add tag v1_8_6_5001v1_8_6_5001

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_6_5001@13304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2491 files changed, 580216 insertions, 0 deletions

diff --git a/ruby_1_8_6/.cvsignore b/ruby_1_8_6/.cvsignore
new file mode 100644
index 0000000000..a72211d03f
--- /dev/null
+++ b/ruby_1_8_6/.cvsignore
@@ -0,0 +1,48 @@
+*.bak
+*.orig
+*.rej
+*.sav
+*~
+.*.list
+.*.time
+.ccmalloc
+.ppack
+.ext
+.git
+.svn
+.pc
+COPYING.LIB
+ChangeLog.pre-alpha
+ChangeLog.pre1_1
+Makefile
+README.fat-patch
+README.v6
+README.atheos
+archive
+autom4te*.cache
+automake
+beos
+config.cache
+config.h
+config.h.in
+config.log
+config.status
+configure
+libruby.so.*
+miniruby
+newdate.rb
+newver.rb
+parse.c
+patches
+ppack
+preview
+rbconfig.rb
+repack
+riscos
+rubicon
+ruby
+ruby-man.rd.gz
+tmp
+web
+y.output
+y.tab.c
diff --git a/ruby_1_8_6/.document b/ruby_1_8_6/.document
new file mode 100644
index 0000000000..230c50e387
--- /dev/null
+++ b/ruby_1_8_6/.document
@@ -0,0 +1,16 @@
+# This file determines which files in the
+# Ruby hierarchy will be processed by the RDoc
+# tool when it is given the top-level directory
+# as an argument
+
+# Process all the C source files
+*.c
+
+# the lib/ directory (which has its own .document file)
+
+lib
+
+
+# and some of the ext/ directory (which has its own .document file)
+
+ext
diff --git a/ruby_1_8_6/COPYING b/ruby_1_8_6/COPYING
new file mode 100644
index 0000000000..9043404a83
--- /dev/null
+++ b/ruby_1_8_6/COPYING
@@ -0,0 +1,56 @@
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the GPL
+version 2 (see the file GPL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
diff --git a/ruby_1_8_6/COPYING.ja b/ruby_1_8_6/COPYING.ja
new file mode 100644
index 0000000000..933cc7cb9a
--- /dev/null
+++ b/ruby_1_8_6/COPYING.ja
@@ -0,0 +1,51 @@
+$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL(the GNU General
+Public License)$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G(B
+$B$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
+
+  1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B
+
+  2. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$N%=!<%9$r(B
+     $B<+M3$KJQ99$G$-$^$9!%(B
+
+     (a) $B%M%C%H%K%e!<%:$K%]%9%H$7$?$j!$:n<T$KJQ99$rAwIU$9$k(B
+         $B$J$I$NJ}K!$G!$JQ99$r8x3+$9$k!%(B
+
+     (b) $BJQ99$7$?K\%W%m%0%i%`$r<+J,$N=jB0$9$kAH?%FbIt$@$1$G(B
+         $B;H$&!%(B
+
+     (c) $BJQ99E@$rL@<($7$?$&$(!$%=%U%H%&%'%"$NL>A0$rJQ99$9$k!%(B
+         $B$=$N%=%U%H%&%'%"$rG[I[$9$k;~$K$OJQ99A0$NK\%W%m%0%i(B
+         $B%`$bF1;~$KG[I[$9$k!%$^$?$OJQ99A0$NK\%W%m%0%i%`$N%=!<(B
+         $B%9$NF~<jK!$rL@<($9$k!%(B
+
+     (d) $B$=$NB>$NJQ99>r7o$r:n<T$H9g0U$9$k!%(B
+
+  3. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$r%3%s%Q%$(B
+     $B%k$7$?%*%V%8%'%/%H%3!<%I$d<B9T7A<0$G$bG[I[$G$-$^$9!%(B
+
+     (a) $B%P%$%J%j$r<u$1<h$C$??M$,%=!<%9$rF~<j$G$-$k$h$&$K!$(B
+         $B%=!<%9$NF~<jK!$rL@<($9$k!%(B
+
+     (b) $B5!3#2DFI$J%=!<%9%3!<%I$rE:IU$9$k!%(B
+
+     (c) $BJQ99$r9T$C$?%P%$%J%j$OL>A0$rJQ99$7$?$&$(!$%*%j%8%J(B
+         $B%k$N%=!<%9%3!<%I$NF~<jK!$rL@<($9$k!%(B
+
+     (d) $B$=$NB>$NG[I[>r7o$r:n<T$H9g0U$9$k!%(B
+
+  4. $BB>$N%W%m%0%i%`$X$N0zMQ$O$$$+$J$kL\E*$G$"$l<+M3$G$9!%$?(B
+     $B$@$7!$K\%W%m%0%i%`$K4^$^$l$kB>$N:n<T$K$h$k%3!<%I$O!$$=(B
+     $B$l$>$l$N:n<T$N0U8~$K$h$k@)8B$,2C$($i$l$k>l9g$,$"$j$^$9!%(B
+
+     $B$=$l$i%U%!%$%k$N0lMw$H$=$l$>$l$NG[I[>r7o$J$I$KIU$$$F$O(B
+     LEGAL$B%U%!%$%k$r;2>H$7$F$/$@$5$$!%(B
+
+  5. $BK\%W%m%0%i%`$X$NF~NO$H$J$k%9%/%j%W%H$*$h$S!$K\%W%m%0%i(B
+     $B%`$+$i$N=PNO$N8"Mx$OK\%W%m%0%i%`$N:n<T$G$O$J$/!$$=$l$>(B
+     $B$l$NF~=PNO$r@8@.$7$??M$KB0$7$^$9!%$^$?!$K\%W%m%0%i%`$K(B
+     $BAH$_9~$^$l$k$?$a$N3HD%%i%$%V%i%j$K$D$$$F$bF1MM$G$9!%(B
+
+  6. $BK\%W%m%0%i%`$OL5J]>Z$G$9!%:n<T$OK\%W%m%0%i%`$r%5%]!<%H(B
+     $B$9$k0U;V$O$"$j$^$9$,!$%W%m%0%i%`<+?H$N%P%0$"$k$$$OK\%W(B
+     $B%m%0%i%`$N<B9T$J$I$+$iH/@8$9$k$$$+$J$kB;32$KBP$7$F$b@U(B
+     $BG$$r;}$A$^$;$s!%(B
diff --git a/ruby_1_8_6/ChangeLog b/ruby_1_8_6/ChangeLog
new file mode 100644
index 0000000000..73fca5a2b1
--- /dev/null
+++ b/ruby_1_8_6/ChangeLog
@@ -0,0 +1,19627 @@
+Wed Aug 22 12:40:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_delete_key): delete the entry without calling block.
+
+	* hash.c (rb_hash_shift): should consider iter_lev too.
+
+	* hash.c (delete_if_i): use rb_hash_delete_key() so that the block
+	  isn't called twice.  [ruby-core:11556]
+
+Sun Arg 12 03:56:30 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/tuplespace.rb: fix Rinda::TupleSpace keeper thread bug.
+	  the thread is started too early. [ruby-talk:264062] 
+
+	* test/rinda/test_rinda.rb: ditto.
+
+Wed Aug 22 12:31:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func_isinf): set yes also on OpenSolaris.
+	  [ruby-Bugs-12859]
+
+Wed Aug 22 12:30:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rexml/encodings/{ISO-8859-15,CP-1252}.rb: fixed invalid syntax.
+
+Wed Aug 22 12:29:36 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/README: fixed a typo.
+
+Wed Aug 22 12:13:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): save all CONFIG values.
+
+	* ext/extmk.rb (extmake): remove mkmf.log at clean, and extconf.h at
+	  distclean, respectively.
+
+	* ext/extmk.rb: remove rdoc at clean, and installed list file at
+	  distclean, respectively.
+
+Wed Aug 22 11:49:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): should not check positional number as
+	  width.  [ruby-core:11838]
+
+Wed Aug 22 11:47:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_aref): check for Bignum index range.
+	 [ruby-dev:31271]
+
+Wed Aug 22 11:41:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (conv_to_posix_path): removed.
+
+	* ruby.c (rubylib_mangled_path, rubylib_mangled_path2): return
+	  VALUE instead of a pointer to static buffer.
+
+	* ruby.c (push_include_cygwin): fixed buffer overflow.
+	  [ruby-dev:31297]
+
+	* ruby.c (ruby_init_loadpath): not convert built-in paths.
+
+Wed Aug 22 11:39:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h (is_ruby_native_thread): removed since declared as an int
+	  function in ruby.h already.
+
+Wed Aug 22 11:00:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (init_mkmf): should remove mkmf.log too.
+
+Wed Aug 22 10:57:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_config.c (ossl_config_set_section): do not
+	  initialize aggregations with dynamic values.  [ruby-talk:259306]
+
+Wed Aug 22 10:55:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (get_backtrace): check the result more.
+	  [ruby-dev:31261] [ruby-bugs-12398]
+
+Wed Aug 22 10:36:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_lshift, rb_big_rshift): separated functions
+	  to get rid of infinite recursion.  fixed calculation in edge
+	  cases.  [ruby-dev:31244]
+
+	* numeric.c (rb_fix_lshift, rb_fix_rshift): ditto.
+
+Wed Aug 22 10:29:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_pow): refine overflow check.  [ruby-dev:31242]
+
+Wed Aug 22 10:26:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_succ): Time#succ should return a time object in the
+	  same timezone mode to the original.  [ruby-talk:260256]
+
+Wed Aug 22 10:24:00 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_pow): integer power calculation: 0**n => 0, 
+	  1**n => 1, -1**n => 1 (n: even) / -1 (n: odd).
+
+	* test/ruby/test_fixnum.rb (TestFixnum::test_pow): update test
+	  suite.  pow(-3, 2^64) gives NaN when pow(3, 2^64) gives Inf.
+
+Wed Aug 22 10:23:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/base64.rb (Base64::b64encode): should not specify /o option
+	  for regular expression.  [ruby-dev:31221]
+
+Wed Aug 22 10:20:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): more checks for format argument.
+	  [ruby-core:11569], [ruby-core:11570], [ruby-core:11571],
+	  [ruby-core:11573]
+
+Wed Aug 22 10:13:45 2007  pegacorn  <subscriber.jp AT gmail.com>
+
+	* ext/digest/digest.c (rb_digest_instance_update,
+	  rb_digest_instance_finish, rb_digest_instance_reset,
+	  rb_digest_instance_block_length): %s in rb_raise() expects char*.
+	  [ruby-dev:31222]
+
+	* ext/openssl/ossl.h: include ossl_pkcs5.h.  [ruby-dev:31231]
+
+	* ext/openssl/ossl_pkcs5.h: new file for PKCS5.  [ruby-dev:31231]
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): use ossl_raise()
+	  instead of rb_raise().  [ruby-dev:31222]
+
+	* ext/sdbm/_sdbm.c: DOSISH platforms need io.h.  [ruby-dev:31232]
+
+	* ext/syck/syck.h: include stdlib.h for malloc() and free().
+	  [ruby-dev:31232]
+
+	* ext/syck/syck.h (syck_parser_set_input_type): prototype added.
+	  [ruby-dev:31231]
+
+	* win32/win32.c: include mbstring.h for _mbspbrk().  [ruby-dev:31232]
+
+	* win32.h (rb_w32_getcwd): prototype added.  [ruby-dev:31232]
+
+Wed Aug 22 10:11:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_cstr_to_inum): check leading non-digits.
+	  [ruby-core:11691]
+
+Wed Aug 22 10:07:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_neg): SIGNED_VALUE isn't in 1.8.
+
+	* bignum.c (bigtrunc): do not empty Bignum.  [ruby-dev:31229]
+
+Wed Aug 22 10:02:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_pow): 0**2 should not raise floating point
+	  exception.  [ruby-dev:31216]
+
+Wed Aug 22 10:01:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): enclose command line except for
+	  command.com which can not handle quotes.  [ruby-talk:258939]
+
+Wed Aug 22 09:58:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand
+	  ::CONFIG which is an alias of MAKEFILE_CONFIG.
+
+Wed Aug 22 09:55:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (rb_struct_init_copy): disallow changing the size.
+	  [ruby-dev:31168]
+
+Wed Aug 22 09:54:28 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* random.c: documentation fix.  srand(0) initializes PRNG with '0',
+	  not with random_seed.
+
+Wed Aug 22 09:53:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir.
+
+Wed Aug 22 09:46:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): sign bit extension should not be done
+	  if FPLUS flag is specified.  [ruby-list:39224]
+
+Wed Aug 22 09:41:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_initialize): should call rb_ary_modify() first.
+	  [ruby-core:11562]
+
+Wed Aug 22 09:40:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (yylex): return non-valid token for an invalid
+	  instance/class variable name.  a patch from from Yusuke ENDOH
+	  <mame AT tsg.ne.jp>.  [ruby-dev:31095]
+
+Wed Aug 22 09:39:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (dsym): return non-null NODE even if yyerror().  based on a
+	  patch from from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:31085]
+
+Wed Aug 22 09:38:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_exec_v, rb_proc_exec): preserve errno.
+
+Wed Aug 22 09:00:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occured
+	  in at_exit blocks.  [ruby-core:11263]
+
+Wed Aug 22 08:52:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_path2class): get rid of dangling pointer caused by
+	  optimized out value.
+
+Wed Aug 22 08:51:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/lib/dl/win32.rb: seems that dl doesn't accept void argument.
+	  fixed [ruby-bugs:PR#5489].
+
+Wed Aug 22 08:49:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (darwin): prohibit loading extension libraries to
+	  miniruby.
+
+Wed Aug 22 08:34:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_kill_thread): renamed in order to get rid of conflict
+	  with a BeOS system function.  [ruby-core:10830]
+
+Wed Aug 22 08:32:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (ruby_setreuid, ruby_setregid): rename to get rid of name
+	  clash.
+Wed Aug 22 08:27:53 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (ResponseParser#next_token): fixed
+	  error message. (backported from HEAD)
+
+	* lib/net/imap.rb (ResponseParser#parse_error): fixed
+	  the condition not to refer @token.symbol unexpectedly.
+	  Thanks, Dick Monahan. (backported from HEAD)
+
+Wed Aug 22 08:26:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_extended): erroneous check condition when dump
+	  method is defined.  [ruby-core:10646]
+
+Mon Jun 18 11:29:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h, ext/thread/thread.c: moved prototype of rb_thread_status()
+	  to get rid of error in C++.  [ruby-list:43615]
+
+Sun Jun 10 13:47:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
+	  get rid of invoking shell.  [ruby-dev:30942]
+
+Sat Jun  9 10:40:00 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* stable version 1.8.6-p36 released.
+
+Fri Jun  8 17:50:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (rb_thread_cancel_timer): fix undefined function
+
+Wed May 30 05:17:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): get rid of SEGV at ZSUPER in a block
+	  [ruby-dev:30836]
+
+Wed May 30 04:29:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (thread_timer): timer thread should not receive any
+	  signals.  submitted by Sylvain Joyeux.  [ruby-core:08546]
+
+Wed May 30 04:18:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval_cmd): just return if no exceptions.
+	  [ruby-dev:30820]
+
+Tue May 29 11:01:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_opendir): store attributes of the second
+	  entries or later too.
+
+	* win32/win32.c (rb_w32_opendir, rb_w32_readdir): eliminate magic
+	  numbers.
+
+Thu Jun  7 20:10:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c, intern.h, ext/thread/thread.c: should not free queue
+	  while any live threads are waiting.
+	  [ruby-dev:30653]
+
+Thu Jun  7 14:53:46 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* eval.c (method_inspect): show proper class name.
+	  [ruby-talk:248647], Thanks Calamitas.
+
+Sun May 27 05:24:56 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* runruby.rb: eliminate uninitialized variable.
+	  [ruby-core:11255]
+
+Sun May 27 05:19:03 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* eval.c (mnew): call of super via a method object should work again.
+	  [ruby-talk:248647], Thanks Calamitas.
+
+	* test/ruby/test_method.rb (TestMethod::test_method_super): test for
+	  above fix.
+
+Wed May 23 07:29:53 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* process.c (proc_exec_v): terminate timer thread in advance.
+	  [ruby-dev:30581], Thanks H. Holon.
+
+Wed May 23 06:51:46 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* lib/cgi.rb (CGI#[]): get rid of exceptions being raised.
+	  [ruby-dev:30740], Thanks Kentaro KAWAMOTO.
+
+Wed May 23 05:49:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb, ext/purelib.rb, lib/mkmf.rb, runruby.rb: clear default
+	  load path to get rid of load pre-installed extensions/libraries.
+	  [ruby-core:11017]
+
+Wed May 23 06:14:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (move_to_next_entry): loc also must move forward.
+	  [ruby-talk:251987]
+
+Wed May 23 05:55:04 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (init_stdhandle): stderr should be without buffering,
+	  but mswin32 use buffering when stderr is not connected to tty.
+
+Wed May 23 05:35:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
+
+Wed May 23 05:17:33 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_s_conv): rdoc fix.
+
+Wed May 23 05:10:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_priority): rdoc fix; the initial value is
+	  inherited from the creating thread.  [ruby-core:10607]
+
+Wed May 23 04:22:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (do_stat, do_lstat, do_opendir): should not warn ENOTDIR.
+	  [ruby-talk:248288]
+
+Wed May 23 03:50:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (libpathflag): not to append RPATHFLAG to current
+	  directory.
+
+	* lib/mkmf.rb (init_mkmf): add current directory to default
+	  library path with highest priority.  [ruby-core:10960]
+
+	* lib/mkmf.rb (LINK_SO): LIBPATH to be placed before DLDFLAGS.
+
+Wed May 23 03:33:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond):
+	  ensures Thread.critical to be false.  [ruby-talk:248300]
+
+Wed May 23 03:25:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_strtod): exponent is radix 10.  [ruby-talk:248272]
+
+Wed May 23 03:12:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LDFLAGS): prepend -L. instead appending it to
+	  XLDFLAGS.  [ruby-core:10933]
+
+	* configure.in (Makefile): remove $U for automake from MISSING.
+	  [ruby-talk:248171]
+
+Wed May 23 02:09:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): should not clear state on TAG_NEXT when
+	  it's invoked from within lambda body.  [ruby-talk:248136]
+
+	* eval.c (proc_invoke): handle TAG_NEXT which would be caused by
+	  next in the lambda body as well.
+
+Wed May 23 01:55:49 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_fclose, rb_w32_close): need to save errno
+	  before calling original fclose()/close().
+
+Wed May 23 01:42:29 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (disconnect): call shutdown for
+	  SSLSocket. Thanks, Technorama Ltd.
+
+Wed May 23 01:28:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_notimplement), io.c (pipe_open): removed definite
+	  articles and UNIX manual section from messages.  [ruby-dev:30690]
+
+	* io.c (pipe_open): raise NotImplementedError for command "-" on
+	  platforms where fork(2) is not available.  [ruby-dev:30681]
+
+Wed May 23 00:03:42 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (s_recv, s_recvfrom): some systems (such as
+	  windows) doesn't set fromlen if the socket is connection-oriented.
+	  reported by Bram Whillock in [ruby-core:10512] [ruby-Bugs#9061]
+
+Sat Mar 24 23:40:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.h (struct rb_thread.locals): explicit as struct.
+	  [ruby-core:10585]
+
+	* eval.c, node.h (enum rb_thread_status, struct rb_thread,
+	  rb_curr_thread, rb_main_thread): prefixed.  [ruby-core:10586]
+
+	* file.c (chompdirsep): made an unprefixed name static.
+
+	* io.c (io_fread): ditto.
+
+Tue May 22 23:27:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): exit by SystemExit and SignalException in END
+	  block.  [ruby-core:10609]
+
+	* test/ruby/test_beginendblock.rb (test_should_propagate_exit_code):
+	  test for exit in END block.  [ruby-core:10760]
+
+	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
+	  test for signal in END block.
+
+Tue May 22 23:14:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_provided): check for extension library if SOEXT is
+	  explicitly given.  [ruby-dev:30657]
+
+Tue May 22 21:29:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bignum.c (rb_big2str0): round up for the most significant digit.
+	  [ruby-core:10686]
+
+Tue May 22 20:53:02 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/thread/thread.c (remove_one): Preserve List invariants;
+	  submitted by: MenTaLguY <mental AT rydia.net>
+	  in [ruby-core:10598] and [ruby-bugs:PR#9388].
+
+Tue Mar 20 15:37:24 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* distruby.rb: Add zip generation.
+
+Fri Mar 16 21:48:11 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/dl/dl.c (rb_ary2cary): Fix a bug in type validation;
+	  submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
+	  in [ruby-dev:30554].
+
+Fri Mar 16 18:28:06 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/etc/etc.c (etc_getgrgid): Fix a bug in Etc::getgrgid()
+	  always returning the (real) group entry of the running process;
+	  reported by: UEDA Hiroyuki <ueda AT netforest.ad.jp>
+	  in [ruby-dev:30586].
+
+Fri Mar 16 16:33:58 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/thread/thread.c (unlock_mutex_inner): Make sure that the
+	  given mutex is actually owned by the caller; submitted by:
+	  Sylvain Joyeux <sylvain.joyeux AT m4x.org> in [ruby-core:10598].
+
+Fri Mar 16 16:21:35 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/thread/thread.c (wait_condvar, lock_mutex): Fix a problem in
+	  ConditionVariable#wait that occurs when two threads that are
+	  trying to access the condition variable are also in concurrence
+	  for the given mutex; submitted by: Sylvain Joyeux
+	  <sylvain.joyeux AT m4x.org> and MenTaLguY <mental AT rydia.net>
+	  in [ruby-core:10598].
+
+Fri Mar 16 16:17:27 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/thread/test_thread.rb: Add a test script for the `thread'
+	  library.  This should result in failure as of now with
+	  ext/thread; submitted by: Sylvain Joyeux <sylvain.joyeux AT
+	  m4x.org> in [ruby-core:10598].
+
+Wed Mar 14 12:30:00 2007  Shigeo Kobayashi  <shigeo@tinyforest.jp>
+
+	* ext/bigdecimal/bigdecimal.c: BigDecimal("-.31") is now
+	  treated as ("-0.31") not as ("0.31").
+
+Tue Mar 13 04:04:04 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* stable version 1.8.6 released.
+
+Tue Mar 13 02:54:17 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph
+	  assumption any more; submitted by MIYASAKA Masaru <alkaid AT
+	  coral.ocn.ne.jp> in [ruby-dev:30537].
+
+Mon Mar 12 11:07:44 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about
+	  externally defined modules; submitted by Technorama
+	  Ltd. <oss-ruby AT technorama.net> in [ruby-bugs:PR#4704].
+
+	* ext/openssl/ossl_bn.c (Init_ossl_bn): Ditto.
+
+	* ext/openssl/ossl_cipher.c (Init_ossl_cipher): Ditto.
+
+	* ext/openssl/ossl_digest.c (Init_ossl_digest): Ditto.
+
+	* ext/openssl/ossl_hmac.c (Init_ossl_hmac): Ditto.
+
+	* ext/openssl/ossl_pkey.c (Init_ossl_pkey): Ditto.
+
+	* ext/openssl/ossl_pkey_dh.c (Init_ossl_dh): Ditto.
+
+	* ext/openssl/ossl_pkey_dsa.c (Init_ossl_dsa): Ditto.
+
+	* ext/openssl/ossl_pkey_rsa.c (Init_ossl_rsa): Ditto.
+
+	* ext/openssl/ossl_rand.c (Init_ossl_rand): Ditto.
+
+	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Ditto.
+
+Mon Mar 12 01:23:50 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/dl/sym.c (rb_dlsym_inspect): Use "0x%x" rather for pointers.
+	  This might not be very right but it is commonly used in other
+	  parts of the code; submitted by sheepman <sheepman AT
+	  sheepman.sakura.ne.jp> in [ruby-dev:30532].
+
+	* ext/dl/ptr.c (rb_dlptr_inspect): Ditto.
+
+	* ext/dl/lib/dl/import.rb (DL::Importable::Internal::import,
+	  DL::Importable::Internal::callback): Avoid race condition for an
+	  instance variable; submitted by sheepman <sheepman AT
+	  sheepman.sakura.ne.jp> in [ruby-dev:30530].
+
+Sun Mar 11 19:04:29 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/README: Add a note about ruby-electric.el. 
+
+	* misc/ruby-mode.el (ruby-non-block-do-re): Fix
+	  ruby-non-block-do-re. [ruby-core:03719]
+
+	* misc/inf-ruby.el: Synchronize the comment section with trunk.
+
+	* misc/README, misc/rdebug.el: Add rdebug.el, Emacs ruby-debug
+	  interface based on rubydb3x.el; submitted by Martin Nordholts
+	  <enselic AT gmail.com> in [ruby-bugs:PR#9023].
+
+Sun Mar 11 17:51:46 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/dl/mkcallback.rb (mkfunc): Make sure that a callback
+	  function is found in the function table before trying to call
+	  it; submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
+	  in [ruby-dev:30524].
+
+Sun Mar 11 17:30:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (error_handle): no message when exiting by signal.
+
+	* eval.c (ruby_cleanup): re-send signal.  [ruby-dev:30516]
+
+	* eval.c (rb_thread_interrupt): instantiate SignalException.
+
+	* eval.c (rb_thread_signal_raise): now takes signal number instead
+	  of signal name.
+
+	* intern.h (rb_thread_signal_raise, ruby_default_signal): prototypes.
+
+	* signal.c (esignal_init): takes a signal number and an optional
+	  signal name.
+
+	* signal.c (interrupt_init): pass SIGINT always.
+
+	* signal.c (ruby_default_signal): invoke system default signal
+	  handler.
+
+	* signal.c (rb_signal_exec, trap): handle SIGTERM.  [ruby-dev:30505]
+
+Tue Mar  6 19:03:42 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/md5.rb (MD5::new, MD5::md5): Do not modify
+	  Digest::MD5.
+
+	* ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
+
+	* lib/shell/process-controller.rb: fix thread synchronization
+	  problem for [ruby-dev:30477].
+
+	* ext/digest/lib/md5.rb (MD5::new, MD5::md5): Catch up with
+	  Digest's API changes; noted by: Kazuhiro Yoshida <moriq AT
+	  moriq.com> in [ruby-dev:30500].
+
+	* ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
+	
+	* time.c (time_to_s): Back out the format changes; discussed
+	  in [ruby-dev:30495].
+
+	* ext/tk/sample/irbtkw.rbw: fails to exit process.
+
+Mon Mar  5 20:26:10 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* time.c (time_to_s): Correct the wrong format which did not
+	  really conform to RFC 2822; pointed out by: OHARA Shigeki <os at
+	  iij.ad.jp> in [ruby-dev:30487].
+
+Sun Mar  4 23:53:27 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mv): could not move a directory between
+	  different filesystems. [ruby-dev:30411]
+
+Sun Mar  4 23:46:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_utime): allow nil to set the current time.
+
+	* lib/fileutils.rb (touch): ditto, and added :mtime and :nocreate
+	  options.  fixed: [ruby-talk:219037]
+
+Sun Mar  4 23:19:00 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* util.c (push_element): should return a int value.
+
+Sun Mar  4 01:06:55 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#^, Set#&): Correct documentation.  Those methods
+	  return sets, not arrays; noted by Oliver Frank Wittich <nietz AT
+	  mangabrain.de>.
+
+Sat Mar  3 21:41:31 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* eval.c (stack_check): Unset inline to fix build with GCC 3.4.6;
+	  submitted by: NISHIMATSU Takeshi <t_nissie AT yahoo.co.jp> in
+	  [ruby-list:43218].
+	  cf. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24556
+
+Sat Mar  3 19:07:05 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/thread/thread.c (push_list): Use ALLOC().
+
+	* ext/thread/thread.c (rb_mutex_alloc): Ditto.
+
+	* ext/thread/thread.c (rb_condvar_alloc): Ditto.
+
+Sat Mar  3 18:56:40 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* NEWS: Add a note for String#intern.
+
+Sat Mar  3 18:36:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_provided): return true only for features loaded from
+	  .rb files, and not search actual library type.  [ruby-dev:30414]
+
+	* eval.c (rb_feature_p): check loading_tbl if the given ext is
+	  empty.  [ruby-dev:30452]
+
+	* eval.c (rb_feature_p): fix possible buffer overrun.
+
+Sat Mar  3 16:30:39 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* env.h (SCOPE_CLONE): Introduce a new scope flag to prevent a
+	  local_tbl region from getting freed many times; submitted by
+	  Chikanaga Tomoyuki <chikanag AT nippon-control-system.co.jp> in
+	  [ruby-dev:30460].
+
+	* eval.c (proc_invoke): Ditto.
+
+	* gc.c (obj_free): Ditto.
+
+	* parse.y (top_local_setup_gen): Ditto.
+
+Sat Mar  3 16:09:27 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* object.c (rb_obj_ivar_set): RDoc updated according to a
+	  suggestion from Brian Candler <B.Candler AT pobox.com>.
+	  [ruby-core:10469]
+
+Sat Mar  3 15:41:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt, arg): should not omit lhs of OP_ASGN1 even if
+	  empty.  [ruby-dev:30452]
+
+Thu Mar  1 04:08:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb (patchlevel): read from version.h.
+
+Thu Mar  1 03:42:09 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
+	  Digest::Base subclasses, which was unintentionally made
+	  impossible while restructuring Digest classes.
+
+Wed Feb 28 22:10:55 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* doc/NEWS-1.8.0: Rename NEWS to NEWS-1.8.0.  This is way too old
+	  NEWS.
+
+	* NEWS: Add NEWS, a document file to keep user visible feature
+	  changes between releases.
+
+	* configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
+
+	* missing/flock.c: workaround for MinGW.
+
+	* ext/openssl/extconf.rb: no need to check unistd.h and sys/time.h.
+	  they are already checked at configure.
+	  reported by KOBAYASHI Yasuhiro [ruby-list:43225]
+
+	* lib/mkmf.rb ($DEFLIBPATH): default library paths ($(topdir), etc)
+	  should be the first elements of library paths list.
+	  reported by KOBAYASHI Yasuhiro [ruby-list:43225]
+
+	* test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use
+	  target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]
+
+	* mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']
+
+	* common.mk: new target dist
+
+	* distruby.rb: new file
+
+	* configure.in (--enable-auto-image-base): avoid the neccessity to
+	  rebase the shared libs as much as possible;
+	  submitted by Corinna Vinschen <spam at vinschen.de> in
+	  [ruby-talk:240964].
+
+Wed Feb 28 20:51:32 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* pack.c (pack_unpack): properly ignore non-base64 octets such as
+	  UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
+	  to fix [ruby-core:10437]
+
+Tue Feb 27 21:50:10 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
+
+	* configure.in (ac_cv_func_setrlimit): workaround for djgpp.
+
+Tue Feb 27 20:49:19 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/base64.rb (Base64::b64encode): Fix documentation; submitted
+	  by David Symonds <dsymonds@gmail.com> in [ruby-core:10432].
+
+	* regex.c (calculate_must_string, slow_search, re_search): Silence
+	  warnings regarding char * vs. unsigned char * mismatch;
+	  submitted by Lyle Johnson <lyle.johnson@gmail.com>
+	  in [ruby-core:10416].
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_load): Ditto.
+
+	* ext/digest/sha1/sha1ossl.c (SHA1_Finish): Ditto.
+
+	* ext/digest/rmd160/rmd160ossl.c (RMD160_Finish): Ditto.
+
+	* ext/digest/digest.c (rb_digest_base_finish,
+	  rb_digest_base_update): Ditto.
+
+	* ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
+	  rb_nkf_guess2): Ditto.
+
+	* ext/thread/thread.c (wait_list_cleanup, rb_mutex_try_lock):
+	  Eliminate rb_thread_critical switching where unnecessary;
+	  implied by shugo in [ruby-dev:30412].
+
+	* ext/thread/thread.c (set_critical): Merge in
+	  thread_exclusive_ensure().
+
+	* ext/thread/thread.c: Consistently use 0 and 1 for
+	  rb_thread_critical values.
+
+	* ext/thread/thread.c: Use xmalloc()/xfree() instead of
+	  malloc()/free(); pointed out by shugo in [ruby-dev:30412].
+
+	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::initialize):
+	  Initialize @workdir properly to silence a warning under -w.
+	  Submitted by <tommy at tmtm.org> in [ruby-dev:30400].
+
+Sun Feb 25 02:50:51 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* defines.h: Pull the RUBY_MBCHAR_MAXSIZE definition from trunk,
+	  which is necessary for dir.c to compile on djgpp and emx.
+
+Sat Feb 24 17:04:01 2007   Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: updated based on date2 4.0.3.
+
+Sat Feb 24 17:01:02 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/racc/cparse/cparse.c (cparse_params_mark): remove useless
+	  rb_gc_mark.  Thanks Tomoyuki Chikanaga. [ruby-dev:30405]
+
+Sat Feb 24 16:53:09 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* signal.c (sighandler): need to tell to be interrupted to main
+	  context when handler is installed.
+
+	* win32/win32.[ch] (rb_win32_interrupted): new function to listen
+	  interrupt.
+
+	* win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
+	  workaround. [ruby-core:10259]
+
+	* win32/win32.c (NtInitialize): call above function.
+
+Fri Feb 23 13:04:43 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* numeric.c (fix_cmp, fix_equal): Remove FIX2LONG() to optimize.
+	  suggested in
+	  http://t-a-w.blogspot.com/2007/02/making-ruby-faster.html.
+	  [ruby-talk:240223]
+
+Fri Feb 23 12:47:13 2007  James Edward Gray II  <james@grayproductions.net>
+
+	* lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): Make the
+	  Content-Length parameter optional for responses in
+	  xmlrpc/client.rb; suggested by Daniel Berger
+	  <Daniel.Berger@qwest.com> and approved by the maintainer.
+
+	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Add DateTime
+	  support to xmlrpc; approved by the maintainer.
+
+Mon Feb 19 18:33:30 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/socket/socket.c (unix_peeraddr): wrong syscall name in error
+	  message for #peeraddr. a patch from Sam Roberts
+	  <sroberts at uniserve.com>.  [ruby-core:10366]
+
+Mon Feb 19 18:27:42 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in, defines.h, eval.c (rb_feature_p, rb_provided,
+	  load_wait, search_required, rb_require_safe), ext/extmk.rb: Fix
+	  a bug where a statically linked extension cannot be autoloaded.
+	  [ruby-dev:30023] / [ruby-dev:30239]
+
+Thu Feb 15 20:31:07 2007  Akinori MUSHA  <knu@iDaemons.org>
+ 
+	* lib/uri/ftp.rb: Revert the previous change pending discussion.
+ 
+Fri Feb 16 11:18:21 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/.document: Apply patch for irb, e2mmap and README by Hugh Sasse
+	<hgs at dmu.ac.uk> from [ruby-core:10135]
+
+	* lib/prettyprint.rb: Suppress RDoc for PrettyPrint test suite.
+
+Thu Feb 15 18:10:09 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* dir.c (glob_helper): Fix the function declaration.
+
+Thu Feb 15 16:55:33 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* version.h: Branch off ruby_1_8_6 from ruby_1_8 in preparation
+	  for the forthcoming 1.8.6 release.
+
+Thu Feb 15 16:44:14 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/uri/generic.rb (URI::Generic::userinfo): Considering how
+	  `scheme://user:@...', `scheme://:password@...' and
+	  `scheme://:@...' are parsed, an empty user name or password
+	  should be allowed and represented as it is.
+
+Thu Feb 15 11:46:05 2007  KIMURA Koichi  <hogemuta@gmail.com>
+
+	* dir.c, win32/win32.c, win32/dir.h, ruby.h, intern.h: Bring
+	  encoding aware globbing support in from trunk.  Dir.[] and
+	  Dir.glob() can now take many patterns in an array.  Minor fixes
+	  will follow.
+
+Thu Feb 15 11:00:26 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/uri/generic.rb (URI::Generic::userinfo): should support
+	  empty password.  [ruby-core:10290]
+
+	* lib/uri/generic.rb (URI::Generic::set_password): password can be
+	  cleared by nil.  [ruby-core:10290]
+
+	* lib/uri/common.rb (escape): regard second string argument as a
+	  character set properly. [ruby-dev:27692]
+
+	* lib/uri/ftp.rb: Attempt to conform to RFC 1738 with regard to
+	  relative/absolute paths.
+
+	* lib/uri: Lovely RDOC patches from mathew (metaATpoboxDOTcom).
+
+Thu Feb 15 10:57:38 2007  Tietew  <tietew@tietew.net>>
+
+	* lib/cgi.rb (CGI::unescapeHTML): invalid decoding for single
+	  unescaped ampersand.  a patch from Tietew
+	  <tietew+ruby-dev at tietew.net> in [ruby-dev:30292].
+	  fixed: [ruby-dev:30289]
+
+Thu Feb 15 10:48:40 2007  MenTaLguY  <mental@rydia.net>
+
+	* ext/thread/thread.c: Handle interrupted waits correctly.
+	  [ruby-bugs:PR#8663]
+
+Wed Feb 14 19:22:15 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest.rb (Digest::self.const_missing): Drop
+	  autoloads for sha2 classes in favor of handling in
+	  const_missing(), to work around a problem exposed on OS X.
+
+Tue Feb 13 02:21:12 2007  Sam Roberts  <sroberts@uniserve.com>
+
+	* io.c (rb_f_syscall): Fix buffer overflow with syscall
+	  arguments.  [ruby-bugs:PR#8541]
+
+Sun Feb 11 07:46:45 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse
+	  a quoted-string in a Content-Disposition value.
+
+Sun Feb 11 06:27:54 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in, ext/thread/extconf.rb, lib/thread.rb: Add a
+	  configure option `--disable-fastthread', to choose the original,
+	  pure ruby version of the "thread" library instead of the new,
+	  much faster implementation in ext/thread.
+
+Sun Feb 11 06:22:20 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/Setup: Add thread except for platforms without threads
+	  support.
+
+Sun Feb 11 06:15:16 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/thread/lib/thread.rb: Add a replacement of thread.rb that
+	  loads this extension.
+
+Sun Feb 11 05:39:47 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/thread.rb: Remove an ineffective part of the code.
+
+Sun Feb 11 05:32:54 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/thread/thread.c (rb_thread_exclusive): Implement
+	  Thread.exclusive.
+
+Sun Feb 11 05:26:51 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/thread/thread.c: Get rid of use of a dummy function.
+
+Sun Feb 11 01:45:31 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/thread/thread.c (Init_thread): Define missing aliases:
+	  Queue#enq and SizedQueue#enq.
+
+Sat Feb 10 09:27:35 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_variant2val): fix compile error
+	  on VC++.
+
+Sat Feb 10 07:41:52 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_variant2val): fix the bug when
+	  SAFEARRAY pointer is NULL.
+
+Sat Feb 10 00:13:11 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: fix typo (TkConfigMethod::__confinfo_cmd, 
+	  __conv_keyonly_opts).
+
+Fri Feb  9 20:44:53 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/thread: Make style fixes (mostly de-K&R'ism) to match the
+	  rest of the source code.
+
+	* ext/thread: Make USE_MEM_POOLS an extconf option.
+
+Fri Feb  9 20:43:01 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/thread: Import the "fastthread" implementation by MenTaLguY
+	  in the original form.  This module is not hooked into the build
+	  yet since it needs some style fixes and adjustments.
+
+Fri Feb  9 15:46:09 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/bigdecimal: Synchronize with trunk.  Better function
+	  prototypes, removal of a useless method `!=', and document
+	  updates.
+
+Tue Feb 06 22:06:45 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+
+        * ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c}:
+          imported nkf 2007-01-28.
+          * Fixed: can't decode MIME encode JIS string.
+          * Fixed: Fullwitdh-halfwidth conversion.
+          * Support DoCoMo's and Softbank's EMOJI
+          * Support CP932, CP5022x, eucJP-ms UDC
+          * Support UTF-32 encoding
+          * Support beyond BMP
+          [ruby-dev:29700] [ruby-dev:29922] [ruby-dev:30144]
+
+Wed Jan 31 14:52:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_iterate): need to PUSH_ITER in proper order.
+	  [ruby-core:10125]
+
+	* test/ruby/test_iterator.rb (TestIterator::test_block_given_within_iterator):
+	  add new test.  [ruby-core:10125]
+
+Tue Jan 30 14:58:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* string.c (rb_str_sub_bang): calling rb_str_modify() should be just
+	  before actually modifying the string.
+	  fixed: [ruby-dev:30211] (originally reported by zunda)
+
+Tue Jan 30 12:05:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb: autoconf 2.61 support.  [ruby-core:10016]
+
+Sat Jan 27 15:20:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (dyna_var_lookup): should not alter dvar->val not to
+	  destroy living value.  [ruby-core:10076]
+
+	* parse.y (dyna_init): ditto.
+
+Fri Jan 26 12:03:39 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb (TkConfigMethod#__confinfo_cmd,
+	  __conv_keyonly_optkeys): make them private [ruby-dev:30074].
+
+	* ext/tk/lib/tk/txtwin_abst.rb: fix typo [ruby-dev:30073].
+
+	* ext/tk/lib/tk/canvas.rb (TkCanvas#scan_dragto): lack of an argument.
+
+	* ext/tk/lib/tk/canvas.rb: clarify the including module name
+	  [ruby-dev:30080].
+
+	* ext/tk/lib/tk/scrollable.rb: change primary name of modules
+	  [ruby-dev:30080].
+
+Wed Jan 24 18:05:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): fix
+	  regexp font-lock bug.  [ruby-talk:235758]
+
+Tue Jan 23 11:02:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+ 
+ 	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest::read_line):
+
+Tue Jan 23 18:26:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension::read_multipart): use == instead
+	  of ===.  [ruby-dev:30176]
+
+Tue Jan 23 10:48:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c: added documentation for Hash about how it uses eql? and
+	  hash methods for the keys.  [ruby-core:09995]
+
+Mon Jan 22 14:57:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c: fix errors in socket sample code.
+	  [ruby-core:09992]
+
+Sat Jan 13 23:54:48 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_free, ole_type_free, 
+	  olemethod_free, olevariable_free, oleparam_free, 
+	  ole_event_free): fix memory leak.  [ruby-core:09846]
+
+Fri Jan 12 11:13:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly
+	  convert uid/gid from VALUE. (backport of r11521)
+
+Wed Jan 10 18:57:57 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c (strscan_do_scan): should set kcode option
+	  before match. [ruby-dev:29914]
+
+	* test/strscan/test_stringscanner.rb: test it.
+
+	* re.c: export kcode_set_option and kcode_reset_option (with "rb_"
+	  prefix).
+
+	* intern.h: ditto.
+
+Tue Jan  9 17:45:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_find_file): should not call fpath_check() with NULL.
+	  fixed: [ruby-core:09867]
+
+Tue Jan  9 03:54:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_upto): String#upto from empty string makes
+	  inifinite loop.  [ruby-core:09864]
+
+Sun Jan  7 12:13:26 2007  Eric Hodel  <drbrain@segment7.net> 
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_class_comment):
+	  Look for class and module comments above rb_define_class and
+	  rb_define_module.  Patch by Daniel Berger <djberg96 at gmail.com>
+
+Sun Jan  7 10:32:12 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constants):
+	  Properly handle escaping of : in comments.
+	* test/rdoc/parsers/test_parse_c.rb:
+	  Test RDoc::C_Parser#do_classes and Rdoc::C_Parser#find_class_comment.
+
+Sun Jan  7 09:33:02 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: updated based on date2 4.0.1.
+
+Wed Jan  3 11:36:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (ruby_dup): start GC on ENOMEM as well.
+
+Mon Jan  1 06:13:11 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parsers/c_parser.rb: Make Rdoc accessible.  Update constant
+	value information.
+
+Mon Jan  1 06:13:11 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/bigdecimal/bigdecimal.c: Update constant comments to provide
+	values for RDoc.
+
+Mon Jan  1 06:05:55 2007  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constansts):
+	Allow RDoc comment to give friendly value for rb_define_const.  Patch
+	by Daniel Berger <djberg96 at gmail.com>, [ruby-patches-7499].
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constansts): Fix
+	whitespace handling in constant comments.
+
+Sun Dec 31 00:31:16 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb: updated based on date2 4.0.
+
+Thu Dec 14 18:29:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/readline/readline.c: NetBSD editline does not have
+	  rl_username_completion_function() and rl_completion_matches().
+	  a patch from Takahiro Kambe <taca at back-street.net>.
+	  [ruby-dev:30008]
+
+Thu Dec 14 18:20:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/locale.rb (IRB::Locale::puts): typo fixed.  a patch from
+	  NAKAMURA Usaku <usa@ruby-lang.org>.  [ruby-dev:30012]
+
+Mon Dec 11 11:58:36 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/sha2/lib/sha2.rb: Moved one level up from under
+	  the superfluous subdirectory digest/.
+
+Mon Dec 11 11:46:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_define_const): typo fixed.
+
+Mon Dec 11 09:36:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_aset): index double decode problem.
+	  [ruby-core:09695]
+
+Sat Dec  9 21:39:24 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): keep the exception till after END blocks.
+	  [ruby-core:09675]
+
+Sat Dec  9 11:22:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/locale.rb (IRB::Locale::search_file): ues File.exist?
+	  instead of File.exists?.  a patch from Yutaka Kanemoto
+	  <kinpoco at gmail.com> in [ruby-dev:30000].
+
+Thu Dec  7 09:29:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/weakref.rb (WeakRef::__setobj__): should support
+	  marshaling.  [ruby-talk:228508]
+
+	* lib/delegate.rb (Delegator::marshal_load): need to call
+	  __setobj__.
+
+Wed Dec  6 23:56:14 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, common.mk (NULLCMD): moved for platforms that empty
+	  command does not run.  fixed: [ruby-dev:29994]
+
+Wed Dec  6 17:17:26 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (SITE_DIR): fixed to emtpy RUBY_SITE_LIB in config.h on
+	  NetBSD.  fixed: [ruby-dev:29358]
+
+Tue Dec  5 00:59:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-parse-partial): need to parse "/=" as
+	  self assignment operator, not regex.  [ruby-talk:227324]
+
+Mon Dec  4 10:48:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h (OFFT2NUM): use LONG2NUM() if sizeof(long) equals to
+	  sizeof(off_t).
+
+Mon Dec  4 10:43:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (dyna_init_gen): dvar initialization only if dvar is
+	  assigned inner block.  [ruby-talk:227402]
+
+Mon Dec  4 08:32:49 2006  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
+	  boundary. JVN#84798830
+
+Sat Dec  2 07:09:04 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ocsp.c: OpenSSL::OCSP::OSCPError should be
+	  subclass of OpenSSL::OpenSSLError. [ruby-dev:29980]
+
+Fri Dec  1 17:01:49 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c (ruby_init_stack): decrease "stack level too deep" in Windows.
+	  merge from trunk.
+
+Fri Dec  1 16:31:53 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: shouldn't run the killed thread at callback.
+	  [ruby-talk: 227408]
+
+Mon Nov 27 17:18:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): need not to truncate string if no
+	  width specifier given for %s.  [ruby-dev:29952]
+
+Sun Nov 26 16:36:46 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* version.h: addition of RUBY_PATCHLEVEL.
+	* version.c: ditto.
+
+Fri Nov 24 10:17:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bignorm): avoid segmentation.  a patch from Hiroyuki
+	  Ito <ZXB01226@nifty.com>.  [ruby-list:43012]
+
+Thu Nov 23 10:38:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_define_method): set implicit visibility only when
+	  it's called for the target class (ruby_cbase).
+
+Wed Nov 22 16:00:49 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: support --with-X11/--without-X11 option.
+
+	* ext/tk/README.tcltklib: add description about --with-X11-* option
+	  [ruby-talk:225166] and --with-X11/--without-X11 option.
+
+	* ext/tk/tkutil/extconf.rb: able to be called manually
+	  [ruby-talk:225950].
+
+Wed Nov 15 23:22:54 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (test_grpowned, rb_stat_grpowned): should honor
+	  supplementary group IDs.  [ruby-core:09546]
+
+Thu Nov  9 03:15:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (BEGIN_CALLARGS): ruby_block may be NULL even when
+	  ITER_PRE.
+
+Tue Nov  7 18:34:34 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest/hmac.rb: Keep this out of the 1.8 tree
+	  until we reach a consensus that HMAC should be put under Digest.
+
+Tue Nov  7 18:05:01 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/itemconfig.rb: minor bug fix.
+
+Mon Nov  6 20:11:20 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/0.9.rb (RSS::Rss): removed needless include.
+
+Mon Nov  6 15:41:55 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/itemconfig.rb: ext/tk/lib/tk/itemconfig.rb: bug
+	  fix on 'itemconfiginfo' method, and modify to make it easy to
+	  override 'itemconfiginfo' method.
+
+	* ext/tk/lib/tkextlib/tile/treeview.rb : support Tile 0.7.8.
+
+	* ext/tk/lib/tkextlib/version.rb : [new] add Tk::Tkextlib_RELEASE_DATE
+	  to get the information from scripts.
+
+	* ext/tk/lib/tk.rb: load 'tkextlib/version.rb', and update RELEASE_DATE
+
+	* ext/tk/lib/tkextlib/SUPPORT_STATUS: update.
+
+	* ext/tk/sample/editable_listbox.rb: [new] the listbox with editable
+	  items. It's one of the example about usage of Place geometry manager.
+
+	* ext/tk/sample/tktextio.rb: improve the functions of TkTextIO class.
+	  Those are required by 'irbtkw.rbw'.
+
+	* ext/tk/sample/irbtkw.rbw: [new] IRB on Ruby/Tk. It doesn't need any
+	  real console. IRB works on a text widget without I/O blocking. That
+	  is, thread switching on IRB will work properly, even if on Windows.
+
+Sun Nov  5 19:53:49 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: updated based on date2 3.9.7.
+
+Sat Nov  4 13:13:57 2006  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: accept NOMODSEQ. [ruby-core:9002]
+	  (backported from HEAD)
+
+Fri Nov  3 00:16:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_getnameinfo__aix): AF_INET6 workaround
+	  for AIX.  a patch from Yutaka Kanemoto <kinpoco AT gmail.com>.
+	  [ruby-dev:29744]
+
+Thu Nov  2 15:43:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (primary): should set NODE even when compstmt is NULL.
+	  merge from trunk. fixed: [ruby-dev:29732]
+
+Thu Nov  2 14:48:30 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#^): Fix XOR operation against a container that
+	  holds duplicate values. [issue: #6444]
+
+Wed Nov  1 02:41:38 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest/hmac.rb (Digest::HMAC::update): Minor
+	  optimization.
+
+	* ext/digest/digest.c (rb_digest_instance_equal): Allow comparing
+	  a digest instance with another of a different class.
+
+Wed Nov  1 01:05:13 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (rb_call0): fixed bug of zsuper with both of opt and rest.
+	  fixed: [ruby-list:42928]
+
+	* test/ruby/test_super.rb: add tests to check above bug.
+
+Tue Oct 31 17:03:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_dup): duplicate the class of original time.
+	  [ruby-core:09357]
+
+	* lib/time.rb (Time::make_time, Time::rfc2822, Time::httpdate):
+	  should respect subclasses.  [ruby-core:09357]
+
+Mon Oct 30 23:40:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (miniruby): add XLDFLAGS.
+
+	* configure.in (aix): use -bE option for miniruby.  [ruby-dev:29698]
+
+	* dir.c (glob_helper): get rid of possible memory leak.
+
+	* win32/win32.c (cmdglob, rb_w32_cmdvector, rb_w32_opendir,
+	  rb_w32_get_environ): not to use GC before initialization.
+
+Mon Oct 30 19:29:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bignum.c (rb_big2str0): use better approximation.
+
+Mon Oct 30 18:35:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big2str0): wrong allocation length.  a patch from
+	  U.Nakamura <usa at garbagecollect.jp> [ruby-dev:29710]
+
+Mon Oct 30 12:34:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): fix commit miss.  [ruby-dev:29707]
+
+Mon Oct 30 12:20:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big2str0): a bug in length adjustment.
+
+Mon Oct 30 11:15:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): should preserve leading zero
+	  information for negative %b and %x.  [ruby-talk:221347]
+
+Thu Oct 26 21:05:58 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_verify): should clear error.
+	  (fix http://bugs.debian.org/394336)
+
+	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto.
+
+Thu Oct 26 15:21:10 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/digest/digest.c (Init_digest): typo.
+
+Wed Oct 25 17:23:28 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest, test/digest/test_digest.rb: Merge from trunk:
+	  - Introduce versioning in Digest::Base API, and prefix C
+	    constants with RUBY_ and C type names with rb_ to avoid name
+	    clash in writing extensions.
+	  - Introduce Digest::Class and Digest::Instance for ease of
+	    implementing subclasses and add-ons.
+	  - Digest::Instance module requires and assumes that any instance
+	    be resettable and clonable.  An instance method #new() is
+	    added so digest instances work just like digest classes.
+	  - The constructor does no longer take an initial string to feed;
+	    digest() and hexdigest() now do, instead.  This allows digest
+	    classes to take their own hashing parameters.
+	  - Make some changes to digest() and hexdigest() class methods,
+	    which now take extra arguments, which are passed through to
+	    the constructor in an internal call.
+	  - Add #digest_length/size/length() and #block_length(),
+	  - Add the Digest::SHA2 class to wrap up SHA2 variants: SHA256,
+	    SHA384 and SHA512, hoping this module would make a decent
+	    example of a digest subclass written in Ruby.
+	  - Rip BubbleBabble support out of the base class and have a
+	    separate module named digest/bubblebabble.
+	  - Remove RD documents in favor of newly written and embedded
+	    RDoc documentation.
+
+Wed Oct 25 08:03:23 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: updated based on date2 3.9.6.
+	  [ruby-core:09323]
+
+Sun Oct 22 14:48:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* signal.c (ruby_signal): don't set SA_RESTART.  a backport from
+	  the HEAD.  [ruby-talk:220937]  [ruby-talk:147220]
+
+	* signal.c (Init_signal): avoid duplicated installation of SIGCHLD
+	  handler.
+
+Sun Oct 22 16:47:56 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_substr): should be infected with only original
+	  string, but not the shared string.  fixed: [ruby-core:09152]
+
+	* string.c (rb_str_new4): keep shared string untainted when orignal
+	  string is tainted.  fixed: [ruby-dev:29672]
+
+Sun Oct 22 05:20:34 2006  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+
+	* configure.in: alloca is broken; use C_ALLOCA instead.
+	  [ruby-dev:29416]
+
+Fri Oct 20 10:47:43 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.
+
+Fri Oct 20 08:42:38 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (NULLCMD): dummy command.
+
+	* bcc32/Makefile.sub (post-install-*): Borland make cannot ignore
+	  command-less double-colon rules.  [ruby-dev:29676]
+
+Fri Oct 20 00:37:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bcc32/Makefile.sub ($(LIBRUBY_SO)): execute pre-link hook.
+
+	* ext/extmk.rb: workaround for Borland make.
+
+Wed Oct 18 23:02:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_shift): shorten copy size.  fixed: [ruby-list:42907]
+
+	* signal.c (Init_signal): handle SIGTERM.  fixed: [ruby-list:42895]
+
+	* win32/win32.c (rb_w32_utime): allow NULL to set the current time.
+	  [ruby-talk:219248]
+
+Wed Oct 18 00:55:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): use particular enums.  [ruby-core:09221]
+
+Mon Oct 16 08:30:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb: *OBJS are not needed for extension libraries.
+
+	* {bcc32,wince,win32}/Makefile.sub (config.status): fixed typo,
+	  missing comma.
+
+Sun Oct 15 01:03:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/collector/dir.rb (Collector::Dir#collect): append base
+	  directory but not prepend.
+
+	* lib/test/unit/collector/dir.rb (Collector::Dir#collect_file): do not
+	  join with dot.  fixed: [ruby-core:09179]
+
+Sat Oct 14 23:39:50 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (singleton): no need to re-create NODE_SELF() again.
+	  [ruby-core:09177]
+
+Sat Oct 14 23:25:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parser_warning, parser_warn): some error message may
+	  contain format specifiers.  a patch from Akinori MUSHA <knu at
+	  iDaemons.org>.  [ruby-dev:29657]
+
+	* ext/bigdecimal/bigdecimal.c (VpException): ditto.
+
+	* ext/dl/handle.c (rb_dlhandle_initialize): ditto.
+
+	* ext/gdbm/gdbm.c (rb_gdbm_fatal): ditto.
+
+Sat Oct 14 08:24:45 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest/hmac: Back out the addition of digest/hmac
+	  for now because the API is too premature for a stable branch.
+
+Sat Oct 14 00:55:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bcc32/Makefile.sub (post-install-ext): no longer needed.
+
+	* bcc32/configure.bat: get rid of a quirk of Borland make, which
+	  sets empty macro in command line to "1".
+
+Fri Oct 13 22:50:43 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: updated based on date2 3.9.5.
+
+Fri Oct 13 22:33:28 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (FileUtils.cp_r): dereference_root=true is
+	  default in Ruby 1.8.  This line is wrongly removed in last commit.
+
+Fri Oct 13 18:19:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c: Class#inherited RDoc added.  a patch from Daniel
+	  Berger <djberg96 at gmail.com>  [ruby-core:08942]
+
+Fri Oct 13 02:30:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/collector/dir.rb (Collector::Dir#collect): prepend
+	  base directory to load path.
+
+	* lib/test/unit/collector/dir.rb (Collector::Dir#collect_file): should
+	  use the given File-like interface, but not File directly.
+
+	* test/testunit/collector/test_dir.rb (TestDir::FileSystem): implement
+	  File-like methods correctly.
+
+Fri Oct 13 01:48:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/date.rb (Date::self.complete_hash): need to check if g is
+	  nil before dereference.  [ruby-core:09116]
+
+Fri Oct 13 00:34:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_cvar_defined): wrong id check.  a patch from
+	  Mauricio Fernandez <mfp at acm.org>.  [ruby-core:09158]
+
+	* object.c (rb_mod_cvar_get): typo fixed.  [ruby-core:09168]
+
+	* object.c (rb_mod_cvar_set): ditto.
+
+Wed Oct 11 22:21:41 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest: Merge from trunk; metadata location changed,
+	  Digest::Base#reset() added, Digest::Base#equal() changed, and
+	  digest/hmac added with some modifications made for ruby 1.8.
+
+Tue Oct 10 17:24:12 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc32,win32,wince}/Makefile.sub (config.status): shouldn't use
+	  copy command instead of install. use -run install.
+
+Tue Oct 10 16:49:16 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (hexdigest_str_new, bubblebabble_str_new):
+	  Perform StringValue() checks properly.
+
+	* ext/digest/digest.c: Use RSTRING_{PTR,LEN} macros.
+
+Tue Oct 10 13:49:53 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest: Merge from trunk; apply all changes since the
+	  initial import, except for the removal of compatibility stub
+	  libraries (md5.rb and sha1.rb).
+
+Mon Oct  9 23:46:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/parsedate.rb: documentation patch from Konrad Meyer
+	  <konrad.meyer@gmail.com>.  [ruby-doc:1238]
+
+	* lib/open3.rb, lib/ping.rb: ditto.
+
+Mon Oct  9 22:56:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rexml/encoding.rb (REXML::Encoding::check_encoding): spaces
+	  are allowed around equal sign.  [ruby-core:09032]
+
+	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser): ditto.
+
+Sat Oct  7 23:53:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_scan): small documentation fix.
+	  [ruby-core:09007]
+
+Sat Oct  7 23:44:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_rshift): a bug in right shift of negative
+	  bignums.  [ruby-core:09020]
+
+Sat Oct  7 00:27:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_include_module): remove unnecessary check.
+	  [ruby-talk:218402]
+
+Fri Oct  6 04:30:30 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* sample/openssl/c_rehash.rb: Use digest/md5 instead of obsolete md5.
+
+Wed Oct  4 18:47:25 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/*: bugfix and update
+	  (see ext/tk/ChangeLog.tkextlib).
+
+Wed Oct  4 17:25:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call): check protected visibility based on real self,
+	  not ruby_frame->self.  [ruby-talk:217822]
+
+Wed Oct  4 08:52:30 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/optparse/test_getopts.rb: changed the class name of test case
+	  to get rid of conflict with test_optparse.rb.
+
+Tue Oct  3 23:32:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/testcase.rb (Test::Unit::TestCase.suite): test name
+	  must be string.  fixed: [ruby-core:08978]
+
+Mon Oct  2 23:47:55 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::COLLECTORS):
+	  base directory should be lower precedence.  fixed: [ruby-dev:29622]
+
+	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): typo.
+
+	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
+	  load expanded path.  fixed: [ruby-dev:29621]
+
+Mon Oct  2 15:49:19 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* instruby.rb: batfile should be CRLF'ed.
+
+Mon Oct  2 01:24:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (test-all): separate directory where running test cases
+	  from source tree.
+
+	* lib/test/unit/autorunner.rb (options): added --basedir, --workdir
+	  and --load-path options.
+
+	* lib/test/unit/collector/dir.rb (recursive_collect, collect_file):
+	  base directory support.
+
+Sun Oct  1 23:56:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, common.mk, ext/extmk.rb, win{32,ce}/Makefile.in: keep
+	  LIBRUBY_SO unless need to be removed.
+
+Sun Oct  1 23:12:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#make_switch): pass arguments directly.
+
+Sat Sep 30 15:12:25 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.4.
+
+Fri Sep 29 12:11:04 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* jcode.rb (succ!): call original succ! if $KCODE == 'n'.
+	  fixed: [ruby-talk:216845]
+
+Fri Sep 29 11:43:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_func): revert fallback checking undeclared function.
+	  fixed: [ruby-core:08949]
+
+Fri Sep 29 09:56:56 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: extout is needed for also clean.
+	  fixed: [ruby-core:08944]
+
+	* lib/optparse.rb (OptionParser::Switch#conv_arg): unsplat by
+	  Proc#call if no conversion is given.
+
+Thu Sep 28 23:59:31 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.h (struct thread): declare win32_exception_list on cygwin and
+	  win32 regardless if it is implemented.  Provisional fix for
+	  [ruby-core:08917].
+
+Thu Sep 28 20:53:16 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/tmpdir.rb: use return value of getdir.call for length.
+
+Wed Sep 27 01:04:49 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_func): check function pointer first and macro next.
+
+	* lib/mkmf.rb (have_type): simplified with typedef and sizeof.
+
+Tue Sep 26 23:57:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#getopts): use strings as key.
+	  fixed: [ruby-dev:29614]
+
+Tue Sep 26 15:31:26 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {win32,wince}/Makefile.sub (CPP): check predefined value.
+
+Tue Sep 26 07:55:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_shift): should not move memory region if array
+	  body is shared.  a patch from Kent Sibilev <ksruby at gmail.com>.
+	  [ruby-core:08922]
+
+Mon Sep 25 22:26:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_path_end): skip root directory.  fixed: [ruby-core:08913]
+
+	* lib/mkmf.rb (init_mkmf): set default $LDFLAGS.  Patch by Michal
+	  Suchanek <hramrach at centrum.cz>.  [ruby-talk:216256]
+
+Mon Sep 25 08:14:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_shift): should clear shifting top element.
+	  [ruby-talk:216055]
+
+	* array.c (rb_ary_shift): avoid creating shared object if array
+	  size is small.
+
+Mon Sep 25 08:11:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* random.c (rb_f_rand): RDoc typo fix.  a patch from Frederick
+	  Cheung <fred at 82ask.com>.  [ruby-talk:216047]
+
+Sun Sep 24 22:28:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* runruby.rb: extension library scripts moved into common directory.
+
+Sun Sep 24 14:59:50 2006  Tanaka Akira  <akr@fsij.org>
+
+	* node.h (struct thread): ia64 support is broken by sandbox patch.
+
+Sun Sep 24 12:11:16 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.3.
+
+Sat Sep 23 23:24:57 2006  why the lucky stiff  <why@ruby-lang.org>
+
+	* eval.c (rb_thread_save_context, rb_thread_restore_context):
+	  sandbox hook to save and restore sandbox state.
+
+	* eval.c (thread_no_ensure): added THREAD_NO_ENSURE thread flag.
+
+	* eval.c (rb_thread_kill_bang): Thread#kill! uses the above flag
+	  to circumvent ensure, in order to prevent endless loops.
+	  [ruby-core:08768]
+
+	* eval.c (rb_thread_kill): fix Thread#kill docs, which returns
+	  the thread object in all cases.
+
+	* node.h: expose the rb_jmpbuf_t and rb_thread_t structs, along
+	  with the thread flags.  used by the sandbox extension.
+
+	* ruby.h: extern rb_eThreadError, so sandbox can swap it.
+
+Sat Sep 23 21:34:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content
+	  may be empty.  a patch from Jamis Buck <jamis at 37signals.com>.
+
+Sat Sep 23 08:35:53 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rdoc/ri/ri_options.rb: prevent NameError.  [ruby-dev:29597]
+
+Sat Sep 23 01:04:20 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.2.
+
+Fri Sep 22 02:06:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* .cvsignore: ignore timestamp files and installed list file.
+
+Fri Sep 22 01:36:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb: include FileUtils unconditionally.
+
+Thu Sep 21 22:56:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (no-install): not install rdoc actually.
+
+	* common.mk (install-doc, no-install-doc): use instruby.rb.
+
+	* instruby.rb: rdoc installation.
+
+	* ext/extmk.rb: expand ruby executable names.
+
+Thu Sep 21 13:55:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_getpwuid): uid integer should be wraped in
+	  uid_t value.  [ruby-core:08897]
+
+	* ext/etc/etc.c (etc_getpwuid): uid_t may be bigger than plain
+	  'int' type.
+
+Wed Sep 20 23:17:41 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (pre-install-doc): create data directory before install.
+
+	* lib/mkmf.rb (dir_re): fixed typo.
+
+	* lib/mkmf.rb (install_dirs): remove extra slash.
+
+Wed Sep 20 09:53:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc32,win32,wince}/Makefile.sub (INSTALLED_LIST): need to define
+	  this macro to install.
+
+Wed Sep 20 09:43:10 2006  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: allow extra spaces in responses.
+	  Thanks, Tom Soderlund. (backported from HEAD)
+
+Wed Sep 20 09:25:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/gdbm/gdbm.c: add RDoc documentation. a patch from Peter
+	  Adolphs <futzilogik at users dot sourceforge dot net>.
+	  [ruby-doc:1223]
+
+Tue Sep 19 01:28:00 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: backport from HEAD (rev 1.71).
+
+	* lib/fileutils.rb (FileUtils.cp_r): new option
+	  :remove_destination.
+
+Tue Sep 19 00:42:15 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_obj_ivar_defined, rb_mod_cvar_defined): new methods,
+	  Kernel#instance_variable_defined? and Module#class_variable_defined?.
+	  [ruby-dev:29587]
+
+	* lib/date/format.rb (Date::Bag#method_missing): use new method,
+	  instance_variable_defined? to check if an instance variable is
+	  defined.  fixed: [ruby-dev:29554]
+	  -- This didn't fix anything.
+
+Sun Sep 17 23:44:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/rdoc.rb (RDoc::RDoc#document): scan only files modified
+	  after the previous generation.
+
+Sun Sep 17 17:42:13 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (install-doc): reverted.
+
+	* instruby.rb: stores file name list without destdir prefix.
+
+	* lib/rdoc/generators/ri_generator.rb: do not chdir twice.
+
+Sat Sep 16 23:14:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/pty/pty.c (establishShell): remove remaining unused line.
+
+Sat Sep 16 16:40:44 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, common.in, instruby.rb, ext/extmk.rb, lib/mkmf.rb:
+	  use instruby.rb to install extensions instead of ext/extmk.rb.
+
+	* instruby.rb: store installed list into the file.
+
+	* ext/dbm/extconf.rb: allow multiple candidates for dbm-type.
+
+	* ext/io/wait/extconf.rb: suspicious checking_for.
+
+	* ext/pty/pty.c (establishShell): parent pid is not used.
+
+	* ext/pty/pty.c (freeDevice): not used.
+
+	* ext/pty/pty.c (get_device_once): removed garbage right brace.
+
+	* lib/mkmf.rb (checking_for): improved the messages.
+
+Thu Sep 14 16:11:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_intern): raise SecurityError only when $SAFE
+	  level is greater than zero.  [ruby-core:08862]
+
+	* parse.y (rb_interned_p): new function to check if a string is
+	  already interned.
+
+	* object.c (str_to_id): use rb_str_intern().
+
+Wed Sep 13 18:43:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* README.EXT: English adjustment.  [ruby-core:08851] and
+	  [ruby-core:08852]
+
+Wed Sep 13 18:25:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-parse-partial): better here-doc support.
+	  a patch from Marshall T. Vandegrift <llasram at gmail.com>.
+	  [ruby-core:08804]
+
+Wed Sep 13 16:43:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_intern): prohibit interning tainted string.
+
+Wed Sep 13 01:14:21 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#getopts): works with pre-registered
+	  options.  [ruby-core:08826]
+
+Sun Sep 10 20:27:13 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.1.
+
+Tue Jan 10 09:18:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (stack_extend): fixed prototype.
+
+	* eval.c (rb_require_safe): prevent extension from loading twice.
+	  fixed: [ruby-dev:29523]
+
+Sat Sep  9 23:50:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_mul0): bignum multiplication without
+	  normalization.
+
+	* bignum.c (rb_big_pow): use rb_big_mul0().  [ruby-dev:29547]
+
+Sat Sep  9 14:08:38 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/test/unit/testcase.rb (Test::Unit::TestCase#run): Rescue
+	  Exception in Test::Unit::TestCase#run.  [ruby-core:08783]
+
+Sat Sep  9 04:55:59 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pstore.rb: open all in binary mode, and get rid of the quirk of
+	  msvcrt.  fixed: [ruby-dev:29518]
+
+Sat Sep  9 04:54:42 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, win32/Makefile.sub (MINIRUBY): append MINIRUBYOPT.
+
+	* mkconfig.rb, ext/extmk.rb, lib/mkmf.rb, win32/mkexports.rb: suppress
+	  warnings with $VERBOSE.
+
+	* ext/extmk.rb: Proc#call does not pass the block in 1.8.
+
+	* win32/resource.rb: add more info.
+
+Fri Sep  8 10:03:59 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookies): new
+	  method to parse multiple cookies per Set-Cookie header.
+	  Thanks to Aaron Patterson <aaron_patterson at speakeasy.net>.
+	  [ruby-core:08802]
+
+Fri Sep  8 08:59:30 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub, win32/configure.bat win32/setup.mak: program
+	  name transform.
+
+Fri Sep  8 01:33:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h (RSTRING_PTR): add migration macro.
+
+	* ruby.h (RARRAY_PTR): ditto.
+
+Thu Sep  7 23:27:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (path_check_0, fpath_check): disable path check on cygwin.
+	  [ruby-talk:213074]
+
+Wed Sep 06 12:05:19 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for euc-jp
+	  [ruby-dev:29344]
+
+	* ext/nkf/lib/kconv.rb (Kconv::toeuc): remove -m0 [ruby-dev:29505]
+
+Tue Sep  5 06:47:22 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_to_s): variable declaration after an execution
+	  statement.
+
+Tue Sep  5 05:56:51 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_hash): improve collision.  fixed: [ruby-dev:29352]
+
+Tue Sep  5 05:49:41 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (path_check_0): check if sticky bit is set on parent
+	  directories for executable path.  fixed: [ruby-dev:29415]
+
+Tue Sep  5 05:03:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_plus): addition in Fixnum will never overflow
+	  long.  a patch from Ondrej Bilka <neleai at seznam.cz>.
+	  [ruby-core:08794]
+
+	* numeric.c (fix_minus): ditto.
+
+	* bignum.c (rb_big_pow): eagerly truncate resulting bignum.
+	  [ruby-core:08794]
+
+Mon Sep  4 23:15:34 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_to_s): make it conform to RFC2822 date format.
+	  [ruby-dev:29467]
+
+Mon Sep  4 21:43:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dbm/extconf.rb: create makefile according to the result of check
+	  for dbm header.  fixed: [ruby-dev:29445]
+
+Mon Sep  4 21:42:35 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.
+
+Mon Sep  4 21:14:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_strftime): include nul character.  fixed: [ruby-dev:29422]
+
+Mon Sep  4 16:29:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::out): specify -m0 -x option for nkf.
+	  [ruby-dev:29284]
+
+Mon Sep  4 16:13:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (pipe_open): command name should not contain null bytes.
+	  [ruby-dev:29421]
+
+	* process.c (proc_spawn): ditto.
+
+	* process.c (proc_spawn_n): ditto.
+
+	* process.c (rb_f_system): ditto.
+
+Sun Sep  3 15:32:44 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: get rid of nil.to_s.
+
+Sun Sep  3 06:24:38 2006  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (ruby_connect): sockerrlen should be socklen_t.
+
+Sun Sep  3 04:40:42 2006  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: check arpa/inet.h for ntohs.
+
+	* ext/socket/socket.c: include arpa/inet.h if available.
+
+Sun Sep  3 02:34:55 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/unix.rb (DRbUNIXSocket#close): don't get path if client mode.
+	  [ruby-dev:29417]
+
+Sun Sep  3 01:45:17 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/acl.rb (ACLEntry#initialize): examine whether '*' is
+	  included before IPAddr.new. [ruby-dev:29406]
+
+Sat Sep  2 13:23:01 2006  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk (ia64.o): use the compiler driver to assemble ia64.s
+	  to use appropriate ABI.
+
+Sat Sep  2 03:36:22 2006  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk, configure.in, defines.h, eval.c, gc.c, main.c,
+	  numeric.c, ruby.h, ia64.s: backport IA64 HP-UX support.
+
+Fri Sep  1 13:52:57 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/font.rb: TkFont#current_configinfo() doesn't work
+	  on Tcl/Tk8.x.
+
+Thu Aug 31 12:46:55 2006  why the lucky stiff  <why@ruby-lang.org>
+
+	* eval.c (ruby_init): rename top_cref to ruby_top_cref and export,
+	  along with ruby_cref, for use by the sandbox. [ruby-core:08762]
+
+	* node.h: ditto.
+
+Tue Aug 29 19:10:10 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_s_create): fixed memory leak, based on the patch
+	  by Kent Sibilev <ksruby at gmail.com>.  fixed: [ruby-talk:211233]
+
+Mon Aug 28 11:36:02 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parsers/parse_rb.rb: Fix typo.  Submitted by
+	  <calamitas at gmail.com>.  [ruby-core:08724]
+
+Mon Aug 28 07:53:44 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/ri/ri_formatter.rb: Don't unescape HTML in HtmlFormatter.
+	  Submitted by Kent Sibilev <ksruby at gmail.com>.  [ruby-core:08392].
+
+Mon Aug 28 07:25:45 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* file.c (File#size?): Fix documentation submitted by Rick Ohnemus.
+	  ruby-Bugs-5529.  [ruby-core:08725]
+
+Sat Aug 26 08:07:13 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb: updated based on date2 3.8.2.
+
+Fri Aug 25 22:32:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rexml/source.rb (REXML::IOSource#initialize): encoding have to
+	  be set with the accessor.  fixed: [ruby-list:42737]
+
+Fri Aug 25 17:15:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* stable version 1.8.5 released.
+
+Fri Aug 25 17:02:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_sweep): typo fixed.
+
+Tue Aug 22 18:47:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_method):
+	  rdoc documents C module methods as instance methods. a patch in
+	  [ruby-core:08536].
+
+Sat Aug 19 14:15:02 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): include winsock2.h instead of
+	  winsock.h when --with-winsock2 is specified.
+	  fixed: [ruby-dev:29296]
+
+Sat Aug 19 11:28:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_rename): use errno if set properly.
+	  fixed: [ruby-dev:29293]
+
+Sat Aug 19 11:09:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (then): remove semicolon warning.  [ruby-dev:29299]
+
+Thu Aug 17 19:15:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_stat_[rRwWxX]): check for super user.
+	  fixed: [ruby-core:08616]
+
+Thu Aug 17 14:47:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: added rdoc by Daniel Berger.  [ruby-core:08177]
+
+Thu Aug 17 00:39:05 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/ring.rb (do_reply): Fix for RingServer fails to find a
+	  TupleSpace when TupleSpace resides in the same ruby process with
+	  RingServer. a patch from Kent Sibilev. [ruby-core:08453]
+
+Wed Aug 16 11:45:36 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_setuid, proc_setgid, proc_seteuid, proc_setegid):
+	  get rid of bogus implementations on Mac OS X.
+
+Tue Aug 15 19:10:18 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_class_comment): Fix
+	  broken class-level documentation.
+
+Wed Aug 16 11:09:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (set_arg0): fill argv other than the first with an empty
+	  string instead of NULL.
+
+Wed Aug 16 11:08:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.h: removed an excess macro.  fixed: [ruby-dev:29258]
+
+Tue Aug  8 23:49:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/extend-command.rb (IRB::ExtendCommandBundle): pacify
+	  RDoc.  a patch from Eric Hodel <drbrain at segment7.net>.
+	  [ruby-core:08522]
+
+Tue Aug  8 11:32:54 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* Makefile.in, common.mk, configure.in: fix for platforms without
+	  rm. patches from Yutaka kanemoto <kinpoco at gmail.com>.
+	  [ruby-dev:29215]
+
+Mon Aug  7 17:56:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
+	  ext/digest/sha1/sha1ossl.c, ext/readline/readline.c: move
+	  incluion of config.h to pacify AIX.  a patch from Yutaka
+	  Kanemoto <kinpoco at gmail.com>.  [ruby-dev:29197]
+
+Mon Aug  7 15:55:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/syck/syck.c (syck_move_tokens): should avoid negative
+	  memmove.  [ruby-list:42625]
+
+Mon Aug  7 14:37:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in, common.mk: AIX link issue.  a patch from Yutaka
+	  Kanemoto <kinpoco at gmail.com>.  [ruby-dev:29190]
+
+	* ext/socket/socket.c: AIX socket support.  [ruby-dev:29190]
+
+Mon Aug  7 12:05:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dln.c, eval.c, gc.c, regex.c, ruby.h: shut up AIX alloca
+	  warning.  a patch from Yutaka Kanemoto <kinpoco at gmail.com>.
+	  [ruby-dev:29191]
+
+Sun Aug  6 20:40:41 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (str[fp]time): %[EO]U didn't denote %U.
+
+Sat Aug  5 17:07:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (top_local_setup): local_vars[-1] should point
+	  ruby_scope itself to protect local_tbl from garbage collection.
+	  [ruby-dev:29049]
+
+Sat Aug  5 13:54:03 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb (str[fp]time): "%\n" means "\n".
+
+Fri Aug  4 15:21:00 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib: Merge RDoc and .document from HEAD.
+	* lib/drb/ssl.rb: Close socket on SSLError [ruby-core:7197]
+
+Fri Aug  4 19:13:41 2006  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/{init.rb,ruby-lex.rb,slex.rb}: can't input '\c' for
+	  [ruby-core: 7122].
+
+Fri Aug  4 14:02:14 2006  James Edward Gray II  <james@grayproductions.net>
+
+	* lib/date/format.rb (__strptime, strftime): allow multi-line patterns
+	  in Date#strftime the same as Time#strftime accepts.
+	  fixed: [ruby-core:08466]
+
+Fri Aug  4 13:56:51 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (pack_pack): check argument overrun for 'P'.  based on a
+	  patch by rucila <rucila at yahoo.cojp>.  fixed: [ruby-dev:29182]
+
+Tue Aug  1 17:44:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (init_stdhandle): assign standard file handles.
+
+Tue Aug  1 12:24:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (Init_Binding): fix old commit miss.
+
+Mon Jul 31 17:08:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (exit_handler): new function; release winsock and
+	  environment work area.
+
+	* win32/win32.c (NTInitialize): setup exit_handler.
+
+	* win32/win32.c (StartSockets): use exit_handler.
+
+	* win32/win32.c (rb_w32_getenv): use GetEnvironmentStrings() instead
+	  of GetEnvironmentVariable(), because the latter cannot distinguish
+	  wheather a null environment variable exists or not.
+	  fixed: [ruby-talk:205123]
+
+Mon Jul 31 16:15:13 2006  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_process.rb (TestProcess#test_rlimit_nofile):
+	  setrlimit may fail with EINVAL.
+	  reported by MIYAMUKO Katsuyuki.  [ruby-dev:29174]
+
+Mon Jul 31 13:38:22 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPReuqest#parse_uri): improve
+	  for the value of IPv6 address in the Host: header field.
+
+Mon Jul 31 09:22:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h: use ifdef (or defined) for macro constants that may or
+	  may not be defined to shut up gcc's -Wundef warnings.
+	  [ruby-core:08447]
+
+Sun Jul 30 23:26:22 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_call0): trace call/return of method defined from block.
+	  fixed: [ruby-core:08329]
+
+	* eval.c (rb_trap_eval): make the current thread runnable to deal with
+	  exceptions which occurred within the trap.  fixed: [ruby-dev:27729]
+
+	* lib/cgi/session.rb, lib/cgi/session/pstore.rb: suppress warnings.
+	  fixed: [ruby-talk:204896]
+
+Sat Jul 29 06:12:06 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: freeze ip_name for security reason.
+
+Sat Jul 29 01:23:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/logger.rb: improves the amount of documentation that Rdoc
+	  picks up when processing logger.rb by moving the require
+	  statement back before the comment block.  a patch from Hugh
+	  Sasse <hgs at dmu.ac.uk>.  [ruby-core:08422]
+
+Thu Jul 27 22:21:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_to_s): fixed format mismatch.
+
+Thu Jul 27 21:19:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* math.c (domain_check): a new function to check domain error
+	  explicitly for systems that return NaN like FreeBSD.
+	  [ruby-core:07019]
+
+	* math.c (math_acos, math_asin, math_acosh, math_atanh, math_log,
+	  math_log10, math_sqrt): use domain_check().
+
+	* math.c (math_sqrt): fix documentation flaw.
+
+Thu Jul 27 18:12:12 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* time.c: need to declare time_utc_offset.
+
+Thu Jul 27 17:01:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_close): always calls "close" method of the receiver.
+	  [ruby-core:6911] [ruby-core:8112]
+
+Thu Jul 27 16:49:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_to_s): use +0900 style timezone string for local time.
+	  [ruby-dev:29143]
+
+Thu Jul 27 16:41:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
+	  Solaris compiler.  [ruby-core:08114]
+
+Wed Jul 26 22:20:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in: add support for as and ASFLAGS.  [ruby-dev:29138]
+
+Wed Jul 26 22:13:45 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: sync with HEAD (rev 1.132).
+
+	* lib/net/http.rb (Net::HTTP#post, request_post, request): should
+	  set Content-Type: x-www-form-urlencoded by default.
+
+	* lib/net/http.rb (Net::HTTPHeader#content_type): should return
+	  nil when there's no Content-Type.
+
+	* lib/net/http.rb (Net::HTTPHeader#sub_type): should return nil
+	  when there's no sub Content-Type (e.g. "Content-Type: text").
+
+	* lib/net/http.rb (Net::HTTPHeader#type_params): wrongly failed
+	  when there's no Content-Type.
+
+Wed Jul 26 18:35:38 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c: sync with HEAD (rev 1.25).
+
+	* ext/strscan/strscan.c (strscan_do_scan):
+	  StringScanner.new("").scan(//) should return "". [ruby-Bugs:4361]
+
+Wed Jul 26 18:14:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/pty/pty.c (getDevice): retry once after GC on failure.
+	  [ruby-core:08282]
+
+Wed Jul 26 17:28:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): prepend ".." to %u for negative bignum,
+	  but not "-".  fixed: [ruby-core:08167]
+
+Wed Jul 26 16:39:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_scan): add string modification check.
+	  [ruby-core:7216]
+
+Wed Jul 26 16:06:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension::read_multipart): check
+	  multipart boundary end.  a patch from Fujioka <fuj at rabbix.jp>
+	  [ruby-dev:28470]
+
+Wed Jul 26 01:02:59 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: suppress warnings by automake 1.8 or later.
+
+Tue Jul 25 00:30:06 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/prettyprint.rb: RD to RDoc conversion by Hugh Sasse.
+
+Tue Jul 25 14:49:51 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (configuration): typo.
+
+Tue Jul 25 13:14:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_proc_times): rename hz to hertz to avoid name
+	  crash on AIX.  [ruby-dev:29126]
+
+Mon Jul 24 22:03:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (backtrace): skip frames successive on node and method name.
+
+Mon Jul 24 17:55:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_f_system): add security check.  [ruby-talk:202947]
+
+	* process.c (rb_f_system): move signal right before fork to avoid
+	  signal handler intervention.
+
+Mon Jul 24 15:51:52 2006  Tanaka Akira  <akr@fsij.org>
+
+	* ext/readline/readline.c (readline_readline): rl_deprep_term_function
+	  may be NULL with libedit.  reported by Ryan Davis.  [ruby-dev:29070]
+
+Mon Jul 24 15:19:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): revert last change.  [ruby-dev:29112]
+	  [ruby-core:08374]
+
+Sun Jul 23 22:59:49 2006  Tanaka Akira  <akr@fsij.org>
+
+	* test/socket/test_unix.rb: disabled on cygwin.
+	  reported by Kouhei Yanagita.  [ruby-dev:29080]
+
+Fri Jul 21 21:21:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_call0): include funcalled methods in caller list.
+	  fixed: [ruby-core:08290]
+
+Fri Jul 21 12:11:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb, lib/mkmf.rb (with_destdir): remove drive letter before
+	  prepending destdir on DOSISH.
+
+Thu Jul 20 15:07:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h: export classes/modules to implement sandbox.
+	  [ruby-core:08283]
+
+Thu Jul 20 00:06:29 2006  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/completion.rb: support for completion of numeric
+    	  number. [ruby-dev: 29038]
+
+Wed Jul 19 23:53:05 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb, lib/rss/utils.rb: added documents.
+
+Tue Jul 18 22:10:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_f_system): block SIGCHLD during the process
+	  execution, like glibc system(3) does.  [ruby-talk:202361]
+
+Tue Jul 18 23:12:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (open_ifs_socket): should not use plain malloc.
+
+	* win32/win32.c (rb_w32_opendir): should not use plain realloc.
+
+Tue Jul 18 18:05:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/ruby/test_float.rb (TestFloat::test_strtod): update test to
+	  conform strtod change.
+
+Tue Jul 18 15:49:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_unpack): propagate association array to copied
+	  string.  [ruby-core:08223]
+
+	* pack.c (pack_unpack): return referenced string itself if it has
+	  same length as specified.  a patch from <nobu at ruby-lang.org>
+	  in [ruby-core:08225].
+
+	* pack.c (pack_pack): taint 'p' packed strings.
+
+Tue Jul 18 14:03:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer::unmount): remove
+	  inpect argument from sprintf.  [ruby-dev:29039]
+
+Tue Jul 18 10:53:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_cstr_to_dbl): limit out-of-range message.
+
+	* util.c (ruby_strtod): return end pointer even if ERANGE occurred.
+	  fixed: [ruby-dev:29041]
+
+Mon Jul 18 00:43:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (ruby_strtod): stop at dot not followed by digits.
+	  fixed: [ruby-dev:29035]
+
+Tue Jul 18 00:01:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: remove LIBRUBY_SO if static linked extensions exist.
+
+Mon Jul 17 23:30:46 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_msvcrt): defaulted to msvcrt.  Workaround for a
+	  bug of cygwin 1.5.20.
+
+Mon Jul 17 13:43:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (define_swapx): should not use plain malloc.
+
+Mon Jul 17 12:58:41 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: should use ac_cv_lib_dl_dlopen=no on MinGW.
+
+Sat Jul 15 23:50:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_require_safe): wait for another thread requiring the same
+	  feature.  fixed: [ruby-core:08229]
+
+Sat Jul 15 01:27:13 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (has_magic): glob names contain alphabets to enable case fold
+	  search also for directories.  fixed: [ruby-talk:201917]
+
+Sat Jul 15 01:09:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* st.c (malloc): use xmalloc/xcalloc instead of plain
+	  malloc/calloc, to detect memory allocation failure.  see
+	  <http://www.nongnu.org/failmalloc/>.
+
+	* gc.c (rb_memerror): should not raise empty nomem_error.
+
+Fri Jul 14 13:08:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: add methods for new features of latest Tcl/Tk8.5.
+
+	* ext/tk/lib/tk/namespace.rb: ditto.
+
+Fri Jul 14 02:30:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/monitor.rb: document patch from Hugh Sasse <hgs at dmu.ac.uk>.
+	  [ruby-core:08205]
+
+Fri Jul 14 01:09:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (then): error in warning action.
+
+Fri Jul 14 00:10:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_pop): may cause realloc oscillation.  a patch
+	  from MORITA Naoyuki <mlgetter at kidou.sakura.ne.jp>.
+	  [ruby-dev:29028]
+
+Thu Jul 13 22:23:56 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/composite.rb: improve handling of the classname on the
+	  option database for the widget class which includes TkComposite.
+
+Thu Jul 13 20:32:19 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb: updated documents by a patch from
+	Hugh Sasse <hgs at dmu.ac.uk>. [ruby-core:8194]
+
+Wed Jul 12 13:54:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (then): we'd like to reserve colon here for the future.
+	  warning added.
+
+Tue Jul 11 20:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h: export rb_cMethod.  [ruby-talk:201259]
+
+Tue Jul 11 19:13:33 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: remove restriction on the class of
+	  pseudo-toplevel.
+
+Tue Jul 11 18:00:57 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: security fix.
+
+Tue Jul 11 17:33:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* string.c (rb_str_dump): need to extend len for \b.
+
+Mon Jul 10 22:00:00 2006  Shigeo Kobayashi  <shigek@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c: Allows '_' to appear within
+	  digits.  [ruby-dev:28872]
+
+	* ext/bigdecimal/lib/bigdecimal/util.rb: Bug in to_r reported by
+	  [ruby-list:42533] fixed.
+
+Mon Jul 10 19:22:19 2006  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (gc_sweep): expand heap earlier.
+	  reported by MORITA Naoyuki.  [ruby-dev:28960]
+
+Mon Jul 10 18:59:34 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/font.rb: sorry. mistaken to patch.
+
+Mon Jul 10 18:46:52 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: make SEGV risk lower at exit.
+
+	* ext/tk/lib/tk.rb: ditto.
+
+	* ext/tk/lib/multi-tk.rb: fail to call function-style methods on slave
+	  interpreters. The strategy (MultiTkIp_PseudoToplevel_Evaluable) to
+	  fix the problem is a little tricky. You may have to take care of
+	  conflicting with it.
+
+	* ext/tk/lib/tk.rb: a little change for the pseudo-toplevel strategy.
+
+	* ext/tk/lib/tk/font.rb: ditto.
+
+	* ext/tk/lib/tk/msgcat.rb: ditto.
+
+	* ext/tk/lib/tkextlib/itk/incr_tk.rb: ditto.
+
+	* ext/tk/sample/demos-en/widget: fail to call function-style methods
+	  on sample scripts. To fix it, a strategy which similar to the way
+	  on MultiTiIp is used. Please take care when re-write and re-run a
+	  demo script on the Widget-Demo code viewer.
+
+	* ext/tk/sample/demos-jp/widget: ditto.
+
+Mon Jul 10 13:58:40 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* signal.c (ruby_nativethread_signal, posix_nativethread_signal,
+	  sigsend_to_ruby_thread, install_nativethread_sighandler):
+	  nativethread-support on signal handler. RE-backport from 1.9.
+
+	* ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
+
+	* eval.c (ruby_native_thread_kill): ditto.
+
+Mon Jul 10 10:54:14 2006  Ryan Davis  <ryand@zenspider.com>
+
+	* lib/rdoc/parsers/parse_f95.rb: massive overhaul from Yasuhiro
+	  Morikawa including new file suffixes, function support, public
+	  variables and constants, derived-types, defined operators and
+	  assignments, namelists, and subroutine and function
+	  arguments. Truly massive.
+
+	* lib/rdoc/diagram.rb: diagrams are now cached.
+
+	* lib/irb/completion.rb: fixed a crasher when completing against
+	  an unnamed class/module.
+
+	* lib/rdoc/parsers/parse_c.rb: private comment (--/++) support in
+	  C-file rdoc.
+
+	* lib/debug.rb: minor clarification in help.
+
+	* lib/pp.rb: minor clarification on exception.
+
+Mon Jul 10 09:29:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_clear_cache_for_undef): clear entries for included
+	  module.  fixed: [ruby-core:08180]
+
+Mon Jul 10 01:48:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* st.h (st_data_t): use pointer sized integer for st_data_t.
+	  [ruby-dev:28988]
+
+Sun Jul  9 18:06:47 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_constant): fix for value 1 at cross compiling.
+
+	* lib/mkmf.rb (create_makefile): prevent substitution of macro
+	  definition.  fixed: http://www.yotabanana.com/lab/20060624.html#p02
+
+Sun Jul  9 00:54:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (next_jump): deal with destination of next.
+	  fixed: [ruby-core:08169]
+
+Fri Jul  7 00:38:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_default): should not call default procedure if
+	  no key is given.  [ruby-list:42541]
+
+Fri Jul  7 00:29:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_mload): a patch from Daniel Berger
+	  <Daniel.Berger at qwest.com>.  [ruby-core:08128]
+
+Thu Jul  6 22:21:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_proc_times): use sysconf(_SC_CLK_TCK) value prior to
+	  HZ and CLK_TCK.  fixed: [ruby-talk:200293]
+
+Thu Jul  6 22:17:21 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/racc/cparse/cparse.c: sync with original code, rev 1.8.
+
+	* ext/racc/cparse/cparse.c: should mark CparseParams objects.
+
+	* lib/racc/parser.rb: sync with original code, rev 1.8.
+
+	* lib/racc/parser.rb: update coding style.
+
+Mon Jul  3 19:04:38 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c (ip_make_menu_embeddable): help to make a menu
+	  widget embeddable (pack, grid, and so on) like as a general widget.
+	  However, an embeddable menu may require to be definied some event
+	  bindings for general use.
+
+	* ext/tk/lib/tk/event.rb: [bug fix] Tk.callback_break and
+	  Tk.callback_continue don't work on MultiTkIp.
+
+	* ext/tk/lib/multi-tk.rb: ditto.
+
+	* ext/tk/lib/tk.rb: lack of Tk.callback_return.
+
+	* ext/tk/lib/tk/menu.rb: improve creating clone menus.
+
+Mon Jul  3 14:42:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/extconf.rb (PW_UID2VAL, PW_GID2VAL): defaulted to conversion
+	  from int, and sys/types.h needs to be included before grp.h.
+	  fixed: [ruby-dev:28938]
+
+Mon Jul  3 01:14:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_inspect): encode \b (\010) for escape.
+	  [ruby-dev:28927]
+
+	* string.c (rb_str_dump): ditto.
+
+Sun Jul  2 19:17:56 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/racc/cparse/cparse.c: sync with original code (rev 1.7).
+
+	* ext/racc/cparse/cparse.c: use rb_catch instead of rb_iterate.
+	  Giving a block to a Ruby-level method by rb_iterate is obsolete on
+	  Ruby 1.9.  Note that current cparse.c still includes one
+	  rb_iterate call on Ruby 1.8, but it is not a problem (at least
+	  just now).
+
+Sat Jul  1 15:15:49 2006  Tanaka Akira  <akr@m17n.org>
+
+	* test/socket/test_nonblock.rb: add timeout to send/receive
+	  an empty UDP packet.
+	  [ruby-dev:28820]
+
+Fri Jun 30 23:46:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in: should test isinf for Solaris with GCC compiler.
+	  a patch from <ville.mattila at stonesoft.com>.  [ruby-core:07791]
+
+	* configure.in: -shared patch from Andrew Morrow
+	  <andrew.c.morrow at gmail.com>.  [ruby-core:08100]
+
+Thu Jun 29 18:58:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_version): fix patch
+	  failure.
+
+Thu Jun 29 18:00:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c: add RDoc document.  a patch from
+	  mathew <meta at pobox.com>.   [ruby-core:07050]
+
+Wed Jun 28 15:47:14 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/optparse.rb: RDoc patch from Robin Stocker <robin@nibor.org>
+	  [ruby-core:08087]
+
+Wed Jun 28 19:04:34 2006  Tanaka Akira  <akr@m17n.org>
+
+	* test/socket/test_unix.rb: test_seqpacket_pair removed.
+	  [ruby-dev:28846]
+
+Tue Jun 27 23:03:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c: RDoc update for =~ method.  a patch from Alex Young
+	  <alex at blackkettle.org>.  [ruby-core:08068]
+
+Tue Jun 27 22:47:18 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: forgot to update TCLTKLIB_RELEASE_DATE.
+
+	* ext/tk/lib/tk.rb (tk_tcl2ruby): [bug fix] sometimes fail to convert
+	  a tcl string to a ruby object if the tcl string includes "\n".
+
+Tue Jun 27 16:04:05 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.h: define isascii on MinGW for msvcrt compatibility.
+
+	* configure.in: set ac_cv_header_sys_time_h=no on MinGW
+	  for msvcrt compatibility.
+
+Tue Jun 27 11:36:02 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (setup_passwd, setup_group): allow bignum uid, gid and
+	  so on.  [ruby-talk:199102]
+
+Mon Jun 26 13:37:27 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc: Merge from HEAD.
+	  Add options to limit the ri search path.
+
+Tue Jun 27 00:54:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.c (powersOf10): constified.
+
+Mon Jun 26 18:37:44 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c (ip_delete): fix SEGV when a slave-ip is
+	  deleted on callback.
+
+Mon Jun 26 10:47:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (pipe_open): avoid closing uninitialized file descriptors.
+	  a patch from <tommy at tmtm.org> [ruby-dev:28600]
+
+Mon Jun 26 09:56:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.[ch] (rb_w32_send, rb_w32_sendto): constified.
+
+Sun Jun 25 23:02:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, mkconfig.rb: catch-up for latest autoconf.
+
+Sat Jun 24 06:35:00 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* signal.c: revert last change.
+
+	* ruby.h: ditto.
+
+	* eval.c: ditto.
+
+Thu Jun 22 11:52:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
+	  HTTPInternalServerError should be error 500.  [ruby-core:08037]
+
+Thu Jun 22 05:15:58 2006  Tanaka Akira  <akr@m17n.org>
+
+	* ext/socket/socket.c (sock_s_socketpair): try GC only once.
+	  [ruby-dev:28778]
+
+Wed Jun 21 21:28:32 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (jd_to_commercial): now works fine even if in
+	  mathn-ized context.
+
+Wed Jun 21 17:32:31 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* signal.c (ruby_nativethread_signal, posix_nativethread_signal,
+	  sigsend_to_ruby_thread, install_nativethread_sighandler):
+	  nativethread-support on signal handler (backport from 1.9).
+
+	* ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
+
+	* eval.c (ruby_native_thread_kill): ditto.
+
+Wed Jun 21 08:39:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): merge Date
+	  and Time processing.  [ruby-core:08033]
+
+Wed Jun 21 01:40:25 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (yylex, reswords): modifier token is no longer returned in
+	  fname state.  [ruby-dev:28775]
+
+Wed Jun 21 01:12:46 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: RSS::Element.def_corresponded_attr_writer
+	  supported date type.
+
+Tue Jun 20 22:08:36 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rss/test_parser.rb: split parser tests into ...
+	* test/rss/test_parser_1.0.rb: ... RSS 1.0 parsing tests and ...
+	* test/rss/test_parser_2.0.rb: ... RSS 2.0 parsing tests.
+
+Tue Jun 20 21:19:06 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: provided default RSS::Element#children.
+
+	* lib/rss/0.9.rb: used default RSS::Element#children.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/2.0.rb: ditto.
+	* lib/rss/taxonomy.rb: ditto.
+
+Tue Jun 20 21:04:33 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: provided default RSS::Element#_tags.
+
+	* lib/rss/0.9.rb: used default RSS::Element#_tags.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/2.0.rb: ditto.
+	* lib/rss/image.rb: ditto.
+	* lib/rss/taxonomy.rb: ditto.
+
+Tue Jun 20 20:47:07 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: hide RSS::Element.install_model.
+	  (RSS::Element.install_have_child_element,
+	   RSS::Element.install_have_children_element,
+	   RSS::Element.install_text_element,
+	   RSS::Element.install_date_element): call
+	  RSS::Element.install_model internally.
+
+	* lib/rss/0.9.rb: followed new API.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/2.0.rb: ditto.
+	* lib/rss/content.rb: ditto.
+	* lib/rss/dublincore.rb: ditto.
+	* lib/rss/image.rb: ditto.
+	* lib/rss/syndication.rb: ditto.
+	* lib/rss/taxonomy.rb: ditto.
+	* lib/rss/trackback.rb: ditto.
+
+Tue Jun 20 20:18:05 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: add check for OBJ_NAME_do_all_sorted.
+
+	* ext/openssl/ossl_cipher.c (ossl_s_ciphers): new method
+	  OpenSSL::Cipher.ciphers. it returns all the cipher names.
+
+	* ext/openssl/lib/openssl/cipher.rb:
+	  - add constants AES128, AES192, AES256. [ruby-dev:28610]
+	  - reimplement without eval()
+
+	* ext/openssl/lib/openssl/digest.rb: reimplement without eval().
+
+	* test/openssl/test_cipher.rb, test_digest: fix about reimplemented
+	  features.
+
+	* sample/openssl/cipher.rb: rewrite all.
+
+Sat Jun 19 11:21:46 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/test/unit/assertions.rb: Merge RDoc from HEAD.
+
+Tue Jun 20 01:06:57 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb:
+	  - cleanup validation mechanism. Now, #XXX_validation is
+	    needless.
+	  - changed internal variable name RSS::Element::MODEL to
+	    RSS::Element::MODELS.
+	  - RSS::Element.install_model requires uri.
+
+	* lib/rss/0.9.rb: followed new validation API.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/2.0.rb: ditto.
+	* lib/rss/content.rb: ditto.
+	* lib/rss/dublincore.rb: ditto.
+	* lib/rss/image.rb: ditto.
+	* lib/rss/syndication.rb: ditto.
+	* lib/rss/taxonomy.rb: ditto.
+	* lib/rss/trackback.rb: ditto.
+
+Mon Jun 19 23:40:59 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/lib/kconv.rb: remove default -m0 and fix document.
+
+	* ext/nkf/nkf-8/{nkf.c, config.h, utf8tbl.c, utf8tbl.h}:
+	  imported nkf 2.0.7.
+
+Mon Jun 19 22:31:59 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb:
+	  - provided default #to_s as RSS::Element#to_s.
+	  - removed RSS::Element#other_element.
+	  - RSS::Element#tag requires attributes as Hash instead of Array.
+
+	* lib/rss/0.9.rb: removed #to_s to use RSS::Element#to_s.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/image.rb: ditto.
+	* lib/rss/taxonomy.rb: ditto.
+	* lib/rss/trackback.rb: ditto.
+
+	* lib/rss/2.0.rb: removed #other_element.
+
+Mon Jun 19 22:09:16 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c(ole_invoke): support some kind of
+	  method of word. [ruby-Bugs#3237]
+
+	* ext/win32ole/tests/test_word.rb: ditto.
+
+	* ext/win32ole/tests/testall.rb: ditto.
+
+Mon Jun 19 00:02:17 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: automatically detected attributes.
+
+	* lib/rss/0.9.rb: removed #_attrs.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/2.0.rb: ditto.
+	* lib/rss/image.rb: ditto.
+	* lib/rss/taxonomy.rb: ditto.
+	* lib/rss/trackback.rb: ditto.
+
+	* lib/rss/parser.rb: followed new internal API.
+
+Mon Jun 19 00:00:17 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
+
+Sun Jun 18 22:36:13 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: RSS::Element#initialize accepts initial
+	  attributes.
+	* lib/rss/0.9.rb: ditto.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/2.0.rb: ditto.
+	* lib/rss/dublincore.rb: ditto.
+	* lib/rss/image.rb: ditto.
+	* lib/rss/taxonomy.rb: ditto.
+	* lib/rss/trackback.rb: ditto.
+
+	* lib/rss/utils.rb: added Utils.element_initialize_arguments? to
+	  detect backward compatibility initial arguments.
+
+	* lib/rss/parser.rb: user initial attributes to initialize
+	  RSS::Element.
+
+Sun Jun 18 18:24:42 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/converter.rb: use NKF for Uconv fallback.
+
+Sun Jun 18 18:22:04 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rss/test_image.rb: shared name space configuration.
+
+Sun Jun 18 18:13:25 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: improved ignore_unknown_element
+	  handling. RSS::NotExpectedTagError provides tag URI.
+	* lib/rss/parser.rb: ditto.
+	* lib/rss/0.9.rb: ditto.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/content.rb: ditto.
+	* lib/rss/dublincore.rb: ditto.
+	* lib/rss/image.rb: ditto.
+	* lib/rss/syndication.rb: ditto.
+	* lib/rss/taxonomy.rb: ditto.
+	* lib/rss/trackback.rb: ditto.
+
+	* test/rss/rss-assertions.rb: checked URI of not expected tag too.
+	* test/rss/test_parser.rb: ditto.
+
+Sun Jun 18 18:08:36 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: changed empty namespace URI representation to ""
+	  from nil.
+	* lib/rss/parser.rb: ditto.
+	* lib/rss/0.9.rb: ditto.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/2.0.rb: ditto.
+
+Sun Jun 18 18:03:50 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb: removed a guard for requiring open-uri.
+
+Sun Jun 18 18:01:26 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: fixed typo: except -> expect
+	* lib/rss/parser.rb: ditto.
+	* test/rss/rss-assertions.rb: ditto.
+	* test/rss/test_parser.rb: ditto.
+
+Sun Jun 18 17:52:39 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: RSS::Element#calc_indent became to be deprecated.
+	* lib/rss/0.9.rb: ditto.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/image.rb: ditto.
+	* lib/rss/taxonomy.rb: ditto.
+	* lib/rss/trackback.rb: ditto.
+
+	* test/rss/test_1.0.rb: removed RSS::Element.indent_size tests.
+	* test/rss/test_2.0.rb: ditto.
+
+Sun Jun 18 00:49:11 2006  Tanaka Akira  <akr@m17n.org>
+
+	* ext/socket/socket.c (bsock_recv_nonblock): new method
+	  BasicSocket#recv_nonblock.
+	  (udp_recvfrom_nonblock): renamed from ip_recvfrom_nonblock.
+	  IPSocket#recvfrom_nonblock is moved to UDPSocket#recvfrom_nonblock.
+	  (unix_recvfrom_nonblock): removed.
+	  UNIXSocket#recvfrom_nonblock is removed.
+
+Sat Jun 17 22:17:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mathn.rb (Integer::prime_division): raise ZeroDivisionError
+	  on zeros.  [ruby-dev:28739]
+
+Sat Jun 17 14:53:32 2006  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb: backport from 1.9.
+	  (Kernel#Pathname): new method.
+
+Sat Jun 17 10:30:41 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb (Hash#merge, Enumerable#sort_by): removed.
+
+	* lib/rss/rss.rb (RSS::RootElementMixin#to_xml): added.
+	  [ruby-talk:197284]
+
+	  We can convert RSS version easily like the following:
+	    rss10 = RSS::Parser.parse(File.read("1.0.rdf"))
+	    File.open("2.0.rss", "w") {|f| f.print(rss10.to_xml("2.0"))}
+
+	* test/rss/test_1.0.rb: added #to_xml test.
+	* test/rss/test_2.0.rb: ditto.
+
+	* test/rss/rss-testcase.rb: added some helper methods that
+	  generates sample RSS 2.0.
+
+	* sample/rss/convert.rb: added a sample script to convert RSS format.
+
+Sat Jun 17 10:23:22 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb (Kernel#funcall): removed.
+	* lib/rss/parser.rb (Kernel.URI): removed.
+
+	* lib/rss/maker/: supported
+	    xxx.new_yyy do |yyy|
+	      yyy.zzz = zzz
+	      ...
+	    end
+	  style and this style became the style of the recommendation.
+
+	  Old style
+	    yyy = xxx.new_yyy
+	    yyy.zzz = zzz
+	    ...
+	  is supported too but this style isn't recommended.
+	  [ruby-talk:197284]
+
+	* test/rss/test_*maker*.rb: used new recommended style.
+
+Sat Jun 17 09:03:47 2006  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss, test/rss: backported from trunk. (2005-11-16 - now)
+
+	* lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
+	* test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
+
+	* lib/rss/trackback.rb: added TrackBack prefix.
+	* lib/rss/maker/trackback.rb: ditto.
+
+	* lib/rss/rss.rb : removed needless argument 'prefix'.
+	* lib/rss/parser.rb: ditto.
+
+	* lib/rss/1.0.rb: added rdf:Bag.
+
+	* lib/rss/taxonomy.rb: implemented taxonomy module.
+	* test/rss/test_taxonomy.rb: added tests for taxonomy support.
+
+	* lib/rss/1.0.rb: added convenience method 'resources'.
+	* lib/rss/taxonomy.rb: ditto.
+	* test/rss/rss-assertions.rb: added test for 'resources'.
+	* test/rss/test_taxonomy.rb: ditto.
+
+	* lib/rss/rss.rb: fixed a indentation bug.
+	* lib/rss/taxonomy.rb: fixed <taxo:topic> #to_s bug.
+	* test/rss/test_taxonomy.rb: added a #to_s test.
+
+	* lib/rss/maker/taxonomy.rb: implemented taxonomy module for RSS
+	  Maker.
+	* lib/rss/taxonomy.rb: supported RSS Maker.
+	* lib/rss/maker.rb: added taxonomy module support.
+
+	* lib/rss/rss.rb: adjusted to other element API.
+	* lib/rss/1.0.rb: adjusted to other element API but backward
+	  compatibility is reserved.
+	* lib/rss/0.9.rb: ditto.
+
+	* test/rss/test_maker_taxo.rb: added test case for taxonomy module
+	  for RSS Maker.
+	* test/rss/test_setup_maker_1.0.rb: added tests for taxo:topic.
+
+	* test/rss/test_setup_maker_1.0.rb: added backward compatibility
+	  test.
+	* test/rss/test_setup_maker_0.9.rb: ditto.
+	* test/rss/test_setup_maker_2.0.rb: ditto.
+
+	* test/rss/rss-testcase.rb: added convenience method for setting
+	  up taxo:topic.
+	* test/rss/rss-assertions.rb: added assertion for taxo:topic.
+
+	* sample/rss/blend.rb: followed new API.
+
+	* lib/rss/taxonomy.rb: changed class or module prefix to
+	  Taxonomy from Taxo.
+	* lib/rss/maker/taxonomy.rb: ditto.
+
+	* test/rss/test_taxonomy.rb: use #reject directory.
+
+	* lib/rss/: use #__send__ instead of #send.
+	* test/rss/: ditto.
+
+	* lib/rss/parser.rb: added entity handling type predicate.
+	* lib/rss/rexmlparser.rb: ditto.
+	* lib/rss/xmlparser.rb: ditto.
+	* lib/rss/xmlscanner.rb: ditto.
+
+	* lib/rss/xmlscanner.rb: more robust entity handling.
+
+	* test/rss/test_parser.rb: added an entity handling test.
+
+	* test/rss/test_2.0.rb: added RSS 2.0 tests.
+	* test/rss/rss-assertions.rb: extended XML stylesheet assertion.
+	* lib/rss/0.9.rb: added initialize method.
+	* test/rss/test_1.0.rb: cleanup.
+
+	* lib/rss/image.rb: added Image prefix.
+	* lib/rss/maker/image.rb: ditto.
+
+	* lib/rss/rss.rb: improved type conversion.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/0.9.rb: ditto.
+	* lib/rss/2.0.rb: ditto.
+	* lib/rss/image.rb: ditto.
+	* lib/rss/syndication.rb: ditto.
+
+	* test/rss/test_2.0.rb: added type conversion tests.
+	* test/rss/test_accessor.rb: ditto.
+	* test/rss/test_to_s.rb: ditto.
+	* test/rss/test_syndication.rb: ditto.
+	* test/rss/test_setup_maker_2.0.rb: ditto.
+	* test/rss/test_setup_maker_1.0.rb: ditto.
+	* test/rss/test_setup_maker_0.9.rb: ditto.
+	* test/rss/test_maker_sy.rb: ditto.
+	* test/rss/test_maker_image.rb: ditto.
+	* test/rss/test_maker_2.0.rb: ditto.
+	* test/rss/test_maker_0.9.rb: ditto.
+	* test/rss/test_image.rb: ditto.
+
+	* test/rss/test_maker_1.0.rb: use assert instead of assert_equal.
+
+	* test/rss/rss-assertions.rb: improved type conversion assertions.
+
+	* lib/rss/rss.rb: added backward compatibility codes.
+	* lib/rss/parser.rb: ditto.
+	* test/rss/test_parser.rb: ditto.
+	* test/rss/test_2.0.rb: ditto.
+
+Sat Jun 17 02:01:00 2006  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
+	  string.
+
+Sat Jun 17 00:23:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reswords): kDO_BLOCK was missing.  fixed: [ruby-core:7995]
+
+Sat Jun 17 00:02:15 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_propertyput): support
+	  PROPERTYPUTREF. [ruby-talk:183042]
+
+	* ext/win32ole/tests/test_propertyputref.rb: ditto.
+
+Thu Jun 15 23:02:47 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (fole_methods): The return value
+	  of WIN32OLE#ole_methods should include PROPERTYPUTREF methods.
+
+	* ext/win32ole/win32ole.c (fole_put_methods): The return value
+	  of WIN32OLE#ole_put_methods should include PROPERTYPUTREF methods.
+
+	* ext/win32ole/tests/test_ole_methods.rb: ditto.
+
+	* ext/win32ole/tests/testall.rb : ditto.
+
+Wed Jun 14 18:23:28 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* enum.c (enum_any): Documentation typo.
+
+Wed Jun 14 15:01:09 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
+	  warnings when -q is set.
+
+Wed Jun 14 23:03:53 2006  Tanaka Akira  <akr@m17n.org>
+
+	* configure.in: check sizeof(rlim_t).
+	  check setrlimit.
+
+	* process.c (proc_getrlimit): new method Process.getrlimit.
+	  (proc_setrlimit): new method Process.setrlimit.
+
+	* ruby.h (NUM2ULL): new macro.
+
+Mon Jun 12 22:25:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): adjust precision length to prevent
+	  splitting multi-byte characters.  [ruby-list:42389]
+
+Sun Jun 11 23:20:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
+	  parser.
+
+Sun Jun 11 10:00:57 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.h (write): not need to define on bcc.
+
+Sun Jun 11 08:30:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#getopts): new methods.
+
+Sat Jun 10 18:02:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
+	  fixed: raize -> raise.  [ruby-talk:196608]
+
+Thu Jun  8 14:19:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.[ch] (rb_w32_read, rb_w32_write): new functions.
+	  use recv() and send() when fd is socket. fixed: [ruby-dev:28694]
+
+Wed Jun  7 16:22:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
+	  basename and pid.  [ruby-talk:196272]
+
+Wed Jun  7 14:53:04 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (errmap): add some winsock errors.
+
+Wed Jun  7 11:34:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* configure.in: add new configure option `--with-winsock2' for mingw.
+
+	* win32/Makefile.sub (config.h): define USE_WINSOCK2 in config.h
+	  instead of in CPPFLAGS.
+
+	* ext/socket/extconf.rb: determine whether to use winsock2 or not
+	  by using with_config.
+
+Wed Jun  7 10:45:10 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{configure.bat, setup.mak, Makefile.sub, win32.h}: add
+	  new configure option `--with-winsock2'.
+
+	* win32/win32.c (StartSockets): ditto.
+
+	* ext/socket/extconf.rb: ditto.
+
+	* win32/win32.c (open_ifs_socket): new function.
+
+	* win32/win32.c (StartSockets, rb_w32_socket): use open_ifs_socket()
+	  instead of socket().
+	  ifs socket support is backported from trunk.
+
+Wed Jun  7 09:14:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): binding for the return event hook should have
+	  consistent scope.  [ruby-core:07928]
+
+	* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
+	  event_hooks.	no guarantee for arbitrary hook deletion.
+	  [ruby-dev:28632]
+
+Mon Jun  5 18:12:12 2006  Tanaka Akira  <akr@m17n.org>
+
+	* ext/socket/socket.c (sock_s_unpack_sockaddr_in): reject
+	  non-AF_INET/AF_INET6 sockaddr.
+	  (sock_s_unpack_sockaddr_un): reject non-AF_UNIX sockaddr.
+	  [ruby-dev:28691]
+
+Sun Jun  4 20:40:19 2006  Tanaka Akira  <akr@m17n.org>
+
+	* ext/socket/socket.c: fix sockaddr_un handling.
+	  [ruby-dev:28677]
+
+Fri Jun  2 22:08:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/forwardable.rb: RDoc typo fix from Jan Svitok
+	  <jan.svitok at gmail.com>.  [ruby-core:07943]
+
+Fri Jun  2 19:02:09 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: use create_header.
+
+	* ext/openssl/ossl.h, ext/openssl/openssl_missing.h:
+	  include RUBY_EXTCONF_H.
+
+Fri Jun  2 17:16:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (CLEANINGS): remove extconf.h by distclean if created.
+
+Fri Jun  2 00:11:19 2006  Tanaka Akira  <akr@m17n.org>
+
+	* ext/socket/socket.c (s_recvfrom): alen may be zero with UNIXSocket
+	  too.  (tested on NetBSD 3.0)
+	  (s_recvfrom_nonblock): extracted from sock_recvfrom_nonblock.
+	  (sock_recvfrom_nonblock): use s_recvfrom_nonblock.
+	  (ip_recvfrom_nonblock): new method: IPSocket#recvfrom_nonblock
+	  (unix_recvfrom_nonblock): new method: UNIXSocket#recvfrom_nonblock
+	  (s_accept_nonblock): extracted from sock_accept_nonblock.
+	  (sock_accept_nonblock): use s_accept_nonblock.
+	  (tcp_accept_nonblock): new method: TCPServer#accept_nonblock
+	  (unix_accept_nonblock): new method: UNIXServer#accept_nonblock
+
+Thu Jun  1 19:12:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_cmdvector): backslashes inside single-quotes
+	  no longer has special meanings.  fixed: [ruby-list:42311]
+
+Thu Jun  1 16:14:41 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_getcwd): runtime's getcwd() will not success
+	  if the length of the cwd is longer than MAX_PATH.
+	  fixed [ruby-list:42335]
+
+Thu Jun  1 11:29:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_getcwd): set errno if not set.
+	  fixed [ruby-list:42346]
+
+Sat May 27 11:29:46 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): remove extinit files if no statically linked
+	  extensions.
+
+Fri May 26 09:05:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+
+	* ruby.h, lib/mkmf.rb (create_header): clear command line options for
+	  macros moved to extconf.h.
+
+	* ext/extmk.rb (extract_makefile, extmk): made RUBY_EXTCONF_H and
+	  EXTSTATIC permanent.
+
+	* ext/{dbm,digest/*,socket,zlib}/extconf.rb: used $defs and $INCFLAGS.
+
+	* {bcc32,win32,wince}/Makefile.sub (COMPILE_C, COMPILE_CXX): added
+	  $(INCFLAGS).
+
+	* lib/mkmf.rb (configuration): add $defs unless extconf.h was created.
+
+Thu May 25 01:52:07 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (pkg_config): particular config commands support.
+
+	* ext/extmk.rb: deal with $static set in extconf.rb.
+
+	* mkconfig.rb: merge multiple entries to an entry with multiple lines.
+
+	* lib/mkmf.rb: allow a series of commands to link.
+
+	* win32/Makefile.sub: embed manifests.
+
+	* win32/setup.mak: suffix OS name by runtime version.
+
+Wed May 24 23:52:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_install_sh): ignore dummy install-sh.
+	  [ruby-talk:193876]
+
+Wed May 24 03:10:48 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/ssl.rb
+	  (OpenSSL::SSL::SocketForwarder#setsockopt,getsockopt): typo fixed.
+
+Mon May 22 17:54:12 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_recvfrom_nonblock): use rb_read_pending
+	  instead of rb_io_read_pending.
+	  [ruby-dev:28663]
+
+Mon May 22 17:30:04 2006  Tanaka Akira  <akr@m17n.org>
+
+	* rubyio.h (rb_io_set_nonblock): declared.
+
+	* io.c (rb_io_set_nonblock): new function.
+	  (io_getpartial): nonblocking read support.
+	  (io_read_nonblock): new method: IO#read_nonblock.
+	  (io_write_nonblock): new method: IO#write_nonblock.
+
+	* ext/socket/socket.c
+	  (sock_connect_nonblock): new method: Socket#connect_nonblock.
+	  (sock_accept_nonblock): new method: Socket#accept_nonblock.
+	  (sock_recvfrom_nonblock): new method: Socket#recvfrom_nonblock.
+
+	  [ruby-core:7917]
+
+Mon May 22 15:57:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (umethod_bind): should not update original class.
+	  [ruby-dev:28636]
+
+Mon May 22 13:38:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ev_const_get): should support constant access from
+	  within instance_eval().  [ruby-dev:28327]
+
+Thu May 18 17:51:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_timeval): should round for usec floating
+	  number.  [ruby-core:07896]
+
+	* time.c (time_add): ditto.
+
+Thu May 18 17:11:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::out): support utf-8.  a patch from Fujioka
+	  <fuj at rabbix.jp>.  [ruby-dev:28649]
+
+Thu May 18 00:42:12 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles.
+
+Wed May 17 17:55:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (sys_warning): should not call a vararg function
+	  rb_sys_warning() indirectly.  [ruby-core:07886]
+
+Wed May 17 08:17:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* util.c (ruby_strtod): try to reduce errors using powersOf10
+	  table.  [ruby-dev:28644]
+
+Tue May 16 15:34:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_initialize): should not allow modifying literal
+	  regexps.  frozen check moved from rb_reg_initialize_m as well.
+
+Tue May 16 09:20:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_initialize): should not modify untainted objects in
+	  safe levels higher than 3.
+
+	* re.c (rb_memcmp): type change from char* to const void*.
+
+	* dir.c (dir_close): should not close untainted dir stream.
+
+	* dir.c (GetDIR): add tainted/frozen check for each dir operation.
+
+Mon May 15 17:42:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
+	  typo fixed.  a patch from Florian Gross <florg at florg.net>.
+
+Sat May 13 16:14:05 2006  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (PP.mcall): new method.
+	  (Struct#pretty_print): call Kernel#class and Struct#members even if
+	  overridden.
+	  (Struct#pretty_print_cycle): ditto.
+	  [ruby-core:7865]
+
+Thu May 11 19:57:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* util.c (ruby_strtod): differ addition to minimize error.
+	  [ruby-dev:28619]
+
+Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
+	  documented.
+
+Thu May 11 18:10:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* util.c (ruby_strtod): should not raise ERANGE when the input
+	  string does not have any digits.  [ruby-dev:28629]
+
+Sun May  7 03:09:51 2006  Stephan Maka  <stephan@spaceboyz.net>
+
+	* lib/resolv.rb (Resolv::DNS::Requester::ConnectedUDP#initialize):
+	  Use AF_INET6 for nameservers containing colons.
+
+Sat May  6 00:38:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* signal.c (trap): sig should be less then NSIG.  Coverity found
+	  this bug.  a patch from Kevin Tew <tewk at tewk.com>.
+	  [ruby-core:07823]
+
+Thu May  4 02:24:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
+	  uninitialized array element.  a patch from Pat Eyler
+	  <rubypate at gmail.com>.  [ruby-core:07809]
+
+	* array.c (rb_ary_fill): initialize local variables first.  a
+	  patch from Pat Eyler <rubypate at gmail.com>.  [ruby-core:07810]
+
+	* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
+	  type_tag.  a patch from Pat Eyler <rubypate at gmail.com>.
+	  [ruby-core:07808]
+
+Wed May  3 02:12:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (make_hostent_internal): accept ai_family
+	  check from Sam Roberts <sroberts at uniserve.com>.
+	  [ruby-core:07691]
+
+Mon May  1 12:23:19 2006    <sinara@blade.nagaokaut.ac.jp>
+
+	* numeric.c (num_div): use floor rather than rb_Integer().
+	  [ruby-dev:28589]
+
+	* numeric.c (flo_divmod): the first element of Float#divmod should
+	  be an integer. [ruby-dev:28589]
+
+	* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
+
+Sat Apr 29 22:42:08 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): should initialize
+	  flag. [ruby-core:07785]
+
+Fri Apr 28 10:53:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* util.c (ruby_strtod): should not cut off 18 digits for no
+	  reason.  [ruby-core:07796]
+
+	* util.c (ruby_strtod): fixed wrong conversion.
+
+Thu Apr 27 01:38:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_fill): internalize local variable "beg" to
+	  pacify Coverity.  [ruby-core:07770]
+
+Wed Apr 26 16:59:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_unpack): now supports CRLF newlines.  a patch from
+	  <tommy at tmtm.org>.  [ruby-dev:28601]
+
+Tue Apr 25 18:00:05 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c (delete_slaves): maybe increment the reference
+	  count of a NULL Tcl_Obj [ruby-core:07759].
+
+Tue Apr 25 07:55:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/jcode.rb (String::tr_s): should have translated non
+	  squeezing character sequence (i.e. a character) as well.  thanks
+	  to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
+
+Tue Apr 25 00:08:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): should check if c is not a
+	  multibyte character.  a patch from KIMURA Koichi
+	  <kimura.koichi at canon.co.jp>.  [ruby-dev:28598]
+
+Fri Apr 21 15:19:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c (lib_eventloop_ensure): refer freed pointer
+	  [ruby-core:07744] and memory leak.
+
+Fri Apr 21 12:14:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c: document update patch from Sam Roberts
+	  <sroberts at uniserve.com>.  [ruby-core:07701]
+
+Wed Apr 19 13:55:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): too much NEW_LIST()
+
+	* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
+
+Wed Apr 19 11:57:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
+	  [ruby-dev:28585]
+
+	* parse.y (list_concat): revert last change.
+
+	* parse.y (arg): use NODE_ARGSCAT for placeholder.
+
+Wed Apr 19 11:13:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
+	  mathew <meta at pobox.com>.  [ruby-core:07738]
+
+Wed Apr 19 10:13:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_const_set): raise error when no target klass is
+	  supplied.  [ruby-dev:28582]
+
+Wed Apr 19 09:49:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (list_concat): should not modify nodes other than
+	  NODE_ARRAY.  [ruby-dev:28583]
+
+Tue Apr 18 17:40:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: add a binding to a container for a slave IP.
+
+	* ext/tk/lib/tk.rb: update RELEASE_DATE.
+
+	* ext/tk/tcltklib.c: forget to reset a Tcl interpreter.
+
+	* ext/tk/stubs.c: fix potential bugs about handling rb_argv0.
+
+Tue Apr 18 00:11:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c: block_unique should be 1, not frame_unique.
+	  [ruby-dev:28577]
+
+Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_body): Make RDoc
+	  ignore C function prototypes.  Patch by Tilman Sauerbeck
+	  <tilman at code-monkey.de>.  [ruby-core:8574]
+	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
+	  documented.
+
+Mon Apr 10 01:03:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* prec.c (prec_prec_f): documentation patch from
+	  <gerardo.santana at gmail.com>.  [ruby-core:07689]
+
+Sat Apr  8 02:34:34 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_pow): second operand may be too big even if
+	  it's a Fixnum.  [ruby-talk:187984]
+
+Sat Apr  8 02:12:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* README.EXT: update symbol description.  [ruby-talk:188104]
+
+Thu Apr  6 23:28:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* COPYING: explicitly note GPLv2.  [ruby-talk:187922]
+
+Thu Apr  6 11:18:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/panedwindow.rb: lack of arguments. [ruby-core:7681]
+
+Thu Apr  6 01:04:47 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tcltklib.c: fix SEGV when embedding to an application.
+	  [ruby-core:7600]
+
+	* ext/tk/tcltklib.c: fix SEGV at exit. [ruby-talk:186489]
+
+	* ext/tk/tkutil/tkutil.c: follow to changing specification of
+	  instance_eval on ruby-1.9.x.
+
+	* ext/tk/lib/tk.rb: ditto.
+
+	* ext/tk/lib/multi-tk.rb: ditto.
+
+	* ext/tk/lib/tk.rb: remove warning about redefinition of methods.
+
+	* ext/tk/lib/tk/variable.rb: remove warning about unseting Tcl
+	  variables.
+
+Wed Mar 29 20:54:44 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (fole_getproperty): WIN32OLE#[] should accept
+	  multi arguments.
+
+	* ext/win32ole/tests/testWIN32OLE.rb (test_setproperty_bracket): ditto.
+
+Wed Mar 29 10:07:44 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_each_char_to_hex, encode_fallback_subchar,
+	  e2w_conv): support C90 compiler.
+
+Wed Mar 29 06:48:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (backtrace): reports aliased method names in a generated
+	  backtrace.  a patch from "U.Nakamura" <usa at garbagecollect.jp>.
+	  [ruby-dev:28471]
+
+Mon Mar 27 22:19:09 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c, config.h}: imported nkf 2.0.6.
+	  * Add --ic / --oc option and mapping tables.
+	  * Add fallback option.
+	  * Add --no-best-fit-chars option.
+	  * Fix some bugs.
+
+	* ext/nkf/nkf.c (nkf_split_options): added for parse option string.
+
+	* ext/nkf/lib/kconv.rb (Kconv.to*): add -m0.
+	  Note that Kconv.to* still imply -X.
+
+Mon Mar 27 03:17:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): insecure calling should be checked for non
+	  NODE_SCOPE method invocations too.
+
+	* eval.c (rb_alias): should preserve the current safe level as
+	  well as method definition.
+
+Fri Mar 24 23:14:30 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (yield_under_i): pass self again for instance_eval().
+	  [ruby-dev:28466]
+
+Fri Mar 24 17:20:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_f_sleep): remove description about SIGALRM which
+	  is not valid on the current implementation.  [ruby-dev:28464]
+
+Thu Mar 23 10:47:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (method_missing): should support argument splat in
+	  super.  [ruby-talk:185438]
+
+Mon Mar 20 12:05:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in: Solaris SunPro compiler -rapth patch from
+	  <kuwa at labs.fujitsu.com>.  [ruby-dev:28443]
+
+Mon Mar 20 09:40:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in: remove enable_rpath=no for Solaris.
+	  [ruby-dev:28440]
+
+Fri Mar 17 19:08:49 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: fix typo.
+	  [ruby-core:07571]
+
+Wed Mar 15 16:54:21 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): support libraries without *.so.
+
+Wed Mar 15 16:35:43 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: should use
+	  "rb_str_new(0, 0)" to make empty string.
+
+Sat Mar 11 14:24:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::wrap): removed
+	  space before argument parenthesis.  [ruby-talk:183630]
+
+	* ruby.1: a clarification patch from David Lutterkort
+	  <dlutter at redhat.com>.  [ruby-core:7508]
+
+Sat Mar  4 15:26:40 2006  Tanaka Akira  <akr@m17n.org>
+
+	* gc.c (id2ref): fix symbol test.
+
+Sat Mar  4 01:08:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
+	  directories.  a patch from Eric Hodel <drbrain at segment7.net>.
+	  [ruby-core:07423]
+
+Thu Mar  2 19:44:18 2006  Tanaka Akira  <akr@m17n.org>
+
+	* gc.c: align VALUE with sizeof(RVALUE) globally.
+	  (is_pointer_to_heap): check alignment out of loop.
+	  (id2ref): avoid collision between symbols and objects.
+	  (rb_obj_id): ditto.  moved from object.c.
+	  [ruby-talk:178364] [ruby-core:7305]
+
+Thu Mar  2 18:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_fd_writable): should not re-schedule output
+	  from KILLED thread (must be error printing).
+
+Thu Mar  2 17:57:49 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* gc.c: commited magic for reducing RVALUE size on windows. (24->20byte)
+	  [ruby-core:7474]
+
+Thu Mar  2 12:59:14 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.c (filetime_to_unixtime): should set tm_isdst to -1.
+	  stat() didn't treat daylight saving time property on WinNT.
+	  [ruby-talk:182100]
+
+Thu Mar  2 08:02:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (add_heap): heap_slots may overflow.  a patch from Stefan
+	  Weil <weil at mail.berlios.de>.
+
+Wed Mar  1 00:24:31 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/rdoc/parsers/parse_rb.rb (read_escape): could not handle /\^/.
+	  merged Mr. Ishizuka's lib/irb/ruby-lex.rb 's patch rev 1.29.
+	  [ruby-talk:181631] [ruby-dev:28404]
+
+Tue Feb 28 09:32:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/drb/extservm.rb (invoke_service_command): cannot invoke command
+	  if command name is quoted on mswin32. [ruby-dev:28400]
+
+Mon Feb 27 00:19:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h (SYM2ID): should not cast to signed long.
+	  [ruby-core:07414]
+
+Fri Feb 24 20:07:23 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/drbtest.rb (add_service_command): quote pathnames in the
+	  server's command line for space contained directory names.
+	  Thanks, arton. [ruby-dev:28386]
+
+Fri Feb 24 12:11:08 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* instruby.rb: install *.exe.manifest and *.dll.manifest if exist.
+	  It's for VC++8.
+
+Fri Feb 24 11:33:52 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub (HAVE_HYPOT): bcc32 has hypot().
+
+Fri Feb 24 11:19:58 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (time_new_internal): add prototype to tell the compiler
+	  arugments types.
+
+	* win32/win32.c (NtInitialize): need to set a handler for VC++8.
+
+Fri Feb 24 08:19:16 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test.rb: Removed.  Obsolete by test/nkf.
+
+	* ext/.document: enabled documents in nkf and kconv
+
+	* ext/nkf/nkf.c ext/nkf/lib/kconv.rb: Add rdoc.
+
+Thu Feb 23 22:39:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub: use borlndmm.dll if possible. bcc32's RTL internal
+	  memory manager cannot handle large memory block properly.
+	  ex: 10000.times { "" << "." * 529671; GC.start } # crash
+	  [ruby-dev:28230]
+
+Thu Feb 23 13:20:28 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* eval.c (SETUP_ARGS0): fixed memory corruption. [ruby-dev:28360]
+
+Tue Feb 21 02:18:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* configure.in (mingw): have link.  [ruby-list:41838]
+
+	* win32/Makefile.sub (config.h): ditto.
+
+Tue Feb 21 02:07:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (f_arglist): should set command_start = Qtrue for
+	  command body.  [ruby-talk:180648]
+
+Mon Feb 20 17:37:26 2006  Tanaka Akira  <akr@m17n.org>
+
+	* mkconfig.rb: alias RbConfig for Config.
+
+Mon Feb 20 12:27:53 2006  Kent Sibilev  <ksruby@gmail.com>
+
+	* lib/rational.rb (Integer::gcd): small typo fix.
+	  [ruby-core:07395]
+
+Mon Feb 20 01:05:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rational.rb (Integer::gcd): replaced by gcd4 in
+	  [ruby-core:07390].  [ruby-core:07377]
+
+Mon Feb 20 00:57:02 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl.h (OSSL_Debug): should not use __func__.
+	  [ruby-dev:28339]
+
+Sun Feb 19 04:46:29 2006  Guy Decoux  <ts@moulon.inra.fr>
+
+	* eval.c: initial value for block_unique must be 1.
+	  [ruby-talk:180420]
+
+Sat Feb 18 23:58:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/tracer.rb (Tracer::Tracer.add_filter): turn on tracer mode
+	  only when caller() level size is one.  [ruby-core:07389]
+
+	* lib/rdoc/parsers/parse_rb.rb: need not to require "tracer".
+	  [ruby-core:07389]
+
+	* sample/rtags.rb: ditto.
+
+Sat Feb 18 12:18:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::fu_world_writable): make it
+	  private.  [ruby-core:07383]
+
+Sat Feb 18 00:22:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/tracer.rb: merged a minor clarification patch from Daniel
+	  Berger <Daniel.Berger at qwest.com>.  [ruby-core:07376]
+
+Fri Feb 17 11:18:42 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* util.c (ruby_strtod): Float("1e") should fail. [ruby-core:7330]
+
+	* pack.c (EXTEND32): unpack("l") did not work where sizeof(long) != 4.
+	  [ruby-talk:180024]
+
+	* pack.c (pack_unpack): fixed integer overflow on template "w".
+	  [ruby-talk:180126]
+
+Fri Feb 17 09:39:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_wait_for): sleep should always sleep for
+	  specified amount of time.  [ruby-talk:180067]
+
+Thu Feb 16 01:10:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (backtrace): frame->orig_func may not be initialized.
+	  [ruby-core:07367]
+
+Wed Feb 15 16:52:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): NODE_OP_ASGN1 should allow splat in its
+	  argument list.  [ruby-core:07366]
+
+	* parse.y (arg): avoid unnecessary extra argument.
+	  [ruby-core:07366]
+
+	* eval.c (rb_eval): honor visibility on OP_ASGN1 and
+	  OP_ASGN2. [ruby-core:07366]
+
+Wed Feb 15 10:09:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (yield_under_i): should not pass self as an argument to
+	  the block for instance_eval.  [ruby-core:07364]
+
+Wed Feb 15 09:20:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_obj_instance_eval): should be no singleton classes for
+	  true, false, and nil.  [ruby-dev:28186]
+
+Tue Feb 14 18:48:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (DMETHOD_P): accessing wrong frame.  [ruby-dev:28181]
+
+	* eval.c (proc_invoke): preserve FRAME_DMETH flag.
+
+Tue Feb 14 15:13:51 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/zlib/zlib.c: supress warning on test/zlib. [ruby-dev:28323]
+
+Tue Feb 14 14:01:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (search_time_t): support non 32bit time_t environments.
+
+	* win32/Makefile.sub (config.h): VC++8 has ``long long'' type.
+
+	* win32/Makefile.sub (config.h): VC++8's time_t is 64bit value.
+
+	* win32/win32.c (rb_w32_utime): drop read-only attribute before
+	  changing file time.
+
+	  all changes are backported from CVS HEAD.
+
+Tue Feb 14 11:21:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_forward): should not use frame->argv.
+	  [ruby-core:07358]
+
+Mon Feb 13 18:08:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): argument update propagation.  [ruby-dev:28044]
+
+	* env.h: remove argv member from struct FRAME.
+
+Mon Feb 13 13:27:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (eval): should push class from binding if supplied.
+	  [ruby-core:07347]
+
+Mon Feb 13 00:04:00 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
+	  change <%='s behavior. (backported 1.15 - 1.16)
+
+Sat Feb 11 02:04:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (eval): no need to push ruby_class.  [ruby-dev:28176]
+
+Sat Feb 11 01:57:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_autoload): check if ruby_cbase is nil (during
+	  instance_eval for objects cannot have singleton classes,
+	  e.g. fixnums and symbols).  [ruby-dev:28178]
+
+Tue Feb  7 23:03:24 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/zlib/zlib.c: should not access ruby objects in finalizer.
+	  [ruby-dev:28286]
+
+Mon Feb  6 16:02:51 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* file.c (rb_thread_flock): ERROR_NOT_LOCKED is not an error on Cygwin.
+	  In such situation, flock() should return 0.
+
+Mon Feb  6 00:41:08 2006  Tanaka Akira  <akr@m17n.org>
+
+	* ruby.h (RSTRUCT_LEN, RSTRUCT_PTR): defined for source level
+	  compatibility with ruby 1.9.
+
+Sun Feb  5 21:05:34 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* numeric.c (fix_to_s): removed workaround for radix 2. Historically,
+	  rb_fix2str could only handle radix 8, 10, 16. (Rev1.37) But for now,
+	  it can handle radix 2..36. [ruby-Bugs#3438] [ruby-core:7300]
+
+Sun Feb  5 18:55:08 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: imported from trunk, rev 1.129
+
+	* lib/net/http.rb (add_field, get_fields): keep 1.8.2 backward
+	  compatibility.
+
+	* lib/net/https.rb: imported from trunk, rev 1.3.
+
+	* lib/net/https.rb: #use_ssl? definition moved from net/http.rb.
+
+Sun Feb  5 14:22:15 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/pstore.rb: should return default value if name is not found.
+	  [ruby-core:7304]
+
+	* lib/pstore.rb: should raise PStore::Error if not in transaction.
+
+Sat Feb  4 22:51:43 2006  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c: apply the FreeBSD getcontext/setcontext workaround
+	  only before FreeBSD 7-CURRENT.
+
+Sat Feb  4 21:19:23 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (LK_ERR): ERROR_NOT_LOCKED is not an error.
+	  In such situation, flock() should return 0.
+
+Sat Feb  4 15:56:37 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* numeric.c (fix_to_s): (2**32).to_s(2) fails with exception where
+	  sizeof(int) == 4 < sizeof(long). [ruby-core:7300]
+
+Fri Feb  3 15:06:50 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/syck/syck.c (syck_move_tokens): should reset p->cursor or etc
+	  even if skip == 0. This causes buffer overrun.
+	  (ex: YAML.load('--- "..' + '\x82\xA0' * 511 + '"'))
+
+Thu Feb  2 23:51:18 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/syck/emitter.c (syck_emitter_write): should not set '\0' on
+	  emitter's marker. if marker points to the end of buffer, this causes
+	  buffer overrun. (ex: YAML.dump("." * 12288))
+
+Thu Feb  2 16:01:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (eval): need not to protect $SAFE value.
+	  [ruby-core:07177]
+
+Thu Feb  2 14:45:53 2006  Ville Mattila  <ville.mattila@stonesoft.com>
+
+	* configure.in: The isinf is not regognized by autoconf
+	  library guesser on solaris 10. [ruby-core:7138]
+
+Wed Feb  1 22:01:47 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* configure.in, hash.c (ruby_setenv): use setenv(3) and unsetenv(3)
+	  where they are supported. modifing environ variable seems to
+	  segfault solaris 10. [ruby-core:7276] [ruby-dev:28270]
+
+	* ruby.c (set_arg0): if use setenv(3), environ space cannot be used
+	  for altering argv[0].
+
+Tue Jan 31 14:46:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (rb_struct_select): update RDoc description.
+	  [ruby-core:7254]
+
+Tue Jan 31 11:58:51 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: add MultiTkIp#eval and bg_eval.
+
+	* ext/tk/lib/tk/namespace.rb: TkNamespace#eval was enbugged at the
+	  last commit. Now it will return a proper object.
+
+Tue Jan 31 00:10:26 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/syck/rubyext.c (syck_resolver_transfer): workaround for SEGV.
+	  ex: ruby -ryaml -e 'YAML.load("!map:B {}")' [ruby-core:7217]
+
+Sat Jan 28 07:56:57 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/rdoc/usage.rb: support "a:0:33" style caller[-1]. In this case
+	  file name is "a:0". I don't know this really happens though...
+	  [ruby-Bugs:3344]
+
+Wed Jan 25 22:29:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, dln.c, file.c, intern.h, missing.h (eaccess): use
+	  system routine if provided.  fixed: [ruby-core:07195]
+
+Sun Jan 22 23:27:13 2006  Go Noguchi  <gonoguti@yahoo.co.jp>
+
+	* lib/test/unit/autorunner.rb (process_args): ignore arguments after
+	  '--' so that test scripts can handle them.  fixed: [ruby-dev:28258]
+
+Sun Jan 22 22:09:52 2006  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (POST_GETCONTEXT): define separately from PRE_GETCONTEXT on
+	  IA64 to avoid reusing variable address.
+
+Sun Jan 22 20:03:35 2006  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (ruby_setjmp): define PRE_GETCONTEXT and POST_GETCONTEXT
+	  instead of FUNCTION_CALL_MAY_RETURN_TWICE.
+	  define PRE_GETCONTEXT to clear carry flag for workaround of
+	  FreeBSD/i386 getcontext/setcontext bug.
+	  [ruby-dev:28263]
+
+Sat Jan 21 00:36:47 2006  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): use only on SPARC and IA64
+	  before gcc 4.0.3.
+	  [ruby-dev:28247]
+
+Thu Jan 19 22:21:23 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mv): should remove file after copying.
+	  [ruby-dev:28223]
+
+Wed Jan 18 23:37:06 2006  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): don't clobber %l7 of SPARC
+	  if enable-shared.
+	  (ruby_setjmp): call FUNCTION_CALL_MAY_RETURN_TWICE after getcontext
+	  too.
+	  reported by Pav Lucistnik and Marius Strobl.
+	  http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
+
+Tue Jan 17 11:32:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/setup.mak (MAKE): workaround for nmake 8.
+
+Tue Jan 17 11:10:21 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{Makefile.sub,setup.mak}: invoke .bat via shell. workaround
+	  for nmake 8.
+
+Mon Jan 16 10:26:23 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/syck/emitter.c (syck_emit_seq, syck_emit_map, syck_emit_item):
+	  should output complex key mark even if map's key is empty seq/map.
+	  [ruby-core:7129]
+
+Sat Jan 14 05:37:06 2006  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (READ_DATA_PENDING, READ_DATA_PENDING_COUNT): defined
+	  for DragonFly BSD 1.4.0.
+
+Sat Jan 14 03:43:24 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* file.c (rb_file_s_chmod): avoid warning where sizeof(int) !=
+	  sizeof(void*).
+
+Fri Jan 13 19:14:56 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/rdoc/diagram.rb:
+	    - properly quote bare element attributes
+	    - terminates dangling elements (e.g. <img>, <br>, <link>, etc)
+	    - converts "CVS" to the more HTML-friendly acronym element
+	    - adds missing type attributes to style elements
+
+	  based on Paul Duncan's patch <pabs@pablotron.org> [ruby-core:7028]
+
+	* lib/rdoc/generators/html_generator.rb: ditto.
+	* lib/rdoc/generators/template/html/hefss.rb: ditto.
+	* lib/rdoc/generators/template/html/html.rb: ditto.
+	* lib/rdoc/generators/template/html/kilmer.rb: ditto.
+
+Thu Jan 12 11:53:08 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/tkballoonhelp.rb: [bug fix] couldn't add to a widget
+	  which is constructed with TkComposite module.
+	  [new feature] support 'command' option which is called just before
+	  popping up the balloon help.
+
+Wed Jan 11 15:00:00 2006  Ville Mattila  <mulperi@iki.fi>
+
+	* io.c (READ_PENDING*): Support solaris 64-bit environments.
+	  Solaris defines a opaque FILE struct when compiling 64 bit
+	  binaries. This means that we dont have access to _ptr etc.
+	  members anymore. The solution by Steven Lumos is to define
+	  FILE64 that has needed members available. I've modified
+	  the origanal patch a bit so that it compiles both with gcc
+	  and now free sun studio 11 compiler and both amd64 and sparc.
+	  NOTE! We have to 64 bit solaris FILE structure time to time
+	  otherwise we'll get breakage.
+	  [ruby-core:7106]
+
+Tue Jan 10 19:42:33 2006  Tanaka Akira  <akr@m17n.org>
+
+	* gc.c (garbage_collect): mark ruby_current_node.
+	  if an exception is raised in a finalizer called written in C by
+	  rb_gc_call_finalizer_at_exit, ruby_set_current_source may use
+	  collected ruby_current_node and mark_source_filename may corrupt
+	  memory.
+
+Tue Jan 10 13:30:34 2006  akira yamada  <akira@ruby-lang.org>
+
+	* ext/syck/rubyext.c (syck_resolver_transfer): should be able to load
+	  !ruby/object:Bignum syntax 1.8.3 dumped. [ruby-core:6159]
+
+Tue Jan 10 12:47:41 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/yaml/rubytypes.rb (Fixnum): Bignum could not be loaded in
+	  ruby 1.8.3/1.8.4. [ruby-core:6115]
+
+	* lib/yaml/rubytypes.rb (Numeric): Subclass of Numeric could not
+	  be dumped properly. [ruby-core:7047]
+
+Tue Jan 10 12:00:48 2006  Aaron Schrab  <aaron @nospam@ schrab.com>
+
+	* lib/yaml/rubytypes.rb (Symbol#yaml_new): YAML loading of quoted
+	  Symbols broken. [ruby-Bugs:2535]
+
+Mon Jan  9 19:54:35 2006  arton  <artonx@yahoo.co.jp>
+
+	* ext/zlib/extconf.rb: zlib compiled DLL version 1.2.3 distributed by
+	  http://www.zlib.net/ has zdll.lib. [ruby-dev:28209]
+
+Mon Jan  9 14:17:12 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag,
+	  (VisualC++6) so use -O2b2xg- if  $(MSC_VER) < 1400. [ruby-core:7040]
+
+Mon Jan  9 14:17:12 2006  Kero van Gelder  <rubyforge @nospam@ kero.tmfweb.nl>
+
+	* lib/webrick/httpservlet/filehandler.rb: fixed typo. [ruby-core:7075]
+
+Sat Jan  7 15:40:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (singleton): get rid of segfault on syntax error.
+	  fixed: [ruby-core:07070]
+
+Fri Jan  6 10:16:20 2006  Steven Lumos  <steven@lumos.us>
+
+	* io.c (READ_DATA_PENDING): defined for 64bit Solaris on SPARC.
+	  [ruby-core:7057]
+	  (READ_DATA_PENDING_COUNT): ditto.
+	  (READ_DATA_PENDING_PTR): ditto.
+
+Sun Jan  1 17:07:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.c (rb_w32_seekdir): should not segfault even if passed
+	  the location which rb_w32_telldir didn't return. [ruby-core:7035]
+	  (I think HEAD implementation is better. but binary compatibility)
+
+	* test/ruby/test_dir.rb: added.
+
+Sat Dec 31 22:57:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_save_context): should not recycle scope object used
+	  in a thread.  fixed: [ruby-dev:28177]
+
+Fri Dec 30 18:22:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (garbage_collect): mark objects refered from aborting threads.
+	  [ruby-dev:28190]
+
+	* win32/Makefile.sub: VC++8 support.
+
+Fri Dec 30 14:24:53 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dir.c (glob_helper): do not use TRUE for djgpp.
+
+Fri Dec 30 04:54:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (eaccess): workaround for VC++8 runtime.
+
+	* win32/win32.c (ioinfo): VC++8 support.
+
+Thu Dec 29 23:59:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_gc_mark_threads): leave unmarked threads which won't wake
+	  up alone, and mark threads in the loading table.  [ruby-dev:28154]
+
+	* eval.c (rb_gc_abort_threads), gc.c (gc_sweep): kill unmarked
+	  threads.  [ruby-dev:28172]
+
+Thu Dec 29 17:02:07 2005  Tanaka Akira  <akr@m17n.org>
+
+	* test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
+	  "miniruby".  [ruby-dev:28140]
+
+Tue Dec 27 16:59:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/drb/drbtest.rb (DRbService::self.ext_service): increase
+	  timeout limit.  a patch from Kazuhiro NISHIYAMA
+	  <zn at mbf.nifty.com>. [ruby-dev:28132]
+
+Tue Dec 27 08:29:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
+	  treat wildcard character in commonName. [ruby-dev:28121]
+
+Mon Dec 26 22:32:47 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval), gc.c (gc_mark_children), node.h (NEW_ALIAS,
+	  NEW_VALIAS), parse.y (fitem): allow dynamic symbols to
+	  NODE_UNDEF and NODE_ALIAS.
+	  backported from trunk.  fixed: [ruby-dev:28105]
+
+Mon Dec 26 08:50:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ev_const_get): fixed a bug in constant reference during
+	  instance_eval.  [yarv-dev:707]
+
+	* eval.c (ev_const_defined): ditto.
+
+	* lib/yaml.rb (YAML::add_domain_type): typo fixed.  a patch from
+	  Joel VanderWerf <vjoel at path.berkeley.edu>.
+	  [ruby-talk:165285] [ruby-core:6995]
+
+Sat Dec 24 18:58:14 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* stable version 1.8.4 released.
+
+Fri Dec 23 10:30:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/digest/sha2/sha2.c (ULL): support AIX C.  a patch from
+	  Kailden <kailden at gmail.com>.  [ruby-core:06984]
+
+Wed Dec 21 16:53:06 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* file.c (w32_io_info): should return handle because FileIndex is
+	  valid only while file is open. [ruby-dev:28088]
+
+Wed Dec 21 14:53:26 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (test_kernel_open): use File.identical?.
+	  [ruby-talk:171804]
+
+Tue Dec 20 22:41:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (eval_under_i): evaluate source in caller's frame.
+	  [ruby-dev:28076]
+
+	* eval.c (rb_call_super): use original method name on exception.
+	  [ruby-dev:28078]
+
+Tue Dec 20 13:11:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/syck/rubyext.c: fixed GC problem (backported HEAD 1.55 - 1.62)
+	  [ruby-dev:27839]
+
+	* ext/syck/syck.h (S_FREE): small hack. no need to check if pointer is
+	  NULL or not before S_FREE.
+
+	* st.c: uses malloc instead of xmalloc to avoid GC. syck uses st_insert
+	  in gram.c to insert node from rb_syck_bad_anchor_handler into
+	  SyckParser's hash table. if GC occurs in st_insert, it's not under
+	  SyckParser's mark system yet. so RString can be released wrongly.
+	  [ruby-dev:28057]
+
+Tue Dec 20 12:53:23 2005  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/rubyext.c (syck_emitter_reset): to ensure compatibility
+	  with previous Ruby versions, documents are no longer headless.
+
+Tue Dec 20 01:46:48 2005  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (rb_f_backquote): fix a GC problem on
+	  IA64 with gcc 4.0.3 20051216 (prerelease) -O3.
+
+Mon Dec 19 23:32:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_symname_p): fixed wrong validation.  [ruby-dev:28047]
+
+Sat Dec 17 03:57:01 2005  Tanaka Akira  <akr@m17n.org>
+
+	* bignum.c (rb_big_rshift): fix a GC problem on
+	  IA64 with gcc 4.0.3 20051216 (prerelease).
+
+Sat Dec 17 03:30:23 2005  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (bmcall): fix a GC problem by tail call on
+	  IA64 with gcc 4.0.3 20051216 (prerelease).
+
+Fri Dec 16 00:54:06 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* signal.c (Init_signal): revert C++ style comment.
+	  [ruby-dev:28041]
+
+Thu Dec 15 12:35:14 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/tmpdir.rb: merged RDoc patch from Eric Hodel <drbrain at
+	  segment7.net>.  [ruby-core:06894]
+
+Thu Dec 15 01:33:31 2005  Tanaka Akira  <akr@m17n.org>
+
+	* ext/zlib/zlib.c (zstream_run): fix a GC problem by tail call on
+	  x86_64 with gcc 4.0.3 20051111 (prerelease) (Debian 4.0.2-4)
+
+Wed Dec 14 12:11:46 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* test/gdbm/test_gdbm.rb: specify pid for the argument of
+	  Process.wait.  workaround for Cygwin.
+
+Wed Dec 14 12:01:26 2005  Tanaka Akira  <akr@m17n.org>
+
+	* marshal.c (r_object0): fix a GC problem for reading a bignum on
+	  IA64 with gcc 3.3.5 (Debian 1:3.3.5-13).
+
+Tue Dec 13 12:23:47 2005  Tanaka Akira  <akr@m17n.org>
+
+	* re.c (rb_reg_regcomp): fix a GC problem on x86_64 with
+	  gcc 3.3.5 (Debian 1:3.3.5-13).
+
+Tue Dec 13 01:44:16 2005  Tanaka Akira  <akr@m17n.org>
+
+	* array.c (rb_ary_diff): fix a GC problem on IA64 with
+	  gcc 3.3.5 (Debian 1:3.3.5-13).
+	  When rb_ary_push is called, there was no register which contains
+	  `hash' but `&RHASH(hash)->tbl' instead.
+
+Tue Dec 13 00:08:09 2005  Tanaka Akira  <akr@m17n.org>
+
+	* sprintf.c (rb_str_format): fix a GC problem.
+	  [ruby-dev:28001]
+
+Mon Dec 12 15:54:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* test/openssl/test_ssl.rb (test_parallel): call GC.start to close
+	  unused files. [ruby-dev:27981]
+
+Mon Dec 12 00:33:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/digest/digest.c (rb_digest_base_s_digest): add volatile to
+	  protect temporary context object.  [ruby-dev:27979]
+
+	* ext/iconv/iconv.c (Init_iconv): rb_gc_register_address() should
+	  be called before actual variable initialization.
+	  [ruby-dev:27986]
+
+Fri Dec  9 23:31:02 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rexml/encoding.rb (encoding=): give priority to particular
+	  conversion to iconv.  [ruby-core:06520]
+
+Thu Dec  8 02:07:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (umethod_bind): adjust invoking class for module method.
+	  [ruby-dev:27964]
+
+Thu Dec  8 00:40:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (call_trace_func): klass parameter should be a
+	  class/module that defines calling method.  [ruby-talk:169307]
+
+Wed Dec  7 17:10:27 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* sprintf.c (rb_f_sprintf): [ruby-dev:27967]
+
+Wed Dec  7 15:31:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): integer overflow check added.
+
+	* sprintf.c (GETASTER): ditto.
+
+Wed Dec  7 01:02:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/README.macosx-aqua: [new document] tips to avoid the known
+	  bug on platform specific dialogs of Tcl/Tk Aqua on MacOS X.
+
+	* ext/tk/tcltklib.c: fix bug on switching threads and waiting on the
+	  deleted interpreter on vwait and tkwait command.
+
+	* ext/tk/lib/multi-tk.rb: kill the meaningless loop for the deleted Tk
+	  interpreter.
+
+	* ext/tk/sample/demos-jp/image3.rb: [bug fix] wrong argument.
+
+	* ext/tk/sample/demos-en/image3.rb: ditto.
+
+	* ext/tk/sample/demos-jp/menu.rb: fix message for MacOS X.
+
+	* ext/tk/sample/demos-jp/menu8x.rb: ditto.
+
+	* ext/tk/sample/demos-en/menu.rb: ditto.
+
+Tue Dec  6 16:37:57 2005  Yuya Nishida  <yuya@j96.org>
+
+	* eval.c (exec_under): avoid accessing ruby_frame->prev.
+	  [ruby-dev:27948]
+
+Thu Dec  1 00:50:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_funcall2): allow to call protected methods.
+	  fixed: [ruby-dev:27890]
+
+Wed Nov 30 23:52:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (NEWHEAP, ADD2HEAP): set count after pointer was set.
+	  fixed: [ruby-dev:27896]
+
+Wed Nov 30 13:43:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-expr-beg): support $! at the end of
+	  expression.   [ruby-dev:27868]
+
+Mon Nov 28 18:55:43 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (init_inetsock_internal): remove setting
+	  SO_REUSEADDR option on server socket on Cygwin.
+	  fixed: [ruby-core:6765] ([ ruby-Bugs-2872 ])
+
+Mon Nov 28 13:08:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken
+	  error message on bccwin32 + winsock)
+
+Mon Nov 28 09:21:49 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/mkmf.rb (create_makefile): should not change sodir with
+	  dir.gsub!. (bccwin32 failed to install third party exntesions)
+	  [ruby-dev:27834]
+
+Sun Nov 27 00:56:13 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/wsdl/xmlSchema/complexContent.rb: missing
+	  ComplexContent#elementformdefault method.
+
+Sat Nov 26 19:57:45 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dln.c (conv_to_posix_path): should initialize posix.
+
+Thu Nov 24 21:05:58 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* configure.in (AC_CHECK_FUNCS): need to check link().
+	  fixed: [ruby-dev:27814]
+
+Thu Nov 24 01:22:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* file.c (w32_io_info): CreateFile failed on Win9x if file was already
+	  opened. (FILE_SHARE_READ was needed, but actually I don't understand
+	  the flags of CreateFile well...)
+
+Wed Nov 23 20:59:01 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: add Tk.pkgconfig_list and Tk.pkgconfig_get
+	  [Tk8.5 feature].
+
+	* ext/tk/lib/tk/text.rb: supports new indices modifires on a Text
+	  widget [Tk8.5 feature].
+
+	* ext/tk/lib/tk/virtevent.rb: add TkNamedVirtualEvent.
+
+	* ext/tk/lib/tk/autoload.rb: ditto.
+
+	* ext/tk/lib/tk/event.rb: add :data key for virtual events [Tk8.5
+	  feature].
+
+Wed Nov 23 18:55:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* file.c (w32_io_info): should not call GetFileInformationByHandle
+	  for pipe.
+
+	* file.c (w32_io_info): checks return value from rb_w32_get_osfhandle.
+
+	* file.c (w32_io_info): now can identify directory on WinNT.
+
+Wed Nov 23 03:40:49 2005  Guy Decoux  <ts@moulon.inra.fr>
+
+	* re.c (KR_REHASH): should cast to unsigned for 64bit CPU.
+	  [ruby-core:06721]
+
+Wed Nov 23 11:01:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* intern.h, file.c: failed to compile on windows.
+
+Wed Nov 23 07:26:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: check for X509V3_EXT_nconf_nid.
+
+	* ext/openssl/ossl_x509ext.c (MakeX509ExtFactory): should use
+	  OPENSSL_malloc to allocate X509V3_CTX.
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext): use
+	  X509V3_EXT_nconf_nid to avoid SEGV (and to build extensions which
+	  values are placed in separate section).
+
+	* test/openssl/test_x509ext.rb: new file.
+
+Wed Nov 23 01:22:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (test_identical): test if two files are identical.
+
+	* file.c (rb_f_test): support DOSISH systems where st_ino is not
+	  reliable.  fixed: [ruby-core:06672]
+
+	* win32.h, win32.c (rb_w32_osid): check the running platform.
+
+Tue Nov 22 23:52:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb: match incomplete (in current enconding) multibyte
+	  string.  http://inamode6.tokuhirom.dnsalias.org/show/1551
+
+Tue Nov 22 18:36:11 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.c (winnt_stat): set mapped errno instead of ENOENT.
+
+Tue Nov 22 14:46:57 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_file_s_basename): skip slashes just after UNC top slashes.
+
+	* test/ruby/test_path.rb (test_dirname, test_basename): follow new
+	  spec. and add new tests.
+
+Tue Nov 22 13:18:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.c (rb_w32_stat): Dir.chdir('//server/shared');
+	  p Dir.glob('*') should work on WinNT. (implemented our own
+	  stat(2) on WinNT) [ruby-list:41552] [ruby-dev:27711]
+
+Tue Nov 22 02:31:53 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE
+	  is not defined).
+
+Tue Nov 22 01:45:21 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_basename): DOSISH_UNC is defined on cygwin but
+	  DOSISH is not.  fixed: [ruby-dev:27797]
+
+Mon Nov 21 22:50:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_path_skip_prefix, rb_file_s_basename): UNC without path
+	  should not be splitted.  fixed: [ruby-dev:27776] [ruby-dev:27786]
+
+	* parse.y (dsym): prohibit empty symbol literal by interpolation.
+	  fixed: [ruby-talk:166529]
+
+Mon Nov 21 16:03:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/setup.mk: findstr doesn't exist on win9x.
+	  fixed: [ruby-dev:27756]
+
+Sun Nov 20 22:34:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_symname_p): [ not followed by ] is not valid symbol.
+	  fixed: [ruby-talk:166520]
+
+Sat Nov 19 19:57:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::ln): ln documentation fix.
+	  [ruby-core:06661]
+
+Sat Nov 19 07:34:32 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/font.rb: remove dependency on Ruby's version (1.8
+	  or 1.9).
+
+	* ext/tk/lib/tkextlib/ICONS/icons.rb: ditto.
+
+	* ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
+
+Fri Nov 18 17:57:08 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_file_s_dirname): should use skipprefix for UNC path.
+	  pointed out by nobu ([ruby-dev:27744]). fixed: [ruby-core:5076]
+
+Fri Nov 18 17:35:09 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: add restriction to access the entried
+	  command table and manipulate other IPs (for reason of security).
+	  Now, a IP object can be controlled by only its master IP or the
+	  default IP.
+
+	* ext/tk/lib/remote-tk.rb: add restriction to manipulate.
+
+	* ext/tk/tcltklib.c (ip_is_slave_of_p): add TclTkIp#slave_of?(ip)
+	  to check manipulability.
+
+	* ext/tk/lib/tk.rb: bug fix on handling of Tcl's namespaces.
+
+	* ext/tk/lib/tk/namespace.rb: ditto.
+
+Fri Nov 18 17:26:06 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_file_s_dirname): added checks for some patterns with drive
+	  letter. fixed: [ruby-dev:27738]
+
+	* test/ruby/test_path.rb (test_dirname): added tests for above
+	  patterns.
+
+Fri Nov 18 12:18:02 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.h (S_IFIFO): r,w = IO.pipe; r.stat.pipe? now
+	  returns true on VisualC++6.
+
+Wed Nov 16 23:24:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (static-ruby): overridable.
+
+	* ext/extmk.rb (parse_args): force to link extensions statically only
+	  if static is given for extstatic.
+
+	* ext/extmk.rb (RUBY, RUBYW): overridable.
+
+Tue Nov 15 23:46:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/find.rb (Find::find): should not ignore symbolic links to
+	  non-existing files.  [ruby-talk:165866]
+
+Tue Nov 15 16:23:26 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* array.c (rb_ary_fill): previous commit disabled this usage:
+
+	    a = [0,1,2,3,4,5,6,7,8,9]
+	    a.fill {|i| a[i] * 10} #=> [nil, nil, ...., nil]
+
+	  previous commit has the advantage of early garbage collection, but
+	  potensially this would break some script. so I reverted behavior.
+
+Tue Nov 15 16:04:10 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* array.c (rb_ary_fill): tail elements were vanished when the middle
+	  part of array was filled. (ie: [0,1,2,3,4].fill(-1,2,1) => [0,1,-1])
+
+	* test/ruby/test_array.rb (test_fill): added.
+
+Tue Nov 15 14:39:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_fill): should adjust array length correctly when
+	  an array is expanded in the fill process.  [ruby-core:06625]
+
+Mon Nov 14 23:49:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_readlink): ERANGE will occur only on GPFS.
+	  [ruby-dev:27699]
+
+Mon Nov 14 17:36:22 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_first): RDoc update from Daniel Berger
+	  <djberg96@yahoo.com>.  [ruby-core:06577].
+
+Fri Nov 11 10:31:44 2005  Zach Dennis  <zdennis@mktec.com>
+
+	* ext/socket/socket.c: Socket Documentation. [ruby-core:6552]
+
+Fri Nov 11 08:20:56 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (OUTFLAG): keep trailing spaces.  [ruby-dev:27666]
+
+	* mkconfig.rb: substitution refereces added.
+
+Fri Nov 11 07:44:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* configure.in: undef HAVE_LINK on BeOS. (link(2) always returns
+	  EINVAL, and this causes error in test/fileutils.)
+
+	* file.c: overwride chown(2) and fchown(2) on BeOS. (these functions
+	  should not change user/group id if -1 is passed as corresponding
+	  argument, and this causes error in test/fileutils too)
+	  [ruby-dev:27672]
+
+	* file.c (rb_file_s_link): checks HAVE_LINK.
+
+Tue Nov  8 15:32:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/drb/ssl.rb (DRb::SSLConfig#accept): fixed typo.
+	  [ruby-dev:27560] [ruby-core:4627]
+
+Mon Nov  7 13:43:51 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/stubs.c (_nativethread_consistency_check): use simpler
+	  (low cost) way to check whether the Tcl interpreter was compiled
+	  with threads enabled of not.
+
+	* ext/tk/tcltklib.c: reduce warnings.
+
+	* ext/tk/tkutil/tkutil.c: ditto.
+
+Mon Nov  7 00:06:58 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/yaml.rb: removed :nodoc: to generate Kernel doc. [ruby-core:6324]
+
+Sun Nov  6 23:39:13 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (Iconv::BrokenLibrary): exception when detected a
+	  bug of underlying library.
+
+Sun Nov  6 21:46:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch
+	  interpreter after initialization is done. [ruby-dev:27638]
+
+Sun Nov  6 20:13:27 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_readlink): readlink(2) on AIX fails with ERANGE if
+	  buffer size is less than required.  fixed: [ruby-dev:27634]
+
+Wed Nov  2 20:25:28 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/extconf.rb: ext/tk/extconf.rb: change the check parameter
+	  for Win32.
+
+Wed Nov  2 20:14:53 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib: merge into ext/tk and remove.
+
+Wed Nov  2 19:03:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_rbUpdateObjCmd,
+	  ip_rb_threadUpdateObjCmd): passed improper flags to DoOneEvent().
+
+	* ext/tk/tkutil.c: use rb_obj_respond_to() instead of rb_respond_to().
+
+Tue Nov  1 14:20:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call_super): should call method_missing if super is
+	  called from Kernel method.
+
+	* eval.c (exec_under): frame during eval should preserve external
+	  information.
+
+Tue Nov  1 10:50:17 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: should check ERR_peek_last_error().
+	  [ruby-dev:27597]
+
+	* ext/openssl/ossl.c (ossl_raise): ditto.
+
+Mon Oct 31 17:34:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in: use proper option for Sun linker. A patch from
+	  Shinya Kuwamura <kuwa at labs.fujitsu.com>.  [ruby-dev:27603]
+
+Mon Oct 31 11:27:22 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb (test_s_open_error):
+	  skip on Win32/DOS platforms.
+
+Mon Oct 31 05:49:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_update): input data must
+	  not be empty. [ruby-talk:161220]
+
+	* test/openssl/test_cipher.rb: add test for Cipher#update("").
+
+Mon Oct 31 05:37:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpservlet/cgihandler.rb
+	  (WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie:
+	  header field should be splited into each cookie.  [ruby-Bugs:2199]
+
+	* lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookie): new method
+	  to parse the value of Set-Cookie: header field.
+
+	* test/webrick/test_cookie.rb, test/webrick/test_cgi.rb,
+	  test/webrick/webrick.cgi: add some test for cookie.
+
+Mon Oct 31 03:19:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_readline): type check.
+	  [ruby-core:6089]
+
+	* numeric.c (fix_rshift): RDoc fix.  [ruby-core:6351]
+
+	* util.h (strtod): add #undef for platforms defines strtod()
+	  macro.   [ruby-dev:27563]
+
+Mon Oct 31 02:35:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/ruby/test_float.rb (test_precision): test by assert_in_delta.
+	  [ruby-dev:27575]
+
+Sat Oct 29 01:58:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/etc/etc.c: document update from mathew <meta@pobox.com>.
+	  [ruby-core:06473]
+
+	* ext/fcntl/fcntl.c: ditto.
+
+Thu Oct 27 16:45:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (scan_once): wrong condition to use mbclen2().
+	  [ruby-dev:27535]
+
+Wed Oct 26 09:27:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/syck/implicit.c (syck_type_id_to_uri): should return
+	  newly allocated memory. otherwise, type_id will be freed
+	  twice. [ruby-dev:27384] [ruby-core:6385]
+
+Wed Oct 26 09:04:51 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ruby.h (Qfalse, Qtrue, Qnil, Qundef): make sure these immediate
+	  values have VALUE type. there is an environment where sizeof(VALUE)
+	  != sizeof(int) like IA64. if 32bit integer (Qtrue) is passed to ANYARGS
+	  and received by 64bit integer (VALUE), upper bits may have garbage value.
+	  [ruby-dev:27513]
+
+Wed Oct 26 01:58:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_EXTERN): macro to export symbols in shared
+	  library.  [ruby-core:05528]
+
+	* defines.h, {bcc32,win32,wince}/Makefile.sub (RUBY_EXTERN): moved to
+	  configuration pass.
+
+	* ext/extmk.rb (extmake): RUBY_EXTERN for static linked extensions.
+
+Tue Oct 25 15:32:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rational.rb: applied documentation patch from Gavin Sinclair
+	  <gsinclair@gmail.com>.  [ruby-core:06364]
+
+	* lib/irb.rb (IRB::Irb::eval_input): handle prompts with newlines
+	  in irb auto-indentation mode.  [ruby-core:06358]
+
+Tue Oct 25 02:12:08 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::LABEL_LIST_RE):
+	  reduce redundant backtrack.  [ruby-talk:161771]
+
+Tue Oct 25 00:27:35 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/*: RDoc documentation from Eric Hodel
+	  <drbrain@segment7.net> added.
+
+Mon Oct 24 21:14:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, io.c: use sys/syscall.h if syscall.h is not available.
+	  [ruby-core:06247]
+
+Mon Oct 24 20:49:45 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
+	  fixed: [ruby-list:40058], [ruby-dev:27479]
+
+Mon Oct 24 07:57:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
+	  typo fixed.  [ruby-talk:162187]
+
+	* ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
+	  ditto.  [ruby-core:06359]
+
+Sun Oct 23 21:50:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/enumerator/enumerator.c: applied documentation patch from
+	  James Edward Gray II <james@grayproductions.net>.
+	  [ruby-core:06348]
+
+Sun Oct 23 07:11:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/extconf.rb: improve messages [ruby-core:06325].
+
+	* ext/tk/lib/tk.rb, ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/entry.rb,
+	  ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/image.rb,
+	  ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/labelframe.rb,
+	  ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/menu.rb,
+	  ext/tk/lib/tk/radiobutton.rb, ext/tk/lib/tk/scale.rb,
+	  ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tk/text.rb,
+	  ext/tk/lib/tk/toplevel.rb: improve conversion of option values.
+
+	* ext/tk/lib/tkextlib/*: ditto.
+
+	* ext/tk/lib/tkextlib/*: update to support ActiveTcl8.4.11.2.
+
+	* ext/tk/lib/tkextlib/trofs/*: support Trofs 0.4.3.
+
+	* ext/tk/lib/tkextlib/tile/*: support Tile 0.7.2.
+
+	* ext/tk/lib/tkextlib/vu/*: support vu 2.3.0.
+
+	* ext/tk/lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3).
+
+Sat Oct 22 23:54:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb, lib/mkmf.rb (with_config): support --with-extension
+	  options.  [ruby-dev:27449]
+
+Sat Oct 22 13:26:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (sym_inspect), parse.y (parser_yylex, rb_symname_p): check
+	  if valid as a symbol name more strictly.  [ruby-dev:27478]
+
+	* test/ruby/test_symbol.rb: tests for [ruby-core:03573].
+
+	* time.c (rb_strftime): removed meaningless volatile modifiers, and
+	  concatenate successive nul characters at once.  [ruby-dev:27472]
+
+Fri Oct 21 19:21:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
+
+Fri Oct 21 17:49:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bin/erb (ERB::Main::run): typo fixed.  [ruby-core:06337]
+
+Fri Oct 21 15:27:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bignum.c (bignew_1): convertion from `int' to `char' discards
+	  upper bits, (ie. (char)0xff00 -> 0) so it's better to test if
+	  nonzero and set 0 or 1 instead of simply casting ... as a flag usage.
+	  (but I believe this won't cause actual bug in current implementation)
+	  [ruby-dev:27055]
+
+	* time.c: should use LONG_LONG instead of `long long'.
+
+Thu Oct 20 09:37:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/mkmf.rb (create_makefile): Borland make seems not to allow
+	  empty dependency list. If this change is not good, please correct
+	  it.
+
+Thu Oct 20 07:55:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): get rid of a restriction
+	  of Borland make.  fixed: [ruby-dev:27460]
+
+Thu Oct 20 00:13:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* rubysig.h (CHECK_INTS): fix typo.
+
+Wed Oct 19 23:58:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): do not create unnecessary empty
+	  directories.  fixed: [ruby-dev:27451]
+
+Wed Oct 19 19:26:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_gc_mark_parser): get rid of segfault with old yacc.
+	  fixed: [ruby-dev:27439]
+
+Wed Oct 19 08:28:32 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_join): elements may contain null pointer strings.
+	  report and fixed by Lloyd Zusman (hippoman): [ruby-core:06326]
+
+Wed Oct 19 02:34:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c, gc.c, time.c: made internal symbols static.  [ruby-dev:27435]
+
+Wed Oct 19 01:27:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): numeric literal inside character class
+	  disabled succeeding backtrack.  fixed: [ruby-list:41328]
+
+Mon Oct 17 21:18:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_heap): byacc never free parser stack.
+	  fixed: [ruby-dev:27428]
+
+Mon Oct 17 16:04:47 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (chmod_internal, lchmod_internal): fixed type of 2nd argument.
+
+Sun Oct 16 22:16:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: omit non-existing directories.
+
+Sun Oct 16 14:30:05 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/rinda.rb (Rinda::Tuple#initialize): check remote hash
+	  tuple. fixed: [ruby-list:41227]
+
+	* test/rinda/test_rinda.rb: test it.
+
+Sun Oct 16 03:38:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* rubysig.h (CHECK_INTS): prevent signal handler to run during
+	  critical section.  [ruby-core:04039]
+
+	* eval.c (load_wait): need not to call rb_thread_schedule()
+	  explicitly.  [ruby-core:04039]
+
+	* eval.c (rb_thread_schedule): clear rb_thread_critical.
+	  [ruby-core:04039]
+
+Sat Oct 15 19:56:38 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* bin/erb: typo fixed, again. thanks, Doug Kearns.
+
+Fri Oct 14 22:08:26 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (ioctl): should set errno.
+
+Fri Oct 14 16:57:32 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/config.rb (Config::FileHandler): :UserDir should be nil.
+	  It is harmful to permit the access to ~/public_html by default.
+	  suggested by Hiroyuki Iwatsuki.
+
+Thu Oct 13 23:29:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (HEAPCNT): bison allocates indivisible size.
+	  fixed: [ruby-core:06261]
+
+	* io.c, pack.c, ext/syck/rubyext.c, ext/syck/syck.h, missing/isinf.c:
+	  get rid of warnings.  fixed: [ruby-core:06247]
+
+Wed Oct 12 12:52:57 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl.c (Init_openssl): should call
+	  OpenSSL_add_ssl_algorithms().
+
+Wed Oct 12 11:08:54 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* file.c (rb_f_test): typo in RDoc comments.
+
+Tue Oct 11 21:41:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_obj_respond_to): check if obj responds to the given
+	  method with the given visibility.  [ruby-dev:27408]
+
+	* eval.c (rb_respond_to): conform to Object#respond_to?.  [ruby-dev:27411]
+
+Tue Oct 11 00:01:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* st.c (st_free_table): do not call free() but xfree().
+	  [ruby-core:06205]
+
+Sat Oct  8 20:04:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (Init_Binding): add Binding#dup method.  [yarv-dev:666]
+
+	* parse.y (rb_parser_malloc, rb_parser_free): manage parser stack on
+	  heap.  [ruby-list:41199]
+
+	* ext/iconv/charset_alias.rb: parse config.charset_alias file directly.
+
+Fri Oct  7 09:54:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices may
+	  not be parsed correctly.  A patch from August Z. Flatby
+	  (augustzf) in [ruby-Patches-2595].  [ruby-core:06183]
+
+Thu Oct  6 20:12:16 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c (strscan_free): remove useless code.
+	  [ruby-dev:26368] [ruby-dev:27389]
+	  (backported from trunk, rev 1.22)
+
+Wed Oct  5 04:42:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/xmlrpc/server.rb (XMLRPC::Server#initialize): should mount the
+	  servlet on "/".
+
+Wed Oct  5 03:59:09 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
+	  of "join".
+
+Mon Oct  3 00:04:00 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* pack.c (EXTEND16): [ruby-dev:27383]
+
+Thu Sep 29 10:26:18 2005  Tanaka Akira  <akr@m17n.org>
+
+	* ext/dl/dl.c (rb_io_to_ptr): abolish sizeof(FILE).
+	  [ruby-dev:27317]
+
+Thu Sep 29 07:22:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* evalc. (rb_f_send): underscores need to be escaped.
+	  fixed by Doug Kearns.  [ruby-core:06053]
+
+Thu Sep 29 00:57:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ev_const_get), variable.c (rb_const_get_0): retry only when
+	  autoload succeeded.
+
+	* variable.c (rb_autoload_load): now return true if autoload
+	  succeeded.  fixed: [ruby-dev:27331]
+
+Wed Sep 28 23:42:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (apply2files): add prototype.
+
+	* file.c (rb_stat_inspect): constified.
+
+	* class.c (rb_mod_init_copy, rb_class_init_copy), file.c (rb_stat_init_copy),
+	  numeric.c (num_init_copy), object.c (rb_obj_init_copy, Init_Object),
+	  re.c (match_init_copy, rb_reg_init_copy), time.c (time_init_copy):
+	  undocumented.
+
+Wed Sep 28 23:09:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb: document update from James Edward Gray II
+	  <james@grayproductions.net>.  [ruby-core:06027]
+
+Wed Sep 28 15:14:19 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (WEBrick::CGI#start): req.query_string should
+	  refer the value of QUERY_STRING. [ruby-list:41186]
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#query_string=):
+	  add new method.
+
+Wed Sep 28 10:45:44 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: cannot compile with Tcl/Tk8.0.x
+	  [ruby-dev:27335].
+
+Wed Sep 28 08:12:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (read_buffered_data): check if reached EOF.  fixed: [ruby-dev:27334]
+
+Wed Sep 28 07:56:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/yaml/basenode.rb (YAML::BaseNode::match_segment): fix typo.
+	  [ruby-dev:27237], [ruby-core:05854]
+
+	* lib/yaml/tag.rb (Module#yaml_as): suppress warnings.
+
+	* lib/yaml/types.rb (YAML::PrivateType, YAML::DomainType): ditto.
+
+Wed Sep 28 03:23:35 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* rubysig.h: fixed build problem with --enable-pthread on platforms
+	  which don't have setitimer().
+
+Mon Sep 26 22:32:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (set_trace_func): add rb_secure(4) to prevent adding
+	  tracing function.
+
+Sun Sep 25 12:05:10 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* bin/erb: typo fixed.
+
+Sun Sep 25 01:46:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-calculate-indent): arrange deep-indent
+	  closing parenthesis at same column as the opening.
+
+Sun Sep 25 00:42:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-expr-beg): deal with heredoc separately.
+	  fixed: [ruby-list:41168]
+
+	* misc/ruby-mode.el (ruby-calculate-indent): not to deepen indent
+	  level for continuous line inside parentheses.
+	  http://nabeken.tdiary.net/20050915.html#p02
+
+Sun Sep 25 00:18:11 2005  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (unknown_node): show more information.  [ruby-dev:26196]
+
+Sat Sep 24 08:56:01 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (cd): no longer accept :noop option, related
+	  code is useless (backported from trunk, rev 1.67).
+	  [ruby-core:05858] [ruby-Bugs:2494]
+
+Sat Sep 24 08:38:07 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose,
+	  DryRun (backported from trunk, rev 1.66). [ruby-core:05954]
+
+	* test/fileutils/test_nowrite.rb: test it.
+
+	* test/fileutils/test_dryrun.rb: new file.
+
+	* test/fileutils/test_verbose.rb: new file.
+
+Sat Sep 24 02:40:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb: document update from James Edward Gray II
+	  <james@grayproductions.net>.  [ruby-core:05942]
+
+Thu Sep 22 23:36:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (find_executable0): default path if environment is not
+	  set.  [ruby-dev:27281]
+
+Thu Sep 22 16:33:12 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/readline/test_readline.rb (TestReadline::replace_stdio):
+	  merged the patch of [ruby-dev:25232] instead of [ruby-dev:25223].
+
+Wed Sep 21 23:30:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (configuration): generalized nmake dependent code.
+
+Wed Sep 21 09:07:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* stable version 1.8.3 released.
+
+Wed Sep 21 08:52:25 2005  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/token.c: correctly compute identation of a block
+	  scalar's parent node. [ruby-talk:150620]
+
+Wed Sep 21 08:20:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.EXT, README.EXT.ja: add new features.
+
+Wed Sep 21 07:43:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (default_argv, Arguable#options): defaults strings
+	  to be parsed to Arguable instance.
+
+Wed Sep 21 02:44:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (path_check_0): disallow sticky world writable directory
+	  in PATH (and $LOAD_PATH).  [ruby-dev:27226]
+
+	* file.c (fpath_check): typo fixed.
+
+Tue Sep 20 22:29:49 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/wsdl/simpletype/rpc/test_rpc.rb, test/wsdl/ref/test_ref.rb,
+	  test/wsdl/any/test_any.rb test/soap/wsdlDriver/test_calc.rb:
+	  suppress deliberate warnings with $VERBOSE = nil.
+
+Tue Sep 20 21:26:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/wait/lib/nonblock.rb: disable on platforms non-blocking flag
+	  is not available.  fixed: [ruby-dev:27187]
+
+Tue Sep 20 18:23:04 2005  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (thread_mark): mark th->last_status.  [ruby-dev:27179]
+
+Tue Sep 20 18:20:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/yaml.rb: require 'yaml/constants'.  [ruby-core:5776]
+
+Tue Sep 20 17:48:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): add charset
+	  information to content-type header.[ruby-core:5127]
+
+	* lib/xmlrpc/server.rb (CGIServer::serve): ditto.
+
+	* lib/xmlrpc/server.rb (ModRubyServer::serve): ditto.
+
+	* lib/xmlrpc/server.rb (WEBrickServlet::service): ditto.
+
+Tue Sep 20 17:34:46 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/webrick/test_cgi.rb: set ENV["PATH"] to CGIEnvPath on
+	  windows. bcc32's runtime is not installed into system directory,
+	  so it cannot be found without this setting. [ruby-dev:27166]
+
+Tue Sep 20 17:10:38 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/dbm/test_dbm.rb (TestDBM::test_s_open_error): remove
+	  test_s_open_error test to detect duplicate open.
+	  [ruby-dev:27202]
+
+Tue Sep 20 17:08:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* io.c: PIPE_BUF is not defined on BeOS. use _POSIX_PIPE_BUF instead.
+	  [ruby-dev:27185]
+
+Tue Sep 20 16:53:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/readline/test_readline.rb (TestReadline::replace_stdio):
+	  BSD seek support from [ruby-dev:25223].  fixed: [ruby-dev:27150]
+
+Tue Sep 20 15:39:40 2005  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/emitter.c (syck_scan_scalar): prevent indicators from
+	  appearing alone or at the end of plain scalars. [ruby-core:5826]
+
+	* ext/syck/emitter.c (syck_emit_scalar): treat typed scalar nodes
+	  as complex keys.
+
+	* lib/syck.h: version 0.60.
+
+	* lib/yaml/basenode.rb (YAML::BaseNode#at): transform keys during
+	  key searches.
+
+	* ext/syck/rubyext.c: loading of binary-typed nodes.  prevent
+	  emission of plain strings that look like symbols, but which aren't.
+
+Tue Sep 20 05:50:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/xmlrpc/test_webrick_server.rb (setup_http_server):
+	  should not include 'webrick/https' unless 'use_ssl' because
+	  it fails where openssl is not installed.
+
+Tue Sep 20 00:34:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_close): call rb_io_close() directly if io is a T_FILE
+	  object.  [ruby-dev:27156]
+
+Mon Sep 19 19:09:08 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* file.c (rb_file_chown): should accept nil. [ruby-dev:27171]
+	  (backport from trunk, rev 1.208)
+
+Mon Sep 19 18:35:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/dl/dl.c (rb_io_to_ptr): fix DragonFlyBSD support.
+	  [ruby-dev:27151]
+
+Mon Sep 19 14:17:04 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/syck/emitter.c (syck_emit): passing an int* value to the
+	  long* parameter causes unaligned access on LP64 systems.
+	  [ruby-dev:27161]
+
+Mon Sep 19 13:44:03 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: avoid core dump with WIN32OLE_EVENT.
+	  [ruby-dev:27133]
+
+Mon Sep 19 10:36:06 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (cp_r): default is :dereference_root=>true for
+	  backward compatibility. [ruby-dev:27145]
+
+	* test/fileutils/test_fileutils.rb (test_cp_r): test it.
+
+Mon Sep 19 09:57:39 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb: backported from trunk (1.36).
+	  (again) [ruby-dev:27145]
+
+Mon Sep 19 07:45:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_pkey.h, ossl_pkey_rsa.c, ossl_pkey_dsa.c:
+	  an instance variable "private" is added to OpenSSL::PKey class.
+	  this ivar is a flag that shows whether there is a private key
+	  in the instance.
+
+	* ext/openssl/ossl_engine.c: (ossl_engine_load_privkey): set private
+	  key flag.
+
+Mon Sep 19 06:41:32 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: backported from trunk (rev 1.65):
+
+	* lib/fileutils.rb (rm_r): new option :secure.
+
+	* lib/fileutils.rb (rm_rf): new option :secure.
+
+	* lib/fileutils.rb: new method #remove_entry_secure.
+
+	* lib/fileutils.rb (cd): remove option :noop.
+
+	* lib/fileutils.rb (cp_r): new option :dereference_root.
+
+	* lib/fileutils.rb (cp_r): new option :dereference_root.
+
+	* lib/fileutils.rb: new method #remove_entry.
+
+	* lib/fileutils.rb: new method #chmod_R.
+
+	* lib/fileutils.rb: new method #chown.
+
+	* lib/fileutils.rb: new method #chown_R.
+
+	* lib/fileutils.rb: new method .commands.
+
+	* lib/fileutils.rb: new method .options.
+
+	* lib/fileutils.rb: new method .have_option?.
+
+	* lib/fileutils.rb: new method .options_of.
+
+	* lib/fileutils.rb: new method .collect_method.
+
+	* lib/fileutils.rb: use module_function instead of single extend.
+
+	* test/fileutils/test_fileutils.rb: backported from trunk (1.36).
+
+Mon Sep 19 03:17:48 2005  Tanaka Akira  <akr@m17n.org>
+
+	* file.c (rb_thread_flock): wrap the flock system call by
+	  TRAP_BEG/TRAP_END to enable signals.  [ruby-dev:27122]
+
+	* ext/socket/socket.c (bsock_send): wrap the sendto and send system
+	  call by TRAP_BEG/TRAP_END to enable signals when writing to a socket
+	  which is full.  [ruby-dev:27132]
+
+	* io.c (rb_io_syswrite): wrap the write system call by
+	  TRAP_BEG/TRAP_END to enable signals when writing to a pipe which is
+	  full.  [ruby-dev:27134]
+
+Mon Sep 19 03:02:08 2005  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (io_fwrite): wrap the write system call by TRAP_BEG/TRAP_END to
+	  enable signals when writing to a pipe which is full.
+
+Sun Sep 18 02:10:47 2005  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml/rubytypes.rb: remove comments that are bungling up
+	  the rdoc and ri output.  output symbols as plain scalars.
+
+	* ext/syck/rubyext.c (syck_emitter_reset): emit headless
+	  documents always.
+
+	* ext/syck/emitter.c (syck_scan_scalar): quote scalars with any
+	  kind of surrounding line space, tabs or spaces alike.
+
+	* ext/syck/token.c: accept tabs as whitespace, not for indentation,
+	  but strip from plain scalars.
+
+	* test/yaml/test_yaml.rb: remove outdated tests.
+
+Sat Sep 17 23:25:04 2005  sheepman  <sheepman@sheepman.sakura.ne.jp>
+
+	* lib/mathn.rb (Rational::inspect): should preserve original
+	  operand.  [ruby-core:05806]
+
+Sat Sep 17 23:20:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::Cookie): should handle multiple values for a
+	  cookie name.  [ruby-talk:156140]
+
+Sat Sep 17 10:42:13 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
+	  should call Kernel.eval on caller's safe-level instead of slave's
+	  safe-level (Of course, the given script should be evaluated on
+	  slave's safe-level).
+
+Sat Sep 17 09:45:26 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_substr): should propagate taintness even for
+	  empty strings.  [ruby-dev:27121]
+
+	* string.c (rb_str_aref): should infect result if range argument
+	  is tainted.  [ruby-dev:27121]
+
+Sat Sep 17 08:35:39 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/base.rb (RSS::Maker::ItemsBase#normalize): fixed
+	strange RSS::Maker::Item#max_size behavior.
+	Thanks to Kazuhiko <kazuhiko@fdiary.net>.
+
+	* test/rss/test_maker_1.0.rb (RSS::TestMaker10#test_items): ditto.
+
+Fri Sep 16 23:09:20 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_search_event_at): bug fix
+	  in ext/win32ole/sample/ienavi.rb.
+
+	* ext/win32ole/win32ole/tests/testOLEEVENT.rb: ditto.
+
+Fri Sep 16 22:41:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_s_extname): empty string for path name ending with a
+	  period.  fixed: [ruby-core:05651]
+
+	* file.c (rb_file_join): smarter behavior at edge cases.
+	  fixed: [ruby-core:05706]
+
+Fri Sep 16 18:34:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/syck/node.c (syck_replace_str): was using return from the
+	  void function.  a patch from MIYAMUKO Katsuyuki
+	  <miyamuko at mtb.biglobe.ne.jp>.  [ruby-dev:27111]
+
+Fri Sep 16 14:48:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: fix typo on MultiTkIp#bg_eval_string
+
+Fri Sep 16 12:02:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/syck/rubyext.c (syck_resolver_transfer): remove C++ style
+	  comment (//).  [ruby-core:05793]
+
+Fri Sep 16 00:14:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/logger/test_logger.rb: unintentionally overwritten changes by
+	  Usa.  reverted.
+
+Fri Sep 16 00:06:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#initialize): should set
+	  $stdout.binmode.
+
+Thu Sep 15 23:25:21 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.5.
+
+	  #nnn is a ticket number at http://dev.ctor.org/soap4r
+
+	  * SOAP
+
+	    * allow to configure an envelope namespace of SOAP request. (#124)
+	   	TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope'
+	  	@client.options["soap.envelope.requestnamespace"] =
+		  TemporaryNamespace
+	 	@client.options["soap.envelope.responsenamespace"] =
+		  TemporaryNamespace
+		@client.do_proc(...)
+
+	    * let SOAP request XML indent space configuable.  see
+	      "soap.envelope.no_indent" option. (#130)
+
+	    * let external CES configuable.
+	      ex. client["soap.mapping.external_ces"] = 'SJIS'.  $KCODE is used
+	      by default. (#133)
+		external CES ::= CES used in Ruby object of client and server
+		internal CES ::= CES used in SOAP/OM
+
+	    * add iso-8859-1 external CES support. (#106)
+
+	    * fixed illegal 'qualified' handling of elements.  it caused
+	      ASP.NET inteoperability problem. (#144)
+
+	    * added 'soap.envelope.use_numeric_character_reference' (boolean)
+	      option to let query XML use numeric character reference in XML,
+	      not plain UTF-8 character.  !GoogleSearch server seems to not
+	      allow plain UTF-8 character since 2005-08-15 update. (#147)
+
+	    * SOAP::Header::SimpleHeader (de)serialization throws an exception
+	      on !SimpleHeader.on_(in|out)bound when header is a String.  so we
+	      could not use a simple single element headerItem.  fixed.  thanks
+	      to emil. (#129)
+
+	    * out parameter of rpc operation did not work.  (#132)
+
+	    * follow HTTP redirect only if using http-access2.  (#125) (#145)
+
+	    * add a workaround for importing an WSDL whose path begins with
+	      drive letter.  (#115)
+
+	  * WSDL
+
+	    * SOAP Data which is defined as a simpletype was not mapped
+	      correctly to Ruby obj when using wsdl2ruby.rb generated classdef
+	      file. (#123)
+
+	    * rpc/literal support. (#118)
+
+	    * re-implemented local element qualify/unqualify control.  handles
+	      elementFormDefault and form in WSDL.  (#119)
+
+	    * Array of an element which has simpleType causes a crash. (#128)
+
+	    * prarmeterOrder may not contain return part so it can be shorter
+	      than parts size.  Thanks to Hugh.  (#139)
+
+	  * Samples
+
+	    * added !BasicAuth client sample. (#117)
+
+	    * added Base64 client/server sample.
+
+	    * added Flickr SOAP interface client sample. (#122)
+
+	    * added !SalesForce client sample. (#135)
+
+	    * updated Thawte CA certificate for !GoogleAdWords sample.
+
+	    * updated a client script with the newer version made by Johan.
+	      thanks!
+
+	    * shortened long file names. (#120)
+
+	    * fixed typo in authheader sample. (#129)
+
+	    * updated deprecated method usage.  (#138)
+
+Thu Sep 15 23:02:57 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.h (rb_w32_stat): added prototype.
+
+Thu Sep 15 22:35:55 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_signal.rb (test_exit_action): skip the test using
+	  fork on fork-less platforms.
+
+Thu Sep 15 11:39:18 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/dialog.rb: If a dialog does not show up yet,
+	  TkDialogObj#name raises an exception. [ruby-talk:156109]
+
+Thu Sep 15 01:39:19 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/tuplespace.rb (Rinda::TemplateEntry::initialize): pull
+	  up method. Tabs converted to spaces.
+
+Thu Sep 15 00:18:24 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/telnet.rb (Net::Telnet::waitfor): replace sysread with
+	  readpartial.  [ruby-talk:127641]
+
+Wed Sep 14 22:40:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (ruby_glob): glob function not using ruby exception system.
+
+Wed Sep 14 01:26:03 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/https.rb: backported from trunk, rev 1.3.
+	  [ruby-dev:25673] (again), [ruby-dev:26617] (again),
+	  [ruby-dev:27062]
+
+	* ext/openssl/lib/net/https.rb: removed.
+
+	* ext/openssl/lib/net/protocols.rb: removed.
+
+	* lib/net/http.rb: #use_ssl?, #use_ssl are moved from net/https.
+
+Tue Sep 13 22:09:40 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb (Logger): added formatter accessor to logger for
+	  dictating the way in which the logger should format the messages it
+	  displays.  Thanks to Nicholas Seckar (cf. [ruby-talk:153391]) and
+	  Daniel Berger.
+
+	* lib/logger.rb (Logger): added VERSION constant.
+
+	* lib/logger.rb: removed document for LogDevice. It is an
+	  implementation detail and is not a public interface.
+
+	* test/logger/test_logger.rb: added tests.
+
+Tue Sep 13 21:47:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (BEGIN_CALLARGS): pop halfly pushed status.
+	  fixed: [ruby-dev:26881]
+
+Tue Sep 13 16:26:45 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: backported from trunk, rev 1.128.
+	  [ruby-dev:25673] [ruby-dev:26617]
+
+	* lib/net/protocol.rb: backported from trunk, rev 1.78.
+
+	* lib/net/protocol.rb: new method #old_open to support net/smtp
+	  and net/pop.
+
+	* lib/net/smtp.rb: use #old_open.
+
+	* lib/net/pop.rb: ditto.
+
+Tue Sep 13 12:33:05 2005  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml.rb: reworking YAML::Stream to use the new
+	  emitter.
+
+	* lib/yaml/stream.rb: ditto.
+
+	* lib/yaml/rubytypes.rb: added Object#yaml_new.
+
+	* lib/yaml/tag.rb: the tag_subclasses? method now
+	  shows up in the class.  allow taguri to be set using an accessor.
+	  continue support of Object#to_yaml_type.
+
+	* ext/syck/rubyext.c: new emitter code.  yaml_new and yaml_initialize
+	  get called, should they be present.  consolidated all the diaspora of internal
+	  node types into the family below YAML::Syck::Node -- Map,
+	  Seq, Scalar -- all of whom are SyckNode structs pointing to
+	  Ruby data.  moved Object#yaml_new into the node_import and made it the
+	  default behavior.  the target_class is always called wih yaml_new, prepended
+	  a parameter, which is the klass.  loaded nodes through GenericResolver show their style.
+	  new Resolver#tagurize converts type ids to taguris.
+
+	* ext/syck/implicit.re: were 'y' and 'n' seriously omitted??
+
+	* ext/syck/emitter.c: renovated emitter, walks the tree in advance.
+	  consolidated redundant block_styles struct into
+	  the scalar_style struct.  (this means loaded nodes can now
+	  be sent back to emitter and preserve at least its very basic
+	  formatting.)
+
+	* ext/syck/gram.c: headless documents of any kind allowed.
+
+	* ext/syck/node.c: new syck_replace_str methods and syck_empty_*
+	  methods for rewriting node contents, while keeping the ID
+	  and other setup info.  added syck_seq_assign.
+
+	* ext/syck/syck.h: reflect block_styles and new node functions.
+
+Mon Sep 12 20:53:06 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* test/openssl/test_pkcs7.rb (test_enveloped): skip this test
+	  to avoid a bug of PKCS7_enctypt() (only if ext/openssl is
+	  compiled with OpenSSL-0.9.7d or earlier versions).
+	  http://www.mail-archive.com/openssl-dev@openssl.org/msg17376.html
+
+Mon Sep 12 14:03:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/dbm/test_dbm.rb: remove locking test, which may not be
+	  supported on some platforms.  [ruby-dev:27030]
+
+Mon Sep 12 10:45:58 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/dl/dl.c (rb_io_to_ptr): merged a patch for DragonFly BSD
+	  from Takahiro Kambe <taca at back-street.net>.  [ruby-dev:27023]
+
+Sun Sep 11 22:05:51 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* bin/erb (ERB::Main#run): set ERB#filename so that it is used
+	  when reporting syntax/runtime errors. Tabs converted to spaces.
+
+Sat Sep 10 10:17:03 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_engine.c (ossl_engine_s_by_id):
+	  OpenSSL::Engine.by_id calls given block before calling
+	  ENGINE_init (block parameter is the return value of this method
+	  itself).  this functionality is useful to load dynamic shared
+	  engines. the following code is a sample of loading a key using
+	  OpenSC PKCS #11 module.
+
+		require "openssl"
+		pkcs11 = OpenSSL::Engine.by_id("dynamic"){|e|
+		  e.ctrl_cmd("SO_PATH", "/usr/lib/opensc/engine_pkcs11.so")
+		  e.ctrl_cmd("LIST_ADD", "1")
+		  e.ctrl_cmd("LOAD")
+		}
+		pkcs11.ctrl_cmd("PIN", "secret")
+		key = pkcs11.load_private_key
+
+	* ext/openssl/ossl_engine.c (ossl_engine_ctrl_cmd): new method
+	  OpenSSL::Engine#ctrl_cmd. it wraps ENGINE_ctrl_cmd_string.
+
+	* ext/openssl/ossl_engine.c (ossl_engine_get_cmds): new method
+	  OpenSSL::Engine#cmds. it returms engine command definitions.
+
+Sat Sep 10 10:09:47 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.c (asn1str_to_str): new function.
+
+	* ext/openssl/ossl_pkcs7.c: new class OpenSSL::PKCS7::RecipientInfo.
+	  this class wraps PKCS7_RECIP_INFO struct.
+
+	* ext/openssl/ossl_pkcs7.c: OpenSSL::PKCS7::Signer is renamed to
+	  OpenSSL::PKCS7::SignerInfo. ("Signer" remains as an alias of
+	  SignerInfo.)
+
+	* test/openssl/test_pkcs7.rb: new file.
+
+Sat Sep 10 10:05:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): assume that
+	  the argument is a DER string if Base64 decoding failed.
+
+	* ext/openssl/ossl_ns_pki.c (ossl_spki_to_der): new method.
+
+	* test/openssl/test_ns_spki.rb: add new file.
+
+Sat Sep 10 09:56:24 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/digest.rb: added SHA224, SHA256, SHA384 and SHA512.
+	  these features are enabled if this library is compiled with
+	  OpenSSL 0.9.8 or later.
+
+	* test/openssl/test_digest.rb: add test for new digests.
+
+Sat Sep 10 09:51:30 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl.c (ossl_raise): should use ERR_peek_last_error
+	  to get last error on the current thread. And should report
+	  errors on the stack while OpenSSL.debug is true.
+
+	* ext/openssl/ossl.c (ossl_get_errors): new method for debugging
+	  this library.
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): fix error message.
+
+	* ext/openssl/ossl_x509req.c (ossl_x509req_set_attributes): get rid
+	  of unused variable.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): should
+	  set @time to avoid warning.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths,
+	  X509_STORE_add_cert, X509_STORE_add_crl): should raise error if
+	  wrapped functions failed.
+
+	* test/openssl/test_x509store.rb: add test for errors.
+
+Fri Sep  9 22:13:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): prohibit calling tainted method (>2) when
+	  $SAFE == 0.
+
+Fri Sep  9 16:45:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_times): make empty strings to keep taintness,
+	  and a little improvement.  [ruby-dev:26900]
+
+	* ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
+	  characters in command line option.  fixed: [ruby-talk:155369]
+
+Thu Sep  8 14:58:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* merged a patch from Takahiro Kambe <taca at back-street.net> to
+	  support DragonFly BSD.  [ruby-dev:26984]
+
+Wed Sep  7 12:55:08 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb: abolish mod === tempfile to avoid a problem
+	  [ruby-dev:26967].
+
+Wed Sep  7 10:45:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_switch): convert all exceptions to
+	  SystemExit.  fixed: [ruby-core:05724]
+
+	* eval.c (rb_thread_terminated): show backtrace before propagate
+	  exceptions to main thread.
+
+Wed Sep  7 08:35:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, configure.in (MINIOBJS): miniruby on HP-UX can not load
+	  extension libraries.
+
+	* bignum.c (bignew_1, bigadd): K&R style argument actually can't be
+	  defined as char.
+
+	* missing/vsnprintf.c: ANSI compiler supports const keyword.
+
+	* ext/digest/sha2/extconf.rb: reject platforms which has inttypes.h
+	  but no 64bit integer.
+
+	* lib/mkmf.rb (what_type?): guesstimate type.
+
+	* ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be
+	  char*.  fixed: [ruby-core:05470]
+
+Wed Sep  7 08:32:47 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_cvar_get, rb_mod_cvar_set): document fix from
+	  sheepman <sheepman@sheepman.sakura.ne.jp>; a bug in visibility
+	  description.  [ruby-dev:26965]
+
+	* sprintf.c (rb_f_sprintf): warn "too many argument" on verbose
+	  mode (-v/-w); backported from 1.9.  [ruby-dev:26963]
+
+Mon Sep  5 17:03:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/ostruct.rb: a patch from Florian Gross <florgro at gmail.com>
+	  merged to allow recursive inspect (and to_s) for OpenStruct.
+	  [ruby-core:05532]
+
+Mon Sep  5 07:01:12 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/openssl/lib/openssl/buffering.rb (Buffering#do_write):
+	  should clear data from the buffer which already been output.
+
+Fri Sep  2 23:51:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib: do not use __send__ to access private methods.  [ruby-dev:26935]
+
+Fri Sep  2 03:29:00 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb/init.rb: make IRB -I option that is same befavior for ruby.
+	  [ruby-dev:26872], [ruby-dev: 26920]
+
+	* lib/irb/locale.rb: support to print help message when OS locale is
+	  ja_JP.utf-8. [ruby-dev:26872]
+
+Thu Sep  1 17:11:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): wrong condition for $SAFE restoration.
+
+Thu Sep  1 14:12:45 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: On Tcl8.5, MultiTkIp#invoke_hidden doesn't
+	  work (gives wrong order of arguments).
+
+	* ext/tk/lib/multi-tk.rb: add MultiTkIp#invoke_hidden_on_namespace
+	  to support '-namespace' option of 'interp invokehidden' command
+	  on Tcl8.5.
+
+Wed Aug 31 14:43:15 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (OPTFLAGS): default global optimization to
+	  disabled for all VC++ versions.  fixed: [ruby-dev:26897]
+
+Wed Aug 31 11:35:43 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/gdbm/test_gdbm.rb (teardown): should remove GDBM temporary
+	  file.
+
+Wed Aug 31 10:30:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* process.c (proc_detach, proc_setmaxgroups): missing argument type
+	  declaration. (I recommend ANSI-style function)
+
+Tue Aug 30 23:20:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_rescue2): initialization miss.  fixed: [ruby-dev:26917]
+
+	* lib/mkmf.rb (xsystem, xpopen): no longer expand by Config.
+
+	* lib/mkmf.rb (link_command, cc_command, cpp_command): expand
+	  variables at once, and quote hdrdir.  fixed: [ruby-core:05680]
+
+	* lib/mkmf.rb (libpathflag): quote paths.
+
+Tue Aug 30 19:34:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/digest/md5/md5ossl.h, ext/digest/rmd160/rmd160ossl.h,
+	  ext/digest/sha1/sha1ossl.h: include <stddef.h> to avoid
+	  error in compilation with OpenSSL-0.9.8. [ruby-list:41068]
+
+Mon Aug 29 19:54:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/rdoc/usage.rb: improper exceptions. [ruby-dev:26870]
+
+	* lib/rdoc/usage.rb: support the case when non-ruby code exists before
+	  shebang. (this is needed when ri.bat is executed on windows)
+
+Mon Aug 29 17:48:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (method_arity): should return proper arity value.
+	  [ruby-dev:26390]
+
+Mon Aug 29 01:19:57 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/time.rb (Time.parse): extract fractional seconds using
+	  Date._parse.  [ruby-talk:153859]
+
+Sat Aug 27 20:20:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/curses/curses.c ({curses,window}_clrtoeol): added. suggested
+	  by Reyn Vlietstra.
+
+	* ext/curses/curses.c: chtype in curses is not `char', rahter `long'.
+	  [ruby-Bugs:2298]
+
+	* ext/curses/view.rb: String =~ String is deprecated.
+
+Wed Aug 24 10:53:28 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/logger/test_logger.rb (test_shifting_size): should close log
+	  device before unlink, since some platform cannot unlink opened
+	  file.
+
+Sun Aug 21 00:13:27 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/wsdl/xmlSchema/importer.rb (WSDL::XMLSchema::Importer#fetch): add
+	  a workaround for importing an WSDL whose path begins with drive
+	  letter.  [ruby-dev:26242]
+
+Sat Aug 20 22:37:13 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb (write, shift_log?, shift_log): file shifting race
+	  condition bug fixed.  [ruby-dev:26764]
+
+	* test/logger/test_logger.rb: tests.
+
+Fri Aug 19 18:13:39 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/time.rb (Time.apply_offset): fix a problem with last day of
+	  month.  reported by Lucas Nussbaum.  [ruby-talk:152866]
+
+Thu Aug 18 12:46:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub (COMMON_HEADERS): reverted 1.42.2.24.
+	  I misunderstood, bccwin32 on ruby_1_8 uses winsock2 originally.
+	  [ruby-dev:26806]
+
+	* win32/win32.h: include winsock2.h instead of winsock.h. (bcc32)
+
+Wed Aug 17 23:58:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_to_integer): argument constified.
+
+	* eval.c (terminate_process): take String message.
+
+	* eval.c (rb_thread_switch): propagate the exception caused thread
+	  termination directly.  fixed: [ruby-core:05552]
+
+Wed Aug 17 00:05:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_add_method): preserve safe level in the environment
+	  where a method is defined .
+
+	* eval.c (rb_call0): restore preserved safe level in the method
+	  execution.
+
+Mon Aug 15 00:38:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_rescue2): reduce PUSH_TAG() as well as NODE_RESCUE.
+	  [ruby-dev:26800]
+
+	* range.c (range_check, range_init): reduce useless exceptions.
+
+Sat Aug 13 18:51:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_block_pass): distinguish current block from others.
+	  fixed: [ruby-dev:26274]
+
+	* ext/stringio/stringio.c (strio_set_string): disallow nil.
+	  http://www.rubyist.net/~nobu/t/20050811.html#c05
+
+Thu Aug 11 23:29:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c: keep holding string after closed.
+
+Thu Aug 11 13:01:48 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss: fixed sort bug. [ruby-list:41018]
+
+	* lib/rss/1.0.rb (RSS::RDF::Channel#setup_maker_attributes):
+	  removed self.
+
+	* lib/rss/maker/base.rb (RSS::Maker::ItemsBase#<=>): use #date
+	  instead of @date.
+	  (RSS::Maker::Base::self.def_array_element): added #size.
+
+	* lib/rss/maker/1.0.rb
+	  (RSS::Maker::RSS10::Channel#to_rss,
+	   RSS::Maker::RSS10::Items::Item#to_rss): cleared dc_dates set
+	  upped by using #date.
+
+	* lib/rss/maker/dublincore.rb
+	  (RSS::Maker::ChannelBase, RSS::Maker::ItemsBase::ItemBase):
+	  fixed opposite alias.
+
+	* test/rss/test_setup_maker_1.0.rb
+	  (RSS::TestSetupMaker10::test_setup_maker_items_sort): added some
+	  tests for RSS::Maker::ItemsBase#do_sort.
+
+Wed Aug 10 10:29:40 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: fix bug on handling __ruby2val_optkeys().
+
+	* ext/tk/lib/tk/itemconfig.rb: fix bug on handling
+	  __item_ruby2val_optkeys().
+
+	* ext/tk/lib/tk/canvas.rb: didn't check __item_ruby2val_optkeys().
+
+	* ext/tk/lib/tkextlib/blt/component.rb: ditto.
+
+Tue Aug  9 15:12:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: remove dangerous 'rb_jump_tag's.
+
+	* ext/tk/lib/tk.rb: add __val2ruby_optkeys and __ruby2val_optkeys to
+	  help to convert option values between ruby and tcl.
+
+	* ext/tk/lib/tk/itemconfig.rb: add __item_val2ruby_optkeys and
+	  __item_ruby2val_optkeys to help to convert option values between
+	    ruby and tcl.
+
+	* ext/tk/lib/tk/radiobutton.rb: use __ruby2val_optkeys for 'variable'
+	  option (for the reason of backward compatibility).
+
+	* ext/tk/lib/tk/composite.rb: clarify the arguments of super().
+
+	* ext/tk/lib/tk/spinbox.rb: ditto.
+
+	* ext/tk/lib/tk/text.rb: ditto.
+
+	* ext/tk/lib/tk/validation.rb: ditto.
+
+	* ext/tk/lib/tkextlib/*: support to treat tkvariable-type
+	  configure options.
+
+Tue Aug  9 20:30:19 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
+
+	* bignum.c (rb_big_coerce): allow bignum x bignum coercing.
+	  [ruby-dev:26778]
+
+Mon Aug  8 20:43:02 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_method.rb: added.  [ruby-dev:26761]
+
+Sun Aug  7 23:50:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_super.rb: added from HEAD. [ruby-dev:26743]
+
+Sun Aug  7 01:31:15 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (WIN32OLE_EVENT#on_event): should set
+	  only one event handler.
+
+	* ext/win32ole/tests/testOLEEVENT.rb: ditto.
+
+	* ext/win32ole/tests/testOLEPARAM.rb: remove re-defined
+	  test_ole_type_detail method.
+
+Sat Aug  6 12:35:24 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/{tk.rb,tk/itemconfig.rb}: configure creates
+	  TkVariable if key name is 'variable' or 'textvariable'
+	  by default. [ruby-dev:26749]
+
+	* ext/tk/lib/tk/{label,radiobutton}.rb: removed its own
+	  {variable,textvariable} function.
+
+	* ext/tk/lib/tk/variable.rb: retains backward conpatibility.
+
+Fri Aug  5 12:50:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tcltklib/tcltklib.c: fixed memory leak when tk_funcall raised
+	  exception. (copies argv into heap in tk_funcall instead of
+	  caller)
+
+Fri Aug  5 12:42:57 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): need to convert path separetor
+	  before invoking install command.
+
+Fri Aug  5 00:27:04 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tcltklib/tcltklib.c: refactoring - extract ruby string <->
+	  tcl object conversion as get_str_from_obj and get_obj_from_str.
+
+Fri Aug  5 00:19:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* extmk.rb (extmake): needs to be wrapped in an Array.
+
+Thu Aug  4 18:38:36 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: cannot compile for Tcl7.6/Tk4.2.
+
+	* ext/tcltklib/tcltklib.c: add nativethread consistency check.
+
+	* ext/tcltklib/stubs.c: ditto.
+
+	* ext/tk/lib/tk.rb: forgot to define TclTkIp.encoding and encoding=
+	  when Tcl is 7.6 or 8.0.
+
+	* ext/tk/lib/tk/wm.rb: support to make some methods as options of
+	  root or toplevel widget. [ruby-talk:150336]
+
+	* ext/tk/lib/tk/root.rb: ditto.
+
+	* ext/tk/lib/tk/toplevel.rb: ditto.
+
+	* ext/tk/lib/tkextlib/SUPPRT_STATUS: update RELEASE_DATE
+
+Thu Aug  4 08:03:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): should not modify $mflags for each
+	  extentions.
+
+Thu Aug  4 00:25:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated
+	  macro definitions.
+
+	* bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.
+
+	* {win32,wince}/Makefile.sub: separate config.h for compiler versions.
+
+Wed Aug  3 21:59:16 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/variable.rb: TkVariable#trace didn't work on
+	  TkVariable retrived from TkVariable.new_hash.ref. [ruby-dev:26721]
+
+Wed Aug  3 08:22:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]
+	  changes at 2004-09-07.  [ruby-dev:26656]
+
+Tue Aug  2 10:20:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tcltklib/tcltklib.c: use Tcl_[GS]etVar2Ex instead of
+	  Tcl_Obj[GS]etVar2. (avoid Tcl_NewStringObj on supported platforms)
+
+	* ext/tcltklib/tcltklib.c: use ip_{get,set,unset}_variable2_core from
+	  ip_{get,set,unset}_variable.
+
+	* ext/tcltklib/tcltklib.c: replaced Tcl_Panic with rb_bug.
+
+Tue Aug  2 01:41:28 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/ping.rb (Ping.pingecho): should rescue StandardError.
+	  [ruby-dev:26677]
+
+Mon Aug  1 19:09:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tcltklib/tcltklib.c: refactoring - replaced rb_ivar_defined &
+	  rb_ivar_get with single rb_attr_get call.
+
+Mon Aug  1 18:45:07 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tcltklib/tcltklib.c (Tcl_GetStringResult): refactoring - define
+	  alternative macro on Tcl7.x or earlier.
+
+Mon Aug  1 13:57:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tcltklib/tcltklib.c (deleted_ip): refactoring - interpreter
+	  deletion check. [ruby-dev:26664]
+
+Mon Aug  1 01:17:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (check_insecure_method): use private_methods and
+	  protected_methods instead of respond_to? to check method visibility.
+	  [ruby-dev:26616]
+
+	* test/drb/drbtest.rb: ditto.
+
+	* test/drb/ut_drb.rb: ditto.
+
+Mon Aug  1 00:07:32 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+	* lib/irb/context.rb: fix `irb --readline` option. [ruby-list:40955]
+
+Fri Jul 29 09:59:38 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_yield_0): push yielded node instead of yielding.
+	  fixed: [yarv-dev:549]
+
+Thu Jul 28 18:09:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/stubs.c: When --enable-tcltk-stubs, the initialize
+	  routine creates a Tcl/Tk interpreter and deletes it. However,
+	  init cost of Tk's MainWindow is not so small. And that makes it
+	  impossible to use libraries written with Tcl functions only on
+	  an environment without a graphical display. This changes support
+	  delaying initalization of Tk_Stubs until the script needs Tk.
+
+	* ext/tcltklib/stubs.h: New file. Define prototypes and return
+	  codes of functions on stubs.c.
+
+	* ext/tcltklib/tcltklib.c: Support delaying initalization of
+	  Tk_Stubs until the script needs Tk.
+
+	* ext/tcltklib/tcltklib.c: Show friendly error messages for errors
+	  on initialization.
+
+	* ext/tcltklib/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is
+	  exiting and $DEBUG is true. (Not fix. If you know the reason of
+	  why, please fix it.)
+
+	* ext/tk/tkutil.c (ary2list, ary2list2): bug fix on handling of
+	  encoding.
+
+	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
+	  don't work propery.
+
+	* ext/tk/lib/tk.rb: Forget extending Tk::Encoding module to Tk.
+	* ext/tk/lib/tk/variable.rb: TkVarAccess fails to initialize the
+	  object for an element of a Tcl's array variable.
+
+Wed Jul 27 23:23:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (obj_free): make message format consistent with one from
+	  gc_mark().  [ruby-talk:149668]
+
+Wed Jul 27 22:11:37 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* sample/rss/tdiary_plugin: removed. because the plugin
+	  is imported in the tDiary plugin packages.
+
+Wed Jul 27 10:59:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_each): rewinddir(3) before iteration.
+	  [ruby-talk:149628]
+
+Tue Jul 26 12:57:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/openssl_missin.c: include <openssl/engine.h> before
+	  <openssl/x509_vfy.h> to avoid compilation error of mswin32.
+	  suggested by NAKAMURA Usaku.
+
+Mon Jul 25 21:30:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {bcc32,win32,wince}/Makefile.sub: moved CPPFLAGS only for ruby
+	  source to XCFLAGS.
+
+Mon Jul 25 13:45:18 2005  NAJIMA Hiroki  <najima@mickey.ai.kyutech.ac.jp>
+
+	* io.c: check HAVE_SYS_IOCTL_H before including the header.
+	  [ruby-dev:26610]
+
+Mon Jul 25 14:10:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.
+
+Sat Jul 23 16:49:04 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should check
+	  OPENSSL_NO_STATIC_ENGINE.
+
+Fri Jul 22 21:06:08 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
+
+	* bignum.c (rb_big_eq): reduce isnan().  [ruby-dev:26600]
+
+	* numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le): ditto.
+
+Fri Jul 22 15:02:39 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: moved copyright description to lib/rss.rb.
+
+	* lib/rss.rb: added for convenience.
+
+	* sample/rss/re_read.rb: added #to_s sample.
+
+	* sample/rss/blend.rb: use 'require "rss"' instead of
+	  'require "rss/*"'.
+	* sample/rss/list_description.rb: ditto.
+	* sample/rss/rss_recent.rb: ditto.
+	* sample/rss/tdiary-plugin/rss-recent.rb: ditto.
+
+	* sample/rss/tdiary-plugin/rss-recent.rb: 0.0.6 -> 0.0.7.
+
+Fri Jul 22 14:37:43 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb (RSS::Parser#initialize): accept HTTP/FTP
+	  URI and local file path too.
+
+	* test/rss/test_parser.rb (RSS::TestParser#test_parse): test
+	  for the above.
+
+Fri Jul 22 07:01:42 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tkutil.c (tk_conv_args): forget to revert thread_critical
+	  and gc_disable when raise ArgumentError.
+
+	* ext/tk/lib/remote-tk.rb: RemoteTkIp doesn't need to include TkUtil.
+
+	* ext/tcltklib/tcltklib.c: add TclTkIp#has_mainwindow? method.
+
+	* ext/tk/lib/tk.rb: add Tk.has_mainwindow? method.
+
+	* ext/tk/lib/multi-tk.rb: add MultiTkIp#has_mainwindow? method.
+
+	* ext/tk/lib/remote-tk.rb: add RemoteTkIp#has_mainwindow? method.
+
+	* ext/tk/lib/multi-tk.rb: slave IP fail to exit itself when $SAFE==4.
+
+	* ext/tk/lib/multi-tk.rb: remove constants from MultiTkIp module to
+	  avoid access from external.
+
+	* ext/tk/lib/multi-tk.rb: check_root flag is ignored on slave IPs'
+	  mainloop.
+
+	* ext/tk/lib/multi-tk.rb: hang-up Tk.mainloop called on a slave IP
+	  with $SAFE==4.
+
+	* ext/tk/lib/multi-tk.rb: MultiTkIp#bg_eval_proc doesn't work
+	  properly.
+
+	* ext/tk/lib/multi-tk.rb: add MultiTkIp#set_cb_error(proc) and
+	  cb_error(exc) to log errors at callbacks on safe slave IPs.
+
+	* ext/tk/lib/multi-tk.rb: fail to get an available slave IP object
+	  when call Tk.mainloop in the block which is given to new_* method,
+	    because cannot finish initialize while the root widget is alive.
+
+	* ext/tk/lib/multi-tk.rb: fail to control a slave IP when Tk.mainloop
+	  runs on the IP.
+
+Wed Jul 20 19:20:37 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (S_ISREG): need to define S_ISREG before it is used first.
+
+Wed Jul 20 18:40:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* io.c (wsplit_p): patch for the environment where
+	  fcntl(F_GETFL, O_NONBLOCK) is not supported. in that case,
+	  set FMODE_WSPLIT without fcntl check. [ruby-dev:26566]
+
+Wed Jul 20 18:07:11 2005  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (rb_io_ctl): update FMODE_WSPLIT_INITIALIZED and FMODE_WSPLIT
+	  by F_SETFL.
+
+Wed Jul 20 10:04:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_class_path): need to adjust snprintf() len for
+	  teminating NUL.  [ruby-dev:26581]
+
+Wed Jul 20 04:01:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/socket/socket.c: sorry, BeOS also uses HAVE_CLOSESOCKET,
+	  so reverted.
+
+	* ext/socket/extconf.rb: should not define HAVE_CLOSESOCKET
+	  on windows.
+
+Wed Jul 20 03:16:43 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/socket/socket.c: should not undef close() on win32.
+	  it's defined to rb_w32_close(), otherwise handle leaks.
+	  [ruby-Bugs-2131]
+
+Wed Jul 20 00:48:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (syserr_initialize): don't use str before StringValue()
+	  check.  [ruby-dev:26579]
+
+Tue Jul 19 22:47:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (syserr_initialize): add 1 byte for snprintf() size for
+	  NUL at the end.  [ruby-dev:26574]
+
+Tue Jul 19 16:39:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_inspect): replace sprintf() with "%s" format all
+	  over the place by snprintf() to avoid integer overflow.
+
+Tue Jul 19 14:08:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tcltklib/tcltklib.c: rbtk_eventloop_depth is used as int.
+
+	* ext/tcltklib/tcltklib.c: rbtk_pending_exception is tested with
+	  NIL_P, so should assign Qnil instead of 0 (Qfalse).
+
+	* ext/tcltklib/tcltklib.c (ip_invoke_real): fixed memory leak when
+	  ip is deleted.
+
+Tue Jul 19 13:19:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/variable.rb: For symmetry, add TkVariable#string. It
+	  returns a string even if the default value type of the TkVariable
+	  object is not "string".
+
+Mon Jul 18 21:40:20 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* eval.c (rb_call0): make the pointer to NODE volatile
+	  instead of NODE itself.
+
+Mon Jul 18 14:32:21 2005  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (rb_call0): make body volatile to avoid optimization problem.
+	  [ruby-dev:26195]
+
+Mon Jul 18 12:23:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/io/wait/wait.c: wrong backport from trunk.  fixed: [ruby-dev:26562]
+
+Mon Jul 18 09:36:25 2005  Tanaka Akira  <akr@m17n.org>
+
+	* rubyio.h (FMODE_WSPLIT, FMODE_WSPLIT_INITIALIZED): new constant.
+
+	* io.c (wsplit_p): new function.
+	  (io_fwrite): split writing data by PIPE_BUF if wsplit_p is true in
+	  multi-threaded mode.
+	  [ruby-dev:26540]
+
+Sun Jul 17 13:46:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/wait/extconf.rb, ext/io/wait/wait.c: Win32 platforms support.
+
+Fri Jul 15 23:59:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parsers/parse_c.rb (handle_class_module): handle a
+	  module enclosed in a built-in module.  fixed: [ruby-talk:148239]
+
+	* lib/rdoc/parsers/parse_c.rb (find_body): allow macros as methods.
+
+	* lib/rdoc/parsers/parse_c.rb (find_call_seq): allow :nodoc: modifier
+	  in C.  [ruby-core:04572]
+
+Fri Jul 15 18:00:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub (COMMON_HEADERS): ruby_1_8 is using winsock.h.
+	  failed to compile ext/socket on bcc5.6.4. [ruby-dev:26193]
+
+Fri Jul 15 07:58:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
+	  sockets should be non-blocking mode. [ruby-dev:26405]
+
+	* lib/webrick/utils.rb (WEBrick::Utils.set_non_blocking): new method.
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_chunked):
+	  should call sock.read repeatedly until the preferred size data
+	  is obtained.
+
+Thu Jul 14 18:27:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.c (rb_w32_strerror): should return correct message
+	  for ENAMETOOLONG and ENOTEMPTY. (bcc32) [ruby-dev:26533]
+
+	* win32/win32.c (rb_w32_strerror): stripped CR LF on the tail.
+	  (bcc32) [ruby-dev:26533]
+
+Thu Jul 14 00:45:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* LEGAL (ext/nkf/nkf-utf8): updated from nkf1.7 to nkf-utf8.
+
+Wed Jul 13 19:37:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.c (rb_w32_mkdir): should set EEXIST (not EACCES)
+	  if file or directory already exists. (bcc32) [ruby-dev:26508]
+
+	* win32/win32.c (rb_w32_rmdir): should set ENOTDIR (not EINVAL)
+	  if it is not directory. (bcc32, win32)
+
+	* win32/win32.c (rb_w32_rmdir, rb_w32_unlink): restore
+	  FILE_ATTRIBUTE_READONLY flag on function failure.
+
+Wed Jul 13 12:40:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: TclTkLib.do_one_event doesn't work.
+
+	* ext/tk/lib/tk.rb: Tk.thread_update is available.
+
+Tue Jul 12 23:32:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: keep curdir unexpanded.
+
+Mon Jul 11 08:31:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regex.c (read_special): fix parsing backslashes following \c in
+	  regexp.  fixed: [ruby-dev:26500]
+
+Mon Jul 11 02:53:00 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
+	  mistook in merging the patch of [ruby-dev:26235] at
+	  revision 1.4.2.6.
+
+Sun Jul 10 23:58:04 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (Pathname#unlink): try Dir.unlink first to
+	  avoid unlink a directory by root.
+	  cf. [ruby-dev:26237]
+
+Sun Jul 11 05:18:17 2005  Michael Neumann  <mneumann@ruby-lang.org>
+
+	* lib/xmlrpc/server.rb (XMLRPC::Server): Switch from GServer over to
+	  WEBrick. This makes file lib/xmlrpc/httpserver.rb obsolete (at least it is
+		no further used by the XML-RPC library).
+
+Sun Jul 10 12:47:01 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/debug.rb (debug_command): added a deficient format specifier.
+	  fixed: [ruby-core:05419]
+
+Sat Jul  9 21:28:46 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_method_dispid): convert dispid
+	  in Ruby and C by INT2NUM and NUM2INT.
+
+	* ext/win32ole/win32ole.c (ole_invoke2): ditto.
+
+	* ext/win32ole/test/testWIN32OLE.rb: ditto.
+
+	* ext/win32ole/test/testOLEMETHOD.rb: ditto.
+
+Fri Jul  8 15:45:04 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb (RSS::VERSION): 0.1.4 -> 0.1.5.
+
+	* test/rss/test_version.rb (RSS::TestVersion#test_version):
+	  ditto.
+
+	* lib/rss/0.9.rb (RSS::Rss::Channel::Item::Category):
+	  domain attribute of <category> is optional. Thanks to
+	  Chris Lee <clee@kde.org>.
+
+	* test/rss/test_parser.rb (RSS::TestParser#test_category20):
+	  adjusted test case.
+
+Tue Jul  5 23:44:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb: expand source library path.
+
+Tue Jul  5 23:27:14 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (sort_2): get rid of yet another bcc's bug.
+	  fixed: [ruby-core:05152]
+
+	* eval.c (rb_thread_save_context): must not switch contexts during
+	  re-allocating stack.  fixed: [ruby-core:05219]
+
+Tue Jul  5 15:15:10 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tkutil.c: fix typo.
+
+Tue Jul  5 14:51:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: bug fix on treating Unicode strings.
+
+	* ext/tcltklib/tcltklib.c: add methods to treat encoding mode.
+
+	* ext/tcltklib/MANUAL.eng: add description of TclTkLib#encoding,
+	  encoding_system, and so on.
+
+	* ext/tcltklib/MANUAL.euc: ditto.
+
+	* ext/tk/tkutil.c: fail to create a Tcl's list string from an
+	  array including multiple kind of encoded strings.
+
+	* ext/tk/lib/tk.rb: ditto.
+
+	* ext/tk/lib/multi-tk.rb: 2nd arg of _{to|from}UTF8 is omissible.
+
+	* ext/tk/lib/remote-tk.rb: ditto.
+
+	* ext/tk/lib/tk.rb: override TclTkLib#encoding and encoding= to
+	  use TkCore::INTERP.encoding and encoding=.
+
+	* ext/tk/lib/tk.rb: when "require 'tk'" and $KCODE=='NONE', check
+	  DEFAULT_TK_ENCODING to decide Ruby/Tk's system encoding mode.
+
+	* ext/tk/lib/tk/encodedstr.rb: check both of Tk.encoding and
+	  Tk.encoding_system. Tk.encoding has higher priority.
+
+	* ext/tk/lib/tk/optiondb.rb: ditto.
+
+	* ext/tk/lib/tk/spinbox.rb: ditto.
+
+	* ext/tk/lib/tk/validation.rb: ditto.
+
+	* ext/tk/lib/tk/namespace.rb: arguemnts for TclTkIp#_merge_tklist
+	  should be UTF-8 strings.
+
+Mon Jul  4 14:35:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sample/svr.rb: service can be stopped by ill-behaved client; use
+	  tsvr.rb instead.
+
+Mon Jul  4 13:25:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* missing/erf.c: original erf.c by prof. Okumura is confirmed to
+	  be public domain.  reverted BSD implementation.
+
+Mon Jul  4 11:15:37 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/{dbm,gdbm,sdbm}/test_{dbm,gdbm,sdbm}.rb: skip some tests
+	  which using fork on fork-less platforms.
+
+Sun Jul  3 23:26:30 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/wsdl/document/test_rpc.rb: compare formatted time string of
+	  Time objects instead of comparing Time objects itself to avoid
+	  unintended conflict of usec part.  [ruby-dev:26220]
+
+Sat Jul  2 22:41:04 2005  Tanaka Akira  <akr@m17n.org>
+
+	* ext/socket/socket.c (unix_send_io, unix_recv_io): support x86-64 and
+	  IA64.
+
+Sat Jul  2 17:06:23 2005  Tanaka Akira  <akr@m17n.org>
+
+	* defines.h (FLUSH_REGISTER_WINDOWS): defined for IA64.
+	  (flush_register_windows): declare flush_register_windows.
+
+	* eval.c (flush_register_windows): new function.
+
+Fri Jul  1 17:48:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (get2comp): revert all prior changes, and calculate
+	  proper 2's complement for negative numbers.  backported from
+	  HEAD.
+
+Fri Jul  1 15:50:12 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* missing/erf.c: need to include some headers for some platforms.
+
+	* win32/win32.h (copysign, scalb): define for compatibility with
+	  other platforms. [ruby-dev:26430]
+
+Fri Jul  1 15:37:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* missing/crypt.c: modified to make it compilable on platforms
+	  other than BSD.  [ruby-dev:26430]
+
+	* missing/erf.c: ditto.  code from <exp.c> merged.
+
+Fri Jul  1 12:44:56 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (OpenURI.open_http): refine post_connection_check
+	  call.
+
+Fri Jul  1 11:34:08 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* missing/crypt.c: replaced with 4.4BSD version.
+
+	* missing/erf.c: ditto.
+
+	* missing/vsnprintf.c: removed the third provision from the old
+	  BSD license.  [ruby-core:05177]
+
+Fri Jul  1 01:45:21 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_min, enum_max): must not return Qundef.
+	  fixed: [ruby-core:05299]
+
+Fri Jul  1 00:18:40 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator::respond_to): respond_to? must check
+	  destination object.  [ruby-talk:146894]
+
+Thu Jun 30 19:00:21 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+	* lib/irb/ruby-lex.rb (RubyLex::identify_number): alternative implements
+	  for [ruby-dev:26410]. And support a numeric form of 0d99999.
+
+Thu Jun 30 17:28:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb (RubyLex::identify_number): should not treat
+	  plain zero as an octal number.  [ruby-dev:26410]
+
+Thu Jun 30 15:13:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): pre-evaluate argument for unambiguous
+	  evaluation order.  [ruby-dev:26383]
+
+Thu Jun 30 09:53:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator::method_missing): forward unknown
+	  method to the destination.  suggested by
+	  <christophe.poucet@gmail.com>.  [ruby-talk:146776]
+
+Tue Jun 28 21:59:29 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* dir.c, eval.c, hash.c, process.c, ruby.c: avoid warning "unused
+	  variable" [ruby-dev:26387]
+
+Sat Jun 25 17:15:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should
+	  discard if key=val pair is empty. patch from Gary Wright.
+
+Sat Jun 25 23:30:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (detach_process_watcher): terminate process watcher
+	  thread right after rb_waitpid() succeed.  [ruby-talk:146430]
+
+Sat Jun 25 15:49:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_min, enum_max): do not ignore nil as the first element.
+
+Sat Jun 25 14:40:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/sdbm/init.c (fsdbm_select): SDBM#select had returned the array
+	  which contained each elements twice. [ruby-dev:26358]
+
+Fri Jun 25 05:06:47 2005  Michael Neumann  <mneumann@ruby-lang.org>
+
+	* lib/xmlrpc/*, test/xmlrpc/*: backported changes from HEAD into 1.8
+
+Fri Jun 24 17:00:00 2005  Shigeo Kobayashi  <shigeo@tinyforest.jp>
+
+	* ext/bigdecimal/bigdecimal.c: patch from "NATORI Shin"
+	  (u-tokyo.ac.jp) applied to fix rounding bug.
+
+Fri Jun 24 13:06:45 2005  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/common.rb, lib/uri/generic.rb: fixed typo in documents and
+	  replaced some existent domain name with "example.com".
+
+Fri Jun 24 12:23:19 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: fix typo on Tk.grid_propagate.
+
+	* ext/tk/lib/tk.rb: Tk.event_generate and TkWindow#event_generate
+	  accept TkEvent::Event object as context argument.
+
+	* ext/tk/lib/tk/event.rb: add TkEvent::Event#valid_fields and
+	  valid_for_generate to get field parameters of event_generate.
+
+Thu Jun 23 23:55:59 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* runruby.rb: should load built rbconfig.rb.
+
+Thu Jun 23 16:53:15 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/canvastag.rb: TkcGroup.new cannot include given items.
+	  TkcGroup#exclude calls wrong method.
+	  Add alias TkcGroup#add [ruby-talk:146049].
+
+	* ext/tk/lib/tk/canvas.rb: TkCanvas#dtag and some subcommands of
+	  TkCanvas#addtag fail to treat a TkcTag argument.
+
+	* ext/tk/lib/tk/event.rb: add TkEvent::Event#generate to help to send
+	  current event to other widgets.
+
+Mon Jun 20 18:44:04 2005  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): DUMMY_SETJMP is replaced
+	  because setjmp is not enough to fix getcontext and SPARC register
+	  window problem.
+
+Mon Jun 20 16:48:36 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dbm/dbm.c (fdbm_closed): new method DBM#closed?
+
+	* ext/gdbm/gdbm.c (fgdbm_closed): new method GDBM#closed?
+
+	* ext/sdbm/init.c (fsdbm_closed): new method SDBM#closed?
+
+	* test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb
+	  (teardown): close all db objects before deleting data files.
+
+	* win32/win32.{ch} (unlink): hook runtime function to change
+	  file attribute before unlinking.
+	  fixed: [ruby-dev:26360]
+
+Mon Jun 20 02:15:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (define_final): document fix: finalizers never get called
+	  before target object is destroyed.
+
+Mon Jun 20 01:26:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/openssl_missing.c, ext/openssl/ossl.h,
+	  ext/openssl/ossl_asn1.c, ext/openssl/ossl_bio.c,
+	  ext/openssl/ossl_pkcs12.h, ext/openssl/ossl_x509req.c: avoid
+	  compiler warnings. suggested by Michal Rokos.
+
+Sun Jun 19 14:09:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (run_final): reduce unnecessary object allocation during
+	  finalization.
+
+	* gc.c (rb_gc_call_finalizer_at_exit): deferred finalizers list should
+	  be cleared before calling them.  fixed: [ruby-talk:145790]
+
+Fri Jun 17 13:01:40 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/time.rb (Time.parse): fix previous leap seconds support.
+	  (Time.rfc2822): ditto.
+	  (Time.xmlschema): ditto.
+
+Thu Jun 16 15:06:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_rb_threadVwaitCommand): Tcl_Release
+	  was missing.
+
+Thu Jun 16 13:34:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: add Tk.getMultiple{Open|Save}File() which return
+	  an Array of selected files.
+
+Thu Jun 16 12:53:24 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/time.rb (Time.parse): "Fri Jan  1 08:59:60 +0900 1999" was
+	  parsed as "Fri Jan 01 09:00:00 JST 1999" even on an environment
+	  which supports leap seconds.
+	  (Time.rfc2822): ditto.
+	  (Time.xmlschema): ditto.
+
+Thu Jun 16 08:29:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/dl/sym.c (rb_dlsym_call): needs FREE_ARGS before return.
+	  fixed memory leak. [ruby-Bugs-2034]
+
+Wed Jun 15 18:26:39 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: support "tk inactive" sub-command [for Tcl/Tk8.5a3]
+
+	* ext/tk/lib/tk/namespace.rb: support "namespace path" sub-command and
+	  'namespace ensemble' sub-command [for Tcl/Tk8.5a3]
+
+Tue Jun 14 02:02:43 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tkutil.c: add TkUtil::CallbackSubst.subst_arg(m, ...) &
+	  _define_attribute_aliases(hash) to get substitution-argument from
+	  attributes (e.g. subst_arg(:x,:y,:num,:button) --> "%x %y %b %b ").
+
+	* ext/tk/lib/tk/event.rb: use _define_attribute_aliases().
+
+Mon Jun 13 13:01:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* hash.c (ruby_setenv): fixed SEGV. [ruby-dev:26186]
+
+Mon Jun 13 01:54:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* signal.c (sigexit): call rb_thread_signal_exit() instead of
+	  rb_exit().  [ruby-dev:26347]
+
+	* eval.c (rb_thread_signal_exit): a new function to exit on main
+	  thread.
+
+	* eval.c (rb_thread_switch): exit status should be retrieved from
+	  ruby_errinfo.
+
+	* eval.c (rb_f_exit): ensure exit(0) should call
+	  exit(EXIT_SUCCESS).
+
+Mon Jun 13 01:20:02 2005  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (rb_gc_mark_threads): curr_thread may not be part of the
+	  thread list.  [ruby-dev:26312]
+
+Fri Jun 10 23:35:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* missing/mkdir.c: remove. [ruby-core:05177]
+
+Fri Jun 10 22:54:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing.h: fd_set stuffs need sys/types.h.  fixed: [ruby-core:05179]
+
+Thu Jun  9 23:58:12 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/Win32API/Win32API.c (Win32API_Call): disable global
+	  optimization. fixed: [ruby-core:05143]
+
+Thu Jun  9 23:35:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_inject): default the result value to Qundef to use
+	  first element as initial value if not given.
+
+Thu Jun  9 19:55:41 2005  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (ruby_longjmp): new macro to call longjmp, setcontext, etc.
+	  (ruby_setjmp): new macro to call setjmp, getcontext, etc.
+	  (ruby_setjmp): call setjmp before getcontext to avoid IA64 register
+	  stack problem.
+	  [ruby-talk:144939]
+
+	* gc.c (Init_stack): remove IA64_MAGIC_STACK_LIMIT.
+
+Thu Jun  9 11:55:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (SimpleDelegator::__setobj__): need check for
+	  recursive delegation.  [ruby-core:04940]
+
+Wed Jun  8 18:47:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-expr-beg): fix looking point drift.
+
+Wed Jun  8 11:11:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (get2comp): calculate proper 2's complement for
+	  negative numbers.  a bug in normalizing negative numbers
+	  reported from Honda Hiroki <hhonda@ipflex.com>.
+
+Wed Jun  8 08:33:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (enum_min_by, enum_max_by): return nil if no iteration.
+	  fixed: [ruby-dev:26245]
+
+	* eval.c (rb_need_block): ensure a block is given.
+
+	* eval.c (backtrace): skip successive frames sharing same node.
+
+Wed Jun  8 00:15:08 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_getaddrinfo__aix): merged a patch from
+	  KUBO Takehiro <kubo at jiubao.org> to support AIX.  [ruby-list:40832]
+
+Wed Jun  8 00:09:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/yaml/rubytypes.rb (Array::to_yaml): merged a patch from
+	  Tilman Sauerbeck <tilman at code-monkey.de>.  [ruby-core:05055]
+
+	* lib/yaml/rubytypes.rb (Hash::to_yaml): ditto.
+
+Wed Jun  8 00:00:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/curses/curses.c (curses_insertln): merged a patch from
+	  TAKAHASHI Tamotsu <ttakah at lapis.plala.or.jp>.  [ruby-ext:02305]
+
+Tue Jun  7 19:34:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/init.rb (IRB::IRB.rc_file_generators): more flexible
+	  IRB.rc_file_generators.  [ruby-core:05163]
+
+Tue Jun  7 18:39:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/thread.rb: RDoc documentation from Eric Hodel
+	  <drbrain at segment7.net> added.  [ruby-core:05148]
+
+Tue Jun  7 18:30:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): add .SUFFIXES from depend file.
+	  fixed: [ruby-dev:26294]
+
+Tue Jun  7 17:39:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_cvar_get): Module#class_variable_get(): back
+	  ported from CVS HEAD.  [ruby-talk:144741]
+
+	* object.c (rb_mod_cvar_set): Module#class_variable_set().
+	  [ruby-talk:144741]
+
+Tue Jun  7 16:32:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): raise exception on debug mode (-d),
+	  not verbose mode (-v/-w).  [ruby-core:05123]
+
+Tue Jun  7 10:30:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: slave-ip fails to call procedures
+	  delegated by master-ip.
+
+Sun Jun  5 23:00:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/console.rb: create console when required
+
+	* ext/tk/sample/tkextlib/tile/demo.rb: fix TypeError & create Console
+
+Sat Jun  4 14:55:18 2005  Tanaka Akira  <akr@m17n.org>
+
+	* test/dbm/test_dbm.rb: merged from ext/dbm/testdbm.rb.
+
+	* test/gdbm/test_gdbm.rb: merged from ext/gdbm/testgdbm.rb.
+
+	* test/sdbm/test_sdbm.rb: renamed from ext/sdbm/testsdbm.rb with
+	  modification to use test/unit.
+
+Fri Jun  3 14:06:12 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: fix typo.
+
+Wed Jun  1 11:32:42 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub: can use single quote character in DESTDIR.
+	  [ruby-dev:26205]
+
+Mon May 30 23:48:29 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/macpkg.rb: add PACKAGE_NAME information of Tcl/Tk
+	  Extension.
+
+	* ext/tk/lib/tk/msgcat.rb: ditto.
+
+	* ext/tk/lib/tk/winpkg.rb: ditto.
+
+	* ext/tk/lib/tkextlib/*: ditto.
+
+Sat May 28 16:40:15 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* test/openssl/test_x509store.rb: add test for expired CRL
+	  and refine some assertions.
+
+Sat May 28 05:15:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_time): should
+	  not set internal flag directry.
+
+Sat May 28 02:00:11 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
+	  ENV["REQUEST_URI"] is better to get correct Request-URI
+	  than ENV["SCRIPT_NAME"] + ENV["PATH_INFO"].  [ruby-dev:26235]
+
+Fri May 27 16:32:04 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb: use the semicolon as the path separator
+	  in the environment of MSYS.  fixed: [ruby-dev:26232]
+
+Thu May 26 06:08:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
+
+Wed May 25 22:52:42 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/irb/input-method.rb: do not use Readline::HISTORY.pop.
+	  (backported from HEAD)
+
+Wed May 25 21:55:40 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/readline/readline.c: supported libedit. (backported from HEAD)
+
+	* ext/readline/extconf.rb: ditto.
+
+	* test/readline/test_readline.rb: ditto.
+
+Wed May 25 20:06:27 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: TkComm#tk_split_*list fail to split a kind of SJIS
+	  strings. To avoid the trouble, add arguments to control converting
+	  encoding, and do split on a UTF8 string.
+
+	* ext/tk/lib/multi-tk.rb: modify to attend encoding.
+
+	* ext/tk/lib/remote-tk.rb: ditto.
+
+	* ext/tk/lib/tk/itemconfig.rb: ditto.
+
+	* ext/tk/lib/tk/listbox.rb: ditto.
+
+	* ext/tk/lib/tk/namespace.rb: ditto.
+
+	* ext/tk/lib/tk/panedwindow.rb: ditto.
+
+	* ext/tk/lib/tk/text.rb: ditto.
+
+	* ext/tk/lib/tk/textmark.rb: ditto.
+
+	* ext/tk/lib/tk/texttag.rb: ditto.
+
+	* ext/tk/lib/tk/variable.rb: ditto.
+
+	* ext/tk/lib/tk/winfo.rb: ditto.
+
+	* ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto.
+
+	* ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: ditto.
+
+	* ext/tk/lib/tk.rb: add TkWindow#lower_window/raise_window and
+	  Tk#lower_window/raise_window by reason of method-name conflict
+
+	* ext/tk/lib/tk/canvas.rb: bug fix on TkCanvas#delete when given
+	  non-TkcItem arguments.
+
+	* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto.
+
+Wed May 25 12:59:48 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (OpenURI::Meta::RE_QUOTED_STRING): a content of
+	  quoted-string should be zero or more characters.
+
+Tue May 24 23:42:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_pow): support Fixnum ** Float case directly
+	  without coercing.  [ruby-talk:142697] [ruby-talk:143054]
+
+Tue May 24 16:57:24 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (require_libraries): caused SEGV when continuation jumped
+	  in to the required library code.
+
+Tue May 24 11:56:25 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/getopts.rb: should warn only if verbose mode.
+	  fixed: [ruby-dev:26201]
+
+Tue May 24 06:45:31 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): string
+	  literals to be matched non-greedy.
+
+Tue May 24 00:34:32 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/soap/calc: method name 'set' was able to crash with a class Set.
+	  [ruby-dev:26210]
+
+	* test/wsdl/document/test_rpc.rb: dateTime comparison failed under
+	  TZ=right/Asia/Tokyo (with leap second.) [ruby-dev:26208]
+
+Mon May 23 16:24:05 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/extconf.rb: Framework support on MacOS X Tiger.
+
+	* ext/tcltklib/README.1st: add description of Framework support options.
+
+Mon May 23 12:21:37 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (make_regexp): should not return junk address during
+	  compile time.  [ruby-dev:26206]
+
+Sun May 22 21:54:06 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4.
+
+	  == SOAP client and server ==
+
+	  === for both client side and server side ===
+
+	  * improved document/literal service support.
+	    style(rpc,document)/use(encoding, literal) combination are all
+	    supported.  for the detail about combination, see
+	    test/soap/test_style.rb.
+
+	  * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to
+	    WSDL as well as obj2soap.  closes #70.
+
+	  * let SOAP::Mapping::Object handle XML attribute for doc/lit service.
+	    you can set/get XML attribute via accessor methods which as a name
+	    'xmlattr_' prefixed (<foo name="bar"/> -> Foo#xmlattr_name).
+
+	  === client side ===
+
+	  * WSDLDriver capitalized name operation bug fixed.  from
+	    1.5.3-ruby1.8.2, operation which has capitalized name (such as
+	    KeywordSearchRequest in AWS) is defined as a method having
+	    uncapitalized name. (converted with GenSupport.safemethodname
+	    to handle operation name 'foo-bar').  it introduced serious
+	    incompatibility; in the past, it was defined as a capitalized.
+	    define capitalized method as well under that circumstance.
+
+	  * added new factory interface 'WSDLDriverFactory#create_rpc_driver'
+	    to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver
+	    are merged).  'WSDLDriverFactory#create_driver' still creates
+	    WSDLDriver for compatibility but it warns that the method is
+	    deprecated.  please use create_rpc_driver instead of create_driver.
+
+	  * allow to use an URI object as an endpoint_url even with net/http,
+	    not http-access2.
+
+	  === server side ===
+
+	  * added mod_ruby support to SOAP::CGIStub.  rename a CGI script
+	    server.cgi to server.rb and let mod_ruby's RubyHandler handles the
+	    script.  CGIStub detects if it's running under mod_ruby environment
+	    or not.
+
+	  * added fcgi support to SOAP::CGIStub.  see the sample at
+	    sample/soap/calc/server.fcgi.  (almost same as server.cgi but has
+	    fcgi handler at the bottom.)
+
+	  * allow to return a SOAPFault object to respond customized SOAP fault.
+
+	  * added the interface 'generate_explicit_type' for server side
+	    (CGIStub, HTTPServer).  call 'self.generate_explicit_type = true'
+	    if you want to return simplified XML even if it's rpc/encoded
+	    service.
+
+	  == WSDL ==
+
+	  === WSDL definition ===
+
+	  * improved XML Schema support such as extension, restriction,
+	    simpleType, complexType + simpleContent, ref, length, import,
+	    include.
+
+	  * reduced "unknown element/attribute" warnings (warn only 1 time for
+	    each QName).
+
+	  * importing XSD file at schemaLocation with xsd:import.
+
+	  === code generation from WSDL ===
+
+	  * generator crashed when there's '-' in defined element/attribute
+	    name.
+
+	  * added ApacheMap WSDL definition.
+
+	* sample/{soap,wsdl}: removed.
+
+Sun May 22 19:11:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#intialize):
+	  should initialize session id context. [ruby-core:4663]
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): add session id support.
+
+Sat May 21 10:24:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub: tds files were not deleted when DESTDIR
+	  included '\' path delimiter. [ruby-dev:26193]
+
+Thu May 19 19:04:29 2005  speakillof  <speakillof@yahoo.co.jp>
+
+	* lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
+	  swapped. [ruby-core:4772]
+
+Wed May 18 23:42:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (exc_exception): reverted to call Exception#initialize
+	  directly.  fixed: [ruby-dev:26177]
+
+Wed May 18 23:39:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): get rid of using String.  [ruby-dev:26180]
+
+	* dir.c (push_braces): should skip balanced braces.
+
+	* eval.c (ruby_options), win32/win32.c (NtInitialize): move argument
+	  intialization back.  [ruby-dev:26180]
+
+Tue May 17 15:31:31 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
+	  break the loop if the socket reached to EOF. [ruby-talk:142285]
+
+Tue May 17 11:52:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (unixtime_to_filetime): use localtime() instead of
+	  gmtime() when using FileLocalTimeToFileTime().
+
+Mon May 16 22:28:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
+	  to get rid of redefinition warnings on mingw.
+
+	* class.c (rb_class_init_copy): singleton class is disallowed to copy,
+	  from its definition.  fixed: [ruby-talk:142749]
+
+Mon May 16 08:52:29 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.{h,c}: define rb_[pgu]id_t.
+
+Mon May 16 00:21:02 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (Pathname#unlink): use SystemCallError instead of
+	  Errno::EISDIR because EISDIR is not portable.
+	  [ruby-core:5001]
+
+Sun May 15 22:11:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (DRbObject#method_missing): use raise(exception).
+	  [ruby-dev:26164]
+
+Sun May 15 18:56:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, ruby.h: define rb_[pgu]id_t macros instead of typedefs
+	  to get rid of types which might not be defined yet.  [ruby-dev:26165]
+
+Sun May 15 14:35:46 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (Pathname#unlink): unlink a symlink to a directory
+	  was failed.  [ruby-core:4992]
+
+Sun May 15 09:57:30 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (unixtime_to_filetime): deal with DST.
+	  [ruby-talk:141817]
+
+Sat May 14 23:59:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (exc_exception, {exit,name_err,syserr}_initialize): call
+	  Execption#initialize.  fixed: [ruby-talk:142593]
+
+Sat May 14 23:57:26 2005  Erik Huelsmann  <ehuels@gmail.com>
+
+	* configure.in: Check for the availability of pid_t, gid_t and uid_t and
+	  remove AC_TYPE_UID_T.  fixed: [ruby-core:04745]
+
+	* defines.h: Remove pid_t typedef.
+
+	* ruby.h: Define rb_pid_t, rb_gid_t and rb_uid_t in accordance with
+	 the available system types.
+
+	* process.c: Change instances of pid_t and gid_t to their rb_*
+	 counterparts.
+
+	* ext/pty/pty.c: Change pid_t to rb_pid_t.
+
+	* vms/config.h: Define HAVE_{P,G,U}ID_T to 1.
+
+	* win32/Makefile.sub: Remove #define for {g,u}id_t.
+
+	* win32/win32.c: Change pid_t to rb_pid_t.
+
+	* wince/Makefile.sub: Remove #define for {g,u}id_t.
+
+	* wince/sys/types.h: Remove definitions of {p,g,u}id_t.
+
+Fri May 13 23:44:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: keep srcdir unexpanded.
+
+	* lib/mkmf.rb (create_makefile): quote topdir and hdrdir if necessary.
+	  fixed: [ruby-core:04932]
+
+	* lib/mkmf.rb (configuration), {bcc32,win32,wince}/Makefile.sub: make
+	  also INSTALL_PROG and INSTALL_DATA system dependent.
+	  fixed: [ruby-core:04931]
+
+Fri May 13 17:54:39 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* variable.c (generic_ivar_get): rb_attr_get should not warn.
+	  [ruby-dev:26010]
+
+Fri May 13 12:28:43 2005  Daniel Berger  <djberge@qwest.com>
+
+	* array.c (rb_ary_select): can remove argc check. [ruby-core:4911]
+
+	* test/ruby/test_array.rb: add test for find_all.
+
+Fri May 13 11:29:00 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (unknown_node): add volatile directive to prototype.
+
+Thu May 12 17:08:48 2005  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
+	  (swallow, rb_io_each_byte, rb_io_getc): revert previous change.
+
+	* io.c (rb_io_eof, io_fread, appendline, swallow, rb_io_each_byte)
+	  (rb_io_getc, rb_getc): call clearerr before getc to avoid
+	  stdio incompatibility.
+
+Thu May 12 16:52:20 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/rdoc/parsers/parse_c.rb: more readability for mixing
+	  progress "c..." and warning message.
+
+Thu May 12 16:31:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5
+
+Thu May 12 16:15:01 2005  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
+	  (swallow, rb_io_each_byte, rb_io_getc): don't rely EOF flag.
+	  [ruby-talk:141527]
+
+Thu May 12 15:56:20 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
+
+	* lib/rdoc/parsers/parse_c.rb: show parsing progress for C files.
+	  [ruby-core:4341]
+
+Thu May 12 13:47:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/drb/test_drb{ssl,unix}.rb: can test drb
+	  before install. (backported from HEAD) [ruby-dev:26146]
+
+Thu May 12 09:53:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* version.c (ruby_show_version): flush for non-tty stdout.
+
+Thu May 12 09:07:07 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/ruby/envutil.rb, test/drb/drbtest.rb: can test drb
+	  before install. (backported from HEAD) [ruby-Bugs-1672]
+
+Thu May 12 01:23:55 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
+	  parser.  fixed: [ruby-dev:26113]
+
+	* eval.c (unknown_node): ignore broken NODE to get rid of accessing
+	  possibly inaccessible address.  fixed: [ruby-dev:26122]
+	  should emit more useful information like [ruby-dev:26126], though.
+
+Wed May 11 16:20:01 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
+	  and WEBrick::CGI#config. (backported from HEAD)
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
+	  not use String#split("/"). (backported from HEAD)
+
+Wed May 11 15:58:39 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (break_jump): break should not cross functions.
+	  [ruby-list:40818]
+
+Wed May 11 10:39:37 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/tempfile.rb (Tempfile#unlink): fixed typo.
+
+Wed May 11 01:03:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (TMP_ALLOC): use macro NEW_NODE() to get rid of warnings on
+	  platforms which have no alloca().  fixed: [ruby-talk:141301]
+
+Sun May  8 23:17:47 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/timer.rb: fix typo.
+
+Sun May  8 16:52:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/profiler.rb: fixed "undefined method `[]' for nil:NilClass"
+	  [ruby-core:4775] [ruby-talk:140401] [ruby-dev:26118]
+
+Sat May  7 22:58:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (have_var): no libs argument is given.
+
+Sun May  1 09:58:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_sflag): replace '-' in variable names with '_'.
+	  [ruby-dev:26107]
+
+	* ruby.c (set_arg0): use also environment variable space for setting
+	  $0.  [ruby-core:04774]
+
+Wed Apr 27 23:42:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (OPTFLAGS): default global optimization to
+	  disabled only for VC++6.
+
+Tue Apr 26 22:58:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"
+	  command when can't get information of target command.
+
+Mon Apr 25 01:18:43 2005  Tanaka Akira  <akr@m17n.org>
+
+	* regex.c: declare rb_warn to have variadic argument.  [ruby-core:4751]
+
+Sat Apr 23 19:45:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_RubyExitCommand): exit with status code
+	  via TclTkIp#_eval didn't work. [ruby-talk:139390]
+
+Fri Apr 22 16:41:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_set_exc_message): fixed memory leak.
+
+	* ext/tcltklib/tcltklib.c: eTkCallbackReturn was not initialized.
+
+Thu Apr 21 00:07:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): support platforms have file separator
+	  other than /.
+
+	* {bcc32,win32,wince}/Makefile.sub (BUILD_FILE_SEPARATOR): separator
+	  of building platform.
+
+	* {bcc32,win32,wince}/Makefile.sub (CP, INSTALL): use COPY command.
+
+Wed Apr 20 23:22:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, common.mk: miniruby depens on MINIOBJS.
+
+	* dmydln.c (dln_load): dummy function to raise LoadError.
+
+	* cygwin/GNUmakefile.in, {bcc32,win32,wince}/Makefile.sub: miniruby
+	  can't load extensions on Windows.
+
+Wed Apr 20 23:01:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/ifchange.bat: delete testing files.
+
+Wed Apr 20 07:27:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:
+	  add extout option.
+
+	* bcc32/setup.mak: make configuration variables overridable.
+
+Wed Apr 20 04:15:27 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb.rb lib/irb/* doc/irb: IRB 0.9.5
+
+Tue Apr 19 23:37:09 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.
+
+Tue Apr 19 00:06:20 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: expand path for ext/**/extconf.rb.
+
+Mon Apr 18 11:25:14 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/zlib/zlib.c (zstream_run): fixed SEGV. [ruby-core:4712]
+
+Sun Apr 17 23:57:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake, parse_args): do not expand destdir.
+
+	* ext/extmk.rb (relative_from): treat mere drive letter as an absolute
+	  path.
+
+Sat Apr 16 17:01:16 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss):
+	  use the first date information of items as site date information
+	  if channel doesn't have date information.
+
+Sat Apr 16 15:27:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_PROG_INSTALL): not add -p option to INSTALL.
+	  files need timestamps to be kept are only ar-archive on a few
+	  platforms, and be installed by instruby.rb but not INSTALL.
+	  fixed: [ruby-core:04721]
+
+	* mkconfig.rb: purge autoconf value variables.
+
+Sat Apr 16 10:36:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub: quick hack... prepend DESTDIR.
+	  still have restriction on DESTDIR ("", "/", "e:")
+
+Sat Apr 16 03:59:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: check for OPENSSL_cleanse.
+
+	* ext/openssl/openssl_missing.h: ditto.
+
+Thu Apr 14 19:18:30 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (remove_file): ignore exceptions caused by
+	  chmod.
+
+	* lib/fileutils.rb (remove_dir): try to get rights to rmdir.
+	  [ruby-Bugs:1502] (2 items backportted from HEAD, rev 1.53-54)
+
+Thu Apr 14 16:57:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bcc32/Makefile.sub: failed to remove debug information files.
+	  fixed: [ruby-dev:26034]
+
+Wed Apr 13 23:40:21 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb (RSS::VERSION): 0.1.3 -> 0.1.4.
+
+	* lib/rss/rss.rb (RSS::Element#converter): fixed converter
+	  transmission bug.
+
+Wed Apr 13 21:20:35 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (mingw32): extract msvcr*.dll from objdump result.
+
+Wed Apr 13 20:24:30 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (mingw32): use actual runtime DLL name as ruby DLL
+	  name and default load path.
+
+	* win32/Makefile.sub, win32/setup.mak: ditto.
+
+Tue Apr 12 15:33:09 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_finalize): better modification than the
+	  previous commit [ruby-dev:26029].
+
+Tue Apr 12 12:38:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval()
+	  modifies the argument string to eval.
+
+Tue Apr 12 02:21:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_finalize): add existence check of
+	  Tcl commands before calling Tcl_GlobalEval().
+
+Mon Apr 11 23:47:21 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: [druby-ja:123] fix: When reference of my object is
+	  loaded, the object is tainted.
+
+	* test/drb/test_drb.rb: ditto.
+
+Mon Apr 11 22:18:23 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dir.c, file.c (lstat): avoid warnings for mingw.
+
+Mon Apr 11 20:11:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV
+	  when exit on Tcl/Tk8.3.x.
+
+Mon Apr 11 15:26:25 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
+
+Mon Apr 11 12:09:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* {bcc32,win32,wince}/Makefile.sub: ri data was not installed
+	  into correct path. [ruby-dev:26011]
+
+	* bcc32/Makefile.sub: defaulted install-nodoc. [ruby-dev:26011]
+
+Sun Apr 10 10:12:42 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
+	  to VT_EMPTY.
+
+	* ext/win32ole/win32ole/tests/testWIN32OLE.rb: correct error
+	  message string "Unknown" => "unknown".
+
+Sat Apr  9 18:20:31 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/image.rb: support to create TkImage object without
+	  creating a new image object on Tk.
+
+	* ext/tk/lib/tk/menu.rb: use TkCommandNames on create_self()
+
+	* ext/tk/lib/tk/root.rb: TkRoot.to_eval() returns '.'.
+
+	* ext/tk/lib/tk/text.rb: add methods to create a TkText::IndexString
+	  from (x, y) coords.
+
+	* ext/tk/lib/tkextlib/tile/: add demo and update support status.
+
+Sat Apr  9 14:42:29 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* sample/rss/tdiary_plugin/rss-recent.rb: supported configuration
+	  via Web browser.
+
+Sat Apr  9 11:59:57 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss: backoported from HEAD.
+
+	* lib/rss: refactored.
+	  - gave a name to 'x'.
+	  - undef_method -> remove_method for avoiding a warning in ruby 1.6.
+
+
+	* lib/rss/parser.rb: @@setter -> @@setters.
+
+	* lib/rss/parser.rb
+	  (RSS::BaseListener.register_uri)
+	  (RSS::BaseListener.uri_registered?)
+	  (RSS::BaseListener.install_get_text_element):
+	  swapped the first argument and the second argument.
+
+	* lib/rss/taxonomy.rb: swapped the first argument and the second
+	  argument for RSS::BaseListener.install_get_text_element.
+	* lib/rss/image.rb: ditto.
+	* lib/rss/syndication.rb: ditto.
+	* lib/rss/dublincore.rb: ditto.
+	* lib/rss/parser.rb: ditto.
+	* lib/rss/1.0.rb: ditto.
+	* lib/rss/2.0.rb: ditto.
+	* lib/rss/0.9.rb: ditto.
+	* lib/rss/content.rb: ditto.
+
+	* lib/rss/parser.rb
+	  (RSS::BaseListener.install_setter)
+	  (RSS::BaseListener.register_uri): changed fallback way.
+
+	* lib/rss/parser.rb: added class name registry for complex model
+	  elements. (ex. have childlen elements, have some attributes and
+	  a child element and so on.)
+
+
+	* lib/rss/dublincore.rb: supported multiple Dublin Core items.
+	* lib/rss/maker/dublincore.rb: ditto.
+
+	* lib/rss/maker/image.rb: supproted new Dublin Core API.
+
+
+	* lib/rss/maker/base.rb: added default current_element implementation.
+
+
+	* lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
+	  moved to RSS::Utils.
+
+	* lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
+	  moved from RSS::TrackBackUtils.
+
+
+	* lib/rss/maker/image.rb: fixed invalid argument of
+	  add_need_initialize_variable bug.
+	* lib/rss/maker/trackback.rb: ditto.
+
+
+	* lib/rss/rss.rb (Hash#merge): added for ruby 1.6.
+
+	* lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
+	  for date value.
+
+
+	* test/test_dublincore.rb: added tests for plural accessor and
+	  multiple Dublin Core items.
+
+	* test/test_setup_maker_1.0.rb: fixed swapped actual and expected
+	  values.
+
+	* test/rss/rss-assertions.rb (assert_multiple_dublin_core): added
+	  an assertion for testing multiple Dublin Core items.
+
+	* test/rss/test_maker_dc.rb (test_rss10_multiple): added a test
+	  for making multiple Dublin Core items.
+
+	* test/rss/test_maker_dc.rb (test_date): added a test for #date=
+	  and #dc_date=.
+
+
+	* sample/rss/tdiary_plugin/rss-recent.rb:
+	  new option: @options['rss-recent.use-image-link']:
+	  use image as link instread of text if available.
+
+	* sample/rss/tdiary_plugin/rss-recent.rb (RSS_RECENT_VERSION):
+	  0.0.5 -> 0.0.6.
+
+Fri Apr  8 20:17:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): hdrdir needs to be defined also in
+	  Config::CONFIG.
+
+	* lib/mkmf.rb (configuration, create_makefile): get rid of recursive
+	  macro reference.
+
+Fri Apr  8 18:26:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c: add callbacks to OpenSSL::SSL::SSLContexts.
+	  - SSLContext#client_cert_cb=(aProc). it is called when a client
+	    certificate is requested by a server and no certificate was not
+	    set for the SSLContext. it must return an Array which includes
+	    OpenSSL::X509::Certificate and OpenSSL::PKey::RSA/DSA objects.
+	  - SSLContext#tmp_dh_callback=(aProc). it is called in key
+	    exchange with DH algorithm. it must return an OpenSSL::PKey::DH
+	    object.
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): ignore the
+	  argument if it's nil.
+
+	* ext/openssl/ossl_pkey.c
+	  (GetPrivPKeyPtr, ossl_pkey_sign): should call rb_funcall first.
+	  (DupPrivPKeyPtr): new function.
+
+	* ext/openssl/ossl_pkey_dh.c: add default DH parameters.
+
+	* ext/openssl/ossl_pkey.h: ditto.
+
+Fri Apr  8 01:55:20 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
+	  [ruby-dev:25992]
+
+Thu Apr  7 23:58:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): keep directory names in Makefile as macros.
+
+	* lib/mkmf.rb (configuration, create_makefile): ditto.
+
+	* lib/mkmf.rb (CXX_EXT): separate C++ extensions.
+
+Thu Apr  7 17:43:25 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_call0): "return" event hook should be always executed
+	  if event_hooks is set.  fixed: [ruby-core:04662]
+	  (backported from HEAD)
+
+Mon Apr  4 23:17:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb (TkComm#array2tk_list): accept enc-mode argument to
+	  decide whether convert encoding of each element or not.
+
+	* ext/tk/lib/tk/variable.rb (TkVariable#value=): fail to convert the
+	  encoding of array elements when assign an array to an TkVariable
+	  object.
+
+Mon Apr  4 10:26:48 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tk/lib/tk/dialog.rb: fixed typo.
+
+Sun Apr  3 17:16:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.{h,c} (rb_w32_fdopen): avoid warning on bcc32.
+	  (backported from HEAD)
+
+Sat Apr  2 23:38:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (CP, INSTALL): get rid of less portable options.
+
+	* lib/mkmf.rb (configuration, create_makefile): correct configuration
+	  variable.
+
+	* {bcc32,win32,wince}/{Makefile.sub,setup.mak}: leave prefix empty in
+	  config.status for backward compatibility.  fixed: [ruby-core:04649]
+
+	* lib/mkmf.rb (create_makefile): ensure library directories get made
+	  before copying libraries there.
+
+Sat Apr  2 16:59:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: forgot to update RELEASE_DATE
+
+	* ext/tk/lib/tk/variable.rb: fix namespace trouble when autoloading
+
+	* ext/tk/lib/tk/palette.rb: define Tcl variable 'tkPalette' as global
+
+	* ext/tk/lib/tk/dialog.rb: use array2tk_list method when calling
+	  Tk.ip_eval.
+
+	* ext/tk/lib/tk/autoload.rb: add autoload entry 'TkDialogObj' and
+	  'TkWarningObj'
+
+Sat Apr  2 02:19:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb (TkWindow.initialize): accept 'without_creating'
+	  option without 'widgetname' option to allow creating a widget object
+	  which is used as an argument of Tcl/Tk's widget allocation commands.
+
+	* ext/tk/lib/tk/image.rb (TkImage.initialize): accept 'imagename'
+	  option to create a image object by the given name.
+
+Thu Mar 31 22:23:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (SRC_EXT): exclude just case different suffixes on case
+	  insensitive file system platforms.
+
+	* README.EXT, README.EXT.ja (Appendix C): utility functions.
+
+Thu Mar 31 14:15:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should return
+	  value. [ruby-dev:25971]
+
+Thu Mar 31 08:25:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (RUBYOPT): clear for the environment RubyGems installed.
+
+	* common.mk (clean-local): keep $(PREP) files till distclean.
+
+	* common.mk (check): do all tests.
+
+Thu Mar 31 06:00:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should not raise
+	  error even if the specified engine could not be loaded. (Dynamic
+	  engines don't have fixed name to load.)
+
+Thu Mar 31 00:18:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/ifchange.bat, win32/rm.bat: backported from HEAD.
+
+Wed Mar 30 23:44:50 2005  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* Makefile.in, */Makefile.sub, */configure.bat,
+	  cygwin/GNUmakefile.in, common.mk, configure.in, ext/extmk.rb,
+	  lib/mkmf.rb, instruby.rb, runruby.rb: backport extout.
+	  [ruby-dev:25963]
+
+Wed Mar 30 17:41:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: add TclTkIp#_create_console() method to
+	  create a Tcl/Tk's console window.
+
+	* ext/tk/lib/multi-tk.rb: support TclTkIp#_create_console() method.
+
+	* ext/tk/lib/remote-tk.rb: ditto.
+
+	* ext/tk/lib/tk/console.rb: ditto.
+
+	* ext/tk/lib/tk.rb: update RELEASE_DATE
+
+	* ext/tk/sample/demo-*/check2.rb: use 'return' in the Proc object.
+
+	* ext/tk/sample/tkextlib/**: ditto.
+
+Tue Mar 29 22:11:56 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_rinda.rb: use DRbObject.new_with instead of reinit.
+	  [ruby-dev:25961]
+
+Mon Mar 28 23:40:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: move method DRbObject#reinit to DRbObject.new_with.
+	  extract method DRbObject.prepare_backtrace. add DRb.regist_server,
+	  remove_server, fetch_server. change server in thread variable if
+	  in-proc server. [druby-ja:113]
+
+	* lib/drb/gw.rb: ditto.
+
+Mon Mar 28 20:43:34 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/rubyext.c: get rid of warnings caused by a bug of VC.
+
+Mon Mar 28 08:39:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_create): Iconv::Failure requires 3
+	  arguments.  (pointed out by NaHi)
+
+Sat Mar 26 22:51:33 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb (_callback_entry_class?): add for checking whether
+	  a class is available for a callback entry.
+
+	* ext/tk/lib/tk.rb (after_cancel): add Tk.after_cancel(afterID) method.
+
+	* ext/tk/lib/tk.rb (array2tk_list): change from private module method
+	  of TkComm to public module method.
+
+	* ext/tk/lib/tk.rb (cget): add check that slot argument is not
+	  empty string.
+
+	* ext/tk/lib/tk.rb (configinfo): ditto.
+
+	* ext/tk/lib/tk/itemconfig.rb (itemcget): add check that slot argument
+	  is not empty string.
+
+	* ext/tk/lib/tk/itemconfig.rb (itemconfiginfo): ditto.
+
+	* ext/tk/lib/tk/entry.rb: add TkEntry#icursor and icursor= (alias of
+	  cursor and cursor= method).
+
+	* ext/tk/lib/tk/font.rb: improve font treatment when the font name is
+	  empty string.
+
+	* ext/tk/lib/tk/variable.rb: add :variable, :window and :procedure
+	  type.
+
+	* ext/tk/lib/tk/variable.rb: improve treatment of array-type
+	  tkvariable.
+
+	* ext/tk/lib/tkextlib/blt.rb: add commands for zooming.
+
+	* ext/tk/lib/tkextlib/blt/*: bug fix.
+
+	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and add methods
+	  to call TreeCtrl commands for bindings.
+
+	* ext/tk/sample/tkextlib/blt/*: new sample scripts.
+
+	* ext/tk/sample/tkextlib/treectrl/*: ditto.
+
+Fri Mar 25 10:53:16 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (WIN32_LEAN_AND_MEAN): removed because a lot of
+	  troubles.  [ruby-list:40721]
+
+Thu Mar 24 23:10:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (macro_defined?): try to compile for an old compiler
+	  which doesn't bail out at #error directive.  [ruby-dev:25818]
+
+	* lib/mkmf.rb (check_sizeof): refine logging messages.
+
+Thu Mar 24 03:57:48 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/utils.rb (WEBrick::Utils.create_listeners):
+	  - should raise ArgumentError if no port is specified.
+	  - even if the specified port is 0, all TCPServers should be
+	  initialized with the port given to the first one.
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#initialize): if :Port
+	  parameter is 0, it should be updated with the port number which
+	  actually listened.
+
+Wed Mar 23 00:35:10 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/ruby/test_settracefunc.rb (test_event): added tests for
+	  "class" and "end" and "raise".
+
+Tue Mar 22 22:40:18 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_call0): check event_hooks instead of trace_func.
+
+Tue Mar 22 17:30:44 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_add_event_hook): new function to add a hook function for
+	  interpreter events. (backported form HEAD)
+
+Sun Mar 20 22:51:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (mkmf_failed): check if Makefile is created without
+	  create_makefile.
+
+Sat Mar 19 23:48:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-expr-beg): returned true always.
+	  fixed: [ruby-list:40683]
+
+Sat Mar 19 00:41:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/font.rb: add some TkFont class methods to get font
+	  information without creating a TkFont object.
+
+	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and define some
+	  classes for components of Tk::TreeCtrl
+
+Thu Mar 17 17:42:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (make_struct): allow non local-id field
+	  names. [ruby-core:04575]
+
+	* struct.c (inspect_struct): ditto.
+
+Wed Mar 16 23:36:02 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_call0): call_cfunc() should be protected.
+
+	* test/ruby/test_settracefunc.rb: added test for c-return.
+
+Wed Mar 16 22:20:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* object.c (str_to_id): fixed typo.
+
+Wed Mar 16 18:08:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): reorganize "return" event post.
+
+Tue Mar 15 23:49:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (Init_iconv): InvalidEncoding also should include
+	  Iconv::Failure.
+
+Tue Mar 15 16:38:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tkutil.c (ary2list): give wrong arguments to hash2kv()
+
+Mon Mar 14 19:39:33 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/timer.rb (TkTimer): forgot to clear @return_value
+	  when restarting
+
+	* ext/tk/lib/tk/sample/cd_timer.rb: new sample of TkRTTimer
+
+Mon Mar 14 12:21:03 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/timer.rb (TkRTTimer): forgot to reset the callback
+	  time. So, 'continue' do all callbacks between 'stop' and 'continue'.
+
+Mon Mar 14 08:14:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (str_to_id): warn for NUL containing strings.
+
+Mon Mar 14 00:13:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/timer.rb (TkRTTimer): correct calculation of offset
+	  value. get a little better accuracy.
+
+	* ext/tk/sample/demos-en/widget: use a binding with no local variables
+	  when eval a sample script.
+
+	* ext/tk/sample/demos-en/bind.rb: ditto.
+
+	* ext/tk/sample/demos-en/tcolor: ditto.
+
+	* ext/tk/sample/demos-jp/widget: ditto.
+
+	* ext/tk/sample/demos-jp/bind.rb: ditto.
+
+	* ext/tk/sample/demos-jp/tcolor: ditto.
+
+Sun Mar 13 10:04:17 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_rinda.rb: remove test_gc. [ruby-dev:25871]
+
+Thu Mar 10 19:12:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (lib_eventloop_ensure): mis-delete a timer
+	  handler when exit from a recursive called eventloop
+
+	* ext/tk/lib/tk/timer.rb: new TkRTTimer class, which can works for a
+	  realtime operation
+
+	* ext/tk/sample/tkrttimer.rb: sample of TkRTTimer class
+
+	* ext/tk/lib/tk/textmark.rb: move  TkTextMark#+ and TkTextMark#- to
+	  TkText::IndexModMethods
+
+	* ext/tk/lib/tk/text.rb: improve TkTextMark#+ and TkTextMark#-, and
+	  add them to TkText::IndexModMethods module
+
+	* ext/tk/sample/tktextio.rb: add test part of "seek by text index
+	  modifiers"
+
+Thu Mar 10 08:10:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (make_regexp): need to free internal regexp structure when
+	  compilation fails.  [ruby-talk:133228]
+
+Wed Mar  9 20:25:58 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_write): call
+	  rb_sys_fail if errno isn't 0. [ruby-dev:25831]
+
+	* ext/openssl/lib/openssl/cipher.rb: fix typo. [ruby-dev:24285]
+
+Wed Mar  9 15:46:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#start): should
+	  restore @token if accept failure. suggested by Dominique Brezinski.
+	  [ruby-core:04518]
+
+Wed Mar  9 13:37:57 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/tktextio.rb: fix bug of handling 'end' position.
+	  support initial text, overwrite setting and pos_gravity control.
+
+Tue Mar  8 18:16:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/tktextio.rb: New sample script. TkTextIO class in this
+	  sample supports to use a text widget as if it is a I/O stream (such
+	  like as StringIO class).
+
+Tue Mar  8 13:54:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c: workaround for some of 4.4BSD-Lite derived OSs.
+
+Tue Mar  8 12:36:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c: document from Sam Roberts
+	  <sroberts@uniserve.com> for getsockopt and setsockopt is merged.
+	  [ruby-doc:824]
+
+Tue Mar  8 01:27:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.66
+	  fixed: [ruby-dev:25828]
+
+Mon Mar  7 21:35:02 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* sample/webrick/httpsd.rb: fix typo in comment. suggested by
+	  Kazuhiko Shiozaki.
+
+Mon Mar  7 14:55:43 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (block_pass): should not push unique number if a block is
+	  not an orphan.  [ruby-dev:25808]
+
+Wed Feb 16 02:55:21 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
+	  ossl_ssl_write):
+	  - need to set errno on Win32 platform.
+	  - should call rb_sys_fail instead of rasing SSLError if
+	    SSL_ERROR_SYSCALL occured.
+	  - should wait for that the underlying IO become readable or
+	    writable if the error was SSL_ERROR_WANT_READ or
+	    SSL_ERROR_WANT_WRITE. [ruby-dev:25795]
+
+	* ext/openssl/lib/openssl/buffering.rb
+	  (Buffering#initialize): should set @eof and @rbuffer.
+	  (Buffering#fill_rbuff): should rescue Errno::EAGAIN.
+	  (Buffering#consume_rbuf): pointless eof flag resetting is deleted.
+	  (Buffering#read): should return an empty string if the specified
+	  size is zero.
+	  (Buffering#readpartial): new method.
+	  (Buffering#readline): fix typo.
+	  (Buffering#getc): return the first character of string correctly.
+	  (Buffering#each): fix typo.  suggested by Brian Ollenberger.
+	  (Buffering#readchar): fix typo.
+	  (Buffering#eof?): should read again it the input buffer is empty.
+	  (Buffering#do_write): should rescue Errno::EAGAIN.
+	  (Buffering#puts): use "\n" as the output field separator.
+
+	* ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
+	  underlying IO.
+
+	* ext/openssl/extconf.rb: get rid of GNUmakefile generation.
+
+	* text/openssl/test_pair.rb: test for IO like methods.
+
+	* test/ruby/ut_eof.rb: test about empty file.
+
+Mon Mar  7 10:22:06 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/un.rb: should use OptionParser. (backported form HEAD)
+
+Mon Mar  7 09:18:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_cmp_m): should not return false but nil.
+	  fixed: [ruby-dev:25811]
+
+Mon Mar  7 01:22:14 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tkutil.c: remove the some codes which depend on the
+	  difference between Ruby1.8 and 1.9, because st.c on Ruby1.9
+	  was changed.
+
+Mon Mar  7 00:01:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: fail to call TclTkLib.mainloop when $SAFE==4
+
+Sun Mar  6 16:41:33 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: HTTPHeader holds its header fields as an array
+	  (backport from CVS HEAD rev 1.112-1.123). [ruby-list:40629]
+
+	* test/net/http/test_httpheader.rb: new file.
+
+Sun Mar  6 11:47:10 2005  Sam Roberts  <sroberts@uniserve.com>
+
+	* lib/pp.rb: rdoced.  [ruby-core:4490]
+
+Sun Mar  6 11:36:37 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
+	  may return nil.  [ruby-talk:129826]
+	  reported by Daniel Berger.
+
+Sat Mar  5 18:06:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (fnmatch): removed unnecessary code. (ruby_1_8 didn't have
+	  String#clear, so [ruby-dev:24749] didn't affect it)
+
+	* win32/win32.c (NtInitialize): ditto. (by numeric.c 1.101.2.14)
+
+Sat Mar  5 16:29:26 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: freeze callback-entry objects
+
+	* ext/tk/lib/tkextlib/tile.rb: support tile-0.6
+
+Fri Mar  4 19:39:28 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
+	  also locally defined modules.
+
+	* ext/iconv/iconv.c: backport Iconv::InvalidEncoding from CVS HEAD.
+
+	* ext/strscan/strscan.c: moved misplaced rdoc.
+
+Fri Mar  4 15:58:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi-lib.rb: add deprecation warning. [ruby-dev:25499]
+	  getopts.rb, parsearg.rb, importenv.rb as well.
+
+Fri Mar  4 11:17:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_rbUpdateCommand): get rid of
+	  warnings with Tcl/Tk 8.3 or former (backport from CVS_HEAD).
+
+	* ext/tcltklib/tcltklib.c (ip_rb_threadUpdateCommand): ditto.
+
+Fri Mar  4 10:15:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/set.rb (SortedSet::setup): a hack to shut up warning.
+	  [ruby-talk:132866]
+
+Fri Mar  4 07:07:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
+
+Thu Mar  3 23:49:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.62
+
+Thu Mar  3 11:49:51 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* sample/rss/tdiary_plugin/rss-recent.rb: added site information.
+
+Wed Mar  2 19:53:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (parse_args): add DESTDIR only when not directed
+	  already.  fixed: [ruby-dev:25781]
+
+Wed Mar  2 17:14:18 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (lib_eventloop_core): fix typo
+
+Wed Mar  2 16:00:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: enforce thread-check and exception-handling
+	  to avoid SEGV trouble.
+	  [KNOWN BUG] When supports pthread and running multiple Tk
+	  interpreters, an interrupt signal causes SEGV frequently. That
+	  may be a trouble of Ruby's signal handler.
+
+	* ext/tk/tkutil/tkutil.c; fix a bug on converting a SJIS string array
+	  to a Tcl's list string.
+
+	* ext/tk/tcltklib.c: wrap Tcl's original "namespace" command to
+	  protect from namespace crash.
+
+	* ext/tk/lib/multi-tk.rb: enforce exception-handling.
+
+	* ext/tk/lib/multi-tk.rb: catch IRB_EXIT to work on irb.
+
+	* ext/tk/lib/tk.rb: ditto.
+
+	* ext/tk/tcltklib.c: add TclTkLib.mainloop_thread?
+
+	* ext/tk/lib/multi-tk.rb: (bug fix) callback returns a value.
+
+	* ext/tk/lib/tk/canvas.rb (delete): bug fix when multiple arguments.
+
+	* ext/tk/lib/clock.rb: fix 'no method error'.
+
+	* ext/tk/lib/clock.rb (self.clicks): accept a Symbol argument.
+
+	* ext/tk/lib/variable.rb: be able to set default_value_type; :numeric,
+	  :bool, :string, :symbol, :list, :numlist or nil (default; same to
+	  :string). If set a type, TkVariable#value returns a value of the
+	  type.
+
+	* ext/tk/lib/tkextlib/tclx/tclx.rb: add Tk::TclX.signal to warn the
+	  risk of using TclX extension's 'signal' command.
+
+	* ext/tk/sample/irbtk.rb: irb with Ruby/Tk.
+
+	* ext/tk/sample/demos-*/anilabel.rb: bug fix on 'show code'
+
+	* ext/tk/sample/demos-*/aniwave.rb: new Ruby/Tk animation demo.
+
+	* ext/tk/sample/demos-*/pendulum.rb: ditto.
+
+	* ext/tk/sample/demos-*/goldberg.rb: ditto.
+
+	* ext/tk/sample/demos-*/widget: add entries of animation demos.
+
+Tue Mar  1 00:47:43 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_rinda.rb: backport from CVS_HEAD. use
+	  MockClock.sleep instead of Kernel.sleep [ruby-dev:25387]
+
+Tue Mar  1 00:34:24 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/tuplespace.rb (Rinda::TupleSpace): improved keeper thread.
+
+	* test/rinda/test_rinda.rb: ditto.
+
+Mon Feb 28 11:42:23 2005  Ian Macdonald  <ian@caliban.org>
+
+	* exception error messages updated.  [ruby-core:04497]
+
+Mon Feb 28 09:03:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (Init_socket): add bunch of Socket
+	  constants.  Patch from Sam Roberts <sroberts@uniserve.com>.
+	  [ruby-core:04409]
+
+Wed Feb 23 15:04:32 2005  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/generic.rb (split_userinfo): should split ":pass" into ""
+	  and "pass".  [ruby-dev:25667]
+
+Wed Feb 23 08:00:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_s_create): no need for negative argc check.
+	  [ruby-core:04463]
+
+	* array.c (rb_ary_unshift_m): ditto.
+
+Wed Feb 23 01:57:46 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (initialize): handle certs correctly. Thanks,
+	  NABEYA Kenichi. (backported from CVS HEAD)
+
+Tue Feb 22 07:25:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): identfier after dot must not be a variable.
+
+Mon Feb 21 10:04:49 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.
+
+	* win32/win32.[ch] (fcntl): ditto.
+
+	* win32/win32.c (rb_w32_connect): support nonblocking mode.
+
+	* ext/socket/socket.c (wait_connectable, ruby_connect): support
+	  nonblocking connect on various platforms.
+	  all changes are backported from CVS HEAD. [ruby-core:3154],
+	  [ruby-core:4364].
+
+Sun Feb 20 00:48:48 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (URI::FTP#buffer_open): access mechanism
+	  re-implemented according to RFC 1738.
+	  reported by Guillaume Marcais.  [ruby-talk:131650]
+
+Sat Feb 19 18:11:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (DRbObject#respond_to?): take two arguments.
+	  [ruby-dev:25722]
+
+	* test/drb/drbtest.rb: ditto.
+
+Sat Feb 19 13:52:02 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb: call OpenSSL::SSL::SSLSocket#post_connection_check
+	  after connection is made.
+
+Sat Feb 19 01:32:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/bigdecimal/lib/bigdecimal/newton.rb: resolved LoadError.
+	  [ruby-dev:25685]
+
+	* ext/bigdecimal/sample/linear.rb: ditto.
+
+	* ext/bigdecimal/sample/nlsolve.rb: ditto.
+
+	* ext/bigdecimal/lib/bigdecimal/nlsolve.rb: removed because this file
+	  is sample script and same file exists in ext/bigdecimal/sample.
+
+Fri Feb 18 17:14:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
+	  of StandardError class, not Exception class.  [ruby-core:04429]
+
+Thu Feb 17 20:11:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/drb/drb.rb (DRbServer.default_safe_level): fix typo.
+
+Thu Feb 17 20:11:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/digest/test_digest.rb: separate test case for each algorithms.
+	  [ruby-dev:25412]
+
+Thu Feb 17 11:54:00 2005  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/collector.rb (collect_file): now deletes paths added
+	  to $LOAD_PATH instead of restoring it verbatim.
+
+	* lib/test/unit/autorunner.rb (AutoRunner.run): fixed so that
+	  'ruby -rtest/unit -rtest1 -rtest2 -e0' will use the objectspace
+	  collector again. Also tried to simplify the calling convention.
+
+	* test/runner.rb: adjusted for new AutoRunner semantics.
+
+	* lib/test/unit.rb: ditto.
+
+Thu Feb 17 04:21:47 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
+	  fixed: [ruby-core:04444]
+
+Thu Feb 17 00:09:45 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/ignore_test_drb.rb: move TestDRbReusePort to new file
+	  [ruby-dev:25238]
+
+	* test/drb/test_drb.rb: add method DRbService.ext_service, move
+	  TestDRbReusePort to new file [ruby-dev:25238]
+
+	* test/drb/test_drb.rb: ditto.
+
+	* test/drb/test_drbssl.rb: ditto.
+
+	* test/drb/test_drbunix.rb: ditto.
+
+	* test/drb/ut_drb.rb: reduce sleep.
+
+Thu Feb 17 00:02:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (is_defined): NODE_IASGN is an assignment.
+
+Wed Feb 16 23:34:30 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: add lazy stop_service. ([druby-ja:109])
+
+	* lib/drb/extserv.rb: ditto.
+
+Wed Feb 16 17:07:57 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tkutil.c: Follow the change of st.c (st_foreach)
+	  [ruby-list:40623].
+	  Sometimes mis-convert from a Ruby's Array of SJIS Strings, which
+	  includes some kind of SJIS characters, to a Tcl's UTF8 list string.
+
+Mon Feb 14 23:58:17 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb (RSS::ListenerMixin::tag_end):
+	  fixed invalid namespace handling bug.
+
+Mon Feb 14 13:12:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/ssl.rb
+	 (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
+
+Mon Feb 14 00:40:49 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (InvokeMethod.perform): pass DRb info to sub thread.
+
+	* test/drb/test_drb.rb (test_01_safe1_safe4_eval): fix test case.
+
+Sun Feb 13 23:13:46 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/dublincore.rb (RSS::DublicCoreModel#date{,=}): added
+	  convenient methods.
+
+	* lib/rss/0.9.rb (RSS::Rss::Channel#date{,=}): ditto.
+
+	* lib/rss/2.0.rb (RSS::Rss::Channel::Item#date{,=}): ditto.
+
+	* test/rss/: added tests for the convenient methods.
+
+Sun Feb 13 22:43:03 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (DRbServer): add default_safe_level, safe_level,
+	  config[:safe_level] ([druby-ja:120])
+
+	* test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
+
+Sun Feb 13 16:56:52 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase
+	  to the value of status header field. ([ruby-dev:40617])
+
+Sun Feb 13 00:52:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/erb.rb (ERB::Util.h, u): make it module_function.
+
+Sat Feb 12 17:29:19 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (OpenURI.open_loop): send authentication only for
+	  the URI directly specified.
+
+Sat Feb 12 15:07:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* random.c (rand_init): suppress warning.
+
+Sat Feb 12 13:54:03 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb: support https if the platform provides CA
+	  certificates.
+
+Sat Feb 12 06:18:28 2005  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+
+	* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check.
+	  [ruby-dev:25675]
+
+Fri Feb 11 17:40:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
+	  new method OpenSSL::X509::Store#set_default_paths.
+
+Fri Feb 11 11:33:53 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (URI::HTTP#proxy_open): new option supported:
+	  :http_basic_authentication.
+	  suggested by Kent Sibilev.  [ruby-core:4392]
+
+Fri Feb 11 06:30:07 2005  George Ogata  <g_ogata@optushome.com.au>
+
+	* misc/ruby-mode.el: ignore parenthesis inside heredoc.
+	  [ruby-core:04415]
+
+Fri Feb 11 04:54:13 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
+
+	* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
+
+	* lib/rdoc/generators/ri_generator.rb: ditto.
+
+Thu Feb 10 11:14:17 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (COMMON_HEADERS): shouldn't include winsock2.h.
+
+	* ext/socket/extconf.rb (sockaddr_storage): remove workaround for
+	  mswin32.
+
+Thu Feb 10 10:29:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
+	  window_color_set().
+
+Thu Feb 10 00:47:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (make_struct): fixed: [ruby-core:04402]
+
+Wed Feb  9 08:07:08 2005  Paul Duncan  <pabs@pablotron.org>
+
+	* ext/curses/curses.c (window_color_set): [ruby-core:04393]
+
+Tue Feb  8 23:51:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: reject :instance_eval, :class_eval, :module_eval
+	  [druby-ja:117]
+
+Tue Feb  8 13:06:12 2005  Sam Roberts  <sroberts@uniserve.com>
+
+	* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
+	  [ruby-talk:130092]
+
+Tue Feb  8 09:30:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::Cookie): [ruby-talk:130040]
+
+Tue Feb  8 00:19:02 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/resolv.rb (Resolv::DNS::Name#subdomain_of?): new method.
+	  (Resolv::DNS::Name#inspect): ditto.
+	  Suggested by Sam Roberts.  [ruby-talk:129086]
+
+Mon Feb  7 10:06:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c: [ruby-doc:818]
+
+Mon Feb  7 01:56:20 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* instruby.rb, rubytest.rb (srcdir): no longer embed srcdir into
+	  rbconfig.rb. (backported from CVS HEAD)
+
+	* ext/socket/extconf.rb (sockaddr_storage): winsock2.h have the
+	  definition of struct sockaddr_storage, but socket.c doesn't
+	  include it because this version of ruby still has binary level
+	  compatibility with winsock1.
+
+	* lib/mkmf.rb (create_makefile): should support header files in
+	  depend file.
+
+Mon Feb  7 01:21:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/extconf.rb: check if getaddrinfo() works fine only when
+	  wide-getaddrinfo option is not given.  fixed: [ruby-dev:25422]
+
+	* lib/mkmf.rb ($extmk): check if under ext directory.
+
+	* lib/mkmf.rb (Logging.postpone): allow recursive operation.
+
+	* lib/mkmf.rb (try_constant): make sure if really a constant, reduce
+	  the number of times of compile.
+
+	* lib/mkmf.rb (have_macro, have_var, byte_order): new functions.
+
+	* lib/mkmf.rb (find_library): allow directory list with separators.
+
+	* lib/mkmf.rb (arg_config): manage provided configuration options.
+
+	* lib/mkmf.rb (dir_config): accept arrays of directory names as
+	  default values.
+
+	* mkconfig.rb: no longer embed srcdir and compile_dir into
+	  rbconfig.rb.
+
+	* lib/mkmf.rb (create_makefile): fix unbalanced parens.
+
+Sun Feb  6 19:23:01 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (stack_extend): add prototype because VC++8 doesn't
+	  accept __declspec(noinline) with K&R style function definitions.
+	  (backported from CVS HEAD)
+
+Sun Feb  6 14:14:26 2005  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (new_with_hash): changed messages of exception.
+
+	* lib/date/format.rb (str[fp]time): undocumented conversion
+	  specifications %[1-3] are now deprecated.
+
+Sun Feb  6 12:20:11 2005  Akinori MUSHA  <knu@iDaemons.org>
+
+	* bignum.c (rb_big2ulong_pack): One too many arguments are passed
+	  to big2ulong().
+
+	* re.c (rb_reg_init_copy, rb_reg_initialize_m): One too many
+	  arguments are passed to rb_reg_initialize().
+
+Sun Feb  6 03:24:20 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/resolv.rb (Resolv::DNS::Resource::TXT): multiple strings was not
+	  handled.
+	  (Resolv::DNS::Resource::TXT#strings): new method to return all
+	  strings.
+	  (Resolv::DNS::Message::MessageEncoder#put_string_list): new method.
+	  (Resolv::DNS::Message::MessageDecoder#get_string_list): ditto.
+	  based on [ruby-talk:129732] by Sam Roberts.
+
+Fri Feb  4 00:30:45 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss: supported Image module.
+	  http://web.resource.org/rss/1.0/modules/image/
+
+Thu Feb  3 23:42:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_close, strio_close_read, strio_close_write):
+	  should return nil instead of self as well as IO.  [ruby-dev:25623]
+
+	* ext/stringio/stringio.c (strio_extend, strio_putc): fill with zero
+	  extended portion.  [ruby-dev:25626]
+
+Wed Feb  2 23:52:53 2005  sheepman  <sheepman@tcn.zaq.ne.jp>
+
+	* ext/stringio/stringio.c (strio_truncate): should MEMZERO an extended
+	  part.  [ruby-dev:25618]
+
+Wed Feb  2 21:56:01 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb (RSS::Element#convert): added.
+
+	* lib/rss/rss.rb: convert -> need_convert.
+
+	* lib/rss/1.0.rb: ditto.
+
+	* lib/rss/0.9.rb: ditto.
+
+	* lib/rss/2.0.rb: ditto.
+
+	* lib/rss/trackback.rb: ditto.
+
+Tue Feb  1 22:48:48 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (DRb::DRbObject#respond_to?): check marshal_dump and
+	_dump.
+
+Tue Feb  1 00:20:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (aix): fix linker flags on AIX.  [ruby-talk:125460]
+
+Mon Jan 31 13:33:21 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: add invalid namespace check
+
+	* ext/tk/lib/multi-tk.rb: add invalid_namespace? method
+
+	* ext/tk/lib/remote-tk.rb: ditto
+
+Mon Jan 31 10:29:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
+
+Sat Jan 29 09:42:12 2005  Sam Roberts  <sroberts@uniserve.com>
+
+	* lib/resolv.rb (Resolv::DNS::Resource::IN::SRV): Added RFC2782 SRV
+	  resource record for specifying location of services.
+
+Fri Jan 28 17:16:55 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf):
+	  parse options line for ndots option.
+	  (Resolv::Hosts#lazy_initialize): return self.
+	  (Resolv::DNS#lazy_initialize): ditto.
+	  (Resolv::DNS::Config#lazy_initialize): ditto.
+	  Suggested by Sam Roberts.
+
+Thu Jan 27 13:18:03 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* st.c (st_foreach): report success/failure by return value.
+	  [ruby-Bugs-1396]
+
+Thu Jan 27 00:15:29 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb (setup): support BSD-style
+	  directory group inheritance. (backport from HEAD, rev 1.32)
+
+	* test/fileutils/fileasserts.rb (assert_same_entry): show entry
+	  difference. (backport from HEAD, rev 1.4)
+
+Wed Jan 26 23:09:11 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb (WriteAdapter#puts): should append \n, not
+	  prepend. [ruby-talk:128302] (backport from HEAD, rev 1.75)
+
+Wed Jan 26 10:51:50 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (flock_winnt, flock_win95): unlock file even if
+	  LOCK_NB is specified. (backported from CVS HEAD)
+
+Tue Jan 25 17:11:51 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ruby.c (proc_options): correct -T option in RUBYOPT. (backported
+	  from CVS HEAD)
+
+Tue Jan 25 14:05:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: fix SEGV bug; trouble on canceling remained
+	  after scripts [ruby-dev:25479]: NULL current namespace when deleting
+	    Tk interpreter [ruby-talk:126225]
+
+	* ext/tcltklib/extconf.rb: bug fix; TCL_ENABLE_THREAD flag is inverted
+	  [ruby-talk:126360]
+
+	* ext/tcltklib/extconf.rb: add yet another native-thread check
+
+	* ext/tk/tkutil.c: fix SEGV bug; NULL string pointer when finalize
+	  Ruby interpreter
+
+	* ext/tk/lib/multi-tk.rb: avoid warning for deleted safeTk ip frame
+
+	* ext/tk/lib/tk/bindtag.rb: bug fix; new method of named bindtag
+	  doesn't return the created object [ruby-dev:25479]
+
+	* ext/tk/lib/tk/menu.rb: bug on treating arguments [ruby-dev:25479]
+
+	* ext/tk/lib/tk.rb: bug fix; cannot accept a callback ID string for
+	  a command argument [ruby-dev:25479]
+
+	* ext/tk/lib/multi-tk.rb: ditto
+
+	* ext/tk/lib/tk/*.rb: ditto
+
+	* ext/tk/lib/tkextlib/*.rb: ditto
+
+	* ext/tk/sample/demos-jp/anilabel.rb: new demo script
+
+	* ext/tk/sample/demos-en/anilabel.rb: ditto
+
+	* ext/tk/sample/tkHTML/ss.rb: local variable scope bug fix
+	  [ruby-dev:25479]
+
+Mon Jan 24 15:44:25 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
+
+	* lib/rdoc/parsers/parse_c.rb: allow whitespace after function names.
+	  [ruby-core:4296]
+
+	* lib/rdoc/parsers/parse_simple.rb: adds support for private comments
+	  in the "simple" parser. [ruby-core:4301]
+
+Mon Jan 24 15:44:25 2005  Charles Mills  <cmills@freeshell.org>
+
+	* lib/rdoc/parsers/parse_c.rb: adds support for constants
+	  (rb_define_const), accessors (rb_define_attr), and makes a
+	  couple fixes. [ruby-core:4307]
+
+Mon Jan 24 15:44:25 2005  Florian Gro  <florgro@gmail.com>
+
+	* lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
+	  [ruby-core:4302]
+
+Mon Jan 24 15:44:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* document updates - [ruby-core:04296], [ruby-core:04301],
+	  [ruby-core:04302], [ruby-core:04307]
+
+Sun Jan 23 12:41:16 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/wsdlDriver.rb: from 1.5.3-ruby1.8.2, operation which has
+	  capitalized name (such as KeywordSearchRequest in AWS) is defined as
+	  a method having uncapitalized name. (converted with
+	  GenSupport.safemethodname to handle operation name 'foo-bar').  it
+	  introduced serious incompatibility; in the past, it was defined as a
+	  capitalized.
+
+	  define capitalized method as well under that circumstance.
+
+Sun Jan 23 05:24:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_to_der): should call
+	  GetOCSPReq at first.
+
+Sat Jan 22 23:09:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/ssl.rb (accept): rescue SSLError. [druby-ja:110]
+
+Sat Jan 22 22:35:03 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/unix.rb: fail if UNIXFileOwner is set. [druby-ja:111]
+
+Fri Jan 21 23:58:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_set_pos): clear EOF flag.
+	  [ruby-talk:127511]
+
+Fri Jan 21 20:07:02 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/resolv.rb (Resolv::DNS::Config.resolv): don't raise ResolvError.
+	  reported by Sam Roberts.  [ruby-talk:127133]
+
+Fri Jan 21 16:58:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (rb_push_glob): should work for NUL delimited patterns.
+
+Fri Jan 21 13:58:37 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (u8tou16): fixed typo. fixed: [ruby-list:40546]
+	  (backported from CVS HEAD)
+
+Fri Jan 21 09:30:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* rubyio.h (rb_eof_error): should mark as NORETURN. (backported
+	  from CVS HEAD)
+
+Fri Jan 21 00:31:36 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/syck/rubyext.c (syck_parser_bufsize_set): avoid VC++ warning
+	  "local variable 'size' used without having been initialized".
+
+Thu Jan 20 19:03:24 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): shouldn't set $extflags on mswin32.
+
+	* win32/Makefile.sub (LIBRUBY_SO): should use $DLDOBJS instead of
+	  $EXTOBJS.
+	  fixed: [ruby-core:04290] (backported from CVS HEAD)
+
+Thu Jan 20 11:42:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_new4): should propagate taintedness.
+
+	* struct.c (rb_struct_set): use original method name, not callee
+	  name, to retrieve member slot.  [ruby-core:04268]
+
+	* time.c (time_strftime): protect from format modification from GC
+	  finalizers.
+
+Wed Jan 19 18:06:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/ipaddr.rb (to_s, test_to_s): too many colons with some cases.
+	  (backported from CVS HEAD)
+
+Wed Jan 19 01:16:30 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf): ignore
+	  domain and search directive without an argument.
+	  reported by Sam Roberts.  [ruby-talk:126781]
+
+Tue Jan 18 15:03:05 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
+	  of :SSLEnable is false.
+
+	* lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
+	  don't allow changing its mode.
+
+	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
+	  should delete trailing LF from the result of pack("m*").
+
+	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
+	  - should delete trailing LF from the result of pack("m*").
+	  - clear Request-Line not to send the response by HTTPServer#run.
+
+	* lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
+	  refine regexp (and change the name of a local variable).
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
+	  new method to escape URI path component.
+
+	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
+	  escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
+
+	* test/webrick/*, sample/webrick/httpproxy.rb: add new file.
+
+Mon Jan 17 23:33:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (aix): fix typo.  [ruby-talk:126401]
+
+Mon Jan 17 07:08:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/readline.c: suppress warnings.
+
+	* lib/irb/extend-command.rb (IRB::ContextExtender.def_extend_command):
+	  ditto.
+
+	* lib/irb/ext/history.rb (IRB::Context::set_last_value): ditto.
+
+	* lib/irb/ext/history.rb (IRB::Context::eval_history): ditto.
+
+	* lib/irb/locale.rb (IRB::Locale::real_load): ditto.
+
+	* lib/irb/slex.rb (SLex::Node::create_subnode): remove garbage.
+
+Mon Jan 17 00:09:42 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/uri/common.rb (PORT): typo fix. fixed: [ruby-core:04256]
+
+Sat Jan 15 14:57:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): ignore trailing CRs at the end of short
+	  options as well as long options.  fixed: [ruby-core:04232]
+
+Sat Jan 15 13:35:16 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb (RSS::VERSION): 0.1.2 -> 0.1.3.
+
+	* lib/rss/rss.rb: accept inheritance. [ruby-talk:126104]
+
+Thu Jan 13 04:48:53 2005  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (io_fread): don't warn nonblocking behavior by default.
+
+Wed Jan 12 00:36:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_class_superclass): superclass of singleton class also
+	  should be a singleton class.  fixed: [ruby-list:40519]
+
+Tue Jan 11 09:44:40 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* numeric.c (Init_Numeric): turn off floating point exceptions
+	  on bcc32. "1e300".to_f had crashed by overflow.
+
+Tue Jan 11 03:10:10 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (copy_entry): could not copy symbolic link.
+	  [ruby-talk:125733]
+
+	* lib/fileutils.rb (copy_stream): use read/write instead of
+	  sysread/syswrite.
+
+Mon Jan 10 23:08:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_autoload): hide internal data from ruby level.
+	  fixed: [ruby-dev:25435], [ruby-list:40498]
+
+Mon Jan 10 01:22:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_data_object_alloc): klass may be NULL.
+	  [ruby-list:40498]
+
+Sun Jan  9 03:12:58 2005  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (io_fread): warn nonblocking behavior.
+	  (io_readpartial): new method IO#readpartial.
+
+Sat Jan  8 04:38:47 2005  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml.rb: Kernel#y requires an argument.
+
+Fri Jan  7 21:12:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
+
+	* random.c (rand_init): use ALLOC_N instead of ALLOCA_N
+	  [ruby-dev:25426]
+
+Fri Jan  7 18:03:35 2005  Tanaka Akira  <akr@m17n.org>
+
+	* gc.c (mark_locations_array): avoid core dump with -O3.
+	  [ruby-dev:25424]
+
+Thu Jan  6 20:31:07 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/zlib/zlib.c (zstream_end): should return value. (backported
+	  from CVS HEAD)
+
+Thu Jan  6 19:55:13 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.c (rb_w32_close): didn't close socket handle.
+	  [ruby-dev:25414]
+
+	* win32/win32.c (rb_w32_open_osfhandle): bcc32's _open_osfhandle
+	  never set EMFILE.
+
+Thu Jan  6 17:14:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* random.c (random_seed): O_NONBLOCK isn't defined on some
+	  platforms. [ruby-dev:25417]
+
+Thu Jan  6 13:45:35 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/time.rb: recognize +00:00 and GMT as a localtime.
+
+Thu Jan  6 07:58:28 2005  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/usage.rb (RDoc::RDoc.usage_no_exit): Allow for colons
+	  in path names on DOS machines. (thanks to Johan Nilsson)
+
+Wed Jan  5 20:16:32 2005  Tanaka Akira  <akr@m17n.org>
+
+	* random.c (limited_big_rand): didn't work if SIZEOF_BDIGITS == 2.
+	  [ruby-dev:25408]
+
+	* random.c (random_seed): refined.
+
+Wed Jan  5 12:49:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_initialize): Thread objects cannot be initialized
+	  again.  fixed: [ruby-core:04067]
+
+Wed Jan  5 10:48:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* dir.c (dir_s_mkdir): win32 special processing doesn't need any
+	  longer. (backported from CVS HEAD)
+
+	* win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
+	  interface. (backported from CVS HEAD)
+
+	* win32/win32.[ch] (rb_w32_rmdir): new function. (backported from CVS
+	  HEAD)
+
+Wed Jan  5 02:30:11 2005  Tanaka Akira  <akr@m17n.org>
+
+	* random.c (init_by_array): imported from mt19937ar-cok.tgz.
+	  (genrand_int32): ditto.
+	  (genrand_real): replaced with genrand_res53 in mt19937ar-cok.
+	  (rand_init): support bignum for longer seed.
+	  (random_seed): generate longer seed.
+	  (make_mask): new function.
+	  (limited_rand): ditto.
+	  (limited_big_rand): ditto.
+	  (rb_f_rand): call limited_rand and limited_big_rand.
+	  [ruby-dev:25403]
+
+Tue Jan  4 23:25:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_rand): should return positive random number.
+	  [ruby-dev:25401]
+
+Tue Jan  4 11:15:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
+
+	* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
+	  random bignums.  [ruby-dev:25396]
+
+Mon Jan  3 14:01:54 2005  Tanaka Akira  <akr@m17n.org>
+
+	* random.c (random_seed): don't use /dev/urandom if it is not
+	  character device.
+
+Mon Jan  3 11:37:42 2005  Tanaka Akira  <akr@m17n.org>
+
+	* random.c (random_seed): use /dev/urandom if available.
+	  [ruby-dev:25392]
+
+Mon Jan  3 07:46:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
+	  raise NotImplementedError if password is encrypted by digest
+	  algorithms. This patch is contributed by sheepman. [ruby-list:40467]
+
+	* lib/webrick/httpauth/digestauth.rb
+	  (WEBrick::HTTPAuth::DigestAuth#_authenticate): fix digest calculation.
+	  This patch is contributed by sheepman. [ruby-list:40482]
+
+	* lib/webrick/{httpauth.rb,httpauth/basicauth.rb,httpproxy.rb}: use
+	  pack/unpack-template char "m" instead of lib/base64.rb to do base64
+	  encoding/decoding. fixed: [ruby-dev:25336]
+
+	* test/webrick/test_httpauth.rb: new file.
+
+Sat Jan  1 04:20:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ns_spki.c (ossl_spki_set_challenge): should call
+	  StringValue before GetSPKI. fixed: [ruby-dev:25359].
+
+Sat Jan  1 01:13:28 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_autoload): [ruby-dev:25373]
+
+Fri Dec 31 14:10:43 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item): Fix problem
+	  if heading contains formatting.
+
+Thu Dec 30 00:41:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (svalue_to_avalue): [ruby-dev:25366]
+
+	* string.c (rb_str_justify): [ruby-dev:25367]
+
+Wed Dec 29 11:07:07 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/template/html/kilmer.rb: Update to use new
+	  sections.
+
+Tue Dec 28 22:31:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_justify): create buffer string after argument type
+	  conversion.  fixed: [ruby-dev:25341]
+
+Tue Dec 28 15:41:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (reinit): should initialize all static
+	  variables.  fixed: [ruby-list:40445]
+
+Tue Dec 28 15:25:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): second byte is up to
+	  0xfe.
+
+	* ext/nkf/lib/kconv.rb (Kconv#kconv): should handle UTF8 and UTF16
+	  properly.
+
+Tue Dec 28 13:35:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate): ensure
+	  freeing internal zstreams.  fixed: [ruby-dev:25309]
+
+	* ext/zlib/zlib.c (rb_deflate_init_copy): replace rb_deflate_clone.
+
+Tue Dec 28 12:26:45 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub, win32/setup.mak (RDOCTARGET, install,
+	  install-nodoc, install-doc): rdoc support for mswin32.
+
+	* win32/configure.bat (--enable-install-doc, --disable-install-doc):
+	  ditto.
+
+Mon Dec 27 20:02:14 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: fix SEGV bug when deleting Tk interp
+
+	* ext/tk/lib/multi-tk.rb: ditto
+
+Mon Dec 27 16:55:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): should use
+	  rb_hash_new to get exactly a Hash. fix [ruby-dev:25325].
+
+Mon Dec 27 16:29:56 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_justify): [ruby-dev:25341]
+
+Mon Dec 27 15:47:48 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/fileasserts.rb: sync with HEAD.
+
+	* test/fileutils/test_fileutils.rb: ditto.
+
+	* test/fileutils/test_nowrite.rb: ditto.
+
+Mon Dec 27 15:21:07 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mv): should raise error when moving a
+	  directory to the (empty) directory. [ruby-talk:124368]
+	  (backport from HEAD 1.48)
+
+	* lib/fileutils.rb (mv): wrongly did not overwrite file on Win32
+	  platforms. (backport from HEAD 1.48)
+
+Sat Dec 25 11:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* stable version 1.8.2 released.
+
+Sat Dec 25 04:23:49 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mkdir, mkdir_p): should ensure directory
+	  permission. (backportted from HEAD, 1.47)
+
+	* lib/fileutils.rb (traverse, remove_dir): untaint trasted
+	  objects. (backportted from HEAD, 1.46)
+
+Sat Dec 25 01:28:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c: cancel io_reopen() change on Dec. 24th.
+
+	* dln.c: use <dlfcn.h> for NetBSD.  [ruby-dev:25313]
+
+	* io.c (rb_f_select): IO list could be altered.  [ruby-dev:25312]
+
+Fri Dec 24 23:51:48 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub: bcc32 should use RTL dll (backport from HEAD)
+	  [ruby-dev:25306]
+
+	* win32/win32.[ch]: ditto.
+
+Fri Dec 24 23:27:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/image.rb: TkPhotoImage#cget bug fix
+
+Fri Dec 24 18:39:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
+	  [ruby-dev:25306]
+
+Fri Dec 24 02:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_reopen, rb_io_reopen): prohibit to change access mode for
+	  special IO ports.  [ruby-dev:25225]
+
+Fri Dec 24 02:22:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/rubyext.c (rb_syck_io_str_read): [ruby-core:03973]
+
+	* ext/syck/rubyext.c (syck_loader_transfer): check type conversion.
+
+	* ext/syck/rubyext.c (syck_parser_assign_io, rb_new_syck_node): duck
+	  typing.
+
+	* ext/syck/rubyext.c (syck_parser_s_alloc, syck_parser_initialize):
+	  allocation framework.
+
+	* ext/syck/rubyext.c (syck_emitter_s_alloc, syck_emitter_initialize):
+	  ditto.
+
+Fri Dec 24 01:21:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/blt.rb: add BLT extension support
+
+	* ext/tk/lib/tkextlib/blt/*.rb: ditto
+
+	* ext/tk/lib/tkextlib/blt/tile/*.rb: ditto
+
+Thu Dec 23 23:36:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (proc_setgroups): check if the argument lenght is
+	  modified.  fixed: [ruby-dev:25285]
+
+Thu Dec 23 13:13:33 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: define TclTkLib::COMPILE_INFO and
+	  RELEASE_DATE
+
+	* ext/tcltklib/extconf.rb: ditto
+
+	* ext/tk/tkutil.c: define TkUtil::RELEASE_DATE
+
+	* ext/tk/lib/tk.rb: define Tk::RELEASE_DATE
+
+Thu Dec 23 09:38:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_reopen): restore exact mode.  fixed: [ruby-core:04003]
+
+Thu Dec 23 00:16:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (bsdi): use $(CC) for LDSHARED.  fixed [ruby-dev:25270]
+
+Wed Dec 22 11:14:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_mode_modenum): replace O_ACCMODE with O_RDWR.
+	  fixed: [ruby-dev:25273]
+
+Wed Dec 22 08:34:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/sym.c (rb_dlsym_initialize): extract internal pointers after
+	  all argument conversion.  fixed: [ruby-dev:25271]
+
+Wed Dec 22 00:08:01 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/*, test/soap/*, sample/soap/authheader/*: eval cleanup.
+
+Tue Dec 21 22:07:33 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
+	  ossl_asn1_decode_all): temporary value should be marked volatile.
+
+Tue Dec 21 14:40:02 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
+	  ossl_asn1_decode_all): use rb_str_new4 to avoid SEGV.
+	  fix [ruby-dev:25261]
+
+	* test/openssl/test_asn1.rb: add tests for OpenSSL::ASN1.
+
+Tue Dec 21 12:22:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_reopen): keep duplex pipe in correct mode for exception
+	  safeness.  fixed: [ruby-dev:25152]
+
+Tue Dec 21 12:10:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/grid.rb: rescue bug of 'grid configure' on Tcl/Tk8.3-
+
+Tue Dec 21 00:53:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse): [ruby-dev:25261]
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): ditto.
+
+Mon Dec 20 23:22:26 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* added files:
+	  * lib/soap/mapping/wsdl*.rb
+	  * lib/wsdl/soap/element.rb
+	  * lib/wsdl/xmlSchema/simpleContent.rb
+
+	* modified files:
+	  * lib/soap/*
+	  * lib/wsdl/*
+	  * lib/xsd/*
+	  * test/soap/*
+	  * test/wsdl/*
+	  * test/xsd/*
+	  * sample/soap/*
+	  * sample/sdl/*
+
+	* summary
+	  * imported from the soap4r repository.  Version: 1.5.3-ruby1.8.2
+
+	  * added several XSD basetype support: nonPositiveInteger,
+	    negativeInteger, nonNegativeInteger, unsignedLong, unsignedInt,
+	    unsignedShort, unsignedByte, positiveInteger
+
+	  * HTTP client connection/send/receive timeout support.
+
+	  * HTTP client/server gzipped content encoding support.
+
+	  * improved WSDL schema definition support; still is far from
+	    complete, but is making step by step improovement.
+
+Mon Dec 20 22:56:39 2004  Tanaka Akira  <akr@m17n.org>
+
+	* gc.c (stack_end_address): gcc noinline attribute is available since
+	  gcc-3.1.
+
+Mon Dec 20 14:07:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: supports new features of Tcl/Tk8.5a2
+
+	* ext/tk/lib/tk/clock.rb: ditto
+
+	* ext/tk/lib/tk/text.rb: ditto
+
+	* ext/tk/lib/tk/panedwindow.rb: ditto
+
+Mon Dec 20 12:47:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/net/https.rb,protocols.rb,telnets.rb: delete
+	  doc and code about SSLContext#{key_file,cert_file}.
+	  fixed: [ruby-dev:25243]
+
+Mon Dec 20 12:42:17 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (io_fwrite): workaround for MSVCRT's bug.
+	  fixed: [ruby-core:03982]
+
+Mon Dec 20 11:21:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_eof): check if closed before clearerr().
+	  fixed: [ruby-dev:25251]
+
+Mon Dec 20 03:30:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/cgi/session.rb (CGI::Session#initialize): empty session id was
+	  used if request had no session key.  fixed: [ruby-core:03981]
+
+Mon Dec 20 01:51:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (make_struct): [ruby-dev:25249]
+
+Mon Dec 20 00:28:20 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/encodings/SHIFT-JIS.rb: backported from CVS HEAD.
+
+	* lib/rexml/encodings/SHIFT_JIS.rb: ditto.
+
+Sun Dec 19 17:19:48 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509store.c
+	  (ossl_x509store_set_time): add OpenSSL::X509::Store#time=.
+	  (ossl_x509stctx_set_time): add OpenSSL::X509::StoreContext#time=.
+
+	* test/openssl/ossl_x509store.rb: test certificate validity times.
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): add optional
+	  second argument to specify the output format (see also
+	  X509_NAME_print_ex).
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_init): new constants:
+	  OpenSSL::X509::Name::COMPAT, OpenSSL::X509::Name::RFC2253,
+	  OpenSSL::X509::ONELINE, OpenSSL::X509::MULTILINE.
+
+	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name::RFC2253DN):
+	  new module to provide the parse for RFC2253 DN format.
+
+	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name.parse_rfc2253):
+	  new method to parse RFC2253 DN format.
+
+	* test/openssl/ossl_x509name.rb: add tests about RFC2253 DN.
+
+	* text/openssl/ssl_server.rb: try to listen ports from 20443 to 20542
+	  while EADDRINUSE is raised.
+
+	* all changes in this entry are backport from 1.9.
+
+Sun Dec 19 17:24:59 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (enable_rpath): use rpath flag to embed the library
+	  path into extensions on ELF environment.  [ruby-dev:25035]
+
+Sun Dec 19 11:01:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb: use standalone runner for -e.
+
+	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): accept
+	  multiple -p and -x options.
+
+	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#recursive_collect):
+	  ditto.
+
+Sat Dec 18 16:36:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate):
+	  disallow interrupt by type conversion.  fixed: [ruby-dev:25226]
+
+Sat Dec 18 15:16:41 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/webrick/httpauth.rb,
+	  lib/webrick/httpauth/{basicauth.rb,digestauth.rb}: use
+	  pack/unpack-template char "m" instead of lib/base64.rb to do base64
+	  encoding/decoding.
+
+Sat Dec 18 10:51:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_open_dir): new function.  [ruby-dev:25242]
+
+Fri Dec 17 18:07:01 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/readline/test_readline.rb: fix for BSD. Thanks, GOTOU Yuuzou.
+	  fixed: [ruby-dev:25218]
+
+Fri Dec 17 16:28:12 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: fix bug on setting up system encoding
+
+	* ext/tk/lib/tk/event.rb: fix error on require process
+
+	* ext/tk/lib/tk/font.rb: fix abnormal termination error on Windows
+
+	* ext/tk/lib/tk/virtevent.rb: TkVirtualEvent::PreDefVirtEvent.new()
+	  accepts event-sequence arguments
+
+	* ext/tk/lib/tk/text.rb: fail to dump embedded images
+
+	* ext/tk/lib/tk/text.rb: tag_nextrange and tag_prevrange returns wrong
+	  types of values
+
+	* ext/tk/lib/tk/texttag.rb: nextrange and prevrange returns wrong
+	  types of values
+
+	* ext/tk/lib/tk/text.rb: add TkText::IndexModMethods module and
+	  TkText::IndexString class to treat text index modifiers
+
+	* ext/tk/lib/tk/texttag.rb: use TkText::IndexModMethods module
+
+	* ext/tk/lib/tk/textmark.rb: ditto
+
+	* ext/tk/lib/tk/textimage.rb: ditto
+
+	* ext/tk/lib/tk/textwindow.rb: ditto
+
+	* ext/tk/lib/tk/textimage.rb: wrong gravity of text mark for embedded
+	  image
+
+	* ext/tk/lib/tk/textwindow.rb: wrong gravity of text mark for
+	  embedded window
+
+Fri Dec 17 13:50:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
+
+	* vms/vmsruby_private.c, vms/vmsruby_private.h: private routines
+	  for VMS port are added.
+
+	* eval.c (ruby_init): change to call VMS private intialization routine.
+
+Fri Dec 17 13:33:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/cgi/session.rb (CGI::Session#initialize): control adding
+	  session_id hidden fields.  fixed: [ruby-talk:123850]
+
+Thu Dec 16 23:25:25 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb, lib/drb/ssl.rb: backported from CVS HEAD.
+	  [druby-ja:101]
+
+	* test/drb/test_drb.rb: adjust and reduce sleep (backported from
+	  CVS HEAD.)
+
+Thu Dec 16 18:44:58 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
+	  for reading request till data arrive. [ruby-talk:121068]
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
+	  should log about all accepted socket. [ruby-core:03962]
+
+	* lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
+	  "%%" and "%u" are supported. [webricken:135]
+
+	* lib/webrick/httpservlet/filehandler.rb
+	  (WEBrick::HTTPServlet::FileHandler#check_filename):
+	  :NondisclosureName is acceptable if it is Enumerable.
+
+	* lib/webrick/config.rb (WEBrick::Config::FileHandler):
+	  default value of :NondisclosureName is [".ht*", "*~"].
+
+Thu Dec 16 18:36:52 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl.c (ossl_raise): refine message format.
+
+Thu Dec 16 16:29:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/demos-en/widget: modify version check for
+	  supporting features
+
+Thu Dec 16 16:03:50 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/bindtag.rb: bug fix [ruby-talk: 123667]
+
+	* ext/tk/lib/tk/timer.rb: accept :idle for the interval argument
+
+	* ext/tk/lib/tk.rb: add TkComm._callback_entry?()
+
+	* ext/tk/lib/multi-tk.rb: add MultiTkIp.cb_entry_class
+
+	* ext/tk/lib/tk/canvas.rb: use TkComm._callback_entry?()
+
+	* ext/tk/lib/tk/canvastag.rb: ditto
+
+	* ext/tk/lib/tk/dialog.rb: ditto
+
+	* ext/tk/lib/tk/optiondb.rb: ditto
+
+	* ext/tk/lib/tk/text.rb: ditto
+
+	* ext/tk/lib/tk/texttag.rb: ditto
+
+	* ext/tk/lib/tk/textwindow.rb: ditto
+
+	* ext/tk/lib/tk/timer.rb: ditto
+
+	* ext/tk/lib/tk/validation.rb: ditto
+
+	* ext/tk/lib/tkextlib/*: ditto
+
+Thu Dec 16 03:14:28 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (basic_encode): return value of pack('m') may
+	  include multiple CR/LFs.  Backported from main trunk (rev 1.112).
+	  [ruby-dev:25212]
+
+Thu Dec 16 00:33:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (Init_Hash): remove custom "hash" and "eql?".
+
+Wed Dec 15 18:57:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/set.rb (Set::eql): wrong definition.  [ruby-dev:25207]
+
+Wed Dec 15 18:48:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/curses/curses.c (window_subwin): call NUM2INT() before
+	GetWINDOW(). (backported from CVS HEAD)
+
+Wed Dec 15 17:03:50 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.[ch] (rb_w32_isatty): new function to replace MSVCRT's
+	  isatty because it never sets errno. (backported from CVS HEAD)
+
+Wed Dec 15 15:39:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_to_a): avoid SEGV
+	  (rollback the previous commit).
+
+Wed Dec 15 16:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_id_obsolete): warn always.
+
+	* eval.c (rb_enable_super): ditto.
+
+Wed Dec 15 15:31:02 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/set.rb (Set#==): [ruby-dev:25206]
+
+Wed Dec 15 14:22:10 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_fdisset): check whether the handle is valid.
+	  fixed: [ruby-core:03959]
+
+Wed Dec 15 10:30:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198]
+
+Tue Dec 14 17:10:09 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_close): need to reset osfhnd().
+
+Tue Dec 14 14:03:57 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl.c (ossl_raise): avoid buffer overrun.
+	  [ruby-dev:25187]
+
+Tue Dec 14 12:36:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi/session.rb (CGI::Session::initialize): generate new
+	  session if given session_id does not exist.  [ruby-list:40368]
+
+Mon Dec 13 18:13:52 2004  Tanaka Akira  <akr@m17n.org>
+
+	* gc.c (stack_end_address): new function to obtain stack end address.
+	  stack_end_address calls __builtin_frame_address(0) to obtain the
+	  frame pointer of a stack frame of stack_end_address.  The address
+	  is the stack pointer of the caller's stack frame.
+	  (SET_STACK_END): use stack_end_address.
+	  This makes the conservative garbage collector to scan a stack frame
+	  of the garbage_collect function itself.  This is required because
+	  callee-save registers may be stored in the frame.
+	  [ruby-dev:25158]
+
+Mon Dec 13 00:58:02 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (cleanpath_aggressive): make it private.
+	  (cleanpath_conservative): ditto.
+	  Suggested by Daniel Berger.  [ruby-core:3914]
+
+Sun Dec 12 20:06:38 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: backported from CVS HEAD.
+
+Sun Dec 12 10:35:10 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Don't
+	  show an accessor's r/w flag if none was specified
+
+Sun Dec 12 10:14:03 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/rdoc.rb (RDoc::RDoc::parse_files): Never exclude files
+	  explicitly given on the command line.
+
+Sun Dec 11 23:54:07 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/*: update to support libraries in ActiveTcl8.4.12.0
+	  (see ext/tk/ChangeLog.tkextlib).
+
+	* ext/tk/sample/scrollframe.rb: add a new sample.
+
+Sat Dec 11 20:12:21 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: add DRbRemoteError. [ruby-list:40348],
+	  [ruby-list:40390]
+
+	* test/drb/drbtest.rb: ditto.
+
+	* test/drb/ut_drb.rb: ditto.
+
+Sat Dec 11 15:38:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/jcode.rb (String::succ): [ruby-dev:25156]
+
+Sat Dec 11 12:41:55 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (run_trap_eval): prototype; avoid VC++ warnings.
+
+	* ext/socket/getaddrinfo.c: fix typo. fixed: [ruby-core:03947]
+
+	* win32/win32.c: need to include dln.h.
+
+Sat Dec 11 00:10:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_reopen): [ruby-dev:25150]
+
+Fri Dec 10 08:39:27 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_listen): get OpenFile just before calling
+	  listen(2).  fixed: [ruby-dev:25149]
+
+Thu Dec  9 17:00:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
+
+	* ext/socket/socket.c, ext/socket/getaddrinfo.c: port to VMS
+
+Thu Dec  9 16:31:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/sdbm/init.c (GetDBM): typo.
+
+Thu Dec  9 16:05:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
+
+	* defines.h: change path of vms.h
+	* vms/vms.h: delete reference for snprintf()
+	* vms/config.h: new file
+	* vms/config.h_in: deleted
+
+Thu Dec  9 14:38:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_inspect): escape # which starts an expression
+	  substitution.  fixed: [ruby-core:03922]
+
+	* string.c (rb_str_dump): not escape # which isn't a substitution.
+
+Thu Dec  9 10:54:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/dbm/dbm.c (fdbm_select): [ruby-dev:25132]
+
+	* ext/sdbm/init.c: ditto.
+
+	* ext/gdbm/gdbm.c: ditto.
+
+Thu Dec  9 03:08:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_init): set root-win title to "ruby" when
+	  the running script is '-e one-liner' or '-' (stdin).
+
+	* ext/tcltklib/extconf.rb: add find_library("#{lib}#{ver}",..) for
+	  stub libs
+
+	* ext/tk/lib/tk/textmark.rb: TkTextMarkCurrent and TkTextMarkAnchor
+	  have a wrong parent class.
+
+	* ext/tk/lib/tk/dialog.rb: rename TkDialog2 --> TkDialogObj and
+	  TkWarning2 --> TkWarningObj (old names are changed to alias names)
+
+	* ext/tk/lib/tk/dialog.rb: bug fix of treatment of 'prev_command'
+	  option and hashes for configuration
+
+	* ext/tk/lib/tk/dialog.rb: add TkDialogObj#name to return the
+	  button name
+
+	* ext/tk/lib/tk/radiobutton.rb: rename enbugged method value() ==>
+	  get_value() and value=(val) ==> set_value(val).
+
+	* ext/tk/lib/tk/menu.rb: add TkMenu.new_menuspec
+
+	* ext/tk/lib/tk/menu.rb: add alias (TkMenuButton = TkMenubutton,
+	  TkOptionMenuButton = TkOptionMenubutton)
+
+	* ext/tk/lib/tk/event.rb: new method aliases (same as option keys of
+	  event_generate) for Event object
+
+	* ext/tk/lib/tk/font.rb: configinfo returns proper types of values
+
+	* ext/tk/lib/tk.rb: bind methods accept subst_args + block
+
+	* ext/tk/lib/tk/canvas.rb: ditto
+
+	* ext/tk/lib/tk/canvastag.rb: ditto
+
+	* ext/tk/lib/tk/frame.rb: ditto
+
+	* ext/tk/lib/tk/text.rb: ditto
+
+	* ext/tk/lib/tk/texttag.rb: ditto
+
+	* ext/tk/lib/tk/toplevel.rb: ditto
+
+	* ext/tk/lib/tkextlib/*: ditto and bug fix
+
+Wed Dec  8 23:54:29 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Typo
+	  meant that h2 tag was invisible.
+
+Wed Dec  8 21:56:31 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss, test/rss, sample/rss: backported from CVS HEAD.
+
+Wed Dec  8 14:31:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_fwrite): change dereference for cosmetic reason.
+
+	* sprintf.c (rb_f_sprintf): [ruby-dev:25104]
+
+Tue Dec  7 19:08:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
+
+	* io.c (io_fwrite): fix offset incrementation (for VMS and Human68k)
+
+Tue Dec  7 00:27:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (proc_setgroups): [ruby-dev:25081]
+
+Mon Dec  6 18:08:10 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_eqq): document fix.  [ruby-talk:122541]
+
+Mon Dec  6 17:19:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* rubysig.h (TRAP_BEG, TRAP_END): safe errno around CHECK_INTS.
+	  (backported from CVS HEAD)  [ruby-dev:24993]
+
+Mon Dec  6 10:18:17 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in):
+	  Oops - 1.8 doesn't have String#clear
+
+Mon Dec  6 09:59:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_connect): use rb_str_new4().
+	  [ruby-dev:25052]
+
+Mon Dec  6 01:42:08 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
+	  ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
+	  ossl_rsa_private_decrypt): should take an optional argument
+	  to specify padding mode. [ruby-talk:122539]
+
+	* ext/openssl/ossl_pkey_rsa.c (Init_ossl_rsa): add new constants
+	  PKCS1_PADDING, SSLV23_PADDING, NO_PADDING and PKCS1_OAEP_PADDING
+	  under OpenSSL::PKey::RSA.
+
+	* test/openssl/test_pkey_rsa.rb: new file.
+
+Sun Dec  5 19:39:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::Completion#complete): new parameter
+	  to direct case insensitiveness.
+
+	* lib/optparse.rb (OptionParser#order!): ignore case only for long
+	  option.  [ruby-dev:25048]
+
+Sat Dec  4 22:54:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_write): remove rb_str_locktmp().  [ruby-dev:25050]
+
+	* io.c (io_fwrite): takes VALUE string as an argument.
+	  [ruby-dev:25050]
+
+	* ext/socket/socket.c (sock_connect): remove rb_str_locktmp().
+	  [ruby-dev:25050]
+
+	* ext/socket/socket.c (udp_connect): [ruby-dev:25045]
+
+	* ext/socket/socket.c (udp_bind): ditto.
+
+	* ext/socket/socket.c (udp_send): ditto.
+
+	* ext/socket/socket.c (bsock_send): ditto.
+
+	* ext/socket/socket.c (s_recvfrom): ditto.
+
+	* hash.c (rb_hash_hash): should provide "hash" method where "eql?"
+	  is redefined.  [ruby-talk:122482]
+
+Sat Dec  4 14:54:52 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* eval.c (proc_invoke): use volatile `tmp' rather than `args'.
+	  [ruby-core:03882]
+
+Sat Dec  4 14:28:56 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/code_objects.rb (RDoc::Context::Section::set_comment):
+	  Section comments may now be bracketed by lines which are
+	  ignored. You can now write
+	      # -----------
+	      # :section: Dave's Section
+	      # comment material
+	      # -----------
+	   The lines before :section: are removed, and identical lines at the end are
+	   also removed if present.
+
+Sat Dec  4 03:33:45 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/readline/readline.c: check $SAFE. (backported from CVS HEAD)
+
+	* test/readline/test_readline.rb: added tests for readline.
+	  (backported from CVS HEAD)
+
+Sat Dec  4 02:24:00 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c: add constant NKF::VERSION
+
+	* ext/nkf/nkf.c(guess): this becomes an alias of guess2
+
+	* ext/nkf/test.rb(mime_out2): add --no-cp932
+
+	* ext/nkf/nkf-utf8/nkf.c: original nkf2 revision 1.47
+
+Sat Dec  4 00:35:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (bsock_setsockopt): [ruby-dev:25039]
+
+Fri Dec  3 18:57:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/ostruct.rb: 1.9 marshaling support back-ported.
+	  [ruby-core:03871]
+
+Fri Dec  3 13:45:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): copy arguments to frame.argv.
+	  [ruby-core:03861]
+
+Fri Dec  3 12:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.h: fix prototypes.
+
+Fri Dec  3 00:21:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (convert_type): use rb_respond_to() again.
+	  [ruby-dev:25021]
+
+	* eval.c (rb_respond_to): funcall respond_to? if it's redefined.
+	  [ruby-dev:25021]
+
+Fri Dec  3 01:55:24 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: widget configuration by TkWindow#method_missing
+	  returns proper object. "widget.option = val" returns val, and
+	  "widget.option(val)" returns self.
+
+	* ext/tk/lib/tk/font.rb: TkFont#replace accepts only one font argument.
+
+	* ext/tk/lib/tk/radiobutton.rb: add TkRadiobutton#value and
+	  TkRadiobutton#value=(val).
+
+	* ext/tk/lib/tk/spinbox.rb: callback substitution support on
+	  command option.
+
+	* ext/tk/sample/demos-en/widget: bug fix (wrong image height)
+
+	* ext/tk/sample/demos-jp/widget: ditto.
+
+Fri Dec  3 00:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_file_initialize): [ruby-dev:25032]
+
+Thu Dec  2 16:41:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_protect): prevent continuations created inside from being
+	  called from the outside.  [ruby-dev:25003]
+
+	* eval.c (rb_callcc, rb_cont_call): prohibit calling from different
+	  signal contexts.  [ruby-dev:25022]
+
+Thu Dec  2 09:57:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/ostruct.rb (OpenStruct::Marshaler): OpenStruct can be
+	  marshaled again.  [ruby-core:03862]
+
+Thu Dec  2 09:30:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (thread_mark): mark thread group.  [ruby-dev:25020]
+
+	* eval.c (thgroup_add): check whether the argument is really a Thread.
+
+Thu Dec  2 07:57:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_ctl): [ruby-dev:25019]
+
+Wed Dec  1 02:21:02 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* signal.c (sighandler): call handler immediately only for default
+	  handlers.  [ruby-dev:25003]
+
+Tue Nov 30 23:38:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_fread): need not to null terminate.  [ruby-dev:24998]
+
+	* io.c (read_all): remove unnecessary rb_str_resize().
+	  [ruby-dev:24996]  (backported from CVS HEAD)
+
+	* io.c (io_readpartial): ditto.
+
+	* io.c (io_read): ditto.
+
+Tue Nov 30 16:18:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_fread): need not to null terminate.  [ruby-dev:24998]
+
+	* io.c (read_all): remove unnecessary rb_str_resize().
+	  [ruby-dev:24996]
+
+	* io.c (io_read): ditto.
+
+Tue Nov 30 00:49:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_sysread): use temporary lock.  [ruby-dev:24992]
+
+Mon Nov 29 16:06:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_write): insufficiently filled string
+	  being extended when overwriting.  [ruby-core:03836]
+
+Mon Nov 29 15:59:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/ostruct.rb (OpenStruct::method_missing): check method
+	  duplication for -d.
+
+	* lib/ostruct.rb (OpenStruct::initialize): ditto.
+
+Mon Nov 29 15:22:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/io/nonblock/test_flush.rb: abandon tests when io/nonblock is
+	  not supported.
+
+Mon Nov 29 03:08:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (convert_type): direct call conversion methods for the
+	  performance.  [ruby-core:03845]
+
+	* eval.c (rb_funcall_rescue): new function.
+
+	* object.c (rb_Array): avoid using rb_respond_to().
+
+	* object.c (rb_Integer): ditto.
+
+	* parse.y (reduce_nodes): empty body should return nil.
+
+	* string.c (rb_str_aset): the original string should not be
+	  affected by modifying duplicated string.  [ruby-dev:24981]
+
+Mon Nov 29 13:57:38 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): search executable file if no program
+	  name given. (backported from CVS HEAD)
+
+Mon Nov 29 13:37:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (fptr_finalize): must not use FILE after fclose().
+	  [ruby-dev:24985]
+
+Mon Nov 29 13:16:31 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): push back the last space before next
+	  loop because CharNext() eats it.
+
+Mon Nov 29 01:18:18 2004  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (rb_io_check_writable): call io_seek regardless of
+	  NEED_IO_SEEK_BETWEEN_RW.  [ruby-dev:24986]
+
+Sat Nov 27 21:43:39 2004  Tanaka Akira  <akr@m17n.org>
+
+	* io.c: avoid data lost with nonblocking fd and
+	  stdio buffering in sync mode.  [ruby-dev:24966]
+	  based on matz's patch [ruby-dev:24967]
+	  (io_fwrite): new primitive writing function which writes
+	  directly if sync mode.
+	  (rb_io_fwrite): wrapper for io_fwrite now.
+	  (io_write): call io_fwrite instead of rb_io_fwrite.
+
+Sat Nov 27 14:44:15 2004  Kent Sibilev  <ksibilev@bellsouth.net>
+
+	* lib/cgi/session.rb (CGI::Session::initialize): create_new_id is
+	  now a instance method.  [ruby-core:03832]
+
+Sat Nov 27 09:41:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_fread): old rb_io_fread with file closing checking.
+	  (rb_io_fread): wrapper for io_fread now.
+	  [ruby-dev:24964]
+
+Fri Nov 26 18:02:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: Tk.destroy uses TkWindow#epath
+
+	* ext/tk/lib/tk/image.rb: bug fix
+
+	* ext/tk/lib/tk/wm.rb: add 'iconphoto' method(Windows only)
+
+	* ext/tk/lib/tkextlib/*: some methods uses TkWindow#epath
+
+Fri Nov 26 13:49:06 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (method_missing): raise TypeError for classes do not
+	  have allocators.  [ruby-core:03752]
+
+	* lib/erb.rb: add RDoc by James Edward Gray II.  [ruby-core:03786]
+
+Fri Nov 26 13:29:02 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in): Break
+	  out of preprocessing when we find a :section: directive (previously cleared out the
+	  comment, but this apparently now generates an error in gsub!)
+
+Fri Nov 26 00:17:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_read): move StringValue() check before GetOpenFile().
+	  [ruby-dev:24959]
+
+Thu Nov 25 20:14:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/thwait.rb (ThreadsWait#join_nowait): abnormally terminated
+	  threads should be also processed.  [ruby-talk:121320]
+
+Thu Nov 25 10:14:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (push_braces): do not reuse buffer strings.  [ruby-core:03806]
+
+Thu Nov 25 07:59:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (read_all): stringify non-nil buffer argument, and always
+	  taint the result.  [ruby-dev:24955]
+
+Wed Nov 24 01:01:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_read): integer conversion should be prior to
+	  GetOpenFile().  [ruby-dev:24952]
+
+	* configure.in, io.c: cancel [ ruby-Patches-1074 ].
+
+Tue Nov 23 08:09:50 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/menu.rb: improve usability of TkOptionMenubutton
+
+Tue Nov 23 02:00:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_file_chown): integer conversion should be prior to
+	  GetOpenFile().  [ruby-dev:24949]
+
+Tue Nov 23 00:10:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_file_chown): integer conversion should be prior to
+	  GetOpenFile().  [ruby-dev:24947]
+
+	* file.c (rb_file_truncate): ditto.
+
+	* file.c (rb_file_s_truncate): ditto.
+
+	* dir.c (dir_seek): use NUM2OFFT().
+
+	* misc/ruby-mode.el (ruby-non-block-do-re): should not match words
+	  start with block keyword and underscore.  [ruby-core:03719]
+
+Mon Nov 22 22:33:02 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Don't use names
+	  of variables or constants when oarsing 'require'
+
+Mon Nov 22 00:13:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_seek): should retrieve dir_data after NUM2INT().
+	  [ruby-dev:24941]
+
+Sat Nov 20 23:57:33 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/README (et al): Add a new directive, :section:, and
+	  change the output format to accomodate. :section: allows to to
+	  group together methods, attributes, constants, etc under
+	  headings in the output. If used, a table of contents is
+	  generated.
+
+Sat Nov 20 23:56:54 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/options.rb (Options::parse): Force --inline-source if
+	  --one-file option given
+
+Sat Nov 20 23:55:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_splice): should place index wrapping after
+	  possible modification.  [ruby-dev:24940]
+
+Sat Nov 20 13:26:03 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/utf8tbl.c: original revision 1.7
+
+Sat Nov 20 05:34:24 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: original nkf.c rev:1.40
+
+	* ext/nkf/test.rb: add test for mime encode/decode
+
+Sat Nov 20 01:37:34 2004  Johan Holmberg  <holmberg@iar.se>
+
+	* eval.c (error_print): nicer traceback at interrupt.
+	  [ruby-core:03774]
+
+Sat Nov 20 00:07:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_gsub): internal buffer should not be listed by
+	  ObjectSpace.each_object() by String#gsub.  [ruby-dev:24931]
+
+Fri Nov 19 01:20:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi/session.rb (CGI::Session::FileStore::initialize): raise
+	  exception if data corresponding to session specified from the
+	  client does not exist.
+
+Fri Nov 19 00:59:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_gsub): internal buffer should not be listed by
+	  ObjectSpace.each_object().  [ruby-dev:24919]
+
+Thu Nov 18 18:41:08 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_stringchar.rb (test_bang): added.
+
+	* string.c (rb_str_upcase_bang, rb_str_capitalize_bang)
+	(rb_str_swapcase_bang): missing rb_str_modify().  [ruby-dev:24915]
+
+Thu Nov 18 00:21:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (proc_getpgrp): prohibit for $SAFE=2.
+	  [ruby-dev:24899]
+
+	* process.c (get_pid): ditto.  [ruby-dev:24904]
+
+	* process.c (get_ppid): ditto.
+
+	* array.c (rb_ary_delete): defer rb_ary_modify() until actual
+	  modification.  [ruby-dev:24901]
+
+Thu Nov 18 10:10:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c, rubyio.h (rb_io_modenum_flags): exported.
+
+	* ext/stringio/stringio.c (strio_initialize): allow Fixnum as mode as
+	  well as IO.new does.  [ruby-dev:24896]
+
+Wed Nov 17 23:42:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_settracefunc.rb: added.  [ruby-dev:24884]
+
+Wed Nov 17 13:56:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (newline_node): should not use FL_SET. [ruby-dev:24874]
+
+	* parse.y (string_content): should not use FL_UNSET.
+
+	* node.h (NODE_NEWLINE): remove unused bit to utilize flag field
+	  in nodes.
+
+Wed Nov 17 13:09:40 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc32,win32,wince}/Makefile.sub (test): should build ruby.exe
+	  before running test. [ruby-core:03756]
+
+Wed Nov 17 04:33:01 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* pack.c: all features are backport from 1.9. [ruby-dev:24826]
+
+	* bignum.c (rb_big2ulong_pack): new function to pack Bignums.
+
+Wed Nov 17 03:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_splice): move rb_str_modify() after
+	  StringValue(), which may alter the receiver.  [ruby-dev:24878]
+
+Tue Nov 16 23:45:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flo_divmod): protect float values from GC by
+	  assignment to local variables.  [ruby-dev:24873]
+
+Tue Nov 16 16:30:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc32,win32,wince}/setup.mak (-epilogue-): remove config.h and
+	  config.status to force updating them.
+
+Tue Nov 16 16:20:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_read): position was ignored when a
+	  buffer was passed.  http://www.yo.rim.or.jp/~nov/d/?date=20041116#p03
+
+Tue Nov 16 11:19:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::options): use
+	  Regexp conversion.
+
+Tue Nov 16 01:41:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_mod_check): frozen check should be separated.
+	  [ruby-core:3742]
+
+	* array.c (rb_ary_update): pedantic check to detect
+	  rb_ary_to_ary() to modify the receiver.  [ruby-dev:24861]
+
+Mon Nov 15 13:50:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_justify): typo fixed.  [ruby-dev:24851]
+
+Mon Nov 15 11:50:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-special-char-p, ruby-parse-partial): handle
+	  operator symbols.  [ruby-talk:120177]
+
+Sun Nov 14 13:27:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pp.rb (PP#object_address_group): remove odd number of 'f'
+	  prefixed to negative address.
+
+Sun Nov 14 08:51:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/logger/test_logger.rb: Logger just expects
+	  Logger#datetime_format to be used for Time#strftime independently of
+	  locale. [ruby-dev:24828]
+
+Fri Nov 12 15:03:26 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (ruby_options): now we cannot call rb_glob() before
+	  ruby_init(), so call rb_w32_cmdvector() at ruby_options().
+
+	* win32.{c,h} (rb_w32_cmdvector): rename make_cmdvector() and
+	  export it.
+
+Fri Nov 12 14:08:01 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/event.rb: remove $LOADED_FEATURES trick
+
+	* ext/tk/lib/tk.rb: ditto
+
+Fri Nov 12 00:31:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/gdbm/gdbm.c (fgdbm_store): StringValue() may alter string
+	  pointer.  [ruby-dev:24783]
+
+Thu Nov 11 17:36:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (rb_globi): also should call back via rb_glob_caller().
+	  [ruby-dev:24775]
+
+Thu Nov 11 16:47:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_file.rb (test_truncate_wbuf): we want to test
+	  only File#truncate, not behaviour of seek(2).
+
+Thu Nov 11 09:41:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (push_braces): was confusing VALUE and char*.
+
+	* dir.c (rb_push_glob): Dir.glob should have called its block.
+
+Thu Nov 11 01:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (syserr_initialize): use stringified object.
+	  [ruby-dev:24768]
+
+Wed Nov 10 22:49:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (SimpleDelegator::dup): wrong number of
+	  arguments.
+
+	* lib/delegate.rb (DelegateClass::dup): ditto.
+
+Wed Nov 10 12:31:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.EXT (Example): extconf.rb is indispensable now.
+
+Wed Nov 10 03:33:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: fix SEGV when compiled with Tcl/Tk8.3.x
+	  or older
+
+	* ext/tk/lib/tkextlib/tile/style.rb: bug fix
+
+Tue Nov  9 14:27:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::Officious): moved from DefaultList.
+
+Tue Nov  9 01:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (rb_glob2): do not allocate buffer from heap to avoid
+	  memory leaks.  use string object for buffering instead.
+	  [ruby-dev:24738]
+
+	* dir.c (join_path): ditto.
+
+	* io.c (io_read): external input buffer may be modified even after
+	  rb_str_locktmp().  [ruby-dev:24735]
+
+	* dir.c (fnmatch): p or s may be NULL.  [ruby-dev:24749]
+
+Tue Nov  9 00:53:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* regex.c (slow_match): avoid GCC 3.4.x warnings.
+
+Tue Nov  9 00:50:06 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/rdoc.rb: Change version numbering of RDoc and ri
+
+Mon Nov  8 23:38:35 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/extservm.rb: add DRb::ExtServManager#uri=.
+	  [ruby-dev:24743]
+
+Mon Nov  8 22:20:19 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
+	  Fix bug where parent class wasn't being detected if the
+	  child class was defined using the A::B notation.
+
+Mon Nov  8 00:14:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: add setup for mignw32 cross compiling.
+	  [ruby-talk:119413]
+
+Sun Nov  7 23:49:26 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: bind-event methods accept multi substitution
+	  arguments.
+
+	* ext/tk/lib/tk/canvas.rb: ditto.
+
+	* ext/tk/lib/tk/canvastag.rb: ditto.
+
+	* ext/tk/lib/tk/text.rb: ditto.
+
+	* ext/tk/lib/tk/texttag.rb: ditto.
+
+	* ext/tk/lib/tkextlib: ditto.
+
+Sat Nov  6 14:58:44 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/server.rb (WEBrick::HTTPServer#start): remove
+	  :DoNotReverseLookup option. (Socket#do_not_reverse_lookup is a
+	  ruby 1.9 feature)
+
+Sat Nov  6 11:31:04 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb (_parse): checks whether zone was given.
+
+Sat Nov  6 00:46:27 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_locktmp): check STR_TMPLOCK flag before
+	  locking.  [ruby-dev:24727]
+
+Fri Nov  5 18:12:42 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/scrollable.rb: divide Scrollable module into
+	  X_Scrollable and Y_Scrollable
+
+	* ext/tk/lib/tk/entry.rb: include X_Scrollable instead of Scrollable
+
+	* ext/tk/lib/tk/autoload.rb: define autoload for X_Scrollable and
+	  Y_Scrollable
+
+Fri Nov  5 16:05:32 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: TkComm._at() supprts both of "@x,y" and "@x"
+
+Fri Nov  5 13:22:58 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/text.rb: sorry. bug fix again.
+
+Fri Nov  5 13:17:54 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/text.rb: bug fix
+
+Fri Nov  5 08:52:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_mark): stricter GC stack check.
+
+Fri Nov  5 08:52:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_mark): stricter GC stack check.
+
+Fri Nov  5 08:34:43 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_gsub): should have removed rb_str_unlocktmp(str).
+	  [ruby-dev:24708]
+
+Thu Nov  4 21:25:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_gsub): string modify check no longer based on
+	  tmplock.  [ruby-dev:24706]
+
+Thu Nov  4 19:27:46 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_f_open): fix typo.
+
+Thu Nov  4 15:02:14 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/variable.rb: forget to initialize instance_variables
+	  of TkVarAccess objects
+
+Thu Nov  4 09:11:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_mark): enable GC stack checking.
+
+Thu Nov  4 03:11:33 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_gsub): lock strings temporarily.  [ruby-dev:24687]
+
+	* ext/socket/socket.c (s_recvfrom): tmplock input buffer.
+	  [ruby-dev:24705]
+
+Wed Nov  3 22:32:12 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c: On NetBSD don't use setruid() and setrgid().
+
+Wed Nov  3 22:24:17 2004  Daigo Moriwaki  <techml@sgtpepper.net>
+
+	* lib/webrick/httpauth/digestauth.rb: use Base64.encode64 to
+	  avoid warnings.
+
+Wed Nov  3 17:19:59 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_uniq_bang): do not push frozen string from hash
+	  table.  [ruby-dev:24695]
+
+	* array.c (rb_ary_and): ditto.
+
+	* array.c (rb_ary_or): ditto.
+
+Wed Nov  3 17:13:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* io.c (pipe_open): fix compile error
+
+Wed Nov  3 16:58:07 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: support to use different Tcl commands between
+	  configure and configinfo
+
+	* ext/tk/lib/font.rb: ditto.
+
+	* ext/tk/lib/itemconfig.rb: support to use different Tcl commands
+	  between item_configure and item_configinfo
+
+	* ext/tk/lib/itemfont.rb: ditto.
+
+	* ext/tk/extconf.rb: install SUPPORT_STATUS
+
+	* ext/tk/lib/tkextlib: some bug fixes (see ext/tk/ChangeLog.tkextlib)
+
+Wed Nov  3 16:30:41 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf: follow nkf 2.0.4
+
+Wed Nov  3 15:53:34 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rss/test_maker_*.rb: added tests for RSS Maker.
+
+	* lib/rss/maker.rb: added RSS Maker.
+
+	* lib/rss/maker/*.rb: ditto.
+
+Tue Nov  2 16:35:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/enumerator/enumerator.c (each_cons_i): pass copy of an
+	  internal consequent array.  [ruby-talk:118691]
+
+Tue Nov  2 16:05:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_f_fork): need to flush stdout and stderr before
+	  fork(2).  [ruby-talk:117715]
+
+Tue Nov  2 01:20:09 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): nail down dyna_var node when Proc object
+	  or continuation is created.  [ruby-dev:24671]
+
+Mon Nov  1 13:59:28 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb (MANIFEST): do not use anymore, use extconf.rb instead.
+
+	* ext/enumerator/extconf.rb, ext/fcntl/extconf.rb,
+	  ext/stringio/extconf.rb: added.
+
+	* MANIFEST, ext/**/MANIFEST: removed.
+
+	* README.EXT, README.EXT.ja: remove MANIFEST stuff.
+
+Mon Nov  1 01:14:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_open): create copy of popen specifier.  [ruby-dev:24656]
+
+Mon Nov  1 00:36:48 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* main.c (_stklen): move to gc.c.
+
+Sun Oct 31 00:22:28 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_locktmp): lock string temporarily.
+
+	* string.c (str_independent): add tmplock check.
+
+	* io.c (io_write): lock output string temporarily.
+	  [ruby-dev:24649]
+
+	* io.c (io_write): use rb_str_locktmp().
+
+	* io.c (read_all): ditto.
+
+Sat Oct 30 06:53:24 2004  Peter Vanbroekhoven  <peter.vanbroekhoven@cs.kuleuven.ac.be>
+
+	* eval.c (rb_eval): NODE_XSTR should pass copy of literal string.
+
+Sat Oct 30 00:19:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_sort_by): protect continuation jump in.
+	  [ruby-dev:24642]
+
+Fri Oct 29 21:27:51 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_check_initialized): new function to check uninitialized
+	  object.  [ruby-talk:118234]
+
+	* file.c (rb_file_path), io.c (rb_io_closed): check if initialized.
+
+Fri Oct 29 10:00:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_start_0): forget to free some memory chunks.
+	  [ruby-core:03611]
+
+	* eval.c (ruby_cleanup): ruby_finalize_1 may cause exception,
+	  should be wrapped by PUSH_TAG/POP_TAG().  [ruby-dev:24627]
+
+Thu Oct 28 08:42:02 2004  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (argf_forward): use ANSI style.
+	  (argf_read): call argf_forward with argv argument.
+	  [ruby-dev:24624]
+
+Thu Oct 28 23:32:54 2004  akira yamada  <akira@ruby-lang.org>
+
+	* ext/zlib/zlib.c (zstream_detach_input): resets klass of z->input if
+	  z->input isn't nil.
+
+Thu Oct 28 23:19:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: prefer relative path.  [ruby-talk:93037]
+
+Wed Oct 27 18:49:11 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c: prototype; rb_io_fptr_finalize() doesn't return any value
+	  at this version.
+
+Wed Oct 27 17:27:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_sweep): recover ruby_in_compile variable.
+
+Wed Oct 27 09:17:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_gsub): use a string object for exception safeness.
+	  [ruby-dev:24601]
+
+Tue Oct 26 23:52:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_getline): rs modification check should not interfere in the loop.
+
+Tue Oct 26 23:30:39 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/code_objects.rb (RDoc::Context::add_class_or_module):
+	  Restore correct :nopdoc: behavior with nested classes and modules.
+
+Tue Oct 26 18:21:29 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (RESIZE_CAPA): check string attribute before modifying
+	  capacity member of string structure.  [ruby-dev:24594]
+
+Tue Oct 26 11:33:26 2004  David G. Andersen  <dga@lcs.mit.edu>
+
+	* ext/zlib/zlib.c (gzreader_gets): use memchr() to to gain
+	  performance.  [ruby-talk:117701]
+
+Tue Oct 26 10:56:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): raise ArgumentError for extra
+	  arguments, unless (digit)$ style used.
+
+Tue Oct 26 11:33:26 2004  David G. Andersen  <dga@lcs.mit.edu>
+
+	* ext/zlib/zlib.c (gzreader_gets): use memchr() to to gain
+	  performance.  [ruby-talk:117701]
+
+Tue Oct 26 10:56:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): raise ArgumentError for extra
+	  arguments, unless (digit)$ style used.
+
+Mon Oct 25 18:35:39 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.c (isUNCRoot): should check NUL after '.'.
+	  [ruby-dev:24590]
+
+	* win32/win32.c (isUNCRoot): fixed buffer overrun.
+
+Mon Oct 25 08:03:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (get_backtrace): ignore illegal backtrace.  [ruby-dev:24587]
+
+Sun Oct 24 00:41:09 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_load, search_required, rb_require_safe, rb_require): use
+	  frozen shared string to avoid outside modification.  [ruby-dev:24580]
+
+Sat Oct 23 22:18:32 2004  Guy Decoux  <ts@moulon.inra.fr>
+
+	* eval.c (frame_free): Guy Decoux solved the leak problem.
+	  Thanks.  [ruby-core:03549]
+
+Sat Oct 23 00:20:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/zlib/zlib.c (zstream_append_input): clear klass for z->input
+	  to avoid potential vulnerability.
+
+	* ext/zlib/zlib.c (zstream_run): always use zstream_append_input()
+	  to avoid SEGV.  [ruby-dev:24568]
+
+Fri Oct 22 12:02:28 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_alias): was warning for wrong condition.
+	  [ruby-dev:24565]
+
+Fri Oct 22 10:36:37 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#meta_vars):
+	  should check if path_info is not nil.
+
+Fri Oct 22 00:22:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/zlib/zlib.c (zstream_shift_buffer): should restore class
+	  field of a buffer.  [ruby-dev:24562]
+
+Fri Oct 22 00:20:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_include): should not treat char as negative value.
+	  [ruby-dev:24558]
+
+Thu Oct 21 21:32:30 2004  IWATSUKI Hiroyuki  <don@na.rim.or.jp>
+
+	* lib/pstore.rb (PStore#transaction): Use the empty content when a
+	  file is not found.  [ruby-dev:24561]
+
+Thu Oct 21 19:06:15 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#send_body_io):
+	  ensure to close @body. (http://bugs.debian.org/277520)
+
+Thu Oct 21 00:36:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_alias): should warn on method discarding.
+	  [ruby-dev:24546]
+
+	* ext/zlib/zlib.c (zstream_expand_buffer_into): hide internal
+	  string buffer by clearing klass.  [ruby-dev:24548]
+
+Wed Oct 20 19:45:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_gsub): 	reentrant check.  [ruby-dev:24432]
+
+	* backport all SEGV bug fixes from CVS HEAD.  [ruby-dev:24536]
+
+Wed Oct 20 04:17:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/dbm/dbm.c (fdbm_delete_if): should check if deleting element
+	  is a string.  [ruby-dev:24490]
+
+	* ext/sdbm/init.c (fsdbm_delete_if): ditto.
+
+Wed Oct 20 01:37:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_times): Array#* should return an instance of
+	  the class of right operand.  [ruby-dev:24526]
+
+	* ext/zlib/zlib.c (zstream_detach_buffer): should not expose
+	  class-less object to Ruby world. [ruby-dev:24530]
+
+	* eval.c (proc_dup): provide Proc#dup as well.  [ruby-talk:116915]
+
+	* eval.c (ruby_exec): stack marking position may be higher than
+	  expected.  thanks to Guy Decoux.  [ruby-core:03527]
+
+Tue Oct 19 22:43:12 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_attr): If
+	  we come across 'attr' in a context where it isn't
+	  followed by a symbol, just issue a warning.
+
+Tue Oct 19 20:41:37 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole.c(ole_invoke): retrieve the result value when
+	  retrying the IDispatch::invoke.
+
+Tue Oct 19 17:24:11 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (read_all): block string buffer modification during
+	  rb_io_fread() by freezing it temporarily. [ruby-dev:24479]
+
+	* dir.c (rb_push_glob): block call at once the end of method.
+	  [ruby-dev:24487]
+
+	* ext/enumerator/enumerator.c (enum_each_slice): remove
+	  rb_gc_force_recycle() to prevent potential SEGV.
+	  [ruby-dev:24499]
+
+	* ext/zlib/zlib.c (zstream_expand_buffer): hide internal string
+	  buffer by clearing klass.  [ruby-dev:24510]
+
+Tue Oct 19 16:12:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tkutil.c: backport from CVS HEAD
+
+Tue Oct 19 08:54:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h, object.c (rb_class_inherited_p): export.
+
+Tue Oct 19 08:46:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_upto): method result must be checked.  [ruby-dev:24504]
+
+	* eval.c (error_print): ditto.  [ruby-dev:24519]
+
+Mon Oct 18 23:37:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): check inheritance by the internal function.
+	  [ruby-dev:24515]
+
+Mon Oct 18 15:58:01 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* range.c (range_step, range_each): need cast.
+
+Fri Oct 29 16:34:19 2004  Daiki Ueno  <ueno@unixuser.org>
+
+	* misc/ruby-mode.el (ruby-parse-partial): Parse the rest of the
+	line after opening heredoc identifier.  [ruby-dev:24635]
+
+Mon Oct 18 07:26:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_truncate): discard read buffer before truncation.
+	  [ruby-dev:24197]
+
+Mon Oct 18 02:11:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/config.rb (WEBrick::Config::General): add default values:
+	  - WEBrick::Config[:DoNotReverseLookup]
+	  - WEBrick::Config[:RequestCallback] (it used as an alias of
+	    :RequestHandler in WEBrick::HTTPServer#run)
+	  - WEBrick::Config::FileHandler[:AcceptableLanguages]
+
+	* lib/webrick/httpservlet/filehandler.rb
+	  (WEBrick::HTTPServlet::FileHandler#set_filename): search files
+	  having suffix of language-name which Accept-Language header field
+	  includes if :AcceptableLanguages options is present.
+
+	* lib/webrick/httpservlet/filehandler.rb
+	  (WEBrick::HTTPServlet::FileHandler#get_servlet): new method to
+	  search servlet correspond to the suffix of filename.
+
+	* lib/webrick/httprequest.rb: add attributes access methods: accept,
+	  accept_charset, accept_encoding, accept_language, content_length
+	  and content_type.
+
+	* lib/webrick/httpresponse.rb: add attribute access methods:
+	  content_length, content_length=, content_type and content_type=.
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.mime_types):
+	  use the second suffix to detect media type. (the first suffix
+	  may be a language name.)
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_qvalues):
+	  add method to parse Accept header field. it returns an Array of
+	  values sorted by the qvalues.
+
+Mon Oct 18 02:04:11 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host): new
+	  method to register virtual hosting servers.
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#accept): call
+	  do_not_reverse_lookup for each socket if :DoNotReverseLookup
+	  is set.  [ruby-core:02357]
+
+Mon Oct 18 00:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_s_getservbyaname): protocol string
+	  might be altered.  [ruby-dev:24503]
+
+	* string.c (rb_str_upto): check if return value from succ is a
+	  string.  [ruby-dev:24504]
+
+Sun Oct 17 23:03:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/timer.rb: TkTimer#start and restart accept a block
+
+Sun Oct 17 13:05:04 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (fole_func_methods): correct argument mismatch.
+	* ext/win32ole/win32ole.c (fole_get_methods): ditto.
+	* ext/win32ole/win32ole.c (fole_put_methods): ditto.
+	* ext/win32ole/tests/testWIN32OLE.rb: add test for WIN32OLE#ole_func_methods
+	  WIN32OLE#ole_get_methods, WIN32OLE#ole_put_methods
+
+Sat Oct 16 14:45:28 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/0.9.rb (RSS::Rss#to_s): removed garbage.
+
+Sat Oct 16 13:42:49 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/: untabified.
+	* test/rss/: untabified.
+	* lib/rss/0.9.rb (RSS::Rss#to_s): inent -> indent.
+
+Sat Oct 16 13:34:56 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss: supported prety print.
+	* test/rss/test_1.0.rb: added test for calculating default indent size.
+
+Fri Oct 15 18:04:35 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/timer.rb: TkTimer.new(interval, loop){ ... } is
+	  acceptable. Add TkTimer.start ( == new + start ).
+
+Fri Oct 15 12:43:09 2004  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (Init_stack): make prototype declaration consistent with
+	  the definition in gc.c.
+
+Thu Oct 14 14:34:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (MODE_BINMODE, MODE_BINARY): fixed reversed condition.
+
+Thu Oct 14 13:33:59 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: added link to Tutorial.
+
+Mon Oct 11 13:48:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/*: untabify
+
+Sun Oct 10 12:32:08 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Allow 'require'
+	  to be used as a variable name
+
+Sat Oct  9 21:23:37 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/converter.rb: changed to try to use Iconv for default
+	  conversion.
+
+	* lib/rss/rss.rb: 0.0.9 -> 0.1.0.
+
+Sat Oct  9 19:50:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_getline): should not treat char as negative value.
+	  [ruby-dev:24460]
+
+Fri Oct  8 09:49:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): pointer modification check before each
+	  iteration.  [ruby-dev:24445]
+
+Fri Oct  8 01:13:05 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/optiondb.rb: make it more secure
+
+Thu Oct  7 23:47:57 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/scrollbar.rb: When 'set' operation, a scrollbar
+	  cannot propagate view port information from the source widget
+	  (that calls 'set') to other assigned widgets.
+
+Thu Oct  7 17:36:25 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: When CHILDKILLED and so on, Tk.errorCode returns
+	  a Fixnum for 2nd element (it's pid) of the return value.
+
+Thu Oct  7 12:55:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_read): should freeze buffer before thread context
+	  switch. [ruby-dev:24442]
+
+	* pack.c (pack_unpack): string conversion should at the top of the
+	  method.  [ruby-dev:24439]
+
+	* io.c (io_read): buffer should be frozen only after the length
+	  check.  [ruby-dev:24440]
+
+Thu Oct  7 02:56:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c: use FMODE_APPEND.
+
+Thu Oct  7 01:05:33 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: add Tk.errorInfo and Tk.errorCode
+
+Thu Oct  7 00:08:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_s_sysopen): preserve path in the buffer allocated by
+	  ALLOCA_N() to prevent modification.  [ruby-dev:24438]
+
+Wed Oct  6 09:21:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_mode_flags): preserve append mode flag.
+	  [ruby-dev:24436]
+
+	* io.c (rb_io_modenum_mode): do not use external output buffer.
+
+	* string.c (rb_str_justify): differ pointer retrieval to prevent
+	  padding string modification.  [ruby-dev:24434]
+
+	* range.c (range_each_func): allow func to terminate loop by
+	  returning RANGE_EACH_BREAK.
+
+	* range.c (member_i): use RANGE_EACH_BREAK. [ruby-talk:114959]
+
+Mon Oct  4 14:04:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_file_open_internal, rb_io_reopen): fname might be altered
+	  while GC.  [ruby-dev:24408]
+
+Mon Oct  4 12:53:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/optiondb.rb: support definition of command
+	  resources on widgets
+
+	* ext/tk/lib/tk/image.rb: bug fix
+
+Sun Oct  3 21:20:03 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (TEXT_REGEXP): allow 8-bit characters for the german
+	version of Microsoft Exchange Server. (backported from HEAD)
+
+	* lib/net/imap.rb (RTEXT_REGEXP): ditto.
+
+	* lib/net/imap.rb (CTEXT_REGEXP): ditto.
+
+Sat Oct  2 20:34:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.h (NEW_DVAR): extra semicolon.
+
+Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_byte): retrieve pointer from string value for each
+	  time.  [ruby-dev:24404]
+
+	* marshal.c (r_bytes0): ditto.
+
+	* enum.c (sort_by_i): re-entrance check added.  [ruby-dev:24399]
+
+	* io.c (io_read): should freeze all reading buffer.
+	  [ruby-dev:24400]
+
+	* string.c (rb_str_sum): should use bignums when bits is greater
+	  than or equals to sizeof(long)*CHAR_BITS. [ruby-dev:24395]
+
+	* eval.c (specific_eval): defer pointer retrieval to prevent
+	  unsafe sourcefile string modification.  [ruby-dev:24382]
+
+	* eval.c (specific_eval): defer pointer retrieval to prevent
+	  unsafe sourcefile string modification.  [ruby-dev:24382]
+
+	* string.c (rb_str_sum): wrong cast caused wrong result.
+	  [ruby-dev:24385]
+
+	* enum.c (enum_sort_by): hide temporary array from
+	  ObjectSpace.each_object.  [ruby-dev:24386]
+
+	* string.c (rb_str_sum): check was done with false pointer.
+	  [ruby-dev:24383]
+
+	* string.c (rb_str_sum): string may be altered.  [ruby-dev:24381]
+
+Mon Oct 11 17:51:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_popen): get mode string via rb_io_flags_mode() to
+	  avoid mode string modification.  [ruby-dev:24454]
+
+	* io.c (rb_io_getline_fast): should take delim as unsigned char to
+	  distinguish EOF and '\377'.  [ruby-dev:24460]
+
+	* io.c (rb_io_getline): add check for RS modification.
+	  [ruby-dev:24461]
+
+	* enum.c (enum_sort_by): use qsort() directly instead using
+	  rb_iterate().  [ruby-dev:24462]
+
+	* enum.c (enum_each_with_index): remove rb_gc_force_recycle() to
+	  prevent access to recycled object (via continuation for
+	  example).  [ruby-dev:24463]
+
+Fri Oct  1 11:40:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_eval): defer pointer retrieval to prevent unsafe
+	  sourcefile string modification.  [ruby-dev:24373]
+
+	* io.c (io_read): block string buffer modification during
+	  rb_io_fread() by freezing it temporarily. [ruby-dev:24366]
+
+	* io.c (rb_io_s_popen): mode argument may be altered.
+	  [ruby-dev:24375]
+
+	* file.c (rb_file_s_basename): ext argument may be altered.
+	  [ruby-dev:24377]
+
+	* enum.c (enum_sort_by): use NODE instead of 2 element arrays.
+	  [ruby-dev:24378]
+
+	* string.c (rb_str_chomp_bang): StringValue() may change the
+	  receiver.  [ruby-dev:24371]
+
+Fri Oct  1 11:25:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/grid.rb: revive TkGrid.grid
+
+	* ext/tk/lib/tk/pack.rb: revive TkPack.pack
+
+	* ext/tk/lib/tk/place.rb: revive TkPlace.place
+
+Thu Sep 30 00:50:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_init): bug fix
+
+	* ext/tk/tkutil.c (get_eval_string_core): accept a Regexp object
+
+	* ext/tk/lib/multi-tk.rb: fix bug on 'exit' operation
+
+	* ext/tk/lib/tk/text.rb: 'tksearch' accepts a Regexp object as a
+	  matting pattern argument
+
+Wed Sep 29 10:58:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (sort_by_i): internally used object must not be changed
+	  outside.  [ruby-dev:24368]
+
+Mon Sep 27 13:46:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h, struct.c (rb_struct_s_members, rb_struct_members): public
+	  accessors.  [ruby-dev:24342]
+
+	* marshal.c (w_object, r_object0): use accessors.
+
+Mon Sep 27 09:14:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
+	  [ruby-talk:113807]
+
+Fri Sep 24 16:09:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): propagate DVAR_DONT_RECYCLE on termination
+	  to avoid double call to rb_gc_force_recycle(). [ruby-dev:24311]
+
+Fri Sep 24 08:29:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_subseq): original object might be modified after
+	  sharing data creation.  [ruby-dev:24327]
+
+	* array.c (rb_ary_replace): ditto.
+
+	* array.c (ary_make_shared): freeze shared array. [ruby-dev:24325]
+
+	* struct.c (struct_members): always check struct size and size of
+	  members list in the class.  [ruby-dev:24320]
+
+Thu Sep 23 09:29:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_sub_bang): check if string is not modified
+	  during iteration.  [ruby-dev:24315]
+
+	* hash.c (rb_hash_rehash): replace st_foreach() by its deep
+	  checking counterpart.  [ruby-dev:24310]
+
+Wed Sep 22 13:38:12 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_rehash): add iteration check.  [ruby-dev:24301]
+
+	* st.c (st_foreach): add deep check.
+
+Wed Sep 22 13:06:14 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
+	  merge from HEAD.
+
+Wed Sep 22 00:11:12 2004  Dave Thomas  <dave@pragprog.com>
+
+	* process.c: Add documentation for fork()
+
+Wed Sep 22 09:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_collect_bang): element size might change during
+	  comparison.  [ruby-dev:24300]
+
+	* array.c (rb_ary_reject_bang): ditto. [ruby-dev:24300]
+
+	* array.c (rb_ary_eql): ditto. [ruby-dev:24300]
+
+Tue Sep 21 18:29:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_equal): merge miss.
+
+	* array.c (rb_ary_uniq_bang): element size might change during
+	  comparison.  [ruby-dev:24298]
+
+Mon Sep 20 00:24:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_sort_by): do not use qsort directly.  use
+	  rb_ary_sort_bang() instead.  [ruby-dev:24291]
+
+	* enum.c (enum_sort_by): pedantic type check added.
+	  [ruby-dev:24291]
+
+	* hash.c (rb_hash_foreach_iter): check iter_lev after each
+	  iteration.  [ruby-dev:24289]
+
+	* array.c (rb_ary_and): element size might change during
+	  comparison.  [ruby-dev:24290]
+
+	* array.c (rb_ary_or): ditto. [ruby-dev:24292]
+
+	* array.c (rb_ary_equal): wrong fix. [ruby-dev:24286]
+
+Sat Sep 18 15:02:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_equal): element size might change during
+	  comparison.  [ruby-dev:24254]
+
+	* array.c (rb_ary_diff): ditto. [ruby-dev:24274]
+
+	* array.c (rb_ary_select): ditto. [ruby-dev:24278]
+
+	* array.c (rb_ary_delete): ditto. [ruby-dev:24283]
+
+	* array.c (rb_ary_rindex): ditto. [ruby-dev:24275]
+
+	* array.c (rb_ary_initialize): element size might change during
+	  initializing block.  [ruby-dev:24284]
+
+Sat Sep 18 14:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_s_chdir): avoid memory leak and unnecessary chdir to
+	  the original directory when exception has caused in changing
+	  direcotry or within block.  thanks to Johan Holmberg
+	  <holmberg@iar.se> [ruby-core:03446]
+
+Fri Sep 17 20:20:27 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mkdir_p): backport from CVS HEAD 1.45. [ruby-core:03420]
+
+Fri Sep 17 17:11:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_delete): element comparison might change array
+	  size. [ruby-dev:24273]
+
+	* file.c (rb_file_truncate): clear stdio buffer before truncating
+	  the file.  [ruby-dev:24191]
+
+	* ext/digest/digest.c: use rb_obj_class() instead of CLASS_OF
+	  which might return singleton class.  [ruby-dev:24202]
+
+Fri Sep 17 16:07:09 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: improve exit operation
+
+Fri Sep 17 15:01:57 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: fix SEGV when (thread_)vwait or
+	  (thread_)tkwait
+
+	* ext/tk/lib/tk.rb: add alias wait_window to wait_destroy
+
+	* ext/tk/lib/multi-tk.rb: support calling 'mainloop' on slave
+	  interpreters (however, the 'real' eventloop must be run on the
+	  Default Master IP)
+
+	* ext/tk/lib/remote-tk.rb: follow the changes of ext/tk/lib/multi-tk.rb
+
+	* ext/tk/sample/remote-ip_sample2.rb: ditto
+
+	* ext/tk/sample/tkoptdb-safeTk.rb: ditto
+
+Thu Sep 16 18:12:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (WEBrick::CGI#start): should set REMOTE_USER
+	  to request.user attribute.
+
+	* lib/webrick/httpservlet/filehandler.rb
+	  (WEBrick::HTTPServlet::FileHandler#initialize): should expand
+	  the pathname of document root directory.
+
+Thu Sep 16 15:49:28 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_intern): protect string argument from GC.
+	  [ruby-core:03411]
+
+Wed Sep 15 20:22:23 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/tkoptdb-safeTk.rb: fix a bug depend on the changes
+	  of MultiTkIp
+
+Tue Sep 14 23:54:11 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string was en-bugged by
+	  the previous changes.
+
+Tue Sep 14 23:45:44 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::TextFormatter.for):
+	  Add Eric Hodel's simpleformatter.
+
+Tue Sep 14 16:59:37 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: fix SEGV
+
+	* ext/tk/lib/multi-tk.rb: improve safe-level handling of argument proc
+
+	* ext/tk/sample/multi-ip_sample.rb: rename of old 'safe-tk.rb'
+
+	* ext/tk/sample/safe-tk.rb: new sample script
+
+Tue Sep 14 00:15:15 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/zlib/zlib.c: backported from HEAD.
+
+Mon Sep 13 19:16:33 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* eval.c (blk_copy_prev): need frame_dup().  [ruby-dev:24103]
+
+Mon Sep 13 16:23:27 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: MultiTkIp.new_master and new_slave accept
+	  safe-level value argument
+
+Mon Sep 13 10:20:45 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* object.c (nil_inspect): fix typo.
+
+Mon Sep 13 01:03:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: improve control of preserv/release tcltkip
+
+	* ext/tcltklib/tcltklib.c: store original 'exit' command
+
+	* ext/tk/tkutil.c: fix(?) SEGV
+
+Sun Sep 12 23:46:23 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* util.c (ruby_strdup): remove unnecessary code. (xmalloc never
+	  returns NULL.)
+
+	* util.c (ruby_getcwd): fix memory leak on failure.
+
+Sun Sep 12 02:41:58 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: add TclTkIp#allow_ruby_exit? and
+	  allow_ruby_exit=
+
+
+	* ext/tk/lib/multi-tk.rb: ditto.
+
+	* ext/tk/lib/remote-tk.rb: ditto.
+
+	* ext/tcltklib/MANUAL.euc: ditto.
+
+	* ext/tcltklib/MANUAL.eng: ditto.
+
+	* ext/tcltklib/tcltklib.c: fix some reasons of SEGV
+
+	* ext/tk/tkutil.c: ditto.
+
+	* ext/tk/lib/multi-tk.rb: ditto.
+
+	* ext/tk/lib/tk/timer.rb: ditto.
+
+Sat Sep 11 16:09:46 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb: Fix up cross-file class merging.
+
+Fri Sep 10 20:20:53 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tcltklib/tcltklib.c (lib_merge_tklist): fix suspicious
+	  pointer conversion.
+
+Fri Sep 10 02:43:54 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/template/kilmer.rb: James Buck's
+	  patch for call-seq.
+
+Thu Sep  9 13:58:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_init): change flag value for setting
+	  'argv' and 'argv0' variable
+
+	* ext/tk/lib/remote-tk.rb: follow changes of multi-tk.rb
+
+Thu Sep  9 11:46:18 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_classes): Allow
+	  spaces aroun parameter to define_method_under (James Buck)
+
+Wed Sep  8 18:44:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_write): zero fill a gap if exsts.
+	  [ruby-dev:24190]
+
+Wed Sep  8 15:19:49 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_init): cannot create a IP at level 4
+
+	* ext/tk/lib/multi-tk.rb: improve 'exit' operation, security check,
+	  and error treatment
+
+	* ext/tk/lib/multi-tk.rb: allow a trusted slave IP to create slave IPs
+
+	* ext/tk/lib/tk/listbox.rb: add TkListbox#value, value=, clear,	and
+	  erase
+
+	* ext/tk/lib/tk/text.rb: add TkText#clear and erase
+
+Tue Sep  7 15:17:49 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_connect): break immediately if a
+	  socket is non-blocking.  [ruby-talk:111654]
+
+Mon Sep  6 11:08:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tk/lib/tk/menu.rb(TkOptionMenubutton#insert): call correct method
+
+Mon Sep  6 11:00:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_s_chdir): the patch to shut up false warning when
+	  exception occurred within a block.  a patch was given from Johan
+	  Holmberg <holmberg at iar.se>.  [ruby-core:03292]
+
+Mon Sep  6 07:51:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (cvar_cbase): singletons should refer outer cvar scope.
+	  [ruby-dev:24223]
+
+	* eval.c (rb_load): should preserve previous ruby_wrapper value.
+	  [ruby-dev:24226]
+
+Sat Sep  4 01:14:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (cvar_cbase): class variables cause SEGV in
+	  instance_eval() for fixnums and symbols. [ruby-dev:24213]
+
+Fri Sep  3 17:47:58 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (make_struct): remove redefining constant when
+	  conflict.  [ruby-dev:24210]
+
+Fri Sep  3 11:31:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: Tk.after makes TkCore::INTERP.tk_cmd_tbl grow
+	  [ruby-dev:24207]
+
+Fri Sep  3 02:12:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: fix typo [ruby-talk:111266]
+
+	* ext/tk/lib/tk/text.rb: fix typo
+
+	* ext/tk/lib/multi-tk.rb: improve safe-level treatment on slave IPs
+
+Fri Sep  3 01:54:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: already built-in libraries satisfy dependencies.
+	  [ruby-dev:24028]
+
+Thu Sep  2 11:36:20 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* eval.c (rb_obj_instance_eval): backported from HEAD.
+
+Wed Sep  1 21:18:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tk/lib/tk/spinbox.rb: fix typo
+
+Tue Aug 31 18:24:04 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/tk/tkutil.c (cbsubst_init): fix memory leak
+
+	* ext/tk/tkutil.c (cbsubst_get_all_subst_keys): fix SEGV
+
+Tue Aug 31 16:04:22 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_delete): when a tcltkip is deleted,
+	  destroy its root widget
+
+Tue Aug 31 12:30:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (del_root): fix SEGV
+
+Mon Aug 30 23:11:06 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_driver.rb (and others): ri now merges documentation
+	  if it finds the same class in multiple places.
+
+Mon Aug 30 22:40:30 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: 'restart' method accepts arguments
+
+Mon Aug 30 21:50:14 2004  Dave Thomas  <dave@pragprog.com>
+
+	* object.c: Add RDoc for Module.included.
+
+Mon Aug 30 15:10:46 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD. [ruby-dev:24051]
+
+Mon Aug 30 11:29:35 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): strip trailing spaces. [ruby-dev:24143]
+	  merge from HEAD.
+
+Sun Aug 29 14:08:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: compile error on bcc32 [ruby-dev:24081]
+
+	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string does not work
+
+Sat Aug 28 23:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_and): protect parameters from GC.
+	  [ruby-talk:110664]
+
+Thu Aug 26 04:38:29 2004  Dave Thomas  <dave@pragprog.com>
+
+	* eval.c (return_jump): Minor typo in error message. Now reads
+	  "return can't jump across threads".
+
+Tue Aug 24 17:30:00 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/cgi/session.rb (CGI::Session::FileStore#initialize): do not
+	  use a session id as a filename. (backported from HEAD)
+
+	* lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): ditto.
+
+	* lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): use
+	  Dir::tmpdir. (backported from HEAD)
+
+Tue Aug 24 14:40:16 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/cgi/session.rb (CGI::Session::FileStore#initialize): untaint
+	  session id after check. (backported from HEAD)
+
+Tue Aug 24 09:09:01 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): d2i
+	  functions may replace the pointer indicated by the first argument.
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
+
+Mon Aug 23 14:04:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read):
+	  - should return an empty string if specified length to read is 0.
+	  - should check for pending data and wait for fd before reading.
+	  - call underlying IO's sysread if SSL session is not started.
+	  [ruby-dev:24072], [ruby-dev:24075]
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_write):
+	  - call underlying IO's syswrite if SSL session is not started.
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_pending): new method
+	  OpenSSL::SSL#pending.
+
+	* ext/openssl/lib/openssl/buffering.rb: should not use select.
+
+Mon Aug 23 12:40:56 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/resolv.rb (Config.default_config_hash): when multiple domains
+	  are set, Win32::Resolv.get_resolv_info returns Array.
+
+Sun Aug 22 01:15:31 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
+	  should call :ProxyContentHandler before finishing CONNECT.
+
+Sat Aug 21 06:41:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tcltklib/extconf.rb (find_tcl, find_tk): find stub library.
+
+	* lib/mkmf.rb (arg_config, with_config): deal with '-' and '_'
+	  uniformly.  [ruby-dev:24118]
+
+Thu Aug 19 16:29:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: Fail to treat a hash value of 'font' option.
+
+	* ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion infomation.
+
+	* ext/tk/lib/menu.rb: typo bug.
+
+Thu Aug 19 15:15:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (free_dir): fix memory leak.  reported by yamamoto
+	  madoka.
+
+Thu Aug 19 11:00:00 2004  Akiyoshi, Masamichi  <masamichi.akiyoshi@hp.com>
+
+	* dln.c (dln_load): Modify to call lib$find_image_symbol for VMS.
+	* io.c (rb_io_fwrite): Use fputc() for VMS non-stream file.
+
+Thu Aug 19 06:07:45 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/token.c: re2c no longer compiled with bit vectors.  caused
+	  problems for non-ascii characters. [ruby-core:03280]
+	* ext/syck/implicit.c: ditto.
+	* ext/syck/bytecode.c: ditto.
+
+	* lib/yaml/baseemitter.rb: folding now handles double-quoted strings,
+	  fixed problem with extra line feeds at end of folding, whitespace
+	  opening scalar blocks.
+
+	* lib/yaml/rubytypes.rb: subtelties in handling strings with
+	  non-printable characters and odd whitespace patterns.
+
+Wed Aug 18 23:41:33 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb (rbuf_fill): OpenSSL::SSL::SSLSocket has its own
+	  buffer, select(2) might not work. [ruby-dev:24072]
+
+Wed Aug 18 17:10:12 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/tcltklib/stubs.c (ruby_tcltk_stubs): need to call
+	  Tcl_FindExecutable() for Tcl/Tk 8.4.
+
+Wed Aug 18 12:52:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_obj_instance_eval): evaluates under special singleton
+	  classes as for special constants.
+
+Tue Aug 17 17:20:59 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_reopen): should clear allocated OpenFile.  pointed
+	  out by Guy Decoux. [ruby-core:03288]
+
+Tue Aug 17 01:36:32 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/usage.rb: Remove extra indent. Tidy 'ri' option
+	  parsing so RDoc::usage plays better with OptionParser.
+
+Sat Aug 14 13:09:10 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: backport from CVS HEAD (rev1.44).
+
+	* lib/fileutils.rb: cp_r should copy symlink itself, except cp_r
+	  root.
+
+	* lib/fileutils.rb: new option mv :force.
+
+	* lib/fileutils.rb: new module FileUtils::DryRun.
+
+Sat Aug 14 02:48:16 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/usage.rb: Added. Allows command line programs
+	  to report usage using their initial RDoc comment.
+
+Fri Aug 13 13:23:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_range_header):
+	  fix regex for range-spec.
+
+	* lib/webrick/httpservlet/filehandler.rb
+	  (WEBrick::HTTPServlet::DefaultFileHandler#make_partial_content):
+	  multipart/byteranges response was broken.
+
+	* lib/webrick/httpservlet/erbhandler.rb
+	  (WEBrick::HTTPServlet::ERBHandler#do_GET): should select media type
+	  by suffix of script filename.
+
+	* lib/xmlrpc/server.rb: refine example code.
+
+Wed Aug 11 17:17:50 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
+
+Sun Aug  8 00:43:31 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/implicit.c: added sexagecimal float#base60.
+
+	* ext/syck/rubyext.c (yaml_org_handler): ditto.
+
+	* lib/token.c: indentation absolutely ignored when processing flow
+	  collections.  plain scalars are trimmed if indentation follows in
+	  an ambiguous flow collection.
+
+Sat Aug  7 00:50:01 2004  Tanaka Akira  <akr@m17n.org>
+
+	* ext/zlib/zlib.c: Zlib::GzipReader#read(0) returns "" instead of nil.
+
+Tue Aug  3 13:49:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/namespace.rb: bug fix
+
+	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: add Tk::TreeCtrl.loupe
+
+Mon Aug  2 18:04:21 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/msgcat.rb (set_translation): bug fix (fail to set
+	  trans_str to the same as src_str when trans_str is not given.)
+
+Mon Aug  2 11:53:06 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): Fix infinite recursion
+	  looking up some top level symbols (batsman)
+
+Mon Aug  2 11:48:29 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Allow '.'s in
+	  variable names to support SWIG generated files (Hans Fugal)
+
+Sat Jul 31 17:40:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial,
+	  ruby-calculate-indent, ruby-move-to-block, ruby-forward-sexp,
+	  ruby-backward-sexp): keywords must match word-wise.
+
+Sat Jul 31 05:47:37 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml.rb (YAML::load_file, YAML::parse_file): added.
+
+	* lib/yaml/rubytypes.rb: exceptions were using an older
+	  YAML.object_maker. [ruby-core:03080]
+
+	* ext/syck/token.c (sycklex_yaml_utf8): using newline_len to
+	  handline CR-LFs.  "\000" was showing up on folded blocks which
+	  stopped at EOF.
+
+	* ext/syck/token.c: re2c compiled with bit vectors now.
+	* ext/syck/implicit.c: ditto.
+	* ext/syck/bytecode.c: ditto.
+
+Fri Jul 30 16:10:54 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (lib_fromUTF8_core): raise ArgumentError when
+	  the unknown encoding name is given.
+
+	* ext/tcltklib/tcltklib.c (lib_toUTF8_core): ditto.
+
+	* ext/tk/lib/tk.rb (Tk::Encoding.encoding_convertfrom): bug fix.
+
+	* ext/tk/lib/tk.rb (Tk::Encoding.encoding_convertto): ditto.
+
+Wed Jul 28 18:59:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::initialize): remove at_exit code for CGI_PARAMS
+	  and CGI_COOKIES.  they will no longer be used.
+
+Wed Jul 28 01:04:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (run_final): wrong order of data. [ruby-dev:23984]
+
+Tue Jul 27 07:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): copy on write for argument local variable
+	  assignment.
+
+	* eval.c (assign): ditto.
+
+	* eval.c (rb_call0): update ruby_frame->argv with the default
+	  value used for the optional arguments.
+
+	* object.c (Init_Object): "===" calls rb_obj_equal() directly.
+	  [ruby-list:39937]
+
+Mon Jul 26 11:22:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape): should
+	  escape space.
+
+Sun Jul 25 11:05:21 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.{h,c} (rb_w32_{f,fd,fs}open): workaround for bcc32's
+	  {f,fd,fs}open bug. set errno EMFILE and EBADF. [ruby-dev:23963]
+
+Sat Jul 24 13:32:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (rb_range_beg_len): returns Qnil only when "beg" points
+	  outside of a range.  No boundary check for "end".
+
+Fri Jul 23 16:40:25 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (define_final): should not disclose NODE* to Ruby world.
+	  [ruby-dev:23957]
+
+Fri Jul 23 09:03:16 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (disconnected?): new method. (backported from HEAD)
+
+Thu Jul 22 16:41:54 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi/session.rb (CGI::Session::FileStore#update): sets the
+	 permission of the session data file to 0600.
+
+	* lib/cgi/session/pstore.rb (CGI::Session::Pstore#initialize):
+	  ditto.
+
+Thu Jul 22 00:02:21 2004  Masahiro Kitajima  <katonbo@katontech.com>
+
+	* process.c (rb_f_system): not need to call last_status_set() any
+	  longer on _WIN32.
+
+Tue Jul 20 09:15:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/fileutils/test_fileutils.rb: File.link raises EINVAL on BeOS.
+
+Mon Jul 19 01:15:07 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpservlet/cgihandler.rb
+	  (WEBrick::HTTPServlet::CGIhandler#do_GET): set SystemRoot environment
+	  variable to CGI process on Windows native platforms. [ruby-dev:23936]
+
+	* lib/webrick/httpservlet/cgihandler.rb
+	  (WEBrick::HTTPServlet::CGIhandler#do_GET): use $?.exitstatus and
+	  refine log message.
+
+Sun Jul 18 16:14:29 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/msgcat.rb (TkMsgCatalog.callback): bug fix
+	  ( wrong number of argument )
+
+Sun Jul 18 08:13:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): remove extra sign digit.
+
+Sun Jul 18 03:21:42 2004  Akinori MUSHA  <knu@iDaemons.org>
+
+	* dir.c (range): use NULL instead of 0.
+
+	* dir.c (range): get rid of a gcc 3.4 warning.
+
+Sun Jul 18 03:12:11 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (receive_responses): return if a LOGOUT response
+	received. (backported from HEAD)
+	* lib/net/imap.rb (send_string_data): wait command continuation
+	requests before sending octet data of literals. (backported from HEAD)
+
+Sat Jul 17 23:54:59 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/variable.rb: TkVariable#ref returns a TkVariable object
+
+Sat Jul 17 22:04:44 2004  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/ldap.rb: method hierarchical? should be in URI::LDAP.
+
+Sat Jul 17 18:29:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt): not to show same error messages twice.
+
+Sat Jul 17 13:13:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb (RubyLex::identify_string): %s string do not
+	  process expression interpolation.  [ruby-talk:106691]
+
+Sat Jul 17 05:26:27 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/diagram.rb: Incorporate Micheal Neuman's
+	  client-side imagemao patch
+
+Sat Jul 17 01:57:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (THREAD_ALLOC): th->thread should be initialized to NULL.
+	  [ruby-talk:106657]  The solution was found by Guy Decoux.
+
+Fri Jul 16 22:30:28 2004  Michael Neumann  <mneumann@ntecs.de>
+
+	* file.c (rb_stat_dev_major): new methods File::Stat#dev_major and
+	  #dev_minor. [ruby-core:03195]
+
+Fri Jul 16 15:23:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (return_jump, break_jump): raise unexpceted local jump
+	  exception directly.  [ruby-dev:23740]
+
+	* lib/base64.rb (Deprecated): super in bound method calls original
+	  name method in stable version.  [ruby-dev:23916]
+
+Fri Jul 16 11:31:49 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/test/unit/ui/{fox,gtk,gtk2}/testrunner.rb: remove
+	  garbage (patch from akira yamada) [ruby-dev:23911]
+
+Fri Jul 16 11:20:00 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): fix output of NaN, Inf and -Inf with
+	  "%f" or etc on MSVCRT platforms. (backported from HEAD)
+
+Fri Jul 16 11:17:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (exit_initialize): use EXIT_SUCCESS instead of 0.
+	  [ruby-dev:23913]
+
+	* error.c (exit_success_p): new method SystemExit#success?.
+	  [ruby-dev:23912]
+
+	* error.c (syserr_initialize): initialization for subclasses.
+	  [ruby-dev:23912]
+
+Thu Jul 15 23:53:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#warn, OptionParser#abort): Exception
+	  no longer has to_str method.
+
+Thu Jul 15 22:59:48 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/readline/extconf.rb: added dir_config for curses, ncurses,
+	termcap. (backported from HEAD)
+
+Thu Jul 15 20:29:15 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* class.c, error.c, eval.c, intern.h, object.c, variable.c:
+	  do not set path if it is a singleton class.  [ruby-dev:22588]
+	  (backport from 1.9)
+
+Thu Jul 15 10:15:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/, ext/tcltklib/: bug fix
+
+	* ext/tk/lib/tk.rb: better operation for SIGINT when processing
+	  callbacks.
+	* ext/tk/lib/tk/msgcat.rb: ditto.
+	* ext/tk/lib/tk/variable.rb: ditto.
+	* ext/tk/lib/tk/timer.rb: ditto.
+
+	* ext/tk/lib/tk/validation.rb: add Tk::ValidateConfigure.__def_validcmd
+	  to define validatecommand methods easier
+
+	* ext/tk/lib/tk.rb (_genobj_for_tkwidget): support autoload Tk ext
+	  classes
+
+	* ext/tk/lib/tk/canvas.rb and so on: remove the parent widget type
+	  check for items (e.g. canvas items; depends on the class) to
+	  avoid some troubles on Tk extension widget class definition.
+
+	* ext/tk/lib/tkextlib/: add Iwidget and TkTable extension support
+
+	* ext/tk/sample/tkextlib/: add samples of Iwidget and TkTable
+
+
+Wed Jul 14 18:08:37 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1cons_to_der): fix type of
+	  argument. [ruby-dev:23891]
+
+	* test/openssl/test_x509store.rb: prune tests for CRL checking
+	  unless X509::V_FLAG_CRL_CHECK is defined.
+
+Wed Jul 14 12:29:07 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* util.c (ruby_strtod): should not convert string in the form of
+	  "-I.FE-X" which both "I" and "F" are ommitted. [ruby-dev:23883]
+
+	* test/ruby/test_float.rb (test_strtod): add test for bug fix.
+
+Wed Jul 14 00:31:15 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* array.c: rdoc patch. merged patch from Johan Holmberg
+	  <holmberg@iar.se> [ruby-core:3170]
+
+Tue Jul 13 19:39:12 2004  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#merge_path):
+	  "URI('http://www.example.com/foo/..') + './'" should return
+	  "URI('http://www.example.com/')".  [ruby-list:39838]
+	  "URI('http://www.example.com/') + './foo/bar/..'" should return
+	  "URI('http://www.example.com/foo/')".  [ruby-list:39844]
+
+	* test/uri/test_generic.rb (TestGeneric#test_merge): added tests.
+
+Tue Jul 13 15:51:45 2004  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
+	   extmk mode.
+
+	* lib/mkmf.rb (dir_config): Prepend a new library path instead of
+	  appending so it is tried first.
+
+Tue Jul 13 00:50:48 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb: Support call-seq: for Ruby files.
+
+Mon Jul 12 21:20:36 2004  Dave Thomas  <dave@pragprog.com>
+
+	* html_generator.rb: Support hyperlinks of the form {any text}[xxx]
+	  as well as stuff[xxx]
+
+Sat Jul 10 09:30:24 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/soap/marshal/test_struct.rb: use qualified build-tin class name
+	  (::Struct) to avoid name crash.
+
+Sat Jul 10 04:21:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: better operation for SIGINT when processing
+	  callbacks.
+	* ext/tk/lib/tk/msgcat.rb: ditto.
+	* ext/tk/lib/tk/variable.rb: ditto.
+	* ext/tk/lib/tk/timer.rb: ditto.
+
+	* ext/tk/lib/tk/validation.rb (__def_validcmd):  add a module
+	  function of Tk::ValidateConfigure to define validatecommand
+	  methods easier
+
+Fri Jul  9 22:36:36 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* array.c, enum.c, pack.c: rdoc patch from Johan Holmberg
+	  <holmberg@iar.se> [ruby-core:3132] [ruby-core:3136]
+
+	* numeric.c: rdoc patch.
+
+Fri Jul  9 19:26:39 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (URI::HTTPS#proxy_open): raise ArgumentError to
+	  notice https is not supported.
+
+Fri Jul  9 14:28:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_raise): accept third argument as well as
+	  Kernel#raise, and evaluate the arguments to create an exception in
+	  the caller's context.  [ruby-talk:105507]
+
+Fri Jul  9 01:47:08 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib : bug fix
+	* ext/tk/lib/tkextlib/itcl : add [incr Tcl] support
+	* ext/tk/lib/tkextlib/itk  : add [incr Tk] support
+	* ext/tk/lib/tkextlib/iwidgets : midway point of [incr Widgets] support
+	* ext/tk/sample/tkextlib/iwidgets : very simple examples of
+	  [incr Widgets]
+
+Thu Jul  8 22:52:19 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/{rss,parser,0.9,1.0,2.0}.rb: supported RSS 0.9x/2.0
+	  validation and validation which disregard order of elements.
+	* test/rss/test_parser.rb: added tests for RSS 0.9x/2.0
+	  validation.
+	* test/rss/{test_trackback,rss-testcase}.rb: fixed no good method
+	  name.
+
+Thu Jul  8 00:05:23 2004  akira yamada  <akira@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile::initialize): got out code of
+	  generating tmpname.  [ruby-dev:23832][ruby-dev:23837]
+
+Wed Jul  7 15:53:14 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* string.c (rb_str_match): raise TypeError when both arguments are
+	  strings. [ruby-dev:22869] (backported from HEAD)
+
+	* string.c (rb_str_match2): removed.
+
+	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
+	  wince/Makefile.sub (string.c): now not depend on version.h.
+
+Wed Jul  7 00:48:34 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/tk/lib/tkextlib/tktrans.rb,
+	  ext/tk/lib/tkextlib/treectrl.rb: fix syntax errors.
+
+Tue Jul  6 18:38:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib : improve framework of developping Tcl/Tk extension
+	  wrappers
+
+Mon Jul  5 23:56:42 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/{trackback,syndication,dublincore,content}.rb: worked
+	  with ruby 1.6 again.
+
+	* test/rss/rss-assertions.rb: ditto.
+
+Mon Jul  5 22:54:39 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/uri/common.rb (Kernel#URI): new global method for parsing URIs.
+
+Mon Jul  5 09:02:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_yield, rb_f_catch): 4th argument to rb_yield_0()
+	  is a set of bit flags.  [ruby-dev:23859]
+
+Mon Jul  5 01:27:32 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/drb/drb.rb(DRbConn self.open): If socket pool is full, close
+	  the socket whose last-access-time is oldest. (and add new one)
+	  [ruby-dev:23860]
+
+Sun Jul  4 12:24:50 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb: added copyright header.
+
+Sun Jul  4 00:24:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* added files
+	  * lib/soap/attachment.rb
+	  * lib/soap/header
+	  * lib/soap/mimemessage.rb
+	  * lib/soap/rpc/httpserver.rb
+	  * lib/wsdl/soap/cgiStubCreator.rb
+	  * lib/wsdl/soap/classDefCreator.rb
+	  * lib/wsdl/soap/classDefCreatorSupport.rb
+	  * lib/wsdl/soap/clientSkeltonCreator.rb
+	  * lib/wsdl/soap/driverCreator.rb
+	  * lib/wsdl/soap/mappingRegistryCreator.rb
+	  * lib/wsdl/soap/methodDefCreator.rb
+	  * lib/wsdl/soap/servantSkeltonCreator.rb
+	  * lib/wsdl/soap/standaloneServerStubCreator.rb
+	  * lib/wsdl/xmlSchema/enumeration.rb
+	  * lib/wsdl/xmlSchema/simpleRestriction.rb
+	  * lib/wsdl/xmlSchema/simpleType.rb
+	  * lib/xsd/codegen
+	  * lib/xsd/codegen.rb
+	  * sample/soap/authheader
+	  * sample/soap/raa2.4
+	  * sample/soap/ssl
+	  * sample/soap/swa
+	  * sample/soap/whois.rb
+	  * sample/soap/calc/samplehttpd.conf
+	  * sample/soap/exchange/samplehttpd.conf
+	  * sample/soap/sampleStruct/samplehttpd.conf
+	  * sample/wsdl/raa2.4
+	  * sample/wsdl/googleSearch/samplehttpd.conf
+	  * test/openssl/_test_ssl.rb
+	  * test/soap/header
+	  * test/soap/ssl
+	  * test/soap/struct
+	  * test/soap/swa
+	  * test/soap/wsdlDriver
+	  * test/wsdl/multiplefault.wsdl
+	  * test/wsdl/simpletype
+	  * test/wsdl/test_multiplefault.rb
+
+	* modified files
+	  * lib/soap/baseData.rb
+	  * lib/soap/element.rb
+	  * lib/soap/generator.rb
+	  * lib/soap/marshal.rb
+	  * lib/soap/netHttpClient.rb
+	  * lib/soap/parser.rb
+	  * lib/soap/processor.rb
+	  * lib/soap/property.rb
+	  * lib/soap/soap.rb
+	  * lib/soap/streamHandler.rb
+	  * lib/soap/wsdlDriver.rb
+	  * lib/soap/encodingstyle/handler.rb
+	  * lib/soap/encodingstyle/literalHandler.rb
+	  * lib/soap/encodingstyle/soapHandler.rb
+	  * lib/soap/mapping/factory.rb
+	  * lib/soap/mapping/mapping.rb
+	  * lib/soap/mapping/registry.rb
+	  * lib/soap/mapping/rubytypeFactory.rb
+	  * lib/soap/mapping/wsdlRegistry.rb
+	  * lib/soap/rpc/cgistub.rb
+	  * lib/soap/rpc/driver.rb
+	  * lib/soap/rpc/element.rb
+	  * lib/soap/rpc/proxy.rb
+	  * lib/soap/rpc/router.rb
+	  * lib/soap/rpc/soaplet.rb
+	  * lib/soap/rpc/standaloneServer.rb
+	  * lib/wsdl/data.rb
+	  * lib/wsdl/definitions.rb
+	  * lib/wsdl/operation.rb
+	  * lib/wsdl/parser.rb
+	  * lib/wsdl/soap/definitions.rb
+	  * lib/wsdl/xmlSchema/complexContent.rb
+	  * lib/wsdl/xmlSchema/complexType.rb
+	  * lib/wsdl/xmlSchema/data.rb
+	  * lib/wsdl/xmlSchema/parser.rb
+	  * lib/wsdl/xmlSchema/schema.rb
+	  * lib/xsd/datatypes.rb
+	  * lib/xsd/qname.rb
+	  * sample/soap/calc/httpd.rb
+	  * sample/soap/exchange/httpd.rb
+	  * sample/soap/sampleStruct/httpd.rb
+	  * sample/soap/sampleStruct/server.rb
+	  * sample/wsdl/amazon/AmazonSearch.rb
+	  * sample/wsdl/amazon/AmazonSearchDriver.rb
+	  * sample/wsdl/googleSearch/httpd.rb
+	  * test/soap/test_basetype.rb
+	  * test/soap/test_property.rb
+	  * test/soap/test_streamhandler.rb
+	  * test/soap/calc/test_calc.rb
+	  * test/soap/calc/test_calc2.rb
+	  * test/soap/calc/test_calc_cgi.rb
+	  * test/soap/helloworld/test_helloworld.rb
+	  * test/wsdl/test_emptycomplextype.rb
+	  * test/wsdl/axisArray/test_axisarray.rb
+	  * test/wsdl/datetime/test_datetime.rb
+	  * test/wsdl/raa/test_raa.rb
+	  * test/xsd/test_xmlschemaparser.rb
+	  * test/xsd/test_xsd.rb
+
+	* summary
+	  * add SOAP Header mustUnderstand support.
+
+	  * add HTTP client SSL configuration and Cookies support (works
+	    completely with http-access2).
+
+	  * add header handler for handling sending/receiving SOAP Header.
+
+	  * map Ruby's anonymous Struct to common SOAP Struct in SOAP Object
+	    Model.  it caused error.
+
+	  * add WSDL simpleType support to restrict lexical value space.
+
+	  * add SOAP with Attachment support.
+
+Sat Jul  3 17:19:44 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/tk/lib/tkextlib/tkDND.rb: fix syntax error.
+
+Thu Jul  1 23:15:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pstore.rb (transaction): safer backup scheme.  [ruby-list:39102]
+
+	* lib/pstore.rb (commit_new): use FileUtils.copy_stream for Cygwin.
+	  [ruby-dev:23157]
+
+	* lib/pstore.rb (transaction): allow overriding dump and load.
+	  [ruby-dev:23567]
+
+	* lib/pstore.rb (PStore#transaction): get rid of opening in write mode
+	  when read only transaction.  [ruby-dev:23842]
+
+	* lib/yaml/store.rb: follow lib/pstore.rb's change.
+
+Thu Jul  1 18:36:08 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tcltklib : bug fix
+
+	* ext/tk/lib/tk : bug fix and add Tcl/Tk extension support libraries
+
+Thu Jul  1 11:59:45 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: check for EVP_CIPHER_CTX_copy, ENGINE_add,
+	  EVP_CIPHER_CTX_set_padding, EVP_CipherFinal_ex, EVP_CipherInit_ex,
+	  EVP_DigestFinal_ex and EVP_DigestInit_ex.
+
+	* ext/openssl/openssl_missing.c (EVP_CIPHER_CTX_copy): new function.
+
+	* ext/openssl/openssl_missing.h (EVP_DigestInit_ex, EVP_DigestFinal_ex,
+	  EVP_CipherInit_ex, EVP_CipherFinal_ex, HMAC_Init_ex): new macro for
+	  OpenSSL 0.9.6.
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_encrypt, ossl_cipher_decrypt):
+	  re-implemnt (the arguments for this method is ).
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_pkcs5_keyivgen): new method
+	  OpenSSL::Cipher::Cipher#pkcs5_keyivgen. it calls EVP_BytesToKey().
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_alloc, ossl_cipher_initialize,
+	  ossl_cipher_copy, ossl_cipher_reset ossl_cipher_final,
+	  ossl_cipher_set_key, ossl_cipher_set_iv): replace all EVP_CipherInit
+	  and EVP_CipherFinal into EVP_CipherInit_ex and EVP_CipherFinal_ex.
+	  and EVP_CIPHER_CTX_init should only be called once.
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_set_key_length): new method
+	  OpenSSL::Cipher::Cipher#key_len=.
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_init_deprecated): new
+	  finction; print warning for Cipher#<<.
+
+	* ext/openssl/ossl_digest.c: replace all EVP_DigestInit and
+	  EVP_DigestFinal into EVP_DigestInit_ex and EVP_DigestFinal_ex.
+	  and EVP_MD_CTX_init should only be called once.
+
+	* ext/openssl/ossl_digest.c (digest_final): should call
+	  EVP_MD_CTX_cleanup to avoid memory leak.
+
+	* ext/openssl/ossl_hmac.c (ossl_hmac_initialize): repalce HMAC_init
+	  into HMAC_init_ex. and HMAC_CTX_init is moved to ossl_hmac_alloc.
+
+	* ext/openssl/ossl_hmac.c (hmac_final): should call
+	  HMAC_CTX_cleanup to avoid memory leak.
+
+	* test/openssl/test_cipher.rb, test/openssl/test_digest.rb,
+	  test/openssl/test_hmac.rb: new file.
+
+Thu Jul  1 04:08:30 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_i2d_ASN1_TYPE, ossl_ASN1_TYPE_free):
+	  workaround for the versions earlier than OpenSSL-0.9.7.
+
+Thu Jul  1 03:33:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
+	  empty pkey object if no argument is passed. [ruby-talk:103328]
+
+	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
+
+	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
+
+	* ext/openssl/ossl_pkey_dh.c: add new methods: OpenSSL::PKey::DH#p,
+	  OpenSSL::PKey::DH#p=, OpenSSL::PKey::DH#g, OpenSSL::PKey::DH#g=,
+	  OpenSSL::PKey::DH#pub_key, OpenSSL::PKey::DH#pub_key=,
+	  OpenSSL::PKey::DH#priv_key and OpenSSL::PKey::DH#priv_key=.
+
+	* ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
+	  OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
+	  OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
+	  OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
+	  OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
+
+Thu Jul  1 03:16:09 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read): take optional second argument
+	  to specify a string to be written.
+
+	* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#read):
+	  take optional second argument to specify a string to be written.
+
+	* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#gets):
+	  refine regexp for end-of-line.
+
+	* ext/opnessl/lib/openssl/ssl.rb
+	  (OpenSSL::SSL::SocketForwarder#listen): fix typo.
+
+Wed Jun 30 11:38:51 2004  Mikael Brockman  <phubuh@phubuh.org>
+
+	* parse.y (primary): should not be NULL.  [ruby-core:03098]
+
+Wed Jun 30 02:53:24 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/rubyext.c (syck_emitter_new): set buffer after
+	  Data_Wrap_Struct to avoid possible GC. [ruby-talk:104835]
+
+Tue Jun 29 10:31:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval_cmd, rb_thread_trap_eval): restore safe level.
+
+	* gc.c (define_final, run_final): preserve and restore safe level for
+	  finalizers.  [ruby-core:03058]
+
+	* signal.c (signal_exec, rb_trap_exit, trap): preserve and restore
+	  safe level for signal handlers.  [ruby-dev:23829]
+
+Mon Jun 28 14:57:56 2004  Jeff Mitchell  <quixoticsycophant@yahoo.com>
+
+	* configure.in, lib/mkmf.rb (LIBPATHFLAG): use double quotes due to
+	  DOSISH compilers.  [ruby-core:03107]
+
+Mon Jun 28 00:30:19 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* sample/drb/*.rb: using 'DRb.thread.join' instead of 'gets'
+
+Sun Jun 27 22:39:51 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* sample/rss/tdiary_plugin/rss-recent.rb: supported Hiki.
+
+Sun Jun 27 12:19:46 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* {lib,sample,test}/rss: added RSS Parser. [ruby-dev:23780]
+
+Sat Jun 26 11:07:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (aix): -b must come at the start of the command line,
+	  and -e must not appear while testing libraries.  [ruby-talk:104501]
+
+	* lib/mkmf.rb (dir_config): quote directory names if necessary.
+	  [ruby-talk:104505]
+
+Fri Jun 25 15:33:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/extconf.rb: check stricter.  [ruby-talk:104501]
+
+	* ext/iconv/extconf.rb: include iconv.h for libiconv.  [ruby-dev:22715]
+
+Fri Jun 25 08:31:29 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_atfork): remove "fork terminates thread"
+	  warning.  [ruby-dev:23768]
+
+	* object.c (rb_obj_clone): backport FL_FINALIZE patch from 1.9.
+	  [ruby-core:02786][ruby-core:03067]
+
+	* ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()
+	  should give us packed address, not struct sockaddr.
+	  [ruby-core:03053]
+
+Fri Jun 25 02:04:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc32,win32,wince}/setup.mak: remove RUBY_EXTERN lines when
+	  including version.h. [ruby-talk:104456] (backported from HEAD)
+
+Thu Jun 24 14:23:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_fread): return already read data when system call is
+	  interrupted.  [ruby-talk:97206]
+
+Thu Jun 24 01:32:43 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* version.h: added declarations of ruby_version,
+	  ruby_release_date, ruby_platform.
+	  (backported from HEAD)
+
+Wed Jun 23 22:23:37 2004  Dave Thomas  <dave@pragprog.com>
+
+	* ext/socket/socket.c (sock_s_gethostbyaddr): Work around problem
+	  with OS X not returning 'from' parameter to recvfrom for
+	  connection-oriented sockets.
+
+Wed Jun 23 01:45:27 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_quotation):
+	  Fix problem with the 'r' being dropped from %r{xxx}
+
+Wed Jun 23 00:20:20 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing
+	  CRs and LFs. (doesn't depend on CR+LF) [ruby-dev:23749]
+
+Wed Jun 23 00:00:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_initialize): should check fcntl result.  [ruby-dev:23742]
+
+Tue Jun 22 21:11:36 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (OLE_FREE): should not call CoFreeUnuse-
+	  dLibraries().
+
+	* ext/win32ole/win32ole.c (ole_event_free): ditto.
+
+	* ext/win32ole/win32ole.c (ole_hresult2msg): truncate error message
+	  before CR.
+
+Tue Jun 22 16:47:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
+	Thanks, Rutger Nijlunsing.
+
+Mon Jun 21 10:19:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_opendir): use FindFirstFile()/FindNextFile()/
+	  FindClose() instead of _findfirst()/_findnext()/_findclose().
+	  merge from HEAD.
+
+Sat Jun 19 13:24:15 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (method_call): allow changing $SAFE.  [ruby-dev:23713]
+
+Fri Jun 18 23:12:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (proc_save_safe_level, rb_set_safe_level, safe_setter): limit
+	  safe level.
+
+Wed Jun 16 23:05:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_freeze): prepare string representation before
+	  freezing. [ruby-talk:103646]
+
+Wed Jun 16 16:04:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_le): singleton class inherits Class rather than its
+	  object's class.  [ruby-dev:23690]
+
+Wed Jun 16 16:01:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (stack_grow_direction): memoize the direction.
+
+	* gc.c (Init_stack): should always move to end of VALUE.
+
+Tue Jun 15 12:10:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: bug fix (TkWindow#grab)
+
+Mon Jun 14 18:23:27 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/remote-tk.rb: bug fix
+
+Sun Jun 13 00:23:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/extconf.rb: [EXPERIMENTAL] MacOS X (darwin) support
+
+	* ext/tcltklib/tcltklib.c: fix thread trouble on callback proc, and
+	  eliminate warning about instance variable access
+
+	* ext/tk/lib/tk/menubar.rb: improve supported menu_spec
+
+	* ext/tk/lib/tk/menuspec.rb: [add] menu_spec support library
+
+	* ext/tk/lib/tk/root.rb: add menu_spec support
+
+	* ext/tk/lib/tk/text.rb: bug fix
+
+	* ext/tk/lib/tk/toplevel.rb: add menu_spec support
+
+	* ext/tk/sample/menubar?.rb: [add] sample of menu_spec usage
+
+Sat Jun 12 11:15:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (target_os): strip -gnu suffix on Linux.
+
+Fri Jun 11 17:08:21 2004  Akinori MUSHA  <knu@iDaemons.org>
+
+	* config.guess: Restore a wrongly removed hyphen.
+
+Fri Jun 11 14:30:08 2004  Akinori MUSHA  <knu@iDaemons.org>
+
+	* config.guess: Attempt to avoid system name change on
+	  Darwin platforms also.
+
+Fri Jun 11 14:22:45 2004  Akinori MUSHA  <knu@iDaemons.org>
+
+	* config.guess, config.sub: Attempt to avoid system name change on
+	  Linux platforms.  We have been using "linux" instead of
+	  "linux-gnu" on this branch.
+
+Thu Jun 10 19:19:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/sdbm/init.c (fsdbm_store): sdbm should use StringValue().
+	  [ruby-talk:103062]
+
+Wed Jun  9 18:04:14 2004  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic::merge,
+	  URI::Generic::route_from): accepts non-hierarchical URI.
+	  [ruby-dev:23631]
+
+	* test/uri/test_generic.rb (TestGeneric::test_route,
+	  TestGeneric::test_merge): added tests for above changes.
+
+Wed Jun  9 17:39:37 2004  Akinori MUSHA  <knu@iDaemons.org>
+
+	* config.guess, config.sub: Update to a more recent version as of
+	  2004-01-20.
+
+	* configure.in: Add support for DragonFly BSD.
+
+Wed Jun  2 20:16:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_new4): should share shared instance if it already
+	  exists.  [ruby-dev:23665]
+
+Wed Jun  2 12:41:53 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_gets_m): set lastline ($_) even when read line is
+	  nil.  [ruby-dev:23663]
+
+Fri May 28 11:20:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): bad influence on frame node.
+
+	* eval.c (eval): reverted wrongly removed condition.  [ruby-dev:23638]
+
+Thu May 27 23:15:18 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb: leading 0 padding of timestamp usec part.
+
+	* lib/csv.rb (CSV.parse): [CAUTION] behavior changed.  in the past,
+	  CSV.parse accepts a filename to be read-opened (it was just a
+	  shortcut of CSV.open(filename, 'r')).  now CSV.parse accepts a
+	  string or a stream to be parsed e.g.
+	  CSV.parse("1,2\n3,r") #=> [['1', '2'], ['3', '4']]
+
+	* lib/csv.rb: CSV::Row and CSV::Cell are deprecated.  these classes
+	  are removed in the future.  in the new csv.rb, row is represented
+	  as just an Array.  since CSV::Row was a subclass of Array, it won't
+	  hurt almost all programs except one which depended CSV::Row#match.
+	  and a cell is represented as just a String or nil(NULL).  this
+	  change will cause widespread destruction.
+
+	      CSV.open("foo.csv", "r") do |row|
+		row.each do |cell|
+		  if cell.is_null       # using Cell#is_null
+		    p "(NULL)"
+		  else
+		    p cell.data         # using Cell#data
+		  end
+		end
+	      end
+
+	    must be just;
+
+	      CSV.open("foo.csv", "r") do |row|
+		row.each do |cell|
+		  if cell.nil?
+		    p "(NULL)"
+		  else
+		    p cell
+		  end
+		end
+	      end
+
+	* lib/csv.rb: [CAUTION] record separator(CR, LF, CR+LF) behavior
+	  change.  CSV.open, CSV.parse, and CSV,generate now do not force
+	  opened file binmode.  formerly it set binmode explicitly.
+
+	  with CSV.open, binmode of opened file depends the given mode
+	  parameter "r", "w", "rb", and "wb".  CSV.parse and CSV.generate open
+	  file with "r" and "w".
+
+	  setting mode properly is user's responsibility now.
+
+	* lib/csv.rb: accepts String as a fs (field separator/column separator)
+	  and rs (record separator/row separator)
+
+	* lib/csv.rb (CSV.read, CSV.readlines): added.  works as IO.read and
+	  IO.readlines in CSV format.
+
+	* lib/csv.rb: added CSV.foreach(path, rs = nil, &block).  CSV.foreach
+	  now does not handle "| cmd" as a path different from IO.foreach.
+	  needed?
+
+	* test/csv/test_csv.rb: updated.
+
+	* test/ruby/test_float.rb: added test_strtod to test Float("0").
+
+Thu May 27 21:37:50 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (Pathname#initialize): refine pathname initialization
+	  by pathname.
+
+Thu May 27 20:22:05 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
+
+Thu May 27 14:53:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (rb_io_fwrite): workaround for bcc32's fwrite bug.
+	  add errno checking.  [ruby-dev:23627]
+
+Wed May 26 14:19:42 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval, eval): make line number consistent on eval with
+	  Proc.  [ruby-talk:101253]
+
+Wed May 26 13:59:17 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::skip_for_variable): Allow for
+	  'do' after for statement
+
+Wed May 26 13:56:03 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb (Generators::MarkUp::style_url): Fix
+	  relative path to code CSS file
+
+Wed May 26 13:14:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_init_copy): copy also positions.  [ruby-talk:100910]
+
+Wed May 26 00:00:00 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/syck.c (syck_new_parser): clear parser on init.
+	  thanks, ts. [ruby-core:02931]
+
+	* ext/syck/token.c (sycklex_yaml_utf8): buffer underflow.
+	  thanks, ts. [ruby-core:02929]
+
+	* lib/yaml/baseemitter.rb (indent_text): simpler flow block code.
+
+	* lib/yaml.rb: added rdoc to beginning of lib.
+
+Mon May 24 10:46:26 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/rdoc/generators/template/html/html.rb: SYSTEM identifiers
+	  must be absolute URIs
+
+Sat May 22 12:00:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* MANIFEST: add new encodings in rexml.
+
+	* ext/tk/MANIFEST: add recent files.
+
+Sat May 22 05:37:11 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/remote-tk.rb: (NEW library) controll Tk interpreters
+	  on the other processes by Tcl/Tk's 'send' command
+
+Fri May 21 09:22:05 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_parameters):
+	  Add ()'s around parameters that don't have them
+
+Thu May 20 17:02:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (check_sizeof): define result size.  [ruby-core:02911]
+
+	* lib/mkmf.rb (create_header): macro name should not include equal
+	  sign.
+
+Thu May 20 15:59:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/socket/socket.c: fix SEGV. [ruby-dev:23550]
+
+Thu May 20 14:35:52 2004  Tanaka Akira  <akr@m17n.org>
+
+	* ext/socket/socket.c: check SCM_RIGHTS macro addition to
+	  the msg_control field to test existence of file descriptor passing
+	  by msg_control.
+
+Thu May 20 12:38:06 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flo_eq): always check if operands are NaN.
+	  [ruby-list:39685]
+
+Thu May 20 12:34:39 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_visibility):
+	  At Ryan Davis' suggestion, honor visibility modifers if guarded by a
+	  statement modifier
+
+Thu May 20 12:22:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (have_type): do not check pointer to incomplete type,
+	  which always get compiled.  [ruby-list:39683]
+
+Wed May 19 11:09:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: change permition of TkObject#tk_send from
+	  private to public
+
+Tue May 18 14:00:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.h (NEW_DSTR): adjust list length.
+
+	* parse.y (literal_concat): ditto.
+
+Mon May 17 16:14:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* numeric.c (flo_to_s): it's preferable that "p 0.0" outputs "0.0"
+	  instead of "0.0e+00". [ruby-dev:23480]
+
+	* numeric.c (flo_to_s): it's preferable that "p 0.00000000000000000001"
+	  outputs "1.0e-20" instead of "9.999999999999999e-21". (the precision
+	  is considered, but there is assumption DBL_DIG == 15 in current
+	  implementation)
+
+Mon May 17 10:13:33 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (setup_domain_and_type): honor duck typing.
+	  [ruby-dev:23522]
+
+	* ext/socket/socket.c (sock_s_getnameinfo): ditto.
+
+Mon May 17 01:15:23 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml.rb: removed fallback to pure Ruby parser.
+
+	* lib/yaml/baseemitter.rb (indent_text): was forcing a mod value
+	  of zero at times, which kept some blocks from getting indentation.
+
+	* lib/yaml/baseemitter.rb (node_text): rewriting folded scalars.
+
+	* ext/syck/syck.h: reports style of scalars now, be they plain, block
+	  single-, or double-quoted.
+
+	* ext/syck/syck.c: ditto.
+
+	* ext/syck/gram.c: ditto.
+
+	* ext/syck/node.c: ditto.
+
+	* ext/syck/token.c: ditto.
+
+	* ext/syck/rubyext.c (yaml_org_handler): symbols loaded only
+	  if scalar style is plain.
+
+	* ext/syck/rubyext.c (yaml_org_handler): some empty strings were
+	  loaded as symbols.
+
+	* test/yaml/test_yaml.rb (test_perl_regexp): updated test to
+	  match new regexp serialization.
+
+Mon May 17 00:03:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/drb/drb.rb: Cosmetic documentation changes.
+
+Sun May 16 22:36:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/test/unit.rb: Removed :nodoc: directive (it prevented effective
+	  RDoc operation), and added file-level comment.
+
+Sun May 16 20:55:49 2004  Tanaka Akira  <akr@m17n.org>
+
+	* ext/dbm/dbm.c (fdbm_initialize): accept optional 3rd argument to
+	  specify an open flag.
+	  (Init_dbm): define open flags: DBM::READER, DBM::WRITER, DBM::WRCREAT
+	  and DBM::NEWDB.
+
+Sun May 16 13:10:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/test/unit/**/*.rb: Removed :nodoc: directives (many were
+	  generating warnings, many were on private methods).
+
+Sat May 15 01:41:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (eval): forgot to restore $SAFE value before evaluating
+	  compiled node.  [ruby-core:02872]
+
+Sat May 15 01:33:12 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_each_func): terminates loop if generating value
+	  is same to @end.  [ruby-talk:100269]
+
+Fri May 14 22:08:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_new4): should not reuse frozen shared string if
+	  the original is not an instance of String. [ruby-talk:100193]
+
+Fri May 14 18:39:25 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/canvas.rb: improve coords support for canvas items.
+	  Now, supports all of the followings.
+	    TkcLine.new(c, 0, 0, 100, 100, :fill=>'red')
+	    TkcLine.new(c, [0, 0, 100, 100], :fill=>'red')
+	    TkcLine.new(c, [0, 0], [100, 100], :fill=>'red')
+	    TkcLine.new(c, [[0, 0], [100, 100]], :fill=>'red')
+	    TkcLine.new(c, :coords=>[0, 0, 100, 100], :fill=>'red')
+	    TkcLine.new(c, :coords=>[[0, 0], [100, 100]], :fill=>'red')
+
+Fri May 14 12:11:43 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* util.c (ruby_strtod): strtod("0", &end); => end should point '\0'.
+	 [ruby-dev:23498]
+
+Thu May 13 15:47:30 2004  akira yamada  <akira@ruby-lang.org>
+
+	* lib/net/telnet.rb (Net::Telnet::login): "options" can specify
+	  regexps for login prompt and/or password prompt.
+
+Thu May 13 14:23:45 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* hash.c (delete_if_i): use st_delete_safe() (via
+	  rb_hash_delete()) instead of returning ST_DELETE.
+	  backport from HEAD.  [ruby-dev:23487]
+
+Thu May 13 13:01:30 2004  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/mailto.rb (URI::MailTo::to_s): should include fragment.
+
+Thu May 13 11:04:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (pack_pack): always add with null for 'Z'.
+
+	* pack.c (pack_unpack): terminated by null for 'Z'.  [ruby-talk:98281]
+
+Wed May 12 19:59:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (have_type, check_sizeof): replace unusable characters.
+	  [ruby-talk:99788]
+
+Wed May 12 17:41:42 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/resolv.rb (Resolv::DNS::Config): make it configurable without
+	  external file such as /etc/resolv.conf.
+
+Wed May 12 14:37:27 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509name.c: attribute value of DC (short name of
+	  domainComponent) should be IA5String.
+
+Wed May 12 13:20:19 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk/composite.rb: improve configure methods (based on
+	  the proposal of [ruby-talk:99671]).
+
+Wed May 12 11:51:08 2004  Dave Thomas  <dave@pragprog.com>
+
+	* class.c (rb_obj_singleton_methods): fix rdoc
+
+Mon May 10 21:44:42 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb: Change scheme for
+	  looking up symbols in  HTML generator.
+
+Mon May 10 16:45:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (eval): warning during eval should not cause deadlock.
+	  [ruby-talk:98651]
+
+	* eval.c (rb_eval): raise TypeError exception for superclass
+	  mismatch.  [ruby-list:39567]
+
+Mon May 10 12:11:37 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb: Hack to search parents
+	  for unqualified constant names.
+
+Mon May 10 12:11:37 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb: Hack to search parents
+	  for unqualified constant names.
+
+Sun May  9 22:37:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/net/ftp.rb: improved documentation
+	* lib/net/imap.rb: ditto
+	* lib/net/pop.rb: ditto
+	* lib/net/smtp.rb: ditto
+	* lib/net/telnet.rb: ditto
+
+Fri May  7 21:50:21 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_include): Allow
+	  multiple arguments to 'include'
+
+Fri May  7 21:31:56 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (fu_list): Array() breaks pathes including "\n".
+	  [ruby-core:02843]
+
+Fri May  7 11:25:53 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* util.c (ruby_strtod): "0.0000000000000000001" should be converted
+	  to 1.0e-19 instead of 0.0. (leading zeros aren't significant digits)
+	  [ruby-talk:99318] [ruby-dev:23465]
+
+Fri May  7 10:00:05 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tkutil.c (get_eval_string_core): bug fix. [ruby-dev:23466]
+
+Thu May  6 22:13:17 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* ext/socket/socket.c (ippaddr): use NUMERICHOST if can not resolve
+	  hostname.
+
+Thu May  6 14:22:29 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml/rubytypes.rb (to_yaml): added instance variable handling
+	  for Ranges, Strings, Structs, Regexps.
+
+	* lib/yaml/rubytypes.rb (to_yaml_fold): new method for setting a
+	  String's flow style.
+
+	* lib/yaml.rb (YAML::object_maker): now uses Object.allocate.
+
+	* ext/syck/gram.c: fixed transfer methods on structs, broke it
+	  last commit.
+
+Thu May  6 11:40:28 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (string): accept NIL.
+
+	* lib/net/imap.rb (body_type_basic): allow body-fields omissions.
+
+Thu May  6 01:59:04 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb (Generators::HtmlMethod::params):
+	  Don't include the &block parameter if we have explicit
+	  yield parameters.
+
+Wed May  5 03:40:29 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/ring.rb: use recv instead of recvfrom.
+
+Tue May  4 23:52:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/gserver.rb: documented
+
+Tue May  4 23:46:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/xmlrpc/README.txt: introduced for documentation purposes
+
+Mon May  3 09:47:24 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
+	  Fix parsing bug if yield called within 1 line block
+
+Sun May  2 01:04:38 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib, ext/tk: renewal Ruby/Tk
+
+Fri Apr 30 20:08:41 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* time.c (SIZEOF_TIME_T): support SIZEOF_TIME_T == SIZEOF_INT.
+
+Tue Apr 27 13:12:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): too many line trace call. (ruby-bugs PR#1320)
+
+Tue Apr 27 08:41:28 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml/rubytypes.rb: passing Range tests.
+
+	* ext/syck/syck.h: version 0.44.
+
+	* ext/syck/gram.c: transfers no longer open an indentation.
+	  fixed transfers which precede blocks.
+
+	* ext/syck/token.c: ditto.
+
+	* ext/syck/syck.c: fixed segfault if an anchor has been released already.
+
+	* ext/syck/node.c (syck_free_members): organized order of free'd nodes.
+
+	* ext/syck/rubyext.c (syck_emitter_write_m): test for proper string with
+	  StringValue.
+
+Mon Apr 26 23:56:54 2004  Daniel Kelley  <news-1082945587@dkelley.gmp.san-jose.ca.us>
+
+	* README.EXT, README.EXT.ja: fixed wrong function signature.
+	  [ruby-talk:98349]
+
+Mon Apr 26 21:40:09 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/code_objects.rb (RDoc::Context::add_alias): Only alias
+	  to instance methods.
+
+Sat Apr 24 10:38:31 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::group_lines):
+	  Fix bug where consecutive headings are merged.
+
+Fri Apr 23 23:26:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: $hdrdir should not contain macros for backward
+	  compatibility.  [bruby-dev:28]
+
+	* version.c (ruby_show_copyright): obtain copyright year from
+	  RUBY_RELEASE_YEAR.
+
+	* win32/resource.rb: ditto.
+
+	* win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
+	  include them.
+
+	* win32/resource.rb: include winver.h for older WindowsCE.
+
+Fri Apr 23 16:38:46 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb: sync taint/freeze flag between
+	  a pathname object and its internal string object.
+
+Fri Apr 23 14:52:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt, arg, aref_args): should not make sole splat into
+	  array, in aref_args other than aref with op_asgn.
+
+Fri Apr 23 14:14:38 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/resolv.rb: don't use Regexp#source to embed regexps.
+	  [ruby-dev:23432]
+
+Thu Apr 22 04:15:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (aref_args): should pass expanded list.  [ruby-core:02793]
+
+Thu Apr 22 01:12:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flo_to_s): tweak output string based to preserve
+	  decimal point and to remove trailing zeros.  [ruby-talk:97891]
+
+	* string.c (rb_str_index_m): use unsigned comparison for T_FIXNUM
+	  search.  [ruby-talk:97342]
+
+Wed Apr 21 22:57:27 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/rinda.rb, test/rinda/test_rinda.rb: check Hash tuple size.
+
+Wed Apr 21 20:05:00 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (URI::HTTP#proxy_open): set Host: field explicitly.
+	  [ruby-list:39542]
+
+Mon Apr 19 18:11:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_equal): returns true if two hashes have same set
+	  of key-value set.  [ruby-talk:97559]
+
+	* hash.c (rb_hash_eql): returns true if two hashes are equal and
+	  have same default values.
+
+Mon Apr 19 08:19:58 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
+
+	* dln.c, io.c, lib/benchmark.rb, lib/cgi.rb, lib/csv.rb, lib/date.rb,
+	  lib/ftools.rb, lib/getoptlong.rb, lib/logger.rb, lib/matrix.rb,
+	  lib/monitor.rb, lib/set.rb, lib/thwait.rb, lib/timeout.rb,
+	  lib/yaml.rb, lib/drb/drb.rb, lib/irb/workspace.rb, lib/net/ftp.rb,
+	  lib/net/http.rb, lib/net/imap.rb, lib/net/telnet.rb,
+	  lib/racc/parser.rb, lib/rinda/rinda.rb, lib/rinda/tuplespace.rb,
+	  lib/shell/command-processor.rb, lib/soap/rpc/soaplet.rb,
+	  lib/test/unit/testcase.rb, lib/test/unit/testsuite.rb: typo fix.
+
+Mon Apr 19 08:14:18 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Allow for
+	  #ifdef HAVE_PROTOTYPES
+
+Fri Apr 16 22:33:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* ext/iconv/iconv.c: nearly finished RDoc comments.
+
+Fri Apr 16 17:04:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_equal): always returns true or false, never
+	  returns nil. [ruby-dev:23404]
+
+Fri Apr 16 08:27:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: skip linking when libraries to be preloaded not
+	  compiled.  [ruby-list:39561]
+
+Thu Apr 15 23:21:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (pst_success_p): new method Process::Status#success?.
+	  [ruby-dev:23385]
+
+Thu Apr 15 17:12:13 2004  Tanaka Akira  <akr@m17n.org>
+
+	* ext/gdbm/gdbm.c (Init_gdbm): define GDBM::READER, GDBM::WRITER,
+	  GDBM::WRCREAT and GDBM::NEWDB.
+	  (fgdbm_initialize): use specified read/write flag.
+
+Wed Apr 14 11:29:56 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* numeric.c (flo_eq): workaround for bcc32's bug.
+	  (ruby-bugs-ja:PR#594)
+
+Wed Apr 14 13:06:35 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
+
+	* array.c, enum.c, eval.c, file.c, io.c, numeric.c, object.c, prec.c,
+	  process.c, re.c, string.c: typos in RDoc comments.  [ruby-core:02783]
+
+Wed Apr 14 11:06:38 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::scan): Changed
+	  behavior of :enddoc: -- it now unconditionally terminates
+	  processing of the current file.
+
+Wed Apr 14 11:03:22 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* defines.h: include <net/socket.h> to get fd_set definition in BeOS.
+
+Tue Apr 13 23:06:30 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/rinda.rb: change pattern matching.
+	  a === b -> a == b || a === b. [druby-ja:98]
+
+	* test/rinda/test_rinda.rb: ditto.
+
+Tue Apr 13 19:54:29 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: should not overwrite HTTP request header.
+	  [ruby-list:39543]
+
+Tue Apr 13 01:30:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* ext/iconv/iconv.c: RDoc documentation (from RD; nearly finished).
+	* ext/iconv/charset_alias.rb: Prevent from RDoc'ing.
+
+Mon Apr 12 19:11:29 2004  Eric Hodel  <drbrain@segment7.net>
+
+	* gc.c (rb_gc_copy_finalizer): typo.  [ruby-core:02774]
+
+Mon Apr 12 18:52:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_init_i): should return
+	  a value.
+
+Mon Apr 12 10:43:47 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (rb_glob2, rb_glob, rb_globi, push_globs, push_braces,
+	  rb_push_glob): fix memory leak. (leaked when block was interrupted)
+
+Mon Apr 12 10:27:37 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub: backport SIZEOF_TIME_T definition from 1.9.
+
+	* win32/Makefile.sub: ditto.
+
+	* wince/Makefile.sub: ditto.
+
+Sun Apr 11 19:12:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (require_libraries): restore source file/line after
+	  statically linked extensions initialized.  [ruby-dev:23357]
+
+Sun Apr 11 10:47:04 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/code_objects.rb (RDoc::TopLevel::add_class_or_module): Toplevel
+	  classes and modules are a special case too... (handle extending existing
+	  classes with or without :enddoc:)
+
+Sat Apr 10 23:51:13 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/code_objects.rb (RDoc::Context::add_to): Implementation of :enddoc:
+	  made one too many assumptions...
+
+Sat Apr 10 00:00:19 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/markup/simple_markup/inline.rb: Fix problem
+	  with \_cat_<b>dog</b>
+
+Wed Apr  7 00:19:50 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/rinda.rb: fix hash tuple bug.
+
+	* lib/rinda/tuplespace.rb: ditto.
+
+	* test/rinda/test_rinda.rb
+
+Tue Apr  6 18:24:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_reopen): should use rb_io_check_io().
+
+Tue Apr  6 16:46:09 2004  Tanaka Akira  <akr@m17n.org>
+
+	* configure.in: check the size of time_t.
+
+	* time.c (time_add): new function.
+	  (time_plus): use time_add.
+	  (time_minus): use time_add.
+
+Tue Apr  6 13:21:30 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (make_hostent): must return value.
+
+Tue Apr  6 00:05:30 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/rinda.rb: add require 'drb/drb'
+
+Mon Apr  5 08:18:23 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/rdoc.rb: Remove leading ./ from file names so that cross
+	  references work properly.
+
+Sun Apr  4 20:33:42 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (Init_load): make $LOADED_FEATURES built-in.
+	  [ruby-dev:23299]
+
+	* ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
+
+	* lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.
+
+Sun Apr  4 14:01:20 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/options.rb (Options::parse): Allow multiple -x options to RDoc.
+	  Fix bug where files weren't being excluded properly
+
+Sat Apr  3 17:11:05 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/syck.h: version 0.43.
+
+	* ext/syck/lib/gram.c: allow root-level inline collections.
+	 [ruby-talk:94922]
+
+	* lib/yaml/rubytypes.rb (Symbol#to_yaml): emit symbols as implicits.
+	 [ruby-talk:94930]
+
+	* ext/syck/bytecode.c: turn off default implicit typing.
+
+	* ext/syck/implicit.c: detect base60 integers.
+
+	* ext/syck/rubyext.c: handle base60, as well as hex and octal
+	  with commas.  implicit typing of ruby symbols.
+
+Fri Apr  2 17:27:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (top_include): include in the wrapped load is done for
+	  the wrapper, not for a singleton class for wrapped main.
+	  [ruby-dev:23305]
+
+Fri Apr  2 15:13:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_eq): use temporary double variable to save the
+	  result (internal float register may be bigger than 64 bits, for
+	  example, 80 bits on x86).  [ruby-dev:23311]
+
+Fri Apr  2 14:35:26 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (block_pass): should generate unique identifier of the
+	  pushing block.  [ruby-talk:96363]
+
+Fri Apr  2 07:31:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (make_hostent): fix memory leak, based on
+	  the patch from HORIKAWA Hisashi <vzw00011@nifty.ne.jp>.
+
+Thu Apr  1 22:55:33 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb: Allow rdoc comments in
+	  =begin rdoc/=end
+
+	* lib/rdoc/parsers/parse_rb.rb: Fix problem with comment in
+	  top-level method being taken as file comment.
+
+Thu Apr  1 22:55:04 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_options.rb: Fix undefined variable warning.
+
+Thu Apr  1 19:58:37 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/mapping/{factory.rb,registry.rb}: fixed illegal mapped URI
+	  object with soap/marshal.
+	  added URIFactory class for URI mapping.  BasetypeFactory checks
+	  instance_variables when original mapping is not allowed (ivar must
+	  be empty).  Instance of URI have instance_variables but it must be
+	  llowed whenever original mapping is allowed or not.
+
+	* lib/xsd/datatypes.rb: check the smallest positive non-zero
+	  single-precision float exactly instead of packing with "f".
+	  [ruby-talk:88822]
+
+	* lib/soap/mapping/rubytypeFactory.rb: should not dump singleton class.
+	  [ruby-dev:22588]
+	  c = class << Object.new; class C; self; end; end; SOAPMarshal.dump(c)
+
+Wed Mar 31 19:06:23 2004  Tanaka Akira  <akr@m17n.org>
+
+	* time.c (year_leap_p): new function.
+	  (timegm_noleapsecond): ditto.
+	  (search_time_t): use timegm_noleapsecond instead of
+	  mktime for first guess.
+
+Wed Mar 31 12:04:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/delegate.rb (DelegateClass): define internal methods of the
+	  result class, but not metaclass of the caller.  [ruby-talk:96156]
+
+	* intern.h: provide proper prototypes.  [ruby-core:02724]
+
+	* ruby.h: missing.h is now prerequisite to intern.h.
+
+Tue Mar 30 20:25:34 2004  Tanaka Akira  <akr@m17n.org>
+
+	* time.c (search_time_t): limit guess range by mktime if it is
+	  available.  [ruby-dev:23274]
+
+Sun Mar 28 14:16:59 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/pop.rb (auth): failed when account/password include "%".
+	  [ruby-talk:95933]
+
+Sat Mar 27 21:40:41 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb: permit extra semicolon in content-type field.
+
+Sat Mar 27 10:40:48 2004  Tanaka Akira  <akr@m17n.org>
+
+	* (lib/pp.rb, lib/prettyprint.rb): define seplist in PP::PPMethods
+	  instead of PrettyPrint.
+
+Thu Mar 25 23:28:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_overflow_p): backport 1.9 usec overflow function.
+	  (ruby-bugs PR#1307)
+
+Thu Mar 25 23:15:24 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_options.rb (RI::Options::show_version):
+	  Add --version option
+
+Thu Mar 25 04:16:18 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_options.rb (RI::Options): Add the --list-names option,
+	  which dumps our all known names
+
+Thu Mar 25 03:57:47 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_util.rb (NameDescriptor::initialize): No longer
+	  allow nested classes to be designated using "."--you must
+	  now use "::"
+
+Thu Mar 25 02:00:18 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/template/html/one_page_html.rb (Page):
+	  Fix to work with C modules.
+
+Wed Mar 24 21:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/uri.rb: Documented (thanks Dmitry V. Sabanin).
+	* lib/uri/common.rb: Ditto.
+	* lib/uri/ftp.rb: Ditto.
+	* lib/uri/generic.rb: Ditto.
+	* lib/uri/http.rb: Ditto.
+	* lib/uri/https.rb: Ditto.
+	* lib/uri/ldap.rb: Ditto.
+	* lib/uri/mailto.rb: Ditto.
+	  (All backported from 1.9)
+
+Wed Mar 24 18:48:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb ($ruby, $topdir, $hdrdir): should not be affected by
+	  DESTDIR after installed.
+
+	* lib/mkmf.rb (RUBY): / is not recognized as path separator on
+	  nmake/bmake. [ruby-list:39388]
+
+	* lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated.
+
+Wed Mar 24 12:32:56 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_class_module):
+	  Don't document methods if we don't know for sure the
+	  class or module.
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
+	  Don't store documentation for singleton classes if we
+	  don't know the real class.
+
+Wed Mar 24 11:11:26 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb (Generators::HTMLGenerator::load_html_template):
+	  Allow non-RDoc templates by putting a slash in the template name
+
+Mon Mar 22 16:19:57 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ruby.1: add -width option to .Bl for old groff.
+
+Sun Mar 21 21:11:16 2004  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/shell/*: bug fix for Shell#system(command_line_string).
+
+Sat Mar 20 20:57:10 2004  David Black  <dblack@wobblini.net>
+
+	* lib/scanf.rb: Backported 1.9 branch
+	  modifications/corrections to 1.8 branch
+
+Sat Mar 20 23:51:03 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* eval.c (rb_require_safe): preserve old ruby_errinfo.
+	  [ruby-talk:95409]
+
+	* eval.c (rb_f_raise): should not clear backtrace information if
+	  exception object already have one.
+
+Sat Mar 20 15:25:36 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Force
+	  page background to white.
+
+Sat Mar 20 09:52:33 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb: _parse() now accepts fractional
+	  part of second minute that follows a comma or a full stop.
+
+Fri Mar 19 01:55:57 2004  Mauricio Fernandez  <batsman.geo@yahoo.com>
+
+	* io.c (rb_io_sync): need not to check writable. [ruby-core:02674]
+
+Thu Mar 18 21:44:38 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: backport drb.rb 1.16.
+
+Fri Mar 18 17:49:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (make_struct): allow const_id for accessor names.
+	  [ruby-core:04585]
+
+	* eval.c (rb_attr): check if attribute name is local_id or
+	  const_id.
+
+Thu Mar 18 16:22:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_eq): avoid false positive by using scope and
+	  dyna_vars.  no longer use frame.uniq.
+
+Wed Mar 17 14:44:43 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (range): fix possible "\0" overrun. (in case of "\0-")
+
+Mon Mar 15 07:39:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): should not re-submit TAG_BREAK if this
+	  yield is not break destination. [ruby-dev:23197]
+
+Sat Mar 13 14:28:16 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/test_drbssl.rb: rescue LoadError. (Barkport from main
+	  trunk)
+
+	* test/drb/test_drbunix.rb: ditto.
+
+Wed Mar 10 22:28:09 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (remove_dir): should handle symlink correctly.
+	  This patch is contributed by Christian Loew.  [ruby-talk:94635]
+	  (Backport from main trunk)
+
+Wed Mar 10 16:28:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (return_jump): set return value to the return
+	  destination.  separated from localjump_destination().
+
+	* eval.c (break_jump): break innermost loop (or thread or proc).
+
+	* eval.c (rb_yield_0): set exit_value for block break.
+
+Wed Mar 10 15:58:43 2004  Ryan Davis  <ryand@zenspider.com>
+
+	* eval.c (eval): Only print backtrace if generating the backtrace
+	  doesn't generate an exception.  [ruby-core:02621]
+
+Tue Mar  9 13:04:26 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_ungetc): raise IOError instead of calling
+	  rb_sys_fail().  [ruby-talk:23181]
+
+Mon Mar  8 19:32:28 2004  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/common.rb (URI::REGEXP::PATTERN::HOSTPORT): (?:#{PORT})
+	  -> (?::#{PORT}).  [ruby-dev:23170]
+
+Mon Mar  8 15:31:41 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (range): treat incomplete '[' as ordinary character (like
+	  has_magic does).
+
+	* dir.c (range):  Cancel above change. More discussion is needed.
+
+Sun Mar  7 22:37:46 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/ut_drb.rb: use 'druby://localhost:0'. [ruby-dev:23078]
+
+	* test/drb/ut_eval.rb: ditto.
+
+	* test/drb/ut_large.rb: ditto.
+
+	* test/drb/ut_safe1.rb: ditto.
+
+	* test/drb/ut_drb_drbssl.rb: use 'drbssl://localhost:0'.
+
+Sun Mar  7 16:22:26 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* Makefile.in (lex.c): use $? instead of $<.
+
+Fri Mar  5 00:54:14 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/test/unit.rb: MOve RDoc documentation so that you can
+	  now say 'ri Test::Unit'
+
+Tue Mar  2 12:32:59 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub, wince/Makefile.sub (config.h): shouldn't check
+	  defined? NORETURN. [ruby-dev:23100]
+
+Mon Mar  1 12:24:10 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_alias):
+	  Allow aliases to have parentheses
+
+Sun Feb 29 23:14:53 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
+	  Handle :nodoc: on singleton classes.
+
+Sat Feb 28 10:58:49 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* MANIFEST: add test_erb.rb
+
+	* lib/erb.rb, test/erb/test_erb.rb: don't forget filename,
+	  if both filename and safe_level given. [ruby-dev:23050]
+
+Fri Feb 27 01:00:09 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb, test/drb/drbtest.rb: require drb/eq.rb by default
+
+Wed Feb 25 21:16:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (with_destdir): should return the given argument if no
+	  DESTDIR is given.
+
+	* instruby.rb: use path name expansion of cmd.exe.
+
+Wed Feb 25 09:35:22 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* error.c (NameError::Message): new class for lazy evaluation of
+	  message to ensure replaced before marshalling. merge from HEAD.
+	  (ruby-bugs-ja:PR#588)
+
+	* eval.c (rb_method_missing): use NameError::Message. merge from
+	  HEAD. (ruby-bugs-ja:PR#588)
+
+Tue Feb 24 18:59:37 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (glob_helper): '**/' should not match leading period
+	  unless File::FNM_DOTMATCH is set. (like '*/') [ruby-dev:23014]
+
+Tue Feb 24 13:22:21 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/rdoc.rb (RDoc::RDoc::normalized_file_list): Attempt to get better
+	  heuristics on which files to include and exclude. Now only include
+	  non-standard files if they are explicitly named in ARGV.
+
+Tue Feb 24 07:23:30 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb: Deal with :stopdoc: when
+	  choosing a default main page to display (ie. don't select a page
+	  if we don't have documentation for it).
+
+Tue Feb 24 06:40:14 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
+	  class variables in code listings
+
+Tue Feb 24 06:40:14 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
+	  class variables in code listings
+
+Tue Feb 24 06:32:27 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_aliases): Handle
+	  aliases in C files.
+
+Tue Feb 24 06:16:22 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/rdoc.rb (RDoc::RDoc::document): Now create op dir _before_
+	  parsing files.
+
+Tue Feb 24 06:08:47 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_constant):
+	  Start collecting text of constant values earlier: was missing
+	  values in output if there was no space after '='
+
+Tue Feb 24 06:08:25 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb: Escape contant values.
+
+Tue Feb 24 03:45:06 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_config.c (ossl_config_each): add new method
+	  OpenSSL::Config#each. it iterates with section name, field name
+	  and value.
+
+	* ext/openssl/ossl_config.c (Init_ossl_config): include Enumerable.
+
+Mon Feb 23 09:16:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* instruby.rb (DOSISH): embedded path in batch files should not be
+	  prefixed by DESTDIR.  [ruby-core:02186]
+
+Sun Feb 22 09:54:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* re.c: corrected documentation format (again)
+
+Sun Feb 22 09:43:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* re.c: corrected documentation format (rb_reg_initialize_m)
+
+Sat Feb 21 22:36:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* ext/zlib/zlib.c: documented, but needs more effort.
+
+Sat Feb 21 11:12:15 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/os2.c, missing/x68.c: typo fix.  pointed out by greentea.
+
+Fri Feb 20 18:59:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/init.rb (IRB::IRB.parse_opts): add -I option to
+	  irb. [ruby-dev:39243]
+
+Thu Feb 19 23:24:16 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
+	  Support visibility modifiers for attributes
+
+Thu Feb 19 23:24:16 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
+	  Support visibility modifiers for attributes
+
+Thu Feb 19 22:39:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/rinda/test_rinda.rb: DRb.start_service only once in testsuites.
+	  DRb.start_service could handle this.
+
+Thu Feb 19 22:19:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/ostruct.rb: documented
+
+Thu Feb 19 21:28:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* ext/strscan/strscan.c: improved documentation
+
+Thu Feb 19 03:10:52 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c: synchronized with main trunk (rev 1.11).
+
+Thu Feb 19 02:30:34 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c: documentation checked.
+
+Thu Feb 19 00:11:05 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/markup/simple_markup/preprocess.rb (SM::PreProcess::handle):
+	  Strip extraneous space from filenames in :include:
+
+Wed Feb 18 22:52:00 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/unix.rb: remove O_NONBLOCK, thanks \ay
+
+Wed Feb 18 22:47:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* ext/strscan/strscan.c: documented
+
+Wed Feb 18 22:03:11 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/*: should not depend on $KCODE.
+
+Wed Feb 18 17:18:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c: need to include <olectl.h> on Cygwin.
+
+Wed Feb 18 10:40:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): do not prepend dots for negative
+	  numbers if FZERO is specified.  [ruby-list:39218]
+
+Tue Feb 17 23:40:34 2004  Guy Decoux  <ts@moulon.inra.fr>
+
+	* sprintf.c (rb_f_sprintf): preserve original val for
+	  format_integer. [ruby-talk:92975]
+
+Tue Feb 17 23:28:45 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/marshaltestlib.rb: common marshal testcase added.
+
+	* test/ruby/test_marshal.rb: use above testsuite.
+
+	* test/soap/marshal/test_marshal.rb: ditto.
+
+	* test/soap/marshal/cmarshal.rb: removed (not used).
+
+Tue Feb 17 10:51:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/syck/rubyext.c (syck_emitter_end_object): takes only one arg.
+
+Tue Feb 17 01:35:28 2004  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
+	  to NODE_LIT.  [ruby-dev:22920]
+
+Tue Feb 17 01:24:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bcc32/Makefile.sub, win32/Makefile.sub (config.h): define
+	  STACK_GROW_DIRECTION. [ruby-dev:22910]
+
+	* bcc32/Makefile.sub (config.h): add newer checks.
+
+	* wince/Makefile.sub (config.h): define NEED_IO_SEEK_BETWEEN_RW.
+
+Tue Feb 17 00:38:10 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/tuplespace.rb: TupleSpace#initialize, stop doubling timeout
+
+Tue Feb 17 00:18:03 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_rinda.rb: import test_rinda.rb
+
+Tue Feb 17 00:14:30 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub: avoid warning "Redefinition of macro
+	  'HAVE_GETLOGIN'".
+
+	* vms/config.h_in: ditto.
+
+Mon Feb 16 23:28:14 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/csv.rb: document reduction.  [ruby-core:02429]
+
+Mon Feb 16 22:08:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/generator.rb: corrected doc format
+	* lib/rinda/rinda.rb: added documentation (from Hugh Sasse)
+	* lib/rinda/tuplespace.rb: ditto
+
+Mon Feb 16 20:41:32 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub: show more warnings. (refering to mingw)
+
+	* bcc32/setup.mak: ditto.
+
+Mon Feb 16 13:39:44 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (rb_glob, rb_globi): add const.
+
+	* ruby.h: ditto.
+
+Mon Feb 16 02:16:33 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub: should warn suspicious pointer conversion.
+
+	* bcc32/setup.mak: ditto.
+
+Sun Feb 15 19:06:42 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/tuplespace.rb: TupleSpace#read(tpl, 0), raise
+	  RequestExpiredError if not found.
+
+Sun Feb 15 15:56:46 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add IDispatch wrapper in val2variant.
+	  Thanks, arton.
+
+Sun Feb 15 01:46:05 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/mkmf.rb: absolute path of ruby is assigned to $(RUBY).
+	  [ruby-dev:22870]
+
+Sat Feb 14 11:29:41 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* sample/drb/*: import lib/drb/sample
+
+Sat Feb 14 11:08:23 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: add pretty_print, thanks gotoken.
+
+Fri Feb 13 12:35:08 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb: File.link may raise EINVAL and
+	  EACCES on Windows.
+
+Thu Feb 12 21:45:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/ftools.rb: documented
+
+Thu Feb 12 21:25:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/base64.rb: backported from HEAD (modularised and documented)
+
+Thu Feb 12 20:31:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_tmpsrc): cpp32 of Borland C++ ignores #error
+	  directives in DOS line-ending files at all.
+
+Thu Feb 12 02:23:56 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb: use assert_raise instead of assert_raises.
+
+	* lib/pp.rb: ditto.
+
+	* lib/time.rb: ditto.
+
+	* lib/tsort.rb: ditto.
+	  use TSortHash and TSortArray instead of Hash and Array in test.
+
+Wed Feb 11 20:01:12 2004  akira yamada  <akira@ruby-lang.org>
+
+	* test/ruby/test_file.rb (TestFile::test_fnmatch): added tests for
+	  File.fnmatch. [ruby-dev:22815][ruby-dev:22819]
+
+	* test/ruby/test_proc.rb (TestProc::test_eq): added a
+	  test.  [ruby-dev:22599]
+
+	* test/ruby/test_proc.rb (TestProc::test_eq): added tests for
+	   Proc#==.  [ruby-dev:22592], [ruby-dev:22601]
+
+Tue Feb 10 16:43:56 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (umethod_bind): purge unused check.  [ruby-dev:22850]
+
+Mon Feb  9 17:16:00 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/rdoc/parsers/parse_c.rb: escape '{' and '}' to avoid warnings.
+
+Mon Feb  9 13:00:55 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* dir.c (fnmatch): File.fnmatch('*?', 'a') should return true.
+	  [ruby-dev:22815]
+
+	* dir.c (fnmatch): File.fnmatch('\[1\]' , '[1]') should return true.
+	  [ruby-dev:22819]
+
+Sun Feb  8 16:46:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pp.rb (PP::PPMethods::object_address_group): suppress negative
+	  sign for higher heap areas.
+
+Fri Feb  6 22:48:16 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb (gen_url): Support
+	  https in RDoc hyperlinks
+
+Fri Feb  6 22:41:22 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/pp.rb (PPInspectTest#test_to_s_with_iv): rollback the previous
+	  commit.  [ruby-dev:22813]
+
+Fri Feb  6 22:22:50 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/pp.rb (PPInspectTest#test_to_s_with_iv): remove instance
+	  variable which is defined in the test.
+
+Fri Feb  6 00:48:37 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/prettyprint.rb (PrettyPrint#first?): obsoleted.
+
+Thu Feb  5 23:56:55 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/prettyprint.rb (PrettyPrint#seplist): added.
+
+	* lib/pp.rb (PPMethods#pp_object): use seplist.
+	  (PPMethods#pp_hash): ditto.
+	  (Array#pretty_print): ditto.
+	  (Struct#pretty_print): ditto.
+	  (MatchData#pretty_print): ditto.
+
+	* lib/set.rb (Set#pretty_print): use seplist.
+
+Wed Feb  4 02:12:06 2004  Tanaka Akira  <akr@m17n.org>
+
+	* file.c (test_l): fix wrong method name in document.
+	  (test_S): ditto.
+	  (test_b): ditto.
+	  (test_c): ditto.
+	  (test_suid): ditto.
+	  (test_sgid): ditto.
+	  (test_sticky): ditto.
+
+Tue Feb  3 08:04:57 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (Struct#pretty_print_cycle): follow 1.8 style.
+
+Mon Feb  2 19:33:49 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: backport from 1.9 for Interix.
+
+	* dln.c (dln_load): ditto.
+
+Mon Feb  2 13:31:51 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/net/http.rb (canonical_each): fix merge miss.
+
+Mon Feb  2 01:54:00 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (Struct#pretty_print): make it 1.8 style.
+	  (Numeric#pretty_print, FalseClass#pretty_print)
+	  (TrueClass#pretty_print, Module#pretty_print): fix pp for objects
+	  with instance variables.  [ruby-talk:91157]
+
+	* lib/open-uri.rb (URI::Generic#find_proxy): return nil on loopback
+	  address.
+
+	* lib/resolv-replace.rb (BasicSocket#send): don't replace because
+	  it has no hostname argument.
+	  (IPSocket.getaddress): raise SocketError instead of
+	  Resolv::ResolvError for errors.
+	  (TCPSocket#initialize, UDPSocket#bind, UDPSocket#connect)
+	  (SOCKSSocket#initialize): use IPSocket.getaddress instead of
+	  Resolv.getaddress.
+	  (UDPSocket#send): recognize 3 arguments form.  try all addresses on
+	  4 arguments form.
+
+Sun Feb  1 18:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/net/http.rb: merged coding style changes from HEAD.
+
+Sun Feb  1 16:15:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/test/unit.rb: rearranged documentation for RDoc's sake.
+	* lib/matrix.rb: improved documentation.
+	* lib/net/http.rb: slight documentation formatting improvement.
+
+Sun Feb  1 05:30:06 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (URI::Generic#find_proxy): warn HTTP_PROXY.
+	 raise an errror on non-http proxy URI.
+	 (OpenURI::Buffer#<<): make a tempfile binmode.  [ruby-talk:90793]
+
+Sat Jan 31 09:20:32 2004  NAKAMURA, Hiroshi  <nakahiro@sairon.co.jp>
+
+	* sample/openssl/gen_csr.rb: wrong usage string.
+
+Sat Jan 31 01:00:32 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/wsdlDriver.rb, lib/wsdl/soap/operation.rb: add support of
+	  "parts" attribute of soap:body element in WSDL.
+
+	* lib/wsdl/xmlSchema/schema.rb: friendly warning message for
+	  simpleType element which is not supported for now.
+
+	* lib/soap/mapping/factory.rb: deleted unused methods.
+
+	* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
+	  string <-> Ruby class name matching.
+
+	* test/wsdl/soap/{soapbodyparts.wsdl,test_soapbodyparts.wsdl}: new
+	  files.
+
+Thu Jan 29 23:56:00 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* util.c (mblen): fix overrun.  [ruby-dev:22672]
+
+Thu Jan 29 22:41:53 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb: Allow 'link:' in Tidylinks.
+	  THis means you can write "see f1[link:files/f1_rb.html]".
+
+Thu Jan 29 15:33:23 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509hame.c (ossl_x509name_initialize): change
+	  second argument. it expected to be a Hash not an Integer.
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): add new
+	  function for OpenSSL::X509::Name#add_entry.
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_to_a): append ASN.1
+	  tag number to each element of return value.
+
+	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): add constants
+	  OpenSSL::X509::Name::DEFAULT_OBJECT_TYPE and OBJECT_TYPE_TEMPLATE.
+
+	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#initialize):
+	  second argument takes OBJECT_TYPE_TEMPLATE by default.
+
+	* sample/openssl/gen_csr.rb: use OpenSSL::X509::Name.parse.
+
+Wed Jan 28 04:29:41 2004  Eric Schwartz  <emschwar@fc.hp.com>
+
+	* lib/cgi/session.rb: use LOCK_SH to read, and a few other
+	  improvements.  [ruby-core:02328]
+
+Tue Jan 27 11:09:29 2004  FUKUMOTO Atsushi  <fukumoto@nospam.imasy.or.jp>
+
+	* ext/socket/socket.c (s_recvfrom): sending length should be an
+	  invariant while retrying on EAGAIN.  [ruby-talk:89962]
+
+Tue Jan 27 10:35:18 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c (set_argv): fix condition.
+
+Tue Jan 27 02:26:31 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httputils.rb (WEBrick:HTTPUtils::parse_header):
+	  refine regex for header-name.
+
+Tue Jan 27 00:30:11 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub: rollback.
+
+Mon Jan 26 22:53:04 2004  Dave Thomas  <dave@pragprog.com>
+
+	* io.c: Remove documentation references to $defout.
+
+Mon Jan 26 15:11:47 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* sample/exyacc.rb: escape '}' to avoid warning.
+
+Mon Jan 26 14:41:46 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator::initialize): preserve
+	  singleton_method_added method [ruby-dev:22685]
+
+	* lib/delegate.rb (Delegator::initialize): use Kernel::raise
+	  instead of mere raise.  [ruby-dev:22681]
+
+Mon Jan 26 12:47:17 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: define CONST84 when TCL_MAJOR_VERSION == 7
+
+Mon Jan 26 11:35:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: Makefiles should depend on also rbconfig.rb.
+	  (ruby-bugs:PR#1256)
+
+	* ext/win32ole/win32ole.c (set_argv): set real arguments to
+	  WIN32OLE::ARGV.  [ruby-list:39073]
+
+Thu Jan 22 22:54:53 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (BEG_REGEXP): allow 8-bit characters in quoted
+	  strings for Novell GroupWise Internet Agent.
+	* lib/net/imap.rb (DATA_REGEXP): ditto.
+
+Thu Jan 22 16:21:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (string_content): reset lexical states at the beginning of
+	  string contents.  [ruby-list:39061]
+
+Wed Jan 21 21:55:51 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: remove O_NONBLOCK, thanks \ay
+	* lib/drb/extserv.rb: typo
+
+Wed Jan 21 17:57:56 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (envelope): allow NIL.
+	* lib/net/imap.rb (body): ditto.
+	* lib/net/imap.rb (number): ditto.
+	* lib/net/imap.rb (ensure_nz_number): show a detailed error
+	  message.
+
+Wed Jan 21 16:44:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (merge_libs): squeeze successive same libraries.
+	  [ruby-dev:22652]
+
+Wed Jan 21 16:01:37 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/digest/rmd160/extconf.rb: have_library appends found library.
+
+Wed Jan 21 11:36:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (block_append): update nd_end for "real" head node.
+	  [ruby-list:39058]
+
+Tue Jan 20 14:48:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: should check <openssl/conf_api.h> instead
+	  of OPENSSL_VERSION_NUMBER. [ruby-list:39056]
+
+Tue Jan 20 14:43:17 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/base64.rb: Add RDoc
+
+Tue Jan 20 14:25:51 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/abbrev.rb: Add RDoc
+
+Tue Jan 20 13:22:39 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb: Document aliases at
+	  top-most level.
+
+	* lib/English.rb: Document English.rb.
+
+Tue Jan 20 02:49:22 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: add check for OpenSSL version.
+	  [ruby-list:39054]
+
+Tue Jan 20 02:38:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_class): should not dump singleton class.
+	  [ruby-dev:22631]
+
+Tue Jan 20 01:31:36 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (lineno): typo fix(FIX2INT -> INT2FIX).
+
+Mon Jan 19 21:53:38 2004  akira yamada  <akira@ruby-lang.org>
+
+	* io.c, re.c, string.c, time.c: fixed up positions of RDocs.
+
+Mon Jan 19 07:09:20 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: zone was wrong when it was behind UTC.
+	  Thanks Mark J. Reed.
+
+	* lib/date/format.rb: %z is now always replaced by four digits
+	  with a leading plus or minus sign.
+
+	* sample/cal.rb: added a class, anyway.
+
+Sun Jan 18 20:47:35 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ruby.c: use translate_char() on Cygwin.
+
+Sun Jan 18 02:33:26 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* defines.h (_WIN32): undef _WIN32 on Cygwin before defining DOSISH.
+
+Sun Jan 18 00:23:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (class2path): check anonymous class/module before
+	  checking referable, and allow singleton classes.
+
+Fri Jan 16 14:33:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (class2path): get class path and check referable.
+	  [ruby-dev:22588]
+
+Fri Jan 16 09:52:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_eq): Proc with empty body may not be equal.
+	  [ruby-dev:22590]
+
+Thu Jan 15 13:03:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_read): do not append EOF.  (ruby-bugs-ja:PR#585)
+
+	* io.c (rb_io_fwrite): ad-hockery hack to get rid of HP-UX stdio
+	  weird behavior.  [ruby-dev:22424]
+
+Wed Jan 14 13:31:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/extconf.rb: wrapper iconv.rb is dependent on platform.
+
+Tue Jan 13 18:54:28 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb(Logger#msg2str): no special treatment for the object
+	  which responds to :to_str.  commited at 2004-01-11T21:46:27 by
+	  gsinclair.
+
+	* lib/logger.rb(LogDevice#initialize): remove type checking if the
+	  given object is a String.  Kernel.open handles it correctly.
+	  commited at 2004-01-11T21:46:27 by gsinclair.
+
+	* test/logger/test_logger.rb: follow above change (ArgumentError ->
+	  TypeError.)  follow above commit.
+
+Tue Jan 13 14:27:13 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* lib/test/unit/ui/testrunnerutilities.rb (TestRunnerUtilities):
+	  moved run method which allows output level.  [ruby-dev:22554]
+
+Tue Jan 13 04:29:52 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_driver.rb (RiDriver::report_method_stuff):
+	  Show fully-qualified class names in class list.
+
+Tue Jan 13 01:04:37 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_paths.rb (RI::Paths): First attempt at
+	  incorporating DESTDIR in the rdoc installation.
+
+Mon Jan 12 23:27:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (primary): fix position after FCALL.  [ruby-dev:22574]
+
+Mon Jan 12 12:07:22 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods):
+	  Someone changed the "// in eval.c" comments to "/*...*/" style,
+	  so the parsing of the source file name broke.
+
+	* object.c: Remove spurious space in TrueClass documentation.
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Fix
+	  bad regexp: if the code before a documented method contained
+	  a comment that wasn't terminated by whitespace, that comment
+	  and all intervening code was included in the following
+	  method's documentation.
+
+	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter::break_to_newline):
+	  HTML formats need explicit line breaks.
+
+Mon Jan 12 11:46:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
+	  quotes.  [ruby-dev:22564]
+
+	* lib/mkmf.rb (libpathflag): do not enclose with quotes always.
+
+	* {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
+
+Mon Jan 12 02:24:07 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
+	  generation support to ri (Elliot Hughes)
+
+Mon Jan 12 02:24:07 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
+	  generation support to ri (Elliot Hughes)
+
+Sun Jan 11 02:07:47 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
+	  Also accept command line options via the 'RI' environment variable.
+
+Sun Jan 11 02:07:47 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
+	  Also accept command line options via the 'RI' environment variable.
+
+Sat Jan 10 21:27:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (eval): need to add message delimiter. [ruby-dev:22561]
+
+Sat Jan 10 01:54:50 2004  Eric Sunshine  <sunshine@sunshineco.com>
+
+	* defines.h (__NeXT__): Ensure that all standard S_IRUSR, S_IWGRP,
+	  S_IRWXO, etc. macros are defined since future code might require
+	  them (even though present code only requires a subset).
+
+	* defines.h (__NeXT__): Bug fix: WORDS_BIGENDIAN was not being set
+	  correctly on Rhapsody when -arch compiler flag was used (via
+	  configure's --enable-fat-binary option).
+
+Fri Jan  9 10:05:14 2004  Siena.  <siena@faculty.chiba-u.jp>
+
+	* lib/mkmf.rb (libpathflag): use single quotes.  [ruby-dev:22440]
+
+Thu Jan  8 23:49:21 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (RDOCTARGET): new macro.  if you want to install
+	  rdoc documentation, you need to run configure with
+	  --enable-install-doc.
+
+Thu Jan  8 21:29:43 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_pkey.c (ossl_pkey_to_der): removed; it returns
+	  public key only.
+
+	* ext/openssl/ossl_pkey_dh.c (ossl_dh_to_der): new function for
+	  OpenSSL::PKey::DH#to_der.
+
+	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_to_der): new function for
+	  OpenSSL::PKey::DSA#to_der.
+
+	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_to_der): new function for
+	  OpenSSL::PKey::RSA#to_der.
+
+Thu Jan  8 16:51:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/wsdl/datetime/test_datetime.rb: fixed a stupid testcase which
+	  dumps "E" at month-end.
+
+Thu Jan  8 11:20:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* eval.c, object.c, process.c, re.c: don't use C++ style comments.
+
+Thu Jan  8 04:36:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (WEBrick::CGI#initialize): should create
+	  @config[:Logger] if it was not given.
+
+	* sample/webrick/*: new files.
+
+	* MANIFEST: add sample/webrick/*
+
+Wed Jan  7 13:00:18 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_driver.rb: Fix problem where ri was
+	  being too eager to find matches of ambiguous method
+	  names (such as "ri Thread.join" would return both
+	  Thread.join and ThreadsWait.join)
+
+Wed Jan  7 12:35:41 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/debug.rb: revert command parse regexps.  [ruby-list:39014] by
+	  Shirai,Kaoru.
+
+Wed Jan  7 08:21:04 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parserfactory.rb: Check for shebang
+	  line in files that would otherwise be treated as
+	  plain text.
+
+Tue Jan  6 22:13:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_modfunc): should break if m has no super class.
+	  [ruby-dev:22498]
+
+Tue Jan  6 21:55:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (fptr_finalize): should save errno just after failure.
+	  [ruby-dev:22492]
+
+Tue Jan  6 14:53:14 2004  Dave Thomas  <dave@pragprog.com>
+
+	* bin/ri: split out the display side, making it pluggable. Added
+	  new ri_driver and ri_display files in lib/rdoc/ri.
+
+Tue Jan  6 06:37:53 2004  Dave Thomas  <dave@pragprog.com>
+
+	* bin/rdoc: Add --ri-system switch
+
+	* lib/.document: Update with list of files that seem to have
+	  documentation
+
+	* lib/test/unit.rb: Reorder comment to make it RDoc friendly.
+
+	* Makefile.in: add install-nodoc target, and make it
+	  generate RDoc on default install.
+
+	* lib/rdoc/ri/ri_options.rb (RI::Options::parse): Add
+	  --doc-dir option to ri.
+
+Tue Jan  6 00:04:40 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
+	  fix parsing if there are braces in a method parameter list
+
+Fri Jan  2 14:54:11 2004  Dave Thomas  <dave@pragprog.com>
+
+	* bin/ri: Add new --classes option, and arrange for
+	  help messages to be paged too.
+
+	* bin/rdoc: Add statistics.
+
+	* process.c: (MG) Added Process documentation
+
+	* lib/rdoc/ri/ri_formatter.rb (RI::AttributeFormatter::wrap):
+	  Fix problem with labels not displaying in RI labeled
+	  lists using BS and ANSI modes.
+
+Fri Jan  2 01:50:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_eof): ARGF.eof? should not have any side effect.
+	  [ruby-dev:22469]
+
+Wed Dec 31 17:25:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_each_byte): should return self.  [ruby-dev:22465]
+
+Wed Dec 31 11:20:34 2003  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Make
+	  file referenced in "// in sss.c" relative to current file.
+
+Wed Dec 31 11:17:37 2003  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb: Fix problem when
+	  a public method was aliased, but the alias is then
+	  made private, and hence doesn't appear in RDoc output.
+
+Wed Dec 31 01:33:05 2003  Dave Thomas  <dave@pragprog.com>
+
+	* array.c, error.c, eval.c, io.c, prec.c, range.c, re.c,
+	  string.c, time.c: Add RDoc for Kernel functions, and tidy.
+
+Tue Dec 30 19:39:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_readline): should raise EOFError at the end of
+	  files.  [ruby-dev:22458]
+
+	* io.c (argf_read): should concatenate input files when length
+	  argument is nil. [ruby-dev:22450]
+
+	* io.c (argf_read): should update supplied string buffer (2nd
+	  argument) even when IO#read is called multiple times.
+
+	* io.c: should initialize lineno by zero. [ruby-dev:22460]
+
+Tue Dec 30 12:30:30 2003  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): If a
+	  class and a method have the same name, finding Xxx.abc was trying
+	  to find 'abc' in method 'Xxx', not class 'Xxx'.
+
+
+Tue Dec 30 08:32:32 2003  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
+	  Handle undoing nesting of yield parameters correctly for:
+
+	  def each_entry(&b) Dir.foreach(@path) {|f| yield P.new(f) } end
+
+
+Tue Dec 30 08:32:32 2003  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
+	  Handle undoing nesting of yield parameters correctly for:
+
+	    def each_entry(&block) Dir.foreach(@path) {|f| yield Pathname.new(f) } end
+
+Mon Dec 29 12:51:02 2003  Dave Thomas  <dave@pragprog.com>
+
+	* eval.c: Add RDoc for Kernel global functions.
+
+Mon Dec 29 11:00:16 2003  Dave Thomas  <dave@pragprog.com>
+
+	* array.c: Tidy up RDoc loose ends.
+
+Mon Dec 29 05:05:51 2003  Dave Thomas  <dave@pragprog.com>
+
+	* struct.c, random: Add RDoc comments
+
+Mon Dec 29 02:20:54 2003  Dave Thomas  <dave@pragprog.com>
+
+	* eval.c: Add RDoc for class Proc, Method, UnboundMethod
+
+Mon Dec 29 00:41:44 2003  Dave Thomas  <dave@pragprog.com>
+
+	* math.c: Add RDoc comments
+
+Sun Dec 28 20:19:11 2003  Tanaka Akira  <akr@m17n.org>
+
+	* ext/stringio/stringio.c (strio_sysread): StringIO.new.sysread didn't
+	  raise EOFError.
+
+	* ext/zlib/zlib.c (gzreader_gets): don't increment lineno when
+	  gzfile_read_all returns "".
+
+Sun Dec 28 15:25:08 2003  Dave Thomas  <dave@pragprog.com>
+
+	* class.c,object.c,parse.y,sprintf.c,variable.c: Document classes
+	  Object, Module, etc...
+
+Sun Dec 28 11:55:29 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/csv/test_csv.rb: generate bom.csv and mac.csv files on the fly.
+	  [ruby-talk:88852]
+
+	* test/csv/{bom.csv,mac.csv}: removed.
+
+Sun Dec 28 08:56:51 2003  Dave Thomas  <dave@pragprog.com>
+
+	* eval.c: Thead[Group] RDoc (thanks to MG)
+
+Sun Dec 28 03:50:05 2003  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_override_comment):
+	  Escape method names used in regexp
+
+Sun Dec 28 01:46:02 2003  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item):
+	  Add support for rules in 'ri' output.
+
+Sun Dec 28 01:35:35 2003  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body):
+	  Sometimes the Ruby source aliases two otherwise
+	  unrelated methods (for example Kernel#object_id and
+	  Kernel#hash are both the same C function). Provide a
+	  facility to allow the methods to be documented
+	  separately.
+
+Sun Dec 28 01:05:31 2003  Dave Thomas  <dave@pragprog.com>
+
+	* marshal.c, signal.c: RDoc collemts added by Elliott Hughes
+
+Sun Dec 28 00:48:47 2003  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_class_comment):
+	  Some source files use lower case class or module names
+	  when naming the Init_XXX function in C.
+
+Sat Dec 27 23:41:46 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: fix "test: too many arguments" error.
+
+Sat Dec 27 15:32:19 2003  Dave Thomas  <dave@wireless_3.local.thomases.com>
+
+	* time.c: RDoc comments added
+
+Sat Dec 27 15:07:57 2003  Dave Thomas  <dave@pragprog.com>
+
+	* object.c: Add RDoc comments for Symbol class.
+
+Sat Dec 27 14:42:30 2003  Dave Thomas  <dave@pragprog.com>
+
+	* numeric.c: Add RDoc comments.
+
+Sat Dec 27 00:44:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (next_argv): warn always for stdin on inplace edit mode.
+
+	* io.c (read_all): need to check string value.
+
+	* io.c (argf_read): allow ARGF.read(nil).  [ruby-dev:22433]
+
+Fri Dec 26 23:02:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_backquote): need not to check nil result.
+	  [ruby-core:02078]
+
+	* io.c (rb_io_getline): should return nil when read_all gives
+	  empty string, even when nil rs is specified. [ruby-core:02077]
+
+Fri Dec 26 18:50:59 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check if getcontext and setcontext are available.
+
+	* eval.c: use presence of getcontext/setcontext.
+
+Fri Dec 26 16:40:53 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (PathnameTest#test_plus): add 2 assertions.
+
+Fri Dec 26 09:26:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): add sign check for 'i', and 'l'.
+	  [ruby-dev:22427]
+
+	* bignum.c (rb_quad_pack): add range check for 'quad int'.
+
+Thu Dec 25 22:39:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* string.c (rb_str_update): don't return any value.
+
+Thu Dec 25 15:30:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_update): call rb_str_modify().
+
+Thu Dec 25 05:08:09 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (search_required): search actual file name once when no
+	  extension specified.
+
+Thu Dec 25 04:00:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* stable version 1.8.1 released.
+
+Thu Dec 25 00:17:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in: check for nanosleep, -lrt if required.
+	  [ruby-core:02059]
+
+	* eval.c (thread_timer): use select(2) if nanosleep(2) is not
+	  available.
+
+	* eval.c: check __stub_getcontext for glibc on some platforms.
+	  [ruby-list:38984]
+
+Wed Dec 24 23:48:04 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb
+	  test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0"
+	  to express -0.0.  [ruby-talk:88786]
+
+Wed Dec 24 23:29:30 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/tsort.rb (test_orphaned_break): removed.
+
+Wed Dec 24 20:53:06 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/tkmulticolumnlist.rb: new sample
+
+	* ext/tk/sample/tkmultilistframe.rb: bug fix
+
+Wed Dec 24 20:37:37 2003  Eric Sunshine  <sunshine@sunshineco.com>
+
+	* configure.in (LDSHARED): Fixed typographical error in assignment of
+	  LDSHARED for Rhapsody which caused linking of extension modules to
+	  fail.
+
+Wed Dec 24 17:51:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_thread_flock): enable thread support again.
+
+Wed Dec 24 16:46:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (catch_timer): do not call rb_thread_schedule() inside to
+	  avoid pthread_mutex_lock() deadlock.  interrupts to system calls
+	  are detected by TRAP_END via EINTR error.
+
+	* eval.c (thread_timer): do not post signal unless it is
+	  absolutely necessary.
+
+	* rubysig.h (TRAP_END): add CHECK_INTS to switch thread.
+
+	* regex.c (re_compile_pattern): check if nextp is smaller than
+	  pend.  [ruby-dev:22372]
+
+	* eval.c (umethod_bind): remove method overridden check.
+	  [ruby-dev:22366]
+
+Wed Dec 24 16:13:05 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read): should check for error
+	  status by SSL_get_error().
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_write): ditto.
+
+Wed Dec 24 14:23:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_read): clear the buffer argument
+	  when returning nil.  [ruby-dev:22363]
+
+	* test/ruby/ut_eof.rb (TestEOF::test_eof_0, TestEOF::test_eof_1):
+	  add buffer argument tests.
+
+Wed Dec 24 14:07:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb: Modules are allowed to rescue.
+
+	* lib/test/unit/autorunner.rb: show output_level in order.
+
+	* lib/test/unit/collector/dir.rb: get rid of successive same
+	  directories in load path.
+
+	* test/testunit/test_assertions.rb (test_assert_nothing_raised,
+	  test_assert_raise): test for modules.
+
+Wed Dec 24 13:43:34 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (authenticate): remove "\n" from base64 encoded
+	  strings.
+
+Wed Dec 24 11:26:41 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/fileutils/test_fileutils.rb: should not create any
+	  files or directories in current directory.  [ruby-talk:88724]
+
+Wed Dec 24 10:29:53 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_read): never return nil at
+	  unlimited read.  [ruby-dev:22334]
+
+	* ext/stringio/stringio.c (strio_read): support second
+	  argument.  [ruby-dev:22350]
+
+Wed Dec 24 09:38:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (arg): should return 0 after error.  [ruby-dev:22360]
+
+Wed Dec 24 00:56:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (read_all): do not return nil at the end of file.
+	  [ruby-dev:22334]
+
+	* io.c (argf_read): do not depend on nil at eof behavior of
+	  IO#read().
+
+	* eval.c (rb_thread_join): dup exception before re-raising it.
+
+	* io.c (rb_io_eof): call clearerr() to prevent side effect.  this
+	  patch is supplied by Masahiro Sakai <sakai@tom.sfc.keio.ac.jp>.
+	  [ruby-dev:22234]
+
+	* pack.c (OFF16): get offset for big endian machines.
+
+	* pack.c (pack_pack): use OFF16 instead of OFF16B.
+	  [ruby-dev:22344]
+
+	* pack.c (pack_unpack): ditto.
+
+Tue Dec 23 22:47:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_check_readable): set FMODE_RBUF always, even if
+	  NEED_IO_SEEK_BETWEEN_RW is not defined. [ruby-dev:22340]
+
+	* io.c (rb_io_check_writable): clear FMODE_RBUF before writing
+	  something.
+
+Tue Dec 23 22:25:00 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/optparse.rb: incomplete RDoc documentation added in place of
+	  existing RD comments.  Tabs converted to spaces.
+
+Tue Dec 23 19:44:47 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/soap/test_streamhandler.rb (test_basic_auth): removed.
+	  soap4r + basic_auth is not officially supported in ruby/1.8.1 even
+	  though soap4r + basic_auth + http-access2 should run fine.
+
+Tue Dec 23 19:42:59 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_ungetc): raise an exception at unread stream to
+	  avoid unspecified behavior.  [ruby-dev:22330]
+
+	* test/ruby/test_system.rb (test_syntax): glob relatively from
+	  __FILE__.
+
+Tue Dec 23 18:09:40 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): remove unnecessary negative value check.
+	  [ruby-dev:22329]
+
+Tue Dec 23 17:26:55 2003  KONISHI Hiromasa  <konishih@fd6.so-net.ne.jp>
+
+	* bcc32/Makefile.sub (config.h): bcc has finite(). [ruby-list:38940]
+
+Tue Dec 23 16:08:16 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/rexml/encodings/US-ASCII.rb: typo.  [ruby-talk:88650]
+
+	* test/ruby/test_system.rb: num of asserts depended on running dir.
+
+	* test/xsd/test_noencoding.rb: rexml + without iconv/uconv cannot
+	  handle euc-jp.  install iconv, uconv or xmlscan.
+
+Tue Dec 23 14:13:51 2003  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic::check_userinfo,
+	  URI::Generic::check_user, URI::Generic::check_password): tests
+	  conflicts/depends with other components closely.
+
+	* test/uri/test_generic.rb (TestGeneric::test_set_component):
+	  added tets.
+
+Tue Dec 23 11:08:34 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/xsd/test_noencoding.rb: rescue Errno::EINVAL and do not test.
+	  "euc-jp" might not be in supported encoding name list.
+	  [ruby-talk:88650]
+
+Tue Dec 23 06:10:31 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (CGI): add support for mod_ruby.
+
+	* lib/webrick/cgi.rb (CGI::Socket): add check for existence of
+	  OpenSSL module in all HTTPS related methods.
+
+	* lib/webrick/cgi.rb (CGI::Socket#cipher): should create similar
+	  value to OpenSSL::SSLSocket#cipher.
+
+	* lib/webrick/httpresponse.rb (HTTPResponse#setup_header): should
+	  set "connection: close" if @keep_alive is false.
+
+	* lib/webrick/https.rb (HTTPrequest#meta_vars): add supprt for
+	  SSL_PROTOCOL, SSL_CIPHER_USEKEYSIZE and SSL_CIPHER_ALGKEYSIZE.
+
+Mon Dec 22 23:00:05 2003  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic::check_opaque): fixed typo.
+
+Mon Dec 22 21:59:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (map_charset): always ensure code is a String.
+
+Mon Dec 22 21:15:29 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_mod_init_copy): always copy singleton class.
+	  [ruby-dev:22325]
+
+Mon Dec 22 20:44:36 2003  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#route_from): accepts urls which
+	  has no host-part.
+
+	* test/uri/test_generic.rb (TestGeneric::test_route): added a test.
+
+Mon Dec 22 20:38:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/cgi.rb: reduce eval.
+
+	* lib/cgi.rb (CGI::QueryExtension::read_multipart): alias path to
+	  local_path.  [ruby-list:38883]
+
+Mon Dec 22 20:09:31 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/soap/test_property.rb: remove duplicated test method.
+
+Mon Dec 22 18:22:04 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bcc32/Makefile.sub, win32/Makefile.sub (config.h): remove
+	  HAVE_ISINF definition to follow previous commits of missing.h
+	  and win32/win32.h.
+
+Mon Dec 22 17:23:42 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func_setitimer): moved from defines.h
+
+	* defines.h, rubysig.h, signal.c: removed macro handling which
+	  should be done in configure.
+
+	* configure.in (intrinsics.h): check if present.
+
+	* ruby.h: include intrinsics.h if available.
+
+	* bignum.c, marshal.c: include ieeefp.h if available.
+
+	* missing.h (isinf): define as a macro if finite() and isnan()
+	  are available.  [ruby-core:02032]
+
+Mon Dec 22 17:07:31 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (mingw): set isnan, finite and isinf to yes.
+
+Mon Dec 22 13:40:19 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/property.rb: passing block by reference.
+
+Mon Dec 22 00:32:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_with_disable_interrupt): use ENABLE_INTS instead of
+	  ALLOW_INTS which may switch context.  [ruby-dev:22319]
+
+	* ext/syck/emitter.c (syck_emitter_write): str bigger than
+	  e->bufsize causes buffer overflow.  [ruby-dev:22307]
+
+Sun Dec 21 17:29:00 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_check_inheritable): new function.  [ruby-dev:22316]
+
+	* intern.h: add prototype.
+
+	* eval.c (superclass): use rb_check_inheritable().
+
+	* object.c (rb_class_initialize): check argument validity.
+
+Sun Dec 21 16:25:10 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (Pathname#+): re-implemented to resolve ".." in
+	  beginning of the argument.
+	  (Pathname#join): concatenate from the last argument.
+	  (Pathname#parent): just use Pathname#+.
+
+Sun Dec 21 00:12:37 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: add new methods (TkScrollbar#assign, assign_list)
+
+	* ext/tk/sample/tkmultilistframe.rb: use TkScrollbar#assign method
+
+Sat Dec 20 21:59:03 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httprequest.rb (HTTPRequest#meta_vars): refine regexp.
+
+	* lib/webrick/cgi.rb (CGI#start): NPH scripts return status line
+	  instead of Status: header field.
+
+	* lib/webrick/cgi.rb (CGI::Socket): refine some coditions.
+
+Sat Dec 20 16:07:14 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::Completion::complete): wrong
+	  Regexp for word boundary.  pointed out by Gavin Sinclair.
+
+	* lib/optparse.rb (OptionParser::make_switch): [no-] prefix was
+	  missing.
+
+Sat Dec 20 11:40:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/yaml.rb (YAML::YAML): adjust Marshal version.
+
+Sat Dec 20 03:56:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_with_disable_interrupt): prohibit thread context
+	  switch during proc execution.  [ruby-dev:21899]
+
+Sat Dec 20 02:41:02 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb: add file. (yet another CGI library)
+
+	* MANIFEST: add lib/webrick/cgi.rb.
+
+Sat Dec 20 02:18:31 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-calculate-indent): proper indentation
+	  inside of parentheses.  [ruby-dev:22308]
+
+Fri Dec 19 21:24:22 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httprequest.rb (HTTPRequest#meta_vars): should not set
+	  HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH.
+
+	* lib/webrick/https.rb (HTTPRequest#parse): should check presence
+	  of cert() method to detect SSLSocket.
+
+Fri Dec 19 22:56:46 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/property.rb (SOAP::Property#load): new method for loading
+	  property value into existing property tree.
+
+	* test/soap/test_property.rb: add test.
+
+Fri Dec 19 19:21:49 2003  akira yamada  <akira@ruby-lang.org>
+
+	* lib/runit/cui/testrunner.rb (RUNIT::CUI::TestRunner::run):
+	  should use Test::Unit::UI::{PROGRESS_ONLY,VERBOSE}.
+
+Fri Dec 19 17:36:49 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/tkmultilistbox.rb: bug fix
+
+	* ext/tk/sample/tkmultilistframe.rb: new sample script
+
+Fri Dec 19 03:44:27 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httputils.rb (parse_form_data): should return an
+	  empty Hash if the body is empty.
+
+Thu Dec 18 21:47:35 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): should remove deffile if it's
+	  made by miniruby. based on nobu's patch.
+
+Thu Dec 18 21:44:21 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (stack_extend): ignore inline optimization on VC7.
+
+	* win32/Makefile.sub (OS, RT): can override.
+
+	* win32/Makefile.sub (LDFLAGS): ditto. shouldn't use pdb:none
+	  option. based on Tietew's patch [ruby-dev:22289]
+
+Thu Dec 18 16:38:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (fnmatch): unlike find_dirsep(), rb_path_next() never
+	  return NULL.
+
+Thu Dec 18 15:27:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/ipaddr.rb (IPSocket::getaddress): merge usa's patch.
+	  [ruby-dev:21678]
+
+Wed Dec 17 15:15:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension::Value::[]): should work like
+	  String#[] if more than one arguments are specified.
+
+	* lib/delegate.rb: avoid using common instance name as "@obj".
+
+	* lib/cgi.rb (CGI::QueryExtension::Value): Value is no longer
+	  subclass of String, but DelegateClass(String).
+
+	* ext/curses/extconf.rb: restore function check for init_color.
+	  [ruby-list:38905]
+
+	* Makefile.in: need to specify $(MAINLIBS) for the miniruby
+	  generation rule.
+
+	* configure.in: better FreeBSD -lc_r support.
+
+Wed Dec 17 00:16:14 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c: new method
+	  StringScanner#beginning_of_line? (alias #bol?)
+
+	* ext/strscan/strscan.c: new method StringScanner#concat and #<<.
+
+	* ext/strscan/strscan.c: StringScanner#new(str) does not duplicate
+	  nor freeze STR (allow destructive modification).
+
+	* test/strscan/test_stringscanner.rb: test new methods above.
+
+	* test/strscan/test_stringscanner.rb: test destructive string
+	  modification.
+
+Tue Dec 16 21:20:47 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb: don't use local variable `pp'.
+
+	* lib/prettyprint.rb: ditto.
+
+Tue Dec 16 13:20:43 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: condition bug of if statement on
+	  {pack,grid}_propagate methods
+
+Tue Dec 16 03:17:29 2003  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml/rubytypes.rb: comments in strings. [ruby-talk:88012]
+
+	* test/yaml/test_yaml.rb: add test.
+
+Tue Dec 16 01:14:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (catch_timer): check rb_thread_crtical in main native
+	  thread.
+
+	* eval.c (thread_timer): just sends signals periodically, to
+	  prevent main native thread from receiving them in critical
+	  section.  [ruby-core:01959]
+
+Mon Dec 15 13:32:22 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (check_dirname): check string safety and remove extraneous
+	  trailing directory separators.  [ruby-dev:22279]
+
+	* file.c: renamed and externalized rb_path_next,
+	  rb_path_skip_prefix, rb_path_last_separator, rb_path_end.
+
+	* intern.h: prototypes for rb_path_next, rb_path_skip_prefix,
+	  rb_path_last_separator, rb_path_end.
+
+Mon Dec 15 09:27:46 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/ossl_pkcs12.c (ossl_pkcs12_initialize): first argument
+	  of rb_protect should take an argument of VALUE.
+
+Sun Dec 14 18:46:48 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/socket/socket.c (Init_socket): IPv6 is not supported although
+	  AF_INET6 is defined on MinGW.
+
+	* lib/ipaddr.rb (AF_INET6): workaround in the environment which does
+	  not support IPv6.
+
+Sat Dec 13 18:55:16 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/charset_alias.rb: preserve original order.
+
+	* ext/iconv/extconf.rb: remove wrapper file at clean.
+
+Sat Dec 13 18:09:42 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (thread_timer): use timer by sub-thread and nanosleep.
+	  [ruby-talk:87519]
+
+	* gc.c (Init_stack): no stack adjustment for THREAD_SAFE.
+
+Sat Dec 13 17:17:59 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (proc_alloc): cache the created object at first time.
+	  [ruby-talk:61288], [ruby-dev:22240]
+
+Sat Dec 13 09:01:23 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check ucontext.h.
+
+	* eval.c: use getcontext/setcontext() instead of setjmp/longjmp()
+	  on ia64 or with native thread enabled.  [ruby-core:01932]
+
+Sat Dec 13 03:09:14 2003  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml/rubytypes.rb: anonymous struct fix. [ruby-core:01946]
+
+	* test/yaml/test_yaml.rb: add test.
+
+Fri Dec 12 22:36:44 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/csv.rb: add Cell#to_str and Cell#to_s for /.../ =~ aCell,
+	  "#{aCell}" and so on.
+
+	* test/csv/test_csv.rb: add tests.
+
+Fri Dec 12 19:33:06 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mkdir): remove trailing `/' from pathes.
+
+	* lib/fileutils.rb (rmdir): ditto. [ruby-dev:22238]
+
+	* lib/fileutils.rb (rmdir_r): ditto.
+
+	* lib/fileutils.rb (fu_copy_dir): check if it is a directory after
+	  mkdir(2).
+
+Fri Dec 12 06:06:09 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (proc_invoke): fix class name in warning message for
+	  define_method.  [ruby-dev:22235]
+
+Thu Dec 11 21:24:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_pkcs12.[ch]: new files. add OpenSSL::PKCS12.
+
+	* ext/openssl/ossl.[ch]: ditto.
+
+	* ext/openssl/MANIFEST: add ossl_pkcs12.[ch].
+
+Thu Dec 11 20:54:28 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mkdir_p): remove trailing `/' befere mkdir(2).
+	  mkdir("nonexistdir/") does not work on NetBSD/Alpha 1.6.1.
+
+	* lib/fileutils.rb (fu_list): call to_str for all arguments.
+
+Thu Dec 11 20:07:01 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/ftools.rb (makedirs): sync with fileutils.
+
+Thu Dec 11 19:53:03 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mkdir_p): catch all SystemCallErrors.
+	  (mkdir("C:\") causes EACCESS on Windows 2000/NTFS)
+
+Thu Dec 11 19:08:02 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mkdir_p): check if it is a directory after
+	  mkdir(2) instead of before mkdir(2), to avoid race condition.
+	  [ruby-talk:87730]
+	  Refer: mkinstalldirs sh script, GNU mkdir(1) (coreutils 5.0)
+
+Thu Dec 11 18:49:30 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: def m( arg ) -> def m(arg).
+
+Thu Dec 11 11:39:43 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ieeefp.h), numeric.c: needed for finite() on
+	  Solaris.  [ruby-core:01921]
+
+	* file.c (rb_stat_inspect): adjust format specifier.
+
+	* parse.c (arg_prepend): nodetype() is for debug use.
+
+	* ruby.h (ISASCII, etc): cast to int to get rid of warning.
+
+	* ruby.h (alloca.h): include even in GCC.  [ruby-core:01925]
+
+	* ext/bigdecimal/bigdecimal.c (GetVpValue): adjust format
+	  specifier.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_prec, BigDecimal_coerce,
+	  BigDecimal_divmod): use rb_assoc_new() to suppress memory usage.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_split): ditto.
+
+	* ext/dl/sym.c (rb_dlsym_guardcall): guard itself should be
+	  volatile.
+
+	* ext/iconv/iconv.c (iconv_convert): ensure actual parameter with
+	  format specifier.
+
+	* ext/pty/pty.c (MasterDevice, SlaveDevice, deviceNo): do not
+	  define unless used.
+
+	* ext/pty/pty.c (getDevice): get rid of warning.
+
+	* ext/socket/socket.c (port_str, sock_s_getaddrinfo,
+	  sock_s_getnameinfo): FIX2INT() now returns long.
+
+	* ext/socket/socket.c (init_inetsock_internal): uninitialized
+	  variable.
+
+	* ext/syck/rubyext.c (syck_parser_assign_io): add prototype.
+
+	* ext/syck/rubyext.c (rb_syck_mktime, yaml_org_handler): use
+	  ISDIGIT() instead of isdigit() to avoid warnings and for
+	  platforms which don't support non-ascii charater.
+
+Wed Dec 10 19:28:56 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_read): set EOF flag at short read.
+	  [ruby-dev:22223], [ruby-dev:22224]
+
+Wed Dec 10 18:07:25 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/erb.rb: new method ERB#filename(=). [ruby-dev:22208]
+
+Wed Dec 10 17:54:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_read): do not set EOF flag when
+	  requested length is zero.  [ruby-dev:22214]
+
+Wed Dec 10 17:17:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (read_all): should return given string even if data read is
+	  empty.  [ruby-dev:22207]
+
+Wed Dec 10 17:16:06 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_read): adjust behavior at reading
+	  beyond EOF to IO.  [ruby-dev:22205]
+
+	* test/ruby/ut_eof.rb (TestEOF::Seek): test behaviors at reading
+	  beyond EOF.
+
+	* test/ruby/test_file.rb, test/stringio/test_stringio.rb: include
+	  TestEOF::Seek test case.
+
+Wed Dec 10 15:01:19 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/monitor/test_monitor.rb (test_cond): use Queue#deq
+	  instead of sleep.
+
+Wed Dec 10 14:45:39 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/pty/pty.c (HAVE_SYS_IOCTL_H): need to include <sys/ioctl.h>
+	  for TIOCSCTTY on *BSD.  based on gotoyuzo's patch.
+	  (ruby-bugs:PR#1211)
+
+	* ext/pty/pty.c (establishShell): should close descriptors if fork
+	  failed.
+
+Wed Dec 10 12:53:05 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.h: define execv() using do_aspawn().
+
+	* process.c (proc_exec_v): remove #ifdef's which stopped needing.
+
+Tue Dec  9 23:32:23 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb, ext/tk/lib/tkcanvas.rb, ext/tk/lib/tkdialog.rb,
+	  ext/tk/lib/tkentry.rb, ext/tk/lib/tkscrollbox.rb, ext/tk/lib/tktext.rb,
+	  ext/tk/sample/tkalignbox.rb, ext/tk/sample/tkcombobox.rb,
+	  ext/tk/sample/tkmultilistbox.rb, ext/tk/sample/tkoptdb.rb, ext/tk/sample/tktextframe.rb,
+	  ext/tk/sample/demos-en/dialog1.rb, ext/tk/sample/demos-en/dialog2.rb,
+	  ext/tk/sample/demos-jp/dialog1.rb, ext/tk/sample/demos-jp/dialog2.rb:
+	  overrided instance methods, which are private methods on the super
+	  class, are changed to 'private'
+
+Tue Dec  9 19:53:02 2003  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#route_from0): make case insensitive
+	  for host-part.
+
+	* test/uri/test_generic.rb (test_route): added tests for the above
+	  change.
+
+Tue Dec  9 14:10:48 2003  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (rb_io_check_readable): don't call io_seek if EOF flag is set,
+	  to avoid clearing EOF flag.
+	  (rb_io_check_writable): ditto.
+
+Tue Dec  9 02:53:55 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/tkalignbox.rb: new sample script
+
+Tue Dec  9 00:45:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb: renamed #assert_raises to #assert_raise
+	  and made the former call the latter. [ruby-core:01890]
+
+	* test/testunit/test_assertions.rb: ditto.
+
+Tue Dec  9 00:07:35 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/rpc/standaloneServer.rb: add 'shutdown' and 'status'
+	  methods as delegates to WEBrick.
+
+	* test/soap/calc/{test_calc.rb,test_calc2.rb},
+	  test/soap/helloworld/test_helloworld.rb,
+	  test/wsdl/datetime/test_datetime.rb, test/wsdl/raa/test_raa.rb:
+	  follow the change.
+
+Mon Dec  8 22:48:03 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/autorunner.rb: remove dependency to a particular
+	  runner.  [ruby-core:01901], [ruby-list:38869]
+
+	* lib/test/unit/ui/testrunnerutilities.rb: moved output level
+	  constants from Console.
+
+	* lib/test/unit/ui/console/testrunner.rb: ditto.
+
+	* lib/test/unit/ui/{fox,gtk,gtk2,tk}/testrunner.rb (initialize):
+	  accept output_level.
+
+Mon Dec  8 15:03:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/syck.c (syck_io_str_read): get rid of buffer overflow.
+
+Mon Dec  8 13:02:11 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/uri/common.rb: new method URI.regexp. [ruby-dev:22121]
+
+	* test/uri/test_common.rb: add test for URI.regexp.
+
+Mon Dec  8 12:44:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c: define swap16 and swap32 only if they are not
+	  defined. OpenBSD defines these macros. [ruby-dev:22181]
+
+Sun Dec  7 20:54:17 2003  Tanaka Akira  <akr@m17n.org>
+
+	* ext/iconv/iconv.c (map_charset): make case sensitive.
+	  ext/iconv/charset_alias.rb (charset_alias): don't ignore
+	  config.charset's information.  sort aliases.
+
+Sat Dec  6 22:58:03 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_start_ssl): new function to wrap
+	  SSL_connect and SSL_accept; if SSL_connect (or SSL_accept) returned
+	  but not finished the handshake process, we should retry it.
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_connect): call ossl_start_ssl.
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_accept): ditto.
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read): allow signal traps.
+
+Sat Dec  6 21:45:10 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (flush_before_seek): flush before seek on any platform.
+
+	* configure.in: ditto.
+
+Sat Dec  6 17:23:00 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/soap.rb(SOAP::Env.getenv): allow upcase environment variable
+	  as well as downcase one.
+
+	* lib/soap/netHttpClient.rb(SOAP::NetHttpClient#proxy=): check URI.
+
+Fri Dec  5 23:22:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises,
+	  Test::Unit::Assertions::assert_nothing_raised): use the last
+	  argument as message unless class object.
+
+	* test/testunit/test_assertions.rb (test_assert_raises): test for
+	  multiple exception list.  [ruby-core:01891]
+
+	* test/testunit/test_assertions.rb (test_assert_nothing_raised): test
+	  for non-exception classes.
+
+Fri Dec  5 22:23:04 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/netHttpClient.rb: proxy support did not work.  fixed.
+
+	* lib/soap/property.rb: add class methods for loading property from
+	  stream/file/propertyfile.  propertyfile is a file which is located at
+	  somedir in $:.
+
+	* lib/soap/soap.rb, lib/soap/wsdlDriver.rb, lib/soap/rpc/driver.rb,
+	  lib/wsdl/importer.rb: load property from propertyfile 'soap/property'
+	  e.g. /usr/local/lib/ruby/site_ruby/1.8/soap/property.
+
+	* test/soap/test_property.rb, test/soap/test_streamhandler.rb: new file.
+
+Fri Dec  5 17:26:23 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_exec_end_proc): maintain tmp_end_procs.
+	  [ruby-dev:22154]
+
+Fri Dec  5 13:36:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_exec_end_proc): should not clear end_procs and
+	  ephemeral_end_procs before execution. [ruby-dev:22144]
+
+	* eval.c (rb_obj_extend): call Module#extended hook after
+	  extended_object.  [ruby-list:38866]
+
+	* object.c (Init_Object): Module#extended defined.
+
+Fri Dec  5 13:17:30 2003  Tanaka Akira  <akr@m17n.org>
+
+	* test/ruby/test_pipe.rb: use IO.pipe instead of IO.popen.
+
+Fri Dec  5 11:54:45 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_read): follow IO#read.
+
+	* test/ruby/ut_eof.rb, test/ruby/test_file.rb, test/ruby/test_pipe.rb,
+	  test/stringio/test_stringio.rb: add EOF test.
+
+Fri Dec  5 02:49:35 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises):
+	  allow multiple exception list.  [ruby-core:01884]
+
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_nothing_raised):
+	  check whether arguments are subclass of Exception.
+
+Thu Dec  4 23:54:00 2003  Rick Ohnemus  <rick.ohnemus@systemware.com>
+
+	* dln.c (aix_loaderror): should not use member named 'errno' which
+	  might be a macro (e.g. on AIX).
+
+Thu Dec  4 23:32:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (read_all): do not depend on lseek position.
+	  [ruby-dev:22026]
+
+Thu Dec  4 22:37:26 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): preserve $! value when retry happens in the
+	  rescue clause.  [ruby-talk:86697]
+
+Thu Dec  4 21:50:07 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/drb/drb.rb (DRb::DRbMessage::send_request, send_reply):
+	  should rescue errors and re-raise DRbConnError on write too.
+	  [ruby-dev:22132]
+
+Thu Dec  4 16:41:17 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (exc_list): allow expanding list.  [ruby-dev:22134]
+
+Thu Dec  4 14:09:24 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb (test_cp): test if the error is
+	  kind of SystemCallError.  It is needless details that which errno
+	  is set on each systems.
+
+Thu Dec  4 13:24:13 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/monitor.rb: use Object#__send__ instead of Object#send.
+
+Thu Dec  4 13:17:45 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/streamHandler.rb: support latest released version of
+	  http-access2.
+
+Thu Dec  4 13:04:44 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/soap.rb: add SOAP::Env module for environment repository
+	  such as HTTP_PROXY.
+
+	* lib/soap/property.rb: property implementation.
+
+	* lib/soap/streamHandler.rb, lib/soap/wsdlDriver.rb,
+	  lib/soap/rpc/driver.rb: use soap/property.rb.
+
+	* lib/wsdl/importer.rb, lib/soap/wsdlDriver.rb, lib/soap/rpc/driver.rb:
+	  use SOAP::Env.
+
+	* lib/soap/netHttpClient.rb: add basic_auth, ssl_config, and cookie
+	  management interface, but ignored for now.
+
+	* lib/xsd/charset.rb: add XSD::Charset.encoding= interface to set
+	  wiredump charset explicitly.  it was fixed to 'utf-8' when iconv or
+	  uconv module was found.
+
+Thu Dec  4 10:43:58 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/dl/sym.c (rb_dlsym_guardcall): __declspec(noinline) is VC7
+	  feature.
+
+Thu Dec  4 10:27:12 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: update hyperlink to the Japanese document.
+
+Thu Dec  4 09:12:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.c (asn1time_to_time): should check that
+	  the underlying value of ASN1_TIME isn't NULL. [ruby-core:01881]
+
+Thu Dec  4 08:29:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/server.rb (GenericServer#start): should rescue
+	  Exception to avoid unexpected aborting. [ruby-core:01853]
+
+	* lib/webrick/server.rb (GenericServer#start_thread): should check
+	  that peeraddr isn't nil before printing.
+
+	* lib/webrick/httpresponse.rb (HTTPResponse#start_thread): should
+	  rescue Exception to avoid unexpected aborting of thread.
+
+Thu Dec  4 03:48:59 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (Pathname#link, Pathname#symlink): obsoleted.
+	  (Pathname#make_link, Pathname#make_symlink): new method.
+
+Thu Dec  4 01:45:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_read): should not terminate on empty string; wait
+	  until real EOF.  [ruby-dev:21969]
+
+	* io.c (argf_read): should adjust length to read, when length is
+	  specified and read spans command line argument files.
+
+Wed Dec  3 19:38:36 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: correct fcntl parameter. [ruby-dev:22120]
+
+Wed Dec  3 13:49:07 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: 'format'==>'Kernel.format' (avoid override trouble)
+
+	* ext/tk/lib/tkafter.rb: ditto.
+
+	* ext/tk/lib/tkcanvas.rb: ditto.
+
+	* ext/tk/lib/tkdialog.rb: ditto.
+
+	* ext/tk/lib/tktext.rb: ditto.
+
+Wed Dec  3 13:28:13 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (lex.c): try gperf first, and copy from the source
+	  directory if failed.  [ruby-dev:22123]
+
+	* ext/extmk.rb (MTIMES): let makefiles depend to mkmf.rb.
+
+	* lib/mkmf.rb (configuration): DLDFLAGS was duplicated.
+
+Tue Dec  2 23:18:12 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: wrote the warning about HTTP_PROXY environment
+	  variable.
+
+Tue Dec  2 21:31:42 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bin/testrb: new test runner.  [ruby-core:01845]
+
+	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner.run,
+	  Test::Unit::AutoRunner#process_args): take test list to run and
+	  options.
+
+	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::RUNNERS,
+	  Test::Unit::AutoRunner#run): should not exit inside a library,
+	  just return the result instead.
+
+	* lib/test/unit.rb: ditto.
+
+	* test/runner.rb: exit with the test result.
+
+Tue Dec  2 20:18:48 2003  Eric Sunshine  <sunshine@sunshineco.com>
+
+	* configure.in (AC_PROG_YACC): AC_DEFINE(OLD_YACC) if Yacc is found
+	  instead of Bison or byacc.
+
+	* parse.y: If OLD_YACC is defined, ensure that YYMAXDEPTH is at least
+	  10000 (Bison's default) since some old versions of Yacc define it as
+	  low as 150 by default, which is too low for Ruby to parse some files,
+	  such as date/format.rb.  Among other issues, the parse problem causes
+	  "make test" to fail.
+
+Tue Dec  2 20:03:20 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb: check if Pathnames are usable
+	  for arguments.
+
+Tue Dec  2 04:22:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb: fixed #assert_no_match message.
+
+	* test/testunit/test_assertions.rb: ditto.
+
+Tue Dec  2 00:43:00 2003  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/syck.c: string buffering bug.  decrementing by full
+	  max_size now. [ruby-core:01834]
+
+Mon Dec  1 21:33:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_sadded): prohibit singleton method definition for
+	  Numerics.  fill yet another gap between Fixnum and Bignum.
+
+Mon Dec  1 17:33:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (htov16): converts endian using swap16. htov32(), hton16,
+	  hton32 as well. [ruby-talk:85377]
+
+	* pack.c (swap16): swap 2 bytes no matter how big short is on the
+	  platform.  swap32() is also prepared.
+
+	* numeric.c (rb_num2int): returns long to preserve information.
+	  rb_fix2int(), rb_num2uint(), rb_fix2uint() as well.
+	  [ruby-talk:85377]
+
+	* numeric.c (rb_num2uint): should not check for value range if the
+	  source value is negative.
+
+Mon Dec  1 17:14:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sample/optparse/opttest.rb: added.
+
+Mon Dec  1 16:10:52 2003  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/rdoc.rb: (etc) initial merge into main tree.
+
+Mon Dec  1 14:17:49 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (fu_each_src_dest0): call #to_str to allow
+	  Pathname for arguments. [ruby-core:01795]
+
+	* test/fileutils/test_fileutils.rb: does much strict test on
+	  "same" files detecting.
+
+Mon Dec  1 09:28:14 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
+	  (XCFLAGS): re-export $(XCFLAGS).
+
+	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
+	  (ARCH_FLAG): export $(ARCH_FLAG) (perhaps empty value).
+
+Mon Dec  1 01:03:27 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb (TRY_LINK, link_command): added support for DLDFLAGS
+	  and ARCH_FLAG.  [ruby-dev:22085]
+
+Sun Nov 30 20:18:07 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: keep ARCH_FLAG separate. export ARCH_FLAG.
+	  [ruby-core:01819]
+
+	* Makefile.in: add ARCH_FLAG to CFLAGS.
+
+	* Makefile.in: add @CPPFLAGS@ to CPPFLAGS.
+
+	* lib/mkmf.rb (link_command, cc_command): use ARCH_FLAG.
+
+	* lib/mkmf.rb (configuration): add ARCH_FLAG to DLDFLAGS.
+
+	* Makefile.in: add ARCH_FLAG to DLDFLAGS.
+
+	* configure.in: should put getcwd in AC_CHECK_FUNCS, not
+	  AC_REPLACE_FUNCS.  [ruby-core:01826]
+
+Sun Nov 30 18:22:48 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: do not override CCDLDFLAGS, LDFLAGS, XLDFLAGS,
+	  DLDFLAGS and LDSHARED.
+
+	* configure.in: XCFLAGS for compiling ruby itself.  ARCH_FLAG is
+	  reflected in CFLAGS.
+
+	* lib/mkmf.rb: ditto.  do not import XCFLAGS from config.status.
+
+Sun Nov 30 17:37:36 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: bug fix [ruby-talk:86746]
+
+Sun Nov 30 13:02:00 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/encodingstyle/soapHandler.rb: refactoring - Simplifying
+	  Conditional Expressions.
+
+	* lib/wsdl/soap/definitions.rb: refactoring - Move Method.
+
+	* test/xsd/{test_noencoding.rb,noencoding.xml}: new files.  test for
+	  encoding unspecified XML file parsing.
+
+	* test/wsdl/{test_fault.rb,map,datetime}: new files.  test of
+	  SOAPFault, dateTime and Apache's Map.
+
+Sun Nov 30 09:35:14 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_update): get rid of SEGV at just allocated String.
+	  [ruby-core:01812]
+
+Fri Nov 28 23:19:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_mark): explicitly check mark recursion levels, instead
+	  of unreliable stack length.
+
+Fri Nov 28 22:49:56 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/rinda/rinda.rb: fix TupleSpaceProxy#read, read_all.
+
+Fri Nov 28 21:44:40 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* test/fileutils/test_fileutils.rb (test_ln_s): should be a file, not
+	  a directory for FreeBSD.
+
+Fri Nov 28 19:37:56 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (env_has_value, env_index): must match exactly.
+
+	* test/ruby/test_env.rb (test_has_value, test_index): condition for
+	  aboves.
+
+Fri Nov 28 17:59:20 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_env.rb: add tests for ENV.
+
+Fri Nov 28 17:47:46 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (DRbMessage#load): rescue Errno::* and raise
+	  DRbConnError.
+
+Fri Nov 28 15:41:15 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (Pathname#realpath): obsolete the force_absolute
+	  argument.
+
+Fri Nov 28 14:41:52 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/streamHandler.rb: drop unused http parameters.
+
+	* lib/soap/encodingstyle/soapHandler.rb, lib/soap/mapping/factory.rb,
+	  lib/soap/mapping/mapping.rb, lib/soap/mapping/registry.rb,
+	  lib/wsdl/soap/complexType.rb: ApacheSOAP's map support was broken
+	  under WSDL dynanic client environment.  fixed.
+
+	* test/wsdl/raa/*: add tests.
+
+	* lib/xsd/datatypes.rb: dateTime precision bug fix (at least, I hope.)
+	  bug of soap4r.  XSDDateTimeImple.to_time passed a Float to
+	  Time.local/Time.gm as an usec, and NUM2LONG(rb_num2long for Float)
+	  causes rounding error.
+
+	* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: add tests.
+
+Fri Nov 28 04:15:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (method_arity): used wrong Proc object.  [ruby-talk:86504]
+
+Fri Nov 28 00:47:29 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_f_exit), process.c (rb_f_exit_bang): treat true as
+	  success, false as failure.  [ruby-dev:22067]
+
+	* eval.c (rb_f_abort, rb_thread_switch), process.c (rb_f_system): use
+	  ANSI macro instead of hard coded value.
+
+	* eval.c (rb_f_exit), process.c (rb_f_exit_bang): use VALUEs not but
+	  TYPEs.
+
+Thu Nov 27 22:05:48 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* eval.c, gc.c: FreeBSD/ia64 currently does not have a way for a
+	  process to get the base address for the RSE backing store, so
+	  hardcode it for the moment.
+	  [submitted by: Marcel Moolenaar <marcel@FreeBSD.org>]
+
+Thu Nov 27 17:36:42 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkafter.rb: bug fix on TkTimer#cancel_on_exception=(mode).
+	  TkTimer#wait recieves the exception of the callback.
+	  The exception is kept on @return_value.
+
+Thu Nov 27 16:58:48 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_stat): remove _fullpath() for NUL: device.
+
+Wed Nov 26 15:38:47 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* test/fileutils/test_fileutils.rb (test_ln_s): should take the
+	  existing symbolic link for OpenBSD.
+
+Wed Nov 26 04:48:42 2003  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/token.c: removed YYTOKTMP references which
+	  were causing buffer overflows on large block scalars,
+	  comments, quoted scalars and plain scalars.
+
+	* ext/syck/rubyext.c: dynamic changing of buffer size.
+
+	* ext/syck/syck.h: default buffer size of 4k.
+
+Wed Nov 26 00:55:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpresponse.rb: add HTTPResponse#keep_alive=.
+
+	* lib/webrick/httpserver.rb (HTTPServer#run): should pass the
+	  request's keep_alive flag to the response.
+
+Tue Nov 25 21:41:35 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* defines.h (ENV_IGNORECASE): should define when DOSISH without
+	  human68k. [ruby-dev:22047]
+
+	* hash.c (env_has_value, env_index): don't ignore case of value.
+	  [ruby-dev:22048]
+
+Tue Nov 25 21:39:37 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (path_check_1): honor sticky bits always.
+	  [ruby-talk:86273]
+
+Tue Nov 25 20:02:14 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb: do test in more deep
+	  directory.
+
+	* test/fileutils/test_nowrite.rb: ditto.
+
+Tue Nov 25 19:04:23 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (URI::Generic#find_proxy): ENV case sensitivity test
+	  refined.
+
+Tue Nov 25 18:13:30 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb: chdir Dir.tmpdir before each
+	  test. [ruby-dev:22045]
+
+	* test/fileutils/test_nowrite.rb: ditto.
+
+Tue Nov 25 17:52:11 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (URI::Generic#find_proxy): use http_proxy under CGI
+	  if the environment variable is case sensitive.
+
+Tue Nov 25 16:41:33 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb:
+	  removed.  this test requires extra libraries in soap4r/1.5.*.
+
+Tue Nov 25 16:24:42 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license;
+	  GPL2 -> Ruby's.
+
+	* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb,
+	  lib/soap/streamHandler.rb: add interface to streamhandler.
+
+	* lib/soap/marshal.rb: raise error if parse fails.
+
+	* lib/soap/netHttpClient.rb: add https support.  Patched by
+	  Oliver M. Bolzer.
+
+	* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
+
+	* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb,
+	  lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce
+	  using charset for parsing response from buggy server.
+
+	* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half
+	  typed multi-ref array.
+
+	* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map
+	  SOAPStruct which has multi-accessors which name are the same, to an
+	  array.
+
+	* lib/soap/rpc/element.rb: fixed illegal parameter order.
+
+	* lib/soap/rpc/element.rb: element name of response message could have
+	  the name other than 'return'.
+
+	* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb,
+	  lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb,
+	  lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural
+	  fault definition in a operation. [ruby-talk:84948]
+
+	* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add
+	  test for above fix.
+
+	* lib/wsdl/soap/complexType.rb: support WSDL array definition with
+	  maxOccures="unbound".
+
+	* lib/xsd/charset.rb: use cp932 under emx.  Patched by
+	  Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
+
+	* lib/xsd/xmlparser/parser.rb: set @charset nil by default.  Nil means
+	  'follow encoding declaration in XML'.
+
+	* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb,
+	  sample/wsdl/googleSearch/sampleClient.rb,
+	  sample/wsdl/googleSearch/wsdlDriver.rb,
+	  test/wsdl/test_emptycomplextype.rb,
+	  test/wsdl/marshal/test_wsdlmarshal.rb,
+	  test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read }
+	  instead of File.open(...).read. [ruby-dev:21964]
+
+	* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb:
+	  simplify the test case.
+
+	* test/wsdl/axisArray/*: add tests for axis's array encoding.
+
+Tue Nov 25 16:15:29 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ruby.h: don't treat Cygwin as Windows.
+
+Tue Nov 25 15:18:28 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* configure.in: change default value of --enable-pthread (default: no)
+
+Tue Nov 25 07:31:16 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (primary): allow newlines just before right argument
+	  parenthesis.  (ruby-bugs:PR#1221)
+
+Mon Nov 24 23:32:06 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (OpenURI.open_loop, URI::HTTP#proxy_open): use
+	  catch/throw for redirection instead of exception.
+	  (OpenURI.open_loop, OpenURI.redirectable?): restrict redirection.
+
+Mon Nov 24 19:59:48 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (URI::Generic#find_proxy): use CGI_HTTP_PROXY
+	  instead of HTTP_PROXY in the CGI environment.
+
+Mon Nov 24 19:32:55 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/etc/extconf.rb: check for pw_passwd in struct passwd and
+	  gr_passwd in struct group for DJGPP.
+
+	* ext/etc/etc.c: ditto.
+
+	* ext/Setup.dj: support for curses, etc, zlib.
+
+Mon Nov 24 17:00:00 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb: validate option names.
+	  :content_length_proc and :progress_proc option implemented.
+
+Mon Nov 24 14:53:10 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
+	  (XCFLAGS): output empty value instead of `-DRUBY_EXPORT'.
+
+Sat Nov 22 23:09:45 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: set enable_pthread to no on MinGW.
+
+Sat Nov 22 22:56:20 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* configure.in: add --enable-pthread option (default: yes)
+
+Sat Nov 22 22:48:46 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: add Tk.grab_release and fix bug of TkComposite
+
+	* ext/tk/lib/tkafter.rb: bug fix of TkAfter#start
+
+	* ext/tk/sample/tkcombobox.rb: new sample script
+
+	* ext/tcltklib/tcltklib.c: add native thread check
+
+Sat Nov 22 18:49:47 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/curses/curses.c (window_nodelay): nodelay() of NetBSD's
+	  libcruses returns no value, just like keypad().
+
+Sat Nov 22 17:36:36 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
+	  (HAVE_GETCWD): output to config.h.
+
+	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
+	  (XCFLAGS): output to config.status.
+
+Sat Nov 22 13:10:10 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (have_st_ino?): djgpp has valid st_ino.
+
+Sat Nov 22 11:28:48 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (Init_stack): stack region is far smaller than usual if
+	  pthread is used.
+
+Sat Nov 22 07:30:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/util/backtracefilter.rb: fixed a bug that occurred
+	  when an exception had no backtrace.
+
+	* test/testunit/util/test_backtracefilter.rb: ditto.
+
+Fri Nov 21 16:44:18 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkentry.rb: fix the encoding trouble of percent
+	  substitutions on validatecommand option of TkEntry widget
+
+	* ext/tk/lib/tk.rb: fix bug on {pack|grid}_propagate() method
+
+Fri Nov 21 16:12:11 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ruby.1: Fix markups and grammar.
+
+Fri Nov 21 14:49:42 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* ruby.1: wrote about ruby related environment variables.
+
+Fri Nov 21 12:28:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_extended): singleton methods should not be checked
+	  when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
+
+Fri Nov 21 01:40:00 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* configure.in: check <pthread.h>
+
+	* ruby.h: include pthread.h if existence.
+	  define is_ruby_native() macro when not HAVE_NATIVETHREAD
+
+	* eval.c: undef is_ruby_native() function when not HAVE_NATIVETHREAD
+
+Fri Nov 21 00:43:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb: use #__send__ instead of #send.
+
+	* lib/test/unit/testcase.rb: ditto.
+
+Thu Nov 20 19:19:22 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: don't find the Cygwin's pthread library on MinGW.
+
+Thu Nov 20 19:15:50 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (have_st_ino?): emx (OS/2 with EMX) does not
+	  have st_ino (always 0). [ruby-dev:21972]
+
+	* lib/fileutils.rb (rename_cannot_overwrite_file?): emx does not
+	  allow overwriting files by rename(2).
+
+	* test/fileutils/test_fileutils.rb: windows? ->
+	  have_drive_letter?, have_file_perm?
+
+Thu Nov 20 17:50:58 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/tkballoonhelp.rb: new sample script
+
+	* ext/tk/sample/tkmultilistbox.rb: ditto
+
+	* ext/tk/sample/tktextframe.rb: ditto
+
+Thu Nov 20 13:37:34 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ruby.h: define is_ruby_native_thread() for no native thread
+	  environment
+
+	* eval.c: ditto
+
+Thu Nov 20 12:42:47 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* configure.in: always check existence of the pthread library
+
+	* ruby.h: define macros for ruby's native thread check
+
+	* eval.c: add ruby's native thread check
+
+	* gc.c: ditto
+
+Wed Nov 19 14:45:18 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (to_ary): print more friendly warning message.
+
+Wed Nov 19 14:32:08 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (fu_same?): add djgpp and wince.
+
+	* lib/fileutils.rb (cannot_overwrite_file?): add wince.
+
+Wed Nov 19 11:04:47 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/fileutils.rb (cannot_overwrite_file?, have_st_ino?): bccwin32
+	  is same as mswin32.
+
+Wed Nov 19 07:54:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit.rb: do not run tests if $! is set.
+
+	* lib/test/unit/assertionfailederror.rb: extend StandardError instead
+	  Exception (irb catches the former but not the latter).
+
+Tue Nov 18 23:31:36 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* missing/memmove.c (memmove): take void *, not char *.
+
+	* missing.h (memmove): ditto.
+
+	* missing.h (strchr, strrchr): return char *, not int.
+
+Tue Nov 18 22:20:10 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (fu_same?): temporal fix for windows.
+
+Tue Nov 18 19:05:04 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (fu_same?): check by inode instead of path
+	  name, to detect two hard links pointing to the same content.
+
+	* test/fileutils.rb: did not create correctly looped symlinks.
+
+Tue Nov 18 18:23:05 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_read): behave as IO at empty string.
+	  [ruby-dev:21939], [ruby-dev:21941]
+
+	* ext/stringio/stringio.c (strio_getc, strio_getline): set EOF flag.
+
+	* ext/stringio/stringio.c (strio_rewind, strio_seek, strio_ungetc):
+	  clear EOF flag.
+
+	* test/stringio/test_stringio.rb: imported from [ruby-dev:21941].
+
+Tue Nov 18 14:06:35 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (fu_each_src_dest): raise if src==dest.
+	  [ruby-talk:85344] [ruby-core:01699]
+
+	* lib/fileutils.rb: use Object#is_a? instead of Class#=== to allow
+	  e.g. remote objects for receivers.
+
+	* lib/fileutils.rb: FileTest -> File.
+
+	* lib/fileutils.rb: put parentheses for arguments of File.xxxx?
+
+	* test/fileutils/test_fileutils.rb (test_cp): test "cp a a".
+
+	* test/fileutils/test_fileutils.rb (test_mv): test "mv a a".
+
+	* test/fileutils/test_fileutils.rb (test_ln): test "ln a a".
+
+	* test/fileutils/test_fileutils.rb (test_ln_s): test "ln_s a a".
+
+	* test/fileutils/test_fileutils.rb (test_install): test "install a a".
+
+	* test/fileutils/fileasserts.rb: new method assert_symlink.
+
+	* test/fileutils/fileasserts.rb: assert_is_directory -> assert_directory.
+
+Mon Nov 17 19:38:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (getcwdofdrv): avoid using getcwd() directly, use
+	  my_getcwd() instead.
+
+	* merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
+	  <sunshine@sunshineco.com>.  [ruby-core:01596]
+
+Mon Nov 17 10:50:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::Completion::complete): allow least
+	  common completion for three or more candidates.
+
+Mon Nov 17 09:41:38 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/ui/tk/testrunner.rb,
+	  lib/test/unit/ui/gtk/testrunner.rb:
+	  run GUI main loop in sub thread.
+
+	* lib/test/unit/ui/gtk2/testrunner.rb: imported from rough.
+
+	* lib/test/unit/autorunner.rb (keyword_display): sort keywords.
+
+Sun Nov 16 18:10:57 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): iterator should return value from next inside
+	  begin/rescue/end.  (ruby-bugs:PR#1218)
+
+Sun Nov 16 13:26:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): LINK check earlier than anything else,
+	  i.e. do not dump TYPE_IVAR for already dumped objects.
+	  (ruby-bugs:PR#1220)
+
+	* eval.c (rb_eval): call "inherited" only when a new class is
+	  generated; not on reopening.
+
+	* eval.c (eval): prepend error position in evaluating string to
+	  "mesg" attribute string only when it's available and is a
+	  string.
+
+Sun Nov 16 12:16:10 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb: logging response body. [experimental]
+	  [ruby-list:38800]
+
+Sun Nov 16 10:49:38 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/thread.rb (Thread.exclusive): wrap method definition in
+	  class Thread to enable rdoc to process.
+
+Sun Nov 16 09:45:23 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (set_debug_output): warn if method is called
+	  after #start.  [ruby-dev:38798]
+
+Sun Nov 16 04:41:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (eval): do not re-raise exception to avoid unnecessary
+	  exception copying, instead modify exception and internal
+	  information to adjust eval().
+
+	* eval.c (backtrace): can return the current frame information
+	  only if lev < -1.
+
+Sat Nov 15 22:16:42 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* /ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext):
+	  refine error message.
+
+Sat Nov 15 10:05:40 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (OpenURI.open_loop, OpenURI::HTTP#proxy_open):
+	  refactored to support options.
+	  (Buffer): maintain size by this class.
+
+Sat Nov 15 07:40:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_method_node): new API to retrieve method body.
+
+Fri Nov 14 13:21:30 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: fix (en-bugged at 2003/11/07)
+
+	* ext/tk/lib/tkdialog.rb: TkDialog.new accepts a parent widget
+	  argument [ruby-talk:85066]
+
+Thu Nov 13 20:53:35 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (Kernel[#.]open): hard coded URI schemes removed.
+	  [ruby-ext:02251]
+
+Thu Nov 13 19:17:00 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/test/unit/ui/tk/testrunner.rb: use grid and panedwindow
+	  (if available)
+
+Thu Nov 13 17:56:41 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (OpenURI.open_uri): use File::RDONLY.
+	  reported by Take_tk <ggb03124@nifty.ne.jp>.
+	  [ruby-ext:02245]
+
+Thu Nov 13 16:45:53 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509req.c (ossl_x509req_to_der): add function for
+	  X509::Request#to_der.
+
+Thu Nov 13 11:31:14 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::Completion#complete): prior shorter
+	  name to containing longer name.
+
+Thu Nov 13 06:08:54 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: stop freezing some classes
+
+	* ext/tk/lib/multi-tk.rb: ditto.
+
+Wed Nov 12 17:32:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (assert_throws, assert_nothing_thrown):
+	  uncaught throw in sub thread raises ThreadError.
+
+	* lib/test/unit/ui/tk/testrunner.rb (setup_ui): "expand" is not
+	  necessary.
+
+Wed Nov 12 14:09:43 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/monitor/test_monitor.rb: fix the timing problem by Queue.
+
+Wed Nov 12 12:59:44 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/monitor/test_monitor.rb: added.
+
+Wed Nov 12 10:14:28 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/monitor.rb: refactored. Thanks, Gennady Bystritsky.
+
+Wed Nov 12 06:11:39 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl.c (ossl_x509_sk2ary, ossl_x509crl_sk2ary):
+	  add functions to convert STACK into Array.
+
+	* ext/openssl/ossl.h: add prototypes.
+
+	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_set_certificates,
+	  ossl_pkcs7_get_certificates, ossl_pkcs7_get_crls,
+	  ossl_pkcs7_set_crls): add functions for PKCS7#certificates=
+	  PKCS7#certificates, PKCS7#crls= and PKCS7#crls.
+
+Wed Nov 12 00:47:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/ui/testrunnermediator.rb: should require 'test/unit'.
+
+Tue Nov 11 23:54:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/ui/gtk/testrunner.rb: added a rescue clause to handle
+	  the case when the requested font is not available.
+
+Tue Nov 11 22:44:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (appendline): file may not end with newline.  a bug if
+	  READ_DATA_PENDING_PTR is defined. [ruby-talk:84925]
+
+Tue Nov 11 10:42:41 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: raise an exception when creating TkWindow
+	  object, because TkWindow class is an abstract class.
+
+Tue Nov 11 03:30:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/ext/openssl/ossl_conf.c (ossl_config_get_value): return nil
+	  if the specified value doesn't exist.
+
+	* lib/ext/openssl/ossl_conf.c (ossl_config_get_section): return
+	  a empty hash if the specified section doesn't exist.
+
+Mon Nov 10 11:40:29 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/monitor.rb (wait): return true on signal/broadcastfalse and
+	  false on timeout. Thanks Gennady Bystritsky.
+
+Mon Nov 10 00:07:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (primary): primary_value may be 0 when syntax error.
+	  [ruby-talk:84893]
+
+Sun Nov  9 02:05:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb: un-deprecated #assert_not_nil to
+	  maintain symmetry with #assert_nil. Also added better output for
+	  #assert_kind_of.
+
+	* test/testunit/tc_assertions.rb: ditto.
+
+Sat Nov  8 18:50:20 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/wsdl/raa/*: add new testcase for WSDL loading, parsing and
+	  reading.
+
+	* test/soap/marshal/*: backport from soap4r/1.5.1.  all differences are
+	  for ruby/1.6.
+
+	* lib/soap/*: backport from soap4r/1.5.1.  all differences are for
+	  ruby/1.6.
+
+	* lib/wsdl/data.rb, lib/wsdl/xmlSchema/data.rb: move definition of
+	  ArrayTypeAttrName from ::WSDL::XMLSchema::* to ::WSDL::*.
+	  [ruby-talk:84813]
+
+	* lib/wsdl/soap/definitions.rb: element name typo in custom exception
+	  struct definition which is needed for wsdlDriver; camelCase ->
+	  underscore_name.
+
+Sat Nov  8 13:49:50 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* configure.in: improvement of pthread check
+
+Sat Nov  8 13:28:46 2003  Takaaki Tateishi  <ttate@ttsky.net>
+	* ext/dl/sym.c: Add DL.win32_last_error and DL.last_error.
+	  Thanks, Kaoru Shirai.
+
+Sat Nov  8 06:19:38 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: To fix 'pthread-enabled Tcl/Tk' problem,
+	  TclTkIp#_eval calls Tcl_Eval() on the mainloop thread only
+	  (queueing a handler to the EventQueue).
+
+	* ext/tcltklib/README.1st: edit the description of '--with-pthread-ext'
+
+Fri Nov  7 23:23:04 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (Pathname#+): if self or the argument is `.', return
+	  another.
+	  (Pathname#parent): if self is `.', return `..'.
+	  (Pathname#children): if self is `.', don't prepend self for a
+	  pathname in a result.
+	  (Pathname#join): re-implemented using Pathname#+.
+	  (Pathname#find): if self is `.', remove `./' prefix of yielding
+	  pathname.
+
+Fri Nov  7 10:23:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (make_hostent): get rid of SEGV on aliases
+	  lookup failure.  (ruby-bugs:PR#1215)
+
+Fri Nov  7 04:08:05 2003  UENO Katsuhiro  <katsu@blue.sky.or.jp>
+
+	* ext/zlib/zlib.c (Init_zlib): define Zlib::GzipReader#each_line as
+	  an alias of Zlib::GzipReader#each.
+
+Fri Nov  7 01:03:16 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_load): save and restore rb_prohibit_interrupt.
+	  [ruby-dev:21857]
+
+Thu Nov  6 18:05:07 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_inspect): show the path also at a closed file.
+	  [ruby-dev:21851]
+
+Thu Nov  6 11:42:07 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_set_string, strio_reopen): check
+	  tainted.
+
+	* ext/stringio/stringio.c (strio_copy, strio_ungetc, strio_write,
+	  strio_putc): add infection.
+
+	* ext/stringio/stringio.c (strio_path): just nil.  [ruby-dev:21846]
+
+	* ruby.c (proc_options): reserve searched script path in the
+	  source file name table.  [ruby-list:38765]
+
+	* lib/optparse.rb (OptionParser::Completion#complete): default not to
+	  ignore case on completion.  [ruby-talk:84726]
+
+	* win32/win32.c (make_cmdvector): process backslashes even if a quote
+	  is not enclosed.
+
+Wed Nov  5 23:49:45 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* sample/openssl/gen_csr.rb: there (at least) is a CA which does not
+	  accept DN in UTF8STRING format.  it's a sample.
+
+Wed Nov  5 22:55:16 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* configure.in, eval.c, signal.c: : add '--with-pthread-ext'
+	  option to fix the pthread trouble on 'tcltklib'
+
+	* ext/tcltklib/README.1st: add the description of '--with-pthread-ext'
+
+	* ext/tk/lib/tktext.rb : add TkText#text_copy, text_cut, text_paste
+	  to support Tcl/Tk8.4's tk_textCopy, tk_textCut, tk_textPaste
+
+	* ext/tk/lib/tk.rb : add TkMenu#set_focus support Tcl/Tk's
+	  tk_menuSetFocus
+
+Wed Nov  5 17:33:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_load): allow interrupt during loaded program
+	  evaluation.  [ruby-dev:21834]
+
+	* hash.c (rb_hash_fetch): always warn if default argument and a
+	  block are supplied at the same time. [ruby-dev:21842]
+
+	* hash.c (env_fetch): ditto.
+
+	* array.c (rb_ary_fetch): ditto.
+
+Wed Nov  5 19:08:47 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
+	  do not remove next argument if empty value is placed.
+
+	* test/optparse: added.
+
+Wed Nov  5 17:05:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/ui/gtk/testrunner.rb: typo.
+
+Wed Nov  5 11:13:32 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* string.c: add #include "version.h". this file still depends on it.
+
+	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
+	  wince/Makefile.sub: add version.h dependency to string.c.
+
+Wed Nov  5 09:14:23 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/monitor.rb: revert to the previous revision.
+
+Wed Nov  5 08:39:51 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/https.rb (HTTPRequest#parse): set @client_cert_chain.
+
+	* lib/webrick/https.rb (HTTPRequest#meta_vars): create
+	  SSL_CLIENT_CERT_CHAIN_n from @client_cert_chain.
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_get_peer_cert_chain): return nil
+	  if no cert-chain was given.
+
+Tue Nov  4 23:44:48 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
+	  remove needless version.h dependency.
+
+Tue Nov  4 23:38:43 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* class.c, hash.c, string.c: remove #include "version.h".
+
+	* Makefile.in: remove needless version.h dependency.
+
+Tue Nov  4 06:54:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (read_all): fptr->f may be NULL, if IO is closed in the
+	  signal handler.
+
+	* io.c (io_read): ditto.
+
+	* string.c (get_pat): remove 1.8.0 warning code.
+
+	* string.c (rb_str_match): extend warning until 1.8.2.
+
+	* string.c (rb_str_match2): ditto.
+
+	* class.c (class_instance_method_list): remove 1.8.0 warnings.
+	  method_list now recurs.  [ruby-dev:21816]
+
+	* class.c (rb_obj_singleton_methods): ditto.
+
+	* array.c (rb_ary_select): remove select with block.
+	  [ruby-dev:21824]
+
+	* hash.c (rb_hash_select): ditto.
+
+	* hash.c (env_select): ditto.
+
+	* re.c (match_select): ditto.
+
+	* struct.c (rb_struct_select): ditto.
+
+Mon Nov  3 22:53:21 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/racc/parser.rb: synchronize with Racc 1.4.4.
+
+	* ext/racc/cparse/cparse.c: ditto.
+
+	* ext/racc/cparse/cparse.c (parse_main): should abort when
+	  the length of LR state stack <=1, not ==0.
+
+Mon Nov  3 08:50:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (check_uid_switch): remove duplicated error messages.
+
+	* process.c (check_gid_switch): ditto.
+
+Sun Nov  2 02:28:33 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/ssl.rb: new option :SSLExtraChainCert.
+
+Sun Nov  2 01:02:04 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* string.c (rb_str_hash): Update the HASH_PERL alternative hash
+	  algorithm in sync with Perl 5.8.
+
+	* st.c (strhash): Ditto.
+
+Sat Nov  1 18:21:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_peer_cert_chain): add new method
+	  SSLSocket#peer_cert_chain.
+
+	* ext/openssl/ossl_x509req.c (GetX509ReqPtr): new function
+	  which returns underlying X509_REQ.
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_issuer_cert,
+	  ossl_x509extfactory_set_subject_cert, ossl_x509extfactory_set_crl,
+	  ossl_x509extfactory_set_subject_req, ossl_x509extfactory_set_config):
+	  use underlying C struct without duplication not to leak momory.
+
+Sat Nov  1 01:49:03 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/mapping/factory.rb: mark marshalled basetype objects when
+	  @allow_original_mapping is true.  multi-referencing basetype node is
+	  prohibited in SOAP/1.1 encoding but soap4r's original ruby object
+	  mapping requires basetype to be marked to detect self referencing
+	  loop.  e.g. o = 1; o.instance_eval { @iv = o }  soap4r's original
+	  mapping is only used through soap/marshal API.
+
+	* test/soap/marshal/test_marshal.rb: add tests for self referencing
+	  immutable objects.
+
+	* test/soap/calc/test_calc_cgi.rb: fix test name.
+
+Fri Oct 31 22:26:29 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+
+	* wince/string_wce.c (strrchr): should decrement pointer.
+
+	* wince/Makefile.sub: correct a range of isdigit().
+
+Fri Oct 31 12:55:24 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in, lib/mkmf.rb: add RPATHFLAG for NetBSD.
+	  [ruby-dev:21791]
+
+	* bcc32/Makefile.sub, win32/Makefile.sub, win32/Makefile.sub: ditto.
+
+Fri Oct 31 01:38:14 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* wince/Makefile.sub, win32/Makefile.sub (.y.c): allow white spaces
+	  at the beginning of line to remove by sed. (ruby-bugs-ja:PR#580)
+
+Fri Oct 31 01:02:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* compar.c (cmp_equal): protect exceptions from <=> comparison
+	  again.  returns nil if any exception or error happened during
+	  comparison.
+
+	* eval.c (search_required): should update *featurep when DLEXT2 is
+	  defined. (ruby-bugs-ja:PR#581)
+
+Thu Oct 30 23:41:04 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb: add DRbArray
+
+	* lib/drb/invokemethod.rb: fix Hash#each problem. [ruby-dev:21773]
+
+	* lib/drb/unix.rb: add LoadError. [ruby-dev:21743]
+
+Thu Oct 30 23:19:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/generator.rb: better XML pretty printing.
+
+	* lib/soap/encodingstyle/soapHandler.rb: remove unnecessary namespace
+	  assignment in the element which has "encodingStyle" attribute, and
+	  add necessary namespace assignment for "arrayType" attribute.
+
+	* test/soap/calc/test_calc_cgi.rb: take over $DEBUG to ruby process
+	  through CGI.
+
+Thu Oct 30 22:59:39 2003  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/yaml2byte.c: HASH const too long.  Thanks, matz.
+
+Thu Oct 30 19:13:53 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syck/MANIFEST: Add yamlbyte.h.
+
+Thu Oct 30 14:25:31 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (READ_DATA_BUFFERED): new macro to detect whether stdio
+	  buffer filled.
+
+	* io.c (rb_io_fptr_cleanup): move path deallocation to
+	  rb_io_fptr_finalize (finalizer called by GC).
+
+Thu Oct 30 13:23:39 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (logop): left may be NULL. [ruby-talk:84539]
+
+	* eval.c (rb_eval): NODE_CASE nd_head may be NULL.
+
+Thu Oct 30 10:14:51 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/test/unit/autorunner.rb: make fox runner work.
+
+Thu Oct 30 09:32:26 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (rb_f_system): fixed lack of security check before
+	  calling do_spawn() on win32. [ruby-talk:84555]
+
+Thu Oct 30 02:46:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): single array value to normal Proc#call
+	  (i.e. not via lambda call), should be treated just like yield.
+	  [ruby-dev:21726]
+
+Thu Oct 30 02:25:48 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/buffering.rb (Buffering#initialize):
+	  add new method to inherit @sync from @io.sync.
+
+	* ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): no need to
+	  set sync flag explicitly.
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_initialize): call super.
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): set extra chain
+	  certificates in @extra_chain_cert.
+
+Wed Oct 29 22:02:04 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/drb/drbtest.rb: use rbconfig.rb to make the path of ruby
+	  interpreter to exec, instead of test/ruby/envutil.rb,
+
+Wed Oct 29 19:58:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/tcltklib/tcltklib.c (CONST84): define CONST84 when it is not
+	  defined and TCL_MAJOR_VERSION >= 8.
+
+	* ext/tcltklib/tcltklib.c (VwaitVarProc, WaitVariableProc,
+	  rb_threadVwaitProc): use CONST84 instead of CONST.
+
+	* ext/tcltklib/tcltklib.c (ip_rbTkWaitCommand,
+	  ip_rb_threadTkWaitCommand): use CONST84 always.
+
+Wed Oct 29 17:27:05 2003  Tanaka Akira  <akr@m17n.org>
+
+	* re.c (rb_reg_s_union, Init_Regexp): new method `Regexp.union'.
+
+	* lib/pathname.rb (realpath): examine Dir.pwd because it may have
+	  symlinks.
+
+Wed Oct 29 17:16:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_longjmp): must not disturb original jump.
+	  [ruby-dev:21733]
+
+Wed Oct 29 15:28:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (Init_Proc): taint preallocated exception object
+	  sysstack_error. [ruby-talk:84534]
+
+Wed Oct 29 11:27:39 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (ret_args): node may be NULL. [ruby-talk:84530]
+
+Tue Oct 28 15:20:12 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/tcltklib/tcltklib.c (VwaitVarProc, ip_rbVwaitObjCmd,
+	  WaitVariableProc, WaitVisibilityProc, WaitWindowProc,
+	  ip_rbTkWaitObjCmd, ip_rbTkWaitCommand, rb_threadVwaitProc,
+	  rb_threadWaitVisibilityProc, rb_threadWaitWindowProc,
+	  ip_rb_threadVwaitObjCmd, ip_rb_threadTkWaitObjCmd): prototype;
+	  avoid VC++ warnings.
+
+Mon Oct 27 19:19:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_longjmp): ignore reentering error while warning.
+	  [ruby-dev:21730]
+
+Mon Oct 27 00:23:50 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_ruby): bug fix on Win : hang-up when
+	  calling 'exit' in the Tk callback procedure. [ruby-list:38656]
+
+Sat Oct 25 09:18:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_method_missing): protect exception from within
+	  "inspect".  (ruby-bugs:PR#1204)
+
+Fri Oct 24 23:26:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_each): Hash#each should yield single value.
+	  [ruby-talk:84420]
+
+	* hash.c (env_each): ditto for ENV.each.
+
+Thu Oct 23 20:25:32 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/server.rb (GenericServer#start): should rescue
+	  IOError from IO::accept. [ruby-dev:21692]
+
+Thu Oct 23 17:59:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): initialize stack bottom for embedding.
+	  [ruby-dev:21686]
+
+	* ext/dl/extconf.rb: move list of files to clean from DEPEND file,
+	  to get rid of macro redefinitions.
+
+Thu Oct 23 13:44:00 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y: integrate operations for stack_type.  [ruby-dev:21681]
+
+Thu Oct 23 00:41:45 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/soap/calc/*, test/soap/helloworld/*: set logging threshold
+	  to ERROR.
+
+Wed Oct 22 12:53:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
+	  ignore tests which raised LoadError.
+
+	* test/drb/drbtest.rb, test/ruby/test_beginendblock.rb,
+	  test/ruby/test_system.rb: avoid requiring same file twice.
+
+	* test/drb/test_drbssl.rb, test/drb/test_drbunix.rb: should not use
+	  ARGV unless invoked directly.  do not create test cases unless
+	  required libraries are available.
+
+Wed Oct 22 02:31:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): should not ignore exit_value in END
+	  execution. [ruby-dev:21670]
+
+Tue Oct 21 23:16:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): call finalizers and exit procs before
+	  terminating threads.
+
+	* eval.c (ruby_cleanup): preserve ruby_errinfo before ruby_finalize_0().
+
+Tue Oct 21 15:57:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
+	  prepend the directory of target file to the load path.
+
+Tue Oct 21 15:08:53 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (do_spawn, do_aspawn): should wait child process even
+	  if callded with P_OVERLAY.
+
+	* win32/win32.c (do_spawn, do_aspawn): should return child's exit
+	  status to parent.
+
+Tue Oct 21 00:35:02 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/soap/calc/*, test/soap/helloworld/*: catch the exception from
+	  test server thread and recover.
+
+Tue Oct 21 00:22:57 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/*: import drb/runit.
+
+Mon Oct 20 23:55:47 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): set current node after arguments evaluation.
+	  [ruby-dev:21632]
+
+	* eval.c (rb_yield_0): set current node and keep it at local jump.
+
+Mon Oct 20 22:01:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_cleanup): keep thread group for main thread.
+	  [ruby-dev:21644]
+
+Mon Oct 20 18:28:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_catch): backout.
+
+Mon Oct 20 17:31:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (PUSH_FRAME): generate unique number to be TAG_JUMP()
+	  destination.
+
+	* eval.c (localjump_destination): use unique number in ruby_frame
+	  for localjump destination.
+
+Mon Oct 20 11:31:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_signal.rb (test_signal): restore old trap.
+
+Mon Oct 20 11:00:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_sweep): loosen page free condition to avoid add_heap()
+	  race condition. [ruby-dev:21633]
+
+	* gc.c (gc_sweep): do not update malloc_limit when malloc_increase
+	  is smaller than malloc_limit.
+
+Mon Oct 20 09:45:12 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/debug.rb (debug_command): remove debug print.
+
+Wed Oct 20 00:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (search_required): required name must not be changed before
+	  loading.  [ruby-dev:24492]
+
+Sun Oct 19 13:12:30 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (foreachline, dir_foreach): add obsolete warning.
+
+Sun Oct 19 00:14:22 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/soap/calc/*, test/soap/helloworkd/*: changed port# of test
+	  server. (17171)
+
+Sat Oct 18 23:01:32 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* missing/acosh.c (DBL_MANT_DIG): typo fix(ifdef -> ifndef).
+
+Sat Oct 18 05:48:59 2003  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/rubyext.c: YAML::Syck::compile method.
+
+	* ext/syck/syck.c: Buffer edge bug.
+
+	* ext/syck/yaml2byte.c: YAML to bytecode converter.
+
+	* ext/syck/yamlbyte.h: Ditto.
+
+	* ext/syck/bytecode.c: Bytecode parser fixes to empty collections
+	  and empty strings.
+
+	* ext/syck/token.c: Ditto.
+
+Fri Oct 17 23:07:38 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/enumerator/enumerator.c, ext/enumerator/enumerator.txt:
+	  Provide Kernel#to_enum as an alias for Kernel#enum_for.  Maybe
+	  this is a better name.
+
+Fri Oct 17 23:00:30 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/generator.rb: Add rdoc documentation.
+
+Fri Oct 17 22:16:42 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb: Reword and fix Overview.
+
+	* lib/set.rb: It is not necessary to require
+	  'test/unit/ui/console/testrunner'.
+
+Fri Oct 17 11:15:22 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_range.rb: added.
+
+	* MANIFEST: add test/ruby/test_range.rb.
+
+Fri Oct 17 03:21:23 2003  William Sobel  <will.sobel@barra.com>
+
+	* ext/socket/socket.c (make_hostent): h_aliases may be NULL.
+	  (ruby-bugs:PR#1195)
+
+	* ext/socket/socket.c (sock_s_gethostbyaddr): ditto.
+
+Fri Oct 17 00:12:41 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: (bug fix) instance variable @frame was used
+	  without initializing on TkComposite module.
+
+Thu Oct 16 23:51:04 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: If $DEBUG == true and some exception is caused
+	  in a callback operation, Ruby/Tk shows a (verbose) backtrace
+	  information on the callback process.
+
+Thu Oct 16 17:09:19 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/debug.rb (DEBUGGER__::Context::debug_command): do not call
+	  debug_silent_eval() when $1 is not set. (ruby-bugs:PR#1194)
+
+Thu Oct 16 16:54:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_upto): ("a"..."a").to_a should return [].
+	  [ruby-core:01634]
+
+Thu Oct 16 16:40:51 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb:
+	  Add Tk::EncodedString and Tk::UTF8_String class to support
+	  characters using the \uXXXX escape to the UNICODE string.
+
+	* ext/tk/sample/{demos-en,demos-jp}/unicodeout.rb
+	  new demo-scripts (samples of Tk::UTF8_String)
+
+	* ext/tk/sample/{demos-en,demos-jp}/widget
+	  add entries for 'unicodeout.rb'
+
+Thu Oct 16 08:38:06 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/digest/test_digest.rb (test_eq): show failed class.
+
+	* test/ruby/test_iterator.rb (test_break, test_return_trace_func):
+	  test localjump destination.
+
+Wed Oct 15 20:22:31 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/netHttpClient.rb: use URI::HTTP#request_uri instead of
+	  instance_eval('path_query').  [ruby-list:38575]
+
+Wed Oct 15 17:24:45 2003  URABE Shyouhei  <root@mput.dip.jp>
+
+	* lib/cgi.rb (CGI::Cookie): tiny typo fix.
+
+Wed Oct 15 15:00:54 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_run): just return FAILURE instead of parse error
+	  count.  [ruby-list:38569]
+
+Wed Oct 15 13:17:02 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/digest/digest.c (rb_digest_base_alloc): need to initialize
+	  buffer. [ruby-dev:21622]
+
+Wed Oct 15 11:23:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): dump extended modules as well.
+
+	* marshal.c (r_object0): TYPE_USRMARSHAL should restore extended
+	  modules before invoking marshal_load.  these two fixes are done
+	  by Masatoshi Seki <m_seki@mva.biglobe.ne.jp>.
+
+Wed Oct 15 09:30:34 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/enumerator/enumerator.c (enumerator_each): avoid VC++ warning.
+
+	* ext/syck/syck.h: include stdio.h for definition of FILE.
+
+Wed Oct 15 08:09:07 2003  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/bytecode.c: Checkin of YAML bytecode support.
+
+	* ext/syck/gram.c: Ditto.
+
+	* ext/syck/syck.c: Ditto.
+
+	* ext/syck/token.c: Ditto.
+
+	* ext/syck/handler.c: Ditto.
+
+	* ext/syck/handler.c: Now using 'tag' rather than 'taguri' in type URIs.
+
+	* ext/syck/rubyext.c: Ditto (on both counts).
+
+Wed Oct 15 05:05:53 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/generator.rb: A new library which converts an internal
+	  iterator to an external iterator.
+
+	* lib/abbrev.rb: A new library which creates an abbreviation table
+	  from a list.
+
+Wed Oct 15 04:31:51 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/demos-en/entry3.rb, ext/tk/sample/demos-jp/entry3.rb :
+	  new demo-scripts
+
+	* ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/widget :
+	  add entries for 'entry3.rb'
+
+Wed Oct 15 04:31:47 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/digest/test_digest.rb: Moved from ext/digest/test.rb.
+
+Wed Oct 15 03:53:20 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: fixed trouble on auto-load Tcl commands (enbug
+	  on the last commit).
+
+Wed Oct 15 00:25:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): argument parentheses preceded by spaces should
+	  be warned; not error.  [ruby-talk:84103]
+
+Wed Oct 15 00:20:15 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: replace Tcl/Tk's vwait and tkwait to
+	  switch on threads smoothly and avoid seg-fault.
+
+	* ext/tcltklib/tcltklib.c: add TclTkIp._thread_vwait and
+	  _thread_tkwait for waiting on a thread. (Because Tcl/Tk's vwait
+	  and tkwait command wait on an eventloop.)
+
+	* ext/tk/lib/multi-tk.rb: support TclTkIp._thread_vwait and
+	  _thread_tkwait.
+
+	* ext/tk/lib/tk.rb: now, TkVariable#wait has 2 arguments.
+	  If 1st argument is true, waits on a thread. If false, waits on
+	  an eventloop. If 2nd argument is true, checks existence of
+	  rootwidgets. If false, doesn't. Default is wait(true, false).
+
+	* ext/tk/lib/tk.rb: add TkVariable#tkwait(arg) which is equal to
+	  TkVariable#wait(arg, true). wait_visibility and wait_destroy
+	  have an argument for waiting on a thread or an eventloop.
+
+	* ext/tk/lib/tk.rb: improve of accessing Tcl/Tk's special variables.
+
+	* ext/tk/lib/tkafter.rb: support 'wait on a thread' and 'wait on
+	  an eventloop'.
+
+Wed Oct 15 00:10:24 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/baseData.rb: Introduce SOAPType as the common ancestor of
+	  SOAPBasetype and SOAPCompoundtype.
+
+	* lib/soap/generator.rb, lib/soap/element.rb, lib/soap/encodingstyle/*:
+	  Encoding methods signature change.  Pass SOAPGenerator as a parameter.
+
+	* lib/soap/mapping/*, test/soap/marshal/test_marshal.rb: Refactoring
+	  for better marshalling/unmarshalling support.  Now I think SOAP
+	  marshaller supports all kind of object graph which is supported by
+	  Ruby's original marshaller.  Of course there could be bugs as always.
+	  Find it.  :-)
+
+	* lib/soap/rpc/standaloneServer.rb: Set severity threshould to INFO.
+	  DEBUG is too noisy.
+
+	* lib/xsd/datatypes.rb: DateTime#of is obsoleted.  Use DateTime#offset.
+
+	* test/wsdl/emptycomplextype.wsdl, test/xsd/xmlschema.xml: Avoid
+	  useless warning.
+
+Tue Oct 14 19:09:35 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_finalize_0): return the given exit status unless
+	  SystemExit got raised.
+
+Tue Oct 14 11:53:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h (ruby_stop): never return.
+
+	* ruby.h (ruby_run): ditto.
+
+Tue Oct 14 04:43:55 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (realpath): make ELOOP check bit more robust.
+	  (children): prepend self by default.
+	  (chroot): obsoleted.
+
+Tue Oct 14 02:29:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_require_safe): segfault after loading .so.
+
+Tue Oct 14 02:05:23 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/Setup*, ext/enumerator/*: Add ext/enumerator, a helper
+	  module for the Enumerable interface.
+
+Mon Oct 13 23:55:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* test/ruby/envutil.rb: use Config::CONFIG["ruby_install_name"],
+	  not "ruby".
+
+Mon Oct 13 23:57:29 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_feature_p): match by classified suffix.
+
+	* eval.c (rb_require_safe): require library in the specified safe
+	  level.
+
+	* variable.c (rb_autoload, rb_autoload_load): restore safe level
+	  when autoload was called.  [ruby-dev:21338]
+
+	* intern.h: prototypes; rb_require_safe.
+
+	* test/runner.rb: accept non-option arguments.
+
+Mon Oct 13 20:49:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_new4): should not preserve FL_TAINT status in the
+	  internal shared string. [ruby-dev:21601]
+
+	* string.c (rb_str_new4): ditto.
+
+	* eval.c: use EXIT_SUCCESS and EXIT_FAILURE for exit values.
+
+	* process.c: ditto. [ruby-list:38521]
+
+Mon Oct 13 19:51:02 2003  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* lib/debug.rb (debug_command): should enter emacs mode when
+	  assigned any value to the environment variable "EMACS".
+	  On Meadow, (getenv "EMACS") is "meadow".
+
+Sun Oct 12 14:45:03 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/win32ole/extconf.rb: check "windows.h", not "windows".
+	  [ruby-talk:84051]
+
+Sat Oct 11 20:41:03 2003  Corinna Vinschen  <corinna@vinschen.de>
+
+	* file.c (eaccess): Use access(2) on Cygwin.
+
+Sat Oct 11 17:09:21 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/rexml/quickpath.rb (REXML::QuickPath::match):
+	  escape '[' to avoid warning.
+
+Sat Oct 11 16:08:41 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (realpath): check existence of the file.
+
+	* lib/pathname.rb (realpath): re-implemented.
+	  (realpath_root?, realpath_rec): removed
+
+Sat Oct 11 10:19:39 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/monitor.rb: handle exceptions correctly. Thanks, Gennady
+	  Bystritsky.
+
+Fri Oct 10 07:50:54 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (is_defined): inheritance line adjustment as like as
+	  rb_call_super().
+
+Fri Oct 10 01:19:00 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): add
+	  optional argument to specify the DirectoryString type
+	  (ASN1::UTF8STRING by default). RFC3280 deprecates PrintableString
+	  for DirectoryString, and strongly requires to use UTF8String for
+	  all certificates issued after December, 31 2003.
+
+	* ext/openssl/lib/openssl/x509.rb (X509::Name::parse): ditto.
+
+Thu Oct  9 23:50:21 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_start_0): prevent thread from GC.
+	  [ruby-dev:21572]
+
+Thu Oct  9 19:11:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_start_0): non-volatile should be restored from
+	  volatile.
+
+Thu Oct  9 17:43:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (proc_save_safe_level, proc_get_safe_level,
+	  proc_set_safe_level): save/restore safe level 1..4.
+
+Thu Oct  9 16:33:23 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_object0): remove unnecessary iv restoration for
+	  USRMARSHAL. [ruby-dev:21582]
+
+	* marshal.c (w_object): dump generic instance variables from
+	  a string from '_dump'.
+
+	* variable.c (rb_generic_ivar_table): return 0 if obj's FL_EXIVAR
+	  is not set.
+
+	* time.c (time_dump): copy instance variables to dumped string, to
+	  be included in the marshaled data.
+
+	* bignum.c (rb_big2ulong): add range check to ensure round trip.
+
+Thu Oct  9 15:45:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (uv_to_utf8): change message to "out of range", since
+	  negative values are not "too big". [ruby-dev:21567]
+
+Thu Oct  9 14:05:38 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_set_end_proc, rb_exec_end_proc): restore safe level.
+	  [ruby-dev:21557]
+
+Thu Oct  9 10:51:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_yield_0): no error if block is empty.
+
+Thu Oct  9 06:43:33 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (localjump_error): id should be ID.
+
+	* eval.c (rb_eval): nd_rval is set in copy_node_scope().
+
+	* eval.c (rb_yield_0): unused variable.
+
+	* eval.c (rb_yield_0): nothing to do for empty node.
+
+	* eval.c (call_end_proc, proc_invoke): adjust backtrace in END.
+	  [ruby-dev:21551]
+
+	* eval.c (rb_thread_start_0): set the value by break as the result.
+	  [ruby-dev:21552]
+
+	* eval.c (rb_thread_start_0, rb_thread_raise, rb_callcc): save
+	  variables across THREAD_SAVE_CONTEXT.
+
+Thu Oct  9 12:05:46 2003  Eric Sunshine  <sunshine@sunshineco.com>
+
+	* configure.in: revived NextStep, OpenStep, and Rhapsody ports which
+	  had become unbuildable; enhanced --enable-fat-binary option so that
+	  it accepts a list of desired architectures (rather than assuming a
+	  fixed list), or defaults to a platform-appropriate list if user does
+	  not provide an explicit list; made the default list of architectures
+	  for MAB (fat binary) more comprehensive; now uses -fno-common even
+	  when building the interpreter (in addition to using it for
+	  extensions), thus allowing the interpreter to be embedded into a
+	  plugin module of an external project (in addition to allowing
+	  embedding directly into an application); added checks for
+	  <netinet/in_systm.h> (needed by `socket' extension) and getcwd(); now
+	  ensures that -I/usr/local/include is employed when extensions'
+	  extconf.rb scripts invoke have_header() since extension checks on
+	  NextStep and OpenStep will fail without it if the desired resource
+	  resides in the /usr/local tree; fixed formatting of --help message.
+
+	* Makefile.in: $(LIBRUBY_A) rule now deletes the archive before
+	  invoking $(AR) since `ar' on Apple/NeXT can not "update" MAB archives
+	  (see configure's --enable-fat-binary option); added rule for new
+	  missing/getcwd.c.
+
+	* defines.h: fixed endian handling during MAB build (see configure's
+	  --enable-fat-binary option) to ensure that all portions of the
+	  project see the correct WORDS_BIGENDIAN value (some extension modules
+	  were getting the wrong endian setting); added missing constants
+	  GETPGRP_VOID, WNOHANG, WUNTRACED, X_OK, and type pid_t for NextStep
+	  and OpenStep; removed unnecessary and problematic HAVE_SYS_WAIT_H
+	  define in NeXT section.
+
+	* dir.c: do not allow NAMLEN() macro to trust dirent::d_namlen on
+	  NextStep since, on some installations, this value always resolves
+	  uselessly to zero.
+
+	* dln.c: added error reporting to NextStep extension loader since the
+	  previous behavior of failing silently was not useful; now ensures
+	  that NSLINKMODULE_OPTION_BINDNOW compatibility constant is defined
+	  for OpenStep and Rhapsody; no longer includes <mach-o/dyld.h> twice
+	  on Rhapsody since this header lacks multiple-include protection,
+	  which resulted in "redefinition" compilation errors.
+
+	* main.c: also create hard reference to objc_msgSend() on NeXT
+	  platforms (in addition to Apple platforms).
+
+	* lib/mkmf.rb: now exports XCFLAGS from configure script to extension
+	  makefiles so that extensions can be built MAB (see configure's
+	  --enable-fat-binary option); also utilize XCFLAGS in cc_command()
+	  (but not cpp_command() because MAB flags are incompatible with
+	  direct invocation of `cpp').
+
+	* ext/curses/extconf.rb: now additionally checks for presence of these
+	  curses functions which are not present on NextStep or Openstep:
+	  bkgd(), bkgdset(), color(), curs(), getbkgd(), init(), scrl(), set(),
+	  setscrreg(), wattroff(), wattron(), wattrset(), wbkgd(), wbkgdset(),
+	  wscrl(), wsetscrreg()
+
+	* ext/curses/curses.c: added appropriate #ifdef's for additional set of
+	  curses functions now checked by extconf.rb; fixed curses_bkgd() and
+	  window_bkgd() to correctly return boolean result rather than numeric
+	  result; fixed window_getbkgd() to correctly signal an error by
+	  returning nil rather than -1.
+
+	* ext/etc/etc.c: setup_passwd() and setup_group() now check for null
+	  pointers before invoking rb_tainted_str_new2() upon fields extracted
+	  from `struct passwd' and `struct group' since null pointers in some
+	  fields are common on NextStep/OpenStep (especially so for the
+	  `pw_comment' field) and rb_tainted_str_new2() throws an exception
+	  when it receives a null pointer.
+
+	* ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
+	  platforms such as NextStep and OpenStep which lack strdup().
+
+	* ext/socket/getaddrinfo.c: cast first argument of getservbyname(),
+	  gethostbyaddr(), and gethostbyname() from (const char*) to non-const
+	  (char*) for older platforms such as NextStep and OpenStep.
+
+	* ext/socket/socket.c: include "util.h" for strdup()/ruby_strdup() for
+	  platforms such as NextStep and OpenStep which lack strdup(); include
+	  <netinet/in_systm.h> if present for NextStep and OpenStep; cast first
+	  argument of gethostbyaddr() and getservbyname() from (const char*) to
+	  non-const (char*) for older platforms.
+
+	* ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
+	  platforms such as NextStep and OpenStep which lack strdup().
+
+Wed Oct  8 22:19:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit.rb: removed installation instructions.
+
+	* lib/test/unit/ui/testrunnermediator.rb: moved the run flag to a more
+	  central location.
+
+	* lib/test/unit.rb: ditto.
+
+	* lib/test/unit.rb: extracted the running code in to AutoRunner.
+
+	* lib/test/unit/autorunner.rb: added.
+
+	* lib/test/unit/collector/objectspace.rb: extracted common test
+	  collection functionality in to a module.
+
+	* lib/test/unit/collector.rb: ditto; added.
+
+	* test/testunit/collector/test_objectspace.rb: ditto.
+
+	* lib/test/unit/collector/dir.rb: added. Supports collecting tests out
+	  of a directory structure.
+
+	* test/testunit/collector/test_dir.rb: added.
+
+	* test/runner.rb: simplified to use the new capabilities.
+
+Tue Oct  7 15:23:09 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_beginendblock.rb: add tests for nested BEGIN/END.
+
+	* test/ruby/beginmainend.rb: add tests for nested BEGIN/END.
+
+	* test/ruby/endblockwarn.rb: new file added to test of END-in-method
+	  warning.
+
+Tue Oct  7 12:23:47 2003  Tanaka Akira  <akr@m17n.org>
+
+	* ext/fcntl/fcntl.c (Init_fcntl): define Fcntl::O_ACCMODE.
+
+	* ext/socket/extconf.rb: useless assignment removed.
+
+Tue Oct  7 09:13:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_beginendblock.rb (test_endinmethod): END{} is now
+	  allowed in eval.
+
+Tue Oct  7 04:15:25 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt): should not expand mrhs if lhs is solely starred.
+
+Tue Oct  7 02:57:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (stmt): rhs of multiple assignment should not be
+	  expanded using "to_a". [ruby-dev:21527]
+
+Tue Oct  7 01:42:34 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): use appropriate
+	  free function for ASN1_OBJECT.
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1obj_get_sn): add new function for
+	  ASN1::ObjectId#sn; it returns short name text representation of OID.
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1obj_get_ln): add new function for
+	  ASN1::ObjectId#ln; it returns long name text representation of OID.
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1obj_get_oid): add new function for
+	  ASN1::ObjectId#oid; it returns numerical representation of OID.
+
+Mon Oct  6 22:59:46 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/csv.rb (IOReader, BasicWriter): call binmode when a given IO
+	  respond_to?(:binmode).  record separator was wrong when you gave
+	  text mode IO to Reader.parse and Writer.generate.
+
+	* test/csv/test_csv.rb: add tests for above change.
+
+Sun Oct  5 23:27:09 2003  Tanaka Akira  <akr@m17n.org>
+
+	* ext/socket/extconf.rb: check recvmsg even if sendmsg is exists.
+
+	* ext/socket/socket.c (thread_read_select): restored.
+
+Mon Oct  6 16:23:38 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object): wrong method name in the message.
+
+Mon Oct  6 16:02:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (stmt): END in method should cause warning.
+	  [ruby-dev:21519]
+
+Mon Oct  6 15:17:23 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_iterator.rb (test_block_argument_without_paren):
+	  added. (follows sample/test.rb)
+
+Mon Oct  6 11:57:06 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: added
+	  test for eval-ed BEGIN END order.
+
+Mon Oct  6 09:19:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): should pass "weak" value to next level.
+	  [ruby-dev:21496]
+
+	* eval.c (proc_alloc): should not use cached object if klass is
+	  different. [ruby-talk:83685]
+
+Sun Oct  5 23:27:09 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb: version information is added in document.
+
+Sun Oct  5 23:07:03 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_f_END): block should be given.  [ruby-dev:21497]
+
+Sun Oct  5 22:51:23 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/ext/openssl/extconf.rb: add check for some engine functions
+	  unavailable in OpenSSL-0.9.6.
+
+	* lib/ext/openssl/ossl_engine.c: ditto.
+
+Sun Oct  5 17:56:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): fix evaluation order.  [ruby-list:38431]
+
+Sun Oct  5 15:05:06 2003  akira yamada  <akira@ruby-lang.org>
+
+	* test/uri/*: translated RUNIT to Test::Unit.
+
+Sun Oct  5 14:37:39 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/xsd/datatypes.rb: Rational -> Decimal string bug fix.
+
+	* test/soap/marshal/test_marshal.rb: ditto.
+
+	* test/soap/calc/test_calc_cgi.rb: add Config::CONFIG["EXEEXT"] to
+	  RUBYBIN.
+
+Sun Oct  5 13:47:22 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: add tests
+	  about scope, order and allowed syntax.
+
+Sun Oct  5 11:54:29 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/envutil.rb: added.  split "rubybin" from test_system.rb.
+
+	* test/ruby/test_system.rb: use envutil.rb
+
+	* test/ruby/test_beginendblock.rb: added.
+
+	* test/ruby/beginmainend.rb: added.  used in test_beginendblock.rb.
+
+Sun Oct  5 11:23:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* test/testunit/runit/test_testresult.rb: removed some unnecessary
+	  cruft.
+
+Sun Oct  5 11:14:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/rubyunit.rb: aliasing TestCase into the top level is
+	  problematic.
+
+	* lib/runit/assert.rb: fixed a couple of bugs caused by recent
+	  refactoring in Test::Unit.
+
+	* test/testunit/runit/*: added.
+
+Sun Oct  5 10:55:29 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/open-uri.rb (URI::Generic#find_proxy): no_proxy support did not
+	  work.  [ruby-dev:21484]
+
+Sun Oct  5 09:52:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb: will use pp for output if available.
+	  Can be disabled by setting Assertions.use_pp = false.
+
+	* test/testunit/test_assertions.rb: made a small change to exception
+	  formatting.
+
+Sun Oct  5 07:42:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb: made small improvements to assertion
+	  messages. Deprecated Assertions#assert_not_nil; use #assert instead.
+
+	* test/testunit/test_assertions.rb: ditto.
+
+	* test/testunit/util/test_procwrapper.rb: use #assert instead of
+	  #assert_not_nil.
+
+Sun Oct  5 04:10:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb: refactored message building.
+
+Sun Oct  5 03:40:22 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.h: global symbols should be declared
+	  as external.
+
+Sun Oct  5 03:03:20 2003  akira yamada  <akira@ruby-lang.org>
+
+	* test/ruby/test_exception.rb (test_else): added.
+
+Sun Oct  5 02:12:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb: changed assertion messages to rely more
+	  heavily on #inspect. Added backtrace filtering for exceptions in
+	  assertion messages.
+
+	* test/testunit/test_assertions.rb: ditto.
+
+Sun Oct  5 02:12:00 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/acl.rb, lib/drb/ssl.rb: added.
+
+	* lib/drb/drb.rb: exit from a thread using 'break'.
+
+Sat Oct  4 21:49:14 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* gc.c (Init_stack): the type of space is changed to unsigned int
+	  from double.  [ruby-dev:21483]
+
+Sat Oct  4 17:52:59 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/netHttpClient.rb: follow http-access2.  hosts which matches
+	  ENV['no_proxy'] or ENV['NO_PROXY'] are not proxyed.
+	  - [,:] separated. ("ruby-lang.org:rubyist.net")
+	  - no regexp. (give "ruby-lang.org", not "*.ruby-lang.org")
+	  - if you want specify host by IP address, give full address.
+	    ("192.168.1.1, 192.168.1.2")
+
+	* lib/soap/rpc/cgistub.rb: return "Status: XXX MMM" line.
+
+	* test/runner.rb: give testsuite name.
+
+Sat Oct  4 15:16:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): instance variable dump do not cause error
+	  for objects that cannot be dumped, if they traversed from
+	  marshal_dump.  they are just ignored.
+
+	* gc.c (Init_stack): cast "space" (doble value) into unsigned
+	  int.  should run on PowerPC.
+
+	* eval.c (rb_eval): should not execute else part if any exception
+	  is caught. [ruby-dev:21482]
+
+	* parse.y (f_args): should allow unparenthesized block argument.
+
+	* parse.y (f_rest_arg): should allow unparenthesized rest
+	  argument.
+
+Sat Oct  4 14:59:51 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (initialize): raise ArgumentError if argument has
+	  '\0' character.
+	  (relative_path_from): new method.
+	  (each_entry): new method for replacement of dir_foreach.
+	  (foreach, foreachline, dir_foreach, chdir): obsoleted.
+
+Sat Oct  4 12:58:48 2003  akira yamada  <akira@ruby-lang.org>
+
+	* test/uri/* (6 files): added.
+
+Sat Oct  4 12:44:45 2003  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/ftp.rb, lib/uri/mailto.rb: renamed to #to_s from #to_str.
+
+Sat Oct  4 07:33:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/testsuite.rb: changed #<< to return self, and added
+	  #delete.
+
+	* test/testunit/test_testsuite.rb: ditto. Also slightly refactored
+	  #test_size.
+
+	* lib/test/unit/collector/objectspace.rb: collector now preserves the
+	  hierarchy of suites.
+
+	* test/testunit/collector/test_objectspace.rb: ditto.
+
+Sat Oct  4 04:48:49 2003  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/rubyext.c: default keys handled.
+
+	* ext/syck/syck.h: lowered default buffer size to 16k for increased
+	  performance.
+
+	* test/yaml: checkin of basic unit tests.
+
+Sat Oct  4 04:24:19 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: add check for X509V3_set_nconf.
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
+	  cannot implement if X509V3_set_nconf doesn't exist.
+
+Sat Oct  4 02:12:44 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/xsd/datatypes.rb: dump sign by itself.  under the problematic
+	  platform, sprintf("%+.10g", -0.0) => +0.  sigh.
+
+	* sample/wsdl/amazon/*: update schema ver2 to ver3.
+
+Sat Oct  4 01:33:46 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (initialize): duplicate and freeze argument.
+	  (to_s): return duplicated string.
+	  (children): new method.
+	  (each_line): new alias to foreachline.
+
+Fri Oct  3 16:13:19 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_asn1.c: add DER encoder and decoder.
+
+	* ext/openssl/ossl_asn1.h: add OpenSSL::ASN1 module.
+
+	* ext/openssl/ossl.c (Init_openssl): call Init_ossl_asn1.
+
+	* ext/openssl/extconf.rb: check if X509_ATTRIBUTE has field "single".
+
+	* ext/openssl/ossl_x509attr.c (ossl_x509attr_set_value): accept
+	  DER encoded data argument.
+
+	* ext/openssl/ossl_x509attr.c (ossl_x509attr_get_value): return
+	  DER encoded data in OpenSSL::ASN1 types.
+
+Fri Oct  3 13:02:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit.rb: refactored to use optparse.
+
+	* lib/test/unit.rb: added support for selecting the output
+	  level from the command-line.
+
+	* lib/test/unit.rb: added a command-line switch to stop processing
+	  the command-line, allowing arguments to be passed to tests.
+
+	* lib/test/unit.rb: changed the method for specifying a runner or a
+	  filter from the command-line.
+
+	* lib/test/unit/collector/objectspace.rb: fixed a bug causing all
+	  tests to be excluded when the filter was set to an empty array.
+
+	* test/testunit/collector/test_objectspace.rb: ditto.
+
+Fri Oct  3 08:14:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb (RubyLex::identify_identifier): support
+	  'class ::Foo' syntax. [ruby-talk:83514]
+
+Fri Oct  3 08:01:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb: added a default message for #assert,
+	  #assert_block, and #flunk.
+
+	* test/testunit/test_assertions.rb: ditto.
+
+	* lib/test/unit/failure.rb: failures now show a better trace of where
+	  they occurred.
+
+	* test/testunit/test_failure.rb: ditto (added).
+
+	* lib/test/unit/testcase.rb: ditto.
+
+	* test/testunit/test_testcase.rb: ditto.
+
+	* lib/test/unit/util/backtracefilter.rb: added.
+
+	* test/testunit/util/test_backtracefilter.rb: added.
+
+	* lib/test/unit/error.rb: changed to use BacktraceFilter and improved
+	  output.
+
+	* test/testunit/test_error.rb: ditto.
+
+Thu Oct  2 20:33:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_failure_initialize): conform with
+	  orthodox initialization method.
+
+	* ext/iconv/iconv.c (iconv_fail): initialize exception instance
+	  from the class, and do not share instance variables with the
+	  others.  [ruby-dev:21470]
+
+Thu Oct  2 18:20:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (Init_Time): define initialize.  [ruby-dev:21469]
+
+Thu Oct  2 17:39:38 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_engine.c: add a new module OpenSSL::Engine.
+	  it supports OpenSSL hardware cryptographic engine interface.
+
+	* ext/openssl/ossl_engine.h: ditto.
+
+	* ext/openssl/MANIFEST: add ossl_engine.c and ossl_engine.h.
+
+	* ext/openssl/extconf.rb: add check for openssl/engine.h.
+
+	* ext/openssl/ossl.c: call Init_ossl_engine().
+
+	* ext/openssl/ossl.h: include openssl/engine.h.
+
+	* ext/openssl/ossl_pkey_{rsa,dsa,dh}.c: check if underlying
+	  EVP_PKEY referes engine.
+
+Thu Oct  2 17:22:37 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_load): restore instance variables (if any) before
+	  loading from marshaled data.
+
+Thu Oct  2 14:19:15 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (iconv_fail): now yield erred substring, and
+	  set error object to $!.
+
+	* ext/iconv/iconv.c (iconv_convert): error handler block should
+	  return appended part and the rest.  if rest is nil, the
+	  conversion stops.
+
+Thu Oct  2 12:00:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_const_defined_0): look up constants in Object as
+	  well.  [ruby-dev:21458]
+
+	* test/ruby/test_defined.rb (TestDefined::test_defined): test for
+	  constants.
+
+Thu Oct  2 11:17:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb: should not capture an
+	  AssertionFailedError unless explicitly requested.
+
+	* test/testunit/test_assertions.rb: ditto.
+
+	* test/testunit/collector/test_objectspace.rb: fixed a test failure
+	  caused by methods being returned in different orders on different
+	  platforms by moving test sorting from TestSuite into the locations
+	  where suites are constructed. [ruby-talk:83156]
+
+	* lib/test/unit/testcase.rb: ditto.
+
+	* lib/test/unit/testsuite.rb: ditto.
+
+	* lib/test/unit/collector/objectspace.rb: ditto.
+
+Thu Oct  2 03:25:01 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (rb_thread_raise): prototype; avoid VC++ warning.
+
+Thu Oct  2 01:37:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_mdump): new marshal dumper. _dump is still
+	  available for compatibility.
+
+	* time.c (time_mload): new marshal loader.
+
+	* marshal.c (w_object): preserve instance variables for objects
+	  with marshal_dump.
+
+	* marshal.c (r_object0): restore instance variables before calling
+	  marshal_load.
+
+	* error.c (rb_warn_m): always return nil.
+
+Thu Oct  2 01:32:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_block_given_p): real required condition is
+	  ruby_frame->prev->iter == ITER_CUR.
+
+	* eval.c (rb_block_given_p): ditto.
+
+	* eval.c (block_pass): update ruby_frame->iter only when previous
+	  value is ITER_NOT.
+
+Thu Oct  2 01:02:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_const_defined_at): should exclude constants from
+	  Object when TYPE(klass) == T_MODULE *and* exclude is on.
+	  [ruby-dev:21458]
+
+	* variable.c (rb_const_get_0): do not lookup constants from Object
+	  when TYPE(klass) == T_MODULE *and* exclude is on.
+
+Thu Oct  2 00:21:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/logger/test_logger.rb: unlinking file before close causes
+	  problem under win32 box.
+
+	* lib/xsd/datatypes.rb(XSDFloat, XSDDouble): add +/- sign explicitly
+	  when stringified and embedded into XML instance.  Ruby's sprintf may
+	  format -0.0 as "0.0" (no minus sign) depending on underlying C
+	  sprintf implementation.
+
+	* test/xsd/test_xsd.rb, test/soap/test_basetype.rb: follow above change.
+
+	* test/soap/calc/*: give httpd config param "CGIInterpreter".
+	  "/usr/bin/env ruby" thing does not work under non-Unix boxes.
+
+Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_byte): retrieve pointer from string value for each
+	  time.  [ruby-dev:24404]
+
+	* marshal.c (r_bytes0): ditto.
+
+	* enum.c (sort_by_i): re-entrance check added.  [ruby-dev:24399]
+
+	* io.c (io_read): should freeze all reading buffer.
+	  [ruby-dev:24400]
+
+	* string.c (rb_str_sum): should use bignums when bits is greater
+	  than or equals to sizeof(long)*CHAR_BITS. [ruby-dev:24395]
+
+	* eval.c (specific_eval): defer pointer retrieval to prevent
+	  unsafe sourcefile string modification.  [ruby-dev:24382]
+
+	* string.c (rb_str_sum): wrong cast caused wrong result.
+	  [ruby-dev:24385]
+
+	* enum.c (enum_sort_by): hide temporary array from
+	  ObjectSpace.each_object.  [ruby-dev:24386]
+
+	* string.c (rb_str_sum): check was done with false pointer.
+	  [ruby-dev:24383]
+
+	* string.c (rb_str_sum): string may be altered.  [ruby-dev:24381]
+
+Thu Oct  2 00:25:21 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (ruby_signal_name): adjust to the prototype.
+
+	* process.c (pst_inspect): ditto.
+
+	* ext/etc/etc.c (etc_getgrent, Init_etc): typo.
+
+Wed Oct  1 20:49:41 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (heaps): manage slots and limits together.  [ruby-dev:21453]
+
+	* gc.c (add_heap): should not clear heaps slot even if realloc()
+	  failed.
+
+Wed Oct  1 20:36:49 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* MANIFEST: add wince/mkconfig_wce.rb.
+
+Wed Oct  1 17:22:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/etc/etc.c: add new functions: setpwent, getpwent, endpwent,
+	  setgrent, getgrent, endgrent.
+
+	* ext/socket/socket.c (sock_s_gethostbyname): do not reverse lookup.
+
+Wed Oct  1 17:01:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_load): Object scope had priority over required file
+	  scope.  [ruby-dev:21415]
+
+Wed Oct  1 14:09:53 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+
+	* wince/mkconfig_wce.rb: sorry, forget to commit.
+
+Wed Oct  1 10:08:42 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+
+	* wince/setup.mak: add sigmarionIII SDK support.
+
+	* wince/Makefile.sub: ditto.
+
+	* wince/mkexports.rb: fix linker error in SH4.
+
+	* wince/mkconfig_wce.rb: camouflage RUBY_PLATFORM for compiling ext.
+
+Wed Oct  1 08:02:52 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+
+	* wince/time_wce.c (time): add zero check.
+
+Tue Sep 30 16:11:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* Makefile.in: copy lex.c from $(srcdir) if it's not the current
+	  directory.  [ruby-dev:21437]
+
+Tue Sep 30 11:29:23 2003  Tanaka Akira  <akr@m17n.org>
+
+	* process.c (pst_inspect): describe stopped process "stopped".
+
+Tue Sep 30 09:31:56 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/runner.rb: glob for directories.
+
+Tue Sep 30 09:11:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): while/until should not capture break unless
+	  they are destination of the break.
+
+Tue Sep 30 03:12:02 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (finish): revert to 1.93.
+
+	* lib/net/pop.rb (finish): revert to 1.60.
+
+	* lib/net/smtp.rb (finish): revert to 1.67.
+
+	* lib/net/http.rb (do_start): ensure to close socket if failed to
+	  start session.
+
+	* lib/net/pop.rb (do_start): ditto.
+
+	* lib/net/smtp.rb (do_start): ditto.
+
+	* lib/net/smtp.rb: SMTP#started? wrongly returned false always.
+
+Tue Sep 30 02:54:49 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* test/ruby/test_iterator.rb: new test
+	  test_break__nested_loop[123].
+
+Mon Sep 29 23:39:13 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (finish): does not raise IOError even if
+	  !started?, to allow closing socket which was opened before
+	  session started.
+
+	* lib/net/pop.rb (finish): ditto.
+
+	* lib/net/smtp.rb (finish): ditto.
+
+Mon Sep 29 19:06:51 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/win32ole/extconf.rb: add windows.h checking.
+	  (ruby-bugs:PR#1185)
+
+Mon Sep 29 16:18:30 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb: check if the given logdevice object respond_to :write
+	  and :close, not is_a? IO.  duck duck.
+
+	* test/logger/test_logger.rb: self IO.pipe reading/writing may be
+	  locked by the flood.  use tempfile.
+
+	* lib/wsdl/xmlSchema/data.rb: wrong constant reference.
+
+Mon Sep 29 16:11:23 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb: clean up temporary symlink.
+	  Patched by NaHi.  [ruby-dev:21420]
+
+Mon Sep 29 11:16:55 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_atfork): wrong format specifier.
+	  [ruby-dev:21428]
+
+	* process.c (pst_inspect): better description.
+
+Mon Sep 29 02:31:44 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/utils.rb (Utils::su): use setgid and setuid to
+	  set real and effective IDs. and setup group access list by
+	  initgroups.
+
+Sun Sep 28 11:14:19 2003  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* ext/digest/digest.c (Init_digest): `copy_object' was deprecated.
+	  `initialize_copy' should be defined.
+
+	* ext/stringio/stringio.c (Init_stringio): ditto.
+
+Sat Sep 27 18:25:13 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/xsd/charset.rb: XSD::Charset.is_ces did return always true under
+	  $KCODE = "NONE" environment.  check added.
+
+	* test/xsd/test_xsd.rb: add tests for above fix.
+
+Sat Sep 27 15:58:50 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/rpc/cgistub.rb: make logging severity threshold higher.
+
+	* lib/soap/rpc/standaloneServer.rb: defer WEBrick server start to give
+	  a chance to reset logging severity threshold.
+
+	* test/soap/calc/test_*, test/soap/helloworld/test_helloworld.rb: run
+	  silent.
+
+Sat Sep 27 09:44:18 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb: clear all errors on Windows.
+	  [ruby-dev:21417]
+
+	* test/fileutils/test_nowrite.rb: ditto.
+
+Mon Sep 27 09:14:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_delete): comparison may change the capacity.
+	  [ruby-dev:24348]
+
+	* array.c (rb_ary_fill): fill should honor length argument.
+	  [ruby-dev:24346]
+
+	* array.c (rb_ary_replace): should not use ptr from shared array.
+	  [ruby-dev:24345]
+
+	* ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
+	  [ruby-talk:113807]
+
+Sat Sep 27 04:57:07 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_file.rb: new file.  only asserts unlink-before-close
+	  behaviour now.
+
+	* test/soap/marshal/test_digraph.rb: should close before unlink.
+	  unlink-before-close pattern is not needed here.
+
+Sat Sep 27 03:32:37 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/soap/*, test/wsdl/*, test/xsd/*: move TestCase classes into
+	  each module namespace.  TestMarshal in
+	  test/soap/marshal/test_marshal.rb crashed with
+	  test/ruby/test_marshal.rb.
+
+Sat Sep 27 01:30:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_connect): on win32, type of the 4th
+	  argument of getsockopt is char *.
+
+Fri Sep 26 18:35:40 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/resolv-replace.rb: 1.8 compliance.  [ruby-talk:82946]
+
+Fri Sep 26 17:39:27 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_marshal.rb: add test for ruby's objects.
+
+Fri Sep 26 09:52:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* defines.h (flush_register_windows): use volatile only for gcc on
+	  Solaris.  [ruby-dev:21403]
+
+	* lib/mkmf.rb (xsystem): use system directly to honor shell meta
+	  charaters.
+
+Fri Sep 26 00:10:13 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/README: updated.
+
+Thu Sep 25 17:48:10 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/ossl.c (ossl_buf2str): fix type of 1st argument for
+	  rb_protect.
+
+	* ext/openssl/ossl_hmac.c (ossl_hmac_digest): should return meaningful
+	  value.
+
+Thu Sep 25 09:00:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/ostruct.rb: Added OpenStruct#==.
+
+	* test/ostruct/test_ostruct.rb: Added.
+
+Thu Sep 25 07:55:26 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32ole/win32ole.c, ext/openssl/ossl_pkey_dsa.c,
+	  ext/openssl/ossl_pkey_rsa.c, ext/bigdecimal/bigdecimal.h: must
+	  not use C++ or C99 style comment yet.  (ruby-bugs:PR#1184)
+
+Thu Sep 25 00:23:22 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* MANIFEST: add SOAP4R.
+
+Thu Sep 25 00:13:15 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/* (29 files): SOAP4R added.
+
+	* lib/wsdl/* (42 files): WSDL4R added.
+
+	* lib/xsd/* (12 files): XSD4R added.
+
+	* test/soap/* (16 files): added.
+
+	* test/wsdl/* (2 files): added.
+
+	* test/xsd/* (3 files): added.
+
+	* sample/soap/* (27 files): added.
+
+	* sample/wsdl/* (13 files): added.
+
+Wed Sep 24 02:08:11 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpservlet/cgihandler.rb: conform to mswin32.
+	  [ruby-talk:82735], [ruby-talk:82748], [ruby-talk:82818]
+
+Tue Sep 23 23:10:16 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb: add Logger#<<(msg) for writing msg without any
+	  formatting.
+
+	* test/logger/test_logger.rb: ditto.
+
+Tue Sep 23 20:47:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (rb_warn_m): should not warn if -W0 is specified.
+	  [ruby-talk:82675]
+
+Mon Sep 22 21:28:57 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* MANIFEST: updated.
+
+Mon Sep 22 19:22:26 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* configure.in (AC_CHECK_FUNCS): add setuid and setgid.
+
+Mon Sep 22 12:34:55 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* util.c (ruby_strtod): skip preceding zeros before counting
+	  digits in the mantissa. (ruby-bugs:PR#1181)
+
+Sun Sep 21 04:12:36 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): the argument
+	  should be a String.
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): ditt.
+
+	* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): ditto.
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.
+
+Sat Sep 20 11:49:05 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb: typo fixed.
+
+	* test/logger/test_logger.rb: new file.
+
+Fri Sep 19 11:39:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* test/testunit/*: Added.
+
+	* lib/test/unit.rb: Documentation update.
+
+	* lib/test/unit/ui/console/testrunner.rb (TestRunner#initialize):
+	  Ditto.
+
+	* lib/test/unit.rb: Factored out an ObjectSpace collector.
+
+	* lib/test/unit/collector/objectspace.rb: Ditto.
+
+	* sample/testunit/*: Added.
+
+Fri Sep 19 01:00:48 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/log.rb (BasicLog#log): get rid of as ineffectual
+	  condition.
+
+	* lib/webrick/log.rb (BasicLog#format): add "\n" to message.
+
+Thu Sep 18 22:43:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): should push PROT_PCALL tag for orphans.
+
+	* eval.c (proc_invoke): should update "result" for orphans.
+
+Thu Sep 18 20:33:03 2003  Tietew  <tietew-ml-ruby-list@tietew.net>
+
+	* parse.y (str_xquote): do not prepend escapes in
+	  backqoute literals.  [ruby-list:38409]
+
+Thu Sep 18 20:30:17 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb: update document.
+
+Thu Sep 18 15:27:05 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/logger.rb: new file.  Logger, formerly called devel-logger or
+	  Devel::Logger.
+
+	* sample/logger/*: new file.  samples of logger.rb.
+
+Wed Sep 17 23:41:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (localjump_destination): should not raise ThreadError
+	  exception for "break". [ruby-dev:21348]
+
+	* eval.c (proc_invoke): use result instead of prot_tag->retval.
+	  retval is no longer propagated to the ancestors.
+
+Wed Sep 17 20:34:00 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (tokadd_string, parse_string, yylex): escaped terminator
+	  is now interpreted as is.  [ruby-talk:82206]
+
+Wed Sep 17 18:52:36 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/fileassertions.rb: new file.
+
+	* test/fileutils/test_fileutils.rb: new file.
+
+	* test/fileutils/test_nowrite.rb: new file.
+
+Wed Sep 17 18:51:02 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* test/strscan/test_stringscanner.rb: require test/unit.
+
+Wed Sep 17 18:35:34 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* test/strscan/test_stringscanner.rb: new file.
+
+Wed Sep 17 18:03:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl: all files are reviewed to simplify and avoid memory leak.
+
+	* ext/openssl/extconf.rb: add check for assert.h.
+
+	* ext/openssl/ossl.c (ossl_buf2str): new function to convert
+	  C buffer to String and free buffer.
+
+	* ext/openssl/ossl.c (ossl_x509_ary2sk): new function to convert
+	  Array of OpenSSL::X509 to STACK_OF(X509) with exception safe.
+
+	* ext/openssl/ossl.c (ossl_to_der, ossl_to_der_if_possible): new
+	  functions to convert object to DER string.
+
+	* ext/openssl/ossl.h: ditto.
+
+	* ext/openssl/ossl_bio.c (ossl_membio2str): new function to convert
+	  BIO to String object and free BIO.
+
+	* ext/openssl/ossl_bio.h: ditto.
+
+	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_to_der): add for "to_der".
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_to_der): ditto.
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509ext_to_der): ditto.
+
+	* ext/openssl/ossl_x509ext.c (create_ext_from_array): removed
+	  and reimplement in openssl/x509.rb.
+
+	* ext/openssl/ossl_x509attr.c: reimplemented and disable some
+	  method temporarily. this class doesn't work fine without ASN.1
+	  data support;-) I'll rewrite in near future.
+
+	* ext/openssl/lib/openssl/x509.c (X509::Attribute): get rid off
+	  unused code.
+
+	* ext/openssl/lib/openssl/x509.c (X509::ExtensionFactory): refine all.
+
+Tue Sep 16 22:25:06 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/csv/test_csv.rb: add negative tests of row_sep.
+
+Tue Sep 16 18:02:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): should not translate character
+	  class range edge. [ruby-list:38393]
+
+Tue Sep 16 16:47:56 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* MANIFEST: add test/csv/mac.csv.
+
+	* win32/Makefile.sub, bcc32/Makefile.sub (test): add phony NUL target.
+
+Mon Sep 15 19:02:52 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/csv.rb: add extra pamameter to specify row(record) separater
+	  character.  To parse Mac's CR separated CSV, do like this.
+	    CSV.open("mac.csv", "r", ?,, ?\r) { |row| p row.to_a }
+	  The 3rd parameter in this example ?, is for column separater and the
+	  4th ?\r is for row separater.  Row separater is nil by default.  Nil
+	  separater means "\r\n" or "\n".
+
+	* test/csv/test_csv.rb: add tests for above feature.
+
+	* test/csv/mac.csv: added.  Sample CR separated CSV file.
+
+Fri Sep 12 22:41:48 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
+
+	* ext/openssl/ossl.c: move ASN.1 stuff to ossl_asn1.[ch]
+
+	* ext/openssl/ossl.c: move BIO stuff to ossl_bio.[ch]
+
+	* ext/openssl/ossl_asn1.[ch]: new files
+
+	* ext/openssl/ossl_bio.[ch]: new files
+
+Fri Sep 12 12:30:41 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h (rb_disable_super, rb_enable_super): replace with dummy
+	  expressions instead of prototypes.  the functions remain yet for
+	  binary compatibility.  [ruby-talk:81758]
+
+Fri Sep 12 12:09:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_and): convert argument using 'to_int'.
+
+	* bignum.c (rb_big_or): ditto.
+
+	* bignum.c (rb_big_xor): ditto.
+
+Fri Sep 12 07:06:14 2003  David Black  <dblack@superlink.net>
+
+	* lib/scanf.rb: Took out useless @matched_item variable; some small
+	  refactoring.
+
+Thu Sep 11 08:43:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_require): allow "require" on $SAFE>0, if feature
+	  name is not tainted.
+
+	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::stream):
+	  Supports StringIO.
+
+Wed Sep 10 22:47:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl.h: add a workaround for win32 platform.
+	  libeay32.dll doesn't export functions defined in conf_api.h.
+
+	* ext/openssl/ossl_config.c (ossl_config_initialize): ditto.
+
+	* ext/openssl/ossl_config.c (ossl_config_add_value): ditto.
+
+	* ext/openssl/ossl_config.c (set_conf_section_i): should check
+	  if the argument is Array.
+
+Wed Sep 10 22:41:54 2003  Tietew  <tietew@tietew.net>
+
+	* eval.c (win32_get_exception_list): avoid VC7 warning.
+	  [ruby-win32:577]
+
+Tue Sep  9 10:39:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (struct tag): dst should be VALUE.
+
+Tue Sep  9 10:39:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (localjump_destination): stop at the scope where the current
+	  block was created.  [ruby-dev:21353]
+
+Tue Sep  9 05:17:04 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_config.rb: avoid compile error in OpenSSL-0.9.6.
+
+Tue Sep  9 02:41:35 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
+
+	* ext/openssl/ossl_config.c: Refine compatibility.
+
+Tue Sep  9 01:50:45 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpserver.rb (HTTPServer#access_log): add "\n" to
+	  the message.
+
+	* lib/webrick/log.rb (BasicLog#log): add "\n" only if needed.
+
+Mon Sep  8 22:15:33 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/multi-tk.rb: modify security check at creating
+	  a new interpreter
+
+Mon Sep  8 20:00:12 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb, lib/optparse/version.rb: search also all
+	  capital versions.
+
+Mon Sep  8 19:26:33 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl.h: include openssl/conf.h and openssl/conf_api.h.
+
+	* ext/openssl/ossl_config.c: refine all with backward compatibility.
+
+	* ext/openssl/ossl_config.h: export GetConfigPtr() and DupConfigPtr().
+
+	* ext/openssl/ossl_x509.c: added new constants under X509 module.
+	  DEFAULT_CERT_AREA, DEFAULT_CERT_DIR, DEFAULT_CERT_FILE,
+	  DEFAULT_CERT_DIR_ENV, DEFAULT_CERT_FILE_ENV and DEFAULT_PRIVATE_DIR.
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_free): don't free
+	  the members of the struct. it's left to GC.
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509_set_config): add for config=.
+
+	* ext/openssl/ossl_x509ext.c (Xossl_x509extfactory_initialize):
+	  add attr readers: issuer_certificate, subject_certificate,
+	  subject_request, crl and config.
+
+Mon Sep  8 18:26:41 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/accesslog.rb (AccessLog::setup_params): use req.port
+	  instead of config[:Port] or req.request_uri.port.
+
+	* lib/webrick/httprequest.rb (HTTPRequest#meta_vars): ditto.
+
+	* lib/webrick/httpservlet/filehandler.rb (FileHandler#dir_list): ditto.
+
+	* lib/webrick/config.rb: :Listen option never be used.
+
+	* lib/webrick/server.rb (GenericServer#initialize): don't use :Listen
+	  option and add warning message.
+
+	* lib/webrick/log.rb (BasicLog#<<): shortcut of log(INFO, ...).
+
+	* lib/webrick/httpserver.rb (HTTPServer#accesslog): use << for logging.
+
+Sun Sep  7 16:08:28 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (lib_mainloop_core): fixed signal-trap bug
+
+	* ext/tk/lib/*.rb : Ruby/Tk works at $SAFE == 4
+
+Sat Sep  6 02:26:34 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_*.rb: assert_same, assert_match, and so on.
+
+Sat Sep  6 18:45:46 2003  Mauricio Fernandez  <batsman.geo@yahoo.com>
+
+	* parse.y (assignable): call rb_compile_error(), not rb_bug().
+	  [ruby-core:01523]
+
+Sat Sep  6 17:40:41 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ruby_missing.c: rid of unnecessary backward
+	  compatibility stuff. and remove DEFINE_ALLOC_WRAPPER from
+	  all sources.
+
+	* ext/openssl/ossl_x509ext.c (X509::Extension.new): new method.
+
+	* ext/openssl/ossl_x509ext.c (X509::Extension#oid=): new method.
+
+	* ext/openssl/ossl_x509ext.c (X509::Extension#value=): new method.
+
+	* ext/openssl/ossl_x509ext.c (X509::Extension#critical=): new method.
+
+Sat Sep  6 01:23:22 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): need to quote cmd if RUBYSHELL is set.
+
+	* win32/win32.c (CreateChild): fix condition about whether to call
+	  shell or not.
+
+Sat Sep  6 00:36:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* Makefile.in (test): phony target.
+
+	* lib/mkmf.rb (have_library, find_library): configure by library
+	  name.
+
+	* lib/optparse.rb (OptionParser#order, #permute, #parse): allow an
+	  array as argument.
+
+	* test/ruby/test_*.rb: moved invariants to left side in
+	  assert_equal, and use assert_nil, assert_raises and so on.
+
+	* win32/win32.c (isInternalCmd): distinguish command.com and
+	  cmd.exe.
+
+	* win32/win32.c (make_cmdvector): a character just after wildcard
+	  was ignored.  [ruby-core:01518]
+
+Fri Sep  5 20:27:08 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_*.rb: replace 'assert(a == b)' with assert_equal(a, b)'
+
+Fri Sep  5 18:00:51 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/x509.rb: new method X509::Name::parse.
+
+	* ext/openssl/ossl_digest.c: add ossl_digest_new().
+
+	* ext/openssl/ossl_digest.h: ditto.
+
+	* ext/openssl/ossl_cipher.c: add ossl_cipher_new().
+
+	* ext/openssl/ossl_cipher.h: ditto.
+
+Fri Sep  5 15:32:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-font-lock-maybe-here-docs): should not
+	  search delimiter forward if found in backward.
+
+Fri Sep  5 13:32:48 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/runner.rb: arguments should be keys.
+
+Fri Sep  5 12:09:55 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* test/ruby/test_system.rb (test_system): check existence of ruby
+	  interpreter.
+
+Fri Sep  5 11:32:17 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (--version): fix assignment/reference order.
+
+	* lib/optparse.rb (OptionParser#help): new; OptionParser#to_s may
+	  be deprecated in future.
+
+	* lib/optparse/version.rb (OptionParser#show_version): hide Object.
+
+	* test/runner.rb: fix optparse usage.
+
+	* test/runner.rb: glob all testsuits if no tests given.
+
+Fri Sep  5 10:42:58 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/runner.rb: added.  gets testcases from command line and runs it.
+
+	* test/ruby/test_gc.rb: remove useless part which was for dumping test
+	  result.
+
+Fri Sep  5 09:28:59 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby/test_gc.rb: added.  splitter.rb which I made to split
+	  sample/test.rb into test/ruby/test_* kindly removed GC test (the
+	  last section in the original test) to reduce things to be worried.
+
+Fri Sep  5 03:00:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_iterator.rb (test_block_in_arg): add no block
+	  given tests.
+
+	* test/ruby/test_iterator.rb (test_ljump): uncomment LocalJumpError
+	  test.
+
+Fri Sep  5 01:10:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/ruby: tests for ruby itself.
+
+	* test/ruby/test_*.rb: split sample/test.rb into 28 test/unit testcases.
+	  some tests could not be translates...  search '!!' mark to see it.
+
+	* test/csv/test_csv.rb: should require 'csv', not '../lib/csv'.  test
+	  runner should set load path correctly.
+
+Fri Sep  5 01:03:59 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/csv/test_csv.rb: close opened files for CSV::IOBuf explicitly.
+	  opened file cannot be removed under win32 box.
+
+Thu Sep  4 23:59:40 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (tokadd_string): newlines have no special meanings in
+	  %w/%W, otherwise they are ignored only when interpolation is
+	  enabled.  [ruby-dev:21325]
+
+Thu Sep  4 19:38:25 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* ext/io/wait/.cvsignore: added.
+
+	* ext/openssl/.cvsignore: added.
+
+Thu Sep  4 19:28:24 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* sample/openssl: added.  Sample of standard distribution library
+	  should be locate in sample/{module_name}/*.
+
+	* ext/openssl/sample/*: removed.  move to sample/openssl/*.
+
+Thu Sep  4 18:02:15 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/csv/test_csv.rb: use remove_const to reduce warnings.  use
+	  Dir.tmpdir to locate working files.
+
+Thu Sep  4 17:41:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-here-doc-beg-re): underscore also is
+	  valid delimiter.
+
+	* misc/ruby-mode.el (ruby-here-doc-end-match): must quote
+	  arbitrary string to use as regexp.
+
+	* misc/ruby-mode.el (ruby-font-lock-maybe-here-docs): must not
+	  call `ruby-here-doc-end-match' unless `ruby-here-doc-beg-re'
+	  matched.
+
+Thu Sep  4 15:40:07 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test/csv/test_csv.rb: run on test/unit original layer.
+
+Thu Sep  4 12:54:50 2003  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/token.c: headerless documents with root-level spacing now
+	  honored.
+
+Thu Sep  4 00:06:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (mark_frame_adj): need to adjust argv pointer if using
+	  system's alloca. [ruby-core:01503]
+
+Wed Sep  3 21:33:20 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* test: add test directory.  Test::Unit aware testcases and needed
+	  files should be located in this directory.  dir/file name convention;
+	    test/{module_name}/test_{testcase_name}.rb
+	    test/{module_name}/{needed_files}
+	  someday, someone will write testrunner which searches test_*.rb and
+	  run testcases automatically.
+
+	* test/csv/*: add testcase for lib/csv.rb.
+
+Wed Sep  3 01:37:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_gets): should call next_argv() before type check
+	  current_file. [ruby-list:38336]
+
+Tue Sep  2 20:37:15 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): warning
+	  for skipping server verification.
+
+Tue Sep  2 23:36:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): should retrieve retval when pcall is true.
+
+Tue Sep  2 14:09:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/extconf.rb: check s6_addr8 in in6_addr (Tru64 UNIX).
+	  the patch is submitted by nmu <nmu@users.sourceforge.jp>.
+
+	* ext/socket/getaddrinfo.c (getaddrinfo): should use in6_addr8 on
+	  some platforms.
+
+	* ext/socket/getnameinfo.c (getnameinfo): ditto.
+
+Tue Sep  2 14:02:19 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_invoke): fixed bug on passing a exception
+
+	* ext/tk/lib/{tk.rb, tkcanvas.rb, tkfont.rb, tktext.rb} :
+	  bug fix and improvement of font control
+
+Tue Sep  2 09:51:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): should not handle exceptions within rescue
+	  argument.  [ruby-talk:80804]
+
+Tue Sep  2 00:44:37 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_memsearch): fix overrun.  [ruby-talk:80759]
+
+Tue Sep  2 00:41:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/iconv.c (map_charset): use lower case keys.
+
+	* ext/iconv/iconv.c (iconv_fail): just yield error and return the
+	  result if a block is given.
+
+	* ext/iconv/iconv.c (iconv_convert): yield error and append the
+	  result if a block is given.
+
+	* ext/iconv/charset_alias.rb (charset_alias): optional third
+	  argument.
+
+	* ext/iconv/charset_alias.rb (charset_alias): use CP932 instead of
+	  SHIFT_JIS on cygwin.
+
+Mon Sep  1 18:34:25 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): make tail recursion in ELSE clause of
+	  RESCUE a jump.
+
+Mon Sep  1 18:00:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (aref_args): forgot to call NEW_SPLAT(). reported by
+	  Dave Butcher.
+
+	* eval.c (Init_Thread): protect thgroup_default.  suggested by Guy
+	  Decoux in [ruby-talk:80623]
+
+Mon Sep  1 16:59:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_switch): add RESTORE_EXIT; exit by another
+	  thread termination.
+
+	* eval.c (rb_thread_start_0): should not error_print() within
+	  terminated thread, because $stderr used by it might be
+	  overriden now.  [ruby-dev:21280]
+
+Sun Aug 31 22:46:55 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* eval.c (TAG_DST()): take no argument.
+
+	* process.c (p_gid_sw_ensure): return VALUE.
+
+Sun Aug 31 22:27:10 2003  Hidetoshi NAGAI  <nagai@dumbo.ai.kyutech.ac.jp>
+
+	* process.c (p_gid_sw_ensure): lack of function type
+
+Sun Aug 31 12:25:06 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/optparse.rb: --version takes an optional argument; "all" or
+	  a list of package names.
+
+Sun Aug 31 10:17:02 2003  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: yyyy/mm is not an acceptable format.
+
+	* lib/time.rb: follow above.
+
+Sat Aug 30 14:25:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_iter_break): should not call TAG_JUMP directly.
+
+Sat Aug 30 03:58:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (struct BLOCK): remove BLOCKTAG, use scope instead.
+
+	* eval.c (POP_TAG): no longer propagate retval.  retval is now set
+	  directly by localjump_destination().
+
+	* eval.c (localjump_destination): new function to cast
+	  return/break local jump.
+
+	* eval.c (rb_yield_0): stop TAG_RETURN/TAG_BREAK escaping.
+
+Fri Aug 29 22:35:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+
+	* bigdecimal.c *.html: The 2nd arg. for add,sub,mult, and div is 0,
+	  then result will be the same as +,-,*,/ respectively.
+
+Fri Aug 29 17:30:15 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* process.c: bug fix
+
+	* process.c: add rb_secure(2) to methods of Process::{UID,GID,Sys}
+
+	* process.c: deny handling IDs during evaluating the block given to
+	  the Process::{UID,GID}.switch method
+
+	* ext/tcltklib/tcltklib.c : some methods have no effect if on slave-IP
+
+	* ext/tcltklib/tcltklib.c : can create a interpreter without Tk
+
+	* ext/tcltklib/tcltklib.c : bug fix on handling exceptions
+
+	* ext/tcltklib/MANUAL.euc : modify
+
+	* ext/tk/lib/tk.rb : freeze some core modules
+
+	* ext/tk/lib/multi-tk.rb : more secure
+
+	* ext/tk/lib/tk.rb: TkVariable.new(array) --> treat the array as the
+	  Tk's list
+
+	* ext/tk/lib/tk.rb: improve accessibility of TkVariable object
+
+	* ext/tk/lib/tk.rb, ext/tk/lib/tkfont.rb, ext/tk/lib/tkcanvas.rb,
+	  ext/tk/lib/tktext.rb : fix bug of font handling
+
+	* ext/tk/lib/tkfont.rb TkFont.new() accepts compound fonts
+
+Thu Aug 28 22:07:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_autoload_load): call const_missing if autoloading
+	  constant is not defined to allow hook.
+
+	* eval.c (rb_eval): use rb_const_get_from() instead of
+	  rb_const_get_at().
+
+	* eval.c (is_defined): forgot to check NODE_COLON3.
+
+Thu Aug 28 17:30:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_const_get_0): should check constants defined in
+	  included modules, if klass is Object. [ruby-talk:79302]
+
+	* numeric.c (check_uint): check should be done using UINT_MAX, not
+	  INT_MAX. this fix is submitted by Lyle Johnson
+	  <lyle@knology.net> in [ruby-core:01486]
+
+Thu Aug 28 05:02:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (singleton): typo fixed (ruby-bugs-ja:PR#562)
+
+Thu Aug 28 02:37:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): *a = [1,2] now assigns [[1,2]] to a.
+	  consistent with *a = [1], which set [[1]] to a.
+
+	* node.h: merge NODE_RESTARY to NODE_SPLAT.
+
+	* parse.y: rules simplified a bit by removing NODE_RESTARY.
+
+	* sample/test.rb: updated for new assignment behavior.
+
+Wed Aug 27 22:33:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_bug): should not use other methods; this function is
+	  not for ordinary use.  [ruby-dev:21259]
+
+Wed Aug 27 15:07:57 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb (check_response): AUTH CRAM-MD5 returns 334
+	  response. [ruby-list:38279]
+
+Wed Aug 27 05:10:15 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (map_errno): support winsock error.
+
+	* win32/win32.c (pipe_exec, CreateChild, poll_child_status, waitpid,
+	  kill, link, rb_w32_rename, unixtime_to_filetime, rb_w32_utime):
+	  pass errno to map_errno().
+
+	* win32/win32.c (rb_w32_select, rb_w32_accept, rb_w32_bind,
+	  rb_w32_connect, rb_w32_getpeername, rb_w32_getsockname,
+	  rb_w32_getsockopt, rb_w32_ioctlsocket, rb_w32_listen, rb_w32_recv,
+	  rb_w32_recvfrom, rb_w32_send, rb_w32_sendto, rb_w32_setsockopt,
+	  rb_w32_shutdown, rb_w32_socket, rb_w32_gethostbyaddr,
+	  rb_w32_gethostbyname, rb_w32_gethostname, rb_w32_getprotobyname,
+	  rb_w32_getprotobynumber, rb_w32_getservbyname, rb_w32_getservbyport,
+	  rb_w32_fclose, rb_w32_close): use map_errno().
+
+	* win32/win32.h: add winsock errors.
+
+Tue Aug 26 23:53:23 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/ostruct.rb (OpenStruct::method_missing): prohibit modifying
+	  frozen OpenStruct. [ruby-talk:80214]
+
+Tue Aug 26 20:03:50 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_tmpsrc): add the hook for source.
+	  [ruby-list:38122]
+
+Tue Aug 26 15:59:53 2003  why the lucky stiff  <why@ruby-lang.org>
+
+	* implicit.c (syck_type_id_to_taguri): corrected detection of
+	  x-private types.
+
+Sun Aug 24 01:02:48 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): performance improvement.
+	  [ruby-talk:79748]
+
+Sat Aug 23 23:41:16 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_file_s_expand_path): avoid calling rb_scan_args() for
+	  apparent cases. [ruby-talk:79748]
+
+Sat Aug 23 18:56:53 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/nkf/nkf.c (rb_nkf_putchar): should use rb_str_resize() to just
+	  resize a string, rb_str_cat() disallows NULL.  [ruby-dev:21237]
+
+Sat Aug 23 16:48:41 2003  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ruby-lex.rb: bug fix for "foo" !~ /bar/. [ruby-talk:79942]
+
+Sat Aug 23 15:59:58 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval, rb_iterate, block_pass): reduce PUSH/POP_TAG and
+	  EXEC_TAG() for retry.  [ruby-dev:21216]
+
+Sat Aug 23 02:32:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_splat): should check if "values" is array.
+
+	* enum.c (each_with_index_i): typo.
+
+Fri Aug 22 17:07:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (inject_i): use rb_yield_values.
+
+	* enum.c (each_with_index_i): ditto.
+
+	* eval.c (rb_yield_splat): new function to call "yield *values".
+
+	* string.c (rb_str_scan): use rb_yield_splat().
+
+Fri Aug 22 06:13:22 2003  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/rubyext.c: refactoring of the transfer method
+	  dispatch.  added yaml_org_handler for faster dispatch of
+	  transfers to base types.
+
+	* lib/yaml/rubytypes.rb: removed handling of builtins from
+	  Ruby library.
+
+	* ext/syck/token.c: quoted and block scalars are now implicit !str
+
+	* ext/syck/implicit.c: empty string detected as !null.
+
+Fri Aug 22 01:00:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (block_pass): improve passing current block.
+
+Fri Aug 22 00:13:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c: Int. overflow bug in multiplication
+	  fixed, and VpNmlz() speed up.
+
+Wed Aug 20 16:44:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_connect): many systems seem to have
+	  a problem in select() after EINPROGRESS.  [ruby-list:38080]
+
+Wed Aug 20 01:31:17 2003  why the lucky stiff  <why@ruby-lang.org>
+
+	* ext/syck/syck.h: Parser definition problems on HP-UX.
+	  [ruby-talk:79389]
+
+	* ext/syck/handler.c (syck_hdlr_get_anchor): Memory leak.
+
+	* ext/syck/syck.s (syck_io_file_read): Bad arguments to fread.
+
+	* ext/syck/rubyext.c: Tainting issues.
+
+Tue Aug 19 23:20:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c .h .html: to_s("+") implemented.
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb: E implemented.
+
+Tue Aug 19 07:47:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/ssl.rb: new file; SSL/TLS enhancement for GenericServer.
+
+	* lib/webrick/https.rb: SSLSocket handling is moved to webrick/ssl.rb.
+
+	* lib/webrick/compat.rb (File::fnmatch): remove old migration code.
+
+	* lib/webrick/httpserver.rb (HTTPServer#run): ditto.
+
+	* lib/webrick/server.rb (GenericServer#listen): the body of this
+	  method is pull out as Utils::create_lisnteners.
+
+	* lib/webrick/utils.rb (Utils::create_lisnteners): new method.
+
+	* lib/webrick/server.rb (GenericServer#start): should rescue
+	  unknown errors. and refine comments.
+
+	* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): should close
+	  socket if SSLSocket raises error.
+
+Tue Aug 19 11:19:33 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* io.c (next_argv): should not call GetOpenFile() if rb_stdout is
+	  not a IO (T_FILE).
+
+Tue Aug 19 07:47:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c: sync_close is moved to SSLSocket as
+	  a builtin.
+
+	* ext/openssl/lib/openssl/buffering.rb (Buffering#close): ditto.
+
+	* ext/openssl/lib/openssl/buffering.rb (Buffering#puts): should
+	  add a return to the tails of each line.
+
+	* ext/openssl/lib/openssl/ssl.rb: new class OpenSSL::SSL::SSLServer.
+
+	* ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): use sync_close.
+
+	* ext/openssl/sample/echo_svr.rb: use SSLServer.
+
+	* ext/openssl/sample/echo_cli.rb: add example of SSLSocket#sync_close.
+
+Tue Aug 19 01:24:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): Mac OS X standard
+	  headers are inconsistent at this macro.  [ruby-core:01432]
+
+	* ext/curses/extconf.rb: check if _XOPEN_SOURCE_EXTENDED breaks.
+
+	* ext/tcltklib/stubs.c: Status macro in X11/Xthreads.h bothers
+	  winspool.h
+
+	* instruby.rb: make list at first instead of iterator.
+	  [ruby-talk:79347]
+
+Mon Aug 18 11:23:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): preserve raw order for **.
+
+Sun Aug 17 23:39:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/extconf.rb (HAVE_VA_ARGS_MACRO): need to compile.
+
+Sun Aug 17 17:10:03 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (SSLSocket#sync_close=): add a
+	  method to specify if the underlying IO will be closed in
+	  SSLSocket#close.
+
+	* ext/openssl/lib/openssl/buffering.rb: add forwarders to
+	  setsockopt, getsockopt and fcntl.
+
+	* ext/openssl/lib/net/protocols.rb: enable sync for SSLSocket.
+
+Sun Aug 17 11:32:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): should not force to remake Makefile when
+	  installation and so on.
+
+Sat Aug 16 23:58:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_symbol, w_object): get rid of warnings.
+
+	* re.c (rb_memsearch): ditto.
+
+	* time.c (time_dump): ditto.
+
+	* ext/extmk.rb (extmake): not continue making when extconf.rb
+	  failed.
+
+	* ext/openssl/extconf.rb: check __VA_ARGS__ macro more precisely.
+
+	* ext/openssl/ossl.h: remove version.h dependency.
+
+	* ext/openssl/ruby_missing.h: ditto.
+
+	* lib/mkmf.rb (pkg_config): use --libs output except with
+	  only-L for other options.  [ruby-list:38099]
+
+	* lib/mkmf.rb (create_makefile): separate rule for static
+	  library from shared object.
+
+	* win32/Makefile.sub, bcc32/Makefile.sub, wince/Makefile.sub:
+	  define exec_prefix and libdir.
+
+Fri Aug 15 23:15:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c .h: Bug in combination of limit & div
+	  method fixed.
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb: atan() & sqrt() added.
+
+Fri Aug 15 12:01:43 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (HUGE_ST_INO): check whether struct stat.st_ino
+	  is larger than long.  [ruby-dev:21194]
+	  http://www.geocities.co.jp/SiliconValley-PaloAlto/1409/ruby/beos.html
+
+	* error.c (syserr_eqq): errno might exceed Fixnum limit.
+
+	* error.c (Init_Exception): moved base initialization from
+	  init_syserr().
+
+	* inits.c (rb_call_inits): postpone initializing errnos until
+	  Bignum is available.
+
+Fri Aug 15 12:01:43 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): needed to let
+	  keyname() and so on be declared.
+
+	* ext/curses/curses.c (curses_resizeterm, window_resize):
+	  arguments conflicted with macros in term.h.
+
+	* ext/curses/curses.c (Curses module methods): ensure
+	  initialized.  [ruby-dev:21191]
+
+Fri Aug 15 02:08:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (id2ref): recycle check should be done by klass == 0.
+	  [ruby-core:01408]
+
+Fri Aug 15 01:34:23 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
+
+	* ext/openssl/ossl_pkey.c: move generate_cb here
+
+	* ext/openssl/ossl_pkey_{dh|dsa|rsa}.c: adapt to this cb
+
+	* ext/openssl/openssl_missing.[ch]: add (0.9.6x, x<j) missing BN funcs
+
+	* ext/openssl/ossl_bn.c: use supplied funcs from openssl_missing.c
+
+Fri Aug 15 00:38:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c: Bug in div method fixed.
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb: Newly added.
+
+	* ext/bigdecimal/sample/pi.rb: Changed so as to use math.rb.
+
+Thu Aug 14 21:19:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (Init_Thread): Continuation#[] added.  [ruby-talk:79028]
+
+Thu Aug 14 20:03:34 2003  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (OLE_FREE): should not call
+	  ole_message_loop.
+
+	* ext/win32ole/win32ole.c (ole_event_free): ditto.
+
+	* ext/win32ole/win32ole.c (ole_initialize): stop calling
+	  OleUninitialize at exit.
+
+Thu Aug 14 11:27:37 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c (rb_data_object_alloc): check type of 1st argument.
+	  [ruby-dev:21192]
+
+Thu Aug 14 00:21:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (mlhs_node): should allow "::Foo" (colon3) as lhs.
+
+	* parse.y (lhs): ditto.
+
+	* parse.y (yylex): should return tCOLON3 right after kCLASS.
+	  [ruby-talk:78918]
+
+	* error.c (exc_initialize): was converting argument to string too
+	  eagerly.  Only check was needed. [ruby-talk:78958]
+
+Wed Aug 13 23:31:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c .h .html: Ambiguity of
+	  BigDecimal::limit removed.
+
+Wed Aug 13 19:21:34 2003  Christian Neukirchen  <chneukirchen@yahoo.de>
+
+	* lib/webrick/https.rb (HTTPServer#run): should set syncing-mode
+	  to SSLSocket. [ruby-talk:78919]
+
+Wed Aug 13 18:13:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (POP_BLOCK): turn on BLOCK_LEFT flag when leaving block.
+
+	* eval.c (proc_invoke): unpack return/break destination when block
+	  is already left.
+
+Wed Aug 13 15:58:31 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* object.c (rb_class_s_alloc): add function prototype to avoid VC++
+	  warning.
+
+Wed Aug 13 13:50:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/Win32API/Win32API.c (Win32API_initialize): should pass some
+	  class to first argument of Data_Wrap_Struct(). (ruby-bugs:PR#1109)
+
+Tue Aug 12 16:55:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in: static link libraries to LIBRUBY_SO with static linked
+	  ext.  [ruby-dev:21157]
+
+	* ext/extmk.rb (extmake): sort extension library initialization order.
+
+	* ext/extmk.rb (extmake): compact $extlibs.
+
+Tue Aug 12 02:48:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (THREAD_SAVE_CONTEXT): should explicitly turn off the
+	  flag before calling getcontext(2).
+
+	* eval.c (struct thread): add member to save backing store on
+	  IA64. (ruby-bugs PR1086)
+
+	* eval.c (thread_mark): mark IA64 backing store region.
+
+	* eval.c (thread_free): free saved IA64 backing store.
+
+	* eval.c (rb_thread_save_context): save IA64 backing store as well.
+
+	* eval.c (rb_thread_restore_context): restore IA64 backing store.
+
+	* eval.c (THREAD_ALLOC): initialize IA64 members.
+
+Mon Aug 11 22:31:50 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/debug.rb(debug_command): inspection command should inspect
+	  resulting value even if it's nil.  [ruby-dev:21180] by OMAE, jun
+	  <jun66j5@ybb.ne.jp>.
+
+	* lib/debug.rb(debug_command): incomplete regexp.
+
+Mon Aug 11 17:33:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call_super): do not use rb_block_given_p() for
+	  check. [ruby-talk:78656]
+
+	* eval.c (BEGIN_CALLARGS): push ITER_NOT only when ITER_PRE.
+
+Sun Aug 10 10:43:05 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/openssl/buffering.rb: increase BLOCK_SIZE
+	  from 1k to 16k bytes. [ruby-talk:78603]
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): enable
+	  partial write to allow interruption in SSLSocket#write.
+
+Sun Aug 10 00:34:16 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* cygwin/GNUmakefile: remove unnecessary '--drive-name=$(CC)'
+	  for ccache.
+
+Sat Aug  9 10:36:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): do not dump generic instance variable when
+	  marshal_dump is defined.
+
+Sat Aug  9 00:35:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+
+	* ext/bigdecimal.c: F style output(like 1234.56789) implemented
+	  to to_s method.
+	* ext/bigdecimal_??.html: F style output(like 1234.56789)
+	  implemented to to_s method.
+
+Fri Aug  8 12:33:17 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* bcc32/Makefile.sub: rubyw.exe should be a Windows GUI program.
+	  add the -aa option to WLDFLAGS.
+
+Fri Aug  8 11:29:26 2003  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* marshal.c (w_object): should set `c_arg' at first.
+
+Fri Aug  8 03:22:28 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httputils.rb (FormData#list): should not take
+	  a side effect for the receiver.
+
+Thu Aug  7 14:40:37 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* cygwin/GNUmakefile: better --disbale-shared option support.
+
+	* cygwin/GNUmakefile: add forwarding DLL target for cygwin.
+
+Thu Aug  7 14:21:05 2003  Corinna Vinschen  <vinschen@redhat.com>
+
+	* configure.in: Fix Cygwin specific naming of libraries to
+	  be net distribution compliant. (ruby-bugs:PR#1077)
+	  cygwin-ruby18.dll -> cygruby18.dll
+
+Thu Aug  7 12:51:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_at_exit): should not be called without a block.
+	  block_given check added.
+
+Thu Aug  7 06:46:06 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): forgot to pop ruby_class.
+
+	* eval.c (rb_call0): update ruby_class as well as ruby_cref.
+	  (ruby-bugs-ja:PR#540)
+
+Thu Aug  7 04:52:50 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): remove ruby_frame->cbase and unify to
+	  ruby_cref.  [ruby-talk:78141]
+
+Thu Aug  7 04:19:15 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* gc.c: FreeBSD/ia64's mcontext_t is a bit different from that of
+	  Linux/ia64.  This makes gc.c compile but miniruby coredumps for
+	  the moment.
+
+Thu Aug  7 00:15:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+
+	* ext/bigdecimal.c: Comparison results adjusted to Float's.
+	* ext/bigdecimal.c: Use rb_num_coerce_????(x,y) instead of own.
+
+Wed Aug  6 22:58:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/testcase.rb: Added equality checking.
+	* lib/test/unit/testsuite.rb: Added equality checking.
+	* lib/test/unit/assertions.rb: Fixed a warning.
+
+Wed Aug  6 17:28:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): pass LIBPATH to make ruby.  [ruby-dev:21137]
+
+	* ext/extmk.rb (extmake): set library name as source file name in
+	  Init_ext().  [ruby-dev:21137]
+
+	* lib/mkmf.rb (Logging::postpone): postpone logging messages after
+	  heading message as the result of the block.
+
+	* lib/mkmf.rb (macro_defined?): append newline to src unless ended
+	  with it.
+
+	* lib/mkmf.rb (have_library): treat nil function name as "main".
+	  (ruby-bugs:PR#1083)
+
+	* lib/mkmf.rb (pkg_config): should append additional libraries to
+	  $libs but not $LIBS.  [ruby-dev:21137]
+
+	* ext/io/wait/extconf.rb: check DOSISH macro instead of platform.
+
+	* ext/digest/sha1/extconf.rb: have_library already appends library
+	  name.
+
+Wed Aug  6 17:23:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c: initialize /* OK */ variables by Qnil to stop warnings.
+
+Wed Aug  6 04:58:32 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/Setup*: add io/wait and openssl.
+
+Wed Aug  6 01:13:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_autoload): use ruby_cbase instead of ruby_class.
+
+	* eval.c (rb_f_autoload_p): ditto.
+
+	* class.c (rb_mod_init_copy): no longer implements independent
+	  clone and dup methods.  override "initialize_copy" instead.
+	  [ruby-core:01352]
+
+	* object.c (rb_class_s_alloc): define Class allocation function.
+	  this makes Classes to follow clone framework that uses
+	  initialize_copy.
+
+	* object.c (rb_class_initialize): separate instantiation and
+	  initialization.
+
+	* object.c (rb_obj_alloc): prohibit instantiation from
+	  uninitialized class.
+
+	* object.c (rb_class_superclass): check uninitialized class.
+
+	* array.c (rb_ary_fill): wrong index processing with block.  this
+	  fix was done by Koji Arai <JCA02266@nifty.ne.jp> [ruby-list:38029]
+
+	* marshal.c (w_object): should preserve generic ivar for nil,
+	  true, false, symbols, and fixnums.
+
+	* marshal.c (w_uclass): base_klass check should be done after
+	  rb_class_real().
+
+Wed Aug  6 01:18:50 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: update document.
+
+	* lib/net/pop.rb: ditto.
+
+	* lib/net/protocol.rb: ditto.
+
+Wed Aug  6 00:48:37 2003  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* marshal.c (w_object): should recommend marshal_dump rather than
+	  _dump_data.
+
+Tue Aug  5 17:58:57 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/fileutils.rb (install): should preserve timestamp only.
+
+Tue Aug  5 17:31:59 2003  Ian Macdonald  <ian@caliban.org>
+
+	* lib/shell/command-processor.rb (Shell::CommandProcessor::rmdir):
+	  simple typo.
+
+Tue Aug  5 15:47:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_load): should preserve current source file/line.
+
+Tue Aug  5 10:04:42 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_new4): ptr may refer null_str.
+
+Mon Aug  4 17:25:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* stable version 1.8.0 released.
+
+For the changes before 1.8.0, see doc/ChangeLog-1.8.0
+
+Local variables:
+add-log-time-format: (lambda ()
+  (let* ((time (current-time))
+	 (diff (+ (cadr time) 32400))
+	 (lo (% diff 65536))
+	 (hi  (+ (car time) (/ diff 65536))))
+  (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
+indent-tabs-mode: t
+tab-width: 8
+end:
diff --git a/ruby_1_8_6/GPL b/ruby_1_8_6/GPL
new file mode 100644
index 0000000000..5b6e7c66c2
--- /dev/null
+++ b/ruby_1_8_6/GPL
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/ruby_1_8_6/LEGAL b/ruby_1_8_6/LEGAL
new file mode 100644
index 0000000000..908eb270f5
--- /dev/null
+++ b/ruby_1_8_6/LEGAL
@@ -0,0 +1,370 @@
+LEGAL NOTICE INFORMATION
+------------------------
+
+All the files in this distribution are covered under either the Ruby's
+license (see the file COPYING) or public-domain except some files
+mentioned below.
+
+regex.[ch]:
+
+  These files are under LGPL.  Treat them as LGPL says. (See the file
+  LGPL for details)
+
+    Extended regular expression matching and search library.
+    Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+
+    The GNU C Library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    The GNU C Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with the GNU C Library; see the file LGPL.  If not,
+    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.  */
+
+    Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
+    Last change: May 21, 1993 by t^2
+    removed gapped buffer support, multiple syntax support by matz <matz@nts.co.jp>
+    Perl5 extension added by matz <matz@caelum.co.jp>
+    UTF-8 extension added Jan 16 1999 by Yoshida Masato  <yoshidam@tau.bekkoame.ne.jp>
+
+configure:
+
+  This file is free software.
+
+    Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+
+    This configure script is free software; the Free Software Foundation
+    gives unlimited permission to copy, distribute and modify it.
+
+config.guess:
+config.sub:
+parse.c:
+
+  As long as you distribute these files with the file configure, they
+  are covered under the Ruby's license.
+
+      Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+      Free Software Foundation, Inc.
+
+    This file is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+    As a special exception to the GNU General Public License, if you
+    distribute this file as part of a program that contains a
+    configuration script generated by Autoconf, you may include it under
+    the same distribution terms that you use for the rest of that program.
+
+util.c (partly):
+win32/win32.[ch]:
+
+  You can apply the Artistic License to these files. (or GPL,
+  alternatively)
+
+    Copyright (c) 1993, Intergraph Corporation
+
+    You may distribute under the terms of either the GNU General Public
+    License or the Artistic License, as specified in the perl README file.
+
+random.c
+
+  This file is under the new-style BSD license.
+
+    A C-program for MT19937, with initialization improved 2002/2/10.
+    Coded by Takuji Nishimura and Makoto Matsumoto.
+    This is a faster version by taking Shawn Cokus's optimization,
+    Matthe Bellew's simplification, Isaku Wada's real version.
+
+    Before using, initialize the state by using init_genrand(seed) 
+    or init_by_array(init_key, key_length).
+
+    Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+    All rights reserved.                          
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+      1. Redistributions of source code must retain the above copyright
+	 notice, this list of conditions and the following disclaimer.
+
+      2. Redistributions in binary form must reproduce the above copyright
+	 notice, this list of conditions and the following disclaimer in the
+	 documentation and/or other materials provided with the distribution.
+
+      3. The names of its contributors may not be used to endorse or promote 
+	 products derived from this software without specific prior written 
+	 permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+    Any feedback is very welcome.
+    http://www.math.keio.ac.jp/matumoto/emt.html
+    email: matumoto@math.keio.ac.jp
+
+st.[ch]:
+x68/*:
+missing/alloca.c:
+missing/dup2.c:
+missing/finite.c:
+missing/hypot.c:
+missing/isinf.c:
+missing/isnan.c:
+missing/memcmp.c:
+missing/memmove.c:
+missing/strcasecmp.c:
+missing/strchr.c:
+missing/streror.c:
+missing/strftime.c:
+missing/strncasecmp.c:
+missing/strstr.c:
+missing/strtol.c:
+ext/digest/sha1/sha1.[ch]:
+
+  These files are all under public domain.
+
+missing/strtod.c:
+
+  This file will not be used on most platforms depending on how the
+  configure script results.  In any case you must not receive any fee
+  with the file itself.
+
+    Copyright (c) 1988-1993 The Regents of the University of California.
+    Copyright (c) 1994 Sun Microsystems, Inc.
+
+    Permission to use, copy, modify, and distribute this
+    software and its documentation for any purpose and without
+    fee is hereby granted, provided that the above copyright
+    notice appear in all copies.  The University of California
+    makes no representations about the suitability of this
+    software for any purpose.  It is provided "as is" without
+    express or implied warranty.
+
+missing/strtoul.c:
+
+  This file will not be used on most platforms depending on how the
+  configure script results.  In any case you must not receive any fee
+  with the file itself.
+
+    Copyright 1988 Regents of the University of California
+
+    Permission to use, copy, modify, and distribute this
+    software and its documentation for any purpose and without
+    fee is hereby granted, provided that the above copyright
+    notice appear in all copies.  The University of California
+    makes no representations about the suitability of this
+    software for any purpose.  It is provided "as is" without
+    express or implied warranty.
+
+missing/erf.c:
+missing/crypt.c:
+missing/vsnprintf.c:
+
+  This file is under the old-style BSD license.  Note that the
+  paragraph 3 below is now null and void.
+
+    Copyright (c) 1990, 1993
+         The Regents of the University of California.  All rights reserved.
+
+    This code is derived from software contributed to Berkeley by
+    Chris Torek.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of the University nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+    IMPORTANT NOTE:
+    --------------
+    From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+    paragraph 3 above is now null and void.
+
+ext/digest/md5/md5.[ch]:
+
+  These files are under the following license.  Ruby uses modified
+  versions of them.
+
+    Copyright (C) 1999, 2000 Aladdin Enterprises.  All rights reserved.
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+       claim that you wrote the original software. If you use this software
+       in a product, an acknowledgment in the product documentation would be
+       appreciated but is not required.
+    2. Altered source versions must be plainly marked as such, and must not be
+       misrepresented as being the original software.
+    3. This notice may not be removed or altered from any source distribution.
+
+    L. Peter Deutsch
+    ghost@aladdin.com
+
+ext/digest/rmd160/rmd160.[ch]:
+
+  These files have the following copyright information, and by the
+  author we are allowed to use it under the new-style BSD license.
+
+    AUTHOR:   Antoon Bosselaers, ESAT-COSIC
+              (Arranged for libc by Todd C. Miller)
+    DATE:     1 March 1996
+
+    Copyright (c) Katholieke Universiteit Leuven
+    1996, All Rights Reserved
+
+ext/digest/rmd160/rmd160hl.c:
+ext/digest/sha1/sha1hl.c:
+
+  These files are under the beer-ware license.
+
+    "THE BEER-WARE LICENSE" (Revision 42):
+    <phk@login.dkuug.dk> wrote this file.  As long as you retain this notice you
+    can do whatever you want with this stuff. If we meet some day, and you think
+    this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
+
+ext/digest/sha2/sha2.[ch]:
+ext/digest/sha2/sha2hl.c:
+
+  These files are under the new-style BSD license.
+
+    Copyright 2000 Aaron D. Gifford.  All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of the copyright holder nor the names of contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+ext/nkf/nkf-utf8/config.h:
+ext/nkf/nkf-utf8/nkf.c:
+ext/nkf/nkf-utf8/utf8tbl.c:
+
+  These files are under the following license.  So to speak, it is
+  copyrighted semi-public-domain software.
+
+    Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
+       Everyone is permitted to do anything on this program 
+       including copying, modifying, improving,
+       as long as you don't try to pretend that you wrote it.
+       i.e., the above copyright notice has to appear in all copies.
+       Binary distribution requires original version messages.
+       You don't have to ask before copying, redistribution or publishing.
+       THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
+
+ext/socket/addrinfo.h:
+ext/socket/getaddrinfo.c:
+ext/socket/getnameinfo.c:
+
+  These files are under the new-style BSD license.
+
+    Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of the project nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+ext/win32ole/win32ole.c:
+
+  You can apply the Artistic License to this file. (or GPL,
+  alternatively)
+
+    (c) 1995 Microsoft Corporation. All rights reserved.
+    Developed by ActiveWare Internet Corp., http://www.ActiveWare.com
+
+    Other modifications Copyright (c) 1997, 1998 by Gurusamy Sarathy
+    <gsar@umich.edu> and Jan Dubois <jan.dubois@ibm.net>
+ 
+    You may distribute under the terms of either the GNU General Public
+    License or the Artistic License, as specified in the README file
+    of the Perl distribution.
diff --git a/ruby_1_8_6/LGPL b/ruby_1_8_6/LGPL
new file mode 100644
index 0000000000..b1e3f5a263
--- /dev/null
+++ b/ruby_1_8_6/LGPL
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/ruby_1_8_6/Makefile.in b/ruby_1_8_6/Makefile.in
new file mode 100644
index 0000000000..1e372885b7
--- /dev/null
+++ b/ruby_1_8_6/Makefile.in
@@ -0,0 +1,180 @@
+SHELL = /bin/sh
+NULLCMD = :
+
+#### Start of system configuration section. ####
+
+srcdir = @srcdir@
+VPATH = $(srcdir):$(srcdir)/missing
+
+CC = @CC@
+YACC = @YACC@
+PURIFY =
+AUTOCONF = autoconf
+@SET_MAKE@
+MKFILES = @MAKEFILES@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+sbindir = @sbindir@
+libdir = @libdir@
+libexecdir = @libexecdir@
+datarootdir = @datarootdir@
+datadir = @datadir@
+arch = @arch@
+sitearch = @sitearch@
+sitedir = @sitedir@
+
+TESTUI = console
+TESTS =
+RDOCTARGET = @RDOCTARGET@
+
+EXTOUT = @EXTOUT@
+RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
+
+empty =
+OUTFLAG = @OUTFLAG@$(empty)
+CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@
+CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
+LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
+EXTLDFLAGS = 
+XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
+EXTLIBS = 
+LIBS = @LIBS@ $(EXTLIBS)
+MISSING = @LIBOBJS@ @ALLOCA@
+LDSHARED = @LIBRUBY_LDSHARED@
+DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
+SOLIBS = @SOLIBS@
+MAINLIBS = @MAINLIBS@
+MINIOBJS = @MINIOBJS@
+
+RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
+RUBY_SO_NAME=@RUBY_SO_NAME@
+EXEEXT = @EXEEXT@
+PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
+RUBY = $(RUBY_INSTALL_NAME)
+MINIRUBY = @MINIRUBY@ $(MINIRUBYOPT)
+RUNRUBY = @RUNRUBY@
+
+#### End of system configuration section. ####
+
+MAJOR=	@MAJOR@
+MINOR=	@MINOR@
+TEENY=	@TEENY@
+
+LIBRUBY_A     = @LIBRUBY_A@
+LIBRUBY_SO    = @LIBRUBY_SO@
+LIBRUBY_ALIASES= @LIBRUBY_ALIASES@
+LIBRUBY	      = @LIBRUBY@
+LIBRUBYARG    = @LIBRUBYARG@
+LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
+LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
+
+PREP          = @PREP@
+ARCHFILE      = @ARCHFILE@
+SETUP         =
+EXTSTATIC     = @EXTSTATIC@
+
+RM            = rm -f
+NM            = @NM@
+AR            = @AR@
+ARFLAGS       = rcu
+RANLIB        = @RANLIB@
+AS            = @AS@
+ASFLAGS       = @ASFLAGS@
+
+OBJEXT        = @OBJEXT@
+MANTYPE	      = @MANTYPE@
+
+INSTALLED_LIST= .installed.list
+#### End of variables
+
+all:
+
+.DEFAULT: all
+
+# Prevent GNU make v3 from overflowing arg limit on SysV.
+.NOEXPORT:
+
+miniruby$(EXEEXT):
+		@$(RM) $@
+		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
+
+$(PROGRAM):
+		@$(RM) $@
+		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
+
+# We must `rm' the library each time this rule is invoked because "updating" a
+# MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
+# supported.
+$(LIBRUBY_A):
+		@$(RM) $@
+		$(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT)
+		@-$(RANLIB) $@ 2> /dev/null || true
+
+$(LIBRUBY_SO):
+		@-$(PRE_LIBRUBY_UPDATE)
+		$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
+		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
+						  File.symlink "$(LIBRUBY_SO)", link}' \
+				$(LIBRUBY_ALIASES) || true
+
+fake.rb:	Makefile
+		@echo ' \
+		class Object; \
+		  CROSS_COMPILING = RUBY_PLATFORM; \
+		  remove_const :RUBY_PLATFORM; \
+		  remove_const :RUBY_VERSION; \
+		  RUBY_PLATFORM = "@arch@"; \
+		  RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"; \
+		end; \
+		if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
+		  class File; \
+		    remove_const :ALT_SEPARATOR; \
+		    ALT_SEPARATOR = "\\"; \
+		  end; \
+		end; \
+		' > $@
+
+Makefile:	$(srcdir)/Makefile.in
+
+$(MKFILES): config.status $(srcdir)/common.mk
+		MAKE=$(MAKE) $(SHELL) ./config.status
+		@{ \
+		    echo "all:; -@rm -f conftest.mk"; \
+		    echo "conftest.mk: .force; @echo AUTO_REMAKE"; \
+		    echo ".force:"; \
+		} > conftest.mk || exit 1; \
+		$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
+		{ echo "Makefile updated, restart."; exit 1; }
+
+config.status:	$(srcdir)/configure
+		MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck
+
+$(srcdir)/configure: $(srcdir)/configure.in
+		cd $(srcdir) && $(AUTOCONF)
+
+lex.c: keywords
+	@-$(RM) $@
+	gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@ || \
+	cp "$(srcdir)/$@" .
+
+.y.c:
+	$(YACC) $<
+	sed '/^#/s|y\.tab\.c|$@|' y.tab.c > $@
+	rm -f y.tab.c
+
+.c.@OBJEXT@:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
+.s.@OBJEXT@:
+	$(AS) $(ASFLAGS) -o $@ $<
+
+clean-local::
+	@$(RM) ext/extinit.c ext/extinit.$(OBJEXT)
+
+distclean-local::
+	@$(RM) ext/config.cache $(RBCONFIG)
+
+ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c
diff --git a/ruby_1_8_6/NEWS b/ruby_1_8_6/NEWS
new file mode 100644
index 0000000000..de1dafb533
--- /dev/null
+++ b/ruby_1_8_6/NEWS
@@ -0,0 +1,115 @@
+= NEWS
+
+This document is a list of user visible feature changes made between
+releases excluding bug fixes.
+
+Note that each entry is kept so brief that no reason behind or
+reference information is supplied with.  For a full list of changes
+with all sufficient information, see the ChangeLog file.
+
+== Changes with Ruby 1.8.5
+
+=== New platforms/build tools support
+
+* IA64 HP-UX
+
+* Visual C++ 8 SP1
+
+* autoconf 2.6x
+
+=== Library updates (outstanding ones only)
+
+* date
+
+  * Updated based on date2 4.0.3.
+
+* digest
+
+  * New internal APIs for C and Ruby.
+
+  * Support for autoloading.
+
+  * See below for new features and compatibility issues.
+
+* nkf
+
+  * Updated based on nkf as of 2007-01-28.
+
+* tk
+
+  * Tk::X_Scrollable (Y_Scrollable) is renamed to Tk::XScrollable
+    (YScrollable). Tk::X_Scrollable (Y_Scrollable) is still available,
+    but it is an alias name.
+
+  * Updated Tile extension support based on Tile 0.7.8.
+
+  * Support --without-X11 configure option for non-X11 versions of
+    Tcl/Tk (e.g. Tcl/Tk Aqua).
+
+  * New sample script: irbtkw.rbw -- IRB on Ruby/Tk. It has no trouble
+    about STDIN blocking on Windows.
+
+=== New methods and features
+
+* builtin classes
+
+  * New method: Kernel#instance_variable_defined?
+
+  * New method: Module#class_variable_defined?
+
+  * New feature: Dir::glob() can now take an array of glob patterns.
+
+* digest
+
+  * New digest class methods: file
+
+  * New digest instance methods: clone, reset, new,
+    inspect, digest_length (alias size or length),
+    block_length()
+
+  * New library: digest/bubblebabble
+
+  * New function: Digest(name)
+
+* fileutils
+
+  * New option for FileUtils.cp_r(): :remove_destination
+
+* thread
+
+  * Replaced with much faster mutex implementation in C.
+    The former implementation is available with a
+    configure option `--disable-fastthread'.
+
+* webrick
+
+  * New method: WEBrick::Cookie.parse_set_cookies()
+
+=== Compatibility issues (excluding feature bug fixes)
+
+* builtin classes
+
+  * String#intern now raises SecurityError when $SAFE level is greater
+    than zero.
+
+* fileutils
+
+  * A minor implementation change breaks Rake <=0.7.1.
+    Updating Rake to 0.7.2 fixes the problem.
+
+* digest
+
+  * The constructor does no longer take an initial
+    string to feed; digest() and hexdigest() now do,
+    instead.  The following examples show how to
+    migrate:
+
+      # Before
+      md = Digest::MD5.new("string")
+      # After (works with any version)
+      md = Digest::MD5.new.update("string")
+        
+      # Before
+      hd = Digest::MD5.new("string").hexdigest
+      # After (works with any version)
+      hd = Digest::MD5.hexdigest("string")
diff --git a/ruby_1_8_6/README b/ruby_1_8_6/README
new file mode 100644
index 0000000000..cf836415ad
--- /dev/null
+++ b/ruby_1_8_6/README
@@ -0,0 +1,114 @@
+* What's Ruby
+
+Ruby is the interpreted scripting language for quick and
+easy object-oriented programming.  It has many features to
+process text files and to do system management tasks (as in
+Perl).  It is simple, straight-forward, and extensible.
+
+
+* Features of Ruby
+
+  + Simple Syntax
+  + *Normal* Object-Oriented features(ex. class, method calls)
+  + *Advanced* Object-Oriented features(ex. Mix-in, Singleton-method)
+  + Operator Overloading
+  + Exception Handling
+  + Iterators and Closures
+  + Garbage Collection
+  + Dynamic Loading of Object files(on some architecture)
+  + Highly Portable(works on many UNIX machines, and on DOS,
+    Windows, Mac, BeOS etc.)
+
+
+* How to get Ruby
+
+The Ruby distribution files can be found in the following FTP site:
+
+  ftp://ftp.ruby-lang.org/pub/ruby/
+
+The latest source code of this version series can be checked out
+through SVN with the following command:
+
+  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
+
+The trunk of the Ruby source tree can be checked out with the
+following command:
+
+  $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
+
+There are some other branches under development.  Try the following
+command and see the list of branches:
+
+  $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
+
+
+* Ruby home-page
+
+The URL of the Ruby home-page is:
+
+   http://www.ruby-lang.org/
+
+
+* Mailing list
+
+There is a mailing list to talk about Ruby.
+To subscribe this list, please send the following phrase
+
+	subscribe YourFirstName YourFamilyName
+e.g.
+        subscribe Joseph Smith
+
+in the mail body (not subject) to the address <ruby-talk-ctl@ruby-lang.org>.
+
+
+* How to compile and install
+
+This is what you need to do to compile and install Ruby:
+
+  1. If ./configure does not exist or is older than configure.in,
+     run autoconf to (re)generate configure.
+
+  2. Run ./configure, which will generate config.h and Makefile.
+
+  3. Edit defines.h if you need.  Usually this step will not be needed.
+
+  4. Remove comment mark(#) before the module names from ext/Setup (or
+     add module names if not present), if you want to link modules
+     statically.
+
+     If you don't want to compile non static extension modules
+     (probably on architectures which does not allow dynamic loading),
+     remove comment mark from the line "#option nodynamic" in
+     ext/Setup.
+
+  5. Run make.
+
+  6. Optionally, run 'make test' to check whether the compiled Ruby
+     interpreter works well.  If you see the message "test succeeded",
+     your ruby works as it should (hopefully).
+
+  7. Run 'make install'
+
+     You may have to be a super user to install ruby.
+
+If you fail to compile ruby, please send the detailed error report with
+the error log and machine/OS type, to help others.
+
+
+* Copying
+
+See the file COPYING.
+
+
+* The Author
+
+Feel free to send comments and bug reports to the author.  Here is the 
+author's latest mail address:
+
+  matz@netlab.jp
+
+-------------------------------------------------------
+created at: Thu Aug  3 11:57:36 JST 1995
+Local variables:
+mode: indented-text
+end:
diff --git a/ruby_1_8_6/README.EXT b/ruby_1_8_6/README.EXT
new file mode 100644
index 0000000000..2fc2fd606a
--- /dev/null
+++ b/ruby_1_8_6/README.EXT
@@ -0,0 +1,1159 @@
+.\" README.EXT -  -*- Text -*- created at: Mon Aug  7 16:45:54 JST 1995
+
+This document explains how to make extension libraries for Ruby.
+
+1. Basic knowledge
+
+In C, variables have types and data do not have types.  In contrast,
+Ruby variables do not have a static type, and data themselves have
+types, so data will need to be converted between the languages.
+
+Data in Ruby are represented by the C type `VALUE'.  Each VALUE data
+has its data-type.
+
+To retrieve C data from a VALUE, you need to:
+
+ (1) Identify the VALUE's data type
+ (2) Convert the VALUE into C data
+
+Converting to the wrong data type may cause serious problems.
+
+
+1.1 Data-types
+
+The Ruby interpreter has the following data types:
+
+	T_NIL		nil
+	T_OBJECT	ordinary object
+	T_CLASS		class
+	T_MODULE	module
+	T_FLOAT		floating point number
+	T_STRING	string
+	T_REGEXP	regular expression
+	T_ARRAY		array
+	T_FIXNUM	Fixnum(31bit integer)
+	T_HASH		associative array
+	T_STRUCT	(Ruby) structure
+	T_BIGNUM	multi precision integer
+	T_FILE		IO
+	T_TRUE		true
+	T_FALSE		false
+	T_DATA		data
+	T_SYMBOL        symbol
+
+In addition, there are several other types used internally:
+
+	T_ICLASS
+	T_MATCH
+	T_UNDEF
+	T_VARMAP
+	T_SCOPE
+	T_NODE
+
+Most of the types are represented by C structures.
+
+1.2 Check Data Type of the VALUE
+
+The macro TYPE() defined in ruby.h shows the data type of the VALUE.
+TYPE() returns the constant number T_XXXX described above.  To handle
+data types, your code will look something like this:
+
+  switch (TYPE(obj)) {
+    case T_FIXNUM:
+      /* process Fixnum */
+      break;
+    case T_STRING:
+      /* process String */
+      break;
+    case T_ARRAY:
+      /* process Array */
+      break;
+    default:
+      /* raise exception */
+      rb_raise(rb_eTypeError, "not valid value");
+      break;
+  }
+
+There is the data-type check function
+
+  void Check_Type(VALUE value, int type)
+
+which raises an exception if the VALUE does not have the type specified.
+
+There are also faster check macros for fixnums and nil.
+
+  FIXNUM_P(obj)
+  NIL_P(obj)
+
+1.3 Convert VALUE into C data
+
+The data for type T_NIL, T_FALSE, T_TRUE are nil, true, false
+respectively.  They are singletons for the data type.
+
+The T_FIXNUM data is a 31bit length fixed integer (63bit length on
+some machines), which can be converted to a C integer by using the
+FIX2INT() macro.  There is also NUM2INT() which converts any Ruby
+numbers into C integers.  The NUM2INT() macro includes a type check, so
+an exception will be raised if the conversion failed.  NUM2DBL() can
+be used to retrieve the double float value in the same way.
+
+In version 1.7 or later it is recommended that you use the new macros
+StringValue() and StringValuePtr() to get a char* from a VALUE.
+StringValue(var) replaces var's value with the result of "var.to_str()".
+StringValuePtr(var) does same replacement and returns char*
+representation of var.  These macros will skip the replacement if var is
+a String.  Notice that the macros take only the lvalue as their
+argument, to change the value of var in place.
+
+In version 1.6 or earlier, STR2CSTR() was used to do the same thing
+but now it is deprecated in version 1.7, because STR2CSTR() has a risk
+of a dangling pointer problem in the to_str() impliclit conversion.
+
+Other data types have corresponding C structures, e.g. struct RArray
+for T_ARRAY etc. The VALUE of the type which has the corresponding structure
+can be cast to retrieve the pointer to the struct.  The casting macro
+will be of the form RXXXX for each data type; for instance, RARRAY(obj). 
+See "ruby.h".
+
+For example, `RSTRING(str)->len' is the way to get the size of the
+Ruby String object.  The allocated region can be accessed by
+`RSTRING(str)->ptr'.  For arrays, use `RARRAY(ary)->len' and
+`RARRAY(ary)->ptr' respectively.
+
+Notice: Do not change the value of the structure directly, unless you
+are responsible for the result.  This ends up being the cause of interesting
+bugs.
+
+1.4 Convert C data into VALUE
+
+To convert C data to Ruby values:
+
+  * FIXNUM
+
+    left shift 1 bit, and turn on LSB.
+
+  * Other pointer values
+
+    cast to VALUE.
+
+You can determine whether a VALUE is pointer or not by checking its LSB.  
+
+Notice Ruby does not allow arbitrary pointer values to be a VALUE.  They
+should be pointers to the structures which Ruby knows about.  The known
+structures are defined in <ruby.h>.
+
+To convert C numbers to Ruby values, use these macros.
+
+  INT2FIX()	for integers within 31bits.
+  INT2NUM()	for arbitrary sized integer.
+
+INT2NUM() converts an integer into a Bignum if it is out of the FIXNUM
+range, but is a bit slower.
+
+1.5 Manipulating Ruby data
+
+As I already mentioned, it is not recommended to modify an object's internal
+structure.  To manipulate objects, use the functions supplied by the Ruby
+interpreter. Some (not all) of the useful functions are listed below:
+
+ String functions
+
+  rb_str_new(const char *ptr, long len)
+
+    Creates a new Ruby string.
+
+  rb_str_new2(const char *ptr)
+
+    Creates a new Ruby string from a C string.  This is equivalent to
+    rb_str_new(ptr, strlen(ptr)).
+
+  rb_tainted_str_new(const char *ptr, long len)
+
+    Creates a new tainted Ruby string.  Strings from external data
+    sources should be tainted.
+
+  rb_tainted_str_new2(const char *ptr)
+
+    Creates a new tainted Ruby string from a C string.
+
+  rb_str_cat(VALUE str, const char *ptr, long len)
+
+    Appends len bytes of data from ptr to the Ruby string.
+
+ Array functions
+
+  rb_ary_new()
+
+    Creates an array with no elements.
+
+  rb_ary_new2(long len)
+
+    Creates an array with no elements, allocating internal buffer
+    for len elements.
+
+  rb_ary_new3(long n, ...)
+
+    Creates an n-element array from the arguments.
+
+  rb_ary_new4(long n, VALUE *elts)
+
+    Creates an n-element array from a C array.
+
+  rb_ary_push(VALUE ary, VALUE val)
+  rb_ary_pop(VALUE ary)
+  rb_ary_shift(VALUE ary)
+  rb_ary_unshift(VALUE ary, VALUE val)
+
+    Array operations.  The first argument to each functions must be an 
+    array.  They may dump core if other types are given.
+
+2. Extending Ruby with C
+
+2.1 Addding new features to Ruby
+
+You can add new features (classes, methods, etc.) to the Ruby
+interpreter.  Ruby provides APIs for defining the following things:
+
+ * Classes, Modules
+ * Methods, Singleton Methods
+ * Constants
+
+2.1.1 Class/module definition
+
+To define a class or module, use the functions below:
+
+  VALUE rb_define_class(const char *name, VALUE super)
+  VALUE rb_define_module(const char *name)
+
+These functions return the newly created class or module.  You may
+want to save this reference into a variable to use later.
+
+To define nested classes or modules, use the functions below:
+
+  VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
+  VALUE rb_define_module_under(VALUE outer, const char *name)
+
+2.1.2 Method/singleton method definition
+
+To define methods or singleton methods, use these functions:
+
+  void rb_define_method(VALUE klass, const char *name, 
+		        VALUE (*func)(), int argc)
+
+  void rb_define_singleton_method(VALUE object, const char *name, 
+			          VALUE (*func)(), int argc)
+
+The `argc' represents the number of the arguments to the C function,
+which must be less than 17.  But I doubt you'll need that many.
+
+If `argc' is negative, it specifies the calling sequence, not number of
+the arguments.  
+
+If argc is -1, the function will be called as:
+
+  VALUE func(int argc, VALUE *argv, VALUE obj)
+
+where argc is the actual number of arguments, argv is the C array of
+the arguments, and obj is the receiver.
+
+If argc is -2, the arguments are passed in a Ruby array. The function
+will be called like:
+
+  VALUE func(VALUE obj, VALUE args)
+
+where obj is the receiver, and args is the Ruby array containing
+actual arguments.
+
+There are two more functions to define methods.  One is to define
+private methods:
+
+  void rb_define_private_method(VALUE klass, const char *name, 
+			        VALUE (*func)(), int argc)
+
+The other is to define module functions, which are private AND singleton
+methods of the module.  For example, sqrt is the module function
+defined in Math module.  It can be called in the following way:
+
+  Math.sqrt(4)
+
+or
+
+  include Math
+  sqrt(4)
+
+To define module functions, use:
+
+  void rb_define_module_function(VALUE module, const char *name, 
+				 VALUE (*func)(), int argc)
+
+Oh, in addition, function-like methods, which are private methods defined
+in the Kernel module, can be defined using:
+
+  void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
+
+To define an alias for the method,
+
+  void rb_define_alias(VALUE module, const char* new, const char* old);
+
+To define and undefine the `allocate' class method,
+
+  void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
+  void rb_undef_alloc_func(VALUE klass);
+
+func have to take the klass as the argument and return a newly
+allocated instance.  This instance should be empty as possible,
+without any expensive (including external) resources.
+
+2.1.3 Constant definition
+
+We have 2 functions to define constants:
+
+  void rb_define_const(VALUE klass, const char *name, VALUE val)
+  void rb_define_global_const(const char *name, VALUE val)
+
+The former is to define a constant under specified class/module.  The
+latter is to define a global constant.
+
+2.2 Use Ruby features from C
+
+There are several ways to invoke Ruby's features from C code.
+
+2.2.1 Evaluate Ruby Programs in a String
+
+The easiest way to use Ruby's functionality from a C program is to
+evaluate the string as Ruby program.  This function will do the job:
+
+  VALUE rb_eval_string(const char *str)
+
+Evaluation is done under the current context, thus current local variables
+of the innermost method (which is defined by Ruby) can be accessed.
+
+2.2.2 ID or Symbol
+
+You can invoke methods directly, without parsing the string.  First I need
+to explain about ID.  ID is the integer number to represent Ruby's
+identifiers such as variable names.  The Ruby data type corresponding to ID
+is Symbol.  It can be accessed from Ruby in the form:
+
+ :Identifier
+
+You can get the ID value from a string within C code by using
+
+  rb_intern(const char *name)
+
+You can retrieve ID from Ruby object (Symbol or String) given as an
+argument by using
+
+  rb_to_id(VALUE symbol)
+
+You can convert C ID to Ruby Symbol by using
+
+  VALUE ID2SYM(ID id)
+
+and to convert Ruby Symbol object to ID, use
+
+  ID SYM2ID(VALUE symbol)
+
+2.2.3 Invoke Ruby method from C
+
+To invoke methods directly, you can use the function below
+
+  VALUE rb_funcall(VALUE recv, ID mid, int argc, ...)
+
+This function invokes a method on the recv, with the method name
+specified by the symbol mid.
+
+2.2.4 Accessing the variables and constants
+
+You can access class variables and instance variables using access
+functions.  Also, global variables can be shared between both environments.
+There's no way to access Ruby's local variables.
+
+The functions to access/modify instance variables are below:
+
+  VALUE rb_ivar_get(VALUE obj, ID id)
+  VALUE rb_ivar_set(VALUE obj, ID id, VALUE val)
+
+id must be the symbol, which can be retrieved by rb_intern().
+
+To access the constants of the class/module:
+
+  VALUE rb_const_get(VALUE obj, ID id)
+
+See 2.1.3 for defining new constant.
+
+3. Information sharing between Ruby and C
+
+3.1 Ruby constants that C can be accessed from C
+
+The following Ruby constants can be referred from C.
+
+  Qtrue
+  Qfalse
+
+Boolean values.  Qfalse is false in C also (i.e. 0).
+
+  Qnil
+
+Ruby nil in C scope.
+
+3.2 Global variables shared between C and Ruby
+
+Information can be shared between the two environments using shared global
+variables.  To define them, you can use functions listed below:
+
+  void rb_define_variable(const char *name, VALUE *var)
+
+This function defines the variable which is shared by both environments.
+The value of the global variable pointed to by `var' can be accessed
+through Ruby's global variable named `name'.
+
+You can define read-only (from Ruby, of course) variables using the
+function below.
+
+  void rb_define_readonly_variable(const char *name, VALUE *var)
+
+You can defined hooked variables.  The accessor functions (getter and
+setter) are called on access to the hooked variables.
+
+  void rb_define_hooked_variable(constchar *name, VALUE *var,
+				 VALUE (*getter)(), void (*setter)())
+
+If you need to supply either setter or getter, just supply 0 for the
+hook you don't need.  If both hooks are 0, rb_define_hooked_variable()
+works just like rb_define_variable().
+
+  void rb_define_virtual_variable(const char *name,
+				  VALUE (*getter)(), void (*setter)())
+
+This function defines a Ruby global variable without a corresponding C
+variable.  The value of the variable will be set/get only by hooks.
+
+The prototypes of the getter and setter functions are as follows:
+
+  (*getter)(ID id, void *data, struct global_entry* entry);
+  (*setter)(VALUE val, ID id, void *data, struct global_entry* entry);
+
+3.3 Encapsulate C data into a Ruby object
+
+To wrap and objectify a C pointer as a Ruby object (so called
+DATA), use Data_Wrap_Struct().
+
+  Data_Wrap_Struct(klass, mark, free, ptr)
+
+Data_Wrap_Struct() returns a created DATA object.  The klass argument
+is the class for the DATA object.  The mark argument is the function
+to mark Ruby objects pointed by this data.  The free argument is the
+function to free the pointer allocation.  If this is -1, the pointer
+will be just freed.  The functions mark and free will be called from
+garbage collector.
+
+You can allocate and wrap the structure in one step.
+
+  Data_Make_Struct(klass, type, mark, free, sval)
+
+This macro returns an allocated Data object, wrapping the pointer to
+the structure, which is also allocated.  This macro works like:
+
+  (sval = ALLOC(type), Data_Wrap_Struct(klass, mark, free, sval))
+
+Arguments klass, mark, and free work like their counterparts in
+Data_Wrap_Struct().  A pointer to the allocated structure will be
+assigned to sval, which should be a pointer of the type specified.
+
+To retrieve the C pointer from the Data object, use the macro
+Data_Get_Struct().
+
+  Data_Get_Struct(obj, type, sval)
+
+A pointer to the structure will be assigned to the variable sval.
+
+See the example below for details. 
+
+4. Example - Creating dbm extension
+
+OK, here's the example of making an extension library.  This is the
+extension to access DBMs.  The full source is included in the ext/
+directory in the Ruby's source tree.
+
+(1) make the directory
+
+  % mkdir ext/dbm
+
+Make a directory for the extension library under ext directory.
+
+(2) design the library
+
+You need to design the library features, before making it.
+
+(3) write C code.
+
+You need to write C code for your extension library.  If your library
+has only one source file, choosing ``LIBRARY.c'' as a file name is
+preferred.  On the other hand, in case your library has multiple source
+files, avoid choosing ``LIBRARY.c'' for a file name.  It may conflict
+with an intermediate file ``LIBRARY.o'' on some platforms.
+
+Ruby will execute the initializing function named ``Init_LIBRARY'' in
+the library.  For example, ``Init_dbm()'' will be executed when loading
+the library.
+
+Here's the example of an initializing function.
+
+--
+Init_dbm()
+{
+    /* define DBM class */
+    cDBM = rb_define_class("DBM", rb_cObject);
+    /* DBM includes Enumerate module */
+    rb_include_module(cDBM, rb_mEnumerable);
+
+    /* DBM has class method open(): arguments are received as C array */
+    rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
+
+    /* DBM instance method close(): no args */
+    rb_define_method(cDBM, "close", fdbm_close, 0);
+    /* DBM instance method []: 1 argument */
+    rb_define_method(cDBM, "[]", fdbm_fetch, 1);
+		:
+
+    /* ID for a instance variable to store DBM data */
+    id_dbm = rb_intern("dbm");
+}
+--
+
+The dbm extension wraps the dbm struct in the C environment using 
+Data_Make_Struct.
+
+--
+struct dbmdata {
+    int  di_size;
+    DBM *di_dbm;
+};
+
+
+obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
+--
+
+This code wraps the dbmdata structure into a Ruby object.  We avoid wrapping
+DBM* directly, because we want to cache size information.
+
+To retrieve the dbmdata structure from a Ruby object, we define the
+following macro:
+
+--
+#define GetDBM(obj, dbmp) {\
+    Data_Get_Struct(obj, struct dbmdata, dbmp);\
+    if (dbmp->di_dbm == 0) closed_dbm();\
+}
+--
+
+This sort of complicated macro does the retrieving and close checking for
+the DBM.
+
+There are three kinds of way to receive method arguments.  First,
+methods with a fixed number of arguments receive arguments like this:
+
+--
+static VALUE
+fdbm_delete(obj, keystr)
+    VALUE obj, keystr;
+{
+	:
+}
+--
+
+The first argument of the C function is the self, the rest are the
+arguments to the method.
+
+Second, methods with an arbitrary number of arguments receive
+arguments like this:
+
+--
+static VALUE
+fdbm_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+	:
+    if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
+	mode = 0666;		/* default value */
+    }
+	:
+}
+--
+
+The first argument is the number of method arguments, the second
+argument is the C array of the method arguments, and the third
+argument is the receiver of the method.
+
+You can use the function rb_scan_args() to check and retrieve the
+arguments.  For example, "11" means that the method requires at least one
+argument, and at most receives two arguments.
+
+Methods with an arbitrary number of arguments can receive arguments
+by Ruby's array, like this:
+
+--
+static VALUE
+fdbm_indexes(obj, args)
+    VALUE obj, args;
+{
+	:
+}
+--
+
+The first argument is the receiver, the second one is the Ruby array
+which contains the arguments to the method.
+
+** Notice
+
+GC should know about global variables which refer to Ruby's objects, but
+are not exported to the Ruby world.  You need to protect them by
+
+  void rb_global_variable(VALUE *var)
+
+(4) prepare extconf.rb
+
+If the file named extconf.rb exists, it will be executed to generate
+Makefile.
+
+extconf.rb is the file for checking compilation conditions etc.  You
+need to put
+
+  require 'mkmf'
+
+at the top of the file.  You can use the functions below to check
+various conditions.
+
+  have_library(lib, func): check whether library containing function exists.
+  have_func(func, header): check whether function exists
+  have_header(header): check whether header file exists
+  create_makefile(target): generate Makefile
+
+The value of the variables below will affect the Makefile.
+
+  $CFLAGS: included in CFLAGS make variable (such as -O)
+  $CPPFLAGS: included in CPPFLAGS make variable (such as -I, -D)
+  $LDFLAGS: included in LDFLAGS make variable (such as -L)
+  $objs: list of object file names
+
+Normally, the object files list is automatically generated by searching
+source files, but you must define them explicitly if any sources will
+be generated while building.
+
+If a compilation condition is not fulfilled, you should not call
+``create_makefile''.  The Makefile will not be generated, compilation will
+not be done.
+
+(5) prepare depend (optional)
+
+If the file named depend exists, Makefile will include that file to
+check dependencies.  You can make this file by invoking
+
+  % gcc -MM *.c > depend
+
+It's harmless.  Prepare it.
+
+(6) generate Makefile
+
+Try generating the Makefile by:
+
+  ruby extconf.rb
+
+You don't need this step if you put the extension library under the ext
+directory of the ruby source tree.  In that case, compilation of the
+interpreter will do this step for you.
+
+(7) make
+
+Type
+
+  make
+
+to compile your extension.  You don't need this step either if you have
+put the extension library under the ext directory of the ruby source tree.
+
+(8) debug
+
+You may need to rb_debug the extension.  Extensions can be linked
+statically by adding the directory name in the ext/Setup file so that
+you can inspect the extension with the debugger.
+
+(9) done, now you have the extension library
+
+You can do anything you want with your library.  The author of Ruby
+will not claim any restrictions on your code depending on the Ruby API.
+Feel free to use, modify, distribute or sell your program.
+
+Appendix A. Ruby source files overview
+
+ruby language core
+
+  class.c
+  error.c
+  eval.c
+  gc.c
+  object.c
+  parse.y
+  variable.c
+
+utility functions
+
+  dln.c
+  regex.c
+  st.c
+  util.c
+
+ruby interpreter implementation
+
+  dmyext.c
+  inits.c
+  main.c
+  ruby.c
+  version.c
+
+class library
+
+  array.c
+  bignum.c
+  compar.c
+  dir.c
+  enum.c
+  file.c
+  hash.c
+  io.c
+  marshal.c
+  math.c
+  numeric.c
+  pack.c
+  prec.c
+  process.c
+  random.c
+  range.c
+  re.c
+  signal.c
+  sprintf.c
+  string.c
+  struct.c
+  time.c
+
+Appendix B. Ruby extension API reference
+
+** Types
+
+ VALUE
+
+The type for the Ruby object.  Actual structures are defined in ruby.h,
+such as struct RString, etc.  To refer the values in structures, use
+casting macros like RSTRING(obj).
+
+** Variables and constants
+
+ Qnil
+
+const: nil object
+
+ Qtrue
+
+const: true object(default true value)
+
+ Qfalse
+
+const: false object
+
+** C pointer wrapping
+
+ Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval)
+
+Wrap a C pointer into a Ruby object.  If object has references to other
+Ruby objects, they should be marked by using the mark function during
+the GC process.  Otherwise, mark should be 0.  When this object is no
+longer referred by anywhere, the pointer will be discarded by free
+function.
+
+ Data_Make_Struct(klass, type, mark, free, sval)
+
+This macro allocates memory using malloc(), assigns it to the variable
+sval, and returns the DATA encapsulating the pointer to memory region.
+
+ Data_Get_Struct(data, type, sval)
+
+This macro retrieves the pointer value from DATA, and assigns it to
+the variable sval. 
+
+** Checking data types
+
+TYPE(value)
+FIXNUM_P(value)
+NIL_P(value)
+void Check_Type(VALUE value, int type)
+void Check_SafeStr(VALUE value)
+
+** Data type conversion
+
+FIX2INT(value)
+INT2FIX(i)
+NUM2INT(value)
+INT2NUM(i)
+NUM2DBL(value)
+rb_float_new(f)
+StringValue(value)
+StringValuePtr(value)
+StringValueCStr(value)
+rb_str_new2(s)
+
+** defining class/module
+
+ VALUE rb_define_class(const char *name, VALUE super)
+
+Defines a new Ruby class as a subclass of super.
+
+ VALUE rb_define_class_under(VALUE module, const char *name, VALUE super)
+
+Creates a new Ruby class as a subclass of super, under the module's
+namespace.
+
+ VALUE rb_define_module(const char *name)
+
+Defines a new Ruby module.
+
+ VALUE rb_define_module_under(VALUE module, const char *name)
+
+Defines a new Ruby module under the module's namespace.
+
+ void rb_include_module(VALUE klass, VALUE module)
+
+Includes module into class.  If class already includes it, just
+ignored.
+
+ void rb_extend_object(VALUE object, VALUE module)
+
+Extend the object with the module's attributes.
+
+** Defining Global Variables
+
+ void rb_define_variable(const char *name, VALUE *var)
+
+Defines a global variable which is shared between C and Ruby.  If name
+contains a character which is not allowed to be part of the symbol,
+it can't be seen from Ruby programs.
+
+ void rb_define_readonly_variable(const char *name, VALUE *var)
+
+Defines a read-only global variable.  Works just like
+rb_define_variable(), except the defined variable is read-only.
+
+ void rb_define_virtual_variable(const char *name,
+				 VALUE (*getter)(), VALUE (*setter)())
+
+Defines a virtual variable, whose behavior is defined by a pair of C
+functions.  The getter function is called when the variable is
+referenced.  The setter function is called when the variable is set to a
+value.  The prototype for getter/setter functions are:
+
+	VALUE getter(ID id)
+	void setter(VALUE val, ID id)
+
+The getter function must return the value for the access.
+
+ void rb_define_hooked_variable(const char *name, VALUE *var,
+				VALUE (*getter)(), VALUE (*setter)())
+
+Defines hooked variable.  It's a virtual variable with a C variable.  
+The getter is called as
+
+	VALUE getter(ID id, VALUE *var)
+
+returning a new value.  The setter is called as
+
+	void setter(VALUE val, ID id, VALUE *var)
+
+GC requires C global variables which hold Ruby values to be marked.
+
+ void rb_global_variable(VALUE *var)
+
+Tells GC to protect these variables.
+
+** Constant Definition
+
+ void rb_define_const(VALUE klass, const char *name, VALUE val)
+
+Defines a new constant under the class/module.
+
+ void rb_define_global_const(const char *name, VALUE val)
+
+Defines a global constant.  This is just the same as
+
+     rb_define_const(cKernal, name, val)
+
+** Method Definition
+
+ rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+
+Defines a method for the class.  func is the function pointer.  argc
+is the number of arguments.  if argc is -1, the function will receive
+3 arguments: argc, argv, and self.  if argc is -2, the function will
+receive 2 arguments, self and args, where args is a Ruby array of
+the method arguments.
+
+ rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+
+Defines a private method for the class.  Arguments are same as
+rb_define_method().
+
+ rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+
+Defines a singleton method.  Arguments are same as rb_define_method().
+
+ rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
+
+Retrieve argument from argc, argv.  The fmt is the format string for
+the arguments, such as "12" for 1 non-optional argument, 2 optional
+arguments.  If `*' appears at the end of fmt, it means the rest of
+the arguments are assigned to the corresponding variable, packed in
+an array.
+
+** Invoking Ruby method
+
+ VALUE rb_funcall(VALUE recv, ID mid, int narg, ...)
+
+Invokes a method.  To retrieve mid from a method name, use rb_intern().
+
+ VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
+
+Invokes a method, passing arguments by an array of values.
+
+ VALUE rb_eval_string(const char *str)
+
+Compiles and executes the string as a Ruby program.
+
+ ID rb_intern(const char *name)
+
+Returns ID corresponding to the name.
+
+ char *rb_id2name(ID id)
+
+Returns the name corresponding ID.
+
+ char *rb_class2name(VALUE klass)
+
+Returns the name of the class.
+
+ int rb_respond_to(VALUE object, ID id)
+
+Returns true if the object responds to the message specified by id.
+
+** Instance Variables
+
+ VALUE rb_iv_get(VALUE obj, const char *name)
+
+Retrieve the value of the instance variable.  If the name is not
+prefixed by `@', that variable shall be inaccessible from Ruby.
+
+ VALUE rb_iv_set(VALUE obj, const char *name, VALUE val)
+
+Sets the value of the instance variable.
+
+** Control Structure
+
+ VALUE rb_iterate(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
+
+Calls the function func1, supplying func2 as the block.  func1 will be
+called with the argument arg1.  func2 receives the value from yield as
+the first argument, arg2 as the second argument.
+ 
+ VALUE rb_yield(VALUE val)
+
+Evaluates the block with value val.
+
+ VALUE rb_rescue(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
+
+Calls the function func1, with arg1 as the argument.  If an exception
+occurs during func1, it calls func2 with arg2 as the argument.  The
+return value of rb_rescue() is the return value from func1 if no
+exception occurs, from func2 otherwise.
+
+ VALUE rb_ensure(VALUE (*func1)(), void *arg1, void (*func2)(), void *arg2)
+
+Calls the function func1 with arg1 as the argument, then calls func2
+with arg2 if execution terminated.  The return value from
+rb_ensure() is that of func1.
+
+** Exceptions and Errors
+
+ void rb_warn(const char *fmt, ...)
+
+Prints a warning message according to a printf-like format.
+
+ void rb_warning(const char *fmt, ...)
+
+Prints a warning message according to a printf-like format, if
+$VERBOSE is true.
+
+void rb_raise(rb_eRuntimeError, const char *fmt, ...)
+
+Raises RuntimeError.  The fmt is a format string just like printf().
+
+ void rb_raise(VALUE exception, const char *fmt, ...)
+
+Raises a class exception.  The fmt is a format string just like printf().
+
+ void rb_fatal(const char *fmt, ...)
+
+Raises a fatal error, terminates the interpreter.  No exception handling
+will be done for fatal errors, but ensure blocks will be executed.
+
+ void rb_bug(const char *fmt, ...)
+
+Terminates the interpreter immediately.  This function should be
+called under the situation caused by the bug in the interpreter.  No
+exception handling nor ensure execution will be done.
+
+** Initialize and Start the Interpreter
+
+The embedding API functions are below (not needed for extension libraries):
+
+ void ruby_init()
+
+Initializes the interpreter.
+
+ void ruby_options(int argc, char **argv)
+
+Process command line arguments for the interpreter.
+
+ void ruby_run()
+
+Starts execution of the interpreter.
+
+ void ruby_script(char *name)
+
+Specifies the name of the script ($0).
+
+** Hooks for the Interpreter Events
+
+ void rb_add_event_hook(rb_event_hook_func_t func, rb_event_t events)
+
+Adds a hook function for the specified interpreter events.
+events should be Or'ed value of:
+
+	RUBY_EVENT_LINE
+	RUBY_EVENT_CLASS
+	RUBY_EVENT_END
+	RUBY_EVENT_CALL
+	RUBY_EVENT_RETURN
+	RUBY_EVENT_C_CALL
+	RUBY_EVENT_C_RETURN
+	RUBY_EVENT_RAISE
+	RUBY_EVENT_ALL
+
+The definition of rb_event_hook_func_t is below:
+
+ typedef void (*rb_event_hook_func_t)(rb_event_t event, NODE *node,
+ 				      VALUE self, ID id, VALUE klass)
+
+ int rb_remove_event_hook(rb_event_hook_func_t func)
+
+Removes the specified hook function.
+
+Appendix C. Functions Available in extconf.rb
+
+These functions are available in extconf.rb:
+
+ have_macro(macro, headers)
+
+Checks whether macro is defined with header.  Returns true if the macro
+is defined.
+
+ have_library(lib, func)
+
+Checks whether the library exists, containing the specified function.
+Returns true if the library exists.
+
+ find_library(lib, func, path...)
+
+Checks whether a library which contains the specified function exists in
+path.  Returns true if the library exists.
+
+ have_func(func, header)
+
+Checks whether func exists with header.  Returns true if the function
+exists.  To check functions in an additional library, you need to
+check that library first using have_library().
+
+ have_var(var, header)
+
+Checks whether var exists with header.  Returns true if the variable
+exists.  To check variables in an additional library, you need to
+check that library first using have_library().
+
+ have_header(header)
+
+Checks whether header exists.  Returns true if the header file exists.
+
+ find_header(header, path...)
+
+Checks whether header exists in path.  Returns true if the header file
+exists.
+
+ have_struct_member(type, member, header)
+
+Checks whether type has member with header.  Returns true if the type
+is defined and has the member.
+
+ have_type(type, header, opt)
+
+Checks whether type is defined with header.  Returns true if the type
+is defined.
+
+ check_sizeof(type, header)
+
+Checks the size of type in char with header.  Returns the size if the
+type is defined, otherwise nil.
+
+ create_makefile(target)
+
+Generates the Makefile for the extension library.  If you don't invoke
+this method, the compilation will not be done.
+
+ find_executable(bin, path)
+
+Finds command in path, which is File::PATH_SEPARATOR-separated list of
+directories.  If path is nil or omitted, environment varialbe PATH
+will be used.  Returns the path name of the command if it is found,
+otherwise nil.
+
+ with_config(withval[, default=nil])
+
+Parses the command line options and returns the value specified by
+--with-<withval>.
+
+ enable_config(config, *defaults)
+ disable_config(config, *defaults)
+
+Parses the command line options for boolean.  Returns true if
+--enable-<config> is given, or false if --disable-<config> is given.
+Otherwise, yields defaults to the given block and returns the result
+if it is called with a block, or returns defaults.
+
+ dir_config(target[, default_dir])
+ dir_config(target[, default_include, default_lib])
+
+Parses the command line options and adds the directories specified by
+--with-<target>-dir, --with-<target>-include, and/or --with-<target>-lib
+to $CFLAGS and/or $LDFLAGS.  --with-<target>-dir=/path is equivalent to
+--with-<target>-include=/path/include --with-<target>-lib=/path/lib.
+Returns an array of the added directories ([include_dir, lib_dir]).
+
+ pkg_config(pkg)
+
+Obtains the information for pkg by pkg-config command.  The actual
+command name can be overriden by --with-pkg-config command line
+option.
+
+/*
+ * Local variables:
+ * fill-column: 70
+ * end:
+ */
diff --git a/ruby_1_8_6/README.EXT.ja b/ruby_1_8_6/README.EXT.ja
new file mode 100644
index 0000000000..30c4d520ba
--- /dev/null
+++ b/ruby_1_8_6/README.EXT.ja
@@ -0,0 +1,1258 @@
+.\" README.EXT.ja -  -*- Text -*- created at: Mon Aug  7 16:45:54 JST 1995
+
+Rubyの拡張ライブラリの作り方を説明します．
+
+1．基礎知識
+
+Cの変数には型があり，データには型がありません．ですから，た
+とえばポインタをintの変数に代入すると，その値は整数として取
+り扱われます．逆にRubyの変数には型がなく，データに型がありま
+す．この違いのため，CとRubyは相互に変換しなければ，お互いの
+データをアクセスできません．
+
+RubyのデータはVALUEというCの型で表現されます．VALUE型のデー
+タはそのデータタイプを自分で知っています．このデータタイプと
+いうのはデータ(オブジェクト)の実際の構造を意味していて，Ruby
+のクラスとはまた違ったものです．
+
+VALUEからCにとって意味のあるデータを取り出すためには
+
+ (1) VALUEのデータタイプを知る
+ (2) VALUEをCのデータに変換する
+
+の両方が必要です．(1)を忘れると間違ったデータの変換が行われ
+て，最悪プログラムがcore dumpします．
+
+1.1 データタイプ
+
+Rubyにはユーザが使う可能性のある以下のタイプがあります．
+
+	T_NIL		nil
+	T_OBJECT	通常のオブジェクト
+	T_CLASS		クラス
+	T_MODULE	モジュール
+	T_FLOAT		浮動小数点数
+	T_STRING	文字列
+	T_REGEXP	正規表現
+	T_ARRAY		配列
+	T_FIXNUM	Fixnum(31bit長整数)
+	T_HASH		連想配列
+	T_STRUCT	(Rubyの)構造体
+	T_BIGNUM	多倍長整数
+	T_FILE		入出力
+	T_TRUE		真
+	T_FALSE		偽
+	T_DATA		データ
+	T_SYMBOL	シンボル
+
+その他に内部で利用されている以下のタイプがあります．
+
+	T_ICLASS
+	T_MATCH
+	T_UNDEF
+	T_VARMAP
+	T_SCOPE
+	T_NODE
+
+ほとんどのタイプはCの構造体で実装されています．
+
+1.2 VALUEのデータタイプをチェックする
+
+ruby.hではTYPE()というマクロが定義されていて，VALUEのデータ
+タイプを知ることが出来ます．TYPE()マクロは上で紹介したT_XXXX
+の形式の定数を返します．VALUEのデータタイプに応じて処理する
+場合には，TYPE()の値で分岐することになります．
+
+  switch (TYPE(obj)) {
+    case T_FIXNUM:
+      /* FIXNUMの処理 */
+      break;
+    case T_STRING:
+      /* 文字列の処理 */
+      break;
+    case T_ARRAY:
+      /* 配列の処理 */
+      break;
+    default:
+      /* 例外を発生させる */
+      rb_raise(rb_eTypeError, "not valid value");
+      break;
+  }
+
+それとデータタイプをチェックして，正しくなければ例外を発生す
+る関数が用意されています．
+
+  void Check_Type(VALUE value, int type)
+
+この関数はvalueがtypeで無ければ，例外を発生させます．引数と
+して与えられたVALUEのデータタイプが正しいかどうかチェックす
+るためには，この関数を使います．
+
+FIXNUMとNILに関してはより高速な判別マクロが用意されています．
+
+  FIXNUM_P(obj)
+  NIL_P(obj)
+
+1.3 VALUEをCのデータに変換する
+
+データタイプがT_NIL, T_FALSE, T_TRUEである時，データはそれぞ
+れnil, false, trueです．このデータタイプのオブジェクトはひと
+つずつしか存在しません．
+
+データタイプがT_FIXNUMの時，これは31bitのサイズを持つ整数で
+す．FIXNUMをCの整数に変換するためにはマクロ「FIX2INT()」を使
+います．それから，FIXNUMに限らずRubyのデータを整数に変換する
+「NUM2INT()」というマクロがあります．このマクロはデータタイ
+プのチェック無しで使えます(整数に変換できない場合には例外が
+発生する)．同様にチェック無しで使える変換マクロはdoubleを
+取り出す「NUM2DBL()」があります。
+
+char* を取り出す場合、version 1.6 以前では「STR2CSTR()」と
+いうマクロを使っていましたが、これは to_str() による暗黙の
+型変換結果が GC される可能性があるため、version 1.7 以降では
+obsolete となり、代わりに StringValue() と StringValuePtr()
+を使う事を推奨しています。StringValue(var) は var が String
+ であれば何もせず、そうでなければ var を var.to_str() の結果に
+置き換えるマクロ、StringValuePtr(var) は同様に var を置き換え
+てから var の文字列表現に対する char* を返すマクロです。var の
+内容を直接置き換える処理が入るので、var は lvalue である必要が
+あります。
+
+それ以外のデータタイプは対応するCの構造体があります．対応す
+る構造体のあるVALUEはそのままキャスト(型変換)すれば構造体の
+ポインタに変換できます．
+
+構造体は「struct RXxxxx」という名前でruby.hで定義されていま
+す．例えば文字列は「struct RString」です．実際に使う可能性が
+あるのは文字列と配列くらいだと思います．
+
+ruby.hでは構造体へキャストするマクロも「RXXXXX()」(全部大文
+字にしたもの)という名前で提供されています(例: RSTRING())．
+
+例えば，文字列strの長さを得るためには「RSTRING(str)->len」と
+し，文字列strをchar*として得るためには「RSTRING(str)->ptr」
+とします．配列の場合には，それぞれ「RARRAY(ary)->len」，
+「RARRAY(ary)->ptr」となります．
+
+Rubyの構造体を直接アクセスする時に気をつけなければならないこ
+とは，配列や文字列の構造体の中身は参照するだけで，直接変更し
+ないことです．直接変更した場合，オブジェクトの内容の整合性が
+とれなくなって，思わぬバグの原因になります．
+
+1.4 CのデータをVALUEに変換する
+
+VALUEの実際の構造は
+
+  * FIXNUMの場合
+
+    1bit左シフトして，LSBを立てる．
+
+  * その他のポインタの場合
+
+    そのままVALUEにキャストする．
+
+となっています．よって，LSBをチェックすればVALUEがFIXNUMかど
+うかわかるわけです(ポインタのLSBが立っていないことを仮定して
+いる)．
+
+ですから，FIXNUM以外のRubyのオブジェクトの構造体は単にVALUE
+にキャストするだけでVALUEに変換出来ます．ただし，任意の構造
+体がVALUEにキャスト出来るわけではありません．キャストするの
+はRubyの知っている構造体(ruby.hで定義されているstruct RXxxx
+のもの)だけです．
+
+FIXNUMに関しては変換マクロを経由する必要があります．Cの整数
+からVALUEに変換するマクロは以下のものがあります．必要に応じ
+て使い分けてください．
+
+  INT2FIX()	もとの整数が31bit以内に収まる自信がある時
+  INT2NUM()	任意の整数からVALUEへ
+
+INT2NUM()は整数がFIXNUMの範囲に収まらない場合，Bignumに変換
+してくれます(が，少し遅い)．
+
+1.5 Rubyのデータを操作する
+
+先程も述べた通り，Rubyの構造体をアクセスする時に内容の更新を
+行うことは勧められません．で，Rubyのデータを操作する時には
+Rubyが用意している関数を用いてください．
+
+ここではもっとも使われるであろう文字列と配列の生成/操作を行
+い関数をあげます(全部ではないです)．
+
+ 文字列に対する関数
+
+  rb_str_new(const char *ptr, long len)
+
+    新しいRubyの文字列を生成する．
+
+  rb_str_new2(const char *ptr)
+
+    Cの文字列からRubyの文字列を生成する．この関数の機能は
+    rb_str_new(ptr, strlen(ptr))と同等である．
+
+  rb_tainted_str_new(const char *ptr, long len)
+
+    汚染マークが付加された新しいRubyの文字列を生成する．外部
+    からのデータに基づく文字列には汚染マークが付加されるべき
+    である．
+
+  rb_tainted_str_new2(const char *ptr)
+
+    Cの文字列から汚染マークが付加されたRubyの文字列を生成する．
+
+  rb_str_cat(VALUE str, const char *ptr, long len)
+
+    Rubyの文字列strにlenバイトの文字列ptrを追加する．
+
+ 配列に対する関数
+
+  rb_ary_new()
+
+    要素が0の配列を生成する．
+
+  rb_ary_new2(long len)
+
+    要素が0の配列を生成する．len要素分の領域をあらかじめ割り
+    当てておく．
+
+  rb_ary_new3(long n, ...)
+
+    引数で指定したn要素を含む配列を生成する．
+
+  rb_ary_new4(long n, VALUE *elts)
+
+    配列で与えたn要素の配列を生成する．
+
+  rb_ary_push(VALUE ary, VALUE val)
+  rb_ary_pop(VALUE ary)
+  rb_ary_shift(VALUE ary)
+  rb_ary_unshift(VALUE ary, VALUE val)
+
+    Arrayの同名のメソッドと同じ働きをする関数．第1引数は必ず
+    配列でなければならない．
+
+2．Rubyの機能を使う
+
+原理的にRubyで書けることはCでも書けます．RubyそのものがCで記
+述されているんですから，当然といえば当然なんですけど．ここで
+はRubyの拡張に使うことが多いだろうと予測される機能を中心に紹
+介します．
+
+2.1 Rubyに機能を追加する
+
+Rubyで提供されている関数を使えばRubyインタプリタに新しい機能
+を追加することができます．Rubyでは以下の機能を追加する関数が
+提供されています．
+
+ * クラス，モジュール
+ * メソッド，特異メソッドなど
+ * 定数
+
+では順に紹介します．
+
+2.1.1 クラス/モジュール定義
+
+クラスやモジュールを定義するためには，以下の関数を使います．
+
+  VALUE rb_define_class(const char *name, VALUE super)
+  VALUE rb_define_module(const char *name)
+
+これらの関数は新しく定義されたクラスやモジュールを返します．
+メソッドや定数の定義にこれらの値が必要なので，ほとんどの場合
+は戻り値を変数に格納しておく必要があるでしょう．
+
+クラスやモジュールを他のクラスの内部にネストして定義する時に
+は以下の関数を使います．
+
+  VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
+  VALUE rb_define_module_under(VALUE outer, const char *name)
+
+2.1.2 メソッド/特異メソッド定義
+
+メソッドや特異メソッドを定義するには以下の関数を使います．
+
+  void rb_define_method(VALUE klass, const char *name, 
+		        VALUE (*func)(), int argc)
+
+  void rb_define_singleton_method(VALUE object, const char *name, 
+			          VALUE (*func)(), int argc)
+
+
+念のため説明すると「特異メソッド」とは，その特定のオブジェク
+トに対してだけ有効なメソッドです．RubyではよくSmalltalkにお
+けるクラスメソッドとして，クラスに対する特異メソッドが使われ
+ます．
+
+これらの関数の argcという引数はCの関数へ渡される引数の数(と
+形式)を決めます．argcが0以上の時は関数に引き渡す引数の数を意
+味します．16個以上の引数は使えません(が，要りませんよね，そ
+んなに)．実際の関数には先頭の引数としてselfが与えられますの
+で，指定した数より1多い引数を持つことになります．
+
+argcが負の時は引数の数ではなく，形式を指定したことになります．
+argcが-1の時は引数を配列に入れて渡されます．argcが-2の時は引
+数はRubyの配列として渡されます．
+
+メソッドを定義する関数はもう二つあります．ひとつはprivateメ
+ソッドを定義する関数で，引数はrb_define_method()と同じです．
+
+  void rb_define_private_method(VALUE klass, const char *name, 
+				VALUE (*func)(), int argc)
+
+privateメソッドとは関数形式でしか呼び出すことの出来ないメソッ
+ドです．
+
+もうひとつはモジュール関数を定義するものです．モジュール関数
+とはモジュールの特異メソッドであり，同時にprivateメソッドで
+もあるものです．例をあげるとMathモジュールのsqrt()などがあげ
+られます．このメソッドは
+
+  Math.sqrt(4)
+
+という形式でも
+
+  include Math
+  sqrt(4)
+
+という形式でも使えます．モジュール関数を定義する関数は以下の
+通りです．
+
+  void rb_define_module_function(VALUE module, const char *name, 
+		                 VALUE (*func)(), int argc)
+
+関数的メソッド(Kernelモジュールのprivate method)を定義するた
+めの関数は以下の通りです．
+
+  void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
+
+
+メソッドの別名を定義するための関数は以下の通りです。
+
+  void rb_define_alias(VALUE module, const char* new, const char* old);
+
+クラスメソッドallocateを定義したり削除したりするための関数は
+以下の通りです。
+
+  void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
+  void rb_undef_alloc_func(VALUE klass);
+
+funcはクラスを引数として受け取って、新しく割り当てられたイン
+スタンスを返さなくてはなりません。このインスタンスは、外部リ
+ソースなどを含まない、できるだけ「空」のままにしておいたほう
+がよいでしょう。
+
+2.1.3 定数定義
+
+拡張ライブラリが必要な定数はあらかじめ定義しておいた方が良い
+でしょう．定数を定義する関数は二つあります．
+
+  void rb_define_const(VALUE klass, const char *name, VALUE val)
+  void rb_define_global_const(const char *name, VALUE val)
+
+前者は特定のクラス/モジュールに属する定数を定義するもの，後
+者はグローバルな定数を定義するものです．
+
+2.2 Rubyの機能をCから呼び出す
+
+既に『1.5 Rubyのデータを操作する』で一部紹介したような関数を
+使えば，Rubyの機能を実現している関数を直接呼び出すことが出来
+ます．
+
+# このような関数の一覧表はいまのところありません．ソースを見
+# るしかないですね．
+
+それ以外にもRubyの機能を呼び出す方法はいくつかあります．
+
+2.2.1 Rubyのプログラムをevalする
+
+CからRubyの機能を呼び出すもっとも簡単な方法として，文字列で
+与えられたRubyのプログラムを評価する以下の関数があります．
+
+  VALUE rb_eval_string(const char *str)
+
+この評価は現在の環境で行われます．つまり，現在のローカル変数
+などを受け継ぎます．
+
+2.2.2 IDまたはシンボル
+
+Cから文字列を経由せずにRubyのメソッドを呼び出すこともできま
+す．その前に，Rubyインタプリタ内でメソッドや変数名を指定する
+時に使われているIDについて説明しておきましょう．
+
+IDとは変数名，メソッド名を表す整数です．RubyではIDに対応する
+オブジェクトとしてシンボル(Symbol)があり，
+
+ :識別子
+
+でアクセスできます．Cからこの整数を得るためには関数
+
+  rb_intern(const char *name)
+
+を使います．Rubyから引数として与えられたシンボル(または文字
+列)をIDに変換するには以下の関数を使います．
+
+  rb_to_id(VALUE symbol)
+
+IDからシンボルを得るためには以下のマクロを使います．
+
+  VALUE ID2SYM(ID id)
+
+シンボルからIDを得るためには以下のマクロを使います．
+
+  ID SYM2ID(VALUE symbol)
+
+2.2.3 CからRubyのメソッドを呼び出す
+
+Cから文字列を経由せずにRubyのメソッドを呼び出すためには以下
+の関数を使います．
+
+  VALUE rb_funcall(VALUE recv, ID mid, int argc, ...)
+
+この関数はオブジェクトrecvのmidで指定されるメソッドを呼び出
+します．その他に引数の指定の仕方が違う以下の関数もあります．
+
+  VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
+  VALUE rb_apply(VALUE recv, ID mid, VALUE args)
+
+applyには引数としてRubyの配列を与えます．
+
+2.2.4 変数/定数を参照/更新する
+
+Cから関数を使って参照・更新できるのは，定数，インスタンス変
+数です．大域変数は一部のものはCの大域変数としてアクセスでき
+ます．ローカル変数を参照する方法は公開していません．
+
+オブジェクトのインスタンス変数を参照・更新する関数は以下の通
+りです．
+
+  VALUE rb_ivar_get(VALUE obj, ID id)
+  VALUE rb_ivar_set(VALUE obj, ID id, VALUE val)
+
+idはrb_intern()で得られるものを使ってください．
+
+定数を参照するには以下の関数を使ってください．
+
+  VALUE rb_const_get(VALUE obj, ID id)
+
+定数を新しく定義するためには『2.1.3 定数定義』で紹介さ
+れている関数を使ってください．
+
+3．RubyとCとの情報共有
+
+C言語とRubyの間で情報を共有する方法について解説します．
+
+3.1 Cから参照できるRubyの定数
+
+以下のRubyの定数はCのレベルから参照できます．
+
+  Qtrue
+  Qfalse
+
+    真偽値．QfalseはC言語でも偽とみなされます(つまり0)．
+
+  Qnil
+
+    C言語から見た「nil」．
+
+3.2 CとRubyで共有される大域変数
+
+CとRubyで大域変数を使って情報を共有できます．共有できる大域
+変数にはいくつかの種類があります．そのなかでもっとも良く使わ
+れると思われるのはrb_define_variable()です．
+
+  void rb_define_variable(const char *name, VALUE *var)
+
+この関数はRubyとCとで共有する大域変数を定義します．変数名が
+`$'で始まらない時には自動的に追加されます．この変数の値を変
+更すると自動的にRubyの対応する変数の値も変わります．
+
+またRuby側からは更新できない変数もあります．このread onlyの
+変数は以下の関数で定義します．
+
+  void rb_define_readonly_variable(const char *name, VALUE *var)
+
+これら変数の他にhookをつけた大域変数を定義できます．hook付き
+の大域変数は以下の関数を用いて定義します．hook付き大域変数の
+値の参照や設定はhookで行う必要があります．
+
+  void rb_define_hooked_variable(const char *name, VALUE *var,
+				 VALUE (*getter)(), void (*setter)())
+
+この関数はCの関数によってhookのつけられた大域変数を定義しま
+す．変数が参照された時には関数getterが，変数に値がセットされ
+た時には関数setterが呼ばれる．hookを指定しない場合はgetterや
+setterに0を指定します．
+
+# getterもsetterも0ならばrb_define_variable()と同じになる．
+
+それから，Cの関数によって実現されるRubyの大域変数を定義する
+関数があります．
+
+  void rb_define_virtual_variable(const char *name,
+				  VALUE (*getter)(), void (*setter)())
+
+この関数によって定義されたRubyの大域変数が参照された時には
+getterが，変数に値がセットされた時にはsetterが呼ばれます．
+
+getterとsetterの仕様は以下の通りです．
+
+  (*getter)(ID id, void *data, struct global_entry* entry);
+  (*setter)(VALUE val, ID id, void *data, struct global_entry* entry);
+
+3.3 CのデータをRubyオブジェクトにする
+
+Cの世界で定義されたデータ(構造体)をRubyのオブジェクトとして
+取り扱いたい場合がありえます．このような場合には，Dataという
+RubyオブジェクトにCの構造体(へのポインタ)をくるむことでRuby
+オブジェクトとして取り扱えるようになります．
+
+Dataオブジェクトを生成して構造体をRubyオブジェクトにカプセル
+化するためには，以下のマクロを使います．
+
+  Data_Wrap_Struct(klass, mark, free, ptr)
+
+このマクロの戻り値は生成されたDataオブジェクトです．
+
+klassはこのDataオブジェクトのクラスです．ptrはカプセル化する
+Cの構造体へのポインタです．markはこの構造体がRubyのオブジェ
+クトへの参照がある時に使う関数です．そのような参照を含まない
+時には0を指定します．
+
+# そのような参照は勧められません．
+
+freeはこの構造体がもう不要になった時に呼ばれる関数です．この
+関数がガーベージコレクタから呼ばれます．これが-1の場合は，単
+純に開放されます．
+
+Cの構造体の割当とDataオブジェクトの生成を同時に行うマクロと
+して以下のものが提供されています．
+
+  Data_Make_Struct(klass, type, mark, free, sval)
+
+このマクロの戻り値は生成されたDataオブジェクトです．
+
+klass, mark, freeはData_Wrap_Structと同じ働きをします．type
+は割り当てるC構造体の型です．割り当てられた構造体は変数sval
+に代入されます．この変数の型は (type*) である必要があります．
+
+Dataオブジェクトからポインタを取り出すのは以下のマクロを用い
+ます．
+
+  Data_Get_Struct(obj, type, sval)
+
+Cの構造体へのポインタは変数svalに代入されます．
+
+これらのDataの使い方はちょっと分かりにくいので，後で説明する
+例題を参照してください．
+
+4．例題 - dbmパッケージを作る
+
+ここまでの説明でとりあえず拡張ライブラリは作れるはずです．
+Rubyのextディレクトリにすでに含まれているdbmライブラリを例に
+して段階的に説明します．
+
+(1) ディレクトリを作る
+
+  % mkdir ext/dbm
+
+Ruby 1.1からは任意のディレクトリでダイナミックライブラリを作
+ることができるようになりました．Rubyに静的にリンクする場合に
+はRubyを展開したディレクトリの下，extディレクトリの中に拡張
+ライブラリ用のディレクトリを作る必要があります．名前は適当に
+選んで構いません．
+
+(2) 設計する
+
+まあ，当然なんですけど，どういう機能を実現するかどうかまず設
+計する必要があります．どんなクラスをつくるか，そのクラスには
+どんなメソッドがあるか，クラスが提供する定数などについて設計
+します．
+
+(3) Cコードを書く
+
+拡張ライブラリ本体となるC言語のソースを書きます．C言語のソー
+スがひとつの時には「ライブラリ名.c」を選ぶと良いでしょう．C
+言語のソースが複数の場合には逆に「ライブラリ名.c」というファ
+イル名は避ける必要があります．オブジェクトファイルとモジュー
+ル生成時に中間的に生成される「ライブラリ名.o」というファイル
+とが衝突するからです．
+
+Rubyは拡張ライブラリをロードする時に「Init_ライブラリ名」と
+いう関数を自動的に実行します．dbmライブラリの場合「Init_dbm」
+です．この関数の中でクラス，モジュール，メソッド，定数などの
+定義を行います．dbm.cから一部引用します．
+
+--
+Init_dbm()
+{
+    /* DBMクラスを定義する */
+    cDBM = rb_define_class("DBM", rb_cObject);
+    /* DBMはEnumerateモジュールをインクルードする */
+    rb_include_module(cDBM, rb_mEnumerable);
+
+    /* DBMクラスのクラスメソッドopen(): 引数はCの配列で受ける */
+    rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
+
+    /* DBMクラスのメソッドclose(): 引数はなし */
+    rb_define_method(cDBM, "close", fdbm_close, 0);
+    /* DBMクラスのメソッド[]: 引数は1個 */
+    rb_define_method(cDBM, "[]", fdbm_fetch, 1);
+		:
+
+    /* DBMデータを格納するインスタンス変数名のためのID */
+    id_dbm = rb_intern("dbm");
+}
+--
+
+DBMライブラリはdbmのデータと対応するオブジェクトになるはずで
+すから，Cの世界のdbmをRubyの世界に取り込む必要があります．
+
+
+dbm.cではData_Make_Structを以下のように使っています．
+
+--
+struct dbmdata {
+    int  di_size;
+    DBM *di_dbm;
+};
+
+
+obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
+--
+
+ここではdbmstruct構造体へのポインタをDataにカプセル化してい
+ます．DBM*を直接カプセル化しないのはclose()した時の処理を考
+えてのことです．
+
+Dataオブジェクトからdbmstruct構造体のポインタを取り出すため
+に以下のマクロを使っています．
+
+--
+#define GetDBM(obj, dbmp) {\
+    Data_Get_Struct(obj, struct dbmdata, dbmp);\
+    if (dbmp->di_dbm == 0) closed_dbm();\
+}
+--
+
+ちょっと複雑なマクロですが，要するにdbmdata構造体のポインタ
+の取り出しと，closeされているかどうかのチェックをまとめてい
+るだけです．
+
+DBMクラスにはたくさんメソッドがありますが，分類すると3種類の
+引数の受け方があります．ひとつは引数の数が固定のもので，例と
+してはdeleteメソッドがあります．deleteメソッドを実装している
+fdbm_delete()はこのようになっています．
+
+--
+static VALUE
+fdbm_delete(obj, keystr)
+    VALUE obj, keystr;
+{
+	:
+}
+--
+
+引数の数が固定のタイプは第1引数がself，第2引数以降がメソッド
+の引数となります．
+
+引数の数が不定のものはCの配列で受けるものとRubyの配列で受け
+るものとがあります．dbmライブラリの中で，Cの配列で受けるもの
+はDBMのクラスメソッドであるopen()です．これを実装している関
+数fdbm_s_open()はこうなっています．
+
+--
+static VALUE
+fdbm_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+	:
+    if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
+	mode = 0666;		/* default value */
+    }
+	:
+}
+--
+
+このタイプの関数は第1引数が与えられた引数の数，第2引数が与え
+られた引数の入っている配列になります．selfは第3引数として与
+えられます．
+
+この配列で与えられた引数を解析するための関数がopen()でも使わ
+れているrb_scan_args()です．第3引数に指定したフォーマットに
+従い，第4変数以降に指定した変数に値を代入してくれます．この
+フォーマットは，第1文字目が省略できない引数の数，第2文字目が
+省略できる引数の数，第3文字目が対応する相手が無いあまりの引
+数があるかどうかを示す"*"です．2文字目と3文字目は省略できま
+す．dbm.cの例では，フォーマットは"11"ですから，引数は最低1つ
+で，2つまで許されるという意味になります．省略されている時の
+変数の値はnil(C言語のレベルではQnil)になります．
+
+Rubyの配列で引数を受け取るものはindexesがあります．実装はこ
+うです．
+
+--
+static VALUE
+fdbm_indexes(obj, args)
+    VALUE obj, args;
+{
+	:
+}
+--
+
+第1引数はself，第2引数はRubyの配列です．
+
+** 注意事項
+
+Rubyと共有はしないがRubyのオブジェクトを格納する可能性のある
+Cの大域変数は以下の関数を使ってRubyインタプリタに変数の存在
+を教えてあげてください．でないとGCでトラブルを起こします．
+
+  void rb_global_variable(VALUE *var)
+
+(4) extconf.rbを用意する
+
+Makefileを作る場合の雛型になるextconf.rbというファイルを作り
+ます．extconf.rbはライブラリのコンパイルに必要な条件のチェッ
+クなどを行うことが目的です．まず，
+
+  require 'mkmf'
+
+をextconf.rbの先頭に置きます．extconf.rbの中では以下のRuby関
+数を使うことが出来ます．
+
+  have_library(lib, func): ライブラリの存在チェック
+  have_func(func, header): 関数の存在チェック
+  have_header(header): ヘッダファイルの存在チェック
+  create_makefile(target): Makefileの生成
+
+以下の変数を使うことができます．
+
+  $CFLAGS: コンパイル時に追加的に指定するフラグ(-Oなど)
+  $CPPFLAGS: プリプロセッサに追加的に指定するフラグ(-Iや-Dなど)
+  $LDFLAGS: リンク時に追加的に指定するフラグ(-Lなど)
+  $objs: リンクされるオブジェクトファイル名のリスト
+
+オブジェクトファイルのリストは、通常はソースファイルを検索し
+て自動的に生成されますが、makeの途中でソースを生成するような
+場合は明示的に指定する必要があります。
+
+ライブラリをコンパイルする条件が揃わず，そのライブラリをコン
+パイルしない時にはcreate_makefileを呼ばなければMakefileは生
+成されず，コンパイルも行われません．
+
+(5) dependを用意する
+
+もし，ディレクトリにdependというファイルが存在すれば，
+Makefileが依存関係をチェックしてくれます．
+
+  % gcc -MM *.c > depend
+
+などで作ることが出来ます．あって損は無いでしょう．
+
+(6) Makefileを生成する
+
+Makefileを実際に生成するためには
+
+  ruby extconf.rb
+
+とします．extconf.rbに require 'mkmf' の行がない場合にはエラー
+になりますので，引数を追加して
+
+  ruby -r mkmf extconf.rb
+
+としてください．
+
+ディレクトリをext以下に用意した場合にはRuby全体のmakeの時に
+自動的にMakefileが生成されますので，このステップは不要です．
+
+(7) makeする
+
+動的リンクライブラリを生成する場合にはその場でmakeしてくださ
+い．必要であれば make install でインストールされます．
+
+ext以下にディレクトリを用意した場合は，Rubyのディレクトリで
+makeを実行するとMakefileを生成からmake，必要によってはそのモ
+ジュールのRubyへのリンクまで自動的に実行してくれます．
+extconf.rbを書き換えるなどしてMakefileの再生成が必要な時はま
+たRubyディレクトリでmakeしてください．
+
+拡張ライブラリはmake installでRubyライブラリのディレクトリの
+下にコピーされます．もし拡張ライブラリと協調して使うRubyで記
+述されたプログラムがあり，Rubyライブラリに置きたい場合には，
+拡張ライブラリ用のディレクトリの下に lib というディレクトリ
+を作り，そこに 拡張子 .rb のファイルを置いておけば同時にイン
+ストールされます．
+
+(8) デバッグ
+
+まあ，デバッグしないと動かないでしょうね．ext/Setupにディレ
+クトリ名を書くと静的にリンクするのでデバッガが使えるようにな
+ります．その分コンパイルが遅くなりますけど．
+
+(9) できあがり
+
+後はこっそり使うなり，広く公開するなり，売るなり，ご自由にお
+使いください．Rubyの作者は拡張ライブラリに関して一切の権利を
+主張しません．
+
+Appendix A. Rubyのソースコードの分類
+
+Rubyのソースはいくつかに分類することが出来ます．このうちクラ
+スライブラリの部分は基本的に拡張ライブラリと同じ作り方になっ
+ています．これらのソースは今までの説明でほとんど理解できると
+思います．
+
+Ruby言語のコア
+
+  class.c
+  error.c
+  eval.c
+  gc.c
+  object.c
+  parse.y
+  variable.c
+
+ユーティリティ関数
+
+  dln.c
+  regex.c
+  st.c
+  util.c
+
+Rubyコマンドの実装
+
+  dmyext.c
+  inits.c
+  main.c
+  ruby.c
+  version.c
+
+クラスライブラリ
+
+  array.c
+  bignum.c
+  compar.c
+  dir.c
+  enum.c
+  file.c
+  hash.c
+  io.c
+  marshal.c
+  math.c
+  numeric.c
+  pack.c
+  prec.c
+  process.c
+  random.c
+  range.c
+  re.c
+  signal.c
+  sprintf.c
+  string.c
+  struct.c
+  time.c
+
+Appendix B. 拡張用関数リファレンス
+
+C言語からRubyの機能を利用するAPIは以下の通りである．
+
+** 型
+
+VALUE
+
+  Rubyオブジェクトを表現する型．必要に応じてキャストして用いる．
+  組み込み型を表現するCの型はruby.hに記述してあるRで始まる構造
+  体である．VALUE型をこれらにキャストするためにRで始まる構造体
+  名を全て大文字にした名前のマクロが用意されている．
+
+** 変数・定数
+
+Qnil
+
+  定数: nilオブジェクト
+
+Qtrue
+
+  定数: trueオブジェクト(真のデフォルト値)
+
+Qfalse
+
+  定数: falseオブジェクト
+
+** Cデータのカプセル化
+
+Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval)
+
+  Cの任意のポインタをカプセル化したRubyオブジェクトを返す．こ
+  のポインタがRubyからアクセスされなくなった時，freeで指定した
+  関数が呼ばれる．また，このポインタの指すデータが他のRubyオブ
+  ジェクトを指している場合，markに指定する関数でマークする必要
+  がある．
+
+Data_Make_Struct(klass, type, mark, free, sval)
+
+  type型のメモリをmallocし，変数svalに代入した後，それをカプセ
+  ル化したデータを返すマクロ．
+
+Data_Get_Struct(data, type, sval)
+
+  dataからtype型のポインタを取り出し変数svalに代入するマクロ．
+
+** 型チェック
+
+TYPE(value)
+FIXNUM_P(value)
+NIL_P(value)
+void Check_Type(VALUE value, int type)
+void Check_SafeStr(VALUE value)
+
+** 型変換
+
+FIX2INT(value)
+INT2FIX(i)
+NUM2INT(value)
+INT2NUM(i)
+NUM2DBL(value)
+rb_float_new(f)
+StringValue(value)
+StringValuePtr(value)
+StringValueCStr(value)
+rb_str_new2(s)
+
+** クラス/モジュール定義
+
+VALUE rb_define_class(const char *name, VALUE super)
+
+  superのサブクラスとして新しいRubyクラスを定義する．
+
+VALUE rb_define_class_under(VALUE module, const char *name, VALUE super)
+
+  superのサブクラスとして新しいRubyクラスを定義し，moduleの
+  定数として定義する．
+
+VALUE rb_define_module(const char *name)
+
+  新しいRubyモジュールを定義する．
+
+VALUE rb_define_module_under(VALUE module, const char *name)
+
+  新しいRubyモジュールを定義し，moduleの定数として定義する．
+
+void rb_include_module(VALUE klass, VALUE module)
+
+  モジュールをインクルードする．classがすでにmoduleをインク
+  ルードしている時には何もしない(多重インクルードの禁止)．
+
+void rb_extend_object(VALUE object, VALUE module)
+
+  オブジェクトをモジュール(で定義されているメソッド)で拡張する．
+
+** 大域変数定義
+
+void rb_define_variable(const char *name, VALUE *var)
+
+  RubyとCとで共有するグローバル変数を定義する．変数名が`$'で
+  始まらない時には自動的に追加される．nameとしてRubyの識別子
+  として許されない文字(例えば` ')を含む場合にはRubyプログラ
+  ムからは見えなくなる．
+
+void rb_define_readonly_variable(const char *name, VALUE *var)
+
+  RubyとCとで共有するread onlyのグローバル変数を定義する．
+  read onlyであること以外はrb_define_variable()と同じ．
+
+void rb_define_virtual_variable(const char *name,
+				VALUE (*getter)(), void (*setter)())
+
+  関数によって実現されるRuby変数を定義する．変数が参照された
+  時にはgetterが，変数に値がセットされた時にはsetterが呼ばれ
+  る．
+
+void rb_define_hooked_variable(const char *name, VALUE *var,
+			       VALUE (*getter)(), void (*setter)())
+
+  関数によってhookのつけられたグローバル変数を定義する．変数
+  が参照された時にはgetterが，関数に値がセットされた時には
+  setterが呼ばれる．getterやsetterに0を指定した時にはhookを
+  指定しないのと同じ事になる．
+
+void rb_global_variable(VALUE *var)
+
+  GCのため，Rubyプログラムからはアクセスされないが, Rubyオブ
+  ジェクトを含む大域変数をマークする．
+
+** 定数
+
+void rb_define_const(VALUE klass, const char *name, VALUE val)
+
+  定数を定義する．
+
+void rb_define_global_const(const char *name, VALUE val)
+
+  大域定数を定義する．
+
+     rb_define_const(rb_cObject, name, val)
+
+  と同じ意味．
+
+** メソッド定義
+
+rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+
+  メソッドを定義する．argcはselfを除く引数の数．argcが-1の時, 
+  関数には引数の数(selfを含まない)を第1引数, 引数の配列を第2
+  引数とする形式で与えられる(第3引数はself)．argcが-2の時, 
+  第1引数がself, 第2引数がargs(argsは引数を含むRubyの配列)と
+  いう形式で与えられる．
+ 
+rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+
+  privateメソッドを定義する．引数はrb_define_method()と同じ．
+
+rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+
+  特異メソッドを定義する．引数はrb_define_method()と同じ．
+
+rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
+
+  argc, argv形式で与えられた引数を分解する．fmtは必須引数の数, 
+  付加引数の数, 残りの引数があるかを指定する文字列で, "数字
+  数字*"という形式である． 2 番目の数字と"*"はそれぞれ省略可
+  能である．必須引数が一つもない場合は0を指定する．第3引数以
+  降は変数へのポインタで, 該当する要素がその変数に格納される．
+  付加引数に対応する引数が与えられていない場合は変数にQnilが
+  代入される．
+
+** Rubyメソッド呼び出し
+
+VALUE rb_funcall(VALUE recv, ID mid, int narg, ...)
+
+  メソッド呼び出し．文字列からmidを得るためにはrb_intern()を
+  使う．
+
+VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
+
+  メソッド呼び出し．引数をargc, argv形式で渡す．
+
+VALUE rb_eval_string(const char *str)
+
+  文字列をRubyスクリプトとしてコンパイル・実行する．
+
+ID rb_intern(const char *name)
+
+  文字列に対応するIDを返す．
+
+char *rb_id2name(ID id)
+
+  IDに対応する文字列を返す(デバッグ用)．
+
+char *rb_class2name(VALUE klass)
+
+  クラスの名前を返す(デバッグ用)．クラスが名前を持たない時には, 
+  祖先を遡って名前を持つクラスの名前を返す．
+
+int rb_respond_to(VALUE obj, ID id)
+
+  objがidで示されるメソッドを持つかどうかを返す。
+
+** インスタンス変数
+
+VALUE rb_iv_get(VALUE obj, const char *name)
+
+  objのインスタンス変数の値を得る．`@'で始まらないインスタン
+  ス変数は Rubyプログラムからアクセスできない「隠れた」イン
+  スタンス変数になる．定数は大文字の名前を持つクラス(または
+  モジュール)のインスタンス変数として実装されている．
+
+VALUE rb_iv_set(VALUE obj, const char *name, VALUE val)
+
+  objのインスタンス変数をvalにセットする．
+
+** 制御構造
+
+VALUE rb_iterate(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
+
+  func2をブロックとして設定し, func1をイテレータとして呼ぶ． 
+  func1には arg1が引数として渡され, func2には第1引数にイテレー
+  タから与えられた値, 第2引数にarg2が渡される．
+ 
+VALUE rb_yield(VALUE val)
+
+  valを値としてイテレータブロックを呼び出す．
+
+VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
+
+  関数func1をarg1を引数に呼び出す．func1の実行中に例外が発生
+  した時には func2をarg2を引数として呼ぶ．戻り値は例外が発生
+  しなかった時はfunc1の戻り値, 例外が発生した時にはfunc2の戻
+  り値である．
+
+VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, void (*func2)(), VALUE arg2)
+
+  関数func1をarg1を引数として実行し, 実行終了後(たとえ例外が
+  発生しても) func2をarg2を引数として実行する．戻り値はfunc1
+  の戻り値である(例外が発生した時は戻らない)．
+
+** 例外・エラー
+
+void rb_warning(const char *fmt, ...)
+
+  rb_verbose時に標準エラー出力に警告情報を表示する．引数は
+  printf()と同じ．
+
+void rb_raise(rb_eRuntimeError, const char *fmt, ...)
+
+  RuntimeError例外を発生させる．引数はprintf()と同じ．
+
+void rb_raise(VALUE exception, const char *fmt, ...)
+
+  exceptionで指定した例外を発生させる．fmt以下の引数は
+  printf()と同じ．
+
+void rb_fatal(const char *fmt, ...)
+
+  致命的例外を発生させる．通常の例外処理は行なわれず, インター
+  プリタが終了する(ただしensureで指定されたコードは終了前に
+  実行される)．
+
+void rb_bug(const char *fmt, ...)
+
+  インタープリタなどプログラムのバグでしか発生するはずのない
+  状況の時呼ぶ．インタープリタはコアダンプし直ちに終了する．
+  例外処理は一切行なわれない．
+
+** Rubyの初期化・実行
+
+Rubyをアプリケーションに埋め込む場合には以下のインタフェース
+を使う．通常の拡張ライブラリには必要ない．
+
+void ruby_init()
+
+  Rubyインタプリタの初期化を行なう．
+
+void ruby_options(int argc, char **argv)
+
+  Rubyインタプリタのコマンドライン引数の処理を行なう．
+
+void ruby_run()
+
+  Rubyインタプリタを実行する．
+
+void ruby_script(char *name)
+
+  Rubyのスクリプト名($0)を設定する．
+
+
+Appendix C. extconf.rbで使える関数たち
+
+extconf.rbの中では利用可能なコンパイル条件チェックの関数は以
+下の通りである．
+
+have_macro(macro, headers)
+
+  ヘッダファイルheaderをインクルードしてマクロmacroが定義さ
+  れているかどうかチェックする．マクロが定義されている時true
+  を返す．
+
+have_library(lib, func)
+
+  関数funcを定義しているライブラリlibの存在をチェックする．
+  ライブラリが存在する時，trueを返す．
+
+find_library(lib, func, path...)
+
+  関数funcを定義しているライブラリlibの存在を -Lpath を追加
+  しながらチェックする．ライブラリが見付かった時，trueを返す．
+
+have_func(func, header)
+
+  ヘッダファイルheaderをインクルードして関数funcの存在をチェッ
+  クする．funcが標準ではリンクされないライブラリ内のものであ
+  る時には先にhave_libraryでそのライブラリをチェックしておく
+  事．関数が存在する時trueを返す．
+
+have_var(var, header)
+
+  ヘッダファイルheaderをインクルードして変数varの存在をチェッ
+  クする．varが標準ではリンクされないライブラリ内のものであ
+  る時には先にhave_libraryでそのライブラリをチェックしておく
+  事．変数が存在する時trueを返す．
+
+have_header(header)
+
+  ヘッダファイルの存在をチェックする．ヘッダファイルが存在す
+  る時trueを返す．
+
+find_header(header, path...)
+
+  ヘッダファイルheaderの存在を -Ipath を追加しながらチェック
+  する．ヘッダファイルが見付かった時，trueを返す．
+
+have_struct_member(type, member, header)
+
+  ヘッダファイルheaderをインクルードして型typeにメンバmember
+  が存在するかをチェックする．typeが定義されていて，memberを
+  持つする時trueを返す．
+
+have_type(type, header, opt)
+
+  ヘッダファイルheaderをインクルードして型typeが存在するかを
+  チェックする．typeが定義されている時trueを返す．
+
+check_sizeof(type, header)
+
+  ヘッダファイルheaderをインクルードして型typeのchar単位サイ
+  ズを調べる．typeが定義されている時そのサイズを返す．定義さ
+  れていないときはnilを返す．
+
+create_makefile(target)
+
+  拡張ライブラリ用のMakefileを生成する．この関数を呼ばなけれ
+  ばそのライブラリはコンパイルされない．targetはモジュール名
+  を表す．
+
+find_executable(command, path)
+
+  コマンドcommandをFile::PATH_SEPARATORで区切られたパス名の
+  リストpathから探す．pathがnilまたは省略された場合は，環境
+  変数PATHの値を使用する．実行可能なコマンドが見つかった場合
+  はパスを含むファイル名，見つからなかった場合はnilを返す．
+
+with_config(withval[, default=nil])
+
+  コマンドライン上の--with-<withval>で指定されたオプション値を得る．
+
+enable_config(config, *defaults)
+disable_config(config, *defaults)
+
+  コマンドライン上の--enable-<config>または
+  --disable-<config>で指定された真偽値を得る．
+  --enable-<config>が指定されていた場合はtrue，
+  --disable-<config>が指定されていた場合はfalseを返す．
+  どちらも指定されていない場合は，ブロックつきで呼び出されている場合は
+  *defaultsをyieldした結果，ブロックなしなら*defaultsを返す．
+
+dir_config(target[, default_dir])
+dir_config(target[, default_include, default_lib])
+
+  コマンドライン上の--with-<target>-dir, --with-<target>-include,
+  --with-<target>-libのいずれかで指定されるディレクトリを
+  $CFLAGS や $LDFLAGS に追加する．--with-<target>-dir=/pathは
+  --with-<target>-include=/path/include --with-<target>-lib=/path/lib
+  と等価である．追加された include ディレクトリと lib ディレクトリの
+  配列を返す． ([include_dir, lib_dir])
+
+pkg_config(pkg)
+
+  pkg-configコマンドからパッケージpkgの情報を得る． 
+  pkg-configの実際のコマンド名は，--with-pkg-configコマンド
+  ラインオプションで指定可能．
+
+/*
+ * Local variables:
+ * fill-column: 60
+ * end:
+ */
diff --git a/ruby_1_8_6/README.ja b/ruby_1_8_6/README.ja
new file mode 100644
index 0000000000..df8cfc03f4
--- /dev/null
+++ b/ruby_1_8_6/README.ja
@@ -0,0 +1,160 @@
+* Rubyとは
+
+Rubyはシンプルかつ強力なオブジェクト指向スクリプト言語です．
+Rubyは最初から純粋なオブジェクト指向言語として設計されていま
+すから，オブジェクト指向プログラミングを手軽に行う事が出来ま
+す．もちろん通常の手続き型のプログラミングも可能です．
+
+Rubyはテキスト処理関係の能力などに優れ，Perlと同じくらい強力
+です．さらにシンプルな文法と，例外処理やイテレータなどの機構
+によって，より分かりやすいプログラミングが出来ます．
+
+
+* Rubyの特長
+
+  + シンプルな文法
+  + 普通のオブジェクト指向機能(クラス，メソッドコールなど)
+  + 特殊なオブジェクト指向機能(Mixin, 特異メソッドなど)
+  + 演算子オーバーロード
+  + 例外処理機能
+  + イテレータとクロージャ
+  + ガーベージコレクタ
+  + ダイナミックローディング (アーキテクチャによる)
+  + 移植性が高い．多くのUNIX上で動くだけでなく，DOSやWindows，
+    Mac，BeOSなどの上でも動く
+
+
+* 入手法
+
+** FTPで
+
+以下の場所においてあります．
+
+  ftp://ftp.ruby-lang.org/pub/ruby/
+
+** Subversionで
+
+本ブランチのRubyの最新のソースコードは次のコマンドで取得できます．
+
+  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
+
+開発先端のソースコードは次のコマンドで取得できます．
+
+  $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
+
+他に開発中のブランチの一覧は次のコマンドで見られます．
+
+  $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
+
+
+* ホームページ
+
+RubyのホームページのURLは
+
+   http://www.ruby-lang.org/
+
+です．
+
+
+* メーリングリスト
+
+Rubyのメーリングリストがあります。参加希望の方は
+
+   ruby-list-ctl@ruby-lang.org
+
+まで本文に
+
+   subscribe YourFirstName YourFamilyName
+   
+と書いて送って下さい。 
+
+Ruby開発者向けメーリングリストもあります。こちらではrubyのバ
+グ、将来の仕様拡張など実装上の問題について議論されています。
+参加希望の方は
+
+   ruby-dev-ctl@ruby-lang.org
+
+までruby-listと同様の方法でメールしてください。 
+
+Ruby拡張モジュールについて話し合うruby-extメーリングリストと
+数学関係の話題について話し合うruby-mathメーリングリストと
+英語で話し合うruby-talkメーリングリストもあります。参加方法
+はどれも同じです。 
+
+
+* コンパイル・インストール
+
+以下の手順で行ってください．
+
+  1. もしconfigureファイルが見つからない、もしくは
+     configure.inより古いようなら、autoconfを実行して
+     新しくconfigureを生成する
+
+  2. configureを実行してMakefileなどを生成する
+
+  3. (必要ならば)defines.hを編集する
+
+     多分，必要無いと思います．
+
+  4. (必要ならば)ext/Setupに静的にリンクする拡張モジュールを
+     指定する
+
+     ext/Setupに記述したモジュールは静的にリンクされます．
+
+     ダイナミックローディングをサポートしていないアーキテク
+     チャではSetupの1行目の「option nodynamic」という行のコ
+     メントを外す必要があります．また，このアーキテクチャで
+     拡張モジュールを利用するためには，あらかじめ静的にリン
+     クしておく必要があります．
+
+  5. makeを実行してコンパイルする
+
+  6. make testでテストを行う．
+
+     「test succeeded」と表示されれば成功です．ただしテスト
+     に成功しても完璧だと保証されている訳ではありません．
+
+  7. make install
+
+     rootで作業する必要があるかもしれません．
+
+もし，コンパイル時にエラーが発生した場合にはエラーのログとマ
+シン，OSの種類を含むできるだけ詳しいレポートを作者に送ってく
+ださると他の方のためにもなります．
+
+
+* 移植
+
+UNIXであればconfigureがほとんどの差異を吸収してくれるはずで
+すが，思わぬ見落としがあった場合(あるに違いない)，作者にその
+ことをレポートすれば，解決できるかも知れません．
+
+アーキテクチャにもっとも依存するのはGC部です．RubyのGCは対象
+のアーキテクチャがsetjmp()によって全てのレジスタを jmp_bufに
+格納することと，jmp_bufとスタックが32bitアラインメントされて
+いることを仮定しています．特に前者が成立しない場合の対応は非
+常に困難でしょう．後者の解決は比較的簡単で，gc.cでスタックを
+マークしている部分にアラインメントのバイト数だけずらしてマー
+クするコードを追加するだけで済みます．「defined(THINK_C)」で
+括られている部分を参考にしてください
+
+# 実際にはRubyはThink Cではコンパイルできません．
+
+レジスタウィンドウを持つCPUでは，レジスタウィンドウをスタッ
+クにフラッシュするアセンブラコードを追加する必要があるかも知
+れません．
+
+
+* 配布条件
+
+COPYING.jaファイルを参照してください。
+
+
+* 著者
+
+コメント，バグレポートその他は matz@netlab.jp まで．
+-------------------------------------------------------
+created at: Thu Aug  3 11:57:36 JST 1995
+Local variables:
+mode: indented-text
+end:
diff --git a/ruby_1_8_6/ToDo b/ruby_1_8_6/ToDo
new file mode 100644
index 0000000000..b55e399edf
--- /dev/null
+++ b/ruby_1_8_6/ToDo
@@ -0,0 +1,126 @@
+Language Spec.
+
+- Class#allocate - basicNew
+- class Foo::Bar<Baz .. end, module Boo::Bar .. end
+* operator !! for rescue. ???
+* objectify characters
+* ../... outside condition invokes operator method too.
+* ... inside condition turns off just before right condition.???
+* package or access control for global variables??
+* named arguments like foo(nation:="german") or foo(nation: "german").
+* method to retrieve argument information (needs new C API)
+* multiple return values, yield values.  maybe incompatible ???
+* cascading method invocation ???
+* def Class#method .. end ??
+* def Foo::Bar::baz() .. end ??
+* I18N (or M17N) script/string/regexp
+* Fixnum 0 as false ????
+* discourage use of symbol variables (e.g. $/, etc.) in manual
+* discourage use of Perlish features by giving warnings.
+* non confusing in-block local variable (is it possible?)
+  + remove scope by block
+  + variables appears within block may have independent values.
+* Regexp: make /o thread safe.
+* decide whether begin with rescue or ensure make do..while loop.
+* a +1 to be a+1, not a(+1).
+* unify == and eql? again
+* to_i returns nil if str contains no digit.
+* raise exception by `` error
+* jar like combined library package. -> RubyGems?
+* resumable Exception via Exception#resume.
+* method combination, e.g. before, after, around, etc.
+* .. or something like defadvice in Emacs.
+* property - for methods, or for objects in general.
+* "in" modifier, to annotate, or to encourage assertion.
+* selector namespace - something like generic-flet in CLOS, to help RubyBehavior
+* private instance variable (as in Python?) @_foo in class Foo => @_Foo_foo
+* warn/error "bare word" method, like "foo",  you should type "foo()"
+* clarify evaluation order of operator argument (=~, .., ...)
+* :symbol => value hash in the form of {symbol: value, ...} ??
+
+Hacking Interpreter
+
+- generational GC
+* non-blocking open (e.g. for named pipe) for thread
+* avoid blocking with gethostbyname/gethostbyaddr (use fork ???)
+* objectify interpreters ???
+* remove rb_eval() recursions
+* syntax tree -> bytecode ???
+* scrambled script, or script filter
+* setuid ruby
+* performance tune for in-block (dynamic) local variables.
+* give warnings to assign magic variables.
+* export rb_io_{addstr,printf,puts,print}
+* autoload should work with threads [ruby-talk:4589]
+* remove stdio dependency from IOs.
+* warn for inconsistent local variable usage (lv m and method m at the same time). 
+* MicroRuby
+* Built-in Interactive Ruby.
+* Parser API
+* trap every method invocation, which can be enabled by e.g. trap_call :method.
+* unify Errno exceptions of same errno, or new exception comparison scheme.
+* 2.times{|i| if i==0 then a = 15 else puts eval("a") end} should print nil.
+* Thread#max_stack_size attribute (possible??)
+
+Standard Libraries
+
+- Module#define_method which takes a name and a body (block, proc or method).
+- Enume#inject
+- Array#fetch
+- IO::for_fd
+- Process::waitall [ruby-talk:4557]
+- Process::Status
+- File::lchown, File::lchmod; xxx - still need work for non existing platforms
+- move Time::times to Process.
+- Enumerable#sort_by for Schwartzian transformation
+- fork_and_kill_other_threads.
+- signal list (Signal::trap, Signal::list).
+- move NameError under StandardError.
+- Integer#to_s(base)
+- Hash::new{default}
+- hash etc. should handle self referenceing array/hash
+- Array#select(n1,n2...) works like Array#indexes(n1,n2...)
+- use Mersenne Twister RNG for random.
+- deprecate Array#indexes, and Array#indices.
+- remove dependency on MAXPATHLEN.
+* String#scanf(?)
+* Object#fmt(?)
+* Time::strptime
+* Integer[num], Float[num];  Fixnum[num]?
+* method to retrieve non-number trailer for to_i/to_f.
+* Stream or Port, abstract superclass of IO ?
+* String#{pred,prev}, String#downto
+* optional stepsize argument for succ()
+* Ruby module -- Ruby::Version, Ruby::Interpreter
+* introduce Boolean class; super of TrueClass, FalseClass
+* synchronized method - synchronized{...}, synchronized :foo, :bar
+* Array#&, Array#| to allow duplication. ???
+* way to specify immortal (fork endurance) thread;
+* or raise ForkException to every thread but fork caller.
+* new user-defined marshal scheme. _dump(dumper), _load(restorer)
+* library to load per-user profile seeking .ruby_profile or ruby.ini file.
+* warning framework (warn, warning for Ruby level)
+* marshal should not depend on sprintf (works bad with locale).
+* ternary arg pow: a.pow(b,c) == a**b%c
+* new caller(), e.g. call_stack; needs better name.
+* pointer share mechanism similar to one in String for Array.
+* require "1.6" etc. by /usr/lib/ruby/1.6/1.6.rb ;-)
+* save both "feature names" and "normalized path" in $"
+* implement Mutex_m (or MutexMixin) using Mutex.
+
+Extension Libraries
+
+* ptk.rb pTk wrapper that is compatible to tk.rb
+* Berkeley DB extension
+* BitVector
+* thread-safe fcgi
+
+Ruby Libraries
+
+* urllib.rb, nttplib.rb, etc.
+* format like perl's
+
+Tools
+
+* freeze or undump to bundle everything
+* bundle using zlib
diff --git a/ruby_1_8_6/array.c b/ruby_1_8_6/array.c
new file mode 100644
index 0000000000..d392fc1b91
--- /dev/null
+++ b/ruby_1_8_6/array.c
@@ -0,0 +1,3065 @@
+/**********************************************************************
+
+  array.c -
+
+  $Author$
+  $Date$
+  created at: Fri Aug  6 09:46:12 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "util.h"
+#include "st.h"
+
+VALUE rb_cArray;
+static ID id_cmp;
+
+#define ARY_DEFAULT_SIZE 16
+
+void
+rb_mem_clear(mem, size)
+    register VALUE *mem;
+    register long size;
+{
+    while (size--) {
+	*mem++ = Qnil;
+    }
+}
+
+static inline void
+memfill(mem, size, val)
+    register VALUE *mem;
+    register long size;
+    register VALUE val;
+{
+    while (size--) {
+	*mem++ = val;
+    }
+}
+
+#define ARY_TMPLOCK  FL_USER1
+
+static inline void
+rb_ary_modify_check(ary)
+    VALUE ary;
+{
+    if (OBJ_FROZEN(ary)) rb_error_frozen("array");
+    if (FL_TEST(ary, ARY_TMPLOCK))
+	rb_raise(rb_eRuntimeError, "can't modify array during iteration");
+    if (!OBJ_TAINTED(ary) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify array");
+}
+
+static void
+rb_ary_modify(ary)
+    VALUE ary;
+{
+    VALUE *ptr;
+
+    rb_ary_modify_check(ary);
+    if (FL_TEST(ary, ELTS_SHARED)) {
+	ptr = ALLOC_N(VALUE, RARRAY(ary)->len);
+	FL_UNSET(ary, ELTS_SHARED);
+	RARRAY(ary)->aux.capa = RARRAY(ary)->len;
+	MEMCPY(ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+	RARRAY(ary)->ptr = ptr;
+    }
+}
+
+VALUE
+rb_ary_freeze(ary)
+    VALUE ary;
+{
+    return rb_obj_freeze(ary);
+}
+
+/*
+ *  call-seq:
+ *     array.frozen?  -> true or false
+ *
+ *  Return <code>true</code> if this array is frozen (or temporarily frozen
+ *  while being sorted).
+ */
+
+static VALUE
+rb_ary_frozen_p(ary)
+    VALUE ary;
+{
+    if (OBJ_FROZEN(ary)) return Qtrue;
+    if (FL_TEST(ary, ARY_TMPLOCK)) return Qtrue;
+    return Qfalse;
+}
+
+static VALUE ary_alloc _((VALUE));
+static VALUE
+ary_alloc(klass)
+    VALUE klass;
+{
+    NEWOBJ(ary, struct RArray);
+    OBJSETUP(ary, klass, T_ARRAY);
+
+    ary->len = 0;
+    ary->ptr = 0;
+    ary->aux.capa = 0;
+
+    return (VALUE)ary;
+}
+
+static VALUE
+ary_new(klass, len)
+    VALUE klass;
+    long len;
+{
+    VALUE ary = ary_alloc(klass);
+
+    if (len < 0) {
+	rb_raise(rb_eArgError, "negative array size (or size too big)");
+    }
+    if (len > 0 && len * sizeof(VALUE) <= len) {
+	rb_raise(rb_eArgError, "array size too big");
+    }
+    if (len == 0) len++;
+    RARRAY(ary)->ptr = ALLOC_N(VALUE, len);
+    RARRAY(ary)->aux.capa = len;
+
+    return ary;
+}
+
+VALUE
+rb_ary_new2(len)
+    long len;
+{
+    return ary_new(rb_cArray, len);
+}
+
+
+VALUE
+rb_ary_new()
+{
+    return rb_ary_new2(ARY_DEFAULT_SIZE);
+}
+
+#ifdef HAVE_STDARG_PROTOTYPES
+#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_ary_new3(long n, ...)
+#else
+rb_ary_new3(n, va_alist)
+    long n;
+    va_dcl
+#endif
+{
+    va_list ar;
+    VALUE ary;
+    long i;
+
+    ary = rb_ary_new2(n);
+
+    va_init_list(ar, n);
+    for (i=0; i<n; i++) {
+	RARRAY(ary)->ptr[i] = va_arg(ar, VALUE);
+    }
+    va_end(ar);
+
+    RARRAY(ary)->len = n;
+    return ary;
+}
+
+VALUE
+rb_ary_new4(n, elts)
+    long n;
+    const VALUE *elts;
+{
+    VALUE ary;
+
+    ary = rb_ary_new2(n);
+    if (n > 0 && elts) {
+	MEMCPY(RARRAY(ary)->ptr, elts, VALUE, n);
+    }
+
+    /* This assignment to len will be moved to the above "if" block in Ruby 1.9 */
+    RARRAY(ary)->len = n;
+
+    return ary;
+}
+
+VALUE
+rb_assoc_new(car, cdr)
+    VALUE car, cdr;
+{
+    VALUE ary;
+
+    ary = rb_ary_new2(2);
+    RARRAY(ary)->ptr[0] = car;
+    RARRAY(ary)->ptr[1] = cdr;
+    RARRAY(ary)->len = 2;
+
+    return ary;
+}
+
+static VALUE
+to_ary(ary)
+    VALUE ary;
+{
+    return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
+}
+
+VALUE
+rb_check_array_type(ary)
+    VALUE ary;
+{
+    return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary");
+}
+
+static VALUE rb_ary_replace _((VALUE, VALUE));
+
+/*
+ *  call-seq:
+ *     Array.new(size=0, obj=nil)
+ *     Array.new(array)
+ *     Array.new(size) {|index| block }
+ *
+ *  Returns a new array. In the first form, the new array is
+ *  empty. In the second it is created with _size_ copies of _obj_
+ *  (that is, _size_ references to the same
+ *  _obj_). The third form creates a copy of the array
+ *  passed as a parameter (the array is generated by calling
+ *  to_ary  on the parameter). In the last form, an array
+ *  of the given size is created. Each element in this array is
+ *  calculated by passing the element's index to the given block and
+ *  storing the return value.
+ *
+ *     Array.new
+ *     Array.new(2)
+ *     Array.new(5, "A")
+ * 
+ *     # only one copy of the object is created
+ *     a = Array.new(2, Hash.new)
+ *     a[0]['cat'] = 'feline'
+ *     a
+ *     a[1]['cat'] = 'Felix'
+ *     a
+ * 
+ *     # here multiple copies are created
+ *     a = Array.new(2) { Hash.new }
+ *     a[0]['cat'] = 'feline'
+ *     a
+ * 
+ *     squares = Array.new(5) {|i| i*i}
+ *     squares
+ * 
+ *     copy = Array.new(squares)
+ */
+
+static VALUE
+rb_ary_initialize(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    long len;
+    VALUE size, val;
+
+    rb_ary_modify(ary);
+    if (rb_scan_args(argc, argv, "02", &size, &val) == 0) {
+	RARRAY(ary)->len = 0;
+	if (rb_block_given_p()) {
+	    rb_warning("given block not used");
+	}
+	return ary;
+    }
+
+    if (argc == 1 && !FIXNUM_P(size)) {
+	val = rb_check_array_type(size);
+	if (!NIL_P(val)) {
+	    rb_ary_replace(ary, val);
+	    return ary;
+	}
+    }
+
+    len = NUM2LONG(size);
+    if (len < 0) {
+	rb_raise(rb_eArgError, "negative array size");
+    }
+    if (len > 0 && len * (long)sizeof(VALUE) <= len) {
+	rb_raise(rb_eArgError, "array size too big");
+    }
+    if (len > RARRAY(ary)->aux.capa) {
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
+	RARRAY(ary)->aux.capa = len;
+    }
+    if (rb_block_given_p()) {
+	long i;
+
+	if (argc == 2) {
+	    rb_warn("block supersedes default value argument");
+	}
+	for (i=0; i<len; i++) {
+	    rb_ary_store(ary, i, rb_yield(LONG2NUM(i)));
+	    RARRAY(ary)->len = i + 1;
+	}
+    }
+    else {
+	memfill(RARRAY(ary)->ptr, len, val);
+	RARRAY(ary)->len = len;
+    }
+
+    return ary;
+}
+
+
+/* 
+* Returns a new array populated with the given objects. 
+*
+*   Array.[]( 1, 'a', /^A/ )
+*   Array[ 1, 'a', /^A/ ]
+*   [ 1, 'a', /^A/ ]
+*/
+
+static VALUE
+rb_ary_s_create(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE ary = ary_alloc(klass);
+
+    if (argc > 0) {
+	RARRAY(ary)->ptr = ALLOC_N(VALUE, argc);
+	MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
+    }
+    RARRAY(ary)->len = RARRAY(ary)->aux.capa = argc;
+
+    return ary;
+}
+
+void
+rb_ary_store(ary, idx, val)
+    VALUE ary;
+    long idx;
+    VALUE val;
+{
+    if (idx < 0) {
+	idx += RARRAY(ary)->len;
+	if (idx < 0) {
+	    rb_raise(rb_eIndexError, "index %ld out of array",
+		    idx - RARRAY(ary)->len);
+	}
+    }
+
+    rb_ary_modify(ary);
+    if (idx >= RARRAY(ary)->aux.capa) {
+	long new_capa = RARRAY(ary)->aux.capa / 2;
+
+	if (new_capa < ARY_DEFAULT_SIZE) {
+	    new_capa = ARY_DEFAULT_SIZE;
+	}
+	new_capa += idx;
+	if (new_capa * (long)sizeof(VALUE) <= new_capa) {
+	    rb_raise(rb_eArgError, "index too big");
+	}
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, new_capa);
+	RARRAY(ary)->aux.capa = new_capa;
+    }
+    if (idx > RARRAY(ary)->len) {
+	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len,
+		     idx-RARRAY(ary)->len + 1);
+    }
+
+    if (idx >= RARRAY(ary)->len) {
+	RARRAY(ary)->len = idx + 1;
+    }
+    RARRAY(ary)->ptr[idx] = val;
+}
+
+/*
+ *  call-seq:
+ *     array << obj            -> array
+ *  
+ *  Append---Pushes the given object on to the end of this array. This
+ *  expression returns the array itself, so several appends
+ *  may be chained together.
+ *
+ *     [ 1, 2 ] << "c" << "d" << [ 3, 4 ]
+ *             #=>  [ 1, 2, "c", "d", [ 3, 4 ] ]
+ *
+ */
+
+VALUE
+rb_ary_push(ary, item)
+    VALUE ary;
+    VALUE item;
+{
+    rb_ary_store(ary, RARRAY(ary)->len, item);
+    return ary;
+}
+
+/* 
+ *  call-seq:
+ *     array.push(obj, ... )   -> array
+ *  
+ *  Append---Pushes the given object(s) on to the end of this array. This
+ *  expression returns the array itself, so several appends
+ *  may be chained together.
+ *
+ *     a = [ "a", "b", "c" ]
+ *     a.push("d", "e", "f")  
+ *             #=> ["a", "b", "c", "d", "e", "f"]
+ */
+
+static VALUE
+rb_ary_push_m(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    while (argc--) {
+	rb_ary_push(ary, *argv++);
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.pop  -> obj or nil
+ *  
+ *  Removes the last element from <i>self</i> and returns it, or
+ *  <code>nil</code> if the array is empty.
+ *     
+ *     a = [ "a", "m", "z" ]
+ *     a.pop   #=> "z"
+ *     a       #=> ["a", "m"]
+ */
+
+VALUE
+rb_ary_pop(ary)
+    VALUE ary;
+{
+    rb_ary_modify_check(ary);
+    if (RARRAY(ary)->len == 0) return Qnil;
+    if (!FL_TEST(ary, ELTS_SHARED) &&
+	    RARRAY(ary)->len * 2 < RARRAY(ary)->aux.capa &&
+	    RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
+	RARRAY(ary)->aux.capa = RARRAY(ary)->len * 2;
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+    }
+    return RARRAY(ary)->ptr[--RARRAY(ary)->len];
+}
+
+static VALUE
+ary_make_shared(ary)
+    VALUE ary;
+{
+    if (!FL_TEST(ary, ELTS_SHARED)) {
+	NEWOBJ(shared, struct RArray);
+	OBJSETUP(shared, rb_cArray, T_ARRAY);
+
+	shared->len = RARRAY(ary)->len;
+	shared->ptr = RARRAY(ary)->ptr;
+	shared->aux.capa = RARRAY(ary)->aux.capa;
+	RARRAY(ary)->aux.shared = (VALUE)shared;
+	FL_SET(ary, ELTS_SHARED);
+	OBJ_FREEZE(shared);
+	return (VALUE)shared;
+    }
+    else {
+	return RARRAY(ary)->aux.shared;
+    }
+}
+
+/*
+ *  call-seq:
+ *     array.shift   ->   obj or nil
+ *  
+ *  Returns the first element of <i>self</i> and removes it (shifting all
+ *  other elements down by one). Returns <code>nil</code> if the array
+ *  is empty.
+ *     
+ *     args = [ "-m", "-q", "filename" ]
+ *     args.shift   #=> "-m"
+ *     args         #=> ["-q", "filename"]
+ */
+
+VALUE
+rb_ary_shift(ary)
+    VALUE ary;
+{
+    VALUE top;
+
+    rb_ary_modify_check(ary);
+    if (RARRAY(ary)->len == 0) return Qnil;
+    top = RARRAY(ary)->ptr[0];
+    if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE && !FL_TEST(ary, ELTS_SHARED)) {
+	MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1);
+    }
+    else {
+	if (!FL_TEST(ary, ELTS_SHARED)) {
+	    RARRAY(ary)->ptr[0] = Qnil;
+	}
+	ary_make_shared(ary);
+	RARRAY(ary)->ptr++;		/* shift ptr */
+    }
+    RARRAY(ary)->len--;
+
+    return top;
+}
+
+VALUE
+rb_ary_unshift(ary, item)
+    VALUE ary, item;
+{
+    rb_ary_modify(ary);
+    if (RARRAY(ary)->len == RARRAY(ary)->aux.capa) {
+	long capa_inc = RARRAY(ary)->aux.capa / 2;
+	if (capa_inc < ARY_DEFAULT_SIZE) {
+	    capa_inc = ARY_DEFAULT_SIZE;
+	}
+	RARRAY(ary)->aux.capa += capa_inc;
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+    }
+
+    /* sliding items */
+    MEMMOVE(RARRAY(ary)->ptr + 1, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+
+    RARRAY(ary)->len++;
+    RARRAY(ary)->ptr[0] = item;
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.unshift(obj, ...)  -> array
+ *  
+ *  Prepends objects to the front of <i>array</i>.
+ *  other elements up one.
+ *     
+ *     a = [ "b", "c", "d" ]
+ *     a.unshift("a")   #=> ["a", "b", "c", "d"]
+ *     a.unshift(1, 2)  #=> [ 1, 2, "a", "b", "c", "d"]
+ */
+
+static VALUE
+rb_ary_unshift_m(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    long len = RARRAY(ary)->len;
+
+    if (argc == 0) return ary;
+
+    /* make rooms by setting the last item */
+    rb_ary_store(ary, len + argc - 1, Qnil);
+
+    /* sliding items */
+    MEMMOVE(RARRAY(ary)->ptr + argc, RARRAY(ary)->ptr, VALUE, len);
+    MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
+    
+    return ary;
+}
+
+/* faster version - use this if you don't need to treat negative offset */
+static inline VALUE
+rb_ary_elt(ary, offset)
+    VALUE ary;
+    long offset;
+{
+    if (RARRAY(ary)->len == 0) return Qnil;
+    if (offset < 0 || RARRAY(ary)->len <= offset) {
+	return Qnil;
+    }
+    return RARRAY(ary)->ptr[offset];
+}
+
+VALUE
+rb_ary_entry(ary, offset)
+    VALUE ary;
+    long offset;
+{
+    if (offset < 0) {
+	offset += RARRAY(ary)->len;
+    }
+    return rb_ary_elt(ary, offset);
+}
+
+static VALUE
+rb_ary_subseq(ary, beg, len)
+    VALUE ary;
+    long beg, len;
+{
+    VALUE klass, ary2, shared;
+    VALUE *ptr;
+
+    if (beg > RARRAY(ary)->len) return Qnil;
+    if (beg < 0 || len < 0) return Qnil;
+
+    if (beg + len > RARRAY(ary)->len) {
+	len = RARRAY(ary)->len - beg;
+	if (len < 0)
+	    len = 0;
+    }
+    klass = rb_obj_class(ary);
+    if (len == 0) return ary_new(klass, 0);
+
+    shared = ary_make_shared(ary);
+    ptr = RARRAY(ary)->ptr;
+    ary2 = ary_alloc(klass);
+    RARRAY(ary2)->ptr = ptr + beg;
+    RARRAY(ary2)->len = len;
+    RARRAY(ary2)->aux.shared = shared;
+    FL_SET(ary2, ELTS_SHARED);
+
+    return ary2;
+}
+
+/* 
+ *  call-seq:
+ *     array[index]                -> obj      or nil
+ *     array[start, length]        -> an_array or nil
+ *     array[range]                -> an_array or nil
+ *     array.slice(index)          -> obj      or nil
+ *     array.slice(start, length)  -> an_array or nil
+ *     array.slice(range)          -> an_array or nil
+ *
+ *  Element Reference---Returns the element at _index_,
+ *  or returns a subarray starting at _start_ and
+ *  continuing for _length_ elements, or returns a subarray
+ *  specified by _range_.
+ *  Negative indices count backward from the end of the
+ *  array (-1 is the last element). Returns nil if the index
+ *  (or starting index) are out of range.
+ *
+ *     a = [ "a", "b", "c", "d", "e" ]
+ *     a[2] +  a[0] + a[1]    #=> "cab"
+ *     a[6]                   #=> nil
+ *     a[1, 2]                #=> [ "b", "c" ]
+ *     a[1..3]                #=> [ "b", "c", "d" ]
+ *     a[4..7]                #=> [ "e" ]
+ *     a[6..10]               #=> nil
+ *     a[-3, 3]               #=> [ "c", "d", "e" ]
+ *     # special cases
+ *     a[5]                   #=> nil
+ *     a[5, 1]                #=> []
+ *     a[5..10]               #=> []
+ *
+ */
+
+VALUE
+rb_ary_aref(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    VALUE arg;
+    long beg, len;
+
+    if (argc == 2) {
+	if (SYMBOL_P(argv[0])) {
+	    rb_raise(rb_eTypeError, "Symbol as array index");
+	}
+	beg = NUM2LONG(argv[0]);
+	len = NUM2LONG(argv[1]);
+	if (beg < 0) {
+	    beg += RARRAY(ary)->len;
+	}
+	return rb_ary_subseq(ary, beg, len);
+    }
+    if (argc != 1) {
+	rb_scan_args(argc, argv, "11", 0, 0);
+    }
+    arg = argv[0];
+    /* special case - speeding up */
+    if (FIXNUM_P(arg)) {
+	return rb_ary_entry(ary, FIX2LONG(arg));
+    }
+    if (SYMBOL_P(arg)) {
+	rb_raise(rb_eTypeError, "Symbol as array index");
+    }
+    /* check if idx is Range */
+    switch (rb_range_beg_len(arg, &beg, &len, RARRAY(ary)->len, 0)) {
+      case Qfalse:
+	break;
+      case Qnil:
+	return Qnil;
+      default:
+	return rb_ary_subseq(ary, beg, len);
+    }
+    return rb_ary_entry(ary, NUM2LONG(arg));
+}
+
+/* 
+ *  call-seq:
+ *     array.at(index)   ->   obj  or nil
+ *
+ *  Returns the element at _index_. A
+ *  negative index counts from the end of _self_.  Returns +nil+
+ *  if the index is out of range. See also <code>Array#[]</code>.
+ *  (<code>Array#at</code> is slightly faster than <code>Array#[]</code>,
+ *  as it does not accept ranges and so on.)
+ *
+ *     a = [ "a", "b", "c", "d", "e" ]
+ *     a.at(0)     #=> "a"
+ *     a.at(-1)    #=> "e"
+ */
+
+static VALUE
+rb_ary_at(ary, pos)
+    VALUE ary, pos;
+{
+    return rb_ary_entry(ary, NUM2LONG(pos));
+}
+
+/*
+ *  call-seq:
+ *     array.first   ->   obj or nil
+ *     array.first(n) -> an_array
+ *
+ *  Returns the first element, or the first +n+ elements, of the array.
+ *  If the array is empty, the first form returns <code>nil</code>, and the
+ *  second form returns an empty array.
+ *
+ *     a = [ "q", "r", "s", "t" ]
+ *     a.first    #=> "q"
+ *     a.first(1) #=> ["q"]
+ *     a.first(3) #=> ["q", "r", "s"]
+ */
+
+static VALUE
+rb_ary_first(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    if (argc == 0) {
+	if (RARRAY(ary)->len == 0) return Qnil;
+	return RARRAY(ary)->ptr[0];
+    }
+    else {
+	VALUE nv, result;
+	long n, i;
+
+	rb_scan_args(argc, argv, "01", &nv);
+	n = NUM2LONG(nv);
+	if (n > RARRAY(ary)->len) n = RARRAY(ary)->len;
+	result = rb_ary_new2(n);
+	for (i=0; i<n; i++) {
+	    rb_ary_push(result, RARRAY(ary)->ptr[i]);
+	}
+	return result;
+    }
+}
+
+/*
+ *  call-seq:
+ *     array.last     ->  obj or nil
+ *     array.last(n)  ->  an_array
+ *  
+ *  Returns the last element(s) of <i>self</i>. If the array is empty,
+ *  the first form returns <code>nil</code>.
+ *     
+ *     [ "w", "x", "y", "z" ].last   #=> "z"
+ */
+
+static VALUE
+rb_ary_last(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    if (argc == 0) {
+	if (RARRAY(ary)->len == 0) return Qnil;
+	return RARRAY(ary)->ptr[RARRAY(ary)->len-1];
+    }
+    else {
+	VALUE nv, result;
+	long n, i;
+
+	rb_scan_args(argc, argv, "01", &nv);
+	n = NUM2LONG(nv);
+	if (n > RARRAY(ary)->len) n = RARRAY(ary)->len;
+	result = rb_ary_new2(n);
+	for (i=RARRAY(ary)->len-n; n--; i++) {
+	    rb_ary_push(result, RARRAY(ary)->ptr[i]);
+	}
+	return result;
+    }
+}
+
+/*
+ *  call-seq:
+ *     array.fetch(index)                    -> obj
+ *     array.fetch(index, default )          -> obj
+ *     array.fetch(index) {|index| block }   -> obj
+ *  
+ *  Tries to return the element at position <i>index</i>. If the index
+ *  lies outside the array, the first form throws an
+ *  <code>IndexError</code> exception, the second form returns
+ *  <i>default</i>, and the third form returns the value of invoking
+ *  the block, passing in the index. Negative values of <i>index</i>
+ *  count from the end of the array.
+ *     
+ *     a = [ 11, 22, 33, 44 ]
+ *     a.fetch(1)               #=> 22
+ *     a.fetch(-1)              #=> 44
+ *     a.fetch(4, 'cat')        #=> "cat"
+ *     a.fetch(4) { |i| i*i }   #=> 16
+ */
+
+static VALUE
+rb_ary_fetch(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    VALUE pos, ifnone;
+    long block_given;
+    long idx;
+
+    rb_scan_args(argc, argv, "11", &pos, &ifnone);
+    block_given = rb_block_given_p();
+    if (block_given && argc == 2) {
+	rb_warn("block supersedes default value argument");
+    }
+    idx = NUM2LONG(pos);
+
+    if (idx < 0) {
+	idx +=  RARRAY(ary)->len;
+    }
+    if (idx < 0 || RARRAY(ary)->len <= idx) {
+	if (block_given) return rb_yield(pos);
+	if (argc == 1) {
+	    rb_raise(rb_eIndexError, "index %ld out of array", idx);
+	}
+	return ifnone;
+    }
+    return RARRAY(ary)->ptr[idx];
+}
+
+/*
+ *  call-seq:
+ *     array.index(obj)   ->  int or nil
+ *  
+ *  Returns the index of the first object in <i>self</i> such that is 
+ *  <code>==</code> to <i>obj</i>. Returns <code>nil</code> if
+ *  no match is found.
+ *     
+ *     a = [ "a", "b", "c" ]
+ *     a.index("b")   #=> 1
+ *     a.index("z")   #=> nil
+ */
+
+static VALUE
+rb_ary_index(ary, val)
+    VALUE ary;
+    VALUE val;
+{
+    long i;
+
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	if (rb_equal(RARRAY(ary)->ptr[i], val))
+	    return LONG2NUM(i);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     array.rindex(obj)    ->  int or nil
+ *  
+ *  Returns the index of the last object in <i>array</i> 
+ *  <code>==</code> to <i>obj</i>. Returns <code>nil</code> if
+ *  no match is found.
+ *     
+ *     a = [ "a", "b", "b", "b", "c" ]
+ *     a.rindex("b")   #=> 3
+ *     a.rindex("z")   #=> nil
+ */
+
+static VALUE
+rb_ary_rindex(ary, val)
+    VALUE ary;
+    VALUE val;
+{
+    long i = RARRAY(ary)->len;
+
+    while (i--) {
+	if (i > RARRAY(ary)->len) {
+	    i = RARRAY(ary)->len;
+	    continue;
+	}
+	if (rb_equal(RARRAY(ary)->ptr[i], val))
+	    return LONG2NUM(i);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     array.indexes( i1, i2, ... iN )   -> an_array
+ *     array.indices( i1, i2, ... iN )   -> an_array
+ *  
+ *  Deprecated; use <code>Array#values_at</code>.
+ */
+
+static VALUE
+rb_ary_indexes(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    VALUE new_ary;
+    long i;
+
+    rb_warn("Array#%s is deprecated; use Array#values_at", rb_id2name(rb_frame_last_func()));
+    new_ary = rb_ary_new2(argc);
+    for (i=0; i<argc; i++) {
+	rb_ary_push(new_ary, rb_ary_aref(1, argv+i, ary));
+    }
+
+    return new_ary;
+}
+
+VALUE
+rb_ary_to_ary(obj)
+    VALUE obj;
+{
+    if (TYPE(obj) == T_ARRAY) {
+	return obj;
+    }
+    if (rb_respond_to(obj, rb_intern("to_ary"))) {
+	return rb_convert_type(obj, T_ARRAY, "Array", "to_ary");
+    }
+    return rb_ary_new3(1, obj);
+}
+
+static void
+rb_ary_splice(ary, beg, len, rpl)
+    VALUE ary;
+    long beg, len;
+    VALUE rpl;
+{
+    long rlen;
+
+    if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
+    if (beg < 0) {
+	beg += RARRAY(ary)->len;
+	if (beg < 0) {
+	    beg -= RARRAY(ary)->len;
+	    rb_raise(rb_eIndexError, "index %ld out of array", beg);
+	}
+    }
+    if (beg + len > RARRAY(ary)->len) {
+	len = RARRAY(ary)->len - beg;
+    }
+
+    if (NIL_P(rpl)) {
+	rlen = 0;
+    }
+    else {
+	rpl = rb_ary_to_ary(rpl);
+	rlen = RARRAY(rpl)->len;
+    }
+    rb_ary_modify(ary);
+
+    if (beg >= RARRAY(ary)->len) {
+	len = beg + rlen;
+	if (len >= RARRAY(ary)->aux.capa) {
+	    REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
+	    RARRAY(ary)->aux.capa = len;
+	}
+	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, beg - RARRAY(ary)->len);
+	if (rlen > 0) {
+	    MEMCPY(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
+	}
+	RARRAY(ary)->len = len;
+    }
+    else {
+	long alen;
+
+	if (beg + len > RARRAY(ary)->len) {
+	    len = RARRAY(ary)->len - beg;
+	}
+
+	alen = RARRAY(ary)->len + rlen - len;
+	if (alen >= RARRAY(ary)->aux.capa) {
+	    REALLOC_N(RARRAY(ary)->ptr, VALUE, alen);
+	    RARRAY(ary)->aux.capa = alen;
+	}
+
+	if (len != rlen) {
+	    MEMMOVE(RARRAY(ary)->ptr + beg + rlen, RARRAY(ary)->ptr + beg + len,
+		    VALUE, RARRAY(ary)->len - (beg + len));
+	    RARRAY(ary)->len = alen;
+	}
+	if (rlen > 0) {
+	    MEMMOVE(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
+	}
+    }
+}
+
+/* 
+ *  call-seq:
+ *     array[index]         = obj                     ->  obj
+ *     array[start, length] = obj or an_array or nil  ->  obj or an_array or nil
+ *     array[range]         = obj or an_array or nil  ->  obj or an_array or nil
+ *
+ *  Element Assignment---Sets the element at _index_,
+ *  or replaces a subarray starting at _start_ and
+ *  continuing for _length_ elements, or replaces a subarray
+ *  specified by _range_.  If indices are greater than
+ *  the current capacity of the array, the array grows
+ *  automatically. A negative indices will count backward
+ *  from the end of the array. Inserts elements if _length_ is
+ *  zero. If +nil+ is used in the second and third form,
+ *  deletes elements from _self_. An +IndexError+ is raised if a
+ *  negative index points past the beginning of the array. See also
+ *  <code>Array#push</code>, and <code>Array#unshift</code>.
+ * 
+ *     a = Array.new
+ *     a[4] = "4";                 #=> [nil, nil, nil, nil, "4"]
+ *     a[0, 3] = [ 'a', 'b', 'c' ] #=> ["a", "b", "c", nil, "4"]
+ *     a[1..2] = [ 1, 2 ]          #=> ["a", 1, 2, nil, "4"]
+ *     a[0, 2] = "?"               #=> ["?", 2, nil, "4"]
+ *     a[0..2] = "A"               #=> ["A", "4"]
+ *     a[-1]   = "Z"               #=> ["A", "Z"]
+ *     a[1..-1] = nil              #=> ["A"]
+ */
+
+static VALUE
+rb_ary_aset(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    long offset, beg, len;
+
+    if (argc == 3) {
+	if (SYMBOL_P(argv[0])) {
+	    rb_raise(rb_eTypeError, "Symbol as array index");
+	}
+	if (SYMBOL_P(argv[1])) {
+	    rb_raise(rb_eTypeError, "Symbol as subarray length");
+	}
+	rb_ary_splice(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
+	return argv[2];
+    }
+    if (argc != 2) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
+    }
+    if (FIXNUM_P(argv[0])) {
+	offset = FIX2LONG(argv[0]);
+	goto fixnum;
+    }
+    if (SYMBOL_P(argv[0])) {
+	rb_raise(rb_eTypeError, "Symbol as array index");
+    }
+    if (rb_range_beg_len(argv[0], &beg, &len, RARRAY(ary)->len, 1)) {
+	/* check if idx is Range */
+	rb_ary_splice(ary, beg, len, argv[1]);
+	return argv[1];
+    }
+
+    offset = NUM2LONG(argv[0]);
+fixnum:
+    rb_ary_store(ary, offset, argv[1]);
+    return argv[1];
+}
+
+/*
+ *  call-seq:
+ *     array.insert(index, obj...)  -> array
+ *  
+ *  Inserts the given values before the element with the given index
+ *  (which may be negative).
+ *     
+ *     a = %w{ a b c d }
+ *     a.insert(2, 99)         #=> ["a", "b", 99, "c", "d"]
+ *     a.insert(-2, 1, 2, 3)   #=> ["a", "b", 99, "c", 1, 2, 3, "d"]
+ */
+
+static VALUE
+rb_ary_insert(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    long pos;
+
+    if (argc == 1) return ary;
+    if (argc < 1) {
+	rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
+    }
+    pos = NUM2LONG(argv[0]);
+    if (pos == -1) {
+	pos = RARRAY(ary)->len;
+    }
+    if (pos < 0) {
+	pos++;
+    }
+    rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.each {|item| block }   ->   array
+ *  
+ *  Calls <i>block</i> once for each element in <i>self</i>, passing that
+ *  element as a parameter.
+ *     
+ *     a = [ "a", "b", "c" ]
+ *     a.each {|x| print x, " -- " }
+ *     
+ *  produces:
+ *     
+ *     a -- b -- c --
+ */
+
+VALUE
+rb_ary_each(ary)
+    VALUE ary;
+{
+    long i;
+
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	rb_yield(RARRAY(ary)->ptr[i]);
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.each_index {|index| block }  ->  array
+ *  
+ *  Same as <code>Array#each</code>, but passes the index of the element
+ *  instead of the element itself.
+ *     
+ *     a = [ "a", "b", "c" ]
+ *     a.each_index {|x| print x, " -- " }
+ *     
+ *  produces:
+ *     
+ *     0 -- 1 -- 2 --
+ */
+
+static VALUE
+rb_ary_each_index(ary)
+    VALUE ary;
+{
+    long i;
+
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	rb_yield(LONG2NUM(i));
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.reverse_each {|item| block } 
+ *  
+ *  Same as <code>Array#each</code>, but traverses <i>self</i> in reverse
+ *  order.
+ *     
+ *     a = [ "a", "b", "c" ]
+ *     a.reverse_each {|x| print x, " " }
+ *     
+ *  produces:
+ *     
+ *     c b a
+ */
+
+static VALUE
+rb_ary_reverse_each(ary)
+    VALUE ary;
+{
+    long len = RARRAY(ary)->len;
+
+    while (len--) {
+	rb_yield(RARRAY(ary)->ptr[len]);
+	if (RARRAY(ary)->len < len) {
+	    len = RARRAY(ary)->len;
+	}
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.length -> int
+ *  
+ *  Returns the number of elements in <i>self</i>. May be zero.
+ *     
+ *     [ 1, 2, 3, 4, 5 ].length   #=> 5
+ */
+
+static VALUE
+rb_ary_length(ary)
+    VALUE ary;
+{
+    return LONG2NUM(RARRAY(ary)->len);
+}
+
+/*
+ *  call-seq:
+ *     array.empty?   -> true or false
+ *  
+ *  Returns <code>true</code> if <i>self</i> array contains no elements.
+ *     
+ *     [].empty?   #=> true
+ */
+
+static VALUE
+rb_ary_empty_p(ary)
+    VALUE ary;
+{
+    if (RARRAY(ary)->len == 0)
+	return Qtrue;
+    return Qfalse;
+}
+
+VALUE
+rb_ary_dup(ary)
+    VALUE ary;
+{
+    VALUE dup = rb_ary_new2(RARRAY(ary)->len);
+
+    DUPSETUP(dup, ary);
+    MEMCPY(RARRAY(dup)->ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+    RARRAY(dup)->len = RARRAY(ary)->len;
+    return dup;
+}
+
+extern VALUE rb_output_fs;
+
+static VALUE
+inspect_join(ary, arg)
+    VALUE ary;
+    VALUE *arg;
+{
+    return rb_ary_join(arg[0], arg[1]);
+}
+
+VALUE
+rb_ary_join(ary, sep)
+    VALUE ary, sep;
+{
+    long len = 1, i;
+    int taint = Qfalse;
+    VALUE result, tmp;
+
+    if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
+    if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = Qtrue;
+
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	tmp = rb_check_string_type(RARRAY(ary)->ptr[i]);
+	len += NIL_P(tmp) ? 10 : RSTRING(tmp)->len;
+    }
+    if (!NIL_P(sep)) {
+	StringValue(sep);
+	len += RSTRING(sep)->len * (RARRAY(ary)->len - 1);
+    }
+    result = rb_str_buf_new(len);
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	tmp = RARRAY(ary)->ptr[i];
+	switch (TYPE(tmp)) {
+	  case T_STRING:
+	    break;
+	  case T_ARRAY:
+	    if (rb_inspecting_p(tmp)) {
+		tmp = rb_str_new2("[...]");
+	    }
+	    else {
+		VALUE args[2];
+
+		args[0] = tmp;
+		args[1] = sep;
+		tmp = rb_protect_inspect(inspect_join, ary, (VALUE)args);
+	    }
+	    break;
+	  default:
+	    tmp = rb_obj_as_string(tmp);
+	}
+	if (i > 0 && !NIL_P(sep))
+	    rb_str_buf_append(result, sep);
+	rb_str_buf_append(result, tmp);
+	if (OBJ_TAINTED(tmp)) taint = Qtrue;
+    }
+
+    if (taint) OBJ_TAINT(result);
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     array.join(sep=$,)    -> str
+ *  
+ *  Returns a string created by converting each element of the array to
+ *  a string, separated by <i>sep</i>.
+ *     
+ *     [ "a", "b", "c" ].join        #=> "abc"
+ *     [ "a", "b", "c" ].join("-")   #=> "a-b-c"
+ */
+
+static VALUE
+rb_ary_join_m(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    VALUE sep;
+
+    rb_scan_args(argc, argv, "01", &sep);
+    if (NIL_P(sep)) sep = rb_output_fs;
+    
+    return rb_ary_join(ary, sep);
+}
+
+/*
+ *  call-seq:
+ *     array.to_s -> string
+ *  
+ *  Returns _self_<code>.join</code>.
+ *     
+ *     [ "a", "e", "i", "o" ].to_s   #=> "aeio"
+ *
+ */
+
+VALUE
+rb_ary_to_s(ary)
+    VALUE ary;
+{
+    if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
+    
+    return rb_ary_join(ary, rb_output_fs);
+}
+
+static ID inspect_key;
+
+struct inspect_arg {
+    VALUE (*func)();
+    VALUE arg1, arg2;
+};
+
+static VALUE
+inspect_call(arg)
+    struct inspect_arg *arg;
+{
+    return (*arg->func)(arg->arg1, arg->arg2);
+}
+
+static VALUE
+get_inspect_tbl(create)
+    int create;
+{
+    VALUE inspect_tbl = rb_thread_local_aref(rb_thread_current(), inspect_key);
+
+    if (NIL_P(inspect_tbl)) {
+	if (create) {
+	  tbl_init:
+	    inspect_tbl = rb_ary_new();
+	    rb_thread_local_aset(rb_thread_current(), inspect_key, inspect_tbl);
+	}
+    }
+    else if (TYPE(inspect_tbl) != T_ARRAY) {
+	rb_warn("invalid inspect_tbl value");
+	if (create) goto tbl_init;
+	rb_thread_local_aset(rb_thread_current(), inspect_key, Qnil);
+	return Qnil;
+    }
+    return inspect_tbl;
+}
+
+static VALUE
+inspect_ensure(obj)
+    VALUE obj;
+{
+    VALUE inspect_tbl;
+
+    inspect_tbl = get_inspect_tbl(Qfalse);
+    if (!NIL_P(inspect_tbl)) {
+	rb_ary_pop(inspect_tbl);
+    }
+    return 0;
+}
+
+VALUE
+rb_protect_inspect(func, obj, arg)
+    VALUE (*func)(ANYARGS);
+    VALUE obj, arg;
+{
+    struct inspect_arg iarg;
+    VALUE inspect_tbl;
+    VALUE id;
+
+    inspect_tbl = get_inspect_tbl(Qtrue);
+    id = rb_obj_id(obj);
+    if (rb_ary_includes(inspect_tbl, id)) {
+	return (*func)(obj, arg);
+    }
+    rb_ary_push(inspect_tbl, id);
+    iarg.func = func;
+    iarg.arg1 = obj;
+    iarg.arg2 = arg;
+
+    return rb_ensure(inspect_call, (VALUE)&iarg, inspect_ensure, obj);
+}
+
+VALUE
+rb_inspecting_p(obj)
+    VALUE obj;
+{
+    VALUE inspect_tbl;
+
+    inspect_tbl = get_inspect_tbl(Qfalse);
+    if (NIL_P(inspect_tbl)) return Qfalse;
+    return rb_ary_includes(inspect_tbl, rb_obj_id(obj));
+}
+
+static VALUE
+inspect_ary(ary)
+    VALUE ary;
+{
+    int tainted = OBJ_TAINTED(ary);
+    long i;
+    VALUE s, str;
+
+    str = rb_str_buf_new2("[");
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	s = rb_inspect(RARRAY(ary)->ptr[i]);
+	if (OBJ_TAINTED(s)) tainted = Qtrue;
+	if (i > 0) rb_str_buf_cat2(str, ", ");
+	rb_str_buf_append(str, s);
+    }
+    rb_str_buf_cat2(str, "]");
+    if (tainted) OBJ_TAINT(str);
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     array.inspect  -> string
+ *
+ *  Create a printable version of <i>array</i>.
+ */
+
+static VALUE
+rb_ary_inspect(ary)
+    VALUE ary;
+{
+    if (RARRAY(ary)->len == 0) return rb_str_new2("[]");
+    if (rb_inspecting_p(ary)) return rb_str_new2("[...]");
+    return rb_protect_inspect(inspect_ary, ary, 0);
+}
+
+/*
+ *  call-seq:
+ *     array.to_a     -> array
+ *  
+ *  Returns _self_. If called on a subclass of Array, converts
+ *  the receiver to an Array object.
+ */
+
+static VALUE
+rb_ary_to_a(ary)
+    VALUE ary;
+{
+    if (rb_obj_class(ary) != rb_cArray) {
+	VALUE dup = rb_ary_new2(RARRAY(ary)->len);
+	rb_ary_replace(dup, ary);
+	return dup;
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.to_ary -> array
+ *  
+ *  Returns _self_.
+ */
+
+static VALUE
+rb_ary_to_ary_m(ary)
+    VALUE ary;
+{
+    return ary;
+}
+
+VALUE
+rb_ary_reverse(ary)
+    VALUE ary;
+{
+    VALUE *p1, *p2;
+    VALUE tmp;
+
+    rb_ary_modify(ary);
+    if (RARRAY(ary)->len > 1) {
+	p1 = RARRAY(ary)->ptr;
+	p2 = p1 + RARRAY(ary)->len - 1;	/* points last item */
+
+	while (p1 < p2) {
+	    tmp = *p1;
+	    *p1++ = *p2;
+	    *p2-- = tmp;
+	}
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.reverse!   -> array 
+ *  
+ *  Reverses _self_ in place.
+ *     
+ *     a = [ "a", "b", "c" ]
+ *     a.reverse!       #=> ["c", "b", "a"]
+ *     a                #=> ["c", "b", "a"]
+ */
+
+static VALUE
+rb_ary_reverse_bang(ary)
+    VALUE ary;
+{
+    return rb_ary_reverse(ary);
+}
+
+/*
+ *  call-seq:
+ *     array.reverse -> an_array
+ *  
+ *  Returns a new array containing <i>self</i>'s elements in reverse order.
+ *     
+ *     [ "a", "b", "c" ].reverse   #=> ["c", "b", "a"]
+ *     [ 1 ].reverse               #=> [1]
+ */
+
+static VALUE
+rb_ary_reverse_m(ary)
+    VALUE ary;
+{
+    return rb_ary_reverse(rb_ary_dup(ary));
+}
+
+struct ary_sort_data {
+    VALUE ary;
+    VALUE *ptr;
+    long len;
+};
+
+static void
+ary_sort_check(data)
+    struct ary_sort_data *data;
+{
+    if (RARRAY(data->ary)->ptr != data->ptr || RARRAY(data->ary)->len != data->len) {
+	rb_raise(rb_eArgError, "array modified during sort");
+    }
+}
+
+static int
+sort_1(a, b, data)
+    VALUE *a, *b;
+    struct ary_sort_data *data;
+{
+    VALUE retval = rb_yield_values(2, *a, *b);
+    int n;
+
+    n = rb_cmpint(retval, *a, *b);
+    ary_sort_check(data);
+    return n;
+}
+
+static int
+sort_2(ap, bp, data)
+    VALUE *ap, *bp;
+    struct ary_sort_data *data;
+{
+    VALUE retval;
+    VALUE a = *ap, b = *bp;
+    int n;
+
+    if (FIXNUM_P(a) && FIXNUM_P(b)) {
+	if ((long)a > (long)b) return 1;
+	if ((long)a < (long)b) return -1;
+	return 0;
+    }
+    if (TYPE(a) == T_STRING) {
+	if (TYPE(b) == T_STRING) return rb_str_cmp(a, b);
+    }
+
+    retval = rb_funcall(a, id_cmp, 1, b);
+    n = rb_cmpint(retval, a, b);
+    ary_sort_check(data);
+
+    return n;
+}
+
+static VALUE
+sort_internal(ary)
+    VALUE ary;
+{
+    struct ary_sort_data data;
+
+    data.ary = ary;
+    data.ptr = RARRAY(ary)->ptr; data.len = RARRAY(ary)->len;
+    qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE),
+	  rb_block_given_p()?sort_1:sort_2, &data);
+    return ary;
+}
+
+static VALUE
+sort_unlock(ary)
+    VALUE ary;
+{
+    FL_UNSET(ary, ARY_TMPLOCK);
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.sort!                   -> array
+ *     array.sort! {| a,b | block }  -> array 
+ *  
+ *  Sorts _self_. Comparisons for
+ *  the sort will be done using the <code><=></code> operator or using
+ *  an optional code block. The block implements a comparison between
+ *  <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
+ *  <code>Enumerable#sort_by</code>.
+ *     
+ *     a = [ "d", "a", "e", "c", "b" ]
+ *     a.sort                    #=> ["a", "b", "c", "d", "e"]
+ *     a.sort {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
+ */
+
+VALUE
+rb_ary_sort_bang(ary)
+    VALUE ary;
+{
+    rb_ary_modify(ary);
+    if (RARRAY(ary)->len > 1) {
+	FL_SET(ary, ARY_TMPLOCK);	/* prohibit modification during sort */
+	rb_ensure(sort_internal, ary, sort_unlock, ary);
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.sort                   -> an_array 
+ *     array.sort {| a,b | block }  -> an_array 
+ *  
+ *  Returns a new array created by sorting <i>self</i>. Comparisons for
+ *  the sort will be done using the <code><=></code> operator or using
+ *  an optional code block. The block implements a comparison between
+ *  <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
+ *  <code>Enumerable#sort_by</code>.
+ *     
+ *     a = [ "d", "a", "e", "c", "b" ]
+ *     a.sort                    #=> ["a", "b", "c", "d", "e"]
+ *     a.sort {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
+ */
+
+VALUE
+rb_ary_sort(ary)
+    VALUE ary;
+{
+    ary = rb_ary_dup(ary);
+    rb_ary_sort_bang(ary);
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.collect {|item| block }  -> an_array
+ *     array.map     {|item| block }  -> an_array
+ *  
+ *  Invokes <i>block</i> once for each element of <i>self</i>. Creates a 
+ *  new array containing the values returned by the block.
+ *  See also <code>Enumerable#collect</code>.
+ *     
+ *     a = [ "a", "b", "c", "d" ]
+ *     a.collect {|x| x + "!" }   #=> ["a!", "b!", "c!", "d!"]
+ *     a                          #=> ["a", "b", "c", "d"]
+ */
+
+static VALUE
+rb_ary_collect(ary)
+    VALUE ary;
+{
+    long i;
+    VALUE collect;
+
+    if (!rb_block_given_p()) {
+	return rb_ary_new4(RARRAY(ary)->len, RARRAY(ary)->ptr);
+    }
+
+    collect = rb_ary_new2(RARRAY(ary)->len);
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	rb_ary_push(collect, rb_yield(RARRAY(ary)->ptr[i]));
+    }
+    return collect;
+}
+
+/* 
+ *  call-seq:
+ *     array.collect! {|item| block }   ->   array
+ *     array.map!     {|item| block }   ->   array
+ *
+ *  Invokes the block once for each element of _self_, replacing the
+ *  element with the value returned by _block_.
+ *  See also <code>Enumerable#collect</code>.
+ *   
+ *     a = [ "a", "b", "c", "d" ]
+ *     a.collect! {|x| x + "!" }
+ *     a             #=>  [ "a!", "b!", "c!", "d!" ]
+ */
+
+static VALUE
+rb_ary_collect_bang(ary)
+    VALUE ary;
+{
+    long i;
+
+    rb_ary_modify(ary);
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	rb_ary_store(ary, i, rb_yield(RARRAY(ary)->ptr[i]));
+    }
+    return ary;
+}
+
+VALUE
+rb_values_at(obj, olen, argc, argv, func)
+    VALUE obj;
+    long olen;
+    int argc;
+    VALUE *argv;
+    VALUE (*func) _((VALUE,long));
+{
+    VALUE result = rb_ary_new2(argc);
+    long beg, len, i, j;
+
+    for (i=0; i<argc; i++) {
+	if (FIXNUM_P(argv[i])) {
+	    rb_ary_push(result, (*func)(obj, FIX2LONG(argv[i])));
+	    continue;
+	}
+	/* check if idx is Range */
+	switch (rb_range_beg_len(argv[i], &beg, &len, olen, 0)) {
+	  case Qfalse:
+	    break;
+	  case Qnil:
+	    continue;
+	  default:
+	    for (j=0; j<len; j++) {
+		rb_ary_push(result, (*func)(obj, j+beg));
+	    }
+	    continue;
+	}
+	rb_ary_push(result, (*func)(obj, NUM2LONG(argv[i])));
+    }
+    return result;
+}
+
+/* 
+ *  call-seq:
+ *     array.values_at(selector,... )  -> an_array
+ *
+ *  Returns an array containing the elements in
+ *  _self_ corresponding to the given selector(s). The selectors
+ *  may be either integer indices or ranges. 
+ *  See also <code>Array#select</code>.
+ * 
+ *     a = %w{ a b c d e f }
+ *     a.values_at(1, 3, 5)
+ *     a.values_at(1, 3, 5, 7)
+ *     a.values_at(-1, -3, -5, -7)
+ *     a.values_at(1..3, 2...5)
+ */
+
+static VALUE
+rb_ary_values_at(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    return rb_values_at(ary, RARRAY(ary)->len, argc, argv, rb_ary_entry);
+}
+
+/*
+ *  call-seq:
+ *     array.select {|item| block } -> an_array
+ *  
+ *  Invokes the block passing in successive elements from <i>array</i>,
+ *  returning an array containing those elements for which the block
+ *  returns a true value (equivalent to <code>Enumerable#select</code>).
+ *     
+ *     a = %w{ a b c d e f }
+ *     a.select {|v| v =~ /[aeiou]/}   #=> ["a", "e"]
+ */
+
+static VALUE
+rb_ary_select(ary)
+    VALUE ary;
+{
+    VALUE result;
+    long i;
+
+    result = rb_ary_new2(RARRAY(ary)->len);
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	if (RTEST(rb_yield(RARRAY(ary)->ptr[i]))) {
+	    rb_ary_push(result, rb_ary_elt(ary, i));
+	}
+    }
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     array.delete(obj)            -> obj or nil 
+ *     array.delete(obj) { block }  -> obj or nil
+ *  
+ *  Deletes items from <i>self</i> that are equal to <i>obj</i>. If
+ *  the item is not found, returns <code>nil</code>. If the optional
+ *  code block is given, returns the result of <i>block</i> if the item
+ *  is not found.
+ *     
+ *     a = [ "a", "b", "b", "b", "c" ]
+ *     a.delete("b")                   #=> "b"
+ *     a                               #=> ["a", "c"]
+ *     a.delete("z")                   #=> nil
+ *     a.delete("z") { "not found" }   #=> "not found"
+ */
+
+VALUE
+rb_ary_delete(ary, item)
+    VALUE ary;
+    VALUE item;
+{
+    long i1, i2;
+
+    for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
+	VALUE e = RARRAY(ary)->ptr[i1];
+
+	if (rb_equal(e, item)) continue;
+	if (i1 != i2) {
+	    rb_ary_store(ary, i2, e);
+	}
+	i2++;
+    }
+    if (RARRAY(ary)->len == i2) {
+	if (rb_block_given_p()) {
+	    return rb_yield(item);
+	}
+	return Qnil;
+    }
+
+    rb_ary_modify(ary);
+    if (RARRAY(ary)->len > i2) {
+	RARRAY(ary)->len = i2;
+	if (i2 * 2 < RARRAY(ary)->aux.capa &&
+	    RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
+	    REALLOC_N(RARRAY(ary)->ptr, VALUE, i2 * 2);
+	    RARRAY(ary)->aux.capa = i2 * 2;
+	}
+    }
+
+    return item;
+}
+
+VALUE
+rb_ary_delete_at(ary, pos)
+    VALUE ary;
+    long pos;
+{
+    long i, len = RARRAY(ary)->len;
+    VALUE del;
+
+    if (pos >= len) return Qnil;
+    if (pos < 0) {
+	pos += len;
+	if (pos < 0) return Qnil;
+    }
+
+    rb_ary_modify(ary);
+    del = RARRAY(ary)->ptr[pos];
+    for (i = pos + 1; i < len; i++, pos++) {
+	RARRAY(ary)->ptr[pos] = RARRAY(ary)->ptr[i];
+    }
+    RARRAY(ary)->len = pos;
+
+    return del;
+}
+
+/*
+ *  call-seq:
+ *     array.delete_at(index)  -> obj or nil
+ *  
+ *  Deletes the element at the specified index, returning that element,
+ *  or <code>nil</code> if the index is out of range. See also
+ *  <code>Array#slice!</code>.
+ *     
+ *     a = %w( ant bat cat dog )
+ *     a.delete_at(2)    #=> "cat"
+ *     a                 #=> ["ant", "bat", "dog"]
+ *     a.delete_at(99)   #=> nil
+ */
+
+static VALUE
+rb_ary_delete_at_m(ary, pos)
+    VALUE ary, pos;
+{
+    return rb_ary_delete_at(ary, NUM2LONG(pos));
+}
+
+/*
+ *  call-seq:
+ *     array.slice!(index)         -> obj or nil
+ *     array.slice!(start, length) -> sub_array or nil
+ *     array.slice!(range)         -> sub_array or nil 
+ *  
+ *  Deletes the element(s) given by an index (optionally with a length)
+ *  or by a range. Returns the deleted object, subarray, or
+ *  <code>nil</code> if the index is out of range. Equivalent to:
+ *     
+ *     def slice!(*args)
+ *       result = self[*args]
+ *       self[*args] = nil
+ *       result
+ *     end
+ *     
+ *     a = [ "a", "b", "c" ]
+ *     a.slice!(1)     #=> "b"
+ *     a               #=> ["a", "c"]
+ *     a.slice!(-1)    #=> "c"
+ *     a               #=> ["a"]
+ *     a.slice!(100)   #=> nil
+ *     a               #=> ["a"]
+ */
+
+static VALUE
+rb_ary_slice_bang(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    VALUE arg1, arg2;
+    long pos, len;
+
+    if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
+	pos = NUM2LONG(arg1);
+	len = NUM2LONG(arg2);
+      delete_pos_len:
+	if (pos < 0) {
+	    pos = RARRAY(ary)->len + pos;
+	}
+	arg2 = rb_ary_subseq(ary, pos, len);
+	rb_ary_splice(ary, pos, len, Qnil);	/* Qnil/rb_ary_new2(0) */
+	return arg2;
+    }
+
+    if (!FIXNUM_P(arg1) && rb_range_beg_len(arg1, &pos, &len, RARRAY(ary)->len, 1)) {
+	goto delete_pos_len;
+    }
+
+    return rb_ary_delete_at(ary, NUM2LONG(arg1));
+}
+
+/*
+ *  call-seq:
+ *     array.reject! {|item| block }  -> array or nil
+ *  
+ *  Equivalent to <code>Array#delete_if</code>, deleting elements from
+ *  _self_ for which the block evaluates to true, but returns
+ *  <code>nil</code> if no changes were made. Also see
+ *  <code>Enumerable#reject</code>.
+ */
+
+static VALUE
+rb_ary_reject_bang(ary)
+    VALUE ary;
+{
+    long i1, i2;
+
+    rb_ary_modify(ary);
+    for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
+	VALUE v = RARRAY(ary)->ptr[i1];
+	if (RTEST(rb_yield(v))) continue;
+	if (i1 != i2) {
+	    rb_ary_store(ary, i2, v);
+	}
+	i2++;
+    }
+    if (RARRAY(ary)->len == i2) return Qnil;
+    if (i2 < RARRAY(ary)->len)
+	RARRAY(ary)->len = i2;
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.reject {|item| block }  -> an_array
+ *  
+ *  Returns a new array containing the items in _self_
+ *  for which the block is not true.
+ */
+
+static VALUE
+rb_ary_reject(ary)
+    VALUE ary;
+{
+    ary = rb_ary_dup(ary);
+    rb_ary_reject_bang(ary);
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.delete_if {|item| block }  -> array
+ *  
+ *  Deletes every element of <i>self</i> for which <i>block</i> evaluates
+ *  to <code>true</code>.
+ *     
+ *     a = [ "a", "b", "c" ]
+ *     a.delete_if {|x| x >= "b" }   #=> ["a"]
+ */
+
+static VALUE
+rb_ary_delete_if(ary)
+    VALUE ary;
+{
+    rb_ary_reject_bang(ary);
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.zip(arg, ...)                   -> an_array
+ *     array.zip(arg, ...) {| arr | block }  -> nil
+ *  
+ *  Converts any arguments to arrays, then merges elements of
+ *  <i>self</i> with corresponding elements from each argument. This
+ *  generates a sequence of <code>self.size</code> <em>n</em>-element
+ *  arrays, where <em>n</em> is one more that the count of arguments. If
+ *  the size of any argument is less than <code>enumObj.size</code>,
+ *  <code>nil</code> values are supplied. If a block given, it is
+ *  invoked for each output array, otherwise an array of arrays is
+ *  returned.
+ *     
+ *     a = [ 4, 5, 6 ]
+ *     b = [ 7, 8, 9 ]
+ *     
+ *     [1,2,3].zip(a, b)      #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
+ *     [1,2].zip(a,b)         #=> [[1, 4, 7], [2, 5, 8]]
+ *     a.zip([1,2],[8])       #=> [[4,1,8], [5,2,nil], [6,nil,nil]]
+ */
+
+static VALUE
+rb_ary_zip(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    int i, j;
+    long len;
+    VALUE result;
+
+    for (i=0; i<argc; i++) {
+	argv[i] = to_ary(argv[i]);
+    }
+    if (rb_block_given_p()) {
+	for (i=0; i<RARRAY(ary)->len; i++) {
+	    VALUE tmp = rb_ary_new2(argc+1);
+
+	    rb_ary_push(tmp, rb_ary_elt(ary, i));
+	    for (j=0; j<argc; j++) {
+		rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+	    }
+	    rb_yield(tmp);
+	}
+	return Qnil;
+    }
+    len = RARRAY(ary)->len;
+    result = rb_ary_new2(len);
+    for (i=0; i<len; i++) {
+	VALUE tmp = rb_ary_new2(argc+1);
+
+	rb_ary_push(tmp, rb_ary_elt(ary, i));
+	for (j=0; j<argc; j++) {
+	    rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+	}
+	rb_ary_push(result, tmp);
+    }
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     array.transpose -> an_array
+ *  
+ *  Assumes that <i>self</i> is an array of arrays and transposes the
+ *  rows and columns.
+ *     
+ *     a = [[1,2], [3,4], [5,6]]
+ *     a.transpose   #=> [[1, 3, 5], [2, 4, 6]]
+ */
+
+static VALUE
+rb_ary_transpose(ary)
+    VALUE ary;
+{
+    long elen = -1, alen, i, j;
+    VALUE tmp, result = 0;
+
+    alen = RARRAY(ary)->len;
+    if (alen == 0) return rb_ary_dup(ary);
+    for (i=0; i<alen; i++) {
+	tmp = to_ary(rb_ary_elt(ary, i));
+	if (elen < 0) {		/* first element */
+	    elen = RARRAY(tmp)->len;
+	    result = rb_ary_new2(elen);
+	    for (j=0; j<elen; j++) {
+		rb_ary_store(result, j, rb_ary_new2(alen));
+	    }
+	}
+	else if (elen != RARRAY(tmp)->len) {
+	    rb_raise(rb_eIndexError, "element size differs (%d should be %d)",
+		     RARRAY(tmp)->len, elen);
+	}
+	for (j=0; j<elen; j++) {
+	    rb_ary_store(rb_ary_elt(result, j), i, rb_ary_elt(tmp, j));
+	}
+    }
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     array.replace(other_array)  -> array
+ *  
+ *  Replaces the contents of <i>self</i> with the contents of
+ *  <i>other_array</i>, truncating or expanding if necessary.
+ *     
+ *     a = [ "a", "b", "c", "d", "e" ]
+ *     a.replace([ "x", "y", "z" ])   #=> ["x", "y", "z"]
+ *     a                              #=> ["x", "y", "z"]
+ */
+
+static VALUE
+rb_ary_replace(copy, orig)
+    VALUE copy, orig;
+{
+    VALUE shared;
+
+    rb_ary_modify(copy);
+    orig = to_ary(orig);
+    if (copy == orig) return copy;
+    shared = ary_make_shared(orig);
+    if (RARRAY(copy)->ptr && !FL_TEST(copy, ELTS_SHARED))
+	free(RARRAY(copy)->ptr);
+    RARRAY(copy)->ptr = RARRAY(orig)->ptr;
+    RARRAY(copy)->len = RARRAY(orig)->len;
+    RARRAY(copy)->aux.shared = shared;
+    FL_SET(copy, ELTS_SHARED);
+
+    return copy;
+}
+
+/* 
+ *  call-seq:
+ *     array.clear    ->  array
+ *
+ *  Removes all elements from _self_.
+ *
+ *     a = [ "a", "b", "c", "d", "e" ]
+ *     a.clear    #=> [ ]
+ */
+
+VALUE
+rb_ary_clear(ary)
+    VALUE ary;
+{
+    rb_ary_modify(ary);
+    RARRAY(ary)->len = 0;
+    if (ARY_DEFAULT_SIZE * 2 < RARRAY(ary)->aux.capa) {
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, ARY_DEFAULT_SIZE * 2);
+	RARRAY(ary)->aux.capa = ARY_DEFAULT_SIZE * 2;
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.fill(obj)                                -> array
+ *     array.fill(obj, start [, length])              -> array
+ *     array.fill(obj, range )                        -> array
+ *     array.fill {|index| block }                    -> array
+ *     array.fill(start [, length] ) {|index| block } -> array
+ *     array.fill(range) {|index| block }             -> array
+ *  
+ *  The first three forms set the selected elements of <i>self</i> (which
+ *  may be the entire array) to <i>obj</i>. A <i>start</i> of
+ *  <code>nil</code> is equivalent to zero. A <i>length</i> of
+ *  <code>nil</code> is equivalent to <i>self.length</i>. The last three
+ *  forms fill the array with the value of the block. The block is
+ *  passed the absolute index of each element to be filled.
+ *     
+ *     a = [ "a", "b", "c", "d" ]
+ *     a.fill("x")              #=> ["x", "x", "x", "x"]
+ *     a.fill("z", 2, 2)        #=> ["x", "x", "z", "z"]
+ *     a.fill("y", 0..1)        #=> ["y", "y", "z", "z"]
+ *     a.fill {|i| i*i}         #=> [0, 1, 4, 9]
+ *     a.fill(-2) {|i| i*i*i}   #=> [0, 1, 8, 27]
+ */
+
+static VALUE
+rb_ary_fill(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+{
+    VALUE item, arg1, arg2;
+    long beg = 0, end = 0, len = 0;
+    VALUE *p, *pend;
+    int block_p = Qfalse;
+
+    if (rb_block_given_p()) {
+	block_p = Qtrue;
+	rb_scan_args(argc, argv, "02", &arg1, &arg2);
+	argc += 1;		/* hackish */
+    }
+    else {
+	rb_scan_args(argc, argv, "12", &item, &arg1, &arg2);
+    }
+    switch (argc) {
+      case 1:
+	beg = 0;
+	len = RARRAY(ary)->len;
+	break;
+      case 2:
+	if (rb_range_beg_len(arg1, &beg, &len, RARRAY(ary)->len, 1)) {
+	    break;
+	}
+	/* fall through */
+      case 3:
+	beg = NIL_P(arg1) ? 0 : NUM2LONG(arg1);
+	if (beg < 0) {
+	    beg = RARRAY(ary)->len + beg;
+	    if (beg < 0) beg = 0;
+	}
+	len = NIL_P(arg2) ? RARRAY(ary)->len - beg : NUM2LONG(arg2);
+	break;
+    }
+    rb_ary_modify(ary);
+    end = beg + len;
+    if (end > RARRAY(ary)->len) {
+	if (end >= RARRAY(ary)->aux.capa) {
+	    REALLOC_N(RARRAY(ary)->ptr, VALUE, end);
+	    RARRAY(ary)->aux.capa = end;
+	}
+	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
+	RARRAY(ary)->len = end;
+    }
+
+    if (block_p) {
+	VALUE v;
+	long i;
+
+	for (i=beg; i<end; i++) {
+	    v = rb_yield(LONG2NUM(i));
+	    if (i>=RARRAY(ary)->len) break;
+	    RARRAY(ary)->ptr[i] = v;
+	}
+    }
+    else {
+	p = RARRAY(ary)->ptr + beg;
+	pend = p + len;
+	while (p < pend) {
+	    *p++ = item;
+	}
+    }
+    return ary;
+}
+
+/* 
+ *  call-seq:
+ *     array + other_array   -> an_array
+ *
+ *  Concatenation---Returns a new array built by concatenating the
+ *  two arrays together to produce a third array.
+ * 
+ *     [ 1, 2, 3 ] + [ 4, 5 ]    #=> [ 1, 2, 3, 4, 5 ]
+ */
+
+VALUE
+rb_ary_plus(x, y)
+    VALUE x, y;
+{
+    VALUE z;
+    long len;
+
+    y = to_ary(y);
+    len = RARRAY(x)->len + RARRAY(y)->len;
+    z = rb_ary_new2(len);
+    MEMCPY(RARRAY(z)->ptr, RARRAY(x)->ptr, VALUE, RARRAY(x)->len);
+    MEMCPY(RARRAY(z)->ptr + RARRAY(x)->len, RARRAY(y)->ptr, VALUE, RARRAY(y)->len);
+    RARRAY(z)->len = len;
+    return z;
+}
+
+/* 
+ *  call-seq:
+ *     array.concat(other_array)   ->  array
+ *
+ *  Appends the elements in other_array to _self_.
+ *  
+ *     [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
+ */
+
+
+VALUE
+rb_ary_concat(x, y)
+    VALUE x, y;
+{
+    y = to_ary(y);
+    if (RARRAY(y)->len > 0) {
+	rb_ary_splice(x, RARRAY(x)->len, 0, y);
+    }
+    return x;
+}
+
+
+/* 
+ *  call-seq:
+ *     array * int     ->    an_array
+ *     array * str     ->    a_string
+ *
+ *  Repetition---With a String argument, equivalent to
+ *  self.join(str). Otherwise, returns a new array
+ *  built by concatenating the _int_ copies of _self_.
+ *
+ *
+ *     [ 1, 2, 3 ] * 3    #=> [ 1, 2, 3, 1, 2, 3, 1, 2, 3 ]
+ *     [ 1, 2, 3 ] * ","  #=> "1,2,3"
+ *
+ */
+
+static VALUE
+rb_ary_times(ary, times)
+    VALUE ary, times;
+{
+    VALUE ary2, tmp;
+    long i, len;
+
+    tmp = rb_check_string_type(times);
+    if (!NIL_P(tmp)) {
+	return rb_ary_join(ary, tmp);
+    }
+
+    len = NUM2LONG(times);
+    if (len == 0) return ary_new(rb_obj_class(ary), 0);
+    if (len < 0) {
+	rb_raise(rb_eArgError, "negative argument");
+    }
+    if (LONG_MAX/len < RARRAY(ary)->len) {
+	rb_raise(rb_eArgError, "argument too big");
+    }
+    len *= RARRAY(ary)->len;
+
+    ary2 = ary_new(rb_obj_class(ary), len);
+    RARRAY(ary2)->len = len;
+
+    for (i=0; i<len; i+=RARRAY(ary)->len) {
+	MEMCPY(RARRAY(ary2)->ptr+i, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+    }
+    OBJ_INFECT(ary2, ary);
+
+    return ary2;
+}
+
+/* 
+ *  call-seq:
+ *     array.assoc(obj)   ->  an_array  or  nil
+ *
+ *  Searches through an array whose elements are also arrays
+ *  comparing _obj_ with the first element of each contained array
+ *  using obj.==.
+ *  Returns the first contained array that matches (that
+ *  is, the first associated array),
+ *  or +nil+ if no match is found.
+ *  See also <code>Array#rassoc</code>.
+ *
+ *     s1 = [ "colors", "red", "blue", "green" ]
+ *     s2 = [ "letters", "a", "b", "c" ]
+ *     s3 = "foo"
+ *     a  = [ s1, s2, s3 ]
+ *     a.assoc("letters")  #=> [ "letters", "a", "b", "c" ]
+ *     a.assoc("foo")      #=> nil
+ */
+
+VALUE
+rb_ary_assoc(ary, key)
+    VALUE ary, key;
+{
+    long i;
+    VALUE v;
+
+    for (i = 0; i < RARRAY(ary)->len; ++i) {
+	v = RARRAY(ary)->ptr[i];
+	if (TYPE(v) == T_ARRAY &&
+	    RARRAY(v)->len > 0 &&
+	    rb_equal(RARRAY(v)->ptr[0], key))
+	    return v;
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     array.rassoc(key) -> an_array or nil
+ *  
+ *  Searches through the array whose elements are also arrays. Compares
+ *  <em>key</em> with the second element of each contained array using
+ *  <code>==</code>. Returns the first contained array that matches. See
+ *  also <code>Array#assoc</code>.
+ *     
+ *     a = [ [ 1, "one"], [2, "two"], [3, "three"], ["ii", "two"] ]
+ *     a.rassoc("two")    #=> [2, "two"]
+ *     a.rassoc("four")   #=> nil
+ */
+
+VALUE
+rb_ary_rassoc(ary, value)
+    VALUE ary, value;
+{
+    long i;
+    VALUE v;
+
+    for (i = 0; i < RARRAY(ary)->len; ++i) {
+	v = RARRAY(ary)->ptr[i];
+	if (TYPE(v) == T_ARRAY &&
+	    RARRAY(v)->len > 1 &&
+	    rb_equal(RARRAY(v)->ptr[1], value))
+	    return v;
+    }
+    return Qnil;
+}
+
+/* 
+ *  call-seq:
+ *     array == other_array   ->   bool
+ *
+ *  Equality---Two arrays are equal if they contain the same number
+ *  of elements and if each element is equal to (according to
+ *  Object.==) the corresponding element in the other array.
+ *
+ *     [ "a", "c" ]    == [ "a", "c", 7 ]     #=> false
+ *     [ "a", "c", 7 ] == [ "a", "c", 7 ]     #=> true
+ *     [ "a", "c", 7 ] == [ "a", "d", "f" ]   #=> false
+ *
+ */
+
+static VALUE
+rb_ary_equal(ary1, ary2)
+    VALUE ary1, ary2;
+{
+    long i;
+
+    if (ary1 == ary2) return Qtrue;
+    if (TYPE(ary2) != T_ARRAY) {
+	if (!rb_respond_to(ary2, rb_intern("to_ary"))) {
+	    return Qfalse;
+	}
+	return rb_equal(ary2, ary1);
+    }
+    if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
+    for (i=0; i<RARRAY(ary1)->len; i++) {
+	if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
+	    return Qfalse;
+    }
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     array.eql?(other)  -> true or false
+ *
+ *  Returns <code>true</code> if _array_ and _other_ are the same object,
+ *  or are both arrays with the same content.
+ */
+
+static VALUE
+rb_ary_eql(ary1, ary2)
+    VALUE ary1, ary2;
+{
+    long i;
+
+    if (ary1 == ary2) return Qtrue;
+    if (TYPE(ary2) != T_ARRAY) return Qfalse;
+    if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
+    for (i=0; i<RARRAY(ary1)->len; i++) {
+	if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
+	    return Qfalse;
+    }
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     array.hash   -> fixnum
+ *
+ *  Compute a hash-code for this array. Two arrays with the same content
+ *  will have the same hash code (and will compare using <code>eql?</code>).
+ */
+
+static VALUE
+rb_ary_hash(ary)
+    VALUE ary;
+{
+    long i, h;
+    VALUE n;
+
+    h = RARRAY(ary)->len;
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	h = (h << 1) | (h<0 ? 1 : 0);
+	n = rb_hash(RARRAY(ary)->ptr[i]);
+	h ^= NUM2LONG(n);
+    }
+    return LONG2FIX(h);
+}
+
+/*
+ *  call-seq:
+ *     array.include?(obj)   -> true or false
+ *  
+ *  Returns <code>true</code> if the given object is present in
+ *  <i>self</i> (that is, if any object <code>==</code> <i>anObject</i>),
+ *  <code>false</code> otherwise.
+ *     
+ *     a = [ "a", "b", "c" ]
+ *     a.include?("b")   #=> true
+ *     a.include?("z")   #=> false
+ */
+
+VALUE
+rb_ary_includes(ary, item)
+    VALUE ary;
+    VALUE item;
+{
+    long i;
+    
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	if (rb_equal(RARRAY(ary)->ptr[i], item)) {
+	    return Qtrue;
+	}
+    }
+    return Qfalse;
+}
+
+
+/* 
+ *  call-seq:
+ *     array <=> other_array   ->  -1, 0, +1
+ *
+ *  Comparison---Returns an integer (-1, 0,
+ *  or +1) if this array is less than, equal to, or greater than
+ *  other_array.  Each object in each array is compared
+ *  (using <=>). If any value isn't
+ *  equal, then that inequality is the return value. If all the
+ *  values found are equal, then the return is based on a
+ *  comparison of the array lengths.  Thus, two arrays are
+ *  ``equal'' according to <code>Array#<=></code> if and only if they have
+ *  the same length and the value of each element is equal to the
+ *  value of the corresponding element in the other array.
+ *  
+ *     [ "a", "a", "c" ]    <=> [ "a", "b", "c" ]   #=> -1
+ *     [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ]            #=> +1
+ *
+ */
+
+VALUE
+rb_ary_cmp(ary1, ary2)
+    VALUE ary1, ary2;
+{
+    long i, len;
+
+    ary2 = to_ary(ary2);
+    len = RARRAY(ary1)->len;
+    if (len > RARRAY(ary2)->len) {
+	len = RARRAY(ary2)->len;
+    }
+    for (i=0; i<len; i++) {
+	VALUE v = rb_funcall(rb_ary_elt(ary1, i), id_cmp, 1, rb_ary_elt(ary2, i));
+	if (v != INT2FIX(0)) {
+	    return v;
+	}
+    }
+    len = RARRAY(ary1)->len - RARRAY(ary2)->len;
+    if (len == 0) return INT2FIX(0);
+    if (len > 0) return INT2FIX(1);
+    return INT2FIX(-1);
+}
+
+static VALUE
+ary_make_hash(ary1, ary2)
+    VALUE ary1, ary2;
+{
+    VALUE hash = rb_hash_new();
+    long i;
+
+    for (i=0; i<RARRAY(ary1)->len; i++) {
+	rb_hash_aset(hash, RARRAY(ary1)->ptr[i], Qtrue);
+    }
+    if (ary2) {
+	for (i=0; i<RARRAY(ary2)->len; i++) {
+	    rb_hash_aset(hash, RARRAY(ary2)->ptr[i], Qtrue);
+	}
+    }
+    return hash;
+}
+
+/* 
+ *  call-seq:
+ *     array - other_array    -> an_array
+ *
+ *  Array Difference---Returns a new array that is a copy of
+ *  the original array, removing any items that also appear in
+ *  other_array. (If you need set-like behavior, see the
+ *  library class Set.)
+ *
+ *     [ 1, 1, 2, 2, 3, 3, 4, 5 ] - [ 1, 2, 4 ]  #=>  [ 3, 3, 5 ]
+ */
+
+static VALUE
+rb_ary_diff(ary1, ary2)
+    VALUE ary1, ary2;
+{
+    VALUE ary3;
+    volatile VALUE hash;
+    long i;
+
+    hash = ary_make_hash(to_ary(ary2), 0);
+    ary3 = rb_ary_new();
+
+    for (i=0; i<RARRAY(ary1)->len; i++) {
+	if (st_lookup(RHASH(hash)->tbl, RARRAY(ary1)->ptr[i], 0)) continue;
+	rb_ary_push(ary3, rb_ary_elt(ary1, i));
+    }
+    return ary3;
+}
+
+/* 
+ *  call-seq:
+ *     array & other_array
+ *
+ *  Set Intersection---Returns a new array
+ *  containing elements common to the two arrays, with no duplicates.
+ *
+ *     [ 1, 1, 3, 5 ] & [ 1, 2, 3 ]   #=> [ 1, 3 ]
+ */
+
+
+static VALUE
+rb_ary_and(ary1, ary2)
+    VALUE ary1, ary2;
+{
+    VALUE hash, ary3, v, vv;
+    long i;
+
+    ary2 = to_ary(ary2);
+    ary3 = rb_ary_new2(RARRAY(ary1)->len < RARRAY(ary2)->len ?
+	    RARRAY(ary1)->len : RARRAY(ary2)->len);
+    hash = ary_make_hash(ary2, 0);
+
+    for (i=0; i<RARRAY(ary1)->len; i++) {
+	v = vv = rb_ary_elt(ary1, i);
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
+	    rb_ary_push(ary3, v);
+	}
+    }
+
+    return ary3;
+}
+
+/* 
+ *  call-seq:
+ *     array | other_array     ->  an_array
+ *
+ *  Set Union---Returns a new array by joining this array with
+ *  other_array, removing duplicates.
+ *
+ *     [ "a", "b", "c" ] | [ "c", "d", "a" ]
+ *            #=> [ "a", "b", "c", "d" ]
+ */
+
+static VALUE
+rb_ary_or(ary1, ary2)
+    VALUE ary1, ary2;
+{
+    VALUE hash, ary3;
+    VALUE v, vv;
+    long i;
+
+    ary2 = to_ary(ary2);
+    ary3 = rb_ary_new2(RARRAY(ary1)->len+RARRAY(ary2)->len);
+    hash = ary_make_hash(ary1, ary2);
+
+    for (i=0; i<RARRAY(ary1)->len; i++) {
+	v = vv = rb_ary_elt(ary1, i);
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
+	    rb_ary_push(ary3, v);
+	}
+    }
+    for (i=0; i<RARRAY(ary2)->len; i++) {
+	v = vv = rb_ary_elt(ary2, i);
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
+	    rb_ary_push(ary3, v);
+	}
+    }
+    return ary3;
+}
+
+/*
+ *  call-seq:
+ *     array.uniq! -> array or nil
+ *  
+ *  Removes duplicate elements from _self_.
+ *  Returns <code>nil</code> if no changes are made (that is, no
+ *  duplicates are found).
+ *     
+ *     a = [ "a", "a", "b", "b", "c" ]
+ *     a.uniq!   #=> ["a", "b", "c"]
+ *     b = [ "a", "b", "c" ]
+ *     b.uniq!   #=> nil
+ */
+
+static VALUE
+rb_ary_uniq_bang(ary)
+    VALUE ary;
+{
+    VALUE hash, v, vv;
+    long i, j;
+
+    hash = ary_make_hash(ary, 0);
+
+    if (RARRAY(ary)->len == RHASH(hash)->tbl->num_entries) {
+	return Qnil;
+    }
+    for (i=j=0; i<RARRAY(ary)->len; i++) {
+	v = vv = rb_ary_elt(ary, i);
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
+	    rb_ary_store(ary, j++, v);
+	}
+    }
+    RARRAY(ary)->len = j;
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.uniq   -> an_array
+ *  
+ *  Returns a new array by removing duplicate values in <i>self</i>.
+ *     
+ *     a = [ "a", "a", "b", "b", "c" ]
+ *     a.uniq   #=> ["a", "b", "c"]
+ */
+
+static VALUE
+rb_ary_uniq(ary)
+    VALUE ary;
+{
+    ary = rb_ary_dup(ary);
+    rb_ary_uniq_bang(ary);
+    return ary;
+}
+
+/* 
+ *  call-seq:
+ *     array.compact!    ->   array  or  nil
+ *
+ *  Removes +nil+ elements from array.
+ *  Returns +nil+ if no changes were made.
+ *
+ *     [ "a", nil, "b", nil, "c" ].compact! #=> [ "a", "b", "c" ]
+ *     [ "a", "b", "c" ].compact!           #=> nil
+ */
+
+static VALUE
+rb_ary_compact_bang(ary)
+    VALUE ary;
+{
+    VALUE *p, *t, *end;
+
+    rb_ary_modify(ary);
+    p = t = RARRAY(ary)->ptr;
+    end = p + RARRAY(ary)->len;
+    
+    while (t < end) {
+	if (NIL_P(*t)) t++;
+	else *p++ = *t++;
+    }
+    if (RARRAY(ary)->len == (p - RARRAY(ary)->ptr)) {
+	return Qnil;
+    }
+    RARRAY(ary)->len = RARRAY(ary)->aux.capa = (p - RARRAY(ary)->ptr);
+    REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.compact     ->  an_array
+ *
+ *  Returns a copy of _self_ with all +nil+ elements removed.
+ *
+ *     [ "a", nil, "b", nil, "c", nil ].compact
+ *                       #=> [ "a", "b", "c" ]
+ */
+
+static VALUE
+rb_ary_compact(ary)
+    VALUE ary;
+{
+    ary = rb_ary_dup(ary);
+    rb_ary_compact_bang(ary);
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.nitems -> int
+ *  
+ *  Returns the number of non-<code>nil</code> elements in _self_.
+ *  May be zero.
+ *     
+ *     [ 1, nil, 3, nil, 5 ].nitems   #=> 3
+ */
+
+static VALUE
+rb_ary_nitems(ary)
+    VALUE ary;
+{
+    long n = 0;
+    VALUE *p, *pend;
+
+    p = RARRAY(ary)->ptr;
+    pend = p + RARRAY(ary)->len;
+
+    while (p < pend) {
+	if (!NIL_P(*p)) n++;
+	p++;
+    }
+    return LONG2NUM(n);
+}
+
+static long
+flatten(ary, idx, ary2, memo)
+    VALUE ary;
+    long idx;
+    VALUE ary2, memo;
+{
+    VALUE id;
+    long i = idx;
+    long n, lim = idx + RARRAY(ary2)->len;
+
+    id = rb_obj_id(ary2);
+    if (rb_ary_includes(memo, id)) {
+	rb_raise(rb_eArgError, "tried to flatten recursive array");
+    }
+    rb_ary_push(memo, id);
+    rb_ary_splice(ary, idx, 1, ary2);
+    while (i < lim) {
+	VALUE tmp;
+
+	tmp = rb_check_array_type(rb_ary_elt(ary, i));
+	if (!NIL_P(tmp)) {
+	    n = flatten(ary, i, tmp, memo);
+	    i += n; lim += n;
+	}
+	i++;
+    }
+    rb_ary_pop(memo);
+
+    return lim - idx - 1;	/* returns number of increased items */
+}
+
+/*
+ *  call-seq:
+ *     array.flatten! -> array or nil
+ *  
+ *  Flattens _self_ in place.
+ *  Returns <code>nil</code> if no modifications were made (i.e.,
+ *  <i>array</i> contains no subarrays.)
+ *     
+ *     a = [ 1, 2, [3, [4, 5] ] ]
+ *     a.flatten!   #=> [1, 2, 3, 4, 5]
+ *     a.flatten!   #=> nil
+ *     a            #=> [1, 2, 3, 4, 5]
+ */
+
+static VALUE
+rb_ary_flatten_bang(ary)
+    VALUE ary;
+{
+    long i = 0;
+    int mod = 0;
+    VALUE memo = Qnil;
+
+    while (i<RARRAY(ary)->len) {
+	VALUE ary2 = RARRAY(ary)->ptr[i];
+	VALUE tmp;
+
+	tmp = rb_check_array_type(ary2);
+	if (!NIL_P(tmp)) {
+	    if (NIL_P(memo)) {
+		memo = rb_ary_new();
+	    }
+	    i += flatten(ary, i, tmp, memo);
+	    mod = 1;
+	}
+	i++;
+    }
+    if (mod == 0) return Qnil;
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     array.flatten -> an_array
+ *  
+ *  Returns a new array that is a one-dimensional flattening of this
+ *  array (recursively). That is, for every element that is an array,
+ *  extract its elements into the new array.
+ *     
+ *     s = [ 1, 2, 3 ]           #=> [1, 2, 3]
+ *     t = [ 4, 5, 6, [7, 8] ]   #=> [4, 5, 6, [7, 8]]
+ *     a = [ s, t, 9, 10 ]       #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
+ *     a.flatten                 #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10
+ */
+
+static VALUE
+rb_ary_flatten(ary)
+    VALUE ary;
+{
+    ary = rb_ary_dup(ary);
+    rb_ary_flatten_bang(ary);
+    return ary;
+}
+
+
+/* Arrays are ordered, integer-indexed collections of any object. 
+ * Array indexing starts at 0, as in C or Java.  A negative index is 
+ * assumed to be relative to the end of the array---that is, an index of -1 
+ * indicates the last element of the array, -2 is the next to last 
+ * element in the array, and so on. 
+ */
+
+void
+Init_Array()
+{
+    rb_cArray  = rb_define_class("Array", rb_cObject);
+    rb_include_module(rb_cArray, rb_mEnumerable);
+
+    rb_define_alloc_func(rb_cArray, ary_alloc);
+    rb_define_singleton_method(rb_cArray, "[]", rb_ary_s_create, -1);
+    rb_define_method(rb_cArray, "initialize", rb_ary_initialize, -1);
+    rb_define_method(rb_cArray, "initialize_copy", rb_ary_replace, 1);
+
+    rb_define_method(rb_cArray, "to_s", rb_ary_to_s, 0);
+    rb_define_method(rb_cArray, "inspect", rb_ary_inspect, 0);
+    rb_define_method(rb_cArray, "to_a", rb_ary_to_a, 0);
+    rb_define_method(rb_cArray, "to_ary", rb_ary_to_ary_m, 0);
+    rb_define_method(rb_cArray, "frozen?",  rb_ary_frozen_p, 0);
+
+    rb_define_method(rb_cArray, "==", rb_ary_equal, 1);
+    rb_define_method(rb_cArray, "eql?", rb_ary_eql, 1);
+    rb_define_method(rb_cArray, "hash", rb_ary_hash, 0);
+
+    rb_define_method(rb_cArray, "[]", rb_ary_aref, -1);
+    rb_define_method(rb_cArray, "[]=", rb_ary_aset, -1);
+    rb_define_method(rb_cArray, "at", rb_ary_at, 1);
+    rb_define_method(rb_cArray, "fetch", rb_ary_fetch, -1);
+    rb_define_method(rb_cArray, "first", rb_ary_first, -1);
+    rb_define_method(rb_cArray, "last", rb_ary_last, -1);
+    rb_define_method(rb_cArray, "concat", rb_ary_concat, 1);
+    rb_define_method(rb_cArray, "<<", rb_ary_push, 1);
+    rb_define_method(rb_cArray, "push", rb_ary_push_m, -1);
+    rb_define_method(rb_cArray, "pop", rb_ary_pop, 0);
+    rb_define_method(rb_cArray, "shift", rb_ary_shift, 0);
+    rb_define_method(rb_cArray, "unshift", rb_ary_unshift_m, -1);
+    rb_define_method(rb_cArray, "insert", rb_ary_insert, -1);
+    rb_define_method(rb_cArray, "each", rb_ary_each, 0);
+    rb_define_method(rb_cArray, "each_index", rb_ary_each_index, 0);
+    rb_define_method(rb_cArray, "reverse_each", rb_ary_reverse_each, 0);
+    rb_define_method(rb_cArray, "length", rb_ary_length, 0);
+    rb_define_alias(rb_cArray,  "size", "length");
+    rb_define_method(rb_cArray, "empty?", rb_ary_empty_p, 0);
+    rb_define_method(rb_cArray, "index", rb_ary_index, 1);
+    rb_define_method(rb_cArray, "rindex", rb_ary_rindex, 1);
+    rb_define_method(rb_cArray, "indexes", rb_ary_indexes, -1);
+    rb_define_method(rb_cArray, "indices", rb_ary_indexes, -1);
+    rb_define_method(rb_cArray, "join", rb_ary_join_m, -1);
+    rb_define_method(rb_cArray, "reverse", rb_ary_reverse_m, 0);
+    rb_define_method(rb_cArray, "reverse!", rb_ary_reverse_bang, 0);
+    rb_define_method(rb_cArray, "sort", rb_ary_sort, 0);
+    rb_define_method(rb_cArray, "sort!", rb_ary_sort_bang, 0);
+    rb_define_method(rb_cArray, "collect", rb_ary_collect, 0);
+    rb_define_method(rb_cArray, "collect!", rb_ary_collect_bang, 0);
+    rb_define_method(rb_cArray, "map", rb_ary_collect, 0);
+    rb_define_method(rb_cArray, "map!", rb_ary_collect_bang, 0);
+    rb_define_method(rb_cArray, "select", rb_ary_select, 0);
+    rb_define_method(rb_cArray, "values_at", rb_ary_values_at, -1);
+    rb_define_method(rb_cArray, "delete", rb_ary_delete, 1);
+    rb_define_method(rb_cArray, "delete_at", rb_ary_delete_at_m, 1);
+    rb_define_method(rb_cArray, "delete_if", rb_ary_delete_if, 0);
+    rb_define_method(rb_cArray, "reject", rb_ary_reject, 0);
+    rb_define_method(rb_cArray, "reject!", rb_ary_reject_bang, 0);
+    rb_define_method(rb_cArray, "zip", rb_ary_zip, -1);
+    rb_define_method(rb_cArray, "transpose", rb_ary_transpose, 0);
+    rb_define_method(rb_cArray, "replace", rb_ary_replace, 1);
+    rb_define_method(rb_cArray, "clear", rb_ary_clear, 0);
+    rb_define_method(rb_cArray, "fill", rb_ary_fill, -1);
+    rb_define_method(rb_cArray, "include?", rb_ary_includes, 1);
+    rb_define_method(rb_cArray, "<=>", rb_ary_cmp, 1);
+
+    rb_define_method(rb_cArray, "slice", rb_ary_aref, -1);
+    rb_define_method(rb_cArray, "slice!", rb_ary_slice_bang, -1);
+
+    rb_define_method(rb_cArray, "assoc", rb_ary_assoc, 1);
+    rb_define_method(rb_cArray, "rassoc", rb_ary_rassoc, 1);
+
+    rb_define_method(rb_cArray, "+", rb_ary_plus, 1);
+    rb_define_method(rb_cArray, "*", rb_ary_times, 1);
+
+    rb_define_method(rb_cArray, "-", rb_ary_diff, 1);
+    rb_define_method(rb_cArray, "&", rb_ary_and, 1);
+    rb_define_method(rb_cArray, "|", rb_ary_or, 1);
+
+    rb_define_method(rb_cArray, "uniq", rb_ary_uniq, 0);
+    rb_define_method(rb_cArray, "uniq!", rb_ary_uniq_bang, 0);
+    rb_define_method(rb_cArray, "compact", rb_ary_compact, 0);
+    rb_define_method(rb_cArray, "compact!", rb_ary_compact_bang, 0);
+    rb_define_method(rb_cArray, "flatten", rb_ary_flatten, 0);
+    rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, 0);
+    rb_define_method(rb_cArray, "nitems", rb_ary_nitems, 0);
+
+    id_cmp = rb_intern("<=>");
+    inspect_key = rb_intern("__inspect_key__");
+}
diff --git a/ruby_1_8_6/bcc32/Makefile.sub b/ruby_1_8_6/bcc32/Makefile.sub
new file mode 100644
index 0000000000..68328e92c1
--- /dev/null
+++ b/ruby_1_8_6/bcc32/Makefile.sub
@@ -0,0 +1,499 @@
+# -*- makefile -*-
+
+SHELL = $(COMSPEC)
+MKFILES = Makefile
+
+#### Start of system configuration section. ####
+OS = bccwin32
+RT = $(OS)
+
+## variables may be overridden by $(compile_dir)/Makefile
+!ifndef srcdir
+srcdir = ..
+!endif
+!ifndef RUBY_INSTALL_NAME
+RUBY_INSTALL_NAME = ruby
+!endif
+!ifndef RUBYW_INSTALL_NAME
+RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
+!elif "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
+RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
+!endif
+!if "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
+RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
+!endif
+!ifndef RUBY_SO_NAME
+RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
+!endif
+!ifndef icondirs
+!ifdef ICONDIRS
+icondirs=$(ICONDIRS)
+!endif
+!endif
+!ifdef icondirs
+icondirs=$(icondirs:\=/)
+iconinc=-I$(icondirs: = -I)
+!endif
+###############
+
+VPATH = $(srcdir):$(srcdir)/missing
+.SUFFIXES: .y
+
+!ifndef CC
+CC = bcc32
+!endif
+!ifndef CPP
+CPP = cpp32
+!endif
+!ifndef RC
+RC = brcc32
+!endif
+!ifndef YACC
+YACC = byacc
+!endif
+!ifndef AR
+AR = tlib
+!endif
+
+PURIFY =
+AUTOCONF = autoconf
+RM = $(srcdir:/=\)\win32\rm.bat
+
+!if !defined(PROCESSOR_ARCHITECTURE)
+PROCESSOR_ARCHITECTURE = x86
+!endif
+MACHINE = $(PROCESSOR_ARCHITECTURE)
+!if "$(PROCESSOR_ARCHITECTURE)" == "x86"
+!ifndef PROCESSOR_LEVEL
+PROCESSOR_LEVEL = 5
+!endif
+!if 6 < $(PROCESSOR_LEVEL)
+PROCESSOR_LEVEL = 6
+!endif
+PROCESSOR_FLAG = -$(PROCESSOR_LEVEL)
+CPU = i$(PROCESSOR_LEVEL)86
+ARCH = i386
+!else
+CPU = $(PROCESSOR_ARCHITECTURE)
+ARCH = $(PROCESSOR_ARCHITECTURE)
+!endif
+!ifndef DEBUGFLAGS
+DEBUGFLAGS = 
+!endif
+!ifndef OPTFLAGS
+OPTFLAGS = -O
+!endif
+
+!ifndef prefix
+prefix = /usr
+!endif
+!ifndef exec_prefix
+exec_prefix = $(prefix)
+!endif
+!ifndef libdir
+libdir = $(exec_prefix)/lib
+!endif
+!if !defined(datadir)
+datadir = /share
+!endif
+!ifndef EXTOUT
+EXTOUT = .ext
+!endif
+!ifndef RIDATADIR
+RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
+!endif
+!ifndef TESTUI
+TESTUI = console
+!endif
+!ifndef TESTS
+TESTS =
+!endif
+!ifndef RDOCTARGET
+RDOCTARGET = install-nodoc
+!endif
+
+OUTFLAG       = -o
+!ifndef CFLAGS
+CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
+!endif
+!ifndef LDFLAGS
+LDFLAGS = -S:$(STACK)
+!endif
+!ifndef RFLAGS
+RFLAGS = $(iconinc)
+!endif
+!ifndef EXTLIBS
+EXTLIBS =
+!endif
+!ifndef MEMLIB
+MEMLIB =
+!endif
+LIBS = $(MEMLIB) cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
+MISSING = acosh.obj crypt.obj erf.obj win32.obj
+
+!ifndef STACK
+STACK = 0x2000000
+!endif
+
+XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing
+
+ARFLAGS = /a
+LD = ilink32 -q -Gn
+LDSHARED  = $(LD)
+XLDFLAGS  = -Tpe c0x32.obj
+WLDFLAGS  = -aa -Tpe c0w32.obj
+DLDFLAGS  = -Tpd c0d32.obj
+LIBRUBY_LDSHARED = $(LDSHARED)
+LIBRUBY_DLDFLAGS = -Gi $(DLDFLAGS) $(EXTLDFLAGS)
+LDOBJECTS = $(MAINOBJ)
+
+SOLIBS = 
+
+EXEEXT = .exe
+PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
+WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
+RUBYDEF = $(RUBY_SO_NAME).def
+MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT)
+RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
+
+ORGLIBPATH = $(LIB)
+
+#### End of system configuration section. ####
+
+LIBRUBY_A     = $(RUBY_SO_NAME)-static.lib
+LIBRUBY_SO    = $(RUBY_SO_NAME).dll
+LIBRUBY       = $(RUBY_SO_NAME).lib
+LIBRUBYARG    = $(LIBRUBY)
+
+PREP          = miniruby$(EXEEXT)
+
+OBJEXT        = obj
+
+INSTALLED_LIST= .installed.list
+
+WINMAINOBJ    = winmain.$(OBJEXT)
+MINIOBJS      = dmydln.$(OBJEXT)
+
+.path.c = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
+.path.h = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
+.path.y = $(srcdir)
+.path. = $(srcdir)
+
+.c.obj:
+	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -c $(<:/=\)
+
+.rc.res:
+	$(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:/=\)
+
+.y.c:
+	$(YACC) $(YFLAGS) $(<:\=/)
+	sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F)
+	@del y.tab.c
+
+all: $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
+
+ruby: $(PROGRAM)
+rubyw: $(WPROGRAM)
+
+!include $(srcdir)/common.mk
+
+PHONY: Makefile
+
+CONFIG_H = ./.config.h.time
+
+config: config.status
+
+config.status: $(CONFIG_H)
+
+$(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
+	@$(srcdir:/=\)\win32\ifchange.bat config.h &&|
+\#define HAVE_SYS_TYPES_H 1
+\#define HAVE_SYS_STAT_H 1
+\#define HAVE_STDLIB_H 1
+\#define HAVE_STRING_H 1
+\#define HAVE_MEMORY_H 1
+\#define HAVE_OFF_T 1
+\#define SIZEOF_INT 4
+\#define SIZEOF_SHORT 2
+\#define SIZEOF_LONG 4
+\#define SIZEOF_LONG_LONG 0
+\#define SIZEOF___INT64 8
+\#define SIZEOF_OFF_T 4
+\#define SIZEOF_VOIDP 4
+\#define SIZEOF_FLOAT 4
+\#define SIZEOF_DOUBLE 8
+\#define SIZEOF_TIME_T 4
+\#define HAVE_PROTOTYPES 1
+\#define TOKEN_PASTE(x,y) x\#\#y
+\#define HAVE_STDARG_PROTOTYPES 1
+\#define NORETURN(x) x
+\#define RUBY_EXTERN extern __declspec(dllimport)
+\#define HAVE_DECL_SYS_NERR 1
+\#define HAVE_LIMITS_H 1
+\#define HAVE_FCNTL_H 1
+\#define HAVE_UTIME_H 1
+\#define HAVE_FLOAT_H 1
+\#define rb_uid_t uid_t
+\#define rb_gid_t gid_t
+\#define rb_pid_t int
+\#define HAVE_STRUCT_STAT_ST_RDEV 1
+\#define HAVE_ST_RDEV 1
+\#define GETGROUPS_T int
+\#define RETSIGTYPE void
+\#define HAVE_ALLOCA 1
+\#define HAVE_DUP2 1
+\#define HAVE_MEMMOVE 1
+\#define HAVE_MKDIR 1
+\#define HAVE_STRCASECMP 1
+\#define HAVE_STRNCASECMP 1
+\#define HAVE_STRERROR 1
+\#define HAVE_STRFTIME 1
+\#define HAVE_STRCHR 1
+\#define HAVE_STRSTR 1
+\#define HAVE_STRTOD 1
+\#define HAVE_STRTOL 1
+\#define HAVE_STRTOUL 1
+\#define HAVE_ISNAN 1
+\#define HAVE_FINITE 1
+\#define HAVE_HYPOT 1
+\#define HAVE_FMOD 1
+\#define HAVE_WAITPID 1
+\#define HAVE_FSYNC 1
+\#define HAVE_GETCWD 1
+\#define HAVE_CHSIZE 1
+\#define HAVE_TIMES 1
+\#define HAVE_FCNTL 1
+\#define HAVE_LINK 1
+\#define HAVE_TELLDIR 1
+\#define HAVE_SEEKDIR 1
+\#define HAVE_COSH 1
+\#define HAVE_SINH 1
+\#define HAVE_TANH 1
+\#define RSHIFT(x,y) ((x)>>(int)y)
+\#define FILE_COUNT level
+\#define FILE_READPTR curp
+\#define inline __inline
+\#define NEED_IO_SEEK_BETWEEN_RW 1
+\#define STACK_GROW_DIRECTION -1
+\#define DEFAULT_KCODE KCODE_NONE
+\#define DLEXT ".so"
+\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
+\#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
+\#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
+\#define RUBY_PLATFORM "$(ARCH)-$(OS)"
+\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
+\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
+|
+	@exit > $@
+
+config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
+	@echo Creating $@
+	@type > $@ &&|
+# Generated automatically by Makefile.sub.
+s,@SHELL@,$$(COMSPEC),;t t
+s,@BUILD_FILE_SEPARATOR@,\,;t t
+s,@PATH_SEPARATOR@,;,;t t
+s,@CFLAGS@,$(CFLAGS),;t t
+s,@CPPFLAGS@,$(CPPFLAGS),;t t
+s,@CXXFLAGS@,$(CXXFLAGS),;t t
+s,@FFLAGS@,$(FFLAGS),;t t
+s,@LDFLAGS@,,;t t
+s,@LIBS@,$(LIBS),;t t
+s,@exec_prefix@,$${prefix},;t t
+s,@prefix@,,;t t
+s,@program_transform_name@,s,,,,;t t
+s,@bindir@,$${exec_prefix}/bin,;t t
+s,@sbindir@,$${exec_prefix}/sbin,;t t
+s,@libexecdir@,$${exec_prefix}/libexec,;t t
+s,@datadir@,$${prefix}/share,;t t
+s,@sysconfdir@,$${prefix}/etc,;t t
+s,@sharedstatedir@,/etc,;t t
+s,@localstatedir@,/var,;t t
+s,@libdir@,$${exec_prefix}/lib,;t t
+s,@includedir@,$${prefix}/include,;t t
+s,@oldincludedir@,/usr/include,;t t
+s,@infodir@,$${prefix}/info,;t t
+s,@mandir@,$${prefix}/man,;t t
+s,@build@,$(CPU)-pc-$(OS),;t t
+s,@build_alias@,$(CPU)-$(OS),;t t
+s,@build_cpu@,$(CPU),;t t
+s,@build_vendor@,pc,;t t
+s,@build_os@,$(OS),;t t
+s,@host@,$(CPU)-pc-$(OS),;t t
+s,@host_alias@,$(CPU)-$(OS),;t t
+s,@host_cpu@,$(CPU),;t t
+s,@host_vendor@,pc,;t t
+s,@host_os@,$(OS),;t t
+s,@target@,$(ARCH)-pc-$(OS),;t t
+s,@target_alias@,$(ARCH)-$(OS),;t t
+s,@target_cpu@,$(ARCH),;t t
+s,@target_vendor@,pc,;t t
+s,@target_os@,$(OS),;t t
+s,@CC@,$(CC),;t t
+s,@CPP@,cpp32,;t t
+s,@YACC@,$(YACC),;t t
+s,@RANLIB@,,;t t
+s,@AR@,$(AR),;t t
+s,@ARFLAGS@,$(ARFLAGS) ,;t t
+s,@LN_S@,$(LN_S),;t t
+s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@CP@,copy > nul,;t t
+s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
+s,@ALLOCA@,$(ALLOCA),;t t
+s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
+s,@EXEEXT@,.exe,;t t
+s,@OBJEXT@,obj,;t t
+s,@XCFLAGS@,$(XCFLAGS),;t t
+s,@XLDFLAGS@,$(XLDFLAGS),;t t
+s,@DLDFLAGS@,$(DLDFLAGS),;t t
+s,@ARCH_FLAG@,$(ARCH_FLAG),;t t
+s,@STATIC@,$(STATIC),;t t
+s,@CCDLFLAGS@,,;t t
+s,@LDSHARED@,$(LDSHARED),;t t
+s,@DLEXT@,so,;t t
+s,@LIBEXT@,lib,;t t
+s,@STRIP@,$(STRIP),;t t
+s,@EXTSTATIC@,$(EXTSTATIC),;t t
+s,@setup@,Setup,;t t
+s,@MINIRUBY@,$(MINIRUBY),;t t
+s,@PREP@,miniruby$(EXEEXT),;t t
+s,@RUNRUBY@,$(RUNRUBY),;t t
+s,@EXTOUT@,$(EXTOUT),;t t
+s,@ARCHFILE@,,;t t
+s,@RDOCTARGET@,,;t t
+s,@LIBRUBY_LDSHARED@,$$(LDSHARED),;t t
+s,@LIBRUBY_DLDFLAGS@,-Gi $$(DLDFLAGS),;t t
+s,@RUBY_INSTALL_NAME@,$(RUBY_INSTALL_NAME),;t t
+s,@rubyw_install_name@,$(RUBYW_INSTALL_NAME),;t t
+s,@RUBYW_INSTALL_NAME@,$(RUBYW_INSTALL_NAME),;t t
+s,@RUBY_SO_NAME@,$(RUBY_SO_NAME),;t t
+s,@LIBRUBY_A@,$$(RUBY_SO_NAME)-static.lib,;t t
+s,@LIBRUBY_SO@,$$(RUBY_SO_NAME).dll,;t t
+s,@LIBRUBY_ALIASES@,$(LIBRUBY_ALIASES),;t t
+s,@LIBRUBY@,$$(RUBY_SO_NAME).lib,;t t
+s,@LIBRUBYARG@,$$(LIBRUBYARG_SHARED),;t t
+s,@LIBRUBYARG_STATIC@,$$(LIBRUBY_A),;t t
+s,@LIBRUBYARG_SHARED@,$$(LIBRUBY),;t t
+s,@SOLIBS@,$(SOLIBS),;t t
+s,@DLDLIBS@,$(DLDLIBS),;t t
+s,@ENABLE_SHARED@,yes,;t t
+s,@OUTFLAG@,$(OUTFLAG),;t t
+s,@CPPOUTFILE@,,;t t
+s,@LIBPATHFLAG@, -L"%s",;t t
+s,@RPATHFLAG@,,;t t
+s,@LIBARG@,%s.lib,;t t
+s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS), $$(@:/=\), nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE), $$(RESFILE),;t t
+s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) -c $$(<:/=\),;t t
+s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),;t t
+s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t
+s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t
+s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t
+s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN,;t t
+s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
+s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t
+s,@EXPORT_PREFIX@,_,;t t
+s,@arch@,$(ARCH)-$(OS),;t t
+s,@sitearch@,$(ARCH)-$(OS),;t t
+s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
+s,@configure_args@,--enable-shared $(configure_args),;t t
+s,@configure_input@,$$configure_input,;t t
+s,@srcdir@,$(srcdir),;t t
+s,@top_srcdir@,$(srcdir),;t t
+|
+
+miniruby$(EXEEXT):
+		@echo $(LIBS)
+		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS),$@,nul,$(LIBRUBY_A) $(LIBS)
+
+$(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
+		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBY_INSTALL_NAME).res
+
+$(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
+		$(LD) $(LDFLAGS) $(WLDFLAGS) $(MAINOBJ) $(WINMAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBYW_INSTALL_NAME).res
+
+$(LIBRUBY_A):	$(OBJS) $(DMYEXT)
+		@-if exist $@ del $@
+		$(AR) $(ARFLAGS) "$@" $(OBJS) $(DMYEXT)
+
+# $(LIBRUBY):	$(LIBRUBY_SO)
+#		implib $@ $(LIBRUBY_SO)
+
+$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
+		@echo $(DLDOBJS)
+		@$(PRE_LIBRUBY_UPDATE)
+		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
+
+$(LIBRUBY): $(LIBRUBY_SO)
+
+$(RUBYDEF):	$(LIBRUBY_A) $(PREP)
+		$(MINIRUBY) $(srcdir)/bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A)
+
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
+		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
+			-ruby_name=$(RUBY_INSTALL_NAME) \
+			-rubyw_name=$(RUBYW_INSTALL_NAME) \
+			-so_name=$(RUBY_SO_NAME) \
+			. $(icondirs) $(srcdir)/win32
+
+post-install-bin::
+	@$(NULLCMD)
+post-install-lib::
+	@$(NULLCMD)
+post-install-ext-comm::
+	@$(NULLCMD)
+post-install-ext-arch::
+	@$(NULLCMD)
+post-install-man::
+	@$(NULLCMD)
+post-install-doc::
+	@$(NULLCMD)
+
+clean-local::
+		@$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib
+		@$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
+
+distclean-local::
+		@$(RM) ext\config.cache $(RBCONFIG:/=\)
+		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
+		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
+
+ext/extinit.obj: ext/extinit.c $(SETUP)
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c
+
+main.$(OBJEXT): win32.h
+array.$(OBJEXT): win32.h
+bignum.$(OBJEXT): win32.h
+class.$(OBJEXT): win32.h
+compar.$(OBJEXT): win32.h
+dir.$(OBJEXT): dir.h win32.h
+dln.$(OBJEXT): win32.h
+enum.$(OBJEXT): win32.h
+error.$(OBJEXT): win32.h
+eval.$(OBJEXT): win32.h
+file.$(OBJEXT): win32.h
+gc.$(OBJEXT): win32.h
+hash.$(OBJEXT): win32.h
+inits.$(OBJEXT): win32.h
+io.$(OBJEXT): win32.h
+marshal.$(OBJEXT): win32.h
+math.$(OBJEXT): win32.h
+numeric.$(OBJEXT): win32.h
+object.$(OBJEXT): win32.h
+pack.$(OBJEXT): win32.h
+parse.$(OBJEXT): win32.h
+process.$(OBJEXT): win32.h
+prec.$(OBJEXT): win32.h
+random.$(OBJEXT): win32.h
+range.$(OBJEXT): win32.h
+re.$(OBJEXT): win32.h
+regex.$(OBJEXT): win32.h
+ruby.$(OBJEXT): win32.h
+signal.$(OBJEXT): win32.h
+sprintf.$(OBJEXT): win32.h
+st.$(OBJEXT): win32.h
+string.$(OBJEXT): win32.h
+struct.$(OBJEXT): win32.h
+time.$(OBJEXT): win32.h
+util.$(OBJEXT): win32.h
+variable.$(OBJEXT): win32.h
+version.$(OBJEXT): win32.h
diff --git a/ruby_1_8_6/bcc32/README.bcc32 b/ruby_1_8_6/bcc32/README.bcc32
new file mode 100644
index 0000000000..c27a1261f1
--- /dev/null
+++ b/ruby_1_8_6/bcc32/README.bcc32
@@ -0,0 +1,137 @@
+=begin
+
+= How to build ruby using Borland C++
+
+== Requirement
+
+(1) Borland C++ 5.0 or later.
+
+(2) Please set environment variable (({PATH}))
+    to run required commands properly from the command line.
+
+    Note: building ruby requires following commands.
+     * make
+     * bcc32
+     * tlib
+     * ilink32
+
+(3) If you want to build from CVS source, following commands are required.
+     * byacc ((<URL:http://gnuwin32.sourceforge.net/packages/byacc.htm>))
+     * sed   ((<URL:http://gnuwin32.sourceforge.net/packages/sed.htm>))
+
+(4) We strongly recommend to build ruby on C++Builder, to link following files.
+     * usebormm.lib
+     * memmgr.lib
+
+    RTL's internal memory manager cannot handle large memory block properly,
+    so we should use borlndmm.dll instead.
+     10000.times { "" << "." * 529671; GC.start } # crash
+
+== How to compile and install
+
+(1) Execute bcc32\configure.bat on your build directory.
+     ex. c:\ruby-1.6.7>bcc32\configure.bat
+     
+(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
+    if you want to change the name of the executable files. 
+    And add ((|RUBYW_INSTALL_NAME|)) to change the name of the
+    executable without console window if also you want.
+
+(3) Run `((%make%))'
+
+(4) Run `((%make test%))'
+
+(5) Run `((%make DESTDIR=<install_directory> install%))'
+
+    This command will create following directories and install files onto them.
+      * <install_directory>\bin
+      * <install_directory>\lib
+      * <install_directory>\lib\ruby
+      * <install_directory>\lib\ruby\<MAJOR>.<MINOR>
+      * <install_directory>\lib\ruby\<MAJOR>.<MINOR>\<PLATFORM>
+      * <install_directory>\lib\ruby\site_ruby
+      * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>
+      * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>\<PLATFORM>
+      * <install_directory>\man\man1
+    If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
+    The ((|<PLATFORM>|)) is usually `(({i586-bccwin32}))'.
+
+(6) Requires dynamic RTL (cc3250.dll on C++Builder5) and borlndmm.dll (If built with
+    usebormm.lib) to use installed binary. These files are ordinary in bcc32's bin
+    directory.
+
+== Icons
+
+Any icon files(*.ico) in the build directory, directories specified with
+((|icondirs|)) make variable and (({win32})) directory under the ruby
+source directory will be included in DLL or executable files, according
+to their base names.
+    $(RUBY_INSTALL_NAME).ico or ruby.ico   --> $(RUBY_INSTALL_NAME).exe
+    $(RUBYW_INSTALL_NAME).ico or rubyw.ico --> $(RUBYW_INSTALL_NAME).exe
+    the others                             --> $(RUBY_SO_NAME).dll
+
+Although no icons are distributed with the ruby source or in the official 
+site, you can use anything you like. For example, followings are written 
+in Japanese, but you can download at least.
+
+* ((<URL:http://member.nifty.ne.jp/ueivu/rubyico.html>)) or
+  ((<zipped icons|URL:http://member.nifty.ne.jp/ueivu/Ruby_ico.zip>))
+* ((<URL:http://homepage1.nifty.com/a_nakata/ruby/>)) or
+  ((<icon itself|URL:http://homepage1.nifty.com/a_nakata/ruby/RubyIcon.ico>))
+
+== Build examples
+
+* Build on the ruby source directory.
+
+  ex.)
+    ruby source directory:  C:\ruby
+    build directory:        C:\ruby
+    install directory:      C:\usr\local
+
+    C:
+    cd \ruby
+    bcc32\configure
+    make
+    make test
+    make DESTDIR=/usr/local install
+
+* Build on the relative directory from the ruby source directory and CPU type 
+  i386.
+
+  ex.)
+    ruby source directory:  C:\ruby
+    build directory:        C:\ruby\bccwin32
+    install directory:      C:\usr\local
+    CPU                     i386
+    
+    C:
+    cd \ruby
+    mkdir bccwin32
+    cd bccwin32
+    ..\bcc32\configure target i386-bccwin32
+    make
+    make test
+    make DESTDIR=/usr/local install
+
+* Build on the different drive.
+
+  ex.)
+    ruby source directory:  C:\src\ruby
+    build directory:        D:\build\ruby
+    install directory:      C:\usr\local
+
+    D:
+    cd D:\build\ruby
+    C:\src\ruby\bcc32\configure
+    make
+    make test
+    make DESTDIR=C:/usr/local install
+
+== Bugs
+
+You can ((*NOT*)) use a path name contains any white space characters as
+the ruby source directory, this restriction comes from the behavior of
+(({!INCLUDE})) directives of (({MAKE})).
+((- you may call it a bug. -))
+
+=end
diff --git a/ruby_1_8_6/bcc32/configure.bat b/ruby_1_8_6/bcc32/configure.bat
new file mode 100755
index 0000000000..143ad947f0
--- /dev/null
+++ b/ruby_1_8_6/bcc32/configure.bat
@@ -0,0 +1,92 @@
+@echo off

+::: Don't set environment variable in batch file other than autoexec.bat

+::: to avoid "Out of environment space" problem on Windows 95/98.

+::: set TMPMAKE=~tmp~.mak

+

+echo> ~tmp~.mak ####

+echo>> ~tmp~.mak conf = %0

+echo>> ~tmp~.mak $(conf:\=/): nul

+echo>> ~tmp~.mak 	@del ~tmp~.mak

+echo>> ~tmp~.mak 	@-$(MAKE) -l$(MAKEFLAGS) -f $(@D)setup.mak \

+:loop

+if "%1" == "" goto :end

+if "%1" == "--prefix" goto :prefix

+if "%1" == "--srcdir" goto :srcdir

+if "%1" == "srcdir" goto :srcdir

+if "%1" == "--target" goto :target

+if "%1" == "target" goto :target

+if "%1" == "--with-static-linked-ext" goto :extstatic

+if "%1" == "--program-suffix" goto :suffix

+if "%1" == "--program-name" goto :progname

+if "%1" == "--enable-install-doc" goto :enable-rdoc

+if "%1" == "--disable-install-doc" goto :disable-rdoc

+if "%1" == "--extout" goto :extout

+if "%1" == "-h" goto :help

+if "%1" == "--help" goto :help

+  echo>> ~tmp~.mak 	"%1" \

+  shift

+goto :loop

+:srcdir

+  echo>> ~tmp~.mak 	-D"srcdir=%2" \

+  shift

+  shift

+goto :loop

+:prefix

+  echo>> ~tmp~.mak 	-D"prefix=%2" \

+  shift

+  shift

+goto :loop

+:suffix

+  echo>> ~tmp~.mak 	-D"RUBY_SUFFIX=%2" \

+  shift

+  shift

+goto :loop

+:installname

+  echo>> ~tmp~.mak 	-D"RUBY_INSTALL_NAME=%2" \

+  shift

+  shift

+goto :loop

+:soname

+  echo>> ~tmp~.mak 	-D"RUBY_SO_NAME=%2" \

+  shift

+  shift

+goto :loop

+:target

+  echo>> ~tmp~.mak 	"%2" \

+  shift

+  shift

+goto :loop

+:extstatic

+  echo>> ~tmp~.mak 	-D"EXTSTATIC=static" \

+  shift

+goto :loop

+:enable-rdoc

+  echo>> ~tmp~.mak 	-D"RDOCTARGET=install-doc" \

+  shift

+goto :loop

+:disable-rdoc

+  echo>> ~tmp~.mak 	-D"RDOCTARGET=install-nodoc" \

+  shift

+goto :loop

+:extout

+  echo>> ~tmp~.mak 	-D"EXTOUT=%2" \

+  shift

+  shift

+goto :loop

+:help

+  echo Configuration:

+  echo   --help                  display this help

+  echo   --srcdir=DIR            find the sources in DIR [configure dir or `..']

+  echo Installation directories:

+  echo   --prefix=PREFIX         install files in PREFIX (ignored currently)

+  echo System types:

+  echo   --target=TARGET         configure for TARGET [i386-bccwin32]

+  echo Optional Package:

+  echo   --with-static-linked-ext link external modules statically

+  echo   --enable-install-doc    install rdoc indexes during install

+  del ~tmp~.mak

+goto :exit

+:end

+echo>> ~tmp~.mak 	-Dbcc32dir="$(@D)"

+make -s -f ~tmp~.mak

+:exit

diff --git a/ruby_1_8_6/bcc32/mkexports.rb b/ruby_1_8_6/bcc32/mkexports.rb
new file mode 100755
index 0000000000..dc523e2541
--- /dev/null
+++ b/ruby_1_8_6/bcc32/mkexports.rb
@@ -0,0 +1,27 @@
+#!./miniruby -s
+
+$name = $library = $description = nil
+
+SYM = {}
+STDIN.reopen(open("nul"))
+ARGV.each do |obj|
+  IO.foreach("|tdump -q -oiPUBDEF -oiPUBD32 #{obj.tr('/', '\\')}") do |l|
+    next unless /(?:PUBDEF|PUBD32)/ =~ l
+    SYM[$1] = true if /'(.*?)'/ =~ l
+  end
+end
+
+exports = []
+if $name
+  exports << "Name " + $name
+elsif $library
+  exports << "Library " + $library
+end
+exports << "Description " + $description.dump if $description
+exports << "EXPORTS" << SYM.keys.sort
+
+if $output
+  open($output, 'w') {|f| f.puts exports.join("\n")}
+else
+  puts exports.join("\n")
+end
diff --git a/ruby_1_8_6/bcc32/setup.mak b/ruby_1_8_6/bcc32/setup.mak
new file mode 100644
index 0000000000..b7a2539d0a
--- /dev/null
+++ b/ruby_1_8_6/bcc32/setup.mak
@@ -0,0 +1,133 @@
+# -*- makefile -*-
+
+!if "$(srcdir)" != ""
+bcc32dir = $(srcdir)/bcc32
+!elseif "$(bcc32dir)" == "bcc32/"
+srcdir = .
+!elseif "$(bcc32dir:/bcc32/=)/bcc32/" == "$(bcc32dir)"
+srcdir = $(bcc32dir:/bcc32/=)
+!else
+srcdir = $(bcc32dir)/..
+!endif
+!ifndef prefix
+prefix = /usr
+!endif
+OS = bccwin32
+RT = $(OS)
+BANG = !
+APPEND = echo>>$(MAKEFILE)
+!ifdef MAKEFILE
+MAKE = $(MAKE) -f $(MAKEFILE)
+!else
+MAKEFILE = Makefile
+!endif
+
+all: Makefile
+Makefile: -prologue- -generic- -epilogue-
+i386-$(OS): -prologue- -i386- -epilogue-
+i486-$(OS): -prologue- -i486- -epilogue-
+i586-$(OS): -prologue- -i586- -epilogue-
+i686-$(OS): -prologue- -i686- -epilogue-
+alpha-$(OS): -prologue- -alpha- -epilogue-
+
+-prologue-: nul
+	@echo Creating $(MAKEFILE)
+	@type > $(MAKEFILE) &&|
+\#\#\# Makefile for ruby $(OS) \#\#\#
+$(BANG)ifndef srcdir
+srcdir = $(srcdir:\=/)
+$(BANG)endif
+$(BANG)ifndef prefix
+prefix = $(prefix:\=/)
+$(BANG)endif
+$(BANG)ifndef EXTSTATIC
+EXTSTATIC = $(EXTSTATIC)
+$(BANG)endif
+!if defined(RDOCTARGET)
+$(BANG)ifndef RDOCTARGET
+RDOCTARGET = $(RDOCTARGET)
+$(BANG)endif
+!endif
+!if defined(EXTOUT)
+$(BANG)ifndef EXTOUT
+EXTOUT = $(EXTOUT)
+$(BANG)endif
+!endif
+|
+	@type > usebormm.bat &&|
+@echo off
+ilink32 -Gn -x usebormm.lib > nul
+if exist usebormm.tds echo MEMLIB = usebormm.lib
+|
+	@usebormm.bat >> $(MAKEFILE)
+	@del usebormm.*
+
+	@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
+\#include "version.h"
+MAJOR = RUBY_VERSION_MAJOR
+MINOR = RUBY_VERSION_MINOR
+TEENY = RUBY_VERSION_TEENY
+|
+	@type $(MAKEFILE).i >> $(MAKEFILE)
+	@del $(MAKEFILE).i
+
+-generic-: nul
+!if defined(PROCESSOR_ARCHITECTURE) ||  defined(PROCESSOR_LEVEL)
+	@type >> $(MAKEFILE) &&|
+!if defined(PROCESSOR_ARCHITECTURE)
+$(BANG)ifndef PROCESSOR_ARCHITECTURE
+PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
+$(BANG)endif
+!endif
+!if defined(PROCESSOR_LEVEL)
+$(BANG)ifndef PROCESSOR_LEVEL
+PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
+$(BANG)endif
+!endif
+
+|
+!endif
+
+-alpha-: nul
+	@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
+	@$(APPEND) PROCESSOR_ARCHITECTURE = alpha
+	@$(APPEND) !endif
+-ix86-: nul
+	@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
+	@$(APPEND) PROCESSOR_ARCHITECTURE = x86
+	@$(APPEND) !endif
+
+-i386-: -ix86-
+	@$(APPEND) !ifndef PROCESSOR_LEVEL
+	@$(APPEND) PROCESSOR_LEVEL = 3
+	@$(APPEND) !endif
+-i486-: -ix86-
+	@$(APPEND) !ifndef PROCESSOR_LEVEL
+	@$(APPEND) PROCESSOR_LEVEL = 4
+	@$(APPEND) !endif
+-i586-: -ix86-
+	@$(APPEND) !ifndef PROCESSOR_LEVEL
+	@$(APPEND) PROCESSOR_LEVEL = 5
+	@$(APPEND) !endif
+-i686-: -ix86-
+	@$(APPEND) !ifndef PROCESSOR_LEVEL
+	@$(APPEND) PROCESSOR_LEVEL = 6
+	@$(APPEND) !endif
+
+-epilogue-: nul
+	@type >> $(MAKEFILE) &&|
+
+\# OS = $(OS)
+\# RT = $(RT)
+\# RUBY_INSTALL_NAME = ruby
+\# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
+\# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
+\# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
+\# STACK = 0x2000000
+\# LDFLAGS = -S:$$(STACK)
+\# RFLAGS = $$(iconinc)
+\# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
+$(BANG)include $$(srcdir)/bcc32/Makefile.sub
+|
+	@$(srcdir:/=\)\win32\rm.bat config.h config.status
+	@echo type "`$(MAKE)'" to make ruby for $(OS).
diff --git a/ruby_1_8_6/bignum.c b/ruby_1_8_6/bignum.c
new file mode 100644
index 0000000000..58e804091f
--- /dev/null
+++ b/ruby_1_8_6/bignum.c
@@ -0,0 +1,2244 @@
+/**********************************************************************
+
+  bignum.c -
+
+  $Author$
+  $Date$
+  created at: Fri Jun 10 00:48:55 JST 1994
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+
+#include <math.h>
+#include <ctype.h>
+#ifdef HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
+
+VALUE rb_cBignum;
+
+#if defined __MINGW32__
+#define USHORT _USHORT
+#endif
+
+#define BDIGITS(x) ((BDIGIT*)RBIGNUM(x)->digits)
+#define BITSPERDIG (SIZEOF_BDIGITS*CHAR_BIT)
+#define BIGRAD ((BDIGIT_DBL)1 << BITSPERDIG)
+#define DIGSPERLONG ((unsigned int)(SIZEOF_LONG/SIZEOF_BDIGITS))
+#if HAVE_LONG_LONG
+# define DIGSPERLL ((unsigned int)(SIZEOF_LONG_LONG/SIZEOF_BDIGITS))
+#endif
+#define BIGUP(x) ((BDIGIT_DBL)(x) << BITSPERDIG)
+#define BIGDN(x) RSHIFT(x,BITSPERDIG)
+#define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1)))
+#define BDIGMAX ((BDIGIT)-1)
+
+#define BIGZEROP(x) (RBIGNUM(x)->len == 0 || (RBIGNUM(x)->len == 1 && BDIGITS(x)[0] == 0))
+
+static VALUE
+bignew_1(klass, len, sign)
+    VALUE klass;
+    long len;
+    int sign;
+{
+    NEWOBJ(big, struct RBignum);
+    OBJSETUP(big, klass, T_BIGNUM);
+    big->sign = sign?1:0;
+    big->len = len;
+    big->digits = ALLOC_N(BDIGIT, len);
+
+    return (VALUE)big;
+}
+
+#define bignew(len,sign) bignew_1(rb_cBignum,len,sign)
+
+VALUE
+rb_big_clone(x)
+    VALUE x;
+{
+    VALUE z = bignew_1(CLASS_OF(x), RBIGNUM(x)->len, RBIGNUM(x)->sign);
+
+    MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, RBIGNUM(x)->len);
+    return z;
+}
+
+/* modify a bignum by 2's complement */
+static void
+get2comp(x)
+    VALUE x;
+{
+    long i = RBIGNUM(x)->len;
+    BDIGIT *ds = BDIGITS(x);
+    BDIGIT_DBL num;
+
+    if (!i) return;
+    while (i--) ds[i] = ~ds[i];
+    i = 0; num = 1;
+    do {
+	num += ds[i];
+	ds[i++] = BIGLO(num);
+	num = BIGDN(num);
+    } while (i < RBIGNUM(x)->len);
+    if (num != 0) {
+	REALLOC_N(RBIGNUM(x)->digits, BDIGIT, ++RBIGNUM(x)->len);
+	ds = BDIGITS(x);
+	ds[RBIGNUM(x)->len-1] = RBIGNUM(x)->sign ? ~0 : 1;
+    }
+}
+
+void
+rb_big_2comp(x)			/* get 2's complement */
+    VALUE x;
+{
+    get2comp(x);
+}
+
+static VALUE
+bigtrunc(x)
+    VALUE x;
+{
+    long len = RBIGNUM(x)->len;
+    BDIGIT *ds = BDIGITS(x);
+
+    while (--len && !ds[len]);
+    RBIGNUM(x)->len = ++len;
+    return x;
+}
+
+static VALUE
+bigfixize(VALUE x)
+{
+    long len = RBIGNUM(x)->len;
+    BDIGIT *ds = BDIGITS(x);
+
+    if (len*SIZEOF_BDIGITS <= sizeof(VALUE)) {
+	long num = 0;
+	while (len--) {
+	    num = BIGUP(num) + ds[len];
+	}
+	if (num >= 0) {
+	    if (RBIGNUM(x)->sign) {
+		if (POSFIXABLE(num)) return LONG2FIX(num);
+	    }
+	    else {
+		if (NEGFIXABLE(-(long)num)) return LONG2FIX(-(long)num);
+	    }
+	}
+    }
+    return x;
+}
+
+static VALUE
+bignorm(VALUE x)
+{
+    if (!FIXNUM_P(x) && TYPE(x) == T_BIGNUM) {
+	x = bigfixize(bigtrunc(x));
+    }
+    return x;
+}
+
+VALUE
+rb_big_norm(x)
+    VALUE x;
+{
+    return bignorm(x);
+}
+
+VALUE
+rb_uint2big(n)
+    unsigned long n;
+{
+    BDIGIT_DBL num = n;
+    long i = 0;
+    BDIGIT *digits;
+    VALUE big;
+
+    big = bignew(DIGSPERLONG, 1);
+    digits = BDIGITS(big);
+    while (i < DIGSPERLONG) {
+	digits[i++] = BIGLO(num);
+	num = BIGDN(num);
+    }
+
+    i = DIGSPERLONG;
+    while (--i && !digits[i]) ;
+    RBIGNUM(big)->len = i+1;
+    return big;
+}
+
+VALUE
+rb_int2big(n)
+    long n;
+{
+    long neg = 0;
+    VALUE big;
+
+    if (n < 0) {
+	n = -n;
+	neg = 1;
+    }
+    big = rb_uint2big(n);
+    if (neg) {
+	RBIGNUM(big)->sign = 0;
+    }
+    return big;
+}
+
+VALUE
+rb_uint2inum(n)
+    unsigned long n;
+{
+    if (POSFIXABLE(n)) return LONG2FIX(n);
+    return rb_uint2big(n);
+}
+
+VALUE
+rb_int2inum(n)
+    long n;
+{
+    if (FIXABLE(n)) return LONG2FIX(n);
+    return rb_int2big(n);
+}
+
+#ifdef HAVE_LONG_LONG
+
+void
+rb_quad_pack(buf, val)
+    char *buf;
+    VALUE val;
+{
+    LONG_LONG q;
+
+    val = rb_to_int(val);
+    if (FIXNUM_P(val)) {
+	q = FIX2LONG(val);
+    }
+    else {
+	long len = RBIGNUM(val)->len;
+	BDIGIT *ds;
+
+	if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
+	    rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
+	ds = BDIGITS(val);
+	q = 0;
+	while (len--) {
+	    q = BIGUP(q);
+	    q += ds[len];
+	}
+	if (!RBIGNUM(val)->sign) q = -q;
+    }
+    memcpy(buf, (char*)&q, SIZEOF_LONG_LONG);
+}
+
+VALUE
+rb_quad_unpack(buf, sign)
+    const char *buf;
+    int sign;
+{
+    unsigned LONG_LONG q;
+    long neg = 0;
+    long i;
+    BDIGIT *digits;
+    VALUE big;
+
+    memcpy(&q, buf, SIZEOF_LONG_LONG);
+    if (sign) {
+	if (FIXABLE((LONG_LONG)q)) return LONG2FIX((LONG_LONG)q);
+	if ((LONG_LONG)q < 0) {
+	    q = -(LONG_LONG)q;
+	    neg = 1;
+	}
+    }
+    else {
+	if (POSFIXABLE(q)) return LONG2FIX(q);
+    }
+
+    i = 0;
+    big = bignew(DIGSPERLL, 1);
+    digits = BDIGITS(big);
+    while (i < DIGSPERLL) {
+	digits[i++] = BIGLO(q);
+	q = BIGDN(q);
+    }
+
+    i = DIGSPERLL;
+    while (i-- && !digits[i]) ;
+    RBIGNUM(big)->len = i+1;
+
+    if (neg) {
+	RBIGNUM(big)->sign = 0;
+    }
+    return bignorm(big);
+}
+
+#else
+
+#define QUAD_SIZE 8
+
+void
+rb_quad_pack(buf, val)
+    char *buf;
+    VALUE val;
+{
+    long len;
+
+    memset(buf, 0, QUAD_SIZE);
+    val = rb_to_int(val);
+    if (FIXNUM_P(val)) {
+	val = rb_int2big(FIX2LONG(val));
+    }
+    len = RBIGNUM(val)->len * SIZEOF_BDIGITS;
+    if (len > QUAD_SIZE) {
+	rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
+    }
+    memcpy(buf, (char*)BDIGITS(val), len);
+    if (!RBIGNUM(val)->sign) {
+	len = QUAD_SIZE;
+	while (len--) {
+	    *buf = ~*buf;
+	    buf++;
+	}
+    }
+}
+
+#define BNEG(b) (RSHIFT(((BDIGIT*)b)[QUAD_SIZE/SIZEOF_BDIGITS-1],BITSPERDIG-1) != 0)
+
+VALUE
+rb_quad_unpack(buf, sign)
+    const char *buf;
+    int sign;
+{
+    VALUE big = bignew(QUAD_SIZE/SIZEOF_BDIGITS, 1);
+
+    memcpy((char*)BDIGITS(big), buf, QUAD_SIZE);
+    if (sign && BNEG(buf)) {
+	long len = QUAD_SIZE;
+	char *tmp = (char*)BDIGITS(big);
+
+	RBIGNUM(big)->sign = 0;
+	while (len--) {
+	    *tmp = ~*tmp;
+	    tmp++;
+	}
+    }
+
+    return bignorm(big);
+}
+
+#endif
+
+VALUE
+rb_cstr_to_inum(str, base, badcheck)
+    const char *str;
+    int base;
+    int badcheck;
+{
+    const char *s = str;
+    char *end;
+    char sign = 1, nondigit = 0;
+    int c;
+    BDIGIT_DBL num;
+    long len, blen = 1;
+    long i;
+    VALUE z;
+    BDIGIT *zds;
+
+#define conv_digit(c) \
+    (!ISASCII(c) ? -1 : \
+     isdigit(c) ? ((c) - '0') : \
+     islower(c) ? ((c) - 'a' + 10) : \
+     isupper(c) ? ((c) - 'A' + 10) : \
+     -1)
+
+    if (!str) {
+	if (badcheck) goto bad;
+	return INT2FIX(0);
+    }
+    if (badcheck) {
+	while (ISSPACE(*str)) str++;
+    }
+    else {
+	while (ISSPACE(*str) || *str == '_') str++;
+    }
+
+    if (str[0] == '+') {
+	str++;
+    }
+    else if (str[0] == '-') {
+	str++;
+	sign = 0;
+    }
+    if (str[0] == '+' || str[0] == '-') {
+	if (badcheck) goto bad;
+	return INT2FIX(0);
+    }
+    if (base <= 0) {
+	if (str[0] == '0') {
+	    switch (str[1]) {
+	      case 'x': case 'X':
+		base = 16;
+		break;
+	      case 'b': case 'B':
+		base = 2;
+		break;
+	      case 'o': case 'O':
+		base = 8;
+		break;
+	      case 'd': case 'D':
+		base = 10;
+		break;
+	      default:
+		base = 8;
+	    }
+	}
+	else if (base < -1) {
+	    base = -base;
+	}
+	else {
+	    base = 10;
+	}
+    }
+    switch (base) {
+      case 2:
+	len = 1;
+	if (str[0] == '0' && (str[1] == 'b'||str[1] == 'B')) {
+	    str += 2;
+	}
+	break;
+      case 3:
+	len = 2;
+	break;
+      case 8:
+	if (str[0] == '0' && (str[1] == 'o'||str[1] == 'O')) {
+	    str += 2;
+	}
+      case 4: case 5: case 6: case 7:
+	len = 3;
+	break;
+      case 10:
+	if (str[0] == '0' && (str[1] == 'd'||str[1] == 'D')) {
+	    str += 2;
+	}
+      case 9: case 11: case 12: case 13: case 14: case 15:
+	len = 4;
+	break;
+      case 16:
+	len = 4;
+	if (str[0] == '0' && (str[1] == 'x'||str[1] == 'X')) {
+	    str += 2;
+	}
+	break;
+      default:
+	if (base < 2 || 36 < base) {
+	    rb_raise(rb_eArgError, "illegal radix %d", base);
+	}
+	if (base <= 32) {
+	    len = 5;
+	}
+	else {
+	    len = 6;
+	}
+	break;
+    }
+    if (*str == '0') {		/* squeeze preceeding 0s */
+	while (*++str == '0');
+	if (!*str) --str;
+    }
+    c = *str;
+    c = conv_digit(c);
+    if (c < 0 || c >= base) {
+	if (badcheck) goto bad;
+	return INT2FIX(0);
+    }
+    len *= strlen(str)*sizeof(char);
+
+    if (len <= (sizeof(VALUE)*CHAR_BIT)) {
+	unsigned long val = strtoul((char*)str, &end, base);
+
+	if (*end == '_') goto bigparse;
+	if (badcheck) {
+	    if (end == str) goto bad; /* no number */
+	    while (*end && ISSPACE(*end)) end++;
+	    if (*end) goto bad;	      /* trailing garbage */
+	}
+
+	if (POSFIXABLE(val)) {
+	    if (sign) return LONG2FIX(val);
+	    else {
+		long result = -(long)val;
+		return LONG2FIX(result);
+	    }
+	}
+	else {
+	    VALUE big = rb_uint2big(val);
+	    RBIGNUM(big)->sign = sign;
+	    return bignorm(big);
+	}
+    }
+  bigparse:
+    len = (len/BITSPERDIG)+1;
+    if (badcheck && *str == '_') goto bad;
+
+    z = bignew(len, sign);
+    zds = BDIGITS(z);
+    for (i=len;i--;) zds[i]=0;
+    while ((c = *str++) != 0) {
+	if (c == '_') {
+	    if (badcheck) {
+		if (nondigit) goto bad;
+		nondigit = c;
+	    }
+	    continue;
+	}
+	else if ((c = conv_digit(c)) < 0) {
+	    break;
+	}
+	if (c >= base) break;
+	nondigit = 0;
+	i = 0;
+	num = c;
+	for (;;) {
+	    while (i<blen) {
+		num += (BDIGIT_DBL)zds[i]*base;
+		zds[i++] = BIGLO(num);
+		num = BIGDN(num);
+	    }
+	    if (num) {
+		blen++;
+		continue;
+	    }
+	    break;
+	}
+    }
+    if (badcheck) {
+	str--;
+	if (s+1 < str && str[-1] == '_') goto bad;
+	while (*str && ISSPACE(*str)) str++;
+	if (*str) {
+	  bad:
+	    rb_invalid_str(s, "Integer");
+	}
+    }
+
+    return bignorm(z);
+}
+
+VALUE
+rb_str_to_inum(str, base, badcheck)
+    VALUE str;
+    int base;
+    int badcheck;
+{
+    char *s;
+    long len;
+
+    StringValue(str);
+    if (badcheck) {
+	s = StringValueCStr(str);
+    }
+    else {
+	s = RSTRING(str)->ptr;
+    }
+    if (s) {
+	len = RSTRING(str)->len;
+	if (s[len]) {		/* no sentinel somehow */
+	    char *p = ALLOCA_N(char, len+1);
+
+	    MEMCPY(p, s, char, len);
+	    p[len] = '\0';
+	    s = p;
+	}
+    }
+    return rb_cstr_to_inum(s, base, badcheck); 
+}
+
+#if HAVE_LONG_LONG
+
+VALUE
+rb_ull2big(n)
+    unsigned LONG_LONG n;
+{
+    BDIGIT_DBL num = n;
+    long i = 0;
+    BDIGIT *digits;
+    VALUE big;
+
+    big = bignew(DIGSPERLL, 1);
+    digits = BDIGITS(big);
+    while (i < DIGSPERLL) {
+	digits[i++] = BIGLO(num);
+	num = BIGDN(num);
+    }
+
+    i = DIGSPERLL;
+    while (i-- && !digits[i]) ;
+    RBIGNUM(big)->len = i+1;
+    return big;
+}
+
+VALUE
+rb_ll2big(n)
+    LONG_LONG n;
+{
+    long neg = 0;
+    VALUE big;
+
+    if (n < 0) {
+	n = -n;
+	neg = 1;
+    }
+    big = rb_ull2big(n);
+    if (neg) {
+	RBIGNUM(big)->sign = 0;
+    }
+    return big;
+}
+
+VALUE
+rb_ull2inum(n)
+    unsigned LONG_LONG n;
+{
+    if (POSFIXABLE(n)) return LONG2FIX(n);
+    return rb_ull2big(n);
+}
+
+VALUE
+rb_ll2inum(n)
+    LONG_LONG n;
+{
+    if (FIXABLE(n)) return LONG2FIX(n);
+    return rb_ll2big(n);
+}
+
+#endif  /* HAVE_LONG_LONG */
+ 
+VALUE
+rb_cstr2inum(str, base)
+    const char *str;
+    int base;
+{
+    return rb_cstr_to_inum(str, base, base==0);
+}
+
+VALUE
+rb_str2inum(str, base)
+    VALUE str;
+    int base;
+{
+    return rb_str_to_inum(str, base, base==0);
+}
+
+const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+VALUE
+rb_big2str0(x, base, trim)
+    VALUE x;
+    int base;
+    int trim;
+{
+    volatile VALUE t;
+    BDIGIT *ds;
+    long i, j, hbase;
+    VALUE ss;
+    char *s;
+
+    if (FIXNUM_P(x)) {
+	return rb_fix2str(x, base);
+    }
+    i = RBIGNUM(x)->len;
+    if (BIGZEROP(x)) {
+	return rb_str_new2("0");
+    }
+    j = SIZEOF_BDIGITS*CHAR_BIT*i;
+    switch (base) {
+      case 2: break;
+      case 3:
+	j = j * 53L / 84 + 1;
+	break;
+      case 4: case 5: case 6: case 7:
+	j = (j + 1) / 2;
+	break;
+      case 8: case 9:
+	j = (j + 2) / 3;
+	break;
+      case 10: case 11: case 12: case 13: case 14: case 15:
+	j = j * 28L / 93 + 1;
+	break;
+      case 16: case 17: case 18: case 19: case 20: case 21:
+      case 22: case 23: case 24: case 25: case 26: case 27:
+      case 28: case 29: case 30: case 31:
+	j = (j + 3) / 4;
+	break;
+      case 32: case 33: case 34: case 35: case 36:
+	j = (j + 4) / 5;
+	break;
+      default:
+	rb_raise(rb_eArgError, "illegal radix %d", base);
+	break;
+    }
+    j++;			/* space for sign */
+
+    hbase = base * base;
+#if SIZEOF_BDIGITS > 2
+    hbase *= hbase;
+#endif
+
+    t = rb_big_clone(x);
+    ds = BDIGITS(t);
+    ss = rb_str_new(0, j+1);
+    s = RSTRING(ss)->ptr;
+
+    s[0] = RBIGNUM(x)->sign ? '+' : '-';
+    while (i && j > 1) {
+	long k = i;
+	BDIGIT_DBL num = 0;
+
+	while (k--) {
+	    num = BIGUP(num) + ds[k];
+	    ds[k] = (BDIGIT)(num / hbase);
+	    num %= hbase;
+	}
+	if (trim && ds[i-1] == 0) i--;
+	k = SIZEOF_BDIGITS;
+	while (k--) {
+	    s[--j] = ruby_digitmap[num % base];
+	    num /= base;
+	    if (!trim && j < 1) break;
+	    if (trim && i == 0 && num == 0) break;
+	}
+    }
+    if (trim) {while (s[j] == '0') j++;}
+    i = RSTRING(ss)->len - j;
+    if (RBIGNUM(x)->sign) {
+	memmove(s, s+j, i);
+	RSTRING(ss)->len = i-1;
+    }
+    else {
+	memmove(s+1, s+j, i);
+	RSTRING(ss)->len = i;
+    }
+    s[RSTRING(ss)->len] = '\0';
+
+    return ss;
+}
+
+VALUE
+rb_big2str(VALUE x, int base)
+{
+    return rb_big2str0(x, base, Qtrue);
+}
+
+/*
+ *  call-seq:
+ *     big.to_s(base=10)   =>  string
+ *  
+ *  Returns a string containing the representation of <i>big</i> radix
+ *  <i>base</i> (2 through 36).
+ *     
+ *     12345654321.to_s         #=> "12345654321"
+ *     12345654321.to_s(2)      #=> "1011011111110110111011110000110001"
+ *     12345654321.to_s(8)      #=> "133766736061"
+ *     12345654321.to_s(16)     #=> "2dfdbbc31"
+ *     78546939656932.to_s(36)  #=> "rubyrules"
+ */
+
+static VALUE
+rb_big_to_s(argc, argv, x)
+    int argc;
+    VALUE *argv;
+    VALUE x;
+{
+    VALUE b;
+    int base;
+
+    rb_scan_args(argc, argv, "01", &b);
+    if (argc == 0) base = 10;
+    else base = NUM2INT(b);
+    return rb_big2str(x, base);
+}
+
+static unsigned long
+big2ulong(x, type)
+    VALUE x;
+    char *type;
+{
+    long len = RBIGNUM(x)->len;
+    BDIGIT_DBL num;
+    BDIGIT *ds;
+
+    if (len > SIZEOF_LONG/SIZEOF_BDIGITS)
+	rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
+    ds = BDIGITS(x);
+    num = 0;
+    while (len--) {
+	num = BIGUP(num);
+	num += ds[len];
+    }
+    return num;
+}
+
+unsigned long
+rb_big2ulong_pack(x)   
+    VALUE x;  
+{   
+    unsigned long num = big2ulong(x, "unsigned long");
+    if (!RBIGNUM(x)->sign) {
+	return -num;
+    }
+    return num;
+}  
+
+unsigned long
+rb_big2ulong(x)
+    VALUE x;
+{
+    unsigned long num = big2ulong(x, "unsigned long");
+
+    if (!RBIGNUM(x)->sign) {
+	if ((long)num < 0) {
+	    rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
+	}
+	return -num;
+    }
+    return num;
+}
+
+long
+rb_big2long(x)
+    VALUE x;
+{
+    unsigned long num = big2ulong(x, "long");
+
+    if ((long)num < 0 && (RBIGNUM(x)->sign || (long)num != LONG_MIN)) {
+	rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
+    }
+    if (!RBIGNUM(x)->sign) return -(long)num;
+    return num;
+}
+
+#if HAVE_LONG_LONG
+
+static unsigned LONG_LONG
+big2ull(x, type)
+    VALUE x;
+    char *type;
+{
+    long len = RBIGNUM(x)->len;
+    BDIGIT_DBL num;
+    BDIGIT *ds;
+
+    if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
+	rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
+    ds = BDIGITS(x);
+    num = 0;
+    while (len--) {
+	num = BIGUP(num);
+	num += ds[len];
+    }
+    return num;
+}
+
+unsigned LONG_LONG
+rb_big2ull(x)
+    VALUE x;
+{
+    unsigned LONG_LONG num = big2ull(x, "unsigned long long");
+
+    if (!RBIGNUM(x)->sign) return -num;
+    return num;
+}
+
+LONG_LONG
+rb_big2ll(x)
+    VALUE x;
+{
+    unsigned LONG_LONG num = big2ull(x, "long long");
+
+    if ((LONG_LONG)num < 0 && (RBIGNUM(x)->sign
+			       || (LONG_LONG)num != LLONG_MIN)) {
+	rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
+    }
+    if (!RBIGNUM(x)->sign) return -(LONG_LONG)num;
+    return num;
+}
+
+#endif  /* HAVE_LONG_LONG */
+
+static VALUE
+dbl2big(d)
+    double d;
+{
+    long i = 0;
+    BDIGIT c;
+    BDIGIT *digits;
+    VALUE z;
+    double u = (d < 0)?-d:d;
+
+    if (isinf(d)) {
+	rb_raise(rb_eFloatDomainError, d < 0 ? "-Infinity" : "Infinity");
+    }
+    if (isnan(d)) {
+	rb_raise(rb_eFloatDomainError, "NaN");
+    }
+
+    while (!POSFIXABLE(u) || 0 != (long)u) {
+	u /= (double)(BIGRAD);
+	i++;
+    }
+    z = bignew(i, d>=0);
+    digits = BDIGITS(z);
+    while (i--) {
+	u *= BIGRAD;
+	c = (BDIGIT)u;
+	u -= c;
+	digits[i] = c;
+    }
+
+    return z;
+}
+
+VALUE
+rb_dbl2big(d)
+    double d;
+{
+    return bignorm(dbl2big(d));
+}
+
+double
+rb_big2dbl(x)
+    VALUE x;
+{
+    double d = 0.0;
+    long i = RBIGNUM(x)->len;
+    BDIGIT *ds = BDIGITS(x);
+
+    while (i--) {
+	d = ds[i] + BIGRAD*d;
+    }
+    if (isinf(d)) {
+	rb_warn("Bignum out of Float range");
+	d = HUGE_VAL;
+    }
+    if (!RBIGNUM(x)->sign) d = -d;
+    return d;
+}
+
+/*
+ *  call-seq:
+ *     big.to_f -> float
+ *  
+ *  Converts <i>big</i> to a <code>Float</code>. If <i>big</i> doesn't
+ *  fit in a <code>Float</code>, the result is infinity.
+ *     
+ */
+
+static VALUE
+rb_big_to_f(x)
+    VALUE x;
+{
+    return rb_float_new(rb_big2dbl(x));
+}
+
+/*
+ *  call-seq:
+ *     big <=> numeric   => -1, 0, +1
+ *  
+ *  Comparison---Returns -1, 0, or +1 depending on whether <i>big</i> is
+ *  less than, equal to, or greater than <i>numeric</i>. This is the
+ *  basis for the tests in <code>Comparable</code>.
+ *     
+ */
+
+static VALUE
+rb_big_cmp(x, y)
+    VALUE x, y;
+{
+    long xlen = RBIGNUM(x)->len;
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	y = rb_int2big(FIX2LONG(y));
+	break;
+
+      case T_BIGNUM:
+	break;
+
+      case T_FLOAT:
+	return rb_dbl_cmp(rb_big2dbl(x), RFLOAT(y)->value);
+
+      default:
+	return rb_num_coerce_cmp(x, y);
+    }
+
+    if (RBIGNUM(x)->sign > RBIGNUM(y)->sign) return INT2FIX(1);
+    if (RBIGNUM(x)->sign < RBIGNUM(y)->sign) return INT2FIX(-1);
+    if (xlen < RBIGNUM(y)->len)
+	return (RBIGNUM(x)->sign) ? INT2FIX(-1) : INT2FIX(1);
+    if (xlen > RBIGNUM(y)->len)
+	return (RBIGNUM(x)->sign) ? INT2FIX(1) : INT2FIX(-1);
+
+    while(xlen-- && (BDIGITS(x)[xlen]==BDIGITS(y)[xlen]));
+    if (-1 == xlen) return INT2FIX(0);
+    return (BDIGITS(x)[xlen] > BDIGITS(y)[xlen]) ?
+	(RBIGNUM(x)->sign ? INT2FIX(1) : INT2FIX(-1)) :
+	    (RBIGNUM(x)->sign ? INT2FIX(-1) : INT2FIX(1));
+}
+
+/*
+ *  call-seq:
+ *     big == obj  => true or false
+ *  
+ *  Returns <code>true</code> only if <i>obj</i> has the same value
+ *  as <i>big</i>. Contrast this with <code>Bignum#eql?</code>, which
+ *  requires <i>obj</i> to be a <code>Bignum</code>.
+ *     
+ *     68719476736 == 68719476736.0   #=> true
+ */
+
+static VALUE
+rb_big_eq(x, y)
+    VALUE x, y;
+{
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	y = rb_int2big(FIX2LONG(y));
+	break;
+      case T_BIGNUM:
+	break;
+      case T_FLOAT:
+        {
+	    volatile double a, b;
+
+	    a = RFLOAT(y)->value;
+	    if (isnan(a)) return Qfalse;
+	    b = rb_big2dbl(x);
+	    return (a == b)?Qtrue:Qfalse;
+	}
+      default:
+	return rb_equal(y, x);
+    }
+    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
+    if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
+    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     big.eql?(obj)   => true or false
+ *  
+ *  Returns <code>true</code> only if <i>obj</i> is a
+ *  <code>Bignum</code> with the same value as <i>big</i>. Contrast this
+ *  with <code>Bignum#==</code>, which performs type conversions.
+ *     
+ *     68719476736.eql?(68719476736.0)   #=> false
+ */
+
+static VALUE
+rb_big_eql(x, y)
+    VALUE x, y;
+{
+    if (TYPE(y) != T_BIGNUM) return Qfalse;
+    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
+    if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
+    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *    -big   =>  other_big
+ *
+ * Unary minus (returns a new Bignum whose value is 0-big)
+ */
+
+static VALUE
+rb_big_uminus(x)
+    VALUE x;
+{
+    VALUE z = rb_big_clone(x);
+
+    RBIGNUM(z)->sign = !RBIGNUM(x)->sign;
+
+    return bignorm(z);
+}
+
+/*
+ * call-seq:
+ *     ~big  =>  integer
+ *
+ * Inverts the bits in big. As Bignums are conceptually infinite
+ * length, the result acts as if it had an infinite number of one
+ * bits to the left. In hex representations, this is displayed
+ * as two periods to the left of the digits.
+ *  
+ *   sprintf("%X", ~0x1122334455)    #=> "..FEEDDCCBBAA"
+ */
+
+static VALUE
+rb_big_neg(x)
+    VALUE x;
+{
+    VALUE z = rb_big_clone(x);
+    long i;
+    BDIGIT *ds;
+
+    if (!RBIGNUM(x)->sign) get2comp(z);
+    ds = BDIGITS(z);
+    i = RBIGNUM(x)->len;
+    if (!i) return INT2FIX(~0);
+    while (i--) ds[i] = ~ds[i];
+    RBIGNUM(z)->sign = !RBIGNUM(z)->sign;
+    if (RBIGNUM(x)->sign) get2comp(z);
+
+    return bignorm(z);
+}
+
+static VALUE
+bigsub(x, y)
+    VALUE x, y;
+{
+    VALUE z = 0;
+    BDIGIT *zds;
+    BDIGIT_DBL_SIGNED num;
+    long i = RBIGNUM(x)->len;
+    
+    /* if x is larger than y, swap */
+    if (RBIGNUM(x)->len < RBIGNUM(y)->len) {
+	z = x; x = y; y = z;	/* swap x y */
+    }
+    else if (RBIGNUM(x)->len == RBIGNUM(y)->len) {
+	while (i > 0) {
+	    i--;
+	    if (BDIGITS(x)[i] > BDIGITS(y)[i]) {
+		break;
+	    }
+	    if (BDIGITS(x)[i] < BDIGITS(y)[i]) {
+		z = x; x = y; y = z;	/* swap x y */
+		break;
+	    }
+	}
+    }
+
+    z = bignew(RBIGNUM(x)->len, z==0);
+    zds = BDIGITS(z);
+
+    for (i = 0, num = 0; i < RBIGNUM(y)->len; i++) { 
+	num += (BDIGIT_DBL_SIGNED)BDIGITS(x)[i] - BDIGITS(y)[i];
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
+    } 
+    while (num && i < RBIGNUM(x)->len) {
+	num += BDIGITS(x)[i];
+	zds[i++] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    while (i < RBIGNUM(x)->len) {
+	zds[i] = BDIGITS(x)[i];
+	i++;
+    }
+    
+    return z;
+}
+
+static VALUE
+bigadd(x, y, sign)
+    VALUE x, y;
+    int sign;
+{
+    VALUE z;
+    BDIGIT_DBL num;
+    long i, len;
+
+    sign = (sign == RBIGNUM(y)->sign);
+    if (RBIGNUM(x)->sign != sign) {
+	if (sign) return bigsub(y, x);
+	return bigsub(x, y);
+    }
+
+    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
+	len = RBIGNUM(x)->len + 1;
+        z = x; x = y; y = z;
+    }
+    else {
+	len = RBIGNUM(y)->len + 1;
+    }
+    z = bignew(len, sign);
+
+    len = RBIGNUM(x)->len;
+    for (i = 0, num = 0; i < len; i++) {
+	num += (BDIGIT_DBL)BDIGITS(x)[i] + BDIGITS(y)[i];
+	BDIGITS(z)[i] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    len = RBIGNUM(y)->len;
+    while (num && i < len) {
+	num += BDIGITS(y)[i];
+	BDIGITS(z)[i++] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    while (i < len) {
+	BDIGITS(z)[i] = BDIGITS(y)[i];
+	i++;
+    }
+    BDIGITS(z)[i] = (BDIGIT)num;
+
+    return z;
+}
+
+/*
+ *  call-seq:
+ *     big + other  => Numeric
+ *
+ *  Adds big and other, returning the result.
+ */
+
+VALUE
+rb_big_plus(x, y)
+    VALUE x, y;
+{
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	y = rb_int2big(FIX2LONG(y));
+	/* fall through */
+      case T_BIGNUM:
+	return bignorm(bigadd(x, y, 1));
+
+      case T_FLOAT:
+	return rb_float_new(rb_big2dbl(x) + RFLOAT(y)->value);
+
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+}
+
+/*
+ *  call-seq:
+ *     big - other  => Numeric
+ *
+ *  Subtracts other from big, returning the result.
+ */
+
+VALUE
+rb_big_minus(x, y)
+    VALUE x, y;
+{
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	y = rb_int2big(FIX2LONG(y));
+	/* fall through */
+      case T_BIGNUM:
+	return bignorm(bigadd(x, y, 0));
+
+      case T_FLOAT:
+	return rb_float_new(rb_big2dbl(x) - RFLOAT(y)->value);
+
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+}
+
+VALUE
+rb_big_mul0(x, y)
+    VALUE x, y;
+{
+    long i, j;
+    BDIGIT_DBL n = 0;
+    VALUE z;
+    BDIGIT *zds;
+
+    if (FIXNUM_P(x)) x = rb_int2big(FIX2LONG(x));
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	y = rb_int2big(FIX2LONG(y));
+	break;
+
+      case T_BIGNUM:
+	break;
+
+      case T_FLOAT:
+	return rb_float_new(rb_big2dbl(x) * RFLOAT(y)->value);
+
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+
+    j = RBIGNUM(x)->len + RBIGNUM(y)->len + 1;
+    z = bignew(j, RBIGNUM(x)->sign==RBIGNUM(y)->sign);
+    zds = BDIGITS(z);
+    while (j--) zds[j] = 0;
+    for (i = 0; i < RBIGNUM(x)->len; i++) {
+	BDIGIT_DBL dd = BDIGITS(x)[i]; 
+	if (dd == 0) continue;
+	n = 0;
+	for (j = 0; j < RBIGNUM(y)->len; j++) {
+	    BDIGIT_DBL ee = n + (BDIGIT_DBL)dd * BDIGITS(y)[j];
+	    n = zds[i + j] + ee;
+	    if (ee) zds[i + j] = BIGLO(n);
+	    n = BIGDN(n);
+	}
+	if (n) {
+	    zds[i + j] = n;
+	}
+    }
+
+    return z;
+}
+
+/*
+ *  call-seq:
+ *     big * other  => Numeric
+ *
+ *  Multiplies big and other, returning the result.
+ */
+
+VALUE
+rb_big_mul(x, y)
+    VALUE x, y;
+{
+    return bignorm(rb_big_mul0(x, y));
+}
+
+static void
+bigdivrem(x, y, divp, modp)
+    VALUE x, y;
+    VALUE *divp, *modp;
+{
+    long nx = RBIGNUM(x)->len, ny = RBIGNUM(y)->len;
+    long i, j;
+    VALUE yy, z;
+    BDIGIT *xds, *yds, *zds, *tds;
+    BDIGIT_DBL t2;
+    BDIGIT_DBL_SIGNED num;
+    BDIGIT dd, q;
+
+    if (BIGZEROP(y)) rb_num_zerodiv();
+    yds = BDIGITS(y);
+    if (nx < ny || (nx == ny && BDIGITS(x)[nx - 1] < BDIGITS(y)[ny - 1])) {
+	if (divp) *divp = rb_int2big(0);
+	if (modp) *modp = x;
+	return;
+    }
+    xds = BDIGITS(x);
+    if (ny == 1) {
+	dd = yds[0];
+	z = rb_big_clone(x);
+	zds = BDIGITS(z);
+	t2 = 0; i = nx;
+	while (i--) {
+	    t2 = BIGUP(t2) + zds[i];
+	    zds[i] = (BDIGIT)(t2 / dd);
+	    t2 %= dd;
+	}
+	RBIGNUM(z)->sign = RBIGNUM(x)->sign==RBIGNUM(y)->sign;
+	if (modp) {
+	    *modp = rb_uint2big((unsigned long)t2);
+	    RBIGNUM(*modp)->sign = RBIGNUM(x)->sign;
+	}
+	if (divp) *divp = z;
+	return;
+    }
+    z = bignew(nx==ny?nx+2:nx+1, RBIGNUM(x)->sign==RBIGNUM(y)->sign);
+    zds = BDIGITS(z);
+    if (nx==ny) zds[nx+1] = 0;
+    while (!yds[ny-1]) ny--;
+
+    dd = 0;
+    q = yds[ny-1];
+    while ((q & (1<<(BITSPERDIG-1))) == 0) {
+	q <<= 1;
+	dd++;
+    }
+    if (dd) {
+	yy = rb_big_clone(y);
+	tds = BDIGITS(yy);
+	j = 0;
+	t2 = 0;
+	while (j<ny) {
+	    t2 += (BDIGIT_DBL)yds[j]<<dd;
+	    tds[j++] = BIGLO(t2);
+	    t2 = BIGDN(t2);
+	}
+	yds = tds;
+	j = 0;
+	t2 = 0;
+	while (j<nx) {
+	    t2 += (BDIGIT_DBL)xds[j]<<dd;
+	    zds[j++] = BIGLO(t2);
+	    t2 = BIGDN(t2);
+	}
+	zds[j] = (BDIGIT)t2;
+    }
+    else {
+	zds[nx] = 0;
+	j = nx;
+	while (j--) zds[j] = xds[j];
+    }
+
+    j = nx==ny?nx+1:nx;
+    do {
+	if (zds[j] ==  yds[ny-1]) q = BIGRAD-1;
+	else q = (BDIGIT)((BIGUP(zds[j]) + zds[j-1])/yds[ny-1]);
+	if (q) {
+	    i = 0; num = 0; t2 = 0;
+	    do {			/* multiply and subtract */
+		BDIGIT_DBL ee;
+		t2 += (BDIGIT_DBL)yds[i] * q;
+		ee = num - BIGLO(t2);
+		num = (BDIGIT_DBL)zds[j - ny + i] + ee;
+		if (ee) zds[j - ny + i] = BIGLO(num);
+		num = BIGDN(num);
+		t2 = BIGDN(t2);
+	    } while (++i < ny);
+	    num += zds[j - ny + i] - t2;/* borrow from high digit; don't update */
+	    while (num) {		/* "add back" required */
+		i = 0; num = 0; q--;
+		do {
+		    BDIGIT_DBL ee = num + yds[i];
+		    num = (BDIGIT_DBL)zds[j - ny + i] + ee;
+		    if (ee) zds[j - ny + i] = BIGLO(num);
+		    num = BIGDN(num);
+		} while (++i < ny);
+		num--;
+	    }
+	}
+	zds[j] = q;
+    } while (--j >= ny);
+    if (divp) {			/* move quotient down in z */
+	*divp = rb_big_clone(z);
+	zds = BDIGITS(*divp);
+	j = (nx==ny ? nx+2 : nx+1) - ny;
+	for (i = 0;i < j;i++) zds[i] = zds[i+ny];
+	RBIGNUM(*divp)->len = i;
+    }
+    if (modp) {			/* normalize remainder */
+	*modp = rb_big_clone(z);
+	zds = BDIGITS(*modp);
+	while (--ny && !zds[ny]); ++ny;
+	if (dd) {
+	    t2 = 0; i = ny;
+	    while(i--) {
+		t2 = (t2 | zds[i]) >> dd;
+		q = zds[i];
+		zds[i] = BIGLO(t2);
+		t2 = BIGUP(q);
+	    }
+	}
+	RBIGNUM(*modp)->len = ny;
+	RBIGNUM(*modp)->sign = RBIGNUM(x)->sign;
+    }
+}
+
+static void
+bigdivmod(x, y, divp, modp)
+    VALUE x, y;
+    VALUE *divp, *modp;
+{
+    VALUE mod;
+
+    bigdivrem(x, y, divp, &mod);
+    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign && !BIGZEROP(mod)) {
+	if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
+	if (modp) *modp = bigadd(mod, y, 1);
+    }
+    else {
+	if (divp) *divp = *divp;
+	if (modp) *modp = mod;
+    }
+}
+
+/*
+ *  call-seq:
+ *     big / other     => Numeric
+ *     big.div(other)  => Numeric
+ *
+ *  Divides big by other, returning the result.
+ */
+
+static VALUE
+rb_big_div(x, y)
+    VALUE x, y;
+{
+    VALUE z;
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	y = rb_int2big(FIX2LONG(y));
+	break;
+
+      case T_BIGNUM:
+	break;
+
+      case T_FLOAT:
+	return rb_float_new(rb_big2dbl(x) / RFLOAT(y)->value);
+
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+    bigdivmod(x, y, &z, 0);
+
+    return bignorm(z);
+}
+
+/*
+ *  call-seq:
+ *     big % other         => Numeric
+ *     big.modulo(other)   => Numeric
+ *
+ *  Returns big modulo other. See Numeric.divmod for more
+ *  information.
+ */
+
+static VALUE
+rb_big_modulo(x, y)
+    VALUE x, y;
+{
+    VALUE z;
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	y = rb_int2big(FIX2LONG(y));
+	break;
+
+      case T_BIGNUM:
+	break;
+
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+    bigdivmod(x, y, 0, &z);
+
+    return bignorm(z);
+}
+
+/*
+ *  call-seq:
+ *     big.remainder(numeric)    => number
+ *  
+ *  Returns the remainder after dividing <i>big</i> by <i>numeric</i>.
+ *     
+ *     -1234567890987654321.remainder(13731)      #=> -6966
+ *     -1234567890987654321.remainder(13731.24)   #=> -9906.22531493148
+ */
+static VALUE
+rb_big_remainder(x, y)
+    VALUE x, y;
+{
+    VALUE z;
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	y = rb_int2big(FIX2LONG(y));
+	break;
+
+      case T_BIGNUM:
+	break;
+
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+    bigdivrem(x, y, 0, &z);
+
+    return bignorm(z);
+}
+
+static VALUE big_lshift _((VALUE, unsigned int));
+static VALUE big_rshift _((VALUE, unsigned int));
+
+static VALUE big_shift(x, n)
+    VALUE x;
+    int n;
+{
+    if (n < 0)
+	return big_lshift(x, (unsigned int)n);
+    else if (n > 0)
+	return big_rshift(x, (unsigned int)n);
+    return x;
+}
+
+/*
+ *  call-seq:
+ *     big.divmod(numeric)   => array
+ *  
+ *  See <code>Numeric#divmod</code>.
+ *     
+ */
+VALUE
+rb_big_divmod(x, y)
+    VALUE x, y;
+{
+    VALUE div, mod;
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	y = rb_int2big(FIX2LONG(y));
+	break;
+
+      case T_BIGNUM:
+	break;
+
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+    bigdivmod(x, y, &div, &mod);
+
+    return rb_assoc_new(bignorm(div), bignorm(mod));
+}
+
+/*
+ *  call-seq:
+ *     big.quo(numeric) -> float
+ *  
+ *  Returns the floating point result of dividing <i>big</i> by
+ *  <i>numeric</i>.
+ *     
+ *     -1234567890987654321.quo(13731)      #=> -89910996357705.5
+ *     -1234567890987654321.quo(13731.24)   #=> -89909424858035.7
+ *     
+ */
+
+static VALUE
+rb_big_quo(x, y)
+    VALUE x, y;
+{
+    double dx = rb_big2dbl(x);
+    double dy;
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	dy = (double)FIX2LONG(y);
+	break;
+
+      case T_BIGNUM:
+	dy = rb_big2dbl(y);
+	break;
+
+      case T_FLOAT:
+	dy = RFLOAT(y)->value;
+	break;
+
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+    return rb_float_new(dx / dy);
+}
+
+/*
+ *  call-seq:
+ *     big ** exponent   #=> numeric
+ *
+ *  Raises _big_ to the _exponent_ power (which may be an integer, float,
+ *  or anything that will coerce to a number). The result may be
+ *  a Fixnum, Bignum, or Float
+ *
+ *    123456789 ** 2      #=> 15241578750190521
+ *    123456789 ** 1.2    #=> 5126464716.09932
+ *    123456789 ** -2     #=> 6.5610001194102e-17
+ */
+
+VALUE
+rb_big_pow(x, y)
+    VALUE x, y;
+{
+    double d;
+    long yy;
+    
+    if (y == INT2FIX(0)) return INT2FIX(1);
+    switch (TYPE(y)) {
+      case T_FLOAT:
+	d = RFLOAT(y)->value;
+	break;
+
+      case T_BIGNUM:
+	rb_warn("in a**b, b may be too big");
+	d = rb_big2dbl(y);
+	break;
+
+      case T_FIXNUM:
+	yy = FIX2LONG(y);
+	if (yy > 0) {
+	    VALUE z = x;
+	    const long BIGLEN_LIMIT = 1024*1024 / SIZEOF_BDIGITS;
+
+	    if ((RBIGNUM(x)->len > BIGLEN_LIMIT) ||
+		(RBIGNUM(x)->len > BIGLEN_LIMIT / yy)) {
+		rb_warn("in a**b, b may be too big");
+		d = (double)yy;
+		break;
+	    }
+	    for (;;) {
+		yy -= 1;
+		if (yy == 0) break;
+		while (yy % 2 == 0) {
+		    yy /= 2;
+		    x = rb_big_mul0(x, x);
+		    bigtrunc(x);
+		}
+		z = rb_big_mul0(z, x);
+		bigtrunc(z);
+	    }
+	    return bignorm(z);
+	}
+	d = (double)yy;
+	break;
+
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+    return rb_float_new(pow(rb_big2dbl(x), d));
+}
+
+/*
+ * call-seq:
+ *     big & numeric   =>  integer
+ *
+ * Performs bitwise +and+ between _big_ and _numeric_.
+ */
+
+VALUE
+rb_big_and(xx, yy)
+    VALUE xx, yy;
+{
+    volatile VALUE x, y, z;
+    BDIGIT *ds1, *ds2, *zds;
+    long i, l1, l2;
+    char sign;
+
+    x = xx;
+    y = rb_to_int(yy);
+    if (FIXNUM_P(y)) {
+	y = rb_int2big(FIX2LONG(y));
+    }
+    if (!RBIGNUM(y)->sign) {
+	y = rb_big_clone(y);
+	get2comp(y);
+    }
+    if (!RBIGNUM(x)->sign) {
+	x = rb_big_clone(x);
+	get2comp(x);
+    }
+    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
+	l1 = RBIGNUM(y)->len;
+	l2 = RBIGNUM(x)->len;
+	ds1 = BDIGITS(y);
+	ds2 = BDIGITS(x);
+	sign = RBIGNUM(y)->sign;
+    }
+    else {
+	l1 = RBIGNUM(x)->len;
+	l2 = RBIGNUM(y)->len;
+	ds1 = BDIGITS(x);
+	ds2 = BDIGITS(y);
+	sign = RBIGNUM(x)->sign;
+    }
+    z = bignew(l2, RBIGNUM(x)->sign || RBIGNUM(y)->sign);
+    zds = BDIGITS(z);
+
+    for (i=0; i<l1; i++) {
+	zds[i] = ds1[i] & ds2[i];
+    }
+    for (; i<l2; i++) {
+	zds[i] = sign?0:ds2[i];
+    }
+    if (!RBIGNUM(z)->sign) get2comp(z);
+    return bignorm(z);
+}
+
+/*
+ * call-seq:
+ *     big | numeric   =>  integer
+ *
+ * Performs bitwise +or+ between _big_ and _numeric_.
+ */
+
+VALUE
+rb_big_or(xx, yy)
+    VALUE xx, yy;
+{
+    volatile VALUE x, y, z;
+    BDIGIT *ds1, *ds2, *zds;
+    long i, l1, l2;
+    char sign;
+
+    x = xx;
+    y = rb_to_int(yy);
+    if (FIXNUM_P(y)) {
+	y = rb_int2big(FIX2LONG(y));
+    }
+    if (!RBIGNUM(y)->sign) {
+	y = rb_big_clone(y);
+	get2comp(y);
+    }
+    if (!RBIGNUM(x)->sign) {
+	x = rb_big_clone(x);
+	get2comp(x);
+    }
+    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
+	l1 = RBIGNUM(y)->len;
+	l2 = RBIGNUM(x)->len;
+	ds1 = BDIGITS(y);
+	ds2 = BDIGITS(x);
+	sign = RBIGNUM(y)->sign;
+    }
+    else {
+	l1 = RBIGNUM(x)->len;
+	l2 = RBIGNUM(y)->len;
+	ds1 = BDIGITS(x);
+	ds2 = BDIGITS(y);
+	sign = RBIGNUM(x)->sign;
+    }
+    z = bignew(l2, RBIGNUM(x)->sign && RBIGNUM(y)->sign);
+    zds = BDIGITS(z);
+
+    for (i=0; i<l1; i++) {
+	zds[i] = ds1[i] | ds2[i];
+    }
+    for (; i<l2; i++) {
+	zds[i] = sign?ds2[i]:(BIGRAD-1);
+    }
+    if (!RBIGNUM(z)->sign) get2comp(z);
+
+    return bignorm(z);
+}
+
+/*
+ * call-seq:
+ *     big ^ numeric   =>  integer
+ *
+ * Performs bitwise +exclusive or+ between _big_ and _numeric_.
+ */
+
+VALUE
+rb_big_xor(xx, yy)
+    VALUE xx, yy;
+{
+    volatile VALUE x, y;
+    VALUE z;
+    BDIGIT *ds1, *ds2, *zds;
+    long i, l1, l2;
+    char sign;
+
+    x = xx;
+    y = rb_to_int(yy);
+    if (FIXNUM_P(y)) {
+	y = rb_int2big(FIX2LONG(y));
+    }
+    if (!RBIGNUM(y)->sign) {
+	y = rb_big_clone(y);
+	get2comp(y);
+    }
+    if (!RBIGNUM(x)->sign) {
+	x = rb_big_clone(x);
+	get2comp(x);
+    }
+    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
+	l1 = RBIGNUM(y)->len;
+	l2 = RBIGNUM(x)->len;
+	ds1 = BDIGITS(y);
+	ds2 = BDIGITS(x);
+	sign = RBIGNUM(y)->sign;
+    }
+    else {
+	l1 = RBIGNUM(x)->len;
+	l2 = RBIGNUM(y)->len;
+	ds1 = BDIGITS(x);
+	ds2 = BDIGITS(y);
+	sign = RBIGNUM(x)->sign;
+    }
+    RBIGNUM(x)->sign = RBIGNUM(x)->sign?1:0;
+    RBIGNUM(y)->sign = RBIGNUM(y)->sign?1:0;
+    z = bignew(l2, !(RBIGNUM(x)->sign ^ RBIGNUM(y)->sign));
+    zds = BDIGITS(z);
+
+    for (i=0; i<l1; i++) {
+	zds[i] = ds1[i] ^ ds2[i];
+    }
+    for (; i<l2; i++) {
+	zds[i] = sign?ds2[i]:~ds2[i];
+    }
+    if (!RBIGNUM(z)->sign) get2comp(z);
+
+    return bignorm(z);
+}
+
+static VALUE
+check_shiftdown(VALUE y, VALUE x)
+{
+    if (!RBIGNUM(x)->len) return INT2FIX(0);
+    if (RBIGNUM(y)->len > SIZEOF_LONG / SIZEOF_BDIGITS) {
+	return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(-1);
+    }
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *     big << numeric   =>  integer
+ *
+ * Shifts big left _numeric_ positions (right if _numeric_ is negative).
+ */
+
+VALUE
+rb_big_lshift(x, y)
+    VALUE x, y;
+{
+    int shift, neg = 0;
+
+    for (;;) {
+	if (FIXNUM_P(y)) {
+	    shift = FIX2INT(y);
+	    if (shift < 0) {
+		neg = 1;
+		shift = -shift;
+	    }
+	    break;
+	}
+	else if (TYPE(y) == T_BIGNUM) {
+	    if (!RBIGNUM(y)->sign) {
+		VALUE t = check_shiftdown(y, x);
+		if (!NIL_P(t)) return t;
+		neg = 1;
+	    }
+	    shift = big2ulong(y, "long", Qtrue);
+	    break;
+	}
+	y = rb_to_int(y);
+    }
+
+    if (neg) return big_rshift(x, shift);
+    return big_lshift(x, shift);
+}
+
+static VALUE
+big_lshift(x, shift)
+    VALUE x;
+    unsigned int shift;
+{
+    BDIGIT *xds, *zds;
+    int s1 = shift/BITSPERDIG;
+    int s2 = shift%BITSPERDIG;
+    VALUE z;
+    BDIGIT_DBL num = 0;
+    long len, i;
+
+    len = RBIGNUM(x)->len;
+    z = bignew(len+s1+1, RBIGNUM(x)->sign);
+    zds = BDIGITS(z);
+    for (i=0; i<s1; i++) {
+	*zds++ = 0;
+    }
+    xds = BDIGITS(x);
+    for (i=0; i<len; i++) {
+	num = num | (BDIGIT_DBL)*xds++<<s2;
+	*zds++ = BIGLO(num);
+	num = BIGDN(num);
+    }
+    *zds = BIGLO(num);
+    return bignorm(z);
+}
+
+/*
+ * call-seq:
+ *     big >> numeric   =>  integer
+ *
+ * Shifts big right _numeric_ positions (left if _numeric_ is negative).
+ */
+
+VALUE
+rb_big_rshift(x, y)
+    VALUE x, y;
+{
+    int shift;
+    int neg = 0;
+
+    for (;;) {
+	if (FIXNUM_P(y)) {
+	    shift = FIX2INT(y);
+	    if (shift < 0) {
+		neg = 1;
+		shift = -shift;
+	    }
+	    break;
+	}
+	else if (TYPE(y) == T_BIGNUM) {
+	    if (RBIGNUM(y)->sign) {
+		VALUE t = check_shiftdown(y, x);
+		if (!NIL_P(t)) return t;
+	    }
+	    else {
+		neg = 1;
+	    }
+	    shift = big2ulong(y, "long", Qtrue);
+	    break;
+	}
+	y = rb_to_int(y);
+    }
+
+    if (neg) return big_lshift(x, shift);
+    return big_rshift(x, shift);
+}
+
+static VALUE
+big_rshift(x, shift)
+    VALUE x;
+    unsigned int shift;
+{
+    BDIGIT *xds, *zds;
+    long s1 = shift/BITSPERDIG;
+    long s2 = shift%BITSPERDIG;
+    VALUE z;
+    BDIGIT_DBL num = 0;
+    long i, j;
+    volatile VALUE save_x;
+
+    if (s1 > RBIGNUM(x)->len) {
+	if (RBIGNUM(x)->sign)
+	    return INT2FIX(0);
+	else
+	    return INT2FIX(-1);
+    }
+    if (!RBIGNUM(x)->sign) {
+	save_x = x = rb_big_clone(x);
+	get2comp(x);
+    }
+    xds = BDIGITS(x);
+    i = RBIGNUM(x)->len; j = i - s1;
+    if (j == 0) {
+	if (RBIGNUM(x)->sign) return INT2FIX(0);
+	else return INT2FIX(-1);
+    }
+    z = bignew(j, RBIGNUM(x)->sign);
+    if (!RBIGNUM(x)->sign) {
+	num = ((BDIGIT_DBL)~0) << BITSPERDIG;
+    }
+    zds = BDIGITS(z);
+    while (i--, j--) {
+	num = (num | xds[i]) >> s2;
+	zds[j] = BIGLO(num);
+	num = BIGUP(xds[i]);
+    }
+    if (!RBIGNUM(x)->sign) {
+	get2comp(z);
+    }
+    return bignorm(z);
+}
+
+/*
+ *  call-seq:
+ *     big[n] -> 0, 1
+ *  
+ *  Bit Reference---Returns the <em>n</em>th bit in the (assumed) binary
+ *  representation of <i>big</i>, where <i>big</i>[0] is the least
+ *  significant bit.
+ *     
+ *     a = 9**15
+ *     50.downto(0) do |n|
+ *       print a[n]
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     000101110110100000111000011110010100111100010111001
+ *     
+ */
+
+static VALUE
+rb_big_aref(x, y)
+    VALUE x, y;
+{
+    BDIGIT *xds;
+    BDIGIT_DBL num;
+    unsigned long shift;
+    long i, s1, s2;
+
+    if (TYPE(y) == T_BIGNUM) {
+	if (!RBIGNUM(y)->sign)
+	    return INT2FIX(0);
+	if (RBIGNUM(bigtrunc(y))->len > SIZEOF_LONG/SIZEOF_BDIGITS) {
+	  out_of_range:
+	    return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(1);
+	}
+	shift = big2ulong(y, "long", Qfalse);
+    }
+    else {
+	i = NUM2LONG(y);
+	if (i < 0) return INT2FIX(0);
+	shift = (VALUE)i;
+    }
+    s1 = shift/BITSPERDIG;
+    s2 = shift%BITSPERDIG;
+
+    if (s1 >= RBIGNUM(x)->len) goto out_of_range;
+    if (!RBIGNUM(x)->sign) {
+	xds = BDIGITS(x);
+	i = 0; num = 1;
+	while (num += ~xds[i], ++i <= s1) {
+	    num = BIGDN(num);
+	}
+    }
+    else {
+	num = BDIGITS(x)[s1];
+    }
+    if (num & ((BDIGIT_DBL)1<<s2))
+	return INT2FIX(1);
+    return INT2FIX(0);
+}
+
+/*
+ * call-seq:
+ *   big.hash   => fixnum
+ *
+ * Compute a hash based on the value of _big_.
+ */
+
+static VALUE
+rb_big_hash(x)
+    VALUE x;
+{
+    long i, len, key;
+    BDIGIT *digits;
+
+    key = 0; digits = BDIGITS(x); len = RBIGNUM(x)->len;
+    for (i=0; i<len; i++) {
+	key ^= *digits++;
+    }
+    return LONG2FIX(key);
+}
+
+/*
+ * MISSING: documentation
+ */
+
+static VALUE
+rb_big_coerce(x, y)
+    VALUE x, y;
+{
+    if (FIXNUM_P(y)) {
+	return rb_assoc_new(rb_int2big(FIX2LONG(y)), x);
+    }
+    else if (TYPE(y) == T_BIGNUM) {
+       return rb_assoc_new(y, x);
+    }
+    else {
+	rb_raise(rb_eTypeError, "can't coerce %s to Bignum",
+		 rb_obj_classname(y));
+    }
+    /* not reached */
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     big.abs -> aBignum
+ *  
+ *  Returns the absolute value of <i>big</i>.
+ *     
+ *     -1234567890987654321.abs   #=> 1234567890987654321
+ */
+
+static VALUE
+rb_big_abs(x)
+    VALUE x;
+{
+    if (!RBIGNUM(x)->sign) {
+	x = rb_big_clone(x);
+	RBIGNUM(x)->sign = 1;
+    }
+    return x;
+}
+
+VALUE
+rb_big_rand(max, rand_buf)
+    VALUE max;
+    double *rand_buf;
+{
+    VALUE v;
+    long len = RBIGNUM(max)->len;
+
+    if (BIGZEROP(max)) {
+	return rb_float_new(rand_buf[0]);
+    }
+    v = bignew(len,1);
+    len--;
+    BDIGITS(v)[len] = BDIGITS(max)[len] * rand_buf[len];    
+    while (len--) {
+	BDIGITS(v)[len] = ((BDIGIT)~0) * rand_buf[len];
+    }
+
+    return v;
+}
+
+/*
+ *  call-seq:
+ *     big.size -> integer
+ *  
+ *  Returns the number of bytes in the machine representation of
+ *  <i>big</i>.
+ *     
+ *     (256**10 - 1).size   #=> 12
+ *     (256**20 - 1).size   #=> 20
+ *     (256**40 - 1).size   #=> 40
+ */
+
+static VALUE
+rb_big_size(big)
+    VALUE big;
+{
+    return LONG2FIX(RBIGNUM(big)->len*SIZEOF_BDIGITS);
+}
+
+/*
+ *  Bignum objects hold integers outside the range of
+ *  Fixnum. Bignum objects are created
+ *  automatically when integer calculations would otherwise overflow a
+ *  Fixnum. When a calculation involving
+ *  Bignum objects returns a result that will fit in a
+ *  Fixnum, the result is automatically converted.
+ *     
+ *  For the purposes of the bitwise operations and <code>[]</code>, a
+ *  Bignum is treated as if it were an infinite-length
+ *  bitstring with 2's complement representation.
+ *     
+ *  While Fixnum values are immediate, Bignum
+ *  objects are not---assignment and parameter passing work with
+ *  references to objects, not the objects themselves.
+ *     
+ */
+
+void
+Init_Bignum()
+{
+    rb_cBignum = rb_define_class("Bignum", rb_cInteger);
+
+    rb_define_method(rb_cBignum, "to_s", rb_big_to_s, -1);
+    rb_define_method(rb_cBignum, "coerce", rb_big_coerce, 1);
+    rb_define_method(rb_cBignum, "-@", rb_big_uminus, 0);
+    rb_define_method(rb_cBignum, "+", rb_big_plus, 1);
+    rb_define_method(rb_cBignum, "-", rb_big_minus, 1);
+    rb_define_method(rb_cBignum, "*", rb_big_mul, 1);
+    rb_define_method(rb_cBignum, "/", rb_big_div, 1);
+    rb_define_method(rb_cBignum, "%", rb_big_modulo, 1);
+    rb_define_method(rb_cBignum, "div", rb_big_div, 1);
+    rb_define_method(rb_cBignum, "divmod", rb_big_divmod, 1);
+    rb_define_method(rb_cBignum, "modulo", rb_big_modulo, 1);
+    rb_define_method(rb_cBignum, "remainder", rb_big_remainder, 1);
+    rb_define_method(rb_cBignum, "quo", rb_big_quo, 1);
+    rb_define_method(rb_cBignum, "**", rb_big_pow, 1);
+    rb_define_method(rb_cBignum, "&", rb_big_and, 1);
+    rb_define_method(rb_cBignum, "|", rb_big_or, 1);
+    rb_define_method(rb_cBignum, "^", rb_big_xor, 1);
+    rb_define_method(rb_cBignum, "~", rb_big_neg, 0);
+    rb_define_method(rb_cBignum, "<<", rb_big_lshift, 1);
+    rb_define_method(rb_cBignum, ">>", rb_big_rshift, 1);
+    rb_define_method(rb_cBignum, "[]", rb_big_aref, 1);
+
+    rb_define_method(rb_cBignum, "<=>", rb_big_cmp, 1);
+    rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
+    rb_define_method(rb_cBignum, "eql?", rb_big_eql, 1);
+    rb_define_method(rb_cBignum, "hash", rb_big_hash, 0);
+    rb_define_method(rb_cBignum, "to_f", rb_big_to_f, 0);
+    rb_define_method(rb_cBignum, "abs", rb_big_abs, 0);
+    rb_define_method(rb_cBignum, "size", rb_big_size, 0);
+}
diff --git a/ruby_1_8_6/bin/erb b/ruby_1_8_6/bin/erb
new file mode 100755
index 0000000000..a6fcd5370c
--- /dev/null
+++ b/ruby_1_8_6/bin/erb
@@ -0,0 +1,141 @@
+#!/usr/bin/env ruby
+# Tiny eRuby --- ERB2
+# Copyright (c) 1999-2000,2002 Masatoshi SEKI 
+# You can redistribute it and/or modify it under the same terms as Ruby.
+
+require 'erb'
+
+class ERB
+  module Main
+    def ARGV.switch
+      return nil if self.empty?
+      arg = self.shift
+      return nil if arg == '--'
+      if arg =~ /^-(.)(.*)/
+        return arg if $1 == '-'
+        raise 'unknown switch "-"' if $2.index('-')
+        self.unshift "-#{$2}" if $2.size > 0
+        "-#{$1}"
+      else
+        self.unshift arg
+        nil
+      end
+    end
+    
+    def ARGV.req_arg
+      self.shift || raise('missing argument')
+    end
+
+    def trim_mode_opt(trim_mode, disable_percent)
+      return trim_mode if disable_percent
+      case trim_mode
+      when 0
+        return '%'
+      when 1
+        return '%>'
+      when 2
+        return '%<>'
+      when '-'
+        return '%-'
+      end
+    end
+    module_function :trim_mode_opt
+
+    def run(factory=ERB)
+      trim_mode = 0
+      disable_percent = false
+      begin
+        while switch = ARGV.switch
+          case switch
+          when '-x'                        # ruby source
+            output = true
+          when '-n'                        # line number
+            number = true
+          when '-v'                        # verbose
+            $VERBOSE = true
+          when '--version'                 # version
+            STDERR.puts factory.version
+            exit
+          when '-d', '--debug'             # debug
+            $DEBUG = true
+          when '-r'                        # require
+            require ARGV.req_arg
+          when '-S'                        # security level
+            arg = ARGV.req_arg
+            raise "invalid safe_level #{arg.dump}" unless arg =~ /^[0-4]$/
+            safe_level = arg.to_i
+          when '-T'                        # trim mode
+            arg = ARGV.req_arg
+            if arg == '-'
+              trim_mode = arg 
+              next
+            end
+            raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
+            trim_mode = arg.to_i
+          when '-K'                        # KCODE
+            arg = ARGV.req_arg
+            case arg.downcase
+            when 'e', '-e', 'euc'
+              $KCODE = 'EUC'
+            when 's', '-s', 'sjis'
+              $KCODE = 'SJIS'
+            when 'u', '-u', 'utf8'
+              $KCODE = 'UTF8'
+            when 'n', '-n', 'none'
+              $KCODE = 'NONE'
+            else
+              raise "invalid KCODE #{arg.dump}"
+            end
+          when '-P'
+            disable_percent = true
+          when '--help'
+            raise "print this help"
+          else
+            raise "unknown switch #{switch.dump}"
+          end
+        end
+      rescue                               # usage
+        STDERR.puts $!.to_s
+        STDERR.puts File.basename($0) + 
+          " [switches] [inputfile]"
+        STDERR.puts <<EOU
+  -x               print ruby script
+  -n               print ruby script with line number
+  -v               enable verbose mode
+  -d               set $DEBUG to true
+  -r [library]     load a library
+  -K [kcode]       specify KANJI code-set
+  -S [safe_level]  set $SAFE (0..4)
+  -T [trim_mode]   specify trim_mode (0..2, -)
+  -P               ignore lines which start with "%"
+EOU
+        exit 1
+      end
+
+      src = $<.read
+      filename = $FILENAME
+      exit 2 unless src
+      trim = trim_mode_opt(trim_mode, disable_percent)
+      erb = factory.new(src.untaint, safe_level, trim)
+      erb.filename = filename
+      if output
+        if number
+          l = 1
+          for line in erb.src
+            puts "%3d %s"%[l, line]
+            l += 1
+          end
+        else
+          puts erb.src
+        end
+      else
+        erb.run(TOPLEVEL_BINDING.taint)
+      end
+    end
+    module_function :run
+  end
+end
+
+if __FILE__ == $0
+  ERB::Main.run
+end
diff --git a/ruby_1_8_6/bin/irb b/ruby_1_8_6/bin/irb
new file mode 100644
index 0000000000..f277bc4b69
--- /dev/null
+++ b/ruby_1_8_6/bin/irb
@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+#
+#   irb.rb - intaractive ruby
+#   	$Release Version: 0.9.5 $
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+
+require "irb"
+
+if __FILE__ == $0
+  IRB.start(__FILE__)
+else
+  # check -e option
+  if /^-e$/ =~ $0
+    IRB.start(__FILE__)
+  else
+    IRB.setup(__FILE__)
+  end
+end
diff --git a/ruby_1_8_6/bin/rdoc b/ruby_1_8_6/bin/rdoc
new file mode 100644
index 0000000000..fe619137fd
--- /dev/null
+++ b/ruby_1_8_6/bin/rdoc
@@ -0,0 +1,67 @@
+#!/usr/bin/env ruby
+#
+#  RDoc: Documentation tool for source code
+#        (see lib/rdoc/rdoc.rb for more information)
+#
+#  Copyright (c) 2003 Dave Thomas
+#  Released under the same terms as Ruby
+#
+#  $Revision$
+
+## Transitional Hack ####
+#
+#  RDoc was initially distributed independently, and installed
+#  itself into <prefix>/lib/ruby/site_ruby/<ver>/rdoc...
+#
+#  Now that RDoc is part of the distribution, it's installed into
+#  <prefix>/lib/ruby/<ver>, which unfortunately appears later in the
+#  search path. This means that if you have previously installed RDoc,
+#  and then install from ruby-lang, you'll pick up the old one by
+#  default. This hack checks for the condition, and readjusts the
+#  search path if necessary.
+
+def adjust_for_existing_rdoc(path)
+  
+  $stderr.puts %{
+  It seems as if you have a previously-installed RDoc in
+  the directory #{path}.
+
+  Because this is now out-of-date, you might want to consider
+  removing the directories:
+
+    #{File.join(path, "rdoc")}
+
+  and
+
+    #{File.join(path, "markup")}
+
+  }
+
+  # Move all the site_ruby directories to the end
+  p $:
+  $:.replace($:.partition {|path| /site_ruby/ !~ path}.flatten)
+  p $:
+end
+
+$:.each do |path|
+  if /site_ruby/ =~ path 
+    rdoc_path = File.join(path, 'rdoc', 'rdoc.rb')
+    if File.exists?(rdoc_path)
+      adjust_for_existing_rdoc(path)
+      break
+    end
+  end
+end
+
+## End of Transitional Hack ##
+
+
+require 'rdoc/rdoc'
+
+begin
+  r = RDoc::RDoc.new
+  r.document(ARGV)
+rescue RDoc::RDocError => e
+  $stderr.puts e.message
+  exit(1)
+end
diff --git a/ruby_1_8_6/bin/ri b/ruby_1_8_6/bin/ri
new file mode 100755
index 0000000000..fb3e00eda3
--- /dev/null
+++ b/ruby_1_8_6/bin/ri
@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+# usage:
+#
+#   ri  name...
+#
+# where name can be 
+#
+#   Class | Class::method | Class#method | Class.method | method
+#
+# All names may be abbreviated to their minimum unbiguous form. If a name
+# _is_ ambiguous, all valid options will be listed.
+#
+# The form '.' method matches either class or instance methods, while 
+# #method matches only instance and ::method matches only class methods.
+#
+#
+# == Installing Documentation
+#
+# 'ri' uses a database of documentation built by the RDoc utility.
+# 
+# So, how do you install this documentation on your system?
+# It depends on how you installed Ruby.
+#
+# <em>If you installed Ruby from source files</em> (that is, if it some point
+# you typed 'make' during the process :), you can install the RDoc
+# documentation yourself. Just go back to the place where you have 
+# your Ruby source and type
+#
+#    make install-doc
+#
+# You'll probably need to do this as a superuser, as the documentation
+# is installed in the Ruby target tree (normally somewhere under 
+# <tt>/usr/local</tt>.
+#
+# <em>If you installed Ruby from a binary distribution</em> (perhaps
+# using a one-click installer, or using some other packaging system),
+# then the team that produced the package probably forgot to package
+# the documentation as well. Contact them, and see if they can add
+# it to the next release.
+#
+
+
+require 'rdoc/ri/ri_driver'
+
+######################################################################
+
+ri = RiDriver.new
+ri.process_args
+
diff --git a/ruby_1_8_6/bin/testrb b/ruby_1_8_6/bin/testrb
new file mode 100755
index 0000000000..ff49cb5466
--- /dev/null
+++ b/ruby_1_8_6/bin/testrb
@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
+  abort r.options.banner + " tests..."
+exit r.run
diff --git a/ruby_1_8_6/class.c b/ruby_1_8_6/class.c
new file mode 100644
index 0000000000..80dc9e4b2d
--- /dev/null
+++ b/ruby_1_8_6/class.c
@@ -0,0 +1,1030 @@
+/**********************************************************************
+
+  class.c -
+
+  $Author$
+  $Date$
+  created at: Tue Aug 10 15:05:44 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "rubysig.h"
+#include "node.h"
+#include "st.h"
+#include <ctype.h>
+
+extern st_table *rb_class_tbl;
+
+VALUE
+rb_class_boot(super)
+    VALUE super;
+{
+    NEWOBJ(klass, struct RClass);
+    OBJSETUP(klass, rb_cClass, T_CLASS);
+
+    klass->super = super;
+    klass->iv_tbl = 0;
+    klass->m_tbl = 0;		/* safe GC */
+    klass->m_tbl = st_init_numtable();
+
+    OBJ_INFECT(klass, super);
+    return (VALUE)klass;
+}
+
+VALUE
+rb_class_new(super)
+    VALUE super;
+{
+    Check_Type(super, T_CLASS);
+    if (super == rb_cClass) {
+	rb_raise(rb_eTypeError, "can't make subclass of Class");
+    }
+    if (FL_TEST(super, FL_SINGLETON)) {
+	rb_raise(rb_eTypeError, "can't make subclass of virtual class");
+    }
+    return rb_class_boot(super);
+}
+
+static int
+clone_method(mid, body, tbl)
+    ID mid;
+    NODE *body;
+    st_table *tbl;
+{
+    st_insert(tbl, mid, (st_data_t)NEW_METHOD(body->nd_body, body->nd_noex));
+    return ST_CONTINUE;
+}
+
+/* :nodoc: */
+VALUE
+rb_mod_init_copy(clone, orig)
+    VALUE clone, orig;
+{
+    rb_obj_init_copy(clone, orig);
+    if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
+	RBASIC(clone)->klass = rb_singleton_class_clone(orig);
+    }
+    RCLASS(clone)->super = RCLASS(orig)->super;
+    if (RCLASS(orig)->iv_tbl) {
+	ID id;
+
+	RCLASS(clone)->iv_tbl = st_copy(RCLASS(orig)->iv_tbl);
+	id = rb_intern("__classpath__");
+	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
+	id = rb_intern("__classid__");
+	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
+    }
+    if (RCLASS(orig)->m_tbl) {
+	RCLASS(clone)->m_tbl = st_init_numtable();
+	st_foreach(RCLASS(orig)->m_tbl, clone_method,
+	  (st_data_t)RCLASS(clone)->m_tbl);
+    }
+
+    return clone;
+}
+
+/* :nodoc: */
+VALUE
+rb_class_init_copy(clone, orig)
+    VALUE clone, orig;
+{
+    if (RCLASS(clone)->super != 0) {
+	rb_raise(rb_eTypeError, "already initialized class");
+    }
+    if (FL_TEST(orig, FL_SINGLETON)) {
+	rb_raise(rb_eTypeError, "can't copy singleton class");
+    }
+    return rb_mod_init_copy(clone, orig);
+}
+
+VALUE
+rb_singleton_class_clone(obj)
+    VALUE obj;
+{
+    VALUE klass = RBASIC(obj)->klass;
+
+    if (!FL_TEST(klass, FL_SINGLETON))
+	return klass;
+    else {
+	/* copy singleton(unnamed) class */
+	NEWOBJ(clone, struct RClass);
+	OBJSETUP(clone, 0, RBASIC(klass)->flags);
+
+	if (BUILTIN_TYPE(obj) == T_CLASS) {
+	    RBASIC(clone)->klass = (VALUE)clone;
+	}
+	else {
+	    RBASIC(clone)->klass = rb_singleton_class_clone(klass);
+	}
+
+	clone->super = RCLASS(klass)->super;
+	clone->iv_tbl = 0;
+	clone->m_tbl = 0;
+	if (RCLASS(klass)->iv_tbl) {
+	    clone->iv_tbl = st_copy(RCLASS(klass)->iv_tbl);
+	}
+	clone->m_tbl = st_init_numtable();
+	st_foreach(RCLASS(klass)->m_tbl, clone_method,
+	  (st_data_t)clone->m_tbl);
+	rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
+	FL_SET(clone, FL_SINGLETON);
+	return (VALUE)clone;
+    }
+}
+
+void
+rb_singleton_class_attached(klass, obj)
+    VALUE klass, obj;
+{
+    if (FL_TEST(klass, FL_SINGLETON)) {
+	if (!RCLASS(klass)->iv_tbl) {
+	    RCLASS(klass)->iv_tbl = st_init_numtable();
+	}
+	st_insert(RCLASS(klass)->iv_tbl, rb_intern("__attached__"), obj);
+    }
+}
+
+VALUE
+rb_make_metaclass(obj, super)
+    VALUE obj, super;
+{
+    VALUE klass = rb_class_boot(super);
+    FL_SET(klass, FL_SINGLETON);
+    RBASIC(obj)->klass = klass;
+    rb_singleton_class_attached(klass, obj);
+    if (BUILTIN_TYPE(obj) == T_CLASS && FL_TEST(obj, FL_SINGLETON)) {
+	RBASIC(klass)->klass = klass;
+	RCLASS(klass)->super = RBASIC(rb_class_real(RCLASS(obj)->super))->klass;
+    }
+    else {
+	VALUE metasuper = RBASIC(rb_class_real(super))->klass;
+
+	/* metaclass of a superclass may be NULL at boot time */
+	if (metasuper) {
+	    RBASIC(klass)->klass = metasuper;
+	}
+    }
+
+    return klass;
+}
+
+VALUE
+rb_define_class_id(id, super)
+    ID id;
+    VALUE super;
+{
+    VALUE klass;
+
+    if (!super) super = rb_cObject;
+    klass = rb_class_new(super);
+    rb_make_metaclass(klass, RBASIC(super)->klass);
+
+    return klass;
+}
+
+void
+rb_check_inheritable(super)
+    VALUE super;
+{
+    if (TYPE(super) != T_CLASS) {
+	rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
+		 rb_obj_classname(super));
+    }
+    if (RBASIC(super)->flags & FL_SINGLETON) {
+	rb_raise(rb_eTypeError, "can't make subclass of virtual class");
+    }
+}
+
+VALUE
+rb_class_inherited(super, klass)
+    VALUE super, klass;
+{
+    if (!super) super = rb_cObject;
+    return rb_funcall(super, rb_intern("inherited"), 1, klass);
+}
+
+VALUE
+rb_define_class(name, super)
+    const char *name;
+    VALUE super;
+{
+    VALUE klass;
+    ID id;
+
+    id = rb_intern(name);
+    if (rb_const_defined(rb_cObject, id)) {
+	klass = rb_const_get(rb_cObject, id);
+	if (TYPE(klass) != T_CLASS) {
+	    rb_raise(rb_eTypeError, "%s is not a class", name);
+	}
+	if (rb_class_real(RCLASS(klass)->super) != super) {
+	    rb_name_error(id, "%s is already defined", name);
+	}
+	return klass;
+    }
+    if (!super) {
+	rb_warn("no super class for `%s', Object assumed", name);
+    }
+    klass = rb_define_class_id(id, super);
+    st_add_direct(rb_class_tbl, id, klass);
+    rb_name_class(klass, id);
+    rb_const_set(rb_cObject, id, klass);
+    rb_class_inherited(super, klass);
+
+    return klass;
+}
+
+VALUE
+rb_define_class_under(outer, name, super)
+    VALUE outer;
+    const char *name;
+    VALUE super;
+{
+    VALUE klass;
+    ID id;
+
+    id = rb_intern(name);
+    if (rb_const_defined_at(outer, id)) {
+	klass = rb_const_get_at(outer, id);
+	if (TYPE(klass) != T_CLASS) {
+	    rb_raise(rb_eTypeError, "%s is not a class", name);
+	}
+	if (rb_class_real(RCLASS(klass)->super) != super) {
+	    rb_name_error(id, "%s is already defined", name);
+	}
+	return klass;
+    }
+    if (!super) {
+	rb_warn("no super class for `%s::%s', Object assumed",
+		rb_class2name(outer), name);
+    }
+    klass = rb_define_class_id(id, super);
+    rb_set_class_path(klass, outer, name);
+    rb_const_set(outer, id, klass);
+    rb_class_inherited(super, klass);
+
+    return klass;
+}
+
+VALUE
+rb_module_new()
+{
+    NEWOBJ(mdl, struct RClass);
+    OBJSETUP(mdl, rb_cModule, T_MODULE);
+
+    mdl->super = 0;
+    mdl->iv_tbl = 0;
+    mdl->m_tbl = 0;
+    mdl->m_tbl = st_init_numtable();
+
+    return (VALUE)mdl;
+}
+
+VALUE
+rb_define_module_id(id)
+    ID id;
+{
+    VALUE mdl;
+
+    mdl = rb_module_new();
+    rb_name_class(mdl, id);
+
+    return mdl;
+}
+
+VALUE
+rb_define_module(name)
+    const char *name;
+{
+    VALUE module;
+    ID id;
+
+    id = rb_intern(name);
+    if (rb_const_defined(rb_cObject, id)) {
+	module = rb_const_get(rb_cObject, id);
+	if (TYPE(module) == T_MODULE)
+	    return module;
+	rb_raise(rb_eTypeError, "%s is not a module", rb_obj_classname(module));
+    }
+    module = rb_define_module_id(id);
+    st_add_direct(rb_class_tbl, id, module);
+    rb_const_set(rb_cObject, id, module);
+
+    return module;
+}
+
+VALUE
+rb_define_module_under(outer, name)
+    VALUE outer;
+    const char *name;
+{
+    VALUE module;
+    ID id;
+
+    id = rb_intern(name);
+    if (rb_const_defined_at(outer, id)) {
+	module = rb_const_get_at(outer, id);
+	if (TYPE(module) == T_MODULE)
+	    return module;
+	rb_raise(rb_eTypeError, "%s::%s is not a module",
+		 rb_class2name(outer), rb_obj_classname(module));
+    }
+    module = rb_define_module_id(id);
+    rb_const_set(outer, id, module);
+    rb_set_class_path(module, outer, name);
+
+    return module;
+}
+
+static VALUE
+include_class_new(module, super)
+    VALUE module, super;
+{
+    NEWOBJ(klass, struct RClass);
+    OBJSETUP(klass, rb_cClass, T_ICLASS);
+
+    if (BUILTIN_TYPE(module) == T_ICLASS) {
+	module = RBASIC(module)->klass;
+    }
+    if (!RCLASS(module)->iv_tbl) {
+	RCLASS(module)->iv_tbl = st_init_numtable();
+    }
+    klass->iv_tbl = RCLASS(module)->iv_tbl;
+    klass->m_tbl = RCLASS(module)->m_tbl;
+    klass->super = super;
+    if (TYPE(module) == T_ICLASS) {
+	RBASIC(klass)->klass = RBASIC(module)->klass;
+    }
+    else {
+	RBASIC(klass)->klass = module;
+    }
+    OBJ_INFECT(klass, module);
+    OBJ_INFECT(klass, super);
+
+    return (VALUE)klass;
+}
+
+void
+rb_include_module(klass, module)
+    VALUE klass, module;
+{
+    VALUE p, c;
+    int changed = 0;
+
+    rb_frozen_class_p(klass);
+    if (!OBJ_TAINTED(klass)) {
+	rb_secure(4);
+    }
+    
+    if (TYPE(module) != T_MODULE) {
+	Check_Type(module, T_MODULE);
+    }
+
+    OBJ_INFECT(klass, module);
+    c = klass;
+    while (module) {
+	int superclass_seen = Qfalse;
+
+	if (RCLASS(klass)->m_tbl == RCLASS(module)->m_tbl)
+	    rb_raise(rb_eArgError, "cyclic include detected");
+	/* ignore if the module included already in superclasses */
+	for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) {
+	    switch (BUILTIN_TYPE(p)) {
+	      case T_ICLASS:
+		if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
+		    if (!superclass_seen) {
+			c = p;	/* move insertion point */
+		    }
+		    goto skip;
+		}
+		break;
+	      case T_CLASS:
+		superclass_seen = Qtrue;
+		break;
+	    }
+	}
+	c = RCLASS(c)->super = include_class_new(module, RCLASS(c)->super);
+	changed = 1;
+      skip:
+	module = RCLASS(module)->super;
+    }
+    if (changed) rb_clear_cache();
+}
+
+/*
+ *  call-seq:
+ *     mod.included_modules -> array
+ *  
+ *  Returns the list of modules included in <i>mod</i>.
+ *     
+ *     module Mixin
+ *     end
+ *     
+ *     module Outer
+ *       include Mixin
+ *     end
+ *     
+ *     Mixin.included_modules   #=> []
+ *     Outer.included_modules   #=> [Mixin]
+ */
+
+VALUE
+rb_mod_included_modules(mod)
+    VALUE mod;
+{
+    VALUE ary = rb_ary_new();
+    VALUE p;
+
+    for (p = RCLASS(mod)->super; p; p = RCLASS(p)->super) {
+	if (BUILTIN_TYPE(p) == T_ICLASS) {
+	    rb_ary_push(ary, RBASIC(p)->klass);
+	}
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     mod.include?(module)    => true or false
+ *  
+ *  Returns <code>true</code> if <i>module</i> is included in
+ *  <i>mod</i> or one of <i>mod</i>'s ancestors.
+ *     
+ *     module A
+ *     end
+ *     class B
+ *       include A
+ *     end
+ *     class C < B
+ *     end
+ *     B.include?(A)   #=> true
+ *     C.include?(A)   #=> true
+ *     A.include?(A)   #=> false
+ */
+
+VALUE
+rb_mod_include_p(mod, mod2)
+    VALUE mod;
+    VALUE mod2;
+{
+    VALUE p;
+
+    Check_Type(mod2, T_MODULE);
+    for (p = RCLASS(mod)->super; p; p = RCLASS(p)->super) {
+	if (BUILTIN_TYPE(p) == T_ICLASS) {
+	    if (RBASIC(p)->klass == mod2) return Qtrue;
+	}
+    }
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     mod.ancestors -> array
+ *  
+ *  Returns a list of modules included in <i>mod</i> (including
+ *  <i>mod</i> itself).
+ *     
+ *     module Mod
+ *       include Math
+ *       include Comparable
+ *     end
+ *     
+ *     Mod.ancestors    #=> [Mod, Comparable, Math]
+ *     Math.ancestors   #=> [Math]
+ */
+
+VALUE
+rb_mod_ancestors(mod)
+    VALUE mod;
+{
+    VALUE p, ary = rb_ary_new();
+
+    for (p = mod; p; p = RCLASS(p)->super) {
+	if (FL_TEST(p, FL_SINGLETON))
+	    continue;
+	if (BUILTIN_TYPE(p) == T_ICLASS) {
+	    rb_ary_push(ary, RBASIC(p)->klass);
+	}
+	else {
+	    rb_ary_push(ary, p);
+	}
+    }
+    return ary;
+}
+
+#define VISI(x) ((x)&NOEX_MASK)
+#define VISI_CHECK(x,f) (VISI(x) == (f))
+
+static int
+ins_methods_push(name, type, ary, visi)
+    ID name;
+    long type;
+    VALUE ary;
+    long visi;
+{
+    if (type == -1) return ST_CONTINUE;
+    switch (visi) {
+      case NOEX_PRIVATE:
+      case NOEX_PROTECTED:
+      case NOEX_PUBLIC:
+	visi = (type == visi);
+	break;
+      default:
+	visi = (type != NOEX_PRIVATE);
+	break;
+    }
+    if (visi) {
+	rb_ary_push(ary, rb_str_new2(rb_id2name(name)));
+    }
+    return ST_CONTINUE;
+}
+
+static int
+ins_methods_i(name, type, ary)
+    ID name;
+    long type;
+    VALUE ary;
+{
+    return ins_methods_push(name, type, ary, -1); /* everything but private */
+}
+
+static int
+ins_methods_prot_i(name, type, ary)
+    ID name;
+    long type;
+    VALUE ary;
+{
+    return ins_methods_push(name, type, ary, NOEX_PROTECTED);
+}
+
+static int
+ins_methods_priv_i(name, type, ary)
+    ID name;
+    long type;
+    VALUE ary;
+{
+    return ins_methods_push(name, type, ary, NOEX_PRIVATE);
+}
+
+static int
+ins_methods_pub_i(name, type, ary)
+    ID name;
+    long type;
+    VALUE ary;
+{
+    return ins_methods_push(name, type, ary, NOEX_PUBLIC);
+}
+
+static int
+method_entry(key, body, list)
+    ID key;
+    NODE *body;
+    st_table *list;
+{
+    long type;
+
+    if (key == ID_ALLOCATOR) return ST_CONTINUE;
+    if (!st_lookup(list, key, 0)) {
+	if (!body->nd_body) type = -1; /* none */
+	else type = VISI(body->nd_noex);
+	st_add_direct(list, key, type);
+    }
+    return ST_CONTINUE;
+}
+
+static VALUE
+class_instance_method_list(argc, argv, mod, func)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
+    int (*func) _((ID, long, VALUE));
+{
+    VALUE ary;
+    int recur;
+    st_table *list;
+
+    if (argc == 0) {
+	recur = Qtrue;
+    }
+    else {
+	VALUE r;
+	rb_scan_args(argc, argv, "01", &r);
+	recur = RTEST(r);
+    }
+
+    list = st_init_numtable();
+    for (; mod; mod = RCLASS(mod)->super) {
+	st_foreach(RCLASS(mod)->m_tbl, method_entry, (st_data_t)list);
+	if (BUILTIN_TYPE(mod) == T_ICLASS) continue;
+	if (FL_TEST(mod, FL_SINGLETON)) continue;
+	if (!recur) break;
+    }
+    ary = rb_ary_new();
+    st_foreach(list, func, ary);
+    st_free_table(list);
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     mod.instance_methods(include_super=true)   => array
+ *  
+ *  Returns an array containing the names of public instance methods in
+ *  the receiver. For a module, these are the public methods; for a
+ *  class, they are the instance (not singleton) methods. With no
+ *  argument, or with an argument that is <code>false</code>, the
+ *  instance methods in <i>mod</i> are returned, otherwise the methods
+ *  in <i>mod</i> and <i>mod</i>'s superclasses are returned.
+ *     
+ *     module A
+ *       def method1()  end
+ *     end
+ *     class B
+ *       def method2()  end
+ *     end
+ *     class C < B
+ *       def method3()  end
+ *     end
+ *     
+ *     A.instance_methods                #=> ["method1"]
+ *     B.instance_methods(false)         #=> ["method2"]
+ *     C.instance_methods(false)         #=> ["method3"]
+ *     C.instance_methods(true).length   #=> 43
+ */
+
+VALUE
+rb_class_instance_methods(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
+{
+    return class_instance_method_list(argc, argv, mod, ins_methods_i);
+}
+
+/*
+ *  call-seq:
+ *     mod.protected_instance_methods(include_super=true)   => array
+ *  
+ *  Returns a list of the protected instance methods defined in
+ *  <i>mod</i>. If the optional parameter is not <code>false</code>, the
+ *  methods of any ancestors are included.
+ */
+
+VALUE
+rb_class_protected_instance_methods(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
+{
+    return class_instance_method_list(argc, argv, mod, ins_methods_prot_i);
+}
+
+/*
+ *  call-seq:
+ *     mod.private_instance_methods(include_super=true)    => array
+ *  
+ *  Returns a list of the private instance methods defined in
+ *  <i>mod</i>. If the optional parameter is not <code>false</code>, the
+ *  methods of any ancestors are included.
+ *     
+ *     module Mod
+ *       def method1()  end
+ *       private :method1
+ *       def method2()  end
+ *     end
+ *     Mod.instance_methods           #=> ["method2"]
+ *     Mod.private_instance_methods   #=> ["method1"]
+ */
+
+VALUE
+rb_class_private_instance_methods(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
+{
+    return class_instance_method_list(argc, argv, mod, ins_methods_priv_i);
+}
+
+/*
+ *  call-seq:
+ *     mod.public_instance_methods(include_super=true)   => array
+ *  
+ *  Returns a list of the public instance methods defined in <i>mod</i>.
+ *  If the optional parameter is not <code>false</code>, the methods of
+ *  any ancestors are included.
+ */
+
+VALUE
+rb_class_public_instance_methods(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
+{
+    return class_instance_method_list(argc, argv, mod, ins_methods_pub_i);
+}
+
+/*
+ *  call-seq:
+ *     obj.singleton_methods(all=true)    => array
+ *  
+ *  Returns an array of the names of singleton methods for <i>obj</i>.
+ *  If the optional <i>all</i> parameter is true, the list will include
+ *  methods in modules included in <i>obj</i>.
+ *     
+ *     module Other
+ *       def three() end
+ *     end
+ *     
+ *     class Single
+ *       def Single.four() end
+ *     end
+ *     
+ *     a = Single.new
+ *     
+ *     def a.one()
+ *     end
+ *     
+ *     class << a
+ *       include Other
+ *       def two()
+ *       end
+ *     end
+ *     
+ *     Single.singleton_methods    #=> ["four"]
+ *     a.singleton_methods(false)  #=> ["two", "one"]
+ *     a.singleton_methods         #=> ["two", "one", "three"]
+ */
+
+VALUE
+rb_obj_singleton_methods(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE recur, ary, klass;
+    st_table *list;
+
+    rb_scan_args(argc, argv, "01", &recur);
+    if (argc == 0) {
+	recur = Qtrue;
+    }
+    klass = CLASS_OF(obj);
+    list = st_init_numtable();
+    if (klass && FL_TEST(klass, FL_SINGLETON)) {
+	st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
+	klass = RCLASS(klass)->super;
+    }
+    if (RTEST(recur)) {
+	while (klass && (FL_TEST(klass, FL_SINGLETON) || TYPE(klass) == T_ICLASS)) {
+	    st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
+	    klass = RCLASS(klass)->super;
+	}
+    }
+    ary = rb_ary_new();
+    st_foreach(list, ins_methods_i, ary);
+    st_free_table(list);
+
+    return ary;
+}
+
+void
+rb_define_method_id(klass, name, func, argc)
+    VALUE klass;
+    ID name;
+    VALUE (*func)();
+    int argc;
+{
+    rb_add_method(klass, name, NEW_CFUNC(func,argc), NOEX_PUBLIC);
+}
+
+void
+rb_define_method(klass, name, func, argc)
+    VALUE klass;
+    const char *name;
+    VALUE (*func)();
+    int argc;
+{
+    ID id = rb_intern(name);
+    int ex = NOEX_PUBLIC;
+
+
+    rb_add_method(klass, id, NEW_CFUNC(func, argc), ex);
+}
+
+void
+rb_define_protected_method(klass, name, func, argc)
+    VALUE klass;
+    const char *name;
+    VALUE (*func)();
+    int argc;
+{
+    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PROTECTED);
+}
+
+void
+rb_define_private_method(klass, name, func, argc)
+    VALUE klass;
+    const char *name;
+    VALUE (*func)();
+    int argc;
+{
+    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PRIVATE);
+}
+
+void
+rb_undef_method(klass, name)
+    VALUE klass;
+    const char *name;
+{
+    rb_add_method(klass, rb_intern(name), 0, NOEX_UNDEF);
+}
+
+#define SPECIAL_SINGLETON(x,c) do {\
+    if (obj == (x)) {\
+	return c;\
+    }\
+} while (0)
+
+VALUE
+rb_singleton_class(obj)
+    VALUE obj;
+{
+    VALUE klass;
+
+    if (FIXNUM_P(obj) || SYMBOL_P(obj)) {
+	rb_raise(rb_eTypeError, "can't define singleton");
+    }
+    if (rb_special_const_p(obj)) {
+	SPECIAL_SINGLETON(Qnil, rb_cNilClass);
+	SPECIAL_SINGLETON(Qfalse, rb_cFalseClass);
+	SPECIAL_SINGLETON(Qtrue, rb_cTrueClass);
+	rb_bug("unknown immediate %ld", obj);
+    }
+
+    DEFER_INTS;
+    if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON) &&
+	rb_iv_get(RBASIC(obj)->klass, "__attached__") == obj) {
+	klass = RBASIC(obj)->klass;
+    }
+    else {
+	klass = rb_make_metaclass(obj, RBASIC(obj)->klass);
+    }
+    if (OBJ_TAINTED(obj)) {
+	OBJ_TAINT(klass);
+    }
+    else {
+	FL_UNSET(klass, FL_TAINT);
+    }
+    if (OBJ_FROZEN(obj)) OBJ_FREEZE(klass);
+    ALLOW_INTS;
+
+    return klass;
+}
+
+void
+rb_define_singleton_method(obj, name, func, argc)
+    VALUE obj;
+    const char *name;
+    VALUE (*func)();
+    int argc;
+{
+    rb_define_method(rb_singleton_class(obj), name, func, argc);
+}
+
+void
+rb_define_module_function(module, name, func, argc)
+    VALUE module;
+    const char *name;
+    VALUE (*func)();
+    int argc;
+{
+    rb_define_private_method(module, name, func, argc);
+    rb_define_singleton_method(module, name, func, argc);
+}
+
+void
+rb_define_global_function(name, func, argc)
+    const char *name;
+    VALUE (*func)();
+    int argc;
+{
+    rb_define_module_function(rb_mKernel, name, func, argc);
+}
+
+void
+rb_define_alias(klass, name1, name2)
+    VALUE klass;
+    const char *name1, *name2;
+{
+    rb_alias(klass, rb_intern(name1), rb_intern(name2));
+}
+
+void
+rb_define_attr(klass, name, read, write)
+    VALUE klass;
+    const char *name;
+    int read, write;
+{
+    rb_attr(klass, rb_intern(name), read, write, Qfalse);
+}
+
+#ifdef HAVE_STDARG_PROTOTYPES
+#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
+
+int
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
+#else
+rb_scan_args(argc, argv, fmt, va_alist)
+    int argc;
+    const VALUE *argv;
+    const char *fmt;
+    va_dcl
+#endif
+{
+    int n, i = 0;
+    const char *p = fmt;
+    VALUE *var;
+    va_list vargs;
+
+    va_init_list(vargs, fmt);
+
+    if (*p == '*') goto rest_arg;
+
+    if (ISDIGIT(*p)) {
+	n = *p - '0';
+	if (n > argc)
+	    rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, n);
+	for (i=0; i<n; i++) {
+	    var = va_arg(vargs, VALUE*);
+	    if (var) *var = argv[i];
+	}
+	p++;
+    }
+    else {
+	goto error;
+    }
+
+    if (ISDIGIT(*p)) {
+	n = i + *p - '0';
+	for (; i<n; i++) {
+	    var = va_arg(vargs, VALUE*);
+	    if (argc > i) {
+		if (var) *var = argv[i];
+	    }
+	    else {
+		if (var) *var = Qnil;
+	    }
+	}
+	p++;
+    }
+
+    if(*p == '*') {
+      rest_arg:
+	var = va_arg(vargs, VALUE*);
+	if (argc > i) {
+	    if (var) *var = rb_ary_new4(argc-i, argv+i);
+	    i = argc;
+	}
+	else {
+	    if (var) *var = rb_ary_new();
+	}
+	p++;
+    }
+
+    if (*p == '&') {
+	var = va_arg(vargs, VALUE*);
+	if (rb_block_given_p()) {
+	    *var = rb_block_proc();
+	}
+	else {
+	    *var = Qnil;
+	}
+	p++;
+    }
+    va_end(vargs);
+
+    if (*p != '\0') {
+	goto error;
+    }
+
+    if (argc > i) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, i);
+    }
+
+    return argc;
+
+  error:
+    rb_fatal("bad scan arg format: %s", fmt);
+    return 0;
+}
diff --git a/ruby_1_8_6/common.mk b/ruby_1_8_6/common.mk
new file mode 100644
index 0000000000..f751fecfb5
--- /dev/null
+++ b/ruby_1_8_6/common.mk
@@ -0,0 +1,446 @@
+bin: $(PROGRAM) $(WPROGRAM)
+lib: $(LIBRUBY)
+dll: $(LIBRUBY_SO)
+
+RUBYOPT       =
+
+STATIC_RUBY   = static-ruby
+
+EXTCONF       = extconf.rb
+RBCONFIG      = ./.rbconfig.time
+LIBRUBY_EXTS  = ./.libruby-with-ext.time
+RDOCOUT       = $(EXTOUT)/rdoc
+
+DMYEXT	      = dmyext.$(OBJEXT)
+MAINOBJ	      = main.$(OBJEXT)
+EXTOBJS	      = 
+DLDOBJS	      = $(DMYEXT)
+
+OBJS	      = array.$(OBJEXT) \
+		bignum.$(OBJEXT) \
+		class.$(OBJEXT) \
+		compar.$(OBJEXT) \
+		dir.$(OBJEXT) \
+		dln.$(OBJEXT) \
+		enum.$(OBJEXT) \
+		error.$(OBJEXT) \
+		eval.$(OBJEXT) \
+		file.$(OBJEXT) \
+		gc.$(OBJEXT) \
+		hash.$(OBJEXT) \
+		inits.$(OBJEXT) \
+		io.$(OBJEXT) \
+		marshal.$(OBJEXT) \
+		math.$(OBJEXT) \
+		numeric.$(OBJEXT) \
+		object.$(OBJEXT) \
+		pack.$(OBJEXT) \
+		parse.$(OBJEXT) \
+		process.$(OBJEXT) \
+		prec.$(OBJEXT) \
+		random.$(OBJEXT) \
+		range.$(OBJEXT) \
+		re.$(OBJEXT) \
+		regex.$(OBJEXT) \
+		ruby.$(OBJEXT) \
+		signal.$(OBJEXT) \
+		sprintf.$(OBJEXT) \
+		st.$(OBJEXT) \
+		string.$(OBJEXT) \
+		struct.$(OBJEXT) \
+		time.$(OBJEXT) \
+		util.$(OBJEXT) \
+		variable.$(OBJEXT) \
+		version.$(OBJEXT) \
+		$(MISSING)
+
+SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
+		--extout="$(EXTOUT)" \
+		--make="$(MAKE)" \
+		--mflags="$(MFLAGS)" \
+		--make-flags="$(MAKEFLAGS)"
+EXTMK_ARGS    =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) --
+INSTRUBY_ARGS =	$(SCRIPT_ARGS) --installed-list $(INSTALLED_LIST)
+
+PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' -- \
+			$(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE)
+
+TESTSDIR      = $(srcdir)/test
+TESTWORKDIR   = testwork
+
+all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
+	@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
+prog: $(PROGRAM) $(WPROGRAM)
+
+miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT)
+
+$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
+
+$(LIBRUBY_A):	$(OBJS) $(DMYEXT) $(ARCHFILE)
+
+$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE)
+
+$(LIBRUBY_EXTS):
+	@exit > $@
+
+$(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
+	@$(RM) $@
+	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
+
+ruby.imp: $(OBJS)
+	@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+
+install: install-nodoc $(RDOCTARGET)
+install-all: install-nodoc install-doc
+
+install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
+pre-install-nodoc:: pre-install-local pre-install-ext
+do-install-nodoc: 
+	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
+post-install-nodoc:: post-install-local post-install-ext
+
+install-local: pre-install-local do-install-local post-install-local
+pre-install-local:: pre-install-bin pre-install-lib pre-install-man
+do-install-local:
+	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
+post-install-local:: post-install-bin post-install-lib post-install-man
+
+install-ext: pre-install-ext do-install-ext post-install-ext
+pre-install-ext:: pre-install-ext-arch pre-install-ext-comm
+do-install-ext:
+	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext
+post-install-ext:: post-install-ext-arch post-install-ext-comm
+
+install-arch: pre-install-arch do-install-arch post-install-arch
+pre-install-arch:: pre-install-bin pre-install-ext-arch
+do-install-arch:
+	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=bin --install=ext-arch
+post-install-arch:: post-install-bin post-install-ext-arch
+
+install-comm: pre-install-comm do-install-comm post-install-comm
+pre-install-comm:: pre-install-lib pre-install-ext-comm pre-install-man
+do-install-comm:
+	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
+post-install-comm:: post-install-lib post-install-ext-comm post-install-man
+
+install-bin: pre-install-bin do-install-bin post-install-bin
+pre-install-bin:: install-prereq
+do-install-bin:
+	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=bin
+post-install-bin::
+	@$(NULLCMD)
+
+install-lib: pre-install-lib do-install-lib post-install-lib
+pre-install-lib:: install-prereq
+do-install-lib:
+	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=lib
+post-install-lib::
+	@$(NULLCMD)
+
+install-ext-comm: pre-install-ext-comm do-install-ext-comm post-install-ext-comm
+pre-install-ext-comm:: install-prereq
+do-install-ext-comm:
+	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-comm
+post-install-ext-comm::
+	@$(NULLCMD)
+
+install-ext-arch: pre-install-ext-arch do-install-ext-arch post-install-ext-arch
+pre-install-ext-arch:: install-prereq
+do-install-ext-arch:
+	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-arch
+post-install-ext-arch::
+	@$(NULLCMD)
+
+install-man: pre-install-man do-install-man post-install-man
+pre-install-man:: install-prereq
+do-install-man:
+	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
+post-install-man::
+	@$(NULLCMD)
+
+what-where: no-install
+no-install: no-install-nodoc no-install-doc
+what-where-all: no-install-all
+no-install-all: no-install-nodoc
+
+what-where-nodoc: no-install-nodoc
+no-install-nodoc: pre-no-install-nodoc dont-install-nodoc post-no-install-nodoc
+pre-no-install-nodoc:: pre-no-install-local pre-no-install-ext
+dont-install-nodoc: 
+	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
+post-no-install-nodoc:: post-no-install-local post-no-install-ext
+
+what-where-local: no-install-local
+no-install-local: pre-no-install-local dont-install-local post-no-install-local
+pre-no-install-local:: pre-no-install-bin pre-no-install-lib pre-no-install-man
+dont-install-local:
+	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
+post-no-install-local:: post-no-install-bin post-no-install-lib post-no-install-man
+
+what-where-ext: no-install-ext
+no-install-ext: pre-no-install-ext dont-install-ext post-no-install-ext
+pre-no-install-ext:: pre-no-install-ext-arch pre-no-install-ext-comm
+dont-install-ext:
+	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext
+post-no-install-ext:: post-no-install-ext-arch post-no-install-ext-comm
+
+what-where-arch: no-install-arch
+no-install-arch: pre-no-install-arch dont-install-arch post-no-install-arch
+pre-no-install-arch:: pre-no-install-bin pre-no-install-ext-arch
+dont-install-arch:
+	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=bin --install=ext-arch
+post-no-install-arch:: post-no-install-lib post-no-install-man post-no-install-ext-arch
+
+what-where-comm: no-install-comm
+no-install-comm: pre-no-install-comm dont-install-comm post-no-install-comm
+pre-no-install-comm:: pre-no-install-lib pre-no-install-ext-comm pre-no-install-man
+dont-install-comm:
+	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
+post-no-install-comm:: post-no-install-lib post-no-install-ext-comm post-no-install-man
+
+what-where-bin: no-install-bin
+no-install-bin: pre-no-install-bin dont-install-bin post-no-install-bin
+pre-no-install-bin:: install-prereq
+dont-install-bin:
+	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=bin
+post-no-install-bin::
+	@$(NULLCMD)
+
+what-where-lib: no-install-lib
+no-install-lib: pre-no-install-lib dont-install-lib post-no-install-lib
+pre-no-install-lib:: install-prereq
+dont-install-lib:
+	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=lib
+post-no-install-lib::
+	@$(NULLCMD)
+
+what-where-ext-comm: no-install-ext-comm
+no-install-ext-comm: pre-no-install-ext-comm dont-install-ext-comm post-no-install-ext-comm
+pre-no-install-ext-comm:: install-prereq
+dont-install-ext-comm:
+	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-comm
+post-no-install-ext-comm::
+	@$(NULLCMD)
+
+what-where-ext-arch: no-install-ext-arch
+no-install-ext-arch: pre-no-install-ext-arch dont-install-ext-arch post-no-install-ext-arch
+pre-no-install-ext-arch:: install-prereq
+dont-install-ext-arch:
+	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-arch
+post-no-install-ext-arch::
+	@$(NULLCMD)
+
+what-where-man: no-install-man
+no-install-man: pre-no-install-man dont-install-man post-no-install-man
+pre-no-install-man:: install-prereq
+dont-install-man:
+	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
+post-no-install-man::
+	@$(NULLCMD)
+
+install-doc: rdoc pre-install-doc do-install-doc post-install-doc
+pre-install-doc:: install-prereq
+do-install-doc: $(PROGRAM)
+	$(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+post-install-doc::
+	@$(NULLCMD)
+
+rdoc: $(PROGRAM) PHONY
+	@echo Generating RDoc documentation
+	$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
+
+what-where-doc: no-install-doc
+no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc
+pre-no-install-doc:: install-prereq
+dont-install-doc::
+	$(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+post-no-install-doc::
+	@$(NULLCMD)
+
+install-prereq:
+	@exit > $(INSTALLED_LIST)
+
+clean: clean-ext clean-local
+clean-local::
+	@$(RM) $(OBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
+	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
+clean-ext:
+	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) clean
+
+distclean: distclean-ext distclean-local
+distclean-local:: clean-local
+	@$(RM) $(MKFILES) config.h rbconfig.rb
+	@$(RM) config.cache config.log config.status
+	@$(RM) *~ *.bak *.stackdump core *.core gmon.out y.tab.c y.output $(PREP)
+distclean-ext:
+	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) distclean
+
+realclean:: distclean
+	@$(RM) parse.c lex.c
+
+check: test test-all
+
+test: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
+	@$(MINIRUBY) $(srcdir)/rubytest.rb
+
+test-all:
+	$(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS)
+
+extconf:
+	$(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTCONFDIR)"
+	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
+
+$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
+	@$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
+		-install_name=$(RUBY_INSTALL_NAME) \
+		-so_name=$(RUBY_SO_NAME) rbconfig.rb
+
+.PRECIOUS: $(MKFILES)
+
+.PHONY: test install install-nodoc install-doc dist
+
+PHONY:
+
+{$(VPATH)}parse.c: parse.y
+
+acosh.$(OBJEXT): {$(VPATH)}acosh.c
+alloca.$(OBJEXT): {$(VPATH)}alloca.c
+crypt.$(OBJEXT): {$(VPATH)}crypt.c
+dup2.$(OBJEXT): {$(VPATH)}dup2.c
+erf.$(OBJEXT): {$(VPATH)}erf.c
+finite.$(OBJEXT): {$(VPATH)}finite.c
+flock.$(OBJEXT): {$(VPATH)}flock.c
+memcmp.$(OBJEXT): {$(VPATH)}memcmp.c
+memmove.$(OBJEXT): {$(VPATH)}memmove.c
+mkdir.$(OBJEXT): {$(VPATH)}mkdir.c
+vsnprintf.$(OBJEXT): {$(VPATH)}vsnprintf.c
+strcasecmp.$(OBJEXT): {$(VPATH)}strcasecmp.c
+strncasecmp.$(OBJEXT): {$(VPATH)}strncasecmp.c
+strchr.$(OBJEXT): {$(VPATH)}strchr.c
+strdup.$(OBJEXT): {$(VPATH)}strdup.c
+strerror.$(OBJEXT): {$(VPATH)}strerror.c
+strftime.$(OBJEXT): {$(VPATH)}strftime.c
+strstr.$(OBJEXT): {$(VPATH)}strstr.c
+strtod.$(OBJEXT): {$(VPATH)}strtod.c
+strtol.$(OBJEXT): {$(VPATH)}strtol.c
+strtoul.$(OBJEXT): {$(VPATH)}strtoul.c
+nt.$(OBJEXT): {$(VPATH)}nt.c
+x68.$(OBJEXT): {$(VPATH)}x68.c
+os2.$(OBJEXT): {$(VPATH)}os2.c
+dl_os2.$(OBJEXT): {$(VPATH)}dl_os2.c
+ia64.$(OBJEXT): {$(VPATH)}ia64.s
+	$(CC) $(CFLAGS) -c $<
+
+# when I use -I., there is confliction at "OpenFile" 
+# so, set . into environment varible "include"
+win32.$(OBJEXT): {$(VPATH)}win32.c
+
+###
+
+array.$(OBJEXT): {$(VPATH)}array.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}util.h {$(VPATH)}st.h
+bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+class.$(OBJEXT): {$(VPATH)}class.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}rubysig.h {$(VPATH)}node.h {$(VPATH)}st.h
+compar.$(OBJEXT): {$(VPATH)}compar.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+dir.$(OBJEXT): {$(VPATH)}dir.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}util.h
+dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}dln.h
+dmydln.$(OBJEXT): {$(VPATH)}dmydln.c {$(VPATH)}dln.c {$(VPATH)}ruby.h \
+  config.h {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}dln.h
+dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
+enum.$(OBJEXT): {$(VPATH)}enum.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}node.h {$(VPATH)}util.h
+error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}env.h {$(VPATH)}st.h
+eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}node.h {$(VPATH)}env.h {$(VPATH)}util.h \
+  {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h
+file.$(OBJEXT): {$(VPATH)}file.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h {$(VPATH)}util.h \
+  {$(VPATH)}dln.h
+gc.$(OBJEXT): {$(VPATH)}gc.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}node.h \
+  {$(VPATH)}env.h {$(VPATH)}re.h {$(VPATH)}regex.h
+hash.$(OBJEXT): {$(VPATH)}hash.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}rubysig.h
+inits.$(OBJEXT): {$(VPATH)}inits.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+io.$(OBJEXT): {$(VPATH)}io.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h  {$(VPATH)}util.h \
+  {$(VPATH)}env.h
+main.$(OBJEXT): {$(VPATH)}main.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+marshal.$(OBJEXT): {$(VPATH)}marshal.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}rubyio.h {$(VPATH)}st.h {$(VPATH)}util.h
+math.$(OBJEXT): {$(VPATH)}math.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+numeric.$(OBJEXT): {$(VPATH)}numeric.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}env.h {$(VPATH)}defines.h {$(VPATH)}intern.h \
+  {$(VPATH)}missing.h
+object.$(OBJEXT): {$(VPATH)}object.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}st.h {$(VPATH)}util.h
+pack.$(OBJEXT): {$(VPATH)}pack.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h \
+  {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c
+prec.$(OBJEXT): {$(VPATH)}prec.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+process.$(OBJEXT): {$(VPATH)}process.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}rubysig.h {$(VPATH)}st.h
+random.$(OBJEXT): {$(VPATH)}random.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+range.$(OBJEXT): {$(VPATH)}range.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+re.$(OBJEXT): {$(VPATH)}re.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}re.h {$(VPATH)}regex.h
+regex.$(OBJEXT): {$(VPATH)}regex.c config.h {$(VPATH)}regex.h
+ruby.$(OBJEXT): {$(VPATH)}ruby.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}dln.h {$(VPATH)}node.h {$(VPATH)}util.h
+signal.$(OBJEXT): {$(VPATH)}signal.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}rubysig.h
+sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+st.$(OBJEXT): {$(VPATH)}st.c config.h {$(VPATH)}st.h
+string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}re.h {$(VPATH)}regex.h
+struct.$(OBJEXT): {$(VPATH)}struct.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
+util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}util.h
+variable.$(OBJEXT): {$(VPATH)}variable.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}util.h
+version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
+  {$(VPATH)}version.h
+
+dist: $(PROGRAM)
+	$(RUNRUBY) $(srcdir)/distruby.rb
diff --git a/ruby_1_8_6/compar.c b/ruby_1_8_6/compar.c
new file mode 100644
index 0000000000..1488b2c65d
--- /dev/null
+++ b/ruby_1_8_6/compar.c
@@ -0,0 +1,243 @@
+/**********************************************************************
+
+  compar.c -
+
+  $Author$
+  $Date$
+  created at: Thu Aug 26 14:39:48 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+
+VALUE rb_mComparable;
+
+static ID cmp;
+
+int
+rb_cmpint(val, a, b)
+    VALUE val, a, b;
+{
+    if (NIL_P(val)) {
+	rb_cmperr(a, b);
+    }
+    if (FIXNUM_P(val)) return FIX2INT(val);
+    if (TYPE(val) == T_BIGNUM) {
+	if (RBIGNUM(val)->sign) return 1;
+	return -1;
+    }
+    if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
+    if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1;
+    return 0;
+}
+
+void
+rb_cmperr(x, y)
+    VALUE x, y;
+{
+    const char *classname;
+
+    if (SPECIAL_CONST_P(y)) {
+	y = rb_inspect(y);
+	classname = StringValuePtr(y);
+    }
+    else {
+	classname = rb_obj_classname(y);
+    }
+    rb_raise(rb_eArgError, "comparison of %s with %s failed",
+	     rb_obj_classname(x), classname);
+}
+
+#define cmperr() (rb_cmperr(x, y), Qnil)
+
+static VALUE
+cmp_eq(a)
+    VALUE *a;
+{
+    VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
+
+    if (NIL_P(c)) return Qnil;
+    if (rb_cmpint(c, a[0], a[1]) == 0) return Qtrue;
+    return Qfalse;
+}
+
+static VALUE
+cmp_failed()
+{
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     obj == other    => true or false
+ *  
+ *  Compares two objects based on the receiver's <code><=></code>
+ *  method, returning true if it returns 0. Also returns true if
+ *  _obj_ and _other_ are the same object.
+ */
+
+static VALUE
+cmp_equal(x, y)
+    VALUE x, y;
+{
+    VALUE a[2];
+
+    if (x == y) return Qtrue;
+
+    a[0] = x; a[1] = y;
+    return rb_rescue(cmp_eq, (VALUE)a, cmp_failed, 0);
+}
+
+/*
+ *  call-seq:
+ *     obj > other    => true or false
+ *  
+ *  Compares two objects based on the receiver's <code><=></code>
+ *  method, returning true if it returns 1.
+ */
+
+static VALUE
+cmp_gt(x, y)
+    VALUE x, y;
+{
+    VALUE c = rb_funcall(x, cmp, 1, y);
+
+    if (NIL_P(c)) return cmperr();
+    if (rb_cmpint(c, x, y) > 0) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     obj >= other    => true or false
+ *  
+ *  Compares two objects based on the receiver's <code><=></code>
+ *  method, returning true if it returns 0 or 1.
+ */
+
+static VALUE
+cmp_ge(x, y)
+    VALUE x, y;
+{
+    VALUE c = rb_funcall(x, cmp, 1, y);
+
+    if (NIL_P(c)) return cmperr();
+    if (rb_cmpint(c, x, y) >= 0) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     obj < other    => true or false
+ *  
+ *  Compares two objects based on the receiver's <code><=></code>
+ *  method, returning true if it returns -1.
+ */
+
+static VALUE
+cmp_lt(x, y)
+    VALUE x, y;
+{
+    VALUE c = rb_funcall(x, cmp, 1, y);
+
+    if (NIL_P(c)) return cmperr();
+    if (rb_cmpint(c, x, y) < 0) return Qtrue;
+    return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     obj <= other    => true or false
+ *  
+ *  Compares two objects based on the receiver's <code><=></code>
+ *  method, returning true if it returns -1 or 0.
+ */
+
+static VALUE
+cmp_le(x, y)
+    VALUE x, y;
+{
+    VALUE c = rb_funcall(x, cmp, 1, y);
+
+    if (NIL_P(c)) return cmperr();
+    if (rb_cmpint(c, x, y) <= 0) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     obj.between?(min, max)    => true or false
+ *  
+ *  Returns <code>false</code> if <i>obj</i> <code><=></code>
+ *  <i>min</i> is less than zero or if <i>anObject</i> <code><=></code>
+ *  <i>max</i> is greater than zero, <code>true</code> otherwise.
+ *     
+ *     3.between?(1, 5)               #=> true
+ *     6.between?(1, 5)               #=> false
+ *     'cat'.between?('ant', 'dog')   #=> true
+ *     'gnu'.between?('ant', 'dog')   #=> false
+ *     
+ */
+
+static VALUE
+cmp_between(x, min, max)
+    VALUE x, min, max;
+{
+    if (RTEST(cmp_lt(x, min))) return Qfalse;
+    if (RTEST(cmp_gt(x, max))) return Qfalse;
+    return Qtrue;
+}
+
+/*
+ *  The <code>Comparable</code> mixin is used by classes whose objects
+ *  may be ordered. The class must define the <code><=></code> operator,
+ *  which compares the receiver against another object, returning -1, 0,
+ *  or +1 depending on whether the receiver is less than, equal to, or
+ *  greater than the other object. <code>Comparable</code> uses
+ *  <code><=></code> to implement the conventional comparison operators
+ *  (<code><</code>, <code><=</code>, <code>==</code>, <code>>=</code>,
+ *  and <code>></code>) and the method <code>between?</code>.
+ *     
+ *     class SizeMatters
+ *       include Comparable
+ *       attr :str
+ *       def <=>(anOther)
+ *         str.size <=> anOther.str.size
+ *       end
+ *       def initialize(str)
+ *         @str = str
+ *       end
+ *       def inspect
+ *         @str
+ *       end
+ *     end
+ *     
+ *     s1 = SizeMatters.new("Z")
+ *     s2 = SizeMatters.new("YY")
+ *     s3 = SizeMatters.new("XXX")
+ *     s4 = SizeMatters.new("WWWW")
+ *     s5 = SizeMatters.new("VVVVV")
+ *     
+ *     s1 < s2                       #=> true
+ *     s4.between?(s1, s3)           #=> false
+ *     s4.between?(s3, s5)           #=> true
+ *     [ s3, s2, s5, s4, s1 ].sort   #=> [Z, YY, XXX, WWWW, VVVVV]
+ *     
+ */
+
+void
+Init_Comparable()
+{
+    rb_mComparable = rb_define_module("Comparable");
+    rb_define_method(rb_mComparable, "==", cmp_equal, 1);
+    rb_define_method(rb_mComparable, ">", cmp_gt, 1);
+    rb_define_method(rb_mComparable, ">=", cmp_ge, 1);
+    rb_define_method(rb_mComparable, "<", cmp_lt, 1);
+    rb_define_method(rb_mComparable, "<=", cmp_le, 1);
+    rb_define_method(rb_mComparable, "between?", cmp_between, 2);
+
+    cmp = rb_intern("<=>");
+}
diff --git a/ruby_1_8_6/config.guess b/ruby_1_8_6/config.guess
new file mode 100644
index 0000000000..dd1688b7b5
--- /dev/null
+++ b/ruby_1_8_6/config.guess
@@ -0,0 +1,1459 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2004-06-11'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep __ELF__ >/dev/null
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    luna88k:OpenBSD:*:*)
+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
+	exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit 0;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	esac ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && exit 0
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit 0 ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit 0 ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+		echo rs6000-ibm-aix3.2.5
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:[45])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit 0 ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit 0 ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    *:UNICOS/mp:*:*)
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*)
+	# Determine whether the default compiler uses glibc.
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#if __GLIBC__ >= 2
+	LIBC=gnu
+	#else
+	LIBC=
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	exit 0 ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit 0 ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit 0 ;;
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+	exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit 0 ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit 0 ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit 0 ;;
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit 0 ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    mips:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit 0 ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit 0 ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit 0 ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit 0 ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit 0 ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;
+	  coff-i386)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0 ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit 0 ;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#ifdef __INTEL_COMPILER
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit 0 ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit 0 ;;
+    i*86:*:5:[78]*)
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit 0 ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit 0 ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit 0 ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit 0 ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit 0 ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Darwin:*:*)
+	case `uname -p` in
+	    *86) UNAME_PROCESSOR=i686 ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit 0 ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit 0 ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit 0 ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit 0 ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit 0 ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit 0 ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit 0 ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit 0 ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit 0 ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit 0 ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit 0 ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit 0 ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+    ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/ruby_1_8_6/config.sub b/ruby_1_8_6/config.sub
new file mode 100644
index 0000000000..506d3ab77f
--- /dev/null
+++ b/ruby_1_8_6/config.sub
@@ -0,0 +1,1537 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+timestamp='2004-06-11'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit 0 ;;
+    --version | -v )
+       echo "$version" ; exit 0 ;;
+    --help | --h* | -h )
+       echo "$usage"; exit 0 ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit 0;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis)
+		os=
+		basic_machine=$1
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| msp430 \
+	| ns16k | ns32k \
+	| openrisc | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xscale | xstormy16 | xtensa \
+	| z8k)
+		basic_machine=$basic_machine-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| msp430-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
+	| ymp-* \
+	| z8k-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+		;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=-linux
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+        -os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+        -tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/ruby_1_8_6/configure.in b/ruby_1_8_6/configure.in
new file mode 100644
index 0000000000..29c19d2b0e
--- /dev/null
+++ b/ruby_1_8_6/configure.in
@@ -0,0 +1,1649 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT()
+
+AC_PREREQ(2.58)
+
+AC_DEFUN([RUBY_MINGW32],
+[case "$host_os" in
+cygwin*)
+AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
+[AC_TRY_CPP([
+#ifndef __MINGW32__
+# error
+#endif
+], rb_cv_mingw32=yes,rb_cv_mingw32=no)
+rm -f conftest*])
+test "$rb_cv_mingw32" = yes && target_os="mingw32"
+  ;;
+esac])
+
+AC_DEFUN([RUBY_CPPOUTFILE],
+[AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
+[cppflags=$CPPFLAGS
+CPPFLAGS='-o conftest.i'
+AC_TRY_CPP([], rb_cv_cppoutfile=yes, rb_cv_cppoutfile=no)
+CPPFLAGS=$cppflags
+rm -f conftest*])
+if test "$rb_cv_cppoutfile" = yes; then
+  CPPOUTFILE='-o conftest.i'
+elif test "$rb_cv_cppoutfile" = no; then
+  CPPOUTFILE='> conftest.i'
+elif test -n "$rb_cv_cppoutfile"; then
+  CPPOUTFILE="$rb_cv_cppoutfile"
+fi
+AC_SUBST(CPPOUTFILE)])
+
+AC_DEFUN([RUBY_PROG_GNU_LD],
+[AC_CACHE_CHECK(whether the linker is GNU ld, rb_cv_prog_gnu_ld,
+[if `$CC $CFLAGS $CPPFLAGS $LDFLAGS --print-prog-name=ld 2>&1` -v 2>&1 | grep "GNU ld" > /dev/null; then
+  rb_cv_prog_gnu_ld=yes
+else
+  rb_cv_prog_gnu_ld=no
+fi
+])
+GNU_LD=$rb_cv_prog_gnu_ld
+AC_SUBST(GNU_LD)])
+
+rb_version=`grep RUBY_VERSION $srcdir/version.h`
+MAJOR=`expr "$rb_version" : '#define RUBY_VERSION "\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*"'`
+MINOR=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*"'`
+TEENY=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)"'`
+AC_SUBST(MAJOR)
+AC_SUBST(MINOR)
+AC_SUBST(TEENY)
+dnl checks for alternative programs
+AC_ARG_WITH(gcc, [  --without-gcc           never use gcc], [
+	case $withval in
+	no)	: ${CC=cc}
+		;;
+	yes)	: ${CC=gcc}
+		;;
+	*)	CC=$withval
+		;;
+	esac])
+dnl If the user switches compilers, we can't believe the cache
+if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
+then
+  AC_MSG_ERROR(cached CC is different -- throw away $cache_file
+(it is also a good idea to do 'make clean' before compiling))
+fi
+
+if test "$program_prefix" = NONE; then
+  program_prefix=
+fi
+AC_CANONICAL_TARGET
+target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
+ac_install_sh='' # unusable for extension libraries.
+
+dnl checks for fat-binary
+AC_ARG_ENABLE(fat-binary,
+       [  --enable-fat-binary=ARCHS
+                          build an Apple/NeXT Multi Architecture Binary (MAB);
+                          ARCHS is a comma-delimited list of architectures for
+                          which to build; if ARCHS is omitted, then the package
+                          will be built for all architectures supported by the
+                          platform ("ppc" for MacOS/X and Darwin; "ppc,i386"
+                          for Rhapsody; "m68k,i386,sparc" for OpenStep;
+                          "m68k,i386,sparc,hppa" for NextStep); if this option
+                          is disabled or omitted entirely, then the package
+                          will be built only for the target platform],
+       [fat_binary=$enableval], [fat_binary=no])
+if test "$fat_binary" != no; then
+
+    AC_MSG_CHECKING([target architectures])
+
+    # Respect TARGET_ARCHS setting from environment if available.
+    if test -z "$TARGET_ARCHS"; then
+	# Respect ARCH given to --enable-fat-binary if present.
+	if test "$fat_binary" != yes; then
+	    TARGET_ARCHS=`echo "$fat_binary" | tr ',' ' '`
+	else
+	    # Choose a default set of architectures based upon platform.
+	    case "$target_os" in
+	    darwin*)
+		TARGET_ARCHS="ppc"
+		;;
+	    rhapsody*)
+		TARGET_ARCHS="ppc i386"
+		;;
+	    openstep*)
+		TARGET_ARCHS="m68k i386 sparc"
+		;;
+	    nextstep*)
+		TARGET_ARCHS="m68k i386 sparc hppa"
+		;;
+	    *)
+		TARGET_ARCHS=`arch`
+	    esac
+	fi
+    fi
+
+    AC_MSG_RESULT([$TARGET_ARCHS])
+
+    # /usr/lib/arch_tool -archify_list $TARGET_ARCHS
+    ARCH_FLAG=
+    for archs in $TARGET_ARCHS 
+    do
+        ARCH_FLAG="$ARCH_FLAG -arch $archs"
+    done
+    AC_DEFINE(NEXT_FAT_BINARY)
+fi
+
+case $target_cpu in
+  i?86) frame_address=yes;;
+  *)    frame_address=no;;
+esac
+AC_ARG_ENABLE(frame-address,
+       [  --enable-frame-address  use GCC __builtin_frame_address(). ],
+       [frame_address=$enableval])
+if test $frame_address = yes; then
+    AC_DEFINE(USE_BUILTIN_FRAME_ADDRESS)
+fi
+
+AC_ARG_PROGRAM
+
+dnl Checks for programs.
+
+if test x"${build}" != x"${host}"; then
+  AC_CHECK_TOOL(CC, gcc)
+fi
+AC_PROG_CC
+AC_PROG_GCC_TRADITIONAL
+if test "$GCC" = yes; then
+    linker_flag=-Wl,
+else
+    linker_flag=
+fi
+
+RUBY_PROG_GNU_LD
+RUBY_CPPOUTFILE
+
+: ${OUTFLAG='-o '}
+AC_SUBST(OUTFLAG)
+
+RUBY_MINGW32
+
+AC_PROG_YACC
+if test "$YACC" = "yacc"; then
+  AC_DEFINE([OLD_YACC])
+fi
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(AR, ar)
+if test -z "$AR"; then
+  AC_CHECK_PROGS(AR, aal, ar)
+fi
+
+AC_CHECK_TOOL(AS, as)
+ASFLAGS=$ASFLAGS
+AC_SUBST(ASFLAGS)
+
+case "$target_os" in
+cygwin*|mingw*)
+    AC_CHECK_TOOL(NM, nm)
+    AC_CHECK_TOOL(WINDRES, windres)
+    AC_CHECK_TOOL(DLLWRAP, dllwrap)
+    target_cpu=`echo $target_cpu | sed s/i.86/i386/`
+    case "$target_os" in
+    mingw*)
+	test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
+	AC_CHECK_TOOL(OBJDUMP, objdump)
+	AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
+	AC_TRY_LINK([#include <stdio.h>],
+		    [FILE* volatile f = stdin; return 0;],
+		    [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
+				   tr A-Z a-z |
+				   sed -n '/^[[ 	]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
+		    [rb_cv_msvcrt=msvcrt])
+	test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
+	AC_ARG_WITH(winsock2,
+		[  --with-winsock2         link winsock2 (MinGW only)], [
+		case $withval in
+		yes) with_winsock2=yes;;
+		*)   with_winsock2=no;;
+		esac], [with_winsock2=no])
+	if test "$with_winsock2" = yes; then
+	  AC_DEFINE(USE_WINSOCK2)
+	fi
+    esac
+    : ${enable_shared=yes}
+    ;;
+aix*)
+    AC_CHECK_TOOL(NM, nm, /usr/ccs/bin/nm, /usr/ccs/bin:$PATH)
+    ;;
+hiuxmpp*)
+    # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
+    AC_DEFINE(__HIUX_MPP__)
+    ;;
+esac
+
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+
+# checks for UNIX variants that set C preprocessor variables
+AC_AIX
+AC_MINIX
+
+AC_SUBST(RM, ['rm -f'])
+AC_SUBST(CP, ['cp'])
+if $as_mkdir_p; then
+  AC_SUBST(MAKEDIRS, ['mkdir -p'])
+else
+  AC_SUBST(MAKEDIRS, ['install -d'])
+fi
+
+dnl check for large file stuff
+AC_SYS_LARGEFILE
+
+AC_CHECK_TYPES([long long, off_t])
+
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(short, 2)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(long long, 0)
+AC_CHECK_SIZEOF(__int64, 0)
+AC_CHECK_SIZEOF(off_t, 0)
+AC_CHECK_SIZEOF(void*, 4)
+AC_CHECK_SIZEOF(float, 4)
+AC_CHECK_SIZEOF(double, 8)
+AC_CHECK_SIZEOF(time_t, 0)
+
+for id in pid_t gid_t uid_t; do
+    AC_CHECK_TYPE($id, [typ=$id], [typ=int])
+    AC_DEFINE_UNQUOTED(rb_$id, $typ)
+done
+
+AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
+  [AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
+	rb_cv_have_prototypes=yes,
+	rb_cv_have_prototypes=no)])
+if test "$rb_cv_have_prototypes" = yes; then
+  AC_DEFINE(HAVE_PROTOTYPES)
+fi
+
+AC_CACHE_CHECK(token paste string, rb_cv_tokenpaste,
+  [AC_TRY_COMPILE([#define paste(a,b) a##b],
+		  [int xy = 1; return paste(x,y);],
+		  rb_cv_tokenpaste=ansi,
+		  rb_cv_tokenpaste=knr)])
+if test "$rb_cv_tokenpaste" = ansi; then
+  AC_DEFINE(TOKEN_PASTE(x,y),[x##y])
+else
+  AC_DEFINE(TOKEN_PASTE(x,y),[x/**/y])
+fi
+
+AC_CACHE_CHECK(for variable length prototypes and stdarg.h, rb_cv_stdarg,
+  [AC_TRY_COMPILE([
+#include <stdarg.h>
+int foo(int x, ...) {
+	va_list va;
+	va_start(va, x);
+	va_arg(va, int);
+	va_arg(va, char *);
+	va_arg(va, double);
+	return 0;
+}
+], [return foo(10, "", 3.14);],
+	rb_cv_stdarg=yes,
+	rb_cv_stdarg=no)])
+if test "$rb_cv_stdarg" = yes; then
+  AC_DEFINE(HAVE_STDARG_PROTOTYPES)
+fi
+
+AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl
+m4_ifval([$2], dnl
+  [AS_VAR_PUSHDEF([attrib],[$2])], dnl
+  [AS_VAR_PUSHDEF([attrib],[FUNC_]AS_TR_CPP($1))] dnl
+)dnl
+m4_ifval([$3], dnl
+  [AS_VAR_PUSHDEF([rbcv],[$3])], dnl
+  [AS_VAR_PUSHDEF([rbcv],[rb_cv_func_][$1])]dnl
+)dnl
+AC_CACHE_CHECK(for [$1] function attribute, rbcv,
+[rbcv=x
+if test "${ac_c_werror_flag+set}"; then
+  rb_c_werror_flag="$ac_c_werror_flag"
+else
+  unset rb_c_werror_flag
+fi
+ac_c_werror_flag=yes
+for mac in "__attribute__ (($1)) x" "x __attribute__ (($1))" "__declspec($1) x" x; do
+  AC_TRY_COMPILE(
+    [#define ]attrib[(x) $mac
+    ]attrib[(void conftest_attribute_check(void));], [],
+    [rbcv="$mac"; break])
+done
+if test "${rb_c_werror_flag+set}"; then
+  ac_c_werror_flag="$rb_c_werror_flag"
+else
+  unset ac_c_werror_flag
+fi
+])
+AC_DEFINE_UNQUOTED(attrib[(x)], $rbcv)
+AS_VAR_POPDEF([attrib])
+AS_VAR_POPDEF([rbcv])
+])
+
+RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN)
+RUBY_FUNC_ATTRIBUTE(noinline, NOINLINE)
+
+AC_CACHE_CHECK([for RUBY_EXTERN], rb_cv_ruby_extern,
+[rb_cv_ruby_extern=no
+for mac in "__attribute__((dllimport))" "__declspec(dllimport)"; do
+  AC_TRY_COMPILE(
+    [extern $mac void conftest(void);],
+    [rb_cv_ruby_extern="extern $mac"; break])
+done])
+test "x$rb_cv_ruby_extern" = xno || AC_DEFINE_UNQUOTED(RUBY_EXTERN, $rb_cv_ruby_extern)
+
+XCFLAGS="$XCFLAGS -DRUBY_EXPORT"
+
+dnl Check whether we need to define sys_nerr locally
+AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
+#include <errno.h>])
+
+dnl whether link libc_r or not
+AC_ARG_WITH(libc_r, 
+	[  --with-libc_r           link libc_r if possible (FreeBSD only)], [
+	case $withval in
+	yes) with_libc_r=yes;;
+	*)   with_libc_r=no;;
+	esac], [with_libc_r=no])
+
+AC_ARG_ENABLE(pthread,
+       [  --enable-pthread        use pthread library.],
+       [enable_pthread=$enableval], [enable_pthread=no])
+
+AC_ARG_ENABLE(fastthread,
+       [  --disable-fastthread    do not use the fastthread mutex], [
+	: handled by ext/thread/extconf.rb
+        ])
+
+dnl Checks for libraries.
+case "$target_os" in
+nextstep*)	;;
+openstep*)	;;
+rhapsody*)	;;
+darwin*)	LIBS="-lobjc $LIBS";;
+hpux*)		LIBS="-lm $LIBS"
+		ac_cv_c_inline=no;;
+human*)		ac_cv_func_getpgrp_void=yes
+		ac_cv_func_setitimer=no
+		;;
+beos*)		ac_cv_func_link=no;;
+cygwin*)	rb_cv_have_daylight=no
+		ac_cv_var_tzname=no
+		ac_cv_func__setjmp=no
+		ac_cv_func_setitimer=no
+		;;
+mingw*)		if test "$with_winsock2" = yes; then
+		  LIBS="-lws2_32 $LIBS"
+		else
+		  LIBS="-lwsock32 $LIBS"
+		fi
+		ac_cv_header_a_out_h=no
+		ac_cv_header_pwd_h=no
+		ac_cv_header_utime_h=no
+		ac_cv_header_sys_ioctl_h=no
+		ac_cv_header_sys_param_h=no
+		ac_cv_header_sys_resource_h=no
+		ac_cv_header_sys_select_h=no
+		ac_cv_header_sys_time_h=no
+		ac_cv_header_sys_times_h=no
+		ac_cv_func_times=yes
+		ac_cv_func_waitpid=yes
+		ac_cv_func_fsync=yes
+		ac_cv_func_vsnprintf=yes
+		ac_cv_func_seekdir=yes
+		ac_cv_func_telldir=yes
+		ac_cv_func_isinf=yes
+		ac_cv_func_isnan=yes
+		ac_cv_func_finite=yes
+		ac_cv_func_link=yes
+		ac_cv_lib_crypt_crypt=no
+		ac_cv_func_getpgrp_void=no
+		ac_cv_func_setpgrp_void=yes
+		ac_cv_func_memcmp_working=yes
+		ac_cv_lib_dl_dlopen=no
+		rb_cv_binary_elf=no
+		rb_cv_negative_time_t=no
+		enable_pthread=no
+		ac_cv_func_fcntl=yes
+		;;
+os2-emx*)	LIBS="-lm $LIBS"
+		ac_cv_lib_dir_opendir=no;;
+msdosdjgpp*)	LIBS="-lm $LIBS"
+		ac_cv_func_getpgrp_void=yes
+		ac_cv_func_setitimer=no
+                ac_cv_sizeof_rlim_t=4
+		ac_cv_func_setrlimit=no
+		;;
+bsdi*)          LIBS="-lm $LIBS"
+                ac_cv_sizeof_rlim_t=8;;
+freebsd*)	LIBS="-lm $LIBS"
+		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
+		  rb_cv_lib_xpg4_needed,
+		  [AC_TRY_CPP([
+#include <osreldate.h>
+#if __FreeBSD_version < 400020 || \
+   (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005)
+#error needs libxpg4
+#endif
+		   ],
+		   rb_cv_lib_xpg4_needed=no,
+		   rb_cv_lib_xpg4_needed=yes,
+		   rb_cv_lib_xpg4_needed=yes)])
+		if test "$rb_cv_lib_xpg4_needed" = yes; then
+			AC_CHECK_LIB(xpg4, setlocale)
+		fi
+		if test "$with_libc_r" = yes; then
+			AC_CACHE_CHECK([whether libc_r is supplementary to libc],
+			  rb_cv_supplementary_lib_c_r,
+			  [AC_TRY_CPP([
+#include <osreldate.h>
+#if 500016 <= __FreeBSD_version
+#error libc_r is supplementary to libc
+#endif
+			   ],
+			   rb_cv_supplementary_lib_c_r=no,
+			   rb_cv_supplementary_lib_c_r=yes,
+			   rb_cv_supplementary_lib_c_r=yes)])
+			if test "$rb_cv_supplementary_lib_c_r" = yes; then
+			   MAINLIBS="-lc_r $MAINLIBS"
+			fi
+		fi
+		;;
+dragonfly*)	LIBS="-lm $LIBS"
+		;;
+bow)		ac_cv_func_setitimer=no
+		;;
+superux*)     ac_cv_func_setitimer=no
+              ;;
+solaris*2.1*) if test -z "$GCC"; then
+	           ac_cv_func_isinf=yes
+              fi
+              LIBS="-lm $LIBS"
+              ;;
+*) LIBS="-lm $LIBS";;
+esac
+AC_CHECK_LIB(crypt, crypt)
+AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
+AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
+
+case "$target_cpu" in
+alpha*)		case "$target_os"::"$GCC" in
+		*::yes)	CFLAGS="-mieee $CFLAGS" ;;   # gcc
+		osf*)   CFLAGS="-ieee $CFLAGS" ;;    # ccc
+		esac ;;
+esac
+
+dnl Checks for header files.
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/syscall.h\
+		 fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
+		 syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \
+		 sys/mkdev.h sys/utime.h netinet/in_systm.h float.h ieeefp.h pthread.h \
+		 ucontext.h intrinsics.h)
+
+dnl Check additional types.
+AC_CHECK_SIZEOF(rlim_t, 0, [
+  #ifdef HAVE_SYS_TYPES_H
+  # include <sys/types.h>
+  #endif
+  #ifdef HAVE_SYS_TIME_H
+  # include <sys/time.h>
+  #endif
+  #ifdef HAVE_SYS_RESOURCE_H
+  # include <sys/resource.h>
+  #endif
+  #ifdef HAVE_UNISTD_H
+  # include <unistd.h>
+  #endif
+  #include <stdio.h>
+])
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_SIZE_T
+AC_STRUCT_ST_BLKSIZE
+AC_STRUCT_ST_BLOCKS
+AC_STRUCT_ST_RDEV
+
+dnl Checks for library functions.
+AC_TYPE_GETGROUPS
+AC_TYPE_SIGNAL
+case "${target_cpu}-${target_os}" in
+powerpc-darwin*)
+  AC_LIBSOURCES(alloca.c)
+  AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
+  AC_DEFINE(C_ALLOCA)
+  AC_DEFINE_UNQUOTED(alloca, alloca)
+  ;;
+*)
+  AC_FUNC_ALLOCA
+  ;;
+esac
+AC_FUNC_MEMCMP
+AC_FUNC_FSEEKO
+AC_CHECK_FUNCS(ftello)
+AC_REPLACE_FUNCS(dup2 memmove strcasecmp strncasecmp strerror strftime\
+		 strchr strstr strtoul crypt flock vsnprintf\
+		 isnan finite isinf hypot acosh erf)
+AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd eaccess\
+	      truncate chsize times utimes fcntl lockf lstat symlink link\
+	      readlink setitimer setruid seteuid setreuid setresuid\
+	      setproctitle setrgid setegid setregid setresgid issetugid pause\
+	      lchown lchmod getpgrp setpgrp getpgid setpgid initgroups\
+	      getgroups setgroups getpriority getrlimit setrlimit sysconf\
+              dlopen sigprocmask\
+	      sigaction _setjmp setsid telldir seekdir fchmod mktime timegm\
+	      cosh sinh tanh setuid setgid setenv unsetenv)
+AC_ARG_ENABLE(setreuid,
+       [  --enable-setreuid       use setreuid()/setregid() according to need even if obsolete.],
+       [use_setreuid=$enableval])
+if test "$use_setreuid" = yes; then
+    AC_DEFINE(USE_SETREUID)
+    AC_DEFINE(USE_SETREGID)
+fi
+AC_STRUCT_TIMEZONE
+AC_CACHE_CHECK(for struct tm.tm_gmtoff, rb_cv_member_struct_tm_tm_gmtoff,
+  [AC_TRY_COMPILE([#include <time.h>],
+    [struct tm t; t.tm_gmtoff = 3600;],
+  [rb_cv_member_struct_tm_tm_gmtoff=yes],
+  [rb_cv_member_struct_tm_tm_gmtoff=no])])
+if test "$rb_cv_member_struct_tm_tm_gmtoff" = yes; then
+  AC_DEFINE(HAVE_STRUCT_TM_TM_GMTOFF)
+fi
+AC_CACHE_CHECK(for external int daylight, rb_cv_have_daylight,
+  [AC_TRY_LINK([#include <time.h>
+  int i;],
+  	[i = daylight;],
+	rb_cv_have_daylight=yes,
+	rb_cv_have_daylight=no)])
+if test "$rb_cv_have_daylight" = yes; then
+  AC_DEFINE(HAVE_DAYLIGHT)
+fi
+AC_CACHE_CHECK(for negative time_t for gmtime(3), rb_cv_negative_time_t,
+  [AC_TRY_RUN([
+#include <time.h>
+
+void
+check(tm, y, m, d, h, s)
+    struct tm *tm;
+    int y, m, d, h, s;
+{
+    if (!tm ||
+	tm->tm_year != y ||
+	tm->tm_mon  != m-1 ||
+	tm->tm_mday != d ||
+	tm->tm_hour != h ||
+	tm->tm_sec  != s) {
+	exit(1);
+    }
+}
+
+int
+main()
+{
+   time_t t = -1;
+   struct tm *tm;
+
+   check(gmtime(&t), 69, 12, 31, 23, 59);
+   t = ~(time_t)0 << 31;
+   check(gmtime(&t), 1, 12, 13, 20, 52);
+   return 0;
+}
+],
+	rb_cv_negative_time_t=yes,
+	rb_cv_negative_time_t=no,
+	rb_cv_negative_time_t=yes)])
+if test "$rb_cv_negative_time_t" = yes; then
+  AC_DEFINE(NEGATIVE_TIME_T)
+fi
+
+if test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes; then
+   AC_DEFINE(POSIX_SIGNAL)
+else
+  AC_CACHE_CHECK(for BSD signal semantics, rb_cv_bsd_signal,
+    [AC_TRY_RUN([
+#include <stdio.h>
+#include <signal.h>
+
+void
+sig_handler(dummy)
+     int dummy;
+{
+}
+
+int
+main()
+{
+  signal(SIGINT, sig_handler);
+  kill(getpid(), SIGINT);
+  kill(getpid(), SIGINT);
+  return 0;
+}
+],
+	rb_cv_bsd_signal=yes,
+	rb_cv_bsd_signal=no,
+	rb_cv_bsd_signal=no)])
+  if test "$rb_cv_bsd_signal" = yes; then
+    AC_DEFINE(BSD_SIGNAL)
+  fi
+fi
+
+AC_FUNC_GETPGRP
+AC_FUNC_SETPGRP  
+
+AC_C_BIGENDIAN
+AC_C_CONST
+AC_C_CHAR_UNSIGNED
+AC_C_INLINE
+AC_C_VOLATILE
+
+if test x"$target_cpu" = xia64; then
+    AC_LIBOBJ([ia64])
+    AC_CACHE_CHECK(for __libc_ia64_register_backing_store_base,
+                   rb_cv___libc_ia64_register_backing_store_base,
+    [rb_cv___libc_ia64_register_backing_store_base=no
+    AC_TRY_LINK(
+      [extern unsigned long __libc_ia64_register_backing_store_base;],
+      [unsigned long p = __libc_ia64_register_backing_store_base;
+       printf("%ld\n", p);],
+      [rb_cv___libc_ia64_register_backing_store_base=yes])])
+    if test $rb_cv___libc_ia64_register_backing_store_base = yes; then
+      AC_DEFINE(HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE)
+    fi
+fi
+
+AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
+    [AC_TRY_RUN([
+int
+main()
+{
+  if (-1==(-1>>1))
+    return 0;
+  return 1;
+}
+],
+	rb_cv_rshift_sign=yes,
+	rb_cv_rshift_sign=no,
+	rb_cv_rshift_sign=yes)])
+if test "$rb_cv_rshift_sign" = yes; then
+  AC_DEFINE(RSHIFT(x,y), ((x)>>(int)y))
+else
+  AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>y) : (x)>>y))
+fi
+
+AC_MSG_CHECKING(read count field in FILE structures)
+AC_CACHE_VAL(rb_cv_fcnt,
+[for fcnt in	dnl
+     _cnt	dnl
+     __cnt	dnl
+     _r		dnl
+     readCount	dnl
+     _rcount	dnl for emx0.9c
+; do
+    AC_TRY_COMPILE([#include <stdio.h>
+],
+	[FILE *f = stdin; f->$fcnt = 0;],
+	rb_cv_fcnt="$fcnt"; break,
+	rb_cv_fcnt="not found")
+done])
+if test "$rb_cv_fcnt" = "not found"; then
+  AC_MSG_RESULT([not found(OK if using GNU libc)])
+else
+  AC_MSG_RESULT($rb_cv_fcnt)
+  AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt)
+fi
+
+AC_MSG_CHECKING(read buffer ptr field in FILE structures)
+AC_CACHE_VAL(rb_cv_frptr,
+[for frptr in	dnl
+     _IO_read_ptr dnl
+     _ptr	dnl
+     __ptr	dnl
+     bufpos	dnl
+     _p	dnl
+; do
+    AC_TRY_COMPILE([#include <stdio.h>
+],
+	[FILE *f = stdin; char buf[256]; f->$frptr = buf;],
+	rb_cv_frptr="$frptr"; break,
+	rb_cv_frptr="not found")
+done])
+if test "$rb_cv_frptr" = "not found"; then
+  AC_MSG_RESULT([not found])
+else
+  AC_MSG_RESULT($rb_cv_frptr)
+  AC_DEFINE_UNQUOTED(FILE_READPTR, $rb_cv_frptr)
+
+  if test "$rb_cv_fcnt" = "not found"; then
+    AC_MSG_CHECKING(read buffer end field in FILE structures)
+    AC_CACHE_VAL(rb_cv_frend,
+    [for frend in	dnl
+         _IO_read_end	dnl
+         bufread 	dnl
+    ; do
+        AC_TRY_COMPILE([#include <stdio.h>
+    ],
+  	[FILE *f = stdin; char buf[256]; f->$frend = buf;],
+  	rb_cv_frend="$frend"; break,
+  	rb_cv_frend="not found")
+    done])
+    if test "$rb_cv_frend" = "not found"; then
+      AC_MSG_RESULT([not found])
+    else
+      AC_MSG_RESULT($rb_cv_frend)
+      AC_DEFINE_UNQUOTED(FILE_READEND, $rb_cv_frend)
+    fi
+  fi
+fi
+
+AC_DEFUN([RUBY_CHECK_IO_NEED],
+[AC_CACHE_CHECK(whether need to [$1], [$2],
+    [AC_TRY_RUN([
+#include <stdio.h>
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
+#ifndef SEEK_CUR
+#define SEEK_CUR 1
+#endif
+#define before_seek(f) ]ifelse(index($2,flush_before_seek),-1,[fflush(f)],[(f,0)])[
+#define reset_rw(f) ]ifelse(index($2,seek_between_rw),-1,[do_seek(f,SEEK_CUR)],[(f,0)])[
+#define do_seek(f, w) (before_seek(f), fseek(f,0,w))
+
+char *fn = "conftest.dat";
+char *wombat = "wombat\n";
+char *koara = "koara\n";
+char *kangaroo = "kangaroo\n";
+
+int main()
+{
+    char buf[BUFSIZ];
+    FILE *f;
+    int r = 1;
+
+    if (!(f = fopen(fn, "w+"))) return 1;
+    fputs(wombat, f);
+    do_seek(f, SEEK_SET);
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
+    reset_rw(f);
+    fputs(koara, f);
+    fputs(kangaroo, f);
+    do_seek(f, SEEK_SET);
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara)) goto fail;
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
+    do_seek(f, SEEK_SET);
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
+    reset_rw(f);
+    fputc('X', f);
+    reset_rw(f);
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara+1)) goto fail;
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
+    do_seek(f, SEEK_SET);
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
+    if (!fgets(buf, BUFSIZ, f) || buf[0] != 'X' || strcmp(buf+1, koara+1)) goto fail;
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
+    r = 0;
+  fail:
+    fclose(f);
+    unlink(fn);
+    return r;
+}
+], [$2]=no, [$2]=yes, [$2]=[$3])])])
+RUBY_CHECK_IO_NEED(seek between R/W, rb_cv_need_io_seek_between_rw, yes)
+if test "$rb_cv_need_io_seek_between_rw" = yes; then
+  AC_DEFINE(NEED_IO_SEEK_BETWEEN_RW, 1)
+fi
+dnl RUBY_CHECK_IO_NEED(flush before seek, rb_cv_need_io_flush_before_seek, no)
+dnl if test "$rb_cv_need_io_flush_before_seek" = yes; then
+dnl   AC_DEFINE(NEED_IO_FLUSH_BEFORE_SEEK, 1)
+dnl fi
+
+AC_CACHE_CHECK([whether st_ino is huge], rb_cv_huge_st_ino,
+[AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([
+#include <sys/stat.h>
+struct stat test_stat;
+], [sizeof(test_stat.st_ino)>sizeof(long)])],
+rb_cv_huge_st_ino=yes,
+rb_cv_huge_st_ino=no)
+])
+if test $rb_cv_huge_st_ino = yes; then
+  AC_DEFINE(HUGE_ST_INO)
+fi
+
+if test "$ac_cv_func_sysconf" = yes; then
+  AC_DEFUN([RUBY_CHECK_SYSCONF], [dnl
+  AC_CACHE_CHECK([whether _SC_$1 is supported], rb_cv_have_sc_[]m4_tolower($1),
+    [AC_TRY_COMPILE([#include <unistd.h>
+      ],
+      [_SC_$1 >= 0],
+      rb_cv_have_sc_[]m4_tolower($1)=yes,
+      rb_cv_have_sc_[]m4_tolower($1)=no)
+    ])
+  if test "$rb_cv_have_sc_[]m4_tolower($1)" = yes; then
+    AC_DEFINE(HAVE__SC_$1)
+  fi
+  ])
+  RUBY_CHECK_SYSCONF(CLK_TCK)
+fi
+
+case "$target_cpu" in
+m68*|i?86|ia64|sparc*|alpha*) rb_cv_stack_grow_dir=-1;;
+hppa*) rb_cv_stack_grow_dir=+1;;
+esac
+AC_CACHE_CHECK(stack growing direction, rb_cv_stack_grow_dir,
+  [AC_TRY_RUN([
+/* recurse to get rid of inlining */
+static int
+stack_growup_p(addr, n)
+    volatile int *addr, n;
+{
+    volatile int end;
+    if (n > 0)
+	return *addr = stack_growup_p(addr, n - 1);
+    else
+	return (&end > addr);
+}
+int main()
+{
+    int x;
+    return stack_growup_p(&x, 10);
+}
+], rb_cv_stack_grow_dir=-1, rb_cv_stack_grow_dir=+1, rb_cv_stack_grow_dir=0)])
+AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $rb_cv_stack_grow_dir)
+
+if test x"$enable_pthread" = xyes; then
+    for pthread_lib in pthread pthreads c c_r; do
+ 	AC_CHECK_LIB($pthread_lib, pthread_kill,
+		     rb_with_pthread=yes, rb_with_pthread=no)
+	if test "$rb_with_pthread" = "yes"; then break; fi
+    done
+    if test x"$rb_with_pthread" = xyes; then
+	AC_DEFINE(_REENTRANT)
+	AC_DEFINE(_THREAD_SAFE)
+	AC_DEFINE(HAVE_LIBPTHREAD)
+	case $pthread_lib in
+	c)
+	    ;;
+	c_r)
+	    MAINLIBS="-pthread $MAINLIBS"
+	    ;;
+	*)
+      	    LIBS="-l$pthread_lib $LIBS"
+	    ;;
+	esac
+    else
+	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
+    fi
+    AC_CHECK_FUNCS(nanosleep)
+    if test x"$ac_cv_func_nanosleep" = xno; then
+       AC_CHECK_LIB(rt, nanosleep)
+       if test x"$ac_cv_lib_rt_nanosleep" = xyes; then
+           AC_DEFINE(HAVE_NANOSLEEP)
+       fi
+    fi
+fi
+if test x"$ac_cv_header_ucontext_h" = xyes; then
+    if test x"$rb_with_pthread" = xyes; then
+	AC_CHECK_FUNCS(getcontext setcontext)
+    fi
+fi
+
+dnl default value for $KANJI
+DEFAULT_KCODE="KCODE_NONE"
+
+AC_ARG_WITH(default-kcode, 
+	[  --with-default-kcode=CODE specify default value for \$KCODE (utf8|euc|sjis|none)], 
+	[case $withval in
+	utf8) DEFAULT_KCODE="KCODE_UTF8";;
+	euc)  DEFAULT_KCODE="KCODE_EUC";;
+	sjis) DEFAULT_KCODE="KCODE_SJIS";;
+	none) DEFAULT_KCODE="KCODE_NONE";;
+        *)    AC_MSG_WARN($withval is not valid kcode; ignored);;
+	esac])
+AC_DEFINE_UNQUOTED(DEFAULT_KCODE, $DEFAULT_KCODE)
+
+dnl wheather use dln_a_out or not
+AC_ARG_WITH(dln-a-out, 
+	[  --with-dln-a-out        use dln_a_out if possible], [
+	case $withval in
+	yes) with_dln_a_out=yes;;
+	*)   with_dln_a_out=no;;
+	esac], [with_dln_a_out=no])
+
+AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
+[AC_TRY_RUN([
+/* Test for whether ELF binaries are produced */
+#include <fcntl.h>
+#include <stdlib.h>
+main() {
+	char buffer[4];
+	int i=open("conftest",O_RDONLY);
+	if(i==-1)
+		exit(1); /* fail */
+	if(read(i,&buffer[0],4)<4)
+		exit(1); /* fail */
+	if(buffer[0] != 127 || buffer[1] != 'E' ||
+           buffer[2] != 'L' || buffer[3] != 'F')
+		exit(1); /* fail */
+	exit(0); /* succeed (yes, it's ELF) */
+}
+],
+rb_cv_binary_elf=yes,
+rb_cv_binary_elf=no,
+rb_cv_binary_elf=yes)])
+
+if test "$rb_cv_binary_elf" = yes; then
+  AC_DEFINE(USE_ELF)
+fi
+
+case "$target_os" in
+linux* | gnu* | k*bsd*-gnu | bsdi*)
+    if test "$rb_cv_binary_elf" = no; then
+	with_dln_a_out=yes
+    else
+	LDFLAGS="$LDFLAGS -rdynamic"
+    fi;;
+esac
+LIBEXT=a
+
+AC_SUBST(DLDFLAGS)dnl
+AC_SUBST(ARCH_FLAG)dnl
+
+AC_SUBST(STATIC)dnl
+AC_SUBST(CCDLFLAGS)dnl
+AC_SUBST(LDSHARED)dnl
+AC_SUBST(DLEXT)dnl
+AC_SUBST(DLEXT2)dnl
+AC_SUBST(LIBEXT)dnl
+
+STATIC=
+: ${LIBPATHFLAG=' -L"%s"'}
+: ${PATHFLAG=''}
+
+if test "$with_dln_a_out" != yes; then
+  rb_cv_dlopen=unknown
+  AC_MSG_CHECKING(whether OS depend dynamic link works)
+  if test "$GCC" = yes; then
+    case "$target_os" in
+    nextstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
+    openstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
+    rhapsody*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
+    darwin*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
+    human*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
+    *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
+    esac
+  else
+    case "$target_os" in
+	hpux*)		CCDLFLAGS="$CCDLFLAGS +Z";;
+	solaris*|irix*)	CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
+	sunos*)		CCDLFLAGS="$CCDLFLAGS -PIC" ;;
+	esix*|uxpds*)   CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
+	*)		: ${CCDLFLAGS=""} ;;
+    esac
+  fi
+
+  case "$target_os" in
+	hpux*)		DLDFLAGS="$DLDFLAGS -E"
+			: ${LDSHARED='ld -b'}
+			XLDFLAGS="$XLDFLAGS -Wl,-E"
+			: ${LIBPATHENV=SHLIB_PATH}
+			rb_cv_dlopen=yes;;
+	solaris*) 	if test "$GCC" = yes; then
+                          : ${LDSHARED='$(CC) -shared'}
+			   if test "$rb_cv_prog_gnu_ld" = yes; then
+	 		       LDFLAGS="$LDFLAGS -Wl,-E"
+			   fi
+			else
+			   : ${LDSHARED='ld -G'}
+			fi
+			rb_cv_dlopen=yes;;
+	sunos*) 	: ${LDSHARED='ld -assert nodefinitions'}
+			rb_cv_dlopen=yes;;
+	irix*)		: ${LDSHARED='ld -shared'}
+			rb_cv_dlopen=yes;;
+	sysv4*) 	: ${LDSHARED='ld -G'}
+			rb_cv_dlopen=yes;;
+        nto-qnx*)       : ${LDSHARED="qcc -shared"}
+                        rb_cv_dlopen=yes ;;
+	esix*|uxpds*) 	: ${LDSHARED="ld -G"}
+			rb_cv_dlopen=yes ;;
+	osf*) 		: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
+			rb_cv_dlopen=yes ;;
+	bsdi3*) 	case "$CC" in
+			*shlicc*)	: ${LDSHARED="$CC -r"}
+					rb_cv_dlopen=yes ;;
+			esac ;;
+	linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*)
+			: ${LDSHARED='${CC} -shared'}
+			if test "$rb_cv_binary_elf" = yes; then
+			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+			fi
+			rb_cv_dlopen=yes ;;
+	interix*) 	: ${LDSHARED="$CC -shared"}
+			XLDFLAGS="$XLDFLAGS -Wl,-E"
+			LIBPATHFLAG=" -L'%1\$-s'"
+			rb_cv_dlopen=yes ;;
+	freebsd*|dragonfly*)       : ${LDSHARED="$CC -shared"}
+			if test "$rb_cv_binary_elf" = yes; then
+			    LDFLAGS="$LDFLAGS -rdynamic"
+			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
+			else
+			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
+			fi
+			rb_cv_dlopen=yes ;;
+	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
+			if test "$rb_cv_binary_elf" = yes; then
+			    LDFLAGS="$LDFLAGS -Wl,-E"
+			fi
+			rb_cv_dlopen=yes ;;
+	nextstep*)	: ${LDSHARED='cc -r -nostdlib'}
+			LDFLAGS="$LDFLAGS -u libsys_s"
+			rb_cv_dlopen=yes ;;
+	openstep*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
+			: ${LDFLAGS=""}
+			rb_cv_dlopen=yes ;;
+	rhapsody*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
+			: ${LDFLAGS=""}
+			rb_cv_dlopen=yes ;;
+	darwin*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'}
+			: ${LDFLAGS=""}
+			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
+			rb_cv_dlopen=yes ;;
+        aix*)           if test "$GCC" = yes; then
+			    : ${LDSHARED='$(CC) -shared'}
+			else
+			    : ${LDSHARED='/usr/ccs/bin/ld'}
+			fi
+			DLDFLAGS="${linker_flag}-G"' -eInit_$(TARGET)'
+			LDFLAGS="${LDFLAGS} ${linker_flag}-brtl"
+			XLDFLAGS="${linker_flag}-bE:ruby.imp"
+                        : ${ARCHFILE="ruby.imp"}
+                        TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
+                        TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
+                        : ${LIBPATHENV=SHLIB_PATH}
+                        rb_cv_dlopen=yes ;;
+	human*)		: ${DLDFLAGS=''}
+			: ${LDSHARED=''}
+			: ${LDFLAGS=''}
+			: ${LINK_SO='ar cru $@ $(OBJS)'}
+			rb_cv_dlopen=yes ;;
+	beos*) 		case "$target_cpu" in
+			  powerpc*)
+			    : ${LDSHARED="ld -xms"}
+			    DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
+                            ;;
+			  i586*)
+			    : ${LDSHARED="ld -shared"}
+			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
+			    ;;
+			esac
+			: ${LIBPATHENV=LIBRARY_PATH}
+			rb_cv_dlopen=yes ;;
+	nto-qnx*)	DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
+			: ${LDSHARED='ld -Bshareable -x'}
+			LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
+			rb_cv_dlopen=yes;;
+	cygwin*|mingw*)	: ${LDSHARED="${CC} -shared -s"}
+			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x02000000"
+			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import,--export-all"
+			: ${LIBPATHENV=""}
+			rb_cv_dlopen=yes ;;
+	hiuxmpp)	: ${LDSHARED='ld -r'} ;;
+	atheos*) 	: ${LDSHARED="$CC -shared"}
+			rb_cv_dlopen=yes ;;
+	os2-emx*)	LDFLAGS="$LDFLAGS -Zbsd-signals"
+			;;
+	*) 		: ${LDSHARED='ld'} ;;
+  esac
+  AC_MSG_RESULT($rb_cv_dlopen)
+
+  AC_ARG_ENABLE(rpath,
+       [  --disable-rpath         embed run path into extension libraries.],
+       [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
+  if test "$enable_rpath" = yes; then
+    LIBPATHFLAG=" -L'%1\$-s'"
+    RPATHFLAG=" ${linker_flag}-R'%1\$-s'"
+  fi
+fi
+AC_SUBST(LINK_SO)
+AC_SUBST(LIBPATHFLAG)
+AC_SUBST(RPATHFLAG)
+AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}")
+AC_SUBST(TRY_LINK)
+
+dln_a_out_works=no
+if test "$ac_cv_header_a_out_h" = yes; then
+  if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then
+    cat confdefs.h > config.h
+    AC_CACHE_CHECK(whether matz's dln works, rb_cv_dln_a_out,
+    [AC_TRY_COMPILE([
+#define USE_DLN_A_OUT
+#include "dln.c"
+],
+	[], 
+	rb_cv_dln_a_out=yes,
+	rb_cv_dln_a_out=no)])
+    if test "$rb_cv_dln_a_out" = yes; then
+      dln_a_out_works=yes
+      AC_DEFINE(USE_DLN_A_OUT)
+    fi
+  fi
+fi
+
+if test "$dln_a_out_works" = yes; then
+  if test "$GCC" = yes; then
+    STATIC=-static
+  else
+    STATIC=-Bstatic
+  fi
+  DLEXT=so
+  CCDLFLAGS=
+else
+  case "$target_os" in
+    hpux*)	DLEXT=sl;;
+    nextstep*|openstep*|rhapsody*|darwin*)
+		DLEXT=bundle;;
+    os2-emx*)	DLEXT=dll;;
+    cygwin*|mingw*)
+		DLEXT=so DLEXT2=dll;;
+    *)		DLEXT=so;;
+  esac
+fi
+len=2 # .rb
+n=`expr "$DLEXT"  : '.*'`; test "$n" -gt "$len" && len=$n
+n=`expr "$DLEXT2" : '.*'`; test "$n" -gt "$len" && len=$n
+AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`)
+test ".$DLEXT"  = "." || AC_DEFINE_UNQUOTED(DLEXT,  ".$DLEXT")
+test ".$DLEXT2" = "." || AC_DEFINE_UNQUOTED(DLEXT2, ".$DLEXT2")
+
+AC_SUBST(STRIP)dnl
+if test "$with_dln_a_out" = yes; then
+  STRIP=true
+else
+  STRIP=strip
+fi
+
+case "$target_os" in
+  linux* | gnu* | k*bsd*-gnu)
+	STRIP='strip -S -x';;
+  nextstep*)
+	STRIP='strip -A -n';;
+  openstep*)
+	STRIP='strip -A -n';;
+  rhapsody*)
+	STRIP='strip -A -n';;
+  darwin*)
+	STRIP='strip -A -n';;
+esac
+
+EXTSTATIC=
+AC_SUBST(EXTSTATIC)dnl
+AC_ARG_WITH(static-linked-ext,
+	    [  --with-static-linked-ext link external modules statically],
+            [case $withval in
+	     yes) STATIC=
+		  EXTSTATIC=static;;
+	     *)	;;
+	     esac])
+
+case "$target_os" in
+  human*)
+    AC_CHECK_LIB(signal, _harderr)
+    AC_CHECK_LIB(hmem, hmemset)
+    AC_CHECK_FUNCS(select gettimeofday)
+    AC_CACHE_CHECK(whether PD libc _dtos18 fail to convert big number,
+		   rb_cv_missing__dtos18,
+    [AC_TRY_RUN(
+changequote(<<, >>)dnl
+<<
+#include <stdio.h>
+main ()
+{
+   char buf[256];
+   sprintf (buf, "%g", 1e+300);
+   exit (strcmp (buf, "1e+300") ? 0 : 1);
+}
+>>,
+changequote([, ])dnl
+rb_cv_missing__dtos18=yes, rb_cv_missing__dtos18=no, rb_cv_missing__dtos18=no)])
+    if test "$rb_cv_missing__dtos18" = yes; then
+      AC_DEFINE(MISSING__DTOS18)
+    fi
+    AC_CACHE_CHECK(whether PD libc fconvert fail to round,
+		   rb_cv_missing_fconvert,
+    [AC_TRY_RUN(
+changequote(<<, >>)dnl
+<<
+#include <stdio.h>
+#include <math.h>
+main ()
+{
+  char buf[256];
+  sprintf (buf, "%f", log(exp(1.0)));
+  exit (strcmp (buf, "1.000000") ? 0 : 1);
+}
+>>,
+changequote([, ])dnl
+rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no)])
+    if test "$rb_cv_missing_fconvert" = yes; then
+      AC_DEFINE(MISSING_FCONVERT)
+    fi
+    AC_LIBOBJ([x68.o])
+    CFLAGS="$CFLAGS -fansi-only"
+    XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
+    EXEEXT=.x
+    OBJEXT=o
+    setup=Setup.x68
+    ;;
+  dnl OS/2 environment w/ Autoconf 2.1x for EMX
+  os2-emx)
+    AC_LIBOBJ([os2])
+    setup=Setup.emx
+    ;;
+  *djgpp*)
+    setup=Setup.dj
+    ;;
+  *)
+    setup=Setup
+    ;;
+esac
+
+AC_SUBST(setup)
+
+if test "$prefix" = NONE; then
+  prefix=$ac_default_prefix
+fi
+
+#if test "$fat_binary" != no ; then
+#  CFLAGS="$CFLAGS $ARCH_FLAG"
+#fi
+
+if test x"$cross_compiling" = xyes; then
+  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake"
+  PREP=fake.rb
+  RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+else
+  MINIRUBY='./miniruby$(EXEEXT)'
+  PREP='miniruby$(EXEEXT)'
+  RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT) --'
+fi
+AC_SUBST(MINIRUBY)
+AC_SUBST(PREP)
+AC_SUBST(RUNRUBY)
+AC_SUBST(EXTOUT, [${EXTOUT-.ext}])
+
+FIRSTMAKEFILE=""
+LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
+LIBRUBY='$(LIBRUBY_A)'
+LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'
+LIBRUBYARG='$(LIBRUBYARG_STATIC)'
+SOLIBS=
+
+case "$target_os" in
+  cygwin*|mingw*|beos*|openstep*|nextstep*|rhapsody*|darwin*|os2-emx*)
+    : ${DLDLIBS=""}
+    ;;
+  *)
+    DLDLIBS="$DLDLIBS -lc"
+    ;;
+esac
+
+RUBY_SO_NAME='$(RUBY_INSTALL_NAME)'
+LIBRUBY_LDSHARED=$LDSHARED
+LIBRUBY_DLDFLAGS=$DLDFLAGS
+LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
+LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so'
+ENABLE_SHARED=no
+
+AC_ARG_ENABLE(shared,
+       [  --enable-shared         build a shared library for Ruby. ],
+       [enable_shared=$enableval])
+if test "$enable_shared" = 'yes'; then
+  LIBRUBY='$(LIBRUBY_SO)'
+  LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
+  LIBRUBYARG='$(LIBRUBYARG_SHARED)'
+  CFLAGS="$CFLAGS $CCDLFLAGS"
+  ENABLE_SHARED=yes
+  if test "$rb_cv_binary_elf" = yes; then
+    SOLIBS='$(LIBS)'
+  fi
+  case "$target_os" in
+    sunos4*)
+	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+	;;
+    linux* | gnu* | k*bsd*-gnu | atheos*)
+	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
+	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+	;;
+    freebsd*|dragonfly*)
+	SOLIBS='$(LIBS)'
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
+	if test "$rb_cv_binary_elf" != "yes" ; then
+	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
+	    LIBRUBY_ALIASES=''
+	fi
+	;;
+    netbsd*)
+	SOLIBS='$(LIBS)'
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
+	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
+	if test "$rb_cv_binary_elf" = yes; then # ELF platforms
+	   LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
+	else	# a.out platforms
+	   LIBRUBY_ALIASES=""
+	fi
+ 	;;
+    openbsd*)
+	SOLIBS='$(LIBS)'
+	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
+	;;
+    solaris*)
+	SOLIBS='$(LIBS)'
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
+	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
+	if test "$GCC" = yes; then
+	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
+	fi
+	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
+ 	;;
+    hpux*)
+	XLDFLAGS="$XLDFLAGS "'-Wl,+s,+b,$(libdir)'
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)'
+	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
+	;;
+    aix*)
+	LIBRUBY_DLDFLAGS="${linker_flag}-G ${linker_flag}-bnoentry $XLDFLAGS"
+	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
+	SOLIBS='-lm -lc'
+	;;
+    beos*)
+	case "$target_cpu" in
+	powerpc*)
+	    LIBRUBY_DLDFLAGS='-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
+	    ;;
+	esac
+	;;
+    darwin*)
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
+	LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
+	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
+	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
+	;;
+    interix*)
+	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
+	;;
+    *)
+	;;
+  esac
+fi
+if test "$enable_rpath" = yes; then
+    LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
+fi
+
+LDFLAGS="-L. $LDFLAGS"
+AC_SUBST(ARCHFILE)
+
+dnl build rdoc index if requested
+RDOCTARGET=""
+AC_ARG_ENABLE(install-doc,
+       [  --enable-install-doc    build and install rdoc indexes during install ],
+       [install_doc=$enableval], [install_doc=no])
+if test "$install_doc" != no; then
+   RDOCTARGET="install-doc"
+fi
+AC_SUBST(RDOCTARGET)
+
+case "$target_os" in
+    netbsd*)
+    	CFLAGS="$CFLAGS -pipe"
+	;;
+    nextstep*|openstep*)
+	# The -fno-common is needed if we wish to embed the Ruby interpreter
+	# into a plugin module of some project (as opposed to embedding it
+	# within the project's application).  The -I/usr/local/include is
+	# needed because CPP as discovered by configure (cc -E -traditional)
+	# fails to consult /usr/local/include by default.  This causes
+	# mkmf.rb's have_header() to fail if the desired resource happens to be
+	# installed in the /usr/local tree.
+    	CFLAGS="$CFLAGS -pipe -fno-common"
+	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+	;;
+    rhapsody*)
+    	CFLAGS="$CFLAGS -pipe -no-precomp -fno-common"
+	;;
+    darwin*)
+    	CFLAGS="$CFLAGS -pipe -fno-common"
+	MINIOBJS=dmydln.o
+	;;
+    os2-emx)
+    	CFLAGS="$CFLAGS -DOS2 -Zmts"
+	LIBRUBY_A=`echo $LIBRUBY_A | sed 's/^lib//'`
+	LIBRUBY_SO=`echo $LIBRUBY_SO | sed 's/^lib//'`
+	LIBRUBY_ALIASES=`for i in $LIBRUBY_ALIASES; do echo "$i"; done | sed 's/^lib//'`
+	;;
+    osf*)
+	if test "$GCC" != "yes" ; then
+	  # compile something small: taint.c is fine for this.
+	  # the main point is the '-v' flag of 'cc'.
+	  case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in
+	  */gemc_cc*)   # we have the new DEC GEM CC
+                        CFLAGS="$CFLAGS -oldc"
+                        ;;
+          *)            # we have the old MIPS CC
+                        ;;
+          esac
+	  # cleanup
+	  rm -f /tmp/main.o
+	  CFLAGS="$CFLAGS -std"
+	fi
+	;;
+    beos*)
+	case "$target_cpu" in
+	powerpc*)
+	    CFLAGS="$CFLAGS -relax_pointers"
+	    ;;
+	esac
+	;;
+    cygwin*|mingw*)
+	case "$target_os" in
+	cygwin*)
+	    if test x"$enable_shared" = xyes; then
+		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}.dll
+		LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
+	    fi
+	    AC_LIBOBJ([strftime])
+	    ;;
+	mingw*)
+	    RUBY_SO_NAME=${rb_cv_msvcrt}-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
+	    if test x"$enable_shared" = xyes; then
+		LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
+		LIBRUBY='lib$(LIBRUBY_SO).a'
+	    fi
+	    AC_LIBOBJ([win32])
+	    COMMON_LIBS=m
+#	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
+	    COMMON_HEADERS="windows.h winsock.h"
+	    ;;
+	esac
+	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
+	LIBRUBY_ALIASES=''
+	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
+	SOLIBS='$(LIBS)'
+	if test x"$enable_shared" = xno; then
+	    LIBRUBY_SO=dummy
+	    LIBRUBY='lib$(RUBY_SO_NAME).a'
+	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
+	fi
+	MINIOBJS=dmydln.o
+	;;
+    hpux*)
+	case "$YACC" in
+	  *yacc*)
+	    XCFLAGS="$XCFLAGS -DYYMAXDEPTH=300"
+	    YACC="$YACC -Nl40000 -Nm40000"
+	    ;;
+	esac
+	MINIOBJS=dmydln.o
+	;;
+    *)
+	;;
+esac
+
+case "$build_os" in
+  *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
+esac
+
+AC_SUBST(XCFLAGS)dnl
+AC_SUBST(XLDFLAGS)dnl
+AC_SUBST(LIBRUBY_LDSHARED)
+AC_SUBST(LIBRUBY_DLDFLAGS)
+AC_SUBST(RUBY_INSTALL_NAME)
+AC_SUBST(rubyw_install_name)
+AC_SUBST(RUBYW_INSTALL_NAME)
+AC_SUBST(RUBY_SO_NAME)
+AC_SUBST(LIBRUBY_A)
+AC_SUBST(LIBRUBY_SO)
+AC_SUBST(LIBRUBY_ALIASES)
+AC_SUBST(LIBRUBY)
+AC_SUBST(LIBRUBYARG)
+AC_SUBST(LIBRUBYARG_STATIC)
+AC_SUBST(LIBRUBYARG_SHARED)
+AC_SUBST(SOLIBS)
+AC_SUBST(DLDLIBS)
+AC_SUBST(ENABLE_SHARED)
+AC_SUBST(MAINLIBS)
+AC_SUBST(COMMON_LIBS)
+AC_SUBST(COMMON_MACROS)
+AC_SUBST(COMMON_HEADERS)
+AC_SUBST(EXPORT_PREFIX)
+AC_SUBST(MINIOBJS)
+
+MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
+MAKEFILES="`echo $MAKEFILES`"
+AC_SUBST(MAKEFILES)
+
+ri_prefix=
+test "$program_prefix" != NONE &&
+  ri_prefix=$program_prefix
+
+ri_suffix=
+test "$program_suffix" != NONE &&
+  ri_suffix=$program_suffix
+
+RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
+case "$target_os" in
+  cygwin*|mingw*)
+    RUBYW_INSTALL_NAME="${ri_prefix}rubyw${ri_suffix}"
+    rubyw_install_name="$RUBYW_INSTALL_NAME"
+    ;;
+esac
+case "$target_os" in
+  cygwin*|mingw*|*djgpp*|os2-emx*)
+    RUBY_LIB_PREFIX="/lib/ruby"
+    ;;
+  *)
+    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
+    ;;
+esac
+RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+
+AC_ARG_WITH(sitedir,
+	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
+            [sitedir=$withval],
+            [sitedir='${prefix}/lib/ruby/site_ruby'])
+SITE_DIR=`eval echo \\"${sitedir}\\"`
+case "$target_os" in
+  cygwin*|mingw*|*djgpp*|os2-emx*)
+    RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
+    RUBY_SITE_LIB_PATH="$SITE_DIR";;
+  *)
+    RUBY_SITE_LIB_PATH="$SITE_DIR";;
+esac
+RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
+
+AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
+
+AC_SUBST(arch)dnl
+AC_SUBST(sitearch)dnl
+AC_SUBST(sitedir)dnl
+
+configure_args=$ac_configure_args
+AC_SUBST(configure_args)dnl
+
+if test "$fat_binary" != no ; then
+    arch="fat-${target_os}"
+
+    AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
+                 "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+
+    AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
+                 "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}")
+else
+    arch="${target_cpu}-${target_os}"
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}")
+fi
+
+case "$target_os" in
+  mingw*) sitearch="i386-$rb_cv_msvcrt" ;;
+  *) sitearch="${arch}" ;;
+esac
+
+AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
+
+AC_ARG_WITH(search-path,
+		[  --with-search-path=DIR specify the additional search path],
+		[search_path=$withval])
+if test "$search_path" != ""; then
+    AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path")
+fi
+
+AC_ARG_WITH(mantype,
+		[  --with-mantype=TYPE specify man page type; TYPE is one of man and doc],
+		[
+			case "$withval" in
+			man|doc)
+				MANTYPE=$withval
+				;;
+			*)
+				AC_MSG_ERROR(invalid man type: $withval)
+				;;
+			esac
+		])
+if test -z "$MANTYPE"; then
+	AC_PATH_PROGS(NROFF, nroff awf, /bin/false, "/usr/bin:/usr/ucb")
+	if ${NROFF} -mdoc ${srcdir}/ruby.1 >/dev/null 2>&1; then
+		MANTYPE=doc
+	else
+		MANTYPE=man
+	fi
+fi
+AC_SUBST(MANTYPE)
+
+if test -f config.h && tr -d '\015' < confdefs.h | cmp -s config.h -; then
+  echo "config.h unchanged"
+else
+  echo "creating config.h"
+  tr -d '\015' < confdefs.h > config.h
+fi
+: > confdefs.h
+
+AC_CONFIG_FILES($FIRSTMAKEFILE)
+AC_CONFIG_FILES(Makefile, [{
+	sed '/^MISSING/s/\$U\././g' Makefile
+	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
+	test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
+	sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
+      } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
+[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
+AC_OUTPUT
diff --git a/ruby_1_8_6/cygwin/GNUmakefile.in b/ruby_1_8_6/cygwin/GNUmakefile.in
new file mode 100644
index 0000000000..03208df11c
--- /dev/null
+++ b/ruby_1_8_6/cygwin/GNUmakefile.in
@@ -0,0 +1,78 @@
+include Makefile
+
+ENABLE_SHARED=@ENABLE_SHARED@
+DLLWRAP = @DLLWRAP@ --target=@target_os@
+
+ifeq (@target_os@,cygwin)
+  DLL_BASE_NAME := $(subst .dll,,$(LIBRUBY_SO))
+else
+  DLL_BASE_NAME := $(RUBY_SO_NAME)
+  DLLWRAP += -mno-cygwin
+  VPATH += $(srcdir)/win32
+endif
+
+ifneq ($(ENABLE_SHARED),yes)
+  RUBY_EXP = $(RUBY_INSTALL_NAME).exp
+  EXTOBJS = $(RUBY_EXP)
+  LIBRUBYARG = $(LIBRUBY_A)
+  LIBRUBY_SO =
+endif
+
+ifeq ($(RUBY_INSTALL_NAME),ruby)
+  RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
+else
+  RUBYW_INSTALL_NAME = $(subst ruby,rubyw,$(RUBY_INSTALL_NAME))
+endif
+
+WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
+SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
+EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
+RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
+
+ruby: $(PROGRAM)
+rubyw: $(WPROGRAM)
+
+$(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
+$(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
+
+%.res.@OBJEXT@: %.rc
+	@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
+
+$(RCFILES): $(RBCONFIG)
+	@$(MINIRUBY) $(srcdir)/win32/resource.rb \
+	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
+	  -so_name=$(DLL_BASE_NAME) \
+	  . $(icondirs) $(srcdir)/win32
+
+$(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
+$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
+	@rm -f $@
+	$(PURIFY) $(CC) -mwindows -e _mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
+	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
+
+$(RUBY_EXP): $(LIBRUBY_A)
+	$(DLLWRAP) \
+	  --output-exp=$(RUBY_EXP) \
+	  --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)
+	$(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
+	@rm -f $(PROGRAM)
+
+GNUmakefile:	$(srcdir)/cygwin/GNUmakefile.in
+
+ifeq (@target_os@,mingw32)
+$(OBJS) $(MAINOBJ): win32/win32.h
+endif
+
+ifeq (@target_os@,cygwin)
+cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR).dll: $(LIBRUBY_A)
+	@NM@ --extern --defined $(LIBRUBY_A) | \
+	  $(MINIRUBY) -ne 'BEGIN{puts "EXPORTS"}; puts $$1+"=cyg$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def
+	@DLLWRAP@ -s --def=rubydll.def -o $@
+	@rm -f rubydll.def
+endif
+
+clean-local::
+	@$(RM) $(RUBY_EXP) $(RCFILES:.rc=.res.@OBJEXT@)
+
+distclean-local::
+	@$(RM) $(RCFILES)
diff --git a/ruby_1_8_6/defines.h b/ruby_1_8_6/defines.h
new file mode 100644
index 0000000000..f1a565acf3
--- /dev/null
+++ b/ruby_1_8_6/defines.h
@@ -0,0 +1,264 @@
+/************************************************
+
+  defines.h -
+
+  $Author$
+  $Date$
+  created at: Wed May 18 00:21:44 JST 1994
+
+************************************************/
+#ifndef DEFINES_H
+#define DEFINES_H
+
+#define RUBY
+
+#ifdef __cplusplus
+# ifndef  HAVE_PROTOTYPES
+#  define HAVE_PROTOTYPES 1
+# endif
+# ifndef  HAVE_STDARG_PROTOTYPES
+#  define HAVE_STDARG_PROTOTYPES 1
+# endif
+#endif
+
+#undef _
+#ifdef HAVE_PROTOTYPES
+# define _(args) args
+#else
+# define _(args) ()
+#endif
+
+#undef __
+#ifdef HAVE_STDARG_PROTOTYPES
+# define __(args) args
+#else
+# define __(args) ()
+#endif
+
+#ifdef __cplusplus
+#define ANYARGS ...
+#else
+#define ANYARGS
+#endif
+
+#define xmalloc ruby_xmalloc
+#define xcalloc ruby_xcalloc
+#define xrealloc ruby_xrealloc
+#define xfree ruby_xfree
+
+void *xmalloc _((long));
+void *xcalloc _((long,long));
+void *xrealloc _((void*,long));
+void xfree _((void*));
+
+#if SIZEOF_LONG_LONG > 0
+# define LONG_LONG long long
+#elif SIZEOF___INT64 > 0
+# define HAVE_LONG_LONG 1
+# define LONG_LONG __int64
+# undef SIZEOF_LONG_LONG
+# define SIZEOF_LONG_LONG SIZEOF___INT64
+#endif
+
+#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+# define BDIGIT unsigned int
+# define SIZEOF_BDIGITS SIZEOF_INT
+# define BDIGIT_DBL unsigned LONG_LONG
+# define BDIGIT_DBL_SIGNED LONG_LONG
+#elif SIZEOF_INT*2 <= SIZEOF_LONG
+# define BDIGIT unsigned int
+# define SIZEOF_BDIGITS SIZEOF_INT
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
+# define BDIGIT unsigned short
+# define SIZEOF_BDIGITS SIZEOF_SHORT
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+#else
+# define BDIGIT unsigned short
+# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+#endif
+
+#ifdef __CYGWIN__
+#undef _WIN32
+#endif
+
+#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
+#define DOSISH 1
+#ifndef _WIN32_WCE
+# define DOSISH_DRIVE_LETTER
+#endif
+#endif
+
+/* define RUBY_USE_EUC/SJIS for default kanji-code */
+#ifndef DEFAULT_KCODE
+#if defined(DOSISH) || defined(__CYGWIN__) || defined(__MACOS__) || defined(OS2)
+#define DEFAULT_KCODE KCODE_SJIS
+#else
+#define DEFAULT_KCODE KCODE_EUC
+#endif
+#endif
+
+#ifdef __NeXT__
+/* NextStep, OpenStep, Rhapsody */
+#ifndef S_IRUSR
+#define S_IRUSR 0000400        /* read permission, owner */
+#endif
+#ifndef S_IRGRP
+#define S_IRGRP 0000040        /* read permission, group */
+#endif
+#ifndef S_IROTH
+#define S_IROTH 0000004        /* read permission, other */
+#endif
+#ifndef S_IWUSR
+#define S_IWUSR 0000200        /* write permission, owner */
+#endif
+#ifndef S_IWGRP
+#define S_IWGRP 0000020        /* write permission, group */
+#endif
+#ifndef S_IWOTH
+#define S_IWOTH 0000002        /* write permission, other */
+#endif
+#ifndef S_IXUSR
+#define S_IXUSR 0000100        /* execute/search permission, owner */
+#endif
+#ifndef S_IXGRP
+#define S_IXGRP 0000010        /* execute/search permission, group */
+#endif
+#ifndef S_IXOTH
+#define S_IXOTH 0000001        /* execute/search permission, other */
+#endif
+#ifndef S_IRWXU
+#define S_IRWXU 0000700        /* read, write, execute permissions, owner */
+#endif
+#ifndef S_IRWXG
+#define S_IRWXG 0000070        /* read, write, execute permissions, group */
+#endif
+#ifndef S_IRWXO
+#define S_IRWXO 0000007        /* read, write, execute permissions, other */
+#endif
+#ifndef S_ISBLK
+#define S_ISBLK(mode)  (((mode) & (0170000)) == (0060000))
+#endif
+#ifndef S_ISCHR
+#define S_ISCHR(mode)  (((mode) & (0170000)) == (0020000))
+#endif
+#ifndef S_ISDIR
+#define S_ISDIR(mode)  (((mode) & (0170000)) == (0040000))
+#endif
+#ifndef S_ISFIFO
+#define S_ISFIFO(mode) (((mode) & (0170000)) == (0010000))
+#endif
+#ifndef S_ISREG
+#define S_ISREG(mode)  (((mode) & (0170000)) == (0100000))
+#endif
+/* Do not trust WORDS_BIGENDIAN from configure since -arch compiler flag may
+   result in a different endian.  Instead trust __BIG_ENDIAN__ and
+   __LITTLE_ENDIAN__ which are set correctly by -arch. */
+#undef WORDS_BIGENDIAN
+#ifdef __BIG_ENDIAN__
+#define WORDS_BIGENDIAN
+#endif
+#ifndef __APPLE__
+/* NextStep, OpenStep (but not Rhapsody) */
+#ifndef GETPGRP_VOID
+#define GETPGRP_VOID 1
+#endif
+#ifndef WNOHANG
+#define WNOHANG 01
+#endif
+#ifndef WUNTRACED
+#define WUNTRACED 02
+#endif
+#ifndef X_OK
+#define X_OK 1
+#endif
+#endif /* __APPLE__ */
+#endif /* NeXT */
+
+#ifdef _WIN32
+#include "win32/win32.h"
+#endif
+
+#if defined(__VMS)
+#include "vms.h"
+#endif
+
+#if defined(__BEOS__)
+#include <net/socket.h> /* intern.h needs fd_set definition */
+#endif
+
+#ifdef RUBY_EXPORT
+#undef RUBY_EXTERN
+#endif
+
+#ifndef RUBY_EXTERN
+#define RUBY_EXTERN extern
+#endif
+
+#ifndef EXTERN
+#define EXTERN RUBY_EXTERN	/* deprecated */
+#endif
+
+#ifndef RUBY_MBCHAR_MAXSIZE
+#define RUBY_MBCHAR_MAXSIZE INT_MAX
+        /* MB_CUR_MAX will not work well in C locale */
+#endif
+
+#if defined(sparc) || defined(__sparc__)
+static inline void
+flush_register_windows(void)
+{
+    asm
+#ifdef __GNUC__
+	volatile
+#endif
+# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
+	("flushw")
+# elif defined(linux) || defined(__linux__)
+	("ta  0x83")
+# else /* Solaris, OpenBSD, NetBSD, etc. */
+	("ta  0x03")
+# endif /* trap always to flush register windows if we are on a Sparc system */
+	;
+}
+#  define FLUSH_REGISTER_WINDOWS flush_register_windows()
+#elif defined(__ia64)
+void *rb_ia64_bsp(void);
+void rb_ia64_flushrs(void);
+#  define FLUSH_REGISTER_WINDOWS rb_ia64_flushrs()
+#else
+#  define FLUSH_REGISTER_WINDOWS ((void)0)
+#endif
+
+#if defined(DOSISH)
+#define PATH_SEP ";"
+#elif defined(riscos)
+#define PATH_SEP ","
+#else
+#define PATH_SEP ":"
+#endif
+#define PATH_SEP_CHAR PATH_SEP[0]
+
+#if defined(__human68k__)
+#define PATH_ENV "path"
+#else
+#define PATH_ENV "PATH"
+#endif
+
+#if defined(DOSISH) && !defined(__human68k__) && !defined(__EMX__)
+#define ENV_IGNORECASE
+#endif
+
+#ifndef DLEXT_MAXLEN
+#define DLEXT_MAXLEN 4
+#endif
+
+#ifndef RUBY_PLATFORM
+#define RUBY_PLATFORM "unknown-unknown"
+#endif
+
+#endif
diff --git a/ruby_1_8_6/dir.c b/ruby_1_8_6/dir.c
new file mode 100644
index 0000000000..0dd12ffd7d
--- /dev/null
+++ b/ruby_1_8_6/dir.c
@@ -0,0 +1,2002 @@
+/**********************************************************************
+
+  dir.c -
+
+  $Author$
+  $Date$
+  created at: Wed Jan  5 09:51:01 JST 1994
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#include "ruby.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#if defined HAVE_DIRENT_H && !defined _WIN32
+# include <dirent.h>
+# define NAMLEN(dirent) strlen((dirent)->d_name)
+#elif defined HAVE_DIRECT_H && !defined _WIN32
+# include <direct.h>
+# define NAMLEN(dirent) strlen((dirent)->d_name)
+#else
+# define dirent direct
+# if !defined __NeXT__
+#  define NAMLEN(dirent) (dirent)->d_namlen
+# else
+#  /* On some versions of NextStep, d_namlen is always zero, so avoid it. */
+#  define NAMLEN(dirent) strlen((dirent)->d_name)
+# endif
+# if HAVE_SYS_NDIR_H
+#  include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+#  include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+#  include <ndir.h>
+# endif
+# ifdef _WIN32
+#  include "win32/dir.h"
+# endif
+#endif
+
+#include <errno.h>
+
+#ifndef HAVE_STDLIB_H
+char *getenv();
+#endif
+
+#ifndef HAVE_STRING_H
+char *strchr _((char*,char));
+#endif
+
+#include <ctype.h>
+
+#include "util.h"
+
+#if !defined HAVE_LSTAT && !defined lstat
+#define lstat stat
+#endif
+
+#ifndef CASEFOLD_FILESYSTEM
+# if defined DOSISH || defined __VMS
+#   define CASEFOLD_FILESYSTEM 1
+# else
+#   define CASEFOLD_FILESYSTEM 0
+# endif
+#endif
+
+#define FNM_NOESCAPE	0x01
+#define FNM_PATHNAME	0x02
+#define FNM_DOTMATCH	0x04
+#define FNM_CASEFOLD	0x08
+#if CASEFOLD_FILESYSTEM
+#define FNM_SYSCASE	FNM_CASEFOLD
+#else
+#define FNM_SYSCASE	0
+#endif
+
+#define FNM_NOMATCH	1
+#define FNM_ERROR	2
+
+#define downcase(c) (nocase && ISUPPER(c) ? tolower(c) : (c))
+#define compare(c1, c2) (((unsigned char)(c1)) - ((unsigned char)(c2)))
+
+/* caution: in case *p == '\0'
+   Next(p) == p + 1 in single byte environment
+   Next(p) == p     in multi byte environment
+*/
+#if defined(CharNext)
+# define Next(p) CharNext(p)
+#elif defined(DJGPP)
+# define Next(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
+#elif defined(__EMX__)
+# define Next(p) ((p) + emx_mblen(p))
+static inline int
+emx_mblen(const char *p)
+{
+    int n = mblen(p, RUBY_MBCHAR_MAXSIZE);
+    return (n < 0) ? 1 : n;
+}
+#endif
+
+#ifndef Next /* single byte environment */
+# define Next(p) ((p) + 1)
+# define Inc(p) (++(p))
+# define Compare(p1, p2) (compare(downcase(*(p1)), downcase(*(p2))))
+#else /* multi byte environment */
+# define Inc(p) ((p) = Next(p))
+# define Compare(p1, p2) (CompareImpl(p1, p2, nocase))
+static int
+CompareImpl(const char *p1, const char *p2, int nocase)
+{
+    const int len1 = Next(p1) - p1;
+    const int len2 = Next(p2) - p2;
+#ifdef _WIN32
+    char buf1[10], buf2[10]; /* large enough? */
+#endif
+
+    if (len1 < 0 || len2 < 0) {
+	rb_fatal("CompareImpl: negative len");
+    }
+
+    if (len1 == 0) return  len2;
+    if (len2 == 0) return -len1;
+
+#ifdef _WIN32
+    if (nocase && rb_w32_iswinnt()) {
+	if (len1 > 1) {
+	    if (len1 >= sizeof(buf1)) {
+		rb_fatal("CompareImpl: too large len");
+	    }
+	    memcpy(buf1, p1, len1);
+	    buf1[len1] = '\0';
+	    CharLower(buf1);
+	    p1 = buf1; /* trick */
+	}
+	if (len2 > 1) {
+	    if (len2 >= sizeof(buf2)) {
+		rb_fatal("CompareImpl: too large len");
+	    }
+	    memcpy(buf2, p2, len2);
+	    buf2[len2] = '\0';
+	    CharLower(buf2);
+	    p2 = buf2; /* trick */
+	}
+    }
+#endif
+    if (len1 == 1)
+	if (len2 == 1)
+	    return compare(downcase(*p1), downcase(*p2));
+	else {
+	    const int ret = compare(downcase(*p1), *p2);
+	    return ret ? ret : -1;
+	}
+    else
+	if (len2 == 1) {
+	    const int ret = compare(*p1, downcase(*p2));
+	    return ret ? ret : 1;
+	}
+	else {
+	    const int ret = memcmp(p1, p2, len1 < len2 ? len1 : len2);
+	    return ret ? ret : len1 - len2;
+	}
+}
+#endif /* environment */
+
+static char *
+bracket(p, s, flags)
+    const char *p; /* pattern (next to '[') */
+    const char *s; /* string */
+    int flags;
+{
+    const int nocase = flags & FNM_CASEFOLD;
+    const int escape = !(flags & FNM_NOESCAPE);
+
+    int ok = 0, not = 0;
+
+    if (*p == '!' || *p == '^') {
+	not = 1;
+	p++;
+    }
+
+    while (*p != ']') {
+	const char *t1 = p;
+	if (escape && *t1 == '\\')
+	    t1++;
+	if (!*t1)
+	    return NULL;
+	p = Next(t1);
+	if (p[0] == '-' && p[1] != ']') {
+	    const char *t2 = p + 1;
+	    if (escape && *t2 == '\\')
+		t2++;
+	    if (!*t2)
+		return NULL;
+	    p = Next(t2);
+	    if (!ok && Compare(t1, s) <= 0 && Compare(s, t2) <= 0)
+		ok = 1;
+	}
+	else
+	    if (!ok && Compare(t1, s) == 0)
+		ok = 1;
+    }
+
+    return ok == not ? NULL : (char *)p + 1;
+}
+
+/* If FNM_PATHNAME is set, only path element will be matched. (upto '/' or '\0')
+   Otherwise, entire string will be matched.
+   End marker itself won't be compared.
+   And if function succeeds, *pcur reaches end marker.
+*/
+#define UNESCAPE(p) (escape && *(p) == '\\' ? (p) + 1 : (p))
+#define ISEND(p) (!*(p) || (pathname && *(p) == '/'))
+#define RETURN(val) return *pcur = p, *scur = s, (val);
+
+static int
+fnmatch_helper(pcur, scur, flags)
+    const char **pcur; /* pattern */
+    const char **scur; /* string */
+    int flags;
+{
+    const int period = !(flags & FNM_DOTMATCH);
+    const int pathname = flags & FNM_PATHNAME;
+    const int escape = !(flags & FNM_NOESCAPE);
+    const int nocase = flags & FNM_CASEFOLD;
+
+    const char *ptmp = 0;
+    const char *stmp = 0;
+
+    const char *p = *pcur;
+    const char *s = *scur;
+
+    if (period && *s == '.' && *UNESCAPE(p) != '.') /* leading period */
+	RETURN(FNM_NOMATCH);
+
+    while (1) {
+	switch (*p) {
+	  case '*':
+	    do { p++; } while (*p == '*');
+	    if (ISEND(UNESCAPE(p))) {
+		p = UNESCAPE(p);
+		RETURN(0);
+	    }
+	    if (ISEND(s))
+		RETURN(FNM_NOMATCH);
+	    ptmp = p;
+	    stmp = s;
+	    continue;
+
+	  case '?':
+	    if (ISEND(s))
+		RETURN(FNM_NOMATCH);
+	    p++;
+	    Inc(s);
+	    continue;
+
+	  case '[': {
+	    const char *t;
+	    if (ISEND(s))
+		RETURN(FNM_NOMATCH);
+	    if (t = bracket(p + 1, s, flags)) {
+		p = t;
+		Inc(s);
+		continue;
+	    }
+	    goto failed;
+	  }
+	}
+
+	/* ordinary */
+	p = UNESCAPE(p);
+	if (ISEND(s))
+	    RETURN(ISEND(p) ? 0 : FNM_NOMATCH);
+	if (ISEND(p))
+	    goto failed;
+	if (Compare(p, s) != 0)
+	    goto failed;
+	Inc(p);
+	Inc(s);
+	continue;
+
+      failed: /* try next '*' position */
+	if (ptmp && stmp) {
+	    p = ptmp;
+	    Inc(stmp); /* !ISEND(*stmp) */
+	    s = stmp;
+	    continue;
+	}
+	RETURN(FNM_NOMATCH);
+    }
+}
+
+static int
+fnmatch(p, s, flags)
+    const char *p; /* pattern */
+    const char *s; /* string */
+    int flags;
+{
+    const int period = !(flags & FNM_DOTMATCH);
+    const int pathname = flags & FNM_PATHNAME;
+
+    const char *ptmp = 0;
+    const char *stmp = 0;
+
+    if (pathname) {
+	while (1) {
+	    if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
+		do { p += 3; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
+		ptmp = p;
+		stmp = s;
+	    }
+	    if (fnmatch_helper(&p, &s, flags) == 0) {
+		while (*s && *s != '/') Inc(s);
+		if (*p && *s) {
+		    p++;
+		    s++;
+		    continue;
+		}
+		if (!*p && !*s)
+		    return 0;
+	    }
+	    /* failed : try next recursion */
+	    if (ptmp && stmp && !(period && *stmp == '.')) {
+		while (*stmp && *stmp != '/') Inc(stmp);
+		if (*stmp) {
+		    p = ptmp;
+		    stmp++;
+		    s = stmp;
+		    continue;
+		}
+	    }
+	    return FNM_NOMATCH;
+	}
+    }
+    else
+	return fnmatch_helper(&p, &s, flags);
+}
+
+VALUE rb_cDir;
+
+struct dir_data {
+    DIR *dir;
+    char *path;
+};
+
+static void
+free_dir(dir)
+    struct dir_data *dir;
+{
+    if (dir) {
+	if (dir->dir) closedir(dir->dir);
+	if (dir->path) free(dir->path);
+    }
+    free(dir);
+}
+
+static VALUE dir_close _((VALUE));
+
+static VALUE dir_s_alloc _((VALUE));
+static VALUE
+dir_s_alloc(klass)
+    VALUE klass;
+{
+    struct dir_data *dirp;
+    VALUE obj = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dirp);
+
+    dirp->dir = NULL;
+    dirp->path = NULL;
+
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     Dir.new( string ) -> aDir
+ *
+ *  Returns a new directory object for the named directory.
+ */
+static VALUE
+dir_initialize(dir, dirname)
+    VALUE dir, dirname;
+{
+    struct dir_data *dp;
+
+    SafeStringValue(dirname);
+    Data_Get_Struct(dir, struct dir_data, dp);
+    if (dp->dir) closedir(dp->dir);
+    if (dp->path) free(dp->path);
+    dp->dir = NULL;
+    dp->path = NULL;
+    dp->dir = opendir(RSTRING(dirname)->ptr);
+    if (dp->dir == NULL) {
+	if (errno == EMFILE || errno == ENFILE) {
+	    rb_gc();
+	    dp->dir = opendir(RSTRING(dirname)->ptr);
+	}
+	if (dp->dir == NULL) {
+	    rb_sys_fail(RSTRING(dirname)->ptr);
+	}
+    }
+    dp->path = strdup(RSTRING(dirname)->ptr);
+
+    return dir;
+}
+
+/*
+ *  call-seq:
+ *     Dir.open( string ) => aDir
+ *     Dir.open( string ) {| aDir | block } => anObject
+ *
+ *  With no block, <code>open</code> is a synonym for
+ *  <code>Dir::new</code>. If a block is present, it is passed
+ *  <i>aDir</i> as a parameter. The directory is closed at the end of
+ *  the block, and <code>Dir::open</code> returns the value of the
+ *  block.
+ */
+
+static VALUE
+dir_s_open(klass, dirname)
+    VALUE klass, dirname;
+{
+    struct dir_data *dp;
+    VALUE dir = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dp);
+
+    dir_initialize(dir, dirname);
+    if (rb_block_given_p()) {
+	return rb_ensure(rb_yield, dir, dir_close, dir);
+    }
+
+    return dir;
+}
+
+static void
+dir_closed()
+{
+    rb_raise(rb_eIOError, "closed directory");
+}
+
+static void
+dir_check(dir)
+    VALUE dir;
+{
+    if (!OBJ_TAINTED(dir) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: operation on untainted Dir");
+    rb_check_frozen(dir);
+}
+
+#define GetDIR(obj, dirp) do {\
+    dir_check(dir);\
+    Data_Get_Struct(obj, struct dir_data, dirp);\
+    if (dirp->dir == NULL) dir_closed();\
+} while (0)
+
+/*
+ *  call-seq:
+ *     dir.inspect => string
+ *
+ *  Return a string describing this Dir object.
+ */
+static VALUE
+dir_inspect(dir)
+    VALUE dir;
+{
+    struct dir_data *dirp;
+
+    GetDIR(dir, dirp);
+    if (dirp->path) {
+	char *c = rb_obj_classname(dir);
+	int len = strlen(c) + strlen(dirp->path) + 4;
+	VALUE s = rb_str_new(0, len);
+	snprintf(RSTRING_PTR(s), len+1, "#<%s:%s>", c, dirp->path);
+	return s;
+    }
+    return rb_funcall(dir, rb_intern("to_s"), 0, 0);
+}
+
+/*
+ *  call-seq:
+ *     dir.path => string or nil
+ *
+ *  Returns the path parameter passed to <em>dir</em>'s constructor.
+ *
+ *     d = Dir.new("..")
+ *     d.path   #=> ".."
+ */
+static VALUE
+dir_path(dir)
+    VALUE dir;
+{
+    struct dir_data *dirp;
+
+    GetDIR(dir, dirp);
+    if (!dirp->path) return Qnil;
+    return rb_str_new2(dirp->path);
+}
+
+/*
+ *  call-seq:
+ *     dir.read => string or nil
+ *
+ *  Reads the next entry from <em>dir</em> and returns it as a string.
+ *  Returns <code>nil</code> at the end of the stream.
+ *
+ *     d = Dir.new("testdir")
+ *     d.read   #=> "."
+ *     d.read   #=> ".."
+ *     d.read   #=> "config.h"
+ */
+static VALUE
+dir_read(dir)
+    VALUE dir;
+{
+    struct dir_data *dirp;
+    struct dirent *dp;
+
+    GetDIR(dir, dirp);
+    errno = 0;
+    dp = readdir(dirp->dir);
+    if (dp) {
+	return rb_tainted_str_new(dp->d_name, NAMLEN(dp));
+    }
+    else if (errno == 0) {	/* end of stream */
+	return Qnil;
+    }
+    else {
+	rb_sys_fail(0);
+    }
+    return Qnil;		/* not reached */
+}
+
+/*
+ *  call-seq:
+ *     dir.each { |filename| block }  => dir
+ *
+ *  Calls the block once for each entry in this directory, passing the
+ *  filename of each entry as a parameter to the block.
+ *
+ *     d = Dir.new("testdir")
+ *     d.each  {|x| puts "Got #{x}" }
+ *
+ *  <em>produces:</em>
+ *
+ *     Got .
+ *     Got ..
+ *     Got config.h
+ *     Got main.rb
+ */
+static VALUE
+dir_each(dir)
+    VALUE dir;
+{
+    struct dir_data *dirp;
+    struct dirent *dp;
+
+    GetDIR(dir, dirp);
+    rewinddir(dirp->dir);
+    for (dp = readdir(dirp->dir); dp != NULL; dp = readdir(dirp->dir)) {
+	rb_yield(rb_tainted_str_new(dp->d_name, NAMLEN(dp)));
+	if (dirp->dir == NULL) dir_closed();
+    }
+    return dir;
+}
+
+/*
+ *  call-seq:
+ *     dir.pos => integer
+ *     dir.tell => integer
+ *
+ *  Returns the current position in <em>dir</em>. See also
+ *  <code>Dir#seek</code>.
+ *
+ *     d = Dir.new("testdir")
+ *     d.tell   #=> 0
+ *     d.read   #=> "."
+ *     d.tell   #=> 12
+ */
+static VALUE
+dir_tell(dir)
+    VALUE dir;
+{
+#ifdef HAVE_TELLDIR
+    struct dir_data *dirp;
+    long pos;
+
+    GetDIR(dir, dirp);
+    pos = telldir(dirp->dir);
+    return rb_int2inum(pos);
+#else
+    rb_notimplement();
+#endif
+}
+
+/*
+ *  call-seq:
+ *     dir.seek( integer ) => dir
+ *
+ *  Seeks to a particular location in <em>dir</em>. <i>integer</i>
+ *  must be a value returned by <code>Dir#tell</code>.
+ *
+ *     d = Dir.new("testdir")   #=> #<Dir:0x401b3c40>
+ *     d.read                   #=> "."
+ *     i = d.tell               #=> 12
+ *     d.read                   #=> ".."
+ *     d.seek(i)                #=> #<Dir:0x401b3c40>
+ *     d.read                   #=> ".."
+ */
+static VALUE
+dir_seek(dir, pos)
+    VALUE dir, pos;
+{
+    struct dir_data *dirp;
+    off_t p = NUM2OFFT(pos);
+
+    GetDIR(dir, dirp);
+#ifdef HAVE_SEEKDIR
+    seekdir(dirp->dir, p);
+    return dir;
+#else
+    rb_notimplement();
+#endif
+}
+
+/*
+ *  call-seq:
+ *     dir.pos( integer ) => integer
+ *
+ *  Synonym for <code>Dir#seek</code>, but returns the position
+ *  parameter.
+ *
+ *     d = Dir.new("testdir")   #=> #<Dir:0x401b3c40>
+ *     d.read                   #=> "."
+ *     i = d.pos                #=> 12
+ *     d.read                   #=> ".."
+ *     d.pos = i                #=> 12
+ *     d.read                   #=> ".."
+ */
+static VALUE
+dir_set_pos(dir, pos)
+    VALUE dir, pos;
+{
+    dir_seek(dir, pos);
+    return pos;
+}
+
+/*
+ *  call-seq:
+ *     dir.rewind => dir
+ *
+ *  Repositions <em>dir</em> to the first entry.
+ *
+ *     d = Dir.new("testdir")
+ *     d.read     #=> "."
+ *     d.rewind   #=> #<Dir:0x401b3fb0>
+ *     d.read     #=> "."
+ */
+static VALUE
+dir_rewind(dir)
+    VALUE dir;
+{
+    struct dir_data *dirp;
+
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(dir)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't close");
+    }
+    GetDIR(dir, dirp);
+    rewinddir(dirp->dir);
+    return dir;
+}
+
+/*
+ *  call-seq:
+ *     dir.close => nil
+ *
+ *  Closes the directory stream. Any further attempts to access
+ *  <em>dir</em> will raise an <code>IOError</code>.
+ *
+ *     d = Dir.new("testdir")
+ *     d.close   #=> nil
+ */
+static VALUE
+dir_close(dir)
+    VALUE dir;
+{
+    struct dir_data *dirp;
+
+    GetDIR(dir, dirp);
+    closedir(dirp->dir);
+    dirp->dir = NULL;
+
+    return Qnil;
+}
+
+static void
+dir_chdir(path)
+    VALUE path;
+{
+    if (chdir(RSTRING(path)->ptr) < 0)
+	rb_sys_fail(RSTRING(path)->ptr);
+}
+
+static int chdir_blocking = 0;
+static VALUE chdir_thread = Qnil;
+
+struct chdir_data {
+    VALUE old_path, new_path;
+    int done;
+};
+
+static VALUE
+chdir_yield(args)
+    struct chdir_data *args;
+{
+    dir_chdir(args->new_path);
+    args->done = Qtrue;
+    chdir_blocking++;
+    if (chdir_thread == Qnil)
+	chdir_thread = rb_thread_current();
+    return rb_yield(args->new_path);
+}
+
+static VALUE
+chdir_restore(args)
+    struct chdir_data *args;
+{
+    if (args->done) {
+	chdir_blocking--;
+	if (chdir_blocking == 0)
+	    chdir_thread = Qnil;
+	dir_chdir(args->old_path);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     Dir.chdir( [ string] ) => 0
+ *     Dir.chdir( [ string] ) {| path | block }  => anObject
+ *
+ *  Changes the current working directory of the process to the given
+ *  string. When called without an argument, changes the directory to
+ *  the value of the environment variable <code>HOME</code>, or
+ *  <code>LOGDIR</code>. <code>SystemCallError</code> (probably
+ *  <code>Errno::ENOENT</code>) if the target directory does not exist.
+ *
+ *  If a block is given, it is passed the name of the new current
+ *  directory, and the block is executed with that as the current
+ *  directory. The original working directory is restored when the block
+ *  exits. The return value of <code>chdir</code> is the value of the
+ *  block. <code>chdir</code> blocks can be nested, but in a
+ *  multi-threaded program an error will be raised if a thread attempts
+ *  to open a <code>chdir</code> block while another thread has one
+ *  open.
+ *
+ *     Dir.chdir("/var/spool/mail")
+ *     puts Dir.pwd
+ *     Dir.chdir("/tmp") do
+ *       puts Dir.pwd
+ *       Dir.chdir("/usr") do
+ *         puts Dir.pwd
+ *       end
+ *       puts Dir.pwd
+ *     end
+ *     puts Dir.pwd
+ *
+ *  <em>produces:</em>
+ *
+ *     /var/spool/mail
+ *     /tmp
+ *     /usr
+ *     /tmp
+ *     /var/spool/mail
+ */
+static VALUE
+dir_s_chdir(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE path = Qnil;
+
+    rb_secure(2);
+    if (rb_scan_args(argc, argv, "01", &path) == 1) {
+	SafeStringValue(path);
+    }
+    else {
+	const char *dist = getenv("HOME");
+	if (!dist) {
+	    dist = getenv("LOGDIR");
+	    if (!dist) rb_raise(rb_eArgError, "HOME/LOGDIR not set");
+	}
+	path = rb_str_new2(dist);
+    }
+
+    if (chdir_blocking > 0) {
+	if (!rb_block_given_p() || rb_thread_current() != chdir_thread)
+	    rb_warn("conflicting chdir during another chdir block");
+    }
+
+    if (rb_block_given_p()) {
+	struct chdir_data args;
+	char *cwd = my_getcwd();
+
+	args.old_path = rb_tainted_str_new2(cwd); free(cwd);
+	args.new_path = path;
+	args.done = Qfalse;
+	return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
+    }
+    dir_chdir(path);
+
+    return INT2FIX(0);
+}
+
+/*
+ *  call-seq:
+ *     Dir.getwd => string
+ *     Dir.pwd => string
+ *
+ *  Returns the path to the current working directory of this process as
+ *  a string.
+ *
+ *     Dir.chdir("/tmp")   #=> 0
+ *     Dir.getwd           #=> "/tmp"
+ */
+static VALUE
+dir_s_getwd(dir)
+    VALUE dir;
+{
+    char *path;
+    VALUE cwd;
+
+    rb_secure(4);
+    path = my_getcwd();
+    cwd = rb_tainted_str_new2(path);
+
+    free(path);
+    return cwd;
+}
+
+static void check_dirname _((volatile VALUE *));
+static void
+check_dirname(dir)
+    volatile VALUE *dir;
+{
+    char *path, *pend;
+
+    SafeStringValue(*dir);
+    rb_secure(2);
+    path = RSTRING(*dir)->ptr;
+    if (path && *(pend = rb_path_end(rb_path_skip_prefix(path)))) {
+	*dir = rb_str_new(path, pend - path);
+    }
+}
+
+/*
+ *  call-seq:
+ *     Dir.chroot( string ) => 0
+ *
+ *  Changes this process's idea of the file system root. Only a
+ *  privileged process may make this call. Not available on all
+ *  platforms. On Unix systems, see <code>chroot(2)</code> for more
+ *  information.
+ */
+static VALUE
+dir_s_chroot(dir, path)
+    VALUE dir, path;
+{
+#if defined(HAVE_CHROOT) && !defined(__CHECKER__)
+    check_dirname(&path);
+
+    if (chroot(RSTRING(path)->ptr) == -1)
+	rb_sys_fail(RSTRING(path)->ptr);
+
+    return INT2FIX(0);
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
+#endif
+}
+
+/*
+ *  call-seq:
+ *     Dir.mkdir( string [, integer] ) => 0
+ *
+ *  Makes a new directory named by <i>string</i>, with permissions
+ *  specified by the optional parameter <i>anInteger</i>. The
+ *  permissions may be modified by the value of
+ *  <code>File::umask</code>, and are ignored on NT. Raises a
+ *  <code>SystemCallError</code> if the directory cannot be created. See
+ *  also the discussion of permissions in the class documentation for
+ *  <code>File</code>.
+ *
+ */
+static VALUE
+dir_s_mkdir(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE path, vmode;
+    int mode;
+
+    if (rb_scan_args(argc, argv, "11", &path, &vmode) == 2) {
+	mode = NUM2INT(vmode);
+    }
+    else {
+	mode = 0777;
+    }
+
+    check_dirname(&path);
+    if (mkdir(RSTRING(path)->ptr, mode) == -1)
+	rb_sys_fail(RSTRING(path)->ptr);
+
+    return INT2FIX(0);
+}
+
+/*
+ *  call-seq:
+ *     Dir.delete( string ) => 0
+ *     Dir.rmdir( string ) => 0
+ *     Dir.unlink( string ) => 0
+ *
+ *  Deletes the named directory. Raises a subclass of
+ *  <code>SystemCallError</code> if the directory isn't empty.
+ */
+static VALUE
+dir_s_rmdir(obj, dir)
+    VALUE obj, dir;
+{
+    check_dirname(&dir);
+    if (rmdir(RSTRING(dir)->ptr) < 0)
+	rb_sys_fail(RSTRING(dir)->ptr);
+
+    return INT2FIX(0);
+}
+
+static void
+sys_warning_1(mesg)
+    const char* mesg;
+{
+    rb_sys_warning("%s", mesg);
+}
+
+#define GLOB_VERBOSE	(1UL << (sizeof(int) * CHAR_BIT - 1))
+#define sys_warning(val) \
+    (void)((flags & GLOB_VERBOSE) && rb_protect((VALUE (*)_((VALUE)))sys_warning_1, (VALUE)(val), 0))
+
+#define GLOB_ALLOC(type) (type *)malloc(sizeof(type))
+#define GLOB_ALLOC_N(type, n) (type *)malloc(sizeof(type) * (n))
+#define GLOB_JUMP_TAG(status) ((status == -1) ? rb_memerror() : rb_jump_tag(status))
+
+/*
+ * ENOTDIR can be returned by stat(2) if a non-leaf element of the path
+ * is not a directory.
+ */
+#define to_be_ignored(e) ((e) == ENOENT || (e) == ENOTDIR)
+
+/* System call with warning */
+static int
+do_stat(const char *path, struct stat *pst, int flags)
+
+{
+    int ret = stat(path, pst);
+    if (ret < 0 && !to_be_ignored(errno))
+	sys_warning(path);
+
+    return ret;
+}
+
+static int
+do_lstat(const char *path, struct stat *pst, int flags)
+{
+    int ret = lstat(path, pst);
+    if (ret < 0 && !to_be_ignored(errno))
+	sys_warning(path);
+
+    return ret;
+}
+
+static DIR *
+do_opendir(const char *path, int flags)
+{
+    DIR *dirp = opendir(path);
+    if (dirp == NULL && !to_be_ignored(errno))
+	sys_warning(path);
+
+    return dirp;
+}
+
+/* Return nonzero if S has any special globbing chars in it.  */
+static int
+has_magic(s, flags)
+    const char *s;
+    int flags;
+{
+    const int escape = !(flags & FNM_NOESCAPE);
+    const int nocase = flags & FNM_CASEFOLD;
+
+    register const char *p = s;
+    register char c;
+
+    while (c = *p++) {
+	switch (c) {
+	  case '*':
+	  case '?':
+	  case '[':
+	    return 1;
+
+	  case '\\':
+	    if (escape && !(c = *p++))
+		return 0;
+	    continue;
+
+	  default:
+	    if (!FNM_SYSCASE && ISALPHA(c) && nocase)
+		return 1;
+	}
+
+	p = Next(p-1);
+    }
+
+    return 0;
+}
+
+/* Find separator in globbing pattern. */
+static char *
+find_dirsep(const char *s, int flags)
+{
+    const int escape = !(flags & FNM_NOESCAPE);
+
+    register const char *p = s;
+    register char c;
+    int open = 0;
+
+    while (c = *p++) {
+	switch (c) {
+	  case '[':
+	    open = 1;
+	    continue;
+	  case ']':
+	    open = 0;
+	    continue;
+
+	  case '/':
+	    if (!open)
+		return (char *)p-1;
+	    continue;
+
+	  case '\\':
+	    if (escape && !(c = *p++))
+		return (char *)p-1;
+	    continue;
+	}
+
+	p = Next(p-1);
+    }
+
+    return (char *)p-1;
+}
+
+/* Remove escaping backslashes */
+static void
+remove_backslashes(p)
+    char *p;
+{
+    char *t = p;
+    char *s = p;
+
+    while (*p) {
+	if (*p == '\\') {
+	    if (t != s)
+		memmove(t, s, p - s);
+	    t += p - s;
+	    s = ++p;
+	    if (!*p) break;
+	}
+	Inc(p);
+    }
+
+    while (*p++);
+
+    if (t != s)
+	memmove(t, s, p - s); /* move '\0' too */
+}
+
+/* Globing pattern */
+enum glob_pattern_type { PLAIN, MAGICAL, RECURSIVE, MATCH_ALL, MATCH_DIR };
+
+struct glob_pattern {
+    char *str;
+    enum glob_pattern_type type;
+    struct glob_pattern *next;
+};
+
+static void glob_free_pattern(struct glob_pattern *list);
+
+static struct glob_pattern *
+glob_make_pattern(const char *p, int flags)
+{
+    struct glob_pattern *list, *tmp, **tail = &list;
+    int dirsep = 0; /* pattern is terminated with '/' */
+
+    while (*p) {
+	tmp = GLOB_ALLOC(struct glob_pattern);
+	if (!tmp) goto error;
+	if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
+	    /* fold continuous RECURSIVEs (needed in glob_helper) */
+	    do { p += 3; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
+	    tmp->type = RECURSIVE;
+	    tmp->str = 0;
+	    dirsep = 1;
+	}
+	else {
+	    const char *m = find_dirsep(p, flags);
+	    char *buf = GLOB_ALLOC_N(char, m-p+1);
+	    if (!buf) {
+		free(tmp);
+		goto error;
+	    }
+	    memcpy(buf, p, m-p);
+	    buf[m-p] = '\0';
+	    tmp->type = has_magic(buf, flags) ? MAGICAL : PLAIN;
+	    tmp->str = buf;
+	    if (*m) {
+		dirsep = 1;
+		p = m + 1;
+	    }
+	    else {
+		dirsep = 0;
+		p = m;
+	    }
+	}
+	*tail = tmp;
+	tail = &tmp->next;
+    }
+
+    tmp = GLOB_ALLOC(struct glob_pattern);
+    if (!tmp) {
+      error:
+	*tail = 0;
+	glob_free_pattern(list);
+	return 0;
+    }
+    tmp->type = dirsep ? MATCH_DIR : MATCH_ALL;
+    tmp->str = 0;
+    *tail = tmp;
+    tmp->next = 0;
+
+    return list;
+}
+
+static void
+glob_free_pattern(struct glob_pattern *list)
+{
+    while (list) {
+	struct glob_pattern *tmp = list;
+	list = list->next;
+	if (tmp->str)
+	    free(tmp->str);
+	free(tmp);
+    }
+}
+
+static char *
+join_path(const char *path, int dirsep, const char *name)
+{
+    long len = strlen(path);
+    char *buf = GLOB_ALLOC_N(char, len+strlen(name)+(dirsep?1:0)+1);
+
+    if (!buf) return 0;
+    memcpy(buf, path, len);
+    if (dirsep) {
+	strcpy(buf+len, "/");
+	len++;
+    }
+    strcpy(buf+len, name);
+    return buf;
+}
+
+enum answer { YES, NO, UNKNOWN };
+
+#ifndef S_ISLNK
+#  ifndef S_IFLNK
+#    define S_ISLNK(m) (0)
+#  else
+#    define S_ISLNK(m) ((m & S_IFMT) == S_IFLNK)
+#  endif
+#endif
+
+#ifndef S_ISDIR
+#   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
+#endif
+
+struct glob_args {
+    void (*func) _((const char*, VALUE));
+    const char *c;
+    VALUE v;
+};
+
+static VALUE glob_func_caller _((VALUE));
+
+static VALUE
+glob_func_caller(val)
+    VALUE val;
+{
+    struct glob_args *args = (struct glob_args *)val;
+
+    (*args->func)(args->c, args->v);
+    return Qnil;
+}
+
+#define glob_call_func(func, path, arg) (*func)(path, arg)
+
+static int glob_helper _((const char *, int, enum answer, enum answer, struct glob_pattern **, struct glob_pattern **, int, ruby_glob_func *, VALUE));
+
+static int
+glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
+    const char *path;
+    int dirsep; /* '/' should be placed before appending child entry's name to 'path'. */
+    enum answer exist; /* Does 'path' indicate an existing entry? */
+    enum answer isdir; /* Does 'path' indicate a directory or a symlink to a directory? */
+    struct glob_pattern **beg;
+    struct glob_pattern **end;
+    int flags;
+    ruby_glob_func *func;
+    VALUE arg;
+{
+    struct stat st;
+    int status = 0;
+    struct glob_pattern **cur, **new_beg, **new_end;
+    int plain = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0;
+    int escape = !(flags & FNM_NOESCAPE);
+
+    for (cur = beg; cur < end; ++cur) {
+	struct glob_pattern *p = *cur;
+	if (p->type == RECURSIVE) {
+	    recursive = 1;
+	    p = p->next;
+	}
+	switch (p->type) {
+	case PLAIN:
+	    plain = 1;
+	    break;
+	case MAGICAL:
+	    magical = 1;
+	    break;
+	case MATCH_ALL:
+	    match_all = 1;
+	    break;
+	case MATCH_DIR:
+	    match_dir = 1;
+	    break;
+	case RECURSIVE:
+	    rb_bug("continuous RECURSIVEs");
+	}
+    }
+
+    if (*path) {
+	if (match_all && exist == UNKNOWN) {
+	    if (do_lstat(path, &st, flags) == 0) {
+		exist = YES;
+		isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
+	    }
+	    else {
+		exist = NO;
+		isdir = NO;
+	    }
+	}
+	if (match_dir && isdir == UNKNOWN) {
+	    if (do_stat(path, &st, flags) == 0) {
+		exist = YES;
+		isdir = S_ISDIR(st.st_mode) ? YES : NO;
+	    }
+	    else {
+		exist = NO;
+		isdir = NO;
+	    }
+	}
+	if (match_all && exist == YES) {
+	    status = glob_call_func(func, path, arg);
+	    if (status) return status;
+	}
+	if (match_dir && isdir == YES) {
+	    char *tmp = join_path(path, dirsep, "");
+	    if (!tmp) return -1;
+	    status = glob_call_func(func, tmp, arg);
+	    free(tmp);
+	    if (status) return status;
+	}
+    }
+
+    if (exist == NO || isdir == NO) return 0;
+
+    if (magical || recursive) {
+	struct dirent *dp;
+	DIR *dirp = do_opendir(*path ? path : ".", flags);
+	if (dirp == NULL) return 0;
+
+	for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
+	    char *buf = join_path(path, dirsep, dp->d_name);
+	    enum answer new_isdir = UNKNOWN;
+
+	    if (!buf) {
+		status = -1;
+		break;
+	    }
+	    if (recursive && strcmp(dp->d_name, ".") != 0 && strcmp(dp->d_name, "..") != 0
+		&& fnmatch("*", dp->d_name, flags) == 0) {
+#ifndef _WIN32
+		if (do_lstat(buf, &st, flags) == 0)
+		    new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
+		else
+		    new_isdir = NO;
+#else
+		new_isdir = dp->d_isdir ? (!dp->d_isrep ? YES : UNKNOWN) : NO;
+#endif
+	    }
+
+	    new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2);
+	    if (!new_beg) {
+		status = -1;
+		break;
+	    }
+
+	    for (cur = beg; cur < end; ++cur) {
+		struct glob_pattern *p = *cur;
+		if (p->type == RECURSIVE) {
+		    if (new_isdir == YES) /* not symlink but real directory */
+			*new_end++ = p; /* append recursive pattern */
+		    p = p->next; /* 0 times recursion */
+		}
+		if (p->type == PLAIN || p->type == MAGICAL) {
+		    if (fnmatch(p->str, dp->d_name, flags) == 0)
+			*new_end++ = p->next;
+		}
+	    }
+
+	    status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end, flags, func, arg);
+	    free(buf);
+	    free(new_beg);
+	    if (status) break;
+	}
+
+	closedir(dirp);
+    }
+    else if (plain) {
+	struct glob_pattern **copy_beg, **copy_end, **cur2;
+
+	copy_beg = copy_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
+	if (!copy_beg) return -1;
+	for (cur = beg; cur < end; ++cur)
+	    *copy_end++ = (*cur)->type == PLAIN ? *cur : 0;
+
+	for (cur = copy_beg; cur < copy_end; ++cur) {
+	    if (*cur) {
+		char *buf;
+		char *name;
+		name = GLOB_ALLOC_N(char, strlen((*cur)->str) + 1);
+		if (!name) {
+		    status = -1;
+		    break;
+		}
+		strcpy(name, (*cur)->str);
+		if (escape) remove_backslashes(name);
+
+		new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
+		if (!new_beg) {
+		    free(name);
+		    status = -1;
+		    break;
+		}
+		*new_end++ = (*cur)->next;
+		for (cur2 = cur + 1; cur2 < copy_end; ++cur2) {
+		    if (*cur2 && fnmatch((*cur2)->str, name, flags) == 0) {
+			*new_end++ = (*cur2)->next;
+			*cur2 = 0;
+		    }
+		}
+
+		buf = join_path(path, dirsep, name);
+		free(name);
+		if (!buf) {
+		    free(new_beg);
+		    status = -1;
+		    break;
+		}
+		status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg, new_end, flags, func, arg);
+		free(buf);
+		free(new_beg);
+		if (status) break;
+	    }
+	}
+
+	free(copy_beg);
+    }
+
+    return status;
+}
+
+static int
+ruby_glob0(path, flags, func, arg)
+    const char *path;
+    int flags;
+    ruby_glob_func *func;
+    VALUE arg;
+{
+    struct glob_pattern *list;
+    const char *root, *start;
+    char *buf;
+    int n;
+    int status;
+
+    start = root = path;
+    flags |= FNM_SYSCASE;
+#if defined DOSISH
+    root = rb_path_skip_prefix(root);
+#endif
+
+    if (root && *root == '/') root++;
+
+    n = root - start;
+    buf = GLOB_ALLOC_N(char, n + 1);
+    if (!buf) return -1;
+    MEMCPY(buf, start, char, n);
+    buf[n] = '\0';
+
+    list = glob_make_pattern(root, flags);
+    if (!list) {
+	free(buf);
+	return -1;
+    }
+    status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg);
+    glob_free_pattern(list);
+    free(buf);
+
+    return status;
+}
+
+int
+ruby_glob(path, flags, func, arg)
+    const char *path;
+    int flags;
+    ruby_glob_func *func;
+    VALUE arg;
+{
+    return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg);
+}
+
+static int rb_glob_caller _((const char *, VALUE));
+
+static int
+rb_glob_caller(path, a)
+    const char *path;
+    VALUE a;
+{
+    int status;
+    struct glob_args *args = (struct glob_args *)a;
+
+    args->c = path;
+    rb_protect(glob_func_caller, a, &status);
+    return status;
+}
+
+static int
+rb_glob2(path, flags, func, arg)
+    const char *path;
+    int flags;
+    void (*func) _((const char *, VALUE));
+    VALUE arg;
+{
+    struct glob_args args;
+
+    args.func = func;
+    args.v = arg;
+
+    if (flags & FNM_SYSCASE) {
+	rb_warning("Dir.glob() ignores File::FNM_CASEFOLD");
+    }
+
+    return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
+}
+
+void
+rb_glob(path, func, arg)
+    const char *path;
+    void (*func) _((const char*, VALUE));
+    VALUE arg;
+{
+    int status = rb_glob2(path, 0, func, arg);
+    if (status) GLOB_JUMP_TAG(status);
+}
+
+static void push_pattern _((const char* path, VALUE ary));
+static void
+push_pattern(path, ary)
+    const char *path;
+    VALUE ary;
+{
+    rb_ary_push(ary, rb_tainted_str_new2(path));
+}
+
+int
+ruby_brace_expand(str, flags, func, arg)
+    const char *str;
+    int flags;
+    ruby_glob_func *func;
+    VALUE arg;
+{
+    const int escape = !(flags & FNM_NOESCAPE);
+    const char *p = str;
+    const char *s = p;
+    const char *lbrace = 0, *rbrace = 0;
+    int nest = 0, status = 0;
+
+    while (*p) {
+	if (*p == '{' && nest++ == 0) {
+	    lbrace = p;
+	}
+	if (*p == '}' && --nest <= 0) {
+	    rbrace = p;
+	    break;
+	}
+	if (*p == '\\' && escape) {
+	    if (!*++p) break;
+	}
+	Inc(p);
+    }
+
+    if (lbrace && rbrace) {
+	char *buf = GLOB_ALLOC_N(char, strlen(s) + 1);
+	long shift;
+
+	if (!buf) return -1;
+	memcpy(buf, s, lbrace-s);
+	shift = (lbrace-s);
+	p = lbrace;
+	while (p < rbrace) {
+	    const char *t = ++p;
+	    nest = 0;
+	    while (p < rbrace && !(*p == ',' && nest == 0)) {
+		if (*p == '{') nest++;
+		if (*p == '}') nest--;
+		if (*p == '\\' && escape) {
+		    if (++p == rbrace) break;
+		}
+		Inc(p);
+	    }
+	    memcpy(buf+shift, t, p-t);
+	    strcpy(buf+shift+(p-t), rbrace+1);
+	    status = ruby_brace_expand(buf, flags, func, arg);
+	    if (status) break;
+	}
+	free(buf);
+    }
+    else if (!lbrace && !rbrace) {
+	status = (*func)(s, arg);
+    }
+
+    return status;
+}
+
+struct brace_args {
+    ruby_glob_func *func;
+    VALUE value;
+    int flags;
+};
+
+static int glob_brace _((const char *, VALUE));
+static int
+glob_brace(path, val)
+    const char *path;
+    VALUE val;
+{
+    struct brace_args *arg = (struct brace_args *)val;
+
+    return ruby_glob0(path, arg->flags, arg->func, arg->value);
+}
+
+static int
+ruby_brace_glob0(str, flags, func, arg)
+    const char *str;
+    int flags;
+    ruby_glob_func *func;
+    VALUE arg;
+{
+    struct brace_args args;
+
+    args.func = func;
+    args.value = arg;
+    args.flags = flags;
+    return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args);
+}
+
+int
+ruby_brace_glob(str, flags, func, arg)
+    const char *str;
+    int flags;
+    ruby_glob_func *func;
+    VALUE arg;
+{
+    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg);
+}
+
+static int
+push_glob(VALUE ary, const char *str, int flags)
+{
+    struct glob_args args;
+
+    args.func = push_pattern;
+    args.v = ary;
+    return ruby_brace_glob0(str, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
+}
+
+static VALUE
+rb_push_glob(str, flags) /* '\0' is delimiter */
+    VALUE str;
+    int flags;
+{
+    long offset = 0;
+    VALUE ary;
+
+    ary = rb_ary_new();
+    SafeStringValue(str);
+
+    while (offset < RSTRING_LEN(str)) {
+	int status = push_glob(ary, RSTRING(str)->ptr + offset, flags);
+	char *p, *pend;
+	if (status) GLOB_JUMP_TAG(status);
+	if (offset >= RSTRING_LEN(str)) break;
+	p = RSTRING(str)->ptr + offset;
+	p += strlen(p) + 1;
+	pend = RSTRING(str)->ptr + RSTRING_LEN(str);
+	while (p < pend && !*p)
+	    p++;
+	offset = p - RSTRING(str)->ptr;
+    }
+
+    return ary;
+}
+
+static VALUE
+dir_globs(argc, argv, flags)
+    long argc;
+    VALUE *argv;
+    int flags;
+{
+    VALUE ary = rb_ary_new();
+    long i;
+
+    for (i = 0; i < argc; ++i) {
+	int status;
+	VALUE str = argv[i];
+	StringValue(str);
+	status = push_glob(ary, RSTRING(str)->ptr, flags);
+	if (status) GLOB_JUMP_TAG(status);
+    }
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     Dir[ array ]                 => array
+ *     Dir[ string [, string ...] ] => array
+ *
+ *  Equivalent to calling
+ *  <code>Dir.glob(</code><i>array,</i><code>0)</code> and 
+ *  <code>Dir.glob([</code><i>string,...</i><code>],0)</code>.
+ *
+ */
+static VALUE
+dir_s_aref(int argc, VALUE *argv, VALUE obj)
+ {
+    if (argc == 1) {
+	return rb_push_glob(argv[0], 0);
+    }
+    return dir_globs(argc, argv, 0);
+ }
+
+/*
+ *  call-seq:
+ *     Dir.glob( pattern, [flags] ) => array
+ *     Dir.glob( pattern, [flags] ) {| filename | block }  => nil
+ *
+ *  Returns the filenames found by expanding <i>pattern</i> which is
+ *  an +Array+ of the patterns or the pattern +String+, either as an
+ *  <i>array</i> or as parameters to the block. Note that this pattern
+ *  is not a regexp (it's closer to a shell glob). See
+ *  <code>File::fnmatch</code> for the meaning of the <i>flags</i>
+ *  parameter. Note that case sensitivity depends on your system (so
+ *  <code>File::FNM_CASEFOLD</code> is ignored)
+ *
+ *  <code>*</code>::        Matches any file. Can be restricted by
+ *                          other values in the glob. <code>*</code>
+ *                          will match all files; <code>c*</code> will
+ *                          match all files beginning with
+ *                          <code>c</code>; <code>*c</code> will match
+ *                          all files ending with <code>c</code>; and
+ *                          <code>*c*</code> will match all files that
+ *                          have <code>c</code> in them (including at
+ *                          the beginning or end). Equivalent to
+ *                          <code>/ .* /x</code> in regexp.
+ *  <code>**</code>::       Matches directories recursively.
+ *  <code>?</code>::        Matches any one character. Equivalent to
+ *                          <code>/.{1}/</code> in regexp.
+ *  <code>[set]</code>::    Matches any one character in +set+.
+ *                          Behaves exactly like character sets in
+ *                          Regexp, including set negation
+ *                          (<code>[^a-z]</code>).
+ *  <code>{p,q}</code>::    Matches either literal <code>p</code> or
+ *                          literal <code>q</code>. Matching literals
+ *                          may be more than one character in length.
+ *                          More than two literals may be specified.
+ *                          Equivalent to pattern alternation in
+ *                          regexp.
+ *  <code>\</code>::        Escapes the next metacharacter.
+ *
+ *     Dir["config.?"]                     #=> ["config.h"]
+ *     Dir.glob("config.?")                #=> ["config.h"]
+ *     Dir.glob("*.[a-z][a-z]")            #=> ["main.rb"]
+ *     Dir.glob("*.[^r]*")                 #=> ["config.h"]
+ *     Dir.glob("*.{rb,h}")                #=> ["main.rb", "config.h"]
+ *     Dir.glob("*")                       #=> ["config.h", "main.rb"]
+ *     Dir.glob("*", File::FNM_DOTMATCH)   #=> [".", "..", "config.h", "main.rb"]
+ *
+ *     rbfiles = File.join("**", "*.rb")
+ *     Dir.glob(rbfiles)                   #=> ["main.rb",
+ *                                              "lib/song.rb",
+ *                                              "lib/song/karaoke.rb"]
+ *     libdirs = File.join("**", "lib")
+ *     Dir.glob(libdirs)                   #=> ["lib"]
+ *
+ *     librbfiles = File.join("**", "lib", "**", "*.rb")
+ *     Dir.glob(librbfiles)                #=> ["lib/song.rb",
+ *                                              "lib/song/karaoke.rb"]
+ *
+ *     librbfiles = File.join("**", "lib", "*.rb")
+ *     Dir.glob(librbfiles)                #=> ["lib/song.rb"]
+ */
+static VALUE
+dir_s_glob(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE str, rflags, ary;
+    int flags;
+
+    if (rb_scan_args(argc, argv, "11", &str, &rflags) == 2)
+	flags = NUM2INT(rflags);
+    else
+	flags = 0;
+
+    ary = rb_check_array_type(str);
+    if (NIL_P(ary)) {
+	ary = rb_push_glob(str, flags);
+    }
+    else {
+	volatile VALUE v = ary;
+	ary = dir_globs(RARRAY_LEN(v), RARRAY_PTR(v), flags);
+    }
+
+    if (rb_block_given_p()) {
+	rb_ary_each(ary);
+	return Qnil;
+    }
+    return ary;
+}
+
+static VALUE
+dir_open_dir(path)
+    VALUE path;
+{
+    VALUE dir = rb_funcall(rb_cDir, rb_intern("open"), 1, path);
+
+    if (TYPE(dir) != T_DATA ||
+	RDATA(dir)->dfree != (RUBY_DATA_FUNC)free_dir) {
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected Dir)",
+		 rb_obj_classname(dir));
+    }
+    return dir;
+}
+
+
+/*
+ *  call-seq:
+ *     Dir.foreach( dirname ) {| filename | block }  => nil
+ *
+ *  Calls the block once for each entry in the named directory, passing
+ *  the filename of each entry as a parameter to the block.
+ *
+ *     Dir.foreach("testdir") {|x| puts "Got #{x}" }
+ *
+ *  <em>produces:</em>
+ *
+ *     Got .
+ *     Got ..
+ *     Got config.h
+ *     Got main.rb
+ *
+ */
+static VALUE
+dir_foreach(io, dirname)
+    VALUE io, dirname;
+{
+    VALUE dir;
+
+    dir = dir_open_dir(dirname);
+    rb_ensure(dir_each, dir, dir_close, dir);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     Dir.entries( dirname ) => array
+ *
+ *  Returns an array containing all of the filenames in the given
+ *  directory. Will raise a <code>SystemCallError</code> if the named
+ *  directory doesn't exist.
+ *
+ *     Dir.entries("testdir")   #=> [".", "..", "config.h", "main.rb"]
+ *
+ */
+static VALUE
+dir_entries(io, dirname)
+    VALUE io, dirname;
+{
+    VALUE dir;
+
+    dir = dir_open_dir(dirname);
+    return rb_ensure(rb_Array, dir, dir_close, dir);
+}
+
+/*
+ *  call-seq:
+ *     File.fnmatch( pattern, path, [flags] ) => (true or false)
+ *     File.fnmatch?( pattern, path, [flags] ) => (true or false)
+ *
+ *  Returns true if <i>path</i> matches against <i>pattern</i> The
+ *  pattern is not a regular expression; instead it follows rules
+ *  similar to shell filename globbing. It may contain the following
+ *  metacharacters:
+ *
+ *  <code>*</code>::        Matches any file. Can be restricted by
+ *                          other values in the glob. <code>*</code>
+ *                          will match all files; <code>c*</code> will
+ *                          match all files beginning with
+ *                          <code>c</code>; <code>*c</code> will match
+ *                          all files ending with <code>c</code>; and
+ *                          <code>*c*</code> will match all files that
+ *                          have <code>c</code> in them (including at
+ *                          the beginning or end). Equivalent to
+ *                          <code>/ .* /x</code> in regexp.
+ *  <code>**</code>::       Matches directories recursively or files
+ *                          expansively.
+ *  <code>?</code>::        Matches any one character. Equivalent to
+ *                          <code>/.{1}/</code> in regexp.
+ *  <code>[set]</code>::    Matches any one character in +set+.
+ *                          Behaves exactly like character sets in
+ *                          Regexp, including set negation
+ *                          (<code>[^a-z]</code>).
+ *  <code>\</code>::        Escapes the next metacharacter.
+ *
+ *  <i>flags</i> is a bitwise OR of the <code>FNM_xxx</code>
+ *  parameters. The same glob pattern and flags are used by
+ *  <code>Dir::glob</code>.
+ *
+ *     File.fnmatch('cat',       'cat')        #=> true  : match entire string
+ *     File.fnmatch('cat',       'category')   #=> false : only match partial string
+ *     File.fnmatch('c{at,ub}s', 'cats')       #=> false : { } isn't supported
+ *
+ *     File.fnmatch('c?t',     'cat')          #=> true  : '?' match only 1 character
+ *     File.fnmatch('c??t',    'cat')          #=> false : ditto
+ *     File.fnmatch('c*',      'cats')         #=> true  : '*' match 0 or more characters
+ *     File.fnmatch('c*t',     'c/a/b/t')      #=> true  : ditto
+ *     File.fnmatch('ca[a-z]', 'cat')          #=> true  : inclusive bracket expression
+ *     File.fnmatch('ca[^t]',  'cat')          #=> false : exclusive bracket expression ('^' or '!')
+ *
+ *     File.fnmatch('cat', 'CAT')                     #=> false : case sensitive
+ *     File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true  : case insensitive
+ *
+ *     File.fnmatch('?',   '/', File::FNM_PATHNAME)  #=> false : wildcard doesn't match '/' on FNM_PATHNAME
+ *     File.fnmatch('*',   '/', File::FNM_PATHNAME)  #=> false : ditto
+ *     File.fnmatch('[/]', '/', File::FNM_PATHNAME)  #=> false : ditto
+ *
+ *     File.fnmatch('\?',   '?')                       #=> true  : escaped wildcard becomes ordinary
+ *     File.fnmatch('\a',   'a')                       #=> true  : escaped ordinary remains ordinary
+ *     File.fnmatch('\a',   '\a', File::FNM_NOESCAPE)  #=> true  : FNM_NOESACPE makes '\' ordinary
+ *     File.fnmatch('[\?]', '?')                       #=> true  : can escape inside bracket expression
+ *
+ *     File.fnmatch('*',   '.profile')                      #=> false : wildcard doesn't match leading
+ *     File.fnmatch('*',   '.profile', File::FNM_DOTMATCH)  #=> true    period by default.
+ *     File.fnmatch('.*',  '.profile')                      #=> true
+ *
+ *     rbfiles = '**' '/' '*.rb' # you don't have to do like this. just write in single string.
+ *     File.fnmatch(rbfiles, 'main.rb')                    #=> false
+ *     File.fnmatch(rbfiles, './main.rb')                  #=> false
+ *     File.fnmatch(rbfiles, 'lib/song.rb')                #=> true
+ *     File.fnmatch('**.rb', 'main.rb')                    #=> true
+ *     File.fnmatch('**.rb', './main.rb')                  #=> false
+ *     File.fnmatch('**.rb', 'lib/song.rb')                #=> true
+ *     File.fnmatch('*',           'dave/.profile')                      #=> true
+ *
+ *     pattern = '*' '/' '*'
+ *     File.fnmatch(pattern, 'dave/.profile', File::FNM_PATHNAME)  #=> false
+ *     File.fnmatch(pattern, 'dave/.profile', File::FNM_PATHNAME | File::FNM_DOTMATCH) #=> true
+ *
+ *     pattern = '**' '/' 'foo'
+ *     File.fnmatch(pattern, 'a/b/c/foo', File::FNM_PATHNAME)     #=> true
+ *     File.fnmatch(pattern, '/a/b/c/foo', File::FNM_PATHNAME)    #=> true
+ *     File.fnmatch(pattern, 'c:/a/b/c/foo', File::FNM_PATHNAME)  #=> true
+ *     File.fnmatch(pattern, 'a/.b/c/foo', File::FNM_PATHNAME)    #=> false
+ *     File.fnmatch(pattern, 'a/.b/c/foo', File::FNM_PATHNAME | File::FNM_DOTMATCH) #=> true
+ */
+static VALUE
+file_s_fnmatch(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE pattern, path;
+    VALUE rflags;
+    int flags;
+
+    if (rb_scan_args(argc, argv, "21", &pattern, &path, &rflags) == 3)
+	flags = NUM2INT(rflags);
+    else
+	flags = 0;
+
+    StringValue(pattern);
+    StringValue(path);
+
+    if (fnmatch(RSTRING(pattern)->ptr, RSTRING(path)->ptr, flags) == 0)
+	return Qtrue;
+
+    return Qfalse;
+}
+
+/*
+ *  Objects of class <code>Dir</code> are directory streams representing
+ *  directories in the underlying file system. They provide a variety of
+ *  ways to list directories and their contents. See also
+ *  <code>File</code>.
+ *
+ *  The directory used in these examples contains the two regular files
+ *  (<code>config.h</code> and <code>main.rb</code>), the parent
+ *  directory (<code>..</code>), and the directory itself
+ *  (<code>.</code>).
+ */
+void
+Init_Dir()
+{
+    rb_cDir = rb_define_class("Dir", rb_cObject);
+
+    rb_include_module(rb_cDir, rb_mEnumerable);
+
+    rb_define_alloc_func(rb_cDir, dir_s_alloc);
+    rb_define_singleton_method(rb_cDir, "open", dir_s_open, 1);
+    rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, 1);
+    rb_define_singleton_method(rb_cDir, "entries", dir_entries, 1);
+
+    rb_define_method(rb_cDir,"initialize", dir_initialize, 1);
+    rb_define_method(rb_cDir,"path", dir_path, 0);
+    rb_define_method(rb_cDir,"read", dir_read, 0);
+    rb_define_method(rb_cDir,"each", dir_each, 0);
+    rb_define_method(rb_cDir,"rewind", dir_rewind, 0);
+    rb_define_method(rb_cDir,"tell", dir_tell, 0);
+    rb_define_method(rb_cDir,"seek", dir_seek, 1);
+    rb_define_method(rb_cDir,"pos", dir_tell, 0);
+    rb_define_method(rb_cDir,"pos=", dir_set_pos, 1);
+    rb_define_method(rb_cDir,"close", dir_close, 0);
+
+    rb_define_singleton_method(rb_cDir,"chdir", dir_s_chdir, -1);
+    rb_define_singleton_method(rb_cDir,"getwd", dir_s_getwd, 0);
+    rb_define_singleton_method(rb_cDir,"pwd", dir_s_getwd, 0);
+    rb_define_singleton_method(rb_cDir,"chroot", dir_s_chroot, 1);
+    rb_define_singleton_method(rb_cDir,"mkdir", dir_s_mkdir, -1);
+    rb_define_singleton_method(rb_cDir,"rmdir", dir_s_rmdir, 1);
+    rb_define_singleton_method(rb_cDir,"delete", dir_s_rmdir, 1);
+    rb_define_singleton_method(rb_cDir,"unlink", dir_s_rmdir, 1);
+
+    rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, -1);
+    rb_define_singleton_method(rb_cDir,"[]", dir_s_aref, -1);
+
+    rb_define_singleton_method(rb_cFile,"fnmatch", file_s_fnmatch, -1);
+    rb_define_singleton_method(rb_cFile,"fnmatch?", file_s_fnmatch, -1);
+
+    rb_file_const("FNM_NOESCAPE", INT2FIX(FNM_NOESCAPE));
+    rb_file_const("FNM_PATHNAME", INT2FIX(FNM_PATHNAME));
+    rb_file_const("FNM_DOTMATCH", INT2FIX(FNM_DOTMATCH));
+    rb_file_const("FNM_CASEFOLD", INT2FIX(FNM_CASEFOLD));
+    rb_file_const("FNM_SYSCASE", INT2FIX(FNM_SYSCASE));
+}
diff --git a/ruby_1_8_6/distruby.rb b/ruby_1_8_6/distruby.rb
new file mode 100644
index 0000000000..613da0eb9c
--- /dev/null
+++ b/ruby_1_8_6/distruby.rb
@@ -0,0 +1,59 @@
+#!./miniruby
+
+if RUBY_PATCHLEVEL.zero?
+	dirname = sprintf 'ruby-%s', RUBY_VERSION
+	tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)/, 'v\1_\2_\3'
+else
+	dirname = sprintf 'ruby-%s-p%u', RUBY_VERSION, RUBY_PATCHLEVEL
+	tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)-p/, 'v\1_\2_\3_'
+end
+tgzname = dirname + '.tar.gz'
+tbzname = dirname + '.tar.bz2'
+zipname = dirname + '.zip'
+repos   = 'http://svn.ruby-lang.org/repos/ruby/tags/' + tagname
+
+STDERR.puts 'exporting sources...'
+system 'svn',  'export',  '-q', repos, dirname
+Dir.chdir dirname do
+	STDERR.puts 'generating configure...'
+	system 'autoconf'
+	system 'rm', '-rf', 'autom4te.cache'
+
+	STDERR.puts 'generating parse.c...'
+	system 'bison', '-y', '-o', 'parse.c', 'parse.y'
+end
+
+STDERR.puts 'generating tarballs...'
+ENV['GZIP'] = '-9'
+system 'tar', 'chofzp', tgzname, dirname
+system 'tar', 'chojfp', tbzname, dirname
+system 'zip', '-q9r', zipname, dirname
+
+require 'digest/md5'
+require 'digest/sha2'
+for name in [tgzname, tbzname, zipname] do
+	open name, 'rb' do |fp|
+		str = fp.read
+		md5 = Digest::MD5.hexdigest str
+		sha = Digest::SHA256.hexdigest str
+		printf "MD5(%s)= %s\nSHA256(%s)= %s\nSIZE(%s)= %s\n\n",
+				 name, md5,
+				 name, sha,
+				 name, str.size
+	end
+end
+
+
+
+# 
+# Local Variables:
+# mode: ruby
+# code: utf-8
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# fill-column: 79
+# default-justification: full
+# End:
+# vi: ts=3 sw=3
+
diff --git a/ruby_1_8_6/djgpp/GNUmakefile.in b/ruby_1_8_6/djgpp/GNUmakefile.in
new file mode 100644
index 0000000000..0a7e1fb131
--- /dev/null
+++ b/ruby_1_8_6/djgpp/GNUmakefile.in
@@ -0,0 +1,2 @@
+include Makefile
+VPATH = $(srcdir) $(srcdir)/missing
diff --git a/ruby_1_8_6/djgpp/README.djgpp b/ruby_1_8_6/djgpp/README.djgpp
new file mode 100644
index 0000000000..f1f413a478
--- /dev/null
+++ b/ruby_1_8_6/djgpp/README.djgpp
@@ -0,0 +1,21 @@
+* How to compile and install on djgpp
+
+This is what you need to do to compile and install Ruby:
+
+  1. Run configure.bat, which will generate config.h and Makefile
+     (GNU sed required).
+     Message like this is normal:
+       sed.exe: can't read 123456789: No such file or directory (ENOENT)
+
+  2. Edit defines.h if you need.  Probably this step will not need.
+
+  3. Remove comment mark(#) before the module names from ext/Setup.dj (or
+     add module names if not present).
+
+  4. Run make.
+
+  5. Optionally, run 'make test' to check whether the compiled Ruby
+     interpreter works well.  If you see the message "test succeeded",
+     your ruby works as it should (hopefully).
+
+  6. Run 'make install'
diff --git a/ruby_1_8_6/djgpp/config.hin b/ruby_1_8_6/djgpp/config.hin
new file mode 100644
index 0000000000..8ee427c92f
--- /dev/null
+++ b/ruby_1_8_6/djgpp/config.hin
@@ -0,0 +1,114 @@
+
+#define PACKAGE_NAME ""
+#define PACKAGE_TARNAME ""
+#define PACKAGE_VERSION ""
+#define PACKAGE_STRING ""
+#define PACKAGE_BUGREPORT ""
+#define USE_BUILTIN_FRAME_ADDRESS 1
+#define STDC_HEADERS 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_LONG_LONG 1
+#define HAVE_OFF_T 1
+#define SIZEOF_INT 4
+#define SIZEOF_SHORT 2
+#define SIZEOF_LONG 4
+#define SIZEOF_LONG_LONG 8
+#define SIZEOF___INT64 0
+#define SIZEOF_OFF_T 4
+#define SIZEOF_VOIDP 4
+#define SIZEOF_FLOAT 4
+#define SIZEOF_DOUBLE 8
+#define HAVE_PROTOTYPES 1
+#define TOKEN_PASTE(x,y) x##y
+#define HAVE_STDARG_PROTOTYPES 1
+#define NORETURN(x) x __attribute__ ((noreturn))
+#define HAVE_DECL_SYS_NERR 1
+#define HAVE_DIRENT_H 1
+#define STDC_HEADERS 1
+#define HAVE_SYS_WAIT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_SYS_FILE_H 1
+#define HAVE_SYS_IOCTL_H 1
+#define HAVE_FCNTL_H 1
+#define HAVE_SYS_FCNTL_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TIMES_H 1
+#define HAVE_SYS_PARAM_H 1
+#define HAVE_PWD_H 1
+#define HAVE_UTIME_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_DIRECT_H 1
+#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+#define HAVE_ST_BLKSIZE 1
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+#define HAVE_ST_RDEV 1
+#define GETGROUPS_T gid_t
+#define RETSIGTYPE void
+#define HAVE_ALLOCA 1
+#define HAVE_DUP2 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MKDIR 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_STRERROR 1
+#define HAVE_STRFTIME 1
+#define HAVE_STRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOUL 1
+#define HAVE_ISINF 1
+#define HAVE_ISNAN 1
+#define HAVE_FINITE 1
+#define HAVE_HYPOT 1
+#define HAVE_ACOSH 1
+#define HAVE_FMOD 1
+#define HAVE_WAITPID 1
+#define HAVE_FSYNC 1
+#define HAVE_TRUNCATE 1
+#define HAVE_CHSIZE 1
+#define HAVE_TIMES 1
+#define HAVE_UTIMES 1
+#define HAVE_FCNTL 1
+#define HAVE_SYMLINK 1
+#define HAVE_SETITIMER 1
+#define HAVE_PAUSE 1
+#define HAVE_GETPGRP 1
+#define HAVE_SETPGID 1
+#define HAVE_GETGROUPS 1
+#define HAVE_GETRLIMIT 1
+#define HAVE_SIGPROCMASK 1
+#define HAVE_SIGACTION 1
+#define HAVE_SETSID 1
+#define HAVE_TELLDIR 1
+#define HAVE_SEEKDIR 1
+#define HAVE_MKTIME 1
+#define HAVE_COSH 1
+#define HAVE_SINH 1
+#define HAVE_TANH 1
+#define HAVE_STRUCT_TM_TM_ZONE 1
+#define HAVE_TM_ZONE 1
+#define HAVE_STRUCT_TM_TM_GMTOFF 1
+#define POSIX_SIGNAL 1
+#define GETPGRP_VOID 1
+#define SETPGRP_VOID 1
+#define RSHIFT(x,y) ((x)>>(int)y)
+#define FILE_COUNT _cnt
+#define FILE_READPTR _ptr
+#define NEED_IO_FLUSH_BETWEEN_RW 1
+#define DEFAULT_KCODE KCODE_NONE
+#define DLEXT ".so"
+#define RUBY_LIB "/lib/ruby/@MAJOR@.@MINOR@"
+#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
+#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/@MAJOR@.@MINOR@"
+#define RUBY_PLATFORM "i386-msdosdjgpp"
+#define RUBY_ARCHLIB "/lib/ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
+#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
diff --git a/ruby_1_8_6/djgpp/config.sed b/ruby_1_8_6/djgpp/config.sed
new file mode 100644
index 0000000000..1805789520
--- /dev/null
+++ b/ruby_1_8_6/djgpp/config.sed
@@ -0,0 +1,128 @@
+/^SHELL/s,/bin/sh,$(COMSPEC),
+;s%/bin/rm%rm%
+;s%|| true%%
+;/\/dev\/null/ {
+;s,/dev/null 2>&1, nul,
+;s,2> /dev/null,,
+;}
+;/^config.status/ {
+;    N;N;N;N;N;d
+;}
+:t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@srcdir@,.,g;t t
+s,@top_srcdir@,..,;t t
+s,@PATH_SEPARATOR@,:,;t t
+s,@PACKAGE_NAME@,,;t t
+s,@PACKAGE_TARNAME@,,;t t
+s,@PACKAGE_VERSION@,,;t t
+s,@PACKAGE_STRING@,,;t t
+s,@PACKAGE_BUGREPORT@,,;t t
+s,@exec_prefix@,${prefix},;t t
+s,@prefix@,/dev/env/DJDIR,;t t
+s%@program_transform_name@%s,^,,%;t t
+s,@bindir@,${exec_prefix}/bin,;t t
+s,@sbindir@,${exec_prefix}/sbin,;t t
+s,@libexecdir@,${exec_prefix}/libexec,;t t
+s,@datadir@,${prefix}/share,;t t
+s,@sysconfdir@,${prefix}/etc,;t t
+s,@sharedstatedir@,${prefix}/com,;t t
+s,@localstatedir@,${prefix}/var,;t t
+s,@libdir@,${exec_prefix}/lib,;t t
+s,@includedir@,${prefix}/include,;t t
+s,@oldincludedir@,/usr/include,;t t
+s,@infodir@,${prefix}/info,;t t
+s,@mandir@,${prefix}/man,;t t
+s,@build_alias@,i586-pc-msdosdjgpp,;t t
+s,@host_alias@,i586-pc-msdosdjgpp,;t t
+s,@target_alias@,i386-msdosdjgpp,;t t
+s,@DEFS@,,;t t
+s,@ECHO_C@,,;t t
+s,@ECHO_N@,-n,;t t
+s,@ECHO_T@,,;t t
+s,@LIBS@,-lm ,;t t
+s,@MAJOR@,1,;t t
+s,@MINOR@,7,;t t
+s,@TEENY@,3,;t t
+s,@build@,i586-pc-msdosdjgpp,;t t
+s,@build_cpu@,i586,;t t
+s,@build_vendor@,pc,;t t
+s,@build_os@,msdosdjgpp,;t t
+s,@host@,i586-pc-msdosdjgpp,;t t
+s,@host_cpu@,i586,;t t
+s,@host_vendor@,pc,;t t
+s,@host_os@,msdosdjgpp,;t t
+s,@target@,i386-pc-msdosdjgpp,;t t
+s,@target_cpu@,i386,;t t
+s,@target_vendor@,pc,;t t
+s,@target_os@,msdosdjgpp,;t t
+s,@CC@,gcc,;t t
+s,@ac_ct_CC@,,;t t
+s,@CFLAGS@,-Os,;t t
+s,@LDFLAGS@,,;t t
+s,@CPPFLAGS@,,;t t
+s,@EXEEXT@,.exe,;t t
+s,@OBJEXT@,o,;t t
+s,@CPP@,gcc -E,;t t
+s,@EGREP@,grep -E,;t t
+s,@GNU_LD@,yes,;t t
+s,@CPPOUTFILE@,-o conftest.i,;t t
+s,@OUTFLAG@,-o ,;t t
+s,@YACC@,bison -y,;t t
+s,@RANLIB@,ranlib,;t t
+s,@ac_ct_RANLIB@,,;t t
+s,@AR@,ar,;t t
+s,@ac_ct_AR@,,;t t
+s,@NM@,,;t t
+s,@ac_ct_NM@,,;t t
+s,@WINDRES@,,;t t
+s,@ac_ct_WINDRES@,,;t t
+s,@DLLWRAP@,,;t t
+s,@ac_ct_DLLWRAP@,,;t t
+s,@LN_S@,ln -s,;t t
+s,@SET_MAKE@,,;t t
+s,@LIBOBJS@,crypt.o flock.o vsnprintf.o,;t t
+s,@ALLOCA@,,;t t
+s,@XCFLAGS@,,;t t
+s,@XLDFLAGS@, -L.,;t t
+s,@DLDFLAGS@,,;t t
+s,@STATIC@,,;t t
+s,@CCDLFLAGS@,,;t t
+s,@LDSHARED@,ld,;t t
+s,@DLEXT@,so,;t t
+s,@DLEXT2@,,;t t
+s,@LIBEXT@,a,;t t
+s,@LINK_SO@,,;t t
+s,@LIBPATHFLAG@, -L%s,;t t
+s,@STRIP@,strip,;t t
+s,@EXTSTATIC@,,;t t
+s,@setup@,Setup.dj,;t t
+s,@MINIRUBY@,./miniruby,;t t
+s,@PREP@,,;t t
+s,@ARCHFILE@,,;t t
+s,@LIBRUBY_LDSHARED@,ld,;t t
+s,@LIBRUBY_DLDFLAGS@,,;t t
+s,@RUBY_INSTALL_NAME@,ruby,;t t
+s,@rubyw_install_name@,,;t t
+s,@RUBYW_INSTALL_NAME@,,;t t
+s,@RUBY_SO_NAME@,$(RUBY_INSTALL_NAME),;t t
+s,@LIBRUBY_A@,lib$(RUBY_INSTALL_NAME).a,;t t
+s,@LIBRUBY_SO@,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY),;t t
+s,@LIBRUBY_ALIASES@,lib$(RUBY_SO_NAME).so,;t t
+s,@LIBRUBY@,$(LIBRUBY_A),;t t
+s,@LIBRUBYARG@,-l$(RUBY_INSTALL_NAME),;t t
+s,@SOLIBS@,,;t t
+s,@DLDLIBS@,-lc,;t t
+s,@ENABLE_SHARED@,no,;t t
+s,@MAINLIBS@,,;t t
+s,@COMMON_LIBS@,,;t t
+s,@COMMON_MACROS@,,;t t
+s,@COMMON_HEADERS@,,;t t
+s,@EXPORT_PREFIX@,,;t t
+s,@MAKEFILES@,Makefile,;t t
+s,@arch@,i386-msdosdjgpp,;t t
+s,@sitearch@,i386-msdosdjgpp,;t t
+s,@sitedir@,${prefix}/lib/ruby/site_ruby,;t t
+s,@configure_args@,,;t t
+/^,THIS_IS_DUMMY_PATTERN_/i\
+ac_given_srcdir=.
diff --git a/ruby_1_8_6/djgpp/configure.bat b/ruby_1_8_6/djgpp/configure.bat
new file mode 100755
index 0000000000..e6a5d79d4a
--- /dev/null
+++ b/ruby_1_8_6/djgpp/configure.bat
@@ -0,0 +1,20 @@
+@echo off

+if exist configure.bat cd ..

+if exist djgpp\version.sed goto exist

+  sed -n -f djgpp\mkver.sed < version.h > djgpp\version.sed

+:exist

+set _conv_=-f djgpp\config.sed -f djgpp\version.sed

+sed %_conv_% < Makefile.in > Makefile

+sed %_conv_% < djgpp\config.hin > config.h

+echo LFN check > 12345678

+sed -n /LFN/d 123456789 > nul

+if errorlevel 2 goto LFN

+    copy missing\vsnprintf.c missing\vsnprint.c > nul

+    copy djgpp\config.sed config.sta > nul

+goto end

+:LFN

+    copy djgpp\config.sed config.status > nul

+:end

+set _conv_=

+del 12345678

+echo Now you must run a make.

diff --git a/ruby_1_8_6/djgpp/mkver.sed b/ruby_1_8_6/djgpp/mkver.sed
new file mode 100644
index 0000000000..f29b9ddd3e
--- /dev/null
+++ b/ruby_1_8_6/djgpp/mkver.sed
@@ -0,0 +1 @@
+/RUBY_VERSION /s/^.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/s,@MAJOR@,\1,;s,@MINOR@,\2,;s,@TEENY@,\3,/p
diff --git a/ruby_1_8_6/dln.c b/ruby_1_8_6/dln.c
new file mode 100644
index 0000000000..9fd605e32e
--- /dev/null
+++ b/ruby_1_8_6/dln.c
@@ -0,0 +1,1860 @@
+/**********************************************************************
+
+  dln.c -
+
+  $Author$
+  $Date$
+  created at: Tue Jan 18 17:05:06 JST 1994
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "dln.h"
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#ifdef __CHECKER__
+#undef HAVE_DLOPEN
+#undef USE_DLN_A_OUT
+#undef USE_DLN_DLOPEN
+#endif
+
+#ifdef USE_DLN_A_OUT
+char *dln_argv0;
+#endif
+
+#if defined(HAVE_ALLOCA_H)
+#include <alloca.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#ifndef xmalloc
+void *xmalloc();
+void *xcalloc();
+void *xrealloc();
+#endif
+
+#include <stdio.h>
+#if defined(_WIN32) || defined(__VMS)
+#include "missing/file.h"
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifndef S_ISDIR
+#   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 1024
+#endif
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifndef _WIN32
+char *getenv();
+#endif
+
+#if defined(__VMS)
+#pragma builtins
+#include <dlfcn.h>
+#endif
+
+#ifdef __MACOS__
+# include <TextUtils.h>
+# include <CodeFragments.h>
+# include <Aliases.h>
+# include "macruby_private.h"
+#endif
+
+#ifdef __BEOS__
+# include <image.h>
+#endif
+
+#ifndef NO_DLN_LOAD
+
+#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(__APPLE__) && !defined(_UNICOSMP)
+/* dynamic load with dlopen() */
+# define USE_DLN_DLOPEN
+#endif
+
+#ifndef FUNCNAME_PATTERN
+# if defined(__hp9000s300) ||  (defined(__NetBSD__) && !defined(__ELF__)) || defined(__BORLANDC__) || (defined(__FreeBSD__) && !defined(__ELF__)) || (defined(__OpenBSD__) && !defined(__ELF__)) || defined(NeXT) || defined(__WATCOMC__) || defined(__APPLE__)
+#  define FUNCNAME_PATTERN "_Init_%s"
+# else
+#  define FUNCNAME_PATTERN "Init_%s"
+# endif
+#endif
+
+static int
+init_funcname_len(buf, file)
+    char **buf;
+    const char *file;
+{
+    char *p;
+    const char *slash;
+    int len;
+
+    /* Load the file as an object one */
+    for (slash = file-1; *file; file++) /* Find position of last '/' */
+#ifdef __MACOS__
+	if (*file == ':') slash = file;
+#else
+	if (*file == '/') slash = file;
+#endif
+
+    len = strlen(FUNCNAME_PATTERN) + strlen(slash + 1);
+    *buf = xmalloc(len);
+    snprintf(*buf, len, FUNCNAME_PATTERN, slash + 1);
+    for (p = *buf; *p; p++) {         /* Delete suffix if it exists */
+	if (*p == '.') {
+	    *p = '\0'; break;
+	}
+    }
+    return p - *buf;
+}
+
+#define init_funcname(buf, file) do {\
+    int len = init_funcname_len(buf, file);\
+    char *tmp = ALLOCA_N(char, len+1);\
+    if (!tmp) {\
+	free(*buf);\
+	rb_memerror();\
+    }\
+    strcpy(tmp, *buf);\
+    free(*buf);\
+    *buf = tmp;\
+} while (0)
+
+#ifdef USE_DLN_A_OUT
+
+#ifndef LIBC_NAME
+# define LIBC_NAME "libc.a"
+#endif
+
+#ifndef DLN_DEFAULT_LIB_PATH
+#  define DLN_DEFAULT_LIB_PATH "/lib:/usr/lib:/usr/local/lib:."
+#endif
+
+#include <errno.h>
+
+static int dln_errno;
+
+#define DLN_ENOEXEC	ENOEXEC	/* Exec format error */
+#define DLN_ECONFL	1201	/* Symbol name conflict */
+#define DLN_ENOINIT	1202	/* No initializer given */
+#define DLN_EUNDEF	1203	/* Undefine symbol remains */
+#define DLN_ENOTLIB	1204	/* Not a library file */
+#define DLN_EBADLIB	1205	/* Malformed library file */
+#define DLN_EINIT	1206	/* Not initialized */
+
+static int dln_init_p = 0;
+
+#include <ar.h>
+#include <a.out.h>
+#ifndef N_COMM
+# define N_COMM 0x12
+#endif
+#ifndef N_MAGIC
+# define N_MAGIC(x) (x).a_magic
+#endif
+
+#define INVALID_OBJECT(h) (N_MAGIC(h) != OMAGIC)
+
+#include "util.h"
+#include "st.h"
+
+static st_table *sym_tbl;
+static st_table *undef_tbl;
+
+static int load_lib();
+
+static int
+load_header(fd, hdrp, disp)
+    int fd;
+    struct exec *hdrp;
+    long disp;
+{
+    int size;
+
+    lseek(fd, disp, 0);
+    size = read(fd, hdrp, sizeof(struct exec));
+    if (size == -1) {
+	dln_errno = errno;
+	return -1;
+    }
+    if (size != sizeof(struct exec) || N_BADMAG(*hdrp)) {
+	dln_errno = DLN_ENOEXEC;
+	return -1;
+    }
+    return 0;
+}
+
+#if defined(sequent)
+#define RELOC_SYMBOL(r)			((r)->r_symbolnum)
+#define RELOC_MEMORY_SUB_P(r)		((r)->r_bsr)
+#define RELOC_PCREL_P(r)		((r)->r_pcrel || (r)->r_bsr)
+#define RELOC_TARGET_SIZE(r)		((r)->r_length)
+#endif
+
+/* Default macros */
+#ifndef RELOC_ADDRESS
+#define RELOC_ADDRESS(r)		((r)->r_address)
+#define RELOC_EXTERN_P(r)		((r)->r_extern)
+#define RELOC_SYMBOL(r)			((r)->r_symbolnum)
+#define RELOC_MEMORY_SUB_P(r)		0
+#define RELOC_PCREL_P(r)		((r)->r_pcrel)
+#define RELOC_TARGET_SIZE(r)		((r)->r_length)
+#endif
+
+#if defined(sun) && defined(sparc)
+/* Sparc (Sun 4) macros */
+#  undef relocation_info
+#  define relocation_info reloc_info_sparc
+#  define R_RIGHTSHIFT(r)	(reloc_r_rightshift[(r)->r_type])
+#  define R_BITSIZE(r) 		(reloc_r_bitsize[(r)->r_type])
+#  define R_LENGTH(r)		(reloc_r_length[(r)->r_type])
+static int reloc_r_rightshift[] = {
+  0, 0, 0, 0, 0, 0, 2, 2, 10, 0, 0, 0, 0, 0, 0,
+};
+static int reloc_r_bitsize[] = {
+  8, 16, 32, 8, 16, 32, 30, 22, 22, 22, 13, 10, 32, 32, 16,
+};
+static int reloc_r_length[] = {
+  0, 1, 2, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+};
+#  define R_PCREL(r) \
+    ((r)->r_type >= RELOC_DISP8 && (r)->r_type <= RELOC_WDISP22)
+#  define R_SYMBOL(r) ((r)->r_index)
+#endif
+
+#if defined(sequent)
+#define R_SYMBOL(r)		((r)->r_symbolnum)
+#define R_MEMORY_SUB(r)		((r)->r_bsr)
+#define R_PCREL(r)		((r)->r_pcrel || (r)->r_bsr)
+#define R_LENGTH(r)		((r)->r_length)
+#endif
+
+#ifndef R_SYMBOL
+#  define R_SYMBOL(r) 		((r)->r_symbolnum)
+#  define R_MEMORY_SUB(r)	0
+#  define R_PCREL(r)  		((r)->r_pcrel)
+#  define R_LENGTH(r) 		((r)->r_length)
+#endif
+
+static struct relocation_info *
+load_reloc(fd, hdrp, disp)
+     int fd;
+     struct exec *hdrp;
+     long disp;
+{
+    struct relocation_info *reloc;
+    int size;
+
+    lseek(fd, disp + N_TXTOFF(*hdrp) + hdrp->a_text + hdrp->a_data, 0);
+    size = hdrp->a_trsize + hdrp->a_drsize;
+    reloc = (struct relocation_info*)xmalloc(size);
+    if (reloc == NULL) {
+	dln_errno = errno;
+	return NULL;
+    }
+
+    if (read(fd, reloc, size) !=  size) {
+	dln_errno = errno;
+	free(reloc);
+	return NULL;
+    }
+
+    return reloc;
+}
+
+static struct nlist *
+load_sym(fd, hdrp, disp)
+    int fd;
+    struct exec *hdrp;
+    long disp;
+{
+    struct nlist * buffer;
+    struct nlist * sym;
+    struct nlist * end;
+    long displ;
+    int size;
+
+    lseek(fd, N_SYMOFF(*hdrp) + hdrp->a_syms + disp, 0);
+    if (read(fd, &size, sizeof(int)) != sizeof(int)) {
+	goto err_noexec;
+    }
+
+    buffer = (struct nlist*)xmalloc(hdrp->a_syms + size);
+    if (buffer == NULL) {
+	dln_errno = errno;
+	return NULL;
+    }
+
+    lseek(fd, disp + N_SYMOFF(*hdrp), 0);
+    if (read(fd, buffer, hdrp->a_syms + size) != hdrp->a_syms + size) {
+	free(buffer);
+	goto err_noexec;
+    }
+
+    sym = buffer;
+    end = sym + hdrp->a_syms / sizeof(struct nlist);
+    displ = (long)buffer + (long)(hdrp->a_syms);
+
+    while (sym < end) {
+	sym->n_un.n_name = (char*)sym->n_un.n_strx + displ;
+	sym++;
+    }
+    return buffer;
+
+  err_noexec:
+    dln_errno = DLN_ENOEXEC;
+    return NULL;
+}
+
+static st_table *
+sym_hash(hdrp, syms)
+    struct exec *hdrp;
+    struct nlist *syms;
+{
+    st_table *tbl;
+    struct nlist *sym = syms;
+    struct nlist *end = syms + (hdrp->a_syms / sizeof(struct nlist));
+
+    tbl = st_init_strtable();
+    if (tbl == NULL) {
+	dln_errno = errno;
+	return NULL;
+    }
+
+    while (sym < end) {
+	st_insert(tbl, sym->n_un.n_name, sym);
+	sym++;
+    }
+    return tbl;
+}
+
+static int
+dln_init(prog)
+    const char *prog;
+{
+    char *file;
+    int fd;
+    struct exec hdr;
+    struct nlist *syms;
+
+    if (dln_init_p == 1) return 0;
+
+    file = dln_find_exe(prog, NULL);
+    if (file == NULL || (fd = open(file, O_RDONLY)) < 0) {
+	dln_errno = errno;
+	return -1;
+    }
+
+    if (load_header(fd, &hdr, 0) == -1) return -1;
+    syms = load_sym(fd, &hdr, 0);
+    if (syms == NULL) {
+	close(fd);
+	return -1;
+    }
+    sym_tbl = sym_hash(&hdr, syms);
+    if (sym_tbl == NULL) {	/* file may be start with #! */
+	char c = '\0';
+	char buf[MAXPATHLEN];
+	char *p;
+
+	free(syms);
+	lseek(fd, 0L, 0);
+	if (read(fd, &c, 1) == -1) {
+	    dln_errno = errno;
+	    return -1;
+	}
+	if (c != '#') goto err_noexec;
+	if (read(fd, &c, 1) == -1) {
+	    dln_errno = errno;
+	    return -1;
+	}
+	if (c != '!') goto err_noexec;
+
+	p = buf;
+	/* skip forwarding spaces */
+	while (read(fd, &c, 1) == 1) {
+	    if (c == '\n') goto err_noexec;
+	    if (c != '\t' && c != ' ') {
+		*p++ = c;
+		break;
+	    }
+	}
+	/* read in command name */
+	while (read(fd, p, 1) == 1) {
+	    if (*p == '\n' || *p == '\t' || *p == ' ') break;
+	    p++;
+	    if (p-buf >= MAXPATHLEN) {
+		dln_errno = ENAMETOOLONG;
+		return -1;
+	    }
+	}
+	*p = '\0';
+
+	return dln_init(buf);
+    }
+    dln_init_p = 1;
+    undef_tbl = st_init_strtable();
+    close(fd);
+    return 0;
+
+  err_noexec:
+    close(fd);
+    dln_errno = DLN_ENOEXEC;
+    return -1;
+}
+
+static long
+load_text_data(fd, hdrp, bss, disp)
+    int fd;
+    struct exec *hdrp;
+    int bss;
+    long disp;
+{
+    int size;
+    unsigned char* addr;
+
+    lseek(fd, disp + N_TXTOFF(*hdrp), 0);
+    size = hdrp->a_text + hdrp->a_data;
+
+    if (bss == -1) size += hdrp->a_bss;
+    else if (bss > 1) size += bss;
+
+    addr = (unsigned char*)xmalloc(size);
+    if (addr == NULL) {
+	dln_errno = errno;
+	return 0;
+    }
+
+    if (read(fd, addr, size) !=  size) {
+	dln_errno = errno;
+	free(addr);
+	return 0;
+    }
+
+    if (bss == -1) {
+	memset(addr +  hdrp->a_text + hdrp->a_data, 0, hdrp->a_bss);
+    }
+    else if (bss > 0) {
+	memset(addr +  hdrp->a_text + hdrp->a_data, 0, bss);
+    }
+
+    return (long)addr;
+}
+
+static int
+undef_print(key, value)
+    char *key, *value;
+{
+    fprintf(stderr, "  %s\n", key);
+    return ST_CONTINUE;
+}
+
+static void
+dln_print_undef()
+{
+    fprintf(stderr, " Undefined symbols:\n");
+    st_foreach(undef_tbl, undef_print, NULL);
+}
+
+static void
+dln_undefined()
+{
+    if (undef_tbl->num_entries > 0) {
+	fprintf(stderr, "dln: Calling undefined function\n");
+	dln_print_undef();
+	rb_exit(1);
+    }
+}
+
+struct undef {
+    char *name;
+    struct relocation_info reloc;
+    long base;
+    char *addr;
+    union {
+	char c;
+	short s;
+	long l;
+    } u;
+};
+
+static st_table *reloc_tbl = NULL;
+static void
+link_undef(name, base, reloc)
+    const char *name;
+    long base;
+    struct relocation_info *reloc;
+{
+    static int u_no = 0;
+    struct undef *obj;
+    char *addr = (char*)(reloc->r_address + base);
+
+    obj = (struct undef*)xmalloc(sizeof(struct undef));
+    obj->name = strdup(name);
+    obj->reloc = *reloc;
+    obj->base = base;
+    switch (R_LENGTH(reloc)) {
+      case 0:		/* byte */
+	obj->u.c = *addr;
+	break;
+      case 1:		/* word */
+	obj->u.s = *(short*)addr;
+	break;
+      case 2:		/* long */
+	obj->u.l = *(long*)addr;
+	break;
+    }
+    if (reloc_tbl == NULL) {
+	reloc_tbl = st_init_numtable();
+    }
+    st_insert(reloc_tbl, u_no++, obj);
+}
+
+struct reloc_arg {
+    const char *name;
+    long value;
+};
+
+static int
+reloc_undef(no, undef, arg)
+    int no;
+    struct undef *undef;
+    struct reloc_arg *arg;
+{
+    int datum;
+    char *address;
+#if defined(sun) && defined(sparc)
+    unsigned int mask = 0;
+#endif
+
+    if (strcmp(arg->name, undef->name) != 0) return ST_CONTINUE;
+    address = (char*)(undef->base + undef->reloc.r_address);
+    datum = arg->value;
+
+    if (R_PCREL(&(undef->reloc))) datum -= undef->base;
+#if defined(sun) && defined(sparc)
+    datum += undef->reloc.r_addend;
+    datum >>= R_RIGHTSHIFT(&(undef->reloc));
+    mask = (1 << R_BITSIZE(&(undef->reloc))) - 1;
+    mask |= mask -1;
+    datum &= mask;
+    switch (R_LENGTH(&(undef->reloc))) {
+      case 0:
+	*address = undef->u.c;
+	*address &= ~mask;
+	*address |= datum;
+	break;
+      case 1:
+	*(short *)address = undef->u.s;
+	*(short *)address &= ~mask;
+	*(short *)address |= datum;
+	break;
+      case 2:
+	*(long *)address = undef->u.l;
+	*(long *)address &= ~mask;
+	*(long *)address |= datum;
+	break;
+    }
+#else
+    switch (R_LENGTH(&(undef->reloc))) {
+      case 0:		/* byte */
+	if (R_MEMORY_SUB(&(undef->reloc)))
+	    *address = datum - *address;
+	else *address = undef->u.c + datum;
+	break;
+      case 1:		/* word */
+	if (R_MEMORY_SUB(&(undef->reloc)))
+	    *(short*)address = datum - *(short*)address;
+	else *(short*)address = undef->u.s + datum;
+	break;
+      case 2:		/* long */
+	if (R_MEMORY_SUB(&(undef->reloc)))
+	    *(long*)address = datum - *(long*)address;
+	else *(long*)address = undef->u.l + datum;
+	break;
+    }
+#endif
+    free(undef->name);
+    free(undef);
+    return ST_DELETE;
+}
+
+static void
+unlink_undef(name, value)
+    const char *name;
+    long value;
+{
+    struct reloc_arg arg;
+
+    arg.name = name;
+    arg.value = value;
+    st_foreach(reloc_tbl, reloc_undef, &arg);
+}
+
+#ifdef N_INDR
+struct indr_data {
+    char *name0, *name1;
+};
+
+static int
+reloc_repl(no, undef, data)
+    int no;
+    struct undef *undef;
+    struct indr_data *data;
+{
+    if (strcmp(data->name0, undef->name) == 0) {
+	free(undef->name);
+	undef->name = strdup(data->name1);
+    }
+    return ST_CONTINUE;
+}
+#endif
+
+static int
+load_1(fd, disp, need_init)
+    int fd;
+    long disp;
+    const char *need_init;
+{
+    static char *libc = LIBC_NAME;
+    struct exec hdr;
+    struct relocation_info *reloc = NULL;
+    long block = 0;
+    long new_common = 0; /* Length of new common */
+    struct nlist *syms = NULL;
+    struct nlist *sym;
+    struct nlist *end;
+    int init_p = 0;
+
+    if (load_header(fd, &hdr, disp) == -1) return -1;
+    if (INVALID_OBJECT(hdr)) {
+	dln_errno = DLN_ENOEXEC;
+	return -1;
+    }
+    reloc = load_reloc(fd, &hdr, disp);
+    if (reloc == NULL) return -1;
+
+    syms = load_sym(fd, &hdr, disp);
+    if (syms == NULL) {
+	free(reloc);
+	return -1;
+    }
+
+    sym = syms;
+    end = syms + (hdr.a_syms / sizeof(struct nlist));
+    while (sym < end) {
+	struct nlist *old_sym;
+	int value = sym->n_value;
+
+#ifdef N_INDR
+	if (sym->n_type == (N_INDR | N_EXT)) {
+	    char *key = sym->n_un.n_name;
+
+	    if (st_lookup(sym_tbl, sym[1].n_un.n_name, &old_sym)) {
+		if (st_delete(undef_tbl, (st_data_t*)&key, NULL)) {
+		    unlink_undef(key, old_sym->n_value);
+		    free(key);
+		}
+	    }
+	    else {
+		struct indr_data data;
+
+		data.name0 = sym->n_un.n_name;
+		data.name1 = sym[1].n_un.n_name;
+		st_foreach(reloc_tbl, reloc_repl, &data);
+
+		st_insert(undef_tbl, strdup(sym[1].n_un.n_name), NULL);
+		if (st_delete(undef_tbl, (st_data_t*)&key, NULL)) {
+		    free(key);
+		}
+	    }
+	    sym += 2;
+	    continue;
+	}
+#endif
+	if (sym->n_type == (N_UNDF | N_EXT)) {
+	    if (st_lookup(sym_tbl, sym->n_un.n_name, &old_sym) == 0) {
+		old_sym = NULL;
+	    }
+
+	    if (value) {
+		if (old_sym) {
+		    sym->n_type = N_EXT | N_COMM;
+		    sym->n_value = old_sym->n_value;
+		}
+		else {
+		    int rnd =
+			value >= sizeof(double) ? sizeof(double) - 1
+			    : value >= sizeof(long) ? sizeof(long) - 1
+				: sizeof(short) - 1;
+
+		    sym->n_type = N_COMM;
+		    new_common += rnd;
+		    new_common &= ~(long)rnd;
+		    sym->n_value = new_common;
+		    new_common += value;
+		}
+	    }
+	    else {
+		if (old_sym) {
+		    sym->n_type = N_EXT | N_COMM;
+		    sym->n_value = old_sym->n_value;
+		}
+		else {
+		    sym->n_value = (long)dln_undefined;
+		    st_insert(undef_tbl, strdup(sym->n_un.n_name), NULL);
+		}
+	    }
+	}
+	sym++;
+    }
+
+    block = load_text_data(fd, &hdr, hdr.a_bss + new_common, disp);
+    if (block == 0) goto err_exit;
+
+    sym = syms;
+    while (sym < end) {
+	struct nlist *new_sym;
+	char *key;
+
+	switch (sym->n_type) {
+	  case N_COMM:
+	    sym->n_value += hdr.a_text + hdr.a_data;
+	  case N_TEXT|N_EXT:
+	  case N_DATA|N_EXT:
+
+	    sym->n_value += block;
+
+	    if (st_lookup(sym_tbl, sym->n_un.n_name, &new_sym) != 0
+		&& new_sym->n_value != (long)dln_undefined) {
+		dln_errno = DLN_ECONFL;
+		goto err_exit;
+	    }
+
+	    key = sym->n_un.n_name;
+	    if (st_delete(undef_tbl, (st_data_t*)&key, NULL) != 0) {
+		unlink_undef(key, sym->n_value);
+		free(key);
+	    }
+
+	    new_sym = (struct nlist*)xmalloc(sizeof(struct nlist));
+	    *new_sym = *sym;
+	    new_sym->n_un.n_name = strdup(sym->n_un.n_name);
+	    st_insert(sym_tbl, new_sym->n_un.n_name, new_sym);
+	    break;
+
+	  case N_TEXT:
+	  case N_DATA:
+	    sym->n_value += block;
+	    break;
+	}
+	sym++;
+    }
+
+    /*
+     * First comes the text-relocation
+     */
+    {
+	struct relocation_info * rel = reloc;
+	struct relocation_info * rel_beg = reloc +
+	    (hdr.a_trsize/sizeof(struct relocation_info));
+	struct relocation_info * rel_end = reloc +
+	    (hdr.a_trsize+hdr.a_drsize)/sizeof(struct relocation_info);
+
+	while (rel < rel_end) {
+	    char *address = (char*)(rel->r_address + block);
+	    long datum = 0;
+#if defined(sun) && defined(sparc)
+	    unsigned int mask = 0;
+#endif
+
+	    if(rel >= rel_beg)
+		address += hdr.a_text;
+
+	    if (rel->r_extern) { /* Look it up in symbol-table */
+		sym = &(syms[R_SYMBOL(rel)]);
+		switch (sym->n_type) {
+		  case N_EXT|N_UNDF:
+		    link_undef(sym->n_un.n_name, block, rel);
+		  case N_EXT|N_COMM:
+		  case N_COMM:
+		    datum = sym->n_value;
+		    break;
+		  default:
+		    goto err_exit;
+		}
+	    } /* end.. look it up */
+	    else { /* is static */
+		switch (R_SYMBOL(rel)) { 
+		  case N_TEXT:
+		  case N_DATA:
+		    datum = block;
+		    break;
+		  case N_BSS:
+		    datum = block +  new_common;
+		    break;
+		  case N_ABS:
+		    break;
+		}
+	    } /* end .. is static */
+	    if (R_PCREL(rel)) datum -= block;
+
+#if defined(sun) && defined(sparc)
+	    datum += rel->r_addend;
+	    datum >>= R_RIGHTSHIFT(rel);
+	    mask = (1 << R_BITSIZE(rel)) - 1;
+	    mask |= mask -1;
+	    datum &= mask;
+
+	    switch (R_LENGTH(rel)) {
+	      case 0:
+		*address &= ~mask;
+		*address |= datum;
+		break;
+	      case 1:
+		*(short *)address &= ~mask;
+		*(short *)address |= datum;
+		break;
+	      case 2:
+		*(long *)address &= ~mask;
+		*(long *)address |= datum;
+		break;
+	    }
+#else
+	    switch (R_LENGTH(rel)) {
+	      case 0:		/* byte */
+		if (datum < -128 || datum > 127) goto err_exit;
+		*address += datum;
+		break;
+	      case 1:		/* word */
+		*(short *)address += datum;
+		break;
+	      case 2:		/* long */
+		*(long *)address += datum;
+		break;
+	    }
+#endif
+	    rel++;
+	}
+    }
+
+    if (need_init) {
+	int len;
+	char **libs_to_be_linked = 0;
+	char *buf;
+
+	if (undef_tbl->num_entries > 0) {
+	    if (load_lib(libc) == -1) goto err_exit;
+	}
+
+	init_funcname(&buf, need_init);
+	len = strlen(buf);
+
+	for (sym = syms; sym<end; sym++) {
+	    char *name = sym->n_un.n_name;
+	    if (name[0] == '_' && sym->n_value >= block) {
+		if (strcmp(name+1, "dln_libs_to_be_linked") == 0) {
+		    libs_to_be_linked = (char**)sym->n_value;
+		}
+		else if (strcmp(name+1, buf) == 0) {
+		    init_p = 1;
+		    ((int (*)())sym->n_value)();
+		}
+	    }
+	}
+	if (libs_to_be_linked && undef_tbl->num_entries > 0) {
+	    while (*libs_to_be_linked) {
+		load_lib(*libs_to_be_linked);
+		libs_to_be_linked++;
+	    }
+	}
+    }
+    free(reloc);
+    free(syms);
+    if (need_init) {
+	if (init_p == 0) {
+	    dln_errno = DLN_ENOINIT;
+	    return -1;
+	}
+	if (undef_tbl->num_entries > 0) {
+	    if (load_lib(libc) == -1) goto err_exit;
+	    if (undef_tbl->num_entries > 0) {
+		dln_errno = DLN_EUNDEF;
+		return -1;
+	    }
+	}
+    }
+    return 0;
+
+  err_exit:
+    if (syms) free(syms);
+    if (reloc) free(reloc);
+    if (block) free((char*)block);
+    return -1;
+}
+
+static int target_offset;
+static int
+search_undef(key, value, lib_tbl)
+    const char *key;
+    int value;
+    st_table *lib_tbl;
+{
+    long offset;
+
+    if (st_lookup(lib_tbl, key, &offset) == 0) return ST_CONTINUE;
+    target_offset = offset;
+    return ST_STOP;
+}
+
+struct symdef {
+    int rb_str_index;
+    int lib_offset;
+};
+
+char *dln_librrb_ary_path = DLN_DEFAULT_LIB_PATH;
+
+static int
+load_lib(lib)
+    const char *lib;
+{
+    char *path, *file;
+    char armagic[SARMAG];
+    int fd, size;
+    struct ar_hdr ahdr;
+    st_table *lib_tbl = NULL;
+    int *data, nsym;
+    struct symdef *base;
+    char *name_base;
+
+    if (dln_init_p == 0) {
+	dln_errno = DLN_ENOINIT;
+	return -1;
+    }
+
+    if (undef_tbl->num_entries == 0) return 0;
+    dln_errno = DLN_EBADLIB;
+
+    if (lib[0] == '-' && lib[1] == 'l') {
+	long len = strlen(lib) + 4;
+	char *p = alloca(len);
+	snprintf(p, len, "lib%s.a", lib+2);
+	lib = p;
+    }
+
+    /* library search path: */
+    /* look for environment variable DLN_LIBRARY_PATH first. */
+    /* then variable dln_librrb_ary_path. */
+    /* if path is still NULL, use "." for path. */
+    path = getenv("DLN_LIBRARY_PATH");
+    if (path == NULL) path = dln_librrb_ary_path;
+
+    file = dln_find_file(lib, path);
+    fd = open(file, O_RDONLY);
+    if (fd == -1) goto syserr;
+    size = read(fd, armagic, SARMAG);
+    if (size == -1) goto syserr;
+
+    if (size != SARMAG) {
+	dln_errno = DLN_ENOTLIB;
+	goto badlib;
+    }
+    size = read(fd, &ahdr, sizeof(ahdr));
+    if (size == -1) goto syserr;
+    if (size != sizeof(ahdr) || sscanf(ahdr.ar_size, "%d", &size) != 1) {
+	goto badlib;
+    }
+
+    if (strncmp(ahdr.ar_name, "__.SYMDEF", 9) == 0) {
+	/* make hash table from __.SYMDEF */
+
+	lib_tbl = st_init_strtable();
+	data = (int*)xmalloc(size);
+	if (data == NULL) goto syserr;
+	size = read(fd, data, size);
+	nsym = *data / sizeof(struct symdef);
+	base = (struct symdef*)(data + 1);
+	name_base = (char*)(base + nsym) + sizeof(int);
+	while (nsym > 0) {
+	    char *name = name_base + base->rb_str_index;
+
+	    st_insert(lib_tbl, name, base->lib_offset + sizeof(ahdr));
+	    nsym--;
+	    base++;
+	}
+	for (;;) {
+	    target_offset = -1;
+	    st_foreach(undef_tbl, search_undef, lib_tbl);
+	    if (target_offset == -1) break;
+	    if (load_1(fd, target_offset, 0) == -1) {
+		st_free_table(lib_tbl);
+		free(data);
+		goto badlib;
+	    }
+	    if (undef_tbl->num_entries == 0) break;
+	}
+	free(data);
+	st_free_table(lib_tbl);
+    }
+    else {
+	/* linear library, need to scan (FUTURE) */
+
+	for (;;) {
+	    int offset = SARMAG;
+	    int found = 0;
+	    struct exec hdr;
+	    struct nlist *syms, *sym, *end;
+
+	    while (undef_tbl->num_entries > 0) {
+		found = 0;
+		lseek(fd, offset, 0);
+		size = read(fd, &ahdr, sizeof(ahdr));
+		if (size == -1) goto syserr;
+		if (size == 0) break;
+		if (size != sizeof(ahdr)
+		    || sscanf(ahdr.ar_size, "%d", &size) != 1) {
+		    goto badlib;
+		}
+		offset += sizeof(ahdr);
+		if (load_header(fd, &hdr, offset) == -1)
+		    goto badlib;
+		syms = load_sym(fd, &hdr, offset);
+		if (syms == NULL) goto badlib;
+		sym = syms;
+		end = syms + (hdr.a_syms / sizeof(struct nlist));
+		while (sym < end) {
+		    if (sym->n_type == N_EXT|N_TEXT
+			&& st_lookup(undef_tbl, sym->n_un.n_name, NULL)) {
+			break;
+		    }
+		    sym++;
+		}
+		if (sym < end) {
+		    found++;
+		    free(syms);
+		    if (load_1(fd, offset, 0) == -1) {
+			goto badlib;
+		    }
+		}
+		offset += size;
+		if (offset & 1) offset++;
+	    }
+	    if (found) break;
+	}
+    }
+    close(fd);
+    return 0;
+
+  syserr:
+    dln_errno = errno;
+  badlib:
+    if (fd >= 0) close(fd);
+    return -1;
+}
+
+static int
+load(file)
+    const char *file;
+{
+    int fd;
+    int result;
+
+    if (dln_init_p == 0) {
+	if (dln_init(dln_argv0) == -1) return -1;
+    }
+    result = strlen(file);
+    if (file[result-1] == 'a') {
+	return load_lib(file);
+    }
+
+    fd = open(file, O_RDONLY);
+    if (fd == -1) {
+	dln_errno = errno;
+	return -1;
+    }
+    result = load_1(fd, 0, file);
+    close(fd);
+
+    return result;
+}
+
+void*
+dln_sym(name)
+    const char *name;
+{
+    struct nlist *sym;
+
+    if (st_lookup(sym_tbl, name, &sym))
+	return (void*)sym->n_value;
+    return NULL;
+}
+
+#endif /* USE_DLN_A_OUT */
+
+#ifdef USE_DLN_DLOPEN
+# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ < 105000000
+#  include <nlist.h>
+#  include <link.h>
+# else
+#  include <dlfcn.h>
+# endif
+#endif
+
+#ifdef __hpux
+#include <errno.h>
+#include "dl.h"
+#endif
+
+#if defined(_AIX)
+#include <ctype.h>	/* for isdigit()	*/
+#include <errno.h>	/* for global errno	*/
+#include <sys/ldr.h>
+#endif
+
+#ifdef NeXT
+#if NS_TARGET_MAJOR < 4
+#include <mach-o/rld.h>
+#else
+#include <mach-o/dyld.h>
+#ifndef NSLINKMODULE_OPTION_BINDNOW
+#define NSLINKMODULE_OPTION_BINDNOW 1
+#endif
+#endif
+#else
+#ifdef __APPLE__
+#include <mach-o/dyld.h>
+#endif
+#endif
+
+#if defined _WIN32 && !defined __CYGWIN__
+#include <windows.h>
+#endif
+
+#ifdef _WIN32_WCE
+#undef FormatMessage
+#define FormatMessage FormatMessageA
+#undef LoadLibrary
+#define LoadLibrary LoadLibraryA
+#undef GetProcAddress
+#define GetProcAddress GetProcAddressA
+#endif
+
+static const char *
+dln_strerror()
+{
+#ifdef USE_DLN_A_OUT
+    char *strerror();
+
+    switch (dln_errno) {
+      case DLN_ECONFL:
+	return "Symbol name conflict";
+      case DLN_ENOINIT:
+	return "No initializer given";
+      case DLN_EUNDEF:
+	return "Unresolved symbols";
+      case DLN_ENOTLIB:
+	return "Not a library file";
+      case DLN_EBADLIB:
+	return "Malformed library file";
+      case DLN_EINIT:
+	return "Not initialized";
+      default:
+	return strerror(dln_errno);
+    }
+#endif
+
+#ifdef USE_DLN_DLOPEN
+    return (char*)dlerror();
+#endif
+
+#if defined _WIN32 && !defined __CYGWIN__
+    static char message[1024];
+    int error = GetLastError();
+    char *p = message;
+    p += sprintf(message, "%d: ", error);
+    FormatMessage(
+	FORMAT_MESSAGE_FROM_SYSTEM	 | FORMAT_MESSAGE_IGNORE_INSERTS,
+	NULL,
+	error,
+	MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+	p,
+	sizeof message - strlen(message),
+	NULL);
+
+    for (p = message; *p; p++) {
+	if (*p == '\n' || *p == '\r')
+	    *p = ' ';
+    }
+    return message;
+#endif
+}
+
+
+#if defined(_AIX) && ! defined(_IA64)
+static void
+aix_loaderror(const char *pathname)
+{
+    char *message[8], errbuf[1024];
+    int i,j;
+
+    struct errtab { 
+	int errnum;
+	char *errstr;
+    } load_errtab[] = {
+	{L_ERROR_TOOMANY,	"too many errors, rest skipped."},
+	{L_ERROR_NOLIB,		"can't load library:"},
+	{L_ERROR_UNDEF,		"can't find symbol in library:"},
+	{L_ERROR_RLDBAD,
+	     "RLD index out of range or bad relocation type:"},
+	{L_ERROR_FORMAT,	"not a valid, executable xcoff file:"},
+	{L_ERROR_MEMBER,
+	     "file not an archive or does not contain requested member:"},
+	{L_ERROR_TYPE,		"symbol table mismatch:"},
+	{L_ERROR_ALIGN,		"text alignment in file is wrong."},
+	{L_ERROR_SYSTEM,	"System error:"},
+	{L_ERROR_ERRNO,		NULL}
+    };
+
+#define LOAD_ERRTAB_LEN	(sizeof(load_errtab)/sizeof(load_errtab[0]))
+#define ERRBUF_APPEND(s) strncat(errbuf, s, sizeof(errbuf)-strlen(errbuf)-1)
+
+    snprintf(errbuf, 1024, "load failed - %s ", pathname);
+
+    if (!loadquery(1, &message[0], sizeof(message))) 
+	ERRBUF_APPEND(strerror(errno));
+    for(i = 0; message[i] && *message[i]; i++) {
+	int nerr = atoi(message[i]);
+	for (j=0; j<LOAD_ERRTAB_LEN; j++) {
+           if (nerr == load_errtab[i].errnum && load_errtab[i].errstr)
+		ERRBUF_APPEND(load_errtab[i].errstr);
+	}
+	while (isdigit(*message[i])) message[i]++; 
+	ERRBUF_APPEND(message[i]);
+	ERRBUF_APPEND("\n");
+    }
+    errbuf[strlen(errbuf)-1] = '\0';	/* trim off last newline */
+    rb_loaderror(errbuf);
+    return;
+}
+#endif
+
+#if defined(__VMS)
+#include <starlet.h>
+#include <rms.h>
+#include <stsdef.h>
+#include <unixlib.h>
+#include <descrip.h>
+#include <lib$routines.h>
+
+static char *vms_filespec;
+static int vms_fileact(char *filespec, int type);
+static long vms_fisexh(long *sigarr, long *mecarr);
+#endif
+
+#endif /* NO_DLN_LOAD */
+
+void*
+dln_load(file)
+    const char *file;
+{
+#ifdef NO_DLN_LOAD
+    rb_raise(rb_eLoadError, "this executable file can't load extension libraries");
+#else
+
+#if !defined(_AIX) && !defined(NeXT)
+    const char *error = 0;
+#define DLN_ERROR() (error = dln_strerror(), strcpy(ALLOCA_N(char, strlen(error) + 1), error))
+#endif
+
+#if defined _WIN32 && !defined __CYGWIN__
+    HINSTANCE handle;
+    char winfile[MAXPATHLEN];
+    void (*init_fct)();
+    char *buf;
+
+    if (strlen(file) >= MAXPATHLEN) rb_loaderror("filename too long");
+
+    /* Load the file as an object one */
+    init_funcname(&buf, file);
+
+    strcpy(winfile, file);
+
+    /* Load file */
+    if ((handle = LoadLibrary(winfile)) == NULL) {
+	error = dln_strerror();
+	goto failed;
+    }
+
+    if ((init_fct = (void(*)())GetProcAddress(handle, buf)) == NULL) {
+	rb_loaderror("%s - %s\n%s", dln_strerror(), buf, file);
+    }
+
+    /* Call the init code */
+    (*init_fct)();
+    return handle;
+#else
+#ifdef USE_DLN_A_OUT
+    if (load(file) == -1) {
+	error = dln_strerror();
+	goto failed;
+    }
+    return 0;
+#else
+
+    char *buf;
+    /* Load the file as an object one */
+    init_funcname(&buf, file);
+
+#ifdef USE_DLN_DLOPEN
+#define DLN_DEFINED
+    {
+	void *handle;
+	void (*init_fct)();
+
+#ifndef RTLD_LAZY
+# define RTLD_LAZY 1
+#endif
+#ifdef __INTERIX
+# undef RTLD_GLOBAL
+#endif
+#ifndef RTLD_GLOBAL
+# define RTLD_GLOBAL 0
+#endif
+
+	/* Load file */
+	if ((handle = (void*)dlopen(file, RTLD_LAZY|RTLD_GLOBAL)) == NULL) {
+	    error = dln_strerror();
+	    goto failed;
+	}
+
+	init_fct = (void(*)())dlsym(handle, buf);
+	if (init_fct == NULL) {
+	    error = DLN_ERROR();
+	    dlclose(handle);
+	    goto failed;
+	}
+	/* Call the init code */
+	(*init_fct)();
+
+	return handle;
+    }
+#endif /* USE_DLN_DLOPEN */
+
+#ifdef __hpux
+#define DLN_DEFINED
+    {
+	shl_t lib = NULL;
+	int flags;
+	void (*init_fct)();
+
+	flags = BIND_DEFERRED;
+	lib = shl_load(file, flags, 0);
+	if (lib == NULL) {
+	    extern int errno;
+	    rb_loaderror("%s - %s", strerror(errno), file);
+	}
+	shl_findsym(&lib, buf, TYPE_PROCEDURE, (void*)&init_fct);
+	if (init_fct == NULL) {
+	    shl_findsym(&lib, buf, TYPE_UNDEFINED, (void*)&init_fct);
+	    if (init_fct == NULL) {
+		errno = ENOSYM;
+		rb_loaderror("%s - %s", strerror(ENOSYM), file);
+	    }
+	}
+	(*init_fct)();
+	return (void*)lib;
+    }
+#endif /* hpux */
+
+#if defined(_AIX) && ! defined(_IA64)
+#define DLN_DEFINED
+    {
+	void (*init_fct)();
+
+	init_fct = (void(*)())load((char*)file, 1, 0);
+	if (init_fct == NULL) {
+	    aix_loaderror(file);
+	}
+	if (loadbind(0, (void*)dln_load, (void*)init_fct) == -1) {
+	    aix_loaderror(file);
+	}
+	(*init_fct)();
+	return (void*)init_fct;
+    }
+#endif /* _AIX */
+
+#if defined(NeXT) || defined(__APPLE__)
+#define DLN_DEFINED
+/*----------------------------------------------------
+   By SHIROYAMA Takayuki Psi@fortune.nest.or.jp
+ 
+   Special Thanks...
+    Yu tomoak-i@is.aist-nara.ac.jp,
+    Mi hisho@tasihara.nest.or.jp,
+    sunshine@sunshineco.com,
+    and... Miss ARAI Akino(^^;)
+ ----------------------------------------------------*/
+#if defined(NeXT) && (NS_TARGET_MAJOR < 4)/* NeXTSTEP rld functions */
+
+    {
+        NXStream* s;
+	unsigned long init_address;
+	char *object_files[2] = {NULL, NULL};
+
+	void (*init_fct)();
+	
+	object_files[0] = (char*)file;
+	
+	s = NXOpenFile(2,NX_WRITEONLY);
+
+	/* Load object file, if return value ==0 ,  load failed*/
+	if(rld_load(s, NULL, object_files, NULL) == 0) {
+	    NXFlush(s);
+	    NXClose(s);
+	    rb_loaderror("Failed to load %.200s", file);
+	}
+
+	/* lookup the initial function */
+	if(rld_lookup(s, buf, &init_address) == 0) {
+	    NXFlush(s);
+	    NXClose(s);
+	    rb_loaderror("Failed to lookup Init function %.200s", file);
+	}
+
+	NXFlush(s);
+	NXClose(s);
+
+	/* Cannot call *init_address directory, so copy this value to
+	   funtion pointer */
+	init_fct = (void(*)())init_address;
+	(*init_fct)();
+	return (void*)init_address;
+    }
+#else/* OPENSTEP dyld functions */
+    {
+	int dyld_result;
+	NSObjectFileImage obj_file; /* handle, but not use it */
+	/* "file" is module file name .
+	   "buf" is pointer to initial function name with "_" . */
+
+	void (*init_fct)();
+
+
+	dyld_result = NSCreateObjectFileImageFromFile(file, &obj_file);
+
+	if (dyld_result != NSObjectFileImageSuccess) {
+	    rb_loaderror("Failed to load %.200s", file);
+	}
+
+	NSLinkModule(obj_file, file, NSLINKMODULE_OPTION_BINDNOW);
+
+	/* lookup the initial function */
+	if(!NSIsSymbolNameDefined(buf)) {
+	    rb_loaderror("Failed to lookup Init function %.200s",file);
+	}	
+	init_fct = NSAddressOfSymbol(NSLookupAndBindSymbol(buf));
+	(*init_fct)();
+
+	return (void*)init_fct;
+    }
+#endif /* rld or dyld */
+#endif
+
+#ifdef __BEOS__
+# define DLN_DEFINED
+    {
+      status_t err_stat;  /* BeOS error status code */
+      image_id img_id;    /* extention module unique id */
+      void (*init_fct)(); /* initialize function for extention module */
+
+      /* load extention module */
+      img_id = load_add_on(file);
+      if (img_id <= 0) {
+	rb_loaderror("Failed to load %.200s", file);
+      }
+      
+      /* find symbol for module initialize function. */
+      /* The Be Book KernelKit Images section described to use
+	 B_SYMBOL_TYPE_TEXT for symbol of function, not
+	 B_SYMBOL_TYPE_CODE. Why ? */
+      /* strcat(init_fct_symname, "__Fv"); */  /* parameter nothing. */
+      /* "__Fv" dont need! The Be Book Bug ? */
+      err_stat = get_image_symbol(img_id, buf,
+				  B_SYMBOL_TYPE_TEXT, (void **)&init_fct);
+
+      if (err_stat != B_NO_ERROR) {
+	char real_name[MAXPATHLEN];
+
+	strcpy(real_name, buf);
+	strcat(real_name, "__Fv");
+        err_stat = get_image_symbol(img_id, real_name,
+				    B_SYMBOL_TYPE_TEXT, (void **)&init_fct);
+      }
+
+      if ((B_BAD_IMAGE_ID == err_stat) || (B_BAD_INDEX == err_stat)) {
+	unload_add_on(img_id);
+	rb_loaderror("Failed to lookup Init function %.200s", file);
+      }
+      else if (B_NO_ERROR != err_stat) {
+	char errmsg[] = "Internal of BeOS version. %.200s (symbol_name = %s)";
+	unload_add_on(img_id);
+	rb_loaderror(errmsg, strerror(err_stat), buf);
+      }
+
+      /* call module initialize function. */
+      (*init_fct)();
+      return (void*)img_id;
+    }
+#endif /* __BEOS__*/
+
+#ifdef __MACOS__
+# define DLN_DEFINED
+    {
+      OSErr err;
+      FSSpec libspec;
+      CFragConnectionID connID;
+      Ptr mainAddr;
+      char errMessage[1024];
+      Boolean isfolder, didsomething;
+      Str63 fragname;
+      Ptr symAddr;
+      CFragSymbolClass class;
+      void (*init_fct)();
+      char fullpath[MAXPATHLEN];
+
+      strcpy(fullpath, file);
+
+      /* resolve any aliases to find the real file */
+      c2pstr(fullpath);
+      (void)FSMakeFSSpec(0, 0, fullpath, &libspec);
+      err = ResolveAliasFile(&libspec, 1, &isfolder, &didsomething);
+      if (err) {
+	  rb_loaderror("Unresolved Alias - %s", file);
+      }
+
+      /* Load the fragment (or return the connID if it is already loaded */
+      fragname[0] = 0;
+      err = GetDiskFragment(&libspec, 0, 0, fragname, 
+			    kLoadCFrag, &connID, &mainAddr,
+			    errMessage);
+      if (err) {
+	  p2cstr(errMessage);
+	  rb_loaderror("%s - %s",errMessage , file);
+      }
+
+      /* Locate the address of the correct init function */
+      c2pstr(buf);
+      err = FindSymbol(connID, buf, &symAddr, &class);
+      if (err) {
+	  rb_loaderror("Unresolved symbols - %s" , file);
+      }
+      init_fct = (void (*)())symAddr;
+      (*init_fct)();
+      return (void*)init_fct;
+    }
+#endif /* __MACOS__ */
+
+#if defined(__VMS)
+#define DLN_DEFINED
+    {
+	long status;
+	void (*init_fct)();
+	char *fname, *p1, *p2;
+
+	$DESCRIPTOR(fname_d, "");
+	$DESCRIPTOR(image_d, "");
+	$DESCRIPTOR(buf_d, "");
+
+	decc$to_vms(file, vms_fileact, 0, 0);
+
+	fname = (char *)__alloca(strlen(file)+1);
+	strcpy(fname,file);
+	if (p1 = strrchr(fname,'/'))
+	    fname = p1 + 1;
+	if (p2 = strrchr(fname,'.'))
+	    *p2 = '\0';
+
+	fname_d.dsc$w_length  = strlen(fname);
+	fname_d.dsc$a_pointer = fname;
+	image_d.dsc$w_length  = strlen(vms_filespec);
+	image_d.dsc$a_pointer = vms_filespec;
+	buf_d.dsc$w_length    = strlen(buf);
+	buf_d.dsc$a_pointer   = buf;
+
+	lib$establish(vms_fisexh);
+
+	status = lib$find_image_symbol (
+		     &fname_d,
+		     &buf_d, 
+		     &init_fct, 
+		     &image_d);
+
+	lib$establish(0);
+
+	if (status == RMS$_FNF) {
+	    error = dln_strerror();
+	    goto failed;
+	} else if (!$VMS_STATUS_SUCCESS(status)) {
+	    error = DLN_ERROR();
+	    goto failed;
+	}
+
+	/* Call the init code */
+	(*init_fct)();
+
+	return 1;
+    }
+#endif /* __VMS */
+
+#ifndef DLN_DEFINED
+    rb_notimplement();
+#endif
+
+#endif /* USE_DLN_A_OUT */
+#endif
+#if !defined(_AIX) && !defined(NeXT)
+  failed:
+    rb_loaderror("%s - %s", error, file);
+#endif
+
+#endif /* NO_DLN_LOAD */
+    return 0;			/* dummy return */
+}
+
+static char *dln_find_1();
+
+char *
+dln_find_exe(fname, path)
+    const char *fname;
+    const char *path;
+{
+    if (!path) {
+	path = getenv(PATH_ENV);
+    }
+
+    if (!path) {
+#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__MACOS__)
+	path = "/usr/local/bin;/usr/ucb;/usr/bin;/bin;.";
+#else
+	path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
+#endif
+    }
+    return dln_find_1(fname, path, 1);
+}
+
+char *
+dln_find_file(fname, path)
+    const char *fname;
+    const char *path;
+{
+#ifndef __MACOS__
+    if (!path) path = ".";
+    return dln_find_1(fname, path, 0);
+#else
+    if (!path) path = ".";
+    return _macruby_path_conv_posix_to_macos(dln_find_1(fname, path, 0));
+#endif
+}
+
+static char fbuf[MAXPATHLEN];
+
+static char *
+dln_find_1(fname, path, exe_flag)
+    char *fname;
+    char *path;
+    int exe_flag;		/* non 0 if looking for executable. */
+{
+    register char *dp;
+    register char *ep;
+    register char *bp;
+    struct stat st;
+#ifdef __MACOS__
+    const char* mac_fullpath;
+#endif
+
+    if (!fname) return fname;
+    if (fname[0] == '/') return fname;
+    if (strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0)
+      return fname;
+    if (exe_flag && strchr(fname, '/')) return fname;
+#ifdef DOSISH
+    if (fname[0] == '\\') return fname;
+# ifdef DOSISH_DRIVE_LETTER
+    if (strlen(fname) > 2 && fname[1] == ':') return fname;
+# endif
+    if (strncmp(".\\", fname, 2) == 0 || strncmp("..\\", fname, 3) == 0)
+      return fname;
+    if (exe_flag && strchr(fname, '\\')) return fname;
+#endif
+
+    for (dp = path;; dp = ++ep) {
+	register int l;
+	int i;
+	int fspace;
+
+	/* extract a component */
+	ep = strchr(dp, PATH_SEP[0]);
+	if (ep == NULL)
+	    ep = dp+strlen(dp);
+
+	/* find the length of that component */
+	l = ep - dp;
+	bp = fbuf;
+	fspace = sizeof fbuf - 2;
+	if (l > 0) {
+	    /*
+	    **	If the length of the component is zero length,
+	    **	start from the current directory.  If the
+	    **	component begins with "~", start from the
+	    **	user's $HOME environment variable.  Otherwise
+	    **	take the path literally.
+	    */
+
+	    if (*dp == '~' && (l == 1 ||
+#if defined(DOSISH)
+			       dp[1] == '\\' || 
+#endif
+			       dp[1] == '/')) {
+		char *home;
+
+		home = getenv("HOME");
+		if (home != NULL) {
+		    i = strlen(home);
+		    if ((fspace -= i) < 0)
+			goto toolong;
+		    memcpy(bp, home, i);
+		    bp += i;
+		}
+		dp++;
+		l--;
+	    }
+	    if (l > 0) {
+		if ((fspace -= l) < 0)
+		    goto toolong;
+		memcpy(bp, dp, l);
+		bp += l;
+	    }
+
+	    /* add a "/" between directory and filename */
+	    if (ep[-1] != '/')
+		*bp++ = '/';
+	}
+
+	/* now append the file name */
+	i = strlen(fname);
+	if ((fspace -= i) < 0) {
+	  toolong:
+	    fprintf(stderr, "openpath: pathname too long (ignored)\n");
+	    *bp = '\0';
+	    fprintf(stderr, "\tDirectory \"%s\"\n", fbuf);
+	    fprintf(stderr, "\tFile \"%s\"\n", fname);
+	    goto next;
+	}
+	memcpy(bp, fname, i + 1);
+
+#ifndef __MACOS__
+	if (stat(fbuf, &st) == 0) {
+	    if (exe_flag == 0) return fbuf;
+	    /* looking for executable */
+	    if (!S_ISDIR(st.st_mode) && eaccess(fbuf, X_OK) == 0)
+		return fbuf;
+	}
+#else
+	if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf)) {
+	    if (exe_flag == 0) return mac_fullpath;
+	    /* looking for executable */
+	    if (stat(mac_fullpath, &st) == 0) {
+		if (!S_ISDIR(st.st_mode) && eaccess(mac_fullpath, X_OK) == 0)
+		    return mac_fullpath;
+	    }
+	}
+#endif
+#if defined(DOSISH)
+	if (exe_flag) {
+	    static const char *extension[] = {
+#if defined(MSDOS)
+		".com", ".exe", ".bat",
+#if defined(DJGPP)
+		".btm", ".sh", ".ksh", ".pl", ".sed",
+#endif
+#elif defined(__EMX__) || defined(_WIN32)
+		".exe", ".com", ".cmd", ".bat",
+/* end of __EMX__ or _WIN32 */
+#else
+		".r", ".R", ".x", ".X", ".bat", ".BAT",
+/* __human68k__ */
+#endif
+		(char *) NULL
+	    };
+	    int j;
+
+	    for (j = 0; extension[j]; j++) {
+		if (fspace < strlen(extension[j])) {
+		    fprintf(stderr, "openpath: pathname too long (ignored)\n");
+		    fprintf(stderr, "\tDirectory \"%.*s\"\n", (int) (bp - fbuf), fbuf);
+		    fprintf(stderr, "\tFile \"%s%s\"\n", fname, extension[j]);
+		    continue;
+		}
+		strcpy(bp + i, extension[j]);
+#ifndef __MACOS__
+		if (stat(fbuf, &st) == 0)
+		    return fbuf;
+#else
+		if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf))
+		    return mac_fullpath;
+
+#endif
+	    }
+	}
+#endif /* MSDOS or _WIN32 or __human68k__ or __EMX__ */
+
+      next:
+	/* if not, and no other alternatives, life is bleak */
+	if (*ep == '\0') {
+	    return NULL;
+	}
+
+	/* otherwise try the next component in the search path */
+    }
+}
+
+#if defined(__VMS)
+
+/* action routine for decc$to_vms */
+static int vms_fileact(char *filespec, int type)
+{
+    if (vms_filespec)
+	free(vms_filespec);
+    vms_filespec = malloc(strlen(filespec)+1);
+    strcpy(vms_filespec, filespec);
+    return 1;
+}
+
+/* exception handler for LIB$FIND_IMAGE_SYMBOL */
+static long vms_fisexh(long *sigarr, long *mecarr)
+{
+    sys$unwind(1, 0);
+    return 1;
+}
+
+#endif /* __VMS */
diff --git a/ruby_1_8_6/dln.h b/ruby_1_8_6/dln.h
new file mode 100644
index 0000000000..182cf9f9f4
--- /dev/null
+++ b/ruby_1_8_6/dln.h
@@ -0,0 +1,40 @@
+/**********************************************************************
+
+  dln.h -
+
+  $Author$
+  $Date$
+  created at: Wed Jan 19 16:53:09 JST 1994
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef DLN_H
+#define DLN_H
+
+#ifdef __cplusplus
+# ifndef  HAVE_PROTOTYPES
+#  define HAVE_PROTOTYPES 1
+# endif
+# ifndef  HAVE_STDARG_PROTOTYPES
+#  define HAVE_STDARG_PROTOTYPES 1
+# endif
+#endif
+
+#undef _
+#ifdef HAVE_PROTOTYPES
+# define _(args) args
+#else
+# define _(args) ()
+#endif
+
+char *dln_find_exe _((const char*,const char*));
+char *dln_find_file _((const char*,const char*));
+
+#ifdef USE_DLN_A_OUT
+extern char *dln_argv0;
+#endif
+
+void *dln_load _((const char*));
+#endif
diff --git a/ruby_1_8_6/dmydln.c b/ruby_1_8_6/dmydln.c
new file mode 100644
index 0000000000..09ea06806c
--- /dev/null
+++ b/ruby_1_8_6/dmydln.c
@@ -0,0 +1,2 @@
+#define NO_DLN_LOAD 1
+#include "dln.c"
diff --git a/ruby_1_8_6/dmyext.c b/ruby_1_8_6/dmyext.c
new file mode 100644
index 0000000000..4120d493c3
--- /dev/null
+++ b/ruby_1_8_6/dmyext.c
@@ -0,0 +1,4 @@
+void
+Init_ext()
+{
+}
diff --git a/ruby_1_8_6/doc/ChangeLog-1.8.0 b/ruby_1_8_6/doc/ChangeLog-1.8.0
new file mode 100644
index 0000000000..d168a50f80
--- /dev/null
+++ b/ruby_1_8_6/doc/ChangeLog-1.8.0
@@ -0,0 +1,24345 @@
+Mon Aug  4 17:21:19 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (class_instance_method_list): methods defined in
+	  singleton class and extended modules should be included.
+	  [ruby-dev:21119]
+
+Mon Aug  4 13:05:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (method_proc): should specify YIELD_FUNC_SVALUE.
+	  [ruby-dev:21107]
+
+	* marshal.c (w_object): should not call w_extended for USRMARSHAL
+	  dump. [ruby-dev:21106]
+
+Mon Aug  4 10:42:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit/ui/console/testrunner.rb: Flushed io in the
+	  Console::TestRunner so that it will output immediately.
+
+Mon Aug  4 10:27:22 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* util.h: remove unnecessary parentheses.  [ruby-dev:20879]
+
+Mon Aug  4 10:00:47 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (receive_responses): raise exception to
+	client_thread. Thanks to William Webber.
+
+Mon Aug  4 09:22:53 2003  William Webber <wew@williamwebber.com>
+
+	* lib/net/imap.rb: convert RD to RDoc.
+
+Mon Aug  4 02:34:05 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_utime): never use utime() of C runtime.
+	  [ruby-talk:77782]
+
+Sun Aug  3 23:56:50 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_call_super): should propagate previous block for
+	  super call.  [ruby-talk:77884]
+
+Sun Aug  3 22:07:47 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkentry.rb: support 'validatecommand' option of 
+	  TkEntry/TkSpinbox widget
+
+	* ext/tk/sample/{demos-en,demos-jp}/spin.rb: add
+
+Sun Aug  3 19:25:28 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (call_trace_func): clear exception flag temporarily.
+	  [ruby-dev:21090]
+
+Sun Aug  3 18:03:44 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* regex.h (re_mbctab): should refer to RUBY_EXPORT.  [ruby-ext:02199]
+
+	* lib/un.h (help): new.  % ruby -run -e help cp
+
+Sun Aug  3 08:53:06 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/{demos-en,demos-jp}/image3.rb: add 
+
+	* ext/tk/lib/tkcanvas.rb: bug fix on Tk object ID management
+
+	* ext/tk/lib/tktext.rb: ditto
+
+Sun Aug  3 02:55:52 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* process.c: modify macro to detect 'MacOS X' [ruby-talk:77849]
+
+	* ext/tcltklib/lib/tcltk.rb: bug fix ( NOT MAINTAINED : only
+	  for running 'line2.rb' demo. )
+
+Sun Aug  3 02:45:06 2003  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* numeric.c (flo_to_s): get rid of buffer overflow.
+
+Sat Aug  2 23:51:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (appendline): clearerr(3) before raising exception, since
+	  exception may be captured by rescue. [ruby-talk:77794]
+
+Sat Aug  2 09:58:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: bug fix --- TkGrid failed to treat 
+	  RELATIVE PLACEMENT
+
+	* ext/tk/sample/demos-en/, demos-jp/: add or modify some
+	  widget demo scripts
+
+Sat Aug  2 20:59:38 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/https.rb: change an option name.
+	  :SSLCertStore -> :SSLCertificateStore.
+
+Sat Aug  2 19:18:40 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: respond_to? needs 2nd argument.
+	  Thanks Jim Bob.  [ruby-talk:77796]
+
+Sat Aug  2 15:11:54 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb (--no-undefined): annoying option removed.
+
+Sat Aug  2 14:53:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (pkg_config): get configuration by pkg-config.  [new]
+
+	* ext/openssl/extconf.rb: use pkg_config.
+
+Sat Aug  2 13:45:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c: add "#pragma weak" for __libc_ia64_register_backing_store_base.
+	  [ruby-dev:21072]
+
+Sat Aug  2 14:02:39 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (classname): find regular class name if not set.
+	  [ruby-dev:20496]
+
+Sat Aug  2 09:58:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: bug fix --- forgot to entry a widget class 
+	  name of 'labelframe' widget
+
+	* ext/tk/sample/{demos-en,demos-jp}/{labelframe.rb,paned1.rb,
+	  paned2.rb,spin.rb}: add demo-scripts to the JP/EN widget demos
+
+Sat Aug  2 05:04:30 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkentry.rb: bug fix of TkEntry#delete
+
+	* ext/tk/samples/: bug fix of some widget demos
+
+	* ext/tk/lib/tk.rb: support <TkVariable object> == <Symbol>
+
+	* ext/tk/lib/*.rb: freeze some object for security reason
+
+Sat Aug  2 03:30:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_obj_singleton_methods): should not go up to
+	  ancestors unless the recursive flag is set. [ruby-list:38007]
+
+	* eval.c (rb_yield_0): expand [] to nil if avalue is set.
+	   [ruby-dev:21058]
+
+	* hash.c (env_each_key): use env_keys to avoid environment modify
+	  on the fly.
+
+	* hash.c (env_each_value): use env_values for safety.
+
+	* hash.c (env_each): allocate environment array first.
+
+Fri Aug  2 03:20:00 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+
+	* lib/yaml/store.rb (YAML::Store#initialize): filename is first
+	  argument.  Thanks Kent Dahl.
+
+Sat Aug  2 00:49:31 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: refine document.
+
+Fri Aug  1 23:57:45 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (rb_gc_mark_locations): no need to swap arguments.
+
+	* gc.c (STACK_LENGTH): insufficient for growing up stack
+	  architectures.
+
+	* gc.c (rb_gc, Init_stack) ditto.
+
+Fri Aug  1 23:33:36 2003  Masatoshi Seki  <mas@snow.local.>
+
+	* rubytest.rb: set dldpath on darwin.
+
+Fri Aug  1 23:07:38 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: convert RD to RDoc. Thanks William Webber.
+	  [ruby-doc:456]
+
+Fri Aug  1 19:48:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/syck/rubyext.c (syck_emitter_write_m): forgot to declare
+	  "self", making it default to "int".
+
+	* ext/syck/rubyext.c (syck_emitter_simple_write): ditto.
+
+	* gc.c (rb_gc): should mark backing store region on IA64.
+
+Fri Aug  1 18:51:10 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* process.c: bug fix --- preprocessor errors occur on OpenBSD-current
+
+Fri Aug  1 17:13:23 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/extconf.rb: should replace literally.
+
+Fri Aug  1 16:22:57 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_check_readable, rb_io_check_writable): ensure not
+	  closed at first.
+
+	* io.c (rb_io_getline): check readable always.  (ruby-bugs:PR#1069)
+
+	* io.c (rb_io_each_byte): ditto.
+
+Fri Aug  1 16:02:46 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (READ_DATA_PENDING_PTR): cast to get rid of warnings.
+
+	* ext/socket/socket.c (unix_send_io, unix_recv_io): ditto.
+
+Fri Aug  1 15:53:24 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.c (isInternalCmd): shouldn't return if find end of str.
+	  [ruby-talk:77678]
+
+Fri Aug  1 13:45:14 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_call_super): propagate previous block if a block is
+	  given.  [ruby-talk:77577]
+
+Fri Aug  1 09:54:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_fill): array length may be changed during the
+	  block execution. [ruby-talk:77579]
+
+	* array.c (rb_ary_zip): ditto.
+
+	* array.c (rb_ary_fill): ditto.
+
+	* hash.c (env_reject_bang): length may be changed during the block
+	  execution.
+
+	* hash.c (env_clear): ditto.
+
+Fri Aug  1 04:58:55 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: bug fix --- forget to eval given block to 
+	  TkRoot.new method
+
+	* ext/tk/sample/tkoptdb-safeTk.rb: new sample script
+
+Fri Aug  1 00:52:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (Init_stack): IA64 requires STACK_LEVEL_MAX to be less than
+	  magic number when optimizer turned on, regardless of rlimit
+	  values.
+
+Thu Jul 31 23:44:00 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/erb.rb: import erb-2.0.4b4.
+
+Thu Jul 31 23:04:45 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/sample/resource.en, ext/tk/sample/resource.jp: 
+	  wrong resource file format
+
+	* ext/tk/lib/tk.rb: add Tk::Encoding.{encoding_convertfrom, 
+	  encoding_convertto}
+
+	* ext/tk/lib/tk.rb: add TkOptionDB.read_with_encoding to read 
+	  non-utf8 resource file
+
+Thu Jul 31 23:02:47 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/etc/etc.c: revert getenv()'s prototype. use it only when _WIN32
+	  is not defined.
+
+Thu Jul 31 20:52:40 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: (IMPORTANT BUG FIX) scan of event keywords
+	  doesn't work on recent versions of Tck/Tk
+
+	* ext/tk/lib/tk.rb: initialize error of instance variable on 
+	  TkComposite
+
+	* ext/tk/lib/multi-tk.rb: initialize error on encoding-system on 
+	  MultiTkIp
+
+	* ext/tk/lib/tk.rb: trouble on destroying widgets
+
+	* ext/tk/sample/demos-en/, demos-jp/: add JP and EN version of 
+	  Ruby/Tk widget demos
+
+Thu Jul 31 15:25:12 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* array.c (rb_ary_collect): must get length of array for each
+	  iteration. reported on [ruby-talk:77500], and fixed by
+	  K.Sasada <ko1@namikilab.tuat.ac.jp> on [ruby-talk:77504]
+
+Thu Jul 31 14:11:54 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: move gmake specific features
+	  into GNUmakefile.
+
+Thu Jul 31 12:36:11 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* bin/erb, lib/erb.rb: add explicit trim mode.
+
+Thu Jul 31 04:59:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (rb_num_coerce_relop): export function.
+
+Thu Jul 31 08:18:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+
+	* lib/test/unit.rb: A useful return code is now set if tests fail when
+	  running automatically using the Console::TestRunner.
+
+Thu Jul 31 07:59:18 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: wrap the command-proc of TkScale --- pass 
+	  the numeric object to the proc
+
+	* ext/tk/lib/tk.rb: better support for widgets created on 
+	  Tk interpreter (without Ruby)
+
+	* ext/tk/lib/multi-tk.rb: a little more stable on Multiple Tk 
+	  interpreters running
+
+Thu Jul 31 00:17:19 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (return_code): obsolete.
+
+	* lib/net/ftp.rb (last_response_code): new method. lastresp is now
+	  alias to last_response_code.
+
+	* lib/net/ftp.rb (last_response): new method.
+
+Wed Jul 30 23:55:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): check has been dropped. "_dump must return
+	  string." [ruby-dev:21024]
+
+Wed Jul 30 22:35:19 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/mkmf.rb (dir_config): allow multiple directories separated
+	  by File::PATH_SEPARATOR.
+
+	* lib/mkmf.rb (create_makefile): DLDFLAGS include $LDFLAGS again.
+	  [ruby-talk:76894]
+
+	* lib/mkmf.rb (init_mkmf): not default $LDFLAGS to LDFLAGS for
+	  ruby itself, but default $DLDFLAGS to DLDFLAGS.
+
+Wed Jul 30 16:17:06 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): marshal_dump should not take any
+	  argument.
+
+Wed Jul 30 15:54:04 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_initialize): should initialize
+	  instance variables. [ruby-talk:77362]
+
+Wed Jul 30 15:39:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): -F set compiled regular expression to $;.
+	  [ruby-talk:77381]
+
+	* string.c (Init_String): no setter type check for $;
+
+Wed Jul 30 15:10:02 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* error.c (rb_raise): snprintf() termination moved to
+	  win32/win32.c.
+
+	* win32/win32.c (valid_filename, str_grow): unused.
+
+	* win32/win32.c (NTLoginName, ChildRecord): make static.
+
+	* win32/win32.c (CreateChild): argument check.
+
+	* win32/win32.c (kill): should not call CloseHandle() when
+	  OpenProcess() failed.
+
+	* win32/win32.c (rb_w32_vsnprintf, rb_w32_snprintf): ensure buffer
+	  terminated.  [ruby-talk:69672]
+
+Wed Jul 30 10:54:10 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (get): fix wrong argument name. Thanks to William
+	  Webber.
+
+Wed Jul 30 10:31:37 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/iconv/iconv.c (iconv_convert): append unchanged portion
+	  after overflow.  [ruby-dev:21006]
+
+	* ext/iconv/extconf.rb: check if iconv() 2nd argument is const.
+
+Wed Jul 30 09:31:55 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in (os2-emx): renamed from os2_emx, add flags to
+	  CFLAGS and LDFLAGS, and remove lib prefix.  [ruby-dev:20993]
+
+	* file.c (rb_file_s_rename): retry with removing new file on
+	  DOSISH.  [ruby-dev:21007]
+
+	* ext/socket/extconf.rb (sendmsg, recvmsg): check functions.
+
+	* ext/socket/socket.c (unix_send_io, unix_recv_io): raise
+	  NotImplementedError unless system calls are available.
+
+	* ext/socket/socket.c (sock_initialize): rename from sock_init()
+	  to get rid of conflict with OS/2 socket library.
+
+Wed Jul 30 07:23:14 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkentry.rb: fix lack of methods for TkEntry
+
+	* ext/tk/lib/multi-tk.rb, ext/tk/lib/tk.rb, 
+	  ext/tk/lib/tkdialog.rb, ext/tk/lib/tkentry.rb, 
+	  ext/tk/sample/safe-tk.rb, ext/tk/sample/tktimer2.rb: bug fix
+
+	* ext/tk/lib/multi-tk.rb: MultiTkIp.new_* accept a block to 
+	  eval under the new interpreter
+
+Wed Jul 30 04:36:30 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c, 
+	  ext/tk/lib/tk.rb, ext/tk/lib/tkafter.rb: additional check of 
+	  Tk interpreters' status for a little more safety
+
+Wed Jul 30 02:37:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): if object responds to 'marshal_dump',
+	  Marshal.dump uses it to dump object.  unlike '_dump',
+	  marshal_dump returns any kind of object.
+
+	* marshal.c (r_object0): restore instance by calling
+	  'marshal_load' method.  unlike '_load', it's an instance
+	  method, to handle cyclic reference.
+
+	* marshal.c (marshal_load): all objects read from file should be
+	  tainted. [ruby-core:01325]
+
+Wed Jul 30 01:47:51 2003  Hugh Sasse  <hgs@dmu.ac.uk>
+
+	* lib/timeout.rb (Timeout::timeout): execute immediately if sec is
+	  zero.
+
+Wed Jul 30 01:36:18 2003  Aron Griffis  <ruby-talk@griffis1.net>
+
+	* ext/socket/socket.c (socks_init): typo fixed. [ruby-talk:77232]
+
+Wed Jul 30 00:48:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/extconf.rb: the default value for --enable-socks is
+	  taken from ENV["SOCKS_SERVER"]. [ruby-talk:77232]
+
+	* ruby.c (proc_options): add -W option. -W0 to shut up all warning
+	  messages. [ruby-talk:77227]
+
+	* error.c (rb_warn): no message will be printed if the value of
+	  $VERBOSE is "nil", i.e. perfect silence.
+
+	* ruby.c (verbose_setter): $VERBOSE value is either true, false,
+	  or nil.
+
+	* io.c (Init_IO): no "read" check for $stdin.  in addition some
+	  function names has been changed.
+
+Tue Jul 29 23:10:19 2003  Yoshida Masato  <yoshidam@yoshidam.net>
+
+	* regex.c (re_match_exec): incorrect multibyte match.
+
+Tue Jul 29 22:36:50 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb (send0): do taint check only when $SAFE > 0
+
+Tue Jul 29 19:20:34 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/fileutils.rb (install): support preserve timestamp.
+
+	* instruby.rb (install): use FileUtils::install preserve mode.
+
+	* lib/un.rb: new.  % ruby -run -e cp -- -p foo bar
+
+	* lib/mkmf.rb: use un.rb instead of ftools.rb.
+
+	* MANIFEST: add lib/un.rb.
+
+	* ext/extmk.rb (INSTALL_PROG, INSTALL_DATA): modify verbose messages.
+
+Tue Jul 29 18:55:22 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: unify coding style.
+
+	* lib/net/http.rb: ditto.
+
+Tue Jul 29 17:27:59 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ruby.h (LLONG_MIN): fix typo.
+
+Tue Jul 29 16:38:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/smtp.rb (Net::SMTP::send0): add taint check.
+
+Tue Jul 29 15:41:02 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* instruby.rb (install): preserve the timestamp for Mac OS X ranlib
+	  problem.
+
+Tue Jul 29 01:14:51 2003  Rick Ohnemus  <rick_ohnemus@acm.org>
+
+	* ruby.h (LLONG_MIN): wrong value.
+
+Mon Jul 28 22:57:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_getc): $stdin may not be IO. [ruby-dev:20973]
+
+Tue Jul 29 16:20:36 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: bug fix and 
+	  change mainloop_abort_on_no_widget_cmd => mainloop_abort_on_exception
+	  ( to avoid thread timing trouble on accessing destroyed widgets )
+
+	* ext/tk/lib/multi-tk.rb: change default mode of 
+	  mainloop_abort_on_exception on multi-tk.rb
+
+	* ext/tk/lib/multi-tk.rb: fix a bug of the procedure for 
+	  'Delete' button on the safe-Tk frmae
+
+Tue Jul 29 12:22:28 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/token.c: prefixed many constants and definitions
+	  with YAML_ to avoid name clash.
+
+	* ext/syck/gram.c: ditto.
+
+	* ext/syck/gram.h: ditto.
+
+Tue Jul 29 12:15:37 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/etc/etc.c: add real prototype to getenv().
+
+	* win32/win32.h: add arguments to definitions of functions if possible.
+
+Tue Jul 29 08:05:30 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb, ext/tk/lib/tkdialog.rb, ext/tk/lib/tktext.rb, 
+	  ext/tk/sample/tkbiff.rb, ext/tk/sample/tkdialog.rb, 
+	  ext/tk/sample/tkform.rb: bug fix ( tested with Ruby/Tk widget demo )
+
+Tue Jul 29 04:22:08 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/syck.h: Added 'syck' yacc prefixes.
+
+	* ext/syck/gram.c: ditto.
+
+	* ext/syck/token.c: ditto.
+
+	* ext/syck: Added ruby.h reference to source files.
+
+Tue Jul 29 03:53:28 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/lib/net/https.rb (use_ssl=): raise ProtocolError if
+	  connection is set up already.
+
+Tue Jul 29 01:45:32 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: use RTEST()
+
+Tue Jul 29 01:24:32 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: bug fix
+
+	* ext/tk/lib/multi-tk.rb: bug fix and pack options are pssed
+	  to the safeTk container
+
+	* ext/tk/sample/safe-tk.rb: add example for pack options of 
+	  safeTk container
+
+Mon Jul 28 23:23:08 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* file.c (Init_File): IO should include File::Const.
+	  [ruby-dev:20964]
+
+Mon Jul 28 18:53:03 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/openssl/extconf.rb: check again after pkg-config for MinGW on
+	  Cygwin.
+
+Mon Jul 28 15:32:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_gets): only "gets" should set $_.
+
+	* ext/stringio/stringio.c (strio_getline): should not set $_ here.
+
+	* io.c (argf_to_s): argf.to_s returns "ARGF".
+
+	* io.c (set_defout_var, set_deferr_var): make $defout and $deferr
+	  obsolete.
+
+	* io.c (set_input_var, set_output_var): allow $stdin, $stdout,
+	  $stderr not to be instance of IO.
+
+	* io.c (rb_f_readline): forward method to current_file. gets,
+	  readline, readlines, getc, readchar, tell, seek, pos=, rewind,
+	  fileno, to_io, eof, each_line, each_byte, binmode, and closed?
+	  as well.
+
+	* io.c (argf_forward): utility function to forward method to
+	  current_file.
+
+Mon Jul 28 06:10:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: bug fix
+
+	* ext/lib/tk/multi-tk.rb: bug fix
+
+	* ext/lib/tk/multi-tk.rb: add methods depend on Tcl's 'interp' command
+
+	* ext/lib/tk/multi-tk.rb: suppot safe-level control of each interpreter
+
+Mon Jul 28 03:08:47 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb: each() should return self.
+
+Mon Jul 28 01:35:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_chomp_bang): defer rb_str_modify() to actual
+	  modify point.  other methods, replace, tr, delete, squeeze,
+	  lstrip, and rstrip as well.
+
+	* string.c (rb_str_rstrip_bang): remove trailing '\0' at the end
+	  of string.
+
+	* string.c (rb_str_lstrip_bang): do not strip '\0' from the left.
+
+Sun Jul 27 21:16:30 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/openssl/extconf.rb: better support MinGW.  add
+	  dir_config("kerberos") and with_config("pkg-config").
+
+	* mkconfig.rb: initialize global variables to avoid warnings.
+
+Sun Jul 27 19:35:06 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: add some methods to support
+	  multiple interpreters (low level)
+
+	* ext/tk/lib/multi-tk.rb: new library to support multiple Tk 
+	  interpreters (high level)
+
+	* ext/tcltklib/demo/safeTk.rb: new sample of safeTk interpreter
+
+	* ext/tk/sample/safe-tk.rb: new sample of multi-tk.rb
+
+	* ext/tk/lib/tk.rb: bug fix and add feature to supprt multi-tk
+
+	* ext/tk/lib/tkafter.rb: ditto
+
+Sun Jul 27 14:43:37 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/debug.rb: fix breakpoint parameter parsing/checking.
+	  (?:(file|class):)(line_number|method)
+
+Sun Jul 27 10:21:28 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/unix.rb: add UNIXFileOwner, UNIXFileGroup.
+
+Sun Jul 27 03:10:43 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* io.c (io_reopen): avoid dup2() equal handles not to close itself and
+	  to get rid of a msvcrt bug.  [ruby-dev:20919]
+
+Sun Jul 27 00:37:16 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/tmpdir.rb: use GetWindowsDirectory, not GetSystemDirectory.
+	  [ruby-talk:77073]
+
+Sat Jul 26 21:25:21 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* io.c (rb_fdopen): set errno if it's zero on win32 platforms.
+
+	* ext/openssl/ossl_ssl.c (TO_SOCKET): define special version when
+	  _WIN32 is defined. this is ruby's problem, not OpenSSL.
+
+	* win32/win32.c: remove some old comments.
+
+Sat Jul 26 14:26:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/tk/lib/tk.rb (TkCore::chooseDirectory): back up wrongly
+	  removed method.
+
+Sat Jul 26 14:14:12 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/stringio/stringio.c: includes Enumerable as well as IO.
+	  [ruby-talk:77058]
+
+Sat Jul 26 07:00:53 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/erb.rb: fix % line.
+
+Sat Jul 26 05:31:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl.h: fix comment.
+
+	* ext/openssl/ossl.c (ossl_debug): should enable if no va-args
+	  macro supplied.
+
+Sat Jul 26 04:04:36 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: refine va-args macro detection.
+	  [ruby-talk:76983]
+
+Sat Jul 26 01:33:51 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_setup): need to pass the real
+	  socket to SSL_get_fd on native win32 platforms.
+
+Sat Jul 26 01:20:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_mod_const_missing): "const_missing" should not
+	  appear in the caller(); add call frame adjustment.
+
+	* eval.c (rb_method_missing): simplify call frame adjustment.
+
+Fri Jul 26 00:04:25 2003  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
+
+	* ext/openssl/sample: add samples.
+	  - cert2text.rb: dump certificate file as text.
+	  - crlstore.rb: CRL store implementation.  Fetch CRL via HTTP when
+	    http-access2 is installed.
+	  - certstore.rb: certificate store implementation.
+	  - cert_store_view.rb: certificate store viewer with FXRuby.  Uses
+	    c_rehash.rb, crlstore.rb and certstore.rb.
+
+Fri Jul 25 16:43:03 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: add TclTkIp#create_slave, 
+	  TclTkIp#_make_safe and TclTkIp#safe?
+
+	* ext/tcltklib/MANUAL.euc: modify descriptions
+
+	* ext/tk/lib/tk.rb: bug fix [ruby-talk:76980] and modify to 
+	  support multi Tk IPs
+
+	* ext/tk/lib/tkafter.rb: modify to support multi Tk IPs
+
+Fri Jul 25 15:47:39 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: add check for BN_rand_range() and
+	  BN_pseudo_rand_range().
+
+	* ext/openssl/ossl_bn.c (ossl_bn_s_rand_range): should raise 
+	  NotImplementedError if BN_rand_range() wan not defined.
+
+	* ext/openssl/ossl_bn.c (ossl_bn_s_pseudo_rand_range): should raise 
+	  NotImplementedError if BN_pseudo_rand_range() wan not defined.
+
+	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_s_encrypt): avoid compiler
+	  warning for OpenSSL-0.9.6.
+
+	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7si_initialize): ditto.
+
+Fri Jul 25 14:34:55 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (tcp_s_gethostbyname): was using
+	  uninitialized size_t value. [ruby-talk:76946]
+
+Fri Jul 25 13:38:38 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* re.c (rb_reg_options_m): use rb_reg_options() to mask internal
+	  flags.
+
+	* re.c (rb_reg_initialize_m): allow nil as third argument and
+	  ignore, and mask code flags if the argument is given.
+	  [ruby-dev:20885]
+
+	* re.c (rb_reg_options): get common flags directly.
+
+Fri Jul 25 03:52:21 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+
+	* lib/yaml/dbm.rb: replace indexes with values_at.
+
+Fri Jul 25 02:55:59 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: add check for libsocket and libnsl.
+
+	* ext/openssl/extconf.rb: use pkg-config to build CFLAGS and LDFLAGS.
+
+Fri Jul 25 01:27:59 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/emitter.c (syck_emitter_flush): accepts count
+	  of bytes to flush.  anchor offsets now functional.
+
+	* ext/syck/syck.h (syck_emitter_flush): ditto.
+
+	* ext/syck/rubyext.c: ditto.
+
+	* ext/syck/token.c: URI escaping now supported.
+
+Thu Jul 24 16:41:31 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/mkmf.rb (have_type): check if a type is defined.
+
+	* lib/mkmf.rb (check_sizeof): check size of a type.
+
+	* ext/dbm/extconf.rb: check if type DBM is defined.
+	  [ruby-talk:76693]
+
+Thu Jul 24 16:18:40 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ChangeLog (add-log-time-format): "%c" contains timezone on
+	  XEmacs.
+
+Thu Jul 24 16:05:22 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in (AC_C_VOLATILE): check if volatile works.
+
+	* defines.h (volatile): removed.
+
+	* eval.c (rb_thread_group): Thread#group.  [new]
+
+Thu Jul 24 15:50:42 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/extconf.rb: add check for win32 OpenSSL libraries.
+
+	* ext/openssl/extconf.rb: add check for __VA_ARGS__.
+
+	* ext/openssl/ossl.h: avoid non C99 compiler errors.
+
+Thu Jul 24 13:32:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (thgroup_add): no warning for terminated threads.
+
+Thu Jul 24 13:09:26 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb: added.
+
+Thu Jul 24 11:21:10 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/io/wait/extconf.rb: removed unnecessary backward
+	  compatibility stuff.
+
+Thu Jul 24 11:09:10 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/openssl/extconf.rb: revert use of dir_config.
+
+Thu Jul 24 09:58:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/Win32API/lib/win32/resolv.rb: added.
+
+	* lib/resolv.rb: support Win32 platforms. based on Tietew's work
+	  [ruby-dev:15573].
+
+Thu Jul 24 04:05:46 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ssl.h: undef X509_NAME and PKCS7_SIGNER_INFO to
+	  avoid name confliction on mswin32.
+
+	* ext/openssl/ssl.c (ossl_protect_obj2bio): avoid VC++ warnings
+	  in function prototype.
+
+	* ext/openssl/ssl.c (ossl_protect_membio2str): ditto.
+
+	* ext/openssl/ssl.c (ossl_protect_x509_ary2sk): ditto.
+
+Thu Jul 24 03:44:04 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
+
+	* ext/openssl/extconf.rb: cut check for OpenSSL version
+
+Thu Jul 24 03:41:30 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/tcltklib/tcltklib.c (ip_init): need at least one statement after
+	  label.
+
+Thu Jul 24 01:48:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension::[]): should return StringIO (or
+	  Tempfile) for multipart/form.
+
+	* variable.c (rb_define_const): give warning for non constant
+	  name. [ruby-core:01287]
+
+Thu Jul 24 01:51:08 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick: imported.
+
+	* MANIFEST: added webrick files.
+
+Thu Jul 24 01:32:04 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/tmpdir.rb (tmpdir): new method.  remove TMPDIR.
+	  use GetSystemWindowsDirectory(GetSystemDirectory), not GetTempPath.
+
+Thu Jul 24 01:08:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl: imported.
+
+Wed Jul 23 23:06:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* file.c (DOSISH): better Cygwin support.
+
+Wed Jul 23 19:13:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_split_m): the receiver may be empty string.
+
+Wed Jul 23 18:43:00 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/erb.rb: import erb-2.0.4b1.
+
+Wed Jul 23 18:21:52 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/io/wait: imported.
+
+Wed Jul 23 16:07:35 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* process.c: unify indentation
+
+	* configure.in: add --enable-setreuid option
+
+	* ext/tcltklib/tcltklib.c: TclTkIp.new accepts 'ip-name' and 'options'
+
+	* ext/tk/lib/tk.rb: support arguments of TclTkIp.new
+
+	* ext/tk/lib/tk*.rb: preparations for multi-Tk interpreter support
+
+Wed Jul 23 15:49:01 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_lstrip_bang): strip NUL along with white
+	  spaces. [ruby-talk:76659]
+
+	* string.c (rb_str_rstrip_bang): ditto.
+
+Wed Jul 23 14:19:17 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/mkmf.rb (log_src, checking_for, create_header):
+	  Logging.message is printf like format.
+
+Wed Jul 23 10:11:15 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/iconv/iconv.c (check_iconv): check if Iconv instance.
+
+	* ext/iconv/iconv.c (iconv_convert): stringify argument.
+
+Wed Jul 23 02:39:46 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* process.c: add a module for raw syscalls to control UID/GID
+
+	* process.c: add modules for portable UID/GID control
+
+Tue Jul 22 19:16:40 2003  Tanaka Akira  <akr@m17n.org>
+
+	* ext/iconv/iconv.c (iconv_failure_initialize): limit
+	  inspect message.  [ruby-dev:20785]
+
+	* ext/iconv/iconv.c (rb_str_derive): share with original
+	  string if possible.  [ruby-dev:20785]
+
+Tue Jul 22 17:22:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_mod_const_missing): new method. [ruby-core:00441]
+
+	* variable.c (rb_const_get_at): allow "const_missing" hook.
+
+	* variable.c (rb_const_get_0): ditto.
+
+	* eval.c (method_missing): rename from rb_undefined to clarify.
+
+	* eval.c (ruby_finalize_0): update exit status if any of END proc
+	  raises SystemExit. [ruby-core:01256]
+
+	* signal.c (rb_trap_exit): wrap rb_eval_cmd
+
+	* eval.c (rb_exec_end_proc): reduce rb_protect().
+
+Tue Jul 22 17:15:57 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* MANIFEST (lib/cgi/session/pstore.rb, lib/yaml/baseemitter.rb):
+	  added.
+
+Tue Jul 22 10:52:19 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* lib/tmpdir.rb: remove charcters after "\000" and regularize path.
+
+Tue Jul 22 02:22:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_equal): should not use rb_equal().
+
+	* string.c (rb_str_equal): should return nil for non string
+	  operand to conform comparable convention. [ruby-dev:20759]
+
+Tue Jul 22 00:19:19 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/tmpdir.rb: new library to get temporary directory path,
+	  using GetTempPath on Win32 environment.
+
+	* lib/tempfile.rb: now uses tmpdir.rb.
+
+	* lib/cgi/session.rb, ib/drb/unix.rb: ditto.
+
+Mon Jul 21 01:53:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_string_value_cstr): check null byte in the string
+	  before retrieving C ptr.  accessed via macro StringValueCStr.
+
+	* file.c: use StringValueCStr to retrieve paths to system calls.
+
+	* file.c (sys_fail2): raise error for two operand system calls
+	  such as rename, link, symlink.  (ruby-bugs PR#1047)
+
+Sun Jul 20 11:03:25 2003  UENO Katsuhiro  <katsu@blue.sky.or.jp>
+
+	* ext/zlib/zlib.c (gzfile_read_header): gz->z.input may be nil after
+	  finishing reading a gzip header.
+
+Sat Jul 19 22:25:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_match2): add warning to "~string".
+	  [ruby-list:37751]
+
+	* lib/net/ftp.rb (Net::FTP::open): takes block.  suggested by Gavin
+	  Sinclair in [ruby-core:01237].
+
+Sat Jul 19 19:03:24 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+
+	* wince/stdlib.c: add bsearch().
+
+Sat Jul 19 12:34:45 2003  David Black  <dblack@superlink.net>
+
+	* lib/scanf.rb: import.
+
+Sat Jul 19 11:27:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/xmlrpc: import.
+
+	* eval.c (thgroup_add): should return group for terminated thread
+	  case.
+
+	* eval.c (thgroup_add): do not raise ThreadError on terminated
+	  thread addition for compatibility.  just warning.
+
+Sat Jul 19 04:50:56 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/iconv/charset_alias.rb, ext/iconv/extconf.rb: make wrapper
+	  script which maps charset names.  [ruby-dev:20625]
+
+	* ext/iconv/iconv.c (charset_map): charset name map.
+
+	* ext/iconv/iconv.c (iconv_dfree): no exception while
+	  finalization.
+
+	* ext/iconv/iconv.c (iconv_s_conv): new method Iconv.conv.
+	  [ruby-dev:20588]
+
+Sat Jul 19 03:09:18 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/Win32API/lib/win32/registry.rb (Win32::Registry::Error):
+	  inherit StandardError instead of SystemCallError.
+
+Sat Jul 19 02:00:39 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_attr): extra calls of method_added.  [ruby-talk:76361]
+
+Fri Jul 18 18:44:22 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/mkmf.rb (init_mkmf): clear $INSTALLFILES.  [ruby-dev:20727]
+
+Fri Jul 18 17:34:39 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/mkmf.rb (rm_f): use FileUtils.
+
+	* lib/mkmf.rb (modified?): return mtime of the target if
+	  it exists and newer than times.
+
+	* lib/mkmf.rb (install_files): add a current directory
+	  file even if it does not exist yet.
+
+	* lib/mkmf.rb (configuration): do not add $LDFLAGS to
+	  DLDFLAGS.
+
+	* ext/extmk.rb (extmake): check whether Makefile is newer
+	  than depend and MANIFEST.
+
+Fri Jul 18 14:57:19 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.c (make_cmdvector): recognize quote within string.
+	  based on Nobu's patch ([ruby-win32:450]). [ruby-talk:75853]
+
+Fri Jul 18 13:04:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_missing): VCALL is called only for LOCAL_ID.  no
+	  check required.
+
+	* parse.y (primary): primary:tFID generates NODE_FCALL.
+	  [ruby-dev:20641]
+
+Thu Jul 17 18:50:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (match_captures): rename from "groups".
+
+Thu Jul 17 17:57:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_clear_cache_by_class): check both klass and origin.
+
+Thu Jul 17 13:46:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ruby_init): set ruby_running to true after
+	  initialization.
+
+Thu Jul 17 13:42:53 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/ftools.rb (File::makedirs): do not handle "//" as a directory.
+
+Thu Jul 17 06:40:28 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: recover and fix typo : Tk.chooseDirectory 
+	  (Tk8.4 feature)
+
+Wed Jul 16 16:23:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_proc_new): call svalue_to_avalue for yield argument.
+
+Wed Jul 16 00:31:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_disable_super, rb_enable_super): deprecate.
+
+	* eval.c (thgroup_s_alloc): re-implement group struct.
+
+	* eval.c (thgroup_add): add check for enclose and frozen status.
+
+Tue Jul 15 19:50:49 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_add_method, rb_alias): need to clear cache by
+	  ID when method defined in parent class is cached for
+	  grand child classes.  [ruby-dev:20672]
+
+Tue Jul 15 14:38:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/matrix.rb: remove elements conversion to_f, to_i, to_r.
+
+	* lib/cgi/session/pstore.rb: add new file.
+
+Tue Jul 15 03:30:41 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/rubyext.c (syck_mark_emitter): forgot to rb_gc_mark the 
+	  outgoing IO object.
+
+Sun Jul 13 14:55:36 2003  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* process.c (proc_getgroups, proc_setmaxgroups): fix typo.
+
+Sat Jul 12 17:01:28 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* struct.c (struct_entry): add prototype to avoid VC++ warnings.
+
+Sat Jul 12 04:43:57 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/emitter.c: new emitter code.
+
+	* ext/syck/rubyext.c: Emitter class.
+
+	* lib/yaml.rb: Load Syck emitter, if available.
+
+	* lib/yaml/stream.rb: ditto.
+
+	* lib/yaml/baseemitter.rb: underlying class for all emitters.
+
+	* lib/yaml/rubytypes.rb: use BaseEmitter abstraction.
+
+	* lib/yaml/emitter.rb: ditto.
+
+Sat Jul 12 04:23:13 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_undef): need to clear cache for inherited class.
+	  (rubicon/builtin/TestModulePrivate.rb:test_undef_method)
+
+Sat Jul 12 01:21:54 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (avalue_to_svalue): typo.
+
+	* eval.c (rb_load): rb_prohibit_interrupt must not underflow.
+
+	* parse.y (NODE_STRTERM, tokadd_string, parse_string): moved
+	  string nest level from a static variable to NODE_STRTERM, to
+	  preserve it from word to word in %W/%w.
+
+Fri Jul 11 22:37:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in (aix): needs ruby.imp even with gcc.
+	  (ruby-bugs:PR#1007)
+
+Fri Jul 11 18:37:37 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* instruby.rb: do not handle directories. [ruby-dev:20613]
+
+Fri Jul 11 16:09:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* util.c (ruby_strtod): exp should be less than MDMAXEXPT.
+
+Fri Jul 11 07:17:47 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: not create a Tcl/Tk interpreter if already 
+	  defined TkCore::INTERP
+
+	* ext/tk/lib/tk.rb: bugfix on TkWindow#configure
+
+Thu Jul 10 14:42:02 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* math.c (math_log): nan takes a dummy argument on Cygwin 1.5.0.
+
+Wed Jul  9 23:50:46 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* regex.c (mbctab_sjis): 0x80 is not shift jis first byte.
+	  [ruby-dev:20516]
+
+Wed Jul  9 15:38:28 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* instruby.rb: do not install shared libraries as man pages.
+
+	* mkconfig.rb: support text-mount on Cygwin.
+
+Wed Jul  9 11:09:57 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* re.c (match_entry): add prototype to avoid VC++ warnings.
+
+Wed Jul  9 03:48:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_load): put rb_load_file() in a thread critical
+	  section. [ruby-dev:20490]
+
+	* eval.c (compile): put rb_compile_string() in a thread critical
+	  section.
+
+Tue Jul  8 02:35:41 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_const_get_0): should not warn if constant is not
+	  defined. (ruby-bugs-ja PR#509)
+
+	* bignum.c (rb_big2dbl): give a warning on overflow.
+	  (ruby-bugs-ja PR#510)
+
+	* util.c (ruby_strtod): change MDMAXEXPT from 511 to 308.
+
+	* pack.c (utf8_to_uv): long is sufficient.  LONG_LONG is not
+	  required.
+
+Tue Jul  8 01:43:16 2003  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* bignum.c (rb_big2str): support 32 bit (without `long long' type)
+	  machines. (ruby-bugs-ja PR#512)
+
+Mon Jul  7 10:22:46 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/dbm/extconf.rb (gdbm_compat, qdbm): add check for gdbm_compat
+	  and qdbm.
+
+Mon Jul  7 01:34:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call_super): k->super maybe NULL if klass is Kernel.
+	   [ruby-dev:20519]
+
+	* gc.c (obj_free): clear method cache when freeing class/module.
+
+Sat Jul  5  23:32:06 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_remove_method): allow "remove_method" to accept
+	  multiple arguments.
+
+Sat Jul  5 00:22:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* node.h (NEW_NODE): cast arguments to rb_node_newnode().
+
+Fri Jul  4 21:48:44 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/syck/rubyext.c, ext/syck/syck.c, ext/syck/syck.h,
+	  ext/syck/token.c: C++ style comments are not allowed.
+	  (ruby-bugs:PR#1008)
+
+Thu Jul  3 23:41:30 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/timeout.rb: add optional exception argument for compatibility
+	  function.
+
+Thu Jul  3 14:22:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_values_at): extract common procedure from
+	  rb_ary_values_at.  follow DRY principle.
+
+	* re.c (match_values_at): values_at should understand ranges.
+
+	* struct.c (rb_struct_values_at): ditto.
+
+	* struct.c (inspect_struct): inspect format changed; add "struct "
+	  at the top.
+
+	* sprintf.c (rb_f_sprintf): "%p" specifier for inspect output.
+	  (RCR#69)
+
+	* eval.c (rb_mod_undef_method): allow "undef_method" to accept
+	  multiple arguments. (RCR#146)
+
+	* lib/timeout.rb: put timeout in Timeout module. (RCR#121)
+	  [ruby-talk:61028]
+
+	* re.c (match_groups): new method added. (RCR#139)
+
+	* variable.c (rb_mod_const_of): should exclude constant defined
+	  in Object, unless retrieving constants of Object.
+
+Thu Jul  3 12:13:05 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb (VPATH): convert from Windows form to Unix form on 
+	  MinGW.  This fixes the build with GNU make 3.80-1 for Cygwin.
+
+Wed Jul  2 23:27:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_new4): do not allocate new string if original
+	  is frozen or already have copy-on-write entry. [ruby-talk:74940]
+
+Wed Jul  2 13:22:39 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_shared_replace): clear flags before copy.
+
+	* string.c (rb_str_replace): ditto.
+
+	* eval.c (rb_yield_0): override visibility mode for module_eval
+	  etc. (ruby-bugs-ja PR#505)
+
+Wed Jul  2 11:45:34 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: synchronize document with source code.
+
+	* lib/net/pop.rb: ditto.
+
+Wed Jul  2 11:39:50 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: unify SMTP and SMTPCommand.
+
+	* lib/net/smtp.rb: new exception class SMTPError.
+
+	* lib/net/smtp.rb: new exception class SMTPAuthenticationError.
+
+	* lib/net/smtp.rb: new exception class SMTPServerBusy.
+
+	* lib/net/smtp.rb: new exception class SMTPSyntaxError.
+
+	* lib/net/smtp.rb: new exception class SMTPFatalError.
+
+	* lib/net/smtp.rb: new exception class SMTPUnknownError.
+
+	* lib/net/smtp.rb: change critical section protect algorithm.
+
+	* lib/net/smtp.rb (SMTP#do_start): check authentication args
+	  before all.
+
+	* lib/net/smtp.rb: new method send_message (alias send_mail).
+
+	* lib/net/smtp.rb: new method open_message_stream (alias ready).
+
+	* lib/net/pop.rb: POPBadResponse is a POPError.
+
+	* lib/net/pop.rb (POPMail#pop): ban ReadAdapter.
+
+	* lib/net/pop.rb (POPMail#top): ditto.
+
+	* lib/net/pop.rb (POP3Command): change critical section protect
+	  algorithm.
+
+	* lib/net/pop.rb (POP3Command#auth): USER and PASS should be one
+	  critical block.
+
+	* lib/net/pop.rb (POP3Command#retr): ban `dest' argument using
+	  iterator.
+
+	* lib/net/pop.rb (POP3Command#top): ditto.
+
+	* lib/net/protocol.rb: #read_message_to -> #each_message_chunk
+
+	* lib/net/protocol.rb: #D -> #LOG
+
+	* lib/net/protocol.rb: #D_off -> #LOG_off
+
+	* lib/net/protocol.rb: #D_on -> #LOG_on
+
+Wed Jul  2 11:10:47 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: set old class aliases for backward
+	  compatibility. [ruby-talk:74863]
+
+	* lib/net/protocol.rb: ditto.
+
+Wed Jul  2 01:32:40 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/net/pop.rb (Net::POP3#start): typofix.
+
+Tue Jul  1 22:08:19 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: TkWindow include TkWinfo
+
+	* ext/tk/lib/tk.rb: treat unknown widget classes as subclasses
+	  of TkWindow
+
+Tue Jul  1 19:02:12 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* parse.y (rb_intern): should use mbclen instead of mblen.
+
+Tue Jul  1 10:36:19 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* class.c (rb_define_class, rb_define_module): also set constant under
+	  Object.  [ruby-dev:20445]
+
+	* object.c (boot_defclass): ditto.
+
+	* variable.c (rb_const_get_at, rb_const_get_0, rb_mod_const_at,
+	  rb_const_defined, mod_av_set, rb_const_assign): toplevel constants
+	  are now under Object, rb_class_tbl remains for GC.
+
+Mon Jun 30 17:53:06 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (mnew): ignore metaclasses have no influence, for rklass.
+	  [ruby-talk:74706]
+
+Sun Jun 29 06:59:07 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb, lib/drb/invokemethod.rb: import drb-2.0.4
+	  (use LocalJumpError#reason)
+
+Sat Jun 28 12:28:54 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in (rb_cv_stack_grow_dir): check stack growing direction.
+
+	* eval.c (rb_thread_restore_context): prior configuration macro.
+
+	* gc.c (ruby_stack_length): always return the address of lower edge.
+
+	* gc.c (rb_gc_mark_locations): remove margin.  [ruby-dev:20462]
+
+	* gc.c (rb_gc, Init_stack): prior configuration macro.
+
+	* gc.c (Init_stack): add safety margin.
+
+Fri Jun 27 14:41:22 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* string.c (rb_str_split_m): remove white spaces on the head of
+	  the last element, when limit is specified.  [ruby-talk:74506]
+
+Fri Jun 27 03:24:54 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* io.c (io_fflush): need to check if closed after thread switch.
+	  [ruby-dev:20351]
+
+	* io.c (fptr_finalize): ditto.
+
+	* string.c (rb_str_rindex_m): fixed wrong fix.  should move backward
+	  first only when matching from the end.
+
+Thu Jun 26 21:34:49 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* class.c (class_instance_method_list): get rid of warning about
+	  arguement type mismatch, and inline method_list().
+	  [ruby-core:01198]
+
+Wed Jun 25 14:40:33 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: add and modify methods --- 
+	  TkWidget.database_class, TkWidget.database_classname, 
+          TkWidget#database_class, TkWidget#database_classname 
+
+	* ext/tk/lib/tk.rb: instances of a subclass of TkToplevel or 
+	  TkFrame are created with ":class=>subclass" option as default.
+
+	* ext/tk/sample/tkoptdb.rb: add a new part
+
+Wed Jun 25 12:52:58 2003  Matthew Dempsky  <jivera@flame.org>
+
+	* class.c (rb_generic_class_instance_methods): merge argument
+	  check (and warning) into one function; following DRY principle.
+	  [ruby-core:01193]
+
+Wed Jun 25 05:49:10 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: add widget destroy hook binding to TkBindTag::ALL
+
+	* ext/tk/lib/tkcanvas.rb: Although requiring manual control of GC, 
+	  memory eating problem of TkCanvas Items is fixed.
+
+	* ext/tk/lib/tktext.rb: add some methods and bug fix
+
+Wed Jun 25 00:14:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (autoload_delete): should delete Qundef from iv_tbl.
+	  (ruby-bugs-ja PR#504)
+
+Tue Jun 24 16:46:07 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: bug fix on TkToplevel, TkFrame,
+	  TkPanedwindow, TkOptionDB
+
+	* ext/tk/lib/tk.rb: TkOptionDB --- make it more secure to use procs 
+	  defined on resourceDB
+
+	* ext/tk/sample/tkoptdb.rb, resource.ja, resource.en: 
+	  sample script how to use TkOptionDB.
+
+Tue Jun 24 14:22:41 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+
+	* lib/yaml/types.rb: replaced Kernel::Hash reference with Object::Hash
+	  from [ruby-talk:74270]
+
+Tue Jun 24 17:59:30 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_yield_0): show yielded block position not only yielding
+	  point.  [ruby-dev:20441]
+
+Tue Jun 24 16:47:07 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (HTTPHeader#proxy_basic_auth): missing `@'.
+	  Thanks Douglas Koszerek. (ruby-bugs:PR975)
+
+Tue Jun 24 14:31:17 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* config.guess: have wrongly returned "alphaev56-unknown-linux-"
+	  on Linux/Alpha. [ruby-dev:20434]
+
+Tue Jun 24 04:54:46 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* configure.in: always add -mieee for gcc/alpha. [ruby-dev:20429]
+
+Tue Jun 24 02:40:09 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* array.c (rb_ary_unshift_m): need to check number of arguments.
+	  [ruby-talk:74189]
+
+Mon Jun 23 23:59:56 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* io.c (io_close): missing prototype. [ruby-dev:20422]
+
+	* ext/socket/socket.c (bsock_do_not_rev_lookup_set): ditto.
+
+	* ext/win32ole/win32ole.c (foletype_guid, foletype_progid): ditto.
+
+	* error.c (syserr_initialize): length argument of sprintf() is an
+	  int.
+
+Mon Jun 23 23:28:14 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* MANIFEST: add wince files.
+
+	* ext/tk/MANIFEST: add sample/tkmenubutton.rb.
+
+Mon Jun 23 17:40:58 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* dir.c (find_dirsep): get rid of warnings.
+
+	* eval.c (error_print): temporary value might be disposed by GC.
+
+	* hash.c (env_has_value, env_index): should not increment NULL.
+
+	* io.c (io_read, rb_io_sysread): not read when length is 0.
+
+	* io.c (rb_io_reopen): ensure initialized IO.
+
+	* io.c (rb_io_init_copy): sychronize file pointer.
+
+	* io.c (rb_io_s_pipe): make exception proof.
+
+	* string.c (rb_str_rindex_m): Fixnum 0 matched end of string.
+
+Mon Jun 23 16:18:12 2003  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (rb_open_file): initialize flags.
+
+	* time.c (time_arg): initialize v[6] even when argc is 10 to
+	  avoid valgrind error.
+
+Mon Jun 23 14:22:44 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: bug fix on TkRoot and TkToplevel
+
+Mon Jun 23 08:24:01 2003  Florian Frank  <flori@nixe.ping.de>
+
+	* string.c (rb_str_upto): generate sequence according to "succ"
+	  order.  formerly check was done by dictionary order.
+	  [ruby-talk:74138]
+
+Mon Jun 23 00:27:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_string_value): fill constant empty string along
+	  with setting ELTS_SHARED if str->ptr is NULL. [ruby-core:01179]
+
+	* string.c (rb_string_value_ptr): ditto.
+
+	* string.c (rb_check_string_type): ditto.
+
+Sun Jun 22 23:42:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* string.c (str_gsub): move END(0) check before mbclen2().
+
+	* string.c (scan_once): reduce END(0) check.
+
+	* io.c (rb_io_initialize): accept fixnum mode.
+
+	* eval.c (error_print): replace strchr() by memchr(), einfo may
+	  contain "\0".
+
+	* pack.c (pack_unpack): range check for "@" move; initialize check
+	  for "m".
+
+	* error.c (syserr_initialize): avoid buffer overflow.
+
+	* file.c (rb_file_s_readlink): expand buffer until readlink
+	  succeed.
+
+Sun Jun 22 16:17:02 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm 
+	  commands as elements
+
+	* ext/tk/lib/tk.rb: TkMenu --- add some methods
+
+	* ext/tk/lib/tk.rb: TkOptionMenubutton --- bug fix
+
+	* ext/tk/sample/tkmenubutton.rb: sample of TkMenubutton and 
+	  TkOptionMenubutton
+
+Sat Jun 21 23:15:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): should not propagate distination tag if
+	  tag is already handled in this level. (ruby-bugs-ja PR#501)
+
+	* object.c (str_to_id): check for empty string before intern. 
+	  [ruby-talk:74006]
+
+Sat Jun 21 13:56:09 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+
+	* wince/Makefile.sub: undefine HAVE__SETJMP.
+
+	* wince/resource.rb: include winver.h in wince3.0.
+
+Sat Jun 21 12:55:17 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm commands 
+	  as elements of a hash argument. 
+
+	* ext/tk/sample/tktimer2.rb: add comments about the usage of a 
+	  TkTimer object.
+
+Sat Jun 21 08:47:22 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk*.rb: remove direct-accesses to TkComm::INTERP and
+	  TkComm::INITIALIZE_TARGETS
+
+	* ext/tk/lib/tk*.rb: use TkINTERP_SETUP_SCRIPTS constant for setting 
+	  up the interpreter
+
+	* ext/tcltklib/tcltklib.c: support to create a safe interpreter 
+	  with safe-Tk
+
+Fri Jun 20 23:28:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): should not propagate TAG_BREAK and
+	  TAG_RETURN from orphan Proc object. [ruby-core:01148]
+
+Fri Jun 20 15:04:28 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* defines.h (PATH_ENV): name of PATH environment. [new]. 
+
+	* defines.h (ENV_IGNORECASE): define for case insensitive platforms
+	  to access environment variables.
+
+	* dln.c (dln_find_exe): use PATH_ENV instead of "PATH".
+
+	* hash.c (env_delete, rb_f_getenv, env_fetch, rb_env_path_tainted,
+	  env_aset): ditto.
+
+	* ruby.c (proc_options): ditto.
+
+Fri Jun 20 14:52:46 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: Tk interpreter returns TAINTED strings.
+
+Fri Jun 20 03:09:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (new_yield): distinguish "yield 1,2" and "yield [1,2]". 
+	  [ruby-dev:20360]
+
+	* eval.c (rb_eval): support new_yield() change.
+
+	* variable.c (rb_const_get_0): warn for Foo::BAR when BAR is a
+	  toplevel constant (i.e. a constant defined under Object).
+	  [ruby-list:36935]
+
+	* parse.y (no_blockarg): separate no block argument check and
+	  ret_args argument processing. 
+
+Fri Jun 20 00:45:19 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+	* lib/csv.rb: import csv module.
+
+Thu Jun 19 22:51:41 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb.rb, lib/drb/drb.rb, lib/drb/eq.rb, 
+	  lib/drb/extserv.rb, lib/drb/extservm.rb, lib/drb/gw.rb, 
+	  lib/drb/invokemethod.rb, lib/drb/observer.rb, 
+	  lib/drb/timeridconv.rb, lib/drb/unix.rb: import drb-2.0.4b3
+
+Thu Jun 19 16:14:43 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (lib_do_one_event): change default
+	  value of the argument
+
+	* ext/tcltklib/tcltklib.c (lib_do_one_event): returns true/false
+
+	* ext/tcltklib/tcltklib.c: add TclTkLib::EventFlag::NONE ( == 0 )
+
+	* ext/tcltklib/tcltklib.c: add set_no_event_wait() and 
+	  get_no_event_wait()
+
+	* ext/tcltklib/MANUAL.euc: modify
+
+	* ext/tcltklib/README.euc: ditto
+
+	* ext/tk/lib/tk.rb: change default value of TkCore.do_one_event 
+	  argument
+
+	* ext/tk/lib/tk.rb: add TkCore.set_no_event_wait(wait) and 
+	  TkCore.get_no_event_wait
+
+	* ext/tk/lib/tk.rb: add Tk.exit ( == destroy root widget )
+
+	* ext/tk/lib/tkafter.rb: rename TkAfter => TkTimer (TkAfter is
+	  an alias name)
+
+	* ext/tk/lib/tkafter.rb: set_callback returns self
+
+	* ext/tk/lib/tkafter.rb: continue() raises an exception, if already 
+	  running or no procedure.
+
+	* ext/tk/lib/tkafter.rb: skip() raises an exception, if not running.
+
+	* ext/tk/sample/tktimer2.rb: new sample for TkTimer class.
+
+Thu Jun 19 16:13:54 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* rubytest.rb: add library path to include standard libraries.
+
+Thu Jun 19 13:13:10 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* hash.c (env_delete, rb_f_getenv, env_fetch): case insensitive to
+	  access environment variables on DOSISH platforms.
+
+Thu Jun 19 00:51:47 2003  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
+
+	* range.c (rb_range_beg_len): out_of_range check after adjusting
+	  end point. [ruby-dev:20370]
+
+Wed Jun 18 23:59:11 2003  Guy Decoux  <ts@moulon.inra.fr>
+
+	* parse.y (call_args): the first argument to arg_cancat() should
+	  be NODE_LIST. [ruby-core:01151]
+
+Wed Jun 18 23:41:27 2003  Marc Cartright  <marc@isri.unlv.edu>
+
+	* ext/zlib/zlib.c (zstream_run): In a particular situation,
+	  deflate/inflate will return Z_BUF_ERROR, even though another call
+	  is required by the zlib library.
+
+Wed Jun 18 19:46:21 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb: bug fix
+
+	* ext/tk/lib/tk.rb: rename 'no_create' option to 'without_creating'
+
+	* ext/tk/lib/tk.rb: add TkWindow#pack_in, TkWindow#grid_in, 
+	  TkWindow#place_in
+
+	* ext/tk/lib/tk.rb: add TkWindow#bind_class and TkWindow#database_class
+
+	* ext/tk/lib/tk.rb: add TkBindTag.new_by_name and TkDatabaseClass 
+	  for binding to database class
+
+	* ext/tk/lib/tk.rb: check varname whether already exsist or not. 
+	  (TkVarAccess.new)
+
+	* ext/tk/lib/tk.rb: TkTextWin#bbox returns an array of four numbers
+
+	* ext/tk/lib/tk.rb: autoload TkDialog2, TkWarning2
+
+	* ext/tk/lib/tk.rb: scan event callback arguments and convert
+	  to proper type
+
+	* ext/tk/lib/tk.rb: TkBindTag.new accepts a block
+
+	* ext/tk/lib/tk.rb: If given taglist, TkWindow#bindtags(taglist) 
+	  returns taglist
+
+	* ext/tk/lib/tk.rb: add TkWindow#bindtags=(taglist)
+
+	* ext/tk/lib/tk.rb: Tk.focue and Tk.focus_lastfor return nil 
+	  if there is no target widget.
+
+	* ext/tk/lib/tk.rb: Tk::Wm.client returns the argument string 
+	  when setting name
+
+	* ext/tk/lib/tk.rb: TkGrid.columnconfiginfo and rowconfiginfo 
+	  given a slot return a number.
+
+	* ext/tk/lib/tk.rb: TkWindow.grid_columnconfiginfo and 
+	  grid_rowconfiginfo --- ditto
+
+	* ext/tk/lib/tk.rb: rename and define alias :: TkOption ==> TkOptionDB
+
+	* ext/tk/lib/tk.rb: define alias :: TkTimer ==> TkAfter
+
+	* ext/tk/lib/tk.rb: some instance methods change from public to private
+
+	* ext/tk/lib/tk.rb: some TkComm methods change to module functions
+
+	* ext/tk/lib/tk.rb: add support for -displayof option to some 
+	  TkWinfo methods
+
+	* ext/tk/lib/tk.rb: bind, bind_append and bind_remove --- 
+	  returns the target of event-binding
+
+	* ext/tk/lib/tk.rb: add Tk8.4 features
+
+	* ext/tk/lib/tk.rb: add TkPaneWindow
+
+	* ext/tk/lib/tkdialog.rb: bug fix
+
+	* ext/tk/lib/tkdialog.rb: some methods return self
+
+	* ext/tk/lib/tkdialog.rb: add TkTextMark#+(mod) and TkTextMark#-(mod)
+
+	* ext/tk/lib/tkdialog.rb: add some methods
+
+	* ext/tk/lib/tkcanvas.rb: bug fix and some methods return self
+
+	* ext/tk/lib/tkentry.rb: some methods return self
+
+	* ext/tk/lib/tkentry.rb: TkEntry#bbox returns an array of four numbers
+
+	* ext/tk/lib/tkentry.rb: scan validatecommand arguments and 
+	  convert to proper type
+
+	* ext/tk/lib/tkbgerror.rb: support to define a error handler by user
+
+	* ext/tcltklib/tcltklib.c: [ruby-talk:60759]
+
+Wed Jun 18 13:50:06 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): should dispatch based on ID type.
+
+Wed Jun 18 12:53:42 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (rb_yield_0): should restore scope_vmode during yield.
+	  [ruby-dev:20361]
+
+Wed Jun 18 01:13:36 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/rubyext.c (rb_syck_load_handler): merge key implemented.
+
+	* ext/syck/rubyext.c (transfer_find_i): removed use of String#=~ in favor
+	    of Regexp#match.
+
+	* lib/yaml.rb: YAML::try_implicit returns.
+
+	* lib/yaml/rubytypes.rb: Regexps added for type matching.
+
+	* lib/yaml/emitter.rb: fix String + nil error.
+
+Tue Jun 17 17:01:08 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/gram.c: added grammar for certain empty sequence entries.
+
+	* ext/syck/handler.c, ext/syck/syck.c, ext/syck/syck.h: track bad anchors.
+
+	* ext/syck/token.c: added pause token, tag possible circular references.
+
+	* lib/yaml/rubytypes.rb: parsing YMD time as Date instance.
+
+	* ext/syck/rubyext.c: ditto. DomainType, PrivateType, BadAlias classes.
+
+Tue Jun 17 21:28:27 2003  Ariff Abdullah <skywizard@time.net.my>
+
+	* win32/win32.c (rb_w32_opendir): need to set errno. [ruby-talk:73761]
+
+Mon Jun 16 19:01:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c: remove rb_cBlock.
+
+Mon Jun 16 18:06:33 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* numeric.c (rb_fix2uint): renamed from rb_fix2int on IA64.
+
+Mon Jun 16 17:02:57 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (proc_invoke): format the message for localjump_error().
+
+Mon Jun 16 16:23:56 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/dl/dl.c (rb_dl_callback): use rb_block_proc() instead of
+	  rb_block_new().
+
+	* ext/win32ole/win32ole.c (ev_on_event): ditto.
+
+Mon Jun 16 16:06:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_alloc): re-unification of Block and Proc.  Block
+	  class is no longer available.
+
+Mon Jun 16 14:43:14 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* bcc32/Makefile.sub: undefine HAVE_GETGROUPS.
+
+Sat Jun 14 16:58:41 2003  Guy Decoux  <ts@moulon.inra.fr>
+
+	* regex.c (calculate_must_string): should handle option_set
+	  properly. [ruby-talk:73481]
+
+	* regex.c (re_compile_fastmap): a bug in flag manipulation.
+	  [ruby-talk:73549]
+
+Sat Jun 14 17:59:59 2003  Guy Decoux  <ts@moulon.inra.fr>
+
+	* eval.c (method_arity): should handle NODE_BMETHOD and
+	  NODE_DMETHOD. [ruby-core:01138]
+
+Fri Jun 13 09:24:39 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (storebinary): seek correctly. Thanks, William Webber.
+
+	* lib/net/ftp.rb (putbinaryfile): rescue FTPPermError.
+
+Thu Jun 12 22:13:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb : add 'no_create' option to widget
+	  initialize method. 
+
+	* ext/tk/MANIFEST : forgot to commit when added tkmacpkg.rb
+	  and tkwinpkg.rb
+
+	* ext/tk/lib/README : ditto.
+
+Thu Jun 12 21:14:11 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tk.rb : widget configure returns self (for method
+	  call chain)
+
+	* ext/tk/lib/tkmacpkg.rb : Mac resource (not new but not
+	  included until now)
+
+	* ext/tk/lib/tkwinpkg.rb : Win DDE and registry (not new but not 
+	  included until now)
+
+Tue Jun 10 14:26:30 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/token.c: preserve newlines prepended to a block.
+
+	* ext/syck/implicit.c (syck_match_implicit): added !merge and !default.
+
+	* lib/yaml/constants.rb: remove '\z' escape.
+
+	* lib/yaml/emitter.rb: ensure reset of @seq_map shortcut flag.
+
+	* lib/yaml/encoding.rb: remove Unicode translation methods.
+
+	* lib/yaml/rubytypes.rb: improved round-tripping of Strings.
+	  [ruby-core:1134]
+
+Tue Jun 10 01:07:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb.rb (IRB::Irb::eval_input): warn and exit if $SAFE >=3
+	  after input evaluation.
+
+	* lib/irb.rb (IRB::Irb::eval_input): untaint input string.  now
+	  irb works for levels 1 and 2.
+
+Mon Jun  9 19:02:33 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in: checks presence of grp.h and setgroups().
+
+	* process.c (proc_getgroups, proc_setgroups): raise
+	  NotImplementedError unless available.  [ruby-talk:73014]
+
+Mon Jun  9 18:09:11 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: fixed 100% CPU problem of Tk.mainloop
+
+Mon Jun  9 15:50:24 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: renewal Tk.mainloop
+
+Sun Jun  8 13:37:21 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+
+	* wince/setup.mak: set SUBSYSTEM in each platform.
+
+	* wince/stdlib.c: fix mblen() bug.
+
+Sat Jun  7 22:22:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/syck/rubyext.c (syck_loader_transfer): should not use
+	  rb_cProc directly, since type_proc may be Proc, Block, or
+	  Method.
+
+	* parse.y (value_expr0): class and module statements should not be
+	  warned for "void value expression". [ruby-talk:72989]
+
+Sat Jun  7 01:46:41 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (add_final): should determine type by respond_to?
+
+	* gc.c (define_final): ditto.
+
+	* io.c (rb_io_ctl): should not depend on respond_to?
+
+	* range.c (range_step): rb_check_string_type().
+
+Fri Jun  6 20:29:14 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (error_print): needs to be exception proof.
+
+	* eval.c (error_handle, rb_longjmp): bails out when exception
+	  reentered.  (ruby-bugs-ja:PR#487), [ruby-core:01119],
+	  [ruby-core:01122]
+
+	* eval.c (Init_Proc): pre-allocates critical error objects.
+
+Fri Jun  6 20:29:14 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (cmd_brace_block, do_block, brace_block): initialize block
+	  variables at the beginning of the block.  [ruby-talk:72521]
+
+Fri Jun  6 18:49:11 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (proc_setgroups): new functions.
+
+Fri Jun  6 18:33:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (define_final): eliminate rb_f_lambda() call.
+
+	* class.c (rb_scan_args): ditto.
+
+	* signal.c (sig_trap): ditto.
+
+	* hash.c (rb_hash_initialize): ditto.
+
+	* variable.c (rb_f_trace_var): ditto.
+
+	* ext/dl/dl.c (rb_dl_callback): ditto.
+
+	* ext/win32ole/win32ole.c (ev_on_event): ditto.
+
+Fri Jun  6 16:10:01 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: define Net::HTTPResponse#to_ary for backward
+	  compatibility.  [ruby-talk:72927]
+
+	* lib/net/protocol.rb: add warning.
+
+Fri Jun  6 13:30:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): $SAFE is turned off in the finalization.
+	  Each END proc should preserve its own $SAFE level. [ruby-core:01119]
+
+	* marshal.c (marshal_load): remove unused variable "hash".
+	  [ruby-core:01120]
+
+	* hash.c (env_str_new): freeze strings from ENV. [ruby-talk:72860]
+
+	* array.c (rb_ary_first): optional argument to retrieve first n
+	  elements.
+
+	* array.c (rb_ary_last): optional argument to retrieve last n
+	  elements.
+
+Thu Jun  5 21:31:55 2003  Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+
+	* wince/stdlib.c: add mblen().
+
+Thu Jun  5 18:33:46 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/curses/curses.c (window_s_allocate,curses_finalize):
+	  avoid VC++ warnings.
+
+Thu Jun  5 17:44:11 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/rubyext.c (syck_parser_mark): was a bit heavy on the GC.
+
+	* lib/yaml.rb (YAML::transfer): added.
+
+Thu Jun  5 16:11:50 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
+	  (MISSING): link with missing/erf.c.
+
+	* missing.h (erf, erfc): fix prototype.
+
+	* missing/erf.c: new. [ruby-list:37753]
+
+Thu Jun  5 15:09:06 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* math.c (math_erf,math_erfc): new function. [ruby-list:37753]
+
+Thu Jun  5 14:49:43 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/rubyext.c: using GC nodes caused segfault. [ruby-core:1071]
+
+Thu Jun  5 13:48:57 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/token.c: directives choked on a period.
+
+	* ext/syck/gram.y: anchors work above a collection. [ruby-core:1071]
+
+	* ext/syck/handler.c, ext/syck/syck.c: ensure a fresh strtable between
+	  parser iterations.
+
+Wed Jun  4 12:06:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ruby_finalize): no longer need to turn off $DEBUG in the
+	  finalizer. (ruby-bugs-ja PR#473)
+
+Tue Jun  3 22:20:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call_super): should search superclass method based on
+	  orig_func, not last_func.
+
+Tue Jun  3 09:59:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call_super): inheritance line adjustment moved from
+	  rb_call(). [ruby-core:01113]
+
+	* eval.c (rb_eval): use rb_call_super() to follow DRY principle.
+
+Mon Jun  2 02:20:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (push_values_at): Array#values_at should work with
+	  ranges too.
+
+	* range.c (rb_range_beg_len): length calculation was wrong.
+
+	* eval.c (rb_call): should set T_ICLASS in the frame->last_class.
+	  [ruby-core:01110]
+
+Sun Jun  1 21:50:01 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: should not use def file, use ld with
+	  --export-all-symbols option on Cygwin/MinGW.
+
+	* defines.h: ditto.
+
+	* cygwin/GNUmakefile.in: ditto.
+
+	* ext/digest/defs.h: avoid warnings on Cygwin.
+
+Sun Jun 01 13:33:49 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+
+	* wince/string_wce.c: add strpbrk() for hpcpro support.
+
+	* wince/setup.mak: add hpcpro(CE2.11) & armv4t(CE.NET) support.
+
+	* wince/resource.rb: ditto.
+
+	* wince/Makefile.sub: ditto.
+
+Sun Jun  1 10:38:28 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* variable.c (rb_autoload_load): autoloaded constants under a module
+	  belong to the module.  [ruby-core:01094], [ruby-dev:20309]
+
+Sat May 31 04:36:54 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (rb_intern): should handle multibyte name.
+
+Fri May 30 23:18:01 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/rubyext.c (rb_syck_mktime): seconds calculated wrong.
+
+	* ext/syck/gram.c: flexibility to anchors and transfer methods on
+	  collections.
+
+	* ext/syck/token.c: hex escapes.
+
+	* lib/yaml/basenode.rb: YamlNode references changed to YAML::BaseNode.
+
+Fri May 30 22:28:04 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* numeric.c (rb_num2uint, rb_fix2int): new function to convert
+	  values over INT_MAX.  [ruby-core:01099]
+
+	* ruby.h (NUM2UINT, FIX2INT): ditto.
+
+Fri May 30 15:01:05 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/token.c: preserve any indentation past an explicit
+	  indentation.
+
+Fri May 30 14:55:44 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_Array): exclude Kernel#to_a instead of Object#to_a.
+	 (ruby-bugs-ja:PR#483)
+
+	* lib/optparse.rb (OptionParser::Switch#parse_arg): not splat.
+
+	* lib/optparse.rb (OptionParser::Switch#conv_arg): splat if no
+	  conversion supplied.
+
+	* lib/optparse.rb (OptionParser::Switch::PlacedArgument#parse):
+	  override next switch after argument conversion.
+
+Fri May 30 14:41:34 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/handler.c, ext/syck/syck.h: removed syck_fold_format().
+
+	* ext/syck/gram.c: flexibility for aliases and anchors.
+
+	* ext/syck/token.c: folding now handled in the tokenizer.
+
+Fri May 30 06:21:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* variable.c (rb_autoload_load): should delete autoloaded
+	  symbol itself before load.  [ruby-core:01097]
+
+	* variable.c (rb_mod_remove_const): must not return Qundef.
+
+Thu May 29 14:59:10 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.c (_CRTIMP): redefine _CRTIMP on MinGW.
+
+	* configure.in: remove '-D__USE_CRTIMP' from XCFLAGS on MinGW.
+
+	* win32/win32.c (NtMakeCmdVector): handle quotes only if not instring.
+
+Thu May 29 09:11:01 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (ev_const_defined, ev_const_get), variable.c
+	  (rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
+	  as autoload marker.  [ruby-dev:18103], [ruby-dev:18184]
+
+	* eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
+	  Module#autoload, Module#autoload?.
+
+	* variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
+	  manage autoload constants per classes/modules.
+
+	* variable.c (rb_const_defined_at, rb_const_defined): return false
+	  for autoloading constants.
+
+	* class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
+	  variable.c (rb_mod_const_at, rb_const_assign): removed autoload
+	  stuff.
+
+	* intern.h: prototypes; rb_autoload, rb_autoload_load,
+	  rb_autoload_p.
+
+	* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
+	  do not treat unmatched argument as an option.
+
+Wed May 28 08:44:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_syscall): type dispatch should be based on
+	  rb_check_string_type(), not FIXNUM_P(), because values may be a
+	  bignum.  [ruby-talk:72257]
+
+Tue May 27 20:33:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c, util.c: removed duplicated includes/defines.
+
+	* ext/socket/socket.c (sock_addrinfo): get rid of SEGV at NULL ptr
+	  String.  increase buffer size for 64bit platforms.
+
+Tue May 27 02:34:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): should pass the current klass value to
+	  block_invoke, which may be called via "super". [ruby-core:01077]
+
+	* eval.c (block_invoke): now takes 4th argument "klass".
+
+	* eval.c (block_alloc): should propagate BLOCK_PROC to
+	  ruby_block.
+
+Mon May 26 23:51:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_object0): should not use "yield" method, use "call"
+	  instead. (ruby-bugs-ja PR#476)
+
+Mon May 26 21:39:46 2003  MoonWolf  <moonwolf@moonwolf.com>
+
+	* lib/mkmf.rb, lib/optparse.rb, lib/tracer.rb: use Method#to_block
+	  instead of deprecated Method#to_proc.  (ruby-bugs-ja:PR#477)
+
+Mon May 26 21:21:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/optparse.rb (OptionParser::Switch::parse,
+	  OptionParser::order): use {Block,Proc}#call instead of deprecated
+	  #yield.
+
+Mon May 26 16:39:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (Init_Proc): Block/Proc separation. [huge change]
+
+	* eval.c (block_arity): returns exact arity number for Procs out
+	  of methods. also gives 1 for {|a|..}.
+
+	* string.c (rb_str_match): revert use of String#index for
+	  invocation like string =~ string.
+
+	* eval.c (rb_Array): move Object#to_a exclusion hack from
+	  splat_value().  need to be in eval.c for a while.
+
+Sun May 25 23:48:21 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* bignum.c (rb_quad_pack): should negate negative bignum.
+	  (ruby-bugs-ja:PR#474)
+
+Sun May 25 03:27:25 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: support LOGIN authentication, based on
+	  the patch by Kazuhiko Izawa. [ruby-talk:78981]
+
+Sat May 24 18:19:51 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+
+	* wince/Makefile.sub: add eMbedded Visual C++ 4.0 support.
+
+	* wince/resource.rb: ditto.
+
+	* wince/setup.mak: ditto.
+
+	* wince/configure.bat: ditto.
+
+	* wince/mkexports.rb: delete japanese comments.
+
+Fri May 23 18:34:05 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_longjmp): get rid of reentering while debug warning.
+	  (ruby-bugs-ja:PR473)
+
+Fri May 23 15:16:16 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* pack.c (pack_unpack): sign-extend if sizeof long is bigger than
+	  32.  (ruby-bugs-ja:PR#472)
+
+Fri May 23 14:19:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ruby_finalize): turn off ruby_debug flag before calling
+	  at_exit procs and finalizers. (ruby-bugs-ja:PR473)
+
+	* ext/tcltklib/tcltklib.c (lib_mainloop_core): OK to block if
+	  there's no other thread. (ruby-bugs:PR#861)
+
+Thu May 22 18:07:46 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/token.c: single- and double-quoted root-level fix.
+
+	* lib/yaml.rb (YAML::object_maker): can create object attributes (such as
+	  found in Exception class)
+
+	* lib/yaml/rubytypes.rb: roundtripping of Exception and subclasses.
+
+Fri May 23 01:26:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_clone): defer copying freezing state after
+	  calling initialize_copy().  [ruby-dev:20276]
+
+Thu May 22 17:12:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (run_final): use rb_thread_critical instead of DEFER_INTS.
+	  [ruby-dev:20272]
+
+	* marshal.c: try to make ArgumentError and TypeError consistent.
+	  [ruby-core:01068]
+
+Thu May 22 15:46:37 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_define_alloc_func): need not to disable
+	  rb_call_super() for allocation functions. [ruby-core:1065]
+
+Thu May 22 06:21:33 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/rubyext.c (rb_syck_err_handler): raise ArgumentError on
+	  malformed YAML.
+
+	* lib/yaml/rubytypes.rb: String#to_yaml was missing space indicators at
+	  the end of a line.
+
+Thu May 22 05:43:24 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/rubyext.c (syck_parser_load): root-level false was returning
+	  nil.
+
+	* ext/syck/token.c: root-level transfer method bug.
+
+	* ext/syck/gram.c: root-level empty gave a parse error.
+
+	* lib/yaml/rubytypes.rb: Symbol#to_yaml generating method call error.
+
+Thu May 22 02:46:38 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_eval): splat NODE_RESTARY.  [ruby-dev:20268]
+
+	* eval.c (rb_thread_fd_close): raise for writing threads.
+	  [ruby-dev:20269]
+
+	* io.c (rb_io_close, io_reopen): ditto.
+
+	* io.c (io_reopen): keep stdio objects for stdin, stdout,
+	  and stderr.  [ruby-dev:19442]
+
+Thu May 22 01:11:15 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (strings, word_list): must create new instance always.
+	  http://yowaken.dip.jp/tdiary/20030521.html#p02
+
+	* parse.y (yylex): slight optimization.
+
+Wed May 21 23:07:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (rb_sys_fail): should not specify errno explicitly.
+	  [ruby-dev:20264]
+
+Wed May 21 20:51:47 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
+	  wince/Makefile.sub: update dependencies.
+
+Wed May 21 17:44:16 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (syserr_initialize): prohibit specifying errno for
+	  subclasses of SystemCallError.  in addition, if initialize is
+	  called for SystenCallError instance, its class be changed.
+	  [ruby-dev:20257]
+
+	* gc.c (run_final): to protect thread context switch, finalizers
+	  are wrapped in DEFER_INTS/ENABLE_INTS.
+
+Wed May 21 13:26:08 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/optparse.rb: get rid of warnings.
+
+Tue May 20 18:59:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_save_context): prohibit rb_gc_force_recycle()
+	  on thread saved ruby_dyna_vars. [ruby-dev:20236]
+
+Tue May 20 17:39:15 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (init_copy): call initialize_copy at the end of copy
+	  process.
+
+Tue May 20 17:15:55 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* error.c (syserr_initialize): use Errno constants as default
+	  errno for subclasses.  [ruby-dev:20241]
+
+Tue May 20 15:26:25 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* st.h: define ST_DATA_T_DEFINED for portability.
+
+	* ext/syck/syck.h: add typedef, st_data_t for Ruby 1.6.
+
+	* ext/syck/syck.c (syck_st_free_nodes): return int.
+
+	* ext/syck/syck.c (syck_add_sym): cast the data to st_data_t
+	  to avoid error on bcc32.
+
+	* ext/syck/syck.c (syck_lookup_sym): ditto.
+
+	* ext/syck/syck.c (syck_free_parser): NULL is not integer.
+
+Tue May 20 13:29:04 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.c (kill): set errno after calling raise().
+
+Tue May 20 10:51:26 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_f_missing): create exception instance by ordinal
+	  method.  [ruby-dev:20033]
+
+	* error.c (rb_name_error, rb_sys_fail): ditto.
+
+	* error.c (exc_to_s, exit_status, name_err_name,
+	  nometh_err_args, syserr_errno, syserr_eqq): access
+	  attributes.
+
+	* error.c (name_err_initialize, nometh_err_initialize,
+	  syserr_initialize): initialize attributes.
+
+Tue May 20 10:26:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): give warning for multiple values for a
+	  block parameter.
+
+	* eval.c (rb_yield_values): a function to yield multiple values.
+
+	* array.c (sort_1): use rb_yield_values.
+
+	* enum.c (min_ii, max_ii): ditto.
+
+	* hash.c (rb_hash_update_block_i, delete_if_i, select_i,
+	  each_pair_i, env_each, env_reject_bang, env_select,
+	  env_update_i): ditto.
+
+	* struct.c (rb_struct_each_pair): ditto.
+
+	* eval.c (top_include): should include module in the current self,
+	  not ruby_top_self. [ruby-dev:20198]
+
+	* eval.c (top_include): stop inclusion to ruby_wrapper; give
+	  warning.
+
+Mon May 19 18:54:30 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/token.c, ext/syck/implicit.c: expanded character set to
+	  allow UTF-8, other Ruby encodings.
+
+Mon May 19 16:47:00 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/syck.c, ext/syck/syck.h, ext/syck/token.c, ext/syck/gram.c:
+	  count line numbers only if line pointer has increased.
+
+Tue May 20 00:45:40 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (push_braces): do not push_braces() unless rbrace is found.
+	  (ruby-bugs-ja:PR#469)
+
+Tue May 20 00:09:41 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/pty/pty.c (pty_finalize_syswait): join (using Thread#value)
+	  before detach pid. [ruby-talk:71519]
+
+Mon May 19 23:02:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (PUSH_FRAME): save outer ruby_block. [ruby-list:37677],
+	  [ruby-dev:20202]
+
+	* eval.c (BEGIN_CALLARGS): restore outer block by using
+	  ruby_block->outer.
+
+	* eval.c (block_pass): do not alter block->prev, but block->outer.
+
+	* array.c (get_inspect_tbl): warning on wrong condition.
+
+Mon May 19 16:13:57 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* class.c: add #include "version.h".
+
+	* hash.c: ditto.
+
+	* string.c: ditto.
+
+Mon May 19 15:33:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (localjump_xvalue): renamed exitstatus to exit_value
+	  since it's not exit "status" after all.
+
+	* eval.c (localjump_error): add reason to LocalJumpError.
+
+	* compar.c (rb_cmpint): raise error via rb_cmperr(), if cmp value
+	  is nil. now take new 2 arguments.
+
+	* time.c (time_cmp): 2003-05-16 fix was incomplete.
+	  (ruby-bugs-ja:PR#458)
+
+Mon May 19 14:42:50 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_cmp): stupid comparison fixed.
+
+	* io.c (Init_IO): ARGF.path added (alias to ARGF.filename).
+	  [ruby-dev:20197]
+
+Mon May 19 13:58:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (init_copy): rename copy_object as initialize_copy,
+	  since it works as copy constructor.
+
+	* eval.c (rb_add_method): initialize_copy should always be
+	  private, like initialize.
+
+Mon May 19 13:51:50 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* re.c (rb_reg_quote): \n \r \f \v quoting was wrong.
+	  [ruby-dev:20203]
+
+	* re.c (rb_reg_quote): rb_reg_quote(" ") should be "\\ ", not
+	  "\\s".
+
+Mon May 19 08:08:51 2003  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb: use warn() instead of $stderr.puts().
+
+	* sample/cal.rb: ditto.
+
+Sat May 17 12:02:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (get_inspect_tbl): check whether inspect_tbl value is a
+	  valid array. (ruby-bugs-ja PR#65)
+
+	* array.c (inspect_ensure,rb_protect_inspect,rb_inspecting_p):
+	  use get_inspect_tbl().
+
+Sat May 17 11:50:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_abort): call exit(1) if exception is raised.  This
+	  patch was made by Nobuyoshi Nakada <nobu.nokada@softhome.net> on
+	  2002-05-30.  (ruby-bugs-ja PR#236)
+
+	* signal.c: disable Ruby's interrupt handler at the beginning.
+	  (ruby-bugs-ja PR#236)
+
+Sat May 17 02:17:42 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/rational.rb (Integer::denominator): fixed typo.
+	  (ruby-bugs-ja:PR#466)
+
+Sat May 17 00:18:11 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/socket/socket.c (ruby_connect): connect() after EINPROGRESS
+	  returns EINVAL on some platforms, need to check true error
+	  status.  [ruby-core:01037]
+
+Sat May 17 00:21:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_class_allocate_instance): singleton class check
+	  moved to rb_obj_alloc(). (ruby-bugs-ja PR#345)
+
+Fri May 16 23:55:50 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_quote): should escape white space characters,
+	  \t, \f, \n, \r. (ruby-bugs-ja PR#231)
+
+Fri May 16 12:40:40 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (block_pass): chain previous block to the pushing block.
+	  [ruby-list:37677]
+
+	* time.c (time_cmp): does not compare with numbers for
+	  interchangeability. (ruby-bugs-ja:PR#458)
+
+Thu May 15 21:55:54 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/gram.c: fixes to one-line documents and end of stream
+	  documents.
+
+	* ext/syck/syck.c, ext/syck/syck.h: add root_on_error to parser
+	  struct, specifying the symbol to be returned on a parse error.
+
+Thu May 15 18:44:31 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb (OpenURI::Redirect#initialize): call super to
+	  initialize mesg.
+
+	* lib/open-uri.rb (OpenURI::Meta#charset): call block to guess charset
+	  if block is given and charset is not given.
+
+Thu May 15 16:55:16 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_le): returns nil if two classes/modules are not
+	  in class-superclass relationship.
+
+	* object.c (rb_mod_cmp): uses new rb_mod_le() behavior.
+
+Thu May 15 07:45:30 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/rubyext.c, ext/syck/implicit.c: timestamp repairs to
+	  timezone and milliseconds.
+
+	* ext/syck/syck.c (syck_parser_reset_levels): duplicate string literal
+	  to avoid warning.
+
+Thu May 15 13:26:48 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_class_instance_methods): default will be changed in
+	  1.8.1.
+
+	* io.c (set_stdio): better message.
+
+Thu May 15 13:18:11 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (set_stdio): $stdin, $stdout, $stderr now became read-only.
+
+	* variable.c (readonly_setter): message changed.
+
+Thu May 15 09:50:51 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/syck/syck.c (syck_parser_pop_level): add prototype.
+
+	* ext/syck/syck.c (syck_strndup): should return value.
+
+Thu May 15 09:32:25 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.c (kill): fix typo and add signal 0 support.
+
+Wed May 14 20:09:26 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/gram.c: sequence-in-map shortcut, transfer methods on
+	  sequence-in-sequence, memory leak in mapping merge.
+
+	* ext/syck/syck.c: memory leak in domain anchoring.
+
+	* lib/yaml/rubytypes.rb, lib/yaml/types.rb: eliminated 1.6.x code.
+
+Wed May 14 19:56:43 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/syck/rubyext.c: add prototypes to avoid VC++ warnings.
+
+Wed May 14 12:23:46 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (Net::HTTP#start): should check whether HTTP
+	  session is opened before finishing. (ruby-bugs-ja:PR#463)
+
+Wed May 14 09:12:55 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: reduce warning. (ruby-bugs-ja:PR#462)
+
+Tue May 13 22:31:04 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* lib/yaml/rubytypes.rb, lib/yaml/types.rb: using Object#object_id
+	  rather than deprecated Object#id.
+
+	* ext/syck/token.c: changed ASCII escapes to octal notation.
+
+	* ext/Setup*: added entries for static linking of Syck extension.
+
+Tue May 13 20:31:58 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: add '--Wl,--enable-auto-import' to DLDFLAGS
+	  on Cygwin/MinGW.
+
+	* configure.in: add '-D__USE_CRTIMP' to XCFLAGS on MinGW.
+
+	* ext/syck/handler.c: add proper casts.
+
+	* ext/syck/syck.c: ditto.
+
+Tue May 13 17:58:08 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* configure.in, bcc32/Makefile.sub, win32/Makefile.sub: define
+	  HAVE_FSYNC.
+
+	* win32/win32.h (fsync): define as _commit().
+
+Tue May 13 15:35:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_match_exec): \Z changed to be consistent with new $
+	  (endbuf) behavior.
+
+Tue May 13 14:48:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (error_pos): use $deferr for output instead of stderr
+	  directly.
+
+	* eval.c (error_print,error_handle,rb_longjmp,rb_thread_schedule):
+	  ditto.
+
+Tue May 13 06:34:19 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* lib/yaml/rubytypes.rb: object and struct loading
+
+	* lib/yaml.rb: YAML::detect_implicit will discover typing for a Ruby
+	  string
+
+	* ext/syck/: Fixed portable comments, misuse of NULL and methods without
+	  return VALUEs.
+
+Mon May 12 18:08:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (Init_IO): new variable $deferr which is default output
+	  port of error messages.
+
+	* io.c (rb_warn_m): new method "warn". [new]
+
+	* error.c (warn_print): use $deferr.
+
+	* error.c (rb_bug): ditto.
+
+	* error.c (err_append): ditto.
+
+Sun May 11 13:50:12 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb: refine to_s test.
+
+	* lib/pp.rb (PP::ObjectMixin#pretty_print): refine to_s handling.
+
+Sun May 11 06:32:13 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/implicit.c, ext/syck/rubyext.c: transfer methods applied to
+	  native loading
+
+	* ext/syck/token.c: fix for transfer methods on same indentation as nested
+	  mapping
+
+	* lib/yaml/rubytypes.rb: all type names in lowercase
+
+Sat May 10 19:55:18 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ext/syck/gram.c ext/syck/handler.c ext/syck/implicit.c
+	  ext/syck/node.c ext/syck/rubyext.c ext/syck/syck.c
+	  ext/syck/syck.h ext/syck/token.c: updated to Syck 0.27
+
+	* lib/yaml/loader.rb: new YAML::Loader class
+
+	* lib/yaml.rb: loading of type families leverages YAML::DefaultLoader
+
+Sat May 10 19:00:08 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+
+	* wince/string.c: file removed.
+
+	* wince/stdlib.c: file added.
+
+Sat May 10 16:17:02 2003  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (decode_utf7): new method.
+
+	* lib/net/imap.rb (encode_utf7): new method.
+
+Fri May  9 21:25:50 2003  why the lucky stiff <ruby-cvs@whytheluckystiff.net>
+
+	* ruby/ext/syck, ruby/lib/yaml: Initial checkin of YAML substances.
+
+Fri May  9 16:38:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_reopen): It should be possible to reopen closed IO.
+	  [ruby-talk:70941]
+
+	* io.c (rb_io_reopen): inherit original file mode unless specified.
+
+Thu May  8 18:44:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_gc): check odd alignment stack on m68k machines.
+
+Thu May  8 12:56:04 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* compar.c (rb_cmperr): raise comparison failure.
+
+	* intern.h: prototype; rb_cmperr
+
+	* numeric.c (flo_gt, flo_ge, flo_lt, flo_le, fix_gt, fix_ge,
+	  fix_lt, fix_le): should fail unless the argument is comparable.
+	  (ruby-bugs-ja:PR#456)
+
+	* numeric.c (int_upto, int_downto): should fail unless the
+	  argument is comparable.  (ruby-bugs-ja:PR#454)
+
+Wed May  7 13:30:11 2003  Masahiro TANAKA  <masa@ir.isas.ac.jp>
+
+	* numeric.c (num_step): better error treatment of float values.
+
+Tue May  6 17:51:54 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/pop.rb: rename method: POP3#mail_size -> n_mails
+
+	* lib/net/pop.rb: rename method: POP3#bytes -> n_bytes
+
+Tue May  6 17:21:01 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/bigdecimal/.cvsignore: new file.
+
+	* ext/zlib/.cvsignore: new file.
+
+Tue May  6 14:39:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_methods): list singleton methods if recur
+	  argument is false;  list all methods otherwise.
+
+Mon May  5 21:19:25 2003  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* ext/gdbm/gdbm.c (fgdbm_values_at): new method to replace
+	  select(index..).
+
+	* ext/sdbm/init.c (fsdbm_values_at): ditto.
+
+	* ext/dbm/dbm.c (fdbm_values_at): ditto.
+
+	* ext/dbm/dbm.c (DBM::VERSION): defined.
+
+	* ext/gdbm/testgdbm.rb: replace select with values_at.
+
+	* ext/sdbm/testsdbm.rb: ditto.
+
+	* ext/dbm/testdbm.rb: ditto.
+
+	* ext/dbm/testdbm.rb (setup): DBM.open(path, 0400) cause EACCESS
+	  on Berkeley DB[234].
+
+Mon May  5 22:57:07 2003  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* sample/cal.rb: use values_at instead of select.
+
+	* sample/biorhythm.rb: ditto.
+
+Mon May  5 18:59:45 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* sample/test.rb: substitute 'select' with 'values_at'.
+
+	* lib/date.rb: ditto.
+
+	* lib/parsedate.rb: ditto.
+
+Mon May  5 00:46:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_values_at): new method to replace select(index..).
+
+	* hash.c (rb_hash_values_at,env_values_at): ditto.
+
+	* re.c (match_values_at): ditto.
+
+	* struct.c (rb_struct_values_at): ditto.
+
+	* re.c (match_select): add iterator behavior.
+
+Sun May  4 19:08:53 2003  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date/format.rb: synchronized with date2 3.3.2.
+
+Sun May  4 15:21:18 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: ESMTP -> SMTP transition wrongly fails.
+
+Sun May  4 15:06:37 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/pop.rb: APOP did not work.  [ruby-dev:20149]
+
+Sat May  3 21:14:29 2003  Johan Holmberg  <holmberg@iar.se>
+
+	* ext/curses/curses.c, ext/digest/sha2/sha2.c, ext/iconv/iconv.c,
+	  ext/racc/cparse/cparse.c: include "ruby.h" at the top to shut up
+	  "_FILE_OFFSET_BITS redefined" warning on Solaris.
+
+Sat May  3 11:00:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_class_protected_instance_methods): now gives
+	  warnings to show migration path.  The default will be reversed
+	  on Jan 2004.
+
+Sat May  3 00:58:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_methods): now accepts recurse parameter.
+
+	* lib/delegate.rb (Delegator::initialize): instance_methods
+	  etc. now recurse by default.  need to specify false.
+
+Sat May  3 00:22:00 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb: reintroduce Protocol.protocol_param.
+
+	* lib/net/http.rb: ditto.
+
+	* lib/net/pop.rb: ditto.
+
+	* lib/net/smtp.rb: ditto.
+
+Fri May  2 23:29:53 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb: remove Protocol class.
+
+	* lib/net/smtp.rb (SMTP): ditto.
+
+	* lib/net/pop.rb (POP3): ditto.
+
+	* lib/net/http.rb (HTTP): ditto.
+
+	* lib/net/protocol.rb: remove Command class.
+
+	* lib/net/smtp.rb (SMTPCommand): ditto.
+
+	* lib/net/pop.rb (POP3Command): ditto.
+
+	* lib/net/pop.rb: remove APOPCommand class.
+
+	* lib/net/protocol.rb: remove Code class and its all subclasses.
+
+	* lib/net/protocol.rb: remove Response class and its all
+	  subclasses.
+
+	* lib/net/pop.rb (POPMail): new method unique_id (alias uidl).
+
+Fri May  2 18:17:37 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* compar.c (cmp_gt): raises ArgumentError when "<=>" give nil.
+	  inspired by discussion on comp.lang.python.
+
+Fri May  2 17:37:01 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi/session.rb (CGI::Session::initialize): updated to
+	  support 2003-04-23 change in cgi.rb [ruby-core:1002]
+
+Fri May  2 17:21:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (method_list): classify methods based on nearest
+	  visibility. [ruby-dev:20127]
+
+	* class.c (rb_class_instance_methods): recurse by default.  other
+	  method listing methods as well.
+
+Fri May  2 09:38:06 2003  Warren Brown  <wkb@airmail.net>
+
+	* string.c (rb_str_ljust): now takes optional argument to specify
+	  pad string. [ruby-talk:70482]
+
+	* string.c (rb_str_rjust): ditto.
+
+	* string.c (rb_str_center): ditto.
+
+	* string.c (rb_str_justify): utility function.
+
+Fri May  2 04:10:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_add_method): call singleton_method_added or
+	  method_added for every method definition (after ruby_running).
+	  [ruby-talk:70471]
+
+	* array.c (rb_ary_reverse_bang): Array#reverse! should not return
+	  nil even for arrays sized less than 2.
+
+Thu May  1 23:18:01 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_eof): should not block after reading all argument
+	  files. (ruby-bugs-ja PR#449)
+
+Fri May  2 15:10:41 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: use hashes to pass options.
+
+	* lib/fileutils.rb: new option mkdir(:mode), mkdir_p(:mode).
+
+	* instruby.rb: follow fileutils.rb feature change.
+
+Thu May  1 08:24:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_match_exec): $ _always_ matches at the end of string.
+
+Wed Apr 30 14:12:00 2003  wanowa.kimura@nifty.ne.jp (kimura wataru)
+
+	* net/imap.rb: support THREAD extension.
+
+Sun Apr 27 23:13:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* string.c (rb_str_to_i): disallow negative radix.
+	  [ruby-dev:20087]
+
+Sat Apr 26 23:34:42 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (open_args): warning message changed to "don't put space
+	  before argument parentheses".
+
+Sat Apr 26 14:25:00 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+
+	* wince/ : files removed.
+	           (config, dll.mak, exe.mak, mswince-ruby17.def,
+	            io.c, process.c, signal.c, string.c, time.c)
+
+	* wince/ : files added.
+	           (assert.c, Makefile.sub, mkexports.rb, io_wce.c,
+	            process_wce.c, signal_wce.c, string_wce.c,
+	            time_wce.c)
+
+	* wince/configure.bat : like mswin32 style.
+
+	* wince/direct.c : remove "static" at _currentdir.
+
+	* wince/io.h : change definition.
+
+	* wince/stdio.c : _fdopen -> fdopen.
+
+	* wince/process.h : add _P_OVERLAY.
+
+	* wince/time.h : change definition.
+
+	* wince/wincemain.c : add wce_SetCurrentDir.
+
+	* wince/wince.c : add wce_SetCurrentDir and wce_fopen.
+	                  fix GetModuleFileNameA to return correct "lpFileName".
+
+	* wince/wince.h : remove #ifdef.
+
+	* wince/sys/utime.h, utime.c : rename _utime to utime.
+
+	* wince/sys/stat.c : expand relative directory in stat.
+
+Sat Apr 26 06:33:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_read): ARGF.read() should read all argument files.
+
+Fri Apr 25 18:46:00 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+
+	* gc.c: STACK_LEVEL_MAX=65535 on mswince.
+
+Fri Apr 25 18:40:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_read): read should not span two files. [ruby-dev:20073]
+
+Fri Apr 25 18:19:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (splat_value): split splat_value() and avalue_splat().
+
+	* io.c: there's no way to set non-IO value to current_file, thus
+	  no need for argf_forward().
+
+Fri Apr 25 02:03:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): Proc#yield should pass through retry and
+	  break like keyword yield. [ruby-talk:70034]
+
+	* eval.c (proc_invoke): orphan Proc now raises LocalJumpError for
+	  break and retry again.
+
+	* eval.c (rb_eval): ARGSCAT should splat the argument.
+
+	* eval.c (splat_value): splat operation function.
+
+Thu Apr 24 23:37:02 2003  Dave Thomas  <dave@thomases.com>
+
+	* lib/matrix.rb (Matrix#minor):  Used Range#size, which no longer
+	  exists.
+
+	* lib/complex.rb (new!): Complex.new had been made private, but
+	  Kernel#Complex called it. Re-exposed as new!.
+
+	* lib/matrix.rb (Matrix.row_vector): Fix method name typo
+
+Thu Apr 24 19:40:02 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb: add -Wl,--no-undefined to LDSHARED only
+	  if GNU ld is 2.11 or later.
+
+Wed Apr 23 14:05:40 2003  Dave Thomas <dave@pragprog.com>
+
+	* lib/ipaddr.rb (include?): Support non-IPAddr parameters.
+	  [ruby-core:00980]
+
+Wed Apr 23 13:31:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::QueryExtension::[]): always return Value
+	  object.
+
+Wed Apr 23 08:39:27 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/zlib/extconf.rb: bccwin32 is win32 too.
+
+Tue Apr 22 20:58:00 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+
+	* ruby.c: don't call VirtualQuery in ruby_init_loadpath()
+	  on mswince.
+
+Tue Apr 22 19:08:53 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* marshal.c (save_mantissa, load_mantissa): for interoperability
+	  should count cut-down bit from topmost.
+
+Tue Apr 22 09:20:40 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg_ambiguous): hopefully better message.
+
+	* lib/cgi.rb (CGI::QueryExtension::initialize_query): to_ary
+	  removed.
+
+Tue Apr 22 06:06:22 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/resolv.rb (Resolv::DNS::Resource#hash): use XOR to accumulate
+	  hash value.
+
+	* lib/tsort.rb (TSort#each_strongly_connected_component): don't use
+	  block argument.
+	  (each_strongly_connected_component_from): ditto.
+
+Mon Apr 21 21:59:48 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* marshal.c: one more digit for decimal point.  [ruby-talk:69808]
+
+Mon Apr 21 21:25:59 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* numeric.c (flo_is_finite_p): use finite() if available.
+
+	* win32/win32.h (isinf, isnan): define as macro.
+	  [ruby-win32:00533]
+
+	* bcc32/Makefile.sub, win32/Makefile.sub: no longer use
+	  missing/isinf.c, missing/isnan.c.
+
+Mon Apr 21 18:36:28 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* bignum.c (rb_cstr_to_inum): unnecessarily long buffer was used
+	  for radix 9.  [ruby-dev:20057]
+
+Mon Apr 21 17:44:34 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (block_append, value_expr0, assign_in_cond,
+	  warn_unless_e_option, warning_unless_e_option, range_op,
+	  cond0): adjust line number in warning.
+
+Mon Apr 21 00:47:42 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* sample/test.rb: avoid the MSVCRT *printf problem(float).
+	  [ruby-dev:20037]
+
+Mon Apr 21 00:11:15 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* marshal.c (w_float): append least mantissa bits to get rid
+	  of roundoff problem.  [ruby-talk:69518]
+
+	* marshal.c (r_object0): load least mantissa bits.
+
+Sun Apr 20 23:24:25 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.c (NtInitialize): set the floating-point control word
+	  on bcc32.
+
+	* win32/win32.h, bcc32/Makefile.sub: use missing/isinf.c, should not
+	  use _finite() because it returns 0 if NaN.
+
+Sun Apr 20 03:09:30 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* parse.y (void_expr0): node might become NULL after calling
+	  remove_begin().
+
+Sat Apr 19 21:55:10 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/Setup*: Add zlib and remove bogus and obsolete entries.
+
+Sat Apr 19 14:47:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_gc): use rb_gc_mark_maybe() to mark registered C
+	  addresses.  C variables may not hold valid reference to Ruby
+	  objects. [ruby-core:00975]
+
+Sat Apr 19 00:56:13 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (rb_struct_eql): should compare values with "eql?".
+
+Fri Apr 18 23:29:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_check): <=> returns nil for invalid values;
+	  should check.
+
+Fri Apr 18 15:26:50 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* error.c (rb_raise): workaround for some implementations of
+	  vsnprintf.
+
+Fri Apr 18 02:23:42 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): should not set RE_OPTIMIZE_ANCHOR,
+	  if anychar_repeat is enclosed by parentheses.
+
+Fri Apr 18 01:49:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* util.c (ruby_strtod): improved conversion accuracy.
+
+Thu Apr 17 14:39:23 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/dbm/dbm.c (each_pair): add prototype to avoid VC++ warnings.
+
+	* ext/readline/readline.c (Init_readline): follow readline 4.2
+	  prototype.
+
+Thu Apr 17 14:22:36 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (cond0): warn only range literals whose both side are
+	  literals.  [ruby-core:00964]
+
+Thu Apr 17 11:10:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/readline/readline.c: add the defined operator for bcc32.
+
+Wed Apr 16 00:14:06 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-special-char-p): should test at the
+	  point if no argument.  fixed by Michael Scholz
+	  <scholz-micha@gmx.de>.
+
+Tue Apr 15 19:35:08 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: rm_r should raise Errno::ENOENT if file
+	  does not exist ([ruby-core:958]).  Thanks Johan Holmberg.
+
+Tue Apr 15 19:12:21 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* struct.c (rb_struct_hash): new methods Struct#hash, Struct#eql?.
+	  (ruby-bugs:PR#758)
+
+Tue Apr 15 16:05:11 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* numeric.c (rb_fix2str): buffer was insufficient.
+	  (ruby-bugs-ja:PR#431)
+
+Mon Apr 14 19:45:56 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* file.c (file_expand_path): root must follow buf when
+	  reallocated.  [ruby-talk:69339], [ruby-dev:20025]
+
+Mon Apr 14 03:22:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* rubyio.h (struct OpenFile): add noraise flag to finalizer.
+
+	* io.c (Init_IO): define $/, $-0, and $\ as string-only
+	  variables.
+
+	* string.c (rb_str_split_m): does not generate empty string if
+	  the receiver is empty.
+
+	* io.c (fptr_finalize): should raise error on EBADF for readable
+	  IOs as well.
+
+Mon Apr 14 15:54:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* bignum.c (rb_cstr_to_inum, rb_big2str): allow 2-36 as radix.
+
+	* numeric.c (rb_fix2str): ditto.
+
+	* string.c (rb_str_to_i): ditto.
+
+Sun Apr 13 03:20:31 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb (try_func): remove COMMON_HEADERS at first for
+	  performance.
+
+Sat Apr 12 20:59:40 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-beginning-of-arg): substitute
+	  ruby-backward-arg.
+
+	* misc/ruby-mode.el (ruby-calculate-indent): fixed wrong
+	  indentation in brace block and parentheses.
+
+	* misc/ruby-mode.el (ruby-forward-sexp, ruby-backward-sexp):
+	  support special char literal, and negative arguments.
+
+Sat Apr 12 17:52:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_stat): use rb_check_convert_type() to retrieve IO.
+
+Fri Apr 11 19:00:14 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* win32/win32.c (rb_w32_stat): check arguments.  [ruby-dev:20007]
+	  [ruby-win32:535]
+
+Fri Apr 11 15:56:08 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* numeric.c (coerce_rescue): prevent inspected String from GC.
+
+	* numeric.c (flo_eq, rb_dbl_cmp, flo_gt, flo_ge, flo_lt, flo_le,
+	  flo_eql): correct NaN comparison.  (ruby-bugs:PR#744)
+
+	* sample/test.rb: NaN comparison test.
+
+Fri Apr 11 14:48:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_stat): dereference using StringValuePtr().
+
+	* file.c (rb_file_s_stat): use rb_stat(). [ruby-dev:20007]
+
+Fri Apr 11 10:51:08 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/benchmark.rb (Benchmark::bm): get rid of warning.
+	  [ruby-talk:69124]
+
+Fri Apr 11 02:41:35 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* io.c (set_stdin): assigned value must respond to "read" and
+	  "getc".
+
+	* io.c (set_outfile): assigned value must respond to "write".
+	  (ruby-bugs-ja:PR#425)
+
+Thu Apr 10 21:12:19 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/pop.rb: Exception line was accidentaly removed.
+	  [ruby-dev:19989]
+
+Thu Apr 10 18:42:13 2003  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* array.c (rb_ary_times): added some checks for request size.
+
+Thu Apr 10 03:22:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_mod_name): always return empty string for
+	  anonymous class/module.  (ruby-bugs-ja PR#424)
+
+	* config.sub: stop forcing addition of -gnu to -linux.
+
+	* variable.c (classname): refactoring.
+
+	* variable.c (rb_class_path): __tmp__classpath__ handling moved
+	  from classname().
+
+Thu Apr 10 01:52:24 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_obj_is_method): indefinite return value.
+
+Thu Apr 10 00:39:32 2003  Tanaka Akira  <akr@m17n.org>
+
+	* regex.c (re_compile_pattern): /[\--\-]/ was warned.  warn /]/.
+
+	* mkconfig.rb: escape `]' in regexp.
+
+Thu Apr 10 00:27:07 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* time.c (time_strftime): RSTRING(format)->ptr might become NULL.
+
+Wed Apr  9 23:54:50 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_obj_remove_instance_variable): better message.
+	  [ruby-talk:68987]
+
+	* variable.c (rb_mod_remove_const): ditto.
+
+	* object.c (rb_obj_ivar_get): ditto.
+
+	* object.c (rb_obj_ivar_set): ditto.
+
+	* parse.y (yylex): ditto.
+
+Wed Apr  9 21:51:20 2003  Dave Thomas  <Dave@Thomases.com>
+
+	* eval.c (rb_mod_define_method): Allow UnboundMethod as
+	  parameter.
+
+Wed Apr  9 18:30:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (top_include): include module to wrapper module if
+	  wrapper is present. experimental.  [ruby-list:37539]
+
+Wed Apr  9 17:24:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_gc_mark_children): introduce this function again; this
+	  is required when stack was very tight. [ruby-talk:68916]
+
+Wed Apr  9 15:49:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigdivmod): small typo.
+
+Wed Apr  9 15:35:04 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/readline/readline.c: include <unistd.h> only when
+	  HAVE_UNISTD_H is defined.
+
+Wed Apr  9 14:05:00 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* marshal.c (w_object): preserve extended module on struct.
+	  (ruby-bugs-ja:PR#422)
+
+Wed Apr  9 03:43:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (BIGZEROP): macro to determine if x is a bignum zero.
+
+Tue Apr  8 11:49:31 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (Init_Proc): make Method and UnboundMethod independent.
+	  They are like instance and its class. [ruby-core:00941]
+
+	* parse.y (yylex): disallow global variables like "$1ve".
+	  [ruby-core:00945]
+
+	* marshal.c (marshal_dump): Marshal.dump(0, false) should cause an
+	  error. (ruby-bugs-ja PR#421)
+
+	* regex.c (re_compile_pattern): warn if '-' is the edge of
+	  character range.
+
+Mon Apr  7 15:49:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_s_unpack_sockaddr_in): remove struct
+	  size check.  getnameinfo(3) can handle. [ruby-dev:19967]
+
+Mon Apr  7 01:33:31 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_read): do not call rb_sys_fail() when required data
+	  length is zero. (ruby-bugs-ja PR#420)
+
+	* eval.c (umethod_proc): should raise TypeError, instead of
+	  returning error causing Proc.  Following the principle of "fail
+	  early".  [ruby-core:00927]
+
+Sun Apr  6 18:29:21 2003  UENO Katsuhiro  <katsu@blue.sky.or.jp>
+
+	* ext/zlib/zlib.c: the return value of GzipReader#getc must be
+	  unsigned.
+
+Sun Apr  6 00:35:37 2003  Tanaka Akira  <akr@m17n.org>
+
+	* sample/exyacc.rb: use Regexp in gsub!.
+
+Sat Apr  5 23:41:28 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): small but serious typo.
+
+Sat Apr  5 04:23:05 2003  Warren Brown  <wkb@airmail.net>
+
+	* sprintf.c (rb_f_sprintf): was decrementing width even if there
+	  is no sign character.
+
+Sat Apr  5 01:41:28 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (backtrace): skip internal allocator frame.
+	  (ruby-bugs-ja PR#416)
+
+Fri Apr  4 10:53:22 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (assign): should prepare mrhs by svalue_to_mrhs().
+
+Wed Apr  2 15:11:23 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* README.EXT, README.EXT.ja (3.3): clarified -1 as free for
+	  Data_Wrap_Struct().  [ruby-dev:19881]
+
+Mon Mar 31 11:11:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_missing): use "inspect" for T_OBJECT as well.
+
+Mon Mar 31 10:50:48 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (env_reject_bang): untaint key string.
+
+	* hash.c (env_delete_m): execute block only if deleting key does
+	  not exist.
+
+Sat Mar 29 17:54:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): do not call rb_str_buf_cat() with NULL ptr,
+	  which causes SEGV; jump to grow instead. [ruby-dev:19944]
+
+Sat Mar 29 15:19:48 2003  Tanaka Akira  <akr@m17n.org>
+
+	* instruby.rb, ext/extmk.rb, lib/benchmark.rb, lib/cgi.rb,
+	  lib/debug.rb, lib/getoptlong.rb, lib/optparse.rb, lib/time.rb,
+	  lib/date/format.rb, lib/irb/ruby-lex.rb lib/uri/common.rb: revert
+	  escape for `-' in character class.
+
+Sat Mar 29 09:48:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (avalue_to_svalue): use rb_check_array_type() again.
+	  Clarify how "to_ary" and "to_a" work. [ruby-talk:68155]
+
+	* eval.c (svalue_to_avalue): ditto.
+
+	* eval.c (svalue_to_mrhs): ditto.
+
+	* eval.c (rb_eval): unary splat to use to_a, but we need a hack to
+	  exclude Object#to_a until it's removed.
+
+	* object.c (rb_Array): check obj.respond_to?("to_a").  Currently
+	  all object respond_to "to_a", but Object#to_a will be removed.
+
+	* range.c (Init_Range): undefine to_ary.
+
+	* re.c (Init_Regexp): ditto.
+
+Sat Mar 29 09:47:52 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* MANIFEST (ext/aix_mksym.rb): remove obsolete file.
+
+Fri Mar 29 06:21:24 2003  UENO Katsuhiro  <katsu@blue.sky.or.jp>
+
+	* ext/zlib: merge from rough.
+
+Fri Mar 28 19:33:39 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* variable.c (rb_class_path): hold temporary class path in a
+	  instance variable to get rid of GC.  [ruby-dev:19932]
+
+	* variable.c (classname): remove temporary class path when exact
+	  name found.
+
+Fri Mar 28 18:29:23 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): do not warn if "-" is at the top
+	  or last of character class.
+
+Thu Mar 27 12:10:15 2003  Tanaka Akira  <akr@m17n.org>
+
+	* regex.c (re_compile_pattern): fix [:name:] handling.
+	  /[\[:digit:]]/ was treated as /[[:digit:]]/.
+	  /[[:-@]/ was treated as /[\[:\-@]/.
+	  /[%-[:digit:]]/ was treated as /[%-\[:digit:]\]/.
+
+Thu Mar 27 03:26:40 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* string.c (rb_str_capitalize_bang): check length before upcase
+	  first character.  (ruby-bugs:PR#697)
+
+Wed Mar 26 20:25:10 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* dln.c (dln_find_1): break if path list end, even for too long
+	  path names.  (ruby-bugs-ja:PR#412)
+
+Wed Mar 26 13:19:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (avalue_splat): new function to do unary * (splat)
+	  operator.
+
+	* eval.c (avalue_to_svalue,svalue_to_avalue,svalue_to_mrhs): do
+	  not use implicit "to_ary" conversion.
+
+	* ext/curses/curses.c (GetWINDOW,GetMOUSE): add taint check.
+
+	* ext/curses/curses.c (curses_init_screen): ditto.
+
+	* ext/curses/curses.c (window_initialize): ditto.
+
+	* gc.c (os_each_obj): prohibit ObjectSpace#each_object in safe
+	  mode ($SAFE >= 4).
+
+Tue Mar 25 23:26:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* signal.c (trap): return "DEFAULT" and "IGNORE" respectively for
+	  previous sighandler SIG_DFL and SIG_IGN. [ruby-talk:67860]
+
+Tue Mar 25 12:24:15 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): call avalue_to_mrhs() to assign block
+	  parameter |a|. [ruby-dev:19897]
+
+	* ruby.c (ruby_set_argv): freeze argument strings.
+
+Tue Mar 25 12:01:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_initialize): should check rb_secure(4).
+
+	* dir.c (dir_s_getwd): should check rb_secure(4).
+
+	* object.c (rb_obj_infect): function version of OBJ_INFECT().
+
+	* eval.c (rb_secure_update): new function to check object update.
+
+Tue Mar 25 10:18:05 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c: should infect also return values of
+	  #inspect.
+
+	* ext/strscan/strscan.c: use snprintf() instead of sprintf().
+
+Mon Mar 24 16:55:04 2003  Takaaki Tateishi <ttate@ttsky.net>
+
+	* ext/dl/dl.c: added rb_secure(4). (Thanks to Minero Aoki)
+
+	* ext/dl/sym.c: ditto.
+
+	* ext/dl/ptr.c: ditto.
+
+Mon Mar 24 00:09:02 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (block_append): warn unused literal.
+
+Sun Mar 23 22:22:04 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/jcode.rb (tr!, delete!, szueeze!): add empty string checking.
+
+Sun Mar 23 19:54:53 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): use free() if dfree is -1.
+
+Sat Mar 22 15:50:29 2003  Tanaka Akira  <akr@m17n.org>
+
+	* time.c (make_time_t): try search_time_t if mktime/timegm is failed.
+
+Sat Mar 22 13:26:33 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/optparse.rb, lib/jcode.rb, ext/tk/lib/tk.rb: reorder character
+	  class /[\]\[]/ to /[\[\]]/ for readability.
+
+Sat Mar 22 12:44:15 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/date/format.rb, lib/uri/common.rb: escape `[', `]', `-' in
+	  character class in regexp to avoid warning.
+
+Sat Mar 22 07:39:32 2003  Ulf Betlehem  <flu@iki.fi>
+
+	* io.c (rb_io_fread): may lose data on nonblocking read.
+
+Fri Mar 21 23:40:41 2003  Tanaka Akira  <akr@m17n.org>
+
+	* regex.c (re_compile_pattern): fix previous change.
+
+	* instruby.rb, ext/extmk.rb, ext/tk/lib/tk.rb, lib/benchmark.rb,
+	  lib/cgi.rb, lib/debug.rb, lib/getoptlong.rb, lib/jcode.rb,
+	  lib/optparse.rb, lib/time.rb, lib/date/format.rb,
+	  lib/irb/ruby-lex.rb: escape `[', `]', `-' in character class in
+	  regexp to avoid warning.
+
+Fri Mar 21 23:23:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): give warning for unescaped square
+	  brackets and minus in character class. [ruby-dev:19868]
+
+Fri Mar 21 18:12:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (bmcall): missing type.
+
+Fri Mar 21 01:29:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): copy sign bits only if value is
+	  negative.
+
+	* missing.h: include <stdarg.h> or <varargs.h> if HAVE_VSNPRINTF
+	  is not defined.
+
+Thu Mar 20 18:31:37 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/optparse.rb (OptionParser#order!): follow recent change
+	  of proc argument.
+
+Thu Mar 20 16:12:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flo_to_s): change format specifier to "%.15g" to
+	  avoid unnecessary 9s (e.g. 99.59999999999999). (ruby-bugs-ja PR#406)
+
+Thu Mar 20 16:03:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (stmt, primary): get rid of SEGV at empty or invalid
+	  condition.  (ruby-bugs-ja:PR#410)
+
+	* parse.y (cond_negative): negate condition node when NODE_NOT.
+
+Thu Mar 20 10:45:29 2003  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (bmcall): add volatile to avoid GC problem.
+
+Thu Mar 20 10:10:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (load_dyna): clear ruby_errinfo. (ruby-bugs-ja PR#409)
+
+Wed Mar 19 23:05:30 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+	* lib/tracer.rb (trace_func): save and recover Thread.critical state.
+	  Fixed by Fukumoto Atsushi <fukumoto@imasy.or.jp> [ruby-dev:19830]
+
+Wed Mar 19 02:55:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (read_all): make str empty if given. (ruby-bugs-ja PR#408)
+
+	* io.c (io_read): ditto.
+
+	* io.c (rb_io_sysread): ditto.
+
+Tue Mar 18 18:24:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c: do not override min and max.
+
+Sun Mar 16 12:29:55 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (object_address_group): use to_s instead of name
+	  to get name of class.
+
+Fri Mar 14 08:53:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (remove_sign_bits): octal left most digit for negative
+	  numbers may be '3'. (ruby-bugs-ja PR#407)
+
+	* sprintf.c (rb_f_sprintf): should prefix sign bits if bignum is
+	  negative, using sign_bits().
+
+Wed Mar 12 16:48:19 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (prep_stdio): set binmode only if the file descriptor
+	  is not connected to a terminal on Cygwin.
+
+Wed Mar 12 11:23:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (avalue_to_mrhs): split argument passing and assignment
+	  conversion.
+
+	* eval.c (svalue_to_mrhs): ditto.
+
+	* eval.c (avalue_to_svalue): avalue_to_svalue([[1,2]]) should be
+	  [[1,2]], not [1,2] to wrap-around.
+
+Tue Mar 11 21:00:59 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: Digest string wrongly included '\n' when user
+	  name is too long (ruby-bugs-ja:PR#404).
+
+Tue Mar 11 20:07:01 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: speeding up by avoiding extra flush.
+	  (suggested by Brian Candler <B.Candler@pobox.com> [ruby-talk:66516])
+
+Tue Mar 11 04:30:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (massign): remove unnecessary array unpacking; it should
+	  be handled before massign() by svalue_to_mrhs().
+
+	* eval.c (svalue_to_mrhs): '*a = v' value conversion to avalue
+	  (i.e. [1] => [[1]], [1,2] => [1,2]).
+
+	* eval.c (rb_eval): use svalue_to_mrhs.
+
+	* eval.c (rb_yield_0): ditto.
+
+	* eval.c (proc_invoke): break from "Proc#yield" is legal.
+
+Mon Mar 10 23:19:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_find_file): need world writable directory check for
+	  relative paths too.
+
+Mon Mar 10 11:23:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_find_file): world writable directory check if
+	  $SAFE >= 1 (was $SAFE >= 2).
+
+Mon Mar 10 01:59:47 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/pop.rb: do not dispatch LIST when a mailbox is empty.
+
+	* lib/net/pop.rb: merge the 'STAT' patch from Frank S.Fejes
+	  <frank@oopdreams.com>, with modifications (listed below).
+
+	* lib/net/pop.rb: new method Net::POP#mail_size.
+
+	* lib/net/pop.rb: new method Net::POP#bytes.
+
+	* lib/net/pop.rb: new method Net::POPCommand#stat.
+
+Sun Mar  9 19:30:25 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/fileutils.rb (mkdir, mkdir_p): revert.
+
+	* instruby.rb (umask): umask 0022, not 0.
+
+Sun Mar  9 17:09:40 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/fileutils.rb (mkdir, mkdir_p): set mode to 0755.
+
+	* Makefile.in (fake.rb): set ALT_SEPARATOR to the default value.
+
+Sat Mar  8 11:30:59 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (massign): fix a bug not to expand in assignment to sole
+	  lhs.  [ruby-dev:19766]
+
+Fri Mar  7 21:57:25 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (Kernel.pp): module function.
+	  (MatchData#pretty_print): new method.
+
+Fri Mar  7 20:27:19 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/tcltklib/extconf.rb (find_tcl, find_tk): return true if
+	  non-versioned found.  [ruby-dev:19759]
+
+Fri Mar  7 15:05:35 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/dbm/extconf.rb: add QDBM support.
+
+Fri Mar  7 12:59:39 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (massign): deal with sole lhs, assign rest args from
+	  converted array.  [ruby-dev:19751]
+
+Fri Mar  7 03:31:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (dsym): :"symbol string" style should not contain `\0'.
+
+	* process.c (proc_detach): new method Process.detach(pid) which
+	  create background watcher thread to issue waitpid. [new]
+
+	* process.c (rb_detach_process): utility function to detach
+	  process from C code.
+
+	* ext/pty/pty.c (pty_finalize_syswait): terminate watcher thread,
+	  and detach child process (by creating new idle waitpid watcher
+	  thread).
+
+	* ext/pty/pty.c (pty_syswait): may lost signal stopped child.
+
+Fri Mar  7 00:30:33 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/Win32API/Win32API.c: no longer use inline-asms.
+
+	* ext/Win32API/extconf.rb: no need to add gcc options.
+
+Thu Mar  6 13:02:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (reswords): fix reswords list.
+
+Wed Mar  5 12:13:21 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: better YACC support on HP-UX.
+
+Wed Mar  5 05:55:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_cat): remove ptr NULL check and MEMZERO(). ptr
+	  must be non NULL.
+
+Tue Mar  4 23:12:07 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in, bcc32/Makefile.sub, win32/Makefile.sub: define
+	  RUBY_EXPORT to export symbols.
+
+	* defines.h: use RUBY_EXTERN instead of EXTERN.
+
+	* intern.h, re.h, ruby.h, rubysig.h: ditto.
+
+	* win32/win32.h: remove EXTERN definition.
+
+Tue Mar  4 17:54:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_aref): raise TypeError if index is a symbol.
+	  [ruby-list:37217]
+
+	* array.c (rb_ary_aset): ditto.
+
+Tue Nov 13 14:39:11 2001  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* missing/strftime.c: HP-UX support.
+
+Tue Mar  4 15:08:08 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: better HP-UX support.
+
+	* missing/strftime.c: ditto.
+
+Tue Mar  4 10:11:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_popen): do not call rb_io_close() directly, call
+	  "close" method instead. [ruby-dev:19717]
+
+	* io.c (rb_io_s_open): ditto.
+
+	* hash.c (rb_any_hash): remove DEFER_INTS.  all do_hash() calls in
+	  st.c are at the top of functions.  No reentrant problem.
+
+Tue Mar  4 01:19:21 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/dl/MANIFEST: Exclude .cvsignore. [found by: eban]
+
+Tue Mar  4 01:17:08 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/Win32API/MANIFEST: Belatedly add lib/win32/registry.rb.
+	  [found by: eban]
+
+Tue Mar  4 00:33:04 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* MANIFEST: Belatedly add Test::Unit files.  D'oh!
+
+Sun Mar  2 09:51:47 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* marshal.c (w_nbyte): should output always via rb_io_write().
+
+	* marshal.c (dump_ensure): ditto.
+
+	* marshal.c (marshal_dump): should call "binmode" method, if it
+	  responds to.
+
+	* marshal.c (r_byte): should input always via "getc" method.
+
+	* marshal.c (r_bytes0): should input always via "read" method.
+
+	* marshal.c (marshal_load): need not to set up FILE* fp;
+
+Mon Mar  3 11:29:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): parse 'lhs = a rescue b' as 'lhs=(a rescue b)'.
+
+Mon Mar  3 02:53:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_fread): should not clearerr() if there's no filled
+	  buffer (i.e. rb_io_fread() returning zero).
+
+Mon Mar  3 01:42:35 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-expr-beg): escaped char syntax.
+
+	* misc/ruby-mode.el (ruby-parse-partial): ditto.
+
+	* misc/ruby-mode.el (ruby-parse-partial): no deep indent for
+	  block.
+
+	* misc/ruby-mode.el (ruby-backward-arg): skip arguments backward.
+
+	* misc/ruby-mode.el (ruby-calculate-indent): too deep indentation.
+
+Fri Feb 28 23:50:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.c (map_errno): map OS error to errno. [new]
+
+	* win32/win32.c (pipe_exec, CreateChild, poll_child_status, waitpid,
+	  kill, link, rb_w32_rename, unixtime_to_filetime, rb_w32_utime): use
+	  map_errno() instead of using GetLastError() directly.
+
+	* win32/win32.c (rb_w32_select, rb_w32_accept, rb_w32_bind,
+	  rb_w32_connect, rb_w32_getpeername, rb_w32_getsockname,
+	  rb_w32_getsockopt, rb_w32_ioctlsocket, rb_w32_listen, rb_w32_recv,
+	  rb_w32_recvfrom, rb_w32_send, rb_w32_sendto, rb_w32_setsockopt,
+	  rb_w32_shutdown, rb_w32_socket, rb_w32_gethostbyaddr,
+	  rb_w32_gethostbyname, rb_w32_gethostname, rb_w32_getprotobyname,
+	  rb_w32_getprotobynumber, rb_w32_getservbyname, rb_w32_getservbyport,
+	  rb_w32_fclose, rb_w32_close): map winsock error to errno.
+
+Fri Feb 28 22:54:10 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* win32/win32.c (flock): supports larger files, and maps error
+	  code.
+
+	* win32/win32.c (rb_w32_asynchronize): returns errno from child
+	  thread.
+
+	* win32/win32.c (rb_w32_fclose, rb_w32_close): ensures unlocked.
+
+Wed Feb 26 17:38:16 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb: replace Kernel.open as well.
+
+Tue Feb 25 23:03:08 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/debug.rb (DEBUGGER__::Context#debug_command): bp filename must
+	  be the basename of it.  [ruby-talk:65644]
+
+Mon Feb 24 17:49:35 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (yycompile): zero clear ruby_eval_tree_begin if
+	  compilation failed.
+
+Mon Feb 24 08:06:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_new): need no MEMZERO().
+
+Sun Feb 23 17:57:06 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/fileutils (fu_stream_blksize): wrong logical condition.
+	  (and -> or).
+
+Sat Feb 22 03:12:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_gt): use rb_num_coerce_cmp() instead of
+	  rb_num_coerce_bin.
+
+	* numeric.c (fix_ge, fix_lt, fix_le): ditto.
+
+	* numeric.c (flo_gt, flo_ge, flo_lt, flo_le): ditto.
+
+Sat Feb 22 02:45:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_create): may called from place higher than
+	  rb_gc_stack_start.
+
+	* gc.c (Init_stack): update rb_gc_stack_start if it is lower (or
+	  higher if stack grows down) than the previous value.
+
+Fri Feb 21 21:03:41 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: new method FileUtils#copy_stream.
+
+	* lib/fileutils.rb: new method FileUtils#compare_file.
+
+	* lib/fileutils.rb: new method FileUtils#compare_stream.
+
+	* lib/fileutils.rb: new method FileUtils#rmtree (alias of rm_rf).
+
+Fri Feb 21 17:19:27 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* eval.c (rb_f_require): do not need to abort if a DLEXT file
+	  is not found.
+
+Fri Feb 21 13:39:25 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_cmp_m): should use LONG2NUM().
+
+Fri Feb 21 12:45:50 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_cmp_m): two small bugs fixed.
+
+Fri Feb 21 08:03:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_gc_mark): inline rb_gc_mark_children().
+
+	* gc.c (gc_sweep): new tactics to increase malloc_limit mildly.
+
+Fri Feb 21 05:16:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_cmp_m): return nil if str2 does not respond to
+	  both "to_str" and "<=>".
+
+	* compar.c (cmp_gt): return nil if "<=>" returns nil (means
+	  incomparable).
+
+	* compar.c (cmp_ge, cmp_lt, cmp_le): ditto.
+
+	* compar.c (cmp_between): use RTEST(), since cmp_lt and cmp_gt may
+	  return nil.
+
+Thu Feb 20 19:05:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_start_0): main thread swapped by fork() may
+	  terminate rb_thread_start_0() successfully. call ruby_stop(0);
+	  this change was suggested by Rudi Cilibrasi
+	  <cilibrar@drachma.ugcs.caltech.edu>.
+
+Thu Feb 20 18:44:51 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* file.c (file_expand_path): fix wrong behavior for root file.
+	  expand_path("..", "//machine/share") => "//machine/share"
+	  expand_path("..", "c:/a") => "c:/"
+	  expand_path("..", "/a") => "/"
+
+Thu Feb 20 18:11:01 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* file.c (file_expand_path): should not upward beyond share name.
+
+Thu Feb 20 15:45:33 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* missing.h (strtoul): fix prototype of strtoul.
+
+Thu Feb 20 10:11:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (clhs): allow "Foo::Bar = x".
+
+Thu Feb 20 04:07:06 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (primary): "self[n]=x" can be legal even when "[]=" is
+	  private.  changes submitted in [ruby-talk:63982]
+
+	* parse.y (aryset): ditto.
+
+	* parse.y (attrset): "self.foo=x" can be legal even when "foo="
+	  is private.
+
+	* eval.c (is_defined): private "[]=" and "foo=" support.
+
+	* eval.c (rb_eval, assign): ditto.
+
+Thu Feb 20 03:58:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): "foo=" should not always be public.
+
+Thu Feb 20 01:23:59 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_thread_restore_context): inhibit interrupts in
+	  critical section while context switching.  [ruby-talk:64785]
+
+Wed Feb 19 18:27:42 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* node.h (nd_cpath): nested class/module declaration.
+	  [EXPERIMENTAL]
+
+	* eval.c (rb_eval): ditto.
+
+	* gc.c (rb_gc_mark_children): ditto.
+
+	* parse.y (cpath): ditto.
+
+Tue Feb 18 21:39:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): should not report uninitialized warning by
+	  attribute reader method.
+
+	* variable.c (rb_attr_get): new function to get instance variable
+	  without uninitialized warning.
+
+	* io.c (argf_to_io): should prefetch argv.
+
+Tue Feb 18 00:13:50 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-comment-column): customize comment
+	  column.  [new]
+
+	* misc/ruby-mode.el (ruby-deep-indent-paren): deep indentation
+	  parentheses.  [new]
+
+	* misc/ruby-mode.el (ruby-expr-beg): fix for / after $?.
+
+	* misc/ruby-mode.el (ruby-parse-partial, ruby-calculate-indent):
+	  deep indentation support.
+
+	* misc/ruby-mode.el (ruby-forward-sexp, ruby-backward-sexp):
+	  move forward/backward across one balanced expression.  [new]
+
+	* misc/ruby-mode.el (ruby-indent-exp): indent balanced
+	  expression.  [new]
+
+	* misc/ruby-mode.el (ruby-electric-brace): indent before
+	  show matching parenthesis.  (contributed by NABEYA Kenichi)
+
+Mon Feb 17 14:36:56 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* win32/win32.c (rb_w32_opendir, rb_w32_utime): need parens.
+
+Mon Feb 17 14:13:25 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.c (link): implement with CreateHardLink().
+
+	* win32/win32.c, win32/win32.h (rb_w32_utime): enable utime() to
+	  directory if on NT. [new] (ruby-bugs-ja:PR#393)
+
+Mon Feb 17 13:28:51 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* file.c (file_expand_path): strip last slash when path is
+	  root.
+
+Sun Feb 16 19:22:31 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* file.c (file_expand_path): buffer might be reallocated while
+	  expanding default directory.
+
+	* file.c (file_expand_path): default directory was being
+	  ignored if path was full path with no drive letter, under
+	  DOSISH.
+
+Sun Feb 16 03:14:33 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (prep_stdio, Init_io): always set binmode on Cygwin.
+
+Sat Feb 15 01:01:45 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* file.c (file_expand_path): fix surplus path separators while
+	  expanding at root directory.  [ruby-dev:19572]
+
+Fri Feb 14 14:25:24 2003  akira yamada  <akira@arika.org>
+
+	* lib/uri/generic.rb, lib/uri/ldap.rb, lib/uri/mailto.ldap: all foo=()
+	  returns arguments passed by caller.
+
+	* lib/uri/generic.rb (Generic#to_str, Generic#to_s): removed to_str.
+	  Suggested by Tanaka Akira <akr@m17n.org> at [ruby-dev:19475].
+
+	* lib/uri/generic.rb (Generic#==): should not generate an URI object
+	  from argument. Suggested by Tanaka Akira <akr@m17n.org> at
+	  [ruby-dev:19475].
+
+Thu Feb 13 11:54:50 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ruby.c (ruby_init_loadpath): ensures buffer terminated
+	  before use strncpy().
+
+	* ruby.c (proc_options): avoid SEGV at -S with no arguments.
+	  script argument is in effect only when -e is not given.
+	  (ruby-bugs-ja:PR#391)
+
+Thu Feb 13 01:30:10 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_thread_schedule): current thread may be dead when
+	  deadlock.  (ruby-bugs:PR#588)
+
+Thu Feb 13 00:28:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_step): step might be float 0 < x < 1.
+
+	* eval.c (rb_thread_schedule): pause if no runnable thread when
+	  there's only one thread.
+
+Thu Feb 13 00:09:47 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* file.c (strrdirsep): ignore trailing directory separators.
+
+	* file.c (rb_file_s_expand_path): File.expand_path(".","/") should
+	  return "/".  (ruby-bugs-ja:PR#389)
+
+	* file.c (rb_file_s_basename): also ignore trailing directory
+	  separators, in compliance with SUSv3.  (ruby-bugs-ja:PR#390)
+
+	* file.c (rb_file_s_dirname, rb_file_s_extname): ditto.
+
+	* file.c (rb_file_s_dirname): append "." if drive only.
+
+	* file.c (rb_file_s_split): get rid of converting twice.
+
+Mon Feb 10 20:55:15 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb (parse_args): add '-n' to $mflags BEFORE "--".
+	  do not add DESTDIR if already included in $mflags.
+
+Mon Feb 10 19:54:30 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (FileUtils#uptodate?): use mtime for
+	  comparison.
+
+Mon Feb 10 10:14:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_to_a): return value should be an Array if the
+	  receiver is an instance of subclass of Array.
+
+	* string.c (rb_str_to_s): return value should be a String if the
+	  receiver is an instance of subclass of String.
+
+Mon Feb 10 03:33:42 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (rb_file_sysopen): rb_file_sysopen_internal() needs four
+	  arguments.
+
+Sun Feb  9 15:16:04 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* intern.h (HAVE_RB_DEFINE_ALLOC_FUNC, RB_CVAR_SET_4ARGS):
+	  define to 1.
+
+	* ruby.h (NORETURN_STYLE_NEW): ditto.
+
+Sun Feb  9 12:28:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/mkmf.rb (init_mkmf): add libdir to LIBPATH unless cross
+	  compiling.
+
+Sun Feb  9 08:34:45 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: 4xx raises Net::ProtoServerError, 5xx raises
+	  Net::ProtoFatalError (for backward compatibility).
+
+Sun Feb  9 07:07:26 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: new method FileUtils.pwd (really).
+
+	* lib/fileutils.rb: FileUtils.pwd, cmp, identical?, uptodate? does
+	  not accept any option.
+
+Sat Feb  8 18:35:30 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-forward-string): fixed void variable
+	  error.
+
+Sat Feb  8 16:23:11 2003  NABEYA Kenichi  <kenichi@nabeya.com>
+
+	* misc/ruby-mode.el (ruby-font-lock-keywords): method name can
+	  be delimited by tab.
+
+Sat Feb  8 03:57:32 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/irb/workspace.rb, lib/irb/ext/math-mode.rb,
+	  lib/irb/ext/multi-irb.rb, lib/irb/lc/error.rb,
+	  lib/irb/lc/help-message, lib/irb/lc/ja/error.rb,
+	  lib/shell/command-processor.rb, lib/shell/error.rb,
+	  lib/shell/filter.rb: Fix typos and grammos. [approved by: keiju]
+
+Sat Feb  8 03:34:28 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* intern.h (HAVE_RB_DEFINE_ALLOC_FUNC): New boolean macro to make
+	  it easier to write extensions that work with both ~1.6 and 1.8~.
+
+	* intern.h (RB_CVAR_SET_4ARGS): Ditto.
+
+	* ruby.h (NORETURN_STYLE_NEW): Ditto.
+
+Sat Feb  8 00:47:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call): calls method_missing when superclass method
+	  does not exist.
+
+	* eval.c (rb_f_missing): now handles "no super" case.
+
+	* object.c (rb_obj_ivar_get): Object#instance_variable_get: new
+	  method to get instance variable value without eval(). [new]
+
+	* object.c (rb_obj_ivar_set): Object#instance_variable_set: new
+	  method to set instance variable value without eval(). [new]
+
+Fri Feb  7 15:35:21 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* intern.h, re.c (rb_memsearch): returns long.
+
+	* string.c (rb_str_index): should return offset position.
+
+Fri Feb  7 15:30:15 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (proc_invoke): should propagate self to super
+	  methods.  [ruby-dev:19510]
+
+Thu Feb  6 19:04:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_initialize_m): should not preset "kcode" unless
+	  encoding is explicitly specified.
+
+Thu Feb  6 19:01:32 2003  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: new method FileUtils.pwd.
+
+	* lib/fileutils.rb: default label is ''.
+
+	* lib/fileutils.rb: using module_eval again, to avoid ruby's bug.
+
+	* lib/fileutils.rb: fix wrong examples in rdoc.
+
+Thu Feb  6 17:43:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/complex.rb (Complex#==): should not raise error by type
+	  mismatch.
+
+	* lib/rational.rb (Rational#==): ditto.
+
+Thu Feb  6 11:44:40 2003  MoonWolf  <moonwolf@moonwolf.com>
+
+	* re.c (rb_reg_initialize_m): 3rd argument was ignored.
+
+Thu Feb  6 01:09:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_count): return 0 for empty string (was
+	  returning nil).
+
+Wed Feb  5 19:41:37 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb: dispatch code restructured to make it openable
+	  that has `open' method.
+
+	* lib/open-uri.rb: Location: field may has a relative URI.
+	  pointed out by erik eriksson <ee@opera.com>.
+
+Wed Feb  5 17:11:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): no .<digit> float literal anymore.
+
+Tue Feb  4 16:11:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_equal): a == b is true when b is non T_ARRAY
+	  object, if b has "to_ary" and b == a.
+
+	* hash.c (rb_hash_equal): a == b is true when b is non T_HASH
+	  object, if b has "to_hash" and b == a.
+
+	* string.c (rb_str_equal): a == b is true when b is non T_STRING
+	  object, if b has "to_str" and b == a.
+
+Mon Feb  3 23:46:48 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_getline): should not increment lineno at EOF.
+
+Mon Feb  3 16:49:19 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (Init_Object): default Object#=== now calls "=="
+	  internally.
+
+	* re.c (rb_reg_initialize_m): should honor option status of
+	  original regexp.
+
+	* array.c (rb_ary_equal): ary2 should be T_ARRAY (no to_ary
+	  conversion).
+
+	* array.c (rb_ary_eql): ditto.
+
+	* string.c (rb_str_equal): str2 should be T_STRING (no to_str
+	  conversion).
+
+Mon Feb  3 16:32:52 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* re.c (rb_memsearch): a little improvement.
+
+Mon Feb  3 13:18:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_memsearch): algorithm body of String#index.
+
+	* error.c (Init_Exception): "to_str" removed.
+
+	* eval.c (eval): should not rely on Exception#to_str
+
+	* eval.c (compile_error): ditto.
+
+	* error.c (err_append): ditto.
+
+Sat Feb  1 23:56:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_merge): Hash#merge, non destructive "update".
+	  now there's also Hash#merge! which is an alias to "update".
+
+Fri Jan 31 14:16:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_index): search using Karp-Rabin algorithm.
+
+Fri Jan 31 12:45:11 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_obj_classname): new function.
+
+	* string.c (rb_str_dup): should preserve original's class (but not
+	  hidden singleton class).
+
+	* string.c (rb_str_substr): ditto.
+
+	* parse.y: backout EXPR_CMDARG removal.
+
+Fri Jan 31 09:40:07 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/optparse.rb (OptionParser::List::accept): default
+	  pattern must not be nil.
+
+	* lib/optparse.rb (OptionParser::make_switch): NoArgument doesn't
+	  override other styles.
+
+Thu Jan 30 16:46:43 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/optparse.rb (OptionParser::Switch::PlacedArgument): added.
+	  if the next argument doesn't start with '-', use it as the
+	  value.
+
+	* lib/optparse.rb (OptionParser::make_switch): fixed a bug of
+	  pattern.
+
+	* lib/optparse.rb (Array): no need to guard.
+
+Thu Jan 30 08:27:19 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* file.c (rb_file_s_expand_path): removed a sludge.
+
+Wed Jan 29 03:24:39 2003  Michal Rokos  <michal@rokos.homeip.net>
+
+	* dir.c (glob_helper): memory leak fixed.
+
+Tue Jan 28 04:45:03 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* instruby.rb (parse_args), ext/extmk.rb (parse_args): Prepend a
+	  hyphen to the first argument of MAKEFLAGS only if appropriate.
+	  Remove wrong comments.
+
+Mon Jan 27 03:30:06 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* error.c (get_syserror): use snprintf() instead of sprintf(). pointed
+	  out by knu.
+
+Mon Jan 27 02:06:38 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* error.c (get_syserror): some Windows' errno have 5 digits. pointed
+	  out by znz.
+
+Sun Jan 26 19:23:10 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* instruby.rb ($mflags.set?): Check $make instead of $nmake, since
+	  there is no such a variable.
+
+	* instruby.rb ($mflags.set?), ext/extmk.rb ($mflags.set?): Return
+	  false if unmatched.
+
+Sun Jan 26 19:08:30 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/shellwords.rb: Embed rdoc style comments.
+
+	* lib/shellwords.rb (shellwords): Use String#lstrip!.
+
+	* lib/shellwords.rb (shellwords): Recognize an object that
+	  responds to to_str() by using String.new().
+
+Sun Jan 26 17:53:04 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* instruby.rb (parse_args), ext/extmk.rb (parse_args): Detect -n
+	  and emulate a dry run.  Use 'make' in case no --make argument is
+	  given.
+
+Sun Jan 26 07:18:42 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* instruby.rb: re-define individual methods verbosely rather than
+	  including FileUtils::Verbose, in order to suppress messages from
+	  FileUtils#cmp.
+
+	* instruby.rb (makedirs): make same directory only once even if
+	  dryrun.
+
+	* lib/fileutils.rb (FileUtils::Verbose, FileUtils::NoWrite):
+	  re-define methods with define_method instead of module_eval.
+
+Sun Jan 26 03:37:18 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* instruby.rb, ext/extmk.rb, Makefile.in, win32/Makefile.sub,
+	  bcc32/Makefile.sub: Replace the complicated MFLAGS/MAKEFLAGS
+	  parser with something plain and comprehensible.  This fixes a
+	  bug where make flags were wrongly reordered and the resulted
+	  command line often did not make sense especially when BSD make
+	  is used with extra arguments given.  Tested with FreeBSD and
+	  Linux by me and mswin32, bccwin32 and mingw by usa.
+
+Fri Jan 24 18:15:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y: tMINUS should have lower precedence than tPOW.
+
+Fri Jan 24 05:12:55 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): deal
+	  with escaped $ and ? at the end of strings.  [ruby-talk:62297]
+
+	* misc/ruby-mode.el (ruby-font-lock-keywords): added defined?.
+
+Thu Jan 23 17:25:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): do not warn discarding already undefined
+	  method.
+
+	* lib/rational.rb: undef quo before replacing.
+
+Thu Jan 23 15:49:57 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (arg): missing arguments.
+
+Thu Jan 23 14:56:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/rational.rb: modified to support "quo".
+
+	* numeric.c (num_quo): should return most exact quotient value,
+	  i.e. float by default, rational if available.
+
+	* numeric.c (num_div): "div" should return x.divmod(x)[0].
+
+Thu Jan 23 13:24:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_arg): was accessing garbage argv value.
+
+Thu Jan 23 06:37:01 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* instruby.rb: should not contain destdir in shebang line.
+
+Wed Jan 22 23:19:57 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.c (pipe_exec): remove unnecessary SetStdHandle().
+
+Wed Jan 22 20:20:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): syntaxify tPOW negative number hack.
+
+	* parse.y (negate_lit): new function to negate literal numeric
+	  values in compile time.
+
+Wed Jan 22 15:36:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_match_exec): charset info may be stored in MBC
+	  region when $KCODE != NONE.
+
+Wed Jan 22 14:22:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (set_syserr): should preserve duplicated error names.
+
+Tue Jan 21 20:29:31 2003  Michal Rokos  <michal@rokos.homeip.net>
+
+	* mkmf.rb: make possible to add files to clean and distclean targets
+
+Tue Jan 21 18:05:25 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* bcc32/Makefile.sub (LIBRUBY_A): link dmyext.
+
+Tue Jan 21 16:59:18 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* instruby.rb: use real interpreter pathname at shebang line.
+	  [ruby-dev:19370]
+
+Tue Jan 21 16:22:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): put back old ** behavior for negative number
+	  right operand.
+
+Tue Jan 21 14:46:12 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb: Use Test::Unit.
+
+	* lib/prettyprint.rb: Ditto
+
+	* lib/time.rb: Ditto
+
+	* lib/tsort.rb: Ditto
+
+Tue Jan 21 04:15:50 2003  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb: Use redefined `to_s' as well as `inspect'.
+	  Useless `pretty_print' methods removed.
+	  (PP::ObjectMixin#pretty_print_inspect): new method.
+
+Mon Jan 20 21:48:43 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in (MANTYPE): Detect if the system's nroff(1) groks
+	  mdoc.  Provide a new option --with-mantype={doc|man} in case the
+	  check does not work as expected.
+
+	* Makefile.in (MANTYPE): Define MANTYPE and pass it to
+	  instruby.rb.
+
+	* instruby.rb: Convert mdoc manpages to man for systems which
+	  nroff(1) does not grok mdoc.
+
+Mon Jan 20 21:25:18 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/tempfile.rb (self.open): If a block is given, call it with
+	  tempfile as an argument and automatically close the tempfile
+	  when the block terminates.
+
+Mon Jan 20 21:02:50 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* mdoc2man.rb: Properly put nested braces, parentheses and angles.
+
+	* mdoc2man.rb: Add support for .An and .Aq/.Ao/.Ac.
+
+	* mdoc2man.rb: Add support for .Dl.
+
+	* mdoc2man.rb: Make .Pf macro actually work.
+
+	* mdoc2man.rb: Properly handle .Os.
+
+	* mdoc2man.rb: Correctly omit spaces around punctuation
+	  characters.
+
+Mon Jan 20 19:43:41 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* mdoc2man.rb: Make this work as a library.
+
+Mon Jan 20 18:22:40 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_f_require): purge too many goto's.
+
+Mon Jan 20 17:50:05 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* mdoc2man.rb (parse_macro): Understand .Ux.
+
+Mon Jan 20 17:32:56 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* mdoc2man.rb: New file.  A mdoc to man converter ported from
+	  Perl.
+
+Mon Jan 20 15:40:15 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ruby.1: Properly close .Bl with .El.
+
+Mon Jan 20 04:14:17 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/mkmf.rb (egrep_cpp): use inspect to show options.
+
+	* lib/mkmf.rb (dir_config): prior configured directories to
+	  defaults.
+
+	* lib/mkmf.rb (dir_config): extract first word to determine
+	  make command type.
+
+Mon Jan 20 02:15:53 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/aix_mksym.rb: no longer used.
+
+Mon Jan 20 00:17:16 2003  Matt Armstrong  <matt@lickey.com>
+
+	* file.c (eaccess): under windows, make eaccess() just call
+	  access(). [ruby-core:716], [ruby-bugs:PR#556]
+
+Sun Jan 19 23:08:18 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/shellwords.rb (shellwords): A backslash ('\') in single
+	  quotes should not be regarded as meta character.  This bug or
+	  maybe feature was inherited from Perl's shellwords.pl.
+
+Sun Jan 19 14:01:12 2003  UENO Katsuhiro  <unnie@blue.sky.or.jp>
+
+	* regex.c (is_in_list): should work well with UTF-8.
+
+	* regex.c (re_match_exec): ditto.
+
+Sat Jan 18 14:53:49 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* bignum.c (rb_cstr_to_inum): should not erase all 0s, but
+	  squeeze into one.  [ruby-dev:19377]
+
+Fri Jan 17 03:33:42 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* sprintf.c (rb_f_sprintf): Fix a bug caused by an uninitialized
+	  variable v, that a bignum unexpectedly gets converted into a
+	  string with its higher figures all filled with ./f/7/1,
+	  depending on the base.  This bug seems to have been introduced
+	  in rev.1.27.
+
+	* sprintf.c (rb_f_sprintf): Use switch instead of a sequence of
+	  else-if's.
+
+Wed Jan 15 15:18:38 2003  moumar  <moumar@netcourrier.com>
+
+	* configure.in (ARCHFILE): set even unless --enable-shared on
+	  AIX.  [ruby-talk:61466]
+
+	* marshal.c (math.h): should be included after ruby.h on AIX.
+	  [ruby-talk:61366]
+
+Tue Jan 14 21:47:56 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_f_require): do not search adding .rb/.so suffixes if
+	  the suffix specified.  [ruby-dev:18702]
+	  http://moonrock.jp/~don/d/200211.html#d08_t1
+
+Tue Jan 14 18:36:41 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_all): now works without block.
+
+	* enum.c (enum_any): ditto.
+
+Tue Jan 14 01:21:32 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* io.c (next_argv): not always set binmode.
+
+Mon Jan 13 20:45:19 2003  Guy Decoux  <ts@moulon.inra.fr>
+
+	* parse.y (list_append): avoid O(n) search using node->nd_next->nd_end.
+
+	* parse.y (list_concat): ditto.
+
+	* eval.c (rb_eval): NODE_ARRY nd_end adoption.
+
+Mon Jan 13 02:22:11 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/dl/lib/dl/win32.rb: eliminate unnecessary "A" adding.
+
+Sun Jan 12 16:07:17 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (next_argv): inherit binmode from $defout.
+
+Sat Jan 11 22:50:47 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/dl/lib/dl/win32.rb: compatibility improvement.
+
+Sat Jan 11 01:44:16 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in (RUBY_CHECK_IO_NEED): added more tests.
+
+	* io.c (rb_io_check_readable): seek after synchronized write.
+
+Fri Jan 10 01:23:45 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): syntax
+	  classes are not allowed inside character classes.
+	  [ruby-talk:60996]
+
+Thu Jan  9 23:28:01 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in: AC_MSG_FAILURE is a new macro in 2.54b or later.
+
+Thu Jan  9 17:05:24 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in (RUBY_CHECK_IO_NEED): check whether fseek() and
+	  fflush() are needed.
+
+	* io.c (flush_before_seek): flush write stream only.
+
+	* io.c (rb_io_check_readable): seek instead of flush if the last
+	  operation was write.
+
+	* io.c (rb_io_check_writable): seek instead of flush if the last
+	  operation was read.
+
+	* bcc32/Makefile.sub, win32/Makefile.sub: needs to seek between
+	  R/W.
+
+Thu Jan  9 16:31:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): should not discard nested NODE_BLOCK.
+
+Thu Jan  9 15:12:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (stmt): NODE_NOT elimination for if/unless/while/until node.
+
+	* parse.y (primary): ditto.
+
+Thu Jan  9 13:26:18 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* st.h, st.c: Back out the introduction of st_*_func_t.  Some
+	  compilers complain about function type mismatch.
+
+Thu Jan  9 02:10:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): reduce recursive rb_eval() call by using sort
+	  of continuation passing style.
+
+Wed Jan  8 17:10:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/Win32API/lib/win32/registry.rb: added. [new]
+
+Wed Jan  8 15:54:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c: remove ruby_last_node and assignments seems to be
+	  unnecessary
+
+	* intern.h: debug does not run if ID_ALLOCATOR is zero.
+
+Wed Jan  8 15:04:11 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_each): treat fixnums specially to boost.
+
+	* numeric.c (num_step): remove rb_scan_args() for small speedup.
+
+Tue Jan  7 17:56:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (svalue_to_avalue): should return converted array.
+
+Tue Jan  7 07:48:01 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_f_local_variables): skip $_, $~ and flip states in
+	  dynamic variables.  [ruby-core:00681]
+
+Tue Jan  7 02:46:29 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (env_clear): new Hash compatible method.
+
+	* hash.c (env_shift, env_invert, env_replace, env_update): ditto.
+
+Mon Jan  6 23:36:29 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* st.h, st.c: Introduce new conventional typedef's, st_data_t,
+	  st_compare_func_t, st_hash_func_t and st_each_func_t.
+
+	* st.h, st.c: Do explicit function declarations and do not rely on
+	  implicit declarations.
+
+	* class.c, eval.c, gc.c, hash.c, marshal.c, parse.y, variable.c:
+	  Add proper casts to avoid warnings.
+
+Mon Jan  6 20:44:43 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* intern.h (rb_check_array_type): Declare rb_check_array_type().
+
+	* ext/digest/md5/md5ossl.c: Include stdio.h for sprintf() and
+	  string.h for memcmp().
+
+	* ext/dl/ptr.c: Include ctype.h for isdigit().
+
+Mon Jan  6 18:43:17 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* file.c: improve DOSISH drive letter support.
+
+Mon Jan  6 18:31:45 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/fileutils.rb (ln): add ' -f' in the verbose message.
+
+	* lib/fileutils.rb (cp_r): add 'p' in the verbose message.
+
+Mon Jan  6 16:44:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_join): dispatch based on "to_str".
+
+	* array.c (rb_ary_times, rb_ary_equal): ditto.
+
+Mon Jan  6 13:26:35 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* process.c (proc_exec_v): follow to proc_spawn_v(). call do_aspawn()
+	  on Win32.
+
+	* process.c (rb_proc_exec): call do_spawn() on Win32.
+
+	* win32/win32.c, win32/win32.h (do_spawn, do_aspawn): add mode flag.
+
+	* process.c (proc_spawn_v, rb_f_system): follow above change.
+
+Mon Jan  6 05:11:15 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/extmk.rb: make $0 normal variable.
+
+Mon Jan  6 02:32:46 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* struct.c (make_struct): needs meta class.
+
+Sun Jan  5 22:54:05 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/fileutils.rb (ln): `argv' is not a argument.
+
+Sun Jan  5 17:44:37 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/extmk.rb (extmake): set $0 temporarily while loading
+	  extconf.rb.
+
+Sun Jan  5 14:46:46 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* instruby.rb: need paren in regexp(make -n install).
+
+	* ext/extmk.rb (sysquote): do not need to quote on mswin/bccwin/mingw.
+
+	* ext/extmk.rb ($mflags): uniq items and remove '-' and '--'.
+	  move options to the lead.
+
+	* lib/fileutils.rb (install): model on the real install
+	  command(message).
+
+Sun Jan  5 09:36:46 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ruby.c (ruby_init_loadpath): under Windows, get the module
+	  path from an internal address instead of hard coded library
+	  name.
+
+	* cygwin/GNUmakefile.in, bcc32/Makefile.sub,
+	  win32/Makefile.sub (CPPFLAGS): removed LIBRUBY_SO macro.
+
+	* bcc32/Makefile.sub, win32/Makefile.sub (config.h): no longer
+	  depends on makefiles.
+
+Sun Jan  5 04:17:05 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* gc.c (SET_STACK_END): Issue a FLUSH_REGISTER_WINDOWS here too.
+	  This fixes make test on FreeBSD/sparc64.
+
+Sun Jan  5 03:43:47 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* defines.h (FLUSH_REGISTER_WINDOWS): Make the flushw call an
+	  inline function so it can be used as an expression.
+
+	* eval.c (EXEC_TAG, THREAD_SAVE_CONTEXT): Consistently call
+	  FLUSH_REGISTER_WINDOWS before calling setjmp(). (I suspect that
+	  every setjmp() implementation should take care of register
+	  windows, though)
+
+Sun Jan  5 03:12:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* file.c (utimbuf): use utimbuf instead of _utimbuf if defined _WIN32.
+
+	* win32/Makefile.sub (LIBS): use oldnames.lib.
+
+	* win32/win32.c (rb_w32_getcwd): follow above change.
+
+	* win32/win32.h: ditto.
+
+	* wince/direct.c, wince/direct.h (getcwd): ditto.
+
+	* wince/io.h: ditto.
+
+	* wince/string.c, wince/wince.h (stricmp, strnicmp): ditto.
+
+Sat Jan  4 15:18:50 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* process.c (rb_proc_exec): use same logic as DJGPP on win32 ports.
+
+	* process.c (rb_f_system): ditto.
+
+	* win32/win32.c, win32/win32.h (do_aspawn): [new]. for arrayed
+	  arguments.
+
+	* win32/win32.c (CreateChild): add new argument for real filename of
+	  executing process.
+
+	* win32/win32.c (NtHasRedirection, pipe_exec): follow above change.
+
+Sat Jan  4 14:29:52 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* configure.in: set rb_cv_need_io_flush_between_seek=yes.
+
+	* win32/Makefile.sub (config.h): define NEED_IO_FLUSH_BETWEE_SEEK.
+	  (pointed out by moriq [ruby-dev:19299])
+
+Sat Jan  4 03:12:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (umethod_bind): exact class match is not required.  relax
+	  the restriction to subclasses.
+
+Sat Jan  4 01:33:40 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* file.c (rb_file_s_lchmod): get rid of gcc-3 -O3 warning.
+
+Fri Jan  3 22:26:07 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* process.c (rb_proc_times): need to initialize first.
+
+Fri Jan  3 01:10:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): call "inherited" before executing class body.
+
+	* class.c (rb_define_class): call "inherited" after defining the
+	  constant.
+
+	* class.c (rb_define_class_under): ditto.
+
+Thu Jan  2 19:37:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (massign): expand first element if RHS is an array and
+	  its size is 1, and LHS has concrete assignment target (i.e. LHS
+	  has target(s) other than *var).
+
+	* eval.c (massign): avoid unnecessary avalue/svalue conversion.
+
+	* eval.c (rb_yield_0): ditto
+
+	* array.c (rb_ary_update): do not allocate unused array if rpl is
+	  nil (i.e. merely removing elements).
+
+Thu Jan  2 13:55:08 2003  Mathieu Bouchard  <matju@sympatico.ca>
+
+	* io.c (io_read): should resize supplied string if it's shorter
+	  than expected.
+
+Thu Jan  2 11:01:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (bmcall): arguments should be an array.
+
+Wed Jan  1 18:18:45 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: better DJGPP support. add GNUmakefile.
+
+	* djgpp/GNUmakefile: new.
+
+Wed Jan  1 04:16:18 2003  Akinori MUSHA  <knu@iDaemons.org>
+
+	* node.h (struct RNode): Change argc from int to long.  Otherwise
+	  NEW_CFUNC() sets argc to a wrong value on platforms where
+	  sizeof(int) != sizeof(long) and the byte order is big-endian.
+	  This fixes breakage on FreeBSD/sparc64.
+
+Tue Dec 31 23:22:50 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (massign): removed awkward conversion between yvalue,
+	  mvalue, etc.
+
+	* eval.c (rb_yield_0): new parameter added to tell whether val is
+	  an array value or not.
+
+	* parse.y (yield_args): restructuring: new nodes: NODE_RESTARY2,
+	  NODE_SVALUE; removed node: NODE_RESTARGS.
+
+Tue Dec 31 21:13:51 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* Makefile.in, {win32,bcc32}/Makefile.sub: add new target:
+	  what-where, no-install.
+
+	* mkconfig.rb: add const: CROSS_COMPILING.
+
+	* ext/extmk.rb: no-install support.  add MAKEDIRS macro.
+
+	* lib/mkmf.rb: add !ifdef .. !endif for Borland make.
+
+	* process.c: improve DJGPP support.  system "ls", "-l".
+
+Tue Dec 31 20:16:37 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/socket/addrinfo.h (NI_MAXHOST): Define NI_MAXHOST and
+	  NI_MAXSERV only if they are not defined yet.  This fixes build
+	  on such platforms as OpenBSD.
+
+Tue Dec 31 20:07:49 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/tcltklib/extconf.rb (find_tcl, find_tk): Look for both
+	  lib{tcl,tk}M.N and lib{tcl,tk}MN on all platforms.  *BSD have
+	  Tcl/Tk libraries named this way.
+
+Tue Dec 31 19:48:21 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in: Improve OpenBSD support. [obtained from: OpenBSD
+	  ports]
+
+	* dln.c (FUNCNAME_PATTERN): Ditto.
+
+Tue Dec 31 19:21:02 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* array.c (rb_ary_transpose): Properly declare ary as a VALUE.
+
+	* file.c (rb_file_s_chmod): Do not directly cast an int to void *
+	  to avoid a warning.
+
+	* defines.h (FLUSH_REGISTER_WINDOWS): Add support for
+	  FreeBSD/sparc64.  miniruby still coredumps in a different place,
+	  though.
+
+Tue Dec 31 07:47:15 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (parse_string): readjusted.
+
+	* parse.y (heredoc_identifier): readjusted.
+
+	* parse.y (here_document): make EOL codes of single-quoted
+	  here-documents consistent.
+
+	* parse.y (yylex): reduced unnecessary conditionals.
+
+Tue Dec 31 04:49:51 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ruby.1: mdoc'ify.
+
+Tue Dec 31 01:30:29 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* parse.y (yylex): do not accept " __END__\n".  ([ruby-dev:19245])
+
+Mon Dec 30 21:10:59 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* parse.y (yylex): use strncmp instead of strcmp.
+	  accept "__END__\r\n".  ([ruby-dev:19241])
+
+Mon Dec 30 20:32:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_gc_mark_frame): should mark frame->node.
+
+Mon Dec 30 19:10:30 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/extmk.rb: split --make argument contains options, assume
+	  the first word of --make-flags is always options even unless
+	  preceded by -, and ignore letter-case of options if nmake.
+
+	* instruby.rb: extract -n option also from --make and
+	  --make-flags.
+
+	* bcc32/Makefile.sub, win32/Makefile.sub: not prepend - to
+	  $(MFLAGS)
+
+Mon Dec 30 16:44:14 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* string.c (rb_str_substr): should share the shared string if
+	  present, instead of the original string.  (ruby-bugs:PR#528)
+
+Mon Dec 30 05:10:00 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/socket/socket.c (tcp_svr_init): local host to
+	  init_inetsock() is VALUE but not pointer.
+
+	* ext/socket/socket.c (sock_s_unpack_sockaddr_in): get rid of
+	  gcc-3 -O3 warning.
+
+Sun Dec 29 23:45:53 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* gc.c (gc_sweep): adjust GC trigger.
+
+	* dln.c (init_funcname_len): get rid of gcc-3 -O3 warning.
+
+	* eval.c (copy_node_scope): ditto.
+
+	* hash.c (rb_hash_foreach, delete_if_i, select_i, each_value_i,
+	  each_key_i, each_pair_i, envix): ditto.
+
+	* range.c (range_each_func): ditto.
+
+	* file.c (rb_file_s_chmod): ditto.
+
+Sun Dec 29 15:30:37 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (fu_parseargs): should not inherit ftools.rb's
+	  misfeature.
+
+Sun Dec 29 05:08:13 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* lib/fileutils.rb (cmp): return false if file size differs.
+
+Sat Dec 28 19:21:24 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* instruby.rb: remove junk args.
+
+	* lib/mkmf.rb (create_makefile): remove a trouble library
+	  before making a shared library.
+
+	* win32/Makefile.sub: invoke instruby.rb with the --make-flags option.
+
+Sat Dec 28 03:09:58 2002  Wakou Aoyama  <wakou@ruby-lang.org>
+
+	* lib/cgi.rb (CGI#[]): improvement. thanks to Kazuhiro NISHIYAMA
+	  <zn@mbf.nifty.com>
+
+Sat Dec 28 00:34:03 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* {win32,bcc32}/Makefile.sub: remove `=' from --make-flags options.
+	  nmake quotes args if included `=' in args.
+
+	* instruby.rb: use getopts.rb.
+
+	* ext/dbm/extconf.rb (-DDBM_HDR): substitute ' with " to avoid
+	  a error on Win32.
+
+	* ext/gdbm/gdbm.c: add prototypes to avoid VC++ warnings.
+
+Fri Dec 27 21:41:57 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* bcc32/setup.mak, win32/setup.mak(-prologue-): move srcdir from
+	  CPP input or UNC path will be removed as a comment.
+
+Fri Dec 27 17:55:00 2002  Takaaki Uematsu  <mail@uema2.cjb.net>
+
+	* wince/config, wince/configure.bat: replace 1.7 with 1.8
+	  in macros.
+
+Fri Dec 27 13:28:14 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* instruby.rb: fileutils.rb accepts only one argument.
+
+Fri Dec 27 13:23:29 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (fu_parseargs): reject illegal options
+	  correctly.
+
+	* lib/fileutils.rb (uptodate?): parameter declaration was wrong.
+
+	* lib/fileutils.rb: change coding styles.
+
+Fri Dec 27 09:25:22 2002  ABE Shigeru  <shiger-a@nifty.com>
+
+	* process.c (rb_proc_times): avoid WindowsXP crash using volatile
+	  variables.
+
+Fri Dec 27 02:56:58 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* instruby.rb: check only `-' option, and use fileutils instead of
+	  ftools.
+
+Fri Dec 27 02:45:17 2002  Wakou Aoyama  <wakou@ruby-lang.org>
+
+	* lib/net/telnet.rb: Telnet#print not add "\n".
+
+	* lib/cgi.rb: cgi['key'] is equal cgi['key'][0]
+
+Thu Dec 26 22:33:18 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb (create_makefile): check only `-' option.
+
+	* configure.in: cleanups for MinGW. remove -D__NO_ISOCEXT in $CFLAGS.
+
+	* win32/win32.h: prototypes for isinf, isnan are not needed on MinGW.
+
+Thu Dec 26 19:22:00 2002  YOSHIDA Kazuhiro <moriq@moriq.com>
+
+	* win32/setup.mak (-prologue-): moved srcdir macro definition.
+	  [ruby-win32:420].
+
+Wed Dec 25 18:26:44 2002  K.Kosako  <kosako@sofnec.co.jp>
+
+	* regex.c (re_match): fixed wrong \G behavior.  (ruby-bugs-ja:PR#377)
+
+Wed Dec 25 16:41:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_match_exec): fix odd \G behavior based on the patch
+	  from Nobu.
+
+Wed Dec 25 11:05:11 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* bcc32/setup.mak (-generic-): removed garbages.
+
+Wed Dec 25 10:36:20 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* bcc32/Makefile.sub, win32/Makefile.sub (RUBY_SO_NAME, config.h):
+	  use $(MAJOR) and $(MINOR). based on Nobu's patch. [ruby-win32:413]
+
+	* bcc32/setup.mak, win32/setup.mak (-prologue-): define MAJOR, MINOR
+	  and TEENY from version.h. based on Nobu's patch. [ruby-win32:413]
+
+	* win32/Makefile.sub (config.h): add HAVE_FLOAT_H.
+
+	* win32/Makefile.sub (parse.obj): depend on win32/win32.h.
+
+Tue Dec 24 23:49:16 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/irb/completion.rb: Use Object#class rather than Object#type.
+
+Tue Dec 24 23:37:40 2002  TADA Tadashi <sho@spc.gr.jp>
+
+	* lib/cgi.rb (Cookie::parse), lib/cgi-lib.rb (initialize): Do not
+	  pass to split() a bare string longer than 2 characters as
+	  separator.
+
+Tue Dec 24 19:19:24 2002  Tietew <tietew@tietew.net>
+
+	* numeric.c (DBL_MAX_10_EXP): fix typo. [ruby-dev:19175]
+
+Tue Dec 24 17:02:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_undefined): use NoMethodError instead of fatal.
+
+Tue Dec 24 02:12:45 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/README: Synchronize with reality.
+
+Tue Dec 24 02:05:51 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* MANIFEST, lib/README, lib/ipaddr.rb: Add ipaddr.rb from rough.
+
+Sun Dec 22 04:07:47 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/dbm/dbm.c (fdbm_alloc): allocator takes only one argument.
+
+Sun Dec 22 02:49:25 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* array.c (ary_alloc), dir.c (dir_s_alloc), eval.c (thgroup_s_alloc),
+	  file.c (rb_stat_s_alloc), hash.c (hash_alloc), io.c (io_alloc),
+	  object.c (rb_module_s_alloc, rb_class_allocate_instance),
+	  re.c (match_alloc, rb_reg_s_alloc), string.c (str_alloc),
+	  time.c (time_s_alloc), ext/digest/digest.c (rb_digest_base_alloc),
+	  ext/tcltklib/tcltklib.c (ip_alloc),
+	  ext/win32ole/win32ole.c (fole_s_allocate, fev_s_allocate)
+	  : add prototype to get rid of VC++ warnings.
+
+	* ext/sdbm/init.c (fsdbm_alloc): allocator takes only one argument.
+
+Sun Dec 22 00:36:43 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): accept pure ruby libraries.
+
+Sat Dec 21 23:59:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (ins_methods_i): should not show ID_ALLOCATOR.
+
+	* class.c (ins_methods_prot_i): ditto.
+
+	* class.c (ins_methods_priv_i): ditto.
+
+	* class.c (ins_methods_pub_i): ditto.
+
+	* eval.c (call_trace_func): ditto.
+
+	* eval.c (rb_undefined): ditto.
+
+Sat Dec 21 07:27:24 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-parse-partial): keywords must not be
+	  preceded by @ or $.
+
+Fri Dec 20 20:29:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
+	  ext/dl/handle.c, ext/dl/ptr.c, ext/dl/sym.c, ext/gdbm/gdbm.c,
+	  ext/iconv/iconv.c, ext/sdbm/init.c, ext/stringio/stringio.c,
+	  ext/strscan/strscan.c, ext/tcltklib/tcltklib.c,
+	  ext/win32ole/win32ole.c: use rb_define_alloc_func().
+
+Fri Dec 20 18:29:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* io.c (rb_io_fwrite): separated from io_write().
+
+	* marshal.c (w_byten): use rb_io_fwrite() to support non-blocking
+	  IO, and added error check.
+
+	* rubyio.h: prototypes; rb_io_fwrite
+
+Fri Dec 20 17:40:59 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (Init_Object): should not remove Class#allocate.
+
+	* lib/profiler.rb: separate profiling functions, without
+	  trace_func and at_exit setting.
+
+Fri Dec 20 16:20:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (do_block): split "do" block and tLBRACE_ARG block.
+
+	* parse.y (cmd_brace_block): new tLBRACE_ARG block rule
+
+	* parse.y (command): can take optional cmd_brace_block; use %prec
+	  to resolve shift/reduce conflict. (ruby-bugs-ja PR#372)
+
+	* eval.c (ruby_finalize): trace_func should be cleared here (after
+	  executing exit procs and finalizers).
+
+	* eval.c (rb_define_alloc_func): new allocation framework, based
+	  on Nobu's work [ruby-dev:19116].  "allocate" method is no longer
+	  used for object allocation.
+
+Fri Dec 20 05:06:49 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/README, lib/cgi/ftplib.rb, lib/telnet.rb: Delete ftplib.rb
+	  and telnet.rb.  It has been quite some time sinc they were
+	  obsoleted and made to emit warnings.
+
+Fri Dec 20 04:58:22 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/tempfile.rb: Embed Rdoc style comments.
+
+	* lib/tempfile.rb: Add length as an alias for size.
+
+Fri Dec 20 03:57:32 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/tempfile.rb: Add Tempfile#close!() as a shorthand for
+	  Tempfile#close(true).
+
+	* lib/tempfile.rb: Add Tempfile#{unlink,delete}().
+
+Fri Dec 20 03:53:01 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/README, lib/cgi/final.rb, lib/cgi/session.rb: Delete
+	  final.rb, which was obsoleted long ago.
+
+Fri Dec 20 00:16:06 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* re.c (rb_reg_match_pre, rb_reg_match_post, match_to_a,
+	  match_select): return instances of same class as the original
+	  string.  [ruby-dev:19119]
+
+Thu Dec 19 22:55:49 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* numeric.c (DBL_EPSILON): fix typo.
+
+Thu Dec 19 22:35:20 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (assign): avoid [BUG] at multiple attribute assignment.
+
+Thu Dec 19 01:00:09 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_step): use DBL_EPSILON.
+
+	* array.c (rb_check_array_type): new function: return an array
+	  (convert if possible), or nil.
+
+	* string.c (rb_check_string_type): new function: return a string
+	  (convert if possible), or nil.
+
+	* numeric.c (rb_dbl_cmp): returns nil if values are not
+	  comparable.
+
+	* numeric.c (fix_cmp,flo_cmp): use rb_num_coerce_cmp()
+
+	* bignum.c (rb_big_cmp): ditto.
+
+	* numeric.c (rb_num_coerce_cmp): new coercing function for "<=>",
+	  which does not raise TypeError.
+
+	* numeric.c (do_coerce): can be suppress exception now.
+
+	* object.c (rb_mod_cmp): should return nil for non class/module
+	  objects.
+
+Thu Dec 19 04:21:10 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/open-uri.rb: add a missing ||. (found by: ruby -wc)
+
+Wed Dec 18 17:53:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_eqq): return false if the argument is not a
+	  string.  now returns boolean value.
+
+	* class.c (rb_include_module): argument should be T_MODULE, not
+	  T_class, nor T_ICLASS.
+
+Wed Dec 18 03:52:55 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* string.c (rb_str_new4): handle tail shared string.
+	  (ruby-bugs-ja:PR#370)
+
+	* string.c (rb_str_dup_frozen): ditto.
+
+Tue Dec 17 21:08:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* node.h (NODE_ATTRASGN): new node, assignment to attribute.
+	  [ruby-core:00637].
+
+	* eval.c (is_defined, rb_eval): ditto.
+
+	* parse.y (attrset, node_assign): ditto.
+
+	* string.c (rb_str_substr): tail sharing.  [ruby-core:00650]
+
+	* re.c (rb_reg_nth_match): ditto.
+
+Tue Dec 17 16:52:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (is_defined): "defined?" should return "assignment" for
+	  attribute assignment (e.g. a.foo=b) and indexed assignment
+	  (e.g. a[2] = 44).
+
+	* parse.y (aryset): use NODE_ATTRASGN.
+
+Tue Dec 17 04:03:45 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/open-uri.rb: new file.
+
+Tue Dec 17 00:28:19 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* file.c (utimbuf): need to define for VC++.
+
+Mon Dec 16 15:53:20 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (nextc): get rid of overrun.  (pointed out by akr
+	  [ruby-list:36773])
+
+Sun Dec 15 21:16:44 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb (init_mkmf): add $(topdir) to $LIBPATH if $extmk.
+	  remove adding $(archdir) to $LIBPATH.
+
+Sat Dec 15 12:15:00 2002  Takaaki Uematsu <mail@uema2.cjb.net>
+
+	* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
+	  eval.c, file.c, hash.c, io.c, main.c, missing.c,
+	  process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
+	  bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
+	  ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
+	  ext/socket/getnameinfo.c, ext/socket/socket.c,
+	  ext/tcltklib/stubs.c
+	  : replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
+	* wince/exe.mak : delete \r at the end of lines.
+	* wince/mswince-ruby17.def : delete rb_obj_become
+
+Sun Dec 15 11:43:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (dispose_string): dispose String object.
+
+	* parse.y (heredoc_restore, here_document): fix memory leak.
+
+Sat Dec 14 14:25:00 2002  Takaaki Uematsu <mail@uema2.cjb.net>
+
+	* wince/sys : add stat.c, stat.h, timeb.c, timeb.h,
+		      types.h, utime.c, utime.h
+	* wince/dll.mak : object file name changed.
+	* wince/io.c : add empty dup2().
+	* wince/io.h : add dup2 definition.
+
+Sat Dec 14 01:51:29 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/dbm/extconf.rb (rb_check): support for GNU dbm 1.8.3.
+	  (-with-dbm-type=gdbm_compat). link against -lgdbm_compat
+	  and -lgdbm.
+
+Fri Dec 13 23:42:16 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/dbm/extconf.rb (db_check): check existence of the function
+	  in the specified library before checking it in libc.
+
+Fri Dec 13 17:15:49 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (generic_ivar_get): should always warn uninitialized
+	  instance variables.
+
+Fri Dec 13 12:33:22 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (expr): rescue clause was ignored.
+
+Thu Dec 12 18:19:14 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (RUBY_PROG_GNU_LD): add $CFLAGS, $CPPFLAGS, $LDFLAGS
+	  to the option of $CC.
+
+	* configure.in: set LIBRUBYARG to '-l$(RUBY_SO_NAME)' if the
+	  target os is cygwin and --disable-shared option is supplied.
+
+	* lib/mkmf.rb (init_mkmf): expand config["LIBRUBY"] and
+	  config["LIBRUBY_A"].  don't link $LIBRUBYARG_STATIC if
+	  --disable-shared option is supplied.
+
+	* configure.in (RUBY_CPPOUTFILE): should be a better message.
+
+	* ext/Win32API/extconf.rb: join with a space.
+
+Thu Dec 12 17:27:19 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_hash): define Regexp#hash to make regexps to be
+	  hash keys.
+
+	* re.c (Init_Regexp): define Regexp#eql? (alias to Regexp#==).
+
+Thu Dec 12 16:26:31 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* marshal.c (r_object0): singleton class instance can't be loaded.
+	  (ruby-bugs-ja:PR#366)
+
+Wed Dec 11 23:35:43 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb (create_makefile): -no-undefined -> --no-undefined.
+
+Wed Dec 11 17:54:59 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_read): takes optional second argument to specify a
+	  string to be written.  the string should not be frozen.
+
+	* io.c (rb_io_sysread): ditto.
+
+Wed Dec 11 11:30:28 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/digest/digest.c (rb_digest_base_copy): renamed "become".
+
+	* ext/stringio/stringio.c (strio_copy): ditto.
+
+Wed Dec 11 00:45:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/getoptlong.rb (GetoptLong::Error): provide a common ancestor
+	  for GetoptLong error classes (RCR#129).
+
+Tue Dec 10 17:42:39 2002  K.Kosako  <kosako@sofnec.co.jp>
+
+	* re.c (rb_reg_copy_object): fixed memory leak.
+
+Tue Dec 10 17:30:35 2002  Tanaka Akira  <akr@m17n.org>
+
+	* pack.c (utf8_limits): fix the limit of 4 bytes UTF-8 sequence.
+
+Tue Dec 10 12:01:15 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (mnew): original class of method defined in module should
+	  be the module not intermediate class.  [ruby-dev:19040]
+
+Tue Dec 10 01:16:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): preceding ".." for negative numbers
+	  still left;  removed.
+
+	* sprintf.c (rb_f_sprintf): should not prepend '0' if width > prec
+	  for example "%5.3d".
+
+Sat Dec  7 18:14:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (Init_process): add Process.exit and Process.abort
+
+	* pack.c (utf8_to_uv): raise ArgumentError for malformed/redundant
+	  UTF-8 sequences.
+
+Fri Dec  6 03:46:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (last_status_set): add pid attribute to Process::Status.
+
+Wed Dec  4 17:31:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (uv_to_utf8): limit maximum length of the encoded string
+	  to 6 bytes, even when the platform supports 8 bytes long integers.
+
+	* pack.c (utf8_to_uv): do not decode sequences longer than 6 bytes.
+
+	* object.c (copy_object): use "copy_object" method, not "become".
+
+Wed Dec  4 16:37:11 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (copy_object): copy finalizers as well if any.
+
+	* gc.c (rb_gc_copy_finalizer): new function to copy finalizers.
+
+Tue Dec  3 01:13:41 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (PP.singleline_pp): new method.
+
+Sun Dec  1 23:04:03 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/optparse.rb (OptionParser::new): same as OptionParser#on but
+	  returns new OptionParser::switch.
+
+Sun Dec  1 22:43:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* win32/win32.c (rb_w32_stat): empty path is invalid, and return
+	  ENOENT rather than EBADF in such case.  [ruby-talk:57177]
+
+Fri Nov 29 18:01:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (utf8_to_uv): added checks for malformed or redundant
+	  UTF-8 sequences.
+
+Thu Nov 28 12:08:30 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb: Avoid the use of "clean::" in favor of "clean:" in
+	  order not to let make(1) choke if there is another dependency on
+	  the target added in a depend file.
+
+Thu Nov 28 02:40:42 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb: Make sure to dig the destination directory before
+	  installing a file there.  Formerly "make install" could fail
+	  depending on make(1)'s mood of the moment, especially when -jN
+	  is given.
+
+Wed Nov 27 17:39:38 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/syslog.c: Cut redundancy.
+
+	* ext/syslog/syslog.c: Do not leak ident.
+
+Wed Nov 27 17:25:29 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/syslog.c, ext/syslog/test.rb: Syslog.close should
+	  raise RuntimeError when not opened.
+
+	* ext/syslog/syslog.c, ext/syslog/test.rb:
+	  Syslog.{ident,options,facility,mask} should all return nil when
+	  not opened.
+
+	* ext/syslog/syslog.c, ext/syslog/test.rb: Change back the output
+	  format of inspect().
+
+Wed Nov 27 16:25:43 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/test.rb: Switch from RUnit to Test::Unit.
+
+Wed Nov 27 16:14:12 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/syslog.c: Fix a problem where Syslog.ident was not
+	  marked and could thus be GC'd.
+
+Wed Nov 27 16:11:53 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/test.rb: Switch from RUnit to Test::Unit.
+
+	* ext/syslog/test.rb: The output format of inspect() is slightly
+	  altered.
+
+Wed Nov 27 06:43:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* error.c (exit_initialize): add SystemExit#initialize to set
+	  instance variable status.  (ruby-bugs-ja:PR#362)
+	  Now accepts status as optional first argument.
+
+	* eval.c (error_handle): now SystemExit have status always.
+
+	* eval.c (system_exit): just instantiate SystemExit without raise.
+
+	* eval.c (rb_thread_start_0): initialize SystemExit properly.
+
+Tue Nov 26 10:17:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dln.c (init_funcname_len): remove MAXPATHLEN dependency.
+
+Mon Nov 25 19:55:38 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): return true if not dynamic and not static.
+
+Mon Nov 25 01:08:40 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dln.c: revert and add the MAXPATHLEN definition on mswin32/mingw32.
+
+Sun Nov 24 20:36:53 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dln.c: move the MAXPATHLEN definition in front.
+
+Fri Nov 22 22:55:01 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): preceding ".." for negative
+	  hexadecimal numbers should not appear if prec (e.g. %.4) is
+	  specified.
+
+	* pack.c (NUM2I32): support platforms which does not have 32bit
+	  integers (e.g. Cray).
+
+Fri Nov 22 19:20:36 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* instruby.rb: Install batch files on Windows. [Submitted by usa]
+
+Fri Nov 22 18:31:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_add_method): node may be NULL.
+
+Thu Nov 21 20:53:06 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: changes coding style.
+
+	* lib/net/pop.rb: ditto.
+
+	* lib/net/protocol.rb: ditto.
+
+Thu Nov 21 20:17:08 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: changes coding style.
+
+Thu Nov 21 20:04:06 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: should not overwrite Host: header.
+	  (This patch is contributed by sean@ruby-lang.org)
+
+Thu Nov 21 20:01:33 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: support Proxy-Authorization.
+	  (This patch is contributed by Alexander Bokovoy)
+
+Thu Nov 21 11:03:39 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_find_file_ext): should not terminate searching with
+	  empty path, just ignore.
+
+	* dir.c: remove <sys/parm.h> inclusion.
+
+Wed Nov 20 02:07:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* compar.c (cmp_eq,cmp_gt,cmp_ge,cmp_lt,cmp_le): check using
+	  rb_cmpint().
+
+	* error.c (init_syserr): remove sys_nerr dependency.
+
+Wed Nov 20 01:52:21 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_cmp): added to satisfy Comparable assumption.
+
+	* eval.c (rb_add_method): "initialize" should be public if it is a
+	  singleton method.
+
+Tue Nov 19 22:37:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_match): avoid dereferencing if size == 0.
+	  (ruby-bugs-ja:PR#360)
+
+Tue Nov 19 20:40:39 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_cmp): should return nil if an operand is not a
+	  number nor time. (ruby-bugs-ja:PR#359)
+
+	* file.c (rb_stat_cmp): should return nil if an operand is not
+	  File::Stat.
+
+Tue Nov 19 14:35:09 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_zip): iterates over items in the receiver.
+	  zipped with nil if argument arrays are shorter.  if arrays are
+	  longer, left items are ignored.  now works with blocks.
+
+	* enum.c (zip_i): changed for new behavior.
+
+	* array.c (rb_ary_transpose): added. [new]
+
+Tue Nov 19 05:12:21 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* instruby.rb: Do not install various working files under bin/.
+
+Tue Nov 19 05:07:39 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* instruby.rb: not rewrite installed scripts when dry-run mode.
+
+	* lib/ostruct.rb (OpenStruct::initialize): should symbolize keys
+	  instead of values.
+
+Tue Nov 19 02:24:10 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* instruby.rb: Rewrite installed scripts' shebang lines.
+
+	* instruby.rb: Use File.join() where appropriate.
+
+Tue Nov 19 01:53:35 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* bin/irb: Moved from sample/irb.rb.
+
+	* instruby.rb: Install script files under bin/ with ruby's program
+	  prefix and suffix.
+
+Mon Nov 18 02:13:36 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/tempfile.rb: Make this library thread safe.
+
+	* lib/tempfile.rb: Do not pick a name which was once used and is
+	  still scheduled for removal.
+
+	* lib/tempfile.rb: A lock file need not and must not be scheduled
+	  for removal.
+
+	* lib/tempfile.rb: Compare Max_try with the number of mkdir
+	  failures instead of the suffix counter.
+
+	* lib/tempfile.rb: Overall cleanup and add some important notices.
+
+Sun Nov 17 22:57:31 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (dsym): garbage returned.  (ruby-bugs-ja:PR#358)
+
+Fri Nov 15 07:40:08 2002  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
+
+	* observer.rb: raise NoMethodError instead of NameError.
+	  [ruby-dev:18788]
+
+	* ostruct.rb: ditto.  fix a bug in inspect which called String#+ with
+	  Symbol.  [ruby-dev:18788]
+
+	* profile.rb: illegal use of Array#sort!.  replaced it with non-bang
+	  method.  [ruby-dev:18792]
+
+Thu Nov 14 22:40:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in (LIBRUBY_A): append -static.  [ruby-dev:18689]
+
+	* configure.in (LIBRUBYARG_STATIC, LIBRUBYARG_SHARED): linker
+	  argument to link static/shared library respectively.
+
+	* Makefile.in (LIBRUBYARG_STATIC, LIBRUBYARG_SHARED): added.
+
+	* bcc32/Makefile.sub, win32/Makefile.sub: ditto.
+
+	* instruby.rb (LIBRUBY_A): install to libdir.
+
+	* lib/mkmf.rb (link_command): link static library of ruby, or
+	  try_run fails unless LIBRUBY_SO is installed.  [ruby-dev:18646]
+
+	* eval.c (call_trace_func): toplevel caller was missing.
+	  [ruby-dev:18754]
+
+	* eval.c (proc_to_s): adjust created line number.
+
+	* parse.y (primary, do_block, brace_block): adjust line number of
+	  block to beginning line, instead of the first statement inside
+	  the block.
+
+Thu Nov 14 08:23:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* math.c (math_acos): check errno after operation.  ditto for
+	  asin, acosh, atanh, log, log10 and sqrt.
+
+	* eval.c (rb_add_method): initialize should always be private.
+
+	* parse.y (expr): add rescue modifier rule.
+
+	* parse.y (command_call): return, break and next with argument is
+	  now part of this rule.
+
+Wed Nov 13 16:22:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in (DLDFLAGS): removed -Wl,-no-undefined to
+	  ext/extmk.rb, in order to allow references to symbols in other
+	  extension libraries for mkmf.rb.  [ruby-dev:18724]
+
+	* ext/extmk.rb (extmake): ditto.
+
+	* ext/extmk.rb (extmake): exit when make failed.
+
+Sun Nov 10 03:46:18 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb: retire contain?() and add superset?(),
+	  proper_superset?() subset?(), and proper_subset?().
+	  [obtained from: Jason Voegele's set.rb]
+
+	* lib/set.rb: define several aliases: union() for |(),
+	  difference() for -(), and intersection() for &().
+	  [obtained from: Jason Voegele's set.rb]
+
+	* lib/set.rb: deal with a s/id/object_id/ leftover.
+
+Sat Nov  9 16:06:57 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/tcltklib/stubs.c: should include "util.h" for ruby_strdup.
+
+Sat Nov  9 11:39:45 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c: remove ENABLE_TRACE/DISABLE_TRACE to trace child nodes of
+	  c-call. [ruby-dev:18699]
+
+Fri Nov  8 04:16:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): "a" in "a /5" should be considered as a local
+	  variable. [experimental]
+
+Thu Nov  7 09:51:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_yield_0): should enable trace for non-cfunc nodes.
+	  [ruby-dev:18645]
+
+	* eval.c (blk_orphan): a block created in a different thread is
+	  orphan.  [ruby-dev:17471]
+
+Wed Nov  6 16:57:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_define_method): do not set NOEX_CFUNC if klass is
+	  really a module, whose methods must be safe for reciever's type.
+
+	* eval.c (rb_eval): nosuper should not be inherited unless the
+	  overwritten method is an undef placeholder.
+
+Tue Nov  5 00:46:04 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/extmk.rb: Properly pass the given target to
+	  make(1). [pointed out by eban]
+
+Mon Nov  4 20:03:53 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* instruby.rb, lib/mkmf.rb: use CONFIG["ENABLE_SHARED"] instead of
+	  checking whether CONFIG["configure-args"] includes "--enable-shared".
+
+Mon Nov  4 16:49:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (primary): allow 'when'-less case statement; persuaded
+	  by Sean Chittenden.
+
+Mon Nov  4 06:28:09 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* Makefile.in, ext/extmk.rb, bcc32/Makefile.sub,
+	  win32/Makefile.sub: Introduce better command line syntax
+	  (--make/--make-flags/--extstatic) to extmk.rb and instruby.rb.
+	  Previously such command as 'make -j3 install' with pmake doesn't
+	  fail.  Formerly extmk.rb was receiving "make -j 3 -j 3" via the
+	  command line arguments and just ended up recognizing the first
+	  "3" as destdir. [with help of usa]
+
+Mon Nov  4 03:59:51 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/getopts.rb: Do not choke on characters that cannot be used
+	  in a variable name.  Replace them with `_'.  Define a hash named
+	  $OPT for convenience.
+
+Sat Nov  2 00:38:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (Init_Object): added Object#object_id, new name for
+	  Object#id. [new]
+
+	* object.c (rb_obj_id_obsolete): give warning for Object#id.
+
+	* numeric.c (fix_intern): added Fixnum#to_sym. [new]
+
+	* object.c (sym_to_sym): rename from Symbol#intern
+
+Fri Nov  1 14:21:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_zip): added Enumerable#zip. [new]
+
+	* array.c (rb_ary_zip): added Array#zip.
+
+Thu Oct 31 20:10:18 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (init_syserr): remove sys_nerr dependency.
+
+Thu Oct 31 09:31:51 2002  K.Kosako  <kosako@sofnec.co.jp>
+
+	* eval.c (rb_export_method): undef'ed method visibility should not
+	  be changed.
+
+Wed Oct 30 17:00:47 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_public_method_defined, etc.): new methods:
+	  public_method_defined?, private_method_defined?,
+	  protected_method_defined?
+
+	* object.c (rb_obj_public_methods): new method
+	  Object#public_methods.
+
+	* class.c (ins_methods_i): Object#methods should list both public
+	  and protected methods.
+
+	* class.c (rb_class_public_instance_methods): new method
+	  Module#public_instance_methods.
+
+Wed Oct 30 06:29:00 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* eval.c, file.c, gc.c, io.c, object.c, ruby.c, ruby.h, struct.c,
+	  ext/socket/socket.c: differentiate long and int; use proper
+	  printf type specifiers and do casts where appropriate.
+
+Wed Oct 30 04:07:33 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (error_print, rb_longjmp, rb_thread_schedule): flush
+	  error message.  [ruby-dev:18582]
+
+	* eval.c (ruby_cleanup): added.  just clean up without exit.
+	  [ruby-dev:18582]
+
+	* eval.c (ruby_exec): added.  execute main evaluation tree without
+	  exit.  [ruby-dev:18582]
+
+	* intern.h: prototypes; ruby_cleanup, ruby_exec
+
+Tue Oct 29 02:00:08 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/extmk.rb (extmake): use dummy_makefile to create dummy
+	  Makefile.
+
+	* lib/mkmf.rb (find_executable0): EXEEXT is optional.
+
+	* lib/mkmf.rb (dummy_makefile): make dummy Makefile content.
+
+	* lib/mkmf.rb (create_makefile): define EXTLIB replacing -l.
+
+	* lib/mkmf.rb ($bccwin): detect Borland make by help message.
+
+	* lib/mkmf.rb (CLEANINGS): common rules to clean.
+
+Mon Oct 28 01:27:17 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* djgpp/config.sed (@program_transform_name@): use `%', not `,'.
+
+Sun Oct 27 22:59:50 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* ext/extmk.rb(78) : The unnecessary error when installing by bccwin32
+	                     is controlled.
+
+	* lib/mkmf.rb(773) : Also in the case of bccwin32, the path was added.
+
+Sun Oct 27 17:07:25 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* djgpp/*: sync with the latest.
+
+	* ext/extmk.rb, lib/mkmf.rb: flush $stdout.
+
+	* io.c (READ_DATA_PENDING_COUNT, READ_DATA_PENDING_PTR):
+	  undef these macros on DJGPP.
+
+Sat Oct 26 10:11:47 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* node.h (nd_type): cast the value to int.
+
+Sat Oct 26 04:27:35 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/dbm/dbm.c (fdbm_indexes, fdbm_select): add a missing
+	  argument and prevent coredump when a nonexistent key is
+	  specified.
+
+	* ext/sdbm/init.c (fsdbm_indexes, fsdbm_select): ditto.
+
+Sat Oct 26 03:28:43 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* eval.c, gc.c: use a common set of alloca() #ifdef's.  This fixes
+	  the build with Intel C Compiler for Linux.
+
+	* eval.c (rb_f_require): declare old_func with a real type, not
+	  just type modifiers.
+
+Fri Oct 25 02:55:01 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* string.c (rb_str_split_m): RSTRING(str)->ptr might become NULL.
+	  [ruby-dev:18581]
+
+Thu Oct 24 21:57:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in (LIBPATHFLAG): avoid $ substitution.
+	  [ruby-dev:18577]
+
+	* ext/extmk.rb (extmake): expand $srcdir.
+
+	* ext/win32ole/extconf.rb: should not override $CFLAGS, but
+	  append.
+
+	* lib/mkmf.rb (config_string): use given config hash.
+
+	* bcc32/Makefile.sub (.rc.res): directory part may be empty in
+	  Borland make.
+
+Thu Oct 24 03:38:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/mkmf.rb (create_makefile): site-install target for backward
+	  compatibility.
+
+	* lib/mkmf.rb (init_mkmf): libdir prior to topdir.
+
+	* configure.in (LIBPATHFLAG): should escape $.  [ruby-dev:18572]
+
+	* mkconfig.rb: never substitute escaped $$.
+
+	* instruby.rb: not install LIBRUBY_SO unless enable-shared.
+	  [ruby-dev:18569]
+
+Wed Oct 23 19:16:06 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_eval): added NODE_DSYM, symbol literal with
+	  interpolation.
+
+	* node.h: ditto.
+
+	* intern.h: prototypes; rb_is_junk_id, rb_str_dump, rb_str_intern
+
+	* object.c (sym_inspect): escape and quote for non-alphanumeric
+	  symbols.
+
+	* parse.y (dsym, tokadd_string, yylex): extended symbol literals.
+
+	* parse.y (rb_is_junk_id): added.
+
+	* string.c (rb_str_dump, rb_str_intern) : make extern.
+
+	* lib/mkmf.rb (create_makefile): deffile should be removed by
+	  distclean, not clean.
+
+Tue Oct 22 23:56:41 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb (init_mkmf): add dir_config("opt").
+
+Tue Oct 22 19:44:03 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* bcc32/configure.bat : The command line when calling setup.mak is
+	                        corrected.
+
+	* bcc32/readme.bcc32 : It follows up about the option of configure.bat.
+
+Tue Oct 22 15:23:19 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* instruby.rb: add dryrun mode.
+
+	* ext/extmk.rb (extmake): add install: target to dummy Makefile.
+
+	* ext/extmk.rb (extmake): avoid Borland make's quirk behavior.
+
+	* lib/mkmf.rb (link_command): opt is not a makefile macro.
+
+	* bcc32/Makefile.sub ($(LIBRUBY_SO) $(LIBRUBY)): EXTOBJS were not
+	  linked.
+
+	* bcc32/Makefile.sub (ext/extinit.obj): missing.
+
+	* bcc32/Makefile.sub (TRY_LINK): options have to place before any
+	  non-option arguments.
+
+	* win32/Makefile.sub (TRY_LINK): need -link and -libpath options.
+
+	* bcc32/Makefile.sub, win32/Makefile.sub (RANLIB): logical
+	  operator never work with command.com.
+
+Tue Oct 22 00:59:59 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (RUBY_CPPOUTFILE): fix cache file bug.
+
+	* lib/mkmf.rb (link_command): put 'opt' after conftest.c for
+	  static linking.
+
+Mon Oct 21 22:53:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in (XCFLAGS): CFLAGS to compile ruby itself.
+
+	* configure.in (LIBEXT): suffix for static libraries.
+
+	* configure.in (LIBPATHFLAG): switch template to specify library
+	  path.
+
+	* configure.in (LINK_SO): command to link shared objects.
+
+	* configure.in (DEFFILE, ARCHFILE): miscellaneous system dependent
+	  files.
+
+	* configure.in (EXPORT_PREFIX): prefix to exported symbols on
+	  Windows.
+
+	* configure.in (COMMON_LIBS, COMMON_MACROS, COMMON_HEADERS):
+	  libraries, macros and headers used in common.
+
+	* configure.in (RUBYW_INSTALL_NAME, rubyw_install_name): GUI mode
+	  executable name.
+
+	* Makefile.in (CFLAGS): append XCFLAGS.
+
+	* Makefile.in (PREP): miscellaneous system dependent files.
+
+	* Makefile.in (ruby.imp, ext/extinit.o): moved from ext/extmk.rb.
+
+	* Makefile.in (fake.rb): CROSS_COMPILING keeps building platform.
+
+	* Makefile.in (MAKEFILES): depend on *.in and config.status.
+
+	* Makefile.in (parse.c): replace "y.tab.c" with actual name for
+	  byacc.
+
+	* ext/extmk.rb, lib/mkmf.rb: integrated.
+
+	* ext/extmk.rb: propagate MFLAGS.
+
+	* ext/extmk.rb (extmake): make dummy Makefile to clean even if no
+	  Makefile is made.
+
+	* lib/mkmf.rb (older): accept multiple file names and Time
+	  objects.
+
+	* lib/mkmf.rb (xsystem): split and quote.
+
+	* lib/mkmf.rb (cpp_include): make include directives.
+
+	* lib/mkmf.rb (try_func): try whether specified function is
+	  available.
+
+	* lib/mkmf.rb (install_files): default to site-install.
+
+	* lib/mkmf.rb (checking_for): added.
+
+	* lib/mkmf.rb (find_executable0): just find executable file with
+	  no message.
+
+	* lib/mkmf.rb (create_header): output header file is variable.
+
+	* lib/mkmf.rb (create_makefile): separate sections.
+
+	* lib/mkmf.rb (init_mkmf): initialize global variables.
+
+	* win32/Makefile.sub, bcc32/Makefile.sub (CPP, AR): added.
+
+	* bcc32/Makefile.sub (ARCH): fixed to i386.
+
+	* win32/Makefile.sub, bcc32/Makefile.sub (miniruby): should not
+	  link EXTOBJS.
+
+	* ext/dl/extconf.rb: use try_cpp to cross compile.
+
+	* ext/dl/extconf.rb: not modify files in source directory.
+
+Fri Oct 18 23:11:21 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (value_expr0): allow return/break/next/redo/retry in rhs
+	  of logical operator.  [ruby-dev:18534]
+
+	* parse.y (remove_begin): eliminate useless NODE_BEGIN.
+	  [ruby-dev:18535]
+
+Fri Oct 18 01:02:44 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* hash.c, eval.c: Use (*_NSGetEnviron()) instead of environ on
+	  Darwin for namespace cleanness.  [ruby-core:00537]
+
+	* dln.c (dln_load): Fix Darwin support that has been disabled and
+	  switch to using it on Darwin instead of the system dlopen().
+	  [ruby-core:00541]
+
+Thu Oct 17 19:17:56 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* marshal.c (w_byten): added; write n bytes from s to arg.
+
+	* marshal.c (dump): flush buffered data.
+
+	* marshal.c (marshal_dump, r_byte, r_bytes0, marshal_load): unify
+	  marshaling I/O.  [ruby-talk:53368]
+
+Thu Oct 17 12:58:24 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: stat.blksize might be 0/nil.
+
+	* lib/fileutils.rb: change coding style.
+
+Wed Oct 16 22:35:53 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* sprintf.c (rb_f_sprintf): disallow mixed usage of numbered and
+	  unnumbered arguments.  [ruby-dev:18531]
+	  get rid of memory leak at exception.  [ruby-core:00460]
+
+Wed Oct 16 13:36:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* variable.c (rb_global_entry): not add global entry until
+	  initialized to avoid accessing it while GC.  [ruby-dev:18514]
+
+	* variable.c (rb_alias_variable): ditto.
+
+Wed Oct 16 01:03:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_str_to_dbl): RString ptr might be NULL.
+
+	* object.c (rb_cstr_to_dbl): p pointer might be NULL.
+
+	* bignum.c (rb_str_to_inum): RString ptr might be NULL.
+
+	* bignum.c (rb_cstr_to_inum): str pointer might be NULL.
+
+Sat Oct 12 23:44:11 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* win32/win32.c (rb_w32_putc): wrong condition to fill or flush on
+	  bccwin32.  [ruby-win32:408]
+
+Fri Oct 11 15:58:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): rescue modifier is now an operator with
+	  precedence right below assignments. i.e. "a = b rescue c" now
+	  parsed as "a = (b rescue c)", not as "(a = b) rescue c". [new]
+	  [experimental]
+
+Fri Oct 11 06:05:30 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* win32/win32.c (rb_w32_fclose, rb_w32_close): use closesocket()
+	  for socket.  [ruby-win32:382]
+
+	* win32/win32.c (StartSockets): set NtSocketsInitialized.
+
+	* win32/win32.h: prototypes; rb_w32_fclose, rb_w32_close
+
+Fri Oct 11 00:24:57 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* gc.c (ruby_xmalloc, ruby_xrealloc): restrict total allocation
+	  size according to memories consumed by live objects.
+	  [ruby-dev:18482]
+
+	* gc.c (gc_sweep): estimate how live objects consume memories.
+
+Thu Oct 10 17:26:12 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/tcltklib/stubs.c (ruby_tcltk_stubs): fix memory leak.
+	  [ruby-dev:18478]
+
+Thu Oct 10 15:20:18 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/weakref.rb (WeakRef::@@final): use Hash#delete.
+
+	* lib/weakref.rb (WeakRef::__getobj__): examine if alive or not by
+	  ID_REV_MAP to deal with recycled object.  [ruby-dev:18472]
+
+	* lib/weakref.rb (WeakRef::weakref_alive?): ditto.
+
+Wed Oct  9 07:11:25 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* gc.c (gc_sweep): also adjust heaps_limits when free unused heap
+	  page.  [ruby-core:00526]
+
+	* io.c (io_fflush): condition to retry can occur.
+
+	* io.c (io_write): returned 0 wrongly if no error occurred.
+
+Tue Oct  8 14:19:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* io.c (io_write): must check returned value from fwrite() before
+	  test with ferror().  (ruby-bugs-ja:PR#350)
+
+Tue Oct  8 10:55:23 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/prettyprint.rb (PrettyPrint.singleline_format): new method.
+
+Mon Oct  7 16:43:07 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigdivrem): bignum zero's len should not be 0.
+
+Mon Oct  7 15:36:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigdivmod): wrong condition check for Bignum zero.
+
+	* bignum.c (Init_Bignum): need to add Bignum#div.
+
+Sun Oct  6 00:49:15 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (rb_load): should not pass blocks to the loaded file.
+	  [ruby-dev:18458]
+
+Fri Oct  4 20:25:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_thread_interrupt, rb_thread_signal_raise): no need to
+	  save dead thread context. (same as [ruby-dev:18322])
+	  (ruby-bugs-ja:PR#349)
+
+Fri Oct  4 13:05:58 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (RUBY_PROG_GNU_LD): check whether the linker is GNU ld.
+
+	* ext/extmk.rb (create_makefile): add -Wl,-no-undefined to $DLDFLAGS
+	  on Linux if GNU ld is used and --enable-shared is specified.
+
+Fri Oct  4 02:21:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_rshift): num should be initialized by carry
+	  bits if x is negative.
+
+	* bignum.c (bigdivmod): len for bignum zero is 1, not 0.
+
+Thu Oct  3 20:22:11 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* bcc32/mkexports.rb: to work on cygwin via telnet.
+	  [ruby-win32:358]
+
+	* ext/tcltklib/tcltklib.c (ip_invoke): requires command name
+	  argument.  [ruby-dev:18438]
+
+	* eval.c (ruby_init, ruby_options): Init_stack() with local
+	  location.  (ruby-bugs-ja:PR#277)
+
+	* eval.c (rb_call0): disable trace call.  [ruby-dev:18074]
+
+	* eval.c (eval, rb_load): enable trace call.  [ruby-dev:18074]
+
+	* eval.c (rb_f_require): set source file name for extension
+	  libraries.  [ruby-dev:18445]
+
+	* gc.c (Init_stack): prefer address of argument rather than local
+	  variable to initialize rb_gc_stack_start.
+
+	* ruby.c (translate_char): translate a character in a string;
+	  DOSISH only.  [ruby-dev:18274]
+
+	* ruby.c (ruby_init_loadpath): added argv[0] handling under
+	  Human68K.  [ruby-dev:18274]
+
+	* ruby.c (proc_options): translate directory separator in $0 to
+	  '/'.  [ruby-dev:18274]
+
+Thu Oct  3 00:27:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/delegate.rb (Delegator::initialize): use Object#class
+	  instead of deprecated Object#type.
+
+Wed Oct  2 23:32:48 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in (RUBY_CHECK_IO_NEED_FLUSH): check whether fflush()
+	  is needed.
+
+	* io.c (flush_before_seek): flush before seek if buffered data
+	  may remain.
+
+	* io.c (rb_io_check_readable): flush if the last operation was
+	  write.
+
+	* io.c (rb_io_check_writable): flush if the last operation was
+	  read.
+
+	* rubyio.h (FMODE_RBUF): added.
+
+Wed Oct  2 23:09:20 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* io.c (rb_io_wait_readable): handle retryable errors.
+
+	* io.c (rb_io_wait_writable): ditto.
+
+	* ext/socket/socket.c (bsock_send): ditto.
+
+	* ext/socket/socket.c (s_recvfrom): ditto.
+
+	* ext/socket/socket.c (s_accept): ditto.
+
+	* ext/socket/socket.c (udp_send): ditto.
+
+	* ext/socket/getaddrinfo.c (afdl): made private structures constant.
+
+	* rubyio.h: prototype; rb_io_wait_readable(), rb_io_wait_writable().
+
+Wed Oct  2 13:03:58 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: set ac_cv_func_setitimer to "no" on Cygwin.
+
+Wed Oct  2 10:59:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_sweep): free unused heap page to reduce process size if
+	  possible.
+
+	* object.c (rb_obj_type): deprecated Object#type; use Object#class.
+
+Tue Oct  1 23:48:32 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/socket/socket.c (init_sock): no need for special finalizer,
+	  socket descriptor is no longer duplicated in 1.7.
+	  [ruby-talk:50732]
+
+	* win32/win32.c, win32/win32.h (rb_w32_fddup, rb_w32_fdclose):
+	  delete.
+
+Mon Sep 30 20:29:10 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* io.c (rb_io_inspect): not need to raise IOError for closed
+	  stream.  [ruby-talk:51871]
+
+Mon Sep 30 03:48:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_check): need no Fixnum check.
+
+Sun Sep 29 18:30:24 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* win32/win32.c (rb_w32_open_osfhandle): adjust
+	  rb_w32_open_osfhandle() with _open_osfhandle().
+
+	* win32/win32.c (rb_w32_accept, rb_w32_socket): return -1 on
+	  error.
+
+	* win32/win32.h: should use file descriptor instead of SOCKET.
+
+Sun Sep 29 06:33:03 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.c (is_socket, rb_w32_select, rb_w32_accept, rb_w32_bind,
+	  rb_w32_connect, rb_w32_getpeername, rb_w32_getsockname,
+	  rb_w32_getsockopt, rb_w32_ioctlsocket, rb_w32_listen, rb_w32_recv,
+	  rb_w32_recvfrom, rb_w32_send, rb_w32_sendto, rb_w32_setsockopt,
+	  rb_w32_shutdown, rb_w32_socket, rb_w32_gethostbyaddr,
+	  rb_w32_gethostbyname, rb_w32_gethostname, rb_w32_getprotobyname,
+	  rb_w32_getprotobynumber, rb_w32_getservbyname, rb_w32_getservbyport):
+	  need to protect WSAGetLastError() by RUBY_CRITICAL. [ruby-talk:51778]
+
+Sat Sep 28 20:06:36 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* keywords: add braces around initializers.
+
+Sat Sep 28 13:19:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* hash.c (rb_hash_become): should check self-assignment after
+	  conversion.
+
+Sat Sep 28 10:40:44 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_become): Hash#become should check added
+	  self-assignment.
+
+	* class.c (rb_make_metaclass): metaclass of a superclass may be
+	  NULL at boot time.
+
+Sat Sep 28 09:50:03 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* ext/extmk.rb: The condition judgment without necessity was deleted.
+
+Fri Sep 27 18:40:42 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_thread_deadlock): more verbose message at deadlock.
+
+	* eval.c (rb_thread_schedule): ditto.
+
+	* eval.c (rb_thread_join): ditto.
+
+Fri Sep 27 13:24:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): Class#inherited should be called after the
+	  execution of the class body.
+
+Fri Sep 27 02:41:53 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/sha1: Use OpenSSL's SHA1 engine if available.  It is
+	  much faster than what we have now (sha1.[ch]).  Add a knob
+	  (--with-bundled-sha1) to extconf.rb which makes it use the
+	  bundled one anyway.
+
+Fri Sep 27 02:25:14 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/rmd160: Use OpenSSL's RMD160 engine if available.  It
+	  is much faster than what we have now (rmd160.[ch]).  Add a knob
+	  (--with-bundled-rmd160) to extconf.rb which makes it use the
+	  bundled one anyway.
+
+Fri Sep 27 01:23:39 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/md5: Use OpenSSL's MD5 engine if available.  It is
+	  much faster than what we have now (md5.[ch]).  Add a knob
+	  (--with-bundled-md5) to extconf.rb which makes it use the
+	  bundled one anyway.
+
+Thu Sep 26 22:44:21 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_base_s_digest): Fix a double
+	  free() bug mingled with allocation framework deployment.
+
+	* ext/digest/digest.c (rb_digest_base_s_hexdigest): Get rid of
+	  redundant struct allocation.
+
+Thu Sep 26 09:52:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (primary): remove "return outside of method" check at
+	  compile time.
+
+Wed Sep 25 23:51:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* dir.c (glob_helper): must not closedir() when exception raised
+	  while globbing "**".
+
+	* marshal.c (w_uclass): unused variable.
+
+	* re.c (match_clone): unused.
+
+	* regex.c (re_compile_pattern): get rid of implicit promotion from
+	  plain char to int.
+
+Wed Sep 25 17:46:46 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (libpathflag): restore ENV['LIB'] when some error
+	  occurred.
+
+Wed Sep 25 16:14:51 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_match): p1 may exceed pend limit.
+
+Mon Sep 23 23:22:43 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_call0): must not clear ruby_current_node, or
+	  backtrace cannot be generated.
+
+	* intern.h (ruby_yyparse): rather than yyparse().
+
+	* parse.y (yylex): nextc() returns -1 at end of input, not 0.
+
+	* parse.y (newline_node): reduce duplicated newline node.
+
+	* parse.y (literal_concat): get rid of warning.
+
+	* parse.y (new_evstr): fixed junk code.
+
+Mon Sep 23 19:57:52 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (RUBY_MINGW32): new macro. check for the MinGW
+	  compiler environment.
+
+	* lib/mkmf.rb: refactoring.
+
+Mon Sep 23 08:27:11 2002  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (appendline): forget to terminate with nul.
+
+Mon Sep 23 02:46:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ruby_run): should set toplevel visibility again here.
+
+	* eval.c (rb_eval): should not rely on ruby_class == rb_cObject
+	  check.   Besides allow implicit publicity for attribute set
+	  methods.
+
+	* parse.y (primary): need not to check class_nest, just set
+	  whether method is an attrset or not.
+
+Sun Sep 22 21:49:42 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (call_trace_func): should not call trace function while
+	  compilation.
+
+	* eval.c (rb_call0): also inside c-func.
+
+	* parse.y (yycompile): ditto.
+
+	* ruby.c (require_libraries): preserve source file/line for each
+	  require.
+
+Sun Sep 22 17:08:11 2002  Tanaka Akira  <akr@m17n.org>
+
+	* string.c (rb_str_each_line): p might be at the top of the
+	  string.
+
+Sat Sep 21 23:28:28 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_make_metaclass): class of metaclass should be
+	  metaclass of superclass, unless class itself is a metaclass;
+	  class of metaclass of metaclass should point back to self.
+	  eh, confusing, isn't it.
+
+	* class.c (rb_singleton_class): check if its class is singleton
+	  AND attached to self.
+
+Sat Sep 21 22:23:41 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_thread_raise): no need to save dead thread context.
+	  [ruby-dev:18322]
+
+Fri Sep 20 23:02:01 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (block_append): eliminate unused literal nodes.
+
+	* parse.y (literal_concat): refined literal concatenation.
+
+Fri Sep 20 19:43:40 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb: Merge rough/lib/set.rb rev.1.5-1.15.
+
+Wed Sep 18 12:41:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): should define class/module under ruby_cbase.
+
+	* eval.c (rb_eval): should set class/module path based on
+	  ruby_cbase, not ruby_class.
+
+	* eval.c (module_setup): use ruby_cbase instead of ruby_class.
+
+Tue Sep 17 21:06:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_thread_die): put thread dead state.
+
+	* eval.c (rb_thread_atfork): free stack buffer at fork too.
+
+Tue Sep 17 01:13:31 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_nesting): load wrapping module should appear in
+	  Module#nesting list. (ruby-bugs-ja:PR#328)
+
+	* eval.c (rb_thread_remove): free stack buffer on remove.
+
+Tue Sep 17 00:58:35 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* io.c: add parameter prototype.
+
+	* re.c: ditto.
+
+Sun Sep 15 21:14:22 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* win32/win32.c (rb_w32_opendir, rb_w32_stat): Corresponds to
+	  the unjust path containing ".
+
+Sun Sep 15 19:48:55 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (OUTFLAG, CPPOUTFILE): moved from lib/mkmf.rb.
+	  check whether ${CPP} accepts the -o option.
+
+	* win32/Makefile.sub (OUTFLAG, CPPOUTFILE): ditto.
+
+	* bcc32/Makefile.sub (OUTFLAG, CPPOUTFILE): ditto.
+
+	* djgpp/config.sed (OUTFLAG, CPPOUTFILE): ditto.
+
+	* lib/mkmf.rb (OUTFLAG, CPPOUTFILE): use CONFIG.
+	  make easy to understand log.
+
+	* mkconfig.rb (val): should not strip.
+
+Sat Sep 14 20:13:42 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* error.c(rb_sys_fail): remove case EPIPE on bcc32 .
+
+Fri Sep 13 23:39:49 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* dir.c (glob_func_caller): add prototype to get rid of warning.
+
+Fri Sep 13 18:35:12 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_eval): avoid uninitialized global/class variable
+	  warnings at `||='.  [ruby-dev:18278]
+
+	* parse.y (stmt, arg): ditto
+
+Fri Sep 13 13:28:04 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb ($INSTALLFILES): avoid warning when $VERBOSE mode.
+
+Thu Sep 12 23:20:10 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* bcc32/setup.mak    : Control of a message.
+
+	* bcc32/makefile.sub : include resource.
+
+Thu Sep 12 18:10:03 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* dir.c (glob_helper): fixed freeing buffer.  (ruby-bugs-ja:PR#332)
+
+	* dir.c (glob_helper): should pass matched path.  (ruby-bugs-ja:PR#333)
+
+Thu Sep 12 00:09:32 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_trap_eval): preserve thread status and so on.
+	  [ruby-talk:40337], [ruby-core:00019]
+
+Wed Sep 11 21:25:52 2002  Tanaka Akira  <akr@m17n.org>
+
+	* pp.rb (ARGF.pretty_print): implemented.
+	  (PP.pp): arguments reordered.
+
+Wed Sep 11 18:55:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (proc_to_s): refined format.  [ruby-dev:18215]
+
+Wed Sep 11 17:47:17 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.c, win32/win32.h (rb_w32_getpid): negate pid under Win9x.
+	  [ruby-dev:18262]
+
+Wed Sep 11 12:58:57 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* string.c (get_pat): Add an extra argument "quote".
+
+	* string.c (rb_str_match_m): Do not bother to convert if a regexp
+	  is given.
+
+Wed Sep 11 11:33:40 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* bcc32/Makefile.sub: remove unnecessary `.dll' from filename of
+	  dll's resource file.
+
+	* cygwin/GNUmakefile.in: ditto. [ruby-dev:17103]
+
+	* win32/Makefile.sub: ditto. [ruby-dev:17103]
+
+	* win32/resource.rb: ditto. [ruby-dev:17103]
+
+Wed Sep 11 09:59:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* io.c (rb_io_wait_readable): added.
+
+	* io.c (rb_io_wait_writable): added.
+
+	* io.c (io_read_retryable): added.
+
+	* io.c (io_write): retry on EINTR, ERESTART and EWOULDBLOCK.
+	  [ruby-dev:17855], [ruby-dev:17878], [ruby-core:00444]
+
+	* io.c (rb_io_fread): ditto.
+
+	* io.c (read_all): ditto.
+
+	* io.c (appendline): ditto.
+
+	* io.c (rb_io_each_byte): ditto.
+
+	* io.c (rb_io_getc): ditto.
+
+Wed Sep 11 09:29:24 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (ext): make directory `ext' on compile dir.
+	  [ruby-dev:18255]
+
+Wed Sep 11 00:41:10 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_mod_define_method): initialize orig_func too.
+	  (ruby-bugs-ja:PR#330)
+
+Wed Sep 11 00:01:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (glob_helper): prevent memory leak using rb_protect().
+
+	* string.c (rb_str_associate): no need to check freeze flag.
+
+	* string.c (rb_str_resize): should honor STR_ASSOC flag on
+	  resize.
+
+	* string.c (rb_str_resize): proper STR_ASSOC handling.  pointed
+	  out by Michal Rokos.
+
+	* string.c (rb_str_buf_cat): ditto.
+
+	* string.c (rb_str_cat): ditto.
+
+	* string.c (rb_str_buf_append): ditto.
+
+	* string.c (rb_str_append): ditto.
+
+Tue Sep 10 23:35:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (nextc): restore line number after here documents.
+	  (ruby-bugs-ja:PR#331)
+
+	* parse.y (heredoc_restore): ditto.
+
+Tue Sep 10 18:26:52 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb, lib/mkmf.rb ($INCFLAGS): new var for -I$(topdir).
+
+	* lib/mkmf.rb: add #define WIN32_LEAN_AND_MEAN to improve compile
+	  times.
+
+Tue Sep 10 17:16:14 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (miniruby): shouldn't link $(EXTOBJS).
+	  [ruby-dev:17059]
+
+	* win32/Makefile.sub ($(LIBRUBY_A), $(LIBRUBY)): avoid lib.exe's
+	  warning. [ruby-dev:17059]
+
+	* win32/Makefile.sub: remove unnecessary rules. [ruby-dev:17059]
+
+	* win32/configure.bat, win32/setup.mak, win32/README.win32: enable to
+	  pass some arguments to configure. [ruby-dev:17059]
+
+Mon Sep  9 23:43:33 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.h (S_I?USR): define only if not mingw32.
+
+Mon Sep  9 11:21:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/stringio/stringio.c (strio_set_string): reinitialize
+	  properly.
+
+	* ext/stringio/stringio.c (strio_become): added self-assign check
+	  and experimental auto-conversion to StringIO.
+
+	* ext/stringio/stringio.c (strio_reopen): added.
+
+
+Sun Sep  8 21:29:25 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* time.c (time_free): prototype; struct time_object -> void *.
+	  avoid GCC warnings.
+
+	* lib/mkmf.rb, ext/extmk.rb ($LINK, $CPP): move to lib/mkmf.rb.
+
+Sun Sep  8 19:02:28 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* time.c: prototype; time_free() to avoid VC++ warnings.
+
+	* ext/tcltklib/tcltklib.c: prototype; invoke_queue_handler() to avoid
+	  VC++ warning.
+
+	* win32/win32.c (rb_w32_stat): remove S_IWGRP and S_IWOTH bits from
+	  st_mode.
+
+	* win32/win32.h (S_I*): define if not defined.
+
+Sun Sep  8 14:38:31 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: modify program_prefix only if specified
+	  --program-prefix.
+
+	* configure.in: don't generate ext/extmk.rb.
+
+	* Makefile.in: execute directly $(srcdir)/ext/extmk.rb.
+	  remove -Cext option, "Dir::chdir 'ext'" in ext/extmk.rb.
+
+	* {win32,bccwin32}/Makefile.sub: ditto.
+
+	* instruby.rb: ditto.
+
+	* ext/extmk.rb: renamed from ext/extmk.rb.in.
+
+	* lib/mkmf.rb (module Logging): create log files (mkmf.log)
+	  in each extension module directories.
+
+	* ext/extmk.rb: ditto.
+
+	* lib/mkmf.rb (macro_defined?): new method.
+
+	* ext/.cvsignore: remove extmk.rb.
+
+	* ext/*/.cvsignore: add "*.def".
+
+	* lib/mkmf.rb (have_struct_member): moved from ext/socket/extconf.rb.
+
+	* ext/socket/extconf.rb: use macro_defined? instead of egrep_cpp.
+
+	* ext/etc/extconf.rb: use have_struct_member.
+
+	* ext/etc/etc.c: add prefix HAVE_ST_ to PW_ macros.
+
+Sun Sep  8 14:36:40 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* bcc32/configure.bat : Control of a message.
+	* bcc32/makefile.sub  : @(sitearch) typo.
+	* ext/extmk.rb.in     : [bccwin32] libdir is added to a library path.
+	* lib/mkmf.rb         : ditto.
+
+Sat Sep  7 23:32:56 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/inf-ruby.el (inferior-ruby-error-regexp-alist): regexp
+	  alist for error message from ruby.
+
+	* misc/inf-ruby.el (inferior-ruby-mode): fixed for Emacs.
+
+	* misc/inf-ruby.el (ruby-send-region): compilation-parse-errors
+	  doesn't parse first line, so insert separators before each
+	  evaluations.
+
+Sat Sep  7 19:46:57 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb: Disallow Set.new(false).  Add even more tests.
+	  [Submitted by: "Christoph" <chr_news@gmx.net>]
+
+Sat Sep  7 19:23:56 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb: Fix a bug in flatten()'s recursive set detection.
+	  [Submitted by: "Christoph" <chr_news@gmx.net>]  Some tests
+	  against the bug are added.
+
+	* lib/set.rb: Resurrect the test suite by putting it after
+	  __END__ and executing `eval DATA.read'.
+
+Sat Sep  7 08:41:39 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y (rb_gc_mark_parser): ruby_eval_tree is marked in eval.c.
+
+Fri Sep  6 20:01:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/mkmf.rb ($CC): command to compile C source.
+
+	* lib/mkmf.rb (logging): added.
+
+	* lib/mkmf.rb (try_compile): added.
+
+	* lib/mkmf.rb (egrep_cpp): use internal grep when pattern is
+	  Regexp, otherwise use external egrep command but get rid of
+	  pipe of command.com.
+
+	* lib/mkmf.rb (have_func): local variable should be volatile not
+	  to be eliminated by optimization.
+
+	* lib/mkmf.rb (create_makefile): link with CONFIG["LIBS"].
+
+	* lib/mkmf.rb (create_makefile): emit .SUFFIXES:.
+
+Fri Sep  6 12:11:22 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y (rb_gc_mark_parser): should mark ALL global variables
+	  defined in parse.y.
+
+Fri Sep  6 01:15:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (ruby_xmalloc): remove MALLOC_LIMIT to avoid frequent
+	  garbage collection.
+
+Fri Sep  6 11:47:37 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y (rb_gc_mark_parser): should mark global variables
+	  defined in parse.y.
+
+Fri Sep  6 10:34:32 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* io.c (rb_io_puts): RSTRING(line)->ptr might be NULL.
+
+Fri Sep  6 10:26:37 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y: should not put non-NODE-VALUEs in the semantic stack.
+
+Fri Sep  6 05:48:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* file.c (rb_path_check): nothing to check under DOSISH.
+	  [ruby-list:35772]
+
+Fri Sep  6 05:03:50 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* gc.c (rb_gc): should mark parser.
+
+	* parse.y (rb_gc_mark_parser): new function.
+
+	* intern.h (rb_gc_mark_parser): added.
+
+Thu Sep  5 18:32:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_path2class): should not use rb_eval_string().
+
+Thu Sep  5 17:18:22 2002  Michal Rokos  <michal@ruby-lang.org>
+
+	* dln.c: fix memory leak in dln_load (ruby-core:405) and
+	  in load_1 (ruby-core:407)
+
+Thu Sep  5 15:43:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_extended): should allow marshaling of object which
+	  is extended by named module.
+
+	* class.c (rb_make_metaclass): super may be T_ICLASS, need to skip.
+
+Thu Sep  5 13:09:22 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_eval): overriding false constant with class/module
+	  definition should be error.  (PR#327)
+
+Thu Sep  5 01:24:26 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* extmk.rb (create_makefile): add macro MAKEDIRS, INSTALL_PROG,
+	  INSTALL_DATA.
+
+	* extmk.rb (create_makefile): support for building to any directory.
+
+	* extmk.rb (xsystem): move to mkmf.rb.
+
+	* mkmf.rb (xsystem): support for extmk.rb
+
+	* mkmf.rb ($CPP): remove '-E' option.  add CPPFLAGS.
+
+Wed Sep  4 16:15:17 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb: ==(o) should be aware of all the Set variant
+	  instances, not just those of its subclasses. [Submitted by:
+	  "Christoph" <chr_news@gmx.net>]
+
+	* lib/set.rb: - Fix eql?(). [ditto]
+
+Wed Sep  4 15:23:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_make_metaclass): obj.meta.super.meta should be equal
+	  to obj.meta.meta.super (ruby-bugs-ja:PR#324).
+
+Wed Sep  4 05:10:16 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* parse.y (yylex): the warning message "invalid
+	  character syntax" was never issued (ruby-bugs-ja:PR#323).
+
+Wed Sep  4 01:08:45 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_bytes): do not use alloca (ruby-bugs:PR#382).
+
+Tue Sep  3 17:12:59 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* extmk.rb: require mkmf.rb.  remove duplicate methods.
+	  use Config::CONFIG["FOO"] instead of @FOO@.
+
+	* mkmf.rb: support for extmk.rb.
+
+Mon Sep  2 23:01:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* re.c (rb_reg_search): MatchData must be rb_cMatch.
+	  (ruby-bugs-ja:PR#319)
+
+Mon Sep  2 21:21:46 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* gc.c (gc_sweep): does reclaim nodes in also compile time, if we
+	  can.
+
+	* ruby.c (load_file): omit GC if we can.
+
+	* parse.y (ruby_parser_stack_on_heap): new function.
+
+	* intern.h (ruby_parser_stack_on_heap): added.
+
+Mon Sep  2 18:45:07 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_copy_generic_ivar): remove old generic instance
+	  variable table if it exists.
+
+Sun Sep  1 15:54:33 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* config.guess: fixed for Linux/PPC.
+
+Sat Aug 31 09:38:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_make_metaclass): metaclass of a metaclass is a
+	  metaclass itself.
+
+Fri Aug 30 22:45:16 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb: Added.
+
+Fri Aug 30 20:58:54 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* ext/Win32API/Win32API.c (Win32API_Call): typo.
+
+Fri Aug 30 19:45:52 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* variable.c (rb_const_assign): st_delete() takes pointer to key.
+
+Fri Aug 30 19:40:28 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/Win32API/Win32API.c (Win32API_Call): RSTRING()->ptr may be
+	  NULL.
+
+	* ext/nkf/nkf.c (rb_nkf_guess): ditto.
+
+	* ext/readline/readline.c (readline_s_set_completion_append_character):
+	  ditto.
+
+	* ext/socket/socket.c (sock_s_getaddrinfo, sock_s_getnameinfo):
+	  ditto.
+
+	* ext/tcltklib/tcltklib.c (ip_toUTF8, ip_fromUTF8): ditto.
+
+Fri Aug 30 01:32:17 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_singleton_class): superclass of a metaclass
+	  should be a metaclass of superclass.
+
+	* range.c (range_eq): two instances must belong to a same class to
+	  be equal.
+
+	* range.c (range_eql): ditto.
+
+	* io.c (rb_io_taint_check): frozen check added.
+
+	* file.c (rb_stat_become): frozen check added.
+
+	* object.c (rb_obj_become): ditto.
+
+	* re.c (rb_reg_become): ditto.
+
+	* struct.c (rb_struct_become): ditto.
+
+	* time.c (time_become): ditto.
+
+	* array.c (rb_ary_become): should call rb_ary_modify().
+
+	* hash.c (rb_hash_become): should call rb_hash_modify().
+
+	* compar.c (cmp_equal): should not use NUM2LONG(), since <=> may
+	  return bignum.
+
+	* compar.c (cmp_gt, cmp_ge, cmp_lt, cmp_le, cmp_between): ditto.
+
+Thu Aug 29 23:34:42 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* bcc32/MakeFile.sub (sitearch): add.
+
+Thu Aug 29 13:36:42 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (read_all): should use off_t instead of long.
+
+Thu Aug 29 00:55:55 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* marshal.c (r_object): yield loaded objects, not intermediates.
+	  (ruby-bugs-ja:PR#296)
+
+Thu Aug 29 00:06:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_become): should not free ptr if it's shared.
+
+	* eval.c (rb_alias): prohibit making an alias named "allocate" if
+	  klass is a metaclass.
+
+Wed Aug 28 23:59:15 2002  Michal Rokos  <michal@ruby-lang.org>
+
+	* signal.c: remove #ifdef SIGINT for struct signals.
+
+	* variable.c: get rid of fix length buffer in rb_class_path.
+
+Wed Aug 28 23:34:32 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* io.c (appendline): data was lost when raw mode.
+
+Wed Aug 28 22:57:34 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_string_value_ptr): StringValuePtr() should never
+	  return NULL pointer.
+
+Wed Aug 28 19:12:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/stringio/stringio.c (strio_initialize): RSTRING(mode)->ptr
+	  can be NULL.
+
+	* ext/stringio/stringio.c (strio_ungetc): fix buffer overflow.
+
+Wed Aug 28 18:19:55 2002  Michal Rokos  <michal@ruby-lang.org>
+
+	* file.c: fix memory leak in rb_stat_init.
+
+Wed Aug 28 17:45:03 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* win32/win32.c (kill): negate pid under Win9x.
+
+Wed Aug 28 16:36:40 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (ar): don't check ar twice.
+
+Wed Aug 28 15:00:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_delete_bang): should check if str->ptr is 0.
+
+	* string.c (rb_str_squeeze_bang): ditto.
+
+	* string.c (rb_str_count): ditto.
+
+	* string.c (rb_str_lstrip_bang): ditto.
+
+	* string.c (rb_str_rstrip_bang): ditto.
+
+	* string.c (rb_str_intern): ditto.
+
+Wed Aug 28 11:37:35 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.h: define SIGINT and SIGKILL if not defined.
+
+	* win32/win32.c: remove definition of SIGINT and SIGKILL.
+
+Tue Aug 27 19:50:27 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ruby.c (require_libraries): prevent ruby_sourcefile from GC.
+
+Tue Aug 27 15:03:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_find_file): $LOAD_PATH must not be empty.
+
+	* file.c (rb_find_file_ext): ditto.
+
+Tue Aug 27 02:35:21 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_eq): class check should be based on range.class,
+	  instead of Range to work with Range.dup.
+
+	* range.c (range_eql): ditto.
+
+Mon Aug 26 18:17:56 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_mod_dup): need to preserve metaclass and flags.
+
+Mon Aug 26 10:44:18 2002  Tanaka Akira  <akr@m17n.org>
+
+	* object.c (rb_cstr_to_dbl): had a buffer overrun.
+
+Sun Aug 25 20:10:32 2002  Wakou Aoyama  <wakou@ruby-lang.org>
+
+	* lib/cgi.rb (CGI#form): fix ruby-bugs-ja:PR#280, add default action.
+
+Sat Aug 24 15:32:16 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (call_trace_func): restore source file/line, as trace
+	  function installed in required library with -r option can be
+	  called while parsing.  (ruby-bugs:PR#372)
+
+	* eval.c (module_setup): unused variable.  [ruby-core:00358]
+
+Sat Aug 24 14:59:02 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_class): integrate singleton check into a function
+	  to follow DRY principle.
+
+	* marshal.c (w_uclass): should check singleton method.
+
+	* object.c (rb_obj_dup): dmark and dfree functions must be match
+	  for T_DATA type.
+
+	* object.c (rb_obj_dup): class of the duped object must be match
+	  to the class of the original.
+
+Sat Aug 24 13:57:28 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/time.rb (Time.rfc2822, Time#rfc2822): preserve localtimeness.
+
+	* lib/pp.rb: pretty_print_cycled is renamed to pretty_print_cycle.
+
+Fri Aug 23 23:59:57 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (method_call): check receiver is defined.
+
+	* eval.c (umethod_call): removed.
+
+Fri Aug 23 23:39:17 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_quote): do not escape \t, \f, \r, \n, for they are
+	  not regular expression metacharacters.
+
+	* time.c (time_s_alloc): use time_free instead of free (null check,
+	  also serves for type mark).
+
+	* time.c (time_s_at): check dfree function too.
+
+Fri Aug 23 17:06:48 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: RUBY_SO_NAME is msvcrt-rubyXX on mswin32/mingw32.
+
+	* configure.in (sitearch): new var.
+
+	* mkconfig.rb, lib/mkmf.rb (sitearch): ditto.
+
+	* win32/Makefile.sub, win32/setup.mak (sitearch): ditto.
+
+	* instruby.rb: ditto.
+
+Wed Aug 21 16:53:00 2002  Michal Rokos  <michal@ruby-lang.org>
+
+	* *.c: int, long types cleanup.
+
+	* parse.y: ditto.
+
+	* re.h, regex.h, ruby.h: ditto.
+
+Wed Aug 21 16:43:19 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_cleanup): should not modify the global
+	  variable curr_thread.
+
+Wed Aug 21 16:14:26 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: set ac_cv_func__setjmp to "no" on Cygwin.
+
+	* configure.in: set ac_cv_func_crypt to "no" on MinGW.
+
+Tue Aug 20 21:47 2002  KONISHI Hiromasa  <konishih@fd6.so-net.ne.jp>
+
+	* io.c          (rb_io_fread): remove case EPIPE on bcc32 .
+
+	* win32/win32.c (rb_w32_getc): clear EPIPE error on bcc32.
+
+Tue Aug 20 19:39:03 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* file.c (rb_file_s_expand_path): accept drive letter on Cygwin.
+
+	* file.c (is_absolute_path): ditto.
+
+Tue Aug 20 12:12:25 2002  Tietew <tietew@tietew.net>
+
+	* io.c (rb_io_putc): output via rb_io_write().
+
+Mon Aug 19 19:01:55 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/inf-ruby.el (inf-ruby-keys): ruby-send-definition
+	  conflicted with ruby-insert-end.
+
+	* misc/inf-ruby.el (inferior-ruby-mode): compilation-minor-mode.
+
+	* misc/inf-ruby.el (ruby-send-region): send as here document to
+	  adjust source file/line.  [ruby-talk:47113], [ruby-dev:17965]
+
+	* misc/inf-ruby.el (ruby-send-terminator): added to make unique
+	  terminator.
+
+Mon Aug 19 17:08:19 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_initialize_m): frozen check should be moved here
+	  from rb_reg_initialize().
+
+Mon Aug 19 15:38:44 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (sort_2): comparison should be done as signed long.
+
+	* array.c (sort_2): should return int, not VALUE.
+
+Mon Aug 19 12:38:33 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_thread_save_context, rb_thread_restore_context):
+	  save/restore SEH chain on MS-Windows at thread switch.
+	  [ruby-win32:273]
+
+	* eval.c (win32_get_exception_list, win32_set_exception_list):
+	  added.
+
+Sat Aug 17 23:01:25 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (sort_2): *a - *b may overflow.
+
+Sat Aug 17 00:25:08 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (ary_new): len*sizeof(VALUE) may be a positive value.
+
+	* array.c (rb_ary_initialize): ditto.
+
+Fri Aug 16 15:58:16 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (NOFILE): define NOFILE as 64 if not defined.
+
+	* signal.c (sighandler_t): rename to sh_t on dietlibc.
+
+Fri Aug 16 15:37:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* bignum.c (rb_cstr_to_inum): new decimal and octal string.
+
+Fri Aug 16 13:17:11 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_class_allocate_instance): move singleton class
+	  check from rb_obj_alloc().
+
+Fri Aug 16 11:47:24 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* io.c (rb_io_fread): renamed from io_fread and made extern.
+
+	* marshal.c (r_bytes0): check if successfully read, use
+	  rb_io_fread() instead of fread() to be preemptive.
+	  (ruby-bugs-ja:PR#294, 295)
+
+	* rubyio.h (rb_io_fread): added.
+
+Fri Aug 16 07:57:26 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (compile_error): must not clear ruby_sourcefile here.
+	  (ruby-bugs:PR#364).
+
+	* eval.c (rb_longjmp): set ruby_sourcefile before making
+	  backtrace.
+
+Thu Aug 15 20:38:58 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (ruby_current_node) : added to set sourceline on demand.
+
+	* eval.c (error_pos, error_print, rb_longjmp, assign): set source
+	  file/line.
+
+	* eval.c (rb_eval): store current node instead of file/line, and
+	  preserve it at return.
+
+	* eval.c (module_setup): ditto.
+
+	* eval.c (struct thread): store node instead of file/line.
+
+	* eval.c (rb_thread_raise): ditto.
+
+	* intern.h (ruby_current_node): added.
+
+	* intern.h (ruby_set_current_source): added.
+
+	* parse.y (stmt, arg): not fix position of assignment.
+
+	* parse.y (node_assign): ditto.
+
+	* parse.y (yycompile): clear current node.
+
+Thu Aug 15 00:48:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_initialize): should not modify frozen Regexp.
+
+Tue Aug 13 18:33:18 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/tcltklib/tcltklib.c (ip_init): allocation framework.
+
+Tue Aug 13 15:32:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_replace): should copy ifnone.
+
+	* hash.c (rb_hash_dup): should preserve HASH_PROC_DEFAULT and
+	  HASH_DELETED flags.
+
+	* hash.c (rb_hash_shift): shift from empty hash should not return
+	  its default proc.
+
+	* hash.c (rb_hash_default_proc): new method. [new]
+
+Tue Aug 13 00:37:11 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_aref): no need for Bignum check.
+
+	* array.c (rb_ary_aset): explicit Bignum check removed.
+
+	* numeric.c (fix_aref): normalize bignum before bit-op.
+
+	* bignum.c (rb_big_rand): max may be Bignum zero.
+
+	* bignum.c (rb_cstr_to_inum): should normalize bignums, to avoid
+	  returning fixable bignum value.
+
+	* bignum.c (rb_uint2big): there should be no zero sized bignum.
+
+Mon Aug 12 23:45:28 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/extmk.rb.in: extmake() that works properly for both tkutil
+	  (tk/tkutil.so) and digest/sha1.
+
+Mon Aug 12 22:29:35 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ruby.c (set_arg0): Correct the position of #endif.
+
+Mon Aug 12 17:25:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_equal): should check HASH_PROC_DEFAULT too.
+
+Mon Aug 12 16:15:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* bignum.c (rb_big_cmp): raise for NaN.  (ruby-bugs-ja:PR#284).
+
+Sun Aug 11 09:34:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_eval): set line number from all nodes.
+
+	* eval.c (proc_to_s): show source file/line if available.
+
+	* marshal.c (r_object): register TYPE_BIGNUM regardless real type.
+
+Sat Aug 10 23:47:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_cmp): use dbl2big() for Floats, instead of
+	  big2dbl().
+
+	* bignum.c (Init_Bignum): rb_big_zero_p() removed.  There may be
+	  Bignum zero.
+
+Fri Aug  9 13:31:40 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/Win32API/extconf.rb: check existence of <windows.h>.
+
+Thu Aug  8 09:37:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/optparse.rb (NilClass): must provide conversion block.
+
+	* lib/optparse.rb (String): ditto.
+
+Thu Aug  8 00:45:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): new argument added for original method name.
+	  preserve original method name in frame->orig_func.
+
+	* eval.c (is_defined): use frame->orig_func, not last_func.
+
+	* eval.c (rb_eval): ditto.
+
+	* eval.c (method_call): supply data->oid also to rb_call0().
+
+	* object.c (rb_class_allocate_instance): call rb_obj_alloc() when
+	  called from alias, thus invoke original "allocate".
+
+	* eval.c (remove_method): removing allocate from classes should
+	  cause NameError.
+
+Wed Aug  7 22:12:54 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/optparse.rb (OptionParser::Completion::convert): returned
+	  all values not first one.
+
+	* lib/optparse.rb (OptionParser::Switch::parse): return values as
+	  is.
+
+	* lib/optparse.rb (OptionParser::order): ditto.
+
+	* lib/optparse/time.rb: prior time.rb.
+
+	* lib/optparse/uri.rb: require standard uri module.  thanks to
+	  Minero Aoki.
+
+Wed Aug  7 09:51:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_equal): should check default values.
+
+Wed Aug  7 08:44:32 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/racc/cparse/cparse.c: reduce goto.
+
+Tue Aug  6 15:19:39 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* string.c (rb_str_rindex): must return -1 if unmatched.
+
+Mon Aug  5 22:41:18 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* MANIFEST: add lib/racc/parser.rb.
+
+	* ext/racc/cparse/cparse.c: code refine.
+
+	* ext/racc/cparse/MANIFEST: add depend.
+
+Sun Aug  4 22:30:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/curses/curses.c: follow allocation framework.
+
+Sat Aug  3 21:23:56 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_eval): set constant in cbase scope.
+
+	* eval.c (assign): ditto.
+
+Fri Aug  2 09:12:32 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c: follow allocation framework.
+
+Fri Aug  2 01:21:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (s_recvfrom): update RSTRING len.
+
+Thu Aug  1 17:47:15 2002  Tachino Nobuhiro <tachino@jp.fujitsu.com>
+
+	* parse.y (tokadd_string): ignore backslashed spaces in %w.
+
+Thu Aug  1 14:14:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_find): do not use rb_eval_cmd(); should not accept
+	  a string for if_none.
+
+Wed Jul 31 14:11:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_undef): undef should be done for klass, not ruby_class.
+
+Tue Jul 30 19:48:51 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-accurate-end-of-block): restrict search
+	  region.
+
+	* misc/ruby-mode.el (ruby-parse-partial): reversed wrong patch.
+
+Tue Jul 30 17:21:13 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-accurate-end-of-block): incomplete block
+	  caused infinite loop.
+
+	* misc/ruby-mode.el (ruby-parse-partial): returns nil unless
+	  delimiters found.
+
+Tue Jul 30 15:24:07 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/tcltklib/stubs.c (ruby_tcltk_stubs): win32_getenv returns
+	  the same address always, so allocate string by ruby_strdup.
+
+	* win32/win32.c: prototype; rb_w32_open_osfhandle().
+
+Tue Jul 30 09:11:07 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (rb_thread_join_m): add parameter type declaration.
+
+Tue Jul 30 08:37:11 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (localjump_error): add parameter type declaration.
+
+Mon Jul 29 16:00:54 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb.in: always use File.expand_path for $top_srcdir.
+
+Sat Jul 27 23:07:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_to_int): default to_int implementation for every
+	  numeric class.
+
+Sat Jul 27 08:09:03 2002  Booker C. Bense  <bbense@slac.stanford.edu>
+
+	* re.c (rb_reg_quote): initial part of the string was never copied
+	  to the quoted string.
+
+Fri Jul 26 23:03:53 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_eval): no need to convert to string twice.
+
+Fri Jul 26 18:32:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-expr-beg): wrong indent at modifiers
+	  after ?.
+
+Fri Jul 26 16:01:16 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb.in (create_makefile): use Regexp in gsub.
+
+	* sample/mkproto.rb: ditto and fix bug.
+
+Fri Jul 26 14:31:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* random.c: replace with Mersenne Twister RNG.
+
+Fri Jul 26 12:14:48 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y (yylex): modify to accept a code like "m (a){...}".
+
+Thu Jul 25 09:05:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-delimiter): include here document.
+
+	* misc/ruby-mode.el (ruby-deep-arglist): skips spaces after
+	  parenthesis when 'space.
+
+	* misc/ruby-mode.el (ruby-imenu-create-index): fix for nested
+	  classes.
+
+	* misc/ruby-mode.el (ruby-accurate-end-of-block): added.  scan a
+	  block in the order.
+
+	* misc/ruby-mode.el (ruby-expr-beg): support for here document.
+
+	* misc/ruby-mode.el (ruby-parse-partial): splitted from
+	  ruby-parse-region.
+
+	* misc/ruby-mode.el (ruby-move-to-block): skips RD style comments.
+
+Wed Jul 24 09:47:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (jump_tag_but_local_jump): preserve retval in
+	  LocalJumpError exceptions.
+
+	* parse.y (command): no more check for "super outside of method".
+
+	* eval.c (rb_mod_define_method): should set last_class and
+	  last_func in the block->frame.
+
+Mon Jul 22 17:23:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (error_handle): should handle TAG_THROW as well.
+
+Fri Jul 19 10:52:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): new decimal notation '0d4567'.
+
+Thu Jul 18 11:52:02 2002  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (set_socket): new method.
+
+Thu Jul 18 06:51:24 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y (yylex): fix typo.
+
+Wed Jul 17 18:41:28 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): new octal notation '0o777'.
+
+Mon Jul 15 18:36:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (string_content): every string_content node should
+	  return string only.  use NODE_EVSTR to coercing.
+
+	* eval.c (rb_eval): NODE_EVSTR support.
+
+Mon Jul 15 10:35:35 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y (heredoc_identifier): fix typo.
+
+Sat Jul 13 09:30:04 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (literal_concat_string): wrong optimization.
+
+Sat Jul 13 01:25:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/resolv.rb (Resolv::DNS::open, close): new.
+
+	* lib/optparse.rb, lib/optparse: import.
+
+Fri Jul 12 06:34:05 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: rename HTTP.get_uri get_response.
+
+	* lib/net/http.rb: HTTP.get_print accepts URI objects.
+
+	* lib/net/http.rb: HTTP.get had not work with URI objects.
+
+Fri Jul 12 02:15:58 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* string.c (rb_str_match): fix for string match.
+
+Fri Jul 12 00:02:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/stringio/stringio.c (strio_gets_internal): fixed for record
+	  separator longer than 1.
+
+Thu Jul 11 17:59:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_quote): avoid unnecessary string allocation.
+
+	* string.c (get_pat): quote metacharacters before compiling a
+	  string into a regex.
+
+	* string.c (rb_str_split_m): special treatment of strings of size
+	  1, but AWK emulation.  now uses get_pat().
+
+	* string.c (rb_str_match_m): quote metacharacters.
+
+	* string.c (rb_str_match2): ditto.
+
+Thu Jul 11 12:59:23 2002  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/resolv.rb: untaint strings read from /etc/hosts and
+	  /etc/resolv.conf to prevent SecurityError when $SAFE==1.
+
+Thu Jul 11 09:00:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_slice_bang): if there's no corresponding
+	  substring, slice! should return nil without exception.
+
+Tue Jul  9 20:03:55 2002 Keiju Ishitsuka <keiju@ishitsuka.com>
+
+	* irb 0.9
+
+Sat Jul  6 07:35:02 2002  Jamie Herre  <jfh@gettysgroup.com>
+
+	* array.c (rb_ary_insert): type fixed.
+
+Fri Jul  5 09:17:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_split_m): accept separator value nil as well.
+
+Fri Jul  5 08:59:15 2002  Michal Rokos <michal@ruby-lang.org>
+
+	* enum.c: Fix bug in enum_sort_by and some code indents
+
+Fri Jul  5 05:00:40 2002  Wakou Aoyama  <wakou@ruby-lang.org>
+
+	* lib/cgi.rb (CGI#initialize): improvement for mod_ruby.
+	  thanks to Sean Chittenden <sean@ruby-lang.org>, Shugo Maeda
+	  <shugo@modruby.net>
+
+Fri Jul  5 00:10:09 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_become): was leaking memory.
+
+Thu Jul  4 23:43:26 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y: remove useless function str_extend_p().
+
+Wed Jul  3 14:26:40 2002  Sean Chittenden  <sean@ruby-lang.org>
+
+	* lib/net/ftp.rb (get): new method.
+
+	* lib/net/ftp.rb (putt): ditto.
+
+	* lib/net/ftp.rb (binary): ditto.
+
+	* lib/net/ftp.rb (binary=): ditto.
+
+Wed Jul  3 13:57:53 2002  Sean Chittenden  <sean@ruby-lang.org>
+
+	* lib/net/ftp.rb (getbinaryfile): the second argument (localfile)
+	  is now optional.
+
+	* lib/net/ftp.rb (gettextfile): ditto.
+
+Wed Jul  3 13:45:42 2002  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb: use &block and yield for speed.
+
+Wed Jul  3 02:32:31 2002  Wakou Aoyama  <wakou@ruby-lang.org>
+
+	* lib/cgi.rb (CGI#initialize): improvement for mod_ruby.
+
+Tue Jul  2 14:53:10 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_include_module): should not alter other
+	  classes/modules by inclusion.  by this fix, local order may not
+	  be preserved for some cases.
+
+	* class.c (include_class_new): module may be T_ICLASS; retrieve
+	  original module information.
+
+Tue Jul  2 14:13:11 2002  Wakou Aoyama  <wakou@ruby-lang.org>
+
+	* lib/cgi.rb (CGI#header): accept any type as value.
+
+Sun Jun 30 17:05:29 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (seekdir, telldir): add ac_cv_func_telldir=yes,
+	  ac_cv_func_seekdir=yes for MinGW.
+
+Sat Jun 29 01:43:32 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* io.c (pipe_finalize, pipe_popen): two-way pipe support for win32.
+
+	* win32/win32.c (ChildRecord, FindFreeChildSlot): ditto.
+
+	* win32/win32.c, win32/win32.h (pipe_exec): new function for two-way
+	  pipe support for win32.
+
+	* win32/win32.c, win32/win32.h (FindPipedChildSlot, rb_w32_popen,
+	  rb_w32_pclose): removed functions for two-way pipe support for win32.
+
+Fri Jun 28 23:49:34 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* pack.c (pack_unpack): change names of local variables because their
+	  names are overlapped.
+
+Fri Jun 28 17:54:07 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb: fix object address.
+
+Thu Jun 27 23:55:50 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_stat): fix buffer overflow. (ruby-bugs:PR#329)
+
+Thu Jun 27 20:57:45 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/prettyprint.rb, lib/pp.rb: convenience methods added.
+
+Thu Jun 27 15:22:18 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/prettyprint.rb: re-implemented for incremental output to handle
+	  huge data.  API is changed a bit.
+
+	* lib/pp.rb: adapt new pretty printing API.
+
+Thu Jun 27 08:28:18 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (literal_concat_string): non-string last expression in
+	  #{} was ignored when followed by literal.
+
+Thu Jun 27 03:42:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_expr_str): need to process backslashes properly.
+
+Wed Jun 26 17:33:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_any_to_a): declare Object#to_a to be obsolete.
+
+	* object.c (rb_Array): do not convert nil into [] automagically.
+
+Wed Jun 26 15:40:00 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (words, qwords): word list literal rules.
+
+	* parse.y (parse_string): ditto.
+
+	* parse.y (yylex): %W: word list literal with interpolation. [new]
+
+Tue Jun 25 18:53:34 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (string1, xstring, regexp): moved lex_strnest
+	  initialization to string_contents/xstring_contents.
+
+Tue Jun 25 19:24:38 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* dln.c: remove definition rb_loaderror().
+
+Tue Jun 25 00:34:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_Integer): use "to_int" instead of
+	  "to_i". [experimental]
+
+	* object.c (nil_to_f): new method.
+
+	* object.c (rb_Integer): Symbols and nil should cause error.
+
+	* object.c (rb_Float): nil should cause error.
+
+Tue Jun 25 00:21:00 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* dln.c: remark definition rb_loaderror().
+
+Tue Jun 25 00:14:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (string_dvar): allow back references in interpolation.
+
+Mon Jun 24 16:32:31 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_eval): NODE_EVSTR is no longer used.
+
+	* eval.c (eval): not enforce to make assigned variables dynamic.
+
+	* parse.y (string): split rules to strings/xstring/regexp to allow
+	  arbitrary statements inside string interpolation.
+
+	* parse.y (here_document): splitted into three phases.
+
+	* parse.y (literall_append, literal_concat): added.
+	  append/concatenate string literals.
+
+	* sample/test.rb (valid_syntax): adjust line number for BEGIN.
+
+	* lib/mkmf.rb (create_makefile): get rid of nested string.
+
+	* lib/mkmf.rb (install_rb): site-install didn't work properly.
+
+Sun Jun 23 00:19:10 2002  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb, sample/cal.rb, sample/goodfriday.rb:
+	  updated to the new version (based on date2 3.3).
+
+Sat Jun 22 14:41:33 2002  Guy Decoux  <ts@moulon.inra.fr>
+
+	* ext/socket/socket.c (sock_addrinfo): make all 3 versions of
+	  getaddrinfo happy.  [ruby-core:00184]
+
+Fri Jun 21 18:49:58 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): __END__ should not be effective within
+	  string literals.
+
+Thu Jun 20 21:09:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/readline/readline.c (readline_readline): get rid of
+	  libreadline's bug. (ruby-bugs-ja:PR#268)
+
+Thu Jun 20 17:10:27 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/ftool.rb (BUFSIZE): tuning, set buffer length to 8192.
+
+	* configure.in (__NO_ISOCEXT): add for mingw-runtime 2.0-2.
+
+	* configure.in (__MSVCRT__): removed because it is defined
+	  in the GCC specs.
+
+Wed Jun 19 14:46:18 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb, lib/mkmf.rb (xsystem): open the log file if xsystem
+	  is called.
+
+Wed Jun 19 01:01:13 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (here_document): should be aware of __END__ within here
+	  documents.
+
+Wed Jun 19 00:50:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (yylex): ? followed by successive word characters is
+	  ternary operator not numeric literal.
+
+	* parse.y (yylex): commands after break/next/rescue can take
+	  arguments.  (ruby-bugs-ja:PR#265)
+
+Tue Jun 18 19:20:16 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/mkexports.rb: remove unnecessary exports. (ruby-dev:17418)
+
+Tue Jun 18 12:50:17 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (yylex): should pushback proper char after '<<'.
+
+	* parse.y (range_op, cond0, cond): get rid of doubled warnings.
+
+	* parse.y (value_expr): reduce recursion level.
+
+	* parse.y (logop): ditto.
+
+Mon Jun 17 11:11:34 2002  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* string.c (rb_str_crypt): result need not be tainted always.
+
+Mon Jun 17 10:51:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* dln.c (dln_load): need to preserve dln_strerror() result,
+	  calling other dl family can clear it.
+
+Sat Jun 15 22:56:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): obsolete '?<whitespace>'; use '?\s', '?\n',
+	  etc, instead.
+
+Sat Jun 15 18:51:13 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* dir.c (glob_helper): Use lstat() instead of stat() so it catches
+	  a dead symlink.  Given a dead symlink named "a", Dir.glob("?")
+	  did catch it but Dir.glob("a") somehow didn't.
+
+Sat Jun 15 01:59:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): no here document after a dot.
+
+	* parse.y (yylex): should have set lex_state after '`'.
+
+	* parse.y (yylex): should have set lex_state properly after
+	  tOP_ASGN.
+
+Fri Jun 14 21:01:48 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* bcc32/mkexports.rb: insert sleep(1) for win9x.
+
+	* bcc32/configure.bat: change return code LF -> CRLF for win9x.
+
+	* win32/win32.c: fix rb_w32_open_osfhandle()
+
+Fri Jun 14 15:22:19 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (read_escape): deny zero-width hexadecimal character.
+	  (ruby-bugs-ja:PR#260)
+
+	* parse.y (tokadd_escape): ditto.
+
+	* regex.c (re_compile_pattern): ditto.
+
+Fri Jun 14 00:49:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big2dbl): return canonical HUGE_VAL for infinity.
+
+Thu Jun 13 09:43:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (svalue_to_avalue): v may be Qundef.  This fix was
+	  suggested by Guy Decoux.
+
+Thu Jun 13 00:33:49 2002  takuma ozawa  <metal@mine.ne.jp>
+
+	* hash.c (rb_hash_s_create): use rb_hash_aset() instead of calling
+	  st_insert() directly, to dup&freeze string keys.
+
+Thu Jun 13 00:12:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): proper error message for "@@0".
+
+	* parse.y (yylex): paren to parse_string() must be zero for
+	  unparenthesized strings.
+
+	* parse.y (str_extend): broken string when unterminated "#{".
+
+	* enum.c (enum_sort_by): had a bug in 1 element enumeration.
+
+Wed Jun 12 18:04:44 2002  akira yamada  <akira@arika.org>
+
+	* uri/common.rb (REGEXP::PATTERN::X_ABS_URI): 'file:/foo' is valid.
+
+	* uri/generic.rb (Generic#xxx=): should return substituted value.
+	  (ruby-dev:16728.)
+
+	* test/generic.rb (test_set_component): added tests for the above
+	  change.
+
+Wed Jun 12 02:38:00 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (stmt): fix typo.
+
+Wed Jun 12 01:10:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): 'do' should return kDO_BLOCK on EXPR_ENDARG.
+
+	* parse.y (singleton): "def (()).a end" dumped core.
+
+	* parse.y (range_op): node may be null.
+
+	* parse.y (match_gen): ditto.
+
+Tue Jun 11 19:20:34 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (LIBRUBY): rename to lib$(LIBRUBY_SO).a on Cygwin/MinGW.
+
+	* configure.in, cygwin/GNUmakefile: use dllwrap when --disable-shared
+	  is specified.
+
+Tue Jun 11 17:12:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): void value check for "..", "...", "!", and "not".
+
+	* parse.y (match_gen): void value check for "=~".
+
+	* parse.y (value_expr): check NODE_AND and NODE_OR recursively.
+
+	* parse.y (cond0): void value check added for conditionals.
+
+Tue Jun 11 13:18:47 2002  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (noop): new method.
+
+	* lib/net/ftp.rb (site): ditto.
+
+Tue Jun 11 13:15:41 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* bcc32/Makefile.sub: set PROCESSOR_LEVEL to 6 if it's too big value.
+
+	* win32/Makefile.sub: ditto.
+
+Tue Jun 11 12:37:46 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* bcc32/configure.bat fix.
+
+Tue Jun 11 10:18:23 2002  KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+	* new platform [bccwin32] merged.
+	  - create new folder bcc32
+	  - modify any files for bccwin32
+	      error.c, file.c, hash.c, io.c, instruby.rb,
+	      ext/extmk.rb.in,
+	      lib/mkmf.rb, lib/ftools.rb,
+	      ext/digest/defs.h,
+	      ext/dl/depend, ext/dl/dl.c, ext/dl/sym.c, ext/dl/extconf.rb,
+	      ext/socket/extconf.rb,
+	      ext/pty/extconf.rb,
+	      ext/tcltklib/extconf.rb
+	      ext/Win32API/Win32API.c,
+	      win32/dir.h, win32/win32.c, win32/win32.h, win32/resource.rb
+
+Mon Jun 10 19:02:19 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* numeric.c (fix_lshift): negative shift count means right shift.
+	  (ruby-bugs-ja:PR#248)
+
+	* numeric.c (fix_rshift): return -1 when left side operand is
+	  negative. (ruby-bugs-ja:PR#247)
+
+	* parse.y (yylex): `0_' should be an error. (ruby-bugs-ja:PR#249)
+
+Mon Jun 10 01:53:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): ruby_frame->last_func may be null, if it's
+	  called outside of a method.
+
+	* parse.y (arg): use INT2NUM, not INT2FIX for tUMINUS.
+
+	* parse.y (arg): unnecessary negative tPOW treatment.
+
+	* parse.y (tokadd_escape): wrong backslash escapement.
+
+Sun Jun  9 17:40:41 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* ext/dl: change the callback mechanism.
+
+Sat Jun  8 00:48:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (stmt,arg): too much void value check.
+
+	* parse.y (stmt,arg): need to check void value on rules which does
+	  not use node_assign().
+
+Thu Jun  6 19:50:39 2002  KONISHI Hiromasa <H_Konishi@ruby-lang.org>
+
+	* sample/biorhythm.rb (getPosiiton,etc)
+	  fix at changing Date module ( Date is changed Fixnum to Rational )
+
+Thu Jun  6 17:42:39 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (ipaddr): need not to taint hostnames.
+
+Thu Jun  6 12:04:30 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): use sub! instead of []= because
+	  []= causes exception.
+
+Thu Jun  6 11:42:15 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/thread.rb (Queue::pop): get rid of race condition.
+
+Wed Jun  5 01:56:47 2002  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: Stop the running zombi-eventloop when
+	  mainloop_watchdog is killed.
+
+Tue Jun  4 23:09:24 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_include): should be based on "<=>", whereas
+	  member? still is based on "each".
+
+	* range.c (range_min,range_max): redefine methods based on "<=>".
+
+Tue Jun  4 18:28:37 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/socket/extconf.rb: The IPv6 stack of Cygwin is still incomplete.
+
+	* ext/Win32API/extconf.rb: refactoring.
+
+Tue Jun  4 07:03:33 2002  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkfont.rb:  Fix bugs on TkFont.init_widget_font for Tk8.x.
+
+	* ext/tk/lib/tkafter.rb: Add self to 1st argument of interval- 
+	  and loop-proc
+	  TkAfter#current_interval returns an interval (sleep) time value
+	  TkAfter#current_args returns an array of arguments
+	  TkAfter#return_value returns a return value of last loop-proc
+
+	* ext/tk/lib/tk*.rb: Allow to use Symbols for parameters.
+
+	* ext/tk/lib/tkcanvas.rb: (TkcItem) Add 'coords' parameter to the 
+	  canvas item constructor (for new notation of constructor).
+
+	* ext/tcltklib/tcltklib.c: New 'mainloop' and 'mainloop_watchdog'.
+
+	* ext/tk/lib/tk.rb: (Tk.restart) Add 'app-name' paramater and
+	  'use' parameter.
+
+	* ext/tk/lib/tk.rb: Add new parameter 'widgetname' to the widget
+	  constructor to support effective use of Resource Database. 
+
+	* ext/tk/lib/tk.rb: TkOption::get always returns a tainted string.
+
+Tue Jun  4 00:45:50 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/socket/addrinfo.h: typo.
+
+	* ext/socket/getaddrinfo.c (gai_strerror): make literals const.
+
+	* ext/socket/socket.c (init_inetsock): ensures resources are
+	  freed at exceptions.
+
+	* ext/socket/socket.c (init_unixsock): ditto.
+
+	* ext/socket/socket.c (udp_connect): ditto.
+
+Mon Jun  3 20:39:51 2002  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/extconf.rb : change PLATFORM with RUBY_PLATFORM.
+
+Mon Jun  3 07:07:07 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (here_document): check if identifier is terminated.
+	  (ruby-bugs-ja:PR#239)
+
+	* parse.y (yylex): should pushback proper char after '**'.
+	  (ruby-bugs-ja:PR#240)
+
+Mon Jun  3 05:56:17 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_aset): should raise error if an indexing string
+	  is not found in the receiver.
+
+	* sprintf.c (rb_f_sprintf): "%d" should convert objects into
+	  integers using Integer().
+
+Sat Jun  1 19:20:07 2002  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole: merge from rough.
+
+Fri May 31 17:11:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile::size): added.
+
+Thu May 30 12:52:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_step): iteration done using "+" if elements are
+	  Numeric.  Otherwise using "succ".
+
+	* range.c (range_each): iteration done using "succ".  If the
+	  elements does not respond to "succ", raise TypeError.  As a
+	  result, all Enumerable methods, e.g. collect, require elements
+	  to respond to "succ".
+
+	* range.c (range_member): comparison done using "each", if
+	  elements are non-Numeric or no-"succ" objects.  Otherwise
+	  compare using "<=>".
+
+	* range.c (Init_Range): remove "size" and "length".
+
+Thu May 30 09:16:36 2002  Wakou Aoyama  <wakou@ruby-lang.org>
+
+	* lib/cgi.rb: if StringIO is usable then use it.
+
+Wed May 29 18:55:47 2002  KONISHI Hiromasa <H_Konishi@ruby-lang.org>
+
+	* function renames my* and win32_* to rb_w32_* in win32/win32.c
+	  fixed files win32/win32.c, win32/win32.h, win32/dir.h,
+	              hash.c, rubysig.h, signal.c, ext/socket/socket.c
+
+Wed May 29 17:32:55 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* time.c (tmcmp, search_time_t): activate unless HAVE_TIMEGM.
+
+Wed May 29 13:45:15 2002  Wakou Aoyama  <wakou@ruby-lang.org>
+
+	* lib/cgi.rb: not use const if GET, HEAD. check multipart form head.
+
+Tue May 28 17:56:02 2002  Sean Chittenden  <sean@ruby-lang.org>
+
+	* parse.y: yyparse #defines moved from intern.h
+
+	* ruby.c (proc_options): access prefixed "ruby_yydebug".
+
+	* applied modifies to pacify some of gcc -Wall warnings.
+
+Tue May 28 14:07:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): no more ugly hack for "**", so that "-2**2" to be
+	  parsed as "(-2)**2", whereas "- 2**2" or "-(2)**2" to be parsed
+	  as "-(2**2)".
+
+	* parse.y (yylex): '-2' to be literal fixnum. [new]
+
+Tue May 28 12:13:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (scope_node): trick to keep the node has a scope.
+
+	* eval.c (rb_eval): NODE_EVSTR: write back local_tbl to the node.
+
+	* eval.c (rb_eval): NODE_SCOPE: hold the scope node in ruby_scope.
+
+	* eval.c (module_setup): ditto.
+
+	* eval.c (rb_call0): ditto.
+
+	* node.h (NEW_DASGN, NEW_DASGN_CURR): remove surplus semicolons.
+
+Fri May 24 09:06:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_arg): nil test against v[6] (usec).
+
+Thu May 23 16:39:21 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ruby.c (proc_options): option parsing problem.
+	  (ruby-bugs-ja:PR#233)
+
+Thu May 23 09:13:56 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): removed "-*-" support for #! line.
+
+	* io.c (rb_io_s_sysopen): new method to get a raw file
+	  descriptor. [new]
+
+	* ext/socket/socket.c (tcp_sysaccept): new method to return an
+	  accepted socket fd (integer). [new]
+
+	* ext/socket/socket.c (unix_sysaccept,sock_sysaccept): ditto.
+
+Wed May 22 21:26:47 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ruby.c (proc_options): -T consumes digits only.
+
+Wed May 22 20:18:31 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: need not link vsnprintf.o on MinGW.
+
+Wed May 22 18:34:23 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y (yylex): Here-document label ate '-'.
+
+Tue May 21 13:25:18 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-font-lock-keywords): symbols end with
+	  '_'.
+
+Tue May 21 04:48:37 2002  Sean Chittenden <sean@chittenden.org>
+
+	* lib/cgi-lib.rb: Checking for constant MOD_RUBY instead of
+	  environment variable. Remove a mod_ruby warning and use
+	  Apache::request.headers_out[] instead.
+
+Tue May 21 01:16:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (bodystmt): ensure clause was executed on else clause
+	  without rescue clause.
+
+Tue May 21 00:20:25 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* ext/dl/ptr.c: rename PtrData::alloc to PtrData::malloc.
+
+	* ext/dl/lib/dl/struct.c: rename Struct#alloc to Struct#malloc.
+
+Mon May 20 14:29:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (Init_Object): should do exact match for Module#==.
+
+	* compar.c (cmp_eq): returns 'false' if <=> returns 'nil'.
+
+	* compar.c (cmp_gt,cmp_ge,cmp_lt,cmp_le,cmp_between): ditto.
+
+Mon May 20 13:28:52 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* io.c (rb_io_clone): writing stream was not copied properly.
+
+Sat May 18 21:38:11 2002  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* lib/date.rb, lib/date/format.rb, lib/parsedate.rb:
+	  updated to the new version (based on date2 3.2.1).
+
+Sat May 18 21:18:00 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): add VC++4/5 support about noreturn
+	  directive.
+
+Sat May 18 02:16:41 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): should propagate taintedness.
+
+	* pack.c (pack_unpack): ditto.
+
+Fri May 17 16:16:19 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* sample/test.rb: use eval instead of './miniruby -c',
+	  in order to check a syntax error.
+
+Thu May 16 14:46:34 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_thread_select): cleanup conditional compilation.
+
+Wed May 15 06:13:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_schedule): need to preserve errno before
+	  calling rb_trap_exec().
+
+	* regex.c (calculate_must_string): a bug in charset/charset_not
+	  parsing.
+
+Tue May 14 18:17:44 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* win32/Makefile.sub: config.h inlined.  and catch up with the
+	  latest change.
+
+	* win32/config.h.in: no longer used.
+
+Tue May 14 14:49:05 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* gc.c (is_pointer_to_heap): avoid GCC 3.1 warnings.
+
+	* missing/strftime.c (timezone): it should take no argument on Cygwin.
+
+Tue May 14 03:07:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_clear_cache_by_class): new function.
+
+	* eval.c (set_method_visibility): should have clear cache for
+	  updated visibility.
+
+Mon May 13 14:38:33 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* djgpp/config.hin, djgpp/config.sed: catch up with the latest change.
+
+Mon May 13 01:59:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flo_to_s): default format precision to be "%.16g".
+
+	* util.c (ruby_strtod): use own strtod(3) implementation to avoid
+	  locale hell.  Due to this change "0xff".to_f no longer returns 255.0
+
+Sun May 12 03:01:08 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* missing.h: add for missing/*.c.
+
+	* ruby.h: add `#include "missing.h"'.
+
+	* Makefile.in: add the dependency of missing.h by gcc -MM.
+
+	* MANIFEST: add missing.h
+
+Sat May 11 23:24:52 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* ext/dl: enable dl's stack emulation for constructing function call.
+
+Sat May 11 10:52:09 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* dir.c (glob_helper): remove escaping backslashes.
+
+Sat May 11 02:46:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (avalue_to_yvalue): new function to distinguish yvalue
+	  (no-arg == Qundef) from svalue (no-arg == Qnil).
+
+	* eval.c (rb_yield_0): use avalue_to_yvalue().
+
+	* eval.c (assign): warn if val == Qundef where it means rhs is
+	  void (e.g. yield without value or call without argument).
+
+Fri May 10 19:00:47 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (here_document): preserve line number begins here
+	  document.
+
+Fri May 10 01:55:44 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_thread_join): added an argument to limit time to wait
+	  the thread.
+
+	* eval.c (rb_thread_join_m): new. and added optional argument.
+
+Wed May  8 23:48:40 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (value_expr): need not to warn for WHILE and UNTIL,
+	  since they can have return value (via valued break).
+
+Tue May  7 17:13:40 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: forgot to add '-Wl,' to the gcc option on Cygwin/MinGW.
+
+Tue May  7 15:41:33 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/iconv/iconv.c (iconv_try): should initialize exceptions
+	  properly. (ruby-bugs-ja:PR#232)
+
+Tue May  7 15:28:03 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (rb_yield_0): The destination of the goto jump was wrong.
+
+Tue May  7 09:17:51 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (superclass): undesirable "unexpected return" when the
+	  superclass is not a Class.
+
+Sun May  5 06:53:45 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb: exclude topdir from the system configuration
+	  section and prevent it from being overridden.
+
+Fri May  3 20:19:00 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: add #include <errno.h> in AC_CHECK_DECLS().
+
+	* win32/config.h.in: define HAVE_DECL_SYS_NERR.
+
+Thu May  2 23:42:40 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_s_quote): # also should be quoted.
+
+Thu May  2 18:27:13 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb.in, lib/mkmf.rb: use 'do...end' instead of '{}' for
+	  Borland make.
+
+Thu May  2 08:01:56 2002  Chris Thomas  <kenshin@apple.com>
+
+	* error.c: use HAVE_DECL_SYS_NERR instead of platform names.
+
+Tue Apr 30 09:23:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_step): better iteration condition for float
+	  values;  suggested by Masahiro TANAKA <masa@ir.isas.ac.jp>.
+
+Tue Apr 30 05:59:42 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
+
+	* range.c (range_step): step (for Range#step method) <= 0 makes no
+	  sense, thus ArgError will be raised.
+
+	* range.c (range_each): Range#each method is special case for
+	  Range#step(1)
+
+Mon Apr 29 18:46:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_find_file): load must be done from an absolute path if
+	  $SAFE >= 4.
+
+Sun Apr 28 17:01:56 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.c (insert): fix prototype for ANSI C.
+
+Fri Apr 26 13:47:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_partition): new method. [new]
+
+Fri Apr 26 13:41:00 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_s_quote): quote whitespaces for /x cases.
+
+Fri Apr 26 06:48:23 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* ext/dl/ptr.c (cary2ary): missing break in switch statements.
+
+Fri Apr 26 09:35:47 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_proc_new): make Proc from C function. [new]
+
+	* intern.h (rb_proc_new): prototype.
+
+Wed Apr 24 14:56:46 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (proc_to_proc): return self. [new]
+
+	* eval.c (block_pass): no need to convert if block is Proc.
+
+Wed Apr 24 14:21:41 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: set size of the initial stack from
+	  2MB to 32MB on MinGW/Cygwin.
+
+Wed Apr 24 14:06:35 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_step): try to reduce residual on Float operations.
+
+Wed Apr 24 06:48:31 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* io.c (rb_io_mode_flags): both 'r+b' and 'rb+' should be allowed.
+
+	* io.c (rb_io_mode_modenum): ditto.
+
+Wed Apr 24 01:16:14 2002  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_mark): must check if ptr is NULL
+	  first.  [ruby-talk:38873]
+
+	* lib/mkmf.rb (create_makefile): should print depend file when
+	  make is other than nmake.
+
+Wed Apr 24 00:37:12 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/extmk.rb.in (create_makefile): use `{$(srcdir)}' directive instead
+	  of `$(srcdir)/' when including depend file.
+
+	* lib/mkmf.rb (create_makefile): add `{$(srcdir)}' when including depend
+	  file.
+
+Tue Apr 23 12:58:18 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_memerror): rename from mem_error, and exported.
+
+	* gc.c (Init_GC): pre-allocate NoMemoryError instance.
+
+	* object.c (convert_type): error message changed from "failed to
+	  convert" to "cannot convert", since it does not try to convert
+	  if an object does not respond to the converting method.
+
+Mon Apr 22 09:31:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (block_pass): convert Method to Proc using
+	  rb_check_convert_type().
+
+	* object.c (rb_check_convert_type): always convert T_DATA
+
+	* eval.c (rb_thread_cleanup): should not terminate main_thread by
+	  Fatal error.
+
+	* regex.c (is_in_list): need to not exclude NUL and NEWLINE.
+
+Sat Apr 20 00:19:13 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_expr_str): wrong backslash escapement.
+
+	* re.c (rb_reg_expr_str): do not escape embedded space
+	  characters.
+
+Fri Apr 19 22:03:40 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/Makefile.sub: add -DNT to $CFLAGS instead of $CPPFLAGS.
+
+	* win32/setup.mak: ditto.
+
+Fri Apr 19 17:24:22 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): T_DATA process patch from Joel VanderWerf
+	  <vjoel@PATH.Berkeley.EDU>.  This is temporary hack; it remains
+	  undocumented, and it will be removed when marshaling is
+	  re-designed.
+
+	* marshal.c (r_object): ditto.
+
+Fri Apr 19 17:10:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_step): Integer#step is moved to Numeric#step;
+	  Fixnum#step is merged into this method.
+
+	* numeric.c (int_dotimes): Fixnum#times is merged.
+
+	* numeric.c (int_upto): Fixnum#upto is merged.
+
+	* numeric.c (int_downto): Fixnum#downto is merged.
+
+Fri Apr 19 16:22:55 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/socket/extconf.rb: include <windows.h>, <winsock.h> on _WIN32.
+
+	* win32/win32.c: include <mswsock.h> on __MINGW32__.
+
+	* configure.in: cleanup for autoconf 2.5x.
+
+	* configure.in: use gcc -shared instead of dllwrap on Cygwin/MinGW.
+
+	* ext/extmk.rb, lib/mkmf.rb: get rid of "--def=".
+
+Fri Apr 19 14:57:44 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* re.c (rb_reg_to_s): remove redundant shy group.
+
+Fri Apr 19 01:08:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_cleanup): current thread may be THREAD_STOPPED,
+	  for example when terminated from signal handler.
+
+Thu Apr 18 19:03:15 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): remove /p support.
+
+	* regex.h: ditto.
+
+	* parse.y (parse_regx): ditto.
+
+Thu Apr 18 17:01:43 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* ext/dl/ptr.c (rb_dlptr_cast): removed.
+
+Thu Apr 18 17:01:43 2002  Tanaka Akira  <akr@m17n.org>
+
+	* re.c (rb_reg_to_s): new function for Regexp#to_s.
+
+Wed Apr 17 23:55:34 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/Setup*, ext/bigfloat/*: Back out the import of BigFloat in
+	  favor of its forthcoming successor, BigDecimal.
+
+Wed Apr 17 16:53:33 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_expr_str): should treat backslash specially in
+	  escaping.
+
+Wed Apr 17 08:16:41 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
+
+	* io.c: complete off_t handling; missing argument for
+	  fptr_finalize(); polished rb_scan_args call.
+
+Wed Apr 17 00:01:59 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
+
+	* dir.c: wrap multi-statement macro by do { } while (0)
+
+	* eval.c, numeric,c, sprintf.c, util.c: ditto.
+
+Tue Apr 16 08:59:50 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (assign): convert mrhs to mvalue.
+
+Mon Apr 15 18:12:57 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_eq): check `y == x' if y is neither Fixnum,
+	  Bignum, nor Float.
+
+Mon Apr 15 09:27:31 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_unpack): should treat 'U' in character unit, not in
+	  byte unit.
+
+	* error.c (exc_initialize): should clear backtrace information.
+
+Sat Apr 13 23:42:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_fptr_cleanup): should close IO created by IO.new(fd).
+
+	* rubyio.h: remove FMODE_FDOPEN
+
+Fri Apr 12 12:54:04 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* win32/Makefile.sub: use missing/acosh.c.
+
+	* win32/config.h.in: define HAVE_COSH, HAVE_SINH, and HAVE_TANH.
+
+Fri Apr 12 02:58:55 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* struct.c (rb_struct_select): fix typo.
+
+Fri Apr 12 00:34:17 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* MANIFEST (missing/acosh.c): added.
+
+	* Makefile.in (missing/acosh.c): ditto.
+
+	* Makefile.in (missing/fileblocks.c): ditto.
+
+	* configure.in (AC_REPLACE_FUNCS): check acosh() on behalf of
+	  inverse hyperbolic functions, asinh() and atanh().
+
+	* missing/acosh.c: added for acosh(), asinh() and atanh().
+
+Thu Apr 11 20:01:44 2002  Masahiro Tomita  <tommy@tmtm.org>
+
+	* io.c (io_write): check error if written data is less than
+	  specified size to detect EPIPE.
+
+Thu Apr 11 19:10:37 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (remain_size): IO#read returns "" if file.size == 0.
+
+	* random.c (rand_init): add check for initstate(3).
+
+	* configure.in: ditto.
+
+Thu Apr 11 09:31:19 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* ext/dl/ptr.c: raise() -> rb_raise(). (Thanks Tetsuya Watanabe)
+
+	* ext/dl/sym.c: ditto.
+
+Thu Apr 11 07:57:48 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
+
+	* eval.c (assign): ruby_verbose should be surrounded by RTEST().
+
+	* object.c (rb_str2cstr): ditto.
+
+	* parse.y (void_expr): ditto.
+
+	* parse.y (void_stmts): ditto.
+
+	* variable.c (rb_ivar_get): ditto.
+
+	* variable.c (rb_cvar_set): ditto.
+
+	* variable.c (rb_cvar_get): ditto.
+
+Thu Apr 11 07:02:31 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* ext/dl: Add dl.txt instead of README and README.html.
+
+Thu Apr 11 01:55:52 2002  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi/session.rb: support for multipart form.
+
+Wed Apr 10 18:42:23 2002  Tachino Nobuhiro <tachino@jp.fujitsu.com>
+
+	* dir.c (glob_helper): should have proceed link when link->path
+	  was non existing symbolic link.
+
+Wed Apr 10 17:30:19 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_obj_remove_instance_variable): raise NameError if
+	  specified instance variable is not defined.
+
+	* variable.c (generic_ivar_remove): modified to check ivar
+	  existence.
+
+Wed Apr 10 14:16:45 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* misc/ruby-mode.el (ruby-font-lock-keywords): fontify symbols for
+	  unary operators and aset.
+
+Tue Apr  9 13:40:31 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* lib/mkmf.rb (try_link0): need expand macro in command, sync with
+	  ext/extmk.rb.in.
+
+	* lib/mkmf.rb (try_cpp): ditto.
+
+	* lib/mkmf.rb (egrep_cpp): ditto.
+
+Tue Apr  9 12:44:59 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/stringio/stringio.c (check_modifiable): performance
+	  improvement.  avoid calling rb_str_modify() twice.
+
+	* ext/stringio/stringio.c (strio_ungetc): ditto.
+
+	* ext/stringio/stringio.c (strio_putc): ditto.
+
+	* ext/stringio/stringio.c (strio_write): ditto, and use
+	  rb_str_cat() as possible.
+
+Tue Apr  9 05:17:48 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* re.c (match_select): fix index references and make
+	  MatchData#select actually work.
+
+Tue Apr  9 00:20:52 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_file_s_extname): new method based on the proposal
+	  (and patch) from Mike Hall. [new]
+
+Mon Apr  8 04:50:51 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (error_handle): default to 1 unless status is set.
+
+	* eval.c (ruby_options): guard error_handle() with PROT_NONE.
+
+	* eval.c (ruby_stop): ditto.
+
+Mon Apr  8 01:22:24 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* math.c (math_acosh): added. [new]
+
+	* math.c (math_asinh): ditto.
+
+	* math.c (math_atanh): ditto.
+
+	* struct.c (rb_struct_each_pair): method added. [new]
+
+Sat Apr  6 02:04:49 2002  Guy Decoux  <ts@moulon.inra.fr>
+
+	* class.c (rb_singleton_class): wrong condition; was creating
+	  unnecessary singleton class.
+
+Sat Apr  6 01:09:41 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (remove_sign_bits): simplifies the condition.
+
+	* bignum.c (get2comp): calculate proper carry over.
+
+Fri Apr  5 05:07:28 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* ext/dl: Add dl/struct.rb.
+
+Thu Apr  4 14:08:52 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* ext/dl/lib/dl/import.rb: Get rid of ineffective
+	  encoding/decoding procedures.
+
+Thu Apr  4 01:08:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (int_step): step may be a float less than 1.
+
+Wed Apr  3 20:42:34 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* ext/dl: Merge Nakada's patch.
+
+	* ext/dl/dl.h: define StringValuePtr for ruby-1.6.
+
+Wed Apr  3 15:37:24 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* ext/dl: Add dl/types.rb.
+
+Wed Apr  3 01:54:10 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/extmk.rb.in (enable_config): follow lib/mkmf.rb.
+
+Tue Apr  2 19:59:13 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* ext/dl: Merge from rough.
+
+Tue Apr  2 15:17:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* Makefile.in (CPPFLAGS): remove @includedir@.
+
+	* lib/mkmf.rb (create_makefile): ditto.
+
+	* ext/extmk.rb.in (create_makefile): ditto.
+
+Tue Apr  2 15:09:05 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_addrinfo): should clear addrinfo hints.
+
+Mon Apr  1 23:48:12 2002  Takaaki Tateishi <ttate@kt.jaist.ac.jp>
+
+	* lib/mkmf.rb: install any files using $INSTALLFILES.
+	  (see also [ruby-dev:16683])
+
+Mon Apr  1 17:25:50 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_fptr_cleanup): need flush even when io will not be
+	  closed.
+
+	* io.c (rb_io_initialize): was calling wrong function
+	  rb_io_mode_flags().
+
+Mon Apr  1 16:52:00 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/sdbm/init.c (each_pair): moved prototype before the
+	  definition.
+
+	* ext/racc/cparse/cparse.c (call_scaniter): ditto.
+
+Mon Apr  1 15:11:40 2002  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/racc/cparse/cparse.c: prototype; call_scaniter().
+
+	* ext/sdbm/init.c: prototype; each_pair().
+
+	* ext/tcltklib/tcltklib.c: prototypes; _timer_for_tcl() and ip_ruby(),
+	  Nobu's patch at [ruby-dev:14483].
+
+Mon Apr  1 10:56:40 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (match_setter): it's OK to assign nil to $~.
+
+Mon Apr  1 03:55:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_fptr_cleanup): do not close IO created by for_fd().
+
+	* io.c (rb_io_initialize): mark IO created by for_fd
+
+	* ext/socket/socket.c (bsock_s_for_fd): ditto.
+
+Fri Mar 29 20:21:58 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* lib/mkmf.rb (create_makefile): default FLAGS to empty strings.
+
+Fri Mar 29 16:36:52 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* lib/mkmf.rb (arg_config): should use Shellwords::shellwords like
+	  ext/extmk.rb.in.
+
+	* lib/mkmf.rb (enable_config): default had priority over command
+	  line options and configure_args.
+
+	* lib/mkmf.rb: support autoconf 2.53 style variables from
+	  environment.
+
+	* lib/mkmf.rb: add directory options.
+
+Fri Mar 29 15:49:29 2002  Usaku Nakamura <usa@ruby-lang.org>
+
+	* win32/README.win32: follow recent changes.
+
+Fri Mar 29 14:44:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_fflush): DRY patch from /Christoph applied.
+
+Thu Mar 28 18:58:13 2002  Usaku Nakamura <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): reflect user defined $CC in
+	  config.status.
+
+Thu Mar 28 18:03:51 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/strscan.c: add taint check.
+
+	* ext/strscan/strscan.c: #getch/#get_byte should set regexp
+	  registers.
+
+	* ext/strscan/strscan.c: remove useless #include directive.
+
+	* ext/strscan/strscan.c: refactor struct strscanner.
+
+Thu Mar 28 14:51:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_addrinfo): should specify socktype
+	  from outside.
+
+Wed Mar 27 17:04:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_binmode): should call next_argv() to initialize ARGF.
+
+	* io.c (argf_filename): ditto.
+
+	* io.c (argf_file): ditto.
+
+Wed Mar 27 14:47:32 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (READ_DATA_PENDING): configure.in has supported for uClibc,
+	  so remove uClibc stuff.
+
+Wed Mar 27 13:14:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_sysseek): new method based on a patch from Aristarkh
+	  A Zagorodnikov <xm@bolotov-team.ru>. [new]
+
+	* io.c (READ_DATA_PENDING): use !feof(fp) for default behavior.
+
+Tue Mar 26 20:28:50 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: HTTP.get accepts URI.
+
+	* lib/net/http.rb: new method HTTP.get_uri.
+
+	* lib/net/http.rb: add some HTTP 1.1 response codes.
+
+Tue Mar 26 20:25:28 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* doc/net/protocol.rd.ja, smtp.rd.ja, pop.rd.ja: removed.
+
+	* MANIFEST: remove doc/net/* entries.
+
+Tue Mar 26 18:45:15 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (FILE_READPTR): check bufread instead of bufend
+	  for uClibc.
+
+	* ext/extmk.rb.in (arg_config): should use Shellwords::shellwords.
+
+Tue Mar 26 01:56:33 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (primary): while/until statement modifiers to "begin"
+	  statement now work as "do .. while" even when begin statement
+	  has "rescue" or "ensure" [new].
+
+	* parse.y (bodystmt): rescue/ensure is allowed at every bodies,
+	  i.e. method bodies, begin bodies, class bodies[new], and module
+	  bodies[new].
+
+Mon Mar 25 22:10:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_addrinfo): should specify ai_socktype
+	  for getaddrinfo hints.
+
+Mon Mar 25 17:18:48 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* dir.c (rb_push_glob): local variable 'maxnest' was
+	  uninitialized.
+
+Mon Mar 25 16:53:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_abort): embed aborting message into exception
+	  object [new].
+
+	* eval.c (terminate_process): utility function for exit and abort.
+
+Tue Mar 26 14:04:47 2002  okabe katsuyuki <HGC02147@nifty.ne.jp>
+
+	* win32/mkexports.rb: support VC++.NET.
+
+Tue Mar 26 14:00:17 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/bigfloat/bigfloat.c: Fix the initializer's function name
+	  according to the new library name. (pointed out by nobu)
+
+Tue Mar 26 11:12:01 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: new file.
+
+Tue Mar 26 03:23:50 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (pp): return nil like p.
+
+Tue Mar 26 01:48:01 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/bigfloat/extconf.rb: Downcase the library name. (BigFloat.so
+	  -> bigfloat.so)
+
+	* ext/bigfloat/bigfloat.c (BigFloat_inspect): Alter the inspect
+	  format not to look like an array. (pointed out by akr)
+
+	* ext/bigfloat/bigfloat.c (BigFloat_hash): Implement BigFloat#hash.
+
+	* ext/bigfloat/bigfloat.c (BigFloat_dump, BigFloat_load):
+	  Support marshaling.
+
+Tue Mar 26 00:38:11 2002  Tanaka Akira  <akr@m17n.org>
+
+	* configure.in (FILE_READPTR): check _p for 4.4BSD.
+
+Mon Mar 25 23:39:25 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* configure.in (FILE_READPTR): new.  for IO#gets improvement.
+
+	* io.c (READ_DATA_PENDING_PTR): ditto.
+
+	* io.c (remain_size): separated from read_all().
+
+	* io.c (read_all): argument changed.
+
+	* io.c (appendline): new.  get a line and append to string.
+
+	* io.c (swallow): new.  swallow continuous line delimiters.
+
+	* io.c (rb_io_getline_fast): add delimiter argument.
+
+	* io.c (rb_io_getline): performance improvement.
+
+Mon Mar 25 19:30:25 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb.in (arg_config): get rid of single quotes
+	  for autoconf 2.53.
+
+Mon Mar 25 17:49:41 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* regex.c (mbc_startpos_func): VC6 seems to be unable to
+	  understand forward declaration for static variables.
+
+	* dir.c (rb_push_glob): local variable 'maxnest' was
+	  uninitialized.
+
+Mon Mar 25 13:24:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (bsock_do_not_rev_lookup_set): should not be
+	  allowed when $SAFE > 3.
+
+	* eval.c (rb_thread_ready): THREAD_TO_KILL threads should not turn
+	  into THREAD_RUNNABLE on wakeup.
+
+	* eval.c (rb_thread_list): THREAD_TO_KILL threads should be in the
+	  list.
+
+	* eval.c (thgroup_list): ditto; by moving gid clearance from
+	  rb_thread_cleanup().
+
+Mon Mar 25 11:06:19 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* dln.c (dln_argv0): unused unless USE_DLN_A_OUT.
+
+	* regex.c (mbc_startpos_func): should be static.
+
+Sun Mar 24 12:19:09 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* dir.c (fnmatch): "*/bar" (with FNM_PATHNAME flag) does not
+	  match "foo/bar".
+
+Sun Mar 24 00:46:05 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* util.c (push_element): avoid warning for djgpp.
+
+Sat Mar 23 01:50:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (read_all): files on /proc filesystem with zero stat size,
+	  may have contents.
+
+Fri Mar 22 18:07:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (tcp_s_gethostbyname): refactored.
+
+	* ext/socket/socket.c (sock_s_gethostbyname): ditto.
+
+Fri Mar 22 16:46:54 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/extmk.rb.in: replace mkdir with mkpath to compile racc/cparse.
+
+Fri Mar 22 16:22:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* the VMS support patch submitted by Akiyoshi, Masamichi
+	  <Masamichi.Akiyoshi@jp.compaq.com> is merged.
+
+Fri Mar 22 16:27:24 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/racc/parser.rb: new file.
+
+	* ext/racc/MANIFEST, cparse.c, depend, extconf.rb: new files.
+
+	* lib/README: add racc/parser.rb.
+
+	* ext/Setup*: add racc/cparse.
+
+Fri Mar 22 15:04:03 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (exec_under): changing ruby_class is OK, but should not
+	  alter cbase.
+
+	* eval.c (yield_under_i): ditto.
+
+Fri Mar 22 15:44:38 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* ext/strscan/MANIFEST, strscan.c, depend, extconf.rb: new files.
+
+	* ext/Setup*: add strscan entry.
+
+Fri Mar 22 14:32:14 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb: Protocol#start should return self.
+
+Fri Mar 22 14:14:21 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/resolv.rb: fix arguments to create exceptions.
+	  Patch from matt@lickey.com.  (ruby-bugs:PR#278)
+
+Fri Mar 22 13:51:11 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/bigfloat/.cvsignore, ext/bigfloat/MANIFEST: BigFloat 1.1.8
+	  has been imported.  Add .cvsignore and MANIFEST.
+
+Fri Mar 22 04:07:55 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* sprintf.c (rb_f_printf): discard meaningless prefix ".." for '%u'.
+
+Thu Mar 21 01:11:37 2002  Usaku Nakamura <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.status): fix install path (prefix).
+
+Thu Mar 21 01:03:05 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/configsub.rb: latest autoconf style support.
+
+Wed Mar 20 22:16:25 2002  Usaku Nakamura <usa@ruby-lang.org>
+
+	* mkconfig.rb: close duplicated $stdout before renaming rbconfig.rb.
+
+Wed Mar 20 21:54:17 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* win32/Makefile.sub: made variables configurable.
+
+	* win32/Makefile.sub (config.h): updates RUBY_PLATFORM from
+	  Makefile.
+
+	* win32/Makefile.sub (config.status): ditto. and use recent
+	  autoconf format.
+
+	* win32/Makefile.sub (clean): separate ext and local clean up.
+
+	* win32/Makefile.sub (distclean): ditto.
+
+	* win32/config.status.in: no longer used.
+
+Wed Mar 20 20:12:35 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* variable.c (rb_const_list): a temporary table must be freed.
+
+Wed Mar 20 19:44:09 2002  Tanaka Akira  <akr@m17n.org>
+
+	* mkconfig.rb: don't touch rbconfig.rb if there is a trouble.
+
+Wed Mar 20 16:05:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (is_defined): should check receiver only once.
+
+	* eval.c (is_defined): should handle NODE_NEWLINE.
+
+Wed Mar 20 11:29:25 2002  Aristarkh A Zagorodnikov  <xm@xml-objects.com>
+
+	* file.c (rb_file_s_expand_path): memory leak fixed.
+
+Wed Mar 20 00:36:43 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* util.c (ruby_getcwd): the content of buf is uncertain and must
+	  not be printed when getcwd(buf, size) has failed.
+
+Mon Mar 18 22:19:52 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/stringio/stringio.c (check_modifiable): wrong declaration.
+
+Mon Mar 18 18:04:05 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/digest: add depend file.
+
+	* ext/digest/md5: ditto.
+
+	* ext/digest/rmd160: ditto.
+
+	* ext/digest/sha1: ditto.
+
+	* ext/digest/sha2: ditto.
+
+	* ext/iconv/MANIFEST: ditto.
+
+	* ext/stringio/MANIFEST: ditto.
+
+	* ext/syslog: ditto.
+
+Mon Mar 18 17:18:06 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_f_abort): should not bypass cleanup.
+
+	* ext/stringio/stringio.c (check_modifiable): void function.
+
+Mon Mar 18 12:52:01 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/iconv/extconf.rb: workaround for GNU libiconv.
+
+Mon Mar 18 10:55:03 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* parse.y (parse_string): part of multi-byte sequence must not
+	  match to paren.
+
+	* parse.y (parse_qstring): ditto.
+
+	* parse.y (parse_quotedwords): ditto.
+
+	* parse.y (str_extend): handle multi-byte characters.
+
+Mon Mar 18 10:31:20 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* enum.c (enum_find): catch a value before recycle.
+
+	* enum.c (enum_all): ditto.
+
+	* enum.c (enum_any): ditto.
+
+	* enum.c (enum_min): ditto.
+
+	* enum.c (enum_max): ditto.
+
+Sun Mar 17 20:08:04 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/iconv/depend: added.
+
+	* ext/stringio/depend: added.
+
+Sat Mar 16 22:43:53 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* missing/fileblocks.c: add for autoconf.
+
+Sat Mar 16 15:30:40 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_search): should clear last_match if pos is out of
+	  string range.
+
+	* string.c (rb_str_index_m): ditto.
+
+	* string.c (rb_str_rindex): ditto.
+
+Sat Mar 16 09:04:58 2002  Koji Arai <JCA02266@nifty.ne.jp>
+
+	* enum.c (enum_inject): use the first iterated element as the
+	  initial value when omitted.
+
+	* enum.c (inject_i): ditto.
+
+	* enum.c (Init_Enumerable): Enumerable#inject now takes variable
+	  count arguments.
+
+Fri Mar 15 19:47:31 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* win32/win32.c (StartSockets): remove duplicated lines.
+
+Fri Mar 15 17:44:08 2002  Usaku Nakamura <usa@ruby-lang.org>
+
+	* bignum.c, intern.h (rb_ull2big, rb_ll2big, rb_ull2inum, rb_ll2inum,
+	  big2ull, rb_big2ull, rb_big2ll): use LONG_LONG macro instead of
+	  long long.
+
+	* numeric.c, intern.h, ruby.h (rb_num2ll, rb_num2ull): ditto.
+
+	* ruby.h: use _I64_MAX and _I64_MIN if they are defined (for VC++).
+
+Fri Mar 15 14:02:43 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/iconv/iconv.c: fixed document, Iconv#new is no longer an
+	  iterator. thanks to Tanaka Akira <akr@m17n.org>.
+
+Thu Mar 14 22:17:45 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/iconv: imported.
+
+Thu Mar 14 16:42:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_define_class): should handle autoload.
+
+	* class.c (rb_define_module): ditto.
+
+Thu Mar 14 16:18:12 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: autoconf 2.53 support. use AC_LIBOBJ.
+
+Thu Mar 14 00:29:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_match): should clear $~ if operand is nil.
+
+	* re.c (rb_reg_match2): ditto.
+
+Thu Mar 14 12:32:59 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/stringio/stringio.c: fixed frozen string bug.  ungetc no
+	  longer raises on readonly stream unless modifies actually.
+
+Thu Mar 14 08:57:41 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* dir.c (rb_push_glob): avoid SEGV when a block given.
+
+Thu Mar 14 00:16:02 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* string.c (rb_str_subpat_set): must make str independent after
+	  rb_reg_search() matched.
+
+Wed Mar 13 19:05:15 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* dir.c: FNM_PERIOD is obsoleted and FNM_DOTMATCH is introduced
+	  instead, which has the opposite meaning of FNM_PERIOD.
+
+	* dir.c: Dir::glob now accepts optional FNM_* flags via the second
+	  argument, whereas Dir::[] doesn't.
+
+Wed Mar 13 18:36:55 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/getopts.rb: single_options can be nil[*], and is not not
+	  optional. ([*]Pointed out by gotoken)
+
+Wed Mar 13 17:23:46 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure: merge Jonathan Baker's large file support patch
+	  [ruby-talk:35316], with read_all patch in [ruby-talk:35470].
+
+Wed Mar 13 04:06:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_abort): optional message argument that be printed
+	  on termination.
+
+Tue Mar 12 17:12:06 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/resolv.rb: don't complete domains for absolute FQNs.
+
+Mon Mar 11 23:08:48 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/tsort.rb: new file.
+
+Mon Mar 11 21:03:37 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/stringio: new.
+
+Mon Mar 11 18:03:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): '\0111' should be '\011' plus '1',
+	  since octal literals are formed by three digits at most.
+
+Mon Mar 11 14:44:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): module inclusion using extend() should
+	  also be detected.
+
+	* eval.c (rb_eval_cmd): cbase should not be NULL; it should be
+	  either ruby_wrapper or Object.
+
+Sun Mar 10 02:18:22 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* enum.c (enum_each_with_index): should return self.
+
+	* process.c (proc_setpgrp): should return value for non-void function.
+
+	* process.c (proc_getpgid): should raise exception if getpgid() return -1.
+
+	* string.c (rb_str_ljust): should return a duplicated string.
+
+	* string.c (rb_str_rjust): ditto.
+
+	* string.c (rb_str_center): ditto.
+
+Sat Mar  9 08:45:58 2002  Tanaka Akira  <akr@m17n.org>
+
+	* ext/socket/extconf.rb (have_struct_member): don't print checked
+	  result.
+
+Fri Mar  8 12:19:15 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/resolv.rb: use its own thread group for background threads.
+
+Fri Mar  8 02:21:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (cvar_cbase): utility function to find innermost non
+	  singleton cbase.
+
+	* eval.c (is_defined): adopt new cvar behavior.
+
+	* eval.c (rb_eval): ditto.
+
+	* eval.c (assign): ditto.
+
+Thu Mar  7 20:08:25 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* gc.c (rb_source_filename): added. holds unique strings for file
+	  names with GC space.
+
+	* gc.c (rb_gc_mark): mark source file name.
+
+	* gc.c (gc_sweep): ditto.
+
+	* gc.c (Init_GC): initialize source file name table.
+
+	* intern.h (rb_source_filename): added.
+
+	* eval.c (rb_eval_string): use rb_source_filename().
+
+	* parse.y (yycompile): ditto.
+
+	* ruby.c (proc_options): ditto.
+
+	* ruby.c (load_file): ditto.
+
+	* ruby.c (ruby_script): ditto.
+
+	* ruby.c (ruby_prog_init): ditto.
+
+Wed Mar  6 17:58:08 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dln.c (dln_load): use LoadLibrary instead of LoadLibraryEx.
+
+Wed Mar  6 16:50:37 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_mod_clone): should not call rb_obj_clone(), since
+	  Module does not provide "allocate".
+
+	* class.c (rb_singleton_class): should create new singleton class
+	  if obj is a class or module and attached object is different,
+	  which means metaclass of singleton class is sought.
+
+	* time.c (time_s_alloc): now follows allocation framework.
+
+Tue Mar  5 05:56:29 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/getopts.rb: Rewrite to fix some bugs and complete features.
+	  - Accept options with the colon in the first argument;
+	    getopts("a:bcd:") is equivalent to getopts("bc", "a:", "d:").
+	  - Do not discard the argument that caused an error.
+	  - Do not discard '-', which commonly stands for stdin or stdout.
+	  - Allow specifying a long option with a value using '='.
+	    (command --long-option=value)
+	  - Stop reading options when it meets a non-option argument.
+
+Mon Mar  4 13:19:18 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/extmk.rb.in (dir_config): Sync with mkmf.rb: Fix a bug where
+	  --with-xx-{include,lib} is ignored when --with-xx-dir is
+	  specified.
+
+Mon Mar  4 00:09:55 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): should initialize outer class variables from
+	  methods in singleton class definitions.
+
+	* eval.c (assign): ditto.
+
+Fri Mar  1 11:29:10 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): add const
+	  qualifier only for uClibc.
+
+Fri Mar  1 11:22:51 2002  Amos Gouaux  <amos+ruby@utdallas.edu>
+
+	* lib/net/imap.rb: added document.
+
+	* lib/net/imap.rb (getquotaroot): new method.
+
+	* lib/net/imap.rb (setacl): remove the rights if the rights
+	  parameter is nil.
+
+	* lib/net/imap.rb (getacl): return an array of MailboxACLItem.
+
+Fri Mar  1 06:25:49 2002  Tanaka Akira  <akr@m17n.org>
+
+	* ext/socket/extconf.rb (have_struct_member): new method.
+	  check msg_control and msg_accrights in struct msghdr.  check
+	  sys/uio.h.
+
+	* ext/socket/socket.c: include sys/uio.h if available.
+	  (thread_read_select): new function.
+	  (unix_send_io): ditto.
+	  (unix_recv_io): ditto.
+	  (unix_s_socketpair): ditto.
+	  (Init_socket): define UNIXSocket#send_io, UNIXSocket#recv_io,
+	  UNIXSocket.socketpair and UNIXSocket.pair.
+
+	* dln.c (dln_load): fix typo.
+
+Wed Feb 27 16:30:50 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_include): load modules in argument order.
+
+	* st.c (st_init_table_with_size): num_bins should be prime numbers
+	  (no decrement).
+
+	* st.c (rehash): ditto.
+
+Wed Feb 27 13:18:49 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (READ_DATA_PENDING): uClibc support.
+
+	* random.c (rand_init): ditto.
+
+	* ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): ditto.
+
+Wed Feb 27 07:05:17 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/sha2/sha2.c: Merge from rough.  Fix a couple of
+	  off-by-one errors in Aaron Gifford's code.
+
+	  Obtained from:  KAME via FreeBSD
+	  KAME PR:        393
+	  FreeBSD PR:     kern/34242
+
+Wed Feb 27 03:36:47 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* ext/dbm/dbm.c (fdbm_select): 1.7 behavior.
+
+	* ext/gdbm/gdbm.c (fgdbm_select): ditto.
+
+	* ext/sdbm/sdbm.c (fsdbm_select): ditto.
+
+	* ext/dbm/dbm.c (fdbm_delete): adopt Hash#delete behavior.
+
+	* ext/sdbm/sdbm.c (fsdbm_delete): ditto.
+
+	* ext/gdbm/gdbm.c: need not to dup key to the block.
+
+	* ext/sdbm/sdbm.c : replace RuntimeError with SDBMError.
+
+Tue Feb 26 21:34:07 2002  Usaku Nakamura <usa@ruby-lang.org>
+
+	* bignum.c (rb_big_2comp): void function cannot return any value.
+
+Tue Feb 26 16:52:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_missing): NoMethod error messages for true, false,
+	  nil must respond visibility like for other objects.
+
+Tue Feb 26 15:41:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): call trace_func for if/while conditions.
+
+	* marshal.c (r_object): separate r_regist from proc calling.
+
+Tue Feb 26 11:25:50 2002  akira yamada  <akira@arika.org>
+
+	* lib/uri/generic.rb: merge0 should return [oth, oth] if oth is
+	  absolute URI.
+
+	* lib/uri/generic.rb: registry part must not be allowed for any
+	  schemes for the Internet. (RFC2396, section 3.2.2 and 3.2.1.)
+
+Mon Feb 25 21:22:41 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/syslog.c: Merge from rough.  Use SafeStringValue().
+
+Mon Feb 25 21:12:08 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/syslog.c: Merge from rough.  Turn Syslog into a
+	  module keeping backward compatibility intact.
+
+Mon Feb 25 19:35:48 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* sample/test.rb (system): test with scripts under the source
+	  directory.
+
+Mon Feb 25 15:14:01 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (method_inspect): should not dump core for unbound
+	  singleton methods.
+
+	* object.c (rb_mod_to_s): better description.
+
+Mon Feb 25 13:32:13 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* lib/shell.rb (Shell::expand_path): relative to @cwd.
+
+Mon Feb 25 06:30:11 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* hash.c (env_select): should path the assoc list.
+
+Sun Feb 24 17:20:22 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/*/*.h: Merge from rough.
+	  - Avoid namespace pollution. (MD5_* -> rb_Digest_MD5_*, etc.)
+
+Sat Feb 23 21:12:13 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_syswait): thread kludge; should be fixed to
+	  support native thread.
+
+Fri Feb 22 21:20:53 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb: set read_timeout dynamically.
+
+	* lib/net/http.rb: @@newimpl is always true in the main trunk.
+
+	* lib/net/http.rb: HTTP.port -> default_port
+
+	* lib/net/http.rb: HTTPResponse.read_response_status ->
+	  read_status_line
+
+Fri Feb 22 19:56:15 2002  Usaku Nakamura <usa@ruby-lang.org>
+
+	* win32/config.status.in: set LIBRUBY_SO.
+
+Fri Feb 22 03:34:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (get2comp): need to specify to carry or not.
+
+	* io.c (rb_io_inspect): embed path info.
+
+Fri Feb 22 11:30:01 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/prettyprint.rb: FillGroup implemented.
+
+Thu Feb 21 21:40:18 2002  Usaku Nakamura <usa@ruby-lang.org>
+
+	* ext/extmk.rb.in (create_makefile): remove unnecessary -L option from
+	  LIBS macro.
+
+Thu Feb 21 02:49:12 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* pack.c (pack_pack): wrong # comment treatment.
+
+	* pack.c (pack_unpack): ditto.
+
+Wed Feb 20 15:15:03 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* intern.h: prototypes; rb_io_addstr(), rb_io_printf(),
+	  rb_io_print(), rb_io_puts()
+
+	* io.c (rb_io_addstr): make extern.
+
+	* io.c (rb_io_printf): ditto.
+
+	* io.c (rb_io_print): ditto.
+
+	* io.c (rb_io_puts): ditto.
+
+Wed Feb 20 13:41:35 2002  Usaku Nakamura <usa@ruby-lang.org>
+
+	* io.c (rb_io_close): return Qnil.
+
+Wed Feb 20 12:41:59 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_any_cmp): should handle Qundef in keys.
+
+	* eval.c (remove_method): should not remove a empty method to
+	  implement "undef".
+
+	* eval.c (rb_eval): should allow singleton class def for
+	  true/false/nil.
+
+Tue Feb 19 21:43:32 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb: rename Protocol.port to default_port.
+
+	* lib/net/smtp.rb: ditto.
+
+	* lib/net/pop.rb: ditto.
+
+	* lib/net/http.rb: ditto.
+
+	* lib/net/protocol.rb: rename BufferedSocket class to
+	  InternetMessageIO.
+
+	* lib/net/smtp.rb: ditto.
+
+	* lib/net/pop.rb: ditto.
+
+	* lib/net/http.rb: ditto.
+
+	* lib/net/protocol.rb: rename InternetMessageIO#write_pendstr to
+	  write_message.
+
+	* lib/net/smtp.rb: ditto.
+
+	* lib/net/protocol.rb: new method
+	  InternetMessageIO#through_message.
+
+	* lib/net/smtp.rb: ditto.
+
+	* lib/net/protocol.rb: rename InternetMessageIO#read_pendstr to
+	  read_message_to.
+
+	* lib/net/pop.rb: ditto.
+
+	* lib/net/protocol.rb: rename InternetMessageIO#read_pendlist to
+	  each_list_item
+
+	* lib/net/pop.rb: ditto.
+
+	* lib/net/protocol.rb: Now block size is 1024.
+
+	* lib/net/smtp.rb: new methods SMTP#esmtp? and #esmtp=.
+
+	* lib/net/http.rb: Using singleton method syntax instead of
+	  singleton class clause, to avoid behavior change of class
+	  variables in ruby 1.7.
+
+	* lib/net/http.rb: HTTPResponse class does not inherit from
+	  Net::Response.
+
+	* lib/net/http.rb: divide HTTP#connecting into
+	  {begin,end}_transport.
+
+	* lib/net/http.rb: unused class Accumulator removed.
+
+	* lib/net/http.rb: Net::HTTP reads response. not HTTPRequest.
+
+	* lib/net/http.rb: proxy related class-instance-variables are not
+	  initialized correctly.
+
+Tue Feb 19 20:20:12 2002  Ed Sinjiashvili  <edsin@swes.saren.ru>
+
+	* parse.y (str_extend): backslash escape was done wrong.
+
+Tue Feb 19 17:10:25 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* file.c (path_check_1): do not fail on world writable *parent*
+	  directories too.
+
+Tue Feb 19 15:51:41 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (path_check_1): do not warn on world writable *parent*
+	  directories.
+
+	* class.c (rb_include_module): should preserve ancestor order in
+	  the included class/module.
+
+Tue Feb 19 14:45:32 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (path_check_1): should check directory sticky bits.
+
+	* process.c (security): need not to warn twice.
+
+	* marshal.c (r_object): complete restoration before calling
+	  r_regist().
+
+Tue Feb 19 14:24:36 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): operators in the "op" rule should make
+	  lex_state EXPR_ARG on EXPR_FNAME and EXPR_DOT.
+
+Tue Feb 19 13:38:10 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval_string_wrap): should hide the toplevel local
+	  variable bindings by PUSH_SCOPE().
+
+Tue Feb 19 13:21:51 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* regex.c: fix prototypes of xmalloc(), xcalloc() and xrealloc().
+
+Tue Feb 19 13:16:08 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* io.c (rb_io_ungetc): don't fail pushed EOF back.
+
+Mon Feb 18 20:48:40 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* pack.c (pack_pack): avoid infinite loop at comment.
+
+	* pack.c (pack_unpack): ditto.
+
+Mon Feb 18 14:06:28 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* misc/ruby-mode.el (ruby-block-hanging-re): rescue block was too
+	  indented.
+
+Mon Feb 18 13:56:44 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (expr_value, arg_value, primary_value): value_expr()
+	  check in place.
+
+	* eval.c (block_pass): "&nil" should clear block given.
+
+Mon Feb 18 02:05:56 2002  Wolfgang Jahrling <wolfgang@pro-linux.de>
+
+	* dir.c (push_braces): remove MAXPATHLEN dependency.
+
+	* dir.c (dir_s_globd): ditto.
+
+	* dln.c (init_funcname): ditto.
+
+	* dln.c (load_1): ditto.
+
+	* dln.c (dln_load): ditto.
+
+	* configure.in: add GNU/Hurd switches.
+
+Fri Feb 15 17:44:26 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): allows comment in template strings.
+
+	* pack.c (pack_unpack): ditto.
+
+Sun Feb 17 23:41:37 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* mkconfig.rb (Config::expand): expand ${} too.
+
+	* ext/extmk.rb.in (try_link0): expand command.
+
+	* ext/extmk.rb.in (try_cpp): ditto.
+
+	* ext/extmk.rb.in (extmake): default $LIBPATH to $libdir
+
+Sun Feb 17 21:39:24 2002  Tetsuya Watanabe  <tetsuya.watanabe@nifty.com>
+
+	* ext/digest/md5/md5init.c (Init_md5): rb_cvar_declare() is
+	  replaced by rb_cvar_set().
+
+	* ext/digest/rmd160/rmd160init.c (Init_rmd160): ditto.
+
+	* ext/digest/sha1/sha1init.c (Init_sha1): ditto.
+
+	* ext/digest/sha2/sha2init.c (Init_sha2): ditto.
+
+Sun Feb 17 18:10:09 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* class.c (rb_define_class): warn unless superclass is specified
+	  explicitly.
+
+	* class.c (rb_define_class_under): ditto.
+
+Thu Feb 16 02:11:08 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* misc/ruby-mode.el (ruby-font-lock-keywords): fontify
+	  instance/class/global variables start with '_'.
+
+Fri Feb 15 14:40:38 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): replace rb_cvar_declare() by rb_cvar_set().
+
+	* eval.c (assign): ditto.
+
+	* variable.c (rb_cvar_set): 4th argument (warn) added; define new
+	  class variable if it's not defined yet.
+
+	* variable.c (rb_cvar_declare): removed.
+
+Fri Feb 15 13:36:58 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_rshift): should properly convert the negative
+	  value to 2's compliment.
+
+Thu Feb 14 17:38:35 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* parse.y: avoid SEGV at OP_ASIGN to pseudo variable.
+
+Thu Feb 14 14:13:16 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* struct.c (Init_Struct): should undefine "allocate" for Struct
+	  class (it's redefined in the subclasses).
+
+Wed Feb 13 17:58:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (stmt): local variable declaration order was changed
+	  since 1.6
+
+	* parse.y (arg): ditto.
+
+	* pack.c (pack_pack): add templates 'q' and 'Q'.
+
+	* pack.c (pack_unpack): ditto.
+
+	* bignum.c (rb_quad_pack): new utility function.
+
+	* bignum.c (rb_quad_unpack): ditto.
+
+Tue Feb 12 01:21:34 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (assignable): should emit CVASGN within the method
+	  body.
+
+Mon Feb 11 06:13:53 2002  Matt Armstrong  <matt@lickey.com>
+
+	* dir.c (dir_s_glob): should not warn even if no match found.
+
+Mon Feb 11 04:25:54 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): clean up class variable behavior.
+
+	* eval.c (assign): ditto.
+
+	* eval.c (is_defined): ditto.
+
+	* variable.c (rb_mod_class_variables): need not to call rb_cvar_singleton().
+
+	* variable.c (rb_cvar_singleton): removed.
+
+Mon Feb 11 00:10:41 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* regex.c (re_compile_fastmap): skip begpos.
+
+Sun Feb 10 16:52:53 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ruby.c (load_file): avoid SEGV on '#' only input.
+
+Fri Feb  8 23:07:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): singleton check should be moved from yycompile
+	  to here.
+
+	* eval.c (is_defined): check should be added here too.
+
+Fri Feb  8 05:31:48 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: HTTP.Proxy should use self for proxy-class's
+	  super class.
+
+	* lib/net/http.rb: initialize HTTP.proxy_port by HTTP.port.
+
+Fri Feb  8 01:27:33 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yycompile): should inherit "in_single" if eval happened
+	  in a singleton method.
+
+	* eval.c (rb_eval): class variables from singleton methods defined
+	  within singleton class statement should work like ones defined
+	  by singleton def statements.
+
+Thu Feb  7 13:44:08 2002  akira yamada  <akira@arika.org>
+
+	* uri/common.rb (URI::join): new method.
+
+	* uri/generic.rb (Generic#merge): URI.parse("http://a/")+"b" should
+	  return "http://a/b" but it returned "http://a//b".
+
+	* uri/generic.rb (Generic#check_path): corrected error message,
+	  @path -> v
+
+Thu Feb  7 00:18:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_write): flag when buffered write is done.
+
+	* io.c (fptr_finalize): do not raise error on EBADF if write
+	  buffer is empty.
+
+Wed Feb  6 17:18:54 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* configure.in: keep old config.h unless changed.
+
+Wed Feb  6 13:28:53 2002  Amos Gouaux  <amos+ruby@utdallas.edu>
+
+	* lib/net/imap.rb: OpenSSL support.
+
+	* lib/net/imap.rb (setquota): unset quota if the second argument
+	  is nil.
+
+Wed Feb  6 13:05:11 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_readlines): avoid calling GetOpenFile() repeatedly.
+
+	* io.c (rb_io_each_line): ditto.
+
+	* io.c (argf_getline): ditto.
+
+	* process.c: should include <time.h> to get proper CLK_TCK.
+
+Wed Feb  6 02:10:30 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* io.c (fptr_finalize): ignore EBADF when f and f2 use same
+	  descriptor.
+
+Tue Feb  5 16:17:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (fptr_finalize): should raise error when fclose fails.
+
+	* eval.c (method_inspect): proper output format to distinguish
+	  methods and singleton methods.
+
+Mon Feb  4 22:44:58 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* file.c (rb_file_s_expand_path): should terminate.
+
+Mon Feb  4 15:38:29 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_class_real): should not follow ICLASS link
+
+	* variable.c (classname): should follow ICLASS link explicitly.
+
+	* eval.c (rb_call): ditto.
+
+Fri Feb  1 19:10:04 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* intern.h: prototypes for new functions; rb_cstr_to_inum(),
+	  rb_str_to_inum(), rb_cstr_to_dbl(), rb_str_to_dbl()
+
+	* bignum.c (rb_cstr_to_inum): changed from rb_cstr2inum(), and
+	  added argument badcheck to be consistent with parser. [new]
+
+	* bignum.c (rb_str_to_inum): ditto.
+
+	* bignum.c (rb_cstr2inum): wrapper of rb_cstr_to_inum() now.
+
+	* bignum.c (rb_str2inum): ditto.
+
+	* object.c (rb_cstr_to_dbl): float number parser. [new]
+
+	* object.c (rb_str_to_dbl): ditto.
+
+	* object.c (rb_Float): use rb_cstr_to_dbl() for strict check.
+
+	* object.c (rb_Integer): use rb_str_to_inum() for strict check.
+
+	* string.c (rb_str_to_f): use rb_str_to_dbl() with less check.
+
+	* string.c (rb_str_to_i): use rb_str_to_inum() with less check.
+
+	* string.c (rb_str_hex): ditto.
+
+	* string.c (rb_str_oct): ditto.
+
+	* sprintf.c (rb_f_sprintf): ditto.
+
+	* time.c (obj2long): ditto.
+
+	* parse.y (yylex): use rb_cstr_to_inum() for strict check.
+
+Fri Feb  1 17:46:39 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* regex.c (mbc_startpos): become macro.
+
+	* regex.c (euc_startpos): added for improvement.
+
+	* regex.c (sjis_startpos): ditto.
+
+	* regex.c (utf8_startpos): ditto.
+
+Fri Feb  1 00:03:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_stat_inspect): print dev, rdev in hexadecimal.
+
+Thu Jan 31 20:45:33 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* lib/mkmf.rb (dir_config): prior --with flag.
+
+	* lib/mkmf.rb (arg_config): avoid special variables for
+	  font-lock-mode.
+
+Thu Jan 31 13:22:36 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb (File::Stat#pretty_print): print rdev_major and rdev_minor.
+
+Wed Jan 30 15:58:04 2002  K.Kosako  <kosako@sofnec.co.jp>
+
+	* regex.c (re_adjust_startpos): fix for SJIS and UTF-8.
+
+	* regex.c (mbc_startpos): ditto.
+
+Wed Jan 30 13:37:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_search): should set regs.allocated.
+
+Wed Jan 30 02:25:38 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* regex.c (re_adjust_startpos): search start of multibyte
+	  backward.
+
+	* regex.c (mbc_startpos): ditto.
+
+Tue Jan 29 17:59:20 2002  Tanaka Akira  <akr@m17n.org>
+
+	* file.c: `major' and `minor' macro needs sys/mkdev.h on SunOS 5.x.
+
+	* configure.in: add check for `sys/mkdev.h'.
+
+	* lib/pp.rb: don't print a mode File::Stat as decimal number.
+
+Mon Jan 28 19:16:58 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* array.c (rb_ary_fill): shouldn't yield unless block given.
+
+Mon Jan 28 18:33:18 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* parse.y (yylex): strict check for numbers.
+
+Mon Jan 28 18:01:01 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_stat_rdev_major): added. [new]
+
+	* file.c (rb_stat_rdev_minor): added. [new]
+
+	* file.c (rb_stat_inspect): print mode in octal.
+
+Mon Jan 28 13:29:41 2002  K.Kosako  <kosako@sofnec.co.jp>
+
+	* eval.c (is_defined): defined?(Foo::Baz) should check constants
+	  only, no methods.
+
+	* eval.c (is_defined): should not dump core on defined?(a::b)
+	  where a is not a class nor a module.
+
+Mon Jan 28 02:50:12 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (Init_Object): remove dup and clone from TrueClass,
+	  FalseClass, and NilClass.
+
+	* array.c (rb_ary_fill): Array#fill takes block to get the value to
+	  fill.
+
+Sat Jan 26 20:05:18 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_to_i): to_i(0) auto-detects base radix.
+
+	* array.c (rb_ary_initialize): fill by the block evaluation value
+	  if block is given.
+
+Fri Jan 25 17:48:43 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (solaris): add '-shared' only for GNU ld.
+
+Fri Jan 25 17:16:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_include_module): detect cyclic module inclusion.
+
+Fri Jan 25 02:17:56 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_cleanup): need not to free thread stacks at
+	  process termination.
+
+	* array.c (rb_ary_fetch): use the block to get the default value
+	  if the block is given.
+
+	* eval.c (rb_thread_schedule): should check time only if BOTH
+	  WAIT_SELECT and WAIT_TIME.
+
+Thu Jan 24 11:49:05 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (umethod_bind): should update rklass field.
+
+	* hash.c (rb_hash_update): if a block is given, yields [key,
+	  value1, value2] to the block to resolve conflict.
+
+Thu Jan 24 05:42:01 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* string.c (rb_str_split_m): no need to consider KANJI
+	  characters, if the length of separator is 1 (byte).
+
+Wed Jan 23 16:07:31 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (Init_Array): remove Array#filter.
+
+Wed Jan 23 13:27:44 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_yield_0): restore source file/line after yield.
+
+Wed Jan 23 02:00:14 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_initialize): should accept zero argument.
+
+	* object.c (rb_mod_cmp): should raise ArgumentError if
+	  inheritance/inclusion relation between two classes/modules is
+	  not defined. [new]
+
+Tue Jan 22 17:45:23 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_fsync): new method. [new]
+
+Mon Jan 21 22:57:18 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* signal.c (ruby_signal): must define sighandler_t for every
+	  occasion.
+
+Mon Jan 21 08:25:30 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ruby_stop): should not trace error handler.
+
+	* signal.c (install_sighandler): do not install sighandler unless
+	  the old value is SIG_DFL.
+
+	* io.c (io_write): should not raise exception on O_NONBLOCK io.
+
+	* dir.c (dir_set_pos): seek should return dir, pos= should not.
+
+Sat Jan 19 02:31:45 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): need not to clear method cache for NODE_CLASS,
+	  NODE_SCLASS.
+
+	* gc.c (obj_free): need not to clear method cache on class/module
+	  finalization.
+
+Fri Jan 18 23:38:03 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_fetch): index out of range raises exception
+	  unless optional second argument is specified.
+
+Fri Jan 18 17:32:09 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_s_new): block check moved from initialize to this
+	  method.
+
+	* io.c (rb_io_s_open): open should call initialize too. IO#for_fd
+	  also calls initialize. [new]
+
+Fri Jan 18 10:26:33 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (rb_sys_fail): replace INT2FIX() by INT2NUM() since
+	  errno value may not fit in Fixnum size on Hurd.
+
+	* error.c (set_syserr): ditto.
+
+Fri Jan 18 10:12:00 2002  Usaku Nakamura <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (tcp_svr_s_open): fix typo.
+
+Fri Jan 18 02:27:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_s_glob): returns nil if block given.
+
+	* io.c (rb_io_each_byte): should return self.
+
+	* io.c (rb_io_close_m): close check added.
+
+	* dir.c (dir_seek): should return pos.
+
+Fri Jan 18 01:21:53 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (fixpos): orig may be (NODE*)1, which should not be
+	  dereferenced.
+
+Thu Jan 17 16:21:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (block_pass): allow "retry" from within argument passed
+	  block. [new]
+
+	* eval.c (localjump_error): should preserve exit status in the
+	  exception object. [new]
+
+	* eval.c (proc_invoke): should raise exception for "break" if it's
+	  yielding, not calling. [new]
+
+	* eval.c (block_pass): should NOT raise exception for "break". [new]
+
+	* eval.c (block_pass): should allow block argument relay even in
+	  the tainted mode.
+
+Thu Jan 17 04:51:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c: support subclassing by proper "initialize"
+	  calling convention. [new]
+
+Wed Jan 16 18:25:08 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* st.c: primes should be primes.
+
+Wed Jan 16 12:29:14 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/timeout.rb (timeout): new optional argument to specify an
+	  exception class.
+
+	* lib/resolv.rb: use Resolv::ResolvTimeout for internal timeout to
+	  avoid problem with timeout of application.
+
+Wed Jan 16 11:12:30 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* object.c (rb_Float): remove underscores between digits.
+
+	* bignum.c (rb_cstr2inum): reject prefix followed by spaces only.
+
+	* class.c (rb_class_inherited): should use Object when no super
+	  class.
+
+Tue Jan 15 01:11:44 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (is_defined): method defined? check should honor
+	  protected too.
+
+Mon Jan 14 13:06:02 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (block_pass): should not pass tainted block, if $SAFE > 0.
+
+Sun Jan 13 09:31:41 2002  Koji Arai  <jca02266@nifty.ne.jp>
+
+	* variable.c (rb_mod_remove_cvar): should pass the char*.
+
+Fri Jan 11 05:06:25 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* class.c (rb_make_metaclass): [new]
+
+	* class.c (rb_define_class_id): use rb_make_metaclass(), don't
+	  call Class#inherited hook.
+
+	* class.c (rb_class_inherited): [new]
+
+	* class.c (rb_define_class): call Class#inherited hook here.
+
+	* class.c (rb_define_class_under): ditto after class path is set.
+
+	* class.c (rb_singleton_class): use rb_make_metaclass().
+
+	* eval.c (rb_eval): same as rb_define_class_under().
+
+	* intern.h: prototypes of rb_make_metaclass() and
+	  rb_class_inherited().
+
+	* object.c (rb_class_s_new): use rb_make_metaclass() and
+	  rb_class_inherited().
+
+	* object.c (Init_Object): use rb_make_metaclass().
+
+	* struct.c (make_struct): use rb_class_inherited().
+
+Thu Jan 10 19:15:15 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_add_method): should clear cache by id always.
+
+	* eval.c (rb_disable_super): no longer need to clear cache before
+	  rb_add_method().
+
+	* eval.c (rb_export_method): ditto.
+
+	* eval.c (rb_attr): ditto.
+
+	* eval.c (rb_undef): ditto.
+
+	* eval.c (rb_eval): ditto.
+
+	* eval.c (rb_mod_modfunc): ditto.
+
+	* eval.c (rb_mod_define_method): ditto.
+
+Thu Jan 10 11:42:47 2002  Usaku Nakamura <usa@ruby-lang.org>
+
+	* win32/resource.rb: Modify copyright in resource script.
+
+Thu Jan 10 07:15:44 2002  takuma ozawa  <metal@mine.ne.jp>
+
+	* re.c (match_select): should propagate taintness.
+
+Thu Jan 10 00:54:57 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_set_default): Hash#default= should return the
+	  new value.
+
+Wed Jan  9 20:21:09 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* misc/ruby-mode.el (ruby-calculate-indent): indentation after
+	  comment at beginning of buffer failed.
+
+	* misc/ruby-mode.el (font-lock-defaults): unless XEmacs, set
+	  font-lock variables in ruby-mode-hook.
+
+Tue Jan  8 15:56:20 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_to_i): accepts optional base argument. [new]
+
+	* numeric.c (rb_fix2str): should not handle negative fixnum values
+	  int32 via calling sprintf() directly.
+
+Tue Jan  8 15:54:02 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_add_method): clear replaced method from the cache.
+
+Mon Jan  7 12:38:47 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/time.rb (Time#xmlschema): new optional argument
+	  fractional_seconds to specify a number of digits of
+	  fractional part of the time.
+
+Sat Jan  5 13:18:11 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* range.c (range_member): beginning check was
+	  wrong. [ruby-talk:30252]
+
+Sat Jan  5 03:07:34 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_new2): NULL pointer check added.
+
+Sat Jan  5 00:19:12 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* parse.y (yycompile): strdup()'ed twice.
+
+Fri Jan  4 18:29:10 2002  Michal Rokos  <m.rokos@sh.cvut.cz>
+
+	* class.c (rb_define_module_under): should locate predefined
+	  module using rb_const_defined_at().
+
+Fri Jan  4 17:23:49 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* misc/ruby-mode.el (ruby-forward-string): forward a string. [new]
+
+	* misc/ruby-mode.el (ruby-parse-region): handle nested parentheses
+	  in a string and terminators in #{}.
+
+	* misc/ruby-mode.el (ruby-calculate-indent): ditto.
+
+Wed Jan  2 23:34:25 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): add -I. to CPPFLAGS.
+
+	* lib/mkmf.rb (create_makefile): srcdir support(.def and depend file).
+
+Wed Jan  2 11:51:56 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_f_system): abandon vfork.
+
+	* io.c (pipe_open): ditto.
+
+Tue Jan  1 02:16:48 2002  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/curses/extconf.rb: add dir_config.
+
+	* Makefile.in (fake.rb): set RUBY_VERSION.
+
+Mon Dec 31 14:20:46 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* parse.y (yycompile): always store copy of filename.
+
+	* parse.y (rb_compile_file): no longer need to strdup() here.
+
+Mon Dec 31 05:26:40 2001  Ferris McCormick  <fmccor@inforead.com>
+
+	* defines.h: sparc linux needs different FLUSH_REGISTER_WINDOWS
+
+Mon Dec 31 04:27:28 2001  Minero Aoki  <aamine@mx.edit.ne.jp>
+
+	* lib/net/protocol.rb: Protocol#start returns the return value of
+	  block.
+
+	* lib/net/protocol.rb: set timeout limit by default.
+
+	* lib/net/protocol.rb: new methods WriteAdapter#write, puts,
+	  print, printf.
+
+	* lib/net/http.rb: rename HTTP#get2 to request_get, post2 to
+	  request_post ...
+
+	* lib/net/smtp.rb: should not resolve HELO domain automatically.
+
+Sun Dec 30 00:59:16 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb.in, lib/mkmf.rb (have_library): accept -lm
+	  unconditionally on mswin32/mingw32.
+
+Sat Dec 29 01:55:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_search): abandon stclass optimization.
+
+Fri Dec 28 14:39:05 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* array.c (rb_cmpint): fixed typo.
+
+Thu Dec 27 18:43:04 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* bignum.c (rb_cstr2inum): deny "0_".
+
+Thu Dec 27 01:54:02 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* bignum.c (rb_cstr2inum): allow "0\n" and so on.
+
+Wed Dec 26 19:24:21 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (rb_invalid_str): utility function to show inspect()'ed
+	  string.
+
+	* bignum.c (rb_cstr2inum): prints invalid strings in inspect()'ed
+	  format.
+
+	* object.c (rb_Float): ditto.
+
+Wed Dec 26 02:41:29 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_convert_type): no longer use rb_rescue().
+
+Tue Dec 25 18:32:16 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* re.c (rb_reg_search): initialize taint status of match object.
+
+Tue Dec 25 02:37:49 2001  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pp.rb, lib/prettyprint.rb: new files.
+
+Tue Dec 25 02:11:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_convert_type): check method response check before
+	  invoking rb_rescue().
+
+	* object.c (rb_check_convert_type): ditto.
+
+Mon Dec 24 02:37:40 2001  Le Wang  <lewang@bigfoot.com>
+
+	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords):
+	  fix font-lock problem [ruby-talk:29296].
+
+Sat Dec 22 22:52:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_timeval): wrong cast to time_t.
+
+	* time.c (time_plus): ditto.
+
+Fri Dec 21 20:33:34 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* parse.y (str_extend): make up "#$;" handling.
+
+Fri Dec 21 16:18:17 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* dln.h, ruby.h, util.h: enable prototypes in C++.
+
+Fri Dec 21 15:12:41 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_plus): result should not be negative unless
+	  NEGATIVE_TIME_T is defined.
+
+	* time.c (time_new_internal): should check tv_sec overflow too.
+
+	* time.c (time_timeval): should check time_t range when time is
+	  initialized from float.
+
+	* time.c (time_plus): uses modf(3).
+
+Fri Dec 21 03:15:52 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_mod_define_method): must not convert Method to Proc.
+
+Fri Dec 21 01:17:57 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* lib/mkmf.rb (with_destdir): new.
+
+	* lib/mkmf.rb: prefix target directories with $(DESTDIR) all.
+
+	* lib/mkmf.rb: no need to mkdir $(libdir)
+
+Thu Dec 20 14:08:20 2001  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb: rename Net::Socket to Net::BufferedSocket
+
+Thu Dec 20 13:51:52 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* variable.c (rb_cvar_set): add frozen class/module check.
+
+	* variable.c (rb_cvar_declare): add frozen class/module check.
+
+Thu Dec 20 01:01:50 2001  takuma ozawa  <metal@mine.ne.jp>
+
+	* re.c (match_to_a): should propagate taint.
+
+	* re.c (rb_reg_s_quote): ditto.
+
+Wed Dec 19 16:58:29 2001  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/readline/readline.c: new methods
+	  Readline::basic_word_break_characters,
+	  Readline::basic_word_break_characters=,
+	  Readline::completer_word_break_characters,
+	  Readline::completer_word_break_characters=,
+	  Readline::basic_quote_characters,
+	  Readline::basic_quote_characters=,
+	  Readline::completer_quote_characters,
+	  Readline::completer_quote_characters=,
+	  Readline::filename_quote_characters,
+	  Readline::filename_quote_characters=.
+
+Wed Dec 19 14:05:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_define_method): define_method should follow
+	  default method visibility.
+
+	* eval.c (rb_attr): should warn if the default method visibility
+	  is "module_function" (can be error).
+
+	* eval.c (rb_mod_define_method): should define class/module method
+	  also if the visibility is "module_function".
+
+	* eval.c (rb_mod_define_method): should call hook method
+	  "method_added", and "singleton_method_added".
+
+Wed Dec 19 11:42:13 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* string.c: use RESIZE_CAPA for capacity change.
+
+Wed Dec 19 03:08:40 2001  Tanaka Akira  <akr@m17n.org>
+
+	* lib/time.rb: date.rb is not required anymore.
+
+	* lib/resolv.rb: fix document.  refine IPv6 regex.
+
+Tue Dec 18 23:24:53 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (Init_socket): add listen method to
+	  TCPServer and UNIXServer.
+
+Tue Dec 18 17:54:53 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* sample/test.rb: Hash#indexes -> Hash#select.
+
+Tue Dec 18 01:02:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_schedule): should not select a thread which is
+	  not yet initialized.
+
+Mon Dec 17 18:53:49 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* string.c (rb_str_replace): swap arguments of OBJ_INFECT.
+
+Mon Dec 17 16:52:20 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* intern.h: add prototypes.
+	  rb_gc_enable(), rb_gc_disable(), rb_gc_start(), rb_str_new5()
+	  rb_str_buf_append(), rb_str_buf_cat(), rb_str_buf_cat2(),
+	  rb_str_dup_frozen()
+
+	* ruby.h: added declaration.
+	  rb_defout, rb_stdin, rb_stdout, rb_stderr, ruby_errinfo
+
+	* rubyio.h: changed double include guard macro to RUBYIO_H.
+
+	* array.c (inspect_call): make static.
+
+	* eval.c (dvar_asgn): ditto.
+
+	* io.c (rb_io_close_read): ditto.
+
+	* lex.c (rb_reserved_word): ditto.
+
+	* ruby.c: (req_list_head, req_list_last): ditto.
+
+	* ruby.c (require_libraries): ditto.
+
+Mon Dec 17 15:41:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_plus): wrong boundary check.
+
+	* time.c (time_minus): ditto.
+
+Mon Dec 17 15:19:32 2001  Tanaka Akira  <akr@m17n.org>
+
+	* time.c: new method `gmtoff', `gmt_offset' and `utc_offset'.
+	  (time_utc_offset): new function.
+	  (Init_Time): bind above methods to `time_utc_offset'.
+
+	* time.c: 64bit time_t support.
+	  (time_s_at): use NUM2LONG instead of NUM2INT for tv_sec.
+	  (time_arg): initialize tm_isdst correctly.
+	  use long to initialize tm_year.
+	  (search_time_t): renamed from `make_time_t'.
+	  (make_time_t): call `timegm' and `mktime' instead of `search_time_t'
+	  if available.
+	  (time_to_i): use LONG2NUM instead of INT2NUM.
+	  (time_localtime): check localtime failure.
+	  (time_gmtime): check gmtime failure.
+	  (time_year): use LONG2NUM instead of INT2FIX.
+	  (time_to_a): use long for tm_year.
+	  (time_dump): check tm_year which is not representable with 17bit.
+	  (time_load): initialize tm_isdst.
+
+	* configure.in: check existence of `mktime' and `timegm'.
+	  check existence of tm_gmtoff field of struct tm.
+	  fix negative time_t for 64bit time_t.
+
+	* missing/strftime.c: fix overflow by tm_year + 1900.
+
+	* lib/time.rb: use Time#utc_offset.
+
+Mon Dec 17 00:02:04 2001  Guy Decoux  <ts@moulon.inra.fr>
+
+	* variable.c (find_class_path): should initialize iv_tbl if it's
+	  NULL.
+
+Fri Dec 14 04:23:36 2001  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/pop.rb: new method Net::POP3.APOP
+
+	* lib/net/http.rb: set default Content-Type to
+	  x-www-form-urlencoded (causes warning)
+
+	* lib/net/protocol.rb: remove Net::NetPrivate module.
+
+	* lib/net/smtp.rb: ditto.
+
+	* lib/net/pop.rb: ditto.
+
+	* lib/net/http.rb: ditto.
+
+Fri Dec 14 00:16:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_define_class): should return the existing class if
+	  the class is already defined and its superclass is identical to
+	  the specified superclass.
+
+	* class.c (rb_define_class_under): ditto.
+
+	* class.c (rb_define_module): should return the existing module if
+	  the module is already defined.
+
+Thu Dec 13 09:52:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_new_internal): avoid loop to calculate negative
+	  div, mod.
+
+	* time.c (time_cmp): should handle Bignums.
+
+Tue Dec 11 17:39:16 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* array.c (rb_ary_pop): should ELTS_SHARED flag check before
+	  REALLOC.
+
+Tue Dec 11 12:45:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_match_m): should convert an argument into
+	  regexp if it's a string.
+
+Tue Dec 11 03:40:23 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_select): Array#select(n,m,...) now works like
+	  Array#indexes(n,m,..). [new, experimental]
+
+	* hash.c (rb_hash_select): ditto.
+
+	* hash.c (env_select): ditto.
+
+	* re.c (match_select): ditto.
+
+	* struct.c (rb_struct_select): ditto.
+
+Tue Dec 11 03:17:19 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* object.c (rb_class_real): follow included modules.
+
+Mon Dec 10 23:37:51 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* util.h: change prototype of ruby_qsort() to accord with its
+	  definition.
+
+Mon Dec 10 20:30:01 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* gc.c (STR_ASSOC): use FL_USER3 instead of FL_USER2.
+
+Mon Dec 10 17:40:02 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* parse.y (str_extend): make up pushback call.
+
+Mon Dec 10 02:09:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_modify): should copy the internal buffer if the
+	  modifying buffer is shared.
+
+	* array.c (ary_make_shared): make an internal buffer of an array
+	  to be shared.
+
+	* array.c (rb_ary_shift): avoid sliding an internal buffer by
+	  using shared buffer.
+
+	* array.c (rb_ary_subseq): avoid copying the buffer.
+
+Mon Dec 10 01:06:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (gettable): should freeze __FILE__ string.
+
+Sun Dec  9 18:06:26 2001  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb: calls on_connect before conn_command
+
+Sat Dec  8 23:27:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_puts): old behavior restored.  rationale: a) if you
+	  want to call to_s for arrays, you can just call print a, "\n".
+	  b) to_s wastes memory if array (and sum of its contents) is
+	  huge.  c) now any object that has to_ary is treated as an array,
+	  using rb_check_convert_type().
+
+Sat Dec  8 22:40:38 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_initialize): now accepts a block to calculate
+	  the default value. [new]
+
+	* hash.c (rb_hash_aref): call "default" method to get the value
+	  corresponding to the non existing key.
+
+	* hash.c (rb_hash_default): get the default value based on the
+	  block given to 'new'.  Now it takes an optional "key" argument.
+	  "default" became the method to get the value for non existing
+	  key.  Users may override "default" method to change the hash
+	  behavior.
+
+	* hash.c (rb_hash_set_default): clear the flag if a block is given
+	  to 'new'
+
+Sat Dec  8 02:29:54 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (Init_Object): undef Data.allocate, left Data.new.
+
+Fri Dec  7 19:12:14 2001  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: SMTP.new requires at least one arg.
+
+	* lib/net/pop.rb: POP.new requires at least one arg.
+
+	* lib/net/pop.rb: uses "raise *Error.new" instead of simple raise.
+
+	* lib/net/http.rb: HTTP.new requires at least one arg.
+
+	* lib/net/http.rb: changes implicit start algorithm.
+
+Fri Dec  7 15:49:39 2001  Usaku Nakamura <usa@ruby-lang.org>
+
+	* ext/extmk.rb.in: ignore adding -Wl,-R to DLDFLAGS when the directory
+	  is $topdir.
+
+Fri Dec  7 13:58:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/curses/curses.c (window_scrollok): use RTEST().
+
+	* ext/curses/curses.c (window_idlok): ditto.
+
+	* ext/curses/curses.c (window_keypad): ditto.
+
+	* ext/curses/curses.c (window_idlok): idlok() may return void on
+	  some platforms; so don't use return value.
+
+	* ext/curses/curses.c (window_scrollok): ditto for consistency.
+
+	* ext/curses/curses.c: replace FIX2INT() by typechecking NUM2INT().
+
+Fri Dec  7 09:51:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (str_extend): should not process immature #$x and
+	  #@x interpolation, e.g #@#@ etc.
+
+Fri Dec  7 03:21:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_sort_by): sort_by does not have to be stable always.
+
+	* enum.c (enum_sort_by): call qsort directly to gain performance.
+
+Thu Dec  6 18:52:28 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* ext/extmk.rb.in: add -Wl,-R flags to DLDFLAGS on netbsdelf.
+
+	* lib/mkmf.rb: ditto.
+
+Thu Dec  6 09:15:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* util.c (ruby_qsort): ruby_qsort(qs6) is now native thread safe.
+
+	* error.c (rb_sys_fail): it must be a bug if it's called when
+	  errno == 0.
+
+Wed Dec  5 23:36:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (WC2MBC1ST): should not pass through > 0x80 number in UTF-8.
+
+Wed Dec  5 20:05:18 2001  Florian Frank  <flori@ping.de>
+
+	* ext/socket/socket.c (bsock_send): should raise EWOULDBLOCK
+	  exception.
+
+	* ext/socket/socket.c (s_recvfrom): ditto.
+
+	* ext/socket/socket.c (s_accept): ditto.
+
+	* ext/socket/socket.c (udp_send): ditto.
+
+Tue Dec  4 17:43:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h (DUPSETUP): new SETUP macro for duplication.
+
+	* time.c (time_dup): implement in Time class using DUPSETUP.
+
+	* time.c (time_getlocaltime): new method;  probably requires
+	  better name than getlocaltime. [new,experimental]
+
+	* time.c (time_getgmtime): ditto.
+
+	* array.c (rb_ary_dup): uses DUPSETUP.
+
+	* string.c (rb_str_dup): uses DUPSETUP.  now properly copies
+	  instance variables too.
+
+Tue Dec  4 03:49:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_fread): EAGAIN/EWOULDBLOCK should not terminate and
+	  throw away the input.
+
+	* time.c (time_new_internal): underflow adjustment must not use
+	  negative div/mod.
+
+	* time.c (time_cmp): should consider tv_usec on non Fixnum number
+	  comparison.
+Sun Dec  9 23:00:54 2001  Keiju Ishitsuka <keiju@ishitsuka.com>
+	* matrix.rb: Vector#* bug. reported from Massimiliano Mirra
+	  <info@chromatic-harp.com>.
+
+Sun Dec  9 22:15:59 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* enum.c (enum_sort_by): should replace with last elements.
+
+Mon Dec  3 16:06:57 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/socket/extconf.rb: remove -L/usr/local/lib.
+
+	* configure.in: add -Wl,-export-dynamic on NetBSD.
+
+Mon Dec  3 16:04:16 2001  Usaku Nakamura <usa@ruby-lang.org>
+
+	* configure.in: not use X11BASE, since it's not always set.
+
+Mon Dec  3 13:53:49 2001  Tanaka Akira  <akr@m17n.org>
+
+	* time.c (rb_strftime): buffer length condition was wrong.
+
+	* time.c (time_strftime): should backup buf to the original
+	  buffer.
+
+Mon Dec  3 09:59:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_plus): must detect result overflow.
+
+	* time.c (time_minus): ditto.
+
+	* time.c (time_new_internal): round usec overflow and underflow
+	  here.
+
+	* time.c (time_plus): move operand overflow/underflow check to
+	  time_new_internal().
+
+	* time.c (time_minus): ditto.
+
+	* time.c (time_cmp): should consider tv_usec too.
+
+Mon Dec  3 03:32:22 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* configure.in: apply patch from NetBSD's pkgsrc (patch-aa).
+
+Sun Dec  2 22:01:52 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: use GCC, not without_gcc. remove without_gcc.
+
+	* ext/curses/extconf.rb: check for curses.h.
+
+	* ext/dbm/extconf.rb: check if $CFLAGS includes DBM_HDR.
+
+Sat Dec  1 12:13:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_gmtime): time_modify() should be called even if tm
+	  struct is not calculated yet.
+
+Fri Nov 30 17:02:55 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: set target_cpu to i386 on cygwin and mingw32.
+
+	* configure.in: default --enable-shared to yes on cygwin and mingw32.
+
+Fri Nov 30 00:25:28 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* README.EXT: Appendix B is duplicated.
+
+	* README.EXT.ja: ditto.
+
+Thu Nov 29 00:28:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_equal): object with to_str must be treated as a
+	  string.
+
+Wed Nov 28 18:46:28 2001  Ville Mattila  <mulperi@iki.fi>
+
+	* eval.c (rb_thread_select): should subtract timeofday() from
+	  limit, not reverse.
+
+Wed Nov 28 16:03:28 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* util.c (scan_hex): x is not a hexadecimal digit.
+
+Wed Nov 28 13:38:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_schedule): should treat the case that
+	  select(2) returns 0, if a thread is under both WAIT_SELECT and
+	  WAIT_TIME.  Jakub Travnik <J.Travnik@sh.cvut.cz> actually fixed
+	  this bug.
+
+Tue Nov 27 02:15:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_float): must distinguish -0.0 from 0.0.
+
+Mon Nov 26 20:57:24 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/Setup*, ext/syslog/*: import the "syslog" module from the
+	  rough ruby project.
+
+Mon Nov 26 16:14:42 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* gc.c (gc_mark_all): tweak mark order for little bit better scan.
+
+	* gc.c (rb_gc_mark): ditto.
+
+	* gc.c (rb_gc): ditto.
+
+Mon Nov 26 16:54:59 2001  Usaku Nakamura <usa@ruby-lang.org>
+
+	* win32/win32.c (mypopen): fixed that mypclose() didn't really close
+	  pipe.
+
+	* win32/win32.c (CreateChild): set STARTF_USESTDHANDLES flag only
+	  when some handles are passed.
+
+Mon Nov 26 16:31:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (sort_by_i): slight performance boost.
+
+Sun Nov 25 21:02:18 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* parse.y (str_extend): change types of second and third arguments
+	  from char to int.
+
+Thu Nov 22 20:15:28 2001  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
+
+	* gc.c (gc_mark_rest): should call gc_mark_children(), not gc_mark().
+
+	* gc.c (rb_gc_mark): may cause infinite loop.
+
+Thu Nov 22 00:28:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (str_extend): should check nesting parentheses in #{}.
+
+Wed Nov 21 12:22:52 2001  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/cgi.rb: CGI#header: do not set Apache.request.status for
+	  Location: if Apache.request.status is already set.
+
+Wed Nov 21 02:24:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (pst_wstopsig): returns nil unless WIFSTOPPED() is
+	  non-zero.
+
+	* process.c (pst_wtermsig): returns nil unless WIFSIGNALED() is
+	  non-zero.
+
+	* process.c (pst_wexitstatus): returns nil unless WIFEXITED() is
+	  non-zero.
+
+Wed Nov 21 00:17:54 2001  Ville Mattila  <mulperi@iki.fi>
+
+	* eval.c (rb_thread_select): tv_sec and tv_usec should not be
+	  negative.
+
+	* signal.c (posix_signal): do not set SA_RESTART for SIGVTALRM.
+
+Tue Nov 20 21:09:22 2001  Guy Decoux  <ts@moulon.inra.fr>
+
+	* parse.y (call_args2): block_arg may follow the first argument in
+	  call_args2.
+
+Tue Nov 20 02:01:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (stack_check): should avoid stack length check during
+	  raising SystemStackError exception.
+
+Tue Nov 20 01:07:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (str_extend): should not terminate string interpolation
+	  with newlines in here-docs and newline terminated strings.
+
+Mon Nov 19 17:58:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_modfunc): should follow NODE_ZSUPER link; based
+	  on Guy Decoux's patch in [ruby-talk:25478].
+
+Mon Nov 19 16:09:33 2001  Tanaka Akira  <akr@m17n.org>
+
+	* string.c (rb_str_succ): there was buffer overrun.
+
+Mon Nov 19 14:14:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (str_extend): term can be any character.
+
+Mon Nov 19 04:58:42 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb (header): support for Apache. thanks to
+	  Shugo Maeda <shugo@ruby-lang.org>.
+
+Sun Nov 18 19:37:55 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* parse.y: needless conditionals.
+
+	* parse.y (parse_regx): parse error at unterminated regex /#{.
+	  (ruby-bugs-ja:PR#142)
+
+Sat Nov 17 12:37:39 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_unpack): should give length to utf8_to_uv().
+
+	* pack.c (utf8_to_uv): add length check.
+
+Sat Nov 17 01:41:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* massages: replace "wrong #" by "wrong number".
+
+	* marshal.c (w_float): output Infinity and NaN explicitly.
+
+	* marshal.c (r_object): support new explicit float format.
+
+	* eval.c (rb_thread_wait_for): select may cause ERESTART on
+	  Solaris.
+
+	* eval.c (rb_thread_select): ditto.
+
+Thu Nov 15 15:29:39 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* array.c (rb_ary_join): non-nil separator must be converted to
+	  String.  and separators' total length was wrong.
+
+Thu Nov 15 03:37:17 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* hash.c (ruby_setenv): remove USE_WIN32_RTL_ENV block since it's
+	  obsoleted.
+
+	* win32/win32.c, win32/win32.h: sort out #if 0 - #endif or others.
+
+Thu Nov 15 00:07:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_to_s): if rb_output_fs is nil, insert newlines
+	  between array elements (use rb_default_rs as newline literal)
+	  [experimental].
+
+Wed Nov 14 15:16:23 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* gc.c (init_mark_stack): no need to clear mark_stack.
+
+	* gc.c (gc_mark_all): need to handle finalizer mark.
+
+	* gc.c (gc_mark_rest): use MEMCPY instead of memcpy.
+
+	* gc.c (rb_gc_mark): earlier const check to avoid pusing special
+	  constants into mark stack.
+
+Wed Nov 14 01:12:07 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* win32/win32.c (waitpid): fix wait count.
+
+	* win32/win32.c (poll_child_status): rename from wait_child().
+
+Wed Nov 14 01:33:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_to_s): 'to_s' now takes optional argument to
+	  specify radix. [new]
+
+	* bignum.c (rb_big_to_s): ditto. [new]
+
+Tue Nov 13 19:50:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: do not override CC if set.
+
+Tue Nov 13 16:49:16 2001  Usaku Nakamura <usa@ruby-lang.org>
+
+	* win32/win32.c (mypopen): return error status instead of calling
+	  rb_sys_fail().
+
+	* win32/win32.c (do_spawn): ditto.
+
+Tue Nov 13 14:39:11 2001  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* signal.c (sighandle): should not re-register sighandler if
+	  POSIX_SIGNAL is defined.
+
+Tue Nov 13 12:55:59 2001  Usaku Nakamura <usa@ruby-lang.org>
+
+	* win32/win32.c (do_spawn): use CreateChild() instead of calling
+	  CreateProcess() directly. Original patches comes from Patrick Cheng.
+
+	* win32/win32.c (mypopen): ditto.
+
+	* win32/win32.c (mypclose): use rb_syswait() instead of waiting in this
+	  function.
+
+	* win32/win32.c (waitpid): use wait_child() instead of _cwait().
+
+	* win32/win32.c (CreateChild): added. [new]
+
+	* win32/win32.c (wait_child): added. [new]
+
+	* win32/win32.c (FindFirstChildSlot): added. [new]
+
+	* win32/win32.c (FindChildSlot): added. [new]
+
+	* win32/win32.c (FindPipedChildSlot): added. [new]
+
+	* win32/win32.c (CloseChildHandle): added. [new]
+
+	* win32/win32.c (FindFreeChildSlot): added. [new]
+
+Tue Nov 13 12:38:12 2001  Usaku Nakamura <usa@ruby-lang.org>
+
+	* hash.c (envix): use GET_ENVIRON and FREE_ENVIRON to get environment
+	  variables list.
+
+	* hash.c (env_keys): ditto.
+
+	* hash.c (env_each_key): ditto.
+
+	* hash.c (env_values): ditto.
+
+	* hash.c (env_keys): ditto.
+
+	* hash.c (env_each_value): ditto.
+
+	* hash.c (env_each): ditto.
+
+	* hash.c (env_inspect): ditto.
+
+	* hash.c (env_to_a): ditto.
+
+	* hash.c (env_size): ditto.
+
+	* hash.c (env_empty_p): ditto.
+
+	* hash.c (env_has_value): ditto.
+
+	* hash.c (env_index): ditto.
+
+	* hash.c (env_to_hash): ditto.
+
+	* win32/win32.c (win32_getenv): use static buffer.
+
+	* win32/win32.c, win32/win32.h (win32_get_environ): get environment
+	  variables list. [new]
+
+	* win32/win32.c, win32/win32.h (win32_free_environ): free environment
+	  variables list. [new]
+
+Mon Nov 12 16:48:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (error_print): errat array may be empty.
+
+Mon Nov 12 01:30:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval_cmd): should not upgrade safe level unless
+	  explicitly specified by argument newly added.
+
+	* signal.c (sig_trap): should not allow tainted trap closure.
+
+	* variable.c (rb_f_trace_var): should not allow trace_var on safe
+	  level higher than 3.
+
+	* variable.c (rb_f_trace_var): should not allow tainted trace
+	  closure.
+
+Sun Nov 11 00:12:23 2001  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
+
+	* gc.c: do not use static stack until system stack overflows.
+
+Sat Nov 10 03:57:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (eval): should call Exception#exception instead of
+	  calling rb_exc_new3() directly.
+
+	* error.c (exc_exception): set "mesg" directly to the clone.  it
+	  might be better to set mesg via some method for flexibility.
+
+Sat Nov 10 00:14:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (cvar_override_check): should print original module
+	  name, if 'a' is T_ICLASS.
+
+	* parse.y (yylex): float '1_.0' should not be allowed.
+
+	* variable.c (var_getter): should care about var as Qfalse
+	  (ruby-bugs#PR199).
+
+Fri Nov  9 13:50:06 2001  Usaku Nakamura <usa@ruby-lang.org>
+
+	* win32/config.status.in: make CFLAGS same as Makefile's one.
+
+Thu Nov  8 20:20:37 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_trap_eval): avoid annoying warning with signal.
+	  [ruby-talk:23225]
+
+	* eval.c (rb_call0): adjust caller source file/line while
+	  evaluating optional arguments.
+
+Thu Nov  8 18:41:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (cmpint): <=> or block for {min,max} may return bignum.
+
+	* array.c (sort_1): use rb_compint.
+
+	* array.c (sort_2): ditto.
+
+	* enum.c (min_ii): ditto.
+
+	* enum.c (min_ii): ditto.
+
+	* enum.c (max_i): ditto.
+
+	* enum.c (max_ii): ditto.
+
+Thu Nov  8 18:21:02 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (path_check_1): forgot to initialize 'p'.
+
+Thu Nov  8 14:52:15 2001  Tanaka Akira  <akr@m17n.org>
+
+	* mkconfig.rb: use String#dump to generate Ruby string literal.
+
+Thu Nov  8 15:46:54 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_eql): should override 'eql?'
+
+	* array.c (rb_ary_hash): should override 'hash' too.
+
+Tue Nov  6 14:38:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (security): always give warning for insecure PATH.
+
+	* dir.c (my_getcwd): do not rely on MAXPATHLEN.
+
+	* file.c (rb_file_s_readlink): ditto.
+
+	* file.c (path_check_1): ditto.
+
+Tue Nov  6 14:17:14 2001  Amos Gouaux <amos+ruby@utdallas.edu>
+
+	* lib/net/imap.rb (getquota_response): use astring for mailbox
+	  names.
+
+	* lib/net/imap.rb (getacl_response): ditto.
+
+Mon Nov  5 17:09:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): should not call rb_f_block_given_p().
+
+Sat Nov  3 23:33:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_chomp_bang): should terminate string by NUL.
+
+Sat Nov  3 22:28:51 2001  Keiju Ishitsuka <keiju@ishitsuka.com>
+
+	* matrix.rb (Matrix#column_vectors, Matrix#row_vectors): ditto bug.
+	  this bug report and fix by tsutomu@nucba.ac.jp.
+
+	* forwardable.rb: change raise to Kernel::raise
+
+Sat Nov  3 10:11:57 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): better error message.
+
+Thu Nov  1 14:08:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_aref): idx may be a Bignum.
+
+	* numeric.c (fix_aref): negative index must return zero.
+
+Thu Nov  1 13:23:50 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_mark_children): should NOT treat last element of
+	  structs and arrays specially.
+
+Wed Oct 31 16:59:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (exec_under): should initialize ruby_frame->self;
+
+Wed Oct 31 15:09:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (POP_VARS): should not set DVAR_DONT_RECYCLE if _old
+	  ruby_vars is already force_recycled.
+
+Wed Oct 31 10:28:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_gc): handles mark stack overflow.
+
+	* gc.c (PUSH_MARK): use static mark stack, no more recursion.
+
+Wed Oct 31 02:44:06 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: CGI::Cookie::parse(): Ignore duplicate keys caused by
+	  Netscape bug.
+
+Tue Oct 30 18:21:51 2001  Usaku Nakamura <usa@ruby-lang.org>
+
+	* win32/mkexports.rb: follow the change of rb_io_puts().
+
+Tue Oct 30 14:04:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_chomp_bang): do smart chomp if $/ == '\n'. [new]
+
+	* io.c (rb_io_puts): don't treat Array specially.
+
+	* bignum.c (rb_big_cmp): should convert bignum to float.
+
+	* eval.c (rb_f_eval): can't modify untainted binding.
+
+Mon Oct 29 16:08:30 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): should preserve p0 value.
+
+Mon Oct 29 14:56:44 2001  Usaku Nakamura <usa@ruby-lang.org>
+
+	* intern.h (rb_protect_inspect): follow the change of array.c.
+
+	* eval.c (rb_exec_end_proc): follow the change of rb_protect().
+
+	* eval.c (method_proc, umethod_proc, rb_catch): cast the first
+	  parameter of rb_iterate() to avoid VC++ warning.
+
+	* range.c (range_step): ditto.
+
+	* ext/sdbm/init.c (fsdbm_update, fsdbm_replace): ditto.
+
+Mon Oct 29 07:57:31 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (str_extend): should allow interpolation of $-x.
+
+	* variable.c (rb_cvar_set): empty iv_tbl may cause infinite loop.
+
+	* variable.c (rb_cvar_get): ditto.
+
+	* variable.c (cvar_override_check): ditto.
+
+Sat Oct 27 23:01:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_eq): convert Bignum to Float, instead of
+	  reverse.
+
+Fri Oct 26 06:19:29 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_localtime): getting tm should not be prohibited for
+	  frozen time objects.
+
+	* time.c (time_gmtime): ditto.
+
+	* version.c (Init_version): freeze RUBY_VERSION,
+	  RUBY_RELEASE_DATE, and RUBY_PLATFORM.
+
+	* file.c (Init_File): freeze File::SEPARATOR, ALT_SEPARATOR and
+	  PATH_SEPARATOR.
+
+	* file.c (rb_stat_cmp): should check operand type before calling
+	  get_stat().
+
+Thu Oct 25 10:28:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval_cmd): should not invoke "call" with a block on
+	  any occasion.
+
+Wed Oct 24 03:25:31 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_aref): idx may be a Bignum.
+
+Tue Oct 23 01:21:19 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (proc_invoke): fix self switching in Proc#call
+	  (ruby-bugs-ja#PR108) and GC failure.  use Qundef instead of 0
+	  to direct not switching self.
+
+	* eval.c (call_trace_func): ditto.
+
+	* eval.c (call_end_proc): ditto.
+
+	* eval.c (proc_call): ditto.
+
+	* eval.c (proc_yield): ditto.
+
+Tue Oct 23 01:15:43 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* variable.c (rb_global_entry): reconstruct global variable
+	  aliasing (sharing global_entry->var with other global_entry).
+
+	* variable.c (undef_getter): ditto.
+
+	* variable.c (undef_setter): ditto.
+
+	* variable.c (val_setter): ditto.
+
+	* variable.c (mark_global_entry): ditto.
+
+	* variable.c (rb_define_hooked_variable): ditto.
+
+	* variable.c (rb_f_trace_var): ditto.
+
+	* variable.c (remove_trace): ditto.
+
+	* variable.c (rb_f_untrace_var): ditto.
+
+	* variable.c (rb_gvar_get): ditto.
+
+	* variable.c (trace_en): ditto.
+
+	* variable.c (rb_gvar_set): ditto.
+
+	* variable.c (rb_gvar_defined): ditto.
+
+	* variable.c (rb_alias_variable): ditto.
+
+Mon Oct 22 18:53:55 2001  Masahiro Tanaka  <masa@stars.gsfc.nasa.gov>
+
+	* numeric.c (num_remainder): a bug in Numeric#remainder.
+
+Mon Oct 22 15:21:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_exec_end_proc): END might be called within END
+	  block.
+
+	* class.c (rb_mod_clone): should not copy class name, since clone
+	  should remain anonymous.
+
+Fri Oct 19 23:40:37 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* variable.c (remove_trace): should not access already freed area.
+
+	* variable.c (rb_f_untrace_var): fix memory leak.
+
+Fri Oct 19 17:55:14 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* marshal.c (w_uclass): cloned class is not user
+	  class. (ruby-bugs-ja#PR103)
+
+	* marshal.c (r_object): Struct subclass couldn't
+	  load. (ruby-bugs-ja#PR104)
+
+Wed Oct 17 14:12:50 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* variable.c (alias_fixup): added. ad hoc support for ordinary
+	  global variable aliasing. when original entry is set, make the
+	  alias to refer directly as possible.
+
+	* variable.c (alias_getter, alias_setter): ditto.
+
+	* variable.c (rb_alias_variable): ditto. and no need to mark alias
+	  variables.
+
+	* variable.c (rb_gvar_defined): refer the original entry of an alias.
+
+Tue Oct 16 23:29:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): self in a block given to define_method now be
+	  switched to the receiver of the method.
+
+	* eval.c (proc_invoke): added new parameter to allow self
+	  switching.
+
+Tue Oct 16 21:38:15 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_f_missing): check stack level with rb_stack_check().
+
+	* eval.c (rb_call0): ditto.
+
+	* eval.c, intern.h (rb_stack_check): added. [new]
+
+Tue Oct 16 13:18:47 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* object.c (rb_mod_initialize): optional block with
+	  Module.new. [new] (from 2001-10-10)
+
+Tue Oct 16 00:07:06 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* parse.y (yylex): disallow alpha-numeric and mbchar for
+	  terminator of %string.
+
+Mon Oct 15 18:00:05 2001  Pit Capitain  <pit@capitain.de>
+
+	* string.c (rb_str_index): wrong increment for non alphanumeric
+	  string.
+
+Mon Oct 15 05:23:02 2001  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* sprintf.c (rb_f_sprintf): support "%B".
+
+Wed Oct 10 03:11:47 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_stat_clone): should copy internal data too.
+
+	* numeric.c (num_clone): Numeric should not be copied by clone.
+
+	* object.c (rb_obj_clone): should check immediate values.
+
+	* parse.y (command): `yield' should take command_args.
+
+	* parse.y (parse_quotedwords): %w(...) is not a string.
+
+Tue Oct  9 18:40:35 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* process.c (Init_process): activate the case NT.
+
+Tue Oct  9 17:08:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (thread_status_name): separated from
+	  rb_thread_inspect(). return string expression for thread status.
+
+	* eval.c (rb_thread_status, rb_thread_inspect): use
+	  thread_status_name().
+
+	* eval.c (rb_thread_priority_set): return the priority not but
+	  self.
+
+Sat Oct  6 23:07:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): NODE_MATCH3 was confusing left and right. sigh.
+
+Fri Oct  5 15:19:46 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_unique): should not dump anonymous class.
+
+Fri Oct  5 11:59:13 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (proc_s_new): revived.
+
+	* eval.c (Init_Proc): define Proc.new instead of Proc.allocate to
+	  inhibit from creating uninitialized Proc.
+
+Thu Oct  4 14:11:03 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_connect): EALREADY is the equivalent
+	  for EINPROGRESS in ws2_32.lib.
+
+Wed Oct  3 20:11:06 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* re.c (rb_reg_s_alloc): avoid infinite recursion.
+
+Wed Oct  3 16:49:49 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/gdbm/gdbm.c (rb_gdbm_fetch): str is a VALUE now.
+
+Wed Oct  3 13:32:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_object): better allocation type check for
+	  TYPE_UCLASS. usage of allocation framework is disabled for now.
+
+	* variable.c (rb_class_path): Module may have subclass.
+
+	* string.c (rb_str_update): should maintain original negative
+	  offset.
+
+	* string.c (rb_str_subpat_set): ditto
+
+	* string.c (rb_str_aset): ditto.
+
+	* re.c (rb_reg_nth_match): should check negative nth.
+
+	* re.c (rb_reg_nth_defined): ditto.
+
+Tue Oct  2 19:12:47 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/ftools.rb (catname): allow trailing '/' for the destination.
+
+Tue Oct  2 18:31:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): should override existing class.
+
+Tue Oct  2 17:08:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_alloc): general instance allocation framework.
+	  use of NEWOBJ() is deprecated except within 'allocate' method.
+
+Tue Oct  2 08:04:52 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* marshal.c (r_object): TYPE_UCLASS check should be inversed.
+
+Mon Oct  1 19:18:54 2001  Tanaka Akira  <akr@m17n.org>
+
+	* ext/socket/socket.c (unix_addr): getsockname(2) may result len = 0.
+
+	* ext/socket/socket.c (unix_peeraddr): getpeername(2) may result
+	  len = 0.
+
+Mon Oct  1 09:59:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_subpat_set): support function for new argument
+	  pattern String#[re,offset] = val. [new]
+
+Sat Sep 29 02:30:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (POP_BLOCK): rb_gc_force_recycle() was called too much.
+	  Should not be called if SCOPE_DONT_RECYCLE is set.
+
+Wed Sep 26 22:21:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_aref_m): new argument pattern
+	  String#[re,offset]. [new]
+
+Wed Sep 26 19:02:39 2001  Guy Decoux  <ts@moulon.inra.fr>
+
+	* parse.y: allow 'primary[] = arg'
+
+Tue Sep 25 10:46:42 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* win32/win32.c (isInternalCmd): check return value of NtMakeCmdVector
+	  (Tietew <tietew@tietew.net>'s patch).
+
+Mon Sep 24 00:55:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_substr): should return an instance of
+	  receiver's class.
+
+	* string.c (rb_str_succ): ditto.
+
+	* array.c (rb_ary_subseq): ditto.
+
+	* array.c (rb_ary_initialize): Array.new([1,2,3]) => [1,2,3]. [new]
+
+Sat Sep 22 22:16:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_reverse): should return an instance of
+	  receiver's class.
+
+	* string.c (rb_str_times): ditto.
+
+	* array.c (rb_ary_times): ditto
+
+	* string.c (str_gsub): ditto.
+
+	* string.c (rb_str_ljust): ditto.
+
+	* string.c (rb_str_rjust): ditto.
+
+	* string.c (rb_str_center): ditto.
+
+Sat Sep 22 12:13:39 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (eval): retrieves file, line information from binding.
+
+Thu Sep 20 21:25:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (MATCH_DATA): access via rb_svar().
+
+Thu Sep 20 15:20:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c, intern.h (rb_svar): return reference to special variable
+	  from local variable index. [new]
+
+	* eval.c (rb_eval): use rb_svar() for NODE_FLIP{2,3}.
+
+	* parse.y (rb_(backref|lastline)_(get|set)): access via rb_svar().
+
+	* eval.c (proc_invoke): push dynamic variables.
+
+	* eval.c (rb_thread_yield): push special variables as dynamic
+	  variables($_, $~ and FLIP states).
+
+Thu Sep 20 15:20:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* intern.h, parse.y (rb_is_local_id): return true if the ID is
+	  local symbol. [new]
+
+	* parse.y (internal_id): make new ID for internal use. [new]
+
+	* parse.y (cond0): allocate internal ID for NODE_FLIP{2,3}.
+
+	* eval.c (rb_f_local_variables): use rb_is_local_id() to select
+	  visible local variables.
+
+Thu Sep 20 15:20:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_thread_start_0): SCOPE_SHARED is removed.
+
+	* eval.c, intern.h (rb_thread_scope_shared_p): removed. special
+	  variables are no longer shared by threads.
+
+	* re.c (rb_reg_search): MATCHDATA is no longer shared by threads.
+
+Tue Sep 18 11:44:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_init): String.new() => "" [new]
+
+Tue Sep 11 20:53:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_path): new method.
+
+	* dir.c (dir_initialize): wrap DIR into struct, along with path
+	  information.
+
+Sat Sep  8 07:13:42 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/net/telnet.rb: waitfor(): improvement. thanks to
+	  nobu.nakada@nifty.ne.jp
+
+Sat Sep  8 04:34:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_restore_context): save current value of
+	  lastline and lastmatch in the thread struct for later restore.
+
+	* eval.c (rb_thread_save_context): restore lastline and lastmatch.
+
+Fri Sep  7 11:27:56 2001  akira yamada  <akira@ruby-lang.org>
+
+	* numeric.c (flo_to_s): should handle negative float value.
+
+Fri Sep  7 09:44:44 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/net/telnet.rb: waitfor(): bug fix.
+
+Fri Sep  7 07:11:34 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: CGI#doctype(): bug fix (html4Fr).
+
+	* lib/net/telnet.rb, lib/cgi.rb: remove VERSION, RELEASE_DATE,
+	  VERSION_CODE, RELEASE_CODE. please use REVISION.
+
+	* lib/cgi.rb: CGI#header(): bug fix.
+
+	* lib/net/telnet.rb, lib/cgi.rb: concat --> +=
+
+Thu Sep  6 17:38:18 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* dir.c (dir_s_chdir): raise if environment variable HOME/LOGDIR
+	  not set.
+
+	* dir.c (glob_helper): avoid infinite loop on a file name with
+	  wildcard characters. (ruby-bugs#PR177)
+
+Thu Sep  6 14:25:15 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_base_s_hexdigest): remove a debug
+	  print.
+
+Thu Sep  6 13:56:14 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/digest.c (rb_digest_base_s_digest,
+	  rb_digest_base_s_hexdigest): ensure that a string is given.
+
+Thu Sep  6 13:28:51 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/jcode.rb (_regexp_quote): fix quote handling, again.
+
+Thu Sep  6 07:28:56 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* file.c (rb_find_file_ext): add const qualifiers to ext.
+
+	* intern.h (rb_find_file_ext): ditto.
+
+Thu Sep  6 07:16:14 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/socket/socket.c (Init_socket): remove duplicating constants.
+
+Thu Sep  6 03:15:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_include_module): should check whole ancestors to
+	  avoid duplicate module inclusion.
+
+Wed Sep  5 20:02:27 2001  Shin'ya Adzumi  <adzumi@denpa.org>
+
+	* string.c (trnext): should check backslash before updating "now"
+	  position.
+
+Wed Sep  5 17:41:11 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/jcode.rb (_regexp_quote): fix quote handling.
+
+Tue Sep  4 01:03:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (Init_Regexp): to_s to be alias to inspect.
+
+Mon Sep  3 22:46:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): should support 'keyword='.
+
+Mon Sep  3 20:26:08 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* intern.h (rb_find_file_ext): changed from rb_find_file_noext().
+
+Mon Sep  3 15:12:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): should not adjust argc/argv if -e option
+	  is supplied.
+
+Mon Sep  3 14:11:17 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* error.c: unbreak the build on *BSD with gcc 3.0.1 by removing
+	  the conflicting declaration of sys_nerr for *BSD.
+
+Sat Sep  1 18:50:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): should not alter origargv[].
+
+	* ruby.c (set_arg0): long strings for $0 dumped core.
+
+Sat Sep  1 09:50:54 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ruby.c (set_arg0): prevent SEGV when val is longer than the
+	  original arguments.
+
+	* ruby.c (ruby_process_options): initialize total length of
+	  original arguments at first.
+
+Sat Sep  1 14:05:28 2001  Brian F. Feldman  <green@FreeBSD.org>
+
+	* ruby.c (set_arg0): use setprogtitle() if it's available.
+
+Sat Sep  1 03:49:11 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_popen): accept integer flags as mode.
+
+Fri Aug 31 19:46:05 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* file.c (rb_find_file_ext): extension table can be supplied from
+	  outside.  renamed.
+
+	* eval.c (rb_f_require): replace rb_find_file_noext by
+	  rb_find_file_ext.
+
+Fri Aug 31 19:26:55 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_provided): should also check feature without
+	  extension.
+
+Fri Aug 31 13:06:33 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (flo_to_s): do not rely on decimal point to be '.'
+
+Wed Aug 29 02:18:53 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): ternary ? can be followed by newline.
+
+Tue Aug 28 00:40:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_require): should check static linked libraries
+	  before raising exception.
+
+Fri Aug 24 15:17:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_equal): check identity equality first.
+
+	* string.c (rb_str_equal): ditto.
+
+	* struct.c (rb_struct_equal): ditto.
+
+Fri Aug 24 14:38:17 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* dln.c (dln_strerror): fix a bug that sometimes made null message on
+	  win32 (Tietew <tietew@tietew.net>'s patch).
+
+	* win32/win32.c (mystrerror): ditto.
+
+Fri Aug 24 03:15:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (Init_Numeric): undef Integer::new.
+
+Fri Aug 24 00:46:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): NODE_WHILE should update result for each
+	  conditional evaluation.
+
+	* eval.c (rb_eval): NODE_UNTIL should return last evaluated value
+	  (or value given to break).
+
+Thu Aug 23 21:59:38 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* enum.c (sort_by_i): fix typo.
+
+Thu Aug 23 10:10:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (is_defined): should not dump core for "defined?(())".
+
+	* eval.c (umethod_bind): recv can be an instance of descender of
+	  oklass if oklass is a Module.
+
+Wed Aug 22 23:20:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_equal): check identity equality first.
+
+Wed Aug 22 19:58:59 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (intersect_fds): counts intersecting fds.
+
+	* eval.c (rb_thread_schedule): only fds requested by
+	  each thread count as select_value.
+
+Tue Aug 21 22:28:09 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* file.c (group_member): should check real gid only.
+
+	* file.c (eaccess): do not cache euid, since effective euid may be
+	  changed via Process.euid=().
+
+	* file.c (eaccess): return -1 unless every specified access mode
+	  is permitted.
+
+Tue Aug 21 16:09:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): while/until returns the value which is given
+	  to break.
+
+	* parse.y (value_expr): using while/until/class/def as an
+	  expression is now gives a warning, not an error.
+
+Tue Aug 21 11:56:02 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_eqq): should compare strings based on magical
+	  increment (using String#upto), not dictionary order.
+
+Mon Aug 20 19:53:16 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/digest/sha2/extconf.rb: fix support for cross-compiling.
+
+	* mkconfig.rb: fix support for autoconf 2.52.
+
+Mon Aug 20 17:24:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_sort_by): new method for Schewartzian transformed
+	  stable sort.
+
+Mon Aug 20 16:09:05 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (mod_av_set): detect constant overriding for built-in
+	  classes/modules.
+
+Mon Aug 20 15:14:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (tokadd_escape): escaped backslashes too much.
+
+Mon Aug 20 13:24:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_step): 'iter' here should be an array.
+
+Mon Aug 20 12:43:08 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): should retrieve __member__ data from
+	  non-singleton class.
+
+Sat Aug 18 23:11:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_cvar_get): class variable override check added.
+
+	* variable.c (rb_cvar_set): ditto
+
+	* variable.c (rb_cvar_declare): ditto.
+
+Fri Aug 17 12:13:48 2001  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/protocol.rb: Protocol.new requires at least one arg.
+
+	* lib/net/smtp.rb: ditto.
+
+	* lib/net/pop.rb: ditto.
+
+	* lib/net/http.rb: ditto.
+
+Fri Aug 17 00:49:51 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parse_regx): handle backslash escaping of delimiter here.
+
+Thu Aug 16 23:03:40 2001  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* io.c: prevent recursive malloc calls on NEC UX/4800.
+
+	* ext/socket/socket.c: ditto.
+
+Thu Aug 16 13:54:04 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (s_recvfrom): fix typo.
+
+Thu Aug 16 09:53:28 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (s_recvfrom): avoid VC++6 warning.
+
+Thu Aug 16 03:50:33 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* win32/win32.c (NtCmdGlob): avoid VC++ warning.
+
+	* lib/mkmf.rb: add -I$(srcdir) to CPPFLAGS.
+
+Wed Aug 15 04:59:15 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/*/extconf.rb: really fix so that they build from any
+	  directory.
+
+Wed Aug 15 04:04:02 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/sha2/extconf.rb: fix so that they build from any
+	  directory.
+
+Wed Aug 15 01:59:19 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/defs.h: Define NO_UINT64_T instead of emitting an
+	  error to fail.
+
+	* ext/digest/sha2/extconf.rb: Do not exit on error, and utilize
+	  NO_UINT64_T to detect if the system has a 64bit integer type.
+
+Tue Aug 14 21:14:07 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/sha2/extconf.rb: do not create Makefile when no 64bit
+	  integer type is detected.
+
+Tue Aug 14 17:09:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_step): new method.
+
+Tue Aug 14 11:49:00 2001  TOYOFUKU Chikanobu  <toyofuku@juice.or.jp>
+
+	* string.c (rb_str_cmp): remove needless conditional.
+
+Tue Aug 14 03:23:25 2001  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* string.c (rb_str_lstrip_bang) `return Qnil' was missing.
+
+Mon Aug 13 14:16:46 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* bignum.c, marshal.c: Detypo: s/SIZEOF_ING/SIZEOF_INT/.
+
+Sun Aug 12 15:01:58 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* string.c (rb_str_cat): fix buffer overflow.
+
+	* string.c (rb_str_append): nothing to append actually when `str2'
+	  is empty.
+
+Sat Aug 11 14:43:47 2001  Tanaka Akira  <akr@m17n.org>
+
+	* array.c (rb_inspecting_p): initialize inspect_key if it is
+	  not initialized yet.
+
+Fri Aug 10 22:14:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (cond0): operands of logical operators are not treated
+	  as conditional expression anymore, but propagate conditional
+	  status if used in conditionals.
+
+Tue Aug  7 09:10:32 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* win32/win32.h: fix problems with BC++ (ruby-bugs#PR161).
+
+Mon Aug  6 23:47:46 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* pack.c (pack_pack): associates p/P strings once at last
+	  (reverted to 1.26).
+
+	* string.c (rb_str_associate): associates an Array at once, not
+	  but a String. realloc's when str_buf.
+
+Mon Aug  6 17:01:33 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_gc_mark_threads): should mark ruby_cref.
+
+Mon Aug  6 14:31:37 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* numeric.c (num_divmod): fix typo.
+
+Mon Aug  6 03:29:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_lstrip_bang): new method.
+
+	* string.c (rb_str_rstrip_bang): new method.
+
+Mon Aug  6 00:35:03 2001  Guy Decoux  <decoux@moulon.inra.fr>
+
+	* struct.c (rb_struct_modify): should check frozen and taint
+	  status.
+
+Sun Aug  5 19:28:39 2001  Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
+
+	* string.c (rb_str_associate): should consider STR_ASSOC too.
+
+Sun Aug  5 07:46:18 2001  Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_undefined): do not recurse if method_missing is
+	  undefined.
+
+Thu Aug  2 21:37:32 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (proc_waitpid): now all arguments are optional.
+
+	* process.c (Init_process): waitpid is now alias to wait.
+
+	* process.c (Init_process): waitpid2 is now alias to wait2.
+
+	* process.c (rb_waitpid): made public.
+
+	* ext/pty/pty.c (pty_getpty): avoid disturbing SIGCHLD using
+	  thread and rb_waitpid.
+
+Thu Aug  2 11:23:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (proc_getpgrp): now takes no argument on all
+	  platforms.
+
+	* process.c (proc_setpgrp): ditto.
+
+Thu Aug  2 01:29:42 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* file.c (strrdirsep): removed meaningless code.
+
+	* file.c (rb_file_s_expand_path): reverted to 1.66.
+
+Wed Aug  1 16:17:47 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_s_pack_sockaddr_in): added
+	  Socket::pack_sockaddr_in(). [new]
+
+	* ext/socket/socket.c (sock_s_pack_sockaddr_un): added
+	  Socket::pack_sockaddr_un(). [new]
+
+	* ext/socket/socket.c (sock_s_pack_sockaddr_in): added
+	  Socket::unpack_sockaddr_in(). [new]
+
+	* ext/socket/socket.c (sock_s_pack_sockaddr_un): added
+	  Socket::unpack_sockaddr_un(). [new]
+
+Wed Aug  1 15:42:16 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* eval.c (ruby_run): avoid VC++ warning.
+
+Tue Jul 31 17:30:53 2001  Usaku Nakamura  <usa@ruby-lang.org>
+
+	* marshal.c (Init_marshal): fix typos.
+
+Tue Jul 31 15:16:39 2001  Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
+
+	* process.c (last_status_set): nothing returned, should be void.
+
+	* ext/socket/socket.c (load_addr_info): ditto.
+
+Tue Jul 31 12:11:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (Init_marshal): new constant Marshal::MAJOR_VERSION
+	  and Marshal::MINOR_VERSION.
+
+Tue Jul 31 07:18:04 2001  Nobuyoshi Nakada <nobu.nokada@softhome.net>
+
+	* file.c (rb_file_s_expand_path): scans per path element not per
+	  byte/character, including fix of [ruby-talk:18152] and
+	  multi-byte pathname support.
+
+Tue Jul 31 11:52:10 2001  akira yamada  <akira@ruby-lang.org>
+
+	* marshal.c (marshal_load): ruby_verbose test should be wrapped by
+	  RTEST().
+
+Mon Jul 30 17:54:23 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_index): should return nil (not the default
+	  value) if value is not in the hash.
+
+Mon Jul 30 12:55:47 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (num_div): new method added.  alias to '/' which
+	  should be preserved even if '/' is redefined (e.g. by
+	  mathn). [new]
+
+Mon Jul 30 11:12:14 2001  Amos Gouaux <amos+ruby@utdallas.edu>
+
+	* lib/net/imap.rb: added new commands for managing folder quotas
+	  and folder ACLs.
+
+Mon Jul 30 03:19:53 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_cstr2inum): "0 ff".hex should return 0, not 255.
+
+Fri Jul 27 22:29:41 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* file.c (rb_file_s_expand_path): fixed using CharNext().
+
+Fri Jul 27 18:07:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_provided): extension should be guessed using
+	  rb_find_file_noext().
+
+	* eval.c (rb_f_require): should call rb_feature_p() after
+	  extension completion.
+
+Fri Jul 27 16:25:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): add CHECK_INTS before next, redo, retry to
+	  avoid potential uninterruptable infinite loop.
+
+Thu Jul 26 11:27:12 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* file.c (rb_find_file_noext, rb_find_file): fix tilde expansion
+	  problem.
+
+Wed Jul 25 17:54:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_file_s_expand_path): use CharNext() to expand.
+
+Wed Jul 25 17:16:26 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* intern.h: add some missing function prototypes.
+
+Wed Jul 25 15:50:05 2001  Guy Decoux  <decoux@moulon.inra.fr>
+
+	* file.c (rb_file_s_expand_path): should not expand "." and ".."
+	  not following dirsep.
+
+Wed Jul 25 12:15:32 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* file.c (rb_find_file_noext): should update f by expanded path.
+
+	* file.c (rb_find_file): ditto.
+
+Tue Jul 24 23:10:47 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* file.c (strrdirsep): multi-byte pathname and DOSish separator
+	  support. originally comes from Patrick Cheng. [new]
+
+	* file.c (rb_file_s_basename, rb_file_s_dirname): use
+	  strrdirsep(). comes from Patrick Cheng.
+
+	* file.c (is_absolute_path): restricted in DOSish absolute path
+	  with drive letter, and UNC support. originally comes from
+	  Patrick Cheng.
+
+	* file.c (getcwd): define macro using getwd() unless provided.
+
+Tue Jul 24 19:23:15 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/extmk.rb.in, lib/mkmf.rb: dig the target subdirectory for
+	  lib/* files properly in case of create_makefile("dir/name").
+
+Mon Jul 23 00:26:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_provide_feature): should not tweak extension used for
+	  loading.
+
+Sun Jul 22 21:16:43 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/extmk.rb.in, lib/mkmf.rb: introduce a couple of new make
+	  variables: CLEANFILES and DISTCLEANFILES.  They'd typically be
+	  defined in a file "depend".
+
+Sat Jul 21 09:40:10 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* io.c (io_fread): use fread(3) if PENDING_COUNT is available.
+
+Fri Jul 20 22:55:01 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* gc.c (ruby_xrealloc): fix a dangling bug which led memory
+	  reallocation to fail even though the second try after a GC
+	  succeeds.
+
+Fri Jul 20 03:00:46 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* class.c (rb_mod_include_p): Module#include? added. [new]
+
+Fri Jul 20 01:05:50 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (ignorecase_setter): give warning on modifying $=.
+
+	* string.c (rb_str_casecmp): new method. [new]
+
+	* string.c (rb_str_eql): separated from rb_str_equal(), make it
+	  always be case sensitive. [new]
+
+	* string.c (rb_str_hash): made it always be case sensitive.
+
+Thu Jul 19 13:03:15 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_f_require): should not include path in $" value
+
+	* file.c (rb_find_file): should return 0 explicitly on failure.
+
+Tue Jul 17 11:44:40 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* ruby.h: enable volatile directive with VC++.
+
+	* regex.c: ditto.
+
+Tue Jul 17 06:01:12 2001  Minero Aoki  <aamine@loveruby.net>
+
+	* doc/net/smtp.rd.ja, pop.rd.ja, http.rd.ja: new files.
+
+	* MANIFEST: add doc/net/{http,pop,smtp}.rd.ja.
+
+Tue Jul 17 11:22:01 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (NUM_FAILURE_ITEMS): was confusing NUM_REG_ITEMS and
+	  NUM_NONREG_ITEMS, which have happened to be same value.
+
+Tue Jul 17 11:08:34 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* ext/extmk.rb.in: modify RM macro because command.com/cmd.exe don't
+	  recognize single quotation as quote character.
+
+	* lib/mkmf.rb: ditto.
+
+Tue Jul 17 01:38:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_class_new): subclass check moved to this function.
+
+	* class.c (rb_class_boot): check less version of rb_class_new().
+
+Man Jul 16 13:21:30 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* file.c (file_load_ok): fix typo.
+
+Mon Jul 16 12:58:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): should preserve iter status for embedded
+	  frame in the block.
+
+Mon Jul 16 00:04:39 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_file_s_expand_path): may overrun buffer on stack.
+
+Sun Jul 15 01:38:28 2001  Guy Decoux  <decoux@moulon.inra.fr>
+
+	* string.c (rb_str_insert): forgot to call rb_str_modify().
+
+Sat Jul 14 12:26:30 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/digest/*/extconf.rb: fix so that they build from any
+	  directory.
+
+Sat Jul 14 06:20:17 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/net/http.rb: HTTP#proxy? did not worked.
+
+Sat Jul 14 02:56:19 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/extmk.rb.in: support multi-level ext/ directories.
+	  (e.g. you can have ext/foo, ext/foo/bar and ext/foo/baz)
+
+Sat Jul 14 02:55:02 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/.cvsignore: let cvs ignore extinit.c.
+
+Fri Jul 13 23:47:35 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_search): should consider reverse search.
+
+Fri Jul 13 22:26:09 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb: use File::split to split a target into a prefix and
+	  a module name.  This also works around a just found bug of
+	  String#rindex.
+
+	* ext/extmk.rb.in: ditto.
+
+Fri Jul 13 02:36:10 2001  Minero Aoki  <aamine@loveruby.net>
+
+	* dir.c (dir_s_chdir): warn only when invoked from multiple
+	  threads or block is not given.
+
+Thu Jul 12 15:11:48 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_connect): workaround for the setup of
+	  Cygwin socket(EALREADY).
+
+Mon Jul  9 16:49:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb.in: modify RM macro.
+
+	* lib/mkmf.rb: ditto.
+
+Sun Jul  8 20:52:02 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ruby.h: fix a wrong function name: rb_iglob() -> rb_globi().
+
+Sun Jul  8 16:04:35 2001  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: rename HTTP#request_by_name to send_request.
+
+	* lib/net/protocol.rb (ProtoSocket#read): modify typo.
+
+Sat Jul  7 17:45:35 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_convert_type): should use rb_rescue(), not rb_rescue2().
+
+	* range.c (range_init): ditto.
+
+Fri Jul  6 18:01:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_dup): copies (actually does not free)
+	  generic_ivar on dupif original owns them.
+
+Fri Jul  6 02:15:06 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/tempfile.rb: a tempfile must be created with mode 0600.
+
+Thu Jul  5 20:28:53 2001  Tietew <tietew@tietew.net>
+
+	* string.c (rb_str_each_line): should propagate taint mark.
+
+	* ext/nkf/nkf.c (rb_nkf_kconv): ditto.
+
+Fri Jul  6 14:54:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_require): revamp for simpler implementation.
+
+	* file.c (rb_find_file_noext): use String object, instead of
+	  passing char* around.
+
+	* file.c (rb_find_file): ditto.
+
+Thu Jul  5 22:01:02 2001  Mitsuhiro Kondo  <kondo@nik-prt.co.jp>
+
+	* dln.c (dln_load): should use NSLINKMODULE_OPTION_BINDNOW.
+
+Thu Jul  5 13:44:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (load_file): local variables 'c' remain uninitialized on
+	  xflag.
+
+Thu Jul  5 10:00:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_match): prefetched escaped character too early.
+
+Wed Jul  4 08:58:30 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): add argument check for attr_readers.
+
+Wed Jul  4 04:22:44 2001  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (HTTP#request_by_name): arg order changes.
+
+Wed Jul  4 04:07:36 2001  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb (HTTP#request_by_name): bug fix.
+
+	* lib/net/http.rb: does not write Connection: by default.
+
+	* lib/net/protocol.rb: "start" for started protocol is an error.
+
+	* lib/net/protocol.rb: "finish" for finished protocol is an error.
+
+Wed Jul  4 03:17:31 2001  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: new method HTTP#request_by_name (test)
+
+	* lib/net/http.rb: new class HTTPGenericRequest
+
+Tue Jul  3 23:58:29 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb: distclean should remove mkmf.log as well.
+
+Tue Jul  3 18:35:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval_string_wrap): should push frame (and adjust
+	  cbase) before wrapped eval.
+
+	* eval.c (rb_eval_cmd): ditto.
+
+	* eval.c (eval): should update ruby_class always after all.
+
+Tue Jul  3 14:56:27 2001  Shugo Maeda <shugo@ruby-lang.org>
+
+	* eval.c (block_pass): do not change wrapper information.
+
+	* eval.c (rb_yield_0):  preserve wrapper information.
+
+Tue Jul  3 08:59:50 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* error.c (rb_name_error): raise NameError instead of LoadError.
+
+Mon Jul  2 17:22:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (exc_exception): clone the receiver exception instead of
+	  creating brand new exception object of the receiver.
+
+Mon Jul  2 09:53:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval_string_wrap): extend new ruby_top_self, not
+	  original self.
+
+	* eval.c (rb_eval_cmd): respect ruby_wrapper if set.
+
+	* eval.c (eval): do not update ruby_class unless scope is not
+	  provided.
+
+Sun Jul  1 10:51:15 2001  Shugo Maeda <shugo@ruby-lang.org>
+
+	* eval.c (eval): preserve wrapper information.
+
+	* eval.c (proc_invoke): ditto.
+
+	* eval.c (block_pass): ditto.
+
+Sat Jun 30 02:55:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (void_expr): too much warnings for void context
+	  (e.g. foo[1] that can be mere Proc call).
+
+Fri Jun 29 17:23:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (rb_name_error): new function to raise NameError with
+	  name attribute set.
+
+	* eval.c (rb_f_missing): set name and args in the exception
+	  object. [new]
+
+	* error.c (name_name): NameError#name - new method.
+
+	* error.c (nometh_args): NoMethodError#args - new method.
+
+Fri Jun 29 15:29:31 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lex.c (rb_reserved_word): lex_state after tRESCUE should be
+	  EXPR_MID.
+
+Thu Jun 28 00:21:28 2001  Keiju Ishitsuka <keiju@ishitsuka.com>
+
+	* lib/matrix.rb: resolve 'ruby -w' warnings.
+
+	* lib/irb/locale.rb: resolve 'ruby -w' warnings.
+
+	* lib/irb/multi-irb.rb: resolve 'ruby -w' warnings.
+
+	* lib/irb/ruby-lex.rb: fix problem for "\\M-\\..." and "\\C-\\..."
+	  and resolve 'ruby -w' warnings.
+
+	* lib/irb/ruby-token.rb: fix typo
+
+	* lib/shell/command-processor.rb: resolve 'ruby -w' warnings.
+
+Wed Jun 27 08:53:26 2001  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/pop.rb: new methods POP3.auth_only, POP3#auth_only
+
+	* lib/net/http.rb: HTTP.Proxy returns self if ADDRESS is nil.
+
+	* lib/net/protocol.rb: new method ProtocolError#response
+
+	* lib/net/protocol.rb,smtp.rb,pop.rb,http.rb: add document.
+
+Tue Jun 26 18:42:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (add_heap): allocation size of the heap unit is doubled for
+	  each allocation.
+
+Mon Jun 25 09:54:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (isdelim): space, tab, and newline are no longer
+	  delimiters for glob patterns.
+
+Sat Jun 23 22:28:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (svalue_to_avalue): new conversion scheme between single
+	  value and array values.
+
+	* eval.c (avalue_to_svalue): ditto.
+
+	* eval.c (rb_eval): REXPAND now uses avalue_to_svalue(), return
+	  and yield too.
+
+	* eval.c (rb_yield_0): use avalue_to_svalue().
+
+	* eval.c (proc_invoke): Proc#call gives avaules, whereas
+	  Proc#yield gives mvalues.
+
+	* eval.c (bmcall): convert given value (svalue) to avalue.
+
+Sat Jun 23 18:28:52 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/readline/readline.c (readline_event): a non-void function
+	  should return a value.
+
+Fri Jun 22 23:17:28 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_connect): workaround for the setup of
+	  Cygwin socket.
+
+Fri Jun 22 23:11:17 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
+
+	* lib/irb/locale.rb: fix for require "kconv" problem
+
+Fri Jun 22 18:08:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): no mvalue_to_svalue conversion here.
+
+	* eval.c (massign): takes svalue, convert it to mvalue inside.
+
+	* eval.c (rb_eval): parameters for yield/return are always
+	  svalues now.
+
+	* eval.c (svalue_to_mvalue): more strict conversion.
+
+	* eval.c (mvalue_to_svalue): ditto.
+
+Fri Jun 22 17:12:23 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* st.c (new_size): prime hash size enabled.
+
+	* ext/socket/socket.c (Init_socket): SO_* constants added.
+
+Tue Jun 19 22:24:07 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* gc.c (rb_setjmp): avoid GCC 3.0 warnings.
+
+Tue Jun 19 18:19:30 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/readline/readline.c: add new methods:
+	  Readline::completion_append_character and
+	  Readline::completion_append_character=.
+
+Tue Jun 19 16:29:50 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (svalue_to_mvalue): new function to convert from svalue
+	  to mvalue. [experimental]
+
+	* eval.c (mvalue_to_svalue): new function to convert from mvalue
+	  to svalue.
+
+	* eval.c (rb_eval): use mvalue_to_svalue().
+
+	* eval.c (rb_yield_0): use mvalue_to_svalue().
+
+	* eval.c (proc_invoke): proper mvalue handling.
+
+Mon Jun 18 17:38:50 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_require): searches ".rb" and ".so" at the same
+	  time.  previous behavior (search ".rb", then ".so") has a
+	  security risk (ruby-bugs#PR140).
+
+	* array.c (rb_ary_to_ary): new function to replace internal
+	  rb_Array(), which never calls to_a, but to_ary (rb_Array() might
+	  call both). [new]
+
+Mon Jun 18 00:43:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (PUSH_FAILURE_POINT): push option status again.
+
+	* regex.c (re_compile_pattern): avoid pushing unnecessary
+	  option_set.
+
+Sat Jun 16 10:58:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_load): tainted string is OK if wrapped *and*
+	  $SAFE >= 4.
+
+Thu Jun 14 16:27:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_start_0): should not nail down higher blocks
+	  before preserving original context (i.e. should not alter
+	  original context).
+
+Wed Jun 13 19:34:59 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* dir.c (Init_Dir): add a new method File::fnmatch? along with
+	  File::Constants::FNM_*.  While I am here, FNM_NOCASE is renamed
+	  to FNM_CASEFOLD which is commonly used by *BSD and GNU libc.
+
+Wed Jun 13 09:33:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_yield): new method equivalent to Proc#call but no
+	  check for number of arguments. [new]
+
+Tue Jun 12 14:21:28 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* lib/mkmf.rb: target_prefix is only for installation, not for
+	  build.
+
+Tue Jun 12 00:41:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (method_eq): new method Method#==. [new]
+
+Mon Jun 11 14:29:41 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* confgure.in: add RUBY_CANONICAL_BUILD.
+
+Sun Jun 10 17:31:47 2001  Guy Decoux  <decoux@moulon.inra.fr>
+
+	* gc.c (STR_NO_ORIG): STR_NO_ORIG value was different between
+	  string.c and gc.c
+
+Sat Jun  9 22:10:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): should convert *non-array at the end of
+	  arguments by using Array().
+
+Sat Jun  9 17:04:30 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* hash.c (ruby_setenv): readline library leaves their environment
+	  strings uncopied.  "free" check revised.
+
+Sat Jun  9 16:31:03 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* ext/extmk.rb.in: Use -F and -T for mswin32 because cl.exe doesn't
+	  support -o officially and cl.exe considers that *.cc and *.cxx are
+	  OBJs.
+
+	* lib/mkmf.rb: ditto.
+
+	* win32/Makefile.sub: Use del instead of rm.
+	  All these changes are derived from Nobuyoshi Nakada's patch.
+	  Thanks.
+
+Fri Jun  8 22:37:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (Init_stack): avoid __builtin_frame_address(2) to retrieve
+	  stack bottom line.
+
+Fri Jun  8 18:14:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* st.c (numhash): should shuffle bits by dividing by prime number.
+
+Fri Jun  8 17:05:21 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): multiple assignment behavior fixed, which
+	  results "*a = nil" makes "a == []" now.
+
+Fri Jun  8 15:25:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_require): should set SCOPE_PUBLIC before calling
+	  dln_load().
+
+Thu Jun  7 17:28:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): exclude kDO_BLOCK too much by false condition.
+
+Wed Jun  6 23:02:36 2001  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/sync.rb: bug fix if obj.initialize has parameters when
+	  obj.extend(Sync_m)
+
+	* lib/mutex_m.rb: modified bit
+
+Wed Jun  6 16:11:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_load): should check if tainted even when wrap is
+	  specified.
+
+Wed Jun  6 14:34:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (mrhs_basic): "*arg" should always be expanded by REXPAND.
+
+	* regex.c (re_compile_pattern): too much optimization for the
+	  cases like /(.|a)b/.
+
+Tue Jun  5 23:58:43 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (fc_i): removed vast string allocation.
+
+Tue Jun  5 16:45:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (Init_Exception): NameError went under StandardError,
+	  and NoMethodError went under NameError.
+
+Tue Jun  5 16:40:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (rb_intern): non identifier symbols should be
+	  categorized as ID_JUNK. [new]
+
+Tue Jun  5 16:15:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_mod_const_at): use hash table as internal
+	  data. [new]
+
+	* variable.c (rb_mod_const_of): ditto.
+
+	* variable.c (rb_const_list): new function to convert internal
+	  data (hash table) to array of strings.
+
+	* eval.c (rb_mod_s_constants): data handling scheme has changed.
+
+Tue Jun  5 15:16:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_add_method): should not call rb_secure(), for
+	  last_func may not be set.
+
+	* io.c (rb_io_ctl): ioctl should accept any integer within C long
+	  range.
+
+Tue Jun  5 13:41:13 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/etc/extconf.rb: use egrep_cpp.
+
+Tue Jun  5 12:44:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_object): wrong type check for modules.
+
+	* marshal.c (w_object): should not dump anonymous classes/modules.
+
+Tue Jun  5 01:19:34 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_open_file): use rb_file_sysopen_internal() if the 3rd
+	  argument (permission flags) is given. [new, should be backported?]
+
+	* io.c (rb_io_mode_binmode): mode string (e.g. "r+") to flags to
+	  open(2).
+
+Mon Jun  4 23:55:54 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): NODE_REXPAND expand an array of 1 element as
+	  the element itself. [new, should be backported?]
+
+	* parse.y (ret_args): should treat "*[a]" in rhs expression as
+	  "a", not "[a]".
+
+Mon Jun  4 04:14:53 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/shellwords.rb: don't destroy argument.
+
+Sat Jun  2 23:23:05 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): should push option modifier at the
+	  right place.
+
+Sat Jun  2 23:05:20 2001  Shugo Maeda <shugo@ruby-lang.org>
+
+	* lib/cgi/session.rb: don't use module_function for Class.
+
+Sat Jun  2 00:02:22 2001  Keiju Ishitsuka <keiju@ishitsuka.com>
+
+	* irb messages: fix typos.
+
+Fri Jun  1 17:26:24 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* hash.c (replace_i): ignore when key == Qundef.
+
+Fri Jun  1 16:50:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (call_args2): confusion with list_append() and
+	  list_concat() was fixed.
+
+Fri Jun  1 15:01:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): fixed 'print CGI::bar() {}, "\n"' syntax
+	  breakage, adding new lex_state status.  sigh. [new]
+
+Fri Jun  1 11:21:04 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: use waitpid on mingw32.
+
+	* ext/dbm/extconf.rb: include <ndbm.h>, not <gdbm.h>.
+
+Thu May 31 18:34:57 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* file.c (rb_file_s_unlink): should not allow if $SAFE >= 2.
+
+Thu May 31 17:23:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (Init_Range): define "to_ary".
+
+Thu May 31 13:30:25 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* mkconfig.rb, ext/configsub.rb: VERSION -> RUBY_VERSION.
+
+Thu May 31 08:00:58 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* win32/dir.h: re-add.
+
+Thu May 31 01:25:59 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in: default --with-libc_r to `no' until the problem is
+	  fixed. (FreeBSD only)
+
+Tue May 29 17:24:23 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* ruby.c (proc_options): unexpected SecurityError happens when -T4.
+
+Tue May 29 18:46:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): * \1 .. \9 should be
+	  backreferences always.
+
+	* regex.c (re_match): backreferences corresponding to
+	  unclosed/unmatched parentheses should fail always.
+
+Tue May 29 16:35:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_cat): use rb_str_buf_cat() if possible. [new]
+
+	* string.c (rb_str_append): ditto.
+
+	* string.c (rb_str_buf_cat): remove unnecessary check (type,
+	  taint, modify) to gain performance.
+
+	* string.c (rb_str_buf_append): ditto.
+
+	* string.c (rb_str_buf_finish): removed.
+
+Tue May 29 02:05:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_buf_new): buffering string function. [new]
+
+	* string.c (rb_str_buf_append): ditto.
+
+	* string.c (rb_str_buf_cat): ditto.
+
+	* string.c (rb_str_buf_finish): ditto.
+
+Mon May 28 23:20:43 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: remove unnecessary AC_CANONICAL_BUILD
+
+	* defines.h: #define HAVE_SETITIMER on Cygwin(bug fixed).
+
+	* ruby.c: use relative path from LIBRUBY_SO.
+
+	* ruby.c: don't use -mwin32 option on Cygwin.
+
+	* cygwin/GNUmakefile.in: ditto.
+
+	* ext/sdbm/_sdbm: ditto.
+
+	* ext/tcltklib/extconf.rb: ditto.
+
+	* ext/tcltklib/stubs.c: ditto.
+
+Mon May 28 22:12:01 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/extconf.rb.in: make the priority of the make rule of .c
+	  higher than .C .
+
+Mon May 28 13:22:19 2001  Tanaka Akira  <akr@m17n.org>
+
+	* time.c (make_time_t): local time adjustment revised.
+
+Mon May 28 02:20:38 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* dir.c (glob_helper): teach has_magic() to handle flags and get
+	  glob_helper to properly support FNM_NOESCAPE.
+
+	* dir.c (fnmatch): fix a bug when FNM_PATHNAME and FNM_PERIOD are
+	  specified at the same time.
+
+Sat May 26 09:55:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y: accomplish extended syntax described in [ruby-talk:14525]
+	  using tSPC token. [new, experimental]
+
+Sat May 26 07:05:45 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* MANIFEST: add win32/dir.h .
+
+Fri May 25 20:03:51 2001  Pascal Rigaux  <pixel@mandrakesoft.com>
+
+	* dln.c (dln_find_1): should exclude directories in executable
+	  file lookup.
+
+Fri May 25 18:00:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_obj_singleton_methods): list methods in extended
+	  modules if optional argument is true. [new]
+
+Fri May 25 14:19:25 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* string.c (rb_str_replace): add taint status infection
+	  (OBJ_INFECT()).
+
+	* string.c (rb_str_crypt): ditto.
+
+	* string.c (rb_str_ljust): ditto.
+
+	* string.c (rb_str_rjust): ditto.
+
+	* string.c (rb_str_center): ditto.
+
+Fri May 25 05:39:03 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/sha1/sha1-ruby.c (sha1_hexdigest): fix buffer overflow.  The
+	  buffer for a SHA-1 hexdigest needs to be 41 bytes in length.
+
+Fri May 25 01:47:39 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* MANIFEST: update the entries I forgot to add or remove.
+
+Fri May 25 00:57:25 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/sha1/sha1-ruby.c (sha1_new): separate initialize() from
+	  new().
+
+	* ext/md5/md5init.c (md5i_new): ditto.
+
+Fri May 25 00:53:41 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/dbm/extconf.rb: fix support for *BSD and set $CFLAGS
+	  properly.
+
+Thu May 24 16:10:33 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_member): check based on "<=>" comparison. [new]
+
+	* range.c (range_check): add "succ" check if first end is not a
+	  numeric.
+
+	* range.c (range_eqq): comparison should based on "<=>".
+
+	* range.c (range_each): ditto.
+
+Thu May 24 16:08:21 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* mkconfig.rb: autoconf 2.50 support.
+
+Thu May 24 14:23:35 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): need argument adjustment for C defined
+	  blocks too.
+
+Thu May 24 01:11:30 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/dbm/extconf.rb: header search added. [new]
+
+Wed May 23 02:58:21 2001  Tanaka Akira  <akr@m17n.org>
+
+	* time.c (make_time_t): fix ad-hoc local time adjustment, using
+	  binary tree search.
+
+Tue May 22 17:10:35 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* variable.c (rb_alias_variable): should not allow variable
+	  aliasing if $SAFE >= 4.
+
+Tue May 22 02:37:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (expr): "break" and "next" to take optional expression,
+	  which is used as a value for termination. [new, experimental]
+
+	* eval.c (rb_eval): "break" can give value to terminating method.
+
+	* eval.c (rb_eval): "break" and "next" to take optional expression.
+
+	* eval.c (rb_yield_0): "next" can give value to terminating "yield".
+
+	* eval.c (rb_iterate): "break" can give value to terminating method.
+
+	* eval.c (proc_call): ditto.
+
+Mon May 21 13:15:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big2str): t should be protected from GC.
+
+Sat May 19 09:29:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_proc_times): need not to check return value from
+	  times(2).
+
+Fri May 18 05:36:08 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/extmk.rb.in (xsystem): backout the previous fix which was
+	  bogus.
+
+Fri May 18 05:19:55 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb (xsystem): make a temporary fix to get $(...) macros
+	  properly expanded on a command execution.
+
+	* ext/extmk.rb.in (xsystem): ditto.
+
+Fri May 18 03:45:55 2001  Brian F. Feldman  <green@FreeBSD.org>
+
+	* lib/mkmf.rb: unbreak "make install".  lib/* must be installed
+	  under $rubylibdir, not under $libdir.
+
+Fri May 18 01:28:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (expr): break, next, redo, retry are moved from primary.
+
+Fri May 18 01:11:02 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* ext/sha1/sha1-ruby.c (sha1_new): get rid of an unneeded
+	  rb_obj_call_init() call.
+
+Fri May 18 01:03:55 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* ext/sha1/sha1.txt, ext/sha1/sha1.txt.jp: fix typos.
+
+Thu May 17 19:17:11 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/shell.rb, lib/shell/process-controller.rb,
+	  lib/shell/command-processor.rb: translate Japanese comments into
+	  English.
+
+Thu May 17 19:07:14 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* doc/shell.rd.jp: RD'ify and make some fixes.
+
+	* doc/shell.rd: RD'ify, delete Japanese leftovers, make overall
+	  English fixes, and sync with doc/shell.rd.jp.
+
+Thu May 17 17:35:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): address of local_vars might change during eval.
+
+Thu May 17 07:27:09 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/md5/md5.txt.jp, ext/sha1/sha1.txt.jp:
+	  s/SuperClass/Superclass/.
+
+Thu May 17 07:21:44 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/Setup.dj, ext/Setup.emx, ext/Setup.nt, ext/Setup.x68:
+	  compile sha1 in as well as md5.
+
+	* ext/Setup: put sha1 in a comment.
+
+Thu May 17 07:16:38 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/sha1/sha1.txt.jp: add the Japanese version derived from
+	  ext/md5/md5.txt.jp.
+
+	* ext/sha1/sha1.txt: revise the copyright info and reduce the
+	  difference from ext/md5/md5.txt.
+
+	* ext/md5/md5.txt: reduce the difference from ext/sha1/sha1.txt.
+
+Thu May 17 07:11:35 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/sha1/extconf.rb, ext/sha1/sha1.c: use WORDS_BIGENDIAN to
+	  detect the platform's endian.
+
+Thu May 17 06:31:30 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/md5/md5.txt: make wording fixes, and mention the newly added
+	  method: "<<".
+
+	* ext/md5/md5.txt.jp: ditto.
+
+Wed May 16 18:05:52 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/md5/md5init.c: add an instance method "<<" as an alias for
+	  "update". (inspired by Steve Coltrin's ruby-sha1)
+
+Tue May 15 17:46:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_and): should not push frozen key string.
+
+	* array.c (rb_ary_or): ditto.
+
+Tue May 15 02:18:23 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/thread.rb: rescue ThreadError in case the thread is dead
+	  just before calling Thread#run.
+
+Mon May 14 13:50:22 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_schedule): should save context before raising
+	  deadlock, saved context for current thread might be obsolete.
+
+	* time.c (make_time_t): non DST timezone shift supported (hopefully).
+
+	* time.c (make_time_t): strict range detection for negative time_t.
+
+Mon May 14 11:54:20 2001  Tanaka Akira  <akr@m17n.org>
+
+	* signal.c: SIGINFO added.
+
+Mon May 14 08:57:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_ensure): should not SEGV when prot_tag is NULL.
+
+Sun May 13 23:51:14 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* win32/resource.rb: Modify copyright in resource script.
+
+Sun May 13 14:03:33 2001  Okada Jun  <yun@be-in.org>
+
+	* lib/thread.rb: fix Queue#pop and SizedQueue#max= to avoid
+	  deadlock.
+
+Sat May 12 15:43:55 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* win32/win32.c (kill): add support of signal 9 on mswin32/mingw32.
+
+Fri May 11 15:09:52 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ruby.h (rb_string_value): add volatile to avoid compiler warning.
+
+	* string.c (rb_string_value): ditto.
+
+Fri May 11 03:35:33 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* README.EXT: Document find_library(), with_config() and
+	  dir_config().
+
+Fri May 11 03:34:20 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* README.EXT.jp: Remove the description of find_header() because
+	  such a function does not actually exist.
+
+	* README.EXT.jp: Update the description of dir_config().
+
+Fri May 11 02:42:05 2001  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* README, README.jp: Fix CVS access and mailing lists info.
+
+Fri May 11 02:00:44 2001  Ryo HAYASAKA  <ryoh@jaist.ac.jp>
+
+	* bignum.c (bigdivrem): access boundary bug.
+
+Thu May 10 02:40:47 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): prohibit dumping out singleton classes.
+
+	* object.c (rb_mod_to_s): distinguish singleton classes.
+
+	* variable.c (rb_class2name): it's ok to reveal NilClass,
+	  TrueClass, FalseClass.
+
+Wed May  9 14:38:33 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* eval.c (rb_yield_0): preserve and restore ruby_cref as well.
+
+Tue May  8 18:28:19 2001  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb.rb lib/irb/multi-irb.rb lib/irb/ruby-lex.rb
+	  lib/irb/version.rb resolve ctrl-c problem
+
+Tue May  8 17:12:43 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* eval.c (is_defined): core dumped during instance_eval for
+	  special constants.
+
+	* eval.c (rb_eval): ditto.
+
+Tue May  8 08:52:57 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* doc/forwardable.rd, doc/forwardable.rd.jp: Hit `=begin' and
+	  `=end' in proper places so rd2 can format them without a problem.
+
+	* doc/irb/irb-tools.rd.jp, doc/irb/irb.rd, doc/irb/irb.rd.jp:
+	  ditto.
+
+Tue May  8 08:38:53 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* doc/forwardable.rd, doc/forwardable.rd.jp, lib/forwardable.rb:
+	  Import forwardable 1.1.
+
+Tue May  8 08:34:33 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* doc/irb/irb-tools.rd.jp, doc/irb/irb.rd.jp: Convert from JIS to
+	  EUC.
+
+Tue May  8 03:46:39 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* sample/rbc.rb: Obsoleted by IRB.
+
+Mon May  7 15:58:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): "||=" should not warn for uninitialized instance
+	  variables.
+
+	* eval.c (rb_eval): ditto.
+
+	* eval.c (eval): preserve and restore ruby_cref as well.
+
+Mon May  7 15:45:48 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/ftools.rb (syscopy): chmod destination file only if
+	  it does not exist.
+
+Mon May  7 14:35:57 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_is_instance_of): takes only class/module as an
+	  argument.
+
+Sun May  6 16:27:29 2001  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* eval.c (is_defined): rb_reg_nth_defined() may return Qnil.
+
+Thu May  3 03:15:06 2001  SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
+
+	* configure.in: get --enable-shared to work on MacOS X.
+
+	* Makefile.in: make $(LIBRUBY_SO) depend on miniruby properly.
+	  Now `make -jN' should work without a problem.
+
+Thu May  3 02:07:45 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* win32/config.h.in: add SIZEOF___INT64 definition.
+
+Wed May  2 20:39:35 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dir.c (rb_glob, rb_globi): remove unnecessary FNM_PATHNAME.
+
+Wed May  2 11:46:13 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* eval.c (block_pass): should not downgrade safe level.
+
+Wed May  2 03:07:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/dbm/extconf.rb: allow specifying dbm-type explicitly.
+
+	* ext/dbm/extconf.rb: avoid gdbm if possible, because it leaks
+	  memory, whereas gdbm.so doesn't.  potential incompatibility.
+
+Wed May  2 02:02:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_insert): new method.
+
+Tue May  1 17:55:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): lex_state after RESCUE_MOD should be EXPR_BEG.
+
+Tue May  1 16:23:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_insert): new method.
+
+	* array.c (rb_ary_update): new utility function.
+
+Tue May  1 03:24:05 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/irb/completion.rb, lib/irb/frame.rb, lib/irb/xmp.rb,
+	  doc/irb/irb-tools.rd.jp: Merge from irb-tools 0.7.1.
+
+Tue May  1 03:07:17 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* sample/irb.rb, lib/irb.rb, lib/irb/*, doc/irb/*: Merge from irb
+	  0.7.3.
+
+	* instruby.rb: Install help-message's too.
+
+	* lib/irb/main.rb: This file is not needed anymore.
+
+Fri Apr 27 09:27:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (set_outfile): should check if closed before assignment.
+
+Thu Apr 26 22:36:11 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in:  don't use tzname on Cygwin 1.3.1+.
+
+	* configure.in: add -mieee/-ieee to CFLAGS on OSF1/Alpha
+	  to disable "DIVISION BY ZERO" exception.
+
+Thu Apr 26 22:30:43 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): should preserve value of ruby_errinfo.
+
+Thu Apr 26 10:36:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_schedule): infinite sleep should not cause
+	  dead lock.
+
+Wed Apr 25 16:40:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_flatten_bang): proper recursive detection.
+
+Wed Apr 25 15:36:15 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* eval.c (yield_under): need not to prohibit at safe level 4.
+
+Wed Apr 25 15:22:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): p/P packs nil into NULL.
+
+	* pack.c (pack_unpack): p/P unpacks NULL into nil.
+
+Tue Apr 24 15:35:32 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): size check for P template.
+
+	* ruby.c (set_arg0): wrong predicate when new $0 value is bigger
+	  than original space.
+
+Tue Apr 24 15:18:49 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/extmk.rb.in, lib/mkmf.rb: (dir_config) do not add the
+	  specified include directory if already included in $CPPFLAGS.
+
+	* ext/extmk.rb.in, lib/mkmf.rb: (dir_config) return a more useful
+	  value, [include_dir, lib_dir].
+
+Mon Apr 23 14:43:59 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (id2ref): should use NUM2ULONG()
+
+	* object.c (rb_mod_const_get): check whether name is a class
+	  variable name.
+
+	* object.c (rb_mod_const_set): ditto.
+
+	* object.c (rb_mod_const_defined): ditto.
+
+Sat Apr 21 22:33:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_float): precision changed to "%.16g"
+
+Sat Apr 21 22:07:58 2001  Guy Decoux  <decoux@moulon.inra.fr>
+
+	* eval.c (rb_call0): wrong retry behavior.
+
+Fri Apr 20 19:12:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_aref): a bug on long>int architecture.
+
+Fri Apr 20 14:57:15 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* eval.c (rb_eval_string_wrap): should restore ruby_wrapper.
+
+Sun Apr 22 17:44:37 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: add -mieee to CFLAGS on Linux/Alpha
+	  to disable "DIVISION BY ZERO" exception.
+
+	* configure.in: remove -ansi on OSF/1.
+
+Wed Apr 18 04:37:51 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: CGI::Cookie: no use PATH_INFO.
+
+Wed Apr 18 00:24:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): char class at either edge of range
+	  should be invalid.
+
+Tue Apr 17 17:33:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (handle_rescue): use === to compare exception match.
+
+	* error.c (syserr_eqq): comparison between SytemCallErrors should
+	  based on their error numbers.
+
+Tue Apr 17 16:54:39 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* eval.c (safe_getter): should use INT2NUM().
+
+Tue Apr 17 15:12:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big2long): 2**31 cannot fit in 31 bit long.
+
+Sat Apr 14 22:46:43 2001  Guy Decoux  <decoux@moulon.inra.fr>
+
+	* regex.c (calculate_must_string): wrong length calculation.
+
+Sat Apr 14 13:37:32 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* win32/config.status.in: no longer use missing/alloca.c.
+
+	* win32/Makefile.sub: ditto.
+
+Fri Apr 13 12:40:48 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* eval.c (rb_thread_start_0): fixed memory leak.
+
+Fri Apr 13 16:41:18 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (none): should clear cmdarg_stack too.
+
+Fri Apr 13 06:19:29 2001  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* io.c (rb_fopen): use setvbuf() to avoid recursive malloc() on
+	  some platforms.
+
+Wed Apr 11 23:36:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_stat_dev): device functions should honor stat field
+	  types (except long long such as dev_t).
+
+Wed Apr 11 18:07:53 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* eval.c (rb_mod_nesting): should not push nil for nesting array.
+
+	* eval.c (rb_mod_s_constants): should not search array by
+	  rb_mod_const_at() for nil (happens for singleton class).
+
+Wed Apr 11 13:29:26 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_singleton_class_attached): should modify iv_tbl by
+	  itself, no longer use rb_iv_set() to avoid freeze check error.
+
+	* variable.c (rb_const_get): error message "uninitialized constant
+	  Foo at Bar::Baz" instead of "uninitialized constantBar::Baz::Foo".
+
+Tue Apr 10 17:52:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_included): new hook called from rb_mod_include().
+
+Tue Apr 10 02:24:40 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* io.c (opt_i_set): should strdup() inplace_edit string.
+
+Mon Apr  9 23:29:54 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (exec_under): need to push cref too.
+
+Mon Apr  9 15:20:21 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_missing): raise NameError for "undefined local
+	  variable or method".
+
+	* error.c (Init_Exception): new exception NoMethodError.
+	  NameError moved under ScriptError again.
+
+	* eval.c (rb_f_missing): use NoMethodError instead of NameError.
+
+Mon Apr  9 12:05:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (Init_File): should redefine "new" class method.
+
+Mon Apr  9 11:56:52 2001  Shugo Maeda <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: fix typo.
+
+Fri Apr  6 01:46:35 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (PUSH_CREF): sharing cref node was problematic.  maintain
+	  runtime cref list instead.
+
+	* eval.c (rb_eval): copy defn node before registering.
+
+	* eval.c (rb_load): clear ruby_cref before loading.
+
+Thu Apr  5 22:40:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_const_get): no recursion to show full class path
+	  for modules.
+
+	* eval.c (rb_set_safe_level): should set safe level in curr_thread
+	  as well.
+
+	* eval.c (safe_setter): ditto.
+
+Thu Apr  5 13:46:06 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* object.c (rb_obj_is_instance_of): nil belongs to false, not true.
+
+Thu Apr  5 02:19:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (make_time_t): proper (I hope) daylight saving time
+	  handling for both US and Europe.  I HATE DST!
+
+	* eval.c (rb_thread_wait_for): non blocked signal interrupt should
+	  stop the interval.
+
+Wed Apr  4 03:47:03 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_eq): class check added.
+
+	* eval.c (proc_eq): typo fixed ("return" was omitted).
+
+	* error.c (Init_Exception): move NameError under StandardError.
+
+	* class.c (rb_mod_clone): should copy method bodies too.
+
+	* bignum.c (bigdivrem): should trim trailing zero bdigits of
+	  remainder, even if dd == 0.
+
+	* file.c (check3rdbyte): safe string check moved here.
+
+Tue Apr  3 09:56:20 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb.in (create_makefile): create def file only if
+	  it does not yet exist.
+
+	* lib/mkmf.rb: ditto.
+
+Tue Apr  3 00:05:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (make_time_t): remove HAVE_TM_ZONE code since it
+	  sometimes reports wrong time.
+
+	* time.c (make_time_t): remove unnecessary range check for
+	  platforms where negative time_t is available.
+
+Mon Apr  2 16:52:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (proc_waitall): should push Process::Status instead of
+	  Fixnum status.
+
+	* process.c (waitall_each): should add all entries in pid_tbl.
+	  these changes are inspired by Koji Arai.  Thanks.
+
+	* process.c (proc_wait): should not iterate if pid_tbl is 0.
+
+	* process.c (proc_waitall): ditto.
+
+Mon Apr  2 14:25:49 2001  Shugo Maeda <shugo@ruby-lang.org>
+
+	* lib/monitor.rb (wait): ensure reentrance.
+
+	* lib/monitor.rb (wait): fix timeout support.
+
+Mon Apr  2 12:40:45 2001  Shugo Maeda <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (media_subtype): return subtype.
+
+Mon Apr  2 12:01:15 2001  Shugo Maeda <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (flag_list): capitalize flags.
+
+Mon Apr  2 01:32:38 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* Makefile.in: Introduce MAINLIBS.
+
+	* configure.in: Link libc_r against the ruby executable on
+	  FreeBSD, which is the first attempt to work around a certain
+	  problem regarding pthread on FreeBSD.  It should make ruby/libruby
+	  happy when it loads an extension to a library compiled and linked
+	  with -pthread.  Note, however, that libruby is _not_ linked with
+	  libc_r so as not to mess up pthread unfriendly stuff including
+	  apache+mod_ruby and vim6+ruby_interp.
+
+Mon Apr  2 01:16:24 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.c: use ruby's opendir on mingw32.
+
+	* win32/dir.h, dir.c, Makefile: ditto.
+
+Sun Apr  1 23:26:14 2001  TOYOFUKU Chikanobu  <toyofuku@juice.or.jp>
+
+	* numeric.c (flodivmod): a bug in no fmod case.
+
+Sun Apr  1 18:36:14 2001  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* process.c (pst_wifsignaled): should apply WIFSIGNALED for status
+	  (int), not st (VALUE).
+
+Sat Mar 31 04:47:55 2001  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: add document and example code.
+
+Sat Mar 31 03:24:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (Init_IO): value of $/ and $\ are no longer restricted to
+	  strings.  type checks are done on demand.
+
+	* class.c (rb_include_module): module inclusion should be check
+	  taints.
+
+	* ruby.h (STR2CSTR): replace to StringType() and StringTypePtr().
+
+	* ruby.h (rb_str2cstr): ditto.
+
+Fri Mar 30 23:37:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_load): should not copy toplevel local variables.  It
+	  cause variable/method ambiguity.  Thanks to L. Peter Deutsch.
+
+Fri Mar 30 22:56:56 2001  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: rename ContinueRequest to ContinuationRequest.
+
+Fri Mar 30 12:51:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_include_module): freeze check at first.
+
+Thu Mar 29 17:05:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_attr): sprintf() and rb_intern() moved into
+	  conditional body.
+
+Wed Mar 28 23:43:00 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/extmk.rb.in, lib/mkmf.rb: add C++ rules in addition to C
+	  rules for the mswin32 platforms.
+
+Wed Mar 28 19:29:21 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/extmk.rb.in, lib/mkmf.rb: move C++ rules to the right place.
+
+Wed Mar 28 17:39:04 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_str2cstr): warn if string contains \0 and length
+	  value is ignored.
+
+Wed Mar 28 15:00:31 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* class.c (rb_singleton_class_clone): should copy class constant
+	  table as well.
+
+Wed Mar 28 14:23:23 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* class.c (rb_include_module): sometimes cache was mistakenly left
+	  uncleared - based on the patch by K.Kosako.
+
+	* ruby.h: all Check_SafeStr()'s are replaced by SafeStr() to
+	  ensure 'to_str' be always effective.
+
+Wed Mar 28 09:52:33 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/Makefile.sub: disable global optimization.
+
+Tue Mar 27 15:00:54 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* eval.c (rb_mod_define_method): should have clear method cache.
+
+	* eval.c (rb_mod_define_method): should have raised exception for
+	  type error.
+
+Tue Mar 27 14:48:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h: changed "extern INLINE" to "static inline".
+
+Mon Mar 26 23:19:33 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* time.c (rb_strftime): check whether strftime returns empty string.
+
+Mon Mar 26 21:16:56 2001  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: supports response handlers and multiple commands.
+
+Mon Mar 26 17:21:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c: remove TMP_PROTECT_END to prevent C_ALLOCA crash.
+
+Mon Mar 26 14:04:41 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/Win32API/Win32API.c: remove Init_win32api().
+
+Sun Mar 25 16:52:48 2001  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* file.c (rb_file_flock): do not trap EINTR.
+
+	* missing/flock.c (flock): returns the value from lockf(2)
+	  directly.
+
+Sat Mar 24 23:44:50 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ev_const_defined): should ignore toplevel cbase (Object).
+
+	* eval.c (ev_const_get): ditto.
+
+Fri Mar 23 17:37:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/md5/md5.h: replace by independent md5 implementation
+	  contributed by L. Peter Deutsch (thanks).
+
+	* ext/md5/md5init.c: adopted to Deutsch's md5 implementation.
+
+Fri Mar 23 17:26:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_unpack): string from P/p should be tainted.
+
+Fri Mar 23 12:18:44 2001  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
+
+	* ext/curses/curses.c: curses on Mac OS X public beta does not
+	  have _maxx etc.
+
+Fri Mar 23 10:50:31 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_object): should truncate trailing zero short for
+	  bignums.
+
+Fri Mar 23 09:49:02 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (sym_intern): new method.
+
+Thu Mar 22 22:15:45 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/Win32API/extconf.rb: add -fno-omit-frame-pointer.
+
+Thu Mar 22 18:17:36 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_nesting): should not include Object at the
+	  toplevel.
+
+Thu Mar 22 17:43:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h: better inline function support.
+
+	* configure.in (NO_C_INLINE): check if inline is available for the
+	  C compiler.
+
+Mon Mar 19 11:03:10 2001  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* marshal.c (r_object): len calculation patch was wrong for
+	  machines SIZEOF_BDIGITS == SIZEOF_SHORT.
+
+	* gc.c: alloca prototype reorganized for C_ALLOCA machine.
+
+Wed Mar 21 23:07:45 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.c (win32_stat): WinNT/2k "//host/share" support.
+
+Wed Mar 21 08:05:35 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* win32/dir.h: replace missing/dir.h .
+
+	* win32/win32.h: ditto.
+
+	* win32/win32.c: ditto.
+
+Wed Mar 21 01:26:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (id2ref): sometimes confused symbol and reference.
+
+Tue Mar 20 23:09:33 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.c (win32_stat): UNC support.
+
+	* dir.c (extract_path): fix "./*" problem.
+
+Tue Mar 20 15:10:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (glob_helper): breaks loop after calling recursive
+	  glob_helper; all wild cards should be consumed; no need for
+	  further match.
+
+	* dir.c (dir_s_glob): gives warning if no match found.
+
+Tue Mar 20 14:13:45 2001  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* object.c (sym_inspect): did allocate extra byte space.
+
+Mon Mar 19 19:14:47 2001  Guy Decoux  <decoux@moulon.inra.fr>
+
+	* marshal.c (shortlen): shortlen should return number of bytes
+	  written.
+
+Mon Mar 19 16:52:23 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* eval.c (ev_const_defined): need not to check if cbase->nd_class
+	  is rb_cObject.
+
+	* eval.c (ev_const_get): ditto.
+
+Mon Mar 19 17:11:20 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_zone): return "UTC" for UTC time objects.
+
+Mon Mar 19 16:27:32 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (THREAD_ALLOC): flags should be initialized.
+
+	* signal.c (rb_f_kill): should use FIX2INT, not FIX2UINT.
+
+Mon Mar 19 10:55:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (glob_helper): replace lstat() by stat() to follow symlink
+	  in the case like 'symlink/*'.
+
+	* dir.c (glob_helper): gave warning too much.
+
+Sun Mar 18 08:58:18 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: // === '' --> //.match('')
+
+	* lib/cgi.rb: cgi#header(): improvement for mod_ruby.
+
+	* lib/cgi.rb: cgi#rfc1123date(): improvement.
+	  thanks to TADA Tadashi <sho@spc.gr.jp>.
+
+	* lib/cgi.rb: cgi#rfc1123date(): document bug fix.
+	  thanks to Kazuhiro NISHIYAMA <zn@mbf.nifty.com>.
+
+	* lib/cgi.rb: cgi#header(): bug fix.
+	  thanks to IWATSUKI Hiroyuki <don@na.rim.or.jp>.
+
+Sat Mar 17 11:11:24 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (glob_helper): * should follow symlink, whereas ** should
+	  not follow.
+
+Thu Mar 15 01:28:02 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_s_chdir): block form of Dir.chdir. (RCR#U016).
+
+Fri Mar 16 17:14:17 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in: Set SOLIBS properly for all ELF and
+	  FreeBSD/NetBSD/OpenBSD a.out platforms so that the shlib
+	  dependencies are recorded in the libruby shlib.
+
+Wed Mar 14 16:41:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_schedule): raise FATAL just once to
+	  THREAD_TO_KILL.
+
+Wed Mar 14 10:41:34 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): 0 (= Qfalse) is a valid value, so that
+	  default self should be checked by klass == 0.
+
+	* bignum.c (rb_cstr2inum): should disallow '++1', '+-1', etc.
+
+Tue Mar 13 17:51:09 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ev_const_defined): add new parameter self for special
+	  const fallback.
+
+	* eval.c (ev_const_get): ditto.
+
+Tue Mar 13 16:39:45 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dir.c (rb_glob_helper): fix drive letter handling on DOSISH.
+
+Tue Mar 13 14:54:39 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: add HTTPRequest#basic_auth.
+
+	* lib/net/smtp.rb: raise if only account or password is given.
+
+	* lib/net/protocol.rb: WriteAdapter#<< returns self.
+
+Tue Mar 13 14:41:16 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_seek_m): wrong calling sequence of rb_io_seek().
+
+Tue Mar 13 09:14:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (cond0): no special treatment of string literal in
+	  condition.
+
+Mon Mar 12 18:59:38 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): save/restore $libs and $LIBPATH.
+
+Sun Mar 11 18:13:34 2001  Masahiro Tanaka  <masa@stars.gsfc.nasa.gov>
+
+	* math.c: add acos, asin, atan, conh, sinh, tanh and hypot to Math.
+
+	* configure.in: check hypot availability.
+
+	* missing/hypot.c: public domain rewrite of hypot.
+
+Sun Mar 11 13:21:04 2001  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* parse.y (warn_unless_e_option): warning condition was wrong.
+
+	* parse.y (warning_unless_e_option): ditto.
+
+Sun Mar 11 00:55:31 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb (install_rb): fix handling of destination path.
+
+Sat Mar 10 22:56:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_all): new method 'all?', which returns true if
+	  block returns true for all elements.
+
+	* enum.c (enum_any): new method 'any?', which returns true if
+	  block returns true for any of elements.
+
+Sat Mar 10 02:34:18 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* math.c (math_log, math_log10): use nan() instead of 0.0/0.0 on Cygwin.
+
+Fri Mar  9 09:56:19 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (marshal_load): do not give warning unless explicitly
+	  set to verbose.
+
+Fri Mar  9 02:07:53 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_exit): give string value "exit" to SystemExit.
+
+	* ruby.c (proc_options): -v should not print version if
+	  proc_options called via moreswitches().
+
+Thu Mar  8 17:45:19 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb: one write(2) per one line.
+
+Wed Mar  7 14:26:11 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* math.c (math_log, math_log10): should return NaN if x < 0.0
+	  on Cygwin.
+
+Thu Mar  7 10:31:26 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* parse.y (stmt): while/until modifier must work for empty body.
+
+Tue Mar  6 22:53:58 2001  Kazuhiro Yoshida   <moriq.kazuhiro@nifty.ne.jp>
+
+	* ruby.c (ruby_set_argv): clear ARGV contents before adding args.
+
+Tue Mar  6 10:50:29 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (primary): rescue and ensure clauses should be allowed
+	  to appear in singleton method body.
+
+Mon Mar  5 17:25:13 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_eq): compare Procs using blocktag equality.
+
+	* eval.c (proc_to_s): stringify according to block tag address.
+
+Mon Mar  5 17:19:56 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.c (gettimeofday): use GetLocalTime() instead of ftime()
+	  for high-resolution timing.
+
+Sun Mar  4 17:01:09 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* string.c (trnext): support backslash escape in String#tr.
+
+Sat Mar  3 16:15:16 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): push cbase if ruby_cbase != ruby_class, for
+	  example in the case NODE_DEFN/NODE_DEFS are called within
+	  module_eval.
+
+Wed Feb 28 11:02:41 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_delete_bang): delete! should take at least 1
+	  argument.
+
+	* ruby.c (load_file): add rb_gc() after loading to avoid
+	  extraordinary memory growth.
+
+Wed Feb 28 05:01:40 2001  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* dir.c (rb_glob_helper): "./foo" should match "foo", not "./foo".
+
+Tue Feb 27 16:38:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ev_const_get): retrieve Object's constant if no current
+	  class is available (e.g. defining singleton class for Fixnums).
+
+	* eval.c (ev_const_defined): check Object's constant if no current
+	  class is available (e.g. defining singleton class for Fixnums).
+
+	* time.c (time_timeval): negative time interval should not be
+	  allowed.
+
+	* eval.c (proc_call): ignore block to `call' always, despite of
+	  being orphan or not.
+
+Wed Feb 27 10:16:32 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_yield_0): should check based on rb_block_given_p()
+	  and rb_f_block_given_p().
+
+Tue Feb 27 04:13:45 2001 Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* configure.in (frame-address): --enable-frame-address to allow
+	  __builtin_frame_address() to be used.
+
+	* eval.c (stack_length): use __builtin_frame_address() based on
+	  the macro USE_BUILTIN_FRAME_ADDRESS.
+
+	* gc.c (rb_gc): ditto.
+
+	* gc.c (Init_stack): ditto.
+
+Mon Feb 26 16:20:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (proc_options): call ruby_show_version() just once.
+
+	* dir.c (dir_s_open): returns the value from a block (if given).
+
+Mon Feb 26 14:29:04 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/extmk.rb.in, lib/mkmf.rb: add C++ rules in addition to C
+	  rules.
+
+Mon Feb 26 00:04:52 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_call): should not modify ruby_block->frame.iter
+	  based on ruby_frame->iter altered by PUSH_ITER().
+
+Mon Feb 26 05:27:52 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/net/telnet.rb: #telnetmode(), #binmode(): bug fix.
+	  thanks to nobu.nakada@nifty.ne.jp.
+
+Mon Feb 26 04:55:50 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: CGI#form(): bug fix.
+	  thanks to MoonWolf <moonwolf@moonwolf.com>.
+
+	* lib/cgi.rb: CGI#rfc1123_date(): improvement.
+	  thanks to Tomoyasu Akita <genzo-@dm4lab.to>.
+
+	* lib/cgi.rb: CGI#header(): improvement for mod_ruby.
+	  thanks to Shugo Maeda <shugo@ruby-lang.org>.
+
+Sun Feb 25 02:45:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* file.c (rb_file_s_rename): avoid Cygwin's bug.
+
+Sat Feb 24 23:32:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_fd_close): should save current context before
+	  raising exception.
+
+Sat Feb 24 22:14:00 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.c (myrename): fix error handling.
+
+Sat Feb 24 13:58:48 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: always close connection on request without
+	  body.
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: change copyright.
+
+Sat Feb 24 03:15:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (set_stdin): preserve original stdin.
+
+	* io.c (set_outfile): preserve original stdout/stderr.
+
+Fri Feb 23 08:28:58 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb: clear read buffer after reopen.
+
+	* lib/net/protocol.rb: refactoring.
+
+	* lib/net/http.rb: split module HTTPHeader from HTTPResponse.
+
+Tue Feb 20 23:45:35 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* process.c: add W* macro if not available.
+
+Tue Feb 20 16:37:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in: add check for negative time_t for gmtime(3).
+
+	* time.c (time_new_internal): no positive check if gmtime(3) can
+	  handle negative time_t.
+
+	* time.c (time_timeval): ditto.
+
+	* bignum.c (rb_big2long): should not raise RangeError for Bignum
+	  LONG_MIN value.
+
+Mon Feb 19 17:46:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_substr): "a"[1,2] should return ""; need
+	  rubicon upgrade.
+
+Mon Feb 19 12:10:36 2001  Triet H. Lai  <thlai@mail.usyd.edu.au>
+
+	* error.c (rb_sys_warning): new function to give warning with
+	  strerror() message.
+
+	* dir.c (rb_glob_helper): better error handling, along with
+	  performance tune.
+
+Mon Feb 19 01:55:43 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (secure_visibility): visibility check for untainted modules.
+
+Mon Feb 19 00:29:29 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* signal.c (sigpipe): sighandler which does nothing.
+
+	* signal.c (trap): set sigpipe function for SIGPIPE.
+
+	* signal.c (Init_signal): default SIGPIPE handler should be
+	  sigpipe function.
+
+Sun Feb 18 15:42:38 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/curses/extconf.rb: add dir_config.
+
+	* missing/flock.c: use fcntl(2) instead of lockf(2).
+
+Sun Feb 18 05:46:03 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: Response#range_length was not debugged.
+
+Sun Feb 18 04:02:03 2001  Yasushi Shoji  <yashi@yashi.com>
+
+	* array.c (rb_ary_subseq): wrong boundary check.
+
+Sun Feb 18 00:09:50 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* win32/win32.c: make file I/O faster on mswin32/mingw32.
+
+	* win32/win32.h: ditto.
+
+	* rubysig.h: ditto.
+
+Sat Feb 17 23:32:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (cond0): integer literal in condition should not be
+	  compared to lineno ($.).
+
+Fri Feb 16 01:44:56 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (set_outfile): f should be the FILE* from the assigning value.
+
+	* ext/socket/socket.c (tcp_s_open): should not give default value
+	  to local_host.
+
+	* time.c (time_s_times): move to Process::times.
+
+	* file.c (rb_file_s_lchmod): new method File::lchmod.
+
+	* file.c (rb_file_s_lchown): new method File::lchown.
+
+Thu Feb 15 11:33:49 2001  Shugo Maeda <shugo@ruby-lang.org>
+
+	* lib/cgi/session.rb (close): fixed reversed condition.
+
+Thu Feb 15 08:34:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (proc_waitall): new method based on a patch from Brian
+	  Fundakowski Feldman <green@green.dyndns.org>.
+
+	* process.c (last_status_set): objectify $? value (Process::Status).
+
+Wed Feb 14 17:28:24 2001  Shugo Maeda <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: supports unknown resp_text_code.
+
+Wed Feb 14 00:44:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_s_glob): support backslash escape of metacharacters
+	  and delimiters.
+
+	* dir.c (remove_backslases): remove backslashes from path before
+	  calling stat(2).
+
+	* dir.c (dir_s_glob): call rb_yield directly (via push_pattern) if
+	  block is given to the method.
+
+	* dir.c (push_pattern): do not call rb_ary_push; yield directly.
+
+	* eval.c (blk_copy_prev): reduced ALLOC_N too much.
+
+	* eval.c (frame_dup): ditto.
+
+Tue Feb 13 23:05:38 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dir.c (lstat): should use rb_sys_stat if lstat(2) is not
+	  available.
+
+Tue Feb 13 08:43:10 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_ctl): do not call ioctl/fcntl for f2, if f and f2
+	  have same fileno.
+
+Tue Feb 13 01:13:43 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_load): raise LocalJumpError if unexpected local jumps
+	  appear during load.
+
+	* ext/socket/socket.c (bsock_close_read): don't call rb_thread_fd_close();
+	  it's supposed to be called by io_io_close().
+
+	* ext/socket/socket.c (bsock_close_read): do not modify f and f2.
+
+	* ext/socket/socket.c (bsock_close_write): ditto.
+
+	* ext/socket/socket.c (sock_new): avoid dup(2) on sockets.
+
+	* parse.y (primary): preserve and clear in_single and in_def using
+	  stack to prevent nested method errors in singleton class bodies.
+
+Sun Feb 11 16:00:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* eval.c (stack_length): use __builtin_frame_address() only if
+	  GCC and i386 CPU.
+
+	* gc.c (rb_gc, Init_stack): ditto.
+
+	* configure.in: add ac_cv_func_getpgrp_void=yes on DJGPP.
+
+Sat Feb 10 23:43:49 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* hash.c (rb_any_hash): dumped core on machines sizeof(int) != sizeof(long).
+
+Sat Feb 10 23:07:15 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_s_for_fd): IO::for_fd(fd) - new method.
+
+	* regex.c (PREV_IS_A_LETTER): should not treat c>0x7f as a word
+	  character if -Kn.
+
+Sat Feb 10 00:00:30 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* win32/win32.c (win32_stat): replace stat to enable when pathname
+	  ends with '/' or '\' for mswin32 on Win9X / Win2k.
+
+	* win32/win32.h: ditto.
+
+	* ruby.h: ditto.
+
+	* dir.c (rb_glob_helper): ditto.
+
+	* file.c (rb_stat, rb_file_s_stat, eaccess, check3rdbyte): ditto.
+
+Fri Feb  9 22:54:57 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ruby.c (ruby_init_loadpath): convert '\\' to '/'
+	  before finding executable file path.
+
+Fri Feb  9 17:41:53 2001  Triet H. Lai  <thlai@mail.usyd.edu.au>
+
+	* dir.c (rb_glob_helper): do not follow symbolic links.
+
+Thu Feb  8 21:27:24 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/mkmf.rb (install_rb): fix handling of relative path.
+
+	* lib/mkmf.rb (create_makefile): add srcdir.
+
+Thu Feb  8 02:22:09 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: join HTTPReadResponse into HTTPResponse again.
+
+	* lib/net/http.rb: move http_version() from HTTPRequest to
+	  HTTPResponse.
+
+	* lib/net/protocol.rb: refactoring.
+
+Wed Feb  7 16:27:27 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: split HTTPResponse into HTTPReadResponse
+	  module.
+
+	* lib/net/protocol.rb: add Net::net_private.
+
+	* lib/net/protocol.rb: Socket#reopen takes arg, open_timeout.
+
+Wed Feb  7 16:05:22 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* parse.y (parse_quotedwords): %w should allow parenthesis escape.
+
+Wed Feb  7 00:57:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (parse_qstring): %q should allow terminator escape.
+
+	* re.c (rb_reg_options): new method to give an option values.
+
+	* parse.y (cond0): disable special treating of integer literal in
+	  conditional unless option -e is supplied.  changes current
+	  behavior.  experimental.
+
+	* parse.y (cond0): give warning for string/integer literals and
+	  dot operators in conditionals unless option -e is supplied.
+
+	* re.c (rb_reg_equal): all option flags should be same to be equal.
+
+Tue Feb  6 21:30:44 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: call on_connect() on re-opening socket.
+
+	* lib/net/pop.rb: also POP3 can use APOP auth.
+
+Tue Feb  6 20:19:10 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: add HTTP#request.
+
+	* lib/net/http.rb: take HTTP 1.0 server into account (incomplete).
+
+	* lib/net/protocol.rb: timeout for open/read.
+
+	* lib/net/protocol.rb: add Protocol#on_connect,on_disconnect.
+
+Mon Feb  5 23:15:46 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (Init_Exception): make Interrupt a subclass of
+	  SignalException.
+
+Mon Feb 5 00:39:06 2001  KANEKO Naoshi  <wbs01621@mail.wbs.ne.jp>
+
+	* dir.c: use ISXXX() instead of isxxx().
+
+	* dln.c (aix_loaderror): ditto.
+
+	* file.c (rb_file_s_expand_path): ditto.
+
+	* string.c (rb_str_upcase_bang): ditto.
+
+	* win32/win32.c (do_spawn): ditto.
+
+	* win32/win32.c (NtMakeCmdVector): ditto.
+
+	* win32/win32.c (opendir): ditto.
+
+Sat Feb  3 14:44:53 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* configure.in (AC_C_INLINE): check inline attribute.
+
+	* gc.c (is_pointer_to_heap): use inline rather than __inline__.
+
+	* pack.c (hex2num): ditto.
+
+	* ruby.h (rb_class_of, rb_type, rb_special_const_p): ditto.
+
+	* util.c (rb_class_of, rb_type, rb_special_const_p): defined in
+	  ruby.h.
+
+Fri Feb  2 16:14:51 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_sort_bang): returns self, even if its length is
+	  less than 2.
+
+	* eval.c (POP_VARS): propagate DVAR_DONT_RECYCLE, if
+	  SCOPE_DONT_RECYCLE of ruby_scope is set.
+
+Wed Jan 31 22:27:29 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: gcc-2.95.2-7(Cygwin) support.
+	  add -mwin32 if available.
+
+	* cygwin/GNUmakefile: ditto.
+
+Tue Jan 30 17:56:48 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_fetch): new method.
+
+Mon Jan 29 17:36:19 2001  TOYOFUKU Chikanobu  <toyofuku@juice.or.jp>
+
+	* eval.c (rb_eval): nd_iter evaluation should be wrapped by
+	  BEGIN_CALLARGS and END_CALLARGS.
+
+Mon Jan 29 14:25:39 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (block_pass): return from block jumps directory to
+	  block invoker.
+
+Mon Jan 29 01:40:27 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_independent): should not clear str->orig here.
+	  it's too early.
+
+Fri Jan 26 01:42:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y: clarify do ambiguity, bit more complex but natural
+	  from my point of view.
+
+Wed Jan 24 14:58:08 2001  Akinori MUSHA  <knu@ruby-lang.org>
+
+	* lib/cgi.rb: fix the problem that when running under mod_ruby
+	  header() outputs only one Set-Cookie line.
+
+Wed Jan 24 01:45:49 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (POP_BLOCK_TAG): call rb_gc_force_recycle() if block has
+	  not been objectified.
+
+	* eval.c (rb_callcc): should nail down block->tag history to avoid
+	  rb_gc_force_recycle().
+
+Tue Jan 23 18:51:57 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): should finalize objects in
+	  deferred_final_list too.
+
+Tue Jan 23 16:10:12 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (os_live_obj): do not list terminated object.
+
+	* gc.c (os_obj_of): ditto.
+
+	* gc.c (rb_gc_mark): support new T_BLKTAG tag.
+
+	* gc.c (obj_free): ditto.
+
+	* eval.c (new_blktag): creation of new block tag, which holds
+	  destination of global jump and orphan status.
+
+	* eval.c (block_pass): break from orphan Proc object will raise a
+	  LocalJumpError exception.
+
+Mon Jan 22 16:33:16 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* mkconfig.rb: autoconf 2.49 support.
+
+Mon Jan 22 00:32:44 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (block_pass): behavior consistency with proc_call(). do
+	  not propagate `break'.
+
+Sat Jan 20 03:54:00 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): fixed serious syntax misbehavior.  do's
+	  preceding was too high.  a block in `foo bar do .. end' should
+	  be passed to `foo', not `bar'.
+
+	* parse.y (block_call): syntax restructure.
+
+Thu Jan 18 04:28:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_s_read): new method to call IO#read from
+	  pathname.  In addition, it accepts third optional argument to
+	  specify starting point.
+
+Wed Jan 17 13:28:26 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: remove DEFS definition.
+
+	* mkconfig.rb: ditto.
+
+	* win32/config.status.in: ditto.
+
+Tue Jan 16 17:00:50 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb: ignore EOFError for read.
+
+	* lib/net/http.rb: user specified header was not used.
+
+Mon Jan 15 16:00:07 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_unpack): should check associated pointer packed by
+	  pack("P").  Thus pointers can be retrieved only from pointer
+	  packed strings.  restriction added.
+
+Sun Jan 14 21:49:28 2001  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* sprintf.c (rb_f_sprintf): simple typo.  binary base should be 2,
+	  not '2'.
+
+	* re.c (rb_reg_s_last_match): should explicitly return nth match.
+
+Sun Jan 14 18:21:30 2001  Usaku Nakamura  <usa@osb.att.ne.jp>
+
+	* win32/config.status.in: add some field.
+
+	* win32/win32.c (isInternalCmd): ignore case for shell's internal
+	  command.
+
+	* win32/win32.c (do_spawn): recognize quoted command line.
+
+Sun Jan 14 04:10:27 2001  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb (adding): too few "yield" in case of arg is
+	  not String/File.
+
+	* lib/net/http.rb: add http request object.
+
+Sat Jan 13 19:39:30 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* re.c (rb_reg_desc): separate RE_OPTION_MULTILINE
+
+	* re.c (rb_reg_options): add RE_OPTION_{POSIXLINE,RE_OPTION_MULTILINE,
+	  RE_OPTION_EXTENDED}
+
+Thu Jan 11 10:45:04 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.h, win32/config.h.in: move NORETURN from win32.h
+	  to config.h.in.
+
+	* win32/config.h.in (inline): renamed from INLINE.
+
+	* djgpp/config.hin (INLINE): removed.
+
+Thu Jan 11 06:45:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_dup): should propagate FL_SINGLETON.
+
+	* object.c (inspect_obj): handles the case of no instance variable.
+
+Wed Jan 10 16:15:08 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ruby.h: NORETURN macro is changed for VC++ 6.0.
+
+	* eval.c, intern.h: ditto.
+
+	* djgpp/config.hin, win32/win32.h: ditto.
+
+	* configure.in: ditto.
+
+Wed Jan 10 13:54:53 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* process.c (proc_setuid): use setresuid() if available.
+
+	* process.c (proc_setgid): use setresgid() if available.
+
+	* configure.in: ditto.
+
+Wed Jan 10 01:50:45 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* configure.in (AC_C_INLINE): check inline attribute.
+
+	* string.c (rb_str_reverse_bang): forgot to call rb_str_modify().
+
+Tue Jan  9 17:41:40 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_taint): check frozen status before modifying
+	  taint status.
+
+	* object.c (rb_obj_untaint): ditto.
+
+Tue Jan  9 16:22:14 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enum.c (enum_inject): new method.
+
+Tue Jan  9 02:16:42 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): clear klass member of
+	  terminating object.
+
+	* eval.c (rb_call): raise exception for terminated object.
+
+Mon Jan  8 21:24:37 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigdivrem): t2 might be too big for signed long; do
+	  not use rb_int2big(), but rb_uint2big().
+
+Mon Jan  8 21:35:10 2001  Guy Decoux  <decoux@moulon.inra.fr>
+
+	* file.c (path_check_1): should restore modified path.
+
+Mon Jan  8 03:09:58 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (rb_load_fail): new func to report LoadError.
+
+	* ruby.c (load_file): use rb_load_fail.
+
+Sat Jan  6 00:17:18 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* pack.c (pack_pack): avoid infinite loop(pack 'm2').
+
+Fri Jan  5 01:02:17 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ruby_finalize): should enclosed by PUSH_TAG/POP_TAG.
+
+	* gc.c (rb_gc_mark): link 2 of NODE_IFUNC should not be explicitly
+	  marked.  it may contain non object pointer.
+
+Tue Jan  2 00:20:06 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (reg_s_last_match): Regexp::last_match(nth) returns nth
+	  substring of the match  (alternative for $& and $<digit>).
+
+Sun Dec 31 01:39:16 2000  Guy Decoux  <decoux@moulon.inra.fr>
+
+	* eval.c (rb_mod_define_method): wrong comparison for blocks.
+
+Sat Dec 30 19:28:50 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (id2ref): should handle Symbol too.
+
+	* gc.c (id2ref): should print original ptr value
+
+Sat Dec 30 03:14:22 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_iterate): NODE_CFUNC does not protect its data
+	  (nd_tval), so create new node NODE_IFUNC for iteration C
+	  function.
+
+	* eval.c (rb_yield_0): use NODE_IFUNC.
+
+	* gc.c (rb_gc_mark): support NODE_IFUNC.
+
+Fri Dec 29 11:41:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (mem_error): prohibit recursive mem_error().
+	  (ruby-bugs-ja:PR#36)
+
+Fri Dec 29 11:05:41 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_fd_writable): should not switch context if
+	  rb_thread_critical is set.
+
+	* eval.c (rb_thread_wait_fd): ditto.
+
+	* eval.c (rb_thread_wait_for): ditto.
+
+	* eval.c (rb_thread_select): ditto.
+
+	* eval.c (rb_thread_join): join during critical section causes
+	  deadlock.
+
+Fri Dec 29 00:38:46 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* m17n.c: new file - core functions of M17N.
+
+Tue Dec 26 18:46:41 2000  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
+
+	* lib/debug.rb: Avoid thread deadlock in debugging stopped thread.
+
+	* lib/debug.rb: Uncleared 'finish' state.
+
+Tue Dec 26 16:53:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): remove dvar node by rb_gc_force_recycle()
+	  more eagerly.
+
+	* eval.c (rb_f_binding): recycling should be stopped for outer
+	  scope too.
+
+	* eval.c (proc_new): ditto.
+
+Tue Dec 26 15:45:35 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_inspect): should treat multibyte characters
+	  properly.
+
+Mon Dec 25 17:49:08 2000  K.Kosako  <kosako@sofnec.co.jp>
+
+	* string.c (rb_str_replace_m): unexpected string share happens if
+	  replace is done for associated (STR_NO_ORIG) string.
+
+Tue Dec 26 15:01:53 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_f_p): should not call rb_io_flush() if rb_defout is not
+	  a IO (T_FILE).
+
+Mon Dec 25 15:52:39 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* stable version 1.6.2 released.
+
+Mon Dec 25 05:11:04 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: version 2.1.2 (some bug fixes).
+
+	* lib/cgi.rb: Regexp::last_match[1] --> $1
+
+	* lib/net/telnet.rb: ditto.
+
+Mon Dec 25 04:43:02 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: does not send HEAD on closing socket.
+
+Mon Dec 25 00:44:48 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_any_cmp): should use rb_str_cmp() if TYPE == T_STRING
+	  and CLASS_OF == rb_cString.
+
+	* string.c (rb_str_new4): should copy class of original too.
+
+Mon Dec 25 00:04:54 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_thread_schedule): initial value of `max' changed to -1.
+
+Mon Dec 25 00:16:14 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_replace_m): copy-on-write replace.
+
+	* parse.y (yylex): should handle => after identifier as well as ==
+	  and =~.
+
+Sat Dec 23 23:55:57 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_cstr2inum): Integer("") should not return 0.
+
+Sat Dec 23 11:55:57 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_and): Array#& should preserve original order.
+
+Sat Dec 23 03:44:16 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb: set @closed false in Socket#reopen.
+
+	* lib/net/pop.rb: add POP3.foreach, delete_all.
+
+	* lib/net/pop.rb: add POP3#delete_all.
+
+	* lib/net/http.rb: add HTTP.version_1_1, version_1_2
+
+	* lib/net/http.rb: refactoring.
+
+Fri Dec 22 23:11:12 2000  Ueno Katsuhiro  <unnie@blue.sky.or.jp>
+
+	* eval.c (rb_feature_p): ext might be null.
+
+Fri Dec 22 17:04:12 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* win32/win32.c (myselect): avoid busy loop by adjusting fd_count.
+
+Fri Dec 22 15:07:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_cstr2inum): prefix like '0x' had removed too much.
+
+Thu Dec 21 13:01:46 2000  Tanaka Akira  <akr@m17n.org>
+
+	* lib/net/ftp.rb (makeport): don't use TCPsocket.getaddress.
+
+Wed Dec 20 12:00:15 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_lshift): should cast up to BDIGIT_DBL.
+
+	* parse.y (yylex): disallow trailing '_' for numeric literals.
+
+	* bignum.c (rb_cstr2inum): allow `_' within converting string.
+
+	* eval.c (specific_eval): should take no argument if block is
+	  supplied.
+
+Tue Dec 19 13:44:50 2000  K.Kosako  <kosako@sofnec.co.jp>
+
+	* io.c (rb_f_p): should flush rb_defout, not stdout.
+
+Tue Dec 19 00:57:10 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_minus): usec might overflow. (ruby-bugs-ja:PR#35)
+
+	* eval.c (rb_obj_extend): Object#extend should take at least one
+	  argument.
+
+	* parse.y (mrhs_basic): should check value_expr($3), not $1.
+
+Mon Dec 18 23:18:39 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* util.c (mblen, __crt0_glob_function): add for multibyte
+	  on DJGPP 2.03.
+
+Mon Dec 18 18:10:30 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_plus): usec might underflow (ruby-bugs-ja:#PR33).
+
+Mon Dec 18 08:11:20 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (rb_hash_set_default): should call rb_hash_modify().
+
+Sat Dec 16 02:58:26 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* eval.c (rb_eval): should clear ruby_errinfo on retry.
+
+	* eval.c (rb_rescue2): ditto.
+
+Thu Dec 14 13:06:18 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* class.c (rb_include_module): prohibit frozen class/module.
+
+	* eval.c (rb_frozen_class_p): make external.
+
+	* intern.h (rb_frozen_class_p): prototyped.
+
+	* intern.h (rb_undef): prototyped not but rb_undef_method()
+	  which is also in ruby.h.
+
+Thu Dec 14 09:20:26 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: support -T1 on ruby 1.6.2
+
+	* lib/cgi.rb: $1 --> Regexp::last_match[1]
+
+	* lib/net/telnet.rb: ditto.
+
+Wed Dec 13 23:27:06 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): handles case statement without expr, which
+	  looks for any TRUE (non nil, non false) when expression.
+
+	* parse.y (primary): case expression should not be compstmt, but
+	  mere expr.
+
+	* parse.y (primary): case without following expression is now
+	  separated rule.
+
+Wed Dec 13 12:41:27 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ruby.c (proc_options): accept "--^M" for DOS line endings.
+
+Tue Dec 12 15:45:42 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (newline_node): cancel newline unification.
+
+Mon Dec 11 23:01:57 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): supports cases `?' precedes EOF and newline.
+
+Mon Dec 11 12:11:25 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (call_end_proc): some frame members were left
+	  uninitialized.
+
+Mon Dec 11 01:14:58 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_fptr_finalize): do not fclose stdin, stdout and
+	  stderr at exit.
+
+Sat Dec  9 17:34:48 2000  Tachino Nobuhiro <tachino@open.nm.fujitsu.co.jp>
+
+	* time.c (time_cmp): should check with kind_of?, not instance_of?
+
+	* time.c (time_eql): ditto.
+
+	* time.c (time_minus): ditto.
+
+Fri Dec  8 17:23:25 2000  Tachino Nobuhiro <tachino@open.nm.fujitsu.co.jp>
+
+	* sprintf.c (rb_f_sprintf): proper string precision treat.
+
+Fri Dec  8 10:44:05 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_mod_remove_cvar): Module#remove_class_variable
+	  added.
+
+Thu Dec  7 17:35:51 2000  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (stack_length): don't use __builtin_frame_address() on alpha.
+
+Wed Dec  6 18:07:13 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* djgpp/config.sed, win32/Makefile.sub: typo.
+
+	* eval.c (rb_mod_define_method): avoid VC4.0 warnings.
+
+Wed Dec  6 13:38:08 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_and): tuning, make hash from shorter operand.
+
+Wed Dec  6 01:28:50 2000  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
+
+	* gc.c (rb_gc): __builtin_frame_address() should not be used on
+	  MacOS X.
+
+	* gc.c (Init_stack): ditto.
+
+Mon Dec  4 13:44:01 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/jcode.rb: consider multibyte. not /n.
+
+Mon Dec  4 09:49:36 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_inspect): output whole string contents. no more `...'
+
+	* string.c (rb_str_dump): should propagate taintness.
+
+	* hash.c (env_inspect): hash like human readable output.
+
+	* variable.c (rb_ivar_get): prohibiting instance variable access
+	  is too much restriction.
+
+	* class.c (method_list): retrieving information should not be
+	  restricted where $SAFE=4.
+
+	* class.c (rb_obj_singleton_methods): ditto.
+
+	* eval.c (rb_thread_priority): ditto.
+
+	* eval.c (rb_thread_local_aref): ditto.
+
+	* variable.c (rb_obj_instance_variables): ditto.
+
+	* variable.c (rb_mod_const_at): ditto.
+
+	* variable.c (rb_mod_class_variables): ditto.
+
+	* eval.c (rb_exec_end_proc): end_proc should be preserved.
+
+Sat Dec  2 22:32:43 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): || should accept exactly zero argument.
+
+	* parse.y (stmt): multiple right hand side for single assignment
+	  (e.g. a = 1,2) is allowed.
+
+Wed Nov 29 07:55:29 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (w_long): dumping long should be smaller than 32bit max.
+
+	* marshal.c (w_long): shorter long format for small integers(-123..122).
+
+	* marshal.c (r_long): ditto.
+
+Tue Nov 28 18:10:51 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_define_method): quick hack to implement
+	  on-the-fly method definition.  experimental.
+
+Mon Nov 27 17:00:35 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): should not redefine builtin classes/modules
+	  from within wrapped load.
+
+Mon Nov 27 08:57:33 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (call_end_proc): should be isolated from outer block.
+
+Mon Nov 27 00:10:08 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_ctl): call ioctl/fcntl for fptr->f2 too.
+
+	* process.c (rb_f_fork): call rb_thread_atfork() after creating
+	  child process.
+
+	* eval.c (rb_thread_atfork): kill all other threads immediately,
+	  then turn the current thread into the main thread.
+
+Sat Nov 25 23:12:22 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (ruby_run): move calling point of rb_trap_exit after
+	  cleaning up threads.
+
+	* eval.c (ruby_finalize): new function to call EXIT trap, END
+	  procs and GC finalizers.
+
+	* eval.c (rb_exec_end_proc): prevent recursion.
+
+	* gc.c (rb_gc_call_finalizer_at_exit): ditto.
+
+	* signal.c (rb_trap_exit): ditto. made static.
+
+	* process.c (rb_f_fork): should swallow all exceptions from block
+	  execution.
+
+	* process.c (fork_rescue): should call ruby_finalize().
+
+	* parse.y (yycompile): rb_gc() removed.  I don't remember why I put
+	  this here.  test code?
+
+Fri Nov 24 22:03:48 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (EXCL): exclusive information is now stored in an
+	  instance variable.  this enables proper marshal dump.
+
+	* process.c (proc_waitpid): should clear rb_last_status ($?) if
+	  no pid was given by waitpid(2).
+
+Thu Nov 23 01:35:38 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (proc_waitpid2): returns nil if no pid found.
+
+Wed Nov 22 23:45:15 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* range.c (range_eq): new method.  Compares start and end of range
+	  respectively.
+
+Wed Nov 22 11:01:32 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_mod_class_variables): should honor singleton
+	  class variable rule defined yesterday.
+
+Tue Nov 21 23:24:14 2000  Mitsuteru S Nakao  <nakao@kuicr.kyoto-u.ac.jp>
+
+	* numeric.c (flodivmod): missing second operand (typo).
+
+Tue Nov 21 03:39:41 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (marshal_load): marshal format compatibility check
+	  revised.   greater minor revision is UPWARD compatible;
+	  downward compatibility is not assured.
+
+	* eval.c (is_defined): clarify class variable behavior for
+	  singleton classes.  class variables within singleton class
+	  should be treated like within singleton method.
+
+Mon Nov 20 13:45:21 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): set ruby_sourceline before evaluating
+	  exceptions.
+
+	* gc.c (gc_sweep): defer finalization in GC during compilation or
+	  interrupt prohibit section.
+
+	* gc.c (gc_sweep): mark all nodes before sweeping if GC happened
+	  during compilation.
+
+	* eval.c (rb_eval): should treat class variables specially in a
+	  method defined in the singleton class.
+
+Mon Nov 20 10:20:21 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dir.c, win32/win32.c, ruby.h: add rb_iglob().
+
+Mon Nov 20 00:18:16 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_subseq): should return nil for outbound start
+	  index.
+
+	* marshal.c (marshal_load): show format versions explicitly when
+	  format version mismatch happens.
+
+Sun Nov 19 06:13:24 2000  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* marshal.c: use long for string/array length.
+
+	* pack.c (swaps): use bit-or(|) instead of plus(+).
+
+	* pack.c (swapl): ditto.
+
+Sat Nov 18 15:18:16 2000  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* array.c (rb_ary_replace): array size should be in long.
+
+	* array.c (rb_ary_concat): ditto.
+
+	* array.c (rb_ary_hash): ditto.
+
+Sat Nov 18 14:07:20 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: Socket#readline() reads until "\n", not "\r\n"
+
+Fri Nov 17 14:55:18 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* string.c (rb_str_succ): output should be NUL terminated.
+
+Fri Nov 17 02:54:15 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_close): need not to flush before closing.
+
+	* eval.c (rb_thread_join): should preserve last thread status when
+	  THREAD_TO_KILL.
+
+	* eval.c (rb_thread_stop): ditto.
+
+	* io.c (io_fflush): wrap fflush by TRAP_BEG, TRAP_END.
+
+	* eval.c (rb_eval): method defined within singleton class
+	  definition should behave like singleton method about class
+	  variables.
+
+	* eval.c (is_defined): ditto.
+
+Thu Nov 16 23:06:07 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: can call {old,new}_implementation any times.
+
+	* lib/net/http.rb: HTTP#connecting, receive ->
+	  common_oper, connecting.
+
+	* lib/net/http.rb: output warning if u_header includes
+	  duplicated header.
+
+	* lib/net/http.rb: not check Connection:/Proxy-Connection;
+	  always read until eof.
+
+	* lib/net/protocol.rb: detects and catches "break" from block.
+
+Thu Nov 16 16:32:45 2000  Masahiro Tanaka  <masa@stars.gsfc.nasa.gov>
+
+	* bignum.c (bigdivrem): should have incremented ny first.
+
+Thu Nov 16 14:58:00 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/socket/socket.c (sock_new): duplicates file descriptor
+	  with myfddup() on mswin32/mingw32.
+
+	* win32/win32.h: uses system original fdopen().
+
+	* win32/win32.c (myfddup): newly added instead of myfdopen().
+
+	* win32/win32.c (mybind, myconnect, mygetsockname, mygetsockopt,
+	  mylisten, mysetsockopt): now accept file descriptor only, not
+	  SOCKET.
+
+	* win32/win32.c (myaccept, mysocket): return file descriptor,
+	  instead of SOCKET.
+
+Thu Nov 16 10:23:24 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (massign): too strict check for nameless rest argument.
+
+	* eval.c (method_arity): mere * should return -1.
+
+	* eval.c (intersect_fds): should check all FDs in the fd_set.
+
+Wed Nov 15 19:33:20 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_attr): should clear method cache before calling hook.
+
+	* eval.c (rb_eval): ditto.
+
+	* eval.c (rb_mod_modfunc): ditto.
+
+Mon Nov 13 22:44:52 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (rb_bug): print version to stderr.
+
+Mon Nov 13 19:02:08 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* win32/win32.c, io.c, process.c: the exit status of program must be
+	  multiplied 256 on mswin32 and msdosdjgpp(system(), ``).
+
+Sat Nov 11 22:57:38 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (arg): uniformed treatment of -a**b, where a is a
+	  number literal;  hacky but behavior appears more consistent.
+
+	* parse.y (newline_node): reduce newline node (one per line).
+
+	* random.c (rb_f_srand): should be prohibited in safe level
+	  greater than 4.
+
+Sat Nov 11 22:37:36 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* rubysig.h: do not use rb_trap_immediate on win32.
+
+	* rubysig.h: new macros, ATOMIC_TEST, ATOMIC_SET, ATOMIC_INC,
+	  ATOMIC_DEC, RUBY_CRITICAL and new definition of TRAP_BEG,
+	  TRAP_END.
+
+	* gc.c (ruby_xmalloc): should wrap malloc() by RUBY_CRITICAL.
+
+	* signal.c (sighandle): better win32 sig handling.
+
+	* win32/win32.c (flock): better implementation.
+
+	* win32/win32.c (myselect): ditto.
+
+	* win32/win32.c (myaccept): ditto.
+
+	* win32/win32.c (waitpid): ditto.
+
+	* win32/win32.c (myrename): ditto.
+
+	* win32/win32.c (wait_events): support function for win32 signal
+	  handling.
+
+Sat Nov 11 08:34:18 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.31.
+
+	* lib/net/http.rb: initializes header in HTTP, not HTTPCommand.
+
+	* lib/net/protocol.rb, http.rb: rewrites proxy code.
+
+Fri Nov 10 16:15:53 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (rb_num2long): use to_int, not to_i.
+
+	* error.c: T_SYMBOL was misplaced by T_UNDEF.
+
+	* parse.y (yylex): eval("^") caused infinite loop.
+
+Thu Nov  9 14:22:13 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_taint_check): should check IO taintness; no
+	  operation for untainted IO should be allowed in the sandbox.
+
+	* rubyio.h (GetOpenFile): check IO taintness inside using
+	  rb_io_taint_check().
+
+Wed Nov  8 03:08:53 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (io_fflush): ensure fflush(3) would not block by calling
+	  rb_thread_fd_writable().
+
+Tue Nov  7 20:29:56 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.30.
+
+	* lib/net/protocol.rb, smtp.rb: Command#critical_ok -> error_ok
+
+	* lib/net/http.rb: reads header when also "100 Continue".
+
+Tue Nov  7 04:32:19 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bigdivrem): use bit shift to make y's MSB set.
+
+Mon Nov  6  1:22:49 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* error.c (warn_print): do not use err_append(), to ensure output
+	  to stderr.
+
+	* error.c (rb_warn): use warn_print() instead of err_print().
+
+	* error.c (rb_warning): ditto.
+
+	* error.c (rb_bug): ditto.
+
+	* eval.c (rb_load): re-raise exceptions during load.
+
+	* time.c (make_time_t): remove useless adjust
+
+Thu Nov  2 18:01:16 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* random.c (rb_f_rand): half-baked float support fixed.  This fix
+	  was originally proposed by K.Kosako <kosako@sofnec.co.jp>.
+
+Tue Oct 31 17:27:17 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c: change digit size to `long|int' if long long is
+	  available.
+
+	* marshal.c (w_object): support `long|int' digits.
+
+	* marshal.c (r_object): ditto.
+
+Sat Oct 28 23:54:22 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): allow =end at the end of file (without a
+	  newline at the end).
+
+Fri Oct 27 10:00:27 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_cstr2inum): should ignore trailing white spaces.
+
+	* bignum.c (rb_str2inum): string may not have sentinel NUL.
+
+Fri Oct 27 02:37:22 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_cstr2inum): wrongly assigned base to c before
+	  badcheck check.
+
+Thu Oct 26 02:42:50 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb: Command#critical_ok
+
+	* lib/net/smtp.rb: clear critical flag before go to SMTP
+
+Wed Oct 25 12:30:19 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_concat): replacing array might be the receiver
+	  itself.  do not call rb_ary_push_m.
+
+	* array.c (rb_ary_replace): replacing array might be the receiver
+	  itself.  use memmove.
+
+Fri Oct 20 07:56:23 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): ARGSPUSH should not modify args array.
+
+Thu Oct 19 14:58:17 2000  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* pack.c (NUM2U32): should use NUM2ULONG().
+
+Tue Oct 17 17:30:34 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* eval.c (error_print): ruby_sourcefile may be NULL.
+
+Tue Oct 17 16:36:28 2000  Wes Nakamura  <wknaka@pobox.com>
+
+	* pack.c (NATINT_U32): wrong use of sizeof.
+
+Tue Oct 17 12:48:20 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* eval.c (rb_abort): nil check against ruby_errinfo.
+
+	* eval.c (rb_thread_schedule): use FOREACH_THREAD_FROM instead of
+	  FOREACH_THREAD, since curr_thread may be removed from thread ring.
+
+	* eval.c (THREAD_ALLOC): errinfo should be Qnil.
+
+	* eval.c (rb_callcc): th->prev,th->next are now already
+	  initialized in THREAD_ALLOC.
+
+Mon Oct 16 15:37:33 2000  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* eval.c (rb_thread_inspect): tag size was shorter than required.
+
+	* object.c (rb_obj_inspect): ditto.
+
+Mon Oct 16 14:25:18 2000  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* object.c (sym_inspect): used `name' before initialization.
+
+Mon Oct 16 14:06:00 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): use NATINT_U32 for 'l', 'L', and 'N'.
+
+	* pack.c (I32,U32): 32 bit sized integer.
+
+	* pack.c (OFF16,OFF32B): big endian offset for network byteorder.
+
+Mon Oct 16 06:39:32 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: hex-alpha is not [a-h] but [a-f].
+
+Mon Oct 16 01:02:02 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_start_0): should not abort on exception if
+	  $SAFE >= 4.
+
+	* parse.y (sym): symbols for class variable names.
+
+Sun Oct 15 01:49:18 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_file_flock): should accept interrupt.
+
+	* process.c (rb_waitpid): ditto.
+
+	* process.c (rb_waitpid): ditto.
+
+	* process.c (proc_wait): ditto.
+
+	* process.c (proc_waitpid2): wrong recursion.
+
+Sat Oct 14 03:32:13 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_alloc): should not link a new thread in the
+	  live thread ring before initialization.
+
+Fri Oct 13 17:08:09 2000  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: new file.
+
+Thu Oct 12 18:56:28 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/pop.rb: POP3#reset
+
+	* lib/net/http.rb: a code for "Switch Protocol" was wrongly 100.
+
+Thu Oct 12 01:23:38 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: bug fix: CGI::html(): PRETTY option didn't work.
+
+Thu Oct 12 00:03:02 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (sym_inspect): should adjust string length.
+
+	* struct.c (rb_struct_to_s): ditto.
+
+	* struct.c (rb_struct_inspect): ditto.
+
+Wed Oct 11 22:15:47 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* eval.c (rb_thread_inspect): should adjust string length.
+
+	* object.c (rb_any_to_s): ditto.
+
+	* object.c (rb_obj_inspect): ditto.
+
+Wed Oct 11 18:13:50 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_start_0): should check insecure exit.
+
+Wed Oct 11 14:29:51 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb: 2nd arg for ProtocolError#initialize is
+	  optional.
+
+	* lib/net/http.rb: code refining.
+
+Wed Oct 11 11:13:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (primary): setter method (e.g. foo=) should always be
+	  public.
+
+	* eval.c (rb_thread_raise): should not raise SecurityError if
+	  exception raised by the interpreter.
+
+	* eval.c (rb_thread_cleanup): skip all THREAD_KILLED threads
+	  before FOREACH_THREAD.
+
+Tue Oct 10 16:11:54 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dln.c (dln_load): remove unused code for Cygwin.
+
+Tue Oct 10 09:49:23 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (Init_File): FileTest.size should return 0 (not nil) for
+	  empty files.
+
+Sun Oct  8 13:20:26 2000  Guy Decoux  <decoux@moulon.inra.fr>
+
+	* eval.c (POP_SCOPE): not just set SCOPE_DONT_RECYCLE, but do
+	  scope_dup().
+
+Sat Oct  7 15:10:50 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_reverse_bang): unnecessary ALLOCA_N() was
+	  removed.
+
+Fri Oct  6 14:50:24 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb.in, lib/mkmf.rb: remove "DESTDIR =".
+
+	* Makefile.in, win32/Makefile.sub, ruby.1: renamed -X to -C.
+
+Fri Oct  6 12:50:52 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_plus): use to_ary(), not Check_Type().
+
+	* array.c (rb_ary_concat): ditto.
+
+	* gc.c (rb_gc): use __builtin_frame_address() for gcc.
+
+	* eval.c (stack_length): ditto.
+
+	* parse.y (assign_in_cond): stop warning till some better warning
+	  condition will be found.
+
+Thu Oct  5 18:02:39 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_obj_dup): should have propagated taint flag.
+	  (ruby-bugs:#PR64,65)
+
+Wed Oct  4 00:26:11 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_arity): proc{|a|}'s arity should be -1.
+
+Mon Oct  2 05:28:58 2000  akira yamada  <akira@ruby-lang.org>
+
+	* string.c (trnext): minus at the end of pattern.
+
+Sun Oct  1 00:43:34 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in: exp-name was wrong on cygwin and mingw32.
+
+Thu Sep 28 14:57:09 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_compile_pattern): should try must_string calculation
+	  every time.
+
+Tue Sep 19 23:47:44 2000  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
+
+	* configure.in, config.guess, config.sub: MacOS X support.
+
+Wed Sep 27 18:40:05 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* stable version 1.6.1 released.
+
+Wed Sep 27 16:13:05 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* mkconfig.rb: variables should be expanded only if /\$\{?\w+\}?/.
+
+Tue Sep 26 18:09:51 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* string.c: include <math.h>
+
+Tue Sep 26 15:59:50 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (rb_mod_dup): metaclasses of class/module should not be
+	  cleared by rb_obj_dup.
+
+Tue Sep 26 02:44:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (GC_MALLOC_LIMIT): size extended.
+
+	* regex.c (DOUBLE_STACK): use machine's stack region for regex
+	  stack if its size is small enough.
+
+Mon Sep 25 18:13:07 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c: include <defines.h>.
+
+	* eval.c (rb_add_method): cache mismatch by method
+	  definition. need to clear_cache_by_id every time.
+
+Mon Sep 25 13:31:45 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* win32/win32.c (NtCmdGlob): substitute '\\' with '/'.
+
+Mon Sep 25 00:35:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* defines.h: #undef HAVE_SETITIMER on cygwin.
+
+Sun Sep 24 03:01:53 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, http.rb: typo.
+
+Sat Sep 23 07:33:20 2000  Aleksi Niemela  <aleksi.niemela@cinnober.com>
+
+	* regex.c (re_compile_pattern): nicer regexp error messages for
+	  invalid patterns.
+
+Sat Sep 23 03:06:25 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_autoload_load): should not require already
+	  provided features.
+
+Fri Sep 22 15:46:21 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/http.rb: too early parameter expansion in string.
+
+Fri Sep 22 13:58:51 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/extmk.rb.in: don't use default $:
+
+Fri Sep 22 13:42:50 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* regex.c (PUSH_FAILURE_COUNT): avoid casting warning on alpha.
+
+	* regex.c (PUSH_FAILURE_POINT): ditto.
+
+Fri Sep 22 10:16:21 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* win32/config.h.in: add HAVE_TELLDIR, HAVE_SEEKDIR
+
+Thu Sep 21 19:04:34 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/extmk.rb, lib/mkmf.rb (install_rb): check whether libdir is
+	  directory or not.
+
+Thu Sep 21 17:23:05 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (rb_file_s_symlink): use HAVE_SYMLINK.
+
+	* file.c (rb_file_s_readlink): use HAVE_READLINK.
+
+	* dir.c (dir_tell): use HAVE_TELLDIR.
+
+	* dir.c (dir_seek): use HAVE_SEEKDIR.
+
+	* configure.in (AC_CHECK_FUNCS): lstat, symlink, readlink,
+	  telldir, seekdir checks added.
+
+	* file.c (lstat): should use stat(2) if lstat(2) is not
+	  available.
+
+Thu Sep 21 15:59:23 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.29.
+
+	* lib/net/http.rb: HTTPReadAdapter -> HTTPResponseReceiver
+
+	* lib/net/http.rb (connecting): response is got in receive()
+
+Thu Sep 21 15:49:07 2000  Wayne Scott  <wscott@ichips.intel.com>
+
+	* lib/find.rb (find): should not follow symbolic links;
+	  tuned performance too.
+
+Wed Sep 20 23:21:38 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.c (load_file): two Ctrl-D was required to stop ruby at the
+	  beginning of stdin script read.
+
+Wed Sep 20 14:01:45 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_provided): detect infinite load loop.
+
+	* eval.c (rb_provided): too weak filename comparison.
+
+	* eval.c (rb_thread_alloc): avoid recycling still referenced
+	  dvar structures.
+
+	* eval.c (rb_callcc): ditto.
+
+	* eval.c (THREAD_ALLOC): fill dyna_vars field by ruby_dyna_vars.
+
+Tue Sep 19 17:47:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* stable version 1.6.0 released.
+
+Tue Sep 19 16:24:52 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (Init_marshal): provide marshal.so no more.
+
+Tue Sep 19 14:01:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in, win32/setup.mak: include version number
+	  in RUBY_SO_NAME.
+
+Tue Sep 19 13:07:47 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): was confusing $~ and $_.
+
+Tue Sep 19 13:06:53 2000  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* signal.c (rb_f_kill): signum may be a negative number, should be
+	  treated by signed number.
+
+Tue Sep 19 01:14:56 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_provide): better feature handling.
+
+	* eval.c (rb_f_require): loading ruby library may be partial
+	  state.  checks in rb_thread_loading is integrated.
+
+	* eval.c (rb_provided): better thread awareness.
+
+	* lib/irb/frame.rb: 6 (not 5) parameters for trace_func proc.
+
+	* eval.c (error_print): should print error position even if
+	  get_backtrace() failed.
+
+Sat Sep 16 03:29:59 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_f_require): rb_provided() was called too early; does
+	  not work well with threads.
+
+	* parse.y (ensure): should distinguish empty ensure and non
+	  existing ensure.
+
+	* file.c (Init_File): extending File by class of FileTest was
+	  serious mistake.
+
+Thu Sep 14 02:46:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_yield): array strip should be done in this
+	  function.
+
+Wed Sep 13 17:01:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_eq): incomplete value comparison of bignums.
+
+Wed Sep 13 06:39:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_mod_class_variables): Module#class_variables added.
+
+Wed Sep 13 06:09:26 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: bug fix: CGI::header(): output status header.
+
+Wed Sep 13 01:09:12 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (yylex): allow global variables like '$__a'.
+
+Tue Sep 12 22:28:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/socket/extconf.rb: avoid using terrible <netinet/tcp.h>
+	  on cygwin 1.1.5.
+
+Tue Sep 12 16:01:58 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* array.c (rb_ary_unshift_m): typo.
+
+Tue Sep 12 15:37:55 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): stripped array too much, should remove just
+	  for proc_call().
+
+Tue Sep 12 07:05:24 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: version 2.0.0: require ruby1.5.4 or later.
+
+	* lib/net/telnet.rb: version 1.6.0
+
+Tue Sep 12 03:26:07 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (massign): use to_ary to get an array if available.
+
+	* object.c (rb_Array): ditto.
+
+Mon Sep 11 14:24:47 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* hash.c (ruby_setenv): should not free the element of
+	  origenvironment.
+
+	* parse.y (command_call): kYIELD moved to this rule to allow
+	  'a = yield b'. (ruby-bugs-ja:#PR15)
+
+Mon Sep 11 01:27:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): proc#call([]) should pass single value to
+	  the block.
+
+	* eval.c (callargs): reduce array allocation.
+
+	* eval.c (massign): precise check for argument number.
+
+Fri Sep  8 10:05:17 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (STR_NO_ORIG): should be FL_USER2.
+
+Thu Sep  7 14:17:51 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_cat): should work even for concatenating same
+	  string.
+
+Wed Sep  6 17:06:38 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_cvar_declare): should check superclass's class
+	  variable first.
+
+Wed Sep  6 10:42:02 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-calculate-indent): shift continuing line
+	  if previous line ends with modifier keyword.
+
+	* misc/ruby-mode.el (ruby-parse-region): should not give up if
+	  modifiers are at the end of line.
+
+	* misc/ruby-mode.el (ruby-expr-beg): indented wrongly if modified
+	  statement was size 1.
+
+Wed Sep  6 10:41:19 2000  Kenichi Komiya  <kom@mail1.accsnet.ne.jp>
+
+	* misc/ruby-mode.el (ruby-parse-region): modifier was not handled
+	  well on emacs19.
+
+Tue Sep  5 17:10:12 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_to_s): fixed zone string UTC for utc time object.
+
+Tue Sep  5 00:26:06 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regex.c (re_search): range worked wrongly on bm_search().
+
+Mon Sep  4 13:40:40 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: renamed libruby.a to libruby.{cygwin,mingw32}.a
+	  on cygwin and mingw32.
+
+Sun Sep  3 23:44:04 2000  Noriaki Harada  <tenmei@maoh.office.ne.jp>
+
+	* io.c (NO_SAFE_RENAME): for BeOS too.
+
+Sun Sep  3 11:31:53 2000  Takaaki Tateishi  <ttate@jaist.ac.jp>
+
+	* parse.y (rescue): no assignment was done if rescue body was
+	  empty.
+
+Sat Sep  2 10:52:21 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (call_args,aref_args): block_call can be the last
+	  argument.
+
+	* parse.y (COND_PUSH,COND_POP): maintain condition stack to allow
+	  kDO2 in parentheses in while/until/for conditions.
+
+	* parse.y (yylex): generate kDO2 for EXPR_ARG outside of
+	  while/until/for condition.
+
+Fri Sep  1 10:36:29 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (aref_args,opt_call_args): add block_call to allow a
+	  method without parentheses and with block as a last argument.
+
+	* hash.c (rb_hash_sort): should not return nil.
+
+	* re.c (match_aref): should use rb_reg_nth_match().
+
+	* eval.c (POP_SCOPE): recycled scopes too much
+
+	* eval.c (Init_eval): extend room for stack allowance.
+
+	* eval.c (POP_SCOPE): frees scope too much.
+
+Thu Aug 31 14:28:39 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (rb_gc_mark): T_SCOPE condition must be more precise.
+
+	* eval.c (scope_dup): should not make all duped scope orphan.
+
+Thu Aug 31 10:11:47 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (stmt): allow stmt_rhs to be right hand side of multiple
+	  assignment.
+
+	* time.c (rb_time_timeval): type error should not mention the word
+	  'interval'.
+
+Wed Aug 30 23:21:20 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (rb_num2long): use rb_Integer() instead of independent
+	  convert routine.
+
+	* eval.c (rb_rescue2): now takes arbitrary number of exception types.
+
+	* object.c (rb_convert_type): use rb_rescue2 now to handle NameError.
+
+	* object.c (rb_convert_type): better error message.
+
+Wed Aug 30 17:09:14 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/Win32API/Win32API.c (Win32API_initialize): AlphaNT support.
+
+Wed Aug 30 14:19:07 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (node_assign): should support NODE_CVASGN2 too.
+
+Wed Aug 30 11:31:47 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ext/Win32API/Win32API.c (Win32API_initialize): add the
+	  arguments checking.
+
+	* ext/Win32API/Win32API.c (Win32API_initialize): add taint
+	  checking. allow String object in the third argument.
+
+Wed Aug 30 10:29:40 2000  Masahiro Tomita  <tommy@tmtm.org>
+
+	* io.c (rb_f_p): flush output buffer.
+
+Tue Aug 29 16:29:15 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (assignable): remove NODE_CVASGN3.
+
+	* parse.y (gettable): remove NODE_CVAR3.
+
+Tue Aug 29 02:02:14 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): handles create_makefile("a/b").
+
+	* ext/extmk.rb.in (create_makefile): ditto
+
+Mon Aug 28 18:43:54 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (is_defined): now handles class variables.
+
+	* eval.c (rb_eval): class variable behavior revisited.
+
+	* parse.y (assignable): ditto.
+
+	* parse.y (gettable): ditto.
+
+	* regex.c (PUSH_FAILURE_COUNT): push/pop interval count on failure
+	  stack.  this fix is inspired by the Emacs21 patch from Stefan
+	  Monnier <monnier@cs.yale.edu>.
+
+Fri Aug 25 15:24:39 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* variable.c (rb_cvar_get): should not follow __attached__.
+
+	* variable.c (rb_cvar_set): ditto.
+
+	* variable.c (rb_cvar_declare): ditto.
+
+	* variable.c (mod_av_set): second class variable assignment at the
+	  toplevel should not give warning.
+
+Fri Aug 25 01:18:36 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (next_argv): prepare path for open file.
+
+	* string.c (rb_str_setter): moved from io.c.
+
+	* io.c (next_argv): filename should be "-" for refreshed ARGF.
+
+Thu Aug 24 15:27:39 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/socket/socketport.h: use `extern int h_errno' if needed.
+
+Sat Aug 19 01:34:02 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/sdbm/_sdbm.c (sdbm_prep): flags should be or-ed by O_BINARY on
+	  Win32 too.
+
+	* ext/sdbm/_sdbm.c (makroom): fill hole with 0 on Win32 too.
+
+Fri Aug 18 13:23:59 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): should preserve and clear $! value before
+	  compilation.
+
+	* eval.c (eval): ditto.
+
+Fri Aug 18 11:06:19 2000  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/socket/socket.c (s_accept): start GC on EMFILE/ENFILE.
+
+Thu Aug 17 16:04:48 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (is_defined): should clear ruby_errinfo.
+
+Thu Aug 17 04:26:31 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.27.
+
+	* lib/net/protocol.rb: writing methods returns written byte size.
+
+	* lib/net/smtp.rb: send_mail accepts many destinations.
+
+Wed Aug 16 00:43:47 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_s_times): use CLK_TCK for HZ if it's defined.
+
+Tue Aug 15 17:30:59 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (frame_dup): should set flag FRAME_MALLOC after
+	  argv allocation.
+
+	* eval.c (blk_free): should not free argv if GC was called before
+	  frame_dup.
+
+Tue Aug 15 16:08:40 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: add ac_cv_func_times=yes for mingw32.
+
+	* win32/win32.c (mytimes): typo.
+
+Tue Aug 15 01:45:28 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_eof): should return true at the end of ARGF without
+	  checking stdout if arguments are given.
+
+Mon Aug 14 10:34:32 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_thread_status): status should return false for normal
+	  termination, nil for termination by exception.
+
+Fri Aug 11 15:43:46 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_undef): give warning for undefining __id__, __send__.
+
+Thu Aug 10 08:05:03 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_callcc): returned current thread instead of
+	  continuation wrongly.
+
+Thu Aug 10 05:40:28 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/extmk.rb.in: $CPPFLAGS should be initialized.
+
+	* ext/tcltklib/depend: add stubs.o.
+
+	* ext/tcltklib/extconf.rb: use $CPPFLAGS instead of $CFLAGS.
+
+Wed Aug  9 16:31:48 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_callcc): thread status for continuations must be
+	  THREAD_KILLED, otherwise thread_free() breaks other threads.
+
+Wed Aug  9 13:24:25 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* win32/win32.[ch]: emulate rename(2).
+
+Tue Aug  8 14:01:46 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/tcltklib/tcltklib.c: support --enable-tcltk_stubs
+
+	* ext/tcltklib/extconf.rb: ditto.
+
+	* ext/tcltklib/stubs.c: created. examine candidate shared libraries.
+
+Mon Aug  7 13:59:12 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ruby.h (CLONESETUP): should copy flags before any potential
+	  object allocation.
+
+	* regex.c (re_match): check for stack depth was needed.
+
+Sat Aug  5 16:43:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* djgpp/*: convert DOS line endings to UNIX style.
+
+	* djgpp/config.status: rename to config.sed for SFN.
+
+	* lib/ftools.rb (compare, safe_unlink, chmod): avoid warnings.
+
+	* lib/ftools.rb (move): typo. not `tpath', but `to'.
+
+Fri Aug  4 23:26:48 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (proc_call): gives warning if a block is supplied.
+
+	* eval.c (rb_eval): no warning for discarding if an alias for the
+	  method is already made.
+
+Fri Aug  4 16:32:29 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_reject_bang): returns nil if no element removed.
+
+	* hash.c (rb_hash_reject_bang): returns nil if no element removed.
+
+Thu Aug  3 19:44:26 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_fd_writable): should return integer value.
+
+	* array.c (rb_ary_assoc): search array element whose length is
+	  longer than 0 (not 1).
+
+Wed Aug  2 18:27:47 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_wait_fd): prohibit thread context switch
+	  during compilation.
+
+	* eval.c (rb_cont_call): prohibit Continuation#call across threads.
+
+Wed Aug  2 08:22:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* gc.c (rb_gc): clear malloc_memories to zero, to avoid potential
+	  super frequent GC invocation. (ruby-bugs:#PR48)
+
+	* gc.c (rb_gc): only add_heap() if GC trigger condition is
+	  satisfied.
+
+Tue Aug  1 16:41:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (proc_options): global load path setting moved from
+	  ruby_prog_init().
+
+	* ruby.c (incpush): renamed.  push path entry at the END of the
+	  load path array.  This makes -I directories sorted in order in
+	  the arguments.
+
+Sat Jul 29 23:42:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* dir.c (dir_each): should check whether dir is closed during the
+	  block execution. (ruby-bugs:#PR47)
+
+Sat Jul 29 21:57:30 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ruby.c (rubylib_mangle): provide another buffer for the result.
+
+Wed Jul 26 10:09:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: set SOLIBS to LIBS on Cygwin.
+
+	* configure.in: LIBRUBY_SO='$(RUBY_INSTALL_NAME)'.$target_os.dll
+	  on cygwin and mingw32. ruby-cygwin.dll is bad. why?
+
+Wed Jul 26 10:04:03 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* gc.c (gc_sweep): avoid full scan during compilation.
+
+	* gc.c (rb_gc): add heap during no gc period (including
+	  compilation).
+
+Tue Jul 25 19:03:04 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* cygwin/GNUmakefile: use puts instead of print, because
+	  Cygwin DLL's behavior is changed(or bug?).
+
+	* configure.in: LIBRUBY_SO='$(RUBY_INSTALL_NAME)'-$target_os.dll
+	  on cygwin and mingw32.
+
+	* cygwin/GNUmakefile: ditto.
+
+	* Makefile.in: $(SOLIBS) should be put after dmyext.@OBJEXT@.
+
+	* instruby.rb: install $(LIBRUBY) to libdir
+	  if $(LIBRUBY) != $(LIBRUBY_A_).
+
+Tue Jul 25 15:16:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_p): redirect to $defout.
+
+Mon Jul 24 18:52:55 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* win32/win32.c (win32_getenv): should remove `static'.
+
+	* ruby.c (rubylib_mangle): support "/hoge;/foo"
+
+Mon Jul 24 10:28:55 2000  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
+
+	* string.c (rb_str_count): raise exception if no argument is
+	  given.
+
+Sun Jul 23 12:55:04 2000  Dave Thomas  <Dave@Thomases.com>
+
+	* string.c (rb_str_rindex): Support negative end position.
+
+Fri Jul 21 17:35:01 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (aref_args): command_call now be permitted as
+	  aref_args.
+
+	* process.c (proc_getpriority): getpriority(2) may return valid
+	  negative number.  use errno to detect error.
+
+	* marshal.c (dump_ensure): dumped string should be tainted if
+	  any among target objects is tainted.
+
+	* marshal.c (r_regist): restored object should be tainted if and
+	  only if the source is a file or a tainted string.
+
+Wed Jul 19 15:14:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (bigdivrem): should use rb_int2big(), not rb_uint2big().
+
+Tue Jul 18 14:58:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (ruby_options): should treat SystemExit etc. properly.
+
+	* parse.y (yycompile): should check compile_for_eval, not
+	  ruby_in_eval.
+
+Mon Jul 17 04:29:50 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/mkmf.rb: converts extension of $objs into $OBJEXT.
+
+Sun Jul 16 03:02:34 2000  Dave Thomas <dave@thomases.com>
+
+	* lib/weakref.rb: Change to use new ObjectSpace calls.
+
+Sat Jul 15 21:59:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): should not redefine __id__ nor __send__.
+
+	* gc.c (define_final): integrate final.rb features into the
+	  interpreter.  define_finalizer and undefine_finalizer was
+	  added to ObjectSpace.  plus, add_finalizer, remove_finalizer,
+	  and call_finalizer are deprecated now.
+
+Sat Jul 15 01:32:34 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_mod_method): implements unbound method.
+
+	* eval.c (Init_eval): should prohibit `module_function' for class
+	  Class.
+
+Fri Jul 14 17:19:59 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* cygwin/GNUmakefile.in: use miniruby instead of sed.
+
+Fri Jul 14 12:49:50 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (argf_eof): need to check stdin, when next_p == -1.
+
+	* io.c (read_all): use io_fread() instead of fread(3).
+
+	* io.c (io_reopen): should clearerr FILE if fd < 3.
+
+	* re.c (rb_reg_match_m): the result is exported, so it should be
+	  declared as busy.
+
+	* eval.c (rb_eval): should preserve errinfo even if return, break,
+	  etc. is called in rescue clause.
+
+	* instruby.rb: install irb too.
+
+Wed Jul 12 15:32:57 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (rb_const_get): constants for builtin classes must
+	  have higher priority than constants from included modules at
+	  Object class.
+
+	* bignum.c (bigdivrem): small embarrassing typo.
+
+Wed Jul 12 15:06:28 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): use rb_const_get_at().
+
+	* variable.c (top_const_get): retrieve toplevel constants only,
+	  not ones of Object (and its included modules) in general.
+
+Wed Jul 12 15:04:11 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.26.
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb:
+	  add module Net::NetPrivate and its inner classes
+	  {Read,Write}Adapter, Command, Socket,
+	  SMTPCommand, POP3Command, APOPCommand, HTTPCommand
+
+Wed Jul 12 13:10:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (bigdivrem): defer bignorm().
+
+	* bignum.c (bignorm): accepts accidental fixnums.
+
+Tue Jul 11 16:54:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): `@<digit>' is no longer a valid instance
+	  variable name.
+
+Tue Jul 11 01:51:50 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (rb_big_divmod): should not use Integer(float) for
+	  the right operand.
+
+	* bignum.c (rb_big_remainder): ditto.
+
+	* bignum.c (rb_big_modulo): ditto.
+
+Mon Jul 10 15:27:16 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* io.c (pipe_finalize): should set rb_last_status when pclose().
+
+Mon Jul 10 09:07:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* error.c (rb_bug): print version number and such too.
+
+Sat Jul  8 23:08:40 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_start_0): should copy previous scopes to
+	  prevent rb_gc_force_recycle().
+
+Fri Jul  7 23:36:36 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/socket/addrinfo.h: move IN_EXPERIMENTAL and IN_LOOPBACKNET
+	  definitions to ext/socket/sockport.h.
+
+	* ext/socket/extconf.rb: add getservbyport() and arpa/inet.h check.
+
+	* ext/socket/getaddrinfo.c (getaddrinfo): SOCK_RAW may not be
+	  defined (ex. BeOS, Palm OS 2.x or before).
+
+	* ext/socket/getnameinfo.c (getnameinfo): getservbyport() may not
+	  exist (ex. BeOS, Palm OS).
+
+	* ext/socket/sockport.h: add IN_EXPERIMENTAL, IN_CLASSA_NSHIFT,
+	  IN_LOOPBACKNET, AF_UNSPEC, PF_UNSPEC and PF_INET.
+
+Fri Jul  7 03:30:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (aref_args): should allow Hash[:a=>2] etc.
+
+	* numeric.c (fix_aref): convert index by NUM2INT, not FIX2INT.
+	  (ruby-bugs:#PR37)
+
+	* time.c (time_localtime): should prohibit for frozen time.
+
+	* time.c (time_gmtime): ditto.
+
+Thu Jul  6 19:12:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_file_s_open): should not terminate fptr; just clear it.
+
+	* ruby.c (proc_options): should not call require_libraries()
+	  twice.
+
+	* ruby.c (require_libraries): clear req_list_head.next after
+	  execution.
+
+Thu Jul  6 13:51:57 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* object.c (rb_to_id): name may not be symbol nor fixnum.
+
+	* struct.c (rb_struct_s_def): name may be nil.
+
+Thu Jul  6 02:09:06 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (bigdivrem): new function to return remainder.
+
+	* numeric.c (fixdivmod): now returns modulo, not remainder.
+
+	* numeric.c (flodivmod): ditto.
+
+	* bignum.c (bigdivmod): ditto.
+
+	* numeric.c (num_modulo): new method; alias to '%'.
+
+Thu Jul  6 00:51:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* win32/win32.c (NtCmdGlob): patterns should be separated and
+	  NUL terminated.
+
+Wed Jul  5 22:27:56 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* cygwin/GNUmakefile: use ruby.def to make rubycw.dll.
+
+	* ext/extmk.rb.in: create target.def.
+
+	* lib/mkmf.rb: ditto.
+
+Wed Jul  5 09:47:14 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_arg): Time::local, Time::gm now take 7th optional
+	  argument for usec.
+
+	* numeric.c (num_ceil, etc): default ceil, floor, round, truncate
+	  implementation for Numeric, using `to_f'.
+
+	* io.c (rb_io_reopen): clear fptr->path after free() to prevent
+	  potential GC crash.
+
+	* io.c (rb_file_s_open): terminate fptr unless null.
+
+	* io.c (rb_file_initialize): ditto.
+
+	* lib/tempfile.rb: specify FILE::CREAT|File::EXCL to open for
+	  better security.
+
+	* numeric.c (flo_truncate): new method.
+
+Wed Jul  5 01:02:53 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/extmk.rb.in: join ' ' -> join(' ').
+
+	* lib/mkmf.rb: ditto.
+
+Tue Jul  4 13:51:29 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/dbm/dbm.c: add methods added to Hash in 1.5.x.
+
+	* ext/gdbm/gdbm.c: ditto.
+
+	* ext/sdbm/init.c: ditto.
+
+	* eval.c (proc_call): args may be Qundef (means no argument), do
+	  not call TYPE() for args.
+
+Tue Jul  4 13:20:56 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/extmk.rb.in: make command line must be single-quoted.
+	  $(RUBY_INSTALL_NAME) is command substitution in the POSIX sh.
+
+Tue Jul  4 13:16:02 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* util.c (rb_type): should add T_UNDEF.
+
+Tue Jul  4 09:30:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (here_document): supports EOF right after terminator.
+
+	* random.c (rb_f_rand): argument is now optional (rand(max=0)).
+
+Tue Jul  4 01:50:49 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* win32/ruby.def: remove ruby_mktemp.
+
+Tue Jul  4 01:27:13 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_rescue2): new function to rescue arbitrary exception.
+
+	* numeric.c (do_coerce): should catch NameError explicitly.
+
+Tue Jul  4 00:15:23 2000  Dave Thomas  <Dave@thomases.com>
+
+	* numeric.c (Init_Numeric): forgot to register Numeric#remainder.
+
+Mon Jul  3 23:46:56 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* win32/win32.c (myselect, myaccept): disable interrupt while
+	  executing accept() or select() to avoid Ctrl-C causes
+	  "unknown software exception (0xc0000029)".
+
+Mon Jul  3 18:35:41 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* lib/mkmf.rb: use null device if it exists for cross-compiling.
+
+Mon Jul  3 18:19:51 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.26.
+
+	* lib/net/protocol.rb (finish): do nothing unless active.
+
+	* lib/net/http.rb: HTTP#{get,post}2 again (for new impl).
+
+Mon Jul  3 16:47:22 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* cygwin/GNUmakefile: librubys.a -> lib$(RUBY_INSTALL_NAME)s.a
+
+	* configure.in: use AC_CANONICAL_{HOST,TARGET,BUILD}.
+
+Mon Jul  3 13:15:02 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (fix_divmod): x * d + m = y where d, m = x.divmod(y).
+
+	* bignum.c (rb_big_divmod): ditto.
+
+	* numeric.c (fixdivmod): does not depend C's undefined %
+	  behavior.  adopt to fmod(3m) behavior.
+
+	* numeric.c (flo_mod): modulo now reserves fmod(3m) behavior.
+
+	* numeric.c (num_remainder): 'deprecated' warning.
+
+Mon Jul  3 10:27:28 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: use AC_CANONICAL_SYSTEM.
+
+Sun Jul  2 21:17:37 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: support without --enable-shared for cygwin/mingw32.
+
+	* cygwin/GNUmakefile: ditto.
+
+	* ext/extmk.rb.in: use null device if it exists for cross-compiling.
+
+	* lib/mkmf.rb: ditto.
+
+	* util.c (ruby_mktemp): remove unused ruby_mktemp().
+
+Sun Jul  2 14:18:04 2000  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* eval.c (TMP_PROTECT_END): tmp__protect_tmp may be NULL.
+
+Sun Jul  2 03:37:50 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.25.
+
+	* lib/net/protocol.rb (each_crlf_line): beg = 0 is needed in adding{}
+
+	* lib/net/smtp.rb: allow String for to_addr of SMTP#sendmail
+
+Sat Jul  1 15:22:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (fix_rshift): should handle shift value more than
+	  sizeof(long).
+
+Sat Jul  1 15:22:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): the value from RTEST() is not valid Ruby
+	  object.  result should be either true or false.
+
+Sat Jul  1 09:30:06 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* re.c (rb_reg_initialize): was freeing invalid pointer.
+
+Sat Jul  1 03:25:56 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (call_args): command_call can be the last argument of
+	  call_args.  It had to be the only argument.
+
+	* re.c (rb_reg_s_quote): should not dump core even for unsane mbc
+	  string.
+
+Fri Jun 30 01:36:20 2000  Aleksi Niemela  <aleksi.niemela@cinnober.com>
+
+	* parse.y (f_norm_arg): better, nicer error message.
+
+Thu Jun 29 07:45:33 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c (udp_send): destination may be packed
+	  struct sockaddr.
+
+	* object.c (rb_Integer): Integer(nil) should be invalid, on the
+	  other hand, nil.to_i is OK.
+
+Wed Jun 28 17:26:06 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c (ip_recvfrom): udp_recvfrom and tcp_recvfrom
+	  is merged and moved to IPSocket#recvfrom.
+
+	* ext/socket/socket.c (sock_s_getaddrinfo): family can be a
+	  strings such as "AF_INET" etc.
+
+	* ruby.c (require_libraries): . and RUBYLIB added to $load_path
+	  just before -r procedure.
+
+	* ruby.c (proc_options): -e, - did not exec -r.
+
+Wed Jun 28 14:52:28 2000  Koga Youichirou <y-koga@mms.mt.nec.co.jp>
+
+	* config.sub: NetBSD/hpcmips support.
+
+Wed Jun 28 10:11:06 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* gc.c: gc trigger threshold changed; GC_NEWOBJ_LIMIT removed,
+	  FREE_MIN is increased to 4096.
+
+Tue Jun 27 22:39:28 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.24.
+
+	* lib/net/protocol.rb: modified each_crlf_line again.
+
+	* lib/net/protocol.rb: do_write_beg,do_write_end -> writing{}
+	  do_write_do -> do_write
+
+	* lib/net/http.rb: can make proxy connection by passing
+	  addresses to HTTP.new, start.
+
+	* lib/net/http.rb: HTTP.new_implementation, old_implementation:
+	  can use 1.2 implementation of head, get, post, put.
+	  (see document)
+
+Tue Jun 27 12:05:10 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* win32.c (myfdclr): new function.
+
+	* win32.h: add FD_CLR.
+
+Mon Jun 26 23:41:41 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ruby.h: add cast for ANSI style.
+
+	* gc.c (rb_data_object_alloc): use RUBY_DATA_FUNC.
+
+Mon Jun 26 22:20:03 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* win32/win32.c (is_socket, extract_file_fd): New function.
+
+	* win32/win32.c (myfdopen): use is_socket().
+
+	* win32/win32.c (myselect): return non socket files immediately
+	  if file and socket handles are mixed.
+
+Mon Jun 26 16:21:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_schedule): wait_for cleared too early.
+
+Mon Jun 26 09:15:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* pack.c: remove obsolete 'F', 'D' specifiers.
+
+Sun Jun 25 00:55:03 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/socket/socket.c (sock_s_getnameinfo): `res' would not
+	  be assigned if TYPE(sa) == T_STRING.
+
+Sat Jun 24 14:36:29 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* config*.dj, configure.bat, top.sed: move to djgpp/.
+
+Sat Jun 24 02:34:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (load_file): call require_libraries() here to let
+	  debug.rb work properly.
+
+Fri Jun 23 22:34:51 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* bignum.c (rb_big_lshift): reorder xds assignment to avoid
+	  reusing `x' as `len' by VC++ 6.0 SP3 compiler with -Ox switch.
+
+Fri Jun 23 01:11:27 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_substr): should return empty string (""),
+	  if beg == str.size and len == zero, mostly for convenience and
+	  backward compatibility.
+
+	* parse.y (new_super): should tweak block_pass node for super too.
+
+	* string.c (rb_str_split_m): last split element should not be nil,
+	  but "" when limit is specified.
+
+Thu Jun 22 17:27:46 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_substr): str[n,m] now returns nil when n equals
+	  to str.size.
+
+Thu Jun 22 13:49:02 2000  Uechi Yasumasa <uechi@ryucom.ne.jp>
+
+	* lib/net/ftp.rb: support resuming.
+
+Thu Jun 22 13:37:19 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* eval.c (rb_thread_sleep_forever): merge pause() macro.
+
+Wed Jun 21 08:49:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): should not raise exception just by defining
+	  singleton class.
+
+Wed Jun 21 01:18:03 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.h: two macros RUBY_DATA_FUNC and RUBY_METHOD_FUNC are added
+	  to make writing C++ extensions easier.
+
+	* array.c (rb_ary_dup): internal classes should not be shared by dup.
+
+	* hash.c (rb_hash_dup): ditto.
+
+	* object.c (rb_obj_dup): ditto.
+
+	* string.c (rb_str_dup): ditto.
+
+	* error.c (Init_Exception): renamed NotImplementError to
+	  NotImplementedError.
+
+Tue Jun 20 16:22:38 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (make_time_t): bug in DST boundary.
+
+Tue Jun 20 10:54:19 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: add eval sitedir.
+
+Tue Jun 20 06:14:43 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: change: version syntax. old: x.yz, now: x.y.z
+
+	* lib/net/telnet.rb: ditto.
+
+Tue Jun 20 00:37:45 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (rb_reg_kcode_m): Regexp#kcode returns nil for code unfixed
+	  regexp object.
+
+	* bignum.c (bigdivmod): bignum zero check was wrong.
+
+Mon Jun 19 10:48:28 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (rb_cvar_set): forgot to add security check for class
+	  variable assignment.
+
+Sun Jun 18 22:49:13 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: single quoted sitedir.
+
+	* mkconfig.rb: add DESTDIR for cross-compiling.
+
+	* lib/mkmf.rb: add DESTDIR.
+
+	* ruby.c (load_file): force binmode if fname includes ".exe"
+	  on DOSISH.
+
+Sat Jun 17 23:22:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sprintf.c (rb_f_sprintf): should ignore negative precision given
+	  by <%.*>.
+
+	* sprintf.c (rb_f_sprintf): should allow zero precision.
+
+Sat Jun 17 03:13:29 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_localtime): avoid unnecessary call of localtime.
+
+	* time.c (time_gmtime): avoid unnecessary call of gmtime.
+
+	* process.c (proc_wait2): new method.
+
+	* process.c (proc_waitpid): second argument made optional.
+
+	* process.c (proc_waitpid2): new method.
+
+Sat Jun 17 00:05:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (rb_reg_clone): should initialize member fields.
+
+Fri Jun 16 22:49:34 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_rewind): set lineno to zero.
+
+Fri Jun 16 22:47:47 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.23.
+
+	* lib/net/protocol.rb: too many CRLF in last line.
+
+Fri Jun 16 21:23:59 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: add pause(2) checking.
+
+	* eval.c: define pause() if missing.
+
+Fri Jun 16 18:41:58 2000  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* process.c (proc_setsid): BSD-style setpgrp() don't return
+	  process group ID, but 0 or -1.
+
+Fri Jun 16 16:23:35 2000  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* file.c (rb_stat_inspect): gives detailed information;
+	  compatibility with ruby-1.4.x.
+
+Fri Jun 16 05:18:45 2000  Yasuhiro Fukuma  <yasuf@bsdclub.org>
+
+	* configure.in: FreeBSD: do not link dummy libxpg4 which was
+	  merged into libc.
+
+Fri Jun 16 03:17:36 2000  Satoshi Nojo  <nojo@t-samukawa.or.jp>
+
+	* ext/dbm/dbm.c (fdbm_length): use GetDBM. empty?, [] too.
+
+	* ext/gdbm/gdbm.c (fgdbm_length): ditto.
+
+	* ext/sdbm/init.c (fsdbm_length): ditto.
+
+Fri Jun 16 01:57:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_sleep_forever): pause(2) instead of sleep(3).
+
+Thu Jun 15 10:46:36 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_sub_bang): should propagate taintness from
+	  replacement string.
+
+Wed Jun 14 17:01:41 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* rubytest.rb: add CONFIG['EXEEXT'] to the executable file name.
+
+Wed Jun 14 14:50:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_f_sub): assign to $_ only if modification happens.
+
+	* string.c (rb_f_gsub): ditto.
+
+	* string.c (rb_f_chop): ditto.
+
+	* string.c (rb_f_chomp): ditto.
+
+	* io.c (io_reopen): preserve file position by ftell/fseek, if io
+	  is a seekable.
+
+	* eval.c (method_arity): wrong arity number for the methods with
+	  optional arguments.
+
+	* time.c (make_time_t): opposite timezone shift (should be negative).
+
+Wed Jun 14 14:07:38 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* io.c: typo(ig/if).
+
+	* re.c: typo(re/reg). add rb_reg_check().
+
+	* time.c: remove unneeded declare(daylight, timezone).
+
+	* configure.in: add include <time.h> when daylight checking.
+
+Wed Jun 14 11:36:52 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* marshal.c (r_object): modified for symbols.
+
+	* marshal.c (w_object): ditto.
+
+Wed Jun 14 10:04:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (rb_memcmp): should compare according to ruby_ignorecase.
+
+	* string.c (rb_str_cmp): use rb_memcmp.
+
+	* string.c (rb_str_index): ditto.
+
+	* string.c (rb_str_rindex): ditto.
+
+	* string.c (rb_str_each_line): ditto.
+
+Wed Jun 14 04:58:53 2000  Dave Thomas  <dave@thomases.com>
+
+	* io.c (rb_io_set_lineno): should have returned VALUE, not
+	  integer.
+
+Wed Jun 14 09:29:42 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_dup): dup should always propagate taintness.
+
+Wed Jun 14 00:50:14 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: read_multipart(): if no content body then raise EOFError.
+
+Tue Jun 13 11:46:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* process.c (proc_setsid): try implement it using setpgrp() and
+	  ioctl(fd, TIOCNOTTY, NULL).
+
+	* re.c (rb_reg_prepare_re): magic variable $= should affect regex
+	  pattern match.
+
+	* time.c (make_time_t): use tm.tm_gmtoff if possible.
+
+	* time.c (time_zone): use tm.tm_zone if available.
+
+Tue Jun 13 01:50:57 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.22.
+
+	* lib/net/http.rb: HTTPResponse#body returns body.
+
+Mon Jun 12 23:41:54 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in (daylight): avoid GCC optimization.
+
+Mon Jun 12 19:02:27 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: cygwin has strange timezone.
+
+	* time.c (time_zone): use tzname and daylight.
+
+Sat Jun 10 23:10:32 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_seek): whence is optional, default is SEEK_SET.
+
+Fri Jun  9 17:00:29 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.21.
+
+	* lib/net/http.rb: exception is raised with response object.
+
+Fri Jun  9 15:11:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (make_time_t): supports daylight saving time.
+
+	* eval.c (rb_thread_safe_level): should retrieve current $SAFE
+	  value if a thread is the current thread.
+
+Thu Jun  8 14:25:45 2000  Hiroshi Igarashi  <iga@ruby-lang.org>
+
+	* lib/mkmf.rb: add target `distclean' in Makefile for extlib.
+	  target `clean' doesn't remove Makefile.
+
+Thu Jun  8 13:34:03 2000  Dave Thomas  <dave@thomases.com>
+
+	* numeric.c: add nan?, infinite?, and finite? to Float
+
+Thu Jun  8 00:31:04 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* regex.h: export re_mbctab properly on cygwin.
+
+	* dln.c: use dlopen instead of LoadLibrary on cygwin.
+
+Thu Jun  8 13:41:34 2000  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* file.c (rb_file_s_basename): might dump core.
+
+Tue Jun  6 03:29:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* dir.c (dir_foreach): now returns nil for consistency.
+
+	* bignum.c (bigdivmod): modulo by small numbers was wrong.
+
+Mon Jun  5 00:18:08 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* bignum.c: avoid conflict with USHORT on mingw32.
+
+Mon Jun  5 00:13:35 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* eval.c (rb_thread_schedule): =/== typo.
+
+Sun Jun  4 03:17:36 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: improve: CGI::pretty()
+
+Sun Jun  4 02:01:10 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* lib/mkmf.rb: do not need to add -L$(topdir) in --enable-shared case.
+
+Sat Jun  3 13:50:06 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (rb_id2name): should support constant attrset
+	  identifiers.
+
+	* bignum.c (rb_big_eq): Bignum#== should not raise exception.
+
+Fri Jun  2 11:24:48 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_popen): open with a block returns the value from the
+	  block.  old behavior was back.
+
+Fri Jun  2 00:42:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+
+	* eval.c (rb_thread_cleanup): should clear priority for thread
+	  termination.
+
+Thu Jun  1 22:39:41 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.20.
+
+	* lib/net/http.rb: wrongly closed the socket twice
+	  when no Content-Length: was given.
+
+Thu Jun  1 00:59:15 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_yield_0): convert Qundef to [].
+
+Wed May 31 20:45:59 2000  Dave Thomas  <Dave@Thomases.com>
+
+	* string.c (rb_str_slice_bang): wrong argument number.
+
+Wed May 31 12:37:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_exec_end_proc): print error message from END procs.
+
+Wed May 31 04:06:41 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: change: CGI#out() if "HEAD" == REQUEST_METHOD then
+	  output only HTTP header.
+
+Wed May 31 01:54:21 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_schedule): set main_thread->status to
+	  THREAD_TO_KILL, before raising deadlock error.
+
+	* eval.c (rb_thread_deadlock): if curr_thread == main_thread, do
+	  not call rb_thread_restore_context()
+
+Tue May 30 23:33:41 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* lib/mkmf.rb (create_makefile): add $(TARGET).ilk and *.pdb
+	  to cleanup files for mswin32.
+
+Mon May 29 10:41:10 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* file.c (rb_file_s_basename): should propagate taintness.
+
+Sun May 28 21:37:13 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* eval.c: bug fix: DLEXT2.
+
+Sun May 28 19:21:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* win32/win32.c: use ruby's glob.
+
+	* dir.c: "glob" exported and renamed to "rb_glob".
+
+	* ruby.h: ditto.
+
+	* main.c: turn off command line mingw32's globbing.
+
+Wed May 25 22:25:13 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/extmk.rb.in: use "ftools" instead of "rm -f".
+
+	* lib/mkmf.rb: ditto.
+
+Thu May 25 22:01:32 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* defines.h: mswin32: remove obsolete USHORT definition.
+
+	* re.h: mswin32: use EXTERN instead of extern.
+
+	* regex.h: mswin32: export re_mbctab properly.
+
+	* win32/ruby.def: add ruby_ignorecase and regex.c's exports.
+
+Thu May 25 21:28:44 2000  Minero Aoki <aamine@dp.u-netsurf.ne.jp>
+
+	* re.c (rb_reg_expr_str): escape un-printable character.
+
+Thu May 25 01:35:15 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (tokadd_escape): forgot to add `\x' to hexadecimal
+	  escape sequences.
+
+	* object.c (rb_obj_dup): dup for normal object (T_OBJECT) copies
+	  instance variables only.
+
+Wed May 24 23:49:47 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (rb_mod_initialize): should provide initialize.
+
+Wed May 24 23:17:50 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* win32/Makefile: remove unnecessary mv and rm command call.
+
+Wed May 24 21:01:04 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/pty/pty.c: use "" instead of <> to include ruby.h and rubyio.h
+	  for BeOS (PowerPC).
+
+	* file.c (rb_find_file): should check dln_find_file() result.
+
+	* win32/ruby.def: add rb_block_given_p.
+
+Wed May 24 16:32:45 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_popen): popen does not take 3rd argument anymore.
+
+	* re.c (rb_reg_desc): re may be zero, check before dereferencing.
+
+Wed May 24 16:03:06 2000  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/cgi.rb: bug fix: CGI::escape(), CGI::Cookie::new()
+
+	* lib/net/telnet.rb: improve: binmode(), telnetmode() interface
+
+Wed May 24 13:12:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* misc/ruby-mode.el (ruby-parse-region): support `while .. do'
+	  etc. But corresponding keywords must be at the beginning of
+	  line.
+
+Tue May 23 23:50:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (rb_reg_initialize_m): wrong kcode value.
+
+	* re.c (rb_reg_s_new): forgot to initialize re->ptr.
+
+Tue May 23 08:36:24 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): forgot to restore old option
+	  status by (?ix-ix).
+
+	* regex.c (re_compile_fastmap): anychar may match newline if
+	  RE_OPTION_MULTILINE or RE_OPTION_POSIXLINE is set.
+
+Mon May 22 22:45:06 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.19.
+
+	* lib/net/http.rb: do not use Regexp "p" option.
+
+Mon May 22 21:56:43 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* struct.c (rb_struct_getmember): should use ID2SYM, not INT2NUM.
+
+Mon May 22 15:07:37 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* file.c (rb_find_file): should check if the file really exists.
+
+Mon May 22 09:08:12 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_popen): _exit(0) after processing block under the
+	  child process.
+
+	* io.c (rb_io_popen): flush stdout/stderr before subprocess
+	  termination.
+
+	* eval.c (rb_check_safe_str): insert rb_secure(4); operation
+	  requires untainted string should be prohibited in level 4.
+
+Sun May 21 21:17:00 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: add Setup.dj for djgpp cross-compiling.
+
+	* Setup.dj: add readline.
+
+	* instruby.rb: copy win32/win32.h to archlibdir on mingw32.
+
+Sun May 21 20:58:08 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* pack.c: fix OFF16 and OFF32 definitions for Alpha and IRIX64.
+
+Sun May 21 17:31:37 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* instruby.rb: support "make install" for cross-compiling.
+
+	* ext/extmk.rb.in: ditto.
+
+Sun May 21 14:22:49 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* Makefile.in: rename prep.rb to fake.rb.
+
+	* configure.in: ditto.
+
+Sat May 20 23:29:14 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* dir.c (dir_s_new): does not take block; "open" does.
+
+	* io.c (rb_io_s_new): ditto.
+
+Fri May 19 07:44:26 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* dir.c (dir_s_open): Dir#open does not returns closed Dir if a
+	  block is given to the method.
+
+	* re.c (rb_reg_initialize_m): Regexp::new calls initialize now.
+
+	* string.c (Init_String): String#delete_at removed.
+
+	* string.c (rb_str_aset_m): should have checked argc != 2.
+
+	* eval.c (rb_thread_schedule): select(2) was called too many.
+
+	* regex.c (re_compile_pattern): a bug in (?m) support.  Pointed
+	  out by Dave Thomas <Dave@thomases.com>.
+
+Thu May 18 23:55:26 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* dln.c (search_undef): st_lookup()'s 3rd parameter should be
+	  a pointer of the variable which has the same size and alignment
+	  as `char *'.
+
+	* marshal.c (w_symbol, w_object): ditto.
+
+	* parse.y (rb_intern): ditto.
+
+Thu May 18 18:00:35 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.18.
+
+	* lib/net/protocol.rb: Net::Version was removed.
+
+	* lib/net/smtp.rb: use Socket.gethostname to get local host name.
+
+Thu May 18 13:34:57 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c (ruby_connect): should not have replaced
+	  thread_write_select() by rb_thread_fd_writable().
+
+Thu May 18 09:01:25 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* configure.in, ext/extmk.rb.in, lib/mkmf.rb: remove BeOS R3 support.
+	  Make a shared library (libruby.so) only if the --enable-shared
+	  option is specified.
+
+	* instruby.rb: no longer use libruby.so.LIB and import.h.
+
+	* io.c: fix READ_DATA_PENDING definition for BeOS (PowerPC).
+
+Wed May 17 14:14:23 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (rb_reg_new_1): use /m instead of /p.
+
+Wed May 17 02:22:03 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_polling): wait 0.06 second to let other
+	  processes run.
+
+	* process.c (rb_waitpid): avoid busy wait using rb_thread_polling.
+
+	* file.c (rb_thread_flock): ditto.
+
+	* parse.y (expr): avoid calling value_expr() twice.
+
+Wed May 17 00:45:57 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* io.c (rb_io_binmode): should check PLATFORMs, not O_BINARY, sigh...
+
+Wed May 17 00:40:15 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* win32/config.h: add DLEXT2, now DLEXT on mswin32 is "so".
+
+	* win32/config.status: ditto.
+
+	* win32/ruby.def: add symbol "rb_big_divmod".
+
+Tue May 16 19:45:32 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* intern.h: use EXTERN instead of extern.
+
+	* win32/ruby.def: add rb_defout, rb_stdout, ruby_errinfo,
+	  ruby_sourceline, ruby_sourcefile to work with eruby
+	  reported by Hiroshi Saito <HiroshiSaito@pob.org>.
+	  Export both ruby_xmalloc and xmalloc etc.
+
+Tue May 16 17:00:05 2000  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
+
+	* eval.c (rb_thread_select): should check whether fds are null.
+
+Tue May 16 11:51:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (pipe_open): synchronize subprocess stdout/stderr.
+
+Mon May 15 15:38:09 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.h: exported symbols should be for xmalloc etc. are now
+	  prefixed by 'ruby_', e.g. ruby_xmalloc().
+
+	* eval.c (rb_thread_select): remove busy wait for select.
+
+	* dir.c (glob): trailing path may be null, e.g. glob("**").
+
+Mon May 15 14:48:41 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* io.c (rb_io_pid): new method; returns nil if no process attached
+	  to the IO.
+
+Mon May 15 01:18:20 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_s_popen): _exit after Proc execution.
+
+Sun May 14 18:05:59 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* Makefile.in: missing/nt.c -> win32/win32.c
+
+	* configure.in: bug fix; static linking on mingw32.
+
+	* cygwin/GNUmakefile.in: remove VPATH.
+
+	* ext/extmk.rb.in: Makefile set binmode with mingw32 on cygwin32.
+
+	* lib/mkmf.rb: ditto.
+
+	* win32/config.h: undef HAVE_SYS_FILE_H.
+
+Sun May 14 02:02:48 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* lib/irb/ruby-lex.rb: '/' should be escaped in character class.
+
+Sun May 14 00:54:43 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in, ...: support mingw32.
+
+	* defines.h: ditto. undef EXTERN for tcl/tk on cygwin.
+
+	* ext/*/extconf.rb: replace PLATFORM with RUBY_PLATFORM.
+
+	* ext/socket/sockport.h: define IN_MULTICAST for missing IN_MULTICAST.
+
+	* ext/tcltklib/tcltklib.c: remove declaration of rb_argv0.
+
+	* file.c: should check S_IXGRP, S_ISGID, not NT.
+
+	* io.c (rb_io_binmode): should check _IOBIN, O_BINARY, not PLATFORMs.
+
+Sat May 13 14:21:15 2000  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* io.c (rb_io_s_popen): should check whether a block is given.
+
+Fri May 12 17:33:44 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): charset_not should not exclude
+	  newline from matching set.
+
+Thu May 11 22:51:05 2000  Ryunosuke Ohshima  <ryu@jaist.ac.jp>
+
+	* pack.c (pack_pack): Bignum support.
+
+	* pack.c (pack_unpack): ditto.
+
+Thu May 11 21:19:29 2000  Hiroshi Igarashi  <iga@ruby-lang.org>
+
+	* intern.h: add missing declarations of ruby API functions.
+
+	* ruby.h: fix function name in declarations.
+
+Thu May 11 22:29:25 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/md5/depend: add $(topdir)/config.h dependency to md5c.o.
+
+	* ext/md5/extconf.rb: new file to add -DHAVE_CONFIG_H flag for Alpha.
+
+Thu May 11 10:55:52 2000  Ryunosuke Ohshima  <ryu@jaist.ac.jp>
+
+	* pack.c (pack_pack): packing BER compressed integer by `w'.
+
+	* pack.c (pack_unpack): unpacking BER.
+
+Thu May 11 00:37:55 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (parse_regx): remove in_brack.
+
+Wed May 10 12:51:18 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (proc_options): move adding RUBYLIB and "." to the load
+	  path after #! line parsing.
+
+	* parse.y (parse_regx): should parse backslash escape like `\c['
+	  here to avoid causing `unterminated regexp' error.
+
+Wed May 10 00:19:53 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* MANIFEST, beos/GNUmakefile.in, configure.in: no longer need
+	  beos/GNUmakefile.in to support BeOS R4.5.2 (Intel) as a result
+	  of eban's Makefile.in change.
+
+	* io.c: NOFILE is already defined on BeOS R4.5 (Intel) or later.
+
+	* lib/matrix.rb: remove debug print.
+
+	* regex.c: don't use nested comment.
+
+Tue May  9 17:08:43 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (massign): no longer convert nil into empty array.
+
+	* io.c (rb_io_s_popen): optional 3rd argument to give proc, which
+	  will be executed in spawned child process.
+
+Mon May  8 23:47:39 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* eval.c (rb_callcc): prev & next should be initialized to zero.
+
+Mon May  8 23:17:36 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* dln.c (dln_init): remove possible buffer overrun.  This is
+	  suggested by Aleksi Niemela <aleksi.niemela@cinnober.com>.
+
+	* dln.c (init_funcname): ditto.
+
+Sat May  6 23:35:47 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (lhs): should allow `obj.Attr = 5' type expression.
+
+Sat May  6 15:46:08 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/socket/extconf.rb: add a new configure option to force use
+	  of the WIDE Project's getaddrinfo(): --enbale-wide-getaddrinfo.
+
+Fri May  5 21:19:22 2000  MOROHOSHI Akihiko  <moro@remus.dti.ne.jp>
+
+	* parse.y (yylex): allow '$1foo' and such.
+
+Fri May  5 17:57:24 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.17.
+
+	* lib/net/http.rb: write also port number in Host: field.
+
+	* lib/net/http.rb: see Proxy-Connection: to decide socket connection.
+
+Fri May  5 03:25:15 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_fastmap): charset_not for multibyte
+	  characters excluded too many characters.
+
+Tue May  2 13:23:43 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_schedule): little bit more impartial context
+	  switching.
+
+Tue May  2 09:50:03 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* configure.in: add DLDLIBS to set platform specific library
+	  for extensions.
+
+	* ext/extmk.rb.in: use @DLDLIBS@ instead of RUBY_PLATFORM choice.
+
+	* lib/mkmf.rb: use CONFIG["DLDLIBS"] instead of RUBY_PLATFORM choice.
+
+	* config_s.dj: add @DLDLIBS@.
+
+	* win32/config.status: ditto.
+
+	* win32/ruby.def: regular maintenance.
+
+Mon May  1 23:42:44 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in, eval.c: add DLEXT2. now DLEXT on Cygwin is "so".
+
+	* defines.h: use dllimport, dllexport for Cygwin 1.1.x.
+
+	* ruby.h: ditto.
+
+	* cygwin/GNUmakefile.in: ditto.
+
+	* ext/Win32API/Win32API.c: directly "call" in asm statement for
+	  gcc 2.95.x or newer.
+
+Sat Apr 29 04:58:12 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* array.c (rb_ary_unshift_m): performance improvement.
+
+Fri Apr 28 00:19:22 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* array.c (rb_ary_unshift_m): takes items to push.
+
+Wed Apr 26 15:23:02 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_succ): insert carrying character just before
+	  the leftmost alpha numeric character.
+
+	* string.c (rb_str_succ): proper behavior for "".succ and "\377".succ.
+
+	* string.c (rb_str_succ): use realloc and memmove.
+
+Tue Apr 25 18:28:45 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.16.
+
+	* lib/net/smtp.rb: add SMTP AUTH
+
+Tue Apr 25 14:30:13 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_gets_internal): shortcut when rs == rb_default_rs.
+
+Sat Apr 22 23:14:41 2000  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
+
+	* configure.in: MacOS X support.
+
+Sat Apr 22 16:37:10 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.15.
+
+	* lib/net/http.rb:  closing socket by watching both
+	  user header and server response
+
+Fri Apr 21 21:44:34 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* io.c (rb_io_s_pipe): should set FMODE_SYNC.
+
+Thu Apr 20 16:59:22 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (massign): `*lvalue = false' should assign `[false]' to
+	  lvalue.
+
+Wed Apr 19 08:35:08 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* class.c (rb_singleton_class): generate singleton class for
+	  special constants: nil, true, false.
+
+Wed Apr 19 02:09:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* class.c (rb_singleton_class): singleton method for nil, true,
+	  false is possible now.
+
+	* eval.c (rb_eval): ditto.
+
+Tue Apr 18 18:54:25 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.14.
+
+	* lib/net/http.rb: new method HTTP#head2.
+
+	* lib/net/http.rb: get2/post2 does not raise exceptions.
+
+Mon Apr 17 15:16:31 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_close): to detect some exceptional status, writable
+	  IO should be flushed before close;
+
+Sat Apr 15 18:29:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_collect_bang): Array#filter renamed.
+
+Fri Apr 14 19:47:11 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.13.
+
+	* lib/net/pop.rb: accept illegal timestamp
+
+	* lib/net/http.rb: when body was chunked, does not set Content-Length:
+
+Tue Apr 11 21:14:42 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* config_s.dj: add @sitedir@.
+	* configure.in: add --with-sitedir=DIR option.
+	* instruby.rb: use CONFIG["sitedir"].
+	* lib/mkmf.rb: support 'make site-install'.
+	* win32/config.status: add @sitedir@.
+
+Tue Apr 11 16:25:15 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (rb_big_2comp): unnecessary lvalue cast removed.
+
+Tue Apr 11 02:25:53 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (env_fetch): new method.
+
+	* marshal.c (marshal_dump): accepts depth = nil for unlimited depth.
+
+Sun Apr  9 20:49:19 2000  Dave Thomas  <Dave@Thomases.com>
+
+	* parse.y (str_extend): Allow class variables to be expanded.
+
+Fri Apr  7 02:03:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* error.c (rb_sys_fail): escape non-printable characters.
+
+Thu Apr  6 20:10:47 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/extmk.rb.in (create_makefile): BeOS --program-suffix support.
+	* lib/mkmf.rb (create_makefile): ditto.
+
+Thu Apr  6 09:55:26 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* error.c (rb_sys_fail): need rb_exc_new2() call on BeOS.
+
+Mon Apr  3 17:22:27 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_reopen): support tempfile.
+
+	* eval.c (catch_i): should supply argument.
+
+Sat Apr  1 22:50:28 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* marshal.c (r_object): wrong symbol restoration.
+
+Sat Apr  1 21:30:53 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* io.c (rb_io_printf, rb_f_printf): should use rb_io_write.
+
+Sat Apr  1 00:16:05 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): should be clear flags
+	  before calling finalizers.
+
+	* eval.c (specific_eval): can be called without SecurityError, if
+	  $SAFE >= 4.
+
+	* object.c (sym_inspect): inspect gives ":sym", to_s gives "sym".
+
+Fri Mar 31 22:07:04 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.12.
+
+	* lib/net/protocol.rb:  update Net::Protocol::Proxy#connect
+
+	* lib/net/protocol.rb:  ReplyCode is not a class
+
+	* lib/net/http.rb: header value format was change:
+	  values do not include header name
+
+	* lib/net/http.rb: header is not a Hash, but HTTPResponse
+
+Thu Mar 30 12:19:44 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* enum.c (enum_find): rb_eval_cmd() should be called with array.
+
+Tue Mar 28 13:57:05 2000  Clemens Hintze  <c.hintze@gmx.net>
+
+	* ext/dbm/dbm.c (fdbm_invert): should return new hash.
+
+	* ext/gdbm/gdbm.c (fgdbm_invert): ditto.
+
+Tue Mar 28 00:58:03 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.11.
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: does not
+	  dispatch any commands while dispatching command.
+
+	* lib/net/protocol.rb: failed to get error class of
+	  inherited ReplyCode
+
+	* lib/net/http.rb: change feature of "get2", "post2"
+
+Mon Mar 27 01:34:58 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.10.
+
+	* lib/net/http.rb: return value of 'head' was wrong.
+
+Sun Mar 26 17:47:35 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.9.
+
+	* lib/net/smtp.rb: SMTP#do_ready wrongly took no arguments
+
+Sat Mar 25 23:21:10 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* marshal.c (w_object): symbols should be converted to ID before
+	  dumping out.
+
+Fri Mar 24 18:26:51 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* file.c (test_check): should have checked exact number of arguments.
+
+Fri Mar 24 21:02:11 2000  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* signal.c (trap): should treat some symbols as the signal.
+
+Fri Mar 24 06:58:03 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.8.
+
+	* lib/net/http.rb:  post, get2, post2, get_body
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: separate
+	  Command/Socket documentation.
+
+Thu Mar 23 02:26:14 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_fptr_finalize): fptr may be null.
+
+	* io.c (rb_io_s_new): now calls `initialize'.
+
+	* io.c (rb_io_initialize): actual open done in this method.
+
+	* io.c (rb_file_initialize): ditto.
+
+	* eval.c (rb_eval): class variables in singleton class definition
+	  is now handled properly (I hope).
+
+Wed Mar 22 21:49:36 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* st.c (st_delete_safe): skip already deleted entry.
+
+	* hash.c (rb_hash_delete): modify brace miss.
+
+Wed Mar 22 08:53:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (exec_under): do not push cbase if ruby_cbase == under.
+
+	* node.h (NEW_CREF0): preserve cbase nesting.
+
+Tue Mar 21 12:57:50 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (rb_class_s_new): Class::new should call `inherited'.
+
+Sat Mar 18 12:36:09 2000  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* eval.c (rb_backtrace, make_backtrace): removed unused variable
+	  `lev'.
+
+	* eval.c (rb_attr): calls `method_added' at attribute definition.
+
+	* eval.c (rb_mod_modfunc): calls `singleton_method_added' while
+	  `module_function'.
+
+	* eval.c (rb_eval): parameter to `method_added' and
+	  `singleton_method_added' is Symbol.
+
+	* eval.c (Init_eval): caches IDs for `method_added' and
+	  `singleton_method_added'.
+
+Sat Mar 18 11:25:10 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (rescue): allows `rescue Error in foo'.  experimental.
+	  which is better this or preparing alias `exception' for `$!'?
+
+Fri Mar 17 15:02:45 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (rb_autoload_id): defining new autoload should be
+	  prohibited for $SAFE > 4.
+
+	* variable.c (rb_autoload_load): autoload should be possible for
+	  $SAFE > 4.
+
+	* eval.c (call_trace_func): should handle T_ICLASS properly.
+
+Fri Mar 17 14:34:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_gsub): forgot to initialize str->orig.
+
+Fri Mar 17 01:24:59 2000  Dave Thomas  <Dave@thomases.com>
+
+	* string.c (rb_str_clone): forgot to copy str->orig if STR_NO_ORIG
+	  is set by Array#pack.
+
+Wed Mar 15 21:25:04 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* array.c (rb_ary_join): 'result' is always duplicated
+	  before concat string.
+
+Wed Mar 15 17:26:05 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (rb_hash_s_create): unexpected recursive call removed.
+	  this bug was found by Satoshi Nojo <nojo@t-samukawa.or.jp>.
+
+Wed Mar 15 13:12:39 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (Init_Thread): Thread.join removed finally.
+
+	* string.c (rb_str_chomp_bang): forgot to call rb_str_modify().
+
+Mon Mar 13 16:12:13 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (block_pass): distinguish real orphan block and still
+	  on-stack block passed by block argument.
+
+Mon Mar 13 00:20:25 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (f_norm_arg): proper error message when constant comes
+	  in formal argument list.  this message is suggested by Muvaw
+	  Pnazte <bugathlon@yahoo.com>.
+
+	* eval.c (rb_f_raise): proper error message when the first
+	  argument is not an exception class/object.
+
+	* string.c (rb_str_dup): dup now postpone buffer copy as long as
+	  possible.  performance improved by lazy copying.
+
+Sun Mar 12 13:58:52 2000  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* signal.c (rb_f_kill): should treat some symbols as the signal.
+
+Sat Mar 11 22:03:03 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_gsub): performance tune by avoiding buffer copy.
+
+	* eval.c (rb_f_missing): check if argv[0] is ID.
+
+Sat Mar 11 15:49:41 2000  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* struct.c (rb_struct_aref): struct aref by symbol.
+
+Sat Mar 11 05:07:11 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* process.c (proc_setpriority): should return 0, not nil.
+
+	* process.c (proc_setpgid): ditto.
+
+Fri Mar 10 18:14:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* file.c (path_check_1): confusing buf and path.  this bug found
+	  by <decoux@moulon.inra.fr>.
+
+Fri Mar 10 09:37:49 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* MANIFEST: add beos/GNUmakefile.in.
+	* configure.in: support BeOS R4.5.2 (Intel).
+	* beos/GNUmakefile.in: new file to support BeOS R4.5.2 (Intel).
+
+Thu Mar  9 11:13:32 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_fastmap): fixed embarrassing brace bug.
+
+Thu Mar  9 01:36:32 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* missing/flock.c: emulate missing flock() with fcntl().
+
+Thu Mar  9 00:29:35 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (sym_to_s): returns ":sym".
+
+	* object.c (sym_id2name): separated from to_s; returns "sym".
+
+Wed Mar  8 19:16:19 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.7.
+
+	* lib/net/http.rb (connecting): returns header
+
+Wed Mar  8 02:08:43 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y: escape expansion too early.
+
+	* string.c (rb_f_scan): Kernel#scan added.
+
+	* regex.c (re_compile_pattern): support \cX et al.
+
+Tue Mar  7 01:44:27 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (set_stdin): simplified procedure, allows $stdin = DATA;
+	  experimental.
+
+	* io.c (set_outfile): ditto.
+
+	* re.c (Init_Regexp): new method Regexp#last_match added; it's an
+	  alternative for $~.
+
+	* configure.in (DEFAULT_KCODE): KCODE_NONE should be the default.
+
+	* dir.c (dir_s_rmdir): should return 0 on success.
+
+	* signal.c: remove CWGUSI support.
+
+Mon Mar  6 12:28:37 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* marshal.c (w_symbol): support symbol object.
+
+	* util.c: make symbol as separated class.
+
+	* error.c (Init_Exception): new exception RangeError.
+
+	* ext/socket/socket.c (ip_addrsetup): should check length of hostname.
+
+	* ext/socket/socket.c (ip_addrsetup): check newline at the end of
+	  hostname.  These fixes suggested by Muvaw Pnazte <bugathlon@yahoo.com>.
+
+Sun Mar  5 20:35:45 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/Win32API/Win32API.c (Win32API_initialize): should call
+	  LoadLibrary() everytime and should assign the hdll to Win32API
+	  object(protect the hdll from GC).
+
+Sun Mar  5 18:49:06 2000  Nakada.Nobuyoshi  <nobu.nokada@softhome.net>
+
+	* misc/ruby-mode.el (ruby-parse-region): not treat method `begin'
+	  and `end' as reserved words.
+
+	* misc/ruby-mode.el (ruby-font-lock-docs): ignore after `=begin'
+	  and `=end'.
+
+	* misc/ruby-mode.el (ruby-font-lock-keywords, hilit-set-mode-patterns):
+	  added `yield' to keywords.
+
+	* misc/ruby-mode.el (ruby-font-lock-keywords, hilit-set-mode-patterns):
+	  matches keywords at end of buffer.
+
+Sun Mar  5 18:08:53 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.6.
+
+	* lib/net/http.rb:  allow to omit 'start'
+
+Tue Feb 29 01:08:26 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* range.c (range_initialize): initialization done in `initialize';
+	  `initialize' should not be called more than once.
+
+	* object.c (Init_Object): default `initialize' should take zero
+	  argument.
+
+	* time.c (time_s_new): call `initialize' in Time::new.
+
+Sat Feb 26 22:39:31 2000  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* string.c (rb_str_times): fix String#* with huge string.
+
+Sat Feb 26 00:14:59 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* dir.c (dir_s_new): call `initialize' in Dir::new.
+
+Fri Feb 25 23:01:49 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ruby.h: export ruby_safe_level by EXTERN for mswin32.
+	* win32/ruby.def: regular maintenance.
+
+Fri Feb 25 22:12:46 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_reopen): IO#reopen should accept path as well.
+
+	* string.c (rb_str_s_new): call `initialize' in String::new.
+
+	* hash.c (rb_hash_s_new): call `initialize' in Hash::new.
+
+	* array.c (rb_ary_s_new): call `initialize' in Array::new.
+
+Fri Feb 25 12:50:20 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_start_timer): interval changed to 10ms from 50ms.
+
+Fri Feb 25 06:42:26 2000  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/socket/socket.c (ip_addrsetup): hostp should remain NULL if
+	  host is nil.
+
+Thu Feb 24 16:53:47 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_schedule): priority check for sleep expired
+	  threads needed.
+
+Wed Feb 23 14:22:32 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_join): forgot to initialize a local variable
+	  `taint'.
+
+Tue Feb 22 07:40:55 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (Init_Regexp): renamed to MatchData, old name MatchingData
+	  remain as alias.
+
+Tue Feb 22 00:20:21 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.5.
+
+	* lib/net/session.rb: rename to protocol.rb
+
+	* lib/net/protocol.rb: ProtocolSocket -> Net::Socket
+
+	* lib/net/protocol.rb: Net::Socket#write, write_pendstr
+	  can take block
+
+	* lib/net/smtp.rb: new methods SMTP#ready SMTPCommand#write_mail
+
+	* lib/net/pop.rb: POPMail#pop can take block
+
+Sat Feb 19 23:58:51 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): pop_loop should not pop at forward jump.
+
+Fri Feb 18 17:15:40 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (method_clone): method objects are now clonable.
+
+Fri Feb 18 00:27:34 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (rb_shared_variable_declare): shared variable (aka
+	  class/module variable) introduced.  prefix `@@'. experimental.
+
+	* class.c (rb_scan_args): new format char '&'.
+
+Thu Feb 17 19:09:05 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* win32/win32.c (mypopen): don't close handle if it is not assigned.
+	* win32/win32.c (my_open_osfhandle): support O_NOINHERIT flag.
+	* win32/win32.c (win32_getcwd): rename getcwd to win32_getcwd
+	  in order to avoid using the C/C++ runtime DLL's getcwd.
+	  Use CharNext() to process directory name.
+	* win32/win32.h: map getcwd to win32_getcwd.
+
+Wed Feb 16 00:32:49 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (method_arity): nd_rest is -1 for no rest argument.
+
+	* process.c (proc_waitpid): returns nil when waitpid(2) returns 0.
+
+Tue Feb 15 01:47:00 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* process.c (rb_f_waitpid): pid_t should be signed.
+
+Mon Feb 14 13:59:01 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): yylex yields wrong tokens for `:foo=~expr'.
+
+	* ruby.c (load_file): exit if reading file is empty.
+
+Mon Feb 14 03:34:52 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): `foo.bar=1' should be <foo><.><bar><=><1>,
+	  not <foo><.><bar=><1>.
+
+	* eval.c (rb_thread_restore_context): process according to
+	  RESTORE_* is moved after longjmp().
+
+	* eval.c (thread_switch): new function to process RESTORE_*.
+
+Sun Feb 13 16:19:49 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ruby.c (require_libraries): don't access freed memory.
+
+	* ruby.c (add_modules): ditto.
+
+Fri Feb 11 12:06:22 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (parse_quotedwords): %w() need to split not only by mere
+	  spaces, but by all whitespaces.
+
+Thu Feb 10 02:12:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_index_m): did not support negative offset.
+
+Wed Feb  9 21:54:26 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/socket/getaddrinfo.c: gcc --traditional support.
+	  Rearrange headers to work AC_C_CONST.
+	* ext/socket/getnameinfo.c: ditto.
+	* ext/socket/socket.c: mswin32: use double instead of long long.
+
+Wed Feb  9 16:30:41 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (num_coerce): should return [y, x].
+
+Wed Feb  9 11:07:30 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (ruby_prog_init): loadpath structure changed.
+
+Tue Feb  8 02:07:33 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): optimize for \G at top.
+
+	* regex.c (re_compile_pattern): \G introduced.
+
+	* regex.c (re_match): ditto.
+
+	* string.c (str_sub_bang): old behavior restored: bang method
+	  returns nil if string not changed.
+
+	* regex.c (re_compile_pattern): support independent subexpression
+	  `(?>pattern)'.
+
+	* regex.c (re_match): ditto.
+
+Mon Feb  7 15:51:08 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): now understands interrupts under Ruby.
+
+Mon Feb  7 07:51:52 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_uniq_bang): always return an Array.
+
+	* array.c (rb_ary_compact_bang): ditto.
+
+	* array.c (rb_ary_flatten_bang): ditto.
+
+	* hash.c (rb_hash_reject): returns a Hash, not an Array.
+
+	* hash.c (env_reject): ditto.
+
+Fri Feb  4 10:20:25 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (scan_once): scan now leaves information about the last
+	  successful pattern match in $&.
+
+	* io.c (rb_io_close): should not check closed IO.
+
+Fri Feb  4 05:44:01 2000  Kentaro Inagaki  <inagaki@tg.rim.or.jp>
+
+	* ext/socket/socket.c (s_recv): TRAP_BEG after retry entry.
+
+Wed Feb  2 22:33:45 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_thread_start): receives argument from outside, like
+	  `Thread::start(1,2,3){|a,b,c| ... }'.
+
+Wed Feb  2 22:14:40 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (rb_reg_regsub): should check regs->num_regs.
+
+	* re.c (rb_reg_search): remove matchcache, use static struct
+	  re_register instead.
+
+	* re.c (match_getter): avoid cloning match data.
+
+Wed Feb  2 17:12:15 2000  Dave Thomas  <Dave@Thomases.com>
+
+	* samples/eval.rb: Rescue new ScriptError exception
+
+Wed Feb  2 02:06:07 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_gsub_bang): gsub! now leaves information about the
+	  last successful pattern match in $&.
+
+Mon Jan 31 15:24:58 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_sub_bang): bang method returns string always.
+	  experimental.
+
+Sun Jan 30 17:58:09 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* eval.c: arrange to use setitimer(2) for BOW, DJGPP
+
+	* defines.h: ditto. use random(3) on cygwin b20.1.
+
+Sun Jan 30 17:20:16 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* eval.c: use getrlimit(2) on DJGPP.
+
+Thu Jan 27 01:27:10 2000  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
+
+	* dir.c (glob): glob pattern "/*" did not match.
+
+Wed Jan 26 22:30:47 2000  Shigeo Kobayashi  <shigeo@tinyforest.gr.jp>
+
+	* numeric.c (flo_modulo): wrong result for negative modulo.
+
+Wed Jan 26 02:01:57 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* file.c (test_c): should use S_ISCHR.
+
+	* file.c (rb_stat_c): ditto.
+
+	* string.c (rb_str_each_line): should propagate tainting.
+
+Tue Jan 25 04:01:34 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (rb_obj_freeze): all objects made freezable.
+
+Tue Jan 25 00:37:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: use AC_CHECK_TOOL for cross compiling.
+
+Mon Jan 24 19:01:54 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* array.c (rb_protect_inspect): should be checked by id of
+	  objects; not by object themselves.
+
+Mon Jan 24 18:48:08 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* eval.c (rb_eval): too many warnings;  warned on every method
+	  overriding.  should be on method discarding.
+
+Mon Jan 24 02:56:44 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): -2.abs should be `(-2).abs' to accomplish the
+	  principle of less surprise.  `+2' too.
+
+	* eval.c (rb_eval): when defining class is already there, and
+	  superclass differ, throw away the old class.
+
+	* variable.c (rb_const_set): gives warning again on constant
+	  redefinition.
+
+	* error.c (Init_Exception): SyntaxError, NameError, LoadError and
+	  NotImplementError are subclasses of ScriptError<Exception, not
+	  StandardError.  experimental.
+
+Sat Jan 22 00:00:41 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (parse_quotedwords): no longer use `String#split'.
+	  and enable space escape within quoted word list.
+	  e.g. %w(a\ b\ c abc) => ["a b c", "abc"].
+
+	* string.c (rb_str_slice_bang): new method `slice!'.
+
+Fri Jan 21 21:56:08 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.4.
+
+	* lib/net/http.rb: can receive messages which have
+	  no Content-Length:.
+
+Fri Jan 21 16:15:59 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thgroup_s_new): new class ThreadGroup.
+
+Tue Jan 18 12:24:28 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* struct.c (Init_Struct): remove Struct's own hash and eql?.
+
+Sat Jan 15 22:21:08 2000  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (search_method): argument klass may be 0.
+
+Sat Jan 15 15:03:46 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* enum.c (enum_index): remove this method.
+
+	* enum.c: remove use of pointers to local variables. find,
+	  find_all, min, max, index, member?, each_with_index,
+
+	* eval.c (massign): multiple assignment does not use to_a anymore.
+	  experimental.
+
+Fri Jan 14 12:22:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_replace): use memmove instead of memcpy for
+	  overwrapping strings (e.g. a[1] = a).
+
+Thu Jan 13 11:12:40 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (arg_add): use new node, ARGSPUSH.
+
+Mon Jan 10 18:32:28 2000  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* marshal.c (w_object): forgot an argument to call w_ivar().
+
+Sun Jan  9 18:13:51 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* random.c: first was not defined unless HAVE_RANDOM.
+
+Sat Jan  8 19:02:49 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_sysread): raise IOError for buffered IO.
+
+	* ext/socket/socket.c (s_recv): ditto.
+
+Fri Jan  7 00:59:29 2000  Masahiro Tomita  <tommy@tmtm.org>
+
+	* io.c (io_fread): TRAP_BEG/TRAP_END added around getc().
+
+Thu Jan  6 00:39:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* random.c (rb_f_rand): should be initialized unless srand is
+	  called before.
+
+Wed Jan  5 16:59:34 2000  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.3.
+
+	* lib/net/session.rb: Session -> Protocol, ...
+
+	* lib/net/http.rb: HTTPCommand implementation was changed.
+
+Wed Jan  5 02:14:46 2000  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* parse.y: Fix SEGV on empty parens with UMINUS or UPLUS.
+
+Tue Jan  4 22:25:54 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (stmt): `() while cond' dumped core.
+
+Tue Jan  4 06:04:14 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: modify for cross-compiling.
+	  use target_* instead of host_*.
+	  use AC_CANONICAL_TARGET.
+
+	* Makefile.in: ditto.
+
+	* cygwin/GNUmakefile.in: ditto.
+
+Sat Jan  1 13:26:14 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_yield_0): force_recycle ruby_dyna_vars to gain
+	  performance.
+
+	* array.c (rb_ary_delete_at_m): takes same argument pattern with
+	  rb_ary_aref.
+
+Sat Jan  1 10:12:26 2000  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ruby.h,util.c (rb_special_const_p): peep hole optimization.
+
+	* ruby.h,util.c (rb_test_false_or_nil): removed.
+
+	* ruby.h (RTEST, SPECIAL_CONST_P): peep hole optimization.
+
+	* ruby.h (FL_ABLE, FL_SET, FL_UNSET, FL_REVERSE): made expressions
+	  not statements.
+
+	* ruby.h (OBJ_INFECT): newly added macro which copies taint from
+	  `s' to `x'.
+
+Sat Jan  1 02:04:18 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_safe_level): new method.
+
+	* eval.c (rb_yield_0): recycle dyna_var_map to reduce object
+	  allocation.
+
+Fri Dec 31 00:52:48 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c: thread independent trace_func not needed.
+
+Thu Dec 30 14:47:31 1999  akira yamada  <akira@ruby-lang.org>
+
+	* configure.in: specifies -soname in LIBRUBY_DLDFLAGS on linux
+	  platforms.
+
+Thu Dec 30 10:51:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c,io.c,hash,c,re.c,string.c: `_m' suffix instead of
+	  `_method' for wrapper functions to implement method,
+	  e.g. `rb_str_join_m()'.
+
+Thu Dec 30 02:08:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (rb_cstr2inum): non-numeric format check added.
+	  currently it works only with base == 0 (i.e. Integer()).
+
+	* bignum.c (rb_str2inum): now takes VALUE to 1st argument.  null
+	  byte check added.
+
+	* array.c (rb_ary_replace): unless replacement is an array,
+	  replacement shall be converted to array by `[replacement]', not
+	  by `replacement.to_a'.
+
+	* array.c (rb_ary_plus): right operand must be an array.
+
+	* array.c (rb_ary_concat): argument must be an array.
+
+Mon Dec 27 12:35:47 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/socket/socket.c (sock_finalize): mswin32: fix socket handle leak.
+
+	* win32/win32.c (myfdclose): ditto.
+
+Sun Dec 26 23:15:13 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* win32/win32.c (mypopen): raise catchable error instead of rb_fatal.
+	* win32/win32.c (mypclose): fix process handle leak.
+
+Sun Dec 26 16:17:11 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/Win32API/Win32API.c (Win32API_initialize): use UINT2NUM
+	  instead of INT2NUM to set __dll__ and __proc__.
+
+Sat Dec 25 00:08:59 1999  KANEKO Naoshi  <wbs01621@mail.wbs.ne.jp>
+
+	* ext/Win32API/Win32API.c (Win32API_Call): remove 'dword ptr'
+	  from _asm.
+
+Fri Dec 24 10:26:47 1999  Koji Oda  <oda@bsd1.qnes.nec.co.jp>
+
+	* win32/win32.h: use "C++" linkage.
+
+Fri Dec 24 02:00:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (THREAD_ALLOC): should initialize th->trace.
+
+Fri Dec 24 00:43:39 1999  KANEKO Naoshi  <wbs01621@mail.wbs.ne.jp>
+
+	* io.c (pipe_open): check for `fptr->f == NULL'.
+	* win32/win32.c (mypopen): STDERR does not work during ` function.
+
+Wed Dec 22 22:50:40 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.2.
+
+	* lib/net/http.rb: HTTP support is enhanced a little
+
+	* lib/net/http.rb: support proxy
+
+Tue Dec 21 17:21:28 1999  Koji Oda  <oda@bsd1.qnes.nec.co.jp>
+
+	* ext/socket/socket.c (sock_finalize): mswin32: fix FILE* leak.
+
+Tue Dec 21 05:33:56 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.1.
+
+	* lib/net/http.rb: support HTTP chunk
+
+Mon Dec 20 19:08:12 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* file.c (rb_file_s_expand_path): handle dir separator correctly.
+
+Sun Dec 19 22:56:31 1999  KANEKO Naoshi  <wbs01621@mail.wbs.ne.jp>
+
+	* lib/find.rb: support dosish root directory.
+	* win32/Makefile: ditto.
+	* win32/config.status: ditto.
+	* win32/win32.c (opendir): ditto.
+	* win32/win32.c (opendir): use CharPrev() to get last character
+	  of the directory name.
+
+Sat Dec 18 03:00:01 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* file.c (path_check_1): check should be done by absolute path.
+
+	* marshal.c (r_ivar): should restore generic_ivar too.
+
+	* marshal.c (w_ivar): should dump generic_ivar too.
+
+Fri Dec 17 22:46:46 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.0.
+
+	* lib/net/http.rb: test release
+
+	* lib/net/session.rb: support class swapping
+
+	* lib/net/session.rb: Socket#flush_rbuf
+
+	* lib/net/session.rb: doquote -> Net.quote
+
+Fri Dec 17 19:27:43 1999  IWAMURO Motonori  <iwa@mmp.fujitsu.co.jp>
+
+	* eval.c (rb_load): should initialize ruby_frame->last_class.
+
+Wed Dec 15 01:35:29 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (proc_options): option to change directory changed to
+	  `-C' like tar.
+
+	* ruby.c (proc_options): argv boundary check for `-X'.
+
+Mon Dec 13 15:15:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_adjust_startpos): separate startpos adjustment
+	  because of major performance drawback.
+
+	* class.c (rb_singleton_class): tainted status of the singleton
+	  class must be synchronized with the object.
+
+	* eval.c (rb_thread_schedule): implement thread priority.
+
+Sat Dec 11 03:34:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* gc.c (mark_hashentry): key should be VALUE, not ID.
+
+	* io.c (argf_eof): should check next_p too.
+
+Thu Dec  9 18:09:13 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* error.c (exc_set_backtrace): forgot to declare a VALUE argument.
+
+Thu Dec  9 14:19:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (rb_obj_taint): explicit tainting must be prohibited at
+	  level 4 to prevent polluting trusted object by untrusted code.
+
+	* file.c: file operations (stat, lstat, chmod, chown, umask,
+	  truncate, flock) are prohibited in level 2 (was level 4).
+
+Wed Dec  8 11:48:23 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_f_require): prohibiting require() in the secure mode
+	  cause serious autoloading error.
+
+	* variable.c (rb_obj_instance_variables): don't need to prohibit
+	  to get list of instance variable names of untainted objects.
+
+	* variable.c (rb_ivar_get): don't need to prohibit to get instance
+	  variables of untainted objects.
+
+	* variable.c (rb_mod_remove_const): should prohibit constant
+	  removals too.
+
+Wed Dec  8 09:23:01 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): should try autoloading before defining
+	  class/module at the toplevel.
+
+Tue Dec  7 22:15:30 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* configure.in: Modified rb_cv_rshift_sign detect routine and
+	  more simple/fast RSHIFT() for hpux-10.x.
+
+Tue Dec  7 11:16:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (Init_eval): calculate stack limit from rlimit where
+	  getrlimit(2) is available.
+
+Tue Dec  7 09:57:33 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* file.c (rb_file_ftype): should have removed mode_t.
+
+Mon Dec  6 15:55:30 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* numeric.c (fix_rshift): Fix -1 >> 32 returned 0 (should be -1).
+
+	* numeric.c (fix_rshift): Fix  1 >> -1 returned 0 (should be 2).
+
+Mon Dec  6 11:47:23 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sprintf.c (rb_f_sprintf): formatted string must be tainted if
+	  any of parameters is a tainted string.
+
+	* file.c (rb_file_s_expand_path): expanded file path need not to
+	  be tainted always.
+
+Sun Dec  5 20:25:29 1999  Katsuhiro Ueno  <unnie@blue.sky.or.jp>
+
+	* eval.c (Init_Proc): simple typo.
+
+	* gc.c (add_heap): sizeof(RVALUE*), not sizeof(RVALUE).
+
+Sat Dec  4 01:40:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): adjust startpos for multibyte match unless
+	  the first pattern is forced byte match.
+
+	* bignum.c (rb_big_rand): should not use rand/random where drand48
+	  may be available.  RANDOM_NUMBER should be provided from outside.
+
+Fri Dec  3 09:54:59 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (moreswitches): there may be trailing garbage at #!
+	  line.
+
+	* eval.c (rb_f_require): should check require 'feature.o' too.
+
+Thu Dec  2 11:58:15 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* eval.c (rb_thread_loading): should maintain loading_tbl.
+
+Thu Dec  2 10:21:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_loading_done): wrong parameter to st_delete().
+
+Wed Dec  1 11:24:06 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ruby.c (process_sflag): process -s properly (should not force `--').
+
+Wed Dec  1 09:47:33 1999  Kazunori NISHI  <kazunori@swlab.csce.kyushu-u.ac.jp>
+
+	* string.c (rb_str_split_method): should increment end too.
+
+Tue Nov 30 18:00:45 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* marshal.c: MARSHAL_MINOR incremented; format version is 4.2.
+
+	* marshal.c (w_object): distinguish class and module.
+
+	* marshal.c (w_object): save hash's default value.
+
+	* marshal.c (r_object): restore hash's default value.
+
+Tue Nov 30 01:46:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (rb_reg_source): generated source string must be tainted if
+	  regex is tainted.
+
+	* file.c (rb_file_s_basename): basename should not be tainted
+	  unless the original path is tainted.
+
+	* file.c (rb_file_s_dirname): ditto.
+
+Mon Nov 29 20:42:13 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* file.c (stat_new): Struct::Stat -> File::Stat; Stat is no longer
+	  a Struct.
+
+Mon Nov 29 15:28:52 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (rb_path2class): evaluated value from path should be
+	  module or class.
+
+Fri Nov 26 18:12:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_exec_end_proc): should remove only end_procs defined
+	  within load wrapper.
+
+	* eval.c (rb_load): save and restore ruby_wrapper around loading.
+
+	* eval.c (rb_mark_end_proc): mark end procs registered by END{} or
+	  at_exit{}.
+
+	* eval.c (rb_set_end_proc): should not call rb_global_variable()
+	  on heap address;  it crashed mod_ruby.
+
+Mon Nov 22 14:07:24 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* ruby.c (proc_options): variable e_script should be visited by
+	  garbage collector.
+
+Sat Nov 20 10:10:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (inspect_i): value may be nil, check revised.
+
+Fri Nov 19 18:06:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* dir.c (glob): recursive wildcard match by `**' ala zsh.
+
+Fri Nov 19 11:44:26 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* variable.c: was returning void value.
+
+Fri Nov 19 03:57:22 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* file.c: add methods Stat struct class to reduce stat(2).
+
+Thu Nov 18 16:18:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/pstore.rb: mutual lock by flock(2).
+
+Thu Nov 18 11:44:13 1999  Masahiro Tomita  <tommy@tmtm.org>
+
+	* io.c (read_all): should check bytes too.
+
+Wed Nov 17 02:40:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (Init_IO): $defout (alias of $>) added.
+
+Tue Nov 16 09:47:14 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/pstore.rb: add mutual lock using symlink.
+
+Mon Nov 15 16:50:34 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* enum.c (enum_grep): non matching grep returns an empty array, no
+	  longer returns nil.
+
+	* enum.c (enum_grep): grep with block returns collection of
+	  evaluated values of block over matched elements.
+
+Mon Nov 15 04:50:33 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* re.c (rb_reg_source): should not call rb_reg_expr_str()
+	  everytime.
+
+Sat Nov 13 07:34:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (rb_mod_constants): traverse superclasses to collect
+	  constants.
+
+	* eval.c (assign): modified for shared variables.
+
+	* eval.c (rb_eval): search nested scope, then superclasses to
+	  assign shared variables within methods.
+
+	* eval.c (rb_eval): remove warnings from constants modification,
+	  because they are no longer constants.
+
+	* parse.y (node_assign): modified for shared variables.
+
+	* parse.y (assignable): allow constant assignment in methods;
+	  constants should be called `shared variable'.
+
+Fri Nov 12 23:52:19 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* process.c (rb_f_system): argument check for NT, __EMX__, DJGPP.
+
+Wed Nov 10 21:54:11 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* hash.c (rb_any_cmp): Fixed return without value.
+
+Wed Nov 10 17:57:06 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sprintf.c: incorporate <yasuf@big.or.jp>'s sprintf patch at
+	  [ruby-dev:7754].
+
+Wed Nov 10 08:28:53 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_call0): supply class parameter for each invocation.
+
+Tue Nov  9 13:21:04 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* configure.in: AC_MINIX move to before AC_EXEEXT and AC_OBJEXT.
+
+Mon Nov  8 19:52:29 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* configure.in: Renamed AC_CHAR_UNSIGNED to AC_C_CHAR_UNSIGNED.
+
+	* configure.in: Added default to AC_CHECK_SIZEOF().
+
+Mon Nov  8 14:28:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (stmt): rescue modifier added to the syntax.
+
+	* keywords: kRESCUE_MOD added.
+
+	* eval.c (rb_f_eval): fake outer scope when eval() called without
+	  bindings.
+
+	* eval.c (rb_f_binding): should copy last_class in the outer frame too.
+
+Sun Nov  7 18:31:04 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
+
+	* eval.c (is_defined): last_class may be 0.
+
+Sat Nov  6 19:26:55 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* Makefile.in: Added depend entry make parse.@OBJEXT@ from parse.c
+	  for UCB make
+
+Thu Nov  4 17:41:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): \< (wordbeg), \> (wordend) disabled.
+
+Wed Nov  3 08:52:57 1999  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
+
+	* io.c (Init_IO): forgot to use INT2FIX() around SEEK_SET, etc.
+
+Wed Nov  3 00:25:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_split_method): use mbclen2() to handle kcode
+	  option of regexp objects.
+
+Mon Nov  1 14:22:15 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* eval.c (rb_eval): reduce recursive calls to rb_eval()
+	  case of ||= and &&= .
+
+Sun Oct 31 13:12:42 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* regex.c (re_compile_pattern): wrong [\W] match.
+
+Fri Oct 29 16:57:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/nkf/lib/kconv.rb: new String methods (kconv, tojis, toeuc,
+	  tosjis).
+
+	* time.c (time_s_at): now accepts optional second argument to
+	  specify micro second.
+
+Thu Oct 28 13:35:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_split_method): should be mbchar aware with
+	  single char separators.
+
+Wed Oct 27 12:57:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* random.c (rb_f_srand): random seed should be unsigned.
+
+Tue Oct 26 23:58:15 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_collect): collect for better performance.
+
+Tue Oct 26 19:20:54 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* marshal.c (r_object): should register class/module objects.
+
+Sat Oct 23 15:59:39 1999  Takaaki Tateishi  <ttate@jaist.ac.jp>
+
+	* process.c (rb_f_system): should require at least one argument.
+
+Sat Oct 23 12:42:44 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* enum.c (enum_collect): collect without block will collect
+	  elements in enumerable.
+
+Thu Oct 21 16:14:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (moreswitches): function to process string option;
+	  the name is stolen from perl (not implementation).
+
+	* ruby.c (proc_options): use RUBYOPT environment variable to
+	  retrieve the default options.
+
+	* dir.c (fnmatch): use eban's fnmatch; do not depend on system's
+	  fnmatch (which may have portability problem) anymore.
+
+Wed Oct 20 15:14:24 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* marshal.c (marshal_load): should protect the generated object
+	  table (arg->data) from GC.
+
+Mon Oct 18 16:15:52 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/nkf/nkf.c (rb_nkf_kconv): output should be NUL terminated.
+
+Mon Oct 18 09:03:01 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/session.rb, smtp.rb, pop.rb: 1.0.3
+
+	* lib/net/pop.rb: new methods POP3Command#uidl, POPMail#uidl.
+
+Sun Oct 17 03:35:33 1999  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
+
+	* array.c (rb_ary_pop): forgot some freeze checks.
+
+Sat Oct 16 12:57:53 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* array.c (rb_ary_sort): always returns the copied array.
+
+Fri Oct 15 22:50:41 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* error.c (sys_nerr): on CYGWIN, it is _sys_nerr.
+
+Fri Oct 15 01:32:31 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* io.c (rb_io_ctl) :need to use NUM2ULONG, not NUM2INT.
+
+	* ext/Win32API/Win32API.c (Win32API_Call): need to use NUM2ULONG,
+	  not NUM2INT.
+
+Fri Oct 15 00:22:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (Init_Regexp): super class of the MatchingData, which was
+	  Data, to be Object.
+
+	* eval.c (ruby_run): evaluate required libraries before load &
+	  compiling the script.
+
+	* parse.y (lex_getline): retrieve a line from the stream, saving
+	  lines in the table in debug mode.
+
+	* eval.c (call_trace_func): treat the case ruby_sourcefile is null.
+
+Thu Oct 14 02:00:10 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (string): compile time string concatenation.
+
+Wed Oct 13 07:28:09 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/session.rb, smtp.rb, pop.rb: 1.0.2
+
+	* lib/net/session.rb: new method Session#set_pipe.
+
+	* lib/net/session.rb, smtp.rb, pop.rb: add RD documentation.
+
+Wed Oct 13 02:17:05 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* array.c (rb_ary_plus): remove recursion.
+
+	* array.c (rb_ary_sort_bang): detect modify attempt.
+
+Wed Oct 13 02:17:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (block_pass): should copy block to prevent modifications.
+	  tag in the structure should be updated from latest prot_tag.
+
+	* eval.c (proc_s_new): tag in struct BLOCK should not point into
+	  unused stack.
+
+	* dir.c (dir_s_glob): iterate over generated matching filenames if
+	  the block is given to the method.
+
+	* array.c (rb_ary_at): new methods; at, first, last.
+
+	* hash.c (rb_hash_fetch): raises exception unless the default
+	  value is supplied.
+
+	* hash.c (rb_hash_s_create): need not remove nil from value.
+
+	* hash.c (rb_hash_aset): setting value to nil does not remove key
+	  anymore.
+
+Tue Oct 12 22:29:04 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_read): length may be 0 or negative.
+
+Tue Oct 12 13:26:27 1999  Jun-ichiro itojun Hagino  <itojun@itojun.org>
+
+	* signal.c (posix_signal): RETSIGTYPE may be void.
+
+Tue Oct 12 03:28:03 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* array.c (rb_ary_delete_at): allows negative position.
+
+Mon Oct 11 17:42:25 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* parse.y (rb_intern): should generate distinct ID_ATTRSET symbols
+	  for the name with multiple `='s at the end.
+
+	* Makefile.in (CPPFLAGS): separate cpp flags from CFLAGS.
+
+Mon Oct 11 07:27:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): should not execute the `else' clause on the
+	  case the exceptions are handled by the `rescue' clause.
+
+	* signal.c (Init_signal): ignore SIGPIPE by default.
+
+Wed Oct  6 17:13:19 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* ruby.c (addpath): rubylib_mangled_path() modified.
+
+Mon Oct  4 12:42:32 1999  Kazuhiko Izawa  <izawa@erec.che.tohoku.ac.jp>
+
+	* pack.c (pack_unpack): % in printf format should be %%.
+
+Mon Oct  4 10:01:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (rb_obj_instance_variables): should always return
+	  array for all object can have instance variables now.
+
+Mon Oct  4 00:08:34 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* pack.c (OFF16): need to adjust pointer address to pack/unpack on
+	  64bit machines.
+
+Sun Oct  3 03:05:59 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* time.c (time_arg): mktime y2k problem.
+
+Sun Sep 26 16:54:45 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* parse.y (here_document): `\r' handling for here documents.
+
+Wed Sep 22 09:20:11 1999  Masahiro Tomita  <tommy@tmtm.org>
+
+	* ext/socket/socket.c: SOCKS5 support.
+
+Wed Sep 22 07:33:23 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/session.rb, smtp.rb, pop.rb: 1.0.1
+
+	* lib/net/pop.rb: APOP did not work.
+
+	* lib/net/pop.rb: modify the way to make APOP challenge.
+
+Wed Sep 22 00:35:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_include): should return boolean value.
+
+	* regex.c (re_compile_fastmap): wrong comparison with mbc.
+
+	* eval.c (specific_eval): default sourcefile name should be
+	  "(eval)" for module_eval etc.
+
+Wed Sep 22 00:06:07 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* win32/Makefile: update rules.
+
+	* io.c (io_fread): should not assign in char, it maybe -1.
+
+Tue Sep 21 23:57:54 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (call_trace_func): should not propagate retval in
+	  trace_func.
+
+Mon Sep 20 21:35:39 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* win32/win32.c (myselect): assume non socket files are always
+	  readable/writable.
+
+Mon Sep 20 01:08:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_fread): should not block other threads.
+
+	* io.c (rb_io_synchronized): renamed from rb_io_unbuffered(); do
+	  not call setbuf(NULL) anymore.
+
+Sat Sep 18 13:45:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* stable version 1.4.2 released.
+
+Fri Sep 17 23:24:17 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* eval.c (rb_f_missing): dumped core if no argument given.
+
+Fri Sep 17 23:21:06 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* win32/win32.c (myselect): translate WSAEINTR, WSAENOTSOCK into
+	  UNIX errno constants.
+
+Fri Sep 17 00:52:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (arg): assignable() may return 0.
+
+Thu Sep 16 20:46:23 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* eval.c (rb_eval): was doubly evaluating the return expression.
+
+Thu Sep 16 18:40:08 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* stable version 1.4.1 released.
+
+Thu Sep 16 11:33:22 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* string.c (rb_str_match): should return nil.
+
+Wed Sep 15 22:46:37 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (rb_reg_s_quote): should quote `-' too.
+
+Tue Sep 14 15:23:22 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* parse.y (yylex): no need to ignore `\r' here.
+
+	* parse.y (nextc): strip `\r' from text.
+
+	* parse.y (nextc): support `__END__\r\n' type terminator.
+
+Mon Sep 13 10:49:19 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* eval.c (rb_eval): needless RTEST(ruby_verbose) removed.
+
+Mon Sep 13 09:10:11 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/net/session.rb, smtp.rb, pop.rb: 1.0.0
+
+Wed Sep  8 11:37:38 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* time.c (make_time_t): bit more strict comparison.
+
+Tue Sep  7 00:50:56 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* range.c (range_each): use rb_str_upto() for strings.
+
+	* string.c (rb_str_upto): set upper limit by comparing curr <= end.
+
+	* range.c (range_each): should check equality to handle magic
+	  increment.
+
+Mon Sep  6 22:43:33 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): break/next/redo available within -n/-p loop.
+
+Fri Sep  3 11:14:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* compar.c (cmp_equal): should not raise exception; protect by
+	  rb_rescue().
+
+Thu Sep  2 05:23:05 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* file.c (rb_file_s_expand_path): use dirsep, instead of character
+	  literal '/'.
+
+	* file.c (rb_file_s_expand_path): reduce multiple dirsep at the top.
+
+Wed Sep  1 00:28:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_call): call rb_undefined() if a method appears not to
+	  be exist explicitly from cache.
+
+	* eval.c (rb_method_boundp): check method cache before calling
+	  rb_get_method_body().
+
+	* eval.c (rb_get_method_body): store method non-existence
+	  information in the cache.
+
+	* random.c (rb_f_srand): use getpid(2) to generate seed.
+
+	* regex.c (re_match): do not apply partial mbc match for
+	  charset_not.
+
+	* regex.c (re_compile_pattern): put extended literal prefix (0xff)
+	  only before numeric literals, not before all >0x80 char.
+
+	* regex.c (re_compile_pattern): put numeric literal in extended
+	  charset region, not normal charset bits.
+
+	* regex.c (re_compile_fastmap): calculate fastmap for charset and
+	  charset_not to treat numeric literal (e.g. \246) specially.
+
+Fri Aug 28 17:32:55 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
+
+	* eval.c (rb_eval): should set return value (nil) explicitly if a
+	  value is omitted for return statement.
+
+Sun Aug 26 20:26:40 2001  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* ext/readline/readline.c: restore terminal mode
+	  even if readline() interrupted.
+
+	* ext/readline/readline.c: returned string need to
+	  be tainted.
+
+	* ext/readline/readline.c: fixed memory leak.
+
+	* ext/readline/readline.c: allow negative index.
+
+	* ext/readline/readline.c: added Readline::HISTORY.size
+	  same as Readline::HISTORY.length
+
+	* ext/readline/readline.c: allow conditional parsing
+	  of the ~/.inputrc file by `$if Ruby'.
+
+	* ext/readline/extconf.rb: check whether the
+	  libreadline has the variable `rl_completion_append_character'
+	  (this feature was implemented from GNU readline 2.1).
+
+Thu Aug 26 15:06:11 1999  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
+
+	* gc.c (rb_gc): local variables may be placed beyond stack_end, so
+	  use an address from alloca(1) on non C_ALLOCA platforms.
+
+Thu Aug 26 01:24:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sprintf.c (rb_f_sprintf): "%%" is legal, but "%3.14%" is not.
+
+Mon Aug 23 00:00:54 1999  Tsukada Takuya  <tsukada@fminn.nagano.nagano.jp>
+
+	* regex.c (re_compile_fastmap): wrong macro caused memory leak.
+
+Sat Aug 21 11:30:51 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (ADJ): should not adjust addresses to data on heap.
+
+Fri Aug 20 20:50:58 1999  Kenji Nagasawa  <kenn@hma.att.ne.jp>
+
+	* defines.h (PATH_SEP): path separator is ";" for OS/2.
+
+Thu Aug 19 10:50:43 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* gc.c (rb_gc): add volatile to avoid GCC optimize bug(?).
+
+Wed Aug 18 23:48:10 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* due to disk trouble, some change records were lost.  several
+	  modification made to eval.c, gc.c, io.c, pack.c,
+	  ext/extmk.rb.in, and lib/mkmf.rb.
+
+Fri Aug 13 15:41:39 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* stable version 1.4.0 released.
+
+Fri Aug 13 03:16:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (argf_forward): since $stdout may be non-IO, ARGF.file is
+	  not guaranteed to be IO.  check and forwarding added to every ARGF
+	  method.
+
+	* io.c (set_outfile): $stdout/$stderr may not be IO now.
+
+	* io.c (set_stdin): $stdin may not be IO now.
+
+	* range.c (rb_range_beg_len): round `end' to length as documented.
+
+	* io.c (Init_IO): preserve original stdin/stdout/stderr.
+
+Thu Aug 12 13:44:33 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (Init_load): require receives 1 argument.
+
+	* eval.c (frame_dup): should clear tmp to avoid dangling
+	  references.
+
+Wed Aug 11 13:33:13 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* eval.c (rb_eval): no automatic aggregate initialization.
+
+	* eval.c (module_setup): ditto.
+
+Wed Aug 11 18:18:41 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* eval.c (yield_under_i): automatic aggregate initialization is an
+	  ANSI feature.
+
+Wed Aug 11 10:10:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): parse `[].length==0' as `([].length)==0', not
+	  `([].length=)=0'
+
+	* parse.y (yylex): parse `[].length!=0' as `([].length)!=0', not
+	  `([].length!)=0'
+
+	* parse.y (peek): peek-in lexical buffer.
+
+Wed Aug 11 00:34:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): bug on backward jump adjustment concerning
+	  stop_paren.
+
+Tue Aug 10 14:54:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/nkf/nkf.c (rb_nkf_guess): binary detection was wrong.
+
+Tue Aug 10 00:07:36 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_clone): should use CLONESETUP().
+
+Mon Aug  9 23:57:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.h (CLONESETUP): should have copied generic instance
+	  variables too.
+
+Mon Aug  9 10:46:54 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/socket/extconf.rb: add check for <arpa/nameser.h> and
+	  <resolv.h>.
+
+Sat Aug  7 13:19:06 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* numeric.c (flo_cmp): comparing NaN should not return value.
+	  raises FloatDomainError.
+
+Sat Aug  7 03:09:08 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (blk_free): free copied frames too.
+
+	* eval.c (frame_dup): should copy previous frames from stack to
+	  heap to preserve frame information.
+
+Fri Aug  6 15:01:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.3.7 - version 1.4 beta
+
+	* ext/socket/socket.c (s_recv): UDPsocket#recvfrom now returns
+	  IPsocket#addr information.
+
+	* array.c (rb_ary_subary): ary[-3,3] should not return nil.
+
+Thu Aug  5 10:58:01 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_mark): protect old ruby_frame from GC during it
+	  replaced by eval().
+
+	* eval.c (eval): do not modify frame.prev; binding should preserve
+	  information about calling() too.
+
+	* eval.c (rb_yield_0): no arity check for mere yield; but only for
+	  Proc#call.
+
+Tue Aug  3 22:07:13 1999  Kazuhiro HIWADA  <hiwada@kuee.kyoto-u.ac.jp>
+
+	* object.c (rb_mod_clone): should check if iv_tbl, m_tbl are
+	  initialized.
+
+Tue Aug  3 19:03:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (rb_any_cmp): use rb_with_disable_interrupt() to ensure
+	  clearance of rb_prohibit_interrupt even on failure.
+
+	* eval.c (rb_with_disable_interrupt): new function added.
+
+Sat Jul 31 23:23:44 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_create_0): set THREAD_RAISED flag on thread
+	  termination by exception.
+
+	* eval.c (rb_thread_join): `$!' may not be nil for the threads
+	  created in rescue clause.
+
+	* eval.c (rb_thread_status): ditto.
+
+	* eval.c (rb_thread_join): should re-raise exception for already
+	  dead threads too.
+
+Fri Jul 30 17:56:54 1999  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
+
+	* object.c (rb_mod_ge): wrong comparison.
+
+Fri Jul 30 12:15:44 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/tcltklib/extconf.rb: win32 support.
+
+	* lib/mkmf.rb: use append_library().
+
+	* ext/extmk.rb.in: ditto.
+
+Fri Jul 30 02:11:48 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_delete): should return nil for deleting non
+	  existing item.
+
+	* io.c (rb_io_close): call rb_sys_wait() on explicit close.
+
+	* io.c (rb_io_fptr_close): do not call rb_sys_wait() on finalize.
+
+	* eval.c (yield_under_i): cbase context should be maintained for
+	  Module#module_eval().  suggested by <inaba@st.rim.or.jp>.
+
+Wed Jul 28 01:18:28 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* Makefile.in: add -I$(hdrdir)/lib to install using ftools.
+
+	* util.c: use HAVE_FCNTL_H, not HAVE_FCNTL
+
+Wed Jul 28 18:24:45 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.3.6 - version 1.4 alpha
+
+Tue Jul 27 09:38:08 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* eval.c (rb_eval): reduce recursive rb_eval() calls by
+	  NODE_BLOCKs.
+
+Tue Jul 27 01:20:40 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* file.c (rb_file_s_expand_path): drive letter patch.
+
+Mon Jul 26 02:36:31 1999  Shugo Maeda  <shugo@netlab.co.jp>
+
+	* eval.c (rb_load): should clear ruby_nerr.
+
+	* eval.c (rb_thread_join): oldbt should not be empty to unshift.
+
+Sun Jul 25 12:09:16 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* dir.c (push_braces): should treat nested braces.
+
+Fri Jul 23 02:49:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (rb_hash_clear): dummy argument added; suggested by
+	  <eguchi@shizuokanet.ne.jp>.  thanks.
+
+Thu Jul 22 19:37:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_join): get_backtrace() may return Qnil.
+	  typecheck added.
+
+Tue Jul 20 14:36:43 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* range.c (range_each): do not treat String specially (for future
+	  override).
+
+Tue Jul 20 02:28:34 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_gets): $_ should be nil, when get returns nil.
+
+	* io.c (rb_f_gets): ditto.
+
+Mon Jul 19 17:13:09 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_fastmap): should continue fastmap compile
+	  for anychar_repeat, for it's repeat anyway.
+
+Mon Jul 26 13:33:45 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* lib/jcode.rb: replaced by faster code.
+
+Mon Jul 19 01:57:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/mkmf.rb: no longer use install program.
+
+	* ext/extmk.rb.in: use miniruby to install programs.
+
+Sat Jul 17 00:06:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c (ipaddr): don't do reverse lookup if
+	  attribute do_not_reverse_lookup is set for socket classes.
+	  Experimental.  Note this is a global attribute.
+
+Fri Jul 16 22:18:29 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_eof): use feof() to check EOF already met.
+
+	* io.c (read_all): should return nil at EOF.
+
+Fri Jul 16 13:39:42 1999  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/telnet.rb: version 0.231.
+
+Fri Jul 16 10:58:22 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* regex.c (re_match): debug print removed.
+
+Fri Jul 16 09:58:15 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* many files: clean up unused variables found by gcc -Wall.
+
+	* lib/mkmf.rb: better cygwin support etc.
+
+	* ext/extmk.rb.in: ditto.
+
+	* instruby.rb: ditto.
+
+Fri Jul 16 01:37:50 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* string.c (rb_str_squeeze_bang): the type of local variable `c'
+	  should be int, not char.
+
+	* string.c (rb_str_reverse): should always return copy.
+
+Thu Jul 15 23:25:57 1999  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
+
+	* lib/debug.rb: better display & frame treatment.
+
+Thu Jul 15 21:16:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_each): returns self for normal termination;
+	  returns nil for break.
+
+	* string.c: non bang methods (e.g. String#sub) should always
+	  return copy of the receiver.
+
+Thu Jul 15 21:09:15 1999  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
+
+	* eval.c (find_file): do not add empty string to the path.
+
+	* configure.in (with-search-path): should not add empty string if
+	  the option is not supplied.
+
+Thu Jul 15 17:49:08 1999  Ryo HAYASAKA  <hayasaka@univ21.u-aizu.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: move `#include "ruby.h"' forward.
+
+Thu Jul 15 16:54:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.3.5 - version 1.4 alpha
+
+Wed Jul 14 23:45:33 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* eval.c (ruby_init): initialize for the first time only.
+
+Tue Jul 13 00:15:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (rb_hash_index): re-defined; method to retrieve a key
+	  from the value.
+
+	* hash.c (Init_Hash): member? should be re-defined for Hash.
+
+Tue Jul 12 13:54:51 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* io.c (rb_file_sysopen): wrong number of argument.
+
+Mon Jul 12 11:52:35 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_f_missing): class name included in message.
+
+	* eval.c (print_undef): better error message.
+
+Sun Jul 11 05:36:17 1999  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
+
+	* lib/debug.rb: patch to show proper position.
+
+Fri Jul  9 23:56:14 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* dln.c (dln_find_1): path conv. moved to conv_to_posix_path.
+
+	* dln.c (conv_to_posix_path): path conv. should be done.
+
+Fri Jul  9 10:26:47 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* random.c (RANDOM_NUMBER): should place parentheses.
+
+Fri Jul  8 11:00:51 1999  Shugo Maeda  <shugo@netlab.co.jp>
+
+	* numeric.c (fix_div): division may be out of fixnum range.
+
+	* bignum.c (bigdivmod): proper sign calculation to result.
+
+Wed Jul  7 18:27:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* st.c (st_delete_safe): was modifying wrong slot.
+
+Mon Jul  5 13:17:46 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): close all files at exit.
+
+Fri Jul  2 18:00:21 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* lib/Mail/README: Mail-0.3.0 added to the distribution.
+
+Fri Jul  2 01:45:32 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_fastmap): avoid allocation of register
+	  variables for each invocation of re_match().  Suggested by
+	  Zasukhin Ruslan <ruslan@paradigmasoft.com>.  Thanks.
+
+Tue Jun 29 20:39:24 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* ext/tk/lib/tk.rb (TkVariable): bug fix; should value type check
+	  be added?
+
+	* string.c (rb_str_each_line): a bug in paragraph mode.
+
+	* ruby.c (load_file): shifted too much to skip #!.
+
+Tue Jun 29 06:50:21 1999  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/CGI.rb: 0.30 - cleanup release, incompatible.
+
+	* lib/telnet.rb: 0.22 - timeout added.
+
+Tue Jun 29 10:49:25 1999  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
+
+	* configure.in: better Rhapsody support.
+
+	* lib/mkmf.rb: Rhapsody/NEXTSTEP support.
+
+Tue Jun 29 01:42:13 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/pty/pty.c (chld_changed): should use POSIX.1 style wait.
+
+Mon Jun 28 21:07:36 1999  KIMURA Koichi  <kbk@kt.rim.or.jp>
+
+	* ext/extmk.rb.nt: wrong result for have_library().
+
+Mon Jun 28 15:24:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* missing/isinf.c: OSF/1 raises SIGFPE on one()/zero().
+
+	* regex.c (re_search): should search til EOS, for patterns may
+	  match beyond the end of range.
+
+Mon Jun 28 12:49:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_f_select): should not accept Time objects as an
+	  argument for it is time interval.
+
+	* process.c (rb_f_sleep): ditto.
+
+	* file.c (test_s): should return nil for false condition.
+
+Mon Jun 28 12:23:52 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* bignum.c (rb_dbl2big): typo.
+
+	* file.c (rb_f_test): ditto.
+
+	* string.c (rb_str_crypt): wrong message.
+
+Sun Jun 27 19:50:11 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* eval.c (rb_f_exit): should have treat signed integer status, not
+	  VALUE.
+
+	* process.c (rb_f_exit_bang): should work like exit().
+
+Sun Jun 27 16:21:32 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* string.c (rb_str_rindex): wrong position to search.
+
+Sat Jun 26 04:05:30 1999  Takaaki Tateishi  <ttate@jaist.ac.jp>
+
+	* configure.in (configure_args): --with-search-path to specify
+	  additional ruby search path.
+
+	* ruby.c (ruby_prog_init): additional search path.
+
+Fri Jun 25 13:09:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* pack.c (pack_unpack): needed to initialize natint.
+
+	* regex.c (re_compile_pattern): add start_paren to avoid too much
+	  finalization on maybe_finalize_jump.
+
+Fri Jun 25 13:07:20 1999  Koji Oda  <oda@bsd1.qnes.nec.co.jp>
+
+	* missing/isinf.c: include "config.h" added.
+
+Fri Jun 25 07:25:05 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* lib/mkmf.rb: initialize $(topdir).
+
+	* ext/extmk.rb.in (install_rb): install lib/*.rb properly.
+
+	* configure.in (linux): specifies -rpath on --enable-shared.
+
+	* configure.in (aix): ruby.imp must reside in $(topdir).
+
+Thu Jun 24 19:11:29 1999  Yoshida Masato  <yoshidam@yoshidam.net>
+
+	* parse.y (rb_str_extend): multi-byte identifier in expression
+	  interpolation in strings.
+
+	* parse.y (yylex): support multi-byte char identifiers.
+
+Thu Jun 24 15:27:13 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (f_arg): check duplicate argument names.
+
+	* gc.c (rb_gc_mark): marking wrong member for NODE_ARGS.
+
+	* string.c (rb_str_rindex): POSITION specifies start point, not
+	  end point.
+
+Thu Jun 24 13:00:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (print_mbc): wrong boundary.
+
+	* pack.c (uv_to_utf8): raises ArgError for too big value.
+
+Thu Jun 24 11:02:51 1999  Yoshida Masato  <yoshidam@yoshidam.net>
+
+	* pack.c (uv_to_utf8): mask needed.
+
+Wed Jun 23 21:03:56 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* ruby.h (struct RFile): remove iv_tbl from struct. instance
+	  variables are handled as generic ivs.
+
+Wed Jun 23 22:06:26 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* pack.c (utf8_to_uv): pack to 7 bytes sequence.
+
+	* pack.c (uv_to_utf8): wrong boundary.
+
+	* pack.c (pack_unpack): should treat as unsigned long.
+
+Wed Jun 23 15:10:11 1999  Inaba Hiroto  <inaba@sdd.tokyo-sc.toshiba.co.jp>
+
+	* parse.y (parse_string): failed to parse nested braces.
+
+	* parse.y (parse_regx): nested braces within #{} available.
+
+Wed Jun 23 11:18:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (slow_search): wrong shift width for mbcs.
+
+	* eval.c (rb_thread_save_context): should not clear th->locals.
+
+Wed Jun 23 02:06:14 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): UMINUS binds too tight with digits. changed so
+	  that -2**2 => -4.
+
+	* parse.y (close_paren): `do' for expr termination now works it
+	  used to be.
+
+Wed Jun 22 18:26:42 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* pack.c (pack_pack): should initialize local variable `j'.
+
+Wed Jun 22 15:24:59 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* parse.y (here_document): a bug for multiline heredoc.
+
+Tue Jun 22 15:06:36 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ext/socket/socket.c (ruby_socket): forgot to return fd
+	  explicitly.
+
+Tue Jun 22 13:34:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* rubyio.h (MakeOpenFile): should initialize member `iv_tbl'.
+
+Wed Jun 22 10:35:51 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* io.c (rb_io_gets_internal): getc(3) may not set errno on
+	  interrupt.
+
+Mon Jun 21 22:39:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (call_required_libraries): ruby_sourceline should be
+	  cleared before loading libraries.
+
+	* io.c (set_stdin): do not use reopen(), so that we don't need to
+	  dup original stdin before assigning $stdin.
+
+Mon Jun 21 18:04:27 1999  Ryo HAYASAKA  <hayasaka@univ21.u-aizu.ac.jp>
+
+	* ext/dbm/dbm.c: include <cdefs.h> for solaris 2.6.
+
+Mon Jun 21 15:59:47 1999  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* ext/socket/socket.c (ip_addrsetup): forgot to put `else'.
+
+Mon Jun 21 15:38:37 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (fptr_finalize): remove rb_syswait() invocation to avoid
+	  wait4(2) within GC.  rb_syswait() moved to rb_io_fptr_close().
+
+Mon Jun 21 12:05:59 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* dir.c (dir_s_glob): remove MAXPATHLEN restriction.
+
+	* ext/md5/md5init.c (md5_hexdigest): should have used "%02x".
+
+Sun Jun 20 19:50:38 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* string.c (rb_str_each_line): should have checked string
+	  boundary.
+
+Sat Jun 19 22:24:12 1999  Kenji Nagasawa  <kenn@hma.att.ne.jp>
+
+	* OS/2 patch improved.
+
+Fri Jun 18 08:30:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* marshal.c (r_byte): add data length check.
+
+	* ext/tcltklib/tcltklib.c (_timer_for_tcl): was doing busy-wait.
+
+Tue Jun 15 10:01:21 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* configure.in: remove trailing slash from interpreter embedded
+	  shared library path.
+
+	* configure.in (INSTALL_DLLIB): install shared lib with 0555.
+
+	* instruby.rb: changed mode for shared library into 0555.
+
+Fri Jun 11 23:27:00 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* ext/etc/etc.c (etc_passwd): should return nil, not exception for
+	  call after last passwd entry.
+
+Fri Jun 11 15:21:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* gc.c (rb_gc_mark_locations): add safety margin 1.
+
+	* eval.c (ruby_run): should protect toplevel node tree.
+
+	* ext/etc/etc.c (etc_group): dumps core if there's no more group.
+
+Fri Jun 11 01:50:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (ruby_run): Init_stack() was called too late; local
+	  variables happened to be higher (or lower) than stack_start.
+
+Thu Jun 10 16:41:48 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c: do not call `initialize' for IO objects.  So with Array,
+	  Hash, Range, and Time objects.
+
+	* ext/curses/curses.c (curses_getch): made thread aware using
+	  rb_read_check().
+
+	* ext/curses/curses.c (window_getch): ditto.
+
+	* ext/curses/curses.c (curses_getstr): made (partially) thread
+	  aware using rb_read_check().
+
+	* ext/curses/curses.c (window_getstr): ditto.
+
+	* io.c (rb_read_check): new function to help making something
+	  (like extension libraries) thread aware.
+
+	* eval.c (is_defined): `defined? super' should be true even for
+	  private superclass methods.
+
+Fri Jun 10 13:42:10 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* pack.c (pack_pack): template `Z' should be allowed.
+
+Wed Jun  9 13:26:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_loading): modified to avoid nested race
+	  condition of require().
+
+	* ext/tcltklib/tcltklib.c (ip_invoke): queue invocation on non
+	  main threads.
+
+	* ext/tcltklib/tcltklib.c (lib_mainloop): flush invocation
+	  queues periodically.
+
+	* version.c (ruby_show_version): now print the message to stdout.
+
+	* version.c (ruby_show_copyright): ditto.
+
+Tue Jun  8 00:00:34 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* pack.c (pack_unpack): append sentinel (NUL) to the string.
+
+	* ext/md5/md5init.c (md5_hexdigest): new method to obtain
+	  printable hash string.
+
+	* ext/md5/md5init.c (md5_update): should return self.
+
+	* pack.c (pack_pack): undocumented template 'U' for UTF8.
+
+	* pack.c (pack_unpack): ditto.
+
+	* marshal.c (r_byte): should replace getc() with rb_getc().
+
+	* io.c (rb_getc): getc() replacement uses READ_DATA_PENDING() and
+	  rb_thread_wait_fd().
+
+Mon Jun  7 23:23:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (rb_mod_clone): should call CLOSESETUP().
+
+	* eval.c (bind_clone): should call CLONESETUP() for new clone.
+
+Sat Jun  5 10:32:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_oct): binary (e.g. 0b10111) support.
+
+	* variable.c (rb_const_set): raise warning, not exception.
+
+	* parse.y (yycompile): initialize parser internal variables.
+
+	* parse.y (close_paren): set lex_state to EXPR_PAREN after closing
+	  parenthesis.
+
+	* parse.y (yylex): returns kDO for `do' right after method_call.
+
+Thu Jun  3 11:05:30 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* regex.c (read_backslash): should decode \b within class.
+
+Thu Jun  3 01:06:18 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* dln.c (dln_load): AIX improvement (aix_findmain removed).
+
+Wed Jun  2 00:41:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* pack.c (pack_unpack): new undocumented template Z which strips
+	  stuff after first null.
+
+	* pack.c (pack_pack): should preserve specified length of the
+	  resulting string.
+
+Tue Jun  1 15:29:33 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c (ruby_socket): retry after GC, if socket(2)
+	  failed on EMFILE or ENFILE.
+
+	* ext/socket/socket.c (sock_s_socketpair): ditto.
+
+	* eval.c (module_setup): need to add PUSH_VAR/POP_VAR to clear
+	  dyna vars link list.
+
+	* version.h (RUBY_RELEASE_CODE): integer macro constant for source
+	  version detection.
+
+Sun May 30 22:19:12 1999  Kenji Nagasawa  <kenn@tcp-ip.or.jp>
+
+	* ext/socket/socket.c: emx/gcc 0.9d now fixes things about
+	  AF_UNIX.
+
+	* process.c: OS/2 EMX kludge.
+
+	* Makefile.in (strncasecmp.o): added dependency.
+
+Mon May 31 16:06:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.3.4 - preliminary release for 1.4
+
+Mon May 31 15:57:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_fptr_close): close on IO which main_thread is
+	  waiting cause serious exception, that vanishes the actual fd
+	  closing.  Invocation of rb_thread_fd_close() is deferred
+	  a little.
+
+Sat May 29 18:27:13 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* regex.c (re_match): stack boundary check needed.
+
+Sat May 29 12:27:00 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_invoke): proper ref count management
+	  to avoid leak.  I HATE REF COUNTING!!
+
+	* eval.c (ruby_run): moved ruby_require_libraries() to handle `-r'
+	  from ruby_options() to avoid stack corruption for threads
+	  created in libraries.
+
+Sat May 29 02:22:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_yield_0): when `for' appeared in blocks, it
+	  introduced new scope for local variables.
+
+Fri May 28 17:16:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_squeeze_bang): squeeze AND of the arguments.
+	  UNDOCUMENTED.
+
+	* string.c (rb_str_count): new UNDOCUMENTED method.
+
+	* string.c (rb_str_delete_bang): delete AND of the arg ranges.
+	  UNDOCUMENTED FEATURE for 1.3.x.
+
+	* ext/socket/socket.c (setipaddr): re-wrote using ip_addrsetup().
+
+	* ext/socket/socket.c (ip_addrsetup): decode symbolic address
+	  <broadcast>.
+
+Thu May 27 12:27:42 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (tr_trans): should handle NUL (\0) within strings.
+
+Tue May 25 16:45:11 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_f_syscall): syscall may return values other than zero
+	  on success.
+
+	* regex.c (re_match): handle empty loop properly (hopefully).
+
+	* regex.c (re_match): remove empty group check, because it does
+	  not help non-grouping parentheses (?:..).
+
+	* regex.c (re_compile_fastmap): treating try_next, finalize_push
+	  wrong way.
+
+	* regex.c: remove some obsolete functions such as
+	  group_match_null_string_p().
+
+Mon May 24 14:47:54 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (read_backslash): read backslash by regex.
+
+Sun May 23 19:44:58 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ext/pty/pty.c (getDevice): portability patch.
+
+Fri May 21 23:01:26 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/socket/getaddrinfo.c (GET_AI): should set error code.
+
+Thu May 20 03:43:44 1999  Jun-ichiro itojun Hagino  <itojun@itojun.org>
+
+	* ext/socket/socket.c: you should use sockaddr_storage to handle
+	  IPv6 addresses.
+
+	* ext/socket/getaddrinfo.c (getaddrinfo): prevent retrieving
+	  AF_INET6 address if hints.ai_flags == AI_PASSIVE.
+
+Wed May 19 12:27:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (exec_end_proc): should protect exceptions.
+
+	* gc.c (run_final): ditto.
+
+	* parse.y (f_rest_arg): allow just * for rest arg.
+
+	* parse.y (mlhs_basic): allow * without formal argument.
+
+	* regex.c (re_match): the variable `part' should be initialized.
+
+Tue May 18 15:25:45 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): a bug in range adjustment.
+
+Tue May 18 11:35:59 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* dln.c (conv_to_posix_path): path_len argument added.
+
+Mon May 17 12:26:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (fix_rev): should treat Fixnum as signed long.
+
+	* eval.c (massign): add strict number check for yield (and call).
+
+	* eval.c (proc_arity): new method to return number of arguments.
+
+	* eval.c (method_arity): new method to return number of arguments.
+
+	* parse.y (read_escape): char may be unsigned.
+
+	* string.c (rb_str_succ): ditto.
+
+	* string.c (tr_trans): ditto.
+
+	* object.c (Init_Object): methods `&', `|', `^' are added to nil.
+
+	* range.c (rb_range_beg_len): it should be OK for [0..-len-1].
+
+	* regex.c (re_search): search for byte literal within mbcs.
+
+	* regex.c (is_in_list): parsh
+
+	* regex.c (re_compile_fastmap): should have not alter the loop
+	  variable `j' if TRASLATE_P().
+
+	* regex.c (re_compile_pattern): escaped characters should be read
+	  by PATFETCH_RAW(c).
+
+Sat May 15 11:23:51 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): endline2 (\Z) should not match at the point
+	  between a newline and end-of-line, like endline ($).
+
+	* class.c (include_class_new): should initialize iv_tbl to share
+	  between module and iclass.
+
+Fri May 14 08:50:27 1999  Akira Endo  <akendo@t3.rim.or.jp>
+
+	* regex.c (re_compile_fastmap): it should be k != 0 to skip.
+
+Fri May 14 12:46:56 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_load): a bug in old marshal format support.
+
+	* instruby.rb: make site_ruby directory.
+
+Fri May 14 10:18:02 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* regex.c (re_match): a bug in inline `.*' etc.
+
+Fri May 14 09:58:46 1999  Minero Aoki  <aamine@dp.u-netsurf.ne.jp>
+
+	* ruby.c (addpath): should have specified string length.
+
+Thu May 13 10:40:44 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval_string_wrap): new function.
+
+	* regex.c (re_compile_pattern): POSIX line match should alter
+	  behavior for `^' and `$' to begbuf and endbuf2 respectively.
+
+	* ext/pty/pty.c: un-ANSI-fy function arguments.
+
+Wed May 12 14:19:38 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* struct.c (iv_get): in case of inheritance of generated struct
+	  class, __member__ and __size__ should also be inherited.
+	  Thanks for Pros Yeboah <yeboah@tu-harburg.de>.
+
+	* io.c (rb_f_gets_internal): should check number of arguments
+	  before checking rb_rs == rb_default_rs.  Thanks for Koji Arai
+	  <JCA02266@nifty.ne.jp>.
+
+Tue May 11 08:29:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): .?, .+ did not work.
+
+Mon May 10 00:59:33 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/jcode.rb: forgot to squeeze on reverse (complement) case.
+
+	* string.c (tr_squeeze): should not set modify flag to be honest,
+	  if the string is not modified.
+
+	* signal.c (Init_signal): SIGTERM should not be handled.
+
+	* regex.c (re_match): seeking for longest match is now optional,
+	  which can be set using RE_OPTION_POSIXMATCH.  This satisfies
+	  POSIX longest match as much as Emacs's posix-* functions, which
+	  are known to be incomplete.
+
+Sun May  9 13:04:01 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/socket/socket.c (sock_s_getaddrinfo): conversion from
+	  Fixnums to C integers needed.
+
+Sun May  9 11:51:43 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* range.c (range_eqq): reverse condition.
+
+	* range.c (range_s_new): default should be end inclusive.
+
+Sat May  8 03:27:51 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c (thread_connect): replace nasty
+	  rb_thread_fd_writable() with rb_thread_select().
+
+Fri May  7 20:49:00 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* ext/socket/getaddrinfo.c (inet_pton): wrong parameter to
+	  inet_aton().
+
+	* ext/socket/addrinfo.h (__P): silly cut and paste typo.
+
+Fri May  7 17:03:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* dir.c (glob): removed GPL'ed glob.c completely.
+
+Fri May  7 08:17:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/sdbm/extconf.rb: sdbm extension added to the distribution.
+
+Fri May  7 01:42:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c (tcp_s_gethostbyname): avoid using struct
+	  sockaddr_storage.
+
+Thu May  6 13:21:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_indexes): should not use rb_ary_concat().
+
+Thu May  4 12:34:18 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* parse.y (parse_string): there should be newline escape by
+	  backslashes in strings.
+
+	* parse.y (parse_qstring): ditto.
+
+Mon May  3 04:37:20 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* ext/tcltklib/extconf.rb: better search for libX11.
+
+	* range.c (range_s_new): embarrassing =/== typo.
+
+	* re.c (Init_Regexp): failed to set default kcode.
+
+Mon May  3 02:39:55 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* ext/socket/socket.c (open_inet): typo (res and res0).
+
+Tue May  4 02:07:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* mkconfig.rb: leave undefined $(VARIABLE) unexpanded in the
+	  Config::CONFIG hash table.
+
+Mon May  3 09:37:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): expand exactn{n} at compile time.
+	  handles stop_paren specially.
+
+	* regex.c (re_compile_pattern): expand x{n} at compile time.
+
+	* regex.c (re_search): posix line match should be checked.
+
+	* regex.c (re_search): a bug in anchor condition.
+
+Fri Apr 30 18:57:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.3.3
+
+	* string.c (rb_str_rindex): position should be END point, not
+	  START point.
+
+	* re.c (rb_reg_search): pos means end point on reverse now.
+
+	* array.c (rb_ary_s_create): should clear ary->ptr to avoid
+	  potential gc crash.
+
+Fri Apr 30 15:24:58 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/addrinfo.h: compatibility hack for ipv4.
+
+	* ext/socket/socket.c: itojun's ipv6 patches applied.
+
+	* ext/socket/extconf.rb: detect ipv6 features based on itojun's
+	  ipv6 patches.
+
+	* ext/extmk.rb.in (enable_config): can handle --enable-xxx now.
+
+	* lib/mkmf.rb (enable_config): ditto.
+
+Fri Apr 30 05:22:23 1999  Shugo Maeda  <shugo@netlab.co.jp>
+
+	* string.c (rb_str_aset): last index should not append.
+
+Thu Apr 29 18:55:31 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* dln.c (conv_to_posix_path): remove const from args.
+
+	* ruby.c (rubylib_mangle): remove Fatal(), the obsolete function.
+
+Tue Apr 27 14:11:45 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (fname): lazy workaround for keywords did not work well.
+
+	* ext/extmk.rb.in: `--with-xxx=yyy' argument configuration.
+
+	* lib/mkmf.rb: ditto.
+
+	* misc/ruby-mode.el: forgot to handle $`.
+
+	* ext/extmk.rb.in: better AIX link support proposed by
+	  <komatsu@sarion.co.jp>.
+
+Mon Apr 26 16:46:59 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/extmk.rb.in: AIX shared library support modified.
+
+	* ext/aix_mksym.rb: ditto.
+
+	* configure.in: ditto.
+
+	* sprintf.c (rb_f_sprintf): should allocate proper sized buffer
+	  for float numbers.
+
+Sat Apr 24 00:00:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (operation): syntax like `a.[]=(1,2)' is allowed.
+
+Fri Apr 23 23:54:09 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (argf_binmode): binmode method added to ARGF.
+
+Fri Apr 23 13:55:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_f_chomp): should assign the result to $_.  or maybe
+	  sub/gsub/chop/chomp should NOT assign $_ altogether.
+
+Thu Apr 22 16:50:54 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_callcc): call scope_dup() for all scopes in
+	  the interpreter stack.
+
+Tue Apr 20 11:24:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_dump): `#' should be escaped.
+
+Tue Apr 20 02:32:42 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (parse_regx): option /p for posix match added.
+
+	* re.c (rb_reg_desc): did not print options properly.
+
+	* io.c (rb_file_s_open): initialize was called twice.
+
+Mon Apr 19 18:56:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* configure.in (DEFAULT_KCODE): can specify default code for
+	  $KCODE by --with-default-kcode=(euc|sjis|utf8|none).
+
+	* regex.c (IS_A_LETTER): a byte sequence shorter than mbc should
+	  not match with \w etc.
+
+Mon Apr 19 13:49:11 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (eval): should restore ruby_dyna_vars.
+
+Fri Apr 16 21:40:43 1999  Nobuyoshi Nakada  <gea02117@nifty.ne.jp>
+
+	* io.c (f_backquote): pipe_open may return nil.
+
+	* io.c (f_open): rb_io_open may return nil.
+
+	* io.c (io_s_foreach): ditto.
+
+	* io.c (io_s_readlines): ditto.
+
+	* io.c (io_defset): wrong message.
+
+Fri Apr 16 15:09:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (rb_str2inum): strtoul() returns long, not int.
+
+	* eval.c (rb_load): size of VALUE and ID may be different.
+
+	* util.c (mmprepare): int is too small to cast from pointers.
+
+	* config.guess: avoid 'linux-gnu' for alpha-unknown-linux.
+
+Thu Apr 15 23:46:20 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ruby.c (rubylib_mangle): mangle path by RUBYLIB_PREFIX.
+
+Wed Apr 14 23:52:51 1999  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
+
+	* node.h (NODE_LMASK): should be long to avoid overflow.
+
+Wed Apr 14 13:14:35 1999  Katsuyuki Komatsu  <komatsu@sarion.co.jp>
+
+	* dln.c: AIX dynamic link.
+
+	* ext/aix_ld.rb: ditto.
+
+Wed Apr 14 12:19:09 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/thread.rb: Queue#{enq,deq} added.
+
+Tue Apr 13 17:43:56 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (rb_hash_s_create): Hash::[] acts more like casting.
+
+Tue Apr 13 00:33:52 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_stdio_set): warning for assignment to the variables
+	  $std{in,out,err}.
+
+Mon Apr 12 23:12:32 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_reopen): check for reopening same IO.
+
+Fri Apr  9 17:45:11 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (rb_compile_string): bug for nested eval().
+
+	* regex.c (re_match): should pop non-greedy stack items on
+	  failure, after best_regs are fixed.
+
+Thu Apr  8 17:30:40 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* pack.c (PACK_LENGTH_ADJUST): need to adjust for `*' length.
+
+Tue Apr  6 23:28:44 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (void_check): add void context checks.
+
+Mon Apr  5 12:23:42 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_s_at): should copy gmt-mode.
+
+	* eval.c (eval_node): preserve ruby_eval_tree.
+
+Fri Apr  2 14:00:34 1999  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
+
+	* lib/debug.rb: wrong command interpreting.
+
+Fri Apr  2 11:46:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.3.2
+
+Fri Apr  2 10:40:04 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_s_pipe): forgot to define IO::pipe.
+
+Thu Apr  1 14:40:46 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (assign): modified for rhs change.
+
+	* parse.y (stmt): unparenthesisized method calls can be right hand
+	  side expression of the assignment.
+
+Sat Mar 27 22:42:47 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* ext/nkf/nkf.c (rb_nkf_kconv): check size output_ctr before
+	  decrement.
+
+Thu Mar 25 09:11:03 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_s_at): preserve gmt-mode for result.
+
+	* parse.y (rb_compile_string): do not use cur_mid, use
+	  compile_for_eval instead.
+
+	* st.c (PTR_NOT_EQUAL): wrong logical condition.
+
+Wed Mar 24 13:06:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yycompile): should clear cur_mid after compilation.
+
+	* io.c (next_argv): need to check type for ARGV.shift.
+
+	* eval.c (blk_copy_prev): need to preserve outer scope as well as
+	  outer frames.
+
+	* parse.y (rb_compile_string): return can appear within eval().
+
+Tue Mar 23 10:15:07 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* configure.in: AC_C_CONST check added.
+
+Tue Mar 23 02:07:35 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_plus): preserve gmt-mode for result.
+
+Mon Mar 22 01:32:37 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): adjust line numbers before expression
+	  interpolation within strings.
+
+	* eval.c (rb_eval): defined? returns nil for false condition.
+
+	* numeric.c (num_nonzero_p): returns nil for false condition.
+
+Sat Mar 20 13:07:43 1999  Keiju Ishitsuka  <keiju@rational.com>
+
+	* lib/weakref.rb: avoid leak for two weakrefs for one object.
+
+Fri Mar 19 11:26:45 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* eval.c (ruby_run): needed to eval END{} on exit.
+
+	* eval.c (rb_exit): ditto.
+
+Fri Mar 19 02:17:27 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* signal.c (Init_signal): handles terminating signals HUP, TERM,
+	  QUIT, PIPE, etc.
+
+Thu Mar 18 15:47:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (rb_big_and): bug in sign calculation.
+
+	* bignum.c (rb_big_or): ditto.
+
+	* io.c (rb_f_select): forgot to use to_io to retrieve IO, after
+	  calling select(2).
+
+Tue Mar 16 19:54:31 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ext/extmk.rb.in: static linking cause infinite make loop.
+
+Tue Mar 16 18:50:04 1999  Yoshida Masato  <yoshidam@yoshidam.net>
+
+	* ext/socket/socket.c (tcp_s_gethostbyname): typo, not NUM2INT(),
+	  but INT2NUM().
+
+	* ext/socket/socket.c (mkhostent): ditto.
+
+Tue Mar 16 12:31:44 1999  Ryo HAYASAKA  <hayasaka@cheer.u-aizu.ac.jp>
+
+	* file.c (utime_internal): suppress warning by const.
+
+	* time.c (time_gmtime): ditto.
+
+Tue Mar 16 10:23:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_clone): Time object can be cloned.
+
+Tue Mar 16 03:13:10 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* ruby.c (load_file): argv[argc] should be NULL.
+
+Mon Mar 15 22:12:08 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* sprintf.c (rb_f_sprintf): typo in arg_num check at exit.
+
+Mon Mar 15 16:42:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_dup): dup2 should copy class too.
+
+Mon Mar 15 15:12:53 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
+
+	* lib/mkmf.rb: install program relative path check.
+
+Mon Mar 15 14:05:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (rb_reg_s_new): 2nd argument is now option.
+	  Regexp::EXTENDED can be specified.
+
+Fri Mar 12 10:47:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_index): str.index("") should always match at
+	  offset point.
+
+	* string.c (rb_str_upto): can specify end point exclusion.
+
+	* string.c (rb_str_index): negative offset.
+
+	* regex.c (re_match): begline should not match at the point
+	  between a newline and end-of-string.  endline neither.
+
+	* regex.c (re_compile_pattern): context_indep_anchors .
+
+	* parse.y (parse_regx): need not to push backslashes before
+	  escaped characters.
+
+	* eval.c (rb_thread_join): re-raises exception within target.
+
+Fri Mar 12 01:09:36 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* ext/readline/readline.c (readline_s_vi_editing_mode): wrong
+	  number of arguments.
+
+Fri Mar 12 02:12:50 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* pack.c (PACK_ITEM_ADJUST): "a".unpack("C3") => [97, nil, nil]
+
+Thu Mar 11 18:23:50 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* ext/socket/socket.c (Init_socket): UDPsocket was omitted.
+
+Thu Mar 11 16:43:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* pack.c (PACK_LENGTH_ADJUST): push fixed number of items per
+	  template to result array.
+
+	* pack.c (pack_unpack): I/N/C etc. push nil in the array for "".
+
+Tue Mar  9 00:19:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (ruby_unsetenv): use ruby_setenv(name, 0).
+
+	* hash.c (env_delete): ditto.
+
+	* string.c (rb_str_upto): do not check `beg<end' to generate
+	  strings for the pattern like "a".upto("#a").
+
+	* range.c (range_each): treat strings as special case.
+
+	* range.c (range_each): no longer use upto for generic cases.
+
+Sun Mar  7 14:21:32 1999  IKARASHI Akira  <ikarashi@itlb.te.noda.sut.ac.jp>
+
+	* string.c (rb_str_index): wrong end point calculation.
+
+Sat Mar  6 02:19:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (match_index): MatchingData#index(n) added.
+
+	* array.c (rb_ary_subseq): ary[n..-1] returns an sub-array unless
+	  n is too small negative index.
+
+	* re.c (rb_reg_match_method): Regexp#match(str) added.
+
+	* array.c (rb_ary_indexes): understands ranges as indexes.
+
+	* re.c (match_size): MatchingData#size added.
+
+Fri Mar  5 01:04:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_fill): modified for range.
+
+	* array.c (rb_ary_aset): a[n..m] revisited.
+
+Thu Mar  4 14:23:29 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_subseq): a[n..m] revisited.
+
+	* parse.y (method_call): allow Const::method{}.
+
+	* array.c (rb_ary_replace_method): should replace original array.
+
+Thu Mar  4 02:30:22 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* configure.in: remove --disable-thread, thread feature is no
+	  longer optional.
+
+Thu Mar  4 00:32:17 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
+
+	* parse.y (read_escape): wrong arguments for scan_oct,scan_hex.
+
+Wed Mar  3 11:51:53 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c (Init_socket): rename class names as
+	  TCPsocket -> TCPSocket etc.
+
+Tue Mar  2 19:46:42 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* configure.in (LDSHARED): use gcc -Wl,-G for solaris with gcc.
+
+Tue Mar  2 17:04:19 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): backslashes do not concatenate comment lines
+	  anymore.
+
+Mon Mar  1 14:05:12 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_call0): adjust argv for optional arguments.  super
+	  without arguments emit superclass method with the value from
+	  optional arguments.  enabled as experiment.
+
+Sun Feb 28 14:04:07 1999  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* parse.y (nextc): backslash at the eof cause infinite loop
+
+Sun Feb 28 11:01:26 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* time.c (make_time_t): month range check added.
+
+Sat Feb 27 02:36:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (Init_Regexp): add escape as alias of quote.
+
+	* re.c (rb_reg_s_quote): char-code can be specified now.
+
+Fri Feb 26 18:45:36 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
+
+	* eval.c (error_print): bug for error message with newlines.
+
+Fri Feb 26 12:00:04 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (make_time_t): future check modified to allow 1969-12-31
+	  at certain timezone.
+
+	* time.c (time_arg): year >= 1000 should be past.
+
+	* version.c (Init_version): constant RELEASE_DATE added.
+
+Fri Feb 26 01:08:30 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_substr): returns nil for out-of-range access.
+
+	* array.c (rb_ary_subseq): returns nil for out-of-range access.
+
+	* array.c (rb_ary_store): negative index message has changed.
+
+	* string.c (rb_str_aset): reallocation needed.
+
+	* string.c (rb_str_aset): allow char append to the string.
+
+Thu Feb 25 23:30:17 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* time.c (time_load): tm_year should be packed in 17 bits, not 18.
+
+Thu Feb 25 12:50:25 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* missing/dup2.c: replaced by public domain version.
+
+	* time.c (make_time_t): add `future check' in loops.
+
+	* object.c (rb_num2dbl): forbid implicit conversion from nil, or
+	  strings.  thus `Time.now + str' should raise error.
+
+	* object.c (rb_Float): convert nil into 0.0.
+
+	* object.c (rb_Integer): conversion method improved.
+
+Thu Feb 25 03:27:50 1999  Shugo Maeda  <shugo@netlab.co.jp>
+
+	* eval.c (rb_call): should handle T_ICLASS properly.
+
+Thu Feb 25 00:04:00 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* error.c (Init_Exception): global function Exception() removed.
+
+	* variable.c (rb_class2name): returns "nil"/"true"/"false" for them.
+
+	* time.c (time_dump): time marshaling format compressed size from
+	  11 bytes to 8 bytes.  thanx to tadf@kt.rim.or.jp.
+
+	* eval.c (rb_obj_call_init): should specify arguments explicitly.
+
+Wed Feb 24 15:43:28 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): comment concatenation requires preceding space
+	  before backslash at the end of line.
+
+	* io.c (rb_f_pipe): global pipe is obsolete now.
+
+	* object.c (Init_Object): remove true.to_i, false.to_i.
+
+Tue Feb 23 14:21:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): warn if identifier! immediately followed by `='.
+
+Tue Feb 23 12:32:41 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* eval.c (rb_load): tilde expansion moved to find_file.
+
+	* eval.c (find_file): tilde expansion added.
+
+Tue Feb 23 10:50:20 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (require_method): require can handle multiple fnames.
+
+	* hash.c (rb_hash_foreach_iter): hash key may be nil.
+
+Mon Feb 22 17:44:02 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): should not pop failure point on success for
+	  non-greedy matches.
+
+	* io.c (Init_IO): remove global_functions getc, readchar, ungetc,
+	  seek, tell, rewind.
+
+Sat Feb 20 22:54:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (rb_num2long): no implicit conversion from boolean.
+
+Sat Feb 20 09:58:42 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* numeric.c (flo_to_s): portable Infinity and NaN support.
+
+Sat Feb 20 07:13:31 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* io.c (rb_file_sysopen): forgot to initialize a local variable.
+
+Fri Feb 19 23:05:07 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_subseq): range check changed.
+
+	* marshal.c: increment MARSHAL_MINOR for Time format change.
+
+	* time.c (time_old_load): support old marshal format.
+
+	* time.c (time_load): changed for new format Y/M/D/h/m/s/usec.
+
+	* time.c (time_dump): marshal dump format has changed.
+
+Fri Feb 19 00:25:57 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_arg): should reject "sep\0" and such.
+
+	* time.c (time_plus): Time#+ should not receive Time object
+	  operand.
+
+	* string.c (rb_str_substr): negative length raises exception now.
+
+	* array.c (beg_len): if end == -1, it points end of the array.
+
+	* array.c (rb_ary_subseq): negative length raises exception now.
+
+Thu Feb 18 20:57:04 1999  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* time.c (rb_strftime): strftime() may return 0 on success too.
+
+	* time.c (time_strftime): `\0' within format string should not be
+	  omitted in the result.
+
+	* time.c (rb_strftime): zero length format.
+
+	* time.c (time_to_a): yday start with 1 now.
+
+	* time.c (time_zone): support for long timezone name.
+
+	* time.c (time_yday): yday start with 1 now.
+
+	* time.c (time_minus): minus calculation was wrong.
+
+	* time.c (time_minus): sec, usec should be at least `long', maybe
+	  they should be `time_t'.
+
+	* time.c (time_plus): addition with float was wrong.
+
+	* time.c (time_to_s): support for long timezone name.
+
+	* time.c (time_gm_or_local): too far future check moved.
+
+	* time.c (time_arg): treat 2 digit year as 69-99 => 1969-1999,
+	  00-68 => 2000-2068
+
+Thu Feb 18 03:56:47 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* missing/fnmatch.c: moved to missing directory.
+
+Wed Feb 17 16:22:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* struct.c (rb_struct_alloc): actual initialization now be done in
+	  `initialize'.
+
+Wed Feb 17 09:47:15 1999  okabe katsuyuki  <hgc02147@nifty.ne.jp>
+
+	* regex.c (re_search): use mbclen() instead of ismbchar().
+
+	* re.c (rb_reg_s_quote): should handle mbchars properly.
+
+Wed Feb 17 01:25:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): stop comment concatenation by backslash follows
+	  after >= 0x80 char.  may cause problem with Latin chars.
+
+	* eval.c (error_print): exception in rb_obj_as_string() caused
+	  SEGV. protect it by PUSH_TAG/POP_TAG.
+
+	* error.c (exc_exception): `Exception#exception' should return self.
+
+Wed Feb 17 01:12:22 1999  Hirotaka Ichikawa  <hirotaka.ichikawa@tosmec.toshiba.co.jp>
+
+	* configure.in: BeOS patch.
+
+Tue Feb 16 14:25:00 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): should reallocate mbc space for
+	  character class unless current_mbctype is ASCII.
+
+Mon Feb 15 15:48:30 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* configure.in: specify `-Wl,-E' only for GNU ld.
+
+Mon Feb 15 11:43:22 1999  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
+
+	* array.c (rb_inspecting_p): should return Qfalse.
+
+Sun Feb 14 22:36:40 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* sprintf.c (rb_f_sprintf): `%G' was omitted.
+
+Sun Feb 14 12:47:48 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* numeric.c (Init_Numeric): allow divide by zero on FreeBSD.
+
+	* numeric.c (Init_Numeric): FloatDomainError added.
+
+	* configure.in (AC_REPLACE_FUNCS): add checks for functions
+	  isinf, isnan, and finite.
+
+Sat Feb 13 01:24:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_create_0): should protect th->thread.
+
+Fri Feb 12 16:16:47 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
+
+	* string.c (rb_str_inspect): wrong mbc position.
+
+Fri Feb 12 16:21:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_fd_close):
+
+	* io.c (rb_io_fptr_close): tell scheduler that fd is closed.
+
+	* io.c (rb_io_reopen): ditto.
+
+	* io.c (READ_CHECK): check if closed after thread context switch.
+
+	* ext/socket/socket.c (bsock_close_read): do not check
+	  the return value from shutdown(2).
+
+	* ext/socket/socket.c (bsock_close_write): ditto.
+
+	* ext/socket/socket.c (sock_new): need to dup(fd) for close_read
+	  and close_write.
+
+	* parse.y (here_document): handle newlines within #{}.
+
+	* regex.h: should replace symbols for ruby.
+
+Fri Feb 12 00:46:28 1999  Shugo Maeda  <shugo@netlab.co.jp>
+
+	* marshal.c (r_object): should update the method name in message.
+
+	* marshal.c (w_object): limit should be converted into Fixnum.
+
+Wed Feb 10 15:20:03 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): empty pattern should not cause infinite
+	  pattern match loop.
+
+	* regex.c (re_compile_pattern): RE_OPTIMIZE_ANCHOR for /.*/, not
+	  for /(.|\n)/.
+
+	* numeric.c (fix_pow): `fixnum**nil' should raise TypeError.
+
+	* bignum.c (rb_big_pow): need to normalize results.
+
+Wed Feb 10 01:42:41 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* numeric.c (fix_pow): `(5**1).type' should be Integer.
+
+Tue Feb  9 01:22:49 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): do not ignore newlines in mbchars.
+
+	* io.c (rb_file_s_open): mode can be specified by flags like
+	  open(2), e.g. File::open(path, File::CREAT|File::WRONLY).
+
+	* io.c (rb_f_open): bit-wise mode flags for pipes
+
+	* io.c (Init_IO): bit flags for open.
+
+Sat Feb  6 22:56:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_sub_bang): should not overwrite match data by
+	  regexp match within the block.
+
+	* string.c (rb_str_gsub_bang): ditto.
+
+Sat Feb  6 03:06:17 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (match_getter): accessing $~ without matching caused SEGV.
+
+Fri Feb  5 22:11:08 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* parse.y (yylex): binary literal support, like 0b01001.
+
+	* parse.y (yylex): octal numbers can contain `_'s.
+
+	* parse.y (yylex): warns if non-octal number follows immediately
+	  after octal literal.
+
+	* parse.y (yylex): now need at least one digit after prefix such
+	  as 0x, or 0b.
+
+	* bignum.c (rb_str2inum): recognize binary numbers like 0b0101.
+
+Fri Feb  5 03:26:56 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
+
+	* ruby.c (proc_options): -e without program prints error.
+
+Fri Feb  5 00:01:50 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (terms): needed to clear heredoc_end.
+
+	* numeric.c (flo_div): allow float division by zero.
+
+Thu Feb  4 11:56:24 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* missing/strtod.c: for compatibility.
+
+	* configure.in (strtod): add strtod compatible check.
+
+	* numeric.c (rb_num2long): missing/vsnprintf.c does not support
+	  floating points.
+
+	* numeric.c (flo_to_s): ditto.
+
+Wed Feb  3 23:02:12 1999  Yoshida Masato  <yoshidam@yoshidam.net>
+
+	* regex.c (re_compile_pattern): use ismbchar() to get next char.
+
+	* regex.c (re_search): wrong mbchar shift.
+
+	* re.c (rb_reg_search): needed to reset $KCODE after match.
+
+	* regex.c (re_compile_fastmap): mbchars should match with \w.
+
+Wed Feb  3 22:35:12 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* parse.y (yylex): too big float raise warning, not error.
+
+Tue Feb  2 23:41:42 1999  Yoshida Masato  <yoshidam@yoshidam.net>
+
+	* regex.c (re_match): wrong boundary.
+
+	* regex.c (IS_A_LETTER): re_mbctab[c] may not be 1 for mbc.
+
+	* regex.c (re_search): mbchar support for shifting ranges.
+
+	* regex.c (MBC2WC): wrong conversion.
+
+Wed Feb  3 15:03:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (parse_regx): need to escape parens if terminators are
+	  not any kind of parenthesis.
+
+	* parse.y (parse_qstring): ditto.
+
+	* parse.y (parse_string): ditto.
+
+Tue Feb  2 17:11:26 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* string.c (rb_str_gsub_bang): too small realloc condition.
+
+Mon Feb  1 10:01:17 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* parse.y (yylex): range check for the float literal.
+
+Sat Jan 30 18:34:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (usage): -h option to show brief command description.
+
+Sat Jan 30 08:45:16 1999  IKARASHI Akira  <ikarashi@itlb.te.noda.sut.ac.jp>
+
+	* lib/cgi-lib.rb: cookie support added.
+
+Sat Jan 30 13:38:24 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): mbchars should match with \w
+	  within character class.  Was matching with \W.
+
+	* regex.c (re_match): \w should match with multi byte characters,
+	  not its first byte.
+
+Sat Jan 30 10:06:41 1999  Yoshida Masato  <yoshidam@yoshidam.net>
+
+	* re.c (rb_reg_s_new): UTF-8 flag handle (/u, /U).
+
+	* re.c (rb_kcode): $KCODE handle for UTF-8.
+
+Sat Jan 30 01:51:16 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_delete_if): RTEST() missing.
+
+	* hash.c (delete_if_i): ditto.
+
+	* enum.c (Init_Enumerable): select (=find_all), detect (=find)
+	  added as aliases.
+
+Fri Jan 29 21:32:19 1999  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* hash.c (rb_f_setenv): SEGV caused by small typo.
+
+Fri Jan 29 00:15:58 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/parsedate.rb (parsedate): support date format like
+	  23-Feb-93, which is required by HTTP/1.1.
+
+	* variable.c (find_class_path): avoid calling rb_iv_set().
+
+	* eval.c (backtrace): do not need to modify $SAFE internally.
+
+	* variable.c (classname): inline __classid__ access.
+
+	* eval.c (THREAD_ALLOC): needed to initialize wrapper.
+
+	* lib/ftools.rb (makedirs): allows slash at the end of the path.
+
+	* numeric.c (rb_fix_induced_from): ensure result to be Fixnum.
+
+Thu Jan 28 17:31:43 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (flo_to_s): float format changed to "%16.10g".
+
+Thu Jan 28 02:13:11 1999  Yoshinori Toki  <toki@freedom.ne.jp>
+
+	* array.c (rb_ary_store): expand allocated buffer by 3/2.
+
+Wed Jan 27 17:50:02 1999  Kazuhiro HIWADA  <hiwada@kuee.kyoto-u.ac.jp>
+
+	* bignum.c (dbl2big): raised error if double is too big to cast
+	  into long.  check added.
+
+Wed Jan 27 03:16:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (rb_mod_const_at): can't list constants of the
+	  untainted objects in safe mode.
+
+	* class.c (method_list): can't list methods of untainted objects
+	  in safe mode.
+
+Tue Jan 26 02:40:41 1999  GOTO Kentaro  <gotoken@math.sci.hokudai.ac.jp>
+
+	* prec.c: Precision support for numbers.
+
+Thu Jan 21 19:08:14 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_f_raise): calls `exception' method, not `new'.
+
+	* error.c (exc_exception): renamed from `new'.
+
+Wed Jan 20 03:39:48 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yycompile): rb_in_compile renamed to ruby_in_compile.
+
+	* ruby.c (load_file): define DATA if __END__ appeared in script.
+
+Tue Jan 19 14:57:51 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (here_document): need to protect lex_lastline.
+
+	* parse.y (yylex): disable %//, %'', %``.
+
+Tue Jan 19 05:01:16 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* array.c (beg_len): round range value too much.
+
+Mon Jan 18 13:02:27 1999  Kuroda Jun  <jkuro@dwe.co.jp>
+
+	* hash.c (env_keys): strchr() may return NULL.
+
+Mon Jan 18 17:51:47 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* instruby.rb (wdir): install libruby.a in archdir.
+
+	* lib/ftools.rb (install): removes file before installing.
+
+Mon Jan 18 16:55:31 1999  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* eval.c (rb_callcc): experimental continuation support.
+
+Sun Jan 17 19:45:37 1999  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* pack.c (pack_pack): nil packing caused SEGV.
+
+Sat Jan 16 13:18:03 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_concat): character (fixnum) can be append to
+	  strings
+
+	* array.c (rb_ary_unshift): unshift returns array.
+
+Sat Jan 16 01:39:19 1999  Yoshida Masato  <yoshidam@tau.bekkoame.ne.jp>
+
+	* string.c (rb_str_split_method): UTF-8 support.
+
+	* regex.c: UTF-8 support.
+
+Thu Jan 14 00:42:55 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_gsub_bang): forget to add offset for null match.
+
+	* eval.c (rb_thread_local_aset): can't modify in tainted mode.
+
+	* hash.c (env_each_key): avoid generating temporary array.
+
+Wed Jan 13 23:58:50 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (rb_f_setenv): name and value can be tainted.
+
+Wed Jan  6 02:42:08 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (Init_Bignum): forgot to define Bignum#===.
+
+	* gc.c (gc_sweep): if add_heap() is called during GC, objects on
+	  allocated heap page(s) are not marked, should not be recycled.
+
+	* gc.c (gc_sweep): should refer latest freelist.
+
+	* gc.c (id2ref): modified to support performance patch.
+
+	* object.c (rb_obj_id): performance patch (no bignum for id).
+
+Tue Jan  5 01:56:18 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* config.guess: merge up-to-date from autoconf 2.12.
+
+	* array.c (rb_ary_join): avoid calling rb_protect_inspect() till
+	  it is really needed.
+
+	* object.c (rb_obj_inspect): show detailed information for the
+	  instance variables (infinite loop can avoid now).
+
+	* struct.c (rb_struct_inspect): avoid infinite loop.
+
+Sun Jan  3 01:37:58 1999  Takao KAWAMURA  <kawamura@ike.tottori-u.ac.jp>
+
+	* misc/ruby-mode.el (ruby-end-of-defun): moved too much.
+
+	* misc/ruby-mode.el (ruby-mode-variables): set paragraph-separator
+	  for the mode.
+
+	* misc/ruby-mode.el: proper font-lock for `def' and `nil' etc.
+
+Sat Jan  2 17:09:06 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_jump_tag): new api to invoke JUMP_TAG.  tag values
+	  can obtained from rb_eval_string_protect()/rb_load_protect().
+
+	* eval.c (rb_rescue): now catches all exceptions but SystemExit.
+
+	* eval.c (rb_eval_string_protect): eval string with protection.
+
+	* eval.c (rb_load_protect): load file with protection.
+
+	* io.c (rb_io_puts): avoid infinite loop for cyclic arrays.
+
+	* eval.c (rb_thread_local_aref): thread local hash tables.
+
+	* object.c (rb_equal): check exact equal before calling `=='.
+
+Thu Dec 31 22:28:53 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* eval.c (rb_f_require): feature names should be provided with
+	  DLEXT extension.
+
+	* marshal.c (Init_marshal): need to provide `marshal.so'.
+
+Wed Dec 30 02:29:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (classname): do not call rb_ivar_set().
+
+	* eval.c (ruby_run): finalizers were called too early.
+
+Fri Dec 25 12:19:30 1998  Fukuda Masaki  <fukuda@wni.co.jp>
+
+	* gc.c (rb_gc_mark): should not return on FL_EXIVAR.
+
+Fri Dec 25 11:56:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* gc.c (gc_mark): proper scanning for temporary region.
+
+	* eval.c (TMP_ALLOC): protection for C_ALLOCA was broken.
+
+Thu Dec 24 18:26:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* development version 1.3 released.
+
+Thu Dec 24 00:17:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_load): top self should be set properly.
+
+	* variable.c (classname): check __classpath__ if it is defined.
+
+	* variable.c (classname): invalid warning at -v with static linked
+	  ruby interpreter.
+
+	* eval.c (is_defined): modified for expr::Const support.
+
+	* eval.c (rb_eval): invoke method expr::Const if expr is not class
+	  nor module.
+
+	* parse.y (primary): enable expr::identifier as method
+	  invocation.
+
+Wed Dec 23 03:04:36 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): avoid too many loop pops for (?:..).
+
+Tue Dec 22 18:01:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental version 1.1d1 released.
+
+Mon Dec 21 01:33:03 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (TMP_PROTECT): add volatile to ensure GC protection.
+
+	* string.c (rb_str_gsub_bang): calculate buffer size properly.
+
+	* parse.y (lex_get_str): needed to return Qnil at EOS.
+
+	* eval.c (find_file): check policy modified, raise exception
+	  immediately for tainted load_path.
+
+	* hash.c (rb_f_setenv): do not depend on setenv() nor putenv().
+
+Thu Dec 17 06:29:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/tk/tkutil.c (tk_s_new): use rb_obj_instance_eval(), instead
+	  of rb_yield_0().
+
+	* eval.c (rb_f_require): forgot to call find_file in some cases.
+
+	* eval.c (rb_f_require): `require "feature.so"' to load dynamic
+	  libraries.  old `require "feature.o"' is still OK.
+
+	* eval.c (rb_eval): yield without value dumped core.
+
+Wed Dec 16 16:28:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental version 1.1d0 (pre1.2) released.
+
+Wed Dec 16 10:43:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): bound check before calling re_match().
+
+Tue Dec 15 13:59:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* error.c (exc_to_s): returns class name for unset mesg.
+
+	* error.c (exc_initialize): do not initialize @mesg by "".
+
+	* parse.y (nextc): __END__ should handle CR+LF newlines.
+
+Wed Dec  9 13:37:12 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* pack.c (encodes): use buffering for B-encoding.
+
+	* pack.c (pack_pack): Q-encoding by 'M'.
+
+Tue Dec  8 14:10:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (generic_ivar_get): any object can have instance
+	  variables now.  great improvement.
+
+	* variable.c (rb_name_class): do not set __classpath__ by default,
+	  use __classid__ instead.
+
+Mon Dec  7 22:08:22 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.h (struct RFile): IO objects can have instance variables now.
+
+	* parse.y (primary): allows `def obj::foo; .. end'.
+
+Mon Dec  7 18:24:50 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* ruby.c (set_arg0): $0 support for HP-UX.
+
+Mon Dec  7 01:30:28 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* dln.c (dln_strerror): better error messages on win32.
+
+Sat Dec  5 23:27:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (here_document): indentable here-doc delimiter by
+	  `<<-'.  Proposed by Clemens <c.hintze@gmx.net>.  Thanks.
+
+Thu Dec  3 16:50:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/extmk.rb.in (realclean): trouble on install.
+
+Sun Nov 29 22:25:39 1998  Takaaki Tateishi  <ttate@jaist.ac.jp>
+
+	* process.c (f_exec): check number of argument.
+
+Thu Nov 26 17:27:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c9 released.
+
+Wed Nov 25 13:07:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_dup): do not copy additional data (STR_NO_ORIG).
+
+	* parse.y (yycompile): reduce known memory leak (hard to remove).
+
+Wed Nov 25 03:41:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* st.c (st_init_table_with_size): round size up to prime number.
+
+Sat Nov 21 23:27:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (rb_hash_aset): reduce copying key strings.
+
+	* gc.c (looks_pointerp): declare as inline function if possible.
+
+	* st.c (PTR_NOT_EQUAL): compare hash values first before calling
+	  comparing function.
+
+	* st.c (ADD_DIRECT): save hash value in entries to reduce hash
+	  calculation.
+
+	* string.c (rb_str_gsub_bang): avoid rb_scan_args() to speed-up.
+
+	* string.c (rb_str_sub_bang): ditto.
+
+Sat Nov 21 18:44:06 1998  Masaki Fukushima  <fukusima@goto.info.waseda.ac.jp>
+
+	* time.c (time_s_now): had memory leak.
+
+	* ext/md5/md5init.c (md5_new): had memory leak.
+
+	* ext/md5/md5init.c (md5_clone): ditto.
+
+Fri Nov 20 23:23:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/delegate.rb: do not propagate hash and eql?.
+
+Thu Nov 19 01:40:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sample/ruby-mode.el (ruby-expr-beg): failed to find reserved
+	  word boundary.
+
+	* eval.c (rb_eval): avoid calling `concat' method.  calls
+	  rb_ary_concat() directly for efficiency.
+
+	* eval.c (rb_eval): actual rest arguments extended arrays too much.
+
+Wed Nov 18 14:30:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* class.c (rb_define_global_function): global functions now be
+	  module function of the Kernel.
+
+Wed Nov 18 10:48:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (read_all): SEGV on large files.
+
+Tue Nov 17 18:11:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c8 released.
+
+Tue Nov 17 16:58:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (arg): assignment to attribute name start with capital
+	  should be allowed.
+
+	* eval.c (thread_alloc): needed to mark terminated threads too.
+
+Tue Nov 17 12:33:48 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
+
+	* ext/extmk.rb.in (create_makefile): Set `libdir' to `@libdir@',
+	  Set `pkglibdir' to `$libdir/$(RUBY_INSTALL_NAME)'.
+
+Tue Nov 17 10:30:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sprintf.c (f_sprintf): %l%%c -> %%l%c
+
+Tue Nov 17 01:08:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (ret_args): distinguish `a' and `*a' for the arguments
+	  of yield and return.
+
+	* eval.c (rb_eval): flip3 should work like sed.
+
+	* eval.c (rb_eval): flip{2,3} now have independent state for each
+	  scope to work fine with thread.
+
+Mon Nov 16 23:26:29 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (primary): exec else clause if no exception raised.
+
+Sun Nov 15 15:44:07 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* ext/extmk.rb.in (install): bug in target.
+
+Sat Nov 14 11:02:05 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
+
+	* Makefile.in (install): Give the argument `$(DESTDIR)' to
+	  `instruby.rb'.
+
+	* instruby.rb: Recognize ARG[0] as `destdir'.
+
+	* instruby.rb: Give the argument `destdir' to `extmk.rb'.
+
+	* ext/extmk.rb.in: Recognize ARG[1] as `$destdir'.
+
+	* instruby.rb: Create the installation directories (bindir, libdir,
+	  archdir, pkglibdir, archdir, and mandir) under `destdir', and
+	  install all files under there.
+
+	* ext/extmk.rb.in: Likewise.
+
+Sat Nov 14 10:56:55 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
+
+	* instruby.rb: Add the variable `pkglibdir'.
+
+	* instruby.rb: Set the variable `libdir' to `$(libdir)', not
+	  `$(libdir)/$(ruby_install_name)'. `libruby.so' and `libruby.so.LIB'
+	  are installed at `libdir'.
+
+	* instruby.rb: Set the variable `archdir' to `$(pkglibdir)/$(arch)'.
+
+Fri Nov 13 19:43:29 1998  KIMURA Koichi  <kbk@kt.rim.or.jp>
+
+	* missing/nt.c (SafeFree): wrong free offset.
+
+Thu Nov 12 20:11:53 1998  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* sample/ruby-mode.el: wrong highlight.
+
+	* parse.y (parse_regx): newline in regexp was ignored.
+
+Wed Nov 11 10:54:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (here_document): <<'FOO' should not escape anything.
+
+	* parse.y (here_document): bare << here-doc available, even though
+	  it's deprecated.
+
+	* file.c (rb_file_s_readlink): return value should be tainted.
+
+	* ext/etc/etc.c (setup_passwd): information (eg. GCOS name) should
+	  be tainted (modified at Perl Conference).
+
+Tue Nov 10 00:22:11 1998  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* configure.in: elf support for FreeBSD 3.x
+
+Tue Nov 10 00:05:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): here document available in eval.
+
+Mon Nov  9 17:55:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c7 released.
+
+Fri Nov  6 19:25:27 1998  Takao KAWAMURA  <kawamura@ike.tottori-u.ac.jp>
+
+	* sample/ruby-mode.el: font-lock patch.
+
+Thu Nov  5 15:42:22 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sample/README, lib/README: simple description for each file.
+
+Wed Nov  4 18:14:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (assign): attribute assignment should be called as public.
+
+Tue Nov  3 23:36:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_dump): dumps core for negative char value.
+
+	* regex.c (re_compile_pattern): out of boundary access for empty
+	  regexp.
+
+Mon Nov  2 22:54:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_aset): `str[str]' replaces first match.
+
+Mon Nov  2 18:24:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_create): was accessing modified status.
+
+Sun Nov  1 01:18:52 1998  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* gc.c (xrealloc): size 0 needs round up to 1.
+
+Sat Oct 31 23:18:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_split_method): negative LIMIT means number of
+	  split fields are unlimited, as in perl.
+
+	* string.c (rb_str_split_method): if LIMIT is unspecified,
+	  trailing null fields are stripped.
+
+Sat Oct 31 04:16:14 1998  Inaba Hiroto  <inaba@st.rim.or.jp>
+
+	* string.c (str_aref): regexp index SEGVed.
+
+Fri Oct 30 14:33:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (reg_match): returns nil for unmatch.
+
+	* dir.c (dir_entries): new method.
+
+	* eval.c (block_pass): do not push block, substitute it.
+
+Fri Oct 30 01:28:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* range.c (range_check): avoid <=> check for Fixnums.
+
+	* array.c (rb_ary_aset): accept negative index.
+
+Wed Oct 28 22:00:54 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): access out of boundary fixed.
+
+Wed Oct 28 11:37:42 1998  TAMITO  <tommy@valley.ne.jp>
+
+	* io.c (f_select): fd number comparison bug.
+
+Tue Oct 27 23:07:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sample/ruby-mode.el (ruby-parse-region): forgot to support %w()
+	  style array literal.
+
+	* eval.c (rb_eval): unused block raises warning.
+
+Mon Oct 26 09:37:53 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (dvar_asgn_push): dvar pushed too many times if
+	  variable-in-block first appear in loops.
+
+Sun Oct 25 22:59:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (set_list_bits): was using wrong offset.
+
+Thu Oct 22 00:07:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_obj_method): method retrieved from tainted object
+	  should be tainted too.
+
+	* eval.c (method_call): safe_level should be restored during
+	  Method#call.
+
+Wed Oct 21 14:21:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (Init_IO): new constants IO::SEEK_{SET,CUR,END}.
+
+	* io.c (rb_f_ungetc): ungetc pushes a char back into STDIN.
+
+Mon Oct 19 11:50:00 1998  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
+
+	* ext/extmk.rb: Load '@top_srcdir@/lib/find.rb', not
+	  '../lib/find.rb'.
+
+	* ext/extmk.rb: Distinguish between `top_srcdir' and `topdir'.
+
+	* Makefile.in (CFLAGS): Add `-I.'.
+
+	* Makefile.in (lex.c): Give `@srcdir@/keywords' to gperf, not
+	  `keywords'.
+
+	* instruby.rb: Use `CONFIG["bindir"]', instead of `prefix + "/bin"'.
+
+	* instruby.rb: Use `CONFIG["libdir"]', instead of `prefix + "/lib"'.
+
+	* instruby.rb Use `CONFIG["mandir"]', instead of `prefix + "/man"'.
+
+	* instruby.rb (wdir): Add the variable to preserve the current
+	  working directory.
+
+	* instruby.rb: Chdir to wdir before install `config.h' and
+	  `rbconfig.rb'.
+
+Mon Oct 19 10:07:01 1998  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
+
+	* eval.c (rb_eval): reduce recursive calls to rb_eval().
+
+Fri Oct 16 15:31:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_new_internal): timeval must be positive.
+
+Thu Oct 15 13:54:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (arg): local variables can be accessed within right side
+	  expression in assignment, notably in blocks.
+
+Wed Oct 14 00:18:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (Init_Array): Array#=== is now for equal check, not
+	  inclusion check.
+
+	* parse.y (when_args): `when a, *b' style new syntax for array
+	  expansion in `case'.
+
+Tue Oct 13 14:30:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (rb_obj_untaint): taint marks can be unset.
+
+	* eval.c (rb_eval): taint propagation for embedded strings.
+
+Mon Oct 12 13:27:15 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_call0): check stack depth more frequently.
+
+Mon Oct 12 08:08:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_p): can print even in secure mode.
+
+Sun Oct 11 22:50:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (rb_const_set): taint check for modification.
+
+	* variable.c (rb_ivar_set): taint check for modification.
+
+	* string.c (rb_str_modify): taint check for modification.
+
+	* hash.c (rb_hash_modify): taint check for modification.
+
+	* array.c (rb_ary_modify): taint check for modification.
+
+	* ruby.h (FL_TAINT): taint for all objects, not only strings.
+
+Fri Oct  9 17:01:14 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (read_all): read() returns "" at immediate EOF.
+
+	* io.c (io_read): read(nil) read all until EOF.
+
+Thu Oct  8 13:32:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_dump): marshal can dump Time object now.
+
+	* marshal.c (Init_marshal): rename marshal methods `_dump_to' to
+	  `_dump', `_load_from' to `_load'.
+
+	* parse.y (rb_intern): "+=".intern generates proper symbol.
+
+Mon Oct  5 18:31:53 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c6 released.
+
+Fri Oct  2 14:22:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): `/\s*(--)$/ =~ "- --"' did not match,
+	  because of wrong optimize condition.
+
+Mon Oct  1 01:55:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (rb_intern): should not raise exceptions.
+
+	* parse.y (yylex): symbol like `:foo?=' should not be allowed.
+
+	* ext/extmk.rb.in: makes *.a for static link modules.
+
+Wed Sep 30 14:13:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_start): supports making a subclass of the
+	  Thread class.
+
+Tue Sep 29 17:46:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_thread_join): join is now an instance method.
+
+Fri Sep 25 12:01:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): `@foo!' should be an error.
+
+Thu Sep 24 14:55:06 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* ext/etc/etc.c (Init_etc): wrong field definition.
+
+Thu Sep 17 17:09:05 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_reopen): was creating FILE* for wrong fd.
+
+Tue Sep 15 05:28:11 1998  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* regex.c (re_compile_pattern): forgot to fixup for the pattern
+	  like (?=(A)|(B)).
+
+Tue Sep 15 01:06:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (rb_io_gets_internal): do not set $_ by default, only
+	  gets/readline set the variable.
+
+	* eval.c (rb_f_load): load toplevel class is set to anonymous
+	  module if safe_level >= 5, to encapsulate modification.
+
+	* eval.c (rb_f_load): set frame properly.
+
+	* string.c (rb_str_each_line): do not set $_.
+
+Mon Sep 14 14:42:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): beginning and end of the string, do not
+	  automatically match `\b'.
+
+	* string.c (scan_once): consume at least on character.
+
+	* regex.c (re_search): wrong behavior for negative range.
+
+Sat Sep 12 21:21:26 1998  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* regex.c (re_search): range value should be maintained.
+
+Thu Sep 10 10:55:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (backref_error): yyerror does not understand formats.
+
+Tue Sep  8 18:05:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c5 released.
+
+Tue Sep  8 10:03:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_each_line): wrong line splitting with newline at
+	  top of the string.
+
+	* string.c: non bang methods return copied string.
+
+	* eval.c (f_END): needed to initialize frame->argc;
+
+Fri Sep  4 11:27:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (bigadd): proper sign combination.
+
+	* regex.c (re_search): wrong return value for \A.
+
+Thu Sep  3 14:08:14 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c4 released.
+
+Tue Sep  1 10:47:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (slow_search): do not compare llen and blen.  llen may
+	  be longer than blen, if little contains 0xff.
+
+	* regex.c (mbctab_euc): set 0x8e as multibyte character.
+
+	* string.c (str_inspect): mask character for octal output.
+
+Mon Aug 31 15:32:41 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): use calculated offset if exactn is the
+	  first opcode in the compiled regexp.
+
+	* regex.c (bm_search): use Boyer-Moore search for simple search.
+
+	* regex.c (must_instr): wrong length check if pattern includes
+	  byte escape by 0xff.
+
+	* regex.c (re_compile_pattern): need not to check current_mbctype.
+
+Sat Aug 29 16:31:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_check_safe_str): avoid calling rb_id2name() in normal
+	  cases to speed-up.
+
+	* eval.c (thread_raise): do not save context of terminated thread.
+
+	* regex.c (re_compile_pattern): mask \nnn over 256.
+
+Sat Aug 29 02:09:46 1998  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* sprintf.c (f_sprintf): wrong buffer size check.
+
+Fri Aug 28 01:57:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): accepts (?ix-ix) and (?ix-ix:...).
+
+Fri Aug 28 12:25:33 1998  Hiroshi Igarashi  <igarashi@ueda.info.waseda.ac.jp>
+
+	* ruby.c (ruby_require_modules): load modules in appearing order.
+
+Fri Aug 28 01:57:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): accepts (?ix-ix) and (?ix-ix:...).
+
+Thu Aug 27 12:54:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c3 released.
+
+Wed Aug 26 14:40:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): check whether ruby_class is properly set,
+	  before accessing it.
+
+	* eval.c (rb_obj_instance_eval): ruby_class should be Qnil for
+	  special objects like Fixnums.
+
+	* ext/tkutil/tkutil.c (Init_tkutil): removes calls to
+	  rb_yield_0().  used instance_eval() instead in the tk.rb.
+
+Wed Aug 26 11:47:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): pop non-greedy stack elements on success.
+
+Wed Aug 26 09:25:35 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ruby.h: add #define environ for cygwin32.
+
+Tue Aug 25 08:57:41 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (rb_ary_sort_bang): temporarily freeze sorting array.
+
+Mon Aug 24 18:46:44 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* dln.c (dln_find_1): path check was too strict.
+
+Mon Aug 24 15:28:11 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* parse.y (f_arglist): opt_nl added after f_args.
+
+Fri Aug 21 01:06:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c: grand renaming on socket.c.
+
+	* ext/socket/socket.c (inet_aton): supply inet_aton for those
+	  systems that do not have it.
+
+	* ext/socket/socket.c (setipaddr): use inet_aton instead of
+	  inet_addr.
+
+	* ext/socket/socket.c (tcp_s_gethostbyname): new method: works
+	  like Socket.gethostbyname but returning array contains ip-addrs
+	  as octet decimal string format like "127.0.0.1".
+
+	* ext/socket/socket.c (mkhostent): return format changed to
+	  [host, aliases, type, ipaddr..]  as documented.
+
+Wed Aug 19 00:31:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_ctl): forgot to place TRAP_END at right position.
+
+Fri Aug 14 11:01:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (call_trace_func): save __FILE__, __LINE__ before
+	  executing trace_func, since trace function should not corrupt
+	  line number information.
+
+Thu Aug 13 15:09:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (ary_s_new): was marking unallocated region on GC.
+
+Tue Aug 11 11:57:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c2 released.
+
+Mon Aug 10 14:05:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* process.c (f_system): removed fflush(stdin).
+
+Fri Aug  7 17:44:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* error.c (err_snprintf): replace sprintf for fixed sized buffer,
+	  with snprintf to avoid buffer over-run.  For systems which does
+	  dot provide snprintf, missing/snprintf.c added.
+
+Wed Aug  5 00:47:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (rb_reg_search): recycle match object.
+
+Mon Aug  3 09:17:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (rb_str_gsub_bang): do not allocate temporary string.
+
+	* string.c (rb_str_sub_bang): use inline replace.
+
+Wed Jul 29 00:36:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (hash_s_new): the default value can be specified.
+
+	* hash.c (hash_default): method to set the default value.
+
+	* hash.c (hash_aref): now returns the default value.
+
+Tue Jul 28 13:03:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (ary_s_new): argument to specify initial value is added.
+
+	* array.c (ary_s_new): specifies size, not capacity.
+
+Mon Jul 27 12:39:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_replace): zero fill for expansion gap.
+
+	* regex.c (mbctab_euc): set flags on for 0xA1-0xFE.  suggested by
+	  <inaba@st.rim.or.jp>.
+
+	* string.c (str_inspect): consider current_mbctype.
+
+Sun Jul 26 15:37:11 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* array.c (ary_s_new): Array.new(1<<30) dumps core.
+
+Fri Jul 24 13:40:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c1 released.
+
+Fri Jul 24 02:10:22 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* marshal.c (r_bytes2): allocated buffer size was too short.
+
+	* marshal.c (w_object): saves all options, not only casefold flag.
+
+	* re.c (reg_clone): now copies options properly.
+
+	* re.c (reg_get_kcode): code number was wrong.
+
+Thu Jul 23 13:11:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_attr): argument should be symbol or string.
+
+Wed Jul 22 11:59:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (calculate_must_string): wrong offset added.
+
+Wed Jul 22 11:59:59 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* st.c (rehash): still had a GC problem.  fixed.
+
+Tue Jul 21 13:19:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (gc_mark_threads): crashed on GC before thread allocation.
+
+	* st.c (rehash): GC during rehash caused SEGV.
+
+Tue Jul 21 01:25:10 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sprintf.c (f_sprintf): integer formatter totally re-written.
+
+	* sprintf.c (remove_sign_bits): support uppercase hexadecimal.
+
+Sat Jul 18 00:14:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sprintf.c (f_sprintf): proper sign position for %X and %O.
+
+Fri Jul 17 14:10:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1c0 released.
+
+Fri Jul 17 08:01:49 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* process.c (f_exec): Check_SafeStr() added.
+
+	* process.c (f_system): Check_SafeStr() moved before fork().
+
+Thu Jul 16 22:58:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (scan_once): substrings to the block should not be
+	  tainted.  use reg_nth_match(), not str_substr().
+
+	* string.c (str_substr): needed to transfer taint.
+
+Thu Jul 16 16:15:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* gc.c (xmalloc): object allocation count added to GC trigger.
+
+	* eval.c (thread_save_context): avoid marking uninitialized stack
+	  in thread_mark.  GC may be triggered by REALLOC_N().
+
+Wed Jul 15 15:11:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_31.
+
+Wed Jul 15 15:05:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_create): exit() and abort() in threads now
+	  forwarded to main_thread.
+
+Tue Jul 14 14:03:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (obj_instance_variables): list names that is not
+	  instance variables.
+
+	* gc.c (GC_MALLOC_LIMIT): choose smaller limit value.
+
+Mon Jul 13 12:39:38 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (str2cstr): should not return NULL.
+
+Fri Jul 10 11:51:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (gettable): needed to add dyna_in_block() check.
+
+Thu Jul  9 17:38:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_30.
+
+Thu Jul  9 16:01:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sprintf.c (fmt_setup): format specifier for long needed.
+
+	* sprintf.c (f_sprintf): ditto.
+
+	* numeric.c (fix2str): ditto.
+
+	* eval.c (thread_create): no more ITIMER_REAL.
+
+	* eval.c (thread_create): thread finalization needed before
+	  aborting thread if thread_abort is set.
+
+Wed Jul  8 18:17:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (big_pow): abandon power by bignum (too big).
+
+Tue Jul  7 13:58:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_catch): add C level catch/throw feature.
+
+Mon Jul  6 15:18:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (arg): proper return values for `||=' and `&&='.
+
+Fri Jul  3 16:05:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_29.
+
+Fri Jul  3 11:20:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* marshal.c (r_byte): byte should not extend sign bit.
+
+	* numeric.c (fix_mul): use FIX2LONG() instead of FIX2INT() for
+	  64bit architectures.
+
+	* marshal.c (r_bytes): remove weird casting between pointer and int.
+
+	* process.c (proc_setsid): new method Process#setsid().
+
+Thu Jul  2 12:49:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* marshal.c (w_object): remove `write_bignum' label for 64bit
+	  architectures.
+
+	* marshal.c (r_bytes): needs int, not long.
+
+Wed Jul  1 14:21:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (flo_plus): should not allow addition with strings.
+
+Wed Jul  1 13:09:01 1998  Keiju ISHITSUKA  <keiju@rational.com>
+
+	* numeric.c (num_uminus): wrong coerce direction.
+
+Tue Jun 30 10:13:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (f_p): accepts arbitrary number of arguments.
+
+	* eval.c (rb_yield_0): there's some case that iterator_p() returns
+	  true even if the_block was not set.  check added.
+
+Tue Jun 30 01:05:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (BEGIN_CALLARGS): adjust the_block before evaluating the
+	  receiver's value and the arguments.
+
+Fri Jun 26 18:02:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_28.
+
+Fri Jun 26 11:01:26 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* string.c (str_aset_method): needed to convert to string.
+
+Thu Jun 25 02:05:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): optimize for `.*' at beginning of the
+	  pattern.
+
+	* regex.c (re_search): optimize for character class repeat at
+	  beginning of the pattern.
+
+	* regex.c (re_compile_pattern): detect optimization potential for
+	  the compiled patterns.
+
+Thu Jun 25 00:02:26 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* re.c (reg_s_new): flag value was wrong.
+
+Wed Jun 24 23:45:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_search): wrong anchor handling for reverse search.
+
+Wed Jun 24 02:18:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (mlhs): `((a,b)),c = [[1,2]],3' assigns a=1,b=2,c=3.
+
+Tue Jun 23 11:46:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): `&&=' and `||=' added.
+
+Sat Jun 20 02:53:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (assignable): nesting local variables should have higher
+	  priority than normal local variables for assignment too.
+
+Fri Jun 19 18:28:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_27.
+
+Fri Jun 19 14:34:49 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (assign): support hack for nested multiple assignment.
+
+	* parse.y (mlhs): nested multiple assignment.
+
+	* eval.c (rb_eval): in-block variables now honors static scope.
+
+	* configure.in: RSHIFT check moved to configure.
+
+Thu Jun 18 16:46:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_26.
+
+Thu Jun 18 13:37:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* file.c (file_s_ftype): uses lstat(2) instead of stat(2).
+
+	* dir.c (dir_s_glob): there can be buffer overrun, check added.
+
+	* eval.c (f_binding): handles in-block variables declared after
+	  binding's generation.
+
+	* numeric.c (flo_floor): floor, ceil, round added to Float.
+
+Wed Jun 17 11:20:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (gettable): nesting local variables should have higher
+	  priority than normal local variables.
+
+Tue Jun 16 12:30:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (str2inum): handles `+ddd'.
+
+	* struct.c (make_struct): name parameter can be nil for unnamed
+	  structures.
+
+Mon Jun 15 16:30:10 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (class_s_inherited): prohibiting to make subclass of
+	  class Class.
+
+	* object.c (module_s_new): support for making subclass of Module.
+
+	* parse.y (yycompile): clear eval_tree before compiling.
+
+Fri Jun 12 17:58:18 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (eval): write back the_dyna_var into the block.
+
+Thu Jun 11 18:19:18 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_25.
+
+	* eval.c (dvar_add_compiling): register dyna_var at compile time.
+
+	* regex.c (re_compile_pattern): RE_DUP_MAX iteration is too big.
+
+Wed Jun 10 15:12:04 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_eof): do not block other threads.
+
+	* signal.c (trap): reserve SIGALRM for thread.
+
+	* eval.c (thread_create): use ITIMER_REAL also to avoid system
+	  call blocking.
+
+	* io.c (f_syscall): add TRAP_BEG, TRAP_END around system calls.
+
+	* io.c (io_ctl): add TRAP_BEG, TRAP_END around system calls.
+
+	* enum.c (enum_collect): did not collect false values.
+
+	* array.c (ary_new2): forgot to initialize capa field.
+
+Tue Jun  9 18:36:15 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* string.c (str_split_method): split dumped core for "\xff".
+
+Tue Jun  9 16:22:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_24.
+
+Tue Jun  9 16:04:07 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ext/kconv/kconv.c (kconv_guess): more precise decision for EUC,
+	  using jless algorithm (3 sequential EUC hiragana characters).
+
+Tue Jun  9 15:12:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/kconv/kconv.c (kconv_guess): wrong guess for EUC as SJIS in
+	  some cases (0xe0 - 0xef).
+
+	* gc.c (xmalloc): insert size check for big (negative in signed)
+	  allocation size.
+
+Tue Jun  9 02:54:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/parsedate.rb: wday moved to the last in the return values.
+
+Mon Jun  8 10:40:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_split_method): split dumped core for "\0".
+
+Sat Jun  6 22:50:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (calculate_must_string): wrong condition for
+	  {start,stop}_nowidth.
+
+	* regex.c (re_match): various features imported from GNU regex.c
+	  0.12, such as nested grouping, avoiding infinite loop with empty
+	  match, etc.
+
+	* regex.c (register_info_type): now use union.
+
+	* regex.c (re_search): more precise anchor(^) check.
+
+Wed Jun  3 18:07:54 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (reg_raise): check rb_in_compile, not rb_in_eval.
+
+Mon Jun  1 05:26:06 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* string.c (trnext): casting to signed char* needed.
+
+Tue Jun  2 16:00:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c (udp_addrsetup): error check enhanced.
+
+	* ext/socket/socket.c (sock_s_getservbyaname): use strtoul(), if
+	  possible.
+
+Sat May 30 07:10:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (reg_prepare_re): no more needless regular expression
+	  recompile on casefold conditions.
+
+Thu May 28 18:02:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (nil_plus): no more `+' method for nil.
+
+Wed May 27 17:33:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (hash_fetch): new method.
+
+	* regex.c (re_search): check whether translate table is set.
+
+Tue May 26 11:39:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_23.
+
+	* parse.y (yylex): no UPLUS/UMINUS for 1st argument if
+	  parenthesises are omitted.
+
+Tue May 26 01:09:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): (?XI) for turns off the
+	  corresponding option.
+
+Mon May 25 12:38:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): inline i option (?i).
+
+	* regex.c (re_compile_pattern): inline x option (?x).
+
+	* regex.c (re_compile_pattern): x option for regexp.
+
+	* dir.c (dir_s_open): returns block's evaluated value.
+
+	* io.c (f_open): returns block's evaluated value.
+
+	* ext/curses/curses.c (curses_addstr): nil argument caused SEGV.
+
+Fri May 22 11:52:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): push mark on (?:), so that
+	  laststart check for {a,b} can be done.
+
+Thu May 21 17:31:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_match): wrong match (too non-greedy) for `{a,b}?'.
+
+	* io.c (io_lineno): new method IO#lineno, IO#lineno=.
+
+Wed May 20 06:04:43 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* BeOS patch.
+
+Wed May 20 16:32:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (BIGDN): use RSHIFT(), instead of mere `>>'.
+
+Tue May 19 16:36:26 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_22.
+
+Tue May 19 16:31:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (assignable): specification changed for in-block
+	  variable definition.
+
+	* eval.c (dyna_var_asgn): error in in-block variables' compile
+	  time definition.
+
+	* parse.y (str_extend): wrong nesting detection.
+
+Tue May 19 09:47:55 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* numeric.c (num2int): re-defined (extensions may use this).
+
+Mon May 18 16:40:50 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* error.c (get_syserr): BeOS support.
+
+	* configure.in: modified for BeOS.
+
+	* string.c (str_dump): do not call isascii().
+
+	* sprintf.c (remove_sign_bits): forgot to initialize end pointer.
+
+	* glob.c: #include <alloca.h> added.
+
+Mon May 18 14:52:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_21.
+
+Mon May 18 03:27:57 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* file.c (file_s_expand_path): optional second argument
+	  `default_directory' added.
+
+Sat May 16 22:06:52 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* error.c (RAISE_ERROR): wrong error message
+
+Fri May 15 14:43:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_20.
+
+Thu May 14 14:44:21 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* sun4 cc patches for intern.h and regex.h.
+
+Thu May 14 14:03:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* random.c (RANDOM_MAX): guessing proper maximum value for random
+	  numbers.
+
+	* random.c (f_rand): use drand48 if possible.
+
+Wed May 13 19:05:20 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+
+	* BeOS patches for io.c, error.c and config.guess.
+
+Wed May 13 14:56:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_19.
+
+	* most of the Mac and BeOS patches merged, except path separators.
+
+	* error.c (err_append): generated SyntaxError was String.
+
+	* ruby.h: xxx2INT, xxx2UINT checks values as int, not long.
+
+	* ruby.h: remove typedef's. INT, UINT, UCHAR, USHORT.
+
+Tue May 12 17:38:00 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_18.
+
+Tue May 12 11:38:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* error.c (syserr_errno): returns errno of the SystemCallError.
+
+	* error.c (rb_sys_fail): saves errno in the Exception.
+
+	* error.c (set_syserr): no need to protect syserr_list.
+
+	* error.c (rb_sys_fail): no more bufsize limit.
+
+	* error.c (set_syserr): integer value of errno can be accessed by
+	  Errno::EXXX::Errno.
+
+Sun May 10 03:10:33 1998  WATANABE Tetsuya  <tetsu@jpn.hp.com>
+
+	* io.c (io_tell etc.): moved from File class to IO class.
+
+Fri May  8 12:26:37 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* pack.c (pack_unpack): should be unsigned int (was signed int).
+
+Thu May  7 16:34:10 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* pack.c (pack_pack): `V', `N' uses newly created NUM2UINT().
+
+	* ruby.h (NUM2UINT): new macro.
+
+	* bignum.c (big2uint): try to convert bignum into UINT.
+
+	* re.c (reg_match): needed to return false for match with nil.
+
+	* gc.c (obj_free): wrong condition to free string.
+
+Wed May  6 21:08:08 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ruby.c (ruby_process_options): modified for DJGPP.
+
+Wed May  6 15:48:03 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_17.
+
+Wed May  6 01:37:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c: remove global variable `errat'.
+
+	* eval.c (rb_longjmp): embed error position information in the
+	  exception object.
+
+Sat May  2 12:20:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (reg_search): supports reverse search.
+
+	* string.c (str_index_method): does update $~ etc.
+
+	* eval.c (f_load): needed to clear the_dyna_vars.
+
+	* eval.c (dyna_var_asgn): do not push dyna_var, which is id == 0.
+
+	* error.c (Init_Exception): NotImplementError is no longer
+	  StandardError, which is not handled by default rescue.
+
+Fri May  1 00:35:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (proc_options): `-d' turns on verbose flag too.
+
+	* error.c (exception): last argument may be the superclass of the
+	  defining exception(s).
+
+	* io.c (Init_IO): EOFError is now subclass of the IOError.
+
+	* io.c (Init_IO): forgot to define IOError.
+
+	* error.c (Init_Exception): old Exception class renamed to
+	  StandardError.  Exception now replaces old GlobalExit.
+
+	* error.c (Init_Exception): Exception is now the root of the
+	  Global Exits.  There's no longer GlobalExit class.
+
+	* util.c (ruby_mktemp): check TMP, TMPDIR first.
+
+Thu Apr 30 01:08:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/tk.rb: call 'unknown', if proc not defined.
+
+	* eval.c (handle_rescue): default rescue handles `Exceptional' not
+	  only the instance of the `Exception's.
+
+	* eval.c (f_raise): exception can be any object.
+
+	* time.c (time_gm_or_local): call time_gmtime or time_localtime.
+
+	* eval.c (f_raise): raises TypeError if the class which is not a
+	  subclass of String is specified (checked in exc_new()).
+
+	* error.c (exc_new): need to check whether invalid class (not a
+	  subclass of String) is specified.
+
+Wed Apr 29 21:05:44 1998  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* ruby.c (proc_options): option '-e' via tempfile.
+
+Tue Apr 28 15:27:58 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_16.
+
+Tue Apr 28 00:07:38 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (obj_is_proc): type check predicate.
+
+	* eval.c (obj_is_block): ditto.
+
+Mon Apr 27 16:59:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/gtk/gtk.c (Init_gtk): use timeout, not idle to avoid
+	  consuming CPU too much.
+
+	* lib/tk.rb: use tcltklib#_invoke instead of `_eval'.
+
+Mon Apr 27 16:59:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (ary_sort): use dup, not clone.
+
+Mon Apr 27 13:46:27 1998  Tadahiro Maebashi  <maebashi@iij.ad.jp>
+
+	* ext/tcltklib/tcltklib.c (ip_invoke): invoke tcl command
+	  directly.  need not worry about escaping tcl characters.
+
+Mon Apr 27 12:04:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* random.c (f_rand): do not call srand() implicitly.
+
+Fri Apr 24 14:35:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_15.
+
+	* parse.y (assignable): dyna_var_asgn actually defines nested
+	  local variables in outer context.
+
+	* random.c (f_rand): call srand(), if it has not called yet.
+
+	* random.c (f_srand): use tv_usec as the default seed.
+
+	* eval.c (rb_eval): values of nested local variables should be
+	  independent.
+
+	* eval.c (rb_yield_0): local variables wrong nested conditions.
+
+Wed Apr 22 23:27:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (select_get_io): get IO object by `to_io'.
+
+	* io.c (io_to_io): method to retrieve IO object, from delegating
+	  object for example.
+
+Wed Apr 22 16:52:37 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_14.
+
+	* string.c (str_modify): check for embedded pointer reference.
+
+	* gc.c (obj_free): ditto.
+
+	* pack.c (pack_pack): p/P template to embed pointers.
+
+Wed Apr 22 00:07:10 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* array.c (ary_rindex): embarrassing typo.
+
+Tue Apr 21 12:31:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_13.
+
+	* configure.in (RUBY_LIB): supports --program-{prefix,suffix}.
+
+	* array.c (ary_rindex): new method.
+
+	* io.c (io_binmode): should return self.
+
+Tue Apr 21 08:23:04 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* parse.y (here_document): calling parse_string with wrong
+	  arguments.
+
+	* struct.c (struct_aset): problem member assignment with name.
+
+Mon Apr 20 14:47:49 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_12.
+
+	* time.c (time_arg): args may be string (support for reduced
+	  implicit type conversion).
+
+	* lib/base64.rb: changed to use pack/unpack with `m' template.
+
+Mon Apr 20 06:23:20 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (mod_remove_const): new method.
+
+Sat Apr 18 03:53:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (hash_each_with_index): removed.  use Enumerable's
+	  each_with_index instead.
+
+	* class.c (rb_include_module): check for super modules, since
+	  module's included modules may be changed.
+
+Fri Apr 17 21:50:47 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* marshal.c (r_long): r_byte() may return signed byte.
+
+Fri Apr 17 11:58:30 1998  NAGAI Hidetoshi  <nagai@dumbo.ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c (lib_mainloop): thread and interrupt check.
+
+Fri Apr 17 11:06:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (find_file): try to fopen() to check whether file exists.
+
+	* ruby.c (load_file): ditto.
+
+	* struct.c (struct_aset): struct member can be set by member name.
+
+Fri Apr 17 00:47:19 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ext/extmk.rb.in: added m68k-human support
+
+	* file.c (LOCK_SH): defines moved.
+
+	* array.c (ary_flatten_bang): simplified loop.
+
+Thu Apr 16 16:52:01 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_11.
+
+	* lib/tk.rb: thread support (experimental - maybe slow).
+
+	* eval.c (rb_longjmp): trace event on exception in raising
+	  context, just before raising exception.
+
+	* struct.c (struct_s_members): forgot to check singletons.
+
+	* struct.c (struct_aref): members can be accessed by names too.
+
+	* array.c (ary_flatten): new method.
+
+	* eval.c (rb_longjmp): prints exception information with `-d'.
+
+	* object.c (any_to_s): remove class name restriction.
+
+Thu Apr 16 01:38:02 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* file.c (thread_flock): do not block other threads.
+
+	* eval.c (thread_trap_eval): signals are now delivered to the
+	  current thread again.  In case that the current thread is dead,
+	  signals are forwarded to the main thread.
+
+	* string.c (str_new4): need not to duplicate frozen strings.
+
+Wed Apr 15 08:33:47 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* struct.c (struct_inspect): remove restriction for struct names.
+
+Wed Apr 15 02:55:02 1998  Kazuya 'Sharl' Masuda  <sharl@www.ufo.co.jp>
+
+	* x68 patches to config.sub, ext/extmk.rb.in
+
+Wed Apr 15 01:22:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_dup_frozen): do not duplicate frozen strings.
+
+	* parse.y (yylex): allow nested parenthesises.
+
+	* io.c (obj_displayln): prints newline after `display'ing the
+	  receiver.
+
+	* io.c (io_puts): avoid generating "\n" each time.  use RS_default
+	  instead.
+
+	* io.c (f_p): ditto.
+
+Tue Apr 14 22:18:17 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* struct.c (struct_aref): should not subtract negative index.
+
+Tue Apr 14 11:34:50 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_10.
+
+	* parse.y: token names prefixed by `t'.
+
+	* struct.c (struct_s_def): supports subclassing of Struct.
+
+	* io.c (io_s_new): supports subclassing of IO.
+
+Mon Apr 13 11:07:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (f_binding): need to restore method name.
+
+	* eval.c (rb_call0): raises SystemStackError, not Fatal.
+
+	* io.c (obj_display): same as `print self'.
+
+	* io.c (f_p): can now be called in the method form.
+
+	* re.c (reg_regsub): needed to be mbchar aware.
+
+Mon Apr 13 13:18:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_trap_eval): all signals delivered to main_thread.
+
+Mon Apr 13 12:47:03 1998  TAKAHASHI Masayoshi  <maki@inac.co.jp>
+
+	* re.c (kcode_set_option): did not set SJIS on SJIS condition.
+
+Sun Apr 12 22:14:07 1998  Kazunori NISHI  <kazunori@swlab.csce.kyushu-u.ac.jp>
+
+	* array.c (ary_uniq_bang): should be `==', not `='. embarrassing.
+
+Sat Apr 11 02:13:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (ary_subseq): SEGVed for `[][1,1]'.
+
+Fri Apr 10 21:29:06 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* array.c (ary_subseq): add check for beg larger than array length.
+
+Wed Apr  8 17:24:11 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* dir.c (dir_s_open): can be called with block (like IO#open).
+
+	* dir.c (dir_s_chdir): print directory path on error.
+
+	* dir.c (dir_s_chroot): ditto
+
+	* dir.c (Init_Dir): needed to override `new'.
+
+Thu Apr  9 18:24:58 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_09.
+
+	* string.c (str_cmp): do not depend on sentinel at the end of the
+	  strings.
+
+	* string.c (str_chomp_bang): forgot to set the sentinel.
+
+Wed Apr  8 00:59:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* bignum.c (big2int): converted int may be too big to fit in
+	  signed int.
+
+	* parse.y (arg): `foo += 1' should not cause an error.
+
+	* variable.c (rb_const_defined): returned false even if the
+	  constant is defined at the top level.
+
+	* eval.c (f_local_variables): dyna_var->id may be null.  should
+	  have checked before calling str_new2().
+
+Tue Apr  7 01:15:15 1998  Kaneko Naoshi  <wbs01621@mail.wbs.or.jp>
+
+	* re.c (reg_regsub): need to check string boundary.
+
+Tue Apr  7 19:19:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_cmp): returns either 1, 0, -1.
+
+	* array.c (ary_cmp): should check array length, too
+
+Tue Apr  7 18:50:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_08.
+
+Tue Apr  7 18:31:27 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* instruby.rb (mandir): dll installation for cygwin32
+
+Tue Apr  7 01:16:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* config.sub (maybe_os): TOWNS support?
+
+	* config.guess: too strict check for libc versions on linuxes.
+
+	* experimental release 1.1b9_07.
+
+	* array.c (ary_cmp): compare each element using `<=>'.
+
+	* hash.c (hash_each_with_index): yields [value, key] pair.
+
+	* class.c (class_protected_instance_methods): list protected
+	  method names.
+
+	* class.c (ins_methods_i): exclude protected methods.
+
+	* eval.c (PUSH_BLOCK): dynamic variables can be accessed from
+	  eval() with bindings.
+
+Mon Apr  6 14:49:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_yield): must return evaluated value.
+
+Fri Apr  3 13:07:29 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_schedule): context switch bypassed on wrong
+	  conditions.
+
+	* variable.c (rb_name_class): set classname by id before String
+	  class is initialized (1.0 behavior restored).
+
+Fri Apr  3 11:25:45 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (num2int): no implicit conversion from string.
+
+	* numeric.c (num2int): check whether `to_i' returns an Integer.
+
+	* numeric.c (num_zero_p): new method.
+
+	* numeric.c (num_nonzero_p): new method.  returns the receiver if
+	  it's not zero.
+
+	* eval.c (obj_instance_eval): the_class should be the object's
+	  singleton class.
+
+	* error.c (exc_s_new): message is converted into a string.
+
+Thu Apr  2 18:31:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (obj_call_init): every object call `initialize'.
+
+Wed Apr  1 08:51:53 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* parse.y (stmt): UNTIL_MOD should be for stmt, not only for expr.
+
+Wed Apr  1 01:20:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (true_and): boolean operators &, | and ^.
+
+Tue Mar 31 13:23:58 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (ary_compact_bang): returns nil, if it does not modify
+	  the array like String's bang methods.
+
+	* array.c (ary_uniq_bang): new method to remove duplicate items.
+
+	* eval.c (bind_s_new): new method.
+
+	* numeric.c (num2int): raise exception if Fixnums too big to
+	  convert into `int' in case that sizeof(int) < sizeof(INT).
+
+	* string.c (str_center): SEGV on negative width.
+
+	* eval.c (eval): forgot to set sourcefile.
+
+Mon Mar 30 11:12:29 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* file.c (f_test): raises exception for unknown command.
+
+	* eval.c (Init_eval): `class_eval': alias to the module_eval.
+
+Mon Mar 30 18:50:42 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* string.c (str_capitalize_bang): did not check string modification.
+
+	* string.c (str_delete_bang): wrong conversion.
+
+	* string.c (str_intern): typo in error message.
+
+Mon Mar 30 01:44:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (obj_instance_eval): accepts block as evaluation body.
+	  No compilation needed each time.
+
+	* eval.c (mod_module_eval): ditto
+
+	* file.c (file_s_umask): umask did not return old values, if no
+	  argument given.
+
+Sun Mar 29 00:54:23 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (f_throw): nil returned always.
+
+Sat Mar 28 20:40:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_06.
+
+Sat Mar 28 16:07:11 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* io.c (io_closed): should not cause exception for closed IO.
+
+	* string.c (str_tr): returned nil for success.
+
+Sat Mar 28 00:47:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (f_local_variables): new method to return an array of
+	  local variable names.
+
+	* variable.c (obj_instance_variables): now returns an array of
+	  variable names, as described in the reference.
+
+	* eval.c (rb_attr): honors default method visibility of the
+	  current scope.
+
+Fri Mar 27 13:49:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_05.
+
+	* ruby.c (ruby_prog_init): `site_ruby' added to load_path.
+
+	* ruby.c (ruby_prog_init): load-path order changed.  Paths in
+	  the RUBYLIB environment variable comes first in non-tainted
+	  mode.
+
+Thu Mar 26 11:51:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_call): new feature: `protected' methods.
+
+	* string.c (str_dump): new method.
+
+	* eval.c (block_pass): block argument can be nil, which means no
+	  block is supplied for the method.
+
+Wed Mar 25 21:20:13 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* string.c (str_reverse_bang): string copied to wrong place.
+
+Wed Mar 25 08:12:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (flo_modulo): caused SEGV if left operand is not a
+	  float value.
+
+	* eval.c (f_eval): optional third and fourth argument to specify
+	  file-name and line-number.
+
+	* eval.c (eval): file-name and line-number set properly.
+
+	* parse.y (assign_in_cond): literal assignment is now warning, not
+	  compile error.
+
+	* error.c (Warn): Warn() always print message, OTOH Waring()
+	  prints when verbose flag is set.
+
+Tue Mar 24 12:50:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (ruby_prog_init): `.' should come last in the load-path.
+
+	* eval.c (Init_eval): `__send__', alias for `send'.
+
+Mon Mar 23 12:44:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_chomp_bang): now takes `rs' as an argument.
+
+	* eval.c (thread_free): main_thread should not be freed.
+
+Fri Mar 20 16:40:34 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_chomp_bang): chomp! (and other ! methods) returns
+	  nil if it does not modify the string.
+
+	* string.c (str_sub_iter_s): should check last pattern since it
+	  may be matched to null.
+
+Thu Mar 19 13:48:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_04.
+
+	* parse.y (yylex): `10e0.9' should cause syntax error.
+
+Wed Mar 18 17:46:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (load_file): new file object constant DATA.  Only
+	  available for the script from the file.
+
+	* regex.c (re_match): forwarding failure point popped too much.
+
+Tue Mar 17 18:23:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* math.c (math_frexp): newly added.
+
+	* math.c (math_ldexp): ditto.
+
+	* bignum.c (bigdivmod): calculates modulo.
+
+	* numeric.c (fix_remainder): returns reminder, formerly introduced
+	  as modulo.
+
+	* numeric.c (fix_modulo): calculates proper `modulo'.
+
+	* bignum.c (bigdivmod): wrong sign for reminder.
+
+Mon Mar 16 17:07:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_03.
+
+Mon Mar 16 16:33:53 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* io.c (pipe_finalize): needed to add pipe_finalize to pipes on
+	  cygwin32.
+
+Mon Mar 16 14:11:06 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* class.c (ins_methods_i): needed to consider NOEX_UNDEF.
+
+Mon Mar 16 13:23:53 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* io.c (io_check_closed): check for `fptr->f2 == NULL'.
+
+	* io.c (io_fptr_close): ditto.
+
+Mon Mar 16 11:49:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (pipe_atexit): free()ing referencing pipe_list.
+
+	* range.c (range_length): returns zero, if the first is greater
+	  than the last.
+
+	* signal.c (trap_restore_mask): restore signal mask before raising
+	  exceptions and throws.
+
+Fri Mar 13 13:49:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_02.
+
+	* object.c (mod_clone): need to dups constants and instance
+	  variables.
+
+	* eval.c (rb_eval): forgot to initialize body for NODE_DEFS.
+
+	* eval.c (rb_eval): retrieve self from calling frame, since self
+	  changes sometimes.
+
+	* env.h (FRAME): need to save self in the calling frame.
+
+	* io.c (f_gets_method): rs should be initialized by RS.
+
+Thu Mar 12 15:33:57 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* experimental release 1.1b9_01.
+
+	* range.c (range_s_new): check values by `first <= last'.
+
+	* parse.y (lastline_set): fixed offset for $_ and $~ in the local
+	  variable space.
+
+Wed Mar 11 02:14:17 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_gets): handle normal case specially for speed.
+
+	* eval.c (rb_disable_super): function to disable superclass's
+	  method explicitly.
+
+	* eval.c (rb_eval): inherits previous method definition's
+	  NOEX_UNDEF-ness, if exists.
+
+	* class.c (rb_define_method): disables superclass's overriding
+	  method by default.
+
+Wed Mar 11 01:40:48 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* numeric.c (flo_gt,etc.): do not depend on `<=>', to handle NaN.
+
+Tue Mar 10 00:03:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (load_file): understands multiple options in #! line.
+
+	* regex.c (re_compile_pattern): support for [:alpha:] etc.
+
+Mon Mar  9 16:53:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.h (GetOpenFile): embed io_check_closed in GetOpenFile.
+
+	* sprintf.c (f_sprintf): zero padding failed for negative
+	  integers.
+
+	* sprintf.c (remove_sign_bits): failed to remove some bits.
+
+Sat Mar  7 21:51:46 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* class.c (ins_methods_i): body may be NULL for some case.
+
+Fri Mar  6 17:23:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (mbcinit): table driven mbchar detection.
+
+	* object.c (obj_alloc): check for allocating instance for the
+	  primitive classes (mostly perfect).
+
+	* ext/curses/curses.c (curses_finalize): restore original state at
+	  interpreter termination.
+
+	* ext/curses/curses.c (curses_addstr): forgot to check argument
+	  type (caused SEGV).  now uses STR2CSTR() macro.
+
+Thu Mar  5 13:47:39 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (block_pass): accepts method object as block args.
+
+	* eval.c (f_missing): use any_to_s() for stringify.
+
+Wed Mar  4 01:39:52 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (block_arg): new syntax - block argument in the
+	  calling arglist.
+
+	* eval.c (rb_call): no module search. simplified a lot.
+
+	* eval.c (rb_eval): block arg support.
+
+	* parse.y (f_block_arg): new syntax - block argument in the
+	  formal arglist.
+
+Tue Mar  3 14:20:15 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (obj_method): returns bound method object.
+
+	* eval.c (rb_call): argument check for empty methods.
+
+	* ruby.h (NUM2CHR): new macro, originally from curses module.
+
+Tue Mar  3 13:03:35 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* io.c (io_putc): new method.
+
+Tue Mar  3 11:21:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_inspect): more strict charcode detection.
+
+	* eval.c (thread_stop): stopping only thread raises ThreadError
+	  exception.
+
+Tue Mar  3 08:04:56 1998  Tadayoshi Funaba  <tadf@kt.rim.or.jp>
+
+	* struct.c (struct_alloc): incomplete struct initialization made
+	  GC to access unallocated addresses.
+
+Mon Mar  2 16:28:27 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (thread_stop_method): remove Thread#stop.
+
+Fri Feb 27 18:16:26 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b9 released.
+
+Fri Feb 27 09:36:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (hash_delete_nil): needed to compare value to nil, since
+	  nil is the valid key for hashes.
+
+	* hash.c (hash_foreach_iter): rehashing causes IndexError.
+
+	* hash.c (hash_foreach_iter): rehash check by pointer comparison.
+
+Thu Feb 26 17:22:13 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (fname): convert reswords into symbols.
+
+	* parse.y (reswords): reserved words are now embedded in the
+	  syntax (sigh).
+
+	* parse.y: now reserved words can be method names safely.
+
+Wed Feb 25 15:50:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (mod_module_eval): clear the_scope's PRIVATE flag before
+	  calling eval().
+
+	* gc.c (gc_call_finalizer_at_exit): run finalizers before any data
+	  object being freed.
+
+	* eval.c (rb_eval): needed to keep prot_tag->retval before
+	  evaluating the ensure clause.
+
+Tue Feb 24 11:16:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): reserved words can be appear as method names at
+	  right after 'def' and `.'(dot), like foo.next.
+
+	* eval.c (return_check): checks for return out of thread (formerly
+	  done in return_value).
+
+	* eval.c (POP_TAG): copy retval to outer level.
+
+	* eval.c (return_value): just set retval, no check, no unwinding.
+
+	* parse.y (nextc): line continuation by backslash at end of line.
+
+	* regex.c (re_compile_pattern): forgot to clear pending_exact on
+	  closing parentheses.
+
+	* parse.y (assignable): should not assign dyna_var to true, if it
+	  is already defined.
+
+Mon Feb 23 14:35:03 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (obj_is_kind_of): no longer accepts true/false/nil.
+
+	* object.c ({true,false,nil}_to_i): can be converted into integers.
+
+Mon Feb 23 12:11:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (reg_s_quote): needed to be mbchar aware.
+
+	* eval.c (proc_s_new): wrong iter mark.
+
+Sat Feb 21 22:59:30 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* io.c (f_syscall): no argument check.
+
+Fri Feb 20 10:17:51 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b8 released.
+
+	* ext/kconv/kconv.c (kconv_kconv): default output code now be
+	  determined according to the value of $KCODE.
+
+	* re.c (rb_get_kcode): can retrieve $KCODE from C code.
+
+	* parse.y (stmt): if/unless modifiers returns nil, if condition is
+	  not established.
+
+Thu Feb 19 11:06:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/kconv/kconv.c (kconv_kconv): charcode can be specified by
+	  code name (JIS, SJIS, EUC like value of $KCODE).
+
+	* regex.c (re_compile_pattern): forgot to fixup_jump for (?:..).
+
+	* regex.c (re_compile_pattern): needed to clear pending_exact on
+	  non-registering grouping (?:...).
+
+Wed Feb 18 19:54:21 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (here_document): needed to set lex_state to EXPR_END.
+
+Wed Feb 18 18:45:10 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* patches for cygwin32 applied.
+
+Wed Feb 18 00:41:31 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_sub_s): needed to be mbchar aware to increment one
+	  character.
+
+	* regex.c (re_match): \Z matches newline just before the end of
+	  the string.
+
+Tue Feb 17 00:04:32 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_arg): Time.gm and Time.local now understands
+	  Time#to_a format.
+
+	* string.c (str_sub_s): replace happened twice for null pattern.
+
+	* regex.c (re_search): null pattern should not match after newline
+	  at the end of string.
+
+	* time.c (time_isdst): now returns boolean value.
+
+	* error.c (rb_check_type): treat special constants in messages.
+
+	* parse.y (yylex): new form `::Const' to see toplevel constants.
+
+	* parse.y (cond): SEGV on `if ()'.
+
+	* gc.c (obj_free): some data needed explicit free().
+
+Mon Feb 16 23:55:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (blk_free): release duplicated block informations.
+
+	* eval.c (blk_copy_prev): duplicate outer block information into
+	  the heap, when proc/binding created.
+
+Mon Feb 16 14:38:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_mon): now 1 for January and so on.
+
+	* time.c (time_year): year in 19xx (no + 1900 needed anymore).
+
+Mon Feb 16 13:28:33 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): need to fetch mbchar's second byte
+	  without translation.
+
+Mon Feb 16 12:29:27 1998  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* eval.c (f_pass_block): pass iterator block to other method.
+
+Fri Feb 13 08:16:11 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (parse_regx): handle \s before read_escape().
+
+	* parse.y (read_escape): `\s' in strings as space.
+
+Tue Feb 10 17:29:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b7 released.
+
+	* string.c (str_aset): string insertion by `str[n] = str2'.
+
+	* string.c (str_oct): does recognize `0x'.
+
+	* sprintf.c (f_sprintf): use base 10 for conversion from string to
+	  integer.
+
+Mon Feb  9 14:51:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* numeric.c (do_coerce): proper error message.
+
+	* string.c (str_sum): bug - masked by wrong value. (sigh..)
+
+Sat Feb  7 15:11:14 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_empty): new method
+
+Fri Feb  6 01:42:15 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c (time_asctime): use asctime(3), not strftime(3).
+
+Thu Feb  5 18:58:46 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_fptr_close): do not free path on close().
+
+	* array.c (ary_filter): new method.
+
+	* enum.c (enum_each_with_index): new method.
+
+Thu Feb  5 14:10:35 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (primary): singleton class def can be appeared inside
+	  method bodies.
+
+	* hash.c (hash_replace): replace content.
+
+	* string.c (str_replace_method): replace content.
+
+	* array.c (ary_replace_method): replace elements.
+
+	* string.c (str_succ_bang): String#succ!
+
+Thu Feb  5 18:20:30 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* string.c (str_upcase_bang): multi byte character support.
+
+Wed Feb  4 13:55:26 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (ary_reverse): SEGV on empty array reverse.
+
+Tue Feb  3 12:24:07 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (match_to_a): non matching element should be nil.
+
+	* ruby.c (ruby_load_script): load script after all initialization.
+
+	* bignum.c (str2inum): need to interpret prefix `0' of `0x'.
+
+Tue Feb  3 10:00:18 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* numeric.c (fix_rshift): use `sizeof(INT)*8' instead of 32.
+
+Mon Feb  2 14:09:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (set_arg0): grab environment region too.
+
+Thu Jan 29 18:36:25 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* process.c (rb_proc_exec): check `sh' to be exist.
+
+Thu Jan 29 18:18:19 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_stdio_set): assignment to $stdin or $stdout does
+	  reopen() as well as $stderr.
+
+Thu Jan 29 14:18:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* class.c (mod_ancestors): should not include singleton classes.
+
+	* object.c (obj_type): should not return internal class.
+
+	* io.c (io_reopen): unwillingly closes stdio streams.
+
+Thu Jan 29 11:50:35 1998  Toshihiko SHIMOKAWA  <toshi@csce.kyushu-u.ac.jp>
+
+	* ext/socket/socket.c (udp_addrsetup): forgot to use htons().
+
+Tue Jan 27 23:15:24 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* keywords: __FILE__, __LINE__ are available again.
+
+Fri Jan 23 14:19:28 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b6 released.
+
+	* object.c (mod_to_s): need to duplicate classpath.
+
+	* error.c (exc_inspect): need to duplicate classpath.
+
+Thu Jan 22 00:37:47 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.h (STR2CSTR): new macro to retrieve char*.
+
+	* class.c (rb_define_method): `initialize' should always be
+	  private, even if it defined by C extensions.
+
+	* eval.c (rb_eval): `initialize' should always be private.
+
+Thu Jan 22 16:21:08 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): some singleton class def cause SEGV.
+
+	* eval.c (TMP_ALLOC): replace ALLOCA_N, where thread context
+	  switch may happen.
+
+Wed Jan 21 01:43:42 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (PUSH_FRAME): do not use ALLOCA_N().  crash on some
+	  platforms that use missing/alloca.c.
+
+	* regex.c (re_compile_pattern): too many pops for non register
+	  subexpr.
+
+	* parse.y (yylex): open parentheses after identifiers are argument
+	  list, even if whitespaces have seen.
+
+Tue Jan 20 15:19:59 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (terms): quoted word list by %w(a b c).
+
+	* ext/tcltklib/extconf.rb: more accurate check for tcl/tk libs.
+
+	* file.c (rb_stat): most of the FileTest methods (and function
+	  `test') accept File objects as the argument.
+
+Tue Jan 19 18:19:24 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ext/extmk.rb.in (install): there should be no newline after install:
+
+	* re.c (MIN): renamed from min().  there's a local variable named
+	  min in the file, so that some cpp will raise an error.
+
+Mon Jan 19 16:30:05 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b5 released.
+
+	* process.c (rb_syswait): no exception raised.
+
+Fri Jan 16 00:43:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.h (CLONESETUP): copies its singleton classes too.
+
+	* class.c (singleton_class_attached): saves binded object in the
+	  singleton classes.
+
+	* eval.c (rb_eval): calls singleton_method_added even in the
+	  singleton class clauses.
+
+Fri Jan 15 23:22:43 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ruby.c (proc_options): -S does not recognize PATH.
+
+Thu Jan 15 02:03:12 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_clear_cache_by_id): clear only affected cache
+	  entries.
+
+Wed Jan 14 02:14:48 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c: new UDP/IP socket classes.
+
+Tue Jan 13 10:00:18 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_cmp): ignorecase($=) works wrong.
+
+Fri Jan  9 13:19:55 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b4 released.
+
+	* eval.c (f_missing): class name omitted from the error message.
+
+	* error.c (exc_inspect): description changed.
+
+	* string.c (Init_String): GlobalExit's superclass did not filled,
+	  since GlobalExit created earlier than String.
+
+Thu Jan  8 12:10:09 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (aryset): expr in the brackets can be null.
+
+Wed Jan  7 21:13:56 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_reopen): keep stderr unclosed.
+
+	* io.c (io_errset): keep stderr unclosed.
+
+Tue Jan  6 00:27:43 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y: syntax modified for `while expr do .. end' etc.
+
+	* process.c (f_exec,f_system): can supply arbitrary name for the
+	  new process.
+
+Mon Jan  5 16:59:13 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* file.c (file_s_basename): removes any extension by ".*".
+
+Sun Jan  4 19:36:22 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* parse.y (yylex): needed to update lex_p (reading point).
+
+Sat Jan  3 19:14:14 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* class.c,object.c: duplicate defines mKernel and cFinxnum.
+
+Fri Jan  2 20:38:59 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/curses/curses.c (NUM2CHAR): uses the first character for
+	  string arguments.
+
+	* array.c (ary_fill): did not extend array for ranges.
+
+	* array.c (beg_len): did not return end pos bigger than size.
+
+Fri Jan  2 02:09:16 1998  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* dir.c (dir_s_chdir): bug in nil check.
+
+	* array.c (ary_fill): bug in nil check.
+
+Tue Dec 30 11:46:23 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* hash.c (env_path_tainted): checks directories in PATH
+	  environment variable are not world writable.
+
+	* ruby.c (load_file): invoke specified interpreter if the #! line
+	  does not contain the word `ruby'.
+
+Fri Dec 26 03:26:41 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (uscore_get): type information included in the error
+	  message.
+
+	* variable.c (f_untrace_var): does not free trace-data within
+	  trace procedure.
+
+Thu Dec 25 02:50:29 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b3 released.
+
+	* ruby.h: inlining some functions on gcc 2.x
+
+Tue Dec 23 02:47:33 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): public/private information kept in the current
+	  scope, to remove undesired state from the class/module.
+
+	* time.c (time_strftime): remove hidden limit of 100 bytes of
+	  result string, using malloc'ed buffer.
+
+	* hash.c (hash_update): merges the contents of another hash,
+	  overriding existing keys.
+
+	* regex.c (must_instr): totally re-written.
+
+	* io.c (read_all): try to allocate proper sized buffer using
+	  fstat(2) for speedup.
+
+Sat Dec 20 00:27:28 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (must_instr): need to skip 2 bytes for mbchars.
+
+Fri Dec 19 01:18:29 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b2 released.
+
+	* eval.c (check_errat): check and convert (if necessary) traceback
+	  information before assigning to the variable $@.
+
+	* eval.c (f_raise): optional third argument to specify traceback
+	  information.
+
+	* io.c (f_open): prevent infinite recursive call.
+
+Thu Dec 18 19:33:47 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_rindex): now accepts regexp as index.
+
+Thu Dec 18 18:42:50 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ext/socket/extconf.rb: modified to detect win32 socket lib.
+
+Thu Dec 18 00:25:03 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* re.c (reg_equal): checks for source and casefold and kcode matching.
+
+	* marshal.c: became built-in module.
+
+	* ext/marshal/marshal.c (r_object): displays struct name for
+	  non-compatible struct.
+
+	* string.c (str_index_method): now searches character (fixnum) in
+	  the string.
+
+	* string.c (str_include): redefine `include?'.
+
+	* regex.c (re_match): start_nowidth saves current stack position
+	  to stop_nowidth.
+
+	* regex.c (re_compile_pattern): add space to stop_nowidth to save
+	  runtime stack position.
+
+Tue Dec 16 14:57:43 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (scan_once): wrong exception for regexp that match with
+	  null string (use substr instead of subseq).
+
+Sat Dec 13 00:13:32 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (expr): remove bare assocs from expr rule.
+
+	* rbconfig.rb: renamed from config.rb (it was too generic name).
+
+Fri Dec 12 00:50:25 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (expr): warns if BEGIN or END appear in the method
+	  bodies.
+
+	* string.c (str_match): calls y =~ x if y is neither String nor
+	  Regexp so that eregex.rb works.
+
+	* eval.c (f_at_exit): to register end proc.
+
+	* class.c (rb_define_module_function): define 'function' method
+	  for the Module, not private method.
+
+	* class.c (rb_define_function): function to define `function' method.
+
+	* eval.c (rb_eval): inherit visibility from superclass's method
+	  except when it is set to `function'
+
+	* eval.c (rb_eval): new visibility status `function'.
+
+	* parse.y (yycompile): do not clear eval_tree. thus enable multiple
+	  command line script by option `-e'.
+
+	* eval.c (rb_eval): END execute just once.
+
+	* parse.y (expr): BEGIN/END built in the syntax.
+
+Thu Dec 11 13:14:35 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (mod_le): Module (or Class) comparison.
+
+	* eval.c (rb_remove_method): raises NameError if named method does
+	  not exist.
+
+	* ext/curses/curses.c: remove CHECK macro for BSD curses.
+
+Thu Dec 11 12:44:01 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* pack.c: sun4 cc patch
+
+Wed Dec 10 15:21:36 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/marshal/marshal.c (marshal_load): can supply evolution proc
+	  object as optional second argument.
+
+	* re.c (reg_source): get source string of the regular expression.
+
+Tue Dec  9 10:05:17 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b1 released.
+
+	* parse.y (tokadd): token buffer overrun.
+
+	* ruby.c (ruby_prog_init): forgot to protect rb_argv0 from gc.
+
+	* eval.c (ruby_run): call finalizers at process termination.
+
+	* gc.c (gc_call_finalizer_at_exit): call free proc for every Data
+	  Wrapper, and finalizer for specified objects at termination.
+
+	* version.c (show_version): version format changed.
+
+	* regex.c (re_match): wrong match with non-greedy if they appear
+	  more than once in regular expressions.
+
+	* sample/ruby-mode.el (ruby-expr-beg): forgot to handle modifiers.
+
+Mon Dec  8 19:00:15 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_puts): just put a newline if no argument given.
+
+	* ext/tcltklib/tcltklib.c (lib_mainloop): thread-aware tk handle
+	  when $tk_thread_safe is set.
+
+	* ext/tcltklib/tcltklib.c (lib_mainloop): use Tcl_DoOneEvent()
+	  instead of Tk_MainLoop().
+
+Mon Dec  6 07:11:16 1997  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* io.c (io_puts): core dumped without any argument.
+
+Fri Dec  5 18:17:17 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (mod_remove_method): remove (not undef) a method from the
+	  class/module.
+
+	* variable.c (obj_remove_instance_variable): method to remove
+	  instance variables.
+
+Thu Dec  4 13:50:29 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1b0 released.
+
+	* string.c (str_aref): called str_index for regexp.
+
+Mon Dec  1 15:24:41 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* compar.c (cmp_between): wrong comparison made.
+
+Wed Nov 26 18:18:05 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* lib/mkmf.rb: generate Makefile for extension modules out of ruby
+	  source tree. use like `ruby -r mkmf extconf.rb'.
+
+	* numeric.c (fix2str): enlarge buffer to prevent overflow on some
+	  machines.
+
+	* parse.y (here_document): wrong line number generated after here-doc.
+
+Fri Nov 21 13:17:12 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (yylex): skip multibyte characters in comments.
+
+Wed Nov 19 17:19:20 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (nil_to_a): nil.to_a => [].
+
+	* parse.y (call_args): wrong node generation.
+
+Tue Nov 18 10:13:08 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* array.c (Init_Array): Array#=== works as Array#include?
+
+	* regex.c (re_compile_pattern): insert initialize code for jump_n,
+	  before entering loops.
+
+	* re.c (reg_search): does not save registers unless $& etc appear
+	  in the script.
+
+Mon Nov 17 13:01:43 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (is_defined): add defined? check for receivers and
+	  arguments for calls.
+
+	* re.c (reg_search): cache last match object.
+
+	* re.c (match_aref): $[0] etc. are available.
+
+Sat Nov 15 00:11:36 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* io.c (io_s_popen): "rb" detection
+
+Fri Nov 14 18:28:40 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (scan_once): returns whole match if the pattern does
+	  not contain any parentheses.
+
+Thu Nov 13 14:39:06 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (str_sub): returns copy of the receiver string, even if
+	  any substitution occurred.
+
+	* regex.c (re_compile_pattern): no-width match by (?=..), (?!..).
+
+Wed Nov 12 13:44:47 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* time.c: remove coerce from Time class.
+
+	* regex.c (re_match): non-greedy match by ??, *? +?, {n,m}?.
+
+Mon Nov 10 11:24:51 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): non-registering parens (?:..).
+
+	* regex.c (re_compile_pattern): new meta character \< (wordbeg)
+	  and \> (wordend).
+
+	* regex.c (re_compile_pattern): embedded comment for regular
+	  expression by (?#...).
+
+Fri Nov  7 16:58:24 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* regex.c (re_compile_pattern): perl5 regexp \A and \Z available.
+
+	* regex.c (re_compile_pattern): can expand compile stack dynamically.
+
+	* regex.c (PUSH_FAILURE_POINT): wrong compare condition.
+
+Wed Nov  2 16:00:00 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* string.c (str_sub_s): "".sub! "", "" => "\000"
+
+Fri Oct 31 15:52:10 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (assoc): keyword assoc like {fg->"black"}.
+
+Thu Oct 30 17:33:38 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_println): print with newline, which is not affected by
+	  the values of $/ and $\.
+
+Thu Oct 30 16:54:01 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* string.c (str_chop_bang): "".chop caused SEGV.
+
+	* string.c (str_chomp_bang): method to chop out last newline.
+
+Mon Oct 27 13:49:13 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/extmk.rb.in: library may have pathname contains `.'
+
+	* eval.c (rb_rescue): should not protect SystemError.
+
+Fri Oct 24 10:58:53 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_s_with_open_stream): ensures to close stream.
+
+Thu Oct 23 11:17:44 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_errset): value of $stderr can be changed (to any IO
+	  object).
+
+	* io.c (next_argv): $< can be anything that responds to `write'.
+
+	* file.c (file_s_with_open_file): ensures to close file.
+
+	* error.c (exception): create error under the current class/module.
+
+	* range.c (range_eqq): fixnum check for last needed too.
+
+Wed Oct 22 12:52:30 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/socket/socket.c: Socket::Constants added.
+
+	* file.c: File::Constants added for inclusion.
+
+	* array.c (ary_join): call ary_join() recursively for the 1st
+	  array element.
+
+Mon Oct 20 12:18:29 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ruby.c (load_file): wrong condition for #! check with -x.
+
+	* file.c (file_s_dirname): did return "" for "/a".
+
+Fri Oct 17 14:29:09 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c: now works on alpha-linux.
+
+	* bignum.c (bigadd): some undefined side effect order assumed.
+
+Wed Oct 15 17:49:24 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* intern.h: function prototypes added.
+
+Mon Oct 13 16:54:18 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* class.c (rb_define_class_id): call superclass's `inherited'
+	  method when making subclasses.
+
+	* parse.y (nextc): clear lex_lastline at the end of file.
+
+	* object.c (Init_Object): need to undef Class#append_features.
+
+	* eval.c (rb_eval): no warning on extending classes or modules.
+
+Thu Oct  9 11:17:50 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (error_print): the exception name follows after the error
+	  message.
+
+	* eval.c (compile_error): error message slightly changed.
+
+	* parse.y (nextc): script parsing will be terminated by __END__ at
+	  beginning of line.
+
+	* eval.c (compile_error): `__END__' is no longer a keyword.
+
+	* parse.y (nextc): protect lastline read from script stream.
+
+Tue Oct  7 14:06:06 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1 alpha9 released.
+
+	* eval.c (mod_append_features): renamed from extend_class.
+
+	* eval.c (rb_eval): defining method calls `method_added'.
+
+	* eval.c (ruby_options): exception while processing options must
+	  terminate the interpreter.
+
+	* error.c (Init_Exception): wrong method configuration.  `new'
+	  should have been a singleton method.
+
+Mon Oct  6 18:55:38 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/kconv/kconv.c (kconv_guess): code to guess character code
+	  from string.
+
+Mon Oct  6 18:38:17 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* pack.c: now encode/decode base64 by `m' template.
+
+Fri Oct  3 10:51:10 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* MANIFEST: needed to include lex.c in the distribution.
+
+	* eval.c (ruby_options): f_require() called too early.
+
+	* eval.c (rb_provide): module extensions should always be `.o'.
+
+Thu Oct  2 11:38:31 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1 alpha8 released.
+
+	* ext/marshal/marshal.c (r_object): remove temporal regist for
+	  structs. (caused problem if structs form cycles.)
+
+	* parse.y (match_gen): static binding for match(=~) calls
+	  with regexp literals.
+
+Wed Oct  1 15:26:55 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c: protect retval in struct tag from GC for C_ALLOCA.
+
+	* eval.c: no more pointer value from setjmp/longjmp.
+
+Wed Oct  1 14:01:49 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ext/marshal/marshal.c (w_byte): argument must be char.
+
+Wed Oct  1 10:30:22 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (mod_const_at): global constants now belongs to the
+	  class Object.
+
+	* object.c (Init_Object): new global constant NIL.
+
+	* ext/marshal/marshal.c (marshal_dump): try to set binmode.
+
+	* ext/marshal/marshal.c (r_object): forgot to re-regist structs in
+	  the object table.
+
+	* eval.c (ruby_options): call Init_ext() before any require()
+	  calls by `-r'.
+
+Fri Sep 30 14:29:22 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ext/marshal/marshal.c (w_object): marshal dumped core.
+
+Tue Sep 30 10:27:39 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sample/test.rb: bignum test suits added.
+
+	* eval.c (rb_eval): new pseudo variable `true' and `false'.
+
+	* parse.y: new keywords `true' and `false' added.
+
+Mon Sep 29 13:37:58 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (forbid_setid): forbid some options in suid mode.
+
+	* ruby.h (NUM2DBL): new macro to convert into doubles.
+
+Mon Sep 27 09:53:48 1997  EGUCHI Osamu  <eguchi@shizuokanet.or.jp>
+
+	* bignum.c: modified for speeding.
+
+Fri Sep 26 18:27:59 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* sample/from.rb: some extensions.
+
+Mon Sep 29 13:15:56 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (lhs): no more syntax error on `obj.CONSTANT = value'.
+
+Fri Sep 26 14:41:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (ruby_run): deferred calling Init_ext() just before eval_node.
+
+Fri Sep 26 13:27:24 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* io.c (io_isatty): forgot to return TRUE value.
+
+Fri Sep 25 11:10:58 1997  EGUCHI Osamu  <eguchi@shizuokanet.or.jp>
+
+	* eval.c: use _setjmp/_longjmp instead of setjmp/longjmp on some
+	  platforms.
+
+Wed Sep 24 17:43:13 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* string.c (Init_String): String#taint and String#taint? added.
+
+	* class.c (mod_ancestors): ancestors include the class itself.
+
+Wed Sep 24 00:57:00 1997  Katsuyuki Okabe  <HGC02147@niftyserve.or.jp>
+
+	* X68000 patch.
+
+Tue Sep 23 20:42:30 1997  EGUCHI Osamu  <eguchi@shizuokanet.or.jp>
+
+	* parse.y (node_newnode): SEGV on null node setup.
+
+Mon Sep 22 11:22:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (ruby_prog_init): wrong safe condition check.
+
+Sun Sep 21 14:46:02 1997  MAEDA shugo  <shugo@po.aianet.ne.jp>
+
+	* error.c (exc_inspect): garbage added to classpath.
+
+Fri Sep 19 11:49:23 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (newtok): forgot to adjust buffer size when shrinking
+	  the token buffer.
+
+	* enum.c (enum_find): rb_eval_cmd() does not return value.
+
+	* io.c (pipe_open): close fds on pipe exec. fcntl(fd, F_SETFD, 1)
+	  no longer used.
+
+Tue Sep 16 17:54:25 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* file.c (f_test): problem if wrong command specified.
+
+	* ruby.c (ruby_prog_init): close stdaux and stdprn for MSDOS.
+
+	* ruby.c (ruby_prog_init): should not add path from environment
+	  variable, if ruby is running under setuid.
+
+	* process.c (init_ids): check suid check for setuid/seteuid etc.
+
+Mon Sep 15 00:42:04 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* regex.c (re_compile_pattern): \w{3} and \W{3} did not work.
+
+Thu Sep 11 10:31:48 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1 alpha7 released.
+
+	* ext/socket/socket.c (sock_new): no setbuf() for NT.
+
+	* io.c (rb_fopen,rb_fdopen): set close-on-exec for every fd.
+
+Wed Sep 10 15:55:31 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ext/marshal/marshal.c (r_bytes0): extra big length check.
+
+Tue Sep  9 16:27:14 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (pipe_fptr_atexit): clean up popen()'ed fptr.
+
+	* error.c (set_syserr): some system has error code that is bigger
+	  than sys_nerr. grrr.
+
+Mon Sep  8 18:33:33 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_s_new): dereferenced nil for optional mode.
+
+Fri Sep  5 10:26:03 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* class.c (class_instance_methods): do not include methods which
+	  are changed to private in subclasses.
+
+Thu Sep  4 12:38:53 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* variable.c (f_global_variables): list name of the global
+	  variables.
+
+	* object.c (obj_id): returns unique integer.
+
+Wed Sep  3 14:05:16 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1 alpha6 released.
+
+	* eval.c (mod_s_constants): context sensitive constant list.
+
+	* variable.c (mod_constants): no more `all' option.
+
+	* variable.c (mod_const_of): the values for autoload classes are
+	  their name strings.
+
+	* class.c (class_instance_methods): no special treatment for
+	  singleton classes.
+
+	* object.c (obj_singleton_methods): returns list of singleton
+	  method names.
+
+	* parse.y (yylex): no here document after `class' keyword.
+
+	* eval.c (f_load): expand path if fname begins with `~'.
+
+Tue Sep  2 13:19:48 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* class.c (ins_methods_i): do not list undef'ed methods.
+
+Mon Sep  1 13:42:48 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1 alpha5 released.
+
+	* object.c (mod_attr_reader): create methods to define attribute
+	  reader/write/accessor.
+
+	* class.c (rb_define_attr): always defines accessors.
+
+	* eval.c (rb_call): alias occurred in the module body caused SEGV.
+
+	* parse.y: did not generate here document strings properly.
+
+Mon Sep  1 11:43:57 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* parse.y (yylex): heredoc dropped an extra character.
+
+Fri Aug 29 11:10:21 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* class.c (class_instance_methods): same method names should not
+	  appear more than once.
+
+	* parse.y (yylex): spaces can follow =begin/=end.
+
+	* variable.c (find_class_path): look for class_tbl also for
+	  unnamed fundamental classes, such as Object, String, etc.
+
+	* variable.c (rb_name_class): can't name class before String class
+	  is initialized.
+
+	* inits.c (rb_call_inits): unrecognized dependency from GC to
+	  Array.
+
+	* variable.c (find_class_path): could not find class if Object's
+	  iv_tbl is NULL.
+
+Thu Aug 28 13:12:05 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1 alpha4 released.
+
+	* variable.c (mod_constants): wrong condition for singleton
+	  class.
+
+	* parse.y (yylex): revised `=begin' skip code.
+
+	* parse.y (here_document): forgot to free(eos).
+
+	* parse.y (yylex): spaces after `<<' prohibited for here
+	  documents to avoid confusing with operator `<<'.
+
+	* eval.c (is_defined): separated from rb_eval().
+
+Wed Aug 27 11:32:42 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1 alpha3 released.
+
+	* variable.c (mod_name): returns name of the class/module.
+
+	* parse.y (here_document): finally here document available now.
+
+	* variable.c (fc_i): some classes/modules does not have iv_tbl.
+
+	* variable.c (find_class_path): avoid infinite loop.
+
+Tue Aug 26 13:43:47 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (rb_eval): undef'ing non-existing method will raise
+	  NameError exception.
+
+	* object.c (class_s_new): needed to create metaclass too.
+
+	* eval.c (error_print): no class name print for anonymous class.
+
+	* eval.c (rb_longjmp): proper exception raised if raise() called
+	  without arguments, with $! or $@ set.
+
+	* object.c (Init_Object): superclass()'s method argument setting
+	  was wrong again.
+
+	* class.c (mod_ancestors): list superclasses and included modules
+	  in priority order.
+
+Mon Aug 25 11:53:11 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1 alpha2 released.
+
+	* sample/ruby-mode.el (ruby-parse-region): auto-indent now
+	  supports "\\" in the strings.
+
+	* struct.c (struct_getmember): new API to get member value from C
+	  language side.
+
+Sat Aug 23 21:39:05 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* parse.y (assignable): remove unnecessary local variable
+	  initialize by nil.
+
+Fri Aug 22 14:26:40 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (error_print): modified exception print format.
+
+Thu Aug 21 16:10:58 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* sample/ruby-mode.el (ruby-calculate-indent): wrong indent level
+	  calculated with keyword operators.
+
+Thu Aug 21 11:36:58 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* parse.y (arg): ary[0] += 1 cause SEGV
+
+Wed Aug 20 17:28:50 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* ruby.c (ruby_process_options): require() all modules after
+	  processing all options
+
+	* process.c (rb_proc_exec): more security checks added.
+
+	* process.c (rb_proc_exec): insecure path on exec.
+
+	* hash.c (f_getenv): PATH modification security check.
+
+Tue Aug 19 00:15:38 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1 alpha1 released.
+
+	* eval.c (mod_eval): work as normal eval() if second binding
+	  argument given.
+
+	* eval.c (rb_call): did not raise ArgumentError if too many
+	  arguments more than optional arguments (without rest arg).
+
+	* eval.c (rb_eval): did not work well for op_asgn2 (attribute
+	  self assignment).
+
+	* eval.c (Init_Thread): returns main thread.
+
+Mon Aug 18 09:25:56 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* object.c (inspect_i): did not display T_DATA instance variables.
+
+	* parse.y: provides more accurate line number information.
+
+	* eval.c (thread_value): include value's backtrace information in
+	  the variable `$@'.
+
+	* eval.c (f_abort): print backtrace and exit.
+
+Sat Aug 16 00:17:44 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (class_new_instance): do not make instance from virtual
+	  classes.
+
+	* object.c (class_s_new): do not make subclass of singleton class.
+
+Fri Aug 15 15:49:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* eval.c (call_trace_func): block context switch in the trace
+	  function.
+
+	* eval.c (rb_eval): clear method cache at class extension.
+
+	* object.c (obj_type): returns object's class even if it defines
+	  singleton methods.
+
+Fri Aug 15 19:40:43 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
+
+	* ext/socket/socket.c (Init_socket): small typo caused SEGV.
+
+Wed Aug 13 17:51:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.1 alpha0 released.
+
+Local variables:
+add-log-time-format: (lambda ()
+  (let* ((time (current-time))
+  	 (diff (+ (cadr time) 32400))
+	  (lo (% diff 65536))
+	  (hi  (+ (car time) (/ diff 65536))))
+    (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
+indent-tabs-mode: t
+tab-width: 8
+end:
diff --git a/ruby_1_8_6/doc/NEWS-1.8.0 b/ruby_1_8_6/doc/NEWS-1.8.0
new file mode 100644
index 0000000000..b4445fa59f
--- /dev/null
+++ b/ruby_1_8_6/doc/NEWS-1.8.0
@@ -0,0 +1,837 @@
+= command line options
+
+: -W option
+
+  new option to specify warning level. -W0 to shut up warnings, -W1 for normal level,
+  -W2 for verbose level.  -w equals to -W2.
+
+= language syntax
+
+: arbitrary delimited string array
+
+  %W(...) notation, word list literal like %w(...) with the
+  exception that #{} interpolation is allowed.
+
+: arbitrary delimited symbol literl
+
+  :"foo", :"foo#{bar}", etc.
+
+: expression interpolation in strings
+
+  Now arbitrary statements are allowed inside #{} interpolation
+  without escapes.  In other hand, they can no longer access to
+  variables defined in eval.
+
+: negative number literals
+
+  Digits preceded minus sign is a literal integer.
+
+: array expansion
+
+  Fixed with the following behavior:
+
+    a = *[1]
+    p a #=> [1]
+
+  Now 1-element array in rhs is expanded properly.
+
+    a = *[1]
+    p a #=> 1
+
+: break and next
+
+  Extended to take an optional expression, which is used as a value
+  for termination.
+
+: direct assignment to Foo::Bar is allowed
+
+  also, you can define "class Foo::Bar; end".
+
+= language core
+
+: $stdin, $stdout, $stderr
+
+  can be assignable again.  the original stdio are preserved as STDIN,
+  STDOUT, STDERR.
+
+: $VERBOSE now has 3 levels
+
+  nil - silence, false - medium (default), true - verbose
+
+: allocation framework
+
+  any instance of class can be allocated by class.allocate,
+  (except for a few classes).
+
+: comparison of exception classes in a rescue clause
+
+  changed to use Module#=== for comparing $! with the exception
+  class specified in each rescue clause.
+
+  as the previous behavior was to use kind_of?, the effect is limited
+  to the SystemCallError case.  SystemCallError.=== has been newly
+  defined to return true when the two have the same errno.  With this
+  change, SystemCallError's with the same errno, such as Errno::EAGAIN
+  and Errno::EWOULDBLOCK, can both be rescued by listing just one of
+  them.
+
+: constants lookup
+
+  improved at the performance of searching by using an internal hash
+  table.
+
+  calls const_missing method of the class/module, if constant is not
+  found in the look up path.
+
+: expression parenthesis in the first argument
+
+  altered to get the following code (note the space after p):
+
+    p ("xx"*2).to_i
+
+  Interpreted as:
+
+    p (("xx"*2).to_i)
+
+  Instead of:
+
+    (p("xx"*2)).to_i
+
+: implicit comparison in conditional expressions
+
+  Obsoleted except when it is used in -e.
+
+  : between Range and $.
+      Use explicit comparison instead.
+
+  : between Regexp and $_
+      Use the unary method ~/re/ instead.
+
+: to_str
+
+  added to get objects which define to_str() treated as String's.
+
+  now almost all the built-in methods try each argument with to_str()
+  when they expect it to be a String.
+
+    foo = Object.new
+    class <<foo
+      def to_str
+        "foo"
+      end
+    end
+    p File.open(foo)
+    => -:7:in `open': wrong argument type Object (expected String) (TypeError)
+       ruby 1.6.4 (2001-04-19) [i586-linux]
+    => -:7:in `open': No such file or directory - "foo" (Errno::ENOENT)
+       ruby 1.7.0 (2001-05-02) [i586-linux]
+
+: multiple assignment behavior
+
+  Fixed so that "*a = nil" results in "a == []".
+
+= changes in core class library
+
+: open
+
+  Extended so that when the third argument is permission flags it
+  calls open(2) instead of fopen(3).
+
+: sprintf
+
+  new format specifier "%p" is available.
+
+: lambda and proc
+
+  Proc object returns from these methods has the following attributes:
+
+  * strict argument number check
+  * break and return terminates the proc execution.
+
+: warn(message)
+
+  a method to give warnings.
+
+: abort()
+
+  takes optional terminate message argument.
+
+: Object#initialize_copy
+
+  copy constructor for clone and dup.
+
+: Object#instance_variable_set, Object#instance_variable_get
+
+  added.
+
+: Object#singleton_method_removed
+: Object#singleton_method_undefined
+
+  Added.
+
+: Array#transpose
+
+  added.
+
+: Array#fetch(index [, default])
+
+  Added.  If a default value isn't given, raises index error if index
+  is out of range.
+
+: Array#insert(n, other, ...)
+
+  Added. [ruby-talk:14289]
+
+  This is much the same as (({ary[n,0] = [other,...]})) except
+  returing self.
+
+    ary = [0,1,2,3]
+    ary[2, 0] = [4, 5, 6]
+    p ary
+
+    ary = [0,1,2,3]
+    ary.insert(2, 4, 5, 6)
+    p ary
+
+: Array#sort!
+
+  Changed to always return self without checking whether the sequence
+  of the elements was modified or not.
+
+  Beware that this behavior is not guaranteed to continue in the
+  future.  Do not rely on its return value. [ruby-dev:12506]
+
+: Array#filter
+
+  Previously deprecated, now removed.  Use Array#collect!.
+
+: Array#pack, String#unpack
+
+  Allows comment in template strings.
+
+: Array#pack, String#unpack
+
+  New templates 'q' and 'Q' for 64bit integer (signed and unsigned respectively).
+
+: Array#new
+
+  Now takes block to fill initial values.  E.g.
+
+	Array.new(10) { |i| i + 1 }
+	=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+
+: Array#fill
+
+  Takes block to get the values to fill.
+
+: Array#fetch
+
+  Takes block to get the default value.
+
+: Array#zip
+
+  added.
+
+: Hash#update
+
+  Takes block to resolve key conflict.
+
+: Hash#merge and Hash#merge!
+
+  update hash.  Hash#merge! is a synonym of Hash#update.
+
+: String#split
+
+  if "sep" argument is a string, regular expression meta characters
+  are escaped internally.
+
+: String#rstrip
+
+  chop off NULs at the end of strings.
+
+: String#to_i
+
+  Now accepts optional base argument.
+
+	"101".to_i(10) => 101
+	"101".to_i(2)  => 5
+	"101".to_i(8)  => 65
+	"101".to_i(16) => 257
+
+  A base argument of 0 guesses at the base.
+
+	"101".to_i(0)   => 101
+	"0b101".to_i(0) => 5
+	"0101".to_i(0)  => 65
+	"0x101".to_i(0) => 257
+
+: String#[regexp, nth]
+
+  Extended to accepts optional second argument.
+
+  It tries match between self and REGEXP, then returns the
+  content of the NTH regexp register.
+
+: String#casecmp
+
+  Added.  This is a case insensitive version of String#<=>.
+
+: String#chomp
+
+  If $/ == "\n", chops off last newlines (any of \n, \r, \r\n).
+
+: String#eql?
+
+  Changed to be always case sensitive.
+
+: String#insert(n, other)
+
+  Added.
+
+  This is much the same as (({str[n, 0] = other})) except returing
+  self.
+
+: String#lstrip, rstrip, lstrip!, rstrip!
+
+  Added.  These strip only left or right part of a string.
+
+: String#match
+
+  Added.
+
+: String/Array methods
+
+  Returns an instance of receivers class.
+
+: String.new
+
+  The first argument becomes optional.
+
+: Symbol#intern
+
+  Added.
+
+: Symbol.all_symbols
+
+  Added. [ruby-dev:12921]
+
+: IO
+
+  64bit off_t support by Janathan Baker.
+
+: IO#read
+: IO#sysread
+
+  takes optinal second argument for read buffer.
+
+: IO::sysopen
+
+  New method to get a raw file descriptor.
+
+: IO#sysseek
+
+  Added.
+
+: IO#fsync
+
+  new method that copies all in-memory parts of a file to disk and
+  waits until the device reports that all parts are on stable storage.
+  Implemented with fsync(2) or equivalent.
+
+: IO.open
+
+  Made public.  Can only associate an IO object with a file number
+  like IO.new and IO.for_fd, but can take a block.
+
+: IO.for_fd
+
+  Added as a synonym for IO.new.
+
+: IO.read
+
+  Added.  Like IO.readlines, except it returns the entire file as a
+  string.  [ruby-talk:9460]
+
+: File#fnmatch, File::Constants::FNM_*
+
+  Added.  Refer to the fnmatch(3) manpage for details.
+
+  Localism is FNM_DOTMATCH which has the opposite meaning of the
+  commonly known FNM_PERIOD, which does not exist in Ruby.
+
+  e.g.
+
+    # exclude files matching "*.bak" case-insensitively.
+    files.reject! {|fn| File.fnmatch?("*.bak", fn, File::FNM_CASEFOLD) }
+
+: File.lchmod
+: File.lchown
+
+  Added.
+
+: File.open, IO.open
+
+  File mode can be specified by flags like open(2),
+  e.g. File::open(path, File::CREAT|File::WRONLY).
+
+: Regexp#options
+
+  Added.
+
+: Regexp.last_match(n)
+
+  Extended to take an optional argument.
+
+: MatchData#captures
+
+  added.
+
+: Dir#path
+
+  Added.
+
+: Dir.chdir
+
+  Extended to take a block.
+
+: Dir.glob
+
+  Made to support meta-character escaping by a backslash.  Wildcards
+  and spaces may now be escaped using a backslash.
+
+: Dir.open
+
+  Changed to return what the block returns when a block is given, just
+  as File.open does. (It always returned (({nil})) in 1.6 and
+  prior)
+
+: Dir.chdir
+
+  Changed to warn only when invoked from multiple threads or no block
+  is given. [ruby-dev:13823]
+
+    Dir.chdir('foo') {
+      Dir.chdir('bar') {   # previously warned
+        puts Dir.pwd
+      }
+    }
+
+: Dir#pos=
+
+  Returns the new position instead of self.
+
+: Dir::glob
+
+  Now accepts optional FNM_* flags via the second argument, whereas
+  Dir::[] doesn't.
+
+    Dir.glob("makefile", File::FNM_CASEFOLD) #=> ['Makefile', 'makefile']
+
+: Class#inherited
+
+  Method is called when Class is inherited by another class.
+
+	class A; end
+	def A.inherited(by)
+          puts "A inherited by #{by.inspect}"
+        end
+        class B < A; end
+
+        Prints out "A inherited by B"
+
+: Module#include?
+
+  Added. [ruby-dev:13941] 
+
+: Module#included
+
+  Added.  This is a hook called after Module#append_feature.
+
+: Module#method_removed
+: Module#method_undefined
+
+  Added.
+
+: Module.new, Class.new
+
+  Extended to take block.
+
+: Time
+
+  Extended to accept a negative time_t. (Only when the platform
+  supports it)
+
+    p Time.at(-1)
+    => Thu Jan 01 08:59:59 JST 1970
+
+: Time#to_a
+: Time#zone
+
+  Made to return "UTC" under gmtime.  It used to return a platform
+  dependent value, typically "GMT", in 1.6 and prior.
+
+: Marshal to use marshal_dump and marshal_load
+
+  if a dumping object responds to 'marshal_dump', Marshal.dump calls
+  it, and dumps object returned.  Marshal.load allocates a new instance
+  using "allocate", then calls its "marshal_load" with dumped data.
+  Marshal format version is now 4.8 (was 4.6 in 1.6.8).
+
+: Marshal
+
+  Fixed not to dump anonymous classes/modules.
+
+  Fixed with loading modules.
+
+: Thread#group
+
+  new method to get belonging  ThreadGroup.
+
+: Thread#terminate
+
+  synonym of Thread#exit
+
+: Thread#join
+
+  Optional argument limits maximum time to wait the thread in second.
+  And returns nil if timed out.
+
+: ThreagGroup#enclose
+
+  prohibits thread movement from/to enclosed groups.
+
+: Range#step([step=1])
+
+  Added.
+
+: SystemCallError
+
+  SystemCallError's "===" match (used in rescue also) is now based on its errno.
+
+: Interrupt
+
+  Made a subclass of SignalException. (It was a subclass of
+  Exception in 1.6 and prior)
+
+: NameError and NoMethodError
+
+  Moved and now NoMethodError < NameError < StandardError.
+
+: NoMethodError
+
+  Added. [ruby-dev:12763]
+
+: NotImplementError
+
+  Finally obsoleted.  Use NotImplementedError.
+
+: SystemCallError.===
+
+  Added. (See the "Comparison of exception classes in a rescue clause"
+  paragraph above) [ruby-dev:12670]
+
+: SystemExit#status
+
+  Added.
+
+: Proc#==
+
+  Added.
+
+: Method#==
+
+  Added.
+
+: UnboundMethod is no longer subclass of Method
+
+  class hierarchy changed. 
+
+: Enumerable#all?
+: Enumerable#any?
+: Enumerable#inject
+: Enumerable#sort_by
+
+  Added.
+
+: Math.acos(x)
+: Math.asin(x)
+: Math.atan(x)
+: Math.cosh(x)
+: Math.hypot(x,y)
+: Math.sinh(x)
+: Math.tanh(x)
+
+  Added.
+
+: Process.abort
+: Process.exit
+
+  synonym of Kernel#abort, and Kernel#exit respectively.
+
+: Process::detach(pid)
+
+  new method to detach child process.  child process will be "wait"ed
+  automagically.
+
+: Process.times
+
+  Moved from Time.times. (Time.times still remains but emits a
+  warning)
+
+: Process.waitall
+
+  Added.
+
+: Process::Status
+
+  Added.  (({$?})) is now an instance of this class.
+
+: Process::UID, Process::GID, Process::Sys,
+
+  Added.
+
+: Signal
+
+  Added. This module has module functions Signal.trap and Signal.list.
+
+= changes in bundled libraries
+
+: lib/cgi.rb
+
+  cgi[name] returns CGI::QueryExtension::Value that wraps string
+  value, no longer array.
+
+: lib/timeout
+
+  timeout "function" wrapped in Timeout module.
+
+: TCPServer#accept, UNIXServer#accept, Socket#accept
+
+  New methods to return an accepted socket fd.
+
+: Date and DateTime
+
+  lib/date.rb now provides both Date and DateTime.
+
+  Some methods have been renamed.  But the old names are still alive.
+
+  Some new methods have been added (Date::parse, Date#strftime, etc.).
+
+  Date#mjd now returns the chronological modified Julian day number.
+
+  All facilities about tjd have been removed.
+
+: Curses
+
+  Updated.  New methods and constants for using the mouse, character
+  attributes, colors and key codes have been added.
+
+: Net::HTTP
+
+  New version of Net::HTTP has introduced seriously incompatible
+  changes. For details, see document embedded in net/http.rb itself.
+
+: Socket.pack_sockaddr_in, Socket.unpack_sockaddr_in
+
+  Added.  Utility for direct Socket access.
+
+: Socket.pack_sockaddr_un, Socket.unpack_sockaddr_un
+
+  Added.  Utility for direct Socket access.
+
+: TCPServer#listen, UNIXServer#listen
+
+  Added.
+
+: TCPSocket.new
+: TCPSocket.open
+
+  Extended to take an address and a port number for the local side in
+  optional 3rd and 4th arguments.
+
+= newly bundled library
+
+: ext/bigdecimal
+
+  variable precision decimal number 
+
+: ext/dl
+
+  an interface to the dynamic linker.
+
+: ext/enumerator
+
+  a helper module for the Enumerable interface.
+
+: ext/io/wait
+
+  IO wait methods.
+
+: ext/iconv
+
+  wrapper library of (({iconv})).
+
+: ext/openssl
+
+  OpenSSL for Ruby
+
+: ext/racc/cparse
+
+  Racc runtime library in C. (Racc is a parser generator for ruby)
+
+: ext/stringio
+
+  Pseudo (({IO})) class from/to (({String})).
+
+: ext/strscan
+
+  Fast string scanner library.
+
+: ext/syck
+
+  fast YAML parser.
+
+: lib/abbrev
+
+  creates an abbreviation table from a list
+
+: lib/benchmark
+
+  Ruby scripts benchmarker
+
+: lib/cgi/session/pstore
+
+  cgi/session back-end using pstore 
+
+: lib/csv
+
+  reads/writes CSV files.
+
+: lib/date/format
+
+  strftime for Date class
+
+: lib/drb
+
+  dRuby or distributed Ruby
+
+: lib/fileutils
+
+  file utility library.
+
+: lib/generator
+
+  converts an internal iterator to an external iterator
+
+: lib/gserver
+
+  generic server used by xmlrpc
+
+: lib/ipaddr
+
+  manipulates IP address.
+
+: lib/multi-tk
+
+  to allow safe Tk, etc.
+
+: lib/open-uri
+
+  easy-to-use wrapper for net/http and net/ftp
+
+: lib/optparse
+
+  command line options utility library
+
+: lib/pathname
+
+  handles pathname in OO manner.
+
+: lib/pp
+
+  prettyprinter for Ruby objects
+
+: lib/prettyprint
+
+  implements prettyprint algorithm.
+
+: lib/profiler
+
+  library to implement -r "profile"
+
+: lib/racc/parser
+
+  RACC parser generator runtime in Ruby.
+
+: lib/scanf
+
+  scan string and retrieve object with format
+
+: lib/set
+
+  Set class
+
+: lib/runit
+
+  RubyUnit compatible layer for test/unit
+
+: lib/test/unit
+
+  unit testing framework for Ruby
+
+: lib/tmpdir
+
+  get temporary directory path.
+
+: lib/tsort
+
+  topological sorting library.
+
+: lib/rexml
+
+  REXML XML library
+
+: lib/webrick
+
+  generic internet server kit
+
+: lib/xmlrpc
+
+  simple RPC via XML
+
+: lib/un
+
+  used like 'ruby -run -e cp -- -p foo bar'.  neat, isn't it?
+
+: lib/win32/registry
+
+  win32/registry is registry accessor
+
+: lib/yaml
+
+  YAML Ain't Mark-up Language
+
+= removed libraries
+
+: lib/ftplib
+
+  use net/ftp instead.
+
+: lib/telnet
+
+  use net/telnet instead.
+
+= new port
+
+: WindowsCE port
+: Win32 BCC
+
+= interpreter implementation
+
+: garbage collector
+
+  faster, but uses more memory for the worst case.
+
+: string concatenation
+
+  faster by avoiding too frequent realloc(3).
diff --git a/ruby_1_8_6/doc/forwardable.rd b/ruby_1_8_6/doc/forwardable.rd
new file mode 100644
index 0000000000..7272c374b6
--- /dev/null
+++ b/ruby_1_8_6/doc/forwardable.rd
@@ -0,0 +1,84 @@
+ -- forwardable.rb
+						
+                                                $Release Version: 1.1 $
+                                                $Revision$
+                                                $Date$
+						Original version by Tosh
+
+=begin
+
+= Forwardable
+
+A Module to define delegations for selected methods to a class.
+
+== Usage
+
+Using through extending the class.
+  
+  class Foo
+    extend Forwardable
+
+    def_delegators("@out", "printf", "print")
+    def_delegators(:@in, :gets)
+    def_delegator(:@contents, :[], "content_at")
+  end
+  f = Foo.new
+  f.printf ...
+  f.gets
+  f.content_at(1)
+
+== Methods
+
+--- Forwardable#def_instance_delegators(accessor, *methods)
+
+      adding the delegations for each method of ((|methods|)) to
+      ((|accessor|)).
+
+--- Forwardable#def_instance_delegator(accessor, method, ali = method)
+      
+      adding the delegation for ((|method|)) to ((|accessor|)). When
+      you give optional argument ((|ali|)), ((|ali|)) is used as the
+      name of the delegation method, instead of ((|method|)).
+
+--- Forwardable#def_delegators(accessor, *methods)
+
+      the alias of ((|Forwardable#def_instance_delegators|)).
+
+--- Forwardable#def_delegator(accessor, method, ali = method)
+      
+      the alias of ((|Forwardable#def_instance_delegator|)).
+
+= SingleForwardable
+
+a Module to define delegations for selected methods to an object.
+
+== Usage
+
+Using through extending the object.
+
+  g = Goo.new
+  g.extend SingleForwardable
+  g.def_delegator("@out", :puts)
+  g.puts ...
+
+== Methods
+
+--- SingleForwardable#def_singleton_delegators(accessor, *methods)
+
+      adding the delegations for each method of ((|methods|)) to
+      ((|accessor|)).
+
+--- SingleForwardable#def_singleton_delegator(accessor, method, ali = method)
+
+      adding the delegation for ((|method|)) to ((|accessor|)). When
+      you give optional argument ((|ali|)), ((|ali|)) is used as the
+      name of the delegation method, instead of ((|method|)).
+
+--- SingleForwardable#def_delegators(accessor, *methods)
+
+      the alias of ((|SingleForwardable#def_instance_delegators|)).
+
+--- SingleForwardable#def_delegator(accessor, method, ali = method)
+
+      the alias of ((|SingleForwardable#def_instance_delegator|)).
+=end
diff --git a/ruby_1_8_6/doc/forwardable.rd.ja b/ruby_1_8_6/doc/forwardable.rd.ja
new file mode 100644
index 0000000000..d928fddc5e
--- /dev/null
+++ b/ruby_1_8_6/doc/forwardable.rd.ja
@@ -0,0 +1,81 @@
+  -- forwatable.rb
+                                                $Release Version: 1.1 $
+                                                $Revision$
+                                                $Date$
+
+=begin
+= Forwardable
+
+クラスに対しメソッドの委譲機能を定義します.
+
+== 使い方
+
+クラスに対してextendして使います. 
+  
+  class Foo
+    extend Forwardable
+
+    def_delegators("@out", "printf", "print")
+    def_delegators(:@in, :gets)
+    def_delegator(:@contents, :[], "content_at")
+  end
+  f = Foo.new
+  f.printf ...
+  f.gets
+  f.content_at(1)
+
+== メソッド
+
+--- Forwardable#def_instance_delegators(accessor, *methods)
+
+      ((|methods|))で渡されたメソッドのリストを((|accessorに|))委譲する
+      ようにします.
+
+--- Forwardable#def_instance_delegator(accessor, method, ali = method)
+
+      ((||method|))で渡されたメソッドを((|accessor|))に委譲するようにし
+      ます. ((|ali|))が引数として渡されたときは, メソッド((|ali|))が呼ば
+      れたときには, ((|accessor|))に対し((|method|))を呼び出します.
+
+--- Forwardable#def_delegators(accessor, *methods)
+
+      ((|Forwardable#def_instance_delegators|))の別名です.
+
+--- Forwardable#def_delegator(accessor, method, ali = method)
+
+      ((|Forwardable#def_instance_delegator|))の別名です.
+
+= SingleForwardable
+
+オブジェクトに対し, メソッドの委譲機能を定義します.
+
+== 使い方
+
+オブジェクトに対して((|extend|))して使います. 
+
+  g = Goo.new
+  g.extend SingleForwardable
+  g.def_delegator("@out", :puts)
+  g.puts ...
+
+== メソッド
+
+--- SingleForwardable#def_singleton_delegators(accessor, *methods)
+
+      ((|methods|))で渡されたメソッドのリストを((|accessor|))に委譲する
+      ようにします.
+
+--- SingleForwardable#def_singleton_delegator(accessor, method, ali = method)
+
+      ((|method|))で渡されたメソッドを((|accessor|))に委譲するようにしま
+      す. ((|ali|))が引数として渡されたときは, メソッド((|ali|))が呼ばれ
+      たときには, ((|accessor|))に対し((|method|))を呼び出します.
+
+--- SingleForwardable#def_delegators(accessor, *methods)
+
+      ((|SingleForwardable#def_singleton_delegators|))の別名です.
+
+--- SingleForwardable#def_delegator(accessor, method, ali = method)
+
+      ((|SingleForwardable#def_singleton_delegator|))の別名です.
+=end
diff --git a/ruby_1_8_6/doc/irb/irb-tools.rd.ja b/ruby_1_8_6/doc/irb/irb-tools.rd.ja
new file mode 100644
index 0000000000..64d9ab29c8
--- /dev/null
+++ b/ruby_1_8_6/doc/irb/irb-tools.rd.ja
@@ -0,0 +1,185 @@
+irb関連おまけコマンドとライブラリ
+				$Release Version: 0.7.1 $
+			   	$Revision$
+			   	$Date$
+			   	by Keiju ISHITSUKA(Nihon Rational Co.,Ltd.)
+
+=begin
+
+:コマンド:
+* rtags		-- ruby tags command
+
+:関数ライブラリ:
+* xmp		-- irb version of gotoken xmp-function
+
+:クラスライブラリ:
+* frame.rb      -- frame tracer
+* completion.rb -- irb completor
+
+= rtags
+
+rtagsはemacs及びvi用の, TAGファイルをつくるコマンドです.
+
+== 使い方
+
+   rtags [-vi] file....
+
+カレントディレクトリにemacs用のTAGSファイルができます. -viオプションを
+つけた時にはvi用のtagsファイルを作成します.
+
+emacsの場合, 通常のetags.elがそのまま使えます. 検索可能なのは,
+
+* クラス
+* メソッド
+* 特異メソッド
+* alias
+* attrで宣言されたアクセサ(パラメータがシンボルか文字列リテラルに限る)
+* attr_XXXで宣言されたアクセサ(パラメータがシンボルか文字列リテラルに限る)
+
+です.
+
+Cなどで使っているのと違うのは, コンプリーションに関する部分で,
+
+関数名は,
+
+  関数名(
+
+クラスは,
+
+  ::クラス名::....::クラス名
+
+メソッドは,
+
+  ::クラス名::....::クラス名#メソッド名
+
+特異メソッド(クラスメソッド)は
+
+  ::クラス名::....::クラス名.メソッド名
+
+でコンプリーションを行なうところです.
+
+= xmp.rb
+
+ごとけんxmpの上位互換バージョンです. ただ, 非常に重いのでごとけんxmpで
+は対応できない時に, 使用すると良いでしょう.
+
+== 使い方
+
+=== 関数として使う.
+
+    require "irb/xmp"
+    xmp <<END
+    foo = 1
+    foo
+    END
+    ---
+    foo = 1
+        ==>1
+    foo
+	==>1
+
+=== XMPインスタンスを用いる.
+
+この場合は, XMPがコンテキスト情報を持つので, 変数の値などを保持してい
+ます.
+
+  require "irb/xmp"
+  xmp = XMP.new
+  xmp.puts <<END
+  foo = 1
+  foo
+  END
+  xmp.puts <<END
+  foo
+  END
+  ===
+  foo = 1
+      ==>1
+  foo
+      ==>1
+  foo
+      ==>1
+
+== コンテキストに関して
+
+XMPメソッド群のコンテキストは, 呼び出す前のコンテキストで評価されます.
+明示的にコンテキストを指定するとそのコンテキストで評価します.
+
+例:
+
+  xmp "foo", an_binding
+
+:注:
+マルチスレッドには対応していません.
+
+= frame.rb
+現在実行中のフレーム情報を取り扱うためのクラスです. 
+
+* IRB::Frame.top(n = 0)
+  上からn番目のコンテキストを取り出します. nは0が最上位になります.
+* IRB::Frame.bottom(n = 0)
+  下からn番目のコンテキストを取り出します. nは0が最下位になります.
+* IRB::Frame.sender
+  センダになっているオブジェクトを取り出します. センダとは, そのメソッ
+  ドを呼び出した側のselfのことです.
+
+:注:
+set_trace_funcを用いてRubyの実行をトレースしています. マルチスレッドに
+は対応していません.
+
+= completion.rb
+irbのcompletion機能を提供するものです. 
+
+== 使い方
+
+   % irb -r irb/completion
+
+とするか, ~/.irbrc 中に
+
+   require "irb/completion"
+
+を入れてください. irb実行中に require "irb/completion" してもよいです.
+
+irb実行中に (TAB) を押すとコンプレーションします.
+
+トップレベルで(TAB)を押すとすべての構文要素, クラス, メソッドの候補がで
+ます. 候補が唯一ならば完全に補完します.
+
+  irb(main):001:0> in    
+  in                    inspect               instance_eval
+  include               install_alias_method  instance_of?
+  initialize            install_aliases       instance_variables
+  irb(main):001:0> inspect
+  "main"
+  irb(main):002:0> foo = Object.new
+  #<Object:0x4027146c>
+
+  ((|変数名.|))の後に(TAB)を押すと, そのオブジェクトのメソッド一覧がでま
+  す.
+
+  irb(main):003:0> foo.
+  foo.==                  foo.frozen?             foo.protected_methods
+  foo.===                 foo.hash                foo.public_methods
+  foo.=~                  foo.id                  foo.respond_to?
+  foo.__id__              foo.inspect             foo.send
+  foo.__send__            foo.instance_eval       foo.singleton_methods
+  foo.class               foo.instance_of?        foo.taint
+  foo.clone               foo.instance_variables  foo.tainted?
+  foo.display             foo.is_a?               foo.to_a
+  foo.dup                 foo.kind_of?            foo.to_s
+  foo.eql?                foo.method              foo.type
+  foo.equal?              foo.methods             foo.untaint
+  foo.extend              foo.nil?                
+  foo.freeze              foo.private_methods     
+
+=end
+
+% Begin Emacs Environment
+% Local Variables:
+% mode: text
+% comment-column: 0
+% comment-start: "%"
+% comment-end: "\n"
+% End:
+%
+
diff --git a/ruby_1_8_6/doc/irb/irb.rd b/ruby_1_8_6/doc/irb/irb.rd
new file mode 100644
index 0000000000..a42cd46680
--- /dev/null
+++ b/ruby_1_8_6/doc/irb/irb.rd
@@ -0,0 +1,392 @@
+irb -- interactive ruby
+		$Release Version: 0.9 $
+		$Revision$
+		$Date$
+		by Keiju ISHITSUKA(keiju@ishitsuka.com)
+		by gotoken-san who is original translater from japanese version
+
+=begin
+= What is irb?
+
+irb stands for `interactive ruby'. irb is a tool to execute interactively
+ruby expressions read from stdin. 
+
+= Invoking
+
+  % irb
+
+= Usage
+
+Use of irb is easy if you know ruby.  Executing irb, prompts are 
+displayed as follows. Then, enter expression of ruby. A input is
+executed when it is syntacticaly completed. 
+
+  dim% irb
+  irb(main):001:0> 1+2
+  3
+  irb(main):002:0> class Foo
+  irb(main):003:1>  def foo
+  irb(main):004:2>    print 1
+  irb(main):005:2>  end
+  irb(main):006:1> end
+  nil
+  irb(main):007:0> 
+
+And, Readline extesion module can be used with irb. Using Readline
+is the standard default action if Readline is installed. 
+
+= Command line option
+
+  irb.rb [options] file_name opts
+  options:
+  -f		    suppress read ~/.irbrc 
+  -m		    bc mode (fraction or matrix are available)
+  -d                set $DEBUG  to true (same as `ruby -d')
+  -Kc		    same as `ruby -Kc'
+  -r load-module    same as `ruby -r'
+  --verbose	    command input is echoed(default)
+  --noverbose	    command input isn't echoed
+  --echo	    commands are echoed immediately before execution(default)
+  --noecho	    commands aren't echoed immediately before execution
+  --inspect	    uses `inspect' for output (the default except bc mode)
+  --noinspect	    doesn't uses inspect for output
+  --readline	    uses Readline extension module
+  --noreadline	    doesn't use Readline extension module
+  --prompt prompt-mode
+  --prompt-mode prompt-mode
+		    switches prompt mode. Pre-defined prompt modes are
+		    `default', `simple', `xmp' and `inf-ruby'
+			    
+  --inf-ruby-mode   uses prompt appreciate for inf-ruby-mode on emacs. 
+		    Suppresses --readline. 
+  --simple-prompt   simple prompt mode
+  --noprompt	    no prompt
+  --tracer	    display trace for each execution of commands.
+  --back-trace-limit n
+		    displayes backtrace top n and tail n. The default
+		    value is 16. 
+  --irb_debug n	    sets internal debug level to n (It shouldn't be used)
+  -v, --version	    prints the version of irb
+
+= Configurations
+
+irb reads `~/.irbrc' when it is invoked. If `~/.irbrb' doesn't exist
+irb try to read in the order `.irbrc', `irb.rc', `_irbrc' then `$irbrc'. 
+
+The following is altanative to the command line option. To use them
+type as follows in an irb session. 
+
+  IRB.conf[:IRB_NAME]="irb"
+  IRB.conf[:MATH_MODE]=false
+  IRB.conf[:USE_TRACER]=false
+  IRB.conf[:USE_LOADER]=false
+  IRB.conf[:IGNORE_SIGINT]=true
+  IRB.conf[:IGNORE_EOF]=false
+  IRB.conf[:INSPECT_MODE]=nil
+  IRB.conf[:IRB_RC] = nil
+  IRB.conf[:BACK_TRACE_LIMIT]=16
+  IRB.conf[:USE_LOADER] = false
+  IRB.conf[:USE_READLINE] = nil
+  IRB.conf[:USE_TRACER] = false
+  IRB.conf[:IGNORE_SIGINT] = true
+  IRB.conf[:IGNORE_EOF] = false
+  IRB.conf[:PROMPT_MODE] = :DEFALUT
+  IRB.conf[:PROMPT] = {...}
+  IRB.conf[:DEBUG_LEVEL]=0
+  IRB.conf[:VERBOSE]=true
+
+== Customizing prompt
+
+To costomize the prompt you set a variable
+
+  IRB.conf[:PROMPT]
+
+For example, describe as follows in `.irbrc'. 
+
+  IRB.conf[:PROMPT][:MY_PROMPT] = { # name of prompt mode
+    :PROMPT_I => nil,		  # normal prompt
+    :PROMPT_S => nil,		  # prompt for continuated strings
+    :PROMPT_C => nil,		  # prompt for continuated statement
+    :RETURN => "    ==>%s\n"	  # format to return value
+  }
+
+Then, invoke irb with the above prompt mode by
+
+  % irb --prompt my-prompt
+
+Or add the following in `.irbrc'. 
+
+  IRB.conf[:PROMPT_MODE] = :MY_PROMPT
+
+Constants PROMPT_I, PROMPT_S and PROMPT_C specifies the format. 
+In the prompt specification, some special strings are available. 
+
+  %N	command name which is running
+  %m	to_s of main object (self)
+  %M	inspect of main object (self)
+  %l	type of string(", ', /, ]), `]' is inner %w[...]
+  %NNi	indent level. NN is degits and means as same as printf("%NNd"). 
+        It can be ommited
+  %NNn	line number. 
+  %%    %
+
+For instance, the default prompt mode is defined as follows:
+
+IRB.conf[:PROMPT_MODE][:DEFAULT] = {
+      :PROMPT_I => "%N(%m):%03n:%i> ",
+      :PROMPT_S => "%N(%m):%03n:%i%l ",
+      :PROMPT_C => "%N(%m):%03n:%i* ",
+      :RETURN => "%s\n"
+} 
+
+RETURN is used to printf. 
+
+== Configurating subirb
+
+The command line option or IRB.conf specify the default behavior of
+(sub)irb. On the other hand, each conf of in the next sction `6. Command' 
+is used to individually configurate (sub)irb. 
+
+If proc is set to IRB.conf[:IRB_RC], its subirb will be invoked after
+execution of that proc under giving the context of irb as its
+aregument. By this mechanism each subirb can be configurated. 
+
+= Command
+
+For irb commands, both simple name and `irb_'-prefixed name are prepared. 
+
+--- exit, quit, irb_exit	
+    Quits (sub)irb. 
+
+--- conf, irb_context
+    Displays current configuration. Modifing the configuration is
+    achieved by sending message to `conf'. 
+
+--- conf.eval_history = N
+    Sets execution result history.
+    N is a integer or nil. If N > 0, the number of historys is N. 
+    If N == 0, the number of historys is unlimited. If N is nill,
+    execution result history isn't used(default).
+
+--- conf.back_trace_limit
+    Sets display lines of backtrace as top n and tail n. 
+    The default value is 16.
+    
+--- conf.debug_level = N
+    Sets debug level of irb. 
+
+--- conf.ignore_eof = true/false
+    Whether ^D (control-d) will be ignored or not. 
+    If false is set, ^D means quit. 
+
+--- conf.ignore_sigint= true/false
+    Whether ^C (control-c) will be ignored or not. 
+    If false is set, ^D means quit.  If true, 
+      during input:   cancel inputing then return to top level. 
+      during execute: abondon current execution. 
+
+--- conf.inf_ruby_mode = true/false
+    Whether inf-ruby-mode or not. The default value is false.
+
+--- conf.inspect_mode = true/false/nil
+    Specifies inspect mode. 
+    true:  display inspect
+    false: display to_s
+    nil:   inspect mode in non math mode, 
+           non inspect mode in math mode. 
+
+--- conf.math_mode
+    Whether bc mode or not. 
+
+--- conf.use_loader = true/false
+    Whether irb's own file reader method is used when load/require or not. 
+    This mode is globaly affected (irb wide). 
+
+--- conf.prompt_c
+    prompt for a continuating statement (e.g, immediately after of `if')
+
+--- conf.prompt_i
+    standard prompt
+
+--- conf.prompt_s
+    prompt for a continuating string
+
+--- conf.rc
+    Whether ~/.irbrc is read or not. 
+
+--- conf.use_prompt = true/false
+    Prompting or not. 
+
+--- conf.use_readline = true/false/nil
+    Whether readline is used or not. 
+    true: uses 
+    false: doen't use
+    nil: intends to use readline except for inf-ruby-mode (default)
+#
+#--- conf.verbose=T/F
+#    Whether verbose messages are display or not. 
+
+--- cws, chws, irb_change_workspace [obj]
+    obj will be self. If obj is omitted, self will be home-object, or
+    the main object of first started irb.
+
+--- pushws, irb_pushws, irb_push_workspace [obj]
+    same as UNIX-shell command pushd.
+
+--- popws, irb_popws, irb_pop_workspace
+    same as UNIX-shell command popd
+
+--- irb [obj]
+    Invoke subirb. If obj is given, obj will be self. 
+
+--- jobs, irb_jobs
+    List of subirb
+
+--- fg n, irb_fg n
+    Switch into specified subirb. The following is candidates of n:
+
+      irb number
+      thhread
+      irb object
+      self(obj which is specified of irb obj)
+
+--- kill n, irb_kill n
+    Kill subirb. The means of n is as same as the case of irb_fg. 
+
+--- souce, irb_source  path
+    This is a like UNIX-shell command source. evaluate script in path
+    on current context.
+
+--- irb_load path, prev
+    irb-version of Ruby's load.
+
+= System variable
+
+--- _  The latest value of evaluation (it is local)
+--- __ The history of evaluation values.
+    __[line_no] return an evaluation value of line number<line_no>. If
+    line_no is a negative, return value before -<line_no> from latest
+    value.
+
+= Session Example
+
+  dim% ruby irb.rb
+  irb(main):001:0> irb                        # invoke subirb
+  irb#1(main):001:0> jobs                     # list of subirbs
+  #0->irb on main (#<Thread:0x400fb7e4> : stop)
+  #1->irb#1 on main (#<Thread:0x40125d64> : running)
+  nil
+  irb#1(main):002:0> fg 0                     # switch job
+  nil
+  irb(main):002:0> class Foo;end
+  nil
+  irb(main):003:0> irb Foo                    # invoke subirb which has the 
+					      #              context of Foo
+  irb#2(Foo):001:0> def foo                   # define Foo#foo
+  irb#2(Foo):002:1>   print 1
+  irb#2(Foo):003:1> end
+  nil
+  irb#2(Foo):004:0> fg 0                      # switch job
+  nil
+  irb(main):004:0> jobs                       # list of job
+  #0->irb on main (#<Thread:0x400fb7e4> : running)
+  #1->irb#1 on main (#<Thread:0x40125d64> : stop)
+  #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
+  nil
+  irb(main):005:0> Foo.instance_methods       # Foo#foo is defined asurely
+  ["foo"]
+  irb(main):006:0> fg 2                       # switch job
+  nil
+  irb#2(Foo):005:0> def bar                   # define Foo#bar
+  irb#2(Foo):006:1>  print "bar"
+  irb#2(Foo):007:1> end
+  nil
+  irb#2(Foo):010:0>  Foo.instance_methods
+  ["bar", "foo"]
+  irb#2(Foo):011:0> fg 0                      
+  nil
+  irb(main):007:0> f = Foo.new
+  #<Foo:0x4010af3c>
+  irb(main):008:0> irb f                      # invoke subirb which has the
+					      #  context of f (instance of Foo)
+  irb#3(#<Foo:0x4010af3c>):001:0> jobs
+  #0->irb on main (#<Thread:0x400fb7e4> : stop)
+  #1->irb#1 on main (#<Thread:0x40125d64> : stop)
+  #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
+  #3->irb#3 on #<Foo:0x4010af3c> (#<Thread:0x4010a1e0> : running)
+  nil
+  irb#3(#<Foo:0x4010af3c>):002:0> foo         # evaluate f.foo
+  1nil
+  irb#3(#<Foo:0x4010af3c>):003:0> bar         # evaluate f.bar
+  barnil
+  irb#3(#<Foo:0x4010af3c>):004:0> kill 1, 2, 3# kill job
+  nil
+  irb(main):009:0> jobs
+  #0->irb on main (#<Thread:0x400fb7e4> : running)
+  nil
+  irb(main):010:0> exit                       # exit
+  dim% 
+
+= Restrictions
+
+Because irb evaluates the inputs immediately after the imput is
+syntactically completed, irb gives slight different result than
+directly use ruby. Known difference is pointed out here. 
+
+
+== Declaration of the local variable
+
+The following causes an error in ruby:
+
+  eval "foo = 0"
+  foo
+  --
+  -:2: undefined local variable or method `foo' for #<Object:0x40283118> (NameError)
+  ---
+  NameError
+
+Though, the above will successfully done by irb. 
+
+  >> eval "foo = 0"
+ => 0
+ >> foo
+ => 0
+
+Ruby evaluates a code after reading entire of code and determination
+of the scope of local variables. On the other hand, irb do
+immediately. More precisely, irb evaluate at first
+
+  evel "foo = 0" 
+
+then foo is defined on this timing. It is because of this
+incompatibility.
+
+If you'd like to detect those differences, begin...end can be used:
+
+  >> begin
+  ?>   eval "foo = 0"
+  >>   foo
+  >> end
+  NameError: undefined local variable or method `foo' for #<Object:0x4013d0f0>
+  (irb):3
+  (irb_local_binding):1:in `eval'
+
+== Here-document
+
+Implementation of Here-document is incomplete. 
+
+== Symbol
+
+Irb can not always recognize a symbol as to be Symbol. Concretely, an
+expression have completed, however Irb regard it as continuation line.
+
+=end
+
+% Begin Emacs Environment
+% Local Variables:
+% mode: text
+% comment-column: 0
+% comment-start: "%"
+% comment-end: "\n"
+% End:
+%
diff --git a/ruby_1_8_6/doc/irb/irb.rd.ja b/ruby_1_8_6/doc/irb/irb.rd.ja
new file mode 100644
index 0000000000..338dcc644e
--- /dev/null
+++ b/ruby_1_8_6/doc/irb/irb.rd.ja
@@ -0,0 +1,413 @@
+irb -- interactive ruby
+				$Release Version: 0.9.5 $
+			   	$Revision$
+			   	$Date$
+			   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+=begin
+= irbとは?
+
+irbはinteractive rubyの略です. rubyの式を標準入力から簡単に入力/実行する
+ためのツールです.
+
+= 起動
+
+  % irb
+
+で行ないます. 
+
+= 使い方
+
+irbの使い方は, Rubyさえ知っていればいたって簡単です. 基本的には irb と
+いうコマンドを実行するだけです. irbを実行すると, 以下のようなプロンプ
+トが表れてきます. 後は, rubyの式を入れて下さい. 式が完結した時点で実行
+されます.
+
+  dim% irb
+  irb(main):001:0> 1+2
+  3
+  irb(main):002:0> class Foo
+  irb(main):003:1>  def foo
+  irb(main):004:2>    print 1
+  irb(main):005:2>  end
+  irb(main):006:1> end
+  nil
+  irb(main):007:0> 
+
+また, irbはReadlineモジュールにも対応しています. Readlineモジュールが
+インストールされている時には, それを使うのが標準の動作になります.
+
+= コマンドオプション
+
+  irb.rb [options] file_name opts
+  options:
+  -f		    ~/.irbrc を読み込まない.
+  -m		    bcモード(分数, 行列の計算ができる)
+  -d                $DEBUG をtrueにする(ruby -d と同じ)
+  -Kc		    ruby -Kcと同じ
+  -r load-module    ruby -r と同じ.
+  --verbose	    これから実行する行を表示する(デフォルト)
+  --noverbose	    これから実行する行を表示しない
+  --echo	    実行結果を表示する(デフォルト)
+  --noecho	    実行結果を表示しない
+  --inspect	    結果出力にinspectを用いる(bcモード以外はデフォルト). 
+  --noinspect	    結果出力にinspectを用いない.
+  --readline	    readlineライブラリを利用する.
+  --noreadline	    readlineライブラリを利用しない. デフォルトの動作は,
+		    inf-ruby-mode以外でreadlineライブラリを利用しよう
+		    とする. 
+  --prompt prompt-mode
+  --prompt-mode prompt-mode
+		    プロンプトモードを切替えます. 現在定義されているプ
+		    ロンプトモードは, default, simple, xmp, inf-rubyが
+		    用意されています. デフォルトはdefaultプロンプトモー
+		    ドになっています.
+			    
+  --inf-ruby-mode   emacsのinf-ruby-mode用のプロンプト表示を行なう. 特
+		    に指定がない限り, readlineライブラリは使わなくなる.
+  --simple-prompt
+		    非常にシンプルなプロンプトを用いるモードです.
+  --noprompt	    プロンプト表示を行なわない.
+  --tracer	    コマンド実行時にトレースを行なう.
+  --back-trace-limit n
+		    バックトレース表示をバックトレースの頭から n, 後ろ
+		    からnだけ行なう. デフォルトは16 
+  --irb_debug n	    irbのデバッグデバッグレベルをnに設定する(利用しな
+		    い方が無難でしょう).
+  -v, --version	    irbのバージョンを表示する
+
+= コンフィギュレーション
+
+irb起動時に``~/.irbrc''を読み込みます. もし存在しない場合は,
+``.irbrc'', ``irb.rc'', ``_irbrc'', ``$irbrc''の順にloadを試みます.
+
+オプションを設定する代わりに, 以下のコマンドでもデフォルトの動作を設定
+できます.
+
+  IRB.conf[:IRB_NAME]="irb"
+  IRB.conf[:MATH_MODE]=false
+  IRB.conf[:USE_TRACER]=false
+  IRB.conf[:USE_LOADER]=false
+  IRB.conf[:IGNORE_SIGINT]=true
+  IRB.conf[:IGNORE_EOF]=false
+  IRB.conf[:INSPECT_MODE]=nil
+  IRB.conf[:IRB_RC] = nil
+  IRB.conf[:BACK_TRACE_LIMIT]=16
+  IRB.conf[:USE_LOADER] = false
+  IRB.conf[:USE_READLINE] = nil
+  IRB.conf[:USE_TRACER] = false
+  IRB.conf[:IGNORE_SIGINT] = true
+  IRB.conf[:IGNORE_EOF] = false
+  IRB.conf[:PROMPT_MODE] = :DEFALUT
+  IRB.conf[:PROMPT] = {...}
+  IRB.conf[:DEBUG_LEVEL]=0
+  IRB.conf[:VERBOSE]=true
+
+== プロンプトの設定
+
+プロンプトをカスタマイズしたい時には, 
+
+   IRB.conf[:PROMPT]
+
+を用います. 例えば, .irbrcの中で下のような式を記述します:
+
+   IRB.conf[:PROMPT][:MY_PROMPT] = { # プロンプトモードの名前
+     :PROMPT_I => nil,		  # 通常のプロンプト
+     :PROMPT_N => nil,		  # 継続行のプロンプト
+     :PROMPT_S => nil,		  # 文字列などの継続行のプロンプト
+     :PROMPT_C => nil,		  # 式が継続している時のプロンプト
+     :RETURN => "    ==>%s\n"	  # リターン時のプロンプト
+   }
+
+プロンプトモードを指定したい時には,
+
+  irb --prompt my-prompt
+
+でそのプロンプトモードで起動されます. または, .irbrcに下式を記述しても
+OKです.
+
+  IRB.conf[:PROMPT_MODE] = :MY_PROMPT
+
+PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_Cは, フォーマットを指定します.
+
+  %N	起動しているコマンド名が出力される.
+  %m	mainオブジェクト(self)がto_sで出力される.
+  %M	mainオブジェクト(self)がinspectされて出力される.
+  %l	文字列中のタイプを表す(", ', /, ], `]'は%wの中の時)
+  %NNi	インデントのレベルを表す. NNは数字が入りprintfの%NNdと同じ. 省
+	略可能
+  %NNn	行番号を表します.
+  %%    %
+
+例えば, デフォルトのプロンプトモードは:
+
+  IRB.conf[:PROMPT_MODE][:DEFAULT] = {
+      :PROMPT_I => "%N(%m):%03n:%i> ",
+      :PROMPT_N => "%N(%m):%03n:%i> ",
+      :PROMPT_S => "%N(%m):%03n:%i%l ",
+      :PROMPT_C => "%N(%m):%03n:%i* ",
+      :RETURN => "%s\n"
+  } 
+
+となっています.
+
+RETURNは, 現在のところprintf形式です. 将来仕様が変わるかも知れません.
+
+== サブirbの設定
+
+コマンドラインオプションおよびIRB.confは(サブ)irb起動時のデフォルトの
+設定を決めるもので, `5. コマンド'にあるconfで個別の(サブ)irbの設定がで
+きるようになっています.
+
+IRB.conf[:IRB_RC]にprocが設定されていると, サブirbを起動する時にその
+procをirbのコンテキストを引数として呼び出します. これによって個別のサ
+ブirbごとに設定を変えることができるようになります.
+
+
+= コマンド
+
+irb拡張コマンドは, 簡単な名前と頭に`irb_'をつけた名前と両方定義されて
+います. これは, 簡単な名前がoverrideされた時のためです.
+
+--- exit, quit, irb_exit	
+    終了する. 
+    サブirbの場合, そのサブirbを終了する.
+
+--- conf, irb_context
+    irbの現在の設定を表示する. 設定の変更は, confにメッセージを送るこ
+    とによって行なえる. 
+
+--- conf.eval_history = N
+    実行結果のヒストリ機能の設定.
+    nnは整数かnilで nn>0 であればその数だけヒストリにためる。nn==0の時は
+    無制限に記憶する、nilだとヒストリ機能はやめる(デフォルト). 
+
+--- Conf.back_trace_limit
+    バックトレース表示をバックトレースの頭からn, 後ろからnだけ行なう.
+    デフォルトは16
+    
+--- conf.debug_level = N
+    irb用のデバッグレベルの設定
+
+--- conf.ignore_eof = true/false
+    ^Dが入力された時の動作を設定する. trueの時は^Dを無視する, falseの
+    時はirbを終了する. 
+
+--- conf.ignore_sigint= true/false
+    ^Cが入力された時の動作を設定する. false時は, irbを終了する. trueの
+    時の動作は以下のようになる:
+      入力中: これまで入力したものをキャンセルしトップレベルに戻る. 
+      実行中: 実行を中止する.
+
+--- conf.inf_ruby_mode = true/false
+    inf-ruby-mode用のプロンプト表示を行なう. デフォルトはfalse.
+
+--- conf.inspect_mode = true/false/nil
+    インスペクトモードを設定する.
+    true: インスペクトして表示する.
+    false: 通常のprintで表示する.
+    nil: 通常モードであれば, inspect modeとなり, mathモードの時は, non
+	 inspect modeとなる.   
+
+--- conf.math_mode
+    参照のみ. bcモード(分数, 行列の計算ができます)かどうか?
+
+--- conf.use_loader = true/false
+    load/require時にirbのfile読み込み機能を用いるモードのスイッチ(デフォ
+    ルトは用いない). このモードはIRB全体に反映される.
+
+--- conf.prompt_c
+    ifの直後など, 行が継続している時のプロンプト.
+
+--- conf.prompt_i
+    通常のプロンプト.
+
+--- conf.prompt_s
+    文字列中などを表すプロンプト.
+
+--- conf.rc
+    ~/.irbrcを読み込んだかどうか?
+
+--- conf.use_prompt = true/false
+    プロンプト表示するかどうか? デフォルトではプロンプトを表示する.
+
+--- conf.use_readline = true/false/nil
+    readlineを使うかどうか?
+    true: readlineを使う.
+    false: readlineを使わない.
+    nil: (デフォルト)inf-ruby-mode以外でreadlineライブラリを利用しよ
+         うとする.  
+#
+#--- conf.verbose=T/F
+#    irbからいろいろなメッセージを出力するか?
+
+--- cws, chws, irb_cws, irb_chws, irb_change_workspace [obj]
+    objをselfとする. objが省略されたときは, home workspace, すなわち
+    irbを起動したときのmain objectをselfとする.
+
+--- pushws, irb_pushws, irb_push_workspace [obj]
+    UNIXシェルコマンドのpushdと同様.
+
+--- popws, irb_popws, irb_pop_workspace
+    UNIXシェルコマンドのpopdと同様.
+
+--- irb [obj]
+    サブirbを立ちあげる. objが指定された時は, そのobjをselfとする.
+
+--- jobs, irb_jobs
+    サブirbのリスト
+
+--- fg n, irb_fg n
+    指定したサブirbにスイッチする. nは, 次のものを指定する.
+
+      irb番号
+      スレッド
+      irbオブジェクト
+      self(irb objで起動した時のobj)
+
+--- kill n, irb_kill n
+      サブirbをkillする. nはfgと同じ.
+
+--- souce, irb_source  path
+    UNIXシェルコマンドのsourceと似ている. 現在の環境上でpath内のスクリ
+    プトを評価する.
+
+--- irb_load path, prev
+
+    Rubyのloadのirb版.
+
+= システム変数
+
+--- _  
+    前の計算の実行結果を覚えている(ローカル変数).
+--- __ 
+    実行結果の履歴を覚えている.
+    __[line_no]で、その行で実行した結果を得ることができる. line_noが負の
+    時には、最新の結果から-line_no前の結果を得ることができる.
+
+=  使用例
+
+以下のような感じです.
+
+  dim% ruby irb.rb
+  irb(main):001:0> irb                        # サブirbの立ちあげ
+  irb#1(main):001:0> jobs                     # サブirbのリスト
+  #0->irb on main (#<Thread:0x400fb7e4> : stop)
+  #1->irb#1 on main (#<Thread:0x40125d64> : running)
+  nil
+  irb#1(main):002:0> fg 0                     # jobのスイッチ
+  nil
+  irb(main):002:0> class Foo;end
+  nil
+  irb(main):003:0> irb Foo                    # Fooをコンテキストしてirb
+					      # 立ちあげ
+  irb#2(Foo):001:0> def foo                   # Foo#fooの定義
+  irb#2(Foo):002:1>   print 1
+  irb#2(Foo):003:1> end
+  nil
+  irb#2(Foo):004:0> fg 0                      # jobをスイッチ
+  nil
+  irb(main):004:0> jobs                       # jobのリスト
+  #0->irb on main (#<Thread:0x400fb7e4> : running)
+  #1->irb#1 on main (#<Thread:0x40125d64> : stop)
+  #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
+  nil
+  irb(main):005:0> Foo.instance_methods       # Foo#fooがちゃんと定義さ
+					      # れている
+  ["foo"]
+  irb(main):006:0> fg 2                       # jobをスイッチ
+  nil
+  irb#2(Foo):005:0> def bar                   # Foo#barを定義
+  irb#2(Foo):006:1>  print "bar"
+  irb#2(Foo):007:1> end
+  nil
+  irb#2(Foo):010:0>  Foo.instance_methods
+  ["bar", "foo"]
+  irb#2(Foo):011:0> fg 0                      
+  nil
+  irb(main):007:0> f = Foo.new
+  #<Foo:0x4010af3c>
+  irb(main):008:0> irb f                      # Fooのインスタンスでirbを
+					      # 立ちあげる.
+  irb#3(#<Foo:0x4010af3c>):001:0> jobs
+  #0->irb on main (#<Thread:0x400fb7e4> : stop)
+  #1->irb#1 on main (#<Thread:0x40125d64> : stop)
+  #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
+  #3->irb#3 on #<Foo:0x4010af3c> (#<Thread:0x4010a1e0> : running)
+  nil
+  irb#3(#<Foo:0x4010af3c>):002:0> foo         # f.fooの実行
+  nil
+  irb#3(#<Foo:0x4010af3c>):003:0> bar         # f.barの実行
+  barnil
+  irb#3(#<Foo:0x4010af3c>):004:0> kill 1, 2, 3# jobのkill
+  nil
+  irb(main):009:0> jobs
+  #0->irb on main (#<Thread:0x400fb7e4> : running)
+  nil
+  irb(main):010:0> exit                       # 終了
+  dim% 
+
+= 使用上の制限
+
+irbは, 評価できる時点(式が閉じた時点)での逐次実行を行ないます. したがっ
+て, rubyを直接使った時と, 若干異なる動作を行なう場合があります.
+
+現在明らかになっている問題点を説明します.
+
+== ローカル変数の宣言
+
+rubyでは, 以下のプログラムはエラーになります.
+
+  eval "foo = 0"
+  foo
+  --
+  -:2: undefined local variable or method `foo' for #<Object:0x40283118> (NameError)
+  ---
+  NameError
+
+ところが, irbを用いると
+
+  >> eval "foo = 0"
+  => 0
+  >> foo
+  => 0
+
+となり, エラーを起こしません. これは, rubyが最初にスクリプト全体をコン
+パイルしてローカル変数を決定するからです. それに対し, irbは実行可能に
+なる(式が閉じる)と自動的に評価しているからです. 上記の例では, 
+
+  evel "foo = 0" 
+
+を行なった時点で評価を行ない, その時点で変数が定義されるため, 次式で 
+変数fooは定義されているからです.
+
+このようなrubyとirbの動作の違いを解決したい場合は, begin...endで括って
+バッチ的に実行して下さい:
+
+  >> begin
+  ?>   eval "foo = 0"
+  >>   foo
+  >> end
+  NameError: undefined local variable or method `foo' for #<Object:0x4013d0f0>
+  (irb):3
+  (irb_local_binding):1:in `eval'
+
+== ヒアドキュメント
+
+現在のところヒアドキュメントの実装は不完全です. 
+
+== シンボル
+
+シンボルであるかどうかの判断を間違えることがあります. 具体的には式が完了
+しているのに継続行と見なすことがあります.
+
+=end
+
+% Begin Emacs Environment
+% Local Variables:
+% mode: text
+% comment-column: 0
+% comment-start: "%"
+% comment-end: "\n"
+% End:
+%
+
diff --git a/ruby_1_8_6/doc/shell.rd b/ruby_1_8_6/doc/shell.rd
new file mode 100644
index 0000000000..02ee1b020a
--- /dev/null
+++ b/ruby_1_8_6/doc/shell.rd
@@ -0,0 +1,348 @@
+ -- shell.rb
+				$Release Version: 0.6.0 $
+			   	$Revision$
+			   	$Date$
+			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
+
+=begin
+
+= What's shell.rb?
+
+It realizes a wish to do execution of commands with filters and pipes
+like sh/csh by using just native facilities of ruby.
+
+= Main classes
+
+== Shell
+
+Every shell object has its own current working directory, and executes
+each command as if it stands in the directory.
+
+--- Shell#cwd
+--- Shell#dir
+--- Shell#getwd
+--- Shell#pwd
+
+      Returns the current directory
+
+--- Shell#system_path
+
+      Returns the command search path in an array
+
+--- Shell#umask
+
+      Returns the umask
+
+== Filter
+
+Any result of command exection is a Filter.  Filter include
+Enumerable, therefore a Filter object can use all Enumerable
+facilities.
+
+= Main methods
+
+== Command definitions
+
+In order to execute a command on your OS, you need to define it as a
+Shell method.
+
+Alternatively, you can execute any command via Shell#system even if it
+is not defined.
+
+--- Shell.def_system_command(command, path = command)
+
+      Defines a command.  Registers <path> as a Shell method
+      <command>.
+
+      ex)
+      Shell.def_system_command "ls"
+        Defines ls.
+
+      Shell.def_system_command "sys_sort", "sort"
+        Defines sys_sort as sort.
+
+--- Shell.undef_system_command(command)
+
+      Undefines a commmand
+
+--- Shell.alias_command(ali, command, *opts) {...}
+
+      Aliases a command.
+
+      ex)
+        Shell.alias_command "lsC", "ls", "-CBF", "--show-control-chars"
+        Shell.alias_command("lsC", "ls"){|*opts| ["-CBF", "--show-control-chars", *opts]}
+
+--- Shell.unalias_command(ali)
+
+      Unaliases a command.
+
+--- Shell.install_system_commands(pre = "sys_")
+
+      Defines all commands in the default_system_path as Shell method,
+      all with <pre> prefixed to their names.
+
+== Creation
+
+--- Shell.new
+
+      Creates a Shell object which current directory is set to the
+      process current directory.
+
+--- Shell.cd(path)
+
+      Creates a Shell object which current directory is set to
+      <path>.
+
+== Process management
+
+--- Shell#jobs
+
+      Returns a list of scheduled jobs.
+
+--- Shell#kill sig, job
+
+      Sends a signal <sig> to <job>.
+
+== Current directory operations
+
+--- Shell#cd(path, &block)
+--- Shell#chdir
+
+      Changes the current directory to <path>.  If a block is given,
+      it restores the current directory when the block ends.
+
+--- Shell#pushd(path = nil, &block)
+--- Shell#pushdir
+
+      Pushes the current directory to the directory stack, changing
+      the current directory to <path>.  If <path> is omitted, it
+      exchanges its current directory and the top of its directory
+      stack.  If a block is given, it restores the current directory
+      when the block ends.
+
+--- Shell#popd
+--- Shell#popdir
+
+      Pops a directory from the directory stack, and sets the current
+      directory to it.
+
+== File and directory operations
+
+--- Shell#foreach(path = nil, &block)
+
+      Same as:
+        File#foreach (when path is a file)
+        Dir#foreach (when path is a directory)
+
+--- Shell#open(path, mode)
+
+      Same as:
+        File#open (when path is a file)
+        Dir#open (when path is a directory)
+
+--- Shell#unlink(path)
+
+      Same as:
+        Dir#open (when path is a file)
+        Dir#unlink (when path is a directory)
+
+--- Shell#test(command, file1, file2)
+--- Shell#[command, file1, file2]
+
+      Same as test().
+      ex)
+          sh[?e, "foo"]
+          sh[:e, "foo"]
+          sh["e", "foo"]
+          sh[:exists?, "foo"]
+          sh["exists?", "foo"]
+
+--- Shell#mkdir(*path)
+
+      Same as Dir.mkdir (with multiple directories allowed)
+
+--- Shell#rmdir(*path)
+
+      Same as Dir.rmdir (with multiple directories allowed)
+
+== Command execution
+
+--- System#system(command, *opts)
+
+      Executes <command> with <opts>.
+
+      ex)
+        print sh.system("ls", "-l")
+        sh.system("ls", "-l") | sh.head > STDOUT
+
+--- System#rehash
+
+      Does rehash.
+
+--- Shell#transact &block
+
+      Executes a block as self.
+      ex)
+        sh.transact{system("ls", "-l") | head > STDOUT}
+
+--- Shell#out(dev = STDOUT, &block)
+
+      Does transact, with redirecting the result output to <dev>.
+
+== Internal commands
+
+--- Shell#echo(*strings)
+--- Shell#cat(*files)
+--- Shell#glob(patten)
+--- Shell#tee(file)
+
+      Return Filter objects, which are results of their execution.
+
+--- Filter#each &block
+
+      Iterates a block for each line of it.
+
+--- Filter#<(src)
+
+      Inputs from <src>, which is either a string of a file name or an
+      IO.
+
+--- Filter#>(to)
+
+      Outputs to <to>, which is either a string of a file name or an
+      IO.
+
+--- Filter#>>(to)
+
+      Appends the ouput to <to>, which is either a string of a file
+      name or an IO.
+
+--- Filter#|(filter)
+
+      Processes a pipeline.
+
+--- Filter#+(filter)
+
+      (filter1 + filter2) outputs filter1, and then outputs filter2.
+
+--- Filter#to_a
+--- Filter#to_s
+
+== Built-in commands
+
+--- Shell#atime(file)
+--- Shell#basename(file, *opt)
+--- Shell#chmod(mode, *files)
+--- Shell#chown(owner, group, *file)
+--- Shell#ctime(file)
+--- Shell#delete(*file)
+--- Shell#dirname(file)
+--- Shell#ftype(file)
+--- Shell#join(*file)
+--- Shell#link(file_from, file_to)
+--- Shell#lstat(file)
+--- Shell#mtime(file)
+--- Shell#readlink(file)
+--- Shell#rename(file_from, file_to)
+--- Shell#split(file)
+--- Shell#stat(file)
+--- Shell#symlink(file_from, file_to)
+--- Shell#truncate(file, length)
+--- Shell#utime(atime, mtime, *file)
+
+      Equivalent to the class methods of File with the same names.
+
+--- Shell#blockdev?(file)
+--- Shell#chardev?(file)
+--- Shell#directory?(file)
+--- Shell#executable?(file)
+--- Shell#executable_real?(file)
+--- Shell#exist?(file)/Shell#exists?(file)
+--- Shell#file?(file)
+--- Shell#grpowned?(file)
+--- Shell#owned?(file)
+--- Shell#pipe?(file)
+--- Shell#readable?(file)
+--- Shell#readable_real?(file)
+--- Shell#setgid?(file)
+--- Shell#setuid?(file)
+--- Shell#size(file)/Shell#size?(file)
+--- Shell#socket?(file)
+--- Shell#sticky?(file)
+--- Shell#symlink?(file)
+--- Shell#writable?(file)
+--- Shell#writable_real?(file)
+--- Shell#zero?(file)
+
+      Equivalent to the class methods of FileTest with the same names.
+
+--- Shell#syscopy(filename_from, filename_to)
+--- Shell#copy(filename_from, filename_to)
+--- Shell#move(filename_from, filename_to)
+--- Shell#compare(filename_from, filename_to)
+--- Shell#safe_unlink(*filenames)
+--- Shell#makedirs(*filenames)
+--- Shell#install(filename_from, filename_to, mode)
+
+      Equivalent to the class methods of FileTools with the same
+      names.
+
+      And also, there are some aliases for convenience:
+
+--- Shell#cmp	<- Shell#compare
+--- Shell#mv	<- Shell#move
+--- Shell#cp	<- Shell#copy
+--- Shell#rm_f	<- Shell#safe_unlink
+--- Shell#mkpath	<- Shell#makedirs
+
+= Samples
+
+== ex1
+
+  sh = Shell.cd("/tmp")
+  sh.mkdir "shell-test-1" unless sh.exists?("shell-test-1")
+  sh.cd("shell-test-1")
+  for dir in ["dir1", "dir3", "dir5"]
+    if !sh.exists?(dir)
+      sh.mkdir dir
+      sh.cd(dir) do
+	f = sh.open("tmpFile", "w")
+	f.print "TEST\n"
+	f.close
+      end
+      print sh.pwd
+    end
+  end
+
+== ex2
+
+  sh = Shell.cd("/tmp")
+  sh.transact do
+    mkdir "shell-test-1" unless exists?("shell-test-1")
+    cd("shell-test-1")
+    for dir in ["dir1", "dir3", "dir5"]
+      if !exists?(dir)
+	mkdir dir
+	cd(dir) do
+	  f = open("tmpFile", "w")
+	  f.print "TEST\n"
+	  f.close
+	end
+	print pwd
+      end
+    end
+  end
+
+== ex3
+
+  sh.cat("/etc/printcap") | sh.tee("tee1") > "tee2"
+  (sh.cat < "/etc/printcap") | sh.tee("tee11") > "tee12"
+  sh.cat("/etc/printcap") | sh.tee("tee1") >> "tee2"
+  (sh.cat < "/etc/printcap") | sh.tee("tee11") >> "tee12"
+
+== ex4
+
+  print sh.cat("/etc/passwd").head.collect{|l| l =~ /keiju/}
+
+=end
diff --git a/ruby_1_8_6/doc/shell.rd.ja b/ruby_1_8_6/doc/shell.rd.ja
new file mode 100644
index 0000000000..073e71ea42
--- /dev/null
+++ b/ruby_1_8_6/doc/shell.rd.ja
@@ -0,0 +1,336 @@
+ -- shell.rb
+				$Release Version: 0.6.0 $
+			   	$Revision$
+			   	$Date$
+			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
+
+=begin
+
+= 目的
+
+ruby上でsh/cshのようにコマンドの実行及びフィルタリングを手軽に行う.
+sh/cshの制御文はrubyの機能を用いて実現する.
+
+= 主なクラス一覧
+
+== Shell
+
+Shellオブジェクトはカレントディレクトリを持ち, コマンド実行はそこからの
+相対パスになります.
+
+--- Shell#cwd
+--- Shell#dir
+--- Shell#getwd
+--- Shell#pwd
+
+      カレントディレクトリを返す。
+
+--- Shell#system_path
+
+      コマンドサーチパスの配列を返す。
+
+--- Shell#umask
+
+      umaskを返す。
+
+== Filter
+
+コマンドの実行結果はすべてFilterとしてかえります. Enumerableをincludeし
+ています.
+
+= 主なメソッド一覧
+
+== コマンド定義
+
+OS上のコマンドを実行するにはまず, Shellのメソッドとして定義します.
+
+注) コマンドを定義しなくとも直接実行できるShell#systemコマンドもあります.
+
+--- Shell.def_system_command(command, path = command)
+
+      Shellのメソッドとしてcommandを登録します. 
+
+      例)
+      Shell.def_system_command "ls"
+        ls を定義
+
+      Shell.def_system_command "sys_sort", "sort"
+        sortコマンドをsys_sortとして定義
+
+--- Shell.undef_system_command(command)
+
+      commandを削除します.
+
+--- Shell.alias_command(ali, command, *opts) {...}
+
+      commandのaliasをします. 
+
+      例)
+        Shell.alias_command "lsC", "ls", "-CBF", "--show-control-chars"
+        Shell.alias_command("lsC", "ls"){|*opts| ["-CBF", "--show-control-chars", *opts]}
+
+--- Shell.unalias_command(ali)
+
+      commandのaliasを削除します.
+
+--- Shell.install_system_commands(pre = "sys_")
+
+      system_path上にある全ての実行可能ファイルをShellに定義する. メソッ
+      ド名は元のファイル名の頭にpreをつけたものとなる.
+
+== 生成
+
+--- Shell.new
+
+      プロセスのカレントディレクトリをカレントディレクトリとするShellオ
+      ブジェクトを生成します.
+
+--- Shell.cd(path)
+
+      pathをカレントディレクトリとするShellオブジェクトを生成します.
+
+== プロセス管理
+
+--- Shell#jobs
+
+      スケジューリングされているjobの一覧を返す.
+
+--- Shell#kill sig, job
+
+      jobにシグナルsigを送る
+
+== カレントディレクトリ操作
+
+--- Shell#cd(path, &block)
+--- Shell#chdir
+
+      カレントディレクトリをpathにする. イテレータとして呼ばれたときには
+      ブロック実行中のみカレントディレクトリを変更する.
+
+--- Shell#pushd(path = nil, &block)
+--- Shell#pushdir
+
+      カレントディレクトリをディレクトリスタックにつみ, カレントディレク
+      トリをpathにする. pathが省略されたときには, カレントディレクトリと
+      ディレクトリスタックのトップを交換する. イテレータとして呼ばれたと
+      きには, ブロック実行中のみpushdする.
+
+--- Shell#popd
+--- Shell#popdir
+
+      ディレクトリスタックからポップし, それをカレントディレクトリにする.
+
+== ファイル/ディレクトリ操作
+
+--- Shell#foreach(path = nil, &block)
+
+      pathがファイルなら, File#foreach
+      pathがディレクトリなら, Dir#foreach
+
+--- Shell#open(path, mode)
+
+      pathがファイルなら, File#open
+      pathがディレクトリなら, Dir#open
+
+--- Shell#unlink(path)
+
+      pathがファイルなら, File#unlink
+      pathがディレクトリなら, Dir#unlink
+
+--- Shell#test(command, file1, file2)
+--- Shell#[command, file1, file2]
+
+      ファイルテスト関数testと同じ. 
+      例)
+          sh[?e, "foo"]
+          sh[:e, "foo"]
+          sh["e", "foo"]
+          sh[:exists?, "foo"]
+          sh["exists?", "foo"]
+
+--- Shell#mkdir(*path)
+
+      Dir.mkdirと同じ(複数可)
+
+--- Shell#rmdir(*path)
+
+      Dir.rmdirと同じ(複数可)
+
+== コマンド実行
+
+--- System#system(command, *opts)
+
+      commandを実行する.
+      例)
+        print sh.system("ls", "-l")
+        sh.system("ls", "-l") | sh.head > STDOUT
+
+--- System#rehash
+
+      リハッシュする
+
+--- Shell#transact &block
+
+      ブロック中ではshellをselfとして実行する.
+      例)
+        sh.transact{system("ls", "-l") | head > STDOUT}
+
+--- Shell#out(dev = STDOUT, &block)
+
+      transactを呼び出しその結果をdevに出力する.
+
+== 内部コマンド
+
+--- Shell#echo(*strings)
+--- Shell#cat(*files)
+--- Shell#glob(patten)
+--- Shell#tee(file)
+
+      これらは実行すると, それらを内容とするFilterオブジェクトを返します. 
+
+--- Filter#each &block
+
+      フィルタの一行ずつをblockに渡す.
+
+--- Filter#<(src)
+
+      srcをフィルタの入力とする. srcが, 文字列ならばファイルを, IOであれ
+      ばそれをそのまま入力とする.
+
+--- Filter#>(to)
+
+      srcをフィルタの出力とする. toが, 文字列ならばファイルに, IOであれ
+      ばそれをそのまま出力とする.
+
+--- Filter#>>(to)
+
+      srcをフィルタに追加する. toが, 文字列ならばファイルに, IOであれば
+      それをそのまま出力とする.
+
+--- Filter#|(filter)
+
+      パイプ結合
+
+--- Filter#+(filter)
+
+      filter1 + filter2 は filter1の出力の後, filter2の出力を行う.
+
+--- Filter#to_a
+--- Filter#to_s
+
+== 組込みコマンド
+
+--- Shell#atime(file)
+--- Shell#basename(file, *opt)
+--- Shell#chmod(mode, *files)
+--- Shell#chown(owner, group, *file)
+--- Shell#ctime(file)
+--- Shell#delete(*file)
+--- Shell#dirname(file)
+--- Shell#ftype(file)
+--- Shell#join(*file)
+--- Shell#link(file_from, file_to)
+--- Shell#lstat(file)
+--- Shell#mtime(file)
+--- Shell#readlink(file)
+--- Shell#rename(file_from, file_to)
+--- Shell#split(file)
+--- Shell#stat(file)
+--- Shell#symlink(file_from, file_to)
+--- Shell#truncate(file, length)
+--- Shell#utime(atime, mtime, *file)
+
+      これらはFileクラスにある同名のクラスメソッドと同じです.
+
+--- Shell#blockdev?(file)
+--- Shell#chardev?(file)
+--- Shell#directory?(file)
+--- Shell#executable?(file)
+--- Shell#executable_real?(file)
+--- Shell#exist?(file)/Shell#exists?(file)
+--- Shell#file?(file)
+--- Shell#grpowned?(file)
+--- Shell#owned?(file)
+--- Shell#pipe?(file)
+--- Shell#readable?(file)
+--- Shell#readable_real?(file)
+--- Shell#setgid?(file)
+--- Shell#setuid?(file)
+--- Shell#size(file)/Shell#size?(file)
+--- Shell#socket?(file)
+--- Shell#sticky?(file)
+--- Shell#symlink?(file)
+--- Shell#writable?(file)
+--- Shell#writable_real?(file)
+--- Shell#zero?(file)
+
+      これらはFileTestクラスにある同名のクラスメソッドと同じです.
+
+--- Shell#syscopy(filename_from, filename_to)
+--- Shell#copy(filename_from, filename_to)
+--- Shell#move(filename_from, filename_to)
+--- Shell#compare(filename_from, filename_to)
+--- Shell#safe_unlink(*filenames)
+--- Shell#makedirs(*filenames)
+--- Shell#install(filename_from, filename_to, mode)
+
+      これらはFileToolsクラスにある同名のクラスメソッドと同じです.
+
+      その他, 以下のものがエイリアスされています.
+
+--- Shell#cmp	<- Shell#compare
+--- Shell#mv	<- Shell#move
+--- Shell#cp	<- Shell#copy
+--- Shell#rm_f	<- Shell#safe_unlink
+--- Shell#mkpath	<- Shell#makedirs
+
+= サンプル
+
+== ex1
+
+  sh = Shell.cd("/tmp")
+  sh.mkdir "shell-test-1" unless sh.exists?("shell-test-1")
+  sh.cd("shell-test-1")
+  for dir in ["dir1", "dir3", "dir5"]
+    if !sh.exists?(dir)
+      sh.mkdir dir
+      sh.cd(dir) do
+	f = sh.open("tmpFile", "w")
+	f.print "TEST\n"
+	f.close
+      end
+      print sh.pwd
+    end
+  end
+
+== ex2
+
+  sh = Shell.cd("/tmp")
+  sh.transact do
+    mkdir "shell-test-1" unless exists?("shell-test-1")
+    cd("shell-test-1")
+    for dir in ["dir1", "dir3", "dir5"]
+      if !exists?(dir)
+	mkdir dir
+	cd(dir) do
+	  f = open("tmpFile", "w")
+	  f.print "TEST\n"
+	  f.close
+	end
+	print pwd
+      end
+    end
+  end
+
+== ex3
+
+  sh.cat("/etc/printcap") | sh.tee("tee1") > "tee2"
+  (sh.cat < "/etc/printcap") | sh.tee("tee11") > "tee12"
+  sh.cat("/etc/printcap") | sh.tee("tee1") >> "tee2"
+  (sh.cat < "/etc/printcap") | sh.tee("tee11") >> "tee12"
+
+== ex4
+
+  print sh.cat("/etc/passwd").head.collect{|l| l =~ /keiju/}
+
+=end
diff --git a/ruby_1_8_6/enum.c b/ruby_1_8_6/enum.c
new file mode 100644
index 0000000000..2a29272ae9
--- /dev/null
+++ b/ruby_1_8_6/enum.c
@@ -0,0 +1,931 @@
+/**********************************************************************
+
+  enum.c -
+
+  $Author$
+  $Date$
+  created at: Fri Oct  1 15:15:19 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "node.h"
+#include "util.h"
+
+VALUE rb_mEnumerable;
+static ID id_each, id_eqq, id_cmp;
+
+VALUE
+rb_each(obj)
+    VALUE obj;
+{
+    return rb_funcall(obj, id_each, 0, 0);
+}
+
+static VALUE
+grep_i(i, arg)
+    VALUE i, *arg;
+{
+    if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
+	rb_ary_push(arg[1], i);
+    }
+    return Qnil;
+}
+
+static VALUE
+grep_iter_i(i, arg)
+    VALUE i, *arg;
+{
+    if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
+	rb_ary_push(arg[1], rb_yield(i));
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.grep(pattern)                   => array
+ *     enum.grep(pattern) {| obj | block }  => array
+ *  
+ *  Returns an array of every element in <i>enum</i> for which
+ *  <code>Pattern === element</code>. If the optional <em>block</em> is
+ *  supplied, each matching element is passed to it, and the block's
+ *  result is stored in the output array.
+ *     
+ *     (1..100).grep 38..44   #=> [38, 39, 40, 41, 42, 43, 44]
+ *     c = IO.constants
+ *     c.grep(/SEEK/)         #=> ["SEEK_END", "SEEK_SET", "SEEK_CUR"]
+ *     res = c.grep(/SEEK/) {|v| IO.const_get(v) }
+ *     res                    #=> [2, 0, 1]
+ *     
+ */
+
+static VALUE
+enum_grep(obj, pat)
+    VALUE obj, pat;
+{
+    VALUE ary = rb_ary_new();
+    VALUE arg[2];
+
+    arg[0] = pat;
+    arg[1] = ary;
+
+    rb_iterate(rb_each, obj, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
+    
+    return ary;
+}
+
+static VALUE
+find_i(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    if (RTEST(rb_yield(i))) {
+	*memo = i;
+	rb_iter_break();
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.detect(ifnone = nil) {| obj | block }  => obj or nil
+ *     enum.find(ifnone = nil)   {| obj | block }  => obj or nil
+ *  
+ *  Passes each entry in <i>enum</i> to <em>block</em>. Returns the
+ *  first for which <em>block</em> is not <code>false</code>.  If no
+ *  object matches, calls <i>ifnone</i> and returns its result when it
+ *  is specified, or returns <code>nil</code>
+ *     
+ *     (1..10).detect  {|i| i % 5 == 0 and i % 7 == 0 }   #=> nil
+ *     (1..100).detect {|i| i % 5 == 0 and i % 7 == 0 }   #=> 35
+ *     
+ */
+
+static VALUE
+enum_find(argc, argv, obj)
+    int argc;
+    VALUE* argv;
+    VALUE obj;
+{
+    VALUE memo = Qundef;
+    VALUE if_none;
+
+    rb_scan_args(argc, argv, "01", &if_none);
+    rb_iterate(rb_each, obj, find_i, (VALUE)&memo);
+    if (memo != Qundef) {
+	return memo;
+    }
+    if (!NIL_P(if_none)) {
+	return rb_funcall(if_none, rb_intern("call"), 0, 0);
+    }
+    return Qnil;
+}
+
+static VALUE
+find_all_i(i, ary)
+    VALUE i, ary;
+{
+    if (RTEST(rb_yield(i))) {
+	rb_ary_push(ary, i);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.find_all {| obj | block }  => array
+ *     enum.select   {| obj | block }  => array
+ *  
+ *  Returns an array containing all elements of <i>enum</i> for which
+ *  <em>block</em> is not <code>false</code> (see also
+ *  <code>Enumerable#reject</code>).
+ *     
+ *     (1..10).find_all {|i|  i % 3 == 0 }   #=> [3, 6, 9]
+ *     
+ */
+
+static VALUE
+enum_find_all(obj)
+    VALUE obj;
+{
+    VALUE ary = rb_ary_new();
+    
+    rb_iterate(rb_each, obj, find_all_i, ary);
+
+    return ary;
+}
+
+static VALUE
+reject_i(i, ary)
+    VALUE i, ary;
+{
+    if (!RTEST(rb_yield(i))) {
+	rb_ary_push(ary, i);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.reject {| obj | block }  => array
+ *  
+ *  Returns an array for all elements of <i>enum</i> for which
+ *  <em>block</em> is false (see also <code>Enumerable#find_all</code>).
+ *     
+ *     (1..10).reject {|i|  i % 3 == 0 }   #=> [1, 2, 4, 5, 7, 8, 10]
+ *     
+ */
+
+static VALUE
+enum_reject(obj)
+    VALUE obj;
+{
+    VALUE ary = rb_ary_new();
+    
+    rb_iterate(rb_each, obj, reject_i, ary);
+
+    return ary;
+}
+
+static VALUE
+collect_i(i, ary)
+    VALUE i, ary;
+{
+    rb_ary_push(ary, rb_yield(i));
+
+    return Qnil;
+}
+
+static VALUE
+collect_all(i, ary)
+    VALUE i, ary;
+{
+    rb_ary_push(ary, i);
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.collect {| obj | block }  => array
+ *     enum.map     {| obj | block }  => array
+ *  
+ *  Returns a new array with the results of running <em>block</em> once
+ *  for every element in <i>enum</i>.
+ *     
+ *     (1..4).collect {|i| i*i }   #=> [1, 4, 9, 16]
+ *     (1..4).collect { "cat"  }   #=> ["cat", "cat", "cat", "cat"]
+ *     
+ */
+
+static VALUE
+enum_collect(obj)
+    VALUE obj;
+{
+    VALUE ary = rb_ary_new();
+
+    rb_iterate(rb_each, obj, rb_block_given_p() ? collect_i : collect_all, ary);
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     enum.to_a      =>    array
+ *     enum.entries   =>    array
+ *  
+ *  Returns an array containing the items in <i>enum</i>.
+ *     
+ *     (1..7).to_a                       #=> [1, 2, 3, 4, 5, 6, 7]
+ *     { 'a'=>1, 'b'=>2, 'c'=>3 }.to_a   #=> [["a", 1], ["b", 2], ["c", 3]]
+ */
+static VALUE
+enum_to_a(obj)
+    VALUE obj;
+{
+    VALUE ary = rb_ary_new();
+
+    rb_iterate(rb_each, obj, collect_all, ary);
+
+    return ary;
+}
+
+static VALUE
+inject_i(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    if (*memo == Qundef) {
+        *memo = i;
+    }
+    else {
+        *memo = rb_yield_values(2, *memo, i);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.inject(initial) {| memo, obj | block }  => obj
+ *     enum.inject          {| memo, obj | block }  => obj
+ *  
+ *  Combines the elements of <i>enum</i> by applying the block to an
+ *  accumulator value (<i>memo</i>) and each element in turn. At each
+ *  step, <i>memo</i> is set to the value returned by the block. The
+ *  first form lets you supply an initial value for <i>memo</i>. The
+ *  second form uses the first element of the collection as a the
+ *  initial value (and skips that element while iterating).
+ *     
+ *     # Sum some numbers
+ *     (5..10).inject {|sum, n| sum + n }              #=> 45
+ *     # Multiply some numbers
+ *     (5..10).inject(1) {|product, n| product * n }   #=> 151200
+ *     
+ *     # find the longest word
+ *     longest = %w{ cat sheep bear }.inject do |memo,word|
+ *        memo.length > word.length ? memo : word
+ *     end
+ *     longest                                         #=> "sheep"
+ *     
+ *     # find the length of the longest word
+ *     longest = %w{ cat sheep bear }.inject(0) do |memo,word|
+ *        memo >= word.length ? memo : word.length
+ *     end
+ *     longest                                         #=> 5
+ *     
+ */
+
+static VALUE
+enum_inject(argc, argv, obj)
+    int argc;
+    VALUE *argv, obj;
+{
+    VALUE memo = Qundef;
+
+    if (rb_scan_args(argc, argv, "01", &memo) == 0)
+	memo = Qundef;
+    rb_iterate(rb_each, obj, inject_i, (VALUE)&memo);
+    if (memo == Qundef) return Qnil;
+    return memo;
+}
+
+static VALUE
+partition_i(i, ary)
+    VALUE i, *ary;
+{
+    if (RTEST(rb_yield(i))) {
+	rb_ary_push(ary[0], i);
+    }
+    else {
+	rb_ary_push(ary[1], i);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.partition {| obj | block }  => [ true_array, false_array ]
+ *  
+ *  Returns two arrays, the first containing the elements of
+ *  <i>enum</i> for which the block evaluates to true, the second
+ *  containing the rest.
+ *     
+ *     (1..6).partition {|i| (i&1).zero?}   #=> [[2, 4, 6], [1, 3, 5]]
+ *     
+ */
+
+static VALUE
+enum_partition(obj)
+    VALUE obj;
+{
+    VALUE ary[2];
+
+    ary[0] = rb_ary_new();
+    ary[1] = rb_ary_new();
+    rb_iterate(rb_each, obj, partition_i, (VALUE)ary);
+
+    return rb_assoc_new(ary[0], ary[1]);
+}
+
+/*
+ *  call-seq:
+ *     enum.sort                     => array
+ *     enum.sort {| a, b | block }   => array
+ *  
+ *  Returns an array containing the items in <i>enum</i> sorted,
+ *  either according to their own <code><=></code> method, or by using
+ *  the results of the supplied block. The block should return -1, 0, or
+ *  +1 depending on the comparison between <i>a</i> and <i>b</i>. As of
+ *  Ruby 1.8, the method <code>Enumerable#sort_by</code> implements a
+ *  built-in Schwartzian Transform, useful when key computation or
+ *  comparison is expensive..
+ *     
+ *     %w(rhea kea flea).sort         #=> ["flea", "kea", "rhea"]
+ *     (1..10).sort {|a,b| b <=> a}   #=> [10, 9, 8, 7, 6, 5, 4, 3, 2, 1]
+ */
+
+static VALUE
+enum_sort(obj)
+    VALUE obj;
+{
+    return rb_ary_sort(enum_to_a(obj));
+}
+
+static VALUE
+sort_by_i(i, ary)
+    VALUE i, ary;
+{
+    VALUE v;
+    NODE *memo;
+
+    v = rb_yield(i);
+    if (RBASIC(ary)->klass) {
+	rb_raise(rb_eRuntimeError, "sort_by reentered");
+    }
+    memo = rb_node_newnode(NODE_MEMO, v, i, 0);
+    rb_ary_push(ary, (VALUE)memo);
+    return Qnil;
+}
+
+static int
+sort_by_cmp(aa, bb)
+    NODE **aa, **bb;
+{
+    VALUE a = aa[0]->u1.value;
+    VALUE b = bb[0]->u1.value;
+
+    return rb_cmpint(rb_funcall(a, id_cmp, 1, b), a, b);
+}
+
+/*
+ *  call-seq:
+ *     enum.sort_by {| obj | block }    => array
+ *  
+ *  Sorts <i>enum</i> using a set of keys generated by mapping the
+ *  values in <i>enum</i> through the given block.
+ *     
+ *     %w{ apple pear fig }.sort_by {|word| word.length}
+                    #=> ["fig", "pear", "apple"]
+ *     
+ *  The current implementation of <code>sort_by</code> generates an
+ *  array of tuples containing the original collection element and the
+ *  mapped value. This makes <code>sort_by</code> fairly expensive when
+ *  the keysets are simple
+ *     
+ *     require 'benchmark'
+ *     include Benchmark
+ *     
+ *     a = (1..100000).map {rand(100000)}
+ *     
+ *     bm(10) do |b|
+ *       b.report("Sort")    { a.sort }
+ *       b.report("Sort by") { a.sort_by {|a| a} }
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     user     system      total        real
+ *     Sort        0.180000   0.000000   0.180000 (  0.175469)
+ *     Sort by     1.980000   0.040000   2.020000 (  2.013586)
+ *     
+ *  However, consider the case where comparing the keys is a non-trivial
+ *  operation. The following code sorts some files on modification time
+ *  using the basic <code>sort</code> method.
+ *     
+ *     files = Dir["*"]
+ *     sorted = files.sort {|a,b| File.new(a).mtime <=> File.new(b).mtime}
+ *     sorted   #=> ["mon", "tues", "wed", "thurs"]
+ *     
+ *  This sort is inefficient: it generates two new <code>File</code>
+ *  objects during every comparison. A slightly better technique is to
+ *  use the <code>Kernel#test</code> method to generate the modification
+ *  times directly.
+ *     
+ *     files = Dir["*"]
+ *     sorted = files.sort { |a,b|
+ *       test(?M, a) <=> test(?M, b)
+ *     }
+ *     sorted   #=> ["mon", "tues", "wed", "thurs"]
+ *     
+ *  This still generates many unnecessary <code>Time</code> objects. A
+ *  more efficient technique is to cache the sort keys (modification
+ *  times in this case) before the sort. Perl users often call this
+ *  approach a Schwartzian Transform, after Randal Schwartz. We
+ *  construct a temporary array, where each element is an array
+ *  containing our sort key along with the filename. We sort this array,
+ *  and then extract the filename from the result.
+ *     
+ *     sorted = Dir["*"].collect { |f|
+ *        [test(?M, f), f]
+ *     }.sort.collect { |f| f[1] }
+ *     sorted   #=> ["mon", "tues", "wed", "thurs"]
+ *     
+ *  This is exactly what <code>sort_by</code> does internally.
+ *     
+ *     sorted = Dir["*"].sort_by {|f| test(?M, f)}
+ *     sorted   #=> ["mon", "tues", "wed", "thurs"]
+ */
+
+static VALUE
+enum_sort_by(obj)
+    VALUE obj;
+{
+    VALUE ary;
+    long i;
+
+    if (TYPE(obj) == T_ARRAY) {
+	ary  = rb_ary_new2(RARRAY(obj)->len);
+    }
+    else {
+	ary = rb_ary_new();
+    }
+    RBASIC(ary)->klass = 0;
+    rb_iterate(rb_each, obj, sort_by_i, ary);
+    if (RARRAY(ary)->len > 1) {
+	qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE), sort_by_cmp, 0);
+    }
+    if (RBASIC(ary)->klass) {
+	rb_raise(rb_eRuntimeError, "sort_by reentered");
+    }
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	RARRAY(ary)->ptr[i] = RNODE(RARRAY(ary)->ptr[i])->u2.value;
+    }
+    RBASIC(ary)->klass = rb_cArray;
+    return ary;
+}
+
+static VALUE
+all_iter_i(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    if (!RTEST(rb_yield(i))) {
+	*memo = Qfalse;
+	rb_iter_break();
+    }
+    return Qnil;
+}
+
+static VALUE
+all_i(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    if (!RTEST(i)) {
+	*memo = Qfalse;
+	rb_iter_break();
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.all? [{|obj| block } ]   => true or false
+ *  
+ *  Passes each element of the collection to the given block. The method
+ *  returns <code>true</code> if the block never returns
+ *  <code>false</code> or <code>nil</code>. If the block is not given,
+ *  Ruby adds an implicit block of <code>{|obj| obj}</code> (that is
+ *  <code>all?</code> will return <code>true</code> only if none of the
+ *  collection members are <code>false</code> or <code>nil</code>.)
+ *     
+ *     %w{ ant bear cat}.all? {|word| word.length >= 3}   #=> true
+ *     %w{ ant bear cat}.all? {|word| word.length >= 4}   #=> false
+ *     [ nil, true, 99 ].all?                             #=> false
+ *     
+ */
+
+static VALUE
+enum_all(obj)
+    VALUE obj;
+{
+    VALUE result = Qtrue;
+
+    rb_iterate(rb_each, obj, rb_block_given_p() ? all_iter_i : all_i, (VALUE)&result);
+    return result;
+}
+
+static VALUE
+any_iter_i(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    if (RTEST(rb_yield(i))) {
+	*memo = Qtrue;
+	rb_iter_break();
+    }
+    return Qnil;
+}
+
+static VALUE
+any_i(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    if (RTEST(i)) {
+	*memo = Qtrue;
+	rb_iter_break();
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.any? [{|obj| block } ]   => true or false
+ *  
+ *  Passes each element of the collection to the given block. The method
+ *  returns <code>true</code> if the block ever returns a value other
+ *  than <code>false</code> or <code>nil</code>. If the block is not
+ *  given, Ruby adds an implicit block of <code>{|obj| obj}</code> (that
+ *  is <code>any?</code> will return <code>true</code> if at least one
+ *  of the collection members is not <code>false</code> or
+ *  <code>nil</code>.
+ *     
+ *     %w{ ant bear cat}.any? {|word| word.length >= 3}   #=> true
+ *     %w{ ant bear cat}.any? {|word| word.length >= 4}   #=> true
+ *     [ nil, true, 99 ].any?                             #=> true
+ *     
+ */
+
+static VALUE
+enum_any(obj)
+    VALUE obj;
+{
+    VALUE result = Qfalse;
+
+    rb_iterate(rb_each, obj, rb_block_given_p() ? any_iter_i : any_i, (VALUE)&result);
+    return result;
+}
+
+static VALUE
+min_i(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    VALUE cmp;
+
+    if (*memo == Qundef) {
+	*memo = i;
+    }
+    else {
+	cmp = rb_funcall(i, id_cmp, 1, *memo);
+	if (rb_cmpint(cmp, i, *memo) < 0) {
+	    *memo = i;
+	}
+    }
+    return Qnil;
+}
+
+static VALUE
+min_ii(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    VALUE cmp;
+
+    if (*memo == Qundef) {
+	*memo = i;
+    }
+    else {
+	cmp = rb_yield_values(2, i, *memo);
+	if (rb_cmpint(cmp, i, *memo) < 0) {
+	    *memo = i;
+	}
+    }
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     enum.min                    => obj
+ *     enum.min {| a,b | block }   => obj
+ *  
+ *  Returns the object in <i>enum</i> with the minimum value. The
+ *  first form assumes all objects implement <code>Comparable</code>;
+ *  the second uses the block to return <em>a <=> b</em>.
+ *     
+ *     a = %w(albatross dog horse)
+ *     a.min                                  #=> "albatross"
+ *     a.min {|a,b| a.length <=> b.length }   #=> "dog"
+ */
+
+static VALUE
+enum_min(obj)
+    VALUE obj;
+{
+    VALUE result = Qundef;
+
+    rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)&result);
+    if (result == Qundef) return Qnil;
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     enum.max                    => obj
+ *     enum.max {| a,b | block }   => obj
+ *  
+ *  Returns the object in <i>enum</i> with the maximum value. The
+ *  first form assumes all objects implement <code>Comparable</code>;
+ *  the second uses the block to return <em>a <=> b</em>.
+ *     
+ *     a = %w(albatross dog horse)
+ *     a.max                                  #=> "horse"
+ *     a.max {|a,b| a.length <=> b.length }   #=> "albatross"
+ */
+
+static VALUE
+max_i(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    VALUE cmp;
+
+    if (*memo == Qundef) {
+	*memo = i;
+    }
+    else {
+	cmp = rb_funcall(i, id_cmp, 1, *memo);
+	if (rb_cmpint(cmp, i, *memo) > 0) {
+	    *memo = i;
+	}
+    }
+    return Qnil;
+}
+
+static VALUE
+max_ii(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    VALUE cmp;
+
+    if (*memo == Qundef) {
+	*memo = i;
+    }
+    else {
+	cmp = rb_yield_values(2, i, *memo);
+	if (rb_cmpint(cmp, i, *memo) > 0) {
+	    *memo = i;
+	}
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.max                   => obj
+ *     enum.max {|a,b| block }    => obj
+ *  
+ *  Returns the object in _enum_ with the maximum value. The
+ *  first form assumes all objects implement <code>Comparable</code>;
+ *  the second uses the block to return <em>a <=> b</em>.
+ *     
+ *     a = %w(albatross dog horse)
+ *     a.max                                  #=> "horse"
+ *     a.max {|a,b| a.length <=> b.length }   #=> "albatross"
+ */  
+
+static VALUE
+enum_max(obj)
+    VALUE obj;
+{
+    VALUE result = Qundef;
+
+    rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)&result);
+    if (result == Qundef) return Qnil;
+    return result;
+}
+
+static VALUE
+member_i(item, memo)
+    VALUE item;
+    VALUE *memo;
+{
+    if (rb_equal(item, memo[0])) {
+	memo[1] = Qtrue;
+	rb_iter_break();
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.include?(obj)     => true or false
+ *     enum.member?(obj)      => true or false
+ *  
+ *  Returns <code>true</code> if any member of <i>enum</i> equals
+ *  <i>obj</i>. Equality is tested using <code>==</code>.
+ *     
+ *     IO.constants.include? "SEEK_SET"          #=> true
+ *     IO.constants.include? "SEEK_NO_FURTHER"   #=> false
+ *     
+ */
+
+static VALUE
+enum_member(obj, val)
+    VALUE obj, val;
+{
+    VALUE memo[2];
+
+    memo[0] = val;
+    memo[1] = Qfalse;
+    rb_iterate(rb_each, obj, member_i, (VALUE)memo);
+    return memo[1];
+}
+
+static VALUE
+each_with_index_i(val, memo)
+    VALUE val;
+    VALUE *memo;
+{
+    rb_yield_values(2, val, INT2FIX(*memo));
+    ++*memo;
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.each_with_index {|obj, i| block }  -> enum
+ *  
+ *  Calls <em>block</em> with two arguments, the item and its index, for
+ *  each item in <i>enum</i>.
+ *     
+ *     hash = Hash.new
+ *     %w(cat dog wombat).each_with_index {|item, index|
+ *       hash[item] = index
+ *     }
+ *     hash   #=> {"cat"=>0, "wombat"=>2, "dog"=>1}
+ *     
+ */
+
+static VALUE
+enum_each_with_index(obj)
+    VALUE obj;
+{
+    VALUE memo = 0;
+
+    rb_need_block();
+    rb_iterate(rb_each, obj, each_with_index_i, (VALUE)&memo);
+    return obj;
+}
+
+static VALUE
+zip_i(val, memo)
+    VALUE val;
+    VALUE *memo;
+{
+    VALUE result = memo[0];
+    VALUE args = memo[1];
+    int idx = memo[2]++;
+    VALUE tmp;
+    int i;
+
+    tmp = rb_ary_new2(RARRAY(args)->len + 1);
+    rb_ary_store(tmp, 0, val);
+    for (i=0; i<RARRAY(args)->len; i++) {
+	rb_ary_push(tmp, rb_ary_entry(RARRAY(args)->ptr[i], idx));
+    }
+    if (rb_block_given_p()) {
+	rb_yield(tmp);
+    }
+    else {
+	rb_ary_push(result, tmp);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     enum.zip(arg, ...)                   => array
+ *     enum.zip(arg, ...) {|arr| block }    => nil
+ *  
+ *  Converts any arguments to arrays, then merges elements of
+ *  <i>enum</i> with corresponding elements from each argument. This
+ *  generates a sequence of <code>enum#size</code> <em>n</em>-element
+ *  arrays, where <em>n</em> is one more that the count of arguments. If
+ *  the size of any argument is less than <code>enum#size</code>,
+ *  <code>nil</code> values are supplied. If a block given, it is
+ *  invoked for each output array, otherwise an array of arrays is
+ *  returned.
+ *     
+ *     a = [ 4, 5, 6 ]
+ *     b = [ 7, 8, 9 ]
+ *     
+ *     (1..3).zip(a, b)      #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
+ *     "cat\ndog".zip([1])   #=> [["cat\n", 1], ["dog", nil]]
+ *     (1..3).zip            #=> [[1], [2], [3]]
+ *     
+ */
+
+static VALUE
+enum_zip(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    int i;
+    VALUE result;
+    VALUE memo[3];
+
+    for (i=0; i<argc; i++) {
+	argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_a");
+    }
+    result = rb_block_given_p() ? Qnil : rb_ary_new();
+    memo[0] = result;
+    memo[1] = rb_ary_new4(argc, argv);
+    memo[2] = 0;
+    rb_iterate(rb_each, obj, zip_i, (VALUE)memo);
+
+    return result;
+}
+
+/*
+ *  The <code>Enumerable</code> mixin provides collection classes with
+ *  several traversal and searching methods, and with the ability to
+ *  sort. The class must provide a method <code>each</code>, which
+ *  yields successive members of the collection. If
+ *  <code>Enumerable#max</code>, <code>#min</code>, or
+ *  <code>#sort</code> is used, the objects in the collection must also
+ *  implement a meaningful <code><=></code> operator, as these methods
+ *  rely on an ordering between members of the collection.
+ */
+
+void
+Init_Enumerable()
+{
+    rb_mEnumerable = rb_define_module("Enumerable");
+
+    rb_define_method(rb_mEnumerable,"to_a", enum_to_a, 0);
+    rb_define_method(rb_mEnumerable,"entries", enum_to_a, 0);
+
+    rb_define_method(rb_mEnumerable,"sort", enum_sort, 0);
+    rb_define_method(rb_mEnumerable,"sort_by", enum_sort_by, 0);
+    rb_define_method(rb_mEnumerable,"grep", enum_grep, 1);
+    rb_define_method(rb_mEnumerable,"find", enum_find, -1);
+    rb_define_method(rb_mEnumerable,"detect", enum_find, -1);
+    rb_define_method(rb_mEnumerable,"find_all", enum_find_all, 0);
+    rb_define_method(rb_mEnumerable,"select", enum_find_all, 0);
+    rb_define_method(rb_mEnumerable,"reject", enum_reject, 0);
+    rb_define_method(rb_mEnumerable,"collect", enum_collect, 0);
+    rb_define_method(rb_mEnumerable,"map", enum_collect, 0);
+    rb_define_method(rb_mEnumerable,"inject", enum_inject, -1);
+    rb_define_method(rb_mEnumerable,"partition", enum_partition, 0);
+    rb_define_method(rb_mEnumerable,"all?", enum_all, 0);
+    rb_define_method(rb_mEnumerable,"any?", enum_any, 0);
+    rb_define_method(rb_mEnumerable,"min", enum_min, 0);
+    rb_define_method(rb_mEnumerable,"max", enum_max, 0);
+    rb_define_method(rb_mEnumerable,"member?", enum_member, 1);
+    rb_define_method(rb_mEnumerable,"include?", enum_member, 1);
+    rb_define_method(rb_mEnumerable,"each_with_index", enum_each_with_index, 0);
+    rb_define_method(rb_mEnumerable, "zip", enum_zip, -1);
+
+    id_eqq  = rb_intern("===");
+    id_each = rb_intern("each");
+    id_cmp  = rb_intern("<=>");
+}
+
diff --git a/ruby_1_8_6/env.h b/ruby_1_8_6/env.h
new file mode 100644
index 0000000000..c50103f71e
--- /dev/null
+++ b/ruby_1_8_6/env.h
@@ -0,0 +1,60 @@
+/**********************************************************************
+
+  env.h -
+
+  $Author$
+  $Date$
+  created at: Mon Jul 11 11:53:03 JST 1994
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef ENV_H
+#define ENV_H
+
+extern struct FRAME {
+    VALUE self;
+    int argc;
+    ID last_func;
+    ID orig_func;
+    VALUE last_class;
+    struct FRAME *prev;
+    struct FRAME *tmp;
+    struct RNode *node;
+    int iter;
+    int flags;
+    unsigned long uniq;
+} *ruby_frame;
+
+void rb_gc_mark_frame _((struct FRAME *));
+
+#define FRAME_DMETH  1
+#define FRAME_FUNC   2
+
+extern struct SCOPE {
+    struct RBasic super;
+    ID *local_tbl;
+    VALUE *local_vars;
+    int flags;
+} *ruby_scope;
+
+#define SCOPE_ALLOCA  0
+#define SCOPE_MALLOC  1
+#define SCOPE_NOSTACK 2
+#define SCOPE_DONT_RECYCLE 4
+#define SCOPE_CLONE   8
+
+extern int ruby_in_eval;
+
+extern VALUE ruby_class;
+
+struct RVarmap {
+    struct RBasic super;
+    ID id;
+    VALUE val;
+    struct RVarmap *next;
+};
+extern struct RVarmap *ruby_dyna_vars;
+
+#endif /* ENV_H */
diff --git a/ruby_1_8_6/error.c b/ruby_1_8_6/error.c
new file mode 100644
index 0000000000..608d1fa558
--- /dev/null
+++ b/ruby_1_8_6/error.c
@@ -0,0 +1,1566 @@
+/**********************************************************************
+
+  error.c -
+
+  $Author$
+  $Date$
+  created at: Mon Aug  9 16:11:34 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "env.h"
+#include "st.h"
+
+#include <stdio.h>
+#ifdef HAVE_STDARG_PROTOTYPES
+#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+
+extern const char ruby_version[], ruby_release_date[], ruby_platform[];
+
+int ruby_nerrs;
+
+static int
+err_position(buf, len)
+    char *buf;
+    long len;
+{
+    ruby_set_current_source();
+    if (!ruby_sourcefile) {
+	return 0;
+    }
+    else if (ruby_sourceline == 0) {
+	return snprintf(buf, len, "%s: ", ruby_sourcefile);
+    }
+    else {
+	return snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline);
+    }
+}
+
+static void
+err_snprintf(buf, len, fmt, args)
+    char *buf;
+    long len;
+    const char *fmt;
+    va_list args;
+{
+    long n;
+
+    n = err_position(buf, len);
+    if (len > n) {
+	vsnprintf((char*)buf+n, len-n, fmt, args);
+    }
+}
+
+static void err_append _((const char*));
+static void
+err_print(fmt, args)
+    const char *fmt;
+    va_list args;
+{
+    char buf[BUFSIZ];
+
+    err_snprintf(buf, BUFSIZ, fmt, args);
+    err_append(buf);
+}
+
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_compile_error(const char *fmt, ...)
+#else
+rb_compile_error(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
+{
+    va_list args;
+
+    va_init_list(args, fmt);
+    err_print(fmt, args);
+    va_end(args);
+    ruby_nerrs++;
+}
+
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_compile_error_append(const char *fmt, ...)
+#else
+rb_compile_error_append(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
+{
+    va_list args;
+    char buf[BUFSIZ];
+
+    va_init_list(args, fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
+    va_end(args);
+    err_append(buf);
+}
+
+static void
+warn_print(fmt, args)
+    const char *fmt;
+    va_list args;
+{
+    char buf[BUFSIZ];
+    int len;
+
+    err_snprintf(buf, BUFSIZ, fmt, args);
+    len = strlen(buf);
+    buf[len++] = '\n';
+    rb_write_error2(buf, len);
+}
+
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_warn(const char *fmt, ...)
+#else
+rb_warn(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
+{
+    char buf[BUFSIZ];
+    va_list args;
+
+    if (NIL_P(ruby_verbose)) return;
+
+    snprintf(buf, BUFSIZ, "warning: %s", fmt);
+
+    va_init_list(args, fmt);
+    warn_print(buf, args);
+    va_end(args);
+}
+
+/* rb_warning() reports only in verbose mode */
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_warning(const char *fmt, ...)
+#else
+rb_warning(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
+{
+    char buf[BUFSIZ];
+    va_list args;
+
+    if (!RTEST(ruby_verbose)) return;
+
+    snprintf(buf, BUFSIZ, "warning: %s", fmt);
+
+    va_init_list(args, fmt);
+    warn_print(buf, args);
+    va_end(args);
+}
+
+/*
+ * call-seq:
+ *    warn(msg)   => nil
+ *
+ * Display the given message (followed by a newline) on STDERR unless
+ * warnings are disabled (for example with the <code>-W0</code> flag).
+ */
+
+static VALUE
+rb_warn_m(self, mesg)
+    VALUE self, mesg;
+{
+    if (!NIL_P(ruby_verbose)) {
+	rb_io_write(rb_stderr, mesg);
+	rb_io_write(rb_stderr, rb_default_rs);
+    }
+    return Qnil;
+}
+
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_bug(const char *fmt, ...)
+#else
+rb_bug(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
+{
+    char buf[BUFSIZ];
+    va_list args;
+    FILE *out = stderr;
+    int len = err_position(buf, BUFSIZ);
+
+    if (fwrite(buf, 1, len, out) == len ||
+	fwrite(buf, 1, len, (out = stdout)) == len) {
+	fputs("[BUG] ", out);
+	va_init_list(args, fmt);
+	vfprintf(out, fmt, args);
+	va_end(args);
+	fprintf(out, "\nruby %s (%s) [%s]\n\n",
+		ruby_version, ruby_release_date, ruby_platform);
+    }
+    abort();
+}
+
+static struct types {
+    int type;
+    const char *name;
+} builtin_types[] = {
+    {T_NIL,	"nil"},
+    {T_OBJECT,	"Object"},
+    {T_CLASS,	"Class"},
+    {T_ICLASS,	"iClass"},	/* internal use: mixed-in module holder */
+    {T_MODULE,	"Module"},
+    {T_FLOAT,	"Float"},
+    {T_STRING,	"String"},
+    {T_REGEXP,	"Regexp"},
+    {T_ARRAY,	"Array"},
+    {T_FIXNUM,	"Fixnum"},
+    {T_HASH,	"Hash"},
+    {T_STRUCT,	"Struct"},
+    {T_BIGNUM,	"Bignum"},
+    {T_FILE,	"File"},
+    {T_TRUE,	"true"},
+    {T_FALSE,	"false"},
+    {T_SYMBOL,	"Symbol"},	/* :symbol */
+    {T_DATA,	"Data"},	/* internal use: wrapped C pointers */
+    {T_MATCH,	"MatchData"},	/* data of $~ */
+    {T_VARMAP,	"Varmap"},	/* internal use: dynamic variables */
+    {T_SCOPE,	"Scope"},	/* internal use: variable scope */
+    {T_NODE,	"Node"},	/* internal use: syntax tree node */
+    {T_UNDEF,	"undef"},	/* internal use: #undef; should not happen */
+    {-1,	0}
+};
+
+void
+rb_check_type(x, t)
+    VALUE x;
+    int t;
+{
+    struct types *type = builtin_types;
+
+    if (x == Qundef) {
+	rb_bug("undef leaked to the Ruby space");
+    }
+
+    if (TYPE(x) != t) {
+	while (type->type >= 0) {
+	    if (type->type == t) {
+		char *etype;
+
+		if (NIL_P(x)) {
+		    etype = "nil";
+		}
+		else if (FIXNUM_P(x)) {
+		    etype = "Fixnum";
+		}
+		else if (SYMBOL_P(x)) {
+		    etype = "Symbol";
+		}
+		else if (rb_special_const_p(x)) {
+		    etype = RSTRING(rb_obj_as_string(x))->ptr;
+		}
+		else {
+		    etype = rb_obj_classname(x);
+		}
+		rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
+			 etype, type->name);
+	    }
+	    type++;
+	}
+	rb_bug("unknown type 0x%x", t);
+    }
+}
+
+/* exception classes */
+#include <errno.h>
+
+VALUE rb_eException;
+VALUE rb_eSystemExit;
+VALUE rb_eInterrupt;
+VALUE rb_eSignal;
+VALUE rb_eFatal;
+VALUE rb_eStandardError;
+VALUE rb_eRuntimeError;
+VALUE rb_eTypeError;
+VALUE rb_eArgError;
+VALUE rb_eIndexError;
+VALUE rb_eRangeError;
+VALUE rb_eNameError;
+VALUE rb_eNoMethodError;
+VALUE rb_eSecurityError;
+VALUE rb_eNotImpError;
+VALUE rb_eNoMemError;
+VALUE rb_cNameErrorMesg;
+
+VALUE rb_eScriptError;
+VALUE rb_eSyntaxError;
+VALUE rb_eLoadError;
+
+VALUE rb_eSystemCallError;
+VALUE rb_mErrno;
+
+VALUE
+rb_exc_new(etype, ptr, len)
+    VALUE etype;
+    const char *ptr;
+    long len;
+{
+    return rb_funcall(etype, rb_intern("new"), 1, rb_str_new(ptr, len));
+}
+
+VALUE
+rb_exc_new2(etype, s)
+    VALUE etype;
+    const char *s;
+{
+    return rb_exc_new(etype, s, strlen(s));
+}
+
+VALUE
+rb_exc_new3(etype, str)
+    VALUE etype, str;
+{
+    StringValue(str);
+    return rb_exc_new(etype, RSTRING(str)->ptr, RSTRING(str)->len);
+}
+
+/*
+ * call-seq:
+ *    Exception.new(msg = nil)   =>  exception
+ *
+ *  Construct a new Exception object, optionally passing in 
+ *  a message.
+ */
+
+static VALUE
+exc_initialize(argc, argv, exc)
+    int argc;
+    VALUE *argv;
+    VALUE exc;
+{
+    VALUE arg;
+
+    rb_scan_args(argc, argv, "01", &arg);
+    rb_iv_set(exc, "mesg", arg);
+    rb_iv_set(exc, "bt", Qnil);
+
+    return exc;
+}
+
+/*
+ *  Document-method: exception
+ *
+ *  call-seq:
+ *     exc.exception(string) -> an_exception or exc
+ *  
+ *  With no argument, or if the argument is the same as the receiver,
+ *  return the receiver. Otherwise, create a new
+ *  exception object of the same class as the receiver, but with a
+ *  message equal to <code>string.to_str</code>.
+ *     
+ */
+
+static VALUE
+exc_exception(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE exc;
+
+    if (argc == 0) return self;
+    if (argc == 1 && self == argv[0]) return self;
+    exc = rb_obj_clone(self);
+    exc_initialize(argc, argv, exc);
+
+    return exc;
+}
+
+/*
+ * call-seq:
+ *   exception.to_s   =>  string
+ *
+ * Returns exception's message (or the name of the exception if
+ * no message is set).
+ */
+
+static VALUE
+exc_to_s(exc)
+    VALUE exc;
+{
+    VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
+
+    if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
+    if (OBJ_TAINTED(exc)) OBJ_TAINT(mesg);
+    return mesg;
+}
+
+/*
+ * call-seq:
+ *   exception.message   =>  string
+ *   exception.to_str    =>  string
+ *
+ * Returns the result of invoking <code>exception.to_s</code>.
+ * Normally this returns the exception's message or name. By
+ * supplying a to_str method, exceptions are agreeing to
+ * be used where Strings are expected.
+ */
+
+static VALUE
+exc_to_str(exc)
+    VALUE exc;
+{
+    return rb_funcall(exc, rb_intern("to_s"), 0, 0);
+}
+
+/*
+ * call-seq:
+ *   exception.inspect   => string
+ *
+ * Return this exception's class name an message
+ */
+
+static VALUE
+exc_inspect(exc)
+    VALUE exc;
+{
+    VALUE str, klass;
+
+    klass = CLASS_OF(exc);
+    exc = rb_obj_as_string(exc);
+    if (RSTRING(exc)->len == 0) {
+	return rb_str_dup(rb_class_name(klass));
+    }
+
+    str = rb_str_buf_new2("#<");
+    klass = rb_class_name(klass);
+    rb_str_buf_append(str, klass);
+    rb_str_buf_cat(str, ": ", 2);
+    rb_str_buf_append(str, exc);
+    rb_str_buf_cat(str, ">", 1);
+
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     exception.backtrace    => array
+ *  
+ *  Returns any backtrace associated with the exception. The backtrace
+ *  is an array of strings, each containing either ``filename:lineNo: in
+ *  `method''' or ``filename:lineNo.''
+ *     
+ *     def a
+ *       raise "boom"
+ *     end
+ *     
+ *     def b
+ *       a()
+ *     end
+ *     
+ *     begin
+ *       b()
+ *     rescue => detail
+ *       print detail.backtrace.join("\n")
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     prog.rb:2:in `a'
+ *     prog.rb:6:in `b'
+ *     prog.rb:10
+*/
+
+static VALUE
+exc_backtrace(exc)
+    VALUE exc;
+{
+    static ID bt;
+
+    if (!bt) bt = rb_intern("bt");
+    return rb_attr_get(exc, bt);
+}
+
+VALUE
+rb_check_backtrace(bt)
+    VALUE bt;
+{
+    long i;
+    static char *err = "backtrace must be Array of String";
+
+    if (!NIL_P(bt)) {
+	int t = TYPE(bt);
+
+	if (t == T_STRING) return rb_ary_new3(1, bt);
+	if (t != T_ARRAY) {
+	    rb_raise(rb_eTypeError, err);
+	}
+	for (i=0;i<RARRAY(bt)->len;i++) {
+	    if (TYPE(RARRAY(bt)->ptr[i]) != T_STRING) {
+		rb_raise(rb_eTypeError, err);
+	    }
+	}
+    }
+    return bt;
+}
+
+/*
+ *  call-seq:
+ *     exc.set_backtrace(array)   =>  array
+ *  
+ *  Sets the backtrace information associated with <i>exc</i>. The
+ *  argument must be an array of <code>String</code> objects in the
+ *  format described in <code>Exception#backtrace</code>.
+ *     
+ */
+
+static VALUE
+exc_set_backtrace(exc, bt)
+    VALUE exc;
+    VALUE bt;
+{
+    return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
+}
+
+/*
+ * call-seq:
+ *   SystemExit.new(status=0)   => system_exit
+ *
+ * Create a new +SystemExit+ exception with the given status.
+ */
+
+static VALUE
+exit_initialize(argc, argv, exc)
+    int argc;
+    VALUE *argv;
+    VALUE exc;
+{
+    VALUE status = INT2FIX(EXIT_SUCCESS);
+    if (argc > 0 && FIXNUM_P(argv[0])) {
+	status = *argv++;
+	--argc;
+    }
+    rb_call_super(argc, argv);
+    rb_iv_set(exc, "status", status);
+    return exc;
+}
+
+
+/*
+ * call-seq:
+ *   system_exit.status   => fixnum
+ *
+ * Return the status value associated with this system exit.
+ */
+
+static VALUE
+exit_status(exc)
+    VALUE exc;
+{
+    return rb_attr_get(exc, rb_intern("status"));
+}
+
+
+/*
+ * call-seq:
+ *   system_exit.success?  => true or false
+ *
+ * Returns +true+ if exiting successful, +false+ if not.
+ */
+
+static VALUE
+exit_success_p(exc)
+    VALUE exc;
+{
+    VALUE status = rb_attr_get(exc, rb_intern("status"));
+    if (NIL_P(status)) return Qtrue;
+    if (status == INT2FIX(EXIT_SUCCESS)) return Qtrue;
+    return Qfalse;
+}
+
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_name_error(ID id, const char *fmt, ...)
+#else
+rb_name_error(id, fmt, va_alist)
+    ID id;
+    const char *fmt;
+    va_dcl
+#endif
+{
+    VALUE exc, argv[2];
+    va_list args;
+    char buf[BUFSIZ];
+
+    va_init_list(args, fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
+    va_end(args);
+
+    argv[0] = rb_str_new2(buf);
+    argv[1] = ID2SYM(id);
+    exc = rb_class_new_instance(2, argv, rb_eNameError);
+    rb_exc_raise(exc);
+}
+
+/*
+ * call-seq:
+ *   NameError.new(msg [, name])  => name_error
+ *
+ * Construct a new NameError exception. If given the <i>name</i>
+ * parameter may subsequently be examined using the <code>NameError.name</code>
+ * method.
+ */
+
+static VALUE
+name_err_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE name;
+
+    name = (argc > 1) ? argv[--argc] : Qnil;
+    rb_call_super(argc, argv);
+    rb_iv_set(self, "name", name);
+    return self;
+}
+
+/*
+ *  call-seq:
+ *    name_error.name    =>  string or nil
+ *
+ *  Return the name associated with this NameError exception.
+ */
+
+static VALUE
+name_err_name(self)
+    VALUE self;
+{
+    return rb_attr_get(self, rb_intern("name"));
+}
+
+/*
+ * call-seq:
+ *  name_error.to_s   => string
+ *
+ * Produce a nicely-formated string representing the +NameError+.
+ */
+
+static VALUE
+name_err_to_s(exc)
+    VALUE exc;
+{
+    VALUE mesg = rb_attr_get(exc, rb_intern("mesg")), str = mesg;
+
+    if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
+    StringValue(str);
+    if (str != mesg) {
+	rb_iv_set(exc, "mesg", mesg = str);
+    }
+    if (OBJ_TAINTED(exc)) OBJ_TAINT(mesg);
+    return mesg;
+}
+
+/*
+ * call-seq:
+ *   NoMethodError.new(msg, name [, args])  => no_method_error
+ *
+ * Construct a NoMethodError exception for a method of the given name
+ * called with the given arguments. The name may be accessed using
+ * the <code>#name</code> method on the resulting object, and the
+ * arguments using the <code>#args</code> method.
+ */
+
+static VALUE
+nometh_err_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE args = (argc > 2) ? argv[--argc] : Qnil;
+    name_err_initialize(argc, argv, self);
+    rb_iv_set(self, "args", args);
+    return self;
+}
+
+/* :nodoc: */
+static void
+name_err_mesg_mark(ptr)
+    VALUE *ptr;
+{
+    rb_gc_mark_locations(ptr, ptr+3);
+}
+
+/* :nodoc: */
+static VALUE
+name_err_mesg_new(obj, mesg, recv, method)
+    VALUE obj, mesg, recv, method;
+{
+    VALUE *ptr = ALLOC_N(VALUE, 3);
+
+    ptr[0] = mesg;
+    ptr[1] = recv;
+    ptr[2] = method;
+    return Data_Wrap_Struct(rb_cNameErrorMesg, name_err_mesg_mark, -1, ptr);
+}
+
+/* :nodoc: */
+static VALUE
+name_err_mesg_to_str(obj)
+    VALUE obj;
+{
+    VALUE *ptr, mesg;
+    Data_Get_Struct(obj, VALUE, ptr);
+
+    mesg = ptr[0];
+    if (NIL_P(mesg)) return Qnil;
+    else {
+	char *desc = 0;
+	VALUE d = 0, args[3];
+
+	obj = ptr[1];
+	switch (TYPE(obj)) {
+	  case T_NIL:
+	    desc = "nil";
+	    break;
+	  case T_TRUE:
+	    desc = "true";
+	    break;
+	  case T_FALSE:
+	    desc = "false";
+	    break;
+	  default:
+	    d = rb_protect(rb_inspect, obj, 0);
+	    if (NIL_P(d) || RSTRING(d)->len > 65) {
+		d = rb_any_to_s(obj);
+	    }
+	    desc = RSTRING(d)->ptr;
+	    break;
+	}
+	if (desc && desc[0] != '#') {
+	    d = rb_str_new2(desc);
+	    rb_str_cat2(d, ":");
+	    rb_str_cat2(d, rb_obj_classname(obj));
+	}
+	args[0] = mesg;
+	args[1] = ptr[2];
+	args[2] = d;
+	mesg = rb_f_sprintf(3, args);
+    }
+    if (OBJ_TAINTED(obj)) OBJ_TAINT(mesg);
+    return mesg;
+}
+
+/* :nodoc: */
+static VALUE
+name_err_mesg_load(klass, str)
+    VALUE klass, str;
+{
+    return str;
+}
+
+/*
+ * call-seq:
+ *   no_method_error.args  => obj
+ *
+ * Return the arguments passed in as the third parameter to
+ * the constructor.
+ */
+
+static VALUE
+nometh_err_args(self)
+    VALUE self;
+{
+    return rb_attr_get(self, rb_intern("args"));
+}
+
+void
+rb_invalid_str(str, type)
+    const char *str, *type;
+{
+    VALUE s = rb_str_inspect(rb_str_new2(str));
+
+    rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING(s)->ptr);
+}
+
+/* 
+ *  Document-module: Errno
+ *
+ *  Ruby exception objects are subclasses of <code>Exception</code>.
+ *  However, operating systems typically report errors using plain
+ *  integers. Module <code>Errno</code> is created dynamically to map
+ *  these operating system errors to Ruby classes, with each error
+ *  number generating its own subclass of <code>SystemCallError</code>.
+ *  As the subclass is created in module <code>Errno</code>, its name
+ *  will start <code>Errno::</code>.
+ *     
+ *  The names of the <code>Errno::</code> classes depend on
+ *  the environment in which Ruby runs. On a typical Unix or Windows
+ *  platform, there are <code>Errno</code> classes such as
+ *  <code>Errno::EACCES</code>, <code>Errno::EAGAIN</code>,
+ *  <code>Errno::EINTR</code>, and so on.
+ *     
+ *  The integer operating system error number corresponding to a
+ *  particular error is available as the class constant
+ *  <code>Errno::</code><em>error</em><code>::Errno</code>.
+ *     
+ *     Errno::EACCES::Errno   #=> 13
+ *     Errno::EAGAIN::Errno   #=> 11
+ *     Errno::EINTR::Errno    #=> 4
+ *     
+ *  The full list of operating system errors on your particular platform
+ *  are available as the constants of <code>Errno</code>.
+ *
+ *     Errno.constants   #=> E2BIG, EACCES, EADDRINUSE, EADDRNOTAVAIL, ...
+ */
+
+static st_table *syserr_tbl;
+
+static VALUE
+set_syserr(n, name)
+    int n;
+    const char *name;
+{
+    VALUE error;
+
+    if (!st_lookup(syserr_tbl, n, &error)) {
+	error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError);
+	rb_define_const(error, "Errno", INT2NUM(n));
+	st_add_direct(syserr_tbl, n, error);
+    }
+    else {
+	rb_define_const(rb_mErrno, name, error);
+    }
+    return error;
+}
+
+static VALUE
+get_syserr(n)
+    int n;
+{
+    VALUE error;
+
+    if (!st_lookup(syserr_tbl, n, &error)) {
+	char name[8];	/* some Windows' errno have 5 digits. */
+
+	snprintf(name, sizeof(name), "E%03d", n);
+	error = set_syserr(n, name);
+    }
+    return error;
+}
+
+/*
+ * call-seq:
+ *   SystemCallError.new(msg, errno)  => system_call_error_subclass
+ *
+ * If _errno_ corresponds to a known system error code, constructs
+ * the appropriate <code>Errno</code> class for that error, otherwise
+ * constructs a generic <code>SystemCallError</code> object. The
+ * error number is subsequently available via the <code>errno</code>
+ * method.
+ */
+
+static VALUE
+syserr_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+#if !defined(_WIN32) && !defined(__VMS)
+    char *strerror();
+#endif
+    char *err;
+    VALUE mesg, error;
+    VALUE klass = rb_obj_class(self);
+
+    if (klass == rb_eSystemCallError) {
+	rb_scan_args(argc, argv, "11", &mesg, &error);
+	if (argc == 1 && FIXNUM_P(mesg)) {
+	    error = mesg; mesg = Qnil;
+	}
+	if (!NIL_P(error) && st_lookup(syserr_tbl, NUM2LONG(error), &klass)) {
+	    /* change class */
+	    if (TYPE(self) != T_OBJECT) { /* insurance to avoid type crash */
+		rb_raise(rb_eTypeError, "invalid instance type");
+	    }
+	    RBASIC(self)->klass = klass;
+	}
+    }
+    else {
+	rb_scan_args(argc, argv, "01", &mesg);
+	error = rb_const_get(klass, rb_intern("Errno"));
+    }
+    if (!NIL_P(error)) err = strerror(NUM2LONG(error));
+    else err = "unknown error";
+    if (!NIL_P(mesg)) {
+	VALUE str = mesg;
+	size_t len;
+
+	StringValue(str);
+	len = strlen(err)+RSTRING(str)->len+3;
+	mesg = rb_str_new(0, len);
+	snprintf(RSTRING(mesg)->ptr, len+1, "%s - %.*s", err,
+		(int)RSTRING(str)->len, RSTRING(str)->ptr);
+	rb_str_resize(mesg, strlen(RSTRING(mesg)->ptr));
+    }
+    else {
+	mesg = rb_str_new2(err);
+    }
+    rb_call_super(1, &mesg);
+    rb_iv_set(self, "errno", error);
+    return self;
+}
+
+/*
+ * call-seq:
+ *   system_call_error.errno   => fixnum
+ *
+ * Return this SystemCallError's error number.
+ */
+
+static VALUE
+syserr_errno(self)
+    VALUE self;
+{
+    return rb_attr_get(self, rb_intern("errno"));
+}
+
+/*
+ * call-seq:
+ *   system_call_error === other  => true or false
+ *
+ * Return +true+ if the receiver is a generic +SystemCallError+, or
+ * if the error numbers _self_ and _other_ are the same.
+ */
+
+
+static VALUE
+syserr_eqq(self, exc)
+    VALUE self, exc;
+{
+    VALUE num, e;
+
+    if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) return Qfalse;
+    if (self == rb_eSystemCallError) return Qtrue;
+
+    num = rb_attr_get(exc, rb_intern("errno"));
+    if (NIL_P(num)) {
+	VALUE klass = CLASS_OF(exc);
+
+	while (TYPE(klass) == T_ICLASS || FL_TEST(klass, FL_SINGLETON)) {
+	    klass = (VALUE)RCLASS(klass)->super;
+	}
+	num = rb_const_get(klass, rb_intern("Errno"));
+    }
+    e = rb_const_get(self, rb_intern("Errno"));
+    if (FIXNUM_P(num) ? num == e : rb_equal(num, e))
+	return Qtrue;
+    return Qfalse;
+}
+
+/*
+ *  Descendents of class <code>Exception</code> are used to communicate
+ *  between <code>raise</code> methods and <code>rescue</code>
+ *  statements in <code>begin/end</code> blocks. <code>Exception</code>
+ *  objects carry information about the exception---its type (the
+ *  exception's class name), an optional descriptive string, and
+ *  optional traceback information. Programs may subclass 
+ *  <code>Exception</code> to add additional information.
+ */
+
+void
+Init_Exception()
+{
+    rb_eException   = rb_define_class("Exception", rb_cObject);
+    rb_define_singleton_method(rb_eException, "exception", rb_class_new_instance, -1);
+    rb_define_method(rb_eException, "exception", exc_exception, -1);
+    rb_define_method(rb_eException, "initialize", exc_initialize, -1);
+    rb_define_method(rb_eException, "to_s", exc_to_s, 0);
+    rb_define_method(rb_eException, "to_str", exc_to_str, 0);
+    rb_define_method(rb_eException, "message", exc_to_str, 0);
+    rb_define_method(rb_eException, "inspect", exc_inspect, 0);
+    rb_define_method(rb_eException, "backtrace", exc_backtrace, 0);
+    rb_define_method(rb_eException, "set_backtrace", exc_set_backtrace, 1);
+
+    rb_eSystemExit  = rb_define_class("SystemExit", rb_eException);
+    rb_define_method(rb_eSystemExit, "initialize", exit_initialize, -1);
+    rb_define_method(rb_eSystemExit, "status", exit_status, 0);
+    rb_define_method(rb_eSystemExit, "success?", exit_success_p, 0);
+
+    rb_eFatal  	    = rb_define_class("fatal", rb_eException);
+    rb_eSignal      = rb_define_class("SignalException", rb_eException);
+    rb_eInterrupt   = rb_define_class("Interrupt", rb_eSignal);
+
+    rb_eStandardError = rb_define_class("StandardError", rb_eException);
+    rb_eTypeError     = rb_define_class("TypeError", rb_eStandardError);
+    rb_eArgError      = rb_define_class("ArgumentError", rb_eStandardError);
+    rb_eIndexError    = rb_define_class("IndexError", rb_eStandardError);
+    rb_eRangeError    = rb_define_class("RangeError", rb_eStandardError);
+    rb_eNameError     = rb_define_class("NameError", rb_eStandardError);
+    rb_define_method(rb_eNameError, "initialize", name_err_initialize, -1);
+    rb_define_method(rb_eNameError, "name", name_err_name, 0);
+    rb_define_method(rb_eNameError, "to_s", name_err_to_s, 0);
+    rb_cNameErrorMesg = rb_define_class_under(rb_eNameError, "message", rb_cData);
+    rb_define_singleton_method(rb_cNameErrorMesg, "!", name_err_mesg_new, 3);
+    rb_define_method(rb_cNameErrorMesg, "to_str", name_err_mesg_to_str, 0);
+    rb_define_method(rb_cNameErrorMesg, "_dump", name_err_mesg_to_str, 1);
+    rb_define_singleton_method(rb_cNameErrorMesg, "_load", name_err_mesg_load, 1);
+    rb_eNoMethodError = rb_define_class("NoMethodError", rb_eNameError);
+    rb_define_method(rb_eNoMethodError, "initialize", nometh_err_initialize, -1);
+    rb_define_method(rb_eNoMethodError, "args", nometh_err_args, 0);
+
+    rb_eScriptError = rb_define_class("ScriptError", rb_eException);
+    rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
+    rb_eLoadError   = rb_define_class("LoadError", rb_eScriptError);
+    rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
+
+    rb_eRuntimeError = rb_define_class("RuntimeError", rb_eStandardError);
+    rb_eSecurityError = rb_define_class("SecurityError", rb_eStandardError);
+    rb_eNoMemError = rb_define_class("NoMemoryError", rb_eException);
+
+    syserr_tbl = st_init_numtable();
+    rb_eSystemCallError = rb_define_class("SystemCallError", rb_eStandardError);
+    rb_define_method(rb_eSystemCallError, "initialize", syserr_initialize, -1);
+    rb_define_method(rb_eSystemCallError, "errno", syserr_errno, 0);
+    rb_define_singleton_method(rb_eSystemCallError, "===", syserr_eqq, 1);
+
+    rb_mErrno = rb_define_module("Errno");
+
+    rb_define_global_function("warn", rb_warn_m, 1);
+}
+
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_raise(VALUE exc, const char *fmt, ...)
+#else
+rb_raise(exc, fmt, va_alist)
+    VALUE exc;
+    const char *fmt;
+    va_dcl
+#endif
+{
+    va_list args;
+    char buf[BUFSIZ];
+
+    va_init_list(args,fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
+    va_end(args);
+    rb_exc_raise(rb_exc_new2(exc, buf));
+}
+
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_loaderror(const char *fmt, ...)
+#else
+rb_loaderror(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
+{
+    va_list args;
+    char buf[BUFSIZ];
+
+    va_init_list(args, fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
+    va_end(args);
+    rb_exc_raise(rb_exc_new2(rb_eLoadError, buf));
+}
+
+void
+rb_notimplement()
+{
+    rb_raise(rb_eNotImpError,
+	     "%s() function is unimplemented on this machine",
+	     rb_id2name(ruby_frame->last_func));
+}
+
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_fatal(const char *fmt, ...)
+#else
+rb_fatal(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
+{
+    va_list args;
+    char buf[BUFSIZ];
+
+    va_init_list(args, fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
+    va_end(args);
+
+    ruby_in_eval = 0;
+    rb_exc_fatal(rb_exc_new2(rb_eFatal, buf));
+}
+
+void
+rb_sys_fail(mesg)
+    const char *mesg;
+{
+    int n = errno;
+    VALUE arg;
+
+    errno = 0;
+    if (n == 0) {
+	rb_bug("rb_sys_fail(%s) - errno == 0", mesg ? mesg : "");
+    }
+
+    arg = mesg ? rb_str_new2(mesg) : Qnil;
+    rb_exc_raise(rb_class_new_instance(1, &arg, get_syserr(n)));
+}
+
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_sys_warning(const char *fmt, ...)
+#else
+rb_sys_warning(fmt, va_alist)
+     const char *fmt;
+     va_dcl
+#endif
+{
+     char buf[BUFSIZ];
+     va_list args;
+     int errno_save;
+     
+     errno_save = errno;
+
+     if (!RTEST(ruby_verbose)) return;
+
+     snprintf(buf, BUFSIZ, "warning: %s", fmt);
+     snprintf(buf+strlen(buf), BUFSIZ-strlen(buf), ": %s", strerror(errno_save));
+     
+     va_init_list(args, fmt);
+     warn_print(buf, args);
+     va_end(args);
+     errno = errno_save;
+}
+
+void
+rb_load_fail(path)
+    const char *path;
+{
+    rb_loaderror("%s -- %s", strerror(errno), path);
+}
+
+void
+rb_error_frozen(what)
+    const char *what;
+{
+    rb_raise(rb_eTypeError, "can't modify frozen %s", what);
+}
+
+void
+rb_check_frozen(obj)
+    VALUE obj;
+{
+    if (OBJ_FROZEN(obj)) rb_error_frozen(rb_obj_classname(obj));
+}
+
+void
+Init_syserr()
+{
+#ifdef EPERM
+    set_syserr(EPERM, "EPERM");
+#endif
+#ifdef ENOENT
+    set_syserr(ENOENT, "ENOENT");
+#endif
+#ifdef ESRCH
+    set_syserr(ESRCH, "ESRCH");
+#endif
+#ifdef EINTR
+    set_syserr(EINTR, "EINTR");
+#endif
+#ifdef EIO
+    set_syserr(EIO, "EIO");
+#endif
+#ifdef ENXIO
+    set_syserr(ENXIO, "ENXIO");
+#endif
+#ifdef E2BIG
+    set_syserr(E2BIG, "E2BIG");
+#endif
+#ifdef ENOEXEC
+    set_syserr(ENOEXEC, "ENOEXEC");
+#endif
+#ifdef EBADF
+    set_syserr(EBADF, "EBADF");
+#endif
+#ifdef ECHILD
+    set_syserr(ECHILD, "ECHILD");
+#endif
+#ifdef EAGAIN
+    set_syserr(EAGAIN, "EAGAIN");
+#endif
+#ifdef ENOMEM
+    set_syserr(ENOMEM, "ENOMEM");
+#endif
+#ifdef EACCES
+    set_syserr(EACCES, "EACCES");
+#endif
+#ifdef EFAULT
+    set_syserr(EFAULT, "EFAULT");
+#endif
+#ifdef ENOTBLK
+    set_syserr(ENOTBLK, "ENOTBLK");
+#endif
+#ifdef EBUSY
+    set_syserr(EBUSY, "EBUSY");
+#endif
+#ifdef EEXIST
+    set_syserr(EEXIST, "EEXIST");
+#endif
+#ifdef EXDEV
+    set_syserr(EXDEV, "EXDEV");
+#endif
+#ifdef ENODEV
+    set_syserr(ENODEV, "ENODEV");
+#endif
+#ifdef ENOTDIR
+    set_syserr(ENOTDIR, "ENOTDIR");
+#endif
+#ifdef EISDIR
+    set_syserr(EISDIR, "EISDIR");
+#endif
+#ifdef EINVAL
+    set_syserr(EINVAL, "EINVAL");
+#endif
+#ifdef ENFILE
+    set_syserr(ENFILE, "ENFILE");
+#endif
+#ifdef EMFILE
+    set_syserr(EMFILE, "EMFILE");
+#endif
+#ifdef ENOTTY
+    set_syserr(ENOTTY, "ENOTTY");
+#endif
+#ifdef ETXTBSY
+    set_syserr(ETXTBSY, "ETXTBSY");
+#endif
+#ifdef EFBIG
+    set_syserr(EFBIG, "EFBIG");
+#endif
+#ifdef ENOSPC
+    set_syserr(ENOSPC, "ENOSPC");
+#endif
+#ifdef ESPIPE
+    set_syserr(ESPIPE, "ESPIPE");
+#endif
+#ifdef EROFS
+    set_syserr(EROFS, "EROFS");
+#endif
+#ifdef EMLINK
+    set_syserr(EMLINK, "EMLINK");
+#endif
+#ifdef EPIPE
+    set_syserr(EPIPE, "EPIPE");
+#endif
+#ifdef EDOM
+    set_syserr(EDOM, "EDOM");
+#endif
+#ifdef ERANGE
+    set_syserr(ERANGE, "ERANGE");
+#endif
+#ifdef EDEADLK
+    set_syserr(EDEADLK, "EDEADLK");
+#endif
+#ifdef ENAMETOOLONG
+    set_syserr(ENAMETOOLONG, "ENAMETOOLONG");
+#endif
+#ifdef ENOLCK
+    set_syserr(ENOLCK, "ENOLCK");
+#endif
+#ifdef ENOSYS
+    set_syserr(ENOSYS, "ENOSYS");
+#endif
+#ifdef ENOTEMPTY
+    set_syserr(ENOTEMPTY, "ENOTEMPTY");
+#endif
+#ifdef ELOOP
+    set_syserr(ELOOP, "ELOOP");
+#endif
+#ifdef EWOULDBLOCK
+    set_syserr(EWOULDBLOCK, "EWOULDBLOCK");
+#endif
+#ifdef ENOMSG
+    set_syserr(ENOMSG, "ENOMSG");
+#endif
+#ifdef EIDRM
+    set_syserr(EIDRM, "EIDRM");
+#endif
+#ifdef ECHRNG
+    set_syserr(ECHRNG, "ECHRNG");
+#endif
+#ifdef EL2NSYNC
+    set_syserr(EL2NSYNC, "EL2NSYNC");
+#endif
+#ifdef EL3HLT
+    set_syserr(EL3HLT, "EL3HLT");
+#endif
+#ifdef EL3RST
+    set_syserr(EL3RST, "EL3RST");
+#endif
+#ifdef ELNRNG
+    set_syserr(ELNRNG, "ELNRNG");
+#endif
+#ifdef EUNATCH
+    set_syserr(EUNATCH, "EUNATCH");
+#endif
+#ifdef ENOCSI
+    set_syserr(ENOCSI, "ENOCSI");
+#endif
+#ifdef EL2HLT
+    set_syserr(EL2HLT, "EL2HLT");
+#endif
+#ifdef EBADE
+    set_syserr(EBADE, "EBADE");
+#endif
+#ifdef EBADR
+    set_syserr(EBADR, "EBADR");
+#endif
+#ifdef EXFULL
+    set_syserr(EXFULL, "EXFULL");
+#endif
+#ifdef ENOANO
+    set_syserr(ENOANO, "ENOANO");
+#endif
+#ifdef EBADRQC
+    set_syserr(EBADRQC, "EBADRQC");
+#endif
+#ifdef EBADSLT
+    set_syserr(EBADSLT, "EBADSLT");
+#endif
+#ifdef EDEADLOCK
+    set_syserr(EDEADLOCK, "EDEADLOCK");
+#endif
+#ifdef EBFONT
+    set_syserr(EBFONT, "EBFONT");
+#endif
+#ifdef ENOSTR
+    set_syserr(ENOSTR, "ENOSTR");
+#endif
+#ifdef ENODATA
+    set_syserr(ENODATA, "ENODATA");
+#endif
+#ifdef ETIME
+    set_syserr(ETIME, "ETIME");
+#endif
+#ifdef ENOSR
+    set_syserr(ENOSR, "ENOSR");
+#endif
+#ifdef ENONET
+    set_syserr(ENONET, "ENONET");
+#endif
+#ifdef ENOPKG
+    set_syserr(ENOPKG, "ENOPKG");
+#endif
+#ifdef EREMOTE
+    set_syserr(EREMOTE, "EREMOTE");
+#endif
+#ifdef ENOLINK
+    set_syserr(ENOLINK, "ENOLINK");
+#endif
+#ifdef EADV
+    set_syserr(EADV, "EADV");
+#endif
+#ifdef ESRMNT
+    set_syserr(ESRMNT, "ESRMNT");
+#endif
+#ifdef ECOMM
+    set_syserr(ECOMM, "ECOMM");
+#endif
+#ifdef EPROTO
+    set_syserr(EPROTO, "EPROTO");
+#endif
+#ifdef EMULTIHOP
+    set_syserr(EMULTIHOP, "EMULTIHOP");
+#endif
+#ifdef EDOTDOT
+    set_syserr(EDOTDOT, "EDOTDOT");
+#endif
+#ifdef EBADMSG
+    set_syserr(EBADMSG, "EBADMSG");
+#endif
+#ifdef EOVERFLOW
+    set_syserr(EOVERFLOW, "EOVERFLOW");
+#endif
+#ifdef ENOTUNIQ
+    set_syserr(ENOTUNIQ, "ENOTUNIQ");
+#endif
+#ifdef EBADFD
+    set_syserr(EBADFD, "EBADFD");
+#endif
+#ifdef EREMCHG
+    set_syserr(EREMCHG, "EREMCHG");
+#endif
+#ifdef ELIBACC
+    set_syserr(ELIBACC, "ELIBACC");
+#endif
+#ifdef ELIBBAD
+    set_syserr(ELIBBAD, "ELIBBAD");
+#endif
+#ifdef ELIBSCN
+    set_syserr(ELIBSCN, "ELIBSCN");
+#endif
+#ifdef ELIBMAX
+    set_syserr(ELIBMAX, "ELIBMAX");
+#endif
+#ifdef ELIBEXEC
+    set_syserr(ELIBEXEC, "ELIBEXEC");
+#endif
+#ifdef EILSEQ
+    set_syserr(EILSEQ, "EILSEQ");
+#endif
+#ifdef ERESTART
+    set_syserr(ERESTART, "ERESTART");
+#endif
+#ifdef ESTRPIPE
+    set_syserr(ESTRPIPE, "ESTRPIPE");
+#endif
+#ifdef EUSERS
+    set_syserr(EUSERS, "EUSERS");
+#endif
+#ifdef ENOTSOCK
+    set_syserr(ENOTSOCK, "ENOTSOCK");
+#endif
+#ifdef EDESTADDRREQ
+    set_syserr(EDESTADDRREQ, "EDESTADDRREQ");
+#endif
+#ifdef EMSGSIZE
+    set_syserr(EMSGSIZE, "EMSGSIZE");
+#endif
+#ifdef EPROTOTYPE
+    set_syserr(EPROTOTYPE, "EPROTOTYPE");
+#endif
+#ifdef ENOPROTOOPT
+    set_syserr(ENOPROTOOPT, "ENOPROTOOPT");
+#endif
+#ifdef EPROTONOSUPPORT
+    set_syserr(EPROTONOSUPPORT, "EPROTONOSUPPORT");
+#endif
+#ifdef ESOCKTNOSUPPORT
+    set_syserr(ESOCKTNOSUPPORT, "ESOCKTNOSUPPORT");
+#endif
+#ifdef EOPNOTSUPP
+    set_syserr(EOPNOTSUPP, "EOPNOTSUPP");
+#endif
+#ifdef EPFNOSUPPORT
+    set_syserr(EPFNOSUPPORT, "EPFNOSUPPORT");
+#endif
+#ifdef EAFNOSUPPORT
+    set_syserr(EAFNOSUPPORT, "EAFNOSUPPORT");
+#endif
+#ifdef EADDRINUSE
+    set_syserr(EADDRINUSE, "EADDRINUSE");
+#endif
+#ifdef EADDRNOTAVAIL
+    set_syserr(EADDRNOTAVAIL, "EADDRNOTAVAIL");
+#endif
+#ifdef ENETDOWN
+    set_syserr(ENETDOWN, "ENETDOWN");
+#endif
+#ifdef ENETUNREACH
+    set_syserr(ENETUNREACH, "ENETUNREACH");
+#endif
+#ifdef ENETRESET
+    set_syserr(ENETRESET, "ENETRESET");
+#endif
+#ifdef ECONNABORTED
+    set_syserr(ECONNABORTED, "ECONNABORTED");
+#endif
+#ifdef ECONNRESET
+    set_syserr(ECONNRESET, "ECONNRESET");
+#endif
+#ifdef ENOBUFS
+    set_syserr(ENOBUFS, "ENOBUFS");
+#endif
+#ifdef EISCONN
+    set_syserr(EISCONN, "EISCONN");
+#endif
+#ifdef ENOTCONN
+    set_syserr(ENOTCONN, "ENOTCONN");
+#endif
+#ifdef ESHUTDOWN
+    set_syserr(ESHUTDOWN, "ESHUTDOWN");
+#endif
+#ifdef ETOOMANYREFS
+    set_syserr(ETOOMANYREFS, "ETOOMANYREFS");
+#endif
+#ifdef ETIMEDOUT
+    set_syserr(ETIMEDOUT, "ETIMEDOUT");
+#endif
+#ifdef ECONNREFUSED
+    set_syserr(ECONNREFUSED, "ECONNREFUSED");
+#endif
+#ifdef EHOSTDOWN
+    set_syserr(EHOSTDOWN, "EHOSTDOWN");
+#endif
+#ifdef EHOSTUNREACH
+    set_syserr(EHOSTUNREACH, "EHOSTUNREACH");
+#endif
+#ifdef EALREADY
+    set_syserr(EALREADY, "EALREADY");
+#endif
+#ifdef EINPROGRESS
+    set_syserr(EINPROGRESS, "EINPROGRESS");
+#endif
+#ifdef ESTALE
+    set_syserr(ESTALE, "ESTALE");
+#endif
+#ifdef EUCLEAN
+    set_syserr(EUCLEAN, "EUCLEAN");
+#endif
+#ifdef ENOTNAM
+    set_syserr(ENOTNAM, "ENOTNAM");
+#endif
+#ifdef ENAVAIL
+    set_syserr(ENAVAIL, "ENAVAIL");
+#endif
+#ifdef EISNAM
+    set_syserr(EISNAM, "EISNAM");
+#endif
+#ifdef EREMOTEIO
+    set_syserr(EREMOTEIO, "EREMOTEIO");
+#endif
+#ifdef EDQUOT
+    set_syserr(EDQUOT, "EDQUOT");
+#endif
+}
+
+static void
+err_append(s)
+    const char *s;
+{
+    extern VALUE ruby_errinfo;
+
+    if (ruby_in_eval) {
+	if (NIL_P(ruby_errinfo)) {
+	    ruby_errinfo = rb_exc_new2(rb_eSyntaxError, s);
+	}
+	else {
+	    VALUE str = rb_obj_as_string(ruby_errinfo);
+
+	    rb_str_cat2(str, "\n");
+	    rb_str_cat2(str, s);
+	    ruby_errinfo = rb_exc_new3(rb_eSyntaxError, str);
+	}
+    }
+    else {
+	rb_write_error(s);
+	rb_write_error("\n");
+    }
+}
diff --git a/ruby_1_8_6/eval.c b/ruby_1_8_6/eval.c
new file mode 100644
index 0000000000..fa0ed979a6
--- /dev/null
+++ b/ruby_1_8_6/eval.c
@@ -0,0 +1,13236 @@
+/**********************************************************************
+
+  eval.c -
+
+  $Author$
+  $Date$
+  created at: Thu Jun 10 14:22:17 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "node.h"
+#include "env.h"
+#include "util.h"
+#include "rubysig.h"
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+
+#include <stdio.h>
+
+#include "st.h"
+#include "dln.h"
+
+#ifdef __APPLE__
+#include <crt_externs.h>
+#endif
+
+/* Make alloca work the best possible way.  */
+#ifdef __GNUC__
+# ifndef atarist
+#  ifndef alloca
+#   define alloca __builtin_alloca
+#  endif
+# endif /* atarist */
+#else
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifndef _AIX
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+void *alloca ();
+#   endif
+#  endif /* AIX */
+# endif /* HAVE_ALLOCA_H */
+#endif /* __GNUC__ */
+
+#ifdef HAVE_STDARG_PROTOTYPES
+#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
+
+#ifndef HAVE_STRING_H
+char *strrchr _((const char*,const char));
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef __BEOS__
+#include <net/socket.h>
+#endif
+
+#ifdef __MACOS__
+#include "macruby_private.h"
+#endif
+
+#ifdef __VMS
+#include "vmsruby_private.h"
+#endif
+
+#ifdef USE_CONTEXT
+
+NORETURN(static void rb_jump_context(rb_jmpbuf_t, int));
+static inline void
+rb_jump_context(env, val)
+    rb_jmpbuf_t env;
+    int val;
+{
+    env->status = val;
+    setcontext(&env->context);
+    abort();			/* ensure noreturn */
+}
+/*
+ * PRE_GETCONTEXT and POST_GETCONTEXT is a magic for getcontext, gcc,
+ * IA64 register stack and SPARC register window combination problem.
+ *
+ * Assume following code sequence.
+ * 
+ * 1. set a register in the register stack/window such as r32/l0.
+ * 2. call getcontext.
+ * 3. use the register.
+ * 4. update the register for other use.
+ * 5. call setcontext indirectly (or directly).
+ *
+ * This code should be run as 1->2->3->4->5->3->4.
+ * But after second getcontext return (second 3),
+ * the register is broken (updated).
+ * It's because getcontext/setcontext doesn't preserve the content of the
+ * register stack/window.
+ *
+ * setjmp also doesn't preserve the content of the register stack/window.
+ * But it has not the problem because gcc knows setjmp may return twice.
+ * gcc detects setjmp and generates setjmp safe code.
+ *
+ * So setjmp calls before and after the getcontext call makes the code
+ * somewhat safe.
+ * It fix the problem on IA64.
+ * It is not required that setjmp is called at run time, since the problem is
+ * register usage.
+ *
+ * Since the magic setjmp is not enough for SPARC,
+ * inline asm is used to prohibit registers in register windows.
+ *
+ * Since the problem is fixed at gcc 4.0.3, the magic is applied only for
+ * prior versions of gcc.
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21957
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22127
+ */
+#  define GCC_VERSION_BEFORE(major, minor, patchlevel) \
+    (defined(__GNUC__) && !defined(__INTEL_COMPILER) && \
+     ((__GNUC__ < (major)) ||  \
+      (__GNUC__ == (major) && __GNUC_MINOR__ < (minor)) || \
+      (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ < (patchlevel))))
+#  if GCC_VERSION_BEFORE(4,0,3) && (defined(sparc) || defined(__sparc__))
+#    ifdef __pic__
+/*
+ * %l7 is excluded for PIC because it is PIC register.
+ * http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
+ */
+#      define PRE_GETCONTEXT \
+	 ({ __asm__ volatile ("" : : :  \
+	    "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
+	    "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", \
+	    "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
+#    else
+#      define PRE_GETCONTEXT \
+	 ({ __asm__ volatile ("" : : :  \
+	    "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
+	    "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", "%l7", \
+	    "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
+#    endif
+#    define POST_GETCONTEXT PRE_GETCONTEXT
+#  elif GCC_VERSION_BEFORE(4,0,3) && defined(__ia64)
+static jmp_buf function_call_may_return_twice_jmp_buf;
+int function_call_may_return_twice_false_1 = 0;
+int function_call_may_return_twice_false_2 = 0;
+#    define PRE_GETCONTEXT \
+       (function_call_may_return_twice_false_1 ? \
+        setjmp(function_call_may_return_twice_jmp_buf) : \
+        0)
+#    define POST_GETCONTEXT \
+       (function_call_may_return_twice_false_2 ? \
+        setjmp(function_call_may_return_twice_jmp_buf) : \
+        0)
+#  elif defined(__FreeBSD__) && __FreeBSD__ < 7
+/*
+ * workaround for FreeBSD/i386 getcontext/setcontext bug.
+ * clear the carry flag by (0 ? ... : ...).
+ * FreeBSD PR 92110 http://www.freebsd.org/cgi/query-pr.cgi?pr=92110
+ * [ruby-dev:28263]
+ */
+static int volatile freebsd_clear_carry_flag = 0;
+#    define PRE_GETCONTEXT \
+       (freebsd_clear_carry_flag ? (freebsd_clear_carry_flag = 0) : 0)
+#  endif
+#  ifndef PRE_GETCONTEXT
+#    define PRE_GETCONTEXT 0
+#  endif
+#  ifndef POST_GETCONTEXT
+#    define POST_GETCONTEXT 0
+#  endif
+#  define ruby_longjmp(env, val) rb_jump_context(env, val)
+#  define ruby_setjmp(just_before_setjmp, j) ((j)->status = 0, \
+     (just_before_setjmp), \
+     PRE_GETCONTEXT, \
+     getcontext(&(j)->context), \
+     POST_GETCONTEXT, \
+     (j)->status)
+#else
+#  if !defined(setjmp) && defined(HAVE__SETJMP)
+#    define ruby_setjmp(just_before_setjmp, env) \
+       ((just_before_setjmp), _setjmp(env))
+#    define ruby_longjmp(env,val) _longjmp(env,val)
+#  else
+#    define ruby_setjmp(just_before_setjmp, env) \
+       ((just_before_setjmp), setjmp(env))
+#    define ruby_longjmp(env,val) longjmp(env,val)
+#  endif
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <errno.h>
+
+#if defined(__VMS)
+#pragma nostandard
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#include <sys/stat.h>
+
+VALUE rb_cProc;
+VALUE rb_cBinding;
+static VALUE proc_invoke _((VALUE,VALUE,VALUE,VALUE));
+static VALUE rb_f_binding _((VALUE));
+static void rb_f_END _((void));
+static VALUE rb_f_block_given_p _((void));
+static VALUE block_pass _((VALUE,NODE*));
+
+VALUE rb_cMethod;
+static VALUE method_call _((int, VALUE*, VALUE));
+VALUE rb_cUnboundMethod;
+static VALUE umethod_bind _((VALUE, VALUE));
+static VALUE rb_mod_define_method _((int, VALUE*, VALUE));
+NORETURN(static void rb_raise_jump _((VALUE)));
+static VALUE rb_make_exception _((int argc, VALUE *argv));
+
+static int scope_vmode;
+#define SCOPE_PUBLIC    0
+#define SCOPE_PRIVATE   1
+#define SCOPE_PROTECTED 2
+#define SCOPE_MODFUNC   5
+#define SCOPE_MASK      7
+#define SCOPE_SET(f)  (scope_vmode=(f))
+#define SCOPE_TEST(f) (scope_vmode&(f))
+
+VALUE (*ruby_sandbox_save)_((rb_thread_t));
+VALUE (*ruby_sandbox_restore)_((rb_thread_t));
+NODE* ruby_current_node;
+int ruby_safe_level = 0;
+/* safe-level:
+   0 - strings from streams/environment/ARGV are tainted (default)
+   1 - no dangerous operation by tainted value
+   2 - process/file operations prohibited
+   3 - all generated objects are tainted
+   4 - no global (non-tainted) variable modification/no direct output
+*/
+
+static VALUE safe_getter _((void));
+static void safe_setter _((VALUE val));
+
+void
+rb_secure(level)
+    int level;
+{
+    if (level <= ruby_safe_level) {
+	if (ruby_frame->last_func) {
+	    rb_raise(rb_eSecurityError, "Insecure operation `%s' at level %d",
+		     rb_id2name(ruby_frame->last_func), ruby_safe_level);
+	}
+	else {
+	    rb_raise(rb_eSecurityError, "Insecure operation at level %d", ruby_safe_level);
+	}
+    }
+}
+
+void
+rb_secure_update(obj)
+    VALUE obj;
+{
+    if (!OBJ_TAINTED(obj)) rb_secure(4);
+}
+
+void
+rb_check_safe_obj(x)
+    VALUE x;
+{
+    if (ruby_safe_level > 0 && OBJ_TAINTED(x)){
+	if (ruby_frame->last_func) {
+	    rb_raise(rb_eSecurityError, "Insecure operation - %s",
+		     rb_id2name(ruby_frame->last_func));
+	}
+	else {
+	    rb_raise(rb_eSecurityError, "Insecure operation: -r");
+	}
+    }
+    rb_secure(4);
+}
+
+void
+rb_check_safe_str(x)
+    VALUE x;
+{
+    rb_check_safe_obj(x);
+    if (TYPE(x)!= T_STRING) {
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected String)",
+		 rb_obj_classname(x));
+    }
+}
+
+NORETURN(static void print_undef _((VALUE, ID)));
+static void
+print_undef(klass, id)
+    VALUE klass;
+    ID id;
+{
+    rb_name_error(id, "undefined method `%s' for %s `%s'",
+		  rb_id2name(id),
+		  (TYPE(klass) == T_MODULE) ? "module" : "class",
+		  rb_class2name(klass));
+}
+
+static ID removed, singleton_removed, undefined, singleton_undefined;
+
+#define CACHE_SIZE 0x800
+#define CACHE_MASK 0x7ff
+#define EXPR1(c,m) ((((c)>>3)^(m))&CACHE_MASK)
+
+struct cache_entry {		/* method hash table. */
+    ID mid;			/* method's id */
+    ID mid0;			/* method's original id */
+    VALUE klass;		/* receiver's class */
+    VALUE origin;		/* where method defined  */
+    NODE *method;
+    int noex;
+};
+
+static struct cache_entry cache[CACHE_SIZE];
+static int ruby_running = 0;
+
+void
+rb_clear_cache()
+{
+   struct cache_entry *ent, *end;
+
+    if (!ruby_running) return;
+    ent = cache; end = ent + CACHE_SIZE;
+    while (ent < end) {
+	ent->mid = 0;
+	ent++;
+    }
+}
+
+static void
+rb_clear_cache_for_undef(klass, id)
+    VALUE klass;
+    ID id;
+{
+    struct cache_entry *ent, *end;
+
+    if (!ruby_running) return;
+    ent = cache; end = ent + CACHE_SIZE;
+    while (ent < end) {
+	if (ent->mid == id &&
+	    RCLASS(ent->origin)->m_tbl == RCLASS(klass)->m_tbl) {
+	    ent->mid = 0;
+	}
+	ent++;
+    }
+}
+
+static void
+rb_clear_cache_by_id(id)
+    ID id;
+{
+    struct cache_entry *ent, *end;
+
+    if (!ruby_running) return;
+    ent = cache; end = ent + CACHE_SIZE;
+    while (ent < end) {
+	if (ent->mid == id) {
+	    ent->mid = 0;
+	}
+	ent++;
+    }
+}
+
+void
+rb_clear_cache_by_class(klass)
+    VALUE klass;
+{
+    struct cache_entry *ent, *end;
+
+    if (!ruby_running) return;
+    ent = cache; end = ent + CACHE_SIZE;
+    while (ent < end) {
+	if (ent->klass == klass || ent->origin == klass) {
+	    ent->mid = 0;
+	}
+	ent++;
+    }
+}
+
+static ID init, eqq, each, aref, aset, match, missing;
+static ID added, singleton_added;
+static ID __id__, __send__, respond_to;
+
+#define NOEX_TAINTED 8
+#define NOEX_SAFE(n) ((n) >> 4)
+#define NOEX_WITH(n, v) ((n) | (v) << 4)
+#define NOEX_WITH_SAFE(n) NOEX_WITH(n, ruby_safe_level)
+
+void
+rb_add_method(klass, mid, node, noex)
+    VALUE klass;
+    ID mid;
+    NODE *node;
+    int noex;
+{
+    NODE *body;
+
+    if (NIL_P(klass)) klass = rb_cObject;
+    if (ruby_safe_level >= 4 && (klass == rb_cObject || !OBJ_TAINTED(klass))) {
+	rb_raise(rb_eSecurityError, "Insecure: can't define method");
+    }
+    if (!FL_TEST(klass, FL_SINGLETON) &&
+	node && nd_type(node) != NODE_ZSUPER &&
+	(mid == rb_intern("initialize" )|| mid == rb_intern("initialize_copy"))) {
+	noex = NOEX_PRIVATE | noex;
+    }
+    else if (FL_TEST(klass, FL_SINGLETON) && node && nd_type(node) == NODE_CFUNC &&
+	     mid == rb_intern("allocate")) {
+	rb_warn("defining %s.allocate is deprecated; use rb_define_alloc_func()",
+		rb_class2name(rb_iv_get(klass, "__attached__")));
+	mid = ID_ALLOCATOR;
+    }
+    if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
+    rb_clear_cache_by_id(mid);
+    body = NEW_METHOD(node, NOEX_WITH_SAFE(noex));
+    st_insert(RCLASS(klass)->m_tbl, mid, (st_data_t)body);
+    if (node && mid != ID_ALLOCATOR && ruby_running) {
+	if (FL_TEST(klass, FL_SINGLETON)) {
+	    rb_funcall(rb_iv_get(klass, "__attached__"), singleton_added, 1, ID2SYM(mid));
+	}
+	else {
+	    rb_funcall(klass, added, 1, ID2SYM(mid));
+	}
+    }
+}
+
+void
+rb_define_alloc_func(klass, func)
+    VALUE klass;
+    VALUE (*func) _((VALUE));
+{
+    Check_Type(klass, T_CLASS);
+    rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0), NOEX_PRIVATE);
+}
+
+void
+rb_undef_alloc_func(klass)
+    VALUE klass;
+{
+    Check_Type(klass, T_CLASS);
+    rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, 0, NOEX_UNDEF);
+}
+
+static NODE*
+search_method(klass, id, origin)
+    VALUE klass, *origin;
+    ID id;
+{
+    NODE *body;
+
+    if (!klass) return 0;
+    while (!st_lookup(RCLASS(klass)->m_tbl, id, (st_data_t *)&body)) {
+	klass = RCLASS(klass)->super;
+	if (!klass) return 0;
+    }
+
+    if (origin) *origin = klass;
+    return body;
+}
+
+static NODE*
+rb_get_method_body(klassp, idp, noexp)
+    VALUE *klassp;
+    ID *idp;
+    int *noexp;
+{
+    ID id = *idp;
+    VALUE klass = *klassp;
+    VALUE origin;
+    NODE * volatile body;
+    struct cache_entry *ent;
+
+    if ((body = search_method(klass, id, &origin)) == 0 || !body->nd_body) {
+	/* store empty info in cache */
+	ent = cache + EXPR1(klass, id);
+	ent->klass  = klass;
+	ent->origin = klass;
+	ent->mid = ent->mid0 = id;
+	ent->noex   = 0;
+	ent->method = 0;
+
+	return 0;
+    }
+
+    if (ruby_running) {
+	/* store in cache */
+	ent = cache + EXPR1(klass, id);
+	ent->klass  = klass;
+	ent->noex   = body->nd_noex;
+	if (noexp) *noexp = body->nd_noex;
+	body = body->nd_body;
+	if (nd_type(body) == NODE_FBODY) {
+	    ent->mid = id;
+	    *klassp = body->nd_orig;
+	    ent->origin = body->nd_orig;
+	    *idp = ent->mid0 = body->nd_mid;
+	    body = ent->method = body->nd_head;
+	}
+	else {
+	    *klassp = origin;
+	    ent->origin = origin;
+	    ent->mid = ent->mid0 = id;
+	    ent->method = body;
+	}
+    }
+    else {
+	if (noexp) *noexp = body->nd_noex;
+	body = body->nd_body;
+	if (nd_type(body) == NODE_FBODY) {
+	    *klassp = body->nd_orig;
+	    *idp = body->nd_mid;
+	    body = body->nd_head;
+	}
+	else {
+	    *klassp = origin;
+	}
+    }
+
+    return body;
+}
+
+NODE*
+rb_method_node(klass, id)
+    VALUE klass;
+    ID id;
+{
+    int noex;
+
+    return rb_get_method_body(&klass, &id, &noex);
+}
+
+static void
+remove_method(klass, mid)
+    VALUE klass;
+    ID mid;
+{
+    NODE *body;
+
+    if (klass == rb_cObject) {
+	rb_secure(4);
+    }
+    if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't remove method");
+    }
+    if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
+    if (mid == __id__ || mid == __send__ || mid == init) {
+	rb_warn("removing `%s' may cause serious problem", rb_id2name(mid));
+    }
+    if (!st_delete(RCLASS(klass)->m_tbl, &mid, (st_data_t *)&body) ||
+	!body->nd_body) {
+	rb_name_error(mid, "method `%s' not defined in %s",
+		      rb_id2name(mid), rb_class2name(klass));
+    }
+    rb_clear_cache_for_undef(klass, mid);
+    if (FL_TEST(klass, FL_SINGLETON)) {
+	rb_funcall(rb_iv_get(klass, "__attached__"), singleton_removed, 1, ID2SYM(mid));
+    }
+    else {
+	rb_funcall(klass, removed, 1, ID2SYM(mid));
+    }
+}
+
+void
+rb_remove_method(klass, name)
+    VALUE klass;
+    const char *name;
+{
+    remove_method(klass, rb_intern(name));
+}
+
+/*
+ *  call-seq:
+ *     remove_method(symbol)   => self
+ *  
+ *  Removes the method identified by _symbol_ from the current
+ *  class. For an example, see <code>Module.undef_method</code>.
+ */
+
+static VALUE
+rb_mod_remove_method(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
+{
+    int i;
+
+    for (i=0; i<argc; i++) {
+	remove_method(mod, rb_to_id(argv[i]));
+    }
+    return mod;
+}
+
+#undef rb_disable_super
+#undef rb_enable_super
+
+void
+rb_disable_super(klass, name)
+    VALUE klass;
+    const char *name;
+{
+    /* obsolete - no use */
+}
+
+void
+rb_enable_super(klass, name)
+    VALUE klass;
+    const char *name;
+{
+    rb_warn("rb_enable_super() is obsolete");
+}
+
+static void
+rb_export_method(klass, name, noex)
+    VALUE klass;
+    ID name;
+    ID noex;
+{
+    NODE *body;
+    VALUE origin;
+
+    if (klass == rb_cObject) {
+	rb_secure(4);
+    }
+    body = search_method(klass, name, &origin);
+    if (!body && TYPE(klass) == T_MODULE) {
+	body = search_method(rb_cObject, name, &origin);
+    }
+    if (!body || !body->nd_body) {
+	print_undef(klass, name);
+    }
+    if (body->nd_noex != noex) {
+	if (klass == origin) {
+	    body->nd_noex = noex;
+	}
+	else {
+	    rb_add_method(klass, name, NEW_ZSUPER(), noex);
+	}
+    }
+}
+
+int
+rb_method_boundp(klass, id, ex)
+    VALUE klass;
+    ID id;
+    int ex;
+{
+    struct cache_entry *ent;
+    int noex;
+
+    /* is it in the method cache? */
+    ent = cache + EXPR1(klass, id);
+    if (ent->mid == id && ent->klass == klass) {
+	if (ex && (ent->noex & NOEX_PRIVATE))
+	    return Qfalse;
+	if (!ent->method) return Qfalse;
+	return Qtrue;
+    }
+    if (rb_get_method_body(&klass, &id, &noex)) {
+	if (ex && (noex & NOEX_PRIVATE))
+	    return Qfalse;
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+void
+rb_attr(klass, id, read, write, ex)
+    VALUE klass;
+    ID id;
+    int read, write, ex;
+{
+    const char *name;
+    char *buf;
+    ID attriv;
+    int noex;
+    size_t len;
+
+    if (!ex) noex = NOEX_PUBLIC;
+    else {
+	if (SCOPE_TEST(SCOPE_PRIVATE)) {
+	    noex = NOEX_PRIVATE;
+	    rb_warning((scope_vmode == SCOPE_MODFUNC) ?
+		       "attribute accessor as module_function" :
+		       "private attribute?");
+	}
+	else if (SCOPE_TEST(SCOPE_PROTECTED)) {
+	    noex = NOEX_PROTECTED;
+	}
+	else {
+	    noex = NOEX_PUBLIC;
+	}
+    }
+
+    if (!rb_is_local_id(id) && !rb_is_const_id(id)) {
+	rb_name_error(id, "invalid attribute name `%s'", rb_id2name(id));
+    }
+    name = rb_id2name(id);
+    if (!name) {
+	rb_raise(rb_eArgError, "argument needs to be symbol or string");
+    }
+    len = strlen(name)+2;
+    buf = ALLOCA_N(char,len);
+    snprintf(buf, len, "@%s", name);
+    attriv = rb_intern(buf);
+    if (read) {
+	rb_add_method(klass, id, NEW_IVAR(attriv), noex);
+    }
+    if (write) {
+	rb_add_method(klass, rb_id_attrset(id), NEW_ATTRSET(attriv), noex);
+    }
+}
+
+extern int ruby_in_compile;
+
+VALUE ruby_errinfo = Qnil;
+extern NODE *ruby_eval_tree_begin;
+extern NODE *ruby_eval_tree;
+extern int ruby_nerrs;
+
+VALUE rb_eLocalJumpError;
+VALUE rb_eSysStackError;
+
+extern VALUE ruby_top_self;
+
+struct FRAME *ruby_frame;
+struct SCOPE *ruby_scope;
+static struct FRAME *top_frame;
+static struct SCOPE *top_scope;
+
+static unsigned long frame_unique = 0;
+
+#define PUSH_FRAME() do {		\
+    struct FRAME _frame;		\
+    _frame.prev = ruby_frame;		\
+    _frame.tmp  = 0;			\
+    _frame.node = ruby_current_node;	\
+    _frame.iter = ruby_iter->iter;	\
+    _frame.argc = 0;			\
+    _frame.flags = 0;			\
+    _frame.uniq = frame_unique++;	\
+    ruby_frame = &_frame
+
+#define POP_FRAME()  			\
+    ruby_current_node = _frame.node;	\
+    ruby_frame = _frame.prev;		\
+} while (0)
+
+struct BLOCK {
+    NODE *var;
+    NODE *body;
+    VALUE self;
+    struct FRAME frame;
+    struct SCOPE *scope;
+    VALUE klass;
+    NODE *cref;
+    int iter;
+    int vmode;
+    int flags;
+    int uniq;
+    struct RVarmap *dyna_vars;
+    VALUE orig_thread;
+    VALUE wrapper;
+    VALUE block_obj;
+    struct BLOCK *outer;
+    struct BLOCK *prev;
+};
+
+#define BLOCK_D_SCOPE 1
+#define BLOCK_LAMBDA  2
+
+static struct BLOCK *ruby_block;
+static unsigned long block_unique = 1;
+
+#define PUSH_BLOCK(v,b) do {		\
+    struct BLOCK _block;		\
+    _block.var = (v);			\
+    _block.body = (b);			\
+    _block.self = self;			\
+    _block.frame = *ruby_frame;		\
+    _block.klass = ruby_class;		\
+    _block.cref = ruby_cref;		\
+    _block.frame.node = ruby_current_node;\
+    _block.scope = ruby_scope;		\
+    _block.prev = ruby_block;		\
+    _block.outer = ruby_block;		\
+    _block.iter = ruby_iter->iter;	\
+    _block.vmode = scope_vmode;		\
+    _block.flags = BLOCK_D_SCOPE;	\
+    _block.dyna_vars = ruby_dyna_vars;	\
+    _block.wrapper = ruby_wrapper;	\
+    _block.block_obj = 0;		\
+    _block.uniq = (b)?block_unique++:0; \
+    if (b) {				\
+	prot_tag->blkid = _block.uniq;  \
+    }                                   \
+    ruby_block = &_block
+
+#define POP_BLOCK() \
+   ruby_block = _block.prev; \
+} while (0)
+
+struct RVarmap *ruby_dyna_vars;
+#define PUSH_VARS() do { \
+    struct RVarmap * volatile _old; \
+    _old = ruby_dyna_vars; \
+    ruby_dyna_vars = 0
+
+#define POP_VARS() \
+    if (_old && (ruby_scope->flags & SCOPE_DONT_RECYCLE)) {\
+	if (RBASIC(_old)->flags) /* unless it's already recycled */ \
+	    FL_SET(_old, DVAR_DONT_RECYCLE); \
+    }\
+    ruby_dyna_vars = _old; \
+} while (0)
+
+#define DVAR_DONT_RECYCLE FL_USER2
+
+#define DMETHOD_P() (ruby_frame->flags & FRAME_DMETH)
+
+static struct RVarmap*
+new_dvar(id, value, prev)
+    ID id;
+    VALUE value;
+    struct RVarmap *prev;
+{
+    NEWOBJ(vars, struct RVarmap);
+    OBJSETUP(vars, 0, T_VARMAP);
+    vars->id = id;
+    vars->val = value;
+    vars->next = prev;
+
+    return vars;
+}
+
+VALUE
+rb_dvar_defined(id)
+    ID id;
+{
+    struct RVarmap *vars = ruby_dyna_vars;
+
+    while (vars) {
+	if (vars->id == id) return Qtrue;
+	vars = vars->next;
+    }
+    return Qfalse;
+}
+
+VALUE
+rb_dvar_curr(id)
+    ID id;
+{
+    struct RVarmap *vars = ruby_dyna_vars;
+
+    while (vars) {
+	if (vars->id == 0) break;
+	if (vars->id == id) return Qtrue;
+	vars = vars->next;
+    }
+    return Qfalse;
+}
+
+VALUE
+rb_dvar_ref(id)
+    ID id;
+{
+    struct RVarmap *vars = ruby_dyna_vars;
+
+    while (vars) {
+	if (vars->id == id) {
+	    return vars->val;
+	}
+	vars = vars->next;
+    }
+    return Qnil;
+}
+
+void
+rb_dvar_push(id, value)
+    ID id;
+    VALUE value;
+{
+    ruby_dyna_vars = new_dvar(id, value, ruby_dyna_vars);
+}
+
+static void
+dvar_asgn_internal(id, value, curr)
+    ID id;
+    VALUE value;
+    int curr;
+{
+    int n = 0;
+    struct RVarmap *vars = ruby_dyna_vars;
+
+    while (vars) {
+	if (curr && vars->id == 0) {
+	    /* first null is a dvar header */
+	    n++;
+	    if (n == 2) break;
+	}
+	if (vars->id == id) {
+	    vars->val = value;
+	    return;
+	}
+	vars = vars->next;
+    }
+    if (!ruby_dyna_vars) {
+	ruby_dyna_vars = new_dvar(id, value, 0);
+    }
+    else {
+	vars = new_dvar(id, value, ruby_dyna_vars->next);
+	ruby_dyna_vars->next = vars;
+    }
+}
+
+static inline void
+dvar_asgn(id, value)
+    ID id;
+    VALUE value;
+{
+    dvar_asgn_internal(id, value, 0);
+}
+
+static inline void
+dvar_asgn_curr(id, value)
+    ID id;
+    VALUE value;
+{
+    dvar_asgn_internal(id, value, 1);
+}
+
+VALUE *
+rb_svar(cnt)
+    int cnt;
+{
+    struct RVarmap *vars = ruby_dyna_vars;
+    ID id;
+
+    if (!ruby_scope->local_tbl) return NULL;
+    if (cnt >= ruby_scope->local_tbl[0]) return NULL;
+    id = ruby_scope->local_tbl[cnt+1];
+    while (vars) {
+	if (vars->id == id) return &vars->val;
+	vars = vars->next;
+    }
+    if (ruby_scope->local_vars == 0) return NULL;
+    return &ruby_scope->local_vars[cnt];
+}
+
+struct iter {
+    int iter;
+    struct iter *prev;
+};
+static struct iter *ruby_iter;
+
+#define ITER_NOT 0
+#define ITER_PRE 1
+#define ITER_CUR 2
+#define ITER_PAS 3
+
+#define PUSH_ITER(i) do {		\
+    struct iter _iter;			\
+    _iter.prev = ruby_iter;		\
+    _iter.iter = (i);			\
+    ruby_iter = &_iter
+
+#define POP_ITER()			\
+    ruby_iter = _iter.prev;		\
+} while (0)
+
+struct tag {
+    rb_jmpbuf_t buf;
+    struct FRAME *frame;
+    struct iter *iter;
+    VALUE tag;
+    VALUE retval;
+    struct SCOPE *scope;
+    VALUE dst;
+    struct tag *prev;
+    int blkid;
+};
+static struct tag *prot_tag;
+
+#define PUSH_TAG(ptag) do {		\
+    struct tag _tag;			\
+    _tag.retval = Qnil;			\
+    _tag.frame = ruby_frame;		\
+    _tag.iter = ruby_iter;		\
+    _tag.prev = prot_tag;		\
+    _tag.scope = ruby_scope;		\
+    _tag.tag = ptag;			\
+    _tag.dst = 0;			\
+    _tag.blkid = 0;			\
+    prot_tag = &_tag
+
+#define PROT_NONE   Qfalse	/* 0 */
+#define PROT_THREAD Qtrue	/* 2 */
+#define PROT_FUNC   INT2FIX(0)	/* 1 */
+#define PROT_LOOP   INT2FIX(1)	/* 3 */
+#define PROT_LAMBDA INT2FIX(2)	/* 5 */
+#define PROT_YIELD  INT2FIX(3)	/* 7 */
+
+#define EXEC_TAG()    (FLUSH_REGISTER_WINDOWS, ruby_setjmp(((void)0), prot_tag->buf))
+
+#define JUMP_TAG(st) do {		\
+    ruby_frame = prot_tag->frame;	\
+    ruby_iter = prot_tag->iter;		\
+    ruby_longjmp(prot_tag->buf,(st));	\
+} while (0)
+
+#define POP_TAG()			\
+    prot_tag = _tag.prev;		\
+} while (0)
+
+#define TAG_DST() (_tag.dst == (VALUE)ruby_frame->uniq)
+
+#define TAG_RETURN	0x1
+#define TAG_BREAK	0x2
+#define TAG_NEXT	0x3
+#define TAG_RETRY	0x4
+#define TAG_REDO	0x5
+#define TAG_RAISE	0x6
+#define TAG_THROW	0x7
+#define TAG_FATAL	0x8
+#define TAG_MASK	0xf
+
+VALUE ruby_class;
+static VALUE ruby_wrapper;	/* security wrapper */
+
+#define PUSH_CLASS(c) do {		\
+    VALUE _class = ruby_class;		\
+    ruby_class = (c)
+
+#define POP_CLASS() ruby_class = _class; \
+} while (0)
+
+NODE *ruby_cref = 0;
+NODE *ruby_top_cref;
+#define PUSH_CREF(c) ruby_cref = NEW_NODE(NODE_CREF,(c),0,ruby_cref)
+#define POP_CREF() ruby_cref = ruby_cref->nd_next
+
+#define PUSH_SCOPE() do {		\
+    volatile int _vmode = scope_vmode;	\
+    struct SCOPE * volatile _old;	\
+    NEWOBJ(_scope, struct SCOPE);	\
+    OBJSETUP(_scope, 0, T_SCOPE);	\
+    _scope->local_tbl = 0;		\
+    _scope->local_vars = 0;		\
+    _scope->flags = 0;			\
+    _old = ruby_scope;			\
+    ruby_scope = _scope;		\
+    scope_vmode = SCOPE_PUBLIC
+
+rb_thread_t rb_curr_thread;
+rb_thread_t rb_main_thread;
+#define main_thread rb_main_thread
+#define curr_thread rb_curr_thread
+
+static void scope_dup _((struct SCOPE *));
+
+#define POP_SCOPE() 			\
+    if (ruby_scope->flags & SCOPE_DONT_RECYCLE) {\
+	if (_old) scope_dup(_old);	\
+    }					\
+    if (!(ruby_scope->flags & SCOPE_MALLOC)) {\
+	ruby_scope->local_vars = 0;	\
+	ruby_scope->local_tbl  = 0;	\
+	if (!(ruby_scope->flags & SCOPE_DONT_RECYCLE) && \
+	    ruby_scope != top_scope) {	\
+	    rb_gc_force_recycle((VALUE)ruby_scope);\
+	}				\
+    }					\
+    ruby_scope->flags |= SCOPE_NOSTACK;	\
+    ruby_scope = _old;			\
+    scope_vmode = _vmode;		\
+} while (0)
+
+static VALUE rb_eval _((VALUE,NODE*));
+static VALUE eval _((VALUE,VALUE,VALUE,char*,int));
+static NODE *compile _((VALUE, char*, int));
+
+static VALUE rb_yield_0 _((VALUE, VALUE, VALUE, int, int));
+
+#define YIELD_LAMBDA_CALL 1
+#define YIELD_PROC_CALL   2
+#define YIELD_PUBLIC_DEF  4
+#define YIELD_FUNC_AVALUE 1
+#define YIELD_FUNC_SVALUE 2
+
+static VALUE rb_call _((VALUE,VALUE,ID,int,const VALUE*,int,VALUE));
+static VALUE module_setup _((VALUE,NODE*));
+
+static VALUE massign _((VALUE,NODE*,VALUE,int));
+static void assign _((VALUE,NODE*,VALUE,int));
+
+typedef struct event_hook {
+    rb_event_hook_func_t func;
+    rb_event_t events;
+    struct event_hook *next;
+} rb_event_hook_t;
+
+static rb_event_hook_t *event_hooks;
+
+#define EXEC_EVENT_HOOK(event, node, self, id, klass) \
+    do { \
+	rb_event_hook_t *hook = event_hooks; \
+        rb_event_hook_func_t hook_func; \
+        rb_event_t events; \
+	\
+	while (hook) { \
+            hook_func = hook->func; \
+            events = hook->events; \
+            hook = hook->next; \
+	    if (events & event) \
+		(*hook_func)(event, node, self, id, klass); \
+	} \
+    } while (0)
+
+static VALUE trace_func = 0;
+static int tracing = 0;
+static void call_trace_func _((rb_event_t,NODE*,VALUE,ID,VALUE));
+
+#if 0
+#define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \
+			      ruby_sourceline = nd_line(ruby_current_node))
+#else
+#define SET_CURRENT_SOURCE() ((void)0)
+#endif
+
+void
+ruby_set_current_source()
+{
+    if (ruby_current_node) {
+	ruby_sourcefile = ruby_current_node->nd_file;
+	ruby_sourceline = nd_line(ruby_current_node);
+    }
+}
+
+static void
+#ifdef HAVE_STDARG_PROTOTYPES
+warn_printf(const char *fmt, ...)
+#else
+warn_printf(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
+{
+    char buf[BUFSIZ];
+    va_list args;
+
+    va_init_list(args, fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
+    va_end(args);
+    rb_write_error(buf);
+}
+
+#define warn_print(x) rb_write_error(x)
+#define warn_print2(x,l) rb_write_error2(x,l)
+
+static void
+error_pos()
+{
+    ruby_set_current_source();
+    if (ruby_sourcefile) {
+	if (ruby_frame->last_func) {
+	    warn_printf("%s:%d:in `%s'", ruby_sourcefile, ruby_sourceline,
+			rb_id2name(ruby_frame->orig_func));
+	}
+	else if (ruby_sourceline == 0) {
+	    warn_printf("%s", ruby_sourcefile);
+	}
+	else {
+	    warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
+	}
+    }
+}
+
+VALUE rb_check_backtrace(VALUE);
+
+static VALUE
+get_backtrace(info)
+    VALUE info;
+{
+    if (NIL_P(info)) return Qnil;
+    info = rb_funcall(info, rb_intern("backtrace"), 0);
+    if (NIL_P(info)) return Qnil;
+    return rb_check_backtrace(info);
+}
+
+static void
+set_backtrace(info, bt)
+    VALUE info, bt;
+{
+    rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
+}
+
+static void
+error_print()
+{
+    VALUE errat = Qnil;		/* OK */
+    volatile VALUE eclass, e;
+    char *einfo;
+    long elen;
+
+    if (NIL_P(ruby_errinfo)) return;
+
+    PUSH_TAG(PROT_NONE);
+    if (EXEC_TAG() == 0) {
+	errat = get_backtrace(ruby_errinfo);
+    }
+    else {
+	errat = Qnil;
+    }
+    if (EXEC_TAG()) goto error;
+    if (NIL_P(errat)){
+	ruby_set_current_source();
+	if (ruby_sourcefile)
+	    warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
+	else
+	    warn_printf("%d", ruby_sourceline);
+    }
+    else if (RARRAY(errat)->len == 0) {
+	error_pos();
+    }
+    else {
+	VALUE mesg = RARRAY(errat)->ptr[0];
+
+	if (NIL_P(mesg)) error_pos();
+	else {
+	    warn_print2(RSTRING(mesg)->ptr, RSTRING(mesg)->len);
+	}
+    }
+
+    eclass = CLASS_OF(ruby_errinfo);
+    if (EXEC_TAG() == 0) {
+  	e = rb_funcall(ruby_errinfo, rb_intern("message"), 0, 0);
+ 	StringValue(e);
+	einfo = RSTRING(e)->ptr;
+	elen = RSTRING(e)->len;
+    }
+    else {
+	einfo = "";
+	elen = 0;
+    }
+    if (EXEC_TAG()) goto error;
+    if (eclass == rb_eRuntimeError && elen == 0) {
+	warn_print(": unhandled exception\n");
+    }
+    else {
+	VALUE epath;
+
+	epath = rb_class_name(eclass);
+	if (elen == 0) {
+	    warn_print(": ");
+	    warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
+	    warn_print("\n");
+	}
+	else {
+	    char *tail  = 0;
+	    long len = elen;
+
+	    if (RSTRING(epath)->ptr[0] == '#') epath = 0;
+	    if (tail = memchr(einfo, '\n', elen)) {
+		len = tail - einfo;
+		tail++;		/* skip newline */
+	    }
+	    warn_print(": ");
+	    warn_print2(einfo, len);
+	    if (epath) {
+		warn_print(" (");
+		warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
+		warn_print(")\n");
+	    }
+	    if (tail) {
+		warn_print2(tail, elen-len-1);
+	    }
+	}
+    }
+
+    if (!NIL_P(errat)) {
+	long i;
+	struct RArray *ep = RARRAY(errat);
+
+#define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
+#define TRACE_HEAD 8
+#define TRACE_TAIL 5
+
+	ep = RARRAY(errat);
+	for (i=1; i<ep->len; i++) {
+	    if (TYPE(ep->ptr[i]) == T_STRING) {
+		warn_printf("\tfrom %s\n", RSTRING(ep->ptr[i])->ptr);
+	    }
+	    if (i == TRACE_HEAD && ep->len > TRACE_MAX) {
+		warn_printf("\t ... %ld levels...\n",
+			ep->len - TRACE_HEAD - TRACE_TAIL);
+		i = ep->len - TRACE_TAIL;
+	    }
+	}
+    }
+  error:
+    POP_TAG();
+}
+
+#if defined(__APPLE__)
+#define environ (*_NSGetEnviron())
+#elif !defined(_WIN32) && !defined(__MACOS__) || defined(_WIN32_WCE)
+extern char **environ;
+#endif
+char **rb_origenviron;
+
+void rb_call_inits _((void));
+void Init_stack _((VALUE*));
+void Init_heap _((void));
+void Init_ext _((void));
+
+#ifdef HAVE_NATIVETHREAD
+static rb_nativethread_t ruby_thid;
+int 
+is_ruby_native_thread() {
+    return NATIVETHREAD_EQUAL(ruby_thid, NATIVETHREAD_CURRENT());
+}
+
+# ifdef HAVE_NATIVETHREAD_KILL
+void
+ruby_native_thread_kill(sig)
+    int sig;
+{
+    NATIVETHREAD_KILL(ruby_thid, sig);
+}
+# endif
+#endif
+
+void
+ruby_init()
+{
+    static int initialized = 0;
+    static struct FRAME frame;
+    static struct iter iter;
+    int state;
+
+    if (initialized)
+	return;
+    initialized = 1;
+#ifdef HAVE_NATIVETHREAD
+    ruby_thid = NATIVETHREAD_CURRENT();
+#endif
+
+    ruby_frame = top_frame = &frame;
+    ruby_iter = &iter;
+
+#ifdef __MACOS__
+    rb_origenviron = 0;
+#else
+    rb_origenviron = environ;
+#endif
+
+    Init_stack((void*)&state);
+    Init_heap();
+    PUSH_SCOPE();
+    ruby_scope->local_vars = 0;
+    ruby_scope->local_tbl  = 0;
+    top_scope = ruby_scope;
+    /* default visibility is private at toplevel */
+    SCOPE_SET(SCOPE_PRIVATE);
+
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	rb_call_inits();
+	ruby_class = rb_cObject;
+	ruby_frame->self = ruby_top_self;
+	ruby_top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0);
+	ruby_cref = ruby_top_cref;
+	rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self));
+#ifdef __MACOS__
+	_macruby_init();
+#elif defined(__VMS)
+	_vmsruby_init();
+#endif
+	ruby_prog_init();
+	ALLOW_INTS;
+    }
+    POP_TAG();
+    if (state) {
+	error_print();
+	exit(EXIT_FAILURE);
+    }
+    POP_SCOPE();
+    ruby_scope = top_scope;
+    top_scope->flags &= ~SCOPE_NOSTACK;
+    ruby_running = 1;
+}
+
+static VALUE
+eval_node(self, node)
+    VALUE self;
+    NODE *node;
+{
+    NODE *beg_tree = ruby_eval_tree_begin;
+
+    ruby_eval_tree_begin = 0;
+    if (beg_tree) {
+	rb_eval(self, beg_tree);
+    }
+
+    if (!node) return Qnil;
+    return rb_eval(self, node);
+}
+
+int ruby_in_eval;
+
+static void rb_thread_cleanup _((void));
+static void rb_thread_wait_other_threads _((void));
+
+static int thread_set_raised();
+static int thread_reset_raised();
+
+static int thread_no_ensure _((void));
+
+static VALUE exception_error;
+static VALUE sysstack_error;
+
+static int
+sysexit_status(err)
+    VALUE err;
+{
+    VALUE st = rb_iv_get(err, "status");
+    return NUM2INT(st);
+}
+
+static int
+error_handle(ex)
+    int ex;
+{
+    int status = EXIT_FAILURE;
+
+    if (thread_set_raised()) return EXIT_FAILURE;
+    switch (ex & TAG_MASK) {
+      case 0:
+	status = EXIT_SUCCESS;
+	break;
+
+      case TAG_RETURN:
+	error_pos();
+	warn_print(": unexpected return\n");
+	break;
+      case TAG_NEXT:
+	error_pos();
+	warn_print(": unexpected next\n");
+	break;
+      case TAG_BREAK:
+	error_pos();
+	warn_print(": unexpected break\n");
+	break;
+      case TAG_REDO:
+	error_pos();
+	warn_print(": unexpected redo\n");
+	break;
+      case TAG_RETRY:
+	error_pos();
+	warn_print(": retry outside of rescue clause\n");
+	break;
+      case TAG_THROW:
+	if (prot_tag && prot_tag->frame && prot_tag->frame->node) {
+	    NODE *tag = prot_tag->frame->node;
+	    warn_printf("%s:%d: uncaught throw\n",
+		    tag->nd_file, nd_line(tag));
+	}
+	else {
+	    error_pos();
+	    warn_printf(": unexpected throw\n");
+	}
+	break;
+      case TAG_RAISE:
+      case TAG_FATAL:
+	if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
+	    status = sysexit_status(ruby_errinfo);
+	}
+	else if (rb_obj_is_instance_of(ruby_errinfo, rb_eSignal)) {
+	    /* no message when exiting by signal */
+	}
+	else {
+	    error_print();
+	}
+	break;
+      default:
+	rb_bug("Unknown longjmp status %d", ex);
+	break;
+    }
+    thread_reset_raised();
+    return status;
+}
+
+void
+ruby_options(argc, argv)
+    int argc;
+    char **argv;
+{
+    int state;
+
+    Init_stack((void*)&state);
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	ruby_process_options(argc, argv);
+    }
+    else {
+	trace_func = 0;
+	tracing = 0;
+	exit(error_handle(state));
+    }
+    POP_TAG();
+}
+
+void rb_exec_end_proc _((void));
+
+static void
+ruby_finalize_0()
+{
+    PUSH_TAG(PROT_NONE);
+    if (EXEC_TAG() == 0) {
+	rb_trap_exit();
+    }
+    POP_TAG();
+    rb_exec_end_proc();
+}
+
+static void
+ruby_finalize_1()
+{
+    signal(SIGINT, SIG_DFL);
+    ruby_errinfo = 0;
+    rb_gc_call_finalizer_at_exit();
+    trace_func = 0;
+    tracing = 0;
+}
+
+void
+ruby_finalize()
+{
+    ruby_finalize_0();
+    ruby_finalize_1();
+}
+
+int
+ruby_cleanup(ex)
+    int ex;
+{
+    int state;
+    volatile VALUE errs[2];
+    int nerr;
+
+    errs[1] = ruby_errinfo;
+    ruby_safe_level = 0;
+    Init_stack((void *)&state);
+    ruby_finalize_0();
+    errs[0] = ruby_errinfo;
+    PUSH_TAG(PROT_NONE);
+    PUSH_ITER(ITER_NOT);
+    if ((state = EXEC_TAG()) == 0) {
+	rb_thread_cleanup();
+	rb_thread_wait_other_threads();
+    }
+    else if (ex == 0) {
+	ex = state;
+    }
+    POP_ITER();
+    ruby_errinfo = errs[1];
+    ex = error_handle(ex);
+    ruby_finalize_1();
+    POP_TAG();
+
+    for (nerr = 0; nerr < sizeof(errs) / sizeof(errs[0]); ++nerr) {
+	VALUE err = errs[nerr];
+
+	if (!RTEST(err)) continue;
+
+	if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
+	    return sysexit_status(err);
+	}
+	else if (rb_obj_is_kind_of(err, rb_eSignal)) {
+	    VALUE sig = rb_iv_get(err, "signo");
+	    ruby_default_signal(NUM2INT(sig));
+	}
+	else if (ex == 0) {
+	    ex = 1;
+	}
+    }
+
+#if EXIT_SUCCESS != 0 || EXIT_FAILURE != 1
+    switch (ex) {
+#if EXIT_SUCCESS != 0
+      case 0: return EXIT_SUCCESS;
+#endif
+#if EXIT_FAILURE != 1
+      case 1: return EXIT_FAILURE;
+#endif
+    }
+#endif
+
+    return ex;
+}
+
+static int
+ruby_exec_internal()
+{
+    int state;
+
+    PUSH_TAG(PROT_NONE);
+    PUSH_ITER(ITER_NOT);
+    /* default visibility is private at toplevel */
+    SCOPE_SET(SCOPE_PRIVATE);
+    if ((state = EXEC_TAG()) == 0) {
+	eval_node(ruby_top_self, ruby_eval_tree);
+    }
+    POP_ITER();
+    POP_TAG();
+    return state;
+}
+
+void
+ruby_stop(ex)
+    int ex;
+{
+    exit(ruby_cleanup(ex));
+}
+
+int
+ruby_exec()
+{
+    volatile NODE *tmp;
+
+    Init_stack((void*)&tmp);
+    return ruby_exec_internal();
+}
+
+void
+ruby_run()
+{
+    int state;
+    static int ex;
+
+    if (ruby_nerrs > 0) exit(EXIT_FAILURE);
+    state = ruby_exec();
+    if (state && !ex) ex = state;
+    ruby_stop(ex);
+}
+
+static void
+compile_error(at)
+    const char *at;
+{
+    VALUE str;
+
+    ruby_nerrs = 0;
+    str = rb_str_buf_new2("compile error");
+    if (at) {
+	rb_str_buf_cat2(str, " in ");
+	rb_str_buf_cat2(str, at);
+    }
+    rb_str_buf_cat(str, "\n", 1);
+    if (!NIL_P(ruby_errinfo)) {
+	rb_str_append(str, rb_obj_as_string(ruby_errinfo));
+    }
+    rb_exc_raise(rb_exc_new3(rb_eSyntaxError, str));
+}
+
+VALUE
+rb_eval_string(str)
+    const char *str;
+{
+    VALUE v;
+    NODE *oldsrc = ruby_current_node;
+
+    ruby_current_node = 0;
+    ruby_sourcefile = rb_source_filename("(eval)");
+    v = eval(ruby_top_self, rb_str_new2(str), Qnil, 0, 0);
+    ruby_current_node = oldsrc;
+
+    return v;
+}
+
+VALUE
+rb_eval_string_protect(str, state)
+    const char *str;
+    int *state;
+{
+    return rb_protect((VALUE (*)_((VALUE)))rb_eval_string, (VALUE)str, state);
+}
+
+VALUE
+rb_eval_string_wrap(str, state)
+    const char *str;
+    int *state;
+{
+    int status;
+    VALUE self = ruby_top_self;
+    VALUE wrapper = ruby_wrapper;
+    VALUE val;
+
+    PUSH_CLASS(ruby_wrapper = rb_module_new());
+    ruby_top_self = rb_obj_clone(ruby_top_self);
+    rb_extend_object(ruby_top_self, ruby_wrapper);
+    PUSH_FRAME();
+    ruby_frame->last_func = 0;
+    ruby_frame->last_class = 0;
+    ruby_frame->self = self;
+    PUSH_CREF(ruby_wrapper);
+    PUSH_SCOPE();
+
+    val = rb_eval_string_protect(str, &status);
+    ruby_top_self = self;
+
+    POP_SCOPE();
+    POP_FRAME();
+    POP_CLASS();
+    ruby_wrapper = wrapper;
+    if (state) {
+	*state = status;
+    }
+    else if (status) {
+	JUMP_TAG(status);
+    }
+    return val;
+}
+
+NORETURN(static void localjump_error(const char*, VALUE, int));
+static void
+localjump_error(mesg, value, reason)
+    const char *mesg;
+    VALUE value;
+    int reason;
+{
+    VALUE exc = rb_exc_new2(rb_eLocalJumpError, mesg);
+    ID id;
+
+    rb_iv_set(exc, "@exit_value", value);
+    switch (reason) {
+      case TAG_BREAK:
+	id = rb_intern("break"); break;
+      case TAG_REDO:
+	id = rb_intern("redo"); break;
+      case TAG_RETRY:
+	id = rb_intern("retry"); break;
+      case TAG_NEXT:
+	id = rb_intern("next"); break;
+      case TAG_RETURN:
+	id = rb_intern("return"); break;
+      default:
+	id = rb_intern("noreason"); break;
+    }
+    rb_iv_set(exc, "@reason", ID2SYM(id));
+    rb_exc_raise(exc);
+}
+
+/*
+ * call_seq:
+ *   local_jump_error.exit_value  => obj
+ *
+ * Returns the exit value associated with this +LocalJumpError+.
+ */
+static VALUE
+localjump_xvalue(exc)
+    VALUE exc;
+{
+    return rb_iv_get(exc, "@exit_value");
+}
+
+/*
+ * call-seq:
+ *    local_jump_error.reason   => symbol
+ *
+ * The reason this block was terminated:
+ * :break, :redo, :retry, :next, :return, or :noreason.
+ */
+
+static VALUE
+localjump_reason(exc)
+    VALUE exc;
+{
+    return rb_iv_get(exc, "@reason");
+}
+
+NORETURN(static void jump_tag_but_local_jump _((int,VALUE)));
+static void
+jump_tag_but_local_jump(state, val)
+    int state;
+    VALUE val;
+{
+
+    if (val == Qundef) val = prot_tag->retval;
+    switch (state) {
+      case 0:
+	break;
+      case TAG_RETURN:
+	localjump_error("unexpected return", val, state);
+	break;
+      case TAG_BREAK:
+	localjump_error("unexpected break", val, state);
+	break;
+      case TAG_NEXT:
+	localjump_error("unexpected next", val, state);
+	break;
+      case TAG_REDO:
+	localjump_error("unexpected redo", Qnil, state);
+	break;
+      case TAG_RETRY:
+	localjump_error("retry outside of rescue clause", Qnil, state);
+	break;
+      default:
+	break;
+    }
+    JUMP_TAG(state);
+}
+
+VALUE
+rb_eval_cmd(cmd, arg, level)
+    VALUE cmd, arg;
+    int level;
+{
+    int state;
+    VALUE val = Qnil;		/* OK */
+    struct SCOPE *saved_scope;
+    volatile int safe = ruby_safe_level;
+
+    if (OBJ_TAINTED(cmd)) {
+	level = 4;
+    }
+    if (TYPE(cmd) != T_STRING) {
+	PUSH_ITER(ITER_NOT);
+	PUSH_TAG(PROT_NONE);
+	ruby_safe_level = level;
+	if ((state = EXEC_TAG()) == 0) {
+	    val = rb_funcall2(cmd, rb_intern("call"), RARRAY(arg)->len, RARRAY(arg)->ptr);
+	}
+	ruby_safe_level = safe;
+	POP_TAG();
+	POP_ITER();
+	if (state) JUMP_TAG(state);
+	return val;
+    }
+
+    saved_scope = ruby_scope;
+    ruby_scope = top_scope;
+    PUSH_FRAME();
+    ruby_frame->last_func = 0;
+    ruby_frame->last_class = 0;
+    ruby_frame->self = ruby_top_self;
+    PUSH_CREF(ruby_wrapper ? ruby_wrapper : rb_cObject);
+
+    ruby_safe_level = level;
+
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	val = eval(ruby_top_self, cmd, Qnil, 0, 0);
+    }
+    if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
+	scope_dup(saved_scope);
+    ruby_scope = saved_scope;
+    ruby_safe_level = safe;
+    POP_TAG();
+    POP_FRAME();
+
+    if (state) jump_tag_but_local_jump(state, val);
+    return val;
+}
+
+#define ruby_cbase (ruby_cref->nd_clss)
+
+static VALUE
+ev_const_defined(cref, id, self)
+    NODE *cref;
+    ID id;
+    VALUE self;
+{
+    NODE *cbase = cref;
+    VALUE result;
+
+    while (cbase && cbase->nd_next) {
+	struct RClass *klass = RCLASS(cbase->nd_clss);
+
+	if (!NIL_P(klass)) {
+	    if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) {
+		if (result == Qundef && NIL_P(rb_autoload_p((VALUE)klass, id))) {
+		    return Qfalse;
+		}
+		return Qtrue;
+	    }
+	}
+	cbase = cbase->nd_next;
+    }
+    return rb_const_defined(cref->nd_clss, id);
+}
+
+static VALUE
+ev_const_get(cref, id, self)
+    NODE *cref;
+    ID id;
+    VALUE self;
+{
+    NODE *cbase = cref;
+    VALUE result;
+
+    while (cbase && cbase->nd_next) {
+	VALUE klass = cbase->nd_clss;
+
+	if (!NIL_P(klass)) {
+	    while (RCLASS(klass)->iv_tbl &&
+		   st_lookup(RCLASS(klass)->iv_tbl, id, &result)) {
+		if (result == Qundef) {
+		    if (!RTEST(rb_autoload_load(klass, id))) break;
+		    continue;
+		}
+		return result;
+	    }
+	}
+	cbase = cbase->nd_next;
+    }
+    return rb_const_get(NIL_P(cref->nd_clss) ? CLASS_OF(self): cref->nd_clss, id);
+}
+
+static VALUE
+cvar_cbase()
+{
+    NODE *cref = ruby_cref;
+
+    while (cref && cref->nd_next && (NIL_P(cref->nd_clss) || FL_TEST(cref->nd_clss, FL_SINGLETON))) {
+	cref = cref->nd_next;
+	if (!cref->nd_next) {
+	    rb_warn("class variable access from toplevel singleton method");
+	}
+    }
+    if (NIL_P(cref->nd_clss)) {
+	rb_raise(rb_eTypeError, "no class variables available");
+    }
+    return cref->nd_clss;
+}
+
+/*
+ *  call-seq:
+ *     Module.nesting    => array
+ *  
+ *  Returns the list of +Modules+ nested at the point of call.
+ *     
+ *     module M1
+ *       module M2
+ *         $a = Module.nesting
+ *       end
+ *     end
+ *     $a           #=> [M1::M2, M1]
+ *     $a[0].name   #=> "M1::M2"
+ */
+
+static VALUE
+rb_mod_nesting()
+{
+    NODE *cbase = ruby_cref;
+    VALUE ary = rb_ary_new();
+
+    while (cbase && cbase->nd_next) {
+	if (!NIL_P(cbase->nd_clss)) rb_ary_push(ary, cbase->nd_clss);
+	cbase = cbase->nd_next;
+    }
+    if (ruby_wrapper && RARRAY(ary)->len == 0) {
+	rb_ary_push(ary, ruby_wrapper);
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     Module.constants   => array
+ *  
+ *  Returns an array of the names of all constants defined in the
+ *  system. This list includes the names of all modules and classes.
+ *     
+ *     p Module.constants.sort[1..5]
+ *     
+ *  <em>produces:</em>
+ *     
+ *     ["ARGV", "ArgumentError", "Array", "Bignum", "Binding"]
+ */
+
+static VALUE
+rb_mod_s_constants()
+{
+    NODE *cbase = ruby_cref;
+    void *data = 0;
+
+    while (cbase) {
+	if (!NIL_P(cbase->nd_clss)) {
+	    data = rb_mod_const_at(cbase->nd_clss, data);
+	}
+	cbase = cbase->nd_next;
+    }
+
+    if (!NIL_P(ruby_cbase)) {
+	data = rb_mod_const_of(ruby_cbase, data);
+    }
+    return rb_const_list(data);
+}
+
+void
+rb_frozen_class_p(klass)
+    VALUE klass;
+{
+    char *desc = "something(?!)";
+
+    if (OBJ_FROZEN(klass)) {
+	if (FL_TEST(klass, FL_SINGLETON))
+	    desc = "object";
+	else {
+	    switch (TYPE(klass)) {
+	      case T_MODULE:
+	      case T_ICLASS:
+		desc = "module"; break;
+	      case T_CLASS:
+		desc = "class"; break;
+	    }
+	}
+	rb_error_frozen(desc);
+    }
+}
+
+void
+rb_undef(klass, id)
+    VALUE klass;
+    ID id;
+{
+    VALUE origin;
+    NODE *body;
+
+    if (ruby_cbase == rb_cObject && klass == rb_cObject) {
+	rb_secure(4);
+    }
+    if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't undef `%s'", rb_id2name(id));
+    }
+    rb_frozen_class_p(klass);
+    if (id == __id__ || id == __send__ || id == init) {
+	rb_warn("undefining `%s' may cause serious problem", rb_id2name(id));
+    }
+    body = search_method(klass, id, &origin);
+    if (!body || !body->nd_body) {
+	char *s0 = " class";
+	VALUE c = klass;
+
+	if (FL_TEST(c, FL_SINGLETON)) {
+	    VALUE obj = rb_iv_get(klass, "__attached__");
+
+	    switch (TYPE(obj)) {
+	      case T_MODULE:
+	      case T_CLASS:
+		c = obj;
+		s0 = "";
+	    }
+	}
+	else if (TYPE(c) == T_MODULE) {
+	    s0 = " module";
+	}
+	rb_name_error(id, "undefined method `%s' for%s `%s'",
+		      rb_id2name(id),s0,rb_class2name(c));
+    }
+    rb_add_method(klass, id, 0, NOEX_PUBLIC);
+    if (FL_TEST(klass, FL_SINGLETON)) {
+	rb_funcall(rb_iv_get(klass, "__attached__"),
+		   singleton_undefined, 1, ID2SYM(id));
+    }
+    else {
+	rb_funcall(klass, undefined, 1, ID2SYM(id));
+    }
+}
+
+/*
+ *  call-seq:
+ *     undef_method(symbol)    => self
+ *  
+ *  Prevents the current class from responding to calls to the named
+ *  method. Contrast this with <code>remove_method</code>, which deletes
+ *  the method from the particular class; Ruby will still search
+ *  superclasses and mixed-in modules for a possible receiver.
+ *     
+ *     class Parent
+ *       def hello
+ *         puts "In parent"
+ *       end
+ *     end
+ *     class Child < Parent
+ *       def hello
+ *         puts "In child"
+ *       end
+ *     end
+ *     
+ *     
+ *     c = Child.new
+ *     c.hello
+ *     
+ *     
+ *     class Child
+ *       remove_method :hello  # remove from child, still in parent
+ *     end
+ *     c.hello
+ *     
+ *     
+ *     class Child
+ *       undef_method :hello   # prevent any calls to 'hello'
+ *     end
+ *     c.hello
+ *     
+ *  <em>produces:</em>
+ *     
+ *     In child
+ *     In parent
+ *     prog.rb:23: undefined method `hello' for #<Child:0x401b3bb4> (NoMethodError)
+ */
+
+static VALUE
+rb_mod_undef_method(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
+{
+    int i;
+
+    for (i=0; i<argc; i++) {
+	rb_undef(mod, rb_to_id(argv[i]));
+    }
+    return mod;
+}
+
+void
+rb_alias(klass, name, def)
+    VALUE klass;
+    ID name, def;
+{
+    VALUE origin;
+    NODE *orig, *body, *node;
+    VALUE singleton = 0;
+
+    rb_frozen_class_p(klass);
+    if (name == def) return;
+    if (klass == rb_cObject) {
+	rb_secure(4);
+    }
+    orig = search_method(klass, def, &origin);
+    if (!orig || !orig->nd_body) {
+	if (TYPE(klass) == T_MODULE) {
+	    orig = search_method(rb_cObject, def, &origin);
+	}
+    }
+    if (!orig || !orig->nd_body) {
+	print_undef(klass, def);
+    }
+    if (FL_TEST(klass, FL_SINGLETON)) {
+	singleton = rb_iv_get(klass, "__attached__");
+    }
+    body = orig->nd_body;
+    orig->nd_cnt++;
+    if (nd_type(body) == NODE_FBODY) { /* was alias */
+	def = body->nd_mid;
+	origin = body->nd_orig;
+	body = body->nd_head;
+    }
+
+    rb_clear_cache_by_id(name);
+    if (RTEST(ruby_verbose) && st_lookup(RCLASS(klass)->m_tbl, name, (st_data_t *)&node)) {
+	if (node->nd_cnt == 0 && node->nd_body) {
+	    rb_warning("discarding old %s", rb_id2name(name));
+	}
+    }
+    st_insert(RCLASS(klass)->m_tbl, name,
+	      (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin),
+				    NOEX_WITH_SAFE(orig->nd_noex)));
+    if (singleton) {
+	rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
+    }
+    else {
+	rb_funcall(klass, added, 1, ID2SYM(name));
+    }
+}
+
+/*
+ *  call-seq:
+ *     alias_method(new_name, old_name)   => self
+ *  
+ *  Makes <i>new_name</i> a new copy of the method <i>old_name</i>. This can
+ *  be used to retain access to methods that are overridden.
+ *     
+ *     module Mod
+ *       alias_method :orig_exit, :exit
+ *       def exit(code=0)
+ *         puts "Exiting with code #{code}"
+ *         orig_exit(code)
+ *       end
+ *     end
+ *     include Mod
+ *     exit(99)
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Exiting with code 99
+ */
+
+static VALUE
+rb_mod_alias_method(mod, newname, oldname)
+    VALUE mod, newname, oldname;
+{
+    rb_alias(mod, rb_to_id(newname), rb_to_id(oldname));
+    return mod;
+}
+
+static NODE*
+copy_node_scope(node, rval)
+    NODE *node;
+    NODE *rval;
+{
+    NODE *copy = NEW_NODE(NODE_SCOPE,0,rval,node->nd_next);
+
+    if (node->nd_tbl) {
+	copy->nd_tbl = ALLOC_N(ID, node->nd_tbl[0]+1);
+	MEMCPY(copy->nd_tbl, node->nd_tbl, ID, node->nd_tbl[0]+1);
+    }
+    else {
+	copy->nd_tbl = 0;
+    }
+    return copy;
+}
+
+#ifdef C_ALLOCA
+# define TMP_PROTECT NODE * volatile tmp__protect_tmp=0
+# define TMP_ALLOC(n)							\
+    (tmp__protect_tmp = NEW_NODE(NODE_ALLOCA,				\
+				 ALLOC_N(VALUE,n),tmp__protect_tmp,n),	\
+     (void*)tmp__protect_tmp->nd_head)
+#else
+# define TMP_PROTECT typedef int foobazzz
+# define TMP_ALLOC(n) ALLOCA_N(VALUE,n)
+#endif
+
+#define SETUP_ARGS0(anode,extra) do {\
+    NODE *n = anode;\
+    if (!n) {\
+	argc = 0;\
+	argv = 0;\
+    }\
+    else if (nd_type(n) == NODE_ARRAY) {\
+	argc=anode->nd_alen;\
+	if (argc > 0) {\
+	    int i;\
+	    n = anode;\
+	    argv = TMP_ALLOC(argc+extra);\
+	    for (i=0;i<argc;i++) {\
+		argv[i] = rb_eval(self,n->nd_head);\
+		n=n->nd_next;\
+	    }\
+	}\
+	else {\
+	    argc = 0;\
+	    argv = 0;\
+	}\
+    }\
+    else {\
+	VALUE args = rb_eval(self,n);\
+	if (TYPE(args) != T_ARRAY)\
+	    args = rb_ary_to_ary(args);\
+	argc = RARRAY(args)->len;\
+	argv = TMP_ALLOC(argc+extra);\
+	MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);\
+    }\
+} while (0)
+
+#define SETUP_ARGS(anode) SETUP_ARGS0(anode,0)
+
+#define BEGIN_CALLARGS do {\
+    struct BLOCK *tmp_block = ruby_block;\
+    int tmp_iter = ruby_iter->iter;\
+    switch (tmp_iter) {\
+      case ITER_PRE:\
+	if (ruby_block) ruby_block = ruby_block->outer;\
+      case ITER_PAS:\
+	tmp_iter = ITER_NOT;\
+    }\
+    PUSH_ITER(tmp_iter)
+
+#define END_CALLARGS \
+    ruby_block = tmp_block;\
+    POP_ITER();\
+} while (0)
+
+#define MATCH_DATA *rb_svar(node->nd_cnt)
+
+static char* is_defined _((VALUE, NODE*, char*));
+
+static char*
+arg_defined(self, node, buf, type)
+    VALUE self;
+    NODE *node;
+    char *buf;
+    char *type;
+{
+    int argc;
+    int i;
+
+    if (!node) return type;	/* no args */
+    if (nd_type(node) == NODE_ARRAY) {
+	argc=node->nd_alen;
+	if (argc > 0) {
+	    for (i=0;i<argc;i++) {
+		if (!is_defined(self, node->nd_head, buf))
+		    return 0;
+		node = node->nd_next;
+	    }
+	}
+    }
+    else if (!is_defined(self, node, buf)) {
+	return 0;
+    }
+    return type;
+}
+
+static char*
+is_defined(self, node, buf)
+    VALUE self;
+    NODE *node;			/* OK */
+    char *buf;
+{
+    VALUE val;			/* OK */
+    int state;
+
+  again:
+    if (!node) return "expression";
+    switch (nd_type(node)) {
+      case NODE_SUPER:
+      case NODE_ZSUPER:
+	if (ruby_frame->last_func == 0) return 0;
+	else if (ruby_frame->last_class == 0) return 0;
+	val = ruby_frame->last_class;
+	if (rb_method_boundp(RCLASS(val)->super, ruby_frame->orig_func, 0)) {
+	    if (nd_type(node) == NODE_SUPER) {
+		return arg_defined(self, node->nd_args, buf, "super");
+	    }
+	    return "super";
+	}
+	break;
+
+      case NODE_VCALL:
+      case NODE_FCALL:
+	val = self;
+	goto check_bound;
+
+      case NODE_ATTRASGN:
+	val = self;
+	if (node->nd_recv == (NODE *)1) goto check_bound;
+      case NODE_CALL:
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    val = rb_eval(self, node->nd_recv);
+	}
+	POP_TAG();
+	if (state) {
+	    ruby_errinfo = Qnil;
+	    return 0;
+	}
+      check_bound:
+	{
+	    int call = nd_type(node)==NODE_CALL;
+
+	    val = CLASS_OF(val);
+	    if (call) {
+		int noex;
+		ID id = node->nd_mid;
+
+		if (!rb_get_method_body(&val, &id, &noex))
+		    break;
+		if ((noex & NOEX_PRIVATE))
+		    break;
+		if ((noex & NOEX_PROTECTED) &&
+		    !rb_obj_is_kind_of(self, rb_class_real(val)))
+		    break;
+	    }
+	    else if (!rb_method_boundp(val, node->nd_mid, call))
+		break;
+	    return arg_defined(self, node->nd_args, buf,
+			       nd_type(node) == NODE_ATTRASGN ?
+			       "assignment" : "method");
+	}
+	break;
+
+      case NODE_MATCH2:
+      case NODE_MATCH3:
+	return "method";
+
+      case NODE_YIELD:
+	if (rb_block_given_p()) {
+	    return "yield";
+	}
+	break;
+
+      case NODE_SELF:
+	return "self";
+
+      case NODE_NIL:
+	return "nil";
+
+      case NODE_TRUE:
+	return "true";
+
+      case NODE_FALSE:
+	return "false";
+
+      case NODE_ATTRSET:
+      case NODE_OP_ASGN1:
+      case NODE_OP_ASGN2:
+      case NODE_MASGN:
+      case NODE_LASGN:
+      case NODE_DASGN:
+      case NODE_DASGN_CURR:
+      case NODE_GASGN:
+      case NODE_IASGN:
+      case NODE_CDECL:
+      case NODE_CVDECL:
+      case NODE_CVASGN:
+	return "assignment";
+
+      case NODE_LVAR:
+	return "local-variable";
+      case NODE_DVAR:
+	return "local-variable(in-block)";
+
+      case NODE_GVAR:
+	if (rb_gvar_defined(node->nd_entry)) {
+	    return "global-variable";
+	}
+	break;
+
+      case NODE_IVAR:
+	if (rb_ivar_defined(self, node->nd_vid)) {
+	    return "instance-variable";
+	}
+	break;
+
+      case NODE_CONST:
+	if (ev_const_defined(ruby_cref, node->nd_vid, self)) {
+	    return "constant";
+	}
+	break;
+
+      case NODE_CVAR:
+	if (rb_cvar_defined(cvar_cbase(), node->nd_vid)) {
+	    return "class variable";
+	}
+	break;
+
+      case NODE_COLON2:
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    val = rb_eval(self, node->nd_head);
+	}
+	POP_TAG();
+	if (state) {
+	    ruby_errinfo = Qnil;
+	    return 0;
+	}
+	else {
+	    switch (TYPE(val)) {
+	      case T_CLASS:
+	      case T_MODULE:
+		if (rb_const_defined_from(val, node->nd_mid))
+		    return "constant";
+		break;
+	      default:
+		if (rb_method_boundp(CLASS_OF(val), node->nd_mid, 1)) {
+		    return "method";
+		}
+	    }
+	}
+	break;
+
+      case NODE_COLON3:
+	if (rb_const_defined_from(rb_cObject, node->nd_mid)) {
+	    return "constant";
+	}
+	break;
+
+      case NODE_NTH_REF:
+	if (RTEST(rb_reg_nth_defined(node->nd_nth, MATCH_DATA))) {
+	    sprintf(buf, "$%d", (int)node->nd_nth);
+	    return buf;
+	}
+	break;
+
+      case NODE_BACK_REF:
+	if (RTEST(rb_reg_nth_defined(0, MATCH_DATA))) {
+	    sprintf(buf, "$%c", (char)node->nd_nth);
+	    return buf;
+	}
+	break;
+
+      case NODE_NEWLINE:
+	node = node->nd_next;
+	goto again;
+
+      default:
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    rb_eval(self, node);
+	}
+	POP_TAG();
+	if (!state) {
+	    return "expression";
+	}
+	ruby_errinfo = Qnil;
+	break;
+    }
+    return 0;
+}
+
+static int handle_rescue _((VALUE,NODE*));
+
+static void blk_free();
+
+static VALUE
+rb_obj_is_proc(proc)
+    VALUE proc;
+{
+    if (TYPE(proc) == T_DATA && RDATA(proc)->dfree == (RUBY_DATA_FUNC)blk_free) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+void
+rb_add_event_hook(func, events)
+    rb_event_hook_func_t func;
+    rb_event_t events;
+{
+    rb_event_hook_t *hook;
+
+    hook = ALLOC(rb_event_hook_t);
+    hook->func = func;
+    hook->events = events;
+    hook->next = event_hooks;
+    event_hooks = hook;
+}
+
+int
+rb_remove_event_hook(func)
+    rb_event_hook_func_t func;
+{
+    rb_event_hook_t *prev, *hook;
+
+    prev = NULL;
+    hook = event_hooks;
+    while (hook) {
+	if (hook->func == func) {
+	    if (prev) {
+		prev->next = hook->next;
+	    }
+	    else {
+		event_hooks = hook->next;
+	    }
+	    xfree(hook);
+	    return 0;
+	}
+	prev = hook;
+	hook = hook->next;
+    }
+    return -1;
+}
+
+/*
+ *  call-seq:
+ *     set_trace_func(proc)    => proc
+ *     set_trace_func(nil)     => nil
+ *  
+ *  Establishes _proc_ as the handler for tracing, or disables
+ *  tracing if the parameter is +nil+. _proc_ takes up
+ *  to six parameters: an event name, a filename, a line number, an
+ *  object id, a binding, and the name of a class. _proc_ is
+ *  invoked whenever an event occurs. Events are: <code>c-call</code>
+ *  (call a C-language routine), <code>c-return</code> (return from a
+ *  C-language routine), <code>call</code> (call a Ruby method),
+ *  <code>class</code> (start a class or module definition),
+ *  <code>end</code> (finish a class or module definition),
+ *  <code>line</code> (execute code on a new line), <code>raise</code>
+ *  (raise an exception), and <code>return</code> (return from a Ruby
+ *  method). Tracing is disabled within the context of _proc_.
+ *
+ *      class Test
+ *	def test
+ *	  a = 1
+ *	  b = 2
+ *	end
+ *      end
+ *
+ *      set_trace_func proc { |event, file, line, id, binding, classname|
+ *	   printf "%8s %s:%-2d %10s %8s\n", event, file, line, id, classname
+ *      }
+ *      t = Test.new
+ *      t.test
+ *
+ *	  line prog.rb:11               false
+ *      c-call prog.rb:11        new    Class
+ *      c-call prog.rb:11 initialize   Object
+ *    c-return prog.rb:11 initialize   Object
+ *    c-return prog.rb:11        new    Class
+ *	  line prog.rb:12               false
+ *  	  call prog.rb:2        test     Test
+ *	  line prog.rb:3        test     Test
+ *	  line prog.rb:4        test     Test
+ *      return prog.rb:4        test     Test
+ */
+
+
+static VALUE
+set_trace_func(obj, trace)
+    VALUE obj, trace;
+{
+    rb_event_hook_t *hook;
+
+    rb_secure(4);
+    if (NIL_P(trace)) {
+	trace_func = 0;
+	rb_remove_event_hook(call_trace_func);
+	return Qnil;
+    }
+    if (!rb_obj_is_proc(trace)) {
+	rb_raise(rb_eTypeError, "trace_func needs to be Proc");
+    }
+    trace_func = trace;
+    for (hook = event_hooks; hook; hook = hook->next) {
+	if (hook->func == call_trace_func)
+	    return trace;
+    }
+    rb_add_event_hook(call_trace_func, RUBY_EVENT_ALL);
+    return trace;
+}
+
+static char *
+get_event_name(rb_event_t event)
+{
+    switch (event) {
+    case RUBY_EVENT_LINE:
+	return "line";
+    case RUBY_EVENT_CLASS:
+	return "class";
+    case RUBY_EVENT_END:
+	return "end";
+    case RUBY_EVENT_CALL:
+	return "call";
+    case RUBY_EVENT_RETURN:
+	return "return";
+    case RUBY_EVENT_C_CALL:
+	return "c-call";
+    case RUBY_EVENT_C_RETURN:
+	return "c-return";
+    case RUBY_EVENT_RAISE:
+	return "raise";
+    default:
+	return "unknown";
+    }
+}
+
+static void
+call_trace_func(event, node, self, id, klass)
+    rb_event_t event;
+    NODE *node;
+    VALUE self;
+    ID id;
+    VALUE klass;		/* OK */
+{
+    int state, raised;
+    struct FRAME *prev;
+    NODE *node_save;
+    VALUE srcfile;
+    char *event_name;
+
+    if (!trace_func) return;
+    if (tracing) return;
+    if (ruby_in_compile) return;
+    if (id == ID_ALLOCATOR) return;
+
+    if (!(node_save = ruby_current_node)) {
+	node_save = NEW_NEWLINE(0);
+    }
+    tracing = 1;
+    prev = ruby_frame;
+    PUSH_FRAME();
+    *ruby_frame = *prev;
+    ruby_frame->prev = prev;
+    ruby_frame->iter = 0;	/* blocks not available anyway */
+
+    if (node) {
+	ruby_current_node = node;
+	ruby_frame->node = node;
+	ruby_sourcefile = node->nd_file;
+	ruby_sourceline = nd_line(node);
+    }
+    if (klass) {
+	if (TYPE(klass) == T_ICLASS) {
+	    klass = RBASIC(klass)->klass;
+	}
+	else if (FL_TEST(klass, FL_SINGLETON)) {
+	    klass = rb_iv_get(klass, "__attached__");
+	}
+    }
+    PUSH_TAG(PROT_NONE);
+    raised = thread_reset_raised();
+    if ((state = EXEC_TAG()) == 0) {
+	srcfile = rb_str_new2(ruby_sourcefile?ruby_sourcefile:"(ruby)");
+	event_name = get_event_name(event);
+	proc_invoke(trace_func, rb_ary_new3(6, rb_str_new2(event_name),
+					    srcfile,
+					    INT2FIX(ruby_sourceline),
+					    id?ID2SYM(id):Qnil,
+					    self?rb_f_binding(self):Qnil,
+					    klass),
+		    Qundef, 0);
+    }
+    if (raised) thread_set_raised();
+    POP_TAG();
+    POP_FRAME();
+
+    tracing = 0;
+    ruby_current_node = node_save;
+    SET_CURRENT_SOURCE();
+    if (state) JUMP_TAG(state);
+}
+
+static VALUE
+avalue_to_svalue(v)
+    VALUE v;
+{
+    VALUE tmp, top;
+
+    tmp = rb_check_array_type(v);
+    if (NIL_P(tmp)) {
+	return v;
+    }
+    if (RARRAY(tmp)->len == 0) {
+	return Qundef;
+    }
+    if (RARRAY(tmp)->len == 1) {
+	top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
+	if (NIL_P(top)) {
+	    return RARRAY(tmp)->ptr[0];
+	}
+	if (RARRAY(top)->len > 1) {
+	    return v;
+	}
+	return top;
+    }
+    return tmp;
+}
+
+static VALUE
+svalue_to_avalue(v)
+    VALUE v;
+{
+    VALUE tmp, top;
+
+    if (v == Qundef) return rb_ary_new2(0);
+    tmp = rb_check_array_type(v);
+    if (NIL_P(tmp)) {
+	return rb_ary_new3(1, v);
+    }
+    if (RARRAY(tmp)->len == 1) {
+	top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
+	if (!NIL_P(top) && RARRAY(top)->len > 1) {
+	    return tmp;
+	}
+	return rb_ary_new3(1, v);
+    }
+    return tmp;
+}
+
+static VALUE
+svalue_to_mrhs(v, lhs)
+    VALUE v;
+    NODE *lhs;
+{
+    VALUE tmp;
+
+    if (v == Qundef) return rb_ary_new2(0);
+    tmp = rb_check_array_type(v);
+    if (NIL_P(tmp)) {
+	return rb_ary_new3(1, v);
+    }
+    /* no lhs means splat lhs only */
+    if (!lhs) {
+	return rb_ary_new3(1, v);
+    }
+    return tmp;
+}
+
+static VALUE
+avalue_splat(v)
+    VALUE v;
+{
+    if (RARRAY(v)->len == 0) {
+	return Qundef;
+    }
+    if (RARRAY(v)->len == 1) {
+	return RARRAY(v)->ptr[0];
+    }
+    return v;
+}
+
+#if 1
+VALUE
+rb_Array(val)
+    VALUE val;
+{
+    VALUE tmp = rb_check_array_type(val);
+
+    if (NIL_P(tmp)) {
+	/* hack to avoid invoke Object#to_a */
+	VALUE origin;
+	ID id = rb_intern("to_a");
+
+	if (search_method(CLASS_OF(val), id, &origin) &&
+	    RCLASS(origin)->m_tbl != RCLASS(rb_mKernel)->m_tbl) { /* exclude Kernel#to_a */
+	    val = rb_funcall(val, id, 0);
+	    if (TYPE(val) != T_ARRAY) {
+		rb_raise(rb_eTypeError, "`to_a' did not return Array");
+	    }
+	    return val;
+	}
+	else {
+	    return rb_ary_new3(1, val);
+	}
+    }
+    return tmp;
+}
+#endif
+
+static VALUE
+splat_value(v)
+    VALUE v;
+{
+    if (NIL_P(v)) return rb_ary_new3(1, Qnil);
+    return rb_Array(v);
+}
+
+static VALUE
+class_prefix(self, cpath)
+    VALUE self;
+    NODE *cpath;
+{
+    if (!cpath) {
+	rb_bug("class path missing");
+    }
+    if (cpath->nd_head) {
+	VALUE c = rb_eval(self, cpath->nd_head);
+	switch (TYPE(c)) {
+	  case T_CLASS:
+	  case T_MODULE:
+	    break;
+	  default:
+	    rb_raise(rb_eTypeError, "%s is not a class/module",
+		     RSTRING(rb_obj_as_string(c))->ptr);
+	}
+	return c;
+    }
+    else if (nd_type(cpath) == NODE_COLON2) {
+	return ruby_cbase;
+    }
+    else if (ruby_wrapper) {
+	return ruby_wrapper;
+    }
+    else {
+	return rb_cObject;
+    }
+}
+
+#define return_value(v) do {\
+  if ((prot_tag->retval = (v)) == Qundef) {\
+    prot_tag->retval = Qnil;\
+  }\
+} while (0)
+
+NORETURN(static void return_jump _((VALUE)));
+NORETURN(static void break_jump _((VALUE)));
+NORETURN(static void next_jump _((VALUE)));
+NORETURN(static void unknown_node _((NODE * volatile)));
+
+static void
+unknown_node(node)
+    NODE *volatile node;
+{
+    ruby_current_node = 0;
+    if (node->flags == 0) {
+        rb_bug("terminated node (0x%lx)", node);
+    }
+    else if (BUILTIN_TYPE(node) != T_NODE) {
+        rb_bug("not a node 0x%02lx (0x%lx)", BUILTIN_TYPE(node), node);
+    }
+    else {
+        rb_bug("unknown node type %d (0x%lx)", nd_type(node), node);
+    }
+}
+
+static VALUE
+rb_eval(self, n)
+    VALUE self;
+    NODE *n;
+{
+    NODE * volatile contnode = 0;
+    NODE * volatile node = n;
+    int state;
+    volatile VALUE result = Qnil;
+
+#define RETURN(v) do { \
+    result = (v); \
+    goto finish; \
+} while (0)
+
+  again:
+    if (!node) RETURN(Qnil);
+
+    ruby_current_node = node;
+    switch (nd_type(node)) {
+      case NODE_BLOCK:
+	if (contnode) {
+	    result = rb_eval(self, node);
+	    break;
+	}
+	contnode = node->nd_next;
+	node = node->nd_head;
+	goto again;
+
+      case NODE_POSTEXE:
+	rb_f_END();
+	nd_set_type(node, NODE_NIL); /* exec just once */
+	result = Qnil;
+	break;
+
+	/* begin .. end without clauses */
+      case NODE_BEGIN:
+	node = node->nd_body;
+	goto again;
+
+	/* nodes for speed-up(default match) */
+      case NODE_MATCH:
+	result = rb_reg_match2(node->nd_lit);
+	break;
+
+	/* nodes for speed-up(literal match) */
+      case NODE_MATCH2:
+	{
+	    VALUE l = rb_eval(self,node->nd_recv);
+	    VALUE r = rb_eval(self,node->nd_value);
+	    result = rb_reg_match(l, r);
+	}
+	break;
+
+	/* nodes for speed-up(literal match) */
+      case NODE_MATCH3:
+	{
+	    VALUE r = rb_eval(self,node->nd_recv);
+	    VALUE l = rb_eval(self,node->nd_value);
+	    if (TYPE(l) == T_STRING) {
+		result = rb_reg_match(r, l);
+	    }
+	    else {
+		result = rb_funcall(l, match, 1, r);
+	    }
+	}
+	break;
+
+	/* node for speed-up(top-level loop for -n/-p) */
+      case NODE_OPT_N:
+	PUSH_TAG(PROT_LOOP);
+	switch (state = EXEC_TAG()) {
+	  case 0:
+	  opt_n_next:
+	    while (!NIL_P(rb_gets())) {
+	      opt_n_redo:
+		rb_eval(self, node->nd_body);
+	    }
+	    break;
+
+	  case TAG_REDO:
+	    state = 0;
+	    goto opt_n_redo;
+	  case TAG_NEXT:
+	    state = 0;
+	    goto opt_n_next;
+	  case TAG_BREAK:
+	    state = 0;
+	  default:
+	    break;
+	}
+	POP_TAG();
+	if (state) JUMP_TAG(state);
+	RETURN(Qnil);
+
+      case NODE_SELF:
+	RETURN(self);
+
+      case NODE_NIL:
+	RETURN(Qnil);
+
+      case NODE_TRUE:
+	RETURN(Qtrue);
+
+      case NODE_FALSE:
+	RETURN(Qfalse);
+
+      case NODE_IF:
+	EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
+			ruby_frame->last_func,
+			ruby_frame->last_class);
+	if (RTEST(rb_eval(self, node->nd_cond))) {
+	    node = node->nd_body;
+	}
+	else {
+	    node = node->nd_else;
+	}
+	goto again;
+
+      case NODE_WHEN:
+	while (node) {
+	    NODE *tag;
+
+	    if (nd_type(node) != NODE_WHEN) goto again;
+	    tag = node->nd_head;
+	    while (tag) {
+		EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
+				ruby_frame->last_func,
+				ruby_frame->last_class);
+		if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
+		    VALUE v = rb_eval(self, tag->nd_head->nd_head);
+		    long i;
+
+		    if (TYPE(v) != T_ARRAY) v = rb_ary_to_ary(v);
+		    for (i=0; i<RARRAY(v)->len; i++) {
+			if (RTEST(RARRAY(v)->ptr[i])) {
+			    node = node->nd_body;
+			    goto again;
+			}
+		    }
+		    tag = tag->nd_next;
+		    continue;
+		}
+		if (RTEST(rb_eval(self, tag->nd_head))) {
+		    node = node->nd_body;
+		    goto again;
+		}
+		tag = tag->nd_next;
+	    }
+	    node = node->nd_next;
+	}
+	RETURN(Qnil);
+
+      case NODE_CASE:
+	{
+	    VALUE val;
+
+	    val = rb_eval(self, node->nd_head);
+	    node = node->nd_body;
+	    while (node) {
+		NODE *tag;
+
+		if (nd_type(node) != NODE_WHEN) {
+		    goto again;
+		}
+		tag = node->nd_head;
+		while (tag) {
+		    EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
+				    ruby_frame->last_func,
+				    ruby_frame->last_class);
+		    if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
+			VALUE v = rb_eval(self, tag->nd_head->nd_head);
+			long i;
+
+			if (TYPE(v) != T_ARRAY) v = rb_ary_to_ary(v);
+			for (i=0; i<RARRAY(v)->len; i++) {
+			    if (RTEST(rb_funcall2(RARRAY(v)->ptr[i], eqq, 1, &val))){
+				node = node->nd_body;
+				goto again;
+			    }
+			}
+			tag = tag->nd_next;
+			continue;
+		    }
+		    if (RTEST(rb_funcall2(rb_eval(self, tag->nd_head), eqq, 1, &val))) {
+			node = node->nd_body;
+			goto again;
+		    }
+		    tag = tag->nd_next;
+		}
+		node = node->nd_next;
+	    }
+	}
+	RETURN(Qnil);
+
+      case NODE_WHILE:
+	PUSH_TAG(PROT_LOOP);
+	result = Qnil;
+	switch (state = EXEC_TAG()) {
+	  case 0:
+	    if (node->nd_state && !RTEST(rb_eval(self, node->nd_cond)))
+		goto while_out;
+	    do {
+	      while_redo:
+		rb_eval(self, node->nd_body);
+	      while_next:
+		;
+	    } while (RTEST(rb_eval(self, node->nd_cond)));
+	    break;
+
+	  case TAG_REDO:
+	    state = 0;
+	    goto while_redo;
+	  case TAG_NEXT:
+	    state = 0;
+	    goto while_next;
+	  case TAG_BREAK:
+	    if (TAG_DST()) {
+		state = 0;
+		result = prot_tag->retval;
+	    }
+	    /* fall through */
+	  default:
+	    break;
+	}
+      while_out:
+	POP_TAG();
+	if (state) JUMP_TAG(state);
+	RETURN(result);
+
+      case NODE_UNTIL:
+	PUSH_TAG(PROT_LOOP);
+	result = Qnil;
+	switch (state = EXEC_TAG()) {
+	  case 0:
+	    if (node->nd_state && RTEST(rb_eval(self, node->nd_cond)))
+		goto until_out;
+	    do {
+	      until_redo:
+		rb_eval(self, node->nd_body);
+	      until_next:
+		;
+	    } while (!RTEST(rb_eval(self, node->nd_cond)));
+	    break;
+
+	  case TAG_REDO:
+	    state = 0;
+	    goto until_redo;
+	  case TAG_NEXT:
+	    state = 0;
+	    goto until_next;
+	  case TAG_BREAK:
+	    if (TAG_DST()) {
+		state = 0;
+		result = prot_tag->retval;
+	    }
+	    /* fall through */
+	  default:
+	    break;
+	}
+      until_out:
+	POP_TAG();
+	if (state) JUMP_TAG(state);
+	RETURN(result);
+
+      case NODE_BLOCK_PASS:
+	result = block_pass(self, node);
+	break;
+
+      case NODE_ITER:
+      case NODE_FOR:
+	{
+	    PUSH_TAG(PROT_LOOP);
+	    PUSH_BLOCK(node->nd_var, node->nd_body);
+
+	    state = EXEC_TAG();
+	    if (state == 0) {
+	      iter_retry:
+		PUSH_ITER(ITER_PRE);
+		if (nd_type(node) == NODE_ITER) {
+		    result = rb_eval(self, node->nd_iter);
+		}
+		else {
+		    VALUE recv;
+
+		    _block.flags &= ~BLOCK_D_SCOPE;
+		    BEGIN_CALLARGS;
+		    recv = rb_eval(self, node->nd_iter);
+		    END_CALLARGS;
+		    ruby_current_node = node;
+		    SET_CURRENT_SOURCE();
+		    result = rb_call(CLASS_OF(recv),recv,each,0,0,0,self);
+		}
+		POP_ITER();
+	    }
+	    else if (state == TAG_BREAK && TAG_DST()) {
+		result = prot_tag->retval;
+		state = 0;
+	    }
+	    else if (state == TAG_RETRY) {
+		state = 0;
+		goto iter_retry;
+	    }
+	    POP_BLOCK();
+	    POP_TAG();
+	    switch (state) {
+	      case 0:
+		break;
+	      default:
+		JUMP_TAG(state);
+	    }
+	}
+	break;
+
+      case NODE_BREAK:
+	break_jump(rb_eval(self, node->nd_stts));
+	break;
+
+      case NODE_NEXT:
+	CHECK_INTS;
+	next_jump(rb_eval(self, node->nd_stts));
+	break;
+
+      case NODE_REDO:
+	CHECK_INTS;
+	JUMP_TAG(TAG_REDO);
+	break;
+
+      case NODE_RETRY:
+	CHECK_INTS;
+	JUMP_TAG(TAG_RETRY);
+	break;
+
+      case NODE_SPLAT:
+	result = splat_value(rb_eval(self, node->nd_head));
+	break;
+
+      case NODE_TO_ARY:
+	result = rb_ary_to_ary(rb_eval(self, node->nd_head));
+	break;
+
+      case NODE_SVALUE:
+	result = avalue_splat(rb_eval(self, node->nd_head));
+	if (result == Qundef) result = Qnil;
+	break;
+
+      case NODE_YIELD:
+	if (node->nd_head) {
+	    result = rb_eval(self, node->nd_head);
+	    ruby_current_node = node;
+	}
+	else {
+	    result = Qundef;	/* no arg */
+	}
+	SET_CURRENT_SOURCE();
+	result = rb_yield_0(result, 0, 0, 0, node->nd_state);
+	break;
+
+      case NODE_RESCUE:
+	{
+	    volatile VALUE e_info = ruby_errinfo;
+	    volatile int rescuing = 0;
+
+	    PUSH_TAG(PROT_NONE);
+	    if ((state = EXEC_TAG()) == 0) {
+	      retry_entry:
+		result = rb_eval(self, node->nd_head);
+	    }
+	    else if (rescuing) {
+		if (rescuing < 0) {
+		    /* in rescue argument, just reraise */
+		}
+		else if (state == TAG_RETRY) {
+		    rescuing = state = 0;
+		    ruby_errinfo = e_info;
+		    goto retry_entry;
+		}
+		else if (state != TAG_RAISE) {
+		    result = prot_tag->retval;
+		}
+	    }
+	    else if (state == TAG_RAISE) {
+		NODE *resq = node->nd_resq;
+
+		rescuing = -1;
+		while (resq) {
+		    ruby_current_node = resq;
+		    if (handle_rescue(self, resq)) {
+			state = 0;
+			rescuing = 1;
+			result = rb_eval(self, resq->nd_body);
+			break;
+		    }
+		    resq = resq->nd_head; /* next rescue */
+		}
+	    }
+	    else {
+		result = prot_tag->retval;
+	    }
+	    POP_TAG();
+	    if (state != TAG_RAISE) ruby_errinfo = e_info;
+	    if (state) {
+		JUMP_TAG(state);
+	    }
+	    /* no exception raised */
+	    if (!rescuing && (node = node->nd_else)) { /* else clause given */
+		goto again;
+	    }
+	}
+	break;
+
+      case NODE_ENSURE:
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    result = rb_eval(self, node->nd_head);
+	}
+	POP_TAG();
+	if (node->nd_ensr && !thread_no_ensure()) {
+	    VALUE retval = prot_tag->retval; /* save retval */
+	    VALUE errinfo = ruby_errinfo;
+
+	    rb_eval(self, node->nd_ensr);
+	    return_value(retval);
+	    ruby_errinfo = errinfo;
+	}
+	if (state) JUMP_TAG(state);
+	break;
+
+      case NODE_AND:
+	result = rb_eval(self, node->nd_1st);
+	if (!RTEST(result)) break;
+	node = node->nd_2nd;
+	goto again;
+
+      case NODE_OR:
+	result = rb_eval(self, node->nd_1st);
+	if (RTEST(result)) break;
+	node = node->nd_2nd;
+	goto again;
+
+      case NODE_NOT:
+	if (RTEST(rb_eval(self, node->nd_body))) result = Qfalse;
+	else result = Qtrue;
+	break;
+
+      case NODE_DOT2:
+      case NODE_DOT3:
+        {
+	    VALUE beg = rb_eval(self, node->nd_beg);
+	    VALUE end = rb_eval(self, node->nd_end);
+	    result = rb_range_new(beg, end, nd_type(node) == NODE_DOT3);
+	}	
+	break;
+
+      case NODE_FLIP2:		/* like AWK */
+	{
+	    VALUE *flip = rb_svar(node->nd_cnt);
+	    if (!flip) rb_bug("unexpected local variable");
+	    if (!RTEST(*flip)) {
+		if (RTEST(rb_eval(self, node->nd_beg))) {
+		    *flip = RTEST(rb_eval(self, node->nd_end))?Qfalse:Qtrue;
+		    result = Qtrue;
+		}
+		else {
+		    result = Qfalse;
+		}
+	    }
+	    else {
+		if (RTEST(rb_eval(self, node->nd_end))) {
+		    *flip = Qfalse;
+		}
+		result = Qtrue;
+	    }
+	}
+	break;
+
+      case NODE_FLIP3:		/* like SED */
+	{
+	    VALUE *flip = rb_svar(node->nd_cnt);
+	    if (!flip) rb_bug("unexpected local variable");
+	    if (!RTEST(*flip)) {
+		result = RTEST(rb_eval(self, node->nd_beg)) ? Qtrue : Qfalse;
+		*flip = result;
+	    }
+	    else {
+		if (RTEST(rb_eval(self, node->nd_end))) {
+		    *flip = Qfalse;
+		}
+		result = Qtrue;
+	    }
+	}
+	break;
+
+      case NODE_RETURN:
+	return_jump(rb_eval(self, node->nd_stts));
+	break;
+
+      case NODE_ARGSCAT:
+	{
+	    VALUE args = rb_eval(self, node->nd_head);
+	    result = rb_ary_concat(args, splat_value(rb_eval(self, node->nd_body)));
+	}
+	break;
+
+      case NODE_ARGSPUSH:
+	{
+	    VALUE args = rb_ary_dup(rb_eval(self, node->nd_head));
+	    result = rb_ary_push(args, rb_eval(self, node->nd_body));
+	}
+	break;
+
+      case NODE_ATTRASGN:
+	{
+	    VALUE recv;
+	    int argc; VALUE *argv; /* used in SETUP_ARGS */
+	    int scope;
+	    TMP_PROTECT;
+
+	    BEGIN_CALLARGS;
+	    if (node->nd_recv == (NODE *)1) {
+		recv = self;
+		scope = 1;
+	    }
+	    else {
+		recv = rb_eval(self, node->nd_recv);
+		scope = 0;
+	    }
+	    SETUP_ARGS(node->nd_args);
+	    END_CALLARGS;
+
+	    ruby_current_node = node;
+	    SET_CURRENT_SOURCE();
+	    rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,scope,self);
+	    result = argv[argc-1];
+	}
+	break;
+
+      case NODE_CALL:
+	{
+	    VALUE recv;
+	    int argc; VALUE *argv; /* used in SETUP_ARGS */
+	    TMP_PROTECT;
+
+	    BEGIN_CALLARGS;
+	    recv = rb_eval(self, node->nd_recv);
+	    SETUP_ARGS(node->nd_args);
+	    END_CALLARGS;
+
+	    ruby_current_node = node;
+	    SET_CURRENT_SOURCE();
+	    result = rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,0,self);
+	}
+	break;
+
+      case NODE_FCALL:
+	{
+	    int argc; VALUE *argv; /* used in SETUP_ARGS */
+	    TMP_PROTECT;
+
+	    BEGIN_CALLARGS;
+	    SETUP_ARGS(node->nd_args);
+	    END_CALLARGS;
+
+	    ruby_current_node = node;
+	    SET_CURRENT_SOURCE();
+	    result = rb_call(CLASS_OF(self),self,node->nd_mid,argc,argv,1,self);
+	}
+	break;
+
+      case NODE_VCALL:
+	SET_CURRENT_SOURCE();
+	result = rb_call(CLASS_OF(self),self,node->nd_mid,0,0,2,self);
+	break;
+
+      case NODE_SUPER:
+      case NODE_ZSUPER:
+	{
+	    int argc; VALUE *argv; /* used in SETUP_ARGS */
+	    TMP_PROTECT;
+
+	    if (ruby_frame->last_class == 0) {
+		if (ruby_frame->last_func) {
+		    rb_name_error(ruby_frame->last_func,
+				  "superclass method `%s' disabled",
+				  rb_id2name(ruby_frame->orig_func));
+		}
+		else {
+		    rb_raise(rb_eNoMethodError, "super called outside of method");
+		}
+	    }
+	    if (nd_type(node) == NODE_ZSUPER) {
+		argc = ruby_frame->argc;
+		if (argc && DMETHOD_P()) {
+		    if (TYPE(RBASIC(ruby_scope)->klass) != T_ARRAY ||
+			RARRAY(RBASIC(ruby_scope)->klass)->len != argc) {
+			rb_raise(rb_eRuntimeError, 
+				 "super: specify arguments explicitly");
+		    }
+		    argv = RARRAY(RBASIC(ruby_scope)->klass)->ptr;
+		}
+		else if (!ruby_scope->local_vars) {
+		    argc = 0;
+		    argv = 0;
+		}
+		else {
+		    argv = ruby_scope->local_vars + 2;
+		}
+	    }
+	    else {
+		BEGIN_CALLARGS;
+		SETUP_ARGS(node->nd_args);
+		END_CALLARGS;
+		ruby_current_node = node;
+	    }
+
+	    SET_CURRENT_SOURCE();
+	    result = rb_call_super(argc, argv);
+	}
+	break;
+
+      case NODE_SCOPE:
+	{
+	    struct FRAME frame;
+	    NODE *saved_cref = 0;
+
+	    frame = *ruby_frame;
+	    frame.tmp = ruby_frame;
+	    ruby_frame = &frame;
+
+	    PUSH_SCOPE();
+	    PUSH_TAG(PROT_NONE);
+	    if (node->nd_rval) {
+		saved_cref = ruby_cref;
+		ruby_cref = (NODE*)node->nd_rval;
+	    }
+	    if (node->nd_tbl) {
+		VALUE *vars = ALLOCA_N(VALUE, node->nd_tbl[0]+1);
+		*vars++ = (VALUE)node;
+		ruby_scope->local_vars = vars;
+		rb_mem_clear(ruby_scope->local_vars, node->nd_tbl[0]);
+		ruby_scope->local_tbl = node->nd_tbl;
+	    }
+	    else {
+		ruby_scope->local_vars = 0;
+		ruby_scope->local_tbl  = 0;
+	    }
+	    if ((state = EXEC_TAG()) == 0) {
+		result = rb_eval(self, node->nd_next);
+	    }
+	    POP_TAG();
+	    POP_SCOPE();
+	    ruby_frame = frame.tmp;
+	    if (saved_cref)
+		ruby_cref = saved_cref;
+	    if (state) JUMP_TAG(state);
+	}
+	break;
+
+      case NODE_OP_ASGN1:
+	{
+	    int argc; VALUE *argv; /* used in SETUP_ARGS */
+	    VALUE recv, val, tmp;
+	    NODE *rval;
+	    TMP_PROTECT;
+
+	    recv = rb_eval(self, node->nd_recv);
+	    rval = node->nd_args->nd_head;
+	    SETUP_ARGS0(node->nd_args->nd_body, 1);
+	    val = rb_funcall3(recv, aref, argc, argv);
+	    switch (node->nd_mid) {
+	    case 0: /* OR */
+	      if (RTEST(val)) RETURN(val);
+	      val = rb_eval(self, rval);
+	      break;
+	    case 1: /* AND */
+	      if (!RTEST(val)) RETURN(val);
+	      val = rb_eval(self, rval);
+	      break;
+	    default:
+	      tmp = rb_eval(self, rval);
+	      val = rb_funcall3(val, node->nd_mid, 1, &tmp);
+	    }
+	    argv[argc] = val;
+	    rb_funcall2(recv, aset, argc+1, argv);
+	    result = val;
+	}
+	break;
+
+      case NODE_OP_ASGN2:
+	{
+	    ID id = node->nd_next->nd_vid;
+	    VALUE recv, val, tmp;
+
+	    recv = rb_eval(self, node->nd_recv);
+	    val = rb_funcall3(recv, id, 0, 0);
+	    switch (node->nd_next->nd_mid) {
+	    case 0: /* OR */
+	      if (RTEST(val)) RETURN(val);
+	      val = rb_eval(self, node->nd_value);
+	      break;
+	    case 1: /* AND */
+	      if (!RTEST(val)) RETURN(val);
+	      val = rb_eval(self, node->nd_value);
+	      break;
+	    default:
+	      tmp = rb_eval(self, node->nd_value);
+	      val = rb_funcall3(val, node->nd_next->nd_mid, 1, &tmp);
+	    }
+
+	    rb_funcall2(recv, node->nd_next->nd_aid, 1, &val);
+	    result = val;
+	}
+	break;
+
+      case NODE_OP_ASGN_AND:
+	result = rb_eval(self, node->nd_head);
+	if (!RTEST(result)) break;
+	node = node->nd_value;
+	goto again;
+
+      case NODE_OP_ASGN_OR:
+	if ((node->nd_aid && !is_defined(self, node->nd_head, 0)) ||
+	    !RTEST(result = rb_eval(self, node->nd_head))) {
+	    node = node->nd_value;
+	    goto again;
+	}
+	break;
+
+      case NODE_MASGN:
+	result = massign(self, node, rb_eval(self, node->nd_value), 0);
+	break;
+
+      case NODE_LASGN:
+	if (ruby_scope->local_vars == 0)
+	    rb_bug("unexpected local variable assignment");
+	result = rb_eval(self, node->nd_value);
+	ruby_scope->local_vars[node->nd_cnt] = result;
+	break;
+
+      case NODE_DASGN:
+	result = rb_eval(self, node->nd_value);
+	dvar_asgn(node->nd_vid, result);
+	break;
+
+      case NODE_DASGN_CURR:
+	result = rb_eval(self, node->nd_value);
+	dvar_asgn_curr(node->nd_vid, result);
+	break;
+
+      case NODE_GASGN:
+	result = rb_eval(self, node->nd_value);
+	rb_gvar_set(node->nd_entry, result);
+	break;
+
+      case NODE_IASGN:
+	result = rb_eval(self, node->nd_value);
+	rb_ivar_set(self, node->nd_vid, result);
+	break;
+
+      case NODE_CDECL:
+	result = rb_eval(self, node->nd_value);
+	if (node->nd_vid == 0) {
+	    rb_const_set(class_prefix(self, node->nd_else), node->nd_else->nd_mid, result);
+	}
+	else {
+	    rb_const_set(ruby_cbase, node->nd_vid, result);
+	}
+	break;
+
+      case NODE_CVDECL:
+	if (NIL_P(ruby_cbase)) {
+	    rb_raise(rb_eTypeError, "no class/module to define class variable");
+	}
+	result = rb_eval(self, node->nd_value);
+	rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qtrue);
+	break;
+
+      case NODE_CVASGN:
+	result = rb_eval(self, node->nd_value);
+	rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qfalse);
+	break;
+
+      case NODE_LVAR:
+	if (ruby_scope->local_vars == 0) {
+	    rb_bug("unexpected local variable");
+	}
+	result = ruby_scope->local_vars[node->nd_cnt];
+	break;
+
+      case NODE_DVAR:
+	result = rb_dvar_ref(node->nd_vid);
+	break;
+
+      case NODE_GVAR:
+	result = rb_gvar_get(node->nd_entry);
+	break;
+
+      case NODE_IVAR:
+	result = rb_ivar_get(self, node->nd_vid);
+	break;
+
+      case NODE_CONST:
+	result = ev_const_get(ruby_cref, node->nd_vid, self);
+	break;
+
+      case NODE_CVAR:
+	result = rb_cvar_get(cvar_cbase(), node->nd_vid);
+	break;
+
+      case NODE_BLOCK_ARG:
+	if (ruby_scope->local_vars == 0)
+	    rb_bug("unexpected block argument");
+	if (rb_block_given_p()) {
+	    result = rb_block_proc();
+	    ruby_scope->local_vars[node->nd_cnt] = result;
+	}
+	else {
+	    result = Qnil;
+	}
+	break;
+
+      case NODE_COLON2:
+	{
+	    VALUE klass;
+
+	    klass = rb_eval(self, node->nd_head);
+	    if (rb_is_const_id(node->nd_mid)) {
+		switch (TYPE(klass)) {
+		  case T_CLASS:
+		  case T_MODULE:
+		    result = rb_const_get_from(klass, node->nd_mid);
+		    break;
+		  default:
+		    rb_raise(rb_eTypeError, "%s is not a class/module",
+			     RSTRING(rb_obj_as_string(klass))->ptr);
+		    break;
+		}
+	    }
+	    else {
+		result = rb_funcall(klass, node->nd_mid, 0, 0);
+	    }
+	}
+	break;
+
+      case NODE_COLON3:
+	result = rb_const_get_from(rb_cObject, node->nd_mid);
+	break;
+
+      case NODE_NTH_REF:
+	result = rb_reg_nth_match(node->nd_nth, MATCH_DATA);
+	break;
+
+      case NODE_BACK_REF:
+	switch (node->nd_nth) {
+	  case '&':
+	    result = rb_reg_last_match(MATCH_DATA);
+	    break;
+	  case '`':
+	    result = rb_reg_match_pre(MATCH_DATA);
+	    break;
+	  case '\'':
+	    result = rb_reg_match_post(MATCH_DATA);
+	    break;
+	  case '+':
+	    result = rb_reg_match_last(MATCH_DATA);
+	    break;
+	  default:
+	    rb_bug("unexpected back-ref");
+	}
+	break;
+
+      case NODE_HASH:
+	{
+	    NODE *list;
+	    VALUE hash = rb_hash_new();
+	    VALUE key, val;
+
+	    list = node->nd_head;
+	    while (list) {
+		key = rb_eval(self, list->nd_head);
+		list = list->nd_next;
+		if (list == 0)
+		    rb_bug("odd number list for Hash");
+		val = rb_eval(self, list->nd_head);
+		list = list->nd_next;
+		rb_hash_aset(hash, key, val);
+	    }
+	    result = hash;
+	}
+	break;
+
+      case NODE_ZARRAY:		/* zero length list */
+	result = rb_ary_new();
+	break;
+
+      case NODE_ARRAY:
+	{
+	    VALUE ary;
+	    long i;
+
+	    i = node->nd_alen;
+	    ary = rb_ary_new2(i);
+	    for (i=0;node;node=node->nd_next) {
+		RARRAY(ary)->ptr[i++] = rb_eval(self, node->nd_head);
+		RARRAY(ary)->len = i;
+	    }
+
+	    result = ary;
+	}
+	break;
+
+      case NODE_STR:
+	result = rb_str_new3(node->nd_lit);
+	break;
+
+      case NODE_EVSTR:
+	result = rb_obj_as_string(rb_eval(self, node->nd_body));
+	break;
+
+      case NODE_DSTR:
+      case NODE_DXSTR:
+      case NODE_DREGX:
+      case NODE_DREGX_ONCE:
+      case NODE_DSYM:
+	{
+	    VALUE str, str2;
+	    NODE *list = node->nd_next;
+
+	    str = rb_str_new3(node->nd_lit);
+	    while (list) {
+		if (list->nd_head) {
+		    switch (nd_type(list->nd_head)) {
+		      case NODE_STR:
+			str2 = list->nd_head->nd_lit;
+			break;
+		      default:
+			str2 = rb_eval(self, list->nd_head);
+			break;
+		    }
+		    rb_str_append(str, str2);
+		    OBJ_INFECT(str, str2);
+		}
+		list = list->nd_next;
+	    }
+	    switch (nd_type(node)) {
+	      case NODE_DREGX:
+		result = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
+				    node->nd_cflag);
+		break;
+	      case NODE_DREGX_ONCE:	/* regexp expand once */
+		result = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
+				    node->nd_cflag);
+		nd_set_type(node, NODE_LIT);
+		node->nd_lit = result;
+		break;
+	      case NODE_LIT:
+		/* other thread may replace NODE_DREGX_ONCE to NODE_LIT */
+		goto again;
+	      case NODE_DXSTR:
+		result = rb_funcall(self, '`', 1, str);
+		break;
+	      case NODE_DSYM:
+		result = rb_str_intern(str);
+		break;
+	      default:
+		result = str;
+		break;
+	    }
+	}
+	break;
+
+      case NODE_XSTR:
+	result = rb_funcall(self, '`', 1, rb_str_new3(node->nd_lit));
+	break;
+
+      case NODE_LIT:
+	result = node->nd_lit;
+	break;
+
+      case NODE_DEFN:
+	if (node->nd_defn) {
+	    NODE *body,  *defn;
+	    VALUE origin;
+	    int noex;
+
+	    if (NIL_P(ruby_class)) {
+		rb_raise(rb_eTypeError, "no class/module to add method");
+	    }
+	    if (ruby_class == rb_cObject && node->nd_mid == init) {
+		rb_warn("redefining Object#initialize may cause infinite loop");
+	    }
+	    if (node->nd_mid == __id__ || node->nd_mid == __send__) {
+		rb_warn("redefining `%s' may cause serious problem",
+			rb_id2name(node->nd_mid));
+	    }
+	    rb_frozen_class_p(ruby_class);
+	    body = search_method(ruby_class, node->nd_mid, &origin);
+	    if (body){
+		if (RTEST(ruby_verbose) && ruby_class == origin && body->nd_cnt == 0 && body->nd_body) {
+		    rb_warning("method redefined; discarding old %s", rb_id2name(node->nd_mid));
+		}
+	    }
+
+	    if (SCOPE_TEST(SCOPE_PRIVATE) || node->nd_mid == init) {
+		noex = NOEX_PRIVATE;
+	    }
+	    else if (SCOPE_TEST(SCOPE_PROTECTED)) {
+		noex = NOEX_PROTECTED;
+	    }
+	    else {
+		noex = NOEX_PUBLIC;
+	    }
+	    if (body && origin == ruby_class && body->nd_body == 0) {
+		noex |= NOEX_NOSUPER;
+	    }
+
+	    defn = copy_node_scope(node->nd_defn, ruby_cref);
+	    rb_add_method(ruby_class, node->nd_mid, defn, noex);
+	    if (scope_vmode == SCOPE_MODFUNC) {
+		rb_add_method(rb_singleton_class(ruby_class),
+			      node->nd_mid, defn, NOEX_PUBLIC);
+	    }
+	    result = Qnil;
+	}
+	break;
+
+      case NODE_DEFS:
+	if (node->nd_defn) {
+	    VALUE recv = rb_eval(self, node->nd_recv);
+	    VALUE klass;
+	    NODE *body = 0, *defn;
+
+	    if (ruby_safe_level >= 4 && !OBJ_TAINTED(recv)) {
+		rb_raise(rb_eSecurityError, "Insecure: can't define singleton method");
+	    }
+	    if (FIXNUM_P(recv) || SYMBOL_P(recv)) {
+		rb_raise(rb_eTypeError,
+			 "can't define singleton method \"%s\" for %s",
+			 rb_id2name(node->nd_mid),
+			 rb_obj_classname(recv));
+	    }
+
+	    if (OBJ_FROZEN(recv)) rb_error_frozen("object");
+	    klass = rb_singleton_class(recv);
+	    if (st_lookup(RCLASS(klass)->m_tbl, node->nd_mid, (st_data_t *)&body)) {
+		if (ruby_safe_level >= 4) {
+		    rb_raise(rb_eSecurityError, "redefining method prohibited");
+		}
+		if (RTEST(ruby_verbose)) {
+		    rb_warning("redefine %s", rb_id2name(node->nd_mid));
+		}
+	    }
+	    defn = copy_node_scope(node->nd_defn, ruby_cref);
+	    rb_add_method(klass, node->nd_mid, defn,
+			  NOEX_PUBLIC|(body?body->nd_noex&NOEX_UNDEF:0));
+	    result = Qnil;
+	}
+	break;
+
+      case NODE_UNDEF:
+	if (NIL_P(ruby_class)) {
+	    rb_raise(rb_eTypeError, "no class to undef method");
+	}
+	rb_undef(ruby_class, rb_to_id(rb_eval(self, node->u2.node)));
+	result = Qnil;
+	break;
+
+      case NODE_ALIAS:
+	if (NIL_P(ruby_class)) {
+	    rb_raise(rb_eTypeError, "no class to make alias");
+	}
+	rb_alias(ruby_class, rb_to_id(rb_eval(self, node->u1.node)),
+		             rb_to_id(rb_eval(self, node->u2.node)));
+	result = Qnil;
+	break;
+
+      case NODE_VALIAS:
+	rb_alias_variable(node->u1.id, node->u2.id);
+	result = Qnil;
+	break;
+
+      case NODE_CLASS:
+	{
+	    VALUE super, klass, tmp, cbase;
+	    ID cname;
+	    int gen = Qfalse;
+
+	    cbase = class_prefix(self, node->nd_cpath);
+	    cname = node->nd_cpath->nd_mid;
+
+	    if (NIL_P(ruby_cbase)) {
+		rb_raise(rb_eTypeError, "no outer class/module");
+	    }
+	    if (node->nd_super) {
+	       super = rb_eval(self, node->nd_super);
+	       rb_check_inheritable(super);
+	    }
+	    else {
+		super = 0;
+	    }
+
+	    if (rb_const_defined_at(cbase, cname)) {
+		klass = rb_const_get_at(cbase, cname);
+		if (TYPE(klass) != T_CLASS) {
+		    rb_raise(rb_eTypeError, "%s is not a class",
+			     rb_id2name(cname));
+		}
+		if (super) {
+		    tmp = rb_class_real(RCLASS(klass)->super);
+		    if (tmp != super) {
+			rb_raise(rb_eTypeError, "superclass mismatch for class %s",
+				 rb_id2name(cname));
+		    }
+		    super = 0;
+		}
+		if (ruby_safe_level >= 4) {
+		    rb_raise(rb_eSecurityError, "extending class prohibited");
+		}
+	    }
+	    else {
+		if (!super) super = rb_cObject;
+		klass = rb_define_class_id(cname, super);
+		rb_set_class_path(klass, cbase, rb_id2name(cname));
+		rb_const_set(cbase, cname, klass);
+		gen = Qtrue;
+	    }
+	    if (ruby_wrapper) {
+		rb_extend_object(klass, ruby_wrapper);
+		rb_include_module(klass, ruby_wrapper);
+	    }
+	    if (super && gen) {
+		rb_class_inherited(super, klass);
+	    }
+	    result = module_setup(klass, node);
+	}
+	break;
+
+      case NODE_MODULE:
+	{
+	    VALUE module, cbase;
+	    ID cname;
+
+	    if (NIL_P(ruby_cbase)) {
+		rb_raise(rb_eTypeError, "no outer class/module");
+	    }
+	    cbase = class_prefix(self, node->nd_cpath);
+	    cname = node->nd_cpath->nd_mid;
+	    if (rb_const_defined_at(cbase, cname)) {
+		module = rb_const_get_at(cbase, cname);
+		if (TYPE(module) != T_MODULE) {
+		    rb_raise(rb_eTypeError, "%s is not a module",
+			     rb_id2name(cname));
+		}
+		if (ruby_safe_level >= 4) {
+		    rb_raise(rb_eSecurityError, "extending module prohibited");
+		}
+	    }
+	    else {
+		module = rb_define_module_id(cname);
+		rb_set_class_path(module, cbase, rb_id2name(cname));
+		rb_const_set(cbase, cname, module);
+	    }
+	    if (ruby_wrapper) {
+		rb_extend_object(module, ruby_wrapper);
+		rb_include_module(module, ruby_wrapper);
+	    }
+
+	    result = module_setup(module, node);
+	}
+	break;
+
+      case NODE_SCLASS:
+	{
+	    VALUE klass;
+
+	    result = rb_eval(self, node->nd_recv);
+	    if (FIXNUM_P(result) || SYMBOL_P(result)) {
+		rb_raise(rb_eTypeError, "no virtual class for %s",
+			 rb_obj_classname(result));
+	    }
+	    if (ruby_safe_level >= 4 && !OBJ_TAINTED(result))
+		rb_raise(rb_eSecurityError, "Insecure: can't extend object");
+	    klass = rb_singleton_class(result);
+
+	    if (ruby_wrapper) {
+		rb_extend_object(klass, ruby_wrapper);
+		rb_include_module(klass, ruby_wrapper);
+	    }
+
+	    result = module_setup(klass, node);
+	}
+	break;
+
+      case NODE_DEFINED:
+	{
+	    char buf[20];
+	    char *desc = is_defined(self, node->nd_head, buf);
+
+	    if (desc) result = rb_str_new2(desc);
+	    else result = Qnil;
+	}
+	break;
+
+      case NODE_NEWLINE:
+	EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self, 
+			ruby_frame->last_func,
+			ruby_frame->last_class);
+	node = node->nd_next;
+	goto again;
+
+      default:
+	unknown_node(node);
+    }
+  finish:
+    CHECK_INTS;
+    if (contnode) {
+	node = contnode;
+	contnode = 0;
+	goto again;
+    }
+    return result;
+}
+
+static VALUE
+module_setup(module, n)
+    VALUE module;
+    NODE *n;
+{
+    NODE * volatile node = n->nd_body;
+    int state;
+    struct FRAME frame;
+    VALUE result = Qnil;	/* OK */
+    TMP_PROTECT;
+
+    frame = *ruby_frame;
+    frame.tmp = ruby_frame;
+    ruby_frame = &frame;
+
+    PUSH_CLASS(module);
+    PUSH_SCOPE();
+    PUSH_VARS();
+
+    if (node->nd_tbl) {
+	VALUE *vars = TMP_ALLOC(node->nd_tbl[0]+1);
+	*vars++ = (VALUE)node;
+	ruby_scope->local_vars = vars;
+	rb_mem_clear(ruby_scope->local_vars, node->nd_tbl[0]);
+	ruby_scope->local_tbl = node->nd_tbl;
+    }
+    else {
+	ruby_scope->local_vars = 0;
+	ruby_scope->local_tbl  = 0;
+    }
+
+    PUSH_CREF(module);
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	EXEC_EVENT_HOOK(RUBY_EVENT_CLASS, n, ruby_cbase,
+			ruby_frame->last_func, ruby_frame->last_class);
+	result = rb_eval(ruby_cbase, node->nd_next);
+    }
+    POP_TAG();
+    POP_CREF();
+    POP_VARS();
+    POP_SCOPE();
+    POP_CLASS();
+
+    ruby_frame = frame.tmp;
+    EXEC_EVENT_HOOK(RUBY_EVENT_END, n, 0,
+		    ruby_frame->last_func, ruby_frame->last_class);
+    if (state) JUMP_TAG(state);
+
+    return result;
+}
+
+static NODE *basic_respond_to = 0;
+
+int
+rb_obj_respond_to(obj, id, priv)
+    VALUE obj;
+    ID id;
+    int priv;
+{
+    VALUE klass = CLASS_OF(obj);
+
+    if (rb_method_node(klass, respond_to) == basic_respond_to) {
+	return rb_method_boundp(klass, id, !priv);
+    }
+    else {
+	VALUE args[2];
+	int n = 0;
+	args[n++] = ID2SYM(id);
+	if (priv) args[n++] = Qtrue;
+	return rb_funcall2(obj, respond_to, n, args);
+    }
+}
+
+int
+rb_respond_to(obj, id)
+    VALUE obj;
+    ID id;
+{
+    return rb_obj_respond_to(obj, id, Qfalse);
+}
+
+/*
+ *  call-seq:
+ *     obj.respond_to?(symbol, include_private=false) => true or false
+ *  
+ *  Returns +true+> if _obj_ responds to the given
+ *  method. Private methods are included in the search only if the
+ *  optional second parameter evaluates to +true+.
+ */
+
+static VALUE
+obj_respond_to(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE mid, priv;
+    ID id;
+
+    rb_scan_args(argc, argv, "11", &mid, &priv);
+    id = rb_to_id(mid);
+    if (rb_method_boundp(CLASS_OF(obj), id, !RTEST(priv))) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     mod.method_defined?(symbol)    => true or false
+ *  
+ *  Returns +true+ if the named method is defined by
+ *  _mod_ (or its included modules and, if _mod_ is a class,
+ *  its ancestors). Public and protected methods are matched.
+ *     
+ *     module A
+ *       def method1()  end
+ *     end
+ *     class B
+ *       def method2()  end
+ *     end
+ *     class C < B
+ *       include A
+ *       def method3()  end
+ *     end
+ *     
+ *     A.method_defined? :method1    #=> true
+ *     C.method_defined? "method1"   #=> true
+ *     C.method_defined? "method2"   #=> true
+ *     C.method_defined? "method3"   #=> true
+ *     C.method_defined? "method4"   #=> false
+ */
+
+static VALUE
+rb_mod_method_defined(mod, mid)
+    VALUE mod, mid;
+{
+    return rb_method_boundp(mod, rb_to_id(mid), 1);
+}
+
+#define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f))
+
+/*
+ *  call-seq:
+ *     mod.public_method_defined?(symbol)   => true or false
+ *  
+ *  Returns +true+ if the named public method is defined by
+ *  _mod_ (or its included modules and, if _mod_ is a class,
+ *  its ancestors).
+ *     
+ *     module A
+ *       def method1()  end
+ *     end
+ *     class B
+ *       protected
+ *       def method2()  end
+ *     end
+ *     class C < B
+ *       include A
+ *       def method3()  end
+ *     end
+ *     
+ *     A.method_defined? :method1           #=> true
+ *     C.public_method_defined? "method1"   #=> true
+ *     C.public_method_defined? "method2"   #=> false
+ *     C.method_defined? "method2"          #=> true
+ */
+
+static VALUE
+rb_mod_public_method_defined(mod, mid)
+    VALUE mod, mid;
+{
+    ID id = rb_to_id(mid);
+    int noex;
+
+    if (rb_get_method_body(&mod, &id, &noex)) {
+	if (VISI_CHECK(noex, NOEX_PUBLIC))
+	    return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     mod.private_method_defined?(symbol)    => true or false
+ *  
+ *  Returns +true+ if the named private method is defined by
+ *  _ mod_ (or its included modules and, if _mod_ is a class,
+ *  its ancestors).
+ *     
+ *     module A
+ *       def method1()  end
+ *     end
+ *     class B
+ *       private
+ *       def method2()  end
+ *     end
+ *     class C < B
+ *       include A
+ *       def method3()  end
+ *     end
+ *     
+ *     A.method_defined? :method1            #=> true
+ *     C.private_method_defined? "method1"   #=> false
+ *     C.private_method_defined? "method2"   #=> true
+ *     C.method_defined? "method2"           #=> false
+ */
+
+static VALUE
+rb_mod_private_method_defined(mod, mid)
+    VALUE mod, mid;
+{
+    ID id = rb_to_id(mid);
+    int noex;
+
+    if (rb_get_method_body(&mod, &id, &noex)) {
+	if (VISI_CHECK(noex, NOEX_PRIVATE))
+	    return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     mod.protected_method_defined?(symbol)   => true or false
+ *  
+ *  Returns +true+ if the named protected method is defined
+ *  by _mod_ (or its included modules and, if _mod_ is a
+ *  class, its ancestors).
+ *     
+ *     module A
+ *       def method1()  end
+ *     end
+ *     class B
+ *       protected
+ *       def method2()  end
+ *     end
+ *     class C < B
+ *       include A
+ *       def method3()  end
+ *     end
+ *     
+ *     A.method_defined? :method1              #=> true
+ *     C.protected_method_defined? "method1"   #=> false
+ *     C.protected_method_defined? "method2"   #=> true
+ *     C.method_defined? "method2"             #=> true
+ */
+
+static VALUE
+rb_mod_protected_method_defined(mod, mid)
+    VALUE mod, mid;
+{
+    ID id = rb_to_id(mid);
+    int noex;
+
+    if (rb_get_method_body(&mod, &id, &noex)) {
+	if (VISI_CHECK(noex, NOEX_PROTECTED))
+	    return Qtrue;
+    }
+    return Qfalse;
+}
+
+NORETURN(static VALUE terminate_process _((int, VALUE)));
+static VALUE
+terminate_process(status, mesg)
+    int status;
+    VALUE mesg;
+{
+    VALUE args[2];
+    args[0] = INT2NUM(status);
+    args[1] = mesg;
+
+    rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit));
+}
+
+void
+rb_exit(status)
+    int status;
+{
+    if (prot_tag) {
+	terminate_process(status, rb_str_new("exit", 4));
+    }
+    ruby_finalize();
+    exit(status);
+}
+
+
+/*
+ *  call-seq:
+ *     exit(integer=0)
+ *     Kernel::exit(integer=0)
+ *     Process::exit(integer=0)
+ *  
+ *  Initiates the termination of the Ruby script by raising the
+ *  <code>SystemExit</code> exception. This exception may be caught. The
+ *  optional parameter is used to return a status code to the invoking
+ *  environment.
+ *     
+ *     begin
+ *       exit
+ *       puts "never get here"
+ *     rescue SystemExit
+ *       puts "rescued a SystemExit exception"
+ *     end
+ *     puts "after begin block"
+ *     
+ *  <em>produces:</em>
+ *     
+ *     rescued a SystemExit exception
+ *     after begin block
+ *     
+ *  Just prior to termination, Ruby executes any <code>at_exit</code> functions
+ *  (see Kernel::at_exit) and runs any object finalizers (see
+ *  ObjectSpace::define_finalizer).
+ *     
+ *     at_exit { puts "at_exit function" }
+ *     ObjectSpace.define_finalizer("string",  proc { puts "in finalizer" })
+ *     exit
+ *     
+ *  <em>produces:</em>
+ *     
+ *     at_exit function
+ *     in finalizer
+ */
+
+VALUE
+rb_f_exit(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE status;
+    int istatus;
+
+    rb_secure(4);
+    if (rb_scan_args(argc, argv, "01", &status) == 1) {
+	switch (status) {
+	  case Qtrue:
+	    istatus = EXIT_SUCCESS;
+	    break;
+	  case Qfalse:
+	    istatus = EXIT_FAILURE;
+	    break;
+	  default:
+	    istatus = NUM2INT(status);
+#if EXIT_SUCCESS != 0
+	    if (istatus == 0) istatus = EXIT_SUCCESS;
+#endif
+	    break;
+	}
+    }
+    else {
+	istatus = EXIT_SUCCESS;
+    }
+    rb_exit(istatus);
+    return Qnil;		/* not reached */
+}
+
+
+/*
+ *  call-seq:
+ *     abort
+ *     Kernel::abort
+ *     Process::abort
+ *  
+ *  Terminate execution immediately, effectively by calling
+ *  <code>Kernel.exit(1)</code>. If _msg_ is given, it is written
+ *  to STDERR prior to terminating.
+ */
+
+VALUE
+rb_f_abort(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    rb_secure(4);
+    if (argc == 0) {
+	if (!NIL_P(ruby_errinfo)) {
+	    error_print();
+	}
+	rb_exit(EXIT_FAILURE);
+    }
+    else {
+	VALUE mesg;
+
+	rb_scan_args(argc, argv, "1", &mesg);
+	StringValue(mesg);
+	rb_io_puts(1, &mesg, rb_stderr);
+	terminate_process(EXIT_FAILURE, mesg);
+    }
+    return Qnil;		/* not reached */
+}
+
+void
+rb_iter_break()
+{
+    break_jump(Qnil);
+}
+
+NORETURN(static void rb_longjmp _((int, VALUE)));
+static VALUE make_backtrace _((void));
+
+static void
+rb_longjmp(tag, mesg)
+    int tag;
+    VALUE mesg;
+{
+    VALUE at;
+
+    if (thread_set_raised()) {
+	ruby_errinfo = exception_error;
+	JUMP_TAG(TAG_FATAL);
+    }
+    if (NIL_P(mesg)) mesg = ruby_errinfo;
+    if (NIL_P(mesg)) {
+	mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
+    }
+
+    ruby_set_current_source();
+    if (ruby_sourcefile && !NIL_P(mesg)) {
+	at = get_backtrace(mesg);
+	if (NIL_P(at)) {
+	    at = make_backtrace();
+	    set_backtrace(mesg, at);
+	}
+    }
+    if (!NIL_P(mesg)) {
+	ruby_errinfo = mesg;
+    }
+
+    if (RTEST(ruby_debug) && !NIL_P(ruby_errinfo)
+	&& !rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
+	VALUE e = ruby_errinfo;
+	int status;
+
+	PUSH_TAG(PROT_NONE);
+	if ((status = EXEC_TAG()) == 0) {
+	    StringValue(e);
+	    warn_printf("Exception `%s' at %s:%d - %s\n",
+			rb_obj_classname(ruby_errinfo),
+			ruby_sourcefile, ruby_sourceline,
+			RSTRING(e)->ptr);
+	}
+	POP_TAG();
+	if (status == TAG_FATAL && ruby_errinfo == exception_error) {
+	    ruby_errinfo = mesg;
+	}
+	else if (status) {
+	    thread_reset_raised();
+	    JUMP_TAG(status);
+	}
+    }
+
+    rb_trap_restore_mask();
+    if (tag != TAG_FATAL) {
+	EXEC_EVENT_HOOK(RUBY_EVENT_RAISE, ruby_current_node,
+			ruby_frame->self,
+			ruby_frame->last_func,
+			ruby_frame->last_class);
+    }
+    if (!prot_tag) {
+	error_print();
+    }
+    thread_reset_raised();
+    JUMP_TAG(tag);
+}
+
+void
+rb_exc_raise(mesg)
+    VALUE mesg;
+{
+    rb_longjmp(TAG_RAISE, mesg);
+}
+
+void
+rb_exc_fatal(mesg)
+    VALUE mesg;
+{
+    rb_longjmp(TAG_FATAL, mesg);
+}
+
+void
+rb_interrupt()
+{
+    rb_raise(rb_eInterrupt, "");
+}
+
+/*
+ *  call-seq:
+ *     raise
+ *     raise(string)
+ *     raise(exception [, string [, array]])
+ *     fail
+ *     fail(string)
+ *     fail(exception [, string [, array]])
+ *  
+ *  With no arguments, raises the exception in <code>$!</code> or raises
+ *  a <code>RuntimeError</code> if <code>$!</code> is +nil+.
+ *  With a single +String+ argument, raises a
+ *  +RuntimeError+ with the string as a message. Otherwise,
+ *  the first parameter should be the name of an +Exception+
+ *  class (or an object that returns an +Exception+ object when sent
+ *  an +exception+ message). The optional second parameter sets the
+ *  message associated with the exception, and the third parameter is an
+ *  array of callback information. Exceptions are caught by the
+ *  +rescue+ clause of <code>begin...end</code> blocks.
+ *     
+ *     raise "Failed to create socket"
+ *     raise ArgumentError, "No parameters", caller
+ */
+
+static VALUE
+rb_f_raise(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    rb_raise_jump(rb_make_exception(argc, argv));
+    return Qnil;		/* not reached */
+}
+
+static VALUE
+rb_make_exception(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE mesg;
+    ID exception;
+    int n;
+
+    mesg = Qnil;
+    switch (argc) {
+      case 0:
+	mesg = Qnil;
+	break;
+      case 1:
+	if (NIL_P(argv[0])) break;
+	if (TYPE(argv[0]) == T_STRING) {
+	    mesg = rb_exc_new3(rb_eRuntimeError, argv[0]);
+	    break;
+	}
+	n = 0;
+	goto exception_call;
+
+      case 2:
+      case 3:
+	n = 1;
+      exception_call:
+	exception = rb_intern("exception");
+	if (!rb_respond_to(argv[0], exception)) {
+	    rb_raise(rb_eTypeError, "exception class/object expected");
+	}
+	mesg = rb_funcall(argv[0], exception, n, argv[1]);
+	break;
+      default:
+	rb_raise(rb_eArgError, "wrong number of arguments");
+	break;
+    }
+    if (argc > 0) {
+	if (!rb_obj_is_kind_of(mesg, rb_eException))
+	    rb_raise(rb_eTypeError, "exception object expected");
+	if (argc>2)
+	    set_backtrace(mesg, argv[2]);
+    }
+
+    return mesg;
+}
+
+static void
+rb_raise_jump(mesg)
+    VALUE mesg;
+{
+    if (ruby_frame != top_frame) {
+	PUSH_FRAME();		/* fake frame */
+	*ruby_frame = *_frame.prev->prev;
+	rb_longjmp(TAG_RAISE, mesg);
+	POP_FRAME();
+    }
+    rb_longjmp(TAG_RAISE, mesg);
+}
+
+void
+rb_jump_tag(tag)
+    int tag;
+{
+    JUMP_TAG(tag);
+}
+
+int
+rb_block_given_p()
+{
+    if (ruby_frame->iter == ITER_CUR && ruby_block)
+	return Qtrue;
+    return Qfalse;
+}
+
+int
+rb_iterator_p()
+{
+    return rb_block_given_p();
+}
+
+/*
+ *  call-seq:
+ *     block_given?   => true or false
+ *     iterator?      => true or false
+ *  
+ *  Returns <code>true</code> if <code>yield</code> would execute a
+ *  block in the current context. The <code>iterator?</code> form
+ *  is mildly deprecated.
+ *     
+ *     def try
+ *       if block_given?
+ *         yield
+ *       else
+ *         "no block"
+ *       end
+ *     end
+ *     try                  #=> "no block"
+ *     try { "hello" }      #=> "hello"
+ *     try do "hello" end   #=> "hello"
+ */
+
+
+static VALUE
+rb_f_block_given_p()
+{
+    if (ruby_frame->prev && ruby_frame->prev->iter == ITER_CUR && ruby_block)
+	return Qtrue;
+    return Qfalse;
+}
+
+VALUE rb_eThreadError;
+
+NORETURN(static void proc_jump_error(int, VALUE));
+static void
+proc_jump_error(state, result)
+    int state;
+    VALUE result;
+{
+    char mesg[32];
+    char *statement;
+
+    switch (state) {
+      case TAG_BREAK:
+	statement = "break"; break;
+      case TAG_RETURN:
+	statement = "return"; break;
+      case TAG_RETRY:
+	statement = "retry"; break;
+      default:
+	statement = "local-jump"; break; /* should not happen */
+    }
+    snprintf(mesg, sizeof mesg, "%s from proc-closure", statement);
+    localjump_error(mesg, result, state);
+}
+
+static void
+return_jump(retval)
+    VALUE retval;
+{
+    struct tag *tt = prot_tag;
+    int yield = Qfalse;
+
+    if (retval == Qundef) retval = Qnil;
+    while (tt) {
+	if (tt->tag == PROT_YIELD) {
+	    yield = Qtrue;
+	    tt = tt->prev;
+	}
+	if (tt->tag == PROT_FUNC && tt->frame->uniq == ruby_frame->uniq) {
+	    tt->dst = (VALUE)ruby_frame->uniq;
+	    tt->retval = retval;
+	    JUMP_TAG(TAG_RETURN);
+	}
+	if (tt->tag == PROT_LAMBDA && !yield) {
+	    tt->dst = (VALUE)tt->frame->uniq;
+	    tt->retval = retval;
+	    JUMP_TAG(TAG_RETURN);
+	}
+	if (tt->tag == PROT_THREAD) {
+	    rb_raise(rb_eThreadError, "return can't jump across threads");
+	}
+	tt = tt->prev;
+    }
+    localjump_error("unexpected return", retval, TAG_RETURN);
+}
+
+static void
+break_jump(retval)
+    VALUE retval;
+{
+    struct tag *tt = prot_tag;
+
+    if (retval == Qundef) retval = Qnil;
+    while (tt) {
+	switch (tt->tag) {
+	  case PROT_THREAD:
+	  case PROT_YIELD:
+	  case PROT_LOOP:
+	  case PROT_LAMBDA:
+	    tt->dst = (VALUE)tt->frame->uniq;
+	    tt->retval = retval;
+	    JUMP_TAG(TAG_BREAK);
+	    break;
+	  case PROT_FUNC:
+	    tt = 0;
+	    continue;
+	  default:
+	    break;
+	}
+	tt = tt->prev;
+    }
+    localjump_error("unexpected break", retval, TAG_BREAK);
+}
+
+static void
+next_jump(retval)
+    VALUE retval;
+{
+    struct tag *tt = prot_tag;
+
+    if (retval == Qundef) retval = Qnil;
+    while (tt) {
+	switch (tt->tag) {
+	  case PROT_THREAD:
+	  case PROT_YIELD:
+	  case PROT_LOOP:
+	  case PROT_LAMBDA:
+	  case PROT_FUNC:
+	    tt->dst = (VALUE)tt->frame->uniq;
+	    tt->retval = retval;
+	    JUMP_TAG(TAG_NEXT);
+	    break;
+	  default:
+	    break;
+	}
+	tt = tt->prev;
+    }
+    localjump_error("unexpected next", retval, TAG_NEXT);
+}
+
+void
+rb_need_block()
+{
+    if (!rb_block_given_p()) {
+	localjump_error("no block given", Qnil, 0);
+    }
+}
+
+static VALUE
+rb_yield_0(val, self, klass, flags, avalue)
+    VALUE val, self, klass;	/* OK */
+    int flags, avalue;
+{
+    NODE *node;
+    volatile VALUE result = Qnil;
+    volatile VALUE old_cref;
+    volatile VALUE old_wrapper;
+    struct BLOCK * volatile block;
+    struct SCOPE * volatile old_scope;
+    int old_vmode;
+    struct FRAME frame;
+    NODE *cnode = ruby_current_node;
+    int lambda = flags & YIELD_LAMBDA_CALL;
+    int state;
+
+    rb_need_block();
+
+    PUSH_VARS();
+    block = ruby_block;
+    frame = block->frame;
+    frame.prev = ruby_frame;
+    frame.node = cnode;
+    ruby_frame = &(frame);
+    old_cref = (VALUE)ruby_cref;
+    ruby_cref = block->cref;
+    old_wrapper = ruby_wrapper;
+    ruby_wrapper = block->wrapper;
+    old_scope = ruby_scope;
+    ruby_scope = block->scope;
+    old_vmode = scope_vmode;
+    scope_vmode = (flags & YIELD_PUBLIC_DEF) ? SCOPE_PUBLIC : block->vmode;
+    ruby_block = block->prev;
+    if (block->flags & BLOCK_D_SCOPE) {
+	/* put place holder for dynamic (in-block) local variables */
+	ruby_dyna_vars = new_dvar(0, 0, block->dyna_vars);
+    }
+    else {
+	/* FOR does not introduce new scope */
+	ruby_dyna_vars = block->dyna_vars;
+    }
+    PUSH_CLASS(klass ? klass : block->klass);
+    if (!klass) {
+	self = block->self;
+    }
+    node = block->body;
+
+    if (block->var) {
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    if (block->var == (NODE*)1) { /* no parameter || */
+		if (lambda && RARRAY(val)->len != 0) {
+		    rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
+			     RARRAY(val)->len);
+		}
+	    }
+	    else if (block->var == (NODE*)2) {
+		if (TYPE(val) == T_ARRAY && RARRAY(val)->len != 0) {
+		    rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
+			     RARRAY(val)->len);
+		}
+	    }
+	    else if (nd_type(block->var) == NODE_MASGN) {
+		if (!avalue) {
+		    val = svalue_to_mrhs(val, block->var->nd_head);
+		}
+		massign(self, block->var, val, lambda);
+	    }
+	    else {
+		int len = 0;
+		if (avalue) {
+		    len = RARRAY(val)->len;
+		    if (len == 0) {
+			goto zero_arg;
+		    }
+		    if (len == 1) {
+			val = RARRAY(val)->ptr[0];
+		    }
+		    else {
+			goto multi_values;
+		    }
+		}
+		else if (val == Qundef) {
+		  zero_arg:
+		    val = Qnil;
+		  multi_values:
+		    {
+			ruby_current_node = block->var;
+			rb_warn("multiple values for a block parameter (%d for 1)\n\tfrom %s:%d",
+				len, cnode->nd_file, nd_line(cnode));
+			ruby_current_node = cnode;
+		    }
+		}
+		assign(self, block->var, val, lambda);
+	    }
+	}
+	POP_TAG();
+	if (state) goto pop_state;
+    }
+    if (!node) {
+	state = 0;
+	goto pop_state;
+    }
+    ruby_current_node = node;
+
+    PUSH_ITER(block->iter);
+    PUSH_TAG(lambda ? PROT_NONE : PROT_YIELD);
+    if ((state = EXEC_TAG()) == 0) {
+      redo:
+	if (nd_type(node) == NODE_CFUNC || nd_type(node) == NODE_IFUNC) {
+	    if (node->nd_state == YIELD_FUNC_AVALUE) {
+		if (!avalue) {
+		    val = svalue_to_avalue(val);
+		}
+	    }
+	    else {
+		if (avalue) {
+		    val = avalue_to_svalue(val);
+		}
+		if (val == Qundef && node->nd_state != YIELD_FUNC_SVALUE)
+		    val = Qnil;
+	    }
+	    result = (*node->nd_cfnc)(val, node->nd_tval, self);
+	}
+	else {
+	    result = rb_eval(self, node);
+	}
+    }
+    else {
+	switch (state) {
+	  case TAG_REDO:
+	    state = 0;
+	    CHECK_INTS;
+	    goto redo;
+	  case TAG_NEXT:
+	    if (!lambda) {
+		state = 0;
+		result = prot_tag->retval;
+	    }
+	    break;
+	  case TAG_BREAK:
+	    if (TAG_DST()) {
+		result = prot_tag->retval;
+	    }
+	    else {
+		lambda = Qtrue;	/* just pass TAG_BREAK */
+	    }
+	    break;
+	  default:
+	    break;
+	}
+    }
+    POP_TAG();
+    POP_ITER();
+  pop_state:
+    POP_CLASS();
+    if (ruby_dyna_vars && (block->flags & BLOCK_D_SCOPE) &&
+	!FL_TEST(ruby_dyna_vars, DVAR_DONT_RECYCLE)) {
+	struct RVarmap *vars = ruby_dyna_vars;
+
+	if (ruby_dyna_vars->id == 0) {
+	    vars = ruby_dyna_vars->next;
+	    rb_gc_force_recycle((VALUE)ruby_dyna_vars);
+	    while (vars && vars->id != 0 && vars != block->dyna_vars) {
+		struct RVarmap *tmp = vars->next;
+		rb_gc_force_recycle((VALUE)vars);
+		vars = tmp;
+	    }
+	}
+    }
+    POP_VARS();
+    ruby_block = block;
+    ruby_frame = ruby_frame->prev;
+    ruby_cref = (NODE*)old_cref;
+    ruby_wrapper = old_wrapper;
+    if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
+	scope_dup(old_scope);
+    ruby_scope = old_scope;
+    scope_vmode = old_vmode;
+    switch (state) {
+      case 0:
+	break;
+      case TAG_BREAK:
+	if (!lambda) {
+	    struct tag *tt = prot_tag;
+
+	    while (tt) {
+		if (tt->tag == PROT_LOOP && tt->blkid == ruby_block->uniq) {
+		    tt->dst = (VALUE)tt->frame->uniq;
+		    tt->retval = result;
+		    JUMP_TAG(TAG_BREAK);
+		}
+		tt = tt->prev;
+	    }
+	    proc_jump_error(TAG_BREAK, result);
+	}
+	/* fall through */
+      default:
+	JUMP_TAG(state);
+	break;
+    }
+    ruby_current_node = cnode;
+    return result;
+}
+
+VALUE
+rb_yield(val)
+    VALUE val;
+{
+    return rb_yield_0(val, 0, 0, 0, Qfalse);
+}
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_yield_values(int n, ...)
+#else
+rb_yield_values(n, va_alist)
+    int n;
+    va_dcl
+#endif
+{
+    va_list args;
+    VALUE ary;
+
+    if (n == 0) {
+	return rb_yield_0(Qundef, 0, 0, 0, Qfalse);
+    }
+    ary = rb_ary_new2(n);
+    va_init_list(args, n);
+    while (n--) {
+	rb_ary_push(ary, va_arg(args, VALUE));
+    }
+    va_end(args);
+    return rb_yield_0(ary, 0, 0, 0, Qtrue);
+}
+
+VALUE
+rb_yield_splat(values)
+    VALUE values;
+{
+    int avalue = Qfalse;
+
+    if (TYPE(values) == T_ARRAY) {
+	if (RARRAY(values)->len == 0) {
+	    values = Qundef;
+	}
+	else {
+	    avalue = Qtrue;
+	}
+    }
+    return rb_yield_0(values, 0, 0, 0, avalue);
+}
+
+/*
+ *  call-seq:
+ *     loop {|| block } 
+ *  
+ *  Repeatedly executes the block.
+ *     
+ *     loop do
+ *       print "Input: "
+ *       line = gets
+ *       break if !line or line =~ /^qQ/
+ *       # ...
+ *     end
+ */
+
+static VALUE
+rb_f_loop()
+{
+    for (;;) {
+	rb_yield_0(Qundef, 0, 0, 0, Qfalse);
+	CHECK_INTS;
+    }
+    return Qnil;		/* dummy */
+}
+
+static VALUE
+massign(self, node, val, pcall)
+    VALUE self;
+    NODE *node;
+    VALUE val;
+    int pcall;
+{
+    NODE *list;
+    long i = 0, len;
+
+    len = RARRAY(val)->len;
+    list = node->nd_head;
+    for (; list && i<len; i++) {
+	assign(self, list->nd_head, RARRAY(val)->ptr[i], pcall);
+	list = list->nd_next;
+    }
+    if (pcall && list) goto arg_error;
+    if (node->nd_args) {
+	if ((long)(node->nd_args) == -1) {
+	    /* no check for mere `*' */
+	}
+	else if (!list && i<len) {
+	    assign(self, node->nd_args, rb_ary_new4(len-i, RARRAY(val)->ptr+i), pcall);
+	}
+	else {
+	    assign(self, node->nd_args, rb_ary_new2(0), pcall);
+	}
+    }
+    else if (pcall && i < len) {
+	goto arg_error;
+    }
+
+    while (list) {
+	i++;
+	assign(self, list->nd_head, Qnil, pcall);
+	list = list->nd_next;
+    }
+    return val;
+
+  arg_error:
+    while (list) {
+	i++;
+	list = list->nd_next;
+    }
+    rb_raise(rb_eArgError, "wrong number of arguments (%ld for %ld)", len, i);
+}
+
+static void
+assign(self, lhs, val, pcall)
+    VALUE self;
+    NODE *lhs;
+    VALUE val;
+    int pcall;
+{
+    ruby_current_node = lhs;
+    if (val == Qundef) {
+	rb_warning("assigning void value");
+	val = Qnil;
+    }
+    switch (nd_type(lhs)) {
+      case NODE_GASGN:
+	rb_gvar_set(lhs->nd_entry, val);
+	break;
+
+      case NODE_IASGN:
+	rb_ivar_set(self, lhs->nd_vid, val);
+	break;
+
+      case NODE_LASGN:
+	if (ruby_scope->local_vars == 0)
+	    rb_bug("unexpected local variable assignment");
+	ruby_scope->local_vars[lhs->nd_cnt] = val;
+	break;
+
+      case NODE_DASGN:
+	dvar_asgn(lhs->nd_vid, val);
+	break;
+
+      case NODE_DASGN_CURR:
+	dvar_asgn_curr(lhs->nd_vid, val);
+	break;
+
+      case NODE_CDECL:
+	if (lhs->nd_vid == 0) {
+	    rb_const_set(class_prefix(self, lhs->nd_else), lhs->nd_else->nd_mid, val);
+	}
+	else {
+	    rb_const_set(ruby_cbase, lhs->nd_vid, val);
+	}
+	break;
+
+      case NODE_CVDECL:
+	if (RTEST(ruby_verbose) && FL_TEST(ruby_cbase, FL_SINGLETON)) {
+	    rb_warn("declaring singleton class variable");
+	}
+	rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qtrue);
+	break;
+
+      case NODE_CVASGN:
+	rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qfalse);
+	break;
+
+      case NODE_MASGN:
+	massign(self, lhs, svalue_to_mrhs(val, lhs->nd_head), pcall);
+	break;
+
+      case NODE_CALL:
+      case NODE_ATTRASGN:
+	{
+	    VALUE recv;
+	    int scope;
+	    if (lhs->nd_recv == (NODE *)1) {
+		recv = self;
+		scope = 1;
+	    }
+	    else {
+		recv = rb_eval(self, lhs->nd_recv);
+		scope = 0;
+	    }
+	    if (!lhs->nd_args) {
+		/* attr set */
+		ruby_current_node = lhs;
+		SET_CURRENT_SOURCE();
+		rb_call(CLASS_OF(recv), recv, lhs->nd_mid, 1, &val, scope, self);
+	    }
+	    else {
+		/* array set */
+		VALUE args;
+
+		args = rb_eval(self, lhs->nd_args);
+		rb_ary_push(args, val);
+		ruby_current_node = lhs;
+		SET_CURRENT_SOURCE();
+		rb_call(CLASS_OF(recv), recv, lhs->nd_mid,
+			RARRAY(args)->len, RARRAY(args)->ptr, scope, self);
+	    }
+	}
+	break;
+
+      default:
+	rb_bug("bug in variable assignment");
+	break;
+    }
+}
+
+VALUE
+rb_iterate(it_proc, data1, bl_proc, data2)
+    VALUE (*it_proc) _((VALUE)), (*bl_proc)(ANYARGS);
+    VALUE data1, data2;
+{
+    int state;
+    volatile VALUE retval = Qnil;
+    NODE *node = NEW_IFUNC(bl_proc, data2);
+    VALUE self = ruby_top_self;
+
+    PUSH_TAG(PROT_LOOP);
+    PUSH_BLOCK(0, node);
+    PUSH_ITER(ITER_PRE);
+    state = EXEC_TAG();
+    if (state == 0) {
+  iter_retry:
+	retval = (*it_proc)(data1);
+    }
+    else if (state == TAG_BREAK && TAG_DST()) {
+	retval = prot_tag->retval;
+	state = 0;
+    }
+    else if (state == TAG_RETRY) {
+	state = 0;
+	goto iter_retry;
+    }
+    POP_ITER();
+    POP_BLOCK();
+    POP_TAG();
+
+    switch (state) {
+      case 0:
+	break;
+      default:
+	JUMP_TAG(state);
+    }
+    return retval;
+}
+
+static int
+handle_rescue(self, node)
+    VALUE self;
+    NODE *node;
+{
+    int argc; VALUE *argv; /* used in SETUP_ARGS */
+    TMP_PROTECT;
+
+    if (!node->nd_args) {
+	return rb_obj_is_kind_of(ruby_errinfo, rb_eStandardError);
+    }
+
+    BEGIN_CALLARGS;
+    SETUP_ARGS(node->nd_args);
+    END_CALLARGS;
+
+    while (argc--) {
+	if (!rb_obj_is_kind_of(argv[0], rb_cModule)) {
+	    rb_raise(rb_eTypeError, "class or module required for rescue clause");
+	}
+	if (RTEST(rb_funcall(*argv, eqq, 1, ruby_errinfo))) return 1;
+	argv++;
+    }
+    return 0;
+}
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_rescue2(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*r_proc)(ANYARGS), VALUE data2, ...)
+#else
+rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
+    VALUE (*b_proc)(ANYARGS), (*r_proc)(ANYARGS);
+    VALUE data1, data2;
+    va_dcl
+#endif
+{
+    int state;
+    volatile VALUE result;
+    volatile VALUE e_info = ruby_errinfo;
+    volatile int handle = Qfalse;
+    VALUE eclass;
+    va_list args;
+
+    PUSH_TAG(PROT_NONE);
+    switch (state = EXEC_TAG()) {
+      case TAG_RETRY:
+	if (!handle) break;
+	handle = Qfalse;
+	state = 0;
+	ruby_errinfo = Qnil;
+      case 0:
+	result = (*b_proc)(data1);
+	break;
+      case TAG_RAISE:
+	if (handle) break;
+	handle = Qfalse;
+	va_init_list(args, data2);
+	while (eclass = va_arg(args, VALUE)) {
+	    if (rb_obj_is_kind_of(ruby_errinfo, eclass)) {
+		handle = Qtrue;
+		break;
+	    }
+	}
+	va_end(args);
+
+	if (handle) {
+	    state = 0;
+	    if (r_proc) {
+		result = (*r_proc)(data2, ruby_errinfo);
+	    }
+	    else {
+		result = Qnil;
+	    }
+	    ruby_errinfo = e_info;
+	}
+    }
+    POP_TAG();
+    if (state) JUMP_TAG(state);
+
+    return result;
+}
+
+VALUE
+rb_rescue(b_proc, data1, r_proc, data2)
+    VALUE (*b_proc)(), (*r_proc)();
+    VALUE data1, data2;
+{
+    return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError, (VALUE)0);
+}
+
+static VALUE cont_protect;
+
+VALUE
+rb_protect(proc, data, state)
+    VALUE (*proc) _((VALUE));
+    VALUE data;
+    int *state;
+{
+    VALUE result = Qnil;	/* OK */
+    int status;
+
+    PUSH_TAG(PROT_NONE);
+    cont_protect = (VALUE)rb_node_newnode(NODE_MEMO, cont_protect, 0, 0);
+    if ((status = EXEC_TAG()) == 0) {
+	result = (*proc)(data);
+    }
+    cont_protect = ((NODE *)cont_protect)->u1.value;
+    POP_TAG();
+    if (state) {
+	*state = status;
+    }
+    if (status != 0) {
+	return Qnil;
+    }
+
+    return result;
+}
+
+VALUE
+rb_ensure(b_proc, data1, e_proc, data2)
+    VALUE (*b_proc)();
+    VALUE data1;
+    VALUE (*e_proc)();
+    VALUE data2;
+{
+    int state;
+    volatile VALUE result = Qnil;
+    VALUE retval;
+
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	result = (*b_proc)(data1);
+    }
+    POP_TAG();
+    retval = prot_tag ? prot_tag->retval : Qnil;	/* save retval */
+    if (!thread_no_ensure()) {
+    (*e_proc)(data2);
+    }
+    if (prot_tag) return_value(retval);
+    if (state) JUMP_TAG(state);
+    return result;
+}
+
+VALUE
+rb_with_disable_interrupt(proc, data)
+    VALUE (*proc)();
+    VALUE data;
+{
+    VALUE result = Qnil;	/* OK */
+    int status;
+
+    DEFER_INTS;
+    {
+	int thr_critical = rb_thread_critical;
+
+	rb_thread_critical = Qtrue;
+	PUSH_TAG(PROT_NONE);
+	if ((status = EXEC_TAG()) == 0) {
+	    result = (*proc)(data);
+	}
+	POP_TAG();
+	rb_thread_critical = thr_critical;
+    }
+    ENABLE_INTS;
+    if (status) JUMP_TAG(status);
+
+    return result;
+}
+
+static void
+stack_check()
+{
+    static int overflowing = 0;
+
+    if (!overflowing && ruby_stack_check()) {
+	int state;
+	overflowing = 1;
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    rb_exc_raise(sysstack_error);
+	}
+	POP_TAG();
+	overflowing = 0;
+	JUMP_TAG(state);
+    }
+}
+
+static int last_call_status;
+
+#define CSTAT_PRIV  1
+#define CSTAT_PROT  2
+#define CSTAT_VCALL 4
+#define CSTAT_SUPER 8
+
+/*
+ *  call-seq:
+ *     obj.method_missing(symbol [, *args] )   => result
+ *  
+ *  Invoked by Ruby when <i>obj</i> is sent a message it cannot handle.
+ *  <i>symbol</i> is the symbol for the method called, and <i>args</i>
+ *  are any arguments that were passed to it. By default, the interpreter
+ *  raises an error when this method is called. However, it is possible
+ *  to override the method to provide more dynamic behavior.
+ *  The example below creates
+ *  a class <code>Roman</code>, which responds to methods with names
+ *  consisting of roman numerals, returning the corresponding integer
+ *  values.
+ *     
+ *     class Roman
+ *       def romanToInt(str)
+ *         # ...
+ *       end
+ *       def method_missing(methId)
+ *         str = methId.id2name
+ *         romanToInt(str)
+ *       end
+ *     end
+ *     
+ *     r = Roman.new
+ *     r.iv      #=> 4
+ *     r.xxiii   #=> 23
+ *     r.mm      #=> 2000
+ */
+
+static VALUE
+rb_method_missing(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    ID id;
+    VALUE exc = rb_eNoMethodError;
+    char *format = 0;
+    NODE *cnode = ruby_current_node;
+
+    if (argc == 0 || !SYMBOL_P(argv[0])) {
+	rb_raise(rb_eArgError, "no id given");
+    }
+
+    stack_check();
+
+    id = SYM2ID(argv[0]);
+
+    if (last_call_status & CSTAT_PRIV) {
+	format = "private method `%s' called for %s";
+    }
+    else if (last_call_status & CSTAT_PROT) {
+	format = "protected method `%s' called for %s";
+    }
+    else if (last_call_status & CSTAT_VCALL) {
+	format = "undefined local variable or method `%s' for %s";
+	exc = rb_eNameError;
+    }
+    else if (last_call_status & CSTAT_SUPER) {
+	format = "super: no superclass method `%s'";
+    }
+    if (!format) {
+	format = "undefined method `%s' for %s";
+    }
+
+    ruby_current_node = cnode;
+    {
+	int n = 0;
+	VALUE args[3];
+
+	args[n++] = rb_funcall(rb_const_get(exc, rb_intern("message")), '!',
+			       3, rb_str_new2(format), obj, argv[0]);
+	args[n++] = argv[0];
+	if (exc == rb_eNoMethodError) {
+	    args[n++] = rb_ary_new4(argc-1, argv+1);
+	}
+	exc = rb_class_new_instance(n, args, exc);
+	ruby_frame = ruby_frame->prev; /* pop frame for "method_missing" */
+	rb_exc_raise(exc);
+    }
+
+    return Qnil;		/* not reached */
+}
+
+static VALUE
+method_missing(obj, id, argc, argv, call_status)
+    VALUE obj;
+    ID    id;
+    int   argc;
+    const VALUE *argv;
+    int   call_status;
+{
+    VALUE *nargv;
+
+    last_call_status = call_status;
+
+    if (id == missing) {
+	PUSH_FRAME();
+	rb_method_missing(argc, argv, obj);
+	POP_FRAME();
+    }
+    else if (id == ID_ALLOCATOR) {
+	rb_raise(rb_eTypeError, "allocator undefined for %s", rb_class2name(obj));
+    }
+    if (argc < 0) {
+	VALUE tmp;
+
+	argc = -argc-1;
+	tmp = splat_value(argv[argc]);
+	nargv = ALLOCA_N(VALUE, argc + RARRAY(tmp)->len + 1);
+	MEMCPY(nargv+1, argv, VALUE, argc);
+	MEMCPY(nargv+1+argc, RARRAY(tmp)->ptr, VALUE, RARRAY(tmp)->len);
+	argc += RARRAY(tmp)->len;
+    }
+    else {
+	nargv = ALLOCA_N(VALUE, argc+1);
+	MEMCPY(nargv+1, argv, VALUE, argc);
+    }
+    nargv[0] = ID2SYM(id);
+    return rb_funcall2(obj, missing, argc+1, nargv);
+}
+
+static inline VALUE
+call_cfunc(func, recv, len, argc, argv)
+    VALUE (*func)();
+    VALUE recv;
+    int len, argc;
+    VALUE *argv;
+{
+    if (len >= 0 && argc != len) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+		 argc, len);
+    }
+
+    switch (len) {
+      case -2:
+	return (*func)(recv, rb_ary_new4(argc, argv));
+	break;
+      case -1:
+	return (*func)(argc, argv, recv);
+	break;
+      case 0:
+	return (*func)(recv);
+	break;
+      case 1:
+	return (*func)(recv, argv[0]);
+	break;
+      case 2:
+	return (*func)(recv, argv[0], argv[1]);
+	break;
+      case 3:
+	return (*func)(recv, argv[0], argv[1], argv[2]);
+	break;
+      case 4:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3]);
+	break;
+      case 5:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4]);
+	break;
+      case 6:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5]);
+	break;
+      case 7:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6]);
+	break;
+      case 8:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7]);
+	break;
+      case 9:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8]);
+	break;
+      case 10:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8], argv[9]);
+	break;
+      case 11:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]);
+	break;
+      case 12:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8], argv[9],
+		       argv[10], argv[11]);
+	break;
+      case 13:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+		       argv[11], argv[12]);
+	break;
+      case 14:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+		       argv[11], argv[12], argv[13]);
+	break;
+      case 15:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+		       argv[11], argv[12], argv[13], argv[14]);
+	break;
+      default:
+	rb_raise(rb_eArgError, "too many arguments (%d)", len);
+	break;
+    }
+    return Qnil;		/* not reached */
+}
+
+static VALUE
+rb_call0(klass, recv, id, oid, argc, argv, body, flags)
+    VALUE klass, recv;
+    ID    id;
+    ID    oid;
+    int argc;			/* OK */
+    VALUE *argv;		/* OK */
+    NODE * volatile body;
+    int flags;
+{
+    NODE *b2;		/* OK */
+    volatile VALUE result = Qnil;
+    int itr;
+    static int tick;
+    TMP_PROTECT;
+    volatile int safe = -1;
+
+    if (NOEX_SAFE(flags) > ruby_safe_level &&
+	!(flags&NOEX_TAINTED) && ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
+	rb_raise(rb_eSecurityError, "calling insecure method: %s",
+		 rb_id2name(id));
+    }
+    switch (ruby_iter->iter) {
+      case ITER_PRE:
+      case ITER_PAS:
+	itr = ITER_CUR;
+	break;
+      case ITER_CUR:
+      default:
+	itr = ITER_NOT;
+	break;
+    }
+
+    if ((++tick & 0xff) == 0) {
+	CHECK_INTS;		/* better than nothing */
+	stack_check();
+	rb_gc_finalize_deferred();
+    }
+    if (argc < 0) {
+	VALUE tmp;
+	VALUE *nargv;
+
+	argc = -argc-1;
+	tmp = splat_value(argv[argc]);
+	nargv = TMP_ALLOC(argc + RARRAY(tmp)->len);
+	MEMCPY(nargv, argv, VALUE, argc);
+	MEMCPY(nargv+argc, RARRAY(tmp)->ptr, VALUE, RARRAY(tmp)->len);
+	argc += RARRAY(tmp)->len;
+	argv = nargv;
+    }
+    PUSH_ITER(itr);
+    PUSH_FRAME();
+
+    ruby_frame->last_func = id;
+    ruby_frame->orig_func = oid;
+    ruby_frame->last_class = (flags & NOEX_NOSUPER)?0:klass;
+    ruby_frame->self = recv;
+    ruby_frame->argc = argc;
+    ruby_frame->flags = 0;
+
+    switch (nd_type(body)) {
+      case NODE_CFUNC:
+	{
+	    int len = body->nd_argc;
+
+	    if (len < -2) {
+		rb_bug("bad argc (%d) specified for `%s(%s)'",
+		       len, rb_class2name(klass), rb_id2name(id));
+	    }
+	    if (event_hooks) {
+		int state;
+
+		EXEC_EVENT_HOOK(RUBY_EVENT_C_CALL, ruby_current_node,
+				recv, id, klass);
+		PUSH_TAG(PROT_FUNC);
+		if ((state = EXEC_TAG()) == 0) {
+		    result = call_cfunc(body->nd_cfnc, recv, len, argc, argv);
+		}
+		POP_TAG();
+		ruby_current_node = ruby_frame->node;
+		EXEC_EVENT_HOOK(RUBY_EVENT_C_RETURN, ruby_current_node,
+				recv, id, klass);
+		if (state) JUMP_TAG(state);
+	    }
+	    else {
+		result = call_cfunc(body->nd_cfnc, recv, len, argc, argv);
+	    }
+	}
+	break;
+
+	/* for attr get/set */
+      case NODE_IVAR:
+	if (argc != 0) {
+	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	}
+	result = rb_attr_get(recv, body->nd_vid);
+	break;
+
+      case NODE_ATTRSET:
+	if (argc != 1)
+	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+	result = rb_ivar_set(recv, body->nd_vid, argv[0]);
+	break;
+
+      case NODE_ZSUPER:
+	result = rb_call_super(argc, argv);
+	break;
+
+      case NODE_DMETHOD:
+	result = method_call(argc, argv, umethod_bind(body->nd_cval, recv));
+	break;
+
+      case NODE_BMETHOD:
+	ruby_frame->flags |= FRAME_DMETH;
+	if (event_hooks) {
+	    struct BLOCK *data;
+	    Data_Get_Struct(body->nd_cval, struct BLOCK, data);
+	    EXEC_EVENT_HOOK(RUBY_EVENT_CALL, data->body, recv, id, klass);
+	}
+	result = proc_invoke(body->nd_cval, rb_ary_new4(argc, argv), recv, klass);
+	if (event_hooks) {
+	    EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
+	}
+	break;
+
+      case NODE_SCOPE:
+	{
+	    int state;
+	    VALUE *local_vars;	/* OK */
+	    NODE *saved_cref = 0;
+
+	    PUSH_SCOPE();
+	    if (body->nd_rval) {
+		saved_cref = ruby_cref;
+		ruby_cref = (NODE*)body->nd_rval;
+	    }
+	    PUSH_CLASS(ruby_cbase);
+	    if (body->nd_tbl) {
+		local_vars = TMP_ALLOC(body->nd_tbl[0]+1);
+		*local_vars++ = (VALUE)body;
+		rb_mem_clear(local_vars, body->nd_tbl[0]);
+		ruby_scope->local_tbl = body->nd_tbl;
+		ruby_scope->local_vars = local_vars;
+	    }
+	    else {
+		local_vars = ruby_scope->local_vars = 0;
+		ruby_scope->local_tbl  = 0;
+	    }
+	    b2 = body = body->nd_next;
+
+	    if (NOEX_SAFE(flags) > ruby_safe_level) {
+		safe = ruby_safe_level;
+		ruby_safe_level = NOEX_SAFE(flags);
+	    }
+	    PUSH_VARS();
+	    PUSH_TAG(PROT_FUNC);
+	    if ((state = EXEC_TAG()) == 0) {
+		NODE *node = 0;
+		int i, nopt = 0;
+
+		if (nd_type(body) == NODE_ARGS) {
+		    node = body;
+		    body = 0;
+		}
+		else if (nd_type(body) == NODE_BLOCK) {
+		    node = body->nd_head;
+		    body = body->nd_next;
+		}
+		if (node) {
+		    if (nd_type(node) != NODE_ARGS) {
+			rb_bug("no argument-node");
+		    }
+
+		    i = node->nd_cnt;
+		    if (i > argc) {
+			rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+				 argc, i);
+		    }
+		    if (!node->nd_rest) {
+			NODE *optnode = node->nd_opt;
+
+			nopt = i;
+			while (optnode) {
+			    nopt++;
+			    optnode = optnode->nd_next;
+			}
+			if (nopt < argc) {
+			    rb_raise(rb_eArgError,
+				     "wrong number of arguments (%d for %d)",
+				     argc, nopt);
+			}
+		    }
+		    if (local_vars) {
+			if (i > 0) {
+			    /* +2 for $_ and $~ */
+			    MEMCPY(local_vars+2, argv, VALUE, i);
+			}
+		    }
+		    argv += i; argc -= i;
+		    if (node->nd_opt) {
+			NODE *opt = node->nd_opt;
+
+			while (opt && argc) {
+			    assign(recv, opt->nd_head, *argv, 1);
+			    argv++; argc--;
+			    ++i;
+			    opt = opt->nd_next;
+			}
+			if (opt) {
+			    rb_eval(recv, opt);
+			    while (opt) {
+				opt = opt->nd_next;
+				++i;
+			    }
+			}
+		    }
+		    if (!node->nd_rest) {
+			i = nopt;
+		    }
+		    else {
+			VALUE v;
+			
+			if (argc > 0) {
+			    v = rb_ary_new4(argc,argv);
+			    i = -i - 1;
+			}
+			else {
+			    v = rb_ary_new2(0);
+			}
+			assign(recv, node->nd_rest, v, 1);
+		    }
+		    ruby_frame->argc = i;
+		}
+		if (event_hooks) {
+		    EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass);
+		}
+		result = rb_eval(recv, body);
+	    }
+	    else if (state == TAG_RETURN && TAG_DST()) {
+		result = prot_tag->retval;
+		state = 0;
+	    }
+	    POP_TAG();
+	    if (event_hooks) {
+		EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
+	    }
+	    POP_VARS();
+	    POP_CLASS();
+	    POP_SCOPE();
+	    ruby_cref = saved_cref;
+	    if (safe >= 0) ruby_safe_level = safe;
+	    switch (state) {
+	      case 0:
+		break;
+
+	      case TAG_BREAK:
+	      case TAG_RETURN:
+		JUMP_TAG(state);
+		break;
+
+	      case TAG_RETRY:
+		if (rb_block_given_p()) JUMP_TAG(state);
+		/* fall through */
+	      default:
+		jump_tag_but_local_jump(state, result);
+		break;
+	    }
+	}
+	break;
+
+      default:
+	unknown_node(body);
+	break;
+    }
+    POP_FRAME();
+    POP_ITER();
+    return result;
+}
+
+static VALUE
+rb_call(klass, recv, mid, argc, argv, scope, self)
+    VALUE klass, recv;
+    ID    mid;
+    int argc;			/* OK */
+    const VALUE *argv;		/* OK */
+    int scope;
+    VALUE self;
+{
+    NODE  *body;		/* OK */
+    int    noex;
+    ID     id = mid;
+    struct cache_entry *ent;
+
+    if (!klass) {
+	rb_raise(rb_eNotImpError, "method `%s' called on terminated object (0x%lx)",
+		 rb_id2name(mid), recv);
+    }
+    /* is it in the method cache? */
+    ent = cache + EXPR1(klass, mid);
+    if (ent->mid == mid && ent->klass == klass) {
+	if (!ent->method)
+	    return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
+	klass = ent->origin;
+	id    = ent->mid0;
+	noex  = ent->noex;
+	body  = ent->method;
+    }
+    else if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
+	if (scope == 3) {
+	    return method_missing(recv, mid, argc, argv, CSTAT_SUPER);
+	}
+	return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
+    }
+
+    if (mid != missing && scope == 0) {
+	/* receiver specified form for private method */
+	if (noex & NOEX_PRIVATE)
+	    return method_missing(recv, mid, argc, argv, CSTAT_PRIV);
+
+	/* self must be kind of a specified form for protected method */
+	if (noex & NOEX_PROTECTED) {
+	    VALUE defined_class = klass;
+
+	    if (self == Qundef) self = ruby_frame->self;
+	    if (TYPE(defined_class) == T_ICLASS) {
+		defined_class = RBASIC(defined_class)->klass;
+	    }
+	    if (!rb_obj_is_kind_of(self, rb_class_real(defined_class)))
+		return method_missing(recv, mid, argc, argv, CSTAT_PROT);
+	}
+    }
+
+    return rb_call0(klass, recv, mid, id, argc, argv, body, noex);
+}
+
+VALUE
+rb_apply(recv, mid, args)
+    VALUE recv;
+    ID mid;
+    VALUE args;
+{
+    int argc;
+    VALUE *argv;
+
+    argc = RARRAY(args)->len; /* Assigns LONG, but argc is INT */
+    argv = ALLOCA_N(VALUE, argc);
+    MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);
+    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1, Qundef);
+}
+
+/*
+ *  call-seq:
+ *     obj.send(symbol [, args...])        => obj
+ *     obj.__send__(symbol [, args...])    => obj
+ *  
+ *  Invokes the method identified by _symbol_, passing it any
+ *  arguments specified. You can use <code>\_\_send__</code> if the name
+ *  +send+ clashes with an existing method in _obj_.
+ *     
+ *     class Klass
+ *       def hello(*args)
+ *         "Hello " + args.join(' ')
+ *       end
+ *     end
+ *     k = Klass.new
+ *     k.send :hello, "gentle", "readers"   #=> "Hello gentle readers"
+ */
+
+static VALUE
+rb_f_send(argc, argv, recv)
+    int argc;
+    VALUE *argv;
+    VALUE recv;
+{
+    VALUE vid;
+
+    if (argc == 0) rb_raise(rb_eArgError, "no method name given");
+
+    vid = *argv++; argc--;
+    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+    vid = rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, 1, Qundef);
+    POP_ITER();
+
+    return vid;
+}
+
+static VALUE
+vafuncall(recv, mid, n, ar)
+    VALUE recv;
+    ID mid;
+    int n;
+    va_list *ar;
+{
+    VALUE *argv;
+
+    if (n > 0) {
+	long i;
+
+	argv = ALLOCA_N(VALUE, n);
+
+	for (i=0;i<n;i++) {
+	    argv[i] = va_arg(*ar, VALUE);
+	}
+	va_end(*ar);
+    }
+    else {
+	argv = 0;
+    }
+
+    return rb_call(CLASS_OF(recv), recv, mid, n, argv, 1, Qundef);
+}
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_funcall(VALUE recv, ID mid, int n, ...)
+#else
+rb_funcall(recv, mid, n, va_alist)
+    VALUE recv;
+    ID mid;
+    int n;
+    va_dcl
+#endif
+{
+    va_list ar;
+    va_init_list(ar, n);
+
+    return vafuncall(recv, mid, n, &ar);
+}
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_funcall_rescue(VALUE recv, ID mid, int n, ...)
+#else
+rb_funcall_rescue(recv, mid, n, va_alist)
+    VALUE recv;
+    ID mid;
+    int n;
+    va_dcl
+#endif
+{
+    VALUE result = Qnil;	/* OK */
+    int status;
+    va_list ar;
+
+    va_init_list(ar, n);
+
+    PUSH_TAG(PROT_NONE);
+    if ((status = EXEC_TAG()) == 0) {
+	result = vafuncall(recv, mid, n, &ar);
+    }
+    POP_TAG();
+    switch (status) {
+      case 0:
+	return result;
+      case TAG_RAISE:
+	return Qundef;
+      default:
+	JUMP_TAG(status);
+    }
+}
+
+VALUE
+rb_funcall2(recv, mid, argc, argv)
+    VALUE recv;
+    ID mid;
+    int argc;
+    const VALUE *argv;
+{
+    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1, Qundef);
+}
+
+VALUE
+rb_funcall3(recv, mid, argc, argv)
+    VALUE recv;
+    ID mid;
+    int argc;
+    const VALUE *argv;
+{
+    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 0, Qundef);
+}
+
+VALUE
+rb_call_super(argc, argv)
+    int argc;
+    const VALUE *argv;
+{
+    VALUE result, self, klass;
+
+    if (ruby_frame->last_class == 0) {
+	rb_name_error(ruby_frame->last_func, "calling `super' from `%s' is prohibited",
+		      rb_id2name(ruby_frame->orig_func));
+    }
+
+    self = ruby_frame->self;
+    klass = ruby_frame->last_class;
+    if (RCLASS(klass)->super == 0) {
+	return method_missing(self, ruby_frame->orig_func, argc, argv, CSTAT_SUPER);
+    }
+
+    PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT);
+    result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3, Qundef);
+    POP_ITER();
+
+    return result;
+}
+
+static VALUE
+backtrace(lev)
+    int lev;
+{
+    struct FRAME *frame = ruby_frame;
+    char buf[BUFSIZ];
+    VALUE ary;
+    NODE *n;
+
+    ary = rb_ary_new();
+    if (frame->last_func == ID_ALLOCATOR) {
+	frame = frame->prev;
+    }
+    if (lev < 0) {
+	ruby_set_current_source();
+	if (frame->last_func) {
+	    snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
+		     ruby_sourcefile, ruby_sourceline,
+		     rb_id2name(frame->last_func));
+	}
+	else if (ruby_sourceline == 0) {
+	    snprintf(buf, BUFSIZ, "%s", ruby_sourcefile);
+	}
+	else {
+	    snprintf(buf, BUFSIZ, "%s:%d", ruby_sourcefile, ruby_sourceline);
+	}
+	rb_ary_push(ary, rb_str_new2(buf));
+	if (lev < -1) return ary;
+    }
+    else {
+	while (lev-- > 0) {
+	    frame = frame->prev;
+	    if (!frame) {
+		ary = Qnil;
+		break;
+	    }
+	}
+    }
+    for (; frame && (n = frame->node); frame = frame->prev) {
+	if (frame->prev && frame->prev->last_func) {
+	    if (frame->prev->node == n) {
+		if (frame->prev->last_func == frame->last_func) continue;
+	    }
+	    snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
+		     n->nd_file, nd_line(n),
+		     rb_id2name(frame->prev->last_func));
+	}
+	else {
+	    snprintf(buf, BUFSIZ, "%s:%d", n->nd_file, nd_line(n));
+	}
+	rb_ary_push(ary, rb_str_new2(buf));
+    }
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     caller(start=1)    => array
+ *  
+ *  Returns the current execution stack---an array containing strings in
+ *  the form ``<em>file:line</em>'' or ``<em>file:line: in
+ *  `method'</em>''. The optional _start_ parameter
+ *  determines the number of initial stack entries to omit from the
+ *  result.
+ *     
+ *     def a(skip)
+ *       caller(skip)
+ *     end
+ *     def b(skip)
+ *       a(skip)
+ *     end
+ *     def c(skip)
+ *       b(skip)
+ *     end
+ *     c(0)   #=> ["prog:2:in `a'", "prog:5:in `b'", "prog:8:in `c'", "prog:10"]
+ *     c(1)   #=> ["prog:5:in `b'", "prog:8:in `c'", "prog:11"]
+ *     c(2)   #=> ["prog:8:in `c'", "prog:12"]
+ *     c(3)   #=> ["prog:13"]
+ */
+
+static VALUE
+rb_f_caller(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE level;
+    int lev;
+
+    rb_scan_args(argc, argv, "01", &level);
+
+    if (NIL_P(level)) lev = 1;
+    else lev = NUM2INT(level);
+    if (lev < 0) rb_raise(rb_eArgError, "negative level (%d)", lev);
+
+    return backtrace(lev);
+}
+
+void
+rb_backtrace()
+{
+    long i;
+    VALUE ary;
+
+    ary = backtrace(-1);
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	printf("\tfrom %s\n", RSTRING(RARRAY(ary)->ptr[i])->ptr);
+    }
+}
+
+static VALUE
+make_backtrace()
+{
+    return backtrace(-1);
+}
+
+ID
+rb_frame_last_func()
+{
+    return ruby_frame->last_func;
+}
+
+static NODE*
+compile(src, file, line)
+    VALUE src;
+    char *file;
+    int line;
+{
+    NODE *node;
+    int critical;
+
+    ruby_nerrs = 0;
+    StringValue(src);
+    critical = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+    node = rb_compile_string(file, src, line);
+    rb_thread_critical = critical;
+
+    if (ruby_nerrs == 0) return node;
+    return 0;
+}
+
+static VALUE
+eval(self, src, scope, file, line)
+    VALUE self, src, scope;
+    char *file;
+    int line;
+{
+    struct BLOCK *data = NULL;
+    volatile VALUE result = Qnil;
+    struct SCOPE * volatile old_scope;
+    struct BLOCK * volatile old_block;
+    struct RVarmap * volatile old_dyna_vars;
+    VALUE volatile old_cref;
+    int volatile old_vmode;
+    volatile VALUE old_wrapper;
+    struct FRAME frame;
+    NODE *nodesave = ruby_current_node;
+    volatile int iter = ruby_frame->iter;
+    volatile int safe = ruby_safe_level;
+    int state;
+
+    if (!NIL_P(scope)) {
+	if (!rb_obj_is_proc(scope)) {
+	    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Binding)",
+		     rb_obj_classname(scope));
+	}
+
+	Data_Get_Struct(scope, struct BLOCK, data);
+	/* PUSH BLOCK from data */
+	frame = data->frame;
+	frame.tmp = ruby_frame;	/* gc protection */
+	ruby_frame = &(frame);
+	old_scope = ruby_scope;
+	ruby_scope = data->scope;
+	old_block = ruby_block;
+	ruby_block = data->prev;
+	old_dyna_vars = ruby_dyna_vars;
+	ruby_dyna_vars = data->dyna_vars;
+	old_vmode = scope_vmode;
+	scope_vmode = data->vmode;
+	old_cref = (VALUE)ruby_cref;
+	ruby_cref = data->cref;
+	old_wrapper = ruby_wrapper;
+	ruby_wrapper = data->wrapper;
+	if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->frame.node) {
+	    file = data->frame.node->nd_file;
+	    if (!file) file = "__builtin__";
+	    line = nd_line(data->frame.node);
+	}
+
+	self = data->self;
+	ruby_frame->iter = data->iter;
+    }
+    else {
+	if (ruby_frame->prev) {
+	    ruby_frame->iter = ruby_frame->prev->iter;
+	}
+    }
+    if (file == 0) {
+	ruby_set_current_source();
+	file = ruby_sourcefile;
+	line = ruby_sourceline;
+    }
+    PUSH_CLASS(data ? data->klass : ruby_class);
+    ruby_in_eval++;
+    if (TYPE(ruby_class) == T_ICLASS) {
+	ruby_class = RBASIC(ruby_class)->klass;
+    }
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	NODE *node;
+
+	ruby_safe_level = 0;
+	result = ruby_errinfo;
+	ruby_errinfo = Qnil;
+	node = compile(src, file, line);
+	ruby_safe_level = safe;
+	if (ruby_nerrs > 0) {
+	    compile_error(0);
+	}
+	if (!NIL_P(result)) ruby_errinfo = result;
+	result = eval_node(self, node);
+    }
+    POP_TAG();
+    POP_CLASS();
+    ruby_in_eval--;
+    if (!NIL_P(scope)) {
+	int dont_recycle = ruby_scope->flags & SCOPE_DONT_RECYCLE;
+
+	ruby_wrapper = old_wrapper;
+	ruby_cref  = (NODE*)old_cref;
+	ruby_frame = frame.tmp;
+	ruby_scope = old_scope;
+	ruby_block = old_block;
+	ruby_dyna_vars = old_dyna_vars;
+	data->vmode = scope_vmode; /* write back visibility mode */
+	scope_vmode = old_vmode;
+	if (dont_recycle) {
+	    struct tag *tag;
+	    struct RVarmap *vars;
+
+	    scope_dup(ruby_scope);
+	    for (tag=prot_tag; tag; tag=tag->prev) {
+		scope_dup(tag->scope);
+	    }
+	    for (vars = ruby_dyna_vars; vars; vars = vars->next) {
+		FL_SET(vars, DVAR_DONT_RECYCLE);
+	    }
+	}
+    }
+    else {
+	ruby_frame->iter = iter;
+    }
+    ruby_current_node = nodesave;
+    ruby_set_current_source();
+    if (state) {
+	if (state == TAG_RAISE) {
+	    if (strcmp(file, "(eval)") == 0) {
+		VALUE mesg, errat;
+
+		errat = get_backtrace(ruby_errinfo);
+		mesg  = rb_attr_get(ruby_errinfo, rb_intern("mesg"));
+		if (!NIL_P(errat) && TYPE(errat) == T_ARRAY) {
+		    if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) {
+			rb_str_update(mesg, 0, 0, rb_str_new2(": "));
+			rb_str_update(mesg, 0, 0, RARRAY(errat)->ptr[0]);
+		    }
+		    RARRAY(errat)->ptr[0] = RARRAY(backtrace(-2))->ptr[0];
+		}
+	    }
+	    rb_exc_raise(ruby_errinfo);
+	}
+	JUMP_TAG(state);
+    }
+
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     eval(string [, binding [, filename [,lineno]]])  => obj
+ *  
+ *  Evaluates the Ruby expression(s) in <em>string</em>. If
+ *  <em>binding</em> is given, the evaluation is performed in its
+ *  context. The binding may be a <code>Binding</code> object or a
+ *  <code>Proc</code> object. If the optional <em>filename</em> and
+ *  <em>lineno</em> parameters are present, they will be used when
+ *  reporting syntax errors.
+ *     
+ *     def getBinding(str)
+ *       return binding
+ *     end
+ *     str = "hello"
+ *     eval "str + ' Fred'"                      #=> "hello Fred"
+ *     eval "str + ' Fred'", getBinding("bye")   #=> "bye Fred"
+ */
+
+static VALUE
+rb_f_eval(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE src, scope, vfile, vline;
+    char *file = "(eval)";
+    int line = 1;
+
+    rb_scan_args(argc, argv, "13", &src, &scope, &vfile, &vline);
+    if (ruby_safe_level >= 4) {
+	StringValue(src);
+	if (!NIL_P(scope) && !OBJ_TAINTED(scope)) {
+	    rb_raise(rb_eSecurityError, "Insecure: can't modify trusted binding");
+	}
+    }
+    else {
+	SafeStringValue(src);
+    }
+    if (argc >= 3) {
+	StringValue(vfile);
+    }
+    if (argc >= 4) {
+	line = NUM2INT(vline);
+    }
+
+    if (!NIL_P(vfile)) file = RSTRING(vfile)->ptr;
+    if (NIL_P(scope) && ruby_frame->prev) {
+	struct FRAME *prev;
+	VALUE val;
+
+	prev = ruby_frame;
+	PUSH_FRAME();
+	*ruby_frame = *prev->prev;
+	ruby_frame->prev = prev;
+	val = eval(self, src, scope, file, line);
+	POP_FRAME();
+
+	return val;
+    }
+    return eval(self, src, scope, file, line);
+}
+
+/* function to call func under the specified class/module context */
+static VALUE
+exec_under(func, under, cbase, args)
+    VALUE (*func)();
+    VALUE under, cbase;
+    void *args;
+{
+    VALUE val = Qnil;		/* OK */
+    int state;
+    int mode;
+    struct FRAME *f = ruby_frame;
+
+    PUSH_CLASS(under);
+    PUSH_FRAME();
+    ruby_frame->self = f->self;
+    ruby_frame->last_func = f->last_func;
+    ruby_frame->orig_func = f->orig_func;
+    ruby_frame->last_class = f->last_class;
+    ruby_frame->argc = f->argc;
+    if (cbase) {
+	PUSH_CREF(cbase);
+    }
+
+    mode = scope_vmode;
+    SCOPE_SET(SCOPE_PUBLIC);
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	val = (*func)(args);
+    }
+    POP_TAG();
+    if (cbase) POP_CREF();
+    SCOPE_SET(mode);
+    POP_FRAME();
+    POP_CLASS();
+    if (state) JUMP_TAG(state);
+
+    return val;
+}
+
+static VALUE
+eval_under_i(args)
+    VALUE *args;
+{
+    struct FRAME *f = ruby_frame;
+
+    if (f && (f = f->prev) && (f = f->prev)) {
+	ruby_frame = f;
+    }
+    return eval(args[0], args[1], Qnil, (char*)args[2], (int)args[3]);
+}
+
+/* string eval under the class/module context */
+static VALUE
+eval_under(under, self, src, file, line)
+    VALUE under, self, src;
+    const char *file;
+    int line;
+{
+    VALUE args[4];
+
+    if (ruby_safe_level >= 4) {
+	StringValue(src);
+    }
+    else {
+	SafeStringValue(src);
+    }
+    args[0] = self;
+    args[1] = src;
+    args[2] = (VALUE)file;
+    args[3] = (VALUE)line;
+    return exec_under(eval_under_i, under, under, args);
+}
+
+static VALUE
+yield_under_i(self)
+    VALUE self;
+{
+    return rb_yield_0(self, self, ruby_class, YIELD_PUBLIC_DEF, Qfalse);
+}
+
+/* block eval under the class/module context */
+static VALUE
+yield_under(under, self)
+    VALUE under, self;
+{
+    return exec_under(yield_under_i, under, 0, self);
+}
+
+static VALUE
+specific_eval(argc, argv, klass, self)
+    int argc;
+    VALUE *argv;
+    VALUE klass, self;
+{
+    if (rb_block_given_p()) {
+	if (argc > 0) {
+	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	}
+	return yield_under(klass, self);
+    }
+    else {
+	char *file = "(eval)";
+	int   line = 1;
+
+	if (argc == 0) {
+	    rb_raise(rb_eArgError, "block not supplied");
+	}
+	else {
+	    if (ruby_safe_level >= 4) {
+		StringValue(argv[0]);
+	    }
+	    else {
+		SafeStringValue(argv[0]);
+	    }
+	    if (argc > 3) {
+		rb_raise(rb_eArgError, "wrong number of arguments: %s(src) or %s{..}",
+			 rb_id2name(ruby_frame->last_func),
+			 rb_id2name(ruby_frame->last_func));
+	    }
+	    if (argc > 2) line = NUM2INT(argv[2]);
+	    if (argc > 1) {
+		file = StringValuePtr(argv[1]);
+	    }
+	}
+	return eval_under(klass, self, argv[0], file, line);
+    }
+}
+
+/*
+ *  call-seq:
+ *     obj.instance_eval(string [, filename [, lineno]] )   => obj
+ *     obj.instance_eval {| | block }                       => obj
+ *  
+ *  Evaluates a string containing Ruby source code, or the given block,
+ *  within the context of the receiver (_obj_). In order to set the
+ *  context, the variable +self+ is set to _obj_ while
+ *  the code is executing, giving the code access to _obj_'s
+ *  instance variables. In the version of <code>instance_eval</code>
+ *  that takes a +String+, the optional second and third
+ *  parameters supply a filename and starting line number that are used
+ *  when reporting compilation errors.
+ *     
+ *     class Klass
+ *       def initialize
+ *         @secret = 99
+ *       end
+ *     end
+ *     k = Klass.new
+ *     k.instance_eval { @secret }   #=> 99
+ */
+
+VALUE
+rb_obj_instance_eval(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE klass;
+
+    if (SPECIAL_CONST_P(self)) {
+	klass = Qnil;
+    }
+    else {
+	klass = rb_singleton_class(self);
+    }
+    return specific_eval(argc, argv, klass, self);
+}
+
+/*
+ *  call-seq:
+ *     mod.class_eval(string [, filename [, lineno]])  => obj
+ *     mod.module_eval {|| block }                     => obj
+ *  
+ *  Evaluates the string or block in the context of _mod_. This can
+ *  be used to add methods to a class. <code>module_eval</code> returns
+ *  the result of evaluating its argument. The optional _filename_
+ *  and _lineno_ parameters set the text for error messages.
+ *     
+ *     class Thing
+ *     end
+ *     a = %q{def hello() "Hello there!" end}
+ *     Thing.module_eval(a)
+ *     puts Thing.new.hello()
+ *     Thing.module_eval("invalid code", "dummy", 123)
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Hello there!
+ *     dummy:123:in `module_eval': undefined local variable
+ *         or method `code' for Thing:Class
+ */
+
+VALUE
+rb_mod_module_eval(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
+{
+    return specific_eval(argc, argv, mod, mod);
+}
+
+VALUE rb_load_path;
+
+NORETURN(static void load_failed _((VALUE)));
+
+void
+rb_load(fname, wrap)
+    VALUE fname;
+    int wrap;
+{
+    VALUE tmp;
+    int state;
+    volatile int prohibit_int = rb_prohibit_interrupt;
+    volatile ID last_func;
+    volatile VALUE wrapper = ruby_wrapper;
+    volatile VALUE self = ruby_top_self;
+    NODE *volatile last_node;
+    NODE *saved_cref = ruby_cref;
+    TMP_PROTECT;
+
+    if (wrap && ruby_safe_level >= 4) {
+	StringValue(fname);
+    }
+    else {
+	SafeStringValue(fname);
+    }
+    fname = rb_str_new4(fname);
+    tmp = rb_find_file(fname);
+    if (!tmp) {
+	load_failed(fname);
+    }
+    fname = tmp;
+
+    ruby_errinfo = Qnil;	/* ensure */
+    PUSH_VARS();
+    PUSH_CLASS(ruby_wrapper);
+    ruby_cref = ruby_top_cref;
+    if (!wrap) {
+	rb_secure(4);		/* should alter global state */
+	ruby_class = rb_cObject;
+	ruby_wrapper = 0;
+    }
+    else {
+	/* load in anonymous module as toplevel */
+	ruby_class = ruby_wrapper = rb_module_new();
+	self = rb_obj_clone(ruby_top_self);
+	rb_extend_object(self, ruby_wrapper);
+	PUSH_CREF(ruby_wrapper);
+    }
+    PUSH_ITER(ITER_NOT);
+    PUSH_FRAME();
+    ruby_frame->last_func = 0;
+    ruby_frame->last_class = 0;
+    ruby_frame->self = self;
+    PUSH_SCOPE();
+    /* default visibility is private at loading toplevel */
+    SCOPE_SET(SCOPE_PRIVATE);
+    PUSH_TAG(PROT_NONE);
+    state = EXEC_TAG();
+    last_func = ruby_frame->last_func;
+    last_node = ruby_current_node;
+    if (!ruby_current_node && ruby_sourcefile) {
+	last_node = NEW_NEWLINE(0);
+    }
+    ruby_current_node = 0;
+    if (state == 0) {
+	NODE *node;
+	volatile int critical;
+
+	DEFER_INTS;
+	ruby_in_eval++;
+	critical = rb_thread_critical;
+	rb_thread_critical = Qtrue;
+	rb_load_file(RSTRING(fname)->ptr);
+	ruby_in_eval--;
+	node = ruby_eval_tree;
+	rb_thread_critical = critical;
+	ALLOW_INTS;
+	if (ruby_nerrs == 0) {
+	    eval_node(self, node);
+	}
+    }
+    ruby_frame->last_func = last_func;
+    ruby_current_node = last_node;
+    ruby_sourcefile = 0;
+    ruby_set_current_source();
+    if (ruby_scope->flags == SCOPE_ALLOCA && ruby_class == rb_cObject) {
+	if (ruby_scope->local_tbl) /* toplevel was empty */
+	    free(ruby_scope->local_tbl);
+    }
+    POP_TAG();
+    rb_prohibit_interrupt = prohibit_int;
+    ruby_cref = saved_cref;
+    POP_SCOPE();
+    POP_FRAME();
+    POP_ITER();
+    POP_CLASS();
+    POP_VARS();
+    ruby_wrapper = wrapper;
+    if (ruby_nerrs > 0) {
+	ruby_nerrs = 0;
+	rb_exc_raise(ruby_errinfo);
+    }
+    if (state) jump_tag_but_local_jump(state, Qundef);
+    if (!NIL_P(ruby_errinfo))	/* exception during load */
+	rb_exc_raise(ruby_errinfo);
+}
+
+void
+rb_load_protect(fname, wrap, state)
+    VALUE fname;
+    int wrap;
+    int *state;
+{
+    int status;
+
+    PUSH_TAG(PROT_NONE);
+    if ((status = EXEC_TAG()) == 0) {
+	rb_load(fname, wrap);
+    }
+    POP_TAG();
+    if (state) *state = status;
+}
+
+/*
+ *  call-seq:
+ *     load(filename, wrap=false)   => true
+ *  
+ *  Loads and executes the Ruby
+ *  program in the file _filename_. If the filename does not
+ *  resolve to an absolute path, the file is searched for in the library
+ *  directories listed in <code>$:</code>. If the optional _wrap_
+ *  parameter is +true+, the loaded script will be executed
+ *  under an anonymous module, protecting the calling program's global
+ *  namespace. In no circumstance will any local variables in the loaded
+ *  file be propagated to the loading environment.
+ */
+
+
+static VALUE
+rb_f_load(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE fname, wrap;
+
+    rb_scan_args(argc, argv, "11", &fname, &wrap);
+    rb_load(fname, RTEST(wrap));
+    return Qtrue;
+}
+
+VALUE ruby_dln_librefs;
+static VALUE rb_features;
+static st_table *loading_tbl;
+
+#define IS_SOEXT(e) (strcmp(e, ".so") == 0 || strcmp(e, ".o") == 0)
+#ifdef DLEXT2
+#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0 || strcmp(e, DLEXT2) == 0)
+#else
+#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0)
+#endif
+
+
+static const char *const loadable_ext[] = {
+    ".rb", DLEXT,
+#ifdef DLEXT2
+    DLEXT2,
+#endif
+    0
+};
+
+static int rb_feature_p _((const char *, const char *, int));
+static int search_required _((VALUE, VALUE *, VALUE *));
+
+static int
+rb_feature_p(feature, ext, rb)
+    const char *feature, *ext;
+    int rb;
+{
+    VALUE v;
+    const char *f, *e;
+    long i, len, elen;
+
+    if (ext) {
+	len = ext - feature;
+	elen = strlen(ext);
+    }
+    else {
+	len = strlen(feature);
+	elen = 0;
+    }
+    for (i = 0; i < RARRAY_LEN(rb_features); ++i) {
+	v = RARRAY_PTR(rb_features)[i];
+	f = StringValuePtr(v);
+	if (RSTRING_LEN(v) < len || strncmp(f, feature, len) != 0)
+	    continue;
+	if (!*(e = f + len)) {
+	    if (ext) continue;
+	    return 'u';
+	}
+	if (*e != '.') continue;
+	if ((!rb || !ext) && (IS_SOEXT(e) || IS_DLEXT(e))) {
+	    return 's';
+	}
+	if ((rb || !ext) && (strcmp(e, ".rb") == 0)) {
+	    return 'r';
+	}
+    }
+    if (loading_tbl) {
+	if (st_lookup(loading_tbl, (st_data_t)feature, 0)) {
+	    if (!ext) return 'u';
+	    return strcmp(ext, ".rb") ? 's' : 'r';
+	}
+	else {
+	    char *buf;
+
+	    if (ext && *ext) return 0;
+	    buf = ALLOCA_N(char, len + DLEXT_MAXLEN + 1);
+	    MEMCPY(buf, feature, char, len);
+	    for (i = 0; (e = loadable_ext[i]) != 0; i++) {
+		strncpy(buf + len, e, DLEXT_MAXLEN + 1);
+		if (st_lookup(loading_tbl, (st_data_t)buf, 0)) {
+		    return i ? 's' : 'r';
+		}
+	    }
+	}
+    }
+    return 0;
+}
+
+int
+rb_provided(feature)
+    const char *feature;
+{
+    const char *ext = strrchr(feature, '.');
+
+    if (ext && !strchr(ext, '/')) {
+	if (strcmp(".rb", ext) == 0) {
+	    if (rb_feature_p(feature, ext, Qtrue)) return Qtrue;
+	    return Qfalse;
+	}
+	else if (IS_SOEXT(ext) || IS_DLEXT(ext)) {
+	    if (rb_feature_p(feature, ext, Qfalse)) return Qtrue;
+	    return Qfalse;
+	}
+    }
+    if (rb_feature_p(feature, feature + strlen(feature), Qtrue))
+	return Qtrue;
+
+    return Qfalse;
+}
+
+static void
+rb_provide_feature(feature)
+    VALUE feature;
+{
+    rb_ary_push(rb_features, feature);
+}
+
+void
+rb_provide(feature)
+    const char *feature;
+{
+    rb_provide_feature(rb_str_new2(feature));
+}
+
+static char *
+load_lock(ftptr)
+    const char *ftptr;
+{
+    st_data_t th;
+
+    if (!loading_tbl ||
+	!st_lookup(loading_tbl, (st_data_t)ftptr, &th))
+    {
+	/* loading ruby library should be serialized. */
+	if (!loading_tbl) {
+	    loading_tbl = st_init_strtable();
+	}
+	/* partial state */
+	ftptr = ruby_strdup(ftptr);
+	st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread);
+	return (char *)ftptr;
+    }
+    do {
+	if ((rb_thread_t)th == curr_thread) return 0;
+	CHECK_INTS;
+    } while (st_lookup(loading_tbl, (st_data_t)ftptr, &th));
+    return 0;
+}
+
+static void
+load_unlock(const char *ftptr)
+{
+    if (ftptr) {
+	st_data_t key = (st_data_t)ftptr;
+	
+	if (st_delete(loading_tbl, &key, 0)) {
+	    free((char *)key);
+	}
+    }
+}
+
+/*
+ *  call-seq:
+ *     require(string)    => true or false
+ *  
+ *  Ruby tries to load the library named _string_, returning
+ *  +true+ if successful. If the filename does not resolve to
+ *  an absolute path, it will be searched for in the directories listed
+ *  in <code>$:</code>. If the file has the extension ``.rb'', it is
+ *  loaded as a source file; if the extension is ``.so'', ``.o'', or
+ *  ``.dll'', or whatever the default shared library extension is on
+ *  the current platform, Ruby loads the shared library as a Ruby
+ *  extension. Otherwise, Ruby tries adding ``.rb'', ``.so'', and so on
+ *  to the name. The name of the loaded feature is added to the array in
+ *  <code>$"</code>. A feature will not be loaded if it's name already
+ *  appears in <code>$"</code>. However, the file name is not converted
+ *  to an absolute path, so that ``<code>require 'a';require
+ *  './a'</code>'' will load <code>a.rb</code> twice.
+ *     
+ *     require "my-library.rb"
+ *     require "db-driver"
+ */
+
+VALUE
+rb_f_require(obj, fname)
+    VALUE obj, fname;
+{
+    return rb_require_safe(fname, ruby_safe_level);
+}
+
+static int
+search_required(fname, featurep, path)
+    VALUE fname, *featurep, *path;
+{
+    VALUE tmp;
+    char *ext, *ftptr;
+    int type;
+
+    *featurep = fname;
+    *path = 0;
+    ext = strrchr(ftptr = RSTRING_PTR(fname), '.');
+    if (ext && !strchr(ext, '/')) {
+	if (strcmp(".rb", ext) == 0) {
+	    if (rb_feature_p(ftptr, ext, Qtrue)) return 'r';
+	    if ((*path = rb_find_file(fname)) != 0) return 'r';
+	    return 0;
+	}
+	else if (IS_SOEXT(ext)) {
+	    if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
+	    tmp = rb_str_new(RSTRING_PTR(fname), ext-RSTRING_PTR(fname));
+	    *featurep = tmp;
+#ifdef DLEXT2
+	    OBJ_FREEZE(tmp);
+	    if (rb_find_file_ext(&tmp, loadable_ext+1)) {
+		*featurep = tmp;
+		*path = rb_find_file(tmp);
+		return 's';
+	    }
+#else
+	    rb_str_cat2(tmp, DLEXT);
+	    OBJ_FREEZE(tmp);
+	    if (*path = rb_find_file(tmp)) {
+		return 's';
+	    }
+#endif
+	}
+	else if (IS_DLEXT(ext)) {
+	    if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
+	    if ((*path = rb_find_file(fname)) != 0) return 's';
+	}
+    }
+    tmp = fname;
+    type = rb_find_file_ext(&tmp, loadable_ext);
+    *featurep = tmp;
+    switch (type) {
+      case 0:
+	ftptr = RSTRING_PTR(tmp);
+	return rb_feature_p(ftptr, 0, Qfalse);
+
+      default:
+	ext = strrchr(ftptr = RSTRING(tmp)->ptr, '.');
+	if (rb_feature_p(ftptr, ext, !--type)) break;
+	*path = rb_find_file(tmp);
+    }
+    return type ? 's' : 'r';
+}
+
+static void
+load_failed(fname)
+    VALUE fname;
+{
+    rb_raise(rb_eLoadError, "no such file to load -- %s", RSTRING(fname)->ptr);
+}
+
+VALUE
+rb_require_safe(fname, safe)
+    VALUE fname;
+    int safe;
+{
+    VALUE result = Qnil;
+    volatile VALUE errinfo = ruby_errinfo;
+    int state;
+    struct {
+	NODE *node;
+	ID func;
+	int vmode, safe;
+    } volatile saved;
+    char *volatile ftptr = 0;
+
+    if (OBJ_TAINTED(fname)) {
+	rb_check_safe_obj(fname);
+    }
+    StringValue(fname);
+    fname = rb_str_new4(fname);
+    saved.vmode = scope_vmode;
+    saved.node = ruby_current_node;
+    saved.func = ruby_frame->last_func;
+    saved.safe = ruby_safe_level;
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	VALUE feature, path;
+	long handle;
+	int found;
+
+	ruby_safe_level = safe;
+	found = search_required(fname, &feature, &path);
+	if (found) {
+	    if (!path || !(ftptr = load_lock(RSTRING_PTR(feature)))) {
+		result = Qfalse;
+	    }
+	    else {
+		ruby_safe_level = 0;
+		switch (found) {
+		  case 'r':
+		    rb_load(path, 0);
+		    break;
+
+		  case 's':
+		    ruby_current_node = 0;
+		    ruby_sourcefile = rb_source_filename(RSTRING(path)->ptr);
+		    ruby_sourceline = 0;
+		    ruby_frame->last_func = 0;
+		    SCOPE_SET(SCOPE_PUBLIC);
+		    handle = (long)dln_load(RSTRING(path)->ptr);
+		    rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
+		    break;
+		}
+		rb_provide_feature(feature);
+		result = Qtrue;
+	    }
+	}
+    }
+    POP_TAG();
+    ruby_current_node = saved.node;
+    ruby_set_current_source();
+    ruby_frame->last_func = saved.func;
+    SCOPE_SET(saved.vmode);
+    ruby_safe_level = saved.safe;
+    load_unlock(ftptr);
+    if (state) JUMP_TAG(state);
+    if (NIL_P(result)) {
+	load_failed(fname);
+    }
+    ruby_errinfo = errinfo;
+
+    return result;
+}
+
+VALUE
+rb_require(fname)
+    const char *fname;
+{
+    VALUE fn = rb_str_new2(fname);
+    OBJ_FREEZE(fn);
+    return rb_require_safe(fn, ruby_safe_level);
+}
+
+void
+ruby_init_ext(name, init)
+    const char *name;
+    void (*init) _((void));
+{
+    ruby_current_node = 0;
+    ruby_sourcefile = rb_source_filename(name);
+    ruby_sourceline = 0;
+    ruby_frame->last_func = 0;
+    ruby_frame->orig_func = 0;
+    SCOPE_SET(SCOPE_PUBLIC);
+    if (load_lock(name)) {
+	(*init)();
+	rb_provide(name);
+	load_unlock(name);
+    }
+}
+
+static void
+secure_visibility(self)
+    VALUE self;
+{
+    if (ruby_safe_level >= 4 && !OBJ_TAINTED(self)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't change method visibility");
+    }
+}
+
+static void
+set_method_visibility(self, argc, argv, ex)
+    VALUE self;
+    int argc;
+    VALUE *argv;
+    ID ex;
+{
+    int i;
+
+    secure_visibility(self);
+    for (i=0; i<argc; i++) {
+	rb_export_method(self, rb_to_id(argv[i]), ex);
+    }
+    rb_clear_cache_by_class(self);
+}
+
+/*
+ *  call-seq:
+ *     public                 => self
+ *     public(symbol, ...)    => self
+ *  
+ *  With no arguments, sets the default visibility for subsequently
+ *  defined methods to public. With arguments, sets the named methods to
+ *  have public visibility.
+ */
+
+static VALUE
+rb_mod_public(argc, argv, module)
+    int argc;
+    VALUE *argv;
+    VALUE module;
+{
+    secure_visibility(module);
+    if (argc == 0) {
+	SCOPE_SET(SCOPE_PUBLIC);
+    }
+    else {
+	set_method_visibility(module, argc, argv, NOEX_PUBLIC);
+    }
+    return module;
+}
+
+/*
+ *  call-seq:
+ *     protected                => self
+ *     protected(symbol, ...)   => self
+ *  
+ *  With no arguments, sets the default visibility for subsequently
+ *  defined methods to protected. With arguments, sets the named methods
+ *  to have protected visibility.
+ */
+
+static VALUE
+rb_mod_protected(argc, argv, module)
+    int argc;
+    VALUE *argv;
+    VALUE module;
+{
+    secure_visibility(module);
+    if (argc == 0) {
+	SCOPE_SET(SCOPE_PROTECTED);
+    }
+    else {
+	set_method_visibility(module, argc, argv, NOEX_PROTECTED);
+    }
+    return module;
+}
+
+/*
+ *  call-seq:
+ *     private                 => self
+ *     private(symbol, ...)    => self
+ *  
+ *  With no arguments, sets the default visibility for subsequently
+ *  defined methods to private. With arguments, sets the named methods
+ *  to have private visibility.
+ *     
+ *     module Mod
+ *       def a()  end
+ *       def b()  end
+ *       private
+ *       def c()  end
+ *       private :a
+ *     end
+ *     Mod.private_instance_methods   #=> ["a", "c"]
+ */
+
+static VALUE
+rb_mod_private(argc, argv, module)
+    int argc;
+    VALUE *argv;
+    VALUE module;
+{
+    secure_visibility(module);
+    if (argc == 0) {
+	SCOPE_SET(SCOPE_PRIVATE);
+    }
+    else {
+	set_method_visibility(module, argc, argv, NOEX_PRIVATE);
+    }
+    return module;
+}
+
+/*
+ *  call-seq:
+ *     mod.public_class_method(symbol, ...)    => mod
+ *  
+ *  Makes a list of existing class methods public.
+ */
+
+static VALUE
+rb_mod_public_method(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    set_method_visibility(CLASS_OF(obj), argc, argv, NOEX_PUBLIC);
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     mod.private_class_method(symbol, ...)   => mod
+ *  
+ *  Makes existing class methods private. Often used to hide the default
+ *  constructor <code>new</code>.
+ *     
+ *     class SimpleSingleton  # Not thread safe
+ *       private_class_method :new
+ *       def SimpleSingleton.create(*args, &block)
+ *         @me = new(*args, &block) if ! @me
+ *         @me
+ *       end
+ *     end
+ */
+
+static VALUE
+rb_mod_private_method(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    set_method_visibility(CLASS_OF(obj), argc, argv, NOEX_PRIVATE);
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     public
+ *     public(symbol, ...)
+ *  
+ *  With no arguments, sets the default visibility for subsequently
+ *  defined methods to public. With arguments, sets the named methods to
+ *  have public visibility.
+ */
+
+static VALUE
+top_public(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    return rb_mod_public(argc, argv, rb_cObject);
+}
+
+static VALUE
+top_private(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    return rb_mod_private(argc, argv, rb_cObject);
+}
+
+/*
+ *  call-seq:
+ *     module_function(symbol, ...)    => self
+ *  
+ *  Creates module functions for the named methods. These functions may
+ *  be called with the module as a receiver, and also become available
+ *  as instance methods to classes that mix in the module. Module
+ *  functions are copies of the original, and so may be changed
+ *  independently. The instance-method versions are made private. If
+ *  used with no arguments, subsequently defined methods become module
+ *  functions.
+ *     
+ *     module Mod
+ *       def one
+ *         "This is one"
+ *       end
+ *       module_function :one
+ *     end
+ *     class Cls
+ *       include Mod
+ *       def callOne
+ *         one
+ *       end
+ *     end
+ *     Mod.one     #=> "This is one"
+ *     c = Cls.new
+ *     c.callOne   #=> "This is one"
+ *     module Mod
+ *       def one
+ *         "This is the new one"
+ *       end
+ *     end
+ *     Mod.one     #=> "This is one"
+ *     c.callOne   #=> "This is the new one"
+ */
+
+static VALUE
+rb_mod_modfunc(argc, argv, module)
+    int argc;
+    VALUE *argv;
+    VALUE module;
+{
+    int i;
+    ID id;
+    NODE *body;
+
+    if (TYPE(module) != T_MODULE) {
+	rb_raise(rb_eTypeError, "module_function must be called for modules");
+    }
+
+    secure_visibility(module);
+    if (argc == 0) {
+	SCOPE_SET(SCOPE_MODFUNC);
+	return module;
+    }
+
+    set_method_visibility(module, argc, argv, NOEX_PRIVATE);
+    for (i=0; i<argc; i++) {
+	VALUE m = module;
+
+	id = rb_to_id(argv[i]);
+	for (;;) {
+	    body = search_method(m, id, &m);
+	    if (body == 0) {
+		body = search_method(rb_cObject, id, &m);
+	    }
+	    if (body == 0 || body->nd_body == 0) {
+		rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
+	    }
+	    if (nd_type(body->nd_body) != NODE_ZSUPER) {
+		break;		/* normal case: need not to follow 'super' link */
+	    }
+	    m = RCLASS(m)->super;
+	    if (!m) break;
+	}
+	rb_add_method(rb_singleton_class(module), id, body->nd_body, NOEX_PUBLIC);
+    }
+    return module;
+}
+
+/*
+ *  call-seq:
+ *     append_features(mod)   => mod
+ *  
+ *  When this module is included in another, Ruby calls
+ *  <code>append_features</code> in this module, passing it the
+ *  receiving module in _mod_. Ruby's default implementation is
+ *  to add the constants, methods, and module variables of this module
+ *  to _mod_ if this module has not already been added to
+ *  _mod_ or one of its ancestors. See also <code>Module#include</code>.
+ */
+
+static VALUE
+rb_mod_append_features(module, include)
+    VALUE module, include;
+{
+    switch (TYPE(include)) {
+      case T_CLASS:
+      case T_MODULE:
+	break;
+      default:
+	Check_Type(include, T_CLASS);
+	break;
+    }
+    rb_include_module(include, module);
+
+    return module;
+}
+
+/*
+ *  call-seq:
+ *     include(module, ...)    => self
+ *  
+ *  Invokes <code>Module.append_features</code> on each parameter in turn.
+ */
+
+static VALUE
+rb_mod_include(argc, argv, module)
+    int argc;
+    VALUE *argv;
+    VALUE module;
+{
+    int i;
+
+    for (i=0; i<argc; i++) Check_Type(argv[i], T_MODULE);
+    while (argc--) {
+	rb_funcall(argv[argc], rb_intern("append_features"), 1, module);
+	rb_funcall(argv[argc], rb_intern("included"), 1, module);
+    }
+    return module;
+}
+
+void
+rb_obj_call_init(obj, argc, argv)
+    VALUE obj;
+    int argc;
+    VALUE *argv;
+{
+    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+    rb_funcall2(obj, init, argc, argv);
+    POP_ITER();
+}
+
+void
+rb_extend_object(obj, module)
+    VALUE obj, module;
+{
+    rb_include_module(rb_singleton_class(obj), module);
+}
+
+/*
+ *  call-seq:
+ *     extend_object(obj)    => obj
+ *  
+ *  Extends the specified object by adding this module's constants and
+ *  methods (which are added as singleton methods). This is the callback
+ *  method used by <code>Object#extend</code>.
+ *     
+ *     module Picky
+ *       def Picky.extend_object(o)
+ *         if String === o
+ *           puts "Can't add Picky to a String"
+ *         else
+ *           puts "Picky added to #{o.class}"
+ *           super
+ *         end
+ *       end
+ *     end
+ *     (s = Array.new).extend Picky  # Call Object.extend
+ *     (s = "quick brown fox").extend Picky
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Picky added to Array
+ *     Can't add Picky to a String
+ */
+
+static VALUE
+rb_mod_extend_object(mod, obj)
+    VALUE mod, obj;
+{
+    rb_extend_object(obj, mod);
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     obj.extend(module, ...)    => obj
+ *  
+ *  Adds to _obj_ the instance methods from each module given as a
+ *  parameter.
+ *     
+ *     module Mod
+ *       def hello
+ *         "Hello from Mod.\n"
+ *       end
+ *     end
+ *     
+ *     class Klass
+ *       def hello
+ *         "Hello from Klass.\n"
+ *       end
+ *     end
+ *     
+ *     k = Klass.new
+ *     k.hello         #=> "Hello from Klass.\n"
+ *     k.extend(Mod)   #=> #<Klass:0x401b3bc8>
+ *     k.hello         #=> "Hello from Mod.\n"
+ */
+
+static VALUE
+rb_obj_extend(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    int i;
+
+    if (argc == 0) {
+	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
+    }
+    for (i=0; i<argc; i++) Check_Type(argv[i], T_MODULE);
+    while (argc--) {
+	rb_funcall(argv[argc], rb_intern("extend_object"), 1, obj);
+	rb_funcall(argv[argc], rb_intern("extended"), 1, obj);
+    }
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     include(module, ...)   => self
+ *  
+ *  Invokes <code>Module.append_features</code>
+ *  on each parameter in turn. Effectively adds the methods and constants
+ *  in each module to the receiver.
+ */
+
+static VALUE
+top_include(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    rb_secure(4);
+    if (ruby_wrapper) {
+	rb_warning("main#include in the wrapped load is effective only in wrapper module");
+	return rb_mod_include(argc, argv, ruby_wrapper);
+    }
+    return rb_mod_include(argc, argv, rb_cObject);
+}
+
+VALUE rb_f_trace_var();
+VALUE rb_f_untrace_var();
+
+static void
+errinfo_setter(val, id, var)
+    VALUE val;
+    ID id;
+    VALUE *var;
+{
+    if (!NIL_P(val) && !rb_obj_is_kind_of(val, rb_eException)) {
+	rb_raise(rb_eTypeError, "assigning non-exception to $!");
+    }
+    *var = val;
+}
+
+static VALUE
+errat_getter(id)
+    ID id;
+{
+    return get_backtrace(ruby_errinfo);
+}
+
+static void
+errat_setter(val, id, var)
+    VALUE val;
+    ID id;
+    VALUE *var;
+{
+    if (NIL_P(ruby_errinfo)) {
+	rb_raise(rb_eArgError, "$! not set");
+    }
+    set_backtrace(ruby_errinfo, val);
+}
+
+/*
+ *  call-seq:
+ *     local_variables    => array
+ *  
+ *  Returns the names of the current local variables.
+ *     
+ *     fred = 1
+ *     for i in 1..10
+ *        # ...
+ *     end
+ *     local_variables   #=> ["fred", "i"]
+ */
+
+static VALUE
+rb_f_local_variables()
+{
+    ID *tbl;
+    int n, i;
+    VALUE ary = rb_ary_new();
+    struct RVarmap *vars;
+
+    tbl = ruby_scope->local_tbl;
+    if (tbl) {
+	n = *tbl++;
+	for (i=2; i<n; i++) {	/* skip first 2 ($_ and $~) */
+	    if (!rb_is_local_id(tbl[i])) continue; /* skip flip states */
+	    rb_ary_push(ary, rb_str_new2(rb_id2name(tbl[i])));
+	}
+    }
+
+    vars = ruby_dyna_vars;
+    while (vars) {
+	if (vars->id && rb_is_local_id(vars->id)) { /* skip $_, $~ and flip states */
+	    rb_ary_push(ary, rb_str_new2(rb_id2name(vars->id)));
+	}
+	vars = vars->next;
+    }
+
+    return ary;
+}
+
+static VALUE rb_f_catch _((VALUE,VALUE));
+NORETURN(static VALUE rb_f_throw _((int,VALUE*)));
+
+struct end_proc_data {
+    void (*func)();
+    VALUE data;
+    int safe;
+    struct end_proc_data *next;
+};
+
+static struct end_proc_data *end_procs, *ephemeral_end_procs, *tmp_end_procs;
+
+void
+rb_set_end_proc(func, data)
+    void (*func) _((VALUE));
+    VALUE data;
+{
+    struct end_proc_data *link = ALLOC(struct end_proc_data);
+    struct end_proc_data **list;
+
+    if (ruby_wrapper) list = &ephemeral_end_procs;
+    else              list = &end_procs;
+    link->next = *list;
+    link->func = func;
+    link->data = data;
+    link->safe = ruby_safe_level;
+    *list = link;
+}
+
+void
+rb_mark_end_proc()
+{
+    struct end_proc_data *link;
+
+    link = end_procs;
+    while (link) {
+	rb_gc_mark(link->data);
+	link = link->next;
+    }
+    link = ephemeral_end_procs;
+    while (link) {
+	rb_gc_mark(link->data);
+	link = link->next;
+    }
+    link = tmp_end_procs;
+    while (link) {
+	rb_gc_mark(link->data);
+	link = link->next;
+    }
+}
+
+static void call_end_proc _((VALUE data));
+
+static void
+call_end_proc(data)
+    VALUE data;
+{
+    PUSH_ITER(ITER_NOT);
+    PUSH_FRAME();
+    ruby_frame->self = ruby_frame->prev->self;
+    ruby_frame->node = 0;
+    ruby_frame->last_func = 0;
+    ruby_frame->last_class = 0;
+    proc_invoke(data, rb_ary_new2(0), Qundef, 0);
+    POP_FRAME();
+    POP_ITER();
+}
+
+static void
+rb_f_END()
+{
+    PUSH_FRAME();
+    ruby_frame->argc = 0;
+    ruby_frame->iter = ITER_CUR;
+    rb_set_end_proc(call_end_proc, rb_block_proc());
+    POP_FRAME();
+}
+
+/*
+ *  call-seq:
+ *     at_exit { block } -> proc
+ *  
+ *  Converts _block_ to a +Proc+ object (and therefore
+ *  binds it at the point of call) and registers it for execution when
+ *  the program exits. If multiple handlers are registered, they are
+ *  executed in reverse order of registration.
+ *     
+ *     def do_at_exit(str1)
+ *       at_exit { print str1 }
+ *     end
+ *     at_exit { puts "cruel world" }
+ *     do_at_exit("goodbye ")
+ *     exit
+ *     
+ *  <em>produces:</em>
+ *     
+ *     goodbye cruel world
+ */
+
+static VALUE
+rb_f_at_exit()
+{
+    VALUE proc;
+
+    if (!rb_block_given_p()) {
+	rb_raise(rb_eArgError, "called without a block");
+    }
+    proc = rb_block_proc();
+    rb_set_end_proc(call_end_proc, proc);
+    return proc;
+}
+
+void
+rb_exec_end_proc()
+{
+    struct end_proc_data *link, *tmp;
+    int status;
+    volatile int safe = ruby_safe_level;
+
+    while (ephemeral_end_procs) {
+	tmp_end_procs = link = ephemeral_end_procs;
+	ephemeral_end_procs = 0;
+	while (link) {
+	    PUSH_TAG(PROT_NONE);
+	    if ((status = EXEC_TAG()) == 0) {
+		ruby_safe_level = link->safe;
+		(*link->func)(link->data);
+	    }
+	    POP_TAG();
+	    if (status) {
+		error_handle(status);
+	    }
+	    tmp = link;
+	    tmp_end_procs = link = link->next;
+	    free(tmp);
+	}
+    }
+    while (end_procs) {
+	tmp_end_procs = link = end_procs;
+	end_procs = 0;
+	while (link) {
+	    PUSH_TAG(PROT_NONE);
+	    if ((status = EXEC_TAG()) == 0) {
+		ruby_safe_level = link->safe;
+		(*link->func)(link->data);
+	    }
+	    POP_TAG();
+	    if (status) {
+		error_handle(status);
+	    }
+	    tmp = link;
+	    tmp_end_procs = link = link->next;
+	    free(tmp);
+	}
+    }
+    ruby_safe_level = safe;
+}
+
+void
+Init_eval()
+{
+    init = rb_intern("initialize");
+    eqq = rb_intern("===");
+    each = rb_intern("each");
+
+    aref = rb_intern("[]");
+    aset = rb_intern("[]=");
+    match = rb_intern("=~");
+    missing = rb_intern("method_missing");
+    added = rb_intern("method_added");
+    singleton_added = rb_intern("singleton_method_added");
+    removed = rb_intern("method_removed");
+    singleton_removed = rb_intern("singleton_method_removed");
+    undefined = rb_intern("method_undefined");
+    singleton_undefined = rb_intern("singleton_method_undefined");
+
+    __id__ = rb_intern("__id__");
+    __send__ = rb_intern("__send__");
+
+    rb_global_variable((VALUE*)&top_scope);
+    rb_global_variable((VALUE*)&ruby_eval_tree_begin);
+
+    rb_global_variable((VALUE*)&ruby_eval_tree);
+    rb_global_variable((VALUE*)&ruby_dyna_vars);
+
+    rb_define_virtual_variable("$@", errat_getter, errat_setter);
+    rb_define_hooked_variable("$!", &ruby_errinfo, 0, errinfo_setter);
+
+    rb_define_global_function("eval", rb_f_eval, -1);
+    rb_define_global_function("iterator?", rb_f_block_given_p, 0);
+    rb_define_global_function("block_given?", rb_f_block_given_p, 0);
+    rb_define_global_function("method_missing", rb_method_missing, -1);
+    rb_define_global_function("loop", rb_f_loop, 0);
+
+    rb_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1);
+    respond_to   = rb_intern("respond_to?");
+    rb_global_variable((VALUE*)&basic_respond_to);
+    basic_respond_to = rb_method_node(rb_cObject, respond_to);
+    
+    rb_define_global_function("raise", rb_f_raise, -1);
+    rb_define_global_function("fail", rb_f_raise, -1);
+
+    rb_define_global_function("caller", rb_f_caller, -1);
+
+    rb_define_global_function("exit", rb_f_exit, -1);
+    rb_define_global_function("abort", rb_f_abort, -1);
+
+    rb_define_global_function("at_exit", rb_f_at_exit, 0);
+
+    rb_define_global_function("catch", rb_f_catch, 1);
+    rb_define_global_function("throw", rb_f_throw, -1);
+    rb_define_global_function("global_variables", rb_f_global_variables, 0); /* in variable.c */
+    rb_define_global_function("local_variables", rb_f_local_variables, 0);
+
+    rb_define_method(rb_mKernel, "send", rb_f_send, -1);
+    rb_define_method(rb_mKernel, "__send__", rb_f_send, -1);
+    rb_define_method(rb_mKernel, "instance_eval", rb_obj_instance_eval, -1);
+
+    rb_define_private_method(rb_cModule, "append_features", rb_mod_append_features, 1);
+    rb_define_private_method(rb_cModule, "extend_object", rb_mod_extend_object, 1);
+    rb_define_private_method(rb_cModule, "include", rb_mod_include, -1);
+    rb_define_private_method(rb_cModule, "public", rb_mod_public, -1);
+    rb_define_private_method(rb_cModule, "protected", rb_mod_protected, -1);
+    rb_define_private_method(rb_cModule, "private", rb_mod_private, -1);
+    rb_define_private_method(rb_cModule, "module_function", rb_mod_modfunc, -1);
+    rb_define_method(rb_cModule, "method_defined?", rb_mod_method_defined, 1);
+    rb_define_method(rb_cModule, "public_method_defined?", rb_mod_public_method_defined, 1);
+    rb_define_method(rb_cModule, "private_method_defined?", rb_mod_private_method_defined, 1);
+    rb_define_method(rb_cModule, "protected_method_defined?", rb_mod_protected_method_defined, 1);
+    rb_define_method(rb_cModule, "public_class_method", rb_mod_public_method, -1);
+    rb_define_method(rb_cModule, "private_class_method", rb_mod_private_method, -1);
+    rb_define_method(rb_cModule, "module_eval", rb_mod_module_eval, -1);
+    rb_define_method(rb_cModule, "class_eval", rb_mod_module_eval, -1);
+
+    rb_undef_method(rb_cClass, "module_function");
+
+    rb_define_private_method(rb_cModule, "remove_method", rb_mod_remove_method, -1);
+    rb_define_private_method(rb_cModule, "undef_method", rb_mod_undef_method, -1);
+    rb_define_private_method(rb_cModule, "alias_method", rb_mod_alias_method, 2);
+    rb_define_private_method(rb_cModule, "define_method", rb_mod_define_method, -1);
+
+    rb_define_singleton_method(rb_cModule, "nesting", rb_mod_nesting, 0);
+    rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, 0);
+
+    rb_define_singleton_method(ruby_top_self, "include", top_include, -1);
+    rb_define_singleton_method(ruby_top_self, "public", top_public, -1);
+    rb_define_singleton_method(ruby_top_self, "private", top_private, -1);
+
+    rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
+
+    rb_define_global_function("trace_var", rb_f_trace_var, -1); /* in variable.c */
+    rb_define_global_function("untrace_var", rb_f_untrace_var, -1); /* in variable.c */
+
+    rb_define_global_function("set_trace_func", set_trace_func, 1);
+    rb_global_variable(&trace_func);
+
+    rb_define_virtual_variable("$SAFE", safe_getter, safe_setter);
+}
+
+/*
+ *  call-seq:
+ *     mod.autoload(name, filename)   => nil
+ *
+ *  Registers _filename_ to be loaded (using <code>Kernel::require</code>) 
+ *  the first time that _name_ (which may be a <code>String</code> or
+ *  a symbol) is accessed in the namespace of _mod_.
+ *
+ *     module A
+ *     end
+ *     A.autoload(:B, "b")
+ *     A::B.doit            # autoloads "b"
+ */
+
+static VALUE
+rb_mod_autoload(mod, sym, file)
+    VALUE mod;
+    VALUE sym;
+    VALUE file;
+{
+    ID id = rb_to_id(sym);
+
+    Check_SafeStr(file);
+    rb_autoload(mod, id, RSTRING(file)->ptr);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     mod.autoload?(name)   => String or nil
+ *
+ *  Returns _filename_ to be loaded if _name_ is registered as
+ *  +autoload+ in the namespace of _mod_.
+ *
+ *     module A
+ *     end
+ *     A.autoload(:B, "b")
+ *     A.autoload?(:B)            # => "b"
+ */
+
+static VALUE
+rb_mod_autoload_p(mod, sym)
+    VALUE mod, sym;
+{
+    return rb_autoload_p(mod, rb_to_id(sym));
+}
+
+/*
+ *  call-seq:
+ *     autoload(module, filename)   => nil
+ *  
+ *  Registers _filename_ to be loaded (using <code>Kernel::require</code>) 
+ *  the first time that _module_ (which may be a <code>String</code> or
+ *  a symbol) is accessed.
+ *     
+ *     autoload(:MyModule, "/usr/local/lib/modules/my_module.rb")
+ */
+
+static VALUE
+rb_f_autoload(obj, sym, file)
+    VALUE obj;
+    VALUE sym;
+    VALUE file;
+{
+    if (NIL_P(ruby_cbase)) {
+	rb_raise(rb_eTypeError, "no class/module for autoload target");
+    }
+    return rb_mod_autoload(ruby_cbase, sym, file);
+}
+
+/*
+ *  call-seq:
+ *     autoload(module, filename)   => nil
+ *
+ *  Registers _filename_ to be loaded (using <code>Kernel::require</code>)
+ *  the first time that _module_ (which may be a <code>String</code> or
+ *  a symbol) is accessed.
+ *
+ *     autoload(:MyModule, "/usr/local/lib/modules/my_module.rb")
+ */
+
+static VALUE
+rb_f_autoload_p(obj, sym)
+    VALUE obj;
+    VALUE sym;
+{
+    /* use ruby_cbase as same as rb_f_autoload. */
+    if (NIL_P(ruby_cbase)) {
+	return Qfalse;
+    }
+    return rb_mod_autoload_p(ruby_cbase, sym);
+}
+
+void
+Init_load()
+{
+    rb_define_readonly_variable("$:", &rb_load_path);
+    rb_define_readonly_variable("$-I", &rb_load_path);
+    rb_define_readonly_variable("$LOAD_PATH", &rb_load_path);
+    rb_load_path = rb_ary_new();
+
+    rb_define_readonly_variable("$\"", &rb_features);
+    rb_define_readonly_variable("$LOADED_FEATURES", &rb_features);
+    rb_features = rb_ary_new();
+
+    rb_define_global_function("load", rb_f_load, -1);
+    rb_define_global_function("require", rb_f_require, 1);
+    rb_define_method(rb_cModule, "autoload",  rb_mod_autoload,   2);
+    rb_define_method(rb_cModule, "autoload?", rb_mod_autoload_p, 1);
+    rb_define_global_function("autoload",  rb_f_autoload,   2);
+    rb_define_global_function("autoload?", rb_f_autoload_p, 1);
+    rb_global_variable(&ruby_wrapper);
+
+    rb_global_variable(&ruby_dln_librefs);
+    ruby_dln_librefs = rb_ary_new();
+}
+
+static void
+scope_dup(scope)
+    struct SCOPE *scope;
+{
+    ID *tbl;
+    VALUE *vars;
+
+    scope->flags |= SCOPE_DONT_RECYCLE;
+    if (scope->flags & SCOPE_MALLOC) return;
+
+    if (scope->local_tbl) {
+	tbl = scope->local_tbl;
+	vars = ALLOC_N(VALUE, tbl[0]+1);
+	*vars++ = scope->local_vars[-1];
+	MEMCPY(vars, scope->local_vars, VALUE, tbl[0]);
+	scope->local_vars = vars;
+	scope->flags |= SCOPE_MALLOC;
+    }
+}
+
+static void
+blk_mark(data)
+    struct BLOCK *data;
+{
+    while (data) {
+	rb_gc_mark_frame(&data->frame);
+	rb_gc_mark((VALUE)data->scope);
+	rb_gc_mark((VALUE)data->var);
+	rb_gc_mark((VALUE)data->body);
+	rb_gc_mark((VALUE)data->self);
+	rb_gc_mark((VALUE)data->dyna_vars);
+	rb_gc_mark((VALUE)data->cref);
+	rb_gc_mark(data->wrapper);
+	rb_gc_mark(data->block_obj);
+	data = data->prev;
+    }
+}
+
+static void
+frame_free(frame)
+    struct FRAME *frame;
+{
+    struct FRAME *tmp;
+
+    frame = frame->prev;
+    while (frame) {
+	tmp = frame;
+	frame = frame->prev;
+	free(tmp);
+    }
+}
+
+static void
+blk_free(data)
+    struct BLOCK *data;
+{
+    void *tmp;
+
+    while (data) {
+	frame_free(&data->frame);
+	tmp = data;
+	data = data->prev;
+	free(tmp);
+    }
+}
+
+static void
+frame_dup(frame)
+    struct FRAME *frame;
+{
+    struct FRAME *tmp;
+
+    for (;;) {
+	frame->tmp = 0;		/* should not preserve tmp */
+	if (!frame->prev) break;
+	tmp = ALLOC(struct FRAME);
+	*tmp = *frame->prev;
+	frame->prev = tmp;
+	frame = tmp;
+    }
+}
+
+
+static void
+blk_copy_prev(block)
+    struct BLOCK *block;
+{
+    struct BLOCK *tmp;
+    struct RVarmap* vars;
+
+    while (block->prev) {
+	tmp = ALLOC_N(struct BLOCK, 1);
+	MEMCPY(tmp, block->prev, struct BLOCK, 1);
+	scope_dup(tmp->scope);
+	frame_dup(&tmp->frame);
+
+	for (vars = tmp->dyna_vars; vars; vars = vars->next) {
+	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+	    FL_SET(vars, DVAR_DONT_RECYCLE);
+	}
+
+	block->prev = tmp;
+	block = tmp;
+    }
+}
+
+
+static void
+blk_dup(dup, orig)
+    struct BLOCK *dup, *orig;
+{
+    MEMCPY(dup, orig, struct BLOCK, 1);
+    frame_dup(&dup->frame);
+
+    if (dup->iter) {
+	blk_copy_prev(dup);
+    }
+    else {
+	dup->prev = 0;
+    }
+}
+
+/*
+ * MISSING: documentation
+ */
+
+static VALUE
+proc_clone(self)
+    VALUE self;
+{
+    struct BLOCK *orig, *data;
+    VALUE bind;
+
+    Data_Get_Struct(self, struct BLOCK, orig);
+    bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
+    CLONESETUP(bind, self);
+    blk_dup(data, orig);
+
+    return bind;
+}
+
+/*
+ * MISSING: documentation
+ */
+
+static VALUE
+proc_dup(self)
+    VALUE self;
+{
+    struct BLOCK *orig, *data;
+    VALUE bind;
+
+    Data_Get_Struct(self, struct BLOCK, orig);
+    bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
+    blk_dup(data, orig);
+
+    return bind;
+}
+
+/*
+ *  call-seq:
+ *     binding -> a_binding
+ *  
+ *  Returns a +Binding+ object, describing the variable and
+ *  method bindings at the point of call. This object can be used when
+ *  calling +eval+ to execute the evaluated command in this
+ *  environment. Also see the description of class +Binding+.
+ *     
+ *     def getBinding(param)
+ *       return binding
+ *     end
+ *     b = getBinding("hello")
+ *     eval("param", b)   #=> "hello"
+ */
+
+static VALUE
+rb_f_binding(self)
+    VALUE self;
+{
+    struct BLOCK *data, *p;
+    struct RVarmap *vars;
+    VALUE bind;
+
+    PUSH_BLOCK(0,0);
+    bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
+    *data = *ruby_block;
+
+    data->orig_thread = rb_thread_current();
+    data->wrapper = ruby_wrapper;
+    data->iter = rb_f_block_given_p();
+    frame_dup(&data->frame);
+    if (ruby_frame->prev) {
+	data->frame.last_func = ruby_frame->prev->last_func;
+	data->frame.last_class = ruby_frame->prev->last_class;
+	data->frame.orig_func = ruby_frame->prev->orig_func;
+    }
+
+    if (data->iter) {
+	blk_copy_prev(data);
+    }
+    else {
+	data->prev = 0;
+    }
+
+    for (p = data; p; p = p->prev) {
+	for (vars = p->dyna_vars; vars; vars = vars->next) {
+	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+	    FL_SET(vars, DVAR_DONT_RECYCLE);
+	}
+    }
+    scope_dup(data->scope);
+    POP_BLOCK();
+
+    return bind;
+}
+
+#define PROC_TSHIFT (FL_USHIFT+1)
+#define PROC_TMASK  (FL_USER1|FL_USER2|FL_USER3)
+#define PROC_TMAX   (PROC_TMASK >> PROC_TSHIFT)
+
+#define SAFE_LEVEL_MAX PROC_TMASK
+
+static void
+proc_save_safe_level(data)
+    VALUE data;
+{
+    int safe = ruby_safe_level;
+    if (safe > PROC_TMAX) safe = PROC_TMAX;
+    FL_SET(data, (safe << PROC_TSHIFT) & PROC_TMASK);
+}
+
+static int
+proc_get_safe_level(data)
+    VALUE data;
+{
+    return (RBASIC(data)->flags & PROC_TMASK) >> PROC_TSHIFT;
+}
+
+static void
+proc_set_safe_level(data)
+    VALUE data;
+{
+    ruby_safe_level = proc_get_safe_level(data);
+}
+
+static VALUE
+proc_alloc(klass, proc)
+    VALUE klass;
+    int proc;
+{
+    volatile VALUE block;
+    struct BLOCK *data, *p;
+    struct RVarmap *vars;
+
+    if (!rb_block_given_p() && !rb_f_block_given_p()) {
+	rb_raise(rb_eArgError, "tried to create Proc object without a block");
+    }
+    if (proc && !rb_block_given_p()) {
+	rb_warn("tried to create Proc object without a block");
+    }
+
+    if (!proc && ruby_block->block_obj && CLASS_OF(ruby_block->block_obj) == klass) {
+	return ruby_block->block_obj;
+    }
+    block = Data_Make_Struct(klass, struct BLOCK, blk_mark, blk_free, data);
+    *data = *ruby_block;
+
+    data->orig_thread = rb_thread_current();
+    data->wrapper = ruby_wrapper;
+    data->iter = data->prev?Qtrue:Qfalse;
+    data->block_obj = block;
+    frame_dup(&data->frame);
+    if (data->iter) {
+	blk_copy_prev(data);
+    }
+    else {
+	data->prev = 0;
+    }
+
+    for (p = data; p; p = p->prev) {
+	for (vars = p->dyna_vars; vars; vars = vars->next) {
+	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+	    FL_SET(vars, DVAR_DONT_RECYCLE);
+	}
+    }
+    scope_dup(data->scope);
+    proc_save_safe_level(block);
+    if (proc) {
+	data->flags |= BLOCK_LAMBDA;
+    }
+    else {
+	ruby_block->block_obj = block;
+    }
+
+    return block;
+}
+
+/*
+ *  call-seq:
+ *     Proc.new {|...| block } => a_proc 
+ *     Proc.new                => a_proc 
+ *  
+ *  Creates a new <code>Proc</code> object, bound to the current
+ *  context. <code>Proc::new</code> may be called without a block only
+ *  within a method with an attached block, in which case that block is
+ *  converted to the <code>Proc</code> object.
+ *     
+ *     def proc_from
+ *       Proc.new
+ *     end
+ *     proc = proc_from { "hello" }
+ *     proc.call   #=> "hello"
+ */
+
+static VALUE
+proc_s_new(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE block = proc_alloc(klass, Qfalse);
+
+    rb_obj_call_init(block, argc, argv);
+    return block;
+}
+
+VALUE
+rb_block_proc()
+{
+    return proc_alloc(rb_cProc, Qfalse);
+}
+
+VALUE
+rb_f_lambda()
+{
+    rb_warn("rb_f_lambda() is deprecated; use rb_block_proc() instead");
+    return proc_alloc(rb_cProc, Qtrue);
+}
+
+/*
+ * call-seq:
+ *   proc   { |...| block }  => a_proc
+ *   lambda { |...| block }  => a_proc
+ *
+ * Equivalent to <code>Proc.new</code>, except the resulting Proc objects
+ * check the number of parameters passed when called.
+ */
+
+static VALUE
+proc_lambda()
+{
+    return proc_alloc(rb_cProc, Qtrue);
+}
+
+static int
+block_orphan(data)
+    struct BLOCK *data;
+{
+    if (data->scope->flags & SCOPE_NOSTACK) {
+	return 1;
+    }
+    if (data->orig_thread != rb_thread_current()) {
+	return 1;
+    }
+    return 0;
+}
+
+static VALUE
+proc_invoke(proc, args, self, klass)
+    VALUE proc, args;		/* OK */
+    VALUE self, klass;
+{
+    struct BLOCK * volatile old_block;
+    struct BLOCK _block;
+    struct BLOCK *data;
+    volatile VALUE result = Qundef;
+    int state;
+    volatile int safe = ruby_safe_level;
+    volatile VALUE old_wrapper = ruby_wrapper;
+    volatile int pcall, avalue = Qtrue;
+    volatile VALUE tmp = args;
+
+    if (rb_block_given_p() && ruby_frame->last_func) {
+	if (klass != ruby_frame->last_class)
+	    klass = rb_obj_class(proc);
+	rb_warning("block for %s#%s is useless",
+		   rb_class2name(klass),
+		   rb_id2name(ruby_frame->last_func));
+    }
+
+    Data_Get_Struct(proc, struct BLOCK, data);
+    pcall = (data->flags & BLOCK_LAMBDA) ? YIELD_LAMBDA_CALL : 0;
+    if (!pcall && RARRAY(args)->len == 1) {
+	avalue = Qfalse;
+	args = RARRAY(args)->ptr[0];
+    }
+
+    PUSH_VARS();
+    ruby_wrapper = data->wrapper;
+    ruby_dyna_vars = data->dyna_vars;
+    /* PUSH BLOCK from data */
+    old_block = ruby_block;
+    _block = *data;
+    if (self != Qundef) _block.frame.self = self;
+    if (klass) _block.frame.last_class = klass;
+    _block.frame.argc = RARRAY(tmp)->len;
+    _block.frame.flags = ruby_frame->flags;
+    if (_block.frame.argc && DMETHOD_P()) {
+        NEWOBJ(scope, struct SCOPE);
+        OBJSETUP(scope, tmp, T_SCOPE);
+        scope->local_tbl = _block.scope->local_tbl;
+        scope->local_vars = _block.scope->local_vars;
+        scope->flags |= SCOPE_CLONE;
+        _block.scope = scope;
+    }
+    /* modify current frame */
+    ruby_block = &_block;
+    PUSH_ITER(ITER_CUR);
+    ruby_frame->iter = ITER_CUR;
+    PUSH_TAG(pcall ? PROT_LAMBDA : PROT_NONE);
+    state = EXEC_TAG();
+    if (state == 0) {
+	proc_set_safe_level(proc);
+	result = rb_yield_0(args, self, (self!=Qundef)?CLASS_OF(self):0, pcall, avalue);
+    }
+    else if (TAG_DST()) {
+	result = prot_tag->retval;
+    }
+    POP_TAG();
+    POP_ITER();
+    ruby_block = old_block;
+    ruby_wrapper = old_wrapper;
+    POP_VARS();
+    ruby_safe_level = safe;
+
+    switch (state) {
+      case 0:
+	break;
+      case TAG_RETRY:
+	proc_jump_error(TAG_RETRY, Qnil); /* xxx */
+	JUMP_TAG(state);
+	break;
+      case TAG_NEXT:
+      case TAG_BREAK:
+	if (!pcall && result != Qundef) {
+	    proc_jump_error(state, result);
+	}
+      case TAG_RETURN:
+	if (result != Qundef) {
+	    if (pcall) break;
+	    return_jump(result);
+	}
+      default:
+	JUMP_TAG(state);
+    }
+    return result;
+}
+
+/* CHECKME: are the argument checking semantics correct? */
+
+/*
+ *  call-seq:
+ *     prc.call(params,...)   => obj
+ *     prc[params,...]        => obj
+ *  
+ *  Invokes the block, setting the block's parameters to the values in
+ *  <i>params</i> using something close to method calling semantics.
+ *  Generates a warning if multiple values are passed to a proc that
+ *  expects just one (previously this silently converted the parameters
+ *  to an array). 
+ *
+ *  For procs created using <code>Kernel.proc</code>, generates an 
+ *  error if the wrong number of parameters
+ *  are passed to a proc with multiple parameters. For procs created using
+ *  <code>Proc.new</code>, extra parameters are silently discarded.
+ *
+ *  Returns the value of the last expression evaluated in the block. See
+ *  also <code>Proc#yield</code>.
+ *     
+ *     a_proc = Proc.new {|a, *b| b.collect {|i| i*a }}
+ *     a_proc.call(9, 1, 2, 3)   #=> [9, 18, 27]
+ *     a_proc[9, 1, 2, 3]        #=> [9, 18, 27]
+ *     a_proc = Proc.new {|a,b| a}
+ *     a_proc.call(1,2,3)
+ *     
+ *  <em>produces:</em>
+ *     
+ *     prog.rb:5: wrong number of arguments (3 for 2) (ArgumentError)
+ *     	from prog.rb:4:in `call'
+ *     	from prog.rb:5
+ */
+
+static VALUE
+proc_call(proc, args)
+    VALUE proc, args;		/* OK */
+{
+    return proc_invoke(proc, args, Qundef, 0);
+}
+
+static VALUE bmcall _((VALUE, VALUE));
+static VALUE method_arity _((VALUE));
+
+/*
+ *  call-seq:
+ *     prc.arity -> fixnum
+ *  
+ *  Returns the number of arguments that would not be ignored. If the block
+ *  is declared to take no arguments, returns 0. If the block is known
+ *  to take exactly n arguments, returns n. If the block has optional
+ *  arguments, return -n-1, where n is the number of mandatory
+ *  arguments. A <code>proc</code> with no argument declarations
+ *  is the same a block declaring <code>||</code> as its arguments.
+ *     
+ *     Proc.new {}.arity          #=>  0
+ *     Proc.new {||}.arity        #=>  0
+ *     Proc.new {|a|}.arity       #=>  1
+ *     Proc.new {|a,b|}.arity     #=>  2
+ *     Proc.new {|a,b,c|}.arity   #=>  3
+ *     Proc.new {|*a|}.arity      #=> -1
+ *     Proc.new {|a,*b|}.arity    #=> -2
+ */
+
+static VALUE
+proc_arity(proc)
+    VALUE proc;
+{
+    struct BLOCK *data;
+    NODE *list;
+    int n;
+
+    Data_Get_Struct(proc, struct BLOCK, data);
+    if (data->var == 0) {
+	if (data->body && nd_type(data->body) == NODE_IFUNC &&
+	    data->body->nd_cfnc == bmcall) {
+	    return method_arity(data->body->nd_tval);
+	}
+	return INT2FIX(-1);
+    }
+    if (data->var == (NODE*)1) return INT2FIX(0);
+    if (data->var == (NODE*)2) return INT2FIX(0);
+    switch (nd_type(data->var)) {
+      default:
+	return INT2FIX(1);
+      case NODE_MASGN:
+	list = data->var->nd_head;
+	n = 0;
+	while (list) {
+	    n++;
+	    list = list->nd_next;
+	}
+	if (data->var->nd_args) return INT2FIX(-n-1);
+	return INT2FIX(n);
+    }
+}
+
+/*
+ * call-seq:
+ *   prc == other_proc   =>  true or false
+ *
+ * Return <code>true</code> if <i>prc</i> is the same object as
+ * <i>other_proc</i>, or if they are both procs with the same body.
+ */
+
+static VALUE
+proc_eq(self, other)
+    VALUE self, other;
+{
+    struct BLOCK *data, *data2;
+
+    if (self == other) return Qtrue;
+    if (TYPE(other) != T_DATA) return Qfalse;
+    if (RDATA(other)->dmark != (RUBY_DATA_FUNC)blk_mark) return Qfalse;
+    if (CLASS_OF(self) != CLASS_OF(other)) return Qfalse;
+    Data_Get_Struct(self, struct BLOCK, data);
+    Data_Get_Struct(other, struct BLOCK, data2);
+    if (data->body != data2->body) return Qfalse;
+    if (data->var != data2->var) return Qfalse;
+    if (data->scope != data2->scope) return Qfalse;
+    if (data->dyna_vars != data2->dyna_vars) return Qfalse;
+    if (data->flags != data2->flags) return Qfalse;
+
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *   prc.to_s   => string
+ *
+ * Shows the unique identifier for this proc, along with
+ * an indication of where the proc was defined.
+ */
+
+static VALUE
+proc_to_s(self)
+    VALUE self;
+{
+    struct BLOCK *data;
+    NODE *node;
+    char *cname = rb_obj_classname(self);
+    const int w = (sizeof(VALUE) * CHAR_BIT) / 4;
+    long len = strlen(cname)+6+w; /* 6:tags 16:addr */
+    VALUE str;
+
+    Data_Get_Struct(self, struct BLOCK, data);
+    if ((node = data->frame.node) || (node = data->body)) {
+	len += strlen(node->nd_file) + 2 + (SIZEOF_LONG*CHAR_BIT-NODE_LSHIFT)/3;
+	str = rb_str_new(0, len);
+	snprintf(RSTRING(str)->ptr, len+1,
+		 "#<%s:0x%.*lx@%s:%d>", cname, w, (VALUE)data->body,
+		 node->nd_file, nd_line(node));
+    }
+    else {
+	str = rb_str_new(0, len);
+	snprintf(RSTRING(str)->ptr, len+1,
+		 "#<%s:0x%.*lx>", cname, w, (VALUE)data->body);
+    }
+    RSTRING(str)->len = strlen(RSTRING(str)->ptr);
+    if (OBJ_TAINTED(self)) OBJ_TAINT(str);
+
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     prc.to_proc -> prc
+ *  
+ *  Part of the protocol for converting objects to <code>Proc</code>
+ *  objects. Instances of class <code>Proc</code> simply return
+ *  themselves.
+ */
+
+static VALUE
+proc_to_self(self)
+    VALUE self;
+{
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     prc.binding    => binding
+ *  
+ *  Returns the binding associated with <i>prc</i>. Note that
+ *  <code>Kernel#eval</code> accepts either a <code>Proc</code> or a
+ *  <code>Binding</code> object as its second parameter.
+ *     
+ *     def fred(param)
+ *       proc {}
+ *     end
+ *     
+ *     b = fred(99)
+ *     eval("param", b.binding)   #=> 99
+ *     eval("param", b)           #=> 99
+ */
+
+static VALUE
+proc_binding(proc)
+    VALUE proc;
+{
+    struct BLOCK *orig, *data;
+    VALUE bind;
+
+    Data_Get_Struct(proc, struct BLOCK, orig);
+    bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
+    MEMCPY(data, orig, struct BLOCK, 1);
+    frame_dup(&data->frame);
+
+    if (data->iter) {
+	blk_copy_prev(data);
+    }
+    else {
+	data->prev = 0;
+    }
+
+    return bind;
+}
+
+static VALUE
+block_pass(self, node)
+    VALUE self;
+    NODE *node;
+{
+    VALUE proc = rb_eval(self, node->nd_body);	/* OK */
+    VALUE b;
+    struct BLOCK * volatile old_block;
+    struct BLOCK _block;
+    struct BLOCK *data;
+    volatile VALUE result = Qnil;
+    int state;
+    volatile int orphan;
+    volatile int safe = ruby_safe_level;
+
+    if (NIL_P(proc)) {
+	PUSH_ITER(ITER_NOT);
+	result = rb_eval(self, node->nd_iter);
+	POP_ITER();
+	return result;
+    }
+    if (!rb_obj_is_proc(proc)) {
+	b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
+	if (!rb_obj_is_proc(b)) {
+	    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc)",
+		     rb_obj_classname(proc));
+	}
+	proc = b;
+    }
+
+    if (ruby_safe_level >= 1 && OBJ_TAINTED(proc) &&
+	ruby_safe_level > proc_get_safe_level(proc)) {
+	rb_raise(rb_eSecurityError, "Insecure: tainted block value");
+    }
+
+    if (ruby_block && ruby_block->block_obj == proc) {
+	PUSH_ITER(ITER_PAS);
+	result = rb_eval(self, node->nd_iter);
+	POP_ITER();
+	return result;
+    }
+
+    Data_Get_Struct(proc, struct BLOCK, data);
+    orphan = block_orphan(data);
+
+    /* PUSH BLOCK from data */
+    old_block = ruby_block;
+    _block = *data;
+    _block.outer = ruby_block;
+    if (orphan) _block.uniq = block_unique++;
+    ruby_block = &_block;
+    PUSH_ITER(ITER_PRE);
+    if (ruby_frame->iter == ITER_NOT)
+	ruby_frame->iter = ITER_PRE;
+
+    PUSH_TAG(PROT_LOOP);
+    state = EXEC_TAG();
+    if (state == 0) {
+      retry:
+	proc_set_safe_level(proc);
+	if (safe > ruby_safe_level)
+	    ruby_safe_level = safe;
+	result = rb_eval(self, node->nd_iter);
+    }
+    else if (state == TAG_BREAK && TAG_DST()) {
+	result = prot_tag->retval;
+	state = 0;
+    }
+    else if (state == TAG_RETRY) {
+	state = 0;
+	goto retry;
+    }
+    POP_TAG();
+    POP_ITER();
+    ruby_block = old_block;
+    ruby_safe_level = safe;
+
+    switch (state) {/* escape from orphan block */
+      case 0:
+	break;
+      case TAG_RETURN:
+	if (orphan) {
+	    proc_jump_error(state, prot_tag->retval);
+	}
+      default:
+	JUMP_TAG(state);
+    }
+
+    return result;
+}
+
+struct METHOD {
+    VALUE klass, rklass;
+    VALUE recv;
+    ID id, oid;
+    int safe_level;
+    NODE *body;
+};
+
+static void
+bm_mark(data)
+    struct METHOD *data;
+{
+    rb_gc_mark(data->rklass);
+    rb_gc_mark(data->klass);
+    rb_gc_mark(data->recv);
+    rb_gc_mark((VALUE)data->body);
+}
+
+static VALUE
+mnew(klass, obj, id, mklass)
+    VALUE klass, obj, mklass;
+    ID id;
+{
+    VALUE method;
+    NODE *body;
+    int noex;
+    struct METHOD *data;
+    VALUE rklass = klass;
+    ID oid = id;
+
+  again:
+    if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
+	print_undef(rklass, oid);
+    }
+
+    if (nd_type(body) == NODE_ZSUPER) {
+	klass = RCLASS(klass)->super;
+	goto again;
+    }
+
+    while (rklass != klass &&
+	   (FL_TEST(rklass, FL_SINGLETON) || TYPE(rklass) == T_ICLASS)) {
+	rklass = RCLASS(rklass)->super;
+    }
+    method = Data_Make_Struct(mklass, struct METHOD, bm_mark, free, data);
+    data->klass = klass;
+    data->recv = obj;
+    data->id = id;
+    data->body = body;
+    data->rklass = rklass;
+    data->oid = oid;
+    data->safe_level = NOEX_WITH_SAFE(0);
+    OBJ_INFECT(method, klass);
+
+    return method;
+}
+
+
+/**********************************************************************
+ *
+ * Document-class : Method
+ *
+ *  Method objects are created by <code>Object#method</code>, and are
+ *  associated with a particular object (not just with a class). They
+ *  may be used to invoke the method within the object, and as a block
+ *  associated with an iterator. They may also be unbound from one
+ *  object (creating an <code>UnboundMethod</code>) and bound to
+ *  another.
+ *     
+ *     class Thing
+ *       def square(n)
+ *         n*n
+ *       end
+ *     end
+ *     thing = Thing.new
+ *     meth  = thing.method(:square)
+ *     
+ *     meth.call(9)                 #=> 81
+ *     [ 1, 2, 3 ].collect(&meth)   #=> [1, 4, 9]
+ *     
+ */
+
+/*
+ * call-seq:
+ *   meth == other_meth  => true or false
+ *
+ * Two method objects are equal if that are bound to the same
+ * object and contain the same body.
+ */
+
+
+static VALUE
+method_eq(method, other)
+    VALUE method, other;
+{
+    struct METHOD *m1, *m2;
+
+    if (TYPE(other) != T_DATA || RDATA(other)->dmark != (RUBY_DATA_FUNC)bm_mark)
+	return Qfalse;
+    if (CLASS_OF(method) != CLASS_OF(other))
+	return Qfalse;
+
+    Data_Get_Struct(method, struct METHOD, m1);
+    Data_Get_Struct(other, struct METHOD, m2);
+
+    if (m1->klass != m2->klass || m1->rklass != m2->rklass ||
+	m1->recv != m2->recv || m1->body != m2->body)
+	return Qfalse;
+
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     meth.unbind    => unbound_method
+ *  
+ *  Dissociates <i>meth</i> from it's current receiver. The resulting
+ *  <code>UnboundMethod</code> can subsequently be bound to a new object
+ *  of the same class (see <code>UnboundMethod</code>).
+ */
+
+static VALUE
+method_unbind(obj)
+    VALUE obj;
+{
+    VALUE method;
+    struct METHOD *orig, *data;
+
+    Data_Get_Struct(obj, struct METHOD, orig);
+    method = Data_Make_Struct(rb_cUnboundMethod, struct METHOD, bm_mark, free, data);
+    data->klass = orig->klass;
+    data->recv = Qundef;
+    data->id = orig->id;
+    data->body = orig->body;
+    data->rklass = orig->rklass;
+    data->oid = orig->oid;
+    OBJ_INFECT(method, obj);
+
+    return method;
+}
+
+/*
+ *  call-seq:
+ *     obj.method(sym)    => method
+ *  
+ *  Looks up the named method as a receiver in <i>obj</i>, returning a
+ *  <code>Method</code> object (or raising <code>NameError</code>). The
+ *  <code>Method</code> object acts as a closure in <i>obj</i>'s object
+ *  instance, so instance variables and the value of <code>self</code>
+ *  remain available.
+ *     
+ *     class Demo
+ *       def initialize(n)
+ *         @iv = n
+ *       end
+ *       def hello()
+ *         "Hello, @iv = #{@iv}"
+ *       end
+ *     end
+ *     
+ *     k = Demo.new(99)
+ *     m = k.method(:hello)
+ *     m.call   #=> "Hello, @iv = 99"
+ *     
+ *     l = Demo.new('Fred')
+ *     m = l.method("hello")
+ *     m.call   #=> "Hello, @iv = Fred"
+ */
+
+static VALUE
+rb_obj_method(obj, vid)
+    VALUE obj;
+    VALUE vid;
+{
+    return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod);
+}
+
+/*
+ *  call-seq:
+ *     mod.instance_method(symbol)   => unbound_method
+ *  
+ *  Returns an +UnboundMethod+ representing the given
+ *  instance method in _mod_.
+ *     
+ *     class Interpreter
+ *       def do_a() print "there, "; end
+ *       def do_d() print "Hello ";  end
+ *       def do_e() print "!\n";     end
+ *       def do_v() print "Dave";    end
+ *       Dispatcher = {
+ *        ?a => instance_method(:do_a),
+ *        ?d => instance_method(:do_d),
+ *        ?e => instance_method(:do_e),
+ *        ?v => instance_method(:do_v)
+ *       }
+ *       def interpret(string)
+ *         string.each_byte {|b| Dispatcher[b].bind(self).call }
+ *       end
+ *     end
+ *     
+ *     
+ *     interpreter = Interpreter.new
+ *     interpreter.interpret('dave')
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Hello there, Dave!
+ */
+
+static VALUE
+rb_mod_method(mod, vid)
+    VALUE mod;
+    VALUE vid;
+{
+    return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod);
+}
+
+/*
+ * MISSING: documentation
+ */
+
+static VALUE
+method_clone(self)
+    VALUE self;
+{
+    VALUE clone;
+    struct METHOD *orig, *data;
+
+    Data_Get_Struct(self, struct METHOD, orig);
+    clone = Data_Make_Struct(CLASS_OF(self),struct METHOD, bm_mark, free, data);
+    CLONESETUP(clone, self);
+    *data = *orig;
+
+    return clone;
+}
+
+/*
+ *  call-seq:
+ *     meth.call(args, ...)    => obj
+ *     meth[args, ...]         => obj
+ *  
+ *  Invokes the <i>meth</i> with the specified arguments, returning the
+ *  method's return value.
+ *     
+ *     m = 12.method("+")
+ *     m.call(3)    #=> 15
+ *     m.call(20)   #=> 32
+ */
+
+static VALUE
+method_call(argc, argv, method)
+    int argc;
+    VALUE *argv;
+    VALUE method;
+{
+    VALUE result = Qnil;	/* OK */
+    struct METHOD *data;
+    int safe;
+
+    Data_Get_Struct(method, struct METHOD, data);
+    if (data->recv == Qundef) {
+	rb_raise(rb_eTypeError, "can't call unbound method; bind first");
+    }
+    if (OBJ_TAINTED(method)) {
+        safe = NOEX_WITH(data->safe_level, 4)|NOEX_TAINTED;
+    }
+    else {
+	safe = data->safe_level;
+    }
+    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+    result = rb_call0(data->klass,data->recv,data->id,data->oid,argc,argv,data->body,safe);
+    POP_ITER();
+    return result;
+}
+
+/**********************************************************************
+ *
+ * Document-class: UnboundMethod
+ *
+ *  Ruby supports two forms of objectified methods. Class
+ *  <code>Method</code> is used to represent methods that are associated
+ *  with a particular object: these method objects are bound to that
+ *  object. Bound method objects for an object can be created using
+ *  <code>Object#method</code>.
+ *     
+ *  Ruby also supports unbound methods; methods objects that are not
+ *  associated with a particular object. These can be created either by
+ *  calling <code>Module#instance_method</code> or by calling
+ *  <code>unbind</code> on a bound method object. The result of both of
+ *  these is an <code>UnboundMethod</code> object.
+ *     
+ *  Unbound methods can only be called after they are bound to an
+ *  object. That object must be be a kind_of? the method's original
+ *  class.
+ *     
+ *     class Square
+ *       def area
+ *         @side * @side
+ *       end
+ *       def initialize(side)
+ *         @side = side
+ *       end
+ *     end
+ *     
+ *     area_un = Square.instance_method(:area)
+ *     
+ *     s = Square.new(12)
+ *     area = area_un.bind(s)
+ *     area.call   #=> 144
+ *     
+ *  Unbound methods are a reference to the method at the time it was
+ *  objectified: subsequent changes to the underlying class will not
+ *  affect the unbound method.
+ *     
+ *     class Test
+ *       def test
+ *         :original
+ *       end
+ *     end
+ *     um = Test.instance_method(:test)
+ *     class Test
+ *       def test
+ *         :modified
+ *       end
+ *     end
+ *     t = Test.new
+ *     t.test            #=> :modified
+ *     um.bind(t).call   #=> :original
+ *     
+ */
+
+/*
+ *  call-seq:
+ *     umeth.bind(obj) -> method
+ *  
+ *  Bind <i>umeth</i> to <i>obj</i>. If <code>Klass</code> was the class
+ *  from which <i>umeth</i> was obtained,
+ *  <code>obj.kind_of?(Klass)</code> must be true.
+ *     
+ *     class A
+ *       def test
+ *         puts "In test, class = #{self.class}"
+ *       end
+ *     end
+ *     class B < A
+ *     end
+ *     class C < B
+ *     end
+ *     
+ *     
+ *     um = B.instance_method(:test)
+ *     bm = um.bind(C.new)
+ *     bm.call
+ *     bm = um.bind(B.new)
+ *     bm.call
+ *     bm = um.bind(A.new)
+ *     bm.call
+ *     
+ *  <em>produces:</em>
+ *     
+ *     In test, class = C
+ *     In test, class = B
+ *     prog.rb:16:in `bind': bind argument must be an instance of B (TypeError)
+ *     	from prog.rb:16
+ */
+
+static VALUE
+umethod_bind(method, recv)
+    VALUE method, recv;
+{
+    struct METHOD *data, *bound;
+    VALUE rklass = CLASS_OF(recv);
+
+    Data_Get_Struct(method, struct METHOD, data);
+    if (data->rklass != rklass) {
+	if (FL_TEST(data->rklass, FL_SINGLETON)) {
+	    rb_raise(rb_eTypeError, "singleton method bound for a different object");
+	}
+	if (TYPE(data->rklass) == T_MODULE) {
+	    st_table *m_tbl = RCLASS(data->rklass)->m_tbl;
+	    while (RCLASS(rklass)->m_tbl != m_tbl) {
+		rklass = RCLASS(rklass)->super;
+		if (!rklass) goto not_instace;
+	    }
+	}
+	else if (!rb_obj_is_kind_of(recv, data->rklass)) {
+	  not_instace:
+	    rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
+		     rb_class2name(data->rklass));
+	}
+    }
+
+    method = Data_Make_Struct(rb_cMethod,struct METHOD,bm_mark,free,bound);
+    *bound = *data;
+    bound->recv = recv;
+    bound->rklass = rklass;
+
+    return method;
+}
+
+/*
+ *  call-seq:
+ *     meth.arity    => fixnum
+ *  
+ *  Returns an indication of the number of arguments accepted by a
+ *  method. Returns a nonnegative integer for methods that take a fixed
+ *  number of arguments. For Ruby methods that take a variable number of
+ *  arguments, returns -n-1, where n is the number of required
+ *  arguments. For methods written in C, returns -1 if the call takes a
+ *  variable number of arguments.
+ *     
+ *     class C
+ *       def one;    end
+ *       def two(a); end
+ *       def three(*a);  end
+ *       def four(a, b); end
+ *       def five(a, b, *c);    end
+ *       def six(a, b, *c, &d); end
+ *     end
+ *     c = C.new
+ *     c.method(:one).arity     #=> 0
+ *     c.method(:two).arity     #=> 1
+ *     c.method(:three).arity   #=> -1
+ *     c.method(:four).arity    #=> 2
+ *     c.method(:five).arity    #=> -3
+ *     c.method(:six).arity     #=> -3
+ *     
+ *     "cat".method(:size).arity      #=> 0
+ *     "cat".method(:replace).arity   #=> 1
+ *     "cat".method(:squeeze).arity   #=> -1
+ *     "cat".method(:count).arity     #=> -1
+ */
+
+static VALUE
+method_arity(method)
+    VALUE method;
+{
+    struct METHOD *data;
+    NODE *body;
+    int n;
+
+    Data_Get_Struct(method, struct METHOD, data);
+
+    body = data->body;
+    switch (nd_type(body)) {
+      case NODE_CFUNC:
+	if (body->nd_argc < 0) return INT2FIX(-1);
+	return INT2FIX(body->nd_argc);
+      case NODE_ZSUPER:
+	return INT2FIX(-1);
+      case NODE_ATTRSET:
+	return INT2FIX(1);
+      case NODE_IVAR:
+	return INT2FIX(0);
+      case NODE_BMETHOD:
+	return proc_arity(body->nd_cval);
+      case NODE_DMETHOD:
+	return method_arity(body->nd_cval);
+      case NODE_SCOPE:
+	body = body->nd_next;	/* skip NODE_SCOPE */
+	if (nd_type(body) == NODE_BLOCK)
+	    body = body->nd_head;
+	if (!body) return INT2FIX(0);
+	n = body->nd_cnt;
+	if (body->nd_opt || body->nd_rest)
+	    n = -n-1;
+	return INT2FIX(n);
+      default:
+	rb_raise(rb_eArgError, "invalid node 0x%x", nd_type(body));
+   }
+}
+
+/*
+ *  call-seq:
+ *   meth.to_s      =>  string
+ *   meth.inspect   =>  string
+ *
+ *  Show the name of the underlying method.
+ *
+ *    "cat".method(:count).inspect   #=> "#<Method: String#count>"
+ */
+
+static VALUE
+method_inspect(method)
+    VALUE method;
+{
+    struct METHOD *data;
+    VALUE str;
+    const char *s;
+    char *sharp = "#";
+
+    Data_Get_Struct(method, struct METHOD, data);
+    str = rb_str_buf_new2("#<");
+    s = rb_obj_classname(method);
+    rb_str_buf_cat2(str, s);
+    rb_str_buf_cat2(str, ": ");
+
+    if (FL_TEST(data->klass, FL_SINGLETON)) {
+	VALUE v = rb_iv_get(data->klass, "__attached__");
+
+	if (data->recv == Qundef) {
+	    rb_str_buf_append(str, rb_inspect(data->klass));
+	}
+	else if (data->recv == v) {
+	    rb_str_buf_append(str, rb_inspect(v));
+	    sharp = ".";
+	}
+	else {
+	    rb_str_buf_append(str, rb_inspect(data->recv));
+	    rb_str_buf_cat2(str, "(");
+	    rb_str_buf_append(str, rb_inspect(v));
+	    rb_str_buf_cat2(str, ")");
+	    sharp = ".";
+	}
+    }
+    else {
+	rb_str_buf_cat2(str, rb_class2name(data->rklass));
+	if (data->rklass != data->klass) {
+	    VALUE klass = data -> klass;
+	    if (TYPE(klass) == T_ICLASS) {
+		klass = RBASIC(klass)->klass;
+	    }
+	    rb_str_buf_cat2(str, "(");
+	    rb_str_buf_cat2(str, rb_class2name(klass));
+	    rb_str_buf_cat2(str, ")");
+	}
+    }
+    rb_str_buf_cat2(str, sharp);
+    rb_str_buf_cat2(str, rb_id2name(data->oid));
+    rb_str_buf_cat2(str, ">");
+
+    return str;
+}
+
+static VALUE
+mproc(method)
+    VALUE method;
+{
+    VALUE proc;
+
+    /* emulate ruby's method call */
+    PUSH_ITER(ITER_CUR);
+    PUSH_FRAME();
+    proc = rb_block_proc();
+    POP_FRAME();
+    POP_ITER();
+
+    return proc;
+}
+
+static VALUE
+bmcall(args, method)
+    VALUE args, method;
+{
+    volatile VALUE a;
+    VALUE ret;
+
+    a = svalue_to_avalue(args);
+    ret = method_call(RARRAY(a)->len, RARRAY(a)->ptr, method);
+    a = Qnil; /* prevent tail call */
+    return ret;
+}
+
+VALUE
+rb_proc_new(func, val)
+    VALUE (*func)(ANYARGS);	/* VALUE yieldarg[, VALUE procarg] */
+    VALUE val;
+{
+    struct BLOCK *data;
+    VALUE proc = rb_iterate((VALUE(*)_((VALUE)))mproc, 0, func, val);
+
+    Data_Get_Struct(proc, struct BLOCK, data);
+    data->body->nd_state = YIELD_FUNC_AVALUE;
+    return proc;
+}
+
+/*
+ *  call-seq:
+ *     meth.to_proc    => prc
+ *  
+ *  Returns a <code>Proc</code> object corresponding to this method.
+ */
+
+static VALUE
+method_proc(method)
+    VALUE method;
+{
+    VALUE proc;
+    struct METHOD *mdata;
+    struct BLOCK *bdata;
+
+    proc = rb_iterate((VALUE(*)_((VALUE)))mproc, 0, bmcall, method);
+    Data_Get_Struct(method, struct METHOD, mdata);
+    Data_Get_Struct(proc, struct BLOCK, bdata);
+    bdata->body->nd_file = mdata->body->nd_file;
+    nd_set_line(bdata->body, nd_line(mdata->body));
+    bdata->body->nd_state = YIELD_FUNC_SVALUE;
+
+    return proc;
+}
+
+static VALUE
+rb_obj_is_method(m)
+    VALUE m;
+{
+    if (TYPE(m) == T_DATA && RDATA(m)->dmark == (RUBY_DATA_FUNC)bm_mark) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     define_method(symbol, method)     => new_method
+ *     define_method(symbol) { block }   => proc
+ *  
+ *  Defines an instance method in the receiver. The _method_
+ *  parameter can be a +Proc+ or +Method+ object.
+ *  If a block is specified, it is used as the method body. This block
+ *  is evaluated using <code>instance_eval</code>, a point that is
+ *  tricky to demonstrate because <code>define_method</code> is private.
+ *  (This is why we resort to the +send+ hack in this example.)
+ *     
+ *     class A
+ *       def fred
+ *         puts "In Fred"
+ *       end
+ *       def create_method(name, &block)
+ *         self.class.send(:define_method, name, &block)
+ *       end
+ *       define_method(:wilma) { puts "Charge it!" }
+ *     end
+ *     class B < A
+ *       define_method(:barney, instance_method(:fred))
+ *     end
+ *     a = B.new
+ *     a.barney
+ *     a.wilma
+ *     a.create_method(:betty) { p self }
+ *     a.betty
+ *     
+ *  <em>produces:</em>
+ *     
+ *     In Fred
+ *     Charge it!
+ *     #<B:0x401b39e8>
+ */
+
+static VALUE
+rb_mod_define_method(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
+{
+    ID id;
+    VALUE body;
+    NODE *node;
+    int noex;
+
+    if (argc == 1) {
+	id = rb_to_id(argv[0]);
+	body = proc_lambda();
+    }
+    else if (argc == 2) {
+	id = rb_to_id(argv[0]);
+	body = argv[1];
+	if (!rb_obj_is_method(body) && !rb_obj_is_proc(body)) {
+	    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Method)",
+		     rb_obj_classname(body));
+	}
+    }
+    else {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+    }
+    if (RDATA(body)->dmark == (RUBY_DATA_FUNC)bm_mark) {
+	node = NEW_DMETHOD(method_unbind(body));
+    }
+    else if (RDATA(body)->dmark == (RUBY_DATA_FUNC)blk_mark) {
+	struct BLOCK *block;
+
+	body = proc_clone(body);
+	Data_Get_Struct(body, struct BLOCK, block);
+	block->frame.last_func = id;
+	block->frame.orig_func = id;
+	block->frame.last_class = mod;
+	node = NEW_BMETHOD(body);
+    }
+    else {
+	/* type error */
+	rb_raise(rb_eTypeError, "wrong argument type (expected Proc/Method)");
+    }
+
+    noex = NOEX_PUBLIC;
+    if (ruby_cbase == mod) {
+	if (SCOPE_TEST(SCOPE_PRIVATE)) {
+	    noex = NOEX_PRIVATE;
+	}
+	else if (SCOPE_TEST(SCOPE_PROTECTED)) {
+	    noex = NOEX_PROTECTED;
+	}
+    }
+    rb_add_method(mod, id, node, noex);
+    return body;
+}
+
+/*
+ *  <code>Proc</code> objects are blocks of code that have been bound to
+ *  a set of local variables. Once bound, the code may be called in
+ *  different contexts and still access those variables.
+ *     
+ *     def gen_times(factor)
+ *       return Proc.new {|n| n*factor }
+ *     end
+ *     
+ *     times3 = gen_times(3)
+ *     times5 = gen_times(5)
+ *     
+ *     times3.call(12)               #=> 36
+ *     times5.call(5)                #=> 25
+ *     times3.call(times5.call(4))   #=> 60
+ *     
+ */
+
+void
+Init_Proc()
+{
+    rb_eLocalJumpError = rb_define_class("LocalJumpError", rb_eStandardError);
+    rb_define_method(rb_eLocalJumpError, "exit_value", localjump_xvalue, 0);
+    rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0);
+
+    rb_global_variable(&exception_error);
+    exception_error = rb_exc_new2(rb_eFatal, "exception reentered");
+
+    rb_eSysStackError = rb_define_class("SystemStackError", rb_eStandardError);
+    rb_global_variable(&sysstack_error);
+    sysstack_error = rb_exc_new2(rb_eSysStackError, "stack level too deep");
+    OBJ_TAINT(sysstack_error);
+
+    rb_cProc = rb_define_class("Proc", rb_cObject);
+    rb_undef_alloc_func(rb_cProc);
+    rb_define_singleton_method(rb_cProc, "new", proc_s_new, -1);
+
+    rb_define_method(rb_cProc, "clone", proc_clone, 0);
+    rb_define_method(rb_cProc, "dup", proc_dup, 0);
+    rb_define_method(rb_cProc, "call", proc_call, -2);
+    rb_define_method(rb_cProc, "arity", proc_arity, 0);
+    rb_define_method(rb_cProc, "[]", proc_call, -2);
+    rb_define_method(rb_cProc, "==", proc_eq, 1);
+    rb_define_method(rb_cProc, "to_s", proc_to_s, 0);
+    rb_define_method(rb_cProc, "to_proc", proc_to_self, 0);
+    rb_define_method(rb_cProc, "binding", proc_binding, 0);
+
+    rb_define_global_function("proc", proc_lambda, 0);
+    rb_define_global_function("lambda", proc_lambda, 0);
+
+    rb_cMethod = rb_define_class("Method", rb_cObject);
+    rb_undef_alloc_func(rb_cMethod);
+    rb_undef_method(CLASS_OF(rb_cMethod), "new");
+    rb_define_method(rb_cMethod, "==", method_eq, 1);
+    rb_define_method(rb_cMethod, "clone", method_clone, 0);
+    rb_define_method(rb_cMethod, "call", method_call, -1);
+    rb_define_method(rb_cMethod, "[]", method_call, -1);
+    rb_define_method(rb_cMethod, "arity", method_arity, 0);
+    rb_define_method(rb_cMethod, "inspect", method_inspect, 0);
+    rb_define_method(rb_cMethod, "to_s", method_inspect, 0);
+    rb_define_method(rb_cMethod, "to_proc", method_proc, 0);
+    rb_define_method(rb_cMethod, "unbind", method_unbind, 0);
+    rb_define_method(rb_mKernel, "method", rb_obj_method, 1);
+
+    rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cObject);
+    rb_undef_alloc_func(rb_cUnboundMethod);
+    rb_undef_method(CLASS_OF(rb_cUnboundMethod), "new");
+    rb_define_method(rb_cUnboundMethod, "==", method_eq, 1);
+    rb_define_method(rb_cUnboundMethod, "clone", method_clone, 0);
+    rb_define_method(rb_cUnboundMethod, "arity", method_arity, 0);
+    rb_define_method(rb_cUnboundMethod, "inspect", method_inspect, 0);
+    rb_define_method(rb_cUnboundMethod, "to_s", method_inspect, 0);
+    rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1);
+    rb_define_method(rb_cModule, "instance_method", rb_mod_method, 1);
+}
+
+/*
+ *  Objects of class <code>Binding</code> encapsulate the execution
+ *  context at some particular place in the code and retain this context 
+ *  for future use. The variables, methods, value of <code>self</code>,
+ *  and possibly an iterator block that can be accessed in this context
+ *  are all retained. Binding objects can be created using
+ *  <code>Kernel#binding</code>, and are made available to the callback
+ *  of <code>Kernel#set_trace_func</code>.
+ *     
+ *  These binding objects can be passed as the second argument of the
+ *  <code>Kernel#eval</code> method, establishing an environment for the
+ *  evaluation.
+ *     
+ *     class Demo
+ *       def initialize(n)
+ *         @secret = n
+ *       end
+ *       def getBinding
+ *         return binding()
+ *       end
+ *     end
+ *     
+ *     k1 = Demo.new(99)
+ *     b1 = k1.getBinding
+ *     k2 = Demo.new(-3)
+ *     b2 = k2.getBinding
+ *     
+ *     eval("@secret", b1)   #=> 99
+ *     eval("@secret", b2)   #=> -3
+ *     eval("@secret")       #=> nil
+ *     
+ *  Binding objects have no class-specific methods.
+ *     
+ */
+
+void 
+Init_Binding() 
+{
+    rb_cBinding = rb_define_class("Binding", rb_cObject);
+    rb_undef_alloc_func(rb_cBinding);
+    rb_undef_method(CLASS_OF(rb_cBinding), "new");
+    rb_define_method(rb_cBinding, "clone", proc_clone, 0);
+    rb_define_method(rb_cBinding, "dup", proc_dup, 0);
+    rb_define_global_function("binding", rb_f_binding, 0);
+}
+
+/* Windows SEH refers data on the stack. */
+#undef SAVE_WIN32_EXCEPTION_LIST
+#if defined _WIN32 || defined __CYGWIN__
+#if defined __CYGWIN__
+typedef unsigned long DWORD;
+#endif
+
+static inline DWORD
+win32_get_exception_list()
+{
+    DWORD p;
+# if defined _MSC_VER
+#   ifdef _M_IX86
+#   define SAVE_WIN32_EXCEPTION_LIST
+#   if _MSC_VER >= 1310
+      /* warning: unsafe assignment to fs:0 ... this is ok */
+#     pragma warning(disable: 4733)
+#   endif
+    __asm mov eax, fs:[0];
+    __asm mov p, eax;
+#   endif
+# elif defined __GNUC__
+#   ifdef __i386__
+#   define SAVE_WIN32_EXCEPTION_LIST
+    __asm__("movl %%fs:0,%0" : "=r"(p));
+#   endif
+# elif defined __BORLANDC__
+#   define SAVE_WIN32_EXCEPTION_LIST
+    __emit__(0x64, 0xA1, 0, 0, 0, 0); /* mov eax, fs:[0] */
+    p = _EAX;
+# endif
+    return p;
+}
+
+static inline void
+win32_set_exception_list(p)
+    DWORD p;
+{
+# if defined _MSC_VER
+#   ifdef _M_IX86
+    __asm mov eax, p;
+    __asm mov fs:[0], eax;
+#   endif
+# elif defined __GNUC__
+#   ifdef __i386__
+    __asm__("movl %0,%%fs:0" :: "r"(p));
+#   endif
+# elif defined __BORLANDC__
+    _EAX = p;
+    __emit__(0x64, 0xA3, 0, 0, 0, 0); /* mov fs:[0], eax */
+# endif
+}
+
+#if !defined SAVE_WIN32_EXCEPTION_LIST && !defined _WIN32_WCE
+# error unsupported platform
+#endif
+#endif
+
+int rb_thread_pending = 0;
+
+VALUE rb_cThread;
+
+extern VALUE rb_last_status;
+
+#define WAIT_FD		(1<<0)
+#define WAIT_SELECT	(1<<1)
+#define WAIT_TIME	(1<<2)
+#define WAIT_JOIN	(1<<3)
+#define WAIT_PID	(1<<4)
+
+/* +infty, for this purpose */
+#define DELAY_INFTY 1E30
+
+#if !defined HAVE_PAUSE
+# if defined _WIN32 && !defined __CYGWIN__
+#  define pause() Sleep(INFINITE)
+# else
+#  define pause() sleep(0x7fffffff)
+# endif
+#endif
+
+#define THREAD_RAISED 0x200	 /* temporary flag */
+#define THREAD_TERMINATING 0x400 /* persistent flag */
+#define THREAD_NO_ENSURE 0x800   /* persistent flag */
+#define THREAD_FLAGS_MASK  0xc00 /* mask for persistent flags */
+
+#define FOREACH_THREAD_FROM(f,x) x = f; do { x = x->next;
+#define END_FOREACH_FROM(f,x) } while (x != f)
+
+#define FOREACH_THREAD(x) FOREACH_THREAD_FROM(curr_thread,x)
+#define END_FOREACH(x)    END_FOREACH_FROM(curr_thread,x)
+
+struct thread_status_t {
+    NODE *node;
+
+    int tracing;
+    VALUE errinfo;
+    VALUE last_status;
+    VALUE last_line;
+    VALUE last_match;
+
+    int safe;
+
+    enum rb_thread_status status;
+    int wait_for;
+    int fd;
+    fd_set readfds;
+    fd_set writefds;
+    fd_set exceptfds;
+    int select_value;
+    double delay;
+    rb_thread_t join;
+};
+
+#define THREAD_COPY_STATUS(src, dst) (void)(	\
+    (dst)->node = (src)->node,			\
+						\
+    (dst)->tracing = (src)->tracing,		\
+    (dst)->errinfo = (src)->errinfo,		\
+    (dst)->last_status = (src)->last_status,	\
+    (dst)->last_line = (src)->last_line,	\
+    (dst)->last_match = (src)->last_match,	\
+						\
+    (dst)->safe = (src)->safe,			\
+						\
+    (dst)->status = (src)->status,		\
+    (dst)->wait_for = (src)->wait_for,		\
+    (dst)->fd = (src)->fd,			\
+    (dst)->readfds = (src)->readfds,		\
+    (dst)->writefds = (src)->writefds,		\
+    (dst)->exceptfds = (src)->exceptfds,	\
+    (dst)->select_value = (src)->select_value,	\
+    (dst)->delay = (src)->delay,		\
+    (dst)->join = (src)->join,			\
+    0)
+
+static int
+thread_set_raised()
+{
+    if (curr_thread->flags & THREAD_RAISED) return 1;
+    curr_thread->flags |= THREAD_RAISED;
+    return 0;
+}
+
+static int
+thread_reset_raised()
+{
+    if (!(curr_thread->flags & THREAD_RAISED)) return 0;
+    curr_thread->flags &= ~THREAD_RAISED;
+    return 1;
+}
+
+static int
+thread_no_ensure()
+{
+    return ((curr_thread->flags & THREAD_NO_ENSURE) == THREAD_NO_ENSURE);
+}
+
+static void rb_thread_ready _((rb_thread_t));
+
+static VALUE run_trap_eval _((VALUE));
+static VALUE
+run_trap_eval(arg)
+    VALUE arg;
+{
+    VALUE *p = (VALUE *)arg;
+    return rb_eval_cmd(p[0], p[1], (int)p[2]);
+}
+
+static VALUE
+rb_trap_eval(cmd, sig, safe)
+    VALUE cmd;
+    int sig, safe;
+{
+    int state;
+    VALUE val = Qnil;		/* OK */
+    volatile struct thread_status_t save;
+    VALUE arg[3];
+
+    arg[0] = cmd;
+    arg[1] = rb_ary_new3(1, INT2FIX(sig));
+    arg[2] = (VALUE)safe;
+    THREAD_COPY_STATUS(curr_thread, &save);
+    rb_thread_ready(curr_thread);
+    PUSH_ITER(ITER_NOT);
+    val = rb_protect(run_trap_eval, (VALUE)&arg, &state);
+    POP_ITER();
+    THREAD_COPY_STATUS(&save, curr_thread);
+
+    if (state) {
+	rb_trap_immediate = 0;
+	rb_thread_ready(curr_thread);
+	JUMP_TAG(state);
+    }
+
+    if (curr_thread->status == THREAD_STOPPED) {
+	rb_thread_schedule();
+    }
+    errno = EINTR;
+
+    return val;
+}
+
+static const char *
+thread_status_name(status)
+    enum rb_thread_status status;
+{
+    switch (status) {
+      case THREAD_RUNNABLE:
+	return "run";
+      case THREAD_STOPPED:
+	return "sleep";
+      case THREAD_TO_KILL:
+	return "aborting";
+      case THREAD_KILLED:
+	return "dead";
+      default:
+	return "unknown";
+    }
+}
+
+/* $SAFE accessor */
+void
+rb_set_safe_level(level)
+    int level;
+{
+    if (level > ruby_safe_level) {
+	if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX;
+	ruby_safe_level = level;
+	curr_thread->safe = level;
+    }
+}
+
+static VALUE
+safe_getter()
+{
+    return INT2NUM(ruby_safe_level);
+}
+
+static void
+safe_setter(val)
+    VALUE val;
+{
+    int level = NUM2INT(val);
+
+    if (level < ruby_safe_level) {
+	rb_raise(rb_eSecurityError, "tried to downgrade safe level from %d to %d",
+		 ruby_safe_level, level);
+    }
+    if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX;
+    ruby_safe_level = level;
+    curr_thread->safe = level;
+}
+
+/* Return the current time as a floating-point number */
+static double
+timeofday()
+{
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return (double)tv.tv_sec + (double)tv.tv_usec * 1e-6;
+}
+
+#define STACK(addr) (th->stk_pos<(VALUE*)(addr) && (VALUE*)(addr)<th->stk_pos+th->stk_len)
+#define ADJ(addr) (void*)(STACK(addr)?(((VALUE*)(addr)-th->stk_pos)+th->stk_ptr):(VALUE*)(addr))
+static void
+thread_mark(th)
+    rb_thread_t th;
+{
+    struct FRAME *frame;
+    struct BLOCK *block;
+
+    rb_gc_mark(th->result);
+    rb_gc_mark(th->thread);
+    if (th->join) rb_gc_mark(th->join->thread);
+
+    rb_gc_mark(th->klass);
+    rb_gc_mark(th->wrapper);
+    rb_gc_mark((VALUE)th->cref);
+
+    rb_gc_mark((VALUE)th->scope);
+    rb_gc_mark((VALUE)th->dyna_vars);
+    rb_gc_mark(th->errinfo);
+    rb_gc_mark(th->last_status);
+    rb_gc_mark(th->last_line);
+    rb_gc_mark(th->last_match);
+    rb_mark_tbl(th->locals);
+    rb_gc_mark(th->thgroup);
+    rb_gc_mark_maybe(th->sandbox);
+
+    /* mark data in copied stack */
+    if (th == curr_thread) return;
+    if (th->status == THREAD_KILLED) return;
+    if (th->stk_len == 0) return;  /* stack not active, no need to mark. */
+    if (th->stk_ptr) {
+	rb_gc_mark_locations(th->stk_ptr, th->stk_ptr+th->stk_len);
+#if defined(THINK_C) || defined(__human68k__)
+	rb_gc_mark_locations(th->stk_ptr+2, th->stk_ptr+th->stk_len+2);
+#endif
+#ifdef __ia64
+	if (th->bstr_ptr) {
+            rb_gc_mark_locations(th->bstr_ptr, th->bstr_ptr+th->bstr_len);
+	}
+#endif
+    }
+    frame = th->frame;
+    while (frame && frame != top_frame) {
+	frame = ADJ(frame);
+	rb_gc_mark_frame(frame);
+	if (frame->tmp) {
+	    struct FRAME *tmp = frame->tmp;
+
+	    while (tmp && tmp != top_frame) {
+		tmp = ADJ(tmp);
+		rb_gc_mark_frame(tmp);
+		tmp = tmp->prev;
+	    }
+	}
+	frame = frame->prev;
+    }
+    block = th->block;
+    while (block) {
+	block = ADJ(block);
+	rb_gc_mark_frame(&block->frame);
+	block = block->prev;
+    }
+}
+
+static int
+mark_loading_thread(key, value, lev)
+    ID key;
+    VALUE value;
+    int lev;
+{
+    rb_gc_mark(((rb_thread_t)value)->thread);
+    return ST_CONTINUE;
+}
+
+void
+rb_gc_mark_threads()
+{
+    rb_thread_t th;
+
+    /* static global mark */
+    rb_gc_mark((VALUE)ruby_cref);
+
+    if (!curr_thread) return;
+    rb_gc_mark(main_thread->thread);
+    rb_gc_mark(curr_thread->thread);
+    FOREACH_THREAD_FROM(main_thread, th) {
+	switch (th->status) {
+	  case THREAD_TO_KILL:
+	  case THREAD_RUNNABLE:
+	    break;
+	  case THREAD_STOPPED:
+	    if (th->wait_for) break;
+	  default:
+	    continue;
+	}
+	rb_gc_mark(th->thread);
+    } END_FOREACH_FROM(main_thread, th);
+    if (loading_tbl) st_foreach(loading_tbl, mark_loading_thread, 0);
+}
+
+void
+rb_gc_abort_threads()
+{
+    rb_thread_t th;
+
+    if (!main_thread)
+        return;
+
+    FOREACH_THREAD_FROM(main_thread, th) {
+	if (FL_TEST(th->thread, FL_MARK)) continue;
+	if (th->status == THREAD_STOPPED) {
+	    th->status = THREAD_TO_KILL;
+	    rb_gc_mark(th->thread);
+	}
+    } END_FOREACH_FROM(main_thread, th);
+}
+
+static void
+thread_free(th)
+    rb_thread_t th;
+{
+    if (th->stk_ptr) free(th->stk_ptr);
+    th->stk_ptr = 0;
+#ifdef __ia64
+    if (th->bstr_ptr) free(th->bstr_ptr);
+    th->bstr_ptr = 0;
+#endif
+    if (th->locals) st_free_table(th->locals);
+    if (th->status != THREAD_KILLED) {
+	if (th->prev) th->prev->next = th->next;
+	if (th->next) th->next->prev = th->prev;
+    }
+    if (th != main_thread) free(th);
+}
+
+static rb_thread_t
+rb_thread_check(data)
+    VALUE data;
+{
+    if (TYPE(data) != T_DATA || RDATA(data)->dmark != (RUBY_DATA_FUNC)thread_mark) {
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
+		 rb_obj_classname(data));
+    }
+    return (rb_thread_t)RDATA(data)->data;
+}
+
+static VALUE rb_thread_raise _((int, VALUE*, rb_thread_t));
+
+static VALUE th_raise_exception;
+static NODE *th_raise_node;
+static VALUE th_cmd;
+static int   th_sig, th_safe;
+
+#define RESTORE_NORMAL		1
+#define RESTORE_FATAL		2
+#define RESTORE_INTERRUPT	3
+#define RESTORE_TRAP		4
+#define RESTORE_RAISE		5
+#define RESTORE_SIGNAL		6
+#define RESTORE_EXIT		7
+
+extern VALUE *rb_gc_stack_start;
+#ifdef __ia64
+extern VALUE *rb_gc_register_stack_start;
+#endif
+
+static void
+rb_thread_save_context(th)
+    rb_thread_t th;
+{
+    VALUE *pos;
+    int len;
+    static VALUE tval;
+
+    len = ruby_stack_length(&pos);
+    th->stk_len = 0;
+    th->stk_pos = pos;
+    if (len > th->stk_max) {
+	VALUE *ptr = realloc(th->stk_ptr, sizeof(VALUE) * len);
+	if (!ptr) rb_memerror();
+	th->stk_ptr = ptr;
+	th->stk_max = len;
+    }
+    th->stk_len = len;
+    FLUSH_REGISTER_WINDOWS;
+    MEMCPY(th->stk_ptr, th->stk_pos, VALUE, th->stk_len);
+#ifdef __ia64
+    th->bstr_pos = rb_gc_register_stack_start;
+    len = (VALUE*)rb_ia64_bsp() - th->bstr_pos;
+    th->bstr_len = 0;
+    if (len > th->bstr_max) {
+        VALUE *ptr = realloc(th->bstr_ptr, sizeof(VALUE) * len);
+        if (!ptr) rb_memerror();
+        th->bstr_ptr = ptr;
+        th->bstr_max = len;
+    }
+    th->bstr_len = len;
+    rb_ia64_flushrs();
+    MEMCPY(th->bstr_ptr, th->bstr_pos, VALUE, th->bstr_len);
+#endif
+#ifdef SAVE_WIN32_EXCEPTION_LIST
+    th->win32_exception_list = win32_get_exception_list();
+#endif
+
+    th->frame = ruby_frame;
+    th->scope = ruby_scope;
+    ruby_scope->flags |= SCOPE_DONT_RECYCLE;
+    th->klass = ruby_class;
+    th->wrapper = ruby_wrapper;
+    th->cref = ruby_cref;
+    th->dyna_vars = ruby_dyna_vars;
+    th->block = ruby_block;
+    th->flags &= THREAD_FLAGS_MASK;
+    th->flags |= (rb_trap_immediate<<8) | scope_vmode;
+    th->iter = ruby_iter;
+    th->tag = prot_tag;
+    th->tracing = tracing;
+    th->errinfo = ruby_errinfo;
+    th->last_status = rb_last_status;
+    tval = rb_lastline_get();
+    rb_lastline_set(th->last_line);
+    th->last_line = tval;
+    tval = rb_backref_get();
+    rb_backref_set(th->last_match);
+    th->last_match = tval;
+    th->safe = ruby_safe_level;
+
+    th->node = ruby_current_node;
+    if (ruby_sandbox_save != NULL)
+    {
+      ruby_sandbox_save(th);
+    }
+}
+
+static int
+rb_thread_switch(n)
+    int n;
+{
+    rb_trap_immediate = (curr_thread->flags&0x100)?1:0;
+    switch (n) {
+      case 0:
+	return 0;
+      case RESTORE_FATAL:
+	JUMP_TAG(TAG_FATAL);
+	break;
+      case RESTORE_INTERRUPT:
+	rb_interrupt();
+	break;
+      case RESTORE_TRAP:
+	rb_trap_eval(th_cmd, th_sig, th_safe);
+	break;
+      case RESTORE_RAISE:
+	ruby_frame->last_func = 0;
+	ruby_current_node = th_raise_node;
+	rb_raise_jump(th_raise_exception);
+	break;
+      case RESTORE_SIGNAL:
+	rb_thread_signal_raise(th_sig);
+	break;
+      case RESTORE_EXIT:
+	ruby_errinfo = th_raise_exception;
+	ruby_current_node = th_raise_node;
+	if (!rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
+	    terminate_process(EXIT_FAILURE, ruby_errinfo);
+	}
+	rb_exc_raise(th_raise_exception);
+	break;
+      case RESTORE_NORMAL:
+      default:
+	break;
+    }
+    return 1;
+}
+
+#define THREAD_SAVE_CONTEXT(th) \
+    (rb_thread_switch((FLUSH_REGISTER_WINDOWS, ruby_setjmp(rb_thread_save_context(th), (th)->context))))
+
+NORETURN(static void rb_thread_restore_context _((rb_thread_t,int)));
+NORETURN(NOINLINE(static void rb_thread_restore_context_0(rb_thread_t,int,void*)));
+NORETURN(NOINLINE(static void stack_extend(rb_thread_t, int, VALUE *)));
+
+static void
+rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp)
+{
+    static rb_thread_t tmp;
+    static int ex;
+    static VALUE tval;
+
+    rb_trap_immediate = 0;	/* inhibit interrupts from here */
+    if (ruby_sandbox_restore != NULL)
+    {
+      ruby_sandbox_restore(th);
+    }
+    ruby_frame = th->frame;
+    ruby_scope = th->scope;
+    ruby_class = th->klass;
+    ruby_wrapper = th->wrapper;
+    ruby_cref = th->cref;
+    ruby_dyna_vars = th->dyna_vars;
+    ruby_block = th->block;
+    scope_vmode = th->flags&SCOPE_MASK;
+    ruby_iter = th->iter;
+    prot_tag = th->tag;
+    tracing = th->tracing;
+    ruby_errinfo = th->errinfo;
+    rb_last_status = th->last_status;
+    ruby_safe_level = th->safe;
+
+    ruby_current_node = th->node;
+
+#ifdef SAVE_WIN32_EXCEPTION_LIST
+    win32_set_exception_list(th->win32_exception_list);
+#endif
+    tmp = th;
+    ex = exit;
+    FLUSH_REGISTER_WINDOWS;
+    MEMCPY(tmp->stk_pos, tmp->stk_ptr, VALUE, tmp->stk_len);
+#ifdef __ia64
+    MEMCPY(tmp->bstr_pos, tmp->bstr_ptr, VALUE, tmp->bstr_len);
+#endif
+
+    tval = rb_lastline_get();
+    rb_lastline_set(tmp->last_line);
+    tmp->last_line = tval;
+    tval = rb_backref_get();
+    rb_backref_set(tmp->last_match);
+    tmp->last_match = tval;
+
+    ruby_longjmp(tmp->context, ex);
+}
+
+#ifdef __ia64
+#define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4
+#define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4
+static volatile int C(a), C(b), C(c), C(d), C(e);
+static volatile int C(f), C(g), C(h), C(i), C(j);
+static volatile int C(k), C(l), C(m), C(n), C(o);
+static volatile int C(p), C(q), C(r), C(s), C(t);
+int rb_dummy_false = 0;
+NORETURN(NOINLINE(static void register_stack_extend(rb_thread_t, int, void *, VALUE *)));
+static void
+register_stack_extend(rb_thread_t th, int exit, void *vp, VALUE *curr_bsp)
+{
+    if (rb_dummy_false) {
+        /* use registers as much as possible */
+        E(a) = E(b) = E(c) = E(d) = E(e) =
+        E(f) = E(g) = E(h) = E(i) = E(j) =
+        E(k) = E(l) = E(m) = E(n) = E(o) =
+        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
+        E(a) = E(b) = E(c) = E(d) = E(e) =
+        E(f) = E(g) = E(h) = E(i) = E(j) =
+        E(k) = E(l) = E(m) = E(n) = E(o) =
+        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
+    }
+    if (curr_bsp < th->bstr_pos+th->bstr_len) {
+        register_stack_extend(th, exit, &exit, (VALUE*)rb_ia64_bsp());
+    }
+    rb_thread_restore_context_0(th, exit, &exit);
+}
+#undef C
+#undef E
+#endif
+
+# if defined(_MSC_VER) && _MSC_VER >= 1300
+__declspec(noinline) static void stack_extend(rb_thread_t, int, VALUE*);
+# endif
+static void
+stack_extend(rb_thread_t th, int exit, VALUE *addr_in_prev_frame)
+{
+#define STACK_PAD_SIZE 1024
+    VALUE space[STACK_PAD_SIZE];
+
+#if STACK_GROW_DIRECTION < 0
+    if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]);
+#elif STACK_GROW_DIRECTION > 0
+    if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]);
+#else
+    if (addr_in_prev_frame < rb_gc_stack_start) {
+        /* Stack grows downward */
+        if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]);
+    }
+    else {
+        /* Stack grows upward */
+        if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]);
+    }
+#endif
+#ifdef __ia64
+    register_stack_extend(th, exit, space, (VALUE*)rb_ia64_bsp());
+#else
+    rb_thread_restore_context_0(th, exit, space);
+#endif
+}
+
+static void
+rb_thread_restore_context(th, exit)
+    rb_thread_t th;
+    int exit;
+{
+    VALUE v;
+    if (!th->stk_ptr) rb_bug("unsaved context");
+    stack_extend(th, exit, &v);
+}
+
+static void
+rb_thread_ready(th)
+    rb_thread_t th;
+{
+    th->wait_for = 0;
+    if (th->status != THREAD_TO_KILL) {
+	th->status = THREAD_RUNNABLE;
+    }
+}
+
+static void
+rb_thread_die(th)
+    rb_thread_t th;
+{
+    th->thgroup = 0;
+    th->status = THREAD_KILLED;
+    if (th->stk_ptr) free(th->stk_ptr);
+    th->stk_ptr = 0;
+}
+
+static void
+rb_thread_remove(th)
+    rb_thread_t th;
+{
+    if (th->status == THREAD_KILLED) return;
+
+    rb_thread_ready(th);
+    rb_thread_die(th);
+    th->prev->next = th->next;
+    th->next->prev = th->prev;
+}
+
+static int
+rb_thread_dead(th)
+    rb_thread_t th;
+{
+    return th->status == THREAD_KILLED;
+}
+
+void
+rb_thread_fd_close(fd)
+    int fd;
+{
+    rb_thread_t th;
+
+    FOREACH_THREAD(th) {
+	if (((th->wait_for & WAIT_FD) && fd == th->fd) ||
+	    ((th->wait_for & WAIT_SELECT) && (fd < th->fd) &&
+	     (FD_ISSET(fd, &th->readfds) ||
+	      FD_ISSET(fd, &th->writefds) ||
+	      FD_ISSET(fd, &th->exceptfds)))) {
+	    VALUE exc = rb_exc_new2(rb_eIOError, "stream closed");
+	    rb_thread_raise(1, &exc, th);
+	}
+    }
+    END_FOREACH(th);
+}
+
+NORETURN(static void rb_thread_main_jump _((VALUE, int)));
+static void
+rb_thread_main_jump(err, tag)
+    VALUE err;
+    int tag;
+{
+    curr_thread = main_thread;
+    th_raise_exception = err;
+    th_raise_node = ruby_current_node;
+    rb_thread_restore_context(main_thread, tag);
+}
+
+NORETURN(static void rb_thread_deadlock _((void)));
+static void
+rb_thread_deadlock()
+{
+    char msg[21+SIZEOF_LONG*2];
+    VALUE e;
+
+    sprintf(msg, "Thread(0x%lx): deadlock", curr_thread->thread);
+    e = rb_exc_new2(rb_eFatal, msg);
+    if (curr_thread == main_thread) {
+	rb_exc_raise(e);
+    }
+    rb_thread_main_jump(e, RESTORE_RAISE);
+}
+
+static void
+copy_fds(dst, src, max)
+    fd_set *dst, *src;
+    int max;
+{
+    int n = 0;
+    int i;
+
+    for (i=0; i<=max; i++) {
+	if (FD_ISSET(i, src)) {
+	    n = i;
+	    FD_SET(i, dst);
+	}
+    }
+}
+
+static int
+match_fds(dst, src, max)
+    fd_set *dst, *src;
+    int max;
+{
+    int i;
+
+    for (i=0; i<=max; i++) {
+	if (FD_ISSET(i, src) && FD_ISSET(i, dst)) {
+	    return Qtrue;
+	}
+    }
+    return Qfalse;
+}
+
+static int
+intersect_fds(src, dst, max)
+    fd_set *src, *dst;
+    int max;
+{
+    int i, n = 0;
+
+    for (i=0; i<=max; i++) {
+	if (FD_ISSET(i, dst)) {
+	    if (FD_ISSET(i, src)) {
+		/* Wake up only one thread per fd. */
+		FD_CLR(i, src);
+		n++;
+	    }
+	    else {
+		FD_CLR(i, dst);
+	    }
+	}
+    }
+    return n;
+}
+
+static int
+find_bad_fds(dst, src, max)
+    fd_set *dst, *src;
+    int max;
+{
+    int i, test = Qfalse;
+
+    for (i=0; i<=max; i++) {
+	if (FD_ISSET(i, src) && !FD_ISSET(i, dst)) {
+	    FD_CLR(i, src);
+	    test = Qtrue;
+	}
+    }
+    return test;
+}
+
+void
+rb_thread_schedule()
+{
+    rb_thread_t next;		/* OK */
+    rb_thread_t th;
+    rb_thread_t curr;
+    int found = 0;
+
+    fd_set readfds;
+    fd_set writefds;
+    fd_set exceptfds;
+    struct timeval delay_tv, *delay_ptr;
+    double delay, now;	/* OK */
+    int n, max;
+    int need_select = 0;
+    int select_timeout = 0;
+
+#ifdef HAVE_NATIVETHREAD
+    if (!is_ruby_native_thread()) {
+	rb_bug("cross-thread violation on rb_thread_schedule()");
+    }
+#endif
+    rb_thread_pending = 0;
+    if (curr_thread == curr_thread->next
+	&& curr_thread->status == THREAD_RUNNABLE)
+	return;
+
+    next = 0;
+    curr = curr_thread;		/* starting thread */
+
+    while (curr->status == THREAD_KILLED) {
+	curr = curr->prev;
+    }
+
+  again:
+    max = -1;
+    FD_ZERO(&readfds);
+    FD_ZERO(&writefds);
+    FD_ZERO(&exceptfds);
+    delay = DELAY_INFTY;
+    now = -1.0;
+
+    FOREACH_THREAD_FROM(curr, th) {
+	if (!found && th->status <= THREAD_RUNNABLE) {
+	    found = 1;
+	}
+	if (th->status != THREAD_STOPPED) continue;
+	if (th->wait_for & WAIT_JOIN) {
+	    if (rb_thread_dead(th->join)) {
+		th->status = THREAD_RUNNABLE;
+		found = 1;
+	    }
+	}
+	if (th->wait_for & WAIT_FD) {
+	    FD_SET(th->fd, &readfds);
+	    if (max < th->fd) max = th->fd;
+	    need_select = 1;
+	}
+	if (th->wait_for & WAIT_SELECT) {
+	    copy_fds(&readfds, &th->readfds, th->fd);
+	    copy_fds(&writefds, &th->writefds, th->fd);
+	    copy_fds(&exceptfds, &th->exceptfds, th->fd);
+	    if (max < th->fd) max = th->fd;
+	    need_select = 1;
+	    if (th->wait_for & WAIT_TIME) {
+		select_timeout = 1;
+	    }
+	    th->select_value = 0;
+	}
+	if (th->wait_for & WAIT_TIME) {
+	    double th_delay;
+
+	    if (now < 0.0) now = timeofday();
+	    th_delay = th->delay - now;
+	    if (th_delay <= 0.0) {
+		th->status = THREAD_RUNNABLE;
+		found = 1;
+	    }
+	    else if (th_delay < delay) {
+		delay = th_delay;
+		need_select = 1;
+	    }
+	    else if (th->delay == DELAY_INFTY) {
+		need_select = 1;
+	    }
+	}
+    }
+    END_FOREACH_FROM(curr, th);
+
+    /* Do the select if needed */
+    if (need_select) {
+	/* Convert delay to a timeval */
+	/* If a thread is runnable, just poll */
+	if (found) {
+	    delay_tv.tv_sec = 0;
+	    delay_tv.tv_usec = 0;
+	    delay_ptr = &delay_tv;
+	}
+	else if (delay == DELAY_INFTY) {
+	    delay_ptr = 0;
+	}
+	else {
+	    delay_tv.tv_sec = delay;
+	    delay_tv.tv_usec = (delay - (double)delay_tv.tv_sec)*1e6;
+	    delay_ptr = &delay_tv;
+	}
+
+	n = select(max+1, &readfds, &writefds, &exceptfds, delay_ptr);
+	if (n < 0) {
+	    int e = errno;
+
+	    if (rb_trap_pending) rb_trap_exec();
+	    if (e == EINTR) goto again;
+#ifdef ERESTART
+	    if (e == ERESTART) goto again;
+#endif
+	    FOREACH_THREAD_FROM(curr, th) {
+		if (th->wait_for & WAIT_SELECT) {
+		    int v = 0;
+
+		    v |= find_bad_fds(&readfds, &th->readfds, th->fd);
+		    v |= find_bad_fds(&writefds, &th->writefds, th->fd);
+		    v |= find_bad_fds(&exceptfds, &th->exceptfds, th->fd);
+		    if (v) {
+			th->select_value = n;
+			n = max;
+		    }
+		}
+	    }
+	    END_FOREACH_FROM(curr, th);
+	}
+ 	if (select_timeout && n == 0) {
+ 	    if (now < 0.0) now = timeofday();
+ 	    FOREACH_THREAD_FROM(curr, th) {
+ 		if (((th->wait_for&(WAIT_SELECT|WAIT_TIME)) == (WAIT_SELECT|WAIT_TIME)) &&
+		    th->delay <= now) {
+ 		    th->status = THREAD_RUNNABLE;
+ 		    th->wait_for = 0;
+ 		    th->select_value = 0;
+ 		    found = 1;
+		    intersect_fds(&readfds, &th->readfds, max);
+		    intersect_fds(&writefds, &th->writefds, max);
+		    intersect_fds(&exceptfds, &th->exceptfds, max);
+		}
+	    }
+	    END_FOREACH_FROM(curr, th);
+	}
+	if (n > 0) {
+	    now = -1.0;
+	    /* Some descriptors are ready.
+	       Make the corresponding threads runnable. */
+	    FOREACH_THREAD_FROM(curr, th) {
+		if ((th->wait_for&WAIT_FD) && FD_ISSET(th->fd, &readfds)) {
+		    /* Wake up only one thread per fd. */
+		    FD_CLR(th->fd, &readfds);
+		    th->status = THREAD_RUNNABLE;
+		    th->fd = 0;
+		    th->wait_for = 0;
+		    found = 1;
+		}
+		if ((th->wait_for&WAIT_SELECT) &&
+		    (match_fds(&readfds, &th->readfds, max) ||
+		     match_fds(&writefds, &th->writefds, max) ||
+		     match_fds(&exceptfds, &th->exceptfds, max))) {
+		    /* Wake up only one thread per fd. */
+		    th->status = THREAD_RUNNABLE;
+		    th->wait_for = 0;
+		    n = intersect_fds(&readfds, &th->readfds, max) +
+			intersect_fds(&writefds, &th->writefds, max) +
+			intersect_fds(&exceptfds, &th->exceptfds, max);
+		    th->select_value = n;
+		    found = 1;
+		}
+	    }
+	    END_FOREACH_FROM(curr, th);
+	}
+	/* The delays for some of the threads should have expired.
+	   Go through the loop once more, to check the delays. */
+	if (!found && delay != DELAY_INFTY)
+	    goto again;
+    }
+
+    FOREACH_THREAD_FROM(curr, th) {
+	if (th->status == THREAD_TO_KILL) {
+	    next = th;
+	    break;
+	}
+	if (th->status == THREAD_RUNNABLE && th->stk_ptr) {
+	    if (!next || next->priority < th->priority)
+	       next = th;
+	}
+    }
+    END_FOREACH_FROM(curr, th);
+
+    if (!next) {
+	/* raise fatal error to main thread */
+	curr_thread->node = ruby_current_node;
+	if (curr->next == curr) {
+	    TRAP_BEG;
+	    pause();
+	    TRAP_END;
+	}
+	FOREACH_THREAD_FROM(curr, th) {
+	    warn_printf("deadlock 0x%lx: %s:",
+			th->thread, thread_status_name(th->status));
+	    if (th->wait_for & WAIT_FD) warn_printf("F(%d)", th->fd);
+	    if (th->wait_for & WAIT_SELECT) warn_printf("S");
+	    if (th->wait_for & WAIT_TIME) warn_printf("T(%f)", th->delay);
+	    if (th->wait_for & WAIT_JOIN)
+		warn_printf("J(0x%lx)", th->join ? th->join->thread : 0);
+	    if (th->wait_for & WAIT_PID) warn_printf("P");
+	    if (!th->wait_for) warn_printf("-");
+	    warn_printf(" %s - %s:%d\n",
+			th==main_thread ? "(main)" : "",
+			th->node->nd_file, nd_line(th->node));
+	}
+	END_FOREACH_FROM(curr, th);
+	next = main_thread;
+	rb_thread_ready(next);
+	next->status = THREAD_TO_KILL;
+	if (!rb_thread_dead(curr_thread)) {
+	    rb_thread_save_context(curr_thread);
+	}
+	rb_thread_deadlock();
+    }
+    next->wait_for = 0;
+    if (next->status == THREAD_RUNNABLE && next == curr_thread) {
+	return;
+    }
+
+    /* context switch */
+    if (curr == curr_thread) {
+	if (THREAD_SAVE_CONTEXT(curr)) {
+	    return;
+	}
+    }
+
+    curr_thread = next;
+    if (next->status == THREAD_TO_KILL) {
+	if (!(next->flags & THREAD_TERMINATING)) {
+	    next->flags |= THREAD_TERMINATING;
+	    /* terminate; execute ensure-clause if any */
+	    rb_thread_restore_context(next, RESTORE_FATAL);
+	}
+    }
+    rb_thread_restore_context(next, RESTORE_NORMAL);
+}
+
+void
+rb_thread_wait_fd(fd)
+    int fd;
+{
+    if (rb_thread_critical) return;
+    if (ruby_in_compile) return;
+    if (curr_thread == curr_thread->next) return;
+    if (curr_thread->status == THREAD_TO_KILL) return;
+
+    curr_thread->status = THREAD_STOPPED;
+    curr_thread->fd = fd;
+    curr_thread->wait_for = WAIT_FD;
+    rb_thread_schedule();
+}
+
+int
+rb_thread_fd_writable(fd)
+    int fd;
+{
+    if (rb_thread_critical) return Qtrue;
+    if (curr_thread == curr_thread->next) return Qtrue;
+    if (curr_thread->status == THREAD_TO_KILL) return Qtrue;
+    if (curr_thread->status == THREAD_KILLED) return Qtrue;
+
+    curr_thread->status = THREAD_STOPPED;
+    FD_ZERO(&curr_thread->readfds);
+    FD_ZERO(&curr_thread->writefds);
+    FD_SET(fd, &curr_thread->writefds);
+    FD_ZERO(&curr_thread->exceptfds);
+    curr_thread->fd = fd+1;
+    curr_thread->wait_for = WAIT_SELECT;
+    rb_thread_schedule();
+    return Qfalse;
+}
+
+void
+rb_thread_wait_for(time)
+    struct timeval time;
+{
+    double date;
+
+    if (rb_thread_critical ||
+	curr_thread == curr_thread->next ||
+	curr_thread->status == THREAD_TO_KILL) {
+	int n;
+	int thr_critical = rb_thread_critical;
+#ifndef linux
+	double d, limit;
+	limit = timeofday()+(double)time.tv_sec+(double)time.tv_usec*1e-6;
+#endif
+	for (;;) {
+	    rb_thread_critical = Qtrue;
+	    TRAP_BEG;
+	    n = select(0, 0, 0, 0, &time);
+	    rb_thread_critical = thr_critical;
+	    TRAP_END;
+	    if (n == 0) return;
+	    if (n < 0) {
+		switch (errno) {
+		  case EINTR:
+#ifdef ERESTART
+		  case ERESTART:
+#endif
+		    break;
+		  default:
+		    rb_sys_fail("sleep");
+		}
+	    }
+#ifndef linux
+	    d = limit - timeofday();
+
+	    time.tv_sec = (int)d;
+	    time.tv_usec = (int)((d - (int)d)*1e6);
+	    if (time.tv_usec < 0) {
+		time.tv_usec += (long)1e6;
+		time.tv_sec -= 1;
+	    }
+	    if (time.tv_sec < 0) return;
+#endif
+	}
+    }
+
+    date = timeofday() + (double)time.tv_sec + (double)time.tv_usec*1e-6;
+    curr_thread->status = THREAD_STOPPED;
+    curr_thread->delay = date;
+    curr_thread->wait_for = WAIT_TIME;
+    rb_thread_schedule();
+}
+
+void rb_thread_sleep_forever _((void));
+
+int
+rb_thread_alone()
+{
+    return curr_thread == curr_thread->next;
+}
+
+int
+rb_thread_select(max, read, write, except, timeout)
+    int max;
+    fd_set *read, *write, *except;
+    struct timeval *timeout;
+{
+#ifndef linux
+    double limit;
+#endif
+    int n;
+
+    if (!read && !write && !except) {
+	if (!timeout) {
+	    rb_thread_sleep_forever();
+	    return 0;
+	}
+	rb_thread_wait_for(*timeout);
+	return 0;
+    }
+
+#ifndef linux
+    if (timeout) {
+	limit = timeofday()+
+	    (double)timeout->tv_sec+(double)timeout->tv_usec*1e-6;
+    }
+#endif
+
+    if (rb_thread_critical ||
+	curr_thread == curr_thread->next ||
+	curr_thread->status == THREAD_TO_KILL) {
+#ifndef linux
+	struct timeval tv, *tvp = timeout;
+
+	if (timeout) {
+	    tv = *timeout;
+	    tvp = &tv;
+	}
+#else
+	struct timeval *const tvp = timeout;
+#endif
+	for (;;) {
+	    TRAP_BEG;
+	    n = select(max, read, write, except, tvp);
+	    TRAP_END;
+	    if (n < 0) {
+		switch (errno) {
+		  case EINTR:
+#ifdef ERESTART
+		  case ERESTART:
+#endif
+#ifndef linux
+		    if (timeout) {
+			double d = limit - timeofday();
+
+			tv.tv_sec = (unsigned int)d;
+			tv.tv_usec = (long)((d-(double)tv.tv_sec)*1e6);
+			if (tv.tv_sec < 0)  tv.tv_sec = 0;
+			if (tv.tv_usec < 0) tv.tv_usec = 0;
+		    }
+#endif
+		    continue;
+		  default:
+		    break;
+		}
+	    }
+	    return n;
+	}
+    }
+
+    curr_thread->status = THREAD_STOPPED;
+    if (read) curr_thread->readfds = *read;
+    else FD_ZERO(&curr_thread->readfds);
+    if (write) curr_thread->writefds = *write;
+    else FD_ZERO(&curr_thread->writefds);
+    if (except) curr_thread->exceptfds = *except;
+    else FD_ZERO(&curr_thread->exceptfds);
+    curr_thread->fd = max;
+    curr_thread->wait_for = WAIT_SELECT;
+    if (timeout) {
+	curr_thread->delay = timeofday() +
+	    (double)timeout->tv_sec + (double)timeout->tv_usec*1e-6;
+	curr_thread->wait_for |= WAIT_TIME;
+    }
+    rb_thread_schedule();
+    if (read) *read = curr_thread->readfds;
+    if (write) *write = curr_thread->writefds;
+    if (except) *except = curr_thread->exceptfds;
+    return curr_thread->select_value;
+}
+
+static int rb_thread_join _((rb_thread_t, double));
+
+static int
+rb_thread_join(th, limit)
+    rb_thread_t th;
+    double limit;
+{
+    enum rb_thread_status last_status = THREAD_RUNNABLE;
+
+    if (rb_thread_critical) rb_thread_deadlock();
+    if (!rb_thread_dead(th)) {
+	if (th == curr_thread)
+	    rb_raise(rb_eThreadError, "thread 0x%lx tried to join itself",
+		     th->thread);
+	if ((th->wait_for & WAIT_JOIN) && th->join == curr_thread)
+	    rb_raise(rb_eThreadError, "Thread#join: deadlock 0x%lx - mutual join(0x%lx)",
+		     curr_thread->thread, th->thread);
+	if (curr_thread->status == THREAD_TO_KILL)
+	    last_status = THREAD_TO_KILL;
+	if (limit == 0) return Qfalse;
+	curr_thread->status = THREAD_STOPPED;
+	curr_thread->join = th;
+	curr_thread->wait_for = WAIT_JOIN;
+	curr_thread->delay = timeofday() + limit;
+	if (limit < DELAY_INFTY) curr_thread->wait_for |= WAIT_TIME;
+	rb_thread_schedule();
+	curr_thread->status = last_status;
+	if (!rb_thread_dead(th)) return Qfalse;
+    }
+
+    if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED)) {
+	VALUE oldbt = get_backtrace(th->errinfo);
+	VALUE errat = make_backtrace();
+	VALUE errinfo = rb_obj_dup(th->errinfo);
+
+	if (TYPE(oldbt) == T_ARRAY && RARRAY(oldbt)->len > 0) {
+	    rb_ary_unshift(errat, rb_ary_entry(oldbt, 0));
+	}
+	set_backtrace(errinfo, errat);
+	rb_exc_raise(errinfo);
+    }
+
+    return Qtrue;
+}
+
+
+/*
+ *  call-seq:
+ *     thr.join          => thr
+ *     thr.join(limit)   => thr
+ *  
+ *  The calling thread will suspend execution and run <i>thr</i>. Does not
+ *  return until <i>thr</i> exits or until <i>limit</i> seconds have passed. If
+ *  the time limit expires, <code>nil</code> will be returned, otherwise
+ *  <i>thr</i> is returned.
+ *     
+ *  Any threads not joined will be killed when the main program exits.  If
+ *  <i>thr</i> had previously raised an exception and the
+ *  <code>abort_on_exception</code> and <code>$DEBUG</code> flags are not set
+ *  (so the exception has not yet been processed) it will be processed at this
+ *  time.
+ *     
+ *     a = Thread.new { print "a"; sleep(10); print "b"; print "c" }
+ *     x = Thread.new { print "x"; Thread.pass; print "y"; print "z" }
+ *     x.join # Let x thread finish, a will be killed on exit.
+ *     
+ *  <em>produces:</em>
+ *     
+ *     axyz
+ *     
+ *  The following example illustrates the <i>limit</i> parameter.
+ *     
+ *     y = Thread.new { 4.times { sleep 0.1; puts 'tick... ' }}
+ *     puts "Waiting" until y.join(0.15)
+ *     
+ *  <em>produces:</em>
+ *     
+ *     tick...
+ *     Waiting
+ *     tick...
+ *     Waitingtick...
+ *     
+ *     
+ *     tick...
+ */
+
+static VALUE
+rb_thread_join_m(argc, argv, thread)
+    int argc;
+    VALUE *argv;
+    VALUE thread;
+{
+    VALUE limit;
+    double delay = DELAY_INFTY;
+    rb_thread_t th = rb_thread_check(thread);
+
+    rb_scan_args(argc, argv, "01", &limit);
+    if (!NIL_P(limit)) delay = rb_num2dbl(limit);
+    if (!rb_thread_join(th, delay))
+	return Qnil;
+    return thread;
+}
+
+
+/*
+ *  call-seq:
+ *     Thread.current   => thread
+ *  
+ *  Returns the currently executing thread.
+ *     
+ *     Thread.current   #=> #<Thread:0x401bdf4c run>
+ */
+
+VALUE
+rb_thread_current()
+{
+    return curr_thread->thread;
+}
+
+
+/*
+ *  call-seq:
+ *     Thread.main   => thread
+ *  
+ *  Returns the main thread for the process.
+ *     
+ *     Thread.main   #=> #<Thread:0x401bdf4c run>
+ */
+
+VALUE
+rb_thread_main()
+{
+    return main_thread->thread;
+}
+
+
+/*
+ *  call-seq:
+ *     Thread.list   => array
+ *  
+ *  Returns an array of <code>Thread</code> objects for all threads that are
+ *  either runnable or stopped.
+ *     
+ *     Thread.new { sleep(200) }
+ *     Thread.new { 1000000.times {|i| i*i } }
+ *     Thread.new { Thread.stop }
+ *     Thread.list.each {|t| p t}
+ *     
+ *  <em>produces:</em>
+ *     
+ *     #<Thread:0x401b3e84 sleep>
+ *     #<Thread:0x401b3f38 run>
+ *     #<Thread:0x401b3fb0 sleep>
+ *     #<Thread:0x401bdf4c run>
+ */
+
+VALUE
+rb_thread_list()
+{
+    rb_thread_t th;
+    VALUE ary = rb_ary_new();
+
+    FOREACH_THREAD(th) {
+	switch (th->status) {
+	  case THREAD_RUNNABLE:
+	  case THREAD_STOPPED:
+	  case THREAD_TO_KILL:
+	    rb_ary_push(ary, th->thread);
+	  default:
+	    break;
+	}
+    }
+    END_FOREACH(th);
+
+    return ary;
+}
+
+
+/*
+ *  call-seq:
+ *     thr.wakeup   => thr
+ *  
+ *  Marks <i>thr</i> as eligible for scheduling (it may still remain blocked on
+ *  I/O, however). Does not invoke the scheduler (see <code>Thread#run</code>).
+ *     
+ *     c = Thread.new { Thread.stop; puts "hey!" }
+ *     c.wakeup
+ *     
+ *  <em>produces:</em>
+ *     
+ *     hey!
+ */
+
+VALUE
+rb_thread_wakeup(thread)
+    VALUE thread;
+{
+    if (!RTEST(rb_thread_wakeup_alive(thread)))
+	rb_raise(rb_eThreadError, "killed thread");
+    return thread;
+}
+
+VALUE
+rb_thread_wakeup_alive(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (th->status == THREAD_KILLED)
+	return Qnil;
+    rb_thread_ready(th);
+
+    return thread;
+}
+
+
+/*
+ *  call-seq:
+ *     thr.run   => thr
+ *  
+ *  Wakes up <i>thr</i>, making it eligible for scheduling. If not in a critical
+ *  section, then invokes the scheduler.
+ *     
+ *     a = Thread.new { puts "a"; Thread.stop; puts "c" }
+ *     Thread.pass
+ *     puts "Got here"
+ *     a.run
+ *     a.join
+ *     
+ *  <em>produces:</em>
+ *     
+ *     a
+ *     Got here
+ *     c
+ */
+
+VALUE
+rb_thread_run(thread)
+    VALUE thread;
+{
+    rb_thread_wakeup(thread);
+    if (!rb_thread_critical) rb_thread_schedule();
+
+    return thread;
+}
+
+
+static void
+rb_kill_thread(th, flags)
+    rb_thread_t th;
+    int flags;
+{
+    if (th != curr_thread && th->safe < 4) {
+	rb_secure(4);
+    }
+    if (th->status == THREAD_TO_KILL || th->status == THREAD_KILLED)
+	return;
+    if (th == th->next || th == main_thread) rb_exit(EXIT_SUCCESS);
+
+    rb_thread_ready(th);
+    th->flags |= flags;
+    th->status = THREAD_TO_KILL;
+    if (!rb_thread_critical) rb_thread_schedule();
+}
+
+
+/*
+ *  call-seq:
+ *     thr.exit        => thr
+ *     thr.kill        => thr
+ *     thr.terminate   => thr
+ *  
+ *  Terminates <i>thr</i> and schedules another thread to be run, returning
+ *  the terminated <code>Thread</code>.  If this is the main thread, or the
+ *  last thread, exits the process.
+ */
+
+VALUE
+rb_thread_kill(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    rb_kill_thread(th, 0);
+    return thread;
+}
+
+
+/*
+ *  call-seq:
+ *     thr.exit!        => thr
+ *     thr.kill!        => thr
+ *     thr.terminate!   => thr
+ *  
+ *  Terminates <i>thr</i> without calling ensure clauses and schedules
+ *  another thread to be run, returning the terminated <code>Thread</code>.
+ *  If this is the main thread, or the last thread, exits the process.
+ *
+ *  See <code>Thread#exit</code> for the safer version.
+ */
+
+static VALUE
+rb_thread_kill_bang(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+    rb_kill_thread(th, THREAD_NO_ENSURE);
+    return thread;
+}
+
+/*
+ *  call-seq:
+ *     Thread.kill(thread)   => thread
+ *  
+ *  Causes the given <em>thread</em> to exit (see <code>Thread::exit</code>).
+ *     
+ *     count = 0
+ *     a = Thread.new { loop { count += 1 } }
+ *     sleep(0.1)       #=> 0
+ *     Thread.kill(a)   #=> #<Thread:0x401b3d30 dead>
+ *     count            #=> 93947
+ *     a.alive?         #=> false
+ */
+
+static VALUE
+rb_thread_s_kill(obj, th)
+    VALUE obj, th;
+{
+    return rb_thread_kill(th);
+}
+
+
+/*
+ *  call-seq:
+ *     Thread.exit   => thread
+ *  
+ *  Terminates the currently running thread and schedules another thread to be
+ *  run. If this thread is already marked to be killed, <code>exit</code>
+ *  returns the <code>Thread</code>. If this is the main thread, or the last
+ *  thread, exit the process.
+ */
+
+static VALUE
+rb_thread_exit()
+{
+    return rb_thread_kill(curr_thread->thread);
+}
+
+
+/*
+ *  call-seq:
+ *     Thread.pass   => nil
+ *  
+ *  Invokes the thread scheduler to pass execution to another thread.
+ *     
+ *     a = Thread.new { print "a"; Thread.pass;
+ *                      print "b"; Thread.pass;
+ *                      print "c" }
+ *     b = Thread.new { print "x"; Thread.pass;
+ *                      print "y"; Thread.pass;
+ *                      print "z" }
+ *     a.join
+ *     b.join
+ *     
+ *  <em>produces:</em>
+ *     
+ *     axbycz
+ */
+
+static VALUE
+rb_thread_pass()
+{
+    rb_thread_schedule();
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     Thread.stop   => nil
+ *  
+ *  Stops execution of the current thread, putting it into a ``sleep'' state,
+ *  and schedules execution of another thread. Resets the ``critical'' condition
+ *  to <code>false</code>.
+ *     
+ *     a = Thread.new { print "a"; Thread.stop; print "c" }
+ *     Thread.pass
+ *     print "b"
+ *     a.run
+ *     a.join
+ *     
+ *  <em>produces:</em>
+ *     
+ *     abc
+ */
+
+VALUE
+rb_thread_stop()
+{
+    enum rb_thread_status last_status = THREAD_RUNNABLE;
+
+    rb_thread_critical = 0;
+    if (curr_thread == curr_thread->next) {
+	rb_raise(rb_eThreadError, "stopping only thread\n\tnote: use sleep to stop forever");
+    }
+    if (curr_thread->status == THREAD_TO_KILL)
+	last_status = THREAD_TO_KILL;
+    curr_thread->status = THREAD_STOPPED;
+    rb_thread_schedule();
+    curr_thread->status = last_status;
+
+    return Qnil;
+}
+
+struct timeval rb_time_timeval();
+
+void
+rb_thread_polling()
+{
+    if (curr_thread != curr_thread->next) {
+	curr_thread->status = THREAD_STOPPED;
+	curr_thread->delay = timeofday() + (double)0.06;
+	curr_thread->wait_for = WAIT_TIME;
+	rb_thread_schedule();
+    }
+}
+
+void
+rb_thread_sleep(sec)
+    int sec;
+{
+    if (curr_thread == curr_thread->next) {
+	TRAP_BEG;
+	sleep(sec);
+	TRAP_END;
+	return;
+    }
+    rb_thread_wait_for(rb_time_timeval(INT2FIX(sec)));
+}
+
+void
+rb_thread_sleep_forever()
+{
+    int thr_critical = rb_thread_critical;
+    if (curr_thread == curr_thread->next ||
+	curr_thread->status == THREAD_TO_KILL) {
+	rb_thread_critical = Qtrue;
+	TRAP_BEG;
+	pause();
+	rb_thread_critical = thr_critical;
+	TRAP_END;
+	return;
+    }
+
+    curr_thread->delay = DELAY_INFTY;
+    curr_thread->wait_for = WAIT_TIME;
+    curr_thread->status = THREAD_STOPPED;
+    rb_thread_schedule();
+}
+
+
+/*
+ *  call-seq:
+ *     thr.priority   => integer
+ *
+ *  Returns the priority of <i>thr</i>. Default is inherited from the
+ *  current thread which creating the new thread, or zero for the
+ *  initial main thread; higher-priority threads will run before
+ *  lower-priority threads.
+ *
+ *     Thread.current.priority   #=> 0
+ */
+
+static VALUE
+rb_thread_priority(thread)
+    VALUE thread;
+{
+    return INT2NUM(rb_thread_check(thread)->priority);
+}
+
+
+/*
+ *  call-seq:
+ *     thr.priority= integer   => thr
+ *
+ *  Sets the priority of <i>thr</i> to <i>integer</i>. Higher-priority threads
+ *  will run before lower-priority threads.
+ *
+ *     count1 = count2 = 0
+ *     a = Thread.new do
+ *           loop { count1 += 1 }
+ *         end
+ *     a.priority = -1
+ *     
+ *     b = Thread.new do
+ *           loop { count2 += 1 }
+ *         end
+ *     b.priority = -2
+ *     sleep 1   #=> 1
+ *     Thread.critical = 1
+ *     count1    #=> 622504
+ *     count2    #=> 5832
+ */
+
+static VALUE
+rb_thread_priority_set(thread, prio)
+    VALUE thread, prio;
+{
+    rb_thread_t th;
+
+    rb_secure(4);
+    th = rb_thread_check(thread);
+
+    th->priority = NUM2INT(prio);
+    rb_thread_schedule();
+    return prio;
+}
+
+
+/*
+ *  call-seq:
+ *     thr.safe_level   => integer
+ *  
+ *  Returns the safe level in effect for <i>thr</i>. Setting thread-local safe
+ *  levels can help when implementing sandboxes which run insecure code.
+ *     
+ *     thr = Thread.new { $SAFE = 3; sleep }
+ *     Thread.current.safe_level   #=> 0
+ *     thr.safe_level              #=> 3
+ */
+
+static VALUE
+rb_thread_safe_level(thread)
+    VALUE thread;
+{
+    rb_thread_t th;
+
+    th = rb_thread_check(thread);
+    if (th == curr_thread) {
+	return INT2NUM(ruby_safe_level);
+    }
+    return INT2NUM(th->safe);
+}
+
+static int ruby_thread_abort;
+static VALUE thgroup_default;
+
+
+/*
+ *  call-seq:
+ *     Thread.abort_on_exception   => true or false
+ *  
+ *  Returns the status of the global ``abort on exception'' condition.  The
+ *  default is <code>false</code>. When set to <code>true</code>, or if the
+ *  global <code>$DEBUG</code> flag is <code>true</code> (perhaps because the
+ *  command line option <code>-d</code> was specified) all threads will abort
+ *  (the process will <code>exit(0)</code>) if an exception is raised in any
+ *  thread. See also <code>Thread::abort_on_exception=</code>.
+ */
+
+static VALUE
+rb_thread_s_abort_exc()
+{
+    return ruby_thread_abort?Qtrue:Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     Thread.abort_on_exception= boolean   => true or false
+ *  
+ *  When set to <code>true</code>, all threads will abort if an exception is
+ *  raised. Returns the new state.
+ *     
+ *     Thread.abort_on_exception = true
+ *     t1 = Thread.new do
+ *       puts  "In new thread"
+ *       raise "Exception from thread"
+ *     end
+ *     sleep(1)
+ *     puts "not reached"
+ *     
+ *  <em>produces:</em>
+ *     
+ *     In new thread
+ *     prog.rb:4: Exception from thread (RuntimeError)
+ *     	from prog.rb:2:in `initialize'
+ *     	from prog.rb:2:in `new'
+ *     	from prog.rb:2
+ */
+
+static VALUE
+rb_thread_s_abort_exc_set(self, val)
+    VALUE self, val;
+{
+    rb_secure(4);
+    ruby_thread_abort = RTEST(val);
+    return val;
+}
+
+
+/*
+ *  call-seq:
+ *     thr.abort_on_exception   => true or false
+ *  
+ *  Returns the status of the thread-local ``abort on exception'' condition for
+ *  <i>thr</i>. The default is <code>false</code>. See also
+ *  <code>Thread::abort_on_exception=</code>.
+ */
+
+static VALUE
+rb_thread_abort_exc(thread)
+    VALUE thread;
+{
+    return rb_thread_check(thread)->abort?Qtrue:Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     thr.abort_on_exception= boolean   => true or false
+ *  
+ *  When set to <code>true</code>, causes all threads (including the main
+ *  program) to abort if an exception is raised in <i>thr</i>. The process will
+ *  effectively <code>exit(0)</code>.
+ */
+
+static VALUE
+rb_thread_abort_exc_set(thread, val)
+    VALUE thread, val;
+{
+    rb_secure(4);
+    rb_thread_check(thread)->abort = RTEST(val);
+    return val;
+}
+
+
+enum rb_thread_status
+rb_thread_status(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+    return th->status;
+}
+
+
+/*
+ *  call-seq:
+ *     thr.group   => thgrp or nil
+ *  
+ *  Returns the <code>ThreadGroup</code> which contains <i>thr</i>, or nil if
+ *  the thread is not a member of any group.
+ *     
+ *     Thread.main.group   #=> #<ThreadGroup:0x4029d914>
+ */
+
+VALUE
+rb_thread_group(thread)
+    VALUE thread;
+{
+    VALUE group = rb_thread_check(thread)->thgroup;
+    if (!group) {
+	group = Qnil;
+    }
+    return group;
+}
+
+#ifdef __ia64
+# define IA64_INIT(x) x
+#else
+# define IA64_INIT(x)
+#endif
+
+#define THREAD_ALLOC(th) do {\
+    th = ALLOC(struct rb_thread);\
+\
+    th->next = 0;\
+    th->prev = 0;\
+\
+    th->status = THREAD_RUNNABLE;\
+    th->result = 0;\
+    th->flags = 0;\
+\
+    th->stk_ptr = 0;\
+    th->stk_len = 0;\
+    th->stk_max = 0;\
+    th->wait_for = 0;\
+    IA64_INIT(th->bstr_ptr = 0);\
+    IA64_INIT(th->bstr_len = 0);\
+    IA64_INIT(th->bstr_max = 0);\
+    FD_ZERO(&th->readfds);\
+    FD_ZERO(&th->writefds);\
+    FD_ZERO(&th->exceptfds);\
+    th->delay = 0.0;\
+    th->join = 0;\
+\
+    th->frame = 0;\
+    th->scope = 0;\
+    th->klass = 0;\
+    th->wrapper = 0;\
+    th->cref = ruby_cref;\
+    th->dyna_vars = ruby_dyna_vars;\
+    th->block = 0;\
+    th->iter = 0;\
+    th->tag = 0;\
+    th->tracing = 0;\
+    th->errinfo = Qnil;\
+    th->last_status = 0;\
+    th->last_line = 0;\
+    th->last_match = Qnil;\
+    th->abort = 0;\
+    th->priority = 0;\
+    th->thgroup = thgroup_default;\
+    th->locals = 0;\
+    th->thread = 0;\
+    if (curr_thread == 0) {\
+      th->sandbox = Qnil;\
+    } else {\
+      th->sandbox = curr_thread->sandbox;\
+    }\
+} while (0)
+
+static rb_thread_t
+rb_thread_alloc(klass)
+    VALUE klass;
+{
+    rb_thread_t th;
+    struct RVarmap *vars;
+
+    THREAD_ALLOC(th);
+    th->thread = Data_Wrap_Struct(klass, thread_mark, thread_free, th);
+
+    for (vars = th->dyna_vars; vars; vars = vars->next) {
+	if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+	FL_SET(vars, DVAR_DONT_RECYCLE);
+    }
+    return th;
+}
+
+static int thread_init = 0;
+
+#if defined(_THREAD_SAFE)
+static void
+catch_timer(sig)
+    int sig;
+{
+#if !defined(POSIX_SIGNAL) && !defined(BSD_SIGNAL)
+    signal(sig, catch_timer);
+#endif
+    /* cause EINTR */
+}
+
+static int time_thread_alive_p = 0;
+static pthread_t time_thread;
+
+static void*
+thread_timer(dummy)
+    void *dummy;
+{
+#ifdef _THREAD_SAFE
+#define test_cancel() pthread_testcancel()
+#else
+#define test_cancel() /* void */
+#endif
+
+    sigset_t all_signals;
+
+    sigfillset(&all_signals);
+    pthread_sigmask(SIG_BLOCK, &all_signals, 0);
+
+    for (;;) {
+#ifdef HAVE_NANOSLEEP
+	struct timespec req, rem;
+
+	test_cancel();
+	req.tv_sec = 0;
+	req.tv_nsec = 10000000;
+	nanosleep(&req, &rem);
+#else
+	struct timeval tv;
+
+	test_cancel();
+	tv.tv_sec = 0;
+	tv.tv_usec = 10000;
+	select(0, NULL, NULL, NULL, &tv);
+#endif
+	if (!rb_thread_critical) {
+	    rb_thread_pending = 1;
+	    if (rb_trap_immediate) {
+		pthread_kill(ruby_thid, SIGVTALRM);
+	    }
+	}
+    }
+#undef test_cancel
+}
+
+void
+rb_thread_start_timer()
+{
+}
+
+void
+rb_thread_stop_timer()
+{
+}
+
+void
+rb_thread_cancel_timer()
+{
+#ifdef _THREAD_SAFE
+    if( time_thread_alive_p )
+    {
+	pthread_cancel( time_thread );
+	pthread_join( time_thread, NULL );
+	time_thread_alive_p = 0;
+    }
+    thread_init = 0;
+#endif
+}
+#elif defined(HAVE_SETITIMER)
+static void
+catch_timer(sig)
+    int sig;
+{
+#if !defined(POSIX_SIGNAL) && !defined(BSD_SIGNAL)
+    signal(sig, catch_timer);
+#endif
+    if (!rb_thread_critical) {
+	rb_thread_pending = 1;
+    }
+    /* cause EINTR */
+}
+
+void
+rb_thread_start_timer()
+{
+    struct itimerval tval;
+
+    if (!thread_init) return;
+    tval.it_interval.tv_sec = 0;
+    tval.it_interval.tv_usec = 10000;
+    tval.it_value = tval.it_interval;
+    setitimer(ITIMER_VIRTUAL, &tval, NULL);
+}
+
+void
+rb_thread_stop_timer()
+{
+    struct itimerval tval;
+
+    if (!thread_init) return;
+    tval.it_interval.tv_sec = 0;
+    tval.it_interval.tv_usec = 0;
+    tval.it_value = tval.it_interval;
+    setitimer(ITIMER_VIRTUAL, &tval, NULL);
+}
+
+void
+rb_thread_cancel_timer()
+{
+}
+
+#else  /* !(_THREAD_SAFE || HAVE_SETITIMER) */
+int rb_thread_tick = THREAD_TICK;
+
+void
+rb_thread_cancel_timer()
+{
+}
+#endif
+
+static VALUE
+rb_thread_start_0(fn, arg, th)
+    VALUE (*fn)();
+    void *arg;
+    rb_thread_t th;
+{
+    volatile rb_thread_t th_save = th;
+    volatile VALUE thread = th->thread;
+    struct BLOCK *volatile saved_block = 0;
+    enum rb_thread_status status;
+    int state;
+
+    if (OBJ_FROZEN(curr_thread->thgroup)) {
+	rb_raise(rb_eThreadError,
+		 "can't start a new thread (frozen ThreadGroup)");
+    }
+
+    if (!thread_init) {
+	thread_init = 1;
+#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
+#if defined(POSIX_SIGNAL)
+	posix_signal(SIGVTALRM, catch_timer);
+#else
+	signal(SIGVTALRM, catch_timer);
+#endif
+
+#ifdef _THREAD_SAFE
+	pthread_create(&time_thread, 0, thread_timer, 0);
+        time_thread_alive_p = 1;
+#else
+	rb_thread_start_timer();
+#endif
+#endif
+    }
+
+    if (THREAD_SAVE_CONTEXT(curr_thread)) {
+	return thread;
+    }
+
+    if (ruby_block) {		/* should nail down higher blocks */
+	struct BLOCK dummy;
+
+	dummy.prev = ruby_block;
+	blk_copy_prev(&dummy);
+	saved_block = ruby_block = dummy.prev;
+    }
+    scope_dup(ruby_scope);
+
+    if (!th->next) {
+	/* merge in thread list */
+	th->prev = curr_thread;
+	curr_thread->next->prev = th;
+	th->next = curr_thread->next;
+	curr_thread->next = th;
+	th->priority = curr_thread->priority;
+	th->thgroup = curr_thread->thgroup;
+    }
+
+    PUSH_TAG(PROT_THREAD);
+    if ((state = EXEC_TAG()) == 0) {
+	if (THREAD_SAVE_CONTEXT(th) == 0) {
+	    curr_thread = th;
+	    th->result = (*fn)(arg, th);
+	}
+	th = th_save;
+    }
+    else if (TAG_DST()) {
+	th = th_save;
+	th->result = prot_tag->retval;
+    }
+    POP_TAG();
+    status = th->status;
+
+    if (th == main_thread) ruby_stop(state);
+    rb_thread_remove(th);
+
+    if (saved_block) {
+	blk_free(saved_block);
+    }
+
+    if (state && status != THREAD_TO_KILL && !NIL_P(ruby_errinfo)) {
+	th->flags |= THREAD_RAISED;
+	if (state == TAG_FATAL) {
+	    /* fatal error within this thread, need to stop whole script */
+	    main_thread->errinfo = ruby_errinfo;
+	    rb_thread_cleanup();
+	}
+	else if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
+	    if (th->safe >= 4) {
+		char buf[32];
+
+		sprintf(buf, "Insecure exit at level %d", th->safe);
+		th->errinfo = rb_exc_new2(rb_eSecurityError, buf);
+	    }
+	    else {
+		/* delegate exception to main_thread */
+		rb_thread_main_jump(ruby_errinfo, RESTORE_RAISE);
+	    }
+	}
+	else if (th->safe < 4 && (ruby_thread_abort || th->abort || RTEST(ruby_debug))) {
+	    /* exit on main_thread */
+	    error_print();
+	    rb_thread_main_jump(ruby_errinfo, RESTORE_EXIT);
+	}
+	else {
+	    th->errinfo = ruby_errinfo;
+	}
+    }
+    rb_thread_schedule();
+    ruby_stop(0);		/* last thread termination */
+    return 0;			/* not reached */
+}
+
+VALUE
+rb_thread_create(fn, arg)
+    VALUE (*fn)();
+    void *arg;
+{
+    Init_stack((VALUE*)&arg);
+    return rb_thread_start_0(fn, arg, rb_thread_alloc(rb_cThread));
+}
+
+static VALUE
+rb_thread_yield(arg, th)
+    VALUE arg;
+    rb_thread_t th;
+{
+    const ID *tbl;
+
+    scope_dup(ruby_block->scope);
+
+    tbl = ruby_scope->local_tbl;
+    if (tbl) {
+	int n = *tbl++;
+	for (tbl += 2, n -= 2; n > 0; --n) { /* skip first 2 ($_ and $~) */
+	    ID id = *tbl++;
+	    if (id != 0 && !rb_is_local_id(id))  /* push flip states */
+		rb_dvar_push(id, Qfalse);
+	}
+    }
+    rb_dvar_push('_', Qnil);
+    rb_dvar_push('~', Qnil);
+    ruby_block->dyna_vars = ruby_dyna_vars;
+
+    return rb_yield_0(arg, 0, 0, YIELD_LAMBDA_CALL, Qtrue);
+}
+
+/*
+ *  call-seq:
+ *     Thread.new([arg]*) {|args| block }   => thread
+ *  
+ *  Creates and runs a new thread to execute the instructions given in
+ *  <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed
+ *  into the block.
+ *     
+ *     x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" }
+ *     a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" }
+ *     x.join # Let the threads finish before
+ *     a.join # main thread exits...
+ *     
+ *  <em>produces:</em>
+ *     
+ *     abxyzc
+ */
+
+static VALUE
+rb_thread_s_new(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    rb_thread_t th = rb_thread_alloc(klass);
+    volatile VALUE *pos;
+
+    pos = th->stk_pos;
+    rb_obj_call_init(th->thread, argc, argv);
+    if (th->stk_pos == 0) {
+	rb_raise(rb_eThreadError, "uninitialized thread - check `%s#initialize'",
+		 rb_class2name(klass));
+    }
+
+    return th->thread;
+}
+
+
+/*
+ *  call-seq:
+ *     Thread.new([arg]*) {|args| block }   => thread
+ *  
+ *  Creates and runs a new thread to execute the instructions given in
+ *  <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed
+ *  into the block.
+ *     
+ *     x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" }
+ *     a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" }
+ *     x.join # Let the threads finish before
+ *     a.join # main thread exits...
+ *     
+ *  <em>produces:</em>
+ *     
+ *     abxyzc
+ */
+
+static VALUE
+rb_thread_initialize(thread, args)
+    VALUE thread, args;
+{
+    rb_thread_t th;
+
+    if (!rb_block_given_p()) {
+	rb_raise(rb_eThreadError, "must be called with a block");
+    }
+    th = rb_thread_check(thread);
+    if (th->stk_max) {
+	NODE *node = th->node;
+	if (!node) {
+	    rb_raise(rb_eThreadError, "already initialized thread");
+	}
+	rb_raise(rb_eThreadError, "already initialized thread - %s:%d",
+		 node->nd_file, nd_line(node));
+    }
+    return rb_thread_start_0(rb_thread_yield, args, th);
+}
+
+
+/*
+ *  call-seq:
+ *     Thread.start([args]*) {|args| block }   => thread
+ *     Thread.fork([args]*) {|args| block }    => thread
+ *  
+ *  Basically the same as <code>Thread::new</code>. However, if class
+ *  <code>Thread</code> is subclassed, then calling <code>start</code> in that
+ *  subclass will not invoke the subclass's <code>initialize</code> method.
+ */
+
+static VALUE
+rb_thread_start(klass, args)
+    VALUE klass, args;
+{
+    if (!rb_block_given_p()) {
+	rb_raise(rb_eThreadError, "must be called with a block");
+    }
+    return rb_thread_start_0(rb_thread_yield, args, rb_thread_alloc(klass));
+}
+
+
+/*
+ *  call-seq:
+ *     thr.value   => obj
+ *  
+ *  Waits for <i>thr</i> to complete (via <code>Thread#join</code>) and returns
+ *  its value.
+ *     
+ *     a = Thread.new { 2 + 2 }
+ *     a.value   #=> 4
+ */
+
+static VALUE
+rb_thread_value(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    while (!rb_thread_join(th, DELAY_INFTY));
+
+    return th->result;
+}
+
+
+/*
+ *  call-seq:
+ *     thr.status   => string, false or nil
+ *  
+ *  Returns the status of <i>thr</i>: ``<code>sleep</code>'' if <i>thr</i> is
+ *  sleeping or waiting on I/O, ``<code>run</code>'' if <i>thr</i> is executing,
+ *  ``<code>aborting</code>'' if <i>thr</i> is aborting, <code>false</code> if
+ *  <i>thr</i> terminated normally, and <code>nil</code> if <i>thr</i>
+ *  terminated with an exception.
+ *     
+ *     a = Thread.new { raise("die now") }
+ *     b = Thread.new { Thread.stop }
+ *     c = Thread.new { Thread.exit }
+ *     d = Thread.new { sleep }
+ *     Thread.critical = true
+ *     d.kill                  #=> #<Thread:0x401b3678 aborting>
+ *     a.status                #=> nil
+ *     b.status                #=> "sleep"
+ *     c.status                #=> false
+ *     d.status                #=> "aborting"
+ *     Thread.current.status   #=> "run"
+ */
+
+static VALUE
+rb_thread_status_name(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (rb_thread_dead(th)) {
+	if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED))
+	    return Qnil;
+	return Qfalse;
+    }
+
+    return rb_str_new2(thread_status_name(th->status));
+}
+
+
+/*
+ *  call-seq:
+ *     thr.alive?   => true or false
+ *  
+ *  Returns <code>true</code> if <i>thr</i> is running or sleeping.
+ *     
+ *     thr = Thread.new { }
+ *     thr.join                #=> #<Thread:0x401b3fb0 dead>
+ *     Thread.current.alive?   #=> true
+ *     thr.alive?              #=> false
+ */
+
+VALUE
+rb_thread_alive_p(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (rb_thread_dead(th)) return Qfalse;
+    return Qtrue;
+}
+
+
+/*
+ *  call-seq:
+ *     thr.stop?   => true or false
+ *  
+ *  Returns <code>true</code> if <i>thr</i> is dead or sleeping.
+ *     
+ *     a = Thread.new { Thread.stop }
+ *     b = Thread.current
+ *     a.stop?   #=> true
+ *     b.stop?   #=> false
+ */
+
+static VALUE
+rb_thread_stop_p(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (rb_thread_dead(th)) return Qtrue;
+    if (th->status == THREAD_STOPPED) return Qtrue;
+    return Qfalse;
+}
+
+static void
+rb_thread_wait_other_threads()
+{
+    rb_thread_t th;
+    int found;
+
+    /* wait other threads to terminate */
+    while (curr_thread != curr_thread->next) {
+	found = 0;
+	FOREACH_THREAD(th) {
+	    if (th != curr_thread && th->status != THREAD_STOPPED) {
+		found = 1;
+		break;
+	    }
+	}
+	END_FOREACH(th);
+	if (!found) return;
+	rb_thread_schedule();
+    }
+}
+
+static void
+rb_thread_cleanup()
+{
+    rb_thread_t curr, th;
+
+    curr = curr_thread;
+    while (curr->status == THREAD_KILLED) {
+	curr = curr->prev;
+    }
+
+    FOREACH_THREAD_FROM(curr, th) {
+	if (th->status != THREAD_KILLED) {
+	    rb_thread_ready(th);
+	    if (th != main_thread) {
+		th->thgroup = 0;
+		th->priority = 0;
+		th->status = THREAD_TO_KILL;
+		RDATA(th->thread)->dfree = NULL;
+	    }
+	}
+    }
+    END_FOREACH_FROM(curr, th);
+}
+
+int rb_thread_critical;
+
+
+/*
+ *  call-seq:
+ *     Thread.critical   => true or false
+ *  
+ *  Returns the status of the global ``thread critical'' condition.
+ */
+
+static VALUE
+rb_thread_critical_get()
+{
+    return rb_thread_critical?Qtrue:Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     Thread.critical= boolean   => true or false
+ *  
+ *  Sets the status of the global ``thread critical'' condition and returns
+ *  it. When set to <code>true</code>, prohibits scheduling of any existing
+ *  thread. Does not block new threads from being created and run. Certain
+ *  thread operations (such as stopping or killing a thread, sleeping in the
+ *  current thread, and raising an exception) may cause a thread to be scheduled
+ *  even when in a critical section.  <code>Thread::critical</code> is not
+ *  intended for daily use: it is primarily there to support folks writing
+ *  threading libraries.
+ */
+
+static VALUE
+rb_thread_critical_set(obj, val)
+    VALUE obj, val;
+{
+    rb_thread_critical = RTEST(val);
+    return val;
+}
+
+void
+rb_thread_interrupt()
+{
+    rb_thread_critical = 0;
+    rb_thread_ready(main_thread);
+    if (curr_thread == main_thread) {
+	rb_interrupt();
+    }
+    if (!rb_thread_dead(curr_thread)) {
+	if (THREAD_SAVE_CONTEXT(curr_thread)) {
+	    return;
+	}
+    }
+    curr_thread = main_thread;
+    rb_thread_restore_context(curr_thread, RESTORE_INTERRUPT);
+}
+
+void
+rb_thread_signal_raise(sig)
+    int sig;
+{
+    rb_thread_critical = 0;
+    if (curr_thread == main_thread) {
+	VALUE argv[1];
+
+	rb_thread_ready(curr_thread);
+	argv[0] = INT2FIX(sig);
+	rb_exc_raise(rb_class_new_instance(1, argv, rb_eSignal));
+    }
+    rb_thread_ready(main_thread);
+    if (!rb_thread_dead(curr_thread)) {
+	if (THREAD_SAVE_CONTEXT(curr_thread)) {
+	    return;
+	}
+    }
+    th_sig = sig;
+    curr_thread = main_thread;
+    rb_thread_restore_context(curr_thread, RESTORE_SIGNAL);
+}
+
+void
+rb_thread_trap_eval(cmd, sig, safe)
+    VALUE cmd;
+    int sig, safe;
+{
+    rb_thread_critical = 0;
+    if (curr_thread == main_thread) {
+	rb_trap_eval(cmd, sig, safe);
+	return;
+    }
+    if (!rb_thread_dead(curr_thread)) {
+	if (THREAD_SAVE_CONTEXT(curr_thread)) {
+	    return;
+	}
+    }
+    th_cmd = cmd;
+    th_sig = sig;
+    th_safe = safe;
+    curr_thread = main_thread;
+    rb_thread_restore_context(curr_thread, RESTORE_TRAP);
+}
+
+void
+rb_thread_signal_exit()
+{
+    VALUE args[2];
+
+    rb_thread_critical = 0;
+    if (curr_thread == main_thread) {
+	rb_thread_ready(curr_thread);
+	rb_exit(EXIT_SUCCESS);
+    }
+    args[0] = INT2NUM(EXIT_SUCCESS);
+    args[1] = rb_str_new2("exit");
+    rb_thread_ready(main_thread);
+    if (!rb_thread_dead(curr_thread)) {
+	if (THREAD_SAVE_CONTEXT(curr_thread)) {
+	    return;
+	}
+    }
+    rb_thread_main_jump(rb_class_new_instance(2, args, rb_eSystemExit), 
+			RESTORE_EXIT);
+}
+
+static VALUE
+rb_thread_raise(argc, argv, th)
+    int argc;
+    VALUE *argv;
+    rb_thread_t th;
+{
+    volatile rb_thread_t th_save = th;
+    VALUE exc;
+
+    if (!th->next) {
+	rb_raise(rb_eArgError, "unstarted thread");
+    }
+    if (rb_thread_dead(th)) return Qnil;
+    exc = rb_make_exception(argc, argv);
+    if (curr_thread == th) {
+	rb_raise_jump(exc);
+    }
+
+    if (!rb_thread_dead(curr_thread)) {
+	if (THREAD_SAVE_CONTEXT(curr_thread)) {
+	    return th_save->thread;
+	}
+    }
+
+    rb_thread_ready(th);
+    curr_thread = th;
+
+    th_raise_exception = exc;
+    th_raise_node = ruby_current_node;
+    rb_thread_restore_context(curr_thread, RESTORE_RAISE);
+    return Qnil;		/* not reached */
+}
+
+
+/*
+ *  call-seq:
+ *     thr.raise(exception)
+ *  
+ *  Raises an exception (see <code>Kernel::raise</code>) from <i>thr</i>. The
+ *  caller does not have to be <i>thr</i>.
+ *     
+ *     Thread.abort_on_exception = true
+ *     a = Thread.new { sleep(200) }
+ *     a.raise("Gotcha")
+ *     
+ *  <em>produces:</em>
+ *     
+ *     prog.rb:3: Gotcha (RuntimeError)
+ *     	from prog.rb:2:in `initialize'
+ *     	from prog.rb:2:in `new'
+ *     	from prog.rb:2
+ */
+
+static VALUE
+rb_thread_raise_m(argc, argv, thread)
+    int argc;
+    VALUE *argv;
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (ruby_safe_level > th->safe) {
+	rb_secure(4);
+    }
+    rb_thread_raise(argc, argv, th);
+    return Qnil;		/* not reached */
+}
+
+VALUE
+rb_thread_local_aref(thread, id)
+    VALUE thread;
+    ID id;
+{
+    rb_thread_t th;
+    VALUE val;
+
+    th = rb_thread_check(thread);
+    if (ruby_safe_level >= 4 && th != curr_thread) {
+	rb_raise(rb_eSecurityError, "Insecure: thread locals");
+    }
+    if (!th->locals) return Qnil;
+    if (st_lookup(th->locals, id, &val)) {
+	return val;
+    }
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *      thr[sym]   => obj or nil
+ *  
+ *  Attribute Reference---Returns the value of a thread-local variable, using
+ *  either a symbol or a string name. If the specified variable does not exist,
+ *  returns <code>nil</code>.
+ *     
+ *     a = Thread.new { Thread.current["name"] = "A"; Thread.stop }
+ *     b = Thread.new { Thread.current[:name]  = "B"; Thread.stop }
+ *     c = Thread.new { Thread.current["name"] = "C"; Thread.stop }
+ *     Thread.list.each {|x| puts "#{x.inspect}: #{x[:name]}" }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     #<Thread:0x401b3b3c sleep>: C
+ *     #<Thread:0x401b3bc8 sleep>: B
+ *     #<Thread:0x401b3c68 sleep>: A
+ *     #<Thread:0x401bdf4c run>:
+ */
+
+static VALUE
+rb_thread_aref(thread, id)
+    VALUE thread, id;
+{
+    return rb_thread_local_aref(thread, rb_to_id(id));
+}
+
+VALUE
+rb_thread_local_aset(thread, id, val)
+    VALUE thread;
+    ID id;
+    VALUE val;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (ruby_safe_level >= 4 && th != curr_thread) {
+	rb_raise(rb_eSecurityError, "Insecure: can't modify thread locals");
+    }
+    if (OBJ_FROZEN(thread)) rb_error_frozen("thread locals");
+
+    if (!th->locals) {
+	th->locals = st_init_numtable();
+    }
+    if (NIL_P(val)) {
+	st_delete(th->locals, (st_data_t*)&id, 0);
+	return Qnil;
+    }
+    st_insert(th->locals, id, val);
+
+    return val;
+}
+
+
+/*
+ *  call-seq:
+ *      thr[sym] = obj   => obj
+ *  
+ *  Attribute Assignment---Sets or creates the value of a thread-local variable,
+ *  using either a symbol or a string. See also <code>Thread#[]</code>.
+ */
+
+static VALUE
+rb_thread_aset(thread, id, val)
+    VALUE thread, id, val;
+{
+    return rb_thread_local_aset(thread, rb_to_id(id), val);
+}
+
+
+/*
+ *  call-seq:
+ *     thr.key?(sym)   => true or false
+ *  
+ *  Returns <code>true</code> if the given string (or symbol) exists as a
+ *  thread-local variable.
+ *     
+ *     me = Thread.current
+ *     me[:oliver] = "a"
+ *     me.key?(:oliver)    #=> true
+ *     me.key?(:stanley)   #=> false
+ */
+
+static VALUE
+rb_thread_key_p(thread, id)
+    VALUE thread, id;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (!th->locals) return Qfalse;
+    if (st_lookup(th->locals, rb_to_id(id), 0))
+	return Qtrue;
+    return Qfalse;
+}
+
+static int
+thread_keys_i(key, value, ary)
+    ID key;
+    VALUE value, ary;
+{
+    rb_ary_push(ary, ID2SYM(key));
+    return ST_CONTINUE;
+}
+
+
+/*
+ *  call-seq:
+ *     thr.keys   => array
+ *  
+ *  Returns an an array of the names of the thread-local variables (as Symbols).
+ *     
+ *     thr = Thread.new do
+ *       Thread.current[:cat] = 'meow'
+ *       Thread.current["dog"] = 'woof'
+ *     end
+ *     thr.join   #=> #<Thread:0x401b3f10 dead>
+ *     thr.keys   #=> [:dog, :cat]
+ */
+
+static VALUE
+rb_thread_keys(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+    VALUE ary = rb_ary_new();
+
+    if (th->locals) {
+	st_foreach(th->locals, thread_keys_i, ary);
+    }
+    return ary;
+}
+
+/*
+ * call-seq:
+ *   thr.inspect   => string
+ *
+ * Dump the name, id, and status of _thr_ to a string.
+ */
+
+static VALUE
+rb_thread_inspect(thread)
+    VALUE thread;
+{
+    char *cname = rb_obj_classname(thread);
+    rb_thread_t th = rb_thread_check(thread);
+    const char *status = thread_status_name(th->status);
+    VALUE str;
+    size_t len = strlen(cname)+7+16+9+1;
+
+    str = rb_str_new(0, len); /* 7:tags 16:addr 9:status 1:nul */
+    snprintf(RSTRING(str)->ptr, len, "#<%s:0x%lx %s>", cname, thread, status);
+    RSTRING(str)->len = strlen(RSTRING(str)->ptr);
+    OBJ_INFECT(str, thread);
+
+    return str;
+}
+
+void
+rb_thread_atfork()
+{
+    rb_thread_t th;
+
+    if (rb_thread_alone()) return;
+    FOREACH_THREAD(th) {
+	if (th != curr_thread) {
+	    rb_thread_die(th);
+	}
+    }
+    END_FOREACH(th);
+    main_thread = curr_thread;
+    curr_thread->next = curr_thread;
+    curr_thread->prev = curr_thread;
+}
+
+
+/*
+ *  Document-class: Continuation
+ *
+ *  Continuation objects are generated by
+ *  <code>Kernel#callcc</code>. They hold a return address and execution
+ *  context, allowing a nonlocal return to the end of the
+ *  <code>callcc</code> block from anywhere within a program.
+ *  Continuations are somewhat analogous to a structured version of C's
+ *  <code>setjmp/longjmp</code> (although they contain more state, so
+ *  you might consider them closer to threads).
+ *     
+ *  For instance:
+ *     
+ *     arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ]
+ *     callcc{|$cc|}
+ *     puts(message = arr.shift)
+ *     $cc.call unless message =~ /Max/
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Freddie
+ *     Herbie
+ *     Ron
+ *     Max
+ *     
+ *  This (somewhat contrived) example allows the inner loop to abandon
+ *  processing early:
+ *     
+ *     callcc {|cont|
+ *       for i in 0..4
+ *         print "\n#{i}: "
+ *         for j in i*5...(i+1)*5
+ *           cont.call() if j == 17
+ *           printf "%3d", j
+ *         end
+ *       end
+ *     }
+ *     print "\n"
+ *     
+ *  <em>produces:</em>
+ *     
+ *     0:   0  1  2  3  4
+ *     1:   5  6  7  8  9
+ *     2:  10 11 12 13 14
+ *     3:  15 16
+ */
+
+VALUE rb_cCont;
+
+/*
+ *  call-seq:
+ *     callcc {|cont| block }   =>  obj
+ *  
+ *  Generates a <code>Continuation</code> object, which it passes to the
+ *  associated block. Performing a <em>cont</em><code>.call</code> will
+ *  cause the <code>callcc</code> to return (as will falling through the
+ *  end of the block). The value returned by the <code>callcc</code> is
+ *  the value of the block, or the value passed to
+ *  <em>cont</em><code>.call</code>. See class <code>Continuation</code> 
+ *  for more details. Also see <code>Kernel::throw</code> for
+ *  an alternative mechanism for unwinding a call stack.
+ */
+
+static VALUE
+rb_callcc(self)
+    VALUE self;
+{
+    volatile VALUE cont;
+    rb_thread_t th;
+    volatile rb_thread_t th_save;
+    struct tag *tag;
+    struct RVarmap *vars;
+
+    THREAD_ALLOC(th);
+    cont = Data_Wrap_Struct(rb_cCont, thread_mark, thread_free, th);
+
+    scope_dup(ruby_scope);
+    for (tag=prot_tag; tag; tag=tag->prev) {
+	scope_dup(tag->scope);
+    }
+    th->thread = curr_thread->thread;
+    th->thgroup = cont_protect;
+
+    for (vars = ruby_dyna_vars; vars; vars = vars->next) {
+	if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+	FL_SET(vars, DVAR_DONT_RECYCLE);
+    }
+    th_save = th;
+    if (THREAD_SAVE_CONTEXT(th)) {
+	return th_save->result;
+    }
+    else {
+	return rb_yield(cont);
+    }
+}
+
+/*
+ *  call-seq:
+ *     cont.call(args, ...) 
+ *     cont[args, ...]
+ *  
+ *  Invokes the continuation. The program continues from the end of the
+ *  <code>callcc</code> block. If no arguments are given, the original
+ *  <code>callcc</code> returns <code>nil</code>. If one argument is
+ *  given, <code>callcc</code> returns it. Otherwise, an array
+ *  containing <i>args</i> is returned.
+ *     
+ *     callcc {|cont|  cont.call }           #=> nil
+ *     callcc {|cont|  cont.call 1 }         #=> 1
+ *     callcc {|cont|  cont.call 1, 2, 3 }   #=> [1, 2, 3]
+ */
+
+static VALUE
+rb_cont_call(argc, argv, cont)
+    int argc;
+    VALUE *argv;
+    VALUE cont;
+{
+    rb_thread_t th = rb_thread_check(cont);
+
+    if (th->thread != curr_thread->thread) {
+	rb_raise(rb_eRuntimeError, "continuation called across threads");
+    }
+    if (th->thgroup != cont_protect) {
+	rb_raise(rb_eRuntimeError, "continuation called across trap");
+    }
+    switch (argc) {
+      case 0:
+	th->result = Qnil;
+	break;
+      case 1:
+	th->result = argv[0];
+	break;
+      default:
+	th->result = rb_ary_new4(argc, argv);
+	break;
+    }
+
+    rb_thread_restore_context(th, RESTORE_NORMAL);
+    return Qnil;
+}
+
+struct thgroup {
+    int enclosed;
+    VALUE group;
+};
+
+
+/*
+ * Document-class: ThreadGroup
+ *
+ *  <code>ThreadGroup</code> provides a means of keeping track of a number of
+ *  threads as a group. A <code>Thread</code> can belong to only one
+ *  <code>ThreadGroup</code> at a time; adding a thread to a new group will
+ *  remove it from any previous group.
+ *     
+ *  Newly created threads belong to the same group as the thread from which they
+ *  were created.
+ */
+
+static VALUE thgroup_s_alloc _((VALUE));
+static VALUE
+thgroup_s_alloc(klass)
+    VALUE klass;
+{
+    VALUE group;
+    struct thgroup *data;
+
+    group = Data_Make_Struct(klass, struct thgroup, 0, free, data);
+    data->enclosed = 0;
+    data->group = group;
+
+    return group;
+}
+
+
+/*
+ *  call-seq:
+ *     thgrp.list   => array
+ *  
+ *  Returns an array of all existing <code>Thread</code> objects that belong to
+ *  this group.
+ *     
+ *     ThreadGroup::Default.list   #=> [#<Thread:0x401bdf4c run>]
+ */
+
+static VALUE
+thgroup_list(group)
+    VALUE group;
+{
+    struct thgroup *data;
+    rb_thread_t th;
+    VALUE ary;
+
+    Data_Get_Struct(group, struct thgroup, data);
+    ary = rb_ary_new();
+
+    FOREACH_THREAD(th) {
+	if (th->thgroup == data->group) {
+	    rb_ary_push(ary, th->thread);
+	}
+    }
+    END_FOREACH(th);
+
+    return ary;
+}
+
+
+/*
+ *  call-seq:
+ *     thgrp.enclose   => thgrp
+ *  
+ *  Prevents threads from being added to or removed from the receiving
+ *  <code>ThreadGroup</code>. New threads can still be started in an enclosed
+ *  <code>ThreadGroup</code>.
+ *     
+ *     ThreadGroup::Default.enclose        #=> #<ThreadGroup:0x4029d914>
+ *     thr = Thread::new { Thread.stop }   #=> #<Thread:0x402a7210 sleep>
+ *     tg = ThreadGroup::new               #=> #<ThreadGroup:0x402752d4>
+ *     tg.add thr
+ *
+ *  <em>produces:</em>
+ *
+ *     ThreadError: can't move from the enclosed thread group
+ */
+
+static VALUE
+thgroup_enclose(group)
+    VALUE group;
+{
+    struct thgroup *data;
+
+    Data_Get_Struct(group, struct thgroup, data);
+    data->enclosed = 1;
+
+    return group;
+}
+
+
+/*
+ *  call-seq:
+ *     thgrp.enclosed?   => true or false
+ *  
+ *  Returns <code>true</code> if <em>thgrp</em> is enclosed. See also
+ *  ThreadGroup#enclose.
+ */
+
+static VALUE
+thgroup_enclosed_p(group)
+    VALUE group;
+{
+    struct thgroup *data;
+
+    Data_Get_Struct(group, struct thgroup, data);
+    if (data->enclosed) return Qtrue;
+    return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     thgrp.add(thread)   => thgrp
+ *  
+ *  Adds the given <em>thread</em> to this group, removing it from any other
+ *  group to which it may have previously belonged.
+ *     
+ *     puts "Initial group is #{ThreadGroup::Default.list}"
+ *     tg = ThreadGroup.new
+ *     t1 = Thread.new { sleep }
+ *     t2 = Thread.new { sleep }
+ *     puts "t1 is #{t1}"
+ *     puts "t2 is #{t2}"
+ *     tg.add(t1)
+ *     puts "Initial group now #{ThreadGroup::Default.list}"
+ *     puts "tg group now #{tg.list}"
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Initial group is #<Thread:0x401bdf4c>
+ *     t1 is #<Thread:0x401b3c90>
+ *     t2 is #<Thread:0x401b3c18>
+ *     Initial group now #<Thread:0x401b3c18>#<Thread:0x401bdf4c>
+ *     tg group now #<Thread:0x401b3c90>
+ */
+
+static VALUE
+thgroup_add(group, thread)
+    VALUE group, thread;
+{
+    rb_thread_t th;
+    struct thgroup *data;
+
+    rb_secure(4);
+    th = rb_thread_check(thread);
+    if (!th->next || !th->prev) {
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
+		 rb_obj_classname(thread));
+    }
+
+    if (OBJ_FROZEN(group)) {
+      rb_raise(rb_eThreadError, "can't move to the frozen thread group");
+    }
+    Data_Get_Struct(group, struct thgroup, data);
+    if (data->enclosed) {
+	rb_raise(rb_eThreadError, "can't move to the enclosed thread group");
+    }
+
+    if (!th->thgroup) {
+	return Qnil;
+    }
+    if (OBJ_FROZEN(th->thgroup)) {
+	rb_raise(rb_eThreadError, "can't move from the frozen thread group");
+    }
+    Data_Get_Struct(th->thgroup, struct thgroup, data);
+    if (data->enclosed) {
+	rb_raise(rb_eThreadError, "can't move from the enclosed thread group");
+    }
+
+    th->thgroup = group;
+    return group;
+}
+
+
+/*
+ *  +Thread+ encapsulates the behavior of a thread of
+ *  execution, including the main thread of the Ruby script.
+ *     
+ *  In the descriptions of the methods in this class, the parameter _sym_
+ *  refers to a symbol, which is either a quoted string or a 
+ *  +Symbol+ (such as <code>:name</code>).
+ */
+
+void
+Init_Thread()
+{
+    VALUE cThGroup;
+
+    rb_eThreadError = rb_define_class("ThreadError", rb_eStandardError);
+    rb_cThread = rb_define_class("Thread", rb_cObject);
+    rb_undef_alloc_func(rb_cThread);
+
+    rb_define_singleton_method(rb_cThread, "new", rb_thread_s_new, -1);
+    rb_define_method(rb_cThread, "initialize", rb_thread_initialize, -2);
+    rb_define_singleton_method(rb_cThread, "start", rb_thread_start, -2);
+    rb_define_singleton_method(rb_cThread, "fork", rb_thread_start, -2);
+
+    rb_define_singleton_method(rb_cThread, "stop", rb_thread_stop, 0);
+    rb_define_singleton_method(rb_cThread, "kill", rb_thread_s_kill, 1);
+    rb_define_singleton_method(rb_cThread, "exit", rb_thread_exit, 0);
+    rb_define_singleton_method(rb_cThread, "pass", rb_thread_pass, 0);
+    rb_define_singleton_method(rb_cThread, "current", rb_thread_current, 0);
+    rb_define_singleton_method(rb_cThread, "main", rb_thread_main, 0);
+    rb_define_singleton_method(rb_cThread, "list", rb_thread_list, 0);
+
+    rb_define_singleton_method(rb_cThread, "critical", rb_thread_critical_get, 0);
+    rb_define_singleton_method(rb_cThread, "critical=", rb_thread_critical_set, 1);
+
+    rb_define_singleton_method(rb_cThread, "abort_on_exception", rb_thread_s_abort_exc, 0);
+    rb_define_singleton_method(rb_cThread, "abort_on_exception=", rb_thread_s_abort_exc_set, 1);
+
+    rb_define_method(rb_cThread, "run", rb_thread_run, 0);
+    rb_define_method(rb_cThread, "wakeup", rb_thread_wakeup, 0);
+    rb_define_method(rb_cThread, "kill", rb_thread_kill, 0);
+    rb_define_method(rb_cThread, "terminate", rb_thread_kill, 0);
+    rb_define_method(rb_cThread, "exit", rb_thread_kill, 0);
+    rb_define_method(rb_cThread, "kill!", rb_thread_kill_bang, 0);
+    rb_define_method(rb_cThread, "terminate!", rb_thread_kill_bang, 0);
+    rb_define_method(rb_cThread, "exit!", rb_thread_kill_bang, 0);
+    rb_define_method(rb_cThread, "value", rb_thread_value, 0);
+    rb_define_method(rb_cThread, "status", rb_thread_status_name, 0);
+    rb_define_method(rb_cThread, "join", rb_thread_join_m, -1);
+    rb_define_method(rb_cThread, "alive?", rb_thread_alive_p, 0);
+    rb_define_method(rb_cThread, "stop?", rb_thread_stop_p, 0);
+    rb_define_method(rb_cThread, "raise", rb_thread_raise_m, -1);
+
+    rb_define_method(rb_cThread, "abort_on_exception", rb_thread_abort_exc, 0);
+    rb_define_method(rb_cThread, "abort_on_exception=", rb_thread_abort_exc_set, 1);
+
+    rb_define_method(rb_cThread, "priority", rb_thread_priority, 0);
+    rb_define_method(rb_cThread, "priority=", rb_thread_priority_set, 1);
+    rb_define_method(rb_cThread, "safe_level", rb_thread_safe_level, 0);
+    rb_define_method(rb_cThread, "group", rb_thread_group, 0);
+
+    rb_define_method(rb_cThread, "[]", rb_thread_aref, 1);
+    rb_define_method(rb_cThread, "[]=", rb_thread_aset, 2);
+    rb_define_method(rb_cThread, "key?", rb_thread_key_p, 1);
+    rb_define_method(rb_cThread, "keys", rb_thread_keys, 0);
+
+    rb_define_method(rb_cThread, "inspect", rb_thread_inspect, 0);
+
+    rb_cCont = rb_define_class("Continuation", rb_cObject);
+    rb_undef_alloc_func(rb_cCont);
+    rb_undef_method(CLASS_OF(rb_cCont), "new");
+    rb_define_method(rb_cCont, "call", rb_cont_call, -1);
+    rb_define_method(rb_cCont, "[]", rb_cont_call, -1);
+    rb_define_global_function("callcc", rb_callcc, 0);
+    rb_global_variable(&cont_protect);
+
+    cThGroup = rb_define_class("ThreadGroup", rb_cObject);
+    rb_define_alloc_func(cThGroup, thgroup_s_alloc);
+    rb_define_method(cThGroup, "list", thgroup_list, 0);
+    rb_define_method(cThGroup, "enclose", thgroup_enclose, 0);
+    rb_define_method(cThGroup, "enclosed?", thgroup_enclosed_p, 0);
+    rb_define_method(cThGroup, "add", thgroup_add, 1);
+    rb_global_variable(&thgroup_default);
+    thgroup_default = rb_obj_alloc(cThGroup);
+    rb_define_const(cThGroup, "Default", thgroup_default);
+
+    /* allocate main thread */
+    main_thread = rb_thread_alloc(rb_cThread);
+    curr_thread = main_thread->prev = main_thread->next = main_thread;
+}
+
+/*
+ *  call-seq:
+ *     catch(symbol) {| | block }  > obj
+ *  
+ *  +catch+ executes its block. If a +throw+ is
+ *  executed, Ruby searches up its stack for a +catch+ block
+ *  with a tag corresponding to the +throw+'s
+ *  _symbol_. If found, that block is terminated, and
+ *  +catch+ returns the value given to +throw+. If
+ *  +throw+ is not called, the block terminates normally, and
+ *  the value of +catch+ is the value of the last expression
+ *  evaluated. +catch+ expressions may be nested, and the
+ *  +throw+ call need not be in lexical scope.
+ *     
+ *     def routine(n)
+ *       puts n
+ *       throw :done if n <= 0
+ *       routine(n-1)
+ *     end
+ *     
+ *     
+ *     catch(:done) { routine(3) }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     3
+ *     2
+ *     1
+ *     0
+ */
+
+static VALUE
+rb_f_catch(dmy, tag)
+    VALUE dmy, tag;
+{
+    int state;
+    VALUE val = Qnil;		/* OK */
+
+    tag = ID2SYM(rb_to_id(tag));
+    PUSH_TAG(tag);
+    if ((state = EXEC_TAG()) == 0) {
+	val = rb_yield_0(tag, 0, 0, 0, Qfalse);
+    }
+    else if (state == TAG_THROW && tag == prot_tag->dst) {
+	val = prot_tag->retval;
+	state = 0;
+    }
+    POP_TAG();
+    if (state) JUMP_TAG(state);
+
+    return val;
+}
+
+static VALUE
+catch_i(tag)
+    VALUE tag;
+{
+    return rb_funcall(Qnil, rb_intern("catch"), 1, tag);
+}
+
+VALUE
+rb_catch(tag, func, data)
+    const char *tag;
+    VALUE (*func)();
+    VALUE data;
+{
+    return rb_iterate((VALUE(*)_((VALUE)))catch_i, ID2SYM(rb_intern(tag)), func, data);
+}
+
+/*
+ *  call-seq:
+ *     throw(symbol [, obj])
+ *  
+ *  Transfers control to the end of the active +catch+ block
+ *  waiting for _symbol_. Raises +NameError+ if there
+ *  is no +catch+ block for the symbol. The optional second
+ *  parameter supplies a return value for the +catch+ block,
+ *  which otherwise defaults to +nil+. For examples, see
+ *  <code>Kernel::catch</code>.
+ */
+
+static VALUE
+rb_f_throw(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE tag, value;
+    struct tag *tt = prot_tag;
+
+    rb_scan_args(argc, argv, "11", &tag, &value);
+    tag = ID2SYM(rb_to_id(tag));
+
+    while (tt) {
+	if (tt->tag == tag) {
+	    tt->dst = tag;
+	    tt->retval = value;
+	    break;
+	}
+	if (tt->tag == PROT_THREAD) {
+	    rb_raise(rb_eThreadError, "uncaught throw `%s' in thread 0x%lx",
+		     rb_id2name(SYM2ID(tag)),
+		     curr_thread);
+	}
+	tt = tt->prev;
+    }
+    if (!tt) {
+	rb_name_error(SYM2ID(tag), "uncaught throw `%s'", rb_id2name(SYM2ID(tag)));
+    }
+    rb_trap_restore_mask();
+    JUMP_TAG(TAG_THROW);
+#ifndef __GNUC__
+    return Qnil; 		/* not reached */
+#endif
+}
+
+void
+rb_throw(tag, val)
+    const char *tag;
+    VALUE val;
+{
+    VALUE argv[2];
+
+    argv[0] = ID2SYM(rb_intern(tag));
+    argv[1] = val;
+    rb_f_throw(2, argv);
+}
diff --git a/ruby_1_8_6/ext/.cvsignore b/ruby_1_8_6/ext/.cvsignore
new file mode 100644
index 0000000000..ab2424ff7a
--- /dev/null
+++ b/ruby_1_8_6/ext/.cvsignore
@@ -0,0 +1,2 @@
+extinit.c
+*.log
diff --git a/ruby_1_8_6/ext/.document b/ruby_1_8_6/ext/.document
new file mode 100644
index 0000000000..ba8182593e
--- /dev/null
+++ b/ruby_1_8_6/ext/.document
@@ -0,0 +1,11 @@
+# Add files to this as they become documented
+
+enumerator/enumerator.c
+iconv/iconv.c
+nkf/lib/kconv.rb
+nkf/nkf.c
+socket/socket.c
+stringio/stringio.c
+strscan/strscan.c
+win32ole
+zlib/zlib.c
diff --git a/ruby_1_8_6/ext/Setup b/ruby_1_8_6/ext/Setup
new file mode 100644
index 0000000000..d0d6317a5e
--- /dev/null
+++ b/ruby_1_8_6/ext/Setup
@@ -0,0 +1,34 @@
+#option nodynamic
+
+#Win32API
+#bigdecimal
+#curses
+#dbm
+#digest
+#digest/md5
+#digest/rmd160
+#digest/sha1
+#digest/sha2
+#dl
+#enumerator
+#etc
+#fcntl
+#gdbm
+#iconv
+#io/wait
+#nkf
+#pty
+#openssl
+#racc/cparse
+#readline
+#sdbm
+#socket
+#stringio
+#strscan
+#syck
+#syslog
+#tcltklib
+#thread
+#tk
+#win32ole
+#zlib
diff --git a/ruby_1_8_6/ext/Setup.atheos b/ruby_1_8_6/ext/Setup.atheos
new file mode 100644
index 0000000000..6bda3a4cfb
--- /dev/null
+++ b/ruby_1_8_6/ext/Setup.atheos
@@ -0,0 +1,34 @@
+option nodynamic
+
+#Win32API
+bigdecimal
+curses
+dbm
+digest
+digest/md5
+digest/rmd160
+digest/sha1
+digest/sha2
+dl
+enumerator
+etc
+fcntl
+gdbm
+iconv
+io/wait
+nkf
+pty
+#openssl
+racc/parse
+readline
+sdbm
+socket
+stringio
+strscan
+syck
+syslog
+#tcltklib
+thread
+#tk
+#win32ole
+zlib
diff --git a/ruby_1_8_6/ext/Setup.dj b/ruby_1_8_6/ext/Setup.dj
new file mode 100644
index 0000000000..4f94788886
--- /dev/null
+++ b/ruby_1_8_6/ext/Setup.dj
@@ -0,0 +1,34 @@
+option nodynamic
+
+#Win32API
+bigdecimal
+curses
+dbm
+digest
+digest/md5
+digest/rmd160
+digest/sha1
+digest/sha2
+#dl
+etc
+enumerator
+fcntl
+gdbm
+#iconv
+#io/wait
+nkf
+#pty
+#openssl
+racc/cparse
+readline
+sdbm
+#socket
+stringio
+strscan
+syck
+#syslog
+#tcltklib
+thread
+#tk
+#win32ole
+zlib
diff --git a/ruby_1_8_6/ext/Setup.emx b/ruby_1_8_6/ext/Setup.emx
new file mode 100644
index 0000000000..afc5923577
--- /dev/null
+++ b/ruby_1_8_6/ext/Setup.emx
@@ -0,0 +1,34 @@
+option nodynamic
+
+#Win32API
+bigdecimal
+curses
+#dbm
+digest
+digest/md5
+digest/rmd160
+digest/sha1
+digest/sha2
+#dl
+enumerator
+etc
+fcntl
+#gdbm
+#iconv
+#io/wait
+nkf
+#pty
+#openssl
+racc/cparse
+#readline
+#sdbm
+socket
+stringio
+strscan
+#syck
+#syslog
+#tcltklib
+thread
+#tk
+#win32ole
+#zlib
diff --git a/ruby_1_8_6/ext/Setup.nt b/ruby_1_8_6/ext/Setup.nt
new file mode 100644
index 0000000000..9f8abf9b8d
--- /dev/null
+++ b/ruby_1_8_6/ext/Setup.nt
@@ -0,0 +1,34 @@
+#option nodynamic
+
+Win32API
+bigdecimal
+#curses
+#dbm
+digest
+digest/md5
+digest/rmd160
+digest/sha1
+digest/sha2
+dl
+enumerator
+etc
+fcntl
+#gdbm
+#iconv
+#io/wait
+nkf
+#pty
+#openssl
+racc/cparse
+#readline
+sdbm
+socket
+stringio
+strscan
+syck
+#syslog
+#tcltklib
+thread
+#tk
+win32ole
+#zlib
diff --git a/ruby_1_8_6/ext/Setup.x68 b/ruby_1_8_6/ext/Setup.x68
new file mode 100644
index 0000000000..0966e737e9
--- /dev/null
+++ b/ruby_1_8_6/ext/Setup.x68
@@ -0,0 +1,34 @@
+option nodynamic
+
+#Win32API
+bigdecimal
+#curses
+dbm
+digest
+digest/md5
+digest/rmd160
+digest/sha1
+digest/sha2
+#dl
+#etc
+enumerator
+fcntl
+#gdbm
+#iconv
+#io/wait
+nkf
+#pty
+#openssl
+racc/cparse
+#readline
+#sdbm
+#socket
+stringio
+strscan
+#syck
+#syslog
+#tcltklib
+thread
+#tk
+#win32ole
+#zlib
diff --git a/ruby_1_8_6/ext/Win32API/.cvsignore b/ruby_1_8_6/ext/Win32API/.cvsignore
new file mode 100644
index 0000000000..90c83ed9b1
--- /dev/null
+++ b/ruby_1_8_6/ext/Win32API/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+*.log
+*.def
diff --git a/ruby_1_8_6/ext/Win32API/Win32API.c b/ruby_1_8_6/ext/Win32API/Win32API.c
new file mode 100644
index 0000000000..a4fd0396f0
--- /dev/null
+++ b/ruby_1_8_6/ext/Win32API/Win32API.c
@@ -0,0 +1,215 @@
+/*
+  Win32API - Ruby Win32 API Import Facility
+*/
+
+#if !defined _MSC_VER && !defined _WIN32
+#define  WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <stdio.h>
+#endif
+
+#define _T_VOID     0
+#define _T_NUMBER   1
+#define _T_POINTER  2
+#define _T_INTEGER  3
+
+#include "ruby.h"
+
+typedef struct {
+    HANDLE dll;
+    HANDLE proc;
+    VALUE dllname;
+    VALUE import;
+    VALUE export;
+} Win32API;
+
+static void
+Win32API_FreeLibrary(hdll)
+    HINSTANCE hdll;
+{
+    FreeLibrary(hdll);
+}
+
+static VALUE
+Win32API_initialize(self, dllname, proc, import, export)
+    VALUE self;
+    VALUE dllname;
+    VALUE proc;
+    VALUE import;
+    VALUE export;
+{
+    HANDLE hproc;
+    HINSTANCE hdll;
+    VALUE str;
+    VALUE a_import;
+    VALUE *ptr;
+    char *s;
+    int i;
+    int len;
+    int ex = _T_VOID;
+
+    SafeStringValue(dllname);
+    SafeStringValue(proc);
+    hdll = LoadLibrary(RSTRING(dllname)->ptr);
+    if (!hdll)
+	rb_raise(rb_eRuntimeError, "LoadLibrary: %s\n", RSTRING(dllname)->ptr);
+    rb_iv_set(self, "__hdll__", Data_Wrap_Struct(rb_cData, 0, Win32API_FreeLibrary, (void*)hdll));
+    hproc = (HANDLE)GetProcAddress(hdll, RSTRING(proc)->ptr);
+    if (!hproc) {
+	str = rb_str_new3(proc);
+	str = rb_str_cat(str, "A", 1);
+	hproc = (HANDLE)GetProcAddress(hdll, RSTRING(str)->ptr);
+	if (!hproc)
+	    rb_raise(rb_eRuntimeError, "GetProcAddress: %s or %s\n",
+		RSTRING(proc)->ptr, RSTRING(str)->ptr);
+    }
+    rb_iv_set(self, "__dll__", UINT2NUM((unsigned long)hdll));
+    rb_iv_set(self, "__dllname__", dllname);
+    rb_iv_set(self, "__proc__", UINT2NUM((unsigned long)hproc));
+
+    a_import = rb_ary_new();
+    switch (TYPE(import)) {
+    case T_NIL:
+	break;
+    case T_ARRAY:
+	ptr = RARRAY(import)->ptr;
+	for (i = 0, len = RARRAY(import)->len; i < len; i++) {
+	    SafeStringValue(ptr[i]);
+	    switch (*(char *)RSTRING(ptr[i])->ptr) {
+	    case 'N': case 'n': case 'L': case 'l':
+		rb_ary_push(a_import, INT2FIX(_T_NUMBER));
+		break;
+	    case 'P': case 'p':
+		rb_ary_push(a_import, INT2FIX(_T_POINTER));
+		break;
+	    case 'I': case 'i':
+		rb_ary_push(a_import, INT2FIX(_T_INTEGER));
+		break;
+	    }
+	}
+        break;
+    default:
+	SafeStringValue(import);
+	s = RSTRING(import)->ptr;
+	for (i = 0, len = RSTRING(import)->len; i < len; i++) {
+	    switch (*s++) {
+	    case 'N': case 'n': case 'L': case 'l':
+		rb_ary_push(a_import, INT2FIX(_T_NUMBER));
+		break;
+	    case 'P': case 'p':
+		rb_ary_push(a_import, INT2FIX(_T_POINTER));
+		break;
+	    case 'I': case 'i':
+		rb_ary_push(a_import, INT2FIX(_T_INTEGER));
+		break;
+	    }
+	}
+        break;
+    }
+
+    if (16 < RARRAY(a_import)->len) {
+	rb_raise(rb_eRuntimeError, "too many parameters: %ld\n", RARRAY(a_import)->len);
+    }
+
+    rb_iv_set(self, "__import__", a_import);
+
+    if (NIL_P(export)) {
+	ex = _T_VOID;
+    } else {
+	SafeStringValue(export);
+	switch (*RSTRING(export)->ptr) {
+        case 'V': case 'v':
+	    ex = _T_VOID;
+	    break;
+	case 'N': case 'n': case 'L': case 'l':
+	    ex = _T_NUMBER;
+	    break;
+	case 'P': case 'p':
+	    ex = _T_POINTER;
+	    break;
+	case 'I': case 'i':
+	    ex = _T_INTEGER;
+	    break;
+	}
+    }
+    rb_iv_set(self, "__export__", INT2FIX(ex));
+
+    return Qnil;
+}
+
+#ifdef _MSC_VER
+#pragma optimize("g", off)
+#endif
+static VALUE
+Win32API_Call(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE args;
+    unsigned long ret;
+    int i;
+    struct {
+	unsigned long params[16];
+    } param;
+#define params param.params
+
+    VALUE obj_proc = rb_iv_get(obj, "__proc__");
+    VALUE obj_import = rb_iv_get(obj, "__import__");
+    VALUE obj_export = rb_iv_get(obj, "__export__");
+    FARPROC ApiFunction = (FARPROC)NUM2ULONG(obj_proc);
+    int items = rb_scan_args(argc, argv, "0*", &args);
+    int nimport = RARRAY(obj_import)->len;
+
+
+    if (items != nimport)
+	rb_raise(rb_eRuntimeError, "wrong number of parameters: expected %d, got %d",
+	    nimport, items);
+
+    for (i = 0; i < nimport; i++) {
+	unsigned long lParam = 0;
+	switch (FIX2INT(rb_ary_entry(obj_import, i))) {
+	    VALUE str;
+	case _T_NUMBER:
+	case _T_INTEGER:
+	default:
+	    lParam = NUM2ULONG(rb_ary_entry(args, i));
+	    break;
+	case _T_POINTER:
+	    str = rb_ary_entry(args, i);
+	    if (NIL_P(str)) {
+		lParam = 0;
+	    } else if (FIXNUM_P(str)) {
+		lParam = NUM2ULONG(str);
+	    } else {
+		StringValue(str);
+		rb_str_modify(str);
+		lParam = (unsigned long)StringValuePtr(str);
+	    }
+	    break;
+	}
+	params[i] = lParam;
+    }
+
+    ret = ApiFunction(param);
+
+    switch (FIX2INT(obj_export)) {
+    case _T_NUMBER:
+    case _T_INTEGER:
+	return INT2NUM(ret);
+    case _T_POINTER:
+	return rb_str_new2((char *)ret);
+    case _T_VOID:
+    default:
+	return INT2NUM(0);
+    }
+}
+
+void
+Init_Win32API()
+{
+    VALUE cWin32API = rb_define_class("Win32API", rb_cObject);
+    rb_define_method(cWin32API, "initialize", Win32API_initialize, 4);
+    rb_define_method(cWin32API, "call", Win32API_Call, -1);
+    rb_define_alias(cWin32API,  "Call", "call");
+}
diff --git a/ruby_1_8_6/ext/Win32API/depend b/ruby_1_8_6/ext/Win32API/depend
new file mode 100644
index 0000000000..b224bb66c9
--- /dev/null
+++ b/ruby_1_8_6/ext/Win32API/depend
@@ -0,0 +1 @@
+Win32API.o : Win32API.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ruby_1_8_6/ext/Win32API/extconf.rb b/ruby_1_8_6/ext/Win32API/extconf.rb
new file mode 100644
index 0000000000..865788556f
--- /dev/null
+++ b/ruby_1_8_6/ext/Win32API/extconf.rb
@@ -0,0 +1,6 @@
+require 'mkmf'
+
+dir_config("win32")
+if have_header("windows.h") and have_library("kernel32")
+  create_makefile("Win32API")
+end
diff --git a/ruby_1_8_6/ext/Win32API/getch.rb b/ruby_1_8_6/ext/Win32API/getch.rb
new file mode 100644
index 0000000000..c015bbe9bc
--- /dev/null
+++ b/ruby_1_8_6/ext/Win32API/getch.rb
@@ -0,0 +1,5 @@
+require 'Win32API'
+
+getch = Win32API.new("crtdll", "_getch", [], 'L')
+
+puts getch.Call.chr
diff --git a/ruby_1_8_6/ext/Win32API/lib/win32/registry.rb b/ruby_1_8_6/ext/Win32API/lib/win32/registry.rb
new file mode 100644
index 0000000000..2671551a33
--- /dev/null
+++ b/ruby_1_8_6/ext/Win32API/lib/win32/registry.rb
@@ -0,0 +1,831 @@
+=begin
+= Win32 Registry I/F
+win32/registry is registry accessor library for Win32 platform.
+It uses Win32API to call Win32 Registry APIs.
+
+== example
+  Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\foo') do |reg|
+    value = reg['foo']                               # read a value
+    value = reg['foo', Win32::Registry::REG_SZ]      # read a value with type
+    type, value = reg.read('foo')                    # read a value
+    reg['foo'] = 'bar'                               # write a value
+    reg['foo', Win32::Registry::REG_SZ] = 'bar'      # write a value with type
+    reg.write('foo', Win32::Registry::REG_SZ, 'bar') # write a value
+    
+    reg.each_value { |name, type, data| ... }        # Enumerate values
+    reg.each_key { |key, wtime| ... }                # Enumerate subkeys
+    
+    reg.delete_value(name)                         # Delete a value
+    reg.delete_key(name)                           # Delete a subkey
+    reg.delete_key(name, true)                     # Delete a subkey recursively
+  end
+
+= Reference
+
+== Win32::Registry class
+
+=== including modules
+
+* Enumerable
+* Registry::Constants
+
+=== class methods
+--- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
+--- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) { |reg| ... }
+    Open the registry key ((|subkey|)) under ((|key|)).
+    ((|key|)) is Win32::Registry object of parent key.
+    You can use predefined key HKEY_* (see ((<constants>)))
+    
+    ((|desired|)) and ((|opt|)) is access mask and key option.
+    For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp>)).
+    
+    If block is given, the key is closed automatically.
+
+--- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
+--- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) { |reg| ... }
+    Create or open the registry key ((|subkey|)) under ((|key|)).
+    You can use predefined key HKEY_* (see ((<constants>)))
+    
+    If subkey is already exists, key is opened and Registry#((<created?>))
+    method will return false.
+    
+    If block is given, the key is closed automatically.
+
+--- Registry.expand_environ(str)
+    Replace (({%\w+%})) into the environment value of ((|str|)).
+    This method is used for REG_EXPAND_SZ.
+    
+    For detail, see ((<ExpandEnvironmentStrings|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp>)) Win32 API.
+
+--- Registry.type2name(type)
+    Convert registry type value to readable string.
+
+--- Registry.wtime2time(wtime)
+    Convert 64-bit FILETIME integer into Time object.
+
+--- Registry.time2wtime(time)
+    Convert Time object or Integer object into 64-bit FILETIME.
+
+=== instance methods
+--- open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
+    Same as (({Win32::((<Registry.open>))(self, subkey, desired, opt)}))
+
+--- create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
+    Same as (({Win32::((<Registry.create>))(self, subkey, desired, opt)}))
+
+--- close
+    Close key.
+    
+    After closed, most method raises error.
+
+--- read(name, *rtype)
+    Read a registry value named ((|name|)) and return array of
+    [ ((|type|)), ((|data|)) ].
+    When name is nil, the `default' value is read.
+    
+    ((|type|)) is value type. (see ((<Win32::Registry::Constants module>)))
+    ((|data|)) is value data, its class is:
+    :REG_SZ, REG_EXPAND_SZ
+       String
+    :REG_MULTI_SZ
+       Array of String
+    :REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD
+       Integer
+    :REG_BINARY
+       String (contains binary data)
+    
+    When ((|rtype|)) is specified, the value type must be included by
+    ((|rtype|)) array, or TypeError is raised.
+
+--- self[name, *rtype]
+    Read a registry value named ((|name|)) and return its value data.
+    The class of value is same as ((<read>)) method returns.
+    
+    If the value type is REG_EXPAND_SZ, returns value data whose environment
+    variables are replaced.
+    If the value type is neither REG_SZ, REG_MULTI_SZ, REG_DWORD,
+    REG_DWORD_BIG_ENDIAN, nor REG_QWORD, TypeError is raised.
+    
+    The meaning of ((|rtype|)) is same as ((<read>)) method.
+
+--- read_s(name)
+--- read_i(name)
+--- read_bin(name)
+    Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
+    registry value named ((|name|)).
+    
+    If the values type does not match, TypeError is raised.
+
+--- read_s_expand(name)
+    Read a REG_SZ or REG_EXPAND_SZ registry value named ((|name|)).
+    
+    If the value type is REG_EXPAND_SZ, environment variables are replaced.
+    Unless the value type is REG_SZ or REG_EXPAND_SZ, TypeError is raised.
+
+--- write(name, type, data)
+    Write ((|data|)) to a registry value named ((|name|)).
+    When name is nil, write to the `default' value.
+    
+    ((|type|)) is type value. (see ((<Registry::Constants module>)))
+    Class of ((|data|)) must be same as which ((<read>))
+    method returns.
+
+--- self[name, wtype = nil] = value
+    Write ((|value|)) to a registry value named ((|name|)).
+    
+    If ((|wtype|)) is specified, the value type is it.
+    Otherwise, the value type is depend on class of ((|value|)):
+    :Integer
+      REG_DWORD
+    :String
+      REG_SZ
+    :Array
+      REG_MULTI_SZ
+
+--- write_s(name, value)
+--- write_i(name, value)
+--- write_bin(name, value)
+    Write ((|value|)) to a registry value named ((|name|)).
+    
+    The value type is REG_SZ(write_s), REG_DWORD(write_i), or
+    REG_BINARY(write_bin).
+
+--- each { |name, type, value| ... }
+--- each_value { |name, type, value| ... }
+    Enumerate values.
+
+--- each_key { |subkey, wtime| ... }
+    Enumerate subkeys.
+    
+    ((|subkey|)) is String which contains name of subkey.
+    ((|wtime|)) is last write time as FILETIME (64-bit integer).
+    (see ((<Registry.wtime2time>)))
+
+--- delete(name)
+--- delete_value(name)
+    Delete a registry value named ((|name|)).
+    We can not delete the `default' value.
+
+--- delete_key(name, recursive = false)
+    Delete a subkey named ((|name|)) and all its values.
+    
+    If ((|recursive|)) is false, the subkey must not have subkeys.
+    Otherwise, this method deletes all subkeys and values recursively.
+
+--- flush
+    Write all the attributes into the registry file.
+
+--- created?
+    Returns if key is created ((*newly*)).
+    (see ((<Registry.create>)))
+
+--- open?
+    Returns if key is not closed.
+
+--- hkey
+    Returns key handle value.
+
+--- parent
+    Win32::Registry object of parent key, or nil if predefeined key.
+
+--- keyname
+    Same as ((|subkey|)) value of ((<Registry.open>)) or
+    ((<Registry.create>)) method.
+
+--- disposition
+    Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
+
+--- name
+--- to_s
+    Full path of key such as (({'HKEY_CURRENT_USER\SOFTWARE\foo\bar'})).
+
+--- info
+    Returns key information as Array of:
+    :num_keys
+      The number of subkeys.
+    :max_key_length
+      Maximum length of name of subkeys.
+    :num_values
+      The number of values.
+    :max_value_name_length
+      Maximum length of name of values.
+    :max_value_length
+      Maximum length of value of values.
+    :descriptor_length
+      Length of security descriptor.
+    :wtime
+      Last write time as FILETIME(64-bit integer)
+    
+    For detail, see ((<RegQueryInfoKey|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp>)) Win32 API.
+
+--- num_keys
+--- max_key_length
+--- num_values
+--- max_value_name_length
+--- max_value_length
+--- descriptor_length
+--- wtime
+    Returns an item of key information.
+
+=== constants
+--- HKEY_CLASSES_ROOT
+--- HKEY_CURRENT_USER
+--- HKEY_LOCAL_MACHINE
+--- HKEY_PERFORMANCE_DATA
+--- HKEY_CURRENT_CONFIG
+--- HKEY_DYN_DATA
+    Win32::Registry object whose key is predefined key.
+    For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/predefined_keys.asp>)).
+
+== Win32::Registry::Constants module
+
+For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/registry.asp>)).
+
+--- HKEY_*
+    Predefined key ((*handle*)).
+    These are Integer, not Win32::Registry.
+
+--- REG_*
+    Registry value type.
+
+--- KEY_*
+    Security access mask.
+
+--- KEY_OPTIONS_*
+    Key options.
+
+--- REG_CREATED_NEW_KEY
+--- REG_OPENED_EXISTING_KEY
+    If the key is created newly or opened existing key.
+    See also Registry#((<disposition>)) method.
+
+=end
+
+require 'Win32API'
+
+module Win32
+  class Registry
+    module Constants
+      HKEY_CLASSES_ROOT = 0x80000000
+      HKEY_CURRENT_USER = 0x80000001
+      HKEY_LOCAL_MACHINE = 0x80000002
+      HKEY_USERS = 0x80000003
+      HKEY_PERFORMANCE_DATA = 0x80000004
+      HKEY_PERFORMANCE_TEXT = 0x80000050
+      HKEY_PERFORMANCE_NLSTEXT = 0x80000060
+      HKEY_CURRENT_CONFIG = 0x80000005
+      HKEY_DYN_DATA = 0x80000006
+      
+      REG_NONE = 0
+      REG_SZ = 1
+      REG_EXPAND_SZ = 2
+      REG_BINARY = 3
+      REG_DWORD = 4
+      REG_DWORD_LITTLE_ENDIAN = 4
+      REG_DWORD_BIG_ENDIAN = 5
+      REG_LINK = 6
+      REG_MULTI_SZ = 7
+      REG_RESOURCE_LIST = 8
+      REG_FULL_RESOURCE_DESCRIPTOR = 9
+      REG_RESOURCE_REQUIREMENTS_LIST = 10
+      REG_QWORD = 11
+      REG_QWORD_LITTLE_ENDIAN = 11
+      
+      STANDARD_RIGHTS_READ = 0x00020000
+      STANDARD_RIGHTS_WRITE = 0x00020000
+      KEY_QUERY_VALUE = 0x0001
+      KEY_SET_VALUE = 0x0002
+      KEY_CREATE_SUB_KEY = 0x0004
+      KEY_ENUMERATE_SUB_KEYS = 0x0008
+      KEY_NOTIFY = 0x0010
+      KEY_CREATE_LINK = 0x0020
+      KEY_READ = STANDARD_RIGHTS_READ |
+        KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
+      KEY_WRITE = STANDARD_RIGHTS_WRITE |
+        KEY_SET_VALUE | KEY_CREATE_SUB_KEY
+      KEY_EXECUTE = KEY_READ
+      KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK
+      
+      REG_OPTION_RESERVED = 0x0000
+      REG_OPTION_NON_VOLATILE = 0x0000
+      REG_OPTION_VOLATILE = 0x0001
+      REG_OPTION_CREATE_LINK = 0x0002
+      REG_OPTION_BACKUP_RESTORE = 0x0004
+      REG_OPTION_OPEN_LINK = 0x0008
+      REG_LEGAL_OPTION = REG_OPTION_RESERVED |
+        REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK |
+        REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK
+      
+      REG_CREATED_NEW_KEY = 1
+      REG_OPENED_EXISTING_KEY = 2
+      
+      REG_WHOLE_HIVE_VOLATILE = 0x0001
+      REG_REFRESH_HIVE = 0x0002
+      REG_NO_LAZY_FLUSH = 0x0004
+      REG_FORCE_RESTORE = 0x0008
+      
+      MAX_KEY_LENGTH = 514
+      MAX_VALUE_LENGTH = 32768
+    end
+    include Constants
+    include Enumerable
+    
+    #
+    # Error
+    #
+    class Error < ::StandardError
+      FormatMessageA = Win32API.new('kernel32.dll', 'FormatMessageA', 'LPLLPLP', 'L')
+      def initialize(code)
+        @code = code
+        msg = "\0" * 1024
+        len = FormatMessageA.call(0x1200, 0, code, 0, msg, 1024, 0)
+        super msg[0, len].tr("\r", '').chomp
+      end
+      attr_reader :code
+    end
+    
+    #
+    # Predefined Keys
+    #
+    class PredefinedKey < Registry
+      def initialize(hkey, keyname)
+        @hkey = hkey
+        @parent = nil
+        @keyname = keyname
+        @disposition = REG_OPENED_EXISTING_KEY
+      end
+      
+      # Predefined keys cannot be closed
+      def close
+        raise Error.new(5) ## ERROR_ACCESS_DENIED
+      end
+      
+      # Fake class for Registry#open, Registry#create
+      def class
+        Registry
+      end
+      
+      # Make all
+      Constants.constants.grep(/^HKEY_/) do |c|
+        Registry.const_set c, new(Constants.const_get(c), c)
+      end
+    end
+    
+    #
+    # Win32 APIs
+    #
+    module API
+      [
+        %w/RegOpenKeyExA    LPLLP        L/,
+        %w/RegCreateKeyExA  LPLLLLPPP    L/,
+        %w/RegEnumValueA    LLPPPPPP     L/,
+        %w/RegEnumKeyExA    LLPPLLLP     L/,
+        %w/RegQueryValueExA LPLPPP       L/,
+        %w/RegSetValueExA   LPLLPL       L/,
+        %w/RegDeleteValue   LP           L/,
+        %w/RegDeleteKey     LP           L/,
+        %w/RegFlushKey      L            L/,
+        %w/RegCloseKey      L            L/,
+        %w/RegQueryInfoKey  LPPPPPPPPPPP L/,
+      ].each do |fn|
+        const_set fn[0].intern, Win32API.new('advapi32.dll', *fn)
+      end
+      
+      module_function
+      
+      def check(result)
+        raise Error, result, caller(2) if result != 0
+      end
+      
+      def packdw(dw)
+        [dw].pack('V')
+      end
+      
+      def unpackdw(dw)
+        dw += [0].pack('V')
+        dw.unpack('V')[0]
+      end
+      
+      def packqw(qw)
+        [ qw & 0xFFFFFFFF, qw >> 32 ].pack('VV')
+      end
+      
+      def unpackqw(qw)
+        qw = qw.unpack('VV')
+        (qw[1] << 32) | qw[0]
+      end
+      
+      def OpenKey(hkey, name, opt, desired)
+        result = packdw(0)
+        check RegOpenKeyExA.call(hkey, name, opt, desired, result)
+        unpackdw(result)
+      end
+      
+      def CreateKey(hkey, name, opt, desired)
+        result = packdw(0)
+        disp = packdw(0)
+        check RegCreateKeyExA.call(hkey, name, 0, 0, opt, desired,
+                                   0, result, disp)
+        [ unpackdw(result), unpackdw(disp) ]
+      end
+      
+      def EnumValue(hkey, index)
+        name = ' ' * Constants::MAX_KEY_LENGTH
+        size = packdw(Constants::MAX_KEY_LENGTH)
+        check RegEnumValueA.call(hkey, index, name, size, 0, 0, 0, 0)
+        name[0, unpackdw(size)]
+      end
+      
+      def EnumKey(hkey, index)
+        name = ' ' * Constants::MAX_KEY_LENGTH
+        size = packdw(Constants::MAX_KEY_LENGTH)
+        wtime = ' ' * 8
+        check RegEnumKeyExA.call(hkey, index, name, size, 0, 0, 0, wtime)
+        [ name[0, unpackdw(size)], unpackqw(wtime) ]
+      end
+      
+      def QueryValue(hkey, name)
+        type = packdw(0)
+        size = packdw(0)
+        check RegQueryValueExA.call(hkey, name, 0, type, 0, size)
+        data = ' ' * unpackdw(size)
+        check RegQueryValueExA.call(hkey, name, 0, type, data, size)
+        [ unpackdw(type), data[0, unpackdw(size)] ]
+      end
+      
+      def SetValue(hkey, name, type, data, size)
+        check RegSetValueExA.call(hkey, name, 0, type, data, size)
+      end
+      
+      def DeleteValue(hkey, name)
+        check RegDeleteValue.call(hkey, name)
+      end
+      
+      def DeleteKey(hkey, name)
+        check RegDeleteKey.call(hkey, name)
+      end
+      
+      def FlushKey(hkey)
+        check RegFlushKey.call(hkey)
+      end
+      
+      def CloseKey(hkey)
+        check RegCloseKey.call(hkey)
+      end
+      
+      def QueryInfoKey(hkey)
+        subkeys = packdw(0)
+        maxsubkeylen = packdw(0)
+        values = packdw(0)
+        maxvaluenamelen = packdw(0)
+        maxvaluelen = packdw(0)
+        secdescs = packdw(0)
+        wtime = ' ' * 8
+        check RegQueryInfoKey.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
+          values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
+        [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
+          unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
+          unpackdw(secdescs), unpackqw(wtime) ]
+      end
+    end
+    
+    #
+    # utility functions
+    #
+    def self.expand_environ(str)
+      str.gsub(/%([^%]+)%/) { ENV[$1] || $& }
+    end
+    
+    @@type2name = { }
+    %w[
+      REG_NONE REG_SZ REG_EXPAND_SZ REG_BINARY REG_DWORD
+      REG_DWORD_BIG_ENDIAN REG_LINK REG_MULTI_SZ
+      REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
+      REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD
+    ].each do |type|
+      @@type2name[Constants.const_get(type)] = type
+    end
+    
+    def self.type2name(type)
+      @@type2name[type] || type.to_s
+    end
+    
+    def self.wtime2time(wtime)
+      Time.at((wtime - 116444736000000000) / 10000000)
+    end
+    
+    def self.time2wtime(time)
+      time.to_i * 10000000 + 116444736000000000
+    end
+    
+    #
+    # constructors
+    #
+    private_class_method :new
+    
+    def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
+      subkey = subkey.chomp('\\')
+      newkey = API.OpenKey(hkey.hkey, subkey, opt, desired)
+      obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
+      if block_given?
+        begin
+          yield obj
+        ensure
+          obj.close
+        end
+      else
+        obj
+      end
+    end
+    
+    def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
+      newkey, disp = API.CreateKey(hkey.hkey, subkey, opt, desired)
+      obj = new(newkey, hkey, subkey, disp)
+      if block_given?
+        begin
+          yield obj
+        ensure
+          obj.close
+        end
+      else
+        obj
+      end
+    end
+    
+    #
+    # finalizer
+    #
+    @@final = proc { |hkey| proc { API.CloseKey(hkey[0]) if hkey[0] } }
+    
+    #
+    # initialize
+    #
+    def initialize(hkey, parent, keyname, disposition)
+      @hkey = hkey
+      @parent = parent
+      @keyname = keyname
+      @disposition = disposition
+      @hkeyfinal = [ hkey ]
+      ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
+    end
+    attr_reader :hkey, :parent, :keyname, :disposition
+    
+    #
+    # attributes
+    #
+    def created?
+      @disposition == REG_CREATED_NEW_KEY
+    end
+    
+    def open?
+      !@hkey.nil?
+    end
+    
+    def name
+      parent = self
+      name = @keyname
+      while parent = parent.parent
+        name = parent.keyname + '\\' + name
+      end
+      name
+    end
+    
+    def inspect
+      "\#<Win32::Registry key=#{name.inspect}>"
+    end
+    
+    #
+    # marshalling
+    #
+    def _dump(depth)
+      raise TypeError, "can't dump Win32::Registry"
+    end
+    
+    #
+    # open/close
+    #
+    def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk)
+      self.class.open(self, subkey, desired, opt, &blk)
+    end
+    
+    def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk)
+      self.class.create(self, subkey, desired, opt, &blk)
+    end
+    
+    def close
+      API.CloseKey(@hkey)
+      @hkey = @parent = @keyname = nil
+      @hkeyfinal[0] = nil
+    end
+    
+    #
+    # iterator
+    #
+    def each_value
+      index = 0
+      while true
+        begin
+          subkey = API.EnumValue(@hkey, index)
+        rescue Error
+          break
+        end
+        begin
+          type, data = read(subkey)
+        rescue Error
+          next
+        end
+        yield subkey, type, data
+        index += 1
+      end
+      index
+    end
+    alias each each_value
+    
+    def each_key
+      index = 0
+      while true
+        begin
+          subkey, wtime = API.EnumKey(@hkey, index)
+        rescue Error
+          break
+        end
+        yield subkey, wtime
+        index += 1
+      end
+      index
+    end
+    
+    def keys
+      keys_ary = []
+      each_key { |key,| keys_ary << key }
+      keys_ary
+    end
+    
+    #
+    # reader
+    #
+    def read(name, *rtype)
+      type, data = API.QueryValue(@hkey, name)
+      unless rtype.empty? or rtype.include?(type)
+        raise TypeError, "Type mismatch (expect #{rtype.inspect} but #{type} present)"
+      end
+      case type
+      when REG_SZ, REG_EXPAND_SZ
+        [ type, data.chop ]
+      when REG_MULTI_SZ
+        [ type, data.split(/\0/) ]
+      when REG_BINARY
+        [ type, data ]
+      when REG_DWORD
+        [ type, API.unpackdw(data) ]
+      when REG_DWORD_BIG_ENDIAN
+        [ type, data.unpack('N')[0] ]
+      when REG_QWORD
+        [ type, API.unpackqw(data) ]
+      else
+        raise TypeError, "Type #{type} is not supported."
+      end
+    end
+    
+    def [](name, *rtype)
+      type, data = read(name, *rtype)
+      case type
+      when REG_SZ, REG_DWORD, REG_QWORD, REG_MULTI_SZ
+        data
+      when REG_EXPAND_SZ
+        Registry.expand_environ(data)
+      else
+        raise TypeError, "Type #{type} is not supported."
+      end
+    end
+    
+    def read_s(name)
+      read(name, REG_SZ)[1]
+    end
+    
+    def read_s_expand(name)
+      type, data = read(name, REG_SZ, REG_EXPAND_SZ)
+      if type == REG_EXPAND_SZ
+        Registry.expand_environ(data)
+      else
+        data
+      end
+    end
+    
+    def read_i(name)
+      read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1]
+    end
+    
+    def read_bin(name)
+      read(name, REG_BINARY)[1]
+    end
+    
+    #
+    # writer
+    #
+    def write(name, type, data)
+      case type
+      when REG_SZ, REG_EXPAND_SZ
+        data = data.to_s + "\0"
+      when REG_MULTI_SZ
+        data = data.to_a.join("\0") + "\0\0"
+      when REG_BINARY
+        data = data.to_s
+      when REG_DWORD
+        data = API.packdw(data.to_i)
+      when REG_DWORD_BIG_ENDIAN
+        data = [data.to_i].pack('N')
+      when REG_QWORD
+        data = API.packqw(data.to_i)
+      else
+        raise TypeError, "Unsupported type #{type}"
+      end
+      API.SetValue(@hkey, name, type, data, data.length)
+    end
+    
+    def []=(name, rtype, value = nil)
+      if value
+        write name, rtype, value
+      else
+        case value = rtype
+        when Integer
+          write name, REG_DWORD, value
+        when String
+          write name, REG_SZ, value
+        when Array
+          write name, REG_MULTI_SZ, value
+        else
+          raise TypeError, "Unexpected type #{value.class}"
+        end
+      end
+      value
+    end
+    
+    def write_s(name, value)
+      write name, REG_SZ, value.to_s
+    end
+    
+    def write_i(name, value)
+      write name, REG_DWORD, value.to_i
+    end
+    
+    def write_bin(name, value)
+      write name, REG_BINARY, value.to_s
+    end
+    
+    #
+    # delete
+    #
+    def delete_value(name)
+      API.DeleteValue(@hkey, name)
+    end
+    alias delete delete_value
+    
+    def delete_key(name, recursive = false)
+      if recursive
+        open(name, KEY_ALL_ACCESS) do |reg|
+          reg.keys.each do |key|
+            begin
+              reg.delete_key(key, true)
+            rescue Error
+              #
+            end
+          end
+        end
+        API.DeleteKey(@hkey, name)
+      else
+        begin
+          API.EnumKey @hkey, 0
+        rescue Error
+          return API.DeleteKey(@hkey, name)
+        end
+        raise Error.new(5) ## ERROR_ACCESS_DENIED
+      end
+    end
+    
+    #
+    # flush
+    #
+    def flush
+      API.FlushKey @hkey
+    end
+    
+    #
+    # key information
+    #
+    def info
+      API.QueryInfoKey(@hkey)
+    end
+    %w[
+      num_keys max_key_length
+      num_values max_value_name_length max_value_length
+      descriptor_length wtime
+    ].each_with_index do |s, i|
+      eval <<-__END__
+        def #{s}
+          info[#{i}]
+        end
+      __END__
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/Win32API/lib/win32/resolv.rb b/ruby_1_8_6/ext/Win32API/lib/win32/resolv.rb
new file mode 100644
index 0000000000..6534d20760
--- /dev/null
+++ b/ruby_1_8_6/ext/Win32API/lib/win32/resolv.rb
@@ -0,0 +1,366 @@
+=begin
+= Win32 DNS and DHCP I/F
+
+=end
+
+require 'win32/registry'
+
+module Win32
+  module Resolv
+    API = Registry::API
+    
+    def self.get_hosts_path
+      path = get_hosts_dir
+      path = File.join(path.gsub(/\\/, File::SEPARATOR), 'hosts')
+      File.exist?(path) ? path : nil
+    end
+    
+    def self.get_resolv_info
+      search, nameserver = get_info
+      if search.empty?
+        search = nil
+      else
+        search.delete("")
+        search.uniq!
+      end
+      if nameserver.empty?
+        nameserver = nil
+      else
+        nameserver.delete("")
+        nameserver.delete("0.0.0.0")
+        nameserver.uniq!
+      end
+      [ search, nameserver ]
+    end
+
+getv = Win32API.new('kernel32.dll', 'GetVersionExA', 'P', 'L')
+info = [ 148, 0, 0, 0, 0 ].pack('V5') + "\0" * 128
+getv.call(info)
+if info.unpack('V5')[4] == 2  # VER_PLATFORM_WIN32_NT
+#====================================================================
+# Windows NT
+#====================================================================
+  module_eval <<-'__EOS__', __FILE__, __LINE__+1
+    TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
+    
+    class << self
+      private
+      def get_hosts_dir
+        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
+          reg.read_s_expand('DataBasePath')
+        end
+      end
+      
+      def get_info
+        search = nil
+        nameserver = []
+        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
+          begin
+            slist = reg.read_s('SearchList')
+            search = slist.split(/,\s*/) unless slist.empty?
+          rescue Registry::Error
+          end
+          
+          if add_search = search.nil?
+            search = []
+            begin
+              nvdom = reg.read_s('NV Domain')
+              unless nvdom.empty?
+                @search = [ nvdom ]
+                if reg.read_i('UseDomainNameDevolution') != 0
+                  if /^[\w\d]+\./ =~ nvdom
+                    devo = $'
+                  end
+                end
+              end
+            rescue Registry::Error
+            end
+          end
+          
+          reg.open('Interfaces') do |reg|
+            reg.each_key do |iface,|
+              reg.open(iface) do |regif|
+                begin
+                  [ 'NameServer', 'DhcpNameServer' ].each do |key|
+                    ns = regif.read_s(key)
+                    unless ns.empty?
+                      nameserver.concat(ns.split(/[,\s]\s*/))
+                      break
+                    end
+                  end
+                rescue Registry::Error
+                end
+                
+                if add_search
+                  begin
+                    [ 'Domain', 'DhcpDomain' ].each do |key|
+                      dom = regif.read_s(key)
+                      unless dom.empty?
+                        search.concat(dom.split(/,\s*/))
+                        break
+                      end
+                    end
+                  rescue Registry::Error
+                  end
+                end
+              end
+            end
+          end
+          search << devo if add_search and devo
+        end
+        [ search.uniq, nameserver.uniq ]
+      end
+    end
+  __EOS__
+else
+#====================================================================
+# Windows 9x
+#====================================================================
+  module_eval <<-'__EOS__', __FILE__, __LINE__+1
+    TCPIP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\MSTCP'
+    DHCP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\DHCP'
+    WINDOWS = 'Software\Microsoft\Windows\CurrentVersion'
+    
+    class << self
+   #   private
+      
+      def get_hosts_dir
+        Registry::HKEY_LOCAL_MACHINE.open(WINDOWS) do |reg|
+          reg.read_s_expand('SystemRoot')
+        end
+      end
+      
+      def get_info
+        search = []
+        nameserver = []
+        begin
+          Registry::HKEY_LOCAL_MACHINE.open(TCPIP_9X) do |reg|
+            if reg.read_s("EnableDNS") == "1"
+              domain = reg.read_s("Domain")
+              ns = reg.read_s("NameServer")
+              slist = reg.read_s("SearchList")
+              search << domain unless domain.empty?
+              search.concat(slist.split(/,\s*/))
+              nameserver.concat(ns.split(/[,\s]\s*/))
+            end
+          end
+        rescue Registry::Error
+        end
+        
+        dhcpinfo = get_dhcpinfo
+        search.concat(dhcpinfo[0])
+        nameserver.concat(dhcpinfo[1])
+        [ search, nameserver ]
+      end
+      
+      def get_dhcpinfo
+        macaddrs = {}
+        ipaddrs = {}
+        WsControl.get_iflist.each do |index, macaddr, *ipaddr|
+          macaddrs[macaddr] = 1
+          ipaddr.each { |ipaddr| ipaddrs[ipaddr] = 1 }
+        end
+        iflist = [ macaddrs, ipaddrs ]
+        
+        search = []
+        nameserver = []
+        version = -1
+        Registry::HKEY_LOCAL_MACHINE.open(DHCP_9X) do |reg|
+          begin
+            version = API.unpackdw(reg.read_bin("Version"))
+          rescue Registry::Error
+          end
+          
+          reg.each_key do |key,|
+            catch(:not_used) do
+              reg.open(key) do |regdi|
+                dom, ns = get_dhcpinfo_key(version, regdi, iflist)
+                search << dom if dom
+                nameserver.concat(ns) if ns
+              end
+            end
+          end
+        end
+        [ search, nameserver ]
+      end
+      
+      def get_dhcpinfo_95(reg)
+        dhcp = reg.read_bin("DhcpInfo")
+        [
+          API.unpackdw(dhcp[4..7]),
+          API.unpackdw(dhcp[8..11]),
+          1,
+          dhcp[45..50],
+          reg.read_bin("OptionInfo"),
+        ]
+      end
+      
+      def get_dhcpinfo_98(reg)
+        [
+          API.unpackdw(reg.read_bin("DhcpIPAddress")),
+          API.unpackdw(reg.read_bin("DhcpSubnetMask")),
+          API.unpackdw(reg.read_bin("HardwareType")),
+          reg.read_bin("HardwareAddress"),
+          reg.read_bin("OptionInfo"),
+        ]
+      end
+      
+      def get_dhcpinfo_key(version, reg, iflist)
+        info = case version
+               when 1
+                 get_dhcpinfo_95(reg)
+               when 2
+                 get_dhcpinfo_98(reg)
+               else
+                 begin
+                   get_dhcpinfo_98(reg)
+                 rescue Registry::Error
+                   get_dhcpinfo_95(reg)
+                 end
+               end
+        ipaddr, netmask, hwtype, macaddr, opt = info
+        throw :not_used unless
+          ipaddr and ipaddr != 0 and
+          netmask and netmask != 0 and
+          macaddr and macaddr.size == 6 and
+          hwtype == 1 and
+          iflist[0][macaddr] and iflist[1][ipaddr]
+        
+        size = opt.size
+        idx = 0
+        while idx <= size
+          opttype = opt[idx]
+          optsize = opt[idx + 1]
+          optval  = opt[idx + 2, optsize]
+          case opttype
+          when 0xFF    ## term
+            break
+          when 0x0F    ## domain
+            domain = optval.chomp("\0")
+          when 0x06    ## dns
+            nameserver = optval.scan(/..../).collect { |addr|
+              "%d.%d.%d.%d" % addr.unpack('C4')
+            }
+          end
+          idx += optsize + 2
+        end
+        [ domain, nameserver ]
+      rescue Registry::Error
+        throw :not_used
+      end
+    end
+    
+    module WsControl
+      WsControl = Win32API.new('wsock32.dll', 'WsControl', 'LLPPPP', 'L')
+      WSAGetLastError = Win32API.new('wsock32.dll', 'WSAGetLastError', 'V', 'L')
+      
+      MAX_TDI_ENTITIES = 512
+      IPPROTO_TCP = 6
+      WSCTL_TCP_QUERY_INFORMATION = 0
+      INFO_CLASS_GENERIC = 0x100
+      INFO_CLASS_PROTOCOL = 0x200
+      INFO_TYPE_PROVIDER = 0x100
+      ENTITY_LIST_ID = 0
+      GENERIC_ENTITY = 0
+      CL_NL_ENTITY = 0x301
+      IF_ENTITY = 0x200
+      ENTITY_TYPE_ID = 1
+      CL_NL_IP = 0x303
+      IF_MIB = 0x202
+      IF_MIB_STATS_ID = 1
+      IP_MIB_ADDRTABLE_ENTRY_ID = 0x102
+      
+      def self.wsctl(tei_entity, tei_instance,
+                     toi_class, toi_type, toi_id,
+                     buffsize)
+        reqinfo = [
+                  ## TDIEntityID
+                    tei_entity, tei_instance,
+                  ## TDIObjectID
+                    toi_class, toi_type, toi_id,
+                  ## TCP_REQUEST_INFORMATION_EX
+                    ""
+                  ].pack('VVVVVa16')
+        reqsize = API.packdw(reqinfo.size)
+        buff = "\0" * buffsize
+        buffsize = API.packdw(buffsize)
+        result = WsControl.call(
+                   IPPROTO_TCP,
+                   WSCTL_TCP_QUERY_INFORMATION,
+                   reqinfo, reqsize,
+                   buff, buffsize)
+        if result != 0
+          raise RuntimeError, "WsControl failed.(#{result})"
+        end
+        [ buff, API.unpackdw(buffsize) ]
+      end
+      private_class_method :wsctl
+      
+      def self.get_iflist
+        # Get TDI Entity List
+        entities, size =
+          wsctl(GENERIC_ENTITY, 0,
+                INFO_CLASS_GENERIC,
+                INFO_TYPE_PROVIDER,
+                ENTITY_LIST_ID,
+                MAX_TDI_ENTITIES * 8)  # sizeof(TDIEntityID)
+        entities = entities[0, size].
+                     scan(/.{8}/).
+                     collect { |e| e.unpack('VV') }
+
+        # Get MIB Interface List
+        iflist = []
+        ifcount = 0
+        entities.each do |entity, instance|
+          if( (entity & IF_ENTITY)>0 )
+            ifcount += 1
+            etype, = wsctl(entity, instance,
+                           INFO_CLASS_GENERIC,
+                           INFO_TYPE_PROVIDER,
+                           ENTITY_TYPE_ID,
+                           4)
+            if( (API.unpackdw(etype) & IF_MIB)==IF_MIB )
+              ifentry, = wsctl(entity, instance,
+                               INFO_CLASS_PROTOCOL,
+                               INFO_TYPE_PROVIDER,
+                               IF_MIB_STATS_ID,
+                               21 * 4 + 8 + 130)  # sizeof(IFEntry)
+              iflist << [
+                API.unpackdw(ifentry[0,4]),
+                ifentry[20, 6]
+              ]
+            end
+          end
+        end
+        
+        # Get IP Addresses
+        entities.each do |entity, instance|
+          if entity == CL_NL_ENTITY
+            etype, = wsctl(entity, instance,
+                           INFO_CLASS_GENERIC,
+                           INFO_TYPE_PROVIDER,
+                           ENTITY_TYPE_ID,
+                           4)
+            if API.unpackdw(etype) == CL_NL_IP
+              ipentries, = wsctl(entity, instance,
+                                 INFO_CLASS_PROTOCOL,
+                                 INFO_TYPE_PROVIDER,
+                                 IP_MIB_ADDRTABLE_ENTRY_ID,
+                                 24 * (ifcount+1))  # sizeof(IPAddrEntry)
+              ipentries.scan(/.{24}/) do |ipentry|
+                ipaddr, index = ipentry.unpack('VV')
+                if ifitem = iflist.assoc(index)
+                  ifitem << ipaddr
+                end
+              end
+            end
+          end
+        end
+        iflist
+      end
+    end
+  __EOS__
+end
+#====================================================================
+  end
+end
diff --git a/ruby_1_8_6/ext/Win32API/point.rb b/ruby_1_8_6/ext/Win32API/point.rb
new file mode 100644
index 0000000000..60e265f3ee
--- /dev/null
+++ b/ruby_1_8_6/ext/Win32API/point.rb
@@ -0,0 +1,18 @@
+require 'Win32API'
+
+getCursorPos = Win32API.new("user32", "GetCursorPos", ['P'], 'V')
+
+lpPoint = " " * 8 # store two LONGs
+getCursorPos.Call(lpPoint)
+x, y = lpPoint.unpack("LL") # get the actual values
+
+print "x: ", x, "\n"
+print "y: ", y, "\n"
+
+ods = Win32API.new("kernel32", "OutputDebugString", ['P'], 'V')
+ods.Call("Hello, World\n");
+
+GetDesktopWindow = Win32API.new("user32", "GetDesktopWindow", [], 'L')
+GetActiveWindow = Win32API.new("user32", "GetActiveWindow", [], 'L')
+SendMessage = Win32API.new("user32", "SendMessage", ['L'] * 4, 'L')
+SendMessage.Call GetDesktopWindow.Call, 274, 0xf140, 0
diff --git a/ruby_1_8_6/ext/bigdecimal/.cvsignore b/ruby_1_8_6/ext/bigdecimal/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/bigdecimal/README b/ruby_1_8_6/ext/bigdecimal/README
new file mode 100644
index 0000000000..a233f47f64
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/README
@@ -0,0 +1,60 @@
+
+  Ruby BIGDECIMAL(Variable Precision) extension library.
+  Copyright (C) 1999  by Shigeo Kobayashi(shigeo@tinyforest.gr.jp)
+
+BigDecimal is copyrighted free software by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see COPYING file), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) rename any non-standard executables so the names do not conflict
+	  with standard executables, which must also be provided.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
+
+       a) distribute the executables and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).
+
+  5. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
+
+* The Author
+
+Feel free to send comments and bug reports to the author.  Here is the 
+author's latest mail address:
+
+  shigeo@tinyforest.gr.jp
+
+-------------------------------------------------------
+created at: Thu Dec 22 1999
diff --git a/ruby_1_8_6/ext/bigdecimal/bigdecimal.c b/ruby_1_8_6/ext/bigdecimal/bigdecimal.c
new file mode 100644
index 0000000000..a4b769e8cf
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/bigdecimal.c
@@ -0,0 +1,4695 @@
+/*
+ *
+ * Ruby BigDecimal(Variable decimal precision) extension library.
+ *
+ * Copyright(C) 2002 by Shigeo Kobayashi(shigeo@tinyforest.gr.jp)
+ *
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Artistic License, as specified in the README file
+ * of this BigDecimal distribution.
+ *
+ *  NOTE: Change log in this source removed to reduce source code size. 
+ *        See rev. 1.25 if needed.
+ *
+ */
+
+#include "ruby.h"
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <float.h>
+#include <math.h>
+#include "math.h"
+#include "version.h"
+ 
+/* #define ENABLE_NUMERIC_STRING */
+
+VALUE rb_cBigDecimal;
+
+#include "bigdecimal.h"
+
+/* MACRO's to guard objects from GC by keeping them in stack */
+#define ENTER(n) volatile VALUE vStack[n];int iStack=0
+#define PUSH(x)  vStack[iStack++] = (unsigned long)(x);
+#define SAVE(p)  PUSH(p->obj);
+#define GUARD_OBJ(p,y) {p=y;SAVE(p);}
+
+/*
+ * ================== Ruby Interface part ==========================
+ */
+#define DoSomeOne(x,y) rb_num_coerce_bin(x,y)
+
+#if 0
+/* BigDecimal provides arbitrary-precision floating point decimal arithmetic.
+ *
+ * Copyright (C) 2002 by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
+ * You may distribute under the terms of either the GNU General Public
+ * License or the Artistic License, as specified in the README file
+ * of the BigDecimal distribution.
+ *
+ * Documented by mathew <meta@pobox.com>.
+ *
+ * = Introduction
+ *
+ * Ruby provides built-in support for arbitrary precision integer arithmetic.
+ * For example:
+ *
+ * 42**13   ->   1265437718438866624512
+ *
+ * BigDecimal provides similar support for very large or very accurate floating
+ * point numbers.
+ *
+ * Decimal arithmetic is also useful for general calculation, because it
+ * provides the correct answers people expect--whereas normal binary floating
+ * point arithmetic often introduces subtle errors because of the conversion
+ * between base 10 and base 2. For example, try:
+ *
+ *   sum = 0
+ *   for i in (1..10000)
+ *     sum = sum + 0.0001
+ *   end
+ *   print sum
+ *
+ * and contrast with the output from:
+ *
+ *   require 'bigdecimal'
+ *
+ *   sum = BigDecimal.new("0")
+ *   for i in (1..10000)
+ *     sum = sum + BigDecimal.new("0.0001")
+ *   end
+ *   print sum
+ *
+ * Similarly:
+ *
+ * (BigDecimal.new("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") -> true
+ *
+ * (1.2 - 1.0) == 0.2 -> false
+ *
+ * = Special features of accurate decimal arithmetic
+ *
+ * Because BigDecimal is more accurate than normal binary floating point
+ * arithmetic, it requires some special values.
+ *
+ * == Infinity
+ *
+ * BigDecimal sometimes needs to return infinity, for example if you divide
+ * a value by zero.
+ *
+ * BigDecimal.new("1.0") / BigDecimal.new("0.0")  -> infinity
+ *
+ * BigDecimal.new("-1.0") / BigDecimal.new("0.0")  -> -infinity
+ *
+ * You can represent infinite numbers to BigDecimal using the strings
+ * 'Infinity', '+Infinity' and '-Infinity' (case-sensitive)
+ *
+ * == Not a Number
+ *
+ * When a computation results in an undefined value, the special value NaN
+ * (for 'not a number') is returned.
+ *
+ * Example:
+ *
+ * BigDecimal.new("0.0") / BigDecimal.new("0.0") -> NaN
+ *
+ * You can also create undefined values.  NaN is never considered to be the
+ * same as any other value, even NaN itself:
+ *
+ * n = BigDecimal.new('NaN')
+ *
+ * n == 0.0 -> nil
+ *
+ * n == n -> nil
+ *
+ * == Positive and negative zero
+ *
+ * If a computation results in a value which is too small to be represented as
+ * a BigDecimal within the currently specified limits of precision, zero must
+ * be returned.
+ *
+ * If the value which is too small to be represented is negative, a BigDecimal
+ * value of negative zero is returned. If the value is positive, a value of
+ * positive zero is returned.
+ *
+ * BigDecimal.new("1.0") / BigDecimal.new("-Infinity") -> -0.0
+ *
+ * BigDecimal.new("1.0") / BigDecimal.new("Infinity") -> 0.0
+ *
+ * (See BigDecimal.mode for how to specify limits of precision.)
+ *
+ * Note that -0.0 and 0.0 are considered to be the same for the purposes of
+ * comparison.
+ *
+ * Note also that in mathematics, there is no particular concept of negative 
+ * or positive zero; true mathematical zero has no sign.
+ */
+void
+Init_BigDecimal()
+{
+    /* This is a #if-ed out function to fool Rdoc into documenting the class. */
+    /* The real init function is Init_bigdecimal() further down. */
+}
+#endif
+
+/*
+ * Returns the BigDecimal version number.
+ *
+ * Ruby 1.8.0 returns 1.0.0.
+ * Ruby 1.8.1 thru 1.8.3 return 1.0.1.
+ */
+static VALUE
+BigDecimal_version(VALUE self)
+{
+    /*
+     * 1.0.0: Ruby 1.8.0
+     * 1.0.1: Ruby 1.8.1
+    */
+    return rb_str_new2("1.0.1");
+}
+
+/*
+ *   VP routines used in BigDecimal part 
+ */
+static unsigned short VpGetException(void);
+static void  VpSetException(unsigned short f);
+static void  VpInternalRound(Real *c,int ixDigit,U_LONG vPrev,U_LONG v);
+static int   VpLimitRound(Real *c,U_LONG ixDigit);
+
+/*
+ *  **** BigDecimal part ****
+ */
+
+static void
+BigDecimal_delete(Real *pv)
+{
+    VpFree(pv);
+}
+
+static VALUE
+ToValue(Real *p)
+{
+    if(VpIsNaN(p)) {
+        VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",0);
+    } else if(VpIsPosInf(p)) {
+        VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
+    } else if(VpIsNegInf(p)) {
+        VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",0);
+    }
+    return p->obj;
+}
+
+static Real *
+GetVpValue(VALUE v, int must)
+{
+    Real *pv;
+    VALUE bg;
+    char szD[128];
+
+    switch(TYPE(v))
+    {
+    case T_DATA:
+        if(RDATA(v)->dfree ==(void *) BigDecimal_delete) {
+            Data_Get_Struct(v, Real, pv);
+            return pv;
+        } else {
+            goto SomeOneMayDoIt;
+        }
+        break;
+    case T_FIXNUM:
+        sprintf(szD, "%ld", FIX2LONG(v));
+        return VpCreateRbObject(VpBaseFig() * 2 + 1, szD);
+
+#ifdef ENABLE_NUMERIC_STRING
+    case T_STRING:
+        SafeStringValue(v);
+        return VpCreateRbObject(strlen(RSTRING_PTR(v)) + VpBaseFig() + 1,
+                                RSTRING_PTR(v));
+#endif /* ENABLE_NUMERIC_STRING */
+
+    case T_BIGNUM:
+        bg = rb_big2str(v, 10);
+        return VpCreateRbObject(strlen(RSTRING_PTR(bg)) + VpBaseFig() + 1,
+                                RSTRING_PTR(bg));
+    default:
+        goto SomeOneMayDoIt;
+    }
+
+SomeOneMayDoIt:
+    if(must) {
+        rb_raise(rb_eTypeError, "%s can't be coerced into BigDecimal",
+                    rb_special_const_p(v)?
+                    RSTRING_PTR(rb_inspect(v)):
+                    rb_obj_classname(v)
+                );
+    }
+    return NULL; /* NULL means to coerce */
+}
+
+/* call-seq:
+ * BigDecimal.double_fig
+ *
+ * The BigDecimal.double_fig class method returns the number of digits a
+ * Float number is allowed to have. The result depends upon the CPU and OS
+ * in use.
+ */
+static VALUE
+BigDecimal_double_fig(VALUE self)
+{
+    return INT2FIX(VpDblFig());
+}
+
+/* call-seq:
+ * precs
+ *
+ * Returns an Array of two Integer values.
+ *
+ * The first value is the current number of significant digits in the 
+ * BigDecimal. The second value is the maximum number of significant digits
+ * for the BigDecimal.
+ */
+static VALUE
+BigDecimal_prec(VALUE self)
+{
+    ENTER(1);
+    Real *p;
+    VALUE obj;
+
+    GUARD_OBJ(p,GetVpValue(self,1));
+    obj = rb_assoc_new(INT2NUM(p->Prec*VpBaseFig()),
+		       INT2NUM(p->MaxPrec*VpBaseFig()));
+    return obj;
+}
+
+static VALUE
+BigDecimal_hash(VALUE self)
+{
+    ENTER(1);
+    Real *p;
+    U_LONG hash,i;
+
+    GUARD_OBJ(p,GetVpValue(self,1));
+    hash = (U_LONG)p->sign;
+    /* hash!=2: the case for 0(1),NaN(0) or +-Infinity(3) is sign itself */
+    if(hash==2) {
+        for(i = 0; i < p->Prec;i++) {
+            hash = 31 * hash + p->frac[i];
+            hash ^= p->frac[i];
+        }
+        hash += p->exponent;
+    }
+    return INT2FIX(hash);
+}
+
+static VALUE
+BigDecimal_dump(int argc, VALUE *argv, VALUE self)
+{
+    ENTER(5);
+    char sz[50];
+    Real *vp;
+    char *psz;
+    VALUE dummy;
+    rb_scan_args(argc, argv, "01", &dummy);
+    GUARD_OBJ(vp,GetVpValue(self,1));
+    sprintf(sz,"%lu:",VpMaxPrec(vp)*VpBaseFig());
+    psz = ALLOCA_N(char,(unsigned int)VpNumOfChars(vp,"E")+strlen(sz));
+    sprintf(psz,"%s",sz);
+    VpToString(vp, psz+strlen(psz), 0, 0);
+    return rb_str_new2(psz);
+}
+
+/*
+ * Internal method used to provide marshalling support. See the Marshal module.
+ */
+static VALUE
+BigDecimal_load(VALUE self, VALUE str)
+{
+    ENTER(2);
+    Real *pv;
+    unsigned char *pch;
+    unsigned char ch;
+    unsigned long m=0;
+
+    SafeStringValue(str);
+    pch = (unsigned char *)RSTRING_PTR(str);
+    /* First get max prec */
+    while((*pch)!=(unsigned char)'\0' && (ch=*pch++)!=(unsigned char)':') {
+        if(!ISDIGIT(ch)) {
+            rb_raise(rb_eTypeError, "load failed: invalid character in the marshaled string");
+        }
+        m = m*10 + (unsigned long)(ch-'0');
+    }
+    if(m>VpBaseFig()) m -= VpBaseFig();
+    GUARD_OBJ(pv,VpNewRbClass(m,(char *)pch,self));
+    m /= VpBaseFig();
+    if(m && pv->MaxPrec>m) pv->MaxPrec = m+1;
+    return ToValue(pv);
+}
+
+ /* call-seq:
+  * BigDecimal.mode(mode, value)
+  *
+  * Controls handling of arithmetic exceptions and rounding. If no value
+  * is supplied, the current value is returned.
+  *
+  * Six values of the mode parameter control the handling of arithmetic
+  * exceptions:
+  *
+  * BigDecimal::EXCEPTION_NaN
+  * BigDecimal::EXCEPTION_INFINITY
+  * BigDecimal::EXCEPTION_UNDERFLOW
+  * BigDecimal::EXCEPTION_OVERFLOW
+  * BigDecimal::EXCEPTION_ZERODIVIDE
+  * BigDecimal::EXCEPTION_ALL
+  *
+  * For each mode parameter above, if the value set is false, computation 
+  * continues after an arithmetic exception of the appropriate type. 
+  * When computation continues, results are as follows:
+  *
+  * EXCEPTION_NaN:: NaN
+  * EXCEPTION_INFINITY:: +infinity or -infinity
+  * EXCEPTION_UNDERFLOW:: 0
+  * EXCEPTION_OVERFLOW:: +infinity or -infinity
+  * EXCEPTION_ZERODIVIDE:: +infinity or -infinity
+  *
+  * One value of the mode parameter controls the rounding of numeric values:
+  * BigDecimal::ROUND_MODE. The values it can take are:
+  *
+  * ROUND_UP:: round away from zero
+  * ROUND_DOWN:: round towards zero (truncate)
+  * ROUND_HALF_UP:: round up if the appropriate digit >= 5, otherwise truncate (default)
+  * ROUND_HALF_DOWN:: round up if the appropriate digit >= 6, otherwise truncate
+  * ROUND_HALF_EVEN:: round towards the even neighbor (Banker's rounding)
+  * ROUND_CEILING:: round towards positive infinity (ceil)
+  * ROUND_FLOOR:: round towards negative infinity (floor)
+  *
+  */
+static VALUE
+BigDecimal_mode(int argc, VALUE *argv, VALUE self)
+{
+    VALUE which;
+    VALUE val;
+    unsigned long f,fo;
+ 
+    if(rb_scan_args(argc,argv,"11",&which,&val)==1) val = Qnil;
+
+    Check_Type(which, T_FIXNUM);
+    f = (unsigned long)FIX2INT(which);
+
+    if(f&VP_EXCEPTION_ALL) {
+        /* Exception mode setting */
+        fo = VpGetException();
+        if(val==Qnil) return INT2FIX(fo);
+        if(val!=Qfalse && val!=Qtrue) {
+            rb_raise(rb_eTypeError, "second argument must be true or false");
+            return Qnil; /* Not reached */
+        }
+        if(f&VP_EXCEPTION_INFINITY) {
+            VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_INFINITY):
+                           (fo&(~VP_EXCEPTION_INFINITY))));
+        }
+        if(f&VP_EXCEPTION_NaN) {
+            VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_NaN):
+                           (fo&(~VP_EXCEPTION_NaN))));
+        }
+        fo = VpGetException();
+        return INT2FIX(fo);
+    }
+    if(VP_ROUND_MODE==f) {
+        /* Rounding mode setting */
+        fo = VpGetRoundMode();
+        if(val==Qnil) return INT2FIX(fo);
+        Check_Type(val, T_FIXNUM);
+        if(!VpIsRoundMode(FIX2INT(val))) {
+            rb_raise(rb_eTypeError, "invalid rounding mode");
+            return Qnil;
+        }
+        fo = VpSetRoundMode((unsigned long)FIX2INT(val));
+        return INT2FIX(fo);
+    }
+    rb_raise(rb_eTypeError, "first argument for BigDecimal#mode invalid");
+    return Qnil;
+}
+
+static U_LONG
+GetAddSubPrec(Real *a, Real *b)
+{
+    U_LONG mxs;
+    U_LONG mx = a->Prec;
+    S_INT d;
+
+    if(!VpIsDef(a) || !VpIsDef(b)) return (-1L);
+    if(mx < b->Prec) mx = b->Prec;
+    if(a->exponent!=b->exponent) {
+        mxs = mx;
+        d = a->exponent - b->exponent;
+        if(d<0) d = -d;
+        mx = mx+(U_LONG)d;
+        if(mx<mxs) {
+            return VpException(VP_EXCEPTION_INFINITY,"Exponent overflow",0);
+        }
+    }
+    return mx;
+}
+
+static S_INT
+GetPositiveInt(VALUE v)
+{
+    S_INT n;
+    Check_Type(v, T_FIXNUM);
+    n = FIX2INT(v);
+    if(n < 0) {
+        rb_raise(rb_eArgError, "argument must be positive");
+    }
+    return n;
+}
+
+VP_EXPORT Real *
+VpNewRbClass(U_LONG mx, char *str, VALUE klass)
+{
+    Real *pv = VpAlloc(mx,str);
+    pv->obj = (VALUE)Data_Wrap_Struct(klass, 0, BigDecimal_delete, pv);
+    return pv;
+}
+
+VP_EXPORT Real *
+VpCreateRbObject(U_LONG mx, const char *str)
+{
+    Real *pv = VpAlloc(mx,str);
+    pv->obj = (VALUE)Data_Wrap_Struct(rb_cBigDecimal, 0, BigDecimal_delete, pv);
+    return pv;
+}
+
+/* Returns True if the value is Not a Number */
+static VALUE
+BigDecimal_IsNaN(VALUE self)
+{
+    Real *p = GetVpValue(self,1);
+    if(VpIsNaN(p))  return Qtrue;
+    return Qfalse;
+}
+
+/* Returns True if the value is infinite */
+static VALUE
+BigDecimal_IsInfinite(VALUE self)
+{
+    Real *p = GetVpValue(self,1);
+    if(VpIsPosInf(p)) return INT2FIX(1);
+    if(VpIsNegInf(p)) return INT2FIX(-1);
+    return Qnil;
+}
+
+/* Returns True if the value is finite (not NaN or infinite) */
+static VALUE
+BigDecimal_IsFinite(VALUE self)
+{
+    Real *p = GetVpValue(self,1);
+    if(VpIsNaN(p)) return Qfalse;
+    if(VpIsInf(p)) return Qfalse;
+    return Qtrue;
+}
+
+/* Returns the value as an integer (Fixnum or Bignum).
+ *
+ * If the BigNumber is infinity or NaN, returns nil.
+ */
+static VALUE
+BigDecimal_to_i(VALUE self)
+{
+    ENTER(5);
+    int e,n,i,nf;
+    U_LONG v,b,j;
+    char *psz,*pch;
+    Real *p;
+
+    GUARD_OBJ(p,GetVpValue(self,1));
+
+    /* Infinity or NaN not converted. */
+    if(VpIsNaN(p)) {
+       VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",0);
+       return Qnil;
+    } else if(VpIsPosInf(p)) {
+       VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
+       return Qnil;
+    } else if(VpIsNegInf(p)) {
+       VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",0);
+       return Qnil;
+    }
+
+    e = VpExponent10(p);
+    if(e<=0) return INT2FIX(0);
+    nf = VpBaseFig();
+    if(e<=nf) {
+        e = VpGetSign(p)*p->frac[0];
+        return INT2FIX(e);
+    }
+    psz = ALLOCA_N(char,(unsigned int)(e+nf+2));
+
+    n = (e+nf-1)/nf;
+    pch = psz;
+    if(VpGetSign(p)<0) *pch++ = '-';
+    for(i=0;i<n;++i) {
+        b = VpBaseVal()/10;
+        if(i>=(int)p->Prec) {
+            while(b) {
+                *pch++ = '0';
+                b /= 10;
+            }
+            continue;
+        }
+        v = p->frac[i];
+        while(b) {
+            j = v/b;
+            *pch++ = (char)(j + '0');
+            v -= j*b;
+            b /= 10;
+        }
+    }
+    *pch++ = 0;
+    return rb_cstr2inum(psz,10);
+}
+
+static VALUE
+BigDecimal_induced_from(VALUE self, VALUE x)
+{
+    Real *p = GetVpValue(x,1);
+    return p->obj;
+}
+
+/* Returns a new Float object having approximately the same value as the
+ * BigDecimal number. Normal accuracy limits and built-in errors of binary
+ * Float arithmetic apply.
+ */
+static VALUE
+BigDecimal_to_f(VALUE self)
+{
+    ENTER(1);
+    Real *p;
+    double d, d2;
+    S_LONG e;
+
+    GUARD_OBJ(p,GetVpValue(self,1));
+    if(VpVtoD(&d, &e, p)!=1) return rb_float_new(d);
+    errno = 0;
+    d2 = pow(10.0,(double)e);
+    if((errno == ERANGE && e>0) || (d2>1.0 && (fabs(d) > (DBL_MAX / d2)))) {
+       VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion",0);
+       if(d>0.0) return rb_float_new(DBL_MAX);
+       else      return rb_float_new(-DBL_MAX);
+    }
+    return rb_float_new(d*d2);
+}
+
+/* The coerce method provides support for Ruby type coercion. It is not
+ * enabled by default.
+ * 
+ * This means that binary operations like + * / or - can often be performed 
+ * on a BigDecimal and an object of another type, if the other object can
+ * be coerced into a BigDecimal value.
+ *
+ * e.g.
+ * a = BigDecimal.new("1.0")
+ * b = a / 2.0  -> 0.5
+ *
+ * Note that coercing a String to a BigDecimal is not supported by default;
+ * it requires a special compile-time option when building Ruby.
+ */
+static VALUE
+BigDecimal_coerce(VALUE self, VALUE other)
+{
+    ENTER(2);
+    VALUE obj;
+    Real *b;
+    if(TYPE(other) == T_FLOAT) {
+       obj = rb_assoc_new(other, BigDecimal_to_f(self));
+    } else {
+       GUARD_OBJ(b,GetVpValue(other,1));
+       obj = rb_assoc_new(b->obj, self);
+    }
+    return obj;
+}
+
+static VALUE
+BigDecimal_uplus(VALUE self)
+{
+    return self;
+}
+
+ /* call-seq:
+  * add(value, digits)
+  *
+  * Add the specified value. 
+  *
+  * e.g.
+  *   c = a.add(b,n)
+  *   c = a + b
+  *
+  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
+  */
+static VALUE
+BigDecimal_add(VALUE self, VALUE r)
+{
+    ENTER(5);
+    Real *c, *a, *b;
+    U_LONG mx;
+    GUARD_OBJ(a,GetVpValue(self,1));
+    b = GetVpValue(r,0);
+    if(!b) return DoSomeOne(self,r);
+    SAVE(b);
+    if(VpIsNaN(b)) return b->obj;
+    if(VpIsNaN(a)) return a->obj;
+    mx = GetAddSubPrec(a,b);
+    if(mx==(-1L)) {
+        GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
+        VpAddSub(c, a, b, 1);
+    } else {
+        GUARD_OBJ(c,VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
+        if(!mx) {
+            VpSetInf(c,VpGetSign(a));
+        } else {
+            VpAddSub(c, a, b, 1);
+        }
+    }
+    return ToValue(c);
+}
+
+ /* call-seq:
+  * sub(value, digits)
+  *
+  * Subtract the specified value. 
+  *
+  * e.g.
+  *   c = a.sub(b,n)
+  *   c = a - b
+  *
+  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
+  */
+static VALUE
+BigDecimal_sub(VALUE self, VALUE r)
+{
+    ENTER(5);
+    Real *c, *a, *b;
+    U_LONG mx;
+
+    GUARD_OBJ(a,GetVpValue(self,1));
+    b = GetVpValue(r,0);
+    if(!b) return DoSomeOne(self,r);
+    SAVE(b);
+
+    if(VpIsNaN(b)) return b->obj;
+    if(VpIsNaN(a)) return a->obj;
+
+    mx = GetAddSubPrec(a,b);
+    if(mx==(-1L)) {
+        GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
+        VpAddSub(c, a, b, -1);
+    } else {
+        GUARD_OBJ(c,VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
+        if(!mx) {
+            VpSetInf(c,VpGetSign(a));
+        } else {
+            VpAddSub(c, a, b, -1);
+        }
+    }
+    return ToValue(c);
+}
+
+static VALUE
+BigDecimalCmp(VALUE self, VALUE r,char op)
+{
+    ENTER(5);
+    S_INT e;
+    Real *a, *b;
+    GUARD_OBJ(a,GetVpValue(self,1));
+    b = GetVpValue(r,0);
+    if(!b) return rb_num_coerce_cmp(self,r);
+    SAVE(b);
+    e = VpComp(a, b);
+    if(e==999) return Qnil;
+    switch(op)
+    {
+    case '*': return   INT2FIX(e); /* any op */
+    case '=': if(e==0) return Qtrue ; return Qfalse;
+    case '!': if(e!=0) return Qtrue ; return Qfalse;
+    case 'G': if(e>=0) return Qtrue ; return Qfalse;
+    case '>': if(e> 0) return Qtrue ; return Qfalse;
+    case 'L': if(e<=0) return Qtrue ; return Qfalse;
+    case '<': if(e< 0) return Qtrue ; return Qfalse;
+    }
+    rb_bug("Undefined operation in BigDecimalCmp()");
+}
+
+/* Returns True if the value is zero. */
+static VALUE
+BigDecimal_zero(VALUE self)
+{
+    Real *a = GetVpValue(self,1);
+    return VpIsZero(a) ? Qtrue : Qfalse;
+}
+
+/* Returns True if the value is non-zero. */
+static VALUE
+BigDecimal_nonzero(VALUE self)
+{
+    Real *a = GetVpValue(self,1);
+    return VpIsZero(a) ? Qnil : self;
+}
+
+/* The comparison operator.
+ * a <=> b is 0 if a == b, 1 if a > b, -1 if a < b.
+ */
+static VALUE
+BigDecimal_comp(VALUE self, VALUE r)
+{
+    return BigDecimalCmp(self, r, '*');
+}
+
+/*
+ * Tests for value equality; returns true if the values are equal.
+ *
+ * The == and === operators and the eql? method have the same implementation 
+ * for BigDecimal.
+ *
+ * Values may be coerced to perform the comparison:
+ *
+ * BigDecimal.new('1.0') == 1.0  -> true
+ */
+static VALUE
+BigDecimal_eq(VALUE self, VALUE r)
+{
+    return BigDecimalCmp(self, r, '=');
+}
+
+/* call-seq:
+ * a < b
+ *
+ * Returns true if a is less than b. Values may be coerced to perform the
+ * comparison (see ==, coerce).
+ */
+static VALUE
+BigDecimal_lt(VALUE self, VALUE r)
+{
+    return BigDecimalCmp(self, r, '<');
+}
+
+/* call-seq:
+ * a <= b
+ *
+ * Returns true if a is less than or equal to b. Values may be coerced to 
+ * perform the comparison (see ==, coerce).
+ */
+static VALUE
+BigDecimal_le(VALUE self, VALUE r)
+{
+    return BigDecimalCmp(self, r, 'L');
+}
+
+/* call-seq:
+ * a > b
+ *
+ * Returns true if a is greater than b.  Values may be coerced to 
+ * perform the comparison (see ==, coerce).
+ */
+static VALUE
+BigDecimal_gt(VALUE self, VALUE r)
+{
+    return BigDecimalCmp(self, r, '>');
+}
+
+/* call-seq:
+ * a >= b
+ *
+ * Returns true if a is greater than or equal to b. Values may be coerced to 
+ * perform the comparison (see ==, coerce)
+ */
+static VALUE
+BigDecimal_ge(VALUE self, VALUE r)
+{
+    return BigDecimalCmp(self, r, 'G');
+}
+
+static VALUE
+BigDecimal_neg(VALUE self)
+{
+    ENTER(5);
+    Real *c, *a;
+    GUARD_OBJ(a,GetVpValue(self,1));
+    GUARD_OBJ(c,VpCreateRbObject(a->Prec *(VpBaseFig() + 1), "0"));
+    VpAsgn(c, a, -1);
+    return ToValue(c);
+}
+
+ /* call-seq:
+  * mult(value, digits)
+  *
+  * Multiply by the specified value. 
+  *
+  * e.g.
+  *   c = a.mult(b,n)
+  *   c = a * b
+  *
+  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
+  */
+static VALUE
+BigDecimal_mult(VALUE self, VALUE r)
+{
+    ENTER(5);
+    Real *c, *a, *b;
+    U_LONG mx;
+
+    GUARD_OBJ(a,GetVpValue(self,1));
+    b = GetVpValue(r,0);
+    if(!b) return DoSomeOne(self,r);
+    SAVE(b);
+
+    mx = a->Prec + b->Prec;
+    GUARD_OBJ(c,VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
+    VpMult(c, a, b);
+    return ToValue(c);
+}
+
+static VALUE
+BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
+/* For c = self.div(r): with round operation */
+{
+    ENTER(5);
+    Real *a, *b;
+    U_LONG mx;
+
+    GUARD_OBJ(a,GetVpValue(self,1));
+    b = GetVpValue(r,0);
+    if(!b) return DoSomeOne(self,r);
+    SAVE(b);
+    *div = b;
+    mx =(a->MaxPrec + b->MaxPrec + 1) * VpBaseFig();
+    GUARD_OBJ((*c),VpCreateRbObject(mx, "#0"));
+    GUARD_OBJ((*res),VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
+    VpDivd(*c, *res, a, b);
+    return (VALUE)0;
+}
+
+ /* call-seq:
+  * div(value, digits)
+  * quo(value)
+  *
+  * Divide by the specified value. 
+  *
+  * e.g.
+  *   c = a.div(b,n)
+  *
+  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
+  * 
+  * If digits is 0, the result is the same as the / operator. If not, the
+  * result is an integer BigDecimal, by analogy with Float#div.
+  *
+  * The alias quo is provided since div(value, 0) is the same as computing
+  * the quotient; see divmod.
+  */
+static VALUE
+BigDecimal_div(VALUE self, VALUE r)
+/* For c = self/r: with round operation */
+{
+    ENTER(5);
+    Real *c=NULL, *res=NULL, *div = NULL;
+    r = BigDecimal_divide(&c, &res, &div, self, r);
+    if(r!=(VALUE)0) return r; /* coerced by other */
+    SAVE(c);SAVE(res);SAVE(div);
+    /* a/b = c + r/b */
+    /* c xxxxx
+       r 00000yyyyy  ==> (y/b)*BASE >= HALF_BASE
+     */
+    /* Round */
+    if(VpHasVal(div)) { /* frac[0] must be zero for NaN,INF,Zero */
+       VpInternalRound(c,0,c->frac[c->Prec-1],(VpBaseVal()*res->frac[0])/div->frac[0]);
+    }
+    return ToValue(c);
+}
+
+/*
+ * %: mod = a%b = a - (a.to_f/b).floor * b
+ * div = (a.to_f/b).floor
+ */
+static VALUE
+BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
+{
+    ENTER(8);
+    Real *c=NULL, *d=NULL, *res=NULL;
+    Real *a, *b;
+    U_LONG mx;
+
+    GUARD_OBJ(a,GetVpValue(self,1));
+    b = GetVpValue(r,0);
+    if(!b) return DoSomeOne(self,r);
+    SAVE(b);
+
+    if(VpIsNaN(a) || VpIsNaN(b)) goto NaN;
+    if(VpIsInf(a) || VpIsInf(b)) goto NaN;
+    if(VpIsZero(b))              goto NaN;
+    if(VpIsZero(a)) {
+       GUARD_OBJ(c,VpCreateRbObject(1, "0"));
+       GUARD_OBJ(d,VpCreateRbObject(1, "0"));
+       *div = d;
+       *mod = c;
+       return (VALUE)0;
+    }
+
+    mx = a->Prec;
+    if(mx<b->Prec) mx = b->Prec;
+    mx =(mx + 1) * VpBaseFig();
+    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(res,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
+    VpDivd(c, res, a, b);
+    mx = c->Prec *(VpBaseFig() + 1);
+    GUARD_OBJ(d,VpCreateRbObject(mx, "0"));
+    VpActiveRound(d,c,VP_ROUND_DOWN,0);
+    VpMult(res,d,b);
+    VpAddSub(c,a,res,-1);
+    if(!VpIsZero(c) && (VpGetSign(a)*VpGetSign(b)<0)) {
+        VpAddSub(res,d,VpOne(),-1);
+        VpAddSub(d  ,c,b,       1);
+        *div = res;
+        *mod = d;
+    } else {
+        *div = d;
+        *mod = c;
+    }
+    return (VALUE)0;
+
+NaN:
+    GUARD_OBJ(c,VpCreateRbObject(1, "NaN"));
+    GUARD_OBJ(d,VpCreateRbObject(1, "NaN"));
+    *div = d;
+    *mod = c;
+    return (VALUE)0;
+}
+
+/* call-seq:
+ * a % b
+ * a.modulo(b)
+ *
+ * Returns the modulus from dividing by b. See divmod.
+ */
+static VALUE
+BigDecimal_mod(VALUE self, VALUE r) /* %: a%b = a - (a.to_f/b).floor * b */
+{
+    ENTER(3);
+    VALUE obj;
+    Real *div=NULL, *mod=NULL;
+
+    obj = BigDecimal_DoDivmod(self,r,&div,&mod);
+    if(obj!=(VALUE)0) return obj;
+    SAVE(div);SAVE(mod);
+    return ToValue(mod);
+}
+
+static VALUE
+BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
+{
+    ENTER(10);
+    U_LONG mx;
+    Real *a=NULL, *b=NULL, *c=NULL, *res=NULL, *d=NULL, *rr=NULL, *ff=NULL;
+    Real *f=NULL;
+
+    GUARD_OBJ(a,GetVpValue(self,1));
+    b = GetVpValue(r,0);
+    if(!b) return DoSomeOne(self,r);
+    SAVE(b);
+
+    mx  =(a->MaxPrec + b->MaxPrec) *VpBaseFig();
+    GUARD_OBJ(c  ,VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(res,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
+    GUARD_OBJ(rr ,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
+    GUARD_OBJ(ff ,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
+
+    VpDivd(c, res, a, b);
+
+    mx = c->Prec *(VpBaseFig() + 1);
+
+    GUARD_OBJ(d,VpCreateRbObject(mx, "0"));
+    GUARD_OBJ(f,VpCreateRbObject(mx, "0"));
+
+    VpActiveRound(d,c,VP_ROUND_DOWN,0); /* 0: round off */
+
+    VpFrac(f, c);
+    VpMult(rr,f,b);
+    VpAddSub(ff,res,rr,1);
+
+    *dv = d;
+    *rv = ff;
+    return (VALUE)0;
+}
+
+/* Returns the remainder from dividing by the value.
+ *
+ * If the values divided are of the same sign, the remainder is the same as
+ * the modulus (see divmod).
+ *
+ * Otherwise, the remainder is the modulus minus the value divided by.
+ */
+static VALUE
+BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
+{
+    VALUE  f;
+    Real  *d,*rv;
+    f = BigDecimal_divremain(self,r,&d,&rv);
+    if(f!=(VALUE)0) return f;
+    return ToValue(rv);
+}
+
+/* Divides by the specified value, and returns the quotient and modulus
+ * as BigDecimal numbers. The quotient is rounded towards negative infinity.
+ *
+ * For example:
+ *
+ * require 'bigdecimal'
+ *
+ * a = BigDecimal.new("42")
+ * b = BigDecimal.new("9")
+ *
+ * q,m = a.divmod(b)
+ *
+ * c = q * b + m
+ *
+ * a == c  -> true
+ *
+ * The quotient q is (a/b).floor, and the modulus is the amount that must be 
+ * added to q * b to get a.
+ */
+static VALUE
+BigDecimal_divmod(VALUE self, VALUE r)
+{
+    ENTER(5);
+    VALUE obj;
+    Real *div=NULL, *mod=NULL;
+
+    obj = BigDecimal_DoDivmod(self,r,&div,&mod);
+    if(obj!=(VALUE)0) return obj;
+    SAVE(div);SAVE(mod);
+    obj = rb_assoc_new(ToValue(div), ToValue(mod));
+    return obj;
+}
+
+static VALUE
+BigDecimal_div2(int argc, VALUE *argv, VALUE self)
+{
+    ENTER(5);
+    VALUE b,n;
+    int na = rb_scan_args(argc,argv,"11",&b,&n);
+    if(na==1) { /* div in Float sense */
+       VALUE obj;
+       Real *div=NULL;
+       Real *mod;
+       obj = BigDecimal_DoDivmod(self,b,&div,&mod);
+       if(obj!=(VALUE)0) return obj;
+       return ToValue(div);
+    } else {    /* div in BigDecimal sense */
+       U_LONG ix = (U_LONG)GetPositiveInt(n);
+       if(ix==0) return BigDecimal_div(self,b);
+       else {
+          Real *res=NULL;
+          Real *av=NULL, *bv=NULL, *cv=NULL;
+          U_LONG mx = (ix+VpBaseFig()*2);
+          U_LONG pl = VpSetPrecLimit(0);
+
+          GUARD_OBJ(cv,VpCreateRbObject(mx,"0"));
+          GUARD_OBJ(av,GetVpValue(self,1));
+          GUARD_OBJ(bv,GetVpValue(b,1));
+          mx = av->Prec + bv->Prec + 2;
+          if(mx <= cv->MaxPrec) mx = cv->MaxPrec+1;
+          GUARD_OBJ(res,VpCreateRbObject((mx * 2  + 2)*VpBaseFig(), "#0"));
+          VpDivd(cv,res,av,bv);
+          VpSetPrecLimit(pl);
+          VpLeftRound(cv,VpGetRoundMode(),ix);
+          return ToValue(cv);
+       }
+    }
+}
+
+static VALUE
+BigDecimal_add2(VALUE self, VALUE b, VALUE n)
+{
+    ENTER(2);
+    Real   *cv;
+    U_LONG mx = (U_LONG)GetPositiveInt(n);
+    if(mx==0) return BigDecimal_add(self,b);
+    else {
+       U_LONG pl = VpSetPrecLimit(0);
+       VALUE   c = BigDecimal_add(self,b);
+       VpSetPrecLimit(pl);
+       GUARD_OBJ(cv,GetVpValue(c,1));
+       VpLeftRound(cv,VpGetRoundMode(),mx);
+       return ToValue(cv);
+    }
+}
+
+static VALUE
+BigDecimal_sub2(VALUE self, VALUE b, VALUE n)
+{
+    ENTER(2);
+    Real *cv;
+    U_LONG mx = (U_LONG)GetPositiveInt(n);
+    if(mx==0) return BigDecimal_sub(self,b);
+    else {
+       U_LONG pl = VpSetPrecLimit(0);
+       VALUE   c = BigDecimal_sub(self,b);
+       VpSetPrecLimit(pl);
+       GUARD_OBJ(cv,GetVpValue(c,1));
+       VpLeftRound(cv,VpGetRoundMode(),mx);
+       return ToValue(cv);
+    }
+}
+
+static VALUE
+BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
+{
+    ENTER(2);
+    Real *cv;
+    U_LONG mx = (U_LONG)GetPositiveInt(n);
+    if(mx==0) return BigDecimal_mult(self,b);
+    else {
+       U_LONG pl = VpSetPrecLimit(0);
+       VALUE   c = BigDecimal_mult(self,b);
+       VpSetPrecLimit(pl);
+       GUARD_OBJ(cv,GetVpValue(c,1));
+       VpLeftRound(cv,VpGetRoundMode(),mx);
+       return ToValue(cv);
+    }
+}
+
+/* Returns the absolute value.
+ *
+ * BigDecimal('5').abs -> 5
+ *
+ * BigDecimal('-3').abs -> 3
+ */
+static VALUE
+BigDecimal_abs(VALUE self)
+{
+    ENTER(5);
+    Real *c, *a;
+    U_LONG mx;
+
+    GUARD_OBJ(a,GetVpValue(self,1));
+    mx = a->Prec *(VpBaseFig() + 1);
+    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    VpAsgn(c, a, 1);
+    VpChangeSign(c,(S_INT)1);
+    return ToValue(c);
+}
+
+/* call-seq:
+ * sqrt(n)
+ *
+ * Returns the square root of the value.
+ *
+ * If n is specified, returns at least that many significant digits.
+ */
+static VALUE
+BigDecimal_sqrt(VALUE self, VALUE nFig)
+{
+    ENTER(5);
+    Real *c, *a;
+    S_INT mx, n;
+
+    GUARD_OBJ(a,GetVpValue(self,1));
+    mx = a->Prec *(VpBaseFig() + 1);
+
+    n = GetPositiveInt(nFig) + VpDblFig() + 1;
+    if(mx <= n) mx = n;
+    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    VpSqrt(c, a);
+    return ToValue(c);
+}
+
+/* Return the integer part of the number.
+ */
+static VALUE
+BigDecimal_fix(VALUE self)
+{
+    ENTER(5);
+    Real *c, *a;
+    U_LONG mx;
+
+    GUARD_OBJ(a,GetVpValue(self,1));
+    mx = a->Prec *(VpBaseFig() + 1);
+    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    VpActiveRound(c,a,VP_ROUND_DOWN,0); /* 0: round off */
+    return ToValue(c);
+}
+
+/* call-seq:
+ * round(n,mode)
+ *
+ * Round to the nearest 1 (by default), returning the result as a BigDecimal.
+ *
+ * BigDecimal('3.14159').round -> 3
+ *
+ * BigDecimal('8.7').round -> 9
+ *
+ * If n is specified and positive, the fractional part of the result has no
+ * more than that many digits. 
+ *
+ * If n is specified and negative, at least that many digits to the left of the
+ * decimal point will be 0 in the result.
+ *
+ * BigDecimal('3.14159').round(3) -> 3.142
+ *
+ * BigDecimal('13345.234').round(-2) -> 13300.0
+ *
+ * The value of the optional mode argument can be used to determine how 
+ * rounding is performed; see BigDecimal.mode.
+ */
+static VALUE
+BigDecimal_round(int argc, VALUE *argv, VALUE self)
+{
+    ENTER(5);
+    Real   *c, *a;
+    int    iLoc = 0;
+    U_LONG mx;
+    VALUE  vLoc;
+    VALUE  vRound;
+    U_LONG pl;
+
+    int    sw = VpGetRoundMode();
+
+    int na = rb_scan_args(argc,argv,"02",&vLoc,&vRound);
+    switch(na) {
+    case 0:
+        iLoc = 0;
+        break;
+    case 1:
+        Check_Type(vLoc, T_FIXNUM);
+        iLoc = FIX2INT(vLoc);
+        break;
+    case 2:
+        Check_Type(vLoc, T_FIXNUM);
+        iLoc = FIX2INT(vLoc);
+        Check_Type(vRound, T_FIXNUM);
+        sw   = FIX2INT(vRound);
+        if(!VpIsRoundMode(sw)) {
+            rb_raise(rb_eTypeError, "invalid rounding mode");
+            return Qnil;
+        }
+        break;
+    }
+
+    pl = VpSetPrecLimit(0);
+    GUARD_OBJ(a,GetVpValue(self,1));
+    mx = a->Prec *(VpBaseFig() + 1);
+    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    VpSetPrecLimit(pl);
+    VpActiveRound(c,a,sw,iLoc);
+    return ToValue(c);
+}
+
+/* call-seq:
+ * truncate(n)
+ *
+ * Truncate to the nearest 1, returning the result as a BigDecimal.
+ *
+ * BigDecimal('3.14159').truncate -> 3
+ *
+ * BigDecimal('8.7').truncate -> 8
+ *
+ * If n is specified and positive, the fractional part of the result has no
+ * more than that many digits. 
+ *
+ * If n is specified and negative, at least that many digits to the left of the
+ * decimal point will be 0 in the result.
+ *
+ * BigDecimal('3.14159').truncate(3) -> 3.141
+ *
+ * BigDecimal('13345.234').truncate(-2) -> 13300.0
+ */
+static VALUE
+BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
+{
+    ENTER(5);
+    Real *c, *a;
+    int iLoc;
+    U_LONG mx;
+    VALUE vLoc;
+    U_LONG pl = VpSetPrecLimit(0);
+
+    if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
+        iLoc = 0;
+    } else {
+        Check_Type(vLoc, T_FIXNUM);
+        iLoc = FIX2INT(vLoc);
+    }
+
+    GUARD_OBJ(a,GetVpValue(self,1));
+    mx = a->Prec *(VpBaseFig() + 1);
+    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    VpSetPrecLimit(pl);
+    VpActiveRound(c,a,VP_ROUND_DOWN,iLoc); /* 0: truncate */
+    return ToValue(c);
+}
+
+/* Return the fractional part of the number.
+ */
+static VALUE
+BigDecimal_frac(VALUE self)
+{
+    ENTER(5);
+    Real *c, *a;
+    U_LONG mx;
+
+    GUARD_OBJ(a,GetVpValue(self,1));
+    mx = a->Prec *(VpBaseFig() + 1);
+    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    VpFrac(c, a);
+    return ToValue(c);
+}
+
+/* call-seq:
+ * floor(n)
+ *
+ * Return the largest integer less than or equal to the value, as a BigDecimal.
+ *
+ * BigDecimal('3.14159').floor -> 3
+ *
+ * BigDecimal('-9.1').floor -> -10
+ *
+ * If n is specified and positive, the fractional part of the result has no
+ * more than that many digits.  
+ *
+ * If n is specified and negative, at least that
+ * many digits to the left of the decimal point will be 0 in the result.
+ *
+ * BigDecimal('3.14159').floor(3) -> 3.141
+ *
+ * BigDecimal('13345.234').floor(-2) -> 13300.0
+ */
+static VALUE
+BigDecimal_floor(int argc, VALUE *argv, VALUE self)
+{
+    ENTER(5);
+    Real *c, *a;
+    U_LONG mx;
+    int iLoc;
+    VALUE vLoc;
+    U_LONG pl = VpSetPrecLimit(0);
+
+    if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
+        iLoc = 0;
+    } else {
+        Check_Type(vLoc, T_FIXNUM);
+        iLoc = FIX2INT(vLoc);
+    }
+
+    GUARD_OBJ(a,GetVpValue(self,1));
+    mx = a->Prec *(VpBaseFig() + 1);
+    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    VpSetPrecLimit(pl);
+    VpActiveRound(c,a,VP_ROUND_FLOOR,iLoc);
+    return ToValue(c);
+}
+
+/* call-seq:
+ * ceil(n)
+ *
+ * Return the smallest integer greater than or equal to the value, as a BigDecimal.
+ *
+ * BigDecimal('3.14159').ceil -> 4
+ *
+ * BigDecimal('-9.1').ceil -> -9
+ *
+ * If n is specified and positive, the fractional part of the result has no
+ * more than that many digits.  
+ *
+ * If n is specified and negative, at least that
+ * many digits to the left of the decimal point will be 0 in the result.
+ *
+ * BigDecimal('3.14159').ceil(3) -> 3.142
+ *
+ * BigDecimal('13345.234').ceil(-2) -> 13400.0
+ */
+static VALUE
+BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
+{
+    ENTER(5);
+    Real *c, *a;
+    U_LONG mx;
+    int iLoc;
+    VALUE vLoc;
+    U_LONG pl = VpSetPrecLimit(0);
+
+    if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
+        iLoc = 0;
+    } else {
+        Check_Type(vLoc, T_FIXNUM);
+        iLoc = FIX2INT(vLoc);
+    }
+
+    GUARD_OBJ(a,GetVpValue(self,1));
+    mx = a->Prec *(VpBaseFig() + 1);
+    GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
+    VpSetPrecLimit(pl);
+    VpActiveRound(c,a,VP_ROUND_CEIL,iLoc);
+    return ToValue(c);
+}
+
+/* call-seq:
+ * to_s(s)
+ *
+ * Converts the value to a string.
+ *
+ * The default format looks like  0.xxxxEnn.
+ *
+ * The optional parameter s consists of either an integer; or an optional '+'
+ * or ' ', followed by an optional number, followed by an optional 'E' or 'F'.
+ *
+ * If there is a '+' at the start of s, positive values are returned with
+ * a leading '+'.
+ *
+ * A space at the start of s returns positive values with a leading space.
+ *
+ * If s contains a number, a space is inserted after each group of that many 
+ * fractional digits.
+ *
+ * If s ends with an 'E', engineering notation (0.xxxxEnn) is used.
+ *
+ * If s ends with an 'F', conventional floating point notation is used.
+ *
+ * Examples:
+ *
+ * BigDecimal.new('-123.45678901234567890').to_s('5F') -> '-123.45678 90123 45678 9'
+ *
+ * BigDecimal.new('123.45678901234567890').to_s('+8F') -> '+123.45678901 23456789'
+ *
+ * BigDecimal.new('123.45678901234567890').to_s(' F') -> ' 123.4567890123456789'
+ */
+static VALUE
+BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
+{
+    ENTER(5);
+    int   fmt=0;   /* 0:E format */
+    int   fPlus=0; /* =0:default,=1: set ' ' before digits ,set '+' before digits. */
+    Real  *vp;
+    char  *psz;
+    char   ch;
+    U_LONG nc;
+    S_INT  mc = 0;
+    VALUE  f;
+
+    GUARD_OBJ(vp,GetVpValue(self,1));
+    
+    if(rb_scan_args(argc,argv,"01",&f)==1) {
+        if(TYPE(f)==T_STRING) {
+            SafeStringValue(f);
+            psz = RSTRING_PTR(f);
+            if(*psz==' ') {
+                fPlus = 1; psz++;
+            } else if(*psz=='+') {
+                fPlus = 2; psz++;
+            }
+            while(ch=*psz++) {
+                if(ISSPACE(ch)) continue;
+                if(!ISDIGIT(ch)) {
+                    if(ch=='F' || ch=='f') fmt = 1; /* F format */
+                    break;
+                }
+                mc = mc * 10 + ch - '0';
+            }
+        } else {
+            mc  = GetPositiveInt(f);
+        }
+    }
+    if(fmt) {
+        nc = VpNumOfChars(vp,"F");
+    } else {
+        nc = VpNumOfChars(vp,"E");
+    }
+    if(mc>0) nc += (nc + mc - 1) / mc + 1;
+
+    psz = ALLOCA_N(char,(unsigned int)nc);
+
+    if(fmt) {
+        VpToFString(vp, psz, mc, fPlus);
+    } else {
+        VpToString (vp, psz, mc, fPlus);
+    }
+    return rb_str_new2(psz);
+}
+
+/* Splits a BigDecimal number into four parts, returned as an array of values.
+ *
+ * The first value represents the sign of the BigDecimal, and is -1 or 1, or 0
+ * if the BigDecimal is Not a Number.
+ *
+ * The second value is a string representing the significant digits of the
+ * BigDecimal, with no leading zeros.
+ *
+ * The third value is the base used for arithmetic (currently always 10) as an
+ * Integer.
+ *
+ * The fourth value is an Integer exponent.
+ *
+ * If the BigDecimal can be represented as 0.xxxxxx*10**n, then xxxxxx is the 
+ * string of significant digits with no leading zeros, and n is the exponent.
+ *
+ * From these values, you can translate a BigDecimal to a float as follows:
+ *
+ *   sign, significant_digits, base, exponent = a.split
+ *   f = sign * "0.#{significant_digits}".to_f * (base ** exponent)
+ *
+ * (Note that the to_f method is provided as a more convenient way to translate 
+ * a BigDecimal to a Float.)
+ */
+static VALUE
+BigDecimal_split(VALUE self)
+{
+    ENTER(5);
+    Real *vp;
+    VALUE obj,obj1;
+    S_LONG e;
+    S_LONG s;
+    char *psz1;
+
+    GUARD_OBJ(vp,GetVpValue(self,1));
+    psz1 = ALLOCA_N(char,(unsigned int)VpNumOfChars(vp,"E"));
+    VpSzMantissa(vp,psz1);
+    s = 1;
+    if(psz1[0]=='-') {
+        s = -1; ++psz1;
+    }
+    if(psz1[0]=='N') s=0; /* NaN */
+    e = VpExponent10(vp);
+    obj1 = rb_str_new2(psz1);
+    obj  = rb_ary_new2(4);
+    rb_ary_push(obj, INT2FIX(s));
+    rb_ary_push(obj, obj1);
+    rb_ary_push(obj, INT2FIX(10));
+    rb_ary_push(obj, INT2NUM(e));
+    return obj;
+}
+
+/* Returns the exponent of the BigDecimal number, as an Integer.
+ *
+ * If the number can be represented as 0.xxxxxx*10**n where xxxxxx is a string
+ * of digits with no leading zeros, then n is the exponent.
+ */
+static VALUE
+BigDecimal_exponent(VALUE self)
+{
+    S_LONG e = VpExponent10(GetVpValue(self,1));
+    return INT2NUM(e);
+}
+
+/* Returns debugging information about the value as a string of comma-separated
+ * values in angle brackets with a leading #:
+ *
+ * BigDecimal.new("1234.5678").inspect ->
+ * "#<BigDecimal:b7ea1130,'0.12345678E4',8(12)>"
+ *
+ * The first part is the address, the second is the value as a string, and
+ * the final part ss(mm) is the current number of significant digits and the
+ * maximum number of significant digits, respectively.
+ */
+static VALUE
+BigDecimal_inspect(VALUE self)
+{
+    ENTER(5);
+    Real *vp;
+    VALUE obj;
+    unsigned int nc;
+    char *psz1;
+    char *pszAll;
+
+    GUARD_OBJ(vp,GetVpValue(self,1));
+    nc = VpNumOfChars(vp,"E");
+    nc +=(nc + 9) / 10;
+
+    psz1   = ALLOCA_N(char,nc);
+    pszAll = ALLOCA_N(char,nc+256);
+    VpToString(vp, psz1, 10, 0);
+    sprintf(pszAll,"#<BigDecimal:%lx,'%s',%lu(%lu)>",self,psz1,VpPrec(vp)*VpBaseFig(),VpMaxPrec(vp)*VpBaseFig());
+    obj = rb_str_new2(pszAll);
+    return obj;
+}
+
+/* call-seq:
+ * power(n)
+ *
+ * Returns the value raised to the power of n. Note that n must be an Integer.
+ *
+ * Also available as the operator **
+ */
+static VALUE
+BigDecimal_power(VALUE self, VALUE p)
+{
+    ENTER(5);
+    Real *x, *y;
+    S_LONG mp, ma, n;
+
+    Check_Type(p, T_FIXNUM);
+    n = FIX2INT(p);
+    ma = n;
+    if(ma < 0)  ma = -ma;
+    if(ma == 0) ma = 1;
+
+    GUARD_OBJ(x,GetVpValue(self,1));
+    if(VpIsDef(x)) {
+        mp = x->Prec *(VpBaseFig() + 1);
+        GUARD_OBJ(y,VpCreateRbObject(mp *(ma + 1), "0"));
+    } else {
+        GUARD_OBJ(y,VpCreateRbObject(1, "0"));
+    }
+    VpPower(y, x, n);
+    return ToValue(y);
+}
+
+static VALUE
+BigDecimal_global_new(int argc, VALUE *argv, VALUE self)
+{
+    ENTER(5);
+    Real *pv;
+    S_LONG mf;
+    VALUE  nFig;
+    VALUE  iniValue;
+
+    if(rb_scan_args(argc,argv,"11",&iniValue,&nFig)==1) {
+        mf = 0;
+    } else {
+        mf = GetPositiveInt(nFig);
+    }
+    SafeStringValue(iniValue);
+    GUARD_OBJ(pv,VpCreateRbObject(mf, RSTRING_PTR(iniValue)));
+    return ToValue(pv);
+}
+
+ /* call-seq:
+  * new(initial, digits)
+  *
+  * Create a new BigDecimal object.
+  *
+  * initial:: The initial value, as a String. Spaces are ignored, unrecognized characters terminate the value.
+  *
+  * digits:: The number of significant digits, as a Fixnum. If omitted or 0, the number of significant digits is determined from the initial value.
+  *
+  * The actual number of significant digits used in computation is usually
+  * larger than the specified number.
+  */
+static VALUE
+BigDecimal_new(int argc, VALUE *argv, VALUE self)
+{
+    ENTER(5);
+    Real *pv;
+    S_LONG mf;
+    VALUE  nFig;
+    VALUE  iniValue;
+
+    if(rb_scan_args(argc,argv,"11",&iniValue,&nFig)==1) {
+        mf = 0;
+    } else {
+        mf = GetPositiveInt(nFig);
+    }
+    SafeStringValue(iniValue);
+    GUARD_OBJ(pv,VpNewRbClass(mf, RSTRING_PTR(iniValue),self));
+    return ToValue(pv);
+}
+
+ /* call-seq:
+  * BigDecimal.limit(digits)
+  *
+  * Limit the number of significant digits in newly created BigDecimal 
+  * numbers to the specified value. Rounding is performed as necessary, 
+  * as specified by BigDecimal.mode.
+  *
+  * A limit of 0, the default, means no upper limit.
+  *
+  * The limit specified by this method takes priority over any limit 
+  * specified to instance methods such as ceil, floor, truncate, or round.
+  */
+static VALUE
+BigDecimal_limit(int argc, VALUE *argv, VALUE self)
+{
+    VALUE  nFig;
+    VALUE  nCur = INT2NUM(VpGetPrecLimit());
+
+    if(rb_scan_args(argc,argv,"01",&nFig)==1) {
+        int nf;
+        if(nFig==Qnil) return nCur;
+        Check_Type(nFig, T_FIXNUM);
+        nf = FIX2INT(nFig);
+        if(nf<0) {
+            rb_raise(rb_eArgError, "argument must be positive");
+        }
+        VpSetPrecLimit(nf);
+    }
+    return nCur;
+}
+
+/* Returns the sign of the value.
+ *
+ * Returns a positive value if > 0, a negative value if < 0, and a 
+ * zero if == 0.
+ *
+ * The specific value returned indicates the type and sign of the BigDecimal, 
+ * as follows:
+ *
+ * BigDecimal::SIGN_NaN:: value is Not a Number
+ * BigDecimal::SIGN_POSITIVE_ZERO:: value is +0
+ * BigDecimal::SIGN_NEGATIVE_ZERO:: value is -0
+ * BigDecimal::SIGN_POSITIVE_INFINITE:: value is +infinity
+ * BigDecimal::SIGN_NEGATIVE_INFINITE:: value is -infinity
+ * BigDecimal::SIGN_POSITIVE_FINITE:: value is positive
+ * BigDecimal::SIGN_NEGATIVE_FINITE:: value is negative
+ */
+static VALUE
+BigDecimal_sign(VALUE self)
+{ /* sign */
+    int s = GetVpValue(self,1)->sign;
+    return INT2FIX(s);
+}
+
+void
+Init_bigdecimal(void)
+{
+    /* Initialize VP routines */
+    VpInit((U_LONG)0);
+
+    /* Class and method registration */
+    rb_cBigDecimal = rb_define_class("BigDecimal",rb_cNumeric);
+
+    /* Global function */
+    rb_define_global_function("BigDecimal", BigDecimal_global_new, -1);
+
+    /* Class methods */
+    rb_define_singleton_method(rb_cBigDecimal, "new", BigDecimal_new, -1);
+    rb_define_singleton_method(rb_cBigDecimal, "mode", BigDecimal_mode, -1);
+    rb_define_singleton_method(rb_cBigDecimal, "limit", BigDecimal_limit, -1);
+    rb_define_singleton_method(rb_cBigDecimal, "double_fig", BigDecimal_double_fig, 0);
+    rb_define_singleton_method(rb_cBigDecimal, "induced_from",BigDecimal_induced_from, 1);
+    rb_define_singleton_method(rb_cBigDecimal, "_load", BigDecimal_load, 1);
+    rb_define_singleton_method(rb_cBigDecimal, "ver", BigDecimal_version, 0);
+
+    /* Constants definition */
+
+    /* 
+     * Base value used in internal calculations.  On a 32 bit system, BASE 
+     * is 10000, indicating that calculation is done in groups of 4 digits.  
+     * (If it were larger, BASE**2 wouldn't fit in 32 bits, so you couldn't
+     * guarantee that two groups could always be multiplied together without 
+     * overflow.) 
+     */
+    rb_define_const(rb_cBigDecimal, "BASE", INT2FIX((S_INT)VpBaseVal()));
+
+    /* Exceptions */
+
+    /*
+     * 0xff: Determines whether overflow, underflow or zero divide result in 
+     * an exception being thrown. See BigDecimal.mode.
+     */
+    rb_define_const(rb_cBigDecimal, "EXCEPTION_ALL",INT2FIX(VP_EXCEPTION_ALL));
+
+    /* 
+     * 0x02: Determines what happens when the result of a computation is not a 
+     * number (NaN). See BigDecimal.mode. 
+     */
+    rb_define_const(rb_cBigDecimal, "EXCEPTION_NaN",INT2FIX(VP_EXCEPTION_NaN));
+
+    /* 
+     * 0x01: Determines what happens when the result of a computation is
+     * infinity.  See BigDecimal.mode.
+     */
+    rb_define_const(rb_cBigDecimal, "EXCEPTION_INFINITY",INT2FIX(VP_EXCEPTION_INFINITY));
+
+    /* 
+     * 0x04: Determines what happens when the result of a computation is an
+     * underflow (a result too small to be represented). See BigDecimal.mode.
+     */
+    rb_define_const(rb_cBigDecimal, "EXCEPTION_UNDERFLOW",INT2FIX(VP_EXCEPTION_UNDERFLOW));
+
+    /* 
+     * 0x01: Determines what happens when the result of a computation is an
+     * underflow (a result too large to be represented). See BigDecimal.mode.
+     */
+    rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW",INT2FIX(VP_EXCEPTION_OVERFLOW));
+
+    /* 
+     * 0x01: Determines what happens when a division by zero is performed.
+     * See BigDecimal.mode.
+     */
+    rb_define_const(rb_cBigDecimal, "EXCEPTION_ZERODIVIDE",INT2FIX(VP_EXCEPTION_ZERODIVIDE));
+
+    /* 
+     * 0x100: Determines what happens when a result must be rounded in order to
+     * fit in the appropriate number of significant digits. See
+     * BigDecimal.mode.
+     */
+    rb_define_const(rb_cBigDecimal, "ROUND_MODE",INT2FIX(VP_ROUND_MODE));
+
+    /* 1: Indicates that values should be rounded away from zero. See
+     * BigDecimal.mode.
+     */
+    rb_define_const(rb_cBigDecimal, "ROUND_UP",INT2FIX(VP_ROUND_UP));
+
+    /* 2: Indicates that values should be rounded towards zero. See
+     * BigDecimal.mode.
+     */
+    rb_define_const(rb_cBigDecimal, "ROUND_DOWN",INT2FIX(VP_ROUND_DOWN));
+
+    /* 3: Indicates that digits >= 5 should be rounded up, others rounded down.
+     * See BigDecimal.mode. */
+    rb_define_const(rb_cBigDecimal, "ROUND_HALF_UP",INT2FIX(VP_ROUND_HALF_UP));
+
+    /* 4: Indicates that digits >= 6 should be rounded up, others rounded down.
+     * See BigDecimal.mode.
+     */
+    rb_define_const(rb_cBigDecimal, "ROUND_HALF_DOWN",INT2FIX(VP_ROUND_HALF_DOWN));
+    /* 5: Round towards +infinity. See BigDecimal.mode. */
+    rb_define_const(rb_cBigDecimal, "ROUND_CEILING",INT2FIX(VP_ROUND_CEIL));
+
+    /* 6: Round towards -infinity. See BigDecimal.mode. */
+    rb_define_const(rb_cBigDecimal, "ROUND_FLOOR",INT2FIX(VP_ROUND_FLOOR));
+
+    /* 7: Round towards the even neighbor. See BigDecimal.mode. */
+    rb_define_const(rb_cBigDecimal, "ROUND_HALF_EVEN",INT2FIX(VP_ROUND_HALF_EVEN));
+
+    /* 0: Indicates that a value is not a number. See BigDecimal.sign. */
+    rb_define_const(rb_cBigDecimal, "SIGN_NaN",INT2FIX(VP_SIGN_NaN));
+
+    /* 1: Indicates that a value is +0. See BigDecimal.sign. */
+    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_ZERO",INT2FIX(VP_SIGN_POSITIVE_ZERO));
+
+    /* -1: Indicates that a value is -0. See BigDecimal.sign. */
+    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_ZERO",INT2FIX(VP_SIGN_NEGATIVE_ZERO));
+
+    /* 2: Indicates that a value is positive and finite. See BigDecimal.sign. */
+    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_FINITE",INT2FIX(VP_SIGN_POSITIVE_FINITE));
+
+    /* -2: Indicates that a value is negative and finite. See BigDecimal.sign. */
+    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_FINITE",INT2FIX(VP_SIGN_NEGATIVE_FINITE));
+
+    /* 3: Indicates that a value is positive and infinite. See BigDecimal.sign. */
+    rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_INFINITE",INT2FIX(VP_SIGN_POSITIVE_INFINITE));
+
+    /* -3: Indicates that a value is negative and infinite. See BigDecimal.sign. */
+    rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_INFINITE",INT2FIX(VP_SIGN_NEGATIVE_INFINITE));
+
+    /* instance methods */
+    rb_define_method(rb_cBigDecimal, "precs", BigDecimal_prec, 0);
+
+    rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
+    rb_define_method(rb_cBigDecimal, "sub", BigDecimal_sub2, 2);
+    rb_define_method(rb_cBigDecimal, "mult", BigDecimal_mult2, 2);
+    rb_define_method(rb_cBigDecimal, "div",BigDecimal_div2, -1);
+    rb_define_method(rb_cBigDecimal, "hash", BigDecimal_hash, 0);
+    rb_define_method(rb_cBigDecimal, "to_s", BigDecimal_to_s, -1);
+    rb_define_method(rb_cBigDecimal, "to_i", BigDecimal_to_i, 0);
+    rb_define_method(rb_cBigDecimal, "to_int", BigDecimal_to_i, 0);
+    rb_define_method(rb_cBigDecimal, "split", BigDecimal_split, 0);
+    rb_define_method(rb_cBigDecimal, "+", BigDecimal_add, 1);
+    rb_define_method(rb_cBigDecimal, "-", BigDecimal_sub, 1);
+    rb_define_method(rb_cBigDecimal, "+@", BigDecimal_uplus, 0);
+    rb_define_method(rb_cBigDecimal, "-@", BigDecimal_neg, 0);
+    rb_define_method(rb_cBigDecimal, "*", BigDecimal_mult, 1);
+    rb_define_method(rb_cBigDecimal, "/", BigDecimal_div, 1);
+    rb_define_method(rb_cBigDecimal, "quo", BigDecimal_div, 1);
+    rb_define_method(rb_cBigDecimal, "%", BigDecimal_mod, 1);
+    rb_define_method(rb_cBigDecimal, "modulo", BigDecimal_mod, 1);
+    rb_define_method(rb_cBigDecimal, "remainder", BigDecimal_remainder, 1);
+    rb_define_method(rb_cBigDecimal, "divmod", BigDecimal_divmod, 1);
+    /* rb_define_method(rb_cBigDecimal, "dup", BigDecimal_dup, 0); */
+    rb_define_method(rb_cBigDecimal, "to_f", BigDecimal_to_f, 0);
+    rb_define_method(rb_cBigDecimal, "abs", BigDecimal_abs, 0);
+    rb_define_method(rb_cBigDecimal, "sqrt", BigDecimal_sqrt, 1);
+    rb_define_method(rb_cBigDecimal, "fix", BigDecimal_fix, 0);
+    rb_define_method(rb_cBigDecimal, "round", BigDecimal_round, -1);
+    rb_define_method(rb_cBigDecimal, "frac", BigDecimal_frac, 0);
+    rb_define_method(rb_cBigDecimal, "floor", BigDecimal_floor, -1);
+    rb_define_method(rb_cBigDecimal, "ceil", BigDecimal_ceil, -1);
+    rb_define_method(rb_cBigDecimal, "power", BigDecimal_power, 1);
+    rb_define_method(rb_cBigDecimal, "**", BigDecimal_power, 1);
+    rb_define_method(rb_cBigDecimal, "<=>", BigDecimal_comp, 1);
+    rb_define_method(rb_cBigDecimal, "==", BigDecimal_eq, 1);
+    rb_define_method(rb_cBigDecimal, "===", BigDecimal_eq, 1);
+    rb_define_method(rb_cBigDecimal, "eql?", BigDecimal_eq, 1);
+    rb_define_method(rb_cBigDecimal, "<", BigDecimal_lt, 1);
+    rb_define_method(rb_cBigDecimal, "<=", BigDecimal_le, 1);
+    rb_define_method(rb_cBigDecimal, ">", BigDecimal_gt, 1);
+    rb_define_method(rb_cBigDecimal, ">=", BigDecimal_ge, 1);
+    rb_define_method(rb_cBigDecimal, "zero?", BigDecimal_zero, 0);
+    rb_define_method(rb_cBigDecimal, "nonzero?", BigDecimal_nonzero, 0);
+    rb_define_method(rb_cBigDecimal, "coerce", BigDecimal_coerce, 1);
+    rb_define_method(rb_cBigDecimal, "inspect", BigDecimal_inspect, 0);
+    rb_define_method(rb_cBigDecimal, "exponent", BigDecimal_exponent, 0);
+    rb_define_method(rb_cBigDecimal, "sign", BigDecimal_sign, 0);
+    rb_define_method(rb_cBigDecimal, "nan?",      BigDecimal_IsNaN, 0);
+    rb_define_method(rb_cBigDecimal, "infinite?", BigDecimal_IsInfinite, 0);
+    rb_define_method(rb_cBigDecimal, "finite?",   BigDecimal_IsFinite, 0);
+    rb_define_method(rb_cBigDecimal, "truncate",  BigDecimal_truncate, -1);
+    rb_define_method(rb_cBigDecimal, "_dump", BigDecimal_dump, -1);
+}
+
+/*
+ *
+ *  ============================================================================
+ *
+ *  vp_ routines begin from here.
+ *
+ *  ============================================================================
+ *
+ */
+#ifdef _DEBUG
+/*static int gfDebug = 1;*/         /* Debug switch */
+static int gfCheckVal = 1;      /* Value checking flag in VpNmlz()  */
+#endif /* _DEBUG */
+
+static U_LONG gnPrecLimit = 0;  /* Global upper limit of the precision newly allocated */
+static U_LONG gfRoundMode = VP_ROUND_HALF_UP; /* Mode for general rounding operation   */
+
+static U_LONG BASE_FIG = 4;     /* =log10(BASE)  */
+static U_LONG BASE = 10000L;    /* Base value(value must be 10**BASE_FIG) */
+                /* The value of BASE**2 + BASE must be represented */
+                /* within one U_LONG. */
+static U_LONG HALF_BASE = 5000L;/* =BASE/2  */
+static S_LONG DBLE_FIG = 8;    /* figure of double */
+static U_LONG BASE1 = 1000L;    /* =BASE/10  */
+
+static Real *VpConstOne;    /* constant 1.0 */
+static Real *VpPt5;        /* constant 0.5 */
+static U_LONG maxnr = 100;    /* Maximum iterations for calcurating sqrt. */
+                /* used in VpSqrt() */
+
+/* ETC */
+#define MemCmp(x,y,z) memcmp(x,y,z)
+#define StrCmp(x,y)   strcmp(x,y)
+
+static int VpIsDefOP(Real *c,Real *a,Real *b,int sw);
+static int AddExponent(Real *a,S_INT n);
+static U_LONG VpAddAbs(Real *a,Real *b,Real *c);
+static U_LONG VpSubAbs(Real *a,Real *b,Real *c);
+static U_LONG VpSetPTR(Real *a,Real *b,Real *c,U_LONG *a_pos,U_LONG *b_pos,U_LONG *c_pos,U_LONG *av,U_LONG *bv);
+static int VpNmlz(Real *a);
+static void VpFormatSt(char *psz,S_INT fFmt);
+static int VpRdup(Real *m,U_LONG ind_m);
+
+#ifdef _DEBUG
+static int gnAlloc=0; /* Memory allocation counter */
+#endif /* _DEBUG */
+
+VP_EXPORT void *
+VpMemAlloc(U_LONG mb)
+{
+    void *p = xmalloc((unsigned int)mb);
+    if(!p) {
+        VpException(VP_EXCEPTION_MEMORY,"failed to allocate memory",1);
+    }
+    memset(p,0,mb);
+#ifdef _DEBUG
+    gnAlloc++; /* Count allocation call */
+#endif /* _DEBUG */
+    return p;
+}
+
+VP_EXPORT void
+VpFree(Real *pv)
+{
+    if(pv != NULL) {
+        xfree(pv);
+#ifdef _DEBUG
+        gnAlloc--; /* Decrement allocation count */
+        if(gnAlloc==0) {
+            printf(" *************** All memories allocated freed ****************");
+            getchar();
+        }
+        if(gnAlloc<0) {
+            printf(" ??????????? Too many memory free calls(%d) ?????????????\n",gnAlloc);
+            getchar();
+        }
+#endif /* _DEBUG */
+    }
+}
+
+/*
+ * EXCEPTION Handling.
+ */
+static unsigned short gfDoException = 0; /* Exception flag */
+
+static unsigned short
+VpGetException (void)
+{
+    return gfDoException;
+}
+
+static void
+VpSetException(unsigned short f)
+{
+    gfDoException = f;
+}
+
+/* These 2 functions added at v1.1.7 */
+VP_EXPORT U_LONG
+VpGetPrecLimit(void)
+{
+    return gnPrecLimit;
+}
+
+VP_EXPORT U_LONG
+VpSetPrecLimit(U_LONG n)
+{
+    U_LONG s = gnPrecLimit;
+    gnPrecLimit = n;
+    return s;
+}
+
+VP_EXPORT unsigned long
+VpGetRoundMode(void)
+{
+    return gfRoundMode;
+}
+
+VP_EXPORT int
+VpIsRoundMode(unsigned long n)
+{
+    if(n==VP_ROUND_UP      || n!=VP_ROUND_DOWN      ||
+       n==VP_ROUND_HALF_UP || n!=VP_ROUND_HALF_DOWN ||
+       n==VP_ROUND_CEIL    || n!=VP_ROUND_FLOOR     ||
+       n==VP_ROUND_HALF_EVEN
+      ) return 1;
+    return 0;
+}
+
+VP_EXPORT unsigned long
+VpSetRoundMode(unsigned long n)
+{
+    if(VpIsRoundMode(n)) gfRoundMode = n;
+    return gfRoundMode;
+}
+
+/*
+ *  0.0 & 1.0 generator
+ *    These gZero_..... and gOne_..... can be any name
+ *    referenced from nowhere except Zero() and One().
+ *    gZero_..... and gOne_..... must have global scope
+ *    (to let the compiler know they may be changed in outside
+ *    (... but not actually..)).
+ */
+volatile double gZero_ABCED9B1_CE73__00400511F31D = 0.0;
+volatile double gOne_ABCED9B4_CE73__00400511F31D  = 1.0;
+static double
+Zero(void)
+{
+    return gZero_ABCED9B1_CE73__00400511F31D;
+}
+
+static double
+One(void)
+{
+    return gOne_ABCED9B4_CE73__00400511F31D;
+}
+
+VP_EXPORT U_LONG
+VpBaseFig(void)
+{
+    return BASE_FIG;
+}
+
+VP_EXPORT U_LONG
+VpDblFig(void)
+{
+    return DBLE_FIG;
+}
+
+VP_EXPORT U_LONG
+VpBaseVal(void)
+{
+    return BASE;
+}
+
+/*
+  ----------------------------------------------------------------
+  Value of sign in Real structure is reserved for future use.
+  short sign;
+                    ==0 : NaN
+                      1 : Positive zero
+                     -1 : Negative zero
+                      2 : Positive number
+                     -2 : Negative number
+                      3 : Positive infinite number
+                     -3 : Negative infinite number
+  ----------------------------------------------------------------
+*/
+
+VP_EXPORT double
+VpGetDoubleNaN(void) /* Returns the value of NaN */
+{
+    static double fNaN = 0.0;
+    if(fNaN==0.0) fNaN = Zero()/Zero();
+    return fNaN;
+}
+
+VP_EXPORT double
+VpGetDoublePosInf(void) /* Returns the value of +Infinity */
+{
+    static double fInf = 0.0;
+    if(fInf==0.0) fInf = One()/Zero();
+    return fInf;
+}
+
+VP_EXPORT double
+VpGetDoubleNegInf(void) /* Returns the value of -Infinity */
+{
+    static double fInf = 0.0;
+    if(fInf==0.0) fInf = -(One()/Zero());
+    return fInf;
+}
+
+VP_EXPORT double
+VpGetDoubleNegZero(void) /* Returns the value of -0 */
+{
+    static double nzero = 1000.0;
+    if(nzero!=0.0) nzero = (One()/VpGetDoubleNegInf());
+    return nzero;
+}
+
+VP_EXPORT int
+VpIsNegDoubleZero(double v)
+{
+    double z = VpGetDoubleNegZero();
+    return MemCmp(&v,&z,sizeof(v))==0;
+}
+
+VP_EXPORT int
+VpException(unsigned short f, const char *str,int always)
+{
+    VALUE exc;
+    int   fatal=0;
+
+    if(f==VP_EXCEPTION_OP || f==VP_EXCEPTION_MEMORY) always = 1;
+
+    if(always||(gfDoException&f)) {
+        switch(f)
+        {
+        /*
+        case VP_EXCEPTION_ZERODIVIDE:
+        case VP_EXCEPTION_OVERFLOW:
+        */
+        case VP_EXCEPTION_INFINITY:
+             exc = rb_eFloatDomainError;
+             goto raise;
+        case VP_EXCEPTION_NaN:
+             exc = rb_eFloatDomainError;
+             goto raise;
+        case VP_EXCEPTION_UNDERFLOW:
+             exc = rb_eFloatDomainError;
+             goto raise;
+        case VP_EXCEPTION_OP:
+             exc = rb_eFloatDomainError;
+             goto raise;
+        case VP_EXCEPTION_MEMORY:
+             fatal = 1;
+             goto raise;
+        default:
+             fatal = 1;
+             goto raise;
+        }
+    }
+    return 0; /* 0 Means VpException() raised no exception */
+
+raise:
+    if(fatal) rb_fatal("%s", str);
+    else   rb_raise(exc, "%s", str);
+    return 0;
+}
+
+/* Throw exception or returns 0,when resulting c is Inf or NaN */
+/*  sw=1:+ 2:- 3:* 4:/ */
+static int
+VpIsDefOP(Real *c,Real *a,Real *b,int sw)
+{
+    if(VpIsNaN(a) || VpIsNaN(b)) {
+        /* at least a or b is NaN */
+        VpSetNaN(c);
+        goto NaN;
+    }
+
+    if(VpIsInf(a)) {
+        if(VpIsInf(b)) {
+            switch(sw)
+            {
+            case 1: /* + */
+                if(VpGetSign(a)==VpGetSign(b)) {
+                    VpSetInf(c,VpGetSign(a));
+                    goto Inf;
+                } else {
+                    VpSetNaN(c);
+                    goto NaN;
+                }
+            case 2: /* - */
+                if(VpGetSign(a)!=VpGetSign(b)) {
+                    VpSetInf(c,VpGetSign(a));
+                    goto Inf;
+                } else {
+                    VpSetNaN(c);
+                    goto NaN;
+                }
+                break;
+            case 3: /* * */
+                VpSetInf(c,VpGetSign(a)*VpGetSign(b));
+                goto Inf;
+                break;
+            case 4: /* / */
+                VpSetNaN(c);
+                goto NaN;
+            }
+            VpSetNaN(c);
+            goto NaN;
+        }
+        /* Inf op Finite */
+        switch(sw)
+        {
+        case 1: /* + */
+        case 2: /* - */
+                VpSetInf(c,VpGetSign(a));
+                break;
+        case 3: /* * */
+                if(VpIsZero(b)) {
+                    VpSetNaN(c);
+                    goto NaN;
+                }
+                VpSetInf(c,VpGetSign(a)*VpGetSign(b));
+                break;
+        case 4: /* / */
+                VpSetInf(c,VpGetSign(a)*VpGetSign(b));
+        }
+        goto Inf;
+    }
+
+    if(VpIsInf(b)) {
+        switch(sw)
+        {
+        case 1: /* + */
+                VpSetInf(c,VpGetSign(b));
+                break;
+        case 2: /* - */
+                VpSetInf(c,-VpGetSign(b));
+                break;
+        case 3: /* * */
+                if(VpIsZero(a)) {
+                    VpSetNaN(c);
+                    goto NaN;
+                }
+                VpSetInf(c,VpGetSign(a)*VpGetSign(b));
+                break;
+        case 4: /* / */
+                VpSetZero(c,VpGetSign(a)*VpGetSign(b));
+        }
+        goto Inf;
+    }
+    return 1; /* Results OK */
+
+Inf:
+    return VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
+NaN:
+    return VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'",0);
+}
+
+/*
+  ----------------------------------------------------------------
+*/
+
+/*
+ *    returns number of chars needed to represent vp in specified format.
+ */
+VP_EXPORT U_LONG
+VpNumOfChars(Real *vp,const char *pszFmt)
+{
+    S_INT  ex;
+    U_LONG nc;
+
+    if(vp == NULL)   return BASE_FIG*2+6;
+    if(!VpIsDef(vp)) return 32; /* not sure,may be OK */
+
+    switch(*pszFmt)
+    {
+    case 'F':
+         nc = BASE_FIG*(vp->Prec + 1)+2;
+         ex = vp->exponent;
+         if(ex<0) {
+             nc += BASE_FIG*(-ex);
+         } else {
+             if(ex > (S_INT)vp->Prec) {
+                 nc += BASE_FIG*(ex - (S_INT)vp->Prec);
+             }
+         }
+         break;
+    case 'E':
+    default:
+         nc = BASE_FIG*(vp->Prec + 2)+6; /* 3: sign + exponent chars */
+    }
+    return nc;
+}
+
+/*
+ * Initializer for Vp routines and constants used.
+ * [Input]
+ *   BaseVal: Base value(assigned to BASE) for Vp calculation.
+ *   It must be the form BaseVal=10**n.(n=1,2,3,...)
+ *   If Base <= 0L,then the BASE will be calcurated so
+ *   that BASE is as large as possible satisfying the
+ *   relation MaxVal <= BASE*(BASE+1). Where the value
+ *   MaxVal is the largest value which can be represented
+ *   by one U_LONG word(LONG) in the computer used.
+ *
+ * [Returns]
+ * DBLE_FIG   ... OK
+ */
+VP_EXPORT U_LONG
+VpInit(U_LONG BaseVal)
+{
+    U_LONG w;
+    double v;
+
+    /* Setup +/- Inf  NaN -0 */
+    VpGetDoubleNaN();
+    VpGetDoublePosInf();
+    VpGetDoubleNegInf();
+    VpGetDoubleNegZero();
+
+    if(BaseVal <= 0) {
+        /* Base <= 0, then determine Base by calcuration. */
+        BASE = 1;
+        while(
+               (BASE > 0) &&
+               ((w = BASE *(BASE + 1)) > BASE) &&((w / BASE) ==(BASE + 1))
+            ) {
+            BaseVal = BASE;
+            BASE = BaseVal * 10L;
+        }
+    }
+    /* Set Base Values */
+    BASE = BaseVal;
+    HALF_BASE = BASE / 2;
+    BASE1 = BASE / 10;
+    BASE_FIG = 0;
+    while(BaseVal /= 10) ++BASE_FIG;
+    /* Allocates Vp constants. */
+    VpConstOne = VpAlloc((U_LONG)1, "1");
+    VpPt5 = VpAlloc((U_LONG)1, ".5");
+
+#ifdef _DEBUG
+    gnAlloc = 0;
+#endif /* _DEBUG */
+
+    /* Determine # of digits available in one 'double'. */
+
+    v = 1.0;
+    DBLE_FIG = 0;
+    while(v + 1.0 > 1.0) {
+        ++DBLE_FIG;
+        v /= 10;
+    }
+
+#ifdef _DEBUG
+    if(gfDebug) {
+        printf("VpInit: BaseVal   = %lu\n", BaseVal);
+        printf("  BASE   = %lu\n", BASE);
+        printf("  HALF_BASE = %lu\n", HALF_BASE);
+        printf("  BASE1  = %lu\n", BASE1);
+        printf("  BASE_FIG  = %lu\n", BASE_FIG);
+        printf("  DBLE_FIG  = %lu\n", DBLE_FIG);
+    }
+#endif /* _DEBUG */
+
+    return DBLE_FIG;
+}
+
+VP_EXPORT Real *
+VpOne(void)
+{
+    return VpConstOne;
+}
+
+/* If exponent overflows,then raise exception or returns 0 */
+static int
+AddExponent(Real *a,S_INT n)
+{
+    S_INT e = a->exponent;
+    S_INT m = e+n;
+    S_INT eb,mb;
+    if(e>0) {
+        if(n>0) {
+            mb = m*BASE_FIG;
+            eb = e*BASE_FIG;
+            if(mb<eb) goto overflow;
+        }
+    } else if(n<0) {
+        mb = m*BASE_FIG;
+        eb = e*BASE_FIG;
+        if(mb>eb) goto underflow;
+    }
+    a->exponent = m;
+    return 1;
+
+/* Overflow/Underflow ==> Raise exception or returns 0 */
+underflow:
+    VpSetZero(a,VpGetSign(a));
+    return VpException(VP_EXCEPTION_UNDERFLOW,"Exponent underflow",0);
+
+overflow:
+    VpSetInf(a,VpGetSign(a));
+    return VpException(VP_EXCEPTION_OVERFLOW,"Exponent overflow",0);
+}
+
+/*
+ * Allocates variable.
+ * [Input]
+ *   mx ... allocation unit, if zero then mx is determined by szVal.
+ *    The mx is the number of effective digits can to be stored.
+ *   szVal ... value assigned(char). If szVal==NULL,then zero is assumed.
+ *            If szVal[0]=='#' then Max. Prec. will not be considered(1.1.7),
+ *            full precision specified by szVal is allocated.
+ *
+ * [Returns]
+ *   Pointer to the newly allocated variable, or
+ *   NULL be returned if memory allocation is failed,or any error.
+ */
+VP_EXPORT Real *
+VpAlloc(U_LONG mx, const char *szVal)
+{
+    U_LONG i, ni, ipn, ipf, nf, ipe, ne, nalloc;
+    char v,*psz;
+    int  sign=1;
+    Real *vp = NULL;
+    U_LONG mf = VpGetPrecLimit();
+
+    mx = (mx + BASE_FIG - 1) / BASE_FIG + 1;    /* Determine allocation unit. */
+    if(szVal) {
+        while(ISSPACE(*szVal)) szVal++;
+        if(*szVal!='#') {
+             if(mf) {
+                mf = (mf + BASE_FIG - 1) / BASE_FIG + 2; /* Needs 1 more for div */
+                if(mx>mf) {
+                    mx = mf;
+                }
+            }
+        } else {
+            ++szVal;
+        }
+    } else {
+       /* necessary to be able to store */
+       /* at least mx digits. */
+       /* szVal==NULL ==> allocate zero value. */
+       vp = (Real *) VpMemAlloc(sizeof(Real) + mx * sizeof(U_LONG));
+       /* xmalloc() alway returns(or throw interruption) */
+       vp->MaxPrec = mx;    /* set max precision */
+       VpSetZero(vp,1);    /* initialize vp to zero. */
+       return vp;
+    }
+
+    /* Skip all '_' after digit: 2006-6-30 */
+    ni = 0;
+    psz = ALLOCA_N(char,strlen(szVal)+1);
+    i   = 0;
+    ipn = 0;
+    while(psz[i]=szVal[ipn]) {
+        if(ISDIGIT(psz[i])) ++ni;
+        if(psz[i]=='_') {
+            if(ni>0) {ipn++;continue;}
+            psz[i]=0;
+            break;
+        }
+        ++i; ++ipn;
+    }
+    /* Skip trailing spaces */
+    while((--i)>0) {
+        if(ISSPACE(psz[i])) psz[i] = 0;
+        else                break;
+    }
+    szVal = psz;
+
+    /* Check on Inf & NaN */
+    if(StrCmp(szVal,SZ_PINF)==0 ||
+       StrCmp(szVal,SZ_INF)==0 ) {
+        vp = (Real *) VpMemAlloc(sizeof(Real) + sizeof(U_LONG));
+        vp->MaxPrec = 1;    /* set max precision */
+        VpSetPosInf(vp);
+        return vp;
+    }
+    if(StrCmp(szVal,SZ_NINF)==0) {
+        vp = (Real *) VpMemAlloc(sizeof(Real) + sizeof(U_LONG));
+        vp->MaxPrec = 1;    /* set max precision */
+        VpSetNegInf(vp);
+        return vp;
+    }
+    if(StrCmp(szVal,SZ_NaN)==0) {
+        vp = (Real *) VpMemAlloc(sizeof(Real) + sizeof(U_LONG));
+        vp->MaxPrec = 1;    /* set max precision */
+        VpSetNaN(vp);
+        return vp;
+    }
+
+    /* check on number szVal[] */
+    ipn = i = 0;
+    if     (szVal[i] == '-') {sign=-1;++i;}
+    else if(szVal[i] == '+')          ++i;
+    /* Skip digits */
+    ni = 0;            /* digits in mantissa */
+    while(v = szVal[i]) {
+        if(!ISDIGIT(v)) break;
+        ++i;
+        ++ni;
+    }
+    nf  = 0;
+    ipf = 0;
+    ipe = 0;
+    ne  = 0;
+    if(v) {
+        /* other than digit nor \0 */
+        if(szVal[i] == '.') {    /* xxx. */
+            ++i;
+            ipf = i;
+            while(v = szVal[i]) {    /* get fraction part. */
+                if(!ISDIGIT(v)) break;
+                ++i;
+                ++nf;
+            }
+        }
+        ipe = 0;        /* Exponent */
+
+        switch(szVal[i]) {
+        case '\0': break;
+        case 'e':
+        case 'E':
+        case 'd':
+        case 'D':
+            ++i;
+            ipe = i;
+            v = szVal[i];
+            if((v == '-') ||(v == '+')) ++i;
+            while(v=szVal[i]) {
+                if(!ISDIGIT(v)) break;
+                ++i;
+                ++ne;
+            }
+            break;
+        default:
+            break;
+        }
+    }
+    nalloc =(ni + nf + BASE_FIG - 1) / BASE_FIG + 1;    /* set effective allocation  */
+    /* units for szVal[]  */
+    if(mx <= 0) mx = 1;
+    nalloc = Max(nalloc, mx);
+    mx = nalloc;
+    vp =(Real *) VpMemAlloc(sizeof(Real) + mx * sizeof(U_LONG));
+    /* xmalloc() alway returns(or throw interruption) */
+    vp->MaxPrec = mx;        /* set max precision */
+    VpSetZero(vp,sign);
+    VpCtoV(vp, &(szVal[ipn]), ni, &(szVal[ipf]), nf, &(szVal[ipe]), ne);
+    return vp;
+}
+
+/*
+ * Assignment(c=a).
+ * [Input]
+ *   a   ... RHSV
+ *   isw ... switch for assignment.
+ *    c = a  when isw > 0
+ *    c = -a when isw < 0
+ *    if c->MaxPrec < a->Prec,then round operation
+ *    will be performed.
+ * [Output]
+ *  c  ... LHSV
+ */
+VP_EXPORT int
+VpAsgn(Real *c, Real *a, int isw)
+{
+    U_LONG n;
+    if(VpIsNaN(a)) {
+        VpSetNaN(c);
+        return 0;
+    }
+    if(VpIsInf(a)) {
+        VpSetInf(c,isw*VpGetSign(a));
+        return 0;
+    }
+
+    /* check if the RHS is zero */
+    if(!VpIsZero(a)) {
+        c->exponent = a->exponent;    /* store  exponent */
+        VpSetSign(c,(isw*VpGetSign(a)));    /* set sign */
+        n =(a->Prec < c->MaxPrec) ?(a->Prec) :(c->MaxPrec);
+        c->Prec = n;
+        memcpy(c->frac, a->frac, n * sizeof(U_LONG));
+        /* Needs round ? */
+        if(isw!=10) {
+            /* Not in ActiveRound */
+            if(c->Prec < a->Prec) {
+               VpInternalRound(c,n,(n>0)?a->frac[n-1]:0,a->frac[n]);
+            } else {
+               VpLimitRound(c,0);
+            }
+        }
+    } else {
+        /* The value of 'a' is zero.  */
+        VpSetZero(c,isw*VpGetSign(a));
+        return 1;
+    }
+    return c->Prec*BASE_FIG;
+}
+
+/*
+ *   c = a + b  when operation =  1 or 2
+ *  = a - b  when operation = -1 or -2.
+ *   Returns number of significant digits of c
+ */
+VP_EXPORT int
+VpAddSub(Real *c, Real *a, Real *b, int operation)
+{
+    S_INT sw, isw;
+    Real *a_ptr, *b_ptr;
+    U_LONG n, na, nb, i;
+    U_LONG mrv;
+
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, "VpAddSub(enter) a=% \n", a);
+        VPrint(stdout, "     b=% \n", b);
+        printf(" operation=%d\n", operation);
+    }
+#endif /* _DEBUG */
+
+    if(!VpIsDefOP(c,a,b,(operation>0)?1:2)) return 0; /* No significant digits */
+
+    /* check if a or b is zero  */
+    if(VpIsZero(a)) {
+        /* a is zero,then assign b to c */
+        if(!VpIsZero(b)) {
+            VpAsgn(c, b, operation);
+        } else {
+            /* Both a and b are zero. */
+            if(VpGetSign(a)<0 && operation*VpGetSign(b)<0) {
+                /* -0 -0 */
+                VpSetZero(c,-1);
+            } else {
+                VpSetZero(c,1);
+            }
+            return 1; /* 0: 1 significant digits */
+        }
+        return c->Prec*BASE_FIG;
+    }
+    if(VpIsZero(b)) {
+        /* b is zero,then assign a to c. */
+        VpAsgn(c, a, 1);
+        return c->Prec*BASE_FIG;
+    }
+
+    if(operation < 0) sw = -1;
+    else              sw =  1;
+
+    /* compare absolute value. As a result,|a_ptr|>=|b_ptr| */
+    if(a->exponent > b->exponent) {
+        a_ptr = a;
+        b_ptr = b;
+    }         /* |a|>|b| */
+    else if(a->exponent < b->exponent) {
+        a_ptr = b;
+        b_ptr = a;
+    }                /* |a|<|b| */
+    else {
+        /* Exponent part of a and b is the same,then compare fraction */
+        /* part */
+        na = a->Prec;
+        nb = b->Prec;
+        n = Min(na, nb);
+        for(i=0;i < n; ++i) {
+            if(a->frac[i] > b->frac[i]) {
+                a_ptr = a;
+                b_ptr = b;
+                goto end_if;
+            } else if(a->frac[i] < b->frac[i]) {
+                a_ptr = b;
+                b_ptr = a;
+                goto end_if;
+            }
+        }
+        if(na > nb) {
+         a_ptr = a;
+            b_ptr = b;
+            goto end_if;
+        } else if(na < nb) {
+            a_ptr = b;
+            b_ptr = a;
+            goto end_if;
+        }
+        /* |a| == |b| */
+        if(VpGetSign(a) + sw *VpGetSign(b) == 0) {
+            VpSetZero(c,1);        /* abs(a)=abs(b) and operation = '-'  */
+            return c->Prec*BASE_FIG;
+        }
+        a_ptr = a;
+        b_ptr = b;
+    }
+
+end_if:
+    isw = VpGetSign(a) + sw *VpGetSign(b);
+    /*
+     *  isw = 0 ...( 1)+(-1),( 1)-( 1),(-1)+(1),(-1)-(-1)
+     *      = 2 ...( 1)+( 1),( 1)-(-1)
+     *      =-2 ...(-1)+(-1),(-1)-( 1)
+     *   If isw==0, then c =(Sign a_ptr)(|a_ptr|-|b_ptr|)
+     *              else c =(Sign ofisw)(|a_ptr|+|b_ptr|)
+    */
+    if(isw) {            /* addition */
+        VpSetSign(c,(S_INT)1);
+        mrv = VpAddAbs(a_ptr, b_ptr, c);
+        VpSetSign(c,isw / 2);
+    } else {            /* subtraction */
+        VpSetSign(c,(S_INT)1);
+        mrv = VpSubAbs(a_ptr, b_ptr, c);
+        if(a_ptr == a) {
+            VpSetSign(c,VpGetSign(a));
+        } else    {
+            VpSetSign(c,VpGetSign(a_ptr) * sw);
+        }
+    }
+    VpInternalRound(c,0,(c->Prec>0)?c->frac[c->Prec-1]:0,mrv);
+
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, "VpAddSub(result) c=% \n", c);
+        VPrint(stdout, "     a=% \n", a);
+        VPrint(stdout, "     b=% \n", b);
+        printf(" operation=%d\n", operation);
+    }
+#endif /* _DEBUG */
+    return c->Prec*BASE_FIG;
+}
+
+/*
+ * Addition of two variable precisional variables
+ * a and b assuming abs(a)>abs(b).
+ *   c = abs(a) + abs(b) ; where |a|>=|b|
+ */
+static U_LONG
+VpAddAbs(Real *a, Real *b, Real *c)
+{
+    U_LONG word_shift;
+    U_LONG carry;
+    U_LONG ap;
+    U_LONG bp;
+    U_LONG cp;
+    U_LONG a_pos;
+    U_LONG b_pos;
+    U_LONG c_pos;
+    U_LONG av, bv, mrv;
+
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, "VpAddAbs called: a = %\n", a);
+        VPrint(stdout, "     b = %\n", b);
+    }
+#endif /* _DEBUG */
+
+    word_shift = VpSetPTR(a, b, c, &ap, &bp, &cp, &av, &bv);
+    a_pos = ap;
+    b_pos = bp;
+    c_pos = cp;
+    if(word_shift==-1L) return 0; /* Overflow */
+    if(b_pos == -1L) goto Assign_a;
+
+    mrv = av + bv; /* Most right val. Used for round. */
+
+    /* Just assign the last few digits of b to c because a has no  */
+    /* corresponding digits to be added. */
+    while(b_pos + word_shift > a_pos) {
+        --c_pos;
+        if(b_pos > 0) {
+            c->frac[c_pos] = b->frac[--b_pos];
+        } else {
+            --word_shift;
+            c->frac[c_pos] = 0;
+        }
+    }
+
+    /* Just assign the last few digits of a to c because b has no */
+    /* corresponding digits to be added. */
+    bv = b_pos + word_shift;
+    while(a_pos > bv) {
+        c->frac[--c_pos] = a->frac[--a_pos];
+    }
+    carry = 0;    /* set first carry be zero */
+
+    /* Now perform addition until every digits of b will be */
+    /* exhausted. */
+    while(b_pos > 0) {
+        c->frac[--c_pos] = a->frac[--a_pos] + b->frac[--b_pos] + carry;
+        if(c->frac[c_pos] >= BASE) {
+            c->frac[c_pos] -= BASE;
+            carry = 1;
+        } else {
+            carry = 0;
+        }
+    }
+
+    /* Just assign the first few digits of a with considering */
+    /* the carry obtained so far because b has been exhausted. */
+    while(a_pos > 0) {
+        c->frac[--c_pos] = a->frac[--a_pos] + carry;
+        if(c->frac[c_pos] >= BASE) {
+            c->frac[c_pos] -= BASE;
+            carry = 1;
+        } else {
+            carry = 0;
+        }
+    }
+    if(c_pos) c->frac[c_pos - 1] += carry;
+    goto Exit;
+
+Assign_a:
+    VpAsgn(c, a, 1);
+    mrv = 0;
+
+Exit:
+
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, "VpAddAbs exit: c=% \n", c);
+    }
+#endif /* _DEBUG */
+    return mrv;
+}
+
+/*
+ * c = abs(a) - abs(b)
+ */
+static U_LONG
+VpSubAbs(Real *a, Real *b, Real *c)
+{
+    U_LONG word_shift;
+    U_LONG mrv;
+    U_LONG borrow;
+    U_LONG ap;
+    U_LONG bp;
+    U_LONG cp;
+    U_LONG a_pos;
+    U_LONG b_pos;
+    U_LONG c_pos;
+    U_LONG av, bv;
+
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, "VpSubAbs called: a = %\n", a);
+        VPrint(stdout, "     b = %\n", b);
+    }
+#endif /* _DEBUG */
+
+    word_shift = VpSetPTR(a, b, c, &ap, &bp, &cp, &av, &bv);
+    a_pos = ap;
+    b_pos = bp;
+    c_pos = cp;
+    if(word_shift==-1L) return 0; /* Overflow */
+    if(b_pos == -1L) goto Assign_a;
+
+    if(av >= bv) {
+        mrv = av - bv;
+        borrow = 0;
+    } else {
+        mrv    = 0;
+        borrow = 1;
+    }
+
+    /* Just assign the values which are the BASE subtracted by   */
+    /* each of the last few digits of the b because the a has no */
+    /* corresponding digits to be subtracted. */
+    if(b_pos + word_shift > a_pos) {
+        while(b_pos + word_shift > a_pos) {
+            --c_pos;
+            if(b_pos > 0) {
+                c->frac[c_pos] = BASE - b->frac[--b_pos] - borrow;
+            } else {
+                --word_shift;
+                c->frac[c_pos] = BASE - borrow;
+            }
+            borrow = 1;
+        }
+    }
+    /* Just assign the last few digits of a to c because b has no */
+    /* corresponding digits to subtract. */
+
+    bv = b_pos + word_shift;
+    while(a_pos > bv) {
+        c->frac[--c_pos] = a->frac[--a_pos];
+    }
+
+    /* Now perform subtraction until every digits of b will be */
+    /* exhausted. */
+    while(b_pos > 0) {
+        --c_pos;
+        if(a->frac[--a_pos] < b->frac[--b_pos] + borrow) {
+            c->frac[c_pos] = BASE + a->frac[a_pos] - b->frac[b_pos] - borrow;
+            borrow = 1;
+        } else {
+            c->frac[c_pos] = a->frac[a_pos] - b->frac[b_pos] - borrow;
+            borrow = 0;
+        }
+    }
+
+    /* Just assign the first few digits of a with considering */
+    /* the borrow obtained so far because b has been exhausted. */
+    while(a_pos > 0) {
+        --c_pos;
+        if(a->frac[--a_pos] < borrow) {
+            c->frac[c_pos] = BASE + a->frac[a_pos] - borrow;
+            borrow = 1;
+        } else {
+            c->frac[c_pos] = a->frac[a_pos] - borrow;
+            borrow = 0;
+        }
+    }
+    if(c_pos) c->frac[c_pos - 1] -= borrow;
+    goto Exit;
+
+Assign_a:
+    VpAsgn(c, a, 1);
+    mrv = 0;
+
+Exit:
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, "VpSubAbs exit: c=% \n", c);
+    }
+#endif /* _DEBUG */
+    return mrv;
+}
+
+/*
+ * Note: If(av+bv)>= HALF_BASE,then 1 will be added to the least significant
+ *    digit of c(In case of addition).
+ * ------------------------- figure of output -----------------------------------
+ *      a =  xxxxxxxxxxx
+ *      b =    xxxxxxxxxx
+ *      c =xxxxxxxxxxxxxxx
+ *      word_shift =  |   |
+ *      right_word =  |    | (Total digits in RHSV)
+ *      left_word  = |   |   (Total digits in LHSV)
+ *      a_pos      =    |
+ *      b_pos      =     |
+ *      c_pos      =      |
+ */
+static U_LONG
+VpSetPTR(Real *a, Real *b, Real *c, U_LONG *a_pos, U_LONG *b_pos, U_LONG *c_pos, U_LONG *av, U_LONG *bv)
+{
+    U_LONG left_word, right_word, word_shift;
+    c->frac[0] = 0;
+    *av = *bv = 0;
+    word_shift =((a->exponent) -(b->exponent));
+    left_word = b->Prec + word_shift;
+    right_word = Max((a->Prec),left_word);
+    left_word =(c->MaxPrec) - 1;    /* -1 ... prepare for round up */
+    /*
+     * check if 'round' is needed.
+     */
+    if(right_word > left_word) {    /* round ? */
+        /*---------------------------------
+         *  Actual size of a = xxxxxxAxx
+         *  Actual size of b = xxxBxxxxx
+         *  Max. size of   c = xxxxxx
+         *  Round off        =   |-----|
+         *  c_pos            =   |
+         *  right_word       =   |
+         *  a_pos            =    |
+         */
+        *c_pos = right_word = left_word + 1;    /* Set resulting precision */
+        /* be equal to that of c */
+        if((a->Prec) >=(c->MaxPrec)) {
+            /*
+             *   a =  xxxxxxAxxx
+             *   c =  xxxxxx
+             *   a_pos =    |
+             */
+            *a_pos = left_word;
+            *av = a->frac[*a_pos];    /* av is 'A' shown in above. */
+        } else {
+            /*
+             *   a = xxxxxxx
+             *   c = xxxxxxxxxx
+             *  a_pos =     |
+             */
+            *a_pos = a->Prec;
+        }
+        if((b->Prec + word_shift) >= c->MaxPrec) {
+            /*
+             *   a = xxxxxxxxx
+             *   b =  xxxxxxxBxxx
+             *   c = xxxxxxxxxxx
+             *  b_pos =   |
+             */
+            if(c->MaxPrec >=(word_shift + 1)) {
+                *b_pos = c->MaxPrec - word_shift - 1;
+                *bv = b->frac[*b_pos];
+            } else {
+                *b_pos = -1L;
+            }
+        } else {
+            /*
+             *   a = xxxxxxxxxxxxxxxx
+             *   b =  xxxxxx
+             *   c = xxxxxxxxxxxxx
+             *  b_pos =     |
+             */
+            *b_pos = b->Prec;
+        }
+    } else {            /* The MaxPrec of c - 1 > The Prec of a + b  */
+        /*
+         *    a =   xxxxxxx
+         *    b =   xxxxxx
+         *    c = xxxxxxxxxxx
+         *   c_pos =   |
+         */
+        *b_pos = b->Prec;
+        *a_pos = a->Prec;
+        *c_pos = right_word + 1;
+    }
+    c->Prec = *c_pos;
+    c->exponent = a->exponent;
+    if(!AddExponent(c,(S_LONG)1)) return (-1L);
+    return word_shift;
+}
+
+/*
+ * Return number og significant digits
+ *       c = a * b , Where a = a0a1a2 ... an
+ *             b = b0b1b2 ... bm
+ *             c = c0c1c2 ... cl
+ *          a0 a1 ... an   * bm
+ *       a0 a1 ... an   * bm-1
+ *         .   .    .
+ *       .   .   .
+ *        a0 a1 .... an    * b0
+ *      +_____________________________
+ *     c0 c1 c2  ......  cl
+ *     nc      <---|
+ *     MaxAB |--------------------|
+ */
+VP_EXPORT int
+VpMult(Real *c, Real *a, Real *b)
+{
+    U_LONG MxIndA, MxIndB, MxIndAB, MxIndC;
+    U_LONG ind_c, i, ii, nc;
+    U_LONG ind_as, ind_ae, ind_bs, ind_be;
+    U_LONG Carry, s;
+    Real *w;
+
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, "VpMult(Enter): a=% \n", a);
+        VPrint(stdout, "      b=% \n", b);
+    }
+#endif /* _DEBUG */
+
+    if(!VpIsDefOP(c,a,b,3)) return 0; /* No significant digit */
+
+    if(VpIsZero(a) || VpIsZero(b)) {
+        /* at least a or b is zero */
+        VpSetZero(c,VpGetSign(a)*VpGetSign(b));
+        return 1; /* 0: 1 significant digit */
+    }
+
+    if(VpIsOne(a)) {
+        VpAsgn(c, b, VpGetSign(a));
+        goto Exit;
+    }
+    if(VpIsOne(b)) {
+        VpAsgn(c, a, VpGetSign(b));
+        goto Exit;
+    }
+    if((b->Prec) >(a->Prec)) {
+        /* Adjust so that digits(a)>digits(b) */
+        w = a;
+        a = b;
+        b = w;
+    }
+    w = NULL;
+    MxIndA = a->Prec - 1;
+    MxIndB = b->Prec - 1;
+    MxIndC = c->MaxPrec - 1;
+    MxIndAB = a->Prec + b->Prec - 1;
+
+    if(MxIndC < MxIndAB) {    /* The Max. prec. of c < Prec(a)+Prec(b) */
+        w = c;
+        c = VpAlloc((U_LONG)((MxIndAB + 1) * BASE_FIG), "#0");
+        MxIndC = MxIndAB;
+    }
+
+    /* set LHSV c info */
+
+    c->exponent = a->exponent;    /* set exponent */
+    if(!AddExponent(c,b->exponent)) return 0;
+    VpSetSign(c,VpGetSign(a)*VpGetSign(b));    /* set sign  */
+    Carry = 0;
+    nc = ind_c = MxIndAB;
+    memset(c->frac, 0, (nc + 1) * sizeof(U_LONG));        /* Initialize c  */
+    c->Prec = nc + 1;        /* set precision */
+    for(nc = 0; nc < MxIndAB; ++nc, --ind_c) {
+        if(nc < MxIndB) {    /* The left triangle of the Fig. */
+            ind_as = MxIndA - nc;
+            ind_ae = MxIndA;
+            ind_bs = MxIndB;
+            ind_be = MxIndB - nc;
+        } else if(nc <= MxIndA) {    /* The middle rectangular of the Fig. */
+            ind_as = MxIndA - nc;
+            ind_ae = MxIndA -(nc - MxIndB);
+            ind_bs = MxIndB;
+            ind_be = 0;
+        } else if(nc > MxIndA) {    /*  The right triangle of the Fig. */
+            ind_as = 0;
+            ind_ae = MxIndAB - nc - 1;
+            ind_bs = MxIndB -(nc - MxIndA);
+            ind_be = 0;
+        }
+
+        for(i = ind_as; i <= ind_ae; ++i) {
+            s =((a->frac[i]) *(b->frac[ind_bs--]));
+            Carry = s / BASE;
+            s = s -(Carry * BASE);
+            c->frac[ind_c] += s;
+            if(c->frac[ind_c] >= BASE) {
+                s = c->frac[ind_c] / BASE;
+                Carry += s;
+                c->frac[ind_c] -= (s * BASE);
+            }
+            if(Carry) {
+                ii = ind_c;
+                while((--ii) >= 0) {
+                    c->frac[ii] += Carry;
+                    if(c->frac[ii] >= BASE) {
+                        Carry = c->frac[ii] / BASE;
+                        c->frac[ii] -=(Carry * BASE);
+                    } else {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    if(w != NULL) {        /* free work variable */
+        VpNmlz(c);
+        VpAsgn(w, c, 1);
+        VpFree(c);
+        c = w;
+    } else {
+        VpLimitRound(c,0);
+    }
+
+Exit:
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, "VpMult(c=a*b): c=% \n", c);
+        VPrint(stdout, "      a=% \n", a);
+        VPrint(stdout, "      b=% \n", b);
+    }
+#endif /*_DEBUG */
+    return c->Prec*BASE_FIG;
+}
+
+/*
+ *   c = a / b,  remainder = r
+ */
+VP_EXPORT int
+VpDivd(Real *c, Real *r, Real *a, Real *b)
+{
+    U_LONG word_a, word_b, word_c, word_r;
+    U_LONG i, n, ind_a, ind_b, ind_c, ind_r;
+    U_LONG nLoop;
+    U_LONG q, b1, b1p1, b1b2, b1b2p1, r1r2;
+    U_LONG borrow, borrow1, borrow2, qb;
+
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, " VpDivd(c=a/b)  a=% \n", a);
+        VPrint(stdout, "    b=% \n", b);
+    }
+#endif /*_DEBUG */
+
+    VpSetNaN(r);
+    if(!VpIsDefOP(c,a,b,4)) goto Exit;
+    if(VpIsZero(a)&&VpIsZero(b)) {
+        VpSetNaN(c);
+        return VpException(VP_EXCEPTION_NaN,"(VpDivd) 0/0 not defined(NaN)",0);
+    }
+    if(VpIsZero(b)) {
+        VpSetInf(c,VpGetSign(a)*VpGetSign(b));
+        return VpException(VP_EXCEPTION_ZERODIVIDE,"(VpDivd) Divide by zero",0);
+    }
+    if(VpIsZero(a)) {
+        /* numerator a is zero  */
+        VpSetZero(c,VpGetSign(a)*VpGetSign(b));
+        VpSetZero(r,VpGetSign(a)*VpGetSign(b));
+        goto Exit;
+    }
+    if(VpIsOne(b)) {
+        /* divide by one  */
+        VpAsgn(c, a, VpGetSign(b));
+        VpSetZero(r,VpGetSign(a));
+        goto Exit;
+    }
+
+    word_a = a->Prec;
+    word_b = b->Prec;
+    word_c = c->MaxPrec;
+    word_r = r->MaxPrec;
+
+    ind_c = 0;
+    ind_r = 1;
+
+    if(word_a >= word_r) goto space_error;
+
+    r->frac[0] = 0;
+    while(ind_r <= word_a) {
+        r->frac[ind_r] = a->frac[ind_r - 1];
+        ++ind_r;
+    }
+
+    while(ind_r < word_r) r->frac[ind_r++] = 0;
+    while(ind_c < word_c) c->frac[ind_c++] = 0;
+
+    /* initial procedure */
+    b1 = b1p1 = b->frac[0];
+    if(b->Prec <= 1) {
+        b1b2p1 = b1b2 = b1p1 * BASE;
+    } else {
+        b1p1 = b1 + 1;
+        b1b2p1 = b1b2 = b1 * BASE + b->frac[1];
+        if(b->Prec > 2) ++b1b2p1;
+    }
+
+    /* */
+    /* loop start */
+    ind_c = word_r - 1;
+    nLoop = Min(word_c,ind_c);
+    ind_c = 1;
+    while(ind_c < nLoop) {
+        if(r->frac[ind_c] == 0) {
+            ++ind_c;
+            continue;
+        }
+        r1r2 = r->frac[ind_c] * BASE + r->frac[ind_c + 1];
+        if(r1r2 == b1b2) {
+            /* The first two word digits is the same */
+            ind_b = 2;
+            ind_a = ind_c + 2;
+            while(ind_b < word_b) {
+                if(r->frac[ind_a] < b->frac[ind_b]) goto div_b1p1;
+                if(r->frac[ind_a] > b->frac[ind_b]) break;
+                ++ind_a;
+                ++ind_b;
+            }
+            /* The first few word digits of r and b is the same and */
+            /* the first different word digit of w is greater than that */
+            /* of b, so quotinet is 1 and just subtract b from r. */
+            borrow = 0;        /* quotient=1, then just r-b */
+            ind_b = b->Prec - 1;
+            ind_r = ind_c + ind_b;
+            if(ind_r >= word_r) goto space_error;
+            n = ind_b;
+            for(i = 0; i <= n; ++i) {
+                if(r->frac[ind_r] < b->frac[ind_b] + borrow) {
+                    r->frac[ind_r] +=(BASE -(b->frac[ind_b] + borrow));
+                    borrow = 1;
+                } else {
+                    r->frac[ind_r] = r->frac[ind_r] - b->frac[ind_b] - borrow;
+                    borrow = 0;
+                }
+                --ind_r;
+                --ind_b;
+            }
+            ++(c->frac[ind_c]);
+            goto carry;
+        }
+        /* The first two word digits is not the same, */
+        /* then compare magnitude, and divide actually. */
+        if(r1r2 >= b1b2p1) {
+            q = r1r2 / b1b2p1;
+            c->frac[ind_c] += q;
+            ind_r = b->Prec + ind_c - 1;
+            goto sub_mult;
+        }
+
+div_b1p1:
+        if(ind_c + 1 >= word_c) goto out_side;
+        q = r1r2 / b1p1;
+        c->frac[ind_c + 1] += q;
+        ind_r = b->Prec + ind_c;
+
+sub_mult:
+        borrow1 = borrow2 = 0;
+        ind_b = word_b - 1;
+        if(ind_r >= word_r) goto space_error;
+        n = ind_b;
+        for(i = 0; i <= n; ++i) {
+            /* now, perform r = r - q * b */
+            qb = q *(b->frac[ind_b]);
+            if(qb < BASE) borrow1 = 0;
+            else {
+                borrow1 = qb / BASE;
+                qb = qb - borrow1 * BASE;
+            }
+            if(r->frac[ind_r] < qb) {
+                r->frac[ind_r] +=(BASE - qb);
+                borrow2 = borrow2 + borrow1 + 1;
+            } else {
+                r->frac[ind_r] -= qb;
+                borrow2 += borrow1;
+            }
+            if(borrow2) {
+                if(r->frac[ind_r - 1] < borrow2) {
+                    r->frac[ind_r - 1] +=(BASE - borrow2);
+                    borrow2 = 1;
+                } else {
+                    r->frac[ind_r - 1] -= borrow2;
+                    borrow2 = 0;
+                }
+            }
+            --ind_r;
+            --ind_b;
+        }
+
+        r->frac[ind_r] -= borrow2;
+carry:
+        ind_r = ind_c;
+        while(c->frac[ind_r] >= BASE) {
+            c->frac[ind_r] -= BASE;
+            --ind_r;
+            ++(c->frac[ind_r]);
+        }
+    }
+    /* End of operation, now final arrangement */
+out_side:
+    c->Prec = word_c;
+    c->exponent = a->exponent;
+    if(!AddExponent(c,(S_LONG)2))   return 0;
+    if(!AddExponent(c,-(b->exponent))) return 0;
+
+    VpSetSign(c,VpGetSign(a)*VpGetSign(b));
+    VpNmlz(c);            /* normalize c */
+    r->Prec = word_r;
+    r->exponent = a->exponent;
+    if(!AddExponent(r,(S_LONG)1)) return 0;
+    VpSetSign(r,VpGetSign(a));
+    VpNmlz(r);            /* normalize r(remainder) */
+    goto Exit;
+
+space_error:
+#ifdef _DEBUG
+    if(gfDebug) {
+        printf("   word_a=%lu\n", word_a);
+        printf("   word_b=%lu\n", word_b);
+        printf("   word_c=%lu\n", word_c);
+        printf("   word_r=%lu\n", word_r);
+        printf("   ind_r =%lu\n", ind_r);
+    }
+#endif /* _DEBUG */
+    rb_bug("ERROR(VpDivd): space for remainder too small.");
+
+Exit:
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, " VpDivd(c=a/b), c=% \n", c);
+        VPrint(stdout, "    r=% \n", r);
+    }
+#endif /* _DEBUG */
+    return c->Prec*BASE_FIG;
+}
+
+/*
+ *  Input  a = 00000xxxxxxxx En(5 preceeding zeros)
+ *  Output a = xxxxxxxx En-5
+ */
+static int
+VpNmlz(Real *a)
+{
+    U_LONG ind_a, i;
+
+    if(!VpIsDef(a)) goto NoVal;
+    if(VpIsZero(a)) goto NoVal;
+
+    ind_a = a->Prec;
+    while(ind_a--) {
+        if(a->frac[ind_a]) {
+            a->Prec = ind_a + 1;
+            i = 0;
+            while(a->frac[i] == 0) ++i;        /* skip the first few zeros */
+            if(i) {
+                a->Prec -= i;
+                if(!AddExponent(a,-((S_INT)i))) return 0;
+                memmove(&(a->frac[0]),&(a->frac[i]),(a->Prec)*sizeof(U_LONG));
+            }
+            return 1;
+        }
+    }
+    /* a is zero(no non-zero digit) */
+    VpSetZero(a,VpGetSign(a));
+    return 0;
+
+NoVal:
+    a->frac[0] = 0;
+    a->Prec=1;
+    return 0;
+}
+
+/*
+ *  VpComp = 0  ... if a=b,
+ *   Pos  ... a>b,
+ *   Neg  ... a<b.
+ *   999  ... result undefined(NaN)
+ */
+VP_EXPORT int
+VpComp(Real *a, Real *b)
+{
+    int val;
+    U_LONG mx, ind;
+    int e;
+    val = 0;
+    if(VpIsNaN(a)||VpIsNaN(b)) return 999;
+    if(!VpIsDef(a)) {
+        if(!VpIsDef(b)) e = a->sign - b->sign;
+        else             e = a->sign;
+        if(e>0)   return  1;
+        else if(e<0) return -1;
+        else   return  0;
+    }
+    if(!VpIsDef(b)) {
+        e = -b->sign;
+        if(e>0) return  1;
+        else return -1;
+    }
+    /* Zero check */
+    if(VpIsZero(a)) {
+        if(VpIsZero(b))      return 0; /* both zero */
+        val = -VpGetSign(b);
+        goto Exit;
+    }
+    if(VpIsZero(b)) {
+        val = VpGetSign(a);
+        goto Exit;
+    }
+
+    /* compare sign */
+    if(VpGetSign(a) > VpGetSign(b)) {
+        val = 1;        /* a>b */
+        goto Exit;
+    }
+    if(VpGetSign(a) < VpGetSign(b)) {
+        val = -1;        /* a<b */
+        goto Exit;
+    }
+
+    /* a and b have same sign, && signe!=0,then compare exponent */
+    if((a->exponent) >(b->exponent)) {
+        val = VpGetSign(a);
+        goto Exit;
+    }
+    if((a->exponent) <(b->exponent)) {
+        val = -VpGetSign(b);
+        goto Exit;
+    }
+
+    /* a and b have same exponent, then compare significand. */
+    mx =((a->Prec) <(b->Prec)) ?(a->Prec) :(b->Prec);
+    ind = 0;
+    while(ind < mx) {
+        if((a->frac[ind]) >(b->frac[ind])) {
+            val = VpGetSign(a);
+         goto Exit;
+        }
+        if((a->frac[ind]) <(b->frac[ind])) {
+            val = -VpGetSign(b);
+            goto Exit;
+        }
+        ++ind;
+    }
+    if((a->Prec) >(b->Prec)) {
+        val = VpGetSign(a);
+    } else if((a->Prec) <(b->Prec)) {
+        val = -VpGetSign(b);
+    }
+
+Exit:
+    if  (val> 1) val =  1;
+    else if(val<-1) val = -1;
+
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, " VpComp a=%\n", a);
+        VPrint(stdout, "  b=%\n", b);
+        printf("  ans=%d\n", val);
+    }
+#endif /* _DEBUG */
+    return (int)val;
+}
+
+#ifdef _DEBUG
+/*
+ *    cntl_chr ... ASCIIZ Character, print control characters
+ *     Available control codes:
+ *      %  ... VP variable. To print '%', use '%%'.
+ *      \n ... new line
+ *      \b ... backspace
+ *           ... tab
+ *     Note: % must must not appear more than once
+ *    a  ... VP variable to be printed
+ */
+VP_EXPORT int
+VPrint(FILE *fp, char *cntl_chr, Real *a)
+{
+    U_LONG i, j, nc, nd, ZeroSup;
+    U_LONG n, m, e, nn;
+
+    /* Check if NaN & Inf. */
+    if(VpIsNaN(a)) {
+        fprintf(fp,SZ_NaN);
+        return 8;
+    }
+    if(VpIsPosInf(a)) {
+        fprintf(fp,SZ_INF);
+        return 8;
+    }
+    if(VpIsNegInf(a)) {
+        fprintf(fp,SZ_NINF);
+        return 9;
+    }
+    if(VpIsZero(a)) {
+        fprintf(fp,"0.0");
+        return 3;
+    }
+
+    j = 0;
+    nd = nc = 0;        /*  nd : number of digits in fraction part(every 10 digits, */
+    /*    nd<=10). */
+    /*  nc : number of caracters printed  */
+    ZeroSup = 1;        /* Flag not to print the leading zeros as 0.00xxxxEnn */
+    while(*(cntl_chr + j)) {
+        if((*(cntl_chr + j) == '%') &&(*(cntl_chr + j + 1) != '%')) {
+         nc = 0;
+         if(!VpIsZero(a)) {
+                if(VpGetSign(a) < 0) {
+                    fprintf(fp, "-");
+                    ++nc;
+                }
+                nc += fprintf(fp, "0.");
+                n = a->Prec;
+                for(i=0;i < n;++i) {
+                 m = BASE1;
+                    e = a->frac[i];
+                    while(m) {
+                        nn = e / m;
+                        if((!ZeroSup) || nn) {
+                            nc += fprintf(fp, "%lu", nn);    /* The reading zero(s) */
+                            /* as 0.00xx will not */
+                            /* be printed. */
+                            ++nd;
+                            ZeroSup = 0;    /* Set to print succeeding zeros */
+                        }
+                        if(nd >= 10) {    /* print ' ' after every 10 digits */
+                            nd = 0;
+                            nc += fprintf(fp, " ");
+                        }
+                        e = e - nn * m;
+                        m /= 10;
+                    }
+                }
+                nc += fprintf(fp, "E%ld", VpExponent10(a));
+            } else {
+                nc += fprintf(fp, "0.0");
+            }
+        } else {
+            ++nc;
+            if(*(cntl_chr + j) == '\\') {
+                switch(*(cntl_chr + j + 1)) {
+                case 'n':
+                    fprintf(fp, "\n");
+                    ++j;
+                    break;
+                case 't':
+                    fprintf(fp, "\t");
+                    ++j;
+                 break;
+                case 'b':
+                    fprintf(fp, "\n");
+                    ++j;
+                    break;
+                default:
+                    fprintf(fp, "%c", *(cntl_chr + j));
+                    break;
+                }
+            } else {
+                fprintf(fp, "%c", *(cntl_chr + j));
+                if(*(cntl_chr + j) == '%') ++j;
+            }
+        }
+        j++;
+    }
+    return (int)nc;
+}
+#endif /* _DEBUG */
+
+static void
+VpFormatSt(char *psz,S_INT fFmt)
+{
+    U_LONG ie;
+    U_LONG i;
+    S_INT nf = 0;
+    char ch;
+
+    if(fFmt<=0) return;
+
+    ie = strlen(psz);
+    for(i = 0; i < ie; ++i) {
+        ch = psz[i];
+        if(!ch) break;
+        if(ISSPACE(ch) || ch=='-' || ch=='+') continue;
+        if(ch == '.')                { nf = 0;continue;}
+        if(ch == 'E') break;
+        nf++;
+        if(nf > fFmt) {
+            memmove(psz + i + 1, psz + i, ie - i + 1);
+            ++ie;
+            nf = 0;
+            psz[i] = ' ';
+        }
+    }
+}
+
+VP_EXPORT S_LONG
+VpExponent10(Real *a)
+{
+    S_LONG ex;
+    U_LONG n;
+
+    if(!VpHasVal(a)) return 0;
+
+    ex =(a->exponent) * BASE_FIG;
+    n = BASE1;
+    while((a->frac[0] / n) == 0) {
+         --ex;
+         n /= 10;
+    }
+    return ex;
+}
+
+VP_EXPORT void
+VpSzMantissa(Real *a,char *psz)
+{
+    U_LONG i, ZeroSup;
+    U_LONG n, m, e, nn;
+
+    if(VpIsNaN(a)) {
+        sprintf(psz,SZ_NaN);
+        return;
+    }
+    if(VpIsPosInf(a)) {
+        sprintf(psz,SZ_INF);
+        return;
+    }
+    if(VpIsNegInf(a)) {
+        sprintf(psz,SZ_NINF);
+        return;
+    }
+
+    ZeroSup = 1;        /* Flag not to print the leading zeros as 0.00xxxxEnn */
+    if(!VpIsZero(a)) {
+        if(VpGetSign(a) < 0) *psz++ = '-';
+        n = a->Prec;
+        for(i=0;i < n;++i) {
+            m = BASE1;
+            e = a->frac[i];
+            while(m) {
+                nn = e / m;
+                if((!ZeroSup) || nn) {
+                    sprintf(psz, "%lu", nn);    /* The reading zero(s) */
+                    psz += strlen(psz);
+                    /* as 0.00xx will be ignored. */
+                    ZeroSup = 0;    /* Set to print succeeding zeros */
+                }
+                e = e - nn * m;
+                m /= 10;
+            }
+        }
+        *psz = 0;
+        while(psz[-1]=='0') *(--psz) = 0;
+    } else {
+        if(VpIsPosZero(a)) sprintf(psz, "0");
+        else      sprintf(psz, "-0");
+    }
+}
+
+VP_EXPORT int
+VpToSpecialString(Real *a,char *psz,int fPlus)
+/* fPlus =0:default, =1: set ' ' before digits , =2: set '+' before digits. */
+{
+    if(VpIsNaN(a)) {
+        sprintf(psz,SZ_NaN);
+        return 1;
+    }
+
+    if(VpIsPosInf(a)) {
+        if(fPlus==1) {
+           *psz++ = ' ';
+        } else if(fPlus==2) {
+           *psz++ = '+';
+        }
+        sprintf(psz,SZ_INF);
+        return 1;
+    }
+    if(VpIsNegInf(a)) {
+        sprintf(psz,SZ_NINF);
+        return 1;
+    }
+    if(VpIsZero(a)) {
+        if(VpIsPosZero(a)) {
+            if(fPlus==1)      sprintf(psz, " 0.0");
+            else if(fPlus==2) sprintf(psz, "+0.0");
+            else              sprintf(psz, "0.0");
+        } else    sprintf(psz, "-0.0");
+        return 1;
+    }
+    return 0;
+}
+
+VP_EXPORT void
+VpToString(Real *a,char *psz,int fFmt,int fPlus)
+/* fPlus =0:default, =1: set ' ' before digits , =2:set '+' before digits. */
+{
+    U_LONG i, ZeroSup;
+    U_LONG n, m, e, nn;
+    char *pszSav = psz;
+    S_LONG ex;
+
+    if(VpToSpecialString(a,psz,fPlus)) return;
+
+    ZeroSup = 1;    /* Flag not to print the leading zeros as 0.00xxxxEnn */
+
+    if(VpGetSign(a) < 0) *psz++ = '-';
+    else if(fPlus==1)    *psz++ = ' ';
+    else if(fPlus==2)    *psz++ = '+';
+
+    *psz++ = '0';
+    *psz++ = '.';
+    n = a->Prec;
+    for(i=0;i < n;++i) {
+        m = BASE1;
+        e = a->frac[i];
+        while(m) {
+            nn = e / m;
+            if((!ZeroSup) || nn) {
+                sprintf(psz, "%lu", nn);    /* The reading zero(s) */
+                psz += strlen(psz);
+                /* as 0.00xx will be ignored. */
+                ZeroSup = 0;    /* Set to print succeeding zeros */
+            }
+            e = e - nn * m;
+            m /= 10;
+        }
+    }
+    ex =(a->exponent) * BASE_FIG;
+    n = BASE1;
+    while((a->frac[0] / n) == 0) {
+        --ex;
+        n /= 10;
+    }
+    while(psz[-1]=='0') *(--psz) = 0;
+    sprintf(psz, "E%ld", ex);
+    if(fFmt) VpFormatSt(pszSav, fFmt);
+}
+
+VP_EXPORT void
+VpToFString(Real *a,char *psz,int fFmt,int fPlus)
+/* fPlus =0:default,=1: set ' ' before digits ,set '+' before digits. */
+{
+    U_LONG i;
+    U_LONG n, m, e, nn;
+    char *pszSav = psz;
+    S_LONG ex;
+
+    if(VpToSpecialString(a,psz,fPlus)) return;
+
+    if(VpGetSign(a) < 0) *psz++ = '-';
+    else if(fPlus==1)    *psz++ = ' ';
+    else if(fPlus==2)    *psz++ = '+';
+
+    n  = a->Prec;
+    ex = a->exponent;
+    if(ex<=0) {
+       *psz++ = '0';*psz++ = '.';
+       while(ex<0) {
+          for(i=0;i<BASE_FIG;++i) *psz++ = '0';
+          ++ex;
+       }
+       ex = -1;
+    }
+
+    for(i=0;i < n;++i) {
+       --ex;
+       if(i==0 && ex >= 0) {
+           sprintf(psz, "%lu", a->frac[i]);
+           psz += strlen(psz);
+       } else {
+           m = BASE1;
+           e = a->frac[i];
+           while(m) {
+               nn = e / m;
+               *psz++ = (char)(nn + '0');
+               e = e - nn * m;
+               m /= 10;
+           }
+       }
+       if(ex == 0) *psz++ = '.';
+    }
+    while(--ex>=0) {
+       m = BASE;
+       while(m/=10) *psz++ = '0';
+       if(ex == 0) *psz++ = '.';
+    }
+    *psz = 0;
+    while(psz[-1]=='0') *(--psz) = 0;
+    if(psz[-1]=='.') sprintf(psz, "0");
+    if(fFmt) VpFormatSt(pszSav, fFmt);
+}
+
+/*
+ *  [Output]
+ *   a[]  ... variable to be assigned the value.
+ *  [Input]
+ *   int_chr[]  ... integer part(may include '+/-').
+ *   ni   ... number of characters in int_chr[],not including '+/-'.
+ *   frac[]  ... fraction part.
+ *   nf   ... number of characters in frac[].
+ *   exp_chr[]  ... exponent part(including '+/-').
+ *   ne   ... number of characters in exp_chr[],not including '+/-'.
+ */
+VP_EXPORT int
+VpCtoV(Real *a, const char *int_chr, U_LONG ni, const char *frac, U_LONG nf, const char *exp_chr, U_LONG ne)
+{
+    U_LONG i, j, ind_a, ma, mi, me;
+    U_LONG loc;
+    S_INT  e,es, eb, ef;
+    S_INT  sign, signe;
+    /* get exponent part */
+    e = 0;
+    ma = a->MaxPrec;
+    mi = ni;
+    me = ne;
+    signe = 1;
+    memset(a->frac, 0, ma * sizeof(U_LONG));
+    if(ne > 0) {
+        i = 0;
+        if(exp_chr[0] == '-') {
+            signe = -1;
+            ++i;
+            ++me;
+        } else if(exp_chr[0] == '+') {
+            ++i;
+            ++me;
+        }
+        while(i < me) {
+            es = e*((S_INT)BASE_FIG);
+            e = e * 10 + exp_chr[i] - '0';
+            if(es>e*((S_INT)BASE_FIG)) {
+                return VpException(VP_EXCEPTION_INFINITY,"exponent overflow",0);
+            }
+            ++i;
+        }
+    }
+
+    /* get integer part */
+    i = 0;
+    sign = 1;
+    if(ni >= 0) {
+        if(int_chr[0] == '-') {
+            sign = -1;
+            ++i;
+            ++mi;
+        } else if(int_chr[0] == '+') {
+            ++i;
+            ++mi;
+        }
+    }
+
+    e = signe * e;        /* e: The value of exponent part. */
+    e = e + ni;        /* set actual exponent size. */
+
+    if(e > 0)    signe = 1;
+    else        signe = -1;
+
+    /* Adjust the exponent so that it is the multiple of BASE_FIG. */
+    j = 0;
+    ef = 1;
+    while(ef) {
+        if(e>=0) eb =  e;
+        else  eb = -e;
+        ef = eb / ((S_INT)BASE_FIG);
+        ef = eb - ef * ((S_INT)BASE_FIG);
+        if(ef) {
+            ++j;        /* Means to add one more preceeding zero */
+            ++e;
+        }
+    }
+
+    eb = e / ((S_INT)BASE_FIG);
+
+    ind_a = 0;
+    while(i < mi) {
+        a->frac[ind_a] = 0;
+        while((j < (U_LONG)BASE_FIG) &&(i < mi)) {
+            a->frac[ind_a] = a->frac[ind_a] * 10 + int_chr[i] - '0';
+            ++j;
+            ++i;
+        }
+        if(i < mi) {
+            ++ind_a;
+            if(ind_a >= ma) goto over_flow;
+            j = 0;
+        }
+    }
+    loc = 1;
+
+    /* get fraction part */
+
+    i = 0;
+    while(i < nf) {
+        while((j < (U_LONG)BASE_FIG) &&(i < nf)) {
+            a->frac[ind_a] = a->frac[ind_a] * 10 + frac[i] - '0';
+            ++j;
+            ++i;
+        }
+        if(i < nf) {
+            ++ind_a;
+            if(ind_a >= ma) goto over_flow;
+            j = 0;
+        }
+    }
+    goto Final;
+
+over_flow:
+    rb_warn("Conversion from String to BigDecimal overflow (last few digits discarded).");
+
+Final:
+    if(ind_a >= ma) ind_a = ma - 1;
+    while(j < (U_LONG)BASE_FIG) {
+        a->frac[ind_a] = a->frac[ind_a] * 10;
+        ++j;
+    }
+    a->Prec = ind_a + 1;
+    a->exponent = eb;
+    VpSetSign(a,sign);
+    VpNmlz(a);
+    return 1;
+}
+
+/*
+ * [Input]
+ *   *m  ... Real
+ * [Output]
+ *   *d  ... fraction part of m(d = 0.xxxxxxx). where # of 'x's is fig.
+ *   *e  ... U_LONG,exponent of m.
+ * DBLE_FIG ... Number of digits in a double variable.
+ *
+ *  m -> d*10**e, 0<d<BASE
+ * [Returns]
+ *   0 ... Zero
+ *   1 ... Normal
+ *   2 ... Infinity
+ *  -1 ... NaN
+ */
+VP_EXPORT int
+VpVtoD(double *d, S_LONG *e, Real *m)
+{
+    U_LONG ind_m, mm, fig;
+    double div;
+    int    f = 1;
+
+    if(VpIsNaN(m)) {
+        *d = VpGetDoubleNaN();
+        *e = 0;
+        f = -1; /* NaN */
+        goto Exit;
+    } else
+    if(VpIsPosZero(m)) {
+        *d = 0.0;
+        *e = 0;
+        f  = 0;
+        goto Exit;
+    } else
+    if(VpIsNegZero(m)) {
+        *d = VpGetDoubleNegZero();
+        *e = 0;
+        f  = 0;
+        goto Exit;
+    } else
+    if(VpIsPosInf(m)) {
+        *d = VpGetDoublePosInf();
+        *e = 0;
+        f  = 2;
+        goto Exit;
+    } else
+    if(VpIsNegInf(m)) {
+        *d = VpGetDoubleNegInf();
+        *e = 0;
+        f  = 2;
+        goto Exit;
+    }
+    /* Normal number */
+    fig =(DBLE_FIG + BASE_FIG - 1) / BASE_FIG;
+    ind_m = 0;
+    mm = Min(fig,(m->Prec));
+    *d = 0.0;
+    div = 1.;
+    while(ind_m < mm) {
+        div /=(double)((S_INT)BASE);
+        *d = *d +((double) ((S_INT)m->frac[ind_m++])) * div;
+    }
+    *e = m->exponent * ((S_INT)BASE_FIG);
+    *d *= VpGetSign(m);
+
+Exit:
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, " VpVtoD: m=%\n", m);
+        printf("   d=%e * 10 **%ld\n", *d, *e);
+        printf("   DBLE_FIG = %ld\n", DBLE_FIG);
+    }
+#endif /*_DEBUG */
+    return f;
+}
+
+/*
+ * m <- d
+ */
+VP_EXPORT void
+VpDtoV(Real *m, double d)
+{
+    U_LONG i, ind_m, mm;
+    U_LONG ne;
+    double  val, val2;
+
+    if(isnan(d)) {
+        VpSetNaN(m);
+        goto Exit;
+    }
+    if(isinf(d)) {
+        if(d>0.0) VpSetPosInf(m);
+        else   VpSetNegInf(m);
+        goto Exit;
+    }
+
+    if(d == 0.0) {
+        VpSetZero(m,1);
+        goto Exit;
+    }
+    val =(d > 0.) ? d :(-d);
+    ne = 0;
+    if(val >= 1.0) {
+        while(val >= 1.0) {
+            val /=(double)((S_INT)BASE);
+            ++ne;
+        }
+    } else {
+        val2 = 1.0 /(double)((S_INT)BASE);
+        while(val < val2) {
+            val *=(double)((S_INT)BASE);
+            --ne;
+        }
+    }
+    /* Now val = 0.xxxxx*BASE**ne */
+
+    mm = m->MaxPrec;
+    memset(m->frac, 0, mm * sizeof(U_LONG));
+    for(ind_m = 0;val > 0.0 && ind_m < mm;ind_m++) {
+        val *=(double)((S_INT)BASE);
+        i =(U_LONG) val;
+        val -=(double)((S_INT)i);
+        m->frac[ind_m] = i;
+    }
+    if(ind_m >= mm) ind_m = mm - 1;
+    if(d > 0.0) {
+        VpSetSign(m, (S_INT)1);
+    } else {
+        VpSetSign(m,-(S_INT)1);
+    }
+    m->Prec = ind_m + 1;
+    m->exponent = ne;
+
+    VpInternalRound(m,0,(m->Prec>0)?m->frac[m->Prec-1]:0,
+                      (U_LONG)(val*((double)((S_INT)BASE))));
+
+Exit:
+#ifdef _DEBUG
+    if(gfDebug) {
+        printf("VpDtoV d=%30.30e\n", d);
+        VPrint(stdout, "  m=%\n", m);
+    }
+#endif /* _DEBUG */
+    return;
+}
+
+/*
+ *  m <- ival
+ */
+VP_EXPORT void
+VpItoV(Real *m, S_INT ival)
+{
+    U_LONG mm, ind_m;
+    U_LONG val, v1, v2, v;
+    int isign;
+    S_INT ne;
+
+    if(ival == 0) {
+        VpSetZero(m,1);
+        goto Exit;
+    }
+    isign = 1;
+    val = ival;
+    if(ival < 0) {
+        isign = -1;
+        val =(U_LONG)(-ival);
+    }
+    ne = 0;
+    ind_m = 0;
+    mm = m->MaxPrec;
+    while(ind_m < mm) {
+        m->frac[ind_m] = 0;
+        ++ind_m;
+    }
+    ind_m = 0;
+    while(val > 0) {
+        if(val) {
+         v1 = val;
+         v2 = 1;
+            while(v1 >= BASE) {
+                v1 /= BASE;
+                v2 *= BASE;
+            }
+            val = val - v2 * v1;
+            v = v1;
+        } else {
+            v = 0;
+        }
+        m->frac[ind_m] = v;
+        ++ind_m;
+        ++ne;
+    }
+    m->Prec = ind_m - 1;
+    m->exponent = ne;
+    VpSetSign(m,isign);
+    VpNmlz(m);
+
+Exit:
+#ifdef _DEBUG
+    if(gfDebug) {
+        printf(" VpItoV i=%d\n", ival);
+        VPrint(stdout, "  m=%\n", m);
+    }
+#endif /* _DEBUG */
+    return;
+}
+
+/*
+ * y = SQRT(x),  y*y - x =>0
+ */
+VP_EXPORT int
+VpSqrt(Real *y, Real *x)
+{
+    Real *f = NULL;
+    Real *r = NULL;
+    S_LONG y_prec, f_prec;
+    S_LONG n;
+    S_LONG e;
+    S_LONG prec;
+    S_LONG nr;
+    double val;
+
+    /* Zero, NaN or Infinity ? */
+    if(!VpHasVal(x)) {
+        if(VpIsZero(x)||VpGetSign(x)>0) {
+            VpAsgn(y,x,1);
+            goto Exit;
+        }
+        VpSetNaN(y);
+        return VpException(VP_EXCEPTION_OP,"(VpSqrt) SQRT(NaN or negative value)",0);
+        goto Exit;
+    }
+
+     /* Negative ? */
+    if(VpGetSign(x) < 0) {
+        VpSetNaN(y);
+        return VpException(VP_EXCEPTION_OP,"(VpSqrt) SQRT(negative value)",0);
+    }
+
+    /* One ? */
+    if(VpIsOne(x)) {
+        VpSetOne(y);
+        goto Exit;
+    }
+
+    n = (S_LONG)y->MaxPrec;
+    if((S_LONG)x->MaxPrec > n) n = (S_LONG)x->MaxPrec;
+    /* allocate temporally variables  */
+    f = VpAlloc(y->MaxPrec *(BASE_FIG + 2), "#1");
+    r = VpAlloc((n + n) *(BASE_FIG + 2), "#1");
+
+    nr = 0;
+    y_prec = (S_LONG)y->MaxPrec;
+    f_prec = (S_LONG)f->MaxPrec;
+
+    prec = x->exponent;
+    if(prec > 0)    ++prec;
+    else            --prec;
+    prec = prec - (S_LONG)y->MaxPrec;
+    VpVtoD(&val, &e, x);    /* val <- x  */
+    e /= ((S_LONG)BASE_FIG);
+    n = e / 2;
+    if(e - n * 2 != 0) {
+        val /=(double)((S_INT)BASE);
+        n =(e + 1) / 2;
+    }
+    VpDtoV(y, sqrt(val));    /* y <- sqrt(val) */
+    y->exponent += n;
+    n = (DBLE_FIG + BASE_FIG - 1) / BASE_FIG;
+    y->MaxPrec = (U_LONG)Min(n , y_prec);
+    f->MaxPrec = y->MaxPrec + 1;
+    n = y_prec*((S_LONG)BASE_FIG);
+    if((U_LONG)n<maxnr) n = (U_LONG)maxnr;
+    do {
+        y->MaxPrec *= 2;
+        if(y->MaxPrec > (U_LONG)y_prec) y->MaxPrec = (U_LONG)y_prec;
+        f->MaxPrec = y->MaxPrec;
+        VpDivd(f, r, x, y);     /* f = x/y    */
+        VpAddSub(r, f, y, -1);  /* r = f - y  */
+        VpMult(f, VpPt5, r);    /* f = 0.5*r  */
+        if(VpIsZero(f))         goto converge;
+        VpAddSub(r, f, y, 1);   /* r = y + f  */
+        VpAsgn(y, r, 1);        /* y = r      */
+        if(f->exponent <= prec) goto converge;
+    } while(++nr < n);
+    /* */
+#ifdef _DEBUG
+    if(gfDebug) {
+        printf("ERROR(VpSqrt): did not converge within %ld iterations.\n",
+            nr);
+    }
+#endif /* _DEBUG */
+    y->MaxPrec = y_prec;
+
+converge:
+    VpChangeSign(y,(S_INT)1);
+#ifdef _DEBUG
+    if(gfDebug) {
+        VpMult(r, y, y);
+        VpAddSub(f, x, r, -1);
+        printf("VpSqrt: iterations = %lu\n", nr);
+        VPrint(stdout, "  y =% \n", y);
+        VPrint(stdout, "  x =% \n", x);
+        VPrint(stdout, "  x-y*y = % \n", f);
+    }
+#endif /* _DEBUG */
+    y->MaxPrec = y_prec;
+
+Exit:
+    VpFree(f);
+    VpFree(r);
+    return 1;
+}
+
+/*
+ *
+ * f = 0: Round off/Truncate, 1: round up, 2:ceil, 3: floor, 4: Banker's rounding
+ * nf: digit position for operation.
+ *
+ */
+VP_EXPORT int
+VpMidRound(Real *y, int f, int nf)
+/*
+ * Round reletively from the decimal point.
+ *    f: rounding mode
+ *   nf: digit location to round from the the decimal point.
+ */
+{
+    /* fracf: any positive digit under rounding position? */
+    /* exptoadd: number of digits needed to compensate negative nf */
+    int n,i,ix,ioffset,fracf,exptoadd;
+    U_LONG v,shifter;
+    U_LONG div;
+
+    nf += y->exponent*((int)BASE_FIG);
+    exptoadd=0;
+    if (nf < 0) {
+        exptoadd = -nf;
+        nf = 0;
+    }
+    /* ix: x->fraq[ix] contains round position */
+    ix = nf/(int)BASE_FIG;
+    if(((U_LONG)ix)>=y->Prec) return 0; /* Unable to round */
+    ioffset = nf - ix*((int)BASE_FIG);
+
+    v = y->frac[ix];
+    /* drop digits after pointed digit */
+    n = BASE_FIG - ioffset - 1;
+    for(shifter=1,i=0;i<n;++i) shifter *= 10;
+    fracf = (v%(shifter*10) > 0);
+    v /= shifter;
+    div = v/10;
+    v = v - div*10;
+    if (fracf == 0) {
+        for(i=ix+1;i<y->Prec;i++) {
+            if (y->frac[i]%BASE) {
+                fracf = 1;
+                break;
+            }
+        }
+    }
+    memset(y->frac+ix+1, 0, (y->Prec - (ix+1)) * sizeof(U_LONG));
+    switch(f) {
+    case VP_ROUND_DOWN: /* Truncate */
+         break;
+    case VP_ROUND_UP:   /* Roundup */
+        if(fracf) ++div;
+         break;
+    case VP_ROUND_HALF_UP:   /* Round half up  */
+        if(v>=5) ++div;
+        break;
+    case VP_ROUND_HALF_DOWN: /* Round half down  */
+        if(v>=6) ++div;
+        break;
+    case VP_ROUND_CEIL: /* ceil */
+        if(fracf && (VpGetSign(y)>0)) ++div;
+        break;
+    case VP_ROUND_FLOOR: /* floor */
+        if(fracf && (VpGetSign(y)<0)) ++div;
+        break;
+    case VP_ROUND_HALF_EVEN: /* Banker's rounding */
+        if(v>5) ++div;
+        else if(v==5) {
+            if((U_LONG)i==(BASE_FIG-1)) {
+                if(ix && (y->frac[ix-1]%2)) ++div;
+            } else {
+                if(div%2) ++div;
+            }
+        }
+        break;
+    }
+    for(i=0;i<=n;++i) div *= 10;
+    if(div>=BASE) {
+        if(ix) {
+            y->frac[ix] = 0;
+            VpRdup(y,ix);
+        } else {
+            S_INT s = VpGetSign(y);
+            int e = y->exponent;
+            VpSetOne(y);
+            VpSetSign(y,s);
+            y->exponent = e+1;
+        }
+    } else {
+        y->frac[ix] = div;
+        VpNmlz(y);
+    }
+    if (exptoadd > 0) {
+        y->exponent += exptoadd/BASE_FIG;
+        exptoadd %= BASE_FIG;
+        for(i=0;i<exptoadd;i++) {
+            y->frac[0] *= 10;
+            if (y->frac[0] >= BASE) {
+                y->frac[0] /= BASE;
+                y->exponent++;
+            }
+        }
+    }
+    return 1;
+}
+
+VP_EXPORT int
+VpLeftRound(Real *y, int f, int nf)
+/*
+ * Round from the left hand side of the digits.
+ */
+{
+    U_LONG v;
+    if(!VpHasVal(y)) return 0; /* Unable to round */
+    v = y->frac[0];
+    nf -= VpExponent(y)*BASE_FIG;
+    while(v=v/10) nf--;
+    nf += (BASE_FIG-1);
+    return VpMidRound(y,f,nf);
+}
+
+VP_EXPORT int 
+VpActiveRound(Real *y, Real *x, int f, int nf)
+{
+    /* First,assign whole value in truncation mode */
+    if(VpAsgn(y, x, 10)<=1) return 0; /* Zero,NaN,or Infinity */
+    return VpMidRound(y,f,nf);
+}
+
+static int
+VpLimitRound(Real *c,U_LONG ixDigit)
+{
+    U_LONG ix = VpGetPrecLimit();
+    if(!VpNmlz(c))    return -1;
+    if(!ix)           return 0;
+    if(!ixDigit) ixDigit = c->Prec-1;
+    if((ix+BASE_FIG-1)/BASE_FIG > ixDigit+1) return 0;
+    return VpLeftRound(c,VpGetRoundMode(),ix);
+}
+
+static void 
+VpInternalRound(Real *c,int ixDigit,U_LONG vPrev,U_LONG v)
+{
+    int f = 0;
+
+    if(VpLimitRound(c,ixDigit)) return;
+    if(!v)                      return;
+
+    v /= BASE1;
+    switch(gfRoundMode) {
+    case VP_ROUND_DOWN:
+        break;
+    case VP_ROUND_UP:
+        if(v)                    f = 1;
+        break;
+    case VP_ROUND_HALF_UP:
+        if(v >= 5)               f = 1;
+        break;
+    case VP_ROUND_HALF_DOWN:
+        if(v >= 6)               f = 1;
+        break;
+    case VP_ROUND_CEIL:  /* ceil */
+        if(v && (VpGetSign(c)>0)) f = 1;
+        break;
+    case VP_ROUND_FLOOR: /* floor */
+        if(v && (VpGetSign(c)<0)) f = 1;
+        break;
+    case VP_ROUND_HALF_EVEN:  /* Banker's rounding */
+        if(v>5) f = 1;
+        else if(v==5 && vPrev%2)  f = 1;
+        break;
+    }
+    if(f) {
+        VpRdup(c,ixDigit);    /* round up */
+        VpNmlz(c);
+    }
+}
+
+/*
+ *  Rounds up m(plus one to final digit of m).
+ */
+static int
+VpRdup(Real *m,U_LONG ind_m)
+{
+    U_LONG carry;
+
+    if(!ind_m) ind_m = m->Prec;
+
+    carry = 1;
+    while(carry > 0 && (ind_m--)) {
+        m->frac[ind_m] += carry;
+        if(m->frac[ind_m] >= BASE) m->frac[ind_m] -= BASE;
+        else                       carry = 0;
+    }
+    if(carry > 0) {        /* Overflow,count exponent and set fraction part be 1  */
+        if(!AddExponent(m,(S_LONG)1)) return 0;
+        m->Prec = m->frac[0] = 1;
+    } else {
+        VpNmlz(m);
+    }
+    return 1;
+}
+
+/*
+ *  y = x - fix(x)
+ */
+VP_EXPORT void
+VpFrac(Real *y, Real *x)
+{
+    U_LONG my, ind_y, ind_x;
+
+    if(!VpHasVal(x)) {
+        VpAsgn(y,x,1);
+        goto Exit;
+    }
+
+    if(x->exponent > 0 && (U_LONG)x->exponent >= x->Prec) {
+        VpSetZero(y,VpGetSign(x));
+        goto Exit;
+    } else if(x->exponent <= 0) {
+        VpAsgn(y, x, 1);
+        goto Exit;
+    }
+
+    y->Prec = x->Prec -(U_LONG) x->exponent;
+    y->Prec = Min(y->Prec, y->MaxPrec);
+    y->exponent = 0;
+    VpSetSign(y,VpGetSign(x));
+    ind_y = 0;
+    my = y->Prec;
+    ind_x = x->exponent;
+    while(ind_y < my) {
+        y->frac[ind_y] = x->frac[ind_x];
+        ++ind_y;
+        ++ind_x;
+    }
+    VpNmlz(y);
+
+Exit:
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, "VpFrac y=%\n", y);
+        VPrint(stdout, "    x=%\n", x);
+    }
+#endif /* _DEBUG */
+    return;
+}
+
+/*
+ *   y = x ** n
+ */
+VP_EXPORT int
+VpPower(Real *y, Real *x, S_INT n)
+{
+    U_LONG s, ss;
+    S_LONG sign;
+    Real *w1 = NULL;
+    Real *w2 = NULL;
+
+    if(VpIsZero(x)) {
+        if(n==0) {
+           VpSetOne(y);
+           goto Exit;
+        }
+        sign = VpGetSign(x);
+        if(n<0) {
+           n = -n;
+           if(sign<0) sign = (n%2)?(-1):(1);
+           VpSetInf (y,sign);
+        } else {
+           if(sign<0) sign = (n%2)?(-1):(1);
+           VpSetZero(y,sign);
+        }
+        goto Exit;
+    }
+    if(!VpIsDef(x)) {
+        VpSetNaN(y); /* Not sure !!! */
+        goto Exit;
+    }
+
+    if((x->exponent == 1) &&(x->Prec == 1) &&(x->frac[0] == 1)) {
+        /* abs(x) = 1 */
+        VpSetOne(y);
+        if(VpGetSign(x) > 0) goto Exit;
+        if((n % 2) == 0) goto Exit;
+        VpSetSign(y,-(S_INT)1);
+        goto Exit;
+    }
+
+    if(n > 0) sign = 1;
+    else if(n < 0) {
+        sign = -1;
+        n = -n;
+    } else {
+        VpSetOne(y);
+        goto Exit;
+    }
+
+    /* Allocate working variables  */
+
+    w1 = VpAlloc((y->MaxPrec + 2) * BASE_FIG, "#0");
+    w2 = VpAlloc((w1->MaxPrec * 2 + 1) * BASE_FIG, "#0");
+    /* calculation start */
+
+    VpAsgn(y, x, 1);
+    --n;
+    while(n > 0) {
+        VpAsgn(w1, x, 1);
+        s = 1;
+loop1:  ss = s;
+        s += s;
+        if(s >(U_LONG) n) goto out_loop1;
+        VpMult(w2, w1, w1);
+        VpAsgn(w1, w2, 1);
+        goto loop1;
+out_loop1:
+        n -= ss;
+        VpMult(w2, y, w1);
+        VpAsgn(y, w2, 1);
+    }
+    if(sign < 0) {
+        VpDivd(w1, w2, VpConstOne, y);
+        VpAsgn(y, w1, 1);
+    }
+
+Exit:
+#ifdef _DEBUG
+    if(gfDebug) {
+        VPrint(stdout, "VpPower y=%\n", y);
+        VPrint(stdout, "VpPower x=%\n", x);
+        printf("  n=%d\n", n);
+    }
+#endif /* _DEBUG */
+    VpFree(w2);
+    VpFree(w1);
+    return 1;
+}
+
+#ifdef _DEBUG
+int
+VpVarCheck(Real * v)
+/*
+ * Checks the validity of the Real variable v.
+ * [Input]
+ *   v ... Real *, variable to be checked.
+ * [Returns]
+ *   0  ... correct v.
+ *   other ... error
+ */
+{
+    U_LONG i;
+
+    if(v->MaxPrec <= 0) {
+        printf("ERROR(VpVarCheck): Illegal Max. Precision(=%lu)\n",
+            v->MaxPrec);
+        return 1;
+    }
+    if((v->Prec <= 0) ||((v->Prec) >(v->MaxPrec))) {
+        printf("ERROR(VpVarCheck): Illegal Precision(=%lu)\n", v->Prec);
+        printf("       Max. Prec.=%lu\n", v->MaxPrec);
+        return 2;
+    }
+    for(i = 0; i < v->Prec; ++i) {
+        if((v->frac[i] >= BASE)) {
+            printf("ERROR(VpVarCheck): Illegal fraction\n");
+            printf("       Frac[%ld]=%lu\n", i, v->frac[i]);
+            printf("       Prec.   =%lu\n", v->Prec);
+            printf("       Exp. =%d\n", v->exponent);
+            printf("       BASE =%lu\n", BASE);
+            return 3;
+        }
+    }
+    return 0;
+}
+#endif /* _DEBUG */
diff --git a/ruby_1_8_6/ext/bigdecimal/bigdecimal.def b/ruby_1_8_6/ext/bigdecimal/bigdecimal.def
new file mode 100644
index 0000000000..8450e164e6
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/bigdecimal.def
@@ -0,0 +1,2 @@
+EXPORTS
+Init_bigdecimal
diff --git a/ruby_1_8_6/ext/bigdecimal/bigdecimal.h b/ruby_1_8_6/ext/bigdecimal/bigdecimal.h
new file mode 100644
index 0000000000..4f77feab00
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/bigdecimal.h
@@ -0,0 +1,216 @@
+/*
+ *
+ * Ruby BigDecimal(Variable decimal precision) extension library. 
+ *
+ * Copyright(C) 2002 by Shigeo Kobayashi(shigeo@tinyforest.gr.jp) 
+ *
+ * You may distribute under the terms of either the GNU General Public 
+ * License or the Artistic License, as specified in the README file 
+ * of this BigDecimal distribution. 
+ *
+ * NOTES:
+ *   2003-03-28 V1.0 checked in.
+ *
+ */
+
+#ifndef  ____BIG_DECIMAL__H____
+#define  ____BIG_DECIMAL__H____
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*
+ *  NaN & Infinity
+ */
+#define SZ_NaN  "NaN"
+#define SZ_INF  "Infinity"
+#define SZ_PINF "+Infinity"
+#define SZ_NINF "-Infinity"
+
+/*
+ *   #define VP_EXPORT other than static to let VP_ routines 
+ *   be called from outside of this module.
+ */
+#define VP_EXPORT static 
+
+#define U_LONG unsigned long
+#define S_LONG long
+#define U_INT  unsigned int
+#define S_INT  int
+
+/* Exception codes */
+#define VP_EXCEPTION_ALL        ((unsigned short)0x00FF)
+#define VP_EXCEPTION_INFINITY   ((unsigned short)0x0001)
+#define VP_EXCEPTION_NaN        ((unsigned short)0x0002)
+#define VP_EXCEPTION_UNDERFLOW  ((unsigned short)0x0004)
+#define VP_EXCEPTION_OVERFLOW   ((unsigned short)0x0001) /* 0x0008) */
+#define VP_EXCEPTION_ZERODIVIDE ((unsigned short)0x0001) /* 0x0010) */
+
+/* Following 2 exceptions cann't controlled by user */
+#define VP_EXCEPTION_OP         ((unsigned short)0x0020)
+#define VP_EXCEPTION_MEMORY     ((unsigned short)0x0040)
+
+/* Computation mode */
+#define VP_ROUND_MODE            ((unsigned short)0x0100)
+#define VP_ROUND_UP         1
+#define VP_ROUND_DOWN       2
+#define VP_ROUND_HALF_UP    3
+#define VP_ROUND_HALF_DOWN  4
+#define VP_ROUND_CEIL       5
+#define VP_ROUND_FLOOR      6
+#define VP_ROUND_HALF_EVEN  7
+
+#define VP_SIGN_NaN                0 /* NaN                      */
+#define VP_SIGN_POSITIVE_ZERO      1 /* Positive zero            */
+#define VP_SIGN_NEGATIVE_ZERO     -1 /* Negative zero            */
+#define VP_SIGN_POSITIVE_FINITE    2 /* Positive finite number   */
+#define VP_SIGN_NEGATIVE_FINITE   -2 /* Negative finite number   */
+#define VP_SIGN_POSITIVE_INFINITE  3 /* Positive infinite number */
+#define VP_SIGN_NEGATIVE_INFINITE -3 /* Negative infinite number */
+
+/*
+ * VP representation
+ *  r = 0.xxxxxxxxx *BASE**exponent
+ */
+typedef struct {
+    VALUE  obj;     /* Back pointer(VALUE) for Ruby object.     */
+    U_LONG MaxPrec; /* Maximum precision size                   */
+                    /* This is the actual size of pfrac[]       */
+                    /*(frac[0] to frac[MaxPrec] are available). */
+    U_LONG Prec;    /* Current precision size.                  */
+                    /* This indicates how much the.             */
+                    /* the array frac[] is actually used.       */
+    S_INT  exponent;/* Exponent part.                           */
+    short  sign;    /* Attributes of the value.                 */
+                    /*
+                     *        ==0 : NaN
+                     *          1 : Positive zero
+                     *         -1 : Negative zero
+                     *          2 : Positive number
+                     *         -2 : Negative number
+                     *          3 : Positive infinite number
+                     *         -3 : Negative infinite number
+                     */
+    short  flag;    /* Not used in vp_routines,space for user.  */
+    U_LONG frac[1]; /* Pointer to array of fraction part.       */
+} Real;
+
+/*  
+ *  ------------------
+ *   EXPORTables.
+ *  ------------------
+ */
+
+VP_EXPORT  Real *
+VpNewRbClass(U_LONG mx,char *str,VALUE klass);
+
+VP_EXPORT  Real *VpCreateRbObject(U_LONG mx,const char *str);
+
+VP_EXPORT U_LONG VpBaseFig(void);
+VP_EXPORT U_LONG VpDblFig(void);
+VP_EXPORT U_LONG VpBaseVal(void);
+
+/* Zero,Inf,NaN (isinf(),isnan() used to check) */
+VP_EXPORT double VpGetDoubleNaN(void);
+VP_EXPORT double VpGetDoublePosInf(void);
+VP_EXPORT double VpGetDoubleNegInf(void);
+VP_EXPORT double VpGetDoubleNegZero(void);
+
+/* These 2 functions added at v1.1.7 */
+VP_EXPORT U_LONG VpGetPrecLimit(void);
+VP_EXPORT U_LONG VpSetPrecLimit(U_LONG n);
+
+/* Round mode */
+VP_EXPORT int           VpIsRoundMode(unsigned long n);
+VP_EXPORT unsigned long VpGetRoundMode(void);
+VP_EXPORT unsigned long VpSetRoundMode(unsigned long n);
+
+VP_EXPORT int VpException(unsigned short f,const char *str,int always);
+VP_EXPORT int VpIsNegDoubleZero(double v);
+VP_EXPORT U_LONG VpNumOfChars(Real *vp,const char *pszFmt);
+VP_EXPORT U_LONG VpInit(U_LONG BaseVal);
+VP_EXPORT void *VpMemAlloc(U_LONG mb);
+VP_EXPORT void VpFree(Real *pv);
+VP_EXPORT Real *VpAlloc(U_LONG mx, const char *szVal);
+VP_EXPORT int VpAsgn(Real *c,Real *a,int isw);
+VP_EXPORT int VpAddSub(Real *c,Real *a,Real *b,int operation);
+VP_EXPORT int VpMult(Real *c,Real *a,Real *b);
+VP_EXPORT int VpDivd(Real *c,Real *r,Real *a,Real *b);
+VP_EXPORT int VpComp(Real *a,Real *b);
+VP_EXPORT S_LONG VpExponent10(Real *a);
+VP_EXPORT void VpSzMantissa(Real *a,char *psz);
+VP_EXPORT int VpToSpecialString(Real *a,char *psz,int fPlus);
+VP_EXPORT void VpToString(Real *a,char *psz,int fFmt,int fPlus);
+VP_EXPORT void VpToFString(Real *a,char *psz,int fFmt,int fPlus);
+VP_EXPORT int VpCtoV(Real *a,const char *int_chr,U_LONG ni,const char *frac,U_LONG nf,const char *exp_chr,U_LONG ne);
+VP_EXPORT int VpVtoD(double *d,S_LONG *e,Real *m);
+VP_EXPORT void VpDtoV(Real *m,double d);
+VP_EXPORT void VpItoV(Real *m,S_INT ival);
+VP_EXPORT int VpSqrt(Real *y,Real *x);
+VP_EXPORT int VpActiveRound(Real *y,Real *x,int f,int il);
+VP_EXPORT int VpMidRound(Real *y, int f, int nf);
+VP_EXPORT int VpLeftRound(Real *y, int f, int nf);
+VP_EXPORT void VpFrac(Real *y,Real *x);
+VP_EXPORT int VpPower(Real *y,Real *x,S_INT n);
+
+/* VP constants */
+VP_EXPORT Real *VpOne(void);
+
+/*  
+ *  ------------------
+ *  MACRO definitions.
+ *  ------------------
+ */
+#define Abs(a)     (((a)>= 0)?(a):(-(a)))
+#define Max(a, b)  (((a)>(b))?(a):(b))
+#define Min(a, b)  (((a)>(b))?(b):(a))
+
+#define VpMaxPrec(a)   ((a)->MaxPrec)
+#define VpPrec(a)      ((a)->Prec)
+#define VpGetFlag(a)   ((a)->flag)
+
+/* Sign */
+
+/* VpGetSign(a) returns 1,-1 if a>0,a<0 respectively */
+#define VpGetSign(a) (((a)->sign>0)?1:(-1))
+/* Change sign of a to a>0,a<0 if s = 1,-1 respectively */
+#define VpChangeSign(a,s) {if((s)>0) (a)->sign=(short)Abs((S_LONG)(a)->sign);else (a)->sign=-(short)Abs((S_LONG)(a)->sign);}
+/* Sets sign of a to a>0,a<0 if s = 1,-1 respectively */
+#define VpSetSign(a,s)    {if((s)>0) (a)->sign=(short)VP_SIGN_POSITIVE_FINITE;else (a)->sign=(short)VP_SIGN_NEGATIVE_FINITE;}
+
+/* 1 */
+#define VpSetOne(a)       {(a)->frac[0]=(a)->exponent=(a)->Prec=1;(a)->sign=VP_SIGN_POSITIVE_FINITE;}
+
+/* ZEROs */
+#define VpIsPosZero(a)  ((a)->sign==VP_SIGN_POSITIVE_ZERO)
+#define VpIsNegZero(a)  ((a)->sign==VP_SIGN_NEGATIVE_ZERO)
+#define VpIsZero(a)     (VpIsPosZero(a) || VpIsNegZero(a))
+#define VpSetPosZero(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_POSITIVE_ZERO)
+#define VpSetNegZero(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NEGATIVE_ZERO)
+#define VpSetZero(a,s)  ( ((s)>0)?VpSetPosZero(a):VpSetNegZero(a) )
+
+/* NaN */
+#define VpIsNaN(a)      ((a)->sign==VP_SIGN_NaN)
+#define VpSetNaN(a)     ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NaN)
+
+/* Infinity */
+#define VpIsPosInf(a)   ((a)->sign==VP_SIGN_POSITIVE_INFINITE)
+#define VpIsNegInf(a)   ((a)->sign==VP_SIGN_NEGATIVE_INFINITE)
+#define VpIsInf(a)      (VpIsPosInf(a) || VpIsNegInf(a))
+#define VpIsDef(a)      ( !(VpIsNaN(a)||VpIsInf(a)) )
+#define VpSetPosInf(a)  ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_POSITIVE_INFINITE)
+#define VpSetNegInf(a)  ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NEGATIVE_INFINITE)
+#define VpSetInf(a,s)   ( ((s)>0)?VpSetPosInf(a):VpSetNegInf(a) )
+#define VpHasVal(a)     (a->frac[0])
+#define VpIsOne(a)      ((a->Prec==1)&&(a->frac[0]==1)&&(a->exponent==1))
+#define VpExponent(a)   (a->exponent)
+#ifdef _DEBUG
+int VpVarCheck(Real * v);
+VP_EXPORT int VPrint(FILE *fp,char *cntl_chr,Real *a);
+#endif /* _DEBUG */
+
+#if defined(__cplusplus)
+}  /* extern "C" { */
+#endif
+#endif /* ____BIG_DECIMAL__H____ */
diff --git a/ruby_1_8_6/ext/bigdecimal/bigdecimal_en.html b/ruby_1_8_6/ext/bigdecimal/bigdecimal_en.html
new file mode 100644
index 0000000000..c2b86faef6
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/bigdecimal_en.html
@@ -0,0 +1,796 @@
+<!-- saved from url=(0022)http://internet.e-mail -->
+<HTML>
+<HEAD>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html">
+<style type="text/css"><!--
+body {  color: #3f0f0f;  background: #fefeff;  margin-left: 2em; margin-right: 2em;}
+h1 {  color: #ffffff;  background-color: #3939AD;  border-color: #FF00FF;  width: 100%;  border-style: solid;
+  border-top-width: 0.1em;  border-bottom-width: 0.1em;  border-right: none;  border-left: none;
+  padding: 0.1em;  font-weight: bold;  font-size: 160%;  text-align: center;}
+h2 {  color: #00007f;  background-color: #e7e7ff;  border-color: #000094;  width: 100%;  border-style: solid;  border-le  ft: none;  border-right: none;  border-top-width: 0.1em;  border-bottom-width: 0.1em;  padding: 0.1em;
+  font-weight: bold;  font-size: 110%;
+}
+h3 {  color: #00007f;  padding: 0.2em;  font-size: 110%;}
+h4, h5 {  color: #000000;  padding: 0.2em;  font-size: 100%;}
+table {  margin-top: 0.2em; margin-bottom: 0.2em;  margin-left: 2em; margin-right: 2em;}
+caption {  color: #7f0000;  font-weight: bold;}
+th {  background: #e7e7ff;  padding-left: 0.2em; padding-right: 0.2em;}
+td {  background: #f3f7ff;  padding-left: 0.2em; padding-right: 0.2em;}
+code {  color: #0000df;}
+dt {  margin-top: 0.2em;}
+li {  margin-top: 0.2em;}
+pre
+{    BACKGROUND-COLOR: #d0d0d0;    BORDER-BOTTOM: medium none;    BORDER-LEFT: medium none;
+    BORDER-RIGHT: medium none;    BORDER-TOP: medium none;    LINE-HEIGHT: 100%;    MARGIN: 12px 12px 12px 12px;
+    PADDING-BOTTOM: 12px;    PADDING-LEFT: 12px;    PADDING-RIGHT: 12px;    PADDING-TOP: 12px;
+    WHITE-SPACE: pre;    WIDTH: 100%
+}
+--></style>
+
+<TITLE>BigDecimal:An extension library for Ruby</TITLE>
+</HEAD>
+<BODY BGCOLOR=#FFFFE0>
+<H1>BigDecimal(Variable Precision Floating Library for Ruby)</H1>
+<DIV align="right"><A HREF="./bigdecimal_ja.html">Japanese</A></DIV><BR>
+BigDecimal is an extension library for the Ruby interpreter. 
+Using BigDecimal class, you can obtain any number of significant digits in computation. 
+For the details about Ruby see:<BR>
+<UL>
+<LI><A HREF="http://www.ruby-lang.org/en/">http://www.ruby-lang.org/en/</A>:Official Ruby page(English).</LI>
+<LI><A HREF="http://kahori.com/ruby/ring/">http://kahori.com/ruby/ring/</A>:Mutually linked pages relating to Ruby(Japanese).
+</LI>
+</UL> 
+NOTE:<BR>
+ This software is provided "AS IS" and without any express or
+ implied warranties,including,without limitation,the implied
+ warranties of merchantibility and fitness for a particular
+ purpose. For the details,see COPYING and README included in this
+ distribution.
+<BR>
+<hr>
+
+<H2>Contents</H2>
+<UL>
+<LI><A HREF="#INTRO">Introduction</LI>
+<LI><A HREF="#SPEC">Usage and methods</A></LI>
+<LI><A HREF="#UNDEF">Infinity,NaN,Zero</A></LI>
+<LI><A HREF="#STRUCT">Internal structure</A></LI>
+<LI><A HREF="#BASE">Binary or decimal number representation</A></LI>
+<LI><A HREF="#PREC">Resulting number of significant digits</A></LI>
+</UL>
+<HR>
+
+<A NAME="#INTRO">
+<H2>Introduction</H2>
+Ruby already has builtin (variable length integer number) class Bignum. Using Bignum class,you can obtain
+ any integer value in magnitude. But, variable length decimal number class is not yet built in. 
+This is why I made variable length floating class BigDecimal.
+Feel free to send any comments or bug reports to me.
+<A HREF="mailto:shigeo@tinyforest.gr.jp">shigeo@tinyforest.gr.jp</A>
+I will try(but can't promise) to fix bugs reported. 
+<hr>
+<H2>Installation</H2>
+The Ruby latest version can be downloaded from <A HREF="http://www.ruby-lang.org/en/">Official Ruby page</A>.
+Once decompress the downloaded Ruby archive,follow the normal installation procedures according to the 
+documents included.
+
+<A NAME="#SPEC">
+<H2>Usage and methods</H2>
+Suppose you already know Ruby programming,
+to create BigDecimal objects,the program would like:<BR>
+
+<CODE><PRE>
+   require 'bigdecimal'
+   a=BigDecimal::new("0.123456789123456789")
+   b=BigDecimal("123456.78912345678",40)
+   c=a+b
+</PRE></CODE>
+
+<H3>List of methods</H3>
+In 32 bits integer system,every 4 digits(in decimal) are computed simultaneously.
+This means the number of significant digits in BigDecimal is always a multiple of 4.
+<P>
+Some more methods are available in Ruby code (not C code). 
+Functions such as sin,cos ...,are in math.rb in bigdecimal directory.
+To use them,require math.rb as:
+<CODE><PRE>
+require "bigdecimal/math.rb"
+</PRE></CODE>
+For details,see the math.rb code and comments.
+Other utility methods are in util.rb.
+To use util.rb, require it as:
+<CODE><PRE>
+require "bigdecimal/util.rb"
+</PRE></CODE>
+For details,see the util.rb code.
+
+<H4><U>Class methods</U></H4>
+<UL>
+<LI><B>new</B></LI><BLOCKQUOTE>
+"new" method creates a new BigDecimal object.<BR>
+a=BigDecimal::new(s[,n]) or<BR>
+a=BigDecimal(s[,n]) or<BR>
+where:<BR>
+s: Initial value string. Spaces will be ignored. Any unrecognizable character for 
+representing initial value terminates the string.<BR>
+n: Maximum number of significant digits of a. n must be a Fixnum object.
+If n is omitted or is equal to 0,then the maximum number of significant digits of a is determined from the length of s.
+Actual number of digits handled in computations are usually gretaer than n.<BR>
+n is useful when performing divisions like
+<CODE><PRE>
+BigDecimal("1")    / BigDecimal("3")    # => 0.3333333333 33E0
+BigDecimal("1",10) / BigDecimal("3",10) # => 0.3333333333 3333333333 33333333E0
+</PRE></CODE>
+but the resulting digits obtained may differ in future version.
+</BLOCKQUOTE>
+
+<LI><B>mode</B></LI><BLOCKQUOTE>
+f = BigDecimal.mode(s[,v])<BR>
+mode method controls BigDecimal computation. If the second argument is not given or is nil,then the value
+of current setting is returned.
+Following usage are defined.<BR>
+<P><B>[EXCEPTION control]</B><P>
+Actions when computation results NaN or Infinity can be defined as follows.
+<P>
+<BLOCKQUOTE>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_NaN,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_INFINITY,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_UNDERFLOW,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_OVERFLOW,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_ZERODIVIDE,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_ALL,flag)<BR>
+</BLOCKQUOTE>
+EXCEPTION_NaN controls the execution when computation results to NaN.<BR>
+EXCEPTION_INFINITY controls the execution when computation results to Infinity(�}Infinity).<BR>
+EXCEPTION_UNDERFLOW controls the execution when computation underflows.<BR>
+EXCEPTION_OVERFLOW controls the execution when computation overflows.<BR>
+EXCEPTION_ZERODIVIDE controls the execution when zero-division occures.<BR>
+EXCEPTION_ALL controls the execution for any exception defined occures.<BR>
+If the flag is true,then the relating exception is thrown.<BR>
+No exception is thrown when the flag is false(default) and computation 
+continues with the result:<BR>
+<BLOCKQUOTE>
+EXCEPTION_NaN results to NaN<BR>
+EXCEPTION_INFINITY results to +Infinity or -Infinity<BR>
+EXCEPTION_UNDERFLOW results to 0.<BR>
+EXCEPTION_OVERFLOW results to +Infinity or -Infinity<BR>
+EXCEPTION_ZERODIVIDE results to +Infinity or -Infinity<BR>
+</BLOCKQUOTE>
+EXCEPTION_INFINITY,EXCEPTION_OVERFLOW, and EXCEPTION_ZERODIVIDE are
+ currently the same.<BR>
+The return value of mode method is the value set.<BR>
+If nil is specified for the second argument,then current setting is returned.<BR>
+Suppose the return value of the mode method is f,then 
+ f &amp; BigDecimal::EXCEPTION_NaN !=0 means EXCEPTION_NaN is set to on.
+<P>
+<B>[ROUND error control]</B><P>
+Rounding operation can be controlled as:
+<BLOCKQUOTE>
+f = BigDecimal::mode(BigDecimal::ROUND_MODE,flag)
+</BLOCKQUOTE>
+where flag must be one of:
+<TABLE>
+
+<TR><TD>ROUND_UP</TD><TD>round away from zero.</TD></TR>
+<TR><TD>ROUND_DOWN</TD><TD>round towards zero(truncate).</TD></TR>
+<TR><TD>ROUND_HALF_UP</TD><TD>round up if the digit &gt;= 5 otherwise truncated(default).</TD></TR>
+<TR><TD>ROUND_HALF_DOWN</TD><TD>round up if the digit &gt;= 6 otherwise truncated.</TD></TR>
+<TR><TD>ROUND_HALF_EVEN</TD><TD>round towards the even neighbor(Banker's rounding).
+<TR><TD>ROUND_CEILING</TD><TD>round towards positive infinity(ceil).</TD></TR>
+<TR><TD>ROUND_FLOOR</TD><TD>round towards negative infinity(floor).</TD></TR>
+</TABLE>
+New rounding mode is returned. If nil is specified for the second argument,then current setting is returned.<BR>
+The digit location for rounding operation can not be specified by this mode method,
+use truncate/round/ceil/floor/add/sub/mult/div mthods for each instance instead.
+</BLOCKQUOTE>
+
+<LI><B>limit[(n)]</B></LI><BLOCKQUOTE>
+Limits the maximum digits that the newly created BigDecimal objects can hold never exceed n.
+This means the rounding operation specified by BigDecimal.mode is 
+performed if necessary.
+limit returns the value before set if n is nil or is not specified.
+Zero,the default value,means no upper limit.<BR>
+The limit has no more priority than instance methods such as truncate,round,ceil,floor,add,sub,mult,and div. <BR>
+mf = BigDecimal::limit(n)<BR>
+</BLOCKQUOTE>
+
+<LI><B>double_fig</B></LI><BLOCKQUOTE>
+double_fig is a class method which returns the number of digits 
+the Float class can have.
+<CODE><PRE>
+  p BigDecimal::double_fig  # ==> 20 (depends on the CPU etc.)
+</PRE></CODE>
+The equivalent C programs which calculates the value of
+double_fig is:
+<CODE><PRE>
+ double v          = 1.0;
+ int    double_fig = 0;
+ while(v + 1.0 > 1.0) {
+    ++double_fig;
+    v /= 10;
+ }
+</PRE></CODE>
+</BLOCKQUOTE>
+
+<LI><B>BASE</B></LI><BLOCKQUOTE>
+Base value used in the BigDecimal calculation.
+On 32 bits integer system,the value of BASE is 10000.<BR>
+b = BigDecimal::BASE<BR>
+</BLOCKQUOTE>
+</UL>
+
+<H4><U>Instance methods</U></H4>
+<UL>
+<LI><B>+</B></LI><BLOCKQUOTE>
+addition(c = a + b)<BR>
+For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
+
+</BLOCKQUOTE>
+<LI><B>-</B></LI><BLOCKQUOTE>
+subtraction (c = a - b) or negation (c = -a)<BR>
+For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
+
+</BLOCKQUOTE>
+<LI><B>*</B></LI><BLOCKQUOTE>
+multiplication(c = a * b)<BR>
+For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
+
+</BLOCKQUOTE>
+<LI><B>/</B></LI><BLOCKQUOTE>
+division(c = a / b)<BR>
+For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
+</BLOCKQUOTE>
+
+<LI><B>add(b,n)</B></LI><BLOCKQUOTE>
+c = a.add(b,n)<BR>
+c = a.add(b,n) performs c = a + b.<BR>
+If n is less than the actual significant digits of a + b,
+then c is rounded properly according to the BigDecimal.limit.<BR>
+If n is zero,then the result is the same as +'s.
+</BLOCKQUOTE>
+<LI><B>sub(b,n)</B></LI><BLOCKQUOTE>
+c = a.sub(b,n)<BR>
+c = a.sub(b,n) performs c = a - b.<BR>
+If n is less than the actual significant digits of a - b,
+then c is rounded properly according to the BigDecimal.limit.<BR>
+If n is zero,then the result is the same as -'s.
+
+</BLOCKQUOTE>
+<LI><B>mult(b,n)</B></LI><BLOCKQUOTE>
+c = a.mult(b,n)<BR>
+c = a.mult(b,n) performs c = a * b.<BR>
+If n is less than the actual significant digits of a * b,
+then c is rounded properly according to the BigDecimal.limit.<BR>
+If n is zero,then the result is the same as *'s.
+
+</BLOCKQUOTE>
+<LI><B>div(b[,n])</B></LI><BLOCKQUOTE>
+c = a.div(b,n)<BR>
+c = a.div(b,n) performs c = a / b.<BR>
+If n is less than the actual significant digits of a / b,
+then c is rounded properly according to the BigDecimal.limit.<BR>
+If n is zero,then the result is the same as /'s.
+If n is not given,then the result will be an integer(BigDecimal) like Float#div.
+</BLOCKQUOTE>
+
+<LI><B>fix</B></LI><BLOCKQUOTE>
+c = a.fix<BR>
+returns integer part of a.<BR>
+
+</BLOCKQUOTE>
+<LI><B>frac</B></LI><BLOCKQUOTE>
+c = a.frac<BR>
+returns fraction part of a.<BR>
+
+</BLOCKQUOTE>
+<LI><B>floor[(n)]</B></LI><BLOCKQUOTE>
+c = a.floor<BR>
+returns the maximum integer value (in BigDecimal) which is less than or equal to a.
+<CODE><PRE>
+ c = BigDecimal("1.23456").floor  #  ==> 1
+ c = BigDecimal("-1.23456").floor #  ==> -2
+</PRE></CODE>
+
+As shown in the following example,an optional integer argument (n) specifying the position 
+of the target digit can be given.<BR>
+If n> 0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
+If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
+<CODE><PRE>
+ c = BigDecimal("1.23456").floor(4)   #  ==> 1.2345
+ c = BigDecimal("15.23456").floor(-1) #  ==> 10.0
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>ceil[(n)]</B></LI><BLOCKQUOTE>
+c = a.ceil<BR>
+returns the minimum integer value (in BigDecimal) which is greater than or equal to a.
+<CODE><PRE>
+ c = BigDecimal("1.23456").ceil  #  ==> 2
+ c = BigDecimal("-1.23456").ceil #  ==> -1
+</PRE></CODE>
+
+As shown in the following example,an optional integer argument (n) specifying the position 
+of the target digit can be given.<BR>
+If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
+If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
+<CODE><PRE>
+ c = BigDecimal("1.23456").ceil(4)   # ==> 1.2346
+ c = BigDecimal("15.23456").ceil(-1) # ==> 20.0
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>round[(n[,b])]</B></LI><BLOCKQUOTE>
+c = a.round<BR>
+round a to the nearest 1(default)�D<BR>
+<CODE><PRE>
+ c = BigDecimal("1.23456").round  #  ==> 1
+ c = BigDecimal("-1.23456").round #  ==> -1
+</PRE></CODE>
+The rounding operation changes according to BigDecimal::mode(BigDecimal::ROUND_MODE,flag) if specified.
+
+As shown in the following example,an optional integer argument (n) specifying the position 
+of the target digit can be given.<BR>
+If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction  part digits is less than or equal to n).<BR>
+If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
+<CODE><PRE>
+c = BigDecimal::new("1.23456").round(4)   #  ==> 1.2346
+c = BigDecimal::new("15.23456").round(-1) #  ==> 20.0
+</PRE></CODE>
+
+Rounding operation can be specified by setting the second optional argument b with the valid ROUND_MODE.<BR>
+<CODE><PRE>
+c = BigDecimal::new("1.23456").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.234
+c = BigDecimal::new("1.23356").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.234
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>truncate[(n)]</B></LI><BLOCKQUOTE>
+c = a.truncate<BR>
+truncate a to the nearest 1�D<BR>
+As shown in the following example,an optional integer argument (n) specifying the position 
+of the target digit can be given.<BR>
+If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
+If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
+
+<CODE><PRE>
+c = BigDecimal::new("1.23456").truncate(4)   #  ==> 1.2345
+c = BigDecimal::new("15.23456").truncate(-1) #  ==> 10.0
+</PRE></CODE>
+</BLOCKQUOTE>
+<LI><B>abs</B></LI><BLOCKQUOTE>
+c = a.abs<BR>
+returns an absolute value of a.<BR>
+
+</BLOCKQUOTE>
+<LI><B>to_i</B></LI><BLOCKQUOTE>
+changes a to an integer.<BR>
+i = a.to_i<BR>
+i becomes to Fixnum or Bignum.
+If a is Infinity or NaN,then i becomes to nil.
+
+</BLOCKQUOTE>
+<LI><B>to_s[(n)]</B></LI><BLOCKQUOTE>
+converts to string(default results look like "0.xxxxxEn").
+<CODE><PRE>
+BigDecimal("1.23456").to_s  #  ==> "0.123456E1"
+</PRE></CODE>
+If n(>0) is given,then a space is inserted to each of two parts divided by the decimal point 
+after every n digits for readability.
+<CODE><PRE>
+BigDecimal("0.1234567890123456789").to_s(10)   #  ==> "0.1234567890 123456789E0"
+</PRE></CODE>
+n can be a string representing a positive integer number.
+<CODE><PRE>
+BigDecimal("0.1234567890123456789").to_s("10") #  ==> "0.1234567890 123456789E0"
+</PRE></CODE>
+If the first character is '+'(or ' '),then '+'(or ' ') will be set before value string
+when the value is positive.
+<CODE><PRE>
+BigDecimal("0.1234567890123456789").to_s(" 10") #  ==> " 0.1234567890 123456789E0"
+BigDecimal("0.1234567890123456789").to_s("+10") #  ==> "+0.1234567890 123456789E0"
+BigDecimal("-0.1234567890123456789").to_s("10") #  ==> "-0.1234567890 123456789E0"
+</PRE></CODE>
+
+At the end of the string,'E'(or 'e') or 'F'(or 'f') can be specified to change 
+number representation.
+<CODE><PRE>
+BigDecimal("1234567890.123456789").to_s("E")  #  ==> "0.1234567890123456789E10"
+BigDecimal("1234567890.123456789").to_s("F")  #  ==> "1234567890.123456789"
+BigDecimal("1234567890.123456789").to_s("5E") #  ==> "0.12345 67890 12345 6789E10"
+BigDecimal("1234567890.123456789").to_s("5F") #  ==> "12345 67890.12345 6789"
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>exponent</B></LI><BLOCKQUOTE>
+returns an integer holding exponent value of a.<BR>
+n = a.exponent <BR>
+means a = 0.xxxxxxx*10**n.
+</BLOCKQUOTE>
+
+<LI><B>precs</B></LI><BLOCKQUOTE>
+n,m = a.precs <BR>
+prec returns number of significant digits (n) and maximum number of 
+significant digits (m) of a.
+</BLOCKQUOTE>
+
+<LI><B>to_f</B></LI><BLOCKQUOTE>
+Creates a new Float object having (nearly) the same value.
+Use split method if you want to convert by yourself.
+</BLOCKQUOTE>
+
+</BLOCKQUOTE>
+<LI><B>sign</B></LI><BLOCKQUOTE>
+n = a.sign <BR>
+returns positive value if a &gt; 0,negative value if a &lt; 0,
+otherwise zero if a == 0.<BR>
+where the value of n means that a is:<BR>
+n = BigDecimal::SIGN_NaN(0) : a is NaN<BR>
+n = BigDecimal::SIGN_POSITIVE_ZERO(1) : a is +0<BR>
+n = BigDecimal::SIGN_NEGATIVE_ZERO(-1) : a is -0<BR>
+n = BigDecimal::SIGN_POSITIVE_FINITE(2) : a is positive<BR>
+n = BigDecimal::SIGN_NEGATIVE_FINITE(-2) : a is negative<BR>
+n = BigDecimal::SIGN_POSITIVE_INFINITE(3) : a is +Infinity<BR>
+n = BigDecimal::SIGN_NEGATIVE_INFINITE(-3) : a is -Infinity<BR>
+The value in () is the actual value,see (<A HREF="#STRUCT">Internal structure</A>.<BR>
+
+</BLOCKQUOTE>
+<LI><B>nan?</B></LI><BLOCKQUOTE>
+a.nan? returns True when a is NaN.
+
+</BLOCKQUOTE>
+<LI><B>infinite?</B></LI><BLOCKQUOTE>
+a.infinite? returns 1 when a is +��,-1 when a is -��, nil otherwise.
+
+</BLOCKQUOTE>
+<LI><B>finite?</B></LI><BLOCKQUOTE>
+a.finite? returns true when a is neither �� nor NaN.
+</BLOCKQUOTE>
+
+<LI><B>zero?</B></LI><BLOCKQUOTE>
+c = a.zero?<BR>
+returns true if a is equal to 0,otherwise returns false<BR>
+</BLOCKQUOTE>
+<LI><B>nonzero?</B></LI><BLOCKQUOTE>
+c = a.nonzero?<BR>
+returns nil if a is 0,otherwise returns a itself.<BR>
+</BLOCKQUOTE>
+
+<LI><B>split</B></LI><BLOCKQUOTE>
+decomposes a BigDecimal value to 4 parts.
+All 4 parts are returned as an array.<BR>
+Parts consist of a sign(0 when the value is NaN,+1 for positive and
+ -1 for negative value), a string representing fraction part,base value(always 10 currently),and an integer(Fixnum) for exponent respectively.
+a=BigDecimal::new("3.14159265")<BR>
+f,x,y,z = a.split<BR>
+where f=+1,x="314159265",y=10 and z=1<BR>
+therefore,you can translate BigDecimal value to Float as:<BR>
+s = "0."+x<BR>
+b = f*(s.to_f)*(y**z)<BR>
+
+</BLOCKQUOTE>
+<LI><B>inspect</B></LI><BLOCKQUOTE>
+is used for debugging output.<BR>
+p a=BigDecimal::new("3.14",10)<BR>
+should produce output like "#&lt;0x112344:'0.314E1',4(12)%gt;".
+where "0x112344" is the address,
+'0.314E1' is the value,4 is the number of the significant digits,
+and 12 is the maximum number of the significant digits 
+the object can hold.
+</BLOCKQUOTE>
+
+<LI><B>sqrt</B></LI><BLOCKQUOTE>
+c = a.sqrt(n)<BR>
+computes square root value of a with significant digit number n at least.<BR>
+</BLOCKQUOTE>
+
+<LI><B>**</B></LI><BLOCKQUOTE>
+c = a ** n<BR>
+returns the value of a powered by n.
+n must be an integer.<BR>
+
+</BLOCKQUOTE>
+<LI><B>power</B></LI><BLOCKQUOTE>
+The same as ** method.<BR>
+c = a.power(n)<BR>
+returns the value of a powered by n(c=a**n).
+n must be an integer.<BR>
+</BLOCKQUOTE>
+
+<LI><B>divmod,quo,modulo,%,remainder</B></LI><BLOCKQUOTE>
+See,corresponding methods in Float class.
+</BLOCKQUOTE>
+
+</BLOCKQUOTE>
+<LI><B>&lt;=&gt;</B></LI><BLOCKQUOTE>
+c = a &lt;=&gt; b <BR>
+returns 0 if a==b,1 if a &gt b,and returns -1 if a &lt b.<BR>
+</BLOCKQUOTE>
+</UL>
+
+Following methods need no explanation.<BR>
+<UL>
+<LI>==</LI>
+<LI>===</LI>
+same as ==,used in case statement.
+<LI>!=</LI>
+<LI>&lt;</LI>
+<LI>&lt;=</LI>
+<LI>&gt;</LI>
+<LI>&gt;=</LI>
+</UL>
+
+<HR>
+<H3>About 'coerce'</H3>
+<B>For the binary operation like A op B:</B>
+<DL>
+<DT> 1.Both A and B are BigDecimal objects</DT>
+<DD> A op B is normally performed.</DD>
+<DT> 2.A is the BigDecimal object but B is other than BigDecimal object</DT>
+<DD> Operation is performed,after B is translated to correcponding BigDecimal object(because BigDecimal supports coerce method).</DD>
+<DT> 3.A is not the BigDecimal object but B is BigDecimal object</DT>
+<DD>If A has coerce mthod,then B will translate A to corresponding 
+BigDecimal object and the operation is performed,otherwise an error occures.</DD>
+</DL>
+
+String is not translated to BigDecimal in default.
+Uncomment /* #define ENABLE_NUMERIC_STRING */ in bigdecimal.c, compile and install 
+again if you want to enable string to BigDecimal conversion.
+Translation stops without error at the character representing non digit.
+For instance,"10XX" is translated to 10,"XXXX" is translated to 0.<BR>
+String representing zero or infinity such as "Infinity","+Infinity","-Infinity",and "NaN" can also be translated to BigDecimal unless false is specified by mode method.<BR>
+
+BigDecimal class supports coerce method(for the details about coerce method,see Ruby documentations). This means the most binary operation can be performed if the BigDecimal object is at the left hand side of the operation.<BR><BR>
+
+ For example:
+<CODE><PRE>
+  a = BigDecimal.E(20)
+  c = a * "0.123456789123456789123456789" # A String is changed to BigDecimal object.
+</PRE></CODE>
+is performed normally.<BR>
+ But,because String does not have coerce method,the following example can not be performed.<BR>
+
+<CODE><PRE>
+  a = BigDecimal.E(20)
+  c = "0.123456789123456789123456789" * a # ERROR
+</PRE></CODE>
+
+If you actually have any inconvenience about the error above.
+You can define a new class derived from String class,
+and define coerce method within the new class.<BR>
+
+<hr>
+<A NAME="#UNDEF">
+<H2>Infinity,Not a Number(NaN),Zero</H2>
+Infinite numbers and NaN can be represented by string writing "+Infinity"(or "Infinity"),"-Infinity",and "NaN" respectively in your program.
+Infinite numbers can be obtained by 1.0/0.0(=Infinity) or -1.0/0.0(=-Infinity).
+<BR><BR>
+NaN(Not a number) can be obtained by undefined computation like 0.0/0.0 
+or Infinity-Infinity.
+Any computation including NaN results to NaN.
+Comparisons with NaN never become true,including comparison with NaN itself.
+<BR><BR>
+Zero has two different variations as +0.0 and -0.0.
+But,still, +0.0==-0.0 is true.
+<BR><BR>
+Computation results including Infinity,NaN,+0.0 or -0.0 become complicated.
+Run following program and comfirm the results.
+Send me any incorrect result if you find.
+
+<CODE><PRE>
+ require "bigdecimal"
+ aa  = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
+ ba  = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
+ opa = %w(+ - * / <=> > >=  < == != <=)
+ for a in aa
+  for b in ba
+    for op in opa
+      x = BigDecimal::new(a)
+      y = BigDecimal::new(b)
+      eval("ans= x #{op} y;print a,' ',op,' ',b,' ==> ',ans.to_s,\"\n\"")
+    end
+  end
+ end
+</PRE></CODE>
+<hr>
+
+<A NAME="#STRUCT">
+<H2>Internal structure</H2>
+BigDecimal number is defined by the structure Real in BigDecimal.h.
+Digits representing a float number are kept in the array frac[] defined in the structure.
+In the program,any floating number(BigDecimal number) is represented as:<BR>
+ <BigDecimal number> = 0.xxxxxxxxx*BASE**n<BR><BR>
+where 'x' is any digit representing mantissa(kept in the array frac[]),
+BASE is base value(=10000 in 32 bit integer system),
+and n is the exponent value.<BR>
+Larger BASE value enables smaller size of the array frac[],and increases computation speed.
+The value of BASE is defined ind VpInit(). In 32 bit integer system,this value is 
+10000. In 64 bit integer system,the value becomes larger.
+BigDecimal has not yet been compiled and tested on 64 bit integer system.
+It will be very nice if anyone try to run BigDecimal on 64 bit system and
+ inform me the results.
+When BASE is 10000,an element of the array frac[] can have vale of from 0 to 9999.
+(up to 4 digits).<BR>
+The structure Real is defined in bigdecimal.h as:<BR>
+<CODE><PRE>
+  typedef struct {
+     VALUE  obj;     /* Back pointer(VALUE) for Ruby object.         */
+     unsigned long MaxPrec; /* The size of the array frac[]          */
+     unsigned long Prec;    /* Current size of frac[] actually used. */
+     short    sign;         /* Attribute of the value.  */
+                            /*  ==0 : NaN               */
+                            /*    1 : +0                */
+                            /*   -1 : -0                */
+                            /*    2 : Positive number   */
+                            /*   -2 : Negative number   */
+                            /*    3 : +Infinity         */
+                            /*   -3 : -Infinity         */
+     unsigned short flag;   /* Control flag             */
+     int      exponent;     /* Exponent value(0.xxxx*BASE**exponent) */
+     unsigned long frac[1]; /* An araay holding mantissa(Variable)   */
+  } Real;
+</CODE></PRE>
+The decimal value 1234.56784321 is represented as(BASE=10000):<BR>
+<PRE>
+    0.1234 5678 4321*(10000)**1
+</PRE>
+where frac[0]=1234,frac[1]=5678,frac[2]=4321,
+Prec=3,sign=2,exponent=1. MaxPrec can be any value greater than or equal to 
+Prec.
+<hr>
+
+<A NAME="#BASE">
+<H2>Binary or decimal number representation</H2>
+I adopted decimal number representation for BigDecimal implementation.
+Of cource,binary number representation is common on the most computers.
+
+<H3>Advantages using decimal representation</H3>
+The reason why I adopted decimal number representation for BigDecimal is:<BR>
+<DL>
+<DT>Easy for debugging
+<DD>The floating number 1234.56784321 can be easily represented as:<BR>
+  frac[0]=1234,frac[1]=5678,frac[2]=4321,exponent=1,and sign=2.
+<DT>Exact representation
+<DD>Following program can add all numbers(in decimal) in a file
+ without any error(no round operation).<BR>
+
+<CODE><PRE>
+   file = File::open(....,"r")
+   s = BigDecimal::new("0")
+   while line = file.gets
+      s = s + line
+   end
+</PRE></CODE>
+
+If the internal representation is binary,translation from decimal to 
+binary is required and the translation error is inevitable.
+For example, 0.1 can not exactly be represented in binary.<BR>
+0.1 => b1*2**(-1)+b1*2**(-2)+b3*2**(-3)+b4*2**(-4)....<BR>
+where b1=0,b2=0,b3=0,b4=1...<BR>
+bn(n=1,2,3,...) is infinite series of digit with value of 0 or 1,
+and rounding operation is necessary but where we should round the series ?
+Of cource,exact "0.1" is printed if the rouding operation is properly done,
+<DT>Significant digit we can have is automatically determined
+<DD>In binary representation,0.1 can not be represented in finite series of digit.
+
+But we only need one element(frac[0]=1) in decimal representation.
+This means that we can always determine the size of the array frac[] in Real 
+structure.
+</DL>
+
+<H3>Disadvantage of decimal representation</H3>
+Because most computers have no internal decimal representaion.
+Once you use BigDecimal,you need to keep using it without
+considering computation cost if exact computation is required.
+
+<H4>Which is the first input?</H4>
+Because most people uses decimal notatin for numeric data representation,
+BigDecimal can handle numeric data without loss of translation error.
+<hr>
+
+<A NAME="#PREC">
+<H2>Resulting number of significant digits</H2>
+For the fundamental arithmetics such as addition,subtraction,
+multiplication,and division,I prepared 2 group of methods<BR>
+
+<H3>1. +,-,*,/</H3>
+For the operation + - * /,you can not specify the resulting 
+number of significant digits.<BR>
+Resulting number of significant digits are defined as:<BR>
+1.1 For *,resulting number of significant digits is the sum of the 
+significant digits of both side of the operator. For / ,resulting number of significant digits is the sum of the 
+maximum significant digits of both side of the operator.<BR>
+1.2 For + and -,resulting number of significant digits is determined so that
+ no round operation is needed. <br>
+For example, c has more than 100 siginificant digits if c is computed as:<BR>
+c = 0.1+0.1*10**(-100)<br>
+<BR>
+As +,-,and * are always exact(no round operation is performed unless BigDecimal.limit is specified),
+which means more momories are required to keep computation results.
+But,the division such as c=1.0/3.0 will always be rounded.<BR>
+
+<H3>2. add,sub,mult,div</H3>
+The length of the significant digits obtained from +,-,*,/ 
+is always defined by that of right and left side of the operator.
+To specify the length of the significant digits by your self,
+use methos add,sub,mult,div.
+<CODE><PRE>
+ BigDecimal("2").div(3,12) # 2.0/3.0 => 0.6666666666 67E0
+</PRE></CODE>
+</BLOCKQUOTE>
+
+<H3>3. truncate,round,ceil,floor</H3>
+Using these methods,you can specify rounding location relatively from
+decimal point.
+<CODE><PRE>
+ BigDecimal("6.66666666666666").round(12) # => 0.6666666666 667E1
+</PRE></CODE>
+</BLOCKQUOTE>
+
+
+<H3>4. Example</H3>
+Following example compute the ratio of the circumference of a circle to 
+its dirmeter(pi=3.14159265358979....) using J.Machin's formula.
+<BR><BR>
+<CODE><PRE>
+#!/usr/local/bin/ruby
+
+require "bigdecimal"
+#
+# Calculates 3.1415.... (the number of times that a circle's diameter
+# will fit around the circle) using J. Machin's formula.
+#
+def big_pi(sig) # sig: Number of significant figures
+  exp    = -sig
+  pi     = BigDecimal::new("0")
+  two    = BigDecimal::new("2")
+  m25    = BigDecimal::new("-0.04")
+  m57121 = BigDecimal::new("-57121")
+
+  u = BigDecimal::new("1")
+  k = BigDecimal::new("1")
+  w = BigDecimal::new("1")
+  t = BigDecimal::new("-80")
+  while (u.nonzero? && u.exponent >= exp) 
+    t   = t*m25
+    u   = t.div(k,sig)
+    pi  = pi + u
+    k   = k+two
+  end
+
+  u = BigDecimal::new("1")
+  k = BigDecimal::new("1")
+  w = BigDecimal::new("1")
+  t = BigDecimal::new("956")
+  while (u.nonzero? && u.exponent >= exp )
+    t   = t.div(m57121,sig)
+    u   = t.div(k,sig)
+    pi  = pi + u
+    k   = k+two
+  end
+  pi
+end
+
+if $0 == __FILE__
+  if ARGV.size == 1
+    print "PI("+ARGV[0]+"):\n"
+    p big_pi(ARGV[0].to_i)
+  else
+    print "TRY: ruby pi.rb 1000 \n"
+  end
+end
+
+</PRE></CODE>
+<HR>
+<FONT size=2>
+<I>
+<A HREF="http://www.tinyforest.gr.jp">
+Shigeo Kobayashi
+</A>
+(E-Mail:<A HREF="mailto:shigeo@tinyforest.gr.jp">&lt;shigeo@tinyforest.gr.jp&gt;</U></A>)
+</I>
+</FONT>
+</TD>
+</TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/ruby_1_8_6/ext/bigdecimal/bigdecimal_ja.html b/ruby_1_8_6/ext/bigdecimal/bigdecimal_ja.html
new file mode 100644
index 0000000000..37bbcbbb09
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/bigdecimal_ja.html
@@ -0,0 +1,799 @@
+<!-- saved from url=(0022)http://internet.e-mail -->
+<HTML>
+<HEAD>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=Shift_JIS">
+<style type="text/css"><!--
+body { color: #3f0f0f;  background: #fefeff; margin-left: 2em; margin-right: 2em;}
+h1 { color: #ffffff;  background-color: #3939AD;  border-color: #FF00FF;  width: 100%;
+  border-style: solid;  border-top-width: 0.1em;  border-bottom-width: 0.1em;  border-right: none;
+  border-left: none;  padding: 0.1em;  font-weight: bold;  font-size: 160%;  text-align: center;
+}
+h2 {  color: #00007f;  background-color: #e7e7ff;  border-color: #000094;  width: 100%;
+  border-style: solid; border-left: none;  border-right: none;  border-top-width: 0.1em;  border-bottom-width: 0.1em;
+  padding: 0.1em;
+  font-weight: bold;  font-size: 110%;
+}
+h3 {  color: #00007f;  padding: 0.2em;  font-size: 110%;}
+h4, h5 {  color: #000000;  padding: 0.2em;  font-size: 100%;}
+table {  margin-top: 0.2em; margin-bottom: 0.2em;  margin-left: 2em; margin-right: 2em;}
+caption {  color: #7f0000;  font-weight: bold;}
+th {  background: #e7e7ff;  padding-left: 0.2em; padding-right: 0.2em;}
+td {  background: #f3f7ff;  padding-left: 0.2em; padding-right: 0.2em;}
+code {  color: #0000df;}
+dt {  margin-top: 0.2em;}
+li {  margin-top: 0.2em;}
+pre
+{    BACKGROUND-COLOR: #d0d0d0;    BORDER-BOTTOM: medium none;    BORDER-LEFT: medium none;
+    BORDER-RIGHT: medium none;    BORDER-TOP: medium none;    LINE-HEIGHT: 100%;    MARGIN: 12px 12px 12px 12px;
+    PADDING-BOTTOM: 12px;    PADDING-LEFT: 12px;    PADDING-RIGHT: 12px;    PADDING-TOP: 12px;
+    WHITE-SPACE: pre;    WIDTH: 100%
+}
+--></style>
+
+<TITLE>BigDecimal:An extension library for Ruby</TITLE>
+</HEAD>
+<BODY BGCOLOR=#FFFFE0>
+<H1>BigDecimal(���������������_���Z�p�g�����C�u����)</H1>
+<DIV align="right"><A HREF="./bigdecimal_en.html">English</A></DIV><BR>
+BigDecimal ���I�u�W�F�N�g�w�����������X�N���v�g���������� Ruby �����������������_
+�v�Z�@�\�����������������g�����C�u���������B
+Ruby �������������������e��������URL���Q���������������B
+<UL>
+<LI><A HREF="http://www.ruby-lang.org/ja/">http://www.ruby-lang.org/ja/</A>�FRuby��ｮ�y�[�W</LI>
+<LI><A HREF="http://kahori.com/ruby/ring/">http://kahori.com/ruby/ring/</A>�FRuby���������y�[�W���H������</LI>
+</UL> 
+<hr>
+<H2>����</H2>
+<UL>
+<LI><A HREF="#INTRO">��������</LI>
+<LI><A HREF="#SPEC">�g�p���@�����\�b�h������</A></LI>
+<LI><A HREF="#UNDEF">�����A�����A�[��������</A></LI>
+<LI><A HREF="#STRUCT">�����\��</A></LI>
+<LI><A HREF="#BASE">2�i��10�i</A></LI>
+<LI><A HREF="#PREC">�v�Z���x��������</A></LI>
+</UL>
+
+<HR>
+<A NAME="#INTRO">
+<H2>��������</H2>
+Ruby ���� Bignum �������N���X�������A���S�������������v�Z�������������������B
+�����A�C���������������_���Z�p�N���X���������������B�������A
+�C���������������_���Z�p�g�����C�u���� BigDecimal ���������������B
+�s�����������E�����������������������A
+<A HREF="mailto:shigeo@tinyforest.gr.jp">shigeo@tinyforest.gr.jp</A>
+�������m�������������B�s�����������C�����������������B�����A�������������W������
+�������������B�����A�������������������������������������������B
+�\���A���������������B
+<BR><BR>
+�����v���O�������Aｩ�R���z�z�E���������\���������B�������A�������������������������B
+�z�z�E�������������� Ruby �����������������B�������� README �����������������B
+
+<hr>
+<H2>�C���X�g�[����������</H2>
+BigDecimal ������ Ruby �����V����<A HREF="http://www.ruby-lang.org/ja/">Ruby��ｮ�y�[�W</A>�����_�E�����[�h���������B
+�_�E�����[�h�������V���������������A�������C���X�g�[��������ﾀ�s�����������B
+Ruby ���������C���X�g�[�����������A������ BigDecimal �����p�������������������������B
+�\�[�X�t�@�C���� 
+bigdecimal.c,bigdecimal.h 
+���Q�����������B<BR>
+
+<hr>
+<A NAME="#SPEC">
+<H2>�g�p���@�����\�b�h������</H2>
+�uRuby�������������v�������O�����A
+<CODE><PRE>
+require 'bigdecimal'
+a=BigDecimal::new("0.123456789123456789")
+b=BigDecimal("123456.78912345678",40)
+c=a+b
+</PRE></CODE>
+<br>
+�������������������g�p�������B
+
+<H3>���\�b�h����</H3>
+���������\�b�h�����p���\�����B
+�u�L�������v���� BigDecimal �����x�������������������B
+�����������������������A�������]�T���������v�Z���������B
+�����A�������R�Q�r�b�g���V�X�e�������P�O�i���S�������v�Z�������B�]�����A���������A
+�������u�L�������v���S���{�����������������B
+<P>
+���������\�b�h���O�����A(C ��������) Ruby �\�[�X���`��
+�����������������������������B�������A
+<CODE><PRE>
+require "bigdecimal/math.rb"
+</PRE></CODE>
+�������������Asin �� cos ���������������g�p���������������������B
+�g�p���@�����A������ math.rb �����e���Q�������������B
+
+�������AFloat ���������������������\�b�h�� util.rb ���T�|�[�g�������������B
+���p��������
+<CODE><PRE>
+require "bigdecimal/util.rb"
+</PRE></CODE>
+���������������B������ util.rb �����e���Q�������������B
+
+<H4><U>�N���X���\�b�h</U></H4>
+<UL>
+<LI><B>new</B></LI><BLOCKQUOTE>
+�V���� BigDecimal �I�u�W�F�N�g�������������B<BR>
+a=BigDecimal::new(s[,n]) ������<BR>
+a=BigDecimal(s[,n])<BR>
+s ���������\�����������l�����������w���������B
+�X�y�[�X���������������B�����A���f���������������o���������_��
+���������I�������������������������B
+n ���K�v���L�������ia �������L�������j���������w���������B
+n �� 0 �����������������������An ���l�� s ���L���������������������B
+s ���L���������� n �������������� n=0 �����������������B
+a �������L�������� n �������������l�����p���������B
+�����L�������������������������Z��ﾀ�s���������������������������B
+<CODE><PRE>
+BigDecimal("1")    / BigDecimal("3")    # => 0.3333333333 33E0
+BigDecimal("1",10) / BigDecimal("3",10) # => 0.3333333333 3333333333 33333333E0
+</PRE></CODE>
+�������A���X�����Z�������������L������ n �������������������o�[�W������
+�������X���������\�������������B
+</BLOCKQUOTE>
+
+<LI><B>mode</B></LI><BLOCKQUOTE>
+f = BigDecimal.mode(s[,v])<BR>
+BigDecimal��ﾀ�s�����������������B���Q�����������A������ nil ���w��������
+�����������l�����������B<BR>
+�������g�p���@�����`�������������B
+<P>
+<B>[���O����]</B><P>
+�v�Z����������(NaN)���[�����������Z�����������������������`�������������������B
+<BLOCKQUOTE>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_NaN,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_INFINITY,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_UNDERFLOW,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_OVERFLOW,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_ZERODIVIDE,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_ALL,flag)<BR>
+</BLOCKQUOTE>
+
+EXCEPTION_NaN �������� NaN ���������������w�������B<BR>
+EXCEPTION_INFINITY ��������������(�}Infinity)���������������w�������B<BR>
+EXCEPTION_UNDERFLOW ���w�������A���_�[�t���[�����������w�������B<BR>
+EXCEPTION_OVERFLOW ���w�������I�[�o�[�t���[�����������w�������B<BR>
+EXCEPTION_ZERODIVIDE ���[�������������Z��ﾀ�s�����������w�������B<BR>
+EXCEPTION_ALL ���A���\���S���������������������������������g�p�������B<BR><BR>
+
+flag �� true ���������A�w���������������������������O�����s�������������������B<BR>
+flag �� false�i�f�t�H���g�j�����A���O�����s�����������B�v�Z���������������������������B<BR>
+<BLOCKQUOTE>
+EXCEPTION_NaN �������A����(NaN)<BR>
+EXCEPTION_INFINITY �������A����(+ or -Infinity)<BR>
+EXCEPTION_UNDERFLOW �������A�[��<BR>
+EXCEPTION_OVERFLOW �������A+Infinity �� -Infinity<BR>
+EXCEPTION_ZERODIVIDE �������A+Infinity �� -Infinity<BR>
+</BLOCKQUOTE>
+EXCEPTION_INFINITY�AEXCEPTION_OVERFLOW�AEXCEPTION_ZERODIVIDE
+���������������������B<BR>
+�����l���A���������l�����B�u�l�v���������A������
+BigDecimal::EXCEPTION_NaN���u�l�v�� & �� �[�����O������
+EXCEPTION_NaN�������������������������������B
+
+<P>
+<B>[���������w��]</B><P>
+�v�Z�r���������������w�������������B
+<BLOCKQUOTE>
+f = BigDecimal::mode(BigDecimal::ROUND_MODE,flag)
+</BLOCKQUOTE>
+���`ｮ���w���������B<BR>
+�������Aflag ������(�����������������C���X�^���X���\�b�h)���������w���������B
+<TABLE>
+<TR><TD>ROUND_UP</TD><TD>�S���������������B</TD></TR>
+<TR><TD>ROUND_DOWN</TD><TD>�S������ﾌ������(truncate)�B</TD></TR>
+<TR><TD>ROUND_HALF_UP</TD><TD>�lﾌ����������(�f�t�H���g)�B</TD></TR>
+<TR><TD>ROUND_HALF_DOWN</TD><TD>��ﾌ�Z���������B</TD></TR>
+<TR><TD>ROUND_HALF_EVEN</TD><TD>�lﾌ�Z���������B�T�����������P�����������������J����������(Banker's rounding)�B</TD></TR>
+<TR><TD>ROUND_CEILING</TD><TD>���l�������������J����������(ceil)�B</TD></TR>
+<TR><TD>ROUND_FLOOR</TD><TD>���l�������������J����������(floor)�B</TD></TR>
+
+</TABLE>
+�����l���w������ flag ���l�����B
+���Q������ nil ���w���������A�����������l�����������B
+mode ���\�b�h�����������������u�����[�U���w�����������������������B
+�������������u��ｩ�������������������� BigDecimal::limit �� truncate/round/ceil/floor�A
+add/sub/mult/div ���������C���X�^���X���\�b�h���g�p�����������B
+</BLOCKQUOTE>
+<LI><B>limit([n])</B></LI><BLOCKQUOTE>
+����������BigDecimal�I�u�W�F�N�g������������n���������������B
+�����l�����������O���l�����B�����l���f�t�H���g�l���O���A�������������������������B
+n ���w���������A������ n �� nil ���������A�������������������������B<BR>
+�v�Z�����s���������A������������������������������������������
+ limit ���\���������������������B�������� BigDecimal.mode ���w��������
+����������ﾀ�s���������B
+�������A�C���X�^���X���\�b�h (truncate/round/ceil/floor/add/sub/mult/div) ��
+���������� limit �����D�����������B<BR>
+mf = BigDecimal::limit(n)<BR>
+</BLOCKQUOTE>
+
+<LI><B>double_fig</B></LI><BLOCKQUOTE>
+Ruby �� Float �N���X�������������L���������������������B
+<CODE><PRE>
+  p BigDecimal::double_fig  # ==> 20 (depends on the CPU etc.)
+</PRE></CODE>
+double_fig�������� C �v���O���������������������B
+<CODE><PRE>
+ double v          = 1.0;
+ int    double_fig = 0;
+ while(v + 1.0 > 1.0) {
+    ++double_fig;
+    v /= 10;
+ }
+</PRE></CODE>
+</BLOCKQUOTE>
+
+<LI><B>BASE</B></LI><BLOCKQUOTE>
+�������g�p�������������l�����B������ 32 �r�b�g�������n����10000�����B<BR>
+b = BigDecimal::BASE<BR>
+</BLOCKQUOTE>
+</UL>
+
+<H4><U>�C���X�^���X���\�b�h</U></H4>
+<UL>
+<LI><B>+</B></LI><BLOCKQUOTE>
+���Z�ic = a + b�j<BR>
+c �����x�����������u<A HREF="#PREC">�v�Z���x��������</A>�v���Q���������������B
+</BLOCKQUOTE>
+
+<LI><B>-</B></LI><BLOCKQUOTE>
+���Z�ic = a - b�j�A�������������]�ic = -a�j<BR>
+c �����x�����������u<A HREF="#PREC">�v�Z���x��������</A>�v���Q���������������B
+
+</BLOCKQUOTE>
+<LI><B>*</B></LI><BLOCKQUOTE>
+���Z(c = a * b)<BR>
+c�����x��(a�����x)+(b�����x)���x�����B<br>
+���������u<A HREF="#PREC">�v�Z���x��������</A>�v���Q���������������B
+
+</BLOCKQUOTE>
+<LI><B>/</B></LI><BLOCKQUOTE>
+���Z(c = a / b)<BR>
+c �����x�����������u<A HREF="#PREC">�v�Z���x��������</A>�v���Q���������������B
+
+</BLOCKQUOTE>
+
+<LI><B>add(b,n)</B></LI><BLOCKQUOTE>
+�������������g�p�������B<BR>
+c = a.add(b,n)<BR>
+c = a + b �������� n �������v�Z�������B<BR>
+a + b �����x�� n ���������������� BigDecimal.mode ���w�����������@���������������B<BR>
+n ���[������ + �����������B
+</BLOCKQUOTE>
+<LI><B>sub(b,n)</B></LI><BLOCKQUOTE>
+�������������g�p�������B<BR>
+c = a.sub(b,n)<BR>
+c = a - b �������� n �������v�Z�������B<BR>
+a - b �����x�� n ���������������� BigDecimal.mode ���w�����������@���������������B<BR>
+n ���[������ - �����������B
+
+</BLOCKQUOTE>
+<LI><B>mult(b,n)</B></LI><BLOCKQUOTE>
+�������������g�p�������B<BR>
+c = a.mult(b,n)<BR>
+c = a * b �������� n �������v�Z�������B<BR>
+a * b �����x�� n ���������������� BigDecimal.mode ���w�����������@���������������B<BR>
+n ���[������ * �����������B
+
+</BLOCKQUOTE>
+<LI><B>div(b[,n])</B></LI><BLOCKQUOTE>
+�������������g�p�������B<BR>
+c = a.div(b,n)<BR>
+c = a / b �������� n �������v�Z�������B
+a / b �����x�� n ���������������� BigDecimal.mode ���w�����������@���������������B<BR>
+n ���[������ / �����������B<BR>
+n ������������������ Float#div �����l������������(BigDecimal)�����������B
+</BLOCKQUOTE>
+
+<LI><B>fix</B></LI><BLOCKQUOTE>
+a �������_����������ﾌ���B<BR>
+c = a.fix
+</BLOCKQUOTE>
+<LI><B>frac</B></LI><BLOCKQUOTE>
+a ����������������ﾌ���B<BR>
+c = a.frac
+</BLOCKQUOTE>
+
+<LI><B>floor[(n)]</B></LI><BLOCKQUOTE>
+c = a.floor<BR>
+a ���������������iBigDecimal �l�j�����������B
+<CODE><PRE>
+c = BigDecimal("1.23456").floor  #  ==> 1
+c = BigDecimal("-1.23456").floor #  ==> -2
+</PRE></CODE>
+���������������� n ���^�������������������B<BR>
+n>=0 �����A�����_���� n+1 ��������������������(�����_�������A���� n ����������)�B<BR>
+n �����������������_���� n ����������������(�����_���u������������������ n ���� 0 ����������)�B<BR>
+<CODE><PRE>
+ c = BigDecimal("1.23456").floor(4)   #  ==> 1.2345
+ c = BigDecimal("15.23456").floor(-1) #  ==> 10.0
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>ceil[(n)]</B></LI><BLOCKQUOTE>
+c = a.ceil<BR>
+a �����������������A�����������������v�Z���A�����l�iBigDecimal �l�j�����������B
+<CODE><PRE>
+c = BigDecimal("1.23456").ceil  #  ==> 2
+c = BigDecimal("-1.23456").ceil #  ==> -1
+</PRE></CODE>
+
+�������������������^�����A�����_���� n+1 ���������������������������������B<BR>
+n>=0 �����A�����_���� n+1 ��������������������(�����_�������A���� n ����������)�B<BR>
+ n �����������������_���� n ������������������(�����_���u������������������ n ���� 0 ����������)�B<BR>
+<CODE><PRE>
+ c = BigDecimal("1.23456").ceil(4)   # ==> 1.2346
+ c = BigDecimal("15.23456").ceil(-1) # ==> 20.0
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>round[(n[,b])]</B></LI><BLOCKQUOTE>
+c = a.round<BR>
+
+�N���X���\�b�h BigDecimal::mode(BigDecimal::ROUND_MODE,flag) ���w������ 
+ROUND_MODE ���]��������������ﾀ�s�������B
+BigDecimal::mode(BigDecimal::ROUND_MODE,flag) �������w�������A�����A����
+���w���������������u�����_�����������������lﾌ�������������iBigDecimal �l�j�v���������B<BR>
+<CODE><PRE>
+ c = BigDecimal("1.23456").round  #  ==> 1
+ c = BigDecimal("-1.23456").round #  ==> -1
+</PRE></CODE>
+
+�������������������^�����A�����_���� n+1 ���������������������������������B<BR>
+n �����������A�����_���� n+1 ������������������(�����_�������A���� n ����������)�B<BR>
+n �����������������_���� n ��������������(�����_���u������������������ n ���� 0 ����������)�B
+<CODE><PRE>
+c = BigDecimal("1.23456").round(4)   #  ==> 1.2346
+c = BigDecimal("15.23456").round(-1) #  ==> 20.0
+</PRE></CODE>
+�Q�������������w���������ABigDecimal#mode ���w�������������A�w�����������@��
+����������ﾀ�s�������B
+<CODE><PRE>
+c = BigDecimal("1.23456").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.234
+c = BigDecimal("1.23356").round(3,BigDecimal::ROUND_HALF_EVEN)   #  ==> 1.234
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>truncate</B></LI><BLOCKQUOTE>
+c = a.truncate<BR>
+�����_��������������ﾌ���������iBigDecimal �l�j���������B<BR>
+�������������������^�����A�����_���� n+1 ���������������������������������B<BR>
+n �����������A�����_���� n+1 ��������������ﾌ������(�����_�������A���� n ����������)�B
+n �����������������_���� n ������������������(�����_���u������������������ n ���� 0 ����������)�B<BR>
+<CODE><PRE>
+c = BigDecimal("1.23456").truncate(4)   #  ==> 1.2345
+c = BigDecimal("15.23456").truncate(-1) #  ==> 10.0
+</PRE></CODE>
+</BLOCKQUOTE>
+
+</BLOCKQUOTE>
+<LI><B>abs</B></LI><BLOCKQUOTE>
+���������l<BR>
+c = a.abs<BR>
+
+</BLOCKQUOTE>
+<LI><B>to_i</B></LI><BLOCKQUOTE>
+�����_����������ﾌ���������������������B<BR>
+i = a.to_i<BR>
+i ���l�������� Fixnum �� Bignum �����������B
+a �� Infinity �� NaN �������Ai �� nil �����������B
+</BLOCKQUOTE>
+<LI><B>to_f</B></LI><BLOCKQUOTE>
+Float �I�u�W�F�N�g�������������B
+���������������l���K�v������ split ���\�b�h�����p����
+���������B
+</BLOCKQUOTE>
+<LI><B>to_s[(n)]</B></LI><BLOCKQUOTE>
+������������������(�f�t�H���g�� "0.xxxxxEn" ���`�����������j�B
+<CODE><PRE>
+BigDecimal("1.23456").to_s  #  ==> "0.123456E1"
+</PRE></CODE>
+���� n �������������w���������������A�����_���������������E�������A�������� n ����
+�������������������B
+<CODE><PRE>
+BigDecimal("0.1234567890123456789").to_s(10)   #  ==> "0.1234567890 123456789E0"
+</PRE></CODE>
+���� n �������������\�����������w���������������������B
+<CODE><PRE>
+BigDecimal("0.1234567890123456789").to_s("10") #  ==> "0.1234567890 123456789E0"
+</PRE></CODE>
+�������������� '+'�i������ ' '�j���t�������A�l�����������A������ '+'�i������ ' '�j���t������
+�i�����������A���� '-' ���t�������B�j�B
+<CODE><PRE>
+BigDecimal("0.1234567890123456789").to_s(" 10") #  ==> " 0.1234567890 123456789E0"
+BigDecimal("0.1234567890123456789").to_s("+10") #  ==> "+0.1234567890 123456789E0"
+BigDecimal("-0.1234567890123456789").to_s("10") #  ==> "-0.1234567890 123456789E0"
+</PRE></CODE>
+
+�������������������� E(������ e) �� F(������ f) ���w�������������A������������
+�\ｦ�`ｮ�����X�������������������B
+<CODE><PRE>
+BigDecimal("1234567890.123456789").to_s("E")  #  ==> "0.1234567890123456789E10"
+BigDecimal("1234567890.123456789").to_s("F")  #  ==> "1234567890.123456789"
+BigDecimal("1234567890.123456789").to_s("5E") #  ==> "0.12345 67890 12345 6789E10"
+BigDecimal("1234567890.123456789").to_s("5F") #  ==> "12345 67890.12345 6789"
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>exponent</B></LI><BLOCKQUOTE>
+�w�����������l�����������B
+n = a.exponent <BR>
+�� a ���l�� 0.xxxxxxx*10**n �������������B
+</BLOCKQUOTE>
+
+<LI><B>precs</B></LI><BLOCKQUOTE>
+n,m  = a.precs<BR>
+a ���L������ (n) �������L������ (m) ���z�������������B
+
+</BLOCKQUOTE>
+
+<LI><B>sign</B></LI><BLOCKQUOTE>
+�l����(sign &gt; 0)�A��(sign &lt; 0)�A������(sigh==0)�������������������������B
+n = a.sign <BR>
+���������� n ���l�� a �������������������������B<BR>
+() �������������Aﾀ�����l����(<A HREF="#STRUCT">�u�����\���v</A>���Q��)�B<BR>
+n = BigDecimal::SIGN_NaN(0) : a �� NaN<BR>
+n = BigDecimal::SIGN_POSITIVE_ZERO(1) : a �� +0<BR>
+n = BigDecimal::SIGN_NEGATIVE_ZERO(-1) : a �� -0<BR>
+n = BigDecimal::SIGN_POSITIVE_FINITE(2) : a �������l<BR>
+n = BigDecimal::SIGN_NEGATIVE_FINITE(-2) : a �������l<BR>
+n = BigDecimal::SIGN_POSITIVE_INFINITE(3) : a ��+Infinity<BR>
+n = BigDecimal::SIGN_NEGATIVE_INFINITE(-3) : a ��-Infinity<BR>
+
+</BLOCKQUOTE>
+<LI><B>nan?</B></LI><BLOCKQUOTE>
+a.nan? �� a ��NaN�������^�����������B
+</BLOCKQUOTE>
+<LI><B>infinite?</B></LI><BLOCKQUOTE>
+a.infinite? �� a ��+�������� 1 �A-���������� -1�A�������O�������� nil �����������B
+</BLOCKQUOTE>
+<LI><B>finite?</B></LI><BLOCKQUOTE>
+a.finite? �� a ���������� NaN �����������^�����������B
+</BLOCKQUOTE>
+
+<LI><B>zero?</B></LI><BLOCKQUOTE>
+a �� 0 ���� true �����������B<BR>
+c = a.zero?
+</BLOCKQUOTE>
+<LI><B>nonzero?</B></LI><BLOCKQUOTE>
+a �� 0 ���� nil�A0 ���O���� a �������������������B<BR>
+c = a.nonzero?
+
+</BLOCKQUOTE>
+<LI><B>split</B></LI><BLOCKQUOTE>
+BigDecimal �l�� 0.xxxxxxx*10**n ���\�������������A�����iNaN��������
+0�A�������O��+1��-1�����������j�A
+�����������������i"xxxxxxx"�j���A�����i10�j�A�X���w�� n ���z����
+���������B<BR>
+a=BigDecimal::new("3.14159265")<BR>
+f,x,y,z = a.split<BR>
+���������Af=+1�Ax="314159265"�Ay=10�Az=1�����������B<BR>
+�]�����A<BR>
+s = "0."+x<BR>
+b = f*(s.to_f)*(y**z)<BR>
+�� Float �������������������������B
+</BLOCKQUOTE>
+<LI><B>inspect</B></LI><BLOCKQUOTE>
+�f�o�b�O�o�����g�p���������B<BR>
+p a=BigDecimal::new("3.14",10)<BR>
+���������A[0x112344:'0.314E1',4(12)]���������o�����������B
+������16�i�����I�u�W�F�N�g���A�h���X�A���� '0.314E1' ���l�A
+����4���������L������(�\ｦ����������������������������)�A
+�������I�u�W�F�N�g�����������������������������B
+</BLOCKQUOTE>
+<LI><B>**</B></LI><BLOCKQUOTE>
+a �� n �����v�Z�������B���������B<BR>
+c = a ** n<BR>
+���������� c ���L������ a �� n �{�������������������B
+</BLOCKQUOTE>
+<LI><B>power</B></LI><BLOCKQUOTE>
+** ���������Aa �� n �����v�Z�������B���������B<BR>
+c = a.power(n)<BR>
+���������� c ���L������ a �� n �{�������������������B
+</BLOCKQUOTE>
+<LI><B>sqrt</B></LI><BLOCKQUOTE>
+a���L���� n �����������in �����������������������j��
+�j���[�g���@���v�Z�������B<BR>
+c = a.sqrt(n)<BR>
+</BLOCKQUOTE>
+
+<LI><B>divmod,quo,modulo,%,remainder</B></LI><BLOCKQUOTE>
+�������������� Float ���e���\�b�h���Q�������������B
+</BLOCKQUOTE>
+
+<LI><B>&lt=&gt</B></LI><BLOCKQUOTE>
+a==b ���� 0�Aa &gt b ���� 1�Aa &lt b ���� -1 �����������B<BR>
+c = a &lt=&gt b 
+</BLOCKQUOTE>
+</UL>
+�����A�����������@�������B<BR>
+<UL>
+<LI><B>==</B></LI>
+<LI><B>===</B></LI>
+�u==�v������������ case �����g�p���������B
+<LI><B>!=</B></LI>
+<LI><B>&lt</B></LI>
+<LI><B>&lt=</B></LI>
+<LI><B>&gt</B></LI>
+<LI><B>&gt=</B></LI>
+</UL>
+
+<H3>coerce��������</H3>
+BigDecimal �I�u�W�F�N�g���Z�p���Z�q�����������������ABigDecimal �I�u�W�F�N�g��
+�E�������I�u�W�F�N�g��(�K�v����) BigDecimal ���������������v�Z�������B
+�]�����ABigDecimal �I�u�W�F�N�g���O�������l�������������������E���u����
+���Z�����\�����B<BR>
+�������A���������i�����j���l��ｩ���������������������������B
+�����������l��ｩ������������������ bigfloat.c ��
+�u/* #define ENABLE_NUMERIC_STRING */�v���R�����g���O���������A
+���R���p�C���A���C���X�g�[�������K�v�����������B
+�����������l���^�����������������K�v�����B���l���������������������������A
+�P���������~�����������G���[���������������B"10XX"�����P�O�A"XXXX"���O
+�������������B<BR>
+<CODE><PRE>
+   a = BigDecimal.E(20)
+   c = a * "0.123456789123456789123456789" # ������ BigDecimal ���������������v�Z
+</PRE></CODE>
+���������������\�������������A"Infinity"�A"+Infinity"�A"-Infinity"�A"NaN"
+���g�p��������(�������E������������������)�B�������Amode ���\�b�h�� false ��
+�w���������������O�������������B
+<BR>
+�����ABigDecimal�N���X�� coerce�iRuby�{�Q���j���T�|�[�g�����������B
+�]�����ABigDecimal �I�u�W�F�N�g���E�����������������������v�����B
+�����A������ Ruby �C���^�v���^���d�l���A�������������������v�Z�����������B<BR>
+<CODE><PRE>
+  a = BigDecimal.E(20)
+  c = "0.123456789123456789123456789" * a # �G���[
+</PRE></CODE>
+�K�v�������������v�����������A�����������������l��
+ String �I�u�W�F�N�g���p�������V�����N���X���������������A
+�����N���X�� coerce ���T�|�[�g�������������B
+
+<hr>
+<A NAME="#UNDEF">
+<H2>�����A�����A�[��������</H2>
+�u�����v�����\�����������������������������B����������������
+ +Infinity�i�����������j�� -Infinity�i�����������j������
+�������\�L���������B
+������ 1.0/0.0 ���������[���������������v�Z�������������������������B
+<BR><BR>
+�u�����v�� 0.0/0.0 �� Infinity-Infinity �������������`��������
+�v�Z�������������������������B������ NaN�iNot a Number�j���\�L���������B
+NaN �������v�Z���S�� NaN �����������B���� NaN ��ｩ�����������A��������
+�������v���������B
+<BR><BR>
+�[���� +0.0 �� -0.0 �������������B�������A+0.0==-0.0 �� true �����B
+<BR><BR>
+Infinity�ANaN�A +0.0 �� -0.0 �����������v�Z�������g����������
+�������G�����B�����������l���A�������v���O������ﾀ�s����������
+�m�F�������������i�������������A�^��������������������������
+���m�������������j�B
+
+<PRE>
+<CODE>
+require "bigdecimal"
+
+aa  = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
+ba  = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
+opa = %w(+ - * / <=> > >=  < == != <=)
+
+for a in aa
+  for b in ba
+    for op in opa
+      x = BigDecimal::new(a)
+      y = BigDecimal::new(b)
+      eval("ans= x #{op} y;print a,' ',op,' ',b,' ==> ',ans.to_s,\"\n\"")
+    end
+  end
+end
+</CODE>
+</PRE>
+
+<hr>
+<A NAME="#STRUCT">
+<H2>�����\��</H2>
+BigDecimal���������������_���\����(Real)���\�����������B
+���������������� unsigned long ���z��(�������\�����v�ffrac)���������������B
+�T�O�I�����A���������������������B<BR><BR>
+ <���������_��> = 0.xxxxxxxxx*BASE**n<BR><BR>
+�������Ax�����������\�������ABASE�������i�P�O�i�����P�O�j�An���w�������\��
+�����l�����BBASE�������������A���������l���\�����������B�������A�z�����T�C�Y��
+���������������BBASE�������������s�������������������A�f�o�b�O������������������
+�l�������A10000���������������iBASE��VpInit()������ｩ���I���v�Z�������j�B
+�������A32�r�b�g���������������B64�r�b�g�������������������������l�����������B
+�c�O�������A64�r�b�g���������e�X�g���������������������i�����A������������������
+���������������������������������������j�B
+BASE��10000���������A���������������z��(frac)���e�v�f�����������S����
+�������i�[���������B<BR><BR>
+���������_�\����(Real)���������������������������B
+<BR>
+<CODE><PRE>
+  typedef struct {
+     unsigned long MaxPrec; // �������x(frac[]���z���T�C�Y)
+     unsigned long Prec;    // ���x(frac[]���g�p�T�C�Y)
+     short    sign;         // �����������������������������`�������B
+                            //  ==0 : NaN
+                            //    1 : +0
+                            //   -1 : -0
+                            //    2 : �����l
+                            //   -2 : �����l
+                            //    3 : +Infinity
+                            //   -3 : -Infinity
+     unsigned short flag;   // �e���������t���b�O
+     int      exponent;     // �w�������l(������*BASE**exponent)
+     unsigned long frac[1]; // ���������z��(����)
+  } Real;
+</CODE></PRE>
+������ 1234.56784321 ������������(BASE=10000����)<BR>
+<PRE>
+    0.1234 5678 4321*(10000)**1
+</PRE>
+�������� frac[0]=1234�Afrac[1]=5678�Afrac[2]=4321�A
+Prec=3�Asign=2�Aexponent=1 �����������BMaxPrec��
+Prec �������������������������������������Bflag ��
+�g�p���@��ﾀ�������������������g�p���������B
+
+<hr>
+<A NAME="#BASE">
+<H2>2�i��10�i</H2>
+BigDecimal �� <���������_��> = 0.xxxxxxxxx*10**n ������10�i�`ｮ�����l�������������B
+�������A�v�Z�@�����������_���������\�����A�������������� <���������_��> = 0.bbbbbbbb*2**n ������
+2�i�`ｮ����������(x �� 0 ���� 9 �����Ab �� 0 �� 1 ������)�B
+BigDecimal ������10�i�������\���`ｮ�����p���������������������������B
+<H4>10�i�������b�g</H4>
+<DL>
+<DT>�f�o�b�O����������
+<DD>�����A�v���O�����������y�����Bfrac[0]=1234�Afrac[1]=5678�Afrac[2]=4321�A
+exponent=1�Asign=2 �������l�� 1234.56784321 ���������������������������������B
+
+<DT>10�i�\�L���������l�����mﾀ�������\��������������
+<DD>�������A�������������v���O�������S������������
+�v�Z�������������������B�����������A���s�����������l
+�������������t�@�C�� file �����v���l�����������������B
+<CODE><PRE>
+   file = File::open(....,"r")
+   s = BigDecimal::new("0")
+   while line = file.gets
+      s = s + line
+   end
+</PRE></CODE>
+��������2�i���������������������������\�������������B
+������ 0.1 ��2�i���\�������� 0.1 = b1*2**(-1)+b1*2**(-2)+b3*2**(-3)+b4*2**(-4)....
+������������������������(b1=0,b2=0,b3=0,b4=1...)�B������ bn(n=1,2,3,...) ��
+2�i���\������ 0 �� 1 �������������B�]�����A�����������������K�v�����������B
+�������������������������B���������A���������x10�i�\�L��������������������
+�������K�������������i�lﾌ�����j������������ "0.1" ���\ｦ���������B�������A
+�����������m�� 0.1 ���������������B
+
+<DT>�L���������L���������i������ｩ�������������j
+<DD>0.1 ���\�������������������������������z���v�f�i frac[0]=1 �j�����������B
+�z���v�f������10�i���l����ｩ���I���������������B�������A���������������_���Z����
+���������������B�t�� 0.1 ��2�i�\��������������2�i���L���������������������� 0.1 ��
+���������������������������B
+</DL>
+
+<H3>10�i���f�����b�g</H3>
+ﾀ���������������b�g���A���������f�����b�g�������������B
+���������A10�i��2�i������������������������������
+�������������������������������������B
+���T���R���s���[�^��10�i�������\���������������������A
+BigDecimal �����p���������������v�Z�������������A�v�Z���x
+�������������������� BigDecimal ���g�p�������K�v�����������B
+
+<H3>�����������H</H3>
+ｩ�����v�Z������������������2�i�����g���l�����������������B
+�v�Z�@���f�[�^�������������������������������A
+10�i���������������B���������Adouble �����v�Z�@����
+�\�������������������������������������������B
+BigDecimal �����[�U���������������������������������������B
+�f�o�b�O���������������A�f�[�^��������������������������
+����������ﾀ���������b�g�����B
+
+<hr>
+<A NAME="#PREC">
+<H2>�v�Z���x��������</H2>
+c = a op b �������v�Z(op �� + - * /)������������������
+���������������������B<BR><BR>
+�P�D���Z��(a ���L������)+(b ���L������)�A
+���Z��(a �������L������)+(b �������L������)�������������iﾀ�����A�]�T���������A
+�����������������������j���������� c ���V���������������B
+�����Z���������A�������o�������������x������ c �������������B������
+ c = 0.1+0.1*10**(-100) �������������Ac �����x���P�O�O�����������x��
+�������������������B
+<BR><BR>
+�Q�D���� c = a op b ���v�Z��ﾀ�s�������B<BR><BR>
+�����������A�����Z�����Z���� c ���K���u�������o�����v���������x��
+������������������(BigDecimal.limit ���w������������)�B
+���Z��(a �������L������)+(b �������L������)������������
+������ c �����������������Ac = 1.0/3.0 ���������v�Z�����������������A
+ c ���������x�����������������v�Z�����������������������������B<BR><BR>
+�������������Ac ���������x�� a �� b ���������������������� c ���K�v������
+�������[�������������������������������������B
+<BR><BR>
+�����F�u+,-,*,/�v�������������x�i�L�������j��ｩ�����w�������������B
+���x���R���g���[���������������A�������C���X�^���X���\�b�h���g�p�������B<BR>
+<UL>
+<LI>add,sub,mult,div</LI><BLOCKQUOTE>
+�����������\�b�h������(����)�������������������w�����������B
+<CODE><PRE>
+ BigDecimal("2").div(3,12) # 2.0/3.0 => 0.6666666666 67E0
+</PRE></CODE>
+</BLOCKQUOTE>
+<LI>truncate,round,ceil,floor</LI><BLOCKQUOTE>
+�����������\�b�h�������_�������������u���w�����������������������B
+<CODE><PRE>
+ BigDecimal("6.66666666666666").round(12) # => 0.6666666666 667E1
+</PRE></CODE>
+</BLOCKQUOTE>
+</UL>
+<H3>ｩ�������x���R���g���[������������</H3>
+ｩ�������x(�L������)���R���g���[�������������� add�Asub�Amult�Adiv �������\�b�h
+���g�p���������B
+�������~�������v�Z�����v���O���������������A
+������������ｩ�����w���������������������B
+<BR><BR>
+<CODE><PRE>
+#!/usr/local/bin/ruby
+
+require "bigdecimal"
+#
+# Calculates 3.1415.... (the number of times that a circle's diameter
+# will fit around the circle) using J. Machin's formula.
+#
+def big_pi(sig) # sig: Number of significant figures
+  exp    = -sig
+  pi     = BigDecimal::new("0")
+  two    = BigDecimal::new("2")
+  m25    = BigDecimal::new("-0.04")
+  m57121 = BigDecimal::new("-57121")
+
+  u = BigDecimal::new("1")
+  k = BigDecimal::new("1")
+  w = BigDecimal::new("1")
+  t = BigDecimal::new("-80")
+  while (u.nonzero? && u.exponent >= exp) 
+    t   = t*m25
+    u   = t.div(k,sig)
+    pi  = pi + u
+    k   = k+two
+  end
+
+  u = BigDecimal::new("1")
+  k = BigDecimal::new("1")
+  w = BigDecimal::new("1")
+  t = BigDecimal::new("956")
+  while (u.nonzero? && u.exponent >= exp )
+    t   = t.div(m57121,sig)
+    u   = t.div(k,sig)
+    pi  = pi + u
+    k   = k+two
+  end
+  pi
+end
+
+if $0 == __FILE__
+  if ARGV.size == 1
+    print "PI("+ARGV[0]+"):\n"
+    p big_pi(ARGV[0].to_i)
+  else
+    print "TRY: ruby pi.rb 1000 \n"
+  end
+end
+
+</PRE></CODE>
+<HR>
+<FONT size=2>
+<I>
+<A HREF="http://www.tinyforest.gr.jp">
+���� ���Y
+</A>
+(E-Mail:<A HREF="mailto:shigeo@tinyforest.gr.jp">&ltshigeo@tinyforest.gr.jp&gt</U></A>)
+</I>
+</FONT>
+</TD>
+</TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/ruby_1_8_6/ext/bigdecimal/depend b/ruby_1_8_6/ext/bigdecimal/depend
new file mode 100644
index 0000000000..402cae95dd
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/depend
@@ -0,0 +1 @@
+bigdecimal.o: bigdecimal.c bigdecimal.h $(hdrdir)/ruby.h
diff --git a/ruby_1_8_6/ext/bigdecimal/extconf.rb b/ruby_1_8_6/ext/bigdecimal/extconf.rb
new file mode 100644
index 0000000000..a68a656044
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('bigdecimal')
diff --git a/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/jacobian.rb
new file mode 100644
index 0000000000..d80eeab901
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/jacobian.rb
@@ -0,0 +1,85 @@
+#
+# require 'bigdecimal/jacobian'
+#
+# Provides methods to compute the Jacobian matrix of a set of equations at a
+# point x. In the methods below:
+#
+# f is an Object which is used to compute the Jacobian matrix of the equations.
+# It must provide the following methods:
+#
+# f.values(x):: returns the values of all functions at x
+#
+# f.zero:: returns 0.0
+# f.one:: returns 1.0
+# f.two:: returns 1.0
+# f.ten:: returns 10.0
+#
+# f.eps:: returns the convergence criterion (epsilon value) used to determine whether two values are considered equal. If |a-b| < epsilon, the two values are considered equal.
+#
+# x is the point at which to compute the Jacobian.
+#
+# fx is f.values(x).
+#
+module Jacobian
+  #--
+  def isEqual(a,b,zero=0.0,e=1.0e-8)
+    aa = a.abs
+    bb = b.abs
+    if aa == zero &&  bb == zero then
+          true
+    else
+          if ((a-b)/(aa+bb)).abs < e then
+             true
+          else
+             false
+          end
+    end
+  end
+  #++
+
+  # Computes the derivative of f[i] at x[i].
+  # fx is the value of f at x.
+  def dfdxi(f,fx,x,i)
+    nRetry = 0
+    n = x.size
+    xSave = x[i]
+    ok = 0
+    ratio = f.ten*f.ten*f.ten
+    dx = x[i].abs/ratio
+    dx = fx[i].abs/ratio if isEqual(dx,f.zero,f.zero,f.eps)
+    dx = f.one/f.ten     if isEqual(dx,f.zero,f.zero,f.eps)
+    until ok>0 do
+      s = f.zero
+      deriv = []
+      if(nRetry>100) then
+         raize "Singular Jacobian matrix. No change at x[" + i.to_s + "]"
+      end
+      dx = dx*f.two
+      x[i] += dx
+      fxNew = f.values(x)
+      for j in 0...n do
+        if !isEqual(fxNew[j],fx[j],f.zero,f.eps) then
+           ok += 1
+           deriv <<= (fxNew[j]-fx[j])/dx
+        else
+           deriv <<= f.zero
+        end
+      end
+      x[i] = xSave
+    end
+    deriv
+  end
+
+  # Computes the Jacobian of f at x. fx is the value of f at x.
+  def jacobian(f,fx,x)
+    n = x.size
+    dfdx = Array::new(n*n)
+    for i in 0...n do
+      df = dfdxi(f,fx,x,i)
+      for j in 0...n do
+         dfdx[j*n+i] = df[j]
+      end
+    end
+    dfdx
+  end
+end
diff --git a/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/ludcmp.rb b/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
new file mode 100644
index 0000000000..8f4888725e
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
@@ -0,0 +1,84 @@
+#
+# Solves a*x = b for x, using LU decomposition.
+#
+module LUSolve
+  # Performs LU decomposition of the n by n matrix a.
+  def ludecomp(a,n,zero=0,one=1)
+    prec = BigDecimal.limit(nil)
+    ps     = []
+    scales = []
+    for i in 0...n do  # pick up largest(abs. val.) element in each row.
+      ps <<= i
+      nrmrow  = zero
+      ixn = i*n
+      for j in 0...n do
+         biggst = a[ixn+j].abs
+         nrmrow = biggst if biggst>nrmrow
+      end
+      if nrmrow>zero then
+         scales <<= one.div(nrmrow,prec)
+      else 
+         raise "Singular matrix"
+      end
+    end
+    n1          = n - 1
+    for k in 0...n1 do # Gaussian elimination with partial pivoting.
+      biggst  = zero;
+      for i in k...n do
+         size = a[ps[i]*n+k].abs*scales[ps[i]]
+         if size>biggst then
+            biggst = size
+            pividx  = i
+         end
+      end
+      raise "Singular matrix" if biggst<=zero
+      if pividx!=k then
+        j = ps[k]
+        ps[k] = ps[pividx]
+        ps[pividx] = j
+      end
+      pivot   = a[ps[k]*n+k]
+      for i in (k+1)...n do
+        psin = ps[i]*n
+        a[psin+k] = mult = a[psin+k].div(pivot,prec)
+        if mult!=zero then
+           pskn = ps[k]*n
+           for j in (k+1)...n do
+             a[psin+j] -= mult.mult(a[pskn+j],prec)
+           end
+        end
+      end
+    end
+    raise "Singular matrix" if a[ps[n1]*n+n1] == zero
+    ps
+  end
+
+  # Solves a*x = b for x, using LU decomposition.
+  #
+  # a is a matrix, b is a constant vector, x is the solution vector.
+  #
+  # ps is the pivot, a vector which indicates the permutation of rows performed
+  # during LU decomposition.
+  def lusolve(a,b,ps,zero=0.0)
+    prec = BigDecimal.limit(nil)
+    n = ps.size
+    x = []
+    for i in 0...n do
+      dot = zero
+      psin = ps[i]*n
+      for j in 0...i do
+        dot = a[psin+j].mult(x[j],prec) + dot
+      end
+      x <<= b[ps[i]] - dot
+    end
+    (n-1).downto(0) do |i|
+       dot = zero
+       psin = ps[i]*n
+       for j in (i+1)...n do
+         dot = a[psin+j].mult(x[j],prec) + dot
+       end
+       x[i]  = (x[i]-dot).div(a[psin+i],prec)
+    end
+    x
+  end
+end
diff --git a/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/math.rb b/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/math.rb
new file mode 100644
index 0000000000..f3248a3c5c
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/math.rb
@@ -0,0 +1,235 @@
+#
+#--
+# Contents:
+#   sqrt(x, prec)
+#   sin (x, prec)
+#   cos (x, prec)
+#   atan(x, prec)  Note: |x|<1, x=0.9999 may not converge.
+#   exp (x, prec)
+#   log (x, prec)
+#   PI  (prec)
+#   E   (prec) == exp(1.0,prec)
+#
+# where:
+#   x    ... BigDecimal number to be computed.
+#            |x| must be small enough to get convergence.
+#   prec ... Number of digits to be obtained.
+#++
+#
+# Provides mathematical functions.
+#
+# Example:
+#
+#   require "bigdecimal"
+#   require "bigdecimal/math"
+#
+#   include BigMath
+#
+#   a = BigDecimal((PI(100)/2).to_s)
+#   puts sin(a,100) # -> 0.10000000000000000000......E1
+#
+module BigMath
+
+  # Computes the square root of x to the specified number of digits of 
+  # precision.
+  #
+  # BigDecimal.new('2').sqrt(16).to_s 
+  #  -> "0.14142135623730950488016887242096975E1"
+  #
+  def sqrt(x,prec)
+    x.sqrt(prec)
+  end
+
+  # Computes the sine of x to the specified number of digits of precision.
+  #
+  # If x is infinite or NaN, returns NaN.
+  def sin(x, prec)
+    raise ArgumentError, "Zero or negative precision for sin" if prec <= 0
+    return BigDecimal("NaN") if x.infinite? || x.nan?
+    n    = prec + BigDecimal.double_fig
+    one  = BigDecimal("1")
+    two  = BigDecimal("2")
+    x1   = x
+    x2   = x.mult(x,n)
+    sign = 1
+    y    = x
+    d    = y
+    i    = one
+    z    = one
+    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
+      m = BigDecimal.double_fig if m < BigDecimal.double_fig
+      sign = -sign
+      x1  = x2.mult(x1,n)
+      i  += two
+      z  *= (i-one) * i
+      d   = sign * x1.div(z,m)
+      y  += d
+    end
+    y
+  end
+
+  # Computes the cosine of x to the specified number of digits of precision.
+  #
+  # If x is infinite or NaN, returns NaN.
+  def cos(x, prec)
+    raise ArgumentError, "Zero or negative precision for cos" if prec <= 0
+    return BigDecimal("NaN") if x.infinite? || x.nan?
+    n    = prec + BigDecimal.double_fig
+    one  = BigDecimal("1")
+    two  = BigDecimal("2")
+    x1 = one
+    x2 = x.mult(x,n)
+    sign = 1
+    y = one
+    d = y
+    i = BigDecimal("0")
+    z = one
+    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
+      m = BigDecimal.double_fig if m < BigDecimal.double_fig
+      sign = -sign
+      x1  = x2.mult(x1,n)
+      i  += two
+      z  *= (i-one) * i
+      d   = sign * x1.div(z,m)
+      y  += d
+    end
+    y
+  end
+
+  # Computes the arctangent of x to the specified number of digits of precision.
+  #
+  # If x is infinite or NaN, returns NaN.
+  # Raises an argument error if x > 1.
+  def atan(x, prec)
+    raise ArgumentError, "Zero or negative precision for atan" if prec <= 0
+    return BigDecimal("NaN") if x.infinite? || x.nan?
+    raise ArgumentError, "x.abs must be less than 1.0" if x.abs>=1
+    n    = prec + BigDecimal.double_fig
+    y = x
+    d = y
+    t = x
+    r = BigDecimal("3")
+    x2 = x.mult(x,n)
+    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
+      m = BigDecimal.double_fig if m < BigDecimal.double_fig
+      t = -t.mult(x2,n)
+      d = t.div(r,m)
+      y += d
+      r += 2
+    end
+    y
+  end
+
+  # Computes the value of e (the base of natural logarithms) raised to the 
+  # power of x, to the specified number of digits of precision.
+  #
+  # If x is infinite or NaN, returns NaN.
+  #
+  # BigMath::exp(BigDecimal.new('1'), 10).to_s
+  # -> "0.271828182845904523536028752390026306410273E1"
+  def exp(x, prec)
+    raise ArgumentError, "Zero or negative precision for exp" if prec <= 0
+    return BigDecimal("NaN") if x.infinite? || x.nan?
+    n    = prec + BigDecimal.double_fig
+    one  = BigDecimal("1")
+    x1 = one
+    y  = one
+    d  = y
+    z  = one
+    i  = 0
+    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
+      m = BigDecimal.double_fig if m < BigDecimal.double_fig
+      x1  = x1.mult(x,n)
+      i += 1
+      z *= i
+      d  = x1.div(z,m)
+      y += d
+    end
+    y
+  end
+
+  # Computes the natural logarithm of x to the specified number of digits 
+  # of precision.
+  #
+  # Returns x if x is infinite or NaN.
+  #
+  def log(x, prec)
+    raise ArgumentError, "Zero or negative argument for log" if x <= 0 || prec <= 0
+    return x if x.infinite? || x.nan?
+    one = BigDecimal("1")
+    two = BigDecimal("2")
+    n  = prec + BigDecimal.double_fig
+    x  = (x - one).div(x + one,n)
+    x2 = x.mult(x,n)
+    y  = x
+    d  = y
+    i = one
+    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
+      m = BigDecimal.double_fig if m < BigDecimal.double_fig
+      x  = x2.mult(x,n)
+      i += two
+      d  = x.div(i,m)
+      y += d
+    end
+    y*two
+  end
+
+  # Computes the value of pi to the specified number of digits of precision.
+  def PI(prec)
+    raise ArgumentError, "Zero or negative argument for PI" if prec <= 0
+    n      = prec + BigDecimal.double_fig
+    zero   = BigDecimal("0")
+    one    = BigDecimal("1")
+    two    = BigDecimal("2")
+
+    m25    = BigDecimal("-0.04")
+    m57121 = BigDecimal("-57121")
+
+    pi     = zero
+
+    d = one
+    k = one
+    w = one
+    t = BigDecimal("-80")
+    while d.nonzero? && ((m = n - (pi.exponent - d.exponent).abs) > 0)
+      m = BigDecimal.double_fig if m < BigDecimal.double_fig
+      t   = t*m25
+      d   = t.div(k,m)
+      k   = k+two
+      pi  = pi + d
+    end
+
+    d = one
+    k = one
+    w = one
+    t = BigDecimal("956")
+    while d.nonzero? && ((m = n - (pi.exponent - d.exponent).abs) > 0)
+      m = BigDecimal.double_fig if m < BigDecimal.double_fig
+      t   = t.div(m57121,n)
+      d   = t.div(k,m)
+      pi  = pi + d
+      k   = k+two
+    end
+    pi
+  end
+
+  # Computes e (the base of natural logarithms) to the specified number of
+  # digits of precision.
+  def E(prec)
+    raise ArgumentError, "Zero or negative precision for E" if prec <= 0
+    n    = prec + BigDecimal.double_fig
+    one  = BigDecimal("1")
+    y  = one
+    d  = y
+    z  = one
+    i  = 0
+    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
+      m = BigDecimal.double_fig if m < BigDecimal.double_fig
+      i += 1
+      z *= i
+      d  = one.div(z,m)
+      y += d
+    end
+    y
+  end
+end
diff --git a/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/newton.rb b/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/newton.rb
new file mode 100644
index 0000000000..59ac0f7f04
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/newton.rb
@@ -0,0 +1,77 @@
+#
+# newton.rb 
+#
+# Solves the nonlinear algebraic equation system f = 0 by Newton's method.
+# This program is not dependent on BigDecimal.
+#
+# To call:
+#    n = nlsolve(f,x)
+#  where n is the number of iterations required,
+#        x is the initial value vector
+#        f is an Object which is used to compute the values of the equations to be solved.
+# It must provide the following methods:
+#
+# f.values(x):: returns the values of all functions at x
+#
+# f.zero:: returns 0.0
+# f.one:: returns 1.0
+# f.two:: returns 1.0
+# f.ten:: returns 10.0
+#
+# f.eps:: returns the convergence criterion (epsilon value) used to determine whether two values are considered equal. If |a-b| < epsilon, the two values are considered equal.
+#
+# On exit, x is the solution vector.
+#
+require "bigdecimal/ludcmp"
+require "bigdecimal/jacobian"
+
+module Newton
+  include LUSolve
+  include Jacobian
+  
+  def norm(fv,zero=0.0)
+    s = zero
+    n = fv.size
+    for i in 0...n do
+      s += fv[i]*fv[i]
+    end
+    s
+  end
+
+  def nlsolve(f,x)
+    nRetry = 0
+    n = x.size
+
+    f0 = f.values(x)
+    zero = f.zero
+    one  = f.one
+    two  = f.two
+    p5 = one/two
+    d  = norm(f0,zero)
+    minfact = f.ten*f.ten*f.ten
+    minfact = one/minfact
+    e = f.eps
+    while d >= e do
+      nRetry += 1
+      # Not yet converged. => Compute Jacobian matrix
+      dfdx = jacobian(f,f0,x)
+      # Solve dfdx*dx = -f0 to estimate dx
+      dx = lusolve(dfdx,f0,ludecomp(dfdx,n,zero,one),zero)
+      fact = two
+      xs = x.dup
+      begin
+        fact *= p5
+        if fact < minfact then
+          raise "Failed to reduce function values."
+        end
+        for i in 0...n do
+          x[i] = xs[i] - dx[i]*fact
+        end
+        f0 = f.values(x)
+        dn = norm(f0,zero)
+      end while(dn>=d)
+      d = dn
+    end
+    nRetry
+  end
+end
diff --git a/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/util.rb b/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/util.rb
new file mode 100644
index 0000000000..09e926acd5
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/lib/bigdecimal/util.rb
@@ -0,0 +1,65 @@
+#
+# BigDecimal utility library.
+#
+# To use these functions, require 'bigdecimal/util'
+#
+# The following methods are provided to convert other types to BigDecimals:
+#
+#   String#to_d -> BigDecimal
+#   Float#to_d -> BigDecimal
+#   Rational#to_d -> BigDecimal
+#
+# The following method is provided to convert BigDecimals to other types:
+#
+#   BigDecimal#to_r -> Rational
+#
+# ----------------------------------------------------------------------
+#
+class Float < Numeric
+  def to_d
+    BigDecimal(self.to_s)
+  end
+end
+
+class String
+  def to_d
+    BigDecimal(self)
+  end
+end
+
+class BigDecimal < Numeric
+  # Converts a BigDecimal to a String of the form "nnnnnn.mmm".
+  # This method is deprecated; use BigDecimal#to_s("F") instead.
+  def to_digits
+     if self.nan? || self.infinite? || self.zero?
+        self.to_s
+     else
+       i       = self.to_i.to_s
+       s,f,y,z = self.frac.split
+       i + "." + ("0"*(-z)) + f
+     end
+  end
+
+  # Converts a BigDecimal to a Rational.
+  def to_r 
+     sign,digits,base,power = self.split
+     numerator = sign*digits.to_i
+     denomi_power = power - digits.size # base is always 10
+     if denomi_power < 0
+        Rational(numerator,base ** (-denomi_power))
+     else
+        Rational(numerator * (base ** denomi_power),1)
+     end
+  end
+end
+
+class Rational < Numeric
+  # Converts a Rational to a BigDecimal
+  def to_d(nFig=0)
+     num = self.numerator.to_s
+     if nFig<=0
+        nFig = BigDecimal.double_fig*2+1
+     end
+     BigDecimal.new(num).div(self.denominator,nFig)
+  end
+end
diff --git a/ruby_1_8_6/ext/bigdecimal/sample/linear.rb b/ruby_1_8_6/ext/bigdecimal/sample/linear.rb
new file mode 100644
index 0000000000..88a62ffa71
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/sample/linear.rb
@@ -0,0 +1,71 @@
+#!/usr/local/bin/ruby
+
+#
+# linear.rb
+#
+# Solves linear equation system(A*x = b) by LU decomposition method.
+#  where  A is a coefficient matrix,x is an answer vector,b is a constant vector.
+#
+# USAGE:
+#   ruby linear.rb [input file solved]
+#
+
+require "bigdecimal"
+require "bigdecimal/ludcmp"
+
+#
+# NOTE:
+#   Change following BigDecimal::limit() if needed.
+BigDecimal::limit(100)
+#
+
+include LUSolve
+def rd_order(na)
+   printf("Number of equations ?") if(na <= 0)
+   n = ARGF.gets().to_i
+end
+
+na   = ARGV.size
+zero = BigDecimal::new("0.0")
+one  = BigDecimal::new("1.0")
+
+while (n=rd_order(na))>0
+  a = []
+  as= []
+  b = []
+  if na <= 0
+     # Read data from console.
+     printf("\nEnter coefficient matrix element A[i,j]\n");
+     for i in 0...n do
+       for j in 0...n do
+         printf("A[%d,%d]? ",i,j); s = ARGF.gets
+         a  << BigDecimal::new(s);
+         as << BigDecimal::new(s);
+       end
+       printf("Contatant vector element b[%d] ? ",i); b << BigDecimal::new(ARGF.gets);
+     end
+  else
+     # Read data from specified file.
+     printf("Coefficient matrix and constant vector.\n");
+     for i in 0...n do
+       s = ARGF.gets
+       printf("%d) %s",i,s)
+       s = s.split
+       for j in 0...n do
+         a  << BigDecimal::new(s[j]);
+         as << BigDecimal::new(s[j]);
+       end
+       b << BigDecimal::new(s[n]);
+     end
+  end
+  x = lusolve(a,b,ludecomp(a,n,zero,one),zero)
+  printf("Answer(x[i] & (A*x-b)[i]) follows\n")
+  for i in 0...n do
+     printf("x[%d]=%s ",i,x[i].to_s)
+     s = zero
+     for j in 0...n do
+       s = s + as[i*n+j]*x[j]
+     end
+     printf(" & %s\n",(s-b[i]).to_s)
+  end
+end
diff --git a/ruby_1_8_6/ext/bigdecimal/sample/nlsolve.rb b/ruby_1_8_6/ext/bigdecimal/sample/nlsolve.rb
new file mode 100644
index 0000000000..7f729e6aaa
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/sample/nlsolve.rb
@@ -0,0 +1,38 @@
+#!/usr/local/bin/ruby
+
+#
+# nlsolve.rb
+# An example for solving nonlinear algebraic equation system.
+#
+
+require "bigdecimal"
+require "bigdecimal/newton"
+include Newton
+
+class Function
+  def initialize()
+    @zero = BigDecimal::new("0.0")
+    @one  = BigDecimal::new("1.0")
+    @two  = BigDecimal::new("2.0")
+    @ten  = BigDecimal::new("10.0")
+    @eps  = BigDecimal::new("1.0e-16")
+  end
+  def zero;@zero;end
+  def one ;@one ;end
+  def two ;@two ;end
+  def ten ;@ten ;end
+  def eps ;@eps ;end
+  def values(x) # <= defines functions solved
+    f = []
+    f1 = x[0]*x[0] + x[1]*x[1] - @two # f1 = x**2 + y**2 - 2 => 0
+    f2 = x[0] - x[1]                  # f2 = x    - y        => 0
+    f <<= f1
+    f <<= f2
+    f
+  end
+end
+ f = BigDecimal::limit(100)
+ f = Function.new
+ x = [f.zero,f.zero]      # Initial values
+ n = nlsolve(f,x)
+ p x
diff --git a/ruby_1_8_6/ext/bigdecimal/sample/pi.rb b/ruby_1_8_6/ext/bigdecimal/sample/pi.rb
new file mode 100644
index 0000000000..2f7dd27d60
--- /dev/null
+++ b/ruby_1_8_6/ext/bigdecimal/sample/pi.rb
@@ -0,0 +1,20 @@
+#!/usr/local/bin/ruby
+
+#
+# pi.rb
+#
+# Calculates 3.1415.... (the number of times that a circle's diameter
+# will fit around the circle) using J. Machin's formula.
+#
+
+require "bigdecimal"
+require "bigdecimal/math.rb"
+
+include BigMath
+
+if ARGV.size == 1
+    print "PI("+ARGV[0]+"):\n"
+    p PI(ARGV[0].to_i)
+else
+    print "TRY: ruby pi.rb 1000 \n"
+end
diff --git a/ruby_1_8_6/ext/curses/.cvsignore b/ruby_1_8_6/ext/curses/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/curses/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/curses/curses.c b/ruby_1_8_6/ext/curses/curses.c
new file mode 100644
index 0000000000..9c51a2127f
--- /dev/null
+++ b/ruby_1_8_6/ext/curses/curses.c
@@ -0,0 +1,2101 @@
+/* -*- C -*-
+ * $Id$
+ *
+ * ext/curses/curses.c
+ * 
+ * by MAEDA Shugo (ender@pic-internet.or.jp)
+ * modified by Yukihiro Matsumoto (matz@netlab.co.jp),
+ *         Toki Yoshinori,
+ *         Hitoshi Takahashi,
+ *         and Takaaki Tateishi (ttate@kt.jaist.ac.jp)
+ *
+ * maintainers:
+ * - Takaaki Tateishi (ttate@kt.jaist.ac.jp)
+ */
+
+#include "ruby.h"
+#include "rubyio.h"
+
+#if defined(HAVE_NCURSES_H)
+# include <ncurses.h>
+#elif defined(HAVE_NCURSES_CURSES_H)
+# include <ncurses/curses.h>
+#elif defined(HAVE_CURSES_COLR_CURSES_H)
+# ifdef HAVE_STDARG_PROTOTYPES
+#  include <stdarg.h>
+# else
+#  include <varargs.h>
+# endif
+# include <curses_colr/curses.h>
+#else
+# include <curses.h>
+# if defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)
+#  if !defined(_maxx)
+#  define _maxx maxx
+#  endif
+#  if !defined(_maxy)
+#  define _maxy maxy
+#  endif
+#  if !defined(_begx)
+#  define _begx begx
+#  endif
+#  if !defined(_begy)
+#  define _begy begy
+#  endif
+# endif
+#endif
+
+#ifdef HAVE_INIT_COLOR
+# define USE_COLOR 1
+#endif
+
+/* supports only ncurses mouse routines */
+#ifdef NCURSES_MOUSE_VERSION
+# define USE_MOUSE 1
+#endif
+
+#define NUM2CH NUM2LONG
+#define CH2FIX LONG2FIX
+
+static VALUE mCurses;
+static VALUE mKey;
+static VALUE cWindow;
+#ifdef USE_MOUSE
+static VALUE cMouseEvent;
+#endif
+
+static VALUE rb_stdscr;
+
+struct windata {
+    WINDOW *window;
+};
+
+#define CHECK(c) c
+
+static VALUE window_attroff();
+static VALUE window_attron();
+static VALUE window_attrset();
+
+static void
+no_window()
+{
+    rb_raise(rb_eRuntimeError, "already closed window");
+}
+
+#define GetWINDOW(obj, winp) do {\
+    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
+	rb_raise(rb_eSecurityError, "Insecure: operation on untainted window");\
+    Data_Get_Struct(obj, struct windata, winp);\
+    if (winp->window == 0) no_window();\
+} while (0)
+
+static void
+free_window(winp)
+    struct windata *winp;
+{
+    if (winp->window && winp->window != stdscr) delwin(winp->window);
+    winp->window = 0;
+    free(winp);
+}
+
+static VALUE
+prep_window(class, window)
+    VALUE class;
+    WINDOW *window;
+{
+    VALUE obj;
+    struct windata *winp;
+
+    if (window == NULL) {
+	rb_raise(rb_eRuntimeError, "failed to create window");
+    }
+
+    obj = rb_obj_alloc(class);
+    Data_Get_Struct(obj, struct windata, winp);
+    winp->window = window;
+    
+    return obj;    
+}
+
+/*-------------------------- module Curses --------------------------*/
+
+/* def init_screen */
+static VALUE
+curses_init_screen()
+{
+    rb_secure(4);
+    if (rb_stdscr) return rb_stdscr;
+    initscr();
+    if (stdscr == 0) {
+	rb_raise(rb_eRuntimeError, "can't initialize curses");
+    }
+    clear();
+    rb_stdscr = prep_window(cWindow, stdscr);
+    return rb_stdscr;
+}
+
+/* def stdscr */
+#define curses_stdscr curses_init_screen
+
+/* def close_screen */
+static VALUE
+curses_close_screen()
+{
+#ifdef HAVE_ISENDWIN
+    if (!isendwin())
+#endif
+	endwin();
+    rb_stdscr = 0;
+    return Qnil;
+}
+
+static void
+curses_finalize(VALUE dummy)
+{
+    if (stdscr
+#ifdef HAVE_ISENDWIN
+	&& !isendwin()
+#endif
+	)
+	endwin();
+    rb_stdscr = 0;
+    rb_gc_unregister_address(&rb_stdscr);
+}
+
+/* def closed? */
+static VALUE
+curses_closed()
+{
+#ifdef HAVE_ISENDWIN
+    if (isendwin()) {
+	return Qtrue;
+    }
+    return Qfalse;
+#else
+    rb_notimplement();
+#endif
+}
+
+/* def clear */
+static VALUE
+curses_clear(obj)
+    VALUE obj;
+{
+    curses_stdscr();
+    wclear(stdscr);
+    return Qnil;
+}
+
+/* def clrtoeol */
+static VALUE
+curses_clrtoeol()
+{
+    curses_stdscr();
+    clrtoeol();
+    return Qnil;
+}
+
+/* def refresh */
+static VALUE
+curses_refresh(obj)
+    VALUE obj;
+{
+    curses_stdscr();
+    refresh();
+    return Qnil;
+}
+
+/* def doupdate */
+static VALUE
+curses_doupdate(obj)
+    VALUE obj;
+{
+    curses_stdscr();
+#ifdef HAVE_DOUPDATE
+    doupdate();
+#else
+    refresh();
+#endif
+    return Qnil;
+}
+
+/* def echo */
+static VALUE
+curses_echo(obj)
+    VALUE obj;
+{
+    curses_stdscr();
+    echo();
+    return Qnil;
+}
+
+/* def noecho */
+static VALUE
+curses_noecho(obj)
+    VALUE obj;
+{
+    curses_stdscr();
+    noecho();
+    return Qnil;
+}
+
+/* def raw */
+static VALUE
+curses_raw(obj)
+    VALUE obj;
+{
+    curses_stdscr();
+    raw();
+    return Qnil;
+}
+
+/* def noraw */
+static VALUE
+curses_noraw(obj)
+    VALUE obj;
+{
+    curses_stdscr();
+    noraw();
+    return Qnil;
+}
+
+/* def cbreak */
+static VALUE
+curses_cbreak(obj)
+    VALUE obj;
+{
+    curses_stdscr();
+    cbreak();
+    return Qnil;
+}
+
+/* def nocbreak */
+static VALUE
+curses_nocbreak(obj)
+    VALUE obj;
+{
+    curses_stdscr();
+    nocbreak();
+    return Qnil;
+}
+
+/* def nl */
+static VALUE
+curses_nl(obj)
+    VALUE obj;
+{
+    curses_stdscr();
+    nl();
+    return Qnil;
+}
+
+/* def nonl */
+static VALUE
+curses_nonl(obj)
+    VALUE obj;
+{
+    curses_stdscr();
+    nonl();
+    return Qnil;
+}
+
+/* def beep */
+static VALUE
+curses_beep(obj)
+    VALUE obj;
+{
+#ifdef HAVE_BEEP
+    curses_stdscr();
+    beep();
+#endif
+    return Qnil;
+}
+
+/* def flash */
+static VALUE
+curses_flash(obj)
+    VALUE obj;
+{
+#ifdef HAVE_FLASH
+    curses_stdscr();
+    flash();
+#endif
+    return Qnil;
+}
+
+/* def ungetch */
+static VALUE
+curses_ungetch(obj, ch)
+    VALUE obj;
+    VALUE ch;
+{
+#ifdef HAVE_UNGETCH
+    curses_stdscr();
+    ungetch(NUM2INT(ch));
+#else
+    rb_notimplement();
+#endif
+    return Qnil;
+}
+
+/* def setpos(y, x) */
+static VALUE
+curses_setpos(obj, y, x)
+    VALUE obj;
+    VALUE y;
+    VALUE x;
+{
+    curses_stdscr();
+    move(NUM2INT(y), NUM2INT(x));
+    return Qnil;
+}
+
+/* def standout */
+static VALUE
+curses_standout(obj)
+    VALUE obj;
+{
+    standout();
+    return Qnil;
+}
+
+/* def standend */
+static VALUE
+curses_standend(obj)
+    VALUE obj;
+{
+    standend();
+    return Qnil;
+}
+
+/* def inch */
+static VALUE
+curses_inch(obj)
+    VALUE obj;
+{
+    curses_stdscr();
+    return CH2FIX(inch());
+}
+
+/* def addch(ch) */
+static VALUE
+curses_addch(obj, ch)
+    VALUE obj;
+    VALUE ch;
+{
+    curses_stdscr();
+    addch(NUM2CH(ch));
+    return Qnil;
+}
+
+/* def insch(ch) */
+static VALUE
+curses_insch(obj, ch)
+    VALUE obj;
+    VALUE ch;
+{
+    curses_stdscr();
+    insch(NUM2CH(ch));
+    return Qnil;
+}
+
+/* def addstr(str) */
+static VALUE
+curses_addstr(obj, str)
+    VALUE obj;
+    VALUE str;
+{
+    curses_stdscr();
+    if (!NIL_P(str)) {
+	addstr(STR2CSTR(str));
+    }
+    return Qnil;
+}
+
+/* def getch */
+static VALUE
+curses_getch(obj)
+    VALUE obj;
+{
+    rb_read_check(stdin);
+    curses_stdscr();
+    return UINT2NUM(getch());
+}
+
+/* def getstr */
+static VALUE
+curses_getstr(obj)
+    VALUE obj;
+{
+    char rtn[1024]; /* This should be big enough.. I hope */
+
+    rb_read_check(stdin);
+#if defined(HAVE_GETNSTR)
+    getnstr(rtn,1023);
+#else
+    getstr(rtn);
+#endif
+    return rb_tainted_str_new2(rtn);
+}
+
+/* def delch */
+static VALUE
+curses_delch(obj)
+    VALUE obj;
+{
+    delch();
+    return Qnil;
+}
+
+/* def delelteln */
+static VALUE
+curses_deleteln(obj)
+    VALUE obj;
+{
+#if defined(HAVE_DELETELN) || defined(deleteln)
+    deleteln();
+#endif
+    return Qnil;
+}
+
+/* def insertln */
+static VALUE
+curses_insertln(obj)
+    VALUE obj;
+{
+#if defined(HAVE_INSERTLN) || defined(insertln)
+    insertln();
+#endif
+    return Qnil;
+}
+
+/* def keyname */
+static VALUE
+curses_keyname(obj, c)
+    VALUE obj;
+    VALUE c;
+{
+#ifdef HAVE_KEYNAME
+  const char *name;
+
+  name = keyname(NUM2INT(c));
+  if (name) {
+    return rb_str_new2(name);
+  } else {
+    return Qnil;
+  }
+#else
+  return Qnil;
+#endif
+}
+
+static VALUE
+curses_lines()
+{
+    return INT2FIX(LINES);
+}
+
+static VALUE
+curses_cols()
+{
+    return INT2FIX(COLS);
+}
+
+static VALUE
+curses_curs_set(VALUE obj, VALUE visibility)
+{
+#ifdef HAVE_CURS_SET
+  int n;
+  return (n = curs_set(NUM2INT(visibility)) != ERR) ? INT2FIX(n) : Qnil;
+#else
+  return Qnil;
+#endif
+}
+
+static VALUE
+curses_scrl(VALUE obj, VALUE n)
+{
+  /* may have to raise exception on ERR */
+#ifdef HAVE_SCRL
+  return (scrl(NUM2INT(n)) == OK) ? Qtrue : Qfalse;
+#else
+  return Qfalse;
+#endif
+}
+
+static VALUE
+curses_setscrreg(VALUE obj, VALUE top, VALUE bottom)
+{
+  /* may have to raise exception on ERR */
+#ifdef HAVE_SETSCRREG
+  return (setscrreg(NUM2INT(top), NUM2INT(bottom)) == OK) ? Qtrue : Qfalse;
+#else
+  return Qfalse;
+#endif
+}
+
+static VALUE
+curses_attroff(VALUE obj, VALUE attrs)
+{
+  return window_attroff(rb_stdscr,attrs);  
+  /* return INT2FIX(attroff(NUM2INT(attrs))); */
+}
+
+static VALUE
+curses_attron(VALUE obj, VALUE attrs)
+{
+  return window_attron(rb_stdscr,attrs);
+  /* return INT2FIX(attroff(NUM2INT(attrs))); */
+}
+
+static VALUE
+curses_attrset(VALUE obj, VALUE attrs)
+{
+  return window_attrset(rb_stdscr,attrs);
+  /* return INT2FIX(attroff(NUM2INT(attrs))); */
+}
+
+static VALUE
+curses_bkgdset(VALUE obj, VALUE ch)
+{
+#ifdef HAVE_BKGDSET
+  bkgdset(NUM2CH(ch));
+#endif
+  return Qnil;
+}
+
+static VALUE
+curses_bkgd(VALUE obj, VALUE ch)
+{
+#ifdef HAVE_BKGD
+  return (bkgd(NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
+#else
+  return Qfalse;
+#endif
+}
+
+static VALUE
+curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
+{
+#if defined(HAVE_RESIZETERM)
+  return (resizeterm(NUM2INT(lin),NUM2INT(col)) == OK) ? Qtrue : Qfalse;
+#else
+  return Qnil;
+#endif
+}
+
+#ifdef USE_COLOR
+static VALUE
+curses_start_color(VALUE obj)
+{
+  /* may have to raise exception on ERR */
+  return (start_color() == OK) ? Qtrue : Qfalse;
+}
+
+static VALUE
+curses_init_pair(VALUE obj, VALUE pair, VALUE f, VALUE b)
+{
+  /* may have to raise exception on ERR */
+  return (init_pair(NUM2INT(pair),NUM2INT(f),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
+}
+
+static VALUE
+curses_init_color(VALUE obj, VALUE color, VALUE r, VALUE g, VALUE b)
+{
+  /* may have to raise exception on ERR */
+  return (init_color(NUM2INT(color),NUM2INT(r),
+		     NUM2INT(g),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
+}
+
+static VALUE
+curses_has_colors(VALUE obj)
+{
+  return has_colors() ? Qtrue : Qfalse;
+}
+
+static VALUE
+curses_can_change_color(VALUE obj)
+{
+  return can_change_color() ? Qtrue : Qfalse;
+}
+
+static VALUE
+curses_color_content(VALUE obj, VALUE color)
+{
+  short r,g,b;
+
+  color_content(NUM2INT(color),&r,&g,&b);
+  return rb_ary_new3(3,INT2FIX(r),INT2FIX(g),INT2FIX(b));
+}
+
+static VALUE
+curses_pair_content(VALUE obj, VALUE pair)
+{
+  short f,b;
+
+  pair_content(NUM2INT(pair),&f,&b);
+  return rb_ary_new3(2,INT2FIX(f),INT2FIX(b));
+}
+
+static VALUE
+curses_color_pair(VALUE obj, VALUE attrs)
+{
+  return INT2FIX(COLOR_PAIR(NUM2INT(attrs)));
+}
+
+static VALUE
+curses_pair_number(VALUE obj, VALUE attrs)
+{
+  return INT2FIX(PAIR_NUMBER(NUM2INT(attrs)));
+}
+#endif /* USE_COLOR */
+
+#ifdef USE_MOUSE
+struct mousedata {
+  MEVENT *mevent;
+};
+
+static void
+no_mevent()
+{
+  rb_raise(rb_eRuntimeError, "no such mouse event");
+}
+
+#define GetMOUSE(obj, data) do {\
+    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
+	rb_raise(rb_eSecurityError, "Insecure: operation on untainted mouse");\
+    Data_Get_Struct(obj, struct mousedata, data);\
+    if (data->mevent == 0) no_mevent();\
+} while (0)
+
+static void
+curses_mousedata_free(struct mousedata *mdata)
+{
+  if (mdata->mevent)
+    free(mdata->mevent);
+}
+
+static VALUE
+curses_getmouse(VALUE obj)
+{
+  struct mousedata *mdata;
+  VALUE val;
+
+  val = Data_Make_Struct(cMouseEvent,struct mousedata,
+			 0,curses_mousedata_free,mdata);
+  mdata->mevent = (MEVENT*)xmalloc(sizeof(MEVENT));
+  return (getmouse(mdata->mevent) == OK) ? val : Qnil;
+}
+
+static VALUE
+curses_ungetmouse(VALUE obj, VALUE mevent)
+{
+  struct mousedata *mdata;
+
+  GetMOUSE(mevent,mdata);
+  return (ungetmouse(mdata->mevent) == OK) ? Qtrue : Qfalse;
+}
+
+static VALUE
+curses_mouseinterval(VALUE obj, VALUE interval)
+{
+  return mouseinterval(NUM2INT(interval)) ? Qtrue : Qfalse;
+}
+
+static VALUE
+curses_mousemask(VALUE obj, VALUE mask)
+{
+  return INT2NUM(mousemask(NUM2UINT(mask),NULL));
+}
+
+#define DEFINE_MOUSE_GET_MEMBER(func_name,mem) \
+static VALUE func_name (VALUE mouse) \
+{ \
+  struct mousedata *mdata; \
+  GetMOUSE(mouse, mdata); \
+  return (UINT2NUM(mdata->mevent -> mem)); \
+}
+
+DEFINE_MOUSE_GET_MEMBER(curs_mouse_id, id)
+DEFINE_MOUSE_GET_MEMBER(curs_mouse_x, x)
+DEFINE_MOUSE_GET_MEMBER(curs_mouse_y, y)
+DEFINE_MOUSE_GET_MEMBER(curs_mouse_z, z)
+DEFINE_MOUSE_GET_MEMBER(curs_mouse_bstate, bstate)
+#undef define_curs_mouse_member
+#endif /* USE_MOUSE */
+
+static VALUE
+curses_timeout(VALUE obj, VALUE delay)
+{
+#ifdef HAVE_TIMEOUT
+  timeout(NUM2INT(delay));
+  return Qnil;
+#else
+    rb_notimplement();
+#endif
+}
+
+static VALUE
+curses_def_prog_mode(VALUE obj)
+{
+#ifdef HAVE_DEF_PROG_MODE
+  return def_prog_mode() == OK ? Qtrue : Qfalse;
+#else
+    rb_notimplement();
+#endif
+}
+
+static VALUE
+curses_reset_prog_mode(VALUE obj)
+{
+#ifdef HAVE_RESET_PROG_MODE
+  return reset_prog_mode() == OK ? Qtrue : Qfalse;
+#else
+    rb_notimplement();
+#endif
+}
+
+/*-------------------------- class Window --------------------------*/
+
+/* def self.allocate */
+static VALUE
+window_s_allocate(VALUE class)
+{
+    struct windata *winp;
+
+    return Data_Make_Struct(class, struct windata, 0, free_window, winp);
+}
+
+/* def initialize(h, w, top, left) */
+static VALUE
+window_initialize(obj, h, w, top, left)
+    VALUE obj;
+    VALUE h;
+    VALUE w;
+    VALUE top;
+    VALUE left;
+{
+    struct windata *winp;
+    WINDOW *window;
+
+    rb_secure(4);
+    curses_init_screen();
+    Data_Get_Struct(obj, struct windata, winp);
+    if (winp->window) delwin(winp->window);
+    window = newwin(NUM2INT(h), NUM2INT(w), NUM2INT(top), NUM2INT(left));
+    wclear(window);
+    winp->window = window;
+
+    return obj;
+}
+
+/* def subwin(height, width, top, left) */
+static VALUE
+window_subwin(obj, height, width, top, left)
+    VALUE obj;
+    VALUE height;
+    VALUE width;
+    VALUE top;
+    VALUE left;
+{
+    struct windata *winp;
+    WINDOW *window;
+    VALUE win;
+    int h, w, t, l;
+
+    h = NUM2INT(height);
+    w = NUM2INT(width);
+    t = NUM2INT(top);
+    l = NUM2INT(left);
+    GetWINDOW(obj, winp);
+    window = subwin(winp->window, h, w, t, l);
+    win = prep_window(rb_obj_class(obj), window);
+
+    return win;
+}
+
+/* def close */
+static VALUE
+window_close(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    delwin(winp->window);
+    winp->window = 0;
+
+    return Qnil;
+}
+
+/* def clear */
+static VALUE
+window_clear(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    wclear(winp->window);
+    
+    return Qnil;
+}
+
+/* def clrtoeol */
+static VALUE
+window_clrtoeol(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    wclrtoeol(winp->window);
+    
+    return Qnil;
+}
+
+/* def refresh */
+static VALUE
+window_refresh(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    wrefresh(winp->window);
+    
+    return Qnil;
+}
+
+/* def noutrefresh */
+static VALUE
+window_noutrefresh(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+
+    GetWINDOW(obj, winp);
+#ifdef HAVE_DOUPDATE
+    wnoutrefresh(winp->window);
+#else
+    wrefresh(winp->window);
+#endif
+
+    return Qnil;
+}
+
+/* def move(y, x) */
+static VALUE
+window_move(obj, y, x)
+    VALUE obj;
+    VALUE y;
+    VALUE x;
+{
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    mvwin(winp->window, NUM2INT(y), NUM2INT(x));
+
+    return Qnil;
+}
+
+/* def setpos(y, x) */
+static VALUE
+window_setpos(obj, y, x)
+    VALUE obj;
+    VALUE y;
+    VALUE x;
+{
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    wmove(winp->window, NUM2INT(y), NUM2INT(x));
+    return Qnil;
+}
+
+/* def cury */
+static VALUE
+window_cury(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    int x, y;
+
+    GetWINDOW(obj, winp);
+    getyx(winp->window, y, x);
+    return INT2FIX(y);
+}
+
+/* def curx */
+static VALUE
+window_curx(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    int x, y;
+
+    GetWINDOW(obj, winp);
+    getyx(winp->window, y, x);
+    return INT2FIX(x);
+}
+
+/* def maxy */
+static VALUE
+window_maxy(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+
+    GetWINDOW(obj, winp);
+#if defined(getmaxy)
+    return INT2FIX(getmaxy(winp->window));
+#elif defined(getmaxyx)
+    {
+	int x, y;
+	getmaxyx(winp->window, y, x);
+	return INT2FIX(y);
+    }
+#else
+    return INT2FIX(winp->window->_maxy+1);
+#endif
+}
+
+/* def maxx */
+static VALUE
+window_maxx(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+
+    GetWINDOW(obj, winp);
+#if defined(getmaxx)
+    return INT2FIX(getmaxx(winp->window));
+#elif defined(getmaxyx)
+    {
+	int x, y;
+	getmaxyx(winp->window, y, x);
+	return INT2FIX(x);
+    }
+#else
+    return INT2FIX(winp->window->_maxx+1);
+#endif
+}
+
+/* def begy */
+static VALUE
+window_begy(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    int x, y;
+
+    GetWINDOW(obj, winp);
+#ifdef getbegyx
+    getbegyx(winp->window, y, x);
+    return INT2FIX(y);
+#else
+    return INT2FIX(winp->window->_begy);
+#endif
+}
+
+/* def begx */
+static VALUE
+window_begx(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    int x, y;
+
+    GetWINDOW(obj, winp);
+#ifdef getbegyx
+    getbegyx(winp->window, y, x);
+    return INT2FIX(x);
+#else
+    return INT2FIX(winp->window->_begx);
+#endif
+}
+
+/* def box(vert, hor) */
+static VALUE
+window_box(argc, argv, self)
+    int argc;
+    VALUE argv[], self;
+{
+    struct windata *winp; 
+    VALUE vert, hor, corn;
+
+    rb_scan_args(argc, argv, "21", &vert, &hor, &corn);
+
+    GetWINDOW(self, winp);
+    box(winp->window, NUM2CH(vert), NUM2CH(hor));
+
+    if (!NIL_P(corn)) {
+      int cur_x, cur_y, x, y;
+      chtype c;
+
+      c = NUM2CH(corn);
+      getyx(winp->window, cur_y, cur_x);
+      x = NUM2INT(window_maxx(self)) - 1;
+      y = NUM2INT(window_maxy(self)) - 1;
+      wmove(winp->window, 0, 0);
+      waddch(winp->window, c);
+      wmove(winp->window, y, 0);
+      waddch(winp->window, c);
+      wmove(winp->window, y, x);
+      waddch(winp->window, c);
+      wmove(winp->window, 0, x);
+      waddch(winp->window, c);
+      wmove(winp->window, cur_y, cur_x);
+    }
+    
+    return Qnil;
+}
+
+/* def standout */
+static VALUE
+window_standout(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    wstandout(winp->window);
+    return Qnil;
+}
+
+/* def standend */
+static VALUE
+window_standend(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    wstandend(winp->window);
+    return Qnil;
+}
+
+/* def inch */
+static VALUE
+window_inch(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    return CH2FIX(winch(winp->window));
+}
+
+/* def addch(ch) */
+static VALUE
+window_addch(obj, ch)
+    VALUE obj;
+    VALUE ch;
+{
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    waddch(winp->window, NUM2CH(ch));
+    
+    return Qnil;
+}
+
+/* def insch(ch) */
+static VALUE
+window_insch(obj, ch)
+    VALUE obj;
+    VALUE ch;
+{
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    winsch(winp->window, NUM2CH(ch));
+    
+    return Qnil;
+}
+
+/* def addstr(str) */
+static VALUE
+window_addstr(obj, str)
+    VALUE obj;
+    VALUE str;
+{
+    if (!NIL_P(str)) {
+	struct windata *winp;
+
+	GetWINDOW(obj, winp);
+	waddstr(winp->window, STR2CSTR(str));
+    }
+    return Qnil;
+}
+
+/* def <<(str) */
+static VALUE
+window_addstr2(obj, str)
+    VALUE obj;
+    VALUE str;
+{
+    window_addstr(obj, str);
+    return obj;
+}
+
+/* def getch */
+static VALUE
+window_getch(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    
+    rb_read_check(stdin);
+    GetWINDOW(obj, winp);
+    return UINT2NUM(wgetch(winp->window));
+}
+
+/* def getstr */
+static VALUE
+window_getstr(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    char rtn[1024]; /* This should be big enough.. I hope */
+    
+    GetWINDOW(obj, winp);
+    rb_read_check(stdin);
+#if defined(HAVE_WGETNSTR)
+    wgetnstr(winp->window, rtn, 1023);
+#else
+    wgetstr(winp->window, rtn);
+#endif
+    return rb_tainted_str_new2(rtn);
+}
+
+/* def delch */
+static VALUE
+window_delch(obj)
+    VALUE obj;
+{
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    wdelch(winp->window);
+    return Qnil;
+}
+
+/* def delelteln */
+static VALUE
+window_deleteln(obj)
+    VALUE obj;
+{
+#if defined(HAVE_WDELETELN) || defined(wdeleteln)
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    wdeleteln(winp->window);
+#endif
+    return Qnil;
+}
+
+/* def insertln */
+static VALUE
+window_insertln(obj)
+    VALUE obj;
+{
+#if defined(HAVE_WINSERTLN) || defined(winsertln)
+    struct windata *winp;
+    
+    GetWINDOW(obj, winp);
+    winsertln(winp->window);
+#endif
+    return Qnil;
+}
+
+static VALUE
+window_scrollok(VALUE obj, VALUE bf)
+{
+  struct windata *winp;
+
+  GetWINDOW(obj, winp);
+  scrollok(winp->window, RTEST(bf) ? TRUE : FALSE);
+  return Qnil;
+}
+
+static VALUE
+window_idlok(VALUE obj, VALUE bf)
+{
+  struct windata *winp;
+
+  GetWINDOW(obj, winp);
+  idlok(winp->window, RTEST(bf) ? TRUE : FALSE);
+  return Qnil;
+}
+
+static VALUE
+window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
+{
+#ifdef HAVE_WSETSCRREG
+  struct windata *winp;
+  int res;
+
+  GetWINDOW(obj, winp);
+  res = wsetscrreg(winp->window, NUM2INT(top), NUM2INT(bottom));
+  /* may have to raise exception on ERR */
+  return (res == OK) ? Qtrue : Qfalse;
+#else
+  return Qfalse;
+#endif
+}
+
+#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
+static VALUE
+window_color_set(VALUE obj, VALUE col) 
+{
+  struct windata *winp;
+  int res;
+
+  GetWINDOW(obj, winp);
+  res = wcolor_set(winp->window, NUM2INT(col), NULL);
+  return (res == OK) ? Qtrue : Qfalse;
+}
+#endif /* USE_COLOR */
+
+static VALUE
+window_scroll(VALUE obj)
+{
+  struct windata *winp;
+
+  GetWINDOW(obj, winp);
+  /* may have to raise exception on ERR */
+  return (scroll(winp->window) == OK) ? Qtrue : Qfalse;
+}
+
+static VALUE
+window_scrl(VALUE obj, VALUE n)
+{
+#ifdef HAVE_WSCRL
+  struct windata *winp;
+
+  GetWINDOW(obj, winp);
+  /* may have to raise exception on ERR */
+  return (wscrl(winp->window,NUM2INT(n)) == OK) ? Qtrue : Qfalse;
+#else
+  return Qfalse;
+#endif
+}
+
+static VALUE
+window_attroff(VALUE obj, VALUE attrs)
+{
+#ifdef HAVE_WATTROFF
+  struct windata *winp;
+
+  GetWINDOW(obj,winp);
+  return INT2FIX(wattroff(winp->window,NUM2INT(attrs)));
+#else
+  return Qtrue;
+#endif
+}
+
+static VALUE
+window_attron(VALUE obj, VALUE attrs)
+{
+#ifdef HAVE_WATTRON
+  struct windata *winp;
+  VALUE val;
+
+  GetWINDOW(obj,winp);
+  val = INT2FIX(wattron(winp->window,NUM2INT(attrs)));
+  if( rb_block_given_p() ){
+    rb_yield(val);
+    wattroff(winp->window,NUM2INT(attrs));
+    return val;
+  }
+  else{
+    return val;
+  }
+#else
+  return Qtrue;
+#endif
+}
+
+static VALUE
+window_attrset(VALUE obj, VALUE attrs)
+{
+#ifdef HAVE_WATTRSET
+  struct windata *winp;
+
+  GetWINDOW(obj,winp);
+  return INT2FIX(wattrset(winp->window,NUM2INT(attrs)));
+#else
+  return Qtrue;
+#endif
+}
+
+static VALUE
+window_bkgdset(VALUE obj, VALUE ch)
+{
+#ifdef HAVE_WBKGDSET
+  struct windata *winp;
+
+  GetWINDOW(obj,winp);
+  wbkgdset(winp->window, NUM2CH(ch));
+#endif
+  return Qnil;
+}
+
+static VALUE
+window_bkgd(VALUE obj, VALUE ch)
+{
+#ifdef HAVE_WBKGD
+  struct windata *winp;
+
+  GetWINDOW(obj,winp);
+  return (wbkgd(winp->window, NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
+#else
+  return Qfalse;
+#endif
+}
+
+static VALUE
+window_getbkgd(VALUE obj)
+{
+#ifdef HAVE_WGETBKGD
+  chtype c;
+  struct windata *winp;
+
+  GetWINDOW(obj,winp);
+  return (c = getbkgd(winp->window) != ERR) ? CH2FIX(c) : Qnil;
+#else
+  return Qnil;
+#endif
+}
+
+static VALUE
+window_resize(VALUE obj, VALUE lin, VALUE col)
+{
+#if defined(HAVE_WRESIZE)
+  struct windata *winp;
+
+  GetWINDOW(obj,winp);
+  return wresize(winp->window, NUM2INT(lin), NUM2INT(col)) == OK ? Qtrue : Qfalse;
+#else
+  return Qnil;
+#endif
+}
+
+
+static VALUE
+window_keypad(VALUE obj, VALUE val)
+{
+#ifdef HAVE_KEYPAD
+  struct windata *winp;
+
+  GetWINDOW(obj,winp);
+  /* keypad() of NetBSD's libcurses returns no value */
+#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
+  keypad(winp->window,(RTEST(val) ? TRUE : FALSE));
+  return Qnil;
+#else
+  /* may have to raise exception on ERR */
+  return (keypad(winp->window,RTEST(val) ? TRUE : FALSE)) == OK ?
+    Qtrue : Qfalse;
+#endif
+#else
+    rb_notimplement();
+#endif /* HAVE_KEYPAD */
+}
+
+static VALUE
+window_nodelay(VALUE obj, VALUE val)
+{
+#ifdef HAVE_NODELAY
+  struct windata *winp;
+  GetWINDOW(obj,winp);
+
+  /* nodelay() of NetBSD's libcurses returns no value */
+#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
+  nodelay(winp->window, RTEST(val) ? TRUE : FALSE);
+  return Qnil;
+#else
+  return nodelay(winp->window,RTEST(val) ? TRUE : FALSE) == OK ? Qtrue : Qfalse;
+#endif
+#else
+    rb_notimplement();
+#endif
+}
+
+static VALUE
+window_timeout(VALUE obj, VALUE delay)
+{
+#ifdef HAVE_WTIMEOUT
+  struct windata *winp;
+  GetWINDOW(obj,winp);
+
+  wtimeout(winp->window,NUM2INT(delay));
+  return Qnil;
+#else
+    rb_notimplement();
+#endif
+}
+
+/*------------------------- Initialization -------------------------*/
+void
+Init_curses()
+{
+    mCurses    = rb_define_module("Curses");
+    mKey       = rb_define_module_under(mCurses, "Key");
+
+    rb_gc_register_address(&rb_stdscr);
+
+#ifdef USE_MOUSE
+    cMouseEvent = rb_define_class_under(mCurses,"MouseEvent",rb_cObject);
+    rb_undef_method(CLASS_OF(cMouseEvent),"new");
+    rb_define_method(cMouseEvent, "eid", curs_mouse_id, 0);
+    rb_define_method(cMouseEvent, "x", curs_mouse_x, 0);
+    rb_define_method(cMouseEvent, "y", curs_mouse_y, 0);
+    rb_define_method(cMouseEvent, "z", curs_mouse_z, 0);
+    rb_define_method(cMouseEvent, "bstate", curs_mouse_bstate, 0);
+#endif /* USE_MOUSE */
+
+    rb_define_module_function(mCurses, "init_screen", curses_init_screen, 0);
+    rb_define_module_function(mCurses, "close_screen", curses_close_screen, 0);
+    rb_define_module_function(mCurses, "closed?", curses_closed, 0);
+    rb_define_module_function(mCurses, "stdscr", curses_stdscr, 0);
+    rb_define_module_function(mCurses, "refresh", curses_refresh, 0);
+    rb_define_module_function(mCurses, "doupdate", curses_doupdate, 0);
+    rb_define_module_function(mCurses, "clear", curses_clear, 0);
+    rb_define_module_function(mCurses, "clrtoeol", curses_clrtoeol, 0);
+    rb_define_module_function(mCurses, "echo", curses_echo, 0);
+    rb_define_module_function(mCurses, "noecho", curses_noecho, 0);
+    rb_define_module_function(mCurses, "raw", curses_raw, 0);
+    rb_define_module_function(mCurses, "noraw", curses_noraw, 0);
+    rb_define_module_function(mCurses, "cbreak", curses_cbreak, 0);
+    rb_define_module_function(mCurses, "nocbreak", curses_nocbreak, 0);
+    rb_define_alias(mCurses, "crmode", "cbreak");
+    rb_define_alias(mCurses, "nocrmode", "nocbreak");
+    rb_define_module_function(mCurses, "nl", curses_nl, 0);
+    rb_define_module_function(mCurses, "nonl", curses_nonl, 0);
+    rb_define_module_function(mCurses, "beep", curses_beep, 0);
+    rb_define_module_function(mCurses, "flash", curses_flash, 0);
+    rb_define_module_function(mCurses, "ungetch", curses_ungetch, 1);
+    rb_define_module_function(mCurses, "setpos", curses_setpos, 2);
+    rb_define_module_function(mCurses, "standout", curses_standout, 0);
+    rb_define_module_function(mCurses, "standend", curses_standend, 0);
+    rb_define_module_function(mCurses, "inch", curses_inch, 0);
+    rb_define_module_function(mCurses, "addch", curses_addch, 1);
+    rb_define_module_function(mCurses, "insch", curses_insch, 1);
+    rb_define_module_function(mCurses, "addstr", curses_addstr, 1);
+    rb_define_module_function(mCurses, "getch", curses_getch, 0);
+    rb_define_module_function(mCurses, "getstr", curses_getstr, 0);
+    rb_define_module_function(mCurses, "delch", curses_delch, 0);
+    rb_define_module_function(mCurses, "deleteln", curses_deleteln, 0);
+    rb_define_module_function(mCurses, "insertln", curses_insertln, 0);
+    rb_define_module_function(mCurses, "keyname", curses_keyname, 1);
+    rb_define_module_function(mCurses, "lines", curses_lines, 0);
+    rb_define_module_function(mCurses, "cols", curses_cols, 0);
+    rb_define_module_function(mCurses, "curs_set", curses_curs_set, 1);
+    rb_define_module_function(mCurses, "scrl", curses_scrl, 1);
+    rb_define_module_function(mCurses, "setscrreg", curses_setscrreg, 2);
+    rb_define_module_function(mCurses, "attroff", curses_attroff, 1);
+    rb_define_module_function(mCurses, "attron", curses_attron, 1);
+    rb_define_module_function(mCurses, "attrset", curses_attrset, 1);
+    rb_define_module_function(mCurses, "bkgdset", curses_bkgdset, 1);
+    rb_define_module_function(mCurses, "bkgd", curses_bkgd, 1);
+    rb_define_module_function(mCurses, "resizeterm", curses_resizeterm, 2);
+    rb_define_module_function(mCurses, "resize", curses_resizeterm, 2);
+#ifdef USE_COLOR
+    rb_define_module_function(mCurses, "start_color", curses_start_color, 0);
+    rb_define_module_function(mCurses, "init_pair", curses_init_pair, 3);
+    rb_define_module_function(mCurses, "init_color", curses_init_color, 4);
+    rb_define_module_function(mCurses, "has_colors?", curses_has_colors, 0);
+    rb_define_module_function(mCurses, "can_change_color?",
+			      curses_can_change_color, 0);
+    rb_define_module_function(mCurses, "color_content", curses_color_content, 1);
+    rb_define_module_function(mCurses, "pair_content", curses_pair_content, 1);
+    rb_define_module_function(mCurses, "color_pair", curses_color_pair, 1);
+    rb_define_module_function(mCurses, "pair_number", curses_pair_number, 1);
+#endif /* USE_COLOR */
+#ifdef USE_MOUSE
+    rb_define_module_function(mCurses, "getmouse", curses_getmouse, 0);
+    rb_define_module_function(mCurses, "ungetmouse", curses_ungetmouse, 1);
+    rb_define_module_function(mCurses, "mouseinterval", curses_mouseinterval, 1);
+    rb_define_module_function(mCurses, "mousemask", curses_mousemask, 1);
+#endif /* USE_MOUSE */
+
+    rb_define_module_function(mCurses, "timeout=", curses_timeout, 1);
+    rb_define_module_function(mCurses, "def_prog_mode", curses_def_prog_mode, 0);
+    rb_define_module_function(mCurses, "reset_prog_mode", curses_reset_prog_mode, 0);
+
+    cWindow = rb_define_class_under(mCurses, "Window", rb_cData);
+    rb_define_alloc_func(cWindow, window_s_allocate);
+    rb_define_method(cWindow, "initialize", window_initialize, 4);
+    rb_define_method(cWindow, "subwin", window_subwin, 4);
+    rb_define_method(cWindow, "close", window_close, 0);
+    rb_define_method(cWindow, "clear", window_clear, 0);
+    rb_define_method(cWindow, "clrtoeol", window_clrtoeol, 0);
+    rb_define_method(cWindow, "refresh", window_refresh, 0);
+    rb_define_method(cWindow, "noutrefresh", window_noutrefresh, 0);
+    rb_define_method(cWindow, "box", window_box, -1);
+    rb_define_method(cWindow, "move", window_move, 2);
+    rb_define_method(cWindow, "setpos", window_setpos, 2);
+#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
+    rb_define_method(cWindow, "color_set", window_color_set, 1);
+#endif /* USE_COLOR && HAVE_WCOLOR_SET */
+    rb_define_method(cWindow, "cury", window_cury, 0);
+    rb_define_method(cWindow, "curx", window_curx, 0);
+    rb_define_method(cWindow, "maxy", window_maxy, 0);
+    rb_define_method(cWindow, "maxx", window_maxx, 0);
+    rb_define_method(cWindow, "begy", window_begy, 0);
+    rb_define_method(cWindow, "begx", window_begx, 0);
+    rb_define_method(cWindow, "standout", window_standout, 0);
+    rb_define_method(cWindow, "standend", window_standend, 0);
+    rb_define_method(cWindow, "inch", window_inch, 0);
+    rb_define_method(cWindow, "addch", window_addch, 1);
+    rb_define_method(cWindow, "insch", window_insch, 1);
+    rb_define_method(cWindow, "addstr", window_addstr, 1);
+    rb_define_method(cWindow, "<<", window_addstr2, 1);
+    rb_define_method(cWindow, "getch", window_getch, 0);
+    rb_define_method(cWindow, "getstr", window_getstr, 0);
+    rb_define_method(cWindow, "delch", window_delch, 0);
+    rb_define_method(cWindow, "deleteln", window_deleteln, 0);
+    rb_define_method(cWindow, "insertln", window_insertln, 0);
+    rb_define_method(cWindow, "scroll", window_scroll, 0);
+    rb_define_method(cWindow, "scrollok", window_scrollok, 1);
+    rb_define_method(cWindow, "idlok", window_idlok, 1);
+    rb_define_method(cWindow, "setscrreg", window_setscrreg, 2);
+    rb_define_method(cWindow, "scrl", window_scrl, 1);
+    rb_define_method(cWindow, "resize", window_resize, 2);
+    rb_define_method(cWindow, "keypad", window_keypad, 1);
+    rb_define_method(cWindow, "keypad=", window_keypad, 1);
+
+    rb_define_method(cWindow, "attroff", window_attroff, 1);
+    rb_define_method(cWindow, "attron", window_attron, 1);
+    rb_define_method(cWindow, "attrset", window_attrset, 1);
+    rb_define_method(cWindow, "bkgdset", window_bkgdset, 1);
+    rb_define_method(cWindow, "bkgd", window_bkgd, 1);
+    rb_define_method(cWindow, "getbkgd", window_getbkgd, 0);
+
+    rb_define_method(cWindow, "nodelay=", window_nodelay, 1);
+    rb_define_method(cWindow, "timeout=", window_timeout, 1);
+
+#define rb_curses_define_const(c) rb_define_const(mCurses,#c,UINT2NUM(c))
+
+#ifdef USE_COLOR
+    rb_curses_define_const(A_ATTRIBUTES);
+#ifdef A_NORMAL
+    rb_curses_define_const(A_NORMAL);
+#endif
+    rb_curses_define_const(A_STANDOUT);
+    rb_curses_define_const(A_UNDERLINE);
+    rb_curses_define_const(A_REVERSE);
+    rb_curses_define_const(A_BLINK);
+    rb_curses_define_const(A_DIM);
+    rb_curses_define_const(A_BOLD);
+    rb_curses_define_const(A_PROTECT);
+#ifdef A_INVIS /* for NetBSD */
+    rb_curses_define_const(A_INVIS);
+#endif
+    rb_curses_define_const(A_ALTCHARSET);
+    rb_curses_define_const(A_CHARTEXT);
+#ifdef A_HORIZONTAL
+    rb_curses_define_const(A_HORIZONTAL);
+#endif
+#ifdef A_LEFT
+    rb_curses_define_const(A_LEFT);
+#endif
+#ifdef A_LOW
+    rb_curses_define_const(A_LOW);
+#endif
+#ifdef A_RIGHT
+    rb_curses_define_const(A_RIGHT);
+#endif
+#ifdef A_TOP
+    rb_curses_define_const(A_TOP);
+#endif
+#ifdef A_VERTICAL
+    rb_curses_define_const(A_VERTICAL);
+#endif
+    rb_curses_define_const(A_COLOR);
+
+#ifdef COLORS
+    rb_curses_define_const(COLORS);
+#endif
+    rb_curses_define_const(COLOR_BLACK);
+    rb_curses_define_const(COLOR_RED);
+    rb_curses_define_const(COLOR_GREEN);
+    rb_curses_define_const(COLOR_YELLOW);
+    rb_curses_define_const(COLOR_BLUE);
+    rb_curses_define_const(COLOR_MAGENTA);
+    rb_curses_define_const(COLOR_CYAN);
+    rb_curses_define_const(COLOR_WHITE);
+#endif /* USE_COLOR */
+#ifdef USE_MOUSE
+#ifdef BUTTON1_PRESSED
+    rb_curses_define_const(BUTTON1_PRESSED);
+#endif
+#ifdef BUTTON1_RELEASED
+    rb_curses_define_const(BUTTON1_RELEASED);
+#endif
+#ifdef BUTTON1_CLICKED
+    rb_curses_define_const(BUTTON1_CLICKED);
+#endif
+#ifdef BUTTON1_DOUBLE_CLICKED
+    rb_curses_define_const(BUTTON1_DOUBLE_CLICKED);
+#endif
+#ifdef BUTTON1_TRIPLE_CLICKED
+    rb_curses_define_const(BUTTON1_TRIPLE_CLICKED);
+#endif
+#ifdef BUTTON2_PRESSED
+    rb_curses_define_const(BUTTON2_PRESSED);
+#endif
+#ifdef BUTTON2_RELEASED
+    rb_curses_define_const(BUTTON2_RELEASED);
+#endif
+#ifdef BUTTON2_CLICKED
+    rb_curses_define_const(BUTTON2_CLICKED);
+#endif
+#ifdef BUTTON2_DOUBLE_CLICKED
+    rb_curses_define_const(BUTTON2_DOUBLE_CLICKED);
+#endif
+#ifdef BUTTON2_TRIPLE_CLICKED
+    rb_curses_define_const(BUTTON2_TRIPLE_CLICKED);
+#endif
+#ifdef BUTTON3_PRESSED
+    rb_curses_define_const(BUTTON3_PRESSED);
+#endif
+#ifdef BUTTON3_RELEASED
+    rb_curses_define_const(BUTTON3_RELEASED);
+#endif
+#ifdef BUTTON3_CLICKED
+    rb_curses_define_const(BUTTON3_CLICKED);
+#endif
+#ifdef BUTTON3_DOUBLE_CLICKED
+    rb_curses_define_const(BUTTON3_DOUBLE_CLICKED);
+#endif
+#ifdef BUTTON3_TRIPLE_CLICKED
+    rb_curses_define_const(BUTTON3_TRIPLE_CLICKED);
+#endif
+#ifdef BUTTON4_PRESSED
+    rb_curses_define_const(BUTTON4_PRESSED);
+#endif
+#ifdef BUTTON4_RELEASED
+    rb_curses_define_const(BUTTON4_RELEASED);
+#endif
+#ifdef BUTTON4_CLICKED
+    rb_curses_define_const(BUTTON4_CLICKED);
+#endif
+#ifdef BUTTON4_DOUBLE_CLICKED
+    rb_curses_define_const(BUTTON4_DOUBLE_CLICKED);
+#endif
+#ifdef BUTTON4_TRIPLE_CLICKED
+    rb_curses_define_const(BUTTON4_TRIPLE_CLICKED);
+#endif
+#ifdef BUTTON_SHIFT
+    rb_curses_define_const(BUTTON_SHIFT);
+#endif
+#ifdef BUTTON_CTRL
+    rb_curses_define_const(BUTTON_CTRL);
+#endif
+#ifdef BUTTON_ALT
+    rb_curses_define_const(BUTTON_ALT);
+#endif
+#ifdef ALL_MOUSE_EVENTS
+    rb_curses_define_const(ALL_MOUSE_EVENTS);
+#endif
+#ifdef REPORT_MOUSE_POSITION
+    rb_curses_define_const(REPORT_MOUSE_POSITION);
+#endif
+#endif /* USE_MOUSE */
+
+#if defined(KEY_MOUSE) && defined(USE_MOUSE)
+    rb_curses_define_const(KEY_MOUSE);
+    rb_define_const(mKey, "MOUSE", INT2NUM(KEY_MOUSE));
+#endif
+#ifdef KEY_MIN
+    rb_curses_define_const(KEY_MIN);
+    rb_define_const(mKey, "MIN", INT2NUM(KEY_MIN));
+#endif
+#ifdef KEY_BREAK
+    rb_curses_define_const(KEY_BREAK);
+    rb_define_const(mKey, "BREAK", INT2NUM(KEY_BREAK));
+#endif
+#ifdef KEY_DOWN
+    rb_curses_define_const(KEY_DOWN);
+    rb_define_const(mKey, "DOWN", INT2NUM(KEY_DOWN));
+#endif
+#ifdef KEY_UP
+    rb_curses_define_const(KEY_UP);
+    rb_define_const(mKey, "UP", INT2NUM(KEY_UP));
+#endif
+#ifdef KEY_LEFT
+    rb_curses_define_const(KEY_LEFT);
+    rb_define_const(mKey, "LEFT", INT2NUM(KEY_LEFT));
+#endif
+#ifdef KEY_RIGHT
+    rb_curses_define_const(KEY_RIGHT);
+    rb_define_const(mKey, "RIGHT", INT2NUM(KEY_RIGHT));
+#endif
+#ifdef KEY_HOME
+    rb_curses_define_const(KEY_HOME);
+    rb_define_const(mKey, "HOME", INT2NUM(KEY_HOME));
+#endif
+#ifdef KEY_BACKSPACE
+    rb_curses_define_const(KEY_BACKSPACE);
+    rb_define_const(mKey, "BACKSPACE", INT2NUM(KEY_BACKSPACE));
+#endif
+#ifdef KEY_F
+    /* KEY_F(n) : 0 <= n <= 63 */
+    {
+      int i;
+      char c[8];
+      for( i=0; i<64; i++ ){
+	sprintf(c, "KEY_F%d", i);
+	rb_define_const(mCurses, c, INT2NUM(KEY_F(i)));
+	sprintf(c, "F%d", i);
+	rb_define_const(mKey, c, INT2NUM(KEY_F(i)));
+      }
+    }
+#endif
+#ifdef KEY_DL
+    rb_curses_define_const(KEY_DL);
+    rb_define_const(mKey, "DL", INT2NUM(KEY_DL));
+#endif
+#ifdef KEY_IL
+    rb_curses_define_const(KEY_IL);
+    rb_define_const(mKey, "IL", INT2NUM(KEY_IL));
+#endif
+#ifdef KEY_DC
+    rb_curses_define_const(KEY_DC);
+    rb_define_const(mKey, "DC", INT2NUM(KEY_DC));
+#endif
+#ifdef KEY_IC
+    rb_curses_define_const(KEY_IC);
+    rb_define_const(mKey, "IC", INT2NUM(KEY_IC));
+#endif
+#ifdef KEY_EIC
+    rb_curses_define_const(KEY_EIC);
+    rb_define_const(mKey, "EIC", INT2NUM(KEY_EIC));
+#endif
+#ifdef KEY_CLEAR
+    rb_curses_define_const(KEY_CLEAR);
+    rb_define_const(mKey, "CLEAR", INT2NUM(KEY_CLEAR));
+#endif
+#ifdef KEY_EOS
+    rb_curses_define_const(KEY_EOS);
+    rb_define_const(mKey, "EOS", INT2NUM(KEY_EOS));
+#endif
+#ifdef KEY_EOL
+    rb_curses_define_const(KEY_EOL);
+    rb_define_const(mKey, "EOL", INT2NUM(KEY_EOL));
+#endif
+#ifdef KEY_SF
+    rb_curses_define_const(KEY_SF);
+    rb_define_const(mKey, "SF", INT2NUM(KEY_SF));
+#endif
+#ifdef KEY_SR
+    rb_curses_define_const(KEY_SR);
+    rb_define_const(mKey, "SR", INT2NUM(KEY_SR));
+#endif
+#ifdef KEY_NPAGE
+    rb_curses_define_const(KEY_NPAGE);
+    rb_define_const(mKey, "NPAGE", INT2NUM(KEY_NPAGE));
+#endif
+#ifdef KEY_PPAGE
+    rb_curses_define_const(KEY_PPAGE);
+    rb_define_const(mKey, "PPAGE", INT2NUM(KEY_PPAGE));
+#endif
+#ifdef KEY_STAB
+    rb_curses_define_const(KEY_STAB);
+    rb_define_const(mKey, "STAB", INT2NUM(KEY_STAB));
+#endif
+#ifdef KEY_CTAB
+    rb_curses_define_const(KEY_CTAB);
+    rb_define_const(mKey, "CTAB", INT2NUM(KEY_CTAB));
+#endif
+#ifdef KEY_CATAB
+    rb_curses_define_const(KEY_CATAB);
+    rb_define_const(mKey, "CATAB", INT2NUM(KEY_CATAB));
+#endif
+#ifdef KEY_ENTER
+    rb_curses_define_const(KEY_ENTER);
+    rb_define_const(mKey, "ENTER", INT2NUM(KEY_ENTER));
+#endif
+#ifdef KEY_SRESET
+    rb_curses_define_const(KEY_SRESET);
+    rb_define_const(mKey, "SRESET", INT2NUM(KEY_SRESET));
+#endif
+#ifdef KEY_RESET
+    rb_curses_define_const(KEY_RESET);
+    rb_define_const(mKey, "RESET", INT2NUM(KEY_RESET));
+#endif
+#ifdef KEY_PRINT
+    rb_curses_define_const(KEY_PRINT);
+    rb_define_const(mKey, "PRINT", INT2NUM(KEY_PRINT));
+#endif
+#ifdef KEY_LL
+    rb_curses_define_const(KEY_LL);
+    rb_define_const(mKey, "LL", INT2NUM(KEY_LL));
+#endif
+#ifdef KEY_A1
+    rb_curses_define_const(KEY_A1);
+    rb_define_const(mKey, "A1", INT2NUM(KEY_A1));
+#endif
+#ifdef KEY_A3
+    rb_curses_define_const(KEY_A3);
+    rb_define_const(mKey, "A3", INT2NUM(KEY_A3));
+#endif
+#ifdef KEY_B2
+    rb_curses_define_const(KEY_B2);
+    rb_define_const(mKey, "B2", INT2NUM(KEY_B2));
+#endif
+#ifdef KEY_C1
+    rb_curses_define_const(KEY_C1);
+    rb_define_const(mKey, "C1", INT2NUM(KEY_C1));
+#endif
+#ifdef KEY_C3
+    rb_curses_define_const(KEY_C3);
+    rb_define_const(mKey, "C3", INT2NUM(KEY_C3));
+#endif
+#ifdef KEY_BTAB
+    rb_curses_define_const(KEY_BTAB);
+    rb_define_const(mKey, "BTAB", INT2NUM(KEY_BTAB));
+#endif
+#ifdef KEY_BEG
+    rb_curses_define_const(KEY_BEG);
+    rb_define_const(mKey, "BEG", INT2NUM(KEY_BEG));
+#endif
+#ifdef KEY_CANCEL
+    rb_curses_define_const(KEY_CANCEL);
+    rb_define_const(mKey, "CANCEL", INT2NUM(KEY_CANCEL));
+#endif
+#ifdef KEY_CLOSE
+    rb_curses_define_const(KEY_CLOSE);
+    rb_define_const(mKey, "CLOSE", INT2NUM(KEY_CLOSE));
+#endif
+#ifdef KEY_COMMAND
+    rb_curses_define_const(KEY_COMMAND);
+    rb_define_const(mKey, "COMMAND", INT2NUM(KEY_COMMAND));
+#endif
+#ifdef KEY_COPY
+    rb_curses_define_const(KEY_COPY);
+    rb_define_const(mKey, "COPY", INT2NUM(KEY_COPY));
+#endif
+#ifdef KEY_CREATE
+    rb_curses_define_const(KEY_CREATE);
+    rb_define_const(mKey, "CREATE", INT2NUM(KEY_CREATE));
+#endif
+#ifdef KEY_END
+    rb_curses_define_const(KEY_END);
+    rb_define_const(mKey, "END", INT2NUM(KEY_END));
+#endif
+#ifdef KEY_EXIT
+    rb_curses_define_const(KEY_EXIT);
+    rb_define_const(mKey, "EXIT", INT2NUM(KEY_EXIT));
+#endif
+#ifdef KEY_FIND
+    rb_curses_define_const(KEY_FIND);
+    rb_define_const(mKey, "FIND", INT2NUM(KEY_FIND));
+#endif
+#ifdef KEY_HELP
+    rb_curses_define_const(KEY_HELP);
+    rb_define_const(mKey, "HELP", INT2NUM(KEY_HELP));
+#endif
+#ifdef KEY_MARK
+    rb_curses_define_const(KEY_MARK);
+    rb_define_const(mKey, "MARK", INT2NUM(KEY_MARK));
+#endif
+#ifdef KEY_MESSAGE
+    rb_curses_define_const(KEY_MESSAGE);
+    rb_define_const(mKey, "MESSAGE", INT2NUM(KEY_MESSAGE));
+#endif
+#ifdef KEY_MOVE
+    rb_curses_define_const(KEY_MOVE);
+    rb_define_const(mKey, "MOVE", INT2NUM(KEY_MOVE));
+#endif
+#ifdef KEY_NEXT
+    rb_curses_define_const(KEY_NEXT);
+    rb_define_const(mKey, "NEXT", INT2NUM(KEY_NEXT));
+#endif
+#ifdef KEY_OPEN
+    rb_curses_define_const(KEY_OPEN);
+    rb_define_const(mKey, "OPEN", INT2NUM(KEY_OPEN));
+#endif
+#ifdef KEY_OPTIONS
+    rb_curses_define_const(KEY_OPTIONS);
+    rb_define_const(mKey, "OPTIONS", INT2NUM(KEY_OPTIONS));
+#endif
+#ifdef KEY_PREVIOUS
+    rb_curses_define_const(KEY_PREVIOUS);
+    rb_define_const(mKey, "PREVIOUS", INT2NUM(KEY_PREVIOUS));
+#endif
+#ifdef KEY_REDO
+    rb_curses_define_const(KEY_REDO);
+    rb_define_const(mKey, "REDO", INT2NUM(KEY_REDO));
+#endif
+#ifdef KEY_REFERENCE
+    rb_curses_define_const(KEY_REFERENCE);
+    rb_define_const(mKey, "REFERENCE", INT2NUM(KEY_REFERENCE));
+#endif
+#ifdef KEY_REFRESH
+    rb_curses_define_const(KEY_REFRESH);
+    rb_define_const(mKey, "REFRESH", INT2NUM(KEY_REFRESH));
+#endif
+#ifdef KEY_REPLACE
+    rb_curses_define_const(KEY_REPLACE);
+    rb_define_const(mKey, "REPLACE", INT2NUM(KEY_REPLACE));
+#endif
+#ifdef KEY_RESTART
+    rb_curses_define_const(KEY_RESTART);
+    rb_define_const(mKey, "RESTART", INT2NUM(KEY_RESTART));
+#endif
+#ifdef KEY_RESUME
+    rb_curses_define_const(KEY_RESUME);
+    rb_define_const(mKey, "RESUME", INT2NUM(KEY_RESUME));
+#endif
+#ifdef KEY_SAVE
+    rb_curses_define_const(KEY_SAVE);
+    rb_define_const(mKey, "SAVE", INT2NUM(KEY_SAVE));
+#endif
+#ifdef KEY_SBEG
+    rb_curses_define_const(KEY_SBEG);
+    rb_define_const(mKey, "SBEG", INT2NUM(KEY_SBEG));
+#endif
+#ifdef KEY_SCANCEL
+    rb_curses_define_const(KEY_SCANCEL);
+    rb_define_const(mKey, "SCANCEL", INT2NUM(KEY_SCANCEL));
+#endif
+#ifdef KEY_SCOMMAND
+    rb_curses_define_const(KEY_SCOMMAND);
+    rb_define_const(mKey, "SCOMMAND", INT2NUM(KEY_SCOMMAND));
+#endif
+#ifdef KEY_SCOPY
+    rb_curses_define_const(KEY_SCOPY);
+    rb_define_const(mKey, "SCOPY", INT2NUM(KEY_SCOPY));
+#endif
+#ifdef KEY_SCREATE
+    rb_curses_define_const(KEY_SCREATE);
+    rb_define_const(mKey, "SCREATE", INT2NUM(KEY_SCREATE));
+#endif
+#ifdef KEY_SDC
+    rb_curses_define_const(KEY_SDC);
+    rb_define_const(mKey, "SDC", INT2NUM(KEY_SDC));
+#endif
+#ifdef KEY_SDL
+    rb_curses_define_const(KEY_SDL);
+    rb_define_const(mKey, "SDL", INT2NUM(KEY_SDL));
+#endif
+#ifdef KEY_SELECT
+    rb_curses_define_const(KEY_SELECT);
+    rb_define_const(mKey, "SELECT", INT2NUM(KEY_SELECT));
+#endif
+#ifdef KEY_SEND
+    rb_curses_define_const(KEY_SEND);
+    rb_define_const(mKey, "SEND", INT2NUM(KEY_SEND));
+#endif
+#ifdef KEY_SEOL
+    rb_curses_define_const(KEY_SEOL);
+    rb_define_const(mKey, "SEOL", INT2NUM(KEY_SEOL));
+#endif
+#ifdef KEY_SEXIT
+    rb_curses_define_const(KEY_SEXIT);
+    rb_define_const(mKey, "SEXIT", INT2NUM(KEY_SEXIT));
+#endif
+#ifdef KEY_SFIND
+    rb_curses_define_const(KEY_SFIND);
+    rb_define_const(mKey, "SFIND", INT2NUM(KEY_SFIND));
+#endif
+#ifdef KEY_SHELP
+    rb_curses_define_const(KEY_SHELP);
+    rb_define_const(mKey, "SHELP", INT2NUM(KEY_SHELP));
+#endif
+#ifdef KEY_SHOME
+    rb_curses_define_const(KEY_SHOME);
+    rb_define_const(mKey, "SHOME", INT2NUM(KEY_SHOME));
+#endif
+#ifdef KEY_SIC
+    rb_curses_define_const(KEY_SIC);
+    rb_define_const(mKey, "SIC", INT2NUM(KEY_SIC));
+#endif
+#ifdef KEY_SLEFT
+    rb_curses_define_const(KEY_SLEFT);
+    rb_define_const(mKey, "SLEFT", INT2NUM(KEY_SLEFT));
+#endif
+#ifdef KEY_SMESSAGE
+    rb_curses_define_const(KEY_SMESSAGE);
+    rb_define_const(mKey, "SMESSAGE", INT2NUM(KEY_SMESSAGE));
+#endif
+#ifdef KEY_SMOVE
+    rb_curses_define_const(KEY_SMOVE);
+    rb_define_const(mKey, "SMOVE", INT2NUM(KEY_SMOVE));
+#endif
+#ifdef KEY_SNEXT
+    rb_curses_define_const(KEY_SNEXT);
+    rb_define_const(mKey, "SNEXT", INT2NUM(KEY_SNEXT));
+#endif
+#ifdef KEY_SOPTIONS
+    rb_curses_define_const(KEY_SOPTIONS);
+    rb_define_const(mKey, "SOPTIONS", INT2NUM(KEY_SOPTIONS));
+#endif
+#ifdef KEY_SPREVIOUS
+    rb_curses_define_const(KEY_SPREVIOUS);
+    rb_define_const(mKey, "SPREVIOUS", INT2NUM(KEY_SPREVIOUS));
+#endif
+#ifdef KEY_SPRINT
+    rb_curses_define_const(KEY_SPRINT);
+    rb_define_const(mKey, "SPRINT", INT2NUM(KEY_SPRINT));
+#endif
+#ifdef KEY_SREDO
+    rb_curses_define_const(KEY_SREDO);
+    rb_define_const(mKey, "SREDO", INT2NUM(KEY_SREDO));
+#endif
+#ifdef KEY_SREPLACE
+    rb_curses_define_const(KEY_SREPLACE);
+    rb_define_const(mKey, "SREPLACE", INT2NUM(KEY_SREPLACE));
+#endif
+#ifdef KEY_SRIGHT
+    rb_curses_define_const(KEY_SRIGHT);
+    rb_define_const(mKey, "SRIGHT", INT2NUM(KEY_SRIGHT));
+#endif
+#ifdef KEY_SRSUME
+    rb_curses_define_const(KEY_SRSUME);
+    rb_define_const(mKey, "SRSUME", INT2NUM(KEY_SRSUME));
+#endif
+#ifdef KEY_SSAVE
+    rb_curses_define_const(KEY_SSAVE);
+    rb_define_const(mKey, "SSAVE", INT2NUM(KEY_SSAVE));
+#endif
+#ifdef KEY_SSUSPEND
+    rb_curses_define_const(KEY_SSUSPEND);
+    rb_define_const(mKey, "SSUSPEND", INT2NUM(KEY_SSUSPEND));
+#endif
+#ifdef KEY_SUNDO
+    rb_curses_define_const(KEY_SUNDO);
+    rb_define_const(mKey, "SUNDO", INT2NUM(KEY_SUNDO));
+#endif
+#ifdef KEY_SUSPEND
+    rb_curses_define_const(KEY_SUSPEND);
+    rb_define_const(mKey, "SUSPEND", INT2NUM(KEY_SUSPEND));
+#endif
+#ifdef KEY_UNDO
+    rb_curses_define_const(KEY_UNDO);
+    rb_define_const(mKey, "UNDO", INT2NUM(KEY_UNDO));
+#endif
+#ifdef KEY_RESIZE
+    rb_curses_define_const(KEY_RESIZE);
+    rb_define_const(mKey, "RESIZE", INT2NUM(KEY_RESIZE));
+#endif
+#ifdef KEY_MAX
+    rb_curses_define_const(KEY_MAX);
+    rb_define_const(mKey, "MAX", INT2NUM(KEY_MAX));
+#endif
+    {
+      int c;
+      char name[] = "KEY_CTRL_x";
+      for( c = 'A'; c <= 'Z'; c++ ){
+	sprintf(name, "KEY_CTRL_%c", c);
+	rb_define_const(mCurses, name, INT2FIX(c - 'A' + 1));
+      }
+    }
+#undef rb_curses_define_const
+
+    rb_set_end_proc(curses_finalize, 0);
+}
diff --git a/ruby_1_8_6/ext/curses/depend b/ruby_1_8_6/ext/curses/depend
new file mode 100644
index 0000000000..ecb79e512d
--- /dev/null
+++ b/ruby_1_8_6/ext/curses/depend
@@ -0,0 +1 @@
+curses.o: curses.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ruby_1_8_6/ext/curses/extconf.rb b/ruby_1_8_6/ext/curses/extconf.rb
new file mode 100644
index 0000000000..01fe971093
--- /dev/null
+++ b/ruby_1_8_6/ext/curses/extconf.rb
@@ -0,0 +1,31 @@
+require 'mkmf'
+
+dir_config('curses')
+dir_config('ncurses')
+dir_config('termcap')
+
+make=false
+have_library("mytinfo", "tgetent") if /bow/ =~ RUBY_PLATFORM
+have_library("tinfo", "tgetent") or have_library("termcap", "tgetent")
+if have_header(*curses=%w"ncurses.h") and have_library("ncurses", "initscr")
+  make=true
+elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "initscr")
+  make=true
+elsif have_header(*curses=%w"curses_colr/curses.h") and have_library("cur_colr", "initscr")
+  curses.unshift("varargs.h")
+  make=true
+elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
+  make=true
+end
+
+if make
+  for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color wcolor_set)
+    have_func(f)
+  end
+  flag = "-D_XOPEN_SOURCE_EXTENDED"
+  src = "int test_var[(sizeof(char*)>sizeof(int))*2-1];"
+  if try_compile(cpp_include(%w[stdio.h stdlib.h]+curses)+src , flag)
+    $defs << flag
+  end
+  create_makefile("curses")
+end
diff --git a/ruby_1_8_6/ext/curses/hello.rb b/ruby_1_8_6/ext/curses/hello.rb
new file mode 100644
index 0000000000..7f57d801a3
--- /dev/null
+++ b/ruby_1_8_6/ext/curses/hello.rb
@@ -0,0 +1,30 @@
+#!/usr/local/bin/ruby
+
+require "curses"
+include Curses
+
+def show_message(message)
+  width = message.length + 6
+  win = Window.new(5, width,
+		   (lines - 5) / 2, (cols - width) / 2)
+  win.box(?|, ?-)
+  win.setpos(2, 3)
+  win.addstr(message)
+  win.refresh
+  win.getch
+  win.close
+end
+
+init_screen
+begin
+  crmode
+#  show_message("Hit any key")
+  setpos((lines - 5) / 2, (cols - 10) / 2)
+  addstr("Hit any key")
+  refresh
+  getch
+  show_message("Hello, World!")
+  refresh
+ensure
+  close_screen
+end
diff --git a/ruby_1_8_6/ext/curses/mouse.rb b/ruby_1_8_6/ext/curses/mouse.rb
new file mode 100644
index 0000000000..c42bc31f33
--- /dev/null
+++ b/ruby_1_8_6/ext/curses/mouse.rb
@@ -0,0 +1,53 @@
+#!/usr/local/bin/ruby
+
+require "curses"
+include Curses
+
+def show_message(*msgs)
+  message = msgs.join
+  width = message.length + 6
+  win = Window.new(5, width,
+		   (lines - 5) / 2, (cols - width) / 2)
+  win.keypad = true
+  win.attron(color_pair(COLOR_RED)){
+    win.box(?|, ?-, ?+)
+  }
+  win.setpos(2, 3)
+  win.addstr(message)
+  win.refresh
+  win.getch
+  win.close
+end
+
+init_screen
+start_color
+init_pair(COLOR_BLUE,COLOR_BLUE,COLOR_WHITE)
+init_pair(COLOR_RED,COLOR_RED,COLOR_WHITE)
+crmode
+noecho
+stdscr.keypad(true)
+
+begin
+  mousemask(BUTTON1_CLICKED|BUTTON2_CLICKED|BUTTON3_CLICKED|BUTTON4_CLICKED)
+  setpos((lines - 5) / 2, (cols - 10) / 2)
+  attron(color_pair(COLOR_BLUE)|A_BOLD){
+    addstr("click")
+  }
+  refresh
+  while( true )
+    c = getch
+    case c
+    when KEY_MOUSE
+      m = getmouse
+      if( m )
+	show_message("getch = #{c.inspect}, ",
+		     "mouse event = #{'0x%x' % m.bstate}, ",
+		     "axis = (#{m.x},#{m.y},#{m.z})")
+      end
+      break
+    end
+  end
+  refresh
+ensure
+  close_screen
+end
diff --git a/ruby_1_8_6/ext/curses/rain.rb b/ruby_1_8_6/ext/curses/rain.rb
new file mode 100644
index 0000000000..36f0f84de2
--- /dev/null
+++ b/ruby_1_8_6/ext/curses/rain.rb
@@ -0,0 +1,76 @@
+#!/usr/local/bin/ruby
+# rain for a curses test
+
+require "curses"
+include Curses
+
+def onsig(sig)
+  close_screen
+  exit sig
+end
+
+def ranf
+  rand(32767).to_f / 32767
+end
+
+# main #
+for i in 1 .. 15  # SIGHUP .. SIGTERM
+  if trap(i, "SIG_IGN") != 0 then  # 0 for SIG_IGN
+    trap(i) {|sig| onsig(sig) }
+  end
+end
+
+init_screen
+nl
+noecho
+srand
+
+xpos = {}
+ypos = {}
+r = lines - 4
+c = cols - 4
+for i in 0 .. 4
+  xpos[i] = (c * ranf).to_i + 2
+  ypos[i] = (r * ranf).to_i + 2
+end
+
+i = 0
+while TRUE
+  x = (c * ranf).to_i + 2
+  y = (r * ranf).to_i + 2
+
+
+  setpos(y, x); addstr(".")
+
+  setpos(ypos[i], xpos[i]); addstr("o")
+
+  i = if i == 0 then 4 else i - 1 end
+  setpos(ypos[i], xpos[i]); addstr("O")
+
+  i = if i == 0 then 4 else i - 1 end
+  setpos(ypos[i] - 1, xpos[i]);      addstr("-")
+  setpos(ypos[i],     xpos[i] - 1); addstr("|.|")
+  setpos(ypos[i] + 1, xpos[i]);      addstr("-")
+
+  i = if i == 0 then 4 else i - 1 end
+  setpos(ypos[i] - 2, xpos[i]);       addstr("-")
+  setpos(ypos[i] - 1, xpos[i] - 1);  addstr("/ \\")
+  setpos(ypos[i],     xpos[i] - 2); addstr("| O |")
+  setpos(ypos[i] + 1, xpos[i] - 1); addstr("\\ /")
+  setpos(ypos[i] + 2, xpos[i]);       addstr("-")
+
+  i = if i == 0 then 4 else i - 1 end
+  setpos(ypos[i] - 2, xpos[i]);       addstr(" ")
+  setpos(ypos[i] - 1, xpos[i] - 1);  addstr("   ")
+  setpos(ypos[i],     xpos[i] - 2); addstr("     ")
+  setpos(ypos[i] + 1, xpos[i] - 1);  addstr("   ")
+  setpos(ypos[i] + 2, xpos[i]);       addstr(" ")
+
+
+  xpos[i] = x
+  ypos[i] = y
+  refresh
+  sleep(0.5)
+end
+
+# end of main
diff --git a/ruby_1_8_6/ext/curses/view.rb b/ruby_1_8_6/ext/curses/view.rb
new file mode 100644
index 0000000000..d9a82a57db
--- /dev/null
+++ b/ruby_1_8_6/ext/curses/view.rb
@@ -0,0 +1,91 @@
+#!/usr/local/bin/ruby
+
+require "curses"
+include Curses
+
+#
+# main
+#
+
+if ARGV.size != 1 then
+  printf("usage: view file\n");
+  exit
+end
+begin
+  fp = open(ARGV[0], "r")
+rescue
+  raise "cannot open file: #{ARGV[1]}"
+end
+
+# signal(SIGINT, finish)
+
+init_screen
+#keypad(stdscr, TRUE)
+nonl
+cbreak
+noecho
+#scrollok(stdscr, TRUE)
+
+# slurp the file
+data_lines = []
+fp.each_line { |l|
+  data_lines.push(l)
+}
+fp.close
+
+
+lptr = 0
+while TRUE
+  i = 0
+  while i < lines
+    setpos(i, 0)
+    #clrtoeol
+    addstr(data_lines[lptr + i]) #if data_lines[lptr + i]
+    i += 1
+  end
+  refresh
+
+  explicit = FALSE
+  n = 0
+  while TRUE
+    c = getch.chr
+    if c =~ /[0-9]/
+      n = 10 * n + c.to_i
+    else
+      break
+    end
+  end
+
+  n = 1 if !explicit && n == 0
+
+  case c
+  when "n"  #when KEY_DOWN
+    i = 0
+    while i < n
+      if lptr + lines < data_lines.size then
+	lptr += 1
+      else
+	break
+      end
+      i += 1 
+    end
+    #wscrl(i)
+      
+  when "p"  #when KEY_UP
+    i = 0
+    while i < n
+      if lptr > 0 then
+	lptr -= 1
+      else
+	break
+      end
+      i += 1 
+    end    
+    #wscrl(-i)
+
+  when "q"
+    break
+  end
+
+end
+close_screen
diff --git a/ruby_1_8_6/ext/curses/view2.rb b/ruby_1_8_6/ext/curses/view2.rb
new file mode 100644
index 0000000000..18d9619216
--- /dev/null
+++ b/ruby_1_8_6/ext/curses/view2.rb
@@ -0,0 +1,115 @@
+#!/usr/local/bin/ruby
+
+require "curses"
+
+if ARGV.size != 1 then
+  printf("usage: view file\n");
+  exit
+end
+begin
+  fp = open(ARGV[0], "r")
+rescue
+  raise "cannot open file: #{ARGV[1]}"
+end
+
+# signal(SIGINT, finish)
+
+Curses.init_screen
+Curses.nonl
+Curses.cbreak
+Curses.noecho
+
+$screen = Curses.stdscr
+
+$screen.scrollok(true)
+#$screen.keypad(true)
+
+# slurp the file
+$data_lines = []
+fp.each_line { |l|
+  $data_lines.push(l.chop)
+}
+fp.close
+
+$top = 0
+$data_lines[0..$screen.maxy-1].each_with_index{|line, idx|
+  $screen.setpos(idx, 0)
+  $screen.addstr(line)
+}
+$screen.setpos(0,0)
+$screen.refresh
+
+def scroll_up
+  if( $top > 0 )
+    $screen.scrl(-1)
+    $top -= 1
+    str = $data_lines[$top]
+    if( str )
+      $screen.setpos(0, 0)
+      $screen.addstr(str)
+    end
+    return true
+  else
+    return false
+  end
+end
+
+def scroll_down
+  if( $top + $screen.maxy < $data_lines.length )
+    $screen.scrl(1)
+    $top += 1
+    str = $data_lines[$top + $screen.maxy - 1]
+    if( str )
+      $screen.setpos($screen.maxy - 1, 0)
+      $screen.addstr(str)
+    end
+    return true
+  else
+    return false
+  end
+end
+
+while true
+  result = true
+  c = Curses.getch
+  case c
+  when Curses::KEY_DOWN, Curses::KEY_CTRL_N
+    result = scroll_down
+  when Curses::KEY_UP, Curses::KEY_CTRL_P
+    result = scroll_up
+  when Curses::KEY_NPAGE, ?\s  # white space
+    for i in 0..($screen.maxy - 2)
+      if( ! scroll_down )
+	if( i == 0 )
+	  result = false
+	end
+	break
+      end
+    end
+  when Curses::KEY_PPAGE
+    for i in 0..($screen.maxy - 2)
+      if( ! scroll_up )
+	if( i == 0 )
+	  result = false
+	end
+	break
+      end
+    end
+  when Curses::KEY_LEFT, Curses::KEY_CTRL_T
+    while( scroll_up )
+    end
+  when Curses::KEY_RIGHT, Curses::KEY_CTRL_B
+    while( scroll_down )
+    end
+  when ?q
+    break
+  else
+    $screen.setpos(0,0)
+    $screen.addstr("[unknown key `#{Curses.keyname(c)}'=#{c}] ")
+  end
+  if( !result )
+    Curses.beep
+  end
+  $screen.setpos(0,0)
+end
+Curses.close_screen
diff --git a/ruby_1_8_6/ext/dbm/.cvsignore b/ruby_1_8_6/ext/dbm/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/dbm/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/dbm/dbm.c b/ruby_1_8_6/ext/dbm/dbm.c
new file mode 100644
index 0000000000..69b7a6e7a7
--- /dev/null
+++ b/ruby_1_8_6/ext/dbm/dbm.c
@@ -0,0 +1,816 @@
+/************************************************
+
+  dbm.c -
+
+  $Author$
+  $Date$
+  created at: Mon Jan 24 15:59:52 JST 1994
+
+  Copyright (C) 1995-2001 Yukihiro Matsumoto
+
+************************************************/
+
+#include "ruby.h"
+
+#ifdef HAVE_CDEFS_H
+# include <cdefs.h>
+#endif
+#ifdef HAVE_SYS_CDEFS_H
+# include <sys/cdefs.h>
+#endif
+#include DBM_HDR
+#include <fcntl.h>
+#include <errno.h>
+
+static VALUE rb_cDBM, rb_eDBMError;
+
+#define RUBY_DBM_RW_BIT 0x20000000
+
+struct dbmdata {
+    int  di_size;
+    DBM *di_dbm;
+};
+
+static void
+closed_dbm()
+{
+    rb_raise(rb_eDBMError, "closed DBM file");
+}
+
+#define GetDBM(obj, dbmp) {\
+    Data_Get_Struct(obj, struct dbmdata, dbmp);\
+    if (dbmp == 0) closed_dbm();\
+    if (dbmp->di_dbm == 0) closed_dbm();\
+}
+
+#define GetDBM2(obj, data, dbm) {\
+    GetDBM(obj, data);\
+    (dbm) = dbmp->di_dbm;\
+}
+
+static void
+free_dbm(dbmp)
+    struct dbmdata *dbmp;
+{
+    if (dbmp) {
+	if (dbmp->di_dbm) dbm_close(dbmp->di_dbm);
+	free(dbmp);
+    }
+}
+
+static VALUE
+fdbm_close(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+
+    GetDBM(obj, dbmp);
+    dbm_close(dbmp->di_dbm);
+    dbmp->di_dbm = 0;
+
+    return Qnil;
+}
+
+static VALUE
+fdbm_closed(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
+    if (dbmp == 0)
+	return Qtrue;
+    if (dbmp->di_dbm == 0)
+	return Qtrue;
+
+    return Qfalse;
+}
+
+static VALUE fdbm_alloc _((VALUE));
+static VALUE
+fdbm_alloc(klass)
+    VALUE klass;
+{
+    return Data_Wrap_Struct(klass, 0, free_dbm, 0);
+}
+
+static VALUE
+fdbm_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE file, vmode, vflags;
+    DBM *dbm;
+    struct dbmdata *dbmp;
+    int mode, flags = 0;
+
+    if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) {
+	mode = 0666;		/* default value */
+    }
+    else if (NIL_P(vmode)) {
+	mode = -1;		/* return nil if DB not exist */
+    }
+    else {
+	mode = NUM2INT(vmode);
+    }
+
+    if (!NIL_P(vflags))
+        flags = NUM2INT(vflags);
+
+    SafeStringValue(file);
+
+    if (flags & RUBY_DBM_RW_BIT) {
+        flags &= ~RUBY_DBM_RW_BIT;
+        dbm = dbm_open(RSTRING(file)->ptr, flags, mode);
+    }
+    else {
+        dbm = 0;
+        if (mode >= 0) {
+            dbm = dbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
+        }
+        if (!dbm) {
+            dbm = dbm_open(RSTRING(file)->ptr, O_RDWR, 0);
+        }
+        if (!dbm) {
+            dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
+        }
+    }
+
+    if (!dbm) {
+	if (mode == -1) return Qnil;
+	rb_sys_fail(RSTRING(file)->ptr);
+    }
+
+    dbmp = ALLOC(struct dbmdata);
+    DATA_PTR(obj) = dbmp;
+    dbmp->di_dbm = dbm;
+    dbmp->di_size = -1;
+
+    return obj;
+}
+
+static VALUE
+fdbm_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
+
+    if (NIL_P(fdbm_initialize(argc, argv, obj))) {
+	return Qnil;
+    }
+
+    if (rb_block_given_p()) {
+        return rb_ensure(rb_yield, obj, fdbm_close, obj);
+    }
+
+    return obj;
+}
+
+static VALUE
+fdbm_fetch(obj, keystr, ifnone)
+    VALUE obj, keystr, ifnone;
+{
+    datum key, value;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    StringValue(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    value = dbm_fetch(dbm, key);
+    if (value.dptr == 0) {
+	if (ifnone == Qnil && rb_block_given_p())
+	    return rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
+	return ifnone;
+    }
+    return rb_tainted_str_new(value.dptr, value.dsize);
+}
+
+static VALUE
+fdbm_aref(obj, keystr)
+    VALUE obj, keystr;
+{
+    return fdbm_fetch(obj, keystr, Qnil);
+}
+
+static VALUE
+fdbm_fetch_m(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE keystr, valstr, ifnone;
+
+    rb_scan_args(argc, argv, "11", &keystr, &ifnone);
+    valstr = fdbm_fetch(obj, keystr, ifnone);
+    if (argc == 1 && !rb_block_given_p() && NIL_P(valstr))
+	rb_raise(rb_eIndexError, "key not found");
+
+    return valstr;
+}
+
+static VALUE
+fdbm_index(obj, valstr)
+    VALUE obj, valstr;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    StringValue(valstr);
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	val = dbm_fetch(dbm, key);
+	if (val.dsize == RSTRING(valstr)->len &&
+	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0) {
+	    return rb_tainted_str_new(key.dptr, key.dsize);
+	}
+    }
+    return Qnil;
+}
+
+static VALUE
+fdbm_indexes(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE new;
+    int i;
+
+    new = rb_ary_new2(argc);
+    for (i=0; i<argc; i++) {
+	rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
+    }
+
+    return new;
+}
+
+static VALUE
+fdbm_select(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE new = rb_ary_new2(argc);
+    int i;
+
+    if (rb_block_given_p()) {
+        datum key, val;
+        DBM *dbm;
+        struct dbmdata *dbmp;
+
+	if (argc > 0) {
+	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
+	}
+        GetDBM2(obj, dbmp, dbm);
+        for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+            VALUE assoc, v;
+            val = dbm_fetch(dbm, key);
+            assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
+                                 rb_tainted_str_new(val.dptr, val.dsize));
+	    v = rb_yield(assoc);
+	    if (RTEST(v)) {
+		rb_ary_push(new, assoc);
+	    }
+	    GetDBM2(obj, dbmp, dbm);
+	}
+    }
+    else {
+	rb_warn("DBM#select(index..) is deprecated; use DBM#values_at");
+
+        for (i=0; i<argc; i++) {
+            rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
+        }
+    }
+
+    return new;
+}
+
+static VALUE
+fdbm_values_at(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE new = rb_ary_new2(argc);
+    int i;
+
+    for (i=0; i<argc; i++) {
+        rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
+    }
+
+    return new;
+}
+
+static void
+fdbm_modify(obj)
+    VALUE obj;
+{
+    rb_secure(4);
+    if (OBJ_FROZEN(obj)) rb_error_frozen("DBM");
+}
+
+static VALUE
+fdbm_delete(obj, keystr)
+    VALUE obj, keystr;
+{
+    datum key, value;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE valstr;
+
+    fdbm_modify(obj);
+    StringValue(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    value = dbm_fetch(dbm, key);
+    if (value.dptr == 0) {
+	if (rb_block_given_p()) return rb_yield(keystr);
+	return Qnil;
+    }
+
+    /* need to save value before dbm_delete() */
+    valstr = rb_tainted_str_new(value.dptr, value.dsize);
+
+    if (dbm_delete(dbm, key)) {
+	dbmp->di_size = -1;
+	rb_raise(rb_eDBMError, "dbm_delete failed");
+    }
+    else if (dbmp->di_size >= 0) {
+	dbmp->di_size--;
+    }
+    return valstr;
+}
+
+static VALUE
+fdbm_shift(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE keystr, valstr;
+
+    fdbm_modify(obj);
+    GetDBM2(obj, dbmp, dbm);
+    dbmp->di_size = -1;
+
+    key = dbm_firstkey(dbm); 
+    if (!key.dptr) return Qnil;
+    val = dbm_fetch(dbm, key);
+    keystr = rb_tainted_str_new(key.dptr, key.dsize);
+    valstr = rb_tainted_str_new(val.dptr, val.dsize);
+    dbm_delete(dbm, key);
+
+    return rb_assoc_new(keystr, valstr);
+}
+
+static VALUE
+fdbm_delete_if(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE keystr, valstr;
+    VALUE ret, ary = rb_ary_new();
+    int i, status = 0, n;
+
+    fdbm_modify(obj);
+    GetDBM2(obj, dbmp, dbm);
+    n = dbmp->di_size;
+    dbmp->di_size = -1;
+
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	val = dbm_fetch(dbm, key);
+	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+        ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
+        if (status != 0) break;
+	if (RTEST(ret)) rb_ary_push(ary, keystr);
+	GetDBM2(obj, dbmp, dbm);
+    }
+
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	keystr = RARRAY(ary)->ptr[i];
+	StringValue(keystr);
+	key.dptr = RSTRING(keystr)->ptr;
+	key.dsize = RSTRING(keystr)->len;
+	if (dbm_delete(dbm, key)) {
+	    rb_raise(rb_eDBMError, "dbm_delete failed");
+	}
+    }
+    if (status) rb_jump_tag(status);
+    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
+
+    return obj;
+}
+
+static VALUE
+fdbm_clear(obj)
+    VALUE obj;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    fdbm_modify(obj);
+    GetDBM2(obj, dbmp, dbm);
+    dbmp->di_size = -1;
+    while (key = dbm_firstkey(dbm), key.dptr) {
+	if (dbm_delete(dbm, key)) {
+	    rb_raise(rb_eDBMError, "dbm_delete failed");
+	}
+    }
+    dbmp->di_size = 0;
+
+    return obj;
+}
+
+static VALUE
+fdbm_invert(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE keystr, valstr;
+    VALUE hash = rb_hash_new();
+
+    GetDBM2(obj, dbmp, dbm);
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	val = dbm_fetch(dbm, key);
+	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	rb_hash_aset(hash, valstr, keystr);
+    }
+    return hash;
+}
+
+static VALUE each_pair _((VALUE));
+
+static VALUE
+each_pair(obj)
+    VALUE obj;
+{
+    return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
+}
+
+static VALUE fdbm_store _((VALUE,VALUE,VALUE));
+
+static VALUE
+update_i(pair, dbm)
+    VALUE pair, dbm;
+{
+    Check_Type(pair, T_ARRAY);
+    if (RARRAY(pair)->len < 2) {
+	rb_raise(rb_eArgError, "pair must be [key, value]");
+    }
+    fdbm_store(dbm, RARRAY(pair)->ptr[0], RARRAY(pair)->ptr[1]);
+    return Qnil;
+}
+
+static VALUE
+fdbm_update(obj, other)
+    VALUE obj, other;
+{
+    rb_iterate(each_pair, other, update_i, obj);
+    return obj;
+}
+
+static VALUE
+fdbm_replace(obj, other)
+    VALUE obj, other;
+{
+    fdbm_clear(obj);
+    rb_iterate(each_pair, other, update_i, obj);
+    return obj;
+}
+
+static VALUE
+fdbm_store(obj, keystr, valstr)
+    VALUE obj, keystr, valstr;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    fdbm_modify(obj);
+    keystr = rb_obj_as_string(keystr);
+    valstr = rb_obj_as_string(valstr);
+
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    dbmp->di_size = -1;
+    if (dbm_store(dbm, key, val, DBM_REPLACE)) {
+#ifdef HAVE_DBM_CLEARERR
+	dbm_clearerr(dbm);
+#endif
+	if (errno == EPERM) rb_sys_fail(0);
+	rb_raise(rb_eDBMError, "dbm_store failed");
+    }
+
+    return valstr;
+}
+
+static VALUE
+fdbm_length(obj)
+    VALUE obj;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    int i = 0;
+
+    GetDBM2(obj, dbmp, dbm);
+    if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
+
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	i++;
+    }
+    dbmp->di_size = i;
+
+    return INT2FIX(i);
+}
+
+static VALUE
+fdbm_empty_p(obj)
+    VALUE obj;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    int i = 0;
+
+    GetDBM2(obj, dbmp, dbm);
+    if (dbmp->di_size < 0) {
+	dbm = dbmp->di_dbm;
+
+	for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	    i++;
+	}
+    }
+    else {
+	i = dbmp->di_size;
+    }
+    if (i == 0) return Qtrue;
+    return Qfalse;
+}
+
+static VALUE
+fdbm_each_value(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    GetDBM2(obj, dbmp, dbm);
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	val = dbm_fetch(dbm, key);
+	rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
+	GetDBM2(obj, dbmp, dbm);
+    }
+    return obj;
+}
+
+static VALUE
+fdbm_each_key(obj)
+    VALUE obj;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    GetDBM2(obj, dbmp, dbm);
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
+	GetDBM2(obj, dbmp, dbm);
+    }
+    return obj;
+}
+
+static VALUE
+fdbm_each_pair(obj)
+    VALUE obj;
+{
+    datum key, val;
+    DBM *dbm;
+    struct dbmdata *dbmp;
+    VALUE keystr, valstr;
+
+    GetDBM2(obj, dbmp, dbm);
+
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	val = dbm_fetch(dbm, key);
+	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	rb_yield(rb_assoc_new(keystr, valstr));
+	GetDBM2(obj, dbmp, dbm);
+    }
+
+    return obj;
+}
+
+static VALUE
+fdbm_keys(obj)
+    VALUE obj;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE ary;
+
+    GetDBM2(obj, dbmp, dbm);
+
+    ary = rb_ary_new();
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	rb_ary_push(ary, rb_tainted_str_new(key.dptr, key.dsize));
+    }
+
+    return ary;
+}
+
+static VALUE
+fdbm_values(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE ary;
+
+    GetDBM2(obj, dbmp, dbm);
+    ary = rb_ary_new();
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	val = dbm_fetch(dbm, key);
+	rb_ary_push(ary, rb_tainted_str_new(val.dptr, val.dsize));
+    }
+
+    return ary;
+}
+
+static VALUE
+fdbm_has_key(obj, keystr)
+    VALUE obj, keystr;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    StringValue(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    val = dbm_fetch(dbm, key);
+    if (val.dptr) return Qtrue;
+    return Qfalse;
+}
+
+static VALUE
+fdbm_has_value(obj, valstr)
+    VALUE obj, valstr;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    StringValue(valstr);
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	val = dbm_fetch(dbm, key);
+	if (val.dsize == RSTRING(valstr)->len &&
+	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
+	    return Qtrue;
+    }
+    return Qfalse;
+}
+
+static VALUE
+fdbm_to_a(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE ary;
+
+    GetDBM2(obj, dbmp, dbm);
+    ary = rb_ary_new();
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	val = dbm_fetch(dbm, key);
+	rb_ary_push(ary, rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
+				      rb_tainted_str_new(val.dptr, val.dsize)));
+    }
+
+    return ary;
+}
+
+static VALUE
+fdbm_to_hash(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE hash;
+
+    GetDBM2(obj, dbmp, dbm);
+    hash = rb_hash_new();
+    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+	val = dbm_fetch(dbm, key);
+	rb_hash_aset(hash, rb_tainted_str_new(key.dptr, key.dsize),
+		           rb_tainted_str_new(val.dptr, val.dsize));
+    }
+
+    return hash;
+}
+
+static VALUE
+fdbm_reject(obj)
+    VALUE obj;
+{
+    return rb_hash_delete_if(fdbm_to_hash(obj));
+}
+
+void
+Init_dbm()
+{
+    rb_cDBM = rb_define_class("DBM", rb_cObject);
+    rb_eDBMError = rb_define_class("DBMError", rb_eStandardError);
+    rb_include_module(rb_cDBM, rb_mEnumerable);
+
+    rb_define_alloc_func(rb_cDBM, fdbm_alloc);
+    rb_define_singleton_method(rb_cDBM, "open", fdbm_s_open, -1);
+
+    rb_define_method(rb_cDBM, "initialize", fdbm_initialize, -1);
+    rb_define_method(rb_cDBM, "close", fdbm_close, 0);
+    rb_define_method(rb_cDBM, "closed?", fdbm_closed, 0);
+    rb_define_method(rb_cDBM, "[]", fdbm_aref, 1);
+    rb_define_method(rb_cDBM, "fetch", fdbm_fetch_m, -1);
+    rb_define_method(rb_cDBM, "[]=", fdbm_store, 2);
+    rb_define_method(rb_cDBM, "store", fdbm_store, 2);
+    rb_define_method(rb_cDBM, "index",  fdbm_index, 1);
+    rb_define_method(rb_cDBM, "indexes",  fdbm_indexes, -1);
+    rb_define_method(rb_cDBM, "indices",  fdbm_indexes, -1);
+    rb_define_method(rb_cDBM, "select",  fdbm_select, -1);
+    rb_define_method(rb_cDBM, "values_at", fdbm_values_at, -1);
+    rb_define_method(rb_cDBM, "length", fdbm_length, 0);
+    rb_define_method(rb_cDBM, "size", fdbm_length, 0);
+    rb_define_method(rb_cDBM, "empty?", fdbm_empty_p, 0);
+    rb_define_method(rb_cDBM, "each", fdbm_each_pair, 0);
+    rb_define_method(rb_cDBM, "each_value", fdbm_each_value, 0);
+    rb_define_method(rb_cDBM, "each_key", fdbm_each_key, 0);
+    rb_define_method(rb_cDBM, "each_pair", fdbm_each_pair, 0);
+    rb_define_method(rb_cDBM, "keys", fdbm_keys, 0);
+    rb_define_method(rb_cDBM, "values", fdbm_values, 0);
+    rb_define_method(rb_cDBM, "shift", fdbm_shift, 0);
+    rb_define_method(rb_cDBM, "delete", fdbm_delete, 1);
+    rb_define_method(rb_cDBM, "delete_if", fdbm_delete_if, 0);
+    rb_define_method(rb_cDBM, "reject!", fdbm_delete_if, 0);
+    rb_define_method(rb_cDBM, "reject", fdbm_reject, 0);
+    rb_define_method(rb_cDBM, "clear", fdbm_clear, 0);
+    rb_define_method(rb_cDBM,"invert", fdbm_invert, 0);
+    rb_define_method(rb_cDBM,"update", fdbm_update, 1);
+    rb_define_method(rb_cDBM,"replace", fdbm_replace, 1);
+
+    rb_define_method(rb_cDBM, "include?", fdbm_has_key, 1);
+    rb_define_method(rb_cDBM, "has_key?", fdbm_has_key, 1);
+    rb_define_method(rb_cDBM, "member?", fdbm_has_key, 1);
+    rb_define_method(rb_cDBM, "has_value?", fdbm_has_value, 1);
+    rb_define_method(rb_cDBM, "key?", fdbm_has_key, 1);
+    rb_define_method(rb_cDBM, "value?", fdbm_has_value, 1);
+
+    rb_define_method(rb_cDBM, "to_a", fdbm_to_a, 0);
+    rb_define_method(rb_cDBM, "to_hash", fdbm_to_hash, 0);
+
+    /* flags for dbm_open() */
+    rb_define_const(rb_cDBM, "READER",  INT2FIX(O_RDONLY|RUBY_DBM_RW_BIT));
+    rb_define_const(rb_cDBM, "WRITER",  INT2FIX(O_RDWR|RUBY_DBM_RW_BIT));
+    rb_define_const(rb_cDBM, "WRCREAT", INT2FIX(O_RDWR|O_CREAT|RUBY_DBM_RW_BIT));
+    rb_define_const(rb_cDBM, "NEWDB",   INT2FIX(O_RDWR|O_CREAT|O_TRUNC|RUBY_DBM_RW_BIT));
+
+#ifdef DB_VERSION_STRING
+    rb_define_const(rb_cDBM, "VERSION",  rb_str_new2(DB_VERSION_STRING));
+#endif
+}
diff --git a/ruby_1_8_6/ext/dbm/depend b/ruby_1_8_6/ext/dbm/depend
new file mode 100644
index 0000000000..5fae80b096
--- /dev/null
+++ b/ruby_1_8_6/ext/dbm/depend
@@ -0,0 +1 @@
+dbm.o: dbm.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ruby_1_8_6/ext/dbm/extconf.rb b/ruby_1_8_6/ext/dbm/extconf.rb
new file mode 100644
index 0000000000..0074ab605b
--- /dev/null
+++ b/ruby_1_8_6/ext/dbm/extconf.rb
@@ -0,0 +1,53 @@
+require 'mkmf'
+
+dir_config("dbm")
+
+if dblib = with_config("dbm-type", nil)
+  dblib = dblib.split(/[ ,]+/)
+else
+  dblib = %w(db db2 db1 dbm gdbm gdbm_compat qdbm)
+end
+
+headers = {
+  "db" => ["db.h"],
+  "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
+  "db2" => ["db2/db.h", "db2.h", "db.h"],
+  "dbm" => ["ndbm.h"],
+  "gdbm" => ["gdbm-ndbm.h", "ndbm.h"],
+  "gdbm_compat" => ["gdbm-ndbm.h", "ndbm.h"],
+  "qdbm" => ["relic.h"],
+}
+
+def headers.db_check(db)
+  db_prefix = nil
+  have_gdbm = false
+  hsearch = nil
+
+  case db
+  when /^db2?$/
+    db_prefix = "__db_n"
+    hsearch = "-DDB_DBM_HSEARCH "
+  when "gdbm"
+    have_gdbm = true
+  when "gdbm_compat"
+    have_gdbm = true
+    have_library("gdbm") or return false
+  end
+  db_prefix ||= ""
+
+  if (have_library(db, db_prefix+"dbm_open") || have_func(db_prefix+"dbm_open")) and
+      hdr = self.fetch(db, ["ndbm.h"]).find {|hdr| have_type("DBM", hdr, hsearch)}
+    have_func(db_prefix+"dbm_clearerr") unless have_gdbm
+    $defs << hsearch if hsearch
+    $defs << '-DDBM_HDR="<'+hdr+'>"'
+    true
+  else
+    false
+  end
+end
+
+if dblib.any? {|db| headers.db_check(db)}
+  have_header("cdefs.h")
+  have_header("sys/cdefs.h")
+  create_makefile("dbm")
+end
diff --git a/ruby_1_8_6/ext/digest/.cvsignore b/ruby_1_8_6/ext/digest/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/digest/bubblebabble/.cvsignore b/ruby_1_8_6/ext/digest/bubblebabble/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/bubblebabble/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/digest/bubblebabble/bubblebabble.c b/ruby_1_8_6/ext/digest/bubblebabble/bubblebabble.c
new file mode 100644
index 0000000000..3a03ceced0
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/bubblebabble/bubblebabble.c
@@ -0,0 +1,142 @@
+/************************************************
+
+  bubblebabble.c - BubbleBabble encoding support
+
+  $Author$
+  created at: Fri Oct 13 18:31:42 JST 2006
+
+  Copyright (C) 2006 Akinori MUSHA
+
+  $Id$
+
+************************************************/
+
+#include "ruby.h"
+#include "digest.h"
+
+static ID id_digest;
+
+static VALUE
+bubblebabble_str_new(VALUE str_digest)
+{
+    char *digest;
+    size_t digest_len;
+    VALUE str;
+    char *p;
+    int i, j, seed = 1;
+    static const char vowels[] = {
+        'a', 'e', 'i', 'o', 'u', 'y'
+    };
+    static const char consonants[] = {
+        'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm', 'n',
+        'p', 'r', 's', 't', 'v', 'z', 'x'
+    };
+
+    StringValue(str_digest);
+    digest = RSTRING_PTR(str_digest);
+    digest_len = RSTRING_LEN(str_digest);
+
+    if ((LONG_MAX - 2) / 3 < (digest_len | 1)) {
+	rb_raise(rb_eRuntimeError, "digest string too long");
+    }
+
+    str = rb_str_new(0, (digest_len | 1) * 3 + 2);
+    p = RSTRING_PTR(str);
+
+    i = j = 0;
+    p[j++] = 'x';
+
+    for (;;) {
+        unsigned char byte1, byte2;
+
+        if (i >= digest_len) {
+            p[j++] = vowels[seed % 6];
+            p[j++] = consonants[16];
+            p[j++] = vowels[seed / 6];
+            break;
+        } 
+
+        byte1 = digest[i++];
+        p[j++] = vowels[(((byte1 >> 6) & 3) + seed) % 6];
+        p[j++] = consonants[(byte1 >> 2) & 15];
+        p[j++] = vowels[((byte1 & 3) + (seed / 6)) % 6];
+
+        if (i >= digest_len) {
+            break;
+        }
+
+        byte2 = digest[i++];
+        p[j++] = consonants[(byte2 >> 4) & 15];
+        p[j++] = '-';
+        p[j++] = consonants[byte2 & 15];
+
+        seed = (seed * 5 + byte1 * 7 + byte2) % 36;
+    }
+
+    p[j] = 'x';
+
+    return str;
+}
+
+/*
+ * call-seq:
+ *     Digest.bubblebabble(string) -> bubblebabble_string
+ *
+ * Returns a BubbleBabble encoded version of a given _string_.
+ */
+static VALUE
+rb_digest_s_bubblebabble(VALUE klass, VALUE str)
+{
+    return bubblebabble_str_new(str);
+}
+
+/*
+ * call-seq:
+ *     Digest::Class.bubblebabble(string, ...) -> hash_string
+ *
+ * Returns the BubbleBabble encoded hash value of a given _string_.
+ */
+static VALUE
+rb_digest_class_s_bubblebabble(int argc, VALUE *argv, VALUE klass)
+{
+    return bubblebabble_str_new(rb_funcall2(klass, id_digest, argc, argv));
+}
+
+/*
+ * call-seq:
+ *     digest_obj.bubblebabble -> hash_string
+ *
+ * Returns the resulting hash value in a Bubblebabble encoded form.
+ */
+static VALUE
+rb_digest_instance_bubblebabble(VALUE self)
+{
+    return bubblebabble_str_new(rb_funcall(self, id_digest, 0));
+}
+
+/*
+ * This module adds some methods to Digest classes to perform
+ * BubbleBabble encoding.
+ */
+void
+Init_bubblebabble(void)
+{
+    VALUE mDigest, mDigest_Instance, cDigest_Class;
+
+    rb_require("digest");
+
+    mDigest = rb_path2class("Digest");
+    mDigest_Instance = rb_path2class("Digest::Instance");
+    cDigest_Class = rb_path2class("Digest::Class");
+
+    /* Digest::bubblebabble() */
+    rb_define_module_function(mDigest, "bubblebabble", rb_digest_s_bubblebabble, 1);
+
+    /* Digest::Class::bubblebabble() */
+    rb_define_singleton_method(cDigest_Class, "bubblebabble", rb_digest_class_s_bubblebabble, -1);
+
+    /* Digest::Instance#bubblebabble() */
+    rb_define_method(mDigest_Instance, "bubblebabble", rb_digest_instance_bubblebabble, 0);
+
+    id_digest = rb_intern("digest");
+}
diff --git a/ruby_1_8_6/ext/digest/bubblebabble/depend b/ruby_1_8_6/ext/digest/bubblebabble/depend
new file mode 100644
index 0000000000..b20148ded4
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/bubblebabble/depend
@@ -0,0 +1,3 @@
+bubblebabble.o: bubblebabble.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
+  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
+  $(srcdir)/../defs.h
diff --git a/ruby_1_8_6/ext/digest/bubblebabble/extconf.rb b/ruby_1_8_6/ext/digest/bubblebabble/extconf.rb
new file mode 100644
index 0000000000..53cb83934a
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/bubblebabble/extconf.rb
@@ -0,0 +1,6 @@
+require 'mkmf'
+
+$defs << "-DHAVE_CONFIG_H"
+$INCFLAGS << " -I$(srcdir)/.."
+
+create_makefile('digest/bubblebabble')
diff --git a/ruby_1_8_6/ext/digest/defs.h b/ruby_1_8_6/ext/digest/defs.h
new file mode 100644
index 0000000000..b9a3470e65
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/defs.h
@@ -0,0 +1,33 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#ifndef DEFS_H
+#define DEFS_H
+
+#include "ruby.h"
+#include <sys/types.h>
+
+#if defined(HAVE_SYS_CDEFS_H)
+# include <sys/cdefs.h>
+#endif
+#if !defined(__BEGIN_DECLS)
+# define __BEGIN_DECLS
+# define __END_DECLS
+#endif
+
+#if defined(HAVE_INTTYPES_H)
+# include <inttypes.h>
+#elif !defined __CYGWIN__ || !defined __uint8_t_defined
+  typedef unsigned char uint8_t;
+  typedef unsigned int  uint32_t;
+# if SIZEOF_LONG == 8
+  typedef unsigned long uint64_t;
+# elif SIZEOF_LONG_LONG == 8
+  typedef unsigned LONG_LONG uint64_t;
+# else
+#  define NO_UINT64_T
+# endif
+#endif
+
+#endif /* DEFS_H */
diff --git a/ruby_1_8_6/ext/digest/depend b/ruby_1_8_6/ext/digest/depend
new file mode 100644
index 0000000000..43601a208f
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/depend
@@ -0,0 +1,2 @@
+digest.o: digest.c digest.h $(hdrdir)/ruby.h $(topdir)/config.h \
+  $(hdrdir)/defines.h $(hdrdir)/intern.h
diff --git a/ruby_1_8_6/ext/digest/digest.c b/ruby_1_8_6/ext/digest/digest.c
new file mode 100644
index 0000000000..0b910e8c47
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/digest.c
@@ -0,0 +1,642 @@
+/************************************************
+
+  digest.c -
+
+  $Author$
+  created at: Fri May 25 08:57:27 JST 2001
+
+  Copyright (C) 1995-2001 Yukihiro Matsumoto
+  Copyright (C) 2001-2006 Akinori MUSHA
+
+  $RoughId: digest.c,v 1.16 2001/07/13 15:38:27 knu Exp $
+  $Id$
+
+************************************************/
+
+#include "digest.h"
+
+static VALUE rb_mDigest;
+static VALUE rb_mDigest_Instance;
+static VALUE rb_cDigest_Class;
+static VALUE rb_cDigest_Base;
+
+static ID id_reset, id_update, id_finish, id_digest, id_hexdigest, id_digest_length;
+static ID id_metadata;
+
+RUBY_EXTERN void Init_digest_base(void);
+
+/*
+ * Document-module: Digest
+ *
+ * This module provides a framework for message digest libraries.
+ */
+
+static VALUE
+hexencode_str_new(VALUE str_digest)
+{
+    char *digest;
+    size_t digest_len;
+    int i;
+    VALUE str;
+    char *p;
+    static const char hex[] = {
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        'a', 'b', 'c', 'd', 'e', 'f'
+    };
+
+    StringValue(str_digest);
+    digest = RSTRING_PTR(str_digest);
+    digest_len = RSTRING_LEN(str_digest);
+
+    if (LONG_MAX / 2 < digest_len) {
+        rb_raise(rb_eRuntimeError, "digest string too long");
+    }
+
+    str = rb_str_new(0, digest_len * 2);
+
+    for (i = 0, p = RSTRING_PTR(str); i < digest_len; i++) {
+        unsigned char byte = digest[i];
+
+        p[i + i]     = hex[byte >> 4];
+        p[i + i + 1] = hex[byte & 0x0f];
+    }
+
+    return str;
+}
+
+/*
+ * call-seq:
+ *     Digest.hexencode(string) -> hexencoded_string
+ *
+ * Generates a hex-encoded version of a given _string_.
+ */
+static VALUE
+rb_digest_s_hexencode(VALUE klass, VALUE str)
+{
+    return hexencode_str_new(str);
+}
+
+/*
+ * Document-module: Digest::Instance
+ *
+ * This module provides instance methods for a digest implementation
+ * object to calculate message digest values.
+ */
+
+/*
+ * call-seq:
+ *     digest_obj.update(string) -> digest_obj
+ *     digest_obj << string -> digest_obj
+ *
+ * Updates the digest using a given _string_ and returns self.
+ *
+ * The update() method and the left-shift operator are overridden by
+ * each implementation subclass. (One should be an alias for the
+ * other)
+ */
+static VALUE
+rb_digest_instance_update(VALUE self, VALUE str)
+{
+    rb_raise(rb_eRuntimeError, "%s does not implement update()", RSTRING_PTR(rb_inspect(self)));
+}
+
+/*
+ * call-seq:
+ *     digest_obj.instance_eval { finish } -> digest_obj
+ *
+ * Finishes the digest and returns the resulting hash value.
+ *
+ * This method is overridden by each implementation subclass and often
+ * made private, because some of those subclasses may leave internal
+ * data uninitialized.  Do not call this method from outside.  Use
+ * #digest!() instead, which ensures that internal data be reset for
+ * security reasons.
+ */
+static VALUE
+rb_digest_instance_finish(VALUE self)
+{
+    rb_raise(rb_eRuntimeError, "%s does not implement finish()", RSTRING_PTR(rb_inspect(self)));
+}
+
+/*
+ * call-seq:
+ *     digest_obj.reset -> digest_obj
+ *
+ * Resets the digest to the initial state and returns self.
+ *
+ * This method is overridden by each implementation subclass.
+ */
+static VALUE
+rb_digest_instance_reset(VALUE self)
+{
+    rb_raise(rb_eRuntimeError, "%s does not implement reset()", RSTRING_PTR(rb_inspect(self)));
+}
+
+/*
+ * call-seq:
+ *     digest_obj.new -> another_digest_obj
+ *
+ * Returns a new, initialized copy of the digest object.  Equivalent
+ * to digest_obj.clone().reset().
+ */
+static VALUE
+rb_digest_instance_new(VALUE self)
+{
+    VALUE clone = rb_obj_clone(self);
+    rb_funcall(clone, id_reset, 0);
+    return clone;
+}
+
+/*
+ * call-seq:
+ *     digest_obj.digest -> string
+ *     digest_obj.digest(string) -> string
+ *
+ * If none is given, returns the resulting hash value of the digest,
+ * keeping the digest's state.
+ *
+ * If a _string_ is given, returns the hash value for the given
+ * _string_, resetting the digest to the initial state before and
+ * after the process.
+ */
+static VALUE
+rb_digest_instance_digest(int argc, VALUE *argv, VALUE self)
+{
+    VALUE str, value;
+
+    if (rb_scan_args(argc, argv, "01", &str) > 0) {
+        rb_funcall(self, id_reset, 0);
+        rb_funcall(self, id_update, 1, str);
+        value = rb_funcall(self, id_finish, 0);
+        rb_funcall(self, id_reset, 0);
+    } else {
+        VALUE clone = rb_obj_clone(self);
+
+        value = rb_funcall(clone, id_finish, 0);
+        rb_funcall(clone, id_reset, 0);
+    }
+
+    return value;
+}
+
+/*
+ * call-seq:
+ *     digest_obj.digest! -> string
+ *
+ * Returns the resulting hash value and resets the digest to the
+ * initial state.
+ */
+static VALUE
+rb_digest_instance_digest_bang(VALUE self)
+{
+    VALUE value = rb_funcall(self, id_finish, 0);
+    rb_funcall(self, id_reset, 0);
+
+    return value;
+}
+
+/*
+ * call-seq:
+ *     digest_obj.hexdigest -> string
+ *     digest_obj.hexdigest(string) -> string
+ *
+ * If none is given, returns the resulting hash value of the digest in
+ * a hex-encoded form, keeping the digest's state.
+ *
+ * If a _string_ is given, returns the hash value for the given
+ * _string_ in a hex-encoded form, resetting the digest to the initial
+ * state before and after the process.
+ */
+static VALUE
+rb_digest_instance_hexdigest(int argc, VALUE *argv, VALUE self)
+{
+    VALUE str, value;
+
+    if (rb_scan_args(argc, argv, "01", &str) > 0) {
+        rb_funcall(self, id_reset, 0);
+        rb_funcall(self, id_update, 1, str);
+        value = rb_funcall(self, id_finish, 0);
+        rb_funcall(self, id_reset, 0);
+    } else {
+        VALUE clone = rb_obj_clone(self);
+
+        value = rb_funcall(clone, id_finish, 0);
+        rb_funcall(clone, id_reset, 0);
+    }
+
+    return hexencode_str_new(value);
+}
+
+/*
+ * call-seq:
+ *     digest_obj.hexdigest! -> string
+ *
+ * Returns the resulting hash value and resets the digest to the
+ * initial state.
+ */
+static VALUE
+rb_digest_instance_hexdigest_bang(VALUE self)
+{
+    VALUE value = rb_funcall(self, id_finish, 0);
+    rb_funcall(self, id_reset, 0);
+
+    return hexencode_str_new(value);
+}
+
+/*
+ * call-seq:
+ *     digest_obj.to_s -> string
+ *
+ * Returns digest_obj.hexdigest().
+ */
+static VALUE
+rb_digest_instance_to_s(VALUE self)
+{
+    return rb_funcall(self, id_hexdigest, 0);
+}
+
+/*
+ * call-seq:
+ *     digest_obj.inspect -> string
+ *
+ * Creates a printable version of the digest object.
+ */
+static VALUE
+rb_digest_instance_inspect(VALUE self)
+{
+    VALUE str;
+    size_t digest_len = 32;	/* about this size at least */
+    char *cname;
+
+    cname = rb_obj_classname(self);
+
+    /* #<Digest::ClassName: xxxxx...xxxx> */
+    str = rb_str_buf_new(2 + strlen(cname) + 2 + digest_len * 2 + 1);
+    rb_str_buf_cat2(str, "#<");
+    rb_str_buf_cat2(str, cname);
+    rb_str_buf_cat2(str, ": ");
+    rb_str_buf_append(str, rb_digest_instance_hexdigest(0, 0, self));
+    rb_str_buf_cat2(str, ">");
+    return str;
+}
+
+/*
+ * call-seq:
+ *     digest_obj == another_digest_obj -> boolean
+ *     digest_obj == string -> boolean
+ *
+ * If a string is given, checks whether it is equal to the hex-encoded
+ * hash value of the digest object.  If another digest instance is
+ * given, checks whether they have the same hash value.  Otherwise
+ * returns false.
+ */
+static VALUE
+rb_digest_instance_equal(VALUE self, VALUE other)
+{
+    VALUE str1, str2;
+
+    if (rb_obj_is_kind_of(other, rb_mDigest_Instance) == Qtrue) {
+        str1 = rb_digest_instance_digest(0, 0, self);
+        str2 = rb_digest_instance_digest(0, 0, other);
+    } else {
+        str1 = rb_digest_instance_to_s(self);
+        str2 = other;
+    }
+
+    /* never blindly assume that subclass methods return strings */
+    StringValue(str1);
+    StringValue(str2);
+
+    if (RSTRING_LEN(str1) == RSTRING_LEN(str2) &&
+	rb_str_cmp(str1, str2) == 0) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *     digest_obj.digest_length -> integer
+ *
+ * Returns the length of the hash value of the digest.
+ *
+ * This method should be overridden by each implementation subclass.
+ * If not, digest_obj.digest().length() is returned.
+ */
+static VALUE
+rb_digest_instance_digest_length(VALUE self)
+{
+    /* subclasses really should redefine this method */
+    VALUE digest = rb_digest_instance_digest(0, 0, self);
+
+    /* never blindly assume that #digest() returns a string */
+    StringValue(digest);
+    return INT2NUM(RSTRING_LEN(digest));
+}
+
+/*
+ * call-seq:
+ *     digest_obj.length -> integer
+ *     digest_obj.size -> integer
+ *
+ * Returns digest_obj.digest_length().
+ */
+static VALUE
+rb_digest_instance_length(VALUE self)
+{
+    return rb_funcall(self, id_digest_length, 0);
+}
+
+/*
+ * call-seq:
+ *     digest_obj.block_length -> integer
+ *
+ * Returns the block length of the digest.
+ *
+ * This method is overridden by each implementation subclass.
+ */
+static VALUE
+rb_digest_instance_block_length(VALUE self)
+{
+    rb_raise(rb_eRuntimeError, "%s does not implement block_length()", RSTRING_PTR(rb_inspect(self)));
+}
+
+/*
+ * Document-class: Digest::Class
+ *
+ * This module stands as a base class for digest implementation
+ * classes.
+ */
+
+/*
+ * call-seq:
+ *     Digest::Class.digest(string, *parameters) -> hash_string
+ *
+ * Returns the hash value of a given _string_.  This is equivalent to
+ * Digest::Class.new(*parameters).digest(string), where extra
+ * _parameters_, if any, are passed through to the constructor and the
+ * _string_ is passed to #digest().
+ */
+static VALUE
+rb_digest_class_s_digest(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE str;
+    volatile VALUE obj;
+
+    if (argc < 1) {
+        rb_raise(rb_eArgError, "no data given");
+    }
+
+    str = *argv++;
+    argc--;
+
+    StringValue(str);
+
+    obj = rb_obj_alloc(klass);
+    rb_obj_call_init(obj, argc, argv);
+
+    return rb_funcall(obj, id_digest, 1, str);
+}
+
+/*
+ * call-seq:
+ *     Digest::Class.hexdigest(string[, ...]) -> hash_string
+ *
+ * Returns the hex-encoded hash value of a given _string_.  This is
+ * almost equivalent to
+ * Digest.hexencode(Digest::Class.new(*parameters).digest(string)).
+ */
+static VALUE
+rb_digest_class_s_hexdigest(int argc, VALUE *argv, VALUE klass)
+{
+    return hexencode_str_new(rb_funcall2(klass, id_digest, argc, argv));
+}
+
+/*
+ * Document-class: Digest::Base
+ *
+ * This abstract class provides a common interface to message digest
+ * implementation classes written in C.
+ */
+
+static rb_digest_metadata_t *
+get_digest_base_metadata(VALUE klass)
+{
+    VALUE p;
+    VALUE obj;
+    rb_digest_metadata_t *algo;
+
+    for (p = klass; p; p = RCLASS(p)->super) {
+        if (rb_ivar_defined(p, id_metadata)) {
+            obj = rb_ivar_get(p, id_metadata);
+            break;
+        }
+    }
+
+    if (!p)
+        rb_raise(rb_eRuntimeError, "Digest::Base cannot be directly inherited in Ruby");
+
+    Data_Get_Struct(obj, rb_digest_metadata_t, algo);
+
+    switch (algo->api_version) {
+      case 2:
+        break;
+
+      /*
+       * put conversion here if possible when API is updated
+       */
+
+      default:
+        rb_raise(rb_eRuntimeError, "Incompatible digest API version");
+    }
+
+    return algo;
+}
+
+static VALUE
+rb_digest_base_alloc(VALUE klass)
+{
+    rb_digest_metadata_t *algo;
+    VALUE obj;
+    void *pctx;
+
+    if (klass == rb_cDigest_Base) {
+	rb_raise(rb_eNotImpError, "Digest::Base is an abstract class");
+    }
+
+    algo = get_digest_base_metadata(klass);
+
+    pctx = xmalloc(algo->ctx_size);
+    algo->init_func(pctx);
+
+    obj = Data_Wrap_Struct(klass, 0, free, pctx);
+
+    return obj;
+}
+
+/* :nodoc: */
+static VALUE
+rb_digest_base_copy(VALUE copy, VALUE obj)
+{
+    rb_digest_metadata_t *algo;
+    void *pctx1, *pctx2;
+
+    if (copy == obj) return copy;
+
+    rb_check_frozen(copy);
+
+    algo = get_digest_base_metadata(rb_obj_class(copy));
+
+    Data_Get_Struct(obj, void, pctx1);
+    Data_Get_Struct(copy, void, pctx2);
+    memcpy(pctx2, pctx1, algo->ctx_size);
+
+    return copy;
+}
+
+/* :nodoc: */
+static VALUE
+rb_digest_base_reset(VALUE self)
+{
+    rb_digest_metadata_t *algo;
+    void *pctx;
+
+    algo = get_digest_base_metadata(rb_obj_class(self));
+
+    Data_Get_Struct(self, void, pctx);
+
+    algo->init_func(pctx);
+
+    return self;
+}
+
+/* :nodoc: */
+static VALUE
+rb_digest_base_update(VALUE self, VALUE str)
+{
+    rb_digest_metadata_t *algo;
+    void *pctx;
+
+    algo = get_digest_base_metadata(rb_obj_class(self));
+
+    Data_Get_Struct(self, void, pctx);
+
+    StringValue(str);
+    algo->update_func(pctx, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str));
+
+    return self;
+}
+
+/* :nodoc: */
+static VALUE
+rb_digest_base_finish(VALUE self)
+{
+    rb_digest_metadata_t *algo;
+    void *pctx;
+    VALUE str;
+
+    algo = get_digest_base_metadata(rb_obj_class(self));
+
+    Data_Get_Struct(self, void, pctx);
+
+    str = rb_str_new(0, algo->digest_len);
+    algo->finish_func(pctx, (unsigned char *)RSTRING_PTR(str));
+
+    /* avoid potential coredump caused by use of a finished context */
+    algo->init_func(pctx);
+
+    return str;
+}
+
+/* :nodoc: */
+static VALUE
+rb_digest_base_digest_length(VALUE self)
+{
+    rb_digest_metadata_t *algo;
+
+    algo = get_digest_base_metadata(rb_obj_class(self));
+
+    return INT2NUM(algo->digest_len);
+}
+
+/* :nodoc: */
+static VALUE
+rb_digest_base_block_length(VALUE self)
+{
+    rb_digest_metadata_t *algo;
+
+    algo = get_digest_base_metadata(rb_obj_class(self));
+
+    return INT2NUM(algo->block_len);
+}
+
+void
+Init_digest(void)
+{
+    id_reset           = rb_intern("reset");
+    id_update          = rb_intern("update");
+    id_finish          = rb_intern("finish");
+    id_digest          = rb_intern("digest");
+    id_hexdigest       = rb_intern("hexdigest");
+    id_digest_length   = rb_intern("digest_length");
+
+    /*
+     * module Digest
+     */
+    rb_mDigest = rb_define_module("Digest");
+
+    /* module functions */
+    rb_define_module_function(rb_mDigest, "hexencode", rb_digest_s_hexencode, 1);
+
+    /*
+     * module Digest::Instance
+     */
+    rb_mDigest_Instance = rb_define_module_under(rb_mDigest, "Instance");
+
+    /* instance methods that should be overridden */
+    rb_define_method(rb_mDigest_Instance, "update", rb_digest_instance_update, 1);
+    rb_define_method(rb_mDigest_Instance, "<<", rb_digest_instance_update, 1);
+    rb_define_private_method(rb_mDigest_Instance, "finish", rb_digest_instance_finish, 0);
+    rb_define_method(rb_mDigest_Instance, "reset", rb_digest_instance_reset, 0);
+    rb_define_method(rb_mDigest_Instance, "digest_length", rb_digest_instance_digest_length, 0);
+    rb_define_method(rb_mDigest_Instance, "block_length", rb_digest_instance_block_length, 0);
+
+    /* instance methods that may be overridden */
+    rb_define_method(rb_mDigest_Instance, "==", rb_digest_instance_equal, 1);
+    rb_define_method(rb_mDigest_Instance, "inspect", rb_digest_instance_inspect, 0);
+
+    /* instance methods that need not usually be overridden */
+    rb_define_method(rb_mDigest_Instance, "new", rb_digest_instance_new, 0);
+    rb_define_method(rb_mDigest_Instance, "digest", rb_digest_instance_digest, -1);
+    rb_define_method(rb_mDigest_Instance, "digest!", rb_digest_instance_digest_bang, 0);
+    rb_define_method(rb_mDigest_Instance, "hexdigest", rb_digest_instance_hexdigest, -1);
+    rb_define_method(rb_mDigest_Instance, "hexdigest!", rb_digest_instance_hexdigest_bang, 0);
+    rb_define_method(rb_mDigest_Instance, "to_s", rb_digest_instance_to_s, 0);
+    rb_define_method(rb_mDigest_Instance, "length", rb_digest_instance_length, 0);
+    rb_define_method(rb_mDigest_Instance, "size", rb_digest_instance_length, 0);
+
+    /*
+     * class Digest::Class
+     */
+    rb_cDigest_Class = rb_define_class_under(rb_mDigest, "Class", rb_cObject);
+    rb_include_module(rb_cDigest_Class, rb_mDigest_Instance);
+
+    /* class methods */
+    rb_define_singleton_method(rb_cDigest_Class, "digest", rb_digest_class_s_digest, -1);
+    rb_define_singleton_method(rb_cDigest_Class, "hexdigest", rb_digest_class_s_hexdigest, -1);
+
+    id_metadata = rb_intern("metadata");
+
+    /* class Digest::Base < Digest::Class */
+    rb_cDigest_Base = rb_define_class_under(rb_mDigest, "Base", rb_cDigest_Class);
+
+    rb_define_alloc_func(rb_cDigest_Base, rb_digest_base_alloc);
+
+    rb_define_method(rb_cDigest_Base, "initialize_copy",  rb_digest_base_copy, 1);
+    rb_define_method(rb_cDigest_Base, "reset", rb_digest_base_reset, 0);
+    rb_define_method(rb_cDigest_Base, "update", rb_digest_base_update, 1);
+    rb_define_method(rb_cDigest_Base, "<<", rb_digest_base_update, 1);
+    rb_define_private_method(rb_cDigest_Base, "finish", rb_digest_base_finish, 0);
+    rb_define_method(rb_cDigest_Base, "digest_length", rb_digest_base_digest_length, 0);
+    rb_define_method(rb_cDigest_Base, "block_length", rb_digest_base_block_length, 0);
+}
diff --git a/ruby_1_8_6/ext/digest/digest.h b/ruby_1_8_6/ext/digest/digest.h
new file mode 100644
index 0000000000..6e4906c859
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/digest.h
@@ -0,0 +1,32 @@
+/************************************************
+
+  digest.h - header file for ruby digest modules
+
+  $Author$
+  created at: Fri May 25 08:54:56 JST 2001
+
+
+  Copyright (C) 2001-2006 Akinori MUSHA
+
+  $RoughId: digest.h,v 1.3 2001/07/13 15:38:27 knu Exp $
+  $Id$
+
+************************************************/
+
+#include "ruby.h"
+
+#define RUBY_DIGEST_API_VERSION	2
+
+typedef void (*rb_digest_hash_init_func_t)(void *);
+typedef void (*rb_digest_hash_update_func_t)(void *, unsigned char *, size_t);
+typedef void (*rb_digest_hash_finish_func_t)(void *, unsigned char *);
+
+typedef struct {
+    int api_version;
+    size_t digest_len;
+    size_t block_len;
+    size_t ctx_size;
+    rb_digest_hash_init_func_t init_func;
+    rb_digest_hash_update_func_t update_func;
+    rb_digest_hash_finish_func_t finish_func;
+} rb_digest_metadata_t;
diff --git a/ruby_1_8_6/ext/digest/extconf.rb b/ruby_1_8_6/ext/digest/extconf.rb
new file mode 100644
index 0000000000..cf9127ecc0
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/extconf.rb
@@ -0,0 +1,10 @@
+# $RoughId: extconf.rb,v 1.6 2001/07/13 15:38:27 knu Exp $
+# $Id$
+
+require "mkmf"
+
+$INSTALLFILES = {
+  "digest.h" => "$(RUBYARCHDIR)"
+}
+
+create_makefile("digest")
diff --git a/ruby_1_8_6/ext/digest/lib/digest.rb b/ruby_1_8_6/ext/digest/lib/digest.rb
new file mode 100644
index 0000000000..0c4ee3c2cc
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/lib/digest.rb
@@ -0,0 +1,50 @@
+require 'digest.so'
+
+module Digest
+  def self.const_missing(name)
+    case name
+    when :SHA256, :SHA384, :SHA512
+      lib = 'digest/sha2.so'
+    else
+      lib = File.join('digest', name.to_s.downcase)
+    end
+
+    begin
+      require lib
+    rescue LoadError => e
+      raise LoadError, "library not found for class Digest::#{name} -- #{lib}", caller(1)
+    end
+    unless Digest.const_defined?(name)
+      raise NameError, "uninitialized constant Digest::#{name}", caller(1)
+    end
+    Digest.const_get(name)
+  end
+
+  class ::Digest::Class
+    # creates a digest object and reads a given file, _name_.
+    # 
+    #  p Digest::SHA256.file("X11R6.8.2-src.tar.bz2").hexdigest
+    #  # => "f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534"
+    def self.file(name)
+      new.file(name)
+    end
+  end
+
+  module Instance
+    # updates the digest with the contents of a given file _name_ and
+    # returns self.
+    def file(name)
+      File.open(name, "rb") {|f|
+        buf = ""
+        while f.read(16384, buf)
+          update buf
+        end
+      }
+      self
+    end
+  end
+end
+
+def Digest(name)
+  Digest.const_get(name)
+end
diff --git a/ruby_1_8_6/ext/digest/lib/md5.rb b/ruby_1_8_6/ext/digest/lib/md5.rb
new file mode 100644
index 0000000000..c399f2de1d
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/lib/md5.rb
@@ -0,0 +1,23 @@
+# just for compatibility; requiring "md5" is obsoleted
+#
+# $RoughId: md5.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
+# $Id$
+
+require 'digest/md5'
+
+class MD5 < Digest::MD5
+  class << self
+    alias orig_new new
+    def new(str = nil)
+      if str
+        orig_new.update(str)
+      else
+        orig_new
+      end
+    end
+
+    def md5(*args)
+      new(*args)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/digest/lib/sha1.rb b/ruby_1_8_6/ext/digest/lib/sha1.rb
new file mode 100644
index 0000000000..4446e12e8d
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/lib/sha1.rb
@@ -0,0 +1,23 @@
+# just for compatibility; requiring "sha1" is obsoleted
+#
+# $RoughId: sha1.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
+# $Id$
+
+require 'digest/sha1'
+
+class SHA1 < Digest::SHA1
+  class << self
+    alias orig_new new
+    def new(str = nil)
+      if str
+        orig_new.update(str)
+      else
+        orig_new
+      end
+    end
+
+    def sha1(*args)
+      new(*args)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/digest/md5/.cvsignore b/ruby_1_8_6/ext/digest/md5/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/md5/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/digest/md5/depend b/ruby_1_8_6/ext/digest/md5/depend
new file mode 100644
index 0000000000..8eaec20b4b
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/md5/depend
@@ -0,0 +1,6 @@
+md5.o: md5.c md5.h $(srcdir)/../defs.h $(hdrdir)/ruby.h $(topdir)/config.h \
+  $(hdrdir)/defines.h $(hdrdir)/intern.h
+md5init.o: md5init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
+  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h md5.h \
+  $(srcdir)/../defs.h
+md5ossl.o: md5ossl.h
diff --git a/ruby_1_8_6/ext/digest/md5/extconf.rb b/ruby_1_8_6/ext/digest/md5/extconf.rb
new file mode 100644
index 0000000000..018f8ccb02
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/md5/extconf.rb
@@ -0,0 +1,29 @@
+# $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
+# $Id$
+
+require "mkmf"
+
+$defs << "-DHAVE_CONFIG_H"
+$INCFLAGS << " -I$(srcdir)/.."
+
+$objs = [ "md5init.#{$OBJEXT}" ]
+
+dir_config("openssl")
+
+if !with_config("bundled-md5") &&
+    have_library("crypto") && have_header("openssl/md5.h")
+  $objs << "md5ossl.#{$OBJEXT}"
+
+else
+  $objs << "md5.#{$OBJEXT}"
+end
+
+have_header("sys/cdefs.h")
+
+have_header("inttypes.h")
+
+have_header("unistd.h")
+
+$preload = %w[digest]
+
+create_makefile("digest/md5")
diff --git a/ruby_1_8_6/ext/digest/md5/md5.c b/ruby_1_8_6/ext/digest/md5/md5.c
new file mode 100644
index 0000000000..993bc47a06
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/md5/md5.c
@@ -0,0 +1,420 @@
+/*
+  Copyright (C) 1999, 2000 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321.
+  It is derived directly from the text of the RFC and not from the
+  reference implementation.
+
+  The original and principal author of md5.c is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2000-07-03 lpd Patched to eliminate warnings about "constant is
+		unsigned in ANSI C, signed in traditional";
+		made test program self-checking.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
+  1999-05-03 lpd Original version.
+ */
+
+/*
+  This code was modified for use in Ruby.
+
+  - Akinori MUSHA <knu@idaemons.org>
+ */
+
+/*$OrigId: md5c.c,v 1.2 2001/03/26 08:57:14 matz Exp $ */
+/*$RoughId: md5.c,v 1.2 2001/07/13 19:48:41 knu Exp $ */
+/*$Id$ */
+
+#include "md5.h"
+
+#ifdef TEST
+/*
+ * Compile with -DTEST to create a self-contained executable test program.
+ * The test program should print out the same values as given in section
+ * A.5 of RFC 1321, reproduced below.
+ */
+#include <string.h>
+main()
+{
+    static const char *const test[7*2] = {
+	"", "d41d8cd98f00b204e9800998ecf8427e",
+	"a", "0cc175b9c0f1b6a831c399e269772661",
+	"abc", "900150983cd24fb0d6963f7d28e17f72",
+	"message digest", "f96b697d7cb7938d525a2f31aaf161d0",
+	"abcdefghijklmnopqrstuvwxyz", "c3fcd3d76192e4007dfb496cca67e13b",
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+				"d174ab98d277d9f5a5611c2c9f419d9f",
+	"12345678901234567890123456789012345678901234567890123456789012345678901234567890", "57edf4a22be3c955ac49da2e2107b67a"
+    };
+    int i;
+
+    for (i = 0; i < 7*2; i += 2) {
+	MD5_CTX state;
+	uint8_t digest[16];
+	char hex_output[16*2 + 1];
+	int di;
+
+	MD5_Init(&state);
+	MD5_Update(&state, (const uint8_t *)test[i], strlen(test[i]));
+	MD5_Final(digest, &state);
+	printf("MD5 (\"%s\") = ", test[i]);
+	for (di = 0; di < 16; ++di)
+	    sprintf(hex_output + di * 2, "%02x", digest[di]);
+	puts(hex_output);
+	if (strcmp(hex_output, test[i + 1]))
+	    printf("**** ERROR, should be: %s\n", test[i + 1]);
+    }
+    return 0;
+}
+#endif /* TEST */
+
+
+/*
+ * For reference, here is the program that computed the T values.
+ */
+#ifdef COMPUTE_T_VALUES
+#include <math.h>
+main()
+{
+    int i;
+    for (i = 1; i <= 64; ++i) {
+	unsigned long v = (unsigned long)(4294967296.0 * fabs(sin((double)i)));
+
+	/*
+	 * The following nonsense is only to avoid compiler warnings about
+	 * "integer constant is unsigned in ANSI C, signed with -traditional".
+	 */
+	if (v >> 31) {
+	    printf("#define T%d /* 0x%08lx */ (T_MASK ^ 0x%08lx)\n", i,
+		   v, (unsigned long)(unsigned int)(~v));
+	} else {
+	    printf("#define T%d    0x%08lx\n", i, v);
+	}
+    }
+    return 0;
+}
+#endif /* COMPUTE_T_VALUES */
+/*
+ * End of T computation program.
+ */
+#ifdef T_MASK
+#undef T_MASK
+#endif
+#define T_MASK ((uint32_t)~0)
+#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
+#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
+#define T3    0x242070db
+#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
+#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
+#define T6    0x4787c62a
+#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
+#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
+#define T9    0x698098d8
+#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
+#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
+#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
+#define T13    0x6b901122
+#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
+#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
+#define T16    0x49b40821
+#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
+#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
+#define T19    0x265e5a51
+#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
+#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
+#define T22    0x02441453
+#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
+#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
+#define T25    0x21e1cde6
+#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
+#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
+#define T28    0x455a14ed
+#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
+#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
+#define T31    0x676f02d9
+#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
+#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
+#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
+#define T35    0x6d9d6122
+#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
+#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
+#define T38    0x4bdecfa9
+#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
+#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
+#define T41    0x289b7ec6
+#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
+#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
+#define T44    0x04881d05
+#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
+#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
+#define T47    0x1fa27cf8
+#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
+#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
+#define T50    0x432aff97
+#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
+#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
+#define T53    0x655b59c3
+#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
+#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
+#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
+#define T57    0x6fa87e4f
+#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
+#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
+#define T60    0x4e0811a1
+#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
+#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
+#define T63    0x2ad7d2bb
+#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
+
+
+static void
+md5_process(MD5_CTX *pms, const uint8_t *data /*[64]*/)
+{
+    uint32_t
+	a = pms->state[0], b = pms->state[1],
+	c = pms->state[2], d = pms->state[3];
+    uint32_t t;
+
+#ifdef WORDS_BIGENDIAN
+
+    /*
+     * On big-endian machines, we must arrange the bytes in the right
+     * order.  (This also works on machines of unknown byte order.)
+     */
+    uint32_t X[16];
+    const uint8_t *xp = data;
+    int i;
+
+    for (i = 0; i < 16; ++i, xp += 4)
+	X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+
+#else
+
+    /*
+     * On little-endian machines, we can process properly aligned data
+     * without copying it.
+     */
+    uint32_t xbuf[16];
+    const uint32_t *X;
+
+    if (!((data - (const uint8_t *)0) & 3)) {
+	/* data are properly aligned */
+	X = (const uint32_t *)data;
+    } else {
+	/* not aligned */
+	memcpy(xbuf, data, 64);
+	X = xbuf;
+    }
+#endif
+
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
+
+    /* Round 1. */
+    /* Let [abcd k s i] denote the operation
+       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + F(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+    /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  7,  T1);
+    SET(d, a, b, c,  1, 12,  T2);
+    SET(c, d, a, b,  2, 17,  T3);
+    SET(b, c, d, a,  3, 22,  T4);
+    SET(a, b, c, d,  4,  7,  T5);
+    SET(d, a, b, c,  5, 12,  T6);
+    SET(c, d, a, b,  6, 17,  T7);
+    SET(b, c, d, a,  7, 22,  T8);
+    SET(a, b, c, d,  8,  7,  T9);
+    SET(d, a, b, c,  9, 12, T10);
+    SET(c, d, a, b, 10, 17, T11);
+    SET(b, c, d, a, 11, 22, T12);
+    SET(a, b, c, d, 12,  7, T13);
+    SET(d, a, b, c, 13, 12, T14);
+    SET(c, d, a, b, 14, 17, T15);
+    SET(b, c, d, a, 15, 22, T16);
+#undef SET
+
+     /* Round 2. */
+     /* Let [abcd k s i] denote the operation
+          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + G(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  1,  5, T17);
+    SET(d, a, b, c,  6,  9, T18);
+    SET(c, d, a, b, 11, 14, T19);
+    SET(b, c, d, a,  0, 20, T20);
+    SET(a, b, c, d,  5,  5, T21);
+    SET(d, a, b, c, 10,  9, T22);
+    SET(c, d, a, b, 15, 14, T23);
+    SET(b, c, d, a,  4, 20, T24);
+    SET(a, b, c, d,  9,  5, T25);
+    SET(d, a, b, c, 14,  9, T26);
+    SET(c, d, a, b,  3, 14, T27);
+    SET(b, c, d, a,  8, 20, T28);
+    SET(a, b, c, d, 13,  5, T29);
+    SET(d, a, b, c,  2,  9, T30);
+    SET(c, d, a, b,  7, 14, T31);
+    SET(b, c, d, a, 12, 20, T32);
+#undef SET
+
+     /* Round 3. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + H(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  5,  4, T33);
+    SET(d, a, b, c,  8, 11, T34);
+    SET(c, d, a, b, 11, 16, T35);
+    SET(b, c, d, a, 14, 23, T36);
+    SET(a, b, c, d,  1,  4, T37);
+    SET(d, a, b, c,  4, 11, T38);
+    SET(c, d, a, b,  7, 16, T39);
+    SET(b, c, d, a, 10, 23, T40);
+    SET(a, b, c, d, 13,  4, T41);
+    SET(d, a, b, c,  0, 11, T42);
+    SET(c, d, a, b,  3, 16, T43);
+    SET(b, c, d, a,  6, 23, T44);
+    SET(a, b, c, d,  9,  4, T45);
+    SET(d, a, b, c, 12, 11, T46);
+    SET(c, d, a, b, 15, 16, T47);
+    SET(b, c, d, a,  2, 23, T48);
+#undef SET
+
+     /* Round 4. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+#define I(x, y, z) ((y) ^ ((x) | ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + I(b,c,d) + X[k] + Ti;\
+  a = ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  6, T49);
+    SET(d, a, b, c,  7, 10, T50);
+    SET(c, d, a, b, 14, 15, T51);
+    SET(b, c, d, a,  5, 21, T52);
+    SET(a, b, c, d, 12,  6, T53);
+    SET(d, a, b, c,  3, 10, T54);
+    SET(c, d, a, b, 10, 15, T55);
+    SET(b, c, d, a,  1, 21, T56);
+    SET(a, b, c, d,  8,  6, T57);
+    SET(d, a, b, c, 15, 10, T58);
+    SET(c, d, a, b,  6, 15, T59);
+    SET(b, c, d, a, 13, 21, T60);
+    SET(a, b, c, d,  4,  6, T61);
+    SET(d, a, b, c, 11, 10, T62);
+    SET(c, d, a, b,  2, 15, T63);
+    SET(b, c, d, a,  9, 21, T64);
+#undef SET
+
+     /* Then perform the following additions. (That is increment each
+        of the four registers by the value it had before this block
+        was started.) */
+    pms->state[0] += a;
+    pms->state[1] += b;
+    pms->state[2] += c;
+    pms->state[3] += d;
+}
+
+void
+MD5_Init(MD5_CTX *pms)
+{
+    pms->count[0] = pms->count[1] = 0;
+    pms->state[0] = 0x67452301;
+    pms->state[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
+    pms->state[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
+    pms->state[3] = 0x10325476;
+}
+
+void
+MD5_Update(MD5_CTX *pms, const uint8_t *data, size_t nbytes)
+{
+    const uint8_t *p = data;
+    size_t left = nbytes;
+    size_t offset = (pms->count[0] >> 3) & 63;
+    uint32_t nbits = (uint32_t)(nbytes << 3);
+
+    if (nbytes <= 0)
+	return;
+
+    /* Update the message length. */
+    pms->count[1] += nbytes >> 29;
+    pms->count[0] += nbits;
+    if (pms->count[0] < nbits)
+	pms->count[1]++;
+
+    /* Process an initial partial block. */
+    if (offset) {
+	size_t copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+
+	memcpy(pms->buffer + offset, p, copy);
+	if (offset + copy < 64)
+	    return;
+	p += copy;
+	left -= copy;
+	md5_process(pms, pms->buffer);
+    }
+
+    /* Process full blocks. */
+    for (; left >= 64; p += 64, left -= 64)
+	md5_process(pms, p);
+
+    /* Process a final partial block. */
+    if (left)
+	memcpy(pms->buffer, p, left);
+}
+
+void
+MD5_Finish(MD5_CTX *pms, uint8_t *digest)
+{
+    static const uint8_t pad[64] = {
+	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+    uint8_t data[8];
+    size_t i;
+
+    /* Save the length before padding. */
+    for (i = 0; i < 8; ++i)
+	data[i] = (uint8_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+    /* Pad to 56 bytes mod 64. */
+    MD5_Update(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+    /* Append the length. */
+    MD5_Update(pms, data, 8);
+    for (i = 0; i < 16; ++i)
+	digest[i] = (uint8_t)(pms->state[i >> 2] >> ((i & 3) << 3));
+}
diff --git a/ruby_1_8_6/ext/digest/md5/md5.h b/ruby_1_8_6/ext/digest/md5/md5.h
new file mode 100644
index 0000000000..f4580ef5e7
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/md5/md5.h
@@ -0,0 +1,80 @@
+/*
+  Copyright (C) 1999 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321.
+  It is derived directly from the text of the RFC and not from the
+  reference implementation.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+	added conditionalization for C++ compilation from Martin
+	Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
+ */
+
+/* $OrigId: md5.h,v 1.2 2001/03/26 08:57:14 matz Exp $ */
+/* $RoughId: md5.h,v 1.3 2002/02/24 08:14:31 knu Exp $ */
+/* $Id$ */
+
+#ifndef MD5_INCLUDED
+#  define MD5_INCLUDED
+
+#include "defs.h"
+
+/*
+ * This code has some adaptations for the Ghostscript environment, but it
+ * will compile and run correctly in any environment with 8-bit chars and
+ * 32-bit ints.  Specifically, it assumes that if the following are
+ * defined, they have the same meaning as in Ghostscript: P1, P2, P3.
+ */
+
+/* Define the state of the MD5 Algorithm. */
+typedef struct md5_state_s {
+    uint32_t count[2];	/* message length in bits, lsw first */
+    uint32_t state[4];	/* digest buffer */
+    uint8_t buffer[64];	/* accumulate block */
+} MD5_CTX;
+
+#ifdef RUBY
+/* avoid name clash */
+#define MD5_Init	rb_Digest_MD5_Init
+#define MD5_Update	rb_Digest_MD5_Update
+#define MD5_Finish	rb_Digest_MD5_Finish
+#endif
+
+void	MD5_Init _((MD5_CTX *pms));
+void	MD5_Update _((MD5_CTX *pms, const uint8_t *data, size_t nbytes));
+void	MD5_Finish _((MD5_CTX *pms, uint8_t *digest));
+
+#define MD5_BLOCK_LENGTH		64
+#define MD5_DIGEST_LENGTH		16
+#define MD5_DIGEST_STRING_LENGTH	(MD5_DIGEST_LENGTH * 2 + 1)
+
+#endif /* MD5_INCLUDED */
diff --git a/ruby_1_8_6/ext/digest/md5/md5init.c b/ruby_1_8_6/ext/digest/md5/md5init.c
new file mode 100644
index 0000000000..17658f4fce
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/md5/md5init.c
@@ -0,0 +1,40 @@
+/* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
+/* $Id$ */
+
+#include "digest.h"
+#if defined(HAVE_OPENSSL_MD5_H)
+#include "md5ossl.h"
+#else
+#include "md5.h"
+#endif
+
+static rb_digest_metadata_t md5 = {
+    RUBY_DIGEST_API_VERSION,
+    MD5_DIGEST_LENGTH,
+    MD5_BLOCK_LENGTH,
+    sizeof(MD5_CTX),
+    (rb_digest_hash_init_func_t)MD5_Init,
+    (rb_digest_hash_update_func_t)MD5_Update,
+    (rb_digest_hash_finish_func_t)MD5_Finish,
+};
+
+/*
+ * A class for calculating message digests using the MD5
+ * Message-Digest Algorithm by RSA Data Security, Inc., described in
+ * RFC1321.
+ */
+void
+Init_md5()
+{
+    VALUE mDigest, cDigest_Base, cDigest_MD5;
+
+    rb_require("digest");
+
+    mDigest = rb_path2class("Digest");
+    cDigest_Base = rb_path2class("Digest::Base");
+
+    cDigest_MD5 = rb_define_class_under(mDigest, "MD5", cDigest_Base);
+
+    rb_ivar_set(cDigest_MD5, rb_intern("metadata"),
+      Data_Wrap_Struct(rb_cObject, 0, 0, &md5));
+}
diff --git a/ruby_1_8_6/ext/digest/md5/md5ossl.c b/ruby_1_8_6/ext/digest/md5/md5ossl.c
new file mode 100644
index 0000000000..d94ae2cd2f
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/md5/md5ossl.c
@@ -0,0 +1,9 @@
+/* $Id$ */
+
+#include "md5ossl.h"
+
+void
+MD5_Finish(MD5_CTX *pctx, unsigned char *digest)
+{
+    MD5_Final(digest, pctx);
+}
diff --git a/ruby_1_8_6/ext/digest/md5/md5ossl.h b/ruby_1_8_6/ext/digest/md5/md5ossl.h
new file mode 100644
index 0000000000..1680c4f5c9
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/md5/md5ossl.h
@@ -0,0 +1,13 @@
+/* $Id$ */
+
+#ifndef MD5OSSL_H_INCLUDED
+#define MD5OSSL_H_INCLUDED
+
+#include <stddef.h>
+#include <openssl/md5.h>
+
+#define MD5_BLOCK_LENGTH	MD5_CBLOCK
+
+void MD5_Finish(MD5_CTX *pctx, unsigned char *digest);
+
+#endif
diff --git a/ruby_1_8_6/ext/digest/rmd160/.cvsignore b/ruby_1_8_6/ext/digest/rmd160/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/rmd160/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/digest/rmd160/depend b/ruby_1_8_6/ext/digest/rmd160/depend
new file mode 100644
index 0000000000..a21d7188dc
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/rmd160/depend
@@ -0,0 +1,6 @@
+rmd160.o: rmd160.c rmd160.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
+  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
+rmd160init.o: rmd160init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
+  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
+  rmd160.h $(srcdir)/../defs.h
+rmd160ossl.o: rmd160ossl.h $(srcdir)/../defs.h
diff --git a/ruby_1_8_6/ext/digest/rmd160/extconf.rb b/ruby_1_8_6/ext/digest/rmd160/extconf.rb
new file mode 100644
index 0000000000..09359944f2
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/rmd160/extconf.rb
@@ -0,0 +1,28 @@
+# $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
+# $Id$
+
+require "mkmf"
+
+$defs << "-DNDEBUG" << "-DHAVE_CONFIG_H"
+$INCFLAGS << " -I$(srcdir)/.."
+
+$objs = [ "rmd160init.#{$OBJEXT}" ]
+
+dir_config("openssl")
+
+if !with_config("bundled-rmd160") &&
+    have_library("crypto") && have_header("openssl/ripemd.h")
+  $objs << "rmd160ossl.#{$OBJEXT}"
+else
+  $objs << "rmd160.#{$OBJEXT}"
+end
+
+have_header("sys/cdefs.h")
+
+have_header("inttypes.h")
+
+have_header("unistd.h")
+
+$preload = %w[digest]
+
+create_makefile("digest/rmd160")
diff --git a/ruby_1_8_6/ext/digest/rmd160/rmd160.c b/ruby_1_8_6/ext/digest/rmd160/rmd160.c
new file mode 100644
index 0000000000..88918728cd
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/rmd160/rmd160.c
@@ -0,0 +1,457 @@
+/*	$NetBSD: rmd160.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $	*/
+/*	$RoughId: rmd160.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
+/*	$Id$	*/
+
+/********************************************************************\
+ *
+ *      FILE:     rmd160.c
+ *
+ *      CONTENTS: A sample C-implementation of the RIPEMD-160
+ *		  hash-function.
+ *      TARGET:   any computer with an ANSI C compiler
+ *
+ *      AUTHOR:   Antoon Bosselaers, ESAT-COSIC
+ *		  (Arranged for libc by Todd C. Miller)
+ *      DATE:     1 March 1996
+ *      VERSION:  1.0
+ *
+ *      Copyright (c) Katholieke Universiteit Leuven
+ *      1996, All Rights Reserved
+ *
+\********************************************************************/
+
+#include "rmd160.h"
+
+#ifndef lint
+/* __RCSID("$NetBSD: rmd160.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $"); */
+#endif	/* not lint */
+
+/* header files */
+
+#ifdef HAVE_SYS_ENDIAN_H_
+#include <sys/endian.h>
+#endif
+
+#ifdef HAVE_MACHINE_ENDIAN_H_
+#include <machine/endian.h>
+#endif
+
+/* #include "namespace.h" */
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef _DIAGASSERT
+#define _DIAGASSERT(cond)	assert(cond)
+#endif
+
+
+/********************************************************************/
+
+/* macro definitions */
+
+/* collect four bytes into one word: */
+#define BYTES_TO_DWORD(strptr)			\
+    (((uint32_t) *((strptr)+3) << 24) |	\
+    ((uint32_t) *((strptr)+2) << 16) |		\
+    ((uint32_t) *((strptr)+1) <<  8) |		\
+    ((uint32_t) *(strptr)))
+
+/* ROL(x, n) cyclically rotates x over n bits to the left */
+/* x must be of an unsigned 32 bits type and 0 <= n < 32. */
+#define ROL(x, n)	(((x) << (n)) | ((x) >> (32-(n))))
+
+/* the three basic functions F(), G() and H() */
+#define F(x, y, z)	((x) ^ (y) ^ (z))
+#define G(x, y, z)	(((x) & (y)) | (~(x) & (z)))
+#define H(x, y, z)	(((x) | ~(y)) ^ (z))
+#define I(x, y, z)	(((x) & (z)) | ((y) & ~(z)))
+#define J(x, y, z)	((x) ^ ((y) | ~(z)))
+
+/* the eight basic operations FF() through III() */
+#define FF(a, b, c, d, e, x, s)	{			\
+      (a) += F((b), (c), (d)) + (x);			\
+      (a) = ROL((a), (s)) + (e);			\
+      (c) = ROL((c), 10);				\
+}
+#define GG(a, b, c, d, e, x, s)	{			\
+      (a) += G((b), (c), (d)) + (x) + 0x5a827999U;	\
+      (a) = ROL((a), (s)) + (e);			\
+      (c) = ROL((c), 10);				\
+}
+#define HH(a, b, c, d, e, x, s)	{			\
+      (a) += H((b), (c), (d)) + (x) + 0x6ed9eba1U;	\
+      (a) = ROL((a), (s)) + (e);			\
+      (c) = ROL((c), 10);				\
+}
+#define II(a, b, c, d, e, x, s)	{			\
+      (a) += I((b), (c), (d)) + (x) + 0x8f1bbcdcU;	\
+      (a) = ROL((a), (s)) + (e);			\
+      (c) = ROL((c), 10);				\
+}
+#define JJ(a, b, c, d, e, x, s)	{			\
+      (a) += J((b), (c), (d)) + (x) + 0xa953fd4eU;	\
+      (a) = ROL((a), (s)) + (e);			\
+      (c) = ROL((c), 10);				\
+}
+#define FFF(a, b, c, d, e, x, s)	{		\
+      (a) += F((b), (c), (d)) + (x);			\
+      (a) = ROL((a), (s)) + (e);			\
+      (c) = ROL((c), 10);				\
+}
+#define GGG(a, b, c, d, e, x, s)	{		\
+      (a) += G((b), (c), (d)) + (x) + 0x7a6d76e9U;	\
+      (a) = ROL((a), (s)) + (e);			\
+      (c) = ROL((c), 10);				\
+}
+#define HHH(a, b, c, d, e, x, s)	{		\
+      (a) += H((b), (c), (d)) + (x) + 0x6d703ef3U;	\
+      (a) = ROL((a), (s)) + (e);			\
+      (c) = ROL((c), 10);				\
+}
+#define III(a, b, c, d, e, x, s)	{		\
+      (a) += I((b), (c), (d)) + (x) + 0x5c4dd124U;	\
+      (a) = ROL((a), (s)) + (e);			\
+      (c) = ROL((c), 10);				\
+}
+#define JJJ(a, b, c, d, e, x, s)	{		\
+      (a) += J((b), (c), (d)) + (x) + 0x50a28be6U;	\
+      (a) = ROL((a), (s)) + (e);			\
+      (c) = ROL((c), 10);				\
+}
+
+/********************************************************************/
+
+void
+RMD160_Init(RMD160_CTX *context)
+{
+
+	_DIAGASSERT(context != NULL);
+
+	/* ripemd-160 initialization constants */
+	context->state[0] = 0x67452301U;
+	context->state[1] = 0xefcdab89U;
+	context->state[2] = 0x98badcfeU;
+	context->state[3] = 0x10325476U;
+	context->state[4] = 0xc3d2e1f0U;
+	context->length[0] = context->length[1] = 0;
+	context->buflen = 0;
+}
+
+/********************************************************************/
+
+void
+RMD160_Transform(uint32_t state[5], const uint32_t block[16])
+{
+	uint32_t aa, bb, cc, dd, ee;
+	uint32_t aaa, bbb, ccc, ddd, eee;
+
+	_DIAGASSERT(state != NULL);
+	_DIAGASSERT(block != NULL);
+
+	aa = aaa = state[0];
+	bb = bbb = state[1];
+	cc = ccc = state[2];
+	dd = ddd = state[3];
+	ee = eee = state[4];
+
+	/* round 1 */
+	FF(aa, bb, cc, dd, ee, block[ 0], 11);
+	FF(ee, aa, bb, cc, dd, block[ 1], 14);
+	FF(dd, ee, aa, bb, cc, block[ 2], 15);
+	FF(cc, dd, ee, aa, bb, block[ 3], 12);
+	FF(bb, cc, dd, ee, aa, block[ 4],  5);
+	FF(aa, bb, cc, dd, ee, block[ 5],  8);
+	FF(ee, aa, bb, cc, dd, block[ 6],  7);
+	FF(dd, ee, aa, bb, cc, block[ 7],  9);
+	FF(cc, dd, ee, aa, bb, block[ 8], 11);
+	FF(bb, cc, dd, ee, aa, block[ 9], 13);
+	FF(aa, bb, cc, dd, ee, block[10], 14);
+	FF(ee, aa, bb, cc, dd, block[11], 15);
+	FF(dd, ee, aa, bb, cc, block[12],  6);
+	FF(cc, dd, ee, aa, bb, block[13],  7);
+	FF(bb, cc, dd, ee, aa, block[14],  9);
+	FF(aa, bb, cc, dd, ee, block[15],  8);
+
+	/* round 2 */
+	GG(ee, aa, bb, cc, dd, block[ 7],  7);
+	GG(dd, ee, aa, bb, cc, block[ 4],  6);
+	GG(cc, dd, ee, aa, bb, block[13],  8);
+	GG(bb, cc, dd, ee, aa, block[ 1], 13);
+	GG(aa, bb, cc, dd, ee, block[10], 11);
+	GG(ee, aa, bb, cc, dd, block[ 6],  9);
+	GG(dd, ee, aa, bb, cc, block[15],  7);
+	GG(cc, dd, ee, aa, bb, block[ 3], 15);
+	GG(bb, cc, dd, ee, aa, block[12],  7);
+	GG(aa, bb, cc, dd, ee, block[ 0], 12);
+	GG(ee, aa, bb, cc, dd, block[ 9], 15);
+	GG(dd, ee, aa, bb, cc, block[ 5],  9);
+	GG(cc, dd, ee, aa, bb, block[ 2], 11);
+	GG(bb, cc, dd, ee, aa, block[14],  7);
+	GG(aa, bb, cc, dd, ee, block[11], 13);
+	GG(ee, aa, bb, cc, dd, block[ 8], 12);
+
+	/* round 3 */
+	HH(dd, ee, aa, bb, cc, block[ 3], 11);
+	HH(cc, dd, ee, aa, bb, block[10], 13);
+	HH(bb, cc, dd, ee, aa, block[14],  6);
+	HH(aa, bb, cc, dd, ee, block[ 4],  7);
+	HH(ee, aa, bb, cc, dd, block[ 9], 14);
+	HH(dd, ee, aa, bb, cc, block[15],  9);
+	HH(cc, dd, ee, aa, bb, block[ 8], 13);
+	HH(bb, cc, dd, ee, aa, block[ 1], 15);
+	HH(aa, bb, cc, dd, ee, block[ 2], 14);
+	HH(ee, aa, bb, cc, dd, block[ 7],  8);
+	HH(dd, ee, aa, bb, cc, block[ 0], 13);
+	HH(cc, dd, ee, aa, bb, block[ 6],  6);
+	HH(bb, cc, dd, ee, aa, block[13],  5);
+	HH(aa, bb, cc, dd, ee, block[11], 12);
+	HH(ee, aa, bb, cc, dd, block[ 5],  7);
+	HH(dd, ee, aa, bb, cc, block[12],  5);
+
+	/* round 4 */
+	II(cc, dd, ee, aa, bb, block[ 1], 11);
+	II(bb, cc, dd, ee, aa, block[ 9], 12);
+	II(aa, bb, cc, dd, ee, block[11], 14);
+	II(ee, aa, bb, cc, dd, block[10], 15);
+	II(dd, ee, aa, bb, cc, block[ 0], 14);
+	II(cc, dd, ee, aa, bb, block[ 8], 15);
+	II(bb, cc, dd, ee, aa, block[12],  9);
+	II(aa, bb, cc, dd, ee, block[ 4],  8);
+	II(ee, aa, bb, cc, dd, block[13],  9);
+	II(dd, ee, aa, bb, cc, block[ 3], 14);
+	II(cc, dd, ee, aa, bb, block[ 7],  5);
+	II(bb, cc, dd, ee, aa, block[15],  6);
+	II(aa, bb, cc, dd, ee, block[14],  8);
+	II(ee, aa, bb, cc, dd, block[ 5],  6);
+	II(dd, ee, aa, bb, cc, block[ 6],  5);
+	II(cc, dd, ee, aa, bb, block[ 2], 12);
+
+	/* round 5 */
+	JJ(bb, cc, dd, ee, aa, block[ 4],  9);
+	JJ(aa, bb, cc, dd, ee, block[ 0], 15);
+	JJ(ee, aa, bb, cc, dd, block[ 5],  5);
+	JJ(dd, ee, aa, bb, cc, block[ 9], 11);
+	JJ(cc, dd, ee, aa, bb, block[ 7],  6);
+	JJ(bb, cc, dd, ee, aa, block[12],  8);
+	JJ(aa, bb, cc, dd, ee, block[ 2], 13);
+	JJ(ee, aa, bb, cc, dd, block[10], 12);
+	JJ(dd, ee, aa, bb, cc, block[14],  5);
+	JJ(cc, dd, ee, aa, bb, block[ 1], 12);
+	JJ(bb, cc, dd, ee, aa, block[ 3], 13);
+	JJ(aa, bb, cc, dd, ee, block[ 8], 14);
+	JJ(ee, aa, bb, cc, dd, block[11], 11);
+	JJ(dd, ee, aa, bb, cc, block[ 6],  8);
+	JJ(cc, dd, ee, aa, bb, block[15],  5);
+	JJ(bb, cc, dd, ee, aa, block[13],  6);
+
+	/* parallel round 1 */
+	JJJ(aaa, bbb, ccc, ddd, eee, block[ 5],  8);
+	JJJ(eee, aaa, bbb, ccc, ddd, block[14],  9);
+	JJJ(ddd, eee, aaa, bbb, ccc, block[ 7],  9);
+	JJJ(ccc, ddd, eee, aaa, bbb, block[ 0], 11);
+	JJJ(bbb, ccc, ddd, eee, aaa, block[ 9], 13);
+	JJJ(aaa, bbb, ccc, ddd, eee, block[ 2], 15);
+	JJJ(eee, aaa, bbb, ccc, ddd, block[11], 15);
+	JJJ(ddd, eee, aaa, bbb, ccc, block[ 4],  5);
+	JJJ(ccc, ddd, eee, aaa, bbb, block[13],  7);
+	JJJ(bbb, ccc, ddd, eee, aaa, block[ 6],  7);
+	JJJ(aaa, bbb, ccc, ddd, eee, block[15],  8);
+	JJJ(eee, aaa, bbb, ccc, ddd, block[ 8], 11);
+	JJJ(ddd, eee, aaa, bbb, ccc, block[ 1], 14);
+	JJJ(ccc, ddd, eee, aaa, bbb, block[10], 14);
+	JJJ(bbb, ccc, ddd, eee, aaa, block[ 3], 12);
+	JJJ(aaa, bbb, ccc, ddd, eee, block[12],  6);
+
+	/* parallel round 2 */
+	III(eee, aaa, bbb, ccc, ddd, block[ 6],  9);
+	III(ddd, eee, aaa, bbb, ccc, block[11], 13);
+	III(ccc, ddd, eee, aaa, bbb, block[ 3], 15);
+	III(bbb, ccc, ddd, eee, aaa, block[ 7],  7);
+	III(aaa, bbb, ccc, ddd, eee, block[ 0], 12);
+	III(eee, aaa, bbb, ccc, ddd, block[13],  8);
+	III(ddd, eee, aaa, bbb, ccc, block[ 5],  9);
+	III(ccc, ddd, eee, aaa, bbb, block[10], 11);
+	III(bbb, ccc, ddd, eee, aaa, block[14],  7);
+	III(aaa, bbb, ccc, ddd, eee, block[15],  7);
+	III(eee, aaa, bbb, ccc, ddd, block[ 8], 12);
+	III(ddd, eee, aaa, bbb, ccc, block[12],  7);
+	III(ccc, ddd, eee, aaa, bbb, block[ 4],  6);
+	III(bbb, ccc, ddd, eee, aaa, block[ 9], 15);
+	III(aaa, bbb, ccc, ddd, eee, block[ 1], 13);
+	III(eee, aaa, bbb, ccc, ddd, block[ 2], 11);
+
+	/* parallel round 3 */
+	HHH(ddd, eee, aaa, bbb, ccc, block[15],  9);
+	HHH(ccc, ddd, eee, aaa, bbb, block[ 5],  7);
+	HHH(bbb, ccc, ddd, eee, aaa, block[ 1], 15);
+	HHH(aaa, bbb, ccc, ddd, eee, block[ 3], 11);
+	HHH(eee, aaa, bbb, ccc, ddd, block[ 7],  8);
+	HHH(ddd, eee, aaa, bbb, ccc, block[14],  6);
+	HHH(ccc, ddd, eee, aaa, bbb, block[ 6],  6);
+	HHH(bbb, ccc, ddd, eee, aaa, block[ 9], 14);
+	HHH(aaa, bbb, ccc, ddd, eee, block[11], 12);
+	HHH(eee, aaa, bbb, ccc, ddd, block[ 8], 13);
+	HHH(ddd, eee, aaa, bbb, ccc, block[12],  5);
+	HHH(ccc, ddd, eee, aaa, bbb, block[ 2], 14);
+	HHH(bbb, ccc, ddd, eee, aaa, block[10], 13);
+	HHH(aaa, bbb, ccc, ddd, eee, block[ 0], 13);
+	HHH(eee, aaa, bbb, ccc, ddd, block[ 4],  7);
+	HHH(ddd, eee, aaa, bbb, ccc, block[13],  5);
+
+	/* parallel round 4 */
+	GGG(ccc, ddd, eee, aaa, bbb, block[ 8], 15);
+	GGG(bbb, ccc, ddd, eee, aaa, block[ 6],  5);
+	GGG(aaa, bbb, ccc, ddd, eee, block[ 4],  8);
+	GGG(eee, aaa, bbb, ccc, ddd, block[ 1], 11);
+	GGG(ddd, eee, aaa, bbb, ccc, block[ 3], 14);
+	GGG(ccc, ddd, eee, aaa, bbb, block[11], 14);
+	GGG(bbb, ccc, ddd, eee, aaa, block[15],  6);
+	GGG(aaa, bbb, ccc, ddd, eee, block[ 0], 14);
+	GGG(eee, aaa, bbb, ccc, ddd, block[ 5],  6);
+	GGG(ddd, eee, aaa, bbb, ccc, block[12],  9);
+	GGG(ccc, ddd, eee, aaa, bbb, block[ 2], 12);
+	GGG(bbb, ccc, ddd, eee, aaa, block[13],  9);
+	GGG(aaa, bbb, ccc, ddd, eee, block[ 9], 12);
+	GGG(eee, aaa, bbb, ccc, ddd, block[ 7],  5);
+	GGG(ddd, eee, aaa, bbb, ccc, block[10], 15);
+	GGG(ccc, ddd, eee, aaa, bbb, block[14],  8);
+
+	/* parallel round 5 */
+	FFF(bbb, ccc, ddd, eee, aaa, block[12] ,  8);
+	FFF(aaa, bbb, ccc, ddd, eee, block[15] ,  5);
+	FFF(eee, aaa, bbb, ccc, ddd, block[10] , 12);
+	FFF(ddd, eee, aaa, bbb, ccc, block[ 4] ,  9);
+	FFF(ccc, ddd, eee, aaa, bbb, block[ 1] , 12);
+	FFF(bbb, ccc, ddd, eee, aaa, block[ 5] ,  5);
+	FFF(aaa, bbb, ccc, ddd, eee, block[ 8] , 14);
+	FFF(eee, aaa, bbb, ccc, ddd, block[ 7] ,  6);
+	FFF(ddd, eee, aaa, bbb, ccc, block[ 6] ,  8);
+	FFF(ccc, ddd, eee, aaa, bbb, block[ 2] , 13);
+	FFF(bbb, ccc, ddd, eee, aaa, block[13] ,  6);
+	FFF(aaa, bbb, ccc, ddd, eee, block[14] ,  5);
+	FFF(eee, aaa, bbb, ccc, ddd, block[ 0] , 15);
+	FFF(ddd, eee, aaa, bbb, ccc, block[ 3] , 13);
+	FFF(ccc, ddd, eee, aaa, bbb, block[ 9] , 11);
+	FFF(bbb, ccc, ddd, eee, aaa, block[11] , 11);
+
+	/* combine results */
+	ddd += cc + state[1];		/* final result for state[0] */
+	state[1] = state[2] + dd + eee;
+	state[2] = state[3] + ee + aaa;
+	state[3] = state[4] + aa + bbb;
+	state[4] = state[0] + bb + ccc;
+	state[0] = ddd;
+}
+
+/********************************************************************/
+
+void
+RMD160_Update(RMD160_CTX *context, const uint8_t *data, size_t nbytes)
+{
+	uint32_t X[16];
+	uint32_t ofs = 0;
+	uint32_t i;
+#ifdef WORDS_BIGENDIAN
+	uint32_t j;
+#endif
+
+	_DIAGASSERT(context != NULL);
+	_DIAGASSERT(data != NULL);
+
+	/* update length[] */
+	if (context->length[0] + nbytes < context->length[0])
+		context->length[1]++;		/* overflow to msb of length */
+	context->length[0] += nbytes;
+
+	(void)memset(X, 0, sizeof(X));
+
+        if ( context->buflen + nbytes < 64 )
+        {
+                (void)memcpy(context->bbuffer + context->buflen, data, nbytes);
+                context->buflen += nbytes;
+        }
+        else
+        {
+                /* process first block */
+                ofs = 64 - context->buflen;
+                (void)memcpy(context->bbuffer + context->buflen, data, ofs);
+#ifndef WORDS_BIGENDIAN
+                (void)memcpy(X, context->bbuffer, sizeof(X));
+#else
+                for (j=0; j < 16; j++)
+                        X[j] = BYTES_TO_DWORD(context->bbuffer + (4 * j));
+#endif
+                RMD160_Transform(context->state, X);
+                nbytes -= ofs;
+
+                /* process remaining complete blocks */
+                for (i = 0; i < (nbytes >> 6); i++) {
+#ifndef WORDS_BIGENDIAN
+                        (void)memcpy(X, data + (64 * i) + ofs, sizeof(X));
+#else
+                        for (j=0; j < 16; j++)
+                                X[j] = BYTES_TO_DWORD(data + (64 * i) + (4 * j) + ofs);
+#endif
+                        RMD160_Transform(context->state, X);
+                }
+
+                /*
+                 * Put last bytes from data into context's buffer
+                 */
+                context->buflen = nbytes & 63;
+                memcpy(context->bbuffer, data + (64 * i) + ofs, context->buflen);
+        }
+}
+
+/********************************************************************/
+
+void
+RMD160_Finish(RMD160_CTX *context, uint8_t digest[20])
+{
+	uint32_t i;
+	uint32_t X[16];
+#ifdef WORDS_BIGENDIAN
+	uint32_t j;
+#endif
+
+	_DIAGASSERT(digest != NULL);
+	_DIAGASSERT(context != NULL);
+
+	/* append the bit m_n == 1 */
+	context->bbuffer[context->buflen] = (uint8_t)'\200';
+
+	(void)memset(context->bbuffer + context->buflen + 1, 0,
+		63 - context->buflen);
+#ifndef WORDS_BIGENDIAN
+	(void)memcpy(X, context->bbuffer, sizeof(X));
+#else
+	for (j=0; j < 16; j++)
+		X[j] = BYTES_TO_DWORD(context->bbuffer + (4 * j));
+#endif
+	if ((context->buflen) > 55) {
+		/* length goes to next block */
+		RMD160_Transform(context->state, X);
+		(void)memset(X, 0, sizeof(X));
+	}
+
+	/* append length in bits */
+	X[14] = context->length[0] << 3;
+	X[15] = (context->length[0] >> 29) |
+	    (context->length[1] << 3);
+	RMD160_Transform(context->state, X);
+
+	if (digest != NULL) {
+		for (i = 0; i < 20; i += 4) {
+			/* extracts the 8 least significant bits. */
+			digest[i]     =  context->state[i>>2];
+			digest[i + 1] = (context->state[i>>2] >>  8);
+			digest[i + 2] = (context->state[i>>2] >> 16);
+			digest[i + 3] = (context->state[i>>2] >> 24);
+		}
+	}
+}
+
+/************************ end of file rmd160.c **********************/
diff --git a/ruby_1_8_6/ext/digest/rmd160/rmd160.h b/ruby_1_8_6/ext/digest/rmd160/rmd160.h
new file mode 100644
index 0000000000..54d1ca9140
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/rmd160/rmd160.h
@@ -0,0 +1,56 @@
+/*	$NetBSD: rmd160.h,v 1.2 2000/07/07 10:47:06 ad Exp $	*/
+/*	$RoughId: rmd160.h,v 1.3 2002/02/24 08:14:31 knu Exp $	*/
+/*	$Id$	*/
+
+/********************************************************************\
+ *
+ *      FILE:     rmd160.h
+ *
+ *      CONTENTS: Header file for a sample C-implementation of the
+ *                RIPEMD-160 hash-function. 
+ *      TARGET:   any computer with an ANSI C compiler
+ *
+ *      AUTHOR:   Antoon Bosselaers, ESAT-COSIC
+ *      DATE:     1 March 1996
+ *      VERSION:  1.0
+ *
+ *      Copyright (c) Katholieke Universiteit Leuven
+ *      1996, All Rights Reserved
+ *
+\********************************************************************/
+
+/*
+ * from OpenBSD: rmd160.h,v 1.4 1999/08/16 09:59:04 millert Exp
+ */
+
+#ifndef _RMD160_H_
+#define _RMD160_H_
+
+#include "defs.h"
+
+typedef struct {
+	uint32_t	state[5];	/* state (ABCDE) */
+	uint32_t	length[2];	/* number of bits */
+	uint8_t		bbuffer[64];    /* overflow buffer */
+	uint32_t	buflen;		/* number of chars in bbuffer */
+} RMD160_CTX;
+
+#ifdef RUBY
+#define RMD160_Init	rb_Digest_RMD160_Init
+#define RMD160_Transform	rb_Digest_RMD160_Transform
+#define RMD160_Update	rb_Digest_RMD160_Update
+#define RMD160_Finish	rb_Digest_RMD160_Finish
+#endif
+
+__BEGIN_DECLS
+void	RMD160_Init _((RMD160_CTX *));
+void	RMD160_Transform _((uint32_t[5], const uint32_t[16]));
+void	RMD160_Update _((RMD160_CTX *, const uint8_t *, size_t));
+void	RMD160_Finish _((RMD160_CTX *, uint8_t[20]));
+__END_DECLS
+
+#define RMD160_BLOCK_LENGTH             64
+#define RMD160_DIGEST_LENGTH            20
+#define RMD160_DIGEST_STRING_LENGTH     (RMD160_DIGEST_LENGTH * 2 + 1)
+
+#endif  /* !_RMD160_H_ */
diff --git a/ruby_1_8_6/ext/digest/rmd160/rmd160init.c b/ruby_1_8_6/ext/digest/rmd160/rmd160init.c
new file mode 100644
index 0000000000..763867df86
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/rmd160/rmd160init.c
@@ -0,0 +1,40 @@
+/* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
+/* $Id$ */
+
+#include "digest.h"
+#if defined(HAVE_OPENSSL_RIPEMD_H)
+#include "rmd160ossl.h"
+#else
+#include "rmd160.h"
+#endif
+
+static rb_digest_metadata_t rmd160 = {
+    RUBY_DIGEST_API_VERSION,
+    RMD160_DIGEST_LENGTH,
+    RMD160_BLOCK_LENGTH,
+    sizeof(RMD160_CTX),
+    (rb_digest_hash_init_func_t)RMD160_Init,
+    (rb_digest_hash_update_func_t)RMD160_Update,
+    (rb_digest_hash_finish_func_t)RMD160_Finish,
+};
+
+/*
+ * A class for calculating message digests using RIPEMD-160
+ * cryptographic hash function, designed by Hans Dobbertin, Antoon
+ * Bosselaers, and Bart Preneel.
+ */
+void
+Init_rmd160()
+{
+    VALUE mDigest, cDigest_Base, cDigest_RMD160;
+
+    rb_require("digest");
+
+    mDigest = rb_path2class("Digest");
+    cDigest_Base = rb_path2class("Digest::Base");
+
+    cDigest_RMD160 = rb_define_class_under(mDigest, "RMD160", cDigest_Base);
+
+    rb_ivar_set(cDigest_RMD160, rb_intern("metadata"),
+      Data_Wrap_Struct(rb_cObject, 0, 0, &rmd160));
+}
diff --git a/ruby_1_8_6/ext/digest/rmd160/rmd160ossl.c b/ruby_1_8_6/ext/digest/rmd160/rmd160ossl.c
new file mode 100644
index 0000000000..f24e63e3d8
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/rmd160/rmd160ossl.c
@@ -0,0 +1,8 @@
+/* $Id$ */
+
+#include "defs.h"
+#include "rmd160ossl.h"
+
+void RMD160_Finish(RMD160_CTX *ctx, char *buf) {
+	RIPEMD160_Final((unsigned char *)buf, ctx);
+}
diff --git a/ruby_1_8_6/ext/digest/rmd160/rmd160ossl.h b/ruby_1_8_6/ext/digest/rmd160/rmd160ossl.h
new file mode 100644
index 0000000000..3df38a01c0
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/rmd160/rmd160ossl.h
@@ -0,0 +1,19 @@
+/* $Id$ */
+
+#ifndef RMD160OSSL_H_INCLUDED
+#define RMD160OSSL_H_INCLUDED
+
+#include <stddef.h>
+#include <openssl/ripemd.h>
+
+#define RMD160_CTX	RIPEMD160_CTX
+
+#define RMD160_Init	RIPEMD160_Init
+#define RMD160_Update	RIPEMD160_Update
+
+#define RMD160_BLOCK_LENGTH		RIPEMD160_CBLOCK
+#define RMD160_DIGEST_LENGTH		RIPEMD160_DIGEST_LENGTH
+
+void RMD160_Finish(RMD160_CTX *ctx, char *buf);
+
+#endif
diff --git a/ruby_1_8_6/ext/digest/sha1/.cvsignore b/ruby_1_8_6/ext/digest/sha1/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha1/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/digest/sha1/depend b/ruby_1_8_6/ext/digest/sha1/depend
new file mode 100644
index 0000000000..61607844d0
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha1/depend
@@ -0,0 +1,6 @@
+sha1.o: sha1.c sha1.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
+  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
+sha1init.o: sha1init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
+  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
+  sha1.h $(srcdir)/../defs.h
+sha1ossl.o: sha1ossl.h  $(srcdir)/../defs.h
diff --git a/ruby_1_8_6/ext/digest/sha1/extconf.rb b/ruby_1_8_6/ext/digest/sha1/extconf.rb
new file mode 100644
index 0000000000..87b74c34af
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha1/extconf.rb
@@ -0,0 +1,28 @@
+# $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
+# $Id$
+
+require "mkmf"
+
+$defs << "-DHAVE_CONFIG_H"
+$INCFLAGS << " -I$(srcdir)/.."
+
+$objs = [ "sha1init.#{$OBJEXT}" ]
+
+dir_config("openssl")
+
+if !with_config("bundled-sha1") &&
+    have_library("crypto") && have_header("openssl/sha.h")
+  $objs << "sha1ossl.#{$OBJEXT}"
+else
+  $objs << "sha1.#{$OBJEXT}"
+end
+
+have_header("sys/cdefs.h")
+
+have_header("inttypes.h")
+
+have_header("unistd.h")
+
+$preload = %w[digest]
+
+create_makefile("digest/sha1")
diff --git a/ruby_1_8_6/ext/digest/sha1/sha1.c b/ruby_1_8_6/ext/digest/sha1/sha1.c
new file mode 100644
index 0000000000..6196ca6b82
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha1/sha1.c
@@ -0,0 +1,269 @@
+/*	$NetBSD: sha1.c,v 1.2 2001/03/22 09:51:48 agc Exp $	*/
+/*	$OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $	*/
+/*	$RoughId: sha1.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
+/*	$Id$	*/
+
+/*
+ * SHA-1 in C
+ * By Steve Reid <steve@edmweb.com>
+ * 100% Public Domain
+ *
+ * Test Vectors (from FIPS PUB 180-1)
+ * "abc"
+ *   A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+ * "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+ *   84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+ * A million repetitions of "a"
+ *   34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+ */
+
+#include "sha1.h"
+
+#define SHA1HANDSOFF		/* Copies data before messing with it. */
+
+#if defined(_KERNEL) || defined(_STANDALONE)
+#include <sys/param.h>
+#include <sys/systm.h>
+#define _DIAGASSERT(x)	(void)0
+#else
+/* #include "namespace.h" */
+#include <assert.h>
+#include <string.h>
+#endif
+
+#ifndef _DIAGASSERT
+#define _DIAGASSERT(cond)	assert(cond)
+#endif
+
+/*
+ * XXX Kludge until there is resolution regarding mem*() functions
+ * XXX in the kernel.
+ */
+#if defined(_KERNEL) || defined(_STANDALONE)
+#define	memcpy(s, d, l)		bcopy((d), (s), (l))
+#endif
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/*
+ * blk0() and blk() perform the initial expand.
+ * I got the idea of expanding during the round function from SSLeay
+ */
+#ifndef WORDS_BIGENDIAN
+# define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+    |(rol(block->l[i],8)&0x00FF00FF))
+#else
+# define blk0(i) block->l[i]
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+    ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/*
+ * (R0+R1), R2, R3, R4 are the different operations (rounds) used in SHA1
+ */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+typedef union {
+    uint8_t c[64];
+    uint32_t l[16];
+} CHAR64LONG16;
+
+#ifdef __sparc_v9__
+void do_R01(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *);
+void do_R2(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *);
+void do_R3(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *);
+void do_R4(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *);
+
+#define nR0(v,w,x,y,z,i) R0(*v,*w,*x,*y,*z,i)
+#define nR1(v,w,x,y,z,i) R1(*v,*w,*x,*y,*z,i)
+#define nR2(v,w,x,y,z,i) R2(*v,*w,*x,*y,*z,i)
+#define nR3(v,w,x,y,z,i) R3(*v,*w,*x,*y,*z,i)
+#define nR4(v,w,x,y,z,i) R4(*v,*w,*x,*y,*z,i)
+
+void
+do_R01(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *block)
+{
+    nR0(a,b,c,d,e, 0); nR0(e,a,b,c,d, 1); nR0(d,e,a,b,c, 2); nR0(c,d,e,a,b, 3);
+    nR0(b,c,d,e,a, 4); nR0(a,b,c,d,e, 5); nR0(e,a,b,c,d, 6); nR0(d,e,a,b,c, 7);
+    nR0(c,d,e,a,b, 8); nR0(b,c,d,e,a, 9); nR0(a,b,c,d,e,10); nR0(e,a,b,c,d,11);
+    nR0(d,e,a,b,c,12); nR0(c,d,e,a,b,13); nR0(b,c,d,e,a,14); nR0(a,b,c,d,e,15);
+    nR1(e,a,b,c,d,16); nR1(d,e,a,b,c,17); nR1(c,d,e,a,b,18); nR1(b,c,d,e,a,19);
+}
+
+void
+do_R2(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *block)
+{
+    nR2(a,b,c,d,e,20); nR2(e,a,b,c,d,21); nR2(d,e,a,b,c,22); nR2(c,d,e,a,b,23);
+    nR2(b,c,d,e,a,24); nR2(a,b,c,d,e,25); nR2(e,a,b,c,d,26); nR2(d,e,a,b,c,27);
+    nR2(c,d,e,a,b,28); nR2(b,c,d,e,a,29); nR2(a,b,c,d,e,30); nR2(e,a,b,c,d,31);
+    nR2(d,e,a,b,c,32); nR2(c,d,e,a,b,33); nR2(b,c,d,e,a,34); nR2(a,b,c,d,e,35);
+    nR2(e,a,b,c,d,36); nR2(d,e,a,b,c,37); nR2(c,d,e,a,b,38); nR2(b,c,d,e,a,39);
+}
+
+void
+do_R3(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *block)
+{
+    nR3(a,b,c,d,e,40); nR3(e,a,b,c,d,41); nR3(d,e,a,b,c,42); nR3(c,d,e,a,b,43);
+    nR3(b,c,d,e,a,44); nR3(a,b,c,d,e,45); nR3(e,a,b,c,d,46); nR3(d,e,a,b,c,47);
+    nR3(c,d,e,a,b,48); nR3(b,c,d,e,a,49); nR3(a,b,c,d,e,50); nR3(e,a,b,c,d,51);
+    nR3(d,e,a,b,c,52); nR3(c,d,e,a,b,53); nR3(b,c,d,e,a,54); nR3(a,b,c,d,e,55);
+    nR3(e,a,b,c,d,56); nR3(d,e,a,b,c,57); nR3(c,d,e,a,b,58); nR3(b,c,d,e,a,59);
+}
+
+void
+do_R4(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *block)
+{
+    nR4(a,b,c,d,e,60); nR4(e,a,b,c,d,61); nR4(d,e,a,b,c,62); nR4(c,d,e,a,b,63);
+    nR4(b,c,d,e,a,64); nR4(a,b,c,d,e,65); nR4(e,a,b,c,d,66); nR4(d,e,a,b,c,67);
+    nR4(c,d,e,a,b,68); nR4(b,c,d,e,a,69); nR4(a,b,c,d,e,70); nR4(e,a,b,c,d,71);
+    nR4(d,e,a,b,c,72); nR4(c,d,e,a,b,73); nR4(b,c,d,e,a,74); nR4(a,b,c,d,e,75);
+    nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79);
+}
+#endif
+
+/*
+ * Hash a single 512-bit block. This is the core of the algorithm.
+ */
+void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
+{
+    uint32_t a, b, c, d, e;
+    CHAR64LONG16 *block;
+
+#ifdef SHA1HANDSOFF
+    CHAR64LONG16 workspace;
+#endif
+
+    _DIAGASSERT(buffer != 0);
+    _DIAGASSERT(state != 0);
+
+#ifdef SHA1HANDSOFF
+    block = &workspace;
+    (void)memcpy(block, buffer, 64);
+#else
+    block = (CHAR64LONG16 *)(void *)buffer;
+#endif
+
+    /* Copy context->state[] to working vars */
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+
+#ifdef __sparc_v9__
+    do_R01(&a, &b, &c, &d, &e, block);
+    do_R2(&a, &b, &c, &d, &e, block);
+    do_R3(&a, &b, &c, &d, &e, block);
+    do_R4(&a, &b, &c, &d, &e, block);
+#else
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+#endif
+
+    /* Add the working vars back into context.state[] */
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+
+    /* Wipe variables */
+    a = b = c = d = e = 0;
+}
+
+
+/*
+ * SHA1_Init - Initialize new context
+ */
+void SHA1_Init(SHA1_CTX *context)
+{
+
+    _DIAGASSERT(context != 0);
+
+    /* SHA1 initialization constants */
+    context->state[0] = 0x67452301;
+    context->state[1] = 0xEFCDAB89;
+    context->state[2] = 0x98BADCFE;
+    context->state[3] = 0x10325476;
+    context->state[4] = 0xC3D2E1F0;
+    context->count[0] = context->count[1] = 0;
+}
+
+
+/*
+ * Run your data through this.
+ */
+void SHA1_Update(SHA1_CTX *context, const uint8_t *data, size_t len)
+{
+    uint32_t i, j;
+
+    _DIAGASSERT(context != 0);
+    _DIAGASSERT(data != 0);
+
+    j = context->count[0];
+    if ((context->count[0] += len << 3) < j)
+	context->count[1] += (len>>29)+1;
+    j = (j >> 3) & 63;
+    if ((j + len) > 63) {
+	(void)memcpy(&context->buffer[j], data, (i = 64-j));
+	SHA1_Transform(context->state, context->buffer);
+	for ( ; i + 63 < len; i += 64)
+	    SHA1_Transform(context->state, &data[i]);
+	j = 0;
+    } else {
+	i = 0;
+    }
+    (void)memcpy(&context->buffer[j], &data[i], len - i);
+}
+
+
+/*
+ * Add padding and return the message digest.
+ */
+void SHA1_Finish(SHA1_CTX* context, uint8_t digest[20])
+{
+    size_t i;
+    uint8_t finalcount[8];
+
+    _DIAGASSERT(digest != 0);
+    _DIAGASSERT(context != 0);
+
+    for (i = 0; i < 8; i++) {
+	finalcount[i] = (uint8_t)((context->count[(i >= 4 ? 0 : 1)]
+	 >> ((3-(i & 3)) * 8) ) & 255);	 /* Endian independent */
+    }
+    SHA1_Update(context, (const uint8_t *)"\200", 1);
+    while ((context->count[0] & 504) != 448)
+	SHA1_Update(context, (const uint8_t *)"\0", 1);
+    SHA1_Update(context, finalcount, 8);  /* Should cause a SHA1_Transform() */
+
+    if (digest) {
+	for (i = 0; i < 20; i++)
+	    digest[i] = (uint8_t)
+		((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+    }
+}
diff --git a/ruby_1_8_6/ext/digest/sha1/sha1.h b/ruby_1_8_6/ext/digest/sha1/sha1.h
new file mode 100644
index 0000000000..60e3b01fe2
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha1/sha1.h
@@ -0,0 +1,39 @@
+/*	$NetBSD: sha1.h,v 1.2 1998/05/29 22:55:44 thorpej Exp $	*/
+/*	$RoughId: sha1.h,v 1.3 2002/02/24 08:14:32 knu Exp $	*/
+/*	$Id$	*/
+
+/*
+ * SHA-1 in C
+ * By Steve Reid <steve@edmweb.com>
+ * 100% Public Domain
+ */
+
+#ifndef _SYS_SHA1_H_
+#define	_SYS_SHA1_H_
+
+#include "defs.h"
+
+typedef struct {
+	uint32_t state[5];
+	uint32_t count[2];  
+	uint8_t buffer[64];
+} SHA1_CTX;
+
+#ifdef RUBY
+/* avoid name clash */
+#define SHA1_Transform	rb_Digest_SHA1_Transform
+#define SHA1_Init	rb_Digest_SHA1_Init
+#define SHA1_Update	rb_Digest_SHA1_Update
+#define SHA1_Finish	rb_Digest_SHA1_Finish
+#endif
+
+void	SHA1_Transform _((uint32_t state[5], const uint8_t buffer[64]));
+void	SHA1_Init _((SHA1_CTX *context));
+void	SHA1_Update _((SHA1_CTX *context, const uint8_t *data, size_t len));
+void	SHA1_Finish _((SHA1_CTX *context, uint8_t digest[20]));
+
+#define SHA1_BLOCK_LENGTH		64
+#define SHA1_DIGEST_LENGTH		20
+#define SHA1_DIGEST_STRING_LENGTH	(SHA1_DIGEST_LENGTH * 2 + 1)
+  
+#endif /* _SYS_SHA1_H_ */
diff --git a/ruby_1_8_6/ext/digest/sha1/sha1init.c b/ruby_1_8_6/ext/digest/sha1/sha1init.c
new file mode 100644
index 0000000000..b2146f05a9
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha1/sha1init.c
@@ -0,0 +1,40 @@
+/* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
+/* $Id$ */
+
+#include "digest.h"
+#if defined(HAVE_OPENSSL_SHA_H)
+#include "sha1ossl.h"
+#else
+#include "sha1.h"
+#endif
+
+static rb_digest_metadata_t sha1 = {
+    RUBY_DIGEST_API_VERSION,
+    SHA1_DIGEST_LENGTH,
+    SHA1_BLOCK_LENGTH,
+    sizeof(SHA1_CTX),
+    (rb_digest_hash_init_func_t)SHA1_Init,
+    (rb_digest_hash_update_func_t)SHA1_Update,
+    (rb_digest_hash_finish_func_t)SHA1_Finish,
+};
+
+/*
+ * A class for calculating message digests using the SHA-1 Secure Hash
+ * Algorithm by NIST (the US' National Institute of Standards and
+ * Technology), described in FIPS PUB 180-1.
+ */
+void
+Init_sha1()
+{
+    VALUE mDigest, cDigest_Base, cDigest_SHA1;
+ 
+    rb_require("digest");
+ 
+    mDigest = rb_path2class("Digest");
+    cDigest_Base = rb_path2class("Digest::Base");
+
+    cDigest_SHA1 = rb_define_class_under(mDigest, "SHA1", cDigest_Base);
+
+    rb_ivar_set(cDigest_SHA1, rb_intern("metadata"),
+      Data_Wrap_Struct(rb_cObject, 0, 0, &sha1));
+}
diff --git a/ruby_1_8_6/ext/digest/sha1/sha1ossl.c b/ruby_1_8_6/ext/digest/sha1/sha1ossl.c
new file mode 100644
index 0000000000..452cf35084
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha1/sha1ossl.c
@@ -0,0 +1,10 @@
+/* $Id$ */
+
+#include "defs.h"
+#include "sha1ossl.h"
+
+void
+SHA1_Finish(SHA1_CTX *ctx, char *buf)
+{
+	SHA1_Final((unsigned char *)buf, ctx);
+}
diff --git a/ruby_1_8_6/ext/digest/sha1/sha1ossl.h b/ruby_1_8_6/ext/digest/sha1/sha1ossl.h
new file mode 100644
index 0000000000..8f9984cc64
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha1/sha1ossl.h
@@ -0,0 +1,20 @@
+/* $Id$ */
+
+#ifndef SHA1OSSL_H_INCLUDED
+#define SHA1OSSL_H_INCLUDED
+
+#include <stddef.h>
+#include <openssl/sha.h>
+
+#define SHA1_CTX	SHA_CTX
+
+#ifdef SHA_BLOCK_LENGTH
+#define SHA1_BLOCK_LENGTH	SHA_BLOCK_LENGTH
+#else
+#define SHA1_BLOCK_LENGTH	SHA_CBLOCK
+#endif
+#define SHA1_DIGEST_LENGTH	SHA_DIGEST_LENGTH
+
+void SHA1_Finish(SHA1_CTX *ctx, char *buf);
+
+#endif
diff --git a/ruby_1_8_6/ext/digest/sha2/.cvsignore b/ruby_1_8_6/ext/digest/sha2/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha2/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/digest/sha2/depend b/ruby_1_8_6/ext/digest/sha2/depend
new file mode 100644
index 0000000000..225d6ad52b
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha2/depend
@@ -0,0 +1,5 @@
+sha2.o: sha2.c sha2.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
+  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
+sha2init.o: sha2init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
+  $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
+  sha2.h $(srcdir)/../defs.h
diff --git a/ruby_1_8_6/ext/digest/sha2/extconf.rb b/ruby_1_8_6/ext/digest/sha2/extconf.rb
new file mode 100644
index 0000000000..c084a51a64
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha2/extconf.rb
@@ -0,0 +1,24 @@
+# $RoughId: extconf.rb,v 1.4 2001/08/14 19:54:51 knu Exp $
+# $Id$
+
+require "mkmf"
+
+$defs << "-DHAVE_CONFIG_H"
+$INCFLAGS << " -I$(srcdir)/.."
+
+$objs = [
+  "sha2.#{$OBJEXT}",
+  "sha2init.#{$OBJEXT}",
+]
+
+have_header("sys/cdefs.h")
+
+have_header("inttypes.h")
+
+have_header("unistd.h")
+
+$preload = %w[digest]
+
+if have_type("uint64_t", "defs.h", $defs.join(' '))
+  create_makefile("digest/sha2")
+end
diff --git a/ruby_1_8_6/ext/digest/sha2/lib/sha2.rb b/ruby_1_8_6/ext/digest/sha2/lib/sha2.rb
new file mode 100644
index 0000000000..52dd639f9b
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha2/lib/sha2.rb
@@ -0,0 +1,73 @@
+#--
+# sha2.rb - defines Digest::SHA2 class which wraps up the SHA256,
+#           SHA384, and SHA512 classes.
+#++
+# Copyright (c) 2006 Akinori MUSHA <knu@iDaemons.org>
+#
+# All rights reserved.  You can redistribute and/or modify it under the same
+# terms as Ruby.
+#
+#   $Id$
+
+require 'digest'
+
+module Digest
+  #
+  # A meta digest provider class for SHA256, SHA384 and SHA512.
+  #
+  class SHA2 < Digest::Class
+    # call-seq:
+    #     Digest::SHA2.new(bitlen = 256) -> digest_obj
+    #
+    # Creates a new SHA2 hash object with a given bit length.
+    def initialize(bitlen = 256)
+      case bitlen
+      when 256
+        @sha2 = Digest::SHA256.new
+      when 384
+        @sha2 = Digest::SHA384.new
+      when 512
+        @sha2 = Digest::SHA512.new
+      else
+        raise ArgumentError, "unsupported bit length: %s" % bitlen.inspect
+      end
+      @bitlen = bitlen
+    end
+
+    # :nodoc:
+    def reset
+      @sha2.reset
+      self
+    end
+
+    # :nodoc:
+    def update(str)
+      @sha2.update(str)
+      self
+    end
+    alias << update
+
+    def finish
+      @sha2.digest!
+    end
+    private :finish
+
+    def block_length
+      @sha2.block_length
+    end
+
+    def digest_length
+      @sha2.digest_length
+    end
+
+    # :nodoc:
+    def initialize_copy(other)
+      @sha2 = other.instance_eval { @sha2.clone }
+    end
+
+    # :nodoc:
+    def inspect
+      "#<%s:%d %s>" % [self.class.name, @bitlen, hexdigest]
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/digest/sha2/sha2.c b/ruby_1_8_6/ext/digest/sha2/sha2.c
new file mode 100644
index 0000000000..aca9ee926f
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha2/sha2.c
@@ -0,0 +1,919 @@
+/*
+ * sha2.c
+ *
+ * Version 1.0.0beta1
+ *
+ * Written by Aaron D. Gifford <me@aarongifford.com>
+ *
+ * Copyright 2000 Aaron D. Gifford.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+/* $RoughId: sha2.c,v 1.3 2002/02/26 22:03:36 knu Exp $ */
+/* $Id$ */
+
+#include "sha2.h"
+#include <stdio.h>
+#include <string.h>	/* memcpy()/memset() or bcopy()/bzero() */
+#include <assert.h>	/* assert() */
+
+/*
+ * ASSERT NOTE:
+ * Some sanity checking code is included using assert().  On my FreeBSD
+ * system, this additional code can be removed by compiling with NDEBUG
+ * defined.  Check your own systems manpage on assert() to see how to
+ * compile WITHOUT the sanity checking code on your system.
+ *
+ * UNROLLED TRANSFORM LOOP NOTE:
+ * You can define SHA2_UNROLL_TRANSFORM to use the unrolled transform
+ * loop version for the hash transform rounds (defined using macros
+ * later in this file).  Either define on the command line, for example:
+ *
+ *   cc -DSHA2_UNROLL_TRANSFORM -o sha2 sha2.c sha2prog.c
+ *
+ * or define below:
+ *
+ *   #define SHA2_UNROLL_TRANSFORM
+ *
+ */
+
+
+/*** SHA-256/384/512 Machine Architecture Definitions *****************/
+typedef uint8_t  sha2_byte;	/* Exactly 1 byte */
+typedef uint32_t sha2_word32;	/* Exactly 4 bytes */
+typedef uint64_t sha2_word64;	/* Exactly 8 bytes */
+
+#if defined(__GNUC__) || defined(_HPUX_SOURCE) || defined(__IBMC__)
+#define ULL(number)	number##ULL
+#else
+#define ULL(number)	(uint64_t)(number)
+#endif
+
+
+/*** SHA-256/384/512 Various Length Definitions ***********************/
+/* NOTE: Most of these are in sha2.h */
+#define SHA256_SHORT_BLOCK_LENGTH	(SHA256_BLOCK_LENGTH - 8)
+#define SHA384_SHORT_BLOCK_LENGTH	(SHA384_BLOCK_LENGTH - 16)
+#define SHA512_SHORT_BLOCK_LENGTH	(SHA512_BLOCK_LENGTH - 16)
+
+
+/*** ENDIAN REVERSAL MACROS *******************************************/
+#ifndef WORDS_BIGENDIAN
+#define REVERSE32(w,x)	{ \
+	sha2_word32 tmp = (w); \
+	tmp = (tmp >> 16) | (tmp << 16); \
+	(x) = ((tmp & 0xff00ff00UL) >> 8) | ((tmp & 0x00ff00ffUL) << 8); \
+}
+#define REVERSE64(w,x)	{ \
+	sha2_word64 tmp = (w); \
+	tmp = (tmp >> 32) | (tmp << 32); \
+	tmp = ((tmp & ULL(0xff00ff00ff00ff00)) >> 8) | \
+	      ((tmp & ULL(0x00ff00ff00ff00ff)) << 8); \
+	(x) = ((tmp & ULL(0xffff0000ffff0000)) >> 16) | \
+	      ((tmp & ULL(0x0000ffff0000ffff)) << 16); \
+}
+#endif
+
+/*
+ * Macro for incrementally adding the unsigned 64-bit integer n to the
+ * unsigned 128-bit integer (represented using a two-element array of
+ * 64-bit words):
+ */
+#define ADDINC128(w,n)	{ \
+	(w)[0] += (sha2_word64)(n); \
+	if ((w)[0] < (n)) { \
+		(w)[1]++; \
+	} \
+}
+
+/*
+ * Macros for copying blocks of memory and for zeroing out ranges
+ * of memory.  Using these macros makes it easy to switch from
+ * using memset()/memcpy() and using bzero()/bcopy().
+ *
+ * Please define either SHA2_USE_MEMSET_MEMCPY or define
+ * SHA2_USE_BZERO_BCOPY depending on which function set you
+ * choose to use:
+ */
+#if !defined(SHA2_USE_MEMSET_MEMCPY) && !defined(SHA2_USE_BZERO_BCOPY)
+/* Default to memset()/memcpy() if no option is specified */
+#define	SHA2_USE_MEMSET_MEMCPY	1
+#endif
+#if defined(SHA2_USE_MEMSET_MEMCPY) && defined(SHA2_USE_BZERO_BCOPY)
+/* Abort with an error if BOTH options are defined */
+#error Define either SHA2_USE_MEMSET_MEMCPY or SHA2_USE_BZERO_BCOPY, not both!
+#endif
+
+#ifdef SHA2_USE_MEMSET_MEMCPY
+#define MEMSET_BZERO(p,l)	memset((p), 0, (l))
+#define MEMCPY_BCOPY(d,s,l)	memcpy((d), (s), (l))
+#endif
+#ifdef SHA2_USE_BZERO_BCOPY
+#define MEMSET_BZERO(p,l)	bzero((p), (l))
+#define MEMCPY_BCOPY(d,s,l)	bcopy((s), (d), (l))
+#endif
+
+
+/*** THE SIX LOGICAL FUNCTIONS ****************************************/
+/*
+ * Bit shifting and rotation (used by the six SHA-XYZ logical functions:
+ *
+ *   NOTE:  The naming of R and S appears backwards here (R is a SHIFT and
+ *   S is a ROTATION) because the SHA-256/384/512 description document
+ *   (see http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf) uses this
+ *   same "backwards" definition.
+ */
+/* Shift-right (used in SHA-256, SHA-384, and SHA-512): */
+#define R(b,x) 		((x) >> (b))
+/* 32-bit Rotate-right (used in SHA-256): */
+#define S32(b,x)	(((x) >> (b)) | ((x) << (32 - (b))))
+/* 64-bit Rotate-right (used in SHA-384 and SHA-512): */
+#define S64(b,x)	(((x) >> (b)) | ((x) << (64 - (b))))
+
+/* Two of six logical functions used in SHA-256, SHA-384, and SHA-512: */
+#define Ch(x,y,z)	(((x) & (y)) ^ ((~(x)) & (z)))
+#define Maj(x,y,z)	(((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+
+/* Four of six logical functions used in SHA-256: */
+#define Sigma0_256(x)	(S32(2,  (x)) ^ S32(13, (x)) ^ S32(22, (x)))
+#define Sigma1_256(x)	(S32(6,  (x)) ^ S32(11, (x)) ^ S32(25, (x)))
+#define sigma0_256(x)	(S32(7,  (x)) ^ S32(18, (x)) ^ R(3 ,   (x)))
+#define sigma1_256(x)	(S32(17, (x)) ^ S32(19, (x)) ^ R(10,   (x)))
+
+/* Four of six logical functions used in SHA-384 and SHA-512: */
+#define Sigma0_512(x)	(S64(28, (x)) ^ S64(34, (x)) ^ S64(39, (x)))
+#define Sigma1_512(x)	(S64(14, (x)) ^ S64(18, (x)) ^ S64(41, (x)))
+#define sigma0_512(x)	(S64( 1, (x)) ^ S64( 8, (x)) ^ R( 7,   (x)))
+#define sigma1_512(x)	(S64(19, (x)) ^ S64(61, (x)) ^ R( 6,   (x)))
+
+/*** INTERNAL FUNCTION PROTOTYPES *************************************/
+/* NOTE: These should not be accessed directly from outside this
+ * library -- they are intended for private internal visibility/use
+ * only.
+ */
+void SHA512_Last(SHA512_CTX*);
+void SHA256_Transform(SHA256_CTX*, const sha2_word32*);
+void SHA512_Transform(SHA512_CTX*, const sha2_word64*);
+
+
+/*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/
+/* Hash constant words K for SHA-256: */
+const static sha2_word32 K256[64] = {
+	0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
+	0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
+	0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
+	0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL,
+	0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
+	0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL,
+	0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL,
+	0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL,
+	0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL,
+	0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
+	0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL,
+	0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL,
+	0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL,
+	0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL,
+	0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
+	0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
+};
+
+/* Initial hash value H for SHA-256: */
+const static sha2_word32 sha256_initial_hash_value[8] = {
+	0x6a09e667UL,
+	0xbb67ae85UL,
+	0x3c6ef372UL,
+	0xa54ff53aUL,
+	0x510e527fUL,
+	0x9b05688cUL,
+	0x1f83d9abUL,
+	0x5be0cd19UL
+};
+
+/* Hash constant words K for SHA-384 and SHA-512: */
+const static sha2_word64 K512[80] = {
+	ULL(0x428a2f98d728ae22), ULL(0x7137449123ef65cd),
+	ULL(0xb5c0fbcfec4d3b2f), ULL(0xe9b5dba58189dbbc),
+	ULL(0x3956c25bf348b538), ULL(0x59f111f1b605d019),
+	ULL(0x923f82a4af194f9b), ULL(0xab1c5ed5da6d8118),
+	ULL(0xd807aa98a3030242), ULL(0x12835b0145706fbe),
+	ULL(0x243185be4ee4b28c), ULL(0x550c7dc3d5ffb4e2),
+	ULL(0x72be5d74f27b896f), ULL(0x80deb1fe3b1696b1),
+	ULL(0x9bdc06a725c71235), ULL(0xc19bf174cf692694),
+	ULL(0xe49b69c19ef14ad2), ULL(0xefbe4786384f25e3),
+	ULL(0x0fc19dc68b8cd5b5), ULL(0x240ca1cc77ac9c65),
+	ULL(0x2de92c6f592b0275), ULL(0x4a7484aa6ea6e483),
+	ULL(0x5cb0a9dcbd41fbd4), ULL(0x76f988da831153b5),
+	ULL(0x983e5152ee66dfab), ULL(0xa831c66d2db43210),
+	ULL(0xb00327c898fb213f), ULL(0xbf597fc7beef0ee4),
+	ULL(0xc6e00bf33da88fc2), ULL(0xd5a79147930aa725),
+	ULL(0x06ca6351e003826f), ULL(0x142929670a0e6e70),
+	ULL(0x27b70a8546d22ffc), ULL(0x2e1b21385c26c926),
+	ULL(0x4d2c6dfc5ac42aed), ULL(0x53380d139d95b3df),
+	ULL(0x650a73548baf63de), ULL(0x766a0abb3c77b2a8),
+	ULL(0x81c2c92e47edaee6), ULL(0x92722c851482353b),
+	ULL(0xa2bfe8a14cf10364), ULL(0xa81a664bbc423001),
+	ULL(0xc24b8b70d0f89791), ULL(0xc76c51a30654be30),
+	ULL(0xd192e819d6ef5218), ULL(0xd69906245565a910),
+	ULL(0xf40e35855771202a), ULL(0x106aa07032bbd1b8),
+	ULL(0x19a4c116b8d2d0c8), ULL(0x1e376c085141ab53),
+	ULL(0x2748774cdf8eeb99), ULL(0x34b0bcb5e19b48a8),
+	ULL(0x391c0cb3c5c95a63), ULL(0x4ed8aa4ae3418acb),
+	ULL(0x5b9cca4f7763e373), ULL(0x682e6ff3d6b2b8a3),
+	ULL(0x748f82ee5defb2fc), ULL(0x78a5636f43172f60),
+	ULL(0x84c87814a1f0ab72), ULL(0x8cc702081a6439ec),
+	ULL(0x90befffa23631e28), ULL(0xa4506cebde82bde9),
+	ULL(0xbef9a3f7b2c67915), ULL(0xc67178f2e372532b),
+	ULL(0xca273eceea26619c), ULL(0xd186b8c721c0c207),
+	ULL(0xeada7dd6cde0eb1e), ULL(0xf57d4f7fee6ed178),
+	ULL(0x06f067aa72176fba), ULL(0x0a637dc5a2c898a6),
+	ULL(0x113f9804bef90dae), ULL(0x1b710b35131c471b),
+	ULL(0x28db77f523047d84), ULL(0x32caab7b40c72493),
+	ULL(0x3c9ebe0a15c9bebc), ULL(0x431d67c49c100d4c),
+	ULL(0x4cc5d4becb3e42b6), ULL(0x597f299cfc657e2a),
+	ULL(0x5fcb6fab3ad6faec), ULL(0x6c44198c4a475817)
+};
+
+/* Initial hash value H for SHA-384 */
+const static sha2_word64 sha384_initial_hash_value[8] = {
+	ULL(0xcbbb9d5dc1059ed8),
+	ULL(0x629a292a367cd507),
+	ULL(0x9159015a3070dd17),
+	ULL(0x152fecd8f70e5939),
+	ULL(0x67332667ffc00b31),
+	ULL(0x8eb44a8768581511),
+	ULL(0xdb0c2e0d64f98fa7),
+	ULL(0x47b5481dbefa4fa4)
+};
+
+/* Initial hash value H for SHA-512 */
+const static sha2_word64 sha512_initial_hash_value[8] = {
+	ULL(0x6a09e667f3bcc908),
+	ULL(0xbb67ae8584caa73b),
+	ULL(0x3c6ef372fe94f82b),
+	ULL(0xa54ff53a5f1d36f1),
+	ULL(0x510e527fade682d1),
+	ULL(0x9b05688c2b3e6c1f),
+	ULL(0x1f83d9abfb41bd6b),
+	ULL(0x5be0cd19137e2179)
+};
+
+
+/*** SHA-256: *********************************************************/
+void SHA256_Init(SHA256_CTX* context) {
+	if (context == (SHA256_CTX*)0) {
+		return;
+	}
+	MEMCPY_BCOPY(context->state, sha256_initial_hash_value, SHA256_DIGEST_LENGTH);
+	MEMSET_BZERO(context->buffer, SHA256_BLOCK_LENGTH);
+	context->bitcount = 0;
+}
+
+#ifdef SHA2_UNROLL_TRANSFORM
+
+/* Unrolled SHA-256 round macros: */
+
+#ifndef WORDS_BIGENDIAN
+
+#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h)	\
+	REVERSE32(*data++, W256[j]); \
+	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
+             K256[j] + W256[j]; \
+	(d) += T1; \
+	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
+	j++
+
+
+#else
+
+#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h)	\
+	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
+	     K256[j] + (W256[j] = *data++); \
+	(d) += T1; \
+	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
+	j++
+
+#endif
+
+#define ROUND256(a,b,c,d,e,f,g,h)	\
+	s0 = W256[(j+1)&0x0f]; \
+	s0 = sigma0_256(s0); \
+	s1 = W256[(j+14)&0x0f]; \
+	s1 = sigma1_256(s1); \
+	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + K256[j] + \
+	     (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0); \
+	(d) += T1; \
+	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
+	j++
+
+void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
+	sha2_word32	a, b, c, d, e, f, g, h, s0, s1;
+	sha2_word32	T1, *W256;
+	int		j;
+
+	W256 = (sha2_word32*)context->buffer;
+
+	/* Initialize registers with the prev. intermediate value */
+	a = context->state[0];
+	b = context->state[1];
+	c = context->state[2];
+	d = context->state[3];
+	e = context->state[4];
+	f = context->state[5];
+	g = context->state[6];
+	h = context->state[7];
+
+	j = 0;
+	do {
+		/* Rounds 0 to 15 (unrolled): */
+		ROUND256_0_TO_15(a,b,c,d,e,f,g,h);
+		ROUND256_0_TO_15(h,a,b,c,d,e,f,g);
+		ROUND256_0_TO_15(g,h,a,b,c,d,e,f);
+		ROUND256_0_TO_15(f,g,h,a,b,c,d,e);
+		ROUND256_0_TO_15(e,f,g,h,a,b,c,d);
+		ROUND256_0_TO_15(d,e,f,g,h,a,b,c);
+		ROUND256_0_TO_15(c,d,e,f,g,h,a,b);
+		ROUND256_0_TO_15(b,c,d,e,f,g,h,a);
+	} while (j < 16);
+
+	/* Now for the remaining rounds to 64: */
+	do {
+		ROUND256(a,b,c,d,e,f,g,h);
+		ROUND256(h,a,b,c,d,e,f,g);
+		ROUND256(g,h,a,b,c,d,e,f);
+		ROUND256(f,g,h,a,b,c,d,e);
+		ROUND256(e,f,g,h,a,b,c,d);
+		ROUND256(d,e,f,g,h,a,b,c);
+		ROUND256(c,d,e,f,g,h,a,b);
+		ROUND256(b,c,d,e,f,g,h,a);
+	} while (j < 64);
+
+	/* Compute the current intermediate hash value */
+	context->state[0] += a;
+	context->state[1] += b;
+	context->state[2] += c;
+	context->state[3] += d;
+	context->state[4] += e;
+	context->state[5] += f;
+	context->state[6] += g;
+	context->state[7] += h;
+
+	/* Clean up */
+	a = b = c = d = e = f = g = h = T1 = 0;
+}
+
+#else /* SHA2_UNROLL_TRANSFORM */
+
+void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
+	sha2_word32	a, b, c, d, e, f, g, h, s0, s1;
+	sha2_word32	T1, T2, *W256;
+	int		j;
+
+	W256 = (sha2_word32*)context->buffer;
+
+	/* Initialize registers with the prev. intermediate value */
+	a = context->state[0];
+	b = context->state[1];
+	c = context->state[2];
+	d = context->state[3];
+	e = context->state[4];
+	f = context->state[5];
+	g = context->state[6];
+	h = context->state[7];
+
+	j = 0;
+	do {
+#ifndef WORDS_BIGENDIAN
+		/* Copy data while converting to host byte order */
+		REVERSE32(*data++,W256[j]);
+		/* Apply the SHA-256 compression function to update a..h */
+		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + W256[j];
+#else
+		/* Apply the SHA-256 compression function to update a..h with copy */
+		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + (W256[j] = *data++);
+#endif
+		T2 = Sigma0_256(a) + Maj(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + T1;
+		d = c;
+		c = b;
+		b = a;
+		a = T1 + T2;
+
+		j++;
+	} while (j < 16);
+
+	do {
+		/* Part of the message block expansion: */
+		s0 = W256[(j+1)&0x0f];
+		s0 = sigma0_256(s0);
+		s1 = W256[(j+14)&0x0f];	
+		s1 = sigma1_256(s1);
+
+		/* Apply the SHA-256 compression function to update a..h */
+		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + 
+		     (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0);
+		T2 = Sigma0_256(a) + Maj(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + T1;
+		d = c;
+		c = b;
+		b = a;
+		a = T1 + T2;
+
+		j++;
+	} while (j < 64);
+
+	/* Compute the current intermediate hash value */
+	context->state[0] += a;
+	context->state[1] += b;
+	context->state[2] += c;
+	context->state[3] += d;
+	context->state[4] += e;
+	context->state[5] += f;
+	context->state[6] += g;
+	context->state[7] += h;
+
+	/* Clean up */
+	a = b = c = d = e = f = g = h = T1 = T2 = 0;
+}
+
+#endif /* SHA2_UNROLL_TRANSFORM */
+
+void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
+	unsigned int	freespace, usedspace;
+
+	if (len == 0) {
+		/* Calling with no data is valid - we do nothing */
+		return;
+	}
+
+	/* Sanity check: */
+	assert(context != NULL && data != NULL);
+
+	usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
+	if (usedspace > 0) {
+		/* Calculate how much free space is available in the buffer */
+		freespace = SHA256_BLOCK_LENGTH - usedspace;
+
+		if (len >= freespace) {
+			/* Fill the buffer completely and process it */
+			MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace);
+			context->bitcount += freespace << 3;
+			len -= freespace;
+			data += freespace;
+			SHA256_Transform(context, (sha2_word32*)context->buffer);
+		} else {
+			/* The buffer is not yet full */
+			MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
+			context->bitcount += len << 3;
+			/* Clean up: */
+			usedspace = freespace = 0;
+			return;
+		}
+	}
+	while (len >= SHA256_BLOCK_LENGTH) {
+		/* Process as many complete blocks as we can */
+		SHA256_Transform(context, (const sha2_word32*)data);
+		context->bitcount += SHA256_BLOCK_LENGTH << 3;
+		len -= SHA256_BLOCK_LENGTH;
+		data += SHA256_BLOCK_LENGTH;
+	}
+	if (len > 0) {
+		/* There's left-overs, so save 'em */
+		MEMCPY_BCOPY(context->buffer, data, len);
+		context->bitcount += len << 3;
+	}
+	/* Clean up: */
+	usedspace = freespace = 0;
+}
+
+void SHA256_Finish(SHA256_CTX* context, sha2_byte digest[]) {
+	sha2_word32	*d = (sha2_word32*)digest;
+	unsigned int	usedspace;
+
+	/* Sanity check: */
+	assert(context != NULL);
+
+	/* If no digest buffer is passed, we don't bother doing this: */
+	if (digest != (sha2_byte*)0) {
+		usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
+#ifndef WORDS_BIGENDIAN
+		/* Convert FROM host byte order */
+		REVERSE64(context->bitcount,context->bitcount);
+#endif
+		if (usedspace > 0) {
+			/* Begin padding with a 1 bit: */
+			context->buffer[usedspace++] = 0x80;
+
+			if (usedspace <= SHA256_SHORT_BLOCK_LENGTH) {
+				/* Set-up for the last transform: */
+				MEMSET_BZERO(&context->buffer[usedspace], SHA256_SHORT_BLOCK_LENGTH - usedspace);
+			} else {
+				if (usedspace < SHA256_BLOCK_LENGTH) {
+					MEMSET_BZERO(&context->buffer[usedspace], SHA256_BLOCK_LENGTH - usedspace);
+				}
+				/* Do second-to-last transform: */
+				SHA256_Transform(context, (sha2_word32*)context->buffer);
+
+				/* And set-up for the last transform: */
+				MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
+			}
+		} else {
+			/* Set-up for the last transform: */
+			MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
+
+			/* Begin padding with a 1 bit: */
+			*context->buffer = 0x80;
+		}
+		/* Set the bit count: */
+		*(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount;
+
+		/* Final transform: */
+		SHA256_Transform(context, (sha2_word32*)context->buffer);
+
+#ifndef WORDS_BIGENDIAN
+		{
+			/* Convert TO host byte order */
+			int	j;
+			for (j = 0; j < 8; j++) {
+				REVERSE32(context->state[j],context->state[j]);
+				*d++ = context->state[j];
+			}
+		}
+#else
+		MEMCPY_BCOPY(d, context->state, SHA256_DIGEST_LENGTH);
+#endif
+	}
+
+	/* Clean up state data: */
+	MEMSET_BZERO(context, sizeof(SHA256_CTX));
+	usedspace = 0;
+}
+
+/*** SHA-512: *********************************************************/
+void SHA512_Init(SHA512_CTX* context) {
+	if (context == (SHA512_CTX*)0) {
+		return;
+	}
+	MEMCPY_BCOPY(context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH);
+	MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH);
+	context->bitcount[0] = context->bitcount[1] =  0;
+}
+
+#ifdef SHA2_UNROLL_TRANSFORM
+
+/* Unrolled SHA-512 round macros: */
+#ifndef WORDS_BIGENDIAN
+
+#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h)	\
+	REVERSE64(*data++, W512[j]); \
+	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
+             K512[j] + W512[j]; \
+	(d) += T1, \
+	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)), \
+	j++
+
+
+#else
+
+#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h)	\
+	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
+             K512[j] + (W512[j] = *data++); \
+	(d) += T1; \
+	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
+	j++
+
+#endif
+
+#define ROUND512(a,b,c,d,e,f,g,h)	\
+	s0 = W512[(j+1)&0x0f]; \
+	s0 = sigma0_512(s0); \
+	s1 = W512[(j+14)&0x0f]; \
+	s1 = sigma1_512(s1); \
+	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + K512[j] + \
+             (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0); \
+	(d) += T1; \
+	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
+	j++
+
+void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
+	sha2_word64	a, b, c, d, e, f, g, h, s0, s1;
+	sha2_word64	T1, *W512 = (sha2_word64*)context->buffer;
+	int		j;
+
+	/* Initialize registers with the prev. intermediate value */
+	a = context->state[0];
+	b = context->state[1];
+	c = context->state[2];
+	d = context->state[3];
+	e = context->state[4];
+	f = context->state[5];
+	g = context->state[6];
+	h = context->state[7];
+
+	j = 0;
+	do {
+		ROUND512_0_TO_15(a,b,c,d,e,f,g,h);
+		ROUND512_0_TO_15(h,a,b,c,d,e,f,g);
+		ROUND512_0_TO_15(g,h,a,b,c,d,e,f);
+		ROUND512_0_TO_15(f,g,h,a,b,c,d,e);
+		ROUND512_0_TO_15(e,f,g,h,a,b,c,d);
+		ROUND512_0_TO_15(d,e,f,g,h,a,b,c);
+		ROUND512_0_TO_15(c,d,e,f,g,h,a,b);
+		ROUND512_0_TO_15(b,c,d,e,f,g,h,a);
+	} while (j < 16);
+
+	/* Now for the remaining rounds up to 79: */
+	do {
+		ROUND512(a,b,c,d,e,f,g,h);
+		ROUND512(h,a,b,c,d,e,f,g);
+		ROUND512(g,h,a,b,c,d,e,f);
+		ROUND512(f,g,h,a,b,c,d,e);
+		ROUND512(e,f,g,h,a,b,c,d);
+		ROUND512(d,e,f,g,h,a,b,c);
+		ROUND512(c,d,e,f,g,h,a,b);
+		ROUND512(b,c,d,e,f,g,h,a);
+	} while (j < 80);
+
+	/* Compute the current intermediate hash value */
+	context->state[0] += a;
+	context->state[1] += b;
+	context->state[2] += c;
+	context->state[3] += d;
+	context->state[4] += e;
+	context->state[5] += f;
+	context->state[6] += g;
+	context->state[7] += h;
+
+	/* Clean up */
+	a = b = c = d = e = f = g = h = T1 = 0;
+}
+
+#else /* SHA2_UNROLL_TRANSFORM */
+
+void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
+	sha2_word64	a, b, c, d, e, f, g, h, s0, s1;
+	sha2_word64	T1, T2, *W512 = (sha2_word64*)context->buffer;
+	int		j;
+
+	/* Initialize registers with the prev. intermediate value */
+	a = context->state[0];
+	b = context->state[1];
+	c = context->state[2];
+	d = context->state[3];
+	e = context->state[4];
+	f = context->state[5];
+	g = context->state[6];
+	h = context->state[7];
+
+	j = 0;
+	do {
+#ifndef WORDS_BIGENDIAN
+		/* Convert TO host byte order */
+		REVERSE64(*data++, W512[j]);
+		/* Apply the SHA-512 compression function to update a..h */
+		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + W512[j];
+#else
+		/* Apply the SHA-512 compression function to update a..h with copy */
+		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + (W512[j] = *data++);
+#endif
+		T2 = Sigma0_512(a) + Maj(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + T1;
+		d = c;
+		c = b;
+		b = a;
+		a = T1 + T2;
+
+		j++;
+	} while (j < 16);
+
+	do {
+		/* Part of the message block expansion: */
+		s0 = W512[(j+1)&0x0f];
+		s0 = sigma0_512(s0);
+		s1 = W512[(j+14)&0x0f];
+		s1 =  sigma1_512(s1);
+
+		/* Apply the SHA-512 compression function to update a..h */
+		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] +
+		     (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0);
+		T2 = Sigma0_512(a) + Maj(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + T1;
+		d = c;
+		c = b;
+		b = a;
+		a = T1 + T2;
+
+		j++;
+	} while (j < 80);
+
+	/* Compute the current intermediate hash value */
+	context->state[0] += a;
+	context->state[1] += b;
+	context->state[2] += c;
+	context->state[3] += d;
+	context->state[4] += e;
+	context->state[5] += f;
+	context->state[6] += g;
+	context->state[7] += h;
+
+	/* Clean up */
+	a = b = c = d = e = f = g = h = T1 = T2 = 0;
+}
+
+#endif /* SHA2_UNROLL_TRANSFORM */
+
+void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
+	unsigned int	freespace, usedspace;
+
+	if (len == 0) {
+		/* Calling with no data is valid - we do nothing */
+		return;
+	}
+
+	/* Sanity check: */
+	assert(context != NULL && data != NULL);
+
+	usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
+	if (usedspace > 0) {
+		/* Calculate how much free space is available in the buffer */
+		freespace = SHA512_BLOCK_LENGTH - usedspace;
+
+		if (len >= freespace) {
+			/* Fill the buffer completely and process it */
+			MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace);
+			ADDINC128(context->bitcount, freespace << 3);
+			len -= freespace;
+			data += freespace;
+			SHA512_Transform(context, (const sha2_word64*)context->buffer);
+		} else {
+			/* The buffer is not yet full */
+			MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
+			ADDINC128(context->bitcount, len << 3);
+			/* Clean up: */
+			usedspace = freespace = 0;
+			return;
+		}
+	}
+	while (len >= SHA512_BLOCK_LENGTH) {
+		/* Process as many complete blocks as we can */
+		SHA512_Transform(context, (const sha2_word64*)data);
+		ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
+		len -= SHA512_BLOCK_LENGTH;
+		data += SHA512_BLOCK_LENGTH;
+	}
+	if (len > 0) {
+		/* There's left-overs, so save 'em */
+		MEMCPY_BCOPY(context->buffer, data, len);
+		ADDINC128(context->bitcount, len << 3);
+	}
+	/* Clean up: */
+	usedspace = freespace = 0;
+}
+
+void SHA512_Last(SHA512_CTX* context) {
+	unsigned int	usedspace;
+
+	usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
+#ifndef WORDS_BIGENDIAN
+	/* Convert FROM host byte order */
+	REVERSE64(context->bitcount[0],context->bitcount[0]);
+	REVERSE64(context->bitcount[1],context->bitcount[1]);
+#endif
+	if (usedspace > 0) {
+		/* Begin padding with a 1 bit: */
+		context->buffer[usedspace++] = 0x80;
+
+		if (usedspace <= SHA512_SHORT_BLOCK_LENGTH) {
+			/* Set-up for the last transform: */
+			MEMSET_BZERO(&context->buffer[usedspace], SHA512_SHORT_BLOCK_LENGTH - usedspace);
+		} else {
+			if (usedspace < SHA512_BLOCK_LENGTH) {
+				MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace);
+			}
+			/* Do second-to-last transform: */
+			SHA512_Transform(context, (const sha2_word64*)context->buffer);
+
+			/* And set-up for the last transform: */
+			MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2);
+		}
+	} else {
+		/* Prepare for final transform: */
+		MEMSET_BZERO(context->buffer, SHA512_SHORT_BLOCK_LENGTH);
+
+		/* Begin padding with a 1 bit: */
+		*context->buffer = 0x80;
+	}
+	/* Store the length of input data (in bits): */
+	*(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1];
+	*(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
+
+	/* Final transform: */
+	SHA512_Transform(context, (const sha2_word64*)context->buffer);
+}
+
+void SHA512_Finish(SHA512_CTX* context, sha2_byte digest[]) {
+	sha2_word64	*d = (sha2_word64*)digest;
+
+	/* Sanity check: */
+	assert(context != NULL);
+
+	/* If no digest buffer is passed, we don't bother doing this: */
+	if (digest != (sha2_byte*)0) {
+		SHA512_Last(context);
+
+		/* Save the hash data for output: */
+#ifndef WORDS_BIGENDIAN
+		{
+			/* Convert TO host byte order */
+			int	j;
+			for (j = 0; j < 8; j++) {
+				REVERSE64(context->state[j],context->state[j]);
+				*d++ = context->state[j];
+			}
+		}
+#else
+		MEMCPY_BCOPY(d, context->state, SHA512_DIGEST_LENGTH);
+#endif
+	}
+
+	/* Zero out state data */
+	MEMSET_BZERO(context, sizeof(SHA512_CTX));
+}
+
+/*** SHA-384: *********************************************************/
+void SHA384_Init(SHA384_CTX* context) {
+	if (context == (SHA384_CTX*)0) {
+		return;
+	}
+	MEMCPY_BCOPY(context->state, sha384_initial_hash_value, SHA512_DIGEST_LENGTH);
+	MEMSET_BZERO(context->buffer, SHA384_BLOCK_LENGTH);
+	context->bitcount[0] = context->bitcount[1] = 0;
+}
+
+void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
+	SHA512_Update((SHA512_CTX*)context, data, len);
+}
+
+void SHA384_Finish(SHA384_CTX* context, sha2_byte digest[]) {
+	sha2_word64	*d = (sha2_word64*)digest;
+
+	/* Sanity check: */
+	assert(context != NULL);
+
+	/* If no digest buffer is passed, we don't bother doing this: */
+	if (digest != (sha2_byte*)0) {
+		SHA512_Last((SHA512_CTX*)context);
+
+		/* Save the hash data for output: */
+#ifndef WORDS_BIGENDIAN
+		{
+			/* Convert TO host byte order */
+			int	j;
+			for (j = 0; j < 6; j++) {
+				REVERSE64(context->state[j],context->state[j]);
+				*d++ = context->state[j];
+			}
+		}
+#else
+		MEMCPY_BCOPY(d, context->state, SHA384_DIGEST_LENGTH);
+#endif
+	}
+
+	/* Zero out state data */
+	MEMSET_BZERO(context, sizeof(SHA384_CTX));
+}
diff --git a/ruby_1_8_6/ext/digest/sha2/sha2.h b/ruby_1_8_6/ext/digest/sha2/sha2.h
new file mode 100644
index 0000000000..917d415b73
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha2/sha2.h
@@ -0,0 +1,109 @@
+/*
+ * sha2.h
+ *
+ * Version 1.0.0beta1
+ *
+ * Written by Aaron D. Gifford <me@aarongifford.com>
+ *
+ * Copyright 2000 Aaron D. Gifford.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+/* $RoughId: sha2.h,v 1.3 2002/02/24 08:14:32 knu Exp $ */
+/* $Id$ */
+
+#ifndef __SHA2_H__
+#define __SHA2_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "defs.h"
+
+
+/*** SHA-256/384/512 Various Length Definitions ***********************/
+#define SHA256_BLOCK_LENGTH		64
+#define SHA256_DIGEST_LENGTH		32
+#define SHA256_DIGEST_STRING_LENGTH	(SHA256_DIGEST_LENGTH * 2 + 1)
+#define SHA384_BLOCK_LENGTH		128
+#define SHA384_DIGEST_LENGTH		48
+#define SHA384_DIGEST_STRING_LENGTH	(SHA384_DIGEST_LENGTH * 2 + 1)
+#define SHA512_BLOCK_LENGTH		128
+#define SHA512_DIGEST_LENGTH		64
+#define SHA512_DIGEST_STRING_LENGTH	(SHA512_DIGEST_LENGTH * 2 + 1)
+
+
+/*** SHA-256/384/512 Context Structures *******************************/
+
+typedef struct _SHA256_CTX {
+	uint32_t	state[8];
+	uint64_t	bitcount;
+	uint8_t	buffer[SHA256_BLOCK_LENGTH];
+} SHA256_CTX;
+typedef struct _SHA512_CTX {
+	uint64_t	state[8];
+	uint64_t	bitcount[2];
+	uint8_t	buffer[SHA512_BLOCK_LENGTH];
+} SHA512_CTX;
+
+typedef SHA512_CTX SHA384_CTX;
+
+
+#ifdef RUBY
+#define SHA256_Init		rb_Digest_SHA256_Init
+#define SHA256_Update		rb_Digest_SHA256_Update
+#define SHA256_Finish		rb_Digest_SHA256_Finish
+
+#define SHA384_Init		rb_Digest_SHA384_Init
+#define SHA384_Update		rb_Digest_SHA384_Update
+#define SHA384_Finish		rb_Digest_SHA384_Finish
+
+#define SHA512_Init		rb_Digest_SHA512_Init
+#define SHA512_Update		rb_Digest_SHA512_Update
+#define SHA512_Finish		rb_Digest_SHA512_Finish
+#endif
+
+/*** SHA-256/384/512 Function Prototypes ******************************/
+void SHA256_Init _((SHA256_CTX *));
+void SHA256_Update _((SHA256_CTX*, const uint8_t*, size_t));
+void SHA256_Finish _((SHA256_CTX*, uint8_t[SHA256_DIGEST_LENGTH]));
+
+void SHA384_Init _((SHA384_CTX*));
+void SHA384_Update _((SHA384_CTX*, const uint8_t*, size_t));
+void SHA384_Finish _((SHA384_CTX*, uint8_t[SHA384_DIGEST_LENGTH]));
+
+void SHA512_Init _((SHA512_CTX*));
+void SHA512_Update _((SHA512_CTX*, const uint8_t*, size_t));
+void SHA512_Finish _((SHA512_CTX*, uint8_t[SHA512_DIGEST_LENGTH]));
+
+#ifdef	__cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __SHA2_H__ */
+
diff --git a/ruby_1_8_6/ext/digest/sha2/sha2init.c b/ruby_1_8_6/ext/digest/sha2/sha2init.c
new file mode 100644
index 0000000000..c83a29316a
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/sha2/sha2init.c
@@ -0,0 +1,52 @@
+/* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
+/* $Id$ */
+
+#include "digest.h"
+#include "sha2.h"
+
+#define FOREACH_BITLEN(func)	func(256) func(384) func(512)
+
+#define DEFINE_ALGO_METADATA(bitlen) \
+static rb_digest_metadata_t sha##bitlen = { \
+    RUBY_DIGEST_API_VERSION, \
+    SHA##bitlen##_DIGEST_LENGTH, \
+    SHA##bitlen##_BLOCK_LENGTH, \
+    sizeof(SHA##bitlen##_CTX), \
+    (rb_digest_hash_init_func_t)SHA##bitlen##_Init, \
+    (rb_digest_hash_update_func_t)SHA##bitlen##_Update, \
+    (rb_digest_hash_finish_func_t)SHA##bitlen##_Finish, \
+};
+
+FOREACH_BITLEN(DEFINE_ALGO_METADATA)
+
+/*
+ * Classes for calculating message digests using the SHA-256/384/512
+ * Secure Hash Algorithm(s) by NIST (the US' National Institute of
+ * Standards and Technology), described in FIPS PUB 180-2.
+ */
+void
+Init_sha2()
+{
+    VALUE mDigest, cDigest_Base;
+    ID id_metadata;
+
+#define DECLARE_ALGO_CLASS(bitlen) \
+    VALUE cDigest_SHA##bitlen;
+
+    FOREACH_BITLEN(DECLARE_ALGO_CLASS)
+
+    rb_require("digest");
+
+    id_metadata = rb_intern("metadata");
+
+    mDigest = rb_path2class("Digest");
+    cDigest_Base = rb_path2class("Digest::Base");
+
+#define DEFINE_ALGO_CLASS(bitlen) \
+    cDigest_SHA##bitlen = rb_define_class_under(mDigest, "SHA" #bitlen, cDigest_Base); \
+\
+    rb_ivar_set(cDigest_SHA##bitlen, id_metadata, \
+      Data_Wrap_Struct(rb_cObject, 0, 0, &sha##bitlen));
+
+    FOREACH_BITLEN(DEFINE_ALGO_CLASS)
+}
diff --git a/ruby_1_8_6/ext/digest/test.sh b/ruby_1_8_6/ext/digest/test.sh
new file mode 100644
index 0000000000..328c7575e6
--- /dev/null
+++ b/ruby_1_8_6/ext/digest/test.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# $RoughId: test.sh,v 1.5 2001/07/13 15:38:27 knu Exp $
+# $Id$
+
+RUBY=${RUBY:=ruby}
+MAKE=${MAKE:=make}
+CFLAGS=${CFLAGS:=-Wall}
+
+${RUBY} extconf.rb --with-cflags="${CFLAGS}"
+${MAKE} clean
+${MAKE}
+
+for algo in md5 rmd160 sha1 sha2; do
+    args=--with-cflags="${CFLAGS}"
+
+    if [ $WITH_BUNDLED_ENGINES ]; then
+	args="$args --with-bundled-$algo"
+    fi
+
+    (cd $algo &&
+	${RUBY} extconf.rb $args;
+	${MAKE} clean;
+	${MAKE})
+    ln -sf ../../$algo/$algo.so lib/digest/
+done
+
+${RUBY} -I. -I./lib ../../test/digest/test_digest.rb
+
+rm lib/digest/*.so
diff --git a/ruby_1_8_6/ext/dl/.cvsignore b/ruby_1_8_6/ext/dl/.cvsignore
new file mode 100644
index 0000000000..6d884b6cec
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/.cvsignore
@@ -0,0 +1,8 @@
+Makefile
+mkmf.log
+dlconfig.h
+dlconfig.rb
+*.func
+*.o
+*~
+*.def
diff --git a/ruby_1_8_6/ext/dl/depend b/ruby_1_8_6/ext/dl/depend
new file mode 100644
index 0000000000..fba3df7a3d
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/depend
@@ -0,0 +1,46 @@
+LDSHARED_TEST = $(LDSHARED) $(LDFLAGS) test/test.o -o test/libtest.so $(LOCAL_LIBS)
+
+libtest.so: test/libtest.so
+
+test/libtest.so: test/test.o $(srcdir)/test/libtest.def
+	$(RUBY) -rftools -e 'ARGV.each do|d|File.mkpath(File.dirname(d))end' $@
+	$(LDSHARED_TEST:dl.def=test/libtest.def)
+
+test/test.o: $(srcdir)/test/test.c
+	@$(RUBY) -rftools -e 'File.mkpath(*ARGV)' test
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/test/test.c -o $@
+
+test:: dl.so libtest.so force
+	$(RUBY) -I. -I$(srcdir)/lib $(srcdir)/test/test.rb
+
+force:
+
+.PHONY: force test
+
+allclean: distclean
+	@rm -f $(CLEANFILES) $(DISTCLEANFILES)
+
+$(OBJS): ./dlconfig.h
+
+sym.o: dl.h call.func
+
+dl.o: dl.h callback.func cbtable.func
+
+ptr.o: dl.h
+
+handle.o: dl.h
+
+call.func: $(srcdir)/mkcall.rb ./dlconfig.rb
+	@echo "Generating call.func"
+	@$(RUBY) $(srcdir)/mkcall.rb > $@
+
+callback.func: $(srcdir)/mkcallback.rb ./dlconfig.rb
+	@echo "Generating callback.func"
+	@$(RUBY) $(srcdir)/mkcallback.rb > $@
+
+cbtable.func: $(srcdir)/mkcbtable.rb ./dlconfig.rb
+	@echo "Generating cbtable.func"
+	@$(RUBY) $(srcdir)/mkcbtable.rb > $@
+
+debug:
+	$(MAKE) CPPFLAGS="$(CPPFLAGS) -DDEBUG"
diff --git a/ruby_1_8_6/ext/dl/dl.c b/ruby_1_8_6/ext/dl/dl.c
new file mode 100644
index 0000000000..5ba3646ea3
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/dl.c
@@ -0,0 +1,728 @@
+/*
+ * $Id$
+ */
+
+#include <ruby.h>
+#include <rubyio.h>
+#include <ctype.h>
+#include "dl.h"
+
+VALUE rb_mDL;
+VALUE rb_eDLError;
+VALUE rb_eDLTypeError;
+
+static VALUE DLFuncTable;
+static void *rb_dl_callback_table[CALLBACK_TYPES][MAX_CALLBACK];
+static ID id_call;
+
+static int
+rb_dl_scan_callback_args(long stack[], const char *proto,
+			 int *argc, VALUE argv[])
+{
+  int i;
+  long *sp;
+  VALUE val;
+
+  sp = stack;
+  for (i=1; proto[i]; i++) {
+    switch (proto[i]) {
+    case 'C':
+      {
+	char v;
+	v = (char)(*sp);
+	sp++;
+	val = INT2NUM(v);
+      }
+      break;
+    case 'H':
+      {
+	short v;
+	v = (short)(*sp);
+	sp++;
+	val = INT2NUM(v);
+      }
+      break;
+    case 'I':
+      {
+	int v;
+	v = (int)(*sp);
+	sp++;
+	val = INT2NUM(v);
+      }
+      break;
+    case 'L':
+      {
+	long v;
+	v = (long)(*sp);
+	sp++;
+	val = INT2NUM(v);
+      }
+      break;
+    case 'F':
+      {
+	float v;
+	memcpy(&v, sp, sizeof(float));
+	sp += sizeof(float)/sizeof(long);
+	val = rb_float_new(v);
+      }
+      break;
+    case 'D':
+      {
+	double v;
+	memcpy(&v, sp, sizeof(double));
+	sp += sizeof(double)/sizeof(long);
+	val = rb_float_new(v);
+      }
+      break;
+    case 'P':
+      {
+	void *v;
+	memcpy(&v, sp, sizeof(void*));
+	sp++;
+	val = rb_dlptr_new(v, 0, 0);
+      }
+      break;
+    case 'S':
+      {
+	char *v;
+	memcpy(&v, sp, sizeof(void*));
+	sp++;
+	val = rb_tainted_str_new2(v);
+      }
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unsupported type `%c'", proto[i]);
+      break;
+    }
+    argv[i-1] = val;
+  }
+  *argc = (i - 1);
+
+  return (*argc);
+}
+
+#include "callback.func"
+
+static void
+init_dl_func_table(){
+#include "cbtable.func"
+}
+
+void *
+dlmalloc(size_t size)
+{
+  DEBUG_CODE2({
+    void *ptr;
+
+    printf("dlmalloc(%d)",size);
+    ptr = xmalloc(size);
+    printf(":0x%x\n",ptr);
+    return ptr;
+  },
+  {
+    return xmalloc(size);
+  });
+}
+
+void *
+dlrealloc(void *ptr, size_t size)
+{
+  DEBUG_CODE({
+    printf("dlrealloc(0x%x,%d)\n",ptr,size);
+  });
+  return xrealloc(ptr, size);
+}
+
+void
+dlfree(void *ptr)
+{
+  DEBUG_CODE({
+    printf("dlfree(0x%x)\n",ptr);
+  });
+  xfree(ptr);
+}
+
+char*
+dlstrdup(const char *str)
+{
+  char *newstr;
+
+  newstr = (char*)dlmalloc(strlen(str)+1);
+  strcpy(newstr,str);
+
+  return newstr;
+}
+
+size_t
+dlsizeof(const char *cstr)
+{
+  size_t size;
+  int i, len, n, dlen;
+  char *d;
+
+  len  = strlen(cstr);
+  size = 0;
+  for (i=0; i<len; i++) {
+    n = 1;
+    if (isdigit(cstr[i+1])) {
+      dlen = 1;
+      while (isdigit(cstr[i+dlen])) { dlen ++; };
+      dlen --;
+      d = ALLOCA_N(char, dlen + 1);
+      strncpy(d, cstr + i + 1, dlen);
+      d[dlen] = '\0';
+      n = atoi(d);
+    }
+    else{
+      dlen = 0;
+    }
+
+    switch (cstr[i]) {
+    case 'I':
+      DLALIGN(0,size,INT_ALIGN);
+    case 'i':
+      size += sizeof(int) * n;
+      break;
+    case 'L':
+      DLALIGN(0,size,LONG_ALIGN);
+    case 'l':
+      size += sizeof(long) * n;
+      break;
+    case 'F':
+      DLALIGN(0,size,FLOAT_ALIGN);
+    case 'f':
+      size += sizeof(float) * n;
+      break;
+    case 'D':
+      DLALIGN(0,size,DOUBLE_ALIGN);
+    case 'd':
+      size += sizeof(double) * n;
+      break;
+    case 'C':
+    case 'c':
+      size += sizeof(char) * n;
+      break;
+    case 'H':
+      DLALIGN(0,size,SHORT_ALIGN);
+    case 'h':
+      size += sizeof(short) * n;
+      break;
+    case 'P':
+    case 'S':
+      DLALIGN(0,size,VOIDP_ALIGN);
+    case 'p':
+    case 's':
+      size += sizeof(void*) * n;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type '%c'", cstr[i]);
+      break;
+    }
+    i += dlen;
+  }
+
+  return size;
+}
+
+static float *
+c_farray(VALUE v, long *size)
+{
+  int i, len;
+  float *ary;
+  VALUE e;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(float) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    case T_FLOAT:
+      ary[i] = (float)(RFLOAT(e)->value);
+      break;
+    case T_NIL:
+      ary[i] = 0.0;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
+    }
+  }
+
+  return ary;
+}
+
+static double *
+c_darray(VALUE v, long *size)
+{
+  int i, len;
+  double *ary;
+  VALUE e;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(double) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    case T_FLOAT:
+      ary[i] = (double)(RFLOAT(e)->value);
+      break;
+    case T_NIL:
+      ary[i] = 0.0;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
+    }
+  }
+
+  return ary;
+}
+
+static long *
+c_larray(VALUE v, long *size)
+{
+  int i, len;
+  long *ary;
+  VALUE e;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(long) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+      ary[i] = (long)(NUM2INT(e));
+      break;
+    case T_NIL:
+      ary[i] = 0;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
+    }
+  }
+
+  return ary;
+}
+
+static int *
+c_iarray(VALUE v, long *size)
+{
+  int i, len;
+  int *ary;
+  VALUE e;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(int) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+      ary[i] = (int)(NUM2INT(e));
+      break;
+    case T_NIL:
+      ary[i] = 0;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
+    }
+  }
+
+  return ary;
+}
+
+static short *
+c_harray(VALUE v, long *size)
+{
+  int i, len;
+  short *ary;
+  VALUE e;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(short) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+      ary[i] = (short)(NUM2INT(e));
+      break;
+    case T_NIL:
+      ary[i] = 0;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
+    }
+  }
+
+  return ary;
+}
+
+static char *
+c_carray(VALUE v, long *size)
+{
+  int i, len;
+  char *ary;
+  VALUE e;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(char) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+      ary[i] = (char)(NUM2INT(e));
+      break;
+    case T_NIL:
+      ary[i] = 0;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
+    }
+  }
+
+  return ary;
+}
+
+static void *
+c_parray(VALUE v, long *size)
+{
+  int i, len;
+  void **ary;
+  VALUE e, tmp;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(void*) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    default:
+      tmp = rb_check_string_type(e);
+      if (NIL_P(tmp)) {
+	  rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      }
+      e = tmp;
+      /* fall through */
+    case T_STRING:
+      rb_check_safe_str(e);
+      {
+	char *str, *src;
+	src = RSTRING(e)->ptr;
+	str = dlstrdup(src);
+	ary[i] = (void*)str;
+      }
+      break;
+    case T_NIL:
+      ary[i] = NULL;
+      break;
+    case T_DATA:
+      if (rb_obj_is_kind_of(e, rb_cDLPtrData)) {
+	struct ptr_data *pdata;
+	Data_Get_Struct(e, struct ptr_data, pdata);
+	ary[i] = (void*)(pdata->ptr);
+      }
+      else{
+        e = rb_funcall(e, rb_intern("to_ptr"), 0);
+        if (rb_obj_is_kind_of(e, rb_cDLPtrData)) {
+	  struct ptr_data *pdata;
+	  Data_Get_Struct(e, struct ptr_data, pdata);
+	  ary[i] = (void*)(pdata->ptr);
+	}
+	else{
+	  rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+	}
+      }
+      break;
+    }
+  }
+
+  return ary;
+}
+
+void *
+rb_ary2cary(char t, VALUE v, long *size)
+{
+  int len;
+  VALUE val0;
+
+  val0 = rb_check_array_type(v);
+  if(NIL_P(val0)) {
+    rb_raise(rb_eDLTypeError, "an array is expected.");
+  }
+  v = val0;
+
+  len = RARRAY(v)->len;
+  if (len == 0) {
+    return NULL;
+  }
+
+  if (!size) {
+    size = ALLOCA_N(long,1);
+  }
+
+  val0 = rb_ary_entry(v,0);
+  switch (TYPE(val0)) {
+  case T_FIXNUM:
+  case T_BIGNUM:
+    switch (t) {
+    case 'C': case 'c':
+      return (void*)c_carray(v,size);
+    case 'H': case 'h':
+      return (void*)c_harray(v,size);
+    case 'I': case 'i':
+      return (void*)c_iarray(v,size);
+    case 'L': case 'l': case 0:
+      return (void*)c_larray(v,size);
+    default:
+      rb_raise(rb_eDLTypeError, "type mismatch");
+    }
+  case T_STRING:
+    return (void*)c_parray(v,size);
+  case T_FLOAT:
+    switch (t) {
+    case 'F': case 'f':
+      return (void*)c_farray(v,size);
+    case 'D': case 'd': case 0:
+      return (void*)c_darray(v,size);
+    }
+    rb_raise(rb_eDLTypeError, "type mismatch");
+  case T_DATA:
+    if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
+      return (void*)c_parray(v,size);
+    }
+    else{
+      val0 = rb_funcall(val0, rb_intern("to_ptr"), 0);
+      if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
+        return (void*)c_parray(v,size);
+      }
+    }
+    rb_raise(rb_eDLTypeError, "type mismatch");
+  case T_NIL:
+    return (void*)c_parray(v, size);
+  default:
+    rb_raise(rb_eDLTypeError, "unsupported type");
+  }
+}
+
+VALUE
+rb_str_to_ptr(VALUE self)
+{
+  char *ptr;
+  int  len;
+
+  len = RSTRING(self)->len;
+  ptr = (char*)dlmalloc(len + 1);
+  memcpy(ptr, RSTRING(self)->ptr, len);
+  ptr[len] = '\0';
+  return rb_dlptr_new((void*)ptr,len,dlfree);
+}
+
+VALUE
+rb_ary_to_ptr(int argc, VALUE argv[], VALUE self)
+{
+  void *ptr;
+  VALUE t;
+  long size;
+
+  switch (rb_scan_args(argc, argv, "01", &t)) {
+  case 1:
+    ptr = rb_ary2cary(StringValuePtr(t)[0], self, &size);
+    break;
+  case 0:
+    ptr = rb_ary2cary(0, self, &size);
+    break;
+  }
+  return ptr ? rb_dlptr_new(ptr, size, dlfree) : Qnil;
+}
+
+VALUE
+rb_io_to_ptr(VALUE self)
+{
+  OpenFile *fptr;
+  FILE     *fp;
+
+  GetOpenFile(self, fptr);
+  fp = fptr->f;
+
+  return fp ? rb_dlptr_new(fp, 0, 0) : Qnil;
+}
+
+VALUE
+rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
+{
+  rb_secure(4);
+  return rb_class_new_instance(argc, argv, rb_cDLHandle);
+}
+
+VALUE
+rb_dl_malloc(VALUE self, VALUE size)
+{
+  rb_secure(4);
+  return rb_dlptr_malloc(DLNUM2LONG(size), dlfree);
+}
+
+VALUE
+rb_dl_strdup(VALUE self, VALUE str)
+{
+  SafeStringValue(str);
+  return rb_dlptr_new(strdup(RSTRING(str)->ptr), RSTRING(str)->len, dlfree);
+}
+
+static VALUE
+rb_dl_sizeof(VALUE self, VALUE str)
+{
+  return INT2NUM(dlsizeof(StringValuePtr(str)));
+}
+
+static VALUE
+rb_dl_callback(int argc, VALUE argv[], VALUE self)
+{
+  VALUE type, proc;
+  int rettype, entry, i;
+  char fname[127];
+
+  rb_secure(4);
+  proc = Qnil;
+  switch (rb_scan_args(argc, argv, "11", &type, &proc)) {
+  case 1:
+    if (rb_block_given_p()) {
+      proc = rb_block_proc();
+    }
+    else{
+      proc = Qnil;
+    }
+  default:
+    break;
+  }
+
+  StringValue(type);
+  switch (RSTRING(type)->ptr[0]) {
+  case '0':
+    rettype = 0x00;
+    break;
+  case 'C':
+    rettype = 0x01;
+    break;
+  case 'H':
+    rettype = 0x02;
+    break;
+  case 'I':
+    rettype = 0x03;
+    break;
+  case 'L':
+    rettype = 0x04;
+    break;
+  case 'F':
+    rettype = 0x05;
+    break;
+  case 'D':
+    rettype = 0x06;
+    break;
+  case 'P':
+    rettype = 0x07;
+    break;
+  default:
+    rb_raise(rb_eDLTypeError, "unsupported type `%c'", RSTRING(type)->ptr[0]);
+  }
+
+  entry = -1;
+  for (i=0; i < MAX_CALLBACK; i++) {
+    if (rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(rettype), INT2NUM(i))) == Qnil) {
+      entry = i;
+      break;
+    }
+  }
+  if (entry < 0) {
+    rb_raise(rb_eDLError, "too many callbacks are defined.");
+  }
+
+  rb_hash_aset(DLFuncTable,
+	       rb_assoc_new(INT2NUM(rettype),INT2NUM(entry)),
+	       rb_assoc_new(type,proc));
+  sprintf(fname, "rb_dl_callback_func_%d_%d", rettype, entry);
+  return rb_dlsym_new((void (*)())rb_dl_callback_table[rettype][entry],
+		      fname, RSTRING(type)->ptr);
+}
+
+static VALUE
+rb_dl_remove_callback(VALUE mod, VALUE sym)
+{
+  freefunc_t f;
+  int i, j;
+
+  rb_secure(4);
+  f = rb_dlsym2csym(sym);
+  for (i=0; i < CALLBACK_TYPES; i++) {
+    for (j=0; j < MAX_CALLBACK; j++) {
+      if (rb_dl_callback_table[i][j] == f) {
+	rb_hash_aset(DLFuncTable, rb_assoc_new(INT2NUM(i),INT2NUM(j)),Qnil);
+	break;
+      }
+    }
+  }
+  return Qnil;
+}
+
+void
+Init_dl()
+{
+  void Init_dlptr();
+  void Init_dlsym();
+  void Init_dlhandle();
+
+  id_call = rb_intern("call");
+
+  rb_mDL = rb_define_module("DL");
+
+  rb_eDLError = rb_define_class_under(rb_mDL, "DLError", rb_eStandardError);
+  rb_eDLTypeError = rb_define_class_under(rb_mDL, "DLTypeError", rb_eDLError);
+
+  DLFuncTable = rb_hash_new();
+  init_dl_func_table();
+  rb_define_const(rb_mDL, "FuncTable", DLFuncTable);
+
+  rb_define_const(rb_mDL, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
+  rb_define_const(rb_mDL, "RTLD_LAZY",   INT2NUM(RTLD_LAZY));
+  rb_define_const(rb_mDL, "RTLD_NOW",    INT2NUM(RTLD_NOW));
+
+  rb_define_const(rb_mDL, "ALIGN_INT",   INT2NUM(ALIGN_INT));
+  rb_define_const(rb_mDL, "ALIGN_LONG",  INT2NUM(ALIGN_LONG));
+  rb_define_const(rb_mDL, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
+  rb_define_const(rb_mDL, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
+  rb_define_const(rb_mDL, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
+  rb_define_const(rb_mDL, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
+
+  rb_define_const(rb_mDL, "MAX_ARG", INT2NUM(MAX_ARG));
+  rb_define_const(rb_mDL, "DLSTACK", rb_tainted_str_new2(DLSTACK_METHOD));
+
+  rb_define_module_function(rb_mDL, "dlopen", rb_dl_dlopen, -1);
+  rb_define_module_function(rb_mDL, "callback", rb_dl_callback, -1);
+  rb_define_module_function(rb_mDL, "define_callback", rb_dl_callback, -1);
+  rb_define_module_function(rb_mDL, "remove_callback", rb_dl_remove_callback, 1);
+  rb_define_module_function(rb_mDL, "malloc", rb_dl_malloc, 1);
+  rb_define_module_function(rb_mDL, "strdup", rb_dl_strdup, 1);
+  rb_define_module_function(rb_mDL, "sizeof", rb_dl_sizeof, 1);
+
+  Init_dlptr();
+  Init_dlsym();
+  Init_dlhandle();
+
+  rb_define_const(rb_mDL, "FREE", rb_dlsym_new(dlfree, "free", "0P"));
+
+  rb_define_method(rb_cString, "to_ptr", rb_str_to_ptr, 0);
+  rb_define_method(rb_cArray, "to_ptr", rb_ary_to_ptr, -1);
+  rb_define_method(rb_cIO, "to_ptr", rb_io_to_ptr, 0);
+}
diff --git a/ruby_1_8_6/ext/dl/dl.def b/ruby_1_8_6/ext/dl/dl.def
new file mode 100644
index 0000000000..cdab4af90d
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/dl.def
@@ -0,0 +1,59 @@
+EXPORTS
+Init_dl
+dlfree
+dlmalloc
+dlrealloc
+dlstrdup
+rb_ary_to_ptr
+rb_dl_dlopen
+rb_dl_malloc
+rb_dl_strdup
+rb_eDLError
+rb_eDLTypeError
+rb_io_to_ptr
+rb_mDL
+rb_str_to_ptr
+Init_dlhandle
+rb_cDLHandle
+rb_dlhandle_close
+rb_dlhandle_disable_close
+rb_dlhandle_enable_close
+rb_dlhandle_sym
+Init_dlptr
+rb_cDLPtrData
+rb_dlmem_each
+rb_dlptr2cptr
+rb_dlptr_malloc
+rb_dlptr_aref
+rb_dlptr_aset
+rb_dlptr_cmp
+rb_dlptr_define_data_type
+rb_dlptr_define_struct
+rb_dlptr_define_union
+rb_dlptr_eql
+rb_dlptr_free_get
+rb_dlptr_free_set
+rb_dlptr_get_data_type
+rb_dlptr_inspect
+rb_dlptr_minus
+rb_dlptr_new
+rb_dlptr_new2
+rb_dlptr_null_p
+rb_dlptr_plus
+rb_dlptr_ptr
+rb_dlptr_ref
+rb_dlptr_to_array
+rb_dlptr_to_i
+rb_dlptr_to_s
+rb_dlptr_to_str
+rb_mDLMemorySpace
+Init_dlsym
+rb_cDLSymbol
+rb_dlsym2csym
+rb_dlsym_call
+rb_dlsym_cproto
+rb_dlsym_inspect
+rb_dlsym_name
+rb_dlsym_new
+rb_dlsym_proto
+rb_dlsym_to_ptr
diff --git a/ruby_1_8_6/ext/dl/dl.h b/ruby_1_8_6/ext/dl/dl.h
new file mode 100644
index 0000000000..1faa316cf1
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/dl.h
@@ -0,0 +1,313 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#ifndef RUBY_DL_H
+#define RUBY_DL_H
+
+#include <ruby.h>
+#include <dlconfig.h>
+
+#if defined(HAVE_DLFCN_H)
+# include <dlfcn.h>
+# /* some stranger systems may not define all of these */
+#ifndef RTLD_LAZY
+#define RTLD_LAZY 0
+#endif
+#ifndef RTLD_GLOBAL
+#define RTLD_GLOBAL 0
+#endif
+#ifndef RTLD_NOW
+#define RTLD_NOW 0
+#endif
+#else
+# if defined(HAVE_WINDOWS_H)
+#   include <windows.h>
+#   define dlclose(ptr) FreeLibrary((HINSTANCE)ptr)
+#   define dlopen(name,flag) ((void*)LoadLibrary(name))
+#   define dlerror()    "unknown error"
+#   define dlsym(handle,name) ((void*)GetProcAddress(handle,name))
+#   define RTLD_LAZY -1
+#   define RTLD_NOW  -1
+#   define RTLD_GLOBAL -1
+# endif
+#endif
+
+#if !defined(StringValue)
+# define StringValue(v) if(TYPE(v) != T_STRING) v = rb_str_to_str(v)
+#endif
+#if !defined(StringValuePtr)
+# define StringValuePtr(v) RSTRING((TYPE(v) == T_STRING) ? (v) : rb_str_to_str(v))->ptr
+#endif
+
+#ifdef DEBUG
+#define DEBUG_CODE(b) {printf("DEBUG:%d\n",__LINE__);b;}
+#define DEBUG_CODE2(b1,b2) {printf("DEBUG:%d\n",__LINE__);b1;}
+#else
+#define DEBUG_CODE(b)
+#define DEBUG_CODE2(b1,b2) b2
+#endif
+
+#define VOID_DLTYPE   0x00
+#define CHAR_DLTYPE   0x01
+#define SHORT_DLTYPE  0x02
+#define INT_DLTYPE    0x03
+#define LONG_DLTYPE   0x04
+#define FLOAT_DLTYPE  0x05
+#define DOUBLE_DLTYPE 0x06
+#define VOIDP_DLTYPE  0x07
+
+#define ARG_TYPE(x,i) (((x) & (0x07 << ((i)*3))) >> ((i)*3))
+#define PUSH_ARG(x,t) do{x <<= 3; x |= t;}while(0)
+#define PUSH_0(x) PUSH_ARG(x,VOID_DLTYPE)
+
+#if SIZEOF_INT == SIZEOF_LONG
+# define PUSH_I(x) PUSH_ARG(x,LONG_DLTYPE)
+# define ANY2I(x)  x.l
+# define DLINT(x)  (long)x
+#else
+# define PUSH_I(x) PUSH_ARG(x,INT_DLTYPE)
+# define ANY2I(x)  x.i
+# define DLINT(x)  (int)x
+#endif
+#define PUSH_L(x) PUSH_ARG(x,LONG_DLTYPE)
+#define ANY2L(x)  x.l
+#define DLLONG(x) (long)x
+
+#if defined(WITH_TYPE_FLOAT)
+# if SIZEOF_FLOAT == SIZEOF_DOUBLE
+#   define PUSH_F(x) PUSH_ARG(x,DOUBLE_DLTYPE)
+#   define ANY2F(x)  (x.d)
+#   define DLFLOAT(x) ((double)x)
+# else
+#   define PUSH_F(x) PUSH_ARG(x,FLOAT_DLTYPE)
+#   define ANY2F(x)  (x.f)
+#   define DLFLOAT(x) ((float)x)
+# endif
+#else
+# define PUSH_F(x) PUSH_ARG(x,DOUBLE_DLTYPE)
+# define ANY2F(x)  (x.d)
+# define DLFLOAT(x) ((double)x)
+#endif
+#define PUSH_D(x) PUSH_ARG(x,DOUBLE_DLTYPE)
+#define ANY2D(x)  (x.d)
+#define DLDOUBLE(x) ((double)x)
+
+#if SIZEOF_INT == SIZEOF_VOIDP && SIZEOF_INT != SIZEOF_LONG
+# define PUSH_P(x) PUSH_ARG(x,INT_DLTYPE)
+# define ANY2P(x)  (x.i)
+# define DLVOIDP(x) ((int)x)
+#elif SIZEOF_LONG == SIZEOF_VOIDP
+# define PUSH_P(x) PUSH_ARG(x,LONG_DLTYPE)
+# define ANY2P(x)  (x.l)
+# define DLVOIDP(x) ((long)x)
+#else
+# define PUSH_P(x) PUSH_ARG(x,VOIDP_DLTYPE)
+# define ANY2P(x)  (x.p)
+# define DLVOIDP(x) ((void*)p)
+#endif
+
+#if defined(WITH_TYPE_CHAR)
+# define PUSH_C(x) PUSH_ARG(x,CHAR_DLTYPE)
+# define ANY2C(x)  (x.c)
+# define DLCHAR(x) ((char)x)
+#else
+# define PUSH_C(x) PUSH_I(x)
+# define ANY2C(x)  ANY2I(x)
+# define DLCHAR(x) DLINT(x)
+#endif
+
+#if defined(WITH_TYPE_SHORT)
+# define PUSH_H(x) PUSH_ARG(x,SHORT_DLTYPE)
+# define ANY2H(x)  (x.h)
+# define DLSHORT(x) ((short)x)
+#else
+# define PUSH_H(x) PUSH_I(x)
+# define ANY2H(x)  ANY2I(x)
+# define DLSHORT(x) DLINT(x)
+#endif
+
+#define PUSH_S(x) PUSH_P(x)
+#define ANY2S(x) ANY2P(x)
+#define DLSTR(x) DLVOIDP(x)
+
+#define CBPUSH_0(x) PUSH_0(x)
+#define CBPUSH_C(x) PUSH_C(x)
+#define CBPUSH_H(x) PUSH_H(x)
+#define CBPUSH_I(x) PUSH_I(x)
+#define CBPUSH_L(x) PUSH_L(x)
+#define CBPUSH_F(x) PUSH_F(x)
+#define CBPUSH_D(x) PUSH_D(x)
+#if defined(WITH_CBTYPE_VOIDP)
+# define CBPUSH_P(x) PUSH_ARG(x,VOIDP_DLTYPE)
+#else
+# define CBPUSH_P(x) PUSH_P(x)
+#endif
+
+
+#if defined(USE_INLINE_ASM)
+# if defined(__i386__) && defined(__GNUC__)
+#   define DLSTACK
+#   define DLSTACK_METHOD "asm"
+#   define DLSTACK_REVERSE
+#   define DLSTACK_PROTO
+#   define DLSTACK_ARGS
+#   define DLSTACK_START(sym)
+#   define DLSTACK_END(sym)
+#   define DLSTACK_PUSH_C(x) asm volatile ("pushl %0" :: "g" (x));
+#   define DLSTACK_PUSH_H(x) asm volatile ("pushl %0" :: "g" (x));
+#   define DLSTACK_PUSH_I(x) asm volatile ("pushl %0" :: "g" (x));
+#   define DLSTACK_PUSH_L(x) asm volatile ("pushl %0" :: "g" (x));
+#   define DLSTACK_PUSH_P(x) asm volatile ("pushl %0" :: "g" (x));
+#   define DLSTACK_PUSH_F(x) asm volatile ("flds %0"::"g"(x));\
+                             asm volatile ("subl $4,%esp");\
+                             asm volatile ("fstps (%esp)");
+#   define DLSTACK_PUSH_D(x) asm volatile ("fldl %0"::"g"(x));\
+                             asm volatile ("subl $8,%esp");\
+                             asm volatile ("fstpl (%esp)")
+# else
+# error --with-asm is not supported on this machine
+# endif
+#elif defined(USE_DLSTACK)
+# define DLSTACK
+# define DLSTACK_GUARD
+# define DLSTACK_METHOD "dl"
+# define DLSTACK_PROTO long,long,long,long,long,\
+                       long,long,long,long,long,\
+                       long,long,long,long,long
+# define DLSTACK_ARGS  stack[0],stack[1],stack[2],stack[3],stack[4],\
+                       stack[5],stack[6],stack[7],stack[8],stack[9],\
+                       stack[10],stack[11],stack[12],stack[13],stack[14]
+# define DLSTACK_SIZE  (sizeof(long)*15)
+# define DLSTACK_START(sym)
+# define DLSTACK_END(sym)
+# define DLSTACK_PUSH_C(x)  {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
+# define DLSTACK_PUSH_H(x)  {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
+# define DLSTACK_PUSH_I(x)  {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
+# define DLSTACK_PUSH_L(x)  memcpy(sp,&x,sizeof(long)); sp++;
+# define DLSTACK_PUSH_P(x)  memcpy(sp,&x,sizeof(void*)); sp++;
+# define DLSTACK_PUSH_F(x)  memcpy(sp,&x,sizeof(float)); sp+=sizeof(float)/sizeof(long);
+# define DLSTACK_PUSH_D(x)  memcpy(sp,&x,sizeof(double)); sp+=sizeof(double)/sizeof(long);
+#else
+# define DLSTACK_METHOD "none"
+#endif
+
+extern VALUE rb_mDL;
+extern VALUE rb_mDLMemorySpace;
+extern VALUE rb_cDLHandle;
+extern VALUE rb_cDLSymbol;
+extern VALUE rb_cDLPtrData;
+extern VALUE rb_cDLStructData;
+
+extern VALUE rb_eDLError;
+extern VALUE rb_eDLTypeError;
+
+#if defined(LONG2NUM) && (SIZEOF_LONG == SIZEOF_VOIDP)
+# define DLLONG2NUM(x) LONG2NUM((long)x)
+# define DLNUM2LONG(x) (long)(NUM2LONG(x))
+#else
+# define DLLONG2NUM(x) INT2NUM((long)x)
+# define DLNUM2LONG(x) (long)(NUM2INT(x))
+#endif
+
+typedef struct { char c; void *x; } s_voidp;
+typedef struct { char c; short x; } s_short;
+typedef struct { char c; int x; } s_int;
+typedef struct { char c; long x; } s_long;
+typedef struct { char c; float x; } s_float;
+typedef struct { char c; double x; } s_double;
+
+#define ALIGN_VOIDP  (sizeof(s_voidp) - sizeof(void *))
+#define ALIGN_SHORT  (sizeof(s_short) - sizeof(short))
+#define ALIGN_INT    (sizeof(s_int) - sizeof(int))
+#define ALIGN_LONG   (sizeof(s_long) - sizeof(long))
+#define ALIGN_FLOAT  (sizeof(s_float) - sizeof(float))
+#define ALIGN_DOUBLE (sizeof(s_double) - sizeof(double))
+
+/* for compatibility */
+#define VOIDP_ALIGN  ALIGN_VOIDP
+#define SHORT_ALIGN  ALIGN_SHORT
+#define INT_ALIGN    ALIGN_INT
+#define LONG_ALIGN   ALIGN_LONG
+#define FLOAT_ALIGN  ALIGN_FLOAT
+#define DOUBLE_ALIGN ALIGN_DOUBLE
+
+#define DLALIGN(ptr,offset,align) {\
+  while( (((unsigned long)((char *)ptr + offset)) % align) != 0 ) offset++;\
+}
+
+typedef void (*freefunc_t)(void *);
+#define DLFREEFUNC(func) ((freefunc_t)(func))
+
+typedef union {
+  void*  p;
+  char   c;
+  short  h;
+  int    i;
+  long   l;
+  float  f;
+  double d;
+  char  *s;
+} ANY_TYPE;
+
+struct dl_handle {
+  void *ptr;
+  int  open;
+  int  enable_close;
+};
+
+struct sym_data {
+  void *func;
+  char *name;
+  char *type;
+  int  len;
+};
+
+enum DLPTR_CTYPE {
+  DLPTR_CTYPE_UNKNOWN,
+  DLPTR_CTYPE_STRUCT,
+  DLPTR_CTYPE_UNION
+};
+
+struct ptr_data {
+  void *ptr;       /* a pointer to the data */
+  freefunc_t free; /* free() */
+  char *stype;      /* array of type specifiers */
+  int  *ssize;      /* size[i] = sizeof(type[i]) > 0 */
+  int  slen;   /* the number of type specifiers */
+  ID   *ids;
+  int  ids_num;
+  int  ctype; /* DLPTR_CTYPE_UNKNOWN, DLPTR_CTYPE_STRUCT, DLPTR_CTYPE_UNION */
+  long size;
+};
+
+#define RDLPTR(obj)  ((struct ptr_data *)(DATA_PTR(obj)))
+#define RDLSYM(obj)  ((struct sym_data *)(DATA_PTR(obj)))
+
+void dlfree(void*);
+void *dlmalloc(size_t);
+void *dlrealloc(void*,size_t);
+char *dlstrdup(const char *);
+size_t dlsizeof(const char *);
+
+void *rb_ary2cary(char t, VALUE ary, long *size);
+
+/*
+void rb_dlmem_delete(void *ptr);
+void rb_dlmem_aset(void *ptr, VALUE obj);
+VALUE rb_dlmem_aref(void *ptr);
+*/
+
+void dlptr_free(struct ptr_data *data);
+void dlptr_init(VALUE val);
+
+VALUE rb_dlptr_new(void *ptr, long size, freefunc_t func);
+VALUE rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func);
+VALUE rb_dlptr_malloc(long size, freefunc_t func);
+void *rb_dlptr2cptr(VALUE val);
+
+VALUE rb_dlsym_new(void (*func)(), const char *name, const char *type);
+freefunc_t rb_dlsym2csym(VALUE val);
+
+
+#endif /* RUBY_DL_H */
diff --git a/ruby_1_8_6/ext/dl/doc/dl.txt b/ruby_1_8_6/ext/dl/doc/dl.txt
new file mode 100644
index 0000000000..893bd21d79
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/doc/dl.txt
@@ -0,0 +1,266 @@
+=begin
+
+= Ruby/DL
+
+Ruby/DL provides an interface to the dynamic linker such as dlopen() on UNIX
+and LoadLibrary() on Windows.
+
+= Building and Installing
+
+  $ ruby extconf.rb    # to create the Makefile
+  $ make               # to build the library 'dl.so'
+  $ make libtest.so    # to build the C library 'libtest.so' for the test script
+  $ make test          # to run the test script
+  $ make install       # to install the library
+  $ make clean         # to remove the created files without Makefile
+  $ make distclean     # to remove the all created files
+
+= Using Ruby/DL
+
+We should usually use DL::Importable module provided by "dl/import.rb".
+It has high-level functions to access library functions. We use
+DL::Importable module to extend a module as follows:
+
+  require "dl/import"
+  module LIBC
+    extend DL::Importable
+  end
+
+Now we can use methods dlload and extern in this module. We load the
+libraries using dlload, and define wrapper methods to library functions
+using extern respectively as follows:
+
+  module LIBC
+    extend DL::Importable
+    dlload "libc.so.6","libm.so.6"
+    extern "int strlen(char*)"
+  end
+  # Note that we should not include the module LIBC from some reason.
+
+We can call the library function strlen() using LIBC.strlen. If the first
+character of given function name is an uppercase, the first character of the
+defined method name becomes lowercase.
+We can also construct memory images of structures and unions using functions
+struct and union which are defined in "dl/struct.rb" as follows:
+
+  require "dl/import"
+  require "dl/struct"
+  module LIBC
+    extend DL::Importable
+    Timeval = struct [       # define timeval structure.
+      "long tv_sec",
+      "long tv_uses",
+    ]
+  end
+  val = LIBC::Timeval.malloc # allocate memory.
+
+Notice that the above example takes LIBC::Timeval.malloc to allocate memory,
+rather than LIBC::Timeval.new. It is because DL::Timeval.new is for wrapping
+an object, PtrData, which has already been created.
+
+We can define a callback using the module function "callback" as follows:
+
+  module Foo
+    extend DL::Importable
+    def my_comp(str1,str2)
+      str1 <=> str2
+    end
+    COMPARE = callback "int my_comp(char*,char*)"
+  end
+
+where Foo::COMPARE is a Symbol object which invokes the method "my_comp".
+
+DL::Importable module is very useful. However, we sometimes encounter a case
+that we must directly use low-level functions such as dlsym(). In such case,
+we would use DL module functions. They are described in next section.
+
+= DL module
+
+Module DL consists of three classes, a few module functions and constants.
+The class Symbol represents the symbol we can call. The class PtrData
+indicates a memory block such as a pointer in C. An object instantiated from
+the class Handle keeps a handle to opened library.
+
+== Constants
+
+* VERSION
+* MAJOR_VERSION
+* MINOR_VERSION
+* PATCH_VERSION
+* RTLD_GLOBAL
+* RTLD_LAZY
+* RTLD_NOW
+* MAX_ARG
+* MAX_CBARG
+* MAX_CBENT
+
+== Functions
+
+* handle = dlopen(lib){|handle| ... }
+  * is quite equal to `Handle.new(lib)'
+
+* sym = set_callback(cbtype, entry){|args| ... }
+* sym = set_callback(cbtype, entry, proc)
+  * makes entry-th pre-defined function to call the proc or given block. the 
+    entry-th pre-defined function is specified by cbtype and entry. cbtype is a
+    prototype of the callback. see also the section `Type specifiers' about 
+    cbtype.
+
+* sym = get_callback(cbtype, entry)
+  * returns the Proc object which is given by the above function
+   `set_callback'.
+
+* ptr = malloc(size, [free = nil])
+  * allocates the size bytes, and returns the pointer as a PtrData object ptr.
+
+* ptr = strdup(str)
+  * returns a PtrData object ptr which represents the pointer to a new string
+    which is a duplicate of the string str.
+
+* size = sizeof(type)
+  * returns the size of type. `sizeof("C") + sizeof("L")' is not equal to
+    `sizeof("CL")'. the latter is assumed to returns the enough size of the
+    structure `struct foo { char c; long l; }', but the size may not equal to
+    `sizeof(foo)' of C.
+
+== Handle class
+
+* handle = Handle.new(lib){|handle| ... }
+  * opens a library lib and returns a Handle object handle. if a block is
+    given, the handle is automatically closed as the block ends.
+
+* Handle#close
+  * closes the handle opened by the above Handle.new(lib).
+
+* sym = Handle#sym(func, prototype = "0"),
+  sym = Handle#[func, prototype = nil]
+
+  * obtains the pointer to a function called func and returns a Symbol object
+    or a DataPtr object. prototype is a string which consists of type
+    specifiers, it indicates the function's prototype. see also the section
+    `Type specifiers'.
+
+== Symbol class
+
+* sym = Symbol.new(addr, type = nil, name = nil)
+  * creates the Symbol object sym with the type type if type is not nil. addr
+    is the address where the function is allocated. If type is nil, it returns
+    a DataPtr object.
+
+* Symbol::char2type(char)
+  * takes a character char that represents a type and returns the type
+    specifier of the C language.
+
+* str = Symbol#proto()
+  * returns the function prototype.
+
+* str = Symbol#name()
+  * Returns the function name.
+
+* str = Symbol#cproto(),
+  str = Symbol#to_s()
+  * returns the prototype of the C language.
+
+* str = Symbol#inspect()
+  * returns the inspectable string.
+
+* r,rs = Symbol#call(arg1,arg2,...,argN),
+  r,rs = Symbol#[](arg1,arg2,...,argN)
+  * calls the function with parameters arg1, arg2, ..., argN. and the result
+    consists of the return value r and parameters rs. rs is an array.
+
+* ptr = Symbol#to_ptr
+  * returns the corresponding PtrData object ptr.
+
+== PtrData class
+
+* ptr = PtrData.new(addr, [size = 0, free = nil])
+  * returns the PtrData object representing the pointer which indicates the
+    address addr. GC frees the memory using the free function.
+
+* PtrData#free=(sym)
+  * If you specify a symbol object sym, GC frees the memory using the function
+    represented by sym.
+
+* sym = PtrData#free
+  * returns a symbol object sym which is used when GC frees the memory. it
+    usually configured by `PtrData#free=' or `PtrData.new'.
+
+* size = PtrData#size, PtrData#size=(size)
+  * gets and sets allocated size of the memory.
+
+* ary = PtrData#to_a(type, [size])
+  * returns an array of the type which specified with type. type must be one of
+    'S','P','I','L','D' and 'F'.
+
+* str = PtrData#to_s([len])
+  * returns a string which length is len. if len is omitted, the end of the
+    string is '\0'.
+
+* ptr = PtrData#ptr,+@
+  * returns the pointed value as a PtrData object ptr.
+
+* ptr = PtrData#ref,-@
+  * returns the reference as a PtrData object ptr.
+
+* ptr = PtrData#+
+  * returns the PtrData object
+
+* ptr = PtrData#-
+  * returns the PtrData object
+
+* PtrData#struct!(type, *members)
+  * defines the data type to get access to a structure member with a symbol.
+    (see also PtrData#[])
+
+* PtrData#union!(type, *members)
+  * defines the data type to get access to a union member with a symbol. (see
+    also PtrData#[])
+
+* val = PtrData#[key], PtrData#[key, num = 0]
+  * if the key is a string or symbol, this method returns the value of the
+    structure/union member which has the type defined by PtrData#
+    {struct!,union!}. if the key is a integer value and this object represents
+    the pointer ptr, it returns the value of `(ptr + key).to_s(num)'
+
+* PtrData#[key,num]=val, PtrData#[key]=val
+  * if the key is a string or symbol, this method substitute the value of the
+    structure/union member with val. if the key is a integer value and val is a
+    string, this method copies num bytes of val to the memory area ptr using
+    memcpy(3).
+
+== Type specifiers
+
+the prototype consists of the following type specifiers, first element of 
+prototype represents the type of return value, and remaining elements represent
+the type of each argument.
+
+    C : char
+    c : char *
+    H : short
+    h : short *
+    I : int
+    i : int *
+    L : long
+    l : long *
+    F : float
+    f : float *
+    D : double
+    d : double *
+    S : const char *
+    s : char *
+    A : const type[]
+    a : type[] (allocates new memory space)
+    P : void * (same as 'p')
+    p : void * (same as 'P')
+    0 : void function (this must be a first character of the prototype)
+
+the cbtype consists of type specifiers 0, C, I, H, L, F, D, S and P.
+for example:
+
+    DL.callback('IPP'){|ptr1,ptr2|
+      str1 = ptr1.ptr.to_s
+      str2 = ptr2.ptr.to_s
+      str1 <=> str2
+    }
+=end
diff --git a/ruby_1_8_6/ext/dl/extconf.rb b/ruby_1_8_6/ext/dl/extconf.rb
new file mode 100644
index 0000000000..beb15ab04c
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/extconf.rb
@@ -0,0 +1,193 @@
+require 'mkmf'
+
+begin # for the exception SystemExit
+
+$:.unshift File.dirname(__FILE__)
+require 'type'
+
+if( ARGV.include?("--help") )
+  print <<EOF
+  --help             print this messages
+  --with-type-char   strictly use type 'char'
+  --with-type-short  strictly use type 'short'
+  --with-type-float  strictly use type 'float'
+  --with-args=<max_arg>
+  --with-callback=<max_callback>
+  --enable-asm       use the embedded assembler for passing arguments.
+                     (this option is available for i386 machine now.)
+  --enable-dlstack   use a stack emulation for constructing function call.
+EOF
+  exit(0)
+end
+
+($CPPFLAGS || $CFLAGS) << " -I."
+
+if (Config::CONFIG['CC'] =~ /gcc/)  # from Win32API
+  $CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer"
+end
+
+$with_dlstack ||= true
+$with_asm = ! $with_dlstack
+
+$with_type_int = try_cpp(<<EOF)
+#include "config.h"
+#if SIZEOF_INT == SIZEOF_LONG
+#error int not needed
+#endif
+EOF
+
+$with_type_float = try_cpp(<<EOF)
+#include "config.h"
+#if SIZEOF_FLOAT == SIZEOF_DOUBLE
+#error float not needed
+#endif
+EOF
+
+$with_type_voidp = try_cpp(<<EOF)
+#include "config.h"
+#if SIZEOF_VOIDP == SIZEOF_INT || SIZEOF_VOIDP == SIZEOF_LONG
+#error void* not needed
+#endif
+EOF
+
+$with_type_char  = DLTYPE[CHAR][:sym]
+$with_type_short = DLTYPE[SHORT][:sym]
+$with_type_long  = DLTYPE[LONG][:sym]
+$with_type_double= DLTYPE[DOUBLE][:sym]
+$with_type_int   &= DLTYPE[INT][:sym]
+$with_type_float &= DLTYPE[FLOAT][:sym]
+$with_type_voidp &= DLTYPE[VOIDP][:sym]
+
+$with_type_char  = enable_config("type-char", $with_type_char)
+$with_type_short = enable_config("type-short", $with_type_short)
+$with_type_float = enable_config("type-float", $with_type_float)
+
+$with_asm        = enable_config("asm", $with_asm)
+$with_dlstack    = enable_config("dlstack", $with_dlstack)
+
+args = with_config("args")
+max_arg = nil
+if( $with_asm || $with_dlstack )
+  $with_type_char = true
+  $with_type_short = true
+  $with_type_float = true
+  max_arg = 0
+end
+if( args )
+  max_arg = args.to_i
+  if( !max_arg )
+    print("--with-args=<max_arg>\n")
+    exit(1)
+  end
+end
+max_arg   ||= 6
+
+max_callback = with_config("callback","10").to_i
+callback_types = DLTYPE.keys.length
+
+
+$dlconfig_h = <<EOF
+#define MAX_ARG           #{max_arg}
+EOF
+
+def dlc_define(const)
+  $dlconfig_h << "#if !defined(#{const})\n" +
+                 "# define #{const}\n" +
+                 "#endif\n"
+end
+
+$dlconfig_h << "#define MAX_CALLBACK #{max_callback}\n"
+$dlconfig_h << "#define CALLBACK_TYPES #{callback_types}\n"
+if( $with_dlstack )
+  $dlconfig_h << "#define USE_DLSTACK\n"
+else
+  if( $with_asm )
+    $dlconfig_h << "#define USE_INLINE_ASM\n"
+  end
+end
+if( $with_type_char )
+  $dlconfig_h << "#define WITH_TYPE_CHAR\n"
+end
+if( $with_type_short )
+  $dlconfig_h << "#define WITH_TYPE_SHORT\n"
+end
+if( $with_type_long )
+  $dlconfig_h << "#define WITH_TYPE_LONG\n"
+end
+if( $with_type_double )
+  $dlconfig_h << "#define WITH_TYPE_DOUBLE\n"
+end
+if( $with_type_float )
+  $dlconfig_h << "#define WITH_TYPE_FLOAT\n"
+end
+if( $with_type_int )
+  $dlconfig_h << "#define WITH_TYPE_INT\n"
+end
+if( $with_type_voidp )
+  $dlconfig_h << "#define WITH_TYPE_VOIDP\n"
+end
+
+if( have_header("windows.h") )
+  have_library("kernel32")
+  have_func("GetLastError", "windows.h")
+  dlc_define("HAVE_WINDOWS_H")
+  have_windows_h = true
+end
+
+if( have_header("dlfcn.h") )
+  dlc_define("HAVE_DLFCN_H")
+  have_library("dl")
+  have_func("dlopen")
+  have_func("dlclose")
+  have_func("dlsym")
+  if( have_func("dlerror") )
+    dlc_define("HAVE_DLERROR")
+  end
+elsif ( have_windows_h )
+  have_func("LoadLibrary")
+  have_func("FreeLibrary")
+  have_func("GetProcAddress")
+else
+  exit(0)
+end
+
+def File.update(file, str)
+  begin
+    open(file){|f|f.read} == str
+  rescue Errno::ENOENT
+    false
+  end or open(file, "w"){|f|f.print(str)}
+end
+
+File.update("dlconfig.h", <<EOF)
+#ifndef DLCONFIG_H
+#define DLCONFIG_H
+#{$dlconfig_h}
+#endif /* DLCONFIG_H */
+EOF
+
+File.update("dlconfig.rb", <<EOF)
+MAX_ARG = #{max_arg}
+MAX_CALLBACK = #{max_callback}
+CALLBACK_TYPES = #{callback_types}
+DLTYPE[CHAR][:sym]  = #{$with_type_char}
+DLTYPE[SHORT][:sym] = #{$with_type_short}
+DLTYPE[INT][:sym]   = #{$with_type_int}
+DLTYPE[LONG][:sym]  = #{$with_type_long}
+DLTYPE[FLOAT][:sym] = #{$with_type_float}
+DLTYPE[DOUBLE][:sym]= #{$with_type_double}
+DLTYPE[VOIDP][:sym] = #{$with_type_voidp}
+EOF
+
+$INSTALLFILES = [
+  ["./dlconfig.h", "$(archdir)$(target_prefix)", "."],
+  ["dl.h", "$(archdir)$(target_prefix)", ""],
+]
+$cleanfiles = %w[test/test.o]
+$distcleanfiles = %w[call.func callback.func cbtable.func dlconfig.rb
+./dlconfig.h test/libtest.so test/*~ *~ mkmf.log]
+
+create_makefile('dl')
+rescue SystemExit
+  # do nothing
+end
diff --git a/ruby_1_8_6/ext/dl/h2rb b/ruby_1_8_6/ext/dl/h2rb
new file mode 100644
index 0000000000..00fbd60c82
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/h2rb
@@ -0,0 +1,500 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+# $Id$
+
+require 'mkmf'
+require 'ftools'
+
+$recursive = false
+$force     = false
+$conly     = true
+$inc_path  = []
+$infilename= nil
+$insert_require = true
+
+def valid_ruby_code?(code)
+  begin
+    eval("BEGIN {return true}; #{code}")
+  rescue SyntaxError
+    return false
+  end
+  return false
+end
+
+def print_usage
+  print <<EOF
+h2rb [-r] [-I <path>] [-d] [<filename>]
+EOF
+end
+
+while( ARGV[0] )
+  case( ARGV[0] )
+  when "-r"
+    ARGV.shift
+    $recursive = true
+  when "-R"
+    ARGV.shift
+    $recursive = false
+  when "-l"
+    ARGV.shift
+    $insert_require = true
+  when "-L"
+    ARGV.shift
+    $insert_require = false
+  when "-c"
+    ARGV.shift
+    $conly = true
+  when "-C"
+    ARGV.shift
+    $conly = false
+  when "-f"
+    ARGV.shift
+    $force = true
+  when "-F"
+    ARGV.shift
+    $force = false
+  when "-I"
+    ARGV.shift
+    $inc_path << ARGV.shift
+  when "-d"
+    ARGV.shift
+    $DEBUG = true
+  when "-h","--help"
+    print_usage()
+    exit 0
+  when /-.*/
+    $stderr.print("unknown option '#{ARGV[0]}'.\n")
+    print_usage()
+    exit 0
+  else
+    $infilename = ARGV.shift
+  end
+end
+
+$inc_dir = File.join(CONFIG["prefix"], "lib", "ruby",
+		     CONFIG["MAJOR"] + "." + CONFIG["MINOR"],
+		     "dl")
+
+class H2RBError < StandardError; end
+
+
+class H2RB
+  def initialize(inc_dir = nil, inc_path = nil, insert_require = nil)
+    @inc_path = inc_path || []
+    @inc_dir  = inc_dir  || '.'
+    @indent = 0
+    @parsed_files = []
+    @insert_require = insert_require || false
+  end
+
+  def find_path(file)
+    if( ! file )
+      return nil
+    end
+    if( File.exist?(file) )
+      if( file[0] == ?/ )
+	return file
+      else
+	return file
+      end
+    end
+    @inc_path.each{|path|
+    full = File.join(path, file)
+      if( File.exist?(full) )
+	return full
+      end
+    }
+    return nil
+  end
+
+  def strip_comment(line)
+    if( @commented )
+      if( e = line.index("*/") )
+	line[0..(e+1)] = ""
+	@commented = false
+      else
+	line = ""
+      end
+    else
+      if( s = line.index("/*") )
+	if( e = line.index("*/") )
+	  line[s..(e+1)] = ""
+	else
+	  line[s..-1] = ""
+	  @commented = true
+	end
+      elsif( s = line.index("//") )
+	line[s..(-1)] = ""
+      end
+    end
+      
+    line.gsub!(/\s+$/,"")
+    return line
+  end
+  
+  def up_indent
+    @indent += 1
+  end
+  
+  def down_indent
+    @indent -= 1
+    if( @indent < 0 )
+      raise
+    end
+  end
+  
+  def indent
+    "  " * @indent
+  end
+
+  def rescue_begin
+    line = "#{indent}begin"
+    up_indent
+    return line
+  end
+
+  def rescue_nameerror
+    down_indent
+    line = [
+      "#{indent}rescue NameError => e",
+      "#{indent}  raise e if( $DEBUG )",
+      "#{indent}end"].join($/)
+    return line
+  end
+
+  def parse_enum(line)
+    if( line =~ /enum\s+(\S+\s+)?\{(.+)\}/ )
+      enum_name  = $1
+      enum_block = $2
+      if( enum_name )
+	line = "#{indent}# -- enum #{enum_name}\n"
+      else
+	line = "#{indent}# -- enum\n"
+      end
+      enums = enum_block.split(/,/).collect{|e| e.strip}
+      i = 0
+      enums.each{|elem|
+	var,val = elem.split(/=/).collect{|e| e.strip}
+	if( val )
+	  i = val.to_i
+	end
+	line += "#{indent}#{var} = #{i.to_s}\n"
+	i += 1
+      }
+      line += "#{indent}# -- end of enum"
+      return line
+    else
+      return nil
+    end
+  end
+
+  def parse_define(line)
+    case line
+    when /^#\s*define\s+(\S+)\(\)/
+      line = nil
+    when /^#\s*define\s+(\S+)\((.+)\)\s+(.+)$/
+      if( @conly )
+	line = nil
+      else
+	defname = $1
+	defargs = $2
+	defval  = $3
+	if( !valid_ruby_code?(defval) )
+	  defval = "nil # #{defval}"
+	end
+	if( defname[0,1] =~ /^[A-Z]$/ )
+	  line = "#{indent}#{defname} = proc{|#{defargs}| #{defval}}"
+	else
+	  line = [
+	    "#{indent}def #{defname}(#{defargs})",
+	    "#{indent}  #{defval}",
+	    "#{indent}end"
+	  ].join("\n")
+	end
+      end
+    when /^#\s*define\s+(\S+)\((.+)\)$/
+      if( @conly )
+	line = nil
+      else
+	defname = $1
+	defargs = $2
+	defval  = nil
+	if( !valid_ruby_code?(defval) )
+	  defval = "nil # #{defval}"
+	end
+	if( defname[0,1] =~ /^[A-Z]$/ )
+	  line = "#{indent}#{defname} = proc{|#{defargs}| #{defval}}"
+	else
+	  line = [
+	    "#{indent}def #{defname}(#{defargs})",
+	    "#{indent}  #{defval}",
+	    "#{indent}end"
+	  ].join("\n")
+	end
+      end
+    when /^#\s*define\s+(\S+)\s+(.+)$/
+      defname = $1
+      defval  = $2
+      if( !valid_ruby_code?(defval) )
+	defval = "nil # #{defval}"
+      end
+      line = [rescue_begin, "#{indent}#{defname} = #{defval}", rescue_nameerror].join($/)
+    when /^#\s*define\s+(\S+)$/
+      defname = $1
+      line = "#{indent}#{defname} = nil"
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_undef(line)
+    case line
+    when /^#\s*undef\s+([A-Z]\S+)$/
+      defname = $1
+      line = "#{indent}remove_const(:#{defname})"
+    when /^#\s*undef\s+(\S+)$/
+      defname = $1
+      line = "#{indent}#{defname} = nil"
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_ifdef(line)
+    case line
+    when /^#\s*ifdef\s+(\S+)$/
+      defname = $1
+      line = [
+	rescue_begin,
+	"#{indent}if( defined?(#{defname}) && ! #{defname}.nil? )"].join($/)
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_ifndef(line)
+    case line
+    when /^#\s*ifndef\s+(\S+)$/
+      defname = $1
+      line = [
+	rescue_begin,
+	"#{indent}if( ! defined?(#{defname}) || #{defname}.nil? )"].join($/)
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_if(line)
+    case line
+    when /^#\s*if\s+(.+)$/
+      cond = $1
+      cond.gsub!(/defined(.+)/){ "defined?(#{$1}) && ! #{$1}.nil?" }
+      if( valid_ruby_code?(cond) )
+	line = "#{indent}if( #{cond} )"
+      else
+	line = "#{indent}if( false ) # #{cond}"
+      end
+      line = [rescue_begin, line].join($/)
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_elif(line)
+    case line
+    when /^#\s*elif\s+(.+)$/
+      cond = $1
+      cond.gsub!("defined","defined?")
+      line = "#{indent}elsif( #{cond} )"
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_else(line)
+    case line
+    when /^#\s*else\s*/
+      line = "#{indent}else"
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_endif(line)
+    case line
+    when /^#\s*endif\s*$/
+      line = ["#{indent}end", rescue_nameerror].join($/)
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_include(line)
+    if( ! @insert_require )
+      return nil
+    end
+
+    file = nil
+    case line
+    when /^#\s*include "(.+)"$/
+      file = $1
+      line = "#{indent}require '#{file}'"
+    when /^#\s*include \<(.+)\>$/
+      file = $1
+      line = "#{indent}require '#{file}'"
+    else
+      line = nil
+    end
+    if( @recursive && file && (!@parsed_files.include?(file)) )
+      parse(file, @recursive, @force, @conly)
+    end
+    return line
+  end
+
+
+  def open_files(infilename)
+    if( ! infilename )
+      return [$stdin, $stdout]
+    end
+
+    old_infilename = infilename
+    infilename = find_path(infilename)
+    if( ! infilename )
+      $stderr.print("'#{old_infilename}' was not found.\n")
+      return [nil,nil]
+    end
+
+    if( infilename )
+      if( infilename[0,1] == '/' )
+	outfilename = File.join(@inc_dir, infilename[1..-1] + ".rb")
+      else
+	outfilename = infilename + ".rb"
+      end
+      File.mkpath(File.dirname(outfilename))
+    else
+      outfilename = nil
+    end
+    
+    if( infilename )
+      fin    = File.open(infilename,"r")
+    else
+      fin    = $stdin
+    end
+    if( outfilename )
+      if( File.exist?(outfilename) && (!@force) )
+	$stderr.print("'#{outfilename}' have already existed.\n")
+	return [fin, nil]
+      end
+      fout   = File.open(outfilename,"w")
+    else
+      fout   = $stdout
+    end
+
+    $stderr.print("#{infilename} -> #{outfilename}\n")
+    if( fout )
+      dir = File.dirname(outfilename)
+      if( dir[0,1] != "." && dir != "" )
+	fout.print("if( ! $LOAD_PATH.include?('#{dir}') )\n",
+		   "  $LOAD_PATH.push('#{dir}')\n",
+		   "end\n")
+      end
+    end
+    return [fin,fout]
+  end
+
+  def parse(infilename = nil, recursive = false, force = false, conly = false)
+    @commented = false
+    @recursive = recursive
+    @force     = force
+    @conly     = conly
+    @parsed_files << infilename
+
+    fin,fout = open_files(infilename)
+    if( !fin )
+      return
+    end
+
+    begin
+      line_number = 0
+      pre_line    = nil
+      fin.each_line{|line|
+	line_number += 1
+	line.chop!
+	if( $DEBUG )
+	  $stderr.print("#{line_number}:(#{@indent}):", line, "\n")
+	end
+	
+	if( pre_line )
+	  line = pre_line + line
+	  pre_line = nil
+	end
+
+	if( line[-1,1] == "\\" )
+	  pre_line = line[0..-2]
+	  next
+	end
+
+	if( eidx = line.index("enum ") )
+	  pre_line = line[eidx .. -1]
+	  if( i = line.index("{") && j = line.index("}") )
+	    line = line[0..j]
+	    pre_line = nil
+	  else
+	    next
+	  end
+	end
+
+	line = strip_comment(line)
+	case line
+	when /^enum\s/
+	  line = parse_enum(line)
+	when /^#\s*define\s/
+	  line = parse_define(line)
+	when /^#\s*undef\s/
+	  line = parse_undef(line)
+	when /^#\s*ifdef\s/
+	  line = parse_ifdef(line)
+	  up_indent
+	when /^#\s*ifndef\s/
+	  line = parse_ifndef(line)
+	  up_indent
+	when /^#\s*if\s/
+	  line = parse_if(line)
+	  up_indent
+	when /^#\s*elif\s/
+	  down_indent
+	  line = parse_elif(line)
+	  up_indent
+	when /^#\s*else/
+	  down_indent
+	  line = parse_else(line)
+	  up_indent
+	when /^#\s*endif/
+	  down_indent
+	  line = parse_endif(line)
+	when /^#\s*include\s/
+	  line = parse_include(line)
+	else
+	  line = nil
+	end
+	if( line && fout )
+	  fout.print(line, "     # #{line_number}",$/)
+	end
+      }
+    ensure
+      fin.close if fin
+      fout.close if fout
+    end
+  end
+end
+
+h2rb = H2RB.new($inc_dir, $inc_path, $insert_require)
+h2rb.parse($infilename, $recursive, $force, $conly)
diff --git a/ruby_1_8_6/ext/dl/handle.c b/ruby_1_8_6/ext/dl/handle.c
new file mode 100644
index 0000000000..69d47caac0
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/handle.c
@@ -0,0 +1,215 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#include <ruby.h>
+#include "dl.h"
+
+VALUE rb_cDLHandle;
+
+void
+dlhandle_free(struct dl_handle *dlhandle)
+{
+  if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
+    dlclose(dlhandle->ptr);
+  }
+}
+
+VALUE
+rb_dlhandle_close(VALUE self)
+{
+  struct dl_handle *dlhandle;
+
+  Data_Get_Struct(self, struct dl_handle, dlhandle);
+  dlhandle->open = 0;
+  return INT2NUM(dlclose(dlhandle->ptr));
+}
+
+VALUE
+rb_dlhandle_s_allocate(VALUE klass)
+{
+  VALUE obj;
+  struct dl_handle *dlhandle;
+
+  obj = Data_Make_Struct(rb_cDLHandle, struct dl_handle, 0,
+			 dlhandle_free, dlhandle);
+  dlhandle->ptr  = 0;
+  dlhandle->open = 0;
+  dlhandle->enable_close = 0;
+
+  return obj;
+}
+
+VALUE
+rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
+{
+  void *ptr;
+  struct dl_handle *dlhandle;
+  VALUE lib, flag;
+  char  *clib;
+  int   cflag;
+  const char *err;
+
+  switch (rb_scan_args(argc, argv, "11", &lib, &flag)) {
+  case 1:
+    clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
+    cflag = RTLD_LAZY | RTLD_GLOBAL;
+    break;
+  case 2:
+    clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
+    cflag = NUM2INT(flag);
+    break;
+  default:
+    rb_bug("rb_dlhandle_new");
+  }
+
+  ptr = dlopen(clib, cflag);
+#if defined(HAVE_DLERROR)
+  if (!ptr && (err = dlerror())) {
+    rb_raise(rb_eRuntimeError, "%s", err);
+  }
+#else
+  if (!ptr) {
+    err = dlerror();
+    rb_raise(rb_eRuntimeError, "%s", err);
+  }
+#endif
+  Data_Get_Struct(self, struct dl_handle, dlhandle);
+  if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
+    dlclose(dlhandle->ptr);
+  }
+  dlhandle->ptr = ptr;
+  dlhandle->open = 1;
+  dlhandle->enable_close = 0;
+
+  if (rb_block_given_p()) {
+    rb_ensure(rb_yield, self, rb_dlhandle_close, self);
+  }
+
+  return Qnil;
+}
+
+VALUE
+rb_dlhandle_enable_close(VALUE self)
+{
+  struct dl_handle *dlhandle;
+
+  Data_Get_Struct(self, struct dl_handle, dlhandle);
+  dlhandle->enable_close = 1;
+  return Qnil;
+}
+
+VALUE
+rb_dlhandle_disable_close(VALUE self)
+{
+  struct dl_handle *dlhandle;
+
+  Data_Get_Struct(self, struct dl_handle, dlhandle);
+  dlhandle->enable_close = 0;
+  return Qnil;
+}
+
+VALUE
+rb_dlhandle_to_i(VALUE self)
+{
+  struct dl_handle *dlhandle;
+
+  Data_Get_Struct(self, struct dl_handle, dlhandle);
+  return DLLONG2NUM(dlhandle);
+}
+
+VALUE
+rb_dlhandle_to_ptr(VALUE self)
+{
+  struct dl_handle *dlhandle;
+
+  Data_Get_Struct(self, struct dl_handle, dlhandle);
+  return rb_dlptr_new(dlhandle, sizeof(dlhandle), 0);
+}
+
+VALUE
+rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
+{
+  VALUE sym, type;
+  void (*func)();
+  VALUE val;
+  struct dl_handle *dlhandle;
+  void *handle;
+  const char *name, *stype;
+  const char *err;
+
+  rb_secure(2);
+  if (rb_scan_args(argc, argv, "11", &sym, &type) == 2) {
+    SafeStringValue(type);
+    stype = StringValuePtr(type);
+  }
+  else{
+    stype = NULL;
+  }
+
+  if (sym == Qnil) {
+#if defined(RTLD_NEXT)
+    name = RTLD_NEXT;
+#else
+    name = NULL;
+#endif
+  }
+  else{
+    SafeStringValue(sym);
+    name = StringValuePtr(sym);
+  }
+
+  Data_Get_Struct(self, struct dl_handle, dlhandle);
+  if (!dlhandle->open) {
+    rb_raise(rb_eRuntimeError, "closed handle");
+  }
+  handle = dlhandle->ptr;
+
+  func = dlsym(handle, name);
+#if defined(HAVE_DLERROR)
+  if (!func && (err = dlerror()))
+#else
+  if (!func)
+#endif
+  {
+#if defined(__CYGWIN__) || defined(WIN32) || defined(__MINGW32__)
+    {
+      int  len = strlen(name);
+      char *name_a = (char*)dlmalloc(len+2);
+      strcpy(name_a, name);
+      name_a[len]   = 'A';
+      name_a[len+1] = '\0';
+      func = dlsym(handle, name_a);
+      dlfree(name_a);
+#if defined(HAVE_DLERROR)
+      if (!func && (err = dlerror()))
+#else
+      if (!func)
+#endif
+      {
+	rb_raise(rb_eRuntimeError, "unknown symbol \"%sA\"", name);
+      }
+    }
+#else
+    rb_raise(rb_eRuntimeError, "unknown symbol \"%s\"", name);
+#endif
+  }
+  val = rb_dlsym_new(func, name, stype);
+
+  return val;
+}
+
+void
+Init_dlhandle()
+{
+  rb_cDLHandle = rb_define_class_under(rb_mDL, "Handle", rb_cObject);
+  rb_define_alloc_func(rb_cDLHandle, rb_dlhandle_s_allocate);
+  rb_define_method(rb_cDLHandle, "initialize", rb_dlhandle_initialize, -1);
+  rb_define_method(rb_cDLHandle, "to_i", rb_dlhandle_to_i, 0);
+  rb_define_method(rb_cDLHandle, "to_ptr", rb_dlhandle_to_ptr, 0);
+  rb_define_method(rb_cDLHandle, "close", rb_dlhandle_close, 0);
+  rb_define_method(rb_cDLHandle, "sym",  rb_dlhandle_sym, -1);
+  rb_define_method(rb_cDLHandle, "[]",  rb_dlhandle_sym, -1);
+  rb_define_method(rb_cDLHandle, "disable_close", rb_dlhandle_disable_close, 0);
+  rb_define_method(rb_cDLHandle, "enable_close", rb_dlhandle_enable_close, 0);
+}
diff --git a/ruby_1_8_6/ext/dl/install.rb b/ruby_1_8_6/ext/dl/install.rb
new file mode 100644
index 0000000000..69b1834301
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/install.rb
@@ -0,0 +1,49 @@
+require 'mkmf'
+require 'ftools'
+
+SO_LIBS = ["dl.so"]
+
+$ruby_version = CONFIG['MAJOR'] + "." + CONFIG['MINOR']
+$prefix = CONFIG['prefix']
+$libdir = File.join($prefix,'lib')
+$rubylibdir = File.join($libdir, 'ruby', $ruby_version)
+$arch = CONFIG['arch']
+$archdir = File.join($rubylibdir, $arch)
+
+def find(dir, match = /./)
+  Dir.chdir(dir)
+  files = []
+  Dir.new(".").each{|file|
+    if( file != "." && file != ".." )
+      case File.ftype(file)
+      when "file"
+	if( file =~ match )
+	  files.push(File.join(dir,file))
+	end
+      when "directory"
+	files += find(file, match).collect{|f| File.join(dir,f)}
+      end
+    end
+  }
+  Dir.chdir("..")
+  return files
+end
+
+def install()
+  rb_files = find(File.join(".","lib"), /.rb$/)
+
+  SO_LIBS.each{|f|
+    File.makedirs($rubylibdir, "#{$archdir}")
+    File.install(f, File.join($archdir,f), 0555, true)
+  }
+
+  rb_files.each{|f|
+    origfile = f
+    instfile = File.join($rubylibdir, origfile.sub("./lib/",""))
+    instdir  = File.dirname(instfile)
+    File.makedirs(instdir)
+    File.install(origfile, instfile, 0644, true)
+  }
+end
+
+install()
diff --git a/ruby_1_8_6/ext/dl/lib/dl/import.rb b/ruby_1_8_6/ext/dl/lib/dl/import.rb
new file mode 100644
index 0000000000..01ee2490e8
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/lib/dl/import.rb
@@ -0,0 +1,225 @@
+# -*- ruby -*-
+
+require 'dl'
+require 'dl/types'
+
+module DL
+  module Importable
+    LIB_MAP = {}
+
+    module Internal
+      def init_types()
+	@types ||= ::DL::Types.new
+      end
+
+      def init_sym()
+	@SYM ||= {}
+      end
+
+      def [](name)
+	return @SYM[name.to_s][0]
+      end
+
+      def dlload(*libnames)
+	if( !defined?(@LIBS) )
+	  @LIBS = []
+	end
+	libnames.each{|libname|
+	  if( !LIB_MAP[libname] )
+	    LIB_MAP[libname] = DL.dlopen(libname)
+	  end
+	  @LIBS.push(LIB_MAP[libname])
+	}
+      end
+      alias dllink :dlload
+
+      def parse_cproto(proto)
+	proto = proto.gsub(/\s+/, " ").strip
+	case proto
+	when /^([\d\w\*_\s]+)\(([\d\w\*_\s\,\[\]]*)\)$/
+	  ret = $1
+	  args = $2.strip()
+	  ret = ret.split(/\s+/)
+	  args = args.split(/\s*,\s*/)
+	  func = ret.pop()
+	  if( func =~ /^\*/ )
+	    func.gsub!(/^\*+/,"")
+	    ret.push("*")
+	  end
+	  ret  = ret.join(" ")
+	  return [func, ret, args]
+	else
+	  raise(RuntimeError,"can't parse the function prototype: #{proto}")
+	end
+      end
+
+      # example:
+      #   extern "int strlen(char*)"
+      #
+      def extern(proto)
+	func,ret,args = parse_cproto(proto)
+	return import(func, ret, args)
+      end
+
+      # example:
+      #   callback "int method_name(int, char*)"
+      #
+      def callback(proto)
+	func,ret,args = parse_cproto(proto)
+
+	init_types()
+	init_sym()
+
+	rty,renc,rdec = @types.encode_return_type(ret)
+        if( !rty )
+          raise(TypeError, "unsupported type: #{ret}")
+        end
+	ty,enc,dec = encode_argument_types(args)
+	symty = rty + ty
+
+	module_eval("module_function :#{func}")
+	sym = module_eval([
+	  "DL::callback(\"#{symty}\"){|*args|",
+	  "  sym,rdec,enc,dec  = @SYM['#{func}']",
+	  "  args = enc.call(args) if enc",
+	  "  r,rs = #{func}(*args)",
+	  "  r  = renc.call(r) if rdec",
+	  "  rs = dec.call(rs) if (dec && rs)",
+	  "  @retval = r",
+	  "  @args   = rs",
+	  "  r",
+	  "}",
+	].join("\n"))
+
+	@SYM[func] = [sym,rdec,enc,dec]
+
+	return sym
+      end
+
+      # example:
+      #  typealias("uint", "unsigned int")
+      #
+      def typealias(alias_type, ty1, enc1=nil, dec1=nil, ty2=nil, enc2=nil, dec2=nil)
+	init_types()
+	@types.typealias(alias_type, ty1, enc1, dec1,
+                                     ty2||ty1, enc2, dec2)
+      end
+
+      # example:
+      #  symbol "foo_value"
+      #  symbol "foo_func", "IIP"
+      #
+      def symbol(name, ty = nil)
+	sym = nil
+	@LIBS.each{|lib|
+	  begin
+	    if( ty )
+	      sym = lib[name, ty]
+	    else
+	      sym = lib[name]
+	    end
+	  rescue
+	    next
+	  end
+	}
+	if( !sym )
+	  raise(RuntimeError, "can't find the symbol `#{name}'")
+	end
+	return sym
+      end
+
+      # example:
+      #   import("get_length", "int", ["void*", "int"])
+      #
+      def import(name, rettype, argtypes = nil)
+	init_types()
+	init_sym()
+
+	rty,_,rdec = @types.encode_return_type(rettype)
+        if( !rty )
+          raise(TypeError, "unsupported type: #{rettype}")
+        end
+	ty,enc,dec = encode_argument_types(argtypes)
+	symty = rty + ty
+
+	sym = symbol(name, symty)
+
+	mname = name.dup
+	if( ?A <= mname[0] && mname[0] <= ?Z )
+	  mname[0,1] = mname[0,1].downcase
+	end
+	@SYM[mname] = [sym,rdec,enc,dec]
+	
+	module_eval [
+	  "def #{mname}(*args)",
+	  "  sym,rdec,enc,dec  = @SYM['#{mname}']",
+	  "  args = enc.call(args) if enc",
+	  if( $DEBUG )
+	    "  p \"[DL] call #{mname} with \#{args.inspect}\""
+	  else
+	    ""
+	  end,
+	  "  r,rs = sym.call(*args)",
+	  if( $DEBUG )
+	    "  p \"[DL] retval=\#{r.inspect} args=\#{rs.inspect}\""
+	  else
+	    ""
+	  end,
+	  "  r  = rdec.call(r) if rdec",
+	  "  rs = dec.call(rs) if dec",
+	  "  @retval = r",
+	  "  @args   = rs",
+	  "  return r",
+	  "end",
+	  "module_function :#{mname}",
+	].join("\n")
+
+	return sym
+      end
+
+      def _args_
+	return @args
+      end
+
+      def _retval_
+	return @retval
+      end
+
+      def encode_argument_types(tys)
+	init_types()
+	encty = []
+	enc = nil
+	dec = nil
+	tys.each_with_index{|ty,idx|
+	  ty,c1,c2 = @types.encode_argument_type(ty)
+          if( !ty )
+            raise(TypeError, "unsupported type: #{ty}")
+          end
+	  encty.push(ty)
+	  if( enc )
+	    if( c1 )
+	      conv1 = enc
+	      enc = proc{|v| v = conv1.call(v); v[idx] = c1.call(v[idx]); v}
+	    end
+	  else
+	    if( c1 )
+	      enc = proc{|v| v[idx] = c1.call(v[idx]); v}
+	    end
+	  end
+	  if( dec )
+	    if( c2 )
+	      conv2 = dec
+	      dec = proc{|v| v = conv2.call(v); v[idx] = c2.call(v[idx]); v}
+	    end
+	  else
+	    if( c2 )
+	      dec = proc{|v| v[idx] = c2.call(v[idx]); v}
+	    end
+	  end
+	}
+	return [encty.join, enc, dec]
+      end
+    end # end of Internal
+    include Internal
+  end # end of Importable
+end
diff --git a/ruby_1_8_6/ext/dl/lib/dl/struct.rb b/ruby_1_8_6/ext/dl/lib/dl/struct.rb
new file mode 100644
index 0000000000..33f303fe22
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/lib/dl/struct.rb
@@ -0,0 +1,149 @@
+# -*- ruby -*-
+
+require 'dl'
+require 'dl/import'
+
+module DL
+  module Importable
+    module Internal
+      def define_struct(contents)
+	init_types()
+	Struct.new(@types, contents)
+      end
+      alias struct define_struct
+
+      def define_union(contents)
+	init_types()
+	Union.new(@types, contents)
+      end
+      alias union define_union
+
+      class Memory
+	def initialize(ptr, names, ty, len, enc, dec)
+	  @ptr = ptr
+	  @names = names
+	  @ty    = ty
+	  @len   = len
+	  @enc   = enc
+	  @dec   = dec
+
+	  # define methods
+	  @names.each{|name|
+	    instance_eval [
+	      "def #{name}",
+	      "  v = @ptr[\"#{name}\"]",
+	      "  if( @len[\"#{name}\"] )",
+	      "    v = v.collect{|x| @dec[\"#{name}\"] ? @dec[\"#{name}\"].call(x) : x }",
+              "  else",
+	      "    v = @dec[\"#{name}\"].call(v) if @dec[\"#{name}\"]",
+	      "  end",
+	      "  return v",
+	      "end",
+	      "def #{name}=(v)",
+	      "  if( @len[\"#{name}\"] )",
+	      "    v = v.collect{|x| @enc[\"#{name}\"] ? @enc[\"#{name}\"].call(x) : x }",
+	      "  else",
+	      "    v = @enc[\"#{name}\"].call(v) if @enc[\"#{name}\"]",
+              "  end",
+	      "  @ptr[\"#{name}\"] = v",
+	      "  return v",
+	      "end",
+	    ].join("\n")
+	  }
+	end
+
+	def to_ptr
+	  return @ptr
+	end
+
+	def size
+	  return @ptr.size
+	end
+      end
+
+      class Struct
+	def initialize(types, contents)
+	  @names = []
+	  @ty   = {}
+	  @len  = {}
+	  @enc  = {}
+	  @dec  = {}
+	  @size = 0
+	  @tys  = ""
+	  @types = types
+	  parse(contents)
+	end
+
+	def size
+	  return @size
+	end
+
+	def members
+	  return @names
+	end
+
+	# ptr must be a PtrData object.
+	def new(ptr)
+	  ptr.struct!(@tys, *@names)
+	  mem = Memory.new(ptr, @names, @ty, @len, @enc, @dec)
+	  return mem
+	end
+
+	def malloc(size = nil)
+	  if( !size )
+	    size = @size
+	  end
+	  ptr = DL::malloc(size)
+	  return new(ptr)
+	end
+
+	def parse(contents)
+	  contents.each{|elem|
+	    name,ty,num,enc,dec = parse_elem(elem)
+	    @names.push(name)
+	    @ty[name]  = ty
+	    @len[name] = num
+	    @enc[name] = enc
+	    @dec[name] = dec
+	    if( num )
+	      @tys += "#{ty}#{num}"
+	    else
+	      @tys += ty
+	    end
+	  }
+	  @size = DL.sizeof(@tys)
+	end
+	
+	def parse_elem(elem)
+	  elem.strip!
+	  case elem
+	  when /^([\w\d_\*]+)([\*\s]+)([\w\d_]+)$/
+	    ty = ($1 + $2).strip
+	    name = $3
+	    num = nil;
+	  when /^([\w\d_\*]+)([\*\s]+)([\w\d_]+)\[(\d+)\]$/
+	    ty = ($1 + $2).strip
+	    name = $3
+	    num = $4.to_i
+	  else
+	    raise(RuntimeError, "invalid element: #{elem}")
+	  end
+	  ty,enc,dec = @types.encode_struct_type(ty)
+          if( !ty )
+            raise(TypeError, "unsupported type: #{ty}")
+          end
+	  return [name,ty,num,enc,dec]
+	end
+      end  # class Struct
+      
+      class Union < Struct
+	def new
+	  ptr = DL::malloc(@size)
+	  ptr.union!(@tys, *@names)
+	  mem = Memory.new(ptr, @names, @ty, @len, @enc, @dec)
+	  return mem
+	end
+      end
+    end  # module Internal
+  end  # module Importable
+end  # module DL
diff --git a/ruby_1_8_6/ext/dl/lib/dl/types.rb b/ruby_1_8_6/ext/dl/lib/dl/types.rb
new file mode 100644
index 0000000000..1144917dae
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/lib/dl/types.rb
@@ -0,0 +1,245 @@
+# -*- ruby -*-
+
+require 'dl'
+
+module DL
+  class Types
+    TYPES = [
+      # FORMAT:
+      # ["alias name",
+      #  "type name", encoding_method, decoding_method,   for function prototypes
+      #  "type name", encoding_method, decoding_method]   for structures (not implemented)
+      
+      # for Windows
+      ["DWORD",  "unsigned long", nil, nil,
+                 "unsigned long", nil, nil],
+      ["PDWORD", "unsigned long *", nil, nil,
+                 "unsigned long *", nil, nil],
+      ["WORD",   "unsigned short", nil, nil,
+                 "unsigned short", nil, nil],
+      ["PWORD",  "unsigned int *", nil, nil,
+                 "unsigned int *", nil, nil],
+      ["BYTE",   "unsigned char",   nil, nil,
+                 "unsigned char", nil, nil],
+      ["PBYTE",  "unsigned char *", nil, nil,
+                 "unsigned char *", nil, nil],
+      ["BOOL",   "ibool", nil, nil,
+                 "ibool", nil, nil],
+      ["ATOM",   "int", nil, nil,
+                 "int", nil, nil],
+      ["BYTE",   "unsigned char", nil, nil,
+                 "unsigned char", nil, nil],
+      ["PBYTE",  "unsigned char *", nil, nil,
+                 "unsigned char *", nil, nil],
+      ["UINT",   "unsigned int", nil, nil,
+                 "unsigned int", nil, nil],
+      ["ULONG",  "unsigned long", nil, nil,
+                 "unsigned long", nil, nil],
+      ["UCHAR",  "unsigned char", nil, nil,
+                 "unsigned char", nil, nil],
+      ["HANDLE", "unsigned long", nil, nil,
+                 "unsigned long", nil, nil],
+      ["PHANDLE","void*", nil, nil,
+                 "void*", nil, nil],
+      ["PVOID",  "void*", nil, nil,
+                 "void*", nil, nil],
+      ["LPCSTR", "char*", nil, nil,
+                 "char*", nil, nil],
+      ["HDC",    "unsigned int", nil, nil,
+                 "unsigned int", nil, nil],
+      ["HWND",   "unsigned int", nil, nil,
+                 "unsigned int", nil, nil],
+      
+      # Others
+      ["uint",   "unsigned int", nil, nil,
+                 "unsigned int", nil, nil],
+      ["u_int",  "unsigned int", nil, nil,
+                 "unsigned int", nil, nil],
+      ["ulong",  "unsigned long", nil, nil,
+                 "unsigned long", nil, nil],
+      ["u_long", "unsigned long", nil, nil,
+                 "unsigned long", nil, nil],
+
+      # DL::Importable primitive types
+      ["ibool",
+        "I",
+	proc{|v| v ? 1 : 0},
+	proc{|v| (v != 0) ? true : false},
+        "I",
+	proc{|v| v ? 1 : 0 },
+	proc{|v| (v != 0) ? true : false} ],
+      ["cbool",
+        "C",
+	proc{|v| v ? 1 : 0},
+	proc{|v| (v != 0) ? true : false},
+        "C",
+	proc{|v,len| v ? 1 : 0},
+	proc{|v,len| (v != 0) ? true : false}],
+      ["lbool",
+        "L",
+	proc{|v| v ? 1 : 0},
+	proc{|v| (v != 0) ? true : false},
+        "L",
+	proc{|v,len| v ? 1 : 0},
+	proc{|v,len| (v != 0) ? true : false}],
+      ["unsigned char",
+        "C",
+	proc{|v| [v].pack("C").unpack("c")[0]},
+	proc{|v| [v].pack("c").unpack("C")[0]},
+        "C",
+	proc{|v| [v].pack("C").unpack("c")[0]},
+	proc{|v| [v].pack("c").unpack("C")[0]}],
+      ["unsigned short",
+        "H",
+	proc{|v| [v].pack("S").unpack("s")[0]},
+	proc{|v| [v].pack("s").unpack("S")[0]},
+        "H",
+	proc{|v| [v].pack("S").unpack("s")[0]},
+	proc{|v| [v].pack("s").unpack("S")[0]}],
+      ["unsigned int",
+        "I",
+	proc{|v| [v].pack("I").unpack("i")[0]},
+	proc{|v| [v].pack("i").unpack("I")[0]},
+        "I",
+	proc{|v| [v].pack("I").unpack("i")[0]},
+	proc{|v| [v].pack("i").unpack("I")[0]}],
+      ["unsigned long",
+        "L",
+	proc{|v| [v].pack("L").unpack("l")[0]},
+	proc{|v| [v].pack("l").unpack("L")[0]},
+        "L",
+	proc{|v| [v].pack("L").unpack("l")[0]},
+	proc{|v| [v].pack("l").unpack("L")[0]}],
+      ["unsigned char ref",
+        "c",
+	proc{|v| [v].pack("C").unpack("c")[0]},
+	proc{|v| [v].pack("c").unpack("C")[0]},
+	nil, nil, nil],
+      ["unsigned int ref",
+        "i",
+	proc{|v| [v].pack("I").unpack("i")[0]},
+	proc{|v| [v].pack("i").unpack("I")[0]},
+	nil, nil, nil],
+      ["unsigned long ref",
+        "l",
+	proc{|v| [v].pack("L").unpack("l")[0]},
+	proc{|v| [v].pack("l").unpack("L")[0]},
+	nil, nil, nil],
+      ["char ref",  "c", nil, nil,
+                    nil, nil, nil],
+      ["short ref", "h", nil, nil,
+                    nil, nil, nil],
+      ["int ref",   "i", nil, nil,
+                    nil, nil, nil],
+      ["long ref",  "l", nil, nil,
+                    nil, nil, nil],
+      ["float ref", "f", nil, nil,
+                    nil, nil, nil],
+      ["double ref","d", nil, nil,
+                    nil, nil, nil],
+      ["char",   "C", nil, nil,
+                 "C", nil, nil],
+      ["short",  "H", nil, nil,
+                 "H", nil, nil],
+      ["int",    "I", nil, nil,
+                 "I", nil, nil],
+      ["long",   "L", nil, nil,
+                 "L", nil, nil],
+      ["float",  "F", nil, nil,
+                 "F", nil, nil],
+      ["double", "D", nil, nil,
+                 "D", nil, nil],
+      [/^char\s*\*$/,"s",nil, nil,
+                     "S",nil, nil],
+      [/^const char\s*\*$/,"S",nil, nil,
+                           "S",nil, nil],
+      [/^.+\*$/,   "P", nil, nil,
+                   "P", nil, nil],
+      [/^.+\[\]$/, "a", nil, nil,
+                   "a", nil, nil],
+      ["void",   "0", nil, nil,
+                 nil, nil, nil],
+    ]
+
+    def initialize
+      init_types()
+    end
+
+    def typealias(ty1, ty2, enc=nil, dec=nil, ty3=nil, senc=nil, sdec=nil)
+      @TYDEFS.unshift([ty1, ty2, enc, dec, ty3, senc, sdec])
+    end
+
+    def init_types
+      @TYDEFS = TYPES.dup
+    end
+
+    def encode_argument_type(alias_type)
+      proc_encode = nil
+      proc_decode = nil
+      @TYDEFS.each{|aty,ty,enc,dec,_,_,_|
+	if( (aty.is_a?(Regexp) && (aty =~ alias_type)) || (aty == alias_type) )
+	  alias_type = alias_type.gsub(aty,ty) if ty
+          alias_type.strip! if alias_type
+	  if( proc_encode )
+	    if( enc )
+	      conv1 = proc_encode
+	      proc_encode = proc{|v| enc.call(conv1.call(v))}
+	    end
+	  else
+	    if( enc )
+	      proc_encode = enc
+	    end
+	  end
+	  if( proc_decode )
+	    if( dec )
+	      conv2 = proc_decode
+	      proc_decode = proc{|v| dec.call(conv2.call(v))}
+	    end
+	  else
+	    if( dec )
+	      proc_decode = dec
+	    end
+	  end
+	end
+      }
+      return [alias_type, proc_encode, proc_decode]
+    end
+
+    def encode_return_type(ty)
+      ty, enc, dec = encode_argument_type(ty)
+      return [ty, enc, dec]
+    end
+
+    def encode_struct_type(alias_type)
+      proc_encode = nil
+      proc_decode = nil
+      @TYDEFS.each{|aty,_,_,_,ty,enc,dec|
+	if( (aty.is_a?(Regexp) && (aty =~ alias_type)) || (aty == alias_type) )
+	  alias_type = alias_type.gsub(aty,ty) if ty
+          alias_type.strip! if alias_type
+	  if( proc_encode )
+	    if( enc )
+	      conv1 = proc_encode
+	      proc_encode = proc{|v| enc.call(conv1.call(v))}
+	    end
+	  else
+	    if( enc )
+	      proc_encode = enc
+	    end
+	  end
+	  if( proc_decode )
+	    if( dec )
+	      conv2 = proc_decode
+	      proc_decode = proc{|v| dec.call(conv2.call(v))}
+	    end
+	  else
+	    if( dec )
+	      proc_decode = dec
+	    end
+	  end
+	end
+      }
+      return [alias_type, proc_encode, proc_decode]
+    end
+  end # end of Types
+end
diff --git a/ruby_1_8_6/ext/dl/lib/dl/win32.rb b/ruby_1_8_6/ext/dl/lib/dl/win32.rb
new file mode 100644
index 0000000000..0fed47c324
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/lib/dl/win32.rb
@@ -0,0 +1,25 @@
+# -*- ruby -*-
+
+require 'dl'
+
+class Win32API
+  DLL = {}
+
+  def initialize(dllname, func, import, export = "0")
+    prototype = (export + import.to_s).tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
+    handle = DLL[dllname] ||= DL::Handle.new(dllname)
+    @sym = handle.sym(func, prototype)
+  end
+
+  def call(*args)
+    import = @sym.proto.split("", 2)[1]
+    args.each_with_index do |x, i|
+      args[i] = nil if x == 0 and import[i] == ?S
+      args[i], = [x].pack("I").unpack("i") if import[i] == ?I
+    end
+    ret, = @sym.call(*args)
+    return ret || 0
+  end
+
+  alias Call call
+end
diff --git a/ruby_1_8_6/ext/dl/mkcall.rb b/ruby_1_8_6/ext/dl/mkcall.rb
new file mode 100644
index 0000000000..6a85570152
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/mkcall.rb
@@ -0,0 +1,62 @@
+# -*- ruby -*-
+
+require 'mkmf'
+$:.unshift File.dirname(__FILE__)
+require 'type'
+require 'dlconfig'
+
+def output_arg(x,i)
+  "args[#{i}].#{DLTYPE[x][:stmem]}"
+end
+
+def output_args(types)
+  t = []
+  types[1..-1].each_with_index{|x,i| t.push(output_arg(x,i))}
+  t.join(",")
+end
+
+def output_callfunc(types)
+  t = types[0]
+  stmem = DLTYPE[t][:stmem]
+  ctypes = types2ctypes(types)
+  if( t == VOID )
+    callstm = "(*f)(#{output_args(types)})"
+  else
+    callstm = "ret.#{stmem} = (*f)(#{output_args(types)})"
+  end
+  [ "{",
+    "#{ctypes[0]} (*f)(#{ctypes[1..-1].join(',')}) = func;",
+    "#{callstm};",
+    "}"].join(" ")
+end
+
+def output_case(types)
+  num = types2num(types)
+  callfunc_stm = output_callfunc(types)
+<<EOF
+  case #{num}:
+#ifdef DEBUG
+    printf("#{callfunc_stm}\\n");
+#endif
+    #{callfunc_stm};
+    break;
+EOF
+end
+
+def rec_output(types = [VOID])
+  print output_case(types)
+  if( types.length <= MAX_ARG )
+    DLTYPE.keys.sort.each{|t|
+      if( t != VOID && DLTYPE[t][:sym] )
+	rec_output(types + [t])
+      end
+    }
+  end
+end
+
+DLTYPE.keys.sort.each{|t|
+  if( DLTYPE[t][:sym] )
+    $stderr.printf("  #{DLTYPE[t][:ctype]}\n")
+    rec_output([t])
+  end
+}
diff --git a/ruby_1_8_6/ext/dl/mkcallback.rb b/ruby_1_8_6/ext/dl/mkcallback.rb
new file mode 100644
index 0000000000..c9f92e4a0d
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/mkcallback.rb
@@ -0,0 +1,56 @@
+# -*- ruby -*-
+
+require 'mkmf'
+$:.unshift File.dirname(__FILE__)
+require 'type'
+require 'dlconfig'
+
+def mkfunc(rettype, fnum, argc)
+  args = (0..(argc-1)).collect{|i| "long arg#{i}"}.join(", ")
+
+  subst_code = (0..(argc-1)).collect{|i|
+    "  buff[#{i.to_s}] = arg#{i.to_s};"
+  }.join("\n")
+
+  ret_code =
+    if( DLTYPE[rettype][:c2rb] )
+      "  return #{DLTYPE[rettype][:rb2c]['retval']};"
+    else
+      "  /* no return value */"
+    end
+
+  code = [
+    "static #{DLTYPE[rettype][:ctype]}",
+    "rb_dl_callback_func_#{rettype.to_s}_#{fnum.to_s}(#{args})",
+    "{",
+    "  VALUE retval, proto, proc, obj;",
+    "  VALUE argv[#{argc.to_s}];",
+    "  int  argc;",
+    "  long buff[#{argc.to_s}];",
+    "",
+    subst_code,
+    "",
+    "  obj = rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(#{rettype.to_s}),INT2NUM(#{fnum.to_s})));",
+    "  if(NIL_P(obj))",
+    "    rb_raise(rb_eDLError, \"callback function does not exist in DL::FuncTable\");",
+    "  Check_Type(obj, T_ARRAY);",
+    "  proto = rb_ary_entry(obj, 0);",
+    "  proc  = rb_ary_entry(obj, 1);",
+    "  Check_Type(proto, T_STRING);",
+    "  if( RSTRING(proto)->len >= #{argc.to_s} )",
+    "    rb_raise(rb_eArgError, \"too many arguments\");",
+    "  rb_dl_scan_callback_args(buff, RSTRING(proto)->ptr, &argc, argv);",
+    "  retval = rb_funcall2(proc, id_call, argc, argv);",
+    "",
+    ret_code,
+    "}",
+  ].join("\n")
+
+  return code
+end
+
+DLTYPE.keys.sort.each{|t|
+  for n in 0..(MAX_CALLBACK - 1)
+    print(mkfunc(t, n, 15), "\n\n")
+  end
+}
diff --git a/ruby_1_8_6/ext/dl/mkcbtable.rb b/ruby_1_8_6/ext/dl/mkcbtable.rb
new file mode 100644
index 0000000000..165c4bdc88
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/mkcbtable.rb
@@ -0,0 +1,18 @@
+# -*- ruby -*-
+
+require 'mkmf'
+$:.unshift File.dirname(__FILE__)
+require 'type'
+require 'dlconfig'
+
+def mktable(rettype, fnum, argc)
+  code =
+    "rb_dl_callback_table[#{rettype}][#{fnum}] = &rb_dl_callback_func_#{rettype.to_s}_#{fnum};"
+  return code
+end
+
+DLTYPE.keys.sort.each{|t|
+  for n in 0..(MAX_CALLBACK - 1)
+    print(mktable(t, n, 15), "\n")
+  end
+}
diff --git a/ruby_1_8_6/ext/dl/ptr.c b/ruby_1_8_6/ext/dl/ptr.c
new file mode 100644
index 0000000000..5112151733
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/ptr.c
@@ -0,0 +1,1068 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#include <ruby.h>
+#include <ctype.h>
+#include <version.h> /* for ruby version code */
+#include "dl.h"
+
+VALUE rb_cDLPtrData;
+VALUE rb_mDLMemorySpace;
+static VALUE DLMemoryTable;
+
+#ifndef T_SYMBOL
+# define T_SYMBOL T_FIXNUM
+#endif
+
+#if RUBY_VERSION_CODE < 171
+static VALUE
+rb_hash_delete(VALUE hash, VALUE key)
+{
+  return rb_funcall(hash, rb_intern("delete"), 1, key);
+}
+#endif
+
+static void
+rb_dlmem_delete(void *ptr)
+{
+  rb_secure(4);
+  rb_hash_delete(DLMemoryTable, DLLONG2NUM(ptr));
+}
+
+static void
+rb_dlmem_aset(void *ptr, VALUE obj)
+{
+  if (obj == Qnil) {
+    rb_dlmem_delete(ptr);
+  }
+  else{
+    rb_hash_aset(DLMemoryTable, DLLONG2NUM(ptr), DLLONG2NUM(obj));
+  }
+}
+
+static VALUE
+rb_dlmem_aref(void *ptr)
+{
+  VALUE val;
+
+  val = rb_hash_aref(DLMemoryTable, DLLONG2NUM(ptr));
+  return val == Qnil ? Qnil : (VALUE)DLNUM2LONG(val);
+}
+
+void
+dlptr_free(struct ptr_data *data)
+{
+  if (data->ptr) {
+    DEBUG_CODE({
+      printf("dlptr_free(): removing the pointer `0x%x' from the MemorySpace\n",
+	     data->ptr);
+    });
+    rb_dlmem_delete(data->ptr);
+    if (data->free) {
+      DEBUG_CODE({
+	printf("dlptr_free(): 0x%x(data->ptr:0x%x)\n",data->free,data->ptr);
+      });
+      (*(data->free))(data->ptr);
+    }
+  }
+  if (data->stype) dlfree(data->stype);
+  if (data->ssize) dlfree(data->ssize);
+  if (data->ids) dlfree(data->ids);
+}
+
+void
+dlptr_init(VALUE val)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(val, struct ptr_data, data);
+  DEBUG_CODE({
+    printf("dlptr_init(): add the pointer `0x%x' to the MemorySpace\n",
+	   data->ptr);
+  });
+  rb_dlmem_aset(data->ptr, val);
+  OBJ_TAINT(val);
+}
+
+VALUE
+rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
+{
+  struct ptr_data *data;
+  VALUE val;
+
+  rb_secure(4);
+  if (ptr) {
+    val = rb_dlmem_aref(ptr);
+    if (val == Qnil) {
+      val = Data_Make_Struct(klass, struct ptr_data,
+			     0, dlptr_free, data);
+      data->ptr = ptr;
+      data->free = func;
+      data->ctype = DLPTR_CTYPE_UNKNOWN;
+      data->stype = NULL;
+      data->ssize = NULL;
+      data->slen = 0;
+      data->size = size;
+      data->ids = NULL;
+      data->ids_num = 0;
+      dlptr_init(val);
+    }
+    else{
+      if (func) {
+	Data_Get_Struct(val, struct ptr_data, data);
+	data->free = func;
+      }
+    }
+  }
+  else{
+    val = Qnil;
+  }
+
+  return val;
+}
+
+VALUE
+rb_dlptr_new(void *ptr, long size, freefunc_t func)
+{
+  return rb_dlptr_new2(rb_cDLPtrData, ptr, size, func);
+}
+
+VALUE
+rb_dlptr_malloc(long size, freefunc_t func)
+{
+  void *ptr;
+
+  rb_secure(4);
+  ptr = dlmalloc((size_t)size);
+  memset(ptr,0,(size_t)size);
+  return rb_dlptr_new(ptr, size, func);
+}
+
+void *
+rb_dlptr2cptr(VALUE val)
+{
+  struct ptr_data *data;
+  void *ptr;
+
+  if (rb_obj_is_kind_of(val, rb_cDLPtrData)) {
+    Data_Get_Struct(val, struct ptr_data, data);
+    ptr = data->ptr;
+  }
+  else if (val == Qnil) {
+    ptr = NULL;
+  }
+  else{
+    rb_raise(rb_eTypeError, "DL::PtrData was expected");
+  }
+    
+  return ptr;
+}
+
+static VALUE
+rb_dlptr_s_allocate(VALUE klass)
+{
+  VALUE obj;
+  struct ptr_data *data;
+
+  rb_secure(4);
+  obj = Data_Make_Struct(klass, struct ptr_data, 0, dlptr_free, data);
+  data->ptr = 0;
+  data->free = 0;
+  data->ctype = DLPTR_CTYPE_UNKNOWN;
+  data->stype = NULL;
+  data->ssize = NULL;
+  data->slen  = 0;
+  data->size  = 0;
+  data->ids   = NULL;
+  data->ids_num = 0;
+
+  return obj;
+}
+
+static VALUE
+rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
+{
+  VALUE ptr, sym, size;
+  struct ptr_data *data;
+  void *p = NULL;
+  freefunc_t f = NULL;
+  long s = 0;
+
+  switch (rb_scan_args(argc, argv, "12", &ptr, &size, &sym)) {
+  case 1:
+    p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
+    break;
+  case 2:
+    p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
+    s = DLNUM2LONG(size);
+    break;
+  case 3:
+    p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
+    s = DLNUM2LONG(size);
+    f = rb_dlsym2csym(sym);
+    break;
+  default:
+    rb_bug("rb_dlptr_initialize");
+  }
+
+  if (p) {
+    Data_Get_Struct(self, struct ptr_data, data);
+    if (data->ptr && data->free) {
+      /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
+      (*(data->free))(data->ptr);
+    }
+    data->ptr  = p;
+    data->size = s;
+    data->free = f;
+  }
+
+  return Qnil;
+}
+
+static VALUE
+rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
+{
+  VALUE size, sym, obj;
+  int   s;
+  freefunc_t f = NULL;
+
+  switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
+  case 1:
+    s = NUM2INT(size);
+    break;
+  case 2:
+    s = NUM2INT(size);
+    f = rb_dlsym2csym(sym);
+    break;
+  default:
+    rb_bug("rb_dlptr_s_malloc");
+  }
+
+  obj = rb_dlptr_malloc(s,f);
+
+  return obj;
+}
+
+VALUE
+rb_dlptr_to_i(VALUE self)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  return DLLONG2NUM(data->ptr);
+}
+
+VALUE
+rb_dlptr_ptr(VALUE self)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  return rb_dlptr_new(*((void**)(data->ptr)),0,0);
+}
+
+VALUE
+rb_dlptr_ref(VALUE self)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  return rb_dlptr_new(&(data->ptr),0,0);
+}
+
+VALUE
+rb_dlptr_null_p(VALUE self)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  return data->ptr ? Qfalse : Qtrue;
+}
+
+VALUE
+rb_dlptr_free_set(VALUE self, VALUE val)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+
+  data->free = DLFREEFUNC(rb_dlsym2csym(val));
+
+  return Qnil;
+}
+
+VALUE
+rb_dlptr_free_get(VALUE self)
+{
+  struct ptr_data *pdata;
+
+  Data_Get_Struct(self, struct ptr_data, pdata);
+
+  return rb_dlsym_new(pdata->free,"(free)","0P");
+}
+
+VALUE
+rb_dlptr_to_array(int argc, VALUE argv[], VALUE self)
+{
+  struct ptr_data *data;
+  int n;
+  int i;
+  int t;
+  VALUE ary;
+  VALUE type, size;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+
+  switch (rb_scan_args(argc, argv, "11", &type, &size)) {
+  case 2:
+    t = StringValuePtr(type)[0];
+    n = NUM2INT(size);
+    break;
+  case 1:
+    t = StringValuePtr(type)[0];
+    switch (t) {
+    case 'C':
+      n = data->size;
+      break;
+    case 'H':
+      n = data->size / sizeof(short);
+      break;
+    case 'I':
+      n = data->size / sizeof(int);
+      break;
+    case 'L':
+      n = data->size / sizeof(long);
+      break;
+    case 'F':
+      n = data->size / sizeof(float);
+      break;
+    case 'D':
+      n = data->size / sizeof(double);
+      break;
+    case  'P': case 'p':
+      n = data->size / sizeof(void*);
+      break;
+    case 'S': case 's':
+      for (n=0; ((void**)(data->ptr))[n]; n++) {};
+      break;
+    default:
+	n = 0;
+    }
+    break;
+  default:
+    rb_bug("rb_dlptr_to_array");
+  }
+
+  ary = rb_ary_new();
+
+  for (i=0; i < n; i++) {
+    switch (t) {
+    case 'C':
+      rb_ary_push(ary, INT2NUM(((char*)(data->ptr))[i]));
+      break;
+    case 'H':
+      rb_ary_push(ary, INT2NUM(((short*)(data->ptr))[i]));
+      break;
+    case 'I':
+      rb_ary_push(ary, INT2NUM(((int*)(data->ptr))[i]));
+      break;
+    case 'L':
+      rb_ary_push(ary, DLLONG2NUM(((long*)(data->ptr))[i]));
+      break;
+    case 'D':
+      rb_ary_push(ary, rb_float_new(((double*)(data->ptr))[i]));
+      break;
+    case 'F':
+      rb_ary_push(ary, rb_float_new(((float*)(data->ptr))[i]));
+      break;
+    case 'S':
+      {
+	char *str = ((char**)(data->ptr))[i];
+	if (str) {
+	  rb_ary_push(ary, rb_tainted_str_new2(str));
+	}
+	else{
+	  rb_ary_push(ary, Qnil);
+	}
+      }
+      break;
+    case 's':
+      {
+	char *str = ((char**)(data->ptr))[i];
+	if (str) {
+	  rb_ary_push(ary, rb_tainted_str_new2(str));
+	  xfree(str);
+	}
+	else{
+	  rb_ary_push(ary, Qnil);
+	}
+      }
+      break;
+    case 'P':
+      rb_ary_push(ary, rb_dlptr_new(((void**)(data->ptr))[i],0,0));
+      break;
+    case 'p':
+      rb_ary_push(ary,
+		  rb_dlptr_new(((void**)(data->ptr))[i],0,dlfree));
+      break;
+    }
+  }
+
+  return ary;
+}
+
+
+VALUE
+rb_dlptr_to_s(int argc, VALUE argv[], VALUE self)
+{
+  struct ptr_data *data;
+  VALUE arg1, val;
+  int len;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  switch (rb_scan_args(argc, argv, "01", &arg1)) {
+  case 0:
+    val = rb_tainted_str_new2((char*)(data->ptr));
+    break;
+  case 1:
+    len = NUM2INT(arg1);
+    val = rb_tainted_str_new((char*)(data->ptr), len);
+    break;
+  default:
+    rb_bug("rb_dlptr_to_s");
+  }
+
+  return val;
+}
+
+VALUE
+rb_dlptr_to_str(int argc, VALUE argv[], VALUE self)
+{
+  struct ptr_data *data;
+  VALUE arg1, val;
+  int len;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  switch (rb_scan_args(argc, argv, "01", &arg1)) {
+  case 0:
+    val = rb_tainted_str_new((char*)(data->ptr),data->size);
+    break;
+  case 1:
+    len = NUM2INT(arg1);
+    val = rb_tainted_str_new((char*)(data->ptr), len);
+    break;
+  default:
+    rb_bug("rb_dlptr_to_str");
+  }
+
+  return val;
+}
+
+VALUE
+rb_dlptr_inspect(VALUE self)
+{
+  struct ptr_data *data;
+  char str[1024];
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  snprintf(str, 1023, "#<%s:0x%lx ptr=0x%lx size=%ld free=0x%lx>",
+	   rb_class2name(CLASS_OF(self)), data, data->ptr, data->size,
+	   (long)data->free);
+  return rb_str_new2(str);
+}
+
+VALUE
+rb_dlptr_eql(VALUE self, VALUE other)
+{
+  void *ptr1, *ptr2;
+  ptr1 = rb_dlptr2cptr(self);
+  ptr2 = rb_dlptr2cptr(other);
+
+  return ptr1 == ptr2 ? Qtrue : Qfalse;
+}
+
+VALUE
+rb_dlptr_cmp(VALUE self, VALUE other)
+{
+  void *ptr1, *ptr2;
+  ptr1 = rb_dlptr2cptr(self);
+  ptr2 = rb_dlptr2cptr(other);
+  return DLLONG2NUM((long)ptr1 - (long)ptr2);
+}
+
+VALUE
+rb_dlptr_plus(VALUE self, VALUE other)
+{
+  void *ptr;
+  long num, size;
+
+  ptr = rb_dlptr2cptr(self);
+  size = RDLPTR(self)->size;
+  num = DLNUM2LONG(other);
+  return rb_dlptr_new((char *)ptr + num, size - num, 0);
+}
+
+VALUE
+rb_dlptr_minus(VALUE self, VALUE other)
+{
+  void *ptr;
+  long num, size;
+
+  ptr = rb_dlptr2cptr(self);
+  size = RDLPTR(self)->size;
+  num = DLNUM2LONG(other);
+  return rb_dlptr_new((char *)ptr - num, size + num, 0);
+}
+
+VALUE
+rb_dlptr_define_data_type(int argc, VALUE argv[], VALUE self)
+{
+  VALUE data_type, type, rest, vid;
+  struct ptr_data *data;
+  int i, t, num;
+  char *ctype;
+
+  rb_scan_args(argc, argv, "11*", &data_type, &type, &rest);
+  Data_Get_Struct(self, struct ptr_data, data);
+
+  if (argc == 1 || (argc == 2 && type == Qnil)) {
+    if (NUM2INT(data_type) == DLPTR_CTYPE_UNKNOWN) {
+      data->ctype = DLPTR_CTYPE_UNKNOWN;
+      data->slen = 0;
+      data->ids_num  = 0;
+      if (data->stype) {
+	dlfree(data->stype);
+	data->stype = NULL;
+      }
+      if (data->ids) {
+	dlfree(data->ids);
+	data->ids = NULL;
+      }
+      return Qnil;
+    }
+    else{
+      rb_raise(rb_eArgError, "wrong arguments");
+    }
+  }
+
+  t = NUM2INT(data_type);
+  StringValue(type);
+  Check_Type(rest, T_ARRAY);
+  num = RARRAY(rest)->len;
+  for (i=0; i<num; i++) {
+    rb_to_id(rb_ary_entry(rest,i));
+  }
+
+  data->ctype = t;
+  data->slen = num;
+  data->ids_num  = num;
+  if (data->stype) dlfree(data->stype);
+  data->stype = (char*)dlmalloc(sizeof(char) * num);
+  if (data->ssize) dlfree(data->ssize);
+  data->ssize = (int*)dlmalloc(sizeof(int) * num);
+  if (data->ids) dlfree(data->ids);
+  data->ids  = (ID*)dlmalloc(sizeof(ID) * data->ids_num);
+
+  ctype = StringValuePtr(type);
+  for (i=0; i<num; i++) {
+    vid = rb_ary_entry(rest,i);
+    data->ids[i] = rb_to_id(vid);
+    data->stype[i] = *ctype;
+    ctype ++;
+    if (isdigit(*ctype)) {
+      char *p, *d;
+      for (p=ctype; isdigit(*p); p++) ;
+      d = ALLOCA_N(char, p - ctype + 1);
+      strncpy(d, ctype, p - ctype);
+      d[p - ctype] = '\0';
+      data->ssize[i] = atoi(d);
+      ctype = p;
+    }
+    else{
+      data->ssize[i] = 1;
+    }
+  }
+
+  if (*ctype) {
+    rb_raise(rb_eArgError, "too few/many arguments");
+  }
+
+  if (!data->size)
+    data->size = dlsizeof(RSTRING(type)->ptr);
+
+  return Qnil;
+}
+
+VALUE
+rb_dlptr_define_struct(int argc, VALUE argv[], VALUE self)
+{
+  VALUE *pass_argv;
+  int pass_argc, i;
+
+  pass_argc = argc + 1;
+  pass_argv = ALLOCA_N(VALUE, pass_argc);
+  pass_argv[0] = INT2FIX(DLPTR_CTYPE_STRUCT);
+  for (i=1; i<pass_argc; i++) {
+    pass_argv[i] = argv[i-1];
+  }
+  return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
+}
+
+VALUE
+rb_dlptr_define_union(int argc, VALUE argv[], VALUE self)
+{
+  VALUE *pass_argv;
+  int pass_argc, i;
+
+  pass_argc = argc + 1;
+  pass_argv = ALLOCA_N(VALUE, pass_argc);
+  pass_argv[0] = INT2FIX(DLPTR_CTYPE_UNION);
+  for (i=1; i<pass_argc; i++) {
+    pass_argv[i] = argv[i-1];
+  }
+  return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
+}
+
+VALUE
+rb_dlptr_get_data_type(VALUE self)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  if (data->stype)
+    return rb_assoc_new(INT2FIX(data->ctype),
+			rb_tainted_str_new(data->stype, data->slen));
+  else
+    return rb_assoc_new(INT2FIX(data->ctype), Qnil);
+}
+
+static VALUE
+cary2ary(void *ptr, char t, int len)
+{
+  VALUE ary;
+  VALUE elem;
+  int i;
+
+  if (len < 1)
+    return Qnil;
+
+  if (len == 1) {
+    switch (t) {
+    case 'I':
+      elem = INT2NUM(*((int*)ptr));
+      ptr = (char *)ptr + sizeof(int);
+      break;
+    case 'L':
+      elem = DLLONG2NUM(*((long*)ptr));
+      ptr = (char *)ptr + sizeof(long);
+      break;
+    case 'P':
+    case 'S':
+      elem = rb_dlptr_new(*((void**)ptr),0, 0);
+      ptr = (char *)ptr + sizeof(void*);
+      break;
+    case 'F':
+      elem = rb_float_new(*((float*)ptr));
+      ptr = (char *)ptr + sizeof(float);
+      break;
+    case 'D':
+      elem = rb_float_new(*((double*)ptr));
+      ptr = (char *)ptr + sizeof(double);
+      break;
+    case 'C':
+      elem = INT2NUM(*((char*)ptr));
+      ptr = (char *)ptr + sizeof(char);
+      break;
+    case 'H':
+      elem = INT2NUM(*((short*)ptr));
+      ptr = (char *)ptr + sizeof(short);
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unsupported type '%c'", t);
+    }
+    return elem;
+  }
+
+  ary = rb_ary_new();
+  for (i=0; i < len; i++) {
+    switch (t) {
+    case 'I':
+      elem = INT2NUM(*((int*)ptr));
+      ptr = (char *)ptr + sizeof(int);
+      break;
+    case 'L':
+      elem = DLLONG2NUM(*((long*)ptr));
+      ptr = (char *)ptr + sizeof(long);
+      break;
+    case 'P':
+    case 'S':
+      elem = rb_dlptr_new(*((void**)ptr), 0, 0);
+      ptr = (char *)ptr + sizeof(void*);
+      break;
+    case 'F':
+      elem = rb_float_new(*((float*)ptr));
+      ptr = (char *)ptr + sizeof(float);
+      break;
+    case 'D':
+      elem = rb_float_new(*((float*)ptr));
+      ptr = (char *)ptr + sizeof(double);
+      break;
+    case 'C':
+      elem = INT2NUM(*((char*)ptr));
+      ptr = (char *)ptr + sizeof(char);
+      break;
+    case 'H':
+      elem = INT2NUM(*((short*)ptr));
+      ptr = (char *)ptr + sizeof(short);
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unsupported type '%c'", t);
+    }
+    rb_ary_push(ary, elem);
+  }
+
+  return ary;
+}
+
+VALUE
+rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
+{
+  VALUE key = Qnil, num = Qnil;
+  ID id;
+  struct ptr_data *data;
+  int i;
+  int offset;
+
+  if (rb_scan_args(argc, argv, "11", &key, &num) == 1) {
+    num = INT2NUM(0);
+  }
+
+  if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
+    VALUE pass[1];
+    pass[0] = num;
+    return rb_dlptr_to_str(1, pass, rb_dlptr_plus(self, key));
+  }
+  rb_to_id(key);
+  if (! (TYPE(key) == T_STRING || TYPE(key) == T_SYMBOL)) {
+    rb_raise(rb_eTypeError, "the key must be a string or symbol");
+  }
+
+  id = rb_to_id(key);
+  Data_Get_Struct(self, struct ptr_data, data);
+  offset = 0;
+  switch (data->ctype) {
+  case DLPTR_CTYPE_STRUCT:
+    for (i=0; i < data->ids_num; i++) {
+      switch (data->stype[i]) {
+      case 'I':
+        DLALIGN(data->ptr,offset,INT_ALIGN);
+        break;
+      case 'L':
+        DLALIGN(data->ptr,offset,LONG_ALIGN);
+        break;
+      case 'P':
+      case 'S':
+        DLALIGN(data->ptr,offset,VOIDP_ALIGN);
+        break;
+      case 'F':
+        DLALIGN(data->ptr,offset,FLOAT_ALIGN);
+        break;
+      case 'D':
+        DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
+        break;
+      case 'C':
+        break;
+      case 'H':
+        DLALIGN(data->ptr,offset,SHORT_ALIGN);
+        break;
+      default:
+        rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+      }
+      if (data->ids[i] == id) {
+	return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
+      }
+      switch (data->stype[i]) {
+      case 'I':
+	offset += sizeof(int) * data->ssize[i];
+	break;
+      case 'L':
+	offset += sizeof(long) * data->ssize[i];
+	break;
+      case 'P':
+      case 'S':
+	offset += sizeof(void*) * data->ssize[i];
+	break;
+      case 'F':
+	offset += sizeof(float) * data->ssize[i];
+	break;
+      case 'D':
+	offset += sizeof(double) * data->ssize[i];
+	break;
+      case 'C':
+	offset += sizeof(char) * data->ssize[i];
+	break;
+      case 'H':
+	offset += sizeof(short) * data->ssize[i];
+	break;
+      default:
+	rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+      }
+    }
+    break;
+  case DLPTR_CTYPE_UNION:
+    for (i=0; i < data->ids_num; i++) {
+      if (data->ids[i] == id) {
+	return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
+      }
+    }
+    break;
+  } /* end of switch */
+
+  rb_raise(rb_eNameError, "undefined key `%s' for %s",
+	   rb_id2name(id), rb_class2name(CLASS_OF(self)));
+
+  return Qnil;
+}
+
+static void *
+ary2cary(char t, VALUE val, long *size)
+{
+  void *ptr;
+
+  if (TYPE(val) == T_ARRAY) {
+    ptr = rb_ary2cary(t, val, size);
+  }
+  else{
+    ptr = rb_ary2cary(t, rb_ary_new3(1, val), size);
+  }
+  return ptr;
+}
+
+VALUE
+rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
+{
+  VALUE key = Qnil, num = Qnil, val = Qnil;
+  ID id;
+  struct ptr_data *data;
+  int i;
+  int offset;
+  long memsize;
+  void *memimg;
+
+  rb_secure(4);
+  switch (rb_scan_args(argc, argv, "21", &key, &num, &val)) {
+  case 2:
+    val = num;
+    num = Qnil;
+    break;
+  }
+
+  if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
+    void *dst, *src;
+    long len;
+
+    StringValue(val);
+    Data_Get_Struct(self, struct ptr_data, data);
+    dst = (void*)((long)(data->ptr) + DLNUM2LONG(key));
+    src = RSTRING(val)->ptr;
+    len = RSTRING(val)->len;
+    if (num == Qnil) {
+      memcpy(dst, src, len);
+    }
+    else{
+      long n = NUM2INT(num);
+      memcpy(dst, src, n < len ? n : len);
+      if (n > len) MEMZERO((char*)dst + len, char, n - len);
+    }
+    return val;
+  }
+
+  id = rb_to_id(key);
+  Data_Get_Struct(self, struct ptr_data, data);
+  switch (data->ctype) {
+  case DLPTR_CTYPE_STRUCT:
+    offset = 0;
+    for (i=0; i < data->ids_num; i++) {
+      switch (data->stype[i]) {
+      case 'I':
+        DLALIGN(data->ptr,offset,INT_ALIGN);
+        break;
+      case 'L':
+        DLALIGN(data->ptr,offset,LONG_ALIGN);
+        break;
+      case 'P':
+      case 'S':
+        DLALIGN(data->ptr,offset,VOIDP_ALIGN);
+        break;
+      case 'D':
+        DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
+        break;
+      case 'F':
+        DLALIGN(data->ptr,offset,FLOAT_ALIGN);
+        break;
+      case 'C':
+        break;
+      case 'H':
+        DLALIGN(data->ptr,offset,SHORT_ALIGN);
+        break;
+      default:
+        rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+      }
+      if (data->ids[i] == id) {
+	memimg = ary2cary(data->stype[i], val, &memsize);
+	memcpy((char *)data->ptr + offset, memimg, memsize);
+        dlfree(memimg);
+	return val;
+      }
+      switch (data->stype[i]) {
+      case 'I':
+      case 'i':
+	offset += sizeof(int) * data->ssize[i];
+	break;
+      case 'L':
+      case 'l':
+	offset += sizeof(long) * data->ssize[i];
+	break;
+      case 'P':
+      case 'p':
+      case 'S':
+      case 's':
+	offset += sizeof(void*) * data->ssize[i];
+	break;
+      case 'D':
+      case 'd':
+	offset += sizeof(double) * data->ssize[i];
+	break;
+      case 'F':
+      case 'f':
+	offset += sizeof(float) * data->ssize[i];
+	break;
+      case 'C':
+      case 'c':
+	offset += sizeof(char) * data->ssize[i];
+	break;
+      case 'H':
+      case 'h':
+	offset += sizeof(short) * data->ssize[i];
+	break;
+      default:
+	rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+      }
+    }
+    return val;
+    /* break; */
+  case DLPTR_CTYPE_UNION:
+    for (i=0; i < data->ids_num; i++) {
+      if (data->ids[i] == id) {
+	switch (data->stype[i]) {
+	case 'I': case 'i':
+	  memsize = sizeof(int) * data->ssize[i];
+	  break;
+	case 'L': case 'l':
+	  memsize = sizeof(long) * data->ssize[i];
+	  break;
+	case 'P': case 'p':
+	case 'S': case 's':
+	  memsize = sizeof(void*) * data->ssize[i];
+	  break;
+	case 'F': case 'f':
+	  memsize = sizeof(float) * data->ssize[i];
+	  break;
+	case 'D': case 'd':
+	  memsize = sizeof(double) * data->ssize[i];
+	  break;
+	case 'C': case 'c':
+	  memsize = sizeof(char) * data->ssize[i];
+	  break;
+	case 'H': case 'h':
+	  memsize = sizeof(short) * data->ssize[i];
+	  break;
+	default:
+	  rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+	}
+	memimg = ary2cary(data->stype[i], val, NULL);
+	memcpy(data->ptr, memimg, memsize);
+        dlfree(memimg);
+      }
+    }
+    return val;
+    /* break; */
+  }
+
+  rb_raise(rb_eNameError, "undefined key `%s' for %s",
+	   rb_id2name(id), rb_class2name(CLASS_OF(self)));
+
+  return Qnil;
+}
+
+VALUE
+rb_dlptr_size(int argc, VALUE argv[], VALUE self)
+{
+  VALUE size;
+
+  if (rb_scan_args(argc, argv, "01", &size) == 0){
+    return DLLONG2NUM(RDLPTR(self)->size);
+  }
+  else{
+    RDLPTR(self)->size = DLNUM2LONG(size);
+    return size;
+  }
+}
+
+static VALUE
+dlmem_each_i(VALUE assoc, void *data)
+{
+  VALUE key, val;
+  key = rb_ary_entry(assoc, 0);
+  val = rb_ary_entry(assoc, 1);
+  rb_yield(rb_assoc_new(key,(VALUE)DLNUM2LONG(val)));
+  return Qnil;
+}
+
+VALUE
+rb_dlmem_each(VALUE self)
+{
+  rb_iterate(rb_each, DLMemoryTable, dlmem_each_i, 0);
+  return Qnil;
+}
+
+void
+Init_dlptr()
+{
+  rb_cDLPtrData = rb_define_class_under(rb_mDL, "PtrData", rb_cObject);
+  rb_define_alloc_func(rb_cDLPtrData, rb_dlptr_s_allocate);
+  rb_define_singleton_method(rb_cDLPtrData, "malloc", rb_dlptr_s_malloc, -1);
+  rb_define_method(rb_cDLPtrData, "initialize", rb_dlptr_initialize, -1);
+  rb_define_method(rb_cDLPtrData, "free=", rb_dlptr_free_set, 1);
+  rb_define_method(rb_cDLPtrData, "free",  rb_dlptr_free_get, 0);
+  rb_define_method(rb_cDLPtrData, "to_i",  rb_dlptr_to_i, 0);
+  rb_define_method(rb_cDLPtrData, "ptr",   rb_dlptr_ptr, 0);
+  rb_define_method(rb_cDLPtrData, "+@", rb_dlptr_ptr, 0);
+  rb_define_method(rb_cDLPtrData, "ref",   rb_dlptr_ref, 0);
+  rb_define_method(rb_cDLPtrData, "-@", rb_dlptr_ref, 0);
+  rb_define_method(rb_cDLPtrData, "null?", rb_dlptr_null_p, 0);
+  rb_define_method(rb_cDLPtrData, "to_a", rb_dlptr_to_array, -1);
+  rb_define_method(rb_cDLPtrData, "to_s", rb_dlptr_to_s, -1);
+  rb_define_method(rb_cDLPtrData, "to_str", rb_dlptr_to_str, -1);
+  rb_define_method(rb_cDLPtrData, "inspect", rb_dlptr_inspect, 0);
+  rb_define_method(rb_cDLPtrData, "<=>", rb_dlptr_cmp, 1);
+  rb_define_method(rb_cDLPtrData, "==", rb_dlptr_eql, 1);
+  rb_define_method(rb_cDLPtrData, "eql?", rb_dlptr_eql, 1);
+  rb_define_method(rb_cDLPtrData, "+", rb_dlptr_plus, 1);
+  rb_define_method(rb_cDLPtrData, "-", rb_dlptr_minus, 1);
+  rb_define_method(rb_cDLPtrData, "define_data_type",
+		   rb_dlptr_define_data_type, -1);
+  rb_define_method(rb_cDLPtrData, "struct!", rb_dlptr_define_struct, -1);
+  rb_define_method(rb_cDLPtrData, "union!",  rb_dlptr_define_union,  -1);
+  rb_define_method(rb_cDLPtrData, "data_type", rb_dlptr_get_data_type, 0);
+  rb_define_method(rb_cDLPtrData, "[]", rb_dlptr_aref, -1);
+  rb_define_method(rb_cDLPtrData, "[]=", rb_dlptr_aset, -1);
+  rb_define_method(rb_cDLPtrData, "size", rb_dlptr_size, -1);
+  rb_define_method(rb_cDLPtrData, "size=", rb_dlptr_size, -1);
+
+  rb_mDLMemorySpace = rb_define_module_under(rb_mDL, "MemorySpace");
+  DLMemoryTable = rb_hash_new();
+  rb_define_const(rb_mDLMemorySpace, "MemoryTable", DLMemoryTable);
+  rb_define_module_function(rb_mDLMemorySpace, "each", rb_dlmem_each, 0);
+}
diff --git a/ruby_1_8_6/ext/dl/sample/c++sample.C b/ruby_1_8_6/ext/dl/sample/c++sample.C
new file mode 100644
index 0000000000..d083d337a7
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/sample/c++sample.C
@@ -0,0 +1,35 @@
+#include <stdio.h>
+
+class Person {
+private:
+  const char *name;
+  int age;
+
+public:
+  Person(const char *name, int age);
+  const char * get_name();
+  int get_age();
+  void set_age(int i);
+};
+
+Person::Person(const char *name, int age)
+  : name(name), age(age)
+{
+  /* empty */
+}
+
+const char *
+Person::get_name()
+{
+  return name;
+}
+
+int
+Person::get_age(){
+  return age;
+}
+
+void
+Person::set_age(int i){
+  age = i;
+}
diff --git a/ruby_1_8_6/ext/dl/sample/c++sample.rb b/ruby_1_8_6/ext/dl/sample/c++sample.rb
new file mode 100644
index 0000000000..29887df845
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/sample/c++sample.rb
@@ -0,0 +1,60 @@
+=begin
+ This script shows how to deal with C++ classes using Ruby/DL.
+ You must build a dynamic loadable library using "c++sample.C"
+ to run this script as follows:
+   $ g++ -o libsample.so -shared c++sample.C
+=end
+
+require 'dl'
+require 'dl/import'
+require 'dl/struct'
+
+# Give a name of dynamic loadable library
+LIBNAME = ARGV[0] || "libsample.so"
+
+class Person
+  module Core
+    extend DL::Importable
+    
+    dlload LIBNAME
+
+    # mangled symbol names
+    extern "void __6PersonPCci(void *, const char *, int)"
+    extern "const char *get_name__6Person(void *)"
+    extern "int get_age__6Person(void *)"
+    extern "void set_age__6Personi(void *, int)"
+
+    Data = struct [
+      "char *name",
+      "int age",
+    ]
+  end
+
+  def initialize(name, age)
+    @ptr = Core::Data.alloc
+    Core::__6PersonPCci(@ptr, name, age)
+  end
+
+  def get_name()
+    str = Core::get_name__6Person(@ptr)
+    if( str )
+      str.to_s
+    else
+      nil
+    end
+  end
+
+  def get_age()
+    Core::get_age__6Person(@ptr)
+  end
+
+  def set_age(age)
+    Core::set_age__6Personi(@ptr, age)
+  end
+end
+
+obj = Person.new("ttate", 1)
+p obj.get_name()
+p obj.get_age()
+obj.set_age(10)
+p obj.get_age()
diff --git a/ruby_1_8_6/ext/dl/sample/drives.rb b/ruby_1_8_6/ext/dl/sample/drives.rb
new file mode 100644
index 0000000000..8a590404b1
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/sample/drives.rb
@@ -0,0 +1,70 @@
+# -*- ruby -*-
+# drives.rb -- find existing drives and show the drive type.
+
+require 'dl'
+require 'dl/import'
+
+module Kernel32
+  extend DL::Importable
+
+  dlload "kernel32"
+
+  extern "long GetLogicalDrives()"
+  extern "int GetDriveType(char*)"
+  extern "long GetDiskFreeSpace(char*, long ref, long ref, long ref, long ref)"
+end
+
+include Kernel32
+
+buff = Kernel32.getLogicalDrives()
+
+i = 0
+ds = []
+while( i < 26 )
+  mask = (1 << i)
+  if( buff & mask > 0 )
+    ds.push((65+i).chr)
+  end
+  i += 1
+end
+
+=begin
+From the cygwin's /usr/include/w32api/winbase.h:
+#define DRIVE_UNKNOWN 0
+#define DRIVE_NO_ROOT_DIR 1
+#define DRIVE_REMOVABLE 2
+#define DRIVE_FIXED 3
+#define DRIVE_REMOTE 4
+#define DRIVE_CDROM 5
+#define DRIVE_RAMDISK 6
+=end
+
+types = [
+  "unknown",
+  "no root dir",
+  "Removable",
+  "Fixed", 
+  "Remote",
+  "CDROM",
+  "RAM",
+]
+print("Drive : Type (Free Space/Available Space)\n")
+ds.each{|d|
+  t = Kernel32.getDriveType(d + ":\\")
+  Kernel32.getDiskFreeSpace(d + ":\\", 0, 0, 0, 0)
+  _,sec_per_clus,byte_per_sec,free_clus,total_clus = Kernel32._args_
+  fbytes = sec_per_clus * byte_per_sec * free_clus
+  tbytes = sec_per_clus * byte_per_sec * total_clus
+  unit = "B"
+  if( fbytes > 1024 && tbytes > 1024 )
+    fbytes = fbytes / 1024
+    tbytes = tbytes / 1024
+    unit = "K"
+  end
+  if( fbytes > 1024 && tbytes > 1024 )
+    fbytes = fbytes / 1024
+    tbytes = tbytes / 1024
+    unit = "M"
+  end
+  print("#{d} : #{types[t]} (#{fbytes} #{unit}/#{tbytes} #{unit})\n")
+}
diff --git a/ruby_1_8_6/ext/dl/sample/getch.rb b/ruby_1_8_6/ext/dl/sample/getch.rb
new file mode 100644
index 0000000000..3f7261c979
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/sample/getch.rb
@@ -0,0 +1,5 @@
+require 'dl'
+
+crtdll = DL::dlopen("crtdll")
+getch  = crtdll['_getch', 'L']
+print(getch.call, "\n")
diff --git a/ruby_1_8_6/ext/dl/sample/libc.rb b/ruby_1_8_6/ext/dl/sample/libc.rb
new file mode 100644
index 0000000000..a1f6fbe543
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/sample/libc.rb
@@ -0,0 +1,69 @@
+require "dl/import"
+require "dl/struct"
+
+module LIBC
+  extend DL::Importable
+
+  begin
+    dlload "libc.so.6"
+  rescue
+    dlload "libc.so.5"
+  end
+
+  extern "int atoi(char*)"
+  extern "ibool isdigit(int)"
+  extern "int gettimeofday(struct timeval *, struct timezone *)"
+  extern "char* strcat(char*, char*)"
+  extern "FILE* fopen(char*, char*)"
+  extern "int fclose(FILE*)"
+  extern "int fgetc(FILE*)"
+  extern "int strlen(char*)"
+  extern "void qsort(void*, int, int, void*)"
+
+  def str_qsort(ary, comp)
+    len = ary.length
+    r,rs = qsort(ary, len, DL.sizeof('P'), comp)
+    return rs[0].to_a('S', len)
+  end
+
+  Timeval = struct [
+    "long tv_sec",
+    "long tv_usec",
+  ]
+
+  Timezone = struct [
+    "int tz_minuteswest",
+    "int tz_dsttime",
+  ]
+
+  def my_compare(ptr1, ptr2)
+    ptr1.ptr.to_s <=> ptr2.ptr.to_s
+  end
+  COMPARE = callback("int my_compare(char**, char**)")
+end
+
+
+$cb1 = DL.callback('IPP'){|ptr1, ptr2|
+  str1 = ptr1.ptr.to_s
+  str2 = ptr2.ptr.to_s
+  str1 <=> str2
+}
+
+p LIBC.atoi("10")
+
+p LIBC.isdigit(?1)
+
+p LIBC.isdigit(?a)
+
+p LIBC.strcat("a", "b")
+
+ary = ["a","c","b"]
+ptr = ary.to_ptr
+LIBC.qsort(ptr, ary.length, DL.sizeof('P'), LIBC::COMPARE)
+p ptr.to_a('S', ary.length)
+
+tv = LIBC::Timeval.malloc
+tz = LIBC::Timezone.malloc
+LIBC.gettimeofday(tv, tz)
+
+p Time.at(tv.tv_sec)
diff --git a/ruby_1_8_6/ext/dl/sample/msgbox.rb b/ruby_1_8_6/ext/dl/sample/msgbox.rb
new file mode 100644
index 0000000000..091e646091
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/sample/msgbox.rb
@@ -0,0 +1,19 @@
+# This script works on Windows.
+
+require 'dl'
+
+User32 = DL.dlopen("user32")
+Kernel32 = DL.dlopen("kernel32")
+
+MB_OK = 0
+MB_OKCANCEL = 1
+
+message_box = User32['MessageBoxA', 'ILSSI']
+r,rs = message_box.call(0, 'ok?', 'error', MB_OKCANCEL)
+
+case r
+when 1
+  print("OK!\n")
+when 2
+  print("Cancel!\n")
+end
diff --git a/ruby_1_8_6/ext/dl/sample/msgbox2.rb b/ruby_1_8_6/ext/dl/sample/msgbox2.rb
new file mode 100644
index 0000000000..e49846cc5e
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/sample/msgbox2.rb
@@ -0,0 +1,18 @@
+# This script works on Windows.
+
+require 'dl/win32'
+
+MB_OK = 0
+MB_OKCANCEL = 1
+
+message_box = Win32API.new("user32",'MessageBoxA', 'ISSI', 'I')
+r = message_box.call(0, 'ok?', 'error', MB_OKCANCEL)
+
+case r
+when 1
+  print("OK!\n")
+when 2
+  print("Cancel!\n")
+else
+  p r
+end
diff --git a/ruby_1_8_6/ext/dl/sample/stream.rb b/ruby_1_8_6/ext/dl/sample/stream.rb
new file mode 100644
index 0000000000..179836999d
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/sample/stream.rb
@@ -0,0 +1,87 @@
+# -*- ruby -*-
+# Display a file name and stream names of a file with those size.
+
+require 'dl'
+require 'dl/import'
+
+module NTFS
+  extend DL::Importable
+
+  dlload "kernel32.dll"
+
+  OPEN_EXISTING         = 3
+  GENERIC_READ          = 0x80000000
+  BACKUP_DATA           = 0x00000001
+  BACKUP_ALTERNATE_DATA = 0x00000004
+  FILE_SHARE_READ       = 0x00000001
+  FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
+
+  typealias "LPSECURITY_ATTRIBUTES", "void*"
+
+  extern "BOOL BackupRead(HANDLE, PBYTE, DWORD, PDWORD, BOOL, BOOL, PVOID)"
+  extern "BOOL BackupSeek(HANDLE, DWORD, DWORD, PDWORD, PDWORD, PVOID)"
+  extern "BOOL CloseHandle(HANDLE)"
+  extern "HANDLE CreateFile(LPCSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES,
+                            DWORD, DWORD, HANDLE)"
+
+  module_function
+
+  def streams(filename)
+    status = []
+    h = createFile(filename,GENERIC_READ,FILE_SHARE_READ,nil,
+		   OPEN_EXISTING,FILE_FLAG_BACKUP_SEMANTICS,0)
+    if( h != 0 )
+      begin
+	# allocate the memory for backup data used in backupRead().
+	data = DL.malloc(DL.sizeof("L5"))
+	data.struct!("LLLLL", :id, :attrs, :size_low, :size_high, :name_size)
+
+	# allocate memories for references to long values used in backupRead().
+	context = DL.malloc(DL.sizeof("L"))
+	lval = DL.malloc(DL.sizeof("L"))
+
+	while( backupRead(h, data, data.size, lval, false, false, context) )
+	  size = data[:size_low] + (data[:size_high] << (DL.sizeof("I") * 8))
+	  case data[:id]
+	  when BACKUP_ALTERNATE_DATA
+	    stream_name = DL.malloc(data[:name_size])
+	    backupRead(h, stream_name, stream_name.size,
+		       lval, false, false, context)
+	    name = stream_name[0, stream_name.size]
+	    name.tr!("\000","")
+	    if( name =~ /^:(.*?):.*$/ )
+	      status.push([$1,size])
+	    end
+	  when BACKUP_DATA
+	    status.push([nil,size])
+	  else
+	    raise(RuntimeError, "unknown data type #{data[:id]}.")
+	  end
+	  l1 = DL.malloc(DL.sizeof("L"))
+	  l2 = DL.malloc(DL.sizeof("L"))
+	  if( !backupSeek(h, data[:size_low], data[:size_high], l1, l2, context) )
+	    break
+	  end
+	end
+      ensure
+	backupRead(h, nil, 0, lval, true, false, context)
+	closeHandle(h)
+      end
+      return status
+    else
+      raise(RuntimeError, "can't open #{filename}.\n")
+    end
+  end
+end
+
+ARGV.each{|filename|
+  if( File.exist?(filename) )
+    NTFS.streams(filename).each{|name,size|
+      if( name )
+	print("#{filename}:#{name}\t#{size}bytes\n")
+      else
+	print("#{filename}\t#{size}bytes\n")
+      end
+    }
+  end
+}
diff --git a/ruby_1_8_6/ext/dl/sym.c b/ruby_1_8_6/ext/dl/sym.c
new file mode 100644
index 0000000000..01e0474f58
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/sym.c
@@ -0,0 +1,992 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#include <ruby.h>
+#include <errno.h>
+#include "dl.h"
+
+VALUE rb_cDLSymbol;
+
+static const char *
+char2type(int ch)
+{
+  switch (ch) {
+  case '0':
+    return "void";
+  case 'P':
+    return "void *";
+  case 'p':
+    return "void *";
+  case 'C':
+    return "char";
+  case 'c':
+    return "char *";
+  case 'H':
+    return "short";
+  case 'h':
+    return "short *";
+  case 'I':
+    return "int";
+  case 'i':
+    return "int *";
+  case 'L':
+    return "long";
+  case 'l':
+    return "long *";
+  case 'F':
+    return "double";
+  case 'f':
+    return "double *";
+  case 'D':
+    return "double";
+  case 'd':
+    return "double *";
+  case 'S':
+    return "const char *";
+  case 's':
+    return "char *";
+  case 'A':
+    return "[]";
+  case 'a':
+    return "[]"; /* ?? */
+  }
+  return NULL;
+}
+
+void
+dlsym_free(struct sym_data *data)
+{
+  if( data->name ){
+    DEBUG_CODE({
+      printf("dlsym_free(): free(data->name:%s)\n",data->name);
+    });
+    free(data->name);
+  }
+  if( data->type ){
+    DEBUG_CODE({
+      printf("dlsym_free(): free(data->type:%s)\n",data->type);
+    });
+    free(data->type);
+  }
+}
+
+VALUE
+rb_dlsym_new(void (*func)(), const char *name, const char *type)
+{
+  VALUE val;
+  struct sym_data *data;
+  const char *ptype;
+
+  rb_secure(4);
+  if( !type || !type[0] ){
+    return rb_dlptr_new((void*)func, 0, 0);
+  }
+
+  for( ptype = type; *ptype; ptype ++ ){
+    if( ! char2type(*ptype) ){
+      rb_raise(rb_eDLTypeError, "unknown type specifier '%c'", *ptype);
+    }
+  }
+
+  if( func ){
+    val = Data_Make_Struct(rb_cDLSymbol, struct sym_data, 0, dlsym_free, data);
+    data->func = func;
+    data->name = name ? strdup(name) : NULL;
+    data->type = type ? strdup(type) : NULL;
+    data->len  = type ? strlen(type) : 0;
+#if !(defined(DLSTACK))
+    if( data->len - 1 > MAX_ARG ){
+      rb_raise(rb_eDLError, "maximum number of arguments is %d.", MAX_ARG);
+    }
+#endif
+  }
+  else{
+    val = Qnil;
+  }
+
+  return val;
+}
+
+freefunc_t
+rb_dlsym2csym(VALUE val)
+{
+  struct sym_data *data;
+  freefunc_t func;
+
+  if( rb_obj_is_kind_of(val, rb_cDLSymbol) ){
+    Data_Get_Struct(val, struct sym_data, data);
+    func = data->func;
+  }
+  else if( val == Qnil ){
+    func = NULL;
+  }
+  else{
+    rb_raise(rb_eTypeError, "DL::Symbol was expected");
+  }
+
+  return func;
+}
+
+VALUE
+rb_dlsym_s_allocate(VALUE klass)
+{
+  VALUE obj;
+  struct sym_data *data;
+
+  obj = Data_Make_Struct(klass, struct sym_data, 0, dlsym_free, data);
+  data->func = 0;
+  data->name = 0;
+  data->type = 0;
+  data->len  = 0;
+
+  return obj;
+}
+
+VALUE
+rb_dlsym_initialize(int argc, VALUE argv[], VALUE self)
+{
+  VALUE addr, name, type;
+  struct sym_data *data;
+  void *saddr;
+  const char *sname, *stype;
+
+  rb_scan_args(argc, argv, "12", &addr, &name, &type);
+
+  saddr = (void*)(DLNUM2LONG(rb_Integer(addr)));
+  if (!NIL_P(name)) StringValue(name);
+  stype = NIL_P(type) ? NULL : StringValuePtr(type);
+  sname = NIL_P(name) ? NULL : RSTRING(name)->ptr;
+
+  if( saddr ){
+    Data_Get_Struct(self, struct sym_data, data);
+    if( data->name ) free(data->name);
+    if( data->type ) free(data->type);
+    data->func = saddr;
+    data->name = sname ? strdup(sname) : 0;
+    data->type = stype ? strdup(stype) : 0;
+    data->len  = stype ? strlen(stype) : 0;
+  }
+
+  return Qnil;
+}
+
+VALUE
+rb_s_dlsym_char2type(VALUE self, VALUE ch)
+{
+  const char *type;
+
+  type = char2type(StringValuePtr(ch)[0]);
+
+  if (type == NULL)
+    return Qnil;
+  else
+    return rb_str_new2(type);
+}
+
+VALUE
+rb_dlsym_name(VALUE self)
+{
+  struct sym_data *sym;
+
+  Data_Get_Struct(self, struct sym_data, sym);
+  return sym->name ? rb_tainted_str_new2(sym->name) : Qnil;
+}
+
+VALUE
+rb_dlsym_proto(VALUE self)
+{
+  struct sym_data *sym;
+
+  Data_Get_Struct(self, struct sym_data, sym);
+  return sym->type ? rb_tainted_str_new2(sym->type) : Qnil;
+}
+
+VALUE
+rb_dlsym_cproto(VALUE self)
+{
+  struct sym_data *sym;
+  const char *ptype, *typestr;
+  size_t len;
+  VALUE val;
+
+  Data_Get_Struct(self, struct sym_data, sym);
+
+  ptype = sym->type;
+
+  if( ptype ){
+    typestr = char2type(*ptype++);
+    len = strlen(typestr);
+    
+    val = rb_tainted_str_new(typestr, len);
+    if (typestr[len - 1] != '*')
+      rb_str_cat(val, " ", 1);
+
+    if( sym->name ){
+      rb_str_cat2(val, sym->name);
+    }
+    else{
+      rb_str_cat2(val, "(null)");
+    }
+    rb_str_cat(val, "(", 1);
+    
+    while (*ptype) {
+      const char *ty = char2type(*ptype++);
+      rb_str_cat2(val, ty);
+      if (*ptype)
+	rb_str_cat(val, ", ", 2);
+    }
+
+    rb_str_cat(val, ");", 2);
+  }
+  else{
+    val = rb_tainted_str_new2("void (");
+    if( sym->name ){
+      rb_str_cat2(val, sym->name);
+    }
+    else{
+      rb_str_cat2(val, "(null)");
+    }
+    rb_str_cat2(val, ")()");
+  }
+
+  return val;
+}
+
+VALUE
+rb_dlsym_inspect(VALUE self)
+{
+  VALUE proto;
+  VALUE val;
+  char  *str;
+  int str_size;
+  struct sym_data *sym;
+
+  Data_Get_Struct(self, struct sym_data, sym);
+  proto = rb_dlsym_cproto(self);
+
+  str_size = RSTRING(proto)->len + 100;
+  str = dlmalloc(str_size);
+  snprintf(str, str_size - 1,
+          "#<DL::Symbol:0x%lx func=0x%lx '%s'>",
+	   sym, sym->func, RSTRING(proto)->ptr);
+  val = rb_tainted_str_new2(str);
+  dlfree(str);
+
+  return val;
+}
+
+static int
+stack_size(struct sym_data *sym)
+{
+  int i;
+  int size;
+
+  size = 0;
+  for( i=1; i < sym->len; i++ ){
+    switch(sym->type[i]){
+    case 'C':
+    case 'H':
+    case 'I':
+    case 'L':
+      size += sizeof(long);
+      break;
+    case 'F':
+      size += sizeof(float);
+      break;
+    case 'D':
+      size += sizeof(double);
+      break;
+    case 'c':
+    case 'h':
+    case 'i':
+    case 'l':
+    case 'f':
+    case 'd':
+    case 'p':
+    case 'P':
+    case 's':
+    case 'S':
+    case 'a':
+    case 'A':
+      size += sizeof(void*);
+      break;
+    default:
+      return -(sym->type[i]);
+    }
+  }
+  return size;
+}
+
+static ID rb_dl_id_DLErrno;
+
+static VALUE
+rb_dl_get_last_error(VALUE self)
+{
+  return rb_thread_local_aref(rb_thread_current(), rb_dl_id_DLErrno);
+}
+
+static VALUE
+rb_dl_set_last_error(VALUE self, VALUE val)
+{
+  errno = NUM2INT(val);
+  rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLErrno, val);
+  return Qnil;
+}
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+static ID rb_dl_id_DLW32Error;
+
+static VALUE
+rb_dl_win32_get_last_error(VALUE self)
+{
+  return rb_thread_local_aref(rb_thread_current(), rb_dl_id_DLW32Error);
+}
+
+static VALUE
+rb_dl_win32_set_last_error(VALUE self, VALUE val)
+{
+    SetLastError(NUM2INT(val));
+    rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLW32Error, val);
+    return Qnil;
+}
+#endif
+
+#ifdef DLSTACK_GUARD
+# ifdef __MSVC_RUNTIME_CHECKS
+#  pragma runtime_checks("s", off)
+# endif
+# if _MSC_VER >= 1300
+__declspec(noinline)
+# endif
+static int
+rb_dlsym_guardcall(char type, ANY_TYPE *ret, long *stack, void *func)
+{
+  char *volatile guard = ALLOCA_N(char, 1); /* guard stack pointer */
+  switch(type){
+  case '0':
+    {
+      void (*f)(DLSTACK_PROTO) = func;
+      f(DLSTACK_ARGS);
+    }
+    break;
+  case 'P':
+  case 'p':
+    {
+      void * (*f)(DLSTACK_PROTO) = func;
+      ret->p = f(DLSTACK_ARGS);
+    }
+    break;
+  case 'C':
+  case 'c':
+    {
+      char (*f)(DLSTACK_PROTO) = func;
+      ret->c = f(DLSTACK_ARGS);
+    }
+    break;
+  case 'H':
+  case 'h':
+    {
+      short (*f)(DLSTACK_PROTO) = func;
+      ret->h = f(DLSTACK_ARGS);
+    }
+    break;
+  case 'I':
+  case 'i':
+    {
+      int (*f)(DLSTACK_PROTO) = func;
+      ret->i = f(DLSTACK_ARGS);
+    }
+    break;
+  case 'L':
+  case 'l':
+    {
+      long (*f)(DLSTACK_PROTO) = func;
+      ret->l = f(DLSTACK_ARGS);
+    }
+    break;
+  case 'F':
+  case 'f':
+    {
+      float (*f)(DLSTACK_PROTO) = func;
+      ret->f = f(DLSTACK_ARGS);
+    }
+    break;
+  case 'D':
+  case 'd':
+    {
+      double (*f)(DLSTACK_PROTO) = func;
+      ret->d = f(DLSTACK_ARGS);
+    }
+    break;
+  case 'S':
+  case 's':
+    {
+      char * (*f)(DLSTACK_PROTO) = func;
+      ret->s = f(DLSTACK_ARGS);
+    }
+    break;
+  default:
+    return 0;
+  }
+  return 1;
+}
+# ifdef __MSVC_RUNTIME_CHECKS
+#  pragma runtime_checks("s", restore)
+# endif
+#endif /* defined(DLSTACK_GUARD) */
+
+VALUE
+rb_dlsym_call(int argc, VALUE argv[], VALUE self)
+{
+  struct sym_data *sym;
+  ANY_TYPE *args;
+  ANY_TYPE *dargs;
+  ANY_TYPE ret;
+  int   *dtypes;
+  VALUE val;
+  VALUE dvals;
+  int i;
+  long ftype;
+  void *func;
+
+  rb_secure_update(self);
+  Data_Get_Struct(self, struct sym_data, sym);
+  DEBUG_CODE({
+    printf("rb_dlsym_call(): type = '%s', func = 0x%x\n", sym->type, sym->func);
+  });
+  if( (sym->len - 1) != argc ){
+    rb_raise(rb_eArgError, "%d arguments are needed", sym->len - 1);
+  }
+
+  ftype = 0;
+  dvals = Qnil;
+
+  args = ALLOC_N(ANY_TYPE, sym->len - 1);
+  dargs = ALLOC_N(ANY_TYPE, sym->len - 1);
+  dtypes = ALLOC_N(int, sym->len - 1);
+#define FREE_ARGS {xfree(args); xfree(dargs); xfree(dtypes);}
+
+  for( i = sym->len - 2; i >= 0; i-- ){
+    dtypes[i] = 0;
+
+    switch( sym->type[i+1] ){
+    case 'p':
+      dtypes[i] = 'p';
+    case 'P':
+      {
+	struct ptr_data *data;
+	VALUE pval;
+
+	if( argv[i] == Qnil ){
+	  ANY2P(args[i]) = DLVOIDP(0);
+	}
+	else{
+	  if( rb_obj_is_kind_of(argv[i], rb_cDLPtrData) ){
+	    pval = argv[i];
+	  }
+	  else{
+	    pval = rb_funcall(argv[i], rb_intern("to_ptr"), 0);
+	    if( !rb_obj_is_kind_of(pval, rb_cDLPtrData) ){
+	      rb_raise(rb_eDLTypeError, "unexpected type of argument #%d", i);
+	    }
+	  }
+	  Data_Get_Struct(pval, struct ptr_data, data);
+	  ANY2P(args[i]) = DLVOIDP(data->ptr);
+	}
+      }
+      PUSH_P(ftype);
+      break;
+    case 'a':
+      dtypes[i] = 'a';
+    case 'A':
+      if( argv[i] == Qnil ){
+	ANY2P(args[i]) = DLVOIDP(0);
+      }
+      else{
+	ANY2P(args[i]) = DLVOIDP(rb_ary2cary(0, argv[i], NULL));
+      }
+      PUSH_P(ftype);
+      break;
+    case 'C':
+      ANY2C(args[i]) = DLCHAR(NUM2CHR(argv[i]));
+      PUSH_C(ftype);
+      break;
+    case 'c':
+      ANY2C(dargs[i]) = DLCHAR(NUM2CHR(argv[i]));
+      ANY2P(args[i]) = DLVOIDP(&(ANY2C(dargs[i])));
+      dtypes[i] = 'c';
+      PUSH_P(ftype);
+      break;
+    case 'H':
+      ANY2H(args[i]) = DLSHORT(NUM2INT(argv[i]));
+      PUSH_C(ftype);
+      break;
+    case 'h':
+      ANY2H(dargs[i]) = DLSHORT(NUM2INT(argv[i]));
+      ANY2P(args[i]) = DLVOIDP(&(ANY2H(dargs[i])));
+      dtypes[i] = 'h';
+      PUSH_P(ftype);
+      break;
+    case 'I':
+      ANY2I(args[i]) = DLINT(NUM2INT(argv[i]));
+      PUSH_I(ftype);
+      break;
+    case 'i':
+      ANY2I(dargs[i]) = DLINT(NUM2INT(argv[i]));
+      ANY2P(args[i]) = DLVOIDP(&(ANY2I(dargs[i])));
+      dtypes[i] = 'i';
+      PUSH_P(ftype);
+      break;
+    case 'L':
+      ANY2L(args[i]) = DLNUM2LONG(argv[i]);
+      PUSH_L(ftype);
+      break;
+    case 'l':
+      ANY2L(dargs[i]) = DLNUM2LONG(argv[i]);
+      ANY2P(args[i]) = DLVOIDP(&(ANY2L(dargs[i])));
+      dtypes[i] = 'l';
+      PUSH_P(ftype);
+      break;
+    case 'F':
+      Check_Type(argv[i], T_FLOAT);
+      ANY2F(args[i]) = DLFLOAT(RFLOAT(argv[i])->value);
+      PUSH_F(ftype);
+      break;
+    case 'f':
+      Check_Type(argv[i], T_FLOAT);
+      ANY2F(dargs[i]) = DLFLOAT(RFLOAT(argv[i])->value);
+      ANY2P(args[i]) = DLVOIDP(&(ANY2F(dargs[i])));
+      dtypes[i] = 'f';
+      PUSH_P(ftype);
+      break;
+    case 'D':
+      Check_Type(argv[i], T_FLOAT);
+      ANY2D(args[i]) = RFLOAT(argv[i])->value;
+      PUSH_D(ftype);
+      break;
+    case 'd':
+      Check_Type(argv[i], T_FLOAT);
+      ANY2D(dargs[i]) = RFLOAT(argv[i])->value;
+      ANY2P(args[i]) = DLVOIDP(&(ANY2D(dargs[i])));
+      dtypes[i] = 'd';
+      PUSH_P(ftype);
+      break;
+    case 'S':
+      if( argv[i] == Qnil ){
+	ANY2S(args[i]) = DLSTR(0);
+      }
+      else{
+	VALUE str = argv[i];
+	SafeStringValue(str);
+	ANY2S(args[i]) = DLSTR(RSTRING(str)->ptr);
+      }
+      PUSH_P(ftype);
+      break;
+    case 's':
+      {
+	VALUE str = argv[i];
+	SafeStringValue(str);
+	ANY2S(args[i]) = DLSTR(dlmalloc(RSTRING(str)->len + 1));
+	memcpy((char*)(ANY2S(args[i])), RSTRING(str)->ptr, RSTRING(str)->len + 1);
+	dtypes[i] = 's';
+      }
+      PUSH_P(ftype);
+      break;
+    default:
+      FREE_ARGS;
+      rb_raise(rb_eDLTypeError,
+	       "unknown type '%c' of the return value.",
+	       sym->type[i+1]);
+    }
+  }
+
+  switch( sym->type[0] ){
+  case '0':
+    PUSH_0(ftype);
+    break;
+  case 'P':
+  case 'p':
+  case 'S':
+  case 's':
+  case 'A':
+  case 'a':
+    PUSH_P(ftype);
+    break;
+  case 'C':
+  case 'c':
+    PUSH_C(ftype);
+    break;
+  case 'H':
+  case 'h':
+    PUSH_H(ftype);
+    break;
+  case 'I':
+  case 'i':
+    PUSH_I(ftype);
+    break;
+  case 'L':
+  case 'l':
+    PUSH_L(ftype);
+    break;
+  case 'F':
+  case 'f':
+    PUSH_F(ftype);
+    break;
+  case 'D':
+  case 'd':
+    PUSH_D(ftype);
+    break;
+  default:
+    FREE_ARGS;
+    rb_raise(rb_eDLTypeError,
+	     "unknown type `%c' of the return value.",
+	     sym->type[0]);
+  }
+
+  func = sym->func;
+
+#if defined(DLSTACK)
+  {
+#if defined(DLSTACK_SIZE)
+  int  stk_size;
+  long stack[DLSTACK_SIZE];
+  long *sp;
+
+  sp = stack;
+  stk_size = stack_size(sym);
+  if( stk_size < 0 ){
+    FREE_ARGS;
+    rb_raise(rb_eDLTypeError, "unknown type '%c'.", -stk_size);
+  }
+  else if( stk_size > (int)(DLSTACK_SIZE) ){
+    FREE_ARGS;
+    rb_raise(rb_eArgError, "too many arguments.");
+  }
+#endif
+
+  DLSTACK_START(sym);
+
+#if defined(DLSTACK_REVERSE)
+  for( i = sym->len - 2; i >= 0; i-- )
+#else
+  for( i = 0; i <= sym->len -2; i++ )
+#endif
+  {
+    switch( sym->type[i+1] ){
+    case 'p':
+    case 'P':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'a':
+    case 'A':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'C':
+      DLSTACK_PUSH_C(ANY2C(args[i]));
+      break;
+    case 'c':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'H':
+      DLSTACK_PUSH_H(ANY2H(args[i]));
+      break;
+    case 'h':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'I':
+      DLSTACK_PUSH_I(ANY2I(args[i]));
+      break;
+    case 'i':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'L':
+      DLSTACK_PUSH_L(ANY2L(args[i]));
+      break;
+    case 'l':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'F':
+      DLSTACK_PUSH_F(ANY2F(args[i]));
+      break;
+    case 'f':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'D':
+      DLSTACK_PUSH_D(ANY2D(args[i]));
+      break;
+    case 'd':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'S':
+    case 's':
+      DLSTACK_PUSH_P(ANY2S(args[i]));
+      break;
+    }
+  }
+  DLSTACK_END(sym->type);
+
+#ifdef DLSTACK_GUARD
+  if(!rb_dlsym_guardcall(sym->type[0], &ret, stack, func)) {
+    FREE_ARGS;
+    rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
+  }
+#else /* defined(DLSTACK_GUARD) */
+  {
+    switch( sym->type[0] ){
+    case '0':
+      {
+	void (*f)(DLSTACK_PROTO) = func;
+	f(DLSTACK_ARGS);
+      }
+      break;
+    case 'P':
+    case 'p':
+      {
+	void * (*f)(DLSTACK_PROTO) = func;
+	ret.p = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'C':
+    case 'c':
+      {
+	char (*f)(DLSTACK_PROTO) = func;
+	ret.c = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'H':
+    case 'h':
+      {
+	short (*f)(DLSTACK_PROTO) = func;
+	ret.h = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'I':
+    case 'i':
+      {
+	int (*f)(DLSTACK_PROTO) = func;
+	ret.i = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'L':
+    case 'l':
+      {
+	long (*f)(DLSTACK_PROTO) = func;
+	ret.l = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'F':
+    case 'f':
+      {
+	float (*f)(DLSTACK_PROTO) = func;
+	ret.f = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'D':
+    case 'd':
+      {
+	double (*f)(DLSTACK_PROTO) = func;
+	ret.d = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'S':
+    case 's':
+      {
+	char * (*f)(DLSTACK_PROTO) = func;
+	ret.s = f(DLSTACK_ARGS);
+      }
+      break;
+    default:
+      FREE_ARGS;
+      rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
+    }
+  }
+#endif /* defubed(DLSTACK_GUARD) */
+
+  {
+    /*
+     * We should get the value of errno/GetLastError() before calling another functions.
+     */
+    int last_errno = errno;
+#ifdef _WIN32
+    DWORD win32_last_err = GetLastError();
+#endif
+
+    rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLErrno, INT2NUM(last_errno));
+#ifdef _WIN32
+    rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLW32Error, INT2NUM(win32_last_err));
+#endif
+  }
+
+  }
+#else /* defined(DLSTACK) */
+  switch(ftype){
+#include "call.func"
+  default:
+    FREE_ARGS;
+    rb_raise(rb_eDLTypeError, "unsupported function type `%s'", sym->type);
+  }
+#endif /* defined(DLSTACK) */
+
+  switch( sym->type[0] ){
+  case '0':
+    val = Qnil;
+    break;
+  case 'P':
+    val = rb_dlptr_new((void*)(ANY2P(ret)), 0, 0);
+    break;
+  case 'p':
+    val = rb_dlptr_new((void*)(ANY2P(ret)), 0, dlfree);
+    break;
+  case 'C':
+  case 'c':
+    val = CHR2FIX((char)(ANY2C(ret)));
+    break;
+  case 'H':
+  case 'h':
+    val = INT2NUM((short)(ANY2H(ret)));
+    break;
+  case 'I':
+  case 'i':
+    val = INT2NUM((int)(ANY2I(ret)));
+    break;
+  case 'L':
+  case 'l':
+    val = DLLONG2NUM((long)(ANY2L(ret)));
+    break;
+  case 'F':
+  case 'f':
+    val = rb_float_new((double)(ANY2F(ret)));
+    break;
+  case 'D':
+  case 'd':
+    val = rb_float_new((double)(ANY2D(ret)));
+    break;
+  case 'S':
+    if( ANY2S(ret) ){
+      val = rb_tainted_str_new2((char*)(ANY2S(ret)));
+    }
+    else{
+      val = Qnil;
+    }
+    break;
+  case 's':
+    if( ANY2S(ret) ){
+      val = rb_tainted_str_new2((char*)(ANY2S(ret)));
+      DEBUG_CODE({
+	printf("dlfree(%s)\n",(char*)(ANY2S(ret)));
+      });
+      dlfree((void*)(ANY2S(ret)));
+    }
+    else{
+      val = Qnil;
+    }
+    break;
+  default:
+    FREE_ARGS;
+    rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
+  }
+
+  dvals = rb_ary_new();
+  for( i = 0; i <= sym->len - 2; i++ ){
+    if( dtypes[i] ){
+      switch( dtypes[i] ){
+      case 'c':
+	rb_ary_push(dvals, CHR2FIX(*((char*)(ANY2P(args[i])))));
+	break;
+      case 'h':
+	rb_ary_push(dvals, INT2NUM(*((short*)(ANY2P(args[i])))));
+	break;
+      case 'i':
+	rb_ary_push(dvals, INT2NUM(*((int*)(ANY2P(args[i])))));
+	break;
+      case 'l':
+        rb_ary_push(dvals, DLLONG2NUM(*((long*)(ANY2P(args[i])))));
+        break;
+      case 'f':
+	rb_ary_push(dvals, rb_float_new(*((float*)(ANY2P(args[i])))));
+	break;
+      case 'd':
+	rb_ary_push(dvals, rb_float_new(*((double*)(ANY2P(args[i])))));
+	break;
+      case 'p':
+	rb_ary_push(dvals, rb_dlptr_new((void*)(ANY2P(args[i])), 0, 0));
+	break;
+      case 'a':
+	rb_ary_push(dvals, rb_dlptr_new((void*)ANY2P(args[i]), 0, 0));
+	break;
+      case 's':
+	rb_ary_push(dvals, rb_tainted_str_new2((char*)ANY2S(args[i])));
+	DEBUG_CODE({
+	  printf("dlfree(%s)\n",(char*)ANY2S(args[i]));
+	});
+	dlfree((void*)ANY2S(args[i]));
+	break;
+      default:
+	{
+	  char c = dtypes[i];
+	  FREE_ARGS;
+	  rb_raise(rb_eRuntimeError, "unknown argument type '%c'", i, c);
+	}
+      }
+    }
+    else{
+      switch( sym->type[i+1] ){
+      case 'A':
+	dlfree((void*)ANY2P(args[i]));
+	break;
+      }
+      rb_ary_push(dvals, argv[i]);
+    }
+  }
+
+  FREE_ARGS;
+#undef FREE_ARGS
+  return rb_assoc_new(val,dvals);
+}
+
+VALUE
+rb_dlsym_to_i(VALUE self)
+{
+  struct sym_data *sym;
+
+  Data_Get_Struct(self, struct sym_data, sym);
+  return DLLONG2NUM(sym);
+}
+
+VALUE
+rb_dlsym_to_ptr(VALUE self)
+{
+  struct sym_data *sym;
+
+  Data_Get_Struct(self, struct sym_data, sym);
+  return rb_dlptr_new(sym->func, sizeof(freefunc_t), 0);
+}
+
+void
+Init_dlsym()
+{
+  rb_cDLSymbol = rb_define_class_under(rb_mDL, "Symbol", rb_cObject);
+  rb_define_alloc_func(rb_cDLSymbol, rb_dlsym_s_allocate);
+  rb_define_singleton_method(rb_cDLSymbol, "char2type", rb_s_dlsym_char2type, 1);
+  rb_define_method(rb_cDLSymbol, "initialize", rb_dlsym_initialize, -1);
+  rb_define_method(rb_cDLSymbol, "call", rb_dlsym_call, -1);
+  rb_define_method(rb_cDLSymbol, "[]",   rb_dlsym_call, -1);
+  rb_define_method(rb_cDLSymbol, "name", rb_dlsym_name, 0);
+  rb_define_method(rb_cDLSymbol, "proto", rb_dlsym_proto, 0);
+  rb_define_method(rb_cDLSymbol, "cproto", rb_dlsym_cproto, 0);
+  rb_define_method(rb_cDLSymbol, "inspect", rb_dlsym_inspect, 0);
+  rb_define_method(rb_cDLSymbol, "to_s", rb_dlsym_cproto, 0);
+  rb_define_method(rb_cDLSymbol, "to_ptr", rb_dlsym_to_ptr, 0);
+  rb_define_method(rb_cDLSymbol, "to_i", rb_dlsym_to_i, 0);
+
+  rb_dl_id_DLErrno = rb_intern("DLErrno");
+  rb_define_singleton_method(rb_mDL, "last_error", rb_dl_get_last_error, 0);  
+  rb_define_singleton_method(rb_mDL, "last_error=", rb_dl_set_last_error, 1);
+#ifdef _WIN32
+  rb_dl_id_DLW32Error = rb_intern("DLW32Error");
+  rb_define_singleton_method(rb_mDL, "win32_last_error", rb_dl_win32_get_last_error, 0);
+  rb_define_singleton_method(rb_mDL, "win32_last_error=", rb_dl_win32_set_last_error, 1);
+#endif
+}
diff --git a/ruby_1_8_6/ext/dl/test/libtest.def b/ruby_1_8_6/ext/dl/test/libtest.def
new file mode 100644
index 0000000000..8ecefc917b
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/test/libtest.def
@@ -0,0 +1,28 @@
+EXPORTS
+test_alloc_test_struct
+test_append
+test_arylen
+test_c2i
+test_call_func1
+test_callback1
+test_close
+test_d2f
+test_f2d
+test_fill_test_struct
+test_fill_test_union
+test_gets
+test_i2c
+test_init
+test_isucc
+test_lcc
+test_lsucc
+test_open
+test_strcat
+test_strlen
+test_succ
+test_data_init
+test_data_add
+test_data_aref
+test_set_long_value
+test_get_long_value
+internal_long_value
diff --git a/ruby_1_8_6/ext/dl/test/test.c b/ruby_1_8_6/ext/dl/test/test.c
new file mode 100644
index 0000000000..7321379390
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/test/test.c
@@ -0,0 +1,247 @@
+#include <stdio.h>
+#include <string.h>
+
+static char internal_string[] = "internal_string";
+long internal_long_value = 100;
+
+struct test_struct {
+  char c;
+  long l;
+};
+
+union test_union {
+  char c;
+  int  i;
+  long l;
+  void *p;
+};
+
+struct test_data {
+  char name[1024];
+  struct test_data *next;
+};
+
+long
+test_get_long_value()
+{
+  return internal_long_value;
+};
+
+void
+test_set_long_value(long l)
+{
+  internal_long_value = l;
+};
+
+void
+test_fill_test_struct(struct test_struct *ptr, char c, long l)
+{
+  ptr->c = c;
+  ptr->l = l;
+};
+
+void
+test_fill_test_union(union test_union *ptr, long l)
+{
+  ptr->l = l;
+};
+
+struct test_struct *
+test_alloc_test_struct(char c, long l)
+{
+  struct test_struct *data;
+
+  data = (struct test_struct *)malloc(sizeof(struct test_struct));
+  data->c = c;
+  data->l = l;
+
+  return data;
+};
+
+int
+test_c2i(char c)
+{
+  return (int)c;
+};
+
+char
+test_i2c(int i)
+{
+  return (char)i;
+};
+
+long
+test_lcc(char c1, char c2)
+{
+  return (long)(c1 + c2);
+};
+
+double
+test_f2d(float f)
+{
+  double d;
+  d = f;
+  return d;
+};
+
+float
+test_d2f(double d)
+{
+  float f;
+  f = d;
+  return f;
+};
+
+int
+test_strlen(const char *str)
+{
+  return strlen(str);
+};
+
+int
+test_isucc(int i)
+{
+  return (i+1);
+};
+
+long
+test_lsucc(long l)
+{
+  return (l+1);
+};
+
+void
+test_succ(long *l)
+{
+  (*l)++;
+};
+
+char *
+test_strcat(char *str1, const char *str2)
+{
+  return strcat(str1, str2);
+};
+
+int
+test_arylen(char *ary[])
+{
+  int i;
+  for( i=0; ary[i]; i++ ){};
+  return i;
+};
+
+void
+test_append(char *ary[], int len, char *astr)
+{
+  int i;
+  int size1,size2;
+  char *str;
+
+  size2 = strlen(astr);
+
+  for( i=0; i <= len - 1; i++ ){
+    size1 = strlen(ary[i]);
+    str = (char*)malloc(size1 + size2 + 1);
+    strcpy(str, ary[i]);
+    strcat(str, astr);
+    ary[i] = str;
+  };
+};
+
+int
+test_init(int *argc, char **argv[])
+{
+  int i;
+  char s[256];
+
+  for( i=0; i < (*argc); i++ ){
+    sprintf(s, "arg%d", i);
+    if( strcmp((*argv)[i], s) != 0 ){
+      return 1;
+    }
+  }
+  return 0;
+}
+
+FILE *
+test_open(const char *filename, const char *mode)
+{
+  FILE *file;
+  file = fopen(filename,mode);
+  return file;
+};
+
+void
+test_close(FILE *file)
+{
+  fclose(file);
+};
+
+char *
+test_gets(char *s, int size, FILE *f)
+{
+  return fgets(s,size,f);
+};
+
+typedef int callback1_t(int, char *);
+#define CALLBACK_MSG "callback message"
+
+int
+test_callback1(int err, const char *msg)
+{
+  if( strcmp(msg, CALLBACK_MSG) == 0 ){
+    return 1;
+  }
+  else{
+    return 0;
+  }
+}
+
+int
+test_call_func1(callback1_t *func)
+{
+  if( func ){
+    return (*func)(0, CALLBACK_MSG);
+  }
+  else{
+    return 0;
+  }
+}
+
+struct test_data *
+test_data_init()
+{
+  struct test_data *data;
+
+  data = (struct test_data *)malloc(sizeof(struct test_data));
+  data->next = NULL;
+  memset(data->name, 0, 1024);
+
+  return data;
+};
+
+void
+test_data_add(struct test_data *list, const char *name)
+{
+  struct test_data *data;
+
+  data = (struct test_data *)malloc(sizeof(struct test_data));
+  memset(data->name, 0, 1024);
+  strncpy(data->name, name, 1024);
+  data->next = list->next;
+  list->next = data;
+};
+
+struct test_data *
+test_data_aref(struct test_data *list, int i)
+{
+  struct test_data *data;
+  int j;
+
+  for( data = list->next, j=0; data; data = data->next, j++ ){
+    if( i == j ){
+      return data;
+    };
+  };
+  return NULL;
+};
diff --git a/ruby_1_8_6/ext/dl/test/test.rb b/ruby_1_8_6/ext/dl/test/test.rb
new file mode 100644
index 0000000000..bf8dfc18e3
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/test/test.rb
@@ -0,0 +1,306 @@
+# -*- ruby -*-
+
+require 'dl'
+require 'dl/import'
+
+$FAIL = 0
+$TOTAL = 0
+
+def assert(label, ty, *conds)
+  $TOTAL += 1
+  cond = !conds.include?(false)
+  if( cond )
+    printf("succeed in `#{label}'\n")
+  else
+    $FAIL += 1
+    case ty
+    when :may
+      printf("fail in `#{label}' ... expected\n")
+    when :must
+      printf("fail in `#{label}' ... unexpected\n")
+    when :raise
+      raise(RuntimeError, "fail in `#{label}'")
+    end
+  end
+end
+
+def debug(*xs)
+  if( $DEBUG )
+    xs.each{|x|
+      p x
+    }
+  end
+end
+
+print("DLSTACK   = #{DL::DLSTACK}\n")
+print("MAX_ARG   = #{DL::MAX_ARG}\n")
+print("\n")
+print("DL::FREE = #{DL::FREE.inspect}\n")
+print("\n")
+
+$LIB = nil
+if( !$LIB && File.exist?("libtest.so") )
+  $LIB = "./libtest.so"
+end
+if( !$LIB && File.exist?("test/libtest.so") )
+  $LIB = "./test/libtest.so"
+end
+
+module LIBTest
+  extend DL::Importable
+
+  dlload($LIB)
+  extern "int test_c2i(char)"
+  extern "char test_i2c(int)"
+  extern "long test_lcc(char, char)"
+  extern "double test_f2d(float)"
+  extern "float test_d2f(double)"
+  extern "int test_strlen(char*)"
+  extern "int test_isucc(int)"
+  extern "long test_lsucc(long)"
+  extern "void test_succ(long *)"
+  extern "int test_arylen(int [])"
+  extern "void test_append(char*[], int, char *)"
+end
+
+DL.dlopen($LIB){|h|
+  c2i = h["test_c2i","IC"]
+  debug c2i
+  r,rs = c2i[?a]
+  debug r,rs
+  assert("c2i", :may, r == ?a)
+  assert("extern c2i", :must, r == LIBTest.test_c2i(?a))
+
+  i2c = h["test_i2c","CI"]
+  debug i2c
+  r,rs = i2c[?a]
+  debug r,rs
+  assert("i2c", :may, r == ?a)
+  assert("exern i2c", :must, r == LIBTest.test_i2c(?a))
+
+  lcc = h["test_lcc","LCC"]
+  debug lcc
+  r,rs = lcc[1,2]
+  assert("lcc", :may, r == 3)
+  assert("extern lcc", :must, r == LIBTest.test_lcc(1,2))
+
+  f2d = h["test_f2d","DF"]
+  debug f2d
+  r,rs = f2d[20.001]
+  debug r,rs
+  assert("f2d", :may, r.to_i == 20)
+  assert("extern f2d", :must, r = LIBTest.test_f2d(20.001))
+
+  d2f = h["test_d2f","FD"]
+  debug d2f
+  r,rs = d2f[20.001]
+  debug r,rs
+  assert("d2f", :may, r.to_i == 20)
+  assert("extern d2f", :must, r == LIBTest.test_d2f(20.001))
+
+  strlen = h["test_strlen","IS"]
+  debug strlen
+  r,rs = strlen["0123456789"]
+  debug r,rs
+  assert("strlen", :must, r == 10)
+  assert("extern strlen", :must, r == LIBTest.test_strlen("0123456789"))
+
+  isucc = h["test_isucc","II"]
+  debug isucc
+  r,rs = isucc[2]
+  debug r,rs
+  assert("isucc", :must, r == 3)
+  assert("extern isucc", :must, r == LIBTest.test_isucc(2))
+
+  lsucc = h["test_lsucc","LL"]
+  debug lsucc
+  r,rs = lsucc[10000000]
+  debug r,rs
+  assert("lsucc", :must, r == 10000001)
+  assert("extern lsucc", :must, r == LIBTest.test_lsucc(10000000))
+
+  succ = h["test_succ","0l"]
+  debug succ
+  r,rs = succ[0]
+  debug r,rs
+  assert("succ", :must, rs[0] == 1)
+  l = DL.malloc(DL.sizeof("L"))
+  l.struct!("L",:lval)
+  LIBTest.test_succ(l)
+  assert("extern succ", :must, rs[0] == l[:lval])
+
+  arylen = h["test_arylen","IA"]
+  debug arylen
+  r,rs = arylen[["a","b","c","d",nil]]
+  debug r,rs
+  assert("arylen", :must, r == 4)
+
+  arylen = h["test_arylen","IP"]
+  debug arylen
+  r,rs = arylen[["a","b","c","d",nil]]
+  debug r,rs
+  assert("arylen", :must, r == 4)
+  assert("extern arylen", :must, r == LIBTest.test_arylen(["a","b","c","d",nil]))
+
+  append = h["test_append","0aIS"]
+  debug append
+  r,rs = append[["a","b","c"],3,"x"]
+  debug r,rs
+  assert("append", :must, rs[0].to_a('S',3) == ["ax","bx","cx"])
+
+  LIBTest.test_append(["a","b","c"],3,"x")
+  assert("extern append", :must, rs[0].to_a('S',3) == LIBTest._args_[0].to_a('S',3))
+
+  strcat = h["test_strcat","SsS"]
+  debug strcat
+  r,rs = strcat["abc\0","x"]
+  debug r,rs
+  assert("strcat", :must, rs[0].to_s == "abcx")
+
+  init = h["test_init","IiP"]
+  debug init
+  argc = 3
+  argv = ["arg0","arg1","arg2"].to_ptr
+  r,rs = init[argc, argv.ref]
+  assert("init", :must, r == 0)
+}
+
+
+h = DL.dlopen($LIB)
+
+sym_open = h["test_open", "PSS"]
+sym_gets = h["test_gets", "SsIP"]
+sym_close = h["test_close", "0P"]
+debug sym_open,sym_gets,sym_close
+
+line = "Hello world!\n"
+File.open("tmp.txt", "w"){|f|
+  f.print(line)
+}
+
+fp,rs = sym_open["tmp.txt", "r"]
+if( fp )
+  fp.free = sym_close
+  r,rs = sym_gets[" " * 256, 256, fp]
+  debug r,rs
+  assert("open,gets", :must, rs[0] == line)
+  ObjectSpace.define_finalizer(fp) {File.unlink("tmp.txt")}
+  fp = nil
+else
+  assert("open,gets", :must, line == nil)
+  File.unlink("tmp.txt")
+end
+
+
+callback1 = h["test_callback1"]
+debug callback1
+r,rs = h["test_call_func1", "IP"][callback1]
+debug r,rs
+assert("callback1", :must, r == 1)
+
+
+callback2 = DL.callback("LLP"){|num,ptr|
+  msg = ptr.to_s
+  if( msg == "callback message" )
+    2
+  else
+    0
+  end
+}
+debug callback2
+r,rs = h["test_call_func1", "IP"][callback2]
+debug r,rs
+assert("callback2", :must, r == 2)
+DL.remove_callback(callback2)
+
+ptr = DL.malloc(DL.sizeof('CL'))
+ptr.struct!("CL", :c, :l)
+ptr["c"] = 0
+ptr["l"] = 0
+r,rs = h["test_fill_test_struct","0PIL"][ptr,100,1000]
+debug r,rs
+assert("fill_test_struct", :must, ptr["c"] == 100, ptr["l"] == 1000)
+assert("fill_test_struct", :must, ptr[:c] == 100, ptr[:l] == 1000) unless (Fixnum === :-)
+
+
+r,rs = h["test_alloc_test_struct", "PIL"][100,200]
+r.free = DL::FREE
+r.struct!("CL", :c, :l)
+assert("alloc_test_struct", :must, r["c"] == 100, r["l"] == 200)
+assert("alloc_test_struct", :must, r[:c] == 100, r[:l] == 200) unless (Fixnum === :-)
+
+ptr = h["test_strlen"]
+sym1 = DL::Symbol.new(ptr,"foo","0")
+sym2 = h["test_strlen","LS"]
+assert("Symbol.new", :must, ptr == sym1.to_ptr, sym1.to_ptr == sym2.to_ptr)
+
+set_val = h["test_set_long_value","0"]
+get_val = h["test_get_long_value","L"]
+lval = get_val[][0]
+ptr = h["internal_long_value"]
+ptr.struct!("L", :l)
+assert("get value", :must, ptr["l"] == lval)
+assert("get value", :must, ptr[:l] == lval) unless (Fixnum === :-)
+ptr["l"] = 200
+lval = get_val[][0]
+assert("set value", :must, ptr["l"] == lval)
+assert("set value", :must, ptr[:l] == lval) unless (Fixnum === :-)
+
+
+data_init = h["test_data_init", "P"]
+data_add  = h["test_data_add", "0PS"]
+data_aref = h["test_data_aref", "PPI"]
+r,rs = data_init[]
+ptr = r
+data_add[ptr, "name1"]
+data_add[ptr, "name2"]
+data_add[ptr, "name3"]
+
+r,rs = data_aref[ptr, 1]
+ptr = r
+ptr.struct!("C1024P", :name, :next)
+assert("data_aref", :must,
+       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name2")
+assert("data_aref", :must,
+       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name2") unless (Fixnum === :-)
+
+ptr = ptr["next"]
+ptr.struct!("C1024P", :name, :next)
+assert("data_aref", :must,
+       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name1")
+assert("data_aref", :must,
+       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name1") unless (Fixnum === :-)
+
+GC.start
+
+ptr = DL::malloc(32)
+ptr.struct!("CHIL", "c", "h", "i", "l")
+ptr["c"] = 1
+ptr["h"] = 2
+ptr["i"] = 3
+ptr["l"] = 4
+assert("struct!", :must,
+       ptr["c"] == 1 &&
+       ptr["h"] == 2 &&
+       ptr["i"] == 3 &&
+       ptr["l"] == 4)
+
+ptr = DL::malloc(DL::sizeof("IP"))
+ptr.struct!("IP", "n", "ptr")
+ptr["n"] = 10
+ptr["ptr"] = nil
+assert("struct!", :must, ptr["n"] == 10 && ptr["ptr"] == nil)
+
+ptr = DL::malloc(16)
+ptr.struct!("CICI", "c1", "i1", "c2", "i2")
+ptr["c1"] = 0xf1
+ptr["c2"] = 0xf2
+c1 = [ptr["c1"]].pack("c").unpack("C")[0]
+c2 = [ptr["c2"]].pack("c").unpack("C")[0]
+assert("struct!", :must,
+  c1 == 0xf1 &&
+  c2 == 0xf2)
+
+
+GC.start
+printf("fail/total = #{$FAIL}/#{$TOTAL}\n")
diff --git a/ruby_1_8_6/ext/dl/type.rb b/ruby_1_8_6/ext/dl/type.rb
new file mode 100644
index 0000000000..804420c395
--- /dev/null
+++ b/ruby_1_8_6/ext/dl/type.rb
@@ -0,0 +1,115 @@
+# example:
+#  DLTYPE[INT][:rb2c]["arg0"] => "NUM2INT(arg0)"
+#  DLTYPE[DOUBLE][:c2rb]["r"] => "rb_float_new(r)"
+
+DLTYPE = {
+  VOID  = 0x00 => {
+    :name => 'VOID',
+    :rb2c => nil,
+    :c2rb => nil,
+    :ctype => "void",
+    :stmem => "v",
+    :sym => true,
+    :cb => true,
+  },
+  CHAR  = 0x01 => {
+    :name => 'CHAR',
+    :rb2c => proc{|x| "NUM2CHR(#{x})"},
+    :c2rb => proc{|x| "CHR2FIX(#{x})"},
+    :ctype => "char",
+    :stmem => "c",
+    :sym => false,
+    :cb => false,
+  },
+  SHORT = 0x02 => {
+    :name => 'SHORT',
+    :rb2c => proc{|x| "FIX2INT(#{x})"},
+    :c2rb => proc{|x| "INT2FIX(#{x})"},
+    :ctype => "short",
+    :stmem => "h",
+    :sym => false,
+    :cb => false,
+  },
+  INT   = 0x03 => {
+    :name => 'INT',
+    :rb2c => proc{|x| "NUM2INT(#{x})"},
+    :c2rb => proc{|x| "INT2NUM(#{x})"},
+    :ctype => "int",
+    :stmem => "i",
+    :sym => true,
+    :cb => false,
+  },
+  LONG  = 0x04 => {
+    :name => 'LONG',
+    :rb2c => proc{|x| "NUM2INT(#{x})"},
+    :c2rb => proc{|x| "INT2NUM(#{x})"},
+    :ctype => "long",
+    :stmem => "l",
+    :sym => true,
+    :cb => true,
+  },
+  FLOAT = 0x05 => {
+    :name => 'FLOAT',
+    :rb2c => proc{|x| "(float)(RFLOAT(#{x})->value)"},
+    :c2rb => proc{|x| "rb_float_new((double)#{x})"},
+    :ctype => "float",
+    :stmem => "f",
+    :sym => false,
+    :cb => false,
+  },
+  DOUBLE = 0x06 => {
+    :name => 'DOUBLE',
+    :rb2c => proc{|x| "RFLOAT(#{x})->value"},
+    :c2rb => proc{|x| "rb_float_new(#{x})"},
+    :ctype => "double",
+    :stmem => "d",
+    :sym => true,
+    :cb => true,
+  },
+  VOIDP = 0x07 => {
+    :name => 'VOIDP',
+    :rb2c => proc{|x| "rb_dlptr2cptr(#{x})"},
+    :c2rb => proc{|x| "rb_dlptr_new(#{x},sizeof(void*),0)"},
+    :ctype => "void *",
+    :stmem => "p",
+    :sym => true,
+    :cb => true,
+  },
+}
+
+def tpush(t, x)
+  (t << 3)|x
+end
+
+def tget(t, i)
+  (t & (0x07 << (i * 3))) >> (i * 3)
+end
+
+def types2num(types)
+  res = 0x00
+  r = types.reverse
+  r.each{|t|
+    res = tpush(res,t)
+  }
+  res
+end
+
+def num2types(num)
+  ts = []
+  i  = 0
+  t = tget(num,i)
+  while( (t != VOID && i > 0) || (i == 0) )
+    ts.push(DLTYPE[t][:ctype])
+    i += 1
+    t = tget(num,i)
+  end
+  ts
+end
+
+def types2ctypes(types)
+  res = []
+  types.each{|t|
+    res.push(DLTYPE[t][:ctype])
+  }
+  res
+end
diff --git a/ruby_1_8_6/ext/enumerator/.cvsignore b/ruby_1_8_6/ext/enumerator/.cvsignore
new file mode 100644
index 0000000000..fc802ff1c2
--- /dev/null
+++ b/ruby_1_8_6/ext/enumerator/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+mkmf.log
diff --git a/ruby_1_8_6/ext/enumerator/enumerator.c b/ruby_1_8_6/ext/enumerator/enumerator.c
new file mode 100644
index 0000000000..1c6e1d1ace
--- /dev/null
+++ b/ruby_1_8_6/ext/enumerator/enumerator.c
@@ -0,0 +1,298 @@
+/************************************************
+
+  enumerator.c - provides Enumerator class
+
+  $Author$
+
+  Copyright (C) 2001-2003 Akinori MUSHA
+
+  $Idaemons: /home/cvs/rb/enumerator/enumerator.c,v 1.1.1.1 2001/07/15 10:12:48 knu Exp $
+  $RoughId: enumerator.c,v 1.6 2003/07/27 11:03:24 nobu Exp $
+  $Id$
+
+************************************************/
+
+#include "ruby.h"
+#include "node.h"
+
+/*
+ * Document-class: Enumerable::Enumerator
+ *
+ * A class which provides a method `each' to be used as an Enumerable
+ * object.
+ */
+static VALUE rb_cEnumerator;
+static ID sym_each, sym_each_with_index, sym_each_slice, sym_each_cons;
+static ID id_new, id_enum_obj, id_enum_method, id_enum_args;
+
+/*
+ *  call-seq:
+ *    obj.to_enum(method = :each, *args)
+ *    obj.enum_for(method = :each, *args)
+ *
+ *  Returns Enumerable::Enumerator.new(self, method, *args).
+ *
+ *  e.g.:
+ *     str = "xyz"
+ *
+ *     enum = str.enum_for(:each_byte)
+ *     a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
+ *
+ *     # protects an array from being modified
+ *     a = [1, 2, 3]
+ *     some_method(a.to_enum)
+ *
+ */
+static VALUE
+obj_to_enum(obj, enum_args)
+    VALUE obj, enum_args;
+{
+    rb_ary_unshift(enum_args, obj);
+
+    return rb_apply(rb_cEnumerator, id_new, enum_args);
+}
+
+/*
+ *  call-seq:
+ *    enum_with_index
+ *
+ *  Returns Enumerable::Enumerator.new(self, :each_with_index).
+ *
+ */
+static VALUE
+enumerator_enum_with_index(obj)
+    VALUE obj;
+{
+    return rb_funcall(rb_cEnumerator, id_new, 2, obj, sym_each_with_index);
+}
+
+static VALUE
+each_slice_i(val, memo)
+    VALUE val;
+    NODE *memo;
+{
+    VALUE ary = memo->u1.value;
+    long size = memo->u3.cnt;
+
+    rb_ary_push(ary, val);
+
+    if (RARRAY(ary)->len == size) {
+	rb_yield(ary);
+	memo->u1.value = rb_ary_new2(size);
+    }
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *    e.each_slice(n) {...}
+ *
+ *  Iterates the given block for each slice of <n> elements.
+ *
+ *  e.g.:
+ *      (1..10).each_slice(3) {|a| p a}
+ *      # outputs below
+ *      [1, 2, 3]
+ *      [4, 5, 6]
+ *      [7, 8, 9]
+ *      [10]
+ *
+ */
+static VALUE
+enum_each_slice(obj, n)
+    VALUE obj, n;
+{
+    long size = NUM2LONG(n);
+    NODE *memo;
+    VALUE ary;
+
+    if (size <= 0) rb_raise(rb_eArgError, "invalid slice size");
+
+    memo = rb_node_newnode(NODE_MEMO, rb_ary_new2(size), 0, size);
+
+    rb_iterate(rb_each, obj, each_slice_i, (VALUE)memo);
+
+    ary = memo->u1.value;
+    if (RARRAY(ary)->len > 0) rb_yield(ary);
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *    e.enum_slice(n)
+ *
+ *  Returns Enumerable::Enumerator.new(self, :each_slice, n).
+ *
+ */
+static VALUE
+enumerator_enum_slice(obj, n)
+    VALUE obj, n;
+{
+    return rb_funcall(rb_cEnumerator, id_new, 3, obj, sym_each_slice, n);
+}
+
+static VALUE
+each_cons_i(val, memo)
+    VALUE val;
+    NODE *memo;
+{
+    VALUE ary = memo->u1.value;
+    long size = memo->u3.cnt;
+
+    if (RARRAY(ary)->len == size) {
+	rb_ary_shift(ary);
+    }
+    rb_ary_push(ary, val);
+    if (RARRAY(ary)->len == size) {
+	rb_yield(rb_ary_dup(ary));
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *    each_cons(n) {...}
+ *
+ *  Iterates the given block for each array of consecutive <n>
+ *  elements.
+ *
+ *  e.g.:
+ *      (1..10).each_cons(3) {|a| p a}
+ *      # outputs below
+ *      [1, 2, 3]
+ *      [2, 3, 4]
+ *      [3, 4, 5]
+ *      [4, 5, 6]
+ *      [5, 6, 7]
+ *      [6, 7, 8]
+ *      [7, 8, 9]
+ *      [8, 9, 10]
+ *
+ */
+static VALUE
+enum_each_cons(obj, n)
+    VALUE obj, n;
+{
+    long size = NUM2LONG(n);
+    NODE *memo;
+
+    if (size <= 0) rb_raise(rb_eArgError, "invalid size");
+    memo = rb_node_newnode(NODE_MEMO, rb_ary_new2(size), 0, size);
+
+    rb_iterate(rb_each, obj, each_cons_i, (VALUE)memo);
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *    e.enum_cons(n)
+ *
+ *  Returns Enumerable::Enumerator.new(self, :each_cons, n).
+ *
+ */
+static VALUE
+enumerator_enum_cons(obj, n)
+    VALUE obj, n;
+{
+    return rb_funcall(rb_cEnumerator, id_new, 3, obj, sym_each_cons, n);
+}
+
+/*
+ *  call-seq:
+ *    Enumerable::Enumerator.new(obj, method = :each, *args)
+ *
+ *  Creates a new Enumerable::Enumerator object, which is to be
+ *  used as an Enumerable object using the given object's given
+ *  method with the given arguments.
+ *
+ *  e.g.:
+ *      str = "xyz"
+ *
+ *      enum = Enumerable::Enumerator.new(str, :each_byte)
+ *      a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
+ *
+ */
+static VALUE
+enumerator_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE enum_obj, enum_method, enum_args;
+
+    rb_scan_args(argc, argv, "11*", &enum_obj, &enum_method, &enum_args);
+
+    if (enum_method == Qnil)
+	enum_method = sym_each;
+
+    rb_ivar_set(obj, id_enum_obj, enum_obj);
+    rb_ivar_set(obj, id_enum_method, enum_method);
+    rb_ivar_set(obj, id_enum_args, enum_args);
+
+    return Qnil;
+}
+
+static VALUE
+enumerator_iter(memo)
+    NODE *memo;
+{
+    return rb_apply(memo->u1.value, memo->u2.id, memo->u3.value);
+}
+
+/*
+ *  call-seq:
+ *    enum.each {...}
+ *
+ *  Iterates the given block using the object and the method specified
+ *  in the first place.
+ *
+ */
+static VALUE
+enumerator_each(obj)
+    VALUE obj;
+{
+    VALUE val;
+
+    obj = (VALUE)rb_node_newnode(NODE_MEMO,
+				 rb_ivar_get(obj, id_enum_obj),
+				 rb_to_id(rb_ivar_get(obj, id_enum_method)),
+				 rb_ivar_get(obj, id_enum_args));
+    val = rb_iterate((VALUE (*)_((VALUE)))enumerator_iter, obj, rb_yield, 0);
+    return val;
+}
+
+void
+Init_enumerator()
+{
+    VALUE rb_mEnumerable;
+
+    rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -2);
+    rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -2);
+
+    rb_mEnumerable = rb_path2class("Enumerable");
+
+    rb_define_method(rb_mEnumerable, "enum_with_index", enumerator_enum_with_index, 0);
+    rb_define_method(rb_mEnumerable, "each_slice", enum_each_slice, 1);
+    rb_define_method(rb_mEnumerable, "enum_slice", enumerator_enum_slice, 1);
+    rb_define_method(rb_mEnumerable, "each_cons", enum_each_cons, 1);
+    rb_define_method(rb_mEnumerable, "enum_cons", enumerator_enum_cons, 1);
+
+    rb_cEnumerator = rb_define_class_under(rb_mEnumerable, "Enumerator", rb_cObject);
+    rb_include_module(rb_cEnumerator, rb_mEnumerable);
+
+    rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1);
+    rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
+
+    sym_each		= ID2SYM(rb_intern("each"));
+    sym_each_with_index	= ID2SYM(rb_intern("each_with_index"));
+    sym_each_slice	= ID2SYM(rb_intern("each_slice"));
+    sym_each_cons	= ID2SYM(rb_intern("each_cons"));
+
+    id_new		= rb_intern("new");
+    id_enum_obj		= rb_intern("enum_obj");
+    id_enum_method	= rb_intern("enum_method");
+    id_enum_args	= rb_intern("enum_args");
+}
diff --git a/ruby_1_8_6/ext/enumerator/enumerator.txt b/ruby_1_8_6/ext/enumerator/enumerator.txt
new file mode 100644
index 0000000000..64c7d50226
--- /dev/null
+++ b/ruby_1_8_6/ext/enumerator/enumerator.txt
@@ -0,0 +1,102 @@
+.\" enumerator.txt -  -*- Indented-Text -*-
+$Idaemons: /home/cvs/rb/enumerator/enumerator.txt,v 1.2 2001/07/15 10:19:24 knu Exp $
+$RoughId: enumerator.txt,v 1.5 2003/02/20 12:24:51 knu Exp $
+$Id$
+
+** Enumerable::Enumerator(Class)
+
+A class which provides a method `each' to be used as an Enumerable
+object.
+
+Superclass: Object
+
+Mix-ins: Enumerable
+
+require 'enumerator'
+
+Class Methods:
+
+    new(obj, method = :each, *args)
+
+	Creates a new Enumerable::Enumerator object, which is to be
+	used as an Enumerable object using the given object's given
+	method with the given arguments.
+
+	e.g.:
+	    str = "xyz"
+
+	    enum = Enumerable::Enumerator.new(str, :each_byte)
+	    a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
+
+Methods:
+
+    each {...}
+
+	Iterates the given block using the object and the method
+	specified in the first place.
+
+
+Requiring this module also adds some methods to the Object class:
+
+    to_enum(method = :each, *args)
+    enum_for(method = :each, *args)
+
+	Returns Enumerable::Enumerator.new(self, method, *args).
+
+	e.g.:
+	    str = "xyz"
+
+	    enum = str.enum_for(:each_byte)
+	    a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
+
+	    # protects an array from being modified
+	    a = [1, 2, 3]
+	    some_method(a.to_enum)
+
+And the Enumerable module.
+
+    each_slice(n) {...}
+
+	Iterates the given block for each slice of <n> elements.
+
+	e.g.:
+	    (1..10).each_slice(3) {|a| p a}
+	    # outputs below
+	    [1, 2, 3]
+	    [4, 5, 6]
+	    [7, 8, 9]
+	    [10]
+
+    enum_slice(n)
+
+	Returns Enumerable::Enumerator.new(self, :each_slice, n).
+
+    each_cons(n) {...}
+
+	Iterates the given block for each array of consecutive <n>
+	elements.
+
+	e.g.:
+	    (1..10).each_cons(3) {|a| p a}
+	    # outputs below
+	    [1, 2, 3]
+	    [2, 3, 4]
+	    [3, 4, 5]
+	    [4, 5, 6]
+	    [5, 6, 7]
+	    [6, 7, 8]
+	    [7, 8, 9]
+	    [8, 9, 10]
+
+    enum_cons(n)
+
+	Returns Enumerable::Enumerator.new(self, :each_cons, n).
+
+    enum_with_index
+
+	Returns Enumerable::Enumerator.new(self, :each_with_index).
+
+-------------------------------------------------------
+Local variables:
+fill-column: 70
+end:
diff --git a/ruby_1_8_6/ext/enumerator/extconf.rb b/ruby_1_8_6/ext/enumerator/extconf.rb
new file mode 100644
index 0000000000..94e2ee38b2
--- /dev/null
+++ b/ruby_1_8_6/ext/enumerator/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('enumerator')
diff --git a/ruby_1_8_6/ext/etc/.cvsignore b/ruby_1_8_6/ext/etc/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/etc/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/etc/depend b/ruby_1_8_6/ext/etc/depend
new file mode 100644
index 0000000000..ac706477b0
--- /dev/null
+++ b/ruby_1_8_6/ext/etc/depend
@@ -0,0 +1 @@
+etc.o : etc.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h 
diff --git a/ruby_1_8_6/ext/etc/etc.c b/ruby_1_8_6/ext/etc/etc.c
new file mode 100644
index 0000000000..486963378b
--- /dev/null
+++ b/ruby_1_8_6/ext/etc/etc.c
@@ -0,0 +1,559 @@
+/************************************************
+
+  etc.c -
+
+  $Author$
+  $Date$
+  created at: Tue Mar 22 18:39:19 JST 1994
+
+************************************************/
+
+#include "ruby.h"
+
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_GETPWENT
+#include <pwd.h>
+#endif
+
+#ifdef HAVE_GETGRENT
+#include <grp.h>
+#endif
+
+#ifndef HAVE_TYPE_UID_T
+#define uid_t int
+#endif
+
+static VALUE sPasswd, sGroup;
+
+#ifndef _WIN32
+char *getenv();
+#endif
+char *getlogin();
+
+/* Returns the short user name of the currently logged in user.
+ *
+ * e.g.
+ *   Etc.getlogin -> 'guest'
+ */
+static VALUE
+etc_getlogin(obj)
+    VALUE obj;
+{
+    char *login;
+
+    rb_secure(4);
+#ifdef HAVE_GETLOGIN
+    login = getlogin();
+    if (!login) login = getenv("USER");
+#else
+    login = getenv("USER");
+#endif
+
+    if (login)
+	return rb_tainted_str_new2(login);
+    return Qnil;
+}
+
+#if defined(HAVE_GETPWENT) || defined(HAVE_GETGRENT)
+static VALUE
+safe_setup_str(str)
+    const char *str;
+{
+    if (str == 0) str = "";
+    return rb_tainted_str_new2(str);
+}
+#endif
+
+#ifdef HAVE_GETPWENT
+static VALUE
+setup_passwd(pwd)
+    struct passwd *pwd;
+{
+    if (pwd == 0) rb_sys_fail("/etc/passwd");
+    return rb_struct_new(sPasswd,
+			 safe_setup_str(pwd->pw_name),
+#ifdef HAVE_ST_PW_PASSWD
+			 safe_setup_str(pwd->pw_passwd),
+#endif
+			 PW_UID2VAL(pwd->pw_uid),
+			 PW_GID2VAL(pwd->pw_gid),
+#ifdef HAVE_ST_PW_GECOS
+			 safe_setup_str(pwd->pw_gecos),
+#endif
+			 safe_setup_str(pwd->pw_dir),
+			 safe_setup_str(pwd->pw_shell),
+#ifdef HAVE_ST_PW_CHANGE
+			 INT2NUM(pwd->pw_change),
+#endif
+#ifdef HAVE_ST_PW_QUOTA
+			 INT2NUM(pwd->pw_quota),
+#endif
+#ifdef HAVE_ST_PW_AGE
+			 PW_AGE2VAL(pwd->pw_age),
+#endif
+#ifdef HAVE_ST_PW_CLASS
+			 safe_setup_str(pwd->pw_class),
+#endif
+#ifdef HAVE_ST_PW_COMMENT
+			 safe_setup_str(pwd->pw_comment),
+#endif
+#ifdef HAVE_ST_PW_EXPIRE
+			 INT2NUM(pwd->pw_expire),
+#endif
+			 0		/*dummy*/
+	);
+}
+#endif
+
+/* Returns the /etc/passwd information for the user with specified integer
+ * user id (uid).
+ *
+ * The information is returned as a Struct::Passwd; see getpwent above for
+ * details.
+ *
+ * e.g.  * Etc.getpwuid(0) -> #<struct Struct::Passwd name="root",
+ * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
+ */
+static VALUE
+etc_getpwuid(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+#if defined(HAVE_GETPWENT)
+    VALUE id;
+    uid_t uid;
+    struct passwd *pwd;
+
+    rb_secure(4);
+    if (rb_scan_args(argc, argv, "01", &id) == 1) {
+	uid = PW_VAL2UID(id);
+    }
+    else {
+	uid = getuid();
+    }
+    pwd = getpwuid(uid);
+    if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", uid);
+    return setup_passwd(pwd);
+#else 
+    return Qnil;
+#endif
+}
+
+/* Returns the /etc/passwd information for the user with specified login name.
+ *
+ * The information is returned as a Struct::Passwd; see getpwent above for
+ * details.
+ *
+ * e.g.  * Etc.getpwnam('root') -> #<struct Struct::Passwd name="root",
+ * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
+ */
+static VALUE
+etc_getpwnam(obj, nam)
+    VALUE obj, nam;
+{
+#ifdef HAVE_GETPWENT
+    struct passwd *pwd;
+
+    SafeStringValue(nam);
+    pwd = getpwnam(RSTRING(nam)->ptr);
+    if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING(nam)->ptr);
+    return setup_passwd(pwd);
+#else 
+    return Qnil;
+#endif
+}
+
+#ifdef HAVE_GETPWENT
+static int passwd_blocking = 0;
+static VALUE
+passwd_ensure()
+{
+    passwd_blocking = Qfalse;
+    return Qnil;
+}
+
+static VALUE
+passwd_iterate()
+{
+    struct passwd *pw;
+
+    setpwent();
+    while (pw = getpwent()) {
+	rb_yield(setup_passwd(pw));
+    }
+    endpwent();
+    return Qnil;
+}
+#endif
+
+/* Provides a convenient Ruby iterator which executes a block for each entry 
+ * in the /etc/passwd file.
+ *
+ * The code block is passed an Etc::Passwd struct; see getpwent above for 
+ * details.
+ *
+ * Example:
+ *
+ *     require 'etc'
+ *
+ *     Etc.passwd {|u|
+ *       puts u.name + " = " + u.gecos
+ *     }
+ *
+ */
+static VALUE
+etc_passwd(obj)
+    VALUE obj;
+{
+#ifdef HAVE_GETPWENT
+    struct passwd *pw;
+
+    rb_secure(4);
+    if (rb_block_given_p()) {
+	if (passwd_blocking) {
+	    rb_raise(rb_eRuntimeError, "parallel passwd iteration");
+	}
+	passwd_blocking = Qtrue;
+	rb_ensure(passwd_iterate, 0, passwd_ensure, 0);
+    }
+    if (pw = getpwent()) {
+	return setup_passwd(pw);
+    }
+#endif
+    return Qnil;
+}
+
+/* Resets the process of reading the /etc/passwd file, so that the next call
+ * to getpwent will return the first entry again.
+ */
+static VALUE
+etc_setpwent(obj)
+    VALUE obj;
+{
+#ifdef HAVE_GETPWENT
+    setpwent();
+#endif
+    return Qnil;
+}
+
+/* Ends the process of scanning through the /etc/passwd file begun with
+ * getpwent, and closes the file.
+ */
+static VALUE
+etc_endpwent(obj)
+    VALUE obj;
+{
+#ifdef HAVE_GETPWENT
+    endpwent();
+#endif
+    return Qnil;
+}
+
+/* Returns an entry from the /etc/passwd file. The first time it is called it
+ * opens the file and returns the first entry; each successive call returns 
+ * the next entry, or nil if the end of the file has been reached.
+ *
+ * To close the file when processing is complete, call endpwent.
+ *
+ * Each entry is returned as a Struct::Passwd:
+ *
+ * - Passwd#name contains the short login name of the user as a String.
+ *
+ * - Passwd#passwd contains the encrypted password of the user as a String.
+ *   an 'x' is returned if shadow passwords are in use. An '*' is returned
+ *   if the user cannot log in using a password.
+ *
+ * - Passwd#uid contains the integer user ID (uid) of the user.
+ *
+ * - Passwd#gid contains the integer group ID (gid) of the user's primary group.
+ *
+ * - Passwd#gecos contains a longer String description of the user, such as 
+ *   a full name. Some Unix systems provide structured information in the 
+ *   gecos field, but this is system-dependent.
+ *
+ * - Passwd#dir contains the path to the home directory of the user as a String.
+ *
+ * - Passwd#shell contains the path to the login shell of the user as a String.
+ */
+static VALUE
+etc_getpwent(obj)
+    VALUE obj;
+{
+#ifdef HAVE_GETPWENT
+    struct passwd *pw;
+
+    if (pw = getpwent()) {
+	return setup_passwd(pw);
+    }
+#endif
+    return Qnil;
+}
+
+#ifdef HAVE_GETGRENT
+static VALUE
+setup_group(grp)
+    struct group *grp;
+{
+    VALUE mem;
+    char **tbl;
+
+    mem = rb_ary_new();
+    tbl = grp->gr_mem;
+    while (*tbl) {
+	rb_ary_push(mem, safe_setup_str(*tbl));
+	tbl++;
+    }
+    return rb_struct_new(sGroup,
+			 safe_setup_str(grp->gr_name),
+#ifdef HAVE_ST_GR_PASSWD
+			 safe_setup_str(grp->gr_passwd),
+#endif
+			 PW_GID2VAL(grp->gr_gid),
+			 mem);
+}
+#endif
+
+/* Returns information about the group with specified integer group id (gid), 
+ * as found in /etc/group.
+ *
+ * The information is returned as a Struct::Group; see getgrent above for
+ * details.
+ *
+ * e.g.  Etc.getgrgid(100) -> #<struct Struct::Group name="users", passwd="x",
+ * gid=100, mem=["meta", "root"]>
+ *
+ */
+static VALUE
+etc_getgrgid(obj, id)
+    VALUE obj, id;
+{
+#ifdef HAVE_GETGRENT
+    gid_t gid;
+    struct group *grp;
+
+    rb_secure(4);
+    gid = PW_VAL2GID(id);
+    grp = getgrgid(gid);
+    if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
+    return setup_group(grp);
+#else
+    return Qnil;
+#endif
+}
+
+/* Returns information about the group with specified String name, as found 
+ * in /etc/group.
+ *
+ * The information is returned as a Struct::Group; see getgrent above for
+ * details.
+ *
+ * e.g.  Etc.getgrnam('users') -> #<struct Struct::Group name="users",
+ * passwd="x", gid=100, mem=["meta", "root"]>
+ *
+ */
+static VALUE
+etc_getgrnam(obj, nam)
+    VALUE obj, nam;
+{
+#ifdef HAVE_GETGRENT
+    struct group *grp;
+
+    rb_secure(4);
+    SafeStringValue(nam);
+    grp = getgrnam(RSTRING(nam)->ptr);
+    if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING(nam)->ptr);
+    return setup_group(grp);
+#else
+    return Qnil;
+#endif
+}
+
+#ifdef HAVE_GETGRENT
+static int group_blocking = 0;
+static VALUE
+group_ensure()
+{
+    group_blocking = Qfalse;
+    return Qnil;
+}
+
+static VALUE
+group_iterate()
+{
+    struct group *pw;
+
+    setgrent();
+    while (pw = getgrent()) {
+	rb_yield(setup_group(pw));
+    }
+    endgrent();
+    return Qnil;
+}
+#endif
+
+/* Provides a convenient Ruby iterator which executes a block for each entry 
+ * in the /etc/group file.
+ *
+ * The code block is passed an Etc::Group struct; see getgrent above for 
+ * details.
+ *
+ * Example:
+ *
+ *     require 'etc'
+ *
+ *     Etc.group {|g|
+ *       puts g.name + ": " + g.mem.join(', ')
+ *     }
+ *
+ */
+static VALUE
+etc_group(obj)
+    VALUE obj;
+{
+#ifdef HAVE_GETGRENT
+    struct group *grp;
+
+    rb_secure(4);
+    if (rb_block_given_p()) {
+	if (group_blocking) {
+	    rb_raise(rb_eRuntimeError, "parallel group iteration");
+	}
+	group_blocking = Qtrue;
+	rb_ensure(group_iterate, 0, group_ensure, 0);
+    }
+    if (grp = getgrent()) {
+	return setup_group(grp);
+    }
+#endif
+    return Qnil;
+}
+
+/* Resets the process of reading the /etc/group file, so that the next call
+ * to getgrent will return the first entry again.
+ */
+static VALUE
+etc_setgrent(obj)
+    VALUE obj;
+{
+#ifdef HAVE_GETGRENT
+    setgrent();
+#endif
+    return Qnil;
+}
+
+/* Ends the process of scanning through the /etc/group file begun by 
+ * getgrent, and closes the file.
+ */
+static VALUE
+etc_endgrent(obj)
+    VALUE obj;
+{
+#ifdef HAVE_GETGRENT
+    endgrent();
+#endif
+    return Qnil;
+}
+
+/* Returns an entry from the /etc/group file. The first time it is called it
+ * opens the file and returns the first entry; each successive call returns 
+ * the next entry, or nil if the end of the file has been reached.
+ *
+ * To close the file when processing is complete, call endgrent.
+ *
+ * Each entry is returned as a Struct::Group:
+ *
+ * - Group#name contains the name of the group as a String.
+ *
+ * - Group#passwd contains the encrypted password as a String. An 'x' is
+ *   returned if password access to the group is not available; an empty 
+ *   string is returned if no password is needed to obtain membership of 
+ *   the group.
+ *
+ * - Group#gid contains the group's numeric ID as an integer.
+ *
+ * - Group#mem is an Array of Strings containing the short login names of the 
+ *   members of the group.
+ */
+static VALUE
+etc_getgrent(obj)
+    VALUE obj;
+{
+#ifdef HAVE_GETGRENT
+    struct group *gr;
+
+    if (gr = getgrent()) {
+	return setup_group(gr);
+    }
+#endif
+    return Qnil;
+}
+
+static VALUE mEtc;
+
+/* The etc module provides access to information from the /etc/passwd and
+ * /etc/group files on Linux and Unix systems.
+ *
+ * Documented by mathew <meta@pobox.com>.
+ */
+void
+Init_etc()
+{
+    mEtc = rb_define_module("Etc");
+
+    rb_define_module_function(mEtc, "getlogin", etc_getlogin, 0);
+
+    rb_define_module_function(mEtc, "getpwuid", etc_getpwuid, -1);
+    rb_define_module_function(mEtc, "getpwnam", etc_getpwnam, 1);
+    rb_define_module_function(mEtc, "setpwent", etc_setpwent, 0);
+    rb_define_module_function(mEtc, "endpwent", etc_endpwent, 0);
+    rb_define_module_function(mEtc, "getpwent", etc_getpwent, 0);
+    rb_define_module_function(mEtc, "passwd", etc_passwd, 0);
+
+    rb_define_module_function(mEtc, "getgrgid", etc_getgrgid, 1);
+    rb_define_module_function(mEtc, "getgrnam", etc_getgrnam, 1);
+    rb_define_module_function(mEtc, "group", etc_group, 0);
+    rb_define_module_function(mEtc, "setgrent", etc_setgrent, 0);
+    rb_define_module_function(mEtc, "endgrent", etc_endgrent, 0);
+    rb_define_module_function(mEtc, "getgrent", etc_getgrent, 0);
+
+    rb_global_variable(&sPasswd);
+    sPasswd =  rb_struct_define("Passwd",
+				"name", "passwd", "uid", "gid",
+#ifdef HAVE_ST_PW_GECOS
+				"gecos",
+#endif
+				"dir", "shell",
+#ifdef HAVE_ST_PW_CHANGE
+				"change",
+#endif
+#ifdef HAVE_ST_PW_QUOTA
+				"quota",
+#endif
+#ifdef HAVE_ST_PW_AGE
+				"age",
+#endif
+#ifdef HAVE_ST_PW_CLASS
+				"uclass",
+#endif
+#ifdef HAVE_ST_PW_COMMENT
+				"comment",
+#endif
+#ifdef HAVE_ST_PW_EXPIRE
+				"expire",
+#endif
+				NULL);
+
+#ifdef HAVE_GETGRENT
+    rb_global_variable(&sGroup);
+    sGroup = rb_struct_define("Group", "name",
+#ifdef HAVE_ST_GR_PASSWD
+			      "passwd",
+#endif
+			      "gid", "mem", NULL);
+#endif
+}
diff --git a/ruby_1_8_6/ext/etc/etc.txt b/ruby_1_8_6/ext/etc/etc.txt
new file mode 100644
index 0000000000..534790172c
--- /dev/null
+++ b/ruby_1_8_6/ext/etc/etc.txt
@@ -0,0 +1,72 @@
+.\" etc.txt -  -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
+
+** Etc(Module)
+
+The module to retrieve information under /etc directory.  Available
+only on UNIX platforms.  All operations defined in this module are
+module functions, so that you can include Etc module into your class.
+
+Module Function:
+
+   getlogin
+
+	returns login name of the user.  It this fails, try getpwuid().
+
+   getpwnam(name)
+
+	searches in /etc/passwd file (or equivalent database), and
+	returns password entry for the user.  The return value is an
+	passwd structure, which has members described below.
+
+	  struct passwd
+	    name 	# user name(string)
+	    passwd	# encrypted password(string)
+	    uid		# user ID(integer)
+	    gid		# group ID(integer)
+	    gecos	# gecos field(string)
+	    dir		# home directory(string)
+	    shell	# login shell(string)
+	    # members below are optional
+	    change	# password change time(integer)
+	    quota	# quota value(integer)
+	    age		# password age(integer)
+	    class	# user access class(string)
+	    comment	# comment(string)
+	    expire	# account expiration time(integer)	    
+	  end
+
+	See getpwnam(3) for detail.
+
+   getpwuid([uid])
+
+	returns passwd entry for the specified user id.  If uid is
+	ommitted, use the value from getuid().  See getpwuid(3) for
+	detail.
+
+   getgrgid(gid)
+
+	searches in /etc/group file (or equivalent database), and
+	returns group entry for the group id.  The return value is an
+	group structure, which has members described below.
+
+	  struct group
+	    name 	# group name(string)
+	    passwd	# group password(string)
+	    gid		# group ID(integer)
+	    mem		# array of the group member names
+	  end
+
+	See getgrgid(3) for detail.
+
+   getgrnam(name)
+
+	returns the group entry for the specified name.  The return
+	value is the group structure.  See getgrnam(3) for detail.
+
+   group
+
+	iterates over all group entries.
+
+   passwd
+
+	iterates over all passwd entries.
diff --git a/ruby_1_8_6/ext/etc/etc.txt.ja b/ruby_1_8_6/ext/etc/etc.txt.ja
new file mode 100644
index 0000000000..2dddcfb036
--- /dev/null
+++ b/ruby_1_8_6/ext/etc/etc.txt.ja
@@ -0,0 +1,72 @@
+.\" etc.txt.ja -  -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
+
+** Etc(モジュール)
+
+/etcディレクトリ以下の情報を得るためのモジュール．クラスにインクルード
+して使うこともできる．
+
+Module Function:
+
+   getlogin
+
+	自分のlogin名を返す．これが失敗した場合はgetpwuid()を用いると
+	良い．
+
+   getpwnam(name)
+
+	/etc/passwdファイル(あるいはDBMファイルやNISデータベース)を検
+	索し，nameの名前を持つpasswdエントリを返す．戻り値はpasswd構造
+	体で以下のメンバを持つ．
+
+	  struct passwd
+	    name 	# ユーザ名(文字列)
+	    passwd	# パスワード(文字列)
+	    uid		# ユーザID(整数)
+	    gid		# グループID(整数)
+	    gecos	# gecosフィールド(文字列)
+	    dir		# ホームディレクトリ(文字列)
+	    shell	# ログインシェル(文字列)
+	    # 以降のメンバはシステムによっては提供されない．
+	    change	# パスワード変更時間(整数)
+	    quota	# クォータ(整数)
+	    age		# エージ(整数)
+	    class	# ユーザアクセスクラス(文字列)
+	    comment	# コメント(文字列)
+	    expire	# アカウント有効期限(整数)	    
+	  end
+
+	詳細はgetpwnam(3)を参照のこと．
+
+   getpwuid([uid])
+
+	uidをユーザIDとするpasswdエントリを返す．戻り値はgetpwnam()と
+	同様である．引数を省略した場合にはgetuid()の値を用いる．詳細は
+	getpwuid(3)を参照のこと．
+
+   getgrgid(gid)
+
+	/etc/groupファイル(あるいは…getpwnam参照)を検索し，gidをグルー
+	プIDとするグループエントリを返す．戻り値はgroup構造体で以下の
+	メンバを持つ．
+
+	  struct group
+	    name 	# グループ名(文字列)
+	    passwd	# グループのパスワード(文字列)
+	    gid		# グループID(整数)
+	    mem		# グループメンバ名の配列
+	  end
+
+	詳細はgetgrgid(3)を参照のこと．
+
+   getgrnam(name)
+
+	nameという名前のグループエントリを返す．戻り値はgetgrgid()と同
+	様である．詳細はgetgrnam(3)を参照．
+
+   group
+
+	全てのグループエントリを順にアクセスするためのイテレータ．
+
+   passwd
+
+	全てのpasswdエントリを順にアクセスするためのイテレータ．
diff --git a/ruby_1_8_6/ext/etc/extconf.rb b/ruby_1_8_6/ext/etc/extconf.rb
new file mode 100644
index 0000000000..dbd0672545
--- /dev/null
+++ b/ruby_1_8_6/ext/etc/extconf.rb
@@ -0,0 +1,43 @@
+require 'mkmf'
+
+have_library("sun", "getpwnam")	# NIS (== YP) interface for IRIX 4
+a = have_func("getlogin")
+b = have_func("getpwent")
+c = have_func("getgrent")
+if  a or b or c
+  have_struct_member('struct passwd', 'pw_gecos', 'pwd.h')
+  have_struct_member('struct passwd', 'pw_change', 'pwd.h')
+  have_struct_member('struct passwd', 'pw_quota', 'pwd.h')
+  if have_struct_member('struct passwd', 'pw_age', 'pwd.h')
+    case what_type?('struct passwd', 'pw_age', 'pwd.h')
+    when "string"
+      f = "safe_setup_str"
+    when "long long"
+      f = "LL2NUM"
+    else
+      f = "INT2NUM"
+    end
+    $defs.push("-DPW_AGE2VAL="+f)
+  end
+  have_struct_member('struct passwd', 'pw_class', 'pwd.h')
+  have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM
+  have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
+  have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
+  have_struct_member('struct group', 'gr_passwd', 'grp.h')
+  [%w"uid_t pwd.h", %w"gid_t grp.h"].each do |t, *h|
+    h.unshift("sys/types.h")
+    f = "INT2NUM"
+    if have_type(t, h)
+      if try_static_assert("sizeof(#{t}) > sizeof(long)", h)
+	f = "LL2NUM"
+      end
+      if try_static_assert("(#{t})-1 > 0", h)
+	f = "U#{f}"
+      end
+    end
+    t = t.chomp('_t').upcase
+    $defs.push("-DPW_#{t}2VAL=#{f}")
+    $defs.push("-DPW_VAL2#{t}=#{f.sub(/([A-Z]+)2(NUM)/, '\22\1')}")
+  end
+  create_makefile("etc")
+end
diff --git a/ruby_1_8_6/ext/extmk.rb b/ruby_1_8_6/ext/extmk.rb
new file mode 100644
index 0000000000..cf7944679c
--- /dev/null
+++ b/ruby_1_8_6/ext/extmk.rb
@@ -0,0 +1,555 @@
+#! /usr/local/bin/ruby
+# -*- ruby -*-
+
+$extension = nil
+$extstatic = nil
+$force_static = nil
+$install = nil
+$destdir = nil
+$dryrun = false
+$clean = nil
+$nodynamic = nil
+$extinit = nil
+$extobjs = nil
+$extflags = ""
+$extlibs = nil
+$extpath = nil
+$ignore = nil
+$message = nil
+
+$progname = $0
+alias $PROGRAM_NAME $0
+alias $0 $progname
+
+$extlist = []
+$compiled = {}
+
+$:.replace([Dir.pwd])
+require 'rbconfig'
+
+srcdir = File.dirname(File.dirname(__FILE__))
+
+$:.unshift(srcdir, File.expand_path("lib", srcdir))
+
+$topdir = "."
+$top_srcdir = srcdir
+
+require 'mkmf'
+require 'optparse/shellwords'
+
+def sysquote(x)
+  @quote ||= /human|os2|macos/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
+  @quote ? x.quote : x
+end
+
+def relative_from(path, base)
+  dir = File.join(path, "")
+  if File.expand_path(dir) == File.expand_path(dir, base)
+    path
+  else
+    File.join(base, path)
+  end
+end
+
+def extract_makefile(makefile, keep = true)
+  m = File.read(makefile)
+  if !(target = m[/^TARGET[ \t]*=[ \t]*(\S*)/, 1])
+    return keep
+  end
+  installrb = {}
+  m.scan(/^install-rb-default:[ \t]*(\S+)\n\1:[ \t]*(\S+)/) {installrb[$2] = $1}
+  oldrb = installrb.keys.sort
+  newrb = install_rb(nil, "").collect {|d, *f| f}.flatten.sort
+  if target_prefix = m[/^target_prefix[ \t]*=[ \t]*\/(.*)/, 1]
+    target = "#{target_prefix}/#{target}"
+  end
+  unless oldrb == newrb
+    if $extout
+      newrb.each {|f| installrb.delete(f)}
+      unless installrb.empty?
+        config = CONFIG.dup
+        install_dirs(target_prefix).each {|var, val| config[var] = val}
+        FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, :verbose => true)
+      end
+    end
+    return false
+  end
+  $target = target
+  $extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1]
+  $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false
+  /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil
+  $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "")
+  $DLDFLAGS += " " + (m[/^DLDFLAGS[ \t]*=[ \t]*(.*)/, 1] || "")
+  if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1]
+    s.sub!(/^#{Regexp.quote($LIBRUBYARG)} */, "")
+    s.sub!(/ *#{Regexp.quote($LIBS)}$/, "")
+    $libs = s
+  end
+  $objs = (m[/^OBJS[ \t]*=[ \t](.*)/, 1] || "").split
+  $srcs = (m[/^SRCS[ \t]*=[ \t](.*)/, 1] || "").split
+  $LOCAL_LIBS = m[/^LOCAL_LIBS[ \t]*=[ \t]*(.*)/, 1] || ""
+  $LIBPATH = Shellwords.shellwords(m[/^libpath[ \t]*=[ \t]*(.*)/, 1] || "") - %w[$(libdir) $(topdir)]
+  true
+end
+
+def extmake(target)
+  print "#{$message} #{target}\n"
+  $stdout.flush
+  if $force_static or $static_ext[target]
+    $static = target
+  else
+    $static = false
+  end
+
+  unless $ignore
+    return true if $nodynamic and not $static
+  end
+
+  FileUtils.mkpath target unless File.directory?(target)
+  begin
+    dir = Dir.pwd
+    FileUtils.mkpath target unless File.directory?(target)
+    Dir.chdir target
+    top_srcdir = $top_srcdir
+    topdir = $topdir
+    hdrdir = $hdrdir
+    prefix = "../" * (target.count("/")+1)
+    $top_srcdir = relative_from(top_srcdir, prefix)
+    $hdrdir = relative_from(hdrdir, prefix)
+    $topdir = prefix + $topdir
+    $target = target
+    $mdir = target
+    $srcdir = File.join($top_srcdir, "ext", $mdir)
+    $preload = nil
+    $objs = ""
+    $srcs = ""
+    $compiled[target] = false
+    makefile = "./Makefile"
+    ok = File.exist?(makefile)
+    unless $ignore
+      rbconfig0 = Config::CONFIG
+      mkconfig0 = CONFIG
+      rbconfig = {
+	"hdrdir" => $hdrdir,
+	"srcdir" => $srcdir,
+	"topdir" => $topdir,
+      }
+      mkconfig = {
+	"top_srcdir" => ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1],
+	"hdrdir" => "$(top_srcdir)",
+	"srcdir" => "$(top_srcdir)/ext/#{$mdir}",
+	"topdir" => $topdir,
+      }
+      rbconfig0.each_pair {|key, val| rbconfig[key] ||= val.dup}
+      mkconfig0.each_pair {|key, val| mkconfig[key] ||= val.dup}
+      Config.module_eval {
+	remove_const(:CONFIG)
+	const_set(:CONFIG, rbconfig)
+	remove_const(:MAKEFILE_CONFIG)
+	const_set(:MAKEFILE_CONFIG, mkconfig)
+      }
+      Object.class_eval {
+	remove_const(:CONFIG)
+	const_set(:CONFIG, mkconfig)
+      }
+      begin
+	$extconf_h = nil
+	ok &&= extract_makefile(makefile)
+	if (($extconf_h && !File.exist?($extconf_h)) ||
+	    !(t = modified?(makefile, MTIMES)) ||
+	    ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb", "#{$srcdir}/depend"].any? {|f| modified?(f, [t])})
+        then
+	  ok = false
+          init_mkmf
+	  Logging::logfile 'mkmf.log'
+	  rm_f makefile
+	  if File.exist?($0 = "#{$srcdir}/makefile.rb")
+	    load $0
+	  elsif File.exist?($0 = "#{$srcdir}/extconf.rb")
+	    load $0
+	  else
+	    create_makefile(target)
+	  end
+	  $defs << "-DRUBY_EXPORT" if $static
+	  ok = File.exist?(makefile)
+	end
+      rescue SystemExit
+	# ignore
+      ensure
+	rm_f "conftest*"
+	config = $0
+	$0 = $PROGRAM_NAME
+      end
+    end
+    ok = yield(ok) if block_given?
+    unless ok
+      open(makefile, "w") do |f|
+	f.print dummy_makefile(CONFIG["srcdir"])
+      end
+      return true
+    end
+    args = sysquote($mflags)
+    unless $destdir.to_s.empty? or $mflags.include?("DESTDIR")
+      args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
+    end
+    if $static
+      args += ["static"] unless $clean
+      $extlist.push [$static, $target, File.basename($target), $preload]
+    end
+    unless system($make, *args)
+      $ignore or $continue or return false
+    end
+    $compiled[target] = true
+    if $clean
+      FileUtils.rm_f("mkmf.log")
+      if $clean != true
+	FileUtils.rm_f([makefile, $extconf_h || "extconf.h"])
+      end
+      File.unlink(makefile) rescue nil
+    end
+    if $static
+      $extflags ||= ""
+      $extlibs ||= []
+      $extpath ||= []
+      unless $mswin
+        $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ")
+      end
+      $extlibs = merge_libs($extlibs, $libs.split, $LOCAL_LIBS.split)
+      $extpath |= $LIBPATH
+    end
+  ensure
+    unless $ignore
+      Config.module_eval {
+	remove_const(:CONFIG)
+	const_set(:CONFIG, rbconfig0)
+	remove_const(:MAKEFILE_CONFIG)
+	const_set(:MAKEFILE_CONFIG, mkconfig0)
+      }
+      Object.class_eval {
+	remove_const(:CONFIG)
+	const_set(:CONFIG, mkconfig0)
+      }
+    end
+    $top_srcdir = top_srcdir
+    $topdir = topdir
+    $hdrdir = hdrdir
+    Dir.chdir dir
+  end
+  begin
+    Dir.rmdir target
+    target = File.dirname(target)
+  rescue SystemCallError
+    break
+  end while true
+  true
+end
+
+def compiled?(target)
+  $compiled[target]
+end
+
+def parse_args()
+  $mflags = []
+
+  opts = nil
+  $optparser ||= OptionParser.new do |opts|
+    opts.on('-n') {$dryrun = true}
+    opts.on('--[no-]extension [EXTS]', Array) do |v|
+      $extension = (v == false ? [] : v)
+    end
+    opts.on('--[no-]extstatic [STATIC]', Array) do |v|
+      if ($extstatic = v) == false
+        $extstatic = []
+      elsif v
+        $force_static = true if $extstatic.delete("static")
+        $extstatic = nil if $extstatic.empty?
+      end
+    end
+    opts.on('--dest-dir=DIR') do |v|
+      $destdir = v
+    end
+    opts.on('--extout=DIR') do |v|
+      $extout = (v unless v.empty?)
+    end
+    opts.on('--make=MAKE') do |v|
+      $make = v || 'make'
+    end
+    opts.on('--make-flags=FLAGS', '--mflags', Shellwords) do |v|
+      v.grep(/\A([-\w]+)=(.*)/) {$configure_args["--#{$1}"] = $2}
+      if arg = v.first
+        arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
+      end
+      $mflags.concat(v)
+    end
+    opts.on('--message [MESSAGE]', String) do |v|
+      $message = v
+    end
+  end
+  begin
+    $optparser.parse!(ARGV)
+  rescue OptionParser::InvalidOption => e
+    retry if /^--/ =~ e.args[0]
+    $optparser.warn(e)
+    abort opts.to_s
+  end
+
+  $destdir ||= ''
+
+  $make, *rest = Shellwords.shellwords($make)
+  $mflags.unshift(*rest) unless rest.empty?
+
+  def $mflags.set?(flag)
+    grep(/\A-(?!-).*#{'%c' % flag}/i) { return true }
+    false
+  end
+  def $mflags.defined?(var)
+    grep(/\A#{var}=(.*)/) {return $1}
+    false
+  end
+
+  if $mflags.set?(?n)
+    $dryrun = true
+  else
+    $mflags.unshift '-n' if $dryrun
+  end
+
+  $continue = $mflags.set?(?k)
+  if $extout
+    $extout = '$(topdir)/'+$extout
+    Config::CONFIG["extout"] = CONFIG["extout"] = $extout
+    $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
+    $mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix"
+  end
+end
+
+parse_args()
+
+if target = ARGV.shift and /^[a-z-]+$/ =~ target
+  $mflags.push(target)
+  target = target.sub(/^(dist|real)(?=(?:clean)?$)/, '')
+  case target
+  when /clean/
+    $ignore ||= true
+    $clean = $1 ? $1[0] : true
+  when /^install\b/
+    $install = true
+    $ignore ||= true
+    $mflags.unshift("INSTALL_PROG=install -c -p -m 0755",
+                    "INSTALL_DATA=install -c -p -m 0644",
+                    "MAKEDIRS=mkdir -p") if $dryrun
+  end
+end
+unless $message
+  if target
+    $message = target.sub(/^(\w+)e?\b/, '\1ing').tr('-', ' ')
+  else
+    $message = "compiling"
+  end
+end
+
+EXEEXT = CONFIG['EXEEXT']
+if CROSS_COMPILING
+  $ruby = CONFIG['MINIRUBY']
+elsif sep = config_string('BUILD_FILE_SEPARATOR')
+  $ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT
+else
+  $ruby = '$(topdir)/miniruby' + EXEEXT
+end
+$ruby << " -I'$(topdir)' -I'$(top_srcdir)/lib'"
+$ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
+$ruby << " -I'$(hdrdir)/ext' -rpurelib.rb"
+$config_h = '$(topdir)/config.h'
+ENV["RUBYLIB"] = "-"
+ENV["RUBYOPT"] = "-rpurelib.rb"
+
+MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
+
+# get static-link modules
+$static_ext = {}
+if $extstatic
+  $extstatic.each do |target|
+    target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
+    $static_ext[target] = $static_ext.size
+  end
+end
+for dir in ["ext", File::join($top_srcdir, "ext")]
+  setup = File::join(dir, CONFIG['setup'])
+  if File.file? setup
+    f = open(setup)
+    while line = f.gets()
+      line.chomp!
+      line.sub!(/#.*$/, '')
+      next if /^\s*$/ =~ line
+      target, opt = line.split(nil, 3)
+      if target == 'option'
+	case opt
+	when 'nodynamic'
+	  $nodynamic = true
+	end
+	next
+      end
+      target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
+      $static_ext[target] = $static_ext.size
+    end
+    MTIMES << f.mtime
+    $setup = setup
+    f.close
+    break
+  end
+end unless $extstatic
+
+ext_prefix = "#{$top_srcdir}/ext"
+exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
+if $extension
+  exts |= $extension.select {|d| File.directory?("#{ext_prefix}/#{d}")}
+else
+  withes, withouts = %w[--with --without].collect {|w|
+    if not (w = %w[-extensions -ext].collect {|opt|arg_config(w+opt)}).any?
+      proc {false}
+    elsif (w = w.grep(String)).empty?
+      proc {true}
+    else
+      proc {|c1| w.collect {|opt| opt.split(/,/)}.flatten.any?(&c1)}
+    end
+  }
+  cond = proc {|ext|
+    cond1 = proc {|n| File.fnmatch(n, ext, File::FNM_PATHNAME)}
+    withes.call(cond1) or !withouts.call(cond1)
+  }
+  exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d|
+    d = File.dirname(d)
+    d.slice!(0, ext_prefix.length + 1)
+    d
+  }.find_all {|ext|
+    with_config(ext, &cond)
+  }.sort
+end
+
+if $extout
+  extout = Config.expand("#{$extout}", Config::CONFIG.merge("topdir"=>$topdir))
+  unless $ignore
+    FileUtils.mkpath(extout)
+  end
+end
+
+dir = Dir.pwd
+FileUtils::makedirs('ext')
+Dir::chdir('ext')
+
+hdrdir = $hdrdir
+$hdrdir = $top_srcdir = relative_from(srcdir, $topdir = "..")
+exts.each do |d|
+  extmake(d) or abort
+end
+$top_srcdir = srcdir
+$topdir = "."
+$hdrdir = hdrdir
+
+extinit = Struct.new(:c, :o) {
+  def initialize(src)
+    super("#{src}.c", "#{src}.#{$OBJEXT}")
+  end
+}.new("extinit")
+if $ignore
+  FileUtils.rm_f(extinit.to_a) if $clean
+  Dir.chdir ".."
+  if $clean
+    Dir.rmdir('ext') rescue nil
+    FileUtils.rm_rf(extout) if $extout
+  end
+  exit
+end
+
+$extinit ||= ""
+$extobjs ||= ""
+$extpath ||= []
+$extflags ||= ""
+$extlibs ||= []
+unless $extlist.empty?
+  $extinit << "\n" unless $extinit.empty?
+  list = $extlist.dup
+  built = []
+  while e = list.shift
+    s,t,i,r = e
+    if r and !(r -= built).empty?
+      l = list.size
+      if (while l > 0; break true if r.include?(list[l-=1][1]) end)
+        list.insert(l + 1, e)
+      end
+      next
+    end
+    f = format("%s/%s.%s", s, i, $LIBEXT)
+    if File.exist?(f)
+      $extinit << "    init(Init_#{i}, \"#{t}.so\");\n"
+      $extobjs << "ext/#{f} "
+      built << t
+    end
+  end
+
+  src = %{\
+#include "ruby.h"
+
+#define init(func, name) {void func _((void)); ruby_init_ext(name, func);}
+
+void ruby_init_ext _((const char *name, void (*init)(void)));
+
+void Init_ext _((void))\n{\n#$extinit}
+}
+  if !modified?(extinit.c, MTIMES) || IO.read(extinit.c) != src
+    open(extinit.c, "w") {|f| f.print src}
+  end
+
+  $extobjs = "ext/#{extinit.o} #{$extobjs}"
+  if RUBY_PLATFORM =~ /m68k-human|beos/
+    $extflags.delete("-L/usr/local/lib")
+  end
+  $extpath.delete("$(topdir)")
+  $extflags = libpathflag($extpath) << " " << $extflags.strip
+  conf = [
+    ['LIBRUBY_SO_UPDATE', '$(LIBRUBY_EXTS)'],
+    ['SETUP', $setup],
+    [enable_config("shared", $enable_shared) ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
+    ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
+  ].map {|n, v|
+    "#{n}=#{v}" if v and !(v = v.strip).empty?
+  }.compact
+  puts conf
+  $stdout.flush
+  $mflags.concat(conf)
+else
+  FileUtils.rm_f(extinit.to_a)
+end
+rubies = []
+%w[RUBY RUBYW STATIC_RUBY].each {|r|
+  n = r
+  if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME")
+    rubies << Config.expand(r+=EXEEXT)
+    $mflags << "#{n}=#{r}"
+  end
+}
+
+Dir.chdir ".."
+unless $destdir.to_s.empty?
+  $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
+end
+puts "making #{rubies.join(', ')}"
+$stdout.flush
+$mflags.concat(rubies)
+
+if $nmake == ?b
+  unless (vars = $mflags.grep(/\A\w+=/n)).empty?
+    open(mkf = "libruby.mk", "wb") do |tmf|
+      tmf.puts("!include Makefile")
+      tmf.puts
+      tmf.puts(*vars.map {|v| v.sub(/=/, " = ")})
+      tmf.puts("PRE_LIBRUBY_UPDATE = del #{mkf}")
+    end
+    $mflags.unshift("-f#{mkf}")
+    vars.each {|flag| flag.sub!(/\A/, "-D")}
+  end
+end
+system($make, *sysquote($mflags)) or exit($?.exitstatus)
+
+#Local variables:
+# mode: ruby
+#end:
diff --git a/ruby_1_8_6/ext/fcntl/.cvsignore b/ruby_1_8_6/ext/fcntl/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/fcntl/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/fcntl/depend b/ruby_1_8_6/ext/fcntl/depend
new file mode 100644
index 0000000000..10eab64a46
--- /dev/null
+++ b/ruby_1_8_6/ext/fcntl/depend
@@ -0,0 +1 @@
+fcntl.o: fcntl.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ruby_1_8_6/ext/fcntl/extconf.rb b/ruby_1_8_6/ext/fcntl/extconf.rb
new file mode 100644
index 0000000000..8b717d4a5b
--- /dev/null
+++ b/ruby_1_8_6/ext/fcntl/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('fcntl')
diff --git a/ruby_1_8_6/ext/fcntl/fcntl.c b/ruby_1_8_6/ext/fcntl/fcntl.c
new file mode 100644
index 0000000000..57cca103f4
--- /dev/null
+++ b/ruby_1_8_6/ext/fcntl/fcntl.c
@@ -0,0 +1,187 @@
+/************************************************
+
+  fcntl.c -
+
+  $Author$
+  created at: Mon Apr  7 18:53:05 JST 1997
+
+  Copyright (C) 1997-2001 Yukihiro Matsumoto
+
+************************************************/
+
+/************************************************
+= NAME
+
+fcntl - load the C fcntl.h defines
+
+= SYNOPSIS
+
+    require "fcntl"
+    m = s.fcntl(Fcntl::F_GETFL, 0)
+    f.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK|m)
+
+= DESCRIPTION
+
+This module is just a translation of the C <fnctl.h> file.
+
+= NOTE
+
+Only #define symbols get translated; you must still correctly
+pack up your own arguments to pass as args for locking functions, etc.
+
+************************************************/
+
+#include "ruby.h"
+#include <fcntl.h>
+
+/* Fcntl loads the constants defined in the system's <fcntl.h> C header
+ * file, and used with both the fcntl(2) and open(2) POSIX system calls.
+ *
+ * Copyright (C) 1997-2001 Yukihiro Matsumoto
+ *
+ * Documented by mathew <meta@pobox.com>
+ *
+ * = Usage
+ * 
+ * To perform a fcntl(2) operation, use IO::fcntl in the core classes.
+ *
+ * To perform an open(2) operation, use IO::sysopen.
+ *
+ * The set of operations and constants available depends upon specific OS
+ * platform. Some values listed below may not be supported on your system.
+ *
+ * The constants supported by Ruby for use with IO::fcntl are:
+ *
+ * - F_DUPFD - duplicate a close-on-exec file handle to a non-close-on-exec
+ *   file handle.
+ *
+ * - F_GETFD - read the close-on-exec flag of a file handle.
+ *
+ * - F_SETFD - set the close-on-exec flag of a file handle.
+ *
+ * - FD_CLOEXEC - the value of the close-on-exec flag.
+ *
+ * - F_GETFL - get file descriptor flags.
+ *
+ * - F_SETFL - set file descriptor flags.
+ *
+ * - O_APPEND, O_NONBLOCK, etc (see below) - file descriptor flag
+ *   values for the above.
+ *
+ * - F_GETLK - determine whether a given region of a file is locked.
+ *
+ * - F_SETLK - acquire a lock on a region of a file.
+ *
+ * - F_SETLKW - acquire a lock on a region of a file, waiting if necessary.
+ *
+ * - F_RDLCK, F_WRLCK, F_UNLCK - types of lock for the above.
+ *
+ * The constants supported by Ruby for use with IO::sysopen are:
+ *
+ * - O_APPEND - open file in append mode.
+ *
+ * - O_NOCTTY - open tty without it becoming controlling tty.
+ *
+ * - O_CREAT - create file if it doesn't exist.
+ *
+ * - O_EXCL - used with O_CREAT, fail if file exists.
+ *
+ * - O_TRUNC - truncate file on open.
+ *
+ * - O_NONBLOCK / O_NDELAY - open in non-blocking mode.
+ *
+ * - O_RDONLY - open read-only.
+ *
+ * - O_WRONLY - open write-only.
+ *
+ * - O_RDWR - open read-write.
+ *
+ * - O_ACCMODE - mask to extract read/write flags.
+ *
+ * Example:
+ * 
+ *   require 'fcntl'
+ *
+ *   fd = IO::sysopen('/tmp/tempfile', 
+ *        Fcntl::O_WRONLY | Fcntl::O_EXCL | Fcntl::O_CREAT)
+ *   f = IO.open(fd)
+ *   f.syswrite("TEMP DATA")
+ *   f.close
+ *
+ */
+void
+Init_fcntl()
+{
+    VALUE mFcntl = rb_define_module("Fcntl");
+#ifdef F_DUPFD
+    rb_define_const(mFcntl, "F_DUPFD", INT2NUM(F_DUPFD));
+#endif
+#ifdef F_GETFD
+    rb_define_const(mFcntl, "F_GETFD", INT2NUM(F_GETFD));
+#endif
+#ifdef F_GETLK
+    rb_define_const(mFcntl, "F_GETLK", INT2NUM(F_GETLK));
+#endif
+#ifdef F_SETFD
+    rb_define_const(mFcntl, "F_SETFD", INT2NUM(F_SETFD));
+#endif
+#ifdef F_GETFL
+    rb_define_const(mFcntl, "F_GETFL", INT2NUM(F_GETFL));
+#endif
+#ifdef F_SETFL
+    rb_define_const(mFcntl, "F_SETFL", INT2NUM(F_SETFL));
+#endif
+#ifdef F_SETLK
+    rb_define_const(mFcntl, "F_SETLK", INT2NUM(F_SETLK));
+#endif
+#ifdef F_SETLKW
+    rb_define_const(mFcntl, "F_SETLKW", INT2NUM(F_SETLKW));
+#endif
+#ifdef FD_CLOEXEC
+    rb_define_const(mFcntl, "FD_CLOEXEC", INT2NUM(FD_CLOEXEC));
+#endif
+#ifdef F_RDLCK
+    rb_define_const(mFcntl, "F_RDLCK", INT2NUM(F_RDLCK));
+#endif
+#ifdef F_UNLCK
+    rb_define_const(mFcntl, "F_UNLCK", INT2NUM(F_UNLCK));
+#endif
+#ifdef F_WRLCK
+    rb_define_const(mFcntl, "F_WRLCK", INT2NUM(F_WRLCK));
+#endif
+#ifdef O_CREAT
+    rb_define_const(mFcntl, "O_CREAT", INT2NUM(O_CREAT));
+#endif
+#ifdef O_EXCL
+    rb_define_const(mFcntl, "O_EXCL", INT2NUM(O_EXCL));
+#endif
+#ifdef O_NOCTTY
+    rb_define_const(mFcntl, "O_NOCTTY", INT2NUM(O_NOCTTY));
+#endif
+#ifdef O_TRUNC
+    rb_define_const(mFcntl, "O_TRUNC", INT2NUM(O_TRUNC));
+#endif
+#ifdef O_APPEND
+    rb_define_const(mFcntl, "O_APPEND", INT2NUM(O_APPEND));
+#endif
+#ifdef O_NONBLOCK
+    rb_define_const(mFcntl, "O_NONBLOCK", INT2NUM(O_NONBLOCK));
+#endif
+#ifdef O_NDELAY
+    rb_define_const(mFcntl, "O_NDELAY", INT2NUM(O_NDELAY));
+#endif
+#ifdef O_RDONLY
+    rb_define_const(mFcntl, "O_RDONLY", INT2NUM(O_RDONLY));
+#endif
+#ifdef O_RDWR
+    rb_define_const(mFcntl, "O_RDWR", INT2NUM(O_RDWR));
+#endif
+#ifdef O_WRONLY
+    rb_define_const(mFcntl, "O_WRONLY", INT2NUM(O_WRONLY));
+#endif
+#ifdef O_ACCMODE
+    rb_define_const(mFcntl, "O_ACCMODE", INT2FIX(O_ACCMODE));
+#else
+    rb_define_const(mFcntl, "O_ACCMODE", INT2FIX(O_RDONLY | O_WRONLY | O_RDWR));
+#endif
+}
diff --git a/ruby_1_8_6/ext/gdbm/.cvsignore b/ruby_1_8_6/ext/gdbm/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/gdbm/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/gdbm/README b/ruby_1_8_6/ext/gdbm/README
new file mode 100644
index 0000000000..df7a261c68
--- /dev/null
+++ b/ruby_1_8_6/ext/gdbm/README
@@ -0,0 +1 @@
+gdbm ext-library for Ruby 1.3 or later
diff --git a/ruby_1_8_6/ext/gdbm/depend b/ruby_1_8_6/ext/gdbm/depend
new file mode 100644
index 0000000000..c080a81619
--- /dev/null
+++ b/ruby_1_8_6/ext/gdbm/depend
@@ -0,0 +1 @@
+gdbm.o: gdbm.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ruby_1_8_6/ext/gdbm/extconf.rb b/ruby_1_8_6/ext/gdbm/extconf.rb
new file mode 100644
index 0000000000..5a09492e5e
--- /dev/null
+++ b/ruby_1_8_6/ext/gdbm/extconf.rb
@@ -0,0 +1,7 @@
+require 'mkmf'
+
+dir_config("gdbm")
+if have_library("gdbm", "gdbm_open") and
+   have_header("gdbm.h")
+  create_makefile("gdbm")
+end
diff --git a/ruby_1_8_6/ext/gdbm/gdbm.c b/ruby_1_8_6/ext/gdbm/gdbm.c
new file mode 100644
index 0000000000..82109fda90
--- /dev/null
+++ b/ruby_1_8_6/ext/gdbm/gdbm.c
@@ -0,0 +1,1358 @@
+/************************************************
+
+  gdbm.c -
+
+  $Author$
+  $Date$
+  modified at: Mon Jan 24 15:59:52 JST 1994
+
+  Documentation by Peter Adolphs < futzilogik at users dot sourceforge dot net >
+
+************************************************/
+
+#include "ruby.h"
+
+#include <gdbm.h>
+#include <fcntl.h>
+#include <errno.h>
+
+/*
+ * Document-class: GDBM
+ *
+ * == Summary
+ *
+ * Ruby extension for GNU dbm (gdbm) -- a simple database engine for storing
+ * key-value pairs on disk.
+ *
+ * == Description
+ *
+ * GNU dbm is a library for simple databases. A database is a file that stores
+ * key-value pairs. Gdbm allows the user to store, retrieve, and delete data by
+ * key. It furthermore allows a non-sorted traversal of all key-value pairs.
+ * A gdbm database thus provides the same functionality as a hash. As
+ * with objects of the Hash class, elements can be accessed with <tt>[]</tt>.
+ * Furthermore, GDBM mixes in the Enumerable module, thus providing convenient
+ * methods such as #find, #collect, #map, etc.
+ *
+ * A process is allowed to open several different databases at the same time.
+ * A process can open a database as a "reader" or a "writer". Whereas a reader
+ * has only read-access to the database, a writer has read- and write-access.
+ * A database can be accessed either by any number of readers or by exactly one
+ * writer at the same time.
+ *
+ * == Examples
+ *
+ * 1. Opening/creating a database, and filling it with some entries:
+ *
+ *      require 'gdbm'
+ *      
+ *      gdbm = GDBM.new("fruitstore.db")
+ *      gdbm["ananas"]    = "3"
+ *      gdbm["banana"]    = "8"
+ *      gdbm["cranberry"] = "4909"
+ *      gdbm.close
+ *
+ * 2. Reading out a database:
+ *
+ *      require 'gdbm'
+ *      
+ *      gdbm = GDBM.new("fruitstore.db")
+ *      gdbm.each_pair do |key, value|
+ *        print "#{key}: #{value}\n"
+ *      end
+ *      gdbm.close
+ *
+ *    produces
+ *
+ *      banana: 8
+ *      ananas: 3
+ *      cranberry: 4909
+ *
+ * == Links
+ *
+ * * http://www.gnu.org/software/gdbm/
+ */
+static VALUE rb_cGDBM, rb_eGDBMError, rb_eGDBMFatalError;
+
+#define RUBY_GDBM_RW_BIT 0x20000000
+
+#define MY_BLOCK_SIZE (2048)
+#define MY_FATAL_FUNC rb_gdbm_fatal
+static void
+rb_gdbm_fatal(msg)
+    char *msg;
+{
+    rb_raise(rb_eGDBMFatalError, "%s", msg);
+}
+
+struct dbmdata {
+    int  di_size;
+    GDBM_FILE di_dbm;
+};
+
+static void
+closed_dbm()
+{
+    rb_raise(rb_eRuntimeError, "closed GDBM file");
+}
+
+#define GetDBM(obj, dbmp) do {\
+    Data_Get_Struct(obj, struct dbmdata, dbmp);\
+    if (dbmp == 0) closed_dbm();\
+    if (dbmp->di_dbm == 0) closed_dbm();\
+} while (0)
+
+#define GetDBM2(obj, data, dbm) {\
+    GetDBM(obj, data);\
+    (dbm) = dbmp->di_dbm;\
+}
+
+static void
+free_dbm(dbmp)
+    struct dbmdata *dbmp;
+{
+    if (dbmp) {
+        if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
+        free(dbmp);
+    }
+}
+
+/*
+ * call-seq:
+ *     gdbm.close -> nil
+ *
+ * Closes the associated database file.
+ */
+static VALUE
+fgdbm_close(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+
+    GetDBM(obj, dbmp);
+    gdbm_close(dbmp->di_dbm);
+    dbmp->di_dbm = 0;
+
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *     gdbm.closed?  -> true or false
+ *
+ * Returns true if the associated database file has been closed.
+ */
+static VALUE
+fgdbm_closed(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
+    if (dbmp == 0)
+        return Qtrue;
+    if (dbmp->di_dbm == 0)
+        return Qtrue;
+
+    return Qfalse;
+}
+
+static VALUE fgdbm_s_alloc _((VALUE));
+
+static VALUE
+fgdbm_s_alloc(klass)
+    VALUE klass;
+{
+    return Data_Wrap_Struct(klass, 0, free_dbm, 0);
+}
+
+/*
+ * call-seq:
+ *      GDBM.new(filename, mode = 0666, flags = nil)
+ *
+ * Creates a new GDBM instance by opening a gdbm file named _filename_.
+ * If the file does not exist, a new file with file mode _mode_ will be
+ * created. _flags_ may be one of the following:
+ * * *READER*  - open as a reader
+ * * *WRITER*  - open as a writer
+ * * *WRCREAT* - open as a writer; if the database does not exist, create a new one
+ * * *NEWDB*   - open as a writer; overwrite any existing databases
+ *
+ * The values *WRITER*, *WRCREAT* and *NEWDB* may be combined with the following
+ * values by bitwise or:
+ * * *SYNC*    - cause all database operations to be synchronized to the disk
+ * * *NOLOCK*  - do not lock the database file
+ *
+ * If no _flags_ are specified, the GDBM object will try to open the database
+ * file as a writer and will create it if it does not already exist
+ * (cf. flag <tt>WRCREAT</tt>). If this fails (for instance, if another process
+ * has already opened the database as a reader), it will try to open the
+ * database file as a reader (cf. flag <tt>READER</tt>).
+ */
+static VALUE
+fgdbm_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE file, vmode, vflags;
+    GDBM_FILE dbm;
+    struct dbmdata *dbmp;
+    int mode, flags = 0;
+
+    if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) {
+        mode = 0666;            /* default value */
+    }
+    else if (NIL_P(vmode)) {
+        mode = -1;              /* return nil if DB does not exist */
+    }
+    else {
+        mode = NUM2INT(vmode);
+    }
+
+    if (!NIL_P(vflags))
+        flags = NUM2INT(vflags);
+
+    SafeStringValue(file);
+
+    if (flags & RUBY_GDBM_RW_BIT) {
+        flags &= ~RUBY_GDBM_RW_BIT;
+	dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
+			flags, mode, MY_FATAL_FUNC);
+    }
+    else {
+        dbm = 0;
+        if (mode >= 0)
+            dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
+                            GDBM_WRCREAT|flags, mode, MY_FATAL_FUNC);
+        if (!dbm)
+            dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
+                            GDBM_WRITER|flags, 0, MY_FATAL_FUNC);
+        if (!dbm)
+            dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
+                            GDBM_READER|flags, 0, MY_FATAL_FUNC);
+    }
+
+    if (!dbm) {
+	if (mode == -1) return Qnil;
+
+	if (gdbm_errno == GDBM_FILE_OPEN_ERROR ||
+	    gdbm_errno == GDBM_CANT_BE_READER ||
+	    gdbm_errno == GDBM_CANT_BE_WRITER)
+	    rb_sys_fail(RSTRING(file)->ptr);
+	else
+	    rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+    }
+
+    dbmp = ALLOC(struct dbmdata);
+    free_dbm(DATA_PTR(obj));
+    DATA_PTR(obj) = dbmp;
+    dbmp->di_dbm = dbm;
+    dbmp->di_size = -1;
+
+    return obj;
+}
+
+/*
+ * call-seq:
+ *      GDBM.open(filename, mode = 0666, flags = nil)
+ *      GDBM.open(filename, mode = 0666, flags = nil) { |gdbm| ... }
+ *
+ * If called without a block, this is synonymous to GDBM::new.
+ * If a block is given, the new GDBM instance will be passed to the block
+ * as a parameter, and the corresponding database file will be closed
+ * after the execution of the block code has been finished.
+ *
+ * Example for an open call with a block:
+ *
+ *   require 'gdbm'
+ *   GDBM.open("fruitstore.db") do |gdbm|
+ *     gdbm.each_pair do |key, value|
+ *       print "#{key}: #{value}\n"
+ *     end
+ *   end
+ */
+static VALUE
+fgdbm_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
+
+    if (NIL_P(fgdbm_initialize(argc, argv, obj))) {
+	return Qnil;
+    }
+
+    if (rb_block_given_p()) {
+        return rb_ensure(rb_yield, obj, fgdbm_close, obj);
+    }
+
+    return obj;
+}
+
+static VALUE
+rb_gdbm_fetch(dbm, key)
+    GDBM_FILE dbm;
+    datum key;
+{
+    datum val;
+    VALUE str;
+
+    val = gdbm_fetch(dbm, key);
+    if (val.dptr == 0)
+        return Qnil;
+
+    str = rb_obj_alloc(rb_cString);
+    RSTRING(str)->len = val.dsize;
+    RSTRING(str)->aux.capa = val.dsize;
+    RSTRING(str)->ptr = REALLOC_N(val.dptr,char,val.dsize+1);
+    RSTRING(str)->ptr[val.dsize] = '\0';
+
+    OBJ_TAINT(str);
+    return (VALUE)str;
+}
+
+static VALUE
+rb_gdbm_fetch2(dbm, keystr)
+    GDBM_FILE dbm;
+    VALUE keystr;
+{
+    datum key;
+
+    StringValue(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    return rb_gdbm_fetch(dbm, key);
+}
+
+static VALUE
+rb_gdbm_fetch3(obj, keystr)
+    VALUE obj, keystr;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+
+    GetDBM2(obj, dbmp, dbm);
+    return rb_gdbm_fetch2(dbm, keystr);
+}
+
+static VALUE
+rb_gdbm_firstkey(dbm)
+    GDBM_FILE dbm;
+{
+    datum key;
+    VALUE str;
+
+    key = gdbm_firstkey(dbm);
+    if (key.dptr == 0)
+        return Qnil;
+
+    str = rb_obj_alloc(rb_cString);
+    RSTRING(str)->len = key.dsize;
+    RSTRING(str)->aux.capa = key.dsize;
+    RSTRING(str)->ptr = REALLOC_N(key.dptr,char,key.dsize+1);
+    RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+
+    OBJ_TAINT(str);
+    return str;
+}
+
+static VALUE
+rb_gdbm_nextkey(dbm, keystr)
+    GDBM_FILE dbm;
+    VALUE keystr;
+{
+    datum key, key2;
+    VALUE str;
+
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+    key2 = gdbm_nextkey(dbm, key);
+    if (key2.dptr == 0)
+        return Qnil;
+
+    str = rb_obj_alloc(rb_cString);
+    RSTRING(str)->len = key2.dsize;
+    RSTRING(str)->aux.capa = key2.dsize;
+    RSTRING(str)->ptr = REALLOC_N(key2.dptr,char,key2.dsize+1);
+    RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+
+    OBJ_TAINT(str);
+    return str;
+}
+
+static VALUE
+fgdbm_fetch(obj, keystr, ifnone)
+    VALUE obj, keystr, ifnone;
+{
+    VALUE valstr;
+
+    valstr = rb_gdbm_fetch3(obj, keystr);
+    if (NIL_P(valstr)) {
+	if (ifnone == Qnil && rb_block_given_p())
+	    return rb_yield(keystr);
+	return ifnone;
+    }
+    return valstr;
+}
+
+/*
+ * call-seq:
+ *      gdbm[key] -> value
+ *
+ * Retrieves the _value_ corresponding to _key_.
+ */
+static VALUE
+fgdbm_aref(obj, keystr)
+    VALUE obj, keystr;
+{
+    return rb_gdbm_fetch3(obj, keystr);
+}
+
+/*
+ * call-seq:
+ *      gdbm.fetch(key [, default]) -> value
+ *
+ * Retrieves the _value_ corresponding to _key_. If there is no value
+ * associated with _key_, _default_ will be returned instead.
+ */
+static VALUE
+fgdbm_fetch_m(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE keystr, valstr, ifnone;
+
+    rb_scan_args(argc, argv, "11", &keystr, &ifnone);
+    valstr = fgdbm_fetch(obj, keystr, ifnone);
+    if (argc == 1 && !rb_block_given_p() && NIL_P(valstr))
+        rb_raise(rb_eIndexError, "key not found");
+
+    return valstr;
+}
+
+/*
+ * call-seq:
+ *      gdbm.index(value) -> key
+ *
+ * Returns the _key_ for a given _value_. If several keys may map to the
+ * same value, the key that is found first will be returned.
+ */
+static VALUE
+fgdbm_index(obj, valstr)
+    VALUE obj, valstr;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    VALUE keystr, valstr2;
+
+    StringValue(valstr);
+    GetDBM2(obj, dbmp, dbm);
+    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+         keystr = rb_gdbm_nextkey(dbm, keystr)) {
+
+	valstr2 = rb_gdbm_fetch2(dbm, keystr);
+        if (!NIL_P(valstr2) &&
+            RSTRING(valstr)->len == RSTRING(valstr2)->len &&
+            memcmp(RSTRING(valstr)->ptr, RSTRING(valstr2)->ptr,
+                   RSTRING(valstr)->len) == 0) {
+	    return keystr;
+        }
+    }
+    return Qnil;
+}
+
+static VALUE
+fgdbm_indexes(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE new;
+    int i;
+
+    new = rb_ary_new2(argc);
+    for (i=0; i<argc; i++) {
+	rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
+    }
+
+    return new;
+}
+
+/*
+ * call-seq:
+ *      gdbm.select { |value| block } -> array
+ *
+ * Returns a new array of all values of the database for which _block_
+ * evaluates to true.
+ */
+static VALUE
+fgdbm_select(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE new = rb_ary_new2(argc);
+    int i;
+
+    if (rb_block_given_p()) {
+        GDBM_FILE dbm;
+        struct dbmdata *dbmp;
+        VALUE keystr;
+
+	if (argc > 0) {
+	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
+	}
+        GetDBM2(obj, dbmp, dbm);
+        for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+             keystr = rb_gdbm_nextkey(dbm, keystr)) {
+            VALUE assoc = rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr));
+	    VALUE v = rb_yield(assoc);
+
+	    if (RTEST(v)) {
+		rb_ary_push(new, assoc);
+	    }
+	    GetDBM2(obj, dbmp, dbm);
+        }
+    }
+    else {
+	rb_warn("GDBM#select(index..) is deprecated; use GDBM#values_at");
+
+        for (i=0; i<argc; i++) {
+            rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
+        }
+    }
+
+    return new;
+}
+
+/*
+ * call-seq:
+ *      gdbm.values_at(key, ...) -> array
+ *
+ * Returns an array of the values associated with each specified _key_.
+ */
+static VALUE
+fgdbm_values_at(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE new = rb_ary_new2(argc);
+    int i;
+
+    for (i=0; i<argc; i++) {
+        rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
+    }
+
+    return new;
+}
+
+static void
+rb_gdbm_modify(obj)
+    VALUE obj;
+{
+    rb_secure(4);
+    if (OBJ_FROZEN(obj)) rb_error_frozen("GDBM");
+}
+
+static VALUE
+rb_gdbm_delete(obj, keystr)
+    VALUE obj, keystr;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+
+    rb_gdbm_modify(obj);
+    StringValue(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    if (!gdbm_exists(dbm, key)) {
+        return Qnil;
+    }
+
+    if (gdbm_delete(dbm, key)) {
+        dbmp->di_size = -1;
+        rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+    }
+    else if (dbmp->di_size >= 0) {
+        dbmp->di_size--;
+    }
+    return obj;
+}
+
+/*
+ * call-seq:
+ *      gdbm.delete(key) -> value or nil
+ *
+ * Removes the key-value-pair with the specified _key_ from this database and
+ * returns the corresponding _value_. Returns nil if the database is empty.
+ */
+static VALUE
+fgdbm_delete(obj, keystr)
+    VALUE obj, keystr;
+{
+    VALUE valstr;
+
+    valstr = fgdbm_fetch(obj, keystr, Qnil);
+    rb_gdbm_delete(obj, keystr);
+    return valstr;
+}
+
+/*
+ * call-seq:
+ *      gdbm.shift -> (key, value) or nil
+ *
+ * Removes a key-value-pair from this database and returns it as a 
+ * two-item array [ _key_, _value_ ]. Returns nil if the database is empty.
+ */
+static VALUE
+fgdbm_shift(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    VALUE keystr, valstr;
+
+    rb_gdbm_modify(obj);
+    GetDBM2(obj, dbmp, dbm);
+    keystr = rb_gdbm_firstkey(dbm);
+    if (NIL_P(keystr)) return Qnil;
+    valstr = rb_gdbm_fetch2(dbm, keystr);
+    rb_gdbm_delete(obj, keystr);
+
+    return rb_assoc_new(keystr, valstr);
+}
+
+/*
+ * call-seq:
+ *      gdbm.delete_if { |key, value| block } -> gdbm
+ *      gdbm.reject! { |key, value| block } -> gdbm
+ *
+ * Deletes every key-value pair from _gdbm_ for which _block_ evaluates to true.
+ */
+static VALUE
+fgdbm_delete_if(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    VALUE keystr, valstr;
+    VALUE ret, ary = rb_ary_new();
+    int i, status = 0, n;
+
+    rb_gdbm_modify(obj);
+    GetDBM2(obj, dbmp, dbm);
+    n = dbmp->di_size;
+    dbmp->di_size = -1;
+
+    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+         keystr = rb_gdbm_nextkey(dbm, keystr)) {
+
+        valstr = rb_gdbm_fetch2(dbm, keystr);
+        ret = rb_protect(rb_yield, rb_assoc_new(keystr, valstr), &status);
+        if (status != 0) break;
+        if (RTEST(ret)) rb_ary_push(ary, keystr);
+        GetDBM2(obj, dbmp, dbm);
+    }
+
+    for (i = 0; i < RARRAY(ary)->len; i++)
+        rb_gdbm_delete(obj, RARRAY(ary)->ptr[i]);
+    if (status) rb_jump_tag(status);
+    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
+
+    return obj;
+}
+
+/*
+ * call-seq:
+ *      gdbm.clear -> gdbm
+ *
+ * Removes all the key-value pairs within _gdbm_.
+ */
+static VALUE
+fgdbm_clear(obj)
+    VALUE obj;
+{
+    datum key, nextkey;
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+
+    rb_gdbm_modify(obj);
+    GetDBM2(obj, dbmp, dbm);
+    dbmp->di_size = -1;
+
+#if 0
+    while (key = gdbm_firstkey(dbm), key.dptr) {
+        if (gdbm_delete(dbm, key)) {
+            free(key.dptr);
+            rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+        }
+        free(key.dptr); 
+    }
+#else
+    while (key = gdbm_firstkey(dbm), key.dptr) {
+        for (; key.dptr; key = nextkey) {
+            nextkey = gdbm_nextkey(dbm, key);
+            if (gdbm_delete(dbm, key)) {
+                free(key.dptr);
+                if (nextkey.dptr) free(nextkey.dptr);
+                rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+            }
+            free(key.dptr);
+        }
+    }
+#endif
+    dbmp->di_size = 0;
+
+    return obj;
+}
+
+/*
+ * call-seq:
+ *     gdbm.invert  -> hash
+ *
+ * Returns a hash created by using _gdbm_'s values as keys, and the keys
+ * as values.
+ */
+static VALUE
+fgdbm_invert(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    VALUE keystr, valstr;
+    VALUE hash = rb_hash_new();
+
+    GetDBM2(obj, dbmp, dbm);
+    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+         keystr = rb_gdbm_nextkey(dbm, keystr)) {
+	valstr = rb_gdbm_fetch2(dbm, keystr);
+
+	rb_hash_aset(hash, valstr, keystr);
+    }
+    return hash;
+}
+
+static VALUE each_pair _((VALUE));
+
+static VALUE
+each_pair(obj)
+    VALUE obj;
+{
+    return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
+}
+
+static VALUE fgdbm_store _((VALUE,VALUE,VALUE));
+
+static VALUE
+update_i(pair, dbm)
+    VALUE pair, dbm;
+{
+    Check_Type(pair, T_ARRAY);
+    if (RARRAY(pair)->len < 2) {
+	rb_raise(rb_eArgError, "pair must be [key, value]");
+    }
+    fgdbm_store(dbm, RARRAY(pair)->ptr[0], RARRAY(pair)->ptr[1]);
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *     gdbm.update(other) -> gdbm
+ *
+ * Adds the key-value pairs of _other_ to _gdbm_, overwriting entries with
+ * duplicate keys with those from _other_. _other_ must have an each_pair
+ * method.
+ */
+static VALUE
+fgdbm_update(obj, other)
+    VALUE obj, other;
+{
+    rb_iterate(each_pair, other, update_i, obj);
+    return obj;
+}
+
+/*
+ * call-seq:
+ *     gdbm.replace(other) -> gdbm
+ *
+ * Replaces the content of _gdbm_ with the key-value pairs of _other_.
+ * _other_ must have an each_pair method.
+ */
+static VALUE
+fgdbm_replace(obj, other)
+    VALUE obj, other;
+{
+    fgdbm_clear(obj);
+    rb_iterate(each_pair, other, update_i, obj);
+    return obj;
+}
+
+/*
+ * call-seq:
+ *      gdbm[key]= value -> value
+ *      gdbm.store(key, value) -> value
+ *
+ * Associates the value _value_ with the specified _key_.
+ */
+static VALUE
+fgdbm_store(obj, keystr, valstr)
+    VALUE obj, keystr, valstr;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+
+    rb_gdbm_modify(obj);
+    StringValue(keystr);
+    StringValue(valstr);
+
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    dbmp->di_size = -1;
+    if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
+        if (errno == EPERM) rb_sys_fail(0);
+        rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+    }
+
+    return valstr;
+}
+
+/*
+ * call-seq:
+ *      gdbm.length -> fixnum
+ *      gdbm.size -> fixnum
+ *
+ * Returns the number of key-value pairs in this database.
+ */
+static VALUE
+fgdbm_length(obj)
+    VALUE obj;
+{
+    datum key, nextkey;
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    int i = 0;
+
+    GetDBM2(obj, dbmp, dbm);
+    if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
+
+    for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
+        nextkey = gdbm_nextkey(dbm, key);
+        free(key.dptr);
+	i++;
+    }
+    dbmp->di_size = i;
+
+    return INT2FIX(i);
+}
+
+/*
+ * call-seq:
+ *      gdbm.empty? -> true or false
+ *
+ * Returns true if the database is empty.
+ */
+static VALUE
+fgdbm_empty_p(obj)
+    VALUE obj;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+
+    GetDBM(obj, dbmp);
+    if (dbmp->di_size < 0) {
+	dbm = dbmp->di_dbm;
+
+	key = gdbm_firstkey(dbm);
+        if (key.dptr) {
+            free(key.dptr);
+            return Qfalse;
+	}
+        return Qtrue;
+    }
+
+    if (dbmp->di_size == 0) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *      gdbm.each_value { |value| block } -> gdbm
+ *
+ * Executes _block_ for each key in the database, passing the corresponding
+ * _value_ as a parameter.
+ */
+static VALUE
+fgdbm_each_value(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    VALUE keystr;
+
+    GetDBM2(obj, dbmp, dbm);
+    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+         keystr = rb_gdbm_nextkey(dbm, keystr)) {
+
+        rb_yield(rb_gdbm_fetch2(dbm, keystr));
+	GetDBM2(obj, dbmp, dbm);
+    }
+    return obj;
+}
+
+/*
+ * call-seq:
+ *      gdbm.each_key { |key| block } -> gdbm
+ *
+ * Executes _block_ for each key in the database, passing the
+ * _key_ as a parameter.
+ */
+static VALUE
+fgdbm_each_key(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    VALUE keystr;
+
+    GetDBM2(obj, dbmp, dbm);
+    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+         keystr = rb_gdbm_nextkey(dbm, keystr)) {
+
+        rb_yield(keystr);
+	GetDBM2(obj, dbmp, dbm);
+    }
+    return obj;
+}
+
+/*
+ * call-seq:
+ *      gdbm.each_pair { |key, value| block } -> gdbm
+ *
+ * Executes _block_ for each key in the database, passing the _key_ and the
+ * correspoding _value_ as a parameter.
+ */
+static VALUE
+fgdbm_each_pair(obj)
+    VALUE obj;
+{
+    GDBM_FILE dbm;
+    struct dbmdata *dbmp;
+    VALUE keystr;
+
+    GetDBM2(obj, dbmp, dbm);
+    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+         keystr = rb_gdbm_nextkey(dbm, keystr)) {
+
+        rb_yield(rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr)));
+        GetDBM2(obj, dbmp, dbm);
+    }
+
+    return obj;
+}
+
+/*
+ * call-seq:
+ *      gdbm.keys -> array
+ *
+ * Returns an array of all keys of this database.
+ */
+static VALUE
+fgdbm_keys(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    VALUE keystr, ary;
+
+    GetDBM2(obj, dbmp, dbm);
+    ary = rb_ary_new();
+    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+         keystr = rb_gdbm_nextkey(dbm, keystr)) {
+
+        rb_ary_push(ary, keystr);
+    }
+
+    return ary;
+}
+
+/*
+ * call-seq:
+ *      gdbm.values -> array
+ *
+ * Returns an array of all values of this database.
+ */
+static VALUE
+fgdbm_values(obj)
+    VALUE obj;
+{
+    datum key, nextkey;
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    VALUE valstr, ary;
+
+    GetDBM2(obj, dbmp, dbm);
+    ary = rb_ary_new();
+    for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
+        nextkey = gdbm_nextkey(dbm, key);
+        valstr = rb_gdbm_fetch(dbm, key);
+        free(key.dptr);
+        rb_ary_push(ary, valstr);
+    }
+
+    return ary;
+}
+
+/*
+ * call-seq:
+ *      gdbm.has_key?(k) -> true or false
+ *      gdbm.key?(k) -> true or false
+ *
+ * Returns true if the given key _k_ exists within the database.
+ * Returns false otherwise.
+ */
+static VALUE
+fgdbm_has_key(obj, keystr)
+    VALUE obj, keystr;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+
+    StringValue(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    if (gdbm_exists(dbm, key))
+        return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *      gdbm.has_value?(v) -> true or false
+ *      gdbm.value?(v) -> true or false
+ *
+ * Returns true if the given value _v_ exists within the database.
+ * Returns false otherwise.
+ */
+static VALUE
+fgdbm_has_value(obj, valstr)
+    VALUE obj, valstr;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    VALUE keystr, valstr2;
+
+    StringValue(valstr);
+    GetDBM2(obj, dbmp, dbm);
+    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+         keystr = rb_gdbm_nextkey(dbm, keystr)) {
+
+	valstr2 = rb_gdbm_fetch2(dbm, keystr);
+
+        if (!NIL_P(valstr2) &&
+            RSTRING(valstr)->len == RSTRING(valstr2)->len &&
+            memcmp(RSTRING(valstr)->ptr, RSTRING(valstr2)->ptr,
+                   RSTRING(valstr)->len) == 0) {
+	    return Qtrue;
+        }
+    }
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *     gdbm.to_a -> array
+ *
+ * Returns an array of all key-value pairs contained in the database.
+ */
+static VALUE
+fgdbm_to_a(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    VALUE keystr, ary;
+
+    GetDBM2(obj, dbmp, dbm);
+    ary = rb_ary_new();
+    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+         keystr = rb_gdbm_nextkey(dbm, keystr)) {
+
+        rb_ary_push(ary, rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr)));
+    }
+
+    return ary;
+}
+
+/*
+ * call-seq:
+ *     gdbm.reorganize -> gdbm
+ *
+ * Reorganizes the database file. This operation removes reserved space of
+ * elements that have already been deleted. It is only useful after a lot of
+ * deletions in the database.
+ */
+static VALUE
+fgdbm_reorganize(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+
+    rb_gdbm_modify(obj);
+    GetDBM2(obj, dbmp, dbm);
+    gdbm_reorganize(dbm);
+    return obj;
+}
+
+/*
+ * call-seq:
+ *     gdbm.sync -> gdbm
+ *
+ * Unless the _gdbm_ object has been opened with the *SYNC* flag, it is not
+ * guarenteed that database modification operations are immediately applied to
+ * the database file. This method ensures that all recent modifications
+ * to the database are written to the file. Blocks until all writing operations
+ * to the disk have been finished.
+ */
+static VALUE
+fgdbm_sync(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+
+    rb_gdbm_modify(obj);
+    GetDBM2(obj, dbmp, dbm);
+    gdbm_sync(dbm);
+    return obj;
+}
+
+/*
+ * call-seq:
+ *     gdbm.cachesize = size -> size
+ *
+ * Sets the size of the internal bucket cache to _size_.
+ */
+static VALUE
+fgdbm_set_cachesize(obj, val)
+    VALUE obj, val;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    int optval;
+
+    GetDBM2(obj, dbmp, dbm);
+    optval = FIX2INT(val);
+    if (gdbm_setopt(dbm, GDBM_CACHESIZE, &optval, sizeof(optval)) == -1) {
+        rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+    }
+    return val;
+}
+
+/*
+ * call-seq:
+ *     gdbm.fastmode = boolean -> boolean
+ *
+ * Turns the database's fast mode on or off. If fast mode is turned on, gdbm
+ * does not wait for writes to be flushed to the disk before continuing.
+ *
+ * This option is obsolete for gdbm >= 1.8 since fast mode is turned on by
+ * default. See also: #syncmode=
+ */
+static VALUE
+fgdbm_set_fastmode(obj, val)
+    VALUE obj, val;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    int optval;
+
+    GetDBM2(obj, dbmp, dbm);
+    optval = 0;
+    if (RTEST(val))
+        optval = 1;
+
+    if (gdbm_setopt(dbm, GDBM_FASTMODE, &optval, sizeof(optval)) == -1) {
+        rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+    }
+    return val;
+}
+
+/*
+ * call-seq:
+ *     gdbm.syncmode = boolean -> boolean
+ *
+ * Turns the database's synchronization mode on or off. If the synchronization
+ * mode is turned on, the database's in-memory state will be synchronized to
+ * disk after every database modification operation. If the synchronization
+ * mode is turned off, GDBM does not wait for writes to be flushed to the disk
+ * before continuing.
+ *
+ * This option is only available for gdbm >= 1.8 where syncmode is turned off
+ * by default. See also: #fastmode=
+ */
+static VALUE
+fgdbm_set_syncmode(obj, val)
+    VALUE obj, val;
+{
+#if !defined(GDBM_SYNCMODE)
+    fgdbm_set_fastmode(obj, RTEST(val) ? Qfalse : Qtrue);
+    return val;
+#else
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    int optval;
+
+    GetDBM2(obj, dbmp, dbm);
+    optval = 0;
+    if (RTEST(val))
+        optval = 1;
+
+    if (gdbm_setopt(dbm, GDBM_FASTMODE, &optval, sizeof(optval)) == -1) {
+        rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+    }
+    return val;
+#endif
+}
+
+/*
+ * call-seq:
+ *     gdbm.to_hash -> hash
+ *
+ * Returns a hash of all key-value pairs contained in the database.
+ */
+static VALUE
+fgdbm_to_hash(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+    VALUE keystr, hash;
+
+    GetDBM2(obj, dbmp, dbm);
+    hash = rb_hash_new();
+    for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
+         keystr = rb_gdbm_nextkey(dbm, keystr)) {
+
+        rb_hash_aset(hash, keystr, rb_gdbm_fetch2(dbm, keystr));
+    }
+
+    return hash;
+}
+
+/*
+ * call-seq:
+ *      gdbm.reject { |key, value| block } -> hash
+ *
+ * Returns a hash copy of _gdbm_ where all key-value pairs from _gdbm_ for
+ * which _block_ evaluates to true are removed. See also: #delete_if
+ */
+static VALUE
+fgdbm_reject(obj)
+    VALUE obj;
+{
+    return rb_hash_delete_if(fgdbm_to_hash(obj));
+}
+
+void
+Init_gdbm()
+{
+    rb_cGDBM = rb_define_class("GDBM", rb_cObject);
+    rb_eGDBMError = rb_define_class("GDBMError", rb_eStandardError);
+    rb_eGDBMFatalError = rb_define_class("GDBMFatalError", rb_eException);
+    rb_include_module(rb_cGDBM, rb_mEnumerable);
+
+    rb_define_alloc_func(rb_cGDBM, fgdbm_s_alloc);
+    rb_define_singleton_method(rb_cGDBM, "open", fgdbm_s_open, -1);
+
+    rb_define_method(rb_cGDBM, "initialize", fgdbm_initialize, -1);
+    rb_define_method(rb_cGDBM, "close", fgdbm_close, 0);
+    rb_define_method(rb_cGDBM, "closed?", fgdbm_closed, 0);
+    rb_define_method(rb_cGDBM, "[]", fgdbm_aref, 1);
+    rb_define_method(rb_cGDBM, "fetch", fgdbm_fetch_m, -1);
+    rb_define_method(rb_cGDBM, "[]=", fgdbm_store, 2);
+    rb_define_method(rb_cGDBM, "store", fgdbm_store, 2);
+    rb_define_method(rb_cGDBM, "index",  fgdbm_index, 1);
+    rb_define_method(rb_cGDBM, "indexes",  fgdbm_indexes, -1);
+    rb_define_method(rb_cGDBM, "indices",  fgdbm_indexes, -1);
+    rb_define_method(rb_cGDBM, "select",  fgdbm_select, -1);
+    rb_define_method(rb_cGDBM, "values_at",  fgdbm_values_at, -1);
+    rb_define_method(rb_cGDBM, "length", fgdbm_length, 0);
+    rb_define_method(rb_cGDBM, "size", fgdbm_length, 0);
+    rb_define_method(rb_cGDBM, "empty?", fgdbm_empty_p, 0);
+    rb_define_method(rb_cGDBM, "each", fgdbm_each_pair, 0);
+    rb_define_method(rb_cGDBM, "each_value", fgdbm_each_value, 0);
+    rb_define_method(rb_cGDBM, "each_key", fgdbm_each_key, 0);
+    rb_define_method(rb_cGDBM, "each_pair", fgdbm_each_pair, 0);
+    rb_define_method(rb_cGDBM, "keys", fgdbm_keys, 0);
+    rb_define_method(rb_cGDBM, "values", fgdbm_values, 0);
+    rb_define_method(rb_cGDBM, "shift", fgdbm_shift, 0);
+    rb_define_method(rb_cGDBM, "delete", fgdbm_delete, 1);
+    rb_define_method(rb_cGDBM, "delete_if", fgdbm_delete_if, 0);
+    rb_define_method(rb_cGDBM, "reject!", fgdbm_delete_if, 0);
+    rb_define_method(rb_cGDBM, "reject", fgdbm_reject, 0);
+    rb_define_method(rb_cGDBM, "clear", fgdbm_clear, 0);
+    rb_define_method(rb_cGDBM, "invert", fgdbm_invert, 0);
+    rb_define_method(rb_cGDBM, "update", fgdbm_update, 1);
+    rb_define_method(rb_cGDBM, "replace", fgdbm_replace, 1);
+    rb_define_method(rb_cGDBM, "reorganize", fgdbm_reorganize, 0);
+    rb_define_method(rb_cGDBM, "sync", fgdbm_sync, 0);
+    /* rb_define_method(rb_cGDBM, "setopt", fgdbm_setopt, 2); */
+    rb_define_method(rb_cGDBM, "cachesize=", fgdbm_set_cachesize, 1);
+    rb_define_method(rb_cGDBM, "fastmode=", fgdbm_set_fastmode, 1);
+    rb_define_method(rb_cGDBM, "syncmode=", fgdbm_set_syncmode, 1);
+
+    rb_define_method(rb_cGDBM, "include?", fgdbm_has_key, 1);
+    rb_define_method(rb_cGDBM, "has_key?", fgdbm_has_key, 1);
+    rb_define_method(rb_cGDBM, "member?", fgdbm_has_key, 1);
+    rb_define_method(rb_cGDBM, "has_value?", fgdbm_has_value, 1);
+    rb_define_method(rb_cGDBM, "key?", fgdbm_has_key, 1);
+    rb_define_method(rb_cGDBM, "value?", fgdbm_has_value, 1);
+
+    rb_define_method(rb_cGDBM, "to_a", fgdbm_to_a, 0);
+    rb_define_method(rb_cGDBM, "to_hash", fgdbm_to_hash, 0);
+
+    /* flag for #new and #open: open database as a reader */
+    rb_define_const(rb_cGDBM, "READER",  INT2FIX(GDBM_READER|RUBY_GDBM_RW_BIT));
+    /* flag for #new and #open: open database as a writer */
+    rb_define_const(rb_cGDBM, "WRITER",  INT2FIX(GDBM_WRITER|RUBY_GDBM_RW_BIT));
+    /* flag for #new and #open: open database as a writer; if the database does not exist, create a new one */
+    rb_define_const(rb_cGDBM, "WRCREAT", INT2FIX(GDBM_WRCREAT|RUBY_GDBM_RW_BIT));
+    /* flag for #new and #open: open database as a writer; overwrite any existing databases  */
+    rb_define_const(rb_cGDBM, "NEWDB",   INT2FIX(GDBM_NEWDB|RUBY_GDBM_RW_BIT));
+
+    /* flag for #new and #open. this flag is obsolete for gdbm >= 1.8 */
+    rb_define_const(rb_cGDBM, "FAST", INT2FIX(GDBM_FAST));
+    /* this flag is obsolete in gdbm 1.8.
+       On gdbm 1.8, fast mode is default behavior. */
+
+    /* gdbm version 1.8 specific */
+#if defined(GDBM_SYNC)
+    /* flag for #new and #open. only for gdbm >= 1.8 */
+    rb_define_const(rb_cGDBM, "SYNC",    INT2FIX(GDBM_SYNC));
+#endif
+#if defined(GDBM_NOLOCK)
+    /* flag for #new and #open */
+    rb_define_const(rb_cGDBM, "NOLOCK",  INT2FIX(GDBM_NOLOCK));
+#endif
+    /* version of the gdbm library*/
+    rb_define_const(rb_cGDBM, "VERSION",  rb_str_new2(gdbm_version));
+}
diff --git a/ruby_1_8_6/ext/iconv/.cvsignore b/ruby_1_8_6/ext/iconv/.cvsignore
new file mode 100644
index 0000000000..394787fced
--- /dev/null
+++ b/ruby_1_8_6/ext/iconv/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+mkmf.log
+*.def
+iconv.rb
+config.charset
diff --git a/ruby_1_8_6/ext/iconv/charset_alias.rb b/ruby_1_8_6/ext/iconv/charset_alias.rb
new file mode 100644
index 0000000000..aed4644290
--- /dev/null
+++ b/ruby_1_8_6/ext/iconv/charset_alias.rb
@@ -0,0 +1,103 @@
+#! /usr/bin/ruby
+# :stopdoc:
+require 'rbconfig'
+require 'optparse'
+
+# http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset
+# Fri, 30 May 2003 00:09:00 GMT'
+
+OS = Config::CONFIG["target_os"]
+SHELL = Config::CONFIG['SHELL']
+
+class Hash::Ordered < Hash
+  def [](key)
+    val = super and val.last
+  end
+  def []=(key, val)
+    ary = fetch(key) {return super(key, [self.size, key, val])} and
+      ary << val
+  end
+  def sort
+    values.sort.collect {|i, *rest| rest}
+  end
+  def each(&block)
+    sort.each(&block)
+  end
+end
+
+def charset_alias(config_charset, mapfile, target = OS)
+  map = Hash::Ordered.new
+  comments = []
+  open(config_charset) do |input|
+    input.find {|line| /^case "\$os" in/ =~ line} or break
+    input.find {|line|
+      /^\s*([-\w\*]+(?:\s*\|\s*[-\w\*]+)*)(?=\))/ =~ line and
+      $&.split('|').any? {|pattern| File.fnmatch?(pattern.strip, target)}
+    } or break
+    input.find do |line|
+      case line
+      when /^\s*echo "(?:\$\w+\.)?([-\w*]+)\s+([-\w]+)"/
+        sys, can = $1, $2
+        can.downcase!
+        map[can] = sys
+        false
+      when /^\s*;;/
+        true
+      else
+        false
+      end
+    end
+  end
+  case target
+  when /linux|-gnu/
+    # map.delete('ascii')
+  when /cygwin|os2-emx/
+    # get rid of tilde/yen problem.
+    map['shift_jis'] = 'cp932'
+  end
+  st = Hash.new(0)
+  map = map.sort.collect do |can, *sys|
+    if sys.grep(/^en_us(?=.|$)/i) {break true} == true
+      noen = %r"^(?!en_us)\w+_\w+#{Regexp.new($')}$"i #"
+      sys.reject! {|s| noen =~ s}
+    end
+    sys = sys.first
+    st[sys] += 1
+    [can, sys]
+  end
+  st.delete_if {|sys, i| i == 1}.empty?
+  st.keys.each {|sys| st[sys] = nil}
+  st.default = nil
+  writer = proc do |f|
+    f.puts("require 'iconv.so'")
+    f.puts
+    f.puts(comments)
+    f.puts("class Iconv")
+    i = 0
+    map.each do |can, sys|
+      if s = st[sys]
+        sys = s
+      elsif st.key?(sys)
+        sys = (st[sys] = "sys#{i+=1}") + " = '#{sys}'.freeze"
+      else
+        sys = "'#{sys}'.freeze"
+      end
+      f.puts("  charset_map['#{can}'] = #{sys}")
+    end
+    f.puts("end")
+  end
+  if mapfile
+    open(mapfile, "w", &writer)
+  else
+    writer[STDOUT]
+  end
+end
+
+target = OS
+opt = nil
+ARGV.options do |opt|
+  opt.banner << " config.status map.rb"
+  opt.on("--target OS") {|t| target = t}
+  opt.parse! and (1..2) === ARGV.size
+end or abort opt.to_s
+charset_alias(ARGV[0], ARGV[1], target)
diff --git a/ruby_1_8_6/ext/iconv/depend b/ruby_1_8_6/ext/iconv/depend
new file mode 100644
index 0000000000..688ddd97b7
--- /dev/null
+++ b/ruby_1_8_6/ext/iconv/depend
@@ -0,0 +1,2 @@
+iconv.o: iconv.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
+  $(hdrdir)/intern.h
diff --git a/ruby_1_8_6/ext/iconv/extconf.rb b/ruby_1_8_6/ext/iconv/extconf.rb
new file mode 100644
index 0000000000..a9d0cfb5e6
--- /dev/null
+++ b/ruby_1_8_6/ext/iconv/extconf.rb
@@ -0,0 +1,51 @@
+require 'mkmf'
+
+dir_config("iconv")
+
+conf = File.exist?(File.join($srcdir, "config.charset"))
+conf = with_config("config-charset", enable_config("config-charset", conf))
+
+if have_func("iconv", "iconv.h") or
+    have_library("iconv", "iconv", "iconv.h")
+  if checking_for("const of iconv() 2nd argument") do
+      create_tmpsrc(cpp_include("iconv.h") + "---> iconv(cd,0,0,0,0) <---")
+      src = xpopen(cpp_command("")) {|f|f.read}
+      if !(func = src[/^--->\s*(\w+).*\s*<---/, 1])
+        Logging::message "iconv function name not found"
+        false
+      elsif !(second = src[%r"\b#{func}\s*\(.*?,(.*?),.*?\)\s*;"m, 1])
+        Logging::message "prototype for #{func}() not found"
+        false
+      else
+        Logging::message $&+"\n"
+        /\bconst\b/ =~ second
+      end
+    end
+    $defs.push('-DICONV_INPTR_CONST')
+  end
+  if conf
+    prefix = '$(srcdir)'
+    prefix =  $nmake ? "{#{prefix}}" : "#{prefix}/"
+    if $extout
+      wrapper = "$(RUBYARCHDIR)/iconv.rb"
+    else
+      wrapper = "./iconv.rb"
+      $INSTALLFILES = [[wrapper, "$(RUBYARCHDIR)"]]
+    end
+    if String === conf
+      require 'uri'
+      scheme = URI.parse(conf).scheme
+    else
+      conf = "$(srcdir)/config.charset"
+    end
+    $cleanfiles << wrapper
+  end
+  create_makefile("iconv")
+  if conf
+    open("Makefile", "a") do |mf|
+      mf.print("\nall: #{wrapper}\n\n#{wrapper}: #{prefix}charset_alias.rb")
+      mf.print(" ", conf) unless scheme
+      mf.print("\n\t$(RUBY) $(srcdir)/charset_alias.rb #{conf} $@\n")
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/iconv/iconv.c b/ruby_1_8_6/ext/iconv/iconv.c
new file mode 100644
index 0000000000..65fed33bd2
--- /dev/null
+++ b/ruby_1_8_6/ext/iconv/iconv.c
@@ -0,0 +1,910 @@
+/* -*- mode:c; c-file-style:"ruby" -*- */
+/**********************************************************************
+
+  iconv.c -
+
+  $Author$
+  $Date$
+  created at: Wed Dec  1 20:28:09 JST 1999
+
+  All the files in this distribution are covered under the Ruby's
+  license (see the file COPYING).
+
+  Documentation by Yukihiro Matsumoto and Gavin Sinclair.
+
+**********************************************************************/
+
+#include "ruby.h"
+#include <errno.h>
+#include <iconv.h>
+#include <assert.h>
+#include "st.h"
+#include "intern.h"
+
+/*
+ * Document-class: Iconv
+ *
+ * == Summary
+ *
+ * Ruby extension for charset conversion.
+ * 
+ * == Abstract
+ *
+ * Iconv is a wrapper class for the UNIX 95 <tt>iconv()</tt> function family,
+ * which translates string between various encoding systems.
+ * 
+ * See Open Group's on-line documents for more details.
+ * * <tt>iconv.h</tt>:       http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.h.html
+ * * <tt>iconv_open()</tt>:  http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_open.html
+ * * <tt>iconv()</tt>:       http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html
+ * * <tt>iconv_close()</tt>: http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_close.html
+ * 
+ * Which coding systems are available is platform-dependent.
+ * 
+ * == Examples
+ *
+ * 1. Instantiate a new Iconv and use method Iconv#iconv.
+ *
+ *      cd = Iconv.new(to, from)
+ *      begin
+ *        input.each { |s| output << cd.iconv(s) }
+ *        output << cd.iconv(nil)                   # Don't forget this!
+ *      ensure
+ *        cd.close
+ *      end
+ *
+ * 2. Invoke Iconv.open with a block.
+ *
+ *      Iconv.open(to, from) do |cd|
+ *        input.each { |s| output << cd.iconv(s) }
+ *        output << cd.iconv(nil)
+ *      end
+ *
+ * 3. Shorthand for (2).
+ *
+ *      Iconv.iconv(to, from, *input.to_a)
+ *
+ * 4. Simple conversion between two charsets.
+ *
+ *      converted_text = Iconv.new('iso-8859-15', 'utf-8').iconv(text)
+ */
+
+/* Invalid value for iconv_t is -1 but 0 for VALUE, I hope VALUE is
+   big enough to keep iconv_t */
+#define VALUE2ICONV(v) ((iconv_t)((VALUE)(v) ^ -1))
+#define ICONV2VALUE(c) ((VALUE)(c) ^ -1)
+
+struct iconv_env_t
+{
+    iconv_t cd;
+    int argc;
+    VALUE *argv;
+    VALUE ret;
+    VALUE (*append)_((VALUE, VALUE));
+};
+
+static VALUE rb_eIconvInvalidEncoding;
+static VALUE rb_eIconvFailure;
+static VALUE rb_eIconvIllegalSeq;
+static VALUE rb_eIconvInvalidChar;
+static VALUE rb_eIconvOutOfRange;
+static VALUE rb_eIconvBrokenLibrary;
+
+static ID rb_success, rb_failed;
+static VALUE iconv_fail _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg));
+static VALUE iconv_failure_initialize _((VALUE error, VALUE mesg, VALUE success, VALUE failed));
+static VALUE iconv_failure_success _((VALUE self));
+static VALUE iconv_failure_failed _((VALUE self));
+
+static iconv_t iconv_create _((VALUE to, VALUE from));
+static void iconv_dfree _((void *cd));
+static VALUE iconv_free _((VALUE cd));
+static VALUE iconv_try _((iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen));
+static VALUE rb_str_derive _((VALUE str, const char* ptr, int len));
+static VALUE iconv_convert _((iconv_t cd, VALUE str, int start, int length, struct iconv_env_t* env));
+static VALUE iconv_s_allocate _((VALUE klass));
+static VALUE iconv_initialize _((VALUE self, VALUE to, VALUE from));
+static VALUE iconv_s_open _((VALUE self, VALUE to, VALUE from));
+static VALUE iconv_s_convert _((struct iconv_env_t* env));
+static VALUE iconv_s_iconv _((int argc, VALUE *argv, VALUE self));
+static VALUE iconv_init_state _((VALUE cd));
+static VALUE iconv_finish _((VALUE self));
+static VALUE iconv_iconv _((int argc, VALUE *argv, VALUE self));
+
+static VALUE charset_map;
+
+/*
+ * Document-method: charset_map
+ * call-seq: Iconv.charset_map
+ *
+ * Returns the map from canonical name to system dependent name.
+ */
+static VALUE charset_map_get _((void))
+{
+    return charset_map;
+}
+
+static char *
+map_charset
+#ifdef HAVE_PROTOTYPES
+    (VALUE *code)
+#else /* HAVE_PROTOTYPES */
+    (code)
+    VALUE *code;
+#endif /* HAVE_PROTOTYPES */
+{
+    VALUE val = *code;
+
+    if (RHASH(charset_map)->tbl && RHASH(charset_map)->tbl->num_entries) {
+	VALUE key = rb_funcall2(val, rb_intern("downcase"), 0, 0);
+	StringValuePtr(key);
+	if (st_lookup(RHASH(charset_map)->tbl, key, &val)) {
+	    *code = val;
+	}
+    }
+    return StringValuePtr(*code);
+}
+
+static iconv_t
+iconv_create
+#ifdef HAVE_PROTOTYPES
+    (VALUE to, VALUE from)
+#else /* HAVE_PROTOTYPES */
+    (to, from)
+    VALUE to;
+    VALUE from;
+#endif /* HAVE_PROTOTYPES */
+{
+    const char* tocode = map_charset(&to);
+    const char* fromcode = map_charset(&from);
+
+    iconv_t cd = iconv_open(tocode, fromcode);
+
+    if (cd == (iconv_t)-1) {
+	switch (errno) {
+	  case EMFILE:
+	  case ENFILE:
+	  case ENOMEM:
+	    rb_gc();
+	    cd = iconv_open(tocode, fromcode);
+	}
+	if (cd == (iconv_t)-1) {
+	    int inval = errno == EINVAL;
+	    char *s = inval ? "invalid encoding " : "iconv";
+	    volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING(to)->len +
+					    RSTRING(from)->len + 8);
+
+	    sprintf(RSTRING(msg)->ptr, "%s(\"%s\", \"%s\")",
+		    s, RSTRING(to)->ptr, RSTRING(from)->ptr);
+	    s = RSTRING(msg)->ptr;
+	    RSTRING(msg)->len = strlen(s);
+	    if (!inval) rb_sys_fail(s);
+	    iconv_fail(rb_eIconvInvalidEncoding,
+		       Qnil, rb_ary_new3(2, to, from), NULL, s);
+	}
+    }
+
+    return cd;
+}
+
+static void
+iconv_dfree
+#ifdef HAVE_PROTOTYPES
+    (void *cd)
+#else /* HAVE_PROTOTYPES */
+    (cd)
+    void *cd;
+#endif /* HAVE_PROTOTYPES */
+{
+    iconv_close(VALUE2ICONV(cd));
+}
+
+#define ICONV_FREE iconv_dfree
+
+static VALUE
+iconv_free
+#ifdef HAVE_PROTOTYPES
+    (VALUE cd)
+#else /* HAVE_PROTOTYPES */
+    (cd)
+    VALUE cd;
+#endif /* HAVE_PROTOTYPES */
+{
+    if (cd && iconv_close(VALUE2ICONV(cd)) == -1)
+	rb_sys_fail("iconv_close");
+    return Qnil;
+}
+
+static VALUE
+check_iconv
+#ifdef HAVE_PROTOTYPES
+    (VALUE obj)
+#else /* HAVE_PROTOTYPES */
+    (obj)
+    VALUE obj;
+#endif /* HAVE_PROTOTYPES */
+{
+    Check_Type(obj, T_DATA);
+    if (RDATA(obj)->dfree != ICONV_FREE) {
+	rb_raise(rb_eArgError, "Iconv expected (%s)", rb_class2name(CLASS_OF(obj)));
+    }
+    return (VALUE)DATA_PTR(obj);
+}
+
+static VALUE
+iconv_try
+#ifdef HAVE_PROTOTYPES
+    (iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)
+#else /* HAVE_PROTOTYPES */
+    (cd, inptr, inlen, outptr, outlen)
+    iconv_t cd;
+    const char **inptr;
+    size_t *inlen;
+    char **outptr;
+    size_t *outlen;
+#endif /* HAVE_PROTOTYPES */
+{
+#ifdef ICONV_INPTR_CONST
+#define ICONV_INPTR_CAST
+#else
+#define ICONV_INPTR_CAST (char **)
+#endif
+    size_t ret;
+
+    errno = 0;
+    ret = iconv(cd, ICONV_INPTR_CAST inptr, inlen, outptr, outlen);
+    if (ret == (size_t)-1) {
+	if (!*inlen)
+	    return Qfalse;
+	switch (errno) {
+	  case E2BIG:
+	    /* try the left in next loop */
+	    break;
+	  case EILSEQ:
+	    return rb_eIconvIllegalSeq;
+	  case EINVAL:
+	    return rb_eIconvInvalidChar;
+	  case 0:
+	    return rb_eIconvBrokenLibrary;
+	  default:
+	    rb_sys_fail("iconv");
+	}
+    }
+    else if (*inlen > 0) {
+	/* something goes wrong */
+	return rb_eIconvIllegalSeq;
+    }
+    else if (ret) {
+	return Qnil;		/* conversion */
+    }
+    return Qfalse;
+}
+
+#define FAILED_MAXLEN 16
+
+static VALUE iconv_failure_initialize
+#ifdef HAVE_PROTOTYPES
+    (VALUE error, VALUE mesg, VALUE success, VALUE failed)
+#else /* HAVE_PROTOTYPES */
+    (error, mesg, success, failed)
+    VALUE error, mesg, success, failed;
+#endif /* HAVE_PROTOTYPES */
+{
+    rb_call_super(1, &mesg);
+    rb_ivar_set(error, rb_success, success);
+    rb_ivar_set(error, rb_failed, failed);
+    return error;
+}
+
+static VALUE
+iconv_fail
+#ifdef HAVE_PROTOTYPES
+    (VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
+#else /* HAVE_PROTOTYPES */
+    (error, success, failed, env, mesg)
+    VALUE error, success, failed;
+    struct iconv_env_t *env;
+    const char *mesg;
+#endif /* HAVE_PROTOTYPES */
+{
+    VALUE args[3];
+
+    if (mesg && *mesg) {
+	args[0] = rb_str_new2(mesg);
+    }
+    else if (TYPE(failed) != T_STRING || RSTRING(failed)->len < FAILED_MAXLEN) {
+	args[0] = rb_inspect(failed);
+    }
+    else {
+	args[0] = rb_inspect(rb_str_substr(failed, 0, FAILED_MAXLEN));
+	rb_str_cat2(args[0], "...");
+    }
+    args[1] = success;
+    args[2] = failed;
+    if (env) {
+	args[1] = env->append(rb_obj_dup(env->ret), success);
+	if (env->argc > 0) {
+	    *(env->argv) = failed;
+	    args[2] = rb_ary_new4(env->argc, env->argv);
+	}
+    }
+    error = rb_class_new_instance(3, args, error);
+    if (!rb_block_given_p()) rb_exc_raise(error);
+    ruby_errinfo = error;
+    return rb_yield(failed);
+}
+
+static VALUE
+rb_str_derive
+#ifdef HAVE_PROTOTYPES
+    (VALUE str, const char* ptr, int len)
+#else /* HAVE_PROTOTYPES */
+    (str, ptr, len)
+    VALUE str;
+    const char *ptr;
+    int len;
+#endif /* HAVE_PROTOTYPES */
+{
+    VALUE ret;
+
+    if (NIL_P(str))
+	return rb_str_new(ptr, len);
+    if (RSTRING(str)->ptr == ptr && RSTRING(str)->len == len)
+	return str;
+    if (RSTRING(str)->ptr + RSTRING(str)->len == ptr + len)
+	ret = rb_str_substr(str, ptr - RSTRING(str)->ptr, len);
+    else
+	ret = rb_str_new(ptr, len);
+    OBJ_INFECT(ret, str);
+    return ret;
+}
+
+static VALUE
+iconv_convert
+#ifdef HAVE_PROTOTYPES
+    (iconv_t cd, VALUE str, int start, int length, struct iconv_env_t* env)
+#else /* HAVE_PROTOTYPES */
+    (cd, str, start, length, env)
+    iconv_t cd;
+    VALUE str;
+    int start;
+    int length;
+    struct iconv_env_t *env;
+#endif /* HAVE_PROTOTYPES */
+{
+    VALUE ret = Qfalse;
+    VALUE error = Qfalse;
+    VALUE rescue;
+    const char *inptr, *instart;
+    size_t inlen;
+    /* I believe ONE CHARACTER never exceed this. */
+    char buffer[BUFSIZ];
+    char *outptr;
+    size_t outlen;
+
+    if (cd == (iconv_t)-1)
+	rb_raise(rb_eArgError, "closed iconv");
+
+    if (NIL_P(str)) {
+	/* Reset output pointer or something. */
+	inptr = "";
+	inlen = 0;
+	outptr = buffer;
+	outlen = sizeof(buffer);
+	error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen);
+	if (RTEST(error)) {
+	    unsigned int i;
+	    rescue = iconv_fail(error, Qnil, Qnil, env, 0);
+	    if (TYPE(rescue) == T_ARRAY) {
+		str = RARRAY(rescue)->len > 0 ? RARRAY(rescue)->ptr[0] : Qnil;
+	    }
+	    if (FIXNUM_P(str) && (i = FIX2INT(str)) <= 0xff) {
+		char c = i;
+		str = rb_str_new(&c, 1);
+	    }
+	    else if (!NIL_P(str)) {
+		StringValue(str);
+	    }
+	}
+
+	inptr = NULL;
+	length = 0;
+    }
+    else {
+	int slen;
+
+	StringValue(str);
+	slen = RSTRING(str)->len;
+	inptr = RSTRING(str)->ptr;
+
+	if (start < 0 ? (start += slen) < 0 : start >= slen)
+	    length = 0;
+	else if (length < 0 && (length += slen + 1) < 0)
+	    length = 0;
+	else if ((length -= start) < 0)
+	    length = 0;
+	else
+	    inptr += start;
+    }
+    instart = inptr;
+    inlen = length;
+
+    do {
+	char errmsg[50];
+	const char *tmpstart = inptr;
+	outptr = buffer;
+	outlen = sizeof(buffer);
+
+	errmsg[0] = 0;
+	error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen);
+
+	if (0 <= outlen && outlen <= sizeof(buffer)) {
+	    outlen = sizeof(buffer) - outlen;
+	    if (NIL_P(error) ||	/* something converted */
+		outlen > inptr - tmpstart || /* input can't contain output */
+		(outlen < inptr - tmpstart && inlen > 0) || /* something skipped */
+		memcmp(buffer, tmpstart, outlen)) /* something differs */
+	    {
+		if (NIL_P(str)) {
+		    ret = rb_str_new(buffer, outlen);
+		}
+		else {
+		    if (ret) {
+			ret = rb_str_buf_cat(ret, instart, tmpstart - instart);
+		    }
+		    else {
+			ret = rb_str_new(instart, tmpstart - instart);
+			OBJ_INFECT(ret, str);
+		    }
+		    ret = rb_str_buf_cat(ret, buffer, outlen);
+		    instart = inptr;
+		}
+	    }
+	    else if (!inlen) {
+		inptr = tmpstart + outlen;
+	    }
+	}
+	else {
+	    /* Some iconv() have a bug, return *outlen out of range */
+	    sprintf(errmsg, "bug?(output length = %ld)", (long)(sizeof(buffer) - outlen));
+	    error = rb_eIconvOutOfRange;
+	}
+
+	if (RTEST(error)) {
+	    long len = 0;
+
+	    if (!ret)
+		ret = rb_str_derive(str, instart, inptr - instart);
+	    else if (inptr > instart)
+		rb_str_cat(ret, instart, inptr - instart);
+	    str = rb_str_derive(str, inptr, inlen);
+	    rescue = iconv_fail(error, ret, str, env, errmsg);
+	    if (TYPE(rescue) == T_ARRAY) {
+		if ((len = RARRAY(rescue)->len) > 0)
+		    rb_str_concat(ret, RARRAY(rescue)->ptr[0]);
+		if (len > 1 && !NIL_P(str = RARRAY(rescue)->ptr[1])) {
+		    StringValue(str);
+		    inlen = length = RSTRING(str)->len;
+		    instart = inptr = RSTRING(str)->ptr;
+		    continue;
+		}
+	    }
+	    else if (!NIL_P(rescue)) {
+		rb_str_concat(ret, rescue);
+	    }
+	    break;
+	}
+    } while (inlen > 0);
+
+    if (!ret)
+	ret = rb_str_derive(str, instart, inptr - instart);
+    else if (inptr > instart)
+	rb_str_cat(ret, instart, inptr - instart);
+    return ret;
+}
+
+static VALUE
+iconv_s_allocate
+#ifdef HAVE_PROTOTYPES
+    (VALUE klass)
+#else /* HAVE_PROTOTYPES */
+    (klass)
+    VALUE klass;
+#endif /* HAVE_PROTOTYPES */
+{
+    return Data_Wrap_Struct(klass, 0, ICONV_FREE, 0);
+}
+
+/*
+ * Document-method: new
+ * call-seq: Iconv.new(to, from)
+ *
+ * Creates new code converter from a coding-system designated with +from+
+ * to another one designated with +to+.
+ * 
+ * === Parameters
+ *
+ * +to+::   encoding name for destination
+ * +from+:: encoding name for source
+ *
+ * === Exceptions
+ *
+ * TypeError::       if +to+ or +from+ aren't String
+ * InvalidEncoding:: if designated converter couldn't find out
+ * SystemCallError:: if <tt>iconv_open(3)</tt> fails
+ */
+static VALUE
+iconv_initialize
+#ifdef HAVE_PROTOTYPES
+    (VALUE self, VALUE to, VALUE from)
+#else /* HAVE_PROTOTYPES */
+    (self, to, from)
+    VALUE self;
+    VALUE to;
+    VALUE from;
+#endif /* HAVE_PROTOTYPES */
+{
+    iconv_free(check_iconv(self));
+    DATA_PTR(self) = NULL;
+    DATA_PTR(self) = (void *)ICONV2VALUE(iconv_create(to, from));
+    return self;
+}
+
+/*
+ * Document-method: open
+ * call-seq: Iconv.open(to, from) { |iconv| ... }
+ *
+ * Equivalent to Iconv.new except that when it is called with a block, it
+ * yields with the new instance and closes it, and returns the result which
+ * returned from the block.
+ */
+static VALUE
+iconv_s_open
+#ifdef HAVE_PROTOTYPES
+    (VALUE self, VALUE to, VALUE from)
+#else /* HAVE_PROTOTYPES */
+    (self, to, from)
+    VALUE self;
+    VALUE to;
+    VALUE from;
+#endif /* HAVE_PROTOTYPES */
+{
+    VALUE cd = ICONV2VALUE(iconv_create(to, from));
+
+    self = Data_Wrap_Struct(self, NULL, ICONV_FREE, (void *)cd);
+    if (rb_block_given_p()) {
+	return rb_ensure(rb_yield, self, (VALUE(*)())iconv_finish, self);
+    }
+    else {
+	return self;
+    }
+}
+
+static VALUE
+iconv_s_convert
+#ifdef HAVE_PROTOTYPES
+    (struct iconv_env_t* env)
+#else /* HAVE_PROTOTYPES */
+    (env)
+    struct iconv_env_t *env;
+#endif /* HAVE_PROTOTYPES */
+{
+    VALUE last = 0;
+
+    for (; env->argc > 0; --env->argc, ++env->argv) {
+	VALUE s = iconv_convert(env->cd, last = *(env->argv), 0, -1, env);
+	env->append(env->ret, s);
+    }
+
+    if (!NIL_P(last)) {
+	VALUE s = iconv_convert(env->cd, Qnil, 0, 0, env);
+	if (RSTRING(s)->len)
+	    env->append(env->ret, s);
+    }
+
+    return env->ret;
+}
+
+/*
+ * Document-method: iconv
+ * call-seq: Iconv.iconv(to, from, *strs)
+ *
+ * Shorthand for
+ *   Iconv.open(to, from) { |cd|
+ *     (strs + [nil]).collect { |s| cd.iconv(s) }
+ *   }
+ *
+ * === Parameters
+ *
+ * <tt>to, from</tt>:: see Iconv.new
+ * <tt>strs</tt>:: strings to be converted
+ *
+ * === Exceptions
+ *
+ * Exceptions thrown by Iconv.new, Iconv.open and Iconv#iconv.
+ */
+static VALUE
+iconv_s_iconv
+#ifdef HAVE_PROTOTYPES
+    (int argc, VALUE *argv, VALUE self)
+#else /* HAVE_PROTOTYPES */
+    (argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+#endif /* HAVE_PROTOTYPES */
+{
+    struct iconv_env_t arg;
+
+    if (argc < 2)		/* needs `to' and `from' arguments at least */
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, 2);
+
+    arg.argc = argc -= 2;
+    arg.argv = argv + 2;
+    arg.append = rb_ary_push;
+    arg.ret = rb_ary_new2(argc);
+    arg.cd = iconv_create(argv[0], argv[1]);
+    return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
+}
+
+/*
+ * Document-method: Iconv::conv
+ * call-seq: Iconv.conv(to, from, str)
+ *
+ * Shorthand for
+ *   Iconv.iconv(to, from, str).join
+ * See Iconv.iconv.
+ */
+static VALUE
+iconv_s_conv
+#ifdef HAVE_PROTOTYPES
+    (VALUE self, VALUE to, VALUE from, VALUE str)
+#else /* HAVE_PROTOTYPES */
+    (self, to, from, str)
+    VALUE self, to, from, str;
+#endif /* HAVE_PROTOTYPES */
+{
+    struct iconv_env_t arg;
+
+    arg.argc = 1;
+    arg.argv = &str;
+    arg.append = rb_str_append;
+    arg.ret = rb_str_new(0, 0);
+    arg.cd = iconv_create(to, from);
+    return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
+}
+
+/*
+ * Document-method: close
+ *
+ * Finishes conversion.
+ *
+ * After calling this, calling Iconv#iconv will cause an exception, but
+ * multiple calls of #close are guaranteed to end successfully.
+ *
+ * Returns a string containing the byte sequence to change the output buffer to
+ * its initial shift state.
+ */
+static VALUE
+iconv_init_state
+#ifdef HAVE_PROTOTYPES
+    (VALUE cd)
+#else /* HAVE_PROTOTYPES */
+    (cd)
+    VALUE cd;
+#endif /* HAVE_PROTOTYPES */
+{
+    return iconv_convert(VALUE2ICONV(cd), Qnil, 0, 0, NULL);
+}
+
+static VALUE
+iconv_finish
+#ifdef HAVE_PROTOTYPES
+    (VALUE self)
+#else /* HAVE_PROTOTYPES */
+    (self)
+    VALUE self;
+#endif /* HAVE_PROTOTYPES */
+{
+    VALUE cd = check_iconv(self);
+
+    if (!cd) return Qnil;
+    DATA_PTR(self) = NULL;
+
+    return rb_ensure(iconv_init_state, cd, iconv_free, cd);
+}
+
+/*
+ * Document-method: iconv
+ * call-seq: iconv(str, start=0, length=-1)
+ *
+ * Converts string and returns the result.
+ * * If +str+ is a String, converts <tt>str[start, length]</tt> and returns the converted string.
+ * * If +str+ is +nil+, places converter itself into initial shift state and
+ *   just returns a string containing the byte sequence to change the output
+ *   buffer to its initial shift state.
+ * * Otherwise, raises an exception.
+ *
+ * === Parameters
+ *
+ * str::    string to be converted, or nil
+ * start::  starting offset
+ * length:: conversion length; nil or -1 means whole the string from start
+ *
+ * === Exceptions
+ *
+ * * IconvIllegalSequence
+ * * IconvInvalidCharacter
+ * * IconvOutOfRange
+ *
+ * === Examples
+ *
+ * See the Iconv documentation.
+ */
+static VALUE
+iconv_iconv
+#ifdef HAVE_PROTOTYPES
+    (int argc, VALUE *argv, VALUE self)
+#else /* HAVE_PROTOTYPES */
+    (argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+#endif /* HAVE_PROTOTYPES */
+{
+    VALUE str, n1, n2;
+    VALUE cd = check_iconv(self);
+
+    n1 = n2 = Qnil;
+    rb_scan_args(argc, argv, "12", &str, &n1, &n2);
+
+    return iconv_convert(VALUE2ICONV(cd), str,
+			 NIL_P(n1) ? 0 : NUM2INT(n1),
+			 NIL_P(n2) ? -1 : NUM2INT(n2),
+			 NULL);
+}
+
+/*
+ * Document-class: Iconv::Failure
+ *
+ * Base attributes for Iconv exceptions.
+ */
+
+/*
+ * Document-method: success
+ * call-seq: success
+ *
+ * Returns string(s) translated successfully until the exception occurred.
+ * * In the case of failure occurred within Iconv.iconv, returned
+ *   value is an array of strings translated successfully preceding
+ *   failure and the last element is string on the way.
+ */
+static VALUE
+iconv_failure_success
+#ifdef HAVE_PROTOTYPES
+(VALUE self)
+#else /* HAVE_PROTOTYPES */
+    (self)
+    VALUE self;
+#endif /* HAVE_PROTOTYPES */
+{
+    return rb_attr_get(self, rb_success);
+}
+
+/*
+ * Document-method: failed
+ * call-seq: failed
+ *
+ * Returns substring of the original string passed to Iconv that starts at the
+ * character caused the exception. 
+ */
+static VALUE
+iconv_failure_failed
+#ifdef HAVE_PROTOTYPES
+(VALUE self)
+#else /* HAVE_PROTOTYPES */
+    (self)
+    VALUE self;
+#endif /* HAVE_PROTOTYPES */
+{
+    return rb_attr_get(self, rb_failed);
+}
+
+/*
+ * Document-method: inspect
+ * call-seq: inspect
+ *
+ * Returns inspected string like as: #<_class_: _success_, _failed_>
+ */
+static VALUE
+iconv_failure_inspect
+#ifdef HAVE_PROTOTYPES
+    (VALUE self)
+#else /* HAVE_PROTOTYPES */
+    (self)
+    VALUE self;
+#endif /* HAVE_PROTOTYPES */
+{
+    char *cname = rb_class2name(CLASS_OF(self));
+    VALUE success = rb_attr_get(self, rb_success);
+    VALUE failed = rb_attr_get(self, rb_failed);
+    VALUE str = rb_str_buf_cat2(rb_str_new2("#<"), cname);
+    str = rb_str_buf_cat(str, ": ", 2);
+    str = rb_str_buf_append(str, rb_inspect(success));
+    str = rb_str_buf_cat(str, ", ", 2);
+    str = rb_str_buf_append(str, rb_inspect(failed));
+    return rb_str_buf_cat(str, ">", 1);
+}
+
+/*
+ * Document-class: Iconv::InvalidEncoding
+ * 
+ * Requested coding-system is not available on this system.
+ */
+
+/*
+ * Document-class: Iconv::IllegalSequence
+ * 
+ * Input conversion stopped due to an input byte that does not belong to
+ * the input codeset, or the output codeset does not contain the
+ * character.
+ */
+
+/*
+ * Document-class: Iconv::InvalidCharacter
+ * 
+ * Input conversion stopped due to an incomplete character or shift
+ * sequence at the end of the input buffer.
+ */
+
+/*
+ * Document-class: Iconv::OutOfRange
+ * 
+ * Iconv library internal error.  Must not occur.
+ */
+
+/*
+ * Document-class: Iconv::BrokenLibrary
+ * 
+ * Detected a bug of underlying iconv(3) libray.
+ * * returns an error without setting errno properly
+ */
+
+void
+Init_iconv _((void))
+{
+    VALUE rb_cIconv = rb_define_class("Iconv", rb_cData);
+
+    rb_define_alloc_func(rb_cIconv, iconv_s_allocate);
+    rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, 2);
+    rb_define_singleton_method(rb_cIconv, "iconv", iconv_s_iconv, -1);
+    rb_define_singleton_method(rb_cIconv, "conv", iconv_s_conv, 3);
+    rb_define_method(rb_cIconv, "initialize", iconv_initialize, 2);
+    rb_define_method(rb_cIconv, "close", iconv_finish, 0);
+    rb_define_method(rb_cIconv, "iconv", iconv_iconv, -1);
+
+    rb_eIconvFailure = rb_define_module_under(rb_cIconv, "Failure");
+    rb_define_method(rb_eIconvFailure, "initialize", iconv_failure_initialize, 3);
+    rb_define_method(rb_eIconvFailure, "success", iconv_failure_success, 0);
+    rb_define_method(rb_eIconvFailure, "failed", iconv_failure_failed, 0);
+    rb_define_method(rb_eIconvFailure, "inspect", iconv_failure_inspect, 0);
+
+    rb_eIconvInvalidEncoding = rb_define_class_under(rb_cIconv, "InvalidEncoding", rb_eArgError);
+    rb_eIconvIllegalSeq = rb_define_class_under(rb_cIconv, "IllegalSequence", rb_eArgError);
+    rb_eIconvInvalidChar = rb_define_class_under(rb_cIconv, "InvalidCharacter", rb_eArgError);
+    rb_eIconvOutOfRange = rb_define_class_under(rb_cIconv, "OutOfRange", rb_eRuntimeError);
+    rb_eIconvBrokenLibrary = rb_define_class_under(rb_cIconv, "BrokenLibrary", rb_eRuntimeError);
+    rb_include_module(rb_eIconvInvalidEncoding, rb_eIconvFailure);
+    rb_include_module(rb_eIconvIllegalSeq, rb_eIconvFailure);
+    rb_include_module(rb_eIconvInvalidChar, rb_eIconvFailure);
+    rb_include_module(rb_eIconvOutOfRange, rb_eIconvFailure);
+    rb_include_module(rb_eIconvBrokenLibrary, rb_eIconvFailure);
+
+    rb_success = rb_intern("success");
+    rb_failed = rb_intern("failed");
+
+    rb_gc_register_address(&charset_map);
+    charset_map = rb_hash_new();
+    rb_define_singleton_method(rb_cIconv, "charset_map", charset_map_get, 0);
+}
+
diff --git a/ruby_1_8_6/ext/io/wait/.cvsignore b/ruby_1_8_6/ext/io/wait/.cvsignore
new file mode 100644
index 0000000000..fc802ff1c2
--- /dev/null
+++ b/ruby_1_8_6/ext/io/wait/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+mkmf.log
diff --git a/ruby_1_8_6/ext/io/wait/extconf.rb b/ruby_1_8_6/ext/io/wait/extconf.rb
new file mode 100644
index 0000000000..e8181d25f5
--- /dev/null
+++ b/ruby_1_8_6/ext/io/wait/extconf.rb
@@ -0,0 +1,17 @@
+require 'mkmf'
+target = "io/wait"
+
+unless macro_defined?("DOSISH", "#include <ruby.h>")
+  fionread = %w[sys/ioctl.h sys/filio.h].find do |h|
+    have_macro("FIONREAD", h)
+  end
+  if fionread
+    $defs << "-DFIONREAD_HEADER=\"<#{fionread}>\""
+    create_makefile(target)
+  end
+else
+  if have_func("rb_w32_ioctlsocket", "ruby.h")
+    have_func("rb_w32_is_socket", "ruby.h")
+    create_makefile(target)
+  end
+end
diff --git a/ruby_1_8_6/ext/io/wait/lib/nonblock.rb b/ruby_1_8_6/ext/io/wait/lib/nonblock.rb
new file mode 100644
index 0000000000..2103fdf25b
--- /dev/null
+++ b/ruby_1_8_6/ext/io/wait/lib/nonblock.rb
@@ -0,0 +1,23 @@
+require "fcntl"
+class IO
+  def nonblock?
+    (fcntl(Fcntl::F_GETFL) & File::NONBLOCK) != 0
+  end
+
+  def nonblock=(nb)
+    f = fcntl(Fcntl::F_GETFL)
+    if nb
+      f |= File::NONBLOCK
+    else
+      f &= ~File::NONBLOCK
+    end
+    fcntl(Fcntl::F_SETFL, f)
+  end
+
+  def nonblock(nb = true)
+    nb, self.nonblock = nonblock?, nb
+    yield
+  ensure
+    self.nonblock = nb
+  end
+end if defined?(Fcntl::F_GETFL)
diff --git a/ruby_1_8_6/ext/io/wait/wait.c b/ruby_1_8_6/ext/io/wait/wait.c
new file mode 100644
index 0000000000..61d6527b36
--- /dev/null
+++ b/ruby_1_8_6/ext/io/wait/wait.c
@@ -0,0 +1,126 @@
+/**********************************************************************
+
+  io/wait.c -
+
+  $Author$
+  $Date$
+  created at: Tue Aug 28 09:08:06 JST 2001
+
+  All the files in this distribution are covered under the Ruby's
+  license (see the file COPYING).
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "rubyio.h"
+
+#include <sys/types.h>
+#if defined(FIONREAD_HEADER)
+#include FIONREAD_HEADER
+#endif
+
+#ifdef HAVE_RB_W32_IOCTLSOCKET
+#define ioctl ioctlsocket
+#define ioctl_arg u_long
+#define ioctl_arg2num(i) ULONG2NUM(i)
+#else
+#define ioctl_arg int
+#define ioctl_arg2num(i) INT2NUM(i)
+#endif
+
+#ifdef HAVE_RB_W32_IS_SOCKET
+#define FIONREAD_POSSIBLE_P(fd) rb_w32_is_socket(fd)
+#else
+#define FIONREAD_POSSIBLE_P(fd) ((fd),Qtrue)
+#endif
+
+static VALUE io_ready_p _((VALUE io));
+static VALUE io_wait _((int argc, VALUE *argv, VALUE io));
+void Init_wait _((void));
+
+EXTERN struct timeval rb_time_interval _((VALUE time));
+
+/*
+=begin
+= IO wait methods.
+=end
+ */
+
+/*
+=begin
+--- IO#ready?
+    returns non-nil if input available without blocking, or nil.
+=end
+*/
+static VALUE
+io_ready_p(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+    FILE *fp;
+    ioctl_arg n;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+    if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
+    fp = fptr->f;
+    if (feof(fp)) return Qfalse;
+    if (rb_read_pending(fp)) return Qtrue;
+    if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
+    if (n > 0) return ioctl_arg2num(n);
+    return Qnil;
+}
+
+/*
+=begin
+--- IO#wait([timeout])
+    waits until input available or timed out and returns self, or nil
+    when EOF reached.
+=end
+*/
+static VALUE
+io_wait(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    OpenFile *fptr;
+    fd_set rd;
+    FILE *fp;
+    int fd;
+    ioctl_arg n;
+    VALUE timeout;
+    struct timeval *tp, timerec;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+    rb_scan_args(argc, argv, "01", &timeout);
+    if (NIL_P(timeout)) {
+	tp = 0;
+    }
+    else {
+	timerec = rb_time_interval(timeout);
+	tp = &timerec;
+    }
+
+    fp = fptr->f;
+    if (feof(fp)) return Qfalse;
+    if (rb_read_pending(fp)) return Qtrue;
+    fd = fileno(fp);
+    FD_ZERO(&rd);
+    FD_SET(fd, &rd);
+    if (rb_thread_select(fd + 1, &rd, NULL, NULL, tp) < 0)
+	rb_sys_fail(0);
+    rb_io_check_closed(fptr);
+    if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
+    if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
+    if (n > 0) return io;
+    return Qnil;
+}
+
+void
+Init_wait()
+{
+    rb_define_method(rb_cIO, "ready?", io_ready_p, 0);
+    rb_define_method(rb_cIO, "wait", io_wait, -1);
+}
diff --git a/ruby_1_8_6/ext/nkf/.cvsignore b/ruby_1_8_6/ext/nkf/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/nkf/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/nkf/depend b/ruby_1_8_6/ext/nkf/depend
new file mode 100644
index 0000000000..0ed8fea8d2
--- /dev/null
+++ b/ruby_1_8_6/ext/nkf/depend
@@ -0,0 +1 @@
+nkf.o : nkf.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(srcdir)/nkf-utf8/nkf.c $(srcdir)/nkf-utf8/utf8tbl.c $(srcdir)/nkf-utf8/config.h
diff --git a/ruby_1_8_6/ext/nkf/extconf.rb b/ruby_1_8_6/ext/nkf/extconf.rb
new file mode 100644
index 0000000000..710662f19c
--- /dev/null
+++ b/ruby_1_8_6/ext/nkf/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('nkf')
diff --git a/ruby_1_8_6/ext/nkf/lib/kconv.rb b/ruby_1_8_6/ext/nkf/lib/kconv.rb
new file mode 100644
index 0000000000..4ffe8d984e
--- /dev/null
+++ b/ruby_1_8_6/ext/nkf/lib/kconv.rb
@@ -0,0 +1,367 @@
+#
+# kconv.rb - Kanji Converter.
+#
+# $Id$
+#
+# ----
+#
+# kconv.rb implements the Kconv class for Kanji Converter.  Additionally,
+# some methods in String classes are added to allow easy conversion.
+#
+
+require 'nkf'
+
+#
+# Kanji Converter for Ruby.
+#
+module Kconv
+  #
+  # Public Constants
+  #
+  
+  #Constant of Encoding
+  
+  # Auto-Detect
+  AUTO = NKF::AUTO
+  # ISO-2022-JP
+  JIS = NKF::JIS
+  # EUC-JP
+  EUC = NKF::EUC
+  # Shift_JIS
+  SJIS = NKF::SJIS
+  # BINARY
+  BINARY = NKF::BINARY
+  # NOCONV
+  NOCONV = NKF::NOCONV
+  # ASCII
+  ASCII = NKF::ASCII
+  # UTF-8
+  UTF8 = NKF::UTF8
+  # UTF-16
+  UTF16 = NKF::UTF16
+  # UTF-32
+  UTF32 = NKF::UTF32
+  # UNKNOWN
+  UNKNOWN = NKF::UNKNOWN
+
+  #
+  # Private Constants
+  #
+  
+  # Revision of kconv.rb
+  REVISION = %q$Revision$
+  
+  #Regexp of Encoding
+  
+  # Regexp of Shift_JIS string (private constant)
+  RegexpShiftjis = /\A(?:
+		       [\x00-\x7f\xa1-\xdf] |
+		       [\x81-\x9f\xe0-\xfc][\x40-\x7e\x80-\xfc] 
+		      )*\z/nx
+
+  # Regexp of EUC-JP string (private constant)
+  RegexpEucjp = /\A(?:
+		    [\x00-\x7f]                         |
+		    \x8e        [\xa1-\xdf]             |
+		    \x8f        [\xa1-\xfe] [\xa1-\xfe] |
+		    [\xa1-\xfe] [\xa1-\xfe]
+		   )*\z/nx
+
+  # Regexp of UTF-8 string (private constant)
+  RegexpUtf8  = /\A(?:
+		    [\x00-\x7f]                                     |
+		    [\xc2-\xdf] [\x80-\xbf]                         |
+		    \xe0        [\xa0-\xbf] [\x80-\xbf]             |
+		    [\xe1-\xef] [\x80-\xbf] [\x80-\xbf]             |
+		    \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf] |
+		    [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf] |
+		    \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf]
+		   )*\z/nx
+
+  #
+  # Public Methods
+  #
+  
+  # call-seq:
+  #    Kconv.kconv(str, out_code, in_code = Kconv::AUTO)
+  #
+  # Convert <code>str</code> to out_code.
+  # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
+  #
+  # *Note*
+  # This method decode MIME encoded string and
+  # convert halfwidth katakana to fullwidth katakana.
+  # If you don't want to decode them, use NKF.nkf.
+  def kconv(str, out_code, in_code = AUTO)
+    opt = '-'
+    case in_code
+    when ::NKF::JIS
+      opt << 'J'
+    when ::NKF::EUC
+      opt << 'E'
+    when ::NKF::SJIS
+      opt << 'S'
+    when ::NKF::UTF8
+      opt << 'W'
+    when ::NKF::UTF16
+      opt << 'W16'
+    end
+
+    case out_code
+    when ::NKF::JIS
+      opt << 'j'
+    when ::NKF::EUC
+      opt << 'e'
+    when ::NKF::SJIS
+      opt << 's'
+    when ::NKF::UTF8
+      opt << 'w'
+    when ::NKF::UTF16
+      opt << 'w16'
+    when ::NKF::NOCONV
+      return str
+    end
+
+    opt = '' if opt == '-'
+
+    ::NKF::nkf(opt, str)
+  end
+  module_function :kconv
+
+  #
+  # Encode to
+  #
+
+  # call-seq:
+  #    Kconv.tojis(str)   -> string
+  #
+  # Convert <code>str</code> to ISO-2022-JP
+  #
+  # *Note*
+  # This method decode MIME encoded string and
+  # convert halfwidth katakana to fullwidth katakana.
+  # If you don't want it, use NKF.nkf('-jxm0', str).
+  def tojis(str)
+    ::NKF::nkf('-jm', str)
+  end
+  module_function :tojis
+
+  # call-seq:
+  #    Kconv.toeuc(str)   -> string
+  #
+  # Convert <code>str</code> to EUC-JP
+  #
+  # *Note*
+  # This method decode MIME encoded string and
+  # convert halfwidth katakana to fullwidth katakana.
+  # If you don't want it, use NKF.nkf('-exm0', str).
+  def toeuc(str)
+    ::NKF::nkf('-em', str)
+  end
+  module_function :toeuc
+
+  # call-seq:
+  #    Kconv.tosjis(str)   -> string
+  #
+  # Convert <code>str</code> to Shift_JIS
+  #
+  # *Note*
+  # This method decode MIME encoded string and
+  # convert halfwidth katakana to fullwidth katakana.
+  # If you don't want it, use NKF.nkf('-sxm0', str).
+  def tosjis(str)
+    ::NKF::nkf('-sm', str)
+  end
+  module_function :tosjis
+
+  # call-seq:
+  #    Kconv.toutf8(str)   -> string
+  #
+  # Convert <code>str</code> to UTF-8
+  #
+  # *Note*
+  # This method decode MIME encoded string and
+  # convert halfwidth katakana to fullwidth katakana.
+  # If you don't want it, use NKF.nkf('-wxm0', str).
+  def toutf8(str)
+    ::NKF::nkf('-wm', str)
+  end
+  module_function :toutf8
+
+  # call-seq:
+  #    Kconv.toutf16(str)   -> string
+  #
+  # Convert <code>str</code> to UTF-16
+  #
+  # *Note*
+  # This method decode MIME encoded string and
+  # convert halfwidth katakana to fullwidth katakana.
+  # If you don't want it, use NKF.nkf('-w16xm0', str).
+  def toutf16(str)
+    ::NKF::nkf('-w16m', str)
+  end
+  module_function :toutf16
+
+  #
+  # guess
+  #
+
+  # call-seq:
+  #    Kconv.guess(str)   -> integer
+  #
+  # Guess input encoding by NKF.guess2
+  def guess(str)
+    ::NKF::guess(str)
+  end
+  module_function :guess
+
+  # call-seq:
+  #    Kconv.guess_old(str)   -> integer
+  #
+  # Guess input encoding by NKF.guess1
+  def guess_old(str)
+    ::NKF::guess1(str)
+  end
+  module_function :guess_old
+
+  #
+  # isEncoding
+  #
+
+  # call-seq:
+  #    Kconv.iseuc(str)   -> obj or nil
+  #
+  # Returns whether input encoding is EUC-JP or not.
+  #
+  # *Note* don't expect this return value is MatchData.
+  def iseuc(str)
+    RegexpEucjp.match( str )
+  end
+  module_function :iseuc
+
+  # call-seq:
+  #    Kconv.issjis(str)   -> obj or nil
+  #
+  # Returns whether input encoding is Shift_JIS or not.
+  #
+  # *Note* don't expect this return value is MatchData.
+  def issjis(str)
+    RegexpShiftjis.match( str )
+  end
+  module_function :issjis
+
+  # call-seq:
+  #    Kconv.isutf8(str)   -> obj or nil
+  #
+  # Returns whether input encoding is UTF-8 or not.
+  #
+  # *Note* don't expect this return value is MatchData.
+  def isutf8(str)
+    RegexpUtf8.match( str )
+  end
+  module_function :isutf8
+
+end
+
+class String
+  # call-seq:
+  #    String#kconv(out_code, in_code = Kconv::AUTO)
+  #
+  # Convert <code>self</code> to out_code.
+  # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
+  #
+  # *Note*
+  # This method decode MIME encoded string and
+  # convert halfwidth katakana to fullwidth katakana.
+  # If you don't want to decode them, use NKF.nkf.
+  def kconv(out_code, in_code=Kconv::AUTO)
+    Kconv::kconv(self, out_code, in_code)
+  end
+  
+  #
+  # to Encoding
+  #
+  
+  # call-seq:
+  #    String#tojis   -> string
+  #
+  # Convert <code>self</code> to ISO-2022-JP
+  #
+  # *Note*
+  # This method decode MIME encoded string and
+  # convert halfwidth katakana to fullwidth katakana.
+  # If you don't want it, use NKF.nkf('-jxm0', str).
+  def tojis; Kconv.tojis(self) end
+
+  # call-seq:
+  #    String#toeuc   -> string
+  #
+  # Convert <code>self</code> to EUC-JP
+  #
+  # *Note*
+  # This method decode MIME encoded string and
+  # convert halfwidth katakana to fullwidth katakana.
+  # If you don't want it, use NKF.nkf('-exm0', str).
+  def toeuc; Kconv.toeuc(self) end
+
+  # call-seq:
+  #    String#tosjis   -> string
+  #
+  # Convert <code>self</code> to Shift_JIS
+  #
+  # *Note*
+  # This method decode MIME encoded string and
+  # convert halfwidth katakana to fullwidth katakana.
+  # If you don't want it, use NKF.nkf('-sxm0', str).
+  def tosjis; Kconv.tosjis(self) end
+
+  # call-seq:
+  #    String#toutf8   -> string
+  #
+  # Convert <code>self</code> to UTF-8
+  #
+  # *Note*
+  # This method decode MIME encoded string and
+  # convert halfwidth katakana to fullwidth katakana.
+  # If you don't want it, use NKF.nkf('-wxm0', str).
+  def toutf8; Kconv.toutf8(self) end
+
+  # call-seq:
+  #    String#toutf16   -> string
+  #
+  # Convert <code>self</code> to UTF-16
+  #
+  # *Note*
+  # This method decode MIME encoded string and
+  # convert halfwidth katakana to fullwidth katakana.
+  # If you don't want it, use NKF.nkf('-w16xm0', str).
+  def toutf16; Kconv.toutf16(self) end
+
+  #
+  # is Encoding
+  #
+
+  # call-seq:
+  #    String#iseuc   -> obj or nil
+  #
+  # Returns whether <code>self</code>'s encoding is EUC-JP or not.
+  #
+  # *Note* don't expect this return value is MatchData.
+  def iseuc;	Kconv.iseuc(self) end
+
+  # call-seq:
+  #    String#issjis   -> obj or nil
+  #
+  # Returns whether <code>self</code>'s encoding is Shift_JIS or not.
+  #
+  # *Note* don't expect this return value is MatchData.
+  def issjis;	Kconv.issjis(self) end
+
+  # call-seq:
+  #    String#isutf8   -> obj or nil
+  #
+  # Returns whether <code>self</code>'s encoding is UTF-8 or not.
+  #
+  # *Note* don't expect this return value is MatchData.
+  def isutf8;	Kconv.isutf8(self) end
+end
diff --git a/ruby_1_8_6/ext/nkf/nkf-utf8/config.h b/ruby_1_8_6/ext/nkf/nkf-utf8/config.h
new file mode 100644
index 0000000000..9da82c6aee
--- /dev/null
+++ b/ruby_1_8_6/ext/nkf/nkf-utf8/config.h
@@ -0,0 +1,88 @@
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
+
+/* UTF8 $BF~=PNO(B */
+#define UTF8_INPUT_ENABLE
+#define UTF8_OUTPUT_ENABLE
+
+/* Shift_JIS $BHO0O30$NJ8;z$r!"(BCP932 $B$GF1CM$JJ8;z$KFI$_49$($k(B */
+#define SHIFTJIS_CP932
+
+/* $B%*%W%7%g%s$GF~NO$r;XDj$7$?;~$K!"J8;z%3!<%I$r8GDj$9$k(B */
+#define INPUT_CODE_FIX
+
+/* --overwrite $B%*%W%7%g%s(B */
+/* by Satoru Takabayashi <ccsatoru@vega.aichi-u.ac.jp> */
+#define OVERWRITE
+
+/* --cap-input, --url-input $B%*%W%7%g%s(B */
+#define INPUT_OPTION
+
+/* --numchar-input $B%*%W%7%g%s(B */
+#define NUMCHAR_OPTION
+
+/* --debug, --no-output $B%*%W%7%g%s(B */
+#define CHECK_OPTION
+
+/* JIS X0212 */
+#define X0212_ENABLE
+
+/* --exec-in, --exec-out $B%*%W%7%g%s(B
+ * pipe, fork, execvp $B$"$?$j$,L5$$$HF0$-$^$;$s!#(B
+ * MS-DOS, MinGW $B$J$I$G$O(B undef $B$K$7$F$/$@$5$$(B
+ * child process $B=*N;;~$N=hM}$,$$$$$+$2$s$J$N$G!"(B
+ * $B%G%U%)%k%H$GL58z$K$7$F$$$^$9!#(B
+ */
+/* #define EXEC_IO */
+
+/* SunOS $B$N(B cc $B$r;H$&$H$-$O(B undef $B$K$7$F$/$@$5$$(B */
+#define ANSI_C_PROTOTYPE
+
+/* int $B$,(B 32bit $BL$K~$N4D6-$G(B NUMCHAR_OPTION $B$r;H$&$K$O!"(B
+ * $B%3%a%s%H$r30$7$F$/$@$5$$!#(B
+ */
+/* #define INT_IS_SHORT */
+
+
+#if defined(INT_IS_SHORT)
+typedef long nkf_char;
+typedef unsigned char nkf_nfchar;
+#else
+typedef int nkf_char;
+typedef int nkf_nfchar;
+#endif
+
+/* Unicode Normalization */
+#define UNICODE_NORMALIZATION
+
+#ifndef WIN32DLL
+/******************************/
+/* $B%G%U%)%k%H$N=PNO%3!<%IA*Br(B */
+/* Select DEFAULT_CODE */
+#define DEFAULT_CODE_JIS
+/* #define DEFAULT_CODE_SJIS */
+/* #define DEFAULT_CODE_EUC */
+/* #define DEFAULT_CODE_UTF8 */
+/******************************/
+#else
+#define DEFAULT_CODE_SJIS
+#endif
+
+#if defined(NUMCHAR_OPTION) && !defined(UTF8_INPUT_ENABLE)
+#define UTF8_INPUT_ENABLE
+#endif
+
+#ifdef UNICODE_NORMALIZATION
+#ifndef UTF8_INPUT_ENABLE
+#define UTF8_INPUT_ENABLE
+#endif
+#define NORMALIZATION_TABLE_LENGTH 942
+#define NORMALIZATION_TABLE_NFC_LENGTH 3
+#define NORMALIZATION_TABLE_NFD_LENGTH 9
+struct normalization_pair{
+    const nkf_nfchar nfc[NORMALIZATION_TABLE_NFC_LENGTH];
+    const nkf_nfchar nfd[NORMALIZATION_TABLE_NFD_LENGTH];
+};
+#endif
+
+#endif /* _CONFIG_H_ */
diff --git a/ruby_1_8_6/ext/nkf/nkf-utf8/nkf.c b/ruby_1_8_6/ext/nkf/nkf-utf8/nkf.c
new file mode 100644
index 0000000000..3cd1b160da
--- /dev/null
+++ b/ruby_1_8_6/ext/nkf/nkf-utf8/nkf.c
@@ -0,0 +1,6040 @@
+/** Network Kanji Filter. (PDS Version)
+************************************************************************
+** Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
+** $BO"Mm@h!'(B $B!J3t!KIY;NDL8&5f=j!!%=%U%H#38&!!;T@n!!;j(B 
+** $B!J(BE-Mail Address: ichikawa@flab.fujitsu.co.jp$B!K(B
+** Copyright (C) 1996,1998
+** Copyright (C) 2002
+** $BO"Mm@h!'(B $BN05eBg3X>pJs9)3X2J(B $B2OLn(B $B??<#(B  mime/X0208 support
+** $B!J(BE-Mail Address: kono@ie.u-ryukyu.ac.jp$B!K(B
+** $BO"Mm@h!'(B COW for DOS & Win16 & Win32 & OS/2
+** $B!J(BE-Mail Address: GHG00637@niftyserve.or.p$B!K(B
+**
+**    $B$3$N%=!<%9$N$$$+$J$kJ#<L!$2~JQ!$=$@5$b5vBz$7$^$9!#$?$@$7!"(B
+**    $B$=$N:]$K$O!"C/$,9W8%$7$?$r<($9$3$NItJ,$r;D$9$3$H!#(B
+**    $B:FG[I[$d;(;o$NIUO?$J$I$NLd$$9g$o$;$bI,MW$"$j$^$;$s!#(B
+**    $B1DMxMxMQ$b>e5-$KH?$7$J$$HO0O$G5v2D$7$^$9!#(B
+**    $B%P%$%J%j$NG[I[$N:]$K$O(Bversion message$B$rJ]B8$9$k$3$H$r>r7o$H$7$^$9!#(B
+**    $B$3$N%W%m%0%i%`$K$D$$$F$OFC$K2?$NJ]>Z$b$7$J$$!"0-$7$+$i$:!#(B
+**
+**    Everyone is permitted to do anything on this program 
+**    including copying, modifying, improving,
+**    as long as you don't try to pretend that you wrote it.
+**    i.e., the above copyright notice has to appear in all copies.  
+**    Binary distribution requires original version messages.
+**    You don't have to ask before copying, redistribution or publishing.
+**    THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
+***********************************************************************/
+
+/***********************************************************************
+** UTF-8 $B%5%]!<%H$K$D$$$F(B
+**    $B=>Mh$N(B nkf $B$HF~$l$+$($F$=$N$^$^;H$($k$h$&$K$J$C$F$$$^$9(B
+**    nkf -e $B$J$I$H$7$F5/F0$9$k$H!"<+F0H=JL$G(B UTF-8 $B$HH=Dj$5$l$l$P!"(B
+**    $B$=$N$^$^(B euc-jp $B$KJQ49$5$l$^$9(B
+**
+**    $B$^$@%P%0$,$"$k2DG=@-$,9b$$$G$9!#(B
+**    ($BFC$K<+F0H=JL!"%3!<%I:.:_!"%(%i!<=hM}7O(B)
+**
+**    $B2?$+LdBj$r8+$D$1$?$i!"(B
+**        E-Mail: furukawa@tcp-ip.or.jp
+**    $B$^$G8fO"Mm$r$*4j$$$7$^$9!#(B
+***********************************************************************/
+/* $Id$ */
+#define NKF_VERSION "2.0.8"
+#define NKF_RELEASE_DATE "2007-01-28"
+#include "config.h"
+#include "utf8tbl.h"
+
+#define COPY_RIGHT \
+    "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW\n" \
+    "Copyright (C) 2002-2006 Kono, Furukawa, Naruse, mastodon"
+
+
+/*
+**
+**
+**
+** USAGE:       nkf [flags] [file] 
+**
+** Flags:
+** b    Output is buffered             (DEFAULT)
+** u    Output is unbuffered
+**
+** t    no operation
+**
+** j    Output code is JIS 7 bit        (DEFAULT SELECT) 
+** s    Output code is MS Kanji         (DEFAULT SELECT) 
+** e    Output code is AT&T JIS         (DEFAULT SELECT) 
+** w    Output code is AT&T JIS         (DEFAULT SELECT) 
+** l    Output code is JIS 7bit and ISO8859-1 Latin-1
+**
+** m    MIME conversion for ISO-2022-JP
+** I    Convert non ISO-2022-JP charactor to GETA by Pekoe <pekoe@lair.net>
+** i_ Output sequence to designate JIS-kanji (DEFAULT_J)
+** o_ Output sequence to designate single-byte roman characters (DEFAULT_R)
+** M    MIME output conversion 
+**
+** r  {de/en}crypt ROT13/47
+**
+** v  display Version
+**
+** T  Text mode output        (for MS-DOS)
+**
+** x    Do not convert X0201 kana into X0208
+** Z    Convert X0208 alphabet to ASCII
+**
+** f60  fold option
+**
+** m    MIME decode
+** B    try to fix broken JIS, missing Escape
+** B[1-9]  broken level
+**
+** O   Output to 'nkf.out' file or last file name
+** d   Delete \r in line feed 
+** c   Add \r in line feed 
+** -- other long option
+** -- ignore following option (don't use with -O )
+**
+**/
+
+#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || defined(__MINGW32__) || defined(__EMX__) || defined(__MSDOS__) || defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)) && !defined(MSDOS)
+#define MSDOS
+#if (defined(__Win32__) || defined(_WIN32)) && !defined(__WIN32__)
+#define __WIN32__
+#endif
+#endif
+
+#ifdef PERL_XS
+#undef OVERWRITE
+#endif
+
+#ifndef PERL_XS
+#include <stdio.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(MSDOS) || defined(__OS2__)
+#include <fcntl.h>
+#include <io.h>
+#if defined(_MSC_VER) || defined(__WATCOMC__)
+#define mktemp _mktemp
+#endif
+#endif
+
+#ifdef MSDOS
+#ifdef LSI_C
+#define setbinmode(fp) fsetbin(fp)
+#elif defined(__DJGPP__)
+#include <libc/dosio.h>
+#define setbinmode(fp) djgpp_setbinmode(fp)
+#else /* Microsoft C, Turbo C */
+#define setbinmode(fp) setmode(fileno(fp), O_BINARY)
+#endif
+#else /* UNIX */
+#define setbinmode(fp)
+#endif
+
+#if defined(__DJGPP__)
+void  djgpp_setbinmode(FILE *fp)
+{
+    /* we do not use libc's setmode(), which changes COOKED/RAW mode in device. */
+    int fd, m;
+    fd = fileno(fp);
+    m = (__file_handle_modes[fd] & (~O_TEXT)) | O_BINARY;
+    __file_handle_set(fd, m);
+}
+#endif
+
+#ifdef _IOFBF /* SysV and MSDOS, Windows */
+#define       setvbuffer(fp, buf, size)       setvbuf(fp, buf, _IOFBF, size)
+#else /* BSD */
+#define       setvbuffer(fp, buf, size)       setbuffer(fp, buf, size)
+#endif
+
+/*Borland C++ 4.5 EasyWin*/
+#if defined(__TURBOC__) && defined(_Windows) && !defined(__WIN32__) /*Easy Win */
+#define         EASYWIN
+#ifndef __WIN16__
+#define __WIN16__
+#endif
+#include <windows.h>
+#endif
+
+#ifdef OVERWRITE
+/* added by satoru@isoternet.org */
+#if defined(__EMX__)
+#include <sys/types.h>
+#endif
+#include <sys/stat.h>
+#if !defined(MSDOS) || defined(__DJGPP__) /* UNIX, djgpp */
+#include <unistd.h>
+#if defined(__WATCOMC__)
+#include <sys/utime.h>
+#else
+#include <utime.h>
+#endif
+#else /* defined(MSDOS) */
+#ifdef __WIN32__
+#ifdef __BORLANDC__ /* BCC32 */
+#include <utime.h>
+#else /* !defined(__BORLANDC__) */
+#include <sys/utime.h>
+#endif /* (__BORLANDC__) */
+#else /* !defined(__WIN32__) */
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__WATCOMC__) || defined(__OS2__) || defined(__EMX__) || defined(__IBMC__) || defined(__IBMCPP__)  /* VC++, MinGW, Watcom, emx+gcc, IBM VAC++ */
+#include <sys/utime.h>
+#elif defined(__TURBOC__) /* BCC */
+#include <utime.h>
+#elif defined(LSI_C) /* LSI C */
+#endif /* (__WIN32__) */
+#endif
+#endif
+#endif
+
+#define         FALSE   0
+#define         TRUE    1
+
+/* state of output_mode and input_mode  
+
+   c2           0 means ASCII
+                X0201
+                ISO8859_1
+                X0208
+                EOF      all termination
+   c1           32bit data
+
+ */
+
+#define         ASCII           0
+#define         X0208           1
+#define         X0201           2
+#define         ISO8859_1       8
+#define         NO_X0201        3
+#define         X0212      0x2844
+#define         X0213_1    0x284F
+#define         X0213_2    0x2850
+
+/* Input Assumption */
+
+#define         JIS_INPUT       4
+#define         EUC_INPUT      16
+#define         SJIS_INPUT      5
+#define         LATIN1_INPUT    6
+#define         FIXED_MIME      7
+#define         STRICT_MIME     8
+
+/* MIME ENCODE */
+
+#define        	ISO2022JP       9
+#define  	JAPANESE_EUC   10
+#define		SHIFT_JIS      11
+
+#define		UTF8           12
+#define		UTF8_INPUT     13
+#define		UTF16_INPUT    1015
+#define		UTF32_INPUT    1017
+
+/* byte order */
+
+#define		ENDIAN_BIG	1234
+#define		ENDIAN_LITTLE	4321
+#define		ENDIAN_2143	2143
+#define		ENDIAN_3412	3412
+
+#define         WISH_TRUE      15
+
+/* ASCII CODE */
+
+#define         BS      0x08
+#define         TAB     0x09
+#define         NL      0x0a
+#define         CR      0x0d
+#define         ESC     0x1b
+#define         SPACE   0x20
+#define         AT      0x40
+#define         SSP     0xa0
+#define         DEL     0x7f
+#define         SI      0x0f
+#define         SO      0x0e
+#define         SSO     0x8e
+#define         SS3     0x8f
+
+#define		is_alnum(c)  \
+            (('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9'))
+
+/* I don't trust portablity of toupper */
+#define nkf_toupper(c)  (('a'<=c && c<='z')?(c-('a'-'A')):c)
+#define nkf_isoctal(c)  ('0'<=c && c<='7')
+#define nkf_isdigit(c)  ('0'<=c && c<='9')
+#define nkf_isxdigit(c)  (nkf_isdigit(c) || ('a'<=c && c<='f') || ('A'<=c && c <= 'F'))
+#define nkf_isblank(c) (c == SPACE || c == TAB)
+#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == NL)
+#define nkf_isalpha(c) (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
+#define nkf_isalnum(c) (nkf_isdigit(c) || nkf_isalpha(c))
+#define nkf_isprint(c) (' '<=c && c<='~')
+#define nkf_isgraph(c) ('!'<=c && c<='~')
+#define hex2bin(c) (('0'<=c&&c<='9') ? (c-'0') : \
+                    ('A'<=c&&c<='F') ? (c-'A'+10) : \
+                    ('a'<=c&&c<='f') ? (c-'a'+10) : 0 )
+#define is_eucg3(c2) (((unsigned short)c2 >> 8) == SS3)
+
+#define CP932_TABLE_BEGIN 0xFA
+#define CP932_TABLE_END   0xFC
+#define CP932INV_TABLE_BEGIN 0xED
+#define CP932INV_TABLE_END   0xEE
+#define is_ibmext_in_sjis(c2) (CP932_TABLE_BEGIN <= c2 && c2 <= CP932_TABLE_END)
+
+#define         HOLD_SIZE       1024
+#if defined(INT_IS_SHORT)
+#define         IOBUF_SIZE      2048
+#else
+#define         IOBUF_SIZE      16384
+#endif
+
+#define         DEFAULT_J       'B'
+#define         DEFAULT_R       'B'
+
+#define         SJ0162  0x00e1          /* 01 - 62 ku offset */
+#define         SJ6394  0x0161          /* 63 - 94 ku offset */
+
+#define         RANGE_NUM_MAX   18
+#define         GETA1   0x22
+#define         GETA2   0x2e
+
+
+#if defined(UTF8_OUTPUT_ENABLE) || defined(UTF8_INPUT_ENABLE)
+#define sizeof_euc_to_utf8_1byte 94
+#define sizeof_euc_to_utf8_2bytes 94
+#define sizeof_utf8_to_euc_C2 64
+#define sizeof_utf8_to_euc_E5B8 64
+#define sizeof_utf8_to_euc_2bytes 112
+#define sizeof_utf8_to_euc_3bytes 16
+#endif
+
+/* MIME preprocessor */
+
+#ifdef EASYWIN /*Easy Win */
+extern POINT _BufferSize;
+#endif
+
+struct input_code{
+    char *name;
+    nkf_char stat;
+    nkf_char score;
+    nkf_char index;
+    nkf_char buf[3];
+    void (*status_func)(struct input_code *, nkf_char);
+    nkf_char (*iconv_func)(nkf_char c2, nkf_char c1, nkf_char c0);
+    int _file_stat;
+};
+
+static char *input_codename = "";
+
+#ifndef PERL_XS
+static const char *CopyRight = COPY_RIGHT;
+#endif
+#if !defined(PERL_XS) && !defined(WIN32DLL)
+static  nkf_char     noconvert(FILE *f);
+#endif
+static  void    module_connection(void);
+static  nkf_char     kanji_convert(FILE *f);
+static  nkf_char     h_conv(FILE *f,nkf_char c2,nkf_char c1);
+static  nkf_char     push_hold_buf(nkf_char c2);
+static  void    set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0));
+static  nkf_char     s_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
+static  nkf_char     s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1);
+static  nkf_char     e_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
+#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
+/* UCS Mapping
+ * 0: Shift_JIS, eucJP-ascii
+ * 1: eucJP-ms
+ * 2: CP932, CP51932
+ */
+#define UCS_MAP_ASCII 0
+#define UCS_MAP_MS    1
+#define UCS_MAP_CP932 2
+static int ms_ucs_map_f = UCS_MAP_ASCII;
+#endif
+#ifdef UTF8_INPUT_ENABLE
+/* no NEC special, NEC-selected IBM extended and IBM extended characters */
+static  int     no_cp932ext_f = FALSE;
+/* ignore ZERO WIDTH NO-BREAK SPACE */
+static  int     no_best_fit_chars_f = FALSE;
+static  int     input_endian = ENDIAN_BIG;
+static  nkf_char     unicode_subchar = '?'; /* the regular substitution character */
+static  void    nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c);
+static  void    encode_fallback_html(nkf_char c);
+static  void    encode_fallback_xml(nkf_char c);
+static  void    encode_fallback_java(nkf_char c);
+static  void    encode_fallback_perl(nkf_char c);
+static  void    encode_fallback_subchar(nkf_char c);
+static  void    (*encode_fallback)(nkf_char c) = NULL;
+static  nkf_char     w2e_conv(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1);
+static  nkf_char     w_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
+static  nkf_char     w_iconv16(nkf_char c2,nkf_char c1,nkf_char c0);
+static  nkf_char     w_iconv32(nkf_char c2,nkf_char c1,nkf_char c0);
+static  nkf_char	unicode_to_jis_common(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1);
+static  nkf_char	w_iconv_common(nkf_char c1,nkf_char c0,const unsigned short *const *pp,nkf_char psize,nkf_char *p2,nkf_char *p1);
+static  void    w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0);
+static  nkf_char     ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0);
+static  nkf_char     w16e_conv(nkf_char val,nkf_char *p2,nkf_char *p1);
+static  void    w_status(struct input_code *, nkf_char);
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+static  int     output_bom_f = FALSE;
+static  int     output_endian = ENDIAN_BIG;
+static  nkf_char     e2w_conv(nkf_char c2,nkf_char c1);
+static  void    w_oconv(nkf_char c2,nkf_char c1);
+static  void    w_oconv16(nkf_char c2,nkf_char c1);
+static  void    w_oconv32(nkf_char c2,nkf_char c1);
+#endif
+static  void    e_oconv(nkf_char c2,nkf_char c1);
+static  nkf_char     e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1);
+static  void    s_oconv(nkf_char c2,nkf_char c1);
+static  void    j_oconv(nkf_char c2,nkf_char c1);
+static  void    fold_conv(nkf_char c2,nkf_char c1);
+static  void    cr_conv(nkf_char c2,nkf_char c1);
+static  void    z_conv(nkf_char c2,nkf_char c1);
+static  void    rot_conv(nkf_char c2,nkf_char c1);
+static  void    hira_conv(nkf_char c2,nkf_char c1);
+static  void    base64_conv(nkf_char c2,nkf_char c1);
+static  void    iso2022jp_check_conv(nkf_char c2,nkf_char c1);
+static  void    no_connection(nkf_char c2,nkf_char c1);
+static  nkf_char     no_connection2(nkf_char c2,nkf_char c1,nkf_char c0);
+
+static  void    code_score(struct input_code *ptr);
+static  void    code_status(nkf_char c);
+
+static  void    std_putc(nkf_char c);
+static  nkf_char     std_getc(FILE *f);
+static  nkf_char     std_ungetc(nkf_char c,FILE *f);
+
+static  nkf_char     broken_getc(FILE *f);
+static  nkf_char     broken_ungetc(nkf_char c,FILE *f);
+
+static  nkf_char     mime_begin(FILE *f);
+static  nkf_char     mime_getc(FILE *f);
+static  nkf_char     mime_ungetc(nkf_char c,FILE *f);
+
+static  void    switch_mime_getc(void);
+static  void    unswitch_mime_getc(void);
+static  nkf_char     mime_begin_strict(FILE *f);
+static  nkf_char     mime_getc_buf(FILE *f);
+static  nkf_char     mime_ungetc_buf(nkf_char c,FILE *f);
+static  nkf_char     mime_integrity(FILE *f,const unsigned char *p);
+
+static  nkf_char     base64decode(nkf_char c);
+static  void    mime_prechar(nkf_char c2, nkf_char c1);
+static  void    mime_putc(nkf_char c);
+static  void    open_mime(nkf_char c);
+static  void    close_mime(void);
+static  void    eof_mime(void);
+static  void    mimeout_addchar(nkf_char c);
+#ifndef PERL_XS
+static  void    usage(void);
+static  void    version(void);
+#endif
+static  void    options(unsigned char *c);
+#if defined(PERL_XS) || defined(WIN32DLL)
+static  void    reinit(void);
+#endif
+
+/* buffers */
+
+#if !defined(PERL_XS) && !defined(WIN32DLL)
+static unsigned char   stdibuf[IOBUF_SIZE];
+static unsigned char   stdobuf[IOBUF_SIZE];
+#endif
+static unsigned char   hold_buf[HOLD_SIZE*2];
+static int             hold_count = 0;
+
+/* MIME preprocessor fifo */
+
+#define MIME_BUF_SIZE   (1024)    /* 2^n ring buffer */
+#define MIME_BUF_MASK   (MIME_BUF_SIZE-1)   
+#define Fifo(n)         mime_buf[(n)&MIME_BUF_MASK]
+static unsigned char           mime_buf[MIME_BUF_SIZE];
+static unsigned int            mime_top = 0;
+static unsigned int            mime_last = 0;  /* decoded */
+static unsigned int            mime_input = 0; /* undecoded */
+static nkf_char (*mime_iconv_back)(nkf_char c2,nkf_char c1,nkf_char c0) = NULL;
+
+/* flags */
+static int             unbuf_f = FALSE;
+static int             estab_f = FALSE;
+static int             nop_f = FALSE;
+static int             binmode_f = TRUE;       /* binary mode */
+static int             rot_f = FALSE;          /* rot14/43 mode */
+static int             hira_f = FALSE;          /* hira/kata henkan */
+static int             input_f = FALSE;        /* non fixed input code  */
+static int             alpha_f = FALSE;        /* convert JIx0208 alphbet to ASCII */
+static int             mime_f = STRICT_MIME;   /* convert MIME B base64 or Q */
+static int             mime_decode_f = FALSE;  /* mime decode is explicitly on */
+static int             mimebuf_f = FALSE;      /* MIME buffered input */
+static int             broken_f = FALSE;       /* convert ESC-less broken JIS */
+static int             iso8859_f = FALSE;      /* ISO8859 through */
+static int             mimeout_f = FALSE;       /* base64 mode */
+#if defined(MSDOS) || defined(__OS2__) 
+static int             x0201_f = TRUE;         /* Assume JISX0201 kana */
+#else
+static int             x0201_f = NO_X0201;     /* Assume NO JISX0201 */
+#endif
+static int             iso2022jp_f = FALSE;    /* convert ISO-2022-JP */
+
+#ifdef UNICODE_NORMALIZATION
+static int nfc_f = FALSE;
+static nkf_char (*i_nfc_getc)(FILE *) = std_getc; /* input of ugetc */
+static nkf_char (*i_nfc_ungetc)(nkf_char c ,FILE *f) = std_ungetc;
+static nkf_char nfc_getc(FILE *f);
+static nkf_char nfc_ungetc(nkf_char c,FILE *f);
+#endif
+
+#ifdef INPUT_OPTION
+static int cap_f = FALSE;
+static nkf_char (*i_cgetc)(FILE *) = std_getc; /* input of cgetc */
+static nkf_char (*i_cungetc)(nkf_char c ,FILE *f) = std_ungetc;
+static nkf_char cap_getc(FILE *f);
+static nkf_char cap_ungetc(nkf_char c,FILE *f);
+
+static int url_f = FALSE;
+static nkf_char (*i_ugetc)(FILE *) = std_getc; /* input of ugetc */
+static nkf_char (*i_uungetc)(nkf_char c ,FILE *f) = std_ungetc;
+static nkf_char url_getc(FILE *f);
+static nkf_char url_ungetc(nkf_char c,FILE *f);
+#endif
+
+#if defined(INT_IS_SHORT)
+#define NKF_INT32_C(n)   (n##L)
+#else
+#define NKF_INT32_C(n)   (n)
+#endif
+#define PREFIX_EUCG3	NKF_INT32_C(0x8F00)
+#define CLASS_MASK	NKF_INT32_C(0xFF000000)
+#define CLASS_UNICODE	NKF_INT32_C(0x01000000)
+#define VALUE_MASK	NKF_INT32_C(0x00FFFFFF)
+#define UNICODE_MAX	NKF_INT32_C(0x0010FFFF)
+#define is_unicode_capsule(c) ((c & CLASS_MASK) == CLASS_UNICODE)
+#define is_unicode_bmp(c) ((c & VALUE_MASK) <= NKF_INT32_C(0xFFFF))
+
+#ifdef NUMCHAR_OPTION
+static int numchar_f = FALSE;
+static nkf_char (*i_ngetc)(FILE *) = std_getc; /* input of ugetc */
+static nkf_char (*i_nungetc)(nkf_char c ,FILE *f) = std_ungetc;
+static nkf_char numchar_getc(FILE *f);
+static nkf_char numchar_ungetc(nkf_char c,FILE *f);
+#endif
+
+#ifdef CHECK_OPTION
+static int noout_f = FALSE;
+static void no_putc(nkf_char c);
+static nkf_char debug_f = FALSE;
+static void debug(const char *str);
+static nkf_char (*iconv_for_check)(nkf_char c2,nkf_char c1,nkf_char c0) = 0;
+#endif
+
+static int guess_f = FALSE;
+#if !defined PERL_XS
+static  void    print_guessed_code(char *filename);
+#endif
+static  void    set_input_codename(char *codename);
+static int is_inputcode_mixed = FALSE;
+static int is_inputcode_set   = FALSE;
+
+#ifdef EXEC_IO
+static int exec_f = 0;
+#endif
+
+#ifdef SHIFTJIS_CP932
+/* invert IBM extended characters to others */
+static int cp51932_f = FALSE;
+
+/* invert NEC-selected IBM extended characters to IBM extended characters */
+static int cp932inv_f = TRUE;
+
+/* static nkf_char cp932_conv(nkf_char c2, nkf_char c1); */
+#endif /* SHIFTJIS_CP932 */
+
+#ifdef X0212_ENABLE
+static int x0212_f = FALSE;
+static nkf_char x0212_shift(nkf_char c);
+static nkf_char x0212_unshift(nkf_char c);
+#endif
+static int x0213_f = FALSE;
+
+static unsigned char prefix_table[256];
+
+static void set_code_score(struct input_code *ptr, nkf_char score);
+static void clr_code_score(struct input_code *ptr, nkf_char score);
+static void status_disable(struct input_code *ptr);
+static void status_push_ch(struct input_code *ptr, nkf_char c);
+static void status_clear(struct input_code *ptr);
+static void status_reset(struct input_code *ptr);
+static void status_reinit(struct input_code *ptr);
+static void status_check(struct input_code *ptr, nkf_char c);
+static void e_status(struct input_code *, nkf_char);
+static void s_status(struct input_code *, nkf_char);
+
+struct input_code input_code_list[] = {
+    {"EUC-JP",    0, 0, 0, {0, 0, 0}, e_status, e_iconv, 0},
+    {"Shift_JIS", 0, 0, 0, {0, 0, 0}, s_status, s_iconv, 0},
+#ifdef UTF8_INPUT_ENABLE
+    {"UTF-8",     0, 0, 0, {0, 0, 0}, w_status, w_iconv, 0},
+    {"UTF-16",    0, 0, 0, {0, 0, 0},     NULL, w_iconv16, 0},
+    {"UTF-32",    0, 0, 0, {0, 0, 0},     NULL, w_iconv32, 0},
+#endif
+    {0}
+};
+
+static int              mimeout_mode = 0;
+static int              base64_count = 0;
+
+/* X0208 -> ASCII converter */
+
+/* fold parameter */
+static int             f_line = 0;    /* chars in line */
+static int             f_prev = 0;
+static int             fold_preserve_f = FALSE; /* preserve new lines */
+static int             fold_f  = FALSE;
+static int             fold_len  = 0;
+
+/* options */
+static unsigned char   kanji_intro = DEFAULT_J;
+static unsigned char   ascii_intro = DEFAULT_R;
+
+/* Folding */
+
+#define FOLD_MARGIN  10
+#define DEFAULT_FOLD 60
+
+static int             fold_margin  = FOLD_MARGIN;
+
+/* converters */
+
+#ifdef DEFAULT_CODE_JIS
+#   define  DEFAULT_CONV j_oconv
+#endif
+#ifdef DEFAULT_CODE_SJIS
+#   define  DEFAULT_CONV s_oconv
+#endif
+#ifdef DEFAULT_CODE_EUC
+#   define  DEFAULT_CONV e_oconv
+#endif
+#ifdef DEFAULT_CODE_UTF8
+#   define  DEFAULT_CONV w_oconv
+#endif
+
+/* process default */
+static void (*output_conv)(nkf_char c2,nkf_char c1) = DEFAULT_CONV;
+
+static void (*oconv)(nkf_char c2,nkf_char c1) = no_connection;
+/* s_iconv or oconv */
+static nkf_char (*iconv)(nkf_char c2,nkf_char c1,nkf_char c0) = no_connection2;
+
+static void (*o_zconv)(nkf_char c2,nkf_char c1) = no_connection;
+static void (*o_fconv)(nkf_char c2,nkf_char c1) = no_connection;
+static void (*o_crconv)(nkf_char c2,nkf_char c1) = no_connection;
+static void (*o_rot_conv)(nkf_char c2,nkf_char c1) = no_connection;
+static void (*o_hira_conv)(nkf_char c2,nkf_char c1) = no_connection;
+static void (*o_base64conv)(nkf_char c2,nkf_char c1) = no_connection;
+static void (*o_iso2022jp_check_conv)(nkf_char c2,nkf_char c1) = no_connection;
+
+/* static redirections */
+
+static  void   (*o_putc)(nkf_char c) = std_putc;
+
+static  nkf_char    (*i_getc)(FILE *f) = std_getc; /* general input */
+static  nkf_char    (*i_ungetc)(nkf_char c,FILE *f) =std_ungetc;
+
+static  nkf_char    (*i_bgetc)(FILE *) = std_getc; /* input of mgetc */
+static  nkf_char    (*i_bungetc)(nkf_char c ,FILE *f) = std_ungetc;
+
+static  void   (*o_mputc)(nkf_char c) = std_putc ; /* output of mputc */
+
+static  nkf_char    (*i_mgetc)(FILE *) = std_getc; /* input of mgetc */
+static  nkf_char    (*i_mungetc)(nkf_char c ,FILE *f) = std_ungetc;
+
+/* for strict mime */
+static  nkf_char    (*i_mgetc_buf)(FILE *) = std_getc; /* input of mgetc_buf */
+static  nkf_char    (*i_mungetc_buf)(nkf_char c,FILE *f) = std_ungetc;
+
+/* Global states */
+static int output_mode = ASCII,    /* output kanji mode */
+           input_mode =  ASCII,    /* input kanji mode */
+           shift_mode =  FALSE;    /* TRUE shift out, or X0201  */
+static int mime_decode_mode =   FALSE;    /* MIME mode B base64, Q hex */
+
+/* X0201 / X0208 conversion tables */
+
+/* X0201 kana conversion table */
+/* 90-9F A0-DF */
+static const
+unsigned char cv[]= {
+    0x21,0x21,0x21,0x23,0x21,0x56,0x21,0x57,
+    0x21,0x22,0x21,0x26,0x25,0x72,0x25,0x21,
+    0x25,0x23,0x25,0x25,0x25,0x27,0x25,0x29,
+    0x25,0x63,0x25,0x65,0x25,0x67,0x25,0x43,
+    0x21,0x3c,0x25,0x22,0x25,0x24,0x25,0x26,
+    0x25,0x28,0x25,0x2a,0x25,0x2b,0x25,0x2d,
+    0x25,0x2f,0x25,0x31,0x25,0x33,0x25,0x35,
+    0x25,0x37,0x25,0x39,0x25,0x3b,0x25,0x3d,
+    0x25,0x3f,0x25,0x41,0x25,0x44,0x25,0x46,
+    0x25,0x48,0x25,0x4a,0x25,0x4b,0x25,0x4c,
+    0x25,0x4d,0x25,0x4e,0x25,0x4f,0x25,0x52,
+    0x25,0x55,0x25,0x58,0x25,0x5b,0x25,0x5e,
+    0x25,0x5f,0x25,0x60,0x25,0x61,0x25,0x62,
+    0x25,0x64,0x25,0x66,0x25,0x68,0x25,0x69,
+    0x25,0x6a,0x25,0x6b,0x25,0x6c,0x25,0x6d,
+    0x25,0x6f,0x25,0x73,0x21,0x2b,0x21,0x2c,
+    0x00,0x00};
+
+
+/* X0201 kana conversion table for daguten */
+/* 90-9F A0-DF */
+static const
+unsigned char dv[]= { 
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x74,
+    0x00,0x00,0x00,0x00,0x25,0x2c,0x25,0x2e,
+    0x25,0x30,0x25,0x32,0x25,0x34,0x25,0x36,
+    0x25,0x38,0x25,0x3a,0x25,0x3c,0x25,0x3e,
+    0x25,0x40,0x25,0x42,0x25,0x45,0x25,0x47,
+    0x25,0x49,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x25,0x50,0x25,0x53,
+    0x25,0x56,0x25,0x59,0x25,0x5c,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00};
+
+/* X0201 kana conversion table for han-daguten */
+/* 90-9F A0-DF */
+static const
+unsigned char ev[]= { 
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x25,0x51,0x25,0x54,
+    0x25,0x57,0x25,0x5a,0x25,0x5d,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00};
+
+
+/* X0208 kigou conversion table */
+/* 0x8140 - 0x819e */
+static const
+unsigned char fv[] = {
+
+    0x00,0x00,0x00,0x00,0x2c,0x2e,0x00,0x3a,
+    0x3b,0x3f,0x21,0x00,0x00,0x27,0x60,0x00,
+    0x5e,0x00,0x5f,0x00,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x2d,0x00,0x2f,
+    0x5c,0x00,0x00,0x7c,0x00,0x00,0x60,0x27,
+    0x22,0x22,0x28,0x29,0x00,0x00,0x5b,0x5d,
+    0x7b,0x7d,0x3c,0x3e,0x00,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x2b,0x2d,0x00,0x00,
+    0x00,0x3d,0x00,0x3c,0x3e,0x00,0x00,0x00,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+    0x24,0x00,0x00,0x25,0x23,0x26,0x2a,0x40,
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+} ;
+
+
+#define    CRLF      1
+
+static int             file_out_f = FALSE;
+#ifdef OVERWRITE
+static int             overwrite_f = FALSE;
+static int             preserve_time_f = FALSE;
+static int             backup_f = FALSE;
+static char            *backup_suffix = "";
+static char *get_backup_filename(const char *suffix, const char *filename);
+#endif
+
+static int             crmode_f = 0;   /* CR, NL, CRLF */
+#ifdef EASYWIN /*Easy Win */
+static int             end_check;
+#endif /*Easy Win */
+
+#define STD_GC_BUFSIZE (256)
+nkf_char std_gc_buf[STD_GC_BUFSIZE];
+nkf_char std_gc_ndx;
+
+#ifdef WIN32DLL
+#include "nkf32dll.c"
+#elif defined(PERL_XS)
+#else /* WIN32DLL */
+int main(int argc, char **argv)
+{
+    FILE  *fin;
+    unsigned char  *cp;
+
+    char *outfname = NULL;
+    char *origfname;
+
+#ifdef EASYWIN /*Easy Win */
+    _BufferSize.y = 400;/*Set Scroll Buffer Size*/
+#endif
+
+    for (argc--,argv++; (argc > 0) && **argv == '-'; argc--, argv++) {
+        cp = (unsigned char *)*argv;
+        options(cp);
+#ifdef EXEC_IO
+        if (exec_f){
+            int fds[2], pid;
+            if (pipe(fds) < 0 || (pid = fork()) < 0){
+                abort();
+            }
+            if (pid == 0){
+                if (exec_f > 0){
+                    close(fds[0]);
+                    dup2(fds[1], 1);
+                }else{
+                    close(fds[1]);
+                    dup2(fds[0], 0);
+                }
+                execvp(argv[1], &argv[1]);
+            }
+            if (exec_f > 0){
+                close(fds[1]);
+                dup2(fds[0], 0);
+            }else{
+                close(fds[0]);
+                dup2(fds[1], 1);
+            }
+            argc = 0;
+            break;
+        }
+#endif
+    }
+    if(x0201_f == WISH_TRUE)
+         x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
+
+    if (binmode_f == TRUE)
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+    if (freopen("","wb",stdout) == NULL) 
+        return (-1);
+#else
+    setbinmode(stdout);
+#endif
+
+    if (unbuf_f)
+      setbuf(stdout, (char *) NULL);
+    else
+      setvbuffer(stdout, (char *) stdobuf, IOBUF_SIZE);
+
+    if (argc == 0) {
+      if (binmode_f == TRUE)
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+      if (freopen("","rb",stdin) == NULL) return (-1);
+#else
+      setbinmode(stdin);
+#endif
+      setvbuffer(stdin, (char *) stdibuf, IOBUF_SIZE);
+      if (nop_f)
+          noconvert(stdin);
+      else {
+          kanji_convert(stdin);
+          if (guess_f) print_guessed_code(NULL);
+      }
+    } else {
+      int nfiles = argc;
+	int is_argument_error = FALSE;
+      while (argc--) {
+	    is_inputcode_mixed = FALSE;
+	    is_inputcode_set   = FALSE;
+	    input_codename = "";
+#ifdef CHECK_OPTION
+	    iconv_for_check = 0;
+#endif
+          if ((fin = fopen((origfname = *argv++), "r")) == NULL) {
+              perror(*--argv);
+		*argv++;
+		is_argument_error = TRUE;
+		continue;
+          } else {
+#ifdef OVERWRITE
+              int fd = 0;
+              int fd_backup = 0;
+#endif
+
+/* reopen file for stdout */
+              if (file_out_f == TRUE) {
+#ifdef OVERWRITE
+                  if (overwrite_f){
+                      outfname = malloc(strlen(origfname)
+                                        + strlen(".nkftmpXXXXXX")
+                                        + 1);
+                      if (!outfname){
+                          perror(origfname);
+                          return -1;
+                      }
+                      strcpy(outfname, origfname);
+#ifdef MSDOS
+                      {
+                          int i;
+                          for (i = strlen(outfname); i; --i){
+                              if (outfname[i - 1] == '/'
+                                  || outfname[i - 1] == '\\'){
+                                  break;
+                              }
+                          }
+                          outfname[i] = '\0';
+                      }
+                      strcat(outfname, "ntXXXXXX");
+                      mktemp(outfname);
+			fd = open(outfname, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL,
+                                S_IREAD | S_IWRITE);
+#else
+                      strcat(outfname, ".nkftmpXXXXXX");
+                      fd = mkstemp(outfname);
+#endif
+                      if (fd < 0
+                          || (fd_backup = dup(fileno(stdout))) < 0
+                          || dup2(fd, fileno(stdout)) < 0
+                          ){
+                          perror(origfname);
+                          return -1;
+                      }
+                  }else
+#endif
+		  if(argc == 1 ) {
+		      outfname = *argv++;
+		      argc--;
+		  } else {
+		      outfname = "nkf.out";
+		  }
+
+		  if(freopen(outfname, "w", stdout) == NULL) {
+		      perror (outfname);
+		      return (-1);
+		  }
+                  if (binmode_f == TRUE) {
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+                      if (freopen("","wb",stdout) == NULL) 
+                           return (-1);
+#else
+                      setbinmode(stdout);
+#endif
+                  }
+              }
+              if (binmode_f == TRUE)
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+                 if (freopen("","rb",fin) == NULL) 
+                    return (-1);
+#else
+                 setbinmode(fin);
+#endif 
+              setvbuffer(fin, (char *) stdibuf, IOBUF_SIZE);
+              if (nop_f)
+                  noconvert(fin);
+              else {
+                  char *filename = NULL;
+                  kanji_convert(fin);
+                  if (nfiles > 1) filename = origfname;
+                  if (guess_f) print_guessed_code(filename);
+              }
+              fclose(fin);
+#ifdef OVERWRITE
+              if (overwrite_f) {
+                  struct stat     sb;
+#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
+                  time_t tb[2];
+#else
+                  struct utimbuf  tb;
+#endif
+
+                  fflush(stdout);
+                  close(fd);
+                  if (dup2(fd_backup, fileno(stdout)) < 0){
+                      perror("dup2");
+                  }
+                  if (stat(origfname, &sb)) {
+                      fprintf(stderr, "Can't stat %s\n", origfname);
+                  }
+                  /* $B%Q!<%_%C%7%g%s$rI|85(B */
+                  if (chmod(outfname, sb.st_mode)) {
+                      fprintf(stderr, "Can't set permission %s\n", outfname);
+                  }
+
+                  /* $B%?%$%`%9%?%s%W$rI|85(B */
+		    if(preserve_time_f){
+#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
+			tb[0] = tb[1] = sb.st_mtime;
+			if (utime(outfname, tb)) {
+			    fprintf(stderr, "Can't set timestamp %s\n", outfname);
+			}
+#else
+			tb.actime  = sb.st_atime;
+			tb.modtime = sb.st_mtime;
+			if (utime(outfname, &tb)) {
+			    fprintf(stderr, "Can't set timestamp %s\n", outfname);
+			}
+#endif
+		    }
+		    if(backup_f){
+			char *backup_filename = get_backup_filename(backup_suffix, origfname);
+#ifdef MSDOS
+			unlink(backup_filename);
+#endif
+			if (rename(origfname, backup_filename)) {
+			    perror(backup_filename);
+			    fprintf(stderr, "Can't rename %s to %s\n",
+				    origfname, backup_filename);
+			}
+		    }else{
+#ifdef MSDOS
+			if (unlink(origfname)){
+			    perror(origfname);
+			}
+#endif
+		    }
+                  if (rename(outfname, origfname)) {
+                      perror(origfname);
+                      fprintf(stderr, "Can't rename %s to %s\n",
+                              outfname, origfname);
+                  }
+                  free(outfname);
+              }
+#endif
+          }
+      }
+	if (is_argument_error)
+	    return(-1);
+    }
+#ifdef EASYWIN /*Easy Win */
+    if (file_out_f == FALSE) 
+        scanf("%d",&end_check);
+    else 
+        fclose(stdout);
+#else /* for Other OS */
+    if (file_out_f == TRUE) 
+        fclose(stdout);
+#endif /*Easy Win */
+    return (0);
+}
+#endif /* WIN32DLL */
+
+#ifdef OVERWRITE
+char *get_backup_filename(const char *suffix, const char *filename)
+{
+    char *backup_filename;
+    int asterisk_count = 0;
+    int i, j;
+    int filename_length = strlen(filename);
+
+    for(i = 0; suffix[i]; i++){
+	if(suffix[i] == '*') asterisk_count++;
+    }
+
+    if(asterisk_count){
+	backup_filename = malloc(strlen(suffix) + (asterisk_count * (filename_length - 1)) + 1);
+	if (!backup_filename){
+	    perror("Can't malloc backup filename.");
+	    return NULL;
+	}
+
+	for(i = 0, j = 0; suffix[i];){
+	    if(suffix[i] == '*'){
+		backup_filename[j] = '\0';
+		strncat(backup_filename, filename, filename_length);
+		i++;
+		j += filename_length;
+	    }else{
+		backup_filename[j++] = suffix[i++];
+	    }
+	}
+	backup_filename[j] = '\0';
+    }else{
+	j = strlen(suffix) + filename_length;
+	backup_filename = malloc( + 1);
+	strcpy(backup_filename, filename);
+	strcat(backup_filename, suffix);
+	backup_filename[j] = '\0';
+    }
+    return backup_filename;
+}
+#endif
+
+static const
+struct {
+    const char *name;
+    const char *alias;
+} long_option[] = {
+    {"ic=", ""},
+    {"oc=", ""},
+    {"base64","jMB"},
+    {"euc","e"},
+    {"euc-input","E"},
+    {"fj","jm"},
+    {"help","v"},
+    {"jis","j"},
+    {"jis-input","J"},
+    {"mac","sLm"},
+    {"mime","jM"},
+    {"mime-input","m"},
+    {"msdos","sLw"},
+    {"sjis","s"},
+    {"sjis-input","S"},
+    {"unix","eLu"},
+    {"version","V"},
+    {"windows","sLw"},
+    {"hiragana","h1"},
+    {"katakana","h2"},
+    {"katakana-hiragana","h3"},
+    {"guess", "g"},
+    {"cp932", ""},
+    {"no-cp932", ""},
+#ifdef X0212_ENABLE
+    {"x0212", ""},
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+    {"utf8", "w"},
+    {"utf16", "w16"},
+    {"ms-ucs-map", ""},
+    {"fb-skip", ""},
+    {"fb-html", ""},
+    {"fb-xml", ""},
+    {"fb-perl", ""},
+    {"fb-java", ""},
+    {"fb-subchar", ""},
+    {"fb-subchar=", ""},
+#endif
+#ifdef UTF8_INPUT_ENABLE
+    {"utf8-input", "W"},
+    {"utf16-input", "W16"},
+    {"no-cp932ext", ""},
+    {"no-best-fit-chars",""},
+#endif
+#ifdef UNICODE_NORMALIZATION
+    {"utf8mac-input", ""},
+#endif
+#ifdef OVERWRITE
+    {"overwrite", ""},
+    {"overwrite=", ""},
+    {"in-place", ""},
+    {"in-place=", ""},
+#endif
+#ifdef INPUT_OPTION
+    {"cap-input", ""},
+    {"url-input", ""},
+#endif
+#ifdef NUMCHAR_OPTION
+    {"numchar-input", ""},
+#endif
+#ifdef CHECK_OPTION
+    {"no-output", ""},
+    {"debug", ""},
+#endif
+#ifdef SHIFTJIS_CP932
+    {"cp932inv", ""},
+#endif
+#ifdef EXEC_IO
+    {"exec-in", ""},
+    {"exec-out", ""},
+#endif
+    {"prefix=", ""},
+};
+
+static int option_mode = 0;
+
+void options(unsigned char *cp)
+{
+    nkf_char i, j;
+    unsigned char *p;
+    unsigned char *cp_back = NULL;
+    char codeset[32];
+
+    if (option_mode==1)
+	return;
+    while(*cp && *cp++!='-');
+    while (*cp || cp_back) {
+	if(!*cp){
+	    cp = cp_back;
+	    cp_back = NULL;
+	    continue;
+	}
+	p = 0;
+        switch (*cp++) {
+        case '-':  /* literal options */
+	    if (!*cp || *cp == SPACE) {        /* ignore the rest of arguments */
+		option_mode = 1;
+		return;
+	    }
+            for (i=0;i<sizeof(long_option)/sizeof(long_option[0]);i++) {
+                p = (unsigned char *)long_option[i].name;
+                for (j=0;*p && *p != '=' && *p == cp[j];p++, j++);
+		if (*p == cp[j] || cp[j] == ' '){
+		    p = &cp[j] + 1;
+		    break;
+		}
+		p = 0;
+            }
+	    if (p == 0) return;
+	    while(*cp && *cp != SPACE && cp++);
+            if (long_option[i].alias[0]){
+		cp_back = cp;
+		cp = (unsigned char *)long_option[i].alias;
+	    }else{
+                if (strcmp(long_option[i].name, "ic=") == 0){
+		    for (i=0; i < 16 && SPACE < p[i] && p[i] < DEL; i++){
+			codeset[i] = nkf_toupper(p[i]);
+		    }
+		    codeset[i] = 0;
+		    if(strcmp(codeset, "ISO-2022-JP") == 0){
+			input_f = JIS_INPUT;
+		    }else if(strcmp(codeset, "X-ISO2022JP-CP932") == 0 ||
+		      strcmp(codeset, "CP50220") == 0 ||
+		      strcmp(codeset, "CP50221") == 0 ||
+		      strcmp(codeset, "CP50222") == 0){
+			input_f = JIS_INPUT;
+#ifdef SHIFTJIS_CP932
+			cp51932_f = TRUE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+		    }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){
+			input_f = JIS_INPUT;
+#ifdef X0212_ENABLE
+			x0212_f = TRUE;
+#endif
+		    }else if(strcmp(codeset, "ISO-2022-JP-3") == 0){
+			input_f = JIS_INPUT;
+#ifdef X0212_ENABLE
+			x0212_f = TRUE;
+#endif
+			x0213_f = TRUE;
+		    }else if(strcmp(codeset, "SHIFT_JIS") == 0){
+			input_f = SJIS_INPUT;
+		    }else if(strcmp(codeset, "WINDOWS-31J") == 0 ||
+			     strcmp(codeset, "CSWINDOWS31J") == 0 ||
+			     strcmp(codeset, "CP932") == 0 ||
+			     strcmp(codeset, "MS932") == 0){
+			input_f = SJIS_INPUT;
+#ifdef SHIFTJIS_CP932
+			cp51932_f = TRUE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+		    }else if(strcmp(codeset, "EUCJP") == 0 ||
+			     strcmp(codeset, "EUC-JP") == 0){
+			input_f = EUC_INPUT;
+		    }else if(strcmp(codeset, "CP51932") == 0){
+			input_f = EUC_INPUT;
+#ifdef SHIFTJIS_CP932
+			cp51932_f = TRUE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+		    }else if(strcmp(codeset, "EUC-JP-MS") == 0 ||
+			     strcmp(codeset, "EUCJP-MS") == 0 ||
+			     strcmp(codeset, "EUCJPMS") == 0){
+			input_f = EUC_INPUT;
+#ifdef SHIFTJIS_CP932
+			cp51932_f = FALSE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_MS;
+#endif
+		    }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 ||
+			     strcmp(codeset, "EUCJP-ASCII") == 0){
+			input_f = EUC_INPUT;
+#ifdef SHIFTJIS_CP932
+			cp51932_f = FALSE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_ASCII;
+#endif
+		    }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 ||
+			     strcmp(codeset, "SHIFT_JIS-2004") == 0){
+			input_f = SJIS_INPUT;
+			x0213_f = TRUE;
+#ifdef SHIFTJIS_CP932
+			cp51932_f = FALSE;
+#endif
+		    }else if(strcmp(codeset, "EUC-JISX0213") == 0 ||
+			     strcmp(codeset, "EUC-JIS-2004") == 0){
+			input_f = EUC_INPUT;
+			x0213_f = TRUE;
+#ifdef SHIFTJIS_CP932
+			cp51932_f = FALSE;
+#endif
+#ifdef UTF8_INPUT_ENABLE
+		    }else if(strcmp(codeset, "UTF-8") == 0 ||
+			     strcmp(codeset, "UTF-8N") == 0 ||
+			     strcmp(codeset, "UTF-8-BOM") == 0){
+			input_f = UTF8_INPUT;
+#ifdef UNICODE_NORMALIZATION
+		    }else if(strcmp(codeset, "UTF8-MAC") == 0 ||
+			     strcmp(codeset, "UTF-8-MAC") == 0){
+			input_f = UTF8_INPUT;
+			nfc_f = TRUE;
+#endif
+		    }else if(strcmp(codeset, "UTF-16") == 0 ||
+			     strcmp(codeset, "UTF-16BE") == 0 ||
+			     strcmp(codeset, "UTF-16BE-BOM") == 0){
+			input_f = UTF16_INPUT;
+			input_endian = ENDIAN_BIG;
+		    }else if(strcmp(codeset, "UTF-16LE") == 0 ||
+			     strcmp(codeset, "UTF-16LE-BOM") == 0){
+			input_f = UTF16_INPUT;
+			input_endian = ENDIAN_LITTLE;
+		    }else if(strcmp(codeset, "UTF-32") == 0 ||
+			     strcmp(codeset, "UTF-32BE") == 0 ||
+			     strcmp(codeset, "UTF-32BE-BOM") == 0){
+			input_f = UTF32_INPUT;
+			input_endian = ENDIAN_BIG;
+		    }else if(strcmp(codeset, "UTF-32LE") == 0 ||
+			     strcmp(codeset, "UTF-32LE-BOM") == 0){
+			input_f = UTF32_INPUT;
+			input_endian = ENDIAN_LITTLE;
+#endif
+		    }
+                    continue;
+		}
+                if (strcmp(long_option[i].name, "oc=") == 0){
+		    x0201_f = FALSE;
+		    for (i=0; i < 16 && SPACE < p[i] && p[i] < DEL; i++){
+			codeset[i] = nkf_toupper(p[i]);
+		    }
+		    codeset[i] = 0;
+		    if(strcmp(codeset, "ISO-2022-JP") == 0){
+			output_conv = j_oconv;
+		    }else if(strcmp(codeset, "X-ISO2022JP-CP932") == 0){
+			output_conv = j_oconv;
+			no_cp932ext_f = TRUE;
+#ifdef SHIFTJIS_CP932
+			cp932inv_f = FALSE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+		    }else if(strcmp(codeset, "CP50220") == 0){
+			output_conv = j_oconv;
+			x0201_f = TRUE;
+#ifdef SHIFTJIS_CP932
+			cp932inv_f = FALSE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+		    }else if(strcmp(codeset, "CP50221") == 0){
+			output_conv = j_oconv;
+#ifdef SHIFTJIS_CP932
+			cp932inv_f = FALSE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+		    }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){
+			output_conv = j_oconv;
+#ifdef X0212_ENABLE
+			x0212_f = TRUE;
+#endif
+#ifdef SHIFTJIS_CP932
+			cp932inv_f = FALSE;
+#endif
+		    }else if(strcmp(codeset, "ISO-2022-JP-3") == 0){
+			output_conv = j_oconv;
+#ifdef X0212_ENABLE
+			x0212_f = TRUE;
+#endif
+			x0213_f = TRUE;
+#ifdef SHIFTJIS_CP932
+			cp932inv_f = FALSE;
+#endif
+		    }else if(strcmp(codeset, "SHIFT_JIS") == 0){
+			output_conv = s_oconv;
+		    }else if(strcmp(codeset, "WINDOWS-31J") == 0 ||
+			     strcmp(codeset, "CSWINDOWS31J") == 0 ||
+			     strcmp(codeset, "CP932") == 0 ||
+			     strcmp(codeset, "MS932") == 0){
+			output_conv = s_oconv;
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+		    }else if(strcmp(codeset, "EUCJP") == 0 ||
+			     strcmp(codeset, "EUC-JP") == 0){
+			output_conv = e_oconv;
+		    }else if(strcmp(codeset, "CP51932") == 0){
+			output_conv = e_oconv;
+#ifdef SHIFTJIS_CP932
+			cp932inv_f = FALSE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+		    }else if(strcmp(codeset, "EUC-JP-MS") == 0 ||
+			     strcmp(codeset, "EUCJP-MS") == 0 ||
+			     strcmp(codeset, "EUCJPMS") == 0){
+			output_conv = e_oconv;
+#ifdef X0212_ENABLE
+			x0212_f = TRUE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_MS;
+#endif
+		    }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 ||
+			     strcmp(codeset, "EUCJP-ASCII") == 0){
+			output_conv = e_oconv;
+#ifdef X0212_ENABLE
+			x0212_f = TRUE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_ASCII;
+#endif
+		    }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 ||
+			     strcmp(codeset, "SHIFT_JIS-2004") == 0){
+			output_conv = s_oconv;
+			x0213_f = TRUE;
+#ifdef SHIFTJIS_CP932
+			cp932inv_f = FALSE;
+#endif
+		    }else if(strcmp(codeset, "EUC-JISX0213") == 0 ||
+			     strcmp(codeset, "EUC-JIS-2004") == 0){
+			output_conv = e_oconv;
+#ifdef X0212_ENABLE
+			x0212_f = TRUE;
+#endif
+			x0213_f = TRUE;
+#ifdef SHIFTJIS_CP932
+			cp932inv_f = FALSE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+		    }else if(strcmp(codeset, "UTF-8") == 0){
+			output_conv = w_oconv;
+		    }else if(strcmp(codeset, "UTF-8N") == 0){
+			output_conv = w_oconv;
+		    }else if(strcmp(codeset, "UTF-8-BOM") == 0){
+			output_conv = w_oconv;
+			output_bom_f = TRUE;
+		    }else if(strcmp(codeset, "UTF-16BE") == 0){
+			output_conv = w_oconv16;
+		    }else if(strcmp(codeset, "UTF-16") == 0 ||
+			     strcmp(codeset, "UTF-16BE-BOM") == 0){
+			output_conv = w_oconv16;
+			output_bom_f = TRUE;
+		    }else if(strcmp(codeset, "UTF-16LE") == 0){
+			output_conv = w_oconv16;
+			output_endian = ENDIAN_LITTLE;
+		    }else if(strcmp(codeset, "UTF-16LE-BOM") == 0){
+			output_conv = w_oconv16;
+			output_endian = ENDIAN_LITTLE;
+			output_bom_f = TRUE;
+		    }else if(strcmp(codeset, "UTF-32") == 0 ||
+			     strcmp(codeset, "UTF-32BE") == 0){
+			output_conv = w_oconv32;
+		    }else if(strcmp(codeset, "UTF-32BE-BOM") == 0){
+			output_conv = w_oconv32;
+			output_bom_f = TRUE;
+		    }else if(strcmp(codeset, "UTF-32LE") == 0){
+			output_conv = w_oconv32;
+			output_endian = ENDIAN_LITTLE;
+		    }else if(strcmp(codeset, "UTF-32LE-BOM") == 0){
+			output_conv = w_oconv32;
+			output_endian = ENDIAN_LITTLE;
+			output_bom_f = TRUE;
+#endif
+		    }
+                    continue;
+		}
+#ifdef OVERWRITE
+                if (strcmp(long_option[i].name, "overwrite") == 0){
+                    file_out_f = TRUE;
+                    overwrite_f = TRUE;
+		    preserve_time_f = TRUE;
+                    continue;
+                }
+                if (strcmp(long_option[i].name, "overwrite=") == 0){
+                    file_out_f = TRUE;
+                    overwrite_f = TRUE;
+		    preserve_time_f = TRUE;
+		    backup_f = TRUE;
+		    backup_suffix = malloc(strlen((char *) p) + 1);
+		    strcpy(backup_suffix, (char *) p);
+                    continue;
+                }
+                if (strcmp(long_option[i].name, "in-place") == 0){
+                    file_out_f = TRUE;
+                    overwrite_f = TRUE;
+		    preserve_time_f = FALSE;
+		    continue;
+                }
+                if (strcmp(long_option[i].name, "in-place=") == 0){
+                    file_out_f = TRUE;
+                    overwrite_f = TRUE;
+		    preserve_time_f = FALSE;
+		    backup_f = TRUE;
+		    backup_suffix = malloc(strlen((char *) p) + 1);
+		    strcpy(backup_suffix, (char *) p);
+		    continue;
+                }
+#endif
+#ifdef INPUT_OPTION
+                if (strcmp(long_option[i].name, "cap-input") == 0){
+                    cap_f = TRUE;
+                    continue;
+                }
+                if (strcmp(long_option[i].name, "url-input") == 0){
+                    url_f = TRUE;
+                    continue;
+                }
+#endif
+#ifdef NUMCHAR_OPTION
+                if (strcmp(long_option[i].name, "numchar-input") == 0){
+                    numchar_f = TRUE;
+                    continue;
+                }
+#endif
+#ifdef CHECK_OPTION
+                if (strcmp(long_option[i].name, "no-output") == 0){
+                    noout_f = TRUE;
+                    continue;
+                }
+                if (strcmp(long_option[i].name, "debug") == 0){
+                    debug_f = TRUE;
+                    continue;
+                }
+#endif
+                if (strcmp(long_option[i].name, "cp932") == 0){
+#ifdef SHIFTJIS_CP932
+                    cp51932_f = TRUE;
+                    cp932inv_f = TRUE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+                    ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+                    continue;
+                }
+                if (strcmp(long_option[i].name, "no-cp932") == 0){
+#ifdef SHIFTJIS_CP932
+                    cp51932_f = FALSE;
+                    cp932inv_f = FALSE;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+                    ms_ucs_map_f = UCS_MAP_ASCII;
+#endif
+                    continue;
+                }
+#ifdef SHIFTJIS_CP932
+                if (strcmp(long_option[i].name, "cp932inv") == 0){
+                    cp932inv_f = TRUE;
+                    continue;
+                }
+#endif
+
+#ifdef X0212_ENABLE
+                if (strcmp(long_option[i].name, "x0212") == 0){
+                    x0212_f = TRUE;
+                    continue;
+                }
+#endif
+
+#ifdef EXEC_IO
+                  if (strcmp(long_option[i].name, "exec-in") == 0){
+                      exec_f = 1;
+                      return;
+                  }
+                  if (strcmp(long_option[i].name, "exec-out") == 0){
+                      exec_f = -1;
+                      return;
+                  }
+#endif
+#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE)
+                if (strcmp(long_option[i].name, "no-cp932ext") == 0){
+		    no_cp932ext_f = TRUE;
+                    continue;
+                }
+		if (strcmp(long_option[i].name, "no-best-fit-chars") == 0){
+		    no_best_fit_chars_f = TRUE;
+		    continue;
+		}
+                if (strcmp(long_option[i].name, "fb-skip") == 0){
+		    encode_fallback = NULL;
+                    continue;
+                }
+                if (strcmp(long_option[i].name, "fb-html") == 0){
+		    encode_fallback = encode_fallback_html;
+                    continue;
+                }
+                if (strcmp(long_option[i].name, "fb-xml" ) == 0){
+		    encode_fallback = encode_fallback_xml;
+                    continue;
+                }
+                if (strcmp(long_option[i].name, "fb-java") == 0){
+		    encode_fallback = encode_fallback_java;
+                    continue;
+                }
+                if (strcmp(long_option[i].name, "fb-perl") == 0){
+		    encode_fallback = encode_fallback_perl;
+                    continue;
+                }
+                if (strcmp(long_option[i].name, "fb-subchar") == 0){
+		    encode_fallback = encode_fallback_subchar;
+                    continue;
+                }
+                if (strcmp(long_option[i].name, "fb-subchar=") == 0){
+		    encode_fallback = encode_fallback_subchar;
+		    unicode_subchar = 0;
+		    if (p[0] != '0'){
+			/* decimal number */
+			for (i = 0; i < 7 && nkf_isdigit(p[i]); i++){
+			    unicode_subchar *= 10;
+			    unicode_subchar += hex2bin(p[i]);
+			}
+		    }else if(p[1] == 'x' || p[1] == 'X'){
+			/* hexadecimal number */
+			for (i = 2; i < 8 && nkf_isxdigit(p[i]); i++){
+			    unicode_subchar <<= 4;
+			    unicode_subchar |= hex2bin(p[i]);
+			}
+		    }else{
+			/* octal number */
+			for (i = 1; i < 8 && nkf_isoctal(p[i]); i++){
+			    unicode_subchar *= 8;
+			    unicode_subchar += hex2bin(p[i]);
+			}
+		    }
+		    w16e_conv(unicode_subchar, &i, &j);
+		    unicode_subchar = i<<8 | j;
+                    continue;
+                }
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+                if (strcmp(long_option[i].name, "ms-ucs-map") == 0){
+                    ms_ucs_map_f = UCS_MAP_MS;
+                    continue;
+                }
+#endif
+#ifdef UNICODE_NORMALIZATION
+		if (strcmp(long_option[i].name, "utf8mac-input") == 0){
+		    input_f = UTF8_INPUT;
+		    nfc_f = TRUE;
+		    continue;
+		}
+#endif
+                if (strcmp(long_option[i].name, "prefix=") == 0){
+                    if (nkf_isgraph(p[0])){
+                        for (i = 1; nkf_isgraph(p[i]); i++){
+                            prefix_table[p[i]] = p[0];
+                        }
+                    }
+                    continue;
+                }
+            }
+            continue;
+        case 'b':           /* buffered mode */
+            unbuf_f = FALSE;
+            continue;
+        case 'u':           /* non bufferd mode */
+            unbuf_f = TRUE;
+            continue;
+        case 't':           /* transparent mode */
+            if (*cp=='1') {
+		/* alias of -t */
+		nop_f = TRUE;
+		*cp++;
+	    } else if (*cp=='2') {
+		/*
+		 * -t with put/get
+		 *
+		 * nkf -t2MB hoge.bin | nkf -t2mB | diff -s - hoge.bin
+		 *
+		 */
+		nop_f = 2;
+		*cp++;
+            } else
+		nop_f = TRUE;
+            continue;
+        case 'j':           /* JIS output */
+        case 'n':
+            output_conv = j_oconv;
+            continue;
+        case 'e':           /* AT&T EUC output */
+            output_conv = e_oconv;
+            cp932inv_f = FALSE;
+            continue;
+        case 's':           /* SJIS output */
+            output_conv = s_oconv;
+            continue;
+        case 'l':           /* ISO8859 Latin-1 support, no conversion */
+            iso8859_f = TRUE;  /* Only compatible with ISO-2022-JP */
+            input_f = LATIN1_INPUT;
+            continue;
+        case 'i':           /* Kanji IN ESC-$-@/B */
+            if (*cp=='@'||*cp=='B') 
+                kanji_intro = *cp++;
+            continue;
+        case 'o':           /* ASCII IN ESC-(-J/B */
+            if (*cp=='J'||*cp=='B'||*cp=='H') 
+                ascii_intro = *cp++;
+            continue;
+        case 'h':
+            /*  
+                bit:1   katakana->hiragana
+                bit:2   hiragana->katakana
+            */
+            if ('9'>= *cp && *cp>='0') 
+                hira_f |= (*cp++ -'0');
+            else 
+                hira_f |= 1;
+            continue;
+        case 'r':
+            rot_f = TRUE;
+            continue;
+#if defined(MSDOS) || defined(__OS2__) 
+        case 'T':
+            binmode_f = FALSE;
+            continue;
+#endif
+#ifndef PERL_XS
+        case 'V':
+            version();
+            exit(1);
+            break;
+        case 'v':
+            usage();
+            exit(1);
+            break;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+        case 'w':           /* UTF-8 output */
+            if (cp[0] == '8') {
+		output_conv = w_oconv; cp++;
+		if (cp[0] == '0'){
+		    cp++;
+		} else {
+		    output_bom_f = TRUE;
+		}
+	    } else {
+		if ('1'== cp[0] && '6'==cp[1]) {
+		    output_conv = w_oconv16; cp+=2;
+		} else if ('3'== cp[0] && '2'==cp[1]) {
+		    output_conv = w_oconv32; cp+=2;
+		} else {
+		    output_conv = w_oconv;
+		    continue;
+		}
+		if (cp[0]=='L') {
+		    cp++;
+		    output_endian = ENDIAN_LITTLE;
+		} else if (cp[0] == 'B') {
+		    cp++;
+                } else {
+		    continue;
+                }
+		if (cp[0] == '0'){
+		    cp++;
+		} else {
+		    output_bom_f = TRUE;
+		}
+	    }
+            continue;
+#endif
+#ifdef UTF8_INPUT_ENABLE
+        case 'W':           /* UTF input */
+	    if (cp[0] == '8') {
+		cp++;
+		input_f = UTF8_INPUT;
+	    }else{
+		if ('1'== cp[0] && '6'==cp[1]) {
+		    cp += 2;
+		    input_f = UTF16_INPUT;
+		    input_endian = ENDIAN_BIG;
+		} else if ('3'== cp[0] && '2'==cp[1]) {
+		    cp += 2;
+		    input_f = UTF32_INPUT;
+		    input_endian = ENDIAN_BIG;
+		} else {
+		    input_f = UTF8_INPUT;
+		    continue;
+		}
+		if (cp[0]=='L') {
+		    cp++;
+		    input_endian = ENDIAN_LITTLE;
+		} else if (cp[0] == 'B') {
+		    cp++;
+		}
+	    }
+            continue;
+#endif
+        /* Input code assumption */
+        case 'J':   /* JIS input */
+            input_f = JIS_INPUT;
+            continue;
+        case 'E':   /* AT&T EUC input */
+            input_f = EUC_INPUT;
+            continue;
+        case 'S':   /* MS Kanji input */
+            input_f = SJIS_INPUT;
+            if (x0201_f==NO_X0201) x0201_f=TRUE;
+            continue;
+        case 'Z':   /* Convert X0208 alphabet to asii */
+            /*  bit:0   Convert X0208
+                bit:1   Convert Kankaku to one space
+                bit:2   Convert Kankaku to two spaces
+                bit:3   Convert HTML Entity
+            */
+            if ('9'>= *cp && *cp>='0') 
+                alpha_f |= 1<<(*cp++ -'0');
+            else 
+                alpha_f |= TRUE;
+            continue;
+        case 'x':   /* Convert X0201 kana to X0208 or X0201 Conversion */
+            x0201_f = FALSE;    /* No X0201->X0208 conversion */
+            /* accept  X0201
+                    ESC-(-I     in JIS, EUC, MS Kanji
+                    SI/SO       in JIS, EUC, MS Kanji
+                    SSO         in EUC, JIS, not in MS Kanji
+                    MS Kanji (0xa0-0xdf) 
+               output  X0201
+                    ESC-(-I     in JIS (0x20-0x5f)
+                    SSO         in EUC (0xa0-0xdf)
+                    0xa0-0xd    in MS Kanji (0xa0-0xdf) 
+            */
+            continue;
+        case 'X':   /* Assume X0201 kana */
+            /* Default value is NO_X0201 for EUC/MS-Kanji mix */
+            x0201_f = TRUE;
+            continue;
+        case 'F':   /* prserve new lines */
+	    fold_preserve_f = TRUE;
+        case 'f':   /* folding -f60 or -f */
+            fold_f = TRUE;
+            fold_len = 0;
+            while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
+		fold_len *= 10;
+		fold_len += *cp++ - '0';
+	    }
+            if (!(0<fold_len && fold_len<BUFSIZ)) 
+                fold_len = DEFAULT_FOLD;
+	    if (*cp=='-') {
+		fold_margin = 0;
+		cp++;
+		while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
+		    fold_margin *= 10;
+		    fold_margin += *cp++ - '0';
+		}
+	    }
+            continue;
+        case 'm':   /* MIME support */
+            /* mime_decode_f = TRUE; */ /* this has too large side effects... */
+            if (*cp=='B'||*cp=='Q') {
+                mime_decode_mode = *cp++;
+                mimebuf_f = FIXED_MIME;
+            } else if (*cp=='N') {
+                mime_f = TRUE; cp++;
+            } else if (*cp=='S') {
+                mime_f = STRICT_MIME; cp++;
+            } else if (*cp=='0') {
+                mime_decode_f = FALSE;
+                mime_f = FALSE; cp++;
+            }
+            continue;
+        case 'M':   /* MIME output */
+            if (*cp=='B') {
+                mimeout_mode = 'B';
+                mimeout_f = FIXED_MIME; cp++;
+            } else if (*cp=='Q') {
+                mimeout_mode = 'Q';
+                mimeout_f = FIXED_MIME; cp++;
+            } else {
+		mimeout_f = TRUE;
+	    }
+            continue;
+        case 'B':   /* Broken JIS support */
+            /*  bit:0   no ESC JIS
+                bit:1   allow any x on ESC-(-x or ESC-$-x
+                bit:2   reset to ascii on NL
+            */
+            if ('9'>= *cp && *cp>='0') 
+                broken_f |= 1<<(*cp++ -'0');
+            else 
+                broken_f |= TRUE;
+            continue;
+#ifndef PERL_XS
+        case 'O':/* for Output file */
+            file_out_f = TRUE;
+            continue;
+#endif
+        case 'c':/* add cr code */
+            crmode_f = CRLF;
+            continue;
+        case 'd':/* delete cr code */
+            crmode_f = NL;
+            continue;
+        case 'I':   /* ISO-2022-JP output */
+            iso2022jp_f = TRUE;
+            continue;
+        case 'L':  /* line mode */
+            if (*cp=='u') {         /* unix */
+                crmode_f = NL; cp++;
+            } else if (*cp=='m') { /* mac */
+                crmode_f = CR; cp++;
+            } else if (*cp=='w') { /* windows */
+                crmode_f = CRLF; cp++;
+            } else if (*cp=='0') { /* no conversion  */
+                crmode_f = 0; cp++;
+            }
+            continue;
+        case 'g':
+#ifndef PERL_XS
+            guess_f = TRUE;
+#endif
+            continue;
+        case ' ':    
+        /* module muliple options in a string are allowed for Perl moudle  */
+	    while(*cp && *cp++!='-');
+            continue;
+        default:
+            /* bogus option but ignored */
+            continue;
+        }
+    }
+}
+
+struct input_code * find_inputcode_byfunc(nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
+{
+    if (iconv_func){
+        struct input_code *p = input_code_list;
+        while (p->name){
+            if (iconv_func == p->iconv_func){
+                return p;
+            }
+            p++;
+        }
+    }
+    return 0;
+}
+
+void set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
+{
+#ifdef INPUT_CODE_FIX
+    if (f || !input_f)
+#endif
+        if (estab_f != f){
+            estab_f = f;
+        }
+
+    if (iconv_func
+#ifdef INPUT_CODE_FIX
+        && (f == -TRUE || !input_f) /* -TRUE means "FORCE" */
+#endif
+        ){
+        iconv = iconv_func;
+    }
+#ifdef CHECK_OPTION
+    if (estab_f && iconv_for_check != iconv){
+        struct input_code *p = find_inputcode_byfunc(iconv);
+        if (p){
+            set_input_codename(p->name);
+            debug(input_codename);
+        }
+        iconv_for_check = iconv;
+    }
+#endif
+}
+
+#define SCORE_L2       (1)                   /* $BBh(B2$B?e=`4A;z(B */
+#define SCORE_KANA     (SCORE_L2 << 1)       /* $B$$$o$f$kH>3Q%+%J(B */
+#define SCORE_DEPEND   (SCORE_KANA << 1)     /* $B5!<o0MB8J8;z(B */
+#ifdef SHIFTJIS_CP932
+#define SCORE_CP932    (SCORE_DEPEND << 1)   /* CP932 $B$K$h$kFI$_49$((B */
+#define SCORE_NO_EXIST (SCORE_CP932 << 1)    /* $BB8:_$7$J$$J8;z(B */
+#else
+#define SCORE_NO_EXIST (SCORE_DEPEND << 1)   /* $BB8:_$7$J$$J8;z(B */
+#endif
+#define SCORE_iMIME    (SCORE_NO_EXIST << 1) /* MIME $B$K$h$k;XDj(B */
+#define SCORE_ERROR    (SCORE_iMIME << 1) /* $B%(%i!<(B */
+
+#define SCORE_INIT (SCORE_iMIME)
+
+const nkf_char score_table_A0[] = {
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
+    SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_NO_EXIST,
+};
+
+const nkf_char score_table_F0[] = {
+    SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2,
+    SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST,
+    SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND,
+    SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_ERROR,
+};
+
+void set_code_score(struct input_code *ptr, nkf_char score)
+{
+    if (ptr){
+        ptr->score |= score;
+    }
+}
+
+void clr_code_score(struct input_code *ptr, nkf_char score)
+{
+    if (ptr){
+        ptr->score &= ~score;
+    }
+}
+
+void code_score(struct input_code *ptr)
+{
+    nkf_char c2 = ptr->buf[0];
+#ifdef UTF8_OUTPUT_ENABLE
+    nkf_char c1 = ptr->buf[1];
+#endif
+    if (c2 < 0){
+        set_code_score(ptr, SCORE_ERROR);
+    }else if (c2 == SSO){
+        set_code_score(ptr, SCORE_KANA);
+#ifdef UTF8_OUTPUT_ENABLE
+    }else if (!e2w_conv(c2, c1)){
+        set_code_score(ptr, SCORE_NO_EXIST);
+#endif
+    }else if ((c2 & 0x70) == 0x20){
+        set_code_score(ptr, score_table_A0[c2 & 0x0f]);
+    }else if ((c2 & 0x70) == 0x70){
+        set_code_score(ptr, score_table_F0[c2 & 0x0f]);
+    }else if ((c2 & 0x70) >= 0x50){
+        set_code_score(ptr, SCORE_L2);
+    }
+}
+
+void status_disable(struct input_code *ptr)
+{
+    ptr->stat = -1;
+    ptr->buf[0] = -1;
+    code_score(ptr);
+    if (iconv == ptr->iconv_func) set_iconv(FALSE, 0);
+}
+
+void status_push_ch(struct input_code *ptr, nkf_char c)
+{
+    ptr->buf[ptr->index++] = c;
+}
+
+void status_clear(struct input_code *ptr)
+{
+    ptr->stat = 0;
+    ptr->index = 0;
+}
+
+void status_reset(struct input_code *ptr)
+{
+    status_clear(ptr);
+    ptr->score = SCORE_INIT;
+}
+
+void status_reinit(struct input_code *ptr)
+{
+    status_reset(ptr);
+    ptr->_file_stat = 0;
+}
+
+void status_check(struct input_code *ptr, nkf_char c)
+{
+    if (c <= DEL && estab_f){
+        status_reset(ptr);
+    }
+}
+
+void s_status(struct input_code *ptr, nkf_char c)
+{
+    switch(ptr->stat){
+      case -1:
+          status_check(ptr, c);
+          break;
+      case 0:
+          if (c <= DEL){
+              break;
+#ifdef NUMCHAR_OPTION
+          }else if (is_unicode_capsule(c)){
+              break;
+#endif
+          }else if (0xa1 <= c && c <= 0xdf){
+              status_push_ch(ptr, SSO);
+              status_push_ch(ptr, c);
+              code_score(ptr);
+              status_clear(ptr);
+          }else if ((0x81 <= c && c < 0xa0) || (0xe0 <= c && c <= 0xef)){
+              ptr->stat = 1;
+              status_push_ch(ptr, c);
+#ifdef SHIFTJIS_CP932
+          }else if (cp51932_f
+                    && is_ibmext_in_sjis(c)){
+              ptr->stat = 2;
+              status_push_ch(ptr, c);
+#endif /* SHIFTJIS_CP932 */
+#ifdef X0212_ENABLE
+          }else if (x0212_f && 0xf0 <= c && c <= 0xfc){
+              ptr->stat = 1;
+              status_push_ch(ptr, c);
+#endif /* X0212_ENABLE */
+          }else{
+              status_disable(ptr);
+          }
+          break;
+      case 1:
+          if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
+              status_push_ch(ptr, c);
+              s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]);
+              code_score(ptr);
+              status_clear(ptr);
+          }else{
+              status_disable(ptr);
+          }
+          break;
+      case 2:
+#ifdef SHIFTJIS_CP932
+          if ((0x40 <= c && c <= 0x7e) || (0x80 <= c && c <= 0xfc)){
+              status_push_ch(ptr, c);
+              if (s2e_conv(ptr->buf[0], ptr->buf[1], &ptr->buf[0], &ptr->buf[1]) == 0){
+                  set_code_score(ptr, SCORE_CP932);
+                  status_clear(ptr);
+                  break;
+              }
+          }
+#endif /* SHIFTJIS_CP932 */
+#ifndef X0212_ENABLE
+          status_disable(ptr);
+#endif
+          break;
+    }
+}
+
+void e_status(struct input_code *ptr, nkf_char c)
+{
+    switch (ptr->stat){
+      case -1:
+          status_check(ptr, c);
+          break;
+      case 0:
+          if (c <= DEL){
+              break;
+#ifdef NUMCHAR_OPTION
+          }else if (is_unicode_capsule(c)){
+              break;
+#endif
+          }else if (SSO == c || (0xa1 <= c && c <= 0xfe)){
+              ptr->stat = 1;
+              status_push_ch(ptr, c);
+#ifdef X0212_ENABLE
+          }else if (0x8f == c){
+              ptr->stat = 2;
+              status_push_ch(ptr, c);
+#endif /* X0212_ENABLE */
+          }else{
+              status_disable(ptr);
+          }
+          break;
+      case 1:
+          if (0xa1 <= c && c <= 0xfe){
+              status_push_ch(ptr, c);
+              code_score(ptr);
+              status_clear(ptr);
+          }else{
+              status_disable(ptr);
+          }
+          break;
+#ifdef X0212_ENABLE
+      case 2:
+          if (0xa1 <= c && c <= 0xfe){
+              ptr->stat = 1;
+              status_push_ch(ptr, c);
+          }else{
+              status_disable(ptr);
+          }
+#endif /* X0212_ENABLE */
+    }
+}
+
+#ifdef UTF8_INPUT_ENABLE
+void w_status(struct input_code *ptr, nkf_char c)
+{
+    switch (ptr->stat){
+      case -1:
+          status_check(ptr, c);
+          break;
+      case 0:
+          if (c <= DEL){
+              break;
+#ifdef NUMCHAR_OPTION
+          }else if (is_unicode_capsule(c)){
+              break;
+#endif
+          }else if (0xc0 <= c && c <= 0xdf){
+              ptr->stat = 1;
+              status_push_ch(ptr, c);
+          }else if (0xe0 <= c && c <= 0xef){
+              ptr->stat = 2;
+              status_push_ch(ptr, c);
+          }else if (0xf0 <= c && c <= 0xf4){
+              ptr->stat = 3;
+              status_push_ch(ptr, c);
+          }else{
+              status_disable(ptr);
+          }
+          break;
+      case 1:
+      case 2:
+          if (0x80 <= c && c <= 0xbf){
+              status_push_ch(ptr, c);
+              if (ptr->index > ptr->stat){
+                  int bom = (ptr->buf[0] == 0xef && ptr->buf[1] == 0xbb
+                             && ptr->buf[2] == 0xbf);
+                  w2e_conv(ptr->buf[0], ptr->buf[1], ptr->buf[2],
+                           &ptr->buf[0], &ptr->buf[1]);
+                  if (!bom){
+                      code_score(ptr);
+                  }
+                  status_clear(ptr);
+              }
+          }else{
+              status_disable(ptr);
+          }
+          break;
+      case 3:
+	if (0x80 <= c && c <= 0xbf){
+	    if (ptr->index < ptr->stat){
+		status_push_ch(ptr, c);
+	    } else {
+	    	status_clear(ptr);
+	    }
+          }else{
+              status_disable(ptr);
+          }
+          break;
+    }
+}
+#endif
+
+void code_status(nkf_char c)
+{
+    int action_flag = 1;
+    struct input_code *result = 0;
+    struct input_code *p = input_code_list;
+    while (p->name){
+        if (!p->status_func) {
+	    ++p;
+	    continue;
+	}
+        if (!p->status_func)
+	    continue;
+        (p->status_func)(p, c);
+        if (p->stat > 0){
+            action_flag = 0;
+        }else if(p->stat == 0){
+            if (result){
+                action_flag = 0;
+            }else{
+                result = p;
+            }
+        }
+        ++p;
+    }
+
+    if (action_flag){
+        if (result && !estab_f){
+            set_iconv(TRUE, result->iconv_func);
+        }else if (c <= DEL){
+            struct input_code *ptr = input_code_list;
+            while (ptr->name){
+                status_reset(ptr);
+                ++ptr;
+            }
+        }
+    }
+}
+
+#ifndef WIN32DLL
+nkf_char std_getc(FILE *f)
+{
+    if (std_gc_ndx){
+        return std_gc_buf[--std_gc_ndx];
+    }
+    return getc(f);
+}
+#endif /*WIN32DLL*/
+
+nkf_char std_ungetc(nkf_char c, FILE *f)
+{
+    if (std_gc_ndx == STD_GC_BUFSIZE){
+        return EOF;
+    }
+    std_gc_buf[std_gc_ndx++] = c;
+    return c;
+}
+
+#ifndef WIN32DLL
+void std_putc(nkf_char c)
+{
+    if(c!=EOF)
+      putchar(c);
+}
+#endif /*WIN32DLL*/
+
+#if !defined(PERL_XS) && !defined(WIN32DLL)
+nkf_char noconvert(FILE *f)
+{
+    nkf_char    c;
+
+    if (nop_f == 2)
+	module_connection();
+    while ((c = (*i_getc)(f)) != EOF)
+      (*o_putc)(c);
+    (*o_putc)(EOF);
+    return 1;
+}
+#endif
+
+void module_connection(void)
+{
+    oconv = output_conv; 
+    o_putc = std_putc;
+
+    /* replace continucation module, from output side */
+
+    /* output redicrection */
+#ifdef CHECK_OPTION
+    if (noout_f || guess_f){
+        o_putc = no_putc;
+    }
+#endif
+    if (mimeout_f) {
+	o_mputc = o_putc;
+	o_putc = mime_putc;
+	if (mimeout_f == TRUE) {
+	    o_base64conv = oconv; oconv = base64_conv;
+	}
+	/* base64_count = 0; */
+    }
+
+    if (crmode_f) {
+	o_crconv = oconv; oconv = cr_conv;
+    }
+    if (rot_f) {
+	o_rot_conv = oconv; oconv = rot_conv;
+    }
+    if (iso2022jp_f) {
+	o_iso2022jp_check_conv = oconv; oconv = iso2022jp_check_conv;
+    }
+    if (hira_f) {
+	o_hira_conv = oconv; oconv = hira_conv;
+    }
+    if (fold_f) {
+	o_fconv = oconv; oconv = fold_conv;
+	f_line = 0;
+    }
+    if (alpha_f || x0201_f) {
+	o_zconv = oconv; oconv = z_conv;
+    }
+
+    i_getc = std_getc;
+    i_ungetc = std_ungetc;
+    /* input redicrection */
+#ifdef INPUT_OPTION
+    if (cap_f){
+        i_cgetc = i_getc; i_getc = cap_getc;
+        i_cungetc = i_ungetc; i_ungetc= cap_ungetc;
+    }
+    if (url_f){
+        i_ugetc = i_getc; i_getc = url_getc;
+        i_uungetc = i_ungetc; i_ungetc= url_ungetc;
+    }
+#endif
+#ifdef NUMCHAR_OPTION
+    if (numchar_f){
+        i_ngetc = i_getc; i_getc = numchar_getc;
+        i_nungetc = i_ungetc; i_ungetc= numchar_ungetc;
+    }
+#endif
+#ifdef UNICODE_NORMALIZATION
+    if (nfc_f && input_f == UTF8_INPUT){
+        i_nfc_getc = i_getc; i_getc = nfc_getc;
+        i_nfc_ungetc = i_ungetc; i_ungetc= nfc_ungetc;
+    }
+#endif
+    if (mime_f && mimebuf_f==FIXED_MIME) {
+	i_mgetc = i_getc; i_getc = mime_getc;
+	i_mungetc = i_ungetc; i_ungetc = mime_ungetc;
+    }
+    if (broken_f & 1) {
+	i_bgetc = i_getc; i_getc = broken_getc;
+	i_bungetc = i_ungetc; i_ungetc = broken_ungetc;
+    }
+    if (input_f == JIS_INPUT || input_f == EUC_INPUT || input_f == LATIN1_INPUT) {
+        set_iconv(-TRUE, e_iconv);
+    } else if (input_f == SJIS_INPUT) {
+        set_iconv(-TRUE, s_iconv);
+#ifdef UTF8_INPUT_ENABLE
+    } else if (input_f == UTF8_INPUT) {
+        set_iconv(-TRUE, w_iconv);
+    } else if (input_f == UTF16_INPUT) {
+        set_iconv(-TRUE, w_iconv16);
+    } else if (input_f == UTF32_INPUT) {
+        set_iconv(-TRUE, w_iconv32);
+#endif
+    } else {
+        set_iconv(FALSE, e_iconv);
+    }
+
+    {
+        struct input_code *p = input_code_list;
+        while (p->name){
+            status_reinit(p++);
+        }
+    }
+}
+
+/*
+ * Check and Ignore BOM
+ */
+void check_bom(FILE *f)
+{
+    int c2;
+    switch(c2 = (*i_getc)(f)){
+    case 0x00:
+	if((c2 = (*i_getc)(f)) == 0x00){
+	    if((c2 = (*i_getc)(f)) == 0xFE){
+		if((c2 = (*i_getc)(f)) == 0xFF){
+		    if(!input_f){
+			set_iconv(TRUE, w_iconv32);
+		    }
+		    if (iconv == w_iconv32) {
+			input_endian = ENDIAN_BIG;
+			return;
+		    }
+		    (*i_ungetc)(0xFF,f);
+		}else (*i_ungetc)(c2,f);
+		(*i_ungetc)(0xFE,f);
+	    }else if(c2 == 0xFF){
+		if((c2 = (*i_getc)(f)) == 0xFE){
+		    if(!input_f){
+			set_iconv(TRUE, w_iconv32);
+		    }
+		    if (iconv == w_iconv32) {
+			input_endian = ENDIAN_2143;
+			return;
+		    }
+		    (*i_ungetc)(0xFF,f);
+		}else (*i_ungetc)(c2,f);
+		(*i_ungetc)(0xFF,f);
+	    }else (*i_ungetc)(c2,f);
+	    (*i_ungetc)(0x00,f);
+	}else (*i_ungetc)(c2,f);
+	(*i_ungetc)(0x00,f);
+	break;
+    case 0xEF:
+	if((c2 = (*i_getc)(f)) == 0xBB){
+	    if((c2 = (*i_getc)(f)) == 0xBF){
+		if(!input_f){
+		    set_iconv(TRUE, w_iconv);
+		}
+		if (iconv == w_iconv) {
+		    return;
+		}
+		(*i_ungetc)(0xBF,f);
+	    }else (*i_ungetc)(c2,f);
+	    (*i_ungetc)(0xBB,f);
+	}else (*i_ungetc)(c2,f);
+	(*i_ungetc)(0xEF,f);
+	break;
+    case 0xFE:
+	if((c2 = (*i_getc)(f)) == 0xFF){
+	    if((c2 = (*i_getc)(f)) == 0x00){
+		if((c2 = (*i_getc)(f)) == 0x00){
+		    if(!input_f){
+			set_iconv(TRUE, w_iconv32);
+		    }
+		    if (iconv == w_iconv32) {
+			input_endian = ENDIAN_3412;
+			return;
+		    }
+		    (*i_ungetc)(0x00,f);
+		}else (*i_ungetc)(c2,f);
+		(*i_ungetc)(0x00,f);
+	    }else (*i_ungetc)(c2,f);
+	    if(!input_f){
+		set_iconv(TRUE, w_iconv16);
+	    }
+	    if (iconv == w_iconv16) {
+		input_endian = ENDIAN_BIG;
+		return;
+	    }
+	    (*i_ungetc)(0xFF,f);
+	}else (*i_ungetc)(c2,f);
+	(*i_ungetc)(0xFE,f);
+	break;
+    case 0xFF:
+	if((c2 = (*i_getc)(f)) == 0xFE){
+	    if((c2 = (*i_getc)(f)) == 0x00){
+		if((c2 = (*i_getc)(f)) == 0x00){
+		    if(!input_f){
+			set_iconv(TRUE, w_iconv32);
+		    }
+		    if (iconv == w_iconv32) {
+			input_endian = ENDIAN_LITTLE;
+			return;
+		    }
+		    (*i_ungetc)(0x00,f);
+		}else (*i_ungetc)(c2,f);
+		(*i_ungetc)(0x00,f);
+	    }else (*i_ungetc)(c2,f);
+	    if(!input_f){
+		set_iconv(TRUE, w_iconv16);
+	    }
+	    if (iconv == w_iconv16) {
+		input_endian = ENDIAN_LITTLE;
+		return;
+	    }
+	    (*i_ungetc)(0xFE,f);
+	}else (*i_ungetc)(c2,f);
+	(*i_ungetc)(0xFF,f);
+	break;
+    default:
+	(*i_ungetc)(c2,f);
+	break;
+    }
+}
+
+/*
+   Conversion main loop. Code detection only. 
+ */
+
+nkf_char kanji_convert(FILE *f)
+{
+    nkf_char    c3, c2=0, c1, c0=0;
+    int is_8bit = FALSE;
+
+    if(input_f == SJIS_INPUT || input_f == EUC_INPUT
+#ifdef UTF8_INPUT_ENABLE
+       || input_f == UTF8_INPUT || input_f == UTF16_INPUT
+#endif
+      ){
+	is_8bit = TRUE;
+    }
+
+    input_mode = ASCII;
+    output_mode = ASCII;
+    shift_mode = FALSE;
+
+#define NEXT continue      /* no output, get next */
+#define SEND ;             /* output c1 and c2, get next */
+#define LAST break         /* end of loop, go closing  */
+
+    module_connection();
+    check_bom(f);
+
+    while ((c1 = (*i_getc)(f)) != EOF) {
+#ifdef INPUT_CODE_FIX
+	if (!input_f)
+#endif
+	    code_status(c1);
+        if (c2) {
+            /* second byte */
+            if (c2 > ((input_f == JIS_INPUT && ms_ucs_map_f) ? 0x92 : DEL)) {
+                /* in case of 8th bit is on */
+                if (!estab_f&&!mime_decode_mode) {
+                    /* in case of not established yet */
+                    /* It is still ambiguious */
+                    if (h_conv(f, c2, c1)==EOF) 
+                        LAST;
+                    else 
+                        c2 = 0;
+                    NEXT;
+                } else {
+		    /* in case of already established */
+		    if (c1 < AT) {
+			/* ignore bogus code and not CP5022x UCD */
+			c2 = 0;
+			NEXT;
+		    } else {
+			SEND;
+		    }
+		}
+            } else
+                /* second byte, 7 bit code */
+                /* it might be kanji shitfted */
+                if ((c1 == DEL) || (c1 <= SPACE)) {
+                    /* ignore bogus first code */
+                    c2 = 0;
+                    NEXT;
+                } else
+                    SEND;
+        } else {
+            /* first byte */
+#ifdef UTF8_INPUT_ENABLE
+	    if (iconv == w_iconv16) {
+		if (input_endian == ENDIAN_BIG) {
+		    c2 = c1;
+		    if ((c1 = (*i_getc)(f)) != EOF) {
+			if (0xD8 <= c2 && c2 <= 0xDB) {
+			    if ((c0 = (*i_getc)(f)) != EOF) {
+				c0 <<= 8;
+				if ((c3 = (*i_getc)(f)) != EOF) {
+				    c0 |= c3;
+				} else c2 = EOF;
+			    } else c2 = EOF;
+			}
+		    } else c2 = EOF;
+		} else {
+		    if ((c2 = (*i_getc)(f)) != EOF) {
+			if (0xD8 <= c2 && c2 <= 0xDB) {
+			    if ((c3 = (*i_getc)(f)) != EOF) {
+				if ((c0 = (*i_getc)(f)) != EOF) {
+				    c0 <<= 8;
+				    c0 |= c3;
+				} else c2 = EOF;
+			    } else c2 = EOF;
+			}
+		    } else c2 = EOF;
+		}
+		SEND;
+            } else if(iconv == w_iconv32){
+		int c3 = c1;
+		if((c2 = (*i_getc)(f)) != EOF &&
+		   (c1 = (*i_getc)(f)) != EOF &&
+		   (c0 = (*i_getc)(f)) != EOF){
+		    switch(input_endian){
+		    case ENDIAN_BIG:
+			c1 = (c2&0xFF)<<16 | (c1&0xFF)<<8 | (c0&0xFF);
+			break;
+		    case ENDIAN_LITTLE:
+			c1 = (c3&0xFF) | (c2&0xFF)<<8 | (c1&0xFF)<<16;
+			break;
+		    case ENDIAN_2143:
+			c1 = (c3&0xFF)<<16 | (c1&0xFF) | (c0&0xFF)<<8;
+			break;
+		    case ENDIAN_3412:
+			c1 = (c3&0xFF)<<8 | (c2&0xFF) | (c0&0xFF)<<16;
+			break;
+		    }
+		    c2 = 0;
+		}else{
+		    c2 = EOF;
+		}
+		SEND;
+            } else
+#endif
+#ifdef NUMCHAR_OPTION
+            if (is_unicode_capsule(c1)){
+                SEND;
+	    } else
+#endif
+	    if (c1 > ((input_f == JIS_INPUT && ms_ucs_map_f) ? 0x92 : DEL)) {
+                /* 8 bit code */
+                if (!estab_f && !iso8859_f) {
+                    /* not established yet */
+                    c2 = c1;
+                    NEXT;
+                } else { /* estab_f==TRUE */
+                    if (iso8859_f) {
+                        c2 = ISO8859_1;
+                        c1 &= 0x7f;
+                        SEND;
+                    } else if (SSP<=c1 && c1<0xe0 && iconv == s_iconv) {
+                        /* SJIS X0201 Case... */
+                        if(iso2022jp_f && x0201_f==NO_X0201) {
+                            (*oconv)(GETA1, GETA2);
+                            NEXT;
+                        } else {
+			    c2 = X0201;
+			    c1 &= 0x7f;
+			    SEND;
+			}
+                    } else if (c1==SSO && iconv != s_iconv) {
+                        /* EUC X0201 Case */
+                        c1 = (*i_getc)(f);  /* skip SSO */
+                        code_status(c1);
+                        if (SSP<=c1 && c1<0xe0) {
+			    if(iso2022jp_f &&  x0201_f==NO_X0201) {
+				(*oconv)(GETA1, GETA2);
+				NEXT;
+			    } else {
+				c2 = X0201;
+				c1 &= 0x7f;
+				SEND;
+			    }
+                        } else  { /* bogus code, skip SSO and one byte */
+                            NEXT;
+                        }
+                    } else {
+                       /* already established */
+                       c2 = c1;
+                       NEXT;
+                    }
+                }
+            } else if ((c1 > SPACE) && (c1 != DEL)) {
+                /* in case of Roman characters */
+                if (shift_mode) { 
+                    /* output 1 shifted byte */
+                    if (iso8859_f) {
+                        c2 = ISO8859_1;
+                        SEND;
+                    } else if (SPACE<=c1 && c1<(0xe0&0x7f) ){
+                      /* output 1 shifted byte */
+			if(iso2022jp_f && x0201_f==NO_X0201) {
+			    (*oconv)(GETA1, GETA2);
+			    NEXT;
+			} else {
+			    c2 = X0201;
+			    SEND;
+			}
+                    } else {
+                        /* look like bogus code */
+                        NEXT;
+                    }
+                } else if (input_mode == X0208 || input_mode == X0212 ||
+			   input_mode == X0213_1 || input_mode == X0213_2) {
+                    /* in case of Kanji shifted */
+                    c2 = c1;
+                    NEXT;
+                } else if (c1 == '=' && mime_f && !mime_decode_mode ) {
+                    /* Check MIME code */
+                    if ((c1 = (*i_getc)(f)) == EOF) {
+                        (*oconv)(0, '=');
+                        LAST;
+                    } else if (c1 == '?') {
+                        /* =? is mime conversion start sequence */
+			if(mime_f == STRICT_MIME) {
+			    /* check in real detail */
+			    if (mime_begin_strict(f) == EOF) 
+				LAST;
+			    else
+				NEXT;
+			} else if (mime_begin(f) == EOF) 
+                            LAST;
+                        else
+                            NEXT;
+                    } else {
+                        (*oconv)(0, '=');
+                        (*i_ungetc)(c1,f);
+                        NEXT;
+                    }
+                } else {
+                    /* normal ASCII code */ 
+                    SEND;
+                }
+            } else if (c1 == SI && (!is_8bit || mime_decode_mode)) {
+                shift_mode = FALSE; 
+                NEXT;
+            } else if (c1 == SO && (!is_8bit || mime_decode_mode)) {
+                shift_mode = TRUE; 
+                NEXT;
+            } else if (c1 == ESC && (!is_8bit || mime_decode_mode)) {
+                if ((c1 = (*i_getc)(f)) == EOF) {
+                    /*  (*oconv)(0, ESC); don't send bogus code */
+                    LAST;
+                } else if (c1 == '$') {
+                    if ((c1 = (*i_getc)(f)) == EOF) {
+                        /*
+                        (*oconv)(0, ESC); don't send bogus code 
+                        (*oconv)(0, '$'); */
+                        LAST;
+                    } else if (c1 == '@'|| c1 == 'B') {
+                        /* This is kanji introduction */
+                        input_mode = X0208;
+                        shift_mode = FALSE;
+                        set_input_codename("ISO-2022-JP");
+#ifdef CHECK_OPTION
+                        debug(input_codename);
+#endif
+                        NEXT;
+                    } else if (c1 == '(') {
+                        if ((c1 = (*i_getc)(f)) == EOF) {
+                            /* don't send bogus code 
+                            (*oconv)(0, ESC);
+                            (*oconv)(0, '$');
+                            (*oconv)(0, '(');
+                                */
+                            LAST;
+                        } else if (c1 == '@'|| c1 == 'B') {
+                            /* This is kanji introduction */
+                            input_mode = X0208;
+                            shift_mode = FALSE;
+                            NEXT;
+#ifdef X0212_ENABLE
+                        } else if (c1 == 'D'){
+                            input_mode = X0212;
+                            shift_mode = FALSE;
+                            NEXT;
+#endif /* X0212_ENABLE */
+                        } else if (c1 == (X0213_1&0x7F)){
+                            input_mode = X0213_1;
+                            shift_mode = FALSE;
+                            NEXT;
+                        } else if (c1 == (X0213_2&0x7F)){
+                            input_mode = X0213_2;
+                            shift_mode = FALSE;
+                            NEXT;
+                        } else {
+                            /* could be some special code */
+                            (*oconv)(0, ESC);
+                            (*oconv)(0, '$');
+                            (*oconv)(0, '(');
+                            (*oconv)(0, c1);
+                            NEXT;
+                        }
+                    } else if (broken_f&0x2) {
+                        /* accept any ESC-(-x as broken code ... */
+                        input_mode = X0208;
+                        shift_mode = FALSE;
+                        NEXT;
+                    } else {
+                        (*oconv)(0, ESC);
+                        (*oconv)(0, '$');
+                        (*oconv)(0, c1);
+                        NEXT;
+                    }
+                } else if (c1 == '(') {
+                    if ((c1 = (*i_getc)(f)) == EOF) {
+                        /* don't send bogus code 
+                        (*oconv)(0, ESC);
+                        (*oconv)(0, '('); */
+                        LAST;
+                    } else {
+                        if (c1 == 'I') {
+                            /* This is X0201 kana introduction */
+                            input_mode = X0201; shift_mode = X0201;
+                            NEXT;
+                        } else if (c1 == 'B' || c1 == 'J' || c1 == 'H') {
+                            /* This is X0208 kanji introduction */
+                            input_mode = ASCII; shift_mode = FALSE;
+                            NEXT;
+                        } else if (broken_f&0x2) {
+                            input_mode = ASCII; shift_mode = FALSE;
+                            NEXT;
+                        } else {
+                            (*oconv)(0, ESC);
+                            (*oconv)(0, '(');
+                            /* maintain various input_mode here */
+                            SEND;
+                        }
+                    }
+               } else if ( c1 == 'N' || c1 == 'n' ){
+                   /* SS2 */
+                   c3 = (*i_getc)(f);  /* skip SS2 */
+                   if ( (SPACE<=c3 && c3 < 0x60) || (0xa0<=c3 && c3 < 0xe0)){
+                       c1 = c3;
+                       c2 = X0201;
+                       SEND;
+                   }else{
+                       (*i_ungetc)(c3, f);
+                       /* lonely ESC  */
+                       (*oconv)(0, ESC);
+                       SEND;
+                   }
+                } else {
+                    /* lonely ESC  */
+                    (*oconv)(0, ESC);
+                    SEND;
+                }
+	    } else if (c1 == ESC && iconv == s_iconv) {
+		/* ESC in Shift_JIS */
+		if ((c1 = (*i_getc)(f)) == EOF) {
+		    /*  (*oconv)(0, ESC); don't send bogus code */
+		    LAST;
+		} else if (c1 == '$') {
+		    /* J-PHONE emoji */
+		    if ((c1 = (*i_getc)(f)) == EOF) {
+			/*
+			   (*oconv)(0, ESC); don't send bogus code 
+			   (*oconv)(0, '$'); */
+			LAST;
+		    } else {
+			if (('E' <= c1 && c1 <= 'G') ||
+			    ('O' <= c1 && c1 <= 'Q')) {
+			    /*
+			       NUM : 0 1 2 3 4 5
+			       BYTE: G E F O P Q
+			       C%7 : 1 6 0 2 3 4
+			       C%7 : 0 1 2 3 4 5 6
+			       NUM : 2 0 3 4 5 X 1
+			     */
+			    static const int jphone_emoji_first_table[7] = {2, 0, 3, 4, 5, 0, 1};
+			    c0 = (jphone_emoji_first_table[c1 % 7] << 8) - SPACE + 0xE000 + CLASS_UNICODE;
+			    while ((c1 = (*i_getc)(f)) != EOF) {
+				if (SPACE <= c1 && c1 <= 'z') {
+				    (*oconv)(0, c1 + c0);
+				} else break; /* c1 == SO */
+			    }
+			}
+		    }
+		    if (c1 == EOF) LAST;
+		    NEXT;
+		} else {
+		    /* lonely ESC  */
+		    (*oconv)(0, ESC);
+		    SEND;
+		}
+            } else if ((c1 == NL || c1 == CR) && broken_f&4) {
+                input_mode = ASCII; set_iconv(FALSE, 0);
+                SEND;
+	    } else if (c1 == NL && mime_decode_f && !mime_decode_mode ) {
+		if ((c1=(*i_getc)(f))!=EOF && c1 == SPACE) {
+		    i_ungetc(SPACE,f);
+		    continue;
+		} else {
+		    i_ungetc(c1,f);
+		}
+		c1 = NL;
+		SEND;
+	    } else if (c1 == CR && mime_decode_f && !mime_decode_mode ) {
+		if ((c1=(*i_getc)(f))!=EOF) {
+		    if (c1==SPACE) {
+			i_ungetc(SPACE,f);
+			continue;
+		    } else if (c1 == NL && (c1=(*i_getc)(f))!=EOF && c1 == SPACE) {
+			i_ungetc(SPACE,f);
+			continue;
+		    } else {
+			i_ungetc(c1,f);
+		    }
+		    i_ungetc(NL,f);
+		} else {
+		    i_ungetc(c1,f);
+		}
+		c1 = CR;
+		SEND;
+	    } else if (c1 == DEL && input_mode == X0208 ) {
+		/* CP5022x */
+		c2 = c1;
+		NEXT;
+	    } else 
+                SEND;
+        }
+        /* send: */
+	switch(input_mode){
+	case ASCII:
+	    switch ((*iconv)(c2, c1, c0)) {  /* can be EUC / SJIS / UTF-8 / UTF-16 */
+	    case -2:
+		/* 4 bytes UTF-8 */
+		if ((c0 = (*i_getc)(f)) != EOF) {
+		    code_status(c0);
+		    c0 <<= 8;
+		    if ((c3 = (*i_getc)(f)) != EOF) {
+			code_status(c3);
+			(*iconv)(c2, c1, c0|c3);
+		    }
+		}
+		break;
+	    case -1:
+		/* 3 bytes EUC or UTF-8 */
+		if ((c0 = (*i_getc)(f)) != EOF) {
+		    code_status(c0);
+		    (*iconv)(c2, c1, c0);
+		}
+		break;
+	    }
+	    break;
+	case X0208:
+	case X0213_1:
+	    if (ms_ucs_map_f &&
+		0x7F <= c2 && c2 <= 0x92 &&
+		0x21 <= c1 && c1 <= 0x7E) {
+		/* CP932 UDC */
+		if(c1 == 0x7F) return 0;
+		c1 = (c2 - 0x7F) * 94 + c1 - 0x21 + 0xE000 + CLASS_UNICODE;
+		c2 = 0;
+	    }
+	    (*oconv)(c2, c1); /* this is JIS, not SJIS/EUC case */
+	    break;
+#ifdef X0212_ENABLE
+	case X0212:
+	    (*oconv)(PREFIX_EUCG3 | c2, c1);
+	    break;
+#endif /* X0212_ENABLE */
+	case X0213_2:
+	    (*oconv)(PREFIX_EUCG3 | c2, c1);
+	    break;
+	default:
+	    (*oconv)(input_mode, c1);  /* other special case */
+	}
+
+        c2 = 0;
+        c0 = 0;
+        continue;
+        /* goto next_word */
+    }
+
+    /* epilogue */
+    (*iconv)(EOF, 0, 0);
+    if (!is_inputcode_set)
+    {
+	if (is_8bit) {
+	    struct input_code *p = input_code_list;
+	    struct input_code *result = p;
+	    while (p->name){
+		if (p->score < result->score) result = p;
+		++p;
+	    }
+	    set_input_codename(result->name);
+	}
+    }
+    return 1;
+}
+
+nkf_char
+h_conv(FILE *f, nkf_char c2, nkf_char c1)
+{
+    nkf_char ret, c3, c0;
+    int hold_index;
+
+
+    /** it must NOT be in the kanji shifte sequence      */
+    /** it must NOT be written in JIS7                   */
+    /** and it must be after 2 byte 8bit code            */
+
+    hold_count = 0;
+    push_hold_buf(c2);
+    push_hold_buf(c1);
+
+    while ((c1 = (*i_getc)(f)) != EOF) {
+        if (c1 == ESC){
+	    (*i_ungetc)(c1,f);
+            break;
+        }
+        code_status(c1);
+        if (push_hold_buf(c1) == EOF || estab_f){
+            break;
+        }
+    }
+
+    if (!estab_f){
+        struct input_code *p = input_code_list;
+        struct input_code *result = p;
+        if (c1 == EOF){
+            code_status(c1);
+        }
+        while (p->name){
+            if (p->score < result->score){
+                result = p;
+            }
+            ++p;
+        }
+        set_iconv(FALSE, result->iconv_func);
+    }
+
+
+    /** now,
+     ** 1) EOF is detected, or
+     ** 2) Code is established, or
+     ** 3) Buffer is FULL (but last word is pushed)
+     **
+     ** in 1) and 3) cases, we continue to use
+     ** Kanji codes by oconv and leave estab_f unchanged.
+     **/
+
+    ret = c1;
+    hold_index = 0;
+    while (hold_index < hold_count){
+        c2 = hold_buf[hold_index++];
+        if (c2 <= DEL
+#ifdef NUMCHAR_OPTION
+            || is_unicode_capsule(c2)
+#endif
+            ){
+            (*iconv)(0, c2, 0);
+            continue;
+        }else if (iconv == s_iconv && 0xa1 <= c2 && c2 <= 0xdf){
+            (*iconv)(X0201, c2, 0);
+            continue;
+        }
+        if (hold_index < hold_count){
+            c1 = hold_buf[hold_index++];
+        }else{
+            c1 = (*i_getc)(f);
+            if (c1 == EOF){
+                c3 = EOF;
+                break;
+            }
+            code_status(c1);
+        }
+        c0 = 0;
+        switch ((*iconv)(c2, c1, 0)) {  /* can be EUC/SJIS/UTF-8 */
+	case -2:
+	    /* 4 bytes UTF-8 */
+            if (hold_index < hold_count){
+                c0 = hold_buf[hold_index++];
+            } else if ((c0 = (*i_getc)(f)) == EOF) {
+		ret = EOF;
+		break;
+	    } else {
+                code_status(c0);
+		c0 <<= 8;
+		if (hold_index < hold_count){
+		    c3 = hold_buf[hold_index++];
+		} else if ((c3 = (*i_getc)(f)) == EOF) {
+		    c0 = ret = EOF;
+		    break;
+		} else {
+		    code_status(c3);
+		    (*iconv)(c2, c1, c0|c3);
+		}
+            }
+	    break;
+	case -1:
+	    /* 3 bytes EUC or UTF-8 */
+            if (hold_index < hold_count){
+                c0 = hold_buf[hold_index++];
+            } else if ((c0 = (*i_getc)(f)) == EOF) {
+		ret = EOF;
+		break;
+	    } else {
+                code_status(c0);
+            }
+            (*iconv)(c2, c1, c0);
+            break;
+	}
+	if (c0 == EOF) break;
+    }
+    return ret;
+}
+
+nkf_char push_hold_buf(nkf_char c2)
+{
+    if (hold_count >= HOLD_SIZE*2)
+        return (EOF);
+    hold_buf[hold_count++] = (unsigned char)c2;
+    return ((hold_count >= HOLD_SIZE*2) ? EOF : hold_count);
+}
+
+nkf_char s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
+{
+#if defined(SHIFTJIS_CP932) || defined(X0212_ENABLE)
+    nkf_char val;
+#endif
+    static const nkf_char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} };
+#ifdef SHIFTJIS_CP932
+    if (!cp932inv_f && is_ibmext_in_sjis(c2)){
+#if 0
+        extern const unsigned short shiftjis_cp932[3][189];
+#endif
+        val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40];
+        if (val){
+            c2 = val >> 8;
+            c1 = val & 0xff;
+        }
+    }
+    if (cp932inv_f
+        && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
+#if 0
+        extern const unsigned short cp932inv[2][189];
+#endif
+        nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
+        if (c){
+            c2 = c >> 8;
+            c1 = c & 0xff;
+        }
+    }
+#endif /* SHIFTJIS_CP932 */
+#ifdef X0212_ENABLE
+    if (!x0213_f && is_ibmext_in_sjis(c2)){
+#if 0
+        extern const unsigned short shiftjis_x0212[3][189];
+#endif
+        val = shiftjis_x0212[c2 - 0xfa][c1 - 0x40];
+        if (val){
+            if (val > 0x7FFF){
+                c2 = PREFIX_EUCG3 | ((val >> 8) & 0x7f);
+                c1 = val & 0xff;
+            }else{
+                c2 = val >> 8;
+                c1 = val & 0xff;
+            }
+            if (p2) *p2 = c2;
+            if (p1) *p1 = c1;
+            return 0;
+        }
+    }
+#endif
+    if(c2 >= 0x80){
+	if(x0213_f && c2 >= 0xF0){
+	    if(c2 <= 0xF3 || (c2 == 0xF4 && c1 < 0x9F)){ /* k=1, 3<=k<=5, k=8, 12<=k<=15 */
+		c2 = PREFIX_EUCG3 | 0x20 | shift_jisx0213_s1a3_table[c2 - 0xF0][0x9E < c1];
+	    }else{ /* 78<=k<=94 */
+		c2 = PREFIX_EUCG3 | (c2 * 2 - 0x17B);
+		if (0x9E < c1) c2++;
+	    }
+	}else{
+	    c2 = c2 + c2 - ((c2 <= 0x9F) ? SJ0162 : SJ6394);
+	    if (0x9E < c1) c2++;
+	}
+	if (c1 < 0x9F)
+	    c1 = c1 - ((c1 > DEL) ? SPACE : 0x1F);
+	else {
+	    c1 = c1 - 0x7E;
+	}
+    }
+
+#ifdef X0212_ENABLE
+    c2 = x0212_unshift(c2);
+#endif
+    if (p2) *p2 = c2;
+    if (p1) *p1 = c1;
+    return 0;
+}
+
+nkf_char s_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+    if (c2 == X0201) {
+	c1 &= 0x7f;
+    } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) {
+        /* NOP */
+    } else if (!x0213_f && 0xF0 <= c2 && c2 <= 0xF9 && 0x40 <= c1 && c1 <= 0xFC) {
+	/* CP932 UDC */
+	if(c1 == 0x7F) return 0;
+	c1 = (c2 - 0xF0) * 188 + (c1 - 0x40 - (0x7E < c1)) + 0xE000 + CLASS_UNICODE;
+	c2 = 0;
+    } else {
+        nkf_char ret = s2e_conv(c2, c1, &c2, &c1);
+        if (ret) return ret;
+    }
+    (*oconv)(c2, c1);
+    return 0;
+}
+
+nkf_char e_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+    if (c2 == X0201) {
+	c1 &= 0x7f;
+#ifdef X0212_ENABLE
+    }else if (c2 == 0x8f){
+        if (c0 == 0){
+            return -1;
+        }
+	if (!cp51932_f && !x0213_f && 0xF5 <= c1 && c1 <= 0xFE && 0xA1 <= c0 && c0 <= 0xFE) {
+	    /* encoding is eucJP-ms, so invert to Unicode Private User Area */
+	    c1 = (c1 - 0xF5) * 94 + c0 - 0xA1 + 0xE3AC + CLASS_UNICODE;
+	    c2 = 0;
+	} else {
+	    c2 = (c2 << 8) | (c1 & 0x7f);
+	    c1 = c0 & 0x7f;
+#ifdef SHIFTJIS_CP932
+	    if (cp51932_f){
+		nkf_char s2, s1;
+		if (e2s_conv(c2, c1, &s2, &s1) == 0){
+		    s2e_conv(s2, s1, &c2, &c1);
+		    if (c2 < 0x100){
+			c1 &= 0x7f;
+			c2 &= 0x7f;
+		    }
+		}
+	    }
+#endif /* SHIFTJIS_CP932 */
+        }
+#endif /* X0212_ENABLE */
+    } else if (c2 == SSO){
+        c2 = X0201;
+        c1 &= 0x7f;
+    } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) {
+        /* NOP */
+    } else {
+	if (!cp51932_f && ms_ucs_map_f && 0xF5 <= c2 && c2 <= 0xFE && 0xA1 <= c1 && c1 <= 0xFE) {
+	    /* encoding is eucJP-ms, so invert to Unicode Private User Area */
+	    c1 = (c2 - 0xF5) * 94 + c1 - 0xA1 + 0xE000 + CLASS_UNICODE;
+	    c2 = 0;
+	} else {
+	    c1 &= 0x7f;
+	    c2 &= 0x7f;
+#ifdef SHIFTJIS_CP932
+	    if (cp51932_f && 0x79 <= c2 && c2 <= 0x7c){
+		nkf_char s2, s1;
+		if (e2s_conv(c2, c1, &s2, &s1) == 0){
+		    s2e_conv(s2, s1, &c2, &c1);
+		    if (c2 < 0x100){
+			c1 &= 0x7f;
+			c2 &= 0x7f;
+		    }
+		}
+	    }
+#endif /* SHIFTJIS_CP932 */
+        }
+    }
+    (*oconv)(c2, c1);
+    return 0;
+}
+
+#ifdef UTF8_INPUT_ENABLE
+nkf_char w2e_conv(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
+{
+    nkf_char ret = 0;
+
+    if (!c1){
+        *p2 = 0;
+        *p1 = c2;
+    }else if (0xc0 <= c2 && c2 <= 0xef) {
+	ret =  unicode_to_jis_common(c2, c1, c0, p2, p1);
+#ifdef NUMCHAR_OPTION
+        if (ret > 0){
+            if (p2) *p2 = 0;
+            if (p1) *p1 = CLASS_UNICODE | ww16_conv(c2, c1, c0);
+            ret = 0;
+        }
+#endif
+    }
+    return ret;
+}
+
+nkf_char w_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+    nkf_char ret = 0;
+    static const int w_iconv_utf8_1st_byte[] =
+    { /* 0xC0 - 0xFF */
+	20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+	21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+	30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33,
+	40, 41, 41, 41, 42, 43, 43, 43, 50, 50, 50, 50, 60, 60, 70, 70};
+    
+    if (c2 < 0 || 0xff < c2) {
+    }else if (c2 == 0) { /* 0 : 1 byte*/
+	c0 = 0;
+    } else if ((c2 & 0xc0) == 0x80) { /* 0x80-0xbf : trail byte */
+	return 0;
+    } else{
+    	switch (w_iconv_utf8_1st_byte[c2 - 0xC0]) {
+	case 21:
+	    if (c1 < 0x80 || 0xBF < c1) return 0;
+	    break;
+	case 30:
+	    if (c0 == 0) return -1;
+	    if (c1 < 0xA0 || 0xBF < c1 || (c0 & 0xc0) != 0x80)
+		return 0;
+	    break;
+	case 31:
+	case 33:
+	    if (c0 == 0) return -1;
+	    if ((c1 & 0xc0) != 0x80 || (c0 & 0xc0) != 0x80)
+		return 0;
+	    break;
+	case 32:
+	    if (c0 == 0) return -1;
+	    if (c1 < 0x80 || 0x9F < c1 || (c0 & 0xc0) != 0x80)
+		return 0;
+	    break;
+	case 40:
+	    if (c0 == 0) return -2;
+	    if (c1 < 0x90 || 0xBF < c1 || (c0 & 0xc0c0) != 0x8080)
+		return 0;
+	    break;
+	case 41:
+	    if (c0 == 0) return -2;
+	    if (c1 < 0x80 || 0xBF < c1 || (c0 & 0xc0c0) != 0x8080)
+		return 0;
+	    break;
+	case 42:
+	    if (c0 == 0) return -2;
+	    if (c1 < 0x80 || 0x8F < c1 || (c0 & 0xc0c0) != 0x8080)
+		return 0;
+	    break;
+	default:
+	    return 0;
+	    break;
+	}
+    }
+    if (c2 == 0 || c2 == EOF){
+    } else if ((c2 & 0xf8) == 0xf0) { /* 4 bytes */
+	c1 = CLASS_UNICODE | ww16_conv(c2, c1, c0);
+	c2 = 0;
+    } else {
+	ret = w2e_conv(c2, c1, c0, &c2, &c1);
+    }
+    if (ret == 0){
+        (*oconv)(c2, c1);
+    }
+    return ret;
+}
+#endif
+
+#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
+void w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0)
+{
+    val &= VALUE_MASK;
+    if (val < 0x80){
+        *p2 = val;
+        *p1 = 0;
+        *p0 = 0;
+    }else if (val < 0x800){
+	*p2 = 0xc0 | (val >> 6);
+	*p1 = 0x80 | (val & 0x3f);
+        *p0 = 0;
+    } else if (val <= NKF_INT32_C(0xFFFF)) {
+        *p2 = 0xe0 | (val >> 12);
+        *p1 = 0x80 | ((val >> 6) & 0x3f);
+        *p0 = 0x80 | (val        & 0x3f);
+    } else if (val <= NKF_INT32_C(0x10FFFF)) {
+        *p2 = 0xe0 |  (val >> 16);
+        *p1 = 0x80 | ((val >> 12) & 0x3f);
+        *p0 = 0x8080 | ((val << 2) & 0x3f00)| (val & 0x3f);
+    } else {
+        *p2 = 0;
+        *p1 = 0;
+        *p0 = 0;
+    }
+}
+#endif
+
+#ifdef UTF8_INPUT_ENABLE
+nkf_char ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+    nkf_char val;
+    if (c2 >= 0xf8) {
+	val = -1;
+    } else if (c2 >= 0xf0){
+	/* c2: 1st, c1: 2nd, c0: 3rd/4th */
+	val = (c2 & 0x0f) << 18;
+        val |= (c1 & 0x3f) << 12;
+        val |= (c0 & 0x3f00) >> 2;
+        val |= (c0 & 0x3f);
+    }else if (c2 >= 0xe0){
+        val = (c2 & 0x0f) << 12;
+        val |= (c1 & 0x3f) << 6;
+        val |= (c0 & 0x3f);
+    }else if (c2 >= 0xc0){
+        val = (c2 & 0x1f) << 6;
+        val |= (c1 & 0x3f);
+    }else{
+        val = c2;
+    }
+    return val;
+}
+
+nkf_char w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1)
+{
+    nkf_char c2, c1, c0;
+    nkf_char ret = 0;
+    val &= VALUE_MASK;
+    if (val < 0x80){
+        *p2 = 0;
+        *p1 = val;
+    }else{
+	w16w_conv(val, &c2, &c1, &c0);
+	ret =  unicode_to_jis_common(c2, c1, c0, p2, p1);
+#ifdef NUMCHAR_OPTION
+	if (ret > 0){
+	    *p2 = 0;
+	    *p1 = CLASS_UNICODE | val;
+	    ret = 0;
+	}
+#endif
+    }
+    return ret;
+}
+#endif
+
+#ifdef UTF8_INPUT_ENABLE
+nkf_char w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+    nkf_char ret = 0;
+    if ((c2==0 && c1 < 0x80) || c2==EOF) {
+	(*oconv)(c2, c1);
+	return 0;
+    }else if (0xD8 <= c2 && c2 <= 0xDB) {
+	if (c0 < NKF_INT32_C(0xDC00) || NKF_INT32_C(0xDFFF) < c0)
+	    return -2;
+	c1 =  CLASS_UNICODE | ((c2 << 18) + (c1 << 10) + c0 - NKF_INT32_C(0x35FDC00));
+	c2 = 0;
+    }else if ((c2>>3) == 27) { /* unpaired surrogate */
+	/*
+	   return 2;
+	*/
+	return 1;
+    }else ret = w16e_conv(((c2 & 0xff)<<8) + c1, &c2, &c1);
+    if (ret) return ret;
+    (*oconv)(c2, c1);
+    return 0;
+}
+
+nkf_char w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+    int ret = 0;
+
+    if ((c2 == 0 && c1 < 0x80) || c2==EOF) {
+    } else if (is_unicode_bmp(c1)) {
+	ret = w16e_conv(c1, &c2, &c1);
+    } else {
+	c2 = 0;
+	c1 =  CLASS_UNICODE | c1;
+    }
+    if (ret) return ret;
+    (*oconv)(c2, c1);
+    return 0;
+}
+
+nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
+{
+#if 0
+    extern const unsigned short *const utf8_to_euc_2bytes[];
+    extern const unsigned short *const utf8_to_euc_2bytes_ms[];
+    extern const unsigned short *const utf8_to_euc_2bytes_932[];
+    extern const unsigned short *const *const utf8_to_euc_3bytes[];
+    extern const unsigned short *const *const utf8_to_euc_3bytes_ms[];
+    extern const unsigned short *const *const utf8_to_euc_3bytes_932[];
+#endif
+    const unsigned short *const *pp;
+    const unsigned short *const *const *ppp;
+    static const int no_best_fit_chars_table_C2[] =
+    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 2, 1, 1, 2,
+	0, 0, 1, 1, 0, 1, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1};
+    static const int no_best_fit_chars_table_C2_ms[] =
+    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0,
+	0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0};
+    static const int no_best_fit_chars_table_932_C2[] =
+    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1,
+	0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0};
+    static const int no_best_fit_chars_table_932_C3[] =
+    {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1};
+    nkf_char ret = 0;
+
+    if(c2 < 0x80){
+	*p2 = 0;
+	*p1 = c2;
+    }else if(c2 < 0xe0){
+	if(no_best_fit_chars_f){
+	    if(ms_ucs_map_f == UCS_MAP_CP932){
+		switch(c2){
+		case 0xC2:
+		    if(no_best_fit_chars_table_932_C2[c1&0x3F]) return 1;
+		    break;
+		case 0xC3:
+		    if(no_best_fit_chars_table_932_C3[c1&0x3F]) return 1;
+		    break;
+		}
+	    }else if(!cp932inv_f){
+		switch(c2){
+		case 0xC2:
+		    if(no_best_fit_chars_table_C2[c1&0x3F]) return 1;
+		    break;
+		case 0xC3:
+		    if(no_best_fit_chars_table_932_C3[c1&0x3F]) return 1;
+		    break;
+		}
+	    }else if(ms_ucs_map_f == UCS_MAP_MS){
+		if(c2 == 0xC2 && no_best_fit_chars_table_C2_ms[c1&0x3F]) return 1;
+	    }
+	}
+	pp =
+	    ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_2bytes_932 :
+	    ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_2bytes_ms :
+	    utf8_to_euc_2bytes;
+	ret =  w_iconv_common(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1);
+    }else if(c0 < 0xF0){
+	if(no_best_fit_chars_f){
+	    if(ms_ucs_map_f == UCS_MAP_CP932){
+		if(c2 == 0xE3 && c1 == 0x82 && c0 == 0x94) return 1;
+	    }else if(ms_ucs_map_f == UCS_MAP_MS){
+		switch(c2){
+		case 0xE2:
+		    switch(c1){
+		    case 0x80:
+			if(c0 == 0x94 || c0 == 0x96 || c0 == 0xBE) return 1;
+			break;
+		    case 0x88:
+			if(c0 == 0x92) return 1;
+			break;
+		    }
+		    break;
+		case 0xE3:
+		    if(c1 == 0x80 || c0 == 0x9C) return 1;
+		    break;
+		}
+	    }else{
+		switch(c2){
+		case 0xE2:
+		    switch(c1){
+		    case 0x80:
+			if(c0 == 0x95) return 1;
+			break;
+		    case 0x88:
+			if(c0 == 0xA5) return 1;
+			break;
+		    }
+		    break;
+		case 0xEF:
+		    switch(c1){
+		    case 0xBC:
+			if(c0 == 0x8D) return 1;
+			break;
+		    case 0xBD:
+			if(c0 == 0x9E && !cp932inv_f) return 1;
+			break;
+		    case 0xBF:
+			if(0xA0 <= c0 && c0 <= 0xA5) return 1;
+			break;
+		    }
+		    break;
+		}
+	    }
+	}
+	ppp =
+	    ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_3bytes_932 :
+	    ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_3bytes_ms :
+	    utf8_to_euc_3bytes;
+	ret = w_iconv_common(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1);
+    }else return -1;
+#ifdef SHIFTJIS_CP932
+    if (!ret && !cp932inv_f && is_eucg3(*p2)) {
+	nkf_char s2, s1;
+	if (e2s_conv(*p2, *p1, &s2, &s1) == 0) {
+	    s2e_conv(s2, s1, p2, p1);
+	}else{
+	    ret = 1;
+	}
+    }
+#endif
+    return ret;
+}
+
+nkf_char w_iconv_common(nkf_char c1, nkf_char c0, const unsigned short *const *pp, nkf_char psize, nkf_char *p2, nkf_char *p1)
+{
+    nkf_char c2;
+    const unsigned short *p;
+    unsigned short val;
+
+    if (pp == 0) return 1;
+
+    c1 -= 0x80;
+    if (c1 < 0 || psize <= c1) return 1;
+    p = pp[c1];
+    if (p == 0)  return 1;
+
+    c0 -= 0x80;
+    if (c0 < 0 || sizeof_utf8_to_euc_C2 <= c0) return 1;
+    val = p[c0];
+    if (val == 0) return 1;
+    if (no_cp932ext_f && (
+	(val>>8) == 0x2D || /* NEC special characters */
+	val > NKF_INT32_C(0xF300) /* IBM extended characters */
+	)) return 1;
+
+    c2 = val >> 8;
+   if (val > 0x7FFF){
+        c2 &= 0x7f;
+        c2 |= PREFIX_EUCG3;
+    }
+    if (c2 == SO) c2 = X0201;
+    c1 = val & 0x7f;
+    if (p2) *p2 = c2;
+    if (p1) *p1 = c1;
+    return 0;
+}
+
+void nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c)
+{
+    const char *hex = "0123456789ABCDEF";
+    int shift = 20;
+    c &= VALUE_MASK;
+    while(shift >= 0){
+	if(c >= 1<<shift){
+	    while(shift >= 0){
+		(*f)(0, hex[(c>>shift)&0xF]);
+		shift -= 4;
+	    }
+	}else{
+	    shift -= 4;
+	}
+    }
+    return;
+}
+
+void encode_fallback_html(nkf_char c)
+{
+    (*oconv)(0, '&');
+    (*oconv)(0, '#');
+    c &= VALUE_MASK;
+    if(c >= NKF_INT32_C(1000000))
+	(*oconv)(0, 0x30+(c/NKF_INT32_C(1000000))%10);
+    if(c >= NKF_INT32_C(100000))
+	(*oconv)(0, 0x30+(c/NKF_INT32_C(100000) )%10);
+    if(c >= 10000)
+	(*oconv)(0, 0x30+(c/10000  )%10);
+    if(c >= 1000)
+	(*oconv)(0, 0x30+(c/1000   )%10);
+    if(c >= 100)
+	(*oconv)(0, 0x30+(c/100    )%10);
+    if(c >= 10)
+	(*oconv)(0, 0x30+(c/10     )%10);
+    if(c >= 0)
+	(*oconv)(0, 0x30+ c         %10);
+    (*oconv)(0, ';');
+    return;
+}
+
+void encode_fallback_xml(nkf_char c)
+{
+    (*oconv)(0, '&');
+    (*oconv)(0, '#');
+    (*oconv)(0, 'x');
+    nkf_each_char_to_hex(oconv, c);
+    (*oconv)(0, ';');
+    return;
+}
+
+void encode_fallback_java(nkf_char c)
+{
+    const char *hex = "0123456789ABCDEF";
+    (*oconv)(0, '\\');
+    c &= VALUE_MASK;
+    if(!is_unicode_bmp(c)){
+	(*oconv)(0, 'U');
+	(*oconv)(0, '0');
+	(*oconv)(0, '0');
+	(*oconv)(0, hex[(c>>20)&0xF]);
+	(*oconv)(0, hex[(c>>16)&0xF]);
+    }else{
+	(*oconv)(0, 'u');
+    }
+    (*oconv)(0, hex[(c>>12)&0xF]);
+    (*oconv)(0, hex[(c>> 8)&0xF]);
+    (*oconv)(0, hex[(c>> 4)&0xF]);
+    (*oconv)(0, hex[ c     &0xF]);
+    return;
+}
+
+void encode_fallback_perl(nkf_char c)
+{
+    (*oconv)(0, '\\');
+    (*oconv)(0, 'x');
+    (*oconv)(0, '{');
+    nkf_each_char_to_hex(oconv, c);
+    (*oconv)(0, '}');
+    return;
+}
+
+void encode_fallback_subchar(nkf_char c)
+{
+    c = unicode_subchar;
+    (*oconv)((c>>8)&0xFF, c&0xFF);
+    return;
+}
+#endif
+
+#ifdef UTF8_OUTPUT_ENABLE
+nkf_char e2w_conv(nkf_char c2, nkf_char c1)
+{
+#if 0
+    extern const unsigned short euc_to_utf8_1byte[];
+    extern const unsigned short *const euc_to_utf8_2bytes[];
+    extern const unsigned short *const euc_to_utf8_2bytes_ms[];
+    extern const unsigned short *const x0212_to_utf8_2bytes[];
+#endif
+    const unsigned short *p;
+
+    if (c2 == X0201) {
+        p = euc_to_utf8_1byte;
+#ifdef X0212_ENABLE
+    } else if (is_eucg3(c2)){
+	if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == NKF_INT32_C(0x8F22) && c1 == 0x43){
+	    return 0xA6;
+	}
+        c2 = (c2&0x7f) - 0x21;
+        if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
+	    p = x0212_to_utf8_2bytes[c2];
+        else
+            return 0;
+#endif
+    } else {
+        c2 &= 0x7f;
+        c2 = (c2&0x7f) - 0x21;
+        if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
+            p = ms_ucs_map_f != UCS_MAP_ASCII ? euc_to_utf8_2bytes_ms[c2] : euc_to_utf8_2bytes[c2];
+	else
+	    return 0;
+    }
+    if (!p) return 0;
+    c1 = (c1 & 0x7f) - 0x21;
+    if (0<=c1 && c1<sizeof_euc_to_utf8_1byte)
+	return p[c1];
+    return 0;
+}
+
+void w_oconv(nkf_char c2, nkf_char c1)
+{
+    nkf_char c0;
+    nkf_char val;
+
+    if (output_bom_f) {
+	output_bom_f = FALSE;
+    	(*o_putc)('\357');
+	(*o_putc)('\273');
+	(*o_putc)('\277');
+    }
+
+    if (c2 == EOF) {
+        (*o_putc)(EOF);
+        return;
+    }
+
+#ifdef NUMCHAR_OPTION
+    if (c2 == 0 && is_unicode_capsule(c1)){
+        val = c1 & VALUE_MASK;
+        if (val < 0x80){
+            (*o_putc)(val);
+        }else if (val < 0x800){
+            (*o_putc)(0xC0 | (val >> 6));
+            (*o_putc)(0x80 | (val & 0x3f));
+        } else if (val <= NKF_INT32_C(0xFFFF)) {
+            (*o_putc)(0xE0 | (val >> 12));
+            (*o_putc)(0x80 | ((val >> 6) & 0x3f));
+            (*o_putc)(0x80 | (val        & 0x3f));
+        } else if (val <= NKF_INT32_C(0x10FFFF)) {
+            (*o_putc)(0xF0 | ( val>>18));
+            (*o_putc)(0x80 | ((val>>12) & 0x3f));
+            (*o_putc)(0x80 | ((val>> 6) & 0x3f));
+            (*o_putc)(0x80 | ( val      & 0x3f));
+        }
+        return;
+    }
+#endif
+
+    if (c2 == 0) { 
+	output_mode = ASCII;
+        (*o_putc)(c1);
+    } else if (c2 == ISO8859_1) {
+	output_mode = ISO8859_1;
+        (*o_putc)(c1 | 0x080);
+    } else {
+        output_mode = UTF8;
+	val = e2w_conv(c2, c1);
+        if (val){
+            w16w_conv(val, &c2, &c1, &c0);
+            (*o_putc)(c2);
+            if (c1){
+                (*o_putc)(c1);
+                if (c0) (*o_putc)(c0);
+            }
+        }
+    }
+}
+
+void w_oconv16(nkf_char c2, nkf_char c1)
+{
+    if (output_bom_f) {
+	output_bom_f = FALSE;
+        if (output_endian == ENDIAN_LITTLE){
+            (*o_putc)((unsigned char)'\377');
+            (*o_putc)('\376');
+        }else{
+            (*o_putc)('\376');
+            (*o_putc)((unsigned char)'\377');
+        }
+    }
+
+    if (c2 == EOF) {
+        (*o_putc)(EOF);
+        return;
+    }
+
+    if (c2 == ISO8859_1) {
+        c2 = 0;
+        c1 |= 0x80;
+#ifdef NUMCHAR_OPTION
+    } else if (c2 == 0 && is_unicode_capsule(c1)) {
+        if (is_unicode_bmp(c1)) {
+            c2 = (c1 >> 8) & 0xff;
+            c1 &= 0xff;
+        } else {
+            c1 &= VALUE_MASK;
+            if (c1 <= UNICODE_MAX) {
+                c2 = (c1 >> 10) + NKF_INT32_C(0xD7C0);   /* high surrogate */
+                c1 = (c1 & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
+                if (output_endian == ENDIAN_LITTLE){
+                    (*o_putc)(c2 & 0xff);
+                    (*o_putc)((c2 >> 8) & 0xff);
+                    (*o_putc)(c1 & 0xff);
+                    (*o_putc)((c1 >> 8) & 0xff);
+                }else{
+                    (*o_putc)((c2 >> 8) & 0xff);
+                    (*o_putc)(c2 & 0xff);
+                    (*o_putc)((c1 >> 8) & 0xff);
+                    (*o_putc)(c1 & 0xff);
+                }
+            }
+            return;
+        }
+#endif
+    } else if (c2) {
+        nkf_char val = e2w_conv(c2, c1);
+        c2 = (val >> 8) & 0xff;
+        c1 = val & 0xff;
+	if (!val) return;
+    }
+    if (output_endian == ENDIAN_LITTLE){
+        (*o_putc)(c1);
+        (*o_putc)(c2);
+    }else{
+        (*o_putc)(c2);
+        (*o_putc)(c1);
+    }
+}
+
+void w_oconv32(nkf_char c2, nkf_char c1)
+{
+    if (output_bom_f) {
+	output_bom_f = FALSE;
+        if (output_endian == ENDIAN_LITTLE){
+            (*o_putc)((unsigned char)'\377');
+            (*o_putc)('\376');
+	    (*o_putc)('\000');
+	    (*o_putc)('\000');
+        }else{
+	    (*o_putc)('\000');
+	    (*o_putc)('\000');
+            (*o_putc)('\376');
+            (*o_putc)((unsigned char)'\377');
+        }
+    }
+
+    if (c2 == EOF) {
+        (*o_putc)(EOF);
+        return;
+    }
+
+    if (c2 == ISO8859_1) {
+        c1 |= 0x80;
+#ifdef NUMCHAR_OPTION
+    } else if (c2 == 0 && is_unicode_capsule(c1)) {
+	c1 &= VALUE_MASK;
+#endif
+    } else if (c2) {
+        c1 = e2w_conv(c2, c1);
+	if (!c1) return;
+    }
+    if (output_endian == ENDIAN_LITTLE){
+        (*o_putc)( c1 & NKF_INT32_C(0x000000FF));
+        (*o_putc)((c1 & NKF_INT32_C(0x0000FF00)) >>  8);
+        (*o_putc)((c1 & NKF_INT32_C(0x00FF0000)) >> 16);
+	(*o_putc)('\000');
+    }else{
+	(*o_putc)('\000');
+        (*o_putc)((c1 & NKF_INT32_C(0x00FF0000)) >> 16);
+        (*o_putc)((c1 & NKF_INT32_C(0x0000FF00)) >>  8);
+        (*o_putc)( c1 & NKF_INT32_C(0x000000FF));
+    }
+}
+#endif
+
+void e_oconv(nkf_char c2, nkf_char c1)
+{
+#ifdef NUMCHAR_OPTION
+    if (c2 == 0 && is_unicode_capsule(c1)){
+        w16e_conv(c1, &c2, &c1);
+        if (c2 == 0 && is_unicode_capsule(c1)){
+	    c2 = c1 & VALUE_MASK;
+	    if (x0212_f && 0xE000 <= c2 && c2 <= 0xE757) {
+		/* eucJP-ms UDC */
+		c1 &= 0xFFF;
+		c2 = c1 / 94;
+		c2 += c2 < 10 ? 0x75 : 0x8FEB;
+		c1 = 0x21 + c1 % 94;
+		if (is_eucg3(c2)){
+		    (*o_putc)(0x8f);
+		    (*o_putc)((c2 & 0x7f) | 0x080);
+		    (*o_putc)(c1 | 0x080);
+		}else{
+		    (*o_putc)((c2 & 0x7f) | 0x080);
+		    (*o_putc)(c1 | 0x080);
+		}
+		return;
+	    } else {
+		if (encode_fallback) (*encode_fallback)(c1);
+		return;
+	    }
+        }
+    }
+#endif
+    if (c2 == EOF) {
+        (*o_putc)(EOF);
+        return;
+    } else if (c2 == 0) { 
+	output_mode = ASCII;
+        (*o_putc)(c1);
+    } else if (c2 == X0201) {
+	output_mode = JAPANESE_EUC;
+        (*o_putc)(SSO); (*o_putc)(c1|0x80);
+    } else if (c2 == ISO8859_1) {
+	output_mode = ISO8859_1;
+        (*o_putc)(c1 | 0x080);
+#ifdef X0212_ENABLE
+    } else if (is_eucg3(c2)){
+	output_mode = JAPANESE_EUC;
+#ifdef SHIFTJIS_CP932
+        if (!cp932inv_f){
+            nkf_char s2, s1;
+            if (e2s_conv(c2, c1, &s2, &s1) == 0){
+                s2e_conv(s2, s1, &c2, &c1);
+            }
+        }
+#endif
+        if (c2 == 0) {
+	    output_mode = ASCII;
+	    (*o_putc)(c1);
+	}else if (is_eucg3(c2)){
+            if (x0212_f){
+                (*o_putc)(0x8f);
+                (*o_putc)((c2 & 0x7f) | 0x080);
+                (*o_putc)(c1 | 0x080);
+            }
+        }else{
+            (*o_putc)((c2 & 0x7f) | 0x080);
+            (*o_putc)(c1 | 0x080);
+        }
+#endif
+    } else {
+        if (!nkf_isgraph(c1) || !nkf_isgraph(c2)) {
+            set_iconv(FALSE, 0);
+            return; /* too late to rescue this char */
+        }
+	output_mode = JAPANESE_EUC;
+        (*o_putc)(c2 | 0x080);
+        (*o_putc)(c1 | 0x080);
+    }
+}
+
+#ifdef X0212_ENABLE
+nkf_char x0212_shift(nkf_char c)
+{
+    nkf_char ret = c;
+    c &= 0x7f;
+    if (is_eucg3(ret)){
+        if (0x75 <= c && c <= 0x7f){
+            ret = c + (0x109 - 0x75);
+        }
+    }else{
+        if (0x75 <= c && c <= 0x7f){
+            ret = c + (0x113 - 0x75);
+        }
+    }
+    return ret;
+}
+
+
+nkf_char x0212_unshift(nkf_char c)
+{
+    nkf_char ret = c;
+    if (0x7f <= c && c <= 0x88){
+        ret = c + (0x75 - 0x7f);
+    }else if (0x89 <= c && c <= 0x92){
+        ret = PREFIX_EUCG3 | 0x80 | (c + (0x75 - 0x89));
+    }
+    return ret;
+}
+#endif /* X0212_ENABLE */
+
+nkf_char e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
+{
+    nkf_char ndx;
+    if (is_eucg3(c2)){
+	ndx = c2 & 0x7f;
+	if (x0213_f){
+	    if((0x21 <= ndx && ndx <= 0x2F)){
+		if (p2) *p2 = ((ndx - 1) >> 1) + 0xec - ndx / 8 * 3;
+		if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
+		return 0;
+	    }else if(0x6E <= ndx && ndx <= 0x7E){
+		if (p2) *p2 = ((ndx - 1) >> 1) + 0xbe;
+		if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
+		return 0;
+	    }
+	    return 1;
+	}
+#ifdef X0212_ENABLE
+	else if(nkf_isgraph(ndx)){
+	    nkf_char val = 0;
+	    const unsigned short *ptr;
+#if 0
+	    extern const unsigned short *const x0212_shiftjis[];
+#endif
+	    ptr = x0212_shiftjis[ndx - 0x21];
+	    if (ptr){
+		val = ptr[(c1 & 0x7f) - 0x21];
+	    }
+	    if (val){
+		c2 = val >> 8;
+		c1 = val & 0xff;
+		if (p2) *p2 = c2;
+		if (p1) *p1 = c1;
+		return 0;
+	    }
+	    c2 = x0212_shift(c2);
+	}
+#endif /* X0212_ENABLE */
+    }
+    if(0x7F < c2) return 1;
+    if (p2) *p2 = ((c2 - 1) >> 1) + ((c2 <= 0x5e) ? 0x71 : 0xb1);
+    if (p1) *p1 = c1 + ((c2 & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e);
+    return 0;
+}
+
+void s_oconv(nkf_char c2, nkf_char c1)
+{
+#ifdef NUMCHAR_OPTION
+    if (c2 == 0 && is_unicode_capsule(c1)){
+        w16e_conv(c1, &c2, &c1);
+        if (c2 == 0 && is_unicode_capsule(c1)){
+	    c2 = c1 & VALUE_MASK;
+	    if (!x0213_f && 0xE000 <= c2 && c2 <= 0xE757) {
+		/* CP932 UDC */
+		c1 &= 0xFFF;
+		c2 = c1 / 188 + 0xF0;
+		c1 = c1 % 188;
+		c1 += 0x40 + (c1 > 0x3e);
+		(*o_putc)(c2);
+		(*o_putc)(c1);
+		return;
+	    } else {
+		if(encode_fallback)(*encode_fallback)(c1);
+		return;
+	    }
+	}
+    }
+#endif
+    if (c2 == EOF) {
+        (*o_putc)(EOF);
+        return;
+    } else if (c2 == 0) {
+	output_mode = ASCII;
+        (*o_putc)(c1);
+    } else if (c2 == X0201) {
+	output_mode = SHIFT_JIS;
+        (*o_putc)(c1|0x80);
+    } else if (c2 == ISO8859_1) {
+	output_mode = ISO8859_1;
+        (*o_putc)(c1 | 0x080);
+#ifdef X0212_ENABLE
+    } else if (is_eucg3(c2)){
+	output_mode = SHIFT_JIS;
+        if (e2s_conv(c2, c1, &c2, &c1) == 0){
+            (*o_putc)(c2);
+            (*o_putc)(c1);
+        }
+#endif
+    } else {
+        if (!nkf_isprint(c1) || !nkf_isprint(c2)) {
+            set_iconv(FALSE, 0);
+            return; /* too late to rescue this char */
+        }
+	output_mode = SHIFT_JIS;
+        e2s_conv(c2, c1, &c2, &c1);
+
+#ifdef SHIFTJIS_CP932
+        if (cp932inv_f
+            && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
+#if 0
+            extern const unsigned short cp932inv[2][189];
+#endif
+            nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
+            if (c){
+                c2 = c >> 8;
+                c1 = c & 0xff;
+            }
+        }
+#endif /* SHIFTJIS_CP932 */
+
+        (*o_putc)(c2);
+	if (prefix_table[(unsigned char)c1]){
+            (*o_putc)(prefix_table[(unsigned char)c1]);
+	}
+        (*o_putc)(c1);
+    }
+}
+
+void j_oconv(nkf_char c2, nkf_char c1)
+{
+#ifdef NUMCHAR_OPTION
+    if (c2 == 0 && is_unicode_capsule(c1)){
+        w16e_conv(c1, &c2, &c1);
+        if (c2 == 0 && is_unicode_capsule(c1)){
+	    c2 = c1 & VALUE_MASK;
+	    if (ms_ucs_map_f && 0xE000 <= c2 && c2 <= 0xE757) {
+		/* CP5022x UDC */
+		c1 &= 0xFFF;
+		c2 = 0x7F + c1 / 94;
+		c1 = 0x21 + c1 % 94;
+	    } else {
+		if (encode_fallback) (*encode_fallback)(c1);
+		return;
+	    }
+        }
+    }
+#endif
+    if (c2 == EOF) {
+        if (output_mode !=ASCII && output_mode!=ISO8859_1) {
+            (*o_putc)(ESC);
+            (*o_putc)('(');
+            (*o_putc)(ascii_intro);
+	    output_mode = ASCII;
+        }
+        (*o_putc)(EOF);
+#ifdef X0212_ENABLE
+    } else if (is_eucg3(c2)){
+	if(x0213_f){
+	    if(output_mode!=X0213_2){
+		output_mode = X0213_2;
+		(*o_putc)(ESC);
+		(*o_putc)('$');
+		(*o_putc)('(');
+		(*o_putc)(X0213_2&0x7F);
+	    }
+	}else{
+	    if(output_mode!=X0212){
+		output_mode = X0212;
+		(*o_putc)(ESC);
+		(*o_putc)('$');
+		(*o_putc)('(');
+		(*o_putc)(X0212&0x7F);
+	    }
+        }
+        (*o_putc)(c2 & 0x7f);
+        (*o_putc)(c1);
+#endif
+    } else if (c2==X0201) {
+        if (output_mode!=X0201) {
+            output_mode = X0201;
+            (*o_putc)(ESC);
+            (*o_putc)('(');
+            (*o_putc)('I');
+        }
+        (*o_putc)(c1);
+    } else if (c2==ISO8859_1) {
+            /* iso8859 introduction, or 8th bit on */
+            /* Can we convert in 7bit form using ESC-'-'-A ? 
+               Is this popular? */
+	output_mode = ISO8859_1;
+        (*o_putc)(c1|0x80);
+    } else if (c2 == 0) {
+        if (output_mode !=ASCII && output_mode!=ISO8859_1) {
+            (*o_putc)(ESC);
+            (*o_putc)('(');
+            (*o_putc)(ascii_intro);
+            output_mode = ASCII;
+        }
+        (*o_putc)(c1);
+    } else {
+	if(ms_ucs_map_f
+	   ? c2<0x20 || 0x92<c2 || c1<0x20 || 0x7e<c1
+	   : c2<0x20 || 0x7e<c2 || c1<0x20 || 0x7e<c1) return;
+	if(x0213_f){
+	    if (output_mode!=X0213_1) {
+		output_mode = X0213_1;
+		(*o_putc)(ESC);
+		(*o_putc)('$');
+		(*o_putc)('(');
+		(*o_putc)(X0213_1&0x7F);
+	    }
+	}else if (output_mode != X0208) {
+            output_mode = X0208;
+            (*o_putc)(ESC);
+            (*o_putc)('$');
+            (*o_putc)(kanji_intro);
+        }
+        (*o_putc)(c2);
+        (*o_putc)(c1);
+    }
+}
+
+void base64_conv(nkf_char c2, nkf_char c1)
+{
+    mime_prechar(c2, c1);
+    (*o_base64conv)(c2,c1);
+}
+
+
+static nkf_char broken_buf[3];
+static int broken_counter = 0;
+static int broken_last = 0;
+nkf_char broken_getc(FILE *f)
+{
+    nkf_char c,c1;
+
+    if (broken_counter>0) {
+	return broken_buf[--broken_counter];
+    }
+    c= (*i_bgetc)(f);
+    if (c=='$' && broken_last != ESC 
+            && (input_mode==ASCII || input_mode==X0201)) {
+	c1= (*i_bgetc)(f);
+	broken_last = 0;
+	if (c1=='@'|| c1=='B') {
+	    broken_buf[0]=c1; broken_buf[1]=c; 
+	    broken_counter=2;
+	    return ESC;
+	} else {
+	    (*i_bungetc)(c1,f);
+	    return c;
+	}
+    } else if (c=='(' && broken_last != ESC 
+            && (input_mode==X0208 || input_mode==X0201)) { /* ) */
+	c1= (*i_bgetc)(f);
+	broken_last = 0;
+	if (c1=='J'|| c1=='B') {
+	    broken_buf[0]=c1; broken_buf[1]=c;
+	    broken_counter=2;
+	    return ESC;
+	} else {
+	    (*i_bungetc)(c1,f);
+	    return c;
+	}
+    } else {
+	broken_last = c;
+	return c;
+    }
+}
+
+nkf_char broken_ungetc(nkf_char c, FILE *f)
+{
+    if (broken_counter<2)
+	broken_buf[broken_counter++]=c;
+    return c;
+}
+
+static nkf_char prev_cr = 0;
+
+void cr_conv(nkf_char c2, nkf_char c1)
+{
+    if (prev_cr) {
+	prev_cr = 0;
+	if (! (c2==0&&c1==NL) ) {
+	    cr_conv(0,'\n');
+	}
+    }
+    if (c2) {
+        (*o_crconv)(c2,c1);
+    } else if (c1=='\r') {
+	prev_cr = c1;
+    } else if (c1=='\n') {
+        if (crmode_f==CRLF) {
+            (*o_crconv)(0,'\r');
+	} else if (crmode_f==CR) {
+            (*o_crconv)(0,'\r');
+	    return;
+	} 
+	(*o_crconv)(0,NL);
+    } else if (c1!='\032' || crmode_f!=NL){
+        (*o_crconv)(c2,c1);
+    }
+}
+
+/* 
+  Return value of fold_conv()
+
+       \n  add newline  and output char
+       \r  add newline  and output nothing
+       ' ' space
+       0   skip  
+       1   (or else) normal output 
+
+  fold state in prev (previous character)
+
+      >0x80 Japanese (X0208/X0201)
+      <0x80 ASCII
+      \n    new line 
+      ' '   space
+
+  This fold algorthm does not preserve heading space in a line.
+  This is the main difference from fmt.
+*/
+
+#define char_size(c2,c1) (c2?2:1)
+
+void fold_conv(nkf_char c2, nkf_char c1)
+{ 
+    nkf_char prev0;
+    nkf_char fold_state;
+
+    if (c1== '\r' && !fold_preserve_f) {
+    	fold_state=0;  /* ignore cr */
+    }else if (c1== '\n'&&f_prev=='\r' && fold_preserve_f) {
+        f_prev = '\n';
+     	fold_state=0;  /* ignore cr */
+    } else if (c1== BS) {
+        if (f_line>0) f_line--;
+        fold_state =  1;
+    } else if (c2==EOF && f_line != 0) {    /* close open last line */
+            fold_state = '\n';
+    } else if ((c1=='\n' && !fold_preserve_f)
+               || ((c1=='\r'||(c1=='\n'&&f_prev!='\r'))
+                   && fold_preserve_f)) {
+        /* new line */
+        if (fold_preserve_f) { 
+            f_prev = c1;
+            f_line = 0;
+            fold_state =  '\r';
+	} else if ((f_prev == c1 && !fold_preserve_f)
+                   || (f_prev == '\n' && fold_preserve_f)
+                   ) {        /* duplicate newline */
+            if (f_line) {
+                f_line = 0;
+                fold_state =  '\n';    /* output two newline */
+            } else {
+                f_line = 0;
+                fold_state =  1;
+            }
+        } else  {
+            if (f_prev&0x80) {     /* Japanese? */
+                f_prev = c1;
+                fold_state =  0;       /* ignore given single newline */
+            } else if (f_prev==' ') {
+                fold_state =  0;
+            } else {
+                f_prev = c1;
+                if (++f_line<=fold_len) 
+                    fold_state =  ' ';
+                else {
+                    f_line = 0;
+                    fold_state =  '\r';        /* fold and output nothing */
+                }
+            }
+        }
+    } else if (c1=='\f') {
+        f_prev = '\n';
+        f_line = 0;
+        fold_state =  '\n';            /* output newline and clear */
+    } else if ( (c2==0  && c1==' ')||
+               (c2==0  && c1=='\t')||
+               (c2=='!'&& c1=='!')) {
+        /* X0208 kankaku or ascii space */
+            if (f_prev == ' ') {
+                fold_state = 0;         /* remove duplicate spaces */
+            } else {
+                f_prev = ' ';    
+                if (++f_line<=fold_len) 
+                    fold_state = ' ';         /* output ASCII space only */
+                else {
+                    f_prev = ' '; f_line = 0;
+                    fold_state = '\r';        /* fold and output nothing */
+                }
+            }
+    } else {
+        prev0 = f_prev; /* we still need this one... , but almost done */
+        f_prev = c1;
+        if (c2 || c2==X0201) 
+            f_prev |= 0x80;  /* this is Japanese */
+        f_line += char_size(c2,c1);
+        if (f_line<=fold_len) {   /* normal case */
+            fold_state = 1;
+        } else {
+            if (f_line>fold_len+fold_margin) { /* too many kinsoku suspension */
+                f_line = char_size(c2,c1);
+                fold_state =  '\n';       /* We can't wait, do fold now */
+            } else if (c2==X0201) {
+            /* simple kinsoku rules  return 1 means no folding  */
+                if (c1==(0xde&0x7f)) fold_state = 1; /* $B!+(B*/
+                else if (c1==(0xdf&0x7f)) fold_state = 1; /* $B!,(B*/
+                else if (c1==(0xa4&0x7f)) fold_state = 1; /* $B!#(B*/
+                else if (c1==(0xa3&0x7f)) fold_state = 1; /* $B!$(B*/
+                else if (c1==(0xa1&0x7f)) fold_state = 1; /* $B!W(B*/
+                else if (c1==(0xb0&0x7f)) fold_state = 1; /* - */
+                else if (SPACE<=c1 && c1<=(0xdf&0x7f)) {      /* X0201 */
+		    f_line = 1;
+		    fold_state = '\n';/* add one new f_line before this character */
+		} else {
+		    f_line = 1;
+		    fold_state = '\n';/* add one new f_line before this character */
+		}
+            } else if (c2==0) {
+                /* kinsoku point in ASCII */ 
+		if (  c1==')'||    /* { [ ( */
+                     c1==']'||
+                     c1=='}'||
+                     c1=='.'||
+                     c1==','||
+                     c1=='!'||
+                     c1=='?'||
+                     c1=='/'||
+                     c1==':'||
+                     c1==';' ) {
+		    fold_state = 1;
+		/* just after special */
+		} else if (!is_alnum(prev0)) {
+		    f_line = char_size(c2,c1);
+		    fold_state = '\n';
+		} else if ((prev0==' ') ||   /* ignored new f_line */
+                      (prev0=='\n')||        /* ignored new f_line */
+                      (prev0&0x80)) {        /* X0208 - ASCII */
+		    f_line = char_size(c2,c1);
+                    fold_state = '\n';/* add one new f_line before this character */
+                } else {
+                    fold_state = 1;  /* default no fold in ASCII */
+                }
+            } else {
+                if (c2=='!') {
+                    if (c1=='"')  fold_state = 1; /* $B!"(B */
+                    else if (c1=='#')  fold_state = 1; /* $B!#(B */
+                    else if (c1=='W')  fold_state = 1; /* $B!W(B */
+                    else if (c1=='K')  fold_state = 1; /* $B!K(B */
+                    else if (c1=='$')  fold_state = 1; /* $B!$(B */
+                    else if (c1=='%')  fold_state = 1; /* $B!%(B */
+                    else if (c1=='\'') fold_state = 1; /* $B!\(B */
+                    else if (c1=='(')  fold_state = 1; /* $B!((B */
+                    else if (c1==')')  fold_state = 1; /* $B!)(B */
+                    else if (c1=='*')  fold_state = 1; /* $B!*(B */
+                    else if (c1=='+')  fold_state = 1; /* $B!+(B */
+                    else if (c1==',')  fold_state = 1; /* $B!,(B */
+                         /* default no fold in kinsoku */
+		    else { 
+			fold_state = '\n';
+			f_line = char_size(c2,c1);
+			/* add one new f_line before this character */
+		    }
+                } else {
+		    f_line = char_size(c2,c1);
+                    fold_state = '\n'; 
+                    /* add one new f_line before this character */
+                }
+            }
+        }
+    }
+    /* terminator process */
+    switch(fold_state) {
+        case '\n': 
+            (*o_fconv)(0,'\n');
+            (*o_fconv)(c2,c1);
+            break;
+        case 0:    
+            return;
+        case '\r': 
+            (*o_fconv)(0,'\n');
+            break;
+        case '\t': 
+        case ' ': 
+            (*o_fconv)(0,' ');
+            break;
+        default:
+            (*o_fconv)(c2,c1);
+    }
+}
+
+nkf_char z_prev2=0,z_prev1=0;
+
+void z_conv(nkf_char c2, nkf_char c1)
+{
+
+    /* if (c2) c1 &= 0x7f; assertion */
+
+    if (x0201_f && z_prev2==X0201) {  /* X0201 */
+        if (c1==(0xde&0x7f)) { /* $BByE@(B */
+            z_prev2=0;
+            (*o_zconv)(dv[(z_prev1-SPACE)*2],dv[(z_prev1-SPACE)*2+1]);
+            return;
+        } else if (c1==(0xdf&0x7f)&&ev[(z_prev1-SPACE)*2]) {  /* $BH>ByE@(B */
+            z_prev2=0;
+            (*o_zconv)(ev[(z_prev1-SPACE)*2],ev[(z_prev1-SPACE)*2+1]);
+            return;
+        } else {
+            z_prev2=0;
+            (*o_zconv)(cv[(z_prev1-SPACE)*2],cv[(z_prev1-SPACE)*2+1]);
+        }
+    }
+
+    if (c2==EOF) {
+        (*o_zconv)(c2,c1);
+        return;
+    }
+
+    if (x0201_f && c2==X0201) {
+        if (dv[(c1-SPACE)*2]||ev[(c1-SPACE)*2]) {
+            /* wait for $BByE@(B or $BH>ByE@(B */
+            z_prev1 = c1; z_prev2 = c2;
+            return;
+        } else {
+            (*o_zconv)(cv[(c1-SPACE)*2],cv[(c1-SPACE)*2+1]);
+            return;
+        }
+    }
+
+    /* JISX0208 Alphabet */
+    if (alpha_f && c2 == 0x23 ) {
+        c2 = 0;
+    } else if (alpha_f && c2 == 0x21 ) { 
+    /* JISX0208 Kigou */
+       if (0x21==c1) {
+           if (alpha_f&0x2) {
+               c1 = ' ';
+               c2 = 0;
+           } else if (alpha_f&0x4) {
+                (*o_zconv)(0,' ');
+                (*o_zconv)(0,' ');
+                return;
+           } 
+       } else if (0x20<c1 && c1<0x7f && fv[c1-0x20]) {
+           c1 = fv[c1-0x20];
+           c2 =  0;
+           if (alpha_f&0x8) {
+               char *entity = 0;
+               switch (c1){
+                 case '>': entity = "&gt;"; break;
+                 case '<': entity = "&lt;"; break;
+                 case '\"': entity = "&quot;"; break;
+                 case '&': entity = "&amp;"; break;
+               }
+               if (entity){
+                   while (*entity) (*o_zconv)(0, *entity++);
+                   return;
+               }
+           }
+       } 
+    }
+    (*o_zconv)(c2,c1);
+}
+
+
+#define rot13(c)  ( \
+      ( c < 'A' ) ? c: \
+      (c <= 'M')  ? (c + 13): \
+      (c <= 'Z')  ? (c - 13): \
+      (c < 'a')   ? (c): \
+      (c <= 'm')  ? (c + 13): \
+      (c <= 'z')  ? (c - 13): \
+      (c) \
+)
+
+#define  rot47(c) ( \
+      ( c < '!' ) ? c: \
+      ( c <= 'O' ) ? (c + 47) : \
+      ( c <= '~' ) ?  (c - 47) : \
+      c \
+)
+
+void rot_conv(nkf_char c2, nkf_char c1)
+{
+    if (c2==0 || c2==X0201 || c2==ISO8859_1) {
+	c1 = rot13(c1);
+    } else if (c2) {
+	c1 = rot47(c1);
+	c2 = rot47(c2);
+    }
+    (*o_rot_conv)(c2,c1);
+}
+
+void hira_conv(nkf_char c2, nkf_char c1)
+{
+    if (hira_f & 1) {
+        if (c2 == 0x25) {
+            if (0x20 < c1 && c1 < 0x74) {
+                c2 = 0x24;
+                (*o_hira_conv)(c2,c1);
+                return;
+            } else if (c1 == 0x74 && (output_conv == w_oconv || output_conv == w_oconv16)) {
+                c2 = 0;
+                c1 = CLASS_UNICODE | 0x3094;
+                (*o_hira_conv)(c2,c1);
+                return;
+            }
+        } else if (c2 == 0x21 && (c1 == 0x33 || c1 == 0x34)) {
+            c1 += 2;
+            (*o_hira_conv)(c2,c1);
+            return;
+        }
+    }
+    if (hira_f & 2) {
+        if (c2 == 0 && c1 == (CLASS_UNICODE | 0x3094)) {
+            c2 = 0x25;
+            c1 = 0x74;
+        } else if (c2 == 0x24 && 0x20 < c1 && c1 < 0x74) {
+            c2 = 0x25;
+        } else if (c2 == 0x21 && (c1 == 0x35 || c1 == 0x36)) {
+            c1 -= 2;
+        }
+    }
+    (*o_hira_conv)(c2,c1);
+}
+
+
+void iso2022jp_check_conv(nkf_char c2, nkf_char c1)
+{
+    static const nkf_char range[RANGE_NUM_MAX][2] = {
+        {0x222f, 0x2239,},
+        {0x2242, 0x2249,},
+        {0x2251, 0x225b,},
+        {0x226b, 0x2271,},
+        {0x227a, 0x227d,},
+        {0x2321, 0x232f,},
+        {0x233a, 0x2340,},
+        {0x235b, 0x2360,},
+        {0x237b, 0x237e,},
+        {0x2474, 0x247e,},
+        {0x2577, 0x257e,},
+        {0x2639, 0x2640,},
+        {0x2659, 0x267e,},
+        {0x2742, 0x2750,},
+        {0x2772, 0x277e,},
+        {0x2841, 0x287e,},
+        {0x4f54, 0x4f7e,},
+        {0x7425, 0x747e},
+    };
+    nkf_char i;
+    nkf_char start, end, c;
+
+    if(c2 >= 0x00 && c2 <= 0x20 && c1 >= 0x7f && c1 <= 0xff) {
+	c2 = GETA1;
+	c1 = GETA2;
+    }
+    if((c2 >= 0x29 && c2 <= 0x2f) || (c2 >= 0x75 && c2 <= 0x7e)) {
+	c2 = GETA1;
+	c1 = GETA2;
+    }
+
+    for (i = 0; i < RANGE_NUM_MAX; i++) {
+	start = range[i][0];
+	end   = range[i][1];
+	c     = (c2 << 8) + c1;
+	if (c >= start && c <= end) {
+	    c2 = GETA1;
+	    c1 = GETA2;
+	}
+    }
+    (*o_iso2022jp_check_conv)(c2,c1);
+}
+
+
+/* This converts  =?ISO-2022-JP?B?HOGE HOGE?= */
+
+const unsigned char *mime_pattern[] = {
+    (const unsigned char *)"\075?EUC-JP?B?",
+    (const unsigned char *)"\075?SHIFT_JIS?B?",
+    (const unsigned char *)"\075?ISO-8859-1?Q?",
+    (const unsigned char *)"\075?ISO-8859-1?B?",
+    (const unsigned char *)"\075?ISO-2022-JP?B?",
+    (const unsigned char *)"\075?ISO-2022-JP?Q?",
+#if defined(UTF8_INPUT_ENABLE)
+    (const unsigned char *)"\075?UTF-8?B?",
+    (const unsigned char *)"\075?UTF-8?Q?",
+#endif
+    (const unsigned char *)"\075?US-ASCII?Q?",
+    NULL
+};
+
+
+/* $B3:Ev$9$k%3!<%I$NM%@hEY$r>e$2$k$?$a$NL\0u(B */
+nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
+    e_iconv, s_iconv, 0, 0, 0, 0,
+#if defined(UTF8_INPUT_ENABLE)
+    w_iconv, w_iconv,
+#endif
+    0,
+};
+
+const nkf_char mime_encode[] = {
+    JAPANESE_EUC, SHIFT_JIS,ISO8859_1, ISO8859_1, X0208, X0201,
+#if defined(UTF8_INPUT_ENABLE)
+    UTF8, UTF8,
+#endif
+    ASCII,
+    0
+};
+
+const nkf_char mime_encode_method[] = {
+    'B', 'B','Q', 'B', 'B', 'Q',
+#if defined(UTF8_INPUT_ENABLE)
+    'B', 'Q',
+#endif
+    'Q',
+    0
+};
+
+
+#define MAXRECOVER 20
+
+void switch_mime_getc(void)
+{
+    if (i_getc!=mime_getc) {
+	i_mgetc = i_getc; i_getc = mime_getc;
+	i_mungetc = i_ungetc; i_ungetc = mime_ungetc;
+	if(mime_f==STRICT_MIME) {
+	    i_mgetc_buf = i_mgetc; i_mgetc = mime_getc_buf;
+	    i_mungetc_buf = i_mungetc; i_mungetc = mime_ungetc_buf;
+	}
+    }
+}
+
+void unswitch_mime_getc(void)
+{
+    if(mime_f==STRICT_MIME) {
+	i_mgetc = i_mgetc_buf;
+	i_mungetc = i_mungetc_buf;
+    }
+    i_getc = i_mgetc;
+    i_ungetc = i_mungetc;
+    if(mime_iconv_back)set_iconv(FALSE, mime_iconv_back);
+    mime_iconv_back = NULL;
+}
+
+nkf_char mime_begin_strict(FILE *f)
+{
+    nkf_char c1 = 0;
+    int i,j,k;
+    const unsigned char *p,*q;
+    nkf_char r[MAXRECOVER];    /* recovery buffer, max mime pattern length */
+
+    mime_decode_mode = FALSE;
+    /* =? has been checked */
+    j = 0;
+    p = mime_pattern[j];
+    r[0]='='; r[1]='?';
+
+    for(i=2;p[i]>' ';i++) {                   /* start at =? */
+        if ( ((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i] ) {
+            /* pattern fails, try next one */
+            q = p;
+            while (mime_pattern[++j]) {
+		p = mime_pattern[j];
+                for(k=2;k<i;k++)              /* assume length(p) > i */
+                    if (p[k]!=q[k]) break;
+                if (k==i && nkf_toupper(c1)==p[k]) break;
+            }
+	    p = mime_pattern[j];
+            if (p) continue;  /* found next one, continue */
+            /* all fails, output from recovery buffer */
+            (*i_ungetc)(c1,f);
+            for(j=0;j<i;j++) {
+                (*oconv)(0,r[j]);
+            }
+            return c1;
+        }
+    }
+    mime_decode_mode = p[i-2];
+
+    mime_iconv_back = iconv;
+    set_iconv(FALSE, mime_priority_func[j]);
+    clr_code_score(find_inputcode_byfunc(mime_priority_func[j]), SCORE_iMIME);
+
+    if (mime_decode_mode=='B') {
+        mimebuf_f = unbuf_f;
+        if (!unbuf_f) {
+            /* do MIME integrity check */
+            return mime_integrity(f,mime_pattern[j]);
+        } 
+    }
+    switch_mime_getc();
+    mimebuf_f = TRUE;
+    return c1;
+}
+
+nkf_char mime_getc_buf(FILE *f)
+{
+    /* we don't keep eof of Fifo, becase it contains ?= as
+       a terminator. It was checked in mime_integrity. */
+    return ((mimebuf_f)?
+        (*i_mgetc_buf)(f):Fifo(mime_input++));
+}
+
+nkf_char mime_ungetc_buf(nkf_char c, FILE *f)
+{
+    if (mimebuf_f)
+	(*i_mungetc_buf)(c,f);
+    else 
+	Fifo(--mime_input) = (unsigned char)c;
+    return c;
+}
+
+nkf_char mime_begin(FILE *f)
+{
+    nkf_char c1;
+    int i,k;
+
+    /* In NONSTRICT mode, only =? is checked. In case of failure, we  */
+    /* re-read and convert again from mime_buffer.  */
+
+    /* =? has been checked */
+    k = mime_last;
+    Fifo(mime_last++)='='; Fifo(mime_last++)='?';
+    for(i=2;i<MAXRECOVER;i++) {                   /* start at =? */
+        /* We accept any character type even if it is breaked by new lines */
+        c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
+        if (c1=='\n'||c1==' '||c1=='\r'||
+                c1=='-'||c1=='_'||is_alnum(c1) ) continue;
+        if (c1=='=') {
+            /* Failed. But this could be another MIME preemble */
+            (*i_ungetc)(c1,f);
+            mime_last--;
+            break;
+        }
+        if (c1!='?') break;
+        else {
+            /* c1=='?' */
+            c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
+            if (!(++i<MAXRECOVER) || c1==EOF) break;
+            if (c1=='b'||c1=='B') {
+                mime_decode_mode = 'B';
+            } else if (c1=='q'||c1=='Q') {
+                mime_decode_mode = 'Q';
+            } else {
+                break;
+            }
+            c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
+            if (!(++i<MAXRECOVER) || c1==EOF) break;
+            if (c1!='?') {
+                mime_decode_mode = FALSE;
+            }
+            break;
+        }
+    }
+    switch_mime_getc();
+    if (!mime_decode_mode) {
+        /* false MIME premble, restart from mime_buffer */
+        mime_decode_mode = 1;  /* no decode, but read from the mime_buffer */
+        /* Since we are in MIME mode until buffer becomes empty,    */
+        /* we never go into mime_begin again for a while.           */
+        return c1;
+    }
+    /* discard mime preemble, and goto MIME mode */
+    mime_last = k;
+    /* do no MIME integrity check */
+    return c1;   /* used only for checking EOF */
+}
+
+#ifdef CHECK_OPTION
+void no_putc(nkf_char c)
+{
+    ;
+}
+
+void debug(const char *str)
+{
+    if (debug_f){
+        fprintf(stderr, "%s\n", str);
+    }
+}
+#endif
+
+void set_input_codename(char *codename)
+{
+    if (guess_f && 
+        is_inputcode_set &&
+        strcmp(codename, "") != 0 && 
+        strcmp(codename, input_codename) != 0)
+    {
+        is_inputcode_mixed = TRUE;
+    }
+    input_codename = codename;
+    is_inputcode_set = TRUE;
+}
+
+#if !defined(PERL_XS) && !defined(WIN32DLL)
+void print_guessed_code(char *filename)
+{
+    char *codename = "BINARY";
+    if (!is_inputcode_mixed) {
+        if (strcmp(input_codename, "") == 0) {
+            codename = "ASCII";
+        } else {
+            codename = input_codename;
+        }
+    }
+    if (filename != NULL) printf("%s:", filename);
+    printf("%s\n", codename);
+}
+#endif /*WIN32DLL*/
+
+#ifdef INPUT_OPTION 
+
+nkf_char hex_getc(nkf_char ch, FILE *f, nkf_char (*g)(FILE *f), nkf_char (*u)(nkf_char c, FILE *f))
+{
+    nkf_char c1, c2, c3;
+    c1 = (*g)(f);
+    if (c1 != ch){
+        return c1;
+    }
+    c2 = (*g)(f);
+    if (!nkf_isxdigit(c2)){
+        (*u)(c2, f);
+        return c1;
+    }
+    c3 = (*g)(f);
+    if (!nkf_isxdigit(c3)){
+        (*u)(c2, f);
+        (*u)(c3, f);
+        return c1;
+    }
+    return (hex2bin(c2) << 4) | hex2bin(c3);
+}
+
+nkf_char cap_getc(FILE *f)
+{
+    return hex_getc(':', f, i_cgetc, i_cungetc);
+}
+
+nkf_char cap_ungetc(nkf_char c, FILE *f)
+{
+    return (*i_cungetc)(c, f);
+}
+
+nkf_char url_getc(FILE *f)
+{
+    return hex_getc('%', f, i_ugetc, i_uungetc);
+}
+
+nkf_char url_ungetc(nkf_char c, FILE *f)
+{
+    return (*i_uungetc)(c, f);
+}
+#endif
+
+#ifdef NUMCHAR_OPTION
+nkf_char numchar_getc(FILE *f)
+{
+    nkf_char (*g)(FILE *) = i_ngetc;
+    nkf_char (*u)(nkf_char c ,FILE *f) = i_nungetc;
+    int i = 0, j;
+    nkf_char buf[8];
+    long c = -1;
+
+    buf[i] = (*g)(f);
+    if (buf[i] == '&'){
+        buf[++i] = (*g)(f);
+        if (buf[i] == '#'){
+            c = 0;
+            buf[++i] = (*g)(f);
+            if (buf[i] == 'x' || buf[i] == 'X'){
+                for (j = 0; j < 7; j++){
+                    buf[++i] = (*g)(f);
+                    if (!nkf_isxdigit(buf[i])){
+                        if (buf[i] != ';'){
+                            c = -1;
+                        }
+                        break;
+                    }
+                    c <<= 4;
+                    c |= hex2bin(buf[i]);
+                }
+            }else{
+                for (j = 0; j < 8; j++){
+                    if (j){
+                        buf[++i] = (*g)(f);
+                    }
+                    if (!nkf_isdigit(buf[i])){
+                        if (buf[i] != ';'){
+                            c = -1;
+                        }
+                        break;
+                    }
+                    c *= 10;
+                    c += hex2bin(buf[i]);
+                }
+            }
+        }
+    }
+    if (c != -1){
+        return CLASS_UNICODE | c;
+    }
+    while (i > 0){
+        (*u)(buf[i], f);
+        --i;
+    }
+    return buf[0];
+}
+
+nkf_char numchar_ungetc(nkf_char c, FILE *f)
+{
+    return (*i_nungetc)(c, f);
+}
+#endif
+
+#ifdef UNICODE_NORMALIZATION
+
+/* Normalization Form C */
+nkf_char nfc_getc(FILE *f)
+{
+    nkf_char (*g)(FILE *f) = i_nfc_getc;
+    nkf_char (*u)(nkf_char c ,FILE *f) = i_nfc_ungetc;
+    int i=0, j, k=1, lower, upper;
+    nkf_char buf[9];
+    const nkf_nfchar *array;
+#if 0
+    extern const struct normalization_pair normalization_table[];
+#endif
+    
+    buf[i] = (*g)(f);
+    while (k > 0 && ((buf[i] & 0xc0) != 0x80)){
+	lower=0, upper=NORMALIZATION_TABLE_LENGTH-1;
+	while (upper >= lower) {
+	    j = (lower+upper) / 2;
+	    array = normalization_table[j].nfd;
+	    for (k=0; k < NORMALIZATION_TABLE_NFD_LENGTH && array[k]; k++){
+		if (array[k] != buf[k]){
+		    array[k] < buf[k] ? (lower = j + 1) : (upper = j - 1);
+		    k = 0;
+		    break;
+		} else if (k >= i)
+		    buf[++i] = (*g)(f);
+	    }
+	    if (k > 0){
+		array = normalization_table[j].nfc;
+		for (i=0; i < NORMALIZATION_TABLE_NFC_LENGTH && array[i]; i++)
+		    buf[i] = (nkf_char)(array[i]);
+		i--;
+		break;
+	    }
+	}
+	while (i > 0)
+	    (*u)(buf[i--], f);
+    }
+    return buf[0];
+}
+
+nkf_char nfc_ungetc(nkf_char c, FILE *f)
+{
+    return (*i_nfc_ungetc)(c, f);
+}
+#endif /* UNICODE_NORMALIZATION */
+
+
+nkf_char 
+mime_getc(FILE *f)
+{
+    nkf_char c1, c2, c3, c4, cc;
+    nkf_char t1, t2, t3, t4, mode, exit_mode;
+    nkf_char lwsp_count;
+    char *lwsp_buf;
+    char *lwsp_buf_new;
+    nkf_char lwsp_size = 128;
+
+    if (mime_top != mime_last) {  /* Something is in FIFO */
+        return  Fifo(mime_top++);
+    }
+    if (mime_decode_mode==1 ||mime_decode_mode==FALSE) {
+	mime_decode_mode=FALSE;
+	unswitch_mime_getc();
+	return (*i_getc)(f);
+    }
+
+    if (mimebuf_f == FIXED_MIME)
+        exit_mode = mime_decode_mode;
+    else
+        exit_mode = FALSE;
+    if (mime_decode_mode == 'Q') {
+        if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
+restart_mime_q:
+        if (c1=='_' && mimebuf_f != FIXED_MIME) return ' ';
+	if (c1<=' ' || DEL<=c1) {
+	    mime_decode_mode = exit_mode; /* prepare for quit */
+	    return c1;
+	}
+        if (c1!='=' && (c1!='?' || mimebuf_f == FIXED_MIME)) {
+	    return c1;
+	}
+                
+        mime_decode_mode = exit_mode; /* prepare for quit */
+        if ((c2 = (*i_mgetc)(f)) == EOF) return (EOF);
+        if (c1=='?'&&c2=='=' && mimebuf_f != FIXED_MIME) {
+            /* end Q encoding */
+            input_mode = exit_mode;
+	    lwsp_count = 0;
+	    lwsp_buf = malloc((lwsp_size+5)*sizeof(char));
+	    if (lwsp_buf==NULL) {
+		perror("can't malloc");
+		return -1;
+	    }
+	    while ((c1=(*i_getc)(f))!=EOF) {
+		switch (c1) {
+		case NL:
+		case CR:
+		    if (c1==NL) {
+			if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
+			    i_ungetc(SPACE,f);
+			    continue;
+			} else {
+			    i_ungetc(c1,f);
+			}
+			c1 = NL;
+		    } else {
+			if ((c1=(*i_getc)(f))!=EOF && c1 == NL) {
+			    if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
+				i_ungetc(SPACE,f);
+				continue;
+			    } else {
+				i_ungetc(c1,f);
+			    }
+			    i_ungetc(NL,f);
+			} else {
+			    i_ungetc(c1,f);
+			}
+			c1 = CR;
+		    }
+		    break;
+		case SPACE:
+		case TAB:
+		    lwsp_buf[lwsp_count] = (unsigned char)c1;
+		    if (lwsp_count++>lwsp_size){
+			lwsp_size <<= 1;
+			lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
+			if (lwsp_buf_new==NULL) {
+			    free(lwsp_buf);
+			    perror("can't realloc");
+			    return -1;
+			}
+			lwsp_buf = lwsp_buf_new;
+		    }
+		    continue;
+		}
+		break;
+	    }
+	    if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) {
+		i_ungetc(c1,f);
+		for(lwsp_count--;lwsp_count>0;lwsp_count--)
+		    i_ungetc(lwsp_buf[lwsp_count],f);
+		c1 = lwsp_buf[0];
+	    }
+	    free(lwsp_buf);
+            return c1;
+        }
+        if (c1=='='&&c2<' ') { /* this is soft wrap */
+            while((c1 =  (*i_mgetc)(f)) <=' ') {
+		if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
+	    }
+            mime_decode_mode = 'Q'; /* still in MIME */
+	    goto restart_mime_q;
+	}
+        if (c1=='?') {
+            mime_decode_mode = 'Q'; /* still in MIME */
+            (*i_mungetc)(c2,f);
+            return c1;
+        }
+        if ((c3 = (*i_mgetc)(f)) == EOF) return (EOF);
+        if (c2<=' ') return c2;
+        mime_decode_mode = 'Q'; /* still in MIME */
+        return ((hex2bin(c2)<<4) + hex2bin(c3));
+    }
+
+    if (mime_decode_mode != 'B') {
+        mime_decode_mode = FALSE;
+        return (*i_mgetc)(f);
+    }
+
+
+    /* Base64 encoding */
+    /* 
+        MIME allows line break in the middle of 
+        Base64, but we are very pessimistic in decoding
+        in unbuf mode because MIME encoded code may broken by 
+        less or editor's control sequence (such as ESC-[-K in unbuffered
+        mode. ignore incomplete MIME.
+    */
+    mode = mime_decode_mode;
+    mime_decode_mode = exit_mode;  /* prepare for quit */
+
+    while ((c1 = (*i_mgetc)(f))<=' ') {
+        if (c1==EOF)
+            return (EOF);
+    }
+mime_c2_retry:
+    if ((c2 = (*i_mgetc)(f))<=' ') {
+        if (c2==EOF)
+            return (EOF);
+	if (mime_f != STRICT_MIME) goto mime_c2_retry;
+        if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
+        return c2;
+    }
+    if ((c1 == '?') && (c2 == '=')) {
+        input_mode = ASCII;
+	lwsp_count = 0;
+	lwsp_buf = malloc((lwsp_size+5)*sizeof(char));
+	if (lwsp_buf==NULL) {
+	    perror("can't malloc");
+	    return -1;
+	}
+	while ((c1=(*i_getc)(f))!=EOF) {
+	    switch (c1) {
+	    case NL:
+	    case CR:
+		if (c1==NL) {
+		    if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
+			i_ungetc(SPACE,f);
+			continue;
+		    } else {
+			i_ungetc(c1,f);
+		    }
+		    c1 = NL;
+		} else {
+		    if ((c1=(*i_getc)(f))!=EOF) {
+			if (c1==SPACE) {
+			    i_ungetc(SPACE,f);
+			    continue;
+			} else if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
+			    i_ungetc(SPACE,f);
+			    continue;
+			} else {
+			    i_ungetc(c1,f);
+			}
+			i_ungetc(NL,f);
+		    } else {
+			i_ungetc(c1,f);
+		    }
+		    c1 = CR;
+		}
+		break;
+	    case SPACE:
+	    case TAB:
+		lwsp_buf[lwsp_count] = (unsigned char)c1;
+		if (lwsp_count++>lwsp_size){
+		    lwsp_size <<= 1;
+		    lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
+		    if (lwsp_buf_new==NULL) {
+			free(lwsp_buf);
+			perror("can't realloc");
+			return -1;
+		    }
+		    lwsp_buf = lwsp_buf_new;
+		}
+		continue;
+	    }
+	    break;
+	}
+	if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) {
+	    i_ungetc(c1,f);
+	    for(lwsp_count--;lwsp_count>0;lwsp_count--)
+		i_ungetc(lwsp_buf[lwsp_count],f);
+	    c1 = lwsp_buf[0];
+	}
+	free(lwsp_buf);
+        return c1;
+    }
+mime_c3_retry:
+    if ((c3 = (*i_mgetc)(f))<=' ') {
+        if (c3==EOF)
+            return (EOF);
+	if (mime_f != STRICT_MIME) goto mime_c3_retry;
+        if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
+        return c3;
+    }
+mime_c4_retry:
+    if ((c4 = (*i_mgetc)(f))<=' ') {
+        if (c4==EOF)
+            return (EOF);
+	if (mime_f != STRICT_MIME) goto mime_c4_retry;
+        if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
+        return c4;
+    }
+
+    mime_decode_mode = mode; /* still in MIME sigh... */
+
+    /* BASE 64 decoding */
+
+    t1 = 0x3f & base64decode(c1);
+    t2 = 0x3f & base64decode(c2);
+    t3 = 0x3f & base64decode(c3);
+    t4 = 0x3f & base64decode(c4);
+    cc = ((t1 << 2) & 0x0fc) | ((t2 >> 4) & 0x03);
+    if (c2 != '=') {
+        Fifo(mime_last++) = (unsigned char)cc;
+        cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f);
+        if (c3 != '=') {
+            Fifo(mime_last++) = (unsigned char)cc;
+            cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f);
+            if (c4 != '=') 
+                Fifo(mime_last++) = (unsigned char)cc;
+        }
+    } else {
+        return c1;
+    }
+    return  Fifo(mime_top++);
+}
+
+nkf_char mime_ungetc(nkf_char c, FILE *f)
+{
+    Fifo(--mime_top) = (unsigned char)c;
+    return c;
+}
+
+nkf_char mime_integrity(FILE *f, const unsigned char *p)
+{
+    nkf_char c,d;
+    unsigned int q;
+    /* In buffered mode, read until =? or NL or buffer full
+     */
+    mime_input = mime_top;
+    mime_last = mime_top;
+    
+    while(*p) Fifo(mime_input++) = *p++;
+    d = 0;
+    q = mime_input;
+    while((c=(*i_getc)(f))!=EOF) {
+        if (((mime_input-mime_top)&MIME_BUF_MASK)==0) {
+	    break;   /* buffer full */
+	}
+        if (c=='=' && d=='?') {
+            /* checked. skip header, start decode */
+            Fifo(mime_input++) = (unsigned char)c;
+            /* mime_last_input = mime_input; */
+            mime_input = q; 
+	    switch_mime_getc();
+            return 1;
+        }
+        if (!( (c=='+'||c=='/'|| c=='=' || c=='?' || is_alnum(c))))
+            break;
+        /* Should we check length mod 4? */
+        Fifo(mime_input++) = (unsigned char)c;
+        d=c;
+    }
+    /* In case of Incomplete MIME, no MIME decode  */
+    Fifo(mime_input++) = (unsigned char)c;
+    mime_last = mime_input;     /* point undecoded buffer */
+    mime_decode_mode = 1;              /* no decode on Fifo last in mime_getc */
+    switch_mime_getc();         /* anyway we need buffered getc */
+    return 1;
+}
+
+nkf_char base64decode(nkf_char c)
+{
+    int             i;
+    if (c > '@') {
+        if (c < '[') {
+            i = c - 'A';                        /* A..Z 0-25 */
+        } else {
+            i = c - 'G'     /* - 'a' + 26 */ ;  /* a..z 26-51 */
+	}
+    } else if (c > '/') {
+        i = c - '0' + '4'   /* - '0' + 52 */ ;  /* 0..9 52-61 */
+    } else if (c == '+') {
+        i = '>'             /* 62 */ ;          /* +  62 */
+    } else {
+        i = '?'             /* 63 */ ;          /* / 63 */
+    }
+    return (i);
+}
+
+static const char basis_64[] =
+   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+static nkf_char b64c;
+#define MIMEOUT_BUF_LENGTH (60)
+char mimeout_buf[MIMEOUT_BUF_LENGTH+1];
+int mimeout_buf_count = 0;
+int mimeout_preserve_space = 0;
+#define itoh4(c)   (c>=10?c+'A'-10:c+'0')
+
+void open_mime(nkf_char mode)
+{
+    const unsigned char *p;
+    int i;
+    int j;
+    p  = mime_pattern[0];
+    for(i=0;mime_encode[i];i++) {
+	if (mode == mime_encode[i]) {
+	    p = mime_pattern[i];
+	    break;
+	}
+    }
+    mimeout_mode = mime_encode_method[i];
+    
+    i = 0;
+    if (base64_count>45) {
+	if (mimeout_buf_count>0 && nkf_isblank(mimeout_buf[i])){
+            (*o_mputc)(mimeout_buf[i]);
+	    i++;
+	}
+	(*o_mputc)(NL);
+	(*o_mputc)(SPACE);
+	base64_count = 1;
+	if (!mimeout_preserve_space && mimeout_buf_count>0
+	    && (mimeout_buf[i]==SPACE || mimeout_buf[i]==TAB
+	    	|| mimeout_buf[i]==CR || mimeout_buf[i]==NL )) {
+	    i++;
+	}
+    }
+    if (!mimeout_preserve_space) {
+	for (;i<mimeout_buf_count;i++) {
+	    if (mimeout_buf[i]==SPACE || mimeout_buf[i]==TAB
+		|| mimeout_buf[i]==CR || mimeout_buf[i]==NL ) {
+		(*o_mputc)(mimeout_buf[i]);
+		base64_count ++;
+	    } else {
+		break;
+	    }
+	}
+    }
+    mimeout_preserve_space = FALSE;
+    
+    while(*p) {
+        (*o_mputc)(*p++);
+        base64_count ++;
+    }
+    j = mimeout_buf_count;
+    mimeout_buf_count = 0;
+    for (;i<j;i++) {
+	mime_putc(mimeout_buf[i]);
+    }
+}
+
+void close_mime(void)
+{
+    (*o_mputc)('?');
+    (*o_mputc)('=');
+    base64_count += 2;
+    mimeout_mode = 0;
+}
+
+void eof_mime(void)
+{
+    switch(mimeout_mode) {
+    case 'Q':
+    case 'B':
+	break;
+    case 2:
+	(*o_mputc)(basis_64[((b64c & 0x3)<< 4)]);
+	(*o_mputc)('=');
+	(*o_mputc)('=');
+	base64_count += 3;
+	break;
+    case 1:
+	(*o_mputc)(basis_64[((b64c & 0xF) << 2)]);
+	(*o_mputc)('=');
+	base64_count += 2;
+	break;
+    }
+    if (mimeout_mode) {
+	if (mimeout_f!=FIXED_MIME) {
+	    close_mime(); 
+	} else if (mimeout_mode != 'Q')
+	    mimeout_mode = 'B';
+    }
+}
+
+void mimeout_addchar(nkf_char c)
+{
+    switch(mimeout_mode) {
+    case 'Q':
+	if (c==CR||c==NL) {
+	    (*o_mputc)(c);
+	    base64_count = 0;
+	} else if(!nkf_isalnum(c)) {
+	    (*o_mputc)('=');
+	    (*o_mputc)(itoh4(((c>>4)&0xf)));
+	    (*o_mputc)(itoh4((c&0xf)));
+	    base64_count += 3;
+	} else {
+	    (*o_mputc)(c);
+	    base64_count++;
+	}
+        break;
+    case 'B':
+        b64c=c;
+        (*o_mputc)(basis_64[c>>2]);
+        mimeout_mode=2;
+        base64_count ++;
+        break;
+    case 2:
+        (*o_mputc)(basis_64[((b64c & 0x3)<< 4) | ((c & 0xF0) >> 4)]);
+        b64c=c;
+        mimeout_mode=1;
+        base64_count ++;
+        break;
+    case 1:
+        (*o_mputc)(basis_64[((b64c & 0xF) << 2) | ((c & 0xC0) >>6)]);
+        (*o_mputc)(basis_64[c & 0x3F]);
+        mimeout_mode='B';
+        base64_count += 2;
+        break;
+    default:
+	(*o_mputc)(c);
+	base64_count++;
+        break;
+    }
+}
+
+nkf_char mime_lastchar2, mime_lastchar1;
+
+void mime_prechar(nkf_char c2, nkf_char c1)
+{
+    if (mimeout_mode){
+        if (c2){
+            if (base64_count + mimeout_buf_count/3*4> 66){
+                (*o_base64conv)(EOF,0);
+                (*o_base64conv)(0,NL);
+                (*o_base64conv)(0,SPACE);
+            }
+        }/*else if (mime_lastchar2){
+            if (c1 <=DEL && !nkf_isspace(c1)){
+                (*o_base64conv)(0,SPACE);
+            }
+        }*/
+    }/*else{
+        if (c2 && mime_lastchar2 == 0
+            && mime_lastchar1 && !nkf_isspace(mime_lastchar1)){
+            (*o_base64conv)(0,SPACE);
+        }
+    }*/
+    mime_lastchar2 = c2;
+    mime_lastchar1 = c1;
+}
+
+void mime_putc(nkf_char c)
+{
+    int i, j;
+    nkf_char lastchar;
+
+    if (mimeout_f == FIXED_MIME){
+        if (mimeout_mode == 'Q'){
+            if (base64_count > 71){
+                if (c!=CR && c!=NL) {
+                    (*o_mputc)('=');
+                    (*o_mputc)(NL);
+                }
+                base64_count = 0;
+            }
+        }else{
+            if (base64_count > 71){
+                eof_mime();
+                (*o_mputc)(NL);
+                base64_count = 0;
+            }
+            if (c == EOF) { /* c==EOF */
+                eof_mime();
+            }
+        }
+        if (c != EOF) { /* c==EOF */
+            mimeout_addchar(c);
+        }
+        return;
+    }
+    
+    /* mimeout_f != FIXED_MIME */
+
+    if (c == EOF) { /* c==EOF */
+	j = mimeout_buf_count;
+	mimeout_buf_count = 0;
+	i = 0;
+	if (mimeout_mode) {
+	    for (;i<j;i++) {
+		if (nkf_isspace(mimeout_buf[i]) && base64_count < 71){
+		    break;
+		}
+		mimeout_addchar(mimeout_buf[i]);
+	    }
+	    eof_mime();
+	    for (;i<j;i++) {
+		mimeout_addchar(mimeout_buf[i]);
+	    }
+	} else {
+	    for (;i<j;i++) {
+		mimeout_addchar(mimeout_buf[i]);
+	    }
+	}
+        return;
+    }
+
+    if (mimeout_mode=='Q') {
+        if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1 ) ) {
+            if (c <= SPACE) {
+                close_mime();
+                (*o_mputc)(SPACE);
+                base64_count++;
+            }
+            (*o_mputc)(c);
+            base64_count++;
+        }
+        return;
+    }
+
+    if (mimeout_buf_count > 0){
+        lastchar = mimeout_buf[mimeout_buf_count - 1];
+    }else{
+        lastchar = -1;
+    }
+
+    if (!mimeout_mode) {
+        if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1)) {
+            if (nkf_isspace(c)) {
+                if (c==CR || c==NL) {
+                    base64_count=0;
+                }
+                for (i=0;i<mimeout_buf_count;i++) {
+                    (*o_mputc)(mimeout_buf[i]);
+                    if (mimeout_buf[i] == CR || mimeout_buf[i] == NL){
+                        base64_count = 0;
+                    }else{
+                        base64_count++;
+                    }
+                }
+                mimeout_buf[0] = (char)c;
+                mimeout_buf_count = 1;
+            }else{
+                if (base64_count > 1
+                    && base64_count + mimeout_buf_count > 76){
+                    (*o_mputc)(NL);
+                    base64_count = 0;
+                    if (!nkf_isspace(mimeout_buf[0])){
+                        (*o_mputc)(SPACE);
+                        base64_count++;
+                    }
+                }
+                mimeout_buf[mimeout_buf_count++] = (char)c;
+                if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
+                    open_mime(output_mode);
+                }
+            }
+            return;
+        }else{
+            if (lastchar==CR || lastchar == NL){
+                for (i=0;i<mimeout_buf_count;i++) {
+                    (*o_mputc)(mimeout_buf[i]);
+                }
+                base64_count = 0;
+                mimeout_buf_count = 0;
+            }
+            if (lastchar==SPACE) {
+                for (i=0;i<mimeout_buf_count-1;i++) {
+                    (*o_mputc)(mimeout_buf[i]);
+                    base64_count++;
+                }
+                mimeout_buf[0] = SPACE;
+                mimeout_buf_count = 1;
+            }
+            open_mime(output_mode);
+        }
+    }else{
+        /* mimeout_mode == 'B', 1, 2 */
+        if ( c<=DEL && (output_mode==ASCII ||output_mode == ISO8859_1 ) ) {
+            if (lastchar == CR || lastchar == NL){
+                if (nkf_isblank(c)) {
+                    for (i=0;i<mimeout_buf_count;i++) {
+                        mimeout_addchar(mimeout_buf[i]);
+                    }
+                    mimeout_buf_count = 0;
+                } else if (SPACE<c && c<DEL) {
+                    eof_mime();
+                    for (i=0;i<mimeout_buf_count;i++) {
+                        (*o_mputc)(mimeout_buf[i]);
+                    }
+                    base64_count = 0;
+                    mimeout_buf_count = 0;
+                }
+            }
+            if (c==SPACE || c==TAB || c==CR || c==NL) {
+                for (i=0;i<mimeout_buf_count;i++) {
+                    if (SPACE<mimeout_buf[i] && mimeout_buf[i]<DEL) {
+                        eof_mime();
+                        for (i=0;i<mimeout_buf_count;i++) {
+                            (*o_mputc)(mimeout_buf[i]);
+                            base64_count++;
+                        }
+                        mimeout_buf_count = 0;
+                    }
+                }
+                mimeout_buf[mimeout_buf_count++] = (char)c;
+                if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
+                    eof_mime();
+                    for (i=0;i<mimeout_buf_count;i++) {
+                        (*o_mputc)(mimeout_buf[i]);
+                        base64_count++;
+                    }
+                    mimeout_buf_count = 0;
+                }
+                return;
+            }
+            if (mimeout_buf_count>0 && SPACE<c && c!='=') {
+                mimeout_buf[mimeout_buf_count++] = (char)c;
+                if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
+                    j = mimeout_buf_count;
+                    mimeout_buf_count = 0;
+                    for (i=0;i<j;i++) {
+                        mimeout_addchar(mimeout_buf[i]);
+                    }
+                }
+                return;
+            }
+        }
+    }
+    if (mimeout_buf_count>0) {
+	j = mimeout_buf_count;
+	mimeout_buf_count = 0;
+	for (i=0;i<j;i++) {
+	    if (mimeout_buf[i]==CR || mimeout_buf[i]==NL)
+		break;
+	    mimeout_addchar(mimeout_buf[i]);
+	}
+	if (i<j) {
+	    eof_mime();
+	    base64_count=0;
+	    for (;i<j;i++) {
+		(*o_mputc)(mimeout_buf[i]);
+	    }
+	    open_mime(output_mode);
+	}
+    }
+    mimeout_addchar(c);
+}
+
+
+#if defined(PERL_XS) || defined(WIN32DLL)
+void reinit(void)
+{
+    {
+        struct input_code *p = input_code_list;
+        while (p->name){
+            status_reinit(p++);
+        }
+    }
+    unbuf_f = FALSE;
+    estab_f = FALSE;
+    nop_f = FALSE;
+    binmode_f = TRUE;
+    rot_f = FALSE;
+    hira_f = FALSE;
+    input_f = FALSE;
+    alpha_f = FALSE;
+    mime_f = STRICT_MIME;
+    mime_decode_f = FALSE;
+    mimebuf_f = FALSE;
+    broken_f = FALSE;
+    iso8859_f = FALSE;
+    mimeout_f = FALSE;
+#if defined(MSDOS) || defined(__OS2__)
+     x0201_f = TRUE;
+#else
+     x0201_f = NO_X0201;
+#endif
+    iso2022jp_f = FALSE;
+#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
+    ms_ucs_map_f = UCS_MAP_ASCII;
+#endif
+#ifdef UTF8_INPUT_ENABLE
+    no_cp932ext_f = FALSE;
+    no_best_fit_chars_f = FALSE;
+    encode_fallback = NULL;
+    unicode_subchar  = '?';
+    input_endian = ENDIAN_BIG;
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+    output_bom_f = FALSE;
+    output_endian = ENDIAN_BIG;
+#endif
+#ifdef UNICODE_NORMALIZATION
+    nfc_f = FALSE;
+#endif
+#ifdef INPUT_OPTION
+    cap_f = FALSE;
+    url_f = FALSE;
+    numchar_f = FALSE;
+#endif
+#ifdef CHECK_OPTION
+    noout_f = FALSE;
+    debug_f = FALSE;
+#endif
+    guess_f = FALSE;
+    is_inputcode_mixed = FALSE;
+    is_inputcode_set   = FALSE;
+#ifdef EXEC_IO
+    exec_f = 0;
+#endif
+#ifdef SHIFTJIS_CP932
+    cp51932_f = TRUE;
+    cp932inv_f = TRUE;
+#endif
+#ifdef X0212_ENABLE
+    x0212_f = FALSE;
+    x0213_f = FALSE;
+#endif
+    {
+        int i;
+        for (i = 0; i < 256; i++){
+            prefix_table[i] = 0;
+        }
+    }
+    hold_count = 0;
+    mimeout_buf_count = 0;
+    mimeout_mode = 0;
+    base64_count = 0;
+    f_line = 0;
+    f_prev = 0;
+    fold_preserve_f = FALSE;
+    fold_f = FALSE;
+    fold_len = 0;
+    kanji_intro = DEFAULT_J;
+    ascii_intro = DEFAULT_R;
+    fold_margin  = FOLD_MARGIN;
+    output_conv = DEFAULT_CONV;
+    oconv = DEFAULT_CONV;
+    o_zconv = no_connection;
+    o_fconv = no_connection;
+    o_crconv = no_connection;
+    o_rot_conv = no_connection;
+    o_hira_conv = no_connection;
+    o_base64conv = no_connection;
+    o_iso2022jp_check_conv = no_connection;
+    o_putc = std_putc;
+    i_getc = std_getc;
+    i_ungetc = std_ungetc;
+    i_bgetc = std_getc;
+    i_bungetc = std_ungetc;
+    o_mputc = std_putc;
+    i_mgetc = std_getc;
+    i_mungetc  = std_ungetc;
+    i_mgetc_buf = std_getc;
+    i_mungetc_buf = std_ungetc;
+    output_mode = ASCII;
+    input_mode =  ASCII;
+    shift_mode =  FALSE;
+    mime_decode_mode = FALSE;
+    file_out_f = FALSE;
+    crmode_f = 0;
+    option_mode = 0;
+    broken_counter = 0;
+    broken_last = 0;
+    z_prev2=0,z_prev1=0;
+#ifdef CHECK_OPTION
+    iconv_for_check = 0;
+#endif
+    input_codename = "";
+#ifdef WIN32DLL
+    reinitdll();
+#endif /*WIN32DLL*/
+}
+#endif
+
+void no_connection(nkf_char c2, nkf_char c1)
+{
+    no_connection2(c2,c1,0);
+}
+
+nkf_char no_connection2(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+    fprintf(stderr,"nkf internal module connection failure.\n");
+    exit(1);
+    return 0; /* LINT */
+}
+
+#ifndef PERL_XS
+#ifdef WIN32DLL
+#define fprintf dllprintf
+#endif
+void usage(void)
+{
+    fprintf(stderr,"USAGE:  nkf(nkf32,wnkf,nkf2) -[flags] [in file] .. [out file for -O flag]\n");
+    fprintf(stderr,"Flags:\n");
+    fprintf(stderr,"b,u      Output is buffered (DEFAULT),Output is unbuffered\n");
+#ifdef DEFAULT_CODE_SJIS
+    fprintf(stderr,"j,s,e,w  Output code is JIS 7 bit, Shift_JIS (DEFAULT), EUC-JP, UTF-8N\n");
+#endif
+#ifdef DEFAULT_CODE_JIS
+    fprintf(stderr,"j,s,e,w  Output code is JIS 7 bit (DEFAULT), Shift JIS, EUC-JP, UTF-8N\n");
+#endif
+#ifdef DEFAULT_CODE_EUC
+    fprintf(stderr,"j,s,e,w  Output code is JIS 7 bit, Shift JIS, EUC-JP (DEFAULT), UTF-8N\n");
+#endif
+#ifdef DEFAULT_CODE_UTF8
+    fprintf(stderr,"j,s,e,w  Output code is JIS 7 bit, Shift JIS, EUC-JP, UTF-8N (DEFAULT)\n");
+#endif
+#ifdef UTF8_OUTPUT_ENABLE
+    fprintf(stderr,"         After 'w' you can add more options. -w[ 8 [0], 16 [[BL] [0]] ]\n");
+#endif
+    fprintf(stderr,"J,S,E,W  Input assumption is JIS 7 bit , Shift JIS, EUC-JP, UTF-8\n");
+#ifdef UTF8_INPUT_ENABLE
+    fprintf(stderr,"         After 'W' you can add more options. -W[ 8, 16 [BL] ] \n");
+#endif
+    fprintf(stderr,"t        no conversion\n");
+    fprintf(stderr,"i[@B]    Specify the Esc Seq for JIS X 0208-1978/83 (DEFAULT B)\n");
+    fprintf(stderr,"o[BJH]   Specify the Esc Seq for ASCII/Roman        (DEFAULT B)\n");
+    fprintf(stderr,"r        {de/en}crypt ROT13/47\n");
+    fprintf(stderr,"h        1 katakana->hiragana, 2 hiragana->katakana, 3 both\n");
+    fprintf(stderr,"v        Show this usage. V: show version\n");
+    fprintf(stderr,"m[BQN0]  MIME decode [B:base64,Q:quoted,N:non-strict,0:no decode]\n");
+    fprintf(stderr,"M[BQ]    MIME encode [B:base64 Q:quoted]\n");
+    fprintf(stderr,"l        ISO8859-1 (Latin-1) support\n");
+    fprintf(stderr,"f/F      Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n");
+    fprintf(stderr,"Z[0-3]   Convert X0208 alphabet to ASCII\n");
+    fprintf(stderr,"         1: Kankaku to 1 space  2: to 2 spaces  3: Convert to HTML Entity\n");
+    fprintf(stderr,"X,x      Assume X0201 kana in MS-Kanji, -x preserves X0201\n");
+    fprintf(stderr,"B[0-2]   Broken input  0: missing ESC,1: any X on ESC-[($]-X,2: ASCII on NL\n");
+#ifdef MSDOS
+    fprintf(stderr,"T        Text mode output\n");
+#endif
+    fprintf(stderr,"O        Output to File (DEFAULT 'nkf.out')\n");
+    fprintf(stderr,"I        Convert non ISO-2022-JP charactor to GETA\n");
+    fprintf(stderr,"d,c      Convert line breaks  -d: LF  -c: CRLF\n");
+    fprintf(stderr,"-L[uwm]  line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n");
+    fprintf(stderr,"\n");
+    fprintf(stderr,"Long name options\n");
+    fprintf(stderr," --ic=<input codeset>  --oc=<output codeset>\n");
+    fprintf(stderr,"                   Specify the input or output codeset\n");
+    fprintf(stderr," --fj  --unix --mac  --windows\n");
+    fprintf(stderr," --jis  --euc  --sjis  --utf8  --utf16  --mime  --base64\n");
+    fprintf(stderr,"                   Convert for the system or code\n");
+    fprintf(stderr," --hiragana  --katakana  --katakana-hiragana\n");
+    fprintf(stderr,"                   To Hiragana/Katakana Conversion\n");
+    fprintf(stderr," --prefix=         Insert escape before troublesome characters of Shift_JIS\n");
+#ifdef INPUT_OPTION
+    fprintf(stderr," --cap-input, --url-input  Convert hex after ':' or '%%'\n");
+#endif
+#ifdef NUMCHAR_OPTION
+    fprintf(stderr," --numchar-input   Convert Unicode Character Reference\n");
+#endif
+#ifdef UTF8_INPUT_ENABLE
+    fprintf(stderr," --fb-{skip, html, xml, perl, java, subchar}\n");
+    fprintf(stderr,"                   Specify how nkf handles unassigned characters\n");
+#endif
+#ifdef OVERWRITE
+    fprintf(stderr," --in-place[=SUFFIX]  --overwrite[=SUFFIX]\n");
+    fprintf(stderr,"                   Overwrite original listed files by filtered result\n");
+    fprintf(stderr,"                   --overwrite preserves timestamp of original files\n");
+#endif
+    fprintf(stderr," -g  --guess       Guess the input code\n");
+    fprintf(stderr," --help  --version Show this help/the version\n");
+    fprintf(stderr,"                   For more information, see also man nkf\n");
+    fprintf(stderr,"\n");
+    version();
+}
+
+void version(void)
+{
+    fprintf(stderr,"Network Kanji Filter Version %s (%s) "
+#if defined(MSDOS) && !defined(__WIN32__) && !defined(__WIN16__) && !defined(__OS2__)
+                  "for DOS"
+#endif
+#if defined(MSDOS) && defined(__WIN16__)
+                  "for Win16"
+#endif
+#if defined(MSDOS) && defined(__WIN32__)
+                  "for Win32"
+#endif
+#ifdef __OS2__
+                  "for OS/2"
+#endif
+                  ,NKF_VERSION,NKF_RELEASE_DATE);
+    fprintf(stderr,"\n%s\n",CopyRight);
+}
+#endif /*PERL_XS*/
+
+/**
+ ** $B%Q%C%A@):n<T(B
+ **  void@merope.pleiades.or.jp (Kusakabe Youichi)
+ **  NIDE Naoyuki <nide@ics.nara-wu.ac.jp>
+ **  ohta@src.ricoh.co.jp (Junn Ohta)
+ **  inouet@strl.nhk.or.jp (Tomoyuki Inoue)
+ **  kiri@pulser.win.or.jp (Tetsuaki Kiriyama)
+ **  Kimihiko Sato <sato@sail.t.u-tokyo.ac.jp>
+ **  a_kuroe@kuroe.aoba.yokohama.jp (Akihiko Kuroe)
+ **  kono@ie.u-ryukyu.ac.jp (Shinji Kono)
+ **  GHG00637@nifty-serve.or.jp (COW)
+ **
+ **/
+
+/* end */
diff --git a/ruby_1_8_6/ext/nkf/nkf-utf8/utf8tbl.c b/ruby_1_8_6/ext/nkf/nkf-utf8/utf8tbl.c
new file mode 100644
index 0000000000..e43ad553d6
--- /dev/null
+++ b/ruby_1_8_6/ext/nkf/nkf-utf8/utf8tbl.c
@@ -0,0 +1,8500 @@
+#include "config.h"
+
+#ifdef UTF8_OUTPUT_ENABLE
+const unsigned short euc_to_utf8_A1[] = {
+         0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A,
+ 0xFF1B, 0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8,
+ 0xFF3E, 0x203E, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003,
+ 0x4EDD, 0x3005, 0x3006, 0x3007, 0x30FC, 0x2014, 0x2010, 0xFF0F,
+ 0xFF3C, 0x301C, 0x2016, 0xFF5C, 0x2026, 0x2025, 0x2018, 0x2019,
+ 0x201C, 0x201D, 0xFF08, 0xFF09, 0x3014, 0x3015, 0xFF3B, 0xFF3D,
+ 0xFF5B, 0xFF5D, 0x3008, 0x3009, 0x300A, 0x300B, 0x300C, 0x300D,
+ 0x300E, 0x300F, 0x3010, 0x3011, 0xFF0B, 0x2212, 0x00B1, 0x00D7,
+ 0x00F7, 0xFF1D, 0x2260, 0xFF1C, 0xFF1E, 0x2266, 0x2267, 0x221E,
+ 0x2234, 0x2642, 0x2640, 0x00B0, 0x2032, 0x2033, 0x2103, 0x00A5,
+ 0xFF04, 0x00A2, 0x00A3, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20,
+ 0x00A7, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7,
+};
+
+/* Microsoft UCS Mapping Compatible */
+const unsigned short euc_to_utf8_A1_ms[] = {
+         0x3000, 0x3001, 0x3002, 0xFF0C, 0xFF0E, 0x30FB, 0xFF1A,
+ 0xFF1B, 0xFF1F, 0xFF01, 0x309B, 0x309C, 0x00B4, 0xFF40, 0x00A8,
+ 0xFF3E, 0xFFE3, 0xFF3F, 0x30FD, 0x30FE, 0x309D, 0x309E, 0x3003,
+ 0x4EDD, 0x3005, 0x3006, 0x3007, 0x30FC, 0x2015, 0x2010, 0xFF0F,
+ 0xFF3C, 0xFF5E, 0x2225, 0xFF5C, 0x2026, 0x2025, 0x2018, 0x2019,
+ 0x201C, 0x201D, 0xFF08, 0xFF09, 0x3014, 0x3015, 0xFF3B, 0xFF3D,
+ 0xFF5B, 0xFF5D, 0x3008, 0x3009, 0x300A, 0x300B, 0x300C, 0x300D,
+ 0x300E, 0x300F, 0x3010, 0x3011, 0xFF0B, 0xFF0D, 0x00B1, 0x00D7,
+ 0x00F7, 0xFF1D, 0x2260, 0xFF1C, 0xFF1E, 0x2266, 0x2267, 0x221E,
+ 0x2234, 0x2642, 0x2640, 0x00B0, 0x2032, 0x2033, 0x2103, 0xFFE5,
+ 0xFF04, 0xFFE0, 0xFFE1, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20,
+ 0x00A7, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7,
+};
+const unsigned short euc_to_utf8_A2[] = {
+         0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
+ 0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2208, 0x220B, 0x2286, 0x2287, 0x2282, 0x2283,
+ 0x222A, 0x2229,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2227, 0x2228, 0x00AC, 0x21D2, 0x21D4, 0x2200,
+ 0x2203,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x2220, 0x22A5, 0x2312, 0x2202,
+ 0x2207, 0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D,
+ 0x2235, 0x222B, 0x222C,      0,      0,      0,      0,      0,
+      0,      0, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
+ 0x2021, 0x00B6,      0,      0,      0,      0, 0x25EF,
+};
+
+/* Microsoft UCS Mapping Compatible */
+const unsigned short euc_to_utf8_A2_ms[] = {
+         0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
+ 0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2208, 0x220B, 0x2286, 0x2287, 0x2282, 0x2283,
+ 0x222A, 0x2229,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2227, 0x2228, 0xFFE2, 0x21D2, 0x21D4, 0x2200,
+ 0x2203,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x2220, 0x22A5, 0x2312, 0x2202,
+ 0x2207, 0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D,
+ 0x2235, 0x222B, 0x222C,      0,      0,      0,      0,      0,
+      0,      0, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
+ 0x2021, 0x00B6,      0,      0,      0,      0, 0x25EF,
+};
+const unsigned short euc_to_utf8_A3[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17,
+ 0xFF18, 0xFF19,      0,      0,      0,      0,      0,      0,
+      0, 0xFF21, 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27,
+ 0xFF28, 0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F,
+ 0xFF30, 0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37,
+ 0xFF38, 0xFF39, 0xFF3A,      0,      0,      0,      0,      0,
+      0, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47,
+ 0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F,
+ 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57,
+ 0xFF58, 0xFF59, 0xFF5A,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_A4[] = {
+         0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047,
+ 0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F,
+ 0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057,
+ 0x3058, 0x3059, 0x305A, 0x305B, 0x305C, 0x305D, 0x305E, 0x305F,
+ 0x3060, 0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067,
+ 0x3068, 0x3069, 0x306A, 0x306B, 0x306C, 0x306D, 0x306E, 0x306F,
+ 0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077,
+ 0x3078, 0x3079, 0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F,
+ 0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087,
+ 0x3088, 0x3089, 0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F,
+ 0x3090, 0x3091, 0x3092, 0x3093,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_A5[] = {
+         0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7,
+ 0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF,
+ 0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7,
+ 0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC, 0x30BD, 0x30BE, 0x30BF,
+ 0x30C0, 0x30C1, 0x30C2, 0x30C3, 0x30C4, 0x30C5, 0x30C6, 0x30C7,
+ 0x30C8, 0x30C9, 0x30CA, 0x30CB, 0x30CC, 0x30CD, 0x30CE, 0x30CF,
+ 0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7,
+ 0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF,
+ 0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 0x30E7,
+ 0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 0x30EE, 0x30EF,
+ 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_A6[] = {
+         0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
+ 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+ 0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8,
+ 0x03A9,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
+ 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+ 0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8,
+ 0x03C9,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_A7[] = {
+         0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401,
+ 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D,
+ 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425,
+ 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D,
+ 0x042E, 0x042F,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451,
+ 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D,
+ 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445,
+ 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D,
+ 0x044E, 0x044F,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_A8[] = {
+         0x2500, 0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C,
+ 0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513,
+ 0x251B, 0x2517, 0x2523, 0x2533, 0x252B, 0x253B, 0x254B, 0x2520,
+ 0x252F, 0x2528, 0x2537, 0x253F, 0x251D, 0x2530, 0x2525, 0x2538,
+ 0x2542,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_A9[] = {
+         0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
+ 0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
+ 0x246F, 0x2470, 0x2471, 0x2472, 0x2473,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x2474,
+ 0x2475, 0x2476, 0x2477, 0x2478, 0x2479, 0x247A, 0x247B, 0x247C,
+ 0x247D, 0x247E, 0x247F, 0x2480, 0x2481, 0x2482, 0x2483, 0x2484,
+ 0x2485, 0x2486, 0x2487,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x2776, 0x2777, 0x2778,
+ 0x2779, 0x277A, 0x277B, 0x277C, 0x277D, 0x277E,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2488, 0x2489, 0x248A, 0x248B, 0x248C, 0x248D,
+ 0x248E, 0x248F, 0x2490,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_AA[] = {
+         0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166,
+ 0x2167, 0x2168, 0x2169, 0x216A, 0x216B,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x2170, 0x2171, 0x2172,
+ 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217A,
+ 0x217B,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x249C, 0x249D, 0x249E,
+ 0x249F, 0x24A0, 0x24A1, 0x24A2, 0x24A3, 0x24A4, 0x24A5, 0x24A6,
+ 0x24A7, 0x24A8, 0x24A9, 0x24AA, 0x24AB, 0x24AC, 0x24AD, 0x24AE,
+ 0x24AF, 0x24B0, 0x24B1, 0x24B2, 0x24B3, 0x24B4, 0x24B5,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_AB[] = {
+         0x339C, 0x339F, 0x339D, 0x33A0, 0x33A4,      0, 0x33A1,
+ 0x33A5, 0x339E, 0x33A2, 0x338E,      0, 0x338F, 0x33C4, 0x3396,
+ 0x3397, 0x2113, 0x3398, 0x33B3, 0x33B2, 0x33B1, 0x33B0, 0x2109,
+ 0x33D4, 0x33CB, 0x3390, 0x3385, 0x3386, 0x3387,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2116, 0x33CD, 0x2121,      0,
+};
+const unsigned short euc_to_utf8_AC[] = {
+         0x2664, 0x2667, 0x2661, 0x2662, 0x2660, 0x2663, 0x2665,
+ 0x2666,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x3020, 0x260E, 0x3004,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x261E, 0x261C, 0x261D, 0x261F, 0x21C6, 0x21C4, 0x21C5,
+      0, 0x21E8, 0x21E6, 0x21E7, 0x21E9,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_AD[] = {
+         0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
+ 0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
+ 0x246F, 0x2470, 0x2471, 0x2472, 0x2473, 0x2160, 0x2161, 0x2162,
+ 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169,      0,
+ 0x3349, 0x3314, 0x3322, 0x334D, 0x3318, 0x3327, 0x3303, 0x3336,
+ 0x3351, 0x3357, 0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B,
+ 0x339C, 0x339D, 0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x337B,
+ 0x301D, 0x301F, 0x2116, 0x33CD, 0x2121, 0x32A4, 0x32A5, 0x32A6,
+ 0x32A7, 0x32A8, 0x3231, 0x3232, 0x3239, 0x337E, 0x337D, 0x337C,
+ 0x2252, 0x2261, 0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, 0x2220,
+ 0x221F, 0x22BF, 0x2235, 0x2229, 0x222A,      0, 0x3299,
+};
+const unsigned short euc_to_utf8_AE[] = {
+         0x3349, 0x3322, 0x334D, 0x3314, 0x3316, 0x3305, 0x3333,
+ 0x334E, 0x3303, 0x3336, 0x3318, 0x3315, 0x3327, 0x3351, 0x334A,
+ 0x3339, 0x3357, 0x330D, 0x3342, 0x3323, 0x3326, 0x333B, 0x332B,
+      0,      0,      0,      0,      0,      0,      0, 0x3300,
+ 0x331E, 0x332A, 0x3331, 0x3347,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x337E,
+ 0x337D, 0x337C, 0x337B,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x337F,      0,      0,
+};
+const unsigned short euc_to_utf8_AF[] = {
+         0x222E, 0x221F, 0x22BF,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x301D, 0x301F,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x3094,      0, 0x30F7, 0x30F8, 0x30F9, 0x30FA,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_B0[] = {
+         0x4E9C, 0x5516, 0x5A03, 0x963F, 0x54C0, 0x611B, 0x6328,
+ 0x59F6, 0x9022, 0x8475, 0x831C, 0x7A50, 0x60AA, 0x63E1, 0x6E25,
+ 0x65ED, 0x8466, 0x82A6, 0x9BF5, 0x6893, 0x5727, 0x65A1, 0x6271,
+ 0x5B9B, 0x59D0, 0x867B, 0x98F4, 0x7D62, 0x7DBE, 0x9B8E, 0x6216,
+ 0x7C9F, 0x88B7, 0x5B89, 0x5EB5, 0x6309, 0x6697, 0x6848, 0x95C7,
+ 0x978D, 0x674F, 0x4EE5, 0x4F0A, 0x4F4D, 0x4F9D, 0x5049, 0x56F2,
+ 0x5937, 0x59D4, 0x5A01, 0x5C09, 0x60DF, 0x610F, 0x6170, 0x6613,
+ 0x6905, 0x70BA, 0x754F, 0x7570, 0x79FB, 0x7DAD, 0x7DEF, 0x80C3,
+ 0x840E, 0x8863, 0x8B02, 0x9055, 0x907A, 0x533B, 0x4E95, 0x4EA5,
+ 0x57DF, 0x80B2, 0x90C1, 0x78EF, 0x4E00, 0x58F1, 0x6EA2, 0x9038,
+ 0x7A32, 0x8328, 0x828B, 0x9C2F, 0x5141, 0x5370, 0x54BD, 0x54E1,
+ 0x56E0, 0x59FB, 0x5F15, 0x98F2, 0x6DEB, 0x80E4, 0x852D,
+};
+const unsigned short euc_to_utf8_B1[] = {
+         0x9662, 0x9670, 0x96A0, 0x97FB, 0x540B, 0x53F3, 0x5B87,
+ 0x70CF, 0x7FBD, 0x8FC2, 0x96E8, 0x536F, 0x9D5C, 0x7ABA, 0x4E11,
+ 0x7893, 0x81FC, 0x6E26, 0x5618, 0x5504, 0x6B1D, 0x851A, 0x9C3B,
+ 0x59E5, 0x53A9, 0x6D66, 0x74DC, 0x958F, 0x5642, 0x4E91, 0x904B,
+ 0x96F2, 0x834F, 0x990C, 0x53E1, 0x55B6, 0x5B30, 0x5F71, 0x6620,
+ 0x66F3, 0x6804, 0x6C38, 0x6CF3, 0x6D29, 0x745B, 0x76C8, 0x7A4E,
+ 0x9834, 0x82F1, 0x885B, 0x8A60, 0x92ED, 0x6DB2, 0x75AB, 0x76CA,
+ 0x99C5, 0x60A6, 0x8B01, 0x8D8A, 0x95B2, 0x698E, 0x53AD, 0x5186,
+ 0x5712, 0x5830, 0x5944, 0x5BB4, 0x5EF6, 0x6028, 0x63A9, 0x63F4,
+ 0x6CBF, 0x6F14, 0x708E, 0x7114, 0x7159, 0x71D5, 0x733F, 0x7E01,
+ 0x8276, 0x82D1, 0x8597, 0x9060, 0x925B, 0x9D1B, 0x5869, 0x65BC,
+ 0x6C5A, 0x7525, 0x51F9, 0x592E, 0x5965, 0x5F80, 0x5FDC,
+};
+const unsigned short euc_to_utf8_B2[] = {
+         0x62BC, 0x65FA, 0x6A2A, 0x6B27, 0x6BB4, 0x738B, 0x7FC1,
+ 0x8956, 0x9D2C, 0x9D0E, 0x9EC4, 0x5CA1, 0x6C96, 0x837B, 0x5104,
+ 0x5C4B, 0x61B6, 0x81C6, 0x6876, 0x7261, 0x4E59, 0x4FFA, 0x5378,
+ 0x6069, 0x6E29, 0x7A4F, 0x97F3, 0x4E0B, 0x5316, 0x4EEE, 0x4F55,
+ 0x4F3D, 0x4FA1, 0x4F73, 0x52A0, 0x53EF, 0x5609, 0x590F, 0x5AC1,
+ 0x5BB6, 0x5BE1, 0x79D1, 0x6687, 0x679C, 0x67B6, 0x6B4C, 0x6CB3,
+ 0x706B, 0x73C2, 0x798D, 0x79BE, 0x7A3C, 0x7B87, 0x82B1, 0x82DB,
+ 0x8304, 0x8377, 0x83EF, 0x83D3, 0x8766, 0x8AB2, 0x5629, 0x8CA8,
+ 0x8FE6, 0x904E, 0x971E, 0x868A, 0x4FC4, 0x5CE8, 0x6211, 0x7259,
+ 0x753B, 0x81E5, 0x82BD, 0x86FE, 0x8CC0, 0x96C5, 0x9913, 0x99D5,
+ 0x4ECB, 0x4F1A, 0x89E3, 0x56DE, 0x584A, 0x58CA, 0x5EFB, 0x5FEB,
+ 0x602A, 0x6094, 0x6062, 0x61D0, 0x6212, 0x62D0, 0x6539,
+};
+const unsigned short euc_to_utf8_B3[] = {
+         0x9B41, 0x6666, 0x68B0, 0x6D77, 0x7070, 0x754C, 0x7686,
+ 0x7D75, 0x82A5, 0x87F9, 0x958B, 0x968E, 0x8C9D, 0x51F1, 0x52BE,
+ 0x5916, 0x54B3, 0x5BB3, 0x5D16, 0x6168, 0x6982, 0x6DAF, 0x788D,
+ 0x84CB, 0x8857, 0x8A72, 0x93A7, 0x9AB8, 0x6D6C, 0x99A8, 0x86D9,
+ 0x57A3, 0x67FF, 0x86CE, 0x920E, 0x5283, 0x5687, 0x5404, 0x5ED3,
+ 0x62E1, 0x64B9, 0x683C, 0x6838, 0x6BBB, 0x7372, 0x78BA, 0x7A6B,
+ 0x899A, 0x89D2, 0x8D6B, 0x8F03, 0x90ED, 0x95A3, 0x9694, 0x9769,
+ 0x5B66, 0x5CB3, 0x697D, 0x984D, 0x984E, 0x639B, 0x7B20, 0x6A2B,
+ 0x6A7F, 0x68B6, 0x9C0D, 0x6F5F, 0x5272, 0x559D, 0x6070, 0x62EC,
+ 0x6D3B, 0x6E07, 0x6ED1, 0x845B, 0x8910, 0x8F44, 0x4E14, 0x9C39,
+ 0x53F6, 0x691B, 0x6A3A, 0x9784, 0x682A, 0x515C, 0x7AC3, 0x84B2,
+ 0x91DC, 0x938C, 0x565B, 0x9D28, 0x6822, 0x8305, 0x8431,
+};
+const unsigned short euc_to_utf8_B4[] = {
+         0x7CA5, 0x5208, 0x82C5, 0x74E6, 0x4E7E, 0x4F83, 0x51A0,
+ 0x5BD2, 0x520A, 0x52D8, 0x52E7, 0x5DFB, 0x559A, 0x582A, 0x59E6,
+ 0x5B8C, 0x5B98, 0x5BDB, 0x5E72, 0x5E79, 0x60A3, 0x611F, 0x6163,
+ 0x61BE, 0x63DB, 0x6562, 0x67D1, 0x6853, 0x68FA, 0x6B3E, 0x6B53,
+ 0x6C57, 0x6F22, 0x6F97, 0x6F45, 0x74B0, 0x7518, 0x76E3, 0x770B,
+ 0x7AFF, 0x7BA1, 0x7C21, 0x7DE9, 0x7F36, 0x7FF0, 0x809D, 0x8266,
+ 0x839E, 0x89B3, 0x8ACC, 0x8CAB, 0x9084, 0x9451, 0x9593, 0x9591,
+ 0x95A2, 0x9665, 0x97D3, 0x9928, 0x8218, 0x4E38, 0x542B, 0x5CB8,
+ 0x5DCC, 0x73A9, 0x764C, 0x773C, 0x5CA9, 0x7FEB, 0x8D0B, 0x96C1,
+ 0x9811, 0x9854, 0x9858, 0x4F01, 0x4F0E, 0x5371, 0x559C, 0x5668,
+ 0x57FA, 0x5947, 0x5B09, 0x5BC4, 0x5C90, 0x5E0C, 0x5E7E, 0x5FCC,
+ 0x63EE, 0x673A, 0x65D7, 0x65E2, 0x671F, 0x68CB, 0x68C4,
+};
+const unsigned short euc_to_utf8_B5[] = {
+         0x6A5F, 0x5E30, 0x6BC5, 0x6C17, 0x6C7D, 0x757F, 0x7948,
+ 0x5B63, 0x7A00, 0x7D00, 0x5FBD, 0x898F, 0x8A18, 0x8CB4, 0x8D77,
+ 0x8ECC, 0x8F1D, 0x98E2, 0x9A0E, 0x9B3C, 0x4E80, 0x507D, 0x5100,
+ 0x5993, 0x5B9C, 0x622F, 0x6280, 0x64EC, 0x6B3A, 0x72A0, 0x7591,
+ 0x7947, 0x7FA9, 0x87FB, 0x8ABC, 0x8B70, 0x63AC, 0x83CA, 0x97A0,
+ 0x5409, 0x5403, 0x55AB, 0x6854, 0x6A58, 0x8A70, 0x7827, 0x6775,
+ 0x9ECD, 0x5374, 0x5BA2, 0x811A, 0x8650, 0x9006, 0x4E18, 0x4E45,
+ 0x4EC7, 0x4F11, 0x53CA, 0x5438, 0x5BAE, 0x5F13, 0x6025, 0x6551,
+ 0x673D, 0x6C42, 0x6C72, 0x6CE3, 0x7078, 0x7403, 0x7A76, 0x7AAE,
+ 0x7B08, 0x7D1A, 0x7CFE, 0x7D66, 0x65E7, 0x725B, 0x53BB, 0x5C45,
+ 0x5DE8, 0x62D2, 0x62E0, 0x6319, 0x6E20, 0x865A, 0x8A31, 0x8DDD,
+ 0x92F8, 0x6F01, 0x79A6, 0x9B5A, 0x4EA8, 0x4EAB, 0x4EAC,
+};
+const unsigned short euc_to_utf8_B6[] = {
+         0x4F9B, 0x4FA0, 0x50D1, 0x5147, 0x7AF6, 0x5171, 0x51F6,
+ 0x5354, 0x5321, 0x537F, 0x53EB, 0x55AC, 0x5883, 0x5CE1, 0x5F37,
+ 0x5F4A, 0x602F, 0x6050, 0x606D, 0x631F, 0x6559, 0x6A4B, 0x6CC1,
+ 0x72C2, 0x72ED, 0x77EF, 0x80F8, 0x8105, 0x8208, 0x854E, 0x90F7,
+ 0x93E1, 0x97FF, 0x9957, 0x9A5A, 0x4EF0, 0x51DD, 0x5C2D, 0x6681,
+ 0x696D, 0x5C40, 0x66F2, 0x6975, 0x7389, 0x6850, 0x7C81, 0x50C5,
+ 0x52E4, 0x5747, 0x5DFE, 0x9326, 0x65A4, 0x6B23, 0x6B3D, 0x7434,
+ 0x7981, 0x79BD, 0x7B4B, 0x7DCA, 0x82B9, 0x83CC, 0x887F, 0x895F,
+ 0x8B39, 0x8FD1, 0x91D1, 0x541F, 0x9280, 0x4E5D, 0x5036, 0x53E5,
+ 0x533A, 0x72D7, 0x7396, 0x77E9, 0x82E6, 0x8EAF, 0x99C6, 0x99C8,
+ 0x99D2, 0x5177, 0x611A, 0x865E, 0x55B0, 0x7A7A, 0x5076, 0x5BD3,
+ 0x9047, 0x9685, 0x4E32, 0x6ADB, 0x91E7, 0x5C51, 0x5C48,
+};
+const unsigned short euc_to_utf8_B7[] = {
+         0x6398, 0x7A9F, 0x6C93, 0x9774, 0x8F61, 0x7AAA, 0x718A,
+ 0x9688, 0x7C82, 0x6817, 0x7E70, 0x6851, 0x936C, 0x52F2, 0x541B,
+ 0x85AB, 0x8A13, 0x7FA4, 0x8ECD, 0x90E1, 0x5366, 0x8888, 0x7941,
+ 0x4FC2, 0x50BE, 0x5211, 0x5144, 0x5553, 0x572D, 0x73EA, 0x578B,
+ 0x5951, 0x5F62, 0x5F84, 0x6075, 0x6176, 0x6167, 0x61A9, 0x63B2,
+ 0x643A, 0x656C, 0x666F, 0x6842, 0x6E13, 0x7566, 0x7A3D, 0x7CFB,
+ 0x7D4C, 0x7D99, 0x7E4B, 0x7F6B, 0x830E, 0x834A, 0x86CD, 0x8A08,
+ 0x8A63, 0x8B66, 0x8EFD, 0x981A, 0x9D8F, 0x82B8, 0x8FCE, 0x9BE8,
+ 0x5287, 0x621F, 0x6483, 0x6FC0, 0x9699, 0x6841, 0x5091, 0x6B20,
+ 0x6C7A, 0x6F54, 0x7A74, 0x7D50, 0x8840, 0x8A23, 0x6708, 0x4EF6,
+ 0x5039, 0x5026, 0x5065, 0x517C, 0x5238, 0x5263, 0x55A7, 0x570F,
+ 0x5805, 0x5ACC, 0x5EFA, 0x61B2, 0x61F8, 0x62F3, 0x6372,
+};
+const unsigned short euc_to_utf8_B8[] = {
+         0x691C, 0x6A29, 0x727D, 0x72AC, 0x732E, 0x7814, 0x786F,
+ 0x7D79, 0x770C, 0x80A9, 0x898B, 0x8B19, 0x8CE2, 0x8ED2, 0x9063,
+ 0x9375, 0x967A, 0x9855, 0x9A13, 0x9E78, 0x5143, 0x539F, 0x53B3,
+ 0x5E7B, 0x5F26, 0x6E1B, 0x6E90, 0x7384, 0x73FE, 0x7D43, 0x8237,
+ 0x8A00, 0x8AFA, 0x9650, 0x4E4E, 0x500B, 0x53E4, 0x547C, 0x56FA,
+ 0x59D1, 0x5B64, 0x5DF1, 0x5EAB, 0x5F27, 0x6238, 0x6545, 0x67AF,
+ 0x6E56, 0x72D0, 0x7CCA, 0x88B4, 0x80A1, 0x80E1, 0x83F0, 0x864E,
+ 0x8A87, 0x8DE8, 0x9237, 0x96C7, 0x9867, 0x9F13, 0x4E94, 0x4E92,
+ 0x4F0D, 0x5348, 0x5449, 0x543E, 0x5A2F, 0x5F8C, 0x5FA1, 0x609F,
+ 0x68A7, 0x6A8E, 0x745A, 0x7881, 0x8A9E, 0x8AA4, 0x8B77, 0x9190,
+ 0x4E5E, 0x9BC9, 0x4EA4, 0x4F7C, 0x4FAF, 0x5019, 0x5016, 0x5149,
+ 0x516C, 0x529F, 0x52B9, 0x52FE, 0x539A, 0x53E3, 0x5411,
+};
+const unsigned short euc_to_utf8_B9[] = {
+         0x540E, 0x5589, 0x5751, 0x57A2, 0x597D, 0x5B54, 0x5B5D,
+ 0x5B8F, 0x5DE5, 0x5DE7, 0x5DF7, 0x5E78, 0x5E83, 0x5E9A, 0x5EB7,
+ 0x5F18, 0x6052, 0x614C, 0x6297, 0x62D8, 0x63A7, 0x653B, 0x6602,
+ 0x6643, 0x66F4, 0x676D, 0x6821, 0x6897, 0x69CB, 0x6C5F, 0x6D2A,
+ 0x6D69, 0x6E2F, 0x6E9D, 0x7532, 0x7687, 0x786C, 0x7A3F, 0x7CE0,
+ 0x7D05, 0x7D18, 0x7D5E, 0x7DB1, 0x8015, 0x8003, 0x80AF, 0x80B1,
+ 0x8154, 0x818F, 0x822A, 0x8352, 0x884C, 0x8861, 0x8B1B, 0x8CA2,
+ 0x8CFC, 0x90CA, 0x9175, 0x9271, 0x783F, 0x92FC, 0x95A4, 0x964D,
+ 0x9805, 0x9999, 0x9AD8, 0x9D3B, 0x525B, 0x52AB, 0x53F7, 0x5408,
+ 0x58D5, 0x62F7, 0x6FE0, 0x8C6A, 0x8F5F, 0x9EB9, 0x514B, 0x523B,
+ 0x544A, 0x56FD, 0x7A40, 0x9177, 0x9D60, 0x9ED2, 0x7344, 0x6F09,
+ 0x8170, 0x7511, 0x5FFD, 0x60DA, 0x9AA8, 0x72DB, 0x8FBC,
+};
+const unsigned short euc_to_utf8_BA[] = {
+         0x6B64, 0x9803, 0x4ECA, 0x56F0, 0x5764, 0x58BE, 0x5A5A,
+ 0x6068, 0x61C7, 0x660F, 0x6606, 0x6839, 0x68B1, 0x6DF7, 0x75D5,
+ 0x7D3A, 0x826E, 0x9B42, 0x4E9B, 0x4F50, 0x53C9, 0x5506, 0x5D6F,
+ 0x5DE6, 0x5DEE, 0x67FB, 0x6C99, 0x7473, 0x7802, 0x8A50, 0x9396,
+ 0x88DF, 0x5750, 0x5EA7, 0x632B, 0x50B5, 0x50AC, 0x518D, 0x6700,
+ 0x54C9, 0x585E, 0x59BB, 0x5BB0, 0x5F69, 0x624D, 0x63A1, 0x683D,
+ 0x6B73, 0x6E08, 0x707D, 0x91C7, 0x7280, 0x7815, 0x7826, 0x796D,
+ 0x658E, 0x7D30, 0x83DC, 0x88C1, 0x8F09, 0x969B, 0x5264, 0x5728,
+ 0x6750, 0x7F6A, 0x8CA1, 0x51B4, 0x5742, 0x962A, 0x583A, 0x698A,
+ 0x80B4, 0x54B2, 0x5D0E, 0x57FC, 0x7895, 0x9DFA, 0x4F5C, 0x524A,
+ 0x548B, 0x643E, 0x6628, 0x6714, 0x67F5, 0x7A84, 0x7B56, 0x7D22,
+ 0x932F, 0x685C, 0x9BAD, 0x7B39, 0x5319, 0x518A, 0x5237,
+};
+const unsigned short euc_to_utf8_BB[] = {
+         0x5BDF, 0x62F6, 0x64AE, 0x64E6, 0x672D, 0x6BBA, 0x85A9,
+ 0x96D1, 0x7690, 0x9BD6, 0x634C, 0x9306, 0x9BAB, 0x76BF, 0x6652,
+ 0x4E09, 0x5098, 0x53C2, 0x5C71, 0x60E8, 0x6492, 0x6563, 0x685F,
+ 0x71E6, 0x73CA, 0x7523, 0x7B97, 0x7E82, 0x8695, 0x8B83, 0x8CDB,
+ 0x9178, 0x9910, 0x65AC, 0x66AB, 0x6B8B, 0x4ED5, 0x4ED4, 0x4F3A,
+ 0x4F7F, 0x523A, 0x53F8, 0x53F2, 0x55E3, 0x56DB, 0x58EB, 0x59CB,
+ 0x59C9, 0x59FF, 0x5B50, 0x5C4D, 0x5E02, 0x5E2B, 0x5FD7, 0x601D,
+ 0x6307, 0x652F, 0x5B5C, 0x65AF, 0x65BD, 0x65E8, 0x679D, 0x6B62,
+ 0x6B7B, 0x6C0F, 0x7345, 0x7949, 0x79C1, 0x7CF8, 0x7D19, 0x7D2B,
+ 0x80A2, 0x8102, 0x81F3, 0x8996, 0x8A5E, 0x8A69, 0x8A66, 0x8A8C,
+ 0x8AEE, 0x8CC7, 0x8CDC, 0x96CC, 0x98FC, 0x6B6F, 0x4E8B, 0x4F3C,
+ 0x4F8D, 0x5150, 0x5B57, 0x5BFA, 0x6148, 0x6301, 0x6642,
+};
+const unsigned short euc_to_utf8_BC[] = {
+         0x6B21, 0x6ECB, 0x6CBB, 0x723E, 0x74BD, 0x75D4, 0x78C1,
+ 0x793A, 0x800C, 0x8033, 0x81EA, 0x8494, 0x8F9E, 0x6C50, 0x9E7F,
+ 0x5F0F, 0x8B58, 0x9D2B, 0x7AFA, 0x8EF8, 0x5B8D, 0x96EB, 0x4E03,
+ 0x53F1, 0x57F7, 0x5931, 0x5AC9, 0x5BA4, 0x6089, 0x6E7F, 0x6F06,
+ 0x75BE, 0x8CEA, 0x5B9F, 0x8500, 0x7BE0, 0x5072, 0x67F4, 0x829D,
+ 0x5C61, 0x854A, 0x7E1E, 0x820E, 0x5199, 0x5C04, 0x6368, 0x8D66,
+ 0x659C, 0x716E, 0x793E, 0x7D17, 0x8005, 0x8B1D, 0x8ECA, 0x906E,
+ 0x86C7, 0x90AA, 0x501F, 0x52FA, 0x5C3A, 0x6753, 0x707C, 0x7235,
+ 0x914C, 0x91C8, 0x932B, 0x82E5, 0x5BC2, 0x5F31, 0x60F9, 0x4E3B,
+ 0x53D6, 0x5B88, 0x624B, 0x6731, 0x6B8A, 0x72E9, 0x73E0, 0x7A2E,
+ 0x816B, 0x8DA3, 0x9152, 0x9996, 0x5112, 0x53D7, 0x546A, 0x5BFF,
+ 0x6388, 0x6A39, 0x7DAC, 0x9700, 0x56DA, 0x53CE, 0x5468,
+};
+const unsigned short euc_to_utf8_BD[] = {
+         0x5B97, 0x5C31, 0x5DDE, 0x4FEE, 0x6101, 0x62FE, 0x6D32,
+ 0x79C0, 0x79CB, 0x7D42, 0x7E4D, 0x7FD2, 0x81ED, 0x821F, 0x8490,
+ 0x8846, 0x8972, 0x8B90, 0x8E74, 0x8F2F, 0x9031, 0x914B, 0x916C,
+ 0x96C6, 0x919C, 0x4EC0, 0x4F4F, 0x5145, 0x5341, 0x5F93, 0x620E,
+ 0x67D4, 0x6C41, 0x6E0B, 0x7363, 0x7E26, 0x91CD, 0x9283, 0x53D4,
+ 0x5919, 0x5BBF, 0x6DD1, 0x795D, 0x7E2E, 0x7C9B, 0x587E, 0x719F,
+ 0x51FA, 0x8853, 0x8FF0, 0x4FCA, 0x5CFB, 0x6625, 0x77AC, 0x7AE3,
+ 0x821C, 0x99FF, 0x51C6, 0x5FAA, 0x65EC, 0x696F, 0x6B89, 0x6DF3,
+ 0x6E96, 0x6F64, 0x76FE, 0x7D14, 0x5DE1, 0x9075, 0x9187, 0x9806,
+ 0x51E6, 0x521D, 0x6240, 0x6691, 0x66D9, 0x6E1A, 0x5EB6, 0x7DD2,
+ 0x7F72, 0x66F8, 0x85AF, 0x85F7, 0x8AF8, 0x52A9, 0x53D9, 0x5973,
+ 0x5E8F, 0x5F90, 0x6055, 0x92E4, 0x9664, 0x50B7, 0x511F,
+};
+const unsigned short euc_to_utf8_BE[] = {
+         0x52DD, 0x5320, 0x5347, 0x53EC, 0x54E8, 0x5546, 0x5531,
+ 0x5617, 0x5968, 0x59BE, 0x5A3C, 0x5BB5, 0x5C06, 0x5C0F, 0x5C11,
+ 0x5C1A, 0x5E84, 0x5E8A, 0x5EE0, 0x5F70, 0x627F, 0x6284, 0x62DB,
+ 0x638C, 0x6377, 0x6607, 0x660C, 0x662D, 0x6676, 0x677E, 0x68A2,
+ 0x6A1F, 0x6A35, 0x6CBC, 0x6D88, 0x6E09, 0x6E58, 0x713C, 0x7126,
+ 0x7167, 0x75C7, 0x7701, 0x785D, 0x7901, 0x7965, 0x79F0, 0x7AE0,
+ 0x7B11, 0x7CA7, 0x7D39, 0x8096, 0x83D6, 0x848B, 0x8549, 0x885D,
+ 0x88F3, 0x8A1F, 0x8A3C, 0x8A54, 0x8A73, 0x8C61, 0x8CDE, 0x91A4,
+ 0x9266, 0x937E, 0x9418, 0x969C, 0x9798, 0x4E0A, 0x4E08, 0x4E1E,
+ 0x4E57, 0x5197, 0x5270, 0x57CE, 0x5834, 0x58CC, 0x5B22, 0x5E38,
+ 0x60C5, 0x64FE, 0x6761, 0x6756, 0x6D44, 0x72B6, 0x7573, 0x7A63,
+ 0x84B8, 0x8B72, 0x91B8, 0x9320, 0x5631, 0x57F4, 0x98FE,
+};
+const unsigned short euc_to_utf8_BF[] = {
+         0x62ED, 0x690D, 0x6B96, 0x71ED, 0x7E54, 0x8077, 0x8272,
+ 0x89E6, 0x98DF, 0x8755, 0x8FB1, 0x5C3B, 0x4F38, 0x4FE1, 0x4FB5,
+ 0x5507, 0x5A20, 0x5BDD, 0x5BE9, 0x5FC3, 0x614E, 0x632F, 0x65B0,
+ 0x664B, 0x68EE, 0x699B, 0x6D78, 0x6DF1, 0x7533, 0x75B9, 0x771F,
+ 0x795E, 0x79E6, 0x7D33, 0x81E3, 0x82AF, 0x85AA, 0x89AA, 0x8A3A,
+ 0x8EAB, 0x8F9B, 0x9032, 0x91DD, 0x9707, 0x4EBA, 0x4EC1, 0x5203,
+ 0x5875, 0x58EC, 0x5C0B, 0x751A, 0x5C3D, 0x814E, 0x8A0A, 0x8FC5,
+ 0x9663, 0x976D, 0x7B25, 0x8ACF, 0x9808, 0x9162, 0x56F3, 0x53A8,
+ 0x9017, 0x5439, 0x5782, 0x5E25, 0x63A8, 0x6C34, 0x708A, 0x7761,
+ 0x7C8B, 0x7FE0, 0x8870, 0x9042, 0x9154, 0x9310, 0x9318, 0x968F,
+ 0x745E, 0x9AC4, 0x5D07, 0x5D69, 0x6570, 0x67A2, 0x8DA8, 0x96DB,
+ 0x636E, 0x6749, 0x6919, 0x83C5, 0x9817, 0x96C0, 0x88FE,
+};
+const unsigned short euc_to_utf8_C0[] = {
+         0x6F84, 0x647A, 0x5BF8, 0x4E16, 0x702C, 0x755D, 0x662F,
+ 0x51C4, 0x5236, 0x52E2, 0x59D3, 0x5F81, 0x6027, 0x6210, 0x653F,
+ 0x6574, 0x661F, 0x6674, 0x68F2, 0x6816, 0x6B63, 0x6E05, 0x7272,
+ 0x751F, 0x76DB, 0x7CBE, 0x8056, 0x58F0, 0x88FD, 0x897F, 0x8AA0,
+ 0x8A93, 0x8ACB, 0x901D, 0x9192, 0x9752, 0x9759, 0x6589, 0x7A0E,
+ 0x8106, 0x96BB, 0x5E2D, 0x60DC, 0x621A, 0x65A5, 0x6614, 0x6790,
+ 0x77F3, 0x7A4D, 0x7C4D, 0x7E3E, 0x810A, 0x8CAC, 0x8D64, 0x8DE1,
+ 0x8E5F, 0x78A9, 0x5207, 0x62D9, 0x63A5, 0x6442, 0x6298, 0x8A2D,
+ 0x7A83, 0x7BC0, 0x8AAC, 0x96EA, 0x7D76, 0x820C, 0x8749, 0x4ED9,
+ 0x5148, 0x5343, 0x5360, 0x5BA3, 0x5C02, 0x5C16, 0x5DDD, 0x6226,
+ 0x6247, 0x64B0, 0x6813, 0x6834, 0x6CC9, 0x6D45, 0x6D17, 0x67D3,
+ 0x6F5C, 0x714E, 0x717D, 0x65CB, 0x7A7F, 0x7BAD, 0x7DDA,
+};
+const unsigned short euc_to_utf8_C1[] = {
+         0x7E4A, 0x7FA8, 0x817A, 0x821B, 0x8239, 0x85A6, 0x8A6E,
+ 0x8CCE, 0x8DF5, 0x9078, 0x9077, 0x92AD, 0x9291, 0x9583, 0x9BAE,
+ 0x524D, 0x5584, 0x6F38, 0x7136, 0x5168, 0x7985, 0x7E55, 0x81B3,
+ 0x7CCE, 0x564C, 0x5851, 0x5CA8, 0x63AA, 0x66FE, 0x66FD, 0x695A,
+ 0x72D9, 0x758F, 0x758E, 0x790E, 0x7956, 0x79DF, 0x7C97, 0x7D20,
+ 0x7D44, 0x8607, 0x8A34, 0x963B, 0x9061, 0x9F20, 0x50E7, 0x5275,
+ 0x53CC, 0x53E2, 0x5009, 0x55AA, 0x58EE, 0x594F, 0x723D, 0x5B8B,
+ 0x5C64, 0x531D, 0x60E3, 0x60F3, 0x635C, 0x6383, 0x633F, 0x63BB,
+ 0x64CD, 0x65E9, 0x66F9, 0x5DE3, 0x69CD, 0x69FD, 0x6F15, 0x71E5,
+ 0x4E89, 0x75E9, 0x76F8, 0x7A93, 0x7CDF, 0x7DCF, 0x7D9C, 0x8061,
+ 0x8349, 0x8358, 0x846C, 0x84BC, 0x85FB, 0x88C5, 0x8D70, 0x9001,
+ 0x906D, 0x9397, 0x971C, 0x9A12, 0x50CF, 0x5897, 0x618E,
+};
+const unsigned short euc_to_utf8_C2[] = {
+         0x81D3, 0x8535, 0x8D08, 0x9020, 0x4FC3, 0x5074, 0x5247,
+ 0x5373, 0x606F, 0x6349, 0x675F, 0x6E2C, 0x8DB3, 0x901F, 0x4FD7,
+ 0x5C5E, 0x8CCA, 0x65CF, 0x7D9A, 0x5352, 0x8896, 0x5176, 0x63C3,
+ 0x5B58, 0x5B6B, 0x5C0A, 0x640D, 0x6751, 0x905C, 0x4ED6, 0x591A,
+ 0x592A, 0x6C70, 0x8A51, 0x553E, 0x5815, 0x59A5, 0x60F0, 0x6253,
+ 0x67C1, 0x8235, 0x6955, 0x9640, 0x99C4, 0x9A28, 0x4F53, 0x5806,
+ 0x5BFE, 0x8010, 0x5CB1, 0x5E2F, 0x5F85, 0x6020, 0x614B, 0x6234,
+ 0x66FF, 0x6CF0, 0x6EDE, 0x80CE, 0x817F, 0x82D4, 0x888B, 0x8CB8,
+ 0x9000, 0x902E, 0x968A, 0x9EDB, 0x9BDB, 0x4EE3, 0x53F0, 0x5927,
+ 0x7B2C, 0x918D, 0x984C, 0x9DF9, 0x6EDD, 0x7027, 0x5353, 0x5544,
+ 0x5B85, 0x6258, 0x629E, 0x62D3, 0x6CA2, 0x6FEF, 0x7422, 0x8A17,
+ 0x9438, 0x6FC1, 0x8AFE, 0x8338, 0x51E7, 0x86F8, 0x53EA,
+};
+const unsigned short euc_to_utf8_C3[] = {
+         0x53E9, 0x4F46, 0x9054, 0x8FB0, 0x596A, 0x8131, 0x5DFD,
+ 0x7AEA, 0x8FBF, 0x68DA, 0x8C37, 0x72F8, 0x9C48, 0x6A3D, 0x8AB0,
+ 0x4E39, 0x5358, 0x5606, 0x5766, 0x62C5, 0x63A2, 0x65E6, 0x6B4E,
+ 0x6DE1, 0x6E5B, 0x70AD, 0x77ED, 0x7AEF, 0x7BAA, 0x7DBB, 0x803D,
+ 0x80C6, 0x86CB, 0x8A95, 0x935B, 0x56E3, 0x58C7, 0x5F3E, 0x65AD,
+ 0x6696, 0x6A80, 0x6BB5, 0x7537, 0x8AC7, 0x5024, 0x77E5, 0x5730,
+ 0x5F1B, 0x6065, 0x667A, 0x6C60, 0x75F4, 0x7A1A, 0x7F6E, 0x81F4,
+ 0x8718, 0x9045, 0x99B3, 0x7BC9, 0x755C, 0x7AF9, 0x7B51, 0x84C4,
+ 0x9010, 0x79E9, 0x7A92, 0x8336, 0x5AE1, 0x7740, 0x4E2D, 0x4EF2,
+ 0x5B99, 0x5FE0, 0x62BD, 0x663C, 0x67F1, 0x6CE8, 0x866B, 0x8877,
+ 0x8A3B, 0x914E, 0x92F3, 0x99D0, 0x6A17, 0x7026, 0x732A, 0x82E7,
+ 0x8457, 0x8CAF, 0x4E01, 0x5146, 0x51CB, 0x558B, 0x5BF5,
+};
+const unsigned short euc_to_utf8_C4[] = {
+         0x5E16, 0x5E33, 0x5E81, 0x5F14, 0x5F35, 0x5F6B, 0x5FB4,
+ 0x61F2, 0x6311, 0x66A2, 0x671D, 0x6F6E, 0x7252, 0x753A, 0x773A,
+ 0x8074, 0x8139, 0x8178, 0x8776, 0x8ABF, 0x8ADC, 0x8D85, 0x8DF3,
+ 0x929A, 0x9577, 0x9802, 0x9CE5, 0x52C5, 0x6357, 0x76F4, 0x6715,
+ 0x6C88, 0x73CD, 0x8CC3, 0x93AE, 0x9673, 0x6D25, 0x589C, 0x690E,
+ 0x69CC, 0x8FFD, 0x939A, 0x75DB, 0x901A, 0x585A, 0x6802, 0x63B4,
+ 0x69FB, 0x4F43, 0x6F2C, 0x67D8, 0x8FBB, 0x8526, 0x7DB4, 0x9354,
+ 0x693F, 0x6F70, 0x576A, 0x58F7, 0x5B2C, 0x7D2C, 0x722A, 0x540A,
+ 0x91E3, 0x9DB4, 0x4EAD, 0x4F4E, 0x505C, 0x5075, 0x5243, 0x8C9E,
+ 0x5448, 0x5824, 0x5B9A, 0x5E1D, 0x5E95, 0x5EAD, 0x5EF7, 0x5F1F,
+ 0x608C, 0x62B5, 0x633A, 0x63D0, 0x68AF, 0x6C40, 0x7887, 0x798E,
+ 0x7A0B, 0x7DE0, 0x8247, 0x8A02, 0x8AE6, 0x8E44, 0x9013,
+};
+const unsigned short euc_to_utf8_C5[] = {
+         0x90B8, 0x912D, 0x91D8, 0x9F0E, 0x6CE5, 0x6458, 0x64E2,
+ 0x6575, 0x6EF4, 0x7684, 0x7B1B, 0x9069, 0x93D1, 0x6EBA, 0x54F2,
+ 0x5FB9, 0x64A4, 0x8F4D, 0x8FED, 0x9244, 0x5178, 0x586B, 0x5929,
+ 0x5C55, 0x5E97, 0x6DFB, 0x7E8F, 0x751C, 0x8CBC, 0x8EE2, 0x985B,
+ 0x70B9, 0x4F1D, 0x6BBF, 0x6FB1, 0x7530, 0x96FB, 0x514E, 0x5410,
+ 0x5835, 0x5857, 0x59AC, 0x5C60, 0x5F92, 0x6597, 0x675C, 0x6E21,
+ 0x767B, 0x83DF, 0x8CED, 0x9014, 0x90FD, 0x934D, 0x7825, 0x783A,
+ 0x52AA, 0x5EA6, 0x571F, 0x5974, 0x6012, 0x5012, 0x515A, 0x51AC,
+ 0x51CD, 0x5200, 0x5510, 0x5854, 0x5858, 0x5957, 0x5B95, 0x5CF6,
+ 0x5D8B, 0x60BC, 0x6295, 0x642D, 0x6771, 0x6843, 0x68BC, 0x68DF,
+ 0x76D7, 0x6DD8, 0x6E6F, 0x6D9B, 0x706F, 0x71C8, 0x5F53, 0x75D8,
+ 0x7977, 0x7B49, 0x7B54, 0x7B52, 0x7CD6, 0x7D71, 0x5230,
+};
+const unsigned short euc_to_utf8_C6[] = {
+         0x8463, 0x8569, 0x85E4, 0x8A0E, 0x8B04, 0x8C46, 0x8E0F,
+ 0x9003, 0x900F, 0x9419, 0x9676, 0x982D, 0x9A30, 0x95D8, 0x50CD,
+ 0x52D5, 0x540C, 0x5802, 0x5C0E, 0x61A7, 0x649E, 0x6D1E, 0x77B3,
+ 0x7AE5, 0x80F4, 0x8404, 0x9053, 0x9285, 0x5CE0, 0x9D07, 0x533F,
+ 0x5F97, 0x5FB3, 0x6D9C, 0x7279, 0x7763, 0x79BF, 0x7BE4, 0x6BD2,
+ 0x72EC, 0x8AAD, 0x6803, 0x6A61, 0x51F8, 0x7A81, 0x6934, 0x5C4A,
+ 0x9CF6, 0x82EB, 0x5BC5, 0x9149, 0x701E, 0x5678, 0x5C6F, 0x60C7,
+ 0x6566, 0x6C8C, 0x8C5A, 0x9041, 0x9813, 0x5451, 0x66C7, 0x920D,
+ 0x5948, 0x90A3, 0x5185, 0x4E4D, 0x51EA, 0x8599, 0x8B0E, 0x7058,
+ 0x637A, 0x934B, 0x6962, 0x99B4, 0x7E04, 0x7577, 0x5357, 0x6960,
+ 0x8EDF, 0x96E3, 0x6C5D, 0x4E8C, 0x5C3C, 0x5F10, 0x8FE9, 0x5302,
+ 0x8CD1, 0x8089, 0x8679, 0x5EFF, 0x65E5, 0x4E73, 0x5165,
+};
+const unsigned short euc_to_utf8_C7[] = {
+         0x5982, 0x5C3F, 0x97EE, 0x4EFB, 0x598A, 0x5FCD, 0x8A8D,
+ 0x6FE1, 0x79B0, 0x7962, 0x5BE7, 0x8471, 0x732B, 0x71B1, 0x5E74,
+ 0x5FF5, 0x637B, 0x649A, 0x71C3, 0x7C98, 0x4E43, 0x5EFC, 0x4E4B,
+ 0x57DC, 0x56A2, 0x60A9, 0x6FC3, 0x7D0D, 0x80FD, 0x8133, 0x81BF,
+ 0x8FB2, 0x8997, 0x86A4, 0x5DF4, 0x628A, 0x64AD, 0x8987, 0x6777,
+ 0x6CE2, 0x6D3E, 0x7436, 0x7834, 0x5A46, 0x7F75, 0x82AD, 0x99AC,
+ 0x4FF3, 0x5EC3, 0x62DD, 0x6392, 0x6557, 0x676F, 0x76C3, 0x724C,
+ 0x80CC, 0x80BA, 0x8F29, 0x914D, 0x500D, 0x57F9, 0x5A92, 0x6885,
+ 0x6973, 0x7164, 0x72FD, 0x8CB7, 0x58F2, 0x8CE0, 0x966A, 0x9019,
+ 0x877F, 0x79E4, 0x77E7, 0x8429, 0x4F2F, 0x5265, 0x535A, 0x62CD,
+ 0x67CF, 0x6CCA, 0x767D, 0x7B94, 0x7C95, 0x8236, 0x8584, 0x8FEB,
+ 0x66DD, 0x6F20, 0x7206, 0x7E1B, 0x83AB, 0x99C1, 0x9EA6,
+};
+const unsigned short euc_to_utf8_C8[] = {
+         0x51FD, 0x7BB1, 0x7872, 0x7BB8, 0x8087, 0x7B48, 0x6AE8,
+ 0x5E61, 0x808C, 0x7551, 0x7560, 0x516B, 0x9262, 0x6E8C, 0x767A,
+ 0x9197, 0x9AEA, 0x4F10, 0x7F70, 0x629C, 0x7B4F, 0x95A5, 0x9CE9,
+ 0x567A, 0x5859, 0x86E4, 0x96BC, 0x4F34, 0x5224, 0x534A, 0x53CD,
+ 0x53DB, 0x5E06, 0x642C, 0x6591, 0x677F, 0x6C3E, 0x6C4E, 0x7248,
+ 0x72AF, 0x73ED, 0x7554, 0x7E41, 0x822C, 0x85E9, 0x8CA9, 0x7BC4,
+ 0x91C6, 0x7169, 0x9812, 0x98EF, 0x633D, 0x6669, 0x756A, 0x76E4,
+ 0x78D0, 0x8543, 0x86EE, 0x532A, 0x5351, 0x5426, 0x5983, 0x5E87,
+ 0x5F7C, 0x60B2, 0x6249, 0x6279, 0x62AB, 0x6590, 0x6BD4, 0x6CCC,
+ 0x75B2, 0x76AE, 0x7891, 0x79D8, 0x7DCB, 0x7F77, 0x80A5, 0x88AB,
+ 0x8AB9, 0x8CBB, 0x907F, 0x975E, 0x98DB, 0x6A0B, 0x7C38, 0x5099,
+ 0x5C3E, 0x5FAE, 0x6787, 0x6BD8, 0x7435, 0x7709, 0x7F8E,
+};
+const unsigned short euc_to_utf8_C9[] = {
+         0x9F3B, 0x67CA, 0x7A17, 0x5339, 0x758B, 0x9AED, 0x5F66,
+ 0x819D, 0x83F1, 0x8098, 0x5F3C, 0x5FC5, 0x7562, 0x7B46, 0x903C,
+ 0x6867, 0x59EB, 0x5A9B, 0x7D10, 0x767E, 0x8B2C, 0x4FF5, 0x5F6A,
+ 0x6A19, 0x6C37, 0x6F02, 0x74E2, 0x7968, 0x8868, 0x8A55, 0x8C79,
+ 0x5EDF, 0x63CF, 0x75C5, 0x79D2, 0x82D7, 0x9328, 0x92F2, 0x849C,
+ 0x86ED, 0x9C2D, 0x54C1, 0x5F6C, 0x658C, 0x6D5C, 0x7015, 0x8CA7,
+ 0x8CD3, 0x983B, 0x654F, 0x74F6, 0x4E0D, 0x4ED8, 0x57E0, 0x592B,
+ 0x5A66, 0x5BCC, 0x51A8, 0x5E03, 0x5E9C, 0x6016, 0x6276, 0x6577,
+ 0x65A7, 0x666E, 0x6D6E, 0x7236, 0x7B26, 0x8150, 0x819A, 0x8299,
+ 0x8B5C, 0x8CA0, 0x8CE6, 0x8D74, 0x961C, 0x9644, 0x4FAE, 0x64AB,
+ 0x6B66, 0x821E, 0x8461, 0x856A, 0x90E8, 0x5C01, 0x6953, 0x98A8,
+ 0x847A, 0x8557, 0x4F0F, 0x526F, 0x5FA9, 0x5E45, 0x670D,
+};
+const unsigned short euc_to_utf8_CA[] = {
+         0x798F, 0x8179, 0x8907, 0x8986, 0x6DF5, 0x5F17, 0x6255,
+ 0x6CB8, 0x4ECF, 0x7269, 0x9B92, 0x5206, 0x543B, 0x5674, 0x58B3,
+ 0x61A4, 0x626E, 0x711A, 0x596E, 0x7C89, 0x7CDE, 0x7D1B, 0x96F0,
+ 0x6587, 0x805E, 0x4E19, 0x4F75, 0x5175, 0x5840, 0x5E63, 0x5E73,
+ 0x5F0A, 0x67C4, 0x4E26, 0x853D, 0x9589, 0x965B, 0x7C73, 0x9801,
+ 0x50FB, 0x58C1, 0x7656, 0x78A7, 0x5225, 0x77A5, 0x8511, 0x7B86,
+ 0x504F, 0x5909, 0x7247, 0x7BC7, 0x7DE8, 0x8FBA, 0x8FD4, 0x904D,
+ 0x4FBF, 0x52C9, 0x5A29, 0x5F01, 0x97AD, 0x4FDD, 0x8217, 0x92EA,
+ 0x5703, 0x6355, 0x6B69, 0x752B, 0x88DC, 0x8F14, 0x7A42, 0x52DF,
+ 0x5893, 0x6155, 0x620A, 0x66AE, 0x6BCD, 0x7C3F, 0x83E9, 0x5023,
+ 0x4FF8, 0x5305, 0x5446, 0x5831, 0x5949, 0x5B9D, 0x5CF0, 0x5CEF,
+ 0x5D29, 0x5E96, 0x62B1, 0x6367, 0x653E, 0x65B9, 0x670B,
+};
+const unsigned short euc_to_utf8_CB[] = {
+         0x6CD5, 0x6CE1, 0x70F9, 0x7832, 0x7E2B, 0x80DE, 0x82B3,
+ 0x840C, 0x84EC, 0x8702, 0x8912, 0x8A2A, 0x8C4A, 0x90A6, 0x92D2,
+ 0x98FD, 0x9CF3, 0x9D6C, 0x4E4F, 0x4EA1, 0x508D, 0x5256, 0x574A,
+ 0x59A8, 0x5E3D, 0x5FD8, 0x5FD9, 0x623F, 0x66B4, 0x671B, 0x67D0,
+ 0x68D2, 0x5192, 0x7D21, 0x80AA, 0x81A8, 0x8B00, 0x8C8C, 0x8CBF,
+ 0x927E, 0x9632, 0x5420, 0x982C, 0x5317, 0x50D5, 0x535C, 0x58A8,
+ 0x64B2, 0x6734, 0x7267, 0x7766, 0x7A46, 0x91E6, 0x52C3, 0x6CA1,
+ 0x6B86, 0x5800, 0x5E4C, 0x5954, 0x672C, 0x7FFB, 0x51E1, 0x76C6,
+ 0x6469, 0x78E8, 0x9B54, 0x9EBB, 0x57CB, 0x59B9, 0x6627, 0x679A,
+ 0x6BCE, 0x54E9, 0x69D9, 0x5E55, 0x819C, 0x6795, 0x9BAA, 0x67FE,
+ 0x9C52, 0x685D, 0x4EA6, 0x4FE3, 0x53C8, 0x62B9, 0x672B, 0x6CAB,
+ 0x8FC4, 0x4FAD, 0x7E6D, 0x9EBF, 0x4E07, 0x6162, 0x6E80,
+};
+const unsigned short euc_to_utf8_CC[] = {
+         0x6F2B, 0x8513, 0x5473, 0x672A, 0x9B45, 0x5DF3, 0x7B95,
+ 0x5CAC, 0x5BC6, 0x871C, 0x6E4A, 0x84D1, 0x7A14, 0x8108, 0x5999,
+ 0x7C8D, 0x6C11, 0x7720, 0x52D9, 0x5922, 0x7121, 0x725F, 0x77DB,
+ 0x9727, 0x9D61, 0x690B, 0x5A7F, 0x5A18, 0x51A5, 0x540D, 0x547D,
+ 0x660E, 0x76DF, 0x8FF7, 0x9298, 0x9CF4, 0x59EA, 0x725D, 0x6EC5,
+ 0x514D, 0x68C9, 0x7DBF, 0x7DEC, 0x9762, 0x9EBA, 0x6478, 0x6A21,
+ 0x8302, 0x5984, 0x5B5F, 0x6BDB, 0x731B, 0x76F2, 0x7DB2, 0x8017,
+ 0x8499, 0x5132, 0x6728, 0x9ED9, 0x76EE, 0x6762, 0x52FF, 0x9905,
+ 0x5C24, 0x623B, 0x7C7E, 0x8CB0, 0x554F, 0x60B6, 0x7D0B, 0x9580,
+ 0x5301, 0x4E5F, 0x51B6, 0x591C, 0x723A, 0x8036, 0x91CE, 0x5F25,
+ 0x77E2, 0x5384, 0x5F79, 0x7D04, 0x85AC, 0x8A33, 0x8E8D, 0x9756,
+ 0x67F3, 0x85AE, 0x9453, 0x6109, 0x6108, 0x6CB9, 0x7652,
+};
+const unsigned short euc_to_utf8_CD[] = {
+         0x8AED, 0x8F38, 0x552F, 0x4F51, 0x512A, 0x52C7, 0x53CB,
+ 0x5BA5, 0x5E7D, 0x60A0, 0x6182, 0x63D6, 0x6709, 0x67DA, 0x6E67,
+ 0x6D8C, 0x7336, 0x7337, 0x7531, 0x7950, 0x88D5, 0x8A98, 0x904A,
+ 0x9091, 0x90F5, 0x96C4, 0x878D, 0x5915, 0x4E88, 0x4F59, 0x4E0E,
+ 0x8A89, 0x8F3F, 0x9810, 0x50AD, 0x5E7C, 0x5996, 0x5BB9, 0x5EB8,
+ 0x63DA, 0x63FA, 0x64C1, 0x66DC, 0x694A, 0x69D8, 0x6D0B, 0x6EB6,
+ 0x7194, 0x7528, 0x7AAF, 0x7F8A, 0x8000, 0x8449, 0x84C9, 0x8981,
+ 0x8B21, 0x8E0A, 0x9065, 0x967D, 0x990A, 0x617E, 0x6291, 0x6B32,
+ 0x6C83, 0x6D74, 0x7FCC, 0x7FFC, 0x6DC0, 0x7F85, 0x87BA, 0x88F8,
+ 0x6765, 0x83B1, 0x983C, 0x96F7, 0x6D1B, 0x7D61, 0x843D, 0x916A,
+ 0x4E71, 0x5375, 0x5D50, 0x6B04, 0x6FEB, 0x85CD, 0x862D, 0x89A7,
+ 0x5229, 0x540F, 0x5C65, 0x674E, 0x68A8, 0x7406, 0x7483,
+};
+const unsigned short euc_to_utf8_CE[] = {
+         0x75E2, 0x88CF, 0x88E1, 0x91CC, 0x96E2, 0x9678, 0x5F8B,
+ 0x7387, 0x7ACB, 0x844E, 0x63A0, 0x7565, 0x5289, 0x6D41, 0x6E9C,
+ 0x7409, 0x7559, 0x786B, 0x7C92, 0x9686, 0x7ADC, 0x9F8D, 0x4FB6,
+ 0x616E, 0x65C5, 0x865C, 0x4E86, 0x4EAE, 0x50DA, 0x4E21, 0x51CC,
+ 0x5BEE, 0x6599, 0x6881, 0x6DBC, 0x731F, 0x7642, 0x77AD, 0x7A1C,
+ 0x7CE7, 0x826F, 0x8AD2, 0x907C, 0x91CF, 0x9675, 0x9818, 0x529B,
+ 0x7DD1, 0x502B, 0x5398, 0x6797, 0x6DCB, 0x71D0, 0x7433, 0x81E8,
+ 0x8F2A, 0x96A3, 0x9C57, 0x9E9F, 0x7460, 0x5841, 0x6D99, 0x7D2F,
+ 0x985E, 0x4EE4, 0x4F36, 0x4F8B, 0x51B7, 0x52B1, 0x5DBA, 0x601C,
+ 0x73B2, 0x793C, 0x82D3, 0x9234, 0x96B7, 0x96F6, 0x970A, 0x9E97,
+ 0x9F62, 0x66A6, 0x6B74, 0x5217, 0x52A3, 0x70C8, 0x88C2, 0x5EC9,
+ 0x604B, 0x6190, 0x6F23, 0x7149, 0x7C3E, 0x7DF4, 0x806F,
+};
+const unsigned short euc_to_utf8_CF[] = {
+         0x84EE, 0x9023, 0x932C, 0x5442, 0x9B6F, 0x6AD3, 0x7089,
+ 0x8CC2, 0x8DEF, 0x9732, 0x52B4, 0x5A41, 0x5ECA, 0x5F04, 0x6717,
+ 0x697C, 0x6994, 0x6D6A, 0x6F0F, 0x7262, 0x72FC, 0x7BED, 0x8001,
+ 0x807E, 0x874B, 0x90CE, 0x516D, 0x9E93, 0x7984, 0x808B, 0x9332,
+ 0x8AD6, 0x502D, 0x548C, 0x8A71, 0x6B6A, 0x8CC4, 0x8107, 0x60D1,
+ 0x67A0, 0x9DF2, 0x4E99, 0x4E98, 0x9C10, 0x8A6B, 0x85C1, 0x8568,
+ 0x6900, 0x6E7E, 0x7897, 0x8155,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_D0[] = {
+         0x5F0C, 0x4E10, 0x4E15, 0x4E2A, 0x4E31, 0x4E36, 0x4E3C,
+ 0x4E3F, 0x4E42, 0x4E56, 0x4E58, 0x4E82, 0x4E85, 0x8C6B, 0x4E8A,
+ 0x8212, 0x5F0D, 0x4E8E, 0x4E9E, 0x4E9F, 0x4EA0, 0x4EA2, 0x4EB0,
+ 0x4EB3, 0x4EB6, 0x4ECE, 0x4ECD, 0x4EC4, 0x4EC6, 0x4EC2, 0x4ED7,
+ 0x4EDE, 0x4EED, 0x4EDF, 0x4EF7, 0x4F09, 0x4F5A, 0x4F30, 0x4F5B,
+ 0x4F5D, 0x4F57, 0x4F47, 0x4F76, 0x4F88, 0x4F8F, 0x4F98, 0x4F7B,
+ 0x4F69, 0x4F70, 0x4F91, 0x4F6F, 0x4F86, 0x4F96, 0x5118, 0x4FD4,
+ 0x4FDF, 0x4FCE, 0x4FD8, 0x4FDB, 0x4FD1, 0x4FDA, 0x4FD0, 0x4FE4,
+ 0x4FE5, 0x501A, 0x5028, 0x5014, 0x502A, 0x5025, 0x5005, 0x4F1C,
+ 0x4FF6, 0x5021, 0x5029, 0x502C, 0x4FFE, 0x4FEF, 0x5011, 0x5006,
+ 0x5043, 0x5047, 0x6703, 0x5055, 0x5050, 0x5048, 0x505A, 0x5056,
+ 0x506C, 0x5078, 0x5080, 0x509A, 0x5085, 0x50B4, 0x50B2,
+};
+const unsigned short euc_to_utf8_D1[] = {
+         0x50C9, 0x50CA, 0x50B3, 0x50C2, 0x50D6, 0x50DE, 0x50E5,
+ 0x50ED, 0x50E3, 0x50EE, 0x50F9, 0x50F5, 0x5109, 0x5101, 0x5102,
+ 0x5116, 0x5115, 0x5114, 0x511A, 0x5121, 0x513A, 0x5137, 0x513C,
+ 0x513B, 0x513F, 0x5140, 0x5152, 0x514C, 0x5154, 0x5162, 0x7AF8,
+ 0x5169, 0x516A, 0x516E, 0x5180, 0x5182, 0x56D8, 0x518C, 0x5189,
+ 0x518F, 0x5191, 0x5193, 0x5195, 0x5196, 0x51A4, 0x51A6, 0x51A2,
+ 0x51A9, 0x51AA, 0x51AB, 0x51B3, 0x51B1, 0x51B2, 0x51B0, 0x51B5,
+ 0x51BD, 0x51C5, 0x51C9, 0x51DB, 0x51E0, 0x8655, 0x51E9, 0x51ED,
+ 0x51F0, 0x51F5, 0x51FE, 0x5204, 0x520B, 0x5214, 0x520E, 0x5227,
+ 0x522A, 0x522E, 0x5233, 0x5239, 0x524F, 0x5244, 0x524B, 0x524C,
+ 0x525E, 0x5254, 0x526A, 0x5274, 0x5269, 0x5273, 0x527F, 0x527D,
+ 0x528D, 0x5294, 0x5292, 0x5271, 0x5288, 0x5291, 0x8FA8,
+};
+const unsigned short euc_to_utf8_D2[] = {
+         0x8FA7, 0x52AC, 0x52AD, 0x52BC, 0x52B5, 0x52C1, 0x52CD,
+ 0x52D7, 0x52DE, 0x52E3, 0x52E6, 0x98ED, 0x52E0, 0x52F3, 0x52F5,
+ 0x52F8, 0x52F9, 0x5306, 0x5308, 0x7538, 0x530D, 0x5310, 0x530F,
+ 0x5315, 0x531A, 0x5323, 0x532F, 0x5331, 0x5333, 0x5338, 0x5340,
+ 0x5346, 0x5345, 0x4E17, 0x5349, 0x534D, 0x51D6, 0x535E, 0x5369,
+ 0x536E, 0x5918, 0x537B, 0x5377, 0x5382, 0x5396, 0x53A0, 0x53A6,
+ 0x53A5, 0x53AE, 0x53B0, 0x53B6, 0x53C3, 0x7C12, 0x96D9, 0x53DF,
+ 0x66FC, 0x71EE, 0x53EE, 0x53E8, 0x53ED, 0x53FA, 0x5401, 0x543D,
+ 0x5440, 0x542C, 0x542D, 0x543C, 0x542E, 0x5436, 0x5429, 0x541D,
+ 0x544E, 0x548F, 0x5475, 0x548E, 0x545F, 0x5471, 0x5477, 0x5470,
+ 0x5492, 0x547B, 0x5480, 0x5476, 0x5484, 0x5490, 0x5486, 0x54C7,
+ 0x54A2, 0x54B8, 0x54A5, 0x54AC, 0x54C4, 0x54C8, 0x54A8,
+};
+const unsigned short euc_to_utf8_D3[] = {
+         0x54AB, 0x54C2, 0x54A4, 0x54BE, 0x54BC, 0x54D8, 0x54E5,
+ 0x54E6, 0x550F, 0x5514, 0x54FD, 0x54EE, 0x54ED, 0x54FA, 0x54E2,
+ 0x5539, 0x5540, 0x5563, 0x554C, 0x552E, 0x555C, 0x5545, 0x5556,
+ 0x5557, 0x5538, 0x5533, 0x555D, 0x5599, 0x5580, 0x54AF, 0x558A,
+ 0x559F, 0x557B, 0x557E, 0x5598, 0x559E, 0x55AE, 0x557C, 0x5583,
+ 0x55A9, 0x5587, 0x55A8, 0x55DA, 0x55C5, 0x55DF, 0x55C4, 0x55DC,
+ 0x55E4, 0x55D4, 0x5614, 0x55F7, 0x5616, 0x55FE, 0x55FD, 0x561B,
+ 0x55F9, 0x564E, 0x5650, 0x71DF, 0x5634, 0x5636, 0x5632, 0x5638,
+ 0x566B, 0x5664, 0x562F, 0x566C, 0x566A, 0x5686, 0x5680, 0x568A,
+ 0x56A0, 0x5694, 0x568F, 0x56A5, 0x56AE, 0x56B6, 0x56B4, 0x56C2,
+ 0x56BC, 0x56C1, 0x56C3, 0x56C0, 0x56C8, 0x56CE, 0x56D1, 0x56D3,
+ 0x56D7, 0x56EE, 0x56F9, 0x5700, 0x56FF, 0x5704, 0x5709,
+};
+const unsigned short euc_to_utf8_D4[] = {
+         0x5708, 0x570B, 0x570D, 0x5713, 0x5718, 0x5716, 0x55C7,
+ 0x571C, 0x5726, 0x5737, 0x5738, 0x574E, 0x573B, 0x5740, 0x574F,
+ 0x5769, 0x57C0, 0x5788, 0x5761, 0x577F, 0x5789, 0x5793, 0x57A0,
+ 0x57B3, 0x57A4, 0x57AA, 0x57B0, 0x57C3, 0x57C6, 0x57D4, 0x57D2,
+ 0x57D3, 0x580A, 0x57D6, 0x57E3, 0x580B, 0x5819, 0x581D, 0x5872,
+ 0x5821, 0x5862, 0x584B, 0x5870, 0x6BC0, 0x5852, 0x583D, 0x5879,
+ 0x5885, 0x58B9, 0x589F, 0x58AB, 0x58BA, 0x58DE, 0x58BB, 0x58B8,
+ 0x58AE, 0x58C5, 0x58D3, 0x58D1, 0x58D7, 0x58D9, 0x58D8, 0x58E5,
+ 0x58DC, 0x58E4, 0x58DF, 0x58EF, 0x58FA, 0x58F9, 0x58FB, 0x58FC,
+ 0x58FD, 0x5902, 0x590A, 0x5910, 0x591B, 0x68A6, 0x5925, 0x592C,
+ 0x592D, 0x5932, 0x5938, 0x593E, 0x7AD2, 0x5955, 0x5950, 0x594E,
+ 0x595A, 0x5958, 0x5962, 0x5960, 0x5967, 0x596C, 0x5969,
+};
+const unsigned short euc_to_utf8_D5[] = {
+         0x5978, 0x5981, 0x599D, 0x4F5E, 0x4FAB, 0x59A3, 0x59B2,
+ 0x59C6, 0x59E8, 0x59DC, 0x598D, 0x59D9, 0x59DA, 0x5A25, 0x5A1F,
+ 0x5A11, 0x5A1C, 0x5A09, 0x5A1A, 0x5A40, 0x5A6C, 0x5A49, 0x5A35,
+ 0x5A36, 0x5A62, 0x5A6A, 0x5A9A, 0x5ABC, 0x5ABE, 0x5ACB, 0x5AC2,
+ 0x5ABD, 0x5AE3, 0x5AD7, 0x5AE6, 0x5AE9, 0x5AD6, 0x5AFA, 0x5AFB,
+ 0x5B0C, 0x5B0B, 0x5B16, 0x5B32, 0x5AD0, 0x5B2A, 0x5B36, 0x5B3E,
+ 0x5B43, 0x5B45, 0x5B40, 0x5B51, 0x5B55, 0x5B5A, 0x5B5B, 0x5B65,
+ 0x5B69, 0x5B70, 0x5B73, 0x5B75, 0x5B78, 0x6588, 0x5B7A, 0x5B80,
+ 0x5B83, 0x5BA6, 0x5BB8, 0x5BC3, 0x5BC7, 0x5BC9, 0x5BD4, 0x5BD0,
+ 0x5BE4, 0x5BE6, 0x5BE2, 0x5BDE, 0x5BE5, 0x5BEB, 0x5BF0, 0x5BF6,
+ 0x5BF3, 0x5C05, 0x5C07, 0x5C08, 0x5C0D, 0x5C13, 0x5C20, 0x5C22,
+ 0x5C28, 0x5C38, 0x5C39, 0x5C41, 0x5C46, 0x5C4E, 0x5C53,
+};
+const unsigned short euc_to_utf8_D6[] = {
+         0x5C50, 0x5C4F, 0x5B71, 0x5C6C, 0x5C6E, 0x4E62, 0x5C76,
+ 0x5C79, 0x5C8C, 0x5C91, 0x5C94, 0x599B, 0x5CAB, 0x5CBB, 0x5CB6,
+ 0x5CBC, 0x5CB7, 0x5CC5, 0x5CBE, 0x5CC7, 0x5CD9, 0x5CE9, 0x5CFD,
+ 0x5CFA, 0x5CED, 0x5D8C, 0x5CEA, 0x5D0B, 0x5D15, 0x5D17, 0x5D5C,
+ 0x5D1F, 0x5D1B, 0x5D11, 0x5D14, 0x5D22, 0x5D1A, 0x5D19, 0x5D18,
+ 0x5D4C, 0x5D52, 0x5D4E, 0x5D4B, 0x5D6C, 0x5D73, 0x5D76, 0x5D87,
+ 0x5D84, 0x5D82, 0x5DA2, 0x5D9D, 0x5DAC, 0x5DAE, 0x5DBD, 0x5D90,
+ 0x5DB7, 0x5DBC, 0x5DC9, 0x5DCD, 0x5DD3, 0x5DD2, 0x5DD6, 0x5DDB,
+ 0x5DEB, 0x5DF2, 0x5DF5, 0x5E0B, 0x5E1A, 0x5E19, 0x5E11, 0x5E1B,
+ 0x5E36, 0x5E37, 0x5E44, 0x5E43, 0x5E40, 0x5E4E, 0x5E57, 0x5E54,
+ 0x5E5F, 0x5E62, 0x5E64, 0x5E47, 0x5E75, 0x5E76, 0x5E7A, 0x9EBC,
+ 0x5E7F, 0x5EA0, 0x5EC1, 0x5EC2, 0x5EC8, 0x5ED0, 0x5ECF,
+};
+const unsigned short euc_to_utf8_D7[] = {
+         0x5ED6, 0x5EE3, 0x5EDD, 0x5EDA, 0x5EDB, 0x5EE2, 0x5EE1,
+ 0x5EE8, 0x5EE9, 0x5EEC, 0x5EF1, 0x5EF3, 0x5EF0, 0x5EF4, 0x5EF8,
+ 0x5EFE, 0x5F03, 0x5F09, 0x5F5D, 0x5F5C, 0x5F0B, 0x5F11, 0x5F16,
+ 0x5F29, 0x5F2D, 0x5F38, 0x5F41, 0x5F48, 0x5F4C, 0x5F4E, 0x5F2F,
+ 0x5F51, 0x5F56, 0x5F57, 0x5F59, 0x5F61, 0x5F6D, 0x5F73, 0x5F77,
+ 0x5F83, 0x5F82, 0x5F7F, 0x5F8A, 0x5F88, 0x5F91, 0x5F87, 0x5F9E,
+ 0x5F99, 0x5F98, 0x5FA0, 0x5FA8, 0x5FAD, 0x5FBC, 0x5FD6, 0x5FFB,
+ 0x5FE4, 0x5FF8, 0x5FF1, 0x5FDD, 0x60B3, 0x5FFF, 0x6021, 0x6060,
+ 0x6019, 0x6010, 0x6029, 0x600E, 0x6031, 0x601B, 0x6015, 0x602B,
+ 0x6026, 0x600F, 0x603A, 0x605A, 0x6041, 0x606A, 0x6077, 0x605F,
+ 0x604A, 0x6046, 0x604D, 0x6063, 0x6043, 0x6064, 0x6042, 0x606C,
+ 0x606B, 0x6059, 0x6081, 0x608D, 0x60E7, 0x6083, 0x609A,
+};
+const unsigned short euc_to_utf8_D8[] = {
+         0x6084, 0x609B, 0x6096, 0x6097, 0x6092, 0x60A7, 0x608B,
+ 0x60E1, 0x60B8, 0x60E0, 0x60D3, 0x60B4, 0x5FF0, 0x60BD, 0x60C6,
+ 0x60B5, 0x60D8, 0x614D, 0x6115, 0x6106, 0x60F6, 0x60F7, 0x6100,
+ 0x60F4, 0x60FA, 0x6103, 0x6121, 0x60FB, 0x60F1, 0x610D, 0x610E,
+ 0x6147, 0x613E, 0x6128, 0x6127, 0x614A, 0x613F, 0x613C, 0x612C,
+ 0x6134, 0x613D, 0x6142, 0x6144, 0x6173, 0x6177, 0x6158, 0x6159,
+ 0x615A, 0x616B, 0x6174, 0x616F, 0x6165, 0x6171, 0x615F, 0x615D,
+ 0x6153, 0x6175, 0x6199, 0x6196, 0x6187, 0x61AC, 0x6194, 0x619A,
+ 0x618A, 0x6191, 0x61AB, 0x61AE, 0x61CC, 0x61CA, 0x61C9, 0x61F7,
+ 0x61C8, 0x61C3, 0x61C6, 0x61BA, 0x61CB, 0x7F79, 0x61CD, 0x61E6,
+ 0x61E3, 0x61F6, 0x61FA, 0x61F4, 0x61FF, 0x61FD, 0x61FC, 0x61FE,
+ 0x6200, 0x6208, 0x6209, 0x620D, 0x620C, 0x6214, 0x621B,
+};
+const unsigned short euc_to_utf8_D9[] = {
+         0x621E, 0x6221, 0x622A, 0x622E, 0x6230, 0x6232, 0x6233,
+ 0x6241, 0x624E, 0x625E, 0x6263, 0x625B, 0x6260, 0x6268, 0x627C,
+ 0x6282, 0x6289, 0x627E, 0x6292, 0x6293, 0x6296, 0x62D4, 0x6283,
+ 0x6294, 0x62D7, 0x62D1, 0x62BB, 0x62CF, 0x62FF, 0x62C6, 0x64D4,
+ 0x62C8, 0x62DC, 0x62CC, 0x62CA, 0x62C2, 0x62C7, 0x629B, 0x62C9,
+ 0x630C, 0x62EE, 0x62F1, 0x6327, 0x6302, 0x6308, 0x62EF, 0x62F5,
+ 0x6350, 0x633E, 0x634D, 0x641C, 0x634F, 0x6396, 0x638E, 0x6380,
+ 0x63AB, 0x6376, 0x63A3, 0x638F, 0x6389, 0x639F, 0x63B5, 0x636B,
+ 0x6369, 0x63BE, 0x63E9, 0x63C0, 0x63C6, 0x63E3, 0x63C9, 0x63D2,
+ 0x63F6, 0x63C4, 0x6416, 0x6434, 0x6406, 0x6413, 0x6426, 0x6436,
+ 0x651D, 0x6417, 0x6428, 0x640F, 0x6467, 0x646F, 0x6476, 0x644E,
+ 0x652A, 0x6495, 0x6493, 0x64A5, 0x64A9, 0x6488, 0x64BC,
+};
+const unsigned short euc_to_utf8_DA[] = {
+         0x64DA, 0x64D2, 0x64C5, 0x64C7, 0x64BB, 0x64D8, 0x64C2,
+ 0x64F1, 0x64E7, 0x8209, 0x64E0, 0x64E1, 0x62AC, 0x64E3, 0x64EF,
+ 0x652C, 0x64F6, 0x64F4, 0x64F2, 0x64FA, 0x6500, 0x64FD, 0x6518,
+ 0x651C, 0x6505, 0x6524, 0x6523, 0x652B, 0x6534, 0x6535, 0x6537,
+ 0x6536, 0x6538, 0x754B, 0x6548, 0x6556, 0x6555, 0x654D, 0x6558,
+ 0x655E, 0x655D, 0x6572, 0x6578, 0x6582, 0x6583, 0x8B8A, 0x659B,
+ 0x659F, 0x65AB, 0x65B7, 0x65C3, 0x65C6, 0x65C1, 0x65C4, 0x65CC,
+ 0x65D2, 0x65DB, 0x65D9, 0x65E0, 0x65E1, 0x65F1, 0x6772, 0x660A,
+ 0x6603, 0x65FB, 0x6773, 0x6635, 0x6636, 0x6634, 0x661C, 0x664F,
+ 0x6644, 0x6649, 0x6641, 0x665E, 0x665D, 0x6664, 0x6667, 0x6668,
+ 0x665F, 0x6662, 0x6670, 0x6683, 0x6688, 0x668E, 0x6689, 0x6684,
+ 0x6698, 0x669D, 0x66C1, 0x66B9, 0x66C9, 0x66BE, 0x66BC,
+};
+const unsigned short euc_to_utf8_DB[] = {
+         0x66C4, 0x66B8, 0x66D6, 0x66DA, 0x66E0, 0x663F, 0x66E6,
+ 0x66E9, 0x66F0, 0x66F5, 0x66F7, 0x670F, 0x6716, 0x671E, 0x6726,
+ 0x6727, 0x9738, 0x672E, 0x673F, 0x6736, 0x6741, 0x6738, 0x6737,
+ 0x6746, 0x675E, 0x6760, 0x6759, 0x6763, 0x6764, 0x6789, 0x6770,
+ 0x67A9, 0x677C, 0x676A, 0x678C, 0x678B, 0x67A6, 0x67A1, 0x6785,
+ 0x67B7, 0x67EF, 0x67B4, 0x67EC, 0x67B3, 0x67E9, 0x67B8, 0x67E4,
+ 0x67DE, 0x67DD, 0x67E2, 0x67EE, 0x67B9, 0x67CE, 0x67C6, 0x67E7,
+ 0x6A9C, 0x681E, 0x6846, 0x6829, 0x6840, 0x684D, 0x6832, 0x684E,
+ 0x68B3, 0x682B, 0x6859, 0x6863, 0x6877, 0x687F, 0x689F, 0x688F,
+ 0x68AD, 0x6894, 0x689D, 0x689B, 0x6883, 0x6AAE, 0x68B9, 0x6874,
+ 0x68B5, 0x68A0, 0x68BA, 0x690F, 0x688D, 0x687E, 0x6901, 0x68CA,
+ 0x6908, 0x68D8, 0x6922, 0x6926, 0x68E1, 0x690C, 0x68CD,
+};
+const unsigned short euc_to_utf8_DC[] = {
+         0x68D4, 0x68E7, 0x68D5, 0x6936, 0x6912, 0x6904, 0x68D7,
+ 0x68E3, 0x6925, 0x68F9, 0x68E0, 0x68EF, 0x6928, 0x692A, 0x691A,
+ 0x6923, 0x6921, 0x68C6, 0x6979, 0x6977, 0x695C, 0x6978, 0x696B,
+ 0x6954, 0x697E, 0x696E, 0x6939, 0x6974, 0x693D, 0x6959, 0x6930,
+ 0x6961, 0x695E, 0x695D, 0x6981, 0x696A, 0x69B2, 0x69AE, 0x69D0,
+ 0x69BF, 0x69C1, 0x69D3, 0x69BE, 0x69CE, 0x5BE8, 0x69CA, 0x69DD,
+ 0x69BB, 0x69C3, 0x69A7, 0x6A2E, 0x6991, 0x69A0, 0x699C, 0x6995,
+ 0x69B4, 0x69DE, 0x69E8, 0x6A02, 0x6A1B, 0x69FF, 0x6B0A, 0x69F9,
+ 0x69F2, 0x69E7, 0x6A05, 0x69B1, 0x6A1E, 0x69ED, 0x6A14, 0x69EB,
+ 0x6A0A, 0x6A12, 0x6AC1, 0x6A23, 0x6A13, 0x6A44, 0x6A0C, 0x6A72,
+ 0x6A36, 0x6A78, 0x6A47, 0x6A62, 0x6A59, 0x6A66, 0x6A48, 0x6A38,
+ 0x6A22, 0x6A90, 0x6A8D, 0x6AA0, 0x6A84, 0x6AA2, 0x6AA3,
+};
+const unsigned short euc_to_utf8_DD[] = {
+         0x6A97, 0x8617, 0x6ABB, 0x6AC3, 0x6AC2, 0x6AB8, 0x6AB3,
+ 0x6AAC, 0x6ADE, 0x6AD1, 0x6ADF, 0x6AAA, 0x6ADA, 0x6AEA, 0x6AFB,
+ 0x6B05, 0x8616, 0x6AFA, 0x6B12, 0x6B16, 0x9B31, 0x6B1F, 0x6B38,
+ 0x6B37, 0x76DC, 0x6B39, 0x98EE, 0x6B47, 0x6B43, 0x6B49, 0x6B50,
+ 0x6B59, 0x6B54, 0x6B5B, 0x6B5F, 0x6B61, 0x6B78, 0x6B79, 0x6B7F,
+ 0x6B80, 0x6B84, 0x6B83, 0x6B8D, 0x6B98, 0x6B95, 0x6B9E, 0x6BA4,
+ 0x6BAA, 0x6BAB, 0x6BAF, 0x6BB2, 0x6BB1, 0x6BB3, 0x6BB7, 0x6BBC,
+ 0x6BC6, 0x6BCB, 0x6BD3, 0x6BDF, 0x6BEC, 0x6BEB, 0x6BF3, 0x6BEF,
+ 0x9EBE, 0x6C08, 0x6C13, 0x6C14, 0x6C1B, 0x6C24, 0x6C23, 0x6C5E,
+ 0x6C55, 0x6C62, 0x6C6A, 0x6C82, 0x6C8D, 0x6C9A, 0x6C81, 0x6C9B,
+ 0x6C7E, 0x6C68, 0x6C73, 0x6C92, 0x6C90, 0x6CC4, 0x6CF1, 0x6CD3,
+ 0x6CBD, 0x6CD7, 0x6CC5, 0x6CDD, 0x6CAE, 0x6CB1, 0x6CBE,
+};
+const unsigned short euc_to_utf8_DE[] = {
+         0x6CBA, 0x6CDB, 0x6CEF, 0x6CD9, 0x6CEA, 0x6D1F, 0x884D,
+ 0x6D36, 0x6D2B, 0x6D3D, 0x6D38, 0x6D19, 0x6D35, 0x6D33, 0x6D12,
+ 0x6D0C, 0x6D63, 0x6D93, 0x6D64, 0x6D5A, 0x6D79, 0x6D59, 0x6D8E,
+ 0x6D95, 0x6FE4, 0x6D85, 0x6DF9, 0x6E15, 0x6E0A, 0x6DB5, 0x6DC7,
+ 0x6DE6, 0x6DB8, 0x6DC6, 0x6DEC, 0x6DDE, 0x6DCC, 0x6DE8, 0x6DD2,
+ 0x6DC5, 0x6DFA, 0x6DD9, 0x6DE4, 0x6DD5, 0x6DEA, 0x6DEE, 0x6E2D,
+ 0x6E6E, 0x6E2E, 0x6E19, 0x6E72, 0x6E5F, 0x6E3E, 0x6E23, 0x6E6B,
+ 0x6E2B, 0x6E76, 0x6E4D, 0x6E1F, 0x6E43, 0x6E3A, 0x6E4E, 0x6E24,
+ 0x6EFF, 0x6E1D, 0x6E38, 0x6E82, 0x6EAA, 0x6E98, 0x6EC9, 0x6EB7,
+ 0x6ED3, 0x6EBD, 0x6EAF, 0x6EC4, 0x6EB2, 0x6ED4, 0x6ED5, 0x6E8F,
+ 0x6EA5, 0x6EC2, 0x6E9F, 0x6F41, 0x6F11, 0x704C, 0x6EEC, 0x6EF8,
+ 0x6EFE, 0x6F3F, 0x6EF2, 0x6F31, 0x6EEF, 0x6F32, 0x6ECC,
+};
+const unsigned short euc_to_utf8_DF[] = {
+         0x6F3E, 0x6F13, 0x6EF7, 0x6F86, 0x6F7A, 0x6F78, 0x6F81,
+ 0x6F80, 0x6F6F, 0x6F5B, 0x6FF3, 0x6F6D, 0x6F82, 0x6F7C, 0x6F58,
+ 0x6F8E, 0x6F91, 0x6FC2, 0x6F66, 0x6FB3, 0x6FA3, 0x6FA1, 0x6FA4,
+ 0x6FB9, 0x6FC6, 0x6FAA, 0x6FDF, 0x6FD5, 0x6FEC, 0x6FD4, 0x6FD8,
+ 0x6FF1, 0x6FEE, 0x6FDB, 0x7009, 0x700B, 0x6FFA, 0x7011, 0x7001,
+ 0x700F, 0x6FFE, 0x701B, 0x701A, 0x6F74, 0x701D, 0x7018, 0x701F,
+ 0x7030, 0x703E, 0x7032, 0x7051, 0x7063, 0x7099, 0x7092, 0x70AF,
+ 0x70F1, 0x70AC, 0x70B8, 0x70B3, 0x70AE, 0x70DF, 0x70CB, 0x70DD,
+ 0x70D9, 0x7109, 0x70FD, 0x711C, 0x7119, 0x7165, 0x7155, 0x7188,
+ 0x7166, 0x7162, 0x714C, 0x7156, 0x716C, 0x718F, 0x71FB, 0x7184,
+ 0x7195, 0x71A8, 0x71AC, 0x71D7, 0x71B9, 0x71BE, 0x71D2, 0x71C9,
+ 0x71D4, 0x71CE, 0x71E0, 0x71EC, 0x71E7, 0x71F5, 0x71FC,
+};
+const unsigned short euc_to_utf8_E0[] = {
+         0x71F9, 0x71FF, 0x720D, 0x7210, 0x721B, 0x7228, 0x722D,
+ 0x722C, 0x7230, 0x7232, 0x723B, 0x723C, 0x723F, 0x7240, 0x7246,
+ 0x724B, 0x7258, 0x7274, 0x727E, 0x7282, 0x7281, 0x7287, 0x7292,
+ 0x7296, 0x72A2, 0x72A7, 0x72B9, 0x72B2, 0x72C3, 0x72C6, 0x72C4,
+ 0x72CE, 0x72D2, 0x72E2, 0x72E0, 0x72E1, 0x72F9, 0x72F7, 0x500F,
+ 0x7317, 0x730A, 0x731C, 0x7316, 0x731D, 0x7334, 0x732F, 0x7329,
+ 0x7325, 0x733E, 0x734E, 0x734F, 0x9ED8, 0x7357, 0x736A, 0x7368,
+ 0x7370, 0x7378, 0x7375, 0x737B, 0x737A, 0x73C8, 0x73B3, 0x73CE,
+ 0x73BB, 0x73C0, 0x73E5, 0x73EE, 0x73DE, 0x74A2, 0x7405, 0x746F,
+ 0x7425, 0x73F8, 0x7432, 0x743A, 0x7455, 0x743F, 0x745F, 0x7459,
+ 0x7441, 0x745C, 0x7469, 0x7470, 0x7463, 0x746A, 0x7476, 0x747E,
+ 0x748B, 0x749E, 0x74A7, 0x74CA, 0x74CF, 0x74D4, 0x73F1,
+};
+const unsigned short euc_to_utf8_E1[] = {
+         0x74E0, 0x74E3, 0x74E7, 0x74E9, 0x74EE, 0x74F2, 0x74F0,
+ 0x74F1, 0x74F8, 0x74F7, 0x7504, 0x7503, 0x7505, 0x750C, 0x750E,
+ 0x750D, 0x7515, 0x7513, 0x751E, 0x7526, 0x752C, 0x753C, 0x7544,
+ 0x754D, 0x754A, 0x7549, 0x755B, 0x7546, 0x755A, 0x7569, 0x7564,
+ 0x7567, 0x756B, 0x756D, 0x7578, 0x7576, 0x7586, 0x7587, 0x7574,
+ 0x758A, 0x7589, 0x7582, 0x7594, 0x759A, 0x759D, 0x75A5, 0x75A3,
+ 0x75C2, 0x75B3, 0x75C3, 0x75B5, 0x75BD, 0x75B8, 0x75BC, 0x75B1,
+ 0x75CD, 0x75CA, 0x75D2, 0x75D9, 0x75E3, 0x75DE, 0x75FE, 0x75FF,
+ 0x75FC, 0x7601, 0x75F0, 0x75FA, 0x75F2, 0x75F3, 0x760B, 0x760D,
+ 0x7609, 0x761F, 0x7627, 0x7620, 0x7621, 0x7622, 0x7624, 0x7634,
+ 0x7630, 0x763B, 0x7647, 0x7648, 0x7646, 0x765C, 0x7658, 0x7661,
+ 0x7662, 0x7668, 0x7669, 0x766A, 0x7667, 0x766C, 0x7670,
+};
+const unsigned short euc_to_utf8_E2[] = {
+         0x7672, 0x7676, 0x7678, 0x767C, 0x7680, 0x7683, 0x7688,
+ 0x768B, 0x768E, 0x7696, 0x7693, 0x7699, 0x769A, 0x76B0, 0x76B4,
+ 0x76B8, 0x76B9, 0x76BA, 0x76C2, 0x76CD, 0x76D6, 0x76D2, 0x76DE,
+ 0x76E1, 0x76E5, 0x76E7, 0x76EA, 0x862F, 0x76FB, 0x7708, 0x7707,
+ 0x7704, 0x7729, 0x7724, 0x771E, 0x7725, 0x7726, 0x771B, 0x7737,
+ 0x7738, 0x7747, 0x775A, 0x7768, 0x776B, 0x775B, 0x7765, 0x777F,
+ 0x777E, 0x7779, 0x778E, 0x778B, 0x7791, 0x77A0, 0x779E, 0x77B0,
+ 0x77B6, 0x77B9, 0x77BF, 0x77BC, 0x77BD, 0x77BB, 0x77C7, 0x77CD,
+ 0x77D7, 0x77DA, 0x77DC, 0x77E3, 0x77EE, 0x77FC, 0x780C, 0x7812,
+ 0x7926, 0x7820, 0x792A, 0x7845, 0x788E, 0x7874, 0x7886, 0x787C,
+ 0x789A, 0x788C, 0x78A3, 0x78B5, 0x78AA, 0x78AF, 0x78D1, 0x78C6,
+ 0x78CB, 0x78D4, 0x78BE, 0x78BC, 0x78C5, 0x78CA, 0x78EC,
+};
+const unsigned short euc_to_utf8_E3[] = {
+         0x78E7, 0x78DA, 0x78FD, 0x78F4, 0x7907, 0x7912, 0x7911,
+ 0x7919, 0x792C, 0x792B, 0x7940, 0x7960, 0x7957, 0x795F, 0x795A,
+ 0x7955, 0x7953, 0x797A, 0x797F, 0x798A, 0x799D, 0x79A7, 0x9F4B,
+ 0x79AA, 0x79AE, 0x79B3, 0x79B9, 0x79BA, 0x79C9, 0x79D5, 0x79E7,
+ 0x79EC, 0x79E1, 0x79E3, 0x7A08, 0x7A0D, 0x7A18, 0x7A19, 0x7A20,
+ 0x7A1F, 0x7980, 0x7A31, 0x7A3B, 0x7A3E, 0x7A37, 0x7A43, 0x7A57,
+ 0x7A49, 0x7A61, 0x7A62, 0x7A69, 0x9F9D, 0x7A70, 0x7A79, 0x7A7D,
+ 0x7A88, 0x7A97, 0x7A95, 0x7A98, 0x7A96, 0x7AA9, 0x7AC8, 0x7AB0,
+ 0x7AB6, 0x7AC5, 0x7AC4, 0x7ABF, 0x9083, 0x7AC7, 0x7ACA, 0x7ACD,
+ 0x7ACF, 0x7AD5, 0x7AD3, 0x7AD9, 0x7ADA, 0x7ADD, 0x7AE1, 0x7AE2,
+ 0x7AE6, 0x7AED, 0x7AF0, 0x7B02, 0x7B0F, 0x7B0A, 0x7B06, 0x7B33,
+ 0x7B18, 0x7B19, 0x7B1E, 0x7B35, 0x7B28, 0x7B36, 0x7B50,
+};
+const unsigned short euc_to_utf8_E4[] = {
+         0x7B7A, 0x7B04, 0x7B4D, 0x7B0B, 0x7B4C, 0x7B45, 0x7B75,
+ 0x7B65, 0x7B74, 0x7B67, 0x7B70, 0x7B71, 0x7B6C, 0x7B6E, 0x7B9D,
+ 0x7B98, 0x7B9F, 0x7B8D, 0x7B9C, 0x7B9A, 0x7B8B, 0x7B92, 0x7B8F,
+ 0x7B5D, 0x7B99, 0x7BCB, 0x7BC1, 0x7BCC, 0x7BCF, 0x7BB4, 0x7BC6,
+ 0x7BDD, 0x7BE9, 0x7C11, 0x7C14, 0x7BE6, 0x7BE5, 0x7C60, 0x7C00,
+ 0x7C07, 0x7C13, 0x7BF3, 0x7BF7, 0x7C17, 0x7C0D, 0x7BF6, 0x7C23,
+ 0x7C27, 0x7C2A, 0x7C1F, 0x7C37, 0x7C2B, 0x7C3D, 0x7C4C, 0x7C43,
+ 0x7C54, 0x7C4F, 0x7C40, 0x7C50, 0x7C58, 0x7C5F, 0x7C64, 0x7C56,
+ 0x7C65, 0x7C6C, 0x7C75, 0x7C83, 0x7C90, 0x7CA4, 0x7CAD, 0x7CA2,
+ 0x7CAB, 0x7CA1, 0x7CA8, 0x7CB3, 0x7CB2, 0x7CB1, 0x7CAE, 0x7CB9,
+ 0x7CBD, 0x7CC0, 0x7CC5, 0x7CC2, 0x7CD8, 0x7CD2, 0x7CDC, 0x7CE2,
+ 0x9B3B, 0x7CEF, 0x7CF2, 0x7CF4, 0x7CF6, 0x7CFA, 0x7D06,
+};
+const unsigned short euc_to_utf8_E5[] = {
+         0x7D02, 0x7D1C, 0x7D15, 0x7D0A, 0x7D45, 0x7D4B, 0x7D2E,
+ 0x7D32, 0x7D3F, 0x7D35, 0x7D46, 0x7D73, 0x7D56, 0x7D4E, 0x7D72,
+ 0x7D68, 0x7D6E, 0x7D4F, 0x7D63, 0x7D93, 0x7D89, 0x7D5B, 0x7D8F,
+ 0x7D7D, 0x7D9B, 0x7DBA, 0x7DAE, 0x7DA3, 0x7DB5, 0x7DC7, 0x7DBD,
+ 0x7DAB, 0x7E3D, 0x7DA2, 0x7DAF, 0x7DDC, 0x7DB8, 0x7D9F, 0x7DB0,
+ 0x7DD8, 0x7DDD, 0x7DE4, 0x7DDE, 0x7DFB, 0x7DF2, 0x7DE1, 0x7E05,
+ 0x7E0A, 0x7E23, 0x7E21, 0x7E12, 0x7E31, 0x7E1F, 0x7E09, 0x7E0B,
+ 0x7E22, 0x7E46, 0x7E66, 0x7E3B, 0x7E35, 0x7E39, 0x7E43, 0x7E37,
+ 0x7E32, 0x7E3A, 0x7E67, 0x7E5D, 0x7E56, 0x7E5E, 0x7E59, 0x7E5A,
+ 0x7E79, 0x7E6A, 0x7E69, 0x7E7C, 0x7E7B, 0x7E83, 0x7DD5, 0x7E7D,
+ 0x8FAE, 0x7E7F, 0x7E88, 0x7E89, 0x7E8C, 0x7E92, 0x7E90, 0x7E93,
+ 0x7E94, 0x7E96, 0x7E8E, 0x7E9B, 0x7E9C, 0x7F38, 0x7F3A,
+};
+const unsigned short euc_to_utf8_E6[] = {
+         0x7F45, 0x7F4C, 0x7F4D, 0x7F4E, 0x7F50, 0x7F51, 0x7F55,
+ 0x7F54, 0x7F58, 0x7F5F, 0x7F60, 0x7F68, 0x7F69, 0x7F67, 0x7F78,
+ 0x7F82, 0x7F86, 0x7F83, 0x7F88, 0x7F87, 0x7F8C, 0x7F94, 0x7F9E,
+ 0x7F9D, 0x7F9A, 0x7FA3, 0x7FAF, 0x7FB2, 0x7FB9, 0x7FAE, 0x7FB6,
+ 0x7FB8, 0x8B71, 0x7FC5, 0x7FC6, 0x7FCA, 0x7FD5, 0x7FD4, 0x7FE1,
+ 0x7FE6, 0x7FE9, 0x7FF3, 0x7FF9, 0x98DC, 0x8006, 0x8004, 0x800B,
+ 0x8012, 0x8018, 0x8019, 0x801C, 0x8021, 0x8028, 0x803F, 0x803B,
+ 0x804A, 0x8046, 0x8052, 0x8058, 0x805A, 0x805F, 0x8062, 0x8068,
+ 0x8073, 0x8072, 0x8070, 0x8076, 0x8079, 0x807D, 0x807F, 0x8084,
+ 0x8086, 0x8085, 0x809B, 0x8093, 0x809A, 0x80AD, 0x5190, 0x80AC,
+ 0x80DB, 0x80E5, 0x80D9, 0x80DD, 0x80C4, 0x80DA, 0x80D6, 0x8109,
+ 0x80EF, 0x80F1, 0x811B, 0x8129, 0x8123, 0x812F, 0x814B,
+};
+const unsigned short euc_to_utf8_E7[] = {
+         0x968B, 0x8146, 0x813E, 0x8153, 0x8151, 0x80FC, 0x8171,
+ 0x816E, 0x8165, 0x8166, 0x8174, 0x8183, 0x8188, 0x818A, 0x8180,
+ 0x8182, 0x81A0, 0x8195, 0x81A4, 0x81A3, 0x815F, 0x8193, 0x81A9,
+ 0x81B0, 0x81B5, 0x81BE, 0x81B8, 0x81BD, 0x81C0, 0x81C2, 0x81BA,
+ 0x81C9, 0x81CD, 0x81D1, 0x81D9, 0x81D8, 0x81C8, 0x81DA, 0x81DF,
+ 0x81E0, 0x81E7, 0x81FA, 0x81FB, 0x81FE, 0x8201, 0x8202, 0x8205,
+ 0x8207, 0x820A, 0x820D, 0x8210, 0x8216, 0x8229, 0x822B, 0x8238,
+ 0x8233, 0x8240, 0x8259, 0x8258, 0x825D, 0x825A, 0x825F, 0x8264,
+ 0x8262, 0x8268, 0x826A, 0x826B, 0x822E, 0x8271, 0x8277, 0x8278,
+ 0x827E, 0x828D, 0x8292, 0x82AB, 0x829F, 0x82BB, 0x82AC, 0x82E1,
+ 0x82E3, 0x82DF, 0x82D2, 0x82F4, 0x82F3, 0x82FA, 0x8393, 0x8303,
+ 0x82FB, 0x82F9, 0x82DE, 0x8306, 0x82DC, 0x8309, 0x82D9,
+};
+const unsigned short euc_to_utf8_E8[] = {
+         0x8335, 0x8334, 0x8316, 0x8332, 0x8331, 0x8340, 0x8339,
+ 0x8350, 0x8345, 0x832F, 0x832B, 0x8317, 0x8318, 0x8385, 0x839A,
+ 0x83AA, 0x839F, 0x83A2, 0x8396, 0x8323, 0x838E, 0x8387, 0x838A,
+ 0x837C, 0x83B5, 0x8373, 0x8375, 0x83A0, 0x8389, 0x83A8, 0x83F4,
+ 0x8413, 0x83EB, 0x83CE, 0x83FD, 0x8403, 0x83D8, 0x840B, 0x83C1,
+ 0x83F7, 0x8407, 0x83E0, 0x83F2, 0x840D, 0x8422, 0x8420, 0x83BD,
+ 0x8438, 0x8506, 0x83FB, 0x846D, 0x842A, 0x843C, 0x855A, 0x8484,
+ 0x8477, 0x846B, 0x84AD, 0x846E, 0x8482, 0x8469, 0x8446, 0x842C,
+ 0x846F, 0x8479, 0x8435, 0x84CA, 0x8462, 0x84B9, 0x84BF, 0x849F,
+ 0x84D9, 0x84CD, 0x84BB, 0x84DA, 0x84D0, 0x84C1, 0x84C6, 0x84D6,
+ 0x84A1, 0x8521, 0x84FF, 0x84F4, 0x8517, 0x8518, 0x852C, 0x851F,
+ 0x8515, 0x8514, 0x84FC, 0x8540, 0x8563, 0x8558, 0x8548,
+};
+const unsigned short euc_to_utf8_E9[] = {
+         0x8541, 0x8602, 0x854B, 0x8555, 0x8580, 0x85A4, 0x8588,
+ 0x8591, 0x858A, 0x85A8, 0x856D, 0x8594, 0x859B, 0x85EA, 0x8587,
+ 0x859C, 0x8577, 0x857E, 0x8590, 0x85C9, 0x85BA, 0x85CF, 0x85B9,
+ 0x85D0, 0x85D5, 0x85DD, 0x85E5, 0x85DC, 0x85F9, 0x860A, 0x8613,
+ 0x860B, 0x85FE, 0x85FA, 0x8606, 0x8622, 0x861A, 0x8630, 0x863F,
+ 0x864D, 0x4E55, 0x8654, 0x865F, 0x8667, 0x8671, 0x8693, 0x86A3,
+ 0x86A9, 0x86AA, 0x868B, 0x868C, 0x86B6, 0x86AF, 0x86C4, 0x86C6,
+ 0x86B0, 0x86C9, 0x8823, 0x86AB, 0x86D4, 0x86DE, 0x86E9, 0x86EC,
+ 0x86DF, 0x86DB, 0x86EF, 0x8712, 0x8706, 0x8708, 0x8700, 0x8703,
+ 0x86FB, 0x8711, 0x8709, 0x870D, 0x86F9, 0x870A, 0x8734, 0x873F,
+ 0x8737, 0x873B, 0x8725, 0x8729, 0x871A, 0x8760, 0x875F, 0x8778,
+ 0x874C, 0x874E, 0x8774, 0x8757, 0x8768, 0x876E, 0x8759,
+};
+const unsigned short euc_to_utf8_EA[] = {
+         0x8753, 0x8763, 0x876A, 0x8805, 0x87A2, 0x879F, 0x8782,
+ 0x87AF, 0x87CB, 0x87BD, 0x87C0, 0x87D0, 0x96D6, 0x87AB, 0x87C4,
+ 0x87B3, 0x87C7, 0x87C6, 0x87BB, 0x87EF, 0x87F2, 0x87E0, 0x880F,
+ 0x880D, 0x87FE, 0x87F6, 0x87F7, 0x880E, 0x87D2, 0x8811, 0x8816,
+ 0x8815, 0x8822, 0x8821, 0x8831, 0x8836, 0x8839, 0x8827, 0x883B,
+ 0x8844, 0x8842, 0x8852, 0x8859, 0x885E, 0x8862, 0x886B, 0x8881,
+ 0x887E, 0x889E, 0x8875, 0x887D, 0x88B5, 0x8872, 0x8882, 0x8897,
+ 0x8892, 0x88AE, 0x8899, 0x88A2, 0x888D, 0x88A4, 0x88B0, 0x88BF,
+ 0x88B1, 0x88C3, 0x88C4, 0x88D4, 0x88D8, 0x88D9, 0x88DD, 0x88F9,
+ 0x8902, 0x88FC, 0x88F4, 0x88E8, 0x88F2, 0x8904, 0x890C, 0x890A,
+ 0x8913, 0x8943, 0x891E, 0x8925, 0x892A, 0x892B, 0x8941, 0x8944,
+ 0x893B, 0x8936, 0x8938, 0x894C, 0x891D, 0x8960, 0x895E,
+};
+const unsigned short euc_to_utf8_EB[] = {
+         0x8966, 0x8964, 0x896D, 0x896A, 0x896F, 0x8974, 0x8977,
+ 0x897E, 0x8983, 0x8988, 0x898A, 0x8993, 0x8998, 0x89A1, 0x89A9,
+ 0x89A6, 0x89AC, 0x89AF, 0x89B2, 0x89BA, 0x89BD, 0x89BF, 0x89C0,
+ 0x89DA, 0x89DC, 0x89DD, 0x89E7, 0x89F4, 0x89F8, 0x8A03, 0x8A16,
+ 0x8A10, 0x8A0C, 0x8A1B, 0x8A1D, 0x8A25, 0x8A36, 0x8A41, 0x8A5B,
+ 0x8A52, 0x8A46, 0x8A48, 0x8A7C, 0x8A6D, 0x8A6C, 0x8A62, 0x8A85,
+ 0x8A82, 0x8A84, 0x8AA8, 0x8AA1, 0x8A91, 0x8AA5, 0x8AA6, 0x8A9A,
+ 0x8AA3, 0x8AC4, 0x8ACD, 0x8AC2, 0x8ADA, 0x8AEB, 0x8AF3, 0x8AE7,
+ 0x8AE4, 0x8AF1, 0x8B14, 0x8AE0, 0x8AE2, 0x8AF7, 0x8ADE, 0x8ADB,
+ 0x8B0C, 0x8B07, 0x8B1A, 0x8AE1, 0x8B16, 0x8B10, 0x8B17, 0x8B20,
+ 0x8B33, 0x97AB, 0x8B26, 0x8B2B, 0x8B3E, 0x8B28, 0x8B41, 0x8B4C,
+ 0x8B4F, 0x8B4E, 0x8B49, 0x8B56, 0x8B5B, 0x8B5A, 0x8B6B,
+};
+const unsigned short euc_to_utf8_EC[] = {
+         0x8B5F, 0x8B6C, 0x8B6F, 0x8B74, 0x8B7D, 0x8B80, 0x8B8C,
+ 0x8B8E, 0x8B92, 0x8B93, 0x8B96, 0x8B99, 0x8B9A, 0x8C3A, 0x8C41,
+ 0x8C3F, 0x8C48, 0x8C4C, 0x8C4E, 0x8C50, 0x8C55, 0x8C62, 0x8C6C,
+ 0x8C78, 0x8C7A, 0x8C82, 0x8C89, 0x8C85, 0x8C8A, 0x8C8D, 0x8C8E,
+ 0x8C94, 0x8C7C, 0x8C98, 0x621D, 0x8CAD, 0x8CAA, 0x8CBD, 0x8CB2,
+ 0x8CB3, 0x8CAE, 0x8CB6, 0x8CC8, 0x8CC1, 0x8CE4, 0x8CE3, 0x8CDA,
+ 0x8CFD, 0x8CFA, 0x8CFB, 0x8D04, 0x8D05, 0x8D0A, 0x8D07, 0x8D0F,
+ 0x8D0D, 0x8D10, 0x9F4E, 0x8D13, 0x8CCD, 0x8D14, 0x8D16, 0x8D67,
+ 0x8D6D, 0x8D71, 0x8D73, 0x8D81, 0x8D99, 0x8DC2, 0x8DBE, 0x8DBA,
+ 0x8DCF, 0x8DDA, 0x8DD6, 0x8DCC, 0x8DDB, 0x8DCB, 0x8DEA, 0x8DEB,
+ 0x8DDF, 0x8DE3, 0x8DFC, 0x8E08, 0x8E09, 0x8DFF, 0x8E1D, 0x8E1E,
+ 0x8E10, 0x8E1F, 0x8E42, 0x8E35, 0x8E30, 0x8E34, 0x8E4A,
+};
+const unsigned short euc_to_utf8_ED[] = {
+         0x8E47, 0x8E49, 0x8E4C, 0x8E50, 0x8E48, 0x8E59, 0x8E64,
+ 0x8E60, 0x8E2A, 0x8E63, 0x8E55, 0x8E76, 0x8E72, 0x8E7C, 0x8E81,
+ 0x8E87, 0x8E85, 0x8E84, 0x8E8B, 0x8E8A, 0x8E93, 0x8E91, 0x8E94,
+ 0x8E99, 0x8EAA, 0x8EA1, 0x8EAC, 0x8EB0, 0x8EC6, 0x8EB1, 0x8EBE,
+ 0x8EC5, 0x8EC8, 0x8ECB, 0x8EDB, 0x8EE3, 0x8EFC, 0x8EFB, 0x8EEB,
+ 0x8EFE, 0x8F0A, 0x8F05, 0x8F15, 0x8F12, 0x8F19, 0x8F13, 0x8F1C,
+ 0x8F1F, 0x8F1B, 0x8F0C, 0x8F26, 0x8F33, 0x8F3B, 0x8F39, 0x8F45,
+ 0x8F42, 0x8F3E, 0x8F4C, 0x8F49, 0x8F46, 0x8F4E, 0x8F57, 0x8F5C,
+ 0x8F62, 0x8F63, 0x8F64, 0x8F9C, 0x8F9F, 0x8FA3, 0x8FAD, 0x8FAF,
+ 0x8FB7, 0x8FDA, 0x8FE5, 0x8FE2, 0x8FEA, 0x8FEF, 0x9087, 0x8FF4,
+ 0x9005, 0x8FF9, 0x8FFA, 0x9011, 0x9015, 0x9021, 0x900D, 0x901E,
+ 0x9016, 0x900B, 0x9027, 0x9036, 0x9035, 0x9039, 0x8FF8,
+};
+const unsigned short euc_to_utf8_EE[] = {
+         0x904F, 0x9050, 0x9051, 0x9052, 0x900E, 0x9049, 0x903E,
+ 0x9056, 0x9058, 0x905E, 0x9068, 0x906F, 0x9076, 0x96A8, 0x9072,
+ 0x9082, 0x907D, 0x9081, 0x9080, 0x908A, 0x9089, 0x908F, 0x90A8,
+ 0x90AF, 0x90B1, 0x90B5, 0x90E2, 0x90E4, 0x6248, 0x90DB, 0x9102,
+ 0x9112, 0x9119, 0x9132, 0x9130, 0x914A, 0x9156, 0x9158, 0x9163,
+ 0x9165, 0x9169, 0x9173, 0x9172, 0x918B, 0x9189, 0x9182, 0x91A2,
+ 0x91AB, 0x91AF, 0x91AA, 0x91B5, 0x91B4, 0x91BA, 0x91C0, 0x91C1,
+ 0x91C9, 0x91CB, 0x91D0, 0x91D6, 0x91DF, 0x91E1, 0x91DB, 0x91FC,
+ 0x91F5, 0x91F6, 0x921E, 0x91FF, 0x9214, 0x922C, 0x9215, 0x9211,
+ 0x925E, 0x9257, 0x9245, 0x9249, 0x9264, 0x9248, 0x9295, 0x923F,
+ 0x924B, 0x9250, 0x929C, 0x9296, 0x9293, 0x929B, 0x925A, 0x92CF,
+ 0x92B9, 0x92B7, 0x92E9, 0x930F, 0x92FA, 0x9344, 0x932E,
+};
+const unsigned short euc_to_utf8_EF[] = {
+         0x9319, 0x9322, 0x931A, 0x9323, 0x933A, 0x9335, 0x933B,
+ 0x935C, 0x9360, 0x937C, 0x936E, 0x9356, 0x93B0, 0x93AC, 0x93AD,
+ 0x9394, 0x93B9, 0x93D6, 0x93D7, 0x93E8, 0x93E5, 0x93D8, 0x93C3,
+ 0x93DD, 0x93D0, 0x93C8, 0x93E4, 0x941A, 0x9414, 0x9413, 0x9403,
+ 0x9407, 0x9410, 0x9436, 0x942B, 0x9435, 0x9421, 0x943A, 0x9441,
+ 0x9452, 0x9444, 0x945B, 0x9460, 0x9462, 0x945E, 0x946A, 0x9229,
+ 0x9470, 0x9475, 0x9477, 0x947D, 0x945A, 0x947C, 0x947E, 0x9481,
+ 0x947F, 0x9582, 0x9587, 0x958A, 0x9594, 0x9596, 0x9598, 0x9599,
+ 0x95A0, 0x95A8, 0x95A7, 0x95AD, 0x95BC, 0x95BB, 0x95B9, 0x95BE,
+ 0x95CA, 0x6FF6, 0x95C3, 0x95CD, 0x95CC, 0x95D5, 0x95D4, 0x95D6,
+ 0x95DC, 0x95E1, 0x95E5, 0x95E2, 0x9621, 0x9628, 0x962E, 0x962F,
+ 0x9642, 0x964C, 0x964F, 0x964B, 0x9677, 0x965C, 0x965E,
+};
+const unsigned short euc_to_utf8_F0[] = {
+         0x965D, 0x965F, 0x9666, 0x9672, 0x966C, 0x968D, 0x9698,
+ 0x9695, 0x9697, 0x96AA, 0x96A7, 0x96B1, 0x96B2, 0x96B0, 0x96B4,
+ 0x96B6, 0x96B8, 0x96B9, 0x96CE, 0x96CB, 0x96C9, 0x96CD, 0x894D,
+ 0x96DC, 0x970D, 0x96D5, 0x96F9, 0x9704, 0x9706, 0x9708, 0x9713,
+ 0x970E, 0x9711, 0x970F, 0x9716, 0x9719, 0x9724, 0x972A, 0x9730,
+ 0x9739, 0x973D, 0x973E, 0x9744, 0x9746, 0x9748, 0x9742, 0x9749,
+ 0x975C, 0x9760, 0x9764, 0x9766, 0x9768, 0x52D2, 0x976B, 0x9771,
+ 0x9779, 0x9785, 0x977C, 0x9781, 0x977A, 0x9786, 0x978B, 0x978F,
+ 0x9790, 0x979C, 0x97A8, 0x97A6, 0x97A3, 0x97B3, 0x97B4, 0x97C3,
+ 0x97C6, 0x97C8, 0x97CB, 0x97DC, 0x97ED, 0x9F4F, 0x97F2, 0x7ADF,
+ 0x97F6, 0x97F5, 0x980F, 0x980C, 0x9838, 0x9824, 0x9821, 0x9837,
+ 0x983D, 0x9846, 0x984F, 0x984B, 0x986B, 0x986F, 0x9870,
+};
+const unsigned short euc_to_utf8_F1[] = {
+         0x9871, 0x9874, 0x9873, 0x98AA, 0x98AF, 0x98B1, 0x98B6,
+ 0x98C4, 0x98C3, 0x98C6, 0x98E9, 0x98EB, 0x9903, 0x9909, 0x9912,
+ 0x9914, 0x9918, 0x9921, 0x991D, 0x991E, 0x9924, 0x9920, 0x992C,
+ 0x992E, 0x993D, 0x993E, 0x9942, 0x9949, 0x9945, 0x9950, 0x994B,
+ 0x9951, 0x9952, 0x994C, 0x9955, 0x9997, 0x9998, 0x99A5, 0x99AD,
+ 0x99AE, 0x99BC, 0x99DF, 0x99DB, 0x99DD, 0x99D8, 0x99D1, 0x99ED,
+ 0x99EE, 0x99F1, 0x99F2, 0x99FB, 0x99F8, 0x9A01, 0x9A0F, 0x9A05,
+ 0x99E2, 0x9A19, 0x9A2B, 0x9A37, 0x9A45, 0x9A42, 0x9A40, 0x9A43,
+ 0x9A3E, 0x9A55, 0x9A4D, 0x9A5B, 0x9A57, 0x9A5F, 0x9A62, 0x9A65,
+ 0x9A64, 0x9A69, 0x9A6B, 0x9A6A, 0x9AAD, 0x9AB0, 0x9ABC, 0x9AC0,
+ 0x9ACF, 0x9AD1, 0x9AD3, 0x9AD4, 0x9ADE, 0x9ADF, 0x9AE2, 0x9AE3,
+ 0x9AE6, 0x9AEF, 0x9AEB, 0x9AEE, 0x9AF4, 0x9AF1, 0x9AF7,
+};
+const unsigned short euc_to_utf8_F2[] = {
+         0x9AFB, 0x9B06, 0x9B18, 0x9B1A, 0x9B1F, 0x9B22, 0x9B23,
+ 0x9B25, 0x9B27, 0x9B28, 0x9B29, 0x9B2A, 0x9B2E, 0x9B2F, 0x9B32,
+ 0x9B44, 0x9B43, 0x9B4F, 0x9B4D, 0x9B4E, 0x9B51, 0x9B58, 0x9B74,
+ 0x9B93, 0x9B83, 0x9B91, 0x9B96, 0x9B97, 0x9B9F, 0x9BA0, 0x9BA8,
+ 0x9BB4, 0x9BC0, 0x9BCA, 0x9BB9, 0x9BC6, 0x9BCF, 0x9BD1, 0x9BD2,
+ 0x9BE3, 0x9BE2, 0x9BE4, 0x9BD4, 0x9BE1, 0x9C3A, 0x9BF2, 0x9BF1,
+ 0x9BF0, 0x9C15, 0x9C14, 0x9C09, 0x9C13, 0x9C0C, 0x9C06, 0x9C08,
+ 0x9C12, 0x9C0A, 0x9C04, 0x9C2E, 0x9C1B, 0x9C25, 0x9C24, 0x9C21,
+ 0x9C30, 0x9C47, 0x9C32, 0x9C46, 0x9C3E, 0x9C5A, 0x9C60, 0x9C67,
+ 0x9C76, 0x9C78, 0x9CE7, 0x9CEC, 0x9CF0, 0x9D09, 0x9D08, 0x9CEB,
+ 0x9D03, 0x9D06, 0x9D2A, 0x9D26, 0x9DAF, 0x9D23, 0x9D1F, 0x9D44,
+ 0x9D15, 0x9D12, 0x9D41, 0x9D3F, 0x9D3E, 0x9D46, 0x9D48,
+};
+const unsigned short euc_to_utf8_F3[] = {
+         0x9D5D, 0x9D5E, 0x9D64, 0x9D51, 0x9D50, 0x9D59, 0x9D72,
+ 0x9D89, 0x9D87, 0x9DAB, 0x9D6F, 0x9D7A, 0x9D9A, 0x9DA4, 0x9DA9,
+ 0x9DB2, 0x9DC4, 0x9DC1, 0x9DBB, 0x9DB8, 0x9DBA, 0x9DC6, 0x9DCF,
+ 0x9DC2, 0x9DD9, 0x9DD3, 0x9DF8, 0x9DE6, 0x9DED, 0x9DEF, 0x9DFD,
+ 0x9E1A, 0x9E1B, 0x9E1E, 0x9E75, 0x9E79, 0x9E7D, 0x9E81, 0x9E88,
+ 0x9E8B, 0x9E8C, 0x9E92, 0x9E95, 0x9E91, 0x9E9D, 0x9EA5, 0x9EA9,
+ 0x9EB8, 0x9EAA, 0x9EAD, 0x9761, 0x9ECC, 0x9ECE, 0x9ECF, 0x9ED0,
+ 0x9ED4, 0x9EDC, 0x9EDE, 0x9EDD, 0x9EE0, 0x9EE5, 0x9EE8, 0x9EEF,
+ 0x9EF4, 0x9EF6, 0x9EF7, 0x9EF9, 0x9EFB, 0x9EFC, 0x9EFD, 0x9F07,
+ 0x9F08, 0x76B7, 0x9F15, 0x9F21, 0x9F2C, 0x9F3E, 0x9F4A, 0x9F52,
+ 0x9F54, 0x9F63, 0x9F5F, 0x9F60, 0x9F61, 0x9F66, 0x9F67, 0x9F6C,
+ 0x9F6A, 0x9F77, 0x9F72, 0x9F76, 0x9F95, 0x9F9C, 0x9FA0,
+};
+const unsigned short euc_to_utf8_F4[] = {
+         0x582F, 0x69C7, 0x9059, 0x7464, 0x51DC, 0x7199,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_F5[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFE33,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFE31,      0,      0,
+      0,      0,      0,      0,      0, 0xFE30,      0,      0,
+      0,      0, 0xFE35, 0xFE36, 0xFE39, 0xFE3A,      0,      0,
+ 0xFE37, 0xFE38, 0xFE3F, 0xFE40, 0xFE3D, 0xFE3E, 0xFE41, 0xFE42,
+ 0xFE43, 0xFE44, 0xFE3B, 0xFE3C,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_F9[] = {
+         0x7E8A, 0x891C, 0x9348, 0x9288, 0x84DC, 0x4FC9, 0x70BB,
+ 0x6631, 0x68C8, 0x92F9, 0x66FB, 0x5F45, 0x4E28, 0x4EE1, 0x4EFC,
+ 0x4F00, 0x4F03, 0x4F39, 0x4F56, 0x4F92, 0x4F8A, 0x4F9A, 0x4F94,
+ 0x4FCD, 0x5040, 0x5022, 0x4FFF, 0x501E, 0x5046, 0x5070, 0x5042,
+ 0x5094, 0x50F4, 0x50D8, 0x514A, 0x5164, 0x519D, 0x51BE, 0x51EC,
+ 0x5215, 0x529C, 0x52A6, 0x52C0, 0x52DB, 0x5300, 0x5307, 0x5324,
+ 0x5372, 0x5393, 0x53B2, 0x53DD, 0xFA0E, 0x549C, 0x548A, 0x54A9,
+ 0x54FF, 0x5586, 0x5759, 0x5765, 0x57AC, 0x57C8, 0x57C7, 0xFA0F,
+ 0xFA10, 0x589E, 0x58B2, 0x590B, 0x5953, 0x595B, 0x595D, 0x5963,
+ 0x59A4, 0x59BA, 0x5B56, 0x5BC0, 0x752F, 0x5BD8, 0x5BEC, 0x5C1E,
+ 0x5CA6, 0x5CBA, 0x5CF5, 0x5D27, 0x5D53, 0xFA11, 0x5D42, 0x5D6D,
+ 0x5DB8, 0x5DB9, 0x5DD0, 0x5F21, 0x5F34, 0x5F67, 0x5FB7,
+};
+const unsigned short euc_to_utf8_FA[] = {
+         0x5FDE, 0x605D, 0x6085, 0x608A, 0x60DE, 0x60D5, 0x6120,
+ 0x60F2, 0x6111, 0x6137, 0x6130, 0x6198, 0x6213, 0x62A6, 0x63F5,
+ 0x6460, 0x649D, 0x64CE, 0x654E, 0x6600, 0x6615, 0x663B, 0x6609,
+ 0x662E, 0x661E, 0x6624, 0x6665, 0x6657, 0x6659, 0xFA12, 0x6673,
+ 0x6699, 0x66A0, 0x66B2, 0x66BF, 0x66FA, 0x670E, 0xF929, 0x6766,
+ 0x67BB, 0x6852, 0x67C0, 0x6801, 0x6844, 0x68CF, 0xFA13, 0x6968,
+ 0xFA14, 0x6998, 0x69E2, 0x6A30, 0x6A6B, 0x6A46, 0x6A73, 0x6A7E,
+ 0x6AE2, 0x6AE4, 0x6BD6, 0x6C3F, 0x6C5C, 0x6C86, 0x6C6F, 0x6CDA,
+ 0x6D04, 0x6D87, 0x6D6F, 0x6D96, 0x6DAC, 0x6DCF, 0x6DF8, 0x6DF2,
+ 0x6DFC, 0x6E39, 0x6E5C, 0x6E27, 0x6E3C, 0x6EBF, 0x6F88, 0x6FB5,
+ 0x6FF5, 0x7005, 0x7007, 0x7028, 0x7085, 0x70AB, 0x710F, 0x7104,
+ 0x715C, 0x7146, 0x7147, 0xFA15, 0x71C1, 0x71FE, 0x72B1,
+};
+const unsigned short euc_to_utf8_FB[] = {
+         0x72BE, 0x7324, 0xFA16, 0x7377, 0x73BD, 0x73C9, 0x73D6,
+ 0x73E3, 0x73D2, 0x7407, 0x73F5, 0x7426, 0x742A, 0x7429, 0x742E,
+ 0x7462, 0x7489, 0x749F, 0x7501, 0x756F, 0x7682, 0x769C, 0x769E,
+ 0x769B, 0x76A6, 0xFA17, 0x7746, 0x52AF, 0x7821, 0x784E, 0x7864,
+ 0x787A, 0x7930, 0xFA18, 0xFA19, 0xFA1A, 0x7994, 0xFA1B, 0x799B,
+ 0x7AD1, 0x7AE7, 0xFA1C, 0x7AEB, 0x7B9E, 0xFA1D, 0x7D48, 0x7D5C,
+ 0x7DB7, 0x7DA0, 0x7DD6, 0x7E52, 0x7F47, 0x7FA1, 0xFA1E, 0x8301,
+ 0x8362, 0x837F, 0x83C7, 0x83F6, 0x8448, 0x84B4, 0x8553, 0x8559,
+ 0x856B, 0xFA1F, 0x85B0, 0xFA20, 0xFA21, 0x8807, 0x88F5, 0x8A12,
+ 0x8A37, 0x8A79, 0x8AA7, 0x8ABE, 0x8ADF, 0xFA22, 0x8AF6, 0x8B53,
+ 0x8B7F, 0x8CF0, 0x8CF4, 0x8D12, 0x8D76, 0xFA23, 0x8ECF, 0xFA24,
+ 0xFA25, 0x9067, 0x90DE, 0xFA26, 0x9115, 0x9127, 0x91DA,
+};
+const unsigned short euc_to_utf8_FC[] = {
+         0x91D7, 0x91DE, 0x91ED, 0x91EE, 0x91E4, 0x91E5, 0x9206,
+ 0x9210, 0x920A, 0x923A, 0x9240, 0x923C, 0x924E, 0x9259, 0x9251,
+ 0x9239, 0x9267, 0x92A7, 0x9277, 0x9278, 0x92E7, 0x92D7, 0x92D9,
+ 0x92D0, 0xFA27, 0x92D5, 0x92E0, 0x92D3, 0x9325, 0x9321, 0x92FB,
+ 0xFA28, 0x931E, 0x92FF, 0x931D, 0x9302, 0x9370, 0x9357, 0x93A4,
+ 0x93C6, 0x93DE, 0x93F8, 0x9431, 0x9445, 0x9448, 0x9592, 0xF9DC,
+ 0xFA29, 0x969D, 0x96AF, 0x9733, 0x973B, 0x9743, 0x974D, 0x974F,
+ 0x9751, 0x9755, 0x9857, 0x9865, 0xFA2A, 0xFA2B, 0x9927, 0xFA2C,
+ 0x999E, 0x9A4E, 0x9AD9, 0x9ADC, 0x9B75, 0x9B72, 0x9B8F, 0x9BB1,
+ 0x9BBB, 0x9C00, 0x9D70, 0x9D6B, 0xFA2D, 0x9E19, 0x9ED1,      0,
+      0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176,
+ 0x2177, 0x2178, 0x2179, 0xFFE2, 0x00A6, 0xFF07, 0xFF02,
+};
+
+/* Microsoft UCS Mapping Compatible */
+const unsigned short euc_to_utf8_FC_ms[] = {
+         0x91D7, 0x91DE, 0x91ED, 0x91EE, 0x91E4, 0x91E5, 0x9206,
+ 0x9210, 0x920A, 0x923A, 0x9240, 0x923C, 0x924E, 0x9259, 0x9251,
+ 0x9239, 0x9267, 0x92A7, 0x9277, 0x9278, 0x92E7, 0x92D7, 0x92D9,
+ 0x92D0, 0xFA27, 0x92D5, 0x92E0, 0x92D3, 0x9325, 0x9321, 0x92FB,
+ 0xFA28, 0x931E, 0x92FF, 0x931D, 0x9302, 0x9370, 0x9357, 0x93A4,
+ 0x93C6, 0x93DE, 0x93F8, 0x9431, 0x9445, 0x9448, 0x9592, 0xF9DC,
+ 0xFA29, 0x969D, 0x96AF, 0x9733, 0x973B, 0x9743, 0x974D, 0x974F,
+ 0x9751, 0x9755, 0x9857, 0x9865, 0xFA2A, 0xFA2B, 0x9927, 0xFA2C,
+ 0x999E, 0x9A4E, 0x9AD9, 0x9ADC, 0x9B75, 0x9B72, 0x9B8F, 0x9BB1,
+ 0x9BBB, 0x9C00, 0x9D70, 0x9D6B, 0xFA2D, 0x9E19, 0x9ED1,      0,
+      0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176,
+ 0x2177, 0x2178, 0x2179, 0xFFE2, 0xFFE4, 0xFF07, 0xFF02,
+};
+
+#ifdef X0212_ENABLE
+const unsigned short euc_to_utf8_8FA2[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x02D8,
+ 0x02C7, 0x00B8, 0x02D9, 0x02DD, 0x00AF, 0x02DB, 0x02DA, 0xFF5E,
+ 0x0384, 0x0385,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x00A1, 0xFFE4, 0x00BF,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x00BA, 0x00AA, 0x00A9, 0x00AE, 0x2122,
+ 0x00A4, 0x2116,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_8FA6[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x0386, 0x0388, 0x0389, 0x038A, 0x03AA,      0, 0x038C,
+      0, 0x038E, 0x03AB,      0, 0x038F,      0,      0,      0,
+      0, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 0x03CA, 0x0390, 0x03CC,
+ 0x03C2, 0x03CD, 0x03CB, 0x03B0, 0x03CE,      0,      0,
+};
+const unsigned short euc_to_utf8_8FA7[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407,
+ 0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x040E, 0x040F,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457,
+ 0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x045E, 0x045F,
+};
+const unsigned short euc_to_utf8_8FA9[] = {
+         0x00C6, 0x0110,      0, 0x0126,      0, 0x0132,      0,
+ 0x0141, 0x013F,      0, 0x014A, 0x00D8, 0x0152,      0, 0x0166,
+ 0x00DE,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x00E6, 0x0111, 0x00F0, 0x0127, 0x0131, 0x0133, 0x0138,
+ 0x0142, 0x0140, 0x0149, 0x014B, 0x00F8, 0x0153, 0x00DF, 0x0167,
+ 0x00FE,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_8FAA[] = {
+         0x00C1, 0x00C0, 0x00C4, 0x00C2, 0x0102, 0x01CD, 0x0100,
+ 0x0104, 0x00C5, 0x00C3, 0x0106, 0x0108, 0x010C, 0x00C7, 0x010A,
+ 0x010E, 0x00C9, 0x00C8, 0x00CB, 0x00CA, 0x011A, 0x0116, 0x0112,
+ 0x0118,      0, 0x011C, 0x011E, 0x0122, 0x0120, 0x0124, 0x00CD,
+ 0x00CC, 0x00CF, 0x00CE, 0x01CF, 0x0130, 0x012A, 0x012E, 0x0128,
+ 0x0134, 0x0136, 0x0139, 0x013D, 0x013B, 0x0143, 0x0147, 0x0145,
+ 0x00D1, 0x00D3, 0x00D2, 0x00D6, 0x00D4, 0x01D1, 0x0150, 0x014C,
+ 0x00D5, 0x0154, 0x0158, 0x0156, 0x015A, 0x015C, 0x0160, 0x015E,
+ 0x0164, 0x0162, 0x00DA, 0x00D9, 0x00DC, 0x00DB, 0x016C, 0x01D3,
+ 0x0170, 0x016A, 0x0172, 0x016E, 0x0168, 0x01D7, 0x01DB, 0x01D9,
+ 0x01D5, 0x0174, 0x00DD, 0x0178, 0x0176, 0x0179, 0x017D, 0x017B,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_8FAB[] = {
+         0x00E1, 0x00E0, 0x00E4, 0x00E2, 0x0103, 0x01CE, 0x0101,
+ 0x0105, 0x00E5, 0x00E3, 0x0107, 0x0109, 0x010D, 0x00E7, 0x010B,
+ 0x010F, 0x00E9, 0x00E8, 0x00EB, 0x00EA, 0x011B, 0x0117, 0x0113,
+ 0x0119, 0x01F5, 0x011D, 0x011F,      0, 0x0121, 0x0125, 0x00ED,
+ 0x00EC, 0x00EF, 0x00EE, 0x01D0,      0, 0x012B, 0x012F, 0x0129,
+ 0x0135, 0x0137, 0x013A, 0x013E, 0x013C, 0x0144, 0x0148, 0x0146,
+ 0x00F1, 0x00F3, 0x00F2, 0x00F6, 0x00F4, 0x01D2, 0x0151, 0x014D,
+ 0x00F5, 0x0155, 0x0159, 0x0157, 0x015B, 0x015D, 0x0161, 0x015F,
+ 0x0165, 0x0163, 0x00FA, 0x00F9, 0x00FC, 0x00FB, 0x016D, 0x01D4,
+ 0x0171, 0x016B, 0x0173, 0x016F, 0x0169, 0x01D8, 0x01DC, 0x01DA,
+ 0x01D6, 0x0175, 0x00FD, 0x00FF, 0x0177, 0x017A, 0x017E, 0x017C,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_8FB0[] = {
+         0x4E02, 0x4E04, 0x4E05, 0x4E0C, 0x4E12, 0x4E1F, 0x4E23,
+ 0x4E24, 0x4E28, 0x4E2B, 0x4E2E, 0x4E2F, 0x4E30, 0x4E35, 0x4E40,
+ 0x4E41, 0x4E44, 0x4E47, 0x4E51, 0x4E5A, 0x4E5C, 0x4E63, 0x4E68,
+ 0x4E69, 0x4E74, 0x4E75, 0x4E79, 0x4E7F, 0x4E8D, 0x4E96, 0x4E97,
+ 0x4E9D, 0x4EAF, 0x4EB9, 0x4EC3, 0x4ED0, 0x4EDA, 0x4EDB, 0x4EE0,
+ 0x4EE1, 0x4EE2, 0x4EE8, 0x4EEF, 0x4EF1, 0x4EF3, 0x4EF5, 0x4EFD,
+ 0x4EFE, 0x4EFF, 0x4F00, 0x4F02, 0x4F03, 0x4F08, 0x4F0B, 0x4F0C,
+ 0x4F12, 0x4F15, 0x4F16, 0x4F17, 0x4F19, 0x4F2E, 0x4F31, 0x4F60,
+ 0x4F33, 0x4F35, 0x4F37, 0x4F39, 0x4F3B, 0x4F3E, 0x4F40, 0x4F42,
+ 0x4F48, 0x4F49, 0x4F4B, 0x4F4C, 0x4F52, 0x4F54, 0x4F56, 0x4F58,
+ 0x4F5F, 0x4F63, 0x4F6A, 0x4F6C, 0x4F6E, 0x4F71, 0x4F77, 0x4F78,
+ 0x4F79, 0x4F7A, 0x4F7D, 0x4F7E, 0x4F81, 0x4F82, 0x4F84,
+};
+const unsigned short euc_to_utf8_8FB1[] = {
+         0x4F85, 0x4F89, 0x4F8A, 0x4F8C, 0x4F8E, 0x4F90, 0x4F92,
+ 0x4F93, 0x4F94, 0x4F97, 0x4F99, 0x4F9A, 0x4F9E, 0x4F9F, 0x4FB2,
+ 0x4FB7, 0x4FB9, 0x4FBB, 0x4FBC, 0x4FBD, 0x4FBE, 0x4FC0, 0x4FC1,
+ 0x4FC5, 0x4FC6, 0x4FC8, 0x4FC9, 0x4FCB, 0x4FCC, 0x4FCD, 0x4FCF,
+ 0x4FD2, 0x4FDC, 0x4FE0, 0x4FE2, 0x4FF0, 0x4FF2, 0x4FFC, 0x4FFD,
+ 0x4FFF, 0x5000, 0x5001, 0x5004, 0x5007, 0x500A, 0x500C, 0x500E,
+ 0x5010, 0x5013, 0x5017, 0x5018, 0x501B, 0x501C, 0x501D, 0x501E,
+ 0x5022, 0x5027, 0x502E, 0x5030, 0x5032, 0x5033, 0x5035, 0x5040,
+ 0x5041, 0x5042, 0x5045, 0x5046, 0x504A, 0x504C, 0x504E, 0x5051,
+ 0x5052, 0x5053, 0x5057, 0x5059, 0x505F, 0x5060, 0x5062, 0x5063,
+ 0x5066, 0x5067, 0x506A, 0x506D, 0x5070, 0x5071, 0x503B, 0x5081,
+ 0x5083, 0x5084, 0x5086, 0x508A, 0x508E, 0x508F, 0x5090,
+};
+const unsigned short euc_to_utf8_8FB2[] = {
+         0x5092, 0x5093, 0x5094, 0x5096, 0x509B, 0x509C, 0x509E,
+ 0x509F, 0x50A0, 0x50A1, 0x50A2, 0x50AA, 0x50AF, 0x50B0, 0x50B9,
+ 0x50BA, 0x50BD, 0x50C0, 0x50C3, 0x50C4, 0x50C7, 0x50CC, 0x50CE,
+ 0x50D0, 0x50D3, 0x50D4, 0x50D8, 0x50DC, 0x50DD, 0x50DF, 0x50E2,
+ 0x50E4, 0x50E6, 0x50E8, 0x50E9, 0x50EF, 0x50F1, 0x50F6, 0x50FA,
+ 0x50FE, 0x5103, 0x5106, 0x5107, 0x5108, 0x510B, 0x510C, 0x510D,
+ 0x510E, 0x50F2, 0x5110, 0x5117, 0x5119, 0x511B, 0x511C, 0x511D,
+ 0x511E, 0x5123, 0x5127, 0x5128, 0x512C, 0x512D, 0x512F, 0x5131,
+ 0x5133, 0x5134, 0x5135, 0x5138, 0x5139, 0x5142, 0x514A, 0x514F,
+ 0x5153, 0x5155, 0x5157, 0x5158, 0x515F, 0x5164, 0x5166, 0x517E,
+ 0x5183, 0x5184, 0x518B, 0x518E, 0x5198, 0x519D, 0x51A1, 0x51A3,
+ 0x51AD, 0x51B8, 0x51BA, 0x51BC, 0x51BE, 0x51BF, 0x51C2,
+};
+const unsigned short euc_to_utf8_8FB3[] = {
+         0x51C8, 0x51CF, 0x51D1, 0x51D2, 0x51D3, 0x51D5, 0x51D8,
+ 0x51DE, 0x51E2, 0x51E5, 0x51EE, 0x51F2, 0x51F3, 0x51F4, 0x51F7,
+ 0x5201, 0x5202, 0x5205, 0x5212, 0x5213, 0x5215, 0x5216, 0x5218,
+ 0x5222, 0x5228, 0x5231, 0x5232, 0x5235, 0x523C, 0x5245, 0x5249,
+ 0x5255, 0x5257, 0x5258, 0x525A, 0x525C, 0x525F, 0x5260, 0x5261,
+ 0x5266, 0x526E, 0x5277, 0x5278, 0x5279, 0x5280, 0x5282, 0x5285,
+ 0x528A, 0x528C, 0x5293, 0x5295, 0x5296, 0x5297, 0x5298, 0x529A,
+ 0x529C, 0x52A4, 0x52A5, 0x52A6, 0x52A7, 0x52AF, 0x52B0, 0x52B6,
+ 0x52B7, 0x52B8, 0x52BA, 0x52BB, 0x52BD, 0x52C0, 0x52C4, 0x52C6,
+ 0x52C8, 0x52CC, 0x52CF, 0x52D1, 0x52D4, 0x52D6, 0x52DB, 0x52DC,
+ 0x52E1, 0x52E5, 0x52E8, 0x52E9, 0x52EA, 0x52EC, 0x52F0, 0x52F1,
+ 0x52F4, 0x52F6, 0x52F7, 0x5300, 0x5303, 0x530A, 0x530B,
+};
+const unsigned short euc_to_utf8_8FB4[] = {
+         0x530C, 0x5311, 0x5313, 0x5318, 0x531B, 0x531C, 0x531E,
+ 0x531F, 0x5325, 0x5327, 0x5328, 0x5329, 0x532B, 0x532C, 0x532D,
+ 0x5330, 0x5332, 0x5335, 0x533C, 0x533D, 0x533E, 0x5342, 0x534C,
+ 0x534B, 0x5359, 0x535B, 0x5361, 0x5363, 0x5365, 0x536C, 0x536D,
+ 0x5372, 0x5379, 0x537E, 0x5383, 0x5387, 0x5388, 0x538E, 0x5393,
+ 0x5394, 0x5399, 0x539D, 0x53A1, 0x53A4, 0x53AA, 0x53AB, 0x53AF,
+ 0x53B2, 0x53B4, 0x53B5, 0x53B7, 0x53B8, 0x53BA, 0x53BD, 0x53C0,
+ 0x53C5, 0x53CF, 0x53D2, 0x53D3, 0x53D5, 0x53DA, 0x53DD, 0x53DE,
+ 0x53E0, 0x53E6, 0x53E7, 0x53F5, 0x5402, 0x5413, 0x541A, 0x5421,
+ 0x5427, 0x5428, 0x542A, 0x542F, 0x5431, 0x5434, 0x5435, 0x5443,
+ 0x5444, 0x5447, 0x544D, 0x544F, 0x545E, 0x5462, 0x5464, 0x5466,
+ 0x5467, 0x5469, 0x546B, 0x546D, 0x546E, 0x5474, 0x547F,
+};
+const unsigned short euc_to_utf8_8FB5[] = {
+         0x5481, 0x5483, 0x5485, 0x5488, 0x5489, 0x548D, 0x5491,
+ 0x5495, 0x5496, 0x549C, 0x549F, 0x54A1, 0x54A6, 0x54A7, 0x54A9,
+ 0x54AA, 0x54AD, 0x54AE, 0x54B1, 0x54B7, 0x54B9, 0x54BA, 0x54BB,
+ 0x54BF, 0x54C6, 0x54CA, 0x54CD, 0x54CE, 0x54E0, 0x54EA, 0x54EC,
+ 0x54EF, 0x54F6, 0x54FC, 0x54FE, 0x54FF, 0x5500, 0x5501, 0x5505,
+ 0x5508, 0x5509, 0x550C, 0x550D, 0x550E, 0x5515, 0x552A, 0x552B,
+ 0x5532, 0x5535, 0x5536, 0x553B, 0x553C, 0x553D, 0x5541, 0x5547,
+ 0x5549, 0x554A, 0x554D, 0x5550, 0x5551, 0x5558, 0x555A, 0x555B,
+ 0x555E, 0x5560, 0x5561, 0x5564, 0x5566, 0x557F, 0x5581, 0x5582,
+ 0x5586, 0x5588, 0x558E, 0x558F, 0x5591, 0x5592, 0x5593, 0x5594,
+ 0x5597, 0x55A3, 0x55A4, 0x55AD, 0x55B2, 0x55BF, 0x55C1, 0x55C3,
+ 0x55C6, 0x55C9, 0x55CB, 0x55CC, 0x55CE, 0x55D1, 0x55D2,
+};
+const unsigned short euc_to_utf8_8FB6[] = {
+         0x55D3, 0x55D7, 0x55D8, 0x55DB, 0x55DE, 0x55E2, 0x55E9,
+ 0x55F6, 0x55FF, 0x5605, 0x5608, 0x560A, 0x560D, 0x560E, 0x560F,
+ 0x5610, 0x5611, 0x5612, 0x5619, 0x562C, 0x5630, 0x5633, 0x5635,
+ 0x5637, 0x5639, 0x563B, 0x563C, 0x563D, 0x563F, 0x5640, 0x5641,
+ 0x5643, 0x5644, 0x5646, 0x5649, 0x564B, 0x564D, 0x564F, 0x5654,
+ 0x565E, 0x5660, 0x5661, 0x5662, 0x5663, 0x5666, 0x5669, 0x566D,
+ 0x566F, 0x5671, 0x5672, 0x5675, 0x5684, 0x5685, 0x5688, 0x568B,
+ 0x568C, 0x5695, 0x5699, 0x569A, 0x569D, 0x569E, 0x569F, 0x56A6,
+ 0x56A7, 0x56A8, 0x56A9, 0x56AB, 0x56AC, 0x56AD, 0x56B1, 0x56B3,
+ 0x56B7, 0x56BE, 0x56C5, 0x56C9, 0x56CA, 0x56CB, 0x56CF, 0x56D0,
+ 0x56CC, 0x56CD, 0x56D9, 0x56DC, 0x56DD, 0x56DF, 0x56E1, 0x56E4,
+ 0x56E5, 0x56E6, 0x56E7, 0x56E8, 0x56F1, 0x56EB, 0x56ED,
+};
+const unsigned short euc_to_utf8_8FB7[] = {
+         0x56F6, 0x56F7, 0x5701, 0x5702, 0x5707, 0x570A, 0x570C,
+ 0x5711, 0x5715, 0x571A, 0x571B, 0x571D, 0x5720, 0x5722, 0x5723,
+ 0x5724, 0x5725, 0x5729, 0x572A, 0x572C, 0x572E, 0x572F, 0x5733,
+ 0x5734, 0x573D, 0x573E, 0x573F, 0x5745, 0x5746, 0x574C, 0x574D,
+ 0x5752, 0x5762, 0x5765, 0x5767, 0x5768, 0x576B, 0x576D, 0x576E,
+ 0x576F, 0x5770, 0x5771, 0x5773, 0x5774, 0x5775, 0x5777, 0x5779,
+ 0x577A, 0x577B, 0x577C, 0x577E, 0x5781, 0x5783, 0x578C, 0x5794,
+ 0x5797, 0x5799, 0x579A, 0x579C, 0x579D, 0x579E, 0x579F, 0x57A1,
+ 0x5795, 0x57A7, 0x57A8, 0x57A9, 0x57AC, 0x57B8, 0x57BD, 0x57C7,
+ 0x57C8, 0x57CC, 0x57CF, 0x57D5, 0x57DD, 0x57DE, 0x57E4, 0x57E6,
+ 0x57E7, 0x57E9, 0x57ED, 0x57F0, 0x57F5, 0x57F6, 0x57F8, 0x57FD,
+ 0x57FE, 0x57FF, 0x5803, 0x5804, 0x5808, 0x5809, 0x57E1,
+};
+const unsigned short euc_to_utf8_8FB8[] = {
+         0x580C, 0x580D, 0x581B, 0x581E, 0x581F, 0x5820, 0x5826,
+ 0x5827, 0x582D, 0x5832, 0x5839, 0x583F, 0x5849, 0x584C, 0x584D,
+ 0x584F, 0x5850, 0x5855, 0x585F, 0x5861, 0x5864, 0x5867, 0x5868,
+ 0x5878, 0x587C, 0x587F, 0x5880, 0x5881, 0x5887, 0x5888, 0x5889,
+ 0x588A, 0x588C, 0x588D, 0x588F, 0x5890, 0x5894, 0x5896, 0x589D,
+ 0x58A0, 0x58A1, 0x58A2, 0x58A6, 0x58A9, 0x58B1, 0x58B2, 0x58C4,
+ 0x58BC, 0x58C2, 0x58C8, 0x58CD, 0x58CE, 0x58D0, 0x58D2, 0x58D4,
+ 0x58D6, 0x58DA, 0x58DD, 0x58E1, 0x58E2, 0x58E9, 0x58F3, 0x5905,
+ 0x5906, 0x590B, 0x590C, 0x5912, 0x5913, 0x5914, 0x8641, 0x591D,
+ 0x5921, 0x5923, 0x5924, 0x5928, 0x592F, 0x5930, 0x5933, 0x5935,
+ 0x5936, 0x593F, 0x5943, 0x5946, 0x5952, 0x5953, 0x5959, 0x595B,
+ 0x595D, 0x595E, 0x595F, 0x5961, 0x5963, 0x596B, 0x596D,
+};
+const unsigned short euc_to_utf8_8FB9[] = {
+         0x596F, 0x5972, 0x5975, 0x5976, 0x5979, 0x597B, 0x597C,
+ 0x598B, 0x598C, 0x598E, 0x5992, 0x5995, 0x5997, 0x599F, 0x59A4,
+ 0x59A7, 0x59AD, 0x59AE, 0x59AF, 0x59B0, 0x59B3, 0x59B7, 0x59BA,
+ 0x59BC, 0x59C1, 0x59C3, 0x59C4, 0x59C8, 0x59CA, 0x59CD, 0x59D2,
+ 0x59DD, 0x59DE, 0x59DF, 0x59E3, 0x59E4, 0x59E7, 0x59EE, 0x59EF,
+ 0x59F1, 0x59F2, 0x59F4, 0x59F7, 0x5A00, 0x5A04, 0x5A0C, 0x5A0D,
+ 0x5A0E, 0x5A12, 0x5A13, 0x5A1E, 0x5A23, 0x5A24, 0x5A27, 0x5A28,
+ 0x5A2A, 0x5A2D, 0x5A30, 0x5A44, 0x5A45, 0x5A47, 0x5A48, 0x5A4C,
+ 0x5A50, 0x5A55, 0x5A5E, 0x5A63, 0x5A65, 0x5A67, 0x5A6D, 0x5A77,
+ 0x5A7A, 0x5A7B, 0x5A7E, 0x5A8B, 0x5A90, 0x5A93, 0x5A96, 0x5A99,
+ 0x5A9C, 0x5A9E, 0x5A9F, 0x5AA0, 0x5AA2, 0x5AA7, 0x5AAC, 0x5AB1,
+ 0x5AB2, 0x5AB3, 0x5AB5, 0x5AB8, 0x5ABA, 0x5ABB, 0x5ABF,
+};
+const unsigned short euc_to_utf8_8FBA[] = {
+         0x5AC4, 0x5AC6, 0x5AC8, 0x5ACF, 0x5ADA, 0x5ADC, 0x5AE0,
+ 0x5AE5, 0x5AEA, 0x5AEE, 0x5AF5, 0x5AF6, 0x5AFD, 0x5B00, 0x5B01,
+ 0x5B08, 0x5B17, 0x5B34, 0x5B19, 0x5B1B, 0x5B1D, 0x5B21, 0x5B25,
+ 0x5B2D, 0x5B38, 0x5B41, 0x5B4B, 0x5B4C, 0x5B52, 0x5B56, 0x5B5E,
+ 0x5B68, 0x5B6E, 0x5B6F, 0x5B7C, 0x5B7D, 0x5B7E, 0x5B7F, 0x5B81,
+ 0x5B84, 0x5B86, 0x5B8A, 0x5B8E, 0x5B90, 0x5B91, 0x5B93, 0x5B94,
+ 0x5B96, 0x5BA8, 0x5BA9, 0x5BAC, 0x5BAD, 0x5BAF, 0x5BB1, 0x5BB2,
+ 0x5BB7, 0x5BBA, 0x5BBC, 0x5BC0, 0x5BC1, 0x5BCD, 0x5BCF, 0x5BD6,
+ 0x5BD7, 0x5BD8, 0x5BD9, 0x5BDA, 0x5BE0, 0x5BEF, 0x5BF1, 0x5BF4,
+ 0x5BFD, 0x5C0C, 0x5C17, 0x5C1E, 0x5C1F, 0x5C23, 0x5C26, 0x5C29,
+ 0x5C2B, 0x5C2C, 0x5C2E, 0x5C30, 0x5C32, 0x5C35, 0x5C36, 0x5C59,
+ 0x5C5A, 0x5C5C, 0x5C62, 0x5C63, 0x5C67, 0x5C68, 0x5C69,
+};
+const unsigned short euc_to_utf8_8FBB[] = {
+         0x5C6D, 0x5C70, 0x5C74, 0x5C75, 0x5C7A, 0x5C7B, 0x5C7C,
+ 0x5C7D, 0x5C87, 0x5C88, 0x5C8A, 0x5C8F, 0x5C92, 0x5C9D, 0x5C9F,
+ 0x5CA0, 0x5CA2, 0x5CA3, 0x5CA6, 0x5CAA, 0x5CB2, 0x5CB4, 0x5CB5,
+ 0x5CBA, 0x5CC9, 0x5CCB, 0x5CD2, 0x5CDD, 0x5CD7, 0x5CEE, 0x5CF1,
+ 0x5CF2, 0x5CF4, 0x5D01, 0x5D06, 0x5D0D, 0x5D12, 0x5D2B, 0x5D23,
+ 0x5D24, 0x5D26, 0x5D27, 0x5D31, 0x5D34, 0x5D39, 0x5D3D, 0x5D3F,
+ 0x5D42, 0x5D43, 0x5D46, 0x5D48, 0x5D55, 0x5D51, 0x5D59, 0x5D4A,
+ 0x5D5F, 0x5D60, 0x5D61, 0x5D62, 0x5D64, 0x5D6A, 0x5D6D, 0x5D70,
+ 0x5D79, 0x5D7A, 0x5D7E, 0x5D7F, 0x5D81, 0x5D83, 0x5D88, 0x5D8A,
+ 0x5D92, 0x5D93, 0x5D94, 0x5D95, 0x5D99, 0x5D9B, 0x5D9F, 0x5DA0,
+ 0x5DA7, 0x5DAB, 0x5DB0, 0x5DB4, 0x5DB8, 0x5DB9, 0x5DC3, 0x5DC7,
+ 0x5DCB, 0x5DD0, 0x5DCE, 0x5DD8, 0x5DD9, 0x5DE0, 0x5DE4,
+};
+const unsigned short euc_to_utf8_8FBC[] = {
+         0x5DE9, 0x5DF8, 0x5DF9, 0x5E00, 0x5E07, 0x5E0D, 0x5E12,
+ 0x5E14, 0x5E15, 0x5E18, 0x5E1F, 0x5E20, 0x5E2E, 0x5E28, 0x5E32,
+ 0x5E35, 0x5E3E, 0x5E4B, 0x5E50, 0x5E49, 0x5E51, 0x5E56, 0x5E58,
+ 0x5E5B, 0x5E5C, 0x5E5E, 0x5E68, 0x5E6A, 0x5E6B, 0x5E6C, 0x5E6D,
+ 0x5E6E, 0x5E70, 0x5E80, 0x5E8B, 0x5E8E, 0x5EA2, 0x5EA4, 0x5EA5,
+ 0x5EA8, 0x5EAA, 0x5EAC, 0x5EB1, 0x5EB3, 0x5EBD, 0x5EBE, 0x5EBF,
+ 0x5EC6, 0x5ECC, 0x5ECB, 0x5ECE, 0x5ED1, 0x5ED2, 0x5ED4, 0x5ED5,
+ 0x5EDC, 0x5EDE, 0x5EE5, 0x5EEB, 0x5F02, 0x5F06, 0x5F07, 0x5F08,
+ 0x5F0E, 0x5F19, 0x5F1C, 0x5F1D, 0x5F21, 0x5F22, 0x5F23, 0x5F24,
+ 0x5F28, 0x5F2B, 0x5F2C, 0x5F2E, 0x5F30, 0x5F34, 0x5F36, 0x5F3B,
+ 0x5F3D, 0x5F3F, 0x5F40, 0x5F44, 0x5F45, 0x5F47, 0x5F4D, 0x5F50,
+ 0x5F54, 0x5F58, 0x5F5B, 0x5F60, 0x5F63, 0x5F64, 0x5F67,
+};
+const unsigned short euc_to_utf8_8FBD[] = {
+         0x5F6F, 0x5F72, 0x5F74, 0x5F75, 0x5F78, 0x5F7A, 0x5F7D,
+ 0x5F7E, 0x5F89, 0x5F8D, 0x5F8F, 0x5F96, 0x5F9C, 0x5F9D, 0x5FA2,
+ 0x5FA7, 0x5FAB, 0x5FA4, 0x5FAC, 0x5FAF, 0x5FB0, 0x5FB1, 0x5FB8,
+ 0x5FC4, 0x5FC7, 0x5FC8, 0x5FC9, 0x5FCB, 0x5FD0, 0x5FD1, 0x5FD2,
+ 0x5FD3, 0x5FD4, 0x5FDE, 0x5FE1, 0x5FE2, 0x5FE8, 0x5FE9, 0x5FEA,
+ 0x5FEC, 0x5FED, 0x5FEE, 0x5FEF, 0x5FF2, 0x5FF3, 0x5FF6, 0x5FFA,
+ 0x5FFC, 0x6007, 0x600A, 0x600D, 0x6013, 0x6014, 0x6017, 0x6018,
+ 0x601A, 0x601F, 0x6024, 0x602D, 0x6033, 0x6035, 0x6040, 0x6047,
+ 0x6048, 0x6049, 0x604C, 0x6051, 0x6054, 0x6056, 0x6057, 0x605D,
+ 0x6061, 0x6067, 0x6071, 0x607E, 0x607F, 0x6082, 0x6086, 0x6088,
+ 0x608A, 0x608E, 0x6091, 0x6093, 0x6095, 0x6098, 0x609D, 0x609E,
+ 0x60A2, 0x60A4, 0x60A5, 0x60A8, 0x60B0, 0x60B1, 0x60B7,
+};
+const unsigned short euc_to_utf8_8FBE[] = {
+         0x60BB, 0x60BE, 0x60C2, 0x60C4, 0x60C8, 0x60C9, 0x60CA,
+ 0x60CB, 0x60CE, 0x60CF, 0x60D4, 0x60D5, 0x60D9, 0x60DB, 0x60DD,
+ 0x60DE, 0x60E2, 0x60E5, 0x60F2, 0x60F5, 0x60F8, 0x60FC, 0x60FD,
+ 0x6102, 0x6107, 0x610A, 0x610C, 0x6110, 0x6111, 0x6112, 0x6113,
+ 0x6114, 0x6116, 0x6117, 0x6119, 0x611C, 0x611E, 0x6122, 0x612A,
+ 0x612B, 0x6130, 0x6131, 0x6135, 0x6136, 0x6137, 0x6139, 0x6141,
+ 0x6145, 0x6146, 0x6149, 0x615E, 0x6160, 0x616C, 0x6172, 0x6178,
+ 0x617B, 0x617C, 0x617F, 0x6180, 0x6181, 0x6183, 0x6184, 0x618B,
+ 0x618D, 0x6192, 0x6193, 0x6197, 0x6198, 0x619C, 0x619D, 0x619F,
+ 0x61A0, 0x61A5, 0x61A8, 0x61AA, 0x61AD, 0x61B8, 0x61B9, 0x61BC,
+ 0x61C0, 0x61C1, 0x61C2, 0x61CE, 0x61CF, 0x61D5, 0x61DC, 0x61DD,
+ 0x61DE, 0x61DF, 0x61E1, 0x61E2, 0x61E7, 0x61E9, 0x61E5,
+};
+const unsigned short euc_to_utf8_8FBF[] = {
+         0x61EC, 0x61ED, 0x61EF, 0x6201, 0x6203, 0x6204, 0x6207,
+ 0x6213, 0x6215, 0x621C, 0x6220, 0x6222, 0x6223, 0x6227, 0x6229,
+ 0x622B, 0x6239, 0x623D, 0x6242, 0x6243, 0x6244, 0x6246, 0x624C,
+ 0x6250, 0x6251, 0x6252, 0x6254, 0x6256, 0x625A, 0x625C, 0x6264,
+ 0x626D, 0x626F, 0x6273, 0x627A, 0x627D, 0x628D, 0x628E, 0x628F,
+ 0x6290, 0x62A6, 0x62A8, 0x62B3, 0x62B6, 0x62B7, 0x62BA, 0x62BE,
+ 0x62BF, 0x62C4, 0x62CE, 0x62D5, 0x62D6, 0x62DA, 0x62EA, 0x62F2,
+ 0x62F4, 0x62FC, 0x62FD, 0x6303, 0x6304, 0x630A, 0x630B, 0x630D,
+ 0x6310, 0x6313, 0x6316, 0x6318, 0x6329, 0x632A, 0x632D, 0x6335,
+ 0x6336, 0x6339, 0x633C, 0x6341, 0x6342, 0x6343, 0x6344, 0x6346,
+ 0x634A, 0x634B, 0x634E, 0x6352, 0x6353, 0x6354, 0x6358, 0x635B,
+ 0x6365, 0x6366, 0x636C, 0x636D, 0x6371, 0x6374, 0x6375,
+};
+const unsigned short euc_to_utf8_8FC0[] = {
+         0x6378, 0x637C, 0x637D, 0x637F, 0x6382, 0x6384, 0x6387,
+ 0x638A, 0x6390, 0x6394, 0x6395, 0x6399, 0x639A, 0x639E, 0x63A4,
+ 0x63A6, 0x63AD, 0x63AE, 0x63AF, 0x63BD, 0x63C1, 0x63C5, 0x63C8,
+ 0x63CE, 0x63D1, 0x63D3, 0x63D4, 0x63D5, 0x63DC, 0x63E0, 0x63E5,
+ 0x63EA, 0x63EC, 0x63F2, 0x63F3, 0x63F5, 0x63F8, 0x63F9, 0x6409,
+ 0x640A, 0x6410, 0x6412, 0x6414, 0x6418, 0x641E, 0x6420, 0x6422,
+ 0x6424, 0x6425, 0x6429, 0x642A, 0x642F, 0x6430, 0x6435, 0x643D,
+ 0x643F, 0x644B, 0x644F, 0x6451, 0x6452, 0x6453, 0x6454, 0x645A,
+ 0x645B, 0x645C, 0x645D, 0x645F, 0x6460, 0x6461, 0x6463, 0x646D,
+ 0x6473, 0x6474, 0x647B, 0x647D, 0x6485, 0x6487, 0x648F, 0x6490,
+ 0x6491, 0x6498, 0x6499, 0x649B, 0x649D, 0x649F, 0x64A1, 0x64A3,
+ 0x64A6, 0x64A8, 0x64AC, 0x64B3, 0x64BD, 0x64BE, 0x64BF,
+};
+const unsigned short euc_to_utf8_8FC1[] = {
+         0x64C4, 0x64C9, 0x64CA, 0x64CB, 0x64CC, 0x64CE, 0x64D0,
+ 0x64D1, 0x64D5, 0x64D7, 0x64E4, 0x64E5, 0x64E9, 0x64EA, 0x64ED,
+ 0x64F0, 0x64F5, 0x64F7, 0x64FB, 0x64FF, 0x6501, 0x6504, 0x6508,
+ 0x6509, 0x650A, 0x650F, 0x6513, 0x6514, 0x6516, 0x6519, 0x651B,
+ 0x651E, 0x651F, 0x6522, 0x6526, 0x6529, 0x652E, 0x6531, 0x653A,
+ 0x653C, 0x653D, 0x6543, 0x6547, 0x6549, 0x6550, 0x6552, 0x6554,
+ 0x655F, 0x6560, 0x6567, 0x656B, 0x657A, 0x657D, 0x6581, 0x6585,
+ 0x658A, 0x6592, 0x6595, 0x6598, 0x659D, 0x65A0, 0x65A3, 0x65A6,
+ 0x65AE, 0x65B2, 0x65B3, 0x65B4, 0x65BF, 0x65C2, 0x65C8, 0x65C9,
+ 0x65CE, 0x65D0, 0x65D4, 0x65D6, 0x65D8, 0x65DF, 0x65F0, 0x65F2,
+ 0x65F4, 0x65F5, 0x65F9, 0x65FE, 0x65FF, 0x6600, 0x6604, 0x6608,
+ 0x6609, 0x660D, 0x6611, 0x6612, 0x6615, 0x6616, 0x661D,
+};
+const unsigned short euc_to_utf8_8FC2[] = {
+         0x661E, 0x6621, 0x6622, 0x6623, 0x6624, 0x6626, 0x6629,
+ 0x662A, 0x662B, 0x662C, 0x662E, 0x6630, 0x6631, 0x6633, 0x6639,
+ 0x6637, 0x6640, 0x6645, 0x6646, 0x664A, 0x664C, 0x6651, 0x664E,
+ 0x6657, 0x6658, 0x6659, 0x665B, 0x665C, 0x6660, 0x6661, 0x66FB,
+ 0x666A, 0x666B, 0x666C, 0x667E, 0x6673, 0x6675, 0x667F, 0x6677,
+ 0x6678, 0x6679, 0x667B, 0x6680, 0x667C, 0x668B, 0x668C, 0x668D,
+ 0x6690, 0x6692, 0x6699, 0x669A, 0x669B, 0x669C, 0x669F, 0x66A0,
+ 0x66A4, 0x66AD, 0x66B1, 0x66B2, 0x66B5, 0x66BB, 0x66BF, 0x66C0,
+ 0x66C2, 0x66C3, 0x66C8, 0x66CC, 0x66CE, 0x66CF, 0x66D4, 0x66DB,
+ 0x66DF, 0x66E8, 0x66EB, 0x66EC, 0x66EE, 0x66FA, 0x6705, 0x6707,
+ 0x670E, 0x6713, 0x6719, 0x671C, 0x6720, 0x6722, 0x6733, 0x673E,
+ 0x6745, 0x6747, 0x6748, 0x674C, 0x6754, 0x6755, 0x675D,
+};
+const unsigned short euc_to_utf8_8FC3[] = {
+         0x6766, 0x676C, 0x676E, 0x6774, 0x6776, 0x677B, 0x6781,
+ 0x6784, 0x678E, 0x678F, 0x6791, 0x6793, 0x6796, 0x6798, 0x6799,
+ 0x679B, 0x67B0, 0x67B1, 0x67B2, 0x67B5, 0x67BB, 0x67BC, 0x67BD,
+ 0x67F9, 0x67C0, 0x67C2, 0x67C3, 0x67C5, 0x67C8, 0x67C9, 0x67D2,
+ 0x67D7, 0x67D9, 0x67DC, 0x67E1, 0x67E6, 0x67F0, 0x67F2, 0x67F6,
+ 0x67F7, 0x6852, 0x6814, 0x6819, 0x681D, 0x681F, 0x6828, 0x6827,
+ 0x682C, 0x682D, 0x682F, 0x6830, 0x6831, 0x6833, 0x683B, 0x683F,
+ 0x6844, 0x6845, 0x684A, 0x684C, 0x6855, 0x6857, 0x6858, 0x685B,
+ 0x686B, 0x686E, 0x686F, 0x6870, 0x6871, 0x6872, 0x6875, 0x6879,
+ 0x687A, 0x687B, 0x687C, 0x6882, 0x6884, 0x6886, 0x6888, 0x6896,
+ 0x6898, 0x689A, 0x689C, 0x68A1, 0x68A3, 0x68A5, 0x68A9, 0x68AA,
+ 0x68AE, 0x68B2, 0x68BB, 0x68C5, 0x68C8, 0x68CC, 0x68CF,
+};
+const unsigned short euc_to_utf8_8FC4[] = {
+         0x68D0, 0x68D1, 0x68D3, 0x68D6, 0x68D9, 0x68DC, 0x68DD,
+ 0x68E5, 0x68E8, 0x68EA, 0x68EB, 0x68EC, 0x68ED, 0x68F0, 0x68F1,
+ 0x68F5, 0x68F6, 0x68FB, 0x68FC, 0x68FD, 0x6906, 0x6909, 0x690A,
+ 0x6910, 0x6911, 0x6913, 0x6916, 0x6917, 0x6931, 0x6933, 0x6935,
+ 0x6938, 0x693B, 0x6942, 0x6945, 0x6949, 0x694E, 0x6957, 0x695B,
+ 0x6963, 0x6964, 0x6965, 0x6966, 0x6968, 0x6969, 0x696C, 0x6970,
+ 0x6971, 0x6972, 0x697A, 0x697B, 0x697F, 0x6980, 0x698D, 0x6992,
+ 0x6996, 0x6998, 0x69A1, 0x69A5, 0x69A6, 0x69A8, 0x69AB, 0x69AD,
+ 0x69AF, 0x69B7, 0x69B8, 0x69BA, 0x69BC, 0x69C5, 0x69C8, 0x69D1,
+ 0x69D6, 0x69D7, 0x69E2, 0x69E5, 0x69EE, 0x69EF, 0x69F1, 0x69F3,
+ 0x69F5, 0x69FE, 0x6A00, 0x6A01, 0x6A03, 0x6A0F, 0x6A11, 0x6A15,
+ 0x6A1A, 0x6A1D, 0x6A20, 0x6A24, 0x6A28, 0x6A30, 0x6A32,
+};
+const unsigned short euc_to_utf8_8FC5[] = {
+         0x6A34, 0x6A37, 0x6A3B, 0x6A3E, 0x6A3F, 0x6A45, 0x6A46,
+ 0x6A49, 0x6A4A, 0x6A4E, 0x6A50, 0x6A51, 0x6A52, 0x6A55, 0x6A56,
+ 0x6A5B, 0x6A64, 0x6A67, 0x6A6A, 0x6A71, 0x6A73, 0x6A7E, 0x6A81,
+ 0x6A83, 0x6A86, 0x6A87, 0x6A89, 0x6A8B, 0x6A91, 0x6A9B, 0x6A9D,
+ 0x6A9E, 0x6A9F, 0x6AA5, 0x6AAB, 0x6AAF, 0x6AB0, 0x6AB1, 0x6AB4,
+ 0x6ABD, 0x6ABE, 0x6ABF, 0x6AC6, 0x6AC9, 0x6AC8, 0x6ACC, 0x6AD0,
+ 0x6AD4, 0x6AD5, 0x6AD6, 0x6ADC, 0x6ADD, 0x6AE4, 0x6AE7, 0x6AEC,
+ 0x6AF0, 0x6AF1, 0x6AF2, 0x6AFC, 0x6AFD, 0x6B02, 0x6B03, 0x6B06,
+ 0x6B07, 0x6B09, 0x6B0F, 0x6B10, 0x6B11, 0x6B17, 0x6B1B, 0x6B1E,
+ 0x6B24, 0x6B28, 0x6B2B, 0x6B2C, 0x6B2F, 0x6B35, 0x6B36, 0x6B3B,
+ 0x6B3F, 0x6B46, 0x6B4A, 0x6B4D, 0x6B52, 0x6B56, 0x6B58, 0x6B5D,
+ 0x6B60, 0x6B67, 0x6B6B, 0x6B6E, 0x6B70, 0x6B75, 0x6B7D,
+};
+const unsigned short euc_to_utf8_8FC6[] = {
+         0x6B7E, 0x6B82, 0x6B85, 0x6B97, 0x6B9B, 0x6B9F, 0x6BA0,
+ 0x6BA2, 0x6BA3, 0x6BA8, 0x6BA9, 0x6BAC, 0x6BAD, 0x6BAE, 0x6BB0,
+ 0x6BB8, 0x6BB9, 0x6BBD, 0x6BBE, 0x6BC3, 0x6BC4, 0x6BC9, 0x6BCC,
+ 0x6BD6, 0x6BDA, 0x6BE1, 0x6BE3, 0x6BE6, 0x6BE7, 0x6BEE, 0x6BF1,
+ 0x6BF7, 0x6BF9, 0x6BFF, 0x6C02, 0x6C04, 0x6C05, 0x6C09, 0x6C0D,
+ 0x6C0E, 0x6C10, 0x6C12, 0x6C19, 0x6C1F, 0x6C26, 0x6C27, 0x6C28,
+ 0x6C2C, 0x6C2E, 0x6C33, 0x6C35, 0x6C36, 0x6C3A, 0x6C3B, 0x6C3F,
+ 0x6C4A, 0x6C4B, 0x6C4D, 0x6C4F, 0x6C52, 0x6C54, 0x6C59, 0x6C5B,
+ 0x6C5C, 0x6C6B, 0x6C6D, 0x6C6F, 0x6C74, 0x6C76, 0x6C78, 0x6C79,
+ 0x6C7B, 0x6C85, 0x6C86, 0x6C87, 0x6C89, 0x6C94, 0x6C95, 0x6C97,
+ 0x6C98, 0x6C9C, 0x6C9F, 0x6CB0, 0x6CB2, 0x6CB4, 0x6CC2, 0x6CC6,
+ 0x6CCD, 0x6CCF, 0x6CD0, 0x6CD1, 0x6CD2, 0x6CD4, 0x6CD6,
+};
+const unsigned short euc_to_utf8_8FC7[] = {
+         0x6CDA, 0x6CDC, 0x6CE0, 0x6CE7, 0x6CE9, 0x6CEB, 0x6CEC,
+ 0x6CEE, 0x6CF2, 0x6CF4, 0x6D04, 0x6D07, 0x6D0A, 0x6D0E, 0x6D0F,
+ 0x6D11, 0x6D13, 0x6D1A, 0x6D26, 0x6D27, 0x6D28, 0x6C67, 0x6D2E,
+ 0x6D2F, 0x6D31, 0x6D39, 0x6D3C, 0x6D3F, 0x6D57, 0x6D5E, 0x6D5F,
+ 0x6D61, 0x6D65, 0x6D67, 0x6D6F, 0x6D70, 0x6D7C, 0x6D82, 0x6D87,
+ 0x6D91, 0x6D92, 0x6D94, 0x6D96, 0x6D97, 0x6D98, 0x6DAA, 0x6DAC,
+ 0x6DB4, 0x6DB7, 0x6DB9, 0x6DBD, 0x6DBF, 0x6DC4, 0x6DC8, 0x6DCA,
+ 0x6DCE, 0x6DCF, 0x6DD6, 0x6DDB, 0x6DDD, 0x6DDF, 0x6DE0, 0x6DE2,
+ 0x6DE5, 0x6DE9, 0x6DEF, 0x6DF0, 0x6DF4, 0x6DF6, 0x6DFC, 0x6E00,
+ 0x6E04, 0x6E1E, 0x6E22, 0x6E27, 0x6E32, 0x6E36, 0x6E39, 0x6E3B,
+ 0x6E3C, 0x6E44, 0x6E45, 0x6E48, 0x6E49, 0x6E4B, 0x6E4F, 0x6E51,
+ 0x6E52, 0x6E53, 0x6E54, 0x6E57, 0x6E5C, 0x6E5D, 0x6E5E,
+};
+const unsigned short euc_to_utf8_8FC8[] = {
+         0x6E62, 0x6E63, 0x6E68, 0x6E73, 0x6E7B, 0x6E7D, 0x6E8D,
+ 0x6E93, 0x6E99, 0x6EA0, 0x6EA7, 0x6EAD, 0x6EAE, 0x6EB1, 0x6EB3,
+ 0x6EBB, 0x6EBF, 0x6EC0, 0x6EC1, 0x6EC3, 0x6EC7, 0x6EC8, 0x6ECA,
+ 0x6ECD, 0x6ECE, 0x6ECF, 0x6EEB, 0x6EED, 0x6EEE, 0x6EF9, 0x6EFB,
+ 0x6EFD, 0x6F04, 0x6F08, 0x6F0A, 0x6F0C, 0x6F0D, 0x6F16, 0x6F18,
+ 0x6F1A, 0x6F1B, 0x6F26, 0x6F29, 0x6F2A, 0x6F2F, 0x6F30, 0x6F33,
+ 0x6F36, 0x6F3B, 0x6F3C, 0x6F2D, 0x6F4F, 0x6F51, 0x6F52, 0x6F53,
+ 0x6F57, 0x6F59, 0x6F5A, 0x6F5D, 0x6F5E, 0x6F61, 0x6F62, 0x6F68,
+ 0x6F6C, 0x6F7D, 0x6F7E, 0x6F83, 0x6F87, 0x6F88, 0x6F8B, 0x6F8C,
+ 0x6F8D, 0x6F90, 0x6F92, 0x6F93, 0x6F94, 0x6F96, 0x6F9A, 0x6F9F,
+ 0x6FA0, 0x6FA5, 0x6FA6, 0x6FA7, 0x6FA8, 0x6FAE, 0x6FAF, 0x6FB0,
+ 0x6FB5, 0x6FB6, 0x6FBC, 0x6FC5, 0x6FC7, 0x6FC8, 0x6FCA,
+};
+const unsigned short euc_to_utf8_8FC9[] = {
+         0x6FDA, 0x6FDE, 0x6FE8, 0x6FE9, 0x6FF0, 0x6FF5, 0x6FF9,
+ 0x6FFC, 0x6FFD, 0x7000, 0x7005, 0x7006, 0x7007, 0x700D, 0x7017,
+ 0x7020, 0x7023, 0x702F, 0x7034, 0x7037, 0x7039, 0x703C, 0x7043,
+ 0x7044, 0x7048, 0x7049, 0x704A, 0x704B, 0x7054, 0x7055, 0x705D,
+ 0x705E, 0x704E, 0x7064, 0x7065, 0x706C, 0x706E, 0x7075, 0x7076,
+ 0x707E, 0x7081, 0x7085, 0x7086, 0x7094, 0x7095, 0x7096, 0x7097,
+ 0x7098, 0x709B, 0x70A4, 0x70AB, 0x70B0, 0x70B1, 0x70B4, 0x70B7,
+ 0x70CA, 0x70D1, 0x70D3, 0x70D4, 0x70D5, 0x70D6, 0x70D8, 0x70DC,
+ 0x70E4, 0x70FA, 0x7103, 0x7104, 0x7105, 0x7106, 0x7107, 0x710B,
+ 0x710C, 0x710F, 0x711E, 0x7120, 0x712B, 0x712D, 0x712F, 0x7130,
+ 0x7131, 0x7138, 0x7141, 0x7145, 0x7146, 0x7147, 0x714A, 0x714B,
+ 0x7150, 0x7152, 0x7157, 0x715A, 0x715C, 0x715E, 0x7160,
+};
+const unsigned short euc_to_utf8_8FCA[] = {
+         0x7168, 0x7179, 0x7180, 0x7185, 0x7187, 0x718C, 0x7192,
+ 0x719A, 0x719B, 0x71A0, 0x71A2, 0x71AF, 0x71B0, 0x71B2, 0x71B3,
+ 0x71BA, 0x71BF, 0x71C0, 0x71C1, 0x71C4, 0x71CB, 0x71CC, 0x71D3,
+ 0x71D6, 0x71D9, 0x71DA, 0x71DC, 0x71F8, 0x71FE, 0x7200, 0x7207,
+ 0x7208, 0x7209, 0x7213, 0x7217, 0x721A, 0x721D, 0x721F, 0x7224,
+ 0x722B, 0x722F, 0x7234, 0x7238, 0x7239, 0x7241, 0x7242, 0x7243,
+ 0x7245, 0x724E, 0x724F, 0x7250, 0x7253, 0x7255, 0x7256, 0x725A,
+ 0x725C, 0x725E, 0x7260, 0x7263, 0x7268, 0x726B, 0x726E, 0x726F,
+ 0x7271, 0x7277, 0x7278, 0x727B, 0x727C, 0x727F, 0x7284, 0x7289,
+ 0x728D, 0x728E, 0x7293, 0x729B, 0x72A8, 0x72AD, 0x72AE, 0x72B1,
+ 0x72B4, 0x72BE, 0x72C1, 0x72C7, 0x72C9, 0x72CC, 0x72D5, 0x72D6,
+ 0x72D8, 0x72DF, 0x72E5, 0x72F3, 0x72F4, 0x72FA, 0x72FB,
+};
+const unsigned short euc_to_utf8_8FCB[] = {
+         0x72FE, 0x7302, 0x7304, 0x7305, 0x7307, 0x730B, 0x730D,
+ 0x7312, 0x7313, 0x7318, 0x7319, 0x731E, 0x7322, 0x7324, 0x7327,
+ 0x7328, 0x732C, 0x7331, 0x7332, 0x7335, 0x733A, 0x733B, 0x733D,
+ 0x7343, 0x734D, 0x7350, 0x7352, 0x7356, 0x7358, 0x735D, 0x735E,
+ 0x735F, 0x7360, 0x7366, 0x7367, 0x7369, 0x736B, 0x736C, 0x736E,
+ 0x736F, 0x7371, 0x7377, 0x7379, 0x737C, 0x7380, 0x7381, 0x7383,
+ 0x7385, 0x7386, 0x738E, 0x7390, 0x7393, 0x7395, 0x7397, 0x7398,
+ 0x739C, 0x739E, 0x739F, 0x73A0, 0x73A2, 0x73A5, 0x73A6, 0x73AA,
+ 0x73AB, 0x73AD, 0x73B5, 0x73B7, 0x73B9, 0x73BC, 0x73BD, 0x73BF,
+ 0x73C5, 0x73C6, 0x73C9, 0x73CB, 0x73CC, 0x73CF, 0x73D2, 0x73D3,
+ 0x73D6, 0x73D9, 0x73DD, 0x73E1, 0x73E3, 0x73E6, 0x73E7, 0x73E9,
+ 0x73F4, 0x73F5, 0x73F7, 0x73F9, 0x73FA, 0x73FB, 0x73FD,
+};
+const unsigned short euc_to_utf8_8FCC[] = {
+         0x73FF, 0x7400, 0x7401, 0x7404, 0x7407, 0x740A, 0x7411,
+ 0x741A, 0x741B, 0x7424, 0x7426, 0x7428, 0x7429, 0x742A, 0x742B,
+ 0x742C, 0x742D, 0x742E, 0x742F, 0x7430, 0x7431, 0x7439, 0x7440,
+ 0x7443, 0x7444, 0x7446, 0x7447, 0x744B, 0x744D, 0x7451, 0x7452,
+ 0x7457, 0x745D, 0x7462, 0x7466, 0x7467, 0x7468, 0x746B, 0x746D,
+ 0x746E, 0x7471, 0x7472, 0x7480, 0x7481, 0x7485, 0x7486, 0x7487,
+ 0x7489, 0x748F, 0x7490, 0x7491, 0x7492, 0x7498, 0x7499, 0x749A,
+ 0x749C, 0x749F, 0x74A0, 0x74A1, 0x74A3, 0x74A6, 0x74A8, 0x74A9,
+ 0x74AA, 0x74AB, 0x74AE, 0x74AF, 0x74B1, 0x74B2, 0x74B5, 0x74B9,
+ 0x74BB, 0x74BF, 0x74C8, 0x74C9, 0x74CC, 0x74D0, 0x74D3, 0x74D8,
+ 0x74DA, 0x74DB, 0x74DE, 0x74DF, 0x74E4, 0x74E8, 0x74EA, 0x74EB,
+ 0x74EF, 0x74F4, 0x74FA, 0x74FB, 0x74FC, 0x74FF, 0x7506,
+};
+const unsigned short euc_to_utf8_8FCD[] = {
+         0x7512, 0x7516, 0x7517, 0x7520, 0x7521, 0x7524, 0x7527,
+ 0x7529, 0x752A, 0x752F, 0x7536, 0x7539, 0x753D, 0x753E, 0x753F,
+ 0x7540, 0x7543, 0x7547, 0x7548, 0x754E, 0x7550, 0x7552, 0x7557,
+ 0x755E, 0x755F, 0x7561, 0x756F, 0x7571, 0x7579, 0x757A, 0x757B,
+ 0x757C, 0x757D, 0x757E, 0x7581, 0x7585, 0x7590, 0x7592, 0x7593,
+ 0x7595, 0x7599, 0x759C, 0x75A2, 0x75A4, 0x75B4, 0x75BA, 0x75BF,
+ 0x75C0, 0x75C1, 0x75C4, 0x75C6, 0x75CC, 0x75CE, 0x75CF, 0x75D7,
+ 0x75DC, 0x75DF, 0x75E0, 0x75E1, 0x75E4, 0x75E7, 0x75EC, 0x75EE,
+ 0x75EF, 0x75F1, 0x75F9, 0x7600, 0x7602, 0x7603, 0x7604, 0x7607,
+ 0x7608, 0x760A, 0x760C, 0x760F, 0x7612, 0x7613, 0x7615, 0x7616,
+ 0x7619, 0x761B, 0x761C, 0x761D, 0x761E, 0x7623, 0x7625, 0x7626,
+ 0x7629, 0x762D, 0x7632, 0x7633, 0x7635, 0x7638, 0x7639,
+};
+const unsigned short euc_to_utf8_8FCE[] = {
+         0x763A, 0x763C, 0x764A, 0x7640, 0x7641, 0x7643, 0x7644,
+ 0x7645, 0x7649, 0x764B, 0x7655, 0x7659, 0x765F, 0x7664, 0x7665,
+ 0x766D, 0x766E, 0x766F, 0x7671, 0x7674, 0x7681, 0x7685, 0x768C,
+ 0x768D, 0x7695, 0x769B, 0x769C, 0x769D, 0x769F, 0x76A0, 0x76A2,
+ 0x76A3, 0x76A4, 0x76A5, 0x76A6, 0x76A7, 0x76A8, 0x76AA, 0x76AD,
+ 0x76BD, 0x76C1, 0x76C5, 0x76C9, 0x76CB, 0x76CC, 0x76CE, 0x76D4,
+ 0x76D9, 0x76E0, 0x76E6, 0x76E8, 0x76EC, 0x76F0, 0x76F1, 0x76F6,
+ 0x76F9, 0x76FC, 0x7700, 0x7706, 0x770A, 0x770E, 0x7712, 0x7714,
+ 0x7715, 0x7717, 0x7719, 0x771A, 0x771C, 0x7722, 0x7728, 0x772D,
+ 0x772E, 0x772F, 0x7734, 0x7735, 0x7736, 0x7739, 0x773D, 0x773E,
+ 0x7742, 0x7745, 0x7746, 0x774A, 0x774D, 0x774E, 0x774F, 0x7752,
+ 0x7756, 0x7757, 0x775C, 0x775E, 0x775F, 0x7760, 0x7762,
+};
+const unsigned short euc_to_utf8_8FCF[] = {
+         0x7764, 0x7767, 0x776A, 0x776C, 0x7770, 0x7772, 0x7773,
+ 0x7774, 0x777A, 0x777D, 0x7780, 0x7784, 0x778C, 0x778D, 0x7794,
+ 0x7795, 0x7796, 0x779A, 0x779F, 0x77A2, 0x77A7, 0x77AA, 0x77AE,
+ 0x77AF, 0x77B1, 0x77B5, 0x77BE, 0x77C3, 0x77C9, 0x77D1, 0x77D2,
+ 0x77D5, 0x77D9, 0x77DE, 0x77DF, 0x77E0, 0x77E4, 0x77E6, 0x77EA,
+ 0x77EC, 0x77F0, 0x77F1, 0x77F4, 0x77F8, 0x77FB, 0x7805, 0x7806,
+ 0x7809, 0x780D, 0x780E, 0x7811, 0x781D, 0x7821, 0x7822, 0x7823,
+ 0x782D, 0x782E, 0x7830, 0x7835, 0x7837, 0x7843, 0x7844, 0x7847,
+ 0x7848, 0x784C, 0x784E, 0x7852, 0x785C, 0x785E, 0x7860, 0x7861,
+ 0x7863, 0x7864, 0x7868, 0x786A, 0x786E, 0x787A, 0x787E, 0x788A,
+ 0x788F, 0x7894, 0x7898, 0x78A1, 0x789D, 0x789E, 0x789F, 0x78A4,
+ 0x78A8, 0x78AC, 0x78AD, 0x78B0, 0x78B1, 0x78B2, 0x78B3,
+};
+const unsigned short euc_to_utf8_8FD0[] = {
+         0x78BB, 0x78BD, 0x78BF, 0x78C7, 0x78C8, 0x78C9, 0x78CC,
+ 0x78CE, 0x78D2, 0x78D3, 0x78D5, 0x78D6, 0x78E4, 0x78DB, 0x78DF,
+ 0x78E0, 0x78E1, 0x78E6, 0x78EA, 0x78F2, 0x78F3, 0x7900, 0x78F6,
+ 0x78F7, 0x78FA, 0x78FB, 0x78FF, 0x7906, 0x790C, 0x7910, 0x791A,
+ 0x791C, 0x791E, 0x791F, 0x7920, 0x7925, 0x7927, 0x7929, 0x792D,
+ 0x7931, 0x7934, 0x7935, 0x793B, 0x793D, 0x793F, 0x7944, 0x7945,
+ 0x7946, 0x794A, 0x794B, 0x794F, 0x7951, 0x7954, 0x7958, 0x795B,
+ 0x795C, 0x7967, 0x7969, 0x796B, 0x7972, 0x7979, 0x797B, 0x797C,
+ 0x797E, 0x798B, 0x798C, 0x7991, 0x7993, 0x7994, 0x7995, 0x7996,
+ 0x7998, 0x799B, 0x799C, 0x79A1, 0x79A8, 0x79A9, 0x79AB, 0x79AF,
+ 0x79B1, 0x79B4, 0x79B8, 0x79BB, 0x79C2, 0x79C4, 0x79C7, 0x79C8,
+ 0x79CA, 0x79CF, 0x79D4, 0x79D6, 0x79DA, 0x79DD, 0x79DE,
+};
+const unsigned short euc_to_utf8_8FD1[] = {
+         0x79E0, 0x79E2, 0x79E5, 0x79EA, 0x79EB, 0x79ED, 0x79F1,
+ 0x79F8, 0x79FC, 0x7A02, 0x7A03, 0x7A07, 0x7A09, 0x7A0A, 0x7A0C,
+ 0x7A11, 0x7A15, 0x7A1B, 0x7A1E, 0x7A21, 0x7A27, 0x7A2B, 0x7A2D,
+ 0x7A2F, 0x7A30, 0x7A34, 0x7A35, 0x7A38, 0x7A39, 0x7A3A, 0x7A44,
+ 0x7A45, 0x7A47, 0x7A48, 0x7A4C, 0x7A55, 0x7A56, 0x7A59, 0x7A5C,
+ 0x7A5D, 0x7A5F, 0x7A60, 0x7A65, 0x7A67, 0x7A6A, 0x7A6D, 0x7A75,
+ 0x7A78, 0x7A7E, 0x7A80, 0x7A82, 0x7A85, 0x7A86, 0x7A8A, 0x7A8B,
+ 0x7A90, 0x7A91, 0x7A94, 0x7A9E, 0x7AA0, 0x7AA3, 0x7AAC, 0x7AB3,
+ 0x7AB5, 0x7AB9, 0x7ABB, 0x7ABC, 0x7AC6, 0x7AC9, 0x7ACC, 0x7ACE,
+ 0x7AD1, 0x7ADB, 0x7AE8, 0x7AE9, 0x7AEB, 0x7AEC, 0x7AF1, 0x7AF4,
+ 0x7AFB, 0x7AFD, 0x7AFE, 0x7B07, 0x7B14, 0x7B1F, 0x7B23, 0x7B27,
+ 0x7B29, 0x7B2A, 0x7B2B, 0x7B2D, 0x7B2E, 0x7B2F, 0x7B30,
+};
+const unsigned short euc_to_utf8_8FD2[] = {
+         0x7B31, 0x7B34, 0x7B3D, 0x7B3F, 0x7B40, 0x7B41, 0x7B47,
+ 0x7B4E, 0x7B55, 0x7B60, 0x7B64, 0x7B66, 0x7B69, 0x7B6A, 0x7B6D,
+ 0x7B6F, 0x7B72, 0x7B73, 0x7B77, 0x7B84, 0x7B89, 0x7B8E, 0x7B90,
+ 0x7B91, 0x7B96, 0x7B9B, 0x7B9E, 0x7BA0, 0x7BA5, 0x7BAC, 0x7BAF,
+ 0x7BB0, 0x7BB2, 0x7BB5, 0x7BB6, 0x7BBA, 0x7BBB, 0x7BBC, 0x7BBD,
+ 0x7BC2, 0x7BC5, 0x7BC8, 0x7BCA, 0x7BD4, 0x7BD6, 0x7BD7, 0x7BD9,
+ 0x7BDA, 0x7BDB, 0x7BE8, 0x7BEA, 0x7BF2, 0x7BF4, 0x7BF5, 0x7BF8,
+ 0x7BF9, 0x7BFA, 0x7BFC, 0x7BFE, 0x7C01, 0x7C02, 0x7C03, 0x7C04,
+ 0x7C06, 0x7C09, 0x7C0B, 0x7C0C, 0x7C0E, 0x7C0F, 0x7C19, 0x7C1B,
+ 0x7C20, 0x7C25, 0x7C26, 0x7C28, 0x7C2C, 0x7C31, 0x7C33, 0x7C34,
+ 0x7C36, 0x7C39, 0x7C3A, 0x7C46, 0x7C4A, 0x7C55, 0x7C51, 0x7C52,
+ 0x7C53, 0x7C59, 0x7C5A, 0x7C5B, 0x7C5C, 0x7C5D, 0x7C5E,
+};
+const unsigned short euc_to_utf8_8FD3[] = {
+         0x7C61, 0x7C63, 0x7C67, 0x7C69, 0x7C6D, 0x7C6E, 0x7C70,
+ 0x7C72, 0x7C79, 0x7C7C, 0x7C7D, 0x7C86, 0x7C87, 0x7C8F, 0x7C94,
+ 0x7C9E, 0x7CA0, 0x7CA6, 0x7CB0, 0x7CB6, 0x7CB7, 0x7CBA, 0x7CBB,
+ 0x7CBC, 0x7CBF, 0x7CC4, 0x7CC7, 0x7CC8, 0x7CC9, 0x7CCD, 0x7CCF,
+ 0x7CD3, 0x7CD4, 0x7CD5, 0x7CD7, 0x7CD9, 0x7CDA, 0x7CDD, 0x7CE6,
+ 0x7CE9, 0x7CEB, 0x7CF5, 0x7D03, 0x7D07, 0x7D08, 0x7D09, 0x7D0F,
+ 0x7D11, 0x7D12, 0x7D13, 0x7D16, 0x7D1D, 0x7D1E, 0x7D23, 0x7D26,
+ 0x7D2A, 0x7D2D, 0x7D31, 0x7D3C, 0x7D3D, 0x7D3E, 0x7D40, 0x7D41,
+ 0x7D47, 0x7D48, 0x7D4D, 0x7D51, 0x7D53, 0x7D57, 0x7D59, 0x7D5A,
+ 0x7D5C, 0x7D5D, 0x7D65, 0x7D67, 0x7D6A, 0x7D70, 0x7D78, 0x7D7A,
+ 0x7D7B, 0x7D7F, 0x7D81, 0x7D82, 0x7D83, 0x7D85, 0x7D86, 0x7D88,
+ 0x7D8B, 0x7D8C, 0x7D8D, 0x7D91, 0x7D96, 0x7D97, 0x7D9D,
+};
+const unsigned short euc_to_utf8_8FD4[] = {
+         0x7D9E, 0x7DA6, 0x7DA7, 0x7DAA, 0x7DB3, 0x7DB6, 0x7DB7,
+ 0x7DB9, 0x7DC2, 0x7DC3, 0x7DC4, 0x7DC5, 0x7DC6, 0x7DCC, 0x7DCD,
+ 0x7DCE, 0x7DD7, 0x7DD9, 0x7E00, 0x7DE2, 0x7DE5, 0x7DE6, 0x7DEA,
+ 0x7DEB, 0x7DED, 0x7DF1, 0x7DF5, 0x7DF6, 0x7DF9, 0x7DFA, 0x7E08,
+ 0x7E10, 0x7E11, 0x7E15, 0x7E17, 0x7E1C, 0x7E1D, 0x7E20, 0x7E27,
+ 0x7E28, 0x7E2C, 0x7E2D, 0x7E2F, 0x7E33, 0x7E36, 0x7E3F, 0x7E44,
+ 0x7E45, 0x7E47, 0x7E4E, 0x7E50, 0x7E52, 0x7E58, 0x7E5F, 0x7E61,
+ 0x7E62, 0x7E65, 0x7E6B, 0x7E6E, 0x7E6F, 0x7E73, 0x7E78, 0x7E7E,
+ 0x7E81, 0x7E86, 0x7E87, 0x7E8A, 0x7E8D, 0x7E91, 0x7E95, 0x7E98,
+ 0x7E9A, 0x7E9D, 0x7E9E, 0x7F3C, 0x7F3B, 0x7F3D, 0x7F3E, 0x7F3F,
+ 0x7F43, 0x7F44, 0x7F47, 0x7F4F, 0x7F52, 0x7F53, 0x7F5B, 0x7F5C,
+ 0x7F5D, 0x7F61, 0x7F63, 0x7F64, 0x7F65, 0x7F66, 0x7F6D,
+};
+const unsigned short euc_to_utf8_8FD5[] = {
+         0x7F71, 0x7F7D, 0x7F7E, 0x7F7F, 0x7F80, 0x7F8B, 0x7F8D,
+ 0x7F8F, 0x7F90, 0x7F91, 0x7F96, 0x7F97, 0x7F9C, 0x7FA1, 0x7FA2,
+ 0x7FA6, 0x7FAA, 0x7FAD, 0x7FB4, 0x7FBC, 0x7FBF, 0x7FC0, 0x7FC3,
+ 0x7FC8, 0x7FCE, 0x7FCF, 0x7FDB, 0x7FDF, 0x7FE3, 0x7FE5, 0x7FE8,
+ 0x7FEC, 0x7FEE, 0x7FEF, 0x7FF2, 0x7FFA, 0x7FFD, 0x7FFE, 0x7FFF,
+ 0x8007, 0x8008, 0x800A, 0x800D, 0x800E, 0x800F, 0x8011, 0x8013,
+ 0x8014, 0x8016, 0x801D, 0x801E, 0x801F, 0x8020, 0x8024, 0x8026,
+ 0x802C, 0x802E, 0x8030, 0x8034, 0x8035, 0x8037, 0x8039, 0x803A,
+ 0x803C, 0x803E, 0x8040, 0x8044, 0x8060, 0x8064, 0x8066, 0x806D,
+ 0x8071, 0x8075, 0x8081, 0x8088, 0x808E, 0x809C, 0x809E, 0x80A6,
+ 0x80A7, 0x80AB, 0x80B8, 0x80B9, 0x80C8, 0x80CD, 0x80CF, 0x80D2,
+ 0x80D4, 0x80D5, 0x80D7, 0x80D8, 0x80E0, 0x80ED, 0x80EE,
+};
+const unsigned short euc_to_utf8_8FD6[] = {
+         0x80F0, 0x80F2, 0x80F3, 0x80F6, 0x80F9, 0x80FA, 0x80FE,
+ 0x8103, 0x810B, 0x8116, 0x8117, 0x8118, 0x811C, 0x811E, 0x8120,
+ 0x8124, 0x8127, 0x812C, 0x8130, 0x8135, 0x813A, 0x813C, 0x8145,
+ 0x8147, 0x814A, 0x814C, 0x8152, 0x8157, 0x8160, 0x8161, 0x8167,
+ 0x8168, 0x8169, 0x816D, 0x816F, 0x8177, 0x8181, 0x8190, 0x8184,
+ 0x8185, 0x8186, 0x818B, 0x818E, 0x8196, 0x8198, 0x819B, 0x819E,
+ 0x81A2, 0x81AE, 0x81B2, 0x81B4, 0x81BB, 0x81CB, 0x81C3, 0x81C5,
+ 0x81CA, 0x81CE, 0x81CF, 0x81D5, 0x81D7, 0x81DB, 0x81DD, 0x81DE,
+ 0x81E1, 0x81E4, 0x81EB, 0x81EC, 0x81F0, 0x81F1, 0x81F2, 0x81F5,
+ 0x81F6, 0x81F8, 0x81F9, 0x81FD, 0x81FF, 0x8200, 0x8203, 0x820F,
+ 0x8213, 0x8214, 0x8219, 0x821A, 0x821D, 0x8221, 0x8222, 0x8228,
+ 0x8232, 0x8234, 0x823A, 0x8243, 0x8244, 0x8245, 0x8246,
+};
+const unsigned short euc_to_utf8_8FD7[] = {
+         0x824B, 0x824E, 0x824F, 0x8251, 0x8256, 0x825C, 0x8260,
+ 0x8263, 0x8267, 0x826D, 0x8274, 0x827B, 0x827D, 0x827F, 0x8280,
+ 0x8281, 0x8283, 0x8284, 0x8287, 0x8289, 0x828A, 0x828E, 0x8291,
+ 0x8294, 0x8296, 0x8298, 0x829A, 0x829B, 0x82A0, 0x82A1, 0x82A3,
+ 0x82A4, 0x82A7, 0x82A8, 0x82A9, 0x82AA, 0x82AE, 0x82B0, 0x82B2,
+ 0x82B4, 0x82B7, 0x82BA, 0x82BC, 0x82BE, 0x82BF, 0x82C6, 0x82D0,
+ 0x82D5, 0x82DA, 0x82E0, 0x82E2, 0x82E4, 0x82E8, 0x82EA, 0x82ED,
+ 0x82EF, 0x82F6, 0x82F7, 0x82FD, 0x82FE, 0x8300, 0x8301, 0x8307,
+ 0x8308, 0x830A, 0x830B, 0x8354, 0x831B, 0x831D, 0x831E, 0x831F,
+ 0x8321, 0x8322, 0x832C, 0x832D, 0x832E, 0x8330, 0x8333, 0x8337,
+ 0x833A, 0x833C, 0x833D, 0x8342, 0x8343, 0x8344, 0x8347, 0x834D,
+ 0x834E, 0x8351, 0x8355, 0x8356, 0x8357, 0x8370, 0x8378,
+};
+const unsigned short euc_to_utf8_8FD8[] = {
+         0x837D, 0x837F, 0x8380, 0x8382, 0x8384, 0x8386, 0x838D,
+ 0x8392, 0x8394, 0x8395, 0x8398, 0x8399, 0x839B, 0x839C, 0x839D,
+ 0x83A6, 0x83A7, 0x83A9, 0x83AC, 0x83BE, 0x83BF, 0x83C0, 0x83C7,
+ 0x83C9, 0x83CF, 0x83D0, 0x83D1, 0x83D4, 0x83DD, 0x8353, 0x83E8,
+ 0x83EA, 0x83F6, 0x83F8, 0x83F9, 0x83FC, 0x8401, 0x8406, 0x840A,
+ 0x840F, 0x8411, 0x8415, 0x8419, 0x83AD, 0x842F, 0x8439, 0x8445,
+ 0x8447, 0x8448, 0x844A, 0x844D, 0x844F, 0x8451, 0x8452, 0x8456,
+ 0x8458, 0x8459, 0x845A, 0x845C, 0x8460, 0x8464, 0x8465, 0x8467,
+ 0x846A, 0x8470, 0x8473, 0x8474, 0x8476, 0x8478, 0x847C, 0x847D,
+ 0x8481, 0x8485, 0x8492, 0x8493, 0x8495, 0x849E, 0x84A6, 0x84A8,
+ 0x84A9, 0x84AA, 0x84AF, 0x84B1, 0x84B4, 0x84BA, 0x84BD, 0x84BE,
+ 0x84C0, 0x84C2, 0x84C7, 0x84C8, 0x84CC, 0x84CF, 0x84D3,
+};
+const unsigned short euc_to_utf8_8FD9[] = {
+         0x84DC, 0x84E7, 0x84EA, 0x84EF, 0x84F0, 0x84F1, 0x84F2,
+ 0x84F7, 0x8532, 0x84FA, 0x84FB, 0x84FD, 0x8502, 0x8503, 0x8507,
+ 0x850C, 0x850E, 0x8510, 0x851C, 0x851E, 0x8522, 0x8523, 0x8524,
+ 0x8525, 0x8527, 0x852A, 0x852B, 0x852F, 0x8533, 0x8534, 0x8536,
+ 0x853F, 0x8546, 0x854F, 0x8550, 0x8551, 0x8552, 0x8553, 0x8556,
+ 0x8559, 0x855C, 0x855D, 0x855E, 0x855F, 0x8560, 0x8561, 0x8562,
+ 0x8564, 0x856B, 0x856F, 0x8579, 0x857A, 0x857B, 0x857D, 0x857F,
+ 0x8581, 0x8585, 0x8586, 0x8589, 0x858B, 0x858C, 0x858F, 0x8593,
+ 0x8598, 0x859D, 0x859F, 0x85A0, 0x85A2, 0x85A5, 0x85A7, 0x85B4,
+ 0x85B6, 0x85B7, 0x85B8, 0x85BC, 0x85BD, 0x85BE, 0x85BF, 0x85C2,
+ 0x85C7, 0x85CA, 0x85CB, 0x85CE, 0x85AD, 0x85D8, 0x85DA, 0x85DF,
+ 0x85E0, 0x85E6, 0x85E8, 0x85ED, 0x85F3, 0x85F6, 0x85FC,
+};
+const unsigned short euc_to_utf8_8FDA[] = {
+         0x85FF, 0x8600, 0x8604, 0x8605, 0x860D, 0x860E, 0x8610,
+ 0x8611, 0x8612, 0x8618, 0x8619, 0x861B, 0x861E, 0x8621, 0x8627,
+ 0x8629, 0x8636, 0x8638, 0x863A, 0x863C, 0x863D, 0x8640, 0x8642,
+ 0x8646, 0x8652, 0x8653, 0x8656, 0x8657, 0x8658, 0x8659, 0x865D,
+ 0x8660, 0x8661, 0x8662, 0x8663, 0x8664, 0x8669, 0x866C, 0x866F,
+ 0x8675, 0x8676, 0x8677, 0x867A, 0x868D, 0x8691, 0x8696, 0x8698,
+ 0x869A, 0x869C, 0x86A1, 0x86A6, 0x86A7, 0x86A8, 0x86AD, 0x86B1,
+ 0x86B3, 0x86B4, 0x86B5, 0x86B7, 0x86B8, 0x86B9, 0x86BF, 0x86C0,
+ 0x86C1, 0x86C3, 0x86C5, 0x86D1, 0x86D2, 0x86D5, 0x86D7, 0x86DA,
+ 0x86DC, 0x86E0, 0x86E3, 0x86E5, 0x86E7, 0x8688, 0x86FA, 0x86FC,
+ 0x86FD, 0x8704, 0x8705, 0x8707, 0x870B, 0x870E, 0x870F, 0x8710,
+ 0x8713, 0x8714, 0x8719, 0x871E, 0x871F, 0x8721, 0x8723,
+};
+const unsigned short euc_to_utf8_8FDB[] = {
+         0x8728, 0x872E, 0x872F, 0x8731, 0x8732, 0x8739, 0x873A,
+ 0x873C, 0x873D, 0x873E, 0x8740, 0x8743, 0x8745, 0x874D, 0x8758,
+ 0x875D, 0x8761, 0x8764, 0x8765, 0x876F, 0x8771, 0x8772, 0x877B,
+ 0x8783, 0x8784, 0x8785, 0x8786, 0x8787, 0x8788, 0x8789, 0x878B,
+ 0x878C, 0x8790, 0x8793, 0x8795, 0x8797, 0x8798, 0x8799, 0x879E,
+ 0x87A0, 0x87A3, 0x87A7, 0x87AC, 0x87AD, 0x87AE, 0x87B1, 0x87B5,
+ 0x87BE, 0x87BF, 0x87C1, 0x87C8, 0x87C9, 0x87CA, 0x87CE, 0x87D5,
+ 0x87D6, 0x87D9, 0x87DA, 0x87DC, 0x87DF, 0x87E2, 0x87E3, 0x87E4,
+ 0x87EA, 0x87EB, 0x87ED, 0x87F1, 0x87F3, 0x87F8, 0x87FA, 0x87FF,
+ 0x8801, 0x8803, 0x8806, 0x8809, 0x880A, 0x880B, 0x8810, 0x8819,
+ 0x8812, 0x8813, 0x8814, 0x8818, 0x881A, 0x881B, 0x881C, 0x881E,
+ 0x881F, 0x8828, 0x882D, 0x882E, 0x8830, 0x8832, 0x8835,
+};
+const unsigned short euc_to_utf8_8FDC[] = {
+         0x883A, 0x883C, 0x8841, 0x8843, 0x8845, 0x8848, 0x8849,
+ 0x884A, 0x884B, 0x884E, 0x8851, 0x8855, 0x8856, 0x8858, 0x885A,
+ 0x885C, 0x885F, 0x8860, 0x8864, 0x8869, 0x8871, 0x8879, 0x887B,
+ 0x8880, 0x8898, 0x889A, 0x889B, 0x889C, 0x889F, 0x88A0, 0x88A8,
+ 0x88AA, 0x88BA, 0x88BD, 0x88BE, 0x88C0, 0x88CA, 0x88CB, 0x88CC,
+ 0x88CD, 0x88CE, 0x88D1, 0x88D2, 0x88D3, 0x88DB, 0x88DE, 0x88E7,
+ 0x88EF, 0x88F0, 0x88F1, 0x88F5, 0x88F7, 0x8901, 0x8906, 0x890D,
+ 0x890E, 0x890F, 0x8915, 0x8916, 0x8918, 0x8919, 0x891A, 0x891C,
+ 0x8920, 0x8926, 0x8927, 0x8928, 0x8930, 0x8931, 0x8932, 0x8935,
+ 0x8939, 0x893A, 0x893E, 0x8940, 0x8942, 0x8945, 0x8946, 0x8949,
+ 0x894F, 0x8952, 0x8957, 0x895A, 0x895B, 0x895C, 0x8961, 0x8962,
+ 0x8963, 0x896B, 0x896E, 0x8970, 0x8973, 0x8975, 0x897A,
+};
+const unsigned short euc_to_utf8_8FDD[] = {
+         0x897B, 0x897C, 0x897D, 0x8989, 0x898D, 0x8990, 0x8994,
+ 0x8995, 0x899B, 0x899C, 0x899F, 0x89A0, 0x89A5, 0x89B0, 0x89B4,
+ 0x89B5, 0x89B6, 0x89B7, 0x89BC, 0x89D4, 0x89D5, 0x89D6, 0x89D7,
+ 0x89D8, 0x89E5, 0x89E9, 0x89EB, 0x89ED, 0x89F1, 0x89F3, 0x89F6,
+ 0x89F9, 0x89FD, 0x89FF, 0x8A04, 0x8A05, 0x8A07, 0x8A0F, 0x8A11,
+ 0x8A12, 0x8A14, 0x8A15, 0x8A1E, 0x8A20, 0x8A22, 0x8A24, 0x8A26,
+ 0x8A2B, 0x8A2C, 0x8A2F, 0x8A35, 0x8A37, 0x8A3D, 0x8A3E, 0x8A40,
+ 0x8A43, 0x8A45, 0x8A47, 0x8A49, 0x8A4D, 0x8A4E, 0x8A53, 0x8A56,
+ 0x8A57, 0x8A58, 0x8A5C, 0x8A5D, 0x8A61, 0x8A65, 0x8A67, 0x8A75,
+ 0x8A76, 0x8A77, 0x8A79, 0x8A7A, 0x8A7B, 0x8A7E, 0x8A7F, 0x8A80,
+ 0x8A83, 0x8A86, 0x8A8B, 0x8A8F, 0x8A90, 0x8A92, 0x8A96, 0x8A97,
+ 0x8A99, 0x8A9F, 0x8AA7, 0x8AA9, 0x8AAE, 0x8AAF, 0x8AB3,
+};
+const unsigned short euc_to_utf8_8FDE[] = {
+         0x8AB6, 0x8AB7, 0x8ABB, 0x8ABE, 0x8AC3, 0x8AC6, 0x8AC8,
+ 0x8AC9, 0x8ACA, 0x8AD1, 0x8AD3, 0x8AD4, 0x8AD5, 0x8AD7, 0x8ADD,
+ 0x8ADF, 0x8AEC, 0x8AF0, 0x8AF4, 0x8AF5, 0x8AF6, 0x8AFC, 0x8AFF,
+ 0x8B05, 0x8B06, 0x8B0B, 0x8B11, 0x8B1C, 0x8B1E, 0x8B1F, 0x8B0A,
+ 0x8B2D, 0x8B30, 0x8B37, 0x8B3C, 0x8B42, 0x8B43, 0x8B44, 0x8B45,
+ 0x8B46, 0x8B48, 0x8B52, 0x8B53, 0x8B54, 0x8B59, 0x8B4D, 0x8B5E,
+ 0x8B63, 0x8B6D, 0x8B76, 0x8B78, 0x8B79, 0x8B7C, 0x8B7E, 0x8B81,
+ 0x8B84, 0x8B85, 0x8B8B, 0x8B8D, 0x8B8F, 0x8B94, 0x8B95, 0x8B9C,
+ 0x8B9E, 0x8B9F, 0x8C38, 0x8C39, 0x8C3D, 0x8C3E, 0x8C45, 0x8C47,
+ 0x8C49, 0x8C4B, 0x8C4F, 0x8C51, 0x8C53, 0x8C54, 0x8C57, 0x8C58,
+ 0x8C5B, 0x8C5D, 0x8C59, 0x8C63, 0x8C64, 0x8C66, 0x8C68, 0x8C69,
+ 0x8C6D, 0x8C73, 0x8C75, 0x8C76, 0x8C7B, 0x8C7E, 0x8C86,
+};
+const unsigned short euc_to_utf8_8FDF[] = {
+         0x8C87, 0x8C8B, 0x8C90, 0x8C92, 0x8C93, 0x8C99, 0x8C9B,
+ 0x8C9C, 0x8CA4, 0x8CB9, 0x8CBA, 0x8CC5, 0x8CC6, 0x8CC9, 0x8CCB,
+ 0x8CCF, 0x8CD6, 0x8CD5, 0x8CD9, 0x8CDD, 0x8CE1, 0x8CE8, 0x8CEC,
+ 0x8CEF, 0x8CF0, 0x8CF2, 0x8CF5, 0x8CF7, 0x8CF8, 0x8CFE, 0x8CFF,
+ 0x8D01, 0x8D03, 0x8D09, 0x8D12, 0x8D17, 0x8D1B, 0x8D65, 0x8D69,
+ 0x8D6C, 0x8D6E, 0x8D7F, 0x8D82, 0x8D84, 0x8D88, 0x8D8D, 0x8D90,
+ 0x8D91, 0x8D95, 0x8D9E, 0x8D9F, 0x8DA0, 0x8DA6, 0x8DAB, 0x8DAC,
+ 0x8DAF, 0x8DB2, 0x8DB5, 0x8DB7, 0x8DB9, 0x8DBB, 0x8DC0, 0x8DC5,
+ 0x8DC6, 0x8DC7, 0x8DC8, 0x8DCA, 0x8DCE, 0x8DD1, 0x8DD4, 0x8DD5,
+ 0x8DD7, 0x8DD9, 0x8DE4, 0x8DE5, 0x8DE7, 0x8DEC, 0x8DF0, 0x8DBC,
+ 0x8DF1, 0x8DF2, 0x8DF4, 0x8DFD, 0x8E01, 0x8E04, 0x8E05, 0x8E06,
+ 0x8E0B, 0x8E11, 0x8E14, 0x8E16, 0x8E20, 0x8E21, 0x8E22,
+};
+const unsigned short euc_to_utf8_8FE0[] = {
+         0x8E23, 0x8E26, 0x8E27, 0x8E31, 0x8E33, 0x8E36, 0x8E37,
+ 0x8E38, 0x8E39, 0x8E3D, 0x8E40, 0x8E41, 0x8E4B, 0x8E4D, 0x8E4E,
+ 0x8E4F, 0x8E54, 0x8E5B, 0x8E5C, 0x8E5D, 0x8E5E, 0x8E61, 0x8E62,
+ 0x8E69, 0x8E6C, 0x8E6D, 0x8E6F, 0x8E70, 0x8E71, 0x8E79, 0x8E7A,
+ 0x8E7B, 0x8E82, 0x8E83, 0x8E89, 0x8E90, 0x8E92, 0x8E95, 0x8E9A,
+ 0x8E9B, 0x8E9D, 0x8E9E, 0x8EA2, 0x8EA7, 0x8EA9, 0x8EAD, 0x8EAE,
+ 0x8EB3, 0x8EB5, 0x8EBA, 0x8EBB, 0x8EC0, 0x8EC1, 0x8EC3, 0x8EC4,
+ 0x8EC7, 0x8ECF, 0x8ED1, 0x8ED4, 0x8EDC, 0x8EE8, 0x8EEE, 0x8EF0,
+ 0x8EF1, 0x8EF7, 0x8EF9, 0x8EFA, 0x8EED, 0x8F00, 0x8F02, 0x8F07,
+ 0x8F08, 0x8F0F, 0x8F10, 0x8F16, 0x8F17, 0x8F18, 0x8F1E, 0x8F20,
+ 0x8F21, 0x8F23, 0x8F25, 0x8F27, 0x8F28, 0x8F2C, 0x8F2D, 0x8F2E,
+ 0x8F34, 0x8F35, 0x8F36, 0x8F37, 0x8F3A, 0x8F40, 0x8F41,
+};
+const unsigned short euc_to_utf8_8FE1[] = {
+         0x8F43, 0x8F47, 0x8F4F, 0x8F51, 0x8F52, 0x8F53, 0x8F54,
+ 0x8F55, 0x8F58, 0x8F5D, 0x8F5E, 0x8F65, 0x8F9D, 0x8FA0, 0x8FA1,
+ 0x8FA4, 0x8FA5, 0x8FA6, 0x8FB5, 0x8FB6, 0x8FB8, 0x8FBE, 0x8FC0,
+ 0x8FC1, 0x8FC6, 0x8FCA, 0x8FCB, 0x8FCD, 0x8FD0, 0x8FD2, 0x8FD3,
+ 0x8FD5, 0x8FE0, 0x8FE3, 0x8FE4, 0x8FE8, 0x8FEE, 0x8FF1, 0x8FF5,
+ 0x8FF6, 0x8FFB, 0x8FFE, 0x9002, 0x9004, 0x9008, 0x900C, 0x9018,
+ 0x901B, 0x9028, 0x9029, 0x902F, 0x902A, 0x902C, 0x902D, 0x9033,
+ 0x9034, 0x9037, 0x903F, 0x9043, 0x9044, 0x904C, 0x905B, 0x905D,
+ 0x9062, 0x9066, 0x9067, 0x906C, 0x9070, 0x9074, 0x9079, 0x9085,
+ 0x9088, 0x908B, 0x908C, 0x908E, 0x9090, 0x9095, 0x9097, 0x9098,
+ 0x9099, 0x909B, 0x90A0, 0x90A1, 0x90A2, 0x90A5, 0x90B0, 0x90B2,
+ 0x90B3, 0x90B4, 0x90B6, 0x90BD, 0x90CC, 0x90BE, 0x90C3,
+};
+const unsigned short euc_to_utf8_8FE2[] = {
+         0x90C4, 0x90C5, 0x90C7, 0x90C8, 0x90D5, 0x90D7, 0x90D8,
+ 0x90D9, 0x90DC, 0x90DD, 0x90DF, 0x90E5, 0x90D2, 0x90F6, 0x90EB,
+ 0x90EF, 0x90F0, 0x90F4, 0x90FE, 0x90FF, 0x9100, 0x9104, 0x9105,
+ 0x9106, 0x9108, 0x910D, 0x9110, 0x9114, 0x9116, 0x9117, 0x9118,
+ 0x911A, 0x911C, 0x911E, 0x9120, 0x9125, 0x9122, 0x9123, 0x9127,
+ 0x9129, 0x912E, 0x912F, 0x9131, 0x9134, 0x9136, 0x9137, 0x9139,
+ 0x913A, 0x913C, 0x913D, 0x9143, 0x9147, 0x9148, 0x914F, 0x9153,
+ 0x9157, 0x9159, 0x915A, 0x915B, 0x9161, 0x9164, 0x9167, 0x916D,
+ 0x9174, 0x9179, 0x917A, 0x917B, 0x9181, 0x9183, 0x9185, 0x9186,
+ 0x918A, 0x918E, 0x9191, 0x9193, 0x9194, 0x9195, 0x9198, 0x919E,
+ 0x91A1, 0x91A6, 0x91A8, 0x91AC, 0x91AD, 0x91AE, 0x91B0, 0x91B1,
+ 0x91B2, 0x91B3, 0x91B6, 0x91BB, 0x91BC, 0x91BD, 0x91BF,
+};
+const unsigned short euc_to_utf8_8FE3[] = {
+         0x91C2, 0x91C3, 0x91C5, 0x91D3, 0x91D4, 0x91D7, 0x91D9,
+ 0x91DA, 0x91DE, 0x91E4, 0x91E5, 0x91E9, 0x91EA, 0x91EC, 0x91ED,
+ 0x91EE, 0x91EF, 0x91F0, 0x91F1, 0x91F7, 0x91F9, 0x91FB, 0x91FD,
+ 0x9200, 0x9201, 0x9204, 0x9205, 0x9206, 0x9207, 0x9209, 0x920A,
+ 0x920C, 0x9210, 0x9212, 0x9213, 0x9216, 0x9218, 0x921C, 0x921D,
+ 0x9223, 0x9224, 0x9225, 0x9226, 0x9228, 0x922E, 0x922F, 0x9230,
+ 0x9233, 0x9235, 0x9236, 0x9238, 0x9239, 0x923A, 0x923C, 0x923E,
+ 0x9240, 0x9242, 0x9243, 0x9246, 0x9247, 0x924A, 0x924D, 0x924E,
+ 0x924F, 0x9251, 0x9258, 0x9259, 0x925C, 0x925D, 0x9260, 0x9261,
+ 0x9265, 0x9267, 0x9268, 0x9269, 0x926E, 0x926F, 0x9270, 0x9275,
+ 0x9276, 0x9277, 0x9278, 0x9279, 0x927B, 0x927C, 0x927D, 0x927F,
+ 0x9288, 0x9289, 0x928A, 0x928D, 0x928E, 0x9292, 0x9297,
+};
+const unsigned short euc_to_utf8_8FE4[] = {
+         0x9299, 0x929F, 0x92A0, 0x92A4, 0x92A5, 0x92A7, 0x92A8,
+ 0x92AB, 0x92AF, 0x92B2, 0x92B6, 0x92B8, 0x92BA, 0x92BB, 0x92BC,
+ 0x92BD, 0x92BF, 0x92C0, 0x92C1, 0x92C2, 0x92C3, 0x92C5, 0x92C6,
+ 0x92C7, 0x92C8, 0x92CB, 0x92CC, 0x92CD, 0x92CE, 0x92D0, 0x92D3,
+ 0x92D5, 0x92D7, 0x92D8, 0x92D9, 0x92DC, 0x92DD, 0x92DF, 0x92E0,
+ 0x92E1, 0x92E3, 0x92E5, 0x92E7, 0x92E8, 0x92EC, 0x92EE, 0x92F0,
+ 0x92F9, 0x92FB, 0x92FF, 0x9300, 0x9302, 0x9308, 0x930D, 0x9311,
+ 0x9314, 0x9315, 0x931C, 0x931D, 0x931E, 0x931F, 0x9321, 0x9324,
+ 0x9325, 0x9327, 0x9329, 0x932A, 0x9333, 0x9334, 0x9336, 0x9337,
+ 0x9347, 0x9348, 0x9349, 0x9350, 0x9351, 0x9352, 0x9355, 0x9357,
+ 0x9358, 0x935A, 0x935E, 0x9364, 0x9365, 0x9367, 0x9369, 0x936A,
+ 0x936D, 0x936F, 0x9370, 0x9371, 0x9373, 0x9374, 0x9376,
+};
+const unsigned short euc_to_utf8_8FE5[] = {
+         0x937A, 0x937D, 0x937F, 0x9380, 0x9381, 0x9382, 0x9388,
+ 0x938A, 0x938B, 0x938D, 0x938F, 0x9392, 0x9395, 0x9398, 0x939B,
+ 0x939E, 0x93A1, 0x93A3, 0x93A4, 0x93A6, 0x93A8, 0x93AB, 0x93B4,
+ 0x93B5, 0x93B6, 0x93BA, 0x93A9, 0x93C1, 0x93C4, 0x93C5, 0x93C6,
+ 0x93C7, 0x93C9, 0x93CA, 0x93CB, 0x93CC, 0x93CD, 0x93D3, 0x93D9,
+ 0x93DC, 0x93DE, 0x93DF, 0x93E2, 0x93E6, 0x93E7, 0x93F9, 0x93F7,
+ 0x93F8, 0x93FA, 0x93FB, 0x93FD, 0x9401, 0x9402, 0x9404, 0x9408,
+ 0x9409, 0x940D, 0x940E, 0x940F, 0x9415, 0x9416, 0x9417, 0x941F,
+ 0x942E, 0x942F, 0x9431, 0x9432, 0x9433, 0x9434, 0x943B, 0x943F,
+ 0x943D, 0x9443, 0x9445, 0x9448, 0x944A, 0x944C, 0x9455, 0x9459,
+ 0x945C, 0x945F, 0x9461, 0x9463, 0x9468, 0x946B, 0x946D, 0x946E,
+ 0x946F, 0x9471, 0x9472, 0x9484, 0x9483, 0x9578, 0x9579,
+};
+const unsigned short euc_to_utf8_8FE6[] = {
+         0x957E, 0x9584, 0x9588, 0x958C, 0x958D, 0x958E, 0x959D,
+ 0x959E, 0x959F, 0x95A1, 0x95A6, 0x95A9, 0x95AB, 0x95AC, 0x95B4,
+ 0x95B6, 0x95BA, 0x95BD, 0x95BF, 0x95C6, 0x95C8, 0x95C9, 0x95CB,
+ 0x95D0, 0x95D1, 0x95D2, 0x95D3, 0x95D9, 0x95DA, 0x95DD, 0x95DE,
+ 0x95DF, 0x95E0, 0x95E4, 0x95E6, 0x961D, 0x961E, 0x9622, 0x9624,
+ 0x9625, 0x9626, 0x962C, 0x9631, 0x9633, 0x9637, 0x9638, 0x9639,
+ 0x963A, 0x963C, 0x963D, 0x9641, 0x9652, 0x9654, 0x9656, 0x9657,
+ 0x9658, 0x9661, 0x966E, 0x9674, 0x967B, 0x967C, 0x967E, 0x967F,
+ 0x9681, 0x9682, 0x9683, 0x9684, 0x9689, 0x9691, 0x9696, 0x969A,
+ 0x969D, 0x969F, 0x96A4, 0x96A5, 0x96A6, 0x96A9, 0x96AE, 0x96AF,
+ 0x96B3, 0x96BA, 0x96CA, 0x96D2, 0x5DB2, 0x96D8, 0x96DA, 0x96DD,
+ 0x96DE, 0x96DF, 0x96E9, 0x96EF, 0x96F1, 0x96FA, 0x9702,
+};
+const unsigned short euc_to_utf8_8FE7[] = {
+         0x9703, 0x9705, 0x9709, 0x971A, 0x971B, 0x971D, 0x9721,
+ 0x9722, 0x9723, 0x9728, 0x9731, 0x9733, 0x9741, 0x9743, 0x974A,
+ 0x974E, 0x974F, 0x9755, 0x9757, 0x9758, 0x975A, 0x975B, 0x9763,
+ 0x9767, 0x976A, 0x976E, 0x9773, 0x9776, 0x9777, 0x9778, 0x977B,
+ 0x977D, 0x977F, 0x9780, 0x9789, 0x9795, 0x9796, 0x9797, 0x9799,
+ 0x979A, 0x979E, 0x979F, 0x97A2, 0x97AC, 0x97AE, 0x97B1, 0x97B2,
+ 0x97B5, 0x97B6, 0x97B8, 0x97B9, 0x97BA, 0x97BC, 0x97BE, 0x97BF,
+ 0x97C1, 0x97C4, 0x97C5, 0x97C7, 0x97C9, 0x97CA, 0x97CC, 0x97CD,
+ 0x97CE, 0x97D0, 0x97D1, 0x97D4, 0x97D7, 0x97D8, 0x97D9, 0x97DD,
+ 0x97DE, 0x97E0, 0x97DB, 0x97E1, 0x97E4, 0x97EF, 0x97F1, 0x97F4,
+ 0x97F7, 0x97F8, 0x97FA, 0x9807, 0x980A, 0x9819, 0x980D, 0x980E,
+ 0x9814, 0x9816, 0x981C, 0x981E, 0x9820, 0x9823, 0x9826,
+};
+const unsigned short euc_to_utf8_8FE8[] = {
+         0x982B, 0x982E, 0x982F, 0x9830, 0x9832, 0x9833, 0x9835,
+ 0x9825, 0x983E, 0x9844, 0x9847, 0x984A, 0x9851, 0x9852, 0x9853,
+ 0x9856, 0x9857, 0x9859, 0x985A, 0x9862, 0x9863, 0x9865, 0x9866,
+ 0x986A, 0x986C, 0x98AB, 0x98AD, 0x98AE, 0x98B0, 0x98B4, 0x98B7,
+ 0x98B8, 0x98BA, 0x98BB, 0x98BF, 0x98C2, 0x98C5, 0x98C8, 0x98CC,
+ 0x98E1, 0x98E3, 0x98E5, 0x98E6, 0x98E7, 0x98EA, 0x98F3, 0x98F6,
+ 0x9902, 0x9907, 0x9908, 0x9911, 0x9915, 0x9916, 0x9917, 0x991A,
+ 0x991B, 0x991C, 0x991F, 0x9922, 0x9926, 0x9927, 0x992B, 0x9931,
+ 0x9932, 0x9933, 0x9934, 0x9935, 0x9939, 0x993A, 0x993B, 0x993C,
+ 0x9940, 0x9941, 0x9946, 0x9947, 0x9948, 0x994D, 0x994E, 0x9954,
+ 0x9958, 0x9959, 0x995B, 0x995C, 0x995E, 0x995F, 0x9960, 0x999B,
+ 0x999D, 0x999F, 0x99A6, 0x99B0, 0x99B1, 0x99B2, 0x99B5,
+};
+const unsigned short euc_to_utf8_8FE9[] = {
+         0x99B9, 0x99BA, 0x99BD, 0x99BF, 0x99C3, 0x99C9, 0x99D3,
+ 0x99D4, 0x99D9, 0x99DA, 0x99DC, 0x99DE, 0x99E7, 0x99EA, 0x99EB,
+ 0x99EC, 0x99F0, 0x99F4, 0x99F5, 0x99F9, 0x99FD, 0x99FE, 0x9A02,
+ 0x9A03, 0x9A04, 0x9A0B, 0x9A0C, 0x9A10, 0x9A11, 0x9A16, 0x9A1E,
+ 0x9A20, 0x9A22, 0x9A23, 0x9A24, 0x9A27, 0x9A2D, 0x9A2E, 0x9A33,
+ 0x9A35, 0x9A36, 0x9A38, 0x9A47, 0x9A41, 0x9A44, 0x9A4A, 0x9A4B,
+ 0x9A4C, 0x9A4E, 0x9A51, 0x9A54, 0x9A56, 0x9A5D, 0x9AAA, 0x9AAC,
+ 0x9AAE, 0x9AAF, 0x9AB2, 0x9AB4, 0x9AB5, 0x9AB6, 0x9AB9, 0x9ABB,
+ 0x9ABE, 0x9ABF, 0x9AC1, 0x9AC3, 0x9AC6, 0x9AC8, 0x9ACE, 0x9AD0,
+ 0x9AD2, 0x9AD5, 0x9AD6, 0x9AD7, 0x9ADB, 0x9ADC, 0x9AE0, 0x9AE4,
+ 0x9AE5, 0x9AE7, 0x9AE9, 0x9AEC, 0x9AF2, 0x9AF3, 0x9AF5, 0x9AF9,
+ 0x9AFA, 0x9AFD, 0x9AFF, 0x9B00, 0x9B01, 0x9B02, 0x9B03,
+};
+const unsigned short euc_to_utf8_8FEA[] = {
+         0x9B04, 0x9B05, 0x9B08, 0x9B09, 0x9B0B, 0x9B0C, 0x9B0D,
+ 0x9B0E, 0x9B10, 0x9B12, 0x9B16, 0x9B19, 0x9B1B, 0x9B1C, 0x9B20,
+ 0x9B26, 0x9B2B, 0x9B2D, 0x9B33, 0x9B34, 0x9B35, 0x9B37, 0x9B39,
+ 0x9B3A, 0x9B3D, 0x9B48, 0x9B4B, 0x9B4C, 0x9B55, 0x9B56, 0x9B57,
+ 0x9B5B, 0x9B5E, 0x9B61, 0x9B63, 0x9B65, 0x9B66, 0x9B68, 0x9B6A,
+ 0x9B6B, 0x9B6C, 0x9B6D, 0x9B6E, 0x9B73, 0x9B75, 0x9B77, 0x9B78,
+ 0x9B79, 0x9B7F, 0x9B80, 0x9B84, 0x9B85, 0x9B86, 0x9B87, 0x9B89,
+ 0x9B8A, 0x9B8B, 0x9B8D, 0x9B8F, 0x9B90, 0x9B94, 0x9B9A, 0x9B9D,
+ 0x9B9E, 0x9BA6, 0x9BA7, 0x9BA9, 0x9BAC, 0x9BB0, 0x9BB1, 0x9BB2,
+ 0x9BB7, 0x9BB8, 0x9BBB, 0x9BBC, 0x9BBE, 0x9BBF, 0x9BC1, 0x9BC7,
+ 0x9BC8, 0x9BCE, 0x9BD0, 0x9BD7, 0x9BD8, 0x9BDD, 0x9BDF, 0x9BE5,
+ 0x9BE7, 0x9BEA, 0x9BEB, 0x9BEF, 0x9BF3, 0x9BF7, 0x9BF8,
+};
+const unsigned short euc_to_utf8_8FEB[] = {
+         0x9BF9, 0x9BFA, 0x9BFD, 0x9BFF, 0x9C00, 0x9C02, 0x9C0B,
+ 0x9C0F, 0x9C11, 0x9C16, 0x9C18, 0x9C19, 0x9C1A, 0x9C1C, 0x9C1E,
+ 0x9C22, 0x9C23, 0x9C26, 0x9C27, 0x9C28, 0x9C29, 0x9C2A, 0x9C31,
+ 0x9C35, 0x9C36, 0x9C37, 0x9C3D, 0x9C41, 0x9C43, 0x9C44, 0x9C45,
+ 0x9C49, 0x9C4A, 0x9C4E, 0x9C4F, 0x9C50, 0x9C53, 0x9C54, 0x9C56,
+ 0x9C58, 0x9C5B, 0x9C5D, 0x9C5E, 0x9C5F, 0x9C63, 0x9C69, 0x9C6A,
+ 0x9C5C, 0x9C6B, 0x9C68, 0x9C6E, 0x9C70, 0x9C72, 0x9C75, 0x9C77,
+ 0x9C7B, 0x9CE6, 0x9CF2, 0x9CF7, 0x9CF9, 0x9D0B, 0x9D02, 0x9D11,
+ 0x9D17, 0x9D18, 0x9D1C, 0x9D1D, 0x9D1E, 0x9D2F, 0x9D30, 0x9D32,
+ 0x9D33, 0x9D34, 0x9D3A, 0x9D3C, 0x9D45, 0x9D3D, 0x9D42, 0x9D43,
+ 0x9D47, 0x9D4A, 0x9D53, 0x9D54, 0x9D5F, 0x9D63, 0x9D62, 0x9D65,
+ 0x9D69, 0x9D6A, 0x9D6B, 0x9D70, 0x9D76, 0x9D77, 0x9D7B,
+};
+const unsigned short euc_to_utf8_8FEC[] = {
+         0x9D7C, 0x9D7E, 0x9D83, 0x9D84, 0x9D86, 0x9D8A, 0x9D8D,
+ 0x9D8E, 0x9D92, 0x9D93, 0x9D95, 0x9D96, 0x9D97, 0x9D98, 0x9DA1,
+ 0x9DAA, 0x9DAC, 0x9DAE, 0x9DB1, 0x9DB5, 0x9DB9, 0x9DBC, 0x9DBF,
+ 0x9DC3, 0x9DC7, 0x9DC9, 0x9DCA, 0x9DD4, 0x9DD5, 0x9DD6, 0x9DD7,
+ 0x9DDA, 0x9DDE, 0x9DDF, 0x9DE0, 0x9DE5, 0x9DE7, 0x9DE9, 0x9DEB,
+ 0x9DEE, 0x9DF0, 0x9DF3, 0x9DF4, 0x9DFE, 0x9E0A, 0x9E02, 0x9E07,
+ 0x9E0E, 0x9E10, 0x9E11, 0x9E12, 0x9E15, 0x9E16, 0x9E19, 0x9E1C,
+ 0x9E1D, 0x9E7A, 0x9E7B, 0x9E7C, 0x9E80, 0x9E82, 0x9E83, 0x9E84,
+ 0x9E85, 0x9E87, 0x9E8E, 0x9E8F, 0x9E96, 0x9E98, 0x9E9B, 0x9E9E,
+ 0x9EA4, 0x9EA8, 0x9EAC, 0x9EAE, 0x9EAF, 0x9EB0, 0x9EB3, 0x9EB4,
+ 0x9EB5, 0x9EC6, 0x9EC8, 0x9ECB, 0x9ED5, 0x9EDF, 0x9EE4, 0x9EE7,
+ 0x9EEC, 0x9EED, 0x9EEE, 0x9EF0, 0x9EF1, 0x9EF2, 0x9EF5,
+};
+const unsigned short euc_to_utf8_8FED[] = {
+         0x9EF8, 0x9EFF, 0x9F02, 0x9F03, 0x9F09, 0x9F0F, 0x9F10,
+ 0x9F11, 0x9F12, 0x9F14, 0x9F16, 0x9F17, 0x9F19, 0x9F1A, 0x9F1B,
+ 0x9F1F, 0x9F22, 0x9F26, 0x9F2A, 0x9F2B, 0x9F2F, 0x9F31, 0x9F32,
+ 0x9F34, 0x9F37, 0x9F39, 0x9F3A, 0x9F3C, 0x9F3D, 0x9F3F, 0x9F41,
+ 0x9F43, 0x9F44, 0x9F45, 0x9F46, 0x9F47, 0x9F53, 0x9F55, 0x9F56,
+ 0x9F57, 0x9F58, 0x9F5A, 0x9F5D, 0x9F5E, 0x9F68, 0x9F69, 0x9F6D,
+ 0x9F6E, 0x9F6F, 0x9F70, 0x9F71, 0x9F73, 0x9F75, 0x9F7A, 0x9F7D,
+ 0x9F8F, 0x9F90, 0x9F91, 0x9F92, 0x9F94, 0x9F96, 0x9F97, 0x9F9E,
+ 0x9FA1, 0x9FA2, 0x9FA3, 0x9FA5,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short euc_to_utf8_8FF3[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174,
+ 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x2160, 0x2161,
+};
+const unsigned short euc_to_utf8_8FF4[] = {
+            0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168,
+    0x2169, 0xff07, 0xff02, 0x3231, 0x2116, 0x2121, 0x70bb, 0x4efc,
+    0x50f4, 0x51ec, 0x5307, 0x5324, 0xfa0e, 0x548a, 0x5759, 0xfa0f,
+    0xfa10, 0x589e, 0x5bec, 0x5cf5, 0x5d53, 0xfa11, 0x5fb7, 0x6085,
+    0x6120, 0x654e, 0x663b, 0x6665, 0xfa12, 0xf929, 0x6801, 0xfa13,
+    0xfa14, 0x6a6b, 0x6ae2, 0x6df8, 0x6df2, 0x7028, 0xfa15, 0xfa16,
+    0x7501, 0x7682, 0x769e, 0xfa17, 0x7930, 0xfa18, 0xfa19, 0xfa1a,
+    0xfa1b, 0x7ae7, 0xfa1c, 0xfa1d, 0x7da0, 0x7dd6, 0xfa1e, 0x8362,
+    0xfa1f, 0x85b0, 0xfa20, 0xfa21, 0x8807, 0xfa22, 0x8b7f, 0x8cf4,
+    0x8d76, 0xfa23, 0xfa24, 0xfa25, 0x90de, 0xfa26, 0x9115, 0xfa27,
+    0xfa28, 0x9592, 0xf9dc, 0xfa29, 0x973b, 0x974d, 0x9751, 0xfa2a,
+    0xfa2b, 0xfa2c, 0x999e, 0x9ad9, 0x9b72, 0xfa2d, 0x9ed1,
+};
+#endif /* X0212_ENABLE */
+
+const unsigned short euc_to_utf8_1byte[] = {
+         0xFF61, 0xFF62, 0xFF63, 0xFF64, 0xFF65, 0xFF66, 0xFF67,
+ 0xFF68, 0xFF69, 0xFF6A, 0xFF6B, 0xFF6C, 0xFF6D, 0xFF6E, 0xFF6F,
+ 0xFF70, 0xFF71, 0xFF72, 0xFF73, 0xFF74, 0xFF75, 0xFF76, 0xFF77,
+ 0xFF78, 0xFF79, 0xFF7A, 0xFF7B, 0xFF7C, 0xFF7D, 0xFF7E, 0xFF7F,
+ 0xFF80, 0xFF81, 0xFF82, 0xFF83, 0xFF84, 0xFF85, 0xFF86, 0xFF87,
+ 0xFF88, 0xFF89, 0xFF8A, 0xFF8B, 0xFF8C, 0xFF8D, 0xFF8E, 0xFF8F,
+ 0xFF90, 0xFF91, 0xFF92, 0xFF93, 0xFF94, 0xFF95, 0xFF96, 0xFF97,
+ 0xFF98, 0xFF99, 0xFF9A, 0xFF9B, 0xFF9C, 0xFF9D, 0xFF9E, 0xFF9F,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x00A9, 0x2122,
+};
+const unsigned short *const euc_to_utf8_2bytes[] = {
+                 euc_to_utf8_A1, euc_to_utf8_A2, euc_to_utf8_A3,
+ euc_to_utf8_A4, euc_to_utf8_A5, euc_to_utf8_A6, euc_to_utf8_A7,
+ euc_to_utf8_A8, euc_to_utf8_A9, euc_to_utf8_AA, euc_to_utf8_AB,
+ euc_to_utf8_AC, euc_to_utf8_AD, euc_to_utf8_AE, euc_to_utf8_AF,
+ euc_to_utf8_B0, euc_to_utf8_B1, euc_to_utf8_B2, euc_to_utf8_B3,
+ euc_to_utf8_B4, euc_to_utf8_B5, euc_to_utf8_B6, euc_to_utf8_B7,
+ euc_to_utf8_B8, euc_to_utf8_B9, euc_to_utf8_BA, euc_to_utf8_BB,
+ euc_to_utf8_BC, euc_to_utf8_BD, euc_to_utf8_BE, euc_to_utf8_BF,
+ euc_to_utf8_C0, euc_to_utf8_C1, euc_to_utf8_C2, euc_to_utf8_C3,
+ euc_to_utf8_C4, euc_to_utf8_C5, euc_to_utf8_C6, euc_to_utf8_C7,
+ euc_to_utf8_C8, euc_to_utf8_C9, euc_to_utf8_CA, euc_to_utf8_CB,
+ euc_to_utf8_CC, euc_to_utf8_CD, euc_to_utf8_CE, euc_to_utf8_CF,
+ euc_to_utf8_D0, euc_to_utf8_D1, euc_to_utf8_D2, euc_to_utf8_D3,
+ euc_to_utf8_D4, euc_to_utf8_D5, euc_to_utf8_D6, euc_to_utf8_D7,
+ euc_to_utf8_D8, euc_to_utf8_D9, euc_to_utf8_DA, euc_to_utf8_DB,
+ euc_to_utf8_DC, euc_to_utf8_DD, euc_to_utf8_DE, euc_to_utf8_DF,
+ euc_to_utf8_E0, euc_to_utf8_E1, euc_to_utf8_E2, euc_to_utf8_E3,
+ euc_to_utf8_E4, euc_to_utf8_E5, euc_to_utf8_E6, euc_to_utf8_E7,
+ euc_to_utf8_E8, euc_to_utf8_E9, euc_to_utf8_EA, euc_to_utf8_EB,
+ euc_to_utf8_EC, euc_to_utf8_ED, euc_to_utf8_EE, euc_to_utf8_EF,
+ euc_to_utf8_F0, euc_to_utf8_F1, euc_to_utf8_F2, euc_to_utf8_F3,
+ euc_to_utf8_F4, euc_to_utf8_F5,              0,              0,
+              0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
+ euc_to_utf8_FC,              0,              0,
+};
+/* Microsoft UCS Mapping Compatible */
+const unsigned short *const euc_to_utf8_2bytes_ms[] = {
+                 euc_to_utf8_A1_ms, euc_to_utf8_A2_ms, euc_to_utf8_A3,
+ euc_to_utf8_A4, euc_to_utf8_A5, euc_to_utf8_A6, euc_to_utf8_A7,
+ euc_to_utf8_A8, euc_to_utf8_A9, euc_to_utf8_AA, euc_to_utf8_AB,
+ euc_to_utf8_AC, euc_to_utf8_AD, euc_to_utf8_AE, euc_to_utf8_AF,
+ euc_to_utf8_B0, euc_to_utf8_B1, euc_to_utf8_B2, euc_to_utf8_B3,
+ euc_to_utf8_B4, euc_to_utf8_B5, euc_to_utf8_B6, euc_to_utf8_B7,
+ euc_to_utf8_B8, euc_to_utf8_B9, euc_to_utf8_BA, euc_to_utf8_BB,
+ euc_to_utf8_BC, euc_to_utf8_BD, euc_to_utf8_BE, euc_to_utf8_BF,
+ euc_to_utf8_C0, euc_to_utf8_C1, euc_to_utf8_C2, euc_to_utf8_C3,
+ euc_to_utf8_C4, euc_to_utf8_C5, euc_to_utf8_C6, euc_to_utf8_C7,
+ euc_to_utf8_C8, euc_to_utf8_C9, euc_to_utf8_CA, euc_to_utf8_CB,
+ euc_to_utf8_CC, euc_to_utf8_CD, euc_to_utf8_CE, euc_to_utf8_CF,
+ euc_to_utf8_D0, euc_to_utf8_D1, euc_to_utf8_D2, euc_to_utf8_D3,
+ euc_to_utf8_D4, euc_to_utf8_D5, euc_to_utf8_D6, euc_to_utf8_D7,
+ euc_to_utf8_D8, euc_to_utf8_D9, euc_to_utf8_DA, euc_to_utf8_DB,
+ euc_to_utf8_DC, euc_to_utf8_DD, euc_to_utf8_DE, euc_to_utf8_DF,
+ euc_to_utf8_E0, euc_to_utf8_E1, euc_to_utf8_E2, euc_to_utf8_E3,
+ euc_to_utf8_E4, euc_to_utf8_E5, euc_to_utf8_E6, euc_to_utf8_E7,
+ euc_to_utf8_E8, euc_to_utf8_E9, euc_to_utf8_EA, euc_to_utf8_EB,
+ euc_to_utf8_EC, euc_to_utf8_ED, euc_to_utf8_EE, euc_to_utf8_EF,
+ euc_to_utf8_F0, euc_to_utf8_F1, euc_to_utf8_F2, euc_to_utf8_F3,
+ euc_to_utf8_F4, euc_to_utf8_F5,              0,              0,
+              0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
+ euc_to_utf8_FC_ms,              0,              0,
+};
+
+#ifdef X0212_ENABLE
+const unsigned short *const x0212_to_utf8_2bytes[] = {
+                              0, euc_to_utf8_8FA2,              0,
+              0,              0, euc_to_utf8_8FA6, euc_to_utf8_8FA7,
+              0, euc_to_utf8_8FA9, euc_to_utf8_8FAA, euc_to_utf8_8FAB,
+              0,              0,              0,              0,
+ euc_to_utf8_8FB0, euc_to_utf8_8FB1, euc_to_utf8_8FB2, euc_to_utf8_8FB3,
+ euc_to_utf8_8FB4, euc_to_utf8_8FB5, euc_to_utf8_8FB6, euc_to_utf8_8FB7,
+ euc_to_utf8_8FB8, euc_to_utf8_8FB9, euc_to_utf8_8FBA, euc_to_utf8_8FBB,
+ euc_to_utf8_8FBC, euc_to_utf8_8FBD, euc_to_utf8_8FBE, euc_to_utf8_8FBF,
+ euc_to_utf8_8FC0, euc_to_utf8_8FC1, euc_to_utf8_8FC2, euc_to_utf8_8FC3,
+ euc_to_utf8_8FC4, euc_to_utf8_8FC5, euc_to_utf8_8FC6, euc_to_utf8_8FC7,
+ euc_to_utf8_8FC8, euc_to_utf8_8FC9, euc_to_utf8_8FCA, euc_to_utf8_8FCB,
+ euc_to_utf8_8FCC, euc_to_utf8_8FCD, euc_to_utf8_8FCE, euc_to_utf8_8FCF,
+ euc_to_utf8_8FD0, euc_to_utf8_8FD1, euc_to_utf8_8FD2, euc_to_utf8_8FD3,
+ euc_to_utf8_8FD4, euc_to_utf8_8FD5, euc_to_utf8_8FD6, euc_to_utf8_8FD7,
+ euc_to_utf8_8FD8, euc_to_utf8_8FD9, euc_to_utf8_8FDA, euc_to_utf8_8FDB,
+ euc_to_utf8_8FDC, euc_to_utf8_8FDD, euc_to_utf8_8FDE, euc_to_utf8_8FDF,
+ euc_to_utf8_8FE0, euc_to_utf8_8FE1, euc_to_utf8_8FE2, euc_to_utf8_8FE3,
+ euc_to_utf8_8FE4, euc_to_utf8_8FE5, euc_to_utf8_8FE6, euc_to_utf8_8FE7,
+ euc_to_utf8_8FE8, euc_to_utf8_8FE9, euc_to_utf8_8FEA, euc_to_utf8_8FEB,
+ euc_to_utf8_8FEC, euc_to_utf8_8FED,              0,              0,
+              0,              0,              0,       euc_to_utf8_8FF3,
+ euc_to_utf8_8FF4,            0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,};
+#endif /* X0212_ENABLE */
+#endif /* UTF8_OUTPUT_ENABLE */
+
+#ifdef UTF8_INPUT_ENABLE
+const unsigned short utf8_to_euc_C2[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xA242, 0x2171, 0x2172, 0xA270, 0x216F, 0xA243, 0x2178,
+ 0x212F, 0xA26D, 0xA26C,      0, 0x224C,      0, 0xA26E, 0xA234,
+ 0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
+ 0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
+};
+const unsigned short utf8_to_euc_C2_ms[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xA242, 0x2171, 0x2172, 0xA270,   0x5C, 0xA243, 0x2178,
+ 0x212F, 0xA26D, 0xA26C,      0, 0x224C,      0, 0xA26E, 0xA234,
+ 0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
+ 0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
+};
+const unsigned short utf8_to_euc_C2_932[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,   0x21, 0x2171, 0x2172,      0,   0x5C,   0x7C, 0x2178,
+ 0x212F,   0x63,   0x61, 0x2263, 0x224C,   0x2D,   0x52, 0x2131,
+ 0x216B, 0x215E,   0x32,   0x33, 0x212D, 0x264C, 0x2279, 0x2126,
+ 0x2124,   0x31,   0x6F, 0x2264,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_C3[] = {
+ 0xAA22, 0xAA21, 0xAA24, 0xAA2A, 0xAA23, 0xAA29, 0xA921, 0xAA2E,
+ 0xAA32, 0xAA31, 0xAA34, 0xAA33, 0xAA40, 0xAA3F, 0xAA42, 0xAA41,
+      0, 0xAA50, 0xAA52, 0xAA51, 0xAA54, 0xAA58, 0xAA53, 0x215F,
+ 0xA92C, 0xAA63, 0xAA62, 0xAA65, 0xAA64, 0xAA72, 0xA930, 0xA94E,
+ 0xAB22, 0xAB21, 0xAB24, 0xAB2A, 0xAB23, 0xAB29, 0xA941, 0xAB2E,
+ 0xAB32, 0xAB31, 0xAB34, 0xAB33, 0xAB40, 0xAB3F, 0xAB42, 0xAB41,
+ 0xA943, 0xAB50, 0xAB52, 0xAB51, 0xAB54, 0xAB58, 0xAB53, 0x2160,
+ 0xA94C, 0xAB63, 0xAB62, 0xAB65, 0xAB64, 0xAB72, 0xA950, 0xAB73,
+};
+const unsigned short utf8_to_euc_C3_932[] = {
+   0x41,   0x41,   0x41,   0x41,   0x41,   0x41,   0x41,   0x43,
+   0x45,   0x45,   0x45,   0x45,   0x49,   0x49,   0x49,   0x49,
+   0x44,   0x4E,   0x4F,   0x4F,   0x4F,   0x4F,   0x4F, 0x215F,
+   0x4F,   0x55,   0x55,   0x55,   0x55,   0x59,   0x54,   0x73,
+   0x61,   0x61,   0x61,   0x61,   0x61,   0x61,   0x61,   0x63,
+   0x65,   0x65,   0x65,   0x65,   0x69,   0x69,   0x69,   0x69,
+   0x64,   0x6E,   0x6F,   0x6F,   0x6F,   0x6F,   0x6F, 0x2160,
+   0x6F,   0x75,   0x75,   0x75,   0x75,   0x79,   0x74,   0x79,
+};
+const unsigned short utf8_to_euc_C4[] = {
+ 0xAA27, 0xAB27, 0xAA25, 0xAB25, 0xAA28, 0xAB28, 0xAA2B, 0xAB2B,
+ 0xAA2C, 0xAB2C, 0xAA2F, 0xAB2F, 0xAA2D, 0xAB2D, 0xAA30, 0xAB30,
+ 0xA922, 0xA942, 0xAA37, 0xAB37,      0,      0, 0xAA36, 0xAB36,
+ 0xAA38, 0xAB38, 0xAA35, 0xAB35, 0xAA3A, 0xAB3A, 0xAA3B, 0xAB3B,
+ 0xAA3D, 0xAB3D, 0xAA3C,      0, 0xAA3E, 0xAB3E, 0xA924, 0xA944,
+ 0xAA47, 0xAB47, 0xAA45, 0xAB45,      0,      0, 0xAA46, 0xAB46,
+ 0xAA44, 0xA945, 0xA926, 0xA946, 0xAA48, 0xAB48, 0xAA49, 0xAB49,
+ 0xA947, 0xAA4A, 0xAB4A, 0xAA4C, 0xAB4C, 0xAA4B, 0xAB4B, 0xA929,
+};
+const unsigned short utf8_to_euc_C5[] = {
+ 0xA949, 0xA928, 0xA948, 0xAA4D, 0xAB4D, 0xAA4F, 0xAB4F, 0xAA4E,
+ 0xAB4E, 0xA94A, 0xA92B, 0xA94B, 0xAA57, 0xAB57,      0,      0,
+ 0xAA56, 0xAB56, 0xA92D, 0xA94D, 0xAA59, 0xAB59, 0xAA5B, 0xAB5B,
+ 0xAA5A, 0xAB5A, 0xAA5C, 0xAB5C, 0xAA5D, 0xAB5D, 0xAA5F, 0xAB5F,
+ 0xAA5E, 0xAB5E, 0xAA61, 0xAB61, 0xAA60, 0xAB60, 0xA92F, 0xA94F,
+ 0xAA6C, 0xAB6C, 0xAA69, 0xAB69, 0xAA66, 0xAB66, 0xAA6B, 0xAB6B,
+ 0xAA68, 0xAB68, 0xAA6A, 0xAB6A, 0xAA71, 0xAB71, 0xAA74, 0xAB74,
+ 0xAA73, 0xAA75, 0xAB75, 0xAA77, 0xAB77, 0xAA76, 0xAB76,      0,
+};
+const unsigned short utf8_to_euc_C7[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xAA26, 0xAB26, 0xAA43,
+ 0xAB43, 0xAA55, 0xAB55, 0xAA67, 0xAB67, 0xAA70, 0xAB70, 0xAA6D,
+ 0xAB6D, 0xAA6F, 0xAB6F, 0xAA6E, 0xAB6E,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xAB39,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_CB[] = {
+      0,      0,      0,      0,      0,      0,      0, 0xA230,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xA22F, 0xA232, 0xA236, 0xA235,      0, 0xA233,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_CE[] = {
+      0,      0,      0,      0, 0xA238, 0xA239, 0xA661,      0,
+ 0xA662, 0xA663, 0xA664,      0, 0xA667,      0, 0xA669, 0xA66C,
+ 0xA676, 0x2621, 0x2622, 0x2623, 0x2624, 0x2625, 0x2626, 0x2627,
+ 0x2628, 0x2629, 0x262A, 0x262B, 0x262C, 0x262D, 0x262E, 0x262F,
+ 0x2630, 0x2631,      0, 0x2632, 0x2633, 0x2634, 0x2635, 0x2636,
+ 0x2637, 0x2638, 0xA665, 0xA66A, 0xA671, 0xA672, 0xA673, 0xA674,
+ 0xA67B, 0x2641, 0x2642, 0x2643, 0x2644, 0x2645, 0x2646, 0x2647,
+ 0x2648, 0x2649, 0x264A, 0x264B, 0x264C, 0x264D, 0x264E, 0x264F,
+};
+const unsigned short utf8_to_euc_CF[] = {
+ 0x2650, 0x2651, 0xA678, 0x2652, 0x2653, 0x2654, 0x2655, 0x2656,
+ 0x2657, 0x2658, 0xA675, 0xA67A, 0xA677, 0xA679, 0xA67C,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_D0[] = {
+      0, 0x2727, 0xA742, 0xA743, 0xA744, 0xA745, 0xA746, 0xA747,
+ 0xA748, 0xA749, 0xA74A, 0xA74B, 0xA74C,      0, 0xA74D, 0xA74E,
+ 0x2721, 0x2722, 0x2723, 0x2724, 0x2725, 0x2726, 0x2728, 0x2729,
+ 0x272A, 0x272B, 0x272C, 0x272D, 0x272E, 0x272F, 0x2730, 0x2731,
+ 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, 0x2738, 0x2739,
+ 0x273A, 0x273B, 0x273C, 0x273D, 0x273E, 0x273F, 0x2740, 0x2741,
+ 0x2751, 0x2752, 0x2753, 0x2754, 0x2755, 0x2756, 0x2758, 0x2759,
+ 0x275A, 0x275B, 0x275C, 0x275D, 0x275E, 0x275F, 0x2760, 0x2761,
+};
+const unsigned short utf8_to_euc_D1[] = {
+ 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x2768, 0x2769,
+ 0x276A, 0x276B, 0x276C, 0x276D, 0x276E, 0x276F, 0x2770, 0x2771,
+      0, 0x2757, 0xA772, 0xA773, 0xA774, 0xA775, 0xA776, 0xA777,
+ 0xA778, 0xA779, 0xA77A, 0xA77B, 0xA77C,      0, 0xA77D, 0xA77E,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E280[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x213E,      0,      0,      0, 0x213D, 0x213D, 0x2142,      0,
+ 0x2146, 0x2147,      0,      0, 0x2148, 0x2149,      0,      0,
+ 0x2277, 0x2278,      0,      0,      0, 0x2145, 0x2144,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
+      0,      0,      0, 0x2228,      0,      0, 0x2131,      0,
+};
+const unsigned short utf8_to_euc_E280_ms[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x213E,      0,      0,      0, 0x213D, 0x213D, 0x2142,      0,
+ 0x2146, 0x2147,      0,      0, 0x2148, 0x2149,      0,      0,
+ 0x2277, 0x2278,      0,      0,      0, 0x2145, 0x2144,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
+      0,      0,      0, 0x2228,      0,      0,   0x7E,      0,
+};
+const unsigned short utf8_to_euc_E280_932[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x213E,      0,      0,      0,      0, 0x213D,      0,      0,
+ 0x2146, 0x2147,      0,      0, 0x2148, 0x2149,      0,      0,
+ 0x2277, 0x2278,      0,      0,      0, 0x2145, 0x2144,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
+      0,      0,      0, 0x2228,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E284[] = {
+      0,      0,      0, 0x216E,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x2D62,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x2D64, 0xA26F,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2272,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E285[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2D35, 0x2D36, 0x2D37, 0x2D38, 0x2D39, 0x2D3A, 0x2D3B, 0x2D3C,
+ 0x2D3D, 0x2D3E,      0,      0,      0,      0,      0,      0,
+ 0xF373, 0xF374, 0xF375, 0xF376, 0xF377, 0xF378, 0xF379, 0xF37A,
+ 0xF37B, 0xF37C,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E286[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x222B, 0x222C, 0x222A, 0x222D,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E287[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x224D,      0, 0x224E,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E288[] = {
+ 0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260,
+ 0x223A,      0,      0, 0x223B,      0,      0,      0,      0,
+      0, 0x2D74, 0x215D,      0,      0,      0,      0,      0,
+      0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2D78,
+ 0x225C,      0,      0,      0,      0, 0x2142,      0, 0x224A,
+ 0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2D73,      0,
+      0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
+      0,      0,      0,      0,      0, 0x2266,      0,      0,
+};
+const unsigned short utf8_to_euc_E288_932[] = {
+ 0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260,
+ 0x223A,      0,      0, 0x223B,      0,      0,      0,      0,
+      0, 0x2D74,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2D78,
+ 0x225C,      0,      0,      0,      0, 0x2142,      0, 0x224A,
+ 0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2D73,      0,
+      0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
+      0,      0,      0,      0,      0, 0x2266,      0,      0,
+};
+const unsigned short utf8_to_euc_E289[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2262,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2162, 0x2261,      0,      0,      0,      0, 0x2165, 0x2166,
+      0,      0, 0x2263, 0x2264,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E28A[] = {
+      0,      0, 0x223E, 0x223F,      0,      0, 0x223C, 0x223D,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x225D,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x2D79,
+};
+const unsigned short utf8_to_euc_E28C[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x225E,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E291[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2D21, 0x2D22, 0x2D23, 0x2D24, 0x2D25, 0x2D26, 0x2D27, 0x2D28,
+ 0x2D29, 0x2D2A, 0x2D2B, 0x2D2C, 0x2D2D, 0x2D2E, 0x2D2F, 0x2D30,
+ 0x2D31, 0x2D32, 0x2D33, 0x2D34,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E294[] = {
+ 0x2821, 0x282C, 0x2822, 0x282D,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x2823,      0,      0, 0x282E,
+ 0x2824,      0,      0, 0x282F, 0x2826,      0,      0, 0x2831,
+ 0x2825,      0,      0, 0x2830, 0x2827, 0x283C,      0,      0,
+ 0x2837,      0,      0, 0x2832, 0x2829, 0x283E,      0,      0,
+ 0x2839,      0,      0, 0x2834, 0x2828,      0,      0, 0x2838,
+ 0x283D,      0,      0, 0x2833, 0x282A,      0,      0, 0x283A,
+ 0x283F,      0,      0, 0x2835, 0x282B,      0,      0, 0x283B,
+};
+const unsigned short utf8_to_euc_E295[] = {
+      0,      0, 0x2840,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2836,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E296[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2223, 0x2222,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2225, 0x2224,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x2227, 0x2226,      0,      0,
+};
+const unsigned short utf8_to_euc_E297[] = {
+      0,      0,      0,      0,      0,      0, 0x2221, 0x217E,
+      0,      0,      0, 0x217B,      0,      0, 0x217D, 0x217C,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x227E,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E298[] = {
+      0,      0,      0,      0,      0, 0x217A, 0x2179,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E299[] = {
+ 0x216A,      0, 0x2169,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2276,      0,      0, 0x2275,      0, 0x2274,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E380[] = {
+ 0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B,
+ 0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
+ 0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D,      0,      0,
+      0,      0,      0,      0, 0x2141, 0x2D60,      0, 0x2D61,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E380_932[] = {
+ 0x2121, 0x2122, 0x2123, 0x2137,      0, 0x2139, 0x213A, 0x213B,
+ 0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
+ 0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D,      0,      0,
+      0,      0,      0,      0,      0, 0x2D60,      0, 0x2D61,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E381[] = {
+      0, 0x2421, 0x2422, 0x2423, 0x2424, 0x2425, 0x2426, 0x2427,
+ 0x2428, 0x2429, 0x242A, 0x242B, 0x242C, 0x242D, 0x242E, 0x242F,
+ 0x2430, 0x2431, 0x2432, 0x2433, 0x2434, 0x2435, 0x2436, 0x2437,
+ 0x2438, 0x2439, 0x243A, 0x243B, 0x243C, 0x243D, 0x243E, 0x243F,
+ 0x2440, 0x2441, 0x2442, 0x2443, 0x2444, 0x2445, 0x2446, 0x2447,
+ 0x2448, 0x2449, 0x244A, 0x244B, 0x244C, 0x244D, 0x244E, 0x244F,
+ 0x2450, 0x2451, 0x2452, 0x2453, 0x2454, 0x2455, 0x2456, 0x2457,
+ 0x2458, 0x2459, 0x245A, 0x245B, 0x245C, 0x245D, 0x245E, 0x245F,
+};
+const unsigned short utf8_to_euc_E382[] = {
+ 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
+ 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
+ 0x2470, 0x2471, 0x2472, 0x2473,      0,      0,      0,      0,
+      0,      0,      0, 0x212B, 0x212C, 0x2135, 0x2136,      0,
+      0, 0x2521, 0x2522, 0x2523, 0x2524, 0x2525, 0x2526, 0x2527,
+ 0x2528, 0x2529, 0x252A, 0x252B, 0x252C, 0x252D, 0x252E, 0x252F,
+ 0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
+ 0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
+};
+const unsigned short utf8_to_euc_E382_932[] = {
+ 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
+ 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
+ 0x2470, 0x2471, 0x2472, 0x2473, 0x2574,      0,      0,      0,
+      0,      0,      0, 0x212B, 0x212C, 0x2135, 0x2136,      0,
+      0, 0x2521, 0x2522, 0x2523, 0x2524, 0x2525, 0x2526, 0x2527,
+ 0x2528, 0x2529, 0x252A, 0x252B, 0x252C, 0x252D, 0x252E, 0x252F,
+ 0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
+ 0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
+};
+const unsigned short utf8_to_euc_E383[] = {
+ 0x2540, 0x2541, 0x2542, 0x2543, 0x2544, 0x2545, 0x2546, 0x2547,
+ 0x2548, 0x2549, 0x254A, 0x254B, 0x254C, 0x254D, 0x254E, 0x254F,
+ 0x2550, 0x2551, 0x2552, 0x2553, 0x2554, 0x2555, 0x2556, 0x2557,
+ 0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E, 0x255F,
+ 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567,
+ 0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x256D, 0x256E, 0x256F,
+ 0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576,      0,
+      0,      0,      0, 0x2126, 0x213C, 0x2133, 0x2134,      0,
+};
+const unsigned short utf8_to_euc_E388[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x2D6A, 0x2D6B,      0,      0,      0,      0,      0,
+      0, 0x2D6C,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E38A[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x2D65, 0x2D66, 0x2D67, 0x2D68,
+ 0x2D69,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E38C[] = {
+      0,      0,      0, 0x2D46,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x2D4A,      0,      0,
+      0,      0,      0,      0, 0x2D41,      0,      0,      0,
+ 0x2D44,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x2D42, 0x2D4C,      0,      0, 0x2D4B, 0x2D45,
+      0,      0,      0, 0x2D4D,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x2D47,      0,
+      0,      0,      0, 0x2D4F,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E38D[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x2D40, 0x2D4E,      0,      0, 0x2D43,      0,      0,
+      0, 0x2D48,      0,      0,      0,      0,      0, 0x2D49,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x2D5F, 0x2D6F, 0x2D6E, 0x2D6D,      0,
+};
+const unsigned short utf8_to_euc_E38E[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x2D53, 0x2D54,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x2D50, 0x2D51, 0x2D52,      0,
+      0, 0x2D56,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E38F[] = {
+      0,      0,      0,      0, 0x2D55,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x2D63,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E4B8[] = {
+ 0x306C, 0x437A, 0xB021, 0x3C37, 0xB022, 0xB023,      0, 0x4B7C,
+ 0x3E66, 0x3B30, 0x3E65, 0x323C, 0xB024, 0x4954, 0x4D3F,      0,
+ 0x5022, 0x312F, 0xB025,      0, 0x336E, 0x5023, 0x4024, 0x5242,
+ 0x3556, 0x4A3A,      0,      0,      0,      0, 0x3E67, 0xB026,
+      0, 0x4E3E,      0, 0xB027, 0xB028,      0, 0x4A42,      0,
+ 0xB029,      0, 0x5024, 0xB02A,      0, 0x4366, 0xB02B, 0xB02C,
+ 0xB02D, 0x5025, 0x367A,      0,      0, 0xB02E, 0x5026,      0,
+ 0x345D, 0x4330,      0, 0x3C67, 0x5027,      0,      0, 0x5028,
+};
+const unsigned short utf8_to_euc_E4B9[] = {
+ 0xB02F, 0xB030, 0x5029, 0x4735, 0xB031, 0x3557,      0, 0xB032,
+      0,      0,      0, 0x4737,      0, 0x4663, 0x3843, 0x4B33,
+      0, 0xB033,      0,      0,      0, 0x6949, 0x502A, 0x3E68,
+ 0x502B, 0x3235, 0xB034,      0, 0xB035, 0x3665, 0x3870, 0x4C69,
+      0,      0, 0x5626, 0xB036,      0,      0,      0,      0,
+ 0xB037, 0xB038,      0,      0,      0,      0,      0,      0,
+      0, 0x4D70,      0, 0x467D, 0xB039, 0xB03A,      0,      0,
+      0, 0xB03B,      0,      0,      0,      0, 0x3425, 0xB03C,
+};
+const unsigned short utf8_to_euc_E4BA[] = {
+ 0x3535,      0, 0x502C,      0,      0, 0x502D, 0x4E3B,      0,
+ 0x4D3D, 0x4168, 0x502F, 0x3B76, 0x4673, 0xB03D, 0x5032,      0,
+      0, 0x313E, 0x385F,      0, 0x385E, 0x3066, 0xB03E, 0xB03F,
+ 0x4F4B, 0x4F4A,      0, 0x3A33, 0x3021, 0xB040, 0x5033, 0x5034,
+ 0x5035, 0x4B34, 0x5036,      0, 0x3872, 0x3067, 0x4B72,      0,
+ 0x357C,      0,      0, 0x357D, 0x357E, 0x4462, 0x4E3C, 0xB041,
+ 0x5037,      0,      0, 0x5038,      0,      0, 0x5039,      0,
+      0, 0xB042, 0x3F4D,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E4BB[] = {
+ 0x3D3A, 0x3F4E, 0x503E, 0xB043, 0x503C,      0, 0x503D, 0x3558,
+      0,      0, 0x3A23, 0x3270,      0, 0x503B, 0x503A, 0x4A29,
+ 0xB044,      0,      0,      0, 0x3B46, 0x3B45, 0x423E, 0x503F,
+ 0x4955, 0x4067, 0xB045, 0xB046,      0, 0x2138, 0x5040, 0x5042,
+ 0xB047, 0xB048, 0xB049, 0x4265, 0x4E61, 0x304A,      0,      0,
+ 0xB04A,      0,      0,      0,      0, 0x5041, 0x323E, 0xB04B,
+ 0x3644, 0xB04C, 0x4367, 0xB04D,      0, 0xB04E, 0x376F, 0x5043,
+      0,      0,      0, 0x4724, 0xF42F, 0xB04F, 0xB050, 0xB051,
+};
+const unsigned short utf8_to_euc_E4BC[] = {
+ 0xB052, 0x346B, 0xB053, 0xB054,      0,      0,      0,      0,
+ 0xB055, 0x5044, 0x304B, 0xB056, 0xB057, 0x3860, 0x346C, 0x497A,
+ 0x4832, 0x3559, 0xB058,      0,      0, 0xB059, 0xB05A, 0xB05B,
+      0, 0xB05C, 0x3271,      0, 0x5067, 0x4541,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xB05D, 0x476C,
+ 0x5046, 0xB05E,      0, 0xB060, 0x483C, 0xB061, 0x4E62, 0xB062,
+ 0x3F2D, 0xB063, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xB065,      0,
+};
+const unsigned short utf8_to_euc_E4BD[] = {
+ 0xB066,      0, 0xB067, 0x4451,      0,      0, 0x4322, 0x504A,
+ 0xB068, 0xB069,      0, 0xB06A, 0xB06B, 0x304C, 0x4463, 0x3D3B,
+ 0x3A34, 0x4D24, 0xB06C, 0x424E, 0xB06D, 0x323F, 0xB06E, 0x5049,
+ 0xB06F, 0x4D3E, 0x5045, 0x5047, 0x3A6E, 0x5048, 0x5524, 0xB070,
+ 0xB05F,      0,      0, 0xB071,      0,      0,      0,      0,
+      0, 0x5050, 0xB072,      0, 0xB073,      0, 0xB074, 0x5053,
+ 0x5051, 0xB075,      0, 0x3242,      0, 0x4A3B, 0x504B, 0xB076,
+ 0xB077, 0xB078, 0xB079, 0x504F, 0x3873, 0xB07A, 0xB07B, 0x3B48,
+};
+const unsigned short utf8_to_euc_E4BE[] = {
+      0, 0xB07C, 0xB07D, 0x3426, 0xB07E, 0xB121, 0x5054,      0,
+ 0x504C, 0xB122, 0xB123, 0x4E63, 0xB124, 0x3B78, 0xB125, 0x504D,
+ 0xB126, 0x5052, 0xB127, 0xB128, 0xB129,      0, 0x5055, 0xB12A,
+ 0x504E, 0xB12B, 0xB12C, 0x3621,      0, 0x304D, 0xB12D, 0xB12E,
+ 0x3622, 0x3241,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x5525,      0, 0x4B79, 0x496E, 0x3874,
+      0,      0, 0xB12F,      0,      0, 0x3F2F, 0x4E37, 0xB130,
+      0, 0xB131,      0, 0xB132, 0xB133, 0xB134, 0xB135, 0x4A58,
+};
+const unsigned short utf8_to_euc_E4BF[] = {
+ 0xB136, 0xB137, 0x3738, 0x4225, 0x3264, 0xB138, 0xB139,      0,
+ 0xB13A, 0xB13B, 0x3D53, 0xB13C, 0xB13D, 0xB13E, 0x5059, 0xB13F,
+ 0x505E, 0x505C, 0xB140,      0, 0x5057,      0,      0, 0x422F,
+ 0x505A,      0, 0x505D, 0x505B, 0xB141, 0x4A5D,      0, 0x5058,
+ 0xB142, 0x3F2E, 0xB143, 0x4B73, 0x505F, 0x5060,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x3D24, 0x506D,
+ 0xB144,      0, 0xB145, 0x4750,      0, 0x4936, 0x5068,      0,
+ 0x4A70,      0, 0x3236,      0, 0xB146, 0xB147, 0x506C, 0xB148,
+};
+const unsigned short utf8_to_euc_E580[] = {
+ 0xB149, 0xB14A,      0,      0, 0xB14B, 0x5066, 0x506F, 0xB14C,
+      0, 0x4152, 0xB14D, 0x3844, 0xB14E, 0x475C, 0xB14F, 0x6047,
+ 0xB150, 0x506E, 0x455D, 0xB151, 0x5063,      0, 0x3876, 0xB152,
+ 0xB153, 0x3875, 0x5061, 0xB154, 0xB155, 0xB156, 0xB157, 0x3C5A,
+      0, 0x5069, 0xB158, 0x4A6F, 0x434D, 0x5065, 0x3771, 0xB159,
+ 0x5062, 0x506A, 0x5064, 0x4E51, 0x506B, 0x4F41, 0xB15A,      0,
+ 0xB15B,      0, 0xB15C, 0xB15D,      0, 0xB15E, 0x3666,      0,
+      0, 0x3770,      0, 0xB176,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E581[] = {
+ 0xB15F, 0xB160, 0xB161, 0x5070,      0, 0xB162, 0xB163, 0x5071,
+ 0x5075, 0x304E, 0xB164,      0, 0xB165,      0, 0xB166, 0x4A50,
+ 0x5074, 0xB167, 0xB168, 0xB169,      0, 0x5073, 0x5077, 0xB16A,
+      0, 0xB16B, 0x5076,      0, 0x4464,      0,      0, 0xB16C,
+ 0xB16D,      0, 0xB16E, 0xB16F,      0, 0x3772, 0xB170, 0xB171,
+      0,      0, 0xB172,      0, 0x5078, 0xB173,      0,      0,
+ 0xB174, 0xB175, 0x3C45,      0, 0x4226, 0x4465, 0x3676,      0,
+ 0x5079,      0,      0,      0,      0, 0x3536,      0,      0,
+};
+const unsigned short utf8_to_euc_E582[] = {
+ 0x507A, 0xB177,      0, 0xB178, 0xB179, 0x507C, 0xB17A,      0,
+      0,      0, 0xB17B,      0,      0, 0x4B35, 0xB17C, 0xB17D,
+ 0xB17E, 0x3766, 0xB221, 0xB222, 0xB223,      0, 0xB224,      0,
+ 0x3B31, 0x4877, 0x507B, 0xB225, 0xB226,      0, 0xB227, 0xB228,
+ 0xB229, 0xB22A, 0xB22B,      0,      0,      0,      0,      0,
+      0,      0, 0xB22C,      0, 0x3A45, 0x4D43,      0, 0xB22D,
+ 0xB22E,      0, 0x507E, 0x5123, 0x507D, 0x3A44,      0, 0x3D7D,
+      0, 0xB22F, 0xB230,      0,      0, 0xB231, 0x3739,      0,
+};
+const unsigned short utf8_to_euc_E583[] = {
+ 0xB232,      0, 0x5124, 0xB233, 0xB234, 0x364F,      0, 0xB235,
+      0, 0x5121, 0x5122,      0, 0xB236, 0x462F, 0xB237, 0x417C,
+ 0xB238, 0x3623,      0, 0xB239, 0xB23A, 0x4B4D, 0x5125,      0,
+ 0xB23B,      0, 0x4E3D,      0, 0xB23C, 0xB23D, 0x5126, 0xB23E,
+      0,      0, 0xB23F, 0x5129, 0xB240, 0x5127, 0xB241, 0x414E,
+ 0xB242, 0xB243,      0,      0,      0, 0x5128, 0x512A, 0xB244,
+      0, 0xB245, 0xB251,      0, 0xF430, 0x512C, 0xB246,      0,
+      0, 0x512B, 0xB247, 0x4A48,      0,      0, 0xB248,      0,
+};
+const unsigned short utf8_to_euc_E584[] = {
+ 0x3537, 0x512E, 0x512F, 0xB249, 0x322F,      0, 0xB24A, 0xB24B,
+ 0xB24C, 0x512D,      0, 0xB24D, 0xB24E, 0xB24F, 0xB250,      0,
+ 0xB252,      0, 0x3C74,      0, 0x5132, 0x5131, 0x5130, 0xB253,
+ 0x5056, 0xB254, 0x5133, 0xB255, 0xB256, 0xB257, 0xB258, 0x3D7E,
+      0, 0x5134,      0, 0xB259,      0,      0,      0, 0xB25A,
+ 0xB25B,      0, 0x4D25,      0, 0xB25C, 0xB25D,      0, 0xB25E,
+      0, 0xB25F, 0x4C59, 0xB260, 0xB261, 0xB262,      0, 0x5136,
+ 0xB263, 0xB264, 0x5135, 0x5138, 0x5137,      0,      0, 0x5139,
+};
+const unsigned short utf8_to_euc_E585[] = {
+ 0x513A, 0x3074, 0xB265, 0x3835, 0x373B, 0x3D3C, 0x437B, 0x3624,
+ 0x4068, 0x3877, 0xB266, 0x396E, 0x513C, 0x4C48, 0x4546, 0xB267,
+ 0x3B79,      0, 0x513B, 0xB268, 0x513D, 0xB269,      0, 0xB26A,
+ 0xB26B,      0, 0x455E,      0, 0x3375,      0,      0, 0xB26C,
+      0,      0, 0x513E,      0, 0xB26D, 0x467E, 0xB26E,      0,
+ 0x4134, 0x5140, 0x5141, 0x482C, 0x3878, 0x4F3B, 0x5142,      0,
+      0, 0x3626,      0,      0,      0, 0x4A3C, 0x4236, 0x3671,
+ 0x4535,      0,      0,      0, 0x3773,      0, 0xB26F,      0,
+};
+const unsigned short utf8_to_euc_E586[] = {
+ 0x5143,      0, 0x5144, 0xB270, 0xB271, 0x4662, 0x315F,      0,
+      0, 0x5147, 0x3A7D, 0xB272, 0x5146, 0x3A46, 0xB273, 0x5148,
+ 0x666E, 0x5149, 0x4B41, 0x514A,      0, 0x514B, 0x514C, 0x3E69,
+ 0xB274, 0x3C4C,      0,      0,      0, 0xB275,      0,      0,
+ 0x3427, 0xB276, 0x514F, 0xB277, 0x514D, 0x4C3D, 0x514E,      0,
+ 0x495A, 0x5150, 0x5151, 0x5152, 0x455F, 0xB278,      0,      0,
+ 0x5156, 0x5154, 0x5155, 0x5153, 0x3A63, 0x5157, 0x4C6A, 0x4E64,
+ 0xB279,      0, 0xB27A,      0, 0xB27B, 0x5158, 0xB27C, 0xB27D,
+};
+const unsigned short utf8_to_euc_E587[] = {
+      0,      0, 0xB27E,      0, 0x4028, 0x5159, 0x3D5A,      0,
+ 0xB321, 0x515A,      0, 0x437C, 0x4E3F, 0x4560,      0, 0xB322,
+      0, 0xB323, 0xB324, 0xB325,      0, 0xB326, 0x5245,      0,
+ 0xB327,      0,      0, 0x515B, 0x7425, 0x3645, 0xB328,      0,
+ 0x515C, 0x4B5E, 0xB329,      0,      0, 0xB32A, 0x3D68, 0x427C,
+      0, 0x515E, 0x4664,      0, 0xF431, 0x515F, 0xB32B,      0,
+ 0x5160, 0x332E, 0xB32C, 0xB32D, 0xB32E, 0x5161, 0x3627, 0xB32F,
+ 0x464C, 0x317A, 0x3D50,      0,      0, 0x4821, 0x5162,      0,
+};
+const unsigned short utf8_to_euc_E588[] = {
+ 0x4561, 0xB330, 0xB331, 0x3F4F, 0x5163, 0xB332, 0x4A2C, 0x405A,
+ 0x3422,      0, 0x3429, 0x5164,      0,      0, 0x5166,      0,
+      0, 0x373A, 0xB333, 0xB334, 0x5165, 0xB335, 0xB336, 0x4E73,
+ 0xB337,      0,      0,      0,      0, 0x3D69,      0,      0,
+      0,      0, 0xB338,      0, 0x483D, 0x4A4C,      0, 0x5167,
+ 0xB339, 0x4D78, 0x5168,      0,      0,      0, 0x5169,      0,
+ 0x457E, 0xB33A, 0xB33B, 0x516A,      0, 0xB33C, 0x4029, 0x3A7E,
+ 0x3774, 0x516B, 0x3B49, 0x396F, 0xB33D,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E589[] = {
+      0,      0,      0, 0x4466, 0x516D, 0xB33E,      0, 0x4227,
+      0, 0xB33F, 0x3A6F, 0x516E, 0x516F, 0x4130,      0, 0x516C,
+      0,      0,      0,      0, 0x5171, 0xB340, 0x4B36, 0xB341,
+ 0xB342,      0, 0xB343, 0x3964, 0xB344,      0, 0x5170, 0xB345,
+ 0xB346, 0xB347,      0, 0x3775, 0x3A5E, 0x476D, 0xB348,      0,
+      0, 0x5174, 0x5172,      0,      0,      0, 0xB349, 0x497B,
+ 0x3E6A, 0x517B, 0x3364, 0x5175, 0x5173, 0x414F,      0, 0xB34A,
+ 0xB34B, 0xB34C,      0,      0,      0, 0x5177,      0, 0x5176,
+};
+const unsigned short utf8_to_euc_E58A[] = {
+ 0xB34D,      0, 0xB34E, 0x3344,      0, 0xB34F,      0, 0x3760,
+ 0x517C, 0x4E2D, 0xB350,      0, 0xB351, 0x5178,      0,      0,
+      0, 0x517D, 0x517A, 0xB352, 0x5179, 0xB353, 0xB354, 0xB355,
+ 0xB356,      0, 0xB357, 0x4E4F, 0xB358,      0,      0, 0x3879,
+ 0x3243,      0,      0, 0x4E74, 0xB359, 0xB35A, 0xB35B, 0xB35C,
+      0, 0x3D75, 0x4558, 0x3965, 0x5222, 0x5223,      0, 0xB35D,
+ 0xB35E, 0x4E65,      0,      0, 0x4F2B, 0x5225, 0xB35F, 0xB360,
+ 0xB361, 0x387A, 0xB362, 0xB363, 0x5224, 0xB364, 0x332F,      0,
+};
+const unsigned short utf8_to_euc_E58B[] = {
+ 0xB365, 0x5226,      0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
+ 0xB368, 0x4A59,      0,      0, 0xB369, 0x5227,      0, 0xB36A,
+      0, 0xB36B, 0x7055,      0, 0xB36C, 0x4630, 0xB36D, 0x5228,
+ 0x342A, 0x4C33,      0, 0xB36E, 0xB36F, 0x3E21, 0x5229, 0x4A67,
+ 0x522D, 0xB370, 0x402A, 0x522A, 0x3650, 0xB371, 0x522B, 0x342B,
+ 0xB372, 0xB373, 0xB374,      0, 0xB375,      0,      0,      0,
+ 0xB376, 0xB377, 0x372E, 0x522E, 0xB378, 0x522F, 0xB379, 0xB37A,
+ 0x5230, 0x5231, 0x3C5B,      0,      0,      0, 0x387B, 0x4C5E,
+};
+const unsigned short utf8_to_euc_E58C[] = {
+ 0xB37B, 0x4C68, 0x4677, 0xB37C,      0, 0x4A71, 0x5232, 0xF432,
+ 0x5233,      0, 0xB37D, 0xB37E, 0xB421, 0x5235,      0, 0x5237,
+ 0x5236, 0xB422,      0, 0xB423,      0, 0x5238, 0x323D, 0x4B4C,
+ 0xB424, 0x3A7C, 0x5239, 0xB425, 0xB426, 0x4159, 0xB427, 0xB428,
+ 0x3E22, 0x3629,      0, 0x523A, 0xF433, 0xB429,      0, 0xB42A,
+ 0xB42B, 0xB42C, 0x485B, 0xB42D, 0xB42E, 0xB42F,      0, 0x523B,
+ 0xB430, 0x523C, 0xB431, 0x523D,      0, 0xB432,      0,      0,
+ 0x523E, 0x4924, 0x3668, 0x3065, 0xB433, 0xB434, 0xB435, 0x463F,
+};
+const unsigned short utf8_to_euc_E58D[] = {
+ 0x523F, 0x3D3D, 0xB436, 0x4069,      0, 0x5241, 0x5240, 0x3E23,
+ 0x3861, 0x5243, 0x483E, 0xB438, 0xB437, 0x5244,      0,      0,
+      0, 0x485C, 0x4234, 0x426E, 0x3628,      0,      0, 0x466E,
+ 0x4331, 0xB439, 0x476E, 0xB43A, 0x4B4E,      0, 0x5246,      0,
+ 0x406A, 0xB43B,      0, 0xB43C,      0, 0xB43D, 0x3735,      0,
+      0, 0x5247,      0,      0, 0xB43E, 0xB43F, 0x5248, 0x312C,
+ 0x3075, 0x346D, 0xB440, 0x4228, 0x3551, 0x4D71,      0, 0x524B,
+ 0x3237, 0xB441,      0, 0x524A,      0,      0, 0xB442, 0x362A,
+};
+const unsigned short utf8_to_euc_E58E[] = {
+      0,      0, 0x524C, 0xB443, 0x4C71,      0,      0, 0xB444,
+ 0xB445,      0,      0,      0,      0,      0, 0xB446,      0,
+      0,      0,      0, 0xB447, 0xB448,      0, 0x524D,      0,
+ 0x4E52, 0xB449, 0x387C,      0,      0, 0xB44A,      0, 0x3836,
+ 0x524E, 0xB44B,      0,      0, 0xB44C, 0x5250, 0x524F,      0,
+ 0x3F5F, 0x3139, 0xB44D, 0xB44E,      0, 0x315E, 0x5251, 0xB44F,
+ 0x5252,      0, 0xB450, 0x3837, 0xB451, 0xB452, 0x5253, 0xB453,
+ 0xB454,      0, 0xB455, 0x356E,      0, 0xB456,      0,      0,
+};
+const unsigned short utf8_to_euc_E58F[] = {
+ 0xB457,      0, 0x3B32, 0x5254,      0, 0xB458,      0,      0,
+ 0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D, 0xB459,
+      0,      0, 0xB45A, 0xB45B, 0x3D47, 0xB45C, 0x3C68, 0x3C75,
+      0, 0x3D76, 0xB45D, 0x4840,      0, 0xB45E, 0xB45F, 0x5257,
+ 0xB460, 0x3143, 0x4151, 0x387D, 0x3845, 0x3667, 0xB461, 0xB462,
+ 0x525B, 0x4321, 0x427E, 0x362B, 0x3E24, 0x525C, 0x525A, 0x3244,
+ 0x4266, 0x3C38, 0x3B4B, 0x3126,      0, 0xB463, 0x3370, 0x3966,
+ 0x3B4A,      0, 0x525D,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E590[] = {
+      0, 0x525E, 0xB464, 0x3549, 0x3346,      0,      0,      0,
+ 0x3967, 0x3548, 0x445F, 0x3125, 0x4631, 0x4C3E, 0x3921, 0x4D79,
+ 0x4547, 0x387E,      0, 0xB465,      0,      0,      0,      0,
+      0,      0, 0xB466, 0x372F,      0, 0x5267,      0, 0x3663,
+ 0x4B4A, 0xB467,      0,      0,      0,      0, 0x485D, 0xB468,
+ 0xB469, 0x5266, 0xB46A, 0x345E, 0x5261, 0x5262, 0x5264, 0xB46B,
+      0, 0xB46C,      0,      0, 0xB46D, 0xB46E, 0x5265,      0,
+ 0x355B, 0x3F61,      0, 0x4A2D, 0x5263, 0x525F, 0x3863,      0,
+};
+const unsigned short utf8_to_euc_E591[] = {
+ 0x5260,      0, 0x4F24, 0xB46F, 0xB470,      0, 0x4A72, 0xB471,
+ 0x4468, 0x3862, 0x3970,      0,      0, 0xB472, 0x5268, 0xB473,
+      0, 0x465D,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xB474, 0x526C,
+      0,      0, 0xB475,      0, 0xB476,      0, 0xB477, 0xB478,
+ 0x3C7E, 0xB479, 0x3C76, 0xB47A,      0, 0xB47B, 0xB47C,      0,
+ 0x526F, 0x526D,      0, 0x4C23, 0xB47D, 0x526A, 0x5273, 0x526E,
+      0,      0,      0, 0x5271, 0x3846, 0x4C3F,      0, 0xB47E,
+};
+const unsigned short utf8_to_euc_E592[] = {
+ 0x5272, 0xB521,      0, 0xB522, 0x5274, 0xB523, 0x5276,      0,
+ 0xB524, 0xB525, 0xF435, 0x3A70, 0x4F42, 0xB526, 0x526B, 0x5269,
+ 0x5275, 0xB527, 0x5270,      0,      0, 0xB528, 0xB529,      0,
+      0,      0,      0,      0, 0xB52A,      0,      0, 0xB52B,
+      0, 0xB52C, 0x5278,      0, 0x5323, 0x527A, 0xB52D, 0xB52E,
+ 0x527E, 0xB52F, 0xB530, 0x5321, 0x527B, 0xB531, 0xB532, 0x533E,
+      0, 0xB533, 0x3A69, 0x3331,      0,      0,      0, 0xB534,
+ 0x5279, 0xB535, 0xB536, 0xB537, 0x5325, 0x3076, 0x5324, 0xB538,
+};
+const unsigned short utf8_to_euc_E593[] = {
+ 0x3025, 0x494A, 0x5322,      0, 0x527C,      0, 0xB539, 0x5277,
+ 0x527D, 0x3A48, 0xB53A,      0,      0, 0xB53B, 0xB53C,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x5326,      0,      0,      0,      0,      0,      0,      0,
+ 0xB53D, 0x3077, 0x532F,      0,      0, 0x5327, 0x5328,      0,
+ 0x3E25, 0x4B69, 0xB53E,      0, 0xB53F, 0x532D, 0x532C, 0xB540,
+      0,      0, 0x452F,      0,      0,      0, 0xB541,      0,
+      0,      0, 0x532E,      0, 0xB542, 0x532B, 0xB543, 0xB544,
+};
+const unsigned short utf8_to_euc_E594[] = {
+ 0xB545, 0xB546,      0,      0, 0x3134, 0xB547, 0x3A36, 0x3F30,
+ 0xB548, 0xB549,      0,      0, 0xB54A, 0xB54B, 0xB54C, 0x5329,
+ 0x4562,      0,      0,      0, 0x532A, 0xB54D, 0x3022,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xB54E, 0xB54F,      0,      0, 0x5334, 0x4D23,
+      0, 0x3E27, 0xB550, 0x533A,      0, 0xB551, 0xB552,      0,
+ 0x5339, 0x5330,      0, 0xB553, 0xB554, 0xB555, 0x4243,      0,
+};
+const unsigned short utf8_to_euc_E595[] = {
+ 0x5331, 0xB556,      0,      0, 0x426F, 0x5336, 0x3E26, 0xB557,
+      0, 0xB558, 0xB559,      0, 0x5333, 0xB55A,      0, 0x4C64,
+ 0xB55B, 0xB55C,      0, 0x373C,      0,      0, 0x5337, 0x5338,
+ 0xB55D,      0, 0xB55E, 0xB55F, 0x5335, 0x533B, 0xB560,      0,
+ 0xB561, 0xB562,      0, 0x5332, 0xB563,      0, 0xB564,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x5341, 0x5346,      0, 0x5342, 0xB565,
+};
+const unsigned short utf8_to_euc_E596[] = {
+ 0x533D, 0xB566, 0xB567, 0x5347, 0x4131,      0, 0xB568, 0x5349,
+ 0xB569, 0x3922, 0x533F, 0x437D,      0,      0, 0xB56A, 0xB56B,
+      0, 0xB56C, 0xB56D, 0xB56E, 0xB56F,      0,      0, 0xB570,
+ 0x5343, 0x533C, 0x342D,      0, 0x346E, 0x3365, 0x5344, 0x5340,
+      0,      0,      0, 0xB571, 0xB572,      0,      0, 0x3776,
+ 0x534A, 0x5348, 0x4153, 0x354A, 0x362C, 0xB573, 0x5345,      0,
+ 0x3674,      0, 0xB574,      0,      0,      0, 0x3144,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xB575,
+};
+const unsigned short utf8_to_euc_E597[] = {
+      0, 0xB576,      0, 0xB577, 0x534E, 0x534C, 0xB578, 0x5427,
+      0, 0xB579,      0, 0xB57A, 0xB57B,      0, 0xB57C,      0,
+      0, 0xB57D, 0xB57E, 0xB621, 0x5351,      0,      0, 0xB622,
+ 0xB623,      0, 0x534B, 0xB624, 0x534F,      0, 0xB625, 0x534D,
+      0,      0, 0xB626, 0x3B4C, 0x5350,      0,      0,      0,
+      0, 0xB627,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xB628, 0x5353,
+      0, 0x5358,      0,      0,      0, 0x5356, 0x5355, 0xB629,
+};
+const unsigned short utf8_to_euc_E598[] = {
+      0,      0,      0,      0,      0, 0xB62A, 0x4332,      0,
+ 0xB62B, 0x3245, 0xB62C,      0,      0, 0xB62D, 0xB62E, 0xB62F,
+ 0xB630, 0xB631, 0xB632,      0, 0x5352,      0, 0x5354, 0x3E28,
+ 0x3133, 0xB633,      0, 0x5357,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x325E,      0,      0, 0xB634,      0,      0, 0x5362,
+ 0xB635, 0x3E7C, 0x535E, 0xB636, 0x535C, 0xB637, 0x535D, 0xB638,
+ 0x535F, 0xB639,      0, 0xB63A, 0xB63B, 0xB63C,      0, 0xB63D,
+};
+const unsigned short utf8_to_euc_E599[] = {
+ 0xB63E, 0xB63F, 0x313D, 0xB640, 0xB641,      0, 0xB642,      0,
+      0, 0xB643,      0, 0xB644, 0x4139, 0xB645, 0x5359, 0xB646,
+ 0x535A,      0,      0,      0, 0xB647,      0,      0,      0,
+      0,      0,      0, 0x337A,      0,      0, 0xB648,      0,
+ 0xB649, 0xB64A, 0xB64B, 0xB64C, 0x5361,      0, 0xB64D,      0,
+ 0x346F, 0xB64E, 0x5364, 0x5360, 0x5363, 0xB64F,      0, 0xB650,
+      0, 0xB651, 0xB652,      0, 0x4A2E, 0xB653,      0,      0,
+ 0x4655,      0, 0x4838,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E59A[] = {
+ 0x5366,      0,      0,      0, 0xB654, 0xB655, 0x5365, 0x3345,
+ 0xB656,      0, 0x5367, 0xB657, 0xB658,      0,      0, 0x536A,
+      0,      0,      0,      0, 0x5369, 0xB659,      0,      0,
+      0, 0xB65A, 0xB65B,      0,      0, 0xB65C, 0xB65D, 0xB65E,
+ 0x5368,      0, 0x4739,      0,      0, 0x536B, 0xB65F, 0xB660,
+ 0xB661, 0xB662,      0, 0xB663, 0xB664, 0xB665, 0x536C,      0,
+      0, 0xB666,      0, 0xB667, 0x536E,      0, 0x536D, 0xB668,
+      0,      0,      0,      0, 0x5370,      0, 0xB669,      0,
+};
+const unsigned short utf8_to_euc_E59B[] = {
+ 0x5373, 0x5371, 0x536F, 0x5372,      0, 0xB66A,      0,      0,
+ 0x5374, 0xB66B, 0xB66C, 0xB66D, 0xB670, 0xB671, 0x5375, 0xB66E,
+ 0xB66F, 0x5376,      0, 0x5377,      0,      0,      0, 0x5378,
+ 0x5145, 0xB672, 0x3C7C, 0x3B4D, 0xB673, 0xB674, 0x3273, 0xB675,
+ 0x3078, 0xB676,      0, 0x4344, 0xB677, 0xB678, 0xB679, 0xB67A,
+ 0xB67B,      0,      0, 0xB67D,      0, 0xB67E, 0x5379,      0,
+ 0x3A24, 0xB67C, 0x304F, 0x3F5E,      0,      0, 0xB721, 0xB722,
+      0, 0x537A, 0x3847,      0,      0, 0x3971,      0, 0x537C,
+};
+const unsigned short utf8_to_euc_E59C[] = {
+ 0x537B, 0xB723, 0xB724, 0x4A60, 0x537D,      0,      0, 0xB725,
+ 0x5421, 0x537E, 0xB726, 0x5422, 0xB727, 0x5423,      0, 0x3777,
+      0, 0xB728, 0x3160, 0x5424,      0, 0xB729, 0x5426,      0,
+ 0x5425,      0, 0xB72A, 0xB72B, 0x5428, 0xB72C,      0, 0x455A,
+ 0xB72D,      0, 0xB72E, 0xB72F, 0xB730, 0xB731, 0x5429, 0x3035,
+ 0x3A5F, 0xB732, 0xB733,      0, 0xB734, 0x373D, 0xB735, 0xB736,
+ 0x434F,      0,      0, 0xB737, 0xB738,      0,      0, 0x542A,
+ 0x542B,      0,      0, 0x542D,      0, 0xB739, 0xB73A, 0xB73B,
+};
+const unsigned short utf8_to_euc_E59D[] = {
+ 0x542E,      0, 0x3A64,      0,      0, 0xB73C, 0xB73D, 0x3651,
+      0,      0, 0x4B37,      0, 0xB73E, 0xB73F, 0x542C, 0x542F,
+ 0x3A41, 0x3923, 0xB740,      0,      0,      0,      0,      0,
+      0, 0xF436,      0,      0,      0,      0,      0,      0,
+      0, 0x5433, 0xB741,      0, 0x3A25, 0xB742, 0x4333, 0xB743,
+ 0xB744, 0x5430, 0x445A, 0xB745,      0, 0xB746, 0xB747, 0xB748,
+ 0xB749, 0xB74A,      0, 0xB74B, 0xB74C, 0xB74D,      0, 0xB74E,
+      0, 0xB74F, 0xB750, 0xB751, 0xB752,      0, 0xB753, 0x5434,
+};
+const unsigned short utf8_to_euc_E59E[] = {
+      0, 0xB754, 0x3F62, 0xB755,      0,      0,      0,      0,
+ 0x5432, 0x5435,      0, 0x373F, 0xB756,      0,      0,      0,
+      0,      0,      0, 0x5436, 0xB757, 0xB760,      0, 0xB758,
+      0, 0xB759, 0xB75A,      0, 0xB75B, 0xB75C, 0xB75D, 0xB75E,
+ 0x5437, 0xB75F, 0x3924, 0x3340, 0x5439,      0,      0, 0xB761,
+ 0xB762, 0xB763, 0x543A,      0, 0xB764,      0,      0,      0,
+ 0x543B,      0,      0, 0x5438,      0,      0,      0,      0,
+ 0xB765,      0,      0,      0,      0, 0xB766,      0,      0,
+};
+const unsigned short utf8_to_euc_E59F[] = {
+ 0x5431,      0,      0, 0x543C,      0,      0, 0x543D, 0xB767,
+ 0xB768,      0,      0, 0x4B64, 0xB769,      0, 0x3E6B, 0xB76A,
+      0,      0, 0x543F, 0x5440, 0x543E, 0xB76B, 0x5442,      0,
+      0,      0,      0,      0, 0x4738, 0xB76C, 0xB76D, 0x3068,
+ 0x4956, 0xB77E,      0, 0x5443, 0xB76E,      0, 0xB76F, 0xB770,
+      0, 0xB771,      0,      0,      0, 0xB772,      0,      0,
+ 0xB773,      0,      0,      0, 0x3E7D, 0xB774, 0xB775, 0x3C39,
+ 0xB776, 0x475D, 0x3470,      0, 0x3A6B, 0xB777, 0xB778, 0xB779,
+};
+const unsigned short utf8_to_euc_E5A0[] = {
+ 0x4B59,      0, 0x4632, 0xB77A, 0xB77B, 0x3778, 0x424F,      0,
+ 0xB77C, 0xB77D, 0x5441, 0x5444, 0xB821, 0xB822,      0,      0,
+      0,      0,      0,      0,      0, 0x4244,      0,      0,
+      0, 0x5445,      0, 0xB823,      0, 0x5446, 0xB824, 0xB825,
+ 0xB826, 0x5448,      0,      0, 0x4469,      0, 0xB827, 0xB828,
+      0,      0, 0x342E,      0,      0, 0xB829,      0, 0x7421,
+ 0x3161, 0x4A73, 0xB82A,      0, 0x3E6C, 0x4548,      0,      0,
+      0, 0xB82B, 0x3A66,      0,      0, 0x544E,      0, 0xB82C,
+};
+const unsigned short utf8_to_euc_E5A1[] = {
+ 0x4A3D, 0x4E5D,      0,      0,      0,      0,      0,      0,
+      0, 0xB82D, 0x3274, 0x544A, 0xB82E, 0xB82F,      0, 0xB830,
+ 0xB831, 0x413A, 0x544D,      0, 0x4563, 0xB832,      0, 0x4549,
+ 0x4564, 0x4839, 0x444D,      0,      0,      0, 0x3A49, 0xB833,
+      0, 0xB834, 0x5449,      0, 0xB835,      0,      0, 0xB836,
+ 0xB837, 0x3176,      0, 0x4536,      0,      0,      0,      0,
+ 0x544B,      0, 0x5447,      0,      0, 0x3F50,      0,      0,
+ 0xB838, 0x544F,      0,      0, 0xB839,      0, 0x3D4E, 0xB83A,
+};
+const unsigned short utf8_to_euc_E5A2[] = {
+ 0xB83B, 0xB83C,      0, 0x362D,      0, 0x5450,      0, 0xB83D,
+ 0xB83E, 0xB83F, 0xB840,      0, 0xB841, 0xB842,      0, 0xB843,
+ 0xB844,      0,      0, 0x4A68, 0xB845,      0, 0xB846, 0x417D,
+      0,      0,      0,      0, 0x4446, 0xB847, 0xF439, 0x5452,
+ 0xB848, 0xB849, 0xB84A,      0,      0,      0, 0xB84B,      0,
+ 0x4B4F, 0xB84C,      0, 0x5453,      0,      0, 0x5458,      0,
+      0, 0xB84D, 0xB84E, 0x4A2F,      0,      0,      0,      0,
+ 0x5457, 0x5451, 0x5454, 0x5456, 0xB850,      0, 0x3A26,      0,
+};
+const unsigned short utf8_to_euc_E5A3[] = {
+      0, 0x4A49, 0xB851,      0, 0xB84F, 0x5459,      0, 0x4345,
+ 0xB852,      0, 0x3275,      0, 0x3E6D, 0xB853, 0xB854,      0,
+ 0xB855, 0x545B, 0xB856, 0x545A, 0xB857, 0x3968, 0xB858, 0x545C,
+ 0x545E, 0x545D, 0xB859,      0, 0x5460, 0xB85A, 0x5455, 0x5462,
+      0, 0xB85B, 0xB85C,      0, 0x5461, 0x545F,      0,      0,
+      0, 0xB85D,      0, 0x3B4E, 0x3F51,      0, 0x4154, 0x5463,
+ 0x403C, 0x306D, 0x4764, 0xB85E,      0,      0,      0, 0x445B,
+      0, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468,      0,      0,
+};
+const unsigned short utf8_to_euc_E5A4[] = {
+      0,      0, 0x5469,      0,      0, 0xB85F, 0xB860,      0,
+      0, 0x4A51, 0x546A, 0xB861, 0xB862,      0,      0, 0x3246,
+ 0x546B,      0, 0xB863, 0xB864, 0xB865, 0x4D3C, 0x3330,      0,
+ 0x5249, 0x3D48, 0x423F, 0x546C, 0x4C6B, 0xB867,      0,      0,
+      0, 0xB868, 0x4C34, 0xB869, 0xB86A, 0x546E,      0, 0x4267,
+ 0xB86B, 0x4537, 0x4240, 0x4957, 0x546F, 0x5470, 0x317B, 0xB86C,
+ 0xB86D, 0x3C3A, 0x5471, 0xB86E,      0, 0xB86F, 0xB870, 0x3050,
+ 0x5472,      0,      0,      0,      0,      0, 0x5473, 0xB871,
+};
+const unsigned short utf8_to_euc_E5A5[] = {
+      0,      0,      0, 0xB872, 0x3162,      0, 0xB873, 0x3471,
+ 0x4660, 0x4A74,      0,      0,      0,      0, 0x5477, 0x4155,
+ 0x5476, 0x3740, 0xB874, 0xB875, 0x4B5B, 0x5475,      0, 0x4565,
+ 0x5479, 0xB876, 0x5478, 0xB877,      0, 0xB878, 0xB879, 0xB87A,
+ 0x547B, 0xB87B, 0x547A, 0xB87C,      0, 0x317C,      0, 0x547C,
+ 0x3E29, 0x547E, 0x4325, 0xB87D, 0x547D, 0xB87E, 0x4A33, 0xB921,
+      0,      0, 0xB922, 0x3D77, 0x455B, 0xB923, 0xB924,      0,
+ 0x5521, 0xB925,      0, 0xB926, 0xB927, 0x3925,      0,      0,
+};
+const unsigned short utf8_to_euc_E5A6[] = {
+      0, 0x5522, 0x4721, 0x485E, 0x4C51,      0,      0,      0,
+      0,      0, 0x4725, 0xB928, 0xB929, 0x552B, 0xB92A,      0,
+      0,      0, 0xB92B, 0x3538,      0, 0xB92C, 0x4D45, 0xB92D,
+      0, 0x4C2F,      0, 0x562C,      0, 0x5523,      0, 0xB92E,
+      0,      0,      0, 0x5526, 0xB92F, 0x4245,      0, 0xB930,
+ 0x4B38,      0,      0,      0, 0x454A, 0xB931, 0xB932, 0xB933,
+ 0xB934,      0, 0x5527, 0xB935,      0,      0,      0, 0xB936,
+      0, 0x4B65, 0xB937, 0x3A4A, 0xB938,      0, 0x3E2A,      0,
+};
+const unsigned short utf8_to_euc_E5A7[] = {
+      0, 0xB939,      0, 0xB93A, 0xB93B,      0, 0x5528,      0,
+ 0xB93C, 0x3B50, 0xB93D, 0x3B4F,      0, 0xB93E,      0,      0,
+ 0x3039, 0x3848, 0xB93F, 0x402B, 0x3051,      0,      0,      0,
+      0, 0x552C, 0x552D,      0, 0x552A, 0xB940, 0xB941, 0xB942,
+      0,      0,      0, 0xB943, 0xB944, 0x3138, 0x342F, 0xB945,
+ 0x5529,      0, 0x4C45, 0x4931,      0,      0, 0xB946, 0xB947,
+      0, 0xB948, 0xB949,      0, 0xB94A,      0, 0x3028, 0xB94B,
+      0,      0,      0, 0x3079,      0,      0,      0, 0x3B51,
+};
+const unsigned short utf8_to_euc_E5A8[] = {
+ 0xB94C, 0x3052,      0, 0x3023, 0xB94D,      0,      0,      0,
+      0, 0x5532,      0,      0, 0xB94E, 0xB94F, 0xB950,      0,
+      0, 0x5530, 0xB951, 0xB952,      0,      0,      0,      0,
+ 0x4C3C,      0, 0x5533,      0, 0x5531,      0, 0xB953, 0x552F,
+ 0x3F31,      0,      0, 0xB954, 0xB955, 0x552E,      0, 0xB956,
+ 0xB957, 0x4A5A, 0xB958,      0,      0, 0xB959,      0, 0x3864,
+ 0xB95A,      0,      0,      0,      0, 0x5537, 0x5538,      0,
+      0,      0,      0,      0, 0x3E2B,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E5A9[] = {
+ 0x5534, 0x4F2C,      0,      0, 0xB95B, 0xB95C, 0x474C, 0xB95D,
+ 0xB95E, 0x5536,      0,      0, 0xB95F,      0,      0,      0,
+ 0xB960,      0,      0,      0,      0, 0xB961,      0,      0,
+      0,      0, 0x3A27,      0,      0,      0, 0xB962,      0,
+      0,      0, 0x5539, 0xB963,      0, 0xB964, 0x4958, 0xB965,
+      0,      0, 0x553A,      0, 0x5535, 0xB966,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xB967,
+      0,      0, 0xB968, 0xB969,      0,      0, 0xB96A, 0x4C3B,
+};
+const unsigned short utf8_to_euc_E5AA[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xB96B,      0,      0,      0,      0,
+ 0xB96C,      0, 0x475E, 0xB96D,      0,      0, 0xB96E,      0,
+      0, 0xB96F, 0x553B, 0x4932, 0xB970,      0, 0xB971, 0xB972,
+ 0xB973,      0, 0xB974,      0,      0,      0,      0, 0xB975,
+      0,      0,      0,      0, 0xB976,      0,      0,      0,
+      0, 0xB977, 0xB978, 0xB979,      0, 0xB97A,      0,      0,
+ 0xB97B,      0, 0xB97C, 0xB97D, 0x553C, 0x5540, 0x553D, 0xB97E,
+};
+const unsigned short utf8_to_euc_E5AB[] = {
+      0, 0x3247, 0x553F,      0, 0xBA21,      0, 0xBA22,      0,
+ 0xBA23, 0x3C3B,      0, 0x553E, 0x3779,      0,      0, 0xBA24,
+ 0x554C,      0,      0,      0,      0,      0, 0x5545, 0x5542,
+      0,      0, 0xBA25,      0, 0xBA26,      0,      0,      0,
+ 0xBA27, 0x4364,      0, 0x5541,      0, 0xBA28, 0x5543,      0,
+      0, 0x5544, 0xBA29,      0,      0,      0, 0xBA2A,      0,
+      0,      0,      0,      0,      0, 0xBA2B, 0xBA2C,      0,
+      0,      0, 0x5546, 0x5547,      0, 0xBA2D,      0,      0,
+};
+const unsigned short utf8_to_euc_E5AC[] = {
+ 0xBA2E, 0xBA2F,      0,      0,      0,      0,      0,      0,
+ 0xBA30, 0x3472,      0, 0x5549, 0x5548,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x554A, 0xBA31,
+      0, 0xBA33,      0, 0xBA34,      0, 0xBA35,      0,      0,
+      0, 0xBA36, 0x3E6E,      0,      0, 0xBA37,      0,      0,
+      0,      0, 0x554D,      0, 0x445C, 0xBA38,      0,      0,
+ 0x3145,      0, 0x554B,      0, 0xBA32,      0, 0x554E,      0,
+ 0xBA39,      0,      0,      0,      0,      0, 0x554F,      0,
+};
+const unsigned short utf8_to_euc_E5AD[] = {
+ 0x5552, 0xBA3A,      0, 0x5550,      0, 0x5551,      0,      0,
+      0,      0,      0, 0xBA3B, 0xBA3C,      0,      0,      0,
+ 0x3B52, 0x5553, 0xBA3D,      0, 0x3926, 0x5554, 0xBA3E, 0x3B7A,
+ 0x4238,      0, 0x5555, 0x5556, 0x3B5A, 0x3927, 0xBA3F, 0x4C52,
+      0,      0,      0, 0x3528, 0x3849, 0x5557, 0x3358,      0,
+ 0xBA40, 0x5558,      0, 0x4239,      0,      0, 0xBA41, 0xBA42,
+ 0x5559, 0x5623,      0, 0x555A,      0, 0x555B,      0,      0,
+ 0x555C,      0, 0x555E,      0, 0xBA43, 0xBA44, 0xBA45, 0xBA46,
+};
+const unsigned short utf8_to_euc_E5AE[] = {
+ 0x555F, 0xBA47,      0, 0x5560, 0xBA48, 0x4270, 0xBA49, 0x3127,
+ 0x3C69, 0x3042, 0xBA4A, 0x4157, 0x3430, 0x3C35, 0xBA4B, 0x3928,
+ 0xBA4C, 0xBA4D,      0, 0xBA4E, 0xBA4F, 0x4566, 0xBA50, 0x3D21,
+ 0x3431, 0x4368, 0x446A, 0x3038, 0x3539, 0x4A75,      0, 0x3C42,
+      0,      0, 0x3552, 0x406B, 0x3C3C, 0x4D28, 0x5561,      0,
+ 0xBA51, 0xBA52,      0,      0, 0xBA53, 0xBA54, 0x355C, 0xBA55,
+ 0x3A4B, 0xBA56, 0xBA57, 0x3332, 0x3163, 0x3E2C, 0x3248, 0xBA58,
+ 0x5562, 0x4D46, 0xBA59,      0, 0xBA5A,      0,      0, 0x3D49,
+};
+const unsigned short utf8_to_euc_E5AF[] = {
+ 0xBA5B, 0xBA5C, 0x3C64, 0x5563, 0x3473, 0x4652, 0x4C29, 0x5564,
+      0, 0x5565,      0,      0, 0x4959, 0xBA5D,      0, 0xBA5E,
+ 0x5567,      0, 0x3428, 0x3677, 0x5566,      0, 0xBA5F, 0xBA60,
+ 0xBA61, 0xBA62, 0xBA63, 0x3432,      0, 0x3F32, 0x556B, 0x3B21,
+ 0xBA64, 0x3249, 0x556A,      0, 0x5568, 0x556C, 0x5569, 0x472B,
+ 0x5C4D, 0x3F33,      0, 0x556D, 0xF43A,      0, 0x4E40, 0xBA65,
+ 0x556E, 0xBA66,      0, 0x5570, 0xBA67, 0x437E, 0x556F,      0,
+ 0x4023,      0, 0x3B7B,      0,      0, 0xBA68, 0x4250, 0x3C77,
+};
+const unsigned short utf8_to_euc_E5B0[] = {
+      0, 0x4975, 0x406C,      0, 0x3C4D, 0x5571, 0x3E2D, 0x5572,
+ 0x5573, 0x3053, 0x423A, 0x3F52, 0xBA69, 0x5574, 0x4633, 0x3E2E,
+      0, 0x3E2F,      0, 0x5575,      0,      0, 0x406D, 0xBA6A,
+      0,      0, 0x3E30,      0,      0,      0, 0xBA6B, 0xBA6C,
+ 0x5576,      0, 0x5577, 0xBA6D, 0x4C60,      0, 0xBA6E,      0,
+ 0x5578, 0xBA6F,      0, 0xBA70, 0xBA71, 0x3646, 0xBA72,      0,
+ 0xBA73, 0x3D22, 0xBA74,      0,      0, 0xBA75, 0xBA76,      0,
+ 0x5579, 0x557A, 0x3C5C, 0x3F2C, 0x4674, 0x3F54, 0x4878, 0x4722,
+};
+const unsigned short utf8_to_euc_E5B1[] = {
+ 0x3649, 0x557B,      0,      0,      0, 0x356F, 0x557C,      0,
+ 0x367E,      0, 0x464F, 0x3230,      0, 0x3B53, 0x557D, 0x5622,
+ 0x5621, 0x367D,      0, 0x557E,      0, 0x4538,      0,      0,
+      0, 0xBA77, 0xBA78,      0, 0xBA79,      0, 0x4230,      0,
+ 0x454B, 0x3C48, 0xBA7A, 0xBA7B, 0x4158, 0x4D7A,      0, 0xBA7C,
+ 0xBA7D, 0xBA7E,      0,      0, 0x5624, 0xBB21, 0x5625, 0x4656,
+ 0xBB22, 0x3B33,      0,      0, 0xBB23, 0xBB24, 0x5627,      0,
+      0, 0x5628, 0xBB25, 0xBB26, 0xBB27, 0xBB28,      0,      0,
+};
+const unsigned short utf8_to_euc_E5B2[] = {
+      0,      0,      0,      0,      0,      0,      0, 0xBB29,
+ 0xBB2A,      0, 0xBB2B,      0, 0x5629,      0,      0, 0xBB2C,
+ 0x3474, 0x562A, 0xBB2D,      0, 0x562B,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xBB2E,      0, 0xBB2F,
+ 0xBB30, 0x322C, 0xBB31, 0xBB32,      0,      0, 0xBB33,      0,
+ 0x413B, 0x3464, 0xBB34, 0x562D, 0x4C28,      0,      0,      0,
+      0, 0x4252, 0xBB35, 0x3359, 0xBB36, 0xBB37, 0x562F, 0x5631,
+ 0x345F,      0, 0xBB38, 0x562E, 0x5630,      0, 0x5633,      0,
+};
+const unsigned short utf8_to_euc_E5B3[] = {
+      0,      0,      0,      0,      0, 0x5632,      0, 0x5634,
+      0, 0xBB39,      0, 0xBB3A,      0,      0,      0,      0,
+      0,      0, 0xBB3B,      0,      0,      0,      0, 0xBB3D,
+      0, 0x5635,      0,      0,      0, 0xBB3C,      0,      0,
+ 0x463D, 0x362E,      0,      0,      0,      0,      0,      0,
+ 0x3265, 0x5636, 0x563B,      0,      0, 0x5639, 0xBB3E, 0x4A77,
+ 0x4A76, 0xBB3F, 0xBB40,      0, 0xBB41, 0xF43B, 0x4567,      0,
+      0,      0, 0x5638, 0x3D54,      0, 0x5637,      0,      0,
+};
+const unsigned short utf8_to_euc_E5B4[] = {
+      0, 0xBB42,      0,      0,      0,      0, 0xBB43, 0x3F72,
+      0,      0,      0, 0x563C,      0, 0xBB44, 0x3A6A,      0,
+      0, 0x5642, 0xBB45,      0, 0x5643, 0x563D, 0x3333, 0x563E,
+ 0x5647, 0x5646, 0x5645, 0x5641,      0,      0,      0, 0x5640,
+      0,      0, 0x5644, 0xBB47, 0xBB48,      0, 0xBB49, 0xBB4A,
+      0, 0x4A78,      0, 0xBB46,      0,      0,      0,      0,
+      0, 0xBB4B,      0,      0, 0xBB4C,      0,      0,      0,
+      0, 0xBB4D,      0,      0,      0, 0xBB4E,      0, 0xBB4F,
+};
+const unsigned short utf8_to_euc_E5B5[] = {
+      0,      0, 0xBB50, 0xBB51,      0,      0, 0xBB52,      0,
+ 0xBB53,      0, 0xBB57, 0x564B, 0x5648,      0, 0x564A,      0,
+ 0x4D72, 0xBB55, 0x5649, 0xF43C,      0, 0xBB54,      0,      0,
+      0, 0xBB56,      0,      0, 0x563F,      0,      0, 0xBB58,
+ 0xBB59, 0xBB5A, 0xBB5B,      0, 0xBB5C,      0,      0,      0,
+      0, 0x3F73, 0xBB5D,      0, 0x564C, 0xBB5E,      0, 0x3A37,
+ 0xBB5F,      0,      0, 0x564D,      0,      0, 0x564E,      0,
+      0, 0xBB60, 0xBB61,      0,      0,      0, 0xBB62, 0xBB63,
+};
+const unsigned short utf8_to_euc_E5B6[] = {
+      0, 0xBB64, 0x5651, 0xBB65, 0x5650,      0,      0, 0x564F,
+ 0xBB66,      0, 0xBB67, 0x4568, 0x563A,      0,      0,      0,
+ 0x5657,      0, 0xBB68, 0xBB69, 0xBB6A, 0xBB6B,      0,      0,
+      0, 0xBB6C,      0, 0xBB6D,      0, 0x5653,      0, 0xBB6E,
+ 0xBB6F,      0, 0x5652,      0,      0,      0,      0, 0xBB70,
+      0,      0,      0, 0xBB71, 0x5654,      0, 0x5655,      0,
+ 0xBB72,      0, 0xE674,      0, 0xBB73,      0,      0, 0x5658,
+ 0xBB74, 0xBB75, 0x4E66,      0, 0x5659, 0x5656,      0,      0,
+};
+const unsigned short utf8_to_euc_E5B7[] = {
+      0,      0,      0, 0xBB76,      0,      0,      0, 0xBB77,
+      0, 0x565A,      0, 0xBB78, 0x3460, 0x565B, 0xBB7A,      0,
+ 0xBB79,      0, 0x565D, 0x565C,      0,      0, 0x565E,      0,
+ 0xBB7B, 0xBB7C,      0, 0x565F,      0, 0x406E, 0x3D23,      0,
+ 0xBB7D, 0x3D64,      0, 0x4163, 0xBB7E, 0x3929, 0x3A38, 0x392A,
+ 0x3570, 0xBC21,      0, 0x5660,      0,      0, 0x3A39,      0,
+      0, 0x384A, 0x5661, 0x4C26, 0x4743, 0x5662,      0, 0x392B,
+ 0xBC22, 0xBC23,      0, 0x342C,      0, 0x4327, 0x3652,      0,
+};
+const unsigned short utf8_to_euc_E5B8[] = {
+ 0xBC24,      0, 0x3B54, 0x495B,      0,      0, 0x4841, 0xBC25,
+      0,      0,      0, 0x5663, 0x3475, 0xBC26,      0,      0,
+      0, 0x5666, 0xBC27,      0, 0xBC28, 0xBC29, 0x4421,      0,
+ 0xBC2A, 0x5665, 0x5664, 0x5667,      0, 0x446B,      0, 0xBC2B,
+ 0xBC2C,      0,      0,      0,      0, 0x3F63,      0,      0,
+ 0xBC2E,      0,      0, 0x3B55,      0, 0x404A, 0xBC2D, 0x4253,
+ 0x3522,      0, 0xBC2F, 0x4422,      0, 0xBC30, 0x5668, 0x5669,
+ 0x3E6F,      0,      0,      0,      0, 0x4B39, 0xBC31,      0,
+};
+const unsigned short utf8_to_euc_E5B9[] = {
+ 0x566C,      0,      0, 0x566B, 0x566A, 0x497D,      0, 0x5673,
+      0, 0xBC34,      0, 0xBC32, 0x4B5A,      0, 0x566D,      0,
+ 0xBC33, 0xBC35,      0,      0, 0x566F, 0x4B6B, 0xBC36, 0x566E,
+ 0xBC37,      0,      0, 0xBC38, 0xBC39,      0, 0xBC3A, 0x5670,
+      0, 0x4828, 0x5671, 0x4A3E, 0x5672,      0,      0,      0,
+ 0xBC3B,      0, 0xBC3C, 0xBC3D, 0xBC3E, 0xBC3F, 0xBC40,      0,
+ 0xBC41,      0, 0x3433, 0x4A3F, 0x472F, 0x5674, 0x5675,      0,
+ 0x392C, 0x3434, 0x5676, 0x3838, 0x4D44, 0x4D29, 0x3476, 0x5678,
+};
+const unsigned short utf8_to_euc_E5BA[] = {
+ 0xBC42, 0x4423,      0, 0x392D, 0x3E31,      0,      0, 0x485F,
+      0,      0, 0x3E32, 0xBC43,      0,      0, 0xBC44, 0x3D78,
+      0,      0,      0,      0,      0, 0x446C, 0x4A79, 0x4539,
+      0,      0, 0x392E,      0, 0x495C,      0,      0,      0,
+ 0x5679,      0, 0xBC45,      0, 0xBC46, 0xBC47, 0x4559, 0x3A42,
+ 0xBC48,      0, 0xBC49, 0x384B, 0xBC4A, 0x446D,      0,      0,
+      0, 0xBC4B,      0, 0xBC4C,      0, 0x3043, 0x3D6E, 0x392F,
+ 0x4D47,      0,      0,      0,      0, 0xBC4D, 0xBC4E, 0xBC4F,
+};
+const unsigned short utf8_to_euc_E5BB[] = {
+      0, 0x567A, 0x567B, 0x4751,      0,      0, 0xBC50,      0,
+ 0x567C, 0x4E77, 0x4F2D, 0xBC52, 0xBC51,      0, 0xBC53, 0x567E,
+ 0x567D, 0xBC54, 0xBC55, 0x3347, 0xBC56, 0xBC57, 0x5721,      0,
+      0,      0, 0x5724, 0x5725, 0xBC58, 0x5723, 0xBC59, 0x4940,
+ 0x3E33, 0x5727, 0x5726, 0x5722,      0, 0xBC5A,      0,      0,
+ 0x5728, 0x5729,      0, 0xBC5B, 0x572A,      0,      0,      0,
+ 0x572D, 0x572B,      0, 0x572C, 0x572E,      0, 0x3164, 0x446E,
+ 0x572F,      0, 0x377A, 0x3276, 0x4736,      0, 0x5730, 0x467B,
+};
+const unsigned short utf8_to_euc_E5BC[] = {
+      0, 0x4A5B, 0xBC5C, 0x5731, 0x4F2E,      0, 0xBC5D, 0xBC5E,
+ 0xBC5F, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031, 0xBC60, 0x3C30,
+ 0x4675, 0x5736,      0, 0x355D, 0x4424, 0x307A, 0x5737, 0x4A26,
+ 0x3930, 0xBC61,      0, 0x4350, 0xBC62, 0xBC63,      0, 0x446F,
+      0, 0xBC64, 0xBC65, 0xBC66, 0xBC67, 0x4C6F, 0x3839, 0x384C,
+ 0xBC68, 0x5738,      0, 0xBC69, 0xBC6A, 0x5739, 0xBC6B, 0x573F,
+ 0xBC6C, 0x3C65,      0,      0, 0xBC6D, 0x4425, 0xBC6E, 0x362F,
+ 0x573A,      0,      0, 0xBC6F, 0x492B, 0xBC70, 0x4346, 0xBC71,
+};
+const unsigned short utf8_to_euc_E5BD[] = {
+ 0xBC72, 0x573B,      0,      0, 0xBC73, 0xBC74,      0, 0xBC75,
+ 0x573C,      0, 0x3630,      0, 0x573D, 0xBC76, 0x573E,      0,
+ 0xBC77, 0x5740,      0, 0x4576, 0xBC78,      0, 0x5741, 0x5742,
+ 0xBC79, 0x5743,      0, 0xBC7A, 0x5734, 0x5733,      0,      0,
+ 0xBC7B, 0x5744, 0x3741, 0xBC7C, 0xBC7D,      0, 0x4927, 0xBC7E,
+      0, 0x3A4C, 0x4937, 0x4426, 0x494B, 0x5745,      0, 0xBD21,
+ 0x3E34, 0x3146, 0xBD22, 0x5746, 0xBD23, 0xBD24,      0, 0x5747,
+ 0xBD25, 0x4C72, 0xBD26,      0, 0x4860, 0xBD27, 0xBD28, 0x574A,
+};
+const unsigned short utf8_to_euc_E5BE[] = {
+ 0x317D, 0x402C, 0x5749, 0x5748, 0x3742, 0x4254,      0, 0x574E,
+ 0x574C, 0xBD29, 0x574B, 0x4E27, 0x3865, 0xBD2A,      0, 0xBD2B,
+ 0x3D79, 0x574D, 0x454C, 0x3D3E,      0,      0, 0xBD2C, 0x4640,
+ 0x5751, 0x5750,      0,      0, 0xBD2D, 0xBD2E, 0x574F,      0,
+ 0x5752, 0x3866, 0xBD2F,      0, 0xBD32,      0,      0, 0xBD30,
+ 0x5753, 0x497C, 0x3D5B, 0xBD31, 0xBD33, 0x5754, 0x4879, 0xBD34,
+ 0xBD35, 0xBD36,      0, 0x4641, 0x4427,      0,      0, 0xF43E,
+ 0xBD37, 0x4530,      0,      0, 0x5755, 0x352B,      0,      0,
+};
+const unsigned short utf8_to_euc_E5BF[] = {
+      0,      0,      0, 0x3F34, 0xBD38, 0x492C,      0, 0xBD39,
+ 0xBD3A, 0xBD3B,      0, 0xBD3C, 0x3477, 0x4726,      0,      0,
+ 0xBD3D, 0xBD3E, 0xBD3F, 0xBD40, 0xBD41,      0, 0x5756, 0x3B56,
+ 0x4B3A, 0x4B3B,      0,      0, 0x317E, 0x575B, 0xBD42,      0,
+ 0x4369, 0xBD43, 0xBD44,      0, 0x5758,      0,      0,      0,
+ 0xBD45, 0xBD46, 0xBD47, 0x3277, 0xBD48, 0xBD49, 0xBD4A, 0xBD4B,
+ 0x582D, 0x575A, 0xBD4C, 0xBD4D,      0, 0x4730, 0xBD4E,      0,
+ 0x5759,      0, 0xBD4F, 0x5757, 0xBD50, 0x397A,      0, 0x575D,
+};
+const unsigned short utf8_to_euc_E680[] = {
+      0,      0,      0,      0,      0,      0,      0, 0xBD51,
+      0,      0, 0xBD52,      0,      0, 0xBD53, 0x5763, 0x5769,
+ 0x5761,      0, 0x455C, 0xBD54, 0xBD55, 0x5766, 0x495D, 0xBD56,
+ 0xBD57, 0x5760, 0xBD58, 0x5765, 0x4E67, 0x3B57,      0, 0xBD59,
+ 0x4255, 0x575E,      0,      0, 0xBD5A, 0x355E, 0x5768, 0x402D,
+ 0x3165, 0x5762, 0x3278, 0x5767,      0, 0xBD5B,      0, 0x3631,
+      0, 0x5764,      0, 0xBD5C,      0, 0xBD5D,      0,      0,
+      0,      0, 0x576A,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E681[] = {
+ 0xBD5E, 0x576C, 0x5776, 0x5774,      0,      0, 0x5771, 0xBD5F,
+ 0xBD60, 0xBD61, 0x5770, 0x4E78, 0xBD62, 0x5772,      0,      0,
+ 0x3632, 0xBD63, 0x3931,      0, 0xBD64, 0x3D7A, 0xBD65, 0xBD66,
+      0, 0x5779, 0x576B,      0,      0, 0xBD67,      0, 0x576F,
+ 0x575F, 0xBD68, 0x327A, 0x5773, 0x5775, 0x4351,      0, 0xBD69,
+ 0x3A28, 0x3238, 0x576D, 0x5778, 0x5777, 0x3633,      0, 0x4229,
+ 0x3366, 0xBD6A,      0,      0,      0, 0x3743,      0, 0x576E,
+      0,      0,      0,      0,      0,      0, 0xBD6B, 0xBD6C,
+};
+const unsigned short utf8_to_euc_E682[] = {
+      0, 0x577A, 0xBD6D, 0x577D, 0x5821, 0xF43F, 0xBD6E,      0,
+ 0xBD6F, 0x3C3D, 0xBD70, 0x5827, 0x4470, 0x577B, 0xBD71,      0,
+      0, 0xBD72, 0x5825, 0xBD73, 0x3279, 0xBD74, 0x5823, 0x5824,
+ 0xBD75,      0, 0x577E, 0x5822,      0, 0xBD76, 0xBD77, 0x3867,
+ 0x4D2A,      0, 0xBD78, 0x3435, 0xBD79, 0xBD7A, 0x3159, 0x5826,
+ 0xBD7B, 0x473A, 0x302D,      0,      0,      0,      0,      0,
+ 0xBD7C, 0xBD7D, 0x4861, 0x575C, 0x582C, 0x5830, 0x4C65, 0xBD7E,
+ 0x5829,      0,      0, 0xBE21, 0x4569, 0x582E, 0xBE22,      0,
+};
+const unsigned short utf8_to_euc_E683[] = {
+      0,      0, 0xBE23,      0, 0xBE24, 0x3E70, 0x582F, 0x4657,
+ 0xBE25, 0xBE26, 0xBE27, 0xBE28,      0,      0, 0xBE29, 0xBE2A,
+      0, 0x4F47,      0, 0x582B, 0xBE2B, 0xBE2C,      0,      0,
+ 0x5831, 0xBE2D, 0x397B, 0xBE2E, 0x404B, 0xBE2F, 0xBE30, 0x3054,
+ 0x582A, 0x5828, 0xBE31, 0x415A,      0, 0xBE32,      0, 0x577C,
+ 0x3B34,      0,      0,      0,      0,      0,      0,      0,
+ 0x4246, 0x583D, 0xBE33, 0x415B, 0x5838, 0xBE34, 0x5835, 0x5836,
+ 0xBE35, 0x3C66, 0x5839, 0x583C, 0xBE36, 0xBE37,      0,      0,
+};
+const unsigned short utf8_to_euc_E684[] = {
+ 0x5837, 0x3D25, 0xBE38, 0x583A,      0,      0, 0x5834, 0xBE39,
+ 0x4C7C, 0x4C7B, 0xBE3A,      0, 0xBE3B, 0x583E, 0x583F, 0x3055,
+ 0xBE3C, 0xBE3D, 0xBE3E, 0xBE3F, 0xBE40, 0x5833, 0xBE41, 0xBE42,
+      0, 0xBE43, 0x3672, 0x3026, 0xBE44,      0, 0xBE45, 0x3436,
+ 0xF440, 0x583B, 0xBE46,      0,      0,      0,      0, 0x5843,
+ 0x5842,      0, 0xBE47, 0xBE48, 0x5847,      0,      0,      0,
+ 0xBE49, 0xBE4A,      0,      0, 0x5848, 0xBE4B, 0xBE4C, 0xBE4D,
+      0, 0xBE4E,      0,      0, 0x5846, 0x5849, 0x5841, 0x5845,
+};
+const unsigned short utf8_to_euc_E685[] = {
+      0, 0xBE4F, 0x584A,      0, 0x584B, 0xBE50, 0xBE51, 0x5840,
+ 0x3B7C, 0xBE52, 0x5844, 0x4256, 0x3932, 0x5832, 0x3F35,      0,
+      0,      0,      0, 0x5858,      0, 0x4A69,      0,      0,
+ 0x584E, 0x584F, 0x5850,      0,      0, 0x5857, 0xBE53, 0x5856,
+ 0xBE54,      0, 0x4B7D, 0x3437,      0, 0x5854,      0, 0x3745,
+ 0x3334,      0,      0, 0x5851, 0xBE55,      0, 0x4E38, 0x5853,
+ 0x3056, 0x5855, 0xBE56, 0x584C, 0x5852, 0x5859, 0x3744, 0x584D,
+ 0xBE57,      0,      0, 0xBE58, 0xBE59,      0, 0x4D5D, 0xBE5A,
+};
+const unsigned short utf8_to_euc_E686[] = {
+ 0xBE5B, 0xBE5C, 0x4D2B, 0xBE5D, 0xBE5E,      0,      0, 0x585C,
+      0,      0, 0x5860, 0xBE5F,      0, 0xBE60, 0x417E,      0,
+ 0x4E79, 0x5861, 0xBE61, 0xBE62, 0x585E,      0, 0x585B, 0xBE63,
+ 0xBE64, 0x585A, 0x585F,      0, 0xBE65, 0xBE66,      0, 0xBE67,
+ 0xBE68,      0,      0,      0, 0x4A30, 0xBE69,      0, 0x4634,
+ 0xBE6A, 0x3746, 0xBE6B, 0x5862, 0x585D, 0xBE6C, 0x5863,      0,
+      0,      0, 0x377B,      0,      0,      0, 0x3231,      0,
+ 0xBE6D, 0xBE6E, 0x586B,      0, 0xBE6F,      0, 0x3438,      0,
+};
+const unsigned short utf8_to_euc_E687[] = {
+ 0xBE70, 0xBE71, 0xBE72, 0x5869,      0,      0, 0x586A, 0x3A29,
+ 0x5868, 0x5866, 0x5865, 0x586C, 0x5864, 0x586E, 0xBE73, 0xBE74,
+ 0x327B,      0,      0,      0,      0, 0xBE75,      0,      0,
+      0,      0,      0,      0, 0xBE76, 0xBE77, 0xBE78, 0xBE79,
+      0, 0xBE7A, 0xBE7B, 0x5870,      0, 0xBE7E, 0x586F, 0xBE7C,
+      0, 0xBE7D,      0,      0, 0xBF21, 0xBF22,      0, 0xBF23,
+      0,      0, 0x4428,      0, 0x5873,      0, 0x5871, 0x5867,
+ 0x377C,      0, 0x5872,      0, 0x5876, 0x5875, 0x5877, 0x5874,
+};
+const unsigned short utf8_to_euc_E688[] = {
+ 0x5878, 0xBF24,      0, 0xBF25, 0xBF26,      0,      0, 0xBF27,
+ 0x5879, 0x587A, 0x4A6A,      0, 0x587C, 0x587B, 0x3D3F,      0,
+ 0x402E, 0x3266, 0x327C, 0xBF28, 0x587D, 0xBF29, 0x303F,      0,
+      0,      0, 0x404C, 0x587E, 0xBF2A, 0x6C43, 0x5921, 0x3761,
+ 0xBF2B, 0x5922, 0xBF2C, 0xBF2D,      0,      0, 0x406F, 0xBF2E,
+      0, 0xBF2F, 0x5923, 0xBF30,      0,      0, 0x5924, 0x353A,
+ 0x5925,      0, 0x5926, 0x5927, 0x4257,      0,      0,      0,
+ 0x384D, 0xBF31,      0, 0x4C61,      0, 0xBF32,      0, 0x4B3C,
+};
+const unsigned short utf8_to_euc_E689[] = {
+ 0x3D6A, 0x5928, 0xBF33, 0xBF34, 0xBF35,      0, 0xBF36, 0x4070,
+ 0x6E3D, 0x4862,      0, 0x3C6A, 0xBF37, 0x3A4D, 0x5929,      0,
+ 0xBF38, 0xBF39, 0xBF3A, 0x4247, 0xBF3B, 0x4A27, 0xBF3C,      0,
+ 0x4271,      0, 0xBF3D, 0x592C, 0xBF3E,      0, 0x592A,      0,
+ 0x592D,      0,      0, 0x592B, 0xBF3F,      0,      0,      0,
+ 0x592E,      0,      0,      0,      0, 0xBF40, 0x4A31, 0xBF41,
+      0, 0x3037,      0, 0xBF42,      0,      0, 0x495E,      0,
+      0, 0x4863, 0xBF43,      0, 0x592F, 0xBF44, 0x5932, 0x3E35,
+};
+const unsigned short utf8_to_euc_E68A[] = {
+ 0x353B,      0, 0x5930, 0x5937, 0x3E36,      0,      0,      0,
+      0, 0x5931, 0x4744,      0,      0, 0xBF45, 0xBF46, 0xBF47,
+ 0xBF48, 0x4D5E, 0x5933, 0x5934, 0x5938, 0x456A, 0x5935, 0x3933,
+ 0x405E,      0,      0, 0x5946, 0x4834,      0, 0x4272,      0,
+      0,      0,      0,      0,      0,      0, 0xBF49,      0,
+ 0xBF4A,      0,      0, 0x4864, 0x5A2D,      0,      0,      0,
+      0, 0x4A7A,      0, 0xBF4B,      0, 0x4471, 0xBF4C, 0xBF4D,
+      0, 0x4B75, 0xBF4E, 0x593B, 0x3221, 0x436A, 0xBF4F, 0xBF50,
+};
+const unsigned short utf8_to_euc_E68B[] = {
+      0,      0, 0x5944,      0, 0xBF51, 0x4334, 0x593E, 0x5945,
+ 0x5940, 0x5947, 0x5943,      0, 0x5942, 0x476F, 0xBF52, 0x593C,
+ 0x327D, 0x593A, 0x3571, 0x4273, 0x5936, 0xBF53, 0xBF54, 0x5939,
+ 0x3934, 0x405B, 0xBF55, 0x3E37, 0x5941, 0x4752,      0,      0,
+ 0x3572, 0x3348,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xBF56,      0, 0x3367, 0x3F21, 0x5949, 0x594E,
+      0, 0x594A, 0xBF57, 0x377D, 0xBF58, 0x594F, 0x3B22, 0x3969,
+      0,      0,      0,      0, 0xBF59, 0xBF5A, 0x3D26, 0x593D,
+};
+const unsigned short utf8_to_euc_E68C[] = {
+      0, 0x3B7D, 0x594C, 0xBF5B, 0xBF5C,      0,      0, 0x3B58,
+ 0x594D, 0x3044, 0xBF5D, 0xBF5E, 0x5948, 0xBF5F,      0,      0,
+ 0xBF60, 0x4429,      0, 0xBF61,      0,      0, 0xBF62,      0,
+ 0xBF63, 0x3573,      0,      0,      0,      0,      0, 0x3634,
+      0,      0,      0,      0,      0,      0,      0, 0x594B,
+ 0x3027, 0xBF64, 0xBF65, 0x3A43,      0, 0xBF66,      0, 0x3F36,
+      0,      0,      0,      0,      0, 0xBF67, 0xBF68,      0,
+      0, 0xBF69, 0x4472,      0, 0xBF6A, 0x4854, 0x5951, 0x415E,
+};
+const unsigned short utf8_to_euc_E68D[] = {
+      0, 0xBF6B, 0xBF6C, 0xBF6D, 0xBF6E,      0, 0xBF6F,      0,
+      0, 0x422A, 0xBF70, 0xBF71, 0x3B2B, 0x5952, 0xBF72, 0x5954,
+ 0x5950,      0, 0xBF73, 0xBF74, 0xBF75, 0x4A61,      0, 0x443D,
+ 0xBF76,      0,      0, 0xBF77, 0x415C,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xBF78, 0xBF79, 0x4A7B,
+ 0x3C4E, 0x5960,      0, 0x595F, 0xBF7A, 0xBF7B, 0x3F78,      0,
+      0, 0xBF7C, 0x377E,      0, 0xBF7D, 0xBF7E, 0x5959, 0x3E39,
+ 0xC021,      0, 0x4668, 0x4731, 0xC022, 0xC023,      0, 0xC024,
+};
+const unsigned short utf8_to_euc_E68E[] = {
+ 0x5957,      0, 0xC025, 0x415D, 0xC026,      0,      0, 0xC027,
+ 0x3C78, 0x595C, 0xC028,      0, 0x3E38,      0, 0x5956, 0x595B,
+ 0xC029,      0, 0x4753,      0, 0xC02A, 0xC02B, 0x5955,      0,
+ 0x3721, 0xC02C, 0xC02D, 0x335D,      0,      0, 0xC02E, 0x595D,
+ 0x4E2B, 0x3A4E, 0x4335, 0x595A, 0xC02F, 0x405C, 0xC030, 0x3935,
+ 0x3F64, 0x3166, 0x413C, 0x5958, 0x3545, 0xC031, 0xC032, 0xC033,
+      0,      0, 0x3747,      0, 0x444F, 0x595E,      0,      0,
+      0,      0,      0, 0x415F,      0, 0xC034, 0x5961,      0,
+};
+const unsigned short utf8_to_euc_E68F[] = {
+ 0x5963, 0xC035,      0, 0x4237, 0x5969, 0xC036, 0x5964,      0,
+ 0xC037, 0x5966,      0,      0,      0,      0, 0xC038, 0x4941,
+ 0x4473, 0xC039, 0x5967, 0xC03A, 0xC03B, 0xC03C, 0x4D2C,      0,
+      0,      0, 0x4D48, 0x3439, 0xC03D,      0,      0,      0,
+ 0xC03E, 0x302E,      0, 0x5965,      0, 0xC03F,      0,      0,
+      0, 0x5962, 0xC040,      0, 0xC041,      0, 0x3478,      0,
+      0,      0, 0xC042, 0xC043, 0x3167, 0xC044, 0x5968,      0,
+ 0xC045, 0xC046, 0x4D49,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E690[] = {
+      0,      0,      0,      0,      0,      0, 0x596C,      0,
+      0, 0xC047, 0xC048,      0,      0, 0x423B,      0, 0x5973,
+ 0xC049,      0, 0xC04A, 0x596D, 0xC04B,      0, 0x596A, 0x5971,
+ 0xC04C,      0,      0,      0, 0x5953,      0, 0xC04D,      0,
+ 0xC04E,      0, 0xC04F,      0, 0xC050, 0xC051, 0x596E,      0,
+ 0x5972, 0xC052, 0xC053,      0, 0x4842, 0x456B,      0, 0xC054,
+ 0xC055,      0,      0,      0, 0x596B, 0xC056, 0x596F,      0,
+      0,      0, 0x3748,      0,      0, 0xC057, 0x3A71, 0xC058,
+};
+const unsigned short utf8_to_euc_E691[] = {
+      0,      0, 0x405D,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xC059,      0,      0, 0x5977, 0xC05A,
+      0, 0xC05B, 0xC05C, 0xC05D, 0xC05E,      0,      0,      0,
+ 0x4526,      0, 0xC05F, 0xC060, 0xC061, 0xC062,      0, 0xC063,
+ 0xC064, 0xC065,      0, 0xC066,      0,      0,      0, 0x5974,
+      0, 0x4B60,      0,      0,      0, 0xC067,      0, 0x5975,
+      0,      0,      0, 0xC068, 0xC069,      0, 0x5976,      0,
+ 0x4C4E,      0, 0x4022, 0xC06A,      0, 0xC06B,      0,      0,
+};
+const unsigned short utf8_to_euc_E692[] = {
+      0,      0,      0, 0x3762,      0, 0xC06C,      0, 0xC06D,
+ 0x597D,      0,      0,      0,      0,      0,      0, 0xC06E,
+ 0xC06F, 0xC070, 0x3B35, 0x597A,      0, 0x5979,      0,      0,
+ 0xC071, 0xC072, 0x4732, 0xC073,      0, 0xC074, 0x4635, 0xC075,
+      0, 0xC076,      0, 0xC077, 0x4531, 0x597B, 0xC078,      0,
+ 0xC079, 0x597C,      0, 0x496F, 0xC07A, 0x4745, 0x3B23,      0,
+ 0x4071,      0, 0x4B50, 0xC07B,      0,      0,      0,      0,
+      0, 0x3349,      0, 0x5A25, 0x597E, 0xC07C, 0xC07D, 0xC07E,
+};
+const unsigned short utf8_to_euc_E693[] = {
+      0, 0x4D4A, 0x5A27,      0, 0xC121, 0x5A23,      0, 0x5A24,
+      0, 0xC122, 0xC123, 0xC124, 0xC125, 0x4160, 0xC126,      0,
+ 0xC127, 0xC128, 0x5A22,      0, 0x593F, 0xC129,      0, 0xC12A,
+ 0x5A26,      0, 0x5A21,      0,      0,      0,      0,      0,
+ 0x5A2B, 0x5A2C, 0x4527, 0x5A2E, 0xC12B, 0xC12C, 0x3B24, 0x5A29,
+      0, 0xC12D, 0xC12E,      0, 0x353C, 0xC12F,      0, 0x5A2F,
+ 0xC130, 0x5A28, 0x5A33,      0, 0x5A32, 0xC131, 0x5A31, 0xC132,
+      0,      0, 0x5A34, 0xC133,      0, 0x5A36, 0x3E71, 0xC134,
+};
+const unsigned short utf8_to_euc_E694[] = {
+ 0x5A35, 0xC135,      0,      0, 0xC136, 0x5A39,      0,      0,
+ 0xC137, 0xC138, 0xC139,      0,      0,      0,      0, 0xC13A,
+      0,      0,      0, 0xC13B, 0xC13C,      0, 0xC13D,      0,
+ 0x5A37, 0xC13E,      0, 0xC13F, 0x5A38, 0x5970, 0xC140, 0xC141,
+      0,      0, 0xC142, 0x5A3B, 0x5A3A,      0, 0xC143,      0,
+      0, 0xC144, 0x5978, 0x5A3C, 0x5A30,      0, 0xC145, 0x3B59,
+      0, 0xC146,      0,      0, 0x5A3D, 0x5A3E, 0x5A40, 0x5A3F,
+ 0x5A41, 0x327E, 0xC147, 0x3936, 0xC148, 0xC149, 0x4A7C, 0x402F,
+};
+const unsigned short utf8_to_euc_E695[] = {
+      0,      0,      0, 0xC14A,      0, 0x384E,      0, 0xC14B,
+ 0x5A43, 0xC14C,      0,      0,      0, 0x5A46, 0xF441, 0x4952,
+ 0xC14D, 0x355F, 0xC14E,      0, 0xC14F, 0x5A45, 0x5A44, 0x4754,
+ 0x5A47, 0x3635,      0,      0,      0, 0x5A49, 0x5A48, 0xC150,
+ 0xC151,      0, 0x343A, 0x3B36,      0,      0, 0x4658, 0xC152,
+      0,      0,      0, 0xC153, 0x3749,      0,      0,      0,
+ 0x3F74,      0, 0x5A4A,      0, 0x4030, 0x4528,      0, 0x495F,
+ 0x5A4B,      0, 0xC154,      0,      0, 0xC155,      0,      0,
+};
+const unsigned short utf8_to_euc_E696[] = {
+      0, 0xC156, 0x5A4C, 0x5A4D,      0, 0xC157,      0, 0x4A38,
+ 0x555D, 0x4046, 0xC158,      0, 0x494C,      0, 0x3A58,      0,
+ 0x4865, 0x4843, 0xC159,      0,      0, 0xC15A,      0, 0x454D,
+ 0xC15B, 0x4E41,      0, 0x5A4F, 0x3C50, 0xC15C,      0, 0x5A50,
+ 0xC15D, 0x3036,      0, 0xC15E, 0x3654, 0x404D, 0xC15F, 0x4960,
+      0,      0,      0, 0x5A51, 0x3B42, 0x4347, 0xC160, 0x3B5B,
+ 0x3F37,      0, 0xC161, 0xC162, 0xC163,      0,      0, 0x5A52,
+      0, 0x4A7D,      0,      0, 0x3177, 0x3B5C,      0, 0xC164,
+};
+const unsigned short utf8_to_euc_E697[] = {
+      0, 0x5A55, 0xC165, 0x5A53, 0x5A56, 0x4E39, 0x5A54,      0,
+ 0xC166, 0xC167,      0, 0x407B, 0x5A57,      0, 0xC168, 0x4232,
+ 0xC169,      0, 0x5A58,      0, 0xC16A,      0, 0xC16B, 0x347A,
+ 0xC16C, 0x5A5A,      0, 0x5A59,      0,      0,      0, 0xC16D,
+ 0x5A5B, 0x5A5C, 0x347B,      0,      0, 0x467C, 0x4336, 0x356C,
+ 0x3B5D, 0x4161,      0,      0, 0x3D5C, 0x3030,      0,      0,
+ 0xC16E, 0x5A5D, 0xC16F,      0, 0xC170, 0xC171,      0,      0,
+      0, 0xC172, 0x3222, 0x5A61,      0,      0, 0xC173, 0xC174,
+};
+const unsigned short utf8_to_euc_E698[] = {
+ 0xC175,      0, 0x3937, 0x5A60, 0xC176,      0, 0x3A2B, 0x3E3A,
+ 0xC177, 0xC178, 0x5A5F,      0, 0x3E3B, 0xC179, 0x4C40, 0x3A2A,
+      0, 0xC17A, 0xC17B, 0x3057, 0x404E, 0xC17C, 0xC17D,      0,
+      0,      0,      0,      0, 0x5A66, 0xC17E, 0xC221, 0x4031,
+ 0x3147, 0xC222, 0xC223, 0xC224, 0xC225, 0x3D55, 0xC226, 0x4B66,
+ 0x3A72, 0xC227, 0xC228, 0xC229, 0xC22A, 0x3E3C, 0xC22B, 0x4027,
+ 0xC22C, 0xC22D,      0, 0xC22E, 0x5A65, 0x5A63, 0x5A64, 0xC230,
+      0, 0xC22F,      0, 0xF442, 0x436B,      0,      0, 0x5B26,
+};
+const unsigned short utf8_to_euc_E699[] = {
+ 0xC231, 0x5A6A, 0x3B7E, 0x3938, 0x5A68, 0xC232, 0xC233,      0,
+      0, 0x5A69, 0xC234, 0x3F38, 0xC235,      0, 0xC237, 0x5A67,
+      0, 0xC236, 0x3B2F,      0,      0,      0,      0, 0xC238,
+ 0xC239, 0xC23A,      0, 0xC23B, 0xC23C, 0x5A6C, 0x5A6B, 0x5A70,
+ 0xC23D, 0xC23E, 0x5A71,      0, 0x5A6D, 0xF443, 0x3322, 0x5A6E,
+ 0x5A6F, 0x4855, 0xC240, 0xC241, 0xC242,      0, 0x4961, 0x374A,
+ 0x5A72,      0,      0, 0xC244, 0x4032, 0xC245, 0x3E3D, 0xC247,
+ 0xC248, 0xC249, 0x4352, 0xC24A, 0xC24C,      0, 0xC243, 0xC246,
+};
+const unsigned short utf8_to_euc_E69A[] = {
+ 0xC24B, 0x3647,      0, 0x5A73, 0x5A77,      0,      0, 0x324B,
+ 0x5A74, 0x5A76,      0, 0xC24D, 0xC24E, 0xC24F, 0x5A75,      0,
+ 0xC250, 0x3D6B, 0xC251,      0,      0,      0, 0x4348, 0x3045,
+ 0x5A78, 0xC252, 0xC253, 0xC254, 0xC255, 0x5A79,      0, 0xC256,
+ 0xC257,      0, 0x442A,      0, 0xC258,      0, 0x4E71,      0,
+      0,      0,      0, 0x3B43,      0, 0xC259, 0x4A6B,      0,
+      0, 0xC25A, 0xC25B,      0, 0x4B3D, 0xC25C,      0,      0,
+ 0x5B22, 0x5A7B,      0, 0xC25D, 0x5A7E,      0, 0x5A7D, 0xC25E,
+};
+const unsigned short utf8_to_euc_E69B[] = {
+ 0xC25F, 0x5A7A, 0xC260, 0xC261, 0x5B21,      0,      0, 0x465E,
+ 0xC262, 0x5A7C,      0,      0, 0xC263,      0, 0xC264, 0xC265,
+      0,      0,      0,      0, 0xC266,      0, 0x5B23,      0,
+      0, 0x3D6C, 0x5B24, 0xC267, 0x4D4B, 0x4778,      0, 0xC268,
+ 0x5B25,      0,      0,      0,      0,      0, 0x5B27,      0,
+ 0xC269, 0x5B28,      0, 0xC26A, 0xC26B,      0, 0xC26C,      0,
+ 0x5B29,      0, 0x364A, 0x3148, 0x3939, 0x5B2A,      0, 0x5B2B,
+ 0x3D71, 0x4162, 0xC26D, 0xC23F, 0x5258, 0x413E, 0x413D, 0x4258,
+};
+const unsigned short utf8_to_euc_E69C[] = {
+ 0x3A47,      0,      0, 0x5072,      0, 0xC26E,      0, 0xC26F,
+ 0x376E, 0x4D2D,      0, 0x4A7E,      0, 0x497E, 0xC270, 0x5B2C,
+      0,      0,      0, 0xC271, 0x3A73, 0x443F, 0x5B2D, 0x4F2F,
+      0, 0xC272,      0, 0x4B3E, 0xC273, 0x442B, 0x5B2E, 0x347C,
+ 0xC274,      0, 0xC275,      0,      0,      0, 0x5B2F, 0x5B30,
+ 0x4C5A,      0, 0x4C24, 0x4B76, 0x4B5C, 0x3B25, 0x5B32,      0,
+      0, 0x3C6B,      0, 0xC276, 0x4B51,      0, 0x5B34, 0x5B37,
+ 0x5B36,      0, 0x3479,      0,      0, 0x3560, 0xC277, 0x5B33,
+};
+const unsigned short utf8_to_euc_E69D[] = {
+      0, 0x5B35,      0,      0,      0, 0xC278, 0x5B38, 0xC279,
+ 0xC27A, 0x3F79,      0,      0, 0xC27B,      0, 0x4D7B, 0x3049,
+ 0x3A60, 0x423C,      0, 0x3C5D, 0xC27C, 0xC27D, 0x3E73,      0,
+      0, 0x5B3B,      0,      0, 0x454E, 0xC27E, 0x5B39, 0x422B,
+ 0x5B3A, 0x3E72, 0x4C5D, 0x5B3C, 0x5B3D, 0x4D68, 0xC321,      0,
+      0,      0, 0x5B42,      0, 0xC322, 0x393A, 0xC323, 0x4755,
+ 0x5B3F, 0x456C, 0x5A5E, 0x5A62, 0xC324, 0x354F, 0xC325, 0x4747,
+      0,      0,      0, 0xC326, 0x5B41,      0, 0x3E3E, 0x4844,
+};
+const unsigned short utf8_to_euc_E69E[] = {
+      0, 0xC327,      0,      0, 0xC328, 0x5B47,      0, 0x487A,
+      0, 0x5B3E,      0, 0x5B44, 0x5B43,      0, 0xC329, 0xC32A,
+ 0x404F, 0xC32B,      0, 0xC32C,      0, 0x4B6D, 0xC32D, 0x4E53,
+ 0xC32E, 0xC32F, 0x4B67, 0xC330, 0x324C, 0x3B5E,      0,      0,
+ 0x4F48, 0x5B46, 0x3F75,      0,      0,      0, 0x5B45,      0,
+      0, 0x5B40,      0,      0,      0,      0,      0, 0x384F,
+ 0xC331, 0xC332, 0xC333, 0x5B4C, 0x5B4A, 0xC334, 0x324D, 0x5B48,
+ 0x5B4E, 0x5B54,      0, 0xC335, 0xC336, 0xC337,      0,      0,
+};
+const unsigned short utf8_to_euc_E69F[] = {
+ 0xC339, 0x4248, 0xC33A, 0xC33B, 0x4A41, 0xC33C, 0x5B56,      0,
+ 0xC33D, 0xC33E, 0x4922,      0,      0,      0, 0x5B55, 0x4770,
+ 0x4B3F, 0x343B, 0xC33F, 0x4077, 0x3D40,      0,      0, 0xC340,
+ 0x4453, 0xC341, 0x4D2E,      0, 0xC342, 0x5B51, 0x5B50,      0,
+      0, 0xC343, 0x5B52,      0, 0x5B4F,      0, 0xC344, 0x5B57,
+      0, 0x5B4D,      0,      0, 0x5B4B,      0, 0x5B53, 0x5B49,
+ 0xC345, 0x436C, 0xC346, 0x4C78, 0x3C46, 0x3A74, 0xC347, 0xC348,
+      0, 0xC338,      0, 0x3A3A,      0,      0, 0x4B6F, 0x3341,
+};
+const unsigned short utf8_to_euc_E6A0[] = {
+      0, 0xF446, 0x444E, 0x464A, 0x3149,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x4072, 0xC34A,      0, 0x4034, 0x372A,
+      0, 0xC34B,      0,      0,      0, 0xC34C, 0x5B59, 0xC34D,
+      0, 0x393B, 0x337C,      0,      0,      0,      0, 0xC34F,
+ 0xC34E, 0x5B5B, 0x3374, 0x5B61, 0xC350, 0xC351,      0, 0xC352,
+ 0xC353, 0xC354, 0x5B5E, 0xC355, 0x4073,      0,      0,      0,
+ 0x334B, 0x3A2C,      0, 0xC356, 0x334A, 0x3A4F,      0, 0xC357,
+};
+const unsigned short utf8_to_euc_E6A1[] = {
+ 0x5B5C, 0x3765, 0x374B, 0x456D, 0xC358, 0xC359, 0x5B5A,      0,
+ 0x3046,      0, 0xC35A,      0, 0xC35B, 0x5B5D, 0x5B5F,      0,
+ 0x364D, 0x372C, 0xC349, 0x343C, 0x354B, 0xC35C,      0, 0xC35D,
+ 0xC35E, 0x5B62,      0, 0xC35F, 0x3A79, 0x4B71,      0, 0x3B37,
+      0,      0,      0, 0x5B63,      0,      0,      0, 0x4930,
+      0,      0,      0, 0xC360,      0,      0, 0xC361, 0xC362,
+ 0xC363, 0xC364, 0xC365,      0, 0x5B6F, 0xC366, 0x3233, 0x5B64,
+      0, 0xC367, 0xC368, 0xC369, 0xC36A,      0, 0x5B75, 0x5B65,
+};
+const unsigned short utf8_to_euc_E6A2[] = {
+      0, 0x4E42, 0xC36B, 0x5B6C, 0xC36C, 0x475F, 0xC36D,      0,
+ 0xC36E,      0,      0,      0,      0, 0x5B74,      0, 0x5B67,
+      0,      0,      0, 0x3034, 0x5B69,      0, 0xC36F, 0x393C,
+ 0xC370,      0, 0xC371, 0x5B6B, 0xC372, 0x5B6A,      0, 0x5B66,
+ 0x5B71, 0xC373, 0x3E3F, 0xC374,      0, 0xC375, 0x546D, 0x3868,
+ 0x4D7C, 0xC376, 0xC377,      0,      0, 0x5B68, 0xC378, 0x4474,
+ 0x3323, 0x3A2D, 0xC379, 0x5B60,      0, 0x5B70, 0x3361,      0,
+      0, 0x5B6E, 0x5B72, 0xC37A, 0x456E,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E6A3[] = {
+      0,      0,      0,      0, 0x347E, 0xC37B, 0x5C32,      0,
+ 0xC37C, 0x4C49, 0x5B77, 0x347D, 0xC37D, 0x5B7E,      0, 0xC37E,
+ 0xC421, 0xC422, 0x4B40, 0xC423, 0x5C21, 0x5C23, 0xC424, 0x5C27,
+ 0x5B79, 0xC425, 0x432A,      0, 0xC426, 0xC427,      0, 0x456F,
+ 0x5C2B, 0x5B7C,      0, 0x5C28,      0, 0xC428,      0, 0x5C22,
+ 0xC429,      0, 0xC42A, 0xC42B, 0xC42C, 0xC42D, 0x3F39, 0x5C2C,
+ 0xC42E, 0xC42F, 0x4033,      0,      0, 0xC430, 0xC431,      0,
+      0, 0x5C2A, 0x343D, 0xC432, 0xC433, 0xC434,      0,      0,
+};
+const unsigned short utf8_to_euc_E6A4[] = {
+ 0x4F50, 0x5B76,      0,      0, 0x5C26, 0x3058, 0xC435,      0,
+ 0x5B78, 0xC436, 0xC437, 0x4C3A, 0x5B7D, 0x3F22, 0x4447, 0x5B73,
+ 0xC438, 0xC439, 0x5C25, 0xC43A,      0,      0, 0xC43B, 0xC43C,
+      0, 0x3F7A, 0x5C2F, 0x3371, 0x3821,      0,      0,      0,
+      0, 0x5C31, 0x5B7A, 0x5C30,      0, 0x5C29, 0x5B7B,      0,
+ 0x5C2D,      0, 0x5C2E,      0,      0,      0,      0,      0,
+ 0x5C3F, 0xC43D,      0, 0xC43E, 0x464E, 0xC43F, 0x5C24,      0,
+ 0xC440, 0x5C3B,      0, 0xC441,      0, 0x5C3D,      0, 0x4458,
+};
+const unsigned short utf8_to_euc_E6A5[] = {
+      0,      0, 0xC442,      0,      0, 0xC443,      0,      0,
+      0, 0xC444, 0x4D4C,      0,      0,      0, 0xC445,      0,
+      0,      0,      0, 0x4976, 0x5C38, 0x424A,      0, 0xC446,
+      0, 0x5C3E, 0x413F, 0xC447, 0x5C35, 0x5C42, 0x5C41,      0,
+ 0x466F, 0x5C40, 0x466A, 0xC448, 0xC449, 0xC44A, 0xC44B,      0,
+ 0xC44C, 0xC44D, 0x5C44, 0x5C37, 0xC44E, 0x3648, 0x5C3A, 0x3D5D,
+ 0xC44F, 0xC450, 0xC451, 0x4760, 0x5C3C, 0x364B,      0, 0x5C34,
+ 0x5C36, 0x5C33, 0xC452, 0xC453, 0x4F30, 0x335A, 0x5C39, 0xC454,
+};
+const unsigned short utf8_to_euc_E6A6[] = {
+ 0xC455, 0x5C43, 0x3335,      0,      0,      0,      0,      0,
+      0,      0, 0x3A67,      0,      0, 0xC456, 0x315D,      0,
+      0, 0x5C54, 0xC457,      0, 0x4F31, 0x5C57, 0xC458,      0,
+ 0xC459,      0,      0, 0x3F3A, 0x5C56,      0,      0,      0,
+ 0x5C55, 0xC45A,      0,      0,      0, 0xC45B, 0xC45C, 0x5C52,
+ 0xC45D,      0,      0, 0xC45E,      0, 0xC45F, 0x5C46, 0xC460,
+      0, 0x5C63, 0x5C45,      0, 0x5C58,      0,      0, 0xC461,
+ 0xC462,      0, 0xC463, 0x5C50, 0xC464,      0, 0x5C4B, 0x5C48,
+};
+const unsigned short utf8_to_euc_E6A7[] = {
+      0, 0x5C49,      0, 0x5C51,      0, 0xC465,      0, 0x7422,
+ 0xC466,      0, 0x5C4E, 0x393D, 0x4448, 0x4164, 0x5C4C,      0,
+ 0x5C47, 0xC467,      0, 0x5C4A,      0,      0, 0xC468, 0xC469,
+ 0x4D4D, 0x4B6A,      0,      0,      0, 0x5C4F, 0x5C59,      0,
+      0,      0, 0xC46A,      0,      0, 0xC46B,      0, 0x5C61,
+ 0x5C5A,      0,      0, 0x5C67,      0, 0x5C65, 0xC46C, 0xC46D,
+      0, 0xC46E, 0x5C60, 0xC46F,      0, 0xC470,      0,      0,
+      0, 0x5C5F,      0, 0x4450,      0, 0x4165, 0xC471, 0x5C5D,
+};
+const unsigned short utf8_to_euc_E6A8[] = {
+ 0xC472, 0xC473, 0x5C5B, 0xC474,      0, 0x5C62,      0,      0,
+      0,      0, 0x5C68, 0x4875, 0x5C6E,      0,      0, 0xC475,
+      0, 0xC476, 0x5C69, 0x5C6C, 0x5C66, 0xC477,      0, 0x4374,
+      0, 0x4938, 0xC478, 0x5C5C,      0, 0xC479, 0x5C64, 0x3E40,
+ 0xC47A, 0x4C4F, 0x5C78, 0x5C6B, 0xC47B,      0,      0,      0,
+ 0xC47C, 0x3822, 0x3223, 0x335F,      0,      0, 0x5C53,      0,
+ 0xC47D,      0, 0xC47E,      0, 0xC521, 0x3E41, 0x5C70, 0xC522,
+ 0x5C77, 0x3C79, 0x3372, 0xC523,      0, 0x432E, 0xC524, 0xC525,
+};
+const unsigned short utf8_to_euc_E6A9[] = {
+      0,      0,      0,      0, 0x5C6D, 0xC526, 0xC527, 0x5C72,
+ 0x5C76, 0xC528, 0xC529, 0x3636,      0,      0, 0xC52A,      0,
+ 0xC52B, 0xC52C, 0xC52D,      0,      0, 0xC52E, 0xC52F,      0,
+ 0x354C, 0x5C74,      0, 0xC530,      0,      0,      0, 0x3521,
+      0, 0x464B, 0x5C73,      0, 0xC531,      0, 0x5C75, 0xC532,
+      0,      0, 0xC533, 0xF449,      0,      0,      0,      0,
+      0, 0xC534, 0x5C6F, 0xC535,      0,      0,      0,      0,
+ 0x5C71,      0,      0,      0,      0,      0, 0xC536, 0x3360,
+};
+const unsigned short utf8_to_euc_E6AA[] = {
+ 0x4349, 0xC537,      0, 0xC538, 0x5C7C,      0, 0xC539, 0xC53A,
+      0, 0xC53B,      0, 0xC53C,      0, 0x5C7A, 0x3869,      0,
+ 0x5C79, 0xC53D,      0,      0,      0,      0,      0, 0x5D21,
+      0,      0,      0, 0xC53E, 0x5B58, 0xC53F, 0xC540, 0xC541,
+ 0x5C7B,      0, 0x5C7D, 0x5C7E,      0, 0xC542,      0,      0,
+      0,      0, 0x5D2C, 0xC543, 0x5D28,      0, 0x5B6D, 0xC544,
+ 0xC545, 0xC546,      0, 0x5D27, 0xC547,      0,      0,      0,
+ 0x5D26,      0,      0, 0x5D23,      0, 0xC548, 0xC549, 0xC54A,
+};
+const unsigned short utf8_to_euc_E6AB[] = {
+      0, 0x5C6A, 0x5D25, 0x5D24,      0,      0, 0xC54B,      0,
+ 0xC54D, 0xC54C,      0,      0, 0xC54E,      0,      0,      0,
+ 0xC54F, 0x5D2A,      0, 0x4F26, 0xC550, 0xC551, 0xC552,      0,
+      0,      0, 0x5D2D, 0x367B, 0xC553, 0xC554, 0x5D29, 0x5D2B,
+      0,      0, 0xF44A,      0, 0xC555,      0,      0, 0xC556,
+ 0x4827,      0, 0x5D2E,      0, 0xC557,      0,      0,      0,
+ 0xC558, 0xC559, 0xC55A,      0,      0,      0,      0,      0,
+      0,      0, 0x5D32, 0x5D2F, 0xC55B, 0xC55C,      0,      0,
+};
+const unsigned short utf8_to_euc_E6AC[] = {
+      0,      0, 0xC55D, 0xC55E, 0x4D73, 0x5D30, 0xC55F, 0xC560,
+      0, 0xC561, 0x5C5E,      0,      0,      0,      0, 0xC562,
+ 0xC563, 0xC564, 0x5D33,      0,      0,      0, 0x5D34, 0xC565,
+      0,      0,      0, 0xC566,      0, 0x3135, 0xC567, 0x5D36,
+ 0x3767, 0x3C21,      0, 0x3655, 0xC568,      0,      0, 0x3224,
+ 0xC569,      0,      0, 0xC56A, 0xC56B,      0,      0, 0xC56C,
+      0,      0, 0x4D5F,      0,      0, 0xC56D, 0xC56E, 0x5D38,
+ 0x5D37, 0x5D3A, 0x353D, 0xC56F,      0, 0x3656, 0x343E, 0xC570,
+};
+const unsigned short utf8_to_euc_E6AD[] = {
+      0,      0,      0, 0x5D3D,      0,      0, 0xC571, 0x5D3C,
+      0, 0x5D3E, 0xC572,      0, 0x324E, 0xC573, 0x4337,      0,
+ 0x5D3F,      0, 0xC574, 0x343F, 0x5D41,      0, 0xC575,      0,
+ 0xC576, 0x5D40,      0, 0x5D42,      0, 0xC577,      0, 0x5D43,
+ 0xC578, 0x5D44, 0x3B5F, 0x4035, 0x3A21,      0, 0x4970, 0xC579,
+      0, 0x4A62, 0x4F44, 0xC57A,      0,      0, 0xC57B, 0x3B75,
+ 0xC57C,      0,      0, 0x3A50, 0x4E72, 0xC57D,      0,      0,
+ 0x5D45, 0x5D46,      0, 0x3B60,      0, 0xC57E, 0xC621, 0x5D47,
+};
+const unsigned short utf8_to_euc_E6AE[] = {
+ 0x5D48,      0, 0xC622, 0x5D4A, 0x5D49, 0xC623, 0x4B58,      0,
+      0, 0x3D5E, 0x3C6C, 0x3B44,      0, 0x5D4B,      0,      0,
+      0,      0,      0,      0,      0, 0x5D4D, 0x3F23, 0xC624,
+ 0x5D4C,      0,      0, 0xC625,      0,      0, 0x5D4E, 0xC626,
+ 0xC627,      0, 0xC628, 0xC629, 0x5D4F,      0,      0,      0,
+ 0xC62A, 0xC62B, 0x5D50, 0x5D51, 0xC62C, 0xC62D, 0xC62E, 0x5D52,
+ 0xC62F, 0x5D54, 0x5D53, 0x5D55, 0x3225, 0x434A,      0, 0x5D56,
+ 0xC630, 0xC631, 0x3B26, 0x334C, 0x5D57, 0xC632, 0xC633, 0x4542,
+};
+const unsigned short utf8_to_euc_E6AF[] = {
+ 0x544C,      0,      0, 0xC634, 0xC635, 0x3523, 0x5D58,      0,
+      0, 0xC636,      0, 0x5D59, 0xC637, 0x4A6C, 0x4B68,      0,
+      0,      0, 0x4647, 0x5D5A, 0x4866,      0, 0xC638,      0,
+ 0x487B,      0, 0xC639, 0x4C53,      0,      0,      0, 0x5D5B,
+      0, 0xC63A,      0, 0xC63B,      0,      0, 0xC63C, 0xC63D,
+      0,      0,      0, 0x5D5D, 0x5D5C,      0, 0xC63E, 0x5D5F,
+      0, 0xC63F,      0, 0x5D5E,      0,      0,      0, 0xC640,
+      0, 0xC641,      0,      0,      0,      0,      0, 0xC642,
+};
+const unsigned short utf8_to_euc_E6B0[] = {
+      0,      0, 0xC643,      0, 0xC644, 0xC645,      0,      0,
+ 0x5D61, 0xC646,      0,      0,      0, 0xC647, 0xC648, 0x3B61,
+ 0xC649, 0x4C31, 0xC64A, 0x5D62, 0x5D63,      0,      0, 0x3524,
+      0, 0xC64B,      0, 0x5D64,      0,      0,      0, 0xC64C,
+      0,      0,      0, 0x5D66, 0x5D65,      0, 0xC64D, 0xC64E,
+ 0xC64F,      0,      0,      0, 0xC650,      0, 0xC651,      0,
+      0,      0,      0, 0xC652, 0x3F65, 0xC653, 0xC654, 0x4939,
+ 0x314A,      0, 0xC655, 0xC656,      0,      0, 0x4845, 0xC657,
+};
+const unsigned short utf8_to_euc_E6B1[] = {
+ 0x4475, 0x3D41, 0x3561,      0,      0,      0,      0,      0,
+      0,      0, 0xC658, 0xC659,      0, 0xC65A, 0x4846, 0xC65B,
+ 0x3C2E,      0, 0xC65C,      0, 0xC65D, 0x5D68,      0, 0x3440,
+      0, 0xC65E, 0x3178, 0xC65F, 0xC660, 0x4672, 0x5D67, 0x393E,
+ 0x4353,      0, 0x5D69,      0,      0,      0,      0, 0xC736,
+ 0x5D71,      0, 0x5D6A, 0xC661,      0, 0xC662,      0, 0xC663,
+ 0x4241,      0, 0x3562, 0x5D72, 0xC664,      0, 0xC665,      0,
+ 0xC666, 0xC667, 0x3768, 0xC668,      0, 0x3525, 0x5D70,      0,
+};
+const unsigned short utf8_to_euc_E6B2[] = {
+      0, 0x5D6E, 0x5D6B, 0x4D60,      0, 0xC669, 0xC66A, 0xC66B,
+ 0x4440, 0xC66C,      0,      0, 0x4659, 0x5D6C,      0,      0,
+ 0x5D74,      0, 0x5D73, 0x3723, 0xC66D, 0xC66E, 0x322D, 0xC66F,
+ 0xC670, 0x3A3B, 0x5D6D, 0x5D6F, 0xC671,      0,      0, 0xC672,
+      0, 0x4B57, 0x4274,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x4B77,      0,      0, 0x5D7C,      0,
+ 0xC673, 0x5D7D, 0xC674, 0x324F, 0xC675,      0,      0,      0,
+ 0x4A28, 0x4C7D, 0x5E21, 0x3C23, 0x3E42, 0x5D78, 0x5D7E, 0x3168,
+};
+const unsigned short utf8_to_euc_E6B3[] = {
+      0, 0x3637, 0xC676,      0, 0x5D75, 0x5D7A, 0xC677,      0,
+      0, 0x4074, 0x4771,      0, 0x4867, 0xC678,      0, 0xC679,
+ 0xC67A, 0xC67B, 0xC67C, 0x5D77, 0xC67D, 0x4B21, 0xC67E, 0x5D79,
+      0, 0x5E24, 0xC721, 0x5E22, 0xC722, 0x5D7B,      0,      0,
+ 0xC723, 0x4B22, 0x4748, 0x3563,      0, 0x4525,      0, 0xC724,
+ 0x436D, 0xC725, 0x5E25, 0xC726, 0xC727,      0, 0xC728, 0x5E23,
+ 0x4259, 0x5D76, 0xC729, 0x314B, 0xC72A,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E6B4[] = {
+      0,      0,      0,      0, 0xC72B,      0,      0, 0xC72C,
+      0,      0, 0xC72D, 0x4D4E, 0x5E30,      0, 0xC72E, 0xC72F,
+      0, 0xC730, 0x5E2F, 0xC731,      0,      0,      0, 0x4076,
+      0, 0x5E2C, 0xC732, 0x4D6C,      0,      0, 0x4636, 0x5E26,
+      0,      0,      0,      0,      0, 0x4445, 0xC733, 0xC734,
+ 0xC735, 0x314C, 0x393F, 0x5E29,      0,      0, 0xC737, 0xC738,
+      0, 0xC739, 0x3D27, 0x5E2E,      0, 0x5E2D, 0x5E28,      0,
+ 0x5E2B, 0xC73A,      0, 0x3368, 0xC73B, 0x5E2A, 0x4749, 0xC73C,
+};
+const unsigned short utf8_to_euc_E6B5[] = {
+      0, 0x4E2E,      0,      0, 0x3E74, 0x4075,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xC73D,
+      0, 0x5E36, 0x5E34,      0, 0x494D,      0, 0xC73E, 0xC73F,
+      0, 0xC740,      0, 0x5E31, 0x5E33, 0xC741, 0x313A, 0xC742,
+      0, 0x3940, 0x4F32,      0, 0x333D,      0, 0x4962, 0xC743,
+ 0xC744,      0,      0,      0, 0x4D61,      0,      0, 0x3324,
+ 0x3F3B, 0x5E35,      0,      0, 0xC745,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E6B6[] = {
+      0,      0, 0xC746,      0,      0, 0x5E3A,      0, 0xC747,
+ 0x3E43,      0,      0,      0, 0x4D30,      0, 0x5E37,      0,
+      0, 0xC748, 0xC749, 0x5E32, 0xC74A, 0x5E38, 0xC74B, 0xC74C,
+ 0xC74D, 0x4E5E,      0, 0x4573, 0x4642,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xC74E,      0, 0xC74F,      0,      0, 0x3336,
+      0,      0, 0x3155,      0, 0xC750, 0x5E3E,      0, 0xC751,
+ 0x5E41, 0xC752,      0,      0, 0x4E43, 0xC753,      0, 0xC754,
+};
+const unsigned short utf8_to_euc_E6B7[] = {
+ 0x4D64,      0,      0,      0, 0xC755, 0x5E48, 0x5E42, 0x5E3F,
+ 0xC756,      0, 0xC757, 0x4E54, 0x5E45,      0, 0xC758, 0xC759,
+      0, 0x3D4A, 0x5E47,      0,      0, 0x5E4C, 0xC75A,      0,
+ 0x4571, 0x5E4A,      0, 0xC75B,      0, 0xC75C, 0x5E44, 0xC75D,
+ 0xC75E, 0x4338, 0xC75F,      0, 0x5E4B, 0xC760, 0x5E40,      0,
+ 0x5E46, 0xC761, 0x5E4D, 0x307C, 0x5E43,      0, 0x5E4E, 0xC762,
+ 0xC763, 0x3F3C, 0xF44C, 0x3D5F, 0xC764, 0x4A25, 0xC765, 0x3A2E,
+ 0xF44B, 0x5E3B, 0x5E49, 0x453A, 0xC766,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E6B8[] = {
+ 0xC767,      0,      0,      0, 0xC768, 0x4036,      0, 0x3369,
+ 0x3A51, 0x3E44, 0x5E3D, 0x3D42,      0,      0,      0,      0,
+      0,      0,      0, 0x374C,      0, 0x5E3C,      0,      0,
+      0, 0x5E52, 0x3D6D, 0x383A,      0, 0x5E61, 0xC769, 0x5E5B,
+ 0x3574, 0x454F, 0xC76A, 0x5E56, 0x5E5F, 0x302F, 0x3132, 0xC76B,
+      0, 0x3239,      0, 0x5E58, 0x422C, 0x5E4F, 0x5E51, 0x3941,
+      0,      0, 0xC76C,      0,      0,      0, 0xC76D,      0,
+ 0x5E62, 0xC76E, 0x5E5D, 0xC76F, 0xC770,      0, 0x5E55,      0,
+};
+const unsigned short utf8_to_euc_E6B9[] = {
+      0,      0,      0, 0x5E5C, 0xC771, 0xC772,      0,      0,
+ 0xC773, 0xC774, 0x4C2B, 0xC775,      0, 0x5E5A, 0x5E5E, 0xC776,
+      0, 0xC777, 0xC778, 0xC779, 0xC77A,      0, 0x3850, 0xC77B,
+ 0x3E45,      0,      0, 0x4339, 0xC77C, 0xC77D, 0xC77E, 0x5E54,
+      0,      0, 0xC821, 0xC822,      0,      0,      0, 0x4D2F,
+ 0xC823,      0,      0, 0x5E57,      0,      0, 0x5E50, 0x4572,
+      0,      0, 0x5E53, 0xC824,      0,      0, 0x5E59,      0,
+      0,      0,      0, 0xC825,      0, 0xC826, 0x4F51, 0x3C3E,
+};
+const unsigned short utf8_to_euc_E6BA[] = {
+ 0x4B7E,      0, 0x5E63,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x482E, 0xC827,      0, 0x5E6F,
+ 0x383B,      0,      0, 0xC828,      0,      0, 0x3D60,      0,
+ 0x5E65, 0xC829,      0,      0, 0x4E2F, 0x3942,      0, 0x5E72,
+ 0xC82A,      0, 0x306E,      0,      0, 0x5E70,      0, 0xC82B,
+      0,      0, 0x5E64,      0,      0, 0xC82C, 0xC82D, 0x5E6A,
+      0, 0xC82E, 0x5E6C, 0xC82F,      0,      0, 0x4D4F, 0x5E67,
+      0,      0, 0x452E, 0xC830,      0, 0x5E69,      0, 0xC831,
+};
+const unsigned short utf8_to_euc_E6BB[] = {
+ 0xC832, 0xC833, 0x5E71, 0xC834, 0x5E6B, 0x4C47,      0, 0xC835,
+ 0xC836, 0x5E66, 0xC837, 0x3C22, 0x5E7E, 0xC838, 0xC839, 0xC83A,
+      0, 0x336A,      0, 0x5E68, 0x5E6D, 0x5E6E,      0,      0,
+      0,      0,      0,      0,      0, 0x426C, 0x425A,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xC83B, 0x5E76, 0xC83C, 0xC83D, 0x5E7C,
+      0,      0, 0x5E7A,      0, 0x4529,      0,      0, 0x5F23,
+ 0x5E77, 0xC83E,      0, 0xC83F,      0, 0xC840, 0x5E78, 0x5E60,
+};
+const unsigned short utf8_to_euc_E6BC[] = {
+      0, 0x3579, 0x493A,      0, 0xC841,      0, 0x3C3F,      0,
+ 0xC842, 0x3977, 0xC843,      0, 0xC844, 0xC845,      0, 0x4F33,
+      0, 0x5E74,      0, 0x5F22, 0x3169, 0x4166, 0xC846,      0,
+ 0xC847,      0, 0xC848, 0xC849,      0,      0,      0,      0,
+ 0x4779,      0, 0x3441, 0x4E7A,      0,      0, 0xC84A,      0,
+      0, 0xC84B, 0xC84C, 0x4C21, 0x4452, 0xC853,      0, 0xC84D,
+ 0xC84E, 0x5E7B, 0x5E7D, 0xC84F,      0,      0, 0xC850,      0,
+ 0x4132,      0,      0, 0xC851, 0xC852,      0, 0x5F21, 0x5E79,
+};
+const unsigned short utf8_to_euc_E6BD[] = {
+      0, 0x5E73,      0,      0,      0, 0x3443,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xC854,
+      0, 0xC855, 0xC856, 0xC857, 0x3769,      0,      0, 0xC858,
+ 0x5F2F, 0xC859, 0xC85A, 0x5F2A, 0x4078, 0xC85B, 0xC85C, 0x3363,
+      0, 0xC85D, 0xC85E,      0, 0x3D61,      0, 0x5F33,      0,
+ 0xC85F,      0,      0,      0, 0xC860, 0x5F2C, 0x442C, 0x5F29,
+ 0x4459,      0,      0,      0, 0x5F4C,      0,      0,      0,
+ 0x5F26,      0, 0x5F25,      0, 0x5F2E, 0xC861, 0xC862,      0,
+};
+const unsigned short utf8_to_euc_E6BE[] = {
+ 0x5F28, 0x5F27, 0x5F2D, 0xC863, 0x4021,      0, 0x5F24, 0xC864,
+ 0xC865,      0,      0, 0xC866, 0xC867, 0xC868, 0x5F30,      0,
+ 0xC869, 0x5F31, 0xC86A, 0xC86B, 0xC86C,      0, 0xC86D, 0x3442,
+      0,      0, 0xC86E,      0,      0,      0,      0, 0xC86F,
+ 0xC870, 0x5F36,      0, 0x5F35, 0x5F37, 0xC871, 0xC872, 0xC873,
+ 0xC874,      0, 0x5F3A,      0,      0,      0, 0xC875, 0xC876,
+ 0xC877, 0x4543,      0, 0x5F34,      0, 0xC878, 0xC879,      0,
+      0, 0x5F38,      0,      0, 0xC87A,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E6BF[] = {
+ 0x3763, 0x4279, 0x5F32, 0x473B,      0, 0xC87B, 0x5F39, 0xC87C,
+ 0xC87D,      0, 0xC87E,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x5F3E, 0x5F3C,      0,      0,
+ 0x5F3F,      0, 0xC921, 0x5F42,      0,      0, 0xC922, 0x5F3B,
+ 0x396A, 0x4728,      0,      0, 0x5E39,      0,      0,      0,
+ 0xC923, 0xC924,      0, 0x4D74, 0x5F3D,      0, 0x5F41, 0x4275,
+ 0xC925, 0x5F40,      0, 0x5F2B,      0, 0xC926, 0x6F69,      0,
+      0, 0xC927, 0x5F45,      0, 0xC928, 0xC929, 0x5F49,      0,
+};
+const unsigned short utf8_to_euc_E780[] = {
+ 0xC92A, 0x5F47,      0,      0,      0, 0xC92B, 0xC92C, 0xC92D,
+      0, 0x5F43,      0, 0x5F44,      0, 0xC92E,      0, 0x5F48,
+      0, 0x5F46,      0,      0,      0, 0x494E,      0, 0xC92F,
+ 0x5F4E,      0, 0x5F4B, 0x5F4A,      0, 0x5F4D, 0x4654, 0x5F4F,
+ 0xC930,      0,      0, 0xC931,      0,      0, 0x4375, 0x426D,
+ 0xF44D,      0,      0,      0, 0x4025,      0,      0, 0xC932,
+ 0x5F50,      0, 0x5F52,      0, 0xC933,      0,      0, 0xC934,
+      0, 0xC935,      0,      0, 0xC936,      0, 0x5F51,      0,
+};
+const unsigned short utf8_to_euc_E781[] = {
+      0,      0,      0, 0xC937, 0xC938,      0,      0,      0,
+ 0xC939, 0xC93A, 0xC93B, 0xC93C, 0x5E75,      0, 0xC941,      0,
+      0, 0x5F53,      0,      0, 0xC93D, 0xC93E,      0,      0,
+ 0x4667,      0,      0,      0,      0, 0xC93F, 0xC940,      0,
+      0,      0,      0, 0x5F54, 0xC942, 0xC943,      0,      0,
+      0,      0,      0, 0x3250, 0xC944,      0, 0xC945, 0x4574,
+ 0x3325,      0,      0,      0,      0, 0xC946, 0xC947,      0,
+ 0x3564,      0,      0,      0, 0x3C5E, 0x3A52, 0xC948,      0,
+};
+const unsigned short utf8_to_euc_E782[] = {
+      0, 0xC949,      0,      0,      0, 0xC94A, 0xC94B,      0,
+      0, 0x4F27, 0x3F66,      0,      0,      0, 0x316A,      0,
+      0,      0, 0x5F56,      0, 0xC94C, 0xC94D, 0xC94E, 0xC94F,
+ 0xC950, 0x5F55,      0, 0xC951,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xC952,      0,      0,      0,
+      0,      0,      0, 0xC953, 0x5F59, 0x433A, 0x5F5C, 0x5F57,
+ 0xC954, 0xC955,      0, 0x5F5B, 0xC956,      0,      0, 0xC957,
+ 0x5F5A, 0x4540, 0x3059, 0xF42E,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E783[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x4E75,      0, 0xC958, 0x5F5E,      0,      0,      0, 0x3128,
+      0, 0xC959,      0, 0xC95A, 0xC95B, 0xC95C, 0xC95D,      0,
+ 0xC95E, 0x5F60,      0,      0, 0xC95F, 0x5F5F,      0, 0x5F5D,
+      0,      0,      0,      0, 0xC960,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x5F58,      0,      0,      0,      0,      0,      0,
+      0, 0x4B23, 0xC961,      0,      0, 0x5F62,      0,      0,
+};
+const unsigned short utf8_to_euc_E784[] = {
+      0,      0,      0, 0xC962, 0xC963, 0xC964, 0xC965, 0xC966,
+      0, 0x5F61,      0, 0xC967, 0xC968,      0,      0, 0xC969,
+      0,      0,      0,      0, 0x316B,      0,      0,      0,
+      0, 0x5F64, 0x4A32,      0, 0x5F63,      0, 0xC96A,      0,
+ 0xC96B, 0x4C35,      0,      0,      0,      0, 0x3E47,      0,
+      0,      0,      0, 0xC96C,      0, 0xC96D,      0, 0xC96E,
+ 0xC96F, 0xC970,      0,      0,      0,      0, 0x4133,      0,
+ 0xC971,      0,      0,      0, 0x3E46,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E785[] = {
+      0, 0xC972,      0,      0,      0, 0xC973, 0xC974, 0xC975,
+      0, 0x4E7B, 0xC976, 0xC977, 0x5F6A,      0, 0x4079,      0,
+ 0xC978,      0, 0xC979,      0,      0, 0x5F66, 0x5F6B, 0xC97A,
+      0, 0x316C, 0xC97B,      0, 0xC97C,      0, 0xC97D,      0,
+ 0xC97E,      0, 0x5F69,      0, 0x4761, 0x5F65, 0x5F68, 0x3E48,
+ 0xCA21, 0x4851,      0,      0, 0x5F6C,      0, 0x3C51,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xCA22,      0,      0,      0, 0x407A,      0,      0,
+};
+const unsigned short utf8_to_euc_E786[] = {
+ 0xCA23,      0,      0,      0, 0x5F6F, 0xCA24,      0, 0xCA25,
+ 0x5F67,      0, 0x3727,      0, 0xCA26,      0,      0, 0x5F6D,
+      0,      0, 0xCA27,      0, 0x4D50, 0x5F70,      0,      0,
+      0, 0x7426, 0xCA28, 0xCA29,      0,      0,      0, 0x3D4F,
+ 0xCA2A,      0, 0xCA2B,      0,      0,      0,      0,      0,
+ 0x5F71,      0,      0,      0, 0x5F72,      0,      0, 0xCA2C,
+ 0xCA2D, 0x472E, 0xCA2E, 0xCA2F,      0,      0,      0,      0,
+      0, 0x5F74, 0xCA30,      0,      0,      0, 0x5F75, 0xCA31,
+};
+const unsigned short utf8_to_euc_E787[] = {
+ 0xCA32, 0xCA33,      0, 0x4733, 0xCA34,      0,      0,      0,
+ 0x4575, 0x5F77,      0, 0xCA35, 0xCA36,      0, 0x5F79,      0,
+ 0x4E55,      0, 0x5F76, 0xCA37, 0x5F78, 0x316D, 0xCA38, 0x5F73,
+      0, 0xCA39, 0xCA3A,      0, 0xCA3B,      0,      0, 0x535B,
+ 0x5F7A,      0,      0,      0,      0, 0x4167, 0x3B38, 0x5F7C,
+      0,      0,      0,      0, 0x5F7B, 0x3F24, 0x5259,      0,
+      0,      0,      0,      0,      0, 0x5F7D,      0,      0,
+ 0xCA3C, 0x6021,      0, 0x5F6E, 0x5F7E,      0, 0xCA3D, 0x6022,
+};
+const unsigned short utf8_to_euc_E788[] = {
+ 0xCA3E,      0,      0,      0,      0,      0, 0x477A, 0xCA3F,
+ 0xCA40, 0xCA41,      0,      0,      0, 0x6023,      0,      0,
+ 0x6024,      0,      0, 0xCA42,      0,      0,      0, 0xCA43,
+      0,      0, 0xCA44, 0x6025,      0, 0xCA45,      0, 0xCA46,
+      0,      0,      0,      0, 0xCA47,      0,      0,      0,
+ 0x6026,      0, 0x445E, 0xCA48, 0x6028, 0x6027,      0, 0xCA49,
+ 0x6029,      0, 0x602A,      0, 0xCA4A, 0x3C5F, 0x4963,      0,
+ 0xCA4B, 0xCA4C, 0x4C6C, 0x602B, 0x602C, 0x4156, 0x3C24, 0x602D,
+};
+const unsigned short utf8_to_euc_E789[] = {
+ 0x602E, 0xCA4D, 0xCA4E, 0xCA4F,      0, 0xCA50, 0x602F, 0x4A52,
+ 0x4847,      0,      0, 0x6030, 0x4757,      0, 0xCA51, 0xCA52,
+ 0xCA53,      0, 0x442D, 0xCA54,      0, 0xCA55, 0xCA56,      0,
+ 0x6031, 0x3267, 0xCA57, 0x356D, 0xCA58, 0x4C46, 0xCA59, 0x4C36,
+ 0xCA5A, 0x3234, 0x4F34, 0xCA5B,      0,      0,      0, 0x4B52,
+ 0xCA5C, 0x4A2A,      0, 0xCA5D,      0,      0, 0xCA5E, 0xCA5F,
+      0, 0xCA60, 0x4037,      0, 0x6032,      0,      0, 0xCA61,
+ 0xCA62, 0x4643,      0, 0xCA63, 0xCA64, 0x3823, 0x6033, 0xCA65,
+};
+const unsigned short utf8_to_euc_E78A[] = {
+ 0x3A54, 0x6035, 0x6034,      0, 0xCA66,      0,      0, 0x6036,
+      0, 0xCA67,      0,      0,      0, 0xCA68, 0xCA69,      0,
+      0,      0, 0x6037, 0xCA6A,      0,      0, 0x6038,      0,
+      0,      0,      0, 0xCA6B,      0,      0,      0,      0,
+ 0x353E,      0, 0x6039,      0,      0,      0,      0, 0x603A,
+ 0xCA6C,      0,      0,      0, 0x3824, 0xCA6D, 0xCA6E, 0x4848,
+      0, 0xCA6F, 0x603C,      0, 0xCA70,      0, 0x3E75,      0,
+      0, 0x603B,      0,      0,      0,      0, 0xCA71,      0,
+};
+const unsigned short utf8_to_euc_E78B[] = {
+      0, 0xCA72, 0x3638, 0x603D, 0x603F,      0, 0x603E, 0xCA73,
+      0, 0xCA74,      0,      0, 0xCA75,      0, 0x6040,      0,
+ 0x3851,      0, 0x6041,      0,      0, 0xCA76, 0xCA77, 0x3669,
+ 0xCA78, 0x4140,      0, 0x397D,      0,      0,      0, 0xCA79,
+ 0x6043, 0x6044, 0x6042,      0,      0, 0xCA7A,      0,      0,
+      0, 0x3C6D,      0,      0, 0x4648, 0x3639,      0,      0,
+      0,      0,      0, 0xCA7B, 0xCA7C,      0,      0, 0x6046,
+ 0x432C, 0x6045, 0xCA7D, 0xCA7E, 0x4F35, 0x4762, 0xCB21,      0,
+};
+const unsigned short utf8_to_euc_E78C[] = {
+      0,      0, 0xCB22,      0, 0xCB23, 0xCB24,      0, 0xCB25,
+      0,      0, 0x6049, 0xCB26,      0, 0xCB27,      0,      0,
+      0,      0, 0xCB28, 0xCB29,      0,      0, 0x604B, 0x6048,
+ 0xCB2A, 0xCB2B,      0, 0x4C54, 0x604A, 0x604C, 0xCB2C, 0x4E44,
+      0,      0, 0xCB2D,      0, 0xCB2E, 0x6050,      0, 0xCB2F,
+ 0xCB30, 0x604F, 0x4376, 0x472D, 0xCB31,      0, 0x3825, 0x604E,
+      0, 0xCB32, 0xCB33,      0, 0x604D, 0xCB34, 0x4D31, 0x4D32,
+      0,      0, 0xCB35, 0xCB36,      0, 0xCB37, 0x6051, 0x316E,
+};
+const unsigned short utf8_to_euc_E78D[] = {
+      0,      0,      0, 0xCB38, 0x3976, 0x3B62,      0,      0,
+      0,      0,      0,      0,      0, 0xCB39, 0x6052, 0x6053,
+ 0xCB3A,      0, 0xCB3B,      0,      0,      0, 0xCB3C, 0x6055,
+ 0xCB3D,      0,      0,      0,      0, 0xCB3E, 0xCB3F, 0xCB40,
+ 0xCB41,      0,      0, 0x3D43,      0,      0, 0xCB42, 0xCB43,
+ 0x6057, 0xCB44, 0x6056, 0xCB45, 0xCB46,      0, 0xCB47, 0xCB48,
+ 0x6058, 0xCB49, 0x334D,      0,      0, 0x605A,      0, 0xCB4A,
+ 0x6059, 0xCB4B, 0x605C, 0x605B, 0xCB4C,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E78E[] = {
+ 0xCB4D, 0xCB4E,      0, 0xCB4F, 0x383C, 0xCB50, 0xCB51, 0x4E28,
+      0, 0x364C,      0, 0x3226,      0,      0, 0xCB52,      0,
+ 0xCB53,      0,      0, 0xCB54,      0, 0xCB55, 0x366A, 0xCB56,
+ 0xCB57,      0,      0,      0, 0xCB58,      0, 0xCB59, 0xCB5A,
+ 0xCB5B,      0, 0xCB5C,      0,      0, 0xCB5D, 0xCB5E,      0,
+      0, 0x3461, 0xCB5F, 0xCB60,      0, 0xCB61,      0,      0,
+      0,      0, 0x4E68, 0x605E,      0, 0xCB62,      0, 0xCB63,
+      0, 0xCB64,      0, 0x6060, 0xCB65, 0xCB66,      0, 0xCB67,
+};
+const unsigned short utf8_to_euc_E78F[] = {
+ 0x6061,      0, 0x3251,      0,      0, 0xCB68, 0xCB69,      0,
+ 0x605D, 0xCB6A, 0x3B39, 0xCB6B, 0xCB6C, 0x4441, 0x605F, 0xCB6D,
+      0,      0, 0xCB6E, 0xCB6F,      0,      0, 0xCB70,      0,
+      0, 0xCB71,      0,      0,      0, 0xCB72, 0x6064,      0,
+ 0x3C6E, 0xCB73,      0, 0xCB74,      0, 0x6062, 0xCB75, 0xCB76,
+      0, 0xCB77, 0x373E,      0,      0, 0x4849, 0x6063,      0,
+      0, 0x607E,      0,      0, 0xCB78, 0xCB79,      0, 0xCB7A,
+ 0x6069, 0xCB7B, 0xCB7C, 0xCB7D,      0, 0xCB7E, 0x383D, 0xCC21,
+};
+const unsigned short utf8_to_euc_E790[] = {
+ 0xCC22, 0xCC23,      0, 0x3565, 0xCC24, 0x6066, 0x4D7D, 0xCC25,
+      0, 0x4E30, 0xCC26,      0,      0,      0,      0,      0,
+      0, 0xCC27,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xCC28, 0xCC29,      0,      0,      0,      0,
+      0,      0, 0x4276,      0, 0xCC2A, 0x6068, 0xCC2B,      0,
+ 0xCC2C, 0xCC2D, 0xCC2E, 0xCC2F, 0xCC30, 0xCC31, 0xCC32, 0xCC33,
+ 0xCC34, 0xCC35, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A,      0,
+      0, 0xCC36, 0x606B,      0,      0,      0,      0, 0x606D,
+};
+const unsigned short utf8_to_euc_E791[] = {
+ 0xCC37, 0x6070,      0, 0xCC38, 0xCC39,      0, 0xCC3A, 0xCC3B,
+      0,      0,      0, 0xCC3C,      0, 0xCC3D,      0,      0,
+      0, 0xCC3E, 0xCC3F,      0,      0, 0x606C,      0, 0xCC40,
+      0, 0x606F, 0x386A, 0x314D, 0x6071, 0xCC41, 0x3F70, 0x606E,
+ 0x4E5C,      0, 0xCC42, 0x6074, 0x7424,      0, 0xCC43, 0xCC44,
+ 0xCC45, 0x6072, 0x6075, 0xCC46,      0, 0xCC47, 0xCC48, 0x6067,
+ 0x6073, 0xCC49, 0xCC4A, 0x3A3C,      0,      0, 0x6076,      0,
+      0,      0,      0,      0,      0,      0, 0x6077,      0,
+};
+const unsigned short utf8_to_euc_E792[] = {
+ 0xCC4B, 0xCC4C,      0, 0x4D7E,      0, 0xCC4D, 0xCC4E, 0xCC4F,
+      0, 0xCC50,      0, 0x6078,      0,      0,      0, 0xCC51,
+ 0xCC52, 0xCC53, 0xCC54,      0,      0,      0,      0,      0,
+ 0xCC55, 0xCC56, 0xCC57,      0, 0xCC58,      0, 0x6079, 0xCC59,
+ 0xCC5A, 0xCC5B, 0x6065, 0xCC5C,      0,      0, 0xCC5D, 0x607A,
+ 0xCC5E, 0xCC5F, 0xCC60, 0xCC61,      0,      0, 0xCC62, 0xCC63,
+ 0x3444, 0xCC64, 0xCC65,      0,      0, 0xCC66,      0,      0,
+      0, 0xCC67,      0, 0xCC68,      0, 0x3C25,      0, 0xCC69,
+};
+const unsigned short utf8_to_euc_E793[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xCC6A, 0xCC6B, 0x607B,      0, 0xCC6C,      0,      0, 0x607C,
+ 0xCC6D,      0,      0, 0xCC6E, 0x607D,      0,      0,      0,
+ 0xCC6F,      0, 0xCC70, 0xCC71, 0x313B,      0, 0xCC72, 0xCC73,
+ 0x6121,      0, 0x493B, 0x6122, 0xCC74,      0, 0x3424, 0x6123,
+ 0xCC75, 0x6124, 0xCC76, 0xCC77,      0,      0, 0x6125, 0xCC78,
+ 0x6127, 0x6128, 0x6126,      0, 0xCC79,      0, 0x4953, 0x612A,
+ 0x6129,      0, 0xCC7A, 0xCC7B, 0xCC7C,      0,      0, 0xCC7D,
+};
+const unsigned short utf8_to_euc_E794[] = {
+      0, 0xF450,      0, 0x612C, 0x612B, 0x612D, 0xCC7E,      0,
+      0,      0,      0,      0, 0x612E, 0x6130, 0x612F,      0,
+      0, 0x3979, 0xCD21, 0x6132,      0, 0x6131, 0xCD22, 0xCD23,
+ 0x3445,      0, 0x3F53,      0, 0x453C,      0, 0x6133, 0x4038,
+ 0xCD24, 0xCD25,      0, 0x3B3A, 0xCD26, 0x3179, 0x6134, 0xCD27,
+ 0x4D51, 0xCD28, 0xCD29, 0x4A63, 0x6135,      0,      0, 0xCD2A,
+ 0x4544, 0x4D33, 0x3943, 0x3F3D,      0,      0, 0xCD2B, 0x434B,
+ 0x5234, 0xCD2C, 0x442E, 0x3268, 0x6136, 0xCD2D, 0xCD2E, 0xCD2F,
+};
+const unsigned short utf8_to_euc_E795[] = {
+ 0xCD30,      0,      0, 0xCD31, 0x6137,      0, 0x613C, 0xCD32,
+ 0xCD33, 0x613A, 0x6139, 0x5A42, 0x3326, 0x6138, 0xCD34, 0x305A,
+ 0xCD35, 0x482A, 0xCD36,      0, 0x484A,      0,      0, 0xCD37,
+      0, 0x4E31, 0x613D, 0x613B, 0x435C, 0x4026, 0xCD38, 0xCD39,
+ 0x482B, 0xCD3A, 0x492D,      0, 0x613F, 0x4E2C, 0x374D, 0x6140,
+      0, 0x613E, 0x4856, 0x6141,      0, 0x6142,      0, 0xCD3B,
+ 0x305B, 0xCD3C,      0, 0x3E76, 0x6147,      0, 0x6144, 0x466D,
+ 0x6143, 0xCD3D, 0xCD3E, 0xCD3F, 0xCD40, 0xCD41, 0xCD42, 0x3526,
+};
+const unsigned short utf8_to_euc_E796[] = {
+      0, 0xCD43, 0x614A,      0,      0, 0xCD44, 0x6145, 0x6146,
+      0, 0x6149, 0x6148, 0x4925,      0,      0, 0x4142, 0x4141,
+ 0xCD45, 0x353F, 0xCD46, 0xCD47, 0x614B, 0xCD48,      0,      0,
+      0, 0xCD49, 0x614C,      0, 0xCD4A, 0x614D,      0,      0,
+      0,      0, 0xCD4B, 0x614F, 0xCD4C, 0x614E,      0,      0,
+      0,      0,      0, 0x3156,      0,      0,      0,      0,
+      0, 0x6157, 0x4868, 0x6151, 0xCD4D, 0x6153,      0,      0,
+ 0x6155, 0x3F3E, 0xCD4E,      0, 0x6156, 0x6154, 0x3C40, 0xCD4F,
+};
+const unsigned short utf8_to_euc_E797[] = {
+ 0xCD50, 0xCD51, 0x6150, 0x6152, 0xCD52, 0x4942, 0xCD53, 0x3E49,
+      0,      0, 0x6159,      0, 0xCD54, 0x6158, 0xCD55, 0xCD56,
+      0,      0, 0x615A,      0, 0x3C26, 0x3A2F,      0, 0xCD57,
+ 0x4577, 0x615B,      0, 0x444B, 0xCD58,      0, 0x615D, 0xCD59,
+ 0xCD5A, 0xCD5B, 0x4E21, 0x615C, 0xCD5C,      0,      0, 0xCD5D,
+      0, 0x4169,      0,      0, 0xCD5E,      0, 0xCD5F, 0xCD60,
+ 0x6162, 0xCD61, 0x6164, 0x6165, 0x4354,      0,      0,      0,
+      0, 0xCD62, 0x6163,      0, 0x6160,      0, 0x615E, 0x615F,
+};
+const unsigned short utf8_to_euc_E798[] = {
+ 0xCD63, 0x6161, 0xCD64, 0xCD65, 0xCD66,      0,      0, 0xCD67,
+ 0xCD68, 0x6168, 0xCD69, 0x6166, 0xCD6A, 0x6167,      0, 0xCD6B,
+      0,      0, 0xCD6C, 0xCD6D,      0, 0xCD6E, 0xCD6F,      0,
+      0, 0xCD70,      0, 0xCD71, 0xCD72, 0xCD73, 0xCD74, 0x6169,
+ 0x616B, 0x616C, 0x616D, 0xCD75, 0x616E, 0xCD76, 0xCD77, 0x616A,
+      0, 0xCD78,      0,      0,      0, 0xCD79,      0,      0,
+ 0x6170,      0, 0xCD7A, 0xCD7B, 0x616F, 0xCD7C,      0,      0,
+ 0xCD7D, 0xCD7E, 0xCE21, 0x6171, 0xCE22,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E799[] = {
+ 0xCE24, 0xCE25, 0x4E45, 0xCE26, 0xCE27, 0xCE28, 0x6174, 0x6172,
+ 0x6173, 0xCE29, 0xCE23, 0xCE2A, 0x3462,      0,      0,      0,
+      0,      0, 0x4C7E,      0,      0, 0xCE2B, 0x4A4A,      0,
+ 0x6176, 0xCE2C,      0,      0, 0x6175,      0,      0, 0xCE2D,
+      0, 0x6177, 0x6178,      0, 0xCE2E, 0xCE2F,      0, 0x617C,
+ 0x6179, 0x617A, 0x617B,      0, 0x617D, 0xCE30, 0xCE31, 0xCE32,
+ 0x617E, 0xCE33, 0x6221,      0, 0xCE34,      0, 0x6222,      0,
+ 0x6223,      0, 0x482F, 0x4550, 0x6224, 0x4772, 0x4934,      0,
+};
+const unsigned short utf8_to_euc_E79A[] = {
+ 0x6225, 0xCE35, 0xF451, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
+ 0x6227,      0,      0, 0x6228, 0xCE37, 0xCE38, 0x6229,      0,
+ 0x3B29,      0,      0, 0x622B,      0, 0xCE39, 0x622A,      0,
+      0, 0x622C, 0x622D, 0xCE3A, 0xCE3B, 0xCE3C, 0xF452, 0xCE3D,
+ 0xCE3E,      0, 0xCE3F, 0xCE40, 0xCE41, 0xCE42, 0xCE43, 0xCE44,
+ 0xCE45,      0, 0xCE46,      0,      0, 0xCE47, 0x4869,      0,
+ 0x622E,      0,      0,      0, 0x622F,      0,      0, 0x7369,
+ 0x6230, 0x6231, 0x6232,      0,      0, 0xCE48,      0, 0x3B2E,
+};
+const unsigned short utf8_to_euc_E79B[] = {
+      0, 0xCE49, 0x6233, 0x4756,      0, 0xCE4A, 0x4B5F,      0,
+ 0x314E, 0xCE4B, 0x3157, 0xCE4C, 0xCE4D, 0x6234, 0xCE4E,      0,
+      0,      0, 0x6236,      0, 0xCE4F,      0, 0x6235, 0x4570,
+      0, 0xCE50,      0, 0x4039, 0x5D39,      0, 0x6237, 0x4C41,
+ 0xCE51, 0x6238,      0, 0x3446, 0x4857, 0x6239, 0xCE52, 0x623A,
+ 0xCE53,      0, 0x623B,      0, 0xCE54,      0, 0x4C5C,      0,
+ 0xCE55, 0xCE56, 0x4C55,      0, 0x443E,      0, 0xCE57,      0,
+ 0x416A, 0xCE58,      0, 0x623D, 0xCE59,      0, 0x3D62,      0,
+};
+const unsigned short utf8_to_euc_E79C[] = {
+ 0xCE5A, 0x3E4A,      0,      0, 0x6240,      0, 0xCE5B, 0x623F,
+ 0x623E, 0x487D, 0xCE5C, 0x3447, 0x3829,      0, 0xCE5D,      0,
+      0,      0, 0xCE5E,      0, 0xCE5F, 0xCE60,      0, 0xCE61,
+      0, 0xCE62, 0xCE63, 0x6246, 0xCE64,      0, 0x6243, 0x3F3F,
+ 0x4C32,      0, 0xCE65,      0, 0x6242, 0x6244, 0x6245,      0,
+ 0xCE66, 0x6241,      0,      0,      0, 0xCE67, 0xCE68, 0xCE69,
+      0,      0,      0,      0, 0xCE6A, 0xCE6B, 0xCE6C, 0x6247,
+ 0x6248, 0xCE6D, 0x442F,      0, 0x3463, 0xCE6E, 0xCE6F,      0,
+};
+const unsigned short utf8_to_euc_E79D[] = {
+ 0x4365,      0, 0xCE70,      0,      0, 0xCE71, 0xCE72, 0x6249,
+      0,      0, 0xCE73,      0,      0, 0xCE74, 0xCE75, 0xCE76,
+      0,      0, 0xCE77,      0,      0,      0, 0xCE78, 0xCE79,
+      0,      0, 0x624A, 0x624D, 0xCE7A,      0, 0xCE7B, 0xCE7C,
+ 0xCE7D, 0x3F67, 0xCE7E, 0x4644, 0xCF21, 0x624E, 0x4B53, 0xCF22,
+ 0x624B,      0, 0xCF23, 0x624C, 0xCF24,      0,      0,      0,
+ 0xCF25,      0, 0xCF26, 0xCF27, 0xCF28,      0,      0,      0,
+      0, 0x6251, 0xCF29,      0,      0, 0xCF2A, 0x6250, 0x624F,
+};
+const unsigned short utf8_to_euc_E79E[] = {
+ 0xCF2B,      0,      0,      0, 0xCF2C,      0,      0,      0,
+      0,      0,      0, 0x6253, 0xCF2D, 0xCF2E, 0x6252,      0,
+      0, 0x6254,      0,      0, 0xCF2F, 0xCF30, 0xCF31,      0,
+      0,      0, 0xCF32,      0,      0,      0, 0x6256, 0xCF33,
+ 0x6255,      0, 0xCF34,      0,      0, 0x4A4D,      0, 0xCF35,
+      0,      0, 0xCF36,      0, 0x3D56, 0x4E46, 0xCF37, 0xCF38,
+ 0x6257, 0xCF39,      0, 0x4637,      0, 0xCF3A, 0x6258,      0,
+      0, 0x6259,      0, 0x625D, 0x625B, 0x625C, 0xCF3B, 0x625A,
+};
+const unsigned short utf8_to_euc_E79F[] = {
+      0,      0,      0, 0xCF3C,      0,      0,      0, 0x625E,
+      0, 0xCF3D,      0,      0,      0, 0x625F,      0,      0,
+      0, 0xCF3E, 0xCF3F,      0,      0, 0xCF40,      0, 0x6260,
+      0, 0xCF41, 0x6261, 0x4C37, 0x6262,      0, 0xCF42, 0xCF43,
+ 0xCF44,      0, 0x4C70, 0x6263, 0xCF45, 0x434E, 0xCF46, 0x476A,
+      0, 0x366B, 0xCF47,      0, 0xCF48, 0x433B, 0x6264, 0x363A,
+ 0xCF49, 0xCF4A,      0, 0x4050, 0xCF4B,      0,      0,      0,
+ 0xCF4C,      0,      0, 0xCF4D, 0x6265,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E7A0[] = {
+      0,      0, 0x3A3D,      0,      0, 0xCF4E, 0xCF4F,      0,
+      0, 0xCF50,      0,      0, 0x6266, 0xCF51, 0xCF52,      0,
+      0, 0xCF53, 0x6267,      0, 0x3826, 0x3A55,      0,      0,
+      0,      0,      0,      0,      0, 0xCF54,      0,      0,
+ 0x6269, 0xCF55, 0xCF56, 0xCF57,      0, 0x4556, 0x3A56, 0x354E,
+      0,      0,      0,      0,      0, 0xCF58, 0xCF59,      0,
+ 0xCF5A,      0, 0x4B24,      0, 0x474B, 0xCF5B,      0, 0xCF5C,
+      0,      0, 0x4557,      0,      0,      0,      0, 0x395C,
+};
+const unsigned short utf8_to_euc_E7A1[] = {
+      0,      0,      0, 0xCF5D, 0xCF5E, 0x626B,      0, 0xCF5F,
+ 0xCF60,      0,      0,      0, 0xCF61,      0, 0xCF62,      0,
+      0,      0, 0xCF63,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xCF64, 0x3E4B, 0xCF65,      0,
+ 0xCF66, 0xCF67,      0, 0xCF68, 0xCF69,      0,      0,      0,
+ 0xCF6A,      0, 0xCF6B, 0x4E32, 0x3945,      0, 0xCF6C, 0x3827,
+      0,      0, 0x4823,      0, 0x626D,      0,      0,      0,
+      0,      0, 0xCF6D,      0, 0x626F,      0, 0xCF6E,      0,
+};
+const unsigned short utf8_to_euc_E7A2[] = {
+      0, 0x386B,      0,      0,      0,      0, 0x626E, 0x4476,
+      0,      0, 0xCF6F,      0, 0x6271, 0x3337, 0x626C, 0xCF70,
+      0, 0x486A,      0, 0x3130, 0xCF71, 0x3A6C,      0, 0x4F52,
+ 0xCF72,      0, 0x6270,      0,      0, 0xCF74, 0xCF75, 0xCF76,
+      0, 0xCF73,      0, 0x6272, 0xCF77,      0,      0, 0x4A4B,
+ 0xCF78, 0x4059, 0x6274,      0, 0xCF79, 0xCF7A,      0, 0x6275,
+ 0xCF7B, 0xCF7C, 0xCF7D, 0xCF7E,      0, 0x6273,      0,      0,
+      0,      0, 0x334E, 0xD021, 0x627B, 0xD022, 0x627A, 0xD023,
+};
+const unsigned short utf8_to_euc_E7A3[] = {
+      0, 0x3C27,      0,      0,      0, 0x627C, 0x6277, 0xD024,
+ 0xD025, 0xD026, 0x627D, 0x6278, 0xD027,      0, 0xD028,      0,
+ 0x4858, 0x6276, 0xD029, 0xD02A, 0x6279, 0xD02B, 0xD02C,      0,
+      0,      0, 0x6322, 0xD02E,      0,      0,      0, 0xD02F,
+ 0xD030, 0xD031,      0,      0, 0xD02D,      0, 0xD032, 0x6321,
+ 0x4B61,      0, 0xD033,      0, 0x627E,      0,      0, 0x306B,
+      0,      0, 0xD034, 0xD035, 0x6324,      0, 0xD037, 0xD038,
+      0,      0, 0xD039, 0xD03A,      0, 0x6323,      0, 0xD03B,
+};
+const unsigned short utf8_to_euc_E7A4[] = {
+ 0xD036, 0x3E4C,      0,      0,      0,      0, 0xD03C, 0x6325,
+      0,      0,      0,      0, 0xD03D,      0, 0x4143,      0,
+ 0xD03E, 0x6327, 0x6326,      0,      0,      0,      0,      0,
+      0, 0x6328, 0xD03F,      0, 0xD040,      0, 0xD041, 0xD042,
+ 0xD043,      0,      0,      0,      0, 0xD044, 0x6268, 0xD045,
+      0, 0xD046, 0x626A, 0x632A, 0x6329, 0xD047,      0,      0,
+ 0xF454, 0xD048,      0,      0, 0xD049, 0xD04A,      0,      0,
+      0,      0, 0x3C28, 0xD04B, 0x4E69, 0xD04C, 0x3C52, 0xD04D,
+};
+const unsigned short utf8_to_euc_E7A5[] = {
+ 0x632B, 0x3737,      0,      0, 0xD04E, 0xD04F, 0xD050, 0x3540,
+ 0x3527, 0x3B63, 0xD051, 0xD052,      0,      0,      0, 0xD053,
+ 0x4D34, 0xD054,      0, 0x6331, 0xD055, 0x6330, 0x4144, 0x632D,
+ 0xD056,      0, 0x632F, 0xD057, 0xD058, 0x3D4B, 0x3F40, 0x632E,
+ 0x632C,      0, 0x472A,      0,      0, 0x3E4D,      0, 0xD059,
+ 0x493C, 0xD05A,      0, 0xD05B,      0, 0x3A57,      0,      0,
+      0,      0, 0xD05C,      0,      0,      0,      0, 0x4578,
+      0, 0xD05D, 0x6332, 0xD05E, 0xD05F,      0, 0xD060, 0x6333,
+};
+const unsigned short utf8_to_euc_E7A6[] = {
+ 0x6349, 0x3658,      0,      0, 0x4F3D, 0x4135,      0,      0,
+      0,      0, 0x6334, 0xD061, 0xD062, 0x3252, 0x4477, 0x4A21,
+      0, 0xD063,      0, 0xD064, 0xD065, 0xD066, 0xD067,      0,
+ 0xD068,      0,      0, 0xD069, 0xD06A, 0x6335,      0,      0,
+      0, 0xD06B,      0,      0,      0,      0, 0x357A, 0x6336,
+ 0xD06C, 0xD06D, 0x6338, 0xD06E,      0,      0, 0x6339, 0xD06F,
+ 0x4729, 0xD070,      0, 0x633A, 0xD071,      0,      0,      0,
+ 0xD072, 0x633B, 0x633C, 0xD073,      0, 0x3659, 0x3253, 0x4645,
+};
+const unsigned short utf8_to_euc_E7A7[] = {
+ 0x3D28, 0x3B64, 0xD074,      0, 0xD075,      0,      0, 0xD076,
+ 0xD077, 0x633D, 0xD078, 0x3D29,      0,      0,      0, 0xD079,
+      0, 0x324A, 0x4943,      0, 0xD07A, 0x633E, 0xD07B,      0,
+ 0x486B,      0, 0xD07C,      0,      0, 0xD07D, 0xD07E, 0x4145,
+ 0xD121, 0x6341, 0xD122, 0x6342, 0x4769, 0xD123, 0x3F41, 0x633F,
+      0, 0x4361, 0xD124, 0xD125, 0x6340, 0xD126,      0,      0,
+ 0x3E4E, 0xD127,      0,      0,      0,      0,      0,      0,
+ 0xD128,      0,      0, 0x305C, 0xD129,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E7A8[] = {
+ 0x3529,      0, 0xD12A, 0xD12B,      0,      0,      0, 0xD12C,
+ 0x6343, 0xD12D, 0xD12E, 0x4478, 0xD12F, 0x6344, 0x4047,      0,
+      0, 0xD130,      0,      0, 0x4C2D, 0xD131,      0, 0x4923,
+ 0x6345, 0x6346, 0x4355, 0xD132, 0x4E47,      0, 0xD133, 0x6348,
+ 0x6347, 0xD134,      0,      0,      0,      0,      0, 0xD135,
+      0,      0,      0, 0xD136,      0, 0xD137, 0x3C6F, 0xD138,
+ 0xD139, 0x634A, 0x3070,      0, 0xD13A, 0xD13B,      0, 0x634D,
+ 0xD13C, 0xD13D, 0xD13E, 0x634B, 0x3254, 0x374E, 0x634C, 0x3946,
+};
+const unsigned short utf8_to_euc_E7A9[] = {
+ 0x3972,      0, 0x4A66, 0x634E, 0xD13F, 0xD140, 0x4B54, 0xD141,
+ 0xD142, 0x6350,      0,      0, 0xD143, 0x4051, 0x314F, 0x323A,
+ 0x302C,      0,      0,      0,      0, 0xD144, 0xD145, 0x634F,
+      0, 0xD146,      0,      0, 0xD147, 0xD148,      0, 0xD149,
+ 0xD14A, 0x6351, 0x6352, 0x3E77,      0, 0xD14B,      0, 0xD14C,
+      0, 0x6353, 0xD14D, 0x334F,      0, 0xD14E,      0,      0,
+ 0x6355,      0,      0,      0, 0x376A, 0xD14F, 0x3566,      0,
+ 0xD150, 0x6356, 0x3675,      0,      0, 0x6357, 0xD151, 0x407C,
+};
+const unsigned short utf8_to_euc_E7AA[] = {
+ 0xD152, 0x464D, 0xD153, 0x4060, 0x3A75, 0xD154, 0xD155,      0,
+ 0x6358,      0, 0xD156, 0xD157,      0,      0,      0,      0,
+ 0xD158, 0xD159, 0x4362, 0x416B, 0xD15A, 0x635A, 0x635C, 0x6359,
+ 0x635B,      0,      0,      0,      0,      0, 0xD15B, 0x3722,
+ 0xD15C,      0,      0, 0xD15D,      0,      0,      0,      0,
+      0, 0x635D, 0x3726,      0, 0xD15E,      0, 0x3567, 0x4D52,
+ 0x635F,      0,      0, 0xD15F,      0, 0xD160, 0x6360,      0,
+      0, 0xD161, 0x312E, 0xD162, 0xD163,      0,      0, 0x6363,
+};
+const unsigned short utf8_to_euc_E7AB[] = {
+      0,      0,      0, 0x3376, 0x6362, 0x6361, 0xD164, 0x6365,
+ 0x635E, 0xD165, 0x6366, 0x4E29, 0xD166, 0x6367, 0xD167, 0x6368,
+      0, 0xD168, 0x5474, 0x636A,      0, 0x6369,      0,      0,
+      0, 0x636B, 0x636C, 0xD169, 0x4E35, 0x636D,      0, 0x706F,
+ 0x3E4F, 0x636E, 0x636F, 0x3D57,      0, 0x4638, 0x6370, 0xF459,
+ 0xD16A, 0xD16B, 0x4328, 0xD16C, 0xD16D, 0x6371,      0, 0x433C,
+ 0x6372, 0xD16E,      0,      0, 0xD16F,      0, 0x3625,      0,
+ 0x513F, 0x435D, 0x3C33, 0xD170,      0, 0xD171, 0xD172, 0x3448,
+};
+const unsigned short utf8_to_euc_E7AC[] = {
+      0,      0, 0x6373,      0, 0x6422,      0, 0x6376, 0xD173,
+ 0x3568,      0, 0x6375, 0x6424,      0,      0,      0, 0x6374,
+      0, 0x3E50,      0,      0, 0xD174,      0,      0,      0,
+ 0x6378, 0x6379,      0, 0x452B,      0,      0, 0x637A, 0xD175,
+ 0x335E,      0,      0, 0xD176,      0, 0x3F5A, 0x4964, 0xD177,
+ 0x637C, 0xD178, 0xD179, 0xD17A, 0x4268, 0xD17B, 0xD17C, 0xD17D,
+ 0xD17E, 0xD221,      0, 0x6377, 0xD222, 0x637B, 0x637D,      0,
+      0, 0x3A7B,      0,      0,      0, 0xD223,      0, 0xD224,
+};
+const unsigned short utf8_to_euc_E7AD[] = {
+ 0xD225, 0xD226,      0,      0,      0, 0x6426, 0x492E, 0xD227,
+ 0x4826, 0x4579,      0, 0x365A, 0x6425, 0x6423, 0xD228, 0x4835,
+ 0x637E, 0x435E, 0x457B,      0, 0x457A, 0xD229, 0x3A76,      0,
+      0,      0,      0,      0,      0, 0x6438,      0,      0,
+ 0xD22A,      0,      0,      0, 0xD22B, 0x6428, 0xD22C, 0x642A,
+      0, 0xD22D, 0xD22E,      0, 0x642D, 0xD22F, 0x642E, 0xD230,
+ 0x642B, 0x642C, 0xD231, 0xD232, 0x6429, 0x6427,      0, 0xD233,
+      0,      0, 0x6421,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E7AE[] = {
+      0,      0,      0,      0, 0xD234,      0, 0x4A4F, 0x3255,
+      0, 0xD235,      0, 0x6435,      0, 0x6432, 0xD236, 0x6437,
+ 0xD237, 0xD238, 0x6436,      0, 0x4773, 0x4C27, 0xD239, 0x3B3B,
+ 0x6430, 0x6439, 0x6434, 0xD23A, 0x6433, 0x642F, 0xD23B, 0x6431,
+ 0xD23C, 0x3449,      0,      0,      0, 0xD23D,      0,      0,
+      0,      0, 0x433D,      0, 0xD23E, 0x407D,      0, 0xD23F,
+ 0xD240, 0x4822, 0xD241,      0, 0x643E, 0xD242, 0xD243,      0,
+ 0x4824,      0, 0xD244, 0xD245, 0xD246, 0xD247,      0,      0,
+};
+const unsigned short utf8_to_euc_E7AF[] = {
+ 0x4061, 0x643B, 0xD248,      0, 0x484F, 0xD249, 0x643F, 0x4A53,
+ 0xD24A, 0x435B, 0xD24B, 0x643A, 0x643C,      0,      0, 0x643D,
+      0,      0,      0,      0, 0xD24C,      0, 0xD24D, 0xD24E,
+      0, 0xD24F, 0xD250, 0xD251,      0, 0x6440,      0,      0,
+ 0x3C44,      0,      0,      0, 0x4646, 0x6445, 0x6444,      0,
+ 0xD252, 0x6441, 0xD253,      0,      0, 0x4F36,      0,      0,
+      0,      0, 0xD254, 0x644A, 0xD255, 0xD256, 0x644E, 0x644B,
+ 0xD257, 0xD258, 0xD259,      0, 0xD25A,      0, 0xD25B,      0,
+};
+const unsigned short utf8_to_euc_E7B0[] = {
+ 0x6447, 0xD25C, 0xD25D, 0xD25E, 0xD25F,      0, 0xD260, 0x6448,
+      0, 0xD261,      0, 0xD262, 0xD263, 0x644D, 0xD264, 0xD265,
+      0, 0x6442, 0x5255, 0x6449, 0x6443,      0,      0, 0x644C,
+      0, 0xD266,      0, 0xD267,      0,      0,      0, 0x6452,
+ 0xD268, 0x344A,      0, 0x644F,      0, 0xD269, 0xD26A, 0x6450,
+ 0xD26B,      0, 0x6451, 0x6454, 0xD26C,      0,      0,      0,
+      0, 0xD26D,      0, 0xD26E, 0xD26F,      0, 0xD270, 0x6453,
+ 0x4876, 0xD271, 0xD272,      0,      0, 0x6455, 0x4E7C, 0x4A6D,
+};
+const unsigned short utf8_to_euc_E7B1[] = {
+ 0x645A,      0,      0, 0x6457,      0,      0, 0xD273,      0,
+      0,      0, 0xD274,      0, 0x6456, 0x4052,      0, 0x6459,
+ 0x645B, 0xD276, 0xD277, 0xD278, 0x6458, 0xD275, 0x645F,      0,
+ 0x645C, 0xD279, 0xD27A, 0xD27B, 0xD27C, 0xD27D, 0xD27E, 0x645D,
+ 0x6446, 0xD321,      0, 0xD322, 0x645E, 0x6460,      0, 0xD323,
+      0, 0xD324,      0,      0, 0x6461, 0xD325, 0xD326,      0,
+ 0xD327,      0, 0xD328, 0x4A46,      0, 0x6462,      0,      0,
+      0, 0xD329,      0,      0, 0xD32A, 0xD32B, 0x4C62,      0,
+};
+const unsigned short utf8_to_euc_E7B2[] = {
+      0, 0x364E, 0x3729, 0x6463,      0,      0, 0xD32C, 0xD32D,
+      0, 0x4A34,      0, 0x3F68,      0, 0x4C30,      0, 0xD32E,
+ 0x6464,      0, 0x4E33,      0, 0xD32F, 0x4774,      0, 0x4146,
+ 0x4734,      0,      0, 0x3D4D,      0,      0, 0xD330, 0x3040,
+ 0xD331, 0x6469, 0x6467,      0, 0x6465, 0x3421, 0xD332, 0x3E51,
+ 0x646A,      0,      0, 0x6468,      0, 0x6466, 0x646E,      0,
+ 0xD333, 0x646D, 0x646C, 0x646B,      0,      0, 0xD334, 0xD335,
+      0, 0x646F, 0xD336, 0xD337, 0xD338, 0x6470, 0x403A, 0xD339,
+};
+const unsigned short utf8_to_euc_E7B3[] = {
+ 0x6471,      0, 0x6473,      0, 0xD33A, 0x6472,      0, 0xD33B,
+ 0xD33C, 0xD33D, 0x3852,      0,      0, 0xD33E, 0x4138, 0xD33F,
+      0,      0, 0x6475, 0xD340, 0xD341, 0xD342, 0x457C, 0xD343,
+ 0x6474, 0xD344, 0xD345,      0, 0x6476, 0xD346, 0x4A35, 0x416C,
+ 0x3947,      0, 0x6477,      0,      0,      0, 0xD347, 0x4E48,
+      0, 0xD348,      0, 0xD349,      0,      0,      0, 0x6479,
+      0,      0, 0x647A,      0, 0x647B, 0xD34A, 0x647C,      0,
+ 0x3B65,      0, 0x647D, 0x374F,      0,      0, 0x356A,      0,
+};
+const unsigned short utf8_to_euc_E7B4[] = {
+ 0x352A,      0, 0x6521, 0xD34B, 0x4C73, 0x3948, 0x647E, 0xD34C,
+ 0xD34D, 0xD34E, 0x6524, 0x4C66,      0, 0x473C,      0, 0xD34F,
+ 0x4933, 0xD350, 0xD351, 0xD352, 0x3D63, 0x6523, 0xD353, 0x3C53,
+ 0x3949, 0x3B66, 0x3569, 0x4A36, 0x6522, 0xD354, 0xD355,      0,
+ 0x4147, 0x4B42, 0x3A77, 0xD356,      0,      0, 0xD357,      0,
+      0,      0, 0xD358, 0x3B67, 0x445D, 0xD359, 0x6527, 0x4E5F,
+ 0x3A59, 0xD35A, 0x6528, 0x3F42,      0, 0x652A,      0,      0,
+      0, 0x3E52, 0x3A30,      0, 0xD35B, 0xD35C, 0xD35D, 0x6529,
+};
+const unsigned short utf8_to_euc_E7B5[] = {
+ 0xD35E, 0xD35F, 0x3D2A, 0x383E, 0x4148, 0x6525, 0x652B, 0xD360,
+ 0xD361,      0,      0, 0x6526, 0x3750, 0xD362, 0x652E, 0x6532,
+ 0x376B, 0xD363,      0, 0xD364,      0,      0, 0x652D, 0xD365,
+      0, 0xD366, 0xD367, 0x6536, 0xD368, 0xD369, 0x394A,      0,
+      0, 0x4D6D, 0x303C, 0x6533,      0, 0xD36A, 0x356B, 0xD36B,
+ 0x6530,      0, 0xD36C,      0,      0,      0, 0x6531,      0,
+ 0xD36D, 0x457D, 0x652F, 0x652C,      0, 0x3328, 0x4064,      0,
+ 0xD36E, 0x3828, 0xD36F, 0xD370,      0, 0x6538,      0, 0xD371,
+};
+const unsigned short utf8_to_euc_E7B6[] = {
+      0, 0xD372, 0xD373, 0xD374,      0, 0xD375, 0xD376,      0,
+ 0xD377, 0x6535,      0, 0xD378, 0xD379, 0xD37A,      0, 0x6537,
+      0, 0xD37B,      0, 0x6534,      0,      0, 0xD37C, 0xD37D,
+      0, 0x3751, 0x4233, 0x6539, 0x416E, 0xD37E, 0xD421, 0x6546,
+ 0xF45C,      0, 0x6542, 0x653C,      0,      0, 0xD422, 0xD423,
+      0,      0, 0xD424, 0x6540, 0x3C7A, 0x305D, 0x653B, 0x6543,
+ 0x6547, 0x394B, 0x4C56, 0xD425, 0x4456, 0x653D, 0xD426, 0xD427,
+ 0x6545, 0xD428, 0x653A, 0x433E,      0, 0x653F, 0x303D, 0x4C4A,
+};
+const unsigned short utf8_to_euc_E7B7[] = {
+      0,      0, 0xD429, 0xD42A, 0xD42B, 0xD42C, 0xD42D, 0x653E,
+      0,      0, 0x365B, 0x486C, 0xD42E, 0xD42F, 0xD430, 0x416D,
+      0, 0x4E50, 0x3D6F,      0,      0, 0x656E, 0xF45D, 0xD431,
+ 0x6548, 0xD432, 0x407E,      0, 0x6544, 0x6549, 0x654B,      0,
+ 0x4479, 0x654E, 0xD434,      0, 0x654A, 0xD435, 0xD436,      0,
+ 0x4A54, 0x344B, 0xD437, 0xD438, 0x4C4B, 0xD439,      0, 0x305E,
+      0, 0xD43A, 0x654D,      0, 0x4E7D, 0xD43B, 0xD43C,      0,
+      0, 0xD43D, 0xD43E, 0x654C,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E7B8[] = {
+ 0xD433, 0x316F,      0,      0, 0x466C, 0x654F,      0,      0,
+ 0xD43F, 0x6556, 0x6550, 0x6557,      0,      0,      0,      0,
+ 0xD440, 0xD441, 0x6553,      0,      0, 0xD442,      0, 0xD443,
+      0,      0,      0, 0x477B, 0xD444, 0xD445, 0x3C4A, 0x6555,
+ 0xD446, 0x6552, 0x6558, 0x6551,      0,      0, 0x3D44, 0xD447,
+ 0xD448,      0,      0, 0x4B25, 0xD449, 0xD44A, 0x3D4C, 0xD44B,
+      0, 0x6554, 0x6560, 0xD44C,      0, 0x655C, 0xD44D, 0x655F,
+      0, 0x655D, 0x6561, 0x655B,      0, 0x6541, 0x4053, 0xD44E,
+};
+const unsigned short utf8_to_euc_E7B9[] = {
+      0, 0x484B,      0, 0x655E, 0xD44F, 0xD450, 0x6559, 0xD451,
+      0,      0, 0x4121, 0x3752,      0, 0x3D2B, 0xD452,      0,
+ 0xD453,      0, 0xD454,      0, 0x3F25, 0x4136, 0x6564,      0,
+ 0xD455, 0x6566, 0x6567,      0,      0, 0x6563, 0x6565, 0xD456,
+      0, 0xD457, 0xD458,      0,      0, 0xD459, 0x655A, 0x6562,
+      0, 0x656A, 0x6569, 0xD45A,      0, 0x4B7A, 0xD45B, 0xD45C,
+ 0x372B,      0,      0, 0xD45D,      0,      0,      0,      0,
+ 0xD45E, 0x6568,      0, 0x656C, 0x656B, 0x656F, 0xD45F, 0x6571,
+};
+const unsigned short utf8_to_euc_E7BA[] = {
+      0, 0xD460, 0x3B3C, 0x656D,      0,      0, 0xD461, 0xD462,
+ 0x6572, 0x6573, 0xD463,      0, 0x6574, 0xD464, 0x657A, 0x453B,
+ 0x6576, 0xD465, 0x6575, 0x6577, 0x6578, 0xD466, 0x6579,      0,
+ 0xD467,      0, 0xD468, 0x657B, 0x657C, 0xD469, 0xD46A,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E7BC[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x344C,      0,
+ 0x657D,      0, 0x657E, 0xD46C, 0xD46B, 0xD46D, 0xD46E, 0xD46F,
+};
+const unsigned short utf8_to_euc_E7BD[] = {
+      0,      0,      0, 0xD470, 0xD471, 0x6621,      0, 0xD472,
+      0,      0,      0,      0, 0x6622, 0x6623, 0x6624, 0xD473,
+ 0x6625, 0x6626, 0xD474, 0xD475, 0x6628, 0x6627,      0,      0,
+ 0x6629,      0,      0, 0xD476, 0xD477, 0xD478,      0, 0x662A,
+ 0x662B, 0xD479,      0, 0xD47A, 0xD47B, 0xD47C, 0xD47D, 0x662E,
+ 0x662C, 0x662D, 0x3A61, 0x3753,      0, 0xD47E, 0x4356,      0,
+ 0x4833, 0xD521, 0x3D70,      0,      0, 0x474D,      0, 0x486D,
+ 0x662F, 0x586D,      0,      0,      0, 0xD522, 0xD523, 0xD524,
+};
+const unsigned short utf8_to_euc_E7BE[] = {
+ 0xD525,      0, 0x6630, 0x6632,      0, 0x4D65, 0x6631, 0x6634,
+ 0x6633,      0, 0x4D53, 0xD526, 0x6635, 0xD527, 0x487E, 0xD528,
+ 0xD529, 0xD52A,      0,      0, 0x6636,      0, 0xD52B, 0xD52C,
+      0,      0, 0x6639,      0, 0xD52D, 0x6638, 0x6637,      0,
+      0, 0xD52E, 0xD52F, 0x663A, 0x3732,      0, 0xD530,      0,
+ 0x4122, 0x3541, 0xD531,      0,      0, 0xD532, 0x663E, 0x663B,
+      0,      0, 0x663C,      0, 0xD533,      0, 0x663F,      0,
+ 0x6640, 0x663D,      0,      0, 0xD534, 0x3129,      0, 0xD535,
+};
+const unsigned short utf8_to_euc_E7BF[] = {
+ 0xD536, 0x3227,      0, 0xD537,      0, 0x6642, 0x6643,      0,
+ 0xD538,      0, 0x6644,      0, 0x4D62,      0, 0xD539, 0xD53A,
+      0,      0, 0x3D2C,      0, 0x6646, 0x6645,      0,      0,
+      0,      0,      0, 0xD53B,      0,      0,      0, 0xD53C,
+ 0x3F69, 0x6647,      0, 0xD53D,      0, 0xD53E, 0x6648,      0,
+ 0xD53F, 0x6649,      0, 0x3465, 0xD540,      0, 0xD541, 0xD542,
+ 0x344D,      0, 0xD543, 0x664A,      0,      0,      0,      0,
+      0, 0x664B, 0xD544, 0x4B5D, 0x4D63, 0xD545, 0xD546, 0xD547,
+};
+const unsigned short utf8_to_euc_E880[] = {
+ 0x4D54, 0x4F37,      0, 0x394D, 0x664E, 0x3C54, 0x664D, 0xD548,
+ 0xD549,      0, 0xD54A, 0x664F, 0x3C29, 0xD54B, 0xD54C, 0xD54D,
+ 0x4251, 0xD54E, 0x6650, 0xD54F, 0xD550, 0x394C, 0xD551, 0x4C57,
+ 0x6651, 0x6652,      0,      0, 0x6653, 0xD552, 0xD553, 0xD554,
+ 0xD555, 0x6654,      0,      0, 0xD556,      0, 0xD557,      0,
+ 0x6655,      0,      0,      0, 0xD558,      0, 0xD559,      0,
+ 0xD55A,      0,      0, 0x3C2A, 0xD55B, 0xD55C, 0x4C6D, 0xD55D,
+      0, 0xD55E, 0xD55F, 0x6657, 0xD560, 0x433F, 0xD561, 0x6656,
+};
+const unsigned short utf8_to_euc_E881[] = {
+ 0xD562,      0,      0,      0, 0xD563,      0, 0x6659,      0,
+      0,      0, 0x6658,      0,      0,      0,      0,      0,
+      0,      0, 0x665A,      0,      0,      0, 0x403B,      0,
+ 0x665B,      0, 0x665C,      0,      0,      0, 0x4A39, 0x665D,
+ 0xD564, 0x416F, 0x665E,      0, 0xD565,      0, 0xD566,      0,
+ 0x665F,      0,      0,      0,      0, 0xD567,      0, 0x4E7E,
+ 0x6662, 0xD568, 0x6661, 0x6660, 0x4430, 0xD569, 0x6663, 0x3F26,
+      0, 0x6664,      0,      0,      0, 0x6665, 0x4F38, 0x6666,
+};
+const unsigned short utf8_to_euc_E882[] = {
+      0, 0xD56A,      0,      0, 0x6667, 0x6669, 0x6668, 0x4825,
+ 0xD56B, 0x4679,      0, 0x4F3E, 0x4829,      0, 0xD56C,      0,
+      0,      0,      0, 0x666B,      0,      0, 0x3E53,      0,
+ 0x492A,      0, 0x666C, 0x666A, 0xD56D, 0x344E, 0xD56E,      0,
+      0, 0x3854, 0x3B68,      0,      0, 0x486E, 0xD56F, 0xD570,
+      0, 0x382A, 0x4B43, 0xD571, 0x666F, 0x666D,      0, 0x394E,
+      0, 0x394F, 0x3069,      0, 0x3A68,      0,      0,      0,
+ 0xD572, 0xD573, 0x4759,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E883[] = {
+      0,      0,      0, 0x305F, 0x6674,      0, 0x4340,      0,
+ 0xD574,      0,      0,      0, 0x4758, 0xD575, 0x425B, 0xD576,
+      0,      0, 0xD577,      0, 0xD578, 0xD579, 0x6676, 0xD57A,
+ 0xD57B, 0x6672, 0x6675, 0x6670,      0, 0x6673, 0x4B26,      0,
+ 0xD57C, 0x3855,      0,      0, 0x307D, 0x6671,      0,      0,
+      0,      0,      0,      0,      0, 0xD57D, 0xD57E, 0x6678,
+ 0xD621, 0x6679, 0xD622, 0xD623, 0x4639,      0, 0xD624,      0,
+ 0x363B, 0xD625, 0xD626,      0, 0x6726, 0x473D, 0xD627,      0,
+};
+const unsigned short utf8_to_euc_E884[] = {
+      0,      0, 0x3B69, 0xD628,      0, 0x363C, 0x4048, 0x4F46,
+ 0x4C2E, 0x6677, 0x4054, 0xD629,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xD62A, 0xD62B,
+ 0xD62C,      0, 0x3553, 0x667A, 0xD62D,      0, 0xD62E,      0,
+ 0xD62F,      0,      0, 0x667C, 0xD630,      0,      0, 0xD631,
+      0, 0x667B,      0,      0, 0xD632,      0,      0, 0x667D,
+ 0xD633, 0x4326,      0, 0x473E,      0, 0xD634,      0,      0,
+      0, 0x4431, 0xD635,      0, 0xD636,      0, 0x6723,      0,
+};
+const unsigned short utf8_to_euc_E885[] = {
+      0,      0,      0,      0,      0, 0xD637, 0x6722, 0xD638,
+      0,      0, 0xD639, 0x667E, 0xD63A,      0, 0x3F55,      0,
+ 0x4965, 0x6725, 0xD63B, 0x6724, 0x3950, 0x4F53,      0, 0xD63C,
+      0,      0,      0,      0,      0,      0,      0, 0x6735,
+ 0xD63D, 0xD63E,      0,      0,      0, 0x6729, 0x672A, 0xD63F,
+ 0xD640, 0xD641,      0, 0x3C70,      0, 0xD642, 0x6728, 0xD643,
+ 0x3978, 0x6727,      0,      0, 0x672B,      0,      0, 0xD644,
+ 0x4432, 0x4A22, 0x4123,      0,      0,      0,      0, 0x425C,
+};
+const unsigned short utf8_to_euc_E886[] = {
+ 0x672F, 0xD645, 0x6730, 0x672C, 0xD647, 0xD648, 0xD649,      0,
+ 0x672D,      0, 0x672E, 0xD64A,      0,      0, 0xD64B, 0x3951,
+ 0xD646,      0,      0, 0x6736,      0, 0x6732, 0xD64C,      0,
+ 0xD64D,      0, 0x4966, 0xD64E, 0x4B6C, 0x4928, 0xD64F,      0,
+ 0x6731,      0, 0xD650, 0x6734, 0x6733,      0,      0,      0,
+ 0x4B44, 0x6737,      0,      0,      0,      0, 0xD651,      0,
+ 0x6738,      0, 0xD652, 0x4137, 0xD653, 0x6739,      0,      0,
+ 0x673B,      0, 0x673F, 0xD654,      0, 0x673C, 0x673A, 0x473F,
+};
+const unsigned short utf8_to_euc_E887[] = {
+ 0x673D,      0, 0x673E, 0xD656,      0, 0xD657, 0x3232,      0,
+ 0x6745, 0x6740, 0xD658, 0xD655,      0, 0x6741, 0xD659, 0xD65A,
+      0, 0x6742,      0, 0x4221,      0, 0xD65B,      0, 0xD65C,
+ 0x6744, 0x6743, 0x6746, 0xD65D,      0, 0xD65E, 0xD65F, 0x6747,
+ 0x6748, 0xD660,      0, 0x3F43, 0xD661, 0x3269,      0, 0x6749,
+ 0x4E57,      0, 0x3C2B, 0xD662, 0xD663, 0x3D2D,      0,      0,
+ 0xD664, 0xD665, 0xD666, 0x3B6A, 0x4357, 0xD667, 0xD668,      0,
+ 0xD669, 0xD66A, 0x674A, 0x674B, 0x3131, 0xD66B, 0x674C, 0xD66C,
+};
+const unsigned short utf8_to_euc_E888[] = {
+ 0xD66D, 0x674D, 0x674E, 0xD66E,      0, 0x674F,      0, 0x6750,
+ 0x363D, 0x5A2A, 0x6751,      0, 0x4065, 0x6752, 0x3C4B, 0xD66F,
+ 0x6753,      0, 0x5030, 0xD670, 0xD671,      0, 0x6754, 0x4A5E,
+ 0x345C, 0xD672, 0xD673, 0x4124, 0x3D58, 0xD674, 0x4971, 0x3D2E,
+      0, 0xD675, 0xD676,      0,      0,      0,      0,      0,
+ 0xD677, 0x6755, 0x3952, 0x6756, 0x484C,      0, 0x6764,      0,
+      0,      0, 0xD678, 0x6758, 0xD679, 0x4249, 0x4775, 0x383F,
+ 0x6757, 0x4125, 0xD67A,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E889[] = {
+ 0x6759,      0,      0, 0xD67B, 0xD67C, 0xD67D, 0xD67E, 0x447A,
+      0,      0,      0, 0xD721,      0,      0, 0xD722, 0xD723,
+      0, 0xD724,      0,      0,      0,      0, 0xD725,      0,
+ 0x675B, 0x675A, 0x675D,      0, 0xD726, 0x675C,      0, 0x675E,
+ 0xD727,      0, 0x6760, 0xD728, 0x675F,      0, 0x344F, 0xD729,
+ 0x6761,      0, 0x6762, 0x6763,      0, 0xD72A, 0x3A31, 0x4E49,
+      0, 0x6765, 0x3F27,      0, 0xD72B,      0, 0x3170, 0x6766,
+ 0x6767,      0,      0, 0xD72C,      0, 0xD72D, 0x6768, 0xD72E,
+};
+const unsigned short utf8_to_euc_E88A[] = {
+ 0xD72F, 0xD730,      0, 0xD731, 0xD732,      0,      0, 0xD733,
+      0, 0xD734, 0xD735, 0x3072,      0, 0x6769, 0xD736,      0,
+      0, 0xD737, 0x676A,      0, 0xD738,      0, 0xD739,      0,
+ 0xD73A, 0x4967, 0xD73B, 0xD73C,      0, 0x3C47,      0, 0x676C,
+ 0xD73D, 0xD73E,      0, 0xD73F, 0xD740, 0x3329, 0x3032, 0xD741,
+ 0xD742, 0xD743, 0xD744, 0x676B, 0x676E, 0x474E, 0xD745, 0x3F44,
+ 0xD746, 0x3256, 0xD747, 0x4B27, 0xD748,      0,      0, 0xD749,
+ 0x375D, 0x365C, 0xD74A, 0x676D, 0xD74B, 0x326A, 0xD74C, 0xD74D,
+};
+const unsigned short utf8_to_euc_E88B[] = {
+      0,      0,      0,      0,      0, 0x3423, 0xD74E,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xD74F, 0x3171, 0x6772, 0x4E6A, 0x425D, 0xD750,      0, 0x4944,
+      0, 0x677E, 0xD751, 0x3257, 0x677C,      0, 0x677A, 0x6771,
+ 0xD752, 0x676F, 0xD753, 0x6770, 0xD754, 0x3C63, 0x366C, 0x4377,
+ 0xD755,      0, 0xD756, 0x4651,      0, 0xD757,      0, 0xD758,
+      0, 0x3151,      0, 0x6774, 0x6773,      0, 0xD759, 0xD75A,
+      0, 0x6779, 0x6775, 0x6778,      0, 0xD75B, 0xD75C,      0,
+};
+const unsigned short utf8_to_euc_E88C[] = {
+ 0xD75D, 0xD75E, 0x4C50, 0x6777, 0x3258, 0x337D, 0x677B, 0xD75F,
+ 0xD760, 0x677D, 0xD761, 0xD762,      0,      0, 0x3754,      0,
+      0,      0,      0,      0,      0,      0, 0x6823, 0x682C,
+ 0x682D,      0,      0, 0xD764, 0x302B, 0xD765, 0xD766, 0xD767,
+      0, 0xD768, 0xD769, 0x6834,      0,      0,      0,      0,
+ 0x3071,      0,      0, 0x682B, 0xD76A, 0xD76B, 0xD76C, 0x682A,
+ 0xD76D, 0x6825, 0x6824, 0xD76E, 0x6822, 0x6821, 0x4363, 0xD76F,
+ 0x427B, 0x6827, 0xD770,      0, 0xD771, 0xD772,      0,      0,
+};
+const unsigned short utf8_to_euc_E88D[] = {
+ 0x6826,      0, 0xD773, 0xD774, 0xD775, 0x6829,      0, 0xD776,
+      0, 0x4170, 0x3755,      0,      0, 0xD777, 0xD778, 0x3141,
+ 0x6828, 0xD779, 0x3953, 0xD83E, 0xD763, 0xD77A, 0xD77B, 0xD77C,
+ 0x4171,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xF45F,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xD77D,      0,      0, 0x683A,      0, 0x683B,      0, 0x3259,
+ 0xD77E,      0,      0, 0x322E, 0x6838, 0xD821,      0, 0xD822,
+};
+const unsigned short utf8_to_euc_E88E[] = {
+ 0xD823,      0, 0xD824,      0, 0xD825, 0x682E, 0xD826, 0x6836,
+      0, 0x683D, 0x6837,      0,      0, 0xD827, 0x6835,      0,
+      0,      0, 0xD828, 0x6776, 0xD829, 0xD82A, 0x6833,      0,
+ 0xD82B, 0xD82C, 0x682F, 0xD82D, 0xD82E, 0xD82F, 0x3450, 0x6831,
+ 0x683C,      0, 0x6832,      0,      0,      0, 0xD830, 0xD831,
+ 0x683E, 0xD832, 0x6830, 0x477C, 0xD833, 0xD84C,      0,      0,
+      0, 0x4D69,      0,      0,      0, 0x6839,      0,      0,
+      0,      0,      0,      0,      0, 0x684F, 0xD834, 0xD835,
+};
+const unsigned short utf8_to_euc_E88F[] = {
+ 0xD836, 0x6847,      0,      0,      0, 0x3F7B,      0, 0xD837,
+      0, 0xD838, 0x3546,      0, 0x365D,      0, 0x6842, 0xD839,
+ 0xD83A, 0xD83B,      0, 0x325B, 0xD83C,      0, 0x3E54,      0,
+ 0x6845,      0,      0,      0, 0x3A5A, 0xD83D,      0, 0x4551,
+ 0x684A,      0,      0,      0,      0,      0,      0,      0,
+ 0xD83F, 0x4A6E, 0xD840, 0x6841,      0,      0,      0, 0x325A,
+ 0x3856, 0x4929, 0x684B,      0, 0x683F,      0, 0xD841, 0x6848,
+ 0xD842, 0xD843,      0, 0x6852, 0xD844, 0x6843,      0,      0,
+};
+const unsigned short utf8_to_euc_E890[] = {
+      0, 0xD845,      0, 0x6844, 0x463A,      0, 0xD846, 0x6849,
+      0,      0, 0xD847, 0x6846, 0x4B28, 0x684C, 0x3060, 0xD848,
+      0, 0xD849,      0, 0x6840,      0, 0xD84A,      0,      0,
+      0, 0xD84B,      0,      0,      0,      0,      0,      0,
+ 0x684E,      0, 0x684D,      0,      0,      0,      0,      0,
+      0, 0x476B, 0x6854,      0, 0x685F,      0,      0, 0xD84D,
+      0, 0x337E,      0,      0,      0, 0x6862,      0,      0,
+ 0x6850, 0xD84E,      0,      0, 0x6855, 0x4D6E,      0,      0,
+};
+const unsigned short utf8_to_euc_E891[] = {
+      0,      0,      0,      0,      0, 0xD84F, 0x685E, 0xD850,
+ 0xD851, 0x4D55, 0xD852,      0,      0, 0xD853, 0x4E2A, 0xD854,
+      0, 0xD855, 0xD856,      0,      0,      0, 0xD857, 0x4378,
+ 0xD858, 0xD859, 0xD85A, 0x336B, 0xD85B,      0,      0,      0,
+ 0xD85C, 0x4972, 0x6864, 0x4621, 0xD85D, 0xD85E, 0x3031, 0xD85F,
+      0, 0x685D, 0xD860, 0x6859, 0x4172, 0x6853, 0x685B, 0x6860,
+ 0xD861, 0x472C,      0, 0xD862, 0xD863, 0x302A, 0xD864, 0x6858,
+ 0xD865, 0x6861, 0x4978,      0, 0xD866, 0xD867,      0,      0,
+};
+const unsigned short utf8_to_euc_E892[] = {
+      0, 0xD868, 0x685C,      0, 0x6857, 0xD869,      0,      0,
+      0,      0,      0, 0x3E55,      0,      0,      0,      0,
+ 0x3D2F,      0, 0xD86A, 0xD86B, 0x3C2C, 0xD86C,      0,      0,
+      0, 0x4C58,      0,      0, 0x4947,      0, 0xD86D, 0x6867,
+      0, 0x6870,      0,      0,      0,      0, 0xD86E,      0,
+ 0xD86F, 0xD870, 0xD871,      0,      0, 0x685A,      0, 0xD872,
+      0, 0xD873, 0x3377,      0, 0xD874,      0,      0,      0,
+ 0x3E78, 0x6865, 0xD875, 0x686A, 0x4173, 0xD876, 0xD877, 0x6866,
+};
+const unsigned short utf8_to_euc_E893[] = {
+ 0xD878, 0x686D, 0xD879,      0, 0x435F,      0, 0x686E, 0xD87A,
+ 0xD87B, 0x4D56, 0x6863, 0x3338, 0xD87C, 0x6869,      0, 0xD87D,
+ 0x686C, 0x4C2C,      0, 0xD87E,      0,      0, 0x686F,      0,
+      0, 0x6868, 0x686B,      0, 0xD921,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xD922,
+      0,      0, 0xD923,      0, 0x4B29,      0, 0x4F21, 0xD924,
+ 0xD925, 0xD926, 0xD927,      0, 0x6873,      0,      0, 0xD928,
+      0,      0, 0xD92A, 0xD92B, 0x687A, 0xD92C,      0, 0x6872,
+};
+const unsigned short utf8_to_euc_E894[] = {
+ 0x3C43,      0, 0xD92D, 0xD92E,      0,      0, 0x6851, 0xD92F,
+      0,      0,      0,      0, 0xD930,      0, 0xD931,      0,
+ 0xD932, 0x4A4E,      0, 0x4C22, 0x6879, 0x6878,      0, 0x6874,
+ 0x6875,      0, 0x3136,      0, 0xD933,      0, 0xD934, 0x6877,
+      0, 0x6871, 0xD935, 0xD936, 0xD937, 0xD938, 0x4455, 0xD939,
+      0,      0, 0xD93A, 0xD93B, 0x6876, 0x307E,      0, 0xD93C,
+      0,      0, 0xD929, 0xD93D, 0xD93E, 0x4222, 0xD93F,      0,
+      0,      0,      0,      0,      0, 0x4A43,      0, 0xD940,
+};
+const unsigned short utf8_to_euc_E895[] = {
+ 0x687B, 0x6921,      0, 0x4859,      0,      0, 0xD941,      0,
+ 0x687E, 0x3E56, 0x3C49, 0x6923,      0,      0, 0x363E, 0xD942,
+ 0xD943, 0xD944, 0xD945, 0xD946,      0, 0x6924, 0xD947, 0x4979,
+ 0x687D, 0xD948, 0x6856,      0, 0xD949, 0xD94A, 0xD94B, 0xD94C,
+ 0xD94D, 0xD94E, 0xD94F, 0x687C, 0xD950,      0,      0,      0,
+ 0x4F4F, 0x4622, 0x4973, 0xD951,      0, 0x692B,      0, 0xD952,
+      0,      0,      0,      0,      0,      0,      0, 0x6931,
+      0, 0xD953, 0xD954, 0xD955,      0, 0xD956, 0x6932, 0xD957,
+};
+const unsigned short utf8_to_euc_E896[] = {
+ 0x6925, 0xD958,      0,      0, 0x4776, 0xD959, 0xD95A, 0x692F,
+ 0x6927, 0xD95B, 0x6929, 0xD95C, 0xD95D,      0,      0, 0xD95E,
+ 0x6933, 0x6928,      0, 0xD95F, 0x692C,      0,      0, 0x3172,
+ 0xD960, 0x4665,      0, 0x692D, 0x6930, 0xD961,      0, 0xD962,
+ 0xD963,      0, 0xD964,      0, 0x6926, 0xD965, 0x4126, 0xD966,
+ 0x692A, 0x3B27, 0x3F45, 0x3730, 0x4C74, 0xD974, 0x4C79, 0x3D72,
+ 0xF461,      0,      0,      0, 0xD967,      0, 0xD968, 0xD969,
+ 0xD96A, 0x6937, 0x6935,      0, 0xD96B, 0xD96C, 0xD96D, 0xD96E,
+};
+const unsigned short utf8_to_euc_E897[] = {
+      0, 0x4F4E, 0xD96F,      0,      0,      0,      0, 0xD970,
+      0, 0x6934, 0xD971, 0xD972,      0, 0x4D75, 0xD973, 0x6936,
+ 0x6938,      0,      0,      0,      0, 0x6939,      0,      0,
+ 0xD975,      0, 0xD976,      0, 0x693C, 0x693A,      0, 0xD977,
+ 0xD978,      0,      0,      0, 0x4623, 0x693B, 0xD979,      0,
+ 0xD97A, 0x484D, 0x692E,      0,      0, 0xD97B,      0,      0,
+      0,      0,      0, 0xD97C,      0,      0, 0xD97D, 0x3D73,
+      0, 0x693D, 0x6942, 0x4174, 0xD97E,      0, 0x6941, 0xDA21,
+};
+const unsigned short utf8_to_euc_E898[] = {
+ 0xDA22,      0, 0x6922,      0, 0xDA23, 0xDA24, 0x6943, 0x4149,
+      0,      0, 0x693E, 0x6940,      0, 0xDA25, 0xDA26,      0,
+ 0xDA27, 0xDA28, 0xDA29, 0x693F,      0,      0, 0x5D31, 0x5D22,
+ 0xDA2A, 0xDA2B, 0x6945, 0xDA2C,      0,      0, 0xDA2D,      0,
+      0, 0xDA2E, 0x6944,      0,      0,      0,      0, 0xDA2F,
+      0, 0xDA30,      0,      0,      0, 0x4D76,      0, 0x623C,
+ 0x6946,      0,      0,      0,      0,      0, 0xDA31,      0,
+ 0xDA32,      0, 0xDA33,      0, 0xDA34, 0xDA35,      0, 0x6947,
+};
+const unsigned short utf8_to_euc_E899[] = {
+ 0xDA36, 0xB866, 0xDA37,      0,      0,      0, 0xDA38,      0,
+      0,      0,      0,      0,      0, 0x6948, 0x3857,      0,
+ 0x3554,      0, 0xDA39, 0xDA3A, 0x694A, 0x515D, 0xDA3B, 0xDA3C,
+ 0xDA3D, 0xDA3E, 0x3575,      0, 0x4E3A, 0xDA3F, 0x3673, 0x694B,
+ 0xDA40, 0xDA41, 0xDA42, 0xDA43, 0xDA44,      0,      0, 0x694C,
+      0, 0xDA45,      0, 0x436E, 0xDA46,      0,      0, 0xDA47,
+      0, 0x694D,      0,      0,      0, 0xDA48, 0xDA49, 0xDA4A,
+      0, 0x467A, 0xDA4B, 0x303A,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E89A[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xDA6D,      0, 0x3263, 0x6952, 0x6953, 0xDA4C,      0,      0,
+      0, 0xDA4D,      0, 0x694E,      0, 0x3B3D, 0xDA4E,      0,
+ 0xDA4F,      0, 0xDA50,      0, 0xDA51,      0,      0,      0,
+      0, 0xDA52,      0, 0x694F, 0x4742,      0, 0xDA53, 0xDA54,
+ 0xDA55, 0x6950, 0x6951, 0x695B,      0, 0xDA56,      0, 0x6955,
+ 0x6958, 0xDA57,      0, 0xDA58, 0xDA59, 0xDA5A, 0x6954, 0xDA5B,
+ 0xDA5C, 0xDA5D,      0,      0,      0,      0,      0, 0xDA5E,
+};
+const unsigned short utf8_to_euc_E89B[] = {
+ 0xDA5F, 0xDA60,      0, 0xDA61, 0x6956, 0xDA62, 0x6957, 0x3C58,
+      0, 0x6959,      0, 0x4341,      0, 0x3756, 0x3342,      0,
+      0, 0xDA63, 0xDA64,      0, 0x695C, 0xDA65,      0, 0xDA66,
+      0, 0x333F, 0xDA67, 0x6961, 0xDA68,      0, 0x695D, 0x6960,
+ 0xDA69,      0,      0, 0xDA6A, 0x483A, 0xDA6B,      0, 0xDA6C,
+      0, 0x695E,      0,      0, 0x695F, 0x4948, 0x485A, 0x6962,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x427D, 0x696C, 0xDA6E, 0x6968, 0xDA6F, 0xDA70, 0x326B,      0,
+};
+const unsigned short utf8_to_euc_E89C[] = {
+ 0x6966,      0, 0x4B2A, 0x6967, 0xDA71, 0xDA72, 0x6964, 0xDA73,
+ 0x6965, 0x696A, 0x696D, 0xDA74,      0, 0x696B, 0xDA75, 0xDA76,
+ 0xDA77, 0x6969, 0x6963, 0xDA78, 0xDA79,      0,      0,      0,
+ 0x4358, 0xDA7A, 0x6974,      0, 0x4C2A,      0, 0xDA7B, 0xDA7C,
+      0, 0xDA7D,      0, 0xDA7E,      0, 0x6972,      0,      0,
+ 0xDB21, 0x6973,      0,      0,      0,      0, 0xDB22, 0xDB23,
+      0, 0xDB24, 0xDB25,      0, 0x696E,      0,      0, 0x6970,
+      0, 0xDB26, 0xDB27, 0x6971, 0xDB28, 0xDB29, 0xDB2A, 0x696F,
+};
+const unsigned short utf8_to_euc_E89D[] = {
+ 0xDB2B,      0,      0, 0xDB2C,      0, 0xDB2D,      0,      0,
+      0, 0x4066,      0, 0x4F39, 0x6978, 0xDB2E, 0x6979,      0,
+      0,      0,      0, 0x6A21,      0, 0x3F2A,      0, 0x697B,
+ 0xDB2F, 0x697E,      0,      0,      0, 0xDB30,      0, 0x6976,
+ 0x6975, 0xDB31,      0, 0x6A22, 0xDB32, 0xDB33, 0x325C,      0,
+ 0x697C,      0, 0x6A23,      0,      0,      0, 0x697D, 0xDB34,
+      0, 0xDB35, 0xDB36,      0, 0x697A,      0, 0x4433,      0,
+ 0x6977,      0,      0, 0xDB37,      0,      0,      0, 0x4768,
+};
+const unsigned short utf8_to_euc_E89E[] = {
+      0,      0, 0x6A27, 0xDB38, 0xDB39, 0xDB3A, 0xDB3B, 0xDB3C,
+ 0xDB3D, 0xDB3E,      0, 0xDB3F, 0xDB40, 0x4D3B,      0,      0,
+ 0xDB41,      0,      0, 0xDB42,      0, 0xDB43,      0, 0xDB44,
+ 0xDB45, 0xDB46,      0,      0,      0,      0, 0xDB47, 0x6A26,
+ 0xDB48,      0, 0x6A25, 0xDB49,      0,      0,      0, 0xDB4A,
+      0,      0,      0, 0x6A2E, 0xDB4B, 0xDB4C, 0xDB4D, 0x6A28,
+      0, 0xDB4E,      0, 0x6A30,      0, 0xDB4F,      0,      0,
+      0,      0, 0x4D66, 0x6A33,      0, 0x6A2A, 0xDB50, 0xDB51,
+};
+const unsigned short utf8_to_euc_E89F[] = {
+ 0x6A2B, 0xDB52,      0,      0, 0x6A2F,      0, 0x6A32, 0x6A31,
+ 0xDB53, 0xDB54, 0xDB55, 0x6A29,      0,      0, 0xDB56,      0,
+ 0x6A2C,      0, 0x6A3D,      0,      0, 0xDB57, 0xDB58,      0,
+      0, 0xDB59, 0xDB5A,      0, 0xDB5B,      0,      0, 0xDB5C,
+ 0x6A36,      0, 0xDB5D, 0xDB5E, 0xDB5F,      0,      0,      0,
+      0,      0, 0xDB60, 0xDB61,      0, 0xDB62,      0, 0x6A34,
+      0, 0xDB63, 0x6A35, 0xDB64,      0,      0, 0x6A3A, 0x6A3B,
+ 0xDB65, 0x332A, 0xDB66, 0x3542,      0,      0, 0x6A39, 0xDB67,
+};
+const unsigned short utf8_to_euc_E8A0[] = {
+      0, 0xDB68,      0, 0xDB69,      0, 0x6A24, 0xDB6A, 0xF464,
+      0, 0xDB6B, 0xDB6C, 0xDB6D,      0, 0x6A38, 0x6A3C, 0x6A37,
+ 0xDB6E, 0x6A3E, 0xDB70, 0xDB71, 0xDB72, 0x6A40, 0x6A3F,      0,
+ 0xDB73, 0xDB6F, 0xDB74, 0xDB75, 0xDB76,      0, 0xDB77, 0xDB78,
+      0, 0x6A42, 0x6A41, 0x695A,      0,      0,      0, 0x6A46,
+ 0xDB79,      0,      0,      0,      0, 0xDB7A, 0xDB7B,      0,
+ 0xDB7C, 0x6A43, 0xDB7D,      0,      0, 0xDB7E, 0x6A44,      0,
+      0, 0x6A45, 0xDC21, 0x6A47, 0xDC22,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E8A1[] = {
+ 0x376C, 0xDC23, 0x6A49, 0xDC24, 0x6A48, 0xDC25, 0x3D30,      0,
+ 0xDC26, 0xDC27, 0xDC28, 0xDC29, 0x3954, 0x5E27, 0xDC2A,      0,
+      0, 0xDC2B, 0x6A4A, 0x3D51,      0, 0xDC2C, 0xDC2D, 0x3339,
+ 0xDC2E, 0x6A4B, 0xDC2F, 0x3152, 0xDC30, 0x3E57, 0x6A4C, 0xDC31,
+ 0xDC32, 0x3955, 0x6A4D, 0x3061, 0xDC33,      0,      0,      0,
+ 0x493D, 0xDC34,      0, 0x6A4E,      0,      0,      0,      0,
+ 0x3F6A, 0xDC35, 0x6A55,      0,      0, 0x6A52,      0, 0x436F,
+      0, 0xDC36,      0, 0xDC37,      0, 0x6A53, 0x6A50, 0x365E,
+};
+const unsigned short utf8_to_euc_E8A2[] = {
+ 0xDC38, 0x6A4F, 0x6A56,      0,      0,      0,      0,      0,
+ 0x3736,      0,      0, 0x425E,      0, 0x6A5C,      0,      0,
+      0,      0, 0x6A58,      0,      0,      0, 0x4235, 0x6A57,
+ 0xDC39, 0x6A5A, 0xDC3A, 0xDC3B, 0xDC3C,      0, 0x6A51, 0xDC3D,
+ 0xDC3E,      0, 0x6A5B,      0, 0x6A5D,      0,      0,      0,
+ 0xDC3F,      0, 0xDC40, 0x486F,      0,      0, 0x6A59,      0,
+ 0x6A5E, 0x6A60,      0,      0, 0x3853, 0x6A54,      0, 0x3041,
+      0,      0, 0xDC41,      0,      0, 0xDC42, 0xDC43, 0x6A5F,
+};
+const unsigned short utf8_to_euc_E8A3[] = {
+ 0xDC44, 0x3A5B, 0x4E76, 0x6A61, 0x6A62, 0x4175,      0,      0,
+      0,      0, 0xDC45, 0xDC46, 0xDC47, 0xDC48, 0xDC49, 0x4E22,
+      0, 0xDC4A, 0xDC4B, 0xDC4C, 0x6A63, 0x4D35,      0,      0,
+ 0x6A64, 0x6A65,      0, 0xDC4D, 0x4A64, 0x6A66, 0xDC4E, 0x3A40,
+      0, 0x4E23,      0,      0,      0,      0,      0, 0xDC4F,
+ 0x6A6B,      0,      0,      0,      0,      0,      0, 0xDC50,
+ 0xDC51, 0xDC52, 0x6A6C, 0x3E58, 0x6A6A, 0xDC53,      0, 0xDC54,
+ 0x4D67, 0x6A67,      0,      0, 0x6A69, 0x403D, 0x3F7E,      0,
+};
+const unsigned short utf8_to_euc_E8A4[] = {
+      0, 0xDC55, 0x6A68,      0, 0x6A6D,      0, 0xDC56, 0x4A23,
+      0,      0, 0x6A6F,      0, 0x6A6E, 0xDC57, 0xDC58, 0xDC59,
+ 0x336C,      0, 0x4B2B, 0x6A70,      0, 0xDC5A, 0xDC5B,      0,
+ 0xDC5C, 0xDC5D, 0xDC5E,      0, 0xDC5F, 0x6A7C, 0x6A72,      0,
+ 0xDC60,      0,      0,      0,      0, 0x6A73, 0xDC61, 0xDC62,
+ 0xDC63,      0, 0x6A74, 0x6A75,      0,      0,      0,      0,
+ 0xDC64, 0xDC65, 0xDC66,      0,      0, 0xDC67, 0x6A79,      0,
+ 0x6A7A, 0xDC68, 0xDC69, 0x6A78,      0,      0, 0xDC6A,      0,
+};
+const unsigned short utf8_to_euc_E8A5[] = {
+ 0xDC6B, 0x6A76, 0xDC6C, 0x6A71, 0x6A77, 0xDC6D, 0xDC6E,      0,
+      0, 0xDC6F,      0,      0, 0x6A7B, 0x7037,      0, 0xDC70,
+      0,      0, 0xDC71,      0,      0,      0, 0x3228, 0xDC72,
+      0,      0, 0xDC73, 0xDC74, 0xDC75,      0, 0x6A7E, 0x365F,
+ 0x6A7D, 0xDC76, 0xDC77, 0xDC78, 0x6B22,      0, 0x6B21,      0,
+      0,      0, 0x6B24, 0xDC79,      0, 0x6B23, 0xDC7A, 0x6B25,
+ 0xDC7B,      0, 0x3D31, 0xDC7C, 0x6B26, 0xDC7D,      0, 0x6B27,
+      0,      0, 0xDC7E, 0xDD21, 0xDD22, 0xDD23, 0x6B28, 0x403E,
+};
+const unsigned short utf8_to_euc_E8A6[] = {
+      0, 0x4D57,      0, 0x6B29,      0,      0, 0x4A24, 0x4746,
+ 0x6B2A, 0xDD24, 0x6B2B, 0x382B,      0, 0xDD25,      0, 0x352C,
+ 0xDD26,      0,      0, 0x6B2C, 0xDD27, 0xDD28, 0x3B6B, 0x4741,
+ 0x6B2D,      0, 0x3350, 0xDD29, 0xDD2A,      0,      0, 0xDD2B,
+ 0xDD2C, 0x6B2E,      0,      0,      0, 0xDD2D, 0x6B30, 0x4D77,
+      0, 0x6B2F, 0x3F46,      0, 0x6B31,      0,      0, 0x6B32,
+ 0xDD2E,      0, 0x6B33, 0x3451, 0xDD2F, 0xDD30, 0xDD31, 0xDD32,
+      0,      0, 0x6B34,      0, 0xDD33, 0x6B35,      0, 0x6B36,
+};
+const unsigned short utf8_to_euc_E8A7[] = {
+ 0x6B37,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0x3351,      0, 0xDD34, 0xDD35, 0xDD36, 0xDD37,
+ 0xDD38,      0, 0x6B38,      0, 0x6B39, 0x6B3A,      0,      0,
+      0,      0,      0, 0x3272,      0, 0xDD39, 0x3F28, 0x6B3B,
+      0, 0xDD3A,      0, 0xDD3B,      0, 0xDD3C,      0,      0,
+      0, 0xDD3D,      0, 0xDD3E, 0x6B3C,      0, 0xDD3F,      0,
+ 0x6B3D, 0xDD40,      0,      0,      0, 0xDD41,      0, 0xDD42,
+};
+const unsigned short utf8_to_euc_E8A8[] = {
+ 0x3840,      0, 0x447B, 0x6B3E, 0xDD43, 0xDD44,      0, 0xDD45,
+ 0x3757,      0, 0x3F56,      0, 0x6B41,      0, 0x4624, 0xDD46,
+ 0x6B40, 0xDD47, 0xDD48, 0x3731, 0xDD49, 0xDD4A, 0x6B3F, 0x4277,
+ 0x352D,      0,      0, 0x6B42,      0, 0x6B43, 0xDD4B, 0x3E59,
+ 0xDD4C,      0, 0xDD4D, 0x376D, 0xDD4E, 0x6B44, 0xDD4F,      0,
+      0,      0, 0x4B2C, 0xDD50, 0xDD51, 0x405F,      0, 0xDD52,
+      0, 0x3576,      0, 0x4C75, 0x414A, 0xDD53, 0x6B45, 0xDD54,
+      0,      0, 0x3F47, 0x4370, 0x3E5A, 0xDD55, 0xDD56,      0,
+};
+const unsigned short utf8_to_euc_E8A9[] = {
+ 0xDD57, 0x6B46,      0, 0xDD58,      0, 0xDD59, 0x6B49, 0xDD5A,
+ 0x6B4A, 0xDD5B,      0,      0,      0, 0xDD5C, 0xDD5D,      0,
+ 0x3A3E, 0x4242, 0x6B48, 0xDD5E, 0x3E5B, 0x493E, 0xDD5F, 0xDD60,
+ 0xDD61,      0,      0, 0x6B47, 0xDD62, 0xDD63, 0x3B6C,      0,
+ 0x3153, 0xDD64, 0x6B4E, 0x3758,      0, 0xDD65, 0x3B6E, 0xDD66,
+      0, 0x3B6D,      0, 0x4F4D, 0x6B4D, 0x6B4C, 0x4127,      0,
+ 0x354D, 0x4F43, 0x333A, 0x3E5C,      0, 0xDD67, 0xDD68, 0xDD69,
+      0, 0xDD6A, 0xDD6B, 0xDD6C, 0x6B4B,      0, 0xDD6D, 0xDD6E,
+};
+const unsigned short utf8_to_euc_E8AA[] = {
+ 0xDD6F,      0, 0x6B50, 0xDD70, 0x6B51, 0x6B4F, 0xDD71, 0x3858,
+      0, 0x4D40,      0, 0xDD72, 0x3B6F, 0x4727,      0, 0xDD73,
+ 0xDD74, 0x6B54, 0xDD75, 0x4040,      0, 0x4342, 0xDD76, 0xDD77,
+ 0x4D36, 0xDD78, 0x6B57,      0,      0,      0, 0x386C, 0xDD79,
+ 0x403F, 0x6B53,      0, 0x6B58, 0x386D, 0x6B55, 0x6B56, 0xDD7A,
+ 0x6B52, 0xDD7B,      0,      0, 0x4062, 0x4649, 0xDD7C, 0xDD7D,
+ 0x432F,      0, 0x325D, 0xDD7E,      0,      0, 0xDE21, 0xDE22,
+      0, 0x4870,      0, 0xDE23, 0x3543,      0, 0xDE24, 0x4434,
+};
+const unsigned short utf8_to_euc_E8AB[] = {
+      0,      0, 0x6B5B, 0xDE25, 0x6B59,      0, 0xDE26, 0x434C,
+ 0xDE27, 0xDE28, 0xDE29, 0x4041, 0x3452, 0x6B5A,      0, 0x3F5B,
+      0, 0xDE2A, 0x4E4A, 0xDE2B, 0xDE2C, 0xDE2D, 0x4F40, 0xDE2E,
+      0,      0, 0x6B5C, 0x6B67, 0x4435, 0xDE2F, 0x6B66, 0xDE30,
+ 0x6B63, 0x6B6B, 0x6B64,      0, 0x6B60,      0, 0x447C, 0x6B5F,
+      0,      0,      0, 0x6B5D, 0xDE31, 0x4D21, 0x3B70,      0,
+ 0xDE32, 0x6B61,      0, 0x6B5E, 0xDE33, 0xDE34, 0xDE35, 0x6B65,
+ 0x3D74,      0, 0x3841,      0, 0xDE36,      0, 0x427A, 0xDE37,
+};
+const unsigned short utf8_to_euc_E8AC[] = {
+ 0x4B45, 0x315A, 0x3062,      0, 0x4625, 0xDE38, 0xDE39, 0x6B69,
+      0,      0, 0xDE3F, 0xDE3A, 0x6B68,      0, 0x4666,      0,
+ 0x6B6D, 0xDE3B,      0,      0, 0x6B62,      0, 0x6B6C, 0x6B6E,
+      0, 0x382C, 0x6B6A, 0x3956, 0xDE3C, 0x3C55, 0xDE3D, 0xDE3E,
+ 0x6B6F, 0x4D58,      0,      0,      0,      0, 0x6B72,      0,
+ 0x6B75,      0,      0, 0x6B73, 0x4935, 0xDE40,      0,      0,
+ 0xDE41,      0,      0, 0x6B70,      0,      0,      0, 0xDE42,
+      0, 0x3660,      0,      0, 0xDE43,      0, 0x6B74,      0,
+};
+const unsigned short utf8_to_euc_E8AD[] = {
+      0, 0x6B76, 0xDE44, 0xDE45, 0xDE46, 0xDE47, 0xDE48,      0,
+ 0xDE49, 0x6B7A,      0,      0, 0x6B77, 0xDE4E, 0x6B79, 0x6B78,
+      0,      0, 0xDE4A, 0xDE4B, 0xDE4C,      0, 0x6B7B,      0,
+ 0x3C31, 0xDE4D, 0x6B7D, 0x6B7C, 0x4968,      0, 0xDE4F, 0x6C21,
+      0,      0,      0, 0xDE50,      0,      0, 0x3759,      0,
+      0,      0,      0, 0x6B7E, 0x6C22, 0xDE51,      0, 0x6C23,
+ 0x3544, 0x6641, 0x3E79,      0, 0x6C24,      0, 0xDE52, 0x386E,
+ 0xDE53, 0xDE54,      0,      0, 0xDE55, 0x6C25, 0xDE56, 0xF466,
+};
+const unsigned short utf8_to_euc_E8AE[] = {
+ 0x6C26, 0xDE57,      0, 0x3B3E, 0xDE58, 0xDE59,      0,      0,
+      0,      0, 0x5A4E, 0xDE5A, 0x6C27, 0xDE5B, 0x6C28, 0xDE5C,
+ 0x3D32,      0, 0x6C29, 0x6C2A, 0xDE5D, 0xDE5E, 0x6C2B,      0,
+      0, 0x6C2C, 0x6C2D,      0, 0xDE5F,      0, 0xDE60, 0xDE61,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E8B0[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x432B,
+ 0xDE62, 0xDE63, 0x6C2E,      0,      0, 0xDE64, 0xDE65, 0x6C30,
+};
+const unsigned short utf8_to_euc_E8B1[] = {
+      0, 0x6C2F,      0,      0,      0, 0xDE66, 0x4626, 0xDE67,
+ 0x6C31, 0xDE68, 0x4B2D, 0xDE69, 0x6C32,      0, 0x6C33, 0xDE6A,
+ 0x6C34, 0xDE6B,      0, 0xDE6C, 0xDE6D, 0x6C35,      0, 0xDE6E,
+ 0xDE6F, 0xDE72, 0x465A, 0xDE70,      0, 0xDE71,      0,      0,
+      0, 0x3E5D, 0x6C36, 0xDE73, 0xDE74,      0, 0xDE75,      0,
+ 0xDE76, 0xDE77, 0x396B, 0x502E, 0x6C37, 0xDE78,      0,      0,
+      0,      0,      0, 0xDE79,      0, 0xDE7A, 0xDE7B,      0,
+ 0x6C38, 0x493F, 0x6C39, 0xDE7C, 0x6C41,      0, 0xDE7D,      0,
+};
+const unsigned short utf8_to_euc_E8B2[] = {
+      0,      0, 0x6C3A,      0,      0, 0x6C3C, 0xDE7E, 0xDF21,
+      0, 0x6C3B, 0x6C3D, 0xDF22, 0x4B46, 0x6C3E, 0x6C3F,      0,
+ 0xDF23,      0, 0xDF24, 0xDF25, 0x6C40,      0,      0,      0,
+ 0x6C42, 0xDF26,      0, 0xDF27, 0xDF28, 0x332D, 0x4467,      0,
+ 0x4969, 0x3A62, 0x3957,      0, 0xDF29,      0,      0, 0x494F,
+ 0x325F, 0x484E, 0x6C45, 0x3453, 0x4055, 0x6C44, 0x6C49, 0x4379,
+ 0x4C63,      0, 0x6C47, 0x6C48, 0x352E,      0, 0x6C4A, 0x4763,
+ 0x425F, 0xDF2A, 0xDF2B, 0x4871, 0x453D, 0x6C46,      0, 0x4B47,
+};
+const unsigned short utf8_to_euc_E8B3[] = {
+ 0x326C, 0x6C4C, 0x4F28, 0x4442, 0x4F45, 0xDF2C, 0xDF2D, 0x3B71,
+ 0x6C4B, 0xDF2E, 0x4231, 0xDF2F,      0, 0x6C5C, 0x4128, 0xDF30,
+      0, 0x4678,      0, 0x4950,      0, 0xDF32, 0xDF31,      0,
+      0, 0xDF33, 0x6C4F, 0x3B3F, 0x3B72, 0xDF34, 0x3E5E,      0,
+ 0x4765, 0xDF35, 0x382D, 0x6C4E, 0x6C4D,      0, 0x496A,      0,
+ 0xDF36,      0, 0x3C41,      0, 0xDF37, 0x4552,      0, 0xDF38,
+ 0xDF39,      0, 0xDF3A,      0, 0xF467, 0xDF3B,      0, 0xDF3C,
+ 0xDF3D,      0, 0x6C51, 0x6C52, 0x3958, 0x6C50, 0xDF3E, 0xDF3F,
+};
+const unsigned short utf8_to_euc_E8B4[] = {
+      0, 0xDF40,      0, 0xDF41, 0x6C53, 0x6C54,      0, 0x6C56,
+ 0x4223, 0xDF42, 0x6C55, 0x3466,      0, 0x6C58,      0, 0x6C57,
+ 0x6C59,      0, 0xDF43, 0x6C5B, 0x6C5D,      0, 0x6C5E, 0xDF44,
+      0,      0,      0, 0xDF45,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E8B5[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x4056, 0xDF46, 0x3C4F, 0x6C5F,
+      0, 0xDF47,      0, 0x3352, 0xDF48, 0x6C60, 0xDF49,      0,
+ 0x4176, 0x6C61,      0, 0x6C62, 0x496B,      0, 0xF468, 0x352F,
+      0,      0,      0,      0,      0,      0,      0, 0xDF4A,
+};
+const unsigned short utf8_to_euc_E8B6[] = {
+      0, 0x6C63, 0xDF4B,      0, 0xDF4C, 0x4436,      0,      0,
+ 0xDF4D,      0, 0x315B,      0,      0, 0xDF4E,      0,      0,
+ 0xDF4F, 0xDF50,      0,      0,      0, 0xDF51,      0,      0,
+      0, 0x6C64,      0,      0,      0,      0, 0xDF52, 0xDF53,
+ 0xDF54,      0,      0, 0x3C71,      0,      0, 0xDF55,      0,
+ 0x3F76,      0,      0, 0xDF56, 0xDF57,      0,      0, 0xDF58,
+      0,      0, 0xDF59, 0x422D,      0, 0xDF5A,      0, 0xDF5B,
+      0, 0xDF5C, 0x6C67, 0xDF5D, 0xDF6F,      0, 0x6C66,      0,
+};
+const unsigned short utf8_to_euc_E8B7[] = {
+ 0xDF5E,      0, 0x6C65,      0,      0, 0xDF5F, 0xDF60, 0xDF61,
+ 0xDF62,      0, 0xDF63, 0x6C6D, 0x6C6B,      0, 0xDF64, 0x6C68,
+      0, 0xDF65,      0,      0, 0xDF66, 0xDF67, 0x6C6A, 0xDF68,
+      0, 0xDF69, 0x6C69, 0x6C6C,      0, 0x3577,      0, 0x6C70,
+      0, 0x4057,      0, 0x6C71, 0xDF6A, 0xDF6B,      0, 0xDF6C,
+ 0x3859,      0, 0x6C6E, 0x6C6F, 0xDF6D,      0,      0, 0x4F29,
+ 0xDF6E, 0xDF70, 0xDF71, 0x4437, 0xDF72, 0x4129,      0,      0,
+      0,      0,      0,      0, 0x6C72, 0xDF73,      0, 0x6C75,
+};
+const unsigned short utf8_to_euc_E8B8[] = {
+      0, 0xDF74,      0,      0, 0xDF75, 0xDF76, 0xDF77,      0,
+ 0x6C73, 0x6C74, 0x4D59, 0xDF78,      0,      0,      0, 0x4627,
+ 0x6C78, 0xDF79,      0,      0, 0xDF7A,      0, 0xDF7B,      0,
+      0,      0,      0,      0,      0, 0x6C76, 0x6C77, 0x6C79,
+ 0xDF7C, 0xDF7D, 0xDF7E, 0xE021,      0,      0, 0xE022, 0xE023,
+      0,      0, 0x6D29,      0,      0,      0,      0,      0,
+ 0x6C7C, 0xE024,      0, 0xE025, 0x6C7D, 0x6C7B, 0xE026, 0xE027,
+ 0xE028, 0xE029,      0,      0,      0, 0xE02A,      0,      0,
+};
+const unsigned short utf8_to_euc_E8B9[] = {
+ 0xE02B, 0xE02C, 0x6C7A,      0, 0x447D,      0,      0, 0x6D21,
+ 0x6D25, 0x6D22, 0x6C7E, 0xE02D, 0x6D23, 0xE02E, 0xE02F, 0xE030,
+ 0x6D24,      0,      0,      0, 0xE031, 0x6D2B,      0,      0,
+      0, 0x6D26,      0, 0xE032, 0xE033, 0xE034, 0xE035, 0x4058,
+ 0x6D28, 0xE036, 0xE037, 0x6D2A, 0x6D27,      0,      0,      0,
+      0, 0xE038,      0,      0, 0xE039, 0xE03A,      0, 0xE03B,
+ 0xE03C, 0xE03D, 0x6D2D,      0, 0x3D33,      0, 0x6D2C,      0,
+      0, 0xE03E, 0xE03F, 0xE040, 0x6D2E,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E8BA[] = {
+      0, 0x6D2F, 0xE041, 0xE042, 0x6D32, 0x6D31,      0, 0x6D30,
+      0, 0xE043, 0x6D34, 0x6D33,      0, 0x4C76,      0,      0,
+ 0xE044, 0x6D36, 0xE045, 0x6D35, 0x6D37, 0xE046,      0,      0,
+      0, 0x6D38, 0xE047, 0xE048,      0, 0xE049, 0xE04A,      0,
+      0, 0x6D3A, 0xE04B,      0,      0,      0,      0, 0xE04C,
+      0, 0xE04D, 0x6D39, 0x3F48, 0x6D3B, 0xE04E, 0xE04F, 0x366D,
+ 0x6D3C, 0x6D3E,      0, 0xE050,      0, 0xE051,      0,      0,
+      0,      0, 0xE052, 0xE053,      0,      0, 0x6D3F,      0,
+};
+const unsigned short utf8_to_euc_E8BB[] = {
+ 0xE054, 0xE055,      0, 0xE056, 0xE057, 0x6D40, 0x6D3D, 0xE058,
+ 0x6D41,      0, 0x3C56, 0x6D42, 0x3530, 0x3733,      0, 0xE059,
+      0, 0xE05A, 0x382E,      0, 0xE05B,      0,      0,      0,
+      0,      0,      0, 0x6D43, 0xE05C,      0,      0, 0x4670,
+      0,      0, 0x453E, 0x6D44,      0,      0,      0,      0,
+ 0xE05D,      0,      0, 0x6D47,      0, 0xE064, 0xE05E,      0,
+ 0xE05F, 0xE060,      0,      0,      0,      0,      0, 0xE061,
+ 0x3C34, 0xE062, 0xE063, 0x6D46, 0x6D45, 0x375A, 0x6D48,      0,
+};
+const unsigned short utf8_to_euc_E8BC[] = {
+ 0xE065,      0, 0xE066, 0x3353,      0, 0x6D4A,      0, 0xE067,
+ 0xE068, 0x3A5C, 0x6D49,      0, 0x6D52,      0,      0, 0xE069,
+ 0xE06A,      0, 0x6D4C, 0x6D4E, 0x4A65, 0x6D4B, 0xE06B, 0xE06C,
+ 0xE06D, 0x6D4D,      0, 0x6D51, 0x6D4F, 0x3531, 0xE06E, 0x6D50,
+ 0xE06F, 0xE070,      0, 0xE071,      0, 0xE072, 0x6D53, 0xE073,
+ 0xE074, 0x475A, 0x4E58,      0, 0xE075, 0xE076, 0xE077, 0x3D34,
+      0,      0,      0, 0x6D54, 0xE078, 0xE079, 0xE07A, 0xE07B,
+ 0x4D22, 0x6D56, 0xE07C, 0x6D55,      0,      0, 0x6D59, 0x4D41,
+};
+const unsigned short utf8_to_euc_E8BD[] = {
+ 0xE07D, 0xE07E, 0x6D58, 0xE121, 0x336D, 0x6D57, 0x6D5C, 0xE122,
+      0, 0x6D5B,      0,      0, 0x6D5A, 0x4532, 0x6D5D, 0xE123,
+      0, 0xE124, 0xE125, 0xE126, 0xE127, 0xE128,      0, 0x6D5E,
+ 0xE129,      0,      0,      0, 0x6D5F, 0xE12A, 0xE12B, 0x396C,
+      0, 0x3725, 0x6D60, 0x6D61, 0x6D62, 0xE12C,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E8BE[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x3F49, 0x6D63, 0xE12D, 0x3C2D, 0x6D64,
+ 0xE12E, 0xE12F,      0, 0x6D65, 0xE130, 0xE131, 0xE132, 0x5221,
+ 0x517E,      0,      0,      0,      0, 0x6D66, 0x6570, 0x6D67,
+ 0x4324, 0x3F2B, 0x4740,      0,      0, 0xE133, 0xE134, 0x6D68,
+ 0xE135,      0, 0x4A55, 0x4454, 0x397E,      0, 0xE136, 0x4329,
+};
+const unsigned short utf8_to_euc_E8BF[] = {
+ 0xE137, 0xE138, 0x312A,      0, 0x4B78, 0x3F57, 0xE139,      0,
+      0,      0, 0xE13A, 0xE13B,      0, 0xE13C, 0x375E,      0,
+ 0xE13D, 0x3661, 0xE13E, 0xE13F, 0x4A56, 0xE140,      0,      0,
+      0,      0, 0x6D69,      0,      0,      0,      0,      0,
+ 0xE141,      0, 0x6D6B, 0xE142, 0xE143, 0x6D6A, 0x3260,      0,
+ 0xE144, 0x4676, 0x6D6C, 0x4777,      0, 0x4533, 0xE145, 0x6D6D,
+ 0x3D52, 0xE146,      0,      0, 0x6D6F, 0xE147, 0xE148, 0x4C42,
+ 0x6D7E, 0x6D71, 0x6D72, 0xE149,      0, 0x4449, 0xE14A,      0,
+};
+const unsigned short utf8_to_euc_E980[] = {
+ 0x4260, 0x4177, 0xE14B, 0x4628, 0xE14C, 0x6D70, 0x3555,      0,
+ 0xE14D,      0,      0, 0x6D79, 0xE14E, 0x6D76, 0x6E25, 0x4629,
+ 0x4360, 0x6D73,      0, 0x447E, 0x4553, 0x6D74, 0x6D78, 0x3F60,
+ 0xE14F, 0x4767, 0x444C, 0xE150,      0, 0x4042, 0x6D77, 0x422E,
+ 0x4224, 0x6D75, 0x3029, 0x4F22,      0,      0,      0, 0x6D7A,
+ 0xE151, 0xE152, 0xE154,      0, 0xE155, 0xE156, 0x4261, 0xE153,
+      0, 0x3D35, 0x3F4A, 0xE157, 0xE158, 0x6D7C, 0x6D7B, 0xE159,
+ 0x306F, 0x6D7D,      0,      0, 0x492F,      0, 0x6E27, 0xE15A,
+};
+const unsigned short utf8_to_euc_E981[] = {
+      0, 0x465B, 0x3F6B, 0xE15B, 0xE15C, 0x4359,      0, 0x3678,
+      0, 0x6E26, 0x4D37, 0x313F, 0xE15D, 0x4A57, 0x3261, 0x6E21,
+ 0x6E22, 0x6E23, 0x6E24, 0x463B, 0x4323, 0x3063, 0x6E28,      0,
+ 0x6E29, 0x7423,      0, 0xE15E, 0x423D, 0xE15F, 0x6E2A,      0,
+ 0x3173, 0x414C, 0xE160, 0x382F,      0, 0x4D5A, 0xE161, 0xE162,
+ 0x6E2B, 0x452C,      0,      0, 0xE163, 0x4178, 0x3C57, 0x6E2C,
+ 0xE164,      0, 0x6E2F,      0, 0xE165, 0x3D65, 0x6E2D, 0x412B,
+ 0x412A, 0xE166, 0x3064,      0, 0x4E4B, 0x6E31,      0, 0x4872,
+};
+const unsigned short utf8_to_euc_E982[] = {
+ 0x6E33, 0x6E32, 0x6E30, 0x6364, 0x3454, 0xE167,      0, 0x6D6E,
+ 0xE168, 0x6E35, 0x6E34, 0xE169, 0xE16A,      0, 0xE16B, 0x6E36,
+ 0xE16C, 0x4D38,      0,      0,      0, 0xE16D,      0, 0xE16E,
+ 0xE16F, 0xE170,      0, 0xE171,      0,      0,      0,      0,
+ 0xE172, 0xE173, 0xE174, 0x4661,      0, 0xE175, 0x4B2E,      0,
+ 0x6E37,      0, 0x3C59,      0,      0,      0,      0, 0x6E38,
+ 0xE176, 0x6E39, 0xE177, 0xE178, 0xE179, 0x6E3A, 0xE17A,      0,
+ 0x4521,      0,      0,      0,      0, 0xE17B, 0xE17D,      0,
+};
+const unsigned short utf8_to_euc_E983[] = {
+      0, 0x306A,      0, 0xE17E, 0xE221, 0xE222,      0, 0xE223,
+ 0xE224,      0, 0x3959,      0, 0xE17C,      0, 0x4F3A,      0,
+      0,      0, 0xE22D,      0,      0, 0xE225,      0, 0xE226,
+ 0xE227, 0xE228,      0, 0x6E3E, 0xE229, 0xE22A, 0xF46C, 0xE22B,
+      0, 0x3734, 0x6E3B,      0, 0x6E3C, 0xE22C,      0,      0,
+ 0x4974,      0,      0, 0xE22F,      0, 0x3354,      0, 0xE230,
+ 0xE231,      0,      0,      0, 0xE232, 0x4D39, 0xE22E, 0x363F,
+      0,      0,      0,      0,      0, 0x4554, 0xE233, 0xE234,
+};
+const unsigned short utf8_to_euc_E984[] = {
+ 0xE235,      0, 0x6E3F,      0, 0xE236, 0xE237, 0xE238,      0,
+ 0xE239,      0,      0,      0,      0, 0xE23A,      0,      0,
+ 0xE23B,      0, 0x6E40,      0, 0xE23C, 0xF46E, 0xE23D, 0xE23E,
+ 0xE23F, 0x6E41, 0xE240,      0, 0xE241,      0, 0xE242,      0,
+ 0xE243,      0, 0xE245, 0xE246,      0, 0xE244,      0, 0xE247,
+      0, 0xE248,      0,      0,      0, 0x4522, 0xE249, 0xE24A,
+ 0x6E43, 0xE24B, 0x6E42,      0, 0xE24C,      0, 0xE24D, 0xE24E,
+      0, 0xE24F, 0xE250,      0, 0xE251, 0xE252,      0,      0,
+};
+const unsigned short utf8_to_euc_E985[] = {
+      0,      0,      0, 0xE253,      0,      0,      0, 0xE254,
+ 0xE255, 0x4653, 0x6E44, 0x3D36, 0x3C60, 0x475B, 0x4371, 0xE256,
+      0,      0, 0x3C72, 0xE257, 0x3F6C,      0, 0x6E45, 0xE258,
+ 0x6E46, 0xE259, 0xE25A, 0xE25B,      0,      0,      0,      0,
+      0, 0xE25C, 0x3F5D, 0x6E47, 0xE25D, 0x6E48,      0, 0xE25E,
+      0, 0x6E49, 0x4D6F,      0, 0x3D37, 0xE25F,      0,      0,
+      0,      0, 0x6E4B, 0x6E4A, 0xE260, 0x395A,      0, 0x3973,
+ 0x3B40, 0xE261, 0xE262, 0xE263,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E986[] = {
+      0, 0xE264, 0x6E4E, 0xE265,      0, 0xE266, 0xE267, 0x3D66,
+      0, 0x6E4D, 0xE268, 0x6E4C,      0, 0x4269, 0xE269,      0,
+ 0x386F, 0xE26A, 0x4043, 0xE26B, 0xE26C, 0xE26D,      0, 0x4830,
+ 0xE26E,      0,      0,      0, 0x3D39,      0, 0xE26F,      0,
+      0, 0xE270, 0x6E4F,      0, 0x3E5F,      0, 0xE271,      0,
+ 0xE272,      0, 0x6E52, 0x6E50, 0xE273, 0xE274, 0xE275, 0x6E51,
+ 0xE276, 0xE277, 0xE278, 0xE279, 0x6E54, 0x6E53, 0xE27A,      0,
+ 0x3E7A,      0, 0x6E55, 0xE27B, 0xE27C, 0xE27D,      0, 0xE27E,
+};
+const unsigned short utf8_to_euc_E987[] = {
+ 0x6E56, 0x6E57, 0xE321, 0xE322,      0, 0xE323, 0x4850, 0x3A53,
+ 0x3C61, 0x6E58,      0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C,
+ 0x6E5A, 0x3662,      0, 0xE324, 0xE325,      0, 0x6E5B, 0xE326,
+ 0x4523, 0xE327, 0xE328, 0x6E5E, 0x3378, 0x3F4B, 0xE329, 0x6E5C,
+      0, 0x6E5D,      0, 0x4460, 0xE32A, 0xE32B, 0x4B55, 0x367C,
+      0, 0xE32C, 0xE32D,      0, 0xE32E, 0xE32F, 0xE330, 0xE331,
+ 0xE332, 0xE333,      0,      0,      0, 0x6E60, 0x6E61, 0xE334,
+      0, 0xE335,      0, 0xE336, 0x6E5F, 0xE337,      0, 0x6E63,
+};
+const unsigned short utf8_to_euc_E988[] = {
+ 0xE338, 0xE339,      0,      0, 0xE33A, 0xE33B, 0xE33C, 0xE33D,
+      0, 0xE33E, 0xE33F,      0, 0xE340, 0x465F, 0x3343,      0,
+ 0xE341, 0x6E67, 0xE342, 0xE343, 0x6E64, 0x6E66, 0xE344,      0,
+ 0xE345,      0,      0,      0, 0xE346, 0xE347, 0x6E62,      0,
+      0,      0,      0, 0xE348, 0xE349, 0xE34A, 0xE34B,      0,
+ 0xE34C, 0x6F4F,      0,      0, 0x6E65,      0, 0xE34D, 0xE34E,
+ 0xE34F,      0,      0, 0xE350, 0x4E6B, 0xE351, 0xE352, 0x385A,
+ 0xE353, 0xE354, 0xE355,      0, 0xE356,      0, 0xE357, 0x6E6F,
+};
+const unsigned short utf8_to_euc_E989[] = {
+ 0xE358,      0, 0xE359, 0xE35A, 0x4534, 0x6E6A, 0xE35B, 0xE35C,
+ 0x6E6D, 0x6E6B, 0xE35D, 0x6E70,      0, 0xE35E, 0xE35F, 0xE360,
+ 0x6E71, 0xE361,      0,      0,      0,      0,      0, 0x6E69,
+ 0xE362, 0xE363, 0x6E76, 0x3174, 0xE364, 0xE365, 0x6E68,      0,
+ 0xE366, 0xE367, 0x482D,      0, 0x6E6C, 0xE368, 0x3E60, 0xE369,
+ 0xE36A, 0xE36B,      0,      0,      0,      0, 0xE36C, 0xE36D,
+ 0xE36E, 0x395B,      0,      0,      0, 0xE36F, 0xE370, 0xE371,
+ 0xE372, 0xE373,      0, 0xE374, 0xE375, 0xE376, 0x4B48, 0xE377,
+};
+const unsigned short utf8_to_euc_E98A[] = {
+ 0x3664,      0,      0, 0x3D46,      0, 0x463C,      0,      0,
+ 0xE378, 0xE379, 0xE37A,      0,      0, 0xE37B, 0xE37C,      0,
+      0, 0x412D, 0xE37D, 0x6E74,      0, 0x6E6E, 0x6E73, 0xE37E,
+ 0x4C43, 0xE421, 0x4438, 0x6E75, 0x6E72,      0,      0, 0xE422,
+ 0xE423,      0,      0,      0, 0xE424, 0xE425,      0, 0xE426,
+ 0xE427,      0,      0, 0xE428,      0, 0x412C,      0, 0xE429,
+      0,      0, 0xE42A,      0,      0,      0, 0xE42B, 0x6E79,
+ 0xE42C, 0x6E78, 0xE42D, 0xE42E, 0xE42F, 0xE430,      0, 0xE431,
+};
+const unsigned short utf8_to_euc_E98B[] = {
+ 0xE432, 0xE433, 0xE434, 0xE435,      0, 0xE436, 0xE437, 0xE438,
+ 0xE439,      0,      0, 0xE43A, 0xE43B, 0xE43C, 0xE43D, 0x6E77,
+ 0xE43E,      0, 0x4B2F, 0xE43F,      0, 0xE440,      0, 0xE441,
+ 0xE442, 0xE443,      0,      0, 0xE444, 0xE445,      0, 0xE446,
+ 0xE447, 0xE448,      0, 0xE449, 0x3D7B, 0xE44A,      0, 0xE44B,
+ 0xE44C, 0x6E7A, 0x4A5F,      0, 0xE44D, 0x3154, 0xE44E,      0,
+ 0xE44F,      0, 0x4946, 0x4372,      0,      0,      0,      0,
+ 0x3578, 0xE450, 0x6E7C, 0xE451, 0x395D,      0,      0, 0xE452,
+};
+const unsigned short utf8_to_euc_E98C[] = {
+ 0xE453,      0, 0xE454,      0,      0,      0, 0x3B2C,      0,
+ 0xE455,      0,      0,      0,      0, 0xE456,      0, 0x6E7B,
+ 0x3F6D, 0xE457,      0,      0, 0xE458, 0xE459,      0,      0,
+ 0x3F6E, 0x6F21, 0x6F23,      0, 0xE45A, 0xE45B, 0xE45C, 0xE45D,
+ 0x3E7B, 0xE45E, 0x6F22, 0x6F24, 0xE45F, 0xE460, 0x3653, 0xE461,
+ 0x4945, 0xE462, 0xE463, 0x3C62, 0x4F23,      0, 0x6E7E, 0x3A78,
+      0,      0, 0x4F3F, 0xE464, 0xE465, 0x6F26, 0xE466, 0xE467,
+      0,      0, 0x6F25, 0x6F27,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E98D[] = {
+      0,      0,      0,      0, 0x6E7D,      0,      0, 0xE468,
+ 0xE469, 0xE46A,      0, 0x4669,      0, 0x4555,      0,      0,
+ 0xE46B, 0xE46C, 0xE46D,      0, 0x4457, 0xE46E, 0x6F2C, 0xE46F,
+ 0xE470,      0, 0xE471, 0x4343, 0x6F28,      0, 0xE472,      0,
+ 0x6F29,      0,      0,      0, 0xE473, 0xE474,      0, 0xE475,
+      0, 0xE476, 0xE477,      0, 0x372D, 0xE478, 0x6F2B, 0xE479,
+ 0xE47A, 0xE47B,      0, 0xE47C, 0xE47D, 0x3830, 0xE47E,      0,
+      0,      0, 0xE521,      0, 0x6F2A, 0xE522, 0x3E61, 0xE523,
+};
+const unsigned short utf8_to_euc_E98E[] = {
+ 0xE524, 0xE525, 0xE526,      0,      0,      0,      0,      0,
+ 0xE527,      0, 0xE528, 0xE529, 0x3379, 0xE52A,      0, 0xE52B,
+      0,      0, 0xE52C,      0, 0x6F30, 0xE52D, 0x3A3F, 0x4179,
+ 0xE52E,      0, 0x444A, 0xE52F,      0,      0, 0xE530,      0,
+      0, 0xE531,      0, 0xE532, 0xE533,      0, 0xE534, 0x333B,
+ 0xE535, 0xE53B,      0, 0xE536, 0x6F2E, 0x6F2F, 0x4443,      0,
+ 0x6F2D,      0,      0,      0, 0xE537, 0xE538, 0xE539,      0,
+      0, 0x6F31, 0xE53A,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E98F[] = {
+      0, 0xE53C,      0, 0x6F37, 0xE53D, 0xE53E, 0xE53F, 0xE540,
+ 0x6F3A, 0xE541, 0xE542, 0xE543, 0xE544, 0xE545,      0,      0,
+ 0x6F39, 0x452D,      0, 0xE546,      0,      0, 0x6F32, 0x6F33,
+ 0x6F36, 0xE547,      0,      0, 0xE548, 0x6F38, 0xE549, 0xE54A,
+      0, 0x3640, 0xE54B,      0, 0x6F3B, 0x6F35, 0xE54C, 0xE54D,
+ 0x6F34,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xE54F,
+ 0xE550, 0xE54E, 0xE551, 0xE552,      0, 0xE553,      0,      0,
+};
+const unsigned short utf8_to_euc_E990[] = {
+      0, 0xE554, 0xE555, 0x6F3F, 0xE556,      0,      0, 0x6F40,
+ 0xE557, 0xE558,      0,      0,      0, 0xE559, 0xE55A, 0xE55B,
+ 0x6F41,      0,      0, 0x6F3E, 0x6F3D, 0xE55C, 0xE55D, 0xE55E,
+ 0x3E62, 0x462A, 0x6F3C,      0,      0,      0,      0, 0xE55F,
+      0, 0x6F45,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x6F43,      0,      0, 0xE560, 0xE561,
+      0, 0xE562, 0xE563, 0xE564, 0xE565, 0x6F44, 0x6F42,      0,
+ 0x4278,      0, 0x6F46, 0xE566,      0, 0xE568,      0, 0xE567,
+};
+const unsigned short utf8_to_euc_E991[] = {
+      0, 0x6F47,      0, 0xE569, 0x6F49, 0xE56A,      0,      0,
+ 0xE56B,      0, 0xE56C,      0, 0xE56D,      0,      0,      0,
+      0, 0x3455, 0x6F48, 0x4C7A,      0, 0xE56E,      0,      0,
+      0, 0xE56F, 0x6F54, 0x6F4A, 0xE570,      0, 0x6F4D, 0xE571,
+ 0x6F4B, 0xE572, 0x6F4C, 0xE573,      0,      0,      0,      0,
+ 0xE574,      0, 0x6F4E, 0xE575,      0, 0xE576, 0xE577, 0xE578,
+ 0x6F50, 0xE579, 0xE57A,      0,      0, 0x6F51,      0, 0x6F52,
+      0,      0,      0,      0, 0x6F55, 0x6F53, 0x6F56, 0x6F58,
+};
+const unsigned short utf8_to_euc_E992[] = {
+      0, 0x6F57,      0, 0xE57C, 0xE57B,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E995[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0x4439,
+ 0xE57D, 0xE57E,      0,      0,      0,      0, 0xE621,      0,
+};
+const unsigned short utf8_to_euc_E996[] = {
+ 0x4C67,      0, 0x6F59, 0x412E, 0xE622,      0,      0, 0x6F5A,
+ 0xE623, 0x4A44, 0x6F5B, 0x332B, 0xE624, 0xE625, 0xE626, 0x313C,
+      0, 0x3457, 0xF471, 0x3456, 0x6F5C,      0, 0x6F5D,      0,
+ 0x6F5E, 0x6F5F,      0,      0,      0, 0xE627, 0xE628, 0xE629,
+ 0x6F60, 0xE62A, 0x3458, 0x3355, 0x395E, 0x4836, 0xE62B, 0x6F62,
+ 0x6F61, 0xE62C,      0, 0xE62D, 0xE62E, 0x6F63,      0,      0,
+      0,      0, 0x315C,      0, 0xE62F,      0, 0xE630,      0,
+      0, 0x6F66, 0xE631, 0x6F65, 0x6F64, 0xE632, 0x6F67, 0xE633,
+};
+const unsigned short utf8_to_euc_E997[] = {
+      0,      0,      0, 0x6F6A,      0,      0, 0xE634, 0x3047,
+ 0xE635, 0xE636, 0x6F68, 0xE637, 0x6F6C, 0x6F6B,      0,      0,
+ 0xE638, 0xE639, 0xE63A, 0xE63B, 0x6F6E, 0x6F6D, 0x6F6F,      0,
+ 0x462E, 0xE63C, 0xE63D,      0, 0x6F70, 0xE63E, 0xE63F, 0xE640,
+ 0xE641, 0x6F71, 0x6F73,      0, 0xE642, 0x6F72, 0xE643,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E998[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0x496C, 0xE644, 0xE645,      0,
+      0, 0x6F74, 0xE646,      0, 0xE647, 0xE648, 0xE649,      0,
+ 0x6F75,      0, 0x3A65,      0, 0xE64A,      0, 0x6F76, 0x6F77,
+      0, 0xE64B, 0x4B49, 0xE64C,      0,      0,      0, 0xE64D,
+ 0xE64E, 0xE64F, 0xE650, 0x414B, 0xE651, 0xE652,      0, 0x3024,
+};
+const unsigned short utf8_to_euc_E999[] = {
+ 0x424B, 0xE653, 0x6F78,      0, 0x496D,      0,      0,      0,
+      0,      0,      0, 0x6F7B, 0x6F79, 0x395F,      0, 0x6F7A,
+ 0x3842,      0, 0xE654,      0, 0xE655,      0, 0xE656, 0xE657,
+ 0xE658,      0,      0, 0x4A45, 0x6F7D, 0x7021, 0x6F7E, 0x7022,
+      0, 0xE659, 0x3121, 0x3F58, 0x3D7C, 0x3459, 0x7023,      0,
+      0,      0, 0x4766,      0, 0x7025,      0, 0xE65A,      0,
+ 0x3122,      0, 0x7024, 0x4444, 0xE65B, 0x4E4D, 0x462B, 0x6F7C,
+ 0x4E26,      0, 0x3831, 0xE65C, 0xE65D, 0x4D5B, 0xE65E, 0xE65F,
+};
+const unsigned short utf8_to_euc_E99A[] = {
+      0, 0xE660, 0xE661, 0xE662, 0xE663, 0x3679, 0x4E34,      0,
+ 0x3728, 0xE664, 0x4262, 0x6721,      0, 0x7026, 0x332C, 0x3F6F,
+      0, 0xE665,      0,      0, 0x3356, 0x7028, 0xE666, 0x7029,
+ 0x7027, 0x3764, 0xE667, 0x3A5D, 0x3E63, 0xE668,      0, 0xE669,
+ 0x3123,      0,      0, 0x4E59, 0xE66A, 0xE66B, 0xE66C, 0x702B,
+ 0x6E2E, 0xE66D, 0x702A,      0,      0,      0, 0xE66E, 0xE66F,
+ 0x702E, 0x702C, 0x702D, 0xE670, 0x702F,      0, 0x7030, 0x4E6C,
+ 0x7031, 0x7032, 0xE671, 0x4049, 0x483B,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E99B[] = {
+ 0x3F7D, 0x3467,      0,      0, 0x4D3A, 0x326D, 0x3D38, 0x385B,
+      0, 0x7035, 0xE672, 0x7034, 0x3B73, 0x7036, 0x7033,      0,
+      0, 0x3B28, 0xE673,      0,      0, 0x703A, 0x6A2D,      0,
+ 0xE675, 0x5256, 0xE676, 0x3F77, 0x7038, 0xE677, 0xE678, 0xE679,
+      0,      0, 0x4E25, 0x4671,      0,      0,      0,      0,
+ 0x312B, 0xE67A, 0x4063, 0x3C36,      0,      0,      0, 0xE67B,
+ 0x4A37, 0xE67C, 0x3140,      0,      0,      0, 0x4E6D, 0x4D6B,
+      0, 0x703B, 0xE67D, 0x4545,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E99C[] = {
+ 0x3C7B,      0, 0xE67E, 0xE721, 0x703C, 0xE722, 0x703D, 0x3F4C,
+ 0x703E, 0xE723, 0x4E6E,      0,      0, 0x7039, 0x7040, 0x7042,
+      0, 0x7041,      0, 0x703F,      0,      0, 0x7043,      0,
+      0, 0x7044, 0xE724, 0xE725, 0x417A, 0xE726, 0x3262,      0,
+      0, 0xE727, 0xE728, 0xE729, 0x7045,      0,      0, 0x4C38,
+ 0xE72A,      0, 0x7046,      0,      0,      0,      0,      0,
+ 0x7047, 0xE72B, 0x4F2A, 0xE72C,      0,      0,      0,      0,
+ 0x5B31, 0x7048,      0, 0xF474,      0, 0x7049, 0x704A,      0,
+};
+const unsigned short utf8_to_euc_E99D[] = {
+      0, 0xE72D, 0x704E, 0xE72E, 0x704B,      0, 0x704C,      0,
+ 0x704D, 0x704F, 0xE72F,      0,      0, 0xF475, 0xE730, 0xE731,
+      0, 0xF476, 0x4044,      0,      0, 0xE732, 0x4C77, 0xE733,
+ 0xE734, 0x4045, 0xE735, 0xE736, 0x7050,      0, 0x4873,      0,
+ 0x7051, 0x7353, 0x4C4C, 0xE737, 0x7052,      0, 0x7053, 0xE738,
+ 0x7054, 0x3357, 0xE739, 0x7056,      0, 0x3F59, 0xE73A,      0,
+      0, 0x7057,      0, 0xE73B, 0x3724,      0, 0xE73C, 0xE73D,
+ 0xE73E, 0x7058, 0x705C, 0xE73F, 0x705A, 0xE740,      0, 0xE741,
+};
+const unsigned short utf8_to_euc_E99E[] = {
+ 0xE742, 0x705B,      0,      0, 0x3373, 0x7059, 0x705D,      0,
+      0, 0xE743,      0, 0x705E,      0, 0x3048,      0, 0x705F,
+ 0x7060,      0,      0,      0,      0, 0xE744, 0xE745, 0xE746,
+ 0x3E64, 0xE747, 0xE748,      0, 0x7061,      0, 0xE749, 0xE74A,
+ 0x3547,      0, 0xE74B, 0x7064,      0,      0, 0x7063,      0,
+ 0x7062,      0,      0, 0x6B71, 0xE74C, 0x4A5C, 0xE74D,      0,
+      0, 0xE74E, 0xE74F, 0x7065, 0x7066, 0xE750, 0xE751,      0,
+ 0xE752, 0xE753, 0xE754,      0, 0xE755,      0, 0xE756, 0xE757,
+};
+const unsigned short utf8_to_euc_E99F[] = {
+      0, 0xE758,      0, 0x7067, 0xE759, 0xE75A, 0x7068, 0xE75B,
+ 0x7069, 0xE75C, 0xE75D, 0x706A, 0xE75E, 0xE75F, 0xE760,      0,
+ 0xE761, 0xE762,      0, 0x345A, 0xE763,      0,      0, 0xE764,
+ 0xE765, 0xE766,      0, 0xE76A, 0x706B, 0xE767, 0xE768,      0,
+ 0xE769, 0xE76B,      0,      0, 0xE76C,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x706C, 0x4723, 0xE76D,
+      0, 0xE76E, 0x706E, 0x323B, 0xE76F, 0x7071, 0x7070, 0xE770,
+ 0xE771,      0, 0xE772, 0x3124,      0,      0,      0, 0x3641,
+};
+const unsigned short utf8_to_euc_E9A0[] = {
+      0, 0x4A47, 0x443A, 0x3A22,      0, 0x3960, 0x3D67, 0xE773,
+ 0x3F5C,      0, 0xE774,      0, 0x7073, 0xE776, 0xE777, 0x7072,
+ 0x4D42, 0x3468, 0x4852, 0x465C, 0xE778,      0, 0xE779, 0x3F7C,
+ 0x4E4E, 0xE775, 0x375B,      0, 0xE77A,      0, 0xE77B,      0,
+ 0xE77C, 0x7076,      0, 0xE77D, 0x7075, 0xE828, 0xE77E,      0,
+      0,      0,      0, 0xE821, 0x4B4B, 0x462C, 0xE822, 0xE823,
+ 0xE824,      0, 0xE825, 0xE826, 0x3150, 0xE827,      0, 0x7077,
+ 0x7074,      0,      0, 0x4951, 0x4D6A, 0x7078, 0xE829,      0,
+};
+const unsigned short utf8_to_euc_E9A1[] = {
+      0,      0,      0,      0, 0xE82A,      0, 0x7079, 0xE82B,
+      0,      0, 0xE82C, 0x707B, 0x426A, 0x335B, 0x335C, 0x707A,
+      0, 0xE82D, 0xE82E, 0xE82F, 0x3469, 0x3832, 0xE830, 0xE831,
+ 0x346A, 0xE832, 0xE833, 0x453F,      0,      0, 0x4E60,      0,
+      0,      0, 0xE834, 0xE835,      0, 0xE836, 0xE837, 0x385C,
+      0,      0, 0xE838, 0x707C, 0xE839,      0,      0, 0x707D,
+ 0x707E, 0x7121,      0, 0x7123, 0x7122,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E9A2[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x4977,      0, 0x7124, 0xE83A,      0, 0xE83B, 0xE83C, 0x7125,
+ 0xE83D, 0x7126,      0,      0, 0xE83E,      0, 0x7127, 0xE83F,
+ 0xE840,      0, 0xE841, 0xE842,      0,      0,      0, 0xE843,
+};
+const unsigned short utf8_to_euc_E9A3[] = {
+      0,      0, 0xE844, 0x7129, 0x7128, 0xE845, 0x712A,      0,
+ 0xE846,      0,      0,      0, 0xE847,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0x4874, 0x664C,      0,      0, 0x3F29,
+      0, 0xE848, 0x3532, 0xE849,      0, 0xE84A, 0xE84B, 0xE84C,
+      0, 0x712B, 0xE84D, 0x712C,      0, 0x522C, 0x5D3B, 0x4853,
+      0,      0, 0x307B, 0xE84E, 0x303B,      0, 0xE84F,      0,
+      0,      0,      0,      0, 0x3B74, 0x4B30, 0x3E7E,      0,
+};
+const unsigned short utf8_to_euc_E9A4[] = {
+      0,      0, 0xE850, 0x712D,      0, 0x4C5F,      0, 0xE851,
+ 0xE852, 0x712E, 0x4D5C,      0, 0x3142,      0,      0,      0,
+ 0x3B41, 0xE853, 0x712F, 0x326E, 0x7130, 0xE854, 0xE855, 0xE856,
+ 0x7131,      0, 0xE857, 0xE858, 0xE859, 0x7133, 0x7134, 0xE85A,
+ 0x7136, 0x7132, 0xE85B,      0, 0x7135,      0, 0xE85C, 0xE85D,
+ 0x345B,      0,      0, 0xE85E, 0x7137,      0, 0x7138,      0,
+      0, 0xE85F, 0xE860, 0xE861, 0xE862, 0xE863,      0,      0,
+      0, 0xE864, 0xE865, 0xE866, 0xE867, 0x7139, 0x713A,      0,
+};
+const unsigned short utf8_to_euc_E9A5[] = {
+ 0xE868, 0xE869, 0x713B,      0,      0, 0x713D, 0xE86A, 0xE86B,
+ 0xE86C, 0x713C,      0, 0x713F, 0x7142, 0xE86D, 0xE86E,      0,
+ 0x713E, 0x7140, 0x7141,      0, 0xE86F, 0x7143,      0, 0x3642,
+ 0xE870, 0xE871,      0, 0xE872, 0xE873,      0, 0xE874, 0xE875,
+ 0xE876,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E9A6[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0x3C73, 0x7144,
+ 0x7145, 0x3961,      0, 0xE877,      0, 0xE878, 0xF47A, 0xE879,
+      0,      0,      0,      0,      0, 0x7146, 0xE87A,      0,
+ 0x333E,      0,      0,      0, 0x474F, 0x7147, 0x7148,      0,
+ 0xE87B, 0xE87C, 0xE87D, 0x435A, 0x466B, 0xE87E,      0,      0,
+      0, 0xE921, 0xE922,      0, 0x7149, 0xE923,      0, 0xE924,
+};
+const unsigned short utf8_to_euc_E9A7[] = {
+      0, 0x477D,      0, 0xE925, 0x424C, 0x3158, 0x366E,      0,
+ 0x366F, 0xE926,      0,      0,      0,      0,      0,      0,
+ 0x4373, 0x714E, 0x3670, 0xE927, 0xE928, 0x326F,      0,      0,
+ 0x714D, 0xE929, 0xE92A, 0x714B, 0xE92B, 0x714C, 0xE92C, 0x714A,
+      0,      0, 0x7158,      0,      0,      0,      0, 0xE92D,
+      0,      0, 0xE92E, 0xE92F, 0xE930, 0x714F, 0x7150,      0,
+ 0xE931, 0x7151, 0x7152,      0, 0xE932, 0xE933,      0,      0,
+ 0x7154, 0xE934,      0, 0x7153,      0, 0xE935, 0xE936, 0x3D59,
+};
+const unsigned short utf8_to_euc_E9A8[] = {
+      0, 0x7155, 0xE937, 0xE938, 0xE939, 0x7157,      0,      0,
+      0,      0,      0, 0xE93A, 0xE93B,      0, 0x3533, 0x7156,
+ 0xE93C, 0xE93D, 0x417B, 0x3833,      0,      0, 0xE93E,      0,
+      0, 0x7159,      0,      0,      0,      0, 0xE93F,      0,
+ 0xE940,      0, 0xE941, 0xE942, 0xE943,      0,      0, 0xE944,
+ 0x424D,      0,      0, 0x715A,      0, 0xE945, 0xE946,      0,
+ 0x462D,      0,      0, 0xE947,      0, 0xE948, 0xE949, 0x715B,
+ 0xE94A,      0,      0,      0,      0,      0, 0x7160,      0,
+};
+const unsigned short utf8_to_euc_E9A9[] = {
+ 0x715E, 0xE94C, 0x715D, 0x715F, 0xE94D, 0x715C,      0, 0xE94B,
+      0,      0, 0xE94E, 0xE94F, 0xE950, 0x7162, 0xE951,      0,
+      0, 0xE952,      0,      0, 0xE953, 0x7161, 0xE954, 0x7164,
+      0,      0, 0x3643, 0x7163,      0, 0xE955,      0, 0x7165,
+      0,      0, 0x7166,      0, 0x7168, 0x7167,      0,      0,
+      0, 0x7169, 0x716B, 0x716A,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E9AA[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x397C,      0, 0xE956,      0, 0xE957, 0x716C, 0xE958, 0xE959,
+ 0x716D,      0, 0xE95A,      0, 0xE95B, 0xE95C, 0xE95D,      0,
+ 0x333C, 0xE95E,      0, 0xE95F, 0x716E,      0, 0xE960, 0xE961,
+};
+const unsigned short utf8_to_euc_E9AB[] = {
+ 0x716F, 0xE962,      0, 0xE963, 0x3F71,      0, 0xE964,      0,
+ 0xE965,      0,      0,      0,      0,      0, 0xE966, 0x7170,
+ 0xE967, 0x7171, 0xE968, 0x7172, 0x7173, 0xE969, 0xE96A, 0xE96B,
+ 0x3962, 0xF47B,      0, 0xE96C, 0xE96D,      0, 0x7174, 0x7175,
+ 0xE96E,      0, 0x7176, 0x7177, 0xE96F, 0xE970, 0x7178, 0xE971,
+      0, 0xE972, 0x4831, 0x717A, 0xE973, 0x4926, 0x717B, 0x7179,
+      0, 0x717D, 0xE974, 0xE975, 0x717C, 0xE976,      0, 0x717E,
+      0, 0xE977, 0xE978, 0x7221,      0, 0xE979,      0, 0xE97A,
+};
+const unsigned short utf8_to_euc_E9AC[] = {
+ 0xE97B, 0xE97C, 0xE97D, 0xE97E, 0xEA21, 0xEA22, 0x7222,      0,
+ 0xEA23, 0xEA24,      0, 0xEA25, 0xEA26, 0xEA27, 0xEA28,      0,
+ 0xEA29,      0, 0xEA2A,      0,      0,      0, 0xEA2B,      0,
+ 0x7223, 0xEA2C, 0x7224, 0xEA2D, 0xEA2E,      0,      0, 0x7225,
+ 0xEA2F,      0, 0x7226, 0x7227,      0, 0x7228, 0xEA30, 0x7229,
+ 0x722A, 0x722B, 0x722C, 0xEA31,      0, 0xEA32, 0x722D, 0x722E,
+      0, 0x5D35, 0x722F, 0xEA33, 0xEA34, 0xEA35,      0, 0xEA36,
+      0, 0xEA37, 0xEA38, 0x6478, 0x3534, 0xEA39,      0,      0,
+};
+const unsigned short utf8_to_euc_E9AD[] = {
+      0, 0x3321, 0x3A32, 0x7231, 0x7230, 0x4C25,      0,      0,
+ 0xEA3A,      0,      0, 0xEA3B, 0xEA3C, 0x7233, 0x7234, 0x7232,
+      0, 0x7235,      0,      0, 0x4B62, 0xEA3D, 0xEA3E, 0xEA3F,
+ 0x7236,      0, 0x357B, 0xEA40,      0,      0, 0xEA41,      0,
+      0, 0xEA42,      0, 0xEA43,      0, 0xEA44, 0xEA45,      0,
+ 0xEA46,      0, 0xEA47, 0xEA48, 0xEA49, 0xEA4A, 0xEA4B, 0x4F25,
+      0,      0, 0xF47C, 0xEA4C, 0x7237, 0xEA4D,      0, 0xEA4E,
+ 0xEA4F, 0xEA50,      0,      0,      0,      0,      0, 0xEA51,
+};
+const unsigned short utf8_to_euc_E9AE[] = {
+ 0xEA52,      0,      0, 0x7239, 0xEA53, 0xEA54, 0xEA55, 0xEA56,
+      0, 0xEA57, 0xEA58, 0xEA59,      0, 0xEA5A, 0x303E, 0xEA5B,
+ 0xEA5C, 0x723A, 0x4A2B, 0x7238, 0xEA5D,      0, 0x723B, 0x723C,
+      0,      0, 0xEA5E,      0,      0, 0xEA5F, 0xEA60, 0x723D,
+ 0x723E,      0,      0,      0,      0,      0, 0xEA61, 0xEA62,
+ 0x723F, 0xEA63, 0x4B6E, 0x3B2D, 0xEA64, 0x3A7A, 0x412F,      0,
+ 0xEA65, 0xEA66, 0xEA67,      0, 0x7240,      0,      0, 0xEA68,
+ 0xEA69, 0x7243,      0, 0xEA6A, 0xEA6B,      0, 0xEA6C, 0xEA6D,
+};
+const unsigned short utf8_to_euc_E9AF[] = {
+ 0x7241, 0xEA6E,      0,      0,      0,      0, 0x7244, 0xEA6F,
+ 0xEA70, 0x3871, 0x7242,      0,      0,      0, 0xEA71, 0x7245,
+ 0xEA72, 0x7246, 0x7247,      0, 0x724B,      0, 0x3B2A, 0xEA73,
+ 0xEA74,      0,      0, 0x4264,      0, 0xEA75,      0, 0xEA76,
+      0, 0x724C, 0x7249, 0x7248, 0x724A, 0xEA77,      0, 0xEA78,
+ 0x375F,      0, 0xEA79, 0xEA7A,      0,      0,      0, 0xEA7B,
+ 0x7250, 0x724F, 0x724E, 0xEA7C,      0, 0x3033,      0, 0xEA7D,
+ 0xEA7E, 0xEB21, 0xEB22,      0,      0, 0xEB23,      0, 0xEB24,
+};
+const unsigned short utf8_to_euc_E9B0[] = {
+ 0xEB25,      0, 0xEB26,      0, 0x725A,      0, 0x7256,      0,
+ 0x7257, 0x7253, 0x7259, 0xEB27, 0x7255, 0x3362,      0, 0xEB28,
+ 0x4F4C, 0xEB29, 0x7258, 0x7254, 0x7252, 0x7251, 0xEB2A,      0,
+ 0xEB2B, 0xEB2C, 0xEB2D, 0x725C, 0xEB2E,      0, 0xEB2F,      0,
+      0, 0x725F, 0xEB30, 0xEB31, 0x725E, 0x725D, 0xEB32, 0xEB33,
+ 0xEB34, 0xEB35, 0xEB36,      0,      0, 0x4949, 0x725B, 0x3073,
+ 0x7260, 0xEB37, 0x7262,      0,      0, 0xEB38, 0xEB39, 0xEB3A,
+      0, 0x336F, 0x724D, 0x3137,      0, 0xEB3B, 0x7264,      0,
+};
+const unsigned short utf8_to_euc_E9B1[] = {
+      0, 0xEB3C,      0, 0xEB3D, 0xEB3E, 0xEB3F, 0x7263, 0x7261,
+ 0x432D, 0xEB40, 0xEB41,      0,      0,      0, 0xEB42, 0xEB43,
+ 0xEB44,      0, 0x4B70, 0xEB45, 0xEB46,      0, 0xEB47, 0x4E5A,
+ 0xEB48,      0, 0x7265, 0xEB49, 0xEB50, 0xEB4A, 0xEB4B, 0xEB4C,
+ 0x7266,      0,      0, 0xEB4D,      0,      0,      0, 0x7267,
+ 0xEB52, 0xEB4E, 0xEB4F, 0xEB51,      0,      0, 0xEB53,      0,
+ 0xEB54,      0, 0xEB55,      0,      0, 0xEB56, 0x7268, 0xEB57,
+ 0x7269,      0,      0, 0xEB58,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E9B3[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x443B, 0xEB59, 0x726A,
+      0, 0x4837,      0, 0x726F, 0x726B,      0,      0,      0,
+ 0x726C,      0, 0xEB5A, 0x4B31, 0x4C44,      0, 0x4650, 0xEB5B,
+      0, 0xEB5C,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E9B4[] = {
+      0,      0, 0xEB5E, 0x7270,      0,      0, 0x7271, 0x463E,
+ 0x726E, 0x726D,      0, 0xEB5D,      0,      0, 0x322A,      0,
+      0, 0xEB5F, 0x7279,      0,      0, 0x7278,      0, 0xEB60,
+ 0xEB61,      0,      0, 0x3175, 0xEB62, 0xEB63, 0xEB64, 0x7276,
+      0,      0,      0, 0x7275,      0,      0, 0x7273,      0,
+ 0x337B,      0, 0x7272, 0x3C32, 0x3229,      0,      0, 0xEB65,
+ 0xEB66,      0, 0xEB67, 0xEB68, 0xEB69,      0,      0,      0,
+      0,      0, 0xEB6A, 0x3963, 0xEB6B, 0xEB6D, 0x727C, 0x727B,
+};
+const unsigned short utf8_to_euc_E9B5[] = {
+      0, 0x727A, 0xEB6E, 0xEB6F, 0x7277, 0xEB6C, 0x727D, 0xEB70,
+ 0x727E,      0, 0xEB71,      0,      0,      0,      0,      0,
+ 0x7325, 0x7324,      0, 0xEB72, 0xEB73,      0,      0,      0,
+      0, 0x7326,      0,      0, 0x312D, 0x7321, 0x7322, 0xEB74,
+ 0x3974, 0x4C39, 0xEB76, 0xEB75, 0x7323, 0xEB77,      0,      0,
+      0, 0xEB78, 0xEB79, 0xEB7A, 0x4B32,      0,      0, 0x732B,
+ 0xEB7B,      0, 0x7327,      0,      0,      0, 0xEB7C, 0xEB7D,
+      0,      0, 0x732C, 0xEB7E, 0xEC21,      0, 0xEC22,      0,
+};
+const unsigned short utf8_to_euc_E9B6[] = {
+      0,      0,      0, 0xEC23, 0xEC24,      0, 0xEC25, 0x7329,
+      0, 0x7328, 0xEC26,      0,      0, 0xEC27, 0xEC28, 0x375C,
+      0,      0, 0xEC29, 0xEC2A,      0, 0xEC2B, 0xEC2C, 0xEC2D,
+ 0xEC2E,      0, 0x732D,      0,      0,      0,      0,      0,
+      0, 0xEC2F,      0,      0, 0x732E,      0,      0,      0,
+      0, 0x732F, 0xEC30, 0x732A, 0xEC31,      0, 0xEC32, 0x7274,
+      0, 0xEC33, 0x7330,      0, 0x4461, 0xEC34,      0,      0,
+ 0x7334, 0xEC35, 0x7335, 0x7333, 0xEC36,      0,      0, 0xEC37,
+};
+const unsigned short utf8_to_euc_E9B7[] = {
+      0, 0x7332, 0x7338, 0xEC38, 0x7331,      0, 0x7336, 0xEC39,
+      0, 0xEC3A, 0xEC3B,      0,      0,      0,      0, 0x7337,
+      0,      0,      0, 0x733A, 0xEC3C, 0xEC3D, 0xEC3E, 0xEC3F,
+      0, 0x7339, 0xEC40,      0,      0,      0, 0xEC41, 0xEC42,
+ 0xEC43,      0,      0,      0,      0, 0xEC44, 0x733C, 0xEC45,
+      0, 0xEC46,      0, 0xEC47,      0, 0x733D, 0xEC48, 0x733E,
+ 0xEC49,      0, 0x4F49, 0xEC4A, 0xEC4B,      0,      0,      0,
+ 0x733B, 0x426B, 0x3A6D,      0,      0, 0x733F, 0xEC4C,      0,
+};
+const unsigned short utf8_to_euc_E9B8[] = {
+      0,      0, 0xEC4E,      0,      0,      0,      0, 0xEC4F,
+      0,      0, 0xEC4D,      0,      0,      0, 0xEC50,      0,
+ 0xEC51, 0xEC52, 0xEC53,      0,      0, 0xEC54, 0xEC55,      0,
+      0, 0xEC56, 0x7340, 0x7341, 0xEC57, 0xEC58, 0x7342,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_E9B9[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x7343,      0,      0,
+ 0x3834, 0x7344, 0xEC59, 0xEC5A, 0xEC5B, 0x7345,      0, 0x3C2F,
+};
+const unsigned short utf8_to_euc_E9BA[] = {
+ 0xEC5C, 0x7346, 0xEC5D, 0xEC5E, 0xEC5F, 0xEC60,      0, 0xEC61,
+ 0x7347,      0,      0, 0x7348, 0x7349,      0, 0xEC62, 0xEC63,
+      0, 0x734C, 0x734A, 0x4F3C,      0, 0x734B, 0xEC64, 0x4E6F,
+ 0xEC65,      0,      0, 0xEC66,      0, 0x734D, 0xEC67, 0x4E5B,
+      0,      0,      0,      0, 0xEC68, 0x734E, 0x477E,      0,
+ 0xEC69, 0x734F, 0x7351,      0, 0xEC6A, 0x7352, 0xEC6B, 0xEC6C,
+ 0xEC6D,      0,      0, 0xEC6E, 0xEC6F, 0xEC70,      0,      0,
+ 0x7350, 0x396D, 0x4C4D, 0x4B63, 0x5677,      0, 0x5D60, 0x4B7B,
+};
+const unsigned short utf8_to_euc_E9BB[] = {
+      0,      0,      0,      0, 0x322B,      0, 0xEC71,      0,
+ 0xEC72,      0,      0, 0xEC73, 0x7354, 0x3550, 0x7355, 0x7356,
+ 0x7357, 0xF47E, 0x3975,      0, 0x7358, 0xEC74,      0,      0,
+ 0x6054, 0x4C5B,      0, 0x4263, 0x7359, 0x735B, 0x735A, 0xEC75,
+ 0x735C,      0,      0,      0, 0xEC76, 0x735D,      0, 0xEC77,
+ 0x735E,      0,      0,      0, 0xEC78, 0xEC79, 0xEC7A, 0x735F,
+ 0xEC7B, 0xEC7C, 0xEC7D,      0, 0x7360, 0xEC7E, 0x7361, 0x7362,
+ 0xED21, 0x7363,      0, 0x7364, 0x7365, 0x7366,      0, 0xED22,
+};
+const unsigned short utf8_to_euc_E9BC[] = {
+      0,      0, 0xED23, 0xED24,      0,      0,      0, 0x7367,
+ 0x7368, 0xED25,      0,      0,      0,      0, 0x4524, 0xED26,
+ 0xED27, 0xED28, 0xED29, 0x385D, 0xED2A, 0x736A, 0xED2B, 0xED2C,
+      0, 0xED2D, 0xED2E, 0xED2F,      0,      0,      0, 0xED30,
+ 0x414D, 0x736B, 0xED31,      0,      0,      0, 0xED32,      0,
+      0,      0, 0xED33, 0xED34, 0x736C,      0,      0, 0xED35,
+      0, 0xED36, 0xED37,      0, 0xED38,      0,      0, 0xED39,
+      0, 0xED3A, 0xED3B, 0x4921, 0xED3C, 0xED3D, 0x736D, 0xED3E,
+};
+const unsigned short utf8_to_euc_E9BD[] = {
+      0, 0xED3F,      0, 0xED40, 0xED41, 0xED42, 0xED43, 0xED44,
+      0,      0, 0x736E, 0x6337,      0,      0, 0x6C5A, 0x706D,
+      0,      0, 0x736F, 0xED45, 0x7370, 0xED46, 0xED47, 0xED48,
+ 0xED49,      0, 0xED4A,      0,      0, 0xED4B, 0xED4C, 0x7372,
+ 0x7373, 0x7374, 0x4E70, 0x7371,      0,      0, 0x7375, 0x7376,
+ 0xED4D, 0xED4E, 0x7378,      0, 0x7377, 0xED4F, 0xED50, 0xED51,
+ 0xED52, 0xED53, 0x737A, 0xED54,      0, 0xED55, 0x737B, 0x7379,
+      0,      0, 0xED56,      0,      0, 0xED57,      0,      0,
+};
+const unsigned short utf8_to_euc_E9BE[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0x4E36,      0, 0xED58,
+ 0xED59, 0xED5A, 0xED5B,      0, 0xED5C, 0x737C, 0xED5D, 0xED5E,
+      0,      0,      0,      0, 0x737D, 0x6354, 0xED5F,      0,
+ 0x737E, 0xED60, 0xED61, 0xED62,      0, 0xED63,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_EFA4[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xF445,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_EFA7[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xF472,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_EFA8[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xF434, 0xF437,
+ 0xF438, 0xF43D, 0xF444, 0xF447, 0xF448, 0xF44E, 0xF44F, 0xF453,
+ 0xF455, 0xF456, 0xF457, 0xF458, 0xF45A, 0xF45B, 0xF45E, 0xF460,
+ 0xF462, 0xF463, 0xF465, 0xF469, 0xF46A, 0xF46B, 0xF46D, 0xF46F,
+ 0xF470, 0xF473, 0xF477, 0xF478, 0xF479, 0xF47D,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_EFBC[] = {
+      0, 0x212A, 0xF42A, 0x2174, 0x2170, 0x2173, 0x2175, 0xF429,
+ 0x214A, 0x214B, 0x2176, 0x215C, 0x2124, 0x215D, 0x2125, 0x213F,
+ 0x2330, 0x2331, 0x2332, 0x2333, 0x2334, 0x2335, 0x2336, 0x2337,
+ 0x2338, 0x2339, 0x2127, 0x2128, 0x2163, 0x2161, 0x2164, 0x2129,
+ 0x2177, 0x2341, 0x2342, 0x2343, 0x2344, 0x2345, 0x2346, 0x2347,
+ 0x2348, 0x2349, 0x234A, 0x234B, 0x234C, 0x234D, 0x234E, 0x234F,
+ 0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357,
+ 0x2358, 0x2359, 0x235A, 0x214E, 0x2140, 0x214F, 0x2130, 0x2132,
+};
+const unsigned short utf8_to_euc_EFBD[] = {
+ 0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
+ 0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
+ 0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
+ 0x2378, 0x2379, 0x237A, 0x2150, 0x2143, 0x2151, 0xA237,      0,
+      0, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
+ 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
+ 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
+ 0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
+};
+const unsigned short utf8_to_euc_EFBD_ms[] = {
+ 0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
+ 0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
+ 0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
+ 0x2378, 0x2379, 0x237A, 0x2150, 0x2143, 0x2151, 0x2141,      0,
+      0, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
+ 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
+ 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
+ 0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
+};
+const unsigned short utf8_to_euc_EFBE[] = {
+ 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
+ 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
+ 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
+ 0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0x0E5C, 0x0E5D, 0x0E5E, 0x0E5F,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short utf8_to_euc_EFBF[] = {
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0x2171, 0x2172, 0x224C, 0x2131, 0xA243, 0x216F,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short *const utf8_to_euc_E2[] = {
+ utf8_to_euc_E280,                0,                0,                0,
+ utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
+ utf8_to_euc_E288, utf8_to_euc_E289, utf8_to_euc_E28A,                0,
+ utf8_to_euc_E28C,                0,                0,                0,
+                0, utf8_to_euc_E291,                0,                0,
+ utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296, utf8_to_euc_E297,
+ utf8_to_euc_E298, utf8_to_euc_E299,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+};
+const unsigned short *const utf8_to_euc_E2_ms[] = {
+ utf8_to_euc_E280_ms,                0,                0,                0,
+ utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
+ utf8_to_euc_E288, utf8_to_euc_E289, utf8_to_euc_E28A,                0,
+ utf8_to_euc_E28C,                0,                0,                0,
+                0, utf8_to_euc_E291,                0,                0,
+ utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296, utf8_to_euc_E297,
+ utf8_to_euc_E298, utf8_to_euc_E299,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+};
+const unsigned short *const utf8_to_euc_E2_932[] = {
+ utf8_to_euc_E280_932,                0,                0,                0,
+ utf8_to_euc_E284, utf8_to_euc_E285, utf8_to_euc_E286, utf8_to_euc_E287,
+ utf8_to_euc_E288_932, utf8_to_euc_E289, utf8_to_euc_E28A,                0,
+ utf8_to_euc_E28C,                0,                0,                0,
+                0, utf8_to_euc_E291,                0,                0,
+ utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296, utf8_to_euc_E297,
+ utf8_to_euc_E298, utf8_to_euc_E299,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+};
+const unsigned short *const utf8_to_euc_E3[] = {
+ utf8_to_euc_E380, utf8_to_euc_E381, utf8_to_euc_E382, utf8_to_euc_E383,
+                0,                0,                0,                0,
+ utf8_to_euc_E388,                0, utf8_to_euc_E38A,                0,
+ utf8_to_euc_E38C, utf8_to_euc_E38D, utf8_to_euc_E38E, utf8_to_euc_E38F,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+};
+const unsigned short *const utf8_to_euc_E3_932[] = {
+ utf8_to_euc_E380_932, utf8_to_euc_E381, utf8_to_euc_E382_932, utf8_to_euc_E383,
+                0,                0,                0,                0,
+ utf8_to_euc_E388,                0, utf8_to_euc_E38A,                0,
+ utf8_to_euc_E38C, utf8_to_euc_E38D, utf8_to_euc_E38E, utf8_to_euc_E38F,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+};
+const unsigned short *const utf8_to_euc_E4[] = {
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+ utf8_to_euc_E4B8, utf8_to_euc_E4B9, utf8_to_euc_E4BA, utf8_to_euc_E4BB,
+ utf8_to_euc_E4BC, utf8_to_euc_E4BD, utf8_to_euc_E4BE, utf8_to_euc_E4BF,
+};
+const unsigned short *const utf8_to_euc_E5[] = {
+ utf8_to_euc_E580, utf8_to_euc_E581, utf8_to_euc_E582, utf8_to_euc_E583,
+ utf8_to_euc_E584, utf8_to_euc_E585, utf8_to_euc_E586, utf8_to_euc_E587,
+ utf8_to_euc_E588, utf8_to_euc_E589, utf8_to_euc_E58A, utf8_to_euc_E58B,
+ utf8_to_euc_E58C, utf8_to_euc_E58D, utf8_to_euc_E58E, utf8_to_euc_E58F,
+ utf8_to_euc_E590, utf8_to_euc_E591, utf8_to_euc_E592, utf8_to_euc_E593,
+ utf8_to_euc_E594, utf8_to_euc_E595, utf8_to_euc_E596, utf8_to_euc_E597,
+ utf8_to_euc_E598, utf8_to_euc_E599, utf8_to_euc_E59A, utf8_to_euc_E59B,
+ utf8_to_euc_E59C, utf8_to_euc_E59D, utf8_to_euc_E59E, utf8_to_euc_E59F,
+ utf8_to_euc_E5A0, utf8_to_euc_E5A1, utf8_to_euc_E5A2, utf8_to_euc_E5A3,
+ utf8_to_euc_E5A4, utf8_to_euc_E5A5, utf8_to_euc_E5A6, utf8_to_euc_E5A7,
+ utf8_to_euc_E5A8, utf8_to_euc_E5A9, utf8_to_euc_E5AA, utf8_to_euc_E5AB,
+ utf8_to_euc_E5AC, utf8_to_euc_E5AD, utf8_to_euc_E5AE, utf8_to_euc_E5AF,
+ utf8_to_euc_E5B0, utf8_to_euc_E5B1, utf8_to_euc_E5B2, utf8_to_euc_E5B3,
+ utf8_to_euc_E5B4, utf8_to_euc_E5B5, utf8_to_euc_E5B6, utf8_to_euc_E5B7,
+ utf8_to_euc_E5B8, utf8_to_euc_E5B9, utf8_to_euc_E5BA, utf8_to_euc_E5BB,
+ utf8_to_euc_E5BC, utf8_to_euc_E5BD, utf8_to_euc_E5BE, utf8_to_euc_E5BF,
+};
+const unsigned short *const utf8_to_euc_E6[] = {
+ utf8_to_euc_E680, utf8_to_euc_E681, utf8_to_euc_E682, utf8_to_euc_E683,
+ utf8_to_euc_E684, utf8_to_euc_E685, utf8_to_euc_E686, utf8_to_euc_E687,
+ utf8_to_euc_E688, utf8_to_euc_E689, utf8_to_euc_E68A, utf8_to_euc_E68B,
+ utf8_to_euc_E68C, utf8_to_euc_E68D, utf8_to_euc_E68E, utf8_to_euc_E68F,
+ utf8_to_euc_E690, utf8_to_euc_E691, utf8_to_euc_E692, utf8_to_euc_E693,
+ utf8_to_euc_E694, utf8_to_euc_E695, utf8_to_euc_E696, utf8_to_euc_E697,
+ utf8_to_euc_E698, utf8_to_euc_E699, utf8_to_euc_E69A, utf8_to_euc_E69B,
+ utf8_to_euc_E69C, utf8_to_euc_E69D, utf8_to_euc_E69E, utf8_to_euc_E69F,
+ utf8_to_euc_E6A0, utf8_to_euc_E6A1, utf8_to_euc_E6A2, utf8_to_euc_E6A3,
+ utf8_to_euc_E6A4, utf8_to_euc_E6A5, utf8_to_euc_E6A6, utf8_to_euc_E6A7,
+ utf8_to_euc_E6A8, utf8_to_euc_E6A9, utf8_to_euc_E6AA, utf8_to_euc_E6AB,
+ utf8_to_euc_E6AC, utf8_to_euc_E6AD, utf8_to_euc_E6AE, utf8_to_euc_E6AF,
+ utf8_to_euc_E6B0, utf8_to_euc_E6B1, utf8_to_euc_E6B2, utf8_to_euc_E6B3,
+ utf8_to_euc_E6B4, utf8_to_euc_E6B5, utf8_to_euc_E6B6, utf8_to_euc_E6B7,
+ utf8_to_euc_E6B8, utf8_to_euc_E6B9, utf8_to_euc_E6BA, utf8_to_euc_E6BB,
+ utf8_to_euc_E6BC, utf8_to_euc_E6BD, utf8_to_euc_E6BE, utf8_to_euc_E6BF,
+};
+const unsigned short *const utf8_to_euc_E7[] = {
+ utf8_to_euc_E780, utf8_to_euc_E781, utf8_to_euc_E782, utf8_to_euc_E783,
+ utf8_to_euc_E784, utf8_to_euc_E785, utf8_to_euc_E786, utf8_to_euc_E787,
+ utf8_to_euc_E788, utf8_to_euc_E789, utf8_to_euc_E78A, utf8_to_euc_E78B,
+ utf8_to_euc_E78C, utf8_to_euc_E78D, utf8_to_euc_E78E, utf8_to_euc_E78F,
+ utf8_to_euc_E790, utf8_to_euc_E791, utf8_to_euc_E792, utf8_to_euc_E793,
+ utf8_to_euc_E794, utf8_to_euc_E795, utf8_to_euc_E796, utf8_to_euc_E797,
+ utf8_to_euc_E798, utf8_to_euc_E799, utf8_to_euc_E79A, utf8_to_euc_E79B,
+ utf8_to_euc_E79C, utf8_to_euc_E79D, utf8_to_euc_E79E, utf8_to_euc_E79F,
+ utf8_to_euc_E7A0, utf8_to_euc_E7A1, utf8_to_euc_E7A2, utf8_to_euc_E7A3,
+ utf8_to_euc_E7A4, utf8_to_euc_E7A5, utf8_to_euc_E7A6, utf8_to_euc_E7A7,
+ utf8_to_euc_E7A8, utf8_to_euc_E7A9, utf8_to_euc_E7AA, utf8_to_euc_E7AB,
+ utf8_to_euc_E7AC, utf8_to_euc_E7AD, utf8_to_euc_E7AE, utf8_to_euc_E7AF,
+ utf8_to_euc_E7B0, utf8_to_euc_E7B1, utf8_to_euc_E7B2, utf8_to_euc_E7B3,
+ utf8_to_euc_E7B4, utf8_to_euc_E7B5, utf8_to_euc_E7B6, utf8_to_euc_E7B7,
+ utf8_to_euc_E7B8, utf8_to_euc_E7B9, utf8_to_euc_E7BA,                0,
+ utf8_to_euc_E7BC, utf8_to_euc_E7BD, utf8_to_euc_E7BE, utf8_to_euc_E7BF,
+};
+const unsigned short *const utf8_to_euc_E8[] = {
+ utf8_to_euc_E880, utf8_to_euc_E881, utf8_to_euc_E882, utf8_to_euc_E883,
+ utf8_to_euc_E884, utf8_to_euc_E885, utf8_to_euc_E886, utf8_to_euc_E887,
+ utf8_to_euc_E888, utf8_to_euc_E889, utf8_to_euc_E88A, utf8_to_euc_E88B,
+ utf8_to_euc_E88C, utf8_to_euc_E88D, utf8_to_euc_E88E, utf8_to_euc_E88F,
+ utf8_to_euc_E890, utf8_to_euc_E891, utf8_to_euc_E892, utf8_to_euc_E893,
+ utf8_to_euc_E894, utf8_to_euc_E895, utf8_to_euc_E896, utf8_to_euc_E897,
+ utf8_to_euc_E898, utf8_to_euc_E899, utf8_to_euc_E89A, utf8_to_euc_E89B,
+ utf8_to_euc_E89C, utf8_to_euc_E89D, utf8_to_euc_E89E, utf8_to_euc_E89F,
+ utf8_to_euc_E8A0, utf8_to_euc_E8A1, utf8_to_euc_E8A2, utf8_to_euc_E8A3,
+ utf8_to_euc_E8A4, utf8_to_euc_E8A5, utf8_to_euc_E8A6, utf8_to_euc_E8A7,
+ utf8_to_euc_E8A8, utf8_to_euc_E8A9, utf8_to_euc_E8AA, utf8_to_euc_E8AB,
+ utf8_to_euc_E8AC, utf8_to_euc_E8AD, utf8_to_euc_E8AE,                0,
+ utf8_to_euc_E8B0, utf8_to_euc_E8B1, utf8_to_euc_E8B2, utf8_to_euc_E8B3,
+ utf8_to_euc_E8B4, utf8_to_euc_E8B5, utf8_to_euc_E8B6, utf8_to_euc_E8B7,
+ utf8_to_euc_E8B8, utf8_to_euc_E8B9, utf8_to_euc_E8BA, utf8_to_euc_E8BB,
+ utf8_to_euc_E8BC, utf8_to_euc_E8BD, utf8_to_euc_E8BE, utf8_to_euc_E8BF,
+};
+const unsigned short *const utf8_to_euc_E9[] = {
+ utf8_to_euc_E980, utf8_to_euc_E981, utf8_to_euc_E982, utf8_to_euc_E983,
+ utf8_to_euc_E984, utf8_to_euc_E985, utf8_to_euc_E986, utf8_to_euc_E987,
+ utf8_to_euc_E988, utf8_to_euc_E989, utf8_to_euc_E98A, utf8_to_euc_E98B,
+ utf8_to_euc_E98C, utf8_to_euc_E98D, utf8_to_euc_E98E, utf8_to_euc_E98F,
+ utf8_to_euc_E990, utf8_to_euc_E991, utf8_to_euc_E992,                0,
+                0, utf8_to_euc_E995, utf8_to_euc_E996, utf8_to_euc_E997,
+ utf8_to_euc_E998, utf8_to_euc_E999, utf8_to_euc_E99A, utf8_to_euc_E99B,
+ utf8_to_euc_E99C, utf8_to_euc_E99D, utf8_to_euc_E99E, utf8_to_euc_E99F,
+ utf8_to_euc_E9A0, utf8_to_euc_E9A1, utf8_to_euc_E9A2, utf8_to_euc_E9A3,
+ utf8_to_euc_E9A4, utf8_to_euc_E9A5, utf8_to_euc_E9A6, utf8_to_euc_E9A7,
+ utf8_to_euc_E9A8, utf8_to_euc_E9A9, utf8_to_euc_E9AA, utf8_to_euc_E9AB,
+ utf8_to_euc_E9AC, utf8_to_euc_E9AD, utf8_to_euc_E9AE, utf8_to_euc_E9AF,
+ utf8_to_euc_E9B0, utf8_to_euc_E9B1,                0, utf8_to_euc_E9B3,
+ utf8_to_euc_E9B4, utf8_to_euc_E9B5, utf8_to_euc_E9B6, utf8_to_euc_E9B7,
+ utf8_to_euc_E9B8, utf8_to_euc_E9B9, utf8_to_euc_E9BA, utf8_to_euc_E9BB,
+ utf8_to_euc_E9BC, utf8_to_euc_E9BD, utf8_to_euc_E9BE,                0,
+};
+const unsigned short *const utf8_to_euc_EF[] = {
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+ utf8_to_euc_EFA4,                0,                0, utf8_to_euc_EFA7,
+ utf8_to_euc_EFA8,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+ utf8_to_euc_EFBC, utf8_to_euc_EFBD, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
+};
+const unsigned short *const utf8_to_euc_EF_ms[] = {
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+ utf8_to_euc_EFA4,                0,                0, utf8_to_euc_EFA7,
+ utf8_to_euc_EFA8,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+                0,                0,                0,                0,
+ utf8_to_euc_EFBC, utf8_to_euc_EFBD_ms, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
+};
+const unsigned short *const utf8_to_euc_2bytes[] = {
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0, utf8_to_euc_C2, utf8_to_euc_C3,
+ utf8_to_euc_C4, utf8_to_euc_C5,              0, utf8_to_euc_C7,
+              0,              0,              0, utf8_to_euc_CB,
+              0,              0, utf8_to_euc_CE, utf8_to_euc_CF,
+ utf8_to_euc_D0, utf8_to_euc_D1,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+};
+const unsigned short *const utf8_to_euc_2bytes_ms[] = {
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0, utf8_to_euc_C2_ms, utf8_to_euc_C3,
+ utf8_to_euc_C4, utf8_to_euc_C5,              0, utf8_to_euc_C7,
+              0,              0,              0, utf8_to_euc_CB,
+              0,              0, utf8_to_euc_CE, utf8_to_euc_CF,
+ utf8_to_euc_D0, utf8_to_euc_D1,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+};
+const unsigned short *const utf8_to_euc_2bytes_932[] = {
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0, utf8_to_euc_C2_932, utf8_to_euc_C3_932,
+ utf8_to_euc_C4, utf8_to_euc_C5,              0, utf8_to_euc_C7,
+              0,              0,              0, utf8_to_euc_CB,
+              0,              0, utf8_to_euc_CE, utf8_to_euc_CF,
+ utf8_to_euc_D0, utf8_to_euc_D1,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+              0,              0,              0,              0,
+};
+const unsigned short *const *const utf8_to_euc_3bytes[] = {
+              0,              0, utf8_to_euc_E2, utf8_to_euc_E3,
+ utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
+ utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
+              0,              0,              0, utf8_to_euc_EF,
+};
+const unsigned short *const *const utf8_to_euc_3bytes_ms[] = {
+              0,              0, utf8_to_euc_E2_ms, utf8_to_euc_E3,
+ utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
+ utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
+              0,              0,              0, utf8_to_euc_EF_ms,
+};
+const unsigned short *const *const utf8_to_euc_3bytes_932[] = {
+              0,              0, utf8_to_euc_E2_932, utf8_to_euc_E3_932,
+ utf8_to_euc_E4, utf8_to_euc_E5, utf8_to_euc_E6, utf8_to_euc_E7,
+ utf8_to_euc_E8, utf8_to_euc_E9,              0,              0,
+              0,              0,              0, utf8_to_euc_EF_ms,
+};
+
+#ifdef UNICODE_NORMALIZATION
+
+/* Normalization Table by Apple */
+/* http://developer.apple.com/technotes/tn/tn1150table.html */
+
+const struct normalization_pair normalization_table[] = {
+    {{0xcd,0xbe},	{0x3b}},
+    {{0xc3,0x80},	{0x41,0xcc,0x80,0x00}},
+    {{0xc3,0x81},	{0x41,0xcc,0x81}},
+    {{0xc3,0x82},	{0x41,0xcc,0x82}},
+    {{0xe1,0xba,0xa6},	{0x41,0xcc,0x82,0xcc,0x80}},
+    {{0xe1,0xba,0xa4},	{0x41,0xcc,0x82,0xcc,0x81}},
+    {{0xe1,0xba,0xaa},	{0x41,0xcc,0x82,0xcc,0x83}},
+    {{0xe1,0xba,0xa8},	{0x41,0xcc,0x82,0xcc,0x89}},
+    {{0xc3,0x83},	{0x41,0xcc,0x83}},
+    {{0xc4,0x80},	{0x41,0xcc,0x84}},
+    {{0xc4,0x82},	{0x41,0xcc,0x86}},
+    {{0xe1,0xba,0xb0},	{0x41,0xcc,0x86,0xcc,0x80}},
+    {{0xe1,0xba,0xae},	{0x41,0xcc,0x86,0xcc,0x81}},
+    {{0xe1,0xba,0xb4},	{0x41,0xcc,0x86,0xcc,0x83}},
+    {{0xe1,0xba,0xb2},	{0x41,0xcc,0x86,0xcc,0x89}},
+    {{0xc7,0xa0},	{0x41,0xcc,0x87,0xcc,0x84}},
+    {{0xc3,0x84},	{0x41,0xcc,0x88}},
+    {{0xc7,0x9e},	{0x41,0xcc,0x88,0xcc,0x84}},
+    {{0xe1,0xba,0xa2},	{0x41,0xcc,0x89}},
+    {{0xc3,0x85},	{0x41,0xcc,0x8a}},
+    {{0xc7,0xba},	{0x41,0xcc,0x8a,0xcc,0x81}},
+    {{0xc7,0x8d},	{0x41,0xcc,0x8c}},
+    {{0xc8,0x80},	{0x41,0xcc,0x8f}},
+    {{0xc8,0x82},	{0x41,0xcc,0x91}},
+    {{0xe1,0xba,0xa0},	{0x41,0xcc,0xa3}},
+    {{0xe1,0xba,0xac},	{0x41,0xcc,0xa3,0xcc,0x82}},
+    {{0xe1,0xba,0xb6},	{0x41,0xcc,0xa3,0xcc,0x86}},
+    {{0xe1,0xb8,0x80},	{0x41,0xcc,0xa5}},
+    {{0xc4,0x84},	{0x41,0xcc,0xa8}},
+    {{0xe1,0xb8,0x82},	{0x42,0xcc,0x87}},
+    {{0xe1,0xb8,0x84},	{0x42,0xcc,0xa3}},
+    {{0xe1,0xb8,0x86},	{0x42,0xcc,0xb1}},
+    {{0xc4,0x86},	{0x43,0xcc,0x81}},
+    {{0xc4,0x88},	{0x43,0xcc,0x82}},
+    {{0xc4,0x8a},	{0x43,0xcc,0x87}},
+    {{0xc4,0x8c},	{0x43,0xcc,0x8c}},
+    {{0xc3,0x87},	{0x43,0xcc,0xa7}},
+    {{0xe1,0xb8,0x88},	{0x43,0xcc,0xa7,0xcc,0x81}},
+    {{0xe1,0xb8,0x8a},	{0x44,0xcc,0x87}},
+    {{0xc4,0x8e},	{0x44,0xcc,0x8c}},
+    {{0xe1,0xb8,0x8c},	{0x44,0xcc,0xa3}},
+    {{0xe1,0xb8,0x90},	{0x44,0xcc,0xa7}},
+    {{0xe1,0xb8,0x92},	{0x44,0xcc,0xad}},
+    {{0xe1,0xb8,0x8e},	{0x44,0xcc,0xb1}},
+    {{0xc3,0x88},	{0x45,0xcc,0x80}},
+    {{0xc3,0x89},	{0x45,0xcc,0x81}},
+    {{0xc3,0x8a},	{0x45,0xcc,0x82}},
+    {{0xe1,0xbb,0x80},	{0x45,0xcc,0x82,0xcc,0x80}},
+    {{0xe1,0xba,0xbe},	{0x45,0xcc,0x82,0xcc,0x81}},
+    {{0xe1,0xbb,0x84},	{0x45,0xcc,0x82,0xcc,0x83}},
+    {{0xe1,0xbb,0x82},	{0x45,0xcc,0x82,0xcc,0x89}},
+    {{0xe1,0xba,0xbc},	{0x45,0xcc,0x83}},
+    {{0xc4,0x92},	{0x45,0xcc,0x84}},
+    {{0xe1,0xb8,0x94},	{0x45,0xcc,0x84,0xcc,0x80}},
+    {{0xe1,0xb8,0x96},	{0x45,0xcc,0x84,0xcc,0x81}},
+    {{0xc4,0x94},	{0x45,0xcc,0x86}},
+    {{0xc4,0x96},	{0x45,0xcc,0x87}},
+    {{0xc3,0x8b},	{0x45,0xcc,0x88}},
+    {{0xe1,0xba,0xba},	{0x45,0xcc,0x89}},
+    {{0xc4,0x9a},	{0x45,0xcc,0x8c}},
+    {{0xc8,0x84},	{0x45,0xcc,0x8f}},
+    {{0xc8,0x86},	{0x45,0xcc,0x91}},
+    {{0xe1,0xba,0xb8},	{0x45,0xcc,0xa3}},
+    {{0xe1,0xbb,0x86},	{0x45,0xcc,0xa3,0xcc,0x82}},
+    {{0xe1,0xb8,0x9c},	{0x45,0xcc,0xa7,0xcc,0x86}},
+    {{0xc4,0x98},	{0x45,0xcc,0xa8}},
+    {{0xe1,0xb8,0x98},	{0x45,0xcc,0xad}},
+    {{0xe1,0xb8,0x9a},	{0x45,0xcc,0xb0}},
+    {{0xe1,0xb8,0x9e},	{0x46,0xcc,0x87}},
+    {{0xc7,0xb4},	{0x47,0xcc,0x81}},
+    {{0xc4,0x9c},	{0x47,0xcc,0x82}},
+    {{0xe1,0xb8,0xa0},	{0x47,0xcc,0x84}},
+    {{0xc4,0x9e},	{0x47,0xcc,0x86}},
+    {{0xc4,0xa0},	{0x47,0xcc,0x87}},
+    {{0xc7,0xa6},	{0x47,0xcc,0x8c}},
+    {{0xc4,0xa2},	{0x47,0xcc,0xa7}},
+    {{0xc4,0xa4},	{0x48,0xcc,0x82}},
+    {{0xe1,0xb8,0xa2},	{0x48,0xcc,0x87}},
+    {{0xe1,0xb8,0xa6},	{0x48,0xcc,0x88}},
+    {{0xe1,0xb8,0xa4},	{0x48,0xcc,0xa3}},
+    {{0xe1,0xb8,0xa8},	{0x48,0xcc,0xa7}},
+    {{0xe1,0xb8,0xaa},	{0x48,0xcc,0xae}},
+    {{0xc3,0x8c},	{0x49,0xcc,0x80}},
+    {{0xc3,0x8d},	{0x49,0xcc,0x81}},
+    {{0xc3,0x8e},	{0x49,0xcc,0x82}},
+    {{0xc4,0xa8},	{0x49,0xcc,0x83}},
+    {{0xc4,0xaa},	{0x49,0xcc,0x84}},
+    {{0xc4,0xac},	{0x49,0xcc,0x86}},
+    {{0xc4,0xb0},	{0x49,0xcc,0x87}},
+    {{0xc3,0x8f},	{0x49,0xcc,0x88}},
+    {{0xe1,0xb8,0xae},	{0x49,0xcc,0x88,0xcc,0x81}},
+    {{0xe1,0xbb,0x88},	{0x49,0xcc,0x89}},
+    {{0xc7,0x8f},	{0x49,0xcc,0x8c}},
+    {{0xc8,0x88},	{0x49,0xcc,0x8f}},
+    {{0xc8,0x8a},	{0x49,0xcc,0x91}},
+    {{0xe1,0xbb,0x8a},	{0x49,0xcc,0xa3}},
+    {{0xc4,0xae},	{0x49,0xcc,0xa8}},
+    {{0xe1,0xb8,0xac},	{0x49,0xcc,0xb0}},
+    {{0xc4,0xb4},	{0x4a,0xcc,0x82}},
+    {{0xe1,0xb8,0xb0},	{0x4b,0xcc,0x81}},
+    {{0xc7,0xa8},	{0x4b,0xcc,0x8c}},
+    {{0xe1,0xb8,0xb2},	{0x4b,0xcc,0xa3}},
+    {{0xc4,0xb6},	{0x4b,0xcc,0xa7}},
+    {{0xe1,0xb8,0xb4},	{0x4b,0xcc,0xb1}},
+    {{0xc4,0xb9},	{0x4c,0xcc,0x81}},
+    {{0xc4,0xbd},	{0x4c,0xcc,0x8c}},
+    {{0xe1,0xb8,0xb6},	{0x4c,0xcc,0xa3}},
+    {{0xe1,0xb8,0xb8},	{0x4c,0xcc,0xa3,0xcc,0x84}},
+    {{0xc4,0xbb},	{0x4c,0xcc,0xa7}},
+    {{0xe1,0xb8,0xbc},	{0x4c,0xcc,0xad}},
+    {{0xe1,0xb8,0xba},	{0x4c,0xcc,0xb1}},
+    {{0xe1,0xb8,0xbe},	{0x4d,0xcc,0x81}},
+    {{0xe1,0xb9,0x80},	{0x4d,0xcc,0x87}},
+    {{0xe1,0xb9,0x82},	{0x4d,0xcc,0xa3}},
+    {{0xc5,0x83},	{0x4e,0xcc,0x81}},
+    {{0xc3,0x91},	{0x4e,0xcc,0x83}},
+    {{0xe1,0xb9,0x84},	{0x4e,0xcc,0x87}},
+    {{0xc5,0x87},	{0x4e,0xcc,0x8c}},
+    {{0xe1,0xb9,0x86},	{0x4e,0xcc,0xa3}},
+    {{0xc5,0x85},	{0x4e,0xcc,0xa7}},
+    {{0xe1,0xb9,0x8a},	{0x4e,0xcc,0xad}},
+    {{0xe1,0xb9,0x88},	{0x4e,0xcc,0xb1}},
+    {{0xc3,0x92},	{0x4f,0xcc,0x80}},
+    {{0xc3,0x93},	{0x4f,0xcc,0x81}},
+    {{0xc3,0x94},	{0x4f,0xcc,0x82}},
+    {{0xe1,0xbb,0x92},	{0x4f,0xcc,0x82,0xcc,0x80}},
+    {{0xe1,0xbb,0x90},	{0x4f,0xcc,0x82,0xcc,0x81}},
+    {{0xe1,0xbb,0x96},	{0x4f,0xcc,0x82,0xcc,0x83}},
+    {{0xe1,0xbb,0x94},	{0x4f,0xcc,0x82,0xcc,0x89}},
+    {{0xc3,0x95},	{0x4f,0xcc,0x83}},
+    {{0xe1,0xb9,0x8c},	{0x4f,0xcc,0x83,0xcc,0x81}},
+    {{0xe1,0xb9,0x8e},	{0x4f,0xcc,0x83,0xcc,0x88}},
+    {{0xc5,0x8c},	{0x4f,0xcc,0x84}},
+    {{0xe1,0xb9,0x90},	{0x4f,0xcc,0x84,0xcc,0x80}},
+    {{0xe1,0xb9,0x92},	{0x4f,0xcc,0x84,0xcc,0x81}},
+    {{0xc5,0x8e},	{0x4f,0xcc,0x86}},
+    {{0xc3,0x96},	{0x4f,0xcc,0x88}},
+    {{0xe1,0xbb,0x8e},	{0x4f,0xcc,0x89}},
+    {{0xc5,0x90},	{0x4f,0xcc,0x8b}},
+    {{0xc7,0x91},	{0x4f,0xcc,0x8c}},
+    {{0xc8,0x8c},	{0x4f,0xcc,0x8f}},
+    {{0xc8,0x8e},	{0x4f,0xcc,0x91}},
+    {{0xc6,0xa0},	{0x4f,0xcc,0x9b}},
+    {{0xe1,0xbb,0x9c},	{0x4f,0xcc,0x9b,0xcc,0x80}},
+    {{0xe1,0xbb,0x9a},	{0x4f,0xcc,0x9b,0xcc,0x81}},
+    {{0xe1,0xbb,0xa0},	{0x4f,0xcc,0x9b,0xcc,0x83}},
+    {{0xe1,0xbb,0x9e},	{0x4f,0xcc,0x9b,0xcc,0x89}},
+    {{0xe1,0xbb,0xa2},	{0x4f,0xcc,0x9b,0xcc,0xa3}},
+    {{0xe1,0xbb,0x8c},	{0x4f,0xcc,0xa3}},
+    {{0xe1,0xbb,0x98},	{0x4f,0xcc,0xa3,0xcc,0x82}},
+    {{0xc7,0xaa},	{0x4f,0xcc,0xa8}},
+    {{0xc7,0xac},	{0x4f,0xcc,0xa8,0xcc,0x84}},
+    {{0xe1,0xb9,0x94},	{0x50,0xcc,0x81}},
+    {{0xe1,0xb9,0x96},	{0x50,0xcc,0x87}},
+    {{0xc5,0x94},	{0x52,0xcc,0x81}},
+    {{0xe1,0xb9,0x98},	{0x52,0xcc,0x87}},
+    {{0xc5,0x98},	{0x52,0xcc,0x8c}},
+    {{0xc8,0x90},	{0x52,0xcc,0x8f}},
+    {{0xc8,0x92},	{0x52,0xcc,0x91}},
+    {{0xe1,0xb9,0x9a},	{0x52,0xcc,0xa3}},
+    {{0xe1,0xb9,0x9c},	{0x52,0xcc,0xa3,0xcc,0x84}},
+    {{0xc5,0x96},	{0x52,0xcc,0xa7}},
+    {{0xe1,0xb9,0x9e},	{0x52,0xcc,0xb1}},
+    {{0xc5,0x9a},	{0x53,0xcc,0x81}},
+    {{0xe1,0xb9,0xa4},	{0x53,0xcc,0x81,0xcc,0x87}},
+    {{0xc5,0x9c},	{0x53,0xcc,0x82}},
+    {{0xe1,0xb9,0xa0},	{0x53,0xcc,0x87}},
+    {{0xc5,0xa0},	{0x53,0xcc,0x8c}},
+    {{0xe1,0xb9,0xa6},	{0x53,0xcc,0x8c,0xcc,0x87}},
+    {{0xe1,0xb9,0xa2},	{0x53,0xcc,0xa3}},
+    {{0xe1,0xb9,0xa8},	{0x53,0xcc,0xa3,0xcc,0x87}},
+    {{0xc5,0x9e},	{0x53,0xcc,0xa7}},
+    {{0xe1,0xb9,0xaa},	{0x54,0xcc,0x87}},
+    {{0xc5,0xa4},	{0x54,0xcc,0x8c}},
+    {{0xe1,0xb9,0xac},	{0x54,0xcc,0xa3}},
+    {{0xc5,0xa2},	{0x54,0xcc,0xa7}},
+    {{0xe1,0xb9,0xb0},	{0x54,0xcc,0xad}},
+    {{0xe1,0xb9,0xae},	{0x54,0xcc,0xb1}},
+    {{0xc3,0x99},	{0x55,0xcc,0x80}},
+    {{0xc3,0x9a},	{0x55,0xcc,0x81}},
+    {{0xc3,0x9b},	{0x55,0xcc,0x82}},
+    {{0xc5,0xa8},	{0x55,0xcc,0x83}},
+    {{0xe1,0xb9,0xb8},	{0x55,0xcc,0x83,0xcc,0x81}},
+    {{0xc5,0xaa},	{0x55,0xcc,0x84}},
+    {{0xe1,0xb9,0xba},	{0x55,0xcc,0x84,0xcc,0x88}},
+    {{0xc5,0xac},	{0x55,0xcc,0x86}},
+    {{0xc3,0x9c},	{0x55,0xcc,0x88}},
+    {{0xc7,0x9b},	{0x55,0xcc,0x88,0xcc,0x80}},
+    {{0xc7,0x97},	{0x55,0xcc,0x88,0xcc,0x81}},
+    {{0xc7,0x95},	{0x55,0xcc,0x88,0xcc,0x84}},
+    {{0xc7,0x99},	{0x55,0xcc,0x88,0xcc,0x8c}},
+    {{0xe1,0xbb,0xa6},	{0x55,0xcc,0x89}},
+    {{0xc5,0xae},	{0x55,0xcc,0x8a}},
+    {{0xc5,0xb0},	{0x55,0xcc,0x8b}},
+    {{0xc7,0x93},	{0x55,0xcc,0x8c}},
+    {{0xc8,0x94},	{0x55,0xcc,0x8f}},
+    {{0xc8,0x96},	{0x55,0xcc,0x91}},
+    {{0xc6,0xaf},	{0x55,0xcc,0x9b}},
+    {{0xe1,0xbb,0xaa},	{0x55,0xcc,0x9b,0xcc,0x80}},
+    {{0xe1,0xbb,0xa8},	{0x55,0xcc,0x9b,0xcc,0x81}},
+    {{0xe1,0xbb,0xae},	{0x55,0xcc,0x9b,0xcc,0x83}},
+    {{0xe1,0xbb,0xac},	{0x55,0xcc,0x9b,0xcc,0x89}},
+    {{0xe1,0xbb,0xb0},	{0x55,0xcc,0x9b,0xcc,0xa3}},
+    {{0xe1,0xbb,0xa4},	{0x55,0xcc,0xa3}},
+    {{0xe1,0xb9,0xb2},	{0x55,0xcc,0xa4}},
+    {{0xc5,0xb2},	{0x55,0xcc,0xa8}},
+    {{0xe1,0xb9,0xb6},	{0x55,0xcc,0xad}},
+    {{0xe1,0xb9,0xb4},	{0x55,0xcc,0xb0}},
+    {{0xe1,0xb9,0xbc},	{0x56,0xcc,0x83}},
+    {{0xe1,0xb9,0xbe},	{0x56,0xcc,0xa3}},
+    {{0xe1,0xba,0x80},	{0x57,0xcc,0x80}},
+    {{0xe1,0xba,0x82},	{0x57,0xcc,0x81}},
+    {{0xc5,0xb4},	{0x57,0xcc,0x82}},
+    {{0xe1,0xba,0x86},	{0x57,0xcc,0x87}},
+    {{0xe1,0xba,0x84},	{0x57,0xcc,0x88}},
+    {{0xe1,0xba,0x88},	{0x57,0xcc,0xa3}},
+    {{0xe1,0xba,0x8a},	{0x58,0xcc,0x87}},
+    {{0xe1,0xba,0x8c},	{0x58,0xcc,0x88}},
+    {{0xe1,0xbb,0xb2},	{0x59,0xcc,0x80}},
+    {{0xc3,0x9d},	{0x59,0xcc,0x81}},
+    {{0xc5,0xb6},	{0x59,0xcc,0x82}},
+    {{0xe1,0xbb,0xb8},	{0x59,0xcc,0x83}},
+    {{0xe1,0xba,0x8e},	{0x59,0xcc,0x87}},
+    {{0xc5,0xb8},	{0x59,0xcc,0x88}},
+    {{0xe1,0xbb,0xb6},	{0x59,0xcc,0x89}},
+    {{0xe1,0xbb,0xb4},	{0x59,0xcc,0xa3}},
+    {{0xc5,0xb9},	{0x5a,0xcc,0x81}},
+    {{0xe1,0xba,0x90},	{0x5a,0xcc,0x82}},
+    {{0xc5,0xbb},	{0x5a,0xcc,0x87}},
+    {{0xc5,0xbd},	{0x5a,0xcc,0x8c}},
+    {{0xe1,0xba,0x92},	{0x5a,0xcc,0xa3}},
+    {{0xe1,0xba,0x94},	{0x5a,0xcc,0xb1}},
+    {{0xe1,0xbf,0xaf},	{0x60}},
+    {{0xc3,0xa0},	{0x61,0xcc,0x80}},
+    {{0xc3,0xa1},	{0x61,0xcc,0x81}},
+    {{0xc3,0xa2},	{0x61,0xcc,0x82}},
+    {{0xe1,0xba,0xa7},	{0x61,0xcc,0x82,0xcc,0x80}},
+    {{0xe1,0xba,0xa5},	{0x61,0xcc,0x82,0xcc,0x81}},
+    {{0xe1,0xba,0xab},	{0x61,0xcc,0x82,0xcc,0x83}},
+    {{0xe1,0xba,0xa9},	{0x61,0xcc,0x82,0xcc,0x89}},
+    {{0xc3,0xa3},	{0x61,0xcc,0x83}},
+    {{0xc4,0x81},	{0x61,0xcc,0x84}},
+    {{0xc4,0x83},	{0x61,0xcc,0x86}},
+    {{0xe1,0xba,0xb1},	{0x61,0xcc,0x86,0xcc,0x80}},
+    {{0xe1,0xba,0xaf},	{0x61,0xcc,0x86,0xcc,0x81}},
+    {{0xe1,0xba,0xb5},	{0x61,0xcc,0x86,0xcc,0x83}},
+    {{0xe1,0xba,0xb3},	{0x61,0xcc,0x86,0xcc,0x89}},
+    {{0xc7,0xa1},	{0x61,0xcc,0x87,0xcc,0x84}},
+    {{0xc3,0xa4},	{0x61,0xcc,0x88}},
+    {{0xc7,0x9f},	{0x61,0xcc,0x88,0xcc,0x84}},
+    {{0xe1,0xba,0xa3},	{0x61,0xcc,0x89}},
+    {{0xc3,0xa5},	{0x61,0xcc,0x8a}},
+    {{0xc7,0xbb},	{0x61,0xcc,0x8a,0xcc,0x81}},
+    {{0xc7,0x8e},	{0x61,0xcc,0x8c}},
+    {{0xc8,0x81},	{0x61,0xcc,0x8f}},
+    {{0xc8,0x83},	{0x61,0xcc,0x91}},
+    {{0xe1,0xba,0xa1},	{0x61,0xcc,0xa3}},
+    {{0xe1,0xba,0xad},	{0x61,0xcc,0xa3,0xcc,0x82}},
+    {{0xe1,0xba,0xb7},	{0x61,0xcc,0xa3,0xcc,0x86}},
+    {{0xe1,0xb8,0x81},	{0x61,0xcc,0xa5}},
+    {{0xc4,0x85},	{0x61,0xcc,0xa8}},
+    {{0xe1,0xb8,0x83},	{0x62,0xcc,0x87}},
+    {{0xe1,0xb8,0x85},	{0x62,0xcc,0xa3}},
+    {{0xe1,0xb8,0x87},	{0x62,0xcc,0xb1}},
+    {{0xc4,0x87},	{0x63,0xcc,0x81}},
+    {{0xc4,0x89},	{0x63,0xcc,0x82}},
+    {{0xc4,0x8b},	{0x63,0xcc,0x87}},
+    {{0xc4,0x8d},	{0x63,0xcc,0x8c}},
+    {{0xc3,0xa7},	{0x63,0xcc,0xa7}},
+    {{0xe1,0xb8,0x89},	{0x63,0xcc,0xa7,0xcc,0x81}},
+    {{0xe1,0xb8,0x8b},	{0x64,0xcc,0x87}},
+    {{0xc4,0x8f},	{0x64,0xcc,0x8c}},
+    {{0xe1,0xb8,0x8d},	{0x64,0xcc,0xa3}},
+    {{0xe1,0xb8,0x91},	{0x64,0xcc,0xa7}},
+    {{0xe1,0xb8,0x93},	{0x64,0xcc,0xad}},
+    {{0xe1,0xb8,0x8f},	{0x64,0xcc,0xb1}},
+    {{0xc3,0xa8},	{0x65,0xcc,0x80}},
+    {{0xc3,0xa9},	{0x65,0xcc,0x81}},
+    {{0xc3,0xaa},	{0x65,0xcc,0x82}},
+    {{0xe1,0xbb,0x81},	{0x65,0xcc,0x82,0xcc,0x80}},
+    {{0xe1,0xba,0xbf},	{0x65,0xcc,0x82,0xcc,0x81}},
+    {{0xe1,0xbb,0x85},	{0x65,0xcc,0x82,0xcc,0x83}},
+    {{0xe1,0xbb,0x83},	{0x65,0xcc,0x82,0xcc,0x89}},
+    {{0xe1,0xba,0xbd},	{0x65,0xcc,0x83}},
+    {{0xc4,0x93},	{0x65,0xcc,0x84}},
+    {{0xe1,0xb8,0x95},	{0x65,0xcc,0x84,0xcc,0x80}},
+    {{0xe1,0xb8,0x97},	{0x65,0xcc,0x84,0xcc,0x81}},
+    {{0xc4,0x95},	{0x65,0xcc,0x86}},
+    {{0xc4,0x97},	{0x65,0xcc,0x87}},
+    {{0xc3,0xab},	{0x65,0xcc,0x88}},
+    {{0xe1,0xba,0xbb},	{0x65,0xcc,0x89}},
+    {{0xc4,0x9b},	{0x65,0xcc,0x8c}},
+    {{0xc8,0x85},	{0x65,0xcc,0x8f}},
+    {{0xc8,0x87},	{0x65,0xcc,0x91}},
+    {{0xe1,0xba,0xb9},	{0x65,0xcc,0xa3}},
+    {{0xe1,0xbb,0x87},	{0x65,0xcc,0xa3,0xcc,0x82}},
+    {{0xe1,0xb8,0x9d},	{0x65,0xcc,0xa7,0xcc,0x86}},
+    {{0xc4,0x99},	{0x65,0xcc,0xa8}},
+    {{0xe1,0xb8,0x99},	{0x65,0xcc,0xad}},
+    {{0xe1,0xb8,0x9b},	{0x65,0xcc,0xb0}},
+    {{0xe1,0xb8,0x9f},	{0x66,0xcc,0x87}},
+    {{0xc7,0xb5},	{0x67,0xcc,0x81}},
+    {{0xc4,0x9d},	{0x67,0xcc,0x82}},
+    {{0xe1,0xb8,0xa1},	{0x67,0xcc,0x84}},
+    {{0xc4,0x9f},	{0x67,0xcc,0x86}},
+    {{0xc4,0xa1},	{0x67,0xcc,0x87}},
+    {{0xc7,0xa7},	{0x67,0xcc,0x8c}},
+    {{0xc4,0xa3},	{0x67,0xcc,0xa7}},
+    {{0xc4,0xa5},	{0x68,0xcc,0x82}},
+    {{0xe1,0xb8,0xa3},	{0x68,0xcc,0x87}},
+    {{0xe1,0xb8,0xa7},	{0x68,0xcc,0x88}},
+    {{0xe1,0xb8,0xa5},	{0x68,0xcc,0xa3}},
+    {{0xe1,0xb8,0xa9},	{0x68,0xcc,0xa7}},
+    {{0xe1,0xb8,0xab},	{0x68,0xcc,0xae}},
+    {{0xe1,0xba,0x96},	{0x68,0xcc,0xb1}},
+    {{0xc3,0xac},	{0x69,0xcc,0x80}},
+    {{0xc3,0xad},	{0x69,0xcc,0x81}},
+    {{0xc3,0xae},	{0x69,0xcc,0x82}},
+    {{0xc4,0xa9},	{0x69,0xcc,0x83}},
+    {{0xc4,0xab},	{0x69,0xcc,0x84}},
+    {{0xc4,0xad},	{0x69,0xcc,0x86}},
+    {{0xc3,0xaf},	{0x69,0xcc,0x88}},
+    {{0xe1,0xb8,0xaf},	{0x69,0xcc,0x88,0xcc,0x81}},
+    {{0xe1,0xbb,0x89},	{0x69,0xcc,0x89}},
+    {{0xc7,0x90},	{0x69,0xcc,0x8c}},
+    {{0xc8,0x89},	{0x69,0xcc,0x8f}},
+    {{0xc8,0x8b},	{0x69,0xcc,0x91}},
+    {{0xe1,0xbb,0x8b},	{0x69,0xcc,0xa3}},
+    {{0xc4,0xaf},	{0x69,0xcc,0xa8}},
+    {{0xe1,0xb8,0xad},	{0x69,0xcc,0xb0}},
+    {{0xc4,0xb5},	{0x6a,0xcc,0x82}},
+    {{0xc7,0xb0},	{0x6a,0xcc,0x8c}},
+    {{0xe1,0xb8,0xb1},	{0x6b,0xcc,0x81}},
+    {{0xc7,0xa9},	{0x6b,0xcc,0x8c}},
+    {{0xe1,0xb8,0xb3},	{0x6b,0xcc,0xa3}},
+    {{0xc4,0xb7},	{0x6b,0xcc,0xa7}},
+    {{0xe1,0xb8,0xb5},	{0x6b,0xcc,0xb1}},
+    {{0xc4,0xba},	{0x6c,0xcc,0x81}},
+    {{0xc4,0xbe},	{0x6c,0xcc,0x8c}},
+    {{0xe1,0xb8,0xb7},	{0x6c,0xcc,0xa3}},
+    {{0xe1,0xb8,0xb9},	{0x6c,0xcc,0xa3,0xcc,0x84}},
+    {{0xc4,0xbc},	{0x6c,0xcc,0xa7}},
+    {{0xe1,0xb8,0xbd},	{0x6c,0xcc,0xad}},
+    {{0xe1,0xb8,0xbb},	{0x6c,0xcc,0xb1}},
+    {{0xe1,0xb8,0xbf},	{0x6d,0xcc,0x81}},
+    {{0xe1,0xb9,0x81},	{0x6d,0xcc,0x87}},
+    {{0xe1,0xb9,0x83},	{0x6d,0xcc,0xa3}},
+    {{0xc5,0x84},	{0x6e,0xcc,0x81}},
+    {{0xc3,0xb1},	{0x6e,0xcc,0x83}},
+    {{0xe1,0xb9,0x85},	{0x6e,0xcc,0x87}},
+    {{0xc5,0x88},	{0x6e,0xcc,0x8c}},
+    {{0xe1,0xb9,0x87},	{0x6e,0xcc,0xa3}},
+    {{0xc5,0x86},	{0x6e,0xcc,0xa7}},
+    {{0xe1,0xb9,0x8b},	{0x6e,0xcc,0xad}},
+    {{0xe1,0xb9,0x89},	{0x6e,0xcc,0xb1}},
+    {{0xc3,0xb2},	{0x6f,0xcc,0x80}},
+    {{0xc3,0xb3},	{0x6f,0xcc,0x81}},
+    {{0xc3,0xb4},	{0x6f,0xcc,0x82}},
+    {{0xe1,0xbb,0x93},	{0x6f,0xcc,0x82,0xcc,0x80}},
+    {{0xe1,0xbb,0x91},	{0x6f,0xcc,0x82,0xcc,0x81}},
+    {{0xe1,0xbb,0x97},	{0x6f,0xcc,0x82,0xcc,0x83}},
+    {{0xe1,0xbb,0x95},	{0x6f,0xcc,0x82,0xcc,0x89}},
+    {{0xc3,0xb5},	{0x6f,0xcc,0x83}},
+    {{0xe1,0xb9,0x8d},	{0x6f,0xcc,0x83,0xcc,0x81}},
+    {{0xe1,0xb9,0x8f},	{0x6f,0xcc,0x83,0xcc,0x88}},
+    {{0xc5,0x8d},	{0x6f,0xcc,0x84}},
+    {{0xe1,0xb9,0x91},	{0x6f,0xcc,0x84,0xcc,0x80}},
+    {{0xe1,0xb9,0x93},	{0x6f,0xcc,0x84,0xcc,0x81}},
+    {{0xc5,0x8f},	{0x6f,0xcc,0x86}},
+    {{0xc3,0xb6},	{0x6f,0xcc,0x88}},
+    {{0xe1,0xbb,0x8f},	{0x6f,0xcc,0x89}},
+    {{0xc5,0x91},	{0x6f,0xcc,0x8b}},
+    {{0xc7,0x92},	{0x6f,0xcc,0x8c}},
+    {{0xc8,0x8d},	{0x6f,0xcc,0x8f}},
+    {{0xc8,0x8f},	{0x6f,0xcc,0x91}},
+    {{0xc6,0xa1},	{0x6f,0xcc,0x9b}},
+    {{0xe1,0xbb,0x9d},	{0x6f,0xcc,0x9b,0xcc,0x80}},
+    {{0xe1,0xbb,0x9b},	{0x6f,0xcc,0x9b,0xcc,0x81}},
+    {{0xe1,0xbb,0xa1},	{0x6f,0xcc,0x9b,0xcc,0x83}},
+    {{0xe1,0xbb,0x9f},	{0x6f,0xcc,0x9b,0xcc,0x89}},
+    {{0xe1,0xbb,0xa3},	{0x6f,0xcc,0x9b,0xcc,0xa3}},
+    {{0xe1,0xbb,0x8d},	{0x6f,0xcc,0xa3}},
+    {{0xe1,0xbb,0x99},	{0x6f,0xcc,0xa3,0xcc,0x82}},
+    {{0xc7,0xab},	{0x6f,0xcc,0xa8}},
+    {{0xc7,0xad},	{0x6f,0xcc,0xa8,0xcc,0x84}},
+    {{0xe1,0xb9,0x95},	{0x70,0xcc,0x81}},
+    {{0xe1,0xb9,0x97},	{0x70,0xcc,0x87}},
+    {{0xc5,0x95},	{0x72,0xcc,0x81}},
+    {{0xe1,0xb9,0x99},	{0x72,0xcc,0x87}},
+    {{0xc5,0x99},	{0x72,0xcc,0x8c}},
+    {{0xc8,0x91},	{0x72,0xcc,0x8f}},
+    {{0xc8,0x93},	{0x72,0xcc,0x91}},
+    {{0xe1,0xb9,0x9b},	{0x72,0xcc,0xa3}},
+    {{0xe1,0xb9,0x9d},	{0x72,0xcc,0xa3,0xcc,0x84}},
+    {{0xc5,0x97},	{0x72,0xcc,0xa7}},
+    {{0xe1,0xb9,0x9f},	{0x72,0xcc,0xb1}},
+    {{0xc5,0x9b},	{0x73,0xcc,0x81}},
+    {{0xe1,0xb9,0xa5},	{0x73,0xcc,0x81,0xcc,0x87}},
+    {{0xc5,0x9d},	{0x73,0xcc,0x82}},
+    {{0xe1,0xb9,0xa1},	{0x73,0xcc,0x87}},
+    {{0xc5,0xa1},	{0x73,0xcc,0x8c}},
+    {{0xe1,0xb9,0xa7},	{0x73,0xcc,0x8c,0xcc,0x87}},
+    {{0xe1,0xb9,0xa3},	{0x73,0xcc,0xa3}},
+    {{0xe1,0xb9,0xa9},	{0x73,0xcc,0xa3,0xcc,0x87}},
+    {{0xc5,0x9f},	{0x73,0xcc,0xa7}},
+    {{0xe1,0xb9,0xab},	{0x74,0xcc,0x87}},
+    {{0xe1,0xba,0x97},	{0x74,0xcc,0x88}},
+    {{0xc5,0xa5},	{0x74,0xcc,0x8c}},
+    {{0xe1,0xb9,0xad},	{0x74,0xcc,0xa3}},
+    {{0xc5,0xa3},	{0x74,0xcc,0xa7}},
+    {{0xe1,0xb9,0xb1},	{0x74,0xcc,0xad}},
+    {{0xe1,0xb9,0xaf},	{0x74,0xcc,0xb1}},
+    {{0xc3,0xb9},	{0x75,0xcc,0x80}},
+    {{0xc3,0xba},	{0x75,0xcc,0x81}},
+    {{0xc3,0xbb},	{0x75,0xcc,0x82}},
+    {{0xc5,0xa9},	{0x75,0xcc,0x83}},
+    {{0xe1,0xb9,0xb9},	{0x75,0xcc,0x83,0xcc,0x81}},
+    {{0xc5,0xab},	{0x75,0xcc,0x84}},
+    {{0xe1,0xb9,0xbb},	{0x75,0xcc,0x84,0xcc,0x88}},
+    {{0xc5,0xad},	{0x75,0xcc,0x86}},
+    {{0xc3,0xbc},	{0x75,0xcc,0x88}},
+    {{0xc7,0x9c},	{0x75,0xcc,0x88,0xcc,0x80}},
+    {{0xc7,0x98},	{0x75,0xcc,0x88,0xcc,0x81}},
+    {{0xc7,0x96},	{0x75,0xcc,0x88,0xcc,0x84}},
+    {{0xc7,0x9a},	{0x75,0xcc,0x88,0xcc,0x8c}},
+    {{0xe1,0xbb,0xa7},	{0x75,0xcc,0x89}},
+    {{0xc5,0xaf},	{0x75,0xcc,0x8a}},
+    {{0xc5,0xb1},	{0x75,0xcc,0x8b}},
+    {{0xc7,0x94},	{0x75,0xcc,0x8c}},
+    {{0xc8,0x95},	{0x75,0xcc,0x8f}},
+    {{0xc8,0x97},	{0x75,0xcc,0x91}},
+    {{0xc6,0xb0},	{0x75,0xcc,0x9b}},
+    {{0xe1,0xbb,0xab},	{0x75,0xcc,0x9b,0xcc,0x80}},
+    {{0xe1,0xbb,0xa9},	{0x75,0xcc,0x9b,0xcc,0x81}},
+    {{0xe1,0xbb,0xaf},	{0x75,0xcc,0x9b,0xcc,0x83}},
+    {{0xe1,0xbb,0xad},	{0x75,0xcc,0x9b,0xcc,0x89}},
+    {{0xe1,0xbb,0xb1},	{0x75,0xcc,0x9b,0xcc,0xa3}},
+    {{0xe1,0xbb,0xa5},	{0x75,0xcc,0xa3}},
+    {{0xe1,0xb9,0xb3},	{0x75,0xcc,0xa4}},
+    {{0xc5,0xb3},	{0x75,0xcc,0xa8}},
+    {{0xe1,0xb9,0xb7},	{0x75,0xcc,0xad}},
+    {{0xe1,0xb9,0xb5},	{0x75,0xcc,0xb0}},
+    {{0xe1,0xb9,0xbd},	{0x76,0xcc,0x83}},
+    {{0xe1,0xb9,0xbf},	{0x76,0xcc,0xa3}},
+    {{0xe1,0xba,0x81},	{0x77,0xcc,0x80}},
+    {{0xe1,0xba,0x83},	{0x77,0xcc,0x81}},
+    {{0xc5,0xb5},	{0x77,0xcc,0x82}},
+    {{0xe1,0xba,0x87},	{0x77,0xcc,0x87}},
+    {{0xe1,0xba,0x85},	{0x77,0xcc,0x88}},
+    {{0xe1,0xba,0x98},	{0x77,0xcc,0x8a}},
+    {{0xe1,0xba,0x89},	{0x77,0xcc,0xa3}},
+    {{0xe1,0xba,0x8b},	{0x78,0xcc,0x87}},
+    {{0xe1,0xba,0x8d},	{0x78,0xcc,0x88}},
+    {{0xe1,0xbb,0xb3},	{0x79,0xcc,0x80}},
+    {{0xc3,0xbd},	{0x79,0xcc,0x81}},
+    {{0xc5,0xb7},	{0x79,0xcc,0x82}},
+    {{0xe1,0xbb,0xb9},	{0x79,0xcc,0x83}},
+    {{0xe1,0xba,0x8f},	{0x79,0xcc,0x87}},
+    {{0xc3,0xbf},	{0x79,0xcc,0x88}},
+    {{0xe1,0xbb,0xb7},	{0x79,0xcc,0x89}},
+    {{0xe1,0xba,0x99},	{0x79,0xcc,0x8a}},
+    {{0xe1,0xbb,0xb5},	{0x79,0xcc,0xa3}},
+    {{0xc5,0xba},	{0x7a,0xcc,0x81}},
+    {{0xe1,0xba,0x91},	{0x7a,0xcc,0x82}},
+    {{0xc5,0xbc},	{0x7a,0xcc,0x87}},
+    {{0xc5,0xbe},	{0x7a,0xcc,0x8c}},
+    {{0xe1,0xba,0x93},	{0x7a,0xcc,0xa3}},
+    {{0xe1,0xba,0x95},	{0x7a,0xcc,0xb1}},
+    {{0xe1,0xbf,0xad},	{0xc2,0xa8,0xcc,0x80}},
+    {{0xe1,0xbf,0xae},	{0xc2,0xa8,0xcc,0x81}},
+    {{0xce,0x85},	{0xc2,0xa8,0xcc,0x8d}},
+    {{0xe1,0xbf,0x81},	{0xc2,0xa8,0xcd,0x82}},
+    {{0xe1,0xbf,0xbd},	{0xc2,0xb4}},
+    {{0xce,0x87},	{0xc2,0xb7}},
+    {{0xd3,0x94},	{0xc3,0x86}},
+    {{0xc7,0xbc},	{0xc3,0x86,0xcc,0x81}},
+    {{0xc7,0xa2},	{0xc3,0x86,0xcc,0x84}},
+    {{0xc7,0xbe},	{0xc3,0x98,0xcc,0x81}},
+    {{0xd3,0x95},	{0xc3,0xa6}},
+    {{0xc7,0xbd},	{0xc3,0xa6,0xcc,0x81}},
+    {{0xc7,0xa3},	{0xc3,0xa6,0xcc,0x84}},
+    {{0xc7,0xbf},	{0xc3,0xb8,0xcc,0x81}},
+    {{0xe1,0xba,0x9b},	{0xc5,0xbf,0xcc,0x87}},
+    {{0xd3,0x98},	{0xc6,0x8f}},
+    {{0xd3,0x9a},	{0xc6,0x8f,0xcc,0x88}},
+    {{0xd3,0xa8},	{0xc6,0x9f}},
+    {{0xd3,0xaa},	{0xc6,0x9f,0xcc,0x88}},
+    {{0xd3,0xa0},	{0xc6,0xb7}},
+    {{0xc7,0xae},	{0xc6,0xb7,0xcc,0x8c}},
+    {{0xd3,0x99},	{0xc9,0x99}},
+    {{0xd3,0x9b},	{0xc9,0x99,0xcc,0x88}},
+    {{0xd3,0xa9},	{0xc9,0xb5}},
+    {{0xd3,0xab},	{0xc9,0xb5,0xcc,0x88}},
+    {{0xd3,0xa1},	{0xca,0x92}},
+    {{0xc7,0xaf},	{0xca,0x92,0xcc,0x8c}},
+    {{0xcd,0xb4},	{0xca,0xb9}},
+    {{0xcd,0x80},	{0xcc,0x80}},
+    {{0xcd,0x81},	{0xcc,0x81}},
+    {{0xcc,0x90},	{0xcc,0x86,0xcc,0x87}},
+    {{0xcd,0x84},	{0xcc,0x88,0xcc,0x8d}},
+    {{0xcd,0x83},	{0xcc,0x93}},
+    {{0xe1,0xbe,0xba},	{0xce,0x91,0xcc,0x80}},
+    {{0xe1,0xbe,0xbb},	{0xce,0x91,0xcc,0x81}},
+    {{0xe1,0xbe,0xb9},	{0xce,0x91,0xcc,0x84}},
+    {{0xe1,0xbe,0xb8},	{0xce,0x91,0xcc,0x86}},
+    {{0xce,0x86},	{0xce,0x91,0xcc,0x8d}},
+    {{0xe1,0xbc,0x88},	{0xce,0x91,0xcc,0x93}},
+    {{0xe1,0xbc,0x8a},	{0xce,0x91,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbc,0x8c},	{0xce,0x91,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbc,0x8e},	{0xce,0x91,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbc,0x89},	{0xce,0x91,0xcc,0x94}},
+    {{0xe1,0xbc,0x8b},	{0xce,0x91,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbc,0x8d},	{0xce,0x91,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbc,0x8f},	{0xce,0x91,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbe,0xbc},	{0xce,0x91,0xcd,0x85}},
+    {{0xe1,0xbe,0x88},	{0xce,0x91,0xcd,0x85,0xcc,0x93}},
+    {{0xe1,0xbe,0x8a},	{0xce,0x91,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbe,0x8c},	{0xce,0x91,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbe,0x8e},	{0xce,0x91,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbe,0x89},	{0xce,0x91,0xcd,0x85,0xcc,0x94}},
+    {{0xe1,0xbe,0x8b},	{0xce,0x91,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbe,0x8d},	{0xce,0x91,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbe,0x8f},	{0xce,0x91,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbf,0x88},	{0xce,0x95,0xcc,0x80}},
+    {{0xe1,0xbf,0x89},	{0xce,0x95,0xcc,0x81}},
+    {{0xce,0x88},	{0xce,0x95,0xcc,0x8d}},
+    {{0xe1,0xbc,0x98},	{0xce,0x95,0xcc,0x93}},
+    {{0xe1,0xbc,0x9a},	{0xce,0x95,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbc,0x9c},	{0xce,0x95,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbc,0x99},	{0xce,0x95,0xcc,0x94}},
+    {{0xe1,0xbc,0x9b},	{0xce,0x95,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbc,0x9d},	{0xce,0x95,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbf,0x8a},	{0xce,0x97,0xcc,0x80}},
+    {{0xe1,0xbf,0x8b},	{0xce,0x97,0xcc,0x81}},
+    {{0xce,0x89},	{0xce,0x97,0xcc,0x8d}},
+    {{0xe1,0xbc,0xa8},	{0xce,0x97,0xcc,0x93}},
+    {{0xe1,0xbc,0xaa},	{0xce,0x97,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbc,0xac},	{0xce,0x97,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbc,0xae},	{0xce,0x97,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbc,0xa9},	{0xce,0x97,0xcc,0x94}},
+    {{0xe1,0xbc,0xab},	{0xce,0x97,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbc,0xad},	{0xce,0x97,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbc,0xaf},	{0xce,0x97,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbf,0x8c},	{0xce,0x97,0xcd,0x85}},
+    {{0xe1,0xbe,0x98},	{0xce,0x97,0xcd,0x85,0xcc,0x93}},
+    {{0xe1,0xbe,0x9a},	{0xce,0x97,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbe,0x9c},	{0xce,0x97,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbe,0x9e},	{0xce,0x97,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbe,0x99},	{0xce,0x97,0xcd,0x85,0xcc,0x94}},
+    {{0xe1,0xbe,0x9b},	{0xce,0x97,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbe,0x9d},	{0xce,0x97,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbe,0x9f},	{0xce,0x97,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbf,0x9a},	{0xce,0x99,0xcc,0x80}},
+    {{0xe1,0xbf,0x9b},	{0xce,0x99,0xcc,0x81}},
+    {{0xe1,0xbf,0x99},	{0xce,0x99,0xcc,0x84}},
+    {{0xe1,0xbf,0x98},	{0xce,0x99,0xcc,0x86}},
+    {{0xce,0xaa},	{0xce,0x99,0xcc,0x88}},
+    {{0xce,0x8a},	{0xce,0x99,0xcc,0x8d}},
+    {{0xe1,0xbc,0xb8},	{0xce,0x99,0xcc,0x93}},
+    {{0xe1,0xbc,0xba},	{0xce,0x99,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbc,0xbc},	{0xce,0x99,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbc,0xbe},	{0xce,0x99,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbc,0xb9},	{0xce,0x99,0xcc,0x94}},
+    {{0xe1,0xbc,0xbb},	{0xce,0x99,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbc,0xbd},	{0xce,0x99,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbc,0xbf},	{0xce,0x99,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbf,0xb8},	{0xce,0x9f,0xcc,0x80}},
+    {{0xe1,0xbf,0xb9},	{0xce,0x9f,0xcc,0x81}},
+    {{0xce,0x8c},	{0xce,0x9f,0xcc,0x8d}},
+    {{0xe1,0xbd,0x88},	{0xce,0x9f,0xcc,0x93}},
+    {{0xe1,0xbd,0x8a},	{0xce,0x9f,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbd,0x8c},	{0xce,0x9f,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbd,0x89},	{0xce,0x9f,0xcc,0x94}},
+    {{0xe1,0xbd,0x8b},	{0xce,0x9f,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbd,0x8d},	{0xce,0x9f,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbf,0xac},	{0xce,0xa1,0xcc,0x94}},
+    {{0xe1,0xbf,0xaa},	{0xce,0xa5,0xcc,0x80}},
+    {{0xe1,0xbf,0xab},	{0xce,0xa5,0xcc,0x81}},
+    {{0xe1,0xbf,0xa9},	{0xce,0xa5,0xcc,0x84}},
+    {{0xe1,0xbf,0xa8},	{0xce,0xa5,0xcc,0x86}},
+    {{0xce,0xab},	{0xce,0xa5,0xcc,0x88}},
+    {{0xce,0x8e},	{0xce,0xa5,0xcc,0x8d}},
+    {{0xe1,0xbd,0x99},	{0xce,0xa5,0xcc,0x94}},
+    {{0xe1,0xbd,0x9b},	{0xce,0xa5,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbd,0x9d},	{0xce,0xa5,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbd,0x9f},	{0xce,0xa5,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbf,0xba},	{0xce,0xa9,0xcc,0x80}},
+    {{0xe1,0xbf,0xbb},	{0xce,0xa9,0xcc,0x81}},
+    {{0xce,0x8f},	{0xce,0xa9,0xcc,0x8d}},
+    {{0xe1,0xbd,0xa8},	{0xce,0xa9,0xcc,0x93}},
+    {{0xe1,0xbd,0xaa},	{0xce,0xa9,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbd,0xac},	{0xce,0xa9,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbd,0xae},	{0xce,0xa9,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbd,0xa9},	{0xce,0xa9,0xcc,0x94}},
+    {{0xe1,0xbd,0xab},	{0xce,0xa9,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbd,0xad},	{0xce,0xa9,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbd,0xaf},	{0xce,0xa9,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbf,0xbc},	{0xce,0xa9,0xcd,0x85}},
+    {{0xe1,0xbe,0xa8},	{0xce,0xa9,0xcd,0x85,0xcc,0x93}},
+    {{0xe1,0xbe,0xaa},	{0xce,0xa9,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbe,0xac},	{0xce,0xa9,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbe,0xae},	{0xce,0xa9,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbe,0xa9},	{0xce,0xa9,0xcd,0x85,0xcc,0x94}},
+    {{0xe1,0xbe,0xab},	{0xce,0xa9,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbe,0xad},	{0xce,0xa9,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbe,0xaf},	{0xce,0xa9,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbd,0xb0},	{0xce,0xb1,0xcc,0x80}},
+    {{0xe1,0xbd,0xb1},	{0xce,0xb1,0xcc,0x81}},
+    {{0xe1,0xbe,0xb1},	{0xce,0xb1,0xcc,0x84}},
+    {{0xe1,0xbe,0xb0},	{0xce,0xb1,0xcc,0x86}},
+    {{0xce,0xac},	{0xce,0xb1,0xcc,0x8d}},
+    {{0xe1,0xbc,0x80},	{0xce,0xb1,0xcc,0x93}},
+    {{0xe1,0xbc,0x82},	{0xce,0xb1,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbc,0x84},	{0xce,0xb1,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbc,0x86},	{0xce,0xb1,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbc,0x81},	{0xce,0xb1,0xcc,0x94}},
+    {{0xe1,0xbc,0x83},	{0xce,0xb1,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbc,0x85},	{0xce,0xb1,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbc,0x87},	{0xce,0xb1,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbe,0xb6},	{0xce,0xb1,0xcd,0x82}},
+    {{0xe1,0xbe,0xb3},	{0xce,0xb1,0xcd,0x85}},
+    {{0xe1,0xbe,0xb2},	{0xce,0xb1,0xcd,0x85,0xcc,0x80}},
+    {{0xe1,0xbe,0xb4},	{0xce,0xb1,0xcd,0x85,0xcc,0x81}},
+    {{0xe1,0xbe,0x80},	{0xce,0xb1,0xcd,0x85,0xcc,0x93}},
+    {{0xe1,0xbe,0x82},	{0xce,0xb1,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbe,0x84},	{0xce,0xb1,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbe,0x86},	{0xce,0xb1,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbe,0x81},	{0xce,0xb1,0xcd,0x85,0xcc,0x94}},
+    {{0xe1,0xbe,0x83},	{0xce,0xb1,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbe,0x85},	{0xce,0xb1,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbe,0x87},	{0xce,0xb1,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbe,0xb7},	{0xce,0xb1,0xcd,0x85,0xcd,0x82}},
+    {{0xe1,0xbd,0xb2},	{0xce,0xb5,0xcc,0x80}},
+    {{0xe1,0xbd,0xb3},	{0xce,0xb5,0xcc,0x81}},
+    {{0xce,0xad},	{0xce,0xb5,0xcc,0x8d}},
+    {{0xe1,0xbc,0x90},	{0xce,0xb5,0xcc,0x93}},
+    {{0xe1,0xbc,0x92},	{0xce,0xb5,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbc,0x94},	{0xce,0xb5,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbc,0x91},	{0xce,0xb5,0xcc,0x94}},
+    {{0xe1,0xbc,0x93},	{0xce,0xb5,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbc,0x95},	{0xce,0xb5,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbd,0xb4},	{0xce,0xb7,0xcc,0x80}},
+    {{0xe1,0xbd,0xb5},	{0xce,0xb7,0xcc,0x81}},
+    {{0xce,0xae},	{0xce,0xb7,0xcc,0x8d}},
+    {{0xe1,0xbc,0xa0},	{0xce,0xb7,0xcc,0x93}},
+    {{0xe1,0xbc,0xa2},	{0xce,0xb7,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbc,0xa4},	{0xce,0xb7,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbc,0xa6},	{0xce,0xb7,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbc,0xa1},	{0xce,0xb7,0xcc,0x94}},
+    {{0xe1,0xbc,0xa3},	{0xce,0xb7,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbc,0xa5},	{0xce,0xb7,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbc,0xa7},	{0xce,0xb7,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbf,0x86},	{0xce,0xb7,0xcd,0x82}},
+    {{0xe1,0xbf,0x83},	{0xce,0xb7,0xcd,0x85}},
+    {{0xe1,0xbf,0x82},	{0xce,0xb7,0xcd,0x85,0xcc,0x80}},
+    {{0xe1,0xbf,0x84},	{0xce,0xb7,0xcd,0x85,0xcc,0x81}},
+    {{0xe1,0xbe,0x90},	{0xce,0xb7,0xcd,0x85,0xcc,0x93}},
+    {{0xe1,0xbe,0x92},	{0xce,0xb7,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbe,0x94},	{0xce,0xb7,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbe,0x96},	{0xce,0xb7,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbe,0x91},	{0xce,0xb7,0xcd,0x85,0xcc,0x94}},
+    {{0xe1,0xbe,0x93},	{0xce,0xb7,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbe,0x95},	{0xce,0xb7,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbe,0x97},	{0xce,0xb7,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbf,0x87},	{0xce,0xb7,0xcd,0x85,0xcd,0x82}},
+    {{0xe1,0xbe,0xbe},	{0xce,0xb9}},
+    {{0xe1,0xbd,0xb6},	{0xce,0xb9,0xcc,0x80}},
+    {{0xe1,0xbd,0xb7},	{0xce,0xb9,0xcc,0x81}},
+    {{0xe1,0xbf,0x91},	{0xce,0xb9,0xcc,0x84}},
+    {{0xe1,0xbf,0x90},	{0xce,0xb9,0xcc,0x86}},
+    {{0xcf,0x8a},	{0xce,0xb9,0xcc,0x88}},
+    {{0xe1,0xbf,0x92},	{0xce,0xb9,0xcc,0x88,0xcc,0x80}},
+    {{0xe1,0xbf,0x93},	{0xce,0xb9,0xcc,0x88,0xcc,0x81}},
+    {{0xce,0x90},	{0xce,0xb9,0xcc,0x88,0xcc,0x8d}},
+    {{0xe1,0xbf,0x97},	{0xce,0xb9,0xcc,0x88,0xcd,0x82}},
+    {{0xce,0xaf},	{0xce,0xb9,0xcc,0x8d}},
+    {{0xe1,0xbc,0xb0},	{0xce,0xb9,0xcc,0x93}},
+    {{0xe1,0xbc,0xb2},	{0xce,0xb9,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbc,0xb4},	{0xce,0xb9,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbc,0xb6},	{0xce,0xb9,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbc,0xb1},	{0xce,0xb9,0xcc,0x94}},
+    {{0xe1,0xbc,0xb3},	{0xce,0xb9,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbc,0xb5},	{0xce,0xb9,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbc,0xb7},	{0xce,0xb9,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbf,0x96},	{0xce,0xb9,0xcd,0x82}},
+    {{0xe1,0xbd,0xb8},	{0xce,0xbf,0xcc,0x80}},
+    {{0xe1,0xbd,0xb9},	{0xce,0xbf,0xcc,0x81}},
+    {{0xcf,0x8c},	{0xce,0xbf,0xcc,0x8d}},
+    {{0xe1,0xbd,0x80},	{0xce,0xbf,0xcc,0x93}},
+    {{0xe1,0xbd,0x82},	{0xce,0xbf,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbd,0x84},	{0xce,0xbf,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbd,0x81},	{0xce,0xbf,0xcc,0x94}},
+    {{0xe1,0xbd,0x83},	{0xce,0xbf,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbd,0x85},	{0xce,0xbf,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbf,0xb4},	{0xce,0xbf,0xcd,0x85,0xcc,0x81}},
+    {{0xe1,0xbf,0xa4},	{0xcf,0x81,0xcc,0x93}},
+    {{0xe1,0xbf,0xa5},	{0xcf,0x81,0xcc,0x94}},
+    {{0xe1,0xbd,0xba},	{0xcf,0x85,0xcc,0x80}},
+    {{0xe1,0xbd,0xbb},	{0xcf,0x85,0xcc,0x81}},
+    {{0xe1,0xbf,0xa1},	{0xcf,0x85,0xcc,0x84}},
+    {{0xe1,0xbf,0xa0},	{0xcf,0x85,0xcc,0x86}},
+    {{0xcf,0x8b},	{0xcf,0x85,0xcc,0x88}},
+    {{0xe1,0xbf,0xa2},	{0xcf,0x85,0xcc,0x88,0xcc,0x80}},
+    {{0xe1,0xbf,0xa3},	{0xcf,0x85,0xcc,0x88,0xcc,0x81}},
+    {{0xce,0xb0},	{0xcf,0x85,0xcc,0x88,0xcc,0x8d}},
+    {{0xe1,0xbf,0xa7},	{0xcf,0x85,0xcc,0x88,0xcd,0x82}},
+    {{0xcf,0x8d},	{0xcf,0x85,0xcc,0x8d}},
+    {{0xe1,0xbd,0x90},	{0xcf,0x85,0xcc,0x93}},
+    {{0xe1,0xbd,0x92},	{0xcf,0x85,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbd,0x94},	{0xcf,0x85,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbd,0x96},	{0xcf,0x85,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbd,0x91},	{0xcf,0x85,0xcc,0x94}},
+    {{0xe1,0xbd,0x93},	{0xcf,0x85,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbd,0x95},	{0xcf,0x85,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbd,0x97},	{0xcf,0x85,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbf,0xa6},	{0xcf,0x85,0xcd,0x82}},
+    {{0xe1,0xbd,0xbc},	{0xcf,0x89,0xcc,0x80}},
+    {{0xe1,0xbd,0xbd},	{0xcf,0x89,0xcc,0x81}},
+    {{0xcf,0x8e},	{0xcf,0x89,0xcc,0x8d}},
+    {{0xe1,0xbd,0xa0},	{0xcf,0x89,0xcc,0x93}},
+    {{0xe1,0xbd,0xa2},	{0xcf,0x89,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbd,0xa4},	{0xcf,0x89,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbd,0xa6},	{0xcf,0x89,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbd,0xa1},	{0xcf,0x89,0xcc,0x94}},
+    {{0xe1,0xbd,0xa3},	{0xcf,0x89,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbd,0xa5},	{0xcf,0x89,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbd,0xa7},	{0xcf,0x89,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbf,0xb6},	{0xcf,0x89,0xcd,0x82}},
+    {{0xe1,0xbf,0xb3},	{0xcf,0x89,0xcd,0x85}},
+    {{0xe1,0xbf,0xb2},	{0xcf,0x89,0xcd,0x85,0xcc,0x80}},
+    {{0xe1,0xbe,0xa0},	{0xcf,0x89,0xcd,0x85,0xcc,0x93}},
+    {{0xe1,0xbe,0xa2},	{0xcf,0x89,0xcd,0x85,0xcc,0x93,0xcc,0x80}},
+    {{0xe1,0xbe,0xa4},	{0xcf,0x89,0xcd,0x85,0xcc,0x93,0xcc,0x81}},
+    {{0xe1,0xbe,0xa6},	{0xcf,0x89,0xcd,0x85,0xcc,0x93,0xcd,0x82}},
+    {{0xe1,0xbe,0xa1},	{0xcf,0x89,0xcd,0x85,0xcc,0x94}},
+    {{0xe1,0xbe,0xa3},	{0xcf,0x89,0xcd,0x85,0xcc,0x94,0xcc,0x80}},
+    {{0xe1,0xbe,0xa5},	{0xcf,0x89,0xcd,0x85,0xcc,0x94,0xcc,0x81}},
+    {{0xe1,0xbe,0xa7},	{0xcf,0x89,0xcd,0x85,0xcc,0x94,0xcd,0x82}},
+    {{0xe1,0xbf,0xb7},	{0xcf,0x89,0xcd,0x85,0xcd,0x82}},
+    {{0xcf,0x94},	{0xcf,0x92,0xcc,0x88}},
+    {{0xcf,0x93},	{0xcf,0x92,0xcc,0x8d}},
+    {{0xd0,0x87},	{0xd0,0x86,0xcc,0x88}},
+    {{0xd3,0x90},	{0xd0,0x90,0xcc,0x86}},
+    {{0xd3,0x92},	{0xd0,0x90,0xcc,0x88}},
+    {{0xd0,0x83},	{0xd0,0x93,0xcc,0x81}},
+    {{0xd3,0x96},	{0xd0,0x95,0xcc,0x86}},
+    {{0xd0,0x81},	{0xd0,0x95,0xcc,0x88}},
+    {{0xd3,0x81},	{0xd0,0x96,0xcc,0x86}},
+    {{0xd3,0x9c},	{0xd0,0x96,0xcc,0x88}},
+    {{0xd3,0x9e},	{0xd0,0x97,0xcc,0x88}},
+    {{0xd3,0xa2},	{0xd0,0x98,0xcc,0x84}},
+    {{0xd0,0x99},	{0xd0,0x98,0xcc,0x86}},
+    {{0xd3,0xa4},	{0xd0,0x98,0xcc,0x88}},
+    {{0xd0,0x8c},	{0xd0,0x9a,0xcc,0x81}},
+    {{0xd3,0xa6},	{0xd0,0x9e,0xcc,0x88}},
+    {{0xd3,0xae},	{0xd0,0xa3,0xcc,0x84}},
+    {{0xd0,0x8e},	{0xd0,0xa3,0xcc,0x86}},
+    {{0xd3,0xb0},	{0xd0,0xa3,0xcc,0x88}},
+    {{0xd3,0xb2},	{0xd0,0xa3,0xcc,0x8b}},
+    {{0xd3,0xb4},	{0xd0,0xa7,0xcc,0x88}},
+    {{0xd3,0xb8},	{0xd0,0xab,0xcc,0x88}},
+    {{0xd3,0x91},	{0xd0,0xb0,0xcc,0x86}},
+    {{0xd3,0x93},	{0xd0,0xb0,0xcc,0x88}},
+    {{0xd1,0x93},	{0xd0,0xb3,0xcc,0x81}},
+    {{0xd3,0x97},	{0xd0,0xb5,0xcc,0x86}},
+    {{0xd1,0x91},	{0xd0,0xb5,0xcc,0x88}},
+    {{0xd3,0x82},	{0xd0,0xb6,0xcc,0x86}},
+    {{0xd3,0x9d},	{0xd0,0xb6,0xcc,0x88}},
+    {{0xd3,0x9f},	{0xd0,0xb7,0xcc,0x88}},
+    {{0xd3,0xa3},	{0xd0,0xb8,0xcc,0x84}},
+    {{0xd0,0xb9},	{0xd0,0xb8,0xcc,0x86}},
+    {{0xd3,0xa5},	{0xd0,0xb8,0xcc,0x88}},
+    {{0xd1,0x9c},	{0xd0,0xba,0xcc,0x81}},
+    {{0xd3,0xa7},	{0xd0,0xbe,0xcc,0x88}},
+    {{0xd3,0xaf},	{0xd1,0x83,0xcc,0x84}},
+    {{0xd1,0x9e},	{0xd1,0x83,0xcc,0x86}},
+    {{0xd3,0xb1},	{0xd1,0x83,0xcc,0x88}},
+    {{0xd3,0xb3},	{0xd1,0x83,0xcc,0x8b}},
+    {{0xd3,0xb5},	{0xd1,0x87,0xcc,0x88}},
+    {{0xd3,0xb9},	{0xd1,0x8b,0xcc,0x88}},
+    {{0xd1,0x97},	{0xd1,0x96,0xcc,0x88}},
+    {{0xd1,0xb6},	{0xd1,0xb4,0xcc,0x8f}},
+    {{0xd1,0xb7},	{0xd1,0xb5,0xcc,0x8f}},
+    {{0xef,0xac,0xae},	{0xd7,0x90,0xd6,0xb7}},
+    {{0xef,0xac,0xaf},	{0xd7,0x90,0xd6,0xb8}},
+    {{0xef,0xac,0xb0},	{0xd7,0x90,0xd6,0xbc}},
+    {{0xef,0xac,0xb1},	{0xd7,0x91,0xd6,0xbc}},
+    {{0xef,0xad,0x8c},	{0xd7,0x91,0xd6,0xbf}},
+    {{0xef,0xac,0xb2},	{0xd7,0x92,0xd6,0xbc}},
+    {{0xef,0xac,0xb3},	{0xd7,0x93,0xd6,0xbc}},
+    {{0xef,0xac,0xb4},	{0xd7,0x94,0xd6,0xbc}},
+    {{0xef,0xad,0x8b},	{0xd7,0x95,0xd6,0xb9}},
+    {{0xef,0xac,0xb5},	{0xd7,0x95,0xd6,0xbc}},
+    {{0xef,0xac,0xb6},	{0xd7,0x96,0xd6,0xbc}},
+    {{0xef,0xac,0xb8},	{0xd7,0x98,0xd6,0xbc}},
+    {{0xef,0xac,0xb9},	{0xd7,0x99,0xd6,0xbc}},
+    {{0xef,0xac,0xba},	{0xd7,0x9a,0xd6,0xbc}},
+    {{0xef,0xac,0xbb},	{0xd7,0x9b,0xd6,0xbc}},
+    {{0xef,0xad,0x8d},	{0xd7,0x9b,0xd6,0xbf}},
+    {{0xef,0xac,0xbc},	{0xd7,0x9c,0xd6,0xbc}},
+    {{0xef,0xac,0xbe},	{0xd7,0x9e,0xd6,0xbc}},
+    {{0xef,0xad,0x80},	{0xd7,0xa0,0xd6,0xbc}},
+    {{0xef,0xad,0x81},	{0xd7,0xa1,0xd6,0xbc}},
+    {{0xef,0xad,0x83},	{0xd7,0xa3,0xd6,0xbc}},
+    {{0xef,0xad,0x84},	{0xd7,0xa4,0xd6,0xbc}},
+    {{0xef,0xad,0x8e},	{0xd7,0xa4,0xd6,0xbf}},
+    {{0xef,0xad,0x86},	{0xd7,0xa6,0xd6,0xbc}},
+    {{0xef,0xad,0x87},	{0xd7,0xa7,0xd6,0xbc}},
+    {{0xef,0xad,0x88},	{0xd7,0xa8,0xd6,0xbc}},
+    {{0xef,0xad,0x89},	{0xd7,0xa9,0xd6,0xbc}},
+    {{0xef,0xac,0xac},	{0xd7,0xa9,0xd6,0xbc,0xd7,0x81}},
+    {{0xef,0xac,0xad},	{0xd7,0xa9,0xd6,0xbc,0xd7,0x82}},
+    {{0xef,0xac,0xaa},	{0xd7,0xa9,0xd7,0x81}},
+    {{0xef,0xac,0xab},	{0xd7,0xa9,0xd7,0x82}},
+    {{0xef,0xad,0x8a},	{0xd7,0xaa,0xd6,0xbc}},
+    {{0xef,0xac,0x9f},	{0xd7,0xb2,0xd6,0xb7}},
+    {{0xe0,0xa5,0x98},	{0xe0,0xa4,0x95,0xe0,0xa4,0xbc}},
+    {{0xe0,0xa5,0x99},	{0xe0,0xa4,0x96,0xe0,0xa4,0xbc}},
+    {{0xe0,0xa5,0x9a},	{0xe0,0xa4,0x97,0xe0,0xa4,0xbc}},
+    {{0xe0,0xa5,0x9b},	{0xe0,0xa4,0x9c,0xe0,0xa4,0xbc}},
+    {{0xe0,0xa5,0x9c},	{0xe0,0xa4,0xa1,0xe0,0xa4,0xbc}},
+    {{0xe0,0xa5,0x9d},	{0xe0,0xa4,0xa2,0xe0,0xa4,0xbc}},
+    {{0xe0,0xa4,0xa9},	{0xe0,0xa4,0xa8,0xe0,0xa4,0xbc}},
+    {{0xe0,0xa5,0x9e},	{0xe0,0xa4,0xab,0xe0,0xa4,0xbc}},
+    {{0xe0,0xa5,0x9f},	{0xe0,0xa4,0xaf,0xe0,0xa4,0xbc}},
+    {{0xe0,0xa4,0xb1},	{0xe0,0xa4,0xb0,0xe0,0xa4,0xbc}},
+    {{0xe0,0xa4,0xb4},	{0xe0,0xa4,0xb3,0xe0,0xa4,0xbc}},
+    {{0xe0,0xa7,0x9c},	{0xe0,0xa6,0xa1,0xe0,0xa6,0xbc}},
+    {{0xe0,0xa7,0x9d},	{0xe0,0xa6,0xa2,0xe0,0xa6,0xbc}},
+    {{0xe0,0xa6,0xb0},	{0xe0,0xa6,0xac,0xe0,0xa6,0xbc}},
+    {{0xe0,0xa7,0x9f},	{0xe0,0xa6,0xaf,0xe0,0xa6,0xbc}},
+    {{0xe0,0xa7,0x8b},	{0xe0,0xa7,0x87,0xe0,0xa6,0xbe}},
+    {{0xe0,0xa7,0x8c},	{0xe0,0xa7,0x87,0xe0,0xa7,0x97}},
+    {{0xe0,0xa9,0x99},	{0xe0,0xa8,0x96,0xe0,0xa8,0xbc}},
+    {{0xe0,0xa9,0x9a},	{0xe0,0xa8,0x97,0xe0,0xa8,0xbc}},
+    {{0xe0,0xa9,0x9b},	{0xe0,0xa8,0x9c,0xe0,0xa8,0xbc}},
+    {{0xe0,0xa9,0x9c},	{0xe0,0xa8,0xa1,0xe0,0xa8,0xbc}},
+    {{0xe0,0xa9,0x9e},	{0xe0,0xa8,0xab,0xe0,0xa8,0xbc}},
+    {{0xe0,0xad,0x9c},	{0xe0,0xac,0xa1,0xe0,0xac,0xbc}},
+    {{0xe0,0xad,0x9d},	{0xe0,0xac,0xa2,0xe0,0xac,0xbc}},
+    {{0xe0,0xad,0x9f},	{0xe0,0xac,0xaf,0xe0,0xac,0xbc}},
+    {{0xe0,0xad,0x8b},	{0xe0,0xad,0x87,0xe0,0xac,0xbe}},
+    {{0xe0,0xad,0x88},	{0xe0,0xad,0x87,0xe0,0xad,0x96}},
+    {{0xe0,0xad,0x8c},	{0xe0,0xad,0x87,0xe0,0xad,0x97}},
+    {{0xe0,0xae,0x94},	{0xe0,0xae,0x92,0xe0,0xaf,0x97}},
+    {{0xe0,0xaf,0x8a},	{0xe0,0xaf,0x86,0xe0,0xae,0xbe}},
+    {{0xe0,0xaf,0x8c},	{0xe0,0xaf,0x86,0xe0,0xaf,0x97}},
+    {{0xe0,0xaf,0x8b},	{0xe0,0xaf,0x87,0xe0,0xae,0xbe}},
+    {{0xe0,0xb1,0x88},	{0xe0,0xb1,0x86,0xe0,0xb1,0x96}},
+    {{0xe0,0xb3,0x80},	{0xe0,0xb2,0xbf,0xe0,0xb3,0x95}},
+    {{0xe0,0xb3,0x8a},	{0xe0,0xb3,0x86,0xe0,0xb3,0x82}},
+    {{0xe0,0xb3,0x8b},	{0xe0,0xb3,0x86,0xe0,0xb3,0x82,0xe0,0xb3,0x95}},
+    {{0xe0,0xb3,0x87},	{0xe0,0xb3,0x86,0xe0,0xb3,0x95}},
+    {{0xe0,0xb3,0x88},	{0xe0,0xb3,0x86,0xe0,0xb3,0x96}},
+    {{0xe0,0xb5,0x8a},	{0xe0,0xb5,0x86,0xe0,0xb4,0xbe}},
+    {{0xe0,0xb5,0x8c},	{0xe0,0xb5,0x86,0xe0,0xb5,0x97}},
+    {{0xe0,0xb5,0x8b},	{0xe0,0xb5,0x87,0xe0,0xb4,0xbe}},
+    {{0xe0,0xb8,0xb3},	{0xe0,0xb9,0x8d,0xe0,0xb8,0xb2}},
+    {{0xe0,0xba,0xb3},	{0xe0,0xbb,0x8d,0xe0,0xba,0xb2}},
+    {{0xe0,0xbd,0xa9},	{0xe0,0xbd,0x80,0xe0,0xbe,0xb5}},
+    {{0xe0,0xbd,0x83},	{0xe0,0xbd,0x82,0xe0,0xbe,0xb7}},
+    {{0xe0,0xbd,0x8d},	{0xe0,0xbd,0x8c,0xe0,0xbe,0xb7}},
+    {{0xe0,0xbd,0x92},	{0xe0,0xbd,0x91,0xe0,0xbe,0xb7}},
+    {{0xe0,0xbd,0x97},	{0xe0,0xbd,0x96,0xe0,0xbe,0xb7}},
+    {{0xe0,0xbd,0x9c},	{0xe0,0xbd,0x9b,0xe0,0xbe,0xb7}},
+    {{0xe0,0xbd,0xb3},	{0xe0,0xbd,0xb2,0xe0,0xbd,0xb1}},
+    {{0xe0,0xbd,0xb5},	{0xe0,0xbd,0xb4,0xe0,0xbd,0xb1}},
+    {{0xe0,0xbe,0x81},	{0xe0,0xbe,0x80,0xe0,0xbd,0xb1}},
+    {{0xe0,0xbe,0xb9},	{0xe0,0xbe,0x90,0xe0,0xbe,0xb5}},
+    {{0xe0,0xbe,0x93},	{0xe0,0xbe,0x92,0xe0,0xbe,0xb7}},
+    {{0xe0,0xbe,0x9d},	{0xe0,0xbe,0x9c,0xe0,0xbe,0xb7}},
+    {{0xe0,0xbe,0xa2},	{0xe0,0xbe,0xa1,0xe0,0xbe,0xb7}},
+    {{0xe0,0xbe,0xa7},	{0xe0,0xbe,0xa6,0xe0,0xbe,0xb7}},
+    {{0xe0,0xbe,0xac},	{0xe0,0xbe,0xab,0xe0,0xbe,0xb7}},
+    {{0xe0,0xbd,0xb6},	{0xe0,0xbe,0xb2,0xe0,0xbe,0x80}},
+    {{0xe0,0xbd,0xb7},	{0xe0,0xbe,0xb2,0xe0,0xbe,0x80,0xe0,0xbd,0xb1}},
+    {{0xe0,0xbd,0xb8},	{0xe0,0xbe,0xb3,0xe0,0xbe,0x80}},
+    {{0xe0,0xbd,0xb9},	{0xe0,0xbe,0xb3,0xe0,0xbe,0x80,0xe0,0xbd,0xb1}},
+    {{0xe1,0xbf,0x8d},	{0xe1,0xbe,0xbf,0xcc,0x80}},
+    {{0xe1,0xbf,0x8e},	{0xe1,0xbe,0xbf,0xcc,0x81}},
+    {{0xe1,0xbf,0x8f},	{0xe1,0xbe,0xbf,0xcd,0x82}},
+    {{0xe1,0xbf,0x9d},	{0xe1,0xbf,0xbe,0xcc,0x80}},
+    {{0xe1,0xbf,0x9e},	{0xe1,0xbf,0xbe,0xcc,0x81}},
+    {{0xe1,0xbf,0x9f},	{0xe1,0xbf,0xbe,0xcd,0x82}},
+    {{0xe3,0x82,0x94},	{0xe3,0x81,0x86,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0x8c},	{0xe3,0x81,0x8b,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0x8e},	{0xe3,0x81,0x8d,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0x90},	{0xe3,0x81,0x8f,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0x92},	{0xe3,0x81,0x91,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0x94},	{0xe3,0x81,0x93,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0x96},	{0xe3,0x81,0x95,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0x98},	{0xe3,0x81,0x97,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0x9a},	{0xe3,0x81,0x99,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0x9c},	{0xe3,0x81,0x9b,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0x9e},	{0xe3,0x81,0x9d,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0xa0},	{0xe3,0x81,0x9f,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0xa2},	{0xe3,0x81,0xa1,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0xa5},	{0xe3,0x81,0xa4,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0xa7},	{0xe3,0x81,0xa6,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0xa9},	{0xe3,0x81,0xa8,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0xb0},	{0xe3,0x81,0xaf,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0xb1},	{0xe3,0x81,0xaf,0xe3,0x82,0x9a}},
+    {{0xe3,0x81,0xb3},	{0xe3,0x81,0xb2,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0xb4},	{0xe3,0x81,0xb2,0xe3,0x82,0x9a}},
+    {{0xe3,0x81,0xb6},	{0xe3,0x81,0xb5,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0xb7},	{0xe3,0x81,0xb5,0xe3,0x82,0x9a}},
+    {{0xe3,0x81,0xb9},	{0xe3,0x81,0xb8,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0xba},	{0xe3,0x81,0xb8,0xe3,0x82,0x9a}},
+    {{0xe3,0x81,0xbc},	{0xe3,0x81,0xbb,0xe3,0x82,0x99}},
+    {{0xe3,0x81,0xbd},	{0xe3,0x81,0xbb,0xe3,0x82,0x9a}},
+    {{0xe3,0x82,0x9e},	{0xe3,0x82,0x9d,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0xb4},	{0xe3,0x82,0xa6,0xe3,0x82,0x99}},
+    {{0xe3,0x82,0xac},	{0xe3,0x82,0xab,0xe3,0x82,0x99}},
+    {{0xe3,0x82,0xae},	{0xe3,0x82,0xad,0xe3,0x82,0x99}},
+    {{0xe3,0x82,0xb0},	{0xe3,0x82,0xaf,0xe3,0x82,0x99}},
+    {{0xe3,0x82,0xb2},	{0xe3,0x82,0xb1,0xe3,0x82,0x99}},
+    {{0xe3,0x82,0xb4},	{0xe3,0x82,0xb3,0xe3,0x82,0x99}},
+    {{0xe3,0x82,0xb6},	{0xe3,0x82,0xb5,0xe3,0x82,0x99}},
+    {{0xe3,0x82,0xb8},	{0xe3,0x82,0xb7,0xe3,0x82,0x99}},
+    {{0xe3,0x82,0xba},	{0xe3,0x82,0xb9,0xe3,0x82,0x99}},
+    {{0xe3,0x82,0xbc},	{0xe3,0x82,0xbb,0xe3,0x82,0x99}},
+    {{0xe3,0x82,0xbe},	{0xe3,0x82,0xbd,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0x80},	{0xe3,0x82,0xbf,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0x82},	{0xe3,0x83,0x81,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0x85},	{0xe3,0x83,0x84,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0x87},	{0xe3,0x83,0x86,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0x89},	{0xe3,0x83,0x88,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0x90},	{0xe3,0x83,0x8f,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0x91},	{0xe3,0x83,0x8f,0xe3,0x82,0x9a}},
+    {{0xe3,0x83,0x93},	{0xe3,0x83,0x92,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0x94},	{0xe3,0x83,0x92,0xe3,0x82,0x9a}},
+    {{0xe3,0x83,0x96},	{0xe3,0x83,0x95,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0x97},	{0xe3,0x83,0x95,0xe3,0x82,0x9a}},
+    {{0xe3,0x83,0x99},	{0xe3,0x83,0x98,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0x9a},	{0xe3,0x83,0x98,0xe3,0x82,0x9a}},
+    {{0xe3,0x83,0x9c},	{0xe3,0x83,0x9b,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0x9d},	{0xe3,0x83,0x9b,0xe3,0x82,0x9a}},
+    {{0xe3,0x83,0xb7},	{0xe3,0x83,0xaf,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0xb8},	{0xe3,0x83,0xb0,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0xb9},	{0xe3,0x83,0xb1,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0xba},	{0xe3,0x83,0xb2,0xe3,0x82,0x99}},
+    {{0xe3,0x83,0xbe},	{0xe3,0x83,0xbd,0xe3,0x82,0x99}},
+};
+#endif /* UNICODE_NORMALIZATION */
+#endif /* UTF8_INPUT_ENABLE */
+
+#ifdef SHIFTJIS_CP932
+const unsigned short shiftjis_cp932[3][189] = {
+ {
+  0xEEEF, 0xEEF0, 0xEEF1, 0xEEF2, 0xEEF3, 0xEEF4, 0xEEF5, 0xEEF6,
+  0xEEF7, 0xEEF8, 0x8754, 0x8755, 0x8756, 0x8757, 0x8758, 0x8759,
+  0x875A, 0x875B, 0x875C, 0x875D, 0x81CA, 0xEEFA, 0xEEFB, 0xEEFC,
+  0x878A, 0x8782, 0x8784, 0x81E6, 0xED40, 0xED41, 0xED42, 0xED43,
+  0xED44, 0xED45, 0xED46, 0xED47, 0xED48, 0xED49, 0xED4A, 0xED4B,
+  0xED4C, 0xED4D, 0xED4E, 0xED4F, 0xED50, 0xED51, 0xED52, 0xED53,
+  0xED54, 0xED55, 0xED56, 0xED57, 0xED58, 0xED59, 0xED5A, 0xED5B,
+  0xED5C, 0xED5D, 0xED5E, 0xED5F, 0xED60, 0xED61, 0xED62,      0,
+  0xED63, 0xED64, 0xED65, 0xED66, 0xED67, 0xED68, 0xED69, 0xED6A,
+  0xED6B, 0xED6C, 0xED6D, 0xED6E, 0xED6F, 0xED70, 0xED71, 0xED72,
+  0xED73, 0xED74, 0xED75, 0xED76, 0xED77, 0xED78, 0xED79, 0xED7A,
+  0xED7B, 0xED7C, 0xED7D, 0xED7E, 0xED80, 0xED81, 0xED82, 0xED83,
+  0xED84, 0xED85, 0xED86, 0xED87, 0xED88, 0xED89, 0xED8A, 0xED8B,
+  0xED8C, 0xED8D, 0xED8E, 0xED8F, 0xED90, 0xED91, 0xED92, 0xED93,
+  0xED94, 0xED95, 0xED96, 0xED97, 0xED98, 0xED99, 0xED9A, 0xED9B,
+  0xED9C, 0xED9D, 0xED9E, 0xED9F, 0xEDA0, 0xEDA1, 0xEDA2, 0xEDA3,
+  0xEDA4, 0xEDA5, 0xEDA6, 0xEDA7, 0xEDA8, 0xEDA9, 0xEDAA, 0xEDAB,
+  0xEDAC, 0xEDAD, 0xEDAE, 0xEDAF, 0xEDB0, 0xEDB1, 0xEDB2, 0xEDB3,
+  0xEDB4, 0xEDB5, 0xEDB6, 0xEDB7, 0xEDB8, 0xEDB9, 0xEDBA, 0xEDBB,
+  0xEDBC, 0xEDBD, 0xEDBE, 0xEDBF, 0xEDC0, 0xEDC1, 0xEDC2, 0xEDC3,
+  0xEDC4, 0xEDC5, 0xEDC6, 0xEDC7, 0xEDC8, 0xEDC9, 0xEDCA, 0xEDCB,
+  0xEDCC, 0xEDCD, 0xEDCE, 0xEDCF, 0xEDD0, 0xEDD1, 0xEDD2, 0xEDD3,
+  0xEDD4, 0xEDD5, 0xEDD6, 0xEDD7, 0xEDD8, 0xEDD9, 0xEDDA, 0xEDDB,
+  0xEDDC, 0xEDDD, 0xEDDE, 0xEDDF, 0xEDE0,
+ },
+ {
+  0xEDE1, 0xEDE2, 0xEDE3, 0xEDE4, 0xEDE5, 0xEDE6, 0xEDE7, 0xEDE8,
+  0xEDE9, 0xEDEA, 0xEDEB, 0xEDEC, 0xEDED, 0xEDEE, 0xEDEF, 0xEDF0,
+  0xEDF1, 0xEDF2, 0xEDF3, 0xEDF4, 0xEDF5, 0xEDF6, 0xEDF7, 0xEDF8,
+  0xEDF9, 0xEDFA, 0xEDFB, 0xEDFC, 0xEE40, 0xEE41, 0xEE42, 0xEE43,
+  0xEE44, 0xEE45, 0xEE46, 0xEE47, 0xEE48, 0xEE49, 0xEE4A, 0xEE4B,
+  0xEE4C, 0xEE4D, 0xEE4E, 0xEE4F, 0xEE50, 0xEE51, 0xEE52, 0xEE53,
+  0xEE54, 0xEE55, 0xEE56, 0xEE57, 0xEE58, 0xEE59, 0xEE5A, 0xEE5B,
+  0xEE5C, 0xEE5D, 0xEE5E, 0xEE5F, 0xEE60, 0xEE61, 0xEE62,      0,
+  0xEE63, 0xEE64, 0xEE65, 0xEE66, 0xEE67, 0xEE68, 0xEE69, 0xEE6A,
+  0xEE6B, 0xEE6C, 0xEE6D, 0xEE6E, 0xEE6F, 0xEE70, 0xEE71, 0xEE72,
+  0xEE73, 0xEE74, 0xEE75, 0xEE76, 0xEE77, 0xEE78, 0xEE79, 0xEE7A,
+  0xEE7B, 0xEE7C, 0xEE7D, 0xEE7E, 0xEE80, 0xEE81, 0xEE82, 0xEE83,
+  0xEE84, 0xEE85, 0xEE86, 0xEE87, 0xEE88, 0xEE89, 0xEE8A, 0xEE8B,
+  0xEE8C, 0xEE8D, 0xEE8E, 0xEE8F, 0xEE90, 0xEE91, 0xEE92, 0xEE93,
+  0xEE94, 0xEE95, 0xEE96, 0xEE97, 0xEE98, 0xEE99, 0xEE9A, 0xEE9B,
+  0xEE9C, 0xEE9D, 0xEE9E, 0xEE9F, 0xEEA0, 0xEEA1, 0xEEA2, 0xEEA3,
+  0xEEA4, 0xEEA5, 0xEEA6, 0xEEA7, 0xEEA8, 0xEEA9, 0xEEAA, 0xEEAB,
+  0xEEAC, 0xEEAD, 0xEEAE, 0xEEAF, 0xEEB0, 0xEEB1, 0xEEB2, 0xEEB3,
+  0xEEB4, 0xEEB5, 0xEEB6, 0xEEB7, 0xEEB8, 0xEEB9, 0xEEBA, 0xEEBB,
+  0xEEBC, 0xEEBD, 0xEEBE, 0xEEBF, 0xEEC0, 0xEEC1, 0xEEC2, 0xEEC3,
+  0xEEC4, 0xEEC5, 0xEEC6, 0xEEC7, 0xEEC8, 0xEEC9, 0xEECA, 0xEECB,
+  0xEECC, 0xEECD, 0xEECE, 0xEECF, 0xEED0, 0xEED1, 0xEED2, 0xEED3,
+  0xEED4, 0xEED5, 0xEED6, 0xEED7, 0xEED8, 0xEED9, 0xEEDA, 0xEEDB,
+  0xEEDC, 0xEEDD, 0xEEDE, 0xEEDF, 0xEEE0,
+ },
+ {
+  0xEEE1, 0xEEE2, 0xEEE3, 0xEEE4, 0xEEE5, 0xEEE6, 0xEEE7, 0xEEE8,
+  0xEEE9, 0xEEEA, 0xEEEB, 0xEEEC,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,
+ },
+};
+const unsigned short cp932inv[2][189] = {
+ {
+  0xFA5C, 0xFA5D, 0xFA5E, 0xFA5F, 0xFA60, 0xFA61, 0xFA62, 0xFA63,
+  0xFA64, 0xFA65, 0xFA66, 0xFA67, 0xFA68, 0xFA69, 0xFA6A, 0xFA6B,
+  0xFA6C, 0xFA6D, 0xFA6E, 0xFA6F, 0xFA70, 0xFA71, 0xFA72, 0xFA73,
+  0xFA74, 0xFA75, 0xFA76, 0xFA77, 0xFA78, 0xFA79, 0xFA7A, 0xFA7B,
+  0xFA7C, 0xFA7D, 0xFA7E, 0xFA80, 0xFA81, 0xFA82, 0xFA83, 0xFA84,
+  0xFA85, 0xFA86, 0xFA87, 0xFA88, 0xFA89, 0xFA8A, 0xFA8B, 0xFA8C,
+  0xFA8D, 0xFA8E, 0xFA8F, 0xFA90, 0xFA91, 0xFA92, 0xFA93, 0xFA94,
+  0xFA95, 0xFA96, 0xFA97, 0xFA98, 0xFA99, 0xFA9A, 0xFA9B,      0,
+  0xFA9C, 0xFA9D, 0xFA9E, 0xFA9F, 0xFAA0, 0xFAA1, 0xFAA2, 0xFAA3,
+  0xFAA4, 0xFAA5, 0xFAA6, 0xFAA7, 0xFAA8, 0xFAA9, 0xFAAA, 0xFAAB,
+  0xFAAC, 0xFAAD, 0xFAAE, 0xFAAF, 0xFAB0, 0xFAB1, 0xFAB2, 0xFAB3,
+  0xFAB4, 0xFAB5, 0xFAB6, 0xFAB7, 0xFAB8, 0xFAB9, 0xFABA, 0xFABB,
+  0xFABC, 0xFABD, 0xFABE, 0xFABF, 0xFAC0, 0xFAC1, 0xFAC2, 0xFAC3,
+  0xFAC4, 0xFAC5, 0xFAC6, 0xFAC7, 0xFAC8, 0xFAC9, 0xFACA, 0xFACB,
+  0xFACC, 0xFACD, 0xFACE, 0xFACF, 0xFAD0, 0xFAD1, 0xFAD2, 0xFAD3,
+  0xFAD4, 0xFAD5, 0xFAD6, 0xFAD7, 0xFAD8, 0xFAD9, 0xFADA, 0xFADB,
+  0xFADC, 0xFADD, 0xFADE, 0xFADF, 0xFAE0, 0xFAE1, 0xFAE2, 0xFAE3,
+  0xFAE4, 0xFAE5, 0xFAE6, 0xFAE7, 0xFAE8, 0xFAE9, 0xFAEA, 0xFAEB,
+  0xFAEC, 0xFAED, 0xFAEE, 0xFAEF, 0xFAF0, 0xFAF1, 0xFAF2, 0xFAF3,
+  0xFAF4, 0xFAF5, 0xFAF6, 0xFAF7, 0xFAF8, 0xFAF9, 0xFAFA, 0xFAFB,
+  0xFAFC, 0xFB40, 0xFB41, 0xFB42, 0xFB43, 0xFB44, 0xFB45, 0xFB46,
+  0xFB47, 0xFB48, 0xFB49, 0xFB4A, 0xFB4B, 0xFB4C, 0xFB4D, 0xFB4E,
+  0xFB4F, 0xFB50, 0xFB51, 0xFB52, 0xFB53, 0xFB54, 0xFB55, 0xFB56,
+  0xFB57, 0xFB58, 0xFB59, 0xFB5A, 0xFB5B,
+ },
+ {
+  0xFB5C, 0xFB5D, 0xFB5E, 0xFB5F, 0xFB60, 0xFB61, 0xFB62, 0xFB63,
+  0xFB64, 0xFB65, 0xFB66, 0xFB67, 0xFB68, 0xFB69, 0xFB6A, 0xFB6B,
+  0xFB6C, 0xFB6D, 0xFB6E, 0xFB6F, 0xFB70, 0xFB71, 0xFB72, 0xFB73,
+  0xFB74, 0xFB75, 0xFB76, 0xFB77, 0xFB78, 0xFB79, 0xFB7A, 0xFB7B,
+  0xFB7C, 0xFB7D, 0xFB7E, 0xFB80, 0xFB81, 0xFB82, 0xFB83, 0xFB84,
+  0xFB85, 0xFB86, 0xFB87, 0xFB88, 0xFB89, 0xFB8A, 0xFB8B, 0xFB8C,
+  0xFB8D, 0xFB8E, 0xFB8F, 0xFB90, 0xFB91, 0xFB92, 0xFB93, 0xFB94,
+  0xFB95, 0xFB96, 0xFB97, 0xFB98, 0xFB99, 0xFB9A, 0xFB9B,      0,
+  0xFB9C, 0xFB9D, 0xFB9E, 0xFB9F, 0xFBA0, 0xFBA1, 0xFBA2, 0xFBA3,
+  0xFBA4, 0xFBA5, 0xFBA6, 0xFBA7, 0xFBA8, 0xFBA9, 0xFBAA, 0xFBAB,
+  0xFBAC, 0xFBAD, 0xFBAE, 0xFBAF, 0xFBB0, 0xFBB1, 0xFBB2, 0xFBB3,
+  0xFBB4, 0xFBB5, 0xFBB6, 0xFBB7, 0xFBB8, 0xFBB9, 0xFBBA, 0xFBBB,
+  0xFBBC, 0xFBBD, 0xFBBE, 0xFBBF, 0xFBC0, 0xFBC1, 0xFBC2, 0xFBC3,
+  0xFBC4, 0xFBC5, 0xFBC6, 0xFBC7, 0xFBC8, 0xFBC9, 0xFBCA, 0xFBCB,
+  0xFBCC, 0xFBCD, 0xFBCE, 0xFBCF, 0xFBD0, 0xFBD1, 0xFBD2, 0xFBD3,
+  0xFBD4, 0xFBD5, 0xFBD6, 0xFBD7, 0xFBD8, 0xFBD9, 0xFBDA, 0xFBDB,
+  0xFBDC, 0xFBDD, 0xFBDE, 0xFBDF, 0xFBE0, 0xFBE1, 0xFBE2, 0xFBE3,
+  0xFBE4, 0xFBE5, 0xFBE6, 0xFBE7, 0xFBE8, 0xFBE9, 0xFBEA, 0xFBEB,
+  0xFBEC, 0xFBED, 0xFBEE, 0xFBEF, 0xFBF0, 0xFBF1, 0xFBF2, 0xFBF3,
+  0xFBF4, 0xFBF5, 0xFBF6, 0xFBF7, 0xFBF8, 0xFBF9, 0xFBFA, 0xFBFB,
+  0xFBFC, 0xFC40, 0xFC41, 0xFC42, 0xFC43, 0xFC44, 0xFC45, 0xFC46,
+  0xFC47, 0xFC48, 0xFC49, 0xFC4A, 0xFC4B,      0,      0, 0xFA40,
+  0xFA41, 0xFA42, 0xFA43, 0xFA44, 0xFA45, 0xFA46, 0xFA47, 0xFA48,
+  0xFA49, 0x81CA, 0xFA55, 0xFA56, 0xFA57,
+ },
+};
+#endif /* SHIFTJIS_CP932 */
+
+#ifdef X0212_ENABLE
+const unsigned short shiftjis_x0212[3][189] = {
+ {
+  0xF373, 0xF374, 0xF375, 0xF376, 0xF377, 0xF378, 0xF379, 0xF37A,
+  0xF37B, 0xF37C, 0xF37D, 0xF37E, 0xF421, 0xF422, 0xF423, 0xF424,
+  0xF425, 0xF426, 0xF427, 0xF428, 0x224C, 0xA243, 0xF429, 0xF42A,
+  0xF42B, 0xF42C, 0xF42D, 0x2268, 0xD463, 0xDC5F, 0xE469, 0xE378,
+  0xD921, 0xB13B, 0xF42E, 0xC22D, 0xC37C, 0xE450, 0xC23F, 0xBC74,
+  0xB029, 0xB048, 0xF42F, 0xB052, 0xB054, 0xB063, 0xB06E, 0xB127,
+  0xB123, 0xB12C, 0xB129, 0xB13E, 0xB15F, 0xB158, 0xB148, 0xB157,
+  0xB163, 0xB174, 0xB161, 0xB223, 0xF430, 0xB23B, 0xB266,      0,
+  0xB26D, 0xB275, 0xB27C, 0xF431, 0xB335, 0xB358, 0xB35B, 0xB365,
+  0xB36E, 0xB37B, 0xF432, 0xF433, 0xB440, 0xB447, 0xB450, 0xB45E,
+  0xF434, 0xB52A, 0xF435, 0xB52F, 0xB544, 0xB568, 0xF436, 0xB742,
+  0xB764, 0xB768, 0xB767, 0xF437, 0xF438, 0xF439, 0xB84E, 0xB861,
+  0xB875, 0xB877, 0xB878, 0xB87C, 0xB92F, 0xB937, 0xBA3E, 0xBA5B,
+  0xCD2A, 0xBA61, 0xF43A, 0xBA6B, 0xBB33, 0xBB38, 0xF43B, 0xBB4A,
+  0xF43C, 0xF43D, 0xBB50, 0xBB5E, 0xBB74, 0xBB75, 0xBB79, 0xBC64,
+  0xBC6D, 0xBC7E, 0xF43E, 0xBD42, 0xBD67, 0xF43F, 0xBD70, 0xBE30,
+  0xBE2C, 0xF440, 0xBE33, 0xBE3D, 0xBE4D, 0xBE49, 0xBE64, 0xBF28,
+  0xBF49, 0xC044, 0xC064, 0xC074, 0xC126, 0xF441, 0xC175, 0xC17C,
+  0xF442, 0xC178, 0xC22B, 0xC221, 0xC225, 0xF443, 0xC238, 0xC23A,
+  0xF444, 0xC244, 0xC252, 0xC257, 0xC25B, 0xC25E, 0xC26D, 0xC270,
+  0xF445, 0xC321, 0xC335, 0xC349, 0xC339, 0xF446, 0xC358, 0xC37E,
+  0xF447, 0xC44C, 0xF448, 0xC459, 0xC46A, 0xC47D, 0xF449, 0xC527,
+  0xC535, 0xC536, 0xF44A, 0xC555, 0xC638, 0xC657, 0xC660, 0xC66A,
+  0xC663, 0xC721, 0xC72B, 0xC747, 0xC743,
+ },
+ {
+  0xC74B, 0xC74F, 0xC759, 0xF44B, 0xF44C, 0xC766, 0xC76E, 0xC77C,
+  0xC76B, 0xC770, 0xC831, 0xC865, 0xC878, 0xC926, 0xC92B, 0xC92D,
+  0xF44D, 0xC94A, 0xC953, 0xC969, 0xC963, 0xC97C, 0xC974, 0xC975,
+  0xF44E, 0xCA33, 0xCA3D, 0xCA6F, 0xCA71, 0xCB2E, 0xF44F, 0xCB4A,
+  0xCB66, 0xCB6A, 0xCB70, 0xCB74, 0xCB6E, 0xCC25, 0xCB79, 0xCC2B,
+  0xCC2E, 0xCC2D, 0xCC32, 0xCC42, 0xCC50, 0xCC59, 0xF450, 0xCD3B,
+  0xF451, 0xCE3B, 0xF452, 0xCE3A, 0xCE43, 0xF453, 0xCE72, 0xB35D,
+  0xCF55, 0xCF62, 0xCF69, 0xCF6D, 0xF454, 0xF455, 0xF456,      0,
+  0xF457, 0xD065, 0xF458, 0xD069, 0xD168, 0xF459, 0xF45A, 0xD16C,
+  0xD23B, 0xF45B, 0xD361, 0xD368, 0xD427, 0xF45C, 0xF45D, 0xD454,
+  0xD472, 0xD52E, 0xF45E, 0xD75E, 0xF45F, 0xD822, 0xD837, 0xD841,
+  0xD851, 0xD874, 0xD946, 0xD948, 0xD951, 0xF460, 0xF461, 0xF462,
+  0xF463, 0xF464, 0xDC53, 0xDD48, 0xDD54, 0xDD6A, 0xDD7A, 0xDE24,
+  0xDE30, 0xF465, 0xDE35, 0xDE4B, 0xF466, 0xDF39, 0xF467, 0xDF43,
+  0xF468, 0xF469, 0xE059, 0xF46A, 0xF46B, 0xE162, 0xF46C, 0xF46D,
+  0xF46E, 0xE247, 0xE328, 0xE326, 0xE329, 0xE32F, 0xE330, 0xE32A,
+  0xE32B, 0xE33C, 0xE341, 0xE33F, 0xE355, 0xE358, 0xE356, 0xE35F,
+  0xE363, 0xE361, 0xE354, 0xE369, 0xE426, 0xE371, 0xE372, 0xE44B,
+  0xE441, 0xE443, 0xE43E, 0xF46F, 0xE440, 0xE447, 0xE43F, 0xE460,
+  0xE45E, 0xE451, 0xF470, 0xE45C, 0xE452, 0xE45B, 0xE454, 0xE47A,
+  0xE46F, 0xE533, 0xE53F, 0xE549, 0xE550, 0xE562, 0xE56A, 0xE56B,
+  0xF471, 0xF472, 0xF473, 0xE668, 0xE66F, 0xE72C, 0xF474, 0xE72E,
+  0xF475, 0xE731, 0xF476, 0xE732, 0xE831, 0xE836, 0xF477, 0xF478,
+  0xE85D, 0xF479, 0xF47A, 0xE951, 0xF47B,
+ },
+ {
+  0xE96D, 0xEA4D, 0xF47C, 0xEA5B, 0xEA66, 0xEA6A, 0xEB25, 0xEB7B,
+  0xEB7A, 0xF47D, 0xEC56, 0xF47E,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,      0,      0,      0,
+       0,      0,      0,      0,      0,
+ },
+};
+
+const unsigned short x0212_shiftjis_A2[] = {
+         0x819F,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0x8143,      0,      0, 0x8150,      0,      0, 0x8160,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFA55,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_B0[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0, 0xFA68,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFA69,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFA6B,      0, 0xFA6C,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFA6D,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFA6E,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_B1[] = {
+              0,      0, 0xFA70,      0,      0,      0, 0xFA6F,
+      0, 0xFA72,      0,      0, 0xFA71,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFA61,      0,      0, 0xFA73,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFA76,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xFA77,
+ 0xFA75,      0,      0,      0,      0,      0,      0, 0xFA74,
+      0, 0xFA7A,      0, 0xFA78,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFA79,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_B2[] = {
+              0,      0, 0xFA7B,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFA7D,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFA7E,      0,
+      0,      0,      0,      0,      0, 0xFA80,      0,      0,
+      0,      0,      0,      0,      0, 0xFA81,      0,      0,
+      0,      0,      0,      0, 0xFA82,      0,      0,
+};
+const unsigned short x0212_shiftjis_B3[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFA84,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFA85,      0,      0, 0xFA86,      0, 0xFB77,      0,      0,
+      0,      0,      0,      0,      0, 0xFA87,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFA88,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFA89,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_B4[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFA8C,      0,      0,      0,      0,      0,      0, 0xFA8D,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFA8E,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFA8F,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_B5[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFA91,      0,      0,      0,      0, 0xFA93,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFA94,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFA95,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_B7[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFA97,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFA98,      0,      0, 0xFA9A,
+ 0xFA99,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_B8[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFA9E,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFA9F,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFAA0,      0, 0xFAA1,
+ 0xFAA2,      0,      0,      0, 0xFAA3,      0,      0,
+};
+const unsigned short x0212_shiftjis_B9[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xFAA4,
+      0,      0,      0,      0,      0,      0,      0, 0xFAA5,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_BA[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFAA6,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFAA7,      0,      0,      0,      0,
+      0, 0xFAA9,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFAAB,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_BB[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFAAC,      0,      0,      0,      0,
+ 0xFAAD,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFAAF,      0,      0,      0,      0,      0,
+ 0xFAB2,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFAB3,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFAB4, 0xFAB5,      0,      0,
+      0, 0xFAB6,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_BC[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFAB7,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFAB8,      0,      0,
+      0,      0,      0,      0, 0xFA67,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFAB9,
+};
+const unsigned short x0212_shiftjis_BD[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFABB,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xFABC,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFABE,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_BE[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFAC0,      0,      0,      0,
+ 0xFABF,      0,      0, 0xFAC2,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFAC3,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFAC5,      0,      0,      0, 0xFAC4,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFAC6,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_BF[] = {
+              0,      0,      0,      0,      0,      0,      0,
+ 0xFAC7,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFAC8,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_C0[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFAC9,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFACA,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFACB,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_C1[] = {
+              0,      0,      0,      0,      0, 0xFACC,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFACE,      0,      0,
+ 0xFAD1,      0,      0,      0, 0xFACF,      0,      0,
+};
+const unsigned short x0212_shiftjis_C2[] = {
+         0xFAD3,      0,      0,      0, 0xFAD4,      0,      0,
+      0,      0,      0, 0xFAD2,      0, 0xFA63,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFAD6,      0, 0xFAD7,      0,      0,      0,      0, 0xFA66,
+      0,      0,      0,      0, 0xFAD9,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFADA,      0,      0,      0,      0, 0xFADB,
+      0,      0,      0, 0xFADC,      0,      0, 0xFADD,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFADE,      0,      0,
+ 0xFADF,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_C3[] = {
+         0xFAE1,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFAE2,      0,      0,
+      0, 0xFAE4,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFAE3,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFAE6,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFA64,      0, 0xFAE7,
+};
+const unsigned short x0212_shiftjis_C4[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFAE9,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFAEB,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFAEC,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFAED,      0,
+};
+const unsigned short x0212_shiftjis_C5[] = {
+              0,      0,      0,      0,      0,      0, 0xFAEF,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFAF0, 0xFAF1,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFAF3,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_C6[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFAF4,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xFAF5,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFAF6,      0,      0, 0xFAF8,      0,      0,      0,      0,
+      0,      0, 0xFAF7,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_C7[] = {
+         0xFAF9,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFAFA,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFAFC,      0,      0,      0, 0xFAFB,
+      0,      0,      0, 0xFB40,      0,      0,      0, 0xFB41,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFB42,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFB45,      0,
+      0,      0,      0, 0xFB48,      0,      0, 0xFB46,      0,
+ 0xFB49,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFB47,      0,      0,
+};
+const unsigned short x0212_shiftjis_C8[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFB4A,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFB4B,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFB4C,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_C9[] = {
+              0,      0,      0,      0,      0, 0xFB4D,      0,
+      0,      0,      0, 0xFB4E,      0, 0xFB4F,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFB51,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFB52,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFB54,      0,      0,      0,      0,
+      0, 0xFB53,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFB56, 0xFB57,      0,      0,
+      0,      0,      0,      0, 0xFB55,      0,      0,
+};
+const unsigned short x0212_shiftjis_CA[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFB59,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFB5A,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xFB5B,
+      0, 0xFB5C,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_CB[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFB5D,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFB5F,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFB60,      0,
+      0,      0, 0xFB61,      0,      0,      0, 0xFB64,      0,
+ 0xFB62,      0,      0,      0, 0xFB63,      0,      0,      0,
+      0, 0xFB66,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_CC[] = {
+              0,      0,      0,      0, 0xFB65,      0,      0,
+      0,      0,      0, 0xFB67,      0, 0xFB69, 0xFB68,      0,
+      0,      0, 0xFB6A,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFB6B,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFB6C,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFB6D,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_CD[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFAA8,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFB6F,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_CE[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFB73, 0xFB71,      0,      0,      0,      0,
+      0,      0,      0, 0xFB74,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFB76,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_CF[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFB78,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFB79,      0,      0,      0,      0,      0,
+      0, 0xFB7A,      0,      0,      0, 0xFB7B,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_D0[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFB81,      0,      0,
+      0, 0xFB83,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_D1[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFB84,      0,      0,      0, 0xFB87,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_D2[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFB88,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_D3[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFB8A,      0,      0,      0,      0,      0,      0,
+ 0xFB8B,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_D4[] = {
+              0,      0,      0,      0,      0,      0, 0xFB8C,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFB8F,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFA5C,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFB90,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_D5[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFB91,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_D7[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFB93,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_D8[] = {
+              0, 0xFB95,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xFB96,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFB97,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFB98,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFB99,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_D9[] = {
+         0xFA60,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFB9A,      0,
+ 0xFB9B,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFB9C,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_DC[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFBA2,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xFA5D,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_DD[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFBA3,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFBA4,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFBA5,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFBA6,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_DE[] = {
+              0,      0,      0, 0xFBA7,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFBA8,      0,      0,      0,      0, 0xFBAA,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFBAB,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_DF[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFBAD,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFBAF,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_E0[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFBB2,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_E1[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFBB5,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_E2[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xFBB9,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_E3[] = {
+              0,      0,      0,      0,      0, 0xFBBB,      0,
+ 0xFBBA, 0xFBBC, 0xFBBF, 0xFBC0,      0,      0,      0, 0xFBBD,
+ 0xFBBE,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFBC1,      0,      0, 0xFBC3,
+      0, 0xFBC2,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFBCA, 0xFBC4, 0xFBC6,      0,
+ 0xFBC5,      0,      0,      0,      0,      0,      0, 0xFBC7,
+      0, 0xFBC9,      0, 0xFBC8,      0,      0,      0,      0,
+      0, 0xFBCB,      0,      0,      0,      0,      0,      0,
+      0, 0xFBCD, 0xFBCE,      0,      0,      0,      0,      0,
+ 0xFA5F,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_E4[] = {
+              0,      0,      0,      0,      0, 0xFBCC,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFBD2, 0xFBD6,
+ 0xFBD4, 0xFBD0,      0, 0xFBD1,      0,      0,      0, 0xFBD5,
+      0,      0,      0, 0xFBCF,      0,      0,      0,      0,
+ 0xFA65, 0xFBD9, 0xFBDC,      0, 0xFBDE,      0,      0,      0,
+      0,      0,      0, 0xFBDD, 0xFBDB,      0, 0xFBD8,      0,
+ 0xFBD7,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFA5E,      0,      0,      0,      0,      0, 0xFBE0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFBDF,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_E5[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFBE1,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0, 0xFBE2,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFBE3,      0,      0,      0,      0,      0,      0,
+ 0xFBE4,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFBE5,      0,      0,      0,      0,      0,
+      0,      0, 0xFBE6, 0xFBE7,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_E6[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+ 0xFBEB,      0,      0,      0,      0,      0,      0, 0xFBEC,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_E7[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0, 0xFBED,      0, 0xFBEF,      0,
+      0, 0xFBF1, 0xFBF3,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_E8[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFBF4,      0,      0,      0,      0, 0xFBF5,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFBF8,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_E9[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0, 0xFBFB,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFC40,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_EA[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0, 0xFC41,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFC43,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFC44,      0,
+      0,      0, 0xFC45,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_EB[] = {
+              0,      0,      0,      0, 0xFC46,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0, 0xFC48, 0xFC47,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_EC[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0, 0xFC4A,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,
+};
+const unsigned short x0212_shiftjis_F3[] = {
+              0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0,      0,      0,      0,      0,      0,
+      0,      0,      0, 0xFA40, 0xFA41, 0xFA42, 0xFA43, 0xFA44,
+ 0xFA45, 0xFA46, 0xFA47, 0xFA48, 0xFA49, 0xFA4A, 0xFA4B,
+};
+const unsigned short x0212_shiftjis_F4[] = {
+         0xFA4C, 0xFA4D, 0xFA4E, 0xFA4F, 0xFA50, 0xFA51, 0xFA52,
+ 0xFA53, 0xFA56, 0xFA57, 0xFA58, 0xFA59, 0xFA5A, 0xFA62, 0xFA6A,
+ 0xFA7C, 0xFA83, 0xFA8A, 0xFA8B, 0xFA90, 0xFA92, 0xFA96, 0xFA9B,
+ 0xFA9C, 0xFA9D, 0xFAAA, 0xFAAE, 0xFAB0, 0xFAB1, 0xFABA, 0xFABD,
+ 0xFAC1, 0xFACD, 0xFAD0, 0xFAD5, 0xFAD8, 0xFAE0, 0xFAE5, 0xFAE8,
+ 0xFAEA, 0xFAEE, 0xFAF2, 0xFB43, 0xFB44, 0xFB50, 0xFB58, 0xFB5E,
+ 0xFB6E, 0xFB70, 0xFB72, 0xFB75, 0xFB7C, 0xFB7D, 0xFB7E, 0xFB80,
+ 0xFB82, 0xFB85, 0xFB86, 0xFB89, 0xFB8D, 0xFB8E, 0xFB92, 0xFB94,
+ 0xFB9D, 0xFB9E, 0xFB9F, 0xFBA0, 0xFBA1, 0xFBA9, 0xFBAC, 0xFBAE,
+ 0xFBB0, 0xFBB1, 0xFBB3, 0xFBB4, 0xFBB6, 0xFBB7, 0xFBB8, 0xFBD3,
+ 0xFBDA, 0xFBE8, 0xFBE9, 0xFBEA, 0xFBEE, 0xFBF0, 0xFBF2, 0xFBF6,
+ 0xFBF7, 0xFBF9, 0xFBFA, 0xFBFC, 0xFC42, 0xFC49, 0xFC4B,
+};
+const unsigned short *const x0212_shiftjis[] = {
+                                    0, x0212_shiftjis_A2,                 0,
+                 0,                 0,                 0,                 0,
+                 0,                 0,                 0,                 0,
+                 0,                 0,                 0,                 0,
+ x0212_shiftjis_B0, x0212_shiftjis_B1, x0212_shiftjis_B2, x0212_shiftjis_B3,
+ x0212_shiftjis_B4, x0212_shiftjis_B5,                 0, x0212_shiftjis_B7,
+ x0212_shiftjis_B8, x0212_shiftjis_B9, x0212_shiftjis_BA, x0212_shiftjis_BB,
+ x0212_shiftjis_BC, x0212_shiftjis_BD, x0212_shiftjis_BE, x0212_shiftjis_BF,
+ x0212_shiftjis_C0, x0212_shiftjis_C1, x0212_shiftjis_C2, x0212_shiftjis_C3,
+ x0212_shiftjis_C4, x0212_shiftjis_C5, x0212_shiftjis_C6, x0212_shiftjis_C7,
+ x0212_shiftjis_C8, x0212_shiftjis_C9, x0212_shiftjis_CA, x0212_shiftjis_CB,
+ x0212_shiftjis_CC, x0212_shiftjis_CD, x0212_shiftjis_CE, x0212_shiftjis_CF,
+ x0212_shiftjis_D0, x0212_shiftjis_D1, x0212_shiftjis_D2, x0212_shiftjis_D3,
+ x0212_shiftjis_D4, x0212_shiftjis_D5,                 0, x0212_shiftjis_D7,
+ x0212_shiftjis_D8, x0212_shiftjis_D9,                 0,                 0,
+ x0212_shiftjis_DC, x0212_shiftjis_DD, x0212_shiftjis_DE, x0212_shiftjis_DF,
+ x0212_shiftjis_E0, x0212_shiftjis_E1, x0212_shiftjis_E2, x0212_shiftjis_E3,
+ x0212_shiftjis_E4, x0212_shiftjis_E5, x0212_shiftjis_E6, x0212_shiftjis_E7,
+ x0212_shiftjis_E8, x0212_shiftjis_E9, x0212_shiftjis_EA, x0212_shiftjis_EB,
+ x0212_shiftjis_EC,                 0,                 0,                 0,
+                 0,                 0,                 0, x0212_shiftjis_F3,
+ x0212_shiftjis_F4,                 0,                 0,                 0,
+                 0,                 0,                 0,                 0,
+                 0,                 0,                 0,
+};
+#endif /* X0212_ENABLE */
diff --git a/ruby_1_8_6/ext/nkf/nkf-utf8/utf8tbl.h b/ruby_1_8_6/ext/nkf/nkf-utf8/utf8tbl.h
new file mode 100644
index 0000000000..1f40f0b363
--- /dev/null
+++ b/ruby_1_8_6/ext/nkf/nkf-utf8/utf8tbl.h
@@ -0,0 +1,34 @@
+#ifndef _UTF8TBL_H_
+#define _UTF8TBL_H_
+
+#ifdef UTF8_OUTPUT_ENABLE
+extern const unsigned short euc_to_utf8_1byte[];
+extern const unsigned short *const euc_to_utf8_2bytes[];
+extern const unsigned short *const euc_to_utf8_2bytes_ms[];
+extern const unsigned short *const x0212_to_utf8_2bytes[];
+#endif /* UTF8_OUTPUT_ENABLE */
+
+#ifdef UTF8_INPUT_ENABLE
+extern const unsigned short *const utf8_to_euc_2bytes[];
+extern const unsigned short *const utf8_to_euc_2bytes_ms[];
+extern const unsigned short *const utf8_to_euc_2bytes_932[];
+extern const unsigned short *const *const utf8_to_euc_3bytes[];
+extern const unsigned short *const *const utf8_to_euc_3bytes_ms[];
+extern const unsigned short *const *const utf8_to_euc_3bytes_932[];
+#endif /* UTF8_INPUT_ENABLE */
+
+#ifdef UNICODE_NORMALIZATION
+extern const struct normalization_pair normalization_table[];
+#endif
+
+#ifdef SHIFTJIS_CP932
+extern const unsigned short shiftjis_cp932[3][189];
+extern const unsigned short cp932inv[2][189];
+#endif /* SHIFTJIS_CP932 */
+
+#ifdef X0212_ENABLE
+extern const unsigned short shiftjis_x0212[3][189];
+extern const unsigned short *const x0212_shiftjis[];
+#endif /* X0212_ENABLE */
+
+#endif
diff --git a/ruby_1_8_6/ext/nkf/nkf.c b/ruby_1_8_6/ext/nkf/nkf.c
new file mode 100644
index 0000000000..2bb0340a64
--- /dev/null
+++ b/ruby_1_8_6/ext/nkf/nkf.c
@@ -0,0 +1,654 @@
+/*
+ *  NKF - Ruby extension for Network Kanji Filter
+ *
+ *  original nkf2.x is maintained at http://sourceforge.jp/projects/nkf/
+ *
+ *  $Id$
+ *
+ */
+
+#define RUBY_NKF_REVISION "$Revision$"
+#define RUBY_NKF_VERSION NKF_VERSION " (" NKF_RELEASE_DATE ")"
+
+#include "ruby.h"
+
+/* Encoding Constants */
+#define	_AUTO		0
+#define	_JIS		1
+#define	_EUC		2
+#define	_SJIS		3
+#define	_BINARY		4
+#define	_NOCONV		4
+#define	_ASCII		5
+/* 0b011x is reserved for UTF-8 Family */
+#define	_UTF8		6
+/* 0b10xx is reserved for UTF-16 Family */
+#define	_UTF16		8
+/* 0b11xx is reserved for UTF-32 Family */
+#define	_UTF32		12
+#define	_OTHER		16
+#define	_UNKNOWN	_AUTO
+
+/* Replace nkf's getchar/putchar for variable modification */
+/* we never use getc, ungetc */
+
+#undef getc
+#undef ungetc
+#define getc(f)         (input_ctr>=i_len?-1:input[input_ctr++])
+#define ungetc(c,f)     input_ctr--
+
+#define INCSIZE         32
+#undef putchar
+#undef TRUE
+#undef FALSE
+#define putchar(c)      rb_nkf_putchar(c)
+
+/* Input/Output pointers */
+
+static unsigned char *output;
+static unsigned char *input;
+static int input_ctr;
+static int i_len;
+static int output_ctr;
+static int o_len;
+static int incsize;
+
+static VALUE result;
+
+static int
+rb_nkf_putchar(c)
+  unsigned int c;
+{
+  if (output_ctr >= o_len) {
+    o_len += incsize;
+    rb_str_resize(result, o_len);
+    incsize *= 2;
+    output = (unsigned char *)RSTRING(result)->ptr;
+  }
+  output[output_ctr++] = c;
+
+  return c;
+}
+
+/* Include kanji filter main part */
+/* getchar and putchar will be replaced during inclusion */
+
+#define PERL_XS 1
+#include "nkf-utf8/config.h"
+#include "nkf-utf8/utf8tbl.c"
+#include "nkf-utf8/nkf.c"
+
+int nkf_split_options(arg)
+    const char* arg;
+{
+    int count = 0;
+    char option[256];
+    int i = 0, j = 0;
+    int is_escaped = FALSE;
+    int is_single_quoted = FALSE;
+    int is_double_quoted = FALSE;
+    for(i = 0; arg[i]; i++){
+	if(j == 255){
+	    return -1;
+	}else if(is_single_quoted){
+	    if(arg[i] == '\''){
+		is_single_quoted = FALSE;
+	    }else{
+		option[j++] = arg[i];
+	    }
+	}else if(is_escaped){
+	    is_escaped = FALSE;
+	    option[j++] = arg[i];
+	}else if(arg[i] == '\\'){
+	    is_escaped = TRUE;
+	}else if(is_double_quoted){
+	    if(arg[i] == '"'){
+		is_double_quoted = FALSE;
+	    }else{
+		option[j++] = arg[i];
+	    }
+	}else if(arg[i] == '\''){
+	    is_single_quoted = TRUE;
+	}else if(arg[i] == '"'){
+	    is_double_quoted = TRUE;
+	}else if(arg[i] == ' '){
+	    option[j] = '\0';
+	    options(option);
+	    j = 0;
+	}else{
+	    option[j++] = arg[i];
+	}
+    }
+    if(j){
+	option[j] = '\0';
+	options(option);
+    }
+    return count;
+}
+
+/*
+ *  call-seq:
+ *     NKF.nkf(opt, str)   -> string
+ *
+ *  Convert _str_ and return converted result.
+ *  Conversion details are specified by _opt_ as String.
+ *
+ *     require 'nkf'
+ *     output = NKF.nkf("-s", input)
+ *
+ *  *Note*
+ *  By default, nkf decodes MIME encoded string.
+ *  If you want not to decode input, use NKF.nkf with <b>-m0</b> flag.
+ */
+
+static VALUE
+rb_nkf_kconv(obj, opt, src)
+  VALUE obj, opt, src;
+{
+  char *opt_ptr, *opt_end;
+  volatile VALUE v;
+
+  reinit();
+  StringValue(opt);
+  opt_ptr = RSTRING(opt)->ptr;
+  opt_end = opt_ptr + RSTRING(opt)->len;
+  nkf_split_options(opt_ptr);
+
+  incsize = INCSIZE;
+
+  input_ctr = 0;
+  StringValue(src);
+  input = (unsigned char *)RSTRING(src)->ptr;
+  i_len = RSTRING(src)->len;
+  result = rb_str_new(0, i_len*3 + 10);
+  v = result;
+
+  output_ctr = 0;
+  output     = (unsigned char *)RSTRING(result)->ptr;
+  o_len      = RSTRING(result)->len;
+  *output    = '\0';
+
+  if(x0201_f == WISH_TRUE)
+    x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
+
+  kanji_convert(NULL);
+  RSTRING(result)->ptr[output_ctr] = '\0';
+  RSTRING(result)->len = output_ctr;
+  OBJ_INFECT(result, src);
+
+  return result;
+}
+
+
+/*
+ *  call-seq:
+ *     NKF.guess1(str)  -> integer
+ *
+ *  Returns guessed encoding of _str_ as integer.
+ *
+ *  Algorithm described in:
+ *  Ken Lunde. `Understanding Japanese Information Processing'
+ *  Sebastopol, CA: O'Reilly & Associates.
+ *
+ *      case NKF.guess1(input)
+ *      when NKF::JIS
+ *        "ISO-2022-JP"
+ *      when NKF::SJIS
+ *        "Shift_JIS"
+ *      when NKF::EUC
+ *        "EUC-JP"
+ *      when NKF::UNKNOWN
+ *        "UNKNOWN(ASCII)"
+ *      when NKF::BINARY
+ *        "BINARY"
+ *      end
+ */
+
+static VALUE
+rb_nkf_guess1(obj, src)
+  VALUE obj, src;
+{
+  unsigned char *p;
+  unsigned char *pend;
+  int sequence_counter = 0;
+
+  StringValue(src);
+  p = (unsigned char *)RSTRING(src)->ptr;
+  pend = p + RSTRING(src)->len;
+  if (p == pend) return INT2FIX(_UNKNOWN);
+
+#define INCR do {\
+      p++;\
+      if (p==pend) return INT2FIX(_UNKNOWN);\
+      sequence_counter++;\
+      if (sequence_counter % 2 == 1 && *p != 0xa4)\
+	sequence_counter = 0;\
+      if (6 <= sequence_counter) {\
+	  sequence_counter = 0;\
+	  return INT2FIX(_EUC);\
+      }\
+  } while (0)
+
+  if (*p == 0xa4)
+    sequence_counter = 1;
+
+  while (p<pend) {
+    if (*p == '\033') {
+      return INT2FIX(_JIS);
+    }
+    if (*p < '\006' || *p == 0x7f || *p == 0xff) {
+      return INT2FIX(_BINARY);
+    }
+    if (0x81 <= *p && *p <= 0x8d) {
+      return INT2FIX(_SJIS);
+    }
+    if (0x8f <= *p && *p <= 0x9f) {
+      return INT2FIX(_SJIS);
+    }
+    if (*p == 0x8e) {	/* SS2 */
+      INCR;
+      if ((0x40 <= *p && *p <= 0x7e) ||
+	  (0x80 <= *p && *p <= 0xa0) ||
+	  (0xe0 <= *p && *p <= 0xfc))
+	return INT2FIX(_SJIS);
+    }
+    else if (0xa1 <= *p && *p <= 0xdf) {
+      INCR;
+      if (0xf0 <= *p && *p <= 0xfe)
+	return INT2FIX(_EUC);
+      if (0xe0 <= *p && *p <= 0xef) {
+	while (p < pend && *p >= 0x40) {
+	  if (*p >= 0x81) {
+	    if (*p <= 0x8d || (0x8f <= *p && *p <= 0x9f)) {
+	      return INT2FIX(_SJIS);
+	    }
+	    else if (0xfd <= *p && *p <= 0xfe) {
+	      return INT2FIX(_EUC);
+	    }
+	  }
+	  INCR;
+	}
+      }
+      else if (*p <= 0x9f) {
+	return INT2FIX(_SJIS);
+      }
+    }
+    else if (0xf0 <= *p && *p <= 0xfe) {
+      return INT2FIX(_EUC);
+    }
+    else if (0xe0 <= *p && *p <= 0xef) {
+      INCR;
+      if ((0x40 <= *p && *p <= 0x7e) ||
+	  (0x80 <= *p && *p <= 0xa0)) {
+	return INT2FIX(_SJIS);
+      }
+      if (0xfd <= *p && *p <= 0xfe) {
+	return INT2FIX(_EUC);
+      }
+    }
+    INCR;
+  }
+  return INT2FIX(_UNKNOWN);
+}
+
+
+/*
+ *  call-seq:
+ *     NKF.guess2(str)  -> integer
+ *
+ *  Returns guessed encoding of _str_ as integer by nkf routine.
+ *
+ *     case NKF.guess(input)
+ *     when NKF::ASCII
+ *       "ASCII"
+ *     when NKF::JIS
+ *       "ISO-2022-JP"
+ *     when NKF::SJIS
+ *       "Shift_JIS"
+ *     when NKF::EUC
+ *       "EUC-JP"
+ *     when NKF::UTF8
+ *       "UTF-8"
+ *     when NKF::UTF16
+ *       "UTF-16"
+ *     when NKF::UNKNOWN
+ *       "UNKNOWN"
+ *     when NKF::BINARY
+ *       "BINARY"
+ *     end
+ */
+
+static VALUE
+rb_nkf_guess2(obj, src)
+  VALUE obj, src;
+{
+  int code = _BINARY;
+
+  reinit();
+
+  input_ctr = 0;
+  StringValue(src);
+  input = (unsigned char *)RSTRING(src)->ptr;
+  i_len = RSTRING(src)->len;
+
+  if(x0201_f == WISH_TRUE)
+    x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
+
+  guess_f = TRUE;
+  kanji_convert( NULL );
+  guess_f = FALSE;
+
+  if (!is_inputcode_mixed) {
+    if (strcmp(input_codename, "") == 0) {
+      code = _ASCII;
+    } else if (strcmp(input_codename, "ISO-2022-JP") == 0) {
+      code = _JIS;
+    } else if (strcmp(input_codename, "EUC-JP") == 0) {
+      code = _EUC;
+    } else if (strcmp(input_codename, "Shift_JIS") == 0) {
+      code = _SJIS;
+    } else if (strcmp(input_codename, "UTF-8") == 0) {
+      code = _UTF8;
+    } else if (strcmp(input_codename, "UTF-16") == 0) {
+      code = _UTF16;
+    } else if (strlen(input_codename) > 0) {
+      code = _UNKNOWN;
+    }
+  }
+
+  return INT2FIX( code );
+}
+
+
+/*
+ *  NKF - Ruby extension for Network Kanji Filter 
+ *
+ *  == Description
+ *
+ *  This is a Ruby Extension version of nkf (Netowrk Kanji Filter).
+ *  It converts the first argument and return converted result. Conversion
+ *  details are specified by flags as the first argument.
+ *
+ *  *Nkf* is a yet another kanji code converter among networks, hosts and terminals.
+ *  It converts input kanji code to designated kanji code
+ *  such as ISO-2022-JP, Shift_JIS, EUC-JP, UTF-8 or UTF-16.
+ *
+ *  One of the most unique faculty of *nkf* is the guess of the input kanji encodings.
+ *  It currently recognizes ISO-2022-JP, Shift_JIS, EUC-JP, UTF-8 and UTF-16.
+ *  So users needn't set the input kanji code explicitly.
+ *
+ *  By default, X0201 kana is converted into X0208 kana.
+ *  For X0201 kana, SO/SI, SSO and ESC-(-I methods are supported.
+ *  For automatic code detection, nkf assumes no X0201 kana in Shift_JIS.
+ *  To accept X0201 in Shift_JIS, use <b>-X</b>, <b>-x</b> or <b>-S</b>.
+ *
+ *  == Flags
+ *
+ *  === -b -u
+ *
+ *  Output is buffered (DEFAULT), Output is unbuffered.
+ *
+ *  === -j -s -e -w -w16
+ *
+ *  Output code is ISO-2022-JP (7bit JIS), Shift_JIS, EUC-JP,
+ *  UTF-8N, UTF-16BE.
+ *  Without this option and compile option, ISO-2022-JP is assumed.
+ *
+ *  === -J -S -E -W -W16
+ *
+ *  Input assumption is JIS 7 bit, Shift_JIS, EUC-JP,
+ *  UTF-8, UTF-16LE.
+ *
+ *  ==== -J
+ *
+ *  Assume  JIS input. It also accepts EUC-JP.
+ *  This is the default. This flag does not exclude Shift_JIS.
+ *
+ *  ==== -S
+ *
+ *  Assume Shift_JIS and X0201 kana input. It also accepts JIS.
+ *  EUC-JP is recognized as X0201 kana. Without <b>-x</b> flag,
+ *  X0201 kana (halfwidth kana) is converted into X0208.
+ *
+ *  ==== -E
+ *
+ *  Assume EUC-JP input. It also accepts JIS.
+ *  Same as -J.
+ *
+ *  === -t
+ *
+ *  No conversion.
+ *
+ *  === -i_
+ *
+ *  Output sequence to designate JIS-kanji. (DEFAULT B)
+ *
+ *  === -o_
+ *
+ *  Output sequence to designate ASCII. (DEFAULT B)
+ *
+ *  === -r
+ *
+ *  {de/en}crypt ROT13/47
+ *
+ *  === -h[123] --hiragana --katakana --katakana-hiragana
+ *
+ *  [-h1 --hiragana] Katakana to Hiragana conversion.
+ *
+ *  [-h2 --katakana] Hiragana to Katakana conversion.
+ *
+ *  [-h3 --katakana-hiragana] Katakana to Hiragana and Hiragana to Katakana conversion.
+ *
+ *  === -T
+ *
+ *  Text mode output (MS-DOS)
+ *
+ *  === -l
+ *
+ *  ISO8859-1 (Latin-1) support
+ *
+ *  === -f[<code>m</code> [- <code>n</code>]]
+ *
+ *  Folding on <code>m</code> length with <code>n</code> margin in a line.
+ *  Without this option, fold length is 60 and fold margin is 10.
+ *
+ *  === -F
+ *
+ *  New line preserving line folding.
+ *
+ *  === -Z[0-3]
+ *
+ *  Convert X0208 alphabet (Fullwidth Alphabets) to ASCII.
+ *
+ *  [-Z -Z0] Convert X0208 alphabet to ASCII.
+ *
+ *  [-Z1] Converts X0208 kankaku to single ASCII space.
+ *
+ *  [-Z2] Converts X0208 kankaku to double ASCII spaces.
+ *
+ *  [-Z3] Replacing Fullwidth >, <, ", & into '&gt;', '&lt;', '&quot;', '&amp;' as in HTML.
+ *
+ *  === -X -x
+ *
+ *  Assume X0201 kana in MS-Kanji.
+ *  With <b>-X</b> or without this option, X0201 is converted into X0208 Kana.
+ *  With <b>-x</b>, try to preserve X0208 kana and do not convert X0201 kana to X0208.
+ *  In JIS output, ESC-(-I is used. In EUC output, SSO is used.
+ *
+ *  === -B[0-2]
+ *
+ *  Assume broken JIS-Kanji input, which lost ESC.
+ *  Useful when your site is using old B-News Nihongo patch.
+ *
+ *  [-B1] allows any char after ESC-( or ESC-$.
+ *
+ *  [-B2] forces ASCII after NL.
+ *
+ *  === -I
+ *
+ *  Replacing non iso-2022-jp char into a geta character
+ *  (substitute character in Japanese).
+ *
+ *  === -d -c
+ *
+ *  Delete \r in line feed, Add \r in line feed.
+ *
+ *  === -m[BQN0]
+ *
+ *  MIME ISO-2022-JP/ISO8859-1 decode. (DEFAULT)
+ *  To see ISO8859-1 (Latin-1) -l is necessary.
+ *
+ *  [-mB] Decode MIME base64 encoded stream. Remove header or other part before
+ *  conversion. 
+ *
+ *  [-mQ] Decode MIME quoted stream. '_' in quoted stream is converted to space.
+ *
+ *  [-mN] Non-strict decoding.
+ *  It allows line break in the middle of the base64 encoding.
+ *
+ *  [-m0] No MIME decode.
+ *
+ *  === -M
+ *
+ *  MIME encode. Header style. All ASCII code and control characters are intact.
+ *  Kanji conversion is performed before encoding, so this cannot be used as a picture encoder.
+ *
+ *  [-MB] MIME encode Base64 stream.
+ *
+ *  [-MQ] Perfome quoted encoding.
+ *
+ *  === -l
+ *
+ *  Input and output code is ISO8859-1 (Latin-1) and ISO-2022-JP.
+ *  <b>-s</b>, <b>-e</b> and <b>-x</b> are not compatible with this option.
+ *
+ *  === -L[uwm]
+ *
+ *  new line mode
+ *  Without this option, nkf doesn't convert line breaks.
+ *
+ *  [-Lu] unix (LF)
+ *
+ *  [-Lw] windows (CRLF)
+ *
+ *  [-Lm] mac (CR)
+ *
+ *  === --fj --unix --mac --msdos --windows
+ *
+ *  convert for these system
+ *
+ *  === --jis --euc --sjis --mime --base64
+ *
+ *  convert for named code
+ *
+ *  === --jis-input --euc-input --sjis-input --mime-input --base64-input
+ *
+ *  assume input system
+ *
+ *  === --ic=<code>input codeset</code> --oc=<code>output codeset</code>
+ *
+ *  Set the input or output codeset.
+ *  NKF supports following codesets and those codeset name are case insensitive.
+ *
+ *  [ISO-2022-JP] a.k.a. RFC1468, 7bit JIS, JUNET
+ *
+ *  [EUC-JP (eucJP-nkf)] a.k.a. AT&T JIS, Japanese EUC, UJIS
+ *
+ *  [eucJP-ascii] a.k.a. x-eucjp-open-19970715-ascii
+ *
+ *  [eucJP-ms] a.k.a. x-eucjp-open-19970715-ms
+ *
+ *  [CP51932] Microsoft Version of EUC-JP.
+ *
+ *  [Shift_JIS] SJIS, MS-Kanji
+ *
+ *  [CP932] a.k.a. Windows-31J
+ *
+ *  [UTF-8] same as UTF-8N
+ *
+ *  [UTF-8N] UTF-8 without BOM
+ *
+ *  [UTF-8-BOM] UTF-8 with BOM
+ *
+ *  [UTF-16] same as UTF-16BE
+ *
+ *  [UTF-16BE] UTF-16 Big Endian without BOM
+ *
+ *  [UTF-16BE-BOM] UTF-16 Big Endian with BOM
+ *
+ *  [UTF-16LE] UTF-16 Little Endian without BOM
+ *
+ *  [UTF-16LE-BOM] UTF-16 Little Endian with BOM
+ *
+ *  [UTF8-MAC] NKDed UTF-8, a.k.a. UTF8-NFD (input only)
+ *
+ *  === --fb-{skip, html, xml, perl, java, subchar}
+ *
+ *  Specify the way that nkf handles unassigned characters.
+ *  Without this option, --fb-skip is assumed.
+ *
+ *  === --prefix= <code>escape character</code> <code>target character</code> ..
+ *
+ *  When nkf converts to Shift_JIS,
+ *  nkf adds a specified escape character to specified 2nd byte of Shift_JIS characters.
+ *  1st byte of argument is the escape character and following bytes are target characters.
+ *
+ *  === --disable-cp932ext
+ *
+ *  Handle the characters extended in CP932 as unassigned characters.
+ *
+ *  === --cap-input
+ *
+ *  Decode hex encoded characters.
+ *
+ *  === --url-input
+ *
+ *  Unescape percent escaped characters.
+ *
+ *  === --
+ *
+ *  Ignore rest of -option.
+ */
+
+void
+Init_nkf()
+{
+    /* hoge */
+    VALUE mKconv = rb_define_module("NKF");
+    /* hoge */
+
+    rb_define_module_function(mKconv, "nkf", rb_nkf_kconv, 2);
+    rb_define_module_function(mKconv, "guess1", rb_nkf_guess1, 1);
+    rb_define_module_function(mKconv, "guess2", rb_nkf_guess2, 1);
+    rb_define_alias(mKconv, "guess", "guess2");
+    rb_define_alias(rb_singleton_class(mKconv), "guess", "guess2");
+
+    /* Auto-Detect */
+    rb_define_const(mKconv, "AUTO", INT2FIX(_AUTO));
+    /* ISO-2022-JP */
+    rb_define_const(mKconv, "JIS", INT2FIX(_JIS));
+    /* EUC-JP */
+    rb_define_const(mKconv, "EUC", INT2FIX(_EUC));
+    /* Shift_JIS */
+    rb_define_const(mKconv, "SJIS", INT2FIX(_SJIS));
+    /* BINARY */
+    rb_define_const(mKconv, "BINARY", INT2FIX(_BINARY));
+    /* No conversion */
+    rb_define_const(mKconv, "NOCONV", INT2FIX(_NOCONV));
+    /* ASCII */
+    rb_define_const(mKconv, "ASCII", INT2FIX(_ASCII));
+    /* UTF-8 */
+    rb_define_const(mKconv, "UTF8", INT2FIX(_UTF8));
+    /* UTF-16 */
+    rb_define_const(mKconv, "UTF16", INT2FIX(_UTF16));
+    /* UTF-32 */
+    rb_define_const(mKconv, "UTF32", INT2FIX(_UTF32));
+    /* UNKNOWN */
+    rb_define_const(mKconv, "UNKNOWN", INT2FIX(_UNKNOWN));
+    /* Full version string of nkf */
+    rb_define_const(mKconv, "VERSION", rb_str_new2(RUBY_NKF_VERSION));
+    /* Version of nkf */
+    rb_define_const(mKconv, "NKF_VERSION", rb_str_new2(NKF_VERSION));
+    /* Release date of nkf */
+    rb_define_const(mKconv, "NKF_RELEASE_DATE", rb_str_new2(NKF_RELEASE_DATE));
+}
diff --git a/ruby_1_8_6/ext/openssl/.cvsignore b/ruby_1_8_6/ext/openssl/.cvsignore
new file mode 100644
index 0000000000..3a9a9f341f
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/.cvsignore
@@ -0,0 +1,5 @@
+GNUmakefile
+Makefile
+mkmf.log
+dep
+extconf.h
diff --git a/ruby_1_8_6/ext/openssl/extconf.rb b/ruby_1_8_6/ext/openssl/extconf.rb
new file mode 100644
index 0000000000..98921bc468
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/extconf.rb
@@ -0,0 +1,121 @@
+=begin
+= $RCSfile$ -- Generator for Makefile
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id$
+=end
+
+require "mkmf"
+
+dir_config("openssl")
+dir_config("kerberos")
+
+message "=== OpenSSL for Ruby configurator ===\n"
+
+##
+# Adds -Wall -DOSSL_DEBUG for compilation and some more targets when GCC is used
+# To turn it on, use: --with-debug or --enable-debug
+#
+if with_config("debug") or enable_config("debug")
+  $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
+
+  if /gcc/ =~ CONFIG["CC"]
+    $CPPFLAGS += " -Wall" unless $CPPFLAGS.split.include? "-Wall"
+  end
+end
+
+message "=== Checking for system dependent stuff... ===\n"
+have_library("nsl", "t_open")
+have_library("socket", "socket")
+have_header("assert.h")
+
+message "=== Checking for required stuff... ===\n"
+if $mingw
+  have_library("wsock32")
+  have_library("gdi32")
+end
+result = have_header("openssl/ssl.h")
+result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")}
+result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")}
+if !result
+  unless pkg_config("openssl") and have_header("openssl/ssl.h")
+    message "=== Checking for required stuff failed. ===\n"
+    message "Makefile wasn't created. Fix the errors above.\n"
+    exit 1
+  end
+end
+
+unless have_header("openssl/conf_api.h")
+  message "OpenSSL 0.9.6 or later required.\n"
+  exit 1
+end
+
+message "=== Checking for OpenSSL features... ===\n"
+have_func("ERR_peek_last_error")
+have_func("BN_mod_add")
+have_func("BN_mod_sqr")
+have_func("BN_mod_sub")
+have_func("BN_pseudo_rand_range")
+have_func("BN_rand_range")
+have_func("CONF_get1_default_config_file")
+have_func("EVP_CIPHER_CTX_copy")
+have_func("EVP_CIPHER_CTX_set_padding")
+have_func("EVP_CipherFinal_ex")
+have_func("EVP_CipherInit_ex")
+have_func("EVP_DigestFinal_ex")
+have_func("EVP_DigestInit_ex")
+have_func("EVP_MD_CTX_cleanup")
+have_func("EVP_MD_CTX_create")
+have_func("EVP_MD_CTX_destroy")
+have_func("EVP_MD_CTX_init")
+have_func("HMAC_CTX_cleanup")
+have_func("HMAC_CTX_copy")
+have_func("HMAC_CTX_init")
+have_func("PEM_def_callback")
+have_func("X509V3_set_nconf")
+have_func("X509V3_EXT_nconf_nid")
+have_func("X509_CRL_add0_revoked")
+have_func("X509_CRL_set_issuer_name")
+have_func("X509_CRL_set_version")
+have_func("X509_CRL_sort")
+have_func("X509_STORE_get_ex_data")
+have_func("X509_STORE_set_ex_data")
+have_func("OBJ_NAME_do_all_sorted")
+have_func("OPENSSL_cleanse")
+if try_compile("#define FOO(a, ...) foo(a, ##__VA_ARGS__)\n int x(){FOO(1);FOO(1,2);FOO(1,2,3);}\n")
+  $defs.push("-DHAVE_VA_ARGS_MACRO")
+end
+if have_header("openssl/engine.h")
+  have_func("ENGINE_add")
+  have_func("ENGINE_load_builtin_engines")
+  have_func("ENGINE_load_openbsd_dev_crypto")
+  have_func("ENGINE_get_digest")
+  have_func("ENGINE_get_cipher")
+  have_func("ENGINE_cleanup")
+end
+if try_compile(<<SRC)
+#include <openssl/opensslv.h>
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+# error "OpenSSL version is less than 0.9.7."
+#endif
+SRC
+  have_header("openssl/ocsp.h")
+end
+have_struct_member("EVP_CIPHER_CTX", "flags", "openssl/evp.h")
+have_struct_member("EVP_CIPHER_CTX", "engine", "openssl/evp.h")
+have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h")
+
+message "=== Checking done. ===\n"
+
+create_header
+create_makefile("openssl")
+message "Done.\n"
diff --git a/ruby_1_8_6/ext/openssl/lib/net/ftptls.rb b/ruby_1_8_6/ext/openssl/lib/net/ftptls.rb
new file mode 100644
index 0000000000..f433457923
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/lib/net/ftptls.rb
@@ -0,0 +1,43 @@
+=begin
+= $RCSfile$ -- SSL/TLS enhancement for Net::HTTP.
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2003 Blaz Grilc <farmer@gmx.co.uk>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Requirements
+
+= Version
+  $Id$
+  
+= Notes
+  Tested on FreeBSD 5-CURRENT and 4-STABLE
+  - ruby 1.6.8 (2003-01-17) [i386-freebsd5]
+  - OpenSSL 0.9.7a Feb 19 2003
+  - ruby-openssl-0.2.0.p0
+  tested on ftp server: glftpd 1.30
+=end
+
+require 'socket'
+require 'openssl'
+require 'net/ftp'
+
+module Net
+  class FTPTLS < FTP
+    def login(user = "anonymous", passwd = nil, acct = nil)
+       ctx = OpenSSL::SSL::SSLContext.new('SSLv23')
+       ctx.key = nil
+       ctx.cert = nil
+       voidcmd("AUTH TLS")
+       @sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
+       @sock.connect
+       super(user, passwd, acct)
+       voidcmd("PBSZ 0")
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/openssl/lib/net/telnets.rb b/ruby_1_8_6/ext/openssl/lib/net/telnets.rb
new file mode 100644
index 0000000000..a872f41e6a
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/lib/net/telnets.rb
@@ -0,0 +1,248 @@
+=begin
+= $RCSfile$ -- SSL/TLS enhancement for Net::Telnet.
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id$
+  
+  2001/11/06: Contiributed to Ruby/OpenSSL project.
+
+== class Net::Telnet
+
+This class will initiate SSL/TLS session automaticaly if the server
+sent OPT_STARTTLS. Some options are added for SSL/TLS.
+
+  host = Net::Telnet::new({
+           "Host"       => "localhost",
+           "Port"       => "telnets",
+           ## follows are new options.
+           'CertFile'   => "user.crt",
+           'KeyFile'    => "user.key",
+           'CAFile'     => "/some/where/certs/casert.pem",
+           'CAPath'     => "/some/where/caserts",
+           'VerifyMode' => SSL::VERIFY_PEER,
+           'VerifyCallback' => verify_proc
+         })
+
+Or, the new options ('Cert', 'Key' and 'CACert') are available from
+Michal Rokos's OpenSSL module.
+
+  cert_data = File.open("user.crt"){|io| io.read }
+  pkey_data = File.open("user.key"){|io| io.read }
+  cacert_data = File.open("your_ca.pem"){|io| io.read }
+  host = Net::Telnet::new({
+           "Host"       => "localhost",
+           "Port"       => "telnets",
+           'Cert'       => OpenSSL::X509::Certificate.new(cert_data)
+           'Key'        => OpenSSL::PKey::RSA.new(pkey_data)
+           'CACert'     => OpenSSL::X509::Certificate.new(cacert_data)
+           'CAFile'     => "/some/where/certs/casert.pem",
+           'CAPath'     => "/some/where/caserts",
+           'VerifyMode' => SSL::VERIFY_PEER,
+           'VerifyCallback' => verify_proc
+         })
+
+This class is expected to be a superset of usual Net::Telnet.
+=end
+
+require "net/telnet"
+require "openssl"
+
+module Net
+  class Telnet
+    attr_reader :ssl
+
+    OPT_STARTTLS       =  46.chr # "\056" # "\x2e" # Start TLS
+    TLS_FOLLOWS        =   1.chr # "\001" # "\x01" # FOLLOWS (for STARTTLS)
+
+    alias preprocess_orig preprocess
+
+    def ssl?; @ssl; end
+
+    def preprocess(string)
+      # combine CR+NULL into CR
+      string = string.gsub(/#{CR}#{NULL}/no, CR) if @options["Telnetmode"]
+
+      # combine EOL into "\n"
+      string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
+
+      string.gsub(/#{IAC}(
+                   [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
+                   [#{DO}#{DONT}#{WILL}#{WONT}][#{OPT_BINARY}-#{OPT_EXOPL}]|
+                   #{SB}[#{OPT_BINARY}-#{OPT_EXOPL}]
+                     (#{IAC}#{IAC}|[^#{IAC}])+#{IAC}#{SE}
+                 )/xno) do
+        if    IAC == $1  # handle escaped IAC characters
+          IAC
+        elsif AYT == $1  # respond to "IAC AYT" (are you there)
+          self.write("nobody here but us pigeons" + EOL)
+          ''
+        elsif DO[0] == $1[0]  # respond to "IAC DO x"
+          if    OPT_BINARY[0] == $1[1]
+            @telnet_option["BINARY"] = true
+            self.write(IAC + WILL + OPT_BINARY)
+          elsif OPT_STARTTLS[0] == $1[1]
+            self.write(IAC + WILL + OPT_STARTTLS)
+            self.write(IAC + SB + OPT_STARTTLS + TLS_FOLLOWS + IAC + SE)
+          else
+            self.write(IAC + WONT + $1[1..1])
+          end
+          ''
+        elsif DONT[0] == $1[0]  # respond to "IAC DON'T x" with "IAC WON'T x"
+          self.write(IAC + WONT + $1[1..1])
+          ''
+        elsif WILL[0] == $1[0]  # respond to "IAC WILL x"
+          if    OPT_BINARY[0] == $1[1]
+            self.write(IAC + DO + OPT_BINARY)
+          elsif OPT_ECHO[0] == $1[1]
+            self.write(IAC + DO + OPT_ECHO)
+          elsif OPT_SGA[0]  == $1[1]
+            @telnet_option["SGA"] = true
+            self.write(IAC + DO + OPT_SGA)
+          else
+            self.write(IAC + DONT + $1[1..1])
+          end
+          ''
+        elsif WONT[0] == $1[0]  # respond to "IAC WON'T x"
+          if    OPT_ECHO[0] == $1[1]
+            self.write(IAC + DONT + OPT_ECHO)
+          elsif OPT_SGA[0]  == $1[1]
+            @telnet_option["SGA"] = false
+            self.write(IAC + DONT + OPT_SGA)
+          else
+            self.write(IAC + DONT + $1[1..1])
+          end
+          ''
+        elsif SB[0] == $1[0]    # respond to "IAC SB xxx IAC SE"
+          if    OPT_STARTTLS[0] == $1[1] && TLS_FOLLOWS[0] == $2[0]
+            @sock = OpenSSL::SSL::SSLSocket.new(@sock)
+            @sock.cert            = @options['Cert'] unless @sock.cert
+            @sock.key             = @options['Key'] unless @sock.key
+            @sock.ca_cert         = @options['CACert']
+            @sock.ca_file         = @options['CAFile']
+            @sock.ca_path         = @options['CAPath']
+            @sock.timeout         = @options['Timeout']
+            @sock.verify_mode     = @options['VerifyMode']
+            @sock.verify_callback = @options['VerifyCallback']
+            @sock.verify_depth    = @options['VerifyDepth']
+            @sock.connect
+            @ssl = true
+          end
+          ''
+        else
+          ''
+        end
+      end
+    end # preprocess
+    
+    alias waitfor_org waitfor
+
+    def waitfor(options)
+      time_out = @options["Timeout"]
+      waittime = @options["Waittime"]
+
+      if options.kind_of?(Hash)
+        prompt   = if options.has_key?("Match")
+                     options["Match"]
+                   elsif options.has_key?("Prompt")
+                     options["Prompt"]
+                   elsif options.has_key?("String")
+                     Regexp.new( Regexp.quote(options["String"]) )
+                   end
+        time_out = options["Timeout"]  if options.has_key?("Timeout")
+        waittime = options["Waittime"] if options.has_key?("Waittime")
+      else
+        prompt = options
+      end
+
+      if time_out == false
+        time_out = nil
+      end
+
+      line = ''
+      buf = ''
+      @rest = '' unless @rest
+
+      until(prompt === line and not IO::select([@sock], nil, nil, waittime))
+        unless IO::select([@sock], nil, nil, time_out)
+          raise TimeoutError, "timed-out; wait for the next data"
+        end
+        begin
+          c = @rest + @sock.sysread(1024 * 1024)
+          @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
+          if @options["Telnetmode"]   
+            pos = 0
+            catch(:next){
+              while true
+                case c[pos]
+                when IAC[0]
+                  case c[pos+1]
+                  when DO[0], DONT[0], WILL[0], WONT[0]
+                    throw :next unless c[pos+2]
+                    pos += 3
+                  when SB[0]
+                    ret = detect_sub_negotiation(c, pos)
+                    throw :next unless ret
+                    pos = ret
+                  when nil
+                    throw :next
+                  else
+                    pos += 2
+                  end
+                when nil
+                  throw :next
+                else
+                  pos += 1
+                end
+              end
+            }
+
+            buf = preprocess(c[0...pos])
+            @rest = c[pos..-1]
+          end
+          @log.print(buf) if @options.has_key?("Output_log")
+          line.concat(buf)
+          yield buf if block_given?   
+        rescue EOFError # End of file reached
+          if line == ''
+            line = nil
+            yield nil if block_given? 
+          end
+          break
+        end
+      end
+      line
+    end
+
+    private
+
+    def detect_sub_negotiation(data, pos)
+      return nil if data.length < pos+6  # IAC SB x param IAC SE
+      pos += 3
+      while true
+        case data[pos]
+        when IAC[0]
+          if data[pos+1] == SE[0]
+            pos += 2
+            return pos
+          else
+            pos += 2
+          end
+        when nil
+          return nil
+        else
+          pos += 1
+        end
+      end
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/ext/openssl/lib/openssl.rb b/ruby_1_8_6/ext/openssl/lib/openssl.rb
new file mode 100644
index 0000000000..24a9eed136
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/lib/openssl.rb
@@ -0,0 +1,24 @@
+=begin
+= $RCSfile$ -- Loader for all OpenSSL C-space and Ruby-space definitions
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id$
+=end
+
+require 'openssl.so'
+
+require 'openssl/bn'
+require 'openssl/cipher'
+require 'openssl/digest'
+require 'openssl/ssl'
+require 'openssl/x509'
+
diff --git a/ruby_1_8_6/ext/openssl/lib/openssl/bn.rb b/ruby_1_8_6/ext/openssl/lib/openssl/bn.rb
new file mode 100644
index 0000000000..e7cbf2cfaf
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/lib/openssl/bn.rb
@@ -0,0 +1,35 @@
+=begin
+= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for BN
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id$
+=end
+
+##
+# Should we care what if somebody require this file directly?
+#require 'openssl'
+
+module OpenSSL
+  class BN
+    include Comparable
+  end # BN
+end # OpenSSL
+
+##
+# Add double dispatch to Integer
+#
+class Integer
+  def to_bn
+    OpenSSL::BN::new(self)
+  end
+end # Integer
+
diff --git a/ruby_1_8_6/ext/openssl/lib/openssl/buffering.rb b/ruby_1_8_6/ext/openssl/lib/openssl/buffering.rb
new file mode 100644
index 0000000000..761a017487
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/lib/openssl/buffering.rb
@@ -0,0 +1,239 @@
+=begin
+= $RCSfile$ -- Buffering mix-in module.
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id$
+=end
+
+module Buffering
+  include Enumerable
+  attr_accessor :sync
+  BLOCK_SIZE = 1024*16
+
+  def initialize(*args)
+    @eof = false
+    @rbuffer = ""
+    @sync = @io.sync
+  end
+
+  #
+  # for reading.
+  #
+  private
+
+  def fill_rbuff
+    begin
+      @rbuffer << self.sysread(BLOCK_SIZE)
+    rescue Errno::EAGAIN
+      retry
+    rescue EOFError
+      @eof = true
+    end
+  end
+
+  def consume_rbuff(size=nil)
+    if @rbuffer.empty?
+      nil
+    else
+      size = @rbuffer.size unless size
+      ret = @rbuffer[0, size]
+      @rbuffer[0, size] = ""
+      ret
+    end
+  end
+
+  public
+
+  def read(size=nil, buf=nil)
+    if size == 0
+      if buf
+        buf.clear
+      else
+        buf = ""
+      end
+      return @eof ? nil : buf
+    end
+    until @eof
+      break if size && size <= @rbuffer.size
+      fill_rbuff
+    end
+    ret = consume_rbuff(size) || ""
+    if buf
+      buf.replace(ret)
+      ret = buf
+    end
+    (size && ret.empty?) ? nil : ret
+  end
+
+  def readpartial(maxlen, buf=nil)
+    if maxlen == 0
+      if buf
+        buf.clear
+      else
+        buf = ""
+      end
+      return @eof ? nil : buf
+    end
+    if @rbuffer.empty?
+      begin
+        return sysread(maxlen, buf)
+      rescue Errno::EAGAIN
+        retry
+      end
+    end
+    ret = consume_rbuff(maxlen)
+    if buf
+      buf.replace(ret)
+      ret = buf
+    end
+    raise EOFError if ret.empty?
+    ret
+  end
+
+  def gets(eol=$/)
+    idx = @rbuffer.index(eol)
+    until @eof
+      break if idx
+      fill_rbuff
+      idx = @rbuffer.index(eol)
+    end
+    if eol.is_a?(Regexp)
+      size = idx ? idx+$&.size : nil
+    else
+      size = idx ? idx+eol.size : nil
+    end
+    consume_rbuff(size)
+  end
+
+  def each(eol=$/)
+    while line = self.gets(eol)
+      yield line
+    end
+  end
+  alias each_line each
+
+  def readlines(eol=$/)
+    ary = []
+    while line = self.gets(eol)
+      ary << line
+    end
+    ary
+  end
+
+  def readline(eol=$/)
+    raise EOFError if eof?
+    gets(eol)
+  end
+
+  def getc
+    c = read(1)
+    c ? c[0] : nil
+  end
+
+  def each_byte
+    while c = getc
+      yield(c)
+    end
+  end
+
+  def readchar
+    raise EOFError if eof?
+    getc
+  end
+
+  def ungetc(c)
+    @rbuffer[0,0] = c.chr
+  end
+
+  def eof?
+    fill_rbuff if !@eof && @rbuffer.empty?
+    @eof && @rbuffer.empty?
+  end
+  alias eof eof?
+
+  #
+  # for writing.
+  #
+  private
+
+  def do_write(s)
+    @wbuffer = "" unless defined? @wbuffer
+    @wbuffer << s
+    @sync ||= false
+    if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/)
+      remain = idx ? idx + $/.size : @wbuffer.length
+      nwritten = 0
+      while remain > 0
+        str = @wbuffer[nwritten,remain]
+        begin
+          nwrote = syswrite(str)
+        rescue Errno::EAGAIN
+          retry
+        end
+        remain -= nwrote
+        nwritten += nwrote
+      end
+      @wbuffer[0,nwritten] = ""
+    end
+  end
+
+  public
+
+  def write(s)
+    do_write(s)
+    s.length
+  end
+
+  def << (s)
+    do_write(s)
+    self
+  end
+
+  def puts(*args)
+    s = ""
+    if args.empty?
+      s << "\n"
+    end
+    args.each{|arg|
+      s << arg.to_s
+      if $/ && /\n\z/ !~ s
+        s << "\n"
+      end
+    }
+    do_write(s)
+    nil
+  end
+
+  def print(*args)
+    s = ""
+    args.each{ |arg| s << arg.to_s }
+    do_write(s)
+    nil
+  end
+
+  def printf(s, *args)
+    do_write(s % args)
+    nil
+  end
+
+  def flush
+    osync = @sync
+    @sync = true
+    do_write ""
+    @sync = osync
+  end
+
+  def close
+    flush rescue nil
+    sysclose
+  end
+end
diff --git a/ruby_1_8_6/ext/openssl/lib/openssl/cipher.rb b/ruby_1_8_6/ext/openssl/lib/openssl/cipher.rb
new file mode 100644
index 0000000000..049533d06b
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/lib/openssl/cipher.rb
@@ -0,0 +1,58 @@
+=begin
+= $RCSfile$ -- Ruby-space predefined Cipher subclasses
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id$
+=end
+
+##
+# Should we care what if somebody require this file directly?
+#require 'openssl'
+
+module OpenSSL
+  module Cipher
+    %w(AES CAST5 BF DES IDEA RC2 RC4 RC5).each{|name|
+      klass = Class.new(Cipher){
+        define_method(:initialize){|*args|
+          cipher_name = args.inject(name){|n, arg| "#{n}-#{arg}" }
+          super(cipher_name)
+        }
+      }
+      const_set(name, klass)
+    }
+
+    %w(128 192 256).each{|keylen|
+      klass = Class.new(Cipher){
+        define_method(:initialize){|mode|
+          mode ||= "CBC"
+          cipher_name = "AES-#{keylen}-#{mode}"
+          super(cipher_name)
+        }
+      }
+      const_set("AES#{keylen}", klass)
+    }
+
+    class Cipher
+      def random_key
+        str = OpenSSL::Random.random_bytes(self.key_len)
+        self.key = str
+        return str
+      end
+
+      def random_iv
+        str = OpenSSL::Random.random_bytes(self.iv_len)
+        self.iv = str
+        return str
+      end
+    end
+  end # Cipher
+end # OpenSSL
diff --git a/ruby_1_8_6/ext/openssl/lib/openssl/digest.rb b/ruby_1_8_6/ext/openssl/lib/openssl/digest.rb
new file mode 100644
index 0000000000..b3e4484805
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/lib/openssl/digest.rb
@@ -0,0 +1,49 @@
+=begin
+= $RCSfile$ -- Ruby-space predefined Digest subclasses
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id$
+=end
+
+##
+# Should we care what if somebody require this file directly?
+#require 'openssl'
+
+module OpenSSL
+  module Digest
+
+    alg = %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1)
+    if OPENSSL_VERSION_NUMBER > 0x00908000
+      alg += %w(SHA224 SHA256 SHA384 SHA512)
+    end
+
+    alg.each{|name|
+      klass = Class.new(Digest){
+        define_method(:initialize){|*data|
+          if data.length > 1
+            raise ArgumentError,
+              "wrong number of arguments (#{data.length} for 1)"
+          end
+          super(name, data.first)
+        }
+      }
+      singleton = (class <<klass; self; end)
+      singleton.class_eval{
+        define_method(:digest){|data| Digest.digest(name, data) }
+        define_method(:hexdigest){|data| Digest.hexdigest(name, data) }
+      }
+      const_set(name, klass)
+    }
+
+  end # Digest
+end # OpenSSL
+
diff --git a/ruby_1_8_6/ext/openssl/lib/openssl/ssl.rb b/ruby_1_8_6/ext/openssl/lib/openssl/ssl.rb
new file mode 100644
index 0000000000..ef7415f478
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/lib/openssl/ssl.rb
@@ -0,0 +1,135 @@
+=begin
+= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for SSL
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id$
+=end
+
+require "openssl"
+require "openssl/buffering"
+require "fcntl"
+
+module OpenSSL
+  module SSL
+    module SocketForwarder
+      def addr
+        to_io.addr
+      end
+
+      def peeraddr
+        to_io.peeraddr
+      end
+
+      def setsockopt(level, optname, optval)
+        to_io.setsockopt(level, optname, optval)
+      end
+
+      def getsockopt(level, optname)
+        to_io.getsockopt(level, optname)
+      end
+
+      def fcntl(*args)
+        to_io.fcntl(*args)
+      end
+
+      def closed?
+        to_io.closed?
+      end
+
+      def do_not_reverse_lookup=(flag)
+        to_io.do_not_reverse_lookup = flag
+      end
+    end
+
+    module Nonblock
+      def initialize(*args)
+        flag = File::NONBLOCK
+        flag |= @io.fcntl(Fcntl::F_GETFL) if defined?(Fcntl::F_GETFL)
+        @io.fcntl(Fcntl::F_SETFL, flag)
+        super
+      end
+    end
+
+    class SSLSocket
+      include Buffering
+      include SocketForwarder
+      include Nonblock
+
+      def post_connection_check(hostname)
+        check_common_name = true
+        cert = peer_cert
+        cert.extensions.each{|ext|
+          next if ext.oid != "subjectAltName"
+          ext.value.split(/,\s+/).each{|general_name|
+            if /\ADNS:(.*)/ =~ general_name
+              check_common_name = false
+              reg = Regexp.escape($1).gsub(/\\\*/, "[^.]+")
+              return true if /\A#{reg}\z/i =~ hostname
+            elsif /\AIP Address:(.*)/ =~ general_name
+              check_common_name = false
+              return true if $1 == hostname
+            end
+          }
+        }
+        if check_common_name
+          cert.subject.to_a.each{|oid, value|
+            if oid == "CN"
+              reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+")
+              return true if /\A#{reg}\z/i =~ hostname
+            end
+          }
+        end
+        raise SSLError, "hostname not match"
+      end
+    end
+
+    class SSLServer
+      include SocketForwarder
+      attr_accessor :start_immediately
+
+      def initialize(svr, ctx)
+        @svr = svr
+        @ctx = ctx
+        unless ctx.session_id_context
+          session_id = OpenSSL::Digest::MD5.hexdigest($0)
+          @ctx.session_id_context = session_id
+        end
+        @start_immediately = true
+      end
+
+      def to_io
+        @svr
+      end
+
+      def listen(backlog=5)
+        @svr.listen(backlog)
+      end
+
+      def accept
+        sock = @svr.accept
+        begin
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
+          ssl.sync_close = true
+          ssl.accept if @start_immediately
+          ssl
+        rescue SSLError => ex
+          sock.close
+          raise ex
+        end
+      end
+
+      def close
+        @svr.close
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/openssl/lib/openssl/x509.rb b/ruby_1_8_6/ext/openssl/lib/openssl/x509.rb
new file mode 100644
index 0000000000..e711bda39c
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/lib/openssl/x509.rb
@@ -0,0 +1,154 @@
+=begin
+= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for X509 and subclasses
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id$
+=end
+
+require "openssl"
+
+module OpenSSL
+  module X509
+    class ExtensionFactory
+      def create_extension(*arg)
+        if arg.size > 1
+          create_ext(*arg)
+        else
+          send("create_ext_from_"+arg[0].class.name.downcase, arg[0])
+        end
+      end
+
+      def create_ext_from_array(ary)
+        raise ExtensionError, "unexpected array form" if ary.size > 3 
+        create_ext(ary[0], ary[1], ary[2])
+      end
+
+      def create_ext_from_string(str) # "oid = critical, value"
+        oid, value = str.split(/=/, 2)
+        oid.strip!
+        value.strip!
+        create_ext(oid, value)
+      end
+      
+      def create_ext_from_hash(hash)
+        create_ext(hash["oid"], hash["value"], hash["critical"])
+      end
+    end
+    
+    class Extension
+      def to_s # "oid = critical, value"
+        str = self.oid
+        str << " = "
+        str << "critical, " if self.critical?
+        str << self.value.gsub(/\n/, ", ")
+      end
+        
+      def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
+        {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
+      end
+
+      def to_a
+        [ self.oid, self.value, self.critical? ]
+      end
+    end
+
+    class Name
+      module RFC2253DN
+        Special = ',=+<>#;'
+        HexChar = /[0-9a-fA-F]/
+        HexPair = /#{HexChar}#{HexChar}/
+        HexString = /#{HexPair}+/
+        Pair = /\\(?:[#{Special}]|\\|"|#{HexPair})/
+        StringChar = /[^#{Special}\\"]/
+        QuoteChar = /[^\\"]/
+        AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/
+        AttributeValue = /
+          (?!["#])((?:#{StringChar}|#{Pair})*)|
+          \#(#{HexString})|
+          "((?:#{QuoteChar}|#{Pair})*)"
+        /x
+        TypeAndValue = /\A(#{AttributeType})=#{AttributeValue}/
+
+        module_function
+
+        def expand_pair(str)
+          return nil unless str
+          return str.gsub(Pair){|pair|
+            case pair.size
+            when 2 then pair[1,1]
+            when 3 then Integer("0x#{pair[1,2]}").chr
+            else raise OpenSSL::X509::NameError, "invalid pair: #{str}"
+            end
+          }
+        end
+
+        def expand_hexstring(str)
+          return nil unless str
+          der = str.gsub(HexPair){|hex| Integer("0x#{hex}").chr }
+          a1 = OpenSSL::ASN1.decode(der)
+          return a1.value, a1.tag
+        end
+
+        def expand_value(str1, str2, str3)
+          value = expand_pair(str1)
+          value, tag = expand_hexstring(str2) unless value
+          value = expand_pair(str3) unless value
+          return value, tag
+        end
+
+        def scan(dn)
+          str = dn
+          ary = []
+          while true
+            if md = TypeAndValue.match(str)
+              matched = md.to_s
+              remain = md.post_match
+              type = md[1]
+              value, tag = expand_value(md[2], md[3], md[4]) rescue nil
+              if value
+                type_and_value = [type, value]
+                type_and_value.push(tag) if tag
+                ary.unshift(type_and_value)
+                if remain.length > 2 && remain[0] == ?,
+                  str = remain[1..-1]
+                  next
+                elsif remain.length > 2 && remain[0] == ?+
+                  raise OpenSSL::X509::NameError,
+                    "multi-valued RDN is not supported: #{dn}"
+                elsif remain.empty?
+                  break
+                end
+              end
+            end
+            msg_dn = dn[0, dn.length - str.length] + " =>" + str
+            raise OpenSSL::X509::NameError, "malformed RDN: #{msg_dn}"
+          end
+          return ary
+        end
+      end
+
+      class <<self
+        def parse_rfc2253(str, template=OBJECT_TYPE_TEMPLATE)
+          ary = OpenSSL::X509::Name::RFC2253DN.scan(str)
+          self.new(ary, template)
+        end
+
+        def parse_openssl(str, template=OBJECT_TYPE_TEMPLATE)
+          ary = str.scan(/\s*([^\/,]+)\s*/).collect{|i| i[0].split("=", 2) }
+          self.new(ary, template)
+        end
+
+        alias parse parse_openssl
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/openssl/openssl_missing.c b/ruby_1_8_6/ext/openssl/openssl_missing.c
new file mode 100644
index 0000000000..f77731ed65
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/openssl_missing.c
@@ -0,0 +1,345 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include RUBY_EXTCONF_H
+
+#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ST_ENGINE)
+# include <openssl/engine.h>
+#endif
+#include <openssl/x509_vfy.h>
+
+#if !defined(OPENSSL_NO_HMAC)
+#include <string.h> /* memcpy() */
+#include <openssl/hmac.h>
+
+#include "openssl_missing.h"
+
+#if !defined(HAVE_HMAC_CTX_COPY)
+int
+HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
+{
+    if (!out || !in) return 0;
+    memcpy(out, in, sizeof(HMAC_CTX));
+
+    if (!EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx)
+	    || !EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx)
+	    || !EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx))
+	return 0;
+    return 1;
+}
+#endif /* HAVE_HMAC_CTX_COPY */
+#endif /* NO_HMAC */
+
+#if !defined(HAVE_X509_STORE_SET_EX_DATA)
+
+int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data)
+{
+    return CRYPTO_set_ex_data(&str->ex_data, idx, data);
+}
+ 
+void *X509_STORE_get_ex_data(X509_STORE *str, int idx)
+{
+    return CRYPTO_get_ex_data(&str->ex_data, idx);
+}
+#endif
+
+#if !defined(HAVE_EVP_MD_CTX_CREATE)
+EVP_MD_CTX *
+EVP_MD_CTX_create(void)
+{
+    EVP_MD_CTX *ctx = OPENSSL_malloc(sizeof(EVP_MD_CTX));
+    if (!ctx) return NULL;
+
+    memset(ctx, 0, sizeof(EVP_MD_CTX));
+
+    return ctx;
+}
+#endif
+
+#if !defined(HAVE_EVP_MD_CTX_CLEANUP)
+int
+EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
+{
+    /* FIXME!!! */
+    memset(ctx, 0, sizeof(EVP_MD_CTX));
+
+    return 1;
+}
+#endif
+
+#if !defined(HAVE_EVP_MD_CTX_DESTROY)
+void
+EVP_MD_CTX_destroy(EVP_MD_CTX *ctx)
+{
+    EVP_MD_CTX_cleanup(ctx);
+    OPENSSL_free(ctx);
+}
+#endif
+
+#if !defined(HAVE_EVP_MD_CTX_INIT)
+void
+EVP_MD_CTX_init(EVP_MD_CTX *ctx)
+{
+    memset(ctx, 0, sizeof(EVP_MD_CTX));
+}
+#endif
+
+#if !defined(HAVE_HMAC_CTX_INIT)
+void
+HMAC_CTX_init(HMAC_CTX *ctx)
+{
+    EVP_MD_CTX_init(&ctx->i_ctx);
+    EVP_MD_CTX_init(&ctx->o_ctx);
+    EVP_MD_CTX_init(&ctx->md_ctx);
+}
+#endif
+
+#if !defined(HAVE_HMAC_CTX_CLEANUP)
+void
+HMAC_CTX_cleanup(HMAC_CTX *ctx)
+{
+    EVP_MD_CTX_cleanup(&ctx->i_ctx);
+    EVP_MD_CTX_cleanup(&ctx->o_ctx);
+    EVP_MD_CTX_cleanup(&ctx->md_ctx);
+    memset(ctx, 0, sizeof(HMAC_CTX));
+}
+#endif
+
+#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
+/* 
+ * this function does not exist in OpenSSL yet... or ever?.
+ * a future version may break this function.
+ * tested on 0.9.7d.
+ */
+int
+EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in)
+{
+    memcpy(out, in, sizeof(EVP_CIPHER_CTX));
+
+#if defined(HAVE_ENGINE_ADD) && defined(HAVE_ST_ENGINE)
+    if (in->engine) ENGINE_add(out->engine);
+    if (in->cipher_data) {
+	out->cipher_data = OPENSSL_malloc(in->cipher->ctx_size);
+	memcpy(out->cipher_data, in->cipher_data, in->cipher->ctx_size);
+    }
+#endif
+
+    return 1;
+}
+#endif
+
+#if !defined(HAVE_X509_CRL_SET_VERSION)
+int
+X509_CRL_set_version(X509_CRL *x, long version)
+{
+    if (x == NULL || x->crl == NULL) return 0;
+    if (x->crl->version == NULL) {
+	x->crl->version = M_ASN1_INTEGER_new();
+	if (x->crl->version == NULL) return 0;
+    }
+    return ASN1_INTEGER_set(x->crl->version, version);
+}
+#endif
+
+#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME)
+int
+X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name)
+{
+    if (x == NULL || x->crl == NULL) return 0;
+    return X509_NAME_set(&x->crl->issuer, name);
+}
+#endif
+
+#if !defined(HAVE_X509_CRL_SORT)
+int
+X509_CRL_sort(X509_CRL *c)
+{
+    int i;
+    X509_REVOKED *r;
+    /* sort the data so it will be written in serial
+     * number order */
+    sk_X509_REVOKED_sort(c->crl->revoked);
+    for (i=0; i<sk_X509_REVOKED_num(c->crl->revoked); i++) {
+	r=sk_X509_REVOKED_value(c->crl->revoked, i);
+	r->sequence=i;
+    }
+    return 1;
+}
+#endif
+
+#if !defined(HAVE_X509_CRL_ADD0_REVOKED)
+static int
+OSSL_X509_REVOKED_cmp(const X509_REVOKED * const *a, const X509_REVOKED * const *b)
+{
+    return(ASN1_STRING_cmp(
+		(ASN1_STRING *)(*a)->serialNumber,
+		(ASN1_STRING *)(*b)->serialNumber));
+}
+		    
+int
+X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev)
+{
+    X509_CRL_INFO *inf;
+    
+    inf = crl->crl;
+    if (!inf->revoked)
+	inf->revoked = sk_X509_REVOKED_new(OSSL_X509_REVOKED_cmp);
+    if (!inf->revoked || !sk_X509_REVOKED_push(inf->revoked, rev))
+	return 0;
+    return 1;
+}
+#endif
+
+#if !defined(HAVE_BN_MOD_SQR)
+int
+BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx)
+{
+    if (!BN_sqr(r, (BIGNUM*)a, ctx)) return 0;
+    return BN_mod(r, r, m, ctx);
+}
+#endif
+
+#if !defined(HAVE_BN_MOD_ADD) || !defined(HAVE_BN_MOD_SUB)
+int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx)
+{
+    if (!BN_mod(r,m,d,ctx)) return 0;
+    if (!r->neg) return 1;
+    return (d->neg ? BN_sub : BN_add)(r, r, d);
+}
+#endif
+
+#if !defined(HAVE_BN_MOD_ADD)
+int
+BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx)
+{
+    if (!BN_add(r, a, b)) return 0;
+    return BN_nnmod(r, r, m, ctx);
+}
+#endif
+
+#if !defined(HAVE_BN_MOD_SUB)
+int
+BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx)
+{
+    if (!BN_sub(r, a, b)) return 0;
+    return BN_nnmod(r, r, m, ctx);
+}
+#endif
+
+#if !defined(HAVE_BN_RAND_RANGE) || !defined(HAVE_BN_PSEUDO_RAND_RANGE)
+static int
+bn_rand_range(int pseudo, BIGNUM *r, BIGNUM *range)
+{
+    int (*bn_rand)(BIGNUM *, int, int, int) = pseudo ? BN_pseudo_rand : BN_rand;
+    int n;
+
+    if (range->neg || BN_is_zero(range)) return 0;
+
+    n = BN_num_bits(range);
+
+    if (n == 1) {
+	if (!BN_zero(r)) return 0;
+    } else if (!BN_is_bit_set(range, n - 2) && !BN_is_bit_set(range, n - 3)) {
+	do {
+	    if (!bn_rand(r, n + 1, -1, 0)) return 0;
+	    if (BN_cmp(r ,range) >= 0) {
+		if (!BN_sub(r, r, range)) return 0;
+		if (BN_cmp(r, range) >= 0)
+		    if (!BN_sub(r, r, range)) return 0;
+	    }
+	} while (BN_cmp(r, range) >= 0);
+    } else {
+	do {
+	    if (!bn_rand(r, n, -1, 0)) return 0;
+	} while (BN_cmp(r, range) >= 0);
+    }
+
+    return 1;
+}
+#endif
+
+#if !defined(HAVE_BN_RAND_RANGE)
+int
+BN_rand_range(BIGNUM *r, BIGNUM *range)
+{
+    return bn_rand_range(0, r, range);
+}
+#endif
+
+#if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
+int
+BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range)
+{
+    return bn_rand_range(1, r, range);
+}
+#endif
+
+#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
+#define OPENSSL_CONF "openssl.cnf"
+char *
+CONF_get1_default_config_file(void)
+{
+    char *file;
+    int len;
+
+    file = getenv("OPENSSL_CONF");
+    if (file) return BUF_strdup(file);
+    len = strlen(X509_get_default_cert_area());
+#ifndef OPENSSL_SYS_VMS
+    len++;
+#endif
+    len += strlen(OPENSSL_CONF);
+    file = OPENSSL_malloc(len + 1);
+    if (!file) return NULL;
+    strcpy(file,X509_get_default_cert_area());
+#ifndef OPENSSL_SYS_VMS
+    strcat(file,"/");
+#endif
+    strcat(file,OPENSSL_CONF);
+
+    return file;
+}
+#endif
+
+#if !defined(HAVE_PEM_DEF_CALLBACK)
+#define OSSL_PASS_MIN_LENGTH 4
+int
+PEM_def_callback(char *buf, int num, int w, void *key)
+{
+    int i,j;
+    const char *prompt;
+    
+    if (key) {
+	i = strlen(key);
+	i = (i > num) ? num : i;
+	memcpy(buf, key, i);
+	return i;
+    }
+
+    prompt = EVP_get_pw_prompt();
+    if (prompt == NULL) prompt = "Enter PEM pass phrase:";
+    for (;;) {
+	i = EVP_read_pw_string(buf, num, prompt, w);
+	if (i != 0) {
+	    memset(buf, 0, (unsigned int)num);
+	    return(-1);
+	}
+	j = strlen(buf);
+	if (j < OSSL_PASS_MIN_LENGTH) {
+	    fprintf(stderr,
+		    "phrase is too short, needs to be at least %d chars\n",
+		    OSSL_PASS_MIN_LENGTH);
+	}
+	else break;
+    }
+    return j;
+}
+#endif
+
diff --git a/ruby_1_8_6/ext/openssl/openssl_missing.h b/ruby_1_8_6/ext/openssl/openssl_missing.h
new file mode 100644
index 0000000000..e8c75ca42c
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/openssl_missing.h
@@ -0,0 +1,130 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_OPENSSL_MISSING_H_)
+#define _OSSL_OPENSSL_MISSING_H_
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*
+ * These functions are not included in headers of OPENSSL <= 0.9.6b
+ */
+
+#if !defined(PEM_read_bio_DSAPublicKey)
+# define PEM_read_bio_DSAPublicKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
+        (char *(*)())d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(char **)x,cb,u)
+#endif
+
+#if !defined(PEM_write_bio_DSAPublicKey)
+# define PEM_write_bio_DSAPublicKey(bp,x) \
+	PEM_ASN1_write_bio((int (*)())i2d_DSAPublicKey,\
+		PEM_STRING_DSA_PUBLIC,\
+		bp,(char *)x, NULL, NULL, 0, NULL, NULL)
+#endif
+
+#if !defined(DSAPrivateKey_dup)
+# define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPrivateKey, \
+	(char *(*)())d2i_DSAPrivateKey,(char *)dsa)
+#endif
+
+#if !defined(DSAPublicKey_dup)
+# define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPublicKey, \
+	(char *(*)())d2i_DSAPublicKey,(char *)dsa)
+#endif
+
+#if !defined(X509_REVOKED_dup)
+# define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
+	(char *(*)())d2i_X509_REVOKED, (char *)rev)
+#endif
+
+#if !defined(PKCS7_SIGNER_INFO_dup)
+#  define PKCS7_SIGNER_INFO_dup(si) (PKCS7_SIGNER_INFO *)ASN1_dup((int (*)())i2d_PKCS7_SIGNER_INFO, \
+	(char *(*)())d2i_PKCS7_SIGNER_INFO, (char *)si)
+#endif
+
+#if !defined(PKCS7_RECIP_INFO_dup)
+#  define PKCS7_RECIP_INFO_dup(ri) (PKCS7_RECIP_INFO *)ASN1_dup((int (*)())i2d_PKCS7_RECIP_INFO, \
+	(char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
+#endif
+
+void HMAC_CTX_init(HMAC_CTX *ctx);
+int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
+void HMAC_CTX_cleanup(HMAC_CTX *ctx);
+
+EVP_MD_CTX *EVP_MD_CTX_create(void);
+void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
+int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
+void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
+
+#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
+int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
+#endif
+
+#if !defined(HAVE_EVP_DIGESTINIT_EX)
+#  define EVP_DigestInit_ex(ctx, md, engine) EVP_DigestInit(ctx, md)
+#endif
+#if !defined(HAVE_EVP_DIGESTFINAL_EX)
+#  define EVP_DigestFinal_ex(ctx, buf, len) EVP_DigestFinal(ctx, buf, len)
+#endif
+
+#if !defined(HAVE_EVP_CIPHERINIT_EX)
+#  define EVP_CipherInit_ex(ctx, type, impl, key, iv, enc) EVP_CipherInit(ctx, type, key, iv, enc)
+#endif
+#if !defined(HAVE_EVP_CIPHERFINAL_EX)
+#  define EVP_CipherFinal_ex(ctx, outm, outl) EVP_CipherFinal(ctx, outm, outl)
+#endif
+
+#if !defined(EVP_CIPHER_name)
+#  define EVP_CIPHER_name(e) OBJ_nid2sn(EVP_CIPHER_nid(e))
+#endif
+
+#if !defined(EVP_MD_name)
+#  define EVP_MD_name(e) OBJ_nid2sn(EVP_MD_type(e))
+#endif
+
+#if !defined(HAVE_EVP_HMAC_INIT_EX)
+#  define HMAC_Init_ex(ctx, key, len, digest, engine) HMAC_Init(ctx, key, len, digest)
+#endif
+
+#if !defined(PKCS7_is_detached)
+#  define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
+#endif
+
+#if !defined(PKCS7_type_is_encrypted)
+#  define PKCS7_type_is_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
+#endif
+
+#if !defined(HAVE_OPENSSL_CLEANSE)
+#define OPENSSL_cleanse(p, l) memset(p, 0, l)
+#endif
+
+void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
+int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
+int X509_CRL_set_version(X509_CRL *x, long version);
+int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
+int X509_CRL_sort(X509_CRL *c);
+int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
+int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
+int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
+int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
+int BN_rand_range(BIGNUM *r, BIGNUM *range);
+int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
+char *CONF_get1_default_config_file(void);
+int PEM_def_callback(char *buf, int num, int w, void *key);
+
+#if defined(__cplusplus)
+}
+#endif
+
+
+#endif /* _OSSL_OPENSSL_MISSING_H_ */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl.c b/ruby_1_8_6/ext/openssl/ossl.c
new file mode 100644
index 0000000000..a98f2641cc
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl.c
@@ -0,0 +1,476 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+#include <stdarg.h> /* for ossl_raise */
+
+/*
+ * String to HEXString conversion
+ */
+int
+string2hex(char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
+{
+    static const char hex[]="0123456789abcdef";
+    int i, len = 2 * buf_len;
+
+    if (buf_len < 0 || len < buf_len) { /* PARANOIA? */
+	return -1;
+    }
+    if (!hexbuf) { /* if no buf, return calculated len */
+	if (hexbuf_len) {
+	    *hexbuf_len = len;
+	}
+	return len;
+    }
+    if (!(*hexbuf = OPENSSL_malloc(len + 1))) {
+	return -1;
+    }
+    for (i = 0; i < buf_len; i++) {
+	(*hexbuf)[2 * i] = hex[((unsigned char)buf[i]) >> 4];
+	(*hexbuf)[2 * i + 1] = hex[buf[i] & 0x0f];
+    }
+    (*hexbuf)[2 * i] = '\0';
+
+    if (hexbuf_len) {
+	*hexbuf_len = len;
+    }
+    return len;
+}
+
+/*
+ * Data Conversion
+ */
+STACK_OF(X509) *
+ossl_x509_ary2sk0(VALUE ary)  
+{
+    STACK_OF(X509) *sk;
+    VALUE val;
+    X509 *x509;
+    int i;
+
+    Check_Type(ary, T_ARRAY);
+    sk = sk_X509_new_null();
+    if (!sk) ossl_raise(eOSSLError, NULL); 
+
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+        val = rb_ary_entry(ary, i);
+        if (!rb_obj_is_kind_of(val, cX509Cert)) {
+            sk_X509_pop_free(sk, X509_free);
+            ossl_raise(eOSSLError, "object not X509 cert in array"); 
+        }
+        x509 = DupX509CertPtr(val); /* NEED TO DUP */
+        sk_X509_push(sk, x509);
+    }
+    return sk;
+}
+
+STACK_OF(X509) *
+ossl_protect_x509_ary2sk(VALUE ary, int *status)
+{
+    return (STACK_OF(X509)*)rb_protect((VALUE(*)_((VALUE)))ossl_x509_ary2sk0,
+				       ary, status);
+}
+
+STACK_OF(X509) *
+ossl_x509_ary2sk(VALUE ary)
+{
+    STACK_OF(X509) *sk;
+    int status = 0;
+
+    sk = ossl_protect_x509_ary2sk(ary, &status);
+    if(status) rb_jump_tag(status);
+
+    return sk;
+}
+
+#define OSSL_IMPL_SK2ARY(name, type)	        \
+VALUE						\
+ossl_##name##_sk2ary(STACK *sk)			\
+{						\
+    type *t;					\
+    int i, num;					\
+    VALUE ary;					\
+						\
+    if (!sk) {					\
+	OSSL_Debug("empty sk!");		\
+	return Qnil;				\
+    }						\
+    num = sk_num(sk);				\
+    if (num < 0) {				\
+	OSSL_Debug("items in sk < -1???");	\
+	return rb_ary_new();			\
+    }						\
+    ary = rb_ary_new2(num);			\
+						\
+    for (i=0; i<num; i++) {			\
+	t = (type *)sk_value(sk, i);		\
+	rb_ary_push(ary, ossl_##name##_new(t));	\
+    }						\
+    return ary;					\
+}
+OSSL_IMPL_SK2ARY(x509, X509)
+OSSL_IMPL_SK2ARY(x509crl, X509_CRL)
+
+static VALUE
+ossl_str_new(int size)
+{
+    return rb_str_new(0, size);
+}
+
+VALUE
+ossl_buf2str(char *buf, int len)
+{
+    VALUE str;
+    int status = 0;
+
+    str = rb_protect((VALUE(*)_((VALUE)))ossl_str_new, len, &status);
+    if(!NIL_P(str)) memcpy(RSTRING(str)->ptr, buf, len);
+    OPENSSL_free(buf);
+    if(status) rb_jump_tag(status);
+
+    return str;
+}
+
+/*
+ * our default PEM callback
+ */
+static VALUE
+ossl_pem_passwd_cb0(VALUE flag)
+{	
+    VALUE pass;
+
+    pass = rb_yield(flag);
+    SafeStringValue(pass);
+
+    return pass;
+}
+
+int
+ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd)
+{
+    int len, status = 0;
+    VALUE rflag, pass;
+    
+    if (pwd || !rb_block_given_p())
+	return PEM_def_callback(buf, max_len, flag, pwd);
+
+    while (1) {
+	/*
+	 * when the flag is nonzero, this passphrase
+	 * will be used to perform encryption; otherwise it will
+	 * be used to perform decryption.
+	 */
+	rflag = flag ? Qtrue : Qfalse;
+	pass  = rb_protect(ossl_pem_passwd_cb0, rflag, &status);
+	if (status) return -1; /* exception was raised. */
+	len = RSTRING(pass)->len;
+	if (len < 4) { /* 4 is OpenSSL hardcoded limit */
+	    rb_warning("password must be longer than 4 bytes");
+	    continue;
+	}
+	if (len > max_len) {
+	    rb_warning("password must be shorter then %d bytes", max_len-1);
+	    continue;
+	}
+	memcpy(buf, RSTRING(pass)->ptr, len);
+	break;
+    }
+    return len;
+}
+
+/*
+ * Verify callback
+ */
+int ossl_verify_cb_idx;
+
+VALUE
+ossl_call_verify_cb_proc(struct ossl_verify_cb_args *args)
+{   
+    return rb_funcall(args->proc, rb_intern("call"), 2,
+                      args->preverify_ok, args->store_ctx);
+}
+ 
+int 
+ossl_verify_cb(int ok, X509_STORE_CTX *ctx)
+{
+    VALUE proc, rctx, ret;
+    struct ossl_verify_cb_args args;
+    int state = 0;
+
+    proc = (VALUE)X509_STORE_CTX_get_ex_data(ctx, ossl_verify_cb_idx);
+    if ((void*)proc == 0)
+	proc = (VALUE)X509_STORE_get_ex_data(ctx->ctx, ossl_verify_cb_idx);
+    if ((void*)proc == 0)
+	return ok;
+    if (!NIL_P(proc)) {
+	rctx = rb_protect((VALUE(*)(VALUE))ossl_x509stctx_new,
+			  (VALUE)ctx, &state);
+	ret = Qfalse;
+	if (!state) {
+	    args.proc = proc;
+	    args.preverify_ok = ok ? Qtrue : Qfalse;
+	    args.store_ctx = rctx;
+	    ret = rb_ensure(ossl_call_verify_cb_proc, (VALUE)&args,
+			    ossl_x509stctx_clear_ptr, rctx);
+	}
+	if (ret == Qtrue) {
+	    X509_STORE_CTX_set_error(ctx, X509_V_OK);
+	    ok = 1;
+	}
+	else{
+	    if (X509_STORE_CTX_get_error(ctx) == X509_V_OK) {
+		X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REJECTED);
+	    }
+	    ok = 0;
+	}
+    }
+
+    return ok;
+}
+
+/*
+ * main module
+ */
+VALUE mOSSL;
+
+/*
+ * OpenSSLError < StandardError
+ */
+VALUE eOSSLError;
+
+/*
+ * Convert to DER string
+ */
+ID ossl_s_to_der;
+
+VALUE
+ossl_to_der(VALUE obj)
+{
+    VALUE tmp;
+
+    tmp = rb_funcall(obj, ossl_s_to_der, 0);
+    StringValue(tmp);
+
+    return tmp;
+}
+
+VALUE
+ossl_to_der_if_possible(VALUE obj)
+{
+    if(rb_respond_to(obj, ossl_s_to_der))
+	return ossl_to_der(obj);
+    return obj;
+}
+
+/*
+ * Errors
+ */
+void
+ossl_raise(VALUE exc, const char *fmt, ...)
+{
+    va_list args;
+    char buf[BUFSIZ];
+    const char *msg;
+    long e;
+    int len = 0;
+
+#ifdef HAVE_ERR_PEEK_LAST_ERROR
+    e = ERR_peek_last_error();
+#else
+    e = ERR_peek_error();
+#endif
+    if (fmt) {
+	va_start(args, fmt);
+	len = vsnprintf(buf, BUFSIZ, fmt, args);
+	va_end(args);
+    }
+    if (len < BUFSIZ && e) {
+	if (dOSSL == Qtrue) /* FULL INFO */
+	    msg = ERR_error_string(e, NULL);
+	else
+	    msg = ERR_reason_error_string(e);
+	fmt = len ? ": %s" : "%s";
+	len += snprintf(buf+len, BUFSIZ-len, fmt, msg);
+    }
+    if (dOSSL == Qtrue){ /* show all errors on the stack */
+	while ((e = ERR_get_error()) != 0){
+	    rb_warn("error on stack: %s", ERR_error_string(e, NULL));
+	}
+    }
+    ERR_clear_error();
+
+    if(len > BUFSIZ) len = strlen(buf);
+    rb_exc_raise(rb_exc_new(exc, buf, len));
+}
+
+VALUE
+ossl_get_errors()
+{
+    VALUE ary;
+    long e;
+
+    ary = rb_ary_new();
+    while ((e = ERR_get_error()) != 0){
+        rb_ary_push(ary, rb_str_new2(ERR_error_string(e, NULL)));
+    }
+
+    return ary;
+}
+
+/*
+ * Debug
+ */
+VALUE dOSSL;
+
+#if !defined(HAVE_VA_ARGS_MACRO)
+void
+ossl_debug(const char *fmt, ...)
+{
+    va_list args;
+	
+    if (dOSSL == Qtrue) {
+	fprintf(stderr, "OSSL_DEBUG: ");
+	va_start(args, fmt);
+	vfprintf(stderr, fmt, args);
+	va_end(args);
+	fprintf(stderr, " [CONTEXT N/A]\n");
+    }
+}
+#endif
+
+static VALUE
+ossl_debug_get(VALUE self)
+{
+    return dOSSL;
+}
+
+static VALUE
+ossl_debug_set(VALUE self, VALUE val)
+{
+    VALUE old = dOSSL;
+    dOSSL = val;
+	
+    if (old != dOSSL) {
+	if (dOSSL == Qtrue) {
+	    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+	    fprintf(stderr, "OSSL_DEBUG: IS NOW ON!\n");
+	} else if (old == Qtrue) {
+	    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF);
+	    fprintf(stderr, "OSSL_DEBUG: IS NOW OFF!\n");
+	}
+    }
+    return val;
+}
+
+/*
+ * OSSL library init
+ */
+void
+Init_openssl()
+{
+    /*
+     * Init timezone info
+     */
+#if 0
+    tzset();
+#endif
+
+    /*
+     * Init all digests, ciphers
+     */
+    /* CRYPTO_malloc_init(); */
+    /* ENGINE_load_builtin_engines(); */
+    OpenSSL_add_ssl_algorithms();
+    OpenSSL_add_all_algorithms();
+    ERR_load_crypto_strings();
+    SSL_load_error_strings();
+
+    /*
+     * FIXME:
+     * On unload do:
+     */
+#if 0
+    CONF_modules_unload(1);
+    destroy_ui_method();
+    EVP_cleanup();
+    ENGINE_cleanup();
+    CRYPTO_cleanup_all_ex_data();
+    ERR_remove_state(0);
+    ERR_free_strings();
+#endif
+
+    /*
+     * Init main module
+     */
+    mOSSL = rb_define_module("OpenSSL");
+
+    /*
+     * Constants
+     */
+    rb_define_const(mOSSL, "VERSION", rb_str_new2(OSSL_VERSION));
+    rb_define_const(mOSSL, "OPENSSL_VERSION", rb_str_new2(OPENSSL_VERSION_TEXT));
+    rb_define_const(mOSSL, "OPENSSL_VERSION_NUMBER", INT2NUM(OPENSSL_VERSION_NUMBER));
+
+    /*
+     * Generic error,
+     * common for all classes under OpenSSL module
+     */
+    eOSSLError = rb_define_class_under(mOSSL,"OpenSSLError",rb_eStandardError);
+
+    /*
+     * Verify callback Proc index for ext-data
+     */
+    ossl_verify_cb_idx =
+	X509_STORE_CTX_get_ex_new_index(0, "ossl_verify_cb_idx", 0, 0, 0);
+
+    /*
+     * Init debug core
+     */
+    dOSSL = Qfalse;
+    rb_define_module_function(mOSSL, "debug", ossl_debug_get, 0);
+    rb_define_module_function(mOSSL, "debug=", ossl_debug_set, 1);
+    rb_define_module_function(mOSSL, "errors", ossl_get_errors, 0);
+
+    /*
+     * Get ID of to_der
+     */
+    ossl_s_to_der = rb_intern("to_der");
+
+    /*
+     * Init components
+     */
+    Init_ossl_bn();
+    Init_ossl_cipher();
+    Init_ossl_config();
+    Init_ossl_digest();
+    Init_ossl_hmac();
+    Init_ossl_ns_spki();
+    Init_ossl_pkcs12();
+    Init_ossl_pkcs7();
+    Init_ossl_pkey();
+    Init_ossl_rand();
+    Init_ossl_ssl();
+    Init_ossl_x509();
+    Init_ossl_ocsp();
+    Init_ossl_engine();
+    Init_ossl_asn1();
+}
+
+#if defined(OSSL_DEBUG)
+/*
+ * Check if all symbols are OK with 'make LDSHARED=gcc all'
+ */
+int
+main(int argc, char *argv[], char *env[])
+{
+    return 0;
+}
+#endif /* OSSL_DEBUG */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl.h b/ruby_1_8_6/ext/openssl/ossl.h
new file mode 100644
index 0000000000..598bfb69da
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl.h
@@ -0,0 +1,220 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_H_)
+#define _OSSL_H_
+
+#include RUBY_EXTCONF_H
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*
+* OpenSSL has defined RFILE and Ruby has defined RFILE - so undef it!
+*/
+#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/
+#  undef RFILE
+#endif
+#include <ruby.h>
+#include <rubyio.h>
+
+/*
+ * Check the OpenSSL version
+ * The only supported are:
+ * 	OpenSSL >= 0.9.7
+ */
+#include <openssl/opensslv.h>
+
+#ifdef HAVE_ASSERT_H
+#  include <assert.h>
+#else
+#  define assert(condition)
+#endif
+
+#if defined(_WIN32)
+#  define OpenFile WINAPI_OpenFile
+#  define OSSL_NO_CONF_API 1
+#endif
+#include <errno.h>
+#include <openssl/err.h>
+#include <openssl/asn1_mac.h>
+#include <openssl/x509v3.h>
+#include <openssl/ssl.h>
+#include <openssl/pkcs12.h>
+#include <openssl/pkcs7.h>
+#include <openssl/hmac.h>
+#include <openssl/rand.h>
+#include <openssl/conf.h>
+#include <openssl/conf_api.h>
+#undef X509_NAME
+#undef PKCS7_SIGNER_INFO
+#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ST_ENGINE)
+#  define OSSL_ENGINE_ENABLED
+#  include <openssl/engine.h>
+#endif
+#if defined(HAVE_OPENSSL_OCSP_H)
+#  define OSSL_OCSP_ENABLED
+#  include <openssl/ocsp.h>
+#endif
+#if defined(_WIN32)
+#  undef OpenFile
+#endif
+
+/*
+ * Common Module
+ */
+extern VALUE mOSSL;
+
+/*
+ * Common Error Class
+ */
+extern VALUE eOSSLError;
+
+/*
+ * CheckTypes
+ */
+#define OSSL_Check_Kind(obj, klass) do {\
+  if (!rb_obj_is_kind_of(obj, klass)) {\
+    ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected kind of %s)",\
+               rb_obj_classname(obj), rb_class2name(klass));\
+  }\
+} while (0)
+
+#define OSSL_Check_Instance(obj, klass) do {\
+  if (!rb_obj_is_instance_of(obj, klass)) {\
+    ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected instance of %s)",\
+               rb_obj_classname(obj), rb_class2name(klass));\
+  }\
+} while (0)
+
+#define OSSL_Check_Same_Class(obj1, obj2) do {\
+  if (!rb_obj_is_instance_of(obj1, rb_obj_class(obj2))) {\
+    ossl_raise(rb_eTypeError, "wrong argument type");\
+  }\
+} while (0)
+
+/*
+ * String to HEXString conversion
+ */
+int string2hex(char *, int, char **, int *);
+
+/*
+ * Data Conversion
+ */
+STACK_OF(X509) *ossl_x509_ary2sk0(VALUE);
+STACK_OF(X509) *ossl_x509_ary2sk(VALUE);
+STACK_OF(X509) *ossl_protect_x509_ary2sk(VALUE,int*);
+VALUE ossl_x509_sk2ary(STACK_OF(X509) *certs);
+VALUE ossl_x509crl_sk2ary(STACK_OF(X509_CRL) *crl);
+VALUE ossl_buf2str(char *buf, int len);
+#define ossl_str_adjust(str, p) \
+do{\
+    int len = RSTRING(str)->len;\
+    int newlen = (p) - (unsigned char*)RSTRING(str)->ptr;\
+    assert(newlen <= len);\
+    RSTRING(str)->len = newlen;\
+    RSTRING(str)->ptr[newlen] = 0;\
+}while(0)
+
+/*
+ * our default PEM callback
+ */
+int ossl_pem_passwd_cb(char *, int, int, void *);
+
+/*
+ * ERRor messages
+ */
+#define OSSL_ErrMsg() ERR_reason_error_string(ERR_get_error())
+NORETURN(void ossl_raise(VALUE, const char *, ...));
+
+/*
+ * Verify callback
+ */
+extern int ossl_verify_cb_idx;
+
+struct ossl_verify_cb_args {
+    VALUE proc;
+    VALUE preverify_ok;
+    VALUE store_ctx;
+};
+
+VALUE ossl_call_verify_cb_proc(struct ossl_verify_cb_args *);
+int ossl_verify_cb(int, X509_STORE_CTX *);
+
+/*
+ * String to DER String
+ */
+extern ID ossl_s_to_der;
+VALUE ossl_to_der(VALUE);
+VALUE ossl_to_der_if_possible(VALUE);
+
+/*
+ * Debug
+ */
+extern VALUE dOSSL;
+
+#if defined(HAVE_VA_ARGS_MACRO)
+#define OSSL_Debug(fmt, ...) do { \
+  if (dOSSL == Qtrue) { \
+    fprintf(stderr, "OSSL_DEBUG: "); \
+    fprintf(stderr, fmt, ##__VA_ARGS__); \
+    fprintf(stderr, " [%s:%d]\n", __FILE__, __LINE__); \
+  } \
+} while (0)
+
+#define OSSL_Warning(fmt, ...) do { \
+  OSSL_Debug(fmt, ##__VA_ARGS__); \
+  rb_warning(fmt, ##__VA_ARGS__); \
+} while (0)
+
+#define OSSL_Warn(fmt, ...) do { \
+  OSSL_Debug(fmt, ##__VA_ARGS__); \
+  rb_warn(fmt, ##__VA_ARGS__); \
+} while (0)
+#else
+void ossl_debug(const char *, ...);
+#define OSSL_Debug ossl_debug
+#define OSSL_Warning rb_warning
+#define OSSL_Warn rb_warn
+#endif
+
+/*
+ * Include all parts
+ */
+#include "openssl_missing.h"
+#include "ruby_missing.h"
+#include "ossl_asn1.h"
+#include "ossl_bio.h"
+#include "ossl_bn.h"
+#include "ossl_cipher.h"
+#include "ossl_config.h"
+#include "ossl_digest.h"
+#include "ossl_hmac.h"
+#include "ossl_ns_spki.h"
+#include "ossl_ocsp.h"
+#include "ossl_pkcs12.h"
+#include "ossl_pkcs7.h"
+#include "ossl_pkcs5.h"
+#include "ossl_pkey.h"
+#include "ossl_rand.h"
+#include "ossl_ssl.h"
+#include "ossl_version.h"
+#include "ossl_x509.h"
+#include "ossl_engine.h"
+
+void Init_openssl(void);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* _OSSL_H_ */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_asn1.c b/ruby_1_8_6/ext/openssl/ossl_asn1.c
new file mode 100644
index 0000000000..3614f470d9
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_asn1.c
@@ -0,0 +1,1170 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' team members
+ * Copyright (C) 2003
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#if defined(HAVE_SYS_TIME_H)
+#  include <sys/time.h>
+#elif !defined(NT) && !defined(_WIN32)
+struct timeval {
+    long tv_sec;	/* seconds */
+    long tv_usec;	/* and microseconds */
+};
+#endif
+
+/*
+ * DATE conversion
+ */
+VALUE
+asn1time_to_time(ASN1_TIME *time)
+{
+    struct tm tm;
+    VALUE argv[6];
+    
+    if (!time || !time->data) return Qnil;
+    memset(&tm, 0, sizeof(struct tm));
+	
+    switch (time->type) {
+    case V_ASN1_UTCTIME:
+	if (sscanf(time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
+    		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
+	    ossl_raise(rb_eTypeError, "bad UTCTIME format");
+	} 
+	if (tm.tm_year < 69) {
+	    tm.tm_year += 2000;
+	} else {
+	    tm.tm_year += 1900;
+	}
+	break;
+    case V_ASN1_GENERALIZEDTIME:
+	if (sscanf(time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
+    		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
+	    ossl_raise(rb_eTypeError, "bad GENERALIZEDTIME format" );
+	} 
+	break;
+    default:
+	rb_warning("unknown time format");
+        return Qnil;
+    }
+    argv[0] = INT2NUM(tm.tm_year);
+    argv[1] = INT2NUM(tm.tm_mon);
+    argv[2] = INT2NUM(tm.tm_mday);
+    argv[3] = INT2NUM(tm.tm_hour);
+    argv[4] = INT2NUM(tm.tm_min);
+    argv[5] = INT2NUM(tm.tm_sec);
+
+    return rb_funcall2(rb_cTime, rb_intern("utc"), 6, argv);
+}
+
+/*
+ * This function is not exported in Ruby's *.h
+ */
+extern struct timeval rb_time_timeval(VALUE);
+
+time_t
+time_to_time_t(VALUE time)
+{
+    return (time_t)NUM2LONG(rb_Integer(time));
+}
+
+/*
+ * STRING conversion
+ */
+VALUE
+asn1str_to_str(ASN1_STRING *str)
+{
+    return rb_str_new(str->data, str->length);
+}
+
+/*
+ * ASN1_INTEGER conversions
+ * TODO: Make a decision what's the right way to do this.
+ */
+#define DO_IT_VIA_RUBY 0
+VALUE
+asn1integer_to_num(ASN1_INTEGER *ai)
+{
+    BIGNUM *bn;
+#if DO_IT_VIA_RUBY
+    char *txt;
+#endif
+    VALUE num;
+
+    if (!ai) {
+	ossl_raise(rb_eTypeError, "ASN1_INTEGER is NULL!");
+    }
+    if (!(bn = ASN1_INTEGER_to_BN(ai, NULL))) {
+	ossl_raise(eOSSLError, NULL);
+    }
+#if DO_IT_VIA_RUBY
+    if (!(txt = BN_bn2dec(bn))) {
+	BN_free(bn);
+	ossl_raise(eOSSLError, NULL);
+    }
+    num = rb_cstr_to_inum(txt, 10, Qtrue);
+    OPENSSL_free(txt);
+#else
+    num = ossl_bn_new(bn);
+#endif
+    BN_free(bn);
+
+    return num;
+}
+
+#if DO_IT_VIA_RUBY
+ASN1_INTEGER *
+num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
+{
+    BIGNUM *bn = NULL;
+
+    if (RTEST(rb_obj_is_kind_of(obj, cBN))) {
+	bn = GetBNPtr(obj);
+    } else {
+	obj = rb_String(obj);
+	if (!BN_dec2bn(&bn, StringValuePtr(obj))) {
+	    ossl_raise(eOSSLError, NULL);
+	}
+    }
+    if (!(ai = BN_to_ASN1_INTEGER(bn, ai))) {
+	BN_free(bn);
+	ossl_raise(eOSSLError, NULL);
+    }
+    BN_free(bn);
+    return ai;
+}
+#else
+ASN1_INTEGER *
+num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
+{
+    BIGNUM *bn = GetBNPtr(obj);
+    
+    if (!(ai = BN_to_ASN1_INTEGER(bn, ai))) {
+	ossl_raise(eOSSLError, NULL);
+    }
+    return ai;
+}
+#endif
+
+/********/
+/*
+ * ASN1 module
+ */
+#define ossl_asn1_get_value(o)       rb_attr_get((o),rb_intern("@value"))
+#define ossl_asn1_get_tag(o)         rb_attr_get((o),rb_intern("@tag"))
+#define ossl_asn1_get_tagging(o)     rb_attr_get((o),rb_intern("@tagging"))
+#define ossl_asn1_get_tag_class(o)   rb_attr_get((o),rb_intern("@tag_class"))
+
+#define ossl_asn1_set_value(o,v)     rb_iv_set((o),"@value",(v))
+#define ossl_asn1_set_tag(o,v)       rb_iv_set((o),"@tag",(v))
+#define ossl_asn1_set_tagging(o,v)   rb_iv_set((o),"@tagging",(v))
+#define ossl_asn1_set_tag_class(o,v) rb_iv_set((o),"@tag_class",(v))
+
+VALUE mASN1;
+VALUE eASN1Error;
+
+VALUE cASN1Data;
+VALUE cASN1Primitive;
+VALUE cASN1Constructive;
+
+VALUE cASN1Boolean;                           /* BOOLEAN           */
+VALUE cASN1Integer, cASN1Enumerated;          /* INTEGER           */
+VALUE cASN1BitString;                         /* BIT STRING        */
+VALUE cASN1OctetString, cASN1UTF8String;      /* STRINGs           */
+VALUE cASN1NumericString, cASN1PrintableString;
+VALUE cASN1T61String, cASN1VideotexString;
+VALUE cASN1IA5String, cASN1GraphicString;
+VALUE cASN1ISO64String, cASN1GeneralString;
+VALUE cASN1UniversalString, cASN1BMPString;
+VALUE cASN1Null;                              /* NULL              */
+VALUE cASN1ObjectId;                          /* OBJECT IDENTIFIER */
+VALUE cASN1UTCTime, cASN1GeneralizedTime;     /* TIME              */
+VALUE cASN1Sequence, cASN1Set;                /* CONSTRUCTIVE      */
+
+static ID sIMPLICIT, sEXPLICIT;
+static ID sUNIVERSAL, sAPPLICATION, sCONTEXT_SPECIFIC, sPRIVATE;
+
+/*
+ * Ruby to ASN1 converters
+ */
+static ASN1_BOOLEAN
+obj_to_asn1bool(VALUE obj)
+{
+     return RTEST(obj) ? 0xff : 0x100;
+}
+
+static ASN1_INTEGER*
+obj_to_asn1int(VALUE obj)
+{
+    return num_to_asn1integer(obj, NULL);
+}
+
+static ASN1_BIT_STRING*
+obj_to_asn1bstr(VALUE obj, long unused_bits)
+{
+    ASN1_BIT_STRING *bstr;
+
+    if(unused_bits < 0) unused_bits = 0;
+    StringValue(obj);
+    if(!(bstr = ASN1_BIT_STRING_new()))
+	ossl_raise(eASN1Error, NULL);
+    ASN1_BIT_STRING_set(bstr, RSTRING(obj)->ptr, RSTRING(obj)->len);
+    bstr->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */
+    bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT|(unused_bits&0x07);
+
+    return bstr;
+}
+
+static ASN1_STRING*
+obj_to_asn1str(VALUE obj)
+{
+    ASN1_STRING *str;
+
+    StringValue(obj);
+    if(!(str = ASN1_STRING_new()))
+	ossl_raise(eASN1Error, NULL);
+    ASN1_STRING_set(str, RSTRING(obj)->ptr, RSTRING(obj)->len);
+
+    return str;
+}
+
+static ASN1_NULL*
+obj_to_asn1null(VALUE obj)
+{
+    ASN1_NULL *null;
+
+    if(!NIL_P(obj))
+	ossl_raise(eASN1Error, "nil expected");
+    if(!(null = ASN1_NULL_new()))
+	ossl_raise(eASN1Error, NULL);
+
+    return null;
+}
+
+static ASN1_OBJECT*
+obj_to_asn1obj(VALUE obj)
+{
+    ASN1_OBJECT *a1obj;
+
+    StringValue(obj);
+    a1obj = OBJ_txt2obj(RSTRING(obj)->ptr, 0);
+    if(!a1obj) a1obj = OBJ_txt2obj(RSTRING(obj)->ptr, 1);
+    if(!a1obj) ossl_raise(eASN1Error, "invalid OBJECT ID");
+
+    return a1obj;
+}
+
+static ASN1_UTCTIME*
+obj_to_asn1utime(VALUE time)
+{
+    time_t sec;
+    ASN1_UTCTIME *t;
+
+    sec = time_to_time_t(time);
+    if(!(t = ASN1_UTCTIME_set(NULL, sec)))
+        ossl_raise(eASN1Error, NULL);
+
+    return t;
+}
+
+static ASN1_GENERALIZEDTIME*
+obj_to_asn1gtime(VALUE time)
+{
+    time_t sec;
+    ASN1_GENERALIZEDTIME *t;
+
+    sec = time_to_time_t(time);
+    if(!(t =ASN1_GENERALIZEDTIME_set(NULL, sec)))
+        ossl_raise(eASN1Error, NULL);
+
+    return t;
+}
+
+static ASN1_STRING*
+obj_to_asn1derstr(VALUE obj)
+{
+    ASN1_STRING *a1str;
+    VALUE str;
+
+    str = ossl_to_der(obj);
+    if(!(a1str = ASN1_STRING_new()))
+	ossl_raise(eASN1Error, NULL);
+    ASN1_STRING_set(a1str, RSTRING(str)->ptr, RSTRING(str)->len);
+
+    return a1str;
+}
+
+/*
+ * DER to Ruby converters
+ */
+static VALUE
+decode_bool(unsigned char* der, int length)
+{
+    int bool;
+    unsigned char *p;
+
+    p = der;
+    if((bool = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
+	ossl_raise(eASN1Error, NULL);
+
+    return bool ? Qtrue : Qfalse;
+}
+
+static VALUE
+decode_int(unsigned char* der, int length)
+{
+    ASN1_INTEGER *ai;
+    unsigned char *p;
+    VALUE ret; 
+    int status = 0;
+
+    p = der;
+    if(!(ai = d2i_ASN1_INTEGER(NULL, &p, length)))
+	ossl_raise(eASN1Error, NULL);
+    ret = rb_protect((VALUE(*)_((VALUE)))asn1integer_to_num,
+		     (VALUE)ai, &status);
+    ASN1_INTEGER_free(ai);
+    if(status) rb_jump_tag(status);
+
+    return ret;
+}
+
+static VALUE
+decode_bstr(unsigned char* der, int length, long *unused_bits)
+{
+    ASN1_BIT_STRING *bstr;
+    unsigned char *p, *buf;
+    long len;
+    VALUE ret;
+
+    p = der;
+    if(!(bstr = d2i_ASN1_BIT_STRING(NULL, &p, length)))
+	ossl_raise(eASN1Error, NULL);
+    len = bstr->length;
+    if(!(buf = OPENSSL_malloc(len))){
+	ASN1_BIT_STRING_free(bstr);
+	ossl_raise(eASN1Error, NULL);
+    }
+    *unused_bits = 0;
+    if(bstr->flags & ASN1_STRING_FLAG_BITS_LEFT)
+	*unused_bits = bstr->flags & 0x07;
+    memcpy(buf, bstr->data, len);
+    ASN1_BIT_STRING_free(bstr);
+    ret = ossl_buf2str(buf, len);
+
+    return ret;
+}
+
+static VALUE
+decode_enum(unsigned char* der, int length)
+{
+    ASN1_ENUMERATED *ai;
+    unsigned char *p;
+    VALUE ret; 
+    int status = 0;
+
+    p = der;
+    if(!(ai = d2i_ASN1_ENUMERATED(NULL, &p, length)))
+	ossl_raise(eASN1Error, NULL);
+    ret = rb_protect((VALUE(*)_((VALUE)))asn1integer_to_num,
+		     (VALUE)ai, &status);
+    ASN1_ENUMERATED_free(ai);
+    if(status) rb_jump_tag(status);
+
+    return ret;
+}
+
+static VALUE
+decode_null(unsigned char* der, int length)
+{
+    ASN1_NULL *null;
+    unsigned char *p;
+
+    p = der;
+    if(!(null = d2i_ASN1_NULL(NULL, &p, length)))
+	ossl_raise(eASN1Error, NULL);
+    ASN1_NULL_free(null);
+
+    return Qnil;
+}
+
+static VALUE
+decode_obj(unsigned char* der, int length)
+{
+    ASN1_OBJECT *obj;
+    unsigned char *p;
+    VALUE ret;
+    int nid;
+    BIO *bio;
+
+    p = der;
+    if(!(obj = d2i_ASN1_OBJECT(NULL, &p, length)))
+	ossl_raise(eASN1Error, NULL);
+    if((nid = OBJ_obj2nid(obj)) != NID_undef){
+	ASN1_OBJECT_free(obj);
+	ret = rb_str_new2(OBJ_nid2sn(nid));
+    }
+    else{
+	if(!(bio = BIO_new(BIO_s_mem()))){
+	    ASN1_OBJECT_free(obj);
+	    ossl_raise(eASN1Error, NULL);
+	}
+	i2a_ASN1_OBJECT(bio, obj);
+	ASN1_OBJECT_free(obj);
+	ret = ossl_membio2str(bio);
+    }
+
+    return ret;
+}
+
+static VALUE
+decode_time(unsigned char* der, int length)
+{
+    ASN1_TIME *time;
+    unsigned char *p;
+    VALUE ret;
+    int status = 0;
+
+    p = der;
+    if(!(time = d2i_ASN1_TIME(NULL, &p, length)))
+	ossl_raise(eASN1Error, NULL);
+    ret = rb_protect((VALUE(*)_((VALUE)))asn1time_to_time,
+		     (VALUE)time, &status);
+    ASN1_TIME_free(time);
+    if(status) rb_jump_tag(status);
+
+    return ret;
+}
+
+/********/
+
+typedef struct {
+    char *name;
+    VALUE *klass;
+} ossl_asn1_info_t;
+
+static ossl_asn1_info_t ossl_asn1_info[] = {
+    { "EOC",               NULL,                  },  /*  0 */
+    { "BOOLEAN",           &cASN1Boolean,         },  /*  1 */
+    { "INTEGER",           &cASN1Integer,         },  /*  2 */
+    { "BIT_STRING",        &cASN1BitString,       },  /*  3 */
+    { "OCTET_STRING",      &cASN1OctetString,     },  /*  4 */
+    { "NULL",              &cASN1Null,            },  /*  5 */
+    { "OBJECT",            &cASN1ObjectId,        },  /*  6 */
+    { "OBJECT_DESCRIPTOR", NULL,                  },  /*  7 */
+    { "EXTERNAL",          NULL,                  },  /*  8 */
+    { "REAL",              NULL,                  },  /*  9 */
+    { "ENUMERATED",        &cASN1Enumerated,      },  /* 10 */
+    { "EMBEDDED_PDV",      NULL,                  },  /* 11 */
+    { "UTF8STRING",        &cASN1UTF8String,      },  /* 12 */
+    { "RELATIVE_OID",      NULL,                  },  /* 13 */
+    { "[UNIVERSAL 14]",    NULL,                  },  /* 14 */
+    { "[UNIVERSAL 15]",    NULL,                  },  /* 15 */
+    { "SEQUENCE",          &cASN1Sequence,        },  /* 16 */
+    { "SET",               &cASN1Set,             },  /* 17 */
+    { "NUMERICSTRING",     &cASN1NumericString,   },  /* 18 */
+    { "PRINTABLESTRING",   &cASN1PrintableString, },  /* 19 */
+    { "T61STRING",         &cASN1T61String,       },  /* 20 */
+    { "VIDEOTEXSTRING",    &cASN1VideotexString,  },  /* 21 */
+    { "IA5STRING",         &cASN1IA5String,       },  /* 22 */
+    { "UTCTIME",           &cASN1UTCTime,         },  /* 23 */
+    { "GENERALIZEDTIME",   &cASN1GeneralizedTime, },  /* 24 */
+    { "GRAPHICSTRING",     &cASN1GraphicString,   },  /* 25 */
+    { "ISO64STRING",       &cASN1ISO64String,     },  /* 26 */
+    { "GENERALSTRING",     &cASN1GeneralString,   },  /* 27 */
+    { "UNIVERSALSTRING",   &cASN1UniversalString, },  /* 28 */
+    { "CHARACTER_STRING",  NULL,                  },  /* 29 */
+    { "BMPSTRING",         &cASN1BMPString,       },  /* 30 */
+};
+
+int ossl_asn1_info_size = (sizeof(ossl_asn1_info)/sizeof(ossl_asn1_info[0]));
+
+static int ossl_asn1_default_tag(VALUE obj);
+
+ASN1_TYPE*
+ossl_asn1_get_asn1type(VALUE obj)
+{
+    ASN1_TYPE *ret;
+    VALUE value, rflag;
+    void *ptr;
+    void (*free_func)();
+    long tag, flag;
+
+    tag = ossl_asn1_default_tag(obj);
+    value = ossl_asn1_get_value(obj);
+    switch(tag){
+    case V_ASN1_BOOLEAN:
+	ptr = (void*)obj_to_asn1bool(value);
+	free_func = NULL;
+	break;
+    case V_ASN1_INTEGER:         /* FALLTHROUGH */
+    case V_ASN1_ENUMERATED:
+	ptr = obj_to_asn1int(value);
+	free_func = ASN1_INTEGER_free;
+	break;
+    case V_ASN1_BIT_STRING:
+        rflag = rb_attr_get(obj, rb_intern("@unused_bits"));
+        flag = NIL_P(rflag) ? -1 : NUM2INT(rflag);
+	ptr = obj_to_asn1bstr(value, flag);
+	free_func = ASN1_BIT_STRING_free;
+	break;
+    case V_ASN1_NULL:
+	ptr = obj_to_asn1null(value);
+	free_func = ASN1_NULL_free;
+	break;
+    case V_ASN1_OCTET_STRING:    /* FALLTHROUGH */
+    case V_ASN1_UTF8STRING:      /* FALLTHROUGH */
+    case V_ASN1_NUMERICSTRING:   /* FALLTHROUGH */
+    case V_ASN1_PRINTABLESTRING: /* FALLTHROUGH */
+    case V_ASN1_T61STRING:       /* FALLTHROUGH */
+    case V_ASN1_VIDEOTEXSTRING:  /* FALLTHROUGH */
+    case V_ASN1_IA5STRING:       /* FALLTHROUGH */
+    case V_ASN1_GRAPHICSTRING:   /* FALLTHROUGH */
+    case V_ASN1_ISO64STRING:     /* FALLTHROUGH */
+    case V_ASN1_GENERALSTRING:   /* FALLTHROUGH */
+    case V_ASN1_UNIVERSALSTRING: /* FALLTHROUGH */
+    case V_ASN1_BMPSTRING:   
+	ptr = obj_to_asn1str(value);
+	free_func = ASN1_STRING_free;
+	break;
+    case V_ASN1_OBJECT:
+	ptr = obj_to_asn1obj(value);
+	free_func = ASN1_OBJECT_free;
+	break;
+    case V_ASN1_UTCTIME:
+	ptr = obj_to_asn1utime(value);
+	free_func = ASN1_TIME_free;
+	break;
+    case V_ASN1_GENERALIZEDTIME:
+	ptr = obj_to_asn1gtime(value);
+	free_func = ASN1_TIME_free;
+	break;
+    case V_ASN1_SET:             /* FALLTHROUGH */
+    case V_ASN1_SEQUENCE:
+	ptr = obj_to_asn1derstr(obj);
+	free_func = ASN1_STRING_free;
+	break;
+    default:
+	ossl_raise(eASN1Error, "unsupported ASN.1 type");
+    }
+    if(!(ret = OPENSSL_malloc(sizeof(ASN1_TYPE)))){
+	if(free_func) free_func(ptr);
+	ossl_raise(eASN1Error, "ASN1_TYPE alloc failure");
+    }
+    memset(ret, 0, sizeof(ASN1_TYPE));
+    ASN1_TYPE_set(ret, tag, ptr);
+
+    return ret;
+}
+
+static int
+ossl_asn1_default_tag(VALUE obj)
+{
+    int i;
+
+    for(i = 0; i < ossl_asn1_info_size; i++){
+	if(ossl_asn1_info[i].klass &&
+	   rb_obj_is_kind_of(obj, *ossl_asn1_info[i].klass)){
+	    return i;
+	}
+    }
+    ossl_raise(eASN1Error, "universal tag for %s not found",
+	       rb_class2name(CLASS_OF(obj)));
+
+    return -1; /* dummy */
+}
+
+static int
+ossl_asn1_tag(VALUE obj)
+{
+    VALUE tag;
+
+    tag = ossl_asn1_get_tag(obj);
+    if(NIL_P(tag))
+	ossl_raise(eASN1Error, "tag number not specified");
+
+    return NUM2INT(tag);
+}
+
+static int
+ossl_asn1_is_explicit(VALUE obj)
+{
+    VALUE s;
+    int ret = -1;
+
+    s = ossl_asn1_get_tagging(obj);
+    if(NIL_P(s)) return 0;
+    else if(SYMBOL_P(s)){
+	if (SYM2ID(s) == sIMPLICIT)
+	    ret = 0;
+	else if (SYM2ID(s) == sEXPLICIT)
+	    ret = 1;
+    }
+    if(ret < 0){
+	ossl_raise(eASN1Error, "invalid tag default");
+    }
+
+    return ret;
+}
+
+static int
+ossl_asn1_tag_class(VALUE obj)
+{
+    VALUE s;
+    int ret = -1;
+
+    s = ossl_asn1_get_tag_class(obj);
+    if(NIL_P(s)) ret = V_ASN1_UNIVERSAL;
+    else if(SYMBOL_P(s)){
+	if (SYM2ID(s) == sUNIVERSAL)
+	    ret = V_ASN1_UNIVERSAL;
+	else if (SYM2ID(s) == sAPPLICATION)
+	    ret = V_ASN1_APPLICATION;
+	else if (SYM2ID(s) == sCONTEXT_SPECIFIC)
+	    ret = V_ASN1_CONTEXT_SPECIFIC;
+	else if (SYM2ID(s) == sPRIVATE)
+	    ret = V_ASN1_PRIVATE;
+    }
+    if(ret < 0){
+	ossl_raise(eASN1Error, "invalid tag class");
+    }
+
+    return ret;
+}
+
+static VALUE
+ossl_asn1_class2sym(int tc)
+{
+    if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
+	return ID2SYM(sPRIVATE);
+    else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
+	return ID2SYM(sCONTEXT_SPECIFIC);
+    else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
+	return ID2SYM(sAPPLICATION);
+    else
+	return ID2SYM(sUNIVERSAL);
+}
+
+static VALUE
+ossl_asn1data_initialize(VALUE self, VALUE value, VALUE tag, VALUE tag_class)
+{
+    if(!SYMBOL_P(tag_class))
+	ossl_raise(eASN1Error, "invalid tag class");
+    if((SYM2ID(tag_class) == sUNIVERSAL) && NUM2INT(tag) > 31)
+	ossl_raise(eASN1Error, "tag number for Universal too large");
+    ossl_asn1_set_tag(self, tag);
+    ossl_asn1_set_value(self, value);
+    ossl_asn1_set_tag_class(self, tag_class);
+
+    return self;
+}
+
+static VALUE 
+join_der_i(VALUE i, VALUE str) 
+{
+    i = ossl_to_der_if_possible(i);
+    StringValue(i);
+    rb_str_append(str, i);
+    return Qnil;
+}
+
+static VALUE
+join_der(VALUE enumerable)
+{
+    VALUE str = rb_str_new(0, 0);
+    rb_iterate(rb_each, enumerable, join_der_i, str);
+    return str;
+}
+
+static VALUE
+ossl_asn1data_to_der(VALUE self)
+{
+    VALUE value, der;
+    int tag, tag_class, is_cons = 0;
+    long length;
+    unsigned char *p;
+
+    value = ossl_asn1_get_value(self);
+    if(rb_obj_is_kind_of(value, rb_cArray)){
+	is_cons = 1;
+	value = join_der(value);
+    }
+    StringValue(value);
+
+    tag = ossl_asn1_tag(self);
+    tag_class = ossl_asn1_tag_class(self);
+    if((length = ASN1_object_size(1, RSTRING(value)->len, tag)) <= 0)
+	ossl_raise(eASN1Error, NULL);
+    der = rb_str_new(0, length);
+    p = RSTRING(der)->ptr;
+    ASN1_put_object(&p, is_cons, RSTRING(value)->len, tag, tag_class);
+    memcpy(p, RSTRING(value)->ptr, RSTRING(value)->len);
+    p += RSTRING(value)->len;
+    ossl_str_adjust(der, p);
+
+    return der;
+}
+
+static VALUE
+ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
+		  int once, int yield)
+{
+    unsigned char *start, *p;
+    long len, off = *offset;
+    int hlen, tag, tc, j;
+    VALUE ary, asn1data, value, tag_class;
+
+    ary = rb_ary_new();
+    p = *pp;
+    while(length > 0){
+	start = p;
+	j = ASN1_get_object(&p, &len, &tag, &tc, length);
+	if(j & 0x80) ossl_raise(eASN1Error, NULL);
+	hlen = p - start;
+	if(yield){
+	    VALUE arg = rb_ary_new();
+	    rb_ary_push(arg, LONG2NUM(depth));
+	    rb_ary_push(arg, LONG2NUM(off));
+	    rb_ary_push(arg, LONG2NUM(hlen));
+	    rb_ary_push(arg, LONG2NUM(len));
+	    rb_ary_push(arg, (j & V_ASN1_CONSTRUCTED) ? Qtrue : Qfalse);
+	    rb_ary_push(arg, ossl_asn1_class2sym(tc));
+	    rb_ary_push(arg, INT2NUM(tag));
+	    rb_yield(arg);
+	}
+	length -= hlen;
+	off += hlen; 
+	if(len > length) ossl_raise(eASN1Error, "value is too short");
+	if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
+	    tag_class = sPRIVATE;
+	else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
+	    tag_class = sCONTEXT_SPECIFIC;
+	else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
+	    tag_class = sAPPLICATION;
+	else
+	    tag_class = sUNIVERSAL;
+	if(j & V_ASN1_CONSTRUCTED){
+	    /* TODO: if j == 0x21 it is indefinite length object. */
+	    if((j == 0x21) && (len == 0)){
+		long lastoff = off;
+		value = ossl_asn1_decode0(&p, length, &off, depth+1, 0, yield);
+		len = off - lastoff;
+	    }
+	    else value = ossl_asn1_decode0(&p, len, &off, depth+1, 0, yield);
+	}
+	else{
+	    value = rb_str_new(p, len);
+	    p += len;
+	    off += len;
+	}
+	if(tag_class == sUNIVERSAL &&
+	   tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass){
+	    VALUE klass = *ossl_asn1_info[tag].klass;
+	    long flag = 0;
+	    if(!rb_obj_is_kind_of(value, rb_cArray)){
+		switch(tag){
+		case V_ASN1_BOOLEAN:
+		    value = decode_bool(start, hlen+len);
+		    break;
+		case V_ASN1_INTEGER:
+		    value = decode_int(start, hlen+len);
+		    break;
+		case V_ASN1_BIT_STRING:
+		    value = decode_bstr(start, hlen+len, &flag);
+		    break;
+		case V_ASN1_NULL:
+		    value = decode_null(start, hlen+len);
+		    break;
+		case V_ASN1_ENUMERATED:
+		    value = decode_enum(start, hlen+len);
+		    break;
+		case V_ASN1_OBJECT:
+		    value = decode_obj(start, hlen+len);
+		    break;
+		case V_ASN1_UTCTIME:           /* FALLTHROUGH */
+		case V_ASN1_GENERALIZEDTIME:
+		    value = decode_time(start, hlen+len);
+		    break;
+		default:
+		    /* use original value */
+		    break;
+		}
+	    }
+	    asn1data = rb_funcall(klass, rb_intern("new"), 1, value);
+	    if(tag == V_ASN1_BIT_STRING){
+		rb_iv_set(asn1data, "@unused_bits", LONG2NUM(flag));
+	    }
+	}
+	else{
+	    asn1data = rb_funcall(cASN1Data, rb_intern("new"), 3,
+				  value, INT2NUM(tag), ID2SYM(tag_class));
+	}
+	rb_ary_push(ary, asn1data);
+	length -= len;
+        if(once) break;
+    }
+    *pp = p;
+    *offset = off;
+
+    return ary;
+}
+
+static VALUE
+ossl_asn1_traverse(VALUE self, VALUE obj)
+{
+    unsigned char *p;
+    long offset = 0;
+    volatile VALUE tmp;
+
+    obj = ossl_to_der_if_possible(obj);
+    tmp = rb_str_new4(StringValue(obj));
+    p = RSTRING(tmp)->ptr;
+    ossl_asn1_decode0(&p, RSTRING(tmp)->len, &offset, 0, 0, 1);
+
+    return Qnil;
+}
+
+static VALUE
+ossl_asn1_decode(VALUE self, VALUE obj)
+{
+    VALUE ret, ary;
+    unsigned char *p;
+    long offset = 0;
+    volatile VALUE tmp;
+
+    obj = ossl_to_der_if_possible(obj);
+    tmp = rb_str_new4(StringValue(obj));
+    p = RSTRING(tmp)->ptr;
+    ary = ossl_asn1_decode0(&p, RSTRING(tmp)->len, &offset, 0, 1, 0);
+    ret = rb_ary_entry(ary, 0);
+
+    return ret;
+}
+
+static VALUE
+ossl_asn1_decode_all(VALUE self, VALUE obj)
+{
+    VALUE ret;
+    unsigned char *p;
+    long offset = 0;
+    volatile VALUE tmp;
+
+    obj = ossl_to_der_if_possible(obj);
+    tmp = rb_str_new4(StringValue(obj));
+    p = RSTRING(tmp)->ptr;
+    ret = ossl_asn1_decode0(&p, RSTRING(tmp)->len, &offset, 0, 0, 0);
+
+    return ret;
+}
+
+static VALUE
+ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE value, tag, tagging, tag_class;
+
+    rb_scan_args(argc, argv, "13", &value, &tag, &tagging, &tag_class);
+    if(argc > 1){
+	if(NIL_P(tag))
+	    ossl_raise(eASN1Error, "must specify tag number");
+        if(NIL_P(tagging))
+	    tagging = ID2SYM(sEXPLICIT);
+	if(!SYMBOL_P(tagging))
+	    ossl_raise(eASN1Error, "invalid tag default");
+	if(NIL_P(tag_class))
+	    tag_class = ID2SYM(sCONTEXT_SPECIFIC);
+	if(!SYMBOL_P(tag_class))
+	    ossl_raise(eASN1Error, "invalid tag class");
+	if(SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31)
+	    ossl_raise(eASN1Error, "tag number for Universal too large");
+    }
+    else{
+	tag = INT2NUM(ossl_asn1_default_tag(self));
+        tagging = Qnil;
+	tag_class = ID2SYM(sUNIVERSAL);
+    }
+    ossl_asn1_set_tag(self, tag);
+    ossl_asn1_set_value(self, value);
+    ossl_asn1_set_tagging(self, tagging);
+    ossl_asn1_set_tag_class(self, tag_class);
+
+    return self;
+}
+
+static int
+ossl_i2d_ASN1_TYPE(ASN1_TYPE *a, unsigned char **pp)
+{
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+    if(!a) return 0;
+    if(a->type == V_ASN1_BOOLEAN)
+        return i2d_ASN1_BOOLEAN(a->value.boolean, pp);
+#endif
+    return i2d_ASN1_TYPE(a, pp);
+}
+
+static void
+ossl_ASN1_TYPE_free(ASN1_TYPE *a)
+{
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+    if(!a) return;
+    if(a->type == V_ASN1_BOOLEAN){
+        OPENSSL_free(a);
+        return;
+    }
+#endif
+    ASN1_TYPE_free(a);
+}
+
+static VALUE
+ossl_asn1prim_to_der(VALUE self)
+{
+    ASN1_TYPE *asn1;
+    int tn, tc, explicit;
+    long length, reallen;
+    unsigned char *buf, *p;
+    VALUE str;
+
+    tn = NUM2INT(ossl_asn1_get_tag(self));
+    tc = ossl_asn1_tag_class(self);
+    explicit = ossl_asn1_is_explicit(self);
+    asn1 = ossl_asn1_get_asn1type(self);
+
+    length = ASN1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
+    if(!(buf = OPENSSL_malloc(length))){
+	ossl_ASN1_TYPE_free(asn1);
+	ossl_raise(eASN1Error, "cannot alloc buffer");
+    }
+    p = buf;
+    if(tc == V_ASN1_UNIVERSAL) ossl_i2d_ASN1_TYPE(asn1, &p);
+    else{
+	if(explicit){
+	    ASN1_put_object(&p, 1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn, tc);
+	    ossl_i2d_ASN1_TYPE(asn1, &p);
+	}
+	else{
+	    ossl_i2d_ASN1_TYPE(asn1, &p);
+	    *buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
+	}
+    }
+    ossl_ASN1_TYPE_free(asn1);
+    reallen = p - buf;
+    assert(reallen <= length);
+    str = ossl_buf2str(buf, reallen); /* buf will be free in ossl_buf2str */
+
+    return str;
+}
+
+static VALUE
+ossl_asn1cons_to_der(VALUE self)
+{
+    int tag, tn, tc, explicit;
+    long seq_len, length;
+    unsigned char *p;
+    VALUE value, str;
+
+    tag = ossl_asn1_default_tag(self);
+    tn = NUM2INT(ossl_asn1_get_tag(self));
+    tc = ossl_asn1_tag_class(self);
+    explicit = ossl_asn1_is_explicit(self);
+    value = join_der(ossl_asn1_get_value(self));
+
+    seq_len = ASN1_object_size(1, RSTRING(value)->len, tag);
+    length = ASN1_object_size(1, seq_len, tn);
+    str = rb_str_new(0, length);
+    p = RSTRING(str)->ptr;
+    if(tc == V_ASN1_UNIVERSAL)
+	ASN1_put_object(&p, 1, RSTRING(value)->len, tn, tc);
+    else{
+	if(explicit){
+	    ASN1_put_object(&p, 1, seq_len, tn, tc);
+	    ASN1_put_object(&p, 1, RSTRING(value)->len, tag, V_ASN1_UNIVERSAL);
+	}
+	else ASN1_put_object(&p, 1, RSTRING(value)->len, tn, tc);
+    }
+    memcpy(p, RSTRING(value)->ptr, RSTRING(value)->len);
+    p += RSTRING(value)->len;
+    ossl_str_adjust(str, p);
+
+    return str;
+}
+
+static VALUE
+ossl_asn1cons_each(VALUE self)
+{
+    rb_ary_each(ossl_asn1_get_value(self));
+    return self;
+}
+
+static VALUE
+ossl_asn1obj_s_register(VALUE self, VALUE oid, VALUE sn, VALUE ln)
+{
+    StringValue(oid);
+    StringValue(sn);
+    StringValue(ln);
+
+    if(!OBJ_create(RSTRING(oid)->ptr, RSTRING(sn)->ptr, RSTRING(ln)->ptr))
+	ossl_raise(eASN1Error, NULL);
+
+    return Qtrue;
+}
+
+static VALUE
+ossl_asn1obj_get_sn(VALUE self)
+{
+    VALUE val, ret = Qnil;
+    int nid;
+
+    val = ossl_asn1_get_value(self);
+    if ((nid = OBJ_txt2nid(StringValuePtr(val))) != NID_undef)
+	ret = rb_str_new2(OBJ_nid2sn(nid));
+
+    return ret;
+}
+
+static VALUE
+ossl_asn1obj_get_ln(VALUE self)
+{
+    VALUE val, ret = Qnil;
+    int nid;
+
+    val = ossl_asn1_get_value(self);
+    if ((nid = OBJ_txt2nid(StringValuePtr(val))) != NID_undef)
+	ret = rb_str_new2(OBJ_nid2ln(nid));
+
+    return ret;
+}
+
+static VALUE
+ossl_asn1obj_get_oid(VALUE self)
+{
+    VALUE val;
+    ASN1_OBJECT *a1obj;
+    char buf[128];
+
+    val = ossl_asn1_get_value(self);
+    a1obj = obj_to_asn1obj(val);
+    OBJ_obj2txt(buf, sizeof(buf), a1obj, 1);
+    ASN1_OBJECT_free(a1obj);
+
+    return rb_str_new2(buf);
+}
+
+#define OSSL_ASN1_IMPL_FACTORY_METHOD(klass) \
+static VALUE ossl_asn1_##klass(int argc, VALUE *argv, VALUE self)\
+{ return rb_funcall3(cASN1##klass, rb_intern("new"), argc, argv); }
+
+OSSL_ASN1_IMPL_FACTORY_METHOD(Boolean)
+OSSL_ASN1_IMPL_FACTORY_METHOD(Integer)
+OSSL_ASN1_IMPL_FACTORY_METHOD(Enumerated)
+OSSL_ASN1_IMPL_FACTORY_METHOD(BitString)
+OSSL_ASN1_IMPL_FACTORY_METHOD(OctetString)
+OSSL_ASN1_IMPL_FACTORY_METHOD(UTF8String)
+OSSL_ASN1_IMPL_FACTORY_METHOD(NumericString)
+OSSL_ASN1_IMPL_FACTORY_METHOD(PrintableString)
+OSSL_ASN1_IMPL_FACTORY_METHOD(T61String)
+OSSL_ASN1_IMPL_FACTORY_METHOD(VideotexString)
+OSSL_ASN1_IMPL_FACTORY_METHOD(IA5String)
+OSSL_ASN1_IMPL_FACTORY_METHOD(GraphicString)
+OSSL_ASN1_IMPL_FACTORY_METHOD(ISO64String)
+OSSL_ASN1_IMPL_FACTORY_METHOD(GeneralString)
+OSSL_ASN1_IMPL_FACTORY_METHOD(UniversalString)
+OSSL_ASN1_IMPL_FACTORY_METHOD(BMPString)
+OSSL_ASN1_IMPL_FACTORY_METHOD(Null)
+OSSL_ASN1_IMPL_FACTORY_METHOD(ObjectId)
+OSSL_ASN1_IMPL_FACTORY_METHOD(UTCTime)
+OSSL_ASN1_IMPL_FACTORY_METHOD(GeneralizedTime)
+OSSL_ASN1_IMPL_FACTORY_METHOD(Sequence)
+OSSL_ASN1_IMPL_FACTORY_METHOD(Set)
+
+void
+Init_ossl_asn1()
+{
+    VALUE ary;
+    int i;
+
+#if 0 /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+#endif
+
+    sUNIVERSAL = rb_intern("UNIVERSAL");
+    sCONTEXT_SPECIFIC = rb_intern("CONTEXT_SPECIFIC");
+    sAPPLICATION = rb_intern("APPLICATION");
+    sPRIVATE = rb_intern("PRIVATE");
+    sEXPLICIT = rb_intern("EXPLICIT");
+    sIMPLICIT = rb_intern("IMPLICIT");
+
+    mASN1 = rb_define_module_under(mOSSL, "ASN1");
+    eASN1Error = rb_define_class_under(mASN1, "ASN1Error", eOSSLError);
+    rb_define_module_function(mASN1, "traverse", ossl_asn1_traverse, 1);
+    rb_define_module_function(mASN1, "decode", ossl_asn1_decode, 1);
+    rb_define_module_function(mASN1, "decode_all", ossl_asn1_decode_all, 1);
+    ary = rb_ary_new();
+    rb_define_const(mASN1, "UNIVERSAL_TAG_NAME", ary);
+    for(i = 0; i < ossl_asn1_info_size; i++){
+	if(ossl_asn1_info[i].name[0] == '[') continue;
+	rb_define_const(mASN1, ossl_asn1_info[i].name, INT2NUM(i));
+	rb_ary_store(ary, i, rb_str_new2(ossl_asn1_info[i].name));
+    }
+
+    cASN1Data = rb_define_class_under(mASN1, "ASN1Data", rb_cObject);
+    rb_attr(cASN1Data, rb_intern("value"), 1, 1, Qtrue);
+    rb_attr(cASN1Data, rb_intern("tag"), 1, 1, Qtrue);
+    rb_attr(cASN1Data, rb_intern("tag_class"), 1, 1, Qtrue);
+    rb_define_method(cASN1Data, "initialize", ossl_asn1data_initialize, 3);
+    rb_define_method(cASN1Data, "to_der", ossl_asn1data_to_der, 0);
+
+    cASN1Primitive = rb_define_class_under(mASN1, "Primitive", cASN1Data);
+    rb_attr(cASN1Primitive, rb_intern("tagging"), 1, 1, Qtrue);
+    rb_define_method(cASN1Primitive, "initialize", ossl_asn1_initialize, -1);
+    rb_define_method(cASN1Primitive, "to_der", ossl_asn1prim_to_der, 0);
+
+    cASN1Constructive = rb_define_class_under(mASN1,"Constructive", cASN1Data);
+    rb_include_module(cASN1Constructive, rb_mEnumerable);
+    rb_attr(cASN1Constructive, rb_intern("tagging"), 1, 1, Qtrue);
+    rb_define_method(cASN1Constructive, "initialize", ossl_asn1_initialize, -1);
+    rb_define_method(cASN1Constructive, "to_der", ossl_asn1cons_to_der, 0);
+    rb_define_method(cASN1Constructive, "each", ossl_asn1cons_each, 0);
+
+#define OSSL_ASN1_DEFINE_CLASS(name, super) \
+do{\
+    cASN1##name = rb_define_class_under(mASN1, #name, cASN1##super);\
+    rb_define_module_function(mASN1, #name, ossl_asn1_##name, -1);\
+}while(0)
+
+    OSSL_ASN1_DEFINE_CLASS(Boolean, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(Integer, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(Enumerated, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(BitString, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(OctetString, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(UTF8String, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(NumericString, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(PrintableString, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(T61String, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(VideotexString, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(IA5String, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(GraphicString, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(ISO64String, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(GeneralString, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(UniversalString, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(BMPString, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(Null, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(ObjectId, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(UTCTime, Primitive);
+    OSSL_ASN1_DEFINE_CLASS(GeneralizedTime, Primitive);
+
+    OSSL_ASN1_DEFINE_CLASS(Sequence, Constructive);
+    OSSL_ASN1_DEFINE_CLASS(Set, Constructive);
+
+    rb_define_singleton_method(cASN1ObjectId, "register", ossl_asn1obj_s_register, 3);
+    rb_define_method(cASN1ObjectId, "sn", ossl_asn1obj_get_sn, 0);
+    rb_define_method(cASN1ObjectId, "ln", ossl_asn1obj_get_ln, 0);
+    rb_define_method(cASN1ObjectId, "oid", ossl_asn1obj_get_oid, 0);
+    rb_define_alias(cASN1ObjectId, "short_name", "sn");
+    rb_define_alias(cASN1ObjectId, "long_name", "ln");
+    rb_attr(cASN1BitString, rb_intern("unused_bits"), 1, 1, Qtrue);
+}
diff --git a/ruby_1_8_6/ext/openssl/ossl_asn1.h b/ruby_1_8_6/ext/openssl/ossl_asn1.h
new file mode 100644
index 0000000000..8aad9f970d
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_asn1.h
@@ -0,0 +1,59 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' team members
+ * Copyright (C) 2003
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_ASN1_H_)
+#define _OSSL_ASN1_H_
+
+/*
+ * ASN1_DATE conversions
+ */
+VALUE asn1time_to_time(ASN1_TIME *);
+time_t time_to_time_t(VALUE);
+
+/*
+ * ASN1_STRING conversions
+ */
+VALUE asn1str_to_str(ASN1_STRING *);
+
+/*
+ * ASN1_INTEGER conversions
+ */
+VALUE asn1integer_to_num(ASN1_INTEGER *);
+ASN1_INTEGER *num_to_asn1integer(VALUE, ASN1_INTEGER *);
+
+/*
+ * ASN1 module
+ */
+extern VALUE mASN1;
+extern VALUE eASN1Error;  
+
+extern VALUE cASN1Data;
+extern VALUE cASN1Primitive;
+extern VALUE cASN1Constructive;
+ 
+extern VALUE cASN1Boolean;                           /* BOOLEAN           */
+extern VALUE cASN1Integer, cASN1Enumerated;          /* INTEGER           */
+extern VALUE cASN1BitString;                         /* BIT STRING        */
+extern VALUE cASN1OctetString, cASN1UTF8String;      /* STRINGs           */
+extern VALUE cASN1NumericString, cASN1PrintableString;
+extern VALUE cASN1T61String, cASN1VideotexString;
+extern VALUE cASN1IA5String, cASN1GraphicString;
+extern VALUE cASN1ISO64String, cASN1GeneralString;
+extern VALUE cASN1UniversalString, cASN1BMPString;
+extern VALUE cASN1Null;                              /* NULL              */
+extern VALUE cASN1ObjectId;                          /* OBJECT IDENTIFIER */
+extern VALUE cASN1UTCTime, cASN1GeneralizedTime;     /* TIME              */
+extern VALUE cASN1Sequence, cASN1Set;                /* CONSTRUCTIVE      */
+
+ASN1_TYPE *ossl_asn1_get_asn1type(VALUE);
+
+void Init_ossl_asn1(void);
+
+#endif
diff --git a/ruby_1_8_6/ext/openssl/ossl_bio.c b/ruby_1_8_6/ext/openssl/ossl_bio.c
new file mode 100644
index 0000000000..9c9aa24197
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_bio.c
@@ -0,0 +1,73 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' team members
+ * Copyright (C) 2003
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+BIO *
+ossl_obj2bio(VALUE obj)
+{
+    BIO *bio;
+
+    if (TYPE(obj) == T_FILE) {
+	OpenFile *fptr;
+	GetOpenFile(obj, fptr);
+	rb_io_check_readable(fptr);
+	bio = BIO_new_fp(fptr->f, BIO_NOCLOSE);
+    }       
+    else {
+	StringValue(obj);
+	bio = BIO_new_mem_buf(RSTRING(obj)->ptr, RSTRING(obj)->len);
+    }
+    if (!bio) ossl_raise(eOSSLError, NULL);
+
+    return bio;
+}
+
+BIO *
+ossl_protect_obj2bio(VALUE obj, int *status)
+{
+     BIO *ret = NULL;
+     ret = (BIO*)rb_protect((VALUE(*)_((VALUE)))ossl_obj2bio, obj, status);
+     return ret;
+}
+
+VALUE
+ossl_membio2str0(BIO *bio)
+{
+    VALUE ret;
+    BUF_MEM *buf;
+
+    BIO_get_mem_ptr(bio, &buf);
+    ret = rb_str_new(buf->data, buf->length);
+
+    return ret;
+}
+
+VALUE
+ossl_protect_membio2str(BIO *bio, int *status)
+{
+    return rb_protect((VALUE(*)_((VALUE)))ossl_membio2str0, (VALUE)bio, status);
+}
+
+VALUE 
+ossl_membio2str(BIO *bio)
+{
+    VALUE ret;
+    int status = 0;
+
+    ret = ossl_protect_membio2str(bio, &status);
+    BIO_free(bio);
+    if(status) rb_jump_tag(status);
+
+    return ret;
+}
diff --git a/ruby_1_8_6/ext/openssl/ossl_bio.h b/ruby_1_8_6/ext/openssl/ossl_bio.h
new file mode 100644
index 0000000000..2d8f675c5b
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_bio.h
@@ -0,0 +1,21 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' team members
+ * Copyright (C) 2003
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_BIO_H_)
+#define _OSSL_BIO_H_
+
+BIO *ossl_obj2bio(VALUE);
+BIO *ossl_protect_obj2bio(VALUE,int*);
+VALUE ossl_membio2str0(BIO*);
+VALUE ossl_membio2str(BIO*);
+VALUE ossl_protect_membio2str(BIO*,int*);
+
+#endif
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_bn.c b/ruby_1_8_6/ext/openssl/ossl_bn.c
new file mode 100644
index 0000000000..cc7689eef5
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_bn.c
@@ -0,0 +1,719 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Technorama team <oss-ruby@technorama.net>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+/* modified by Michal Rokos <m.rokos@sh.cvut.cz> */
+#include "ossl.h"
+
+#define WrapBN(klass, obj, bn) do { \
+  if (!bn) { \
+    ossl_raise(rb_eRuntimeError, "BN wasn't initialized!"); \
+  } \
+  obj = Data_Wrap_Struct(klass, 0, BN_clear_free, bn); \
+} while (0)
+
+#define GetBN(obj, bn) do { \
+  Data_Get_Struct(obj, BIGNUM, bn); \
+  if (!bn) { \
+    ossl_raise(rb_eRuntimeError, "BN wasn't initialized!"); \
+  } \
+} while (0)
+
+#define SafeGetBN(obj, bn) do { \
+  OSSL_Check_Kind(obj, cBN); \
+  GetBN(obj, bn); \
+} while (0)
+
+/*
+ * Classes
+ */
+VALUE cBN;
+VALUE eBNError;
+
+/*
+ * Public
+ */
+VALUE
+ossl_bn_new(BIGNUM *bn)
+{
+    BIGNUM *newbn;
+    VALUE obj;
+
+    newbn = bn ? BN_dup(bn) : BN_new();
+    if (!newbn) {
+	ossl_raise(eBNError, NULL);
+    }
+    WrapBN(cBN, obj, newbn);
+
+    return obj;
+}
+
+BIGNUM *
+GetBNPtr(VALUE obj)
+{
+    BIGNUM *bn = NULL;
+
+    if (RTEST(rb_obj_is_kind_of(obj, cBN))) {
+	GetBN(obj, bn);
+    } else switch (TYPE(obj)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+	obj = rb_String(obj);
+	if (!BN_dec2bn(&bn, StringValuePtr(obj))) {
+	    ossl_raise(eBNError, NULL);
+	}
+	WrapBN(cBN, obj, bn); /* Handle potencial mem leaks */
+	break;
+    default:
+	ossl_raise(rb_eTypeError, "Cannot convert into OpenSSL::BN");
+    }
+    return bn;
+}
+
+/*
+ * Private
+ */
+/*
+ * BN_CTX - is used in more difficult math. ops
+ * (Why just 1? Because Ruby itself isn't thread safe,
+ *  we don't need to care about threads)
+ */
+BN_CTX *ossl_bn_ctx;
+
+static VALUE
+ossl_bn_alloc(VALUE klass)
+{
+    BIGNUM *bn;
+    VALUE obj;
+	
+    if (!(bn = BN_new())) {
+	ossl_raise(eBNError, NULL);
+    }
+    WrapBN(klass, obj, bn);
+
+    return obj;
+}
+
+static VALUE
+ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
+{
+    BIGNUM *bn;
+    VALUE str, bs;
+    int base = 10;
+
+    if (rb_scan_args(argc, argv, "11", &str, &bs) == 2) {
+	base = NUM2INT(bs);
+    }
+    StringValue(str);
+    GetBN(self, bn);
+    if (RTEST(rb_obj_is_kind_of(str, cBN))) {
+	BIGNUM *other;
+
+	GetBN(str, other); /* Safe - we checked kind_of? above */
+	if (!BN_copy(bn, other)) {
+	    ossl_raise(eBNError, NULL);
+	}
+	return self;
+    }
+
+    switch (base) {
+    case 0:
+	if (!BN_mpi2bn(RSTRING(str)->ptr, RSTRING(str)->len, bn)) {
+	    ossl_raise(eBNError, NULL);
+	}
+	break;
+    case 2:
+	if (!BN_bin2bn(RSTRING(str)->ptr, RSTRING(str)->len, bn)) {
+	    ossl_raise(eBNError, NULL);
+	}
+	break;
+    case 10:
+	if (!BN_dec2bn(&bn, RSTRING(str)->ptr)) {
+	    ossl_raise(eBNError, NULL);
+	}
+	break;
+    case 16:
+	if (!BN_hex2bn(&bn, RSTRING(str)->ptr)) {
+	    ossl_raise(eBNError, NULL);
+	}
+	break;
+    default:
+	ossl_raise(rb_eArgError, "illegal radix %d", base);
+    }
+    return self;
+}
+
+static VALUE
+ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
+{
+    BIGNUM *bn;
+    VALUE str, bs;
+    int base = 10, len;
+    char *buf;
+
+    if (rb_scan_args(argc, argv, "01", &bs) == 1) {
+	base = NUM2INT(bs);
+    }
+    GetBN(self, bn);
+    switch (base) {
+    case 0:
+	len = BN_bn2mpi(bn, NULL);
+        str = rb_str_new(0, len);
+	if (BN_bn2mpi(bn, RSTRING(str)->ptr) != len)
+	    ossl_raise(eBNError, NULL);
+	break;
+    case 2:
+	len = BN_num_bytes(bn);
+        str = rb_str_new(0, len);
+	if (BN_bn2bin(bn, RSTRING(str)->ptr) != len)
+	    ossl_raise(eBNError, NULL);
+	break;
+    case 10:
+	if (!(buf = BN_bn2dec(bn))) ossl_raise(eBNError, NULL);
+	str = ossl_buf2str(buf, strlen(buf));
+	break;
+    case 16:
+	if (!(buf = BN_bn2hex(bn))) ossl_raise(eBNError, NULL);
+	str = ossl_buf2str(buf, strlen(buf));
+	break;
+    default:
+	ossl_raise(rb_eArgError, "illegal radix %d", base);
+    }
+
+    return str;
+}
+
+static VALUE
+ossl_bn_to_i(VALUE self)
+{
+    BIGNUM *bn;
+    char *txt;
+    VALUE num;
+
+    GetBN(self, bn);
+
+    if (!(txt = BN_bn2dec(bn))) {
+	ossl_raise(eBNError, NULL);
+    }
+    num = rb_cstr_to_inum(txt, 10, Qtrue);
+    OPENSSL_free(txt);
+
+    return num;
+}
+
+static VALUE
+ossl_bn_to_bn(VALUE self)
+{
+    return self;
+}
+
+static VALUE
+ossl_bn_coerce(VALUE self, VALUE other)
+{
+    switch(TYPE(other)) {
+    case T_STRING:
+	self = ossl_bn_to_s(0, NULL, self);
+	break;
+    case T_FIXNUM:
+    case T_BIGNUM:
+	self = ossl_bn_to_i(self);
+	break;
+    default:
+	if (!RTEST(rb_obj_is_kind_of(other, cBN))) {
+	    ossl_raise(rb_eTypeError, "Don't know how to coerce");
+	}
+    }
+    return rb_assoc_new(other, self);
+}
+
+#define BIGNUM_BOOL1(func)				\
+    static VALUE					\
+    ossl_bn_##func(VALUE self)				\
+    {							\
+	BIGNUM *bn;					\
+	GetBN(self, bn);				\
+	if (BN_##func(bn)) {				\
+	    return Qtrue;				\
+	}						\
+	return Qfalse;					\
+    }
+BIGNUM_BOOL1(is_zero);
+BIGNUM_BOOL1(is_one);
+BIGNUM_BOOL1(is_odd);
+
+#define BIGNUM_1c(func)					\
+    static VALUE					\
+    ossl_bn_##func(VALUE self)				\
+    {							\
+	BIGNUM *bn, *result;				\
+	VALUE obj;					\
+	GetBN(self, bn);				\
+	if (!(result = BN_new())) {			\
+	    ossl_raise(eBNError, NULL);			\
+	}						\
+	if (!BN_##func(result, bn, ossl_bn_ctx)) {	\
+	    BN_free(result);				\
+	    ossl_raise(eBNError, NULL);			\
+	}						\
+	WrapBN(CLASS_OF(self), obj, result);		\
+	return obj;					\
+    }
+BIGNUM_1c(sqr);
+
+#define BIGNUM_2(func)					\
+    static VALUE					\
+    ossl_bn_##func(VALUE self, VALUE other)		\
+    {							\
+	BIGNUM *bn1, *bn2 = GetBNPtr(other), *result;	\
+	VALUE obj;					\
+	GetBN(self, bn1);				\
+	if (!(result = BN_new())) {			\
+	    ossl_raise(eBNError, NULL);			\
+	}						\
+	if (!BN_##func(result, bn1, bn2)) {		\
+	    BN_free(result);				\
+	    ossl_raise(eBNError, NULL);			\
+	}						\
+	WrapBN(CLASS_OF(self), obj, result);		\
+	return obj;					\
+    }
+BIGNUM_2(add);
+BIGNUM_2(sub);
+
+#define BIGNUM_2c(func)						\
+    static VALUE						\
+    ossl_bn_##func(VALUE self, VALUE other)			\
+    {								\
+	BIGNUM *bn1, *bn2 = GetBNPtr(other), *result;		\
+	VALUE obj;						\
+	GetBN(self, bn1);					\
+	if (!(result = BN_new())) {				\
+	    ossl_raise(eBNError, NULL);				\
+	}							\
+	if (!BN_##func(result, bn1, bn2, ossl_bn_ctx)) {	\
+	    BN_free(result);					\
+	    ossl_raise(eBNError, NULL);				\
+	}							\
+	WrapBN(CLASS_OF(self), obj, result);			\
+	return obj;						\
+    }
+BIGNUM_2c(mul);
+BIGNUM_2c(mod);
+BIGNUM_2c(exp);
+BIGNUM_2c(gcd);
+BIGNUM_2c(mod_sqr);
+BIGNUM_2c(mod_inverse);
+
+static VALUE
+ossl_bn_div(VALUE self, VALUE other)
+{
+    BIGNUM *bn1, *bn2 = GetBNPtr(other), *r1, *r2;
+    VALUE obj1, obj2;
+
+    GetBN(self, bn1);
+
+    if (!(r1 = BN_new())) {
+	ossl_raise(eBNError, NULL);
+    }
+    if (!(r2 = BN_new())) {
+	BN_free(r1);
+	ossl_raise(eBNError, NULL);
+    }
+    if (!BN_div(r1, r2, bn1, bn2, ossl_bn_ctx)) {
+	BN_free(r1);
+	BN_free(r2);
+	ossl_raise(eBNError, NULL);
+    }
+    WrapBN(CLASS_OF(self), obj1, r1);
+    WrapBN(CLASS_OF(self), obj2, r2);
+    
+    return rb_ary_new3(2, obj1, obj2);
+}
+
+#define BIGNUM_3c(func)						\
+    static VALUE						\
+    ossl_bn_##func(VALUE self, VALUE other1, VALUE other2)	\
+    {								\
+	BIGNUM *bn1, *bn2 = GetBNPtr(other1);			\
+	BIGNUM *bn3 = GetBNPtr(other2), *result;		\
+	VALUE obj;						\
+	GetBN(self, bn1);					\
+	if (!(result = BN_new())) {				\
+	    ossl_raise(eBNError, NULL);				\
+	}							\
+	if (!BN_##func(result, bn1, bn2, bn3, ossl_bn_ctx)) {	\
+	    BN_free(result);					\
+	    ossl_raise(eBNError, NULL);				\
+	}							\
+	WrapBN(CLASS_OF(self), obj, result);			\
+	return obj;						\
+    }
+BIGNUM_3c(mod_add);
+BIGNUM_3c(mod_sub);
+BIGNUM_3c(mod_mul);
+BIGNUM_3c(mod_exp);
+
+#define BIGNUM_BIT(func)				\
+    static VALUE					\
+    ossl_bn_##func(VALUE self, VALUE bit)		\
+    {							\
+	BIGNUM *bn;					\
+	GetBN(self, bn);				\
+	if (!BN_##func(bn, NUM2INT(bit))) {		\
+	    ossl_raise(eBNError, NULL);			\
+	}						\
+	return self;					\
+    }
+BIGNUM_BIT(set_bit);
+BIGNUM_BIT(clear_bit);
+BIGNUM_BIT(mask_bits);
+
+static VALUE
+ossl_bn_is_bit_set(VALUE self, VALUE bit)
+{
+    int b;
+    BIGNUM *bn;
+
+    b = NUM2INT(bit);
+    GetBN(self, bn);
+    if (BN_is_bit_set(bn, b)) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+#define BIGNUM_SHIFT(func)				\
+    static VALUE					\
+    ossl_bn_##func(VALUE self, VALUE bits)		\
+    {							\
+	BIGNUM *bn, *result;				\
+	int b;						\
+	VALUE obj;					\
+	b = NUM2INT(bits);				\
+	GetBN(self, bn);				\
+	if (!(result = BN_new())) {			\
+		ossl_raise(eBNError, NULL);		\
+	}						\
+	if (!BN_##func(result, bn, b)) {		\
+		BN_free(result);			\
+		ossl_raise(eBNError, NULL);		\
+	}						\
+	WrapBN(CLASS_OF(self), obj, result);		\
+	return obj;					\
+    }
+BIGNUM_SHIFT(lshift);
+BIGNUM_SHIFT(rshift);
+
+#define BIGNUM_RAND(func)					\
+    static VALUE						\
+    ossl_bn_s_##func(int argc, VALUE *argv, VALUE klass)	\
+    {								\
+	BIGNUM *result;						\
+	int bottom = 0, top = 0, b;				\
+	VALUE bits, fill, odd, obj;				\
+								\
+	switch (rb_scan_args(argc, argv, "12", &bits, &fill, &odd)) {	\
+	case 3:							\
+	    bottom = (odd == Qtrue) ? 1 : 0;			\
+	    /* FALLTHROUGH */					\
+	case 2:							\
+	    top = FIX2INT(fill);				\
+	}							\
+	b = NUM2INT(bits);					\
+	if (!(result = BN_new())) {				\
+	    ossl_raise(eBNError, NULL);				\
+	}							\
+	if (!BN_##func(result, b, top, bottom)) {		\
+	    BN_free(result);					\
+	    ossl_raise(eBNError, NULL);				\
+	}							\
+	WrapBN(klass, obj, result);				\
+	return obj;						\
+    }
+BIGNUM_RAND(rand);
+BIGNUM_RAND(pseudo_rand);
+
+#define BIGNUM_RAND_RANGE(func)					\
+    static VALUE						\
+    ossl_bn_s_##func##_range(VALUE klass, VALUE range)		\
+    {								\
+	BIGNUM *bn = GetBNPtr(range), *result;			\
+	VALUE obj;						\
+	if (!(result = BN_new())) {				\
+	    ossl_raise(eBNError, NULL);				\
+	}							\
+	if (!BN_##func##_range(result, bn)) {			\
+	    BN_free(result);					\
+	    ossl_raise(eBNError, NULL);				\
+	}							\
+	WrapBN(klass, obj, result);				\
+	return obj;						\
+    }
+BIGNUM_RAND_RANGE(rand);
+BIGNUM_RAND_RANGE(pseudo_rand);
+
+static VALUE
+ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
+{
+    BIGNUM *add = NULL, *rem = NULL, *result;
+    int safe = 1, num;
+    VALUE vnum, vsafe, vadd, vrem, obj;
+
+    rb_scan_args(argc, argv, "13", &vnum, &vsafe, &vadd, &vrem);
+	
+    num = NUM2INT(vnum);
+
+    if (vsafe == Qfalse) {
+	safe = 0;
+    }
+    if (!NIL_P(vadd)) {
+	if (NIL_P(vrem)) {
+	    ossl_raise(rb_eArgError,
+		       "if ADD is specified, REM must be also given");
+	}
+	add = GetBNPtr(vadd);
+	rem = GetBNPtr(vrem);
+    }
+    if (!(result = BN_new())) {
+	ossl_raise(eBNError, NULL);
+    }
+    if (!BN_generate_prime(result, num, safe, add, rem, NULL, NULL)) {
+	BN_free(result);
+	ossl_raise(eBNError, NULL);
+    }
+    WrapBN(klass, obj, result);
+    
+	return obj;
+}
+
+#define BIGNUM_NUM(func)			\
+    static VALUE 				\
+    ossl_bn_##func(VALUE self)			\
+    {						\
+	BIGNUM *bn;				\
+	GetBN(self, bn);			\
+	return INT2FIX(BN_##func(bn));		\
+    }
+BIGNUM_NUM(num_bytes);
+BIGNUM_NUM(num_bits);
+
+static VALUE
+ossl_bn_copy(VALUE self, VALUE other)
+{
+    BIGNUM *bn1, *bn2;
+    
+    rb_check_frozen(self);
+    
+    if (self == other) return self;
+    
+    GetBN(self, bn1);
+    bn2 = GetBNPtr(other);
+    
+    if (!BN_copy(bn1, bn2)) {
+	ossl_raise(eBNError, NULL);
+    }
+    return self;
+}
+
+#define BIGNUM_CMP(func)				\
+    static VALUE					\
+    ossl_bn_##func(VALUE self, VALUE other)		\
+    {							\
+	BIGNUM *bn1, *bn2 = GetBNPtr(other);		\
+	GetBN(self, bn1);				\
+	return INT2FIX(BN_##func(bn1, bn2));		\
+    }
+BIGNUM_CMP(cmp);
+BIGNUM_CMP(ucmp);
+
+static VALUE
+ossl_bn_eql(VALUE self, VALUE other)
+{
+    if (ossl_bn_cmp(self, other) == INT2FIX(0)) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+static VALUE
+ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
+{
+    BIGNUM *bn;
+    VALUE vchecks;
+    int checks = BN_prime_checks;
+
+    if (rb_scan_args(argc, argv, "01", &vchecks) == 0) {
+	checks = NUM2INT(vchecks);
+    }
+    GetBN(self, bn);
+    switch (BN_is_prime(bn, checks, NULL, ossl_bn_ctx, NULL)) {
+    case 1:
+	return Qtrue;
+    case 0:
+	return Qfalse;
+    default:
+	ossl_raise(eBNError, NULL);
+    }
+    /* not reachable */
+    return Qnil;
+}
+
+static VALUE
+ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
+{
+    BIGNUM *bn;
+    VALUE vchecks, vtrivdiv;
+    int checks = BN_prime_checks, do_trial_division = 1;
+
+    rb_scan_args(argc, argv, "02", &vchecks, &vtrivdiv);
+
+    if (!NIL_P(vchecks)) {
+	checks = NUM2INT(vchecks);
+    }
+    GetBN(self, bn);
+    /* handle true/false */
+    if (vtrivdiv == Qfalse) {
+	do_trial_division = 0;
+    }
+    switch (BN_is_prime_fasttest(bn, checks, NULL, ossl_bn_ctx, NULL, do_trial_division)) {
+    case 1:
+	return Qtrue;
+    case 0:
+	return Qfalse;
+    default:
+	ossl_raise(eBNError, NULL);
+    }
+    /* not reachable */
+    return Qnil;
+}
+
+/*
+ * INIT
+ * (NOTE: ordering of methods is the same as in 'man bn')
+ */
+void
+Init_ossl_bn()
+{
+#if 0 /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+#endif
+
+    if (!(ossl_bn_ctx = BN_CTX_new())) {
+	ossl_raise(rb_eRuntimeError, "Cannot init BN_CTX");
+    }
+
+    eBNError = rb_define_class_under(mOSSL, "BNError", eOSSLError);
+
+    cBN = rb_define_class_under(mOSSL, "BN", rb_cObject);
+
+    rb_define_alloc_func(cBN, ossl_bn_alloc);
+    rb_define_method(cBN, "initialize", ossl_bn_initialize, -1);
+	
+    rb_define_copy_func(cBN, ossl_bn_copy);
+    rb_define_method(cBN, "copy", ossl_bn_copy, 1);
+
+    /* swap (=coerce?) */
+
+    rb_define_method(cBN, "num_bytes", ossl_bn_num_bytes, 0);
+    rb_define_method(cBN, "num_bits", ossl_bn_num_bits, 0);
+    /* num_bits_word */
+
+    rb_define_method(cBN, "+", ossl_bn_add, 1);
+    rb_define_method(cBN, "-", ossl_bn_sub, 1);
+    rb_define_method(cBN, "*", ossl_bn_mul, 1);
+    rb_define_method(cBN, "sqr", ossl_bn_sqr, 0);
+    rb_define_method(cBN, "/", ossl_bn_div, 1);
+    rb_define_method(cBN, "%", ossl_bn_mod, 1);
+    /* nnmod */
+
+    rb_define_method(cBN, "mod_add", ossl_bn_mod_add, 2);
+    rb_define_method(cBN, "mod_sub", ossl_bn_mod_sub, 2);
+    rb_define_method(cBN, "mod_mul", ossl_bn_mod_mul, 2);
+    rb_define_method(cBN, "mod_sqr", ossl_bn_mod_sqr, 1);
+    rb_define_method(cBN, "**", ossl_bn_exp, 1);
+    rb_define_method(cBN, "mod_exp", ossl_bn_mod_exp, 2);
+    rb_define_method(cBN, "gcd", ossl_bn_gcd, 1);
+
+    /* add_word
+     * sub_word
+     * mul_word
+     * div_word
+     * mod_word */
+
+    rb_define_method(cBN, "cmp", ossl_bn_cmp, 1);
+    rb_define_alias(cBN, "<=>", "cmp");
+    rb_define_method(cBN, "ucmp", ossl_bn_ucmp, 1);
+    rb_define_method(cBN, "eql?", ossl_bn_eql, 1);
+    rb_define_alias(cBN, "==", "eql?");
+    rb_define_alias(cBN, "===", "eql?");
+    rb_define_method(cBN, "zero?", ossl_bn_is_zero, 0);
+    rb_define_method(cBN, "one?", ossl_bn_is_one, 0);
+    /* is_word */
+    rb_define_method(cBN, "odd?", ossl_bn_is_odd, 0);
+
+    /* zero
+     * one
+     * value_one - DON'T IMPL.
+     * set_word
+     * get_word */
+    
+    rb_define_singleton_method(cBN, "rand", ossl_bn_s_rand, -1);
+    rb_define_singleton_method(cBN, "pseudo_rand", ossl_bn_s_pseudo_rand, -1);
+    rb_define_singleton_method(cBN, "rand_range", ossl_bn_s_rand_range, 1);
+    rb_define_singleton_method(cBN, "pseudo_rand_range", ossl_bn_s_pseudo_rand_range, 1);
+
+    rb_define_singleton_method(cBN, "generate_prime", ossl_bn_s_generate_prime, -1);
+    rb_define_method(cBN, "prime?", ossl_bn_is_prime, -1);
+
+    rb_define_method(cBN, "set_bit!", ossl_bn_set_bit, 1);
+    rb_define_method(cBN, "clear_bit!", ossl_bn_clear_bit, 1);
+    rb_define_method(cBN, "bit_set?", ossl_bn_is_bit_set, 1);
+    rb_define_method(cBN, "mask_bits!", ossl_bn_mask_bits, 1);
+    rb_define_method(cBN, "<<", ossl_bn_lshift, 1);
+    /* lshift1 - DON'T IMPL. */
+    rb_define_method(cBN, ">>", ossl_bn_rshift, 1);
+    /* rshift1 - DON'T IMPL. */
+
+    /*
+     * bn2bin
+     * bin2bn
+     * bn2hex
+     * bn2dec
+     * hex2bn
+     * dec2bn - all these are implemented in ossl_bn_initialize, and ossl_bn_to_s
+     * print - NOT IMPL.
+     * print_fp - NOT IMPL.
+     * bn2mpi
+     * mpi2bn
+     */
+    rb_define_method(cBN, "to_s", ossl_bn_to_s, -1);
+    rb_define_method(cBN, "to_i", ossl_bn_to_i, 0);
+    rb_define_alias(cBN, "to_int", "to_i");
+    rb_define_method(cBN, "to_bn", ossl_bn_to_bn, 0);
+    rb_define_method(cBN, "coerce", ossl_bn_coerce, 1);
+	
+    /*
+     * TODO:
+     * But how to: from_bin, from_mpi? PACK?
+     * to_bin
+     * to_mpi
+     */
+
+    rb_define_method(cBN, "mod_inverse", ossl_bn_mod_inverse, 1);
+
+    /* RECiProcal
+     * MONTgomery */
+
+    /*
+     * TODO:
+     * Where to belong these?
+     */
+    rb_define_method(cBN, "prime_fasttest?", ossl_bn_is_prime_fasttest, -1);
+}
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_bn.h b/ruby_1_8_6/ext/openssl/ossl_bn.h
new file mode 100644
index 0000000000..12aa484873
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_bn.h
@@ -0,0 +1,22 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_BN_H_)
+#define _OSSL_BN_H_
+
+extern VALUE cBN;
+extern VALUE eBNError;
+
+VALUE ossl_bn_new(BIGNUM *);
+BIGNUM *GetBNPtr(VALUE);
+void Init_ossl_bn(void);
+
+#endif /* _OSS_BN_H_ */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_cipher.c b/ruby_1_8_6/ext/openssl/ossl_cipher.c
new file mode 100644
index 0000000000..57b7976617
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_cipher.c
@@ -0,0 +1,410 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#define MakeCipher(obj, klass, ctx) \
+    obj = Data_Make_Struct(klass, EVP_CIPHER_CTX, 0, ossl_cipher_free, ctx)
+#define GetCipher(obj, ctx) do { \
+    Data_Get_Struct(obj, EVP_CIPHER_CTX, ctx); \
+    if (!ctx) { \
+	ossl_raise(rb_eRuntimeError, "Cipher not inititalized!"); \
+    } \
+} while (0)
+#define SafeGetCipher(obj, ctx) do { \
+    OSSL_Check_Kind(obj, cCipher); \
+    GetCipher(obj, ctx); \
+} while (0)
+
+/*
+ * Classes
+ */
+VALUE mCipher;
+VALUE cCipher;
+VALUE eCipherError;
+
+static VALUE ossl_cipher_alloc(VALUE klass);
+
+/*
+ * PUBLIC
+ */
+const EVP_CIPHER *
+GetCipherPtr(VALUE obj)
+{
+    EVP_CIPHER_CTX *ctx;
+
+    SafeGetCipher(obj, ctx);
+
+    return EVP_CIPHER_CTX_cipher(ctx);
+}
+
+VALUE
+ossl_cipher_new(const EVP_CIPHER *cipher)
+{
+    VALUE ret;
+    EVP_CIPHER_CTX *ctx;
+
+    ret = ossl_cipher_alloc(cCipher);
+    GetCipher(ret, ctx);
+    EVP_CIPHER_CTX_init(ctx);
+    if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) != 1)
+	ossl_raise(eCipherError, NULL);
+
+    return ret;
+}
+
+/*
+ * PRIVATE
+ */
+static void
+ossl_cipher_free(EVP_CIPHER_CTX *ctx)
+{
+    if (ctx) {
+	EVP_CIPHER_CTX_cleanup(ctx);
+	free(ctx);
+    }
+}
+
+static VALUE
+ossl_cipher_alloc(VALUE klass)
+{
+    EVP_CIPHER_CTX *ctx;
+    VALUE obj;
+
+    MakeCipher(obj, klass, ctx);
+    EVP_CIPHER_CTX_init(ctx);
+	
+    return obj;
+}
+
+static VALUE
+ossl_cipher_initialize(VALUE self, VALUE str)
+{
+    EVP_CIPHER_CTX *ctx;
+    const EVP_CIPHER *cipher;
+    char *name;
+
+    name = StringValuePtr(str);
+    GetCipher(self, ctx);
+    if (!(cipher = EVP_get_cipherbyname(name))) {
+	ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%s)", name);
+    }
+    if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) != 1)
+	ossl_raise(eCipherError, NULL);
+
+    return self;
+}
+static VALUE
+ossl_cipher_copy(VALUE self, VALUE other)
+{
+    EVP_CIPHER_CTX *ctx1, *ctx2;
+	
+    rb_check_frozen(self);
+    if (self == other) return self;
+
+    GetCipher(self, ctx1);
+    SafeGetCipher(other, ctx2);
+    if (EVP_CIPHER_CTX_copy(ctx1, ctx2) != 1)
+	ossl_raise(eCipherError, NULL);
+
+    return self;
+}
+
+static void*
+add_cipher_name_to_ary(const OBJ_NAME *name, VALUE ary)
+{
+    rb_ary_push(ary, rb_str_new2(name->name));
+    return NULL;
+}
+
+static VALUE
+ossl_s_ciphers(VALUE self)
+{
+#ifdef HAVE_OBJ_NAME_DO_ALL_SORTED
+    VALUE ary;
+
+    ary = rb_ary_new();
+    OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
+                    (void(*)(const OBJ_NAME*,void*))add_cipher_name_to_ary,
+                    (void*)ary);
+
+    return ary;
+#else
+    rb_notimplement();
+#endif
+}
+
+static VALUE
+ossl_cipher_reset(VALUE self)
+{
+    EVP_CIPHER_CTX *ctx;
+
+    GetCipher(self, ctx);
+    if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, -1) != 1)
+	ossl_raise(eCipherError, NULL);
+		
+    return self;
+}
+
+static VALUE
+ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
+{
+    EVP_CIPHER_CTX *ctx;
+    unsigned char key[EVP_MAX_KEY_LENGTH], *p_key = NULL;
+    unsigned char iv[EVP_MAX_IV_LENGTH], *p_iv = NULL;
+    VALUE pass, init_v;
+
+    if(rb_scan_args(argc, argv, "02", &pass, &init_v) > 0){
+	/*
+	 * oops. this code mistakes salt for IV.
+	 * We deprecated the arguments for this method, but we decided
+	 * keeping this behaviour for backward compatibility.
+	 */
+	StringValue(pass);
+	GetCipher(self, ctx);
+	if (NIL_P(init_v)) memcpy(iv, "OpenSSL for Ruby rulez!", sizeof(iv));
+	else{
+	    char *cname  = rb_class2name(rb_obj_class(self));
+	    rb_warning("key derivation by %s#encrypt is deprecated; "
+		       "use %s::pkcs5_keyivgen instead", cname, cname);
+	    StringValue(init_v);
+	    if (EVP_MAX_IV_LENGTH > RSTRING(init_v)->len) {
+		memset(iv, 0, EVP_MAX_IV_LENGTH);
+		memcpy(iv, RSTRING(init_v)->ptr, RSTRING(init_v)->len);
+	    }
+	    else memcpy(iv, RSTRING(init_v)->ptr, sizeof(iv));
+	}
+	EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
+		       RSTRING(pass)->ptr, RSTRING(pass)->len, 1, key, NULL);
+	p_key = key;
+	p_iv = iv;
+    }
+    else {
+	GetCipher(self, ctx);
+    }
+    if (EVP_CipherInit_ex(ctx, NULL, NULL, p_key, p_iv, mode) != 1) {
+	ossl_raise(eCipherError, NULL);
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self)
+{
+    return ossl_cipher_init(argc, argv, self, 1);
+}
+
+static VALUE
+ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self)
+{
+    return ossl_cipher_init(argc, argv, self, 0);
+}
+
+static VALUE
+ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
+{
+    EVP_CIPHER_CTX *ctx;
+    const EVP_MD *digest;
+    VALUE vpass, vsalt, viter, vdigest;
+    unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH], *salt = NULL;
+    int iter;
+
+    rb_scan_args(argc, argv, "13", &vpass, &vsalt, &viter, &vdigest);
+    StringValue(vpass);
+    if(!NIL_P(vsalt)){
+	StringValue(vsalt);
+	if(RSTRING(vsalt)->len != PKCS5_SALT_LEN)
+	    rb_raise(eCipherError, "salt must be an 8-octet string");
+	salt = RSTRING(vsalt)->ptr;
+    }
+    iter = NIL_P(viter) ? 2048 : NUM2INT(viter);
+    digest = NIL_P(vdigest) ? EVP_md5() : GetDigestPtr(vdigest);
+    GetCipher(self, ctx);
+    EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), digest, salt,
+		   RSTRING(vpass)->ptr, RSTRING(vpass)->len, iter, key, iv); 
+    if (EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, -1) != 1)
+	ossl_raise(eCipherError, NULL);
+    OPENSSL_cleanse(key, sizeof key);
+    OPENSSL_cleanse(iv, sizeof iv);
+
+    return Qnil;
+}
+
+static VALUE 
+ossl_cipher_update(VALUE self, VALUE data)
+{
+    EVP_CIPHER_CTX *ctx;
+    char *in;
+    int in_len, out_len;
+    VALUE str;
+
+    StringValue(data);
+    in = RSTRING(data)->ptr;
+    if ((in_len = RSTRING(data)->len) == 0)
+        rb_raise(rb_eArgError, "data must not be empty");
+    GetCipher(self, ctx);
+    str = rb_str_new(0, in_len+EVP_CIPHER_CTX_block_size(ctx));
+    if (!EVP_CipherUpdate(ctx, RSTRING(str)->ptr, &out_len, in, in_len))
+	ossl_raise(eCipherError, NULL);
+    assert(out_len < RSTRING(str)->len);
+    RSTRING(str)->len = out_len;
+    RSTRING(str)->ptr[out_len] = 0;
+
+    return str;
+}
+
+static VALUE
+ossl_cipher_update_deprecated(VALUE self, VALUE data)
+{
+    char *cname;
+
+    cname = rb_class2name(rb_obj_class(self));
+    rb_warning("%s#<< is deprecated; use %s#update instead", cname, cname);
+    return ossl_cipher_update(self, data);
+}
+
+static VALUE 
+ossl_cipher_final(VALUE self)
+{
+    EVP_CIPHER_CTX *ctx;
+    int out_len;
+    VALUE str;
+
+    GetCipher(self, ctx);
+    str = rb_str_new(0, EVP_CIPHER_CTX_block_size(ctx));
+    if (!EVP_CipherFinal_ex(ctx, RSTRING(str)->ptr, &out_len))
+	ossl_raise(eCipherError, NULL);
+    assert(out_len <= RSTRING(str)->len);
+    RSTRING(str)->len = out_len;
+    RSTRING(str)->ptr[out_len] = 0;
+
+    return str;
+}
+
+static VALUE
+ossl_cipher_name(VALUE self)
+{
+    EVP_CIPHER_CTX *ctx;
+
+    GetCipher(self, ctx);
+
+    return rb_str_new2(EVP_CIPHER_name(EVP_CIPHER_CTX_cipher(ctx)));
+}
+
+static VALUE
+ossl_cipher_set_key(VALUE self, VALUE key)
+{
+    EVP_CIPHER_CTX *ctx;
+
+    StringValue(key);
+    GetCipher(self, ctx);
+
+    if (RSTRING(key)->len < EVP_CIPHER_CTX_key_length(ctx))
+        ossl_raise(eCipherError, "key length too short");
+
+    if (EVP_CipherInit_ex(ctx, NULL, NULL, RSTRING(key)->ptr, NULL, -1) != 1)
+        ossl_raise(eCipherError, NULL);
+
+    return key;
+}
+
+static VALUE
+ossl_cipher_set_iv(VALUE self, VALUE iv)
+{
+    EVP_CIPHER_CTX *ctx;
+
+    StringValue(iv);
+    GetCipher(self, ctx);
+
+    if (RSTRING(iv)->len < EVP_CIPHER_CTX_iv_length(ctx))
+        ossl_raise(eCipherError, "iv length too short");
+
+    if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, RSTRING(iv)->ptr, -1) != 1)
+	ossl_raise(eCipherError, NULL);
+
+    return iv;
+}
+
+static VALUE
+ossl_cipher_set_key_length(VALUE self, VALUE key_length)
+{
+    EVP_CIPHER_CTX *ctx;
+    int len = NUM2INT(key_length);
+ 
+    GetCipher(self, ctx);
+    if (EVP_CIPHER_CTX_set_key_length(ctx, len) != 1)
+        ossl_raise(eCipherError, NULL);
+
+    return key_length;
+}
+
+static VALUE
+ossl_cipher_set_padding(VALUE self, VALUE padding)
+{
+#if defined(HAVE_EVP_CIPHER_CTX_SET_PADDING)
+    EVP_CIPHER_CTX *ctx;
+    int pad = NUM2INT(padding);
+
+    GetCipher(self, ctx);
+    if (EVP_CIPHER_CTX_set_padding(ctx, pad) != 1)
+	ossl_raise(eCipherError, NULL);
+#else
+    rb_notimplement();
+#endif
+    return padding;
+}
+
+#define CIPHER_0ARG_INT(func)					\
+    static VALUE						\
+    ossl_cipher_##func(VALUE self)				\
+    {								\
+	EVP_CIPHER_CTX *ctx;					\
+	GetCipher(self, ctx);					\
+	return INT2NUM(EVP_CIPHER_##func(EVP_CIPHER_CTX_cipher(ctx)));	\
+    }
+CIPHER_0ARG_INT(key_length)
+CIPHER_0ARG_INT(iv_length)
+CIPHER_0ARG_INT(block_size)
+
+/*
+ * INIT
+ */
+void 
+Init_ossl_cipher(void)
+{
+#if 0 /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+#endif
+
+    mCipher = rb_define_module_under(mOSSL, "Cipher");
+    eCipherError = rb_define_class_under(mOSSL, "CipherError", eOSSLError);
+    cCipher = rb_define_class_under(mCipher, "Cipher", rb_cObject);
+
+    rb_define_alloc_func(cCipher, ossl_cipher_alloc);
+    rb_define_copy_func(cCipher, ossl_cipher_copy);
+    rb_define_module_function(mCipher, "ciphers", ossl_s_ciphers, 0);
+    rb_define_method(cCipher, "initialize", ossl_cipher_initialize, 1);
+    rb_define_method(cCipher, "reset", ossl_cipher_reset, 0);
+    rb_define_method(cCipher, "encrypt", ossl_cipher_encrypt, -1);
+    rb_define_method(cCipher, "decrypt", ossl_cipher_decrypt, -1);
+    rb_define_method(cCipher, "pkcs5_keyivgen", ossl_cipher_pkcs5_keyivgen, -1);
+    rb_define_method(cCipher, "update", ossl_cipher_update, 1);
+    rb_define_method(cCipher, "<<", ossl_cipher_update_deprecated, 1);
+    rb_define_method(cCipher, "final", ossl_cipher_final, 0);
+    rb_define_method(cCipher, "name", ossl_cipher_name, 0);
+    rb_define_method(cCipher, "key=", ossl_cipher_set_key, 1);
+    rb_define_method(cCipher, "key_len=", ossl_cipher_set_key_length, 1);
+    rb_define_method(cCipher, "key_len", ossl_cipher_key_length, 0);
+    rb_define_method(cCipher, "iv=", ossl_cipher_set_iv, 1);
+    rb_define_method(cCipher, "iv_len", ossl_cipher_iv_length, 0);
+    rb_define_method(cCipher, "block_size", ossl_cipher_block_size, 0);
+    rb_define_method(cCipher, "padding=", ossl_cipher_set_padding, 1);
+}
diff --git a/ruby_1_8_6/ext/openssl/ossl_cipher.h b/ruby_1_8_6/ext/openssl/ossl_cipher.h
new file mode 100644
index 0000000000..63c7a875e8
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_cipher.h
@@ -0,0 +1,23 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_CIPHER_H_)
+#define _OSSL_CIPHER_H_
+
+extern VALUE mCipher;
+extern VALUE cCipher;
+extern VALUE eCipherError;
+
+const EVP_CIPHER *GetCipherPtr(VALUE);
+VALUE ossl_cipher_new(const EVP_CIPHER *);
+void Init_ossl_cipher(void);
+
+#endif /* _OSSL_CIPHER_H_ */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_config.c b/ruby_1_8_6/ext/openssl/ossl_config.c
new file mode 100644
index 0000000000..f1d6a98253
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_config.c
@@ -0,0 +1,462 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#define WrapConfig(klass, obj, conf) do { \
+    if (!conf) { \
+	ossl_raise(rb_eRuntimeError, "Config wasn't intitialized!"); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, NCONF_free, conf); \
+} while (0)
+#define GetConfig(obj, conf) do { \
+    Data_Get_Struct(obj, CONF, conf); \
+    if (!conf) { \
+	ossl_raise(rb_eRuntimeError, "Config wasn't intitialized!"); \
+    } \
+} while (0)
+#define SafeGetConfig(obj, conf) do { \
+    OSSL_Check_Kind(obj, cConfig); \
+    GetConfig(obj, conf); \
+} while(0);
+
+/*
+ * Classes
+ */
+VALUE cConfig;
+VALUE eConfigError;
+
+/* 
+ * Public 
+ */
+
+static CONF *parse_config(VALUE, CONF*);
+
+CONF *
+GetConfigPtr(VALUE obj)
+{
+    CONF *conf;
+
+    SafeGetConfig(obj, conf);
+
+    return conf;
+}
+
+CONF *
+DupConfigPtr(VALUE obj)
+{
+    VALUE str;
+
+    OSSL_Check_Kind(obj, cConfig);
+    str = rb_funcall(obj, rb_intern("to_s"), 0);
+
+    return parse_config(str, NULL);
+}
+
+/*
+ * Private
+ */
+static CONF *
+parse_config(VALUE str, CONF *dst)
+{
+    CONF *conf;
+    BIO *bio;
+    long eline = -1;
+
+    bio = ossl_obj2bio(str);
+    conf = dst ? dst : NCONF_new(NULL);
+    if(!conf){
+	BIO_free(bio);
+	ossl_raise(eConfigError, NULL);
+    }
+    if(!NCONF_load_bio(conf, bio, &eline)){
+	BIO_free(bio);
+	if(!dst) NCONF_free(conf);
+	if (eline <= 0) ossl_raise(eConfigError, "wrong config format");
+	else ossl_raise(eConfigError, "error in line %d", eline);
+	ossl_raise(eConfigError, NULL);
+    }
+    BIO_free(bio);
+
+    return conf;
+}
+
+static VALUE
+ossl_config_s_parse(VALUE klass, VALUE str)
+{
+    CONF *conf;
+    VALUE obj;
+
+    conf = parse_config(str, NULL);
+    WrapConfig(klass, obj, conf);
+
+    return obj;
+}
+
+static VALUE
+ossl_config_s_alloc(VALUE klass)
+{
+    CONF *conf;
+    VALUE obj;
+
+    if(!(conf = NCONF_new(NULL)))
+	ossl_raise(eConfigError, NULL);
+    WrapConfig(klass, obj, conf);
+
+    return obj;
+}
+
+static VALUE
+ossl_config_copy(VALUE self, VALUE other)
+{
+    VALUE str;
+    CONF *conf;
+
+    str = rb_funcall(self, rb_intern("to_s"), 0);
+    GetConfig(other, conf);
+    parse_config(str, conf);
+
+    return self;
+}
+
+static VALUE
+ossl_config_initialize(int argc, VALUE *argv, VALUE self)
+{
+    CONF *conf;
+    long eline = -1;
+    char *filename;
+    VALUE path;
+
+    rb_scan_args(argc, argv, "01", &path);
+    if(!NIL_P(path)){
+	SafeStringValue(path);
+        filename = StringValuePtr(path);
+	GetConfig(self, conf);
+	if (!NCONF_load(conf, filename, &eline)){
+	    if (eline <= 0)
+		ossl_raise(eConfigError, "wrong config file %s", filename);
+	    else
+		ossl_raise(eConfigError, "error in %s:%d", filename, eline);
+        }
+    }
+#ifdef OSSL_NO_CONF_API
+    else rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
+#else
+    else {
+	GetConfig(self, conf);
+	_CONF_new_data(conf);
+    }
+#endif
+    
+    return self;
+}
+
+static VALUE
+ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value)
+{
+#ifdef OSSL_NO_CONF_API
+    rb_notimplement();
+#else
+    CONF *conf;
+    CONF_VALUE *sv, *cv;
+
+    StringValue(section);
+    StringValue(name);
+    StringValue(value);
+    GetConfig(self, conf);
+    if(!(sv = _CONF_get_section(conf, RSTRING(section)->ptr))){
+	if(!(sv = _CONF_new_section(conf, RSTRING(section)->ptr))){
+	    ossl_raise(eConfigError, NULL);
+	}
+    }
+    if(!(cv = OPENSSL_malloc(sizeof(CONF_VALUE)))){
+	ossl_raise(eConfigError, NULL);
+    }
+    cv->name = BUF_strdup(RSTRING(name)->ptr);
+    cv->value = BUF_strdup(RSTRING(value)->ptr);
+    if(!cv->name || !cv->value || !_CONF_add_string(conf, sv, cv)){
+	OPENSSL_free(cv->name);
+	OPENSSL_free(cv->value);
+	OPENSSL_free(cv);
+	ossl_raise(eConfigError, "_CONF_add_string failure");
+    }
+    
+    return value;
+#endif
+}
+
+static VALUE
+ossl_config_get_value(VALUE self, VALUE section, VALUE name)
+{
+    CONF *conf;
+    char *str;
+
+    StringValue(section);
+    StringValue(name);
+    GetConfig(self, conf);
+    str = NCONF_get_string(conf, RSTRING(section)->ptr, RSTRING(name)->ptr);
+    if(!str){
+	ERR_clear_error();
+	return Qnil;
+    }
+
+    return rb_str_new2(str);
+}
+
+static VALUE
+ossl_config_get_value_old(int argc, VALUE *argv, VALUE self)
+{
+    VALUE section, name;
+    
+    rb_scan_args(argc, argv, "11", &section, &name);
+
+    /* support conf.value(nil, "HOME") -> conf.get_value("", "HOME") */
+    if (NIL_P(section)) section = rb_str_new2("");
+    /* support conf.value("HOME") -> conf.get_value("", "HOME") */
+    if (NIL_P(name)) {
+	name = section;
+	section = rb_str_new2("");
+    }
+    /* NOTE: Don't care about conf.get_value(nil, nil) */
+    rb_warn("Config#value is deprecated; use Config#get_value");
+    return ossl_config_get_value(self, section, name);
+}
+
+static VALUE
+set_conf_section_i(VALUE i, VALUE *arg)
+{
+    VALUE name, value;
+
+    Check_Type(i, T_ARRAY);
+    name = rb_ary_entry(i, 0);
+    value = rb_ary_entry(i, 1);
+    ossl_config_add_value(arg[0], arg[1], name, value);
+
+    return Qnil;
+}
+
+static VALUE
+ossl_config_set_section(VALUE self, VALUE section, VALUE hash)
+{
+    VALUE arg[2];
+
+    arg[0] = self;
+    arg[1] = section;
+    rb_iterate(rb_each, hash, set_conf_section_i, (VALUE)arg);
+    return hash;
+}
+
+/*
+ * Get all numbers as strings - use str.to_i to convert
+ * long number = CONF_get_number(confp->config, sect, StringValuePtr(item));
+ */
+static VALUE
+ossl_config_get_section(VALUE self, VALUE section)
+{
+    CONF *conf;
+    STACK_OF(CONF_VALUE) *sk;
+    CONF_VALUE *entry;
+    int i, entries;
+    VALUE hash;
+
+    hash = rb_hash_new();
+    StringValue(section);
+    GetConfig(self, conf);
+    if (!(sk = NCONF_get_section(conf, StringValuePtr(section)))) {
+	ERR_clear_error();
+	return hash;
+    }
+    if ((entries = sk_CONF_VALUE_num(sk)) < 0) {
+	OSSL_Debug("# of items in section is < 0?!?");
+	return hash;
+    }
+    for (i=0; i<entries; i++) {
+	entry = sk_CONF_VALUE_value(sk, i);		
+	rb_hash_aset(hash, rb_str_new2(entry->name), rb_str_new2(entry->value));
+    }
+
+    return hash;
+}
+
+static VALUE
+ossl_config_get_section_old(VALUE self, VALUE section)
+{
+    rb_warn("Config#section is deprecated; use Config#[]");
+    return ossl_config_get_section(self, section);
+}
+
+#ifdef IMPLEMENT_LHASH_DOALL_ARG_FN
+static void
+get_conf_section(CONF_VALUE *cv, VALUE ary)
+{
+    if(cv->name) return;
+    rb_ary_push(ary, rb_str_new2(cv->section));
+}
+
+static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE*, VALUE);
+
+static VALUE
+ossl_config_get_sections(VALUE self)
+{
+    CONF *conf;
+    VALUE ary;
+
+    GetConfig(self, conf);
+    ary = rb_ary_new();
+    lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(get_conf_section), (void*)ary);
+
+    return ary;
+}
+
+static void
+dump_conf_value(CONF_VALUE *cv, VALUE str)
+{
+    STACK_OF(CONF_VALUE) *sk;
+    CONF_VALUE *v;
+    int i, num;
+
+    if (cv->name) return;
+    sk = (STACK_OF(CONF_VALUE)*)cv->value;
+    num = sk_CONF_VALUE_num(sk);
+    rb_str_cat2(str, "[ ");
+    rb_str_cat2(str, cv->section);
+    rb_str_cat2(str, " ]\n");
+    for(i = 0; i < num; i++){
+	v = sk_CONF_VALUE_value(sk, i);
+	rb_str_cat2(str, v->name ? v->name : "None");
+	rb_str_cat2(str, "=");
+	rb_str_cat2(str, v->value ? v->value : "None");
+	rb_str_cat2(str, "\n");
+    }
+    rb_str_cat2(str, "\n");
+}
+
+static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE*, VALUE);
+
+static VALUE
+dump_conf(CONF *conf)
+{
+    VALUE str;
+
+    str = rb_str_new(0, 0);
+    lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), (void*)str);
+
+    return str;
+}
+
+static VALUE
+ossl_config_to_s(VALUE self)
+{
+    CONF *conf;
+
+    GetConfig(self, conf);
+
+    return dump_conf(conf);
+}
+
+static void
+each_conf_value(CONF_VALUE *cv, void* dummy)
+{
+    STACK_OF(CONF_VALUE) *sk;
+    CONF_VALUE *v;
+    VALUE section, name, value, args;
+    int i, num;
+
+    if (cv->name) return;
+    sk = (STACK_OF(CONF_VALUE)*)cv->value;
+    num = sk_CONF_VALUE_num(sk);
+    section = rb_str_new2(cv->section);
+    for(i = 0; i < num; i++){
+	v = sk_CONF_VALUE_value(sk, i);
+	name = v->name ? rb_str_new2(v->name) : Qnil;
+	value = v->value ? rb_str_new2(v->value) : Qnil;
+        args = rb_ary_new3(3, section, name, value);
+	rb_yield(args);
+    }
+}
+
+static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE*, void*);
+
+static VALUE
+ossl_config_each(VALUE self)
+{
+    CONF *conf;
+
+    GetConfig(self, conf);
+    lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(each_conf_value), (void*)NULL);
+
+    return self;
+}
+#else
+static VALUE
+ossl_config_get_sections(VALUE self)
+{
+    rb_warn("#sections don't work with %s", OPENSSL_VERSION_TEXT);
+    return rb_ary_new();
+}
+
+static VALUE
+ossl_config_to_s(VALUE self)
+{
+    rb_warn("#to_s don't work with %s", OPENSSL_VERSION_TEXT);
+    return rb_str_new(0, 0);
+}
+
+static VALUE
+ossl_config_each(VALUE self)
+{
+    rb_warn("#each don't work with %s", OPENSSL_VERSION_TEXT);
+    return self;
+}
+#endif
+
+static VALUE
+ossl_config_inspect(VALUE self)
+{
+    VALUE str, ary = ossl_config_get_sections(self);
+    char *cname = rb_class2name(rb_obj_class(self));
+
+    str = rb_str_new2("#<");
+    rb_str_cat2(str, cname);
+    rb_str_cat2(str, " sections=");
+    rb_str_append(str, rb_inspect(ary));
+    rb_str_cat2(str, ">");
+
+    return str;
+}
+
+/*
+ * INIT
+ */
+void
+Init_ossl_config()
+{
+    eConfigError = rb_define_class_under(mOSSL, "ConfigError", eOSSLError);
+    cConfig = rb_define_class_under(mOSSL, "Config", rb_cObject);
+
+    rb_define_const(cConfig, "DEFAULT_CONFIG_FILE",
+		    rb_str_new2(CONF_get1_default_config_file()));
+    rb_include_module(cConfig, rb_mEnumerable);
+    rb_define_singleton_method(cConfig, "parse", ossl_config_s_parse, 1);
+    rb_define_alias(CLASS_OF(cConfig), "load", "new");
+    rb_define_alloc_func(cConfig, ossl_config_s_alloc);
+    rb_define_copy_func(cConfig, ossl_config_copy);
+    rb_define_method(cConfig, "initialize", ossl_config_initialize, -1);
+    rb_define_method(cConfig, "get_value", ossl_config_get_value, 2);
+    rb_define_method(cConfig, "value", ossl_config_get_value_old, -1);
+    rb_define_method(cConfig, "add_value", ossl_config_add_value, 3);
+    rb_define_method(cConfig, "[]", ossl_config_get_section, 1);
+    rb_define_method(cConfig, "section", ossl_config_get_section_old, 1);
+    rb_define_method(cConfig, "[]=", ossl_config_set_section, 2);
+    rb_define_method(cConfig, "sections", ossl_config_get_sections, 0);
+    rb_define_method(cConfig, "to_s", ossl_config_to_s, 0);
+    rb_define_method(cConfig, "each", ossl_config_each, 0);
+    rb_define_method(cConfig, "inspect", ossl_config_inspect, 0);
+}
diff --git a/ruby_1_8_6/ext/openssl/ossl_config.h b/ruby_1_8_6/ext/openssl/ossl_config.h
new file mode 100644
index 0000000000..cb226b27e5
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_config.h
@@ -0,0 +1,22 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_CONFIG_H_)
+#define _OSSL_CONFIG_H_
+
+extern VALUE cConfig;
+extern VALUE eConfigError;
+
+CONF* GetConfigPtr(VALUE obj);
+CONF* DupConfigPtr(VALUE obj);
+void Init_ossl_config(void);
+
+#endif /* _OSSL_CONFIG_H_ */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_digest.c b/ruby_1_8_6/ext/openssl/ossl_digest.c
new file mode 100644
index 0000000000..4096b097a2
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_digest.c
@@ -0,0 +1,298 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#define GetDigest(obj, ctx) do { \
+    Data_Get_Struct(obj, EVP_MD_CTX, ctx); \
+    if (!ctx) { \
+	ossl_raise(rb_eRuntimeError, "Digest CTX wasn't initialized!"); \
+    } \
+} while (0)
+#define SafeGetDigest(obj, ctx) do { \
+    OSSL_Check_Kind(obj, cDigest); \
+    GetDigest(obj, ctx); \
+} while (0)
+
+/*
+ * Classes
+ */
+VALUE mDigest;
+VALUE cDigest;
+VALUE eDigestError;
+
+static VALUE ossl_digest_alloc(VALUE klass);
+
+/*
+ * Public
+ */
+const EVP_MD *
+GetDigestPtr(VALUE obj)
+{
+    EVP_MD_CTX *ctx;
+
+    SafeGetDigest(obj, ctx);
+
+    return EVP_MD_CTX_md(ctx); /*== ctx->digest*/
+}
+
+VALUE
+ossl_digest_new(const EVP_MD *md)
+{  
+    VALUE ret;
+    EVP_MD_CTX *ctx;
+
+    ret = ossl_digest_alloc(cDigest);
+    GetDigest(ret, ctx);
+    EVP_MD_CTX_init(ctx);
+    EVP_DigestInit_ex(ctx, md, NULL);
+   
+    return ret;
+}
+
+/*
+ * Private
+ */
+static VALUE
+ossl_digest_alloc(VALUE klass)
+{
+    EVP_MD_CTX *ctx;
+    VALUE obj;
+
+    ctx = EVP_MD_CTX_create();
+    if (ctx == NULL)
+	ossl_raise(rb_eRuntimeError, "EVP_MD_CTX_create() failed");
+    EVP_MD_CTX_init(ctx);
+    obj = Data_Wrap_Struct(klass, 0, EVP_MD_CTX_destroy, ctx);
+	
+    return obj;
+}
+
+VALUE ossl_digest_update(VALUE, VALUE);
+
+static VALUE
+ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
+{
+    EVP_MD_CTX *ctx;
+    const EVP_MD *md;
+    char *name;
+    VALUE type, data;
+
+    rb_scan_args(argc, argv, "11", &type, &data);
+    StringValue(type);
+    if (!NIL_P(data)) StringValue(data);
+    name = StringValuePtr(type);
+    
+    md = EVP_get_digestbyname(name);
+    if (!md) {
+	ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%s).", name);
+    }
+    GetDigest(self, ctx);
+    EVP_DigestInit_ex(ctx, md, NULL);
+    
+    if (!NIL_P(data)) return ossl_digest_update(self, data);
+    return self;
+}
+
+static VALUE
+ossl_digest_copy(VALUE self, VALUE other)
+{
+    EVP_MD_CTX *ctx1, *ctx2;
+    
+    rb_check_frozen(self);
+    if (self == other) return self;
+
+    GetDigest(self, ctx1);
+    SafeGetDigest(other, ctx2);
+
+    if (!EVP_MD_CTX_copy(ctx1, ctx2)) {
+	ossl_raise(eDigestError, NULL);
+    }
+    return self;
+}
+
+static VALUE
+ossl_digest_reset(VALUE self)
+{
+    EVP_MD_CTX *ctx;
+
+    GetDigest(self, ctx);
+    EVP_DigestInit_ex(ctx, EVP_MD_CTX_md(ctx), NULL);
+
+    return self;
+}
+
+VALUE
+ossl_digest_update(VALUE self, VALUE data)
+{
+    EVP_MD_CTX *ctx;
+
+    StringValue(data);
+    GetDigest(self, ctx);
+    EVP_DigestUpdate(ctx, RSTRING(data)->ptr, RSTRING(data)->len);
+
+    return self;
+}
+
+static void
+digest_final(EVP_MD_CTX *ctx, char **buf, int *buf_len)
+{
+    EVP_MD_CTX final;
+
+    if (!EVP_MD_CTX_copy(&final, ctx)) {
+	ossl_raise(eDigestError, NULL);
+    }
+    if (!(*buf = OPENSSL_malloc(EVP_MD_CTX_size(&final)))) {
+	EVP_MD_CTX_cleanup(&final);
+	ossl_raise(eDigestError, "Cannot allocate mem for digest");
+    }
+    EVP_DigestFinal_ex(&final, *buf, buf_len);
+    EVP_MD_CTX_cleanup(&final);
+}
+
+static VALUE
+ossl_digest_digest(VALUE self)
+{
+    EVP_MD_CTX *ctx;
+    char *buf;
+    int buf_len;
+    VALUE digest;
+	
+    GetDigest(self, ctx);
+    digest_final(ctx, &buf, &buf_len);
+    digest = ossl_buf2str(buf, buf_len);
+	
+    return digest;
+}
+
+static VALUE
+ossl_digest_hexdigest(VALUE self)
+{
+    EVP_MD_CTX *ctx;
+    char *buf, *hexbuf;
+    int buf_len;
+    VALUE hexdigest;
+
+    GetDigest(self, ctx);
+    digest_final(ctx, &buf, &buf_len);
+    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
+	OPENSSL_free(buf);
+	ossl_raise(eDigestError, "Memory alloc error");
+    }
+    OPENSSL_free(buf);
+    hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
+
+    return hexdigest;
+}
+
+static VALUE
+ossl_digest_s_digest(VALUE klass, VALUE str, VALUE data)
+{
+    VALUE obj = rb_class_new_instance(1, &str, klass);
+
+    ossl_digest_update(obj, data);
+
+    return ossl_digest_digest(obj);
+}
+
+static VALUE
+ossl_digest_s_hexdigest(VALUE klass, VALUE str, VALUE data)
+{
+    VALUE obj = rb_class_new_instance(1, &str, klass);
+
+    ossl_digest_update(obj, data);
+
+    return ossl_digest_hexdigest(obj);
+}
+
+static VALUE
+ossl_digest_equal(VALUE self, VALUE other)
+{
+    EVP_MD_CTX *ctx;
+    VALUE str1, str2;
+
+    if (rb_obj_is_kind_of(other, cDigest) == Qtrue) {
+	str2 = ossl_digest_digest(other);
+    } else {
+	StringValue(other);
+	str2 = other;
+    }
+    GetDigest(self, ctx);
+    if (RSTRING(str2)->len == EVP_MD_CTX_size(ctx)) {
+	str1 = ossl_digest_digest(self);
+    } else {
+	str1 = ossl_digest_hexdigest(self);
+    }
+    if (RSTRING(str1)->len == RSTRING(str2)->len
+	&& rb_str_cmp(str1, str2) == 0) {
+	return Qtrue;
+    }
+
+    return Qfalse;
+}
+
+static VALUE
+ossl_digest_name(VALUE self)
+{
+    EVP_MD_CTX *ctx;
+
+    GetDigest(self, ctx);
+
+    return rb_str_new2(EVP_MD_name(EVP_MD_CTX_md(ctx)));
+}
+
+static VALUE
+ossl_digest_size(VALUE self)
+{
+    EVP_MD_CTX *ctx;
+
+    GetDigest(self, ctx);
+
+    return INT2NUM(EVP_MD_CTX_size(ctx));
+}
+
+/*
+ * INIT
+ */
+void
+Init_ossl_digest()
+{
+#if 0 /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+#endif
+
+    mDigest = rb_define_module_under(mOSSL, "Digest");
+	
+    eDigestError = rb_define_class_under(mDigest, "DigestError", eOSSLError);
+	
+    cDigest = rb_define_class_under(mDigest, "Digest", rb_cObject);
+	
+    rb_define_alloc_func(cDigest, ossl_digest_alloc);
+    rb_define_singleton_method(cDigest, "digest", ossl_digest_s_digest, 2);
+    rb_define_singleton_method(cDigest, "hexdigest", ossl_digest_s_hexdigest, 2);
+	
+    rb_define_method(cDigest, "initialize", ossl_digest_initialize, -1);
+    rb_define_method(cDigest, "reset", ossl_digest_reset, 0);
+    
+    rb_define_copy_func(cDigest, ossl_digest_copy);
+    
+    rb_define_method(cDigest, "digest", ossl_digest_digest, 0);
+    rb_define_method(cDigest, "hexdigest", ossl_digest_hexdigest, 0);
+    rb_define_alias(cDigest, "inspect", "hexdigest");
+    rb_define_alias(cDigest, "to_s", "hexdigest");
+    
+    rb_define_method(cDigest, "update", ossl_digest_update, 1);
+    rb_define_alias(cDigest, "<<", "update");
+    
+    rb_define_method(cDigest, "==", ossl_digest_equal, 1);
+    
+    rb_define_method(cDigest, "name", ossl_digest_name, 0);
+    rb_define_method(cDigest, "size", ossl_digest_size, 0);
+}
diff --git a/ruby_1_8_6/ext/openssl/ossl_digest.h b/ruby_1_8_6/ext/openssl/ossl_digest.h
new file mode 100644
index 0000000000..8a1f7964f2
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_digest.h
@@ -0,0 +1,23 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_DIGEST_H_)
+#define _OSSL_DIGEST_H_
+
+extern VALUE mDigest;
+extern VALUE cDigest;
+extern VALUE eDigestError;
+
+const EVP_MD *GetDigestPtr(VALUE);
+VALUE ossl_digest_new(const EVP_MD *);
+void Init_ossl_digest(void);
+
+#endif /* _OSSL_DIGEST_H_ */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_engine.c b/ruby_1_8_6/ext/openssl/ossl_engine.c
new file mode 100644
index 0000000000..71586e3620
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_engine.c
@@ -0,0 +1,393 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#if defined(OSSL_ENGINE_ENABLED)
+
+#define WrapEngine(klass, obj, engine) do { \
+    if (!engine) { \
+	ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, ENGINE_free, engine); \
+} while(0)
+#define GetEngine(obj, engine) do { \
+    Data_Get_Struct(obj, ENGINE, engine); \
+    if (!engine) { \
+        ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \
+    } \
+} while (0)
+#define SafeGetEngine(obj, engine) do { \
+    OSSL_Check_Kind(obj, cEngine); \
+    GetPKCS7(obj, engine); \
+} while (0)
+
+/* 
+ * Classes
+ */
+VALUE cEngine;
+VALUE eEngineError;
+
+/*
+ * Private
+ */
+#define OSSL_ENGINE_LOAD_IF_MATCH(x) \
+do{\
+  if(!strcmp(#x, RSTRING(name)->ptr)){\
+    ENGINE_load_##x();\
+    return Qtrue;\
+  }\
+}while(0)
+
+static VALUE
+ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
+{
+#if !defined(HAVE_ENGINE_LOAD_BUILTIN_ENGINES)
+    return Qnil;
+#else
+    VALUE name;
+
+    rb_scan_args(argc, argv, "01", &name);
+    if(NIL_P(name)){
+        ENGINE_load_builtin_engines();
+        return Qtrue;
+    }
+    StringValue(name);
+#ifndef OPENSSL_NO_STATIC_ENGINE
+    OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
+    OSSL_ENGINE_LOAD_IF_MATCH(cswift);
+    OSSL_ENGINE_LOAD_IF_MATCH(chil);
+    OSSL_ENGINE_LOAD_IF_MATCH(atalla);
+    OSSL_ENGINE_LOAD_IF_MATCH(nuron);
+    OSSL_ENGINE_LOAD_IF_MATCH(ubsec);
+    OSSL_ENGINE_LOAD_IF_MATCH(aep);
+    OSSL_ENGINE_LOAD_IF_MATCH(sureware);
+    OSSL_ENGINE_LOAD_IF_MATCH(4758cca);
+#endif
+#ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
+    OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
+#endif
+    OSSL_ENGINE_LOAD_IF_MATCH(openssl);
+    rb_warning("no such builtin loader for `%s'", RSTRING(name)->ptr);
+    return Qnil;
+#endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
+}
+
+static VALUE
+ossl_engine_s_cleanup(VALUE self)
+{
+#if defined(HAVE_ENGINE_CLEANUP)
+    ENGINE_cleanup();
+#endif
+    return Qnil;
+}
+
+static VALUE
+ossl_engine_s_engines(VALUE klass)
+{
+    ENGINE *e;
+    VALUE ary, obj;
+
+    ary = rb_ary_new();
+    for(e = ENGINE_get_first(); e; e = ENGINE_get_next(e)){
+        WrapEngine(klass, obj, e);
+        rb_ary_push(ary, obj);
+    }
+
+    return ary;
+}
+
+static VALUE
+ossl_engine_s_by_id(VALUE klass, VALUE id)
+{
+    ENGINE *e;
+    VALUE obj;
+
+    StringValue(id);
+    ossl_engine_s_load(1, &id, klass);
+    if(!(e = ENGINE_by_id(RSTRING(id)->ptr)))
+	ossl_raise(eEngineError, NULL);
+    WrapEngine(klass, obj, e);
+    if(rb_block_given_p()) rb_yield(obj);
+    if(!ENGINE_init(e))
+	ossl_raise(eEngineError, NULL);
+    ENGINE_ctrl(e, ENGINE_CTRL_SET_PASSWORD_CALLBACK,
+		0, NULL, (void(*)())ossl_pem_passwd_cb);
+    ERR_clear_error();
+
+    return obj;
+}
+
+static VALUE
+ossl_engine_s_alloc(VALUE klass)
+{
+    ENGINE *e;
+    VALUE obj;
+
+    if (!(e = ENGINE_new())) {
+       ossl_raise(eEngineError, NULL);
+    }
+    WrapEngine(klass, obj, e);
+
+    return obj;
+}
+
+static VALUE
+ossl_engine_get_id(VALUE self)
+{
+    ENGINE *e;
+    GetEngine(self, e);
+    return rb_str_new2(ENGINE_get_id(e));
+}
+
+static VALUE
+ossl_engine_get_name(VALUE self)
+{
+    ENGINE *e;
+    GetEngine(self, e);
+    return rb_str_new2(ENGINE_get_name(e));
+}
+
+static VALUE
+ossl_engine_finish(VALUE self)
+{
+    ENGINE *e;
+
+    GetEngine(self, e);
+    if(!ENGINE_finish(e)) ossl_raise(eEngineError, NULL);
+
+    return Qnil;
+}
+
+static VALUE
+ossl_engine_get_cipher(VALUE self, VALUE name)
+{
+#if defined(HAVE_ENGINE_GET_CIPHER)
+    ENGINE *e;
+    const EVP_CIPHER *ciph, *tmp;
+    char *s;
+    int nid;
+
+    s = StringValuePtr(name);
+    tmp = EVP_get_cipherbyname(s);
+    if(!tmp) ossl_raise(eEngineError, "no such cipher `%s'", s);
+    nid = EVP_CIPHER_nid(tmp);
+    GetEngine(self, e);
+    ciph = ENGINE_get_cipher(e, nid);
+    if(!ciph) ossl_raise(eEngineError, NULL);
+
+    return ossl_cipher_new(ciph);
+#else
+    rb_notimplement();
+#endif
+}
+
+static VALUE
+ossl_engine_get_digest(VALUE self, VALUE name)
+{
+#if defined(HAVE_ENGINE_GET_DIGEST)
+    ENGINE *e;
+    const EVP_MD *md, *tmp;
+    char *s;
+    int nid;
+
+    s = StringValuePtr(name);
+    tmp = EVP_get_digestbyname(s);
+    if(!tmp) ossl_raise(eEngineError, "no such digest `%s'", s);
+    nid = EVP_MD_nid(tmp);
+    GetEngine(self, e);
+    md = ENGINE_get_digest(e, nid);
+    if(!md) ossl_raise(eEngineError, NULL);
+
+    return ossl_digest_new(md);
+#else
+    rb_notimplement();
+#endif
+}
+
+static VALUE
+ossl_engine_load_privkey(int argc, VALUE *argv, VALUE self)
+{
+    ENGINE *e;
+    EVP_PKEY *pkey;
+    VALUE id, data, obj;
+    char *sid, *sdata;
+
+    rb_scan_args(argc, argv, "02", &id, &data);
+    sid = NIL_P(id) ? NULL : StringValuePtr(id);
+    sdata = NIL_P(data) ? NULL : StringValuePtr(data);
+    GetEngine(self, e);
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+    pkey = ENGINE_load_private_key(e, sid, sdata);
+#else
+    pkey = ENGINE_load_private_key(e, sid, NULL, sdata);
+#endif
+    if (!pkey) ossl_raise(eEngineError, NULL);
+    obj = ossl_pkey_new(pkey);
+    OSSL_PKEY_SET_PRIVATE(obj);
+
+    return obj;
+}
+
+static VALUE
+ossl_engine_load_pubkey(int argc, VALUE *argv, VALUE self)
+{
+    ENGINE *e;
+    EVP_PKEY *pkey;
+    VALUE id, data;
+    char *sid, *sdata;
+
+    rb_scan_args(argc, argv, "02", &id, &data);
+    sid = NIL_P(id) ? NULL : StringValuePtr(id);
+    sdata = NIL_P(data) ? NULL : StringValuePtr(data);
+    GetEngine(self, e);
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+    pkey = ENGINE_load_public_key(e, sid, sdata);
+#else
+    pkey = ENGINE_load_public_key(e, sid, NULL, sdata);
+#endif
+    if (!pkey) ossl_raise(eEngineError, NULL);
+
+    return ossl_pkey_new(pkey);
+}
+
+static VALUE
+ossl_engine_set_default(VALUE self, VALUE flag)
+{
+    ENGINE *e;
+    int f = NUM2INT(flag);
+
+    GetEngine(self, e);
+    ENGINE_set_default(e, f);
+
+    return Qtrue;
+}
+
+static VALUE
+ossl_engine_ctrl_cmd(int argc, VALUE *argv, VALUE self)
+{
+    ENGINE *e;
+    VALUE cmd, val;
+    int ret;
+
+    GetEngine(self, e);
+    rb_scan_args(argc, argv, "11", &cmd, &val);
+    StringValue(cmd);
+    if (!NIL_P(val)) StringValue(val);
+    ret = ENGINE_ctrl_cmd_string(e, RSTRING(cmd)->ptr,
+				 NIL_P(val) ? NULL : RSTRING(val)->ptr, 0);
+    if (!ret) ossl_raise(eEngineError, NULL);
+
+    return self;
+}
+
+static VALUE
+ossl_engine_cmd_flag_to_name(int flag)
+{
+    switch(flag){
+    case ENGINE_CMD_FLAG_NUMERIC:  return rb_str_new2("NUMERIC");
+    case ENGINE_CMD_FLAG_STRING:   return rb_str_new2("STRING");
+    case ENGINE_CMD_FLAG_NO_INPUT: return rb_str_new2("NO_INPUT");
+    case ENGINE_CMD_FLAG_INTERNAL: return rb_str_new2("INTERNAL");
+    default: return rb_str_new2("UNKNOWN");
+    }
+}
+
+static VALUE
+ossl_engine_get_cmds(VALUE self)
+{
+    ENGINE *e;
+    const ENGINE_CMD_DEFN *defn, *p;
+    VALUE ary, tmp;
+
+    GetEngine(self, e);
+    ary = rb_ary_new();
+    if ((defn = ENGINE_get_cmd_defns(e)) != NULL){
+	for (p = defn; p->cmd_num > 0; p++){
+	    tmp = rb_ary_new();
+	    rb_ary_push(tmp, rb_str_new2(p->cmd_name));
+	    rb_ary_push(tmp, rb_str_new2(p->cmd_desc));
+	    rb_ary_push(tmp, ossl_engine_cmd_flag_to_name(p->cmd_flags));
+	    rb_ary_push(ary, tmp);
+	}
+    }
+
+    return ary;
+}
+
+static VALUE
+ossl_engine_inspect(VALUE self)
+{
+    VALUE str;
+    char *cname = rb_class2name(rb_obj_class(self));
+    
+    str = rb_str_new2("#<");
+    rb_str_cat2(str, cname);
+    rb_str_cat2(str, " id=\"");
+    rb_str_append(str, ossl_engine_get_id(self));
+    rb_str_cat2(str, "\" name=\"");
+    rb_str_append(str, ossl_engine_get_name(self));
+    rb_str_cat2(str, "\">");
+
+    return str;
+}
+
+#define DefEngineConst(x) rb_define_const(cEngine, #x, INT2NUM(ENGINE_##x))
+
+void
+Init_ossl_engine()
+{
+    cEngine = rb_define_class_under(mOSSL, "Engine", rb_cObject);
+    eEngineError = rb_define_class_under(cEngine, "EngineError", eOSSLError);
+
+    rb_define_alloc_func(cEngine, ossl_engine_s_alloc);
+    rb_define_singleton_method(cEngine, "load", ossl_engine_s_load, -1);
+    rb_define_singleton_method(cEngine, "cleanup", ossl_engine_s_cleanup, 0);
+    rb_define_singleton_method(cEngine, "engines", ossl_engine_s_engines, 0);
+    rb_define_singleton_method(cEngine, "by_id", ossl_engine_s_by_id, 1);
+    rb_undef_method(CLASS_OF(cEngine), "new");
+
+    rb_define_method(cEngine, "id", ossl_engine_get_id, 0);
+    rb_define_method(cEngine, "name", ossl_engine_get_name, 0);
+    rb_define_method(cEngine, "finish", ossl_engine_finish, 0);
+    rb_define_method(cEngine, "cipher", ossl_engine_get_cipher, 1);
+    rb_define_method(cEngine, "digest",  ossl_engine_get_digest, 1);
+    rb_define_method(cEngine, "load_private_key", ossl_engine_load_privkey, -1);
+    rb_define_method(cEngine, "load_public_key", ossl_engine_load_pubkey, -1);
+    rb_define_method(cEngine, "set_default", ossl_engine_set_default, 1);
+    rb_define_method(cEngine, "ctrl_cmd", ossl_engine_ctrl_cmd, -1);
+    rb_define_method(cEngine, "cmds", ossl_engine_get_cmds, 0);
+    rb_define_method(cEngine, "inspect", ossl_engine_inspect, 0);
+
+    DefEngineConst(METHOD_RSA);
+    DefEngineConst(METHOD_DSA);
+    DefEngineConst(METHOD_DH);
+    DefEngineConst(METHOD_RAND);
+#ifdef ENGINE_METHOD_BN_MOD_EXP
+    DefEngineConst(METHOD_BN_MOD_EXP);
+#endif
+#ifdef ENGINE_METHOD_BN_MOD_EXP_CRT
+    DefEngineConst(METHOD_BN_MOD_EXP_CRT);
+#endif
+#ifdef ENGINE_METHOD_CIPHERS
+    DefEngineConst(METHOD_CIPHERS);
+#endif
+#ifdef ENGINE_METHOD_DIGESTS
+    DefEngineConst(METHOD_DIGESTS);
+#endif
+    DefEngineConst(METHOD_ALL);
+    DefEngineConst(METHOD_NONE);
+}
+#else
+void
+Init_ossl_engine()
+{
+}
+#endif
diff --git a/ruby_1_8_6/ext/openssl/ossl_engine.h b/ruby_1_8_6/ext/openssl/ossl_engine.h
new file mode 100644
index 0000000000..ea2f256912
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_engine.h
@@ -0,0 +1,20 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2003  Michal Rokos <m.rokos@sh.cvut.cz>
+ * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(OSSL_ENGINE_H)
+#define OSSL_ENGINE_H
+
+extern VALUE cEngine;
+extern VALUE eEngineError;
+
+void Init_ossl_engine(void);
+
+#endif /* OSSL_ENGINE_H */
diff --git a/ruby_1_8_6/ext/openssl/ossl_hmac.c b/ruby_1_8_6/ext/openssl/ossl_hmac.c
new file mode 100644
index 0000000000..312343e03d
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_hmac.c
@@ -0,0 +1,224 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(OPENSSL_NO_HMAC)
+
+#include "ossl.h"
+
+#define MakeHMAC(obj, klass, ctx) \
+    obj = Data_Make_Struct(klass, HMAC_CTX, 0, ossl_hmac_free, ctx)
+#define GetHMAC(obj, ctx) do { \
+    Data_Get_Struct(obj, HMAC_CTX, ctx); \
+    if (!ctx) { \
+	ossl_raise(rb_eRuntimeError, "HMAC wasn't initialized"); \
+    } \
+} while (0)
+#define SafeGetHMAC(obj, ctx) do { \
+    OSSL_Check_Kind(obj, cHMAC); \
+    GetHMAC(obj, ctx); \
+} while (0)
+
+/*
+ * Classes
+ */
+VALUE cHMAC;
+VALUE eHMACError;
+
+/*
+ * Public
+ */
+
+/*
+ * Private
+ */
+static void
+ossl_hmac_free(HMAC_CTX *ctx)
+{
+    HMAC_CTX_cleanup(ctx);
+    free(ctx);
+}
+
+static VALUE
+ossl_hmac_alloc(VALUE klass)
+{
+    HMAC_CTX *ctx;
+    VALUE obj;
+
+    MakeHMAC(obj, klass, ctx);
+    HMAC_CTX_init(ctx);
+	
+    return obj;
+}
+
+static VALUE
+ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
+{
+    HMAC_CTX *ctx;
+
+    StringValue(key);
+    GetHMAC(self, ctx);
+    HMAC_Init_ex(ctx, RSTRING(key)->ptr, RSTRING(key)->len,
+		 GetDigestPtr(digest), NULL);
+
+    return self;
+}
+
+static VALUE
+ossl_hmac_copy(VALUE self, VALUE other)
+{
+    HMAC_CTX *ctx1, *ctx2;
+    
+    rb_check_frozen(self);
+    if (self == other) return self;
+
+    GetHMAC(self, ctx1);
+    SafeGetHMAC(other, ctx2);
+
+    if (!HMAC_CTX_copy(ctx1, ctx2)) {
+	ossl_raise(eHMACError, NULL);
+    }
+    return self;
+}
+
+static VALUE
+ossl_hmac_update(VALUE self, VALUE data)
+{
+    HMAC_CTX *ctx;
+
+    StringValue(data);
+    GetHMAC(self, ctx);
+    HMAC_Update(ctx, RSTRING(data)->ptr, RSTRING(data)->len);
+
+    return self;
+}
+
+static void
+hmac_final(HMAC_CTX *ctx, char **buf, int *buf_len)
+{
+    HMAC_CTX final;
+
+    if (!HMAC_CTX_copy(&final, ctx)) {
+	ossl_raise(eHMACError, NULL);
+    }
+    if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) {
+	HMAC_CTX_cleanup(&final);
+	OSSL_Debug("Allocating %d mem", HMAC_size(&final));
+	ossl_raise(eHMACError, "Cannot allocate memory for hmac");
+    }
+    HMAC_Final(&final, *buf, buf_len);
+    HMAC_CTX_cleanup(&final);
+}
+
+static VALUE
+ossl_hmac_digest(VALUE self)
+{
+    HMAC_CTX *ctx;
+    char *buf;
+    int buf_len;
+    VALUE digest;
+	
+    GetHMAC(self, ctx);
+    hmac_final(ctx, &buf, &buf_len);
+    digest = ossl_buf2str(buf, buf_len);
+    
+    return digest;
+}
+
+static VALUE
+ossl_hmac_hexdigest(VALUE self)
+{
+    HMAC_CTX *ctx;
+    char *buf, *hexbuf;
+    int buf_len;
+    VALUE hexdigest;
+	
+    GetHMAC(self, ctx);
+    hmac_final(ctx, &buf, &buf_len);
+    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
+	OPENSSL_free(buf);
+	ossl_raise(eHMACError, "Memory alloc error");
+    }
+    OPENSSL_free(buf);
+    hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
+
+    return hexdigest;
+}
+
+static VALUE
+ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
+{
+    char *buf;
+    int buf_len;
+	
+    StringValue(key);
+    StringValue(data);
+    buf = HMAC(GetDigestPtr(digest), RSTRING(key)->ptr, RSTRING(key)->len,
+	       RSTRING(data)->ptr, RSTRING(data)->len, NULL, &buf_len);
+
+    return rb_str_new(buf, buf_len);
+}
+
+static VALUE
+ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
+{
+    char *buf, *hexbuf;
+    int buf_len;
+    VALUE hexdigest;
+
+    StringValue(key);
+    StringValue(data);
+	
+    buf = HMAC(GetDigestPtr(digest), RSTRING(key)->ptr, RSTRING(key)->len,
+	       RSTRING(data)->ptr, RSTRING(data)->len, NULL, &buf_len);
+    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
+	ossl_raise(eHMACError, "Cannot convert buf to hexbuf");
+    }
+    hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
+
+    return hexdigest;
+}
+
+/*
+ * INIT
+ */
+void
+Init_ossl_hmac()
+{
+#if 0 /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+#endif
+
+    eHMACError = rb_define_class_under(mOSSL, "HMACError", eOSSLError);
+	
+    cHMAC = rb_define_class_under(mOSSL, "HMAC", rb_cObject);
+
+    rb_define_alloc_func(cHMAC, ossl_hmac_alloc);
+    rb_define_singleton_method(cHMAC, "digest", ossl_hmac_s_digest, 3);
+    rb_define_singleton_method(cHMAC, "hexdigest", ossl_hmac_s_hexdigest, 3);
+    
+    rb_define_method(cHMAC, "initialize", ossl_hmac_initialize, 2);
+    rb_define_copy_func(cHMAC, ossl_hmac_copy);
+
+    rb_define_method(cHMAC, "update", ossl_hmac_update, 1);
+    rb_define_alias(cHMAC, "<<", "update");
+    rb_define_method(cHMAC, "digest", ossl_hmac_digest, 0);
+    rb_define_method(cHMAC, "hexdigest", ossl_hmac_hexdigest, 0);
+    rb_define_alias(cHMAC, "inspect", "hexdigest");
+    rb_define_alias(cHMAC, "to_s", "hexdigest");
+}
+
+#else /* NO_HMAC */
+#  warning >>> OpenSSL is compiled without HMAC support <<<
+void
+Init_ossl_hmac()
+{
+    rb_warning("HMAC will NOT be avaible: OpenSSL is compiled without HMAC.");
+}
+#endif /* NO_HMAC */
diff --git a/ruby_1_8_6/ext/openssl/ossl_hmac.h b/ruby_1_8_6/ext/openssl/ossl_hmac.h
new file mode 100644
index 0000000000..1a2978b39a
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_hmac.h
@@ -0,0 +1,19 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_HMAC_H_)
+#define _OSSL_HMAC_H_
+
+extern VALUE cHMAC;
+extern VALUE eHMACError;
+
+void Init_ossl_hmac(void);
+
+#endif /* _OSSL_HMAC_H_ */
diff --git a/ruby_1_8_6/ext/openssl/ossl_ns_spki.c b/ruby_1_8_6/ext/openssl/ossl_ns_spki.c
new file mode 100644
index 0000000000..66e28374cc
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_ns_spki.c
@@ -0,0 +1,257 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#define WrapSPKI(klass, obj, spki) do { \
+    if (!spki) { \
+	ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, NETSCAPE_SPKI_free, spki); \
+} while (0)
+#define GetSPKI(obj, spki) do { \
+    Data_Get_Struct(obj, NETSCAPE_SPKI, spki); \
+    if (!spki) { \
+	ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
+    } \
+} while (0)
+
+/*
+ * Classes
+ */
+VALUE mNetscape;
+VALUE cSPKI;
+VALUE eSPKIError;
+
+/*
+ * Public functions
+ */
+
+/*
+ * Private functions
+ */
+static VALUE
+ossl_spki_alloc(VALUE klass)
+{
+    NETSCAPE_SPKI *spki;
+    VALUE obj;
+	
+    if (!(spki = NETSCAPE_SPKI_new())) {
+	ossl_raise(eSPKIError, NULL);
+    }	
+    WrapSPKI(klass, obj, spki);
+	
+    return obj;
+}
+
+static VALUE
+ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
+{
+    NETSCAPE_SPKI *spki;
+    VALUE buffer;
+    unsigned char *p;
+	
+    if (rb_scan_args(argc, argv, "01", &buffer) == 0) {
+	return self;
+    }
+    StringValue(buffer);
+    if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING(buffer)->ptr, -1))) {
+	p = RSTRING(buffer)->ptr;
+	if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING(buffer)->len))) {
+	    ossl_raise(eSPKIError, NULL);
+	}
+    }
+    NETSCAPE_SPKI_free(DATA_PTR(self));
+    DATA_PTR(self) = spki;
+    ERR_clear_error();
+
+    return self;
+}
+
+static VALUE
+ossl_spki_to_der(VALUE self)
+{
+    NETSCAPE_SPKI *spki;
+    VALUE str;
+    long len;
+    unsigned char *p;
+
+    GetSPKI(self, spki);
+    if ((len = i2d_NETSCAPE_SPKI(spki, NULL)) <= 0)
+        ossl_raise(eX509CertError, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if (i2d_NETSCAPE_SPKI(spki, &p) <= 0)
+        ossl_raise(eX509CertError, NULL);
+    ossl_str_adjust(str, p);
+    
+    return str;
+}
+
+static VALUE
+ossl_spki_to_pem(VALUE self)
+{
+    NETSCAPE_SPKI *spki;
+    char *data;
+    VALUE str;
+	
+    GetSPKI(self, spki);
+    if (!(data = NETSCAPE_SPKI_b64_encode(spki))) {
+	ossl_raise(eSPKIError, NULL);
+    }
+    str = ossl_buf2str(data, strlen(data));
+
+    return str;
+}
+
+static VALUE
+ossl_spki_print(VALUE self)
+{
+    NETSCAPE_SPKI *spki;
+    BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
+	
+    GetSPKI(self, spki);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eSPKIError, NULL);
+    }
+    if (!NETSCAPE_SPKI_print(out, spki)) {
+	BIO_free(out);
+	ossl_raise(eSPKIError, NULL);
+    }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
+	
+    return str;
+}
+
+static VALUE
+ossl_spki_get_public_key(VALUE self)
+{
+    NETSCAPE_SPKI *spki;
+    EVP_PKEY *pkey;
+
+    GetSPKI(self, spki);
+    if (!(pkey = NETSCAPE_SPKI_get_pubkey(spki))) { /* adds an reference */
+	ossl_raise(eSPKIError, NULL);
+    }
+
+    return ossl_pkey_new(pkey); /* NO DUP - OK */
+}
+
+static VALUE
+ossl_spki_set_public_key(VALUE self, VALUE key)
+{
+    NETSCAPE_SPKI *spki;
+
+    GetSPKI(self, spki);
+    if (!NETSCAPE_SPKI_set_pubkey(spki, GetPKeyPtr(key))) { /* NO NEED TO DUP */
+	ossl_raise(eSPKIError, NULL);
+    }
+
+    return key;
+}
+
+static VALUE
+ossl_spki_get_challenge(VALUE self)
+{
+    NETSCAPE_SPKI *spki;
+
+    GetSPKI(self, spki);
+    if (spki->spkac->challenge->length <= 0) {
+	OSSL_Debug("Challenge.length <= 0?");
+	return rb_str_new(0, 0);
+    }
+
+    return rb_str_new(spki->spkac->challenge->data,
+		      spki->spkac->challenge->length);
+}
+
+static VALUE
+ossl_spki_set_challenge(VALUE self, VALUE str)
+{
+    NETSCAPE_SPKI *spki;
+
+    StringValue(str);
+    GetSPKI(self, spki);
+    if (!ASN1_STRING_set(spki->spkac->challenge, RSTRING(str)->ptr,
+			 RSTRING(str)->len)) {
+	ossl_raise(eSPKIError, NULL);
+    }
+    
+    return str;
+}
+
+static VALUE
+ossl_spki_sign(VALUE self, VALUE key, VALUE digest)
+{
+    NETSCAPE_SPKI *spki;
+    EVP_PKEY *pkey;
+    const EVP_MD *md;
+
+    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
+    md = GetDigestPtr(digest);
+    GetSPKI(self, spki);
+    if (!NETSCAPE_SPKI_sign(spki, pkey, md)) {
+	ossl_raise(eSPKIError, NULL);
+    }
+
+    return self;
+}
+
+/*
+ * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
+ */
+static VALUE
+ossl_spki_verify(VALUE self, VALUE key)
+{
+    NETSCAPE_SPKI *spki;
+
+    GetSPKI(self, spki);
+    switch (NETSCAPE_SPKI_verify(spki, GetPKeyPtr(key))) { /* NO NEED TO DUP */
+    case 0:
+	return Qfalse;
+    case 1:
+	return Qtrue;
+    default:
+	ossl_raise(eSPKIError, NULL);
+    }
+    return Qnil; /* dummy */
+}
+
+/*
+ * NETSCAPE_SPKI init
+ */
+void
+Init_ossl_ns_spki()
+{
+    mNetscape = rb_define_module_under(mOSSL, "Netscape");
+	
+    eSPKIError = rb_define_class_under(mNetscape, "SPKIError", eOSSLError);
+	
+    cSPKI = rb_define_class_under(mNetscape, "SPKI", rb_cObject);
+	
+    rb_define_alloc_func(cSPKI, ossl_spki_alloc);
+    rb_define_method(cSPKI, "initialize", ossl_spki_initialize, -1);
+	
+    rb_define_method(cSPKI, "to_der", ossl_spki_to_der, 0);
+    rb_define_method(cSPKI, "to_pem", ossl_spki_to_pem, 0);
+    rb_define_alias(cSPKI, "to_s", "to_pem");
+    rb_define_method(cSPKI, "to_text", ossl_spki_print, 0);
+    rb_define_method(cSPKI, "public_key", ossl_spki_get_public_key, 0);
+    rb_define_method(cSPKI, "public_key=", ossl_spki_set_public_key, 1);
+    rb_define_method(cSPKI, "sign", ossl_spki_sign, 2);
+    rb_define_method(cSPKI, "verify", ossl_spki_verify, 1);
+    rb_define_method(cSPKI, "challenge", ossl_spki_get_challenge, 0);
+    rb_define_method(cSPKI, "challenge=", ossl_spki_set_challenge, 1);
+}
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_ns_spki.h b/ruby_1_8_6/ext/openssl/ossl_ns_spki.h
new file mode 100644
index 0000000000..9977035a9c
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_ns_spki.h
@@ -0,0 +1,21 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_NS_SPKI_H_)
+#define _OSSL_NS_SPKI_H_
+
+extern VALUE mNetscape;
+extern VALUE cSPKI;
+extern VALUE eSPKIError;
+
+void Init_ossl_ns_spki(void);
+
+#endif /* _OSSL_NS_SPKI_H_ */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_ocsp.c b/ruby_1_8_6/ext/openssl/ossl_ocsp.c
new file mode 100644
index 0000000000..b5ea9dadf5
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_ocsp.c
@@ -0,0 +1,769 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2003  Michal Rokos <m.rokos@sh.cvut.cz>
+ * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#if defined(OSSL_OCSP_ENABLED)
+
+#define WrapOCSPReq(klass, obj, req) do { \
+    if(!req) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
+    obj = Data_Wrap_Struct(klass, 0, OCSP_REQUEST_free, req); \
+} while (0)
+#define GetOCSPReq(obj, req) do { \
+    Data_Get_Struct(obj, OCSP_REQUEST, req); \
+    if(!req) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
+} while (0)
+#define SafeGetOCSPReq(obj, req) do { \
+    OSSL_Check_Kind(obj, cOCSPReq); \
+    GetOCSPReq(obj, req); \
+} while (0)
+
+#define WrapOCSPRes(klass, obj, res) do { \
+    if(!res) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
+    obj = Data_Wrap_Struct(klass, 0, OCSP_RESPONSE_free, res); \
+} while (0)
+#define GetOCSPRes(obj, res) do { \
+    Data_Get_Struct(obj, OCSP_RESPONSE, res); \
+    if(!res) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
+} while (0)
+#define SafeGetOCSPRes(obj, res) do { \
+    OSSL_Check_Kind(obj, cOCSPRes); \
+    GetOCSPRes(obj, res); \
+} while (0)
+
+#define WrapOCSPBasicRes(klass, obj, res) do { \
+    if(!res) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
+    obj = Data_Wrap_Struct(klass, 0, OCSP_BASICRESP_free, res); \
+} while (0)
+#define GetOCSPBasicRes(obj, res) do { \
+    Data_Get_Struct(obj, OCSP_BASICRESP, res); \
+    if(!res) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
+} while (0)
+#define SafeGetOCSPBasicRes(obj, res) do { \
+    OSSL_Check_Kind(obj, cOCSPBasicRes); \
+    GetOCSPBasicRes(obj, res); \
+} while (0)
+
+#define WrapOCSPCertId(klass, obj, cid) do { \
+    if(!cid) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
+    obj = Data_Wrap_Struct(klass, 0, OCSP_CERTID_free, cid); \
+} while (0)
+#define GetOCSPCertId(obj, cid) do { \
+    Data_Get_Struct(obj, OCSP_CERTID, cid); \
+    if(!cid) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
+} while (0)
+#define SafeGetOCSPCertId(obj, cid) do { \
+    OSSL_Check_Kind(obj, cOCSPCertId); \
+    GetOCSPCertId(obj, cid); \
+} while (0)
+
+VALUE mOCSP;
+VALUE eOCSPError;
+VALUE cOCSPReq;
+VALUE cOCSPRes;
+VALUE cOCSPBasicRes;
+VALUE cOCSPCertId;
+
+/*
+ * Public
+ */
+static VALUE
+ossl_ocspcertid_new(OCSP_CERTID *cid)
+{
+    VALUE obj;
+    WrapOCSPCertId(cOCSPCertId, obj, cid);
+    return obj;
+}
+
+/*
+ * OCSP::Resquest
+ */
+static VALUE
+ossl_ocspreq_alloc(VALUE klass)
+{
+    OCSP_REQUEST *req;
+    VALUE obj;
+
+    if (!(req = OCSP_REQUEST_new()))
+	ossl_raise(eOCSPError, NULL);
+    WrapOCSPReq(klass, obj, req);
+
+    return obj;
+}
+
+static VALUE
+ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE arg;
+    unsigned char *p;
+
+    rb_scan_args(argc, argv, "01", &arg);
+    if(!NIL_P(arg)){
+	arg = ossl_to_der_if_possible(arg);
+	StringValue(arg);
+	p = (unsigned char*)RSTRING(arg)->ptr;
+	if(!d2i_OCSP_REQUEST((OCSP_REQUEST**)&DATA_PTR(self), &p,
+			     RSTRING(arg)->len)){
+	    ossl_raise(eOCSPError, "cannot load DER encoded request");
+	}
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_ocspreq_add_nonce(int argc, VALUE *argv, VALUE self)
+{
+    OCSP_REQUEST *req;
+    VALUE val;
+    int ret;
+
+    rb_scan_args(argc, argv, "01", &val);
+    if(NIL_P(val)) {
+	GetOCSPReq(self, req);
+	ret = OCSP_request_add1_nonce(req, NULL, -1);
+    }
+    else{
+	StringValue(val);
+	GetOCSPReq(self, req);
+	ret = OCSP_request_add1_nonce(req, RSTRING(val)->ptr, RSTRING(val)->len);
+    }
+    if(!ret) ossl_raise(eOCSPError, NULL);
+
+    return self;
+}
+
+/* Check nonce validity in a request and response.
+ * Return value reflects result:
+ *  1: nonces present and equal.
+ *  2: nonces both absent.
+ *  3: nonce present in response only.
+ *  0: nonces both present and not equal.
+ * -1: nonce in request only.
+ *
+ *  For most responders clients can check return > 0.
+ *  If responder doesn't handle nonces return != 0 may be
+ *  necessary. return == 0 is always an error.
+ */
+static VALUE
+ossl_ocspreq_check_nonce(VALUE self, VALUE basic_resp)
+{
+    OCSP_REQUEST *req;
+    OCSP_BASICRESP *bs;
+    int res;
+
+    GetOCSPReq(self, req);
+    SafeGetOCSPBasicRes(basic_resp, bs);
+    res = OCSP_check_nonce(req, bs);
+
+    return INT2NUM(res);
+}
+
+static VALUE
+ossl_ocspreq_add_certid(VALUE self, VALUE certid)
+{
+    OCSP_REQUEST *req;
+    OCSP_CERTID *id;
+
+    GetOCSPReq(self, req);
+    GetOCSPCertId(certid, id);
+    if(!OCSP_request_add0_id(req, OCSP_CERTID_dup(id)))
+	ossl_raise(eOCSPError, NULL);
+
+    return self;
+}
+
+static VALUE
+ossl_ocspreq_get_certid(VALUE self)
+{
+    OCSP_REQUEST *req;
+    OCSP_ONEREQ *one;
+    OCSP_CERTID *id;
+    VALUE ary, tmp;
+    int i, count;
+
+    GetOCSPReq(self, req);
+    count = OCSP_request_onereq_count(req);
+    ary = (count > 0) ? rb_ary_new() : Qnil;
+    for(i = 0; i < count; i++){
+	one = OCSP_request_onereq_get0(req, i);
+	if(!(id = OCSP_CERTID_dup(OCSP_onereq_get0_id(one))))
+	    ossl_raise(eOCSPError, NULL);
+	WrapOCSPCertId(cOCSPCertId, tmp, id);
+	rb_ary_push(ary, tmp);
+    }
+
+    return ary;
+}
+
+static VALUE
+ossl_ocspreq_sign(int argc, VALUE *argv, VALUE self)
+{
+    VALUE signer_cert, signer_key, certs, flags;
+    OCSP_REQUEST *req;
+    X509 *signer;
+    EVP_PKEY *key;
+    STACK_OF(X509) *x509s;
+    unsigned long flg;
+    int ret;
+
+    rb_scan_args(argc, argv, "22", &signer_cert, &signer_key, &certs, &flags);
+    signer = GetX509CertPtr(signer_cert);
+    key = GetPrivPKeyPtr(signer_key);
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
+    if(NIL_P(certs)){
+	x509s = sk_X509_new_null();
+	flags |= OCSP_NOCERTS;
+    }
+    else x509s = ossl_x509_ary2sk(certs);
+    GetOCSPReq(self, req);
+    ret = OCSP_request_sign(req, signer, key, EVP_sha1(), x509s, flg);
+    sk_X509_pop_free(x509s, X509_free);
+    if(!ret) ossl_raise(eOCSPError, NULL);
+
+    return self;
+}
+
+static VALUE
+ossl_ocspreq_verify(int argc, VALUE *argv, VALUE self)
+{
+    VALUE certs, store, flags;
+    OCSP_REQUEST *req;
+    STACK_OF(X509) *x509s;
+    X509_STORE *x509st;
+    int flg, result;
+
+    rb_scan_args(argc, argv, "21", &certs, &store, &flags);
+    x509st = GetX509StorePtr(store);
+    flg = NIL_P(flags) ? 0 : INT2NUM(flags);
+    x509s = ossl_x509_ary2sk(certs);
+    GetOCSPReq(self, req);
+    result = OCSP_request_verify(req, x509s, x509st, flg);
+    sk_X509_pop_free(x509s, X509_free);
+    if(!result) rb_warn("%s", ERR_error_string(ERR_peek_error(), NULL));
+
+    return result ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_ocspreq_to_der(VALUE self)
+{
+    OCSP_REQUEST *req;
+    VALUE str;
+    unsigned char *p;
+    long len;
+
+    GetOCSPReq(self, req);
+    if((len = i2d_OCSP_REQUEST(req, NULL)) <= 0)
+	ossl_raise(eOCSPError, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if(i2d_OCSP_REQUEST(req, &p) <= 0)
+	ossl_raise(eOCSPError, NULL);
+    ossl_str_adjust(str, p);
+
+    return str;
+}
+
+/*
+ * OCSP::Response
+ */
+static VALUE
+ossl_ocspres_s_create(VALUE klass, VALUE status, VALUE basic_resp)
+{
+    OCSP_BASICRESP *bs;
+    OCSP_RESPONSE *res;
+    VALUE obj;
+    int st = NUM2INT(status);
+
+    if(NIL_P(basic_resp)) bs = NULL;
+    else GetOCSPBasicRes(basic_resp, bs); /* NO NEED TO DUP */
+    if(!(res = OCSP_response_create(st, bs)))
+	ossl_raise(eOCSPError, NULL);
+    WrapOCSPRes(klass, obj, res);
+
+    return obj;
+}
+
+static VALUE
+ossl_ocspres_alloc(VALUE klass)
+{
+    OCSP_RESPONSE *res;
+    VALUE obj;
+
+    if(!(res = OCSP_RESPONSE_new()))
+	ossl_raise(eOCSPError, NULL);
+    WrapOCSPRes(klass, obj, res);
+
+    return obj;
+}
+
+static VALUE
+ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE arg;
+    unsigned char *p;
+
+    rb_scan_args(argc, argv, "01", &arg);
+    if(!NIL_P(arg)){
+	arg = ossl_to_der_if_possible(arg);
+	StringValue(arg);
+	p = RSTRING(arg)->ptr;
+	if(!d2i_OCSP_RESPONSE((OCSP_RESPONSE**)&DATA_PTR(self), &p,
+			      RSTRING(arg)->len)){
+	    ossl_raise(eOCSPError, "cannot load DER encoded response");
+	}
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_ocspres_status(VALUE self)
+{
+    OCSP_RESPONSE *res;
+    int st;
+
+    GetOCSPRes(self, res);
+    st = OCSP_response_status(res);
+
+    return INT2NUM(st);
+}
+
+static VALUE
+ossl_ocspres_status_string(VALUE self)
+{
+    OCSP_RESPONSE *res;
+    int st;
+
+    GetOCSPRes(self, res);
+    st = OCSP_response_status(res);
+
+    return rb_str_new2(OCSP_response_status_str(st));
+}
+
+static VALUE
+ossl_ocspres_get_basic(VALUE self)
+{
+    OCSP_RESPONSE *res;
+    OCSP_BASICRESP *bs;
+    VALUE ret;
+
+    GetOCSPRes(self, res);
+    if(!(bs = OCSP_response_get1_basic(res)))
+	return Qnil;
+    WrapOCSPBasicRes(cOCSPBasicRes, ret, bs);
+
+    return ret;
+}
+
+static VALUE
+ossl_ocspres_to_der(VALUE self)
+{
+    OCSP_RESPONSE *res;
+    VALUE str;
+    long len;
+    unsigned char *p;
+
+    GetOCSPRes(self, res);
+    if((len = i2d_OCSP_RESPONSE(res, NULL)) <= 0)
+	ossl_raise(eOCSPError, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if(i2d_OCSP_RESPONSE(res, NULL) <= 0)
+	ossl_raise(eOCSPError, NULL);
+    ossl_str_adjust(str, p);
+
+    return str;
+}
+
+/*
+ * OCSP::BasicResponse
+ */
+static VALUE
+ossl_ocspbres_alloc(VALUE klass)
+{
+    OCSP_BASICRESP *bs;
+    VALUE obj;
+
+    if(!(bs = OCSP_BASICRESP_new()))
+	ossl_raise(eOCSPError, NULL);
+    WrapOCSPBasicRes(klass, obj, bs);
+
+    return obj;
+}
+
+static VALUE
+ossl_ocspbres_initialize(int argc, VALUE *argv, VALUE self)
+{
+    return self;
+}
+
+static VALUE
+ossl_ocspbres_copy_nonce(VALUE self, VALUE request)
+{
+    OCSP_BASICRESP *bs;
+    OCSP_REQUEST *req;
+    int ret;
+
+    GetOCSPBasicRes(self, bs);
+    SafeGetOCSPReq(request, req);
+    ret = OCSP_copy_nonce(bs, req);
+
+    return INT2NUM(ret);
+}
+
+static VALUE
+ossl_ocspbres_add_nonce(int argc, VALUE *argv, VALUE self)
+{
+    OCSP_BASICRESP *bs;
+    VALUE val;
+    int ret;
+
+    rb_scan_args(argc, argv, "01", &val);
+    if(NIL_P(val)) {
+	GetOCSPBasicRes(self, bs);
+	ret = OCSP_basic_add1_nonce(bs, NULL, -1);
+    }
+    else{
+	StringValue(val);
+	GetOCSPBasicRes(self, bs);
+	ret = OCSP_basic_add1_nonce(bs, RSTRING(val)->ptr, RSTRING(val)->len);
+    }
+    if(!ret) ossl_raise(eOCSPError, NULL);
+
+    return self;
+}
+
+static VALUE
+ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
+			 VALUE reason, VALUE revtime,
+			 VALUE thisupd, VALUE nextupd, VALUE ext)
+{
+    OCSP_BASICRESP *bs;
+    OCSP_SINGLERESP *single;
+    OCSP_CERTID *id;
+    int st, rsn;
+    ASN1_TIME *ths, *nxt, *rev;
+    int error, i, rstatus = 0;
+    VALUE tmp;
+
+    st = NUM2INT(status);
+    rsn = NIL_P(status) ? 0 : NUM2INT(reason);
+    if(!NIL_P(ext)){
+	/* All ary's members should be X509Extension */
+	Check_Type(ext, T_ARRAY);
+	for (i = 0; i < RARRAY(ext)->len; i++)
+	    OSSL_Check_Kind(RARRAY(ext)->ptr[i], cX509Ext);
+    }
+
+    error = 0;
+    ths = nxt = rev = NULL;
+    if(!NIL_P(revtime)){
+	tmp = rb_protect(rb_Integer, revtime, &rstatus);
+	if(rstatus) goto err;
+	rev = X509_gmtime_adj(NULL, NUM2INT(tmp));
+    }
+    tmp = rb_protect(rb_Integer, thisupd, &rstatus);
+    if(rstatus) goto err;
+    ths = X509_gmtime_adj(NULL, NUM2INT(tmp));
+    tmp = rb_protect(rb_Integer, nextupd, &rstatus);
+    if(rstatus) goto err;
+    nxt = X509_gmtime_adj(NULL, NUM2INT(tmp));
+
+    GetOCSPBasicRes(self, bs);
+    SafeGetOCSPCertId(cid, id);
+    if(!(single = OCSP_basic_add1_status(bs, id, st, rsn, rev, ths, nxt))){
+	error = 1;
+	goto err;
+    }
+
+    if(!NIL_P(ext)){
+	X509_EXTENSION *x509ext;
+	sk_X509_EXTENSION_pop_free(single->singleExtensions, X509_EXTENSION_free);
+	single->singleExtensions = NULL;
+	for(i = 0; i < RARRAY(ext)->len; i++){
+	    x509ext = DupX509ExtPtr(RARRAY(ext)->ptr[i]);
+	    if(!OCSP_SINGLERESP_add_ext(single, x509ext, -1)){
+		X509_EXTENSION_free(x509ext);
+		error = 1;
+		goto err;
+	    }
+	    X509_EXTENSION_free(x509ext);
+	}
+    }
+
+ err:
+    ASN1_TIME_free(ths);
+    ASN1_TIME_free(nxt);
+    ASN1_TIME_free(rev);
+    if(error) ossl_raise(eOCSPError, NULL);
+    if(rstatus) rb_jump_tag(rstatus);
+
+    return self;
+}
+
+static VALUE
+ossl_ocspbres_get_status(VALUE self)
+{
+    OCSP_BASICRESP *bs;
+    OCSP_SINGLERESP *single;
+    OCSP_CERTID *cid;
+    ASN1_TIME *revtime, *thisupd, *nextupd;
+    int status, reason;
+    X509_EXTENSION *x509ext;
+    VALUE ret, ary, ext;
+    int count, ext_count, i, j;
+
+    GetOCSPBasicRes(self, bs);
+    ret = rb_ary_new();
+    count = OCSP_resp_count(bs);
+    for(i = 0; i < count; i++){
+	single = OCSP_resp_get0(bs, i);
+	if(!single) continue;
+
+	revtime = thisupd = nextupd = NULL;
+	status = OCSP_single_get0_status(single, &reason, &revtime,
+					 &thisupd, &nextupd);
+	if(status < 0) continue;
+	if(!(cid = OCSP_CERTID_dup(single->certId)))
+	    ossl_raise(eOCSPError, NULL);
+	ary = rb_ary_new();
+	rb_ary_push(ary, ossl_ocspcertid_new(cid));
+	rb_ary_push(ary, INT2NUM(status));
+	rb_ary_push(ary, INT2NUM(reason));
+	rb_ary_push(ary, revtime ? asn1time_to_time(revtime) : Qnil);
+	rb_ary_push(ary, thisupd ? asn1time_to_time(thisupd) : Qnil);
+	rb_ary_push(ary, nextupd ? asn1time_to_time(nextupd) : Qnil);
+	ext = rb_ary_new();
+	ext_count = OCSP_SINGLERESP_get_ext_count(single);
+	for(j = 0; j < ext_count; j++){
+	    x509ext = OCSP_SINGLERESP_get_ext(single, j);
+	    rb_ary_push(ext, ossl_x509ext_new(x509ext));
+	}
+	rb_ary_push(ary, ext);
+	rb_ary_push(ret, ary);
+    }
+
+    return ret;
+} 
+
+static VALUE
+ossl_ocspbres_sign(int argc, VALUE *argv, VALUE self)
+{
+    VALUE signer_cert, signer_key, certs, flags;
+    OCSP_BASICRESP *bs;
+    X509 *signer;
+    EVP_PKEY *key;
+    STACK_OF(X509) *x509s;
+    unsigned long flg;
+    int ret;
+
+    rb_scan_args(argc, argv, "22", &signer_cert, &signer_key, &certs, &flags);
+    signer = GetX509CertPtr(signer_cert);
+    key = GetPrivPKeyPtr(signer_key);
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
+    if(NIL_P(certs)){
+	x509s = sk_X509_new_null();
+	flg |= OCSP_NOCERTS;
+    }
+    else{
+	x509s = ossl_x509_ary2sk(certs);
+    }
+    GetOCSPBasicRes(self, bs);
+    ret = OCSP_basic_sign(bs, signer, key, EVP_sha1(), x509s, flg);
+    sk_X509_pop_free(x509s, X509_free);
+    if(!ret) ossl_raise(eOCSPError, NULL);
+
+    return self;
+}
+
+static VALUE
+ossl_ocspbres_verify(int argc, VALUE *argv, VALUE self)
+{
+    VALUE certs, store, flags;
+    OCSP_BASICRESP *bs;
+    STACK_OF(X509) *x509s;
+    X509_STORE *x509st;
+    int flg, result;
+
+    rb_scan_args(argc, argv, "21", &certs, &store, &flags);
+    x509st = GetX509StorePtr(store);
+    flg = NIL_P(flags) ? 0 : INT2NUM(flags);
+    x509s = ossl_x509_ary2sk(certs);
+    GetOCSPBasicRes(self, bs);
+    result = OCSP_basic_verify(bs, x509s, x509st, flg);
+    sk_X509_pop_free(x509s, X509_free);
+    if(!result) rb_warn("%s", ERR_error_string(ERR_peek_error(), NULL));
+
+    return result ? Qtrue : Qfalse;
+}
+
+/*
+ * OCSP::CertificateId
+ */
+static VALUE
+ossl_ocspcid_alloc(VALUE klass)
+{
+    OCSP_CERTID *id;
+    VALUE obj;
+
+    if(!(id = OCSP_CERTID_new()))
+	ossl_raise(eOCSPError, NULL);
+    WrapOCSPCertId(klass, obj, id);
+
+    return obj;
+}
+
+static VALUE
+ossl_ocspcid_initialize(VALUE self, VALUE subject, VALUE issuer)
+{
+    OCSP_CERTID *id, *newid;
+    X509 *x509s, *x509i;
+
+    x509s = GetX509CertPtr(subject); /* NO NEED TO DUP */
+    x509i = GetX509CertPtr(issuer); /* NO NEED TO DUP */
+    if(!(newid = OCSP_cert_to_id(NULL, x509s, x509i)))
+	ossl_raise(eOCSPError, NULL);
+    GetOCSPCertId(self, id);
+    OCSP_CERTID_free(id);
+    RDATA(self)->data = newid;
+
+    return self;
+}
+
+static VALUE
+ossl_ocspcid_cmp(VALUE self, VALUE other)
+{
+    OCSP_CERTID *id, *id2;
+    int result;
+
+    GetOCSPCertId(self, id);
+    SafeGetOCSPCertId(other, id2);
+    result = OCSP_id_cmp(id, id2);
+
+    return (result == 0) ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_ocspcid_cmp_issuer(VALUE self, VALUE other)
+{
+    OCSP_CERTID *id, *id2;
+    int result;
+
+    GetOCSPCertId(self, id);
+    SafeGetOCSPCertId(other, id2);
+    result = OCSP_id_issuer_cmp(id, id2);
+
+    return (result == 0) ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_ocspcid_get_serial(VALUE self)
+{
+    OCSP_CERTID *id;
+
+    GetOCSPCertId(self, id);
+
+    return asn1integer_to_num(id->serialNumber);
+}
+
+void
+Init_ossl_ocsp()
+{
+    mOCSP = rb_define_module_under(mOSSL, "OCSP");
+
+    eOCSPError = rb_define_class_under(mOCSP, "OCSPError", eOSSLError);
+
+    cOCSPReq = rb_define_class_under(mOCSP, "Request", rb_cObject);
+    rb_define_alloc_func(cOCSPReq, ossl_ocspreq_alloc);
+    rb_define_method(cOCSPReq, "initialize", ossl_ocspreq_initialize, -1);
+    rb_define_method(cOCSPReq, "add_nonce", ossl_ocspreq_add_nonce, -1);
+    rb_define_method(cOCSPReq, "check_nonce", ossl_ocspreq_check_nonce, 1);
+    rb_define_method(cOCSPReq, "add_certid", ossl_ocspreq_add_certid, 1);
+    rb_define_method(cOCSPReq, "certid", ossl_ocspreq_get_certid, 0);
+    rb_define_method(cOCSPReq, "sign", ossl_ocspreq_sign, -1);
+    rb_define_method(cOCSPReq, "verify", ossl_ocspreq_verify, -1);
+    rb_define_method(cOCSPReq, "to_der", ossl_ocspreq_to_der, 0);
+
+    cOCSPRes = rb_define_class_under(mOCSP, "Response", rb_cObject);
+    rb_define_singleton_method(cOCSPRes, "create", ossl_ocspres_s_create, 2);
+    rb_define_alloc_func(cOCSPRes, ossl_ocspres_alloc);
+    rb_define_method(cOCSPRes, "initialize", ossl_ocspres_initialize, -1);
+    rb_define_method(cOCSPRes, "status", ossl_ocspres_status, 0);
+    rb_define_method(cOCSPRes, "status_string", ossl_ocspres_status_string, 0);
+    rb_define_method(cOCSPRes, "basic", ossl_ocspres_get_basic, 0);
+    rb_define_method(cOCSPRes, "to_der", ossl_ocspres_to_der, 0);
+
+    cOCSPBasicRes = rb_define_class_under(mOCSP, "BasicResponse", rb_cObject);
+    rb_define_alloc_func(cOCSPBasicRes, ossl_ocspbres_alloc);
+    rb_define_method(cOCSPBasicRes, "initialize", ossl_ocspbres_initialize, -1);
+    rb_define_method(cOCSPBasicRes, "copy_nonce", ossl_ocspbres_copy_nonce, 1);
+    rb_define_method(cOCSPBasicRes, "add_nonce", ossl_ocspbres_add_nonce, -1);
+    rb_define_method(cOCSPBasicRes, "add_status", ossl_ocspbres_add_status, 7);
+    rb_define_method(cOCSPBasicRes, "status", ossl_ocspbres_get_status, 0);
+    rb_define_method(cOCSPBasicRes, "sign", ossl_ocspbres_sign, -1);
+    rb_define_method(cOCSPBasicRes, "verify", ossl_ocspbres_verify, -1);
+
+    cOCSPCertId = rb_define_class_under(mOCSP, "CertificateId", rb_cObject);
+    rb_define_alloc_func(cOCSPCertId, ossl_ocspcid_alloc);
+    rb_define_method(cOCSPCertId, "initialize", ossl_ocspcid_initialize, 2);
+    rb_define_method(cOCSPCertId, "cmp", ossl_ocspcid_cmp, 1);
+    rb_define_method(cOCSPCertId, "cmp_issuer", ossl_ocspcid_cmp_issuer, 1);
+    rb_define_method(cOCSPCertId, "serial", ossl_ocspcid_get_serial, 0);
+
+#define DefOCSPConst(x) rb_define_const(mOCSP, #x, INT2NUM(OCSP_##x))
+
+    DefOCSPConst(RESPONSE_STATUS_SUCCESSFUL);
+    DefOCSPConst(RESPONSE_STATUS_MALFORMEDREQUEST);
+    DefOCSPConst(RESPONSE_STATUS_INTERNALERROR);
+    DefOCSPConst(RESPONSE_STATUS_TRYLATER);
+    DefOCSPConst(RESPONSE_STATUS_SIGREQUIRED);
+    DefOCSPConst(RESPONSE_STATUS_UNAUTHORIZED);
+
+    DefOCSPConst(REVOKED_STATUS_NOSTATUS);
+    DefOCSPConst(REVOKED_STATUS_UNSPECIFIED);
+    DefOCSPConst(REVOKED_STATUS_KEYCOMPROMISE);
+    DefOCSPConst(REVOKED_STATUS_CACOMPROMISE);
+    DefOCSPConst(REVOKED_STATUS_AFFILIATIONCHANGED);
+    DefOCSPConst(REVOKED_STATUS_SUPERSEDED);
+    DefOCSPConst(REVOKED_STATUS_CESSATIONOFOPERATION);
+    DefOCSPConst(REVOKED_STATUS_CERTIFICATEHOLD);
+    DefOCSPConst(REVOKED_STATUS_REMOVEFROMCRL);
+
+    DefOCSPConst(NOCERTS);
+    DefOCSPConst(NOINTERN);
+    DefOCSPConst(NOSIGS);
+    DefOCSPConst(NOCHAIN);
+    DefOCSPConst(NOVERIFY);
+    DefOCSPConst(NOEXPLICIT);
+    DefOCSPConst(NOCASIGN);
+    DefOCSPConst(NODELEGATED);
+    DefOCSPConst(NOCHECKS);
+    DefOCSPConst(TRUSTOTHER);
+    DefOCSPConst(RESPID_KEY);
+    DefOCSPConst(NOTIME);
+
+#define DefOCSPVConst(x) rb_define_const(mOCSP, "V_" #x, INT2NUM(V_OCSP_##x))
+
+    DefOCSPVConst(CERTSTATUS_GOOD);
+    DefOCSPVConst(CERTSTATUS_REVOKED);
+    DefOCSPVConst(CERTSTATUS_UNKNOWN);
+    DefOCSPVConst(RESPID_NAME);
+    DefOCSPVConst(RESPID_KEY);
+}
+
+#else /* ! OSSL_OCSP_ENABLED */
+void
+Init_ossl_ocsp()
+{
+}
+#endif
diff --git a/ruby_1_8_6/ext/openssl/ossl_ocsp.h b/ruby_1_8_6/ext/openssl/ossl_ocsp.h
new file mode 100644
index 0000000000..65b4f2e23f
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_ocsp.h
@@ -0,0 +1,24 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2003  Michal Rokos <m.rokos@sh.cvut.cz>
+ * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_OCSP_H_)
+#define _OSSL_OCSP_H_
+
+#if defined(OSSL_OCSP_ENABLED)
+extern VALUE mOCSP;
+extern VALUE cOPCSReq;
+extern VALUE cOPCSRes;
+extern VALUE cOPCSBasicRes;
+#endif
+
+void Init_ossl_ocsp(void);
+
+#endif /* _OSSL_OCSP_H_ */
diff --git a/ruby_1_8_6/ext/openssl/ossl_pkcs12.c b/ruby_1_8_6/ext/openssl/ossl_pkcs12.c
new file mode 100644
index 0000000000..e7d9954c5a
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_pkcs12.c
@@ -0,0 +1,154 @@
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ * $Id$
+ */
+#include "ossl.h"
+
+#define WrapPKCS12(klass, obj, p12) do { \
+    if(!p12) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
+    obj = Data_Wrap_Struct(klass, 0, PKCS12_free, p12); \
+} while (0)
+
+#define GetPKCS12(obj, p12) do { \
+    Data_Get_Struct(obj, PKCS12, p12); \
+    if(!p12) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
+} while (0)
+
+#define SafeGetPKCS12(obj, p12) do { \
+    OSSL_Check_Kind(obj, cPKCS12); \
+    GetPKCS12(obj, p12); \
+} while (0)
+
+#define ossl_pkcs12_set_key(o,v)      rb_iv_set((o), "@key", (v))
+#define ossl_pkcs12_set_cert(o,v)     rb_iv_set((o), "@certificate", (v))
+#define ossl_pkcs12_set_ca_certs(o,v) rb_iv_set((o), "@ca_certs", (v))
+#define ossl_pkcs12_get_key(o)        rb_iv_get((o), "@key")
+#define ossl_pkcs12_get_cert(o)       rb_iv_get((o), "@certificate")
+#define ossl_pkcs12_get_ca_certs(o)   rb_iv_get((o), "@ca_certs")
+
+/*
+ * Classes
+ */
+VALUE mPKCS12;
+VALUE cPKCS12;
+VALUE ePKCS12Error;
+
+/*
+ * Private
+ */
+static VALUE
+ossl_pkcs12_s_allocate(VALUE klass)
+{
+    PKCS12 *p12;
+    VALUE obj;
+
+    if(!(p12 = PKCS12_new())) ossl_raise(ePKCS12Error, NULL);
+    WrapPKCS12(klass, obj, p12);
+
+    return obj;
+}
+
+static VALUE
+ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
+{
+    VALUE pass, name, pkey, cert, ca;
+    VALUE obj;
+    char *passphrase, *friendlyname;
+    EVP_PKEY *key;
+    X509 *x509;
+    STACK_OF(X509) *x509s;
+    PKCS12 *p12;
+    
+    rb_scan_args(argc, argv, "41", &pass, &name, &pkey, &cert, &ca);
+    passphrase = NIL_P(pass) ? NULL : StringValuePtr(pass);
+    friendlyname = NIL_P(name) ? NULL : StringValuePtr(name);
+    key = GetPKeyPtr(pkey);
+    x509 = GetX509CertPtr(cert);
+    x509s = NIL_P(ca) ? NULL : ossl_x509_ary2sk(ca);
+    p12 = PKCS12_create(passphrase, friendlyname, key, x509, x509s,
+                        0, 0, 0, 0, 0);
+    sk_X509_pop_free(x509s, X509_free);
+    if(!p12) ossl_raise(ePKCS12Error, NULL);
+    WrapPKCS12(cPKCS12, obj, p12);
+
+    return obj;
+}
+
+static VALUE
+ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
+{
+    BIO *in;
+    VALUE arg, pass, pkey, cert, ca;
+    char *passphrase;
+    EVP_PKEY *key;
+    X509 *x509;
+    STACK_OF(X509) *x509s = NULL;
+    int st = 0;
+
+    if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) return self;
+    passphrase = NIL_P(pass) ? NULL : StringValuePtr(pass);
+    in = ossl_obj2bio(arg);
+    d2i_PKCS12_bio(in, (PKCS12 **)&DATA_PTR(self));
+    BIO_free(in);
+
+    pkey = cert = ca = Qnil;
+    if(!PKCS12_parse((PKCS12*)DATA_PTR(self), passphrase, &key, &x509, &x509s))
+	ossl_raise(ePKCS12Error, NULL);
+    pkey = rb_protect((VALUE(*)_((VALUE)))ossl_pkey_new, (VALUE)key,
+		      &st); /* NO DUP */
+    if(st) goto err;
+    cert = rb_protect((VALUE(*)_((VALUE)))ossl_x509_new, (VALUE)x509, &st);
+    if(st) goto err;
+    if(x509s){
+	ca =
+	    rb_protect((VALUE(*)_((VALUE)))ossl_x509_sk2ary, (VALUE)x509s, &st);
+	if(st) goto err;
+    }
+
+  err:
+    X509_free(x509);
+    sk_X509_pop_free(x509s, X509_free);
+    ossl_pkcs12_set_key(self, pkey);
+    ossl_pkcs12_set_cert(self, cert);
+    ossl_pkcs12_set_ca_certs(self, ca);
+    if(st) rb_jump_tag(st);
+
+    return self;
+}
+
+static VALUE
+ossl_pkcs12_to_der(VALUE self)
+{
+    PKCS12 *p12;
+    VALUE str;
+    long len;
+    unsigned char *p;
+
+    GetPKCS12(self, p12);
+    if((len = i2d_PKCS12(p12, NULL)) <= 0)
+	ossl_raise(ePKCS12Error, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if(i2d_PKCS12(p12, &p) <= 0)
+	ossl_raise(ePKCS12Error, NULL);
+    ossl_str_adjust(str, p);
+
+    return str;
+}
+
+void
+Init_ossl_pkcs12()
+{
+    mPKCS12 = rb_define_module_under(mOSSL, "PKCS12");
+    cPKCS12 = rb_define_class_under(mPKCS12, "PKCS12", rb_cObject);
+    ePKCS12Error = rb_define_class_under(mPKCS12, "PKCS12Error", eOSSLError);
+    rb_define_module_function(mPKCS12, "create", ossl_pkcs12_s_create, -1);
+
+    rb_define_alloc_func(cPKCS12, ossl_pkcs12_s_allocate);
+    rb_attr(cPKCS12, rb_intern("key"), 1, 0, Qfalse);
+    rb_attr(cPKCS12, rb_intern("certificate"), 1, 0, Qfalse);
+    rb_attr(cPKCS12, rb_intern("ca_certs"), 1, 0, Qfalse);
+    rb_define_method(cPKCS12, "initialize", ossl_pkcs12_initialize, -1);
+    rb_define_method(cPKCS12, "to_der", ossl_pkcs12_to_der, 0);
+}
diff --git a/ruby_1_8_6/ext/openssl/ossl_pkcs12.h b/ruby_1_8_6/ext/openssl/ossl_pkcs12.h
new file mode 100644
index 0000000000..01dde2bc30
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_pkcs12.h
@@ -0,0 +1,16 @@
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ * $Id$
+ */
+#if !defined(_OSSL_PKCS12_H_)
+#define _OSSL_PKCS12_H_
+
+extern VALUE mPKCS12;
+extern VALUE cPKCS12;
+extern VALUE ePKCS12Error;
+
+void Init_ossl_pkcs12(void);
+
+#endif /* _OSSL_PKCS12_H_ */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_pkcs5.h b/ruby_1_8_6/ext/openssl/ossl_pkcs5.h
new file mode 100644
index 0000000000..a3b132bc50
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_pkcs5.h
@@ -0,0 +1,6 @@
+#if !defined(_OSSL_PKCS5_H_)
+#define _OSSL_PKCS5_H_
+
+void Init_ossl_pkcs5(void);
+
+#endif /* _OSSL_PKCS5_H_ */
diff --git a/ruby_1_8_6/ext/openssl/ossl_pkcs7.c b/ruby_1_8_6/ext/openssl/ossl_pkcs7.c
new file mode 100644
index 0000000000..0fcabd7777
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_pkcs7.c
@@ -0,0 +1,995 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#define WrapPKCS7(klass, obj, pkcs7) do { \
+    if (!pkcs7) { \
+	ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, PKCS7_free, pkcs7); \
+} while (0)
+#define GetPKCS7(obj, pkcs7) do { \
+    Data_Get_Struct(obj, PKCS7, pkcs7); \
+    if (!pkcs7) { \
+	ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
+    } \
+} while (0)
+#define SafeGetPKCS7(obj, pkcs7) do { \
+    OSSL_Check_Kind(obj, cPKCS7); \
+    GetPKCS7(obj, pkcs7); \
+} while (0)
+
+#define WrapPKCS7si(klass, obj, p7si) do { \
+    if (!p7si) { \
+	ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, PKCS7_SIGNER_INFO_free, p7si); \
+} while (0)
+#define GetPKCS7si(obj, p7si) do { \
+    Data_Get_Struct(obj, PKCS7_SIGNER_INFO, p7si); \
+    if (!p7si) { \
+	ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
+    } \
+} while (0)
+#define SafeGetPKCS7si(obj, p7si) do { \
+    OSSL_Check_Kind(obj, cPKCS7Signer); \
+    GetPKCS7si(obj, p7si); \
+} while (0)
+
+#define WrapPKCS7ri(klass, obj, p7ri) do { \
+    if (!p7ri) { \
+	ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, PKCS7_RECIP_INFO_free, p7ri); \
+} while (0)
+#define GetPKCS7ri(obj, p7ri) do { \
+    Data_Get_Struct(obj, PKCS7_RECIP_INFO, p7ri); \
+    if (!p7ri) { \
+	ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
+    } \
+} while (0)
+#define SafeGetPKCS7ri(obj, p7ri) do { \
+    OSSL_Check_Kind(obj, cPKCS7Recipient); \
+    GetPKCS7ri(obj, p7ri); \
+} while (0)
+
+#define numberof(ary) (sizeof(ary)/sizeof(ary[0]))
+
+#define ossl_pkcs7_set_data(o,v)       rb_iv_set((o), "@data", (v))
+#define ossl_pkcs7_get_data(o)         rb_iv_get((o), "@data")
+#define ossl_pkcs7_set_err_string(o,v) rb_iv_set((o), "@error_string", (v))
+#define ossl_pkcs7_get_err_string(o)   rb_iv_get((o), "@error_string")
+
+/* 
+ * Classes
+ */
+VALUE mPKCS7;
+VALUE cPKCS7;
+VALUE cPKCS7Signer;
+VALUE cPKCS7Recipient;
+VALUE ePKCS7Error;
+
+/*
+ * Public
+ * (MADE PRIVATE UNTIL SOMEBODY WILL NEED THEM)
+ */
+static VALUE
+ossl_pkcs7si_new(PKCS7_SIGNER_INFO *p7si)
+{
+    PKCS7_SIGNER_INFO *pkcs7;
+    VALUE obj;
+
+    pkcs7 = p7si ? PKCS7_SIGNER_INFO_dup(p7si) : PKCS7_SIGNER_INFO_new();
+    if (!pkcs7) ossl_raise(ePKCS7Error, NULL);
+    WrapPKCS7si(cPKCS7Signer, obj, pkcs7);
+
+    return obj;
+}
+
+static PKCS7_SIGNER_INFO *
+DupPKCS7SignerPtr(VALUE obj)
+{
+    PKCS7_SIGNER_INFO *p7si, *pkcs7;
+	
+    SafeGetPKCS7si(obj, p7si);
+    if (!(pkcs7 = PKCS7_SIGNER_INFO_dup(p7si))) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+
+    return pkcs7;
+}
+
+static VALUE
+ossl_pkcs7ri_new(PKCS7_RECIP_INFO *p7ri)
+{
+    PKCS7_RECIP_INFO *pkcs7;
+    VALUE obj;
+
+    pkcs7 = p7ri ? PKCS7_RECIP_INFO_dup(p7ri) : PKCS7_RECIP_INFO_new();
+    if (!pkcs7) ossl_raise(ePKCS7Error, NULL);
+    WrapPKCS7ri(cPKCS7Recipient, obj, pkcs7);
+
+    return obj;
+}
+
+static PKCS7_RECIP_INFO *
+DupPKCS7RecipientPtr(VALUE obj)
+{
+    PKCS7_RECIP_INFO *p7ri, *pkcs7;
+	
+    SafeGetPKCS7ri(obj, p7ri);
+    if (!(pkcs7 = PKCS7_RECIP_INFO_dup(p7ri))) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+
+    return pkcs7;
+}
+
+/*
+ * Private
+ */
+static VALUE
+ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg)
+{
+    BIO *in, *out;
+    PKCS7 *pkcs7;
+    VALUE ret, data;
+
+    in = ossl_obj2bio(arg);
+    out = NULL;
+    pkcs7 = SMIME_read_PKCS7(in, &out);
+    BIO_free(in);
+    if(!pkcs7) ossl_raise(ePKCS7Error, NULL);
+    data = out ? ossl_membio2str(out) : Qnil;
+    WrapPKCS7(cPKCS7, ret, pkcs7);
+    ossl_pkcs7_set_data(ret, data);
+    ossl_pkcs7_set_err_string(ret, Qnil);
+
+    return ret;
+}
+
+static VALUE
+ossl_pkcs7_s_write_smime(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE pkcs7, data, flags;
+    BIO *out, *in;
+    PKCS7 *p7;
+    VALUE str;
+    int flg;
+
+    rb_scan_args(argc, argv, "12", &pkcs7, &data, &flags);
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
+    if(NIL_P(data)) data = ossl_pkcs7_get_data(pkcs7);
+    SafeGetPKCS7(pkcs7, p7);
+    if(!NIL_P(data) && PKCS7_is_detached(p7))
+	flg |= PKCS7_DETACHED;
+    in = NIL_P(data) ? NULL : ossl_obj2bio(data);
+    if(!(out = BIO_new(BIO_s_mem()))){
+        BIO_free(in);
+        ossl_raise(ePKCS7Error, NULL);
+    }
+    if(!SMIME_write_PKCS7(out, p7, in, flg)){
+        BIO_free(out);
+        BIO_free(in);
+        ossl_raise(ePKCS7Error, NULL);
+    }
+    BIO_free(in);
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+static VALUE
+ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE cert, key, data, certs, flags;
+    X509 *x509;
+    EVP_PKEY *pkey;
+    BIO *in;
+    STACK_OF(X509) *x509s;
+    int flg, status = 0;
+    PKCS7 *pkcs7;
+    VALUE ret;
+
+    rb_scan_args(argc, argv, "32", &cert, &key, &data, &certs, &flags);
+    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
+    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
+    in = ossl_obj2bio(data);
+    if(NIL_P(certs)) x509s = NULL;
+    else{
+	x509s = ossl_protect_x509_ary2sk(certs, &status);
+	if(status){
+	    BIO_free(in);
+	    rb_jump_tag(status);
+	}
+    }
+    if(!(pkcs7 = PKCS7_sign(x509, pkey, x509s, in, flg))){
+	BIO_free(in);
+	sk_X509_pop_free(x509s, X509_free);
+	ossl_raise(ePKCS7Error, NULL);
+    }
+    WrapPKCS7(cPKCS7, ret, pkcs7);
+    ossl_pkcs7_set_data(ret, data);
+    ossl_pkcs7_set_err_string(ret, Qnil);
+    BIO_free(in);
+    sk_X509_pop_free(x509s, X509_free);
+
+    return ret;
+}
+
+static VALUE
+ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE certs, data, cipher, flags;
+    STACK_OF(X509) *x509s;
+    BIO *in;
+    const EVP_CIPHER *ciph;
+    int flg, status = 0;
+    VALUE ret;
+    PKCS7 *p7;
+
+    rb_scan_args(argc, argv, "22", &certs, &data, &cipher, &flags);
+    if(NIL_P(cipher)){
+#if !defined(OPENSSL_NO_RC2)
+	ciph = EVP_rc2_40_cbc();
+#elif !defined(OPENSSL_NO_DES)
+	ciph = EVP_des_ede3_cbc();
+#elif !defined(OPENSSL_NO_RC2)
+	ciph = EVP_rc2_40_cbc();
+#elif !defined(OPENSSL_NO_AES)
+	ciph = EVP_EVP_aes_128_cbc();
+#else
+	ossl_raise(ePKCS7Error, "Must specify cipher");
+#endif
+
+    }
+    else ciph = GetCipherPtr(cipher); /* NO NEED TO DUP */
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
+    in = ossl_obj2bio(data);
+    x509s = ossl_protect_x509_ary2sk(certs, &status);
+    if(status){
+	BIO_free(in);
+	rb_jump_tag(status);
+    }
+    if(!(p7 = PKCS7_encrypt(x509s, in, (EVP_CIPHER*)ciph, flg))){
+	BIO_free(in);
+	sk_X509_pop_free(x509s, X509_free);
+	ossl_raise(ePKCS7Error, NULL);
+    }
+    BIO_free(in);
+    WrapPKCS7(cPKCS7, ret, p7);
+    ossl_pkcs7_set_data(ret, data);
+    sk_X509_pop_free(x509s, X509_free);
+
+    return ret;
+}
+
+static VALUE
+ossl_pkcs7_alloc(VALUE klass)
+{
+    PKCS7 *pkcs7;
+    VALUE obj;
+
+    if (!(pkcs7 = PKCS7_new())) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+    WrapPKCS7(klass, obj, pkcs7);
+    
+    return obj;
+}
+
+static VALUE
+ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
+{
+    PKCS7 *p7;
+    BIO *in;
+    VALUE arg;
+
+    if(rb_scan_args(argc, argv, "01", &arg) == 0)
+	return self;
+    arg = ossl_to_der_if_possible(arg);
+    in = ossl_obj2bio(arg);
+    p7 = PEM_read_bio_PKCS7(in, (PKCS7 **)&DATA_PTR(self), NULL, NULL);
+    if (!p7) {
+	BIO_reset(in);
+        p7 = d2i_PKCS7_bio(in, (PKCS7 **)&DATA_PTR(self));
+    }
+    BIO_free(in);
+    ossl_pkcs7_set_data(self, Qnil);
+    ossl_pkcs7_set_err_string(self, Qnil);
+
+    return self;
+}
+
+static VALUE
+ossl_pkcs7_copy(VALUE self, VALUE other)
+{
+    PKCS7 *a, *b, *pkcs7;
+
+    rb_check_frozen(self);
+    if (self == other) return self;
+
+    GetPKCS7(self, a);
+    SafeGetPKCS7(other, b);
+
+    pkcs7 = PKCS7_dup(b);
+    if (!pkcs7) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+    DATA_PTR(self) = pkcs7;
+    PKCS7_free(a);
+
+    return self;
+}
+
+static int
+ossl_pkcs7_sym2typeid(VALUE sym)
+{
+    int i, ret = Qnil;
+    char *s;
+
+    static struct {
+        const char *name;
+        int nid;
+    } p7_type_tab[] = {
+        { "signed",             NID_pkcs7_signed },
+        { "data",               NID_pkcs7_data },
+        { "signedAndEnveloped", NID_pkcs7_signedAndEnveloped },
+        { "enveloped",          NID_pkcs7_enveloped },
+        { "encrypted",          NID_pkcs7_encrypted },
+        { "digest",             NID_pkcs7_digest },
+        { NULL,                 0 },
+    };
+
+    if(TYPE(sym) == T_SYMBOL) s = rb_id2name(SYM2ID(sym));
+    else s = StringValuePtr(sym);
+    for(i = 0; i < numberof(p7_type_tab); i++){
+	if(p7_type_tab[i].name == NULL)
+	    ossl_raise(ePKCS7Error, "unknown type \"%s\"", s);
+	if(strcmp(p7_type_tab[i].name, s) == 0){
+	    ret = p7_type_tab[i].nid;
+	    break;
+	}
+    }
+
+    return ret;
+}
+
+static VALUE
+ossl_pkcs7_set_type(VALUE self, VALUE type)
+{
+    PKCS7 *p7;
+
+    GetPKCS7(self, p7);
+    if(!PKCS7_set_type(p7, ossl_pkcs7_sym2typeid(type)))
+	ossl_raise(ePKCS7Error, NULL);
+
+    return type;
+}
+
+static VALUE
+ossl_pkcs7_get_type(VALUE self)
+{
+    PKCS7 *p7;
+
+    GetPKCS7(self, p7);
+    if(PKCS7_type_is_signed(p7))
+	return ID2SYM(rb_intern("signed"));
+    if(PKCS7_type_is_encrypted(p7))
+	return ID2SYM(rb_intern("encrypted"));
+    if(PKCS7_type_is_enveloped(p7))
+	return ID2SYM(rb_intern("enveloped"));
+    if(PKCS7_type_is_signedAndEnveloped(p7))
+	return ID2SYM(rb_intern("signedAndEnveloped"));
+    if(PKCS7_type_is_data(p7))
+	return ID2SYM(rb_intern("data"));
+    return Qnil;
+}
+
+static VALUE
+ossl_pkcs7_set_detached(VALUE self, VALUE flag)
+{
+    PKCS7 *p7;
+
+    GetPKCS7(self, p7);
+    if(flag != Qtrue && flag != Qfalse)
+	ossl_raise(ePKCS7Error, "must specify a boolean");
+    if(!PKCS7_set_detached(p7, flag == Qtrue ? 1 : 0))
+	ossl_raise(ePKCS7Error, NULL);
+
+    return flag;
+}
+
+static VALUE
+ossl_pkcs7_get_detached(VALUE self)
+{
+    PKCS7 *p7;
+    GetPKCS7(self, p7);
+    return PKCS7_get_detached(p7) ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_pkcs7_detached_p(VALUE self)
+{
+    PKCS7 *p7;
+    GetPKCS7(self, p7);
+    return PKCS7_is_detached(p7) ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_pkcs7_set_cipher(VALUE self, VALUE cipher)
+{
+    PKCS7 *pkcs7;
+
+    GetPKCS7(self, pkcs7);
+    if (!PKCS7_set_cipher(pkcs7, GetCipherPtr(cipher))) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+
+    return cipher;
+}
+
+static VALUE
+ossl_pkcs7_add_signer(VALUE self, VALUE signer)
+{
+    PKCS7 *pkcs7;
+    PKCS7_SIGNER_INFO *p7si;
+
+    p7si = DupPKCS7SignerPtr(signer); /* NEED TO DUP */
+    GetPKCS7(self, pkcs7);
+    if (!PKCS7_add_signer(pkcs7, p7si)) {
+	PKCS7_SIGNER_INFO_free(p7si);
+	ossl_raise(ePKCS7Error, "Could not add signer.");
+    }
+    if (PKCS7_type_is_signed(pkcs7)){
+	PKCS7_add_signed_attribute(p7si, NID_pkcs9_contentType,
+				   V_ASN1_OBJECT, OBJ_nid2obj(NID_pkcs7_data));
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_pkcs7_get_signer(VALUE self)
+{
+    PKCS7 *pkcs7;
+    STACK_OF(PKCS7_SIGNER_INFO) *sk;
+    PKCS7_SIGNER_INFO *si;
+    int num, i;
+    VALUE ary;
+    
+    GetPKCS7(self, pkcs7);
+    if (!(sk = PKCS7_get_signer_info(pkcs7))) {
+	OSSL_Debug("OpenSSL::PKCS7#get_signer_info == NULL!");
+	return rb_ary_new();
+    }
+    if ((num = sk_PKCS7_SIGNER_INFO_num(sk)) < 0) {
+	ossl_raise(ePKCS7Error, "Negative number of signers!");
+    }
+    ary = rb_ary_new2(num);
+    for (i=0; i<num; i++) {
+	si = sk_PKCS7_SIGNER_INFO_value(sk, i);
+	rb_ary_push(ary, ossl_pkcs7si_new(si));
+    }
+
+    return ary;
+}
+
+static VALUE
+ossl_pkcs7_add_recipient(VALUE self, VALUE recip)
+{
+    PKCS7 *pkcs7;
+    PKCS7_RECIP_INFO *ri;
+
+    ri = DupPKCS7RecipientPtr(recip); /* NEED TO DUP */
+    GetPKCS7(self, pkcs7);
+    if (!PKCS7_add_recipient_info(pkcs7, ri)) {
+	PKCS7_RECIP_INFO_free(ri);
+	ossl_raise(ePKCS7Error, "Could not add recipient.");
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_pkcs7_get_recipient(VALUE self)
+{
+    PKCS7 *pkcs7;
+    STACK_OF(PKCS7_RECIP_INFO) *sk;
+    PKCS7_RECIP_INFO *si;
+    int num, i;
+    VALUE ary;
+    
+    GetPKCS7(self, pkcs7);
+    if (PKCS7_type_is_enveloped(pkcs7))
+	sk = pkcs7->d.enveloped->recipientinfo;
+    else if (PKCS7_type_is_signedAndEnveloped(pkcs7))
+	sk = pkcs7->d.signed_and_enveloped->recipientinfo;
+    else sk = NULL;
+    if (!sk) return rb_ary_new();
+    if ((num = sk_PKCS7_RECIP_INFO_num(sk)) < 0) {
+	ossl_raise(ePKCS7Error, "Negative number of recipient!");
+    }
+    ary = rb_ary_new2(num);
+    for (i=0; i<num; i++) {
+	si = sk_PKCS7_RECIP_INFO_value(sk, i);
+	rb_ary_push(ary, ossl_pkcs7ri_new(si));
+    }
+
+    return ary;
+}
+
+static VALUE
+ossl_pkcs7_add_certificate(VALUE self, VALUE cert)
+{
+    PKCS7 *pkcs7;
+    X509 *x509;
+
+    GetPKCS7(self, pkcs7);
+    x509 = GetX509CertPtr(cert);  /* NO NEED TO DUP */
+    if (!PKCS7_add_certificate(pkcs7, x509)){
+	ossl_raise(ePKCS7Error, NULL);
+    }
+
+    return self;
+}
+
+static STACK *
+pkcs7_get_certs_or_crls(VALUE self, int want_certs)
+{
+    PKCS7 *pkcs7;
+    STACK_OF(X509) *certs;
+    STACK_OF(X509_CRL) *crls;
+    int i;
+
+    GetPKCS7(self, pkcs7);
+    i = OBJ_obj2nid(pkcs7->type);
+    switch(i){
+    case NID_pkcs7_signed:
+        certs = pkcs7->d.sign->cert;
+        crls = pkcs7->d.sign->crl;
+        break;
+    case NID_pkcs7_signedAndEnveloped:
+        certs = pkcs7->d.signed_and_enveloped->cert;
+        crls = pkcs7->d.signed_and_enveloped->crl;
+        break;
+    default:
+        certs = crls = NULL;
+    }
+
+    return want_certs ? certs : crls;
+}
+
+static VALUE
+ossl_pkcs7_set_certs_i(VALUE i, VALUE arg)
+{
+    return ossl_pkcs7_add_certificate(arg, i);
+}
+
+static VALUE
+ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
+{
+    STACK_OF(X509) *certs;
+    X509 *cert;
+
+    certs = pkcs7_get_certs_or_crls(self, 1);
+    while((cert = sk_X509_pop(certs))) X509_free(cert);
+    rb_iterate(rb_each, ary, ossl_pkcs7_set_certs_i, self);
+
+    return ary;
+}
+
+static VALUE
+ossl_pkcs7_get_certificates(VALUE self)
+{
+    return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1));
+}
+
+static VALUE
+ossl_pkcs7_add_crl(VALUE self, VALUE crl)
+{
+    PKCS7 *pkcs7;
+    X509_CRL *x509crl;
+
+    GetPKCS7(self, pkcs7); /* NO DUP needed! */
+    x509crl = GetX509CRLPtr(crl);
+    if (!PKCS7_add_crl(pkcs7, x509crl)) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_pkcs7_set_crls_i(VALUE i, VALUE arg)
+{
+    return ossl_pkcs7_add_crl(arg, i);
+}
+
+static VALUE
+ossl_pkcs7_set_crls(VALUE self, VALUE ary)
+{
+    STACK_OF(X509_CRL) *crls;
+    X509_CRL *crl;
+
+    crls = pkcs7_get_certs_or_crls(self, 0);
+    while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl);
+    rb_iterate(rb_each, ary, ossl_pkcs7_set_crls_i, self);
+
+    return ary;
+}
+
+static VALUE
+ossl_pkcs7_get_crls(VALUE self)
+{
+    return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0));
+}
+
+static VALUE
+ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
+{
+    VALUE certs, store, indata, flags;
+    STACK_OF(X509) *x509s;
+    X509_STORE *x509st;
+    int flg, ok, status = 0;
+    BIO *in, *out;
+    PKCS7 *p7;
+    VALUE data;
+    const char *msg;
+
+    rb_scan_args(argc, argv, "22", &certs, &store, &indata, &flags);
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
+    if(NIL_P(indata)) indata = ossl_pkcs7_get_data(self);
+    in = NIL_P(indata) ? NULL : ossl_obj2bio(indata);
+    if(NIL_P(certs)) x509s = NULL;
+    else{
+	x509s = ossl_protect_x509_ary2sk(certs, &status);
+	if(status){
+	    BIO_free(in);
+	    rb_jump_tag(status);
+	}
+    }
+    x509st = GetX509StorePtr(store);
+    GetPKCS7(self, p7);
+    if(!(out = BIO_new(BIO_s_mem()))){
+	BIO_free(in);
+	sk_X509_pop_free(x509s, X509_free);
+	ossl_raise(ePKCS7Error, NULL);
+    }
+    ok = PKCS7_verify(p7, x509s, x509st, in, out, flg);
+    BIO_free(in);
+    if (ok < 0) ossl_raise(ePKCS7Error, NULL);
+    msg = ERR_reason_error_string(ERR_get_error());
+    ossl_pkcs7_set_err_string(self, msg ? rb_str_new2(msg) : Qnil);
+    ERR_clear_error();
+    data = ossl_membio2str(out);
+    ossl_pkcs7_set_data(self, data);
+    sk_X509_pop_free(x509s, X509_free);
+
+    return (ok == 1) ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_pkcs7_decrypt(int argc, VALUE *argv, VALUE self)
+{
+    VALUE pkey, cert, flags;
+    EVP_PKEY *key;
+    X509 *x509;
+    int flg;
+    PKCS7 *p7;
+    BIO *out;
+    VALUE str;
+
+    rb_scan_args(argc, argv, "21", &pkey, &cert, &flags);
+    key = GetPrivPKeyPtr(pkey); /* NO NEED TO DUP */
+    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
+    GetPKCS7(self, p7);
+    if(!(out = BIO_new(BIO_s_mem())))
+	ossl_raise(ePKCS7Error, NULL);
+    if(!PKCS7_decrypt(p7, key, x509, out, flg)){
+	BIO_free(out);
+	ossl_raise(ePKCS7Error, NULL);
+    }
+    str = ossl_membio2str(out); /* out will be free */
+
+    return str;
+}
+
+static VALUE
+ossl_pkcs7_add_data(VALUE self, VALUE data)
+{
+    PKCS7 *pkcs7;
+    BIO *out, *in;
+    char buf[4096];
+    int len;
+
+    in = ossl_obj2bio(data);
+    GetPKCS7(self, pkcs7);
+    if(PKCS7_type_is_signed(pkcs7)){
+	if(!PKCS7_content_new(pkcs7, NID_pkcs7_data))
+	    ossl_raise(ePKCS7Error, NULL);
+    }
+    if(!(out = PKCS7_dataInit(pkcs7, NULL))) goto err;
+    for(;;){
+	if((len = BIO_read(in, buf, sizeof(buf))) <= 0)
+	    break;
+	if(BIO_write(out, buf, len) != len)
+	    goto err;
+    }
+    if(!PKCS7_dataFinal(pkcs7, out)) goto err;
+    ossl_pkcs7_set_data(self, Qnil);
+    
+ err:
+    BIO_free(out);
+    BIO_free(in);
+    if(ERR_peek_error()){
+	ossl_raise(ePKCS7Error, NULL);
+    }
+
+    return data;
+}
+
+static VALUE
+ossl_pkcs7_to_der(VALUE self)
+{
+    PKCS7 *pkcs7;
+    VALUE str;
+    long len;
+    unsigned char *p;
+
+    GetPKCS7(self, pkcs7);
+    if((len = i2d_PKCS7(pkcs7, NULL)) <= 0)
+	ossl_raise(ePKCS7Error, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if(i2d_PKCS7(pkcs7, &p) <= 0)
+	ossl_raise(ePKCS7Error, NULL);
+    ossl_str_adjust(str, p);
+
+    return str;
+}
+
+static VALUE
+ossl_pkcs7_to_pem(VALUE self)
+{
+    PKCS7 *pkcs7;
+    BIO *out;
+    VALUE str;
+	
+    GetPKCS7(self, pkcs7);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+    if (!PEM_write_bio_PKCS7(out, pkcs7)) {
+	BIO_free(out);
+	ossl_raise(ePKCS7Error, NULL);
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+/*
+ * SIGNER INFO
+ */
+static VALUE
+ossl_pkcs7si_alloc(VALUE klass)
+{
+    PKCS7_SIGNER_INFO *p7si;
+    VALUE obj;
+
+    if (!(p7si = PKCS7_SIGNER_INFO_new())) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+    WrapPKCS7si(klass, obj, p7si);
+
+    return obj;
+}
+
+static VALUE
+ossl_pkcs7si_initialize(VALUE self, VALUE cert, VALUE key, VALUE digest)
+{
+    PKCS7_SIGNER_INFO *p7si;
+    EVP_PKEY *pkey;
+    X509 *x509;
+    const EVP_MD *md;
+
+    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
+    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
+    md = GetDigestPtr(digest);
+    GetPKCS7si(self, p7si);
+    if (!(PKCS7_SIGNER_INFO_set(p7si, x509, pkey, (EVP_MD*)md))) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_pkcs7si_get_issuer(VALUE self)
+{
+    PKCS7_SIGNER_INFO *p7si;
+
+    GetPKCS7si(self, p7si);
+
+    return ossl_x509name_new(p7si->issuer_and_serial->issuer);
+}
+
+static VALUE
+ossl_pkcs7si_get_serial(VALUE self)
+{
+    PKCS7_SIGNER_INFO *p7si;
+
+    GetPKCS7si(self, p7si);
+
+    return asn1integer_to_num(p7si->issuer_and_serial->serial);
+}
+
+static VALUE
+ossl_pkcs7si_get_signed_time(VALUE self)
+{
+    PKCS7_SIGNER_INFO *p7si;
+    ASN1_TYPE *asn1obj;
+	
+    GetPKCS7si(self, p7si);
+	
+    if (!(asn1obj = PKCS7_get_signed_attribute(p7si, NID_pkcs9_signingTime))) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+    if (asn1obj->type == V_ASN1_UTCTIME) {
+	return asn1time_to_time(asn1obj->value.utctime);
+    }
+    /*
+     * OR
+     * ossl_raise(ePKCS7Error, "...");
+     * ?
+     */
+
+    return Qnil;
+}
+
+/*
+ * RECIPIENT INFO
+ */
+static VALUE
+ossl_pkcs7ri_alloc(VALUE klass)
+{
+    PKCS7_RECIP_INFO *p7ri;
+    VALUE obj;
+
+    if (!(p7ri = PKCS7_RECIP_INFO_new())) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+    WrapPKCS7ri(klass, obj, p7ri);
+
+    return obj;
+}
+
+static VALUE
+ossl_pkcs7ri_initialize(VALUE self, VALUE cert)
+{
+    PKCS7_RECIP_INFO *p7ri;
+    X509 *x509;
+
+    x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
+    GetPKCS7ri(self, p7ri);
+    if (!PKCS7_RECIP_INFO_set(p7ri, x509)) {
+	ossl_raise(ePKCS7Error, NULL);
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_pkcs7ri_get_issuer(VALUE self)
+{
+    PKCS7_RECIP_INFO *p7ri;
+
+    GetPKCS7ri(self, p7ri);
+
+    return ossl_x509name_new(p7ri->issuer_and_serial->issuer);
+}
+
+static VALUE
+ossl_pkcs7ri_get_serial(VALUE self)
+{
+    PKCS7_RECIP_INFO *p7ri;
+
+    GetPKCS7ri(self, p7ri);
+
+    return asn1integer_to_num(p7ri->issuer_and_serial->serial);
+}
+
+static VALUE
+ossl_pkcs7ri_get_enc_key(VALUE self)
+{
+    PKCS7_RECIP_INFO *p7ri;
+
+    GetPKCS7ri(self, p7ri);
+
+    return asn1str_to_str(p7ri->enc_key);
+}
+
+/*
+ * INIT
+ */
+void
+Init_ossl_pkcs7()
+{
+    mPKCS7 = rb_define_module_under(mOSSL, "PKCS7");
+
+    ePKCS7Error = rb_define_class_under(mPKCS7, "PKCS7Error", eOSSLError);
+
+    cPKCS7 = rb_define_class_under(mPKCS7, "PKCS7", rb_cObject);
+    rb_define_singleton_method(mPKCS7, "read_smime", ossl_pkcs7_s_read_smime, 1);
+    rb_define_singleton_method(mPKCS7, "write_smime", ossl_pkcs7_s_write_smime, -1);
+    rb_define_singleton_method(mPKCS7, "sign",  ossl_pkcs7_s_sign, -1);
+    rb_define_singleton_method(mPKCS7, "encrypt", ossl_pkcs7_s_encrypt, -1);
+    rb_attr(cPKCS7, rb_intern("data"), 1, 0, Qfalse);
+    rb_attr(cPKCS7, rb_intern("error_string"), 1, 1, Qfalse);
+    rb_define_alloc_func(cPKCS7, ossl_pkcs7_alloc);
+    rb_define_copy_func(cPKCS7, ossl_pkcs7_copy);
+    rb_define_method(cPKCS7, "initialize", ossl_pkcs7_initialize, -1);
+    rb_define_method(cPKCS7, "type=", ossl_pkcs7_set_type, 1);
+    rb_define_method(cPKCS7, "type", ossl_pkcs7_get_type, 0);
+    rb_define_method(cPKCS7, "detached=", ossl_pkcs7_set_detached, 1);
+    rb_define_method(cPKCS7, "detached", ossl_pkcs7_get_detached, 0);
+    rb_define_method(cPKCS7, "detached?", ossl_pkcs7_detached_p, 0);
+    rb_define_method(cPKCS7, "cipher=", ossl_pkcs7_set_cipher, 1);
+    rb_define_method(cPKCS7, "add_signer", ossl_pkcs7_add_signer, 1);
+    rb_define_method(cPKCS7, "signers", ossl_pkcs7_get_signer, 0);
+    rb_define_method(cPKCS7, "add_recipient", ossl_pkcs7_add_recipient, 1);
+    rb_define_method(cPKCS7, "recipients", ossl_pkcs7_get_recipient, 0);
+    rb_define_method(cPKCS7, "add_certificate", ossl_pkcs7_add_certificate, 1);
+    rb_define_method(cPKCS7, "certificates=", ossl_pkcs7_set_certificates, 1);
+    rb_define_method(cPKCS7, "certificates", ossl_pkcs7_get_certificates, 0);
+    rb_define_method(cPKCS7, "add_crl", ossl_pkcs7_add_crl, 1);
+    rb_define_method(cPKCS7, "crls=", ossl_pkcs7_set_crls, 1);
+    rb_define_method(cPKCS7, "crls", ossl_pkcs7_get_crls, 0);
+    rb_define_method(cPKCS7, "add_data", ossl_pkcs7_add_data, 1);
+    rb_define_alias(cPKCS7,  "data=", "add_data");
+    rb_define_method(cPKCS7, "verify", ossl_pkcs7_verify, -1);
+    rb_define_method(cPKCS7, "decrypt", ossl_pkcs7_decrypt, -1);
+    rb_define_method(cPKCS7, "to_pem", ossl_pkcs7_to_pem, 0);
+    rb_define_alias(cPKCS7,  "to_s", "to_pem");
+    rb_define_method(cPKCS7, "to_der", ossl_pkcs7_to_der, 0);
+
+    cPKCS7Signer = rb_define_class_under(mPKCS7, "SignerInfo", rb_cObject);
+    rb_define_const(mPKCS7, "Signer", cPKCS7Signer);
+    rb_define_alloc_func(cPKCS7Signer, ossl_pkcs7si_alloc);
+    rb_define_method(cPKCS7Signer, "initialize", ossl_pkcs7si_initialize,3);
+    rb_define_method(cPKCS7Signer, "issuer", ossl_pkcs7si_get_issuer, 0);
+    rb_define_alias(cPKCS7Signer, "name", "issuer");
+    rb_define_method(cPKCS7Signer, "serial", ossl_pkcs7si_get_serial,0);
+    rb_define_method(cPKCS7Signer,"signed_time",ossl_pkcs7si_get_signed_time,0);
+
+    cPKCS7Recipient = rb_define_class_under(mPKCS7,"RecipientInfo",rb_cObject);
+    rb_define_alloc_func(cPKCS7Recipient, ossl_pkcs7ri_alloc);
+    rb_define_method(cPKCS7Recipient, "initialize", ossl_pkcs7ri_initialize,1); 
+    rb_define_method(cPKCS7Recipient, "issuer", ossl_pkcs7ri_get_issuer,0);
+    rb_define_method(cPKCS7Recipient, "serial", ossl_pkcs7ri_get_serial,0);
+    rb_define_method(cPKCS7Recipient, "enc_key", ossl_pkcs7ri_get_enc_key,0); 
+
+#define DefPKCS7Const(x) rb_define_const(mPKCS7, #x, INT2NUM(PKCS7_##x))
+
+    DefPKCS7Const(TEXT);
+    DefPKCS7Const(NOCERTS);
+    DefPKCS7Const(NOSIGS);
+    DefPKCS7Const(NOCHAIN);
+    DefPKCS7Const(NOINTERN);
+    DefPKCS7Const(NOVERIFY);
+    DefPKCS7Const(DETACHED);
+    DefPKCS7Const(BINARY);
+    DefPKCS7Const(NOATTR);
+    DefPKCS7Const(NOSMIMECAP);
+}
diff --git a/ruby_1_8_6/ext/openssl/ossl_pkcs7.h b/ruby_1_8_6/ext/openssl/ossl_pkcs7.h
new file mode 100644
index 0000000000..f5942d65db
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_pkcs7.h
@@ -0,0 +1,23 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_PKCS7_H_)
+#define _OSSL_PKCS7_H_
+
+extern VALUE mPKCS7;
+extern VALUE cPKCS7;
+extern VALUE cPKCS7Signer;
+extern VALUE cPKCS7Recipient;
+extern VALUE ePKCS7Error;
+
+void Init_ossl_pkcs7(void);
+
+#endif /* _OSSL_PKCS7_H_ */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_pkey.c b/ruby_1_8_6/ext/openssl/ossl_pkey.c
new file mode 100644
index 0000000000..d54f5b938e
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_pkey.c
@@ -0,0 +1,236 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+/*
+ * Classes
+ */
+VALUE mPKey;
+VALUE cPKey;
+VALUE ePKeyError;
+ID id_private_q;
+
+/*
+ * callback for generating keys
+ */
+void
+ossl_generate_cb(int p, int n, void *arg)
+{
+    VALUE ary;
+
+    ary = rb_ary_new2(2);
+    rb_ary_store(ary, 0, INT2NUM(p));
+    rb_ary_store(ary, 1, INT2NUM(n));
+
+    rb_yield(ary);
+}
+
+/*
+ * Public
+ */
+VALUE
+ossl_pkey_new(EVP_PKEY *pkey)
+{
+    if (!pkey) {
+	ossl_raise(ePKeyError, "Cannot make new key from NULL.");
+    }
+    switch (EVP_PKEY_type(pkey->type)) {
+#if !defined(OPENSSL_NO_RSA)
+    case EVP_PKEY_RSA:
+	return ossl_rsa_new(pkey);
+#endif
+#if !defined(OPENSSL_NO_DSA)
+    case EVP_PKEY_DSA:
+	return ossl_dsa_new(pkey);
+#endif
+#if !defined(OPENSSL_NO_DH)
+    case EVP_PKEY_DH:
+	return ossl_dh_new(pkey);
+#endif
+    default:
+	ossl_raise(ePKeyError, "unsupported key type");
+    }
+    return Qnil; /* not reached */
+}
+
+VALUE
+ossl_pkey_new_from_file(VALUE filename)
+{
+    FILE *fp;
+    EVP_PKEY *pkey;
+
+    SafeStringValue(filename);
+    if (!(fp = fopen(RSTRING(filename)->ptr, "r"))) {
+	ossl_raise(ePKeyError, "%s", strerror(errno));
+    }
+
+    pkey = PEM_read_PrivateKey(fp, NULL, ossl_pem_passwd_cb, NULL);
+    fclose(fp);
+    if (!pkey) {
+	ossl_raise(ePKeyError, NULL);
+    }
+
+    return ossl_pkey_new(pkey);
+}
+
+EVP_PKEY *
+GetPKeyPtr(VALUE obj)
+{
+    EVP_PKEY *pkey;
+
+    SafeGetPKey(obj, pkey);
+
+    return pkey;
+}
+
+EVP_PKEY *
+GetPrivPKeyPtr(VALUE obj)
+{
+    EVP_PKEY *pkey;
+	
+    if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) {
+	ossl_raise(rb_eArgError, "Private key is needed.");
+    }
+    SafeGetPKey(obj, pkey);
+
+    return pkey;
+}
+
+EVP_PKEY *
+DupPKeyPtr(VALUE obj)
+{
+    EVP_PKEY *pkey;
+
+    SafeGetPKey(obj, pkey);
+    CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
+
+    return pkey;
+}
+
+EVP_PKEY *
+DupPrivPKeyPtr(VALUE obj)
+{
+    EVP_PKEY *pkey;
+	
+    if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) {
+	ossl_raise(rb_eArgError, "Private key is needed.");
+    }
+    SafeGetPKey(obj, pkey);
+    CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
+
+    return pkey;
+}
+
+/*
+ * Private
+ */
+static VALUE
+ossl_pkey_alloc(VALUE klass)
+{
+    EVP_PKEY *pkey;
+    VALUE obj;
+
+    if (!(pkey = EVP_PKEY_new())) {
+	ossl_raise(ePKeyError, NULL);
+    }
+    WrapPKey(klass, obj, pkey);
+
+    return obj;
+}
+
+static VALUE
+ossl_pkey_initialize(VALUE self)
+{
+    if (rb_obj_is_instance_of(self, cPKey)) {
+	ossl_raise(rb_eNotImpError, "OpenSSL::PKey::PKey is an abstract class.");
+    }
+    return self;
+}
+
+static VALUE
+ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
+{
+    EVP_PKEY *pkey;
+    EVP_MD_CTX ctx;
+    int buf_len;
+    VALUE str;
+
+    if (rb_funcall(self, id_private_q, 0, NULL) != Qtrue) {
+	ossl_raise(rb_eArgError, "Private key is needed.");
+    }
+    GetPKey(self, pkey);
+    EVP_SignInit(&ctx, GetDigestPtr(digest));
+    StringValue(data);
+    EVP_SignUpdate(&ctx, RSTRING(data)->ptr, RSTRING(data)->len);
+    str = rb_str_new(0, EVP_PKEY_size(pkey)+16);
+    if (!EVP_SignFinal(&ctx, RSTRING(str)->ptr, &buf_len, pkey))
+	ossl_raise(ePKeyError, NULL);
+    assert(buf_len <= RSTRING(str)->len);
+    RSTRING(str)->len = buf_len;
+    RSTRING(str)->ptr[buf_len] = 0;
+
+    return str;
+}
+
+static VALUE
+ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
+{
+    EVP_PKEY *pkey;
+    EVP_MD_CTX ctx;
+
+    GetPKey(self, pkey);
+    EVP_VerifyInit(&ctx, GetDigestPtr(digest));
+    StringValue(sig);
+    StringValue(data);
+    EVP_VerifyUpdate(&ctx, RSTRING(data)->ptr, RSTRING(data)->len);
+    switch (EVP_VerifyFinal(&ctx, RSTRING(sig)->ptr, RSTRING(sig)->len, pkey)) {
+    case 0:
+	return Qfalse;
+    case 1:
+	return Qtrue;
+    default:
+	ossl_raise(ePKeyError, NULL);
+    }
+    return Qnil; /* dummy */
+}
+
+/*
+ * INIT
+ */
+void
+Init_ossl_pkey()
+{
+#if 0 /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+#endif
+        
+    mPKey = rb_define_module_under(mOSSL, "PKey");
+	
+    ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
+
+    cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
+	
+    rb_define_alloc_func(cPKey, ossl_pkey_alloc);
+    rb_define_method(cPKey, "initialize", ossl_pkey_initialize, 0);
+
+    rb_define_method(cPKey, "sign", ossl_pkey_sign, 2);
+    rb_define_method(cPKey, "verify", ossl_pkey_verify, 3);
+	
+    id_private_q = rb_intern("private?");
+	
+    /*
+     * INIT rsa, dsa
+     */
+    Init_ossl_rsa();
+    Init_ossl_dsa();
+    Init_ossl_dh();
+}
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_pkey.h b/ruby_1_8_6/ext/openssl/ossl_pkey.h
new file mode 100644
index 0000000000..880a104675
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_pkey.h
@@ -0,0 +1,120 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_PKEY_H_)
+#define _OSSL_PKEY_H_
+
+extern VALUE mPKey;
+extern VALUE cPKey;
+extern VALUE ePKeyError;
+extern ID id_private_q;
+
+#define OSSL_PKEY_SET_PRIVATE(obj) rb_iv_set((obj), "private", Qtrue)
+#define OSSL_PKEY_SET_PUBLIC(obj)  rb_iv_set((obj), "private", Qfalse)
+#define OSSL_PKEY_IS_PRIVATE(obj)  (rb_iv_get((obj), "private") == Qtrue)
+
+#define WrapPKey(klass, obj, pkey) do { \
+    if (!pkey) { \
+	rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!"); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, EVP_PKEY_free, pkey); \
+    OSSL_PKEY_SET_PUBLIC(obj); \
+} while (0)
+#define GetPKey(obj, pkey) do {\
+    Data_Get_Struct(obj, EVP_PKEY, pkey);\
+    if (!pkey) { \
+	rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!");\
+    } \
+} while (0)
+#define SafeGetPKey(obj, pkey) do { \
+    OSSL_Check_Kind(obj, cPKey); \
+    GetPKey(obj, pkey); \
+} while (0)
+
+void ossl_generate_cb(int, int, void *);
+
+VALUE ossl_pkey_new(EVP_PKEY *);
+VALUE ossl_pkey_new_from_file(VALUE);
+EVP_PKEY *GetPKeyPtr(VALUE);
+EVP_PKEY *DupPKeyPtr(VALUE);
+EVP_PKEY *GetPrivPKeyPtr(VALUE);
+EVP_PKEY *DupPrivPKeyPtr(VALUE);
+void Init_ossl_pkey(void);
+
+/*
+ * RSA
+ */
+extern VALUE cRSA;
+extern VALUE eRSAError;
+
+VALUE ossl_rsa_new(EVP_PKEY *);
+void Init_ossl_rsa(void);
+
+/*
+ * DSA
+ */
+extern VALUE cDSA;
+extern VALUE eDSAError;
+
+VALUE ossl_dsa_new(EVP_PKEY *);
+void Init_ossl_dsa(void);
+
+/*
+ * DH
+ */
+extern VALUE cDH;
+extern VALUE eDHError;
+extern DH *OSSL_DEFAULT_DH_512;
+extern DH *OSSL_DEFAULT_DH_1024;
+
+VALUE ossl_dh_new(EVP_PKEY *);
+void Init_ossl_dh(void);
+
+#define OSSL_PKEY_BN(keytype, name)					\
+static VALUE ossl_##keytype##_get_##name(VALUE self)			\
+{									\
+	EVP_PKEY *pkey;							\
+	BIGNUM *bn;							\
+									\
+	GetPKey(self, pkey);						\
+	bn = pkey->pkey.keytype->name;					\
+	if (bn == NULL)							\
+		return Qnil;						\
+	return ossl_bn_new(bn);						\
+}									\
+static VALUE ossl_##keytype##_set_##name(VALUE self, VALUE bignum)	\
+{									\
+	EVP_PKEY *pkey;							\
+	BIGNUM *bn;							\
+									\
+	GetPKey(self, pkey);						\
+	if (NIL_P(bignum)) {						\
+		BN_clear_free(pkey->pkey.keytype->name);		\
+		pkey->pkey.keytype->name = NULL;			\
+		return Qnil;						\
+	}								\
+									\
+	bn = GetBNPtr(bignum);						\
+	if (pkey->pkey.keytype->name == NULL)				\
+		pkey->pkey.keytype->name = BN_new();			\
+	if (pkey->pkey.keytype->name == NULL)				\
+		ossl_raise(eBNError, NULL);				\
+	if (BN_copy(pkey->pkey.keytype->name, bn) == NULL)		\
+		ossl_raise(eBNError, NULL);				\
+	return bignum;							\
+}
+
+#define DEF_OSSL_PKEY_BN(class, keytype, name)				\
+do {									\
+	rb_define_method(class, #name, ossl_##keytype##_get_##name, 0);	\
+	rb_define_method(class, #name "=", ossl_##keytype##_set_##name, 1);\
+} while (0)
+
+#endif /* _OSSL_PKEY_H_ */
diff --git a/ruby_1_8_6/ext/openssl/ossl_pkey_dh.c b/ruby_1_8_6/ext/openssl/ossl_pkey_dh.c
new file mode 100644
index 0000000000..e16ede8bba
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_pkey_dh.c
@@ -0,0 +1,463 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(OPENSSL_NO_DH)
+
+#include "ossl.h"
+
+#define GetPKeyDH(obj, pkey) do { \
+    GetPKey(obj, pkey); \
+    if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) { /* PARANOIA? */ \
+	ossl_raise(rb_eRuntimeError, "THIS IS NOT A DH!") ; \
+    } \
+} while (0)
+
+#define DH_HAS_PRIVATE(dh) ((dh)->priv_key)
+
+#ifdef OSSL_ENGINE_ENABLED
+#  define DH_PRIVATE(dh) (DH_HAS_PRIVATE(dh) || (dh)->engine)
+#else
+#  define DH_PRIVATE(dh) DH_HAS_PRIVATE(dh)
+#endif
+
+
+/*
+ * Classes
+ */
+VALUE cDH;
+VALUE eDHError;
+
+/*
+ * Public
+ */
+static VALUE
+dh_instance(VALUE klass, DH *dh)
+{
+    EVP_PKEY *pkey;
+    VALUE obj;
+	
+    if (!dh) {
+	return Qfalse;
+    }
+    if (!(pkey = EVP_PKEY_new())) {
+	return Qfalse;
+    }
+    if (!EVP_PKEY_assign_DH(pkey, dh)) {
+	EVP_PKEY_free(pkey);
+	return Qfalse;
+    }
+    WrapPKey(klass, obj, pkey);
+
+    return obj;
+}
+
+VALUE
+ossl_dh_new(EVP_PKEY *pkey)
+{
+    VALUE obj;
+
+    if (!pkey) {
+	obj = dh_instance(cDH, DH_new());
+    } else {
+	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) {
+	    ossl_raise(rb_eTypeError, "Not a DH key!");
+	}
+	WrapPKey(cDH, obj, pkey);
+    }
+    if (obj == Qfalse) {
+	ossl_raise(eDHError, NULL);
+    }
+
+    return obj;
+}
+
+/*
+ * Private
+ */
+static DH *
+dh_generate(int size, int gen)
+{
+    DH *dh;
+    
+    dh = DH_generate_parameters(size, gen,
+	    rb_block_given_p() ? ossl_generate_cb : NULL,
+	    NULL);
+    if (!dh) return 0;
+
+    if (!DH_generate_key(dh)) {
+	DH_free(dh);
+	return 0;
+    }
+
+    return dh;
+}
+
+static VALUE
+ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
+{
+    DH *dh ;
+    int g = 2;
+    VALUE size, gen, obj;
+	
+    if (rb_scan_args(argc, argv, "11", &size, &gen) == 2) {
+	g = FIX2INT(gen);
+    }
+    dh = dh_generate(FIX2INT(size), g);
+    obj = dh_instance(klass, dh);
+    if (obj == Qfalse) {
+	DH_free(dh);
+	ossl_raise(eDHError, NULL);
+    }
+
+    return obj;
+}
+
+static VALUE
+ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
+{
+    EVP_PKEY *pkey;
+    DH *dh;
+    int g = 2;
+    BIO *in;
+    VALUE arg, gen;
+
+    GetPKey(self, pkey);
+    if(rb_scan_args(argc, argv, "02", &arg, &gen) == 0) {
+      dh = DH_new();
+    }
+    else if (FIXNUM_P(arg)) {
+	if (!NIL_P(gen)) {
+	    g = FIX2INT(gen);
+	}
+	if (!(dh = dh_generate(FIX2INT(arg), g))) {
+	    ossl_raise(eDHError, NULL);
+	}
+    }
+    else {
+	arg = ossl_to_der_if_possible(arg);
+	in = ossl_obj2bio(arg);
+	dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
+	if (!dh){
+	    BIO_reset(in);
+	    dh = d2i_DHparams_bio(in, NULL);
+	}
+	BIO_free(in);
+	if (!dh) ossl_raise(eDHError, NULL);
+    }
+    if (!EVP_PKEY_assign_DH(pkey, dh)) {
+	DH_free(dh);
+	ossl_raise(eDHError, NULL);
+    }
+    return self;
+}
+
+static VALUE
+ossl_dh_is_public(VALUE self)
+{
+    EVP_PKEY *pkey;
+
+    GetPKeyDH(self, pkey);
+    /*
+     * Do we need to check dhp->dh->public_pkey?
+     * return Qtrue;
+     */
+    return (pkey->pkey.dh->pub_key) ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_dh_is_private(VALUE self)
+{
+    EVP_PKEY *pkey;
+
+    GetPKeyDH(self, pkey);
+	
+    return (DH_PRIVATE(pkey->pkey.dh)) ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_dh_export(VALUE self)
+{
+    EVP_PKEY *pkey;
+    BIO *out;
+    VALUE str;
+
+    GetPKeyDH(self, pkey);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eDHError, NULL);
+    }
+    if (!PEM_write_bio_DHparams(out, pkey->pkey.dh)) {
+	BIO_free(out);
+	ossl_raise(eDHError, NULL);
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+static VALUE
+ossl_dh_to_der(VALUE self)
+{       
+    EVP_PKEY *pkey;
+    unsigned char *p;
+    long len;
+    VALUE str;
+
+    GetPKeyDH(self, pkey);
+    if((len = i2d_DHparams(pkey->pkey.dh, NULL)) <= 0)
+	ossl_raise(eDHError, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if(i2d_DHparams(pkey->pkey.dh, &p) < 0)
+	ossl_raise(eDHError, NULL);
+    ossl_str_adjust(str, p);
+
+    return str;
+}
+
+/*
+ * Stores all parameters of key to the hash
+ * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
+ * Don't use :-)) (I's up to you)
+ */
+static VALUE
+ossl_dh_get_params(VALUE self)
+{
+    EVP_PKEY *pkey;
+    VALUE hash;
+
+    GetPKeyDH(self, pkey);
+
+    hash = rb_hash_new();
+
+    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(pkey->pkey.dh->p));
+    rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(pkey->pkey.dh->g));
+    rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pkey->pkey.dh->pub_key));
+    rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(pkey->pkey.dh->priv_key));
+    
+    return hash;
+}
+
+/*
+ * Prints all parameters of key to buffer
+ * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
+ * Don't use :-)) (I's up to you)
+ */
+static VALUE
+ossl_dh_to_text(VALUE self)
+{
+    EVP_PKEY *pkey;
+    BIO *out;
+    VALUE str;
+
+    GetPKeyDH(self, pkey);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eDHError, NULL);
+    }
+    if (!DHparams_print(out, pkey->pkey.dh)) {
+	BIO_free(out);
+	ossl_raise(eDHError, NULL);
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+/*
+ * Makes new instance DH PUBLIC_KEY from PRIVATE_KEY
+ */
+static VALUE
+ossl_dh_to_public_key(VALUE self)
+{
+    EVP_PKEY *pkey;
+    DH *dh;
+    VALUE obj;
+	
+    GetPKeyDH(self, pkey);
+    dh = DHparams_dup(pkey->pkey.dh); /* err check perfomed by dh_instance */
+    obj = dh_instance(CLASS_OF(self), dh);
+    if (obj == Qfalse) {
+	DH_free(dh);
+	ossl_raise(eDHError, NULL);
+    }
+
+    return obj;
+}
+
+static VALUE
+ossl_dh_check_params(VALUE self)
+{
+    DH *dh;
+    EVP_PKEY *pkey;
+    int codes;
+    
+    GetPKeyDH(self, pkey);
+    dh = pkey->pkey.dh;
+
+    if (!DH_check(dh, &codes)) {
+	return Qfalse;
+    }
+
+    return codes == 0 ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_dh_generate_key(VALUE self)
+{
+    DH *dh;
+    EVP_PKEY *pkey;
+
+    GetPKeyDH(self, pkey);
+    dh = pkey->pkey.dh;
+
+    if (!DH_generate_key(dh))
+	ossl_raise(eDHError, "Failed to generate key");
+    return self;
+}
+
+static VALUE
+ossl_dh_compute_key(VALUE self, VALUE pub)
+{
+    DH *dh;
+    EVP_PKEY *pkey;
+    BIGNUM *pub_key;
+    VALUE str;
+    int len;
+
+    GetPKeyDH(self, pkey);
+    dh = pkey->pkey.dh;
+    pub_key = GetBNPtr(pub);
+    len = DH_size(dh);
+    str = rb_str_new(0, len);
+    if ((len = DH_compute_key(RSTRING(str)->ptr, pub_key, dh)) < 0) {
+	ossl_raise(eDHError, NULL);
+    }
+    RSTRING(str)->len = len;
+    RSTRING(str)->ptr[len] = 0;
+
+    return str;
+}
+
+OSSL_PKEY_BN(dh, p);
+OSSL_PKEY_BN(dh, g);
+OSSL_PKEY_BN(dh, pub_key);
+OSSL_PKEY_BN(dh, priv_key);
+
+/*
+ * -----BEGIN DH PARAMETERS-----
+ * MEYCQQD0zXHljRg/mJ9PYLACLv58Cd8VxBxxY7oEuCeURMiTqEhMym16rhhKgZG2
+ * zk2O9uUIBIxSj+NKMURHGaFKyIvLAgEC
+ * -----END DH PARAMETERS-----
+ */
+static unsigned char DEFAULT_DH_512_PRIM[] = {
+    0xf4, 0xcd, 0x71, 0xe5, 0x8d, 0x18, 0x3f, 0x98,
+    0x9f, 0x4f, 0x60, 0xb0, 0x02, 0x2e, 0xfe, 0x7c,
+    0x09, 0xdf, 0x15, 0xc4, 0x1c, 0x71, 0x63, 0xba,
+    0x04, 0xb8, 0x27, 0x94, 0x44, 0xc8, 0x93, 0xa8,
+    0x48, 0x4c, 0xca, 0x6d, 0x7a, 0xae, 0x18, 0x4a,
+    0x81, 0x91, 0xb6, 0xce, 0x4d, 0x8e, 0xf6, 0xe5,
+    0x08, 0x04, 0x8c, 0x52, 0x8f, 0xe3, 0x4a, 0x31,
+    0x44, 0x47, 0x19, 0xa1, 0x4a, 0xc8, 0x8b, 0xcb,
+};
+static unsigned char DEFAULT_DH_512_GEN[] = { 0x02 }; 
+DH *OSSL_DEFAULT_DH_512 = NULL;
+
+/* 
+ * -----BEGIN DH PARAMETERS-----
+ * MIGHAoGBAJ0lOVy0VIr/JebWn0zDwY2h+rqITFOpdNr6ugsgvkDXuucdcChhYExJ
+ * AV/ZD2AWPbrTqV76mGRgJg4EddgT1zG0jq3rnFdMj2XzkBYx3BVvfR0Arnby0RHR
+ * T4h7KZ/2zmjvV+eF8kBUHBJAojUlzxKj4QeO2x20FP9X5xmNUXeDAgEC
+ * -----END DH PARAMETERS-----
+ */
+static unsigned char DEFAULT_DH_1024_PRIM[] = {
+    0x9d, 0x25, 0x39, 0x5c, 0xb4, 0x54, 0x8a, 0xff,
+    0x25, 0xe6, 0xd6, 0x9f, 0x4c, 0xc3, 0xc1, 0x8d,
+    0xa1, 0xfa, 0xba, 0x88, 0x4c, 0x53, 0xa9, 0x74,
+    0xda, 0xfa, 0xba, 0x0b, 0x20, 0xbe, 0x40, 0xd7,
+    0xba, 0xe7, 0x1d, 0x70, 0x28, 0x61, 0x60, 0x4c,
+    0x49, 0x01, 0x5f, 0xd9, 0x0f, 0x60, 0x16, 0x3d,
+    0xba, 0xd3, 0xa9, 0x5e, 0xfa, 0x98, 0x64, 0x60,
+    0x26, 0x0e, 0x04, 0x75, 0xd8, 0x13, 0xd7, 0x31,
+    0xb4, 0x8e, 0xad, 0xeb, 0x9c, 0x57, 0x4c, 0x8f,
+    0x65, 0xf3, 0x90, 0x16, 0x31, 0xdc, 0x15, 0x6f,
+    0x7d, 0x1d, 0x00, 0xae, 0x76, 0xf2, 0xd1, 0x11,
+    0xd1, 0x4f, 0x88, 0x7b, 0x29, 0x9f, 0xf6, 0xce,
+    0x68, 0xef, 0x57, 0xe7, 0x85, 0xf2, 0x40, 0x54,
+    0x1c, 0x12, 0x40, 0xa2, 0x35, 0x25, 0xcf, 0x12,
+    0xa3, 0xe1, 0x07, 0x8e, 0xdb, 0x1d, 0xb4, 0x14,
+    0xff, 0x57, 0xe7, 0x19, 0x8d, 0x51, 0x77, 0x83
+};
+static unsigned char DEFAULT_DH_1024_GEN[] = { 0x02 };
+DH *OSSL_DEFAULT_DH_1024 = NULL;
+
+static DH*
+ossl_create_dh(unsigned char *p, size_t plen, unsigned char *g, size_t glen)
+{
+    DH *dh;
+
+    if ((dh = DH_new()) == NULL) ossl_raise(eDHError, NULL);
+    dh->p = BN_bin2bn(p, plen, NULL);
+    dh->g = BN_bin2bn(g, glen, NULL);
+    if (dh->p == NULL || dh->g == NULL){
+        DH_free(dh);
+        ossl_raise(eDHError, NULL);
+    }
+
+    return dh;
+}
+
+/*
+ * INIT
+ */
+void
+Init_ossl_dh()
+{
+#if 0 /* let rdoc know about mOSSL and mPKey */
+    mOSSL = rb_define_module("OpenSSL");
+    mPKey = rb_define_module_under(mOSSL, "PKey");
+#endif
+
+    eDHError = rb_define_class_under(mPKey, "DHError", ePKeyError);
+    cDH = rb_define_class_under(mPKey, "DH", cPKey);
+    rb_define_singleton_method(cDH, "generate", ossl_dh_s_generate, -1);
+    rb_define_method(cDH, "initialize", ossl_dh_initialize, -1);
+    rb_define_method(cDH, "public?", ossl_dh_is_public, 0);
+    rb_define_method(cDH, "private?", ossl_dh_is_private, 0);
+    rb_define_method(cDH, "to_text", ossl_dh_to_text, 0);
+    rb_define_method(cDH, "export", ossl_dh_export, 0);
+    rb_define_alias(cDH, "to_pem", "export");
+    rb_define_alias(cDH, "to_s", "export");
+    rb_define_method(cDH, "to_der", ossl_dh_to_der, 0);
+    rb_define_method(cDH, "public_key", ossl_dh_to_public_key, 0);
+    rb_define_method(cDH, "params_ok?", ossl_dh_check_params, 0);
+    rb_define_method(cDH, "generate_key!", ossl_dh_generate_key, 0);
+    rb_define_method(cDH, "compute_key", ossl_dh_compute_key, 1);
+    DEF_OSSL_PKEY_BN(cDH, dh, p);
+    DEF_OSSL_PKEY_BN(cDH, dh, g);
+    DEF_OSSL_PKEY_BN(cDH, dh, pub_key);
+    DEF_OSSL_PKEY_BN(cDH, dh, priv_key);
+    rb_define_method(cDH, "params", ossl_dh_get_params, 0);
+
+    OSSL_DEFAULT_DH_512 = ossl_create_dh(
+	DEFAULT_DH_512_PRIM, sizeof(DEFAULT_DH_512_PRIM),
+	DEFAULT_DH_512_GEN, sizeof(DEFAULT_DH_512_GEN));
+    OSSL_DEFAULT_DH_1024 = ossl_create_dh(
+	DEFAULT_DH_1024_PRIM, sizeof(DEFAULT_DH_1024_PRIM),
+	DEFAULT_DH_1024_GEN, sizeof(DEFAULT_DH_1024_GEN));
+}
+
+#else /* defined NO_DH */
+#   warning >>> OpenSSL is compiled without DH support <<<
+void
+Init_ossl_dh()
+{
+    rb_warning("OpenSSL is compiled without DH support");
+}
+#endif /* NO_DH */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_pkey_dsa.c b/ruby_1_8_6/ext/openssl/ossl_pkey_dsa.c
new file mode 100644
index 0000000000..fdf23aa496
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_pkey_dsa.c
@@ -0,0 +1,422 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(OPENSSL_NO_DSA)
+
+#include "ossl.h"
+
+#define GetPKeyDSA(obj, pkey) do { \
+    GetPKey(obj, pkey); \
+    if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DSA) { /* PARANOIA? */ \
+	ossl_raise(rb_eRuntimeError, "THIS IS NOT A DSA!"); \
+    } \
+} while (0)
+
+#define DSA_HAS_PRIVATE(dsa) ((dsa)->priv_key)
+#define DSA_PRIVATE(obj,dsa) (DSA_HAS_PRIVATE(dsa)||OSSL_PKEY_IS_PRIVATE(obj))
+
+/*
+ * Classes
+ */
+VALUE cDSA;
+VALUE eDSAError;
+
+/*
+ * Public
+ */
+static VALUE
+dsa_instance(VALUE klass, DSA *dsa)
+{
+    EVP_PKEY *pkey;
+    VALUE obj;
+	
+    if (!dsa) {
+	return Qfalse;
+    }
+    if (!(pkey = EVP_PKEY_new())) {
+	return Qfalse;
+    }
+    if (!EVP_PKEY_assign_DSA(pkey, dsa)) {
+	EVP_PKEY_free(pkey);
+	return Qfalse;
+    }
+    WrapPKey(klass, obj, pkey);
+
+    return obj;
+}
+
+VALUE
+ossl_dsa_new(EVP_PKEY *pkey)
+{
+    VALUE obj;
+
+    if (!pkey) {
+	obj = dsa_instance(cDSA, DSA_new());
+    } else {
+	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DSA) {
+	    ossl_raise(rb_eTypeError, "Not a DSA key!");
+	}
+	WrapPKey(cDSA, obj, pkey);
+    }
+    if (obj == Qfalse) {
+	ossl_raise(eDSAError, NULL);
+    }
+
+    return obj;
+}
+
+/*
+ * Private
+ */
+static DSA *
+dsa_generate(int size)
+{
+    DSA *dsa;
+    unsigned char seed[20];
+    int seed_len = 20, counter;
+    unsigned long h;
+
+    if (!RAND_bytes(seed, seed_len)) {
+	return 0;
+    }
+    dsa = DSA_generate_parameters(size, seed, seed_len, &counter, &h,
+	    rb_block_given_p() ? ossl_generate_cb : NULL,
+	    NULL);
+    if(!dsa) return 0;
+
+    if (!DSA_generate_key(dsa)) {
+	DSA_free(dsa);
+	return 0;
+    }
+
+    return dsa;
+}
+
+static VALUE
+ossl_dsa_s_generate(VALUE klass, VALUE size)
+{
+    DSA *dsa = dsa_generate(FIX2INT(size)); /* err handled by dsa_instance */
+    VALUE obj = dsa_instance(klass, dsa);
+
+    if (obj == Qfalse) {
+	DSA_free(dsa);
+	ossl_raise(eDSAError, NULL);
+    }
+
+    return obj;
+}
+
+static VALUE
+ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
+{
+    EVP_PKEY *pkey;
+    DSA *dsa;
+    BIO *in;
+    char *passwd = NULL;
+    VALUE arg, pass;
+	
+    GetPKey(self, pkey);
+    if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
+        dsa = DSA_new();
+    }
+    else if (FIXNUM_P(arg)) {
+	if (!(dsa = dsa_generate(FIX2INT(arg)))) {
+	    ossl_raise(eDSAError, NULL);
+	}
+    }
+    else {
+	if (!NIL_P(pass)) passwd = StringValuePtr(pass);
+	arg = ossl_to_der_if_possible(arg);
+	in = ossl_obj2bio(arg);
+	dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
+	if (!dsa) {
+	    BIO_reset(in);
+	    dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL);
+	}
+	if (!dsa) {
+	    BIO_reset(in);
+	    dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL);
+	}
+	if (!dsa) {
+	    BIO_reset(in);
+	    dsa = d2i_DSAPrivateKey_bio(in, NULL);
+	}
+	if (!dsa) {
+	    BIO_reset(in);
+	    dsa = d2i_DSA_PUBKEY_bio(in, NULL);
+	}
+	BIO_free(in);
+	if (!dsa) ossl_raise(eDSAError, "Neither PUB key nor PRIV key:");
+    }
+    if (!EVP_PKEY_assign_DSA(pkey, dsa)) {
+	DSA_free(dsa);
+	ossl_raise(eDSAError, NULL);
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_dsa_is_public(VALUE self)
+{
+    EVP_PKEY *pkey;
+
+    GetPKeyDSA(self, pkey);
+
+    /*
+     * Do we need to check dsap->dsa->public_pkey?
+     * return Qtrue;
+     */
+    return (pkey->pkey.dsa->pub_key) ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_dsa_is_private(VALUE self)
+{
+    EVP_PKEY *pkey;
+	
+    GetPKeyDSA(self, pkey);
+	
+    return (DSA_PRIVATE(self, pkey->pkey.dsa)) ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_dsa_export(int argc, VALUE *argv, VALUE self)
+{
+    EVP_PKEY *pkey;
+    BIO *out;
+    const EVP_CIPHER *ciph = NULL;
+    char *passwd = NULL;
+    VALUE cipher, pass, str;
+
+    GetPKeyDSA(self, pkey);
+    rb_scan_args(argc, argv, "02", &cipher, &pass);
+    if (!NIL_P(cipher)) {
+	ciph = GetCipherPtr(cipher);
+	if (!NIL_P(pass)) {
+	    passwd = StringValuePtr(pass);
+	}
+    }
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eDSAError, NULL);
+    }
+    if (DSA_HAS_PRIVATE(pkey->pkey.dsa)) {
+	if (!PEM_write_bio_DSAPrivateKey(out, pkey->pkey.dsa, ciph,
+					 NULL, 0, ossl_pem_passwd_cb, passwd)){
+	    BIO_free(out);
+	    ossl_raise(eDSAError, NULL);
+	}
+    } else {
+	if (!PEM_write_bio_DSAPublicKey(out, pkey->pkey.dsa)) {
+	    BIO_free(out);
+	    ossl_raise(eDSAError, NULL);
+	}
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+static VALUE
+ossl_dsa_to_der(VALUE self)
+{
+    EVP_PKEY *pkey;
+    int (*i2d_func)_((DSA*, unsigned char**));
+    unsigned char *p;
+    long len;
+    VALUE str;
+
+    GetPKeyDSA(self, pkey);
+    if(DSA_HAS_PRIVATE(pkey->pkey.dsa))
+	i2d_func = (int(*)_((DSA*,unsigned char**)))i2d_DSAPrivateKey;
+    else
+	i2d_func = i2d_DSA_PUBKEY;
+    if((len = i2d_func(pkey->pkey.dsa, NULL)) <= 0)
+	ossl_raise(eDSAError, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if(i2d_func(pkey->pkey.dsa, &p) < 0)
+	ossl_raise(eDSAError, NULL);
+    ossl_str_adjust(str, p);
+
+    return str;
+}
+
+/*
+ * Stores all parameters of key to the hash
+ * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
+ * Don't use :-)) (I's up to you)
+ */
+static VALUE
+ossl_dsa_get_params(VALUE self)
+{
+    EVP_PKEY *pkey;
+    VALUE hash;
+
+    GetPKeyDSA(self, pkey);
+
+    hash = rb_hash_new();
+
+    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(pkey->pkey.dsa->p));
+    rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(pkey->pkey.dsa->q));
+    rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(pkey->pkey.dsa->g));
+    rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pkey->pkey.dsa->pub_key));
+    rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(pkey->pkey.dsa->priv_key));
+    
+    return hash;
+}
+
+/*
+ * Prints all parameters of key to buffer
+ * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
+ * Don't use :-)) (I's up to you)
+ */
+static VALUE
+ossl_dsa_to_text(VALUE self)
+{
+    EVP_PKEY *pkey;
+    BIO *out;
+    VALUE str;
+
+    GetPKeyDSA(self, pkey);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eDSAError, NULL);
+    }
+    if (!DSA_print(out, pkey->pkey.dsa, 0)) { /* offset = 0 */
+	BIO_free(out);
+	ossl_raise(eDSAError, NULL);
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+/*
+ * Makes new instance DSA PUBLIC_KEY from PRIVATE_KEY
+ */
+static VALUE
+ossl_dsa_to_public_key(VALUE self)
+{
+    EVP_PKEY *pkey;
+    DSA *dsa;
+    VALUE obj;
+	
+    GetPKeyDSA(self, pkey);
+    /* err check performed by dsa_instance */
+    dsa = DSAPublicKey_dup(pkey->pkey.dsa);
+    obj = dsa_instance(CLASS_OF(self), dsa);
+    if (obj == Qfalse) {
+	DSA_free(dsa);
+	ossl_raise(eDSAError, NULL);
+    }
+    return obj;
+}
+
+#define ossl_dsa_buf_size(pkey) (DSA_size((pkey)->pkey.dsa)+16)
+
+static VALUE
+ossl_dsa_sign(VALUE self, VALUE data)
+{
+    EVP_PKEY *pkey;
+    int buf_len;
+    VALUE str;
+
+    GetPKeyDSA(self, pkey);
+    StringValue(data);
+    if (!DSA_PRIVATE(self, pkey->pkey.dsa)) {
+	ossl_raise(eDSAError, "Private DSA key needed!");
+    }
+    str = rb_str_new(0, ossl_dsa_buf_size(pkey));
+    if (!DSA_sign(0, RSTRING(data)->ptr, RSTRING(data)->len, RSTRING(str)->ptr,
+		  &buf_len, pkey->pkey.dsa)) { /* type is ignored (0) */
+	ossl_raise(eDSAError, NULL);
+    }
+    RSTRING(str)->len = buf_len;
+    RSTRING(str)->ptr[buf_len] = 0;
+
+    return str;
+}
+
+static VALUE
+ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
+{
+    EVP_PKEY *pkey;
+    int ret;
+
+    GetPKeyDSA(self, pkey);
+    StringValue(digest);
+    StringValue(sig);
+    /* type is ignored (0) */
+    ret = DSA_verify(0, RSTRING(digest)->ptr, RSTRING(digest)->len,
+		     RSTRING(sig)->ptr, RSTRING(sig)->len, pkey->pkey.dsa);
+    if (ret < 0) {
+	ossl_raise(eDSAError, NULL);
+    }
+    else if (ret == 1) {
+	return Qtrue;
+    }
+
+    return Qfalse;
+}
+
+OSSL_PKEY_BN(dsa, p);
+OSSL_PKEY_BN(dsa, q);
+OSSL_PKEY_BN(dsa, g);
+OSSL_PKEY_BN(dsa, pub_key);
+OSSL_PKEY_BN(dsa, priv_key);
+
+/*
+ * INIT
+ */
+void
+Init_ossl_dsa()
+{
+#if 0 /* let rdoc know about mOSSL and mPKey */
+    mOSSL = rb_define_module("OpenSSL");
+    mPKey = rb_define_module_under(mOSSL, "PKey");
+#endif
+
+    eDSAError = rb_define_class_under(mPKey, "DSAError", ePKeyError);
+
+    cDSA = rb_define_class_under(mPKey, "DSA", cPKey);
+	
+    rb_define_singleton_method(cDSA, "generate", ossl_dsa_s_generate, 1);
+    rb_define_method(cDSA, "initialize", ossl_dsa_initialize, -1);
+
+    rb_define_method(cDSA, "public?", ossl_dsa_is_public, 0);
+    rb_define_method(cDSA, "private?", ossl_dsa_is_private, 0);
+    rb_define_method(cDSA, "to_text", ossl_dsa_to_text, 0);
+    rb_define_method(cDSA, "export", ossl_dsa_export, -1);
+    rb_define_alias(cDSA, "to_pem", "export");
+    rb_define_alias(cDSA, "to_s", "export");
+    rb_define_method(cDSA, "to_der", ossl_dsa_to_der, 0);
+    rb_define_method(cDSA, "public_key", ossl_dsa_to_public_key, 0);
+    rb_define_method(cDSA, "syssign", ossl_dsa_sign, 1);
+    rb_define_method(cDSA, "sysverify", ossl_dsa_verify, 2);
+
+    DEF_OSSL_PKEY_BN(cDSA, dsa, p);
+    DEF_OSSL_PKEY_BN(cDSA, dsa, q);
+    DEF_OSSL_PKEY_BN(cDSA, dsa, g);
+    DEF_OSSL_PKEY_BN(cDSA, dsa, pub_key);
+    DEF_OSSL_PKEY_BN(cDSA, dsa, priv_key);
+
+    rb_define_method(cDSA, "params", ossl_dsa_get_params, 0);
+}
+
+#else /* defined NO_DSA */
+#   warning >>> OpenSSL is compiled without DSA support <<<
+
+void
+Init_ossl_dsa()
+{
+    rb_warning("OpenSSL is compiled without DSA support");
+}
+
+#endif /* NO_DSA */
diff --git a/ruby_1_8_6/ext/openssl/ossl_pkey_rsa.c b/ruby_1_8_6/ext/openssl/ossl_pkey_rsa.c
new file mode 100644
index 0000000000..0afdcf8d01
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_pkey_rsa.c
@@ -0,0 +1,518 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(OPENSSL_NO_RSA)
+
+#include "ossl.h"
+
+#define GetPKeyRSA(obj, pkey) do { \
+    GetPKey(obj, pkey); \
+    if (EVP_PKEY_type(pkey->type) != EVP_PKEY_RSA) { /* PARANOIA? */ \
+	ossl_raise(rb_eRuntimeError, "THIS IS NOT A RSA!") ; \
+    } \
+} while (0)
+
+#define RSA_HAS_PRIVATE(rsa) ((rsa)->p && (rsa)->q)
+#define RSA_PRIVATE(obj,rsa) (RSA_HAS_PRIVATE(rsa)||OSSL_PKEY_IS_PRIVATE(obj))
+
+/*
+ * Classes
+ */
+VALUE cRSA;
+VALUE eRSAError;
+
+/*
+ * Public
+ */
+static VALUE
+rsa_instance(VALUE klass, RSA *rsa)
+{
+    EVP_PKEY *pkey;
+    VALUE obj;
+	
+    if (!rsa) {
+	return Qfalse;
+    }
+    if (!(pkey = EVP_PKEY_new())) {
+	return Qfalse;
+    }
+    if (!EVP_PKEY_assign_RSA(pkey, rsa)) {
+	EVP_PKEY_free(pkey);
+	return Qfalse;
+    }
+    WrapPKey(klass, obj, pkey);
+	
+    return obj;
+}
+
+VALUE
+ossl_rsa_new(EVP_PKEY *pkey)
+{
+    VALUE obj;
+
+    if (!pkey) {
+	obj = rsa_instance(cRSA, RSA_new());
+    }
+    else {
+	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_RSA) {
+	    ossl_raise(rb_eTypeError, "Not a RSA key!");
+	}
+	WrapPKey(cRSA, obj, pkey);
+    }
+    if (obj == Qfalse) {
+	ossl_raise(eRSAError, NULL);
+    }
+
+    return obj;
+}
+
+/*
+ * Private
+ */
+static RSA *
+rsa_generate(int size, int exp)
+{
+    return RSA_generate_key(size, exp,
+	    rb_block_given_p() ? ossl_generate_cb : NULL,
+	    NULL);
+}
+
+static VALUE
+ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
+{
+    RSA *rsa;
+    VALUE size, exp;
+    VALUE obj;
+
+    rb_scan_args(argc, argv, "11", &size, &exp);
+
+    rsa = rsa_generate(NUM2INT(size), NIL_P(exp) ? RSA_F4 : NUM2INT(exp)); /* err handled by rsa_instance */
+    obj = rsa_instance(klass, rsa);
+
+    if (obj == Qfalse) {
+	RSA_free(rsa);
+	ossl_raise(eRSAError, NULL);
+    }
+
+    return obj;
+}
+
+static VALUE
+ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
+{
+    EVP_PKEY *pkey;
+    RSA *rsa;
+    BIO *in;
+    char *passwd = NULL;
+    VALUE arg, pass;
+	
+    GetPKey(self, pkey);
+    if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
+	rsa = RSA_new();
+    }
+    else if (FIXNUM_P(arg)) {
+	rsa = rsa_generate(FIX2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2INT(pass));
+	if (!rsa) ossl_raise(eRSAError, NULL);
+    }
+    else {
+	if (!NIL_P(pass)) passwd = StringValuePtr(pass);
+	arg = ossl_to_der_if_possible(arg);
+	in = ossl_obj2bio(arg);
+	rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
+	if (!rsa) {
+	    BIO_reset(in);
+	    rsa = PEM_read_bio_RSAPublicKey(in, NULL, NULL, NULL);
+	}
+	if (!rsa) {
+	    BIO_reset(in);
+	    rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL);
+	}
+	if (!rsa) {
+	    BIO_reset(in);
+	    rsa = d2i_RSAPrivateKey_bio(in, NULL);
+	}
+	if (!rsa) {
+	    BIO_reset(in);
+	    rsa = d2i_RSAPublicKey_bio(in, NULL);
+	}
+	if (!rsa) {
+	    BIO_reset(in);
+	    rsa = d2i_RSA_PUBKEY_bio(in, NULL);
+	}
+	BIO_free(in);
+	if (!rsa) ossl_raise(eRSAError, "Neither PUB key nor PRIV key:");
+    }
+    if (!EVP_PKEY_assign_RSA(pkey, rsa)) {
+	RSA_free(rsa);
+	ossl_raise(eRSAError, NULL);
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_rsa_is_public(VALUE self)
+{
+    EVP_PKEY *pkey;
+
+    GetPKeyRSA(self, pkey);
+    /*
+     * SURPRISE! :-))
+     * Every key is public at the same time!
+     */
+    return Qtrue;
+}
+
+static VALUE
+ossl_rsa_is_private(VALUE self)
+{
+    EVP_PKEY *pkey;
+	
+    GetPKeyRSA(self, pkey);
+    
+    return (RSA_PRIVATE(self, pkey->pkey.rsa)) ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_rsa_export(int argc, VALUE *argv, VALUE self)
+{
+    EVP_PKEY *pkey;
+    BIO *out;
+    const EVP_CIPHER *ciph = NULL;
+    char *passwd = NULL;
+    VALUE cipher, pass, str;
+
+    GetPKeyRSA(self, pkey);
+
+    rb_scan_args(argc, argv, "02", &cipher, &pass);
+
+    if (!NIL_P(cipher)) {
+	ciph = GetCipherPtr(cipher);
+	if (!NIL_P(pass)) {
+	    passwd = StringValuePtr(pass);
+	}
+    }
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eRSAError, NULL);
+    }
+    if (RSA_HAS_PRIVATE(pkey->pkey.rsa)) {
+	if (!PEM_write_bio_RSAPrivateKey(out, pkey->pkey.rsa, ciph,
+					 NULL, 0, ossl_pem_passwd_cb, passwd)) {
+	    BIO_free(out);
+	    ossl_raise(eRSAError, NULL);
+	}
+    } else {
+	if (!PEM_write_bio_RSAPublicKey(out, pkey->pkey.rsa)) {
+	    BIO_free(out);
+	    ossl_raise(eRSAError, NULL);
+	}
+    }
+    str = ossl_membio2str(out);
+    
+    return str;
+}
+
+static VALUE
+ossl_rsa_to_der(VALUE self)
+{
+    EVP_PKEY *pkey;
+    int (*i2d_func)_((const RSA*, unsigned char**));
+    unsigned char *p;
+    long len;
+    VALUE str;
+
+    GetPKeyRSA(self, pkey);
+    if(RSA_HAS_PRIVATE(pkey->pkey.rsa))
+	i2d_func = i2d_RSAPrivateKey;
+    else
+	i2d_func = i2d_RSAPublicKey;
+    if((len = i2d_func(pkey->pkey.rsa, NULL)) <= 0)
+	ossl_raise(eRSAError, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if(i2d_func(pkey->pkey.rsa, &p) < 0)
+	ossl_raise(eRSAError, NULL);
+    ossl_str_adjust(str, p);
+
+    return str;
+}
+
+#define ossl_rsa_buf_size(pkey) (RSA_size((pkey)->pkey.rsa)+16)
+
+static VALUE
+ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
+{
+    EVP_PKEY *pkey;
+    int buf_len, pad;
+    VALUE str, buffer, padding;
+
+    GetPKeyRSA(self, pkey);
+    rb_scan_args(argc, argv, "11", &buffer, &padding);
+    pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
+    StringValue(buffer);
+    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
+    buf_len = RSA_public_encrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
+				 RSTRING(str)->ptr, pkey->pkey.rsa,
+				 pad);
+    if (buf_len < 0) ossl_raise(eRSAError, NULL);
+    RSTRING(str)->len = buf_len;
+    RSTRING(str)->ptr[buf_len] = 0;
+
+    return str;
+}
+
+static VALUE
+ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
+{
+    EVP_PKEY *pkey;
+    int buf_len, pad;
+    VALUE str, buffer, padding;
+
+    GetPKeyRSA(self, pkey);
+    rb_scan_args(argc, argv, "11", &buffer, &padding);
+    pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
+    StringValue(buffer);
+    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
+    buf_len = RSA_public_decrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
+				 RSTRING(str)->ptr, pkey->pkey.rsa,
+				 pad);
+    if (buf_len < 0) ossl_raise(eRSAError, NULL);
+    RSTRING(str)->len = buf_len;
+    RSTRING(str)->ptr[buf_len] = 0;
+    
+    return str;
+}
+
+static VALUE
+ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
+{
+    EVP_PKEY *pkey;
+    int buf_len, pad;
+    VALUE str, buffer, padding;
+
+    GetPKeyRSA(self, pkey);
+    if (!RSA_PRIVATE(self, pkey->pkey.rsa)) {
+	ossl_raise(eRSAError, "private key needed.");
+    }	
+    rb_scan_args(argc, argv, "11", &buffer, &padding);
+    pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
+    StringValue(buffer);
+    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
+    buf_len = RSA_private_encrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
+				  RSTRING(str)->ptr, pkey->pkey.rsa,
+				  pad);
+    if (buf_len < 0) ossl_raise(eRSAError, NULL);
+    RSTRING(str)->len = buf_len;
+    RSTRING(str)->ptr[buf_len] = 0;
+    
+    return str;
+}
+
+static VALUE
+ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
+{
+    EVP_PKEY *pkey;
+    int buf_len, pad;
+    VALUE str, buffer, padding;
+
+    GetPKeyRSA(self, pkey);
+    if (!RSA_PRIVATE(self, pkey->pkey.rsa)) {
+	ossl_raise(eRSAError, "private key needed.");
+    }
+    rb_scan_args(argc, argv, "11", &buffer, &padding);
+    pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
+    StringValue(buffer);
+    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
+    buf_len = RSA_private_decrypt(RSTRING(buffer)->len, RSTRING(buffer)->ptr,
+				  RSTRING(str)->ptr, pkey->pkey.rsa,
+				  pad);
+    if (buf_len < 0) ossl_raise(eRSAError, NULL);
+    RSTRING(str)->len = buf_len;
+    RSTRING(str)->ptr[buf_len] = 0;
+
+    return str;
+}
+
+/*
+ * Stores all parameters of key to the hash
+ * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
+ * Don't use :-)) (I's up to you)
+ */
+static VALUE
+ossl_rsa_get_params(VALUE self)
+{
+    EVP_PKEY *pkey;
+    VALUE hash;
+
+    GetPKeyRSA(self, pkey);
+
+    hash = rb_hash_new();
+
+    rb_hash_aset(hash, rb_str_new2("n"), ossl_bn_new(pkey->pkey.rsa->n));
+    rb_hash_aset(hash, rb_str_new2("e"), ossl_bn_new(pkey->pkey.rsa->e));
+    rb_hash_aset(hash, rb_str_new2("d"), ossl_bn_new(pkey->pkey.rsa->d));
+    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(pkey->pkey.rsa->p));
+    rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(pkey->pkey.rsa->q));
+    rb_hash_aset(hash, rb_str_new2("dmp1"), ossl_bn_new(pkey->pkey.rsa->dmp1));
+    rb_hash_aset(hash, rb_str_new2("dmq1"), ossl_bn_new(pkey->pkey.rsa->dmq1));
+    rb_hash_aset(hash, rb_str_new2("iqmp"), ossl_bn_new(pkey->pkey.rsa->iqmp));
+    
+    return hash;
+}
+
+/*
+ * Prints all parameters of key to buffer
+ * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
+ * Don't use :-)) (It's up to you)
+ */
+static VALUE
+ossl_rsa_to_text(VALUE self)
+{
+    EVP_PKEY *pkey;
+    BIO *out;
+    VALUE str;
+
+    GetPKeyRSA(self, pkey);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eRSAError, NULL);
+    }
+    if (!RSA_print(out, pkey->pkey.rsa, 0)) { /* offset = 0 */
+	BIO_free(out);
+	ossl_raise(eRSAError, NULL);
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+/*
+ * Makes new instance RSA PUBLIC_KEY from PRIVATE_KEY
+ */
+static VALUE
+ossl_rsa_to_public_key(VALUE self)
+{
+    EVP_PKEY *pkey;
+    RSA *rsa;
+    VALUE obj;
+    
+    GetPKeyRSA(self, pkey);
+    /* err check performed by rsa_instance */
+    rsa = RSAPublicKey_dup(pkey->pkey.rsa);
+    obj = rsa_instance(CLASS_OF(self), rsa);
+    if (obj == Qfalse) {
+	RSA_free(rsa);
+	ossl_raise(eRSAError, NULL);
+    }
+    return obj;
+}
+
+/*
+ * TODO: Test me
+extern BN_CTX *ossl_bn_ctx;
+
+static VALUE
+ossl_rsa_blinding_on(VALUE self)
+{
+    EVP_PKEY *pkey;
+    
+    GetPKeyRSA(self, pkey);
+
+    if (RSA_blinding_on(pkey->pkey.rsa, ossl_bn_ctx) != 1) {
+	ossl_raise(eRSAError, NULL);
+    }
+    return self;
+}
+
+static VALUE
+ossl_rsa_blinding_off(VALUE self)
+{
+    EVP_PKEY *pkey;
+    
+    GetPKeyRSA(self, pkey);
+    RSA_blinding_off(pkey->pkey.rsa);
+
+    return self;
+}
+ */
+
+OSSL_PKEY_BN(rsa, n);
+OSSL_PKEY_BN(rsa, e);
+OSSL_PKEY_BN(rsa, d);
+OSSL_PKEY_BN(rsa, p);
+OSSL_PKEY_BN(rsa, q);
+OSSL_PKEY_BN(rsa, dmp1);
+OSSL_PKEY_BN(rsa, dmq1);
+OSSL_PKEY_BN(rsa, iqmp);
+
+/*
+ * INIT
+ */
+#define DefRSAConst(x) rb_define_const(cRSA, #x,INT2FIX(RSA_##x))
+
+void
+Init_ossl_rsa()
+{
+#if 0 /* let rdoc know about mOSSL and mPKey */
+    mOSSL = rb_define_module("OpenSSL");
+    mPKey = rb_define_module_under(mOSSL, "PKey");
+#endif
+
+    eRSAError = rb_define_class_under(mPKey, "RSAError", ePKeyError);
+
+    cRSA = rb_define_class_under(mPKey, "RSA", cPKey);
+
+    rb_define_singleton_method(cRSA, "generate", ossl_rsa_s_generate, -1);
+    rb_define_method(cRSA, "initialize", ossl_rsa_initialize, -1);
+	
+    rb_define_method(cRSA, "public?", ossl_rsa_is_public, 0);
+    rb_define_method(cRSA, "private?", ossl_rsa_is_private, 0);
+    rb_define_method(cRSA, "to_text", ossl_rsa_to_text, 0);
+    rb_define_method(cRSA, "export", ossl_rsa_export, -1);
+    rb_define_alias(cRSA, "to_pem", "export");
+    rb_define_alias(cRSA, "to_s", "export");
+    rb_define_method(cRSA, "to_der", ossl_rsa_to_der, 0);
+    rb_define_method(cRSA, "public_key", ossl_rsa_to_public_key, 0);
+    rb_define_method(cRSA, "public_encrypt", ossl_rsa_public_encrypt, -1);
+    rb_define_method(cRSA, "public_decrypt", ossl_rsa_public_decrypt, -1);
+    rb_define_method(cRSA, "private_encrypt", ossl_rsa_private_encrypt, -1);
+    rb_define_method(cRSA, "private_decrypt", ossl_rsa_private_decrypt, -1);
+
+    DEF_OSSL_PKEY_BN(cRSA, rsa, n);
+    DEF_OSSL_PKEY_BN(cRSA, rsa, e);
+    DEF_OSSL_PKEY_BN(cRSA, rsa, d);
+    DEF_OSSL_PKEY_BN(cRSA, rsa, p);
+    DEF_OSSL_PKEY_BN(cRSA, rsa, q);
+    DEF_OSSL_PKEY_BN(cRSA, rsa, dmp1);
+    DEF_OSSL_PKEY_BN(cRSA, rsa, dmq1);
+    DEF_OSSL_PKEY_BN(cRSA, rsa, iqmp);
+
+    rb_define_method(cRSA, "params", ossl_rsa_get_params, 0);
+
+    DefRSAConst(PKCS1_PADDING);
+    DefRSAConst(SSLV23_PADDING);
+    DefRSAConst(NO_PADDING);
+    DefRSAConst(PKCS1_OAEP_PADDING);
+
+/*
+ * TODO: Test it
+    rb_define_method(cRSA, "blinding_on!", ossl_rsa_blinding_on, 0);
+    rb_define_method(cRSA, "blinding_off!", ossl_rsa_blinding_off, 0);
+ */
+}
+
+#else /* defined NO_RSA */
+#   warning >>> OpenSSL is compiled without RSA support <<<
+void
+Init_ossl_rsa()
+{
+    rb_warning("OpenSSL is compiled without RSA support");
+}
+#endif /* NO_RSA */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_rand.c b/ruby_1_8_6/ext/openssl/ossl_rand.c
new file mode 100644
index 0000000000..71bb3bedd5
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_rand.c
@@ -0,0 +1,134 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+/*
+ * Classes
+ */
+VALUE mRandom;
+VALUE eRandomError;
+
+/*
+ * Struct
+ */
+
+/*
+ * Public
+ */
+
+/*
+ * Private
+ */
+static VALUE
+ossl_rand_seed(VALUE self, VALUE str)
+{
+    StringValue(str);
+    RAND_seed(RSTRING(str)->ptr, RSTRING(str)->len);
+
+    return str;
+}
+
+static VALUE
+ossl_rand_load_file(VALUE self, VALUE filename)
+{
+    SafeStringValue(filename);
+	
+    if(!RAND_load_file(RSTRING(filename)->ptr, -1)) {
+	ossl_raise(eRandomError, NULL);
+    }
+    return Qtrue;
+}
+
+static VALUE
+ossl_rand_write_file(VALUE self, VALUE filename)
+{
+    SafeStringValue(filename);
+    if (RAND_write_file(RSTRING(filename)->ptr) == -1) {
+	ossl_raise(eRandomError, NULL);
+    }
+    return Qtrue;
+}
+
+static VALUE
+ossl_rand_bytes(VALUE self, VALUE len)
+{
+    VALUE str;
+	
+    str = rb_str_new(0, FIX2INT(len));
+    if (!RAND_bytes(RSTRING(str)->ptr, FIX2INT(len))) {
+	ossl_raise(eRandomError, NULL);
+    }
+
+    return str;
+}
+
+static VALUE
+ossl_rand_pseudo_bytes(VALUE self, VALUE len)
+{
+    VALUE str;
+
+    str = rb_str_new(0, FIX2INT(len));
+    if (!RAND_pseudo_bytes(RSTRING(str)->ptr, FIX2INT(len))) {
+	ossl_raise(eRandomError, NULL);
+    }
+
+    return str;
+}
+
+static VALUE
+ossl_rand_egd(VALUE self, VALUE filename)
+{
+    SafeStringValue(filename);
+	
+    if(!RAND_egd(RSTRING(filename)->ptr)) {
+	ossl_raise(eRandomError, NULL);
+    }
+    return Qtrue;
+}
+
+static VALUE
+ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
+{
+    SafeStringValue(filename);
+
+    if (!RAND_egd_bytes(RSTRING(filename)->ptr, FIX2INT(len))) {
+	ossl_raise(eRandomError, NULL);
+    }
+    return Qtrue;
+}
+
+#define DEFMETH(class, name, func, argc) \
+	rb_define_method(class, name, func, argc); \
+	rb_define_singleton_method(class, name, func, argc);
+
+/*
+ * INIT
+ */
+void
+Init_ossl_rand()
+{
+#if 0 /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+#endif
+
+    mRandom = rb_define_module_under(mOSSL, "Random");
+	
+    eRandomError = rb_define_class_under(mRandom, "RandomError", eOSSLError);
+	
+    DEFMETH(mRandom, "seed", ossl_rand_seed, 1);
+    DEFMETH(mRandom, "load_random_file", ossl_rand_load_file, 1);
+    DEFMETH(mRandom, "write_random_file", ossl_rand_write_file, 1);
+    DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1);
+    DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
+    DEFMETH(mRandom, "egd", ossl_rand_egd, 1);
+    DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);	
+}
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_rand.h b/ruby_1_8_6/ext/openssl/ossl_rand.h
new file mode 100644
index 0000000000..ce2ae0d129
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_rand.h
@@ -0,0 +1,20 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_RAND_H_)
+#define _OSSL_RAND_H_
+
+extern VALUE mRandom;
+extern VALUE eRandomError;
+
+void Init_ossl_rand(void);
+
+#endif /* _OSSL_RAND_H_ */
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_ssl.c b/ruby_1_8_6/ext/openssl/ossl_ssl.c
new file mode 100644
index 0000000000..8e632b526b
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_ssl.c
@@ -0,0 +1,941 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2000-2002  GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+#include <rubysig.h>
+#include <rubyio.h>
+
+#if defined(HAVE_UNISTD_H)
+#  include <unistd.h> /* for read(), and write() */
+#endif
+
+#define numberof(ary) (sizeof(ary)/sizeof(ary[0]))
+
+#ifdef _WIN32
+#  define TO_SOCKET(s) _get_osfhandle(s)
+#else
+#  define TO_SOCKET(s) s
+#endif
+
+VALUE mSSL;
+VALUE eSSLError;
+VALUE cSSLContext;
+VALUE cSSLSocket;
+
+/*
+ * SSLContext class
+ */
+#define ossl_sslctx_set_cert(o,v)        rb_iv_set((o),"@cert",(v))
+#define ossl_sslctx_set_key(o,v)         rb_iv_set((o),"@key",(v))
+#define ossl_sslctx_set_client_ca(o,v)   rb_iv_set((o),"@client_ca",(v))
+#define ossl_sslctx_set_ca_file(o,v)     rb_iv_set((o),"@ca_file",(v))
+#define ossl_sslctx_set_ca_path(o,v)     rb_iv_set((o),"@ca_path",(v))
+#define ossl_sslctx_set_timeout(o,v)     rb_iv_set((o),"@timeout",(v))
+#define ossl_sslctx_set_verify_mode(o,v) rb_iv_set((o),"@verify_mode",(v))
+#define ossl_sslctx_set_verify_dep(o,v)  rb_iv_set((o),"@verify_depth",(v))
+#define ossl_sslctx_set_verify_cb(o,v)   rb_iv_set((o),"@verify_callback",(v))
+#define ossl_sslctx_set_options(o,v)     rb_iv_set((o),"@options",(v))
+#define ossl_sslctx_set_cert_store(o,v)  rb_iv_set((o),"@cert_store",(v))
+#define ossl_sslctx_set_extra_cert(o,v)  rb_iv_set((o),"@extra_chain_cert",(v))
+#define ossl_sslctx_set_client_cert_cb(o,v) rb_iv_set((o),"@client_cert_cb",(v))
+#define ossl_sslctx_set_tmp_dh_cb(o,v)   rb_iv_set((o),"@tmp_dh_callback",(v))
+#define ossl_sslctx_set_sess_id_ctx(o, v) rb_iv_get((o),"@session_id_context"(v))
+
+#define ossl_sslctx_get_cert(o)          rb_iv_get((o),"@cert")
+#define ossl_sslctx_get_key(o)           rb_iv_get((o),"@key")
+#define ossl_sslctx_get_client_ca(o)     rb_iv_get((o),"@client_ca")
+#define ossl_sslctx_get_ca_file(o)       rb_iv_get((o),"@ca_file")
+#define ossl_sslctx_get_ca_path(o)       rb_iv_get((o),"@ca_path")
+#define ossl_sslctx_get_timeout(o)       rb_iv_get((o),"@timeout")
+#define ossl_sslctx_get_verify_mode(o)   rb_iv_get((o),"@verify_mode")
+#define ossl_sslctx_get_verify_dep(o)    rb_iv_get((o),"@verify_depth")
+#define ossl_sslctx_get_verify_cb(o)     rb_iv_get((o),"@verify_callback")
+#define ossl_sslctx_get_options(o)       rb_iv_get((o),"@options")
+#define ossl_sslctx_get_cert_store(o)    rb_iv_get((o),"@cert_store")
+#define ossl_sslctx_get_extra_cert(o)    rb_iv_get((o),"@extra_chain_cert")
+#define ossl_sslctx_get_client_cert_cb(o) rb_iv_get((o),"@client_cert_cb")
+#define ossl_sslctx_get_tmp_dh_cb(o)     rb_iv_get((o),"@tmp_dh_callback")
+#define ossl_sslctx_get_sess_id_ctx(o)   rb_iv_get((o),"@session_id_context")
+
+static char *ossl_sslctx_attrs[] = {
+    "cert", "key", "client_ca", "ca_file", "ca_path",
+    "timeout", "verify_mode", "verify_depth",
+    "verify_callback", "options", "cert_store", "extra_chain_cert",
+    "client_cert_cb", "tmp_dh_callback", "session_id_context",
+};
+
+#define ossl_ssl_get_io(o)           rb_iv_get((o),"@io")
+#define ossl_ssl_get_ctx(o)          rb_iv_get((o),"@context")
+#define ossl_ssl_get_sync_close(o)   rb_iv_get((o),"@sync_close")
+#define ossl_ssl_get_x509(o)         rb_iv_get((o),"@x509")
+#define ossl_ssl_get_key(o)          rb_iv_get((o),"@key")
+#define ossl_ssl_get_tmp_dh(o)       rb_iv_get((o),"@tmp_dh")
+
+#define ossl_ssl_set_io(o,v)         rb_iv_set((o),"@io",(v))
+#define ossl_ssl_set_ctx(o,v)        rb_iv_set((o),"@context",(v))
+#define ossl_ssl_set_sync_close(o,v) rb_iv_set((o),"@sync_close",(v))
+#define ossl_ssl_set_x509(o,v)       rb_iv_set((o),"@x509",(v))
+#define ossl_ssl_set_key(o,v)        rb_iv_set((o),"@key",(v))
+#define ossl_ssl_set_tmp_dh(o,v)     rb_iv_set((o),"@tmp_dh",(v))
+
+static char *ossl_ssl_attr_readers[] = { "io", "context", };
+static char *ossl_ssl_attrs[] = { "sync_close", };
+
+/*
+ * SSLContext class
+ */
+struct {
+    const char *name;
+    SSL_METHOD *(*func)(void);
+} ossl_ssl_method_tab[] = {
+#define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method }
+    OSSL_SSL_METHOD_ENTRY(TLSv1),
+    OSSL_SSL_METHOD_ENTRY(TLSv1_server),
+    OSSL_SSL_METHOD_ENTRY(TLSv1_client),
+    OSSL_SSL_METHOD_ENTRY(SSLv2),
+    OSSL_SSL_METHOD_ENTRY(SSLv2_server),
+    OSSL_SSL_METHOD_ENTRY(SSLv2_client),
+    OSSL_SSL_METHOD_ENTRY(SSLv3),
+    OSSL_SSL_METHOD_ENTRY(SSLv3_server),
+    OSSL_SSL_METHOD_ENTRY(SSLv3_client),
+    OSSL_SSL_METHOD_ENTRY(SSLv23),
+    OSSL_SSL_METHOD_ENTRY(SSLv23_server),
+    OSSL_SSL_METHOD_ENTRY(SSLv23_client),
+#undef OSSL_SSL_METHOD_ENTRY
+};
+
+int ossl_ssl_ex_vcb_idx;
+int ossl_ssl_ex_store_p;
+int ossl_ssl_ex_ptr_idx;
+int ossl_ssl_ex_client_cert_cb_idx;
+int ossl_ssl_ex_tmp_dh_callback_idx;
+
+static void
+ossl_sslctx_free(SSL_CTX *ctx)
+{
+    if(ctx && SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_store_p)== (void*)1)
+	ctx->cert_store = NULL;
+    SSL_CTX_free(ctx);
+}
+
+static VALUE
+ossl_sslctx_s_alloc(VALUE klass)
+{
+    SSL_CTX *ctx;
+
+    ctx = SSL_CTX_new(SSLv23_method());
+    if (!ctx) {
+        ossl_raise(eSSLError, "SSL_CTX_new:");
+    }
+    SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
+    SSL_CTX_set_options(ctx, SSL_OP_ALL);
+    return Data_Wrap_Struct(klass, 0, ossl_sslctx_free, ctx);
+}
+
+static VALUE
+ossl_sslctx_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE ssl_method;
+    SSL_METHOD *method = NULL;
+    SSL_CTX *ctx;
+    int i;
+    char *s;
+
+    for(i = 0; i < numberof(ossl_sslctx_attrs); i++){
+	char buf[32];
+	snprintf(buf, sizeof(buf), "@%s", ossl_sslctx_attrs[i]);
+	rb_iv_set(self, buf, Qnil);
+    }
+    if (rb_scan_args(argc, argv, "01", &ssl_method) == 0){
+        return self;
+    }
+    if(TYPE(ssl_method) == T_SYMBOL)
+	s = rb_id2name(SYM2ID(ssl_method));
+    else
+	s =  StringValuePtr(ssl_method);
+    for (i = 0; i < numberof(ossl_ssl_method_tab); i++) {
+        if (strcmp(ossl_ssl_method_tab[i].name, s) == 0) {
+            method = ossl_ssl_method_tab[i].func();
+            break;
+        }
+    }
+    if (!method) {
+        ossl_raise(rb_eArgError, "unknown SSL method `%s'.", s);
+    }
+    Data_Get_Struct(self, SSL_CTX, ctx);
+    if (SSL_CTX_set_ssl_version(ctx, method) != 1) {
+        ossl_raise(eSSLError, "SSL_CTX_set_ssl_version:");
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_call_client_cert_cb(VALUE obj)
+{
+    VALUE cb, ary, cert, key;
+    SSL *ssl;
+
+    Data_Get_Struct(obj, SSL, ssl);
+    cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_client_cert_cb_idx);
+    if (NIL_P(cb)) return Qfalse;
+    ary = rb_funcall(cb, rb_intern("call"), 1, obj);
+    Check_Type(ary, T_ARRAY);
+    GetX509CertPtr(cert = rb_ary_entry(ary, 0));
+    GetPKeyPtr(key = rb_ary_entry(ary, 1));
+    ossl_ssl_set_x509(obj, cert);
+    ossl_ssl_set_key(obj, key);
+
+    return Qtrue;
+}
+
+static int
+ossl_client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
+{
+    VALUE obj;
+    int status, success;
+
+    obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    success = rb_protect((VALUE(*)_((VALUE)))ossl_call_client_cert_cb,
+                         obj, &status);
+    if (status || !success) return 0;
+    *x509 = DupX509CertPtr(ossl_ssl_get_x509(obj));
+    *pkey = DupPKeyPtr(ossl_ssl_get_key(obj));
+
+    return 1;
+}
+
+#if !defined(OPENSSL_NO_DH)
+static VALUE
+ossl_call_tmp_dh_callback(VALUE *args)
+{
+    SSL *ssl;
+    VALUE cb, dh;
+    EVP_PKEY *pkey;
+
+    Data_Get_Struct(args[0], SSL, ssl);
+    cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_tmp_dh_callback_idx);
+    if (NIL_P(cb)) return Qfalse;
+    dh = rb_funcall(cb, rb_intern("call"), 3, args[0], args[1], args[2]);
+    pkey = GetPKeyPtr(dh);
+    if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) return Qfalse;
+    ossl_ssl_set_tmp_dh(args[0], dh);
+
+    return Qtrue;
+}
+
+static DH*
+ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
+{
+    VALUE args[3];
+    int status, success;
+
+    args[0] = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    args[1] = INT2FIX(is_export);
+    args[2] = INT2FIX(keylength);
+    success = rb_protect((VALUE(*)_((VALUE)))ossl_call_tmp_dh_callback,
+                         (VALUE)args, &status);
+    if (status || !success) return NULL;
+
+    return GetPKeyPtr(ossl_ssl_get_tmp_dh(args[0]))->pkey.dh;
+}
+
+static DH*
+ossl_default_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
+{
+    switch(keylength){
+    case 512:
+	return OSSL_DEFAULT_DH_512;
+    case 1024:
+	return OSSL_DEFAULT_DH_1024;
+    }
+    return NULL;
+}
+#endif /* OPENSSL_NO_DH */
+
+static int
+ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
+{
+    VALUE cb;
+    SSL *ssl;
+
+    ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
+    cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_vcb_idx);
+    X509_STORE_CTX_set_ex_data(ctx, ossl_verify_cb_idx, (void*)cb);
+    return ossl_verify_cb(preverify_ok, ctx);
+}
+
+static VALUE
+ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg)
+{
+    X509 *x509;
+    SSL_CTX *ctx;
+
+    Data_Get_Struct(arg, SSL_CTX, ctx);
+    x509 = DupX509CertPtr(i);
+    if(!SSL_CTX_add_extra_chain_cert(ctx, x509)){
+	ossl_raise(eSSLError, NULL);
+    }
+
+    return i;
+}
+
+static VALUE
+ossl_sslctx_setup(VALUE self)
+{
+    SSL_CTX *ctx;
+    X509 *cert = NULL, *client_ca = NULL;
+    X509_STORE *store;
+    EVP_PKEY *key = NULL;
+    char *ca_path = NULL, *ca_file = NULL;
+    int i, verify_mode;
+    VALUE val;
+
+    if(OBJ_FROZEN(self)) return Qnil;
+    Data_Get_Struct(self, SSL_CTX, ctx);
+
+#if !defined(OPENSSL_NO_DH)
+    if (RTEST(ossl_sslctx_get_tmp_dh_cb(self))){
+	SSL_CTX_set_tmp_dh_callback(ctx, ossl_tmp_dh_callback);
+    }
+    else{
+	rb_warning("using default DH parameters.");
+	SSL_CTX_set_tmp_dh_callback(ctx, ossl_default_tmp_dh_callback);
+    }
+#endif
+
+    val = ossl_sslctx_get_cert_store(self);
+    if(!NIL_P(val)){
+	/*
+         * WORKAROUND:
+	 *   X509_STORE can count references, but
+	 *   X509_STORE_free() doesn't care it.
+	 *   So we won't increment it but mark it by ex_data.
+	 */
+        store = GetX509StorePtr(val); /* NO NEED TO DUP */
+        SSL_CTX_set_cert_store(ctx, store);
+        SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_store_p, (void*)1);
+    }
+
+    val = ossl_sslctx_get_extra_cert(self);
+    if(!NIL_P(val)){
+	rb_iterate(rb_each, val, ossl_sslctx_add_extra_chain_cert_i, self);
+    }
+
+    /* private key may be bundled in certificate file. */
+    val = ossl_sslctx_get_cert(self);
+    cert = NIL_P(val) ? NULL : GetX509CertPtr(val); /* NO DUP NEEDED */
+    val = ossl_sslctx_get_key(self);
+    key = NIL_P(val) ? NULL : GetPKeyPtr(val); /* NO DUP NEEDED */
+    if (cert && key) {
+        if (!SSL_CTX_use_certificate(ctx, cert)) {
+            /* Adds a ref => Safe to FREE */
+            ossl_raise(eSSLError, "SSL_CTX_use_certificate:");
+        }
+        if (!SSL_CTX_use_PrivateKey(ctx, key)) {
+            /* Adds a ref => Safe to FREE */
+            ossl_raise(eSSLError, "SSL_CTX_use_PrivateKey:");
+        }
+        if (!SSL_CTX_check_private_key(ctx)) {
+            ossl_raise(eSSLError, "SSL_CTX_check_private_key:");
+        }
+    }
+
+    val = ossl_sslctx_get_client_ca(self);
+    if(!NIL_P(val)){
+	if(TYPE(val) == T_ARRAY){
+	    for(i = 0; i < RARRAY(val)->len; i++){
+		client_ca = GetX509CertPtr(RARRAY(val)->ptr[i]);
+        	if (!SSL_CTX_add_client_CA(ctx, client_ca)){
+		    /* Copies X509_NAME => FREE it. */
+        	    ossl_raise(eSSLError, "SSL_CTX_add_client_CA");
+        	}
+	    }
+        }
+	else{
+	    client_ca = GetX509CertPtr(val); /* NO DUP NEEDED. */
+            if (!SSL_CTX_add_client_CA(ctx, client_ca)){
+		/* Copies X509_NAME => FREE it. */
+        	ossl_raise(eSSLError, "SSL_CTX_add_client_CA");
+            }
+	}
+    }
+
+    val = ossl_sslctx_get_ca_file(self);
+    ca_file = NIL_P(val) ? NULL : StringValuePtr(val);
+    val = ossl_sslctx_get_ca_path(self);
+    ca_path = NIL_P(val) ? NULL : StringValuePtr(val);
+    if(ca_file || ca_path){
+	if (!SSL_CTX_load_verify_locations(ctx, ca_file, ca_path))
+	    rb_warning("can't set verify locations");
+    }
+
+    val = ossl_sslctx_get_verify_mode(self);
+    verify_mode = NIL_P(val) ? SSL_VERIFY_NONE : NUM2INT(val);
+    SSL_CTX_set_verify(ctx, verify_mode, ossl_ssl_verify_callback);
+    if (RTEST(ossl_sslctx_get_client_cert_cb(self)))
+	SSL_CTX_set_client_cert_cb(ctx, ossl_client_cert_cb);
+
+    val = ossl_sslctx_get_timeout(self);
+    if(!NIL_P(val)) SSL_CTX_set_timeout(ctx, NUM2LONG(val));
+
+    val = ossl_sslctx_get_verify_dep(self);
+    if(!NIL_P(val)) SSL_CTX_set_verify_depth(ctx, NUM2LONG(val));
+
+    val = ossl_sslctx_get_options(self);
+    if(!NIL_P(val)) SSL_CTX_set_options(ctx, NUM2LONG(val));
+    rb_obj_freeze(self);
+
+    val = ossl_sslctx_get_sess_id_ctx(self);
+    if (!NIL_P(val)){
+	StringValue(val);
+	if (!SSL_CTX_set_session_id_context(ctx, RSTRING(val)->ptr,
+					    RSTRING(val)->len)){
+            ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
+	}
+    }
+
+    return Qtrue;
+}
+
+static VALUE
+ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
+{
+    VALUE ary;
+    int bits, alg_bits;
+
+    ary = rb_ary_new2(4);
+    rb_ary_push(ary, rb_str_new2(SSL_CIPHER_get_name(cipher)));
+    rb_ary_push(ary, rb_str_new2(SSL_CIPHER_get_version(cipher)));
+    bits = SSL_CIPHER_get_bits(cipher, &alg_bits);
+    rb_ary_push(ary, INT2FIX(bits));
+    rb_ary_push(ary, INT2FIX(alg_bits));
+
+    return ary;
+}
+
+static VALUE
+ossl_sslctx_get_ciphers(VALUE self)
+{
+    SSL_CTX *ctx;
+    STACK_OF(SSL_CIPHER) *ciphers;
+    SSL_CIPHER *cipher;
+    VALUE ary;
+    int i, num;
+
+    Data_Get_Struct(self, SSL_CTX, ctx);
+    if(!ctx){
+        rb_warning("SSL_CTX is not initialized.");
+        return Qnil;
+    }
+    ciphers = ctx->cipher_list;
+
+    if (!ciphers)
+        return rb_ary_new();
+
+    num = sk_num((STACK*)ciphers);
+    ary = rb_ary_new2(num);
+    for(i = 0; i < num; i++){
+        cipher = (SSL_CIPHER*)sk_value((STACK*)ciphers, i);
+        rb_ary_push(ary, ossl_ssl_cipher_to_ary(cipher));
+    }
+    return ary;
+}
+
+static VALUE
+ossl_sslctx_set_ciphers(VALUE self, VALUE v)
+{
+    SSL_CTX *ctx;
+    VALUE str, elem;
+    int i;
+
+    rb_check_frozen(self);
+    if (NIL_P(v))
+	return v;
+    else if (TYPE(v) == T_ARRAY) {
+        str = rb_str_new(0, 0);
+        for (i = 0; i < RARRAY(v)->len; i++) {
+            elem = rb_ary_entry(v, i);
+            if (TYPE(elem) == T_ARRAY) elem = rb_ary_entry(elem, 0);
+            elem = rb_String(elem);
+            rb_str_append(str, elem);
+            if (i < RARRAY(v)->len-1) rb_str_cat2(str, ":");
+        }
+    } else {
+        str = v;
+        StringValue(str);
+    }
+
+    Data_Get_Struct(self, SSL_CTX, ctx);
+    if(!ctx){
+        ossl_raise(eSSLError, "SSL_CTX is not initialized.");
+        return Qnil;
+    }
+    if (!SSL_CTX_set_cipher_list(ctx, RSTRING(str)->ptr)) {
+        ossl_raise(eSSLError, "SSL_CTX_set_cipher_list:");
+    }
+
+    return v;
+}
+
+/*
+ * SSLSocket class
+ */
+static void
+ossl_ssl_shutdown(SSL *ssl)
+{
+    if (ssl) {
+        SSL_shutdown(ssl);
+        SSL_clear(ssl);
+    }
+}
+
+static void
+ossl_ssl_free(SSL *ssl)
+{
+    ossl_ssl_shutdown(ssl);
+    SSL_free(ssl);
+}
+
+static VALUE
+ossl_ssl_s_alloc(VALUE klass)
+{
+    return Data_Wrap_Struct(klass, 0, ossl_ssl_free, NULL);
+}
+
+static VALUE
+ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE io, ctx;
+
+    if (rb_scan_args(argc, argv, "11", &io, &ctx) == 1) {
+        ctx = rb_funcall(cSSLContext, rb_intern("new"), 0);
+    }
+    OSSL_Check_Kind(ctx, cSSLContext);
+    Check_Type(io, T_FILE);
+    ossl_ssl_set_io(self, io);
+    ossl_ssl_set_ctx(self, ctx);
+    ossl_ssl_set_sync_close(self, Qfalse);
+    ossl_sslctx_setup(ctx);
+    rb_call_super(0, 0);
+
+    return self;
+}
+
+static VALUE
+ossl_ssl_setup(VALUE self)
+{
+    VALUE io, v_ctx, cb;
+    SSL_CTX *ctx;
+    SSL *ssl;
+    OpenFile *fptr;
+
+    Data_Get_Struct(self, SSL, ssl);
+    if(!ssl){
+        v_ctx = ossl_ssl_get_ctx(self);
+        Data_Get_Struct(v_ctx, SSL_CTX, ctx);
+
+        ssl = SSL_new(ctx);
+        if (!ssl) {
+            ossl_raise(eSSLError, "SSL_new:");
+        }
+        DATA_PTR(self) = ssl;
+
+        io = ossl_ssl_get_io(self);
+        GetOpenFile(io, fptr);
+        rb_io_check_readable(fptr);
+        rb_io_check_writable(fptr);
+        SSL_set_fd(ssl, TO_SOCKET(fileno(fptr->f)));
+	SSL_set_ex_data(ssl, ossl_ssl_ex_ptr_idx, (void*)self);
+	cb = ossl_sslctx_get_verify_cb(v_ctx);
+	SSL_set_ex_data(ssl, ossl_ssl_ex_vcb_idx, (void*)cb);
+	cb = ossl_sslctx_get_client_cert_cb(v_ctx);
+	SSL_set_ex_data(ssl, ossl_ssl_ex_client_cert_cb_idx, (void*)cb);
+	cb = ossl_sslctx_get_tmp_dh_cb(v_ctx);
+	SSL_set_ex_data(ssl, ossl_ssl_ex_tmp_dh_callback_idx, (void*)cb);
+    }
+
+    return Qtrue;
+}
+
+#ifdef _WIN32
+#define ssl_get_error(ssl, ret) \
+  (errno = WSAGetLastError(), SSL_get_error(ssl, ret))
+#else
+#define ssl_get_error(ssl, ret) SSL_get_error(ssl, ret)
+#endif
+
+static VALUE
+ossl_start_ssl(VALUE self, int (*func)())
+{
+    SSL *ssl;
+    OpenFile *fptr;
+    int ret;
+
+    Data_Get_Struct(self, SSL, ssl);
+    GetOpenFile(ossl_ssl_get_io(self), fptr);
+    for(;;){
+	if((ret = func(ssl)) > 0) break;
+	switch(ssl_get_error(ssl, ret)){
+	case SSL_ERROR_WANT_WRITE:
+            rb_io_wait_writable(fileno(fptr->f));
+            continue;
+	case SSL_ERROR_WANT_READ:
+            rb_io_wait_readable(fileno(fptr->f));
+            continue;
+	case SSL_ERROR_SYSCALL:
+	    if (errno) rb_sys_fail(0);
+	default:
+	    ossl_raise(eSSLError, NULL);
+	}
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_ssl_connect(VALUE self)
+{
+    ossl_ssl_setup(self);
+    return ossl_start_ssl(self, SSL_connect);
+}
+
+static VALUE
+ossl_ssl_accept(VALUE self)
+{
+    ossl_ssl_setup(self);
+    return ossl_start_ssl(self, SSL_accept);
+}
+
+static VALUE
+ossl_ssl_read(int argc, VALUE *argv, VALUE self)
+{
+    SSL *ssl;
+    int ilen, nread = 0;
+    VALUE len, str;
+    OpenFile *fptr;
+
+    rb_scan_args(argc, argv, "11", &len, &str);
+    ilen = NUM2INT(len);
+    if(NIL_P(str)) str = rb_str_new(0, ilen);
+    else{
+        StringValue(str);
+        rb_str_modify(str);
+        rb_str_resize(str, ilen);
+    }
+    if(ilen == 0) return str;
+
+    Data_Get_Struct(self, SSL, ssl);
+    GetOpenFile(ossl_ssl_get_io(self), fptr);
+    if (ssl) {
+	if(SSL_pending(ssl) <= 0)
+	    rb_thread_wait_fd(fileno(fptr->f));
+	for (;;){
+	    nread = SSL_read(ssl, RSTRING(str)->ptr, RSTRING(str)->len);
+	    switch(ssl_get_error(ssl, nread)){
+	    case SSL_ERROR_NONE:
+		goto end;
+	    case SSL_ERROR_ZERO_RETURN:
+		rb_eof_error();
+	    case SSL_ERROR_WANT_WRITE:
+                rb_io_wait_writable(fileno(fptr->f));
+                continue;
+	    case SSL_ERROR_WANT_READ:
+                rb_io_wait_readable(fileno(fptr->f));
+		continue;
+	    case SSL_ERROR_SYSCALL:
+		if(ERR_peek_error() == 0 && nread == 0) rb_eof_error();
+		rb_sys_fail(0);
+	    default:
+		ossl_raise(eSSLError, "SSL_read:");
+	    }
+        }
+    }
+    else {
+        ID id_sysread = rb_intern("sysread");
+        rb_warning("SSL session is not started yet.");
+        return rb_funcall(ossl_ssl_get_io(self), id_sysread, 2, len, str);
+    }
+
+  end:
+    RSTRING(str)->len = nread;
+    RSTRING(str)->ptr[nread] = 0;
+    OBJ_TAINT(str);
+
+    return str;
+}
+
+static VALUE
+ossl_ssl_write(VALUE self, VALUE str)
+{
+    SSL *ssl;
+    int nwrite = 0;
+    OpenFile *fptr;
+
+    StringValue(str);
+    Data_Get_Struct(self, SSL, ssl);
+    GetOpenFile(ossl_ssl_get_io(self), fptr);
+
+    if (ssl) {
+	for (;;){
+	    nwrite = SSL_write(ssl, RSTRING(str)->ptr, RSTRING(str)->len);
+	    switch(ssl_get_error(ssl, nwrite)){
+	    case SSL_ERROR_NONE:
+		goto end;
+	    case SSL_ERROR_WANT_WRITE:
+                rb_io_wait_writable(fileno(fptr->f));
+                continue;
+	    case SSL_ERROR_WANT_READ:
+                rb_io_wait_readable(fileno(fptr->f));
+                continue;
+	    case SSL_ERROR_SYSCALL:
+		if (errno) rb_sys_fail(0);
+	    default:
+		ossl_raise(eSSLError, "SSL_write:");
+	    }
+        }
+    }
+    else {
+        ID id_syswrite = rb_intern("syswrite");
+        rb_warning("SSL session is not started yet.");
+	return rb_funcall(ossl_ssl_get_io(self), id_syswrite, 1, str);
+    }
+
+  end:
+    return INT2NUM(nwrite);
+}
+
+static VALUE
+ossl_ssl_close(VALUE self)
+{
+    SSL *ssl;
+
+    Data_Get_Struct(self, SSL, ssl);
+    ossl_ssl_shutdown(ssl);
+    if (RTEST(ossl_ssl_get_sync_close(self)))
+	rb_funcall(ossl_ssl_get_io(self), rb_intern("close"), 0);
+
+    return Qnil;
+}
+
+static VALUE
+ossl_ssl_get_cert(VALUE self)
+{
+    SSL *ssl;
+    X509 *cert = NULL;
+
+    Data_Get_Struct(self, SSL, ssl);
+    if (ssl) {
+        rb_warning("SSL session is not started yet.");
+        return Qnil;
+    }
+
+    /*
+     * Is this OpenSSL bug? Should add a ref?
+     * TODO: Ask for.
+     */
+    cert = SSL_get_certificate(ssl); /* NO DUPs => DON'T FREE. */
+
+    if (!cert) {
+        return Qnil;
+    }
+    return ossl_x509_new(cert);
+}
+
+static VALUE
+ossl_ssl_get_peer_cert(VALUE self)
+{
+    SSL *ssl;
+    X509 *cert = NULL;
+    VALUE obj;
+
+    Data_Get_Struct(self, SSL, ssl);
+
+    if (!ssl){
+        rb_warning("SSL session is not started yet.");
+        return Qnil;
+    }
+
+    cert = SSL_get_peer_certificate(ssl); /* Adds a ref => Safe to FREE. */
+
+    if (!cert) {
+        return Qnil;
+    }
+    obj = ossl_x509_new(cert);
+    X509_free(cert);
+
+    return obj;
+}
+
+static VALUE
+ossl_ssl_get_peer_cert_chain(VALUE self)
+{
+    SSL *ssl;
+    STACK_OF(X509) *chain;
+    X509 *cert;
+    VALUE ary;
+    int i, num;
+
+    Data_Get_Struct(self, SSL, ssl);
+    if(!ssl){
+	rb_warning("SSL session is not started yet.");
+	return Qnil;
+    }
+    chain = SSL_get_peer_cert_chain(ssl);
+    if(!chain) return Qnil;
+    num = sk_num(chain);
+    ary = rb_ary_new2(num);
+    for (i = 0; i < num; i++){
+	cert = (X509*)sk_value(chain, i);
+	rb_ary_push(ary, ossl_x509_new(cert));
+    }
+
+    return ary;
+}
+
+static VALUE
+ossl_ssl_get_cipher(VALUE self)
+{
+    SSL *ssl;
+    SSL_CIPHER *cipher;
+
+    Data_Get_Struct(self, SSL, ssl);
+    if (!ssl) {
+        rb_warning("SSL session is not started yet.");
+        return Qnil;
+    }
+    cipher = SSL_get_current_cipher(ssl);
+
+    return ossl_ssl_cipher_to_ary(cipher);
+}
+
+static VALUE
+ossl_ssl_get_state(VALUE self)
+{
+    SSL *ssl;
+    VALUE ret;
+
+    Data_Get_Struct(self, SSL, ssl);
+    if (!ssl) {
+        rb_warning("SSL session is not started yet.");
+        return Qnil;
+    }
+    ret = rb_str_new2(SSL_state_string(ssl));
+    if (ruby_verbose) {
+        rb_str_cat2(ret, ": ");
+        rb_str_cat2(ret, SSL_state_string_long(ssl));
+    }
+    return ret;
+}
+
+static VALUE
+ossl_ssl_pending(VALUE self)
+{
+    SSL *ssl;
+
+    Data_Get_Struct(self, SSL, ssl);
+    if (!ssl) {
+        rb_warning("SSL session is not started yet.");
+        return Qnil;
+    }
+
+    return INT2NUM(SSL_pending(ssl));
+}
+
+void
+Init_ossl_ssl()
+{
+    int i;
+
+#if 0 /* let rdoc know about mOSSL */
+    mOSSL = rb_define_module("OpenSSL");
+#endif
+
+    ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_vcb_idx",0,0,0);
+    ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,"ossl_ssl_ex_store_p",0,0,0);
+    ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,"ossl_ssl_ex_ptr_idx",0,0,0);
+    ossl_ssl_ex_client_cert_cb_idx =
+	SSL_get_ex_new_index(0,"ossl_ssl_ex_client_cert_cb_idx",0,0,0);
+    ossl_ssl_ex_tmp_dh_callback_idx =
+	SSL_get_ex_new_index(0,"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0);
+
+    mSSL = rb_define_module_under(mOSSL, "SSL");
+    eSSLError = rb_define_class_under(mSSL, "SSLError", eOSSLError);
+
+    /* class SSLContext */
+    cSSLContext = rb_define_class_under(mSSL, "SSLContext", rb_cObject);
+    rb_define_alloc_func(cSSLContext, ossl_sslctx_s_alloc);
+    for(i = 0; i < numberof(ossl_sslctx_attrs); i++)
+        rb_attr(cSSLContext, rb_intern(ossl_sslctx_attrs[i]), 1, 1, Qfalse);
+    rb_define_method(cSSLContext, "initialize",  ossl_sslctx_initialize, -1);
+    rb_define_method(cSSLContext, "ciphers",     ossl_sslctx_get_ciphers, 0);
+    rb_define_method(cSSLContext, "ciphers=",    ossl_sslctx_set_ciphers, 1);
+
+    /* class SSLSocket */
+    cSSLSocket = rb_define_class_under(mSSL, "SSLSocket", rb_cObject);
+    rb_define_alloc_func(cSSLSocket, ossl_ssl_s_alloc);
+    for(i = 0; i < numberof(ossl_ssl_attr_readers); i++)
+        rb_attr(cSSLSocket, rb_intern(ossl_ssl_attr_readers[i]), 1, 0, Qfalse);
+    for(i = 0; i < numberof(ossl_ssl_attrs); i++)
+        rb_attr(cSSLSocket, rb_intern(ossl_ssl_attrs[i]), 1, 1, Qfalse);
+    rb_define_alias(cSSLSocket, "to_io", "io");
+    rb_define_method(cSSLSocket, "initialize", ossl_ssl_initialize, -1);
+    rb_define_method(cSSLSocket, "connect",    ossl_ssl_connect, 0);
+    rb_define_method(cSSLSocket, "accept",     ossl_ssl_accept, 0);
+    rb_define_method(cSSLSocket, "sysread",    ossl_ssl_read, -1);
+    rb_define_method(cSSLSocket, "syswrite",   ossl_ssl_write, 1);
+    rb_define_method(cSSLSocket, "sysclose",   ossl_ssl_close, 0);
+    rb_define_method(cSSLSocket, "cert",       ossl_ssl_get_cert, 0);
+    rb_define_method(cSSLSocket, "peer_cert",  ossl_ssl_get_peer_cert, 0);
+    rb_define_method(cSSLSocket, "peer_cert_chain", ossl_ssl_get_peer_cert_chain, 0);
+    rb_define_method(cSSLSocket, "cipher",     ossl_ssl_get_cipher, 0);
+    rb_define_method(cSSLSocket, "state",      ossl_ssl_get_state, 0);
+    rb_define_method(cSSLSocket, "pending",    ossl_ssl_pending, 0);
+
+#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, INT2FIX(SSL_##x))
+
+    ossl_ssl_def_const(VERIFY_NONE);
+    ossl_ssl_def_const(VERIFY_PEER);
+    ossl_ssl_def_const(VERIFY_FAIL_IF_NO_PEER_CERT);
+    ossl_ssl_def_const(VERIFY_CLIENT_ONCE);
+    /* Not introduce constants included in OP_ALL such as...
+     * ossl_ssl_def_const(OP_MICROSOFT_SESS_ID_BUG);
+     * ossl_ssl_def_const(OP_NETSCAPE_CHALLENGE_BUG);
+     * ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
+     * ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG);
+     * ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER);
+     * ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING);
+     * ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG);
+     * ossl_ssl_def_const(OP_TLS_D5_BUG);
+     * ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG);
+     * ossl_ssl_def_const(OP_DONT_INSERT_EMPTY_FRAGMENTS);
+     */
+    ossl_ssl_def_const(OP_ALL);
+#if defined(SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION)
+    ossl_ssl_def_const(OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
+#endif
+#if defined(SSL_OP_SINGLE_ECDH_USE)
+    ossl_ssl_def_const(OP_SINGLE_ECDH_USE);
+#endif
+    ossl_ssl_def_const(OP_SINGLE_DH_USE);
+    ossl_ssl_def_const(OP_EPHEMERAL_RSA);
+#if defined(SSL_OP_CIPHER_SERVER_PREFERENCE)
+    ossl_ssl_def_const(OP_CIPHER_SERVER_PREFERENCE);
+#endif
+    ossl_ssl_def_const(OP_TLS_ROLLBACK_BUG);
+    ossl_ssl_def_const(OP_NO_SSLv2);
+    ossl_ssl_def_const(OP_NO_SSLv3);
+    ossl_ssl_def_const(OP_NO_TLSv1);
+    ossl_ssl_def_const(OP_PKCS1_CHECK_1);
+    ossl_ssl_def_const(OP_PKCS1_CHECK_2);
+    ossl_ssl_def_const(OP_NETSCAPE_CA_DN_BUG);
+    ossl_ssl_def_const(OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
+}
diff --git a/ruby_1_8_6/ext/openssl/ossl_ssl.h b/ruby_1_8_6/ext/openssl/ossl_ssl.h
new file mode 100644
index 0000000000..5929eef856
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_ssl.h
@@ -0,0 +1,21 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_SSL_H_)
+#define _OSSL_SSL_H_
+
+extern VALUE mSSL;
+extern VALUE eSSLError;
+extern VALUE cSSLSocket;
+extern VALUE cSSLContext;
+
+void Init_ossl_ssl(void);
+
+#endif /* _OSSL_SSL_H_ */
diff --git a/ruby_1_8_6/ext/openssl/ossl_version.h b/ruby_1_8_6/ext/openssl/ossl_version.h
new file mode 100644
index 0000000000..63878e0d8e
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_version.h
@@ -0,0 +1,16 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_VERSION_H_)
+#define _OSSL_VERSION_H_
+
+#define OSSL_VERSION "1.0.0"
+
+#endif /* _OSSL_VERSION_H_ */
diff --git a/ruby_1_8_6/ext/openssl/ossl_x509.c b/ruby_1_8_6/ext/openssl/ossl_x509.c
new file mode 100644
index 0000000000..fd1d9b6c7e
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_x509.c
@@ -0,0 +1,104 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+VALUE mX509;
+
+#define DefX509Const(x) rb_define_const(mX509, #x,INT2FIX(X509_##x))
+#define DefX509Default(x,i) \
+  rb_define_const(mX509, "DEFAULT_" #x, rb_str_new2(X509_get_default_##i()))
+
+void
+Init_ossl_x509()
+{
+    mX509 = rb_define_module_under(mOSSL, "X509");
+
+    Init_ossl_x509attr();
+    Init_ossl_x509cert();
+    Init_ossl_x509crl();
+    Init_ossl_x509ext();
+    Init_ossl_x509name();
+    Init_ossl_x509req();
+    Init_ossl_x509revoked();
+    Init_ossl_x509store();
+
+    DefX509Const(V_OK);
+    DefX509Const(V_ERR_UNABLE_TO_GET_ISSUER_CERT);
+    DefX509Const(V_ERR_UNABLE_TO_GET_CRL);
+    DefX509Const(V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE);
+    DefX509Const(V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE);
+    DefX509Const(V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY);
+    DefX509Const(V_ERR_CERT_SIGNATURE_FAILURE);
+    DefX509Const(V_ERR_CRL_SIGNATURE_FAILURE);
+    DefX509Const(V_ERR_CERT_NOT_YET_VALID);
+    DefX509Const(V_ERR_CERT_HAS_EXPIRED);
+    DefX509Const(V_ERR_CRL_NOT_YET_VALID);
+    DefX509Const(V_ERR_CRL_HAS_EXPIRED);
+    DefX509Const(V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD);
+    DefX509Const(V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD);
+    DefX509Const(V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD);
+    DefX509Const(V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
+    DefX509Const(V_ERR_OUT_OF_MEM);
+    DefX509Const(V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT);
+    DefX509Const(V_ERR_SELF_SIGNED_CERT_IN_CHAIN);
+    DefX509Const(V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY);
+    DefX509Const(V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE);
+    DefX509Const(V_ERR_CERT_CHAIN_TOO_LONG);
+    DefX509Const(V_ERR_CERT_REVOKED);
+    DefX509Const(V_ERR_INVALID_CA);
+    DefX509Const(V_ERR_PATH_LENGTH_EXCEEDED);
+    DefX509Const(V_ERR_INVALID_PURPOSE);
+    DefX509Const(V_ERR_CERT_UNTRUSTED);
+    DefX509Const(V_ERR_CERT_REJECTED);
+    DefX509Const(V_ERR_SUBJECT_ISSUER_MISMATCH);
+    DefX509Const(V_ERR_AKID_SKID_MISMATCH);
+    DefX509Const(V_ERR_AKID_ISSUER_SERIAL_MISMATCH);
+    DefX509Const(V_ERR_KEYUSAGE_NO_CERTSIGN);
+    DefX509Const(V_ERR_APPLICATION_VERIFICATION);
+
+#if defined(X509_V_FLAG_CRL_CHECK)
+    DefX509Const(V_FLAG_CRL_CHECK);
+#endif
+#if defined(X509_V_FLAG_CRL_CHECK_ALL)
+    DefX509Const(V_FLAG_CRL_CHECK_ALL);
+#endif
+
+    DefX509Const(PURPOSE_SSL_CLIENT);
+    DefX509Const(PURPOSE_SSL_SERVER);
+    DefX509Const(PURPOSE_NS_SSL_SERVER);
+    DefX509Const(PURPOSE_SMIME_SIGN);
+    DefX509Const(PURPOSE_SMIME_ENCRYPT);
+    DefX509Const(PURPOSE_CRL_SIGN);
+    DefX509Const(PURPOSE_ANY);
+#if defined(X509_PURPOSE_OCSP_HELPER)
+    DefX509Const(PURPOSE_OCSP_HELPER);
+#endif
+
+    DefX509Const(TRUST_COMPAT);
+    DefX509Const(TRUST_SSL_CLIENT);
+    DefX509Const(TRUST_SSL_SERVER);
+    DefX509Const(TRUST_EMAIL);
+    DefX509Const(TRUST_OBJECT_SIGN);
+#if defined(X509_TRUST_OCSP_SIGN)
+    DefX509Const(TRUST_OCSP_SIGN);
+#endif
+#if defined(X509_TRUST_OCSP_REQUEST)
+    DefX509Const(TRUST_OCSP_REQUEST);
+#endif
+
+    DefX509Default(CERT_AREA, cert_area);
+    DefX509Default(CERT_DIR, cert_dir);
+    DefX509Default(CERT_FILE, cert_file);
+    DefX509Default(CERT_DIR_ENV, cert_dir_env);
+    DefX509Default(CERT_FILE_ENV, cert_file_env);
+    DefX509Default(PRIVATE_DIR, private_dir);
+}
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_x509.h b/ruby_1_8_6/ext/openssl/ossl_x509.h
new file mode 100644
index 0000000000..1a43569073
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_x509.h
@@ -0,0 +1,114 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_X509_H_)
+#define _OSSL_X509_H_
+
+/*
+ * X509 main module
+ */
+extern VALUE mX509;
+
+void Init_ossl_x509(void);
+
+/*
+ * X509Attr
+ */
+extern VALUE cX509Attr;
+extern VALUE eX509AttrError;
+
+VALUE ossl_x509attr_new(X509_ATTRIBUTE *);
+X509_ATTRIBUTE *DupX509AttrPtr(VALUE);
+void Init_ossl_x509attr(void);
+
+/*
+ * X509Cert
+ */
+extern VALUE cX509Cert;
+extern VALUE eX509CertError;
+
+VALUE ossl_x509_new(X509 *);
+VALUE ossl_x509_new_from_file(VALUE);
+X509 *GetX509CertPtr(VALUE);
+X509 *DupX509CertPtr(VALUE);
+void Init_ossl_x509cert(void);
+
+/*
+ * X509CRL
+ */
+extern VALUE cX509CRL;
+extern VALUE eX509CRLError;
+
+VALUE ossl_x509crl_new(X509_CRL *);
+X509_CRL *GetX509CRLPtr(VALUE);
+X509_CRL *DupX509CRLPtr(VALUE);
+void Init_ossl_x509crl(void);
+
+/*
+ * X509Extension
+ */
+extern VALUE cX509Ext;
+extern VALUE cX509ExtFactory;
+extern VALUE eX509ExtError;
+
+VALUE ossl_x509ext_new(X509_EXTENSION *);
+X509_EXTENSION *GetX509ExtPtr(VALUE);
+X509_EXTENSION *DupX509ExtPtr(VALUE);
+void Init_ossl_x509ext(void);
+
+/*
+ * X509Name
+ */
+extern VALUE cX509Name;
+extern VALUE eX509NameError;
+
+VALUE ossl_x509name_new(X509_NAME *);
+X509_NAME *GetX509NamePtr(VALUE);
+void Init_ossl_x509name(void);
+
+/*
+ * X509Request
+ */
+extern VALUE cX509Req;
+extern VALUE eX509ReqError;
+
+VALUE ossl_x509req_new(X509_REQ *);
+X509_REQ *GetX509ReqPtr(VALUE);
+X509_REQ *DupX509ReqPtr(VALUE);
+void Init_ossl_x509req(void);
+
+/*
+ * X509Revoked
+ */
+extern VALUE cX509Rev;
+extern VALUE eX509RevError;
+
+VALUE ossl_x509revoked_new(X509_REVOKED *);
+X509_REVOKED *DupX509RevokedPtr(VALUE);
+void Init_ossl_x509revoked(void);
+
+/*
+ * X509Store and X509StoreContext
+ */
+extern VALUE cX509Store;
+extern VALUE cX509StoreContext;
+extern VALUE eX509StoreError;
+
+VALUE ossl_x509store_new(X509_STORE *);
+X509_STORE *GetX509StorePtr(VALUE);
+X509_STORE *DupX509StorePtr(VALUE);
+
+VALUE ossl_x509stctx_new(X509_STORE_CTX *);
+VALUE ossl_x509stctx_clear_ptr(VALUE);
+X509_STORE_CTX *GetX509StCtxtPtr(VALUE);
+
+void Init_ossl_x509store(void);
+
+#endif /* _OSSL_X509_H_ */
diff --git a/ruby_1_8_6/ext/openssl/ossl_x509attr.c b/ruby_1_8_6/ext/openssl/ossl_x509attr.c
new file mode 100644
index 0000000000..7b88e294a9
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_x509attr.c
@@ -0,0 +1,249 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#define WrapX509Attr(klass, obj, attr) do { \
+    if (!attr) { \
+	ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, X509_ATTRIBUTE_free, attr); \
+} while (0)
+#define GetX509Attr(obj, attr) do { \
+    Data_Get_Struct(obj, X509_ATTRIBUTE, attr); \
+    if (!attr) { \
+	ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
+    } \
+} while (0)
+#define SafeGetX509Attr(obj, attr) do { \
+    OSSL_Check_Kind(obj, cX509Attr); \
+    GetX509Attr(obj, attr); \
+} while (0)
+
+/*
+ * Classes
+ */
+VALUE cX509Attr;
+VALUE eX509AttrError;
+
+/*
+ * Public
+ */
+VALUE
+ossl_x509attr_new(X509_ATTRIBUTE *attr)
+{
+    X509_ATTRIBUTE *new;
+    VALUE obj;
+    
+    if (!attr) {
+	new = X509_ATTRIBUTE_new();
+    } else {
+	new = X509_ATTRIBUTE_dup(attr);
+    }
+    if (!new) {
+	ossl_raise(eX509AttrError, NULL);
+    }
+    WrapX509Attr(cX509Attr, obj, new);
+
+    return obj;
+}
+
+X509_ATTRIBUTE *
+DupX509AttrPtr(VALUE obj)
+{
+    X509_ATTRIBUTE *attr, *new;
+
+    SafeGetX509Attr(obj, attr);
+    if (!(new = X509_ATTRIBUTE_dup(attr))) {
+	ossl_raise(eX509AttrError, NULL);
+    }
+
+    return new;
+}
+
+/*
+ * Private
+ */
+static VALUE
+ossl_x509attr_alloc(VALUE klass)
+{
+    X509_ATTRIBUTE *attr;
+    VALUE obj;
+
+    if (!(attr = X509_ATTRIBUTE_new())) 
+	ossl_raise(eX509AttrError, NULL);
+    WrapX509Attr(klass, obj, attr);
+
+    return obj;
+}
+
+static VALUE
+ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE oid, value;
+    X509_ATTRIBUTE *attr;
+    unsigned char *p;
+
+    GetX509Attr(self, attr);
+    if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){
+	oid = ossl_to_der_if_possible(oid);
+	StringValue(oid);
+	p = RSTRING(oid)->ptr;
+	if(!d2i_X509_ATTRIBUTE((X509_ATTRIBUTE**)&DATA_PTR(self),
+			       &p, RSTRING(oid)->len)){
+	    ossl_raise(eX509AttrError, NULL);
+	}
+	return self;
+    }
+    rb_funcall(self, rb_intern("oid="), 1, oid);
+    rb_funcall(self, rb_intern("value="), 1, value);
+
+    return self;
+}
+
+static VALUE
+ossl_x509attr_set_oid(VALUE self, VALUE oid)
+{
+    X509_ATTRIBUTE *attr;
+    ASN1_OBJECT *obj;
+    char *s;
+ 
+    s = StringValuePtr(oid);
+    obj = OBJ_txt2obj(s, 0);
+    if(!obj) obj = OBJ_txt2obj(s, 1);
+    if(!obj) ossl_raise(eX509AttrError, NULL);
+    GetX509Attr(self, attr);
+    X509_ATTRIBUTE_set1_object(attr, obj);
+ 
+    return oid;
+}
+
+static VALUE
+ossl_x509attr_get_oid(VALUE self)
+{
+    X509_ATTRIBUTE *attr;
+    ASN1_OBJECT *oid;
+    BIO *out;
+    VALUE ret;
+    int nid;
+
+    GetX509Attr(self, attr);
+    oid = X509_ATTRIBUTE_get0_object(attr);
+    if ((nid = OBJ_obj2nid(oid)) != NID_undef)
+	ret = rb_str_new2(OBJ_nid2sn(nid));
+    else{
+	if (!(out = BIO_new(BIO_s_mem())))
+	    ossl_raise(eX509AttrError, NULL);
+	i2a_ASN1_OBJECT(out, oid);
+	ret = ossl_membio2str(out);
+    }
+  
+    return ret;
+}
+
+#if defined(HAVE_ST_X509_ATTRIBUTE_SINGLE) || defined(HAVE_ST_SINGLE)
+#  define OSSL_X509ATTR_IS_SINGLE(attr)  ((attr)->single)
+#  define OSSL_X509ATTR_SET_SINGLE(attr) ((attr)->single = 1)
+#else
+#  define OSSL_X509ATTR_IS_SINGLE(attr)  (!(attr)->set)
+#  define OSSL_X509ATTR_SET_SINGLE(attr) ((attr)->set = 0)
+#endif
+
+static VALUE
+ossl_x509attr_set_value(VALUE self, VALUE value)
+{
+    X509_ATTRIBUTE *attr;
+    ASN1_TYPE *a1type;
+
+    if(!(a1type = ossl_asn1_get_asn1type(value)))
+	ossl_raise(eASN1Error, "could not get ASN1_TYPE");
+    if(ASN1_TYPE_get(a1type) == V_ASN1_SEQUENCE){
+	ASN1_TYPE_free(a1type);
+	ossl_raise(eASN1Error, "couldn't set SEQUENCE for attribute value.");
+    }
+    GetX509Attr(self, attr);
+    if(attr->value.set){
+	if(OSSL_X509ATTR_IS_SINGLE(attr)) ASN1_TYPE_free(attr->value.single);
+	else sk_ASN1_TYPE_free(attr->value.set);
+    }
+    OSSL_X509ATTR_SET_SINGLE(attr);
+    attr->value.single = a1type;
+
+    return value;
+}
+
+static VALUE
+ossl_x509attr_get_value(VALUE self)
+{
+    X509_ATTRIBUTE *attr;
+    VALUE str, asn1;
+    long length;
+    unsigned char *p;
+
+    GetX509Attr(self, attr);
+    if(attr->value.ptr == NULL) return Qnil;
+    if(OSSL_X509ATTR_IS_SINGLE(attr)){
+	length = i2d_ASN1_TYPE(attr->value.single, NULL);
+	str = rb_str_new(0, length);
+	p = RSTRING(str)->ptr;
+	i2d_ASN1_TYPE(attr->value.single, &p);
+	ossl_str_adjust(str, p);
+    }
+    else{
+	length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL,
+			i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
+	str = rb_str_new(0, length);
+	p = RSTRING(str)->ptr;
+	i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p,
+			i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
+	ossl_str_adjust(str, p);
+    }
+    asn1 = rb_funcall(mASN1, rb_intern("decode"), 1, str);
+
+    return asn1;
+}
+
+static VALUE
+ossl_x509attr_to_der(VALUE self)
+{
+    X509_ATTRIBUTE *attr;
+    VALUE str;
+    int len;
+    unsigned char *p;
+
+    GetX509Attr(self, attr);
+    if((len = i2d_X509_ATTRIBUTE(attr, NULL)) <= 0)
+	ossl_raise(eX509AttrError, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if(i2d_X509_ATTRIBUTE(attr, &p) <= 0)
+	ossl_raise(eX509AttrError, NULL);
+    RSTRING(str)->len = p - (unsigned char*)RSTRING(str)->ptr; 
+
+    return str;
+}
+
+/*
+ * X509_ATTRIBUTE init
+ */
+void
+Init_ossl_x509attr()
+{
+    eX509AttrError = rb_define_class_under(mX509, "AttributeError", eOSSLError);
+
+    cX509Attr = rb_define_class_under(mX509, "Attribute", rb_cObject);
+    rb_define_alloc_func(cX509Attr, ossl_x509attr_alloc);
+    rb_define_method(cX509Attr, "initialize", ossl_x509attr_initialize, -1);
+    rb_define_method(cX509Attr, "oid=", ossl_x509attr_set_oid, 1);
+    rb_define_method(cX509Attr, "oid", ossl_x509attr_get_oid, 0);
+    rb_define_method(cX509Attr, "value=", ossl_x509attr_set_value, 1);
+    rb_define_method(cX509Attr, "value", ossl_x509attr_get_value, 0);
+    rb_define_method(cX509Attr, "to_der", ossl_x509attr_to_der, 0);
+}
diff --git a/ruby_1_8_6/ext/openssl/ossl_x509cert.c b/ruby_1_8_6/ext/openssl/ossl_x509cert.c
new file mode 100644
index 0000000000..fc587a31f3
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_x509cert.c
@@ -0,0 +1,671 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#define WrapX509(klass, obj, x509) do { \
+    if (!x509) { \
+	ossl_raise(rb_eRuntimeError, "CERT wasn't initialized!"); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, X509_free, x509); \
+} while (0)
+#define GetX509(obj, x509) do { \
+    Data_Get_Struct(obj, X509, x509); \
+    if (!x509) { \
+	ossl_raise(rb_eRuntimeError, "CERT wasn't initialized!"); \
+    } \
+} while (0)
+#define SafeGetX509(obj, x509) do { \
+    OSSL_Check_Kind(obj, cX509Cert); \
+    GetX509(obj, x509); \
+} while (0)
+
+/*
+ * Classes
+ */
+VALUE cX509Cert;
+VALUE eX509CertError;
+
+/*
+ * Public
+ */
+VALUE
+ossl_x509_new(X509 *x509)
+{
+    X509 *new;
+    VALUE obj;
+
+    if (!x509) {
+	new = X509_new();
+    } else {
+	new = X509_dup(x509);
+    }
+    if (!new) {
+	ossl_raise(eX509CertError, NULL);
+    }
+    WrapX509(cX509Cert, obj, new);
+	
+    return obj;
+}
+
+VALUE 
+ossl_x509_new_from_file(VALUE filename)
+{
+    X509 *x509;
+    FILE *fp;
+    VALUE obj;
+
+    SafeStringValue(filename);
+    if (!(fp = fopen(RSTRING(filename)->ptr, "r"))) {
+	ossl_raise(eX509CertError, "%s", strerror(errno));
+    }
+    x509 = PEM_read_X509(fp, NULL, NULL, NULL);
+    /*
+     * prepare for DER...
+#if !defined(OPENSSL_NO_FP_API)
+    if (!x509) {
+	rewind(fp);
+
+	x509 = d2i_X509_fp(fp, NULL);
+    }
+#endif
+    */
+    fclose(fp);
+    if (!x509) {
+	ossl_raise(eX509CertError, NULL);
+    }
+    WrapX509(cX509Cert, obj, x509);
+
+    return obj;
+}
+
+X509 *
+GetX509CertPtr(VALUE obj)
+{
+    X509 *x509;
+	
+    SafeGetX509(obj, x509);
+	
+    return x509;
+}
+
+X509 *
+DupX509CertPtr(VALUE obj)
+{
+    X509 *x509;
+	
+    SafeGetX509(obj, x509);
+	
+    CRYPTO_add(&x509->references, 1, CRYPTO_LOCK_X509);
+	
+    return x509;
+}
+
+/*
+ * Private
+ */
+static VALUE 
+ossl_x509_alloc(VALUE klass)
+{
+    X509 *x509;
+    VALUE obj;
+
+    x509 = X509_new();
+    if (!x509) ossl_raise(eX509CertError, NULL);
+
+    WrapX509(klass, obj, x509);
+
+    return obj;
+}
+
+static VALUE 
+ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
+{
+    BIO *in;
+    X509 *x509;
+    VALUE arg;
+
+    if (rb_scan_args(argc, argv, "01", &arg) == 0) {
+	/* create just empty X509Cert */
+	return self;
+    }
+    arg = ossl_to_der_if_possible(arg);
+    in = ossl_obj2bio(arg);
+    x509 = PEM_read_bio_X509(in, (X509 **)&DATA_PTR(self), NULL, NULL);
+    if (!x509) {
+	BIO_reset(in);
+	x509 = d2i_X509_bio(in, (X509 **)&DATA_PTR(self));
+    }
+    BIO_free(in);
+    if (!x509) ossl_raise(eX509CertError, NULL);
+    
+    return self;
+}
+
+static VALUE
+ossl_x509_copy(VALUE self, VALUE other)
+{
+    X509 *a, *b, *x509;
+	
+    rb_check_frozen(self);
+    if (self == other) return self;
+
+    GetX509(self, a);
+    SafeGetX509(other, b);
+
+    x509 = X509_dup(b);
+    if (!x509) ossl_raise(eX509CertError, NULL);
+    
+    DATA_PTR(self) = x509;
+    X509_free(a);
+
+    return self;
+}
+
+static VALUE 
+ossl_x509_to_der(VALUE self)
+{
+    X509 *x509;
+    VALUE str;
+    long len;
+    unsigned char *p;
+
+    GetX509(self, x509);
+    if ((len = i2d_X509(x509, NULL)) <= 0)
+	ossl_raise(eX509CertError, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if (i2d_X509(x509, &p) <= 0)
+	ossl_raise(eX509CertError, NULL);
+    ossl_str_adjust(str, p);
+    
+    return str;
+}
+
+static VALUE 
+ossl_x509_to_pem(VALUE self)
+{
+    X509 *x509;
+    BIO *out;
+    VALUE str;
+	
+    GetX509(self, x509);
+    out = BIO_new(BIO_s_mem());
+    if (!out) ossl_raise(eX509CertError, NULL);
+
+    if (!PEM_write_bio_X509(out, x509)) {
+	BIO_free(out);
+	ossl_raise(eX509CertError, NULL);
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+static VALUE
+ossl_x509_to_text(VALUE self)
+{
+    X509 *x509;
+    BIO *out;
+    VALUE str;
+	
+    GetX509(self, x509);
+
+    out = BIO_new(BIO_s_mem());
+    if (!out) ossl_raise(eX509CertError, NULL);
+
+    if (!X509_print(out, x509)) {
+	BIO_free(out);
+	ossl_raise(eX509CertError, NULL);
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+#if 0
+/*
+ * Makes from X509 X509_REQuest
+ */
+static VALUE 
+ossl_x509_to_req(VALUE self)
+{
+    X509 *x509;
+    X509_REQ *req;
+    VALUE obj;
+
+    GetX509(self, x509);
+    if (!(req = X509_to_X509_REQ(x509, NULL, EVP_md5()))) {
+	ossl_raise(eX509CertError, NULL);
+    }
+    obj = ossl_x509req_new(req);
+    X509_REQ_free(req);
+
+    return obj;
+}
+#endif
+
+static VALUE 
+ossl_x509_get_version(VALUE self)
+{
+    X509 *x509;
+
+    GetX509(self, x509);
+	
+    return LONG2NUM(X509_get_version(x509));
+}
+
+static VALUE 
+ossl_x509_set_version(VALUE self, VALUE version)
+{
+    X509 *x509;
+    long ver;
+
+    if ((ver = NUM2LONG(version)) < 0) {
+	ossl_raise(eX509CertError, "version must be >= 0!");
+    }
+    GetX509(self, x509);
+    if (!X509_set_version(x509, ver)) {
+	ossl_raise(eX509CertError, NULL);
+    }
+
+    return version;
+}
+
+static VALUE 
+ossl_x509_get_serial(VALUE self)
+{
+    X509 *x509;
+
+    GetX509(self, x509);
+	
+    return asn1integer_to_num(X509_get_serialNumber(x509));
+}
+
+static VALUE 
+ossl_x509_set_serial(VALUE self, VALUE num)
+{
+    X509 *x509;
+
+    GetX509(self, x509);
+
+    x509->cert_info->serialNumber =
+	num_to_asn1integer(num, X509_get_serialNumber(x509));
+	
+    return num;
+}
+
+static VALUE 
+ossl_x509_get_signature_algorithm(VALUE self)
+{
+    X509 *x509;
+    BIO *out;
+    VALUE str;
+
+    GetX509(self, x509);
+    out = BIO_new(BIO_s_mem());
+    if (!out) ossl_raise(eX509CertError, NULL);
+
+    if (!i2a_ASN1_OBJECT(out, x509->cert_info->signature->algorithm)) {
+	BIO_free(out);
+	ossl_raise(eX509CertError, NULL);
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+static VALUE 
+ossl_x509_get_subject(VALUE self)
+{
+    X509 *x509;
+    X509_NAME *name;
+	
+    GetX509(self, x509);
+    if (!(name = X509_get_subject_name(x509))) { /* NO DUP - don't free! */
+	ossl_raise(eX509CertError, NULL);
+    }
+
+    return ossl_x509name_new(name);
+}
+
+static VALUE 
+ossl_x509_set_subject(VALUE self, VALUE subject)
+{
+    X509 *x509;
+	
+    GetX509(self, x509);
+    if (!X509_set_subject_name(x509, GetX509NamePtr(subject))) { /* DUPs name */
+	ossl_raise(eX509CertError, NULL);
+    }
+
+    return subject;
+}
+
+static VALUE 
+ossl_x509_get_issuer(VALUE self)
+{
+    X509 *x509;
+    X509_NAME *name;
+
+    GetX509(self, x509);
+    if(!(name = X509_get_issuer_name(x509))) { /* NO DUP - don't free! */
+	ossl_raise(eX509CertError, NULL);
+    }
+
+    return ossl_x509name_new(name);
+}
+
+static VALUE 
+ossl_x509_set_issuer(VALUE self, VALUE issuer)
+{
+    X509 *x509;
+
+    GetX509(self, x509);
+    if (!X509_set_issuer_name(x509, GetX509NamePtr(issuer))) { /* DUPs name */
+	ossl_raise(eX509CertError, NULL);
+    }
+
+    return issuer;
+}
+
+static VALUE 
+ossl_x509_get_not_before(VALUE self)
+{
+    X509 *x509;
+    ASN1_UTCTIME *asn1time;
+
+    GetX509(self, x509);
+    if (!(asn1time = X509_get_notBefore(x509))) { /* NO DUP - don't free! */
+	ossl_raise(eX509CertError, NULL);
+    }
+
+    return asn1time_to_time(asn1time);
+}
+
+static VALUE 
+ossl_x509_set_not_before(VALUE self, VALUE time)
+{
+    X509 *x509;
+    time_t sec;
+	
+    sec = time_to_time_t(time);
+    GetX509(self, x509);
+    if (!X509_time_adj(X509_get_notBefore(x509), 0, &sec)) {
+	ossl_raise(eX509CertError, NULL);
+    }
+
+    return time;
+}
+
+static VALUE 
+ossl_x509_get_not_after(VALUE self)
+{
+    X509 *x509;
+    ASN1_TIME *asn1time;
+
+    GetX509(self, x509);
+    if (!(asn1time = X509_get_notAfter(x509))) { /* NO DUP - don't free! */
+	ossl_raise(eX509CertError, NULL);
+    }
+
+    return asn1time_to_time(asn1time);
+}
+
+static VALUE 
+ossl_x509_set_not_after(VALUE self, VALUE time)
+{
+    X509 *x509;
+    time_t sec;
+	
+    sec = time_to_time_t(time);
+    GetX509(self, x509);
+    if (!X509_time_adj(X509_get_notAfter(x509), 0, &sec)) {
+	ossl_raise(eX509CertError, NULL);
+    }
+
+    return time;
+}
+
+static VALUE 
+ossl_x509_get_public_key(VALUE self)
+{
+    X509 *x509;
+    EVP_PKEY *pkey;
+
+    GetX509(self, x509);
+    if (!(pkey = X509_get_pubkey(x509))) { /* adds an reference */
+	ossl_raise(eX509CertError, NULL);
+    }
+
+    return ossl_pkey_new(pkey); /* NO DUP - OK */
+}
+
+static VALUE 
+ossl_x509_set_public_key(VALUE self, VALUE key)
+{
+    X509 *x509;
+
+    GetX509(self, x509);
+    if (!X509_set_pubkey(x509, GetPKeyPtr(key))) { /* DUPs pkey */
+	ossl_raise(eX509CertError, NULL);
+    }
+
+    return key;
+}
+
+static VALUE 
+ossl_x509_sign(VALUE self, VALUE key, VALUE digest)
+{
+    X509 *x509;
+    EVP_PKEY *pkey;
+    const EVP_MD *md;
+
+    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
+    md = GetDigestPtr(digest);
+    GetX509(self, x509);
+    if (!X509_sign(x509, pkey, md)) {
+	ossl_raise(eX509CertError, NULL);
+    }
+
+    return self;
+}
+
+/*
+ * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
+ */
+static VALUE 
+ossl_x509_verify(VALUE self, VALUE key)
+{
+    X509 *x509;
+    EVP_PKEY *pkey;
+    int i;
+
+    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
+    GetX509(self, x509);
+    if ((i = X509_verify(x509, pkey)) < 0) {
+	ossl_raise(eX509CertError, NULL);
+    } 
+    if (i > 0) {
+	return Qtrue;
+    }
+
+    return Qfalse;
+}
+
+/*
+ * Checks if 'key' is PRIV key for this cert
+ */
+static VALUE 
+ossl_x509_check_private_key(VALUE self, VALUE key)
+{
+    X509 *x509;
+    EVP_PKEY *pkey;
+	
+    /* not needed private key, but should be */
+    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
+    GetX509(self, x509);
+    if (!X509_check_private_key(x509, pkey)) {
+	OSSL_Warning("Check private key:%s", OSSL_ErrMsg());
+	return Qfalse;
+    }
+
+    return Qtrue;
+}
+
+/*
+ * Gets X509v3 extensions as array of X509Ext objects
+ */
+static VALUE 
+ossl_x509_get_extensions(VALUE self)
+{
+    X509 *x509;
+    int count, i;
+    X509_EXTENSION *ext;
+    VALUE ary;
+
+    GetX509(self, x509);
+    count = X509_get_ext_count(x509);
+    if (count < 0) {
+	return rb_ary_new();
+    }
+    ary = rb_ary_new2(count);
+    for (i=0; i<count; i++) {
+	ext = X509_get_ext(x509, i); /* NO DUP - don't free! */
+	rb_ary_push(ary, ossl_x509ext_new(ext));
+    }
+
+    return ary;
+}
+
+/*
+ * Sets X509_EXTENSIONs
+ */
+static VALUE 
+ossl_x509_set_extensions(VALUE self, VALUE ary)
+{
+    X509 *x509;
+    X509_EXTENSION *ext;
+    int i;
+	
+    Check_Type(ary, T_ARRAY);
+    /* All ary's members should be X509Extension */
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Ext);
+    }
+    GetX509(self, x509);
+    sk_X509_EXTENSION_pop_free(x509->cert_info->extensions, X509_EXTENSION_free);
+    x509->cert_info->extensions = NULL;
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	ext = DupX509ExtPtr(RARRAY(ary)->ptr[i]);
+	
+	if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
+	    X509_EXTENSION_free(ext);
+	    ossl_raise(eX509CertError, NULL);
+	}
+	X509_EXTENSION_free(ext);
+    }
+
+    return ary;
+}
+
+static VALUE 
+ossl_x509_add_extension(VALUE self, VALUE extension)
+{
+    X509 *x509;
+    X509_EXTENSION *ext;
+	
+    GetX509(self, x509);
+    ext = DupX509ExtPtr(extension);
+    if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
+	X509_EXTENSION_free(ext);
+	ossl_raise(eX509CertError, NULL);
+    }
+    X509_EXTENSION_free(ext);
+
+    return extension;
+}
+
+static VALUE
+ossl_x509_inspect(VALUE self)
+{
+    VALUE str;
+    char *cname = rb_class2name(rb_obj_class(self));
+
+    str = rb_str_new2("#<");
+    rb_str_cat2(str, cname);
+    rb_str_cat2(str, " ");
+
+    rb_str_cat2(str, "subject=");
+    rb_str_append(str, rb_inspect(ossl_x509_get_subject(self)));
+    rb_str_cat2(str, ", ");
+
+    rb_str_cat2(str, "issuer=");
+    rb_str_append(str, rb_inspect(ossl_x509_get_issuer(self)));
+    rb_str_cat2(str, ", ");
+
+    rb_str_cat2(str, "serial=");
+    rb_str_append(str, rb_inspect(ossl_x509_get_serial(self)));
+    rb_str_cat2(str, ", ");
+
+    rb_str_cat2(str, "not_before=");
+    rb_str_append(str, rb_inspect(ossl_x509_get_not_before(self)));
+    rb_str_cat2(str, ", ");
+
+    rb_str_cat2(str, "not_after=");
+    rb_str_append(str, rb_inspect(ossl_x509_get_not_after(self)));
+
+    str = rb_str_cat2(str, ">");
+
+    return str;
+}
+
+/*
+ * INIT
+ */
+void 
+Init_ossl_x509cert()
+{
+    eX509CertError = rb_define_class_under(mX509, "CertificateError", eOSSLError);
+	
+    cX509Cert = rb_define_class_under(mX509, "Certificate", rb_cObject);
+	
+    rb_define_alloc_func(cX509Cert, ossl_x509_alloc);
+    rb_define_method(cX509Cert, "initialize", ossl_x509_initialize, -1);
+    rb_define_copy_func(cX509Cert, ossl_x509_copy);
+    
+    rb_define_method(cX509Cert, "to_der", ossl_x509_to_der, 0);
+    rb_define_method(cX509Cert, "to_pem", ossl_x509_to_pem, 0);
+    rb_define_alias(cX509Cert, "to_s", "to_pem");
+    rb_define_method(cX509Cert, "to_text", ossl_x509_to_text, 0);
+    rb_define_method(cX509Cert, "version", ossl_x509_get_version, 0);
+    rb_define_method(cX509Cert, "version=", ossl_x509_set_version, 1);
+    rb_define_method(cX509Cert, "signature_algorithm", ossl_x509_get_signature_algorithm, 0);
+    rb_define_method(cX509Cert, "serial", ossl_x509_get_serial, 0);
+    rb_define_method(cX509Cert, "serial=", ossl_x509_set_serial, 1);
+    rb_define_method(cX509Cert, "subject", ossl_x509_get_subject, 0);
+    rb_define_method(cX509Cert, "subject=", ossl_x509_set_subject, 1);
+    rb_define_method(cX509Cert, "issuer", ossl_x509_get_issuer, 0);
+    rb_define_method(cX509Cert, "issuer=", ossl_x509_set_issuer, 1);
+    rb_define_method(cX509Cert, "not_before", ossl_x509_get_not_before, 0);
+    rb_define_method(cX509Cert, "not_before=", ossl_x509_set_not_before, 1);
+    rb_define_method(cX509Cert, "not_after", ossl_x509_get_not_after, 0);
+    rb_define_method(cX509Cert, "not_after=", ossl_x509_set_not_after, 1);
+    rb_define_method(cX509Cert, "public_key", ossl_x509_get_public_key, 0);
+    rb_define_method(cX509Cert, "public_key=", ossl_x509_set_public_key, 1);
+    rb_define_method(cX509Cert, "sign", ossl_x509_sign, 2);
+    rb_define_method(cX509Cert, "verify", ossl_x509_verify, 1);
+    rb_define_method(cX509Cert, "check_private_key", ossl_x509_check_private_key, 1);
+    rb_define_method(cX509Cert, "extensions", ossl_x509_get_extensions, 0);
+    rb_define_method(cX509Cert, "extensions=", ossl_x509_set_extensions, 1);
+    rb_define_method(cX509Cert, "add_extension", ossl_x509_add_extension, 1);
+    rb_define_method(cX509Cert, "inspect", ossl_x509_inspect, 0);
+}
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_x509crl.c b/ruby_1_8_6/ext/openssl/ossl_x509crl.c
new file mode 100644
index 0000000000..0dc22416e7
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_x509crl.c
@@ -0,0 +1,535 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#define WrapX509CRL(klass, obj, crl) do { \
+    if (!crl) { \
+	ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, X509_CRL_free, crl); \
+} while (0)
+#define GetX509CRL(obj, crl) do { \
+    Data_Get_Struct(obj, X509_CRL, crl); \
+    if (!crl) { \
+	ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \
+    } \
+} while (0)
+#define SafeGetX509CRL(obj, crl) do { \
+    OSSL_Check_Kind(obj, cX509CRL); \
+    GetX509CRL(obj, crl); \
+} while (0)
+
+/*
+ * Classes
+ */
+VALUE cX509CRL;
+VALUE eX509CRLError;
+
+/*
+ * PUBLIC
+ */
+X509_CRL *
+GetX509CRLPtr(VALUE obj)
+{
+    X509_CRL *crl;
+
+    SafeGetX509CRL(obj, crl);
+
+    return crl;
+}
+
+X509_CRL *
+DupX509CRLPtr(VALUE obj)
+{
+    X509_CRL *crl;
+
+    SafeGetX509CRL(obj, crl);
+    CRYPTO_add(&crl->references, 1, CRYPTO_LOCK_X509_CRL);
+
+    return crl;
+}
+
+VALUE
+ossl_x509crl_new(X509_CRL *crl)
+{
+    X509_CRL *tmp;
+    VALUE obj;
+
+    tmp = crl ? X509_CRL_dup(crl) : X509_CRL_new();
+    if(!tmp) ossl_raise(eX509CRLError, NULL);
+    WrapX509CRL(cX509CRL, obj, tmp);
+        
+    return obj;
+}
+
+/*
+ * PRIVATE
+ */
+static VALUE 
+ossl_x509crl_alloc(VALUE klass)
+{
+    X509_CRL *crl;
+    VALUE obj;
+
+    if (!(crl = X509_CRL_new())) {
+	ossl_raise(eX509CRLError, NULL);
+    }
+    WrapX509CRL(klass, obj, crl);
+
+    return obj;
+}
+
+static VALUE 
+ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
+{
+    BIO *in;
+    X509_CRL *crl;
+    VALUE arg;
+
+    if (rb_scan_args(argc, argv, "01", &arg) == 0) {
+	return self;
+    }
+    arg = ossl_to_der_if_possible(arg);
+    in = ossl_obj2bio(arg);
+    crl = PEM_read_bio_X509_CRL(in, (X509_CRL **)&DATA_PTR(self), NULL, NULL);
+    if (!crl) {
+	BIO_reset(in);
+	crl = d2i_X509_CRL_bio(in, (X509_CRL **)&DATA_PTR(self));
+    }
+    BIO_free(in);
+    if (!crl) ossl_raise(eX509CRLError, NULL);
+
+    return self;
+}
+
+static VALUE
+ossl_x509crl_copy(VALUE self, VALUE other)
+{
+    X509_CRL *a, *b, *crl;
+	
+    rb_check_frozen(self);
+    if (self == other) return self;
+    GetX509CRL(self, a);
+    SafeGetX509CRL(other, b);
+    if (!(crl = X509_CRL_dup(b))) {
+	ossl_raise(eX509CRLError, NULL);
+    }
+    X509_CRL_free(a);
+    DATA_PTR(self) = crl;
+
+    return self;
+}
+
+static VALUE 
+ossl_x509crl_get_version(VALUE self)
+{
+    X509_CRL *crl;
+    long ver;
+
+    GetX509CRL(self, crl);
+    ver = X509_CRL_get_version(crl);
+
+    return LONG2NUM(ver);
+}
+
+static VALUE 
+ossl_x509crl_set_version(VALUE self, VALUE version)
+{
+    X509_CRL *crl;
+    long ver;
+
+    if ((ver = NUM2LONG(version)) < 0) {
+	ossl_raise(eX509CRLError, "version must be >= 0!");
+    }
+    GetX509CRL(self, crl);
+    if (!X509_CRL_set_version(crl, ver)) {
+	ossl_raise(eX509CRLError, NULL);
+    }
+
+    return version;
+}
+
+static VALUE 
+ossl_x509crl_get_signature_algorithm(VALUE self)
+{
+    X509_CRL *crl;
+    BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
+
+    GetX509CRL(self, crl);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eX509CRLError, NULL);
+    }
+    if (!i2a_ASN1_OBJECT(out, crl->sig_alg->algorithm)) {
+	BIO_free(out);
+	ossl_raise(eX509CRLError, NULL);
+    }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
+    return str;
+}
+
+static VALUE 
+ossl_x509crl_get_issuer(VALUE self)
+{
+    X509_CRL *crl;
+
+    GetX509CRL(self, crl);
+
+    return ossl_x509name_new(X509_CRL_get_issuer(crl)); /* NO DUP - don't free */
+}
+
+static VALUE 
+ossl_x509crl_set_issuer(VALUE self, VALUE issuer)
+{
+    X509_CRL *crl;
+
+    GetX509CRL(self, crl);
+
+    if (!X509_CRL_set_issuer_name(crl, GetX509NamePtr(issuer))) { /* DUPs name */
+	ossl_raise(eX509CRLError, NULL);
+    }
+    return issuer;
+}
+
+static VALUE 
+ossl_x509crl_get_last_update(VALUE self)
+{
+    X509_CRL *crl;
+
+    GetX509CRL(self, crl);
+
+    return asn1time_to_time(X509_CRL_get_lastUpdate(crl));
+}
+
+static VALUE 
+ossl_x509crl_set_last_update(VALUE self, VALUE time)
+{
+    X509_CRL *crl;
+    time_t sec;
+
+    sec = time_to_time_t(time);
+    GetX509CRL(self, crl);
+    if (!X509_time_adj(crl->crl->lastUpdate, 0, &sec)) {
+	ossl_raise(eX509CRLError, NULL);
+    }
+
+    return time;
+}
+
+static VALUE 
+ossl_x509crl_get_next_update(VALUE self)
+{
+    X509_CRL *crl;
+
+    GetX509CRL(self, crl);
+
+    return asn1time_to_time(X509_CRL_get_nextUpdate(crl));
+}
+
+static VALUE 
+ossl_x509crl_set_next_update(VALUE self, VALUE time)
+{
+    X509_CRL *crl;
+    time_t sec;
+
+    sec = time_to_time_t(time);
+    GetX509CRL(self, crl);
+    /* This must be some thinko in OpenSSL */
+    if (!(crl->crl->nextUpdate = X509_time_adj(crl->crl->nextUpdate, 0, &sec))){
+	ossl_raise(eX509CRLError, NULL);
+    }
+
+    return time;
+}
+
+static VALUE
+ossl_x509crl_get_revoked(VALUE self)
+{
+    X509_CRL *crl;
+    int i, num;
+    X509_REVOKED *rev;
+    VALUE ary, revoked;
+
+    GetX509CRL(self, crl);
+    num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl));
+    if (num < 0) {
+	OSSL_Debug("num < 0???");
+	return rb_ary_new();
+    }
+    ary = rb_ary_new2(num);
+    for(i=0; i<num; i++) {
+	/* NO DUP - don't free! */
+	rev = (X509_REVOKED *)sk_X509_CRL_value(X509_CRL_get_REVOKED(crl), i);
+	revoked = ossl_x509revoked_new(rev);
+	rb_ary_push(ary, revoked);
+    }
+
+    return ary;
+}
+
+static VALUE 
+ossl_x509crl_set_revoked(VALUE self, VALUE ary)
+{
+    X509_CRL *crl;
+    X509_REVOKED *rev;
+    int i;
+
+    Check_Type(ary, T_ARRAY);
+    /* All ary members should be X509 Revoked */
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Rev);
+    }
+    GetX509CRL(self, crl);
+    sk_X509_REVOKED_pop_free(crl->crl->revoked, X509_REVOKED_free);
+    crl->crl->revoked = NULL;
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	rev = DupX509RevokedPtr(RARRAY(ary)->ptr[i]);
+	if (!X509_CRL_add0_revoked(crl, rev)) { /* NO DUP - don't free! */
+	    ossl_raise(eX509CRLError, NULL);
+	}
+    }
+    X509_CRL_sort(crl);
+
+    return ary;
+}
+
+static VALUE 
+ossl_x509crl_add_revoked(VALUE self, VALUE revoked)
+{
+    X509_CRL *crl;
+    X509_REVOKED *rev;
+
+    GetX509CRL(self, crl);
+    rev = DupX509RevokedPtr(revoked);
+    if (!X509_CRL_add0_revoked(crl, rev)) { /* NO DUP - don't free! */
+	ossl_raise(eX509CRLError, NULL);
+    }
+    X509_CRL_sort(crl);
+
+    return revoked;
+}
+
+static VALUE 
+ossl_x509crl_sign(VALUE self, VALUE key, VALUE digest)
+{
+    X509_CRL *crl;
+    EVP_PKEY *pkey;
+    const EVP_MD *md;
+
+    GetX509CRL(self, crl);
+    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
+    md = GetDigestPtr(digest);
+    if (!X509_CRL_sign(crl, pkey, md)) {
+	ossl_raise(eX509CRLError, NULL);
+    }
+
+    return self;
+}
+
+static VALUE 
+ossl_x509crl_verify(VALUE self, VALUE key)
+{
+    X509_CRL *crl;
+    int ret;
+
+    GetX509CRL(self, crl);
+    if ((ret = X509_CRL_verify(crl, GetPKeyPtr(key))) < 0) {
+	ossl_raise(eX509CRLError, NULL);
+    }
+    if (ret == 1) {
+	return Qtrue;
+    }
+
+    return Qfalse;
+}
+
+static VALUE 
+ossl_x509crl_to_der(VALUE self)
+{
+    X509_CRL *crl;
+    BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
+
+    GetX509CRL(self, crl);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eX509CRLError, NULL);
+    }
+    if (!i2d_X509_CRL_bio(out, crl)) {
+	BIO_free(out);
+	ossl_raise(eX509CRLError, NULL);
+    }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
+
+    return str;
+}
+
+static VALUE 
+ossl_x509crl_to_pem(VALUE self)
+{
+    X509_CRL *crl;
+    BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
+
+    GetX509CRL(self, crl);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eX509CRLError, NULL);
+    }
+    if (!PEM_write_bio_X509_CRL(out, crl)) {
+	BIO_free(out);
+	ossl_raise(eX509CRLError, NULL);
+    }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
+
+    return str;
+}
+
+static VALUE 
+ossl_x509crl_to_text(VALUE self)
+{
+    X509_CRL *crl;
+    BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
+
+    GetX509CRL(self, crl);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eX509CRLError, NULL);
+    }
+    if (!X509_CRL_print(out, crl)) {
+	BIO_free(out);
+	ossl_raise(eX509CRLError, NULL);
+    }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
+	
+    return str;
+}
+
+/*
+ * Gets X509v3 extensions as array of X509Ext objects
+ */
+static VALUE 
+ossl_x509crl_get_extensions(VALUE self)
+{
+    X509_CRL *crl;
+    int count, i;
+    X509_EXTENSION *ext;
+    VALUE ary;
+
+    GetX509CRL(self, crl);
+    count = X509_CRL_get_ext_count(crl);
+    if (count < 0) {
+	OSSL_Debug("count < 0???");
+	return rb_ary_new();
+    }
+    ary = rb_ary_new2(count);
+    for (i=0; i<count; i++) {
+	ext = X509_CRL_get_ext(crl, i); /* NO DUP - don't free! */
+	rb_ary_push(ary, ossl_x509ext_new(ext));
+    }
+
+    return ary;
+}
+
+/*
+ * Sets X509_EXTENSIONs
+ */
+static VALUE 
+ossl_x509crl_set_extensions(VALUE self, VALUE ary)
+{
+    X509_CRL *crl;
+    X509_EXTENSION *ext;
+    int i;
+	
+    Check_Type(ary, T_ARRAY);
+    /* All ary members should be X509 Extensions */
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Ext);
+    }
+    GetX509CRL(self, crl);
+    sk_X509_EXTENSION_pop_free(crl->crl->extensions, X509_EXTENSION_free);
+    crl->crl->extensions = NULL;
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	ext = DupX509ExtPtr(RARRAY(ary)->ptr[i]);
+	if(!X509_CRL_add_ext(crl, ext, -1)) { /* DUPs ext - FREE it */
+	    X509_EXTENSION_free(ext);
+	    ossl_raise(eX509CRLError, NULL);
+	}
+	X509_EXTENSION_free(ext);
+    }
+
+    return ary;
+}
+
+static VALUE 
+ossl_x509crl_add_extension(VALUE self, VALUE extension)
+{
+    X509_CRL *crl;
+    X509_EXTENSION *ext;
+
+    GetX509CRL(self, crl);
+    ext = DupX509ExtPtr(extension);
+    if (!X509_CRL_add_ext(crl, ext, -1)) { /* DUPs ext - FREE it */
+	X509_EXTENSION_free(ext);
+	ossl_raise(eX509CRLError, NULL);
+    }
+    X509_EXTENSION_free(ext);
+
+    return extension;
+}
+
+/*
+ * INIT
+ */
+void 
+Init_ossl_x509crl()
+{
+    eX509CRLError = rb_define_class_under(mX509, "CRLError", eOSSLError);
+
+    cX509CRL = rb_define_class_under(mX509, "CRL", rb_cObject);
+	
+    rb_define_alloc_func(cX509CRL, ossl_x509crl_alloc);
+    rb_define_method(cX509CRL, "initialize", ossl_x509crl_initialize, -1);
+    rb_define_copy_func(cX509CRL, ossl_x509crl_copy);
+    
+    rb_define_method(cX509CRL, "version", ossl_x509crl_get_version, 0);
+    rb_define_method(cX509CRL, "version=", ossl_x509crl_set_version, 1);
+    rb_define_method(cX509CRL, "signature_algorithm", ossl_x509crl_get_signature_algorithm, 0);
+    rb_define_method(cX509CRL, "issuer", ossl_x509crl_get_issuer, 0);
+    rb_define_method(cX509CRL, "issuer=", ossl_x509crl_set_issuer, 1);
+    rb_define_method(cX509CRL, "last_update", ossl_x509crl_get_last_update, 0);
+    rb_define_method(cX509CRL, "last_update=", ossl_x509crl_set_last_update, 1);
+    rb_define_method(cX509CRL, "next_update", ossl_x509crl_get_next_update, 0);
+    rb_define_method(cX509CRL, "next_update=", ossl_x509crl_set_next_update, 1);
+    rb_define_method(cX509CRL, "revoked", ossl_x509crl_get_revoked, 0);
+    rb_define_method(cX509CRL, "revoked=", ossl_x509crl_set_revoked, 1);
+    rb_define_method(cX509CRL, "add_revoked", ossl_x509crl_add_revoked, 1);
+    rb_define_method(cX509CRL, "sign", ossl_x509crl_sign, 2);
+    rb_define_method(cX509CRL, "verify", ossl_x509crl_verify, 1);
+    rb_define_method(cX509CRL, "to_der", ossl_x509crl_to_der, 0);
+    rb_define_method(cX509CRL, "to_pem", ossl_x509crl_to_pem, 0);
+    rb_define_alias(cX509CRL, "to_s", "to_pem");
+    rb_define_method(cX509CRL, "to_text", ossl_x509crl_to_text, 0);
+    rb_define_method(cX509CRL, "extensions", ossl_x509crl_get_extensions, 0);
+    rb_define_method(cX509CRL, "extensions=", ossl_x509crl_set_extensions, 1);
+    rb_define_method(cX509CRL, "add_extension", ossl_x509crl_add_extension, 1);
+}
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_x509ext.c b/ruby_1_8_6/ext/openssl/ossl_x509ext.c
new file mode 100644
index 0000000000..31ffec48fa
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_x509ext.c
@@ -0,0 +1,456 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#define WrapX509Ext(klass, obj, ext) do { \
+    if (!ext) { \
+	ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, X509_EXTENSION_free, ext); \
+} while (0)
+#define GetX509Ext(obj, ext) do { \
+    Data_Get_Struct(obj, X509_EXTENSION, ext); \
+    if (!ext) { \
+	ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
+    } \
+} while (0)
+#define SafeGetX509Ext(obj, ext) do { \
+    OSSL_Check_Kind(obj, cX509Ext); \
+    GetX509Ext(obj, ext); \
+} while (0)
+#define MakeX509ExtFactory(klass, obj, ctx) do { \
+    if (!(ctx = OPENSSL_malloc(sizeof(X509V3_CTX)))) \
+        ossl_raise(rb_eRuntimeError, "CTX wasn't allocated!"); \
+    X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, 0); \
+    obj = Data_Wrap_Struct(klass, 0, ossl_x509extfactory_free, ctx); \
+} while (0)
+#define GetX509ExtFactory(obj, ctx) do { \
+    Data_Get_Struct(obj, X509V3_CTX, ctx); \
+    if (!ctx) { \
+	ossl_raise(rb_eRuntimeError, "CTX wasn't initialized!"); \
+    } \
+} while (0)
+
+/*
+ * Classes
+ */
+VALUE cX509Ext;
+VALUE cX509ExtFactory;
+VALUE eX509ExtError;
+
+/*
+ * Public
+ */
+VALUE 
+ossl_x509ext_new(X509_EXTENSION *ext)
+{
+    X509_EXTENSION *new;
+    VALUE obj;
+
+    if (!ext) {
+	new = X509_EXTENSION_new();
+    } else {
+	new = X509_EXTENSION_dup(ext);
+    }
+    if (!new) {
+	ossl_raise(eX509ExtError, NULL);
+    }
+    WrapX509Ext(cX509Ext, obj, new);
+	
+    return obj;
+}
+
+X509_EXTENSION *
+GetX509ExtPtr(VALUE obj)
+{
+    X509_EXTENSION *ext;
+
+    SafeGetX509Ext(obj, ext);
+
+    return ext;
+}
+
+X509_EXTENSION *
+DupX509ExtPtr(VALUE obj)
+{
+    X509_EXTENSION *ext, *new;
+
+    SafeGetX509Ext(obj, ext);
+    if (!(new = X509_EXTENSION_dup(ext))) {
+	ossl_raise(eX509ExtError, NULL);
+    }
+
+    return new;
+}
+
+/*
+ * Private
+ */
+/*
+ * Ext factory
+ */
+static void
+ossl_x509extfactory_free(X509V3_CTX *ctx)
+{
+    OPENSSL_free(ctx);
+}
+
+static VALUE 
+ossl_x509extfactory_alloc(VALUE klass)
+{
+    X509V3_CTX *ctx;
+    VALUE obj;
+
+    MakeX509ExtFactory(klass, obj, ctx);
+
+    return obj;
+}
+
+static VALUE 
+ossl_x509extfactory_set_issuer_cert(VALUE self, VALUE cert)
+{
+    X509V3_CTX *ctx;
+
+    GetX509ExtFactory(self, ctx);
+    rb_iv_set(self, "@issuer_certificate", cert);
+    ctx->issuer_cert = GetX509CertPtr(cert); /* NO DUP NEEDED */
+
+    return cert;
+}
+
+static VALUE 
+ossl_x509extfactory_set_subject_cert(VALUE self, VALUE cert)
+{
+    X509V3_CTX *ctx;
+
+    GetX509ExtFactory(self, ctx);
+    rb_iv_set(self, "@subject_certificate", cert);
+    ctx->subject_cert = GetX509CertPtr(cert); /* NO DUP NEEDED */
+
+    return cert;
+}
+
+static VALUE 
+ossl_x509extfactory_set_subject_req(VALUE self, VALUE req)
+{
+    X509V3_CTX *ctx;
+
+    GetX509ExtFactory(self, ctx);
+    rb_iv_set(self, "@subject_request", req);
+    ctx->subject_req = GetX509ReqPtr(req); /* NO DUP NEEDED */
+
+    return req;
+}
+
+static VALUE 
+ossl_x509extfactory_set_crl(VALUE self, VALUE crl)
+{
+    X509V3_CTX *ctx;
+
+    GetX509ExtFactory(self, ctx);
+    rb_iv_set(self, "@crl", crl);
+    ctx->crl = GetX509CRLPtr(crl); /* NO DUP NEEDED */
+
+    return crl;
+}
+
+static VALUE
+ossl_x509extfactory_set_config(VALUE self, VALUE config)
+{
+#ifdef HAVE_X509V3_SET_NCONF
+    X509V3_CTX *ctx;
+    CONF *conf;
+
+    GetX509ExtFactory(self, ctx);
+    rb_iv_set(self, "@config", config);
+    conf = GetConfigPtr(config);  /* NO DUP NEEDED */
+    X509V3_set_nconf(ctx, conf);
+
+    return config;
+#else
+    rb_notimplement();
+#endif
+}
+
+static VALUE 
+ossl_x509extfactory_initialize(int argc, VALUE *argv, VALUE self)
+{
+    /*X509V3_CTX *ctx;*/
+    VALUE issuer_cert, subject_cert, subject_req, crl;
+	
+    /*GetX509ExtFactory(self, ctx);*/
+
+    rb_scan_args(argc, argv, "04",
+		 &issuer_cert, &subject_cert, &subject_req, &crl);
+    if (!NIL_P(issuer_cert))
+	ossl_x509extfactory_set_issuer_cert(self, issuer_cert);
+    if (!NIL_P(subject_cert))
+	ossl_x509extfactory_set_subject_cert(self, subject_cert);
+    if (!NIL_P(subject_req))
+	ossl_x509extfactory_set_subject_req(self, subject_req);
+    if (!NIL_P(crl))
+	ossl_x509extfactory_set_crl(self, crl);
+
+    return self;
+}
+
+/*
+ * Array to X509_EXTENSION
+ * Structure:
+ * ["ln", "value", bool_critical] or
+ * ["sn", "value", bool_critical] or
+ * ["ln", "critical,value"] or the same for sn
+ * ["ln", "value"] => not critical
+ */
+static VALUE 
+ossl_x509extfactory_create_ext(int argc, VALUE *argv, VALUE self)
+{
+    X509V3_CTX *ctx;
+    X509_EXTENSION *ext;
+    VALUE oid, value, critical, valstr, obj;
+    int nid;
+#ifdef HAVE_X509V3_EXT_NCONF_NID
+    VALUE rconf;
+    CONF *conf;
+#else
+    static LHASH *empty_lhash;
+#endif
+
+    rb_scan_args(argc, argv, "21", &oid, &value, &critical);
+    StringValue(oid);
+    StringValue(value);
+    if(NIL_P(critical)) critical = Qfalse;
+
+    nid = OBJ_ln2nid(RSTRING(oid)->ptr);
+    if(!nid) nid = OBJ_sn2nid(RSTRING(oid)->ptr);
+    if(!nid) ossl_raise(eX509ExtError, "unknown OID `%s'", RSTRING(oid)->ptr);
+    valstr = rb_str_new2(RTEST(critical) ? "critical," : "");
+    rb_str_append(valstr, value);
+    GetX509ExtFactory(self, ctx);
+#ifdef HAVE_X509V3_EXT_NCONF_NID
+    rconf = rb_iv_get(self, "@config");
+    conf = NIL_P(rconf) ? NULL : GetConfigPtr(rconf);
+    ext = X509V3_EXT_nconf_nid(conf, ctx, nid, RSTRING(valstr)->ptr);
+#else
+    if (!empty_lhash) empty_lhash = lh_new(NULL, NULL);
+    ext = X509V3_EXT_conf_nid(empty_lhash, ctx, nid, RSTRING(valstr)->ptr);
+#endif
+    if (!ext){
+	ossl_raise(eX509ExtError, "%s = %s",
+		   RSTRING(oid)->ptr, RSTRING(value)->ptr);
+    }
+    WrapX509Ext(cX509Ext, obj, ext);
+
+    return obj;
+}
+
+/*
+ * Ext
+ */
+static VALUE
+ossl_x509ext_alloc(VALUE klass)
+{
+    X509_EXTENSION *ext;
+    VALUE obj;
+
+    if(!(ext = X509_EXTENSION_new())){
+	ossl_raise(eX509ExtError, NULL);
+    }
+    WrapX509Ext(klass, obj, ext);
+
+    return obj;
+}
+
+static VALUE
+ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE oid, value, critical;
+    unsigned char *p;
+    X509_EXTENSION *ext;
+
+    GetX509Ext(self, ext);
+    if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){
+	oid = ossl_to_der_if_possible(oid);
+	StringValue(oid);
+	p  = RSTRING(oid)->ptr;
+	if(!d2i_X509_EXTENSION((X509_EXTENSION**)&DATA_PTR(self),
+			       &p, RSTRING(oid)->len))
+	    ossl_raise(eX509ExtError, NULL);
+	return self;
+    }
+    rb_funcall(self, rb_intern("oid="), 1, oid);
+    rb_funcall(self, rb_intern("value="), 1, value);
+    if(argc > 2) rb_funcall(self, rb_intern("critical="), 1, critical);
+
+    return self;
+}
+
+static VALUE
+ossl_x509ext_set_oid(VALUE self, VALUE oid)
+{
+    X509_EXTENSION *ext;
+    ASN1_OBJECT *obj;
+    char *s;
+
+    s = StringValuePtr(oid);
+    obj = OBJ_txt2obj(s, 0);
+    if(!obj) obj = OBJ_txt2obj(s, 1);
+    if(!obj) ossl_raise(eX509ExtError, NULL);
+    GetX509Ext(self, ext);
+    X509_EXTENSION_set_object(ext, obj);
+
+    return oid;
+}
+
+static VALUE
+ossl_x509ext_set_value(VALUE self, VALUE data)
+{
+    X509_EXTENSION *ext;
+    ASN1_OCTET_STRING *asn1s;
+    char *s;
+
+    data = ossl_to_der_if_possible(data);
+    StringValue(data);
+    if(!(s = OPENSSL_malloc(RSTRING(data)->len)))
+	ossl_raise(eX509ExtError, "malloc error");
+    memcpy(s, RSTRING(data)->ptr, RSTRING(data)->len);
+    if(!(asn1s = ASN1_OCTET_STRING_new())){
+	free(s);
+	ossl_raise(eX509ExtError, NULL);
+    }
+    if(!M_ASN1_OCTET_STRING_set(asn1s, s, RSTRING(data)->len)){
+	free(s);
+	ASN1_OCTET_STRING_free(asn1s);
+	ossl_raise(eX509ExtError, NULL);
+    }
+    GetX509Ext(self, ext);
+    X509_EXTENSION_set_data(ext, asn1s);
+
+    return data;
+}
+
+static VALUE
+ossl_x509ext_set_critical(VALUE self, VALUE flag)
+{
+    X509_EXTENSION *ext;
+
+    GetX509Ext(self, ext);
+    X509_EXTENSION_set_critical(ext, RTEST(flag) ? 1 : 0);
+
+    return flag;
+}
+
+static VALUE 
+ossl_x509ext_get_oid(VALUE obj)
+{
+    X509_EXTENSION *ext;
+    ASN1_OBJECT *extobj;
+    BIO *out;
+    VALUE ret;
+    int nid;
+
+    GetX509Ext(obj, ext);
+    extobj = X509_EXTENSION_get_object(ext);
+    if ((nid = OBJ_obj2nid(extobj)) != NID_undef)
+	ret = rb_str_new2(OBJ_nid2sn(nid));
+    else{
+	if (!(out = BIO_new(BIO_s_mem())))
+	    ossl_raise(eX509ExtError, NULL);
+	i2a_ASN1_OBJECT(out, extobj);
+	ret = ossl_membio2str(out);
+    }
+
+    return ret;
+}
+
+static VALUE
+ossl_x509ext_get_value(VALUE obj)
+{
+    X509_EXTENSION *ext;
+    BIO *out;
+    VALUE ret;
+
+    GetX509Ext(obj, ext);
+    if (!(out = BIO_new(BIO_s_mem())))
+	ossl_raise(eX509ExtError, NULL);
+    if (!X509V3_EXT_print(out, ext, 0, 0))
+	M_ASN1_OCTET_STRING_print(out, ext->value);
+    ret = ossl_membio2str(out);
+
+    return ret;
+}
+
+static VALUE
+ossl_x509ext_get_critical(VALUE obj)
+{
+    X509_EXTENSION *ext;
+
+    GetX509Ext(obj, ext);
+    return X509_EXTENSION_get_critical(ext) ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_x509ext_to_der(VALUE obj)
+{
+    X509_EXTENSION *ext;
+    unsigned char *p;
+    long len;
+    VALUE str;
+
+    GetX509Ext(obj, ext);
+    if((len = i2d_X509_EXTENSION(ext, NULL)) <= 0)
+	ossl_raise(eX509ExtError, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if(i2d_X509_EXTENSION(ext, &p) < 0)
+	ossl_raise(eX509ExtError, NULL);
+    ossl_str_adjust(str, p);
+
+    return str;
+}
+
+/*
+ * INIT
+ */
+void
+Init_ossl_x509ext()
+{
+    eX509ExtError = rb_define_class_under(mX509, "ExtensionError", eOSSLError);
+    
+    cX509ExtFactory = rb_define_class_under(mX509, "ExtensionFactory", rb_cObject);
+	
+    rb_define_alloc_func(cX509ExtFactory, ossl_x509extfactory_alloc);
+    rb_define_method(cX509ExtFactory, "initialize", ossl_x509extfactory_initialize, -1);
+	
+    rb_attr(cX509ExtFactory, rb_intern("issuer_certificate"), 1, 0, Qfalse);
+    rb_attr(cX509ExtFactory, rb_intern("subject_certificate"), 1, 0, Qfalse);
+    rb_attr(cX509ExtFactory, rb_intern("subject_request"), 1, 0, Qfalse);
+    rb_attr(cX509ExtFactory, rb_intern("crl"), 1, 0, Qfalse);
+    rb_attr(cX509ExtFactory, rb_intern("config"), 1, 0, Qfalse);
+
+    rb_define_method(cX509ExtFactory, "issuer_certificate=", ossl_x509extfactory_set_issuer_cert, 1);
+    rb_define_method(cX509ExtFactory, "subject_certificate=", ossl_x509extfactory_set_subject_cert, 1);
+    rb_define_method(cX509ExtFactory, "subject_request=", ossl_x509extfactory_set_subject_req, 1);
+    rb_define_method(cX509ExtFactory, "crl=", ossl_x509extfactory_set_crl, 1);
+    rb_define_method(cX509ExtFactory, "config=", ossl_x509extfactory_set_config, 1);
+    rb_define_method(cX509ExtFactory, "create_ext", ossl_x509extfactory_create_ext, -1);
+	
+    cX509Ext = rb_define_class_under(mX509, "Extension", rb_cObject);
+    rb_define_alloc_func(cX509Ext, ossl_x509ext_alloc);
+    rb_define_method(cX509Ext, "initialize", ossl_x509ext_initialize, -1);
+    rb_define_method(cX509Ext, "oid=", ossl_x509ext_set_oid, 1);
+    rb_define_method(cX509Ext, "value=", ossl_x509ext_set_value, 1);
+    rb_define_method(cX509Ext, "critical=", ossl_x509ext_set_critical, 1);
+    rb_define_method(cX509Ext, "oid", ossl_x509ext_get_oid, 0);
+    rb_define_method(cX509Ext, "value", ossl_x509ext_get_value, 0);
+    rb_define_method(cX509Ext, "critical?", ossl_x509ext_get_critical, 0);
+    rb_define_method(cX509Ext, "to_der", ossl_x509ext_to_der, 0);
+}
diff --git a/ruby_1_8_6/ext/openssl/ossl_x509name.c b/ruby_1_8_6/ext/openssl/ossl_x509name.c
new file mode 100644
index 0000000000..076d61fb96
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_x509name.c
@@ -0,0 +1,344 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#define WrapX509Name(klass, obj, name) do { \
+    if (!name) { \
+	ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, X509_NAME_free, name); \
+} while (0)
+#define GetX509Name(obj, name) do { \
+    Data_Get_Struct(obj, X509_NAME, name); \
+    if (!name) { \
+	ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \
+    } \
+} while (0)
+#define SafeGetX509Name(obj, name) do { \
+    OSSL_Check_Kind(obj, cX509Name); \
+    GetX509Name(obj, name); \
+} while (0)
+
+#define OBJECT_TYPE_TEMPLATE \
+  rb_const_get(cX509Name, rb_intern("OBJECT_TYPE_TEMPLATE"))
+#define DEFAULT_OBJECT_TYPE \
+  rb_const_get(cX509Name, rb_intern("DEFAULT_OBJECT_TYPE"))
+
+/*
+ * Classes
+ */
+VALUE cX509Name;
+VALUE eX509NameError;
+
+/*
+ * Public
+ */
+VALUE 
+ossl_x509name_new(X509_NAME *name)
+{
+    X509_NAME *new;
+    VALUE obj;
+
+    if (!name) {
+	new = X509_NAME_new();
+    } else {
+	new = X509_NAME_dup(name);
+    }
+    if (!new) {
+	ossl_raise(eX509NameError, NULL);
+    }
+    WrapX509Name(cX509Name, obj, new);
+    
+    return obj;
+}
+
+X509_NAME *
+GetX509NamePtr(VALUE obj)
+{
+    X509_NAME *name;
+
+    SafeGetX509Name(obj, name);
+
+    return name;
+}
+
+/*
+ * Private
+ */
+static VALUE
+ossl_x509name_alloc(VALUE klass)
+{
+    X509_NAME *name;
+    VALUE obj;
+	
+    if (!(name = X509_NAME_new())) {
+	ossl_raise(eX509NameError, NULL);
+    }
+    WrapX509Name(klass, obj, name);
+
+    return obj;
+}
+
+static int id_aref;
+static VALUE ossl_x509name_add_entry(int, VALUE*, VALUE);
+#define rb_aref(obj, key) rb_funcall(obj, id_aref, 1, key)
+
+static VALUE
+ossl_x509name_init_i(VALUE i, VALUE args)
+{
+    VALUE self = rb_ary_entry(args, 0);
+    VALUE template = rb_ary_entry(args, 1);
+    VALUE entry[3];
+
+    Check_Type(i, T_ARRAY);
+    entry[0] = rb_ary_entry(i, 0);
+    entry[1] = rb_ary_entry(i, 1);
+    entry[2] = rb_ary_entry(i, 2);
+    if(NIL_P(entry[2])) entry[2] = rb_aref(template, entry[0]);
+    if(NIL_P(entry[2])) entry[2] = DEFAULT_OBJECT_TYPE;
+    ossl_x509name_add_entry(3, entry, self);
+
+    return Qnil;
+}
+
+static VALUE
+ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
+{
+    X509_NAME *name;
+    VALUE arg, template;
+
+    GetX509Name(self, name);
+    if (rb_scan_args(argc, argv, "02", &arg, &template) == 0) {
+	return self;
+    }
+    else {
+	VALUE tmp = rb_check_array_type(arg);
+	if (!NIL_P(tmp)) {
+	    VALUE args;
+	    if(NIL_P(template)) template = OBJECT_TYPE_TEMPLATE;
+	    args = rb_ary_new3(2, self, template);
+	    rb_iterate(rb_each, tmp, ossl_x509name_init_i, args);
+	}
+	else{
+	    unsigned char *p;
+	    VALUE str = ossl_to_der_if_possible(arg);
+	    StringValue(str);
+	    p = RSTRING(str)->ptr;
+	    if(!d2i_X509_NAME((X509_NAME**)&DATA_PTR(self), &p, RSTRING(str)->len)){
+		ossl_raise(eX509NameError, NULL);
+	    }
+	}
+    }
+
+    return self;
+}
+
+static
+VALUE ossl_x509name_add_entry(int argc, VALUE *argv, VALUE self)
+{
+    X509_NAME *name;
+    VALUE oid, value, type;
+
+    rb_scan_args(argc, argv, "21", &oid, &value, &type);
+    StringValue(oid);
+    StringValue(value);
+    if(NIL_P(type)) type = rb_aref(OBJECT_TYPE_TEMPLATE, oid);
+    GetX509Name(self, name);
+    if (!X509_NAME_add_entry_by_txt(name, RSTRING(oid)->ptr, NUM2INT(type),
+		RSTRING(value)->ptr, RSTRING(value)->len, -1, 0)) {
+	ossl_raise(eX509NameError, NULL);
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_x509name_to_s_old(VALUE self)
+{
+    X509_NAME *name;
+    char *buf;
+    VALUE str;
+
+    GetX509Name(self, name);
+    buf = X509_NAME_oneline(name, NULL, 0);
+    str = rb_str_new2(buf);
+    OPENSSL_free(buf);
+
+    return str;
+}
+
+static VALUE
+ossl_x509name_to_s(int argc, VALUE *argv, VALUE self)
+{           
+    X509_NAME *name;
+    VALUE flag, str;
+    BIO *out;
+    unsigned long iflag;
+
+    rb_scan_args(argc, argv, "01", &flag);
+    if (NIL_P(flag))
+	return ossl_x509name_to_s_old(self);
+    else iflag = NUM2ULONG(flag);
+    if (!(out = BIO_new(BIO_s_mem())))
+	ossl_raise(eX509NameError, NULL);
+    GetX509Name(self, name);
+    if (!X509_NAME_print_ex(out, name, 0, iflag)){
+	BIO_free(out);
+	ossl_raise(eX509NameError, NULL);
+    }
+    str = ossl_membio2str(out);
+
+    return str;
+}
+
+static VALUE 
+ossl_x509name_to_a(VALUE self)
+{
+    X509_NAME *name;
+    X509_NAME_ENTRY *entry;
+    int i,entries;
+    char long_name[512];
+    const char *short_name;
+    VALUE ary, ret;
+	
+    GetX509Name(self, name);
+    entries = X509_NAME_entry_count(name);
+    if (entries < 0) {
+	OSSL_Debug("name entries < 0!");
+	return rb_ary_new();
+    }
+    ret = rb_ary_new2(entries);
+    for (i=0; i<entries; i++) {
+	if (!(entry = X509_NAME_get_entry(name, i))) {
+	    ossl_raise(eX509NameError, NULL);
+	}
+	if (!i2t_ASN1_OBJECT(long_name, sizeof(long_name), entry->object)) {
+	    ossl_raise(eX509NameError, NULL);
+	}
+	short_name = OBJ_nid2sn(OBJ_ln2nid(long_name));
+	ary = rb_ary_new3(3, rb_str_new2(short_name),
+        		  rb_str_new(entry->value->data, entry->value->length),
+        		  INT2FIX(entry->value->type));
+	rb_ary_push(ret, ary);
+    }
+    return ret;
+}
+
+static int
+ossl_x509name_cmp0(VALUE self, VALUE other)
+{
+    X509_NAME *name1, *name2;
+
+    GetX509Name(self, name1);
+    SafeGetX509Name(other, name2);
+
+    return X509_NAME_cmp(name1, name2);
+}
+
+static VALUE
+ossl_x509name_cmp(VALUE self, VALUE other)
+{
+    int result;
+
+    result = ossl_x509name_cmp0(self, other);
+    if (result < 0) return INT2FIX(-1);
+    if (result > 1) return INT2FIX(1);
+
+    return INT2FIX(0);
+}
+
+static VALUE
+ossl_x509name_eql(VALUE self, VALUE other)
+{
+    int result;
+
+    if(CLASS_OF(other) != cX509Name) return Qfalse;
+    result = ossl_x509name_cmp0(self, other);
+
+    return (result == 0) ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_x509name_hash(VALUE self)
+{
+    X509_NAME *name;
+    unsigned long hash;
+
+    GetX509Name(self, name);
+
+    hash = X509_NAME_hash(name);
+
+    return ULONG2NUM(hash);
+}
+
+static VALUE
+ossl_x509name_to_der(VALUE self)
+{
+    X509_NAME *name;
+    VALUE str;
+    long len;
+    unsigned char *p;
+
+    GetX509Name(self, name);
+    if((len = i2d_X509_NAME(name, NULL)) <= 0)
+	ossl_raise(eX509NameError, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if(i2d_X509_NAME(name, &p) <= 0)
+	ossl_raise(eX509NameError, NULL);
+    ossl_str_adjust(str, p);
+
+    return str;
+}
+
+/*
+ * INIT
+ */
+void 
+Init_ossl_x509name()
+{
+    VALUE utf8str, ptrstr, ia5str, hash;
+
+    id_aref = rb_intern("[]");
+    eX509NameError = rb_define_class_under(mX509, "NameError", eOSSLError);
+    cX509Name = rb_define_class_under(mX509, "Name", rb_cObject);
+
+    rb_define_alloc_func(cX509Name, ossl_x509name_alloc);
+    rb_define_method(cX509Name, "initialize", ossl_x509name_initialize, -1);
+    rb_define_method(cX509Name, "add_entry", ossl_x509name_add_entry, -1);
+    rb_define_method(cX509Name, "to_s", ossl_x509name_to_s, -1);
+    rb_define_method(cX509Name, "to_a", ossl_x509name_to_a, 0);
+    rb_define_method(cX509Name, "cmp", ossl_x509name_cmp, 1);
+    rb_define_alias(cX509Name, "<=>", "cmp");
+    rb_define_method(cX509Name, "eql?", ossl_x509name_eql, 1);
+    rb_define_method(cX509Name, "hash", ossl_x509name_hash, 0);
+    rb_define_method(cX509Name, "to_der", ossl_x509name_to_der, 0);
+
+    utf8str = INT2NUM(V_ASN1_UTF8STRING);
+    ptrstr = INT2NUM(V_ASN1_PRINTABLESTRING);
+    ia5str = INT2NUM(V_ASN1_IA5STRING);
+    rb_define_const(cX509Name, "DEFAULT_OBJECT_TYPE", utf8str);
+    hash = rb_hash_new();
+    RHASH(hash)->ifnone = utf8str;
+    rb_hash_aset(hash, rb_str_new2("C"), ptrstr);
+    rb_hash_aset(hash, rb_str_new2("countryName"), ptrstr);
+    rb_hash_aset(hash, rb_str_new2("serialNumber"), ptrstr);
+    rb_hash_aset(hash, rb_str_new2("dnQualifier"), ptrstr);
+    rb_hash_aset(hash, rb_str_new2("DC"), ia5str);
+    rb_hash_aset(hash, rb_str_new2("domainComponent"), ia5str);
+    rb_hash_aset(hash, rb_str_new2("emailAddress"), ia5str);
+    rb_define_const(cX509Name, "OBJECT_TYPE_TEMPLATE", hash);
+
+    rb_define_const(cX509Name, "COMPAT", ULONG2NUM(XN_FLAG_COMPAT));
+    rb_define_const(cX509Name, "RFC2253", ULONG2NUM(XN_FLAG_RFC2253));
+    rb_define_const(cX509Name, "ONELINE", ULONG2NUM(XN_FLAG_ONELINE));
+    rb_define_const(cX509Name, "MULTILINE", ULONG2NUM(XN_FLAG_MULTILINE));
+}
diff --git a/ruby_1_8_6/ext/openssl/ossl_x509req.c b/ruby_1_8_6/ext/openssl/ossl_x509req.c
new file mode 100644
index 0000000000..d644250433
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_x509req.c
@@ -0,0 +1,466 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#define WrapX509Req(klass, obj, req) do { \
+    if (!req) { \
+	ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, X509_REQ_free, req); \
+} while (0)
+#define GetX509Req(obj, req) do { \
+    Data_Get_Struct(obj, X509_REQ, req); \
+    if (!req) { \
+	ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
+    } \
+} while (0)
+#define SafeGetX509Req(obj, req) do { \
+    OSSL_Check_Kind(obj, cX509Req); \
+    GetX509Req(obj, req); \
+} while (0)
+
+/*
+ * Classes
+ */
+VALUE cX509Req;
+VALUE eX509ReqError;
+
+/*
+ * Public functions
+ */
+VALUE
+ossl_x509req_new(X509_REQ *req)
+{
+    X509_REQ *new;
+    VALUE obj;
+
+    if (!req) {
+	new = X509_REQ_new();
+    } else {
+	new = X509_REQ_dup(req);
+    }
+    if (!new) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+    WrapX509Req(cX509Req, obj, new);
+
+    return obj;
+}
+
+X509_REQ *
+GetX509ReqPtr(VALUE obj)
+{
+    X509_REQ *req;
+
+    SafeGetX509Req(obj, req);
+
+    return req;
+}
+
+X509_REQ *
+DupX509ReqPtr(VALUE obj)
+{
+    X509_REQ *req, *new;
+
+    SafeGetX509Req(obj, req);
+    if (!(new = X509_REQ_dup(req))) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+
+    return new;
+}
+
+/*
+ * Private functions
+ */
+static VALUE 
+ossl_x509req_alloc(VALUE klass)
+{
+    X509_REQ *req;
+    VALUE obj;
+
+    if (!(req = X509_REQ_new())) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+    WrapX509Req(klass, obj, req);
+
+    return obj;
+}
+
+static VALUE 
+ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
+{
+    BIO *in;
+    X509_REQ *req;
+    VALUE arg;
+
+    if (rb_scan_args(argc, argv, "01", &arg) == 0) {
+	return self;
+    }
+    arg = ossl_to_der_if_possible(arg);
+    in = ossl_obj2bio(arg);
+    req = PEM_read_bio_X509_REQ(in, (X509_REQ **)&DATA_PTR(self), NULL, NULL);
+    if (!req) {
+	BIO_reset(in);
+	req = d2i_X509_REQ_bio(in, (X509_REQ **)&DATA_PTR(self));
+    }
+    BIO_free(in);
+    if (!req) ossl_raise(eX509ReqError, NULL);
+
+    return self;
+}
+
+static VALUE
+ossl_x509req_copy(VALUE self, VALUE other)
+{
+    X509_REQ *a, *b, *req;
+	
+    rb_check_frozen(self);
+    if (self == other) return self;
+    GetX509Req(self, a);
+    SafeGetX509Req(other, b);
+    if (!(req = X509_REQ_dup(b))) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+    X509_REQ_free(a);
+    DATA_PTR(self) = req;
+
+    return self;
+}
+
+static VALUE 
+ossl_x509req_to_pem(VALUE self)
+{
+    X509_REQ *req;
+    BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
+	
+    GetX509Req(self, req);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+    if (!PEM_write_bio_X509_REQ(out, req)) {
+	BIO_free(out);
+	ossl_raise(eX509ReqError, NULL);
+    }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
+
+    return str;
+}
+
+static VALUE
+ossl_x509req_to_der(VALUE self)
+{
+    X509_REQ *req;
+    VALUE str;
+    long len;
+    unsigned char *p;
+
+    GetX509Req(self, req);
+    if ((len = i2d_X509_REQ(req, NULL)) <= 0)
+	ossl_raise(eX509CertError, NULL);
+    str = rb_str_new(0, len);
+    p = RSTRING(str)->ptr;
+    if (i2d_X509_REQ(req, &p) <= 0)
+	ossl_raise(eX509ReqError, NULL);
+    ossl_str_adjust(str, p);
+
+    return str;
+}
+
+static VALUE 
+ossl_x509req_to_text(VALUE self)
+{
+    X509_REQ *req;
+    BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
+
+    GetX509Req(self, req);
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+    if (!X509_REQ_print(out, req)) {
+	BIO_free(out);
+	ossl_raise(eX509ReqError, NULL);
+    }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
+
+    return str;
+}
+
+#if 0
+/*
+ * Makes X509 from X509_REQuest
+ */
+static VALUE 
+ossl_x509req_to_x509(VALUE self, VALUE days, VALUE key)
+{
+    X509_REQ *req;
+    X509 *x509;
+	
+    GetX509Req(self, req);
+    ...
+    if (!(x509 = X509_REQ_to_X509(req, d, pkey))) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+
+    return ossl_x509_new(x509);
+}
+#endif
+
+static VALUE 
+ossl_x509req_get_version(VALUE self)
+{
+    X509_REQ *req;
+    long version;
+
+    GetX509Req(self, req);
+    version = X509_REQ_get_version(req);
+
+    return LONG2FIX(version);
+}
+
+static VALUE 
+ossl_x509req_set_version(VALUE self, VALUE version)
+{
+    X509_REQ *req;
+    long ver;
+
+    if ((ver = FIX2LONG(version)) < 0) {
+	ossl_raise(eX509ReqError, "version must be >= 0!");
+    }
+    GetX509Req(self, req);
+    if (!X509_REQ_set_version(req, ver)) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+
+    return version;
+}
+
+static VALUE 
+ossl_x509req_get_subject(VALUE self)
+{
+    X509_REQ *req;
+    X509_NAME *name;
+
+    GetX509Req(self, req);
+    if (!(name = X509_REQ_get_subject_name(req))) { /* NO DUP - don't free */
+	ossl_raise(eX509ReqError, NULL);
+    }
+
+    return ossl_x509name_new(name);
+}
+
+static VALUE 
+ossl_x509req_set_subject(VALUE self, VALUE subject)
+{
+    X509_REQ *req;
+	
+    GetX509Req(self, req);
+    /* DUPs name */
+    if (!X509_REQ_set_subject_name(req, GetX509NamePtr(subject))) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+
+    return subject;
+}
+
+static VALUE 
+ossl_x509req_get_signature_algorithm(VALUE self)
+{
+    X509_REQ *req;
+    BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
+
+    GetX509Req(self, req);
+	
+    if (!(out = BIO_new(BIO_s_mem()))) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+    if (!i2a_ASN1_OBJECT(out, req->sig_alg->algorithm)) {
+	BIO_free(out);
+	ossl_raise(eX509ReqError, NULL);
+    }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
+    return str;
+}
+
+static VALUE 
+ossl_x509req_get_public_key(VALUE self)
+{
+    X509_REQ *req;
+    EVP_PKEY *pkey;
+
+    GetX509Req(self, req);
+    if (!(pkey = X509_REQ_get_pubkey(req))) { /* adds reference */
+	ossl_raise(eX509ReqError, NULL);
+    }
+
+    return ossl_pkey_new(pkey); /* NO DUP - OK */
+}
+
+static VALUE 
+ossl_x509req_set_public_key(VALUE self, VALUE key)
+{
+    X509_REQ *req;
+    EVP_PKEY *pkey;
+
+    GetX509Req(self, req);
+    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
+    if (!X509_REQ_set_pubkey(req, pkey)) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+
+    return key;
+}
+
+static VALUE 
+ossl_x509req_sign(VALUE self, VALUE key, VALUE digest)
+{
+    X509_REQ *req;
+    EVP_PKEY *pkey;
+    const EVP_MD *md;
+
+    GetX509Req(self, req);
+    pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
+    md = GetDigestPtr(digest);
+    if (!X509_REQ_sign(req, pkey, md)) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+
+    return self;
+}
+
+/*
+ * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
+ */
+static VALUE 
+ossl_x509req_verify(VALUE self, VALUE key)
+{
+    X509_REQ *req;
+    EVP_PKEY *pkey;
+    int i;
+
+    GetX509Req(self, req);
+    pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
+    if ((i = X509_REQ_verify(req, pkey)) < 0) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+    if (i > 0) {
+	return Qtrue;
+    }
+
+    return Qfalse;
+}
+
+static VALUE 
+ossl_x509req_get_attributes(VALUE self)
+{
+    X509_REQ *req;
+    int count, i;
+    X509_ATTRIBUTE *attr;
+    VALUE ary;
+	
+    GetX509Req(self, req);
+
+    count = X509_REQ_get_attr_count(req);
+    if (count < 0) {
+	OSSL_Debug("count < 0???");
+	return rb_ary_new();
+    }
+    ary = rb_ary_new2(count);
+    for (i=0; i<count; i++) {
+	attr = X509_REQ_get_attr(req, i);
+	rb_ary_push(ary, ossl_x509attr_new(attr));
+    }
+
+    return ary;
+}
+
+static VALUE 
+ossl_x509req_set_attributes(VALUE self, VALUE ary)
+{
+    X509_REQ *req;
+    X509_ATTRIBUTE *attr;
+    int i;
+    VALUE item;
+
+    Check_Type(ary, T_ARRAY);
+    for (i=0;i<RARRAY(ary)->len; i++) {
+	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Attr);
+    }
+    GetX509Req(self, req);
+    sk_X509_ATTRIBUTE_pop_free(req->req_info->attributes, X509_ATTRIBUTE_free);
+    req->req_info->attributes = NULL;
+    for (i=0;i<RARRAY(ary)->len; i++) {
+	item = RARRAY(ary)->ptr[i];
+	attr = DupX509AttrPtr(item);
+	if (!X509_REQ_add1_attr(req, attr)) {
+	    ossl_raise(eX509ReqError, NULL);
+	}
+    }
+    return ary;
+}
+
+static VALUE 
+ossl_x509req_add_attribute(VALUE self, VALUE attr)
+{
+    X509_REQ *req;
+
+    GetX509Req(self, req);
+    if (!X509_REQ_add1_attr(req, DupX509AttrPtr(attr))) {
+	ossl_raise(eX509ReqError, NULL);
+    }
+
+    return attr;
+}
+
+/*
+ * X509_REQUEST init
+ */
+void 
+Init_ossl_x509req()
+{
+    eX509ReqError = rb_define_class_under(mX509, "RequestError", eOSSLError);
+	
+    cX509Req = rb_define_class_under(mX509, "Request", rb_cObject);
+	
+    rb_define_alloc_func(cX509Req, ossl_x509req_alloc);
+    rb_define_method(cX509Req, "initialize", ossl_x509req_initialize, -1);
+    rb_define_copy_func(cX509Req, ossl_x509req_copy);
+	
+    rb_define_method(cX509Req, "to_pem", ossl_x509req_to_pem, 0);
+    rb_define_method(cX509Req, "to_der", ossl_x509req_to_der, 0);
+    rb_define_alias(cX509Req, "to_s", "to_pem");
+    rb_define_method(cX509Req, "to_text", ossl_x509req_to_text, 0);
+    rb_define_method(cX509Req, "version", ossl_x509req_get_version, 0);
+    rb_define_method(cX509Req, "version=", ossl_x509req_set_version, 1);
+    rb_define_method(cX509Req, "subject", ossl_x509req_get_subject, 0);
+    rb_define_method(cX509Req, "subject=", ossl_x509req_set_subject, 1);
+    rb_define_method(cX509Req, "signature_algorithm", ossl_x509req_get_signature_algorithm, 0);
+    rb_define_method(cX509Req, "public_key", ossl_x509req_get_public_key, 0);
+    rb_define_method(cX509Req, "public_key=", ossl_x509req_set_public_key, 1);
+    rb_define_method(cX509Req, "sign", ossl_x509req_sign, 2);
+    rb_define_method(cX509Req, "verify", ossl_x509req_verify, 1);
+    rb_define_method(cX509Req, "attributes", ossl_x509req_get_attributes, 0);
+    rb_define_method(cX509Req, "attributes=", ossl_x509req_set_attributes, 1);
+    rb_define_method(cX509Req, "add_attribute", ossl_x509req_add_attribute, 1);
+}
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_x509revoked.c b/ruby_1_8_6/ext/openssl/ossl_x509revoked.c
new file mode 100644
index 0000000000..3ccac8d26a
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_x509revoked.c
@@ -0,0 +1,229 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+
+#define WrapX509Rev(klass, obj, rev) do { \
+    if (!rev) { \
+	ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, X509_REVOKED_free, rev); \
+} while (0)
+#define GetX509Rev(obj, rev) do { \
+    Data_Get_Struct(obj, X509_REVOKED, rev); \
+    if (!rev) { \
+	ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
+    } \
+} while (0)
+#define SafeGetX509Rev(obj, rev) do { \
+    OSSL_Check_Kind(obj, cX509Rev); \
+    GetX509Rev(obj, rev); \
+} while (0)
+
+/*
+ * Classes
+ */
+VALUE cX509Rev;
+VALUE eX509RevError;
+
+/*
+ * PUBLIC
+ */
+VALUE 
+ossl_x509revoked_new(X509_REVOKED *rev)
+{
+    X509_REVOKED *new;
+    VALUE obj;
+
+    if (!rev) {
+	new = X509_REVOKED_new();
+    } else {
+	new = X509_REVOKED_dup(rev);
+    }
+    if (!new) {
+	ossl_raise(eX509RevError, NULL);
+    }
+    WrapX509Rev(cX509Rev, obj, new);
+
+    return obj;
+}
+
+X509_REVOKED *
+DupX509RevokedPtr(VALUE obj)
+{
+    X509_REVOKED *rev, *new;
+
+    SafeGetX509Rev(obj, rev);
+    if (!(new = X509_REVOKED_dup(rev))) {
+	ossl_raise(eX509RevError, NULL);
+    }
+
+    return new;
+}
+
+/*
+ * PRIVATE
+ */
+static VALUE 
+ossl_x509revoked_alloc(VALUE klass)
+{
+    X509_REVOKED *rev;
+    VALUE obj;
+
+    if (!(rev = X509_REVOKED_new())) {
+	ossl_raise(eX509RevError, NULL);
+    }
+    WrapX509Rev(klass, obj, rev);
+
+    return obj;
+}
+
+static VALUE 
+ossl_x509revoked_initialize(int argc, VALUE *argv, VALUE self)
+{
+    /* EMPTY */
+    return self;
+}
+
+static VALUE 
+ossl_x509revoked_get_serial(VALUE self)
+{
+    X509_REVOKED *rev;
+
+    GetX509Rev(self, rev);
+
+    return asn1integer_to_num(rev->serialNumber);
+}
+
+static VALUE 
+ossl_x509revoked_set_serial(VALUE self, VALUE num)
+{
+    X509_REVOKED *rev;
+
+    GetX509Rev(self, rev);
+    rev->serialNumber = num_to_asn1integer(num, rev->serialNumber);
+
+    return num;
+}
+
+static VALUE 
+ossl_x509revoked_get_time(VALUE self)
+{
+    X509_REVOKED *rev;
+	
+    GetX509Rev(self, rev);
+
+    return asn1time_to_time(rev->revocationDate);
+}
+
+static VALUE 
+ossl_x509revoked_set_time(VALUE self, VALUE time)
+{
+    X509_REVOKED *rev;
+    time_t sec;
+
+    sec = time_to_time_t(time);
+    GetX509Rev(self, rev);
+    if (!X509_time_adj(rev->revocationDate, 0, &sec)) {
+	ossl_raise(eX509RevError, NULL);
+    }
+
+    return time;
+}
+/*
+ * Gets X509v3 extensions as array of X509Ext objects
+ */
+static VALUE 
+ossl_x509revoked_get_extensions(VALUE self)
+{
+    X509_REVOKED *rev;
+    int count, i;
+    X509_EXTENSION *ext;
+    VALUE ary;
+
+    GetX509Rev(self, rev);
+    count = X509_REVOKED_get_ext_count(rev);
+    if (count < 0) {
+	OSSL_Debug("count < 0???");
+	return rb_ary_new();
+    }
+    ary = rb_ary_new2(count);
+    for (i=0; i<count; i++) {
+	ext = X509_REVOKED_get_ext(rev, i);
+	rb_ary_push(ary, ossl_x509ext_new(ext));
+    }
+
+    return ary;
+}
+
+/*
+ * Sets X509_EXTENSIONs
+ */
+static VALUE 
+ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
+{
+    X509_REVOKED *rev;
+    X509_EXTENSION *ext;
+    int i;
+    VALUE item;
+
+    Check_Type(ary, T_ARRAY);
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	OSSL_Check_Kind(RARRAY(ary)->ptr[i], cX509Ext);
+    }
+    GetX509Rev(self, rev);
+    sk_X509_EXTENSION_pop_free(rev->extensions, X509_EXTENSION_free);
+    rev->extensions = NULL;
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	item = RARRAY(ary)->ptr[i];
+	ext = DupX509ExtPtr(item);
+	if(!X509_REVOKED_add_ext(rev, ext, -1)) {
+	    ossl_raise(eX509RevError, NULL);
+	}
+    }
+
+    return ary;
+}
+
+static VALUE
+ossl_x509revoked_add_extension(VALUE self, VALUE ext)
+{
+    X509_REVOKED *rev;
+    
+    GetX509Rev(self, rev);
+    if(!X509_REVOKED_add_ext(rev, DupX509ExtPtr(ext), -1)) {
+	ossl_raise(eX509RevError, NULL);
+    }
+
+    return ext;
+}
+
+/*
+ * INIT
+ */
+void
+Init_ossl_x509revoked()
+{
+    eX509RevError = rb_define_class_under(mX509, "RevokedError", eOSSLError);
+
+    cX509Rev = rb_define_class_under(mX509, "Revoked", rb_cObject);
+	
+    rb_define_alloc_func(cX509Rev, ossl_x509revoked_alloc);
+    rb_define_method(cX509Rev, "initialize", ossl_x509revoked_initialize, -1);
+	
+    rb_define_method(cX509Rev, "serial", ossl_x509revoked_get_serial, 0);
+    rb_define_method(cX509Rev, "serial=", ossl_x509revoked_set_serial, 1);
+    rb_define_method(cX509Rev, "time", ossl_x509revoked_get_time, 0);
+    rb_define_method(cX509Rev, "time=", ossl_x509revoked_set_time, 1);
+    rb_define_method(cX509Rev, "extensions", ossl_x509revoked_get_extensions, 0);
+    rb_define_method(cX509Rev, "extensions=", ossl_x509revoked_set_extensions, 1);
+    rb_define_method(cX509Rev, "add_extension", ossl_x509revoked_add_extension, 1);
+}
+
diff --git a/ruby_1_8_6/ext/openssl/ossl_x509store.c b/ruby_1_8_6/ext/openssl/ossl_x509store.c
new file mode 100644
index 0000000000..cea845a1cc
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ossl_x509store.c
@@ -0,0 +1,613 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#include "ossl.h"
+#include <rubysig.h>
+
+#define WrapX509Store(klass, obj, st) do { \
+    if (!st) { \
+	ossl_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, X509_STORE_free, st); \
+} while (0)
+#define GetX509Store(obj, st) do { \
+    Data_Get_Struct(obj, X509_STORE, st); \
+    if (!st) { \
+	ossl_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \
+    } \
+} while (0)
+#define SafeGetX509Store(obj, st) do { \
+    OSSL_Check_Kind(obj, cX509Store); \
+    GetX509Store(obj, st); \
+} while (0)
+
+#define WrapX509StCtx(klass, obj, ctx) do { \
+    if (!ctx) { \
+	ossl_raise(rb_eRuntimeError, "STORE_CTX wasn't initialized!"); \
+    } \
+    obj = Data_Wrap_Struct(klass, 0, ossl_x509stctx_free, ctx); \
+} while (0)
+#define GetX509StCtx(obj, ctx) do { \
+    Data_Get_Struct(obj, X509_STORE_CTX, ctx); \
+    if (!ctx) { \
+	ossl_raise(rb_eRuntimeError, "STORE_CTX is out of scope!"); \
+    } \
+} while (0)
+#define SafeGetX509StCtx(obj, storep) do { \
+    OSSL_Check_Kind(obj, cX509StoreContext); \
+    GetX509Store(obj, ctx); \
+} while (0)
+
+/*
+ * Classes
+ */
+VALUE cX509Store;
+VALUE cX509StoreContext;
+VALUE eX509StoreError;
+
+/*
+ * Public functions
+ */
+VALUE 
+ossl_x509store_new(X509_STORE *store)
+{
+    VALUE obj;
+
+    WrapX509Store(cX509Store, obj, store);
+
+    return obj;
+}
+
+X509_STORE *
+GetX509StorePtr(VALUE obj)
+{
+    X509_STORE *store;
+
+    SafeGetX509Store(obj, store);
+
+    return store;
+}
+
+X509_STORE *
+DupX509StorePtr(VALUE obj)
+{   
+    X509_STORE *store;
+
+    SafeGetX509Store(obj, store);
+    CRYPTO_add(&store->references, 1, CRYPTO_LOCK_X509_STORE);
+    
+    return store;
+}
+
+/*
+ * Private functions
+ */
+static VALUE 
+ossl_x509store_alloc(VALUE klass)
+{
+    X509_STORE *store;
+    VALUE obj;
+
+    if((store = X509_STORE_new()) == NULL){
+        ossl_raise(eX509StoreError, NULL);
+    }
+    WrapX509Store(klass, obj, store);
+
+    return obj;
+}
+
+/*
+ * General callback for OpenSSL verify
+ */
+static VALUE
+ossl_x509store_set_vfy_cb(VALUE self, VALUE cb)
+{
+    X509_STORE *store;
+
+    GetX509Store(self, store);
+    X509_STORE_set_ex_data(store, ossl_verify_cb_idx, (void*)cb);
+    rb_iv_set(self, "@verify_callback", cb);
+
+    return cb;
+}
+
+static VALUE
+ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
+{
+    X509_STORE *store;
+
+    GetX509Store(self, store);
+    X509_STORE_set_verify_cb_func(store, ossl_verify_cb);
+    ossl_x509store_set_vfy_cb(self, Qnil);
+
+#if (OPENSSL_VERSION_NUMBER < 0x00907000L)
+    rb_iv_set(self, "@flags", INT2NUM(0));
+    rb_iv_set(self, "@purpose", INT2NUM(0));
+    rb_iv_set(self, "@trust", INT2NUM(0));
+#endif
+
+    /* last verification status */
+    rb_iv_set(self, "@error", Qnil);
+    rb_iv_set(self, "@error_string", Qnil);
+    rb_iv_set(self, "@chain", Qnil);
+    rb_iv_set(self, "@time", Qnil);
+
+    return self;
+}
+
+static VALUE
+ossl_x509store_set_flags(VALUE self, VALUE flags)
+{
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
+    X509_STORE *store;
+    long f = NUM2LONG(flags);
+
+    GetX509Store(self, store);
+    X509_STORE_set_flags(store, f);
+#else
+    rb_iv_set(self, "@flags", flags);
+#endif
+
+    return flags;
+}
+
+static VALUE
+ossl_x509store_set_purpose(VALUE self, VALUE purpose)
+{
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
+    X509_STORE *store;
+    long p = NUM2LONG(purpose);
+    
+    GetX509Store(self, store);
+    X509_STORE_set_purpose(store, p);
+#else
+    rb_iv_set(self, "@purpose", purpose);
+#endif
+
+    return purpose;
+}
+
+static VALUE
+ossl_x509store_set_trust(VALUE self, VALUE trust)
+{
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
+    X509_STORE *store;
+    long t = NUM2LONG(trust);
+
+    GetX509Store(self, store);
+    X509_STORE_set_trust(store, t);
+#else
+    rb_iv_set(self, "@trust", trust);
+#endif
+
+    return trust;
+}
+
+static VALUE 
+ossl_x509store_set_time(VALUE self, VALUE time)
+{
+    rb_iv_set(self, "@time", time);
+    return time;
+}
+
+static VALUE 
+ossl_x509store_add_file(VALUE self, VALUE file)
+{
+    X509_STORE *store;
+    X509_LOOKUP *lookup;
+    char *path = NULL;
+
+    if(file != Qnil){
+        Check_SafeStr(file);
+	path = RSTRING(file)->ptr;
+    }
+    GetX509Store(self, store);
+    lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
+    if(lookup == NULL) ossl_raise(eX509StoreError, NULL);
+    if(X509_LOOKUP_load_file(lookup, path, X509_FILETYPE_PEM) != 1){
+        ossl_raise(eX509StoreError, NULL);
+    }
+
+    return self;
+}
+
+static VALUE 
+ossl_x509store_add_path(VALUE self, VALUE dir)
+{
+    X509_STORE *store;
+    X509_LOOKUP *lookup;
+    char *path = NULL;
+
+    if(dir != Qnil){
+        Check_SafeStr(dir);
+	path = RSTRING(dir)->ptr;
+    }
+    GetX509Store(self, store);
+    lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
+    if(lookup == NULL) ossl_raise(eX509StoreError, NULL);
+    if(X509_LOOKUP_add_dir(lookup, path, X509_FILETYPE_PEM) != 1){
+        ossl_raise(eX509StoreError, NULL);
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_x509store_set_default_paths(VALUE self)
+{
+    X509_STORE *store;
+
+    GetX509Store(self, store);
+    if (X509_STORE_set_default_paths(store) != 1){
+        ossl_raise(eX509StoreError, NULL);
+    }
+
+    return Qnil;
+}
+
+static VALUE
+ossl_x509store_add_cert(VALUE self, VALUE arg)
+{
+    X509_STORE *store;
+    X509 *cert;
+
+    cert = GetX509CertPtr(arg); /* NO NEED TO DUP */
+    GetX509Store(self, store);
+    if (X509_STORE_add_cert(store, cert) != 1){
+        ossl_raise(eX509StoreError, NULL);
+    }
+
+    return self;
+}
+
+static VALUE
+ossl_x509store_add_crl(VALUE self, VALUE arg)
+{
+    X509_STORE *store;
+    X509_CRL *crl;
+
+    crl = GetX509CRLPtr(arg); /* NO NEED TO DUP */
+    GetX509Store(self, store);
+    if (X509_STORE_add_crl(store, crl) != 1){
+        ossl_raise(eX509StoreError, NULL);
+    }
+
+    return self;
+}
+
+static VALUE ossl_x509stctx_get_err(VALUE);
+static VALUE ossl_x509stctx_get_err_string(VALUE);
+static VALUE ossl_x509stctx_get_chain(VALUE);
+
+static VALUE 
+ossl_x509store_verify(int argc, VALUE *argv, VALUE self)
+{
+    VALUE cert, chain;
+    VALUE ctx, proc, result;
+
+    rb_scan_args(argc, argv, "11", &cert, &chain);
+    ctx = rb_funcall(cX509StoreContext, rb_intern("new"), 3, self, cert, chain);
+    proc = rb_block_given_p() ?  rb_block_proc() :
+	   rb_iv_get(self, "@verify_callback");
+    rb_iv_set(ctx, "@verify_callback", proc);
+    result = rb_funcall(ctx, rb_intern("verify"), 0);
+
+    rb_iv_set(self, "@error", ossl_x509stctx_get_err(ctx));
+    rb_iv_set(self, "@error_string", ossl_x509stctx_get_err_string(ctx));
+    rb_iv_set(self, "@chain", ossl_x509stctx_get_chain(ctx));
+
+    return result;
+}
+
+/*
+ * Public Functions
+ */
+static void ossl_x509stctx_free(X509_STORE_CTX*);
+
+VALUE
+ossl_x509stctx_new(X509_STORE_CTX *ctx)
+{
+    VALUE obj;
+
+    WrapX509StCtx(cX509StoreContext, obj, ctx);
+
+    return obj;
+}
+
+VALUE
+ossl_x509stctx_clear_ptr(VALUE obj)
+{
+    OSSL_Check_Kind(obj, cX509StoreContext);
+    RDATA(obj)->data = NULL;
+
+    return obj;
+}
+
+/*
+ * Private functions
+ */
+static void
+ossl_x509stctx_free(X509_STORE_CTX *ctx)
+{
+    if(ctx->untrusted)
+	sk_X509_pop_free(ctx->untrusted, X509_free);
+    if(ctx->cert)
+	X509_free(ctx->cert);
+    X509_STORE_CTX_free(ctx);
+}
+
+static VALUE 
+ossl_x509stctx_alloc(VALUE klass)
+{
+    X509_STORE_CTX *ctx;
+    VALUE obj;
+
+    if((ctx = X509_STORE_CTX_new()) == NULL){
+        ossl_raise(eX509StoreError, NULL);
+    }
+    WrapX509StCtx(klass, obj, ctx);
+
+    return obj;
+}
+
+static VALUE ossl_x509stctx_set_flags(VALUE, VALUE);
+static VALUE ossl_x509stctx_set_purpose(VALUE, VALUE);
+static VALUE ossl_x509stctx_set_trust(VALUE, VALUE);
+static VALUE ossl_x509stctx_set_time(VALUE, VALUE);
+
+static VALUE
+ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
+{
+    VALUE store, cert, chain, t;
+    X509_STORE_CTX *ctx;
+    X509_STORE *x509st;
+    X509 *x509 = NULL;
+    STACK_OF(X509) *x509s = NULL;
+
+    rb_scan_args(argc, argv, "12", &store, &cert, &chain);
+    GetX509StCtx(self, ctx);
+    SafeGetX509Store(store, x509st);
+    if(!NIL_P(cert)) x509 = DupX509CertPtr(cert); /* NEED TO DUP */
+    if(!NIL_P(chain)) x509s = ossl_x509_ary2sk(chain);
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
+    if(X509_STORE_CTX_init(ctx, x509st, x509, x509s) != 1){
+        sk_X509_pop_free(x509s, X509_free);
+        ossl_raise(eX509StoreError, NULL);
+    }
+#else
+    X509_STORE_CTX_init(ctx, x509st, x509, x509s);
+    ossl_x509stctx_set_flags(self, rb_iv_get(store, "@flags"));
+    ossl_x509stctx_set_purpose(self, rb_iv_get(store, "@purpose"));
+    ossl_x509stctx_set_trust(self, rb_iv_get(store, "@trust"));
+#endif
+    if (!NIL_P(t = rb_iv_get(store, "@time")))
+	ossl_x509stctx_set_time(self, t);
+    rb_iv_set(self, "@verify_callback", rb_iv_get(store, "@verify_callback"));
+    rb_iv_set(self, "@cert", cert);
+
+    return self;
+}
+
+static VALUE
+ossl_x509stctx_verify(VALUE self)
+{
+    X509_STORE_CTX *ctx;
+    int result;
+
+    GetX509StCtx(self, ctx);
+    X509_STORE_CTX_set_ex_data(ctx, ossl_verify_cb_idx,
+                               (void*)rb_iv_get(self, "@verify_callback"));
+    result = X509_verify_cert(ctx);
+
+    return result ? Qtrue : Qfalse;
+}
+
+static VALUE
+ossl_x509stctx_get_chain(VALUE self)
+{
+    X509_STORE_CTX *ctx;
+    STACK_OF(X509) *chain;
+    X509 *x509;
+    int i, num;
+    VALUE ary;
+
+    GetX509StCtx(self, ctx);
+    if((chain = X509_STORE_CTX_get_chain(ctx)) == NULL){
+        return Qnil;
+    }
+    if((num = sk_X509_num(chain)) < 0){
+	OSSL_Debug("certs in chain < 0???");
+	return rb_ary_new();
+    }
+    ary = rb_ary_new2(num);
+    for(i = 0; i < num; i++) {
+	x509 = sk_X509_value(chain, i);
+	rb_ary_push(ary, ossl_x509_new(x509));
+    }
+
+    return ary;
+}
+
+static VALUE 
+ossl_x509stctx_get_err(VALUE self)
+{
+    X509_STORE_CTX *ctx;
+
+    GetX509StCtx(self, ctx);
+
+    return INT2FIX(X509_STORE_CTX_get_error(ctx));
+}
+
+static VALUE
+ossl_x509stctx_set_error(VALUE self, VALUE err)
+{
+    X509_STORE_CTX *ctx;
+
+    GetX509StCtx(self, ctx);
+    X509_STORE_CTX_set_error(ctx, FIX2INT(err));
+
+    return err;
+}
+
+static VALUE 
+ossl_x509stctx_get_err_string(VALUE self)
+{
+    X509_STORE_CTX *ctx;
+    long err;
+
+    GetX509StCtx(self, ctx);
+    err = X509_STORE_CTX_get_error(ctx);
+
+    return rb_str_new2(X509_verify_cert_error_string(err));
+}
+
+static VALUE 
+ossl_x509stctx_get_err_depth(VALUE self)
+{
+    X509_STORE_CTX *ctx;
+
+    GetX509StCtx(self, ctx);
+
+    return INT2FIX(X509_STORE_CTX_get_error_depth(ctx));
+}
+
+static VALUE 
+ossl_x509stctx_get_curr_cert(VALUE self)
+{
+    X509_STORE_CTX *ctx;
+
+    GetX509StCtx(self, ctx);
+
+    return ossl_x509_new(X509_STORE_CTX_get_current_cert(ctx));
+}
+
+static VALUE
+ossl_x509stctx_get_curr_crl(VALUE self)
+{
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
+    X509_STORE_CTX *ctx;
+
+    GetX509StCtx(self, ctx);
+    if(!ctx->current_crl) return Qnil;
+
+    return ossl_x509crl_new(ctx->current_crl);
+#else
+    return Qnil;
+#endif
+}
+
+static VALUE
+ossl_x509stctx_cleanup(VALUE self)
+{
+    X509_STORE_CTX *ctx;
+
+    GetX509StCtx(self, ctx);
+    X509_STORE_CTX_cleanup(ctx);
+
+    return self;
+}
+
+static VALUE
+ossl_x509stctx_set_flags(VALUE self, VALUE flags)
+{
+    X509_STORE_CTX *store;
+    long f = NUM2LONG(flags);
+
+    GetX509StCtx(self, store);
+    X509_STORE_CTX_set_flags(store, f);
+
+    return flags;
+}
+
+static VALUE
+ossl_x509stctx_set_purpose(VALUE self, VALUE purpose)
+{
+    X509_STORE_CTX *store;
+    long p = NUM2LONG(purpose);
+
+    GetX509StCtx(self, store);
+    X509_STORE_CTX_set_purpose(store, p);
+
+    return purpose;
+}
+
+static VALUE
+ossl_x509stctx_set_trust(VALUE self, VALUE trust)
+{
+    X509_STORE_CTX *store;
+    long t = NUM2LONG(trust);
+
+    GetX509StCtx(self, store);
+    X509_STORE_CTX_set_trust(store, t);
+
+    return trust;
+}
+
+static VALUE
+ossl_x509stctx_set_time(VALUE self, VALUE time)
+{
+    X509_STORE_CTX *store;
+    long t;
+
+    t = NUM2LONG(rb_Integer(time));
+    GetX509StCtx(self, store);
+    X509_STORE_CTX_set_time(store, 0, t);
+
+    return time;
+}
+
+/*
+ * INIT
+ */
+void 
+Init_ossl_x509store()
+{
+    VALUE x509stctx;
+
+    eX509StoreError = rb_define_class_under(mX509, "StoreError", eOSSLError);
+
+    cX509Store = rb_define_class_under(mX509, "Store", rb_cObject);
+    rb_attr(cX509Store, rb_intern("verify_callback"), 1, 0, Qfalse);
+    rb_attr(cX509Store, rb_intern("error"), 1, 0, Qfalse);
+    rb_attr(cX509Store, rb_intern("error_string"), 1, 0, Qfalse);
+    rb_attr(cX509Store, rb_intern("chain"), 1, 0, Qfalse);
+    rb_define_alloc_func(cX509Store, ossl_x509store_alloc);
+    rb_define_method(cX509Store, "initialize",   ossl_x509store_initialize, -1);
+    rb_define_method(cX509Store, "verify_callback=", ossl_x509store_set_vfy_cb, 1);
+    rb_define_method(cX509Store, "flags=",       ossl_x509store_set_flags, 1);
+    rb_define_method(cX509Store, "purpose=",     ossl_x509store_set_purpose, 1);
+    rb_define_method(cX509Store, "trust=",       ossl_x509store_set_trust, 1);
+    rb_define_method(cX509Store, "time=",        ossl_x509store_set_time, 1);
+    rb_define_method(cX509Store, "add_path",     ossl_x509store_add_path, 1);
+    rb_define_method(cX509Store, "add_file",     ossl_x509store_add_file, 1);
+    rb_define_method(cX509Store, "set_default_paths", ossl_x509store_set_default_paths, 0);
+    rb_define_method(cX509Store, "add_cert",     ossl_x509store_add_cert, 1);
+    rb_define_method(cX509Store, "add_crl",      ossl_x509store_add_crl, 1);
+    rb_define_method(cX509Store, "verify",       ossl_x509store_verify, -1);
+
+    cX509StoreContext = rb_define_class_under(mX509,"StoreContext",rb_cObject);
+    x509stctx = cX509StoreContext;
+    rb_define_alloc_func(cX509StoreContext, ossl_x509stctx_alloc);
+    rb_define_method(x509stctx,"initialize",  ossl_x509stctx_initialize, -1);
+    rb_define_method(x509stctx,"verify",      ossl_x509stctx_verify, 0);
+    rb_define_method(x509stctx,"chain",       ossl_x509stctx_get_chain,0);
+    rb_define_method(x509stctx,"error",       ossl_x509stctx_get_err, 0);
+    rb_define_method(x509stctx,"error=",      ossl_x509stctx_set_error, 1);
+    rb_define_method(x509stctx,"error_string",ossl_x509stctx_get_err_string,0);
+    rb_define_method(x509stctx,"error_depth", ossl_x509stctx_get_err_depth, 0);
+    rb_define_method(x509stctx,"current_cert",ossl_x509stctx_get_curr_cert, 0);
+    rb_define_method(x509stctx,"current_crl", ossl_x509stctx_get_curr_crl, 0);
+    rb_define_method(x509stctx,"cleanup",     ossl_x509stctx_cleanup, 0);
+    rb_define_method(x509stctx,"flags=",      ossl_x509stctx_set_flags, 1);
+    rb_define_method(x509stctx,"purpose=",    ossl_x509stctx_set_purpose, 1);
+    rb_define_method(x509stctx,"trust=",      ossl_x509stctx_set_trust, 1);
+    rb_define_method(x509stctx,"time=",       ossl_x509stctx_set_time, 1);
+
+}
diff --git a/ruby_1_8_6/ext/openssl/ruby_missing.h b/ruby_1_8_6/ext/openssl/ruby_missing.h
new file mode 100644
index 0000000000..4bd08890f8
--- /dev/null
+++ b/ruby_1_8_6/ext/openssl/ruby_missing.h
@@ -0,0 +1,18 @@
+/*
+ * $Id$
+ * 'OpenSSL for Ruby' project
+ * Copyright (C) 2001-2003  Michal Rokos <m.rokos@sh.cvut.cz>
+ * All rights reserved.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
+ * (See the file 'LICENCE'.)
+ */
+#if !defined(_OSSL_RUBY_MISSING_H_)
+#define _OSS_RUBY_MISSING_H_
+
+#define rb_define_copy_func(klass, func) \
+	rb_define_method(klass, "initialize_copy", func, 1)
+
+#endif /* _OSS_RUBY_MISSING_H_ */
+
diff --git a/ruby_1_8_6/ext/pty/.cvsignore b/ruby_1_8_6/ext/pty/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/pty/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/pty/README b/ruby_1_8_6/ext/pty/README
new file mode 100644
index 0000000000..42c7d4f891
--- /dev/null
+++ b/ruby_1_8_6/ext/pty/README
@@ -0,0 +1,65 @@
+pty extension version 0.3 by A.ito
+
+1. Introduction
+
+This extension module adds ruby a functionality to execute an 
+arbitrary command through pseudo tty (pty).
+
+2. Install
+
+Follow the instruction below.
+
+(1) Execute
+
+      ruby extconf.rb
+
+    then Makefile is generated.
+
+(3) Do make; make install.
+
+3. What you can do
+
+This extension module defines a module named PTY, which contains
+following module fungtions:
+
+   getpty(command)
+   spawn(command)
+
+      This function reserves a pty, executes command over the pty 
+      and returns an array. The return value is an array with three
+      elements. The first element in the array is for reading and the 
+      second for writing. The third element is the process ID of the
+      child process. If this function is called with an iterator block,
+      the array is passed to the block as block parameters, and the
+      function itself returns nil.
+
+      When the child process is suspended or finished, an exception is
+      raised.  If this function is called with an iterator block,
+      exception is raised only within the block.  Child process
+      monitor is terminated on block exit.
+
+   protect_signal
+   reset_signal
+
+      These functions are obsolete in this version of pty.
+
+4. License
+
+(C) Copyright 1998 by Akinori Ito.
+
+This software may be redistributed freely for this purpose, in full 
+or in part, provided that this entire copyright notice is included 
+on any copies of this software and applications and derivations thereof.
+
+This software is provided on an "as is" basis, without warranty of any
+kind, either expressed or implied, as to any matter including, but not
+limited to warranty of fitness of purpose, or merchantability, or
+results obtained from use of this software.
+
+5. Bug report
+
+Please feel free to send E-mail to
+
+   aito@ei5sun.yz.yamagata-u.ac.jp
+
+for any bug report, opinion, contribution, etc.
diff --git a/ruby_1_8_6/ext/pty/README.expect b/ruby_1_8_6/ext/pty/README.expect
new file mode 100644
index 0000000000..fddbb6fdad
--- /dev/null
+++ b/ruby_1_8_6/ext/pty/README.expect
@@ -0,0 +1,22 @@
+	README for expect
+		by A. Ito, 28 October, 1998
+
+	Expect library adds IO class a method called expect(), which
+does similar act to tcl's expect extension. 
+
+The usage of the method is:
+
+   IO#expect(pattern,timeout=9999999)
+
+where `pattern' is an instance of String or Regexp and `timeout'
+is Fixnum, which can be omitted. 
+	When the method is called without block, it waits until the
+input which matches the pattern is obtained from the IO or the time
+specified as the timeout passes. When the pattern is obtained from the
+IO, the method returns an array. The first element of the array is the
+entire string obtained from the IO until the pattern matches. The
+following elements indicates the specific pattern which matched to the
+anchor in the regular expression. If the method ends because of
+timeout, it returns nil. 
+ 	When the method is called with block, the array is passed as
+the block parameter.
diff --git a/ruby_1_8_6/ext/pty/README.expect.ja b/ruby_1_8_6/ext/pty/README.expect.ja
new file mode 100644
index 0000000000..db84695ee5
--- /dev/null
+++ b/ruby_1_8_6/ext/pty/README.expect.ja
@@ -0,0 +1,21 @@
+	README for expect
+		by A. Ito, 28 October, 1998
+
+  Expectライブラリは，tcl の expect パッケージと似たような機能を
+IOクラスに追加します．
+
+  追加されるメソッドの使い方は次の通りです．
+
+   IO#expect(pattern,timeout=9999999)
+
+pattern は String か Regexp のインスタンス，timeout は Fixnum
+のインスタンスです．timeout は省略できます．
+  このメソッドがブロックなしで呼ばれた場合，まずレシーバである
+IOオブジェクトから pattern にマッチするパターンが読みこまれる
+まで待ちます．パターンが得られたら，そのパターンに関する配列を
+返します．配列の最初の要素は，pattern にマッチするまでに読みこ
+まれた内容の文字列です．2番目以降の要素は，pattern の正規表現
+の中にアンカーがあった場合に，そのアンカーにマッチする部分です．
+もしタイムアウトが起きた場合は，このメソッドはnilを返します．
+  このメソッドがブロック付きで呼ばれた場合には，マッチした要素の
+配列がブロック引数として渡され，ブロックが評価されます．
diff --git a/ruby_1_8_6/ext/pty/README.ja b/ruby_1_8_6/ext/pty/README.ja
new file mode 100644
index 0000000000..5ae4fb06a0
--- /dev/null
+++ b/ruby_1_8_6/ext/pty/README.ja
@@ -0,0 +1,89 @@
+pty 拡張モジュール version 0.3 by A.ito
+
+1. はじめに
+
+この拡張モジュールは，仮想tty (pty) を通して適当なコマンドを
+実行する機能を ruby に提供します．
+
+2. インストール
+
+次のようにしてインストールしてください．
+
+(1)  ruby extconf.rb
+
+    を実行すると Makefile が生成されます．
+
+(2) make; make install を実行してください．
+
+3. 何ができるか
+
+この拡張モジュールは，PTY というモジュールを定義します．その中
+には，次のようなモジュール関数が含まれています．
+
+   getpty(command)
+   spawn(command)
+
+      この関数は，仮想ttyを確保し，指定されたコマンドをその仮想tty
+      の向こうで実行し，配列を返します．戻り値は3つの要素からなる
+      配列です．最初の要素は仮想ttyから読み出すためのIOオブジェクト，
+      2番目は書きこむためのIOオブジェクト，3番目は子プロセスのプロ
+      セスIDです．この関数がイテレータとして呼ばれた場合，これらの
+      要素はブロックパラメータとして渡され，関数自体はnilを返します．
+
+      この関数によって作られたサブプロセスが動いている間，子プロセス
+      の状態を監視するために SIGCHLD シグナルを捕捉します．子プロセス
+      が終了したり停止した場合には，例外が発生します．この間，すべての
+      SIGCHLD が PTY モジュールのシグナルハンドラに捕捉されるので，
+      サブプロセスを生成する他の関数(system() とか IO.popen()など)を
+      使うと，予期しない例外が発生することがあります．これを防ぐため
+      には，下記のprotect_signal()を参照してください．
+
+      この関数がブロックパラメータ付きで呼ばれた場合には，そのブロック
+      の中でのみ SIGCHLD が捕捉されます．したがって，ブロックパラメータ
+      として渡されたIOオブジェクトを，ブロックの外に持ち出して使うの
+      は勧められません．
+
+
+   protect_signal
+
+      この関数はイテレータです．ここで指定されたブロックの中では，
+      子プロセスが終了しても例外を発生しません．この関数を使うことで，
+      PTYの子プロセスが動いている間でも，system()や IO.popen()などの
+      関数を安全に使うことができます．例えば，
+
+        PTY.spawn("command_foo") do |r,w|
+          ...
+          ...
+          PTY.protect_signal do
+            system "some other commands"
+          end
+          ...
+        end
+
+      このような記述により，"some other commands" が終了したときに
+      例外が発生するのを防げます．
+
+    reset_signal
+
+      PTY の子プロセスが動いていても，そのプロセスの終了時に例外が発生
+      しないようにします．
+
+4. 利用について
+
+伊藤彰則が著作権を保有します．
+
+ソースプログラムまたはドキュメントに元の著作権表示が改変されずに
+表示されている場合に限り，誰でも，このソフトウェアを無償かつ著作
+権者に無断で利用・配布・改変できます．利用目的は限定されていませ
+ん．
+
+このプログラムの利用・配布その他このプログラムに関係する行為によ
+って生じたいかなる損害に対しても，作者は一切責任を負いません．
+
+5. バグ報告等
+
+バグレポートは歓迎します．
+
+	aito@ei5sun.yz.yamagata-u.ac.jp
+
+まで電子メールでバグレポートをお送りください．
diff --git a/ruby_1_8_6/ext/pty/depend b/ruby_1_8_6/ext/pty/depend
new file mode 100644
index 0000000000..888be6c301
--- /dev/null
+++ b/ruby_1_8_6/ext/pty/depend
@@ -0,0 +1 @@
+pty.o: pty.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ruby_1_8_6/ext/pty/expect_sample.rb b/ruby_1_8_6/ext/pty/expect_sample.rb
new file mode 100644
index 0000000000..bf8a2352fe
--- /dev/null
+++ b/ruby_1_8_6/ext/pty/expect_sample.rb
@@ -0,0 +1,55 @@
+#
+# sample program of expect.rb
+#
+#  by A. Ito
+#
+#  This program reports the latest version of ruby interpreter
+#  by connecting to ftp server at ruby-lang.org.
+#
+require 'pty'
+require 'expect'
+
+fnames = []
+PTY.spawn("ftp ftp.ruby-lang.org") do |r_f,w_f,pid|
+  w_f.sync = true
+  
+  $expect_verbose = false
+  
+  r_f.expect(/^Name.*: /) do
+    w_f.print "ftp\n"
+  end
+  
+  if !ENV['USER'].nil?
+    username = ENV['USER']
+  elsif !ENV['LOGNAME'].nil?
+    username = ENV['LOGNAME']
+  else
+    username = 'guest'
+  end
+  
+  r_f.expect('word:') do
+    w_f.print username+"@\n"
+  end
+  r_f.expect("> ") do
+    w_f.print "cd pub/ruby\n"
+  end
+  r_f.expect("> ") do
+    w_f.print "dir\n"
+  end
+  
+  r_f.expect("> ") do |output|
+    for x in output[0].split("\n")
+      if x =~ /(ruby.*\.tar\.gz)/ then
+         fnames.push $1
+      end
+    end
+  end
+  begin
+    w_f.print "quit\n"
+  rescue
+  end
+end
+
+print "The latest ruby interpreter is "
+print fnames.sort.pop
+print "\n"
diff --git a/ruby_1_8_6/ext/pty/extconf.rb b/ruby_1_8_6/ext/pty/extconf.rb
new file mode 100644
index 0000000000..5e126fe0cf
--- /dev/null
+++ b/ruby_1_8_6/ext/pty/extconf.rb
@@ -0,0 +1,15 @@
+require 'mkmf'
+
+if /mswin32|mingw|bccwin32/ !~ RUBY_PLATFORM
+  have_header("sys/stropts.h")
+  have_func("setresuid")
+  have_header("libutil.h")
+  have_header("pty.h")
+  have_library("util", "openpty")
+  if have_func("openpty") or
+      have_func("_getpty") or
+      have_func("ptsname") or
+      have_func("ioctl")
+    create_makefile('pty')
+  end
+end
diff --git a/ruby_1_8_6/ext/pty/lib/expect.rb b/ruby_1_8_6/ext/pty/lib/expect.rb
new file mode 100644
index 0000000000..aa9ab895d3
--- /dev/null
+++ b/ruby_1_8_6/ext/pty/lib/expect.rb
@@ -0,0 +1,36 @@
+$expect_verbose = false
+
+class IO
+  def expect(pat,timeout=9999999)
+    buf = ''
+    case pat
+    when String
+      e_pat = Regexp.new(Regexp.quote(pat))
+    when Regexp
+      e_pat = pat
+    end
+    while true
+      if IO.select([self],nil,nil,timeout).nil? then
+        result = nil
+        break
+      end
+      c = getc.chr
+      buf << c
+      if $expect_verbose
+        STDOUT.print c
+        STDOUT.flush
+      end
+      if mat=e_pat.match(buf) then
+        result = [buf,*mat.to_a[1..-1]]
+        break
+      end
+    end
+    if block_given? then
+      yield result
+    else
+      return result
+    end
+    nil
+  end
+end
+
diff --git a/ruby_1_8_6/ext/pty/pty.c b/ruby_1_8_6/ext/pty/pty.c
new file mode 100644
index 0000000000..206d4cd131
--- /dev/null
+++ b/ruby_1_8_6/ext/pty/pty.c
@@ -0,0 +1,485 @@
+#include	"config.h"
+#include	<stdio.h>
+#include	<sys/types.h>
+#include	<sys/stat.h>
+#include	<sys/file.h>
+#include	<fcntl.h>
+#include	<errno.h>
+#include	<pwd.h>
+#ifdef HAVE_SYS_IOCTL_H
+#include	<sys/ioctl.h>
+#endif
+#ifdef HAVE_LIBUTIL_H
+#include	<libutil.h>
+#endif
+#ifdef HAVE_PTY_H
+#include	<pty.h>
+#endif
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#else
+#define WIFSTOPPED(status)    (((status) & 0xff) == 0x7f)
+#endif
+#include <ctype.h>
+
+#include "ruby.h"
+#include "rubyio.h"
+#include "util.h"
+
+#include <signal.h>
+#ifdef HAVE_SYS_STROPTS_H
+#include <sys/stropts.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#define	DEVICELEN	16
+
+#if !defined(HAVE_OPENPTY)
+#if defined(__hpux)
+static
+char	*MasterDevice = "/dev/ptym/pty%s",
+	*SlaveDevice =  "/dev/pty/tty%s",
+	*deviceNo[] = {
+		"p0","p1","p2","p3","p4","p5","p6","p7",
+		"p8","p9","pa","pb","pc","pd","pe","pf",
+		"q0","q1","q2","q3","q4","q5","q6","q7",
+		"q8","q9","qa","qb","qc","qd","qe","qf",
+		"r0","r1","r2","r3","r4","r5","r6","r7",
+		"r8","r9","ra","rb","rc","rd","re","rf",
+		"s0","s1","s2","s3","s4","s5","s6","s7",
+		"s8","s9","sa","sb","sc","sd","se","sf",
+		"t0","t1","t2","t3","t4","t5","t6","t7",
+		"t8","t9","ta","tb","tc","td","te","tf",
+		"u0","u1","u2","u3","u4","u5","u6","u7",
+		"u8","u9","ua","ub","uc","ud","ue","uf",
+		"v0","v1","v2","v3","v4","v5","v6","v7",
+		"v8","v9","va","vb","vc","vd","ve","vf",
+		"w0","w1","w2","w3","w4","w5","w6","w7",
+		"w8","w9","wa","wb","wc","wd","we","wf",
+		0,
+	};
+#elif defined(_IBMESA)  /* AIX/ESA */
+static
+char	*MasterDevice = "/dev/ptyp%s",
+  	*SlaveDevice = "/dev/ttyp%s",
+	*deviceNo[] = {
+"00","01","02","03","04","05","06","07","08","09","0a","0b","0c","0d","0e","0f",
+"10","11","12","13","14","15","16","17","18","19","1a","1b","1c","1d","1e","1f",
+"20","21","22","23","24","25","26","27","28","29","2a","2b","2c","2d","2e","2f",
+"30","31","32","33","34","35","36","37","38","39","3a","3b","3c","3d","3e","3f",
+"40","41","42","43","44","45","46","47","48","49","4a","4b","4c","4d","4e","4f",
+"50","51","52","53","54","55","56","57","58","59","5a","5b","5c","5d","5e","5f",
+"60","61","62","63","64","65","66","67","68","69","6a","6b","6c","6d","6e","6f",
+"70","71","72","73","74","75","76","77","78","79","7a","7b","7c","7d","7e","7f",
+"80","81","82","83","84","85","86","87","88","89","8a","8b","8c","8d","8e","8f",
+"90","91","92","93","94","95","96","97","98","99","9a","9b","9c","9d","9e","9f",
+"a0","a1","a2","a3","a4","a5","a6","a7","a8","a9","aa","ab","ac","ad","ae","af",
+"b0","b1","b2","b3","b4","b5","b6","b7","b8","b9","ba","bb","bc","bd","be","bf",
+"c0","c1","c2","c3","c4","c5","c6","c7","c8","c9","ca","cb","cc","cd","ce","cf",
+"d0","d1","d2","d3","d4","d5","d6","d7","d8","d9","da","db","dc","dd","de","df",
+"e0","e1","e2","e3","e4","e5","e6","e7","e8","e9","ea","eb","ec","ed","ee","ef",
+"f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","fa","fb","fc","fd","fe","ff",
+		};
+#elif !defined(HAVE_PTSNAME)
+static
+char	*MasterDevice = "/dev/pty%s",
+	*SlaveDevice = "/dev/tty%s",
+	*deviceNo[] = {
+		"p0","p1","p2","p3","p4","p5","p6","p7",
+		"p8","p9","pa","pb","pc","pd","pe","pf",
+		"q0","q1","q2","q3","q4","q5","q6","q7",
+		"q8","q9","qa","qb","qc","qd","qe","qf",
+		"r0","r1","r2","r3","r4","r5","r6","r7",
+		"r8","r9","ra","rb","rc","rd","re","rf",
+		"s0","s1","s2","s3","s4","s5","s6","s7",
+		"s8","s9","sa","sb","sc","sd","se","sf",
+		0,
+	};
+#endif
+#endif /* !defined(HAVE_OPENPTY) */
+
+static char SlaveName[DEVICELEN];
+
+#ifndef HAVE_SETEUID
+# ifdef HAVE_SETREUID
+#  define seteuid(e)	setreuid(-1, (e))
+# else /* NOT HAVE_SETREUID */
+#  ifdef HAVE_SETRESUID
+#   define seteuid(e)	setresuid(-1, (e), -1)
+#  else /* NOT HAVE_SETRESUID */
+    /* I can't set euid. (;_;) */
+#  endif /* HAVE_SETRESUID */
+# endif /* HAVE_SETREUID */
+#endif /* NO_SETEUID */
+
+static VALUE eChildExited;
+
+static VALUE
+echild_status(self)
+    VALUE self;
+{
+    return rb_ivar_get(self, rb_intern("status"));
+}
+
+struct pty_info {
+    int fd;
+    rb_pid_t child_pid;
+    VALUE thread;
+};
+
+static void
+raise_from_wait(state, info)
+    struct pty_info *info;
+    char *state;
+{
+    extern VALUE rb_last_status;
+    char buf[1024];
+    VALUE exc;
+
+    snprintf(buf, sizeof(buf), "pty - %s: %ld", state, (long)info->child_pid);
+    exc = rb_exc_new2(eChildExited, buf);
+    rb_iv_set(exc, "status", rb_last_status);
+    rb_funcall(info->thread, rb_intern("raise"), 1, exc);
+}
+
+static VALUE
+pty_syswait(info)
+    struct pty_info *info;
+{
+    int cpid, status;
+
+    for (;;) {
+	cpid = rb_waitpid(info->child_pid, &status, WUNTRACED);
+	if (cpid == -1) return Qnil;
+
+#if defined(IF_STOPPED)
+	if (IF_STOPPED(status)) { /* suspend */
+	    raise_from_wait("stopped", info);
+	}
+#elif defined(WIFSTOPPED)
+	if (WIFSTOPPED(status)) { /* suspend */
+	    raise_from_wait("stopped", info);
+	}
+#else
+---->> Either IF_STOPPED or WIFSTOPPED is needed <<----
+#endif /* WIFSTOPPED | IF_STOPPED */
+	else if (kill(info->child_pid, 0) == 0) {
+	    raise_from_wait("changed", info);
+	}
+	else {
+	    raise_from_wait("exited", info);
+	    return Qnil;
+	}
+    }
+}
+
+static void getDevice _((int*, int*));
+
+struct exec_info {
+    int argc;
+    VALUE *argv;
+};
+
+static VALUE pty_exec _((VALUE v));
+
+static VALUE
+pty_exec(v)
+    VALUE v;
+{
+    struct exec_info *arg = (struct exec_info *)v;
+    return rb_f_exec(arg->argc, arg->argv);
+}
+
+static void
+establishShell(argc, argv, info)
+    int argc;
+    VALUE *argv;
+    struct pty_info *info;
+{
+    int 		i,master,slave;
+    char		*p, tmp, *getenv();
+    struct passwd	*pwent;
+    VALUE		v;
+    struct exec_info	arg;
+    int			status;
+
+    if (argc == 0) {
+	char *shellname;
+
+	if ((p = getenv("SHELL")) != NULL) {
+	    shellname = p;
+	}
+	else {
+	    pwent = getpwuid(getuid());
+	    if (pwent && pwent->pw_shell)
+		shellname = pwent->pw_shell;
+	    else
+		shellname = "/bin/sh";
+	}
+	v = rb_str_new2(shellname);
+	argc = 1;
+	argv = &v;
+    }
+    getDevice(&master,&slave);
+
+    info->thread = rb_thread_current();
+    if((i = fork()) < 0) {
+	close(master);
+	close(slave);
+	rb_sys_fail("fork failed");
+    }
+
+    if(i == 0) {	/* child */
+	/*
+	 * Set free from process group and controlling terminal
+	 */
+#ifdef HAVE_SETSID
+	(void) setsid();
+#else /* HAS_SETSID */
+# ifdef HAVE_SETPGRP
+#  ifdef SETGRP_VOID
+	if (setpgrp() == -1)
+	    perror("setpgrp()");
+#  else /* SETGRP_VOID */
+	if (setpgrp(0, getpid()) == -1)
+	    rb_sys_fail("setpgrp()");
+	if ((i = open("/dev/tty", O_RDONLY)) < 0)
+	    rb_sys_fail("/dev/tty");
+	else {
+	    if (ioctl(i, TIOCNOTTY, (char *)0))
+		perror("ioctl(TIOCNOTTY)");
+	    close(i);
+	}
+#  endif /* SETGRP_VOID */
+# endif /* HAVE_SETPGRP */
+#endif /* HAS_SETSID */
+
+	/*
+	 * obtain new controlling terminal
+	 */
+#if defined(TIOCSCTTY)
+	close(master);
+	(void) ioctl(slave, TIOCSCTTY, (char *)0);
+	/* errors ignored for sun */
+#else
+	close(slave);
+	slave = open(SlaveName, O_RDWR);
+	if (slave < 0) {
+	    perror("open: pty slave");
+	    _exit(1);
+	}
+	close(master);
+#endif
+	write(slave, "", 1);
+	dup2(slave,0);
+	dup2(slave,1);
+	dup2(slave,2);
+	close(slave);
+#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRESUID)
+	seteuid(getuid());
+#endif
+
+	arg.argc = argc;
+	arg.argv = argv;
+	rb_protect(pty_exec, (VALUE)&arg, &status);
+	sleep(1);
+	_exit(1);
+    }
+
+    read(master, &tmp, 1);
+    close(slave);
+
+    info->child_pid = i;
+    info->fd = master;
+}
+
+static VALUE
+pty_finalize_syswait(info)
+    struct pty_info *info;
+{
+    rb_thread_kill(info->thread);
+    rb_funcall(info->thread, rb_intern("value"), 0);
+    rb_detach_process(info->child_pid);
+    return Qnil;
+}
+
+static int
+get_device_once(master, slave, fail)
+    int *master, *slave, fail;
+{
+#if defined HAVE_OPENPTY
+/*
+ * Use openpty(3) of 4.3BSD Reno and later,
+ * or the same interface function.
+ */
+    if (openpty(master, slave, SlaveName,
+		(struct termios *)0, (struct winsize *)0) == -1) {
+	if (!fail) return -1;
+	rb_raise(rb_eRuntimeError, "openpty() failed");
+    }
+
+    return 0;
+#elif defined HAVE__GETPTY
+    char *name;
+
+    if (!(name = _getpty(master, O_RDWR, 0622, 0))) {
+	if (!fail) return -1;
+	rb_raise(rb_eRuntimeError, "_getpty() failed");
+    }
+
+    *slave = open(name, O_RDWR);
+    strcpy(SlaveName, name);
+
+    return 0;
+#else /* HAVE__GETPTY */
+    int	 i,j;
+
+#ifdef HAVE_PTSNAME
+    char *pn;
+    void (*s)();
+
+    extern char *ptsname(int);
+    extern int unlockpt(int);
+    extern int grantpt(int);
+
+    if((i = open("/dev/ptmx", O_RDWR, 0)) != -1) {
+	s = signal(SIGCHLD, SIG_DFL);
+	if(grantpt(i) != -1) {
+	    signal(SIGCHLD, s);
+	    if(unlockpt(i) != -1) {
+		if((pn = ptsname(i)) != NULL) {
+		    if((j = open(pn, O_RDWR, 0)) != -1) {
+#if defined I_PUSH && !defined linux
+			if(ioctl(j, I_PUSH, "ptem") != -1) {
+			    if(ioctl(j, I_PUSH, "ldterm") != -1) {
+				ioctl(j, I_PUSH, "ttcompat");
+#endif
+				*master = i;
+				*slave = j;
+				strcpy(SlaveName, pn);
+				return 0;
+#if defined I_PUSH && !defined linux
+			    }
+			}
+#endif
+		    }
+		}
+	    }
+	}
+	close(i);
+    }
+    if (!fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
+    return -1;
+#else
+    char **p;
+    char MasterName[DEVICELEN];
+
+    for (p = deviceNo; *p != NULL; p++) {
+	sprintf(MasterName,MasterDevice,*p);
+	if ((i = open(MasterName,O_RDWR,0)) >= 0) {
+	    *master = i;
+	    sprintf(SlaveName,SlaveDevice,*p);
+	    if ((j = open(SlaveName,O_RDWR,0)) >= 0) {
+		*slave = j;
+		chown(SlaveName, getuid(), getgid());
+		chmod(SlaveName, 0622);
+		return 0;
+	    }
+	    close(i);
+	}
+    }
+    if (fail) rb_raise(rb_eRuntimeError, "can't get %s", SlaveName);
+    return -1;
+#endif
+#endif
+}
+
+static void
+getDevice(master, slave)
+    int *master, *slave;
+{
+    if (get_device_once(master, slave, 0)) {
+	rb_gc();
+	get_device_once(master, slave, 1);
+    }
+}
+
+/* ruby function: getpty */
+static VALUE
+pty_getpty(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE res;
+    struct pty_info info;
+    struct pty_info thinfo;
+    OpenFile *wfptr,*rfptr;
+    VALUE rport = rb_obj_alloc(rb_cFile);
+    VALUE wport = rb_obj_alloc(rb_cFile);
+
+    MakeOpenFile(rport, rfptr);
+    MakeOpenFile(wport, wfptr);
+
+    establishShell(argc, argv, &info);
+
+    rfptr->mode = rb_io_mode_flags("r");
+    rfptr->f = fdopen(info.fd, "r");
+    rfptr->path = strdup(SlaveName);
+
+    wfptr->mode = rb_io_mode_flags("w") | FMODE_SYNC;
+    wfptr->f = fdopen(dup(info.fd), "w");
+    wfptr->path = strdup(SlaveName);
+
+    res = rb_ary_new2(3);
+    rb_ary_store(res,0,(VALUE)rport);
+    rb_ary_store(res,1,(VALUE)wport);
+    rb_ary_store(res,2,INT2FIX(info.child_pid));
+
+    thinfo.thread = rb_thread_create(pty_syswait, (void*)&info);
+    thinfo.child_pid = info.child_pid;
+    rb_thread_schedule();
+
+    if (rb_block_given_p()) {
+	rb_ensure(rb_yield, res, pty_finalize_syswait, (VALUE)&thinfo);
+	return Qnil;
+    }
+    return res;
+}
+
+/* ruby function: protect_signal - obsolete */
+static VALUE
+pty_protect(self)
+    VALUE self;
+{
+    rb_warn("PTY::protect_signal is no longer needed");
+    rb_yield(Qnil);
+    return self;
+}
+
+/* ruby function: reset_signal - obsolete */
+static VALUE
+pty_reset_signal(self)
+    VALUE self;
+{
+    rb_warn("PTY::reset_signal is no longer needed");
+    return self;
+}
+
+static VALUE cPTY;
+
+void
+Init_pty()
+{
+    cPTY = rb_define_module("PTY");
+    rb_define_module_function(cPTY,"getpty",pty_getpty,-1);
+    rb_define_module_function(cPTY,"spawn",pty_getpty,-1);
+    rb_define_module_function(cPTY,"protect_signal",pty_protect,0);
+    rb_define_module_function(cPTY,"reset_signal",pty_reset_signal,0);
+
+    eChildExited = rb_define_class_under(cPTY,"ChildExited",rb_eRuntimeError);
+    rb_define_method(eChildExited,"status",echild_status,0);
+}
diff --git a/ruby_1_8_6/ext/pty/script.rb b/ruby_1_8_6/ext/pty/script.rb
new file mode 100644
index 0000000000..dbb933171f
--- /dev/null
+++ b/ruby_1_8_6/ext/pty/script.rb
@@ -0,0 +1,37 @@
+require 'pty'
+
+if ARGV.size == 0 then
+  ofile = "typescript"
+else
+  ofile = ARGV[0]
+end
+
+logfile = File.open(ofile,"a")
+
+system "stty -echo raw lnext ^_"
+
+PTY.spawn("/bin/csh") do |r_pty,w_pty,pid|
+
+  Thread.new do
+    while true
+      w_pty.print STDIN.getc.chr
+      w_pty.flush
+    end
+  end
+  
+  begin
+    while true
+      c = r_pty.sysread(512)
+      break if c.nil?
+      print c
+      STDOUT.flush
+      logfile.print c
+    end
+  rescue
+  #  print $@,':',$!,"\n"
+    logfile.close
+  end
+end
+
+system "stty echo -raw lnext ^v"
+
diff --git a/ruby_1_8_6/ext/pty/shl.rb b/ruby_1_8_6/ext/pty/shl.rb
new file mode 100644
index 0000000000..cdaf8d7398
--- /dev/null
+++ b/ruby_1_8_6/ext/pty/shl.rb
@@ -0,0 +1,92 @@
+#
+#  old-fashioned 'shl' like program
+#  by A. Ito
+#
+#  commands:
+#     c        creates new shell
+#     C-z      suspends shell
+#     p        lists all shell
+#     0,1,...  choose shell
+#     q        quit
+
+require 'pty'
+
+$shells = []
+$n_shells = 0
+
+$r_pty = nil
+$w_pty = nil
+
+def writer
+  system "stty -echo raw"
+  begin
+    while true
+      c = STDIN.getc
+      if c == 26 then # C-z
+        $reader.raise(nil)
+        return 'Suspend'
+      end
+      $w_pty.print c.chr
+      $w_pty.flush
+    end
+  rescue
+    $reader.raise(nil)
+    return 'Exit'
+  ensure
+    system "stty echo -raw"
+  end
+end
+
+$reader = Thread.new {
+  while true
+    begin
+      next if $r_pty.nil?
+      c = $r_pty.getc
+      if c.nil? then
+        Thread.stop
+      end
+      print c.chr
+      STDOUT.flush
+    rescue
+      Thread.stop
+    end
+  end
+}
+
+# $reader.raise(nil)
+
+
+while true
+  print ">> "
+  STDOUT.flush
+  case gets
+  when /^c/i
+    $shells[$n_shells] = PTY.spawn("/bin/csh")
+    $r_pty,$w_pty = $shells[$n_shells]
+    $n_shells += 1
+    $reader.run
+    if writer == 'Exit'
+      $n_shells -= 1
+      $shells[$n_shells] = nil
+    end
+  when /^p/i
+    for i in 0..$n_shells
+      unless $shells[i].nil?
+        print i,"\n"
+      end
+    end
+  when /^([0-9]+)/
+    n = $1.to_i
+    if $shells[n].nil?
+      print "\##{i} doesn't exist\n"
+    else
+      $r_pty,$w_pty = $shells[n]
+      $reader.run
+      if writer == 'Exit' then
+        $shells[n] = nil
+      end
+    end
+  when /^q/i
+    exit
+  end
+end
diff --git a/ruby_1_8_6/ext/purelib.rb b/ruby_1_8_6/ext/purelib.rb
new file mode 100644
index 0000000000..10ee06176c
--- /dev/null
+++ b/ruby_1_8_6/ext/purelib.rb
@@ -0,0 +1,3 @@
+if nul = $:.index("-")
+  $:[nul..-1] = ["."]
+end
diff --git a/ruby_1_8_6/ext/racc/cparse/.cvsignore b/ruby_1_8_6/ext/racc/cparse/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/racc/cparse/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/racc/cparse/cparse.c b/ruby_1_8_6/ext/racc/cparse/cparse.c
new file mode 100644
index 0000000000..18a26f670f
--- /dev/null
+++ b/ruby_1_8_6/ext/racc/cparse/cparse.c
@@ -0,0 +1,828 @@
+/*
+
+    cparse.c -- Racc Runtime Core
+  
+    Copyright (c) 1999-2006 Minero Aoki
+  
+    This library is free software.
+    You can distribute/modify this program under the same terms of ruby.
+
+    $originalId: cparse.c,v 1.8 2006/07/06 11:39:46 aamine Exp $
+
+*/
+
+#include "ruby.h"
+#include "version.h"
+
+/* -----------------------------------------------------------------------
+                        Important Constants
+----------------------------------------------------------------------- */
+
+#define RACC_VERSION "1.4.5"
+
+#define DEFAULT_TOKEN -1
+#define ERROR_TOKEN    1
+#define FINAL_TOKEN    0
+
+#define vDEFAULT_TOKEN  INT2FIX(DEFAULT_TOKEN)
+#define vERROR_TOKEN    INT2FIX(ERROR_TOKEN)
+#define vFINAL_TOKEN    INT2FIX(FINAL_TOKEN)
+
+/* -----------------------------------------------------------------------
+                          File Local Variables
+----------------------------------------------------------------------- */
+
+static VALUE RaccBug;
+static VALUE CparseParams;
+
+static ID id_yydebug;
+static ID id_nexttoken;
+static ID id_onerror;
+static ID id_noreduce;
+static ID id_errstatus;
+
+static ID id_d_shift;
+static ID id_d_reduce;
+static ID id_d_accept;
+static ID id_d_read_token;
+static ID id_d_next_state;
+static ID id_d_e_pop;
+
+/* -----------------------------------------------------------------------
+                              Utils
+----------------------------------------------------------------------- */
+
+/* For backward compatibility */
+#ifndef ID2SYM
+# define ID2SYM(i) ULONG2NUM(i)
+#endif
+#ifndef SYM2ID
+#  define SYM2ID(v) ((ID)NUM2ULONG(v))
+#endif
+#ifndef SYMBOL_P
+#  define SYMBOL_P(v) FIXNUM_P(v)
+#endif
+#ifndef LONG2NUM
+#  define LONG2NUM(i) INT2NUM(i)
+#endif
+#if RUBY_VERSION_CODE >= 190
+#  define HAVE_RB_BLOCK_CALL 1
+#endif
+
+static ID value_to_id _((VALUE v));
+static inline long num_to_long _((VALUE n));
+
+static ID
+value_to_id(VALUE v)
+{
+    if (! SYMBOL_P(v)) {
+        rb_raise(rb_eTypeError, "not symbol");
+    }
+    return SYM2ID(v);
+}
+
+static inline long
+num_to_long(VALUE n)
+{
+    return NUM2LONG(n);
+}
+
+#define AREF(s, idx) \
+    ((0 <= idx && idx < RARRAY(s)->len) ? RARRAY(s)->ptr[idx] : Qnil)
+
+/* -----------------------------------------------------------------------
+                        Parser Stack Interfaces
+----------------------------------------------------------------------- */
+
+static VALUE get_stack_tail _((VALUE stack, long len));
+static void cut_stack_tail _((VALUE stack, long len));
+
+static VALUE
+get_stack_tail(VALUE stack, long len)
+{
+    if (len < 0) return Qnil;  /* system error */
+    if (len > RARRAY(stack)->len) len = RARRAY(stack)->len;
+    return rb_ary_new4(len, RARRAY(stack)->ptr + RARRAY(stack)->len - len);
+}
+
+static void
+cut_stack_tail(VALUE stack, long len)
+{
+    while (len > 0) {
+        rb_ary_pop(stack);
+        len--;
+    }
+}
+
+#define STACK_INIT_LEN 64
+#define NEW_STACK() rb_ary_new2(STACK_INIT_LEN)
+#define PUSH(s, i) rb_ary_store(s, RARRAY(s)->len, i)
+#define POP(s) rb_ary_pop(s)
+#define LAST_I(s) \
+    ((RARRAY(s)->len > 0) ? RARRAY(s)->ptr[RARRAY(s)->len - 1] : Qnil)
+#define GET_TAIL(s, len) get_stack_tail(s, len)
+#define CUT_TAIL(s, len) cut_stack_tail(s, len)
+
+/* -----------------------------------------------------------------------
+                       struct cparse_params
+----------------------------------------------------------------------- */
+
+struct cparse_params {
+    VALUE value_v;         /* VALUE version of this struct */
+
+    VALUE parser;          /* parser object */
+
+    int   lex_is_iterator;
+    VALUE lexer;           /* scanner object */
+    ID    lexmid;          /* name of scanner method (must be an iterator) */
+
+    /* State transition tables (immutable)
+       Data structure is from Dragon Book 4.9 */
+    /* action table */
+    VALUE action_table;
+    VALUE action_check;
+    VALUE action_default;
+    VALUE action_pointer;
+    /* goto table */
+    VALUE goto_table;
+    VALUE goto_check;
+    VALUE goto_default;
+    VALUE goto_pointer;
+
+    long  nt_base;         /* NonTerminal BASE index */
+    VALUE reduce_table;    /* reduce data table */
+    VALUE token_table;     /* token conversion table */
+
+    /* parser stacks and parameters */
+    VALUE state;
+    long curstate;
+    VALUE vstack;
+    VALUE tstack;
+    VALUE t;
+    long shift_n;
+    long reduce_n;
+    long ruleno;
+
+    long errstatus;         /* nonzero in error recovering mode */
+    long nerr;              /* number of error */
+
+    int use_result_var;
+
+    VALUE retval;           /* return value of parser routine */
+    long fin;               /* parse result status */
+#define CP_FIN_ACCEPT  1
+#define CP_FIN_EOT     2
+#define CP_FIN_CANTPOP 3
+
+    int debug;              /* user level debug */
+    int sys_debug;          /* system level debug */
+
+    long i;                 /* table index */
+};
+
+/* -----------------------------------------------------------------------
+                        Parser Main Routines
+----------------------------------------------------------------------- */
+
+static VALUE racc_cparse _((VALUE parser, VALUE arg, VALUE sysdebug));
+static VALUE racc_yyparse _((VALUE parser, VALUE lexer, VALUE lexmid,
+                             VALUE arg, VALUE sysdebug));
+
+static void call_lexer _((struct cparse_params *v));
+static VALUE lexer_i _((VALUE block_args, VALUE data, VALUE self));
+
+static VALUE assert_array _((VALUE a));
+static long assert_integer _((VALUE n));
+static VALUE assert_hash _((VALUE h));
+static VALUE initialize_params _((VALUE vparams, VALUE parser, VALUE arg,
+                                 VALUE lexer, VALUE lexmid));
+static void cparse_params_mark _((void *ptr));
+
+static void parse_main _((struct cparse_params *v,
+                         VALUE tok, VALUE val, int resume));
+static void extract_user_token _((struct cparse_params *v,
+                                  VALUE block_args, VALUE *tok, VALUE *val));
+static void shift _((struct cparse_params* v, long act, VALUE tok, VALUE val));
+static int reduce _((struct cparse_params* v, long act));
+static VALUE reduce0 _((VALUE block_args, VALUE data, VALUE self));
+
+#ifdef DEBUG
+# define D_puts(msg)        if (v->sys_debug) puts(msg)
+# define D_printf(fmt,arg)  if (v->sys_debug) printf(fmt,arg)
+#else
+# define D_puts(msg)
+# define D_printf(fmt,arg)
+#endif
+
+static VALUE
+racc_cparse(VALUE parser, VALUE arg, VALUE sysdebug)
+{
+    volatile VALUE vparams;
+    struct cparse_params *v;
+
+    vparams = Data_Make_Struct(CparseParams, struct cparse_params,
+                               cparse_params_mark, -1, v);
+    D_puts("starting cparse");
+    v->sys_debug = RTEST(sysdebug);
+    vparams = initialize_params(vparams, parser, arg, Qnil, Qnil);
+    v->lex_is_iterator = Qfalse;
+    parse_main(v, Qnil, Qnil, 0);
+
+    return v->retval;
+}
+
+static VALUE
+racc_yyparse(VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug)
+{
+    volatile VALUE vparams;
+    struct cparse_params *v;
+
+    vparams = Data_Make_Struct(CparseParams, struct cparse_params,
+                               cparse_params_mark, -1, v);
+    v->sys_debug = RTEST(sysdebug);
+    D_puts("start C yyparse");
+    vparams = initialize_params(vparams, parser, arg, lexer, lexmid);
+    v->lex_is_iterator = Qtrue;
+    D_puts("params initialized");
+    parse_main(v, Qnil, Qnil, 0);
+    call_lexer(v);
+    if (!v->fin) {
+        rb_raise(rb_eArgError, "%s() is finished before EndOfToken",
+                 rb_id2name(v->lexmid));
+    }
+
+    return v->retval;
+}
+
+#ifdef HAVE_RB_BLOCK_CALL
+static void
+call_lexer(struct cparse_params *v)
+{
+    rb_block_call(v->lexer, v->lexmid, 0, NULL, lexer_i, v->value_v);
+}
+#else
+static VALUE
+lexer_iter(VALUE data)
+{
+    struct cparse_params *v;
+
+    Data_Get_Struct(data, struct cparse_params, v);
+    rb_funcall(v->lexer, v->lexmid, 0);
+    return Qnil;
+}
+
+static void
+call_lexer(struct cparse_params *v)
+{
+    rb_iterate(lexer_iter, v->value_v, lexer_i, v->value_v);
+}
+#endif
+
+static VALUE
+lexer_i(VALUE block_args, VALUE data, VALUE self)
+{
+    struct cparse_params *v;
+    VALUE tok, val;
+
+    Data_Get_Struct(data, struct cparse_params, v);
+    if (v->fin)
+        rb_raise(rb_eArgError, "extra token after EndOfToken");
+    extract_user_token(v, block_args, &tok, &val);
+    parse_main(v, tok, val, 1);
+    if (v->fin && v->fin != CP_FIN_ACCEPT)
+       rb_iter_break(); 
+    return Qnil;
+}
+
+static VALUE
+assert_array(VALUE a)
+{
+    Check_Type(a, T_ARRAY);
+    return a;
+}
+
+static VALUE
+assert_hash(VALUE h)
+{
+    Check_Type(h, T_HASH);
+    return h;
+}
+
+static long
+assert_integer(VALUE n)
+{
+    return NUM2LONG(n);
+}
+
+static VALUE
+initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lexmid)
+{
+    struct cparse_params *v;
+
+    Data_Get_Struct(vparams, struct cparse_params, v);
+    v->value_v = vparams;
+    v->parser = parser;
+    v->lexer = lexer;
+    if (! NIL_P(lexmid))
+        v->lexmid = value_to_id(lexmid);
+
+    v->debug = RTEST(rb_ivar_get(parser, id_yydebug));
+
+    Check_Type(arg, T_ARRAY);
+    if (!(13 <= RARRAY(arg)->len && RARRAY(arg)->len <= 14))
+        rb_raise(RaccBug, "[Racc Bug] wrong arg.size %ld", RARRAY(arg)->len);
+    v->action_table   = assert_array  (RARRAY(arg)->ptr[ 0]);
+    v->action_check   = assert_array  (RARRAY(arg)->ptr[ 1]);
+    v->action_default = assert_array  (RARRAY(arg)->ptr[ 2]);
+    v->action_pointer = assert_array  (RARRAY(arg)->ptr[ 3]);
+    v->goto_table     = assert_array  (RARRAY(arg)->ptr[ 4]);
+    v->goto_check     = assert_array  (RARRAY(arg)->ptr[ 5]);
+    v->goto_default   = assert_array  (RARRAY(arg)->ptr[ 6]);
+    v->goto_pointer   = assert_array  (RARRAY(arg)->ptr[ 7]);
+    v->nt_base        = assert_integer(RARRAY(arg)->ptr[ 8]);
+    v->reduce_table   = assert_array  (RARRAY(arg)->ptr[ 9]);
+    v->token_table    = assert_hash   (RARRAY(arg)->ptr[10]);
+    v->shift_n        = assert_integer(RARRAY(arg)->ptr[11]);
+    v->reduce_n       = assert_integer(RARRAY(arg)->ptr[12]);
+    if (RARRAY(arg)->len > 13) {
+        v->use_result_var = RTEST(RARRAY(arg)->ptr[13]);
+    }
+    else {
+        v->use_result_var = Qtrue;
+    }
+
+    v->tstack = v->debug ? NEW_STACK() : Qnil;
+    v->vstack = NEW_STACK();
+    v->state = NEW_STACK();
+    v->curstate = 0;
+    PUSH(v->state, INT2FIX(0));
+    v->t = INT2FIX(FINAL_TOKEN + 1);   /* must not init to FINAL_TOKEN */
+    v->nerr = 0;
+    v->errstatus = 0;
+    rb_ivar_set(parser, id_errstatus, LONG2NUM(v->errstatus));
+
+    v->retval = Qnil;
+    v->fin = 0;
+
+    v->lex_is_iterator = Qfalse;
+
+    rb_iv_set(parser, "@vstack", v->vstack);
+    if (v->debug) {
+        rb_iv_set(parser, "@tstack", v->tstack);
+    }
+    else {
+        rb_iv_set(parser, "@tstack", Qnil);
+    }
+
+    return vparams;
+}
+
+static void
+cparse_params_mark(void *ptr)
+{
+    struct cparse_params *v = (struct cparse_params*)ptr;
+
+    rb_gc_mark(v->value_v);
+    rb_gc_mark(v->parser);
+    rb_gc_mark(v->lexer);
+    rb_gc_mark(v->action_table);
+    rb_gc_mark(v->action_check);
+    rb_gc_mark(v->action_default);
+    rb_gc_mark(v->action_pointer);
+    rb_gc_mark(v->goto_table);
+    rb_gc_mark(v->goto_check);
+    rb_gc_mark(v->goto_default);
+    rb_gc_mark(v->goto_pointer);
+    rb_gc_mark(v->reduce_table);
+    rb_gc_mark(v->token_table);
+    rb_gc_mark(v->state);
+    rb_gc_mark(v->vstack);
+    rb_gc_mark(v->tstack);
+    rb_gc_mark(v->t);
+    rb_gc_mark(v->retval);
+}
+
+static void
+extract_user_token(struct cparse_params *v, VALUE block_args,
+                   VALUE *tok, VALUE *val)
+{
+    if (NIL_P(block_args)) {
+        /* EOF */
+        *tok = Qfalse;
+        *val = rb_str_new("$", 1);
+        return;
+    }
+
+    if (TYPE(block_args) != T_ARRAY) {
+        rb_raise(rb_eTypeError,
+                 "%s() %s %s (must be Array[2])",
+                 v->lex_is_iterator ? rb_id2name(v->lexmid) : "next_token",
+                 v->lex_is_iterator ? "yielded" : "returned",
+                 rb_class2name(CLASS_OF(block_args)));
+    }
+    if (RARRAY(block_args)->len != 2) {
+        rb_raise(rb_eArgError,
+                 "%s() %s wrong size of array (%ld for 2)",
+                 v->lex_is_iterator ? rb_id2name(v->lexmid) : "next_token",
+                 v->lex_is_iterator ? "yielded" : "returned",
+                 RARRAY(block_args)->len);
+    }
+    *tok = AREF(block_args, 0);
+    *val = AREF(block_args, 1);
+}
+
+#define SHIFT(v,act,tok,val) shift(v,act,tok,val)
+#define REDUCE(v,act) do {\
+    switch (reduce(v,act)) {  \
+      case 0: /* normal */    \
+        break;                \
+      case 1: /* yyerror */   \
+        goto user_yyerror;    \
+      case 2: /* yyaccept */  \
+        D_puts("u accept");   \
+        goto accept;          \
+      default:                \
+        break;                \
+    }                         \
+} while (0)
+
+static void
+parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
+{
+    long i;              /* table index */
+    long act;            /* action type */
+    VALUE act_value;     /* action type, VALUE version */
+    int read_next = 1;   /* true if we need to read next token */
+    VALUE tmp;
+
+    if (resume)
+        goto resume;
+    
+    while (1) {
+        D_puts("");
+        D_puts("---- enter new loop ----");
+        D_puts("");
+
+        D_printf("(act) k1=%ld\n", v->curstate);
+        tmp = AREF(v->action_pointer, v->curstate);
+        if (NIL_P(tmp)) goto notfound;
+        D_puts("(act) pointer[k1] ok");
+        i = NUM2LONG(tmp);
+
+        D_printf("read_next=%d\n", read_next);
+        if (read_next && (v->t != vFINAL_TOKEN)) {
+            if (v->lex_is_iterator) {
+                D_puts("resuming...");
+                if (v->fin) rb_raise(rb_eArgError, "token given after EOF");
+                v->i = i;  /* save i */
+                return;
+              resume:
+                D_puts("resumed");
+                i = v->i;  /* load i */
+            }
+            else {
+                D_puts("next_token");
+                tmp = rb_funcall(v->parser, id_nexttoken, 0);
+                extract_user_token(v, tmp, &tok, &val);
+            }
+            /* convert token */
+            v->t = rb_hash_aref(v->token_table, tok);
+            if (NIL_P(v->t)) {
+                v->t = vERROR_TOKEN;
+            }
+            D_printf("(act) t(k2)=%ld\n", NUM2LONG(v->t));
+            if (v->debug) {
+                rb_funcall(v->parser, id_d_read_token,
+                           3, v->t, tok, val);
+            }
+        }
+        read_next = 0;
+
+        i += NUM2LONG(v->t);
+        D_printf("(act) i=%ld\n", i);
+        if (i < 0) goto notfound;
+
+        act_value = AREF(v->action_table, i);
+        if (NIL_P(act_value)) goto notfound;
+        act = NUM2LONG(act_value);
+        D_printf("(act) table[i]=%ld\n", act);
+
+        tmp = AREF(v->action_check, i);
+        if (NIL_P(tmp)) goto notfound;
+        if (NUM2LONG(tmp) != v->curstate) goto notfound;
+        D_printf("(act) check[i]=%ld\n", NUM2LONG(tmp));
+
+        D_puts("(act) found");
+      act_fixed:
+        D_printf("act=%ld\n", act);
+        goto handle_act;
+    
+      notfound:
+        D_puts("(act) not found: use default");
+        act_value = AREF(v->action_default, v->curstate);
+        act = NUM2LONG(act_value);
+        goto act_fixed;
+
+
+      handle_act:
+        if (act > 0 && act < v->shift_n) {
+            D_puts("shift");
+            if (v->errstatus > 0) {
+                v->errstatus--;
+                rb_ivar_set(v->parser, id_errstatus, LONG2NUM(v->errstatus));
+            }
+            SHIFT(v, act, v->t, val);
+            read_next = 1;
+        }
+        else if (act < 0 && act > -(v->reduce_n)) {
+            D_puts("reduce");
+            REDUCE(v, act);
+        }
+        else if (act == -(v->reduce_n)) {
+            goto error;
+          error_recovered:
+            ;   /* goto label requires stmt */
+        }
+        else if (act == v->shift_n) {
+            D_puts("accept");
+            goto accept;
+        }
+        else {
+            rb_raise(RaccBug, "[Racc Bug] unknown act value %ld", act);
+        }
+
+        if (v->debug) {
+            rb_funcall(v->parser, id_d_next_state,
+                       2, LONG2NUM(v->curstate), v->state);
+        }
+    }
+    /* not reach */
+
+
+  accept:
+    if (v->debug) rb_funcall(v->parser, id_d_accept, 0);
+    v->retval = RARRAY(v->vstack)->ptr[0];
+    v->fin = CP_FIN_ACCEPT;
+    return;
+
+
+  error:
+    D_printf("error detected, status=%ld\n", v->errstatus);
+    if (v->errstatus == 0) {
+        v->nerr++;
+        rb_funcall(v->parser, id_onerror,
+                   3, v->t, val, v->vstack);
+    }
+  user_yyerror:
+    if (v->errstatus == 3) {
+        if (v->t == vFINAL_TOKEN) {
+            v->retval = Qfalse;
+            v->fin = CP_FIN_EOT;
+            return;
+        }
+        read_next = 1;
+    }
+    v->errstatus = 3;
+    rb_ivar_set(v->parser, id_errstatus, LONG2NUM(v->errstatus));
+
+    /* check if we can shift/reduce error token */
+    D_printf("(err) k1=%ld\n", v->curstate);
+    D_printf("(err) k2=%d (error)\n", ERROR_TOKEN);
+    while (1) {
+        tmp = AREF(v->action_pointer, v->curstate);
+        if (NIL_P(tmp)) goto error_pop;
+        D_puts("(err) pointer[k1] ok");
+
+        i = NUM2LONG(tmp) + ERROR_TOKEN;
+        D_printf("(err) i=%ld\n", i);
+        if (i < 0) goto error_pop;
+
+        act_value = AREF(v->action_table, i);
+        if (NIL_P(act_value)) {
+            D_puts("(err) table[i] == nil");
+            goto error_pop;
+        }
+        act = NUM2LONG(act_value);
+        D_printf("(err) table[i]=%ld\n", act);
+
+        tmp = AREF(v->action_check, i);
+        if (NIL_P(tmp)) {
+            D_puts("(err) check[i] == nil");
+            goto error_pop;
+        }
+        if (NUM2LONG(tmp) != v->curstate) {
+            D_puts("(err) check[i] != k1");
+            goto error_pop;
+        }
+
+        D_puts("(err) found: can handle error token");
+        break;
+          
+      error_pop:
+        D_puts("(err) act not found: can't handle error token; pop");
+
+        if (RARRAY(v->state)->len <= 1) {
+            v->retval = Qnil;
+            v->fin = CP_FIN_CANTPOP;
+            return;
+        }
+        POP(v->state);
+        POP(v->vstack);
+        v->curstate = num_to_long(LAST_I(v->state));
+        if (v->debug) {
+            POP(v->tstack);
+            rb_funcall(v->parser, id_d_e_pop,
+                       3, v->state, v->tstack, v->vstack);
+        }
+    }
+
+    /* shift/reduce error token */
+    if (act > 0 && act < v->shift_n) {
+        D_puts("e shift");
+        SHIFT(v, act, ERROR_TOKEN, val);
+    }
+    else if (act < 0 && act > -(v->reduce_n)) {
+        D_puts("e reduce");
+        REDUCE(v, act);
+    }
+    else if (act == v->shift_n) {
+        D_puts("e accept");
+        goto accept;
+    }
+    else {
+        rb_raise(RaccBug, "[Racc Bug] unknown act value %ld", act);
+    }
+    goto error_recovered;
+}
+
+static void
+shift(struct cparse_params *v, long act, VALUE tok, VALUE val)
+{
+    PUSH(v->vstack, val);
+    if (v->debug) {
+        PUSH(v->tstack, tok);
+        rb_funcall(v->parser, id_d_shift,
+                   3, tok, v->tstack, v->vstack);
+    }
+    v->curstate = act;
+    PUSH(v->state, LONG2NUM(v->curstate));
+}
+
+static int
+reduce(struct cparse_params *v, long act)
+{
+    VALUE code;
+    v->ruleno = -act * 3;
+    code = rb_catch("racc_jump", reduce0, v->value_v);
+    v->errstatus = num_to_long(rb_ivar_get(v->parser, id_errstatus));
+    return NUM2INT(code);
+}
+
+static VALUE
+reduce0(VALUE val, VALUE data, VALUE self)
+{
+    struct cparse_params *v;
+    VALUE reduce_to, reduce_len, method_id;
+    long len;
+    ID mid;
+    VALUE tmp, tmp_t = Qundef, tmp_v = Qundef;
+    long i, k1, k2;
+    VALUE goto_state;
+
+    Data_Get_Struct(data, struct cparse_params, v);
+    reduce_len = RARRAY(v->reduce_table)->ptr[v->ruleno];
+    reduce_to  = RARRAY(v->reduce_table)->ptr[v->ruleno+1];
+    method_id  = RARRAY(v->reduce_table)->ptr[v->ruleno+2];
+    len = NUM2LONG(reduce_len);
+    mid = value_to_id(method_id);
+
+    /* call action */
+    if (len == 0) {
+        tmp = Qnil;
+        if (mid != id_noreduce)
+            tmp_v = rb_ary_new();
+        if (v->debug)
+            tmp_t = rb_ary_new();
+    }
+    else {
+        if (mid != id_noreduce) {
+            tmp_v = GET_TAIL(v->vstack, len);
+            tmp = RARRAY(tmp_v)->ptr[0];
+        }
+        else {
+            tmp = RARRAY(v->vstack)->ptr[ RARRAY(v->vstack)->len - len ];
+        }
+        CUT_TAIL(v->vstack, len);
+        if (v->debug) {
+            tmp_t = GET_TAIL(v->tstack, len);
+            CUT_TAIL(v->tstack, len);
+        }
+        CUT_TAIL(v->state, len);
+    }
+    if (mid != id_noreduce) {
+        if (v->use_result_var) {
+            tmp = rb_funcall(v->parser, mid,
+                             3, tmp_v, v->vstack, tmp);
+        }
+        else {
+            tmp = rb_funcall(v->parser, mid,
+                             2, tmp_v, v->vstack);
+        }
+    }
+
+    /* then push result */
+    PUSH(v->vstack, tmp);
+    if (v->debug) {
+        PUSH(v->tstack, reduce_to);
+        rb_funcall(v->parser, id_d_reduce,
+                   4, tmp_t, reduce_to, v->tstack, v->vstack);
+    }
+
+    /* calculate transition state */
+    if (RARRAY(v->state)->len == 0)
+        rb_raise(RaccBug, "state stack unexpectedly empty");
+    k2 = num_to_long(LAST_I(v->state));
+    k1 = num_to_long(reduce_to) - v->nt_base;
+    D_printf("(goto) k1=%ld\n", k1);
+    D_printf("(goto) k2=%ld\n", k2);
+
+    tmp = AREF(v->goto_pointer, k1);
+    if (NIL_P(tmp)) goto notfound;
+
+    i = NUM2LONG(tmp) + k2;
+    D_printf("(goto) i=%ld\n", i);
+    if (i < 0) goto notfound;
+
+    goto_state = AREF(v->goto_table, i);
+    if (NIL_P(goto_state)) {
+        D_puts("(goto) table[i] == nil");
+        goto notfound;
+    }
+    D_printf("(goto) table[i]=%ld (goto_state)\n", NUM2LONG(goto_state));
+
+    tmp = AREF(v->goto_check, i);
+    if (NIL_P(tmp)) {
+        D_puts("(goto) check[i] == nil");
+        goto notfound;
+    }
+    if (tmp != LONG2NUM(k1)) {
+        D_puts("(goto) check[i] != table[i]");
+        goto notfound;
+    }
+    D_printf("(goto) check[i]=%ld\n", NUM2LONG(tmp));
+
+    D_puts("(goto) found");
+  transit:
+    PUSH(v->state, goto_state);
+    v->curstate = NUM2LONG(goto_state);
+    return INT2FIX(0);
+
+  notfound:
+    D_puts("(goto) not found: use default");
+    /* overwrite `goto-state' by default value */
+    goto_state = AREF(v->goto_default, k1);
+    goto transit;
+}
+
+/* -----------------------------------------------------------------------
+                          Ruby Interface
+----------------------------------------------------------------------- */
+
+void
+Init_cparse(void)
+{
+    VALUE Racc, Parser;
+    ID id_racc = rb_intern("Racc");
+
+    if (rb_const_defined(rb_cObject, id_racc)) {
+        Racc = rb_const_get(rb_cObject, id_racc);
+        Parser = rb_const_get_at(Racc, rb_intern("Parser"));
+    }
+    else {
+        Racc = rb_define_module("Racc");
+        Parser = rb_define_class_under(Racc, "Parser", rb_cObject);
+    }
+    rb_define_private_method(Parser, "_racc_do_parse_c", racc_cparse, 2);
+    rb_define_private_method(Parser, "_racc_yyparse_c", racc_yyparse, 4);
+    rb_define_const(Parser, "Racc_Runtime_Core_Version_C",
+                    rb_str_new2(RACC_VERSION));
+    rb_define_const(Parser, "Racc_Runtime_Core_Id_C",
+        rb_str_new2("$originalId: cparse.c,v 1.8 2006/07/06 11:39:46 aamine Exp $"));
+
+    CparseParams = rb_define_class_under(Racc, "CparseParams", rb_cObject);
+
+    RaccBug = rb_eRuntimeError;
+
+    id_yydebug      = rb_intern("@yydebug");
+    id_nexttoken    = rb_intern("next_token");
+    id_onerror      = rb_intern("on_error");
+    id_noreduce     = rb_intern("_reduce_none");
+    id_errstatus    = rb_intern("@racc_error_status");
+
+    id_d_shift       = rb_intern("racc_shift");
+    id_d_reduce      = rb_intern("racc_reduce");
+    id_d_accept      = rb_intern("racc_accept");
+    id_d_read_token  = rb_intern("racc_read_token");
+    id_d_next_state  = rb_intern("racc_next_state");
+    id_d_e_pop       = rb_intern("racc_e_pop");
+}
diff --git a/ruby_1_8_6/ext/racc/cparse/depend b/ruby_1_8_6/ext/racc/cparse/depend
new file mode 100644
index 0000000000..7b06a880f5
--- /dev/null
+++ b/ruby_1_8_6/ext/racc/cparse/depend
@@ -0,0 +1 @@
+cparse.o: cparse.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ruby_1_8_6/ext/racc/cparse/extconf.rb b/ruby_1_8_6/ext/racc/cparse/extconf.rb
new file mode 100644
index 0000000000..dd953a7e15
--- /dev/null
+++ b/ruby_1_8_6/ext/racc/cparse/extconf.rb
@@ -0,0 +1,4 @@
+# $Id$
+
+require 'mkmf'
+create_makefile 'racc/cparse'
diff --git a/ruby_1_8_6/ext/readline/.cvsignore b/ruby_1_8_6/ext/readline/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/readline/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/readline/README b/ruby_1_8_6/ext/readline/README
new file mode 100644
index 0000000000..9bbf325c99
--- /dev/null
+++ b/ruby_1_8_6/ext/readline/README
@@ -0,0 +1,62 @@
+Extension for GNU Readline Library
+
+Example:
+
+  require "readline"
+  include Readline
+
+  line = readline("Prompt> ", true)
+
+[Readline]
+
+<module function>
+
+readline(prompt, add_history=nil)
+
+  Reads one line with line editing.  The inputted line is added to the
+  history if add_history is true.
+
+<class methods>
+
+completion_proc = proc
+
+  Specifies a Proc object to determine completion behavior.  It
+  should take input-string, and return an array of completion
+  candidates.
+
+completion_proc
+
+  Returns the completion Proc object.
+
+completion_case_fold = bool
+
+  Sets whether or not to ignore case on completion.
+
+completion_case_fold
+
+  Returns true if completion ignores case.
+
+completion_append_character = char
+
+  Specifies a character to be appended on completion.
+  Nothing will be appended if an empty string ("") or nil is
+  specified.
+
+completion_append_character
+
+  Returns a string containing a character to be appended on
+  completion.  The default is a space (" ").
+
+vi_editing_mode
+
+  Specifies VI editing mode.
+
+emacs_editing_mode
+
+  Specifies Emacs editing mode.
+
+<class constants>
+
+HISTORY
+
+The history buffer.  It behaves just like an array.
diff --git a/ruby_1_8_6/ext/readline/README.ja b/ruby_1_8_6/ext/readline/README.ja
new file mode 100644
index 0000000000..beb951fbf0
--- /dev/null
+++ b/ruby_1_8_6/ext/readline/README.ja
@@ -0,0 +1,63 @@
+GNU Readline Libraryを利用するための拡張モジュールです。
+
+require "readline"
+include Readline
+
+line = readline("Prompt> ", true)
+
+のように使用してください。
+
+[Readline]
+
+<モジュール関数>
+
+readline(prompt, add_history=nil)
+
+  一行入力を読み込みます。
+  add_historyがtrueの場合、ヒストリに読み込んだ文字列を追加します。
+
+<クラスメソッド>
+
+completion_proc = proc
+
+  補完時の動作を決定するProcオブジェクトを指定します。
+  procは引数に入力文字列を取り、候補文字列の配列を返すように
+  してください。
+
+completion_proc
+
+  補完時の動作を決定するProcオブジェクトを返します。
+
+completion_case_fold = case_fold
+
+  補完時に大文字小文字を区別しない場合、trueを指定します。
+
+completion_case_fold
+
+  補完時に大文字小文字を区別しない場合、trueを返します。
+
+completion_append_character = char
+
+  補完時に付加される文字を文字列で指定します。先頭の一文字が
+  設定され、空文字列 ("") または nil を指定すると何も付加
+  されなくなります。
+
+completion_append_character
+
+  補完時に付加される文字を文字列で返します。デフォルトは
+  空白 (" ") です。
+
+vi_editing_mode
+
+  VIモードになります。
+
+emacs_editing_mode
+
+  Emacsモードになります。
+
+<クラス定数>
+
+HISTORY
+
+ヒストリに対する操作はこの定数を通して行ってください。
+配列と同じように扱えるようになっています。
diff --git a/ruby_1_8_6/ext/readline/depend b/ruby_1_8_6/ext/readline/depend
new file mode 100644
index 0000000000..6570c5a036
--- /dev/null
+++ b/ruby_1_8_6/ext/readline/depend
@@ -0,0 +1 @@
+readline.o: readline.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ruby_1_8_6/ext/readline/extconf.rb b/ruby_1_8_6/ext/readline/extconf.rb
new file mode 100644
index 0000000000..b57a36f3a5
--- /dev/null
+++ b/ruby_1_8_6/ext/readline/extconf.rb
@@ -0,0 +1,65 @@
+require "mkmf"
+
+$readline_headers = ["stdio.h"]
+
+def have_readline_header(header)
+  if have_header(header)
+    $readline_headers.push(header)
+    return true
+  else
+    return false
+  end
+end
+
+def have_readline_var(var)
+  return have_var(var, $readline_headers)
+end
+
+dir_config('curses')
+dir_config('ncurses')
+dir_config('termcap')
+dir_config("readline")
+enable_libedit = enable_config("libedit")
+have_library("user32", nil) if /cygwin/ === RUBY_PLATFORM
+have_library("ncurses", "tgetnum") ||
+  have_library("termcap", "tgetnum") ||
+  have_library("curses", "tgetnum")
+
+if enable_libedit
+  unless (have_readline_header("editline/readline.h") ||
+          have_readline_header("readline/readline.h")) &&
+          have_library("edit", "readline")
+    exit
+  end
+else
+  unless ((have_readline_header("readline/readline.h") &&
+           have_readline_header("readline/history.h")) &&
+           (have_library("readline", "readline") ||
+            have_library("edit", "readline"))) ||
+            (have_readline_header("editline/readline.h") &&
+             have_library("edit", "readline"))
+    exit
+  end
+end
+
+have_readline_var("rl_filename_completion_function")
+have_readline_var("rl_username_completion_function")
+have_readline_var("rl_completion_matches")
+have_readline_var("rl_deprep_term_function")
+have_readline_var("rl_completion_append_character")
+have_readline_var("rl_basic_word_break_characters")
+have_readline_var("rl_completer_word_break_characters")
+have_readline_var("rl_basic_quote_characters")
+have_readline_var("rl_completer_quote_characters")
+have_readline_var("rl_filename_quote_characters")
+have_readline_var("rl_attempted_completion_over")
+have_readline_var("rl_library_version")
+have_readline_var("rl_event_hook")
+have_func("rl_cleanup_after_signal")
+have_func("rl_clear_signals")
+have_func("rl_vi_editing_mode")
+have_func("rl_emacs_editing_mode")
+have_func("rl_clear_signals")
+have_func("replace_history_entry")
+have_func("remove_history")
+create_makefile("readline")
diff --git a/ruby_1_8_6/ext/readline/readline.c b/ruby_1_8_6/ext/readline/readline.c
new file mode 100644
index 0000000000..559e1c677b
--- /dev/null
+++ b/ruby_1_8_6/ext/readline/readline.c
@@ -0,0 +1,824 @@
+/* readline.c -- GNU Readline module
+   Copyright (C) 1997-2001  Shugo Maeda */
+
+#include "config.h"
+#include <errno.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#ifdef HAVE_READLINE_READLINE_H
+#include <readline/readline.h>
+#endif
+#ifdef HAVE_READLINE_HISTORY_H
+#include <readline/history.h>
+#endif
+#ifdef HAVE_EDITLINE_READLINE_H
+#include <editline/readline.h>
+#endif
+
+#include "ruby.h"
+#include "rubyio.h"
+#include "rubysig.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+static VALUE mReadline;
+
+#define TOLOWER(c) (isupper(c) ? tolower(c) : c)
+
+#define COMPLETION_PROC "completion_proc"
+#define COMPLETION_CASE_FOLD "completion_case_fold"
+static ID completion_proc, completion_case_fold;
+
+#ifndef HAVE_RL_FILENAME_COMPLETION_FUNCTION
+# define rl_filename_completion_function filename_completion_function
+#endif
+#ifndef HAVE_RL_USERNAME_COMPLETION_FUNCTION
+# define rl_username_completion_function username_completion_function
+#endif
+#ifndef HAVE_RL_COMPLETION_MATCHES
+# define rl_completion_matches completion_matches
+#endif
+
+static int readline_event(void);
+static char **readline_attempted_completion_function(const char *text,
+                                                     int start, int end);
+
+static int
+readline_event()
+{
+    CHECK_INTS;
+    rb_thread_schedule();
+    return 0;
+}
+
+static VALUE
+readline_readline(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE tmp, add_hist, result;
+    char *prompt = NULL;
+    char *buff;
+    int status;
+    OpenFile *ofp, *ifp;
+
+    rb_secure(4);
+    if (rb_scan_args(argc, argv, "02", &tmp, &add_hist) > 0) {
+	SafeStringValue(tmp);
+	prompt = RSTRING(tmp)->ptr;
+    }
+
+    if (!isatty(0) && errno == EBADF) rb_raise(rb_eIOError, "stdin closed");
+
+    Check_Type(rb_stdout, T_FILE);
+    GetOpenFile(rb_stdout, ofp);
+    rl_outstream = GetWriteFile(ofp);
+    Check_Type(rb_stdin, T_FILE);
+    GetOpenFile(rb_stdin, ifp);
+    rl_instream = GetReadFile(ifp);
+    buff = (char*)rb_protect((VALUE(*)_((VALUE)))readline, (VALUE)prompt,
+                              &status);
+    if (status) {
+#if defined HAVE_RL_CLEANUP_AFTER_SIGNAL
+        /* restore terminal mode and signal handler*/
+        rl_cleanup_after_signal();
+#elif defined HAVE_RL_DEPREP_TERM_FUNCTION
+        /* restore terminal mode */
+	if (rl_deprep_term_function != NULL) /* NULL in libedit. [ruby-dev:29116] */
+	    (*rl_deprep_term_function)();
+	else
+#else
+        rl_deprep_terminal();
+#endif
+        rb_jump_tag(status);
+    }
+
+    if (RTEST(add_hist) && buff) {
+	add_history(buff);
+    }
+    if (buff)
+	result = rb_tainted_str_new2(buff);
+    else
+	result = Qnil;
+    if (buff) free(buff);
+    return result;
+}
+
+static VALUE
+readline_s_set_completion_proc(self, proc)
+    VALUE self;
+    VALUE proc;
+{
+    rb_secure(4);
+    if (!rb_respond_to(proc, rb_intern("call")))
+	rb_raise(rb_eArgError, "argument must respond to `call'");
+    return rb_ivar_set(mReadline, completion_proc, proc);
+}
+
+static VALUE
+readline_s_get_completion_proc(self)
+    VALUE self;
+{
+    rb_secure(4);
+    return rb_attr_get(mReadline, completion_proc);
+}
+
+static VALUE
+readline_s_set_completion_case_fold(self, val)
+    VALUE self;
+    VALUE val;
+{
+    rb_secure(4);
+    return rb_ivar_set(mReadline, completion_case_fold, val);
+}
+
+static VALUE
+readline_s_get_completion_case_fold(self)
+    VALUE self;
+{
+    rb_secure(4);
+    return rb_attr_get(mReadline, completion_case_fold);
+}
+
+static char **
+readline_attempted_completion_function(text, start, end)
+    const char *text;
+    int start;
+    int end;
+{
+    VALUE proc, ary, temp;
+    char **result;
+    int case_fold;
+    int i, matches;
+
+    proc = rb_attr_get(mReadline, completion_proc);
+    if (NIL_P(proc))
+	return NULL;
+#ifdef HAVE_RL_ATTEMPTED_COMPLETION_OVER
+    rl_attempted_completion_over = 1;
+#endif
+    case_fold = RTEST(rb_attr_get(mReadline, completion_case_fold));
+    ary = rb_funcall(proc, rb_intern("call"), 1, rb_tainted_str_new2(text));
+    if (TYPE(ary) != T_ARRAY)
+	ary = rb_Array(ary);
+    matches = RARRAY(ary)->len;
+    if (matches == 0)
+	return NULL;
+    result = ALLOC_N(char *, matches + 2);
+    for (i = 0; i < matches; i++) {
+	temp = rb_obj_as_string(RARRAY(ary)->ptr[i]);
+	result[i + 1] = ALLOC_N(char, RSTRING(temp)->len + 1);
+	strcpy(result[i + 1], RSTRING(temp)->ptr);
+    }
+    result[matches + 1] = NULL;
+
+    if (matches == 1) {
+        result[0] = strdup(result[1]);
+    }
+    else {
+	register int i = 1;
+	int low = 100000;
+
+	while (i < matches) {
+	    register int c1, c2, si;
+
+	    if (case_fold) {
+		for (si = 0;
+		     (c1 = TOLOWER(result[i][si])) &&
+			 (c2 = TOLOWER(result[i + 1][si]));
+		     si++)
+		    if (c1 != c2) break;
+	    } else {
+		for (si = 0;
+		     (c1 = result[i][si]) &&
+			 (c2 = result[i + 1][si]);
+		     si++)
+		    if (c1 != c2) break;
+	    }
+
+	    if (low > si) low = si;
+	    i++;
+	}
+	result[0] = ALLOC_N(char, low + 1);
+	strncpy(result[0], result[1], low);
+	result[0][low] = '\0';
+    }
+
+    return result;
+}
+
+static VALUE
+readline_s_vi_editing_mode(self)
+    VALUE self;
+{
+#ifdef HAVE_RL_VI_EDITING_MODE
+    rb_secure(4);
+    rl_vi_editing_mode(1,0);
+    return Qnil;
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_VI_EDITING_MODE */
+}
+
+static VALUE
+readline_s_emacs_editing_mode(self)
+    VALUE self;
+{
+#ifdef HAVE_RL_EMACS_EDITING_MODE
+    rb_secure(4);
+    rl_emacs_editing_mode(1,0);
+    return Qnil;
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_EMACS_EDITING_MODE */
+}
+
+static VALUE
+readline_s_set_completion_append_character(self, str)
+    VALUE self, str;
+{
+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+    rb_secure(4);
+    if (NIL_P(str)) {
+	rl_completion_append_character = '\0';
+    }
+    else {
+	SafeStringValue(str);
+	if (RSTRING(str)->len == 0) {
+	    rl_completion_append_character = '\0';
+	} else {
+	    rl_completion_append_character = RSTRING(str)->ptr[0];
+	}
+    }
+    return self;
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_COMPLETION_APPEND_CHARACTER */
+}
+
+static VALUE
+readline_s_get_completion_append_character(self)
+    VALUE self;
+{
+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+    VALUE str;
+
+    rb_secure(4);
+    if (rl_completion_append_character == '\0')
+	return Qnil;
+
+    str = rb_str_new("", 1);
+    RSTRING(str)->ptr[0] = rl_completion_append_character;
+    return str;
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_COMPLETION_APPEND_CHARACTER */
+}
+
+static VALUE
+readline_s_set_basic_word_break_characters(self, str)
+    VALUE self, str;
+{
+#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
+    static char *basic_word_break_characters = NULL;
+
+    rb_secure(4);
+    SafeStringValue(str);
+    if (basic_word_break_characters == NULL) {
+	basic_word_break_characters =
+	    ALLOC_N(char, RSTRING(str)->len + 1);
+    }
+    else {
+	REALLOC_N(basic_word_break_characters, char, RSTRING(str)->len + 1);
+    }
+    strncpy(basic_word_break_characters,
+	    RSTRING(str)->ptr, RSTRING(str)->len);
+    basic_word_break_characters[RSTRING(str)->len] = '\0';
+    rl_basic_word_break_characters = basic_word_break_characters;
+    return self;
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_BASIC_WORD_BREAK_CHARACTERS */
+}
+
+static VALUE
+readline_s_get_basic_word_break_characters(self, str)
+    VALUE self, str;
+{
+#ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
+    rb_secure(4);
+    if (rl_basic_word_break_characters == NULL)
+	return Qnil;
+    return rb_tainted_str_new2(rl_basic_word_break_characters);
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_BASIC_WORD_BREAK_CHARACTERS */
+}
+
+static VALUE
+readline_s_set_completer_word_break_characters(self, str)
+    VALUE self, str;
+{
+#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
+    static char *completer_word_break_characters = NULL;
+
+    rb_secure(4);
+    SafeStringValue(str);
+    if (completer_word_break_characters == NULL) {
+	completer_word_break_characters =
+	    ALLOC_N(char, RSTRING(str)->len + 1);
+    }
+    else {
+	REALLOC_N(completer_word_break_characters, char, RSTRING(str)->len + 1);
+    }
+    strncpy(completer_word_break_characters,
+	    RSTRING(str)->ptr, RSTRING(str)->len);
+    completer_word_break_characters[RSTRING(str)->len] = '\0';
+    rl_completer_word_break_characters = completer_word_break_characters;
+    return self;
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS */
+}
+
+static VALUE
+readline_s_get_completer_word_break_characters(self, str)
+    VALUE self, str;
+{
+#ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
+    rb_secure(4);
+    if (rl_completer_word_break_characters == NULL)
+	return Qnil;
+    return rb_tainted_str_new2(rl_completer_word_break_characters);
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS */
+}
+
+static VALUE
+readline_s_set_basic_quote_characters(self, str)
+    VALUE self, str;
+{
+#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
+    static char *basic_quote_characters = NULL;
+
+    rb_secure(4);
+    SafeStringValue(str);
+    if (basic_quote_characters == NULL) {
+	basic_quote_characters =
+	    ALLOC_N(char, RSTRING(str)->len + 1);
+    }
+    else {
+	REALLOC_N(basic_quote_characters, char, RSTRING(str)->len + 1);
+    }
+    strncpy(basic_quote_characters,
+	    RSTRING(str)->ptr, RSTRING(str)->len);
+    basic_quote_characters[RSTRING(str)->len] = '\0';
+    rl_basic_quote_characters = basic_quote_characters;
+
+    return self;
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_BASIC_QUOTE_CHARACTERS */
+}
+
+static VALUE
+readline_s_get_basic_quote_characters(self, str)
+    VALUE self, str;
+{
+#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
+    rb_secure(4);
+    if (rl_basic_quote_characters == NULL)
+	return Qnil;
+    return rb_tainted_str_new2(rl_basic_quote_characters);
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_BASIC_QUOTE_CHARACTERS */
+}
+
+static VALUE
+readline_s_set_completer_quote_characters(self, str)
+    VALUE self, str;
+{
+#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
+    static char *completer_quote_characters = NULL;
+
+    rb_secure(4);
+    SafeStringValue(str);
+    if (completer_quote_characters == NULL) {
+	completer_quote_characters =
+	    ALLOC_N(char, RSTRING(str)->len + 1);
+    }
+    else {
+	REALLOC_N(completer_quote_characters, char, RSTRING(str)->len + 1);
+    }
+    strncpy(completer_quote_characters,
+	    RSTRING(str)->ptr, RSTRING(str)->len);
+    completer_quote_characters[RSTRING(str)->len] = '\0';
+    rl_completer_quote_characters = completer_quote_characters;
+
+    return self;
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_COMPLETER_QUOTE_CHARACTERS */
+}
+
+static VALUE
+readline_s_get_completer_quote_characters(self, str)
+    VALUE self, str;
+{
+#ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
+    rb_secure(4);
+    if (rl_completer_quote_characters == NULL)
+	return Qnil;
+    return rb_tainted_str_new2(rl_completer_quote_characters);
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_COMPLETER_QUOTE_CHARACTERS */
+}
+
+static VALUE
+readline_s_set_filename_quote_characters(self, str)
+    VALUE self, str;
+{
+#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
+    static char *filename_quote_characters = NULL;
+
+    rb_secure(4);
+    SafeStringValue(str);
+    if (filename_quote_characters == NULL) {
+	filename_quote_characters =
+	    ALLOC_N(char, RSTRING(str)->len + 1);
+    }
+    else {
+	REALLOC_N(filename_quote_characters, char, RSTRING(str)->len + 1);
+    }
+    strncpy(filename_quote_characters,
+	    RSTRING(str)->ptr, RSTRING(str)->len);
+    filename_quote_characters[RSTRING(str)->len] = '\0';
+    rl_filename_quote_characters = filename_quote_characters;
+
+    return self;
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_FILENAME_QUOTE_CHARACTERS */
+}
+
+static VALUE
+readline_s_get_filename_quote_characters(self, str)
+    VALUE self, str;
+{
+#ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
+    rb_secure(4);
+    if (rl_filename_quote_characters == NULL)
+	return Qnil;
+    return rb_tainted_str_new2(rl_filename_quote_characters);
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif /* HAVE_RL_FILENAME_QUOTE_CHARACTERS */
+}
+
+static VALUE
+hist_to_s(self)
+    VALUE self;
+{
+    return rb_str_new2("HISTORY");
+}
+
+static VALUE
+hist_get(self, index)
+    VALUE self;
+    VALUE index;
+{
+    HIST_ENTRY *entry;
+    int i;
+
+    rb_secure(4);
+    i = NUM2INT(index);
+    if (i < 0) {
+        i += history_length;
+    }
+    entry = history_get(history_base + i);
+    if (entry == NULL) {
+	rb_raise(rb_eIndexError, "invalid index");
+    }
+    return rb_tainted_str_new2(entry->line);
+}
+
+static VALUE
+hist_set(self, index, str)
+    VALUE self;
+    VALUE index;
+    VALUE str;
+{
+#ifdef HAVE_REPLACE_HISTORY_ENTRY
+    HIST_ENTRY *entry;
+    int i;
+
+    rb_secure(4);
+    i = NUM2INT(index);
+    SafeStringValue(str);
+    if (i < 0) {
+        i += history_length;
+    }
+    entry = replace_history_entry(i, RSTRING(str)->ptr, NULL);
+    if (entry == NULL) {
+	rb_raise(rb_eIndexError, "invalid index");
+    }
+    return str;
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif
+}
+
+static VALUE
+hist_push(self, str)
+    VALUE self;
+    VALUE str;
+{
+    rb_secure(4);
+    SafeStringValue(str);
+    add_history(RSTRING(str)->ptr);
+    return self;
+}
+
+static VALUE
+hist_push_method(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE str;
+    
+    rb_secure(4);
+    while (argc--) {
+	str = *argv++;
+	SafeStringValue(str);
+	add_history(RSTRING(str)->ptr);
+    }
+    return self;
+}
+
+static VALUE
+rb_remove_history(index)
+    int index;
+{
+#ifdef HAVE_REMOVE_HISTORY
+    HIST_ENTRY *entry;
+    VALUE val;
+
+    rb_secure(4);
+    entry = remove_history(index);
+    if (entry) {
+        val = rb_tainted_str_new2(entry->line);
+        free(entry->line);
+        free(entry);
+        return val;
+    }
+    return Qnil;
+#else
+    rb_notimplement();
+    return Qnil; /* not reached */
+#endif
+}
+
+static VALUE
+hist_pop(self)
+    VALUE self;
+{
+    rb_secure(4);
+    if (history_length > 0) {
+	return rb_remove_history(history_length - 1);
+    } else {
+	return Qnil;
+    }
+}
+
+static VALUE
+hist_shift(self)
+    VALUE self;
+{
+    rb_secure(4);
+    if (history_length > 0) {
+	return rb_remove_history(0);
+    } else {
+	return Qnil;
+    }
+}
+
+static VALUE
+hist_each(self)
+    VALUE self;
+{
+    HIST_ENTRY *entry;
+    int i;
+
+    rb_secure(4);
+    for (i = 0; i < history_length; i++) {
+        entry = history_get(history_base + i);
+        if (entry == NULL)
+            break;
+	rb_yield(rb_tainted_str_new2(entry->line));
+    }
+    return self;
+}
+
+static VALUE
+hist_length(self)
+    VALUE self;
+{
+    rb_secure(4);
+    return INT2NUM(history_length);
+}
+
+static VALUE
+hist_empty_p(self)
+    VALUE self;
+{
+    rb_secure(4);
+    return history_length == 0 ? Qtrue : Qfalse;
+}
+
+static VALUE
+hist_delete_at(self, index)
+    VALUE self;
+    VALUE index;
+{
+    int i;
+
+    rb_secure(4);
+    i = NUM2INT(index);
+    if (i < 0)
+        i += history_length;
+    if (i < 0 || i > history_length - 1) {
+	rb_raise(rb_eIndexError, "invalid index");
+    }
+    return rb_remove_history(i);
+}
+
+static VALUE
+filename_completion_proc_call(self, str)
+    VALUE self;
+    VALUE str;
+{
+    VALUE result;
+    char **matches;
+    int i;
+
+    matches = rl_completion_matches(StringValuePtr(str),
+				    rl_filename_completion_function);
+    if (matches) {
+	result = rb_ary_new();
+	for (i = 0; matches[i]; i++) {
+	    rb_ary_push(result, rb_tainted_str_new2(matches[i]));
+	    free(matches[i]);
+	}
+	free(matches);
+	if (RARRAY(result)->len >= 2)
+	    rb_ary_shift(result);
+    }
+    else {
+	result = Qnil;
+    }
+    return result;
+}
+
+static VALUE
+username_completion_proc_call(self, str)
+    VALUE self;
+    VALUE str;
+{
+    VALUE result;
+    char **matches;
+    int i;
+
+    matches = rl_completion_matches(StringValuePtr(str),
+				    rl_username_completion_function);
+    if (matches) {
+	result = rb_ary_new();
+	for (i = 0; matches[i]; i++) {
+	    rb_ary_push(result, rb_tainted_str_new2(matches[i]));
+	    free(matches[i]);
+	}
+	free(matches);
+	if (RARRAY(result)->len >= 2)
+	    rb_ary_shift(result);
+    }
+    else {
+	result = Qnil;
+    }
+    return result;
+}
+
+void
+Init_readline()
+{
+    VALUE history, fcomp, ucomp;
+
+    /* Allow conditional parsing of the ~/.inputrc file. */
+    rl_readline_name = "Ruby";
+
+    using_history();
+
+    completion_proc = rb_intern(COMPLETION_PROC);
+    completion_case_fold = rb_intern(COMPLETION_CASE_FOLD);
+
+    mReadline = rb_define_module("Readline");
+    rb_define_module_function(mReadline, "readline",
+			      readline_readline, -1);
+    rb_define_singleton_method(mReadline, "completion_proc=",
+			       readline_s_set_completion_proc, 1);
+    rb_define_singleton_method(mReadline, "completion_proc",
+			       readline_s_get_completion_proc, 0);
+    rb_define_singleton_method(mReadline, "completion_case_fold=",
+			       readline_s_set_completion_case_fold, 1);
+    rb_define_singleton_method(mReadline, "completion_case_fold",
+			       readline_s_get_completion_case_fold, 0);
+    rb_define_singleton_method(mReadline, "vi_editing_mode",
+			       readline_s_vi_editing_mode, 0);
+    rb_define_singleton_method(mReadline, "emacs_editing_mode",
+			       readline_s_emacs_editing_mode, 0);
+    rb_define_singleton_method(mReadline, "completion_append_character=",
+			       readline_s_set_completion_append_character, 1);
+    rb_define_singleton_method(mReadline, "completion_append_character",
+			       readline_s_get_completion_append_character, 0);
+    rb_define_singleton_method(mReadline, "basic_word_break_characters=",
+			       readline_s_set_basic_word_break_characters, 1);
+    rb_define_singleton_method(mReadline, "basic_word_break_characters",
+			       readline_s_get_basic_word_break_characters, 0);
+    rb_define_singleton_method(mReadline, "completer_word_break_characters=",
+			       readline_s_set_completer_word_break_characters, 1);
+    rb_define_singleton_method(mReadline, "completer_word_break_characters",
+			       readline_s_get_completer_word_break_characters, 0);
+    rb_define_singleton_method(mReadline, "basic_quote_characters=",
+			       readline_s_set_basic_quote_characters, 1);
+    rb_define_singleton_method(mReadline, "basic_quote_characters",
+			       readline_s_get_basic_quote_characters, 0);
+    rb_define_singleton_method(mReadline, "completer_quote_characters=",
+			       readline_s_set_completer_quote_characters, 1);
+    rb_define_singleton_method(mReadline, "completer_quote_characters",
+			       readline_s_get_completer_quote_characters, 0);
+    rb_define_singleton_method(mReadline, "filename_quote_characters=",
+			       readline_s_set_filename_quote_characters, 1);
+    rb_define_singleton_method(mReadline, "filename_quote_characters",
+			       readline_s_get_filename_quote_characters, 0);
+
+    history = rb_obj_alloc(rb_cObject);
+    rb_extend_object(history, rb_mEnumerable);
+    rb_define_singleton_method(history,"to_s", hist_to_s, 0);
+    rb_define_singleton_method(history,"[]", hist_get, 1);
+    rb_define_singleton_method(history,"[]=", hist_set, 2);
+    rb_define_singleton_method(history,"<<", hist_push, 1);
+    rb_define_singleton_method(history,"push", hist_push_method, -1);
+    rb_define_singleton_method(history,"pop", hist_pop, 0);
+    rb_define_singleton_method(history,"shift", hist_shift, 0);
+    rb_define_singleton_method(history,"each", hist_each, 0);
+    rb_define_singleton_method(history,"length", hist_length, 0);
+    rb_define_singleton_method(history,"size", hist_length, 0);
+    rb_define_singleton_method(history,"empty?", hist_empty_p, 0);
+    rb_define_singleton_method(history,"delete_at", hist_delete_at, 1);
+    rb_define_const(mReadline, "HISTORY", history);
+
+    fcomp = rb_obj_alloc(rb_cObject);
+    rb_define_singleton_method(fcomp, "call",
+			       filename_completion_proc_call, 1);
+    rb_define_const(mReadline, "FILENAME_COMPLETION_PROC", fcomp);
+
+    ucomp = rb_obj_alloc(rb_cObject);
+    rb_define_singleton_method(ucomp, "call",
+			       username_completion_proc_call, 1);
+    rb_define_const(mReadline, "USERNAME_COMPLETION_PROC", ucomp);
+#if defined HAVE_RL_LIBRARY_VERSION
+    rb_define_const(mReadline, "VERSION", rb_str_new2(rl_library_version));
+#else
+    rb_define_const(mReadline, "VERSION",
+                    rb_str_new2("2.0 or before version"));
+#endif
+
+    rl_attempted_completion_function = readline_attempted_completion_function;
+#ifdef HAVE_RL_EVENT_HOOK
+    rl_event_hook = readline_event;
+#endif
+#ifdef HAVE_RL_CLEAR_SIGNALS
+    rl_clear_signals();
+#endif
+}
diff --git a/ruby_1_8_6/ext/sdbm/.cvsignore b/ruby_1_8_6/ext/sdbm/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/sdbm/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/sdbm/_sdbm.c b/ruby_1_8_6/ext/sdbm/_sdbm.c
new file mode 100644
index 0000000000..5b34824afc
--- /dev/null
+++ b/ruby_1_8_6/ext/sdbm/_sdbm.c
@@ -0,0 +1,973 @@
+/*
+ * sdbm - ndbm work-alike hashed database library
+ * based on Per-Aake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
+ * author: oz@nexus.yorku.ca
+ * status: public domain.
+ *
+ * core routines
+ */
+
+#ifndef lint
+/*char sdbm_rcsid[] = "$Id$";*/
+#endif
+
+#include "sdbm.h"
+#include "config.h"
+
+/*
+ * sdbm - ndbm work-alike hashed database library
+ * tuning and portability constructs [not nearly enough]
+ * author: oz@nexus.yorku.ca
+ */
+
+#define BYTESIZ		8
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef BSD42
+#define SEEK_SET	L_SET
+#define	memset(s,c,n)	bzero(s, n)		/* only when c is zero */
+#define	memcpy(s1,s2,n)	bcopy(s2, s1, n)
+#define	memcmp(s1,s2,n)	bcmp(s1,s2,n)
+#endif
+
+/*
+ * important tuning parms (hah)
+ */
+
+#define SEEDUPS		/* always detect duplicates */
+#define BADMESS		/* generate a message for worst case:
+			   cannot make room after SPLTMAX splits */
+/*
+ * misc
+ */
+#ifdef DEBUG
+#define debug(x)	printf x
+#else
+#define debug(x)
+#endif
+
+#ifdef BIG_E
+#define GET_SHORT(p, i)	(((unsigned)((unsigned char *)(p))[(i)*2] << 8) + (((unsigned char *)(p))[(i)*2 + 1]))
+#define PUT_SHORT(p, i, s) (((unsigned char *)(p))[(i)*2] = (unsigned char)((s) >> 8), ((unsigned char *)(p))[(i)*2 + 1] = (unsigned char)(s))
+#else
+#define GET_SHORT(p, i)	((p)[i])
+#define PUT_SHORT(p, i, s)	((p)[i] = (s))
+#endif
+
+/*#include "pair.h"*/
+static int   fitpair proto((char *, int));
+static void  putpair proto((char *, datum, datum));
+static datum getpair proto((char *, datum));
+static int   delpair proto((char *, datum));
+static int   chkpage proto((char *));
+static datum getnkey proto((char *, int));
+static void  splpage proto((char *, char *, long));
+#ifdef SEEDUPS
+static int   duppair proto((char *, datum));
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef DOSISH
+#include <io.h>
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef BSD42
+#include <sys/file.h>
+#else
+#include <fcntl.h>
+/*#include <memory.h>*/
+#endif
+#ifndef O_BINARY
+#define O_BINARY	0
+#endif
+
+#include <errno.h>
+#ifndef EPERM
+#define EPERM	EACCES
+#endif
+#include <string.h>
+
+#ifdef __STDC__
+#include <stddef.h>
+#endif
+
+#ifndef NULL
+#define NULL	0
+#endif
+
+/*
+ * externals
+ */
+#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__ && !defined(errno)
+extern int errno;
+#endif
+
+/*
+ * forward
+ */
+static int getdbit proto((DBM *, long));
+static int setdbit proto((DBM *, long));
+static int getpage proto((DBM *, long));
+static datum getnext proto((DBM *));
+static int makroom proto((DBM *, long, int));
+
+/*
+ * useful macros
+ */
+#define bad(x)		((x).dptr == NULL || (x).dsize < 0)
+#define exhash(item)	sdbm_hash((item).dptr, (item).dsize)
+#define ioerr(db)	((db)->flags |= DBM_IOERR)
+
+#define OFF_PAG(off)	(long) (off) * PBLKSIZ
+#define OFF_DIR(off)	(long) (off) * DBLKSIZ
+
+static long masks[] = {
+	000000000000L, 000000000001L, 000000000003L,
+	000000000007L, 000000000017L, 000000000037L,
+	000000000077L, 000000000177L, 000000000377L,
+	000000000777L, 000000001777L, 000000003777L,
+	000000007777L, 000000017777L, 000000037777L,
+	000000077777L, 000000177777L, 000000377777L,
+	000000777777L, 000001777777L, 000003777777L,
+	000007777777L, 000017777777L, 000037777777L,
+	000077777777L, 000177777777L, 000377777777L,
+	000777777777L, 001777777777L, 003777777777L,
+	007777777777L, 017777777777L
+};
+
+datum nullitem = {NULL, 0};
+
+DBM *
+sdbm_open(file, flags, mode)
+register char *file;
+register int flags;
+register int mode;
+{
+	register DBM *db;
+	register char *dirname;
+	register char *pagname;
+	register int n;
+
+	if (file == NULL || !*file)
+		return errno = EINVAL, (DBM *) NULL;
+/*
+ * need space for two seperate filenames
+ */
+	n = strlen(file) * 2 + strlen(DIRFEXT) + strlen(PAGFEXT) + 2;
+
+	if ((dirname = malloc((unsigned) n)) == NULL)
+		return errno = ENOMEM, (DBM *) NULL;
+/*
+ * build the file names
+ */
+	dirname = strcat(strcpy(dirname, file), DIRFEXT);
+	pagname = strcpy(dirname + strlen(dirname) + 1, file);
+	pagname = strcat(pagname, PAGFEXT);
+
+	db = sdbm_prep(dirname, pagname, flags, mode);
+	free((char *) dirname);
+	return db;
+}
+
+DBM *
+sdbm_prep(dirname, pagname, flags, mode)
+char *dirname;
+char *pagname;
+int flags;
+int mode;
+{
+	register DBM *db;
+	struct stat dstat;
+
+	if ((db = (DBM *) malloc(sizeof(DBM))) == NULL)
+		return errno = ENOMEM, (DBM *) NULL;
+
+        db->flags = 0;
+        db->hmask = 0;
+        db->blkptr = 0;
+        db->keyptr = 0;
+/*
+ * adjust user flags so that WRONLY becomes RDWR, 
+ * as required by this package. Also set our internal
+ * flag for RDONLY.
+ */
+	if (flags & O_WRONLY)
+		flags = (flags & ~O_WRONLY) | O_RDWR;
+	if (flags & O_RDONLY)
+		db->flags = DBM_RDONLY;
+/*
+ * open the files in sequence, and stat the dirfile.
+ * If we fail anywhere, undo everything, return NULL.
+ */
+	flags |= O_BINARY;
+	if ((db->pagf = open(pagname, flags, mode)) > -1) {
+		if ((db->dirf = open(dirname, flags, mode)) > -1) {
+/*
+ * need the dirfile size to establish max bit number.
+ */
+			if (fstat(db->dirf, &dstat) == 0) {
+/*
+ * zero size: either a fresh database, or one with a single,
+ * unsplit data page: dirpage is all zeros.
+ */
+				db->dirbno = (!dstat.st_size) ? 0 : -1;
+				db->pagbno = -1;
+				db->maxbno = dstat.st_size * (long) BYTESIZ;
+
+				(void) memset(db->pagbuf, 0, PBLKSIZ);
+				(void) memset(db->dirbuf, 0, DBLKSIZ);
+			/*
+			 * success
+			 */
+				return db;
+			}
+			(void) close(db->dirf);
+		}
+		(void) close(db->pagf);
+	}
+	free((char *) db);
+	return (DBM *) NULL;
+}
+
+void
+sdbm_close(db)
+register DBM *db;
+{
+	if (db == NULL)
+		errno = EINVAL;
+	else {
+		(void) close(db->dirf);
+		(void) close(db->pagf);
+		free((char *) db);
+	}
+}
+
+datum
+sdbm_fetch(db, key)
+register DBM *db;
+datum key;
+{
+	if (db == NULL || bad(key))
+		return errno = EINVAL, nullitem;
+
+	if (getpage(db, exhash(key)))
+		return getpair(db->pagbuf, key);
+
+	return ioerr(db), nullitem;
+}
+
+int
+sdbm_delete(db, key)
+register DBM *db;
+datum key;
+{
+	if (db == NULL || bad(key))
+		return errno = EINVAL, -1;
+	if (sdbm_rdonly(db))
+		return errno = EPERM, -1;
+
+	if (getpage(db, exhash(key))) {
+		if (!delpair(db->pagbuf, key))
+			return -1;
+/*
+ * update the page file
+ */
+		if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
+		    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
+			return ioerr(db), -1;
+
+		return 0;
+	}
+
+	return ioerr(db), -1;
+}
+
+int
+sdbm_store(db, key, val, flags)
+register DBM *db;
+datum key;
+datum val;
+int flags;
+{
+	int need;
+	register long hash;
+
+	if (db == NULL || bad(key))
+		return errno = EINVAL, -1;
+	if (sdbm_rdonly(db))
+		return errno = EPERM, -1;
+
+	need = key.dsize + val.dsize;
+/*
+ * is the pair too big (or too small) for this database ??
+ */
+	if (need < 0 || need > PAIRMAX)
+		return errno = EINVAL, -1;
+
+	if (getpage(db, (hash = exhash(key)))) {
+/*
+ * if we need to replace, delete the key/data pair
+ * first. If it is not there, ignore.
+ */
+		if (flags == DBM_REPLACE)
+			(void) delpair(db->pagbuf, key);
+#ifdef SEEDUPS
+		else if (duppair(db->pagbuf, key))
+			return 1;
+#endif
+/*
+ * if we do not have enough room, we have to split.
+ */
+		if (!fitpair(db->pagbuf, need))
+			if (!makroom(db, hash, need))
+				return ioerr(db), -1;
+/*
+ * we have enough room or split is successful. insert the key,
+ * and update the page file.
+ */
+		(void) putpair(db->pagbuf, key, val);
+
+		if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
+		    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
+			return ioerr(db), -1;
+	/*
+	 * success
+	 */
+		return 0;
+	}
+
+	return ioerr(db), -1;
+}
+
+/*
+ * makroom - make room by splitting the overfull page
+ * this routine will attempt to make room for SPLTMAX times before
+ * giving up.
+ */
+static int
+makroom(db, hash, need)
+register DBM *db;
+long hash;
+int need;
+{
+	long newp;
+	char twin[PBLKSIZ];
+#if defined MSDOS || (defined _WIN32 && !defined __CYGWIN__)
+	char zer[PBLKSIZ];
+	long oldtail;
+#endif
+	char *pag = db->pagbuf;
+	char *new = twin;
+	register int smax = SPLTMAX;
+
+	do {
+/*
+ * split the current page
+ */
+		(void) splpage(pag, new, db->hmask + 1);
+/*
+ * address of the new page
+ */
+		newp = (hash & db->hmask) | (db->hmask + 1);
+		debug(("newp: %ld\n", newp));
+/*
+ * write delay, read avoidence/cache shuffle:
+ * select the page for incoming pair: if key is to go to the new page,
+ * write out the previous one, and copy the new one over, thus making
+ * it the current page. If not, simply write the new page, and we are
+ * still looking at the page of interest. current page is not updated
+ * here, as sdbm_store will do so, after it inserts the incoming pair.
+ */
+
+#if defined MSDOS || (defined _WIN32 && !defined __CYGWIN__)
+	/*
+	 * Fill hole with 0 if made it.
+	 * (hole is NOT read as 0)
+	 */
+	oldtail = lseek(db->pagf, 0L, SEEK_END);
+	memset(zer, 0, PBLKSIZ);
+	while (OFF_PAG(newp) > oldtail) {
+		if (lseek(db->pagf, 0L, SEEK_END) < 0 ||
+		    write(db->pagf, zer, PBLKSIZ) < 0) {
+
+			return 0;
+		}
+		oldtail += PBLKSIZ;
+	}
+#endif
+
+		if (hash & (db->hmask + 1)) {
+			if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
+			    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
+				return 0;
+			db->pagbno = newp;
+			(void) memcpy(pag, new, PBLKSIZ);
+		}
+		else if (lseek(db->pagf, OFF_PAG(newp), SEEK_SET) < 0
+			 || write(db->pagf, new, PBLKSIZ) < 0)
+			return 0;
+
+		if (!setdbit(db, db->curbit))
+			return 0;
+/*
+ * see if we have enough room now
+ */
+		if (fitpair(pag, need))
+			return 1;
+/*
+ * try again... update curbit and hmask as getpage would have
+ * done. because of our update of the current page, we do not
+ * need to read in anything. BUT we have to write the current
+ * [deferred] page out, as the window of failure is too great.
+ */
+		db->curbit = 2 * db->curbit + 
+			((hash & (db->hmask + 1)) ? 2 : 1);
+		db->hmask |= (db->hmask + 1);
+
+		if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
+		    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
+			return 0;
+
+	} while (--smax);
+/*
+ * if we are here, this is real bad news. After SPLTMAX splits,
+ * we still cannot fit the key. say goodnight.
+ */
+#ifdef BADMESS
+	(void) write(2, "sdbm: cannot insert after SPLTMAX attempts.\n", 44);
+#endif
+	return 0;
+
+}
+
+/*
+ * the following two routines will break if
+ * deletions aren't taken into account. (ndbm bug)
+ */
+datum
+sdbm_firstkey(db)
+register DBM *db;
+{
+	if (db == NULL)
+		return errno = EINVAL, nullitem;
+/*
+ * start at page 0
+ */
+	(void) memset(db->pagbuf, 0, PBLKSIZ);
+	if (lseek(db->pagf, OFF_PAG(0), SEEK_SET) < 0
+	    || read(db->pagf, db->pagbuf, PBLKSIZ) < 0)
+		return ioerr(db), nullitem;
+	db->pagbno = 0;
+	db->blkptr = 0;
+	db->keyptr = 0;
+
+	return getnext(db);
+}
+
+datum
+sdbm_nextkey(db)
+register DBM *db;
+{
+	if (db == NULL)
+		return errno = EINVAL, nullitem;
+	return getnext(db);
+}
+
+/*
+ * all important binary trie traversal
+ */
+static int
+getpage(db, hash)
+register DBM *db;
+register long hash;
+{
+	register int hbit;
+	register long dbit;
+	register long pagb;
+
+	dbit = 0;
+	hbit = 0;
+	while (dbit < db->maxbno && getdbit(db, dbit))
+		dbit = 2 * dbit + ((hash & ((long) 1 << hbit++)) ? 2 : 1);
+
+	debug(("dbit: %d...", dbit));
+
+	db->curbit = dbit;
+	db->hmask = masks[hbit];
+
+	pagb = hash & db->hmask;
+/*
+ * see if the block we need is already in memory.
+ * note: this lookaside cache has about 10% hit rate.
+ */
+	if (pagb != db->pagbno) { 
+/*
+ * note: here, we assume a "hole" is read as 0s.
+ * if not, must zero pagbuf first.
+ */
+		(void) memset(db->pagbuf, 0, PBLKSIZ);
+
+		if (lseek(db->pagf, OFF_PAG(pagb), SEEK_SET) < 0
+		    || read(db->pagf, db->pagbuf, PBLKSIZ) < 0)
+			return 0;
+		if (!chkpage(db->pagbuf)) {
+			return 0;
+		}
+		db->pagbno = pagb;
+
+		debug(("pag read: %d\n", pagb));
+	}
+	return 1;
+}
+
+static int
+getdbit(db, dbit)
+register DBM *db;
+register long dbit;
+{
+	register long c;
+	register long dirb;
+
+	c = dbit / BYTESIZ;
+	dirb = c / DBLKSIZ;
+
+	if (dirb != db->dirbno) {
+		if (lseek(db->dirf, OFF_DIR(dirb), SEEK_SET) < 0
+		    || read(db->dirf, db->dirbuf, DBLKSIZ) < 0)
+			return 0;
+		db->dirbno = dirb;
+
+		debug(("dir read: %d\n", dirb));
+	}
+
+	return db->dirbuf[c % DBLKSIZ] & (1 << (dbit % BYTESIZ));
+}
+
+static int
+setdbit(db, dbit)
+register DBM *db;
+register long dbit;
+{
+	register long c;
+	register long dirb;
+
+	c = dbit / BYTESIZ;
+	dirb = c / DBLKSIZ;
+
+	if (dirb != db->dirbno) {
+		if (lseek(db->dirf, OFF_DIR(dirb), SEEK_SET) < 0
+		    || read(db->dirf, db->dirbuf, DBLKSIZ) < 0)
+			return 0;
+		db->dirbno = dirb;
+
+		debug(("dir read: %d\n", dirb));
+	}
+
+	db->dirbuf[c % DBLKSIZ] |= (1 << (dbit % BYTESIZ));
+
+	if (dbit >= db->maxbno)
+		db->maxbno += (long) DBLKSIZ * BYTESIZ;
+
+	if (lseek(db->dirf, OFF_DIR(dirb), SEEK_SET) < 0
+	    || write(db->dirf, db->dirbuf, DBLKSIZ) < 0)
+		return 0;
+
+	return 1;
+}
+
+/*
+ * getnext - get the next key in the page, and if done with
+ * the page, try the next page in sequence
+ */
+static datum
+getnext(db)
+register DBM *db;
+{
+	datum key;
+
+	for (;;) {
+		db->keyptr++;
+		key = getnkey(db->pagbuf, db->keyptr);
+		if (key.dptr != NULL)
+			return key;
+/*
+ * we either run out, or there is nothing on this page..
+ * try the next one... If we lost our position on the
+ * file, we will have to seek.
+ */
+		db->keyptr = 0;
+		if (db->pagbno != db->blkptr++)
+			if (lseek(db->pagf, OFF_PAG(db->blkptr), SEEK_SET) < 0)
+				break;
+		db->pagbno = db->blkptr;
+		if (read(db->pagf, db->pagbuf, PBLKSIZ) <= 0)
+			break;
+		if (!chkpage(db->pagbuf)) {
+			break;
+		}
+	}
+
+	return ioerr(db), nullitem;
+}
+
+/* pair.c */
+/*
+ * sdbm - ndbm work-alike hashed database library
+ * based on Per-Aake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
+ * author: oz@nexus.yorku.ca
+ * status: public domain.
+ *
+ * page-level routines
+ */
+
+#ifndef lint
+/*char pair_rcsid[] = "$Id$";*/
+#endif
+
+#ifndef BSD42
+/*#include <memory.h>*/
+#endif
+
+#define exhash(item)	sdbm_hash((item).dptr, (item).dsize)
+
+/* 
+ * forward 
+ */
+static int seepair proto((char *, int, char *, int));
+
+/*
+ * page format:
+ *	+------------------------------+
+ * ino	| n | keyoff | datoff | keyoff |
+ * 	+------------+--------+--------+
+ *	| datoff | - - - ---->	       |
+ *	+--------+---------------------+
+ *	|	 F R E E A R E A       |
+ *	+--------------+---------------+
+ *	|  <---- - - - | data          |
+ *	+--------+-----+----+----------+
+ *	|  key   | data     | key      |
+ *	+--------+----------+----------+
+ *
+ * calculating the offsets for free area:  if the number
+ * of entries (ino[0]) is zero, the offset to the END of
+ * the free area is the block size. Otherwise, it is the
+ * nth (ino[ino[0]]) entry's offset.
+ */
+
+static int
+fitpair(pag, need)
+char *pag;
+int need;
+{
+	register int n;
+	register int off;
+	register int free;
+	register short *ino = (short *) pag;
+
+	off = ((n = GET_SHORT(ino,0)) > 0) ? GET_SHORT(ino,n) : PBLKSIZ;
+	free = off - (n + 1) * sizeof(short);
+	need += 2 * sizeof(short);
+
+	debug(("free %d need %d\n", free, need));
+
+	return need <= free;
+}
+
+static void
+putpair(pag, key, val)
+char *pag;
+datum key;
+datum val;
+{
+	register int n;
+	register int off;
+	register short *ino = (short *) pag;
+
+	off = ((n = GET_SHORT(ino,0)) > 0) ? GET_SHORT(ino,n) : PBLKSIZ;
+/*
+ * enter the key first
+ */
+	off -= key.dsize;
+	if (key.dsize)
+		(void) memcpy(pag + off, key.dptr, key.dsize);
+	PUT_SHORT(ino,n + 1,off);
+/*
+ * now the data
+ */
+	off -= val.dsize;
+	if (val.dsize)
+		(void) memcpy(pag + off, val.dptr, val.dsize);
+	PUT_SHORT(ino,n + 2,off);
+/*
+ * adjust item count
+ */
+	PUT_SHORT(ino,0,GET_SHORT(ino,0) + 2);
+}
+
+static datum
+getpair(pag, key)
+char *pag;
+datum key;
+{
+	register int i;
+	register int n;
+	datum val;
+	register short *ino = (short *) pag;
+
+	if ((n = GET_SHORT(ino,0)) == 0)
+		return nullitem;
+
+	if ((i = seepair(pag, n, key.dptr, key.dsize)) == 0)
+		return nullitem;
+
+	val.dptr = pag + GET_SHORT(ino,i + 1);
+	val.dsize = GET_SHORT(ino,i) - GET_SHORT(ino,i + 1);
+	return val;
+}
+
+#ifdef SEEDUPS
+static int
+duppair(pag, key)
+char *pag;
+datum key;
+{
+	register short *ino = (short *) pag;
+	return GET_SHORT(ino,0) > 0 &&
+		   seepair(pag, GET_SHORT(ino,0), key.dptr, key.dsize) > 0;
+}
+#endif
+
+static datum
+getnkey(pag, num)
+char *pag;
+int num;
+{
+	datum key;
+	register int off;
+	register short *ino = (short *) pag;
+
+	num = num * 2 - 1;
+	if (GET_SHORT(ino,0) == 0 || num > GET_SHORT(ino,0))
+		return nullitem;
+
+	off = (num > 1) ? GET_SHORT(ino,num - 1) : PBLKSIZ;
+
+	key.dptr = pag + GET_SHORT(ino,num);
+	key.dsize = off - GET_SHORT(ino,num);
+
+	return key;
+}
+
+static int
+delpair(pag, key)
+char *pag;
+datum key;
+{
+	register int n;
+	register int i;
+	register short *ino = (short *) pag;
+
+	if ((n = GET_SHORT(ino,0)) == 0)
+		return 0;
+
+	if ((i = seepair(pag, n, key.dptr, key.dsize)) == 0)
+		return 0;
+/*
+ * found the key. if it is the last entry
+ * [i.e. i == n - 1] we just adjust the entry count.
+ * hard case: move all data down onto the deleted pair,
+ * shift offsets onto deleted offsets, and adjust them.
+ * [note: 0 < i < n]
+ */
+	if (i < n - 1) {
+		register int m;
+		register char *dst = pag + (i == 1 ? PBLKSIZ : GET_SHORT(ino,i - 1));
+		register char *src = pag + GET_SHORT(ino,i + 1);
+		register int   zoo = dst - src;
+
+		debug(("free-up %d ", zoo));
+/*
+ * shift data/keys down
+ */
+		m = GET_SHORT(ino,i + 1) - GET_SHORT(ino,n);
+#ifdef DUFF
+#define MOVB 	*--dst = *--src
+
+		if (m > 0) {
+			register int loop = (m + 8 - 1) >> 3;
+
+			switch (m & (8 - 1)) {
+			case 0:	do {
+				MOVB;	case 7:	MOVB;
+			case 6:	MOVB;	case 5:	MOVB;
+			case 4:	MOVB;	case 3:	MOVB;
+			case 2:	MOVB;	case 1:	MOVB;
+				} while (--loop);
+			}
+		}
+#else
+#ifdef MEMMOVE
+		memmove(dst, src, m);
+#else
+		while (m--)
+			*--dst = *--src;
+#endif
+#endif
+/*
+ * adjust offset index up
+ */
+		while (i < n - 1) {
+			PUT_SHORT(ino,i, GET_SHORT(ino,i + 2) + zoo);
+			i++;
+		}
+	}
+	PUT_SHORT(ino, 0, GET_SHORT(ino, 0) - 2);
+	return 1;
+}
+
+/*
+ * search for the key in the page.
+ * return offset index in the range 0 < i < n.
+ * return 0 if not found.
+ */
+static int
+seepair(pag, n, key, siz)
+char *pag;
+register int n;
+register char *key;
+register int siz;
+{
+	register int i;
+	register int off = PBLKSIZ;
+	register short *ino = (short *) pag;
+
+	for (i = 1; i < n; i += 2) {
+		if (siz == off - GET_SHORT(ino,i) &&
+		    memcmp(key, pag + GET_SHORT(ino,i), siz) == 0)
+			return i;
+		off = GET_SHORT(ino,i + 1);
+	}
+	return 0;
+}
+
+static void
+splpage(pag, new, sbit)
+char *pag;
+char *new;
+long sbit;
+{
+	datum key;
+	datum val;
+
+	register int n;
+	register int off = PBLKSIZ;
+	char cur[PBLKSIZ];
+	register short *ino = (short *) cur;
+
+	(void) memcpy(cur, pag, PBLKSIZ);
+	(void) memset(pag, 0, PBLKSIZ);
+	(void) memset(new, 0, PBLKSIZ);
+
+	n = GET_SHORT(ino,0);
+	for (ino++; n > 0; ino += 2) {
+		key.dptr = cur + GET_SHORT(ino,0); 
+		key.dsize = off - GET_SHORT(ino,0);
+		val.dptr = cur + GET_SHORT(ino,1);
+		val.dsize = GET_SHORT(ino,0) - GET_SHORT(ino,1);
+/*
+ * select the page pointer (by looking at sbit) and insert
+ */
+		(void) putpair((exhash(key) & sbit) ? new : pag, key, val);
+
+		off = GET_SHORT(ino,1);
+		n -= 2;
+	}
+
+	debug(("%d split %d/%d\n", ((short *) cur)[0] / 2, 
+	       ((short *) new)[0] / 2,
+	       ((short *) pag)[0] / 2));
+}
+
+/*
+ * check page sanity: 
+ * number of entries should be something
+ * reasonable, and all offsets in the index should be in order.
+ * this could be made more rigorous.
+ */
+static int
+chkpage(pag)
+char *pag;
+{
+	register int n;
+	register int off;
+	register short *ino = (short *) pag;
+
+	if ((n = GET_SHORT(ino,0)) < 0 || n > PBLKSIZ / sizeof(short))
+		return 0;
+
+	if (n > 0) {
+		off = PBLKSIZ;
+		for (ino++; n > 0; ino += 2) {
+			if (GET_SHORT(ino,0) > off || GET_SHORT(ino,1) > off ||
+			    GET_SHORT(ino,1) > GET_SHORT(ino,0))
+				return 0;
+			off = GET_SHORT(ino,1);
+			n -= 2;
+		}
+	}
+	return 1;
+}
+
+/* hash.c */
+/*
+ * sdbm - ndbm work-alike hashed database library
+ * based on Per-Aake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
+ * author: oz@nexus.yorku.ca
+ * status: public domain. keep it that way.
+ *
+ * hashing routine
+ */
+
+/*
+ * polynomial conversion ignoring overflows
+ * [this seems to work remarkably well, in fact better
+ * then the ndbm hash function. Replace at your own risk]
+ * use: 65599	nice.
+ *      65587   even better. 
+ */
+long
+sdbm_hash(str, len)
+register char *str;
+register int len;
+{
+	register unsigned long n = 0;
+
+#ifdef DUFF
+
+#define HASHC	n = *str++ + 65599 * n
+
+	if (len > 0) {
+		register int loop = (len + 8 - 1) >> 3;
+
+		switch(len & (8 - 1)) {
+		case 0:	do {
+			HASHC;	case 7:	HASHC;
+		case 6:	HASHC;	case 5:	HASHC;
+		case 4:	HASHC;	case 3:	HASHC;
+		case 2:	HASHC;	case 1:	HASHC;
+			} while (--loop);
+		}
+
+	}
+#else
+	while (len--)
+		n = ((*str++) & 255) + 65587L * n;
+#endif
+	return n;
+}
diff --git a/ruby_1_8_6/ext/sdbm/depend b/ruby_1_8_6/ext/sdbm/depend
new file mode 100644
index 0000000000..1d8b13d13f
--- /dev/null
+++ b/ruby_1_8_6/ext/sdbm/depend
@@ -0,0 +1,2 @@
+_sdbm.o: _sdbm.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+init.o: init.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ruby_1_8_6/ext/sdbm/extconf.rb b/ruby_1_8_6/ext/sdbm/extconf.rb
new file mode 100644
index 0000000000..cc6c8cefd1
--- /dev/null
+++ b/ruby_1_8_6/ext/sdbm/extconf.rb
@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile("sdbm")
diff --git a/ruby_1_8_6/ext/sdbm/init.c b/ruby_1_8_6/ext/sdbm/init.c
new file mode 100644
index 0000000000..acadc9b26a
--- /dev/null
+++ b/ruby_1_8_6/ext/sdbm/init.c
@@ -0,0 +1,788 @@
+/************************************************
+
+  sdbminit.c -
+
+  $Author$
+  $Date$
+  created at: Fri May  7 08:34:24 JST 1999
+
+  Copyright (C) 1995-2001 Yukihiro Matsumoto
+
+************************************************/
+
+#include "ruby.h"
+
+#include "sdbm.h"
+#include <fcntl.h>
+#include <errno.h>
+
+static VALUE rb_cDBM, rb_eDBMError;
+
+struct dbmdata {
+    int  di_size;
+    DBM *di_dbm;
+};
+
+static void
+closed_sdbm()
+{
+    rb_raise(rb_eDBMError, "closed SDBM file");
+}
+
+#define GetDBM(obj, dbmp) {\
+    Data_Get_Struct(obj, struct dbmdata, dbmp);\
+    if (dbmp == 0) closed_sdbm();\
+    if (dbmp->di_dbm == 0) closed_sdbm();\
+}
+
+#define GetDBM2(obj, data, dbm) {\
+    GetDBM(obj, data);\
+    (dbm) = dbmp->di_dbm;\
+}
+
+static void
+free_sdbm(dbmp)
+    struct dbmdata *dbmp;
+{
+
+    if (dbmp->di_dbm) sdbm_close(dbmp->di_dbm);
+    free(dbmp);
+}
+
+static VALUE
+fsdbm_close(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+
+    GetDBM(obj, dbmp);
+    sdbm_close(dbmp->di_dbm);
+    dbmp->di_dbm = 0;
+
+    return Qnil;
+}
+
+static VALUE
+fsdbm_closed(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
+    if (dbmp == 0)
+	return Qtrue;
+    if (dbmp->di_dbm == 0)
+	return Qtrue;
+
+    return Qfalse;
+}
+
+static VALUE fsdbm_alloc _((VALUE));
+static VALUE
+fsdbm_alloc(klass)
+    VALUE klass;
+{
+    return Data_Wrap_Struct(klass, 0, free_sdbm, 0);
+}
+
+static VALUE
+fsdbm_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE file, vmode;
+    DBM *dbm;
+    struct dbmdata *dbmp;
+    int mode;
+
+    if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
+	mode = 0666;		/* default value */
+    }
+    else if (NIL_P(vmode)) {
+	mode = -1;		/* return nil if DB not exist */
+    }
+    else {
+	mode = NUM2INT(vmode);
+    }
+    SafeStringValue(file);
+
+    dbm = 0;
+    if (mode >= 0)
+	dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
+    if (!dbm)
+	dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR, 0);
+    if (!dbm)
+	dbm = sdbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
+
+    if (!dbm) {
+	if (mode == -1) return Qnil;
+	rb_sys_fail(RSTRING(file)->ptr);
+    }
+
+    dbmp = ALLOC(struct dbmdata);
+    DATA_PTR(obj) = dbmp;
+    dbmp->di_dbm = dbm;
+    dbmp->di_size = -1;
+
+    return obj;
+}
+
+static VALUE
+fsdbm_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE obj = Data_Wrap_Struct(klass, 0, free_sdbm, 0);
+
+    if (NIL_P(fsdbm_initialize(argc, argv, obj))) {
+	return Qnil;
+    }
+
+    if (rb_block_given_p()) {
+        return rb_ensure(rb_yield, obj, fsdbm_close, obj);
+    }
+
+    return obj;
+}
+
+static VALUE
+fsdbm_fetch(obj, keystr, ifnone)
+    VALUE obj, keystr, ifnone;
+{
+    datum key, value;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    StringValue(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    value = sdbm_fetch(dbm, key);
+    if (value.dptr == 0) {
+	if (ifnone == Qnil && rb_block_given_p())
+	    return rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
+	return ifnone;
+    }
+    return rb_tainted_str_new(value.dptr, value.dsize);
+}
+
+static VALUE
+fsdbm_aref(obj, keystr)
+    VALUE obj, keystr;
+{
+    return fsdbm_fetch(obj, keystr, Qnil);
+}
+
+static VALUE
+fsdbm_fetch_m(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE keystr, valstr, ifnone;
+
+    rb_scan_args(argc, argv, "11", &keystr, &ifnone);
+    valstr = fsdbm_fetch(obj, keystr, ifnone);
+    if (argc == 1 && !rb_block_given_p() && NIL_P(valstr))
+	rb_raise(rb_eIndexError, "key not found");
+
+    return valstr;
+}
+
+static VALUE
+fsdbm_index(obj, valstr)
+    VALUE obj, valstr;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    StringValue(valstr);
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	val = sdbm_fetch(dbm, key);
+	if (val.dsize == RSTRING(valstr)->len &&
+	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
+	    return rb_tainted_str_new(key.dptr, key.dsize);
+    }
+    return Qnil;
+}
+
+static VALUE
+fsdbm_indexes(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE new;
+    int i;
+
+    new = rb_ary_new2(argc);
+    for (i=0; i<argc; i++) {
+	rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
+    }
+
+    return new;
+}
+
+static VALUE
+fsdbm_select(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE new = rb_ary_new2(argc);
+    int i;
+
+    if (rb_block_given_p()) {
+        datum key, val;
+        DBM *dbm;
+        struct dbmdata *dbmp;
+
+	if (argc > 0) {
+	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	}
+        GetDBM2(obj, dbmp, dbm);
+        for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+            VALUE assoc, v;
+            val = sdbm_fetch(dbm, key);
+            assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
+                                 rb_tainted_str_new(val.dptr, val.dsize));
+	    v = rb_yield(assoc);
+	    if (RTEST(v)) {
+		rb_ary_push(new, assoc);
+	    }
+	    GetDBM2(obj, dbmp, dbm);
+        }
+    }
+    else {
+	rb_warn("SDBM#select(index..) is deprecated; use SDBM#values_at");
+
+        for (i=0; i<argc; i++) {
+            rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
+        }
+    }
+
+    return new;
+}
+
+static VALUE
+fsdbm_values_at(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE new = rb_ary_new2(argc);
+    int i;
+
+    for (i=0; i<argc; i++) {
+        rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
+    }
+
+    return new;
+}
+
+static void
+fdbm_modify(obj)
+    VALUE obj;
+{
+    rb_secure(4);
+    if (OBJ_FROZEN(obj)) rb_error_frozen("SDBM");
+}
+
+static VALUE
+fsdbm_delete(obj, keystr)
+    VALUE obj, keystr;
+{
+    datum key, value;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE valstr;
+
+    fdbm_modify(obj);
+    StringValue(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    dbmp->di_size = -1;
+
+    value = sdbm_fetch(dbm, key);
+    if (value.dptr == 0) {
+	if (rb_block_given_p()) return rb_yield(keystr);
+	return Qnil;
+    }
+
+    /* need to save value before sdbm_delete() */
+    valstr = rb_tainted_str_new(value.dptr, value.dsize);
+
+    if (sdbm_delete(dbm, key)) {
+	dbmp->di_size = -1;
+	rb_raise(rb_eDBMError, "dbm_delete failed");
+    }
+    else if (dbmp->di_size >= 0) {
+	dbmp->di_size--;
+    }
+    return valstr;
+}
+
+static VALUE
+fsdbm_shift(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE keystr, valstr;
+
+    fdbm_modify(obj);
+    GetDBM2(obj, dbmp, dbm);
+    key = sdbm_firstkey(dbm); 
+    if (!key.dptr) return Qnil;
+    val = sdbm_fetch(dbm, key);
+    keystr = rb_tainted_str_new(key.dptr, key.dsize);
+    valstr = rb_tainted_str_new(val.dptr, val.dsize);
+    sdbm_delete(dbm, key);
+    if (dbmp->di_size >= 0) {
+	dbmp->di_size--;
+    }
+
+    return rb_assoc_new(keystr, valstr);
+}
+
+static VALUE
+fsdbm_delete_if(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE keystr, valstr;
+    VALUE ret, ary = rb_ary_new();
+    int i, status = 0, n;
+
+    fdbm_modify(obj);
+    GetDBM2(obj, dbmp, dbm);
+    n = dbmp->di_size;
+    dbmp->di_size = -1;
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	val = sdbm_fetch(dbm, key);
+	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+        ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
+        if (status != 0) break;
+	if (RTEST(ret)) rb_ary_push(ary, keystr);
+	GetDBM2(obj, dbmp, dbm);
+    }
+
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	keystr = RARRAY(ary)->ptr[i];
+	StringValue(keystr);
+	key.dptr = RSTRING(keystr)->ptr;
+	key.dsize = RSTRING(keystr)->len;
+	if (sdbm_delete(dbm, key)) {
+	    rb_raise(rb_eDBMError, "sdbm_delete failed");
+	}
+    }
+    if (status) rb_jump_tag(status);
+    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
+
+    return obj;
+}
+
+static VALUE
+fsdbm_clear(obj)
+    VALUE obj;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    fdbm_modify(obj);
+    GetDBM2(obj, dbmp, dbm);
+    dbmp->di_size = -1;
+    while (key = sdbm_firstkey(dbm), key.dptr) {
+	if (sdbm_delete(dbm, key)) {
+	    rb_raise(rb_eDBMError, "sdbm_delete failed");
+	}
+    }
+    dbmp->di_size = 0;
+
+    return obj;
+}
+
+static VALUE
+fsdbm_invert(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE keystr, valstr;
+    VALUE hash = rb_hash_new();
+
+    GetDBM2(obj, dbmp, dbm);
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	val = sdbm_fetch(dbm, key);
+	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	rb_hash_aset(hash, valstr, keystr);
+    }
+    return hash;
+}
+
+static VALUE each_pair _((VALUE));
+
+static VALUE
+each_pair(obj)
+    VALUE obj;
+{
+    return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
+}
+
+static VALUE fsdbm_store _((VALUE,VALUE,VALUE));
+
+static VALUE
+update_i(pair, dbm)
+    VALUE pair, dbm;
+{
+    Check_Type(pair, T_ARRAY);
+    if (RARRAY(pair)->len < 2) {
+	rb_raise(rb_eArgError, "pair must be [key, value]");
+    }
+    fsdbm_store(dbm, RARRAY(pair)->ptr[0], RARRAY(pair)->ptr[1]);
+    return Qnil;
+}
+
+static VALUE
+fsdbm_update(obj, other)
+    VALUE obj, other;
+{
+    rb_iterate(each_pair, other, update_i, obj);
+    return obj;
+}
+
+static VALUE
+fsdbm_replace(obj, other)
+    VALUE obj, other;
+{
+    fsdbm_clear(obj);
+    rb_iterate(each_pair, other, update_i, obj);
+    return obj;
+}
+
+static VALUE
+fsdbm_store(obj, keystr, valstr)
+    VALUE obj, keystr, valstr;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    if (valstr == Qnil) {
+	fsdbm_delete(obj, keystr);
+	return Qnil;
+    }
+
+    fdbm_modify(obj);
+    StringValue(keystr);
+    StringValue(valstr);
+
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    dbmp->di_size = -1;
+    if (sdbm_store(dbm, key, val, DBM_REPLACE)) {
+#ifdef HAVE_DBM_CLAERERR
+	sdbm_clearerr(dbm);
+#endif
+	if (errno == EPERM) rb_sys_fail(0);
+	rb_raise(rb_eDBMError, "sdbm_store failed");
+    }
+
+    return valstr;
+}
+
+static VALUE
+fsdbm_length(obj)
+    VALUE obj;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    int i = 0;
+
+    GetDBM2(obj, dbmp, dbm);
+    if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
+
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	i++;
+    }
+    dbmp->di_size = i;
+
+    return INT2FIX(i);
+}
+
+static VALUE
+fsdbm_empty_p(obj)
+    VALUE obj;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    int i = 0;
+
+    GetDBM(obj, dbmp);
+    if (dbmp->di_size < 0) {
+	dbm = dbmp->di_dbm;
+
+	for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	    i++;
+	}
+    }
+    else {
+	i = dbmp->di_size;
+    }
+    if (i == 0) return Qtrue;
+    return Qfalse;
+}
+
+static VALUE
+fsdbm_each_value(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    GetDBM2(obj, dbmp, dbm);
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	val = sdbm_fetch(dbm, key);
+	rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
+	GetDBM2(obj, dbmp, dbm);
+    }
+    return obj;
+}
+
+static VALUE
+fsdbm_each_key(obj)
+    VALUE obj;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    GetDBM2(obj, dbmp, dbm);
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
+	GetDBM2(obj, dbmp, dbm);
+    }
+    return obj;
+}
+
+static VALUE
+fsdbm_each_pair(obj)
+    VALUE obj;
+{
+    datum key, val;
+    DBM *dbm;
+    struct dbmdata *dbmp;
+    VALUE keystr, valstr;
+
+    GetDBM2(obj, dbmp, dbm);
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	val = sdbm_fetch(dbm, key);
+	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	valstr = rb_tainted_str_new(val.dptr, val.dsize);
+	rb_yield(rb_assoc_new(keystr, valstr));
+	GetDBM2(obj, dbmp, dbm);
+    }
+
+    return obj;
+}
+
+static VALUE
+fsdbm_keys(obj)
+    VALUE obj;
+{
+    datum key;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE ary;
+
+    GetDBM2(obj, dbmp, dbm);
+    ary = rb_ary_new();
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	rb_ary_push(ary, rb_tainted_str_new(key.dptr, key.dsize));
+    }
+
+    return ary;
+}
+
+static VALUE
+fsdbm_values(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE ary;
+
+    GetDBM2(obj, dbmp, dbm);
+    ary = rb_ary_new();
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	val = sdbm_fetch(dbm, key);
+	rb_ary_push(ary, rb_tainted_str_new(val.dptr, val.dsize));
+    }
+
+    return ary;
+}
+
+static VALUE
+fsdbm_has_key(obj, keystr)
+    VALUE obj, keystr;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    StringValue(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    val = sdbm_fetch(dbm, key);
+    if (val.dptr) return Qtrue;
+    return Qfalse;
+}
+
+static VALUE
+fsdbm_has_value(obj, valstr)
+    VALUE obj, valstr;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+
+    StringValue(valstr);
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	val = sdbm_fetch(dbm, key);
+	if (val.dsize == RSTRING(valstr)->len &&
+	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
+	    return Qtrue;
+    }
+    return Qfalse;
+}
+
+static VALUE
+fsdbm_to_a(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE ary;
+
+    GetDBM2(obj, dbmp, dbm);
+    ary = rb_ary_new();
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	val = sdbm_fetch(dbm, key);
+	rb_ary_push(ary, rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
+				      rb_tainted_str_new(val.dptr, val.dsize)));
+    }
+
+    return ary;
+}
+
+static VALUE
+fsdbm_to_hash(obj)
+    VALUE obj;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    DBM *dbm;
+    VALUE hash;
+
+    GetDBM2(obj, dbmp, dbm);
+    hash = rb_hash_new();
+    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+	val = sdbm_fetch(dbm, key);
+	rb_hash_aset(hash, rb_tainted_str_new(key.dptr, key.dsize),
+		           rb_tainted_str_new(val.dptr, val.dsize));
+    }
+
+    return hash;
+}
+
+static VALUE
+fsdbm_reject(obj)
+    VALUE obj;
+{
+    return rb_hash_delete_if(fsdbm_to_hash(obj));
+}
+
+void
+Init_sdbm()
+{
+    rb_cDBM = rb_define_class("SDBM", rb_cObject);
+    rb_eDBMError = rb_define_class("SDBMError", rb_eStandardError);
+    rb_include_module(rb_cDBM, rb_mEnumerable);
+
+    rb_define_alloc_func(rb_cDBM, fsdbm_alloc);
+    rb_define_singleton_method(rb_cDBM, "open", fsdbm_s_open, -1);
+
+    rb_define_method(rb_cDBM, "initialize", fsdbm_initialize, -1);
+    rb_define_method(rb_cDBM, "close", fsdbm_close, 0);
+    rb_define_method(rb_cDBM, "closed?", fsdbm_closed, 0);
+    rb_define_method(rb_cDBM, "[]", fsdbm_aref, 1);
+    rb_define_method(rb_cDBM, "fetch", fsdbm_fetch_m, -1);
+    rb_define_method(rb_cDBM, "[]=", fsdbm_store, 2);
+    rb_define_method(rb_cDBM, "store", fsdbm_store, 2);
+    rb_define_method(rb_cDBM, "index",  fsdbm_index, 1);
+    rb_define_method(rb_cDBM, "indexes",  fsdbm_indexes, -1);
+    rb_define_method(rb_cDBM, "indices",  fsdbm_indexes, -1);
+    rb_define_method(rb_cDBM, "select",  fsdbm_select, -1);
+    rb_define_method(rb_cDBM, "values_at",  fsdbm_values_at, -1);
+    rb_define_method(rb_cDBM, "length", fsdbm_length, 0);
+    rb_define_method(rb_cDBM, "size", fsdbm_length, 0);
+    rb_define_method(rb_cDBM, "empty?", fsdbm_empty_p, 0);
+    rb_define_method(rb_cDBM, "each", fsdbm_each_pair, 0);
+    rb_define_method(rb_cDBM, "each_value", fsdbm_each_value, 0);
+    rb_define_method(rb_cDBM, "each_key", fsdbm_each_key, 0);
+    rb_define_method(rb_cDBM, "each_pair", fsdbm_each_pair, 0);
+    rb_define_method(rb_cDBM, "keys", fsdbm_keys, 0);
+    rb_define_method(rb_cDBM, "values", fsdbm_values, 0);
+    rb_define_method(rb_cDBM, "shift", fsdbm_shift, 0);
+    rb_define_method(rb_cDBM, "delete", fsdbm_delete, 1);
+    rb_define_method(rb_cDBM, "delete_if", fsdbm_delete_if, 0);
+    rb_define_method(rb_cDBM, "reject!", fsdbm_delete_if, 0);
+    rb_define_method(rb_cDBM, "reject", fsdbm_reject, 0);
+    rb_define_method(rb_cDBM, "clear", fsdbm_clear, 0);
+    rb_define_method(rb_cDBM,"invert", fsdbm_invert, 0);
+    rb_define_method(rb_cDBM,"update", fsdbm_update, 1);
+    rb_define_method(rb_cDBM,"replace", fsdbm_replace, 1);
+
+    rb_define_method(rb_cDBM, "include?", fsdbm_has_key, 1);
+    rb_define_method(rb_cDBM, "has_key?", fsdbm_has_key, 1);
+    rb_define_method(rb_cDBM, "member?", fsdbm_has_key, 1);
+    rb_define_method(rb_cDBM, "has_value?", fsdbm_has_value, 1);
+    rb_define_method(rb_cDBM, "key?", fsdbm_has_key, 1);
+    rb_define_method(rb_cDBM, "value?", fsdbm_has_value, 1);
+
+    rb_define_method(rb_cDBM, "to_a", fsdbm_to_a, 0);
+    rb_define_method(rb_cDBM, "to_hash", fsdbm_to_hash, 0);
+}
diff --git a/ruby_1_8_6/ext/sdbm/sdbm.h b/ruby_1_8_6/ext/sdbm/sdbm.h
new file mode 100644
index 0000000000..ce8f54c4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/sdbm/sdbm.h
@@ -0,0 +1,84 @@
+/*
+ * sdbm - ndbm work-alike hashed database library
+ * based on Per-Ake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
+ * author: oz@nexus.yorku.ca
+ * status: public domain. 
+ */
+#ifndef	_SDBM_H_
+#define	_SDBM_H_
+
+#define DBLKSIZ 4096
+#define PBLKSIZ 1024
+#define PAIRMAX 1008			/* arbitrary on PBLKSIZ-N */
+#define SPLTMAX	10			/* maximum allowed splits */
+					/* for a single insertion */
+#define DIRFEXT	".dir"
+#define PAGFEXT	".pag"
+
+typedef struct {
+	int dirf;		       /* directory file descriptor */
+	int pagf;		       /* page file descriptor */
+	int flags;		       /* status/error flags, see below */
+	long maxbno;		       /* size of dirfile in bits */
+	long curbit;		       /* current bit number */
+	long hmask;		       /* current hash mask */
+	long blkptr;		       /* current block for nextkey */
+	int keyptr;		       /* current key for nextkey */
+	long blkno;		       /* current page to read/write */
+	long pagbno;		       /* current page in pagbuf */
+	char pagbuf[PBLKSIZ];	       /* page file block buffer */
+	long dirbno;		       /* current block in dirbuf */
+	char dirbuf[DBLKSIZ];	       /* directory file block buffer */
+} DBM;
+
+#define DBM_RDONLY	0x1	       /* data base open read-only */
+#define DBM_IOERR	0x2	       /* data base I/O error */
+
+/*
+ * utility macros
+ */
+#define sdbm_rdonly(db)		((db)->flags & DBM_RDONLY)
+#define sdbm_error(db)		((db)->flags & DBM_IOERR)
+
+#define sdbm_clearerr(db)	((db)->flags &= ~DBM_IOERR)  /* ouch */
+
+#define sdbm_dirfno(db)	((db)->dirf)
+#define sdbm_pagfno(db)	((db)->pagf)
+
+typedef struct {
+	char *dptr;
+	int dsize;
+} datum;
+
+extern datum nullitem;
+
+#if defined(__STDC__) || defined(MSDOS)
+#define proto(p) p
+#else
+#define proto(p) ()
+#endif
+
+/*
+ * flags to sdbm_store
+ */
+#define DBM_INSERT	0
+#define DBM_REPLACE	1
+
+/*
+ * ndbm interface
+ */
+extern DBM *sdbm_open proto((char *, int, int));
+extern void sdbm_close proto((DBM *));
+extern datum sdbm_fetch proto((DBM *, datum));
+extern int sdbm_delete proto((DBM *, datum));
+extern int sdbm_store proto((DBM *, datum, datum, int));
+extern datum sdbm_firstkey proto((DBM *));
+extern datum sdbm_nextkey proto((DBM *));
+
+/*
+ * other
+ */
+extern DBM *sdbm_prep proto((char *, char *, int, int));
+extern long sdbm_hash proto((char *, int));
+
+#endif	/* _SDBM_H_ */
diff --git a/ruby_1_8_6/ext/socket/.cvsignore b/ruby_1_8_6/ext/socket/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/socket/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/socket/addrinfo.h b/ruby_1_8_6/ext/socket/addrinfo.h
new file mode 100644
index 0000000000..a22615ee00
--- /dev/null
+++ b/ruby_1_8_6/ext/socket/addrinfo.h
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef ADDR_INFO_H
+#define ADDR_INFO_H
+#ifndef HAVE_GETADDRINFO
+
+/* special compatibility hack */
+#undef EAI_ADDRFAMILY
+#undef EAI_AGAIN
+#undef EAI_BADFLAGS
+#undef EAI_FAIL
+#undef EAI_FAMILY
+#undef EAI_MEMORY
+#undef EAI_NODATA
+#undef EAI_NONAME
+#undef EAI_SERVICE
+#undef EAI_SOCKTYPE
+#undef EAI_SYSTEM
+#undef EAI_BADHINTS
+#undef EAI_PROTOCOL
+#undef EAI_MAX
+
+#undef AI_PASSIVE
+#undef AI_CANONNAME
+#undef AI_NUMERICHOST
+#undef AI_ALL
+#undef AI_ADDRCONFIG
+#undef AI_V4MAPPED
+#undef AI_DEFAULT
+
+#undef NI_NOFQDN
+#undef NI_NUMERICHOST
+#undef NI_NAMEREQD
+#undef NI_NUMERICSERV
+#undef NI_DGRAM
+
+#define addrinfo addrinfo__compat
+#define getaddrinfo getaddrinfo__compat
+#define getnameinfo getnameinfo__compat
+#define freehostent freehostent__compat
+#define freeaddrinfo freeaddrinfo__compat
+
+#ifndef __P
+# ifdef HAVE_PROTOTYPES
+#  define __P(args) args
+# else
+#  define __P(args) ()
+# endif
+#endif
+
+/* special compatibility hack -- end*/
+
+
+/*
+ * Error return codes from getaddrinfo()
+ */
+#define	EAI_ADDRFAMILY	 1	/* address family for hostname not supported */
+#define	EAI_AGAIN	 2	/* temporary failure in name resolution */
+#define	EAI_BADFLAGS	 3	/* invalid value for ai_flags */
+#define	EAI_FAIL	 4	/* non-recoverable failure in name resolution */
+#define	EAI_FAMILY	 5	/* ai_family not supported */
+#define	EAI_MEMORY	 6	/* memory allocation failure */
+#define	EAI_NODATA	 7	/* no address associated with hostname */
+#define	EAI_NONAME	 8	/* hostname nor servname provided, or not known */
+#define	EAI_SERVICE	 9	/* servname not supported for ai_socktype */
+#define	EAI_SOCKTYPE	10	/* ai_socktype not supported */
+#define	EAI_SYSTEM	11	/* system error returned in errno */
+#define EAI_BADHINTS	12
+#define EAI_PROTOCOL	13
+#define EAI_MAX		14
+
+/*
+ * Flag values for getaddrinfo()
+ */
+#define	AI_PASSIVE	0x00000001 /* get address to use bind() */
+#define	AI_CANONNAME	0x00000002 /* fill ai_canonname */
+#define	AI_NUMERICHOST	0x00000004 /* prevent name resolution */
+/* valid flags for addrinfo */
+#define	AI_MASK		(AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST)
+
+#define	AI_ALL		0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */
+#define	AI_V4MAPPED_CFG	0x00000200 /* accept IPv4-mapped if kernel supports */
+#define	AI_ADDRCONFIG	0x00000400 /* only if any address is assigned */
+#define	AI_V4MAPPED	0x00000800 /* accept IPv4-mapped IPv6 address */
+/* special recommended flags for getipnodebyname */
+#define	AI_DEFAULT	(AI_V4MAPPED_CFG | AI_ADDRCONFIG)
+
+/*
+ * Constants for getnameinfo()
+ */
+#ifndef NI_MAXHOST
+#define	NI_MAXHOST	1025
+#define	NI_MAXSERV	32
+#endif
+
+/*
+ * Flag values for getnameinfo()
+ */
+#define	NI_NOFQDN	0x00000001
+#define	NI_NUMERICHOST	0x00000002
+#define	NI_NAMEREQD	0x00000004
+#define	NI_NUMERICSERV	0x00000008
+#define	NI_DGRAM	0x00000010
+
+struct addrinfo {
+	int	ai_flags;	/* AI_PASSIVE, AI_CANONNAME */
+	int	ai_family;	/* PF_xxx */
+	int	ai_socktype;	/* SOCK_xxx */
+	int	ai_protocol;	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
+	size_t	ai_addrlen;	/* length of ai_addr */
+	char	*ai_canonname;	/* canonical name for hostname */
+	struct sockaddr *ai_addr;	/* binary address */
+	struct addrinfo *ai_next;	/* next structure in linked list */
+};
+
+extern int getaddrinfo __P((
+	const char *hostname, const char *servname,
+	const struct addrinfo *hints,
+	struct addrinfo **res));
+
+extern int getnameinfo __P((
+	const struct sockaddr *sa,
+	size_t salen,
+	char *host,
+	size_t hostlen,
+	char *serv,
+	size_t servlen,
+	int flags));
+
+extern void freehostent __P((struct hostent *));
+extern void freeaddrinfo __P((struct addrinfo *));
+#if defined __UCLIBC__
+const
+#endif
+extern char *gai_strerror __P((int));
+
+/* In case there is no definition of offsetof() provided - though any proper
+Standard C system should have one. */
+
+#ifndef offsetof
+#define offsetof(p_type,field) ((size_t)&(((p_type *)0)->field))
+#endif
+
+#endif
+#endif
diff --git a/ruby_1_8_6/ext/socket/depend b/ruby_1_8_6/ext/socket/depend
new file mode 100644
index 0000000000..cca6d4e62a
--- /dev/null
+++ b/ruby_1_8_6/ext/socket/depend
@@ -0,0 +1,3 @@
+socket.o : socket.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/rubyio.h $(hdrdir)/rubysig.h sockport.h
+getnameinfo.o: getnameinfo.c $(topdir)/config.h addrinfo.h sockport.h
+getaddrinfo.o: getaddrinfo.c $(topdir)/config.h addrinfo.h sockport.h
diff --git a/ruby_1_8_6/ext/socket/extconf.rb b/ruby_1_8_6/ext/socket/extconf.rb
new file mode 100644
index 0000000000..8a13ddba73
--- /dev/null
+++ b/ruby_1_8_6/ext/socket/extconf.rb
@@ -0,0 +1,288 @@
+require 'mkmf'
+
+case RUBY_PLATFORM
+when /bccwin32/
+  test_func = "WSACleanup"
+  have_library("ws2_32", "WSACleanup")
+when /mswin32|mingw/
+  test_func = "WSACleanup"
+  if with_config("winsock2")
+    have_library("ws2_32", "WSACleanup")
+  else
+    have_library("wsock32", "WSACleanup")
+  end
+when /cygwin/
+  test_func = "socket"
+when /beos/
+  test_func = "socket"
+  have_library("net", "socket")
+  have_func("closesocket")
+when /i386-os2_emx/
+  test_func = "socket"
+  have_library("socket", "socket")
+else
+  test_func = "socket"
+  have_library("nsl", "t_open")
+  have_library("socket", "socket")
+end
+
+unless $mswin or $bccwin or $mingw
+  headers = %w<sys/types.h netdb.h string.h sys/socket.h netinet/in.h>
+end
+if /solaris/ =~ RUBY_PLATFORM and !try_compile("")
+  # bug of gcc 3.0 on Solaris 8 ?
+  headers << "sys/feature_tests.h"
+end
+if have_header("arpa/inet.h")
+  headers << "arpa/inet.h"
+end
+
+ipv6 = false
+default_ipv6 = /cygwin/ !~ RUBY_PLATFORM
+if enable_config("ipv6", default_ipv6)
+  if checking_for("ipv6") {try_link(<<EOF)}
+#include <sys/types.h>
+#include <sys/socket.h>
+main()
+{
+  socket(AF_INET6, SOCK_STREAM, 0);
+}
+EOF
+    $defs << "-DENABLE_IPV6" << "-DINET6"
+    ipv6 = true
+  end
+end
+
+if ipv6
+  ipv6lib = nil
+  class << (fmt = "unknown")
+    def %(s) s || self end
+  end
+  idirs, ldirs = dir_config("inet6", %w[/usr/inet6 /usr/local/v6].find {|d| File.directory?(d)})
+  checking_for("ipv6 type", fmt) do
+    if have_macro("IPV6_INRIA_VERSION", "netinet/in.h")
+      "inria"
+    elsif have_macro("__KAME__", "netinet/in.h")
+      have_library(ipv6lib = "inet6")
+      "kame"
+    elsif have_macro("_TOSHIBA_INET6", "sys/param.h")
+      have_library(ipv6lib = "inet6") and "toshiba"
+    elsif have_macro("__V6D__", "sys/v6config.h")
+      have_library(ipv6lib = "v6") and "v6d"
+    elsif have_macro("_ZETA_MINAMI_INET6", "sys/param.h")
+      have_library(ipv6lib = "inet6") and "zeta"
+    elsif ipv6lib = with_config("ipv6-lib")
+      warn <<EOS
+--with-ipv6-lib and --with-ipv6-libdir option will be obsolete, use
+--with-inet6lib and --with-inet6-{include,lib} options instead.
+EOS
+      find_library(ipv6lib, nil, with_config("ipv6-libdir", ldirs)) and
+        ipv6lib
+    elsif have_library("inet6")
+      "inet6"
+    end
+  end or not ipv6lib or abort <<EOS
+
+Fatal: no #{ipv6lib} library found.  cannot continue.
+You need to fetch lib#{ipv6lib}.a from appropriate
+ipv6 kit and compile beforehand.
+EOS
+end
+
+if have_struct_member("struct sockaddr_in", "sin_len", headers)
+  $defs[-1] = "-DHAVE_SIN_LEN"
+end
+
+#   doug's fix, NOW add -Dss_family... only if required!
+[nil, " -Dss_family=__ss_family -Dss_len=__ss_len"].each do |flags|
+  if flags
+    cppflags = $CPPFLAGS
+    $CPPFLAGS += flags
+  end
+  if have_struct_member("struct sockaddr_storage", "ss_family", headers)
+    $defs[-1] = "-DHAVE_SOCKADDR_STORAGE"
+    break
+  elsif flags
+    $CPPFLAGS = cppflags
+  end
+end
+
+if have_struct_member("struct sockaddr", "sa_len", headers)
+  $defs[-1] = "-DHAVE_SA_LEN "
+end
+
+have_header("netinet/tcp.h") if not /cygwin/ =~ RUBY_PLATFORM # for cygwin 1.1.5
+have_header("netinet/udp.h")
+
+if have_func("sendmsg") | have_func("recvmsg")
+  have_struct_member('struct msghdr', 'msg_control', ['sys/types.h', 'sys/socket.h'])
+  have_struct_member('struct msghdr', 'msg_accrights', ['sys/types.h', 'sys/socket.h'])
+end
+
+getaddr_info_ok = enable_config("wide-getaddrinfo") do
+  checking_for("wide getaddrinfo") {try_run(<<EOF)}
+#{cpp_include(headers)}
+#include <stdlib.h>
+
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+
+#ifndef AF_LOCAL
+#define AF_LOCAL AF_UNIX
+#endif
+
+main()
+{
+  int passive, gaierr, inet4 = 0, inet6 = 0;
+  struct addrinfo hints, *ai, *aitop;
+  char straddr[INET6_ADDRSTRLEN], strport[16];
+
+  for (passive = 0; passive <= 1; passive++) {
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_protocol = IPPROTO_TCP;
+    hints.ai_flags = passive ? AI_PASSIVE : 0;
+    hints.ai_socktype = SOCK_STREAM;
+    if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
+      (void)gai_strerror(gaierr);
+      goto bad;
+    }
+    for (ai = aitop; ai; ai = ai->ai_next) {
+      if (ai->ai_family == AF_LOCAL) continue;
+      if (ai->ai_addr == NULL)
+        goto bad;
+#if defined(_AIX)
+      if (ai->ai_family == AF_INET6 && passive) {
+        inet6++;
+        continue;
+      }
+      ai->ai_addr->sa_len = ai->ai_addrlen;
+      ai->ai_addr->sa_family = ai->ai_family;
+#endif
+      if (ai->ai_addrlen == 0 ||
+          getnameinfo(ai->ai_addr, ai->ai_addrlen,
+                      straddr, sizeof(straddr), strport, sizeof(strport),
+                      NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
+        goto bad;
+      }
+      if (strcmp(strport, "54321") != 0) {
+        goto bad;
+      }
+      switch (ai->ai_family) {
+      case AF_INET:
+        if (passive) {
+          if (strcmp(straddr, "0.0.0.0") != 0) {
+            goto bad;
+          }
+        } else {
+          if (strcmp(straddr, "127.0.0.1") != 0) {
+            goto bad;
+          }
+        }
+        inet4++;
+        break;
+      case AF_INET6:
+        if (passive) {
+          if (strcmp(straddr, "::") != 0) {
+            goto bad;
+          }
+        } else {
+          if (strcmp(straddr, "::1") != 0) {
+            goto bad;
+          }
+        }
+        inet6++;
+        break;
+      case AF_UNSPEC:
+        goto bad;
+        break;
+      default:
+        /* another family support? */
+        break;
+      }
+    }
+  }
+
+  if (!(inet4 == 0 || inet4 == 2))
+    goto bad;
+  if (!(inet6 == 0 || inet6 == 2))
+    goto bad;
+
+  if (aitop)
+    freeaddrinfo(aitop);
+  exit(EXIT_SUCCESS);
+
+ bad:
+  if (aitop)
+    freeaddrinfo(aitop);
+  exit(EXIT_FAILURE);
+}
+EOF
+end
+if ipv6 and not getaddr_info_ok
+  abort <<EOS
+
+Fatal: --enable-ipv6 is specified, and your OS seems to support IPv6 feature.
+But your getaddrinfo() and getnameinfo() are appeared to be broken.  Sorry,
+you cannot compile IPv6 socket classes with broken these functions.
+You can try --enable-wide-getaddrinfo.
+EOS
+end
+
+case with_config("lookup-order-hack", "UNSPEC")
+when "INET"
+  $defs << "-DLOOKUP_ORDER_HACK_INET"
+when "INET6"
+  $defs << "-DLOOKUP_ORDER_HACK_INET6"
+when "UNSPEC"
+  # nothing special
+else
+  abort <<EOS
+
+Fatal: invalid value for --with-lookup-order-hack (expected INET, INET6 or UNSPEC)
+EOS
+end
+
+$objs = ["socket.#{$OBJEXT}"]
+
+unless getaddr_info_ok and have_func("getnameinfo", "netdb.h") and have_func("getaddrinfo", "netdb.h")
+  if have_struct_member("struct in6_addr", "s6_addr8", headers)
+    $defs[-1] = "-DHAVE_ADDR8"
+  end
+  $CPPFLAGS="-I. "+$CPPFLAGS
+  $objs += ["getaddrinfo.#{$OBJEXT}"]
+  $objs += ["getnameinfo.#{$OBJEXT}"]
+  have_func("inet_ntop") or have_func("inet_ntoa")
+  have_func("inet_pton") or have_func("inet_aton")
+  have_func("getservbyport")
+  have_header("arpa/nameser.h")
+  have_header("resolv.h")
+end
+
+unless have_type("socklen_t", headers)
+  $defs << "-Dsocklen_t=int"
+end
+
+have_header("sys/un.h")
+have_header("sys/uio.h")
+
+if have_func(test_func)
+  have_func("hsterror")
+  have_func("getipnodebyname") or have_func("gethostbyname2")
+  have_func("socketpair")
+  unless have_func("gethostname")
+    have_func("uname")
+  end
+  if enable_config("socks", ENV["SOCKS_SERVER"])
+    if have_library("socks5", "SOCKSinit")
+      $defs << "-DSOCKS5" << "-DSOCKS"
+    elsif have_library("socks", "Rconnect")
+      $defs << "-DSOCKS"
+    end
+  end
+  create_makefile("socket")
+end
diff --git a/ruby_1_8_6/ext/socket/getaddrinfo.c b/ruby_1_8_6/ext/socket/getaddrinfo.c
new file mode 100644
index 0000000000..9fb4ebcb06
--- /dev/null
+++ b/ruby_1_8_6/ext/socket/getaddrinfo.c
@@ -0,0 +1,698 @@
+/*
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * "#ifdef FAITH" part is local hack for supporting IPv4-v6 translator.
+ *
+ * Issues to be discussed:
+ * - Thread safe-ness must be checked.
+ * - Return values.  There are nonstandard return values defined and used
+ *   in the source code.  This is because RFC2133 is silent about which error
+ *   code must be returned for which situation.
+ * - PF_UNSPEC case would be handled in getipnodebyname() with the AI_ALL flag.
+ */
+
+#include "config.h"
+#include <sys/types.h>
+#if !defined(_WIN32) && !defined(__VMS)
+#include <sys/param.h>
+#if defined(__BEOS__)
+# include <net/socket.h>
+#else
+# include <sys/socket.h>
+#endif
+#include <netinet/in.h>
+#if defined(HAVE_ARPA_INET_H)
+#include <arpa/inet.h>
+#endif
+#if defined(HAVE_ARPA_NAMESER_H)
+#include <arpa/nameser.h>
+#endif
+#include <netdb.h>
+#if defined(HAVE_RESOLV_H)
+#ifdef _SX
+#include <stdio.h>
+#endif
+#include <resolv.h>
+#endif
+#include <unistd.h>
+#elif defined(__VMS )
+#include <socket.h>
+#include <inet.h>
+#include <in.h>
+#include <netdb.h>
+#else
+#include <winsock2.h>
+#include <io.h>
+#endif
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <ctype.h>
+
+#ifdef SOCKS5
+#include <socks.h>
+#endif
+
+#include "addrinfo.h"
+#include "sockport.h"
+
+#if defined(__KAME__) && defined(INET6)
+# define FAITH
+#endif
+
+#define SUCCESS 0
+#define ANY 0
+#define YES 1
+#define NO  0
+
+#ifdef FAITH
+static int translate = NO;
+static struct in6_addr faith_prefix = IN6ADDR_ANY_INIT;
+#endif
+
+static const char in_addrany[] = { 0, 0, 0, 0 };
+static const char in6_addrany[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+static const char in_loopback[] = { 127, 0, 0, 1 }; 
+static const char in6_loopback[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
+};
+
+struct sockinet {
+	u_char	si_len;
+	u_char	si_family;
+	u_short	si_port;
+};
+
+static const struct afd {
+	int a_af;
+	int a_addrlen;
+	int a_socklen;
+	int a_off;
+	const char *a_addrany;
+	const char *a_loopback;	
+} afdl [] = {
+#ifdef INET6
+#define N_INET6 0
+	{PF_INET6, sizeof(struct in6_addr),
+	 sizeof(struct sockaddr_in6),
+	 offsetof(struct sockaddr_in6, sin6_addr),
+	 in6_addrany, in6_loopback},
+#define N_INET  1
+#else
+#define N_INET  0
+#endif
+	{PF_INET, sizeof(struct in_addr),
+	 sizeof(struct sockaddr_in),
+	 offsetof(struct sockaddr_in, sin_addr),
+	 in_addrany, in_loopback},
+	{0, 0, 0, 0, NULL, NULL},
+};
+
+#ifdef INET6
+#define PTON_MAX	16
+#else
+#define PTON_MAX	4
+#endif
+
+static int get_name __P((const char *, const struct afd *,
+			  struct addrinfo **, char *, struct addrinfo *,
+			  int));
+static int get_addr __P((const char *, int, struct addrinfo **,
+			struct addrinfo *, int));
+static int str_isnumber __P((const char *));
+	
+static const char *const ai_errlist[] = {
+	"success.",
+	"address family for hostname not supported.",	/* EAI_ADDRFAMILY */
+	"temporary failure in name resolution.",	/* EAI_AGAIN      */
+	"invalid value for ai_flags.",		       	/* EAI_BADFLAGS   */
+	"non-recoverable failure in name resolution.", 	/* EAI_FAIL       */
+	"ai_family not supported.",			/* EAI_FAMILY     */
+	"memory allocation failure.", 			/* EAI_MEMORY     */
+	"no address associated with hostname.", 	/* EAI_NODATA     */
+	"hostname nor servname provided, or not known.",/* EAI_NONAME     */
+	"servname not supported for ai_socktype.",	/* EAI_SERVICE    */
+	"ai_socktype not supported.", 			/* EAI_SOCKTYPE   */
+	"system error returned in errno.", 		/* EAI_SYSTEM     */
+	"invalid value for hints.",			/* EAI_BADHINTS	  */
+	"resolved protocol is unknown.",		/* EAI_PROTOCOL   */
+	"unknown error.", 				/* EAI_MAX        */
+};
+
+#define GET_CANONNAME(ai, str) \
+if (pai->ai_flags & AI_CANONNAME) {\
+	if (((ai)->ai_canonname = (char *)malloc(strlen(str) + 1)) != NULL) {\
+		strcpy((ai)->ai_canonname, (str));\
+	} else {\
+		error = EAI_MEMORY;\
+		goto free;\
+	}\
+}
+
+#define GET_AI(ai, afd, addr, port) {\
+	char *p;\
+	if (((ai) = (struct addrinfo *)malloc(sizeof(struct addrinfo) +\
+					      ((afd)->a_socklen)))\
+	    == NULL) {\
+		error = EAI_MEMORY;\
+		goto free;\
+	}\
+	memcpy(ai, pai, sizeof(struct addrinfo));\
+	(ai)->ai_addr = (struct sockaddr *)((ai) + 1);\
+	memset((ai)->ai_addr, 0, (afd)->a_socklen);\
+	SET_SA_LEN((ai)->ai_addr, (ai)->ai_addrlen = (afd)->a_socklen);\
+	(ai)->ai_addr->sa_family = (ai)->ai_family = (afd)->a_af;\
+	((struct sockinet *)(ai)->ai_addr)->si_port = port;\
+	p = (char *)((ai)->ai_addr);\
+	memcpy(p + (afd)->a_off, (addr), (afd)->a_addrlen);\
+}
+
+#define ERR(err) { error = (err); goto bad; }
+
+#if defined __UCLIBC__
+const
+#endif
+char *
+gai_strerror(ecode)
+	int ecode;
+{
+	if (ecode < 0 || ecode > EAI_MAX)
+		ecode = EAI_MAX;
+	return (char *)ai_errlist[ecode];
+}
+
+void
+freeaddrinfo(ai)
+	struct addrinfo *ai;
+{
+	struct addrinfo *next;
+
+	do {
+		next = ai->ai_next;
+		if (ai->ai_canonname)
+			free(ai->ai_canonname);
+		/* no need to free(ai->ai_addr) */
+		free(ai);
+	} while ((ai = next) != NULL);
+}
+
+static int
+str_isnumber(p)
+	const char *p;
+{
+	char *q = (char *)p;
+	while (*q) {
+		if (! isdigit(*q))
+			return NO;
+		q++;
+	}
+	return YES;
+}
+
+#ifndef HAVE_INET_PTON
+
+static int
+inet_pton(af, hostname, pton)
+	int af;
+	const char *hostname;
+	void *pton;
+{
+	struct in_addr in;
+
+#ifdef HAVE_INET_ATON
+	if (!inet_aton(hostname, &in))
+	    return 0;
+#else
+	int d1, d2, d3, d4;
+	char ch;
+
+	if (sscanf(hostname, "%d.%d.%d.%d%c", &d1, &d2, &d3, &d4, &ch) == 4 &&
+	    0 <= d1 && d1 <= 255 && 0 <= d2 && d2 <= 255 &&
+	    0 <= d3 && d3 <= 255 && 0 <= d4 && d4 <= 255) {
+	    in.s_addr = htonl(
+		((long) d1 << 24) | ((long) d2 << 16) |
+		((long) d3 << 8) | ((long) d4 << 0));
+	}
+	else {
+	    return 0;
+	}
+#endif
+	memcpy(pton, &in, sizeof(in));
+	return 1;
+}
+#endif
+
+int
+getaddrinfo(hostname, servname, hints, res)
+	const char *hostname, *servname;
+	const struct addrinfo *hints;
+	struct addrinfo **res;
+{
+	struct addrinfo sentinel;
+	struct addrinfo *top = NULL;
+	struct addrinfo *cur;
+	int i, error = 0;
+	char pton[PTON_MAX];
+	struct addrinfo ai;
+	struct addrinfo *pai;
+	u_short port;
+
+#ifdef FAITH
+	static int firsttime = 1;
+
+	if (firsttime) {
+		/* translator hack */
+		{
+			char *q = getenv("GAI");
+			if (q && inet_pton(AF_INET6, q, &faith_prefix) == 1)
+				translate = YES;
+		}
+		firsttime = 0;
+	}
+#endif
+
+	/* initialize file static vars */
+	sentinel.ai_next = NULL;
+	cur = &sentinel;
+	pai = &ai;
+	pai->ai_flags = 0;
+	pai->ai_family = PF_UNSPEC;
+	pai->ai_socktype = ANY;
+	pai->ai_protocol = ANY;
+	pai->ai_addrlen = 0;
+	pai->ai_canonname = NULL;
+	pai->ai_addr = NULL;
+	pai->ai_next = NULL;
+	port = ANY;
+	
+	if (hostname == NULL && servname == NULL)
+		return EAI_NONAME;
+	if (hints) {
+		/* error check for hints */
+		if (hints->ai_addrlen || hints->ai_canonname ||
+		    hints->ai_addr || hints->ai_next)
+			ERR(EAI_BADHINTS); /* xxx */
+		if (hints->ai_flags & ~AI_MASK)
+			ERR(EAI_BADFLAGS);
+		switch (hints->ai_family) {
+		case PF_UNSPEC:
+		case PF_INET:
+#ifdef INET6
+		case PF_INET6:
+#endif
+			break;
+		default:
+			ERR(EAI_FAMILY);
+		}
+		memcpy(pai, hints, sizeof(*pai));
+		switch (pai->ai_socktype) {
+		case ANY:
+			switch (pai->ai_protocol) {
+			case ANY:
+				break;
+			case IPPROTO_UDP:
+				pai->ai_socktype = SOCK_DGRAM;
+				break;
+			case IPPROTO_TCP:
+				pai->ai_socktype = SOCK_STREAM;
+				break;
+			default:
+#if defined(SOCK_RAW)
+				pai->ai_socktype = SOCK_RAW;
+#endif
+				break;
+			}
+			break;
+#if defined(SOCK_RAW)
+		case SOCK_RAW:
+			break;
+#endif
+		case SOCK_DGRAM:
+			if (pai->ai_protocol != IPPROTO_UDP &&
+			    pai->ai_protocol != ANY)
+				ERR(EAI_BADHINTS);	/*xxx*/
+			pai->ai_protocol = IPPROTO_UDP;
+			break;
+		case SOCK_STREAM:
+			if (pai->ai_protocol != IPPROTO_TCP &&
+			    pai->ai_protocol != ANY)
+				ERR(EAI_BADHINTS);	/*xxx*/
+			pai->ai_protocol = IPPROTO_TCP;
+			break;
+		default:
+			ERR(EAI_SOCKTYPE);
+			break;
+		}
+	}
+
+	/*
+	 * service port
+	 */
+	if (servname) {
+		if (str_isnumber(servname)) {
+			if (pai->ai_socktype == ANY) {
+				/* caller accept *ANY* socktype */
+				pai->ai_socktype = SOCK_DGRAM;
+				pai->ai_protocol = IPPROTO_UDP;
+			}
+			port = htons((unsigned short)atoi(servname));
+		} else {
+			struct servent *sp;
+			char *proto;
+
+			proto = NULL;
+			switch (pai->ai_socktype) {
+			case ANY:
+				proto = NULL;
+				break;
+			case SOCK_DGRAM:
+				proto = "udp";
+				break;
+			case SOCK_STREAM:
+				proto = "tcp";
+				break;
+			default:
+				fprintf(stderr, "panic!\n");
+				break;
+			}
+			if ((sp = getservbyname((char*)servname, proto)) == NULL)
+				ERR(EAI_SERVICE);
+			port = sp->s_port;
+			if (pai->ai_socktype == ANY)
+				if (strcmp(sp->s_proto, "udp") == 0) {
+					pai->ai_socktype = SOCK_DGRAM;
+					pai->ai_protocol = IPPROTO_UDP;
+				} else if (strcmp(sp->s_proto, "tcp") == 0) {
+					pai->ai_socktype = SOCK_STREAM;
+					pai->ai_protocol = IPPROTO_TCP;
+				} else
+					ERR(EAI_PROTOCOL);	/*xxx*/
+		}
+	}
+	
+	/*
+	 * hostname == NULL.
+	 * passive socket -> anyaddr (0.0.0.0 or ::)
+	 * non-passive socket -> localhost (127.0.0.1 or ::1)
+	 */
+	if (hostname == NULL) {
+		const struct afd *afd;
+		int s;
+
+		for (afd = &afdl[0]; afd->a_af; afd++) {
+			if (!(pai->ai_family == PF_UNSPEC
+			   || pai->ai_family == afd->a_af)) {
+				continue;
+			}
+
+			/*
+			 * filter out AFs that are not supported by the kernel
+			 * XXX errno?
+			 */
+			s = socket(afd->a_af, SOCK_DGRAM, 0);
+			if (s < 0)
+				continue;
+#if defined(HAVE_CLOSESOCKET)
+			closesocket(s);
+#else
+			close(s);
+#endif
+
+			if (pai->ai_flags & AI_PASSIVE) {
+				GET_AI(cur->ai_next, afd, afd->a_addrany, port);
+				/* xxx meaningless?
+				 * GET_CANONNAME(cur->ai_next, "anyaddr");
+				 */
+			} else {
+				GET_AI(cur->ai_next, afd, afd->a_loopback,
+					port);
+				/* xxx meaningless?
+				 * GET_CANONNAME(cur->ai_next, "localhost");
+				 */
+			}
+			cur = cur->ai_next;
+		}
+		top = sentinel.ai_next;
+		if (top)
+			goto good;
+		else
+			ERR(EAI_FAMILY);
+	}
+	
+	/* hostname as numeric name */
+	for (i = 0; afdl[i].a_af; i++) {
+		if (inet_pton(afdl[i].a_af, hostname, pton)) {
+			u_long v4a;
+#ifdef INET6
+			u_char pfx;
+#endif
+
+			switch (afdl[i].a_af) {
+			case AF_INET:
+				v4a = ((struct in_addr *)pton)->s_addr;
+				if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
+					pai->ai_flags &= ~AI_CANONNAME;
+				v4a >>= IN_CLASSA_NSHIFT;
+				if (v4a == 0 || v4a == IN_LOOPBACKNET)
+					pai->ai_flags &= ~AI_CANONNAME;
+				break;
+#ifdef INET6
+			case AF_INET6:
+#ifdef HAVE_ADDR8
+				pfx = ((struct in6_addr *)pton)->s6_addr8[0];
+#else
+				pfx = ((struct in6_addr *)pton)->s6_addr[0];
+#endif
+				if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
+					pai->ai_flags &= ~AI_CANONNAME;
+				break;
+#endif
+			}
+			
+			if (pai->ai_family == afdl[i].a_af ||
+			    pai->ai_family == PF_UNSPEC) {
+				if (! (pai->ai_flags & AI_CANONNAME)) {
+					GET_AI(top, &afdl[i], pton, port);
+					goto good;
+				}
+				/*
+				 * if AI_CANONNAME and if reverse lookup
+				 * fail, return ai anyway to pacify
+				 * calling application.
+				 *
+				 * XXX getaddrinfo() is a name->address
+				 * translation function, and it looks strange
+				 * that we do addr->name translation here.
+				 */
+				get_name(pton, &afdl[i], &top, pton, pai, port);
+				goto good;
+			} else 
+				ERR(EAI_FAMILY);	/*xxx*/
+		}
+	}
+
+	if (pai->ai_flags & AI_NUMERICHOST)
+		ERR(EAI_NONAME);
+
+	/* hostname as alphabetical name */
+	error = get_addr(hostname, pai->ai_family, &top, pai, port);
+	if (error == 0) {
+		if (top) {
+ good:
+			*res = top;
+			return SUCCESS;
+		} else
+			error = EAI_FAIL;
+	}
+ free:
+	if (top)
+		freeaddrinfo(top);
+ bad:
+	*res = NULL;
+	return error;
+}
+
+static int
+get_name(addr, afd, res, numaddr, pai, port0)
+	const char *addr;
+	const struct afd *afd;
+	struct addrinfo **res;
+	char *numaddr;
+	struct addrinfo *pai;
+	int port0;
+{
+	u_short port = port0 & 0xffff;
+	struct hostent *hp;
+	struct addrinfo *cur;
+	int error = 0;
+#ifdef INET6
+	int h_error;
+#endif
+
+#ifdef INET6
+	hp = getipnodebyaddr(addr, afd->a_addrlen, afd->a_af, &h_error);
+#else
+	hp = gethostbyaddr((char*)addr, afd->a_addrlen, AF_INET);
+#endif
+	if (hp && hp->h_name && hp->h_name[0] && hp->h_addr_list[0]) {
+		GET_AI(cur, afd, hp->h_addr_list[0], port);
+		GET_CANONNAME(cur, hp->h_name);
+	} else
+		GET_AI(cur, afd, numaddr, port);
+	
+#ifdef INET6
+	if (hp)
+		freehostent(hp);
+#endif
+	*res = cur;
+	return SUCCESS;
+ free:
+	if (cur)
+		freeaddrinfo(cur);
+#ifdef INET6
+	if (hp)
+		freehostent(hp);
+#endif
+ /* bad: */
+	*res = NULL;
+	return error;
+}
+
+static int
+get_addr(hostname, af, res, pai, port0)
+	const char *hostname;
+	int af;
+	struct addrinfo **res;
+	struct addrinfo *pai;
+	int port0;
+{
+	u_short port = port0 & 0xffff;
+	struct addrinfo sentinel;
+	struct hostent *hp;
+	struct addrinfo *top, *cur;
+	const struct afd *afd;
+	int i, error = 0, h_error;
+	char *ap;
+
+	top = NULL;
+	sentinel.ai_next = NULL;
+	cur = &sentinel;
+#ifdef INET6
+	if (af == AF_UNSPEC) {
+		hp = getipnodebyname(hostname, AF_INET6,
+				AI_ADDRCONFIG|AI_ALL|AI_V4MAPPED, &h_error);
+	} else
+		hp = getipnodebyname(hostname, af, AI_ADDRCONFIG, &h_error);
+#else
+	hp = gethostbyname((char*)hostname);
+	h_error = h_errno;
+#endif
+	if (hp == NULL) {
+		switch (h_error) {
+		case HOST_NOT_FOUND:
+		case NO_DATA:
+			error = EAI_NODATA;
+			break;
+		case TRY_AGAIN:
+			error = EAI_AGAIN;
+			break;
+		case NO_RECOVERY:
+		default:
+			error = EAI_FAIL;
+			break;
+		}
+		goto bad;
+	}
+
+	if ((hp->h_name == NULL) || (hp->h_name[0] == 0) ||
+	    (hp->h_addr_list[0] == NULL))
+		ERR(EAI_FAIL);
+	
+	for (i = 0; (ap = hp->h_addr_list[i]) != NULL; i++) {
+		switch (af) {
+#ifdef INET6
+		case AF_INET6:
+			afd = &afdl[N_INET6];
+			break;
+#endif
+#ifndef INET6
+		default:	/* AF_UNSPEC */
+#endif
+		case AF_INET:
+			afd = &afdl[N_INET];
+			break;
+#ifdef INET6
+		default:	/* AF_UNSPEC */
+			if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)ap)) {
+				ap += sizeof(struct in6_addr) -
+					sizeof(struct in_addr);
+				afd = &afdl[N_INET];
+			} else
+				afd = &afdl[N_INET6];
+			break;
+#endif
+		}
+#ifdef FAITH
+		if (translate && afd->a_af == AF_INET) {
+			struct in6_addr *in6;
+
+			GET_AI(cur->ai_next, &afdl[N_INET6], ap, port);
+			in6 = &((struct sockaddr_in6 *)cur->ai_next->ai_addr)->sin6_addr;
+			memcpy(&in6->s6_addr32[0], &faith_prefix,
+			    sizeof(struct in6_addr) - sizeof(struct in_addr));
+			memcpy(&in6->s6_addr32[3], ap, sizeof(struct in_addr));
+		} else
+#endif /* FAITH */
+		GET_AI(cur->ai_next, afd, ap, port);
+		if (cur == &sentinel) {
+			top = cur->ai_next;
+			GET_CANONNAME(top, hp->h_name);
+		}
+		cur = cur->ai_next;
+	}
+#ifdef INET6
+	freehostent(hp);
+#endif
+	*res = top;
+	return SUCCESS;
+ free:
+	if (top)
+		freeaddrinfo(top);
+#ifdef INET6
+	if (hp)
+		freehostent(hp);
+#endif
+ bad:
+	*res = NULL;
+	return error;
+}
diff --git a/ruby_1_8_6/ext/socket/getnameinfo.c b/ruby_1_8_6/ext/socket/getnameinfo.c
new file mode 100644
index 0000000000..66f7e8818a
--- /dev/null
+++ b/ruby_1_8_6/ext/socket/getnameinfo.c
@@ -0,0 +1,265 @@
+/*
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Issues to be discussed:
+ * - Thread safe-ness must be checked
+ * - Return values.  There seems to be no standard for return value (RFC2133)
+ *   but INRIA implementation returns EAI_xxx defined for getaddrinfo().
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include <sys/types.h>
+#ifndef _WIN32
+#if defined(__BEOS__)
+# include <net/socket.h>
+#else
+# include <sys/socket.h>
+#endif
+#include <netinet/in.h>
+#if defined(HAVE_ARPA_INET_H)
+#include <arpa/inet.h>
+#endif
+#if defined(HAVE_ARPA_NAMESER_H)
+#include <arpa/nameser.h>
+#endif
+#include <netdb.h>
+#if defined(HAVE_RESOLV_H)
+#include <resolv.h>
+#endif
+#endif
+#ifdef _WIN32
+#include <winsock2.h>
+#define snprintf _snprintf
+#endif
+
+#include <string.h>
+#include <stddef.h>
+
+#ifdef SOCKS5
+#include <socks.h>
+#endif
+
+#include "addrinfo.h"
+#include "sockport.h"
+
+#define SUCCESS 0
+#define ANY 0
+#define YES 1
+#define NO  0
+
+struct sockinet {
+	u_char	si_len;
+	u_char	si_family;
+	u_short	si_port;
+};
+
+static struct afd {
+	int a_af;
+	int a_addrlen;
+	int a_socklen;
+	int a_off;
+} afdl [] = {
+#ifdef INET6
+#define N_INET6 0
+	{PF_INET6, sizeof(struct in6_addr),
+	 sizeof(struct sockaddr_in6),
+	 offsetof(struct sockaddr_in6, sin6_addr)},
+#define N_INET  1
+#else
+#define N_INET  0
+#endif
+	{PF_INET, sizeof(struct in_addr),
+	 sizeof(struct sockaddr_in),
+	 offsetof(struct sockaddr_in, sin_addr)},
+	{0, 0, 0, 0},
+};
+
+#define ENI_NOSOCKET 	0
+#define ENI_NOSERVNAME	1
+#define ENI_NOHOSTNAME	2
+#define ENI_MEMORY	3
+#define ENI_SYSTEM	4
+#define ENI_FAMILY	5
+#define ENI_SALEN	6
+
+#ifndef HAVE_INET_NTOP
+static const char *
+inet_ntop(af, addr, numaddr, numaddr_len)
+	int af;
+	const void *addr;
+	char *numaddr;
+	size_t numaddr_len;
+{
+#ifdef HAVE_INET_NTOA
+	struct in_addr in;
+	memcpy(&in.s_addr, addr, sizeof(in.s_addr));
+	snprintf(numaddr, numaddr_len, "%s", inet_ntoa(in));
+#else
+	unsigned long x = ntohl(*(unsigned long*)addr);
+	snprintf(numaddr, numaddr_len, "%d.%d.%d.%d",
+		 (int) (x>>24) & 0xff, (int) (x>>16) & 0xff,
+		 (int) (x>> 8) & 0xff, (int) (x>> 0) & 0xff);
+#endif
+	return numaddr;
+}
+#endif
+
+int
+getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
+	const struct sockaddr *sa;
+	size_t salen;
+	char *host;
+	size_t hostlen;
+	char *serv;
+	size_t servlen;
+	int flags;
+{
+	struct afd *afd;
+	struct servent *sp;
+	struct hostent *hp;
+	u_short port;
+	int family, len, i;
+	char *addr, *p;
+	u_long v4a;
+#ifdef INET6
+	u_char pfx;
+#endif
+	int h_error;
+	char numserv[512];
+	char numaddr[512];
+
+	if (sa == NULL)
+		return ENI_NOSOCKET;
+
+	len = SA_LEN(sa);
+	if (len != salen) return ENI_SALEN;
+	
+	family = sa->sa_family;
+	for (i = 0; afdl[i].a_af; i++)
+		if (afdl[i].a_af == family) {
+			afd = &afdl[i];
+			goto found;
+		}
+	return ENI_FAMILY;
+	
+ found:
+	if (len != afd->a_socklen) return ENI_SALEN;
+	
+	port = ((struct sockinet *)sa)->si_port; /* network byte order */
+	addr = (char *)sa + afd->a_off;
+
+	if (serv == NULL || servlen == 0) {
+		/* what we should do? */
+	} else if (flags & NI_NUMERICSERV) {
+		snprintf(numserv, sizeof(numserv), "%d", ntohs(port));
+		if (strlen(numserv) + 1 > servlen)
+			return ENI_MEMORY;
+		strcpy(serv, numserv);
+	} else {
+#if defined(HAVE_GETSERVBYPORT)
+		sp = getservbyport(port, (flags & NI_DGRAM) ? "udp" : "tcp");
+		if (sp) {
+			if (strlen(sp->s_name) + 1 > servlen)
+				return ENI_MEMORY;
+			strcpy(serv, sp->s_name);
+		} else
+			return ENI_NOSERVNAME;
+#else
+		return ENI_NOSERVNAME;
+#endif
+	}
+
+	switch (sa->sa_family) {
+	case AF_INET:
+		v4a = ntohl(((struct sockaddr_in *)sa)->sin_addr.s_addr);
+		if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
+			flags |= NI_NUMERICHOST;
+		v4a >>= IN_CLASSA_NSHIFT;
+		if (v4a == 0)
+			flags |= NI_NUMERICHOST;			
+		break;
+#ifdef INET6
+	case AF_INET6:
+#ifdef HAVE_ADDR8
+		pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr8[0];
+#else
+		pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr[0];
+#endif
+		if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
+			flags |= NI_NUMERICHOST;
+		break;
+#endif
+	}
+	if (host == NULL || hostlen == 0) {
+		/* what should we do? */
+	} else if (flags & NI_NUMERICHOST) {
+		if (inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr))
+		    == NULL)
+			return ENI_SYSTEM;
+		if (strlen(numaddr) > hostlen)
+			return ENI_MEMORY;
+		strcpy(host, numaddr);
+	} else {
+#ifdef INET6
+		hp = getipnodebyaddr(addr, afd->a_addrlen, afd->a_af, &h_error);
+#else
+		hp = gethostbyaddr(addr, afd->a_addrlen, afd->a_af);
+		h_error = h_errno;
+#endif
+
+		if (hp) {
+			if (flags & NI_NOFQDN) {
+				p = strchr(hp->h_name, '.');
+				if (p) *p = '\0';
+			}
+			if (strlen(hp->h_name) + 1 > hostlen) {
+#ifdef INET6
+				freehostent(hp);
+#endif
+				return ENI_MEMORY;
+			}
+			strcpy(host, hp->h_name);
+#ifdef INET6
+			freehostent(hp);
+#endif
+		} else {
+			if (flags & NI_NAMEREQD)
+				return ENI_NOHOSTNAME;
+			if (inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr))
+			    == NULL)
+				return ENI_NOHOSTNAME;
+			if (strlen(numaddr) > hostlen)
+				return ENI_MEMORY;
+			strcpy(host, numaddr);
+		}
+	}
+	return SUCCESS;
+}
diff --git a/ruby_1_8_6/ext/socket/socket.c b/ruby_1_8_6/ext/socket/socket.c
new file mode 100644
index 0000000000..4c23a1c178
--- /dev/null
+++ b/ruby_1_8_6/ext/socket/socket.c
@@ -0,0 +1,4701 @@
+/************************************************
+
+  socket.c -
+
+  $Author$
+  $Date$
+  created at: Thu Mar 31 12:21:29 JST 1994
+
+  Copyright (C) 1993-2001 Yukihiro Matsumoto
+
+************************************************/
+
+#include "ruby.h"
+#include "rubyio.h"
+#include "rubysig.h"
+#include "util.h"
+#include <stdio.h>
+#include <sys/types.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+
+#ifndef _WIN32
+#if defined(__BEOS__)
+# include <net/socket.h>
+#else
+# include <sys/socket.h>
+# define pseudo_AF_FTIP pseudo_AF_RTIP	/* workaround for NetBSD and etc. */
+#endif
+#include <netinet/in.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+# include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
+# include <netinet/tcp.h>
+#endif
+#ifdef HAVE_NETINET_UDP_H
+# include <netinet/udp.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+#include <netdb.h>
+#endif
+#include <errno.h>
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
+#if defined(HAVE_FCNTL)
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#endif
+#ifndef EWOULDBLOCK
+#define EWOULDBLOCK EAGAIN
+#endif
+#ifndef HAVE_GETADDRINFO
+# include "addrinfo.h"
+#endif
+#include "sockport.h"
+
+#if defined(__vms)
+#include <tcp.h>
+#endif
+
+static int do_not_reverse_lookup = 0;
+
+VALUE rb_cBasicSocket;
+VALUE rb_cIPSocket;
+VALUE rb_cTCPSocket;
+VALUE rb_cTCPServer;
+VALUE rb_cUDPSocket;
+#ifdef AF_UNIX
+VALUE rb_cUNIXSocket;
+VALUE rb_cUNIXServer;
+#endif
+VALUE rb_cSocket;
+
+static VALUE rb_eSocket;
+
+#ifdef SOCKS
+VALUE rb_cSOCKSSocket;
+#ifdef SOCKS5
+#include <socks.h>
+#else
+void SOCKSinit();
+int Rconnect();
+#endif
+#endif
+
+#define INET_CLIENT 0
+#define INET_SERVER 1
+#define INET_SOCKS  2
+
+#ifndef HAVE_SOCKADDR_STORAGE
+/*
+ * RFC 2553: protocol-independent placeholder for socket addresses
+ */
+#define _SS_MAXSIZE	128
+#define _SS_ALIGNSIZE	(sizeof(double))
+#define _SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(unsigned char) * 2)
+#define _SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(unsigned char) * 2 - \
+				_SS_PAD1SIZE - _SS_ALIGNSIZE)
+
+struct sockaddr_storage {
+#ifdef HAVE_SA_LEN
+	unsigned char ss_len;		/* address length */
+	unsigned char ss_family;	/* address family */
+#else
+	unsigned short ss_family;
+#endif
+	char	__ss_pad1[_SS_PAD1SIZE];
+	double	__ss_align;	/* force desired structure storage alignment */
+	char	__ss_pad2[_SS_PAD2SIZE];
+};
+#endif
+
+#if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6))
+#define LOOKUP_ORDERS		3
+static int lookup_order_table[LOOKUP_ORDERS] = {
+#if defined(LOOKUP_ORDER_HACK_INET)
+    PF_INET, PF_INET6, PF_UNSPEC,
+#elif defined(LOOKUP_ORDER_HACK_INET6)
+    PF_INET6, PF_INET, PF_UNSPEC,
+#else
+    /* should not happen */
+#endif
+};
+
+static int
+ruby_getaddrinfo(nodename, servname, hints, res)
+     char *nodename;
+     char *servname;
+     struct addrinfo *hints;
+     struct addrinfo **res;
+{
+    struct addrinfo tmp_hints;
+    int i, af, error;
+
+    if (hints->ai_family != PF_UNSPEC) {
+	return getaddrinfo(nodename, servname, hints, res);
+    }
+
+    for (i = 0; i < LOOKUP_ORDERS; i++) {
+	af = lookup_order_table[i];
+	MEMCPY(&tmp_hints, hints, struct addrinfo, 1);
+	tmp_hints.ai_family = af;
+	error = getaddrinfo(nodename, servname, &tmp_hints, res);
+	if (error) {
+	    if (tmp_hints.ai_family == PF_UNSPEC) {
+		break;
+	    }
+	}
+	else {
+	    break;
+	}
+    }
+
+    return error;
+}
+#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo((node),(serv),(hints),(res))
+#endif
+
+#if defined(_AIX)
+static int
+ruby_getaddrinfo__aix(nodename, servname, hints, res)
+     char *nodename;
+     char *servname;
+     struct addrinfo *hints;
+     struct addrinfo **res;
+{
+    int error = getaddrinfo(nodename, servname, hints, res);
+    struct addrinfo *r;
+    if (error)
+	return error;
+    for (r = *res; r != NULL; r = r->ai_next) {
+	if (r->ai_addr->sa_family == 0)
+	    r->ai_addr->sa_family = r->ai_family;
+	if (r->ai_addr->sa_len == 0)
+	    r->ai_addr->sa_len = r->ai_addrlen;
+    }
+    return 0;
+}
+#undef getaddrinfo
+#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res))
+static int
+ruby_getnameinfo__aix(sa, salen, host, hostlen, serv, servlen, flags)
+     const struct sockaddr *sa;
+     size_t salen;
+     char *host;
+     size_t hostlen;
+     char *serv;
+     size_t servlen;
+     int flags;
+{
+  struct sockaddr_in6 *sa6;
+  u_int32_t *a6;
+
+  if (sa->sa_family == AF_INET6) {
+    sa6 = (struct sockaddr_in6 *)sa;
+    a6 = sa6->sin6_addr.u6_addr.u6_addr32;
+
+    if (a6[0] == 0 && a6[1] == 0 && a6[2] == 0 && a6[3] == 0) {
+      strncpy(host, "::", hostlen);
+      snprintf(serv, servlen, "%d", sa6->sin6_port);
+      return 0;
+    }
+  }
+  return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
+}
+#undef getnameinfo
+#define getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
+            ruby_getnameinfo__aix((sa), (salen), (host), (hostlen), (serv), (servlen), (flags))
+#ifndef CMSG_SPACE
+# define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
+#endif
+#ifndef CMSG_LEN
+# define CMSG_LEN(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
+#endif
+#endif
+
+#ifdef HAVE_CLOSESOCKET
+#undef close
+#define close closesocket
+#endif
+
+static VALUE
+init_sock(sock, fd)
+    VALUE sock;
+    int fd;
+{
+    OpenFile *fp;
+
+    MakeOpenFile(sock, fp);
+    fp->f = rb_fdopen(fd, "r");
+    fp->f2 = rb_fdopen(fd, "w");
+    fp->mode = FMODE_READWRITE;
+    rb_io_synchronized(fp);
+
+    return sock;
+}
+
+static VALUE
+bsock_s_for_fd(klass, fd)
+    VALUE klass, fd;
+{
+    OpenFile *fptr;
+    VALUE sock = init_sock(rb_obj_alloc(klass), NUM2INT(fd));
+
+    GetOpenFile(sock, fptr);
+
+    return sock;
+}
+
+static VALUE
+bsock_shutdown(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    VALUE howto;
+    int how;
+    OpenFile *fptr;
+
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't shutdown socket");
+    }
+    rb_scan_args(argc, argv, "01", &howto);
+    if (howto == Qnil)
+	how = 2;
+    else {
+	how = NUM2INT(howto);
+	if (how < 0 || 2 < how) {
+	    rb_raise(rb_eArgError, "`how' should be either 0, 1, 2");
+	}
+    }
+    GetOpenFile(sock, fptr);
+    if (shutdown(fileno(fptr->f), how) == -1)
+	rb_sys_fail(0);
+
+    return INT2FIX(0);
+}
+
+static VALUE
+bsock_close_read(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
+    }
+    GetOpenFile(sock, fptr);
+    shutdown(fileno(fptr->f), 0);
+    if (!(fptr->mode & FMODE_WRITABLE)) {
+	return rb_io_close(sock);
+    }
+    fptr->mode &= ~FMODE_READABLE;
+
+    return Qnil;
+}
+
+static VALUE
+bsock_close_write(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
+    }
+    GetOpenFile(sock, fptr);
+    if (!(fptr->mode & FMODE_READABLE)) {
+	return rb_io_close(sock);
+    }
+    shutdown(fileno(fptr->f2), 1);
+    fptr->mode &= ~FMODE_WRITABLE;
+
+    return Qnil;
+}
+
+/*
+ * Document-method: setsockopt
+ * call-seq: setsockopt(level, optname, optval)
+ *
+ * Sets a socket option. These are protocol and system specific, see your
+ * local sytem documentation for details.
+ *
+ * === Parameters
+ * * +level+ is an integer, usually one of the SOL_ constants such as
+ *   Socket::SOL_SOCKET, or a protocol level.
+ * * +optname+ is an integer, usually one of the SO_ constants, such
+ *   as Socket::SO_REUSEADDR.
+ * * +optval+ is the value of the option, it is passed to the underlying
+ *   setsockopt() as a pointer to a certain number of bytes. How this is
+ *   done depends on the type:
+ *   - Fixnum: value is assigned to an int, and a pointer to the int is
+ *     passed, with length of sizeof(int).
+ *   - true or false: 1 or 0 (respectively) is assigned to an int, and the
+ *     int is passed as for a Fixnum. Note that +false+ must be passed,
+ *     not +nil+.
+ *   - String: the string's data and length is passed to the socket.
+ *
+ * === Examples
+ *
+ * Some socket options are integers with boolean values, in this case
+ * #setsockopt could be called like this:
+ *   sock.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
+ *
+ * Some socket options are integers with numeric values, in this case
+ * #setsockopt could be called like this:
+ *   sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_TTL, 255)
+ *
+ * Option values may be structs. Passing them can be complex as it involves
+ * examining your system headers to determine the correct definition. An
+ * example is an +ip_mreq+, which may be defined in your system headers as:
+ *   struct ip_mreq {
+ *     struct  in_addr imr_multiaddr;
+ *     struct  in_addr imr_interface;
+ *   };
+ * 
+ * In this case #setsockopt could be called like this:
+ *   optval =  IPAddr.new("224.0.0.251") + Socket::INADDR_ANY
+ *   sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, optval)
+ *
+*/
+static VALUE
+bsock_setsockopt(sock, lev, optname, val)
+    VALUE sock, lev, optname, val;
+{
+    int level, option;
+    OpenFile *fptr;
+    int i;
+    char *v;
+    int vlen;
+
+    rb_secure(2);
+    level = NUM2INT(lev);
+    option = NUM2INT(optname);
+
+    switch (TYPE(val)) {
+      case T_FIXNUM:
+	i = FIX2INT(val);
+	goto numval;
+      case T_FALSE:
+	i = 0;
+	goto numval;
+      case T_TRUE:
+	i = 1;
+      numval:
+	v = (char*)&i; vlen = sizeof(i);
+	break;
+      default:
+	StringValue(val);
+	v = RSTRING(val)->ptr;
+	vlen = RSTRING(val)->len;
+	break;
+    }
+
+    GetOpenFile(sock, fptr);
+    if (setsockopt(fileno(fptr->f), level, option, v, vlen) < 0)
+	rb_sys_fail(fptr->path);
+
+    return INT2FIX(0);
+}
+
+/*
+ * Document-method: getsockopt
+ * call-seq: getsockopt(level, optname)
+ *
+ * Gets a socket option. These are protocol and system specific, see your
+ * local sytem documentation for details. The option is returned as
+ * a String with the data being the binary value of the socket option.
+ *
+ * === Parameters
+ * * +level+ is an integer, usually one of the SOL_ constants such as
+ *   Socket::SOL_SOCKET, or a protocol level.
+ * * +optname+ is an integer, usually one of the SO_ constants, such
+ *   as Socket::SO_REUSEADDR.
+ *
+ * === Examples
+ *
+ * Some socket options are integers with boolean values, in this case
+ * #getsockopt could be called like this:
+ *   optval = sock.getsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR)
+ *   optval = optval.unpack "i"
+ *   reuseaddr = optval[0] == 0 ? false : true
+ *
+ * Some socket options are integers with numeric values, in this case
+ * #getsockopt could be called like this:
+ *   optval = sock.getsockopt(Socket::IPPROTO_IP, Socket::IP_TTL)
+ *   ipttl = optval.unpack("i")[0]
+ *
+ * Option values may be structs. Decoding them can be complex as it involves
+ * examining your system headers to determine the correct definition. An
+ * example is a +struct linger+, which may be defined in your system headers
+ * as:
+ *   struct linger {
+ *     int l_onoff;
+ *     int l_linger;
+ *   };
+ * 
+ * In this case #getsockopt could be called like this:
+ *   optval =  sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER)
+ *   onoff, linger = optval.unpack "ii"
+*/
+static VALUE
+bsock_getsockopt(sock, lev, optname)
+    VALUE sock, lev, optname;
+{
+#if !defined(__BEOS__)
+    int level, option;
+    socklen_t len;
+    char *buf;
+    OpenFile *fptr;
+
+    level = NUM2INT(lev);
+    option = NUM2INT(optname);
+    len = 256;
+    buf = ALLOCA_N(char,len);
+    GetOpenFile(sock, fptr);
+
+    GetOpenFile(sock, fptr);
+    if (getsockopt(fileno(fptr->f), level, option, buf, &len) < 0)
+	rb_sys_fail(fptr->path);
+
+    return rb_str_new(buf, len);
+#else
+    rb_notimplement();
+#endif
+}
+
+static VALUE
+bsock_getsockname(sock)
+    VALUE sock;
+{
+    char buf[1024];
+    socklen_t len = sizeof buf;
+    OpenFile *fptr;
+
+    GetOpenFile(sock, fptr);
+    if (getsockname(fileno(fptr->f), (struct sockaddr*)buf, &len) < 0)
+	rb_sys_fail("getsockname(2)");
+    return rb_str_new(buf, len);
+}
+
+static VALUE
+bsock_getpeername(sock)
+    VALUE sock;
+{
+    char buf[1024];
+    socklen_t len = sizeof buf;
+    OpenFile *fptr;
+
+    GetOpenFile(sock, fptr);
+    if (getpeername(fileno(fptr->f), (struct sockaddr*)buf, &len) < 0)
+	rb_sys_fail("getpeername(2)");
+    return rb_str_new(buf, len);
+}
+
+static VALUE
+bsock_send(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    VALUE mesg, to;
+    VALUE flags;
+    OpenFile *fptr;
+    FILE *f;
+    int fd, n;
+
+    rb_secure(4);
+    rb_scan_args(argc, argv, "21", &mesg, &flags, &to);
+
+    StringValue(mesg);
+    if (!NIL_P(to)) StringValue(to);
+    GetOpenFile(sock, fptr);
+    f = GetWriteFile(fptr);
+    fd = fileno(f);
+    rb_thread_fd_writable(fd);
+  retry:
+    if (!NIL_P(to)) {
+        TRAP_BEG;
+	n = sendto(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
+		   (struct sockaddr*)RSTRING(to)->ptr, RSTRING(to)->len);
+        TRAP_END;
+    }
+    else {
+        TRAP_BEG;
+	n = send(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags));
+        TRAP_END;
+    }
+    if (n < 0) {
+	if (rb_io_wait_writable(fd)) {
+	    goto retry;
+	}
+	rb_sys_fail("send(2)");
+    }
+    return INT2FIX(n);
+}
+
+static VALUE ipaddr _((struct sockaddr*));
+#ifdef HAVE_SYS_UN_H
+static VALUE unixaddr _((struct sockaddr_un*, socklen_t));
+#endif
+
+enum sock_recv_type {
+    RECV_RECV,			/* BasicSocket#recv(no from) */
+    RECV_IP,			/* IPSocket#recvfrom */
+    RECV_UNIX,			/* UNIXSocket#recvfrom */
+    RECV_SOCKET			/* Socket#recvfrom */
+};
+
+static VALUE
+s_recvfrom(sock, argc, argv, from)
+    VALUE sock;
+    int argc;
+    VALUE *argv;
+    enum sock_recv_type from;
+{
+    OpenFile *fptr;
+    VALUE str;
+    char buf[1024];
+    socklen_t alen = sizeof buf;
+    VALUE len, flg;
+    long buflen;
+    long slen;
+    int fd, flags;
+
+    rb_scan_args(argc, argv, "11", &len, &flg);
+
+    if (flg == Qnil) flags = 0;
+    else             flags = NUM2INT(flg);
+    buflen = NUM2INT(len);
+
+    GetOpenFile(sock, fptr);
+    if (rb_read_pending(fptr->f)) {
+	rb_raise(rb_eIOError, "recv for buffered IO");
+    }
+    fd = fileno(fptr->f);
+
+    str = rb_tainted_str_new(0, buflen);
+
+  retry:
+    rb_str_locktmp(str);
+    rb_thread_wait_fd(fd);
+    TRAP_BEG;
+    slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
+    TRAP_END;
+    rb_str_unlocktmp(str);
+
+    if (slen < 0) {
+	if (rb_io_wait_readable(fd)) {
+	    goto retry;
+	}
+	rb_sys_fail("recvfrom(2)");
+    }
+    if (slen < RSTRING(str)->len) {
+	RSTRING(str)->len = slen;
+	RSTRING(str)->ptr[slen] = '\0';
+    }
+    rb_obj_taint(str);
+    switch (from) {
+      case RECV_RECV:
+	return (VALUE)str;
+      case RECV_IP:
+#if 0
+	if (alen != sizeof(struct sockaddr_in)) {
+	    rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
+	}
+#endif
+	if (alen && alen != sizeof(buf)) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */
+	    return rb_assoc_new(str, ipaddr((struct sockaddr*)buf));
+	else
+	    return rb_assoc_new(str, Qnil);
+
+#ifdef HAVE_SYS_UN_H
+      case RECV_UNIX:
+        return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf, alen));
+#endif
+      case RECV_SOCKET:
+	return rb_assoc_new(str, rb_str_new(buf, alen));
+      default:
+	rb_bug("s_recvfrom called with bad value");
+    }
+}
+
+static VALUE
+s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
+{
+    OpenFile *fptr;
+    VALUE str;
+    char buf[1024];
+    socklen_t alen = sizeof buf;
+    VALUE len, flg;
+    long buflen;
+    long slen;
+    int fd, flags;
+    VALUE addr = Qnil;
+
+    rb_scan_args(argc, argv, "11", &len, &flg);
+
+    if (flg == Qnil) flags = 0;
+    else             flags = NUM2INT(flg);
+    buflen = NUM2INT(len);
+
+#ifdef MSG_DONTWAIT
+    /* MSG_DONTWAIT avoids the race condition between fcntl and recvfrom.
+       It is not portable, though. */
+    flags |= MSG_DONTWAIT;
+#endif
+
+    GetOpenFile(sock, fptr);
+    if (rb_read_pending(fptr->f)) {
+	rb_raise(rb_eIOError, "recvfrom for buffered IO");
+    }
+    fd = fileno(fptr->f);
+
+    str = rb_tainted_str_new(0, buflen);
+
+    rb_io_check_closed(fptr);
+    rb_io_set_nonblock(fptr);
+    slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
+
+    if (slen < 0) {
+	rb_sys_fail("recvfrom(2)");
+    }
+    if (slen < RSTRING(str)->len) {
+	RSTRING(str)->len = slen;
+	RSTRING(str)->ptr[slen] = '\0';
+    }
+    rb_obj_taint(str);
+    switch (from) {
+      case RECV_RECV:
+	return str;
+
+      case RECV_IP:
+        if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */
+            addr = ipaddr((struct sockaddr*)buf);
+        break;
+
+      case RECV_SOCKET:
+        addr = rb_str_new(buf, alen);
+        break;
+
+      default:
+        rb_bug("s_recvfrom_nonblock called with bad value");
+    }
+    return rb_assoc_new(str, addr);
+}
+
+static VALUE
+bsock_recv(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    return s_recvfrom(sock, argc, argv, RECV_RECV);
+}
+
+/*
+ * call-seq:
+ * 	basicsocket.recv_nonblock(maxlen) => mesg
+ * 	basicsocket.recv_nonblock(maxlen, flags) => mesg
+ * 
+ * Receives up to _maxlen_ bytes from +socket+ using recvfrom(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * _flags_ is zero or more of the +MSG_+ options.
+ * The result, _mesg_, is the data received.
+ *
+ * When recvfrom(2) returns 0, Socket#recv_nonblock returns
+ * an empty string as data.
+ * The meaning depends on the socket: EOF on TCP, empty packet on UDP, etc.
+ * 
+ * === Parameters
+ * * +maxlen+ - the number of bytes to receive from the socket
+ * * +flags+ - zero or more of the +MSG_+ options 
+ * 
+ * === Example
+ * 	serv = TCPServer.new("127.0.0.1", 0)
+ * 	af, port, host, addr = serv.addr
+ * 	c = TCPSocket.new(addr, port)
+ * 	s = serv.accept
+ * 	c.send "aaa", 0
+ * 	IO.select([s])
+ * 	p s.recv_nonblock(10) #=> "aaa"
+ *
+ * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
+ * to _recv_nonblock_ fails. 
+ *
+ * BasicSocket#recv_nonblock may raise any error corresponding to recvfrom(2) failure,
+ * including Errno::EAGAIN.
+ *
+ * === See
+ * * Socket#recvfrom
+ */
+
+static VALUE
+bsock_recv_nonblock(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    return s_recvfrom_nonblock(sock, argc, argv, RECV_RECV);
+}
+
+static VALUE
+bsock_do_not_rev_lookup()
+{
+    return do_not_reverse_lookup?Qtrue:Qfalse;
+}
+
+static VALUE
+bsock_do_not_rev_lookup_set(self, val)
+    VALUE self, val;
+{
+    rb_secure(4);
+    do_not_reverse_lookup = RTEST(val);
+    return val;
+}
+
+static void
+make_ipaddr0(addr, buf, len)
+    struct sockaddr *addr;
+    char *buf;
+    size_t len;
+{
+    int error;
+
+    error = getnameinfo(addr, SA_LEN(addr), buf, len, NULL, 0, NI_NUMERICHOST);
+    if (error) {
+	rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
+    }
+}
+
+static VALUE
+make_ipaddr(addr)
+    struct sockaddr *addr;
+{
+    char buf[1024];
+
+    make_ipaddr0(addr, buf, sizeof(buf));
+    return rb_str_new2(buf);
+}
+
+static void
+make_inetaddr(host, buf, len)
+    long host;
+    char *buf;
+    size_t len;
+{
+    struct sockaddr_in sin;
+
+    MEMZERO(&sin, struct sockaddr_in, 1);
+    sin.sin_family = AF_INET;
+    SET_SIN_LEN(&sin, sizeof(sin));
+    sin.sin_addr.s_addr = host;
+    make_ipaddr0((struct sockaddr*)&sin, buf, len);
+}
+
+static int
+str_isnumber(p)
+        const char *p;
+{
+    char *ep;
+
+    if (!p || *p == '\0')
+       return 0;
+    ep = NULL;
+    (void)strtoul(p, &ep, 10);
+    if (ep && *ep == '\0')
+       return 1;
+    else
+       return 0;
+}
+
+static char *
+host_str(host, hbuf, len)
+    VALUE host;
+    char *hbuf;
+    size_t len;
+{
+    if (NIL_P(host)) {
+	return NULL;
+    }
+    else if (rb_obj_is_kind_of(host, rb_cInteger)) {
+	long i = NUM2LONG(host);
+
+	make_inetaddr(htonl(i), hbuf, len);
+	return hbuf;
+    }
+    else {
+	char *name;
+
+	SafeStringValue(host);
+	name = RSTRING(host)->ptr;
+	if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
+	    make_inetaddr(INADDR_ANY, hbuf, len);
+	}
+	else if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
+	    make_inetaddr(INADDR_BROADCAST, hbuf, len);
+	}
+	else if (strlen(name) >= len) {
+	    rb_raise(rb_eArgError, "hostname too long (%d)", strlen(name));
+	}
+	else {
+	    strcpy(hbuf, name);
+	}
+	return hbuf;
+    }
+}
+
+static char *
+port_str(port, pbuf, len)
+    VALUE port;
+    char *pbuf;
+    size_t len;
+{
+    if (NIL_P(port)) {
+	return 0;
+    }
+    else if (FIXNUM_P(port)) {
+	snprintf(pbuf, len, "%ld", FIX2LONG(port));
+	return pbuf;
+    }
+    else {
+	char *serv;
+
+	SafeStringValue(port);
+	serv = RSTRING(port)->ptr;
+	if (strlen(serv) >= len) {
+	    rb_raise(rb_eArgError, "service name too long (%d)", strlen(serv));
+	}
+	strcpy(pbuf, serv);
+	return pbuf;
+    }
+}
+
+#ifndef NI_MAXHOST
+# define 1025
+#endif
+#ifndef NI_MAXSERV
+# define 32
+#endif
+
+static struct addrinfo*
+sock_addrinfo(host, port, socktype, flags)
+    VALUE host, port;
+    int socktype, flags;
+{
+    struct addrinfo hints;
+    struct addrinfo* res = NULL;
+    char *hostp, *portp;
+    int error;
+    char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
+
+    hostp = host_str(host, hbuf, sizeof(hbuf));
+    portp = port_str(port, pbuf, sizeof(pbuf));
+
+    if (socktype == 0 && flags == 0 && str_isnumber(portp)) {
+       socktype = SOCK_DGRAM;
+    }
+
+    MEMZERO(&hints, struct addrinfo, 1);
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = socktype;
+    hints.ai_flags = flags;
+    error = getaddrinfo(hostp, portp, &hints, &res);
+    if (error) {
+	if (hostp && hostp[strlen(hostp)-1] == '\n') {
+	    rb_raise(rb_eSocket, "newline at the end of hostname");
+	}
+	rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
+    }
+
+#if defined(__APPLE__) && defined(__MACH__)
+    {
+        struct addrinfo *r;
+       r = res;
+       while (r) {
+            if (! r->ai_socktype) r->ai_socktype = hints.ai_socktype;
+            if (! r->ai_protocol) {
+                if (r->ai_socktype == SOCK_DGRAM) {
+                    r->ai_protocol = IPPROTO_UDP;
+                } else if (r->ai_socktype == SOCK_STREAM) {
+                    r->ai_protocol = IPPROTO_TCP;
+                }
+            }
+            r = r->ai_next;
+        }
+    }
+#endif
+    return res;
+}
+
+static VALUE
+ipaddr(sockaddr)
+    struct sockaddr *sockaddr;
+{
+    VALUE family, port, addr1, addr2;
+    VALUE ary;
+    int error;
+    char hbuf[1024], pbuf[1024];
+
+    switch (sockaddr->sa_family) {
+    case AF_UNSPEC:
+	family = rb_str_new2("AF_UNSPEC");
+	break;
+    case AF_INET:
+	family = rb_str_new2("AF_INET");
+	break;
+#ifdef INET6
+    case AF_INET6:
+	family = rb_str_new2("AF_INET6");
+	break;
+#endif
+#ifdef AF_LOCAL
+    case AF_LOCAL:
+	family = rb_str_new2("AF_LOCAL");
+	break;
+#elif  AF_UNIX
+    case AF_UNIX:
+	family = rb_str_new2("AF_UNIX");
+	break;
+#endif
+    default:
+        sprintf(pbuf, "unknown:%d", sockaddr->sa_family);
+	family = rb_str_new2(pbuf);
+	break;
+    }
+    addr1 = Qnil;
+    if (!do_not_reverse_lookup) {
+	error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
+			    NULL, 0, 0);
+	if (! error) {
+	    addr1 = rb_str_new2(hbuf);
+	}
+    }
+    error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
+			pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
+    if (error) {
+	rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
+    }
+    addr2 = rb_str_new2(hbuf);
+    if (addr1 == Qnil) {
+	addr1 = addr2;
+    }
+    port = INT2FIX(atoi(pbuf));
+    ary = rb_ary_new3(4, family, port, addr1, addr2);
+
+    return ary;
+}
+
+static int
+ruby_socket(domain, type, proto)
+    int domain, type, proto;
+{
+    int fd;
+
+    fd = socket(domain, type, proto);
+    if (fd < 0) {
+	if (errno == EMFILE || errno == ENFILE) {
+	    rb_gc();
+	    fd = socket(domain, type, proto);
+	}
+    }
+    return fd;
+}
+
+static int
+wait_connectable(fd)
+    int fd;
+{
+    int sockerr;
+    socklen_t sockerrlen;
+    fd_set fds_w;
+    fd_set fds_e;
+
+    for (;;) {
+	FD_ZERO(&fds_w);
+	FD_ZERO(&fds_e);
+
+	FD_SET(fd, &fds_w);
+	FD_SET(fd, &fds_e);
+
+	rb_thread_select(fd+1, 0, &fds_w, &fds_e, 0);
+
+	if (FD_ISSET(fd, &fds_w)) {
+	    return 0;
+	}
+	else if (FD_ISSET(fd, &fds_e)) {
+	    sockerrlen = sizeof(sockerr);
+	    if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr,
+			   &sockerrlen) == 0) {
+		if (sockerr == 0)
+		    continue;	/* workaround for winsock */
+		errno = sockerr;
+	    }
+	    return -1;
+	}
+    }
+
+    return 0;
+}
+
+#ifdef __CYGWIN__
+#define WAIT_IN_PROGRESS 10
+#endif
+#ifdef __APPLE__
+#define WAIT_IN_PROGRESS 10
+#endif
+#ifdef __linux__
+/* returns correct error */
+#define WAIT_IN_PROGRESS 0
+#endif
+#ifndef WAIT_IN_PROGRESS
+/* BSD origin code apparently has a problem */
+#define WAIT_IN_PROGRESS 1
+#endif
+
+static int
+ruby_connect(fd, sockaddr, len, socks)
+    int fd;
+    struct sockaddr *sockaddr;
+    int len;
+    int socks;
+{
+    int status;
+    int mode;
+#if WAIT_IN_PROGRESS > 0
+    int wait_in_progress = -1;
+    int sockerr;
+    socklen_t sockerrlen;
+#endif
+
+#if defined(HAVE_FCNTL)
+# if defined(F_GETFL)
+    mode = fcntl(fd, F_GETFL, 0);
+# else
+    mode = 0;
+# endif
+
+#ifdef O_NDELAY
+# define NONBLOCKING O_NDELAY
+#else
+#ifdef O_NBIO
+# define NONBLOCKING O_NBIO
+#else
+# define NONBLOCKING O_NONBLOCK
+#endif
+#endif
+#ifdef SOCKS5
+    if (!socks)
+#endif
+    fcntl(fd, F_SETFL, mode|NONBLOCKING);
+#endif /* HAVE_FCNTL */
+
+    for (;;) {
+#if defined(SOCKS) && !defined(SOCKS5)
+	if (socks) {
+	    status = Rconnect(fd, sockaddr, len);
+	}
+	else
+#endif
+	{
+	    status = connect(fd, sockaddr, len);
+	}
+	if (status < 0) {
+	    switch (errno) {
+	      case EAGAIN:
+#ifdef EINPROGRESS
+	      case EINPROGRESS:
+#endif
+#if WAIT_IN_PROGRESS > 0
+		sockerrlen = sizeof(sockerr);
+		status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
+		if (status) break;
+		if (sockerr) {
+		    status = -1;
+		    errno = sockerr;
+		    break;
+		}
+#endif
+#ifdef EALREADY
+	      case EALREADY:
+#endif
+#if WAIT_IN_PROGRESS > 0
+		wait_in_progress = WAIT_IN_PROGRESS;
+#endif
+		status = wait_connectable(fd);
+		if (status) {
+		    break;
+		}
+		errno = 0;
+		continue;
+
+#if WAIT_IN_PROGRESS > 0
+	      case EINVAL:
+		if (wait_in_progress-- > 0) {
+		    /*
+		     * connect() after EINPROGRESS returns EINVAL on
+		     * some platforms, need to check true error
+		     * status.
+		     */
+		    sockerrlen = sizeof(sockerr);
+		    status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
+		    if (!status && !sockerr) {
+			struct timeval tv = {0, 100000};
+			rb_thread_wait_for(tv);
+			continue;
+		    }
+		    status = -1;
+		    errno = sockerr;
+		}
+		break;
+#endif
+
+#ifdef EISCONN
+	      case EISCONN:
+		status = 0;
+		errno = 0;
+		break;
+#endif
+	      default:
+		break;
+	    }
+	}
+#ifdef HAVE_FCNTL
+	fcntl(fd, F_SETFL, mode);
+#endif
+	return status;
+    }
+}
+
+struct inetsock_arg
+{
+    VALUE sock;
+    struct {
+	VALUE host, serv;
+	struct addrinfo *res;
+    } remote, local;
+    int type;
+    int fd;
+};
+
+static VALUE
+inetsock_cleanup(arg)
+    struct inetsock_arg *arg;
+{
+    if (arg->remote.res) {
+	freeaddrinfo(arg->remote.res);
+	arg->remote.res = 0;
+    }
+    if (arg->local.res) {
+	freeaddrinfo(arg->local.res);
+	arg->local.res = 0;
+    }
+    if (arg->fd >= 0) {
+	close(arg->fd);
+    }
+    return Qnil;
+}
+
+static VALUE
+init_inetsock_internal(arg)
+    struct inetsock_arg *arg;
+{
+    int type = arg->type;
+    struct addrinfo *res;
+    int fd, status = 0;
+    char *syscall;
+
+    arg->remote.res = sock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM,
+				    (type == INET_SERVER) ? AI_PASSIVE : 0);
+    /*
+     * Maybe also accept a local address
+     */
+
+    if (type != INET_SERVER && (!NIL_P(arg->local.host) || !NIL_P(arg->local.serv))) {
+	arg->local.res = sock_addrinfo(arg->local.host, arg->local.serv, SOCK_STREAM, 0);
+    }
+
+    arg->fd = fd = -1;
+    for (res = arg->remote.res; res; res = res->ai_next) {
+	status = ruby_socket(res->ai_family,res->ai_socktype,res->ai_protocol);
+	syscall = "socket(2)";
+	fd = status;
+	if (fd < 0) {
+	    continue;
+	}
+	arg->fd = fd;
+	if (type == INET_SERVER) {
+#if !defined(_WIN32) && !defined(__CYGWIN__)
+	    status = 1;
+	    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
+		       (char*)&status, sizeof(status));
+#endif
+	    status = bind(fd, res->ai_addr, res->ai_addrlen);
+	    syscall = "bind(2)";
+	}
+	else {
+	    if (arg->local.res) {
+		status = bind(fd, arg->local.res->ai_addr, arg->local.res->ai_addrlen);
+		syscall = "bind(2)";
+	    }
+
+	    if (status >= 0) {
+		status = ruby_connect(fd, res->ai_addr, res->ai_addrlen,
+				      (type == INET_SOCKS));
+		syscall = "connect(2)";
+	    }
+	}
+
+	if (status < 0) {
+	    close(fd);
+	    arg->fd = fd = -1;
+	    continue;
+	} else
+	    break;
+    }
+    if (status < 0) {
+	rb_sys_fail(syscall);
+    }
+
+    arg->fd = -1;
+
+    if (type == INET_SERVER)
+	listen(fd, 5);
+
+    /* create new instance */
+    return init_sock(arg->sock, fd);
+}
+
+static VALUE
+init_inetsock(sock, remote_host, remote_serv, local_host, local_serv, type)
+    VALUE sock, remote_host, remote_serv, local_host, local_serv;
+    int type;
+{
+    struct inetsock_arg arg;
+    arg.sock = sock;
+    arg.remote.host = remote_host;
+    arg.remote.serv = remote_serv;
+    arg.remote.res = 0;
+    arg.local.host = local_host;
+    arg.local.serv = local_serv;
+    arg.local.res = 0;
+    arg.type = type;
+    arg.fd = -1;
+    return rb_ensure(init_inetsock_internal, (VALUE)&arg,
+		     inetsock_cleanup, (VALUE)&arg);
+}
+
+/*
+ * call-seq:
+ *    TCPSocket.new(remote_host, remote_port, local_host=nil, local_port=nil)
+ *
+ * Opens a TCP connection to +remote_host+ on +remote_port+.  If +local_host+
+ * and +local_port+ are specified, then those parameters are used on the local
+ * end to establish the connection.
+ */
+static VALUE
+tcp_init(argc, argv, sock)
+     int argc;
+     VALUE *argv;
+     VALUE sock;
+{
+    VALUE remote_host, remote_serv;
+    VALUE local_host, local_serv;
+
+    rb_scan_args(argc, argv, "22", &remote_host, &remote_serv,
+			&local_host, &local_serv);
+
+    return init_inetsock(sock, remote_host, remote_serv,
+			local_host, local_serv, INET_CLIENT);
+}
+
+#ifdef SOCKS
+static VALUE
+socks_init(sock, host, serv)
+    VALUE sock, host, serv;
+{
+    static init = 0;
+
+    if (init == 0) {
+	SOCKSinit("ruby");
+	init = 1;
+    }
+
+    return init_inetsock(sock, host, serv, Qnil, Qnil, INET_SOCKS);
+}
+
+#ifdef SOCKS5
+static VALUE
+socks_s_close(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
+    }
+    GetOpenFile(sock, fptr);
+    shutdown(fileno(fptr->f), 2);
+    shutdown(fileno(fptr->f2), 2);
+    return rb_io_close(sock);
+}
+#endif
+#endif
+
+struct hostent_arg {
+    VALUE host;
+    struct addrinfo* addr;
+    VALUE (*ipaddr)_((struct sockaddr*, size_t));
+};
+
+static VALUE
+make_hostent_internal(arg)
+    struct hostent_arg *arg;
+{
+    VALUE host = arg->host;
+    struct addrinfo* addr = arg->addr;
+    VALUE (*ipaddr)_((struct sockaddr*, size_t)) = arg->ipaddr;
+
+    struct addrinfo *ai;
+    struct hostent *h;
+    VALUE ary, names;
+    char **pch;
+    const char* hostp;
+    char hbuf[NI_MAXHOST];
+
+    ary = rb_ary_new();
+    if (addr->ai_canonname) {
+	hostp = addr->ai_canonname;
+    }
+    else {
+	hostp = host_str(host, hbuf, sizeof(hbuf));
+    }
+    rb_ary_push(ary, rb_str_new2(hostp));
+
+    if (addr->ai_canonname && (h = gethostbyname(addr->ai_canonname))) {
+	names = rb_ary_new();
+	if (h->h_aliases != NULL) {
+	    for (pch = h->h_aliases; *pch; pch++) {
+		rb_ary_push(names, rb_str_new2(*pch));
+	    }
+	}
+    }
+    else {
+	names = rb_ary_new2(0);
+    }
+    rb_ary_push(ary, names);
+    rb_ary_push(ary, INT2NUM(addr->ai_family));
+    for (ai = addr; ai; ai = ai->ai_next) {
+      /* Pushing all addresses regardless of address family is not the
+       * behaviour expected of gethostbyname(). All the addresses in struct
+       * hostent->h_addr_list must be of the same family.
+       */
+       if(ai->ai_family == addr->ai_family) {
+	   rb_ary_push(ary, (*ipaddr)(ai->ai_addr, ai->ai_addrlen));
+       }
+    }
+
+    return ary;
+}
+
+static VALUE
+make_hostent(host, addr, ipaddr)
+    VALUE host;
+    struct addrinfo* addr;
+    VALUE (*ipaddr)_((struct sockaddr*, size_t));
+{
+    struct hostent_arg arg;
+
+    arg.host = host;
+    arg.addr = addr;
+    arg.ipaddr = ipaddr;
+    return rb_ensure(make_hostent_internal, (VALUE)&arg,
+		     RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)addr);
+}
+
+VALUE
+tcp_sockaddr(addr, len)
+    struct sockaddr *addr;
+    size_t len;
+{
+    return make_ipaddr(addr);
+}
+
+static VALUE
+tcp_s_gethostbyname(obj, host)
+    VALUE obj, host;
+{
+    rb_secure(3);
+    return make_hostent(host, sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), tcp_sockaddr);
+}
+
+static VALUE
+tcp_svr_init(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    VALUE arg1, arg2;
+
+    if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2)
+	return init_inetsock(sock, arg1, arg2, Qnil, Qnil, INET_SERVER);
+    else
+	return init_inetsock(sock, Qnil, arg1, Qnil, Qnil, INET_SERVER);
+}
+
+static VALUE
+s_accept_nonblock(VALUE klass, OpenFile *fptr, struct sockaddr *sockaddr, socklen_t *len)
+{
+    int fd2;
+
+    rb_secure(3);
+    rb_io_set_nonblock(fptr);
+    fd2 = accept(fileno(fptr->f), (struct sockaddr*)sockaddr, len);
+    if (fd2 < 0) {
+        rb_sys_fail("accept(2)");
+    }
+    return init_sock(rb_obj_alloc(klass), fd2);
+}
+
+static VALUE
+s_accept(klass, fd, sockaddr, len)
+    VALUE klass;
+    int fd;
+    struct sockaddr *sockaddr;
+    socklen_t *len;
+{
+    int fd2;
+    int retry = 0;
+
+    rb_secure(3);
+  retry:
+    rb_thread_wait_fd(fd);
+#if defined(_nec_ews)
+    fd2 = accept(fd, sockaddr, len);
+#else
+    TRAP_BEG;
+    fd2 = accept(fd, sockaddr, len);
+    TRAP_END;
+#endif
+    if (fd2 < 0) {
+	switch (errno) {
+	  case EMFILE:
+	  case ENFILE:
+	    if (retry) break;
+	    rb_gc();
+	    retry = 1;
+	    goto retry;
+	  case EWOULDBLOCK:
+	    break;
+	  default:
+	    if (!rb_io_wait_readable(fd)) break;
+	    retry = 0;
+	    goto retry;
+	}
+	rb_sys_fail(0);
+    }
+    if (!klass) return INT2NUM(fd2);
+    return init_sock(rb_obj_alloc(klass), fd2);
+}
+
+static VALUE
+tcp_accept(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    struct sockaddr_storage from;
+    socklen_t fromlen;
+
+    GetOpenFile(sock, fptr);
+    fromlen = sizeof(from);
+    return s_accept(rb_cTCPSocket, fileno(fptr->f),
+		    (struct sockaddr*)&from, &fromlen);
+}
+
+/*
+ * call-seq:
+ * 	tcpserver.accept_nonblock => tcpsocket
+ * 
+ * Accepts an incoming connection using accept(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * It returns an accepted TCPSocket for the incoming connection.
+ * 
+ * === Example
+ * 	require 'socket'
+ * 	serv = TCPServer.new(2202)
+ * 	begin
+ * 	  sock = serv.accept_nonblock
+ * 	rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
+ * 	  IO.select([serv])
+ * 	  retry
+ * 	end
+ * 	# sock is an accepted socket.
+ * 
+ * Refer to Socket#accept for the exceptions that may be thrown if the call
+ * to TCPServer#accept_nonblock fails. 
+ *
+ * TCPServer#accept_nonblock may raise any error corresponding to accept(2) failure,
+ * including Errno::EAGAIN.
+ * 
+ * === See
+ * * TCPServer#accept
+ * * Socket#accept
+ */
+static VALUE
+tcp_accept_nonblock(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    struct sockaddr_storage from;
+    socklen_t fromlen;
+
+    GetOpenFile(sock, fptr);
+    fromlen = sizeof(from);
+    return s_accept_nonblock(rb_cTCPSocket, fptr,
+                             (struct sockaddr *)&from, &fromlen);
+}
+
+static VALUE
+tcp_sysaccept(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    struct sockaddr_storage from;
+    socklen_t fromlen;
+
+    GetOpenFile(sock, fptr);
+    fromlen = sizeof(from);
+    return s_accept(0, fileno(fptr->f), (struct sockaddr*)&from, &fromlen);
+}
+
+#ifdef HAVE_SYS_UN_H
+struct unixsock_arg {
+    struct sockaddr_un *sockaddr;
+    int fd;
+};
+
+static VALUE
+unixsock_connect_internal(arg)
+    struct unixsock_arg *arg;
+{
+    return (VALUE)ruby_connect(arg->fd, arg->sockaddr, sizeof(*arg->sockaddr),
+			       0);
+}
+
+static VALUE
+init_unixsock(sock, path, server)
+    VALUE sock;
+    VALUE path;
+    int server;
+{
+    struct sockaddr_un sockaddr;
+    int fd, status;
+    OpenFile *fptr;
+
+    SafeStringValue(path);
+    fd = ruby_socket(AF_UNIX, SOCK_STREAM, 0);
+    if (fd < 0) {
+	rb_sys_fail("socket(2)");
+    }
+
+    MEMZERO(&sockaddr, struct sockaddr_un, 1);
+    sockaddr.sun_family = AF_UNIX;
+    if (sizeof(sockaddr.sun_path) <= RSTRING(path)->len) {
+        rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
+            (int)sizeof(sockaddr.sun_path)-1);
+    }
+    strcpy(sockaddr.sun_path, StringValueCStr(path));
+
+    if (server) {
+        status = bind(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
+    }
+    else {
+	int prot;
+	struct unixsock_arg arg;
+	arg.sockaddr = &sockaddr;
+	arg.fd = fd;
+        status = rb_protect(unixsock_connect_internal, (VALUE)&arg, &prot);
+	if (prot) {
+	    close(fd);
+	    rb_jump_tag(prot);
+	}
+    }
+
+    if (status < 0) {
+	close(fd);
+	rb_sys_fail(sockaddr.sun_path);
+    }
+
+    if (server) listen(fd, 5);
+
+    init_sock(sock, fd);
+    GetOpenFile(sock, fptr);
+    if (server) {
+        fptr->path = strdup(RSTRING(path)->ptr);
+    }
+
+    return sock;
+}
+#endif
+
+static VALUE
+ip_addr(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    struct sockaddr_storage addr;
+    socklen_t len = sizeof addr;
+
+    GetOpenFile(sock, fptr);
+
+    if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
+	rb_sys_fail("getsockname(2)");
+    return ipaddr((struct sockaddr*)&addr);
+}
+
+static VALUE
+ip_peeraddr(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    struct sockaddr_storage addr;
+    socklen_t len = sizeof addr;
+
+    GetOpenFile(sock, fptr);
+
+    if (getpeername(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
+	rb_sys_fail("getpeername(2)");
+    return ipaddr((struct sockaddr*)&addr);
+}
+
+static VALUE
+ip_recvfrom(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    return s_recvfrom(sock, argc, argv, RECV_IP);
+}
+
+static VALUE
+ip_s_getaddress(obj, host)
+    VALUE obj, host;
+{
+    struct sockaddr_storage addr;
+    struct addrinfo *res = sock_addrinfo(host, Qnil, SOCK_STREAM, 0);
+
+    /* just take the first one */
+    memcpy(&addr, res->ai_addr, res->ai_addrlen);
+    freeaddrinfo(res);
+
+    return make_ipaddr((struct sockaddr*)&addr);
+}
+
+static VALUE
+udp_init(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    VALUE arg;
+    int socktype = AF_INET;
+    int fd;
+
+    rb_secure(3);
+    if (rb_scan_args(argc, argv, "01", &arg) == 1) {
+	socktype = NUM2INT(arg);
+    }
+    fd = ruby_socket(socktype, SOCK_DGRAM, 0);
+    if (fd < 0) {
+	rb_sys_fail("socket(2) - udp");
+    }
+
+    return init_sock(sock, fd);
+}
+
+struct udp_arg
+{
+    struct addrinfo *res;
+    int fd;
+};
+
+static VALUE
+udp_connect_internal(arg)
+    struct udp_arg *arg;
+{
+    int fd = arg->fd;
+    struct addrinfo *res;
+
+    for (res = arg->res; res; res = res->ai_next) {
+	if (ruby_connect(fd, res->ai_addr, res->ai_addrlen, 0) >= 0) {
+	    return Qtrue;
+	}
+    }
+    return Qfalse;
+}
+
+static VALUE
+udp_connect(sock, host, port)
+    VALUE sock, host, port;
+{
+    OpenFile *fptr;
+    struct udp_arg arg;
+    VALUE ret;
+
+    rb_secure(3);
+    arg.res = sock_addrinfo(host, port, SOCK_DGRAM, 0);
+    GetOpenFile(sock, fptr);
+    arg.fd = fileno(fptr->f);
+    ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
+		    RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)arg.res);
+    if (!ret) rb_sys_fail("connect(2)");
+    return INT2FIX(0);
+}
+
+static VALUE
+udp_bind(sock, host, port)
+    VALUE sock, host, port;
+{
+    OpenFile *fptr;
+    struct addrinfo *res0, *res;
+
+    rb_secure(3);
+    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
+    GetOpenFile(sock, fptr);
+    for (res = res0; res; res = res->ai_next) {
+	if (bind(fileno(fptr->f), res->ai_addr, res->ai_addrlen) < 0) {
+	    continue;
+	}
+	freeaddrinfo(res0);
+	return INT2FIX(0);
+    }
+    freeaddrinfo(res0);
+    rb_sys_fail("bind(2)");
+    return INT2FIX(0);
+}
+
+static VALUE
+udp_send(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    VALUE mesg, flags, host, port;
+    OpenFile *fptr;
+    FILE *f;
+    int n;
+    struct addrinfo *res0, *res;
+
+    if (argc == 2 || argc == 3) {
+	return bsock_send(argc, argv, sock);
+    }
+    rb_secure(4);
+    rb_scan_args(argc, argv, "4", &mesg, &flags, &host, &port);
+
+    StringValue(mesg);
+    res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
+    GetOpenFile(sock, fptr);
+    f = GetWriteFile(fptr);
+    for (res = res0; res; res = res->ai_next) {
+      retry:
+	n = sendto(fileno(f), RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
+		   res->ai_addr, res->ai_addrlen);
+	if (n >= 0) {
+	    freeaddrinfo(res0);
+	    return INT2FIX(n);
+	}
+	if (rb_io_wait_writable(fileno(f))) {
+	    goto retry;
+	}
+    }
+    freeaddrinfo(res0);
+    rb_sys_fail("sendto(2)");
+    return INT2FIX(n);
+}
+
+/*
+ * call-seq:
+ * 	udpsocket.recvfrom_nonblock(maxlen) => [mesg, sender_inet_addr]
+ * 	udpsocket.recvfrom_nonblock(maxlen, flags) => [mesg, sender_inet_addr]
+ * 
+ * Receives up to _maxlen_ bytes from +udpsocket+ using recvfrom(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * _flags_ is zero or more of the +MSG_+ options.
+ * The first element of the results, _mesg_, is the data received.
+ * The second element, _sender_inet_addr_, is an array to represent the sender address.
+ *
+ * When recvfrom(2) returns 0,
+ * Socket#recvfrom_nonblock returns an empty string as data.
+ * It means an empty packet.
+ * 
+ * === Parameters
+ * * +maxlen+ - the number of bytes to receive from the socket
+ * * +flags+ - zero or more of the +MSG_+ options 
+ * 
+ * === Example
+ * 	require 'socket'
+ * 	s1 = UDPSocket.new
+ * 	s1.bind("127.0.0.1", 0)
+ * 	s2 = UDPSocket.new
+ * 	s2.bind("127.0.0.1", 0)
+ * 	s2.connect(*s1.addr.values_at(3,1))
+ * 	s1.connect(*s2.addr.values_at(3,1))
+ * 	s1.send "aaa", 0
+ * 	IO.select([s2])
+ * 	p s2.recvfrom_nonblock(10)  #=> ["aaa", ["AF_INET", 33302, "localhost.localdomain", "127.0.0.1"]]
+ *
+ * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
+ * to _recvfrom_nonblock_ fails. 
+ *
+ * UDPSocket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
+ * including Errno::EAGAIN.
+ *
+ * === See
+ * * Socket#recvfrom
+ */
+static VALUE
+udp_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
+{
+    return s_recvfrom_nonblock(sock, argc, argv, RECV_IP);
+}
+
+#ifdef HAVE_SYS_UN_H
+static VALUE
+unix_init(sock, path)
+    VALUE sock, path;
+{
+    return init_unixsock(sock, path, 0);
+}
+
+static char *
+unixpath(struct sockaddr_un *sockaddr, socklen_t len)
+{
+    if (sockaddr->sun_path < (char*)sockaddr + len)
+        return sockaddr->sun_path;
+    else
+        return "";
+}
+
+static VALUE
+unix_path(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+
+    GetOpenFile(sock, fptr);
+    if (fptr->path == 0) {
+	struct sockaddr_un addr;
+	socklen_t len = sizeof(addr);
+	if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
+	    rb_sys_fail(0);
+	fptr->path = strdup(unixpath(&addr, len));
+    }
+    return rb_str_new2(fptr->path);
+}
+
+static VALUE
+unix_svr_init(sock, path)
+    VALUE sock, path;
+{
+    return init_unixsock(sock, path, 1);
+}
+
+static VALUE
+unix_recvfrom(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    return s_recvfrom(sock, argc, argv, RECV_UNIX);
+}
+
+#if defined(HAVE_ST_MSG_CONTROL) && defined(SCM_RIGHTS)
+#define FD_PASSING_BY_MSG_CONTROL 1
+#else
+#define FD_PASSING_BY_MSG_CONTROL 0
+#endif
+
+#if defined(HAVE_ST_MSG_ACCRIGHTS)
+#define FD_PASSING_BY_MSG_ACCRIGHTS 1
+#else
+#define FD_PASSING_BY_MSG_ACCRIGHTS 0
+#endif
+
+static VALUE
+unix_send_io(sock, val)
+    VALUE sock, val;
+{
+#if defined(HAVE_SENDMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+    int fd;
+    OpenFile *fptr;
+    struct msghdr msg;
+    struct iovec vec[1];
+    char buf[1];
+
+#if FD_PASSING_BY_MSG_CONTROL
+    struct {
+	struct cmsghdr hdr;
+	int fd;
+    } cmsg;
+#endif
+
+    if (rb_obj_is_kind_of(val, rb_cIO)) {
+        OpenFile *valfptr;
+	GetOpenFile(val, valfptr);
+	fd = fileno(valfptr->f);
+    }
+    else if (FIXNUM_P(val)) {
+        fd = FIX2INT(val);
+    }
+    else {
+	rb_raise(rb_eTypeError, "neither IO nor file descriptor");
+    }
+
+    GetOpenFile(sock, fptr);
+
+    msg.msg_name = NULL;
+    msg.msg_namelen = 0;
+
+    /* Linux and Solaris doesn't work if msg_iov is NULL. */
+    buf[0] = '\0';
+    vec[0].iov_base = buf;
+    vec[0].iov_len = 1;
+    msg.msg_iov = vec;
+    msg.msg_iovlen = 1;
+
+#if FD_PASSING_BY_MSG_CONTROL
+    msg.msg_control = (caddr_t)&cmsg;
+    msg.msg_controllen = CMSG_SPACE(sizeof(int));
+    msg.msg_flags = 0;
+    cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
+    cmsg.hdr.cmsg_level = SOL_SOCKET;
+    cmsg.hdr.cmsg_type = SCM_RIGHTS;
+    cmsg.fd = fd;
+#else
+    msg.msg_accrights = (caddr_t)&fd;
+    msg.msg_accrightslen = sizeof(fd);
+#endif
+
+    if (sendmsg(fileno(fptr->f), &msg, 0) == -1)
+	rb_sys_fail("sendmsg(2)");
+
+    return Qnil;
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
+#endif
+}
+
+#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+static void
+thread_read_select(fd)
+    int fd;
+{
+    fd_set fds;
+
+    FD_ZERO(&fds);
+    FD_SET(fd, &fds);
+    rb_thread_select(fd+1, &fds, 0, 0, 0);
+}
+#endif
+
+static VALUE
+unix_recv_io(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+    VALUE klass, mode;
+    OpenFile *fptr;
+    struct msghdr msg;
+    struct iovec vec[2];
+    char buf[1];
+
+    int fd;
+#if FD_PASSING_BY_MSG_CONTROL
+    struct {
+	struct cmsghdr hdr;
+	int fd;
+    } cmsg;
+#endif
+
+    rb_scan_args(argc, argv, "02", &klass, &mode);
+    if (argc == 0)
+	klass = rb_cIO;
+    if (argc <= 1)
+	mode = Qnil;
+
+    GetOpenFile(sock, fptr);
+
+    thread_read_select(fileno(fptr->f));
+
+    msg.msg_name = NULL;
+    msg.msg_namelen = 0;
+
+    vec[0].iov_base = buf;
+    vec[0].iov_len = sizeof(buf);
+    msg.msg_iov = vec;
+    msg.msg_iovlen = 1;
+
+#if FD_PASSING_BY_MSG_CONTROL
+    msg.msg_control = (caddr_t)&cmsg;
+    msg.msg_controllen = CMSG_SPACE(sizeof(int));
+    msg.msg_flags = 0;
+    cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
+    cmsg.hdr.cmsg_level = SOL_SOCKET;
+    cmsg.hdr.cmsg_type = SCM_RIGHTS;
+    cmsg.fd = -1;
+#else
+    msg.msg_accrights = (caddr_t)&fd;
+    msg.msg_accrightslen = sizeof(fd);
+    fd = -1;
+#endif
+
+    if (recvmsg(fileno(fptr->f), &msg, 0) == -1)
+	rb_sys_fail("recvmsg(2)");
+
+#if FD_PASSING_BY_MSG_CONTROL
+    if (msg.msg_controllen != CMSG_SPACE(sizeof(int))) {
+      rb_raise(rb_eSocket,
+          "file descriptor was not passed (msg_controllen : %d != %d)",
+          msg.msg_controllen, CMSG_SPACE(sizeof(int)));
+    }
+    if (cmsg.hdr.cmsg_len != CMSG_SPACE(0) + sizeof(int)) {
+      rb_raise(rb_eSocket,
+          "file descriptor was not passed (cmsg_len : %d != %d)",
+          cmsg.hdr.cmsg_len, CMSG_SPACE(0) + sizeof(int));
+    }
+    if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
+      rb_raise(rb_eSocket,
+          "file descriptor was not passed (cmsg_level : %d != %d)",
+          cmsg.hdr.cmsg_level, SOL_SOCKET);
+    }
+    if (cmsg.hdr.cmsg_type != SCM_RIGHTS) {
+      rb_raise(rb_eSocket,
+          "file descriptor was not passed (cmsg_type : %d != %d)",
+          cmsg.hdr.cmsg_type, SCM_RIGHTS);
+    }
+#else
+    if (msg.msg_accrightslen != sizeof(fd)) {
+	rb_raise(rb_eSocket,
+            "file descriptor was not passed (accrightslen) : %d != %d",
+            msg.msg_accrightslen, sizeof(fd));
+    }
+#endif
+
+#if FD_PASSING_BY_MSG_CONTROL
+    fd = cmsg.fd;
+#endif
+
+    if (klass == Qnil)
+	return INT2FIX(fd);
+    else {
+	static ID for_fd = 0;
+	int ff_argc;
+	VALUE ff_argv[2];
+	if (!for_fd)
+	    for_fd = rb_intern("for_fd");
+	ff_argc = mode == Qnil ? 1 : 2;
+	ff_argv[0] = INT2FIX(fd);
+	ff_argv[1] = mode;
+        return rb_funcall2(klass, for_fd, ff_argc, ff_argv);
+    }
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
+#endif
+}
+
+static VALUE
+unix_accept(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    struct sockaddr_un from;
+    socklen_t fromlen;
+
+    GetOpenFile(sock, fptr);
+    fromlen = sizeof(struct sockaddr_un);
+    return s_accept(rb_cUNIXSocket, fileno(fptr->f),
+		    (struct sockaddr*)&from, &fromlen);
+}
+
+/*
+ * call-seq:
+ * 	unixserver.accept_nonblock => unixsocket
+ * 
+ * Accepts an incoming connection using accept(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * It returns an accepted UNIXSocket for the incoming connection.
+ * 
+ * === Example
+ * 	require 'socket'
+ * 	serv = UNIXServer.new("/tmp/sock")
+ * 	begin
+ * 	  sock = serv.accept_nonblock
+ * 	rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
+ * 	  IO.select([serv])
+ * 	  retry
+ * 	end
+ * 	# sock is an accepted socket.
+ * 
+ * Refer to Socket#accept for the exceptions that may be thrown if the call
+ * to UNIXServer#accept_nonblock fails. 
+ *
+ * UNIXServer#accept_nonblock may raise any error corresponding to accept(2) failure,
+ * including Errno::EAGAIN.
+ * 
+ * === See
+ * * UNIXServer#accept
+ * * Socket#accept
+ */
+static VALUE
+unix_accept_nonblock(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    struct sockaddr_un from;
+    socklen_t fromlen;
+
+    GetOpenFile(sock, fptr);
+    fromlen = sizeof(from);
+    return s_accept_nonblock(rb_cUNIXSocket, fptr,
+                             (struct sockaddr *)&from, &fromlen);
+}
+
+static VALUE
+unix_sysaccept(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    struct sockaddr_un from;
+    socklen_t fromlen;
+
+    GetOpenFile(sock, fptr);
+    fromlen = sizeof(struct sockaddr_un);
+    return s_accept(0, fileno(fptr->f), (struct sockaddr*)&from, &fromlen);
+}
+
+static VALUE
+unixaddr(sockaddr, len)
+    struct sockaddr_un *sockaddr;
+    socklen_t len;
+{
+    return rb_assoc_new(rb_str_new2("AF_UNIX"),
+                        rb_str_new2(unixpath(sockaddr, len)));
+}
+
+static VALUE
+unix_addr(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    struct sockaddr_un addr;
+    socklen_t len = sizeof addr;
+
+    GetOpenFile(sock, fptr);
+
+    if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
+	rb_sys_fail("getsockname(2)");
+    return unixaddr(&addr, len);
+}
+
+static VALUE
+unix_peeraddr(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    struct sockaddr_un addr;
+    socklen_t len = sizeof addr;
+
+    GetOpenFile(sock, fptr);
+
+    if (getpeername(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
+	rb_sys_fail("getpeername(2)");
+    return unixaddr(&addr, len);
+}
+#endif
+
+static void
+setup_domain_and_type(domain, dv, type, tv)
+    VALUE domain, type;
+    int *dv, *tv;
+{
+    VALUE tmp;
+    char *ptr;
+
+    tmp = rb_check_string_type(domain);
+    if (!NIL_P(tmp)) {
+	domain = tmp;
+	rb_check_safe_obj(domain);
+	ptr = RSTRING(domain)->ptr;
+	if (strcmp(ptr, "AF_INET") == 0)
+	    *dv = AF_INET;
+#ifdef AF_UNIX
+	else if (strcmp(ptr, "AF_UNIX") == 0)
+	    *dv = AF_UNIX;
+#endif
+#ifdef AF_ISO
+	else if (strcmp(ptr, "AF_ISO") == 0)
+	    *dv = AF_ISO;
+#endif
+#ifdef AF_NS
+	else if (strcmp(ptr, "AF_NS") == 0)
+	    *dv = AF_NS;
+#endif
+#ifdef AF_IMPLINK
+	else if (strcmp(ptr, "AF_IMPLINK") == 0)
+	    *dv = AF_IMPLINK;
+#endif
+#ifdef PF_INET
+	else if (strcmp(ptr, "PF_INET") == 0)
+	    *dv = PF_INET;
+#endif
+#ifdef PF_UNIX
+	else if (strcmp(ptr, "PF_UNIX") == 0)
+	    *dv = PF_UNIX;
+#endif
+#ifdef PF_IMPLINK
+	else if (strcmp(ptr, "PF_IMPLINK") == 0)
+	    *dv = PF_IMPLINK;
+	else if (strcmp(ptr, "AF_IMPLINK") == 0)
+	    *dv = AF_IMPLINK;
+#endif
+#ifdef PF_AX25
+	else if (strcmp(ptr, "PF_AX25") == 0)
+	    *dv = PF_AX25;
+#endif
+#ifdef PF_IPX
+	else if (strcmp(ptr, "PF_IPX") == 0)
+	    *dv = PF_IPX;
+#endif
+	else
+	    rb_raise(rb_eSocket, "unknown socket domain %s", ptr);
+    }
+    else {
+	*dv = NUM2INT(domain);
+    }
+    tmp = rb_check_string_type(type);
+    if (!NIL_P(tmp)) {
+	type = tmp;
+	rb_check_safe_obj(type);
+	ptr = RSTRING(type)->ptr;
+	if (strcmp(ptr, "SOCK_STREAM") == 0)
+	    *tv = SOCK_STREAM;
+	else if (strcmp(ptr, "SOCK_DGRAM") == 0)
+	    *tv = SOCK_DGRAM;
+#ifdef SOCK_RAW
+	else if (strcmp(ptr, "SOCK_RAW") == 0)
+	    *tv = SOCK_RAW;
+#endif
+#ifdef SOCK_SEQPACKET
+	else if (strcmp(ptr, "SOCK_SEQPACKET") == 0)
+	    *tv = SOCK_SEQPACKET;
+#endif
+#ifdef SOCK_RDM
+	else if (strcmp(ptr, "SOCK_RDM") == 0)
+	    *tv = SOCK_RDM;
+#endif
+#ifdef SOCK_PACKET
+	else if (strcmp(ptr, "SOCK_PACKET") == 0)
+	    *tv = SOCK_PACKET;
+#endif
+	else
+	    rb_raise(rb_eSocket, "unknown socket type %s", ptr);
+    }
+    else {
+	*tv = NUM2INT(type);
+    }
+}
+
+static VALUE
+sock_initialize(sock, domain, type, protocol)
+    VALUE sock, domain, type, protocol;
+{
+    int fd;
+    int d, t;
+
+    rb_secure(3);
+    setup_domain_and_type(domain, &d, type, &t);
+    fd = ruby_socket(d, t, NUM2INT(protocol));
+    if (fd < 0) rb_sys_fail("socket(2)");
+
+    return init_sock(sock, fd);
+}
+
+static VALUE
+sock_s_socketpair(klass, domain, type, protocol)
+    VALUE klass, domain, type, protocol;
+{
+#if defined HAVE_SOCKETPAIR
+    int d, t, p, sp[2];
+    int ret;
+
+    setup_domain_and_type(domain, &d, type, &t);
+    p = NUM2INT(protocol);
+    ret = socketpair(d, t, p, sp);
+    if (ret < 0 && (errno == EMFILE || errno == ENFILE)) {
+        rb_gc();
+        ret = socketpair(d, t, p, sp);
+    }
+    if (ret < 0) {
+	rb_sys_fail("socketpair(2)");
+    }
+
+    return rb_assoc_new(init_sock(rb_obj_alloc(klass), sp[0]),
+			init_sock(rb_obj_alloc(klass), sp[1]));
+#else
+    rb_notimplement();
+#endif
+}
+
+#ifdef HAVE_SYS_UN_H
+static VALUE
+unix_s_socketpair(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE domain, type, protocol;
+    domain = INT2FIX(PF_UNIX);
+
+    rb_scan_args(argc, argv, "02", &type, &protocol);
+    if (argc == 0)
+	type = INT2FIX(SOCK_STREAM);
+    if (argc <= 1)
+	protocol = INT2FIX(0);
+
+    return sock_s_socketpair(klass, domain, type, protocol);
+}
+#endif
+
+/*
+ * call-seq:
+ * 	socket.connect(server_sockaddr) => 0
+ * 
+ * Requests a connection to be made on the given +server_sockaddr+. Returns 0 if
+ * successful, otherwise an exception is raised.
+ *  
+ * === Parameter
+ * * +server_sockaddr+ - the +struct+ sockaddr contained in a string
+ * 
+ * === Example:
+ * 	# Pull down Google's web page
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * 	sockaddr = Socket.pack_sockaddr_in( 80, 'www.google.com' )
+ * 	socket.connect( sockaddr )
+ * 	socket.write( "GET / HTTP/1.0\r\n\r\n" )
+ * 	results = socket.read 
+ * 
+ * === Unix-based Exceptions
+ * On unix-based systems the following system exceptions may be raised if 
+ * the call to _connect_ fails:
+ * * Errno::EACCES - search permission is denied for a component of the prefix
+ *   path or write access to the +socket+ is denided
+ * * Errno::EADDRINUSE - the _sockaddr_ is already in use
+ * * Errno::EADDRNOTAVAIL - the specified _sockaddr_ is not available from the
+ *   local machine
+ * * Errno::EAFNOSUPPORT - the specified _sockaddr_ is not a valid address for 
+ *   the address family of the specified +socket+
+ * * Errno::EALREADY - a connection is already in progress for the specified
+ *   socket
+ * * Errno::EBADF - the +socket+ is not a valid file descriptor
+ * * Errno::ECONNREFUSED - the target _sockaddr_ was not listening for connections
+ *   refused the connection request
+ * * Errno::ECONNRESET - the remote host reset the connection request
+ * * Errno::EFAULT - the _sockaddr_ cannot be accessed
+ * * Errno::EHOSTUNREACH - the destination host cannot be reached (probably 
+ *   because the host is down or a remote router cannot reach it)
+ * * Errno::EINPROGRESS - the O_NONBLOCK is set for the +socket+ and the
+ *   connection cnanot be immediately established; the connection will be
+ *   established asynchronously
+ * * Errno::EINTR - the attempt to establish the connection was interrupted by
+ *   delivery of a signal that was caught; the connection will be established
+ *   asynchronously
+ * * Errno::EISCONN - the specified +socket+ is already connected
+ * * Errno::EINVAL - the address length used for the _sockaddr_ is not a valid
+ *   length for the address family or there is an invalid family in _sockaddr_ 
+ * * Errno::ENAMETOOLONG - the pathname resolved had a length which exceeded
+ *   PATH_MAX
+ * * Errno::ENETDOWN - the local interface used to reach the destination is down
+ * * Errno::ENETUNREACH - no route to the network is present
+ * * Errno::ENOBUFS - no buffer space is available
+ * * Errno::ENOSR - there were insufficient STREAMS resources available to 
+ *   complete the operation
+ * * Errno::ENOTSOCK - the +socket+ argument does not refer to a socket
+ * * Errno::EOPNOTSUPP - the calling +socket+ is listening and cannot be connected
+ * * Errno::EPROTOTYPE - the _sockaddr_ has a different type than the socket 
+ *   bound to the specified peer address
+ * * Errno::ETIMEDOUT - the attempt to connect time out before a connection
+ *   was made.
+ * 
+ * On unix-based systems if the address family of the calling +socket+ is
+ * AF_UNIX the follow exceptions may be raised if the call to _connect_
+ * fails:
+ * * Errno::EIO - an i/o error occured while reading from or writing to the 
+ *   file system
+ * * Errno::ELOOP - too many symbolic links were encountered in translating
+ *   the pathname in _sockaddr_
+ * * Errno::ENAMETOOLLONG - a component of a pathname exceeded NAME_MAX 
+ *   characters, or an entired pathname exceeded PATH_MAX characters
+ * * Errno::ENOENT - a component of the pathname does not name an existing file
+ *   or the pathname is an empty string
+ * * Errno::ENOTDIR - a component of the path prefix of the pathname in _sockaddr_
+ *   is not a directory 
+ * 
+ * === Windows Exceptions
+ * On Windows systems the following system exceptions may be raised if 
+ * the call to _connect_ fails:
+ * * Errno::ENETDOWN - the network is down
+ * * Errno::EADDRINUSE - the socket's local address is already in use
+ * * Errno::EINTR - the socket was cancelled
+ * * Errno::EINPROGRESS - a blocking socket is in progress or the service provider
+ *   is still processing a callback function. Or a nonblocking connect call is 
+ *   in progress on the +socket+.
+ * * Errno::EALREADY - see Errno::EINVAL
+ * * Errno::EADDRNOTAVAIL - the remote address is not a valid address, such as 
+ *   ADDR_ANY TODO check ADDRANY TO INADDR_ANY
+ * * Errno::EAFNOSUPPORT - addresses in the specified family cannot be used with
+ *   with this +socket+
+ * * Errno::ECONNREFUSED - the target _sockaddr_ was not listening for connections
+ *   refused the connection request
+ * * Errno::EFAULT - the socket's internal address or address length parameter
+ *   is too small or is not a valid part of the user space address
+ * * Errno::EINVAL - the +socket+ is a listening socket
+ * * Errno::EISCONN - the +socket+ is already connected
+ * * Errno::ENETUNREACH - the network cannot be reached from this host at this time
+ * * Errno::EHOSTUNREACH - no route to the network is present
+ * * Errno::ENOBUFS - no buffer space is available
+ * * Errno::ENOTSOCK - the +socket+ argument does not refer to a socket
+ * * Errno::ETIMEDOUT - the attempt to connect time out before a connection
+ *   was made.
+ * * Errno::EWOULDBLOCK - the socket is marked as nonblocking and the 
+ *   connection cannot be completed immediately
+ * * Errno::EACCES - the attempt to connect the datagram socket to the 
+ *   broadcast address failed
+ * 
+ * === See
+ * * connect manual pages on unix-based systems
+ * * connect function in Microsoft's Winsock functions reference
+ */
+static VALUE
+sock_connect(sock, addr)
+    VALUE sock, addr;
+{
+    OpenFile *fptr;
+    int fd;
+
+    StringValue(addr);
+    addr = rb_str_new4(addr);
+    GetOpenFile(sock, fptr);
+    fd = fileno(fptr->f);
+    if (ruby_connect(fd, (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len, 0) < 0) {
+	rb_sys_fail("connect(2)");
+    }
+
+    return INT2FIX(0);
+}
+
+/*
+ * call-seq:
+ * 	socket.connect_nonblock(server_sockaddr) => 0
+ * 
+ * Requests a connection to be made on the given +server_sockaddr+ after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * Returns 0 if successful, otherwise an exception is raised.
+ *  
+ * === Parameter
+ * * +server_sockaddr+ - the +struct+ sockaddr contained in a string
+ * 
+ * === Example:
+ * 	# Pull down Google's web page
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
+ * 	sockaddr = Socket.sockaddr_in(80, 'www.google.com')
+ * 	begin
+ * 	  socket.connect_nonblock(sockaddr)
+ * 	rescue Errno::EINPROGRESS
+ * 	  IO.select(nil, [socket])
+ * 	  begin
+ * 	    socket.connect_nonblock(sockaddr)
+ * 	  rescue Errno::EISCONN
+ * 	  end
+ * 	end
+ * 	socket.write("GET / HTTP/1.0\r\n\r\n")
+ * 	results = socket.read 
+ * 
+ * Refer to Socket#connect for the exceptions that may be thrown if the call
+ * to _connect_nonblock_ fails. 
+ *
+ * Socket#connect_nonblock may raise any error corresponding to connect(2) failure,
+ * including Errno::EINPROGRESS.
+ *
+ * === See
+ * * Socket#connect
+ */
+static VALUE
+sock_connect_nonblock(sock, addr)
+    VALUE sock, addr;
+{
+    OpenFile *fptr;
+    int n;
+
+    StringValue(addr);
+    addr = rb_str_new4(addr);
+    GetOpenFile(sock, fptr);
+    rb_io_set_nonblock(fptr);
+    n = connect(fileno(fptr->f), (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len);
+    if (n < 0) {
+	rb_sys_fail("connect(2)");
+    }
+
+    return INT2FIX(n);
+}
+
+/*
+ * call-seq:
+ * 	socket.bind(server_sockaddr) => 0
+ * 
+ * Binds to the given +struct+ sockaddr.
+ * 
+ * === Parameter
+ * * +server_sockaddr+ - the +struct+ sockaddr contained in a string
+ *
+ * === Example
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
+ * 	socket.bind( sockaddr )
+ *  
+ * === Unix-based Exceptions
+ * On unix-based based systems the following system exceptions may be raised if 
+ * the call to _bind_ fails:
+ * * Errno::EACCES - the specified _sockaddr_ is protected and the current
+ *   user does not have permission to bind to it
+ * * Errno::EADDRINUSE - the specified _sockaddr_ is already in use
+ * * Errno::EADDRNOTAVAIL - the specified _sockaddr_ is not available from the
+ *   local machine
+ * * Errno::EAFNOSUPPORT - the specified _sockaddr_ isnot a valid address for
+ *   the family of the calling +socket+
+ * * Errno::EBADF - the _sockaddr_ specified is not a valid file descriptor
+ * * Errno::EFAULT - the _sockaddr_ argument cannot be accessed
+ * * Errno::EINVAL - the +socket+ is already bound to an address, and the 
+ *   protocol does not support binding to the new _sockaddr_ or the +socket+
+ *   has been shut down.
+ * * Errno::EINVAL - the address length is not a valid length for the address
+ *   family
+ * * Errno::ENAMETOOLONG - the pathname resolved had a length which exceeded
+ *   PATH_MAX
+ * * Errno::ENOBUFS - no buffer space is available
+ * * Errno::ENOSR - there were insufficient STREAMS resources available to 
+ *   complete the operation
+ * * Errno::ENOTSOCK - the +socket+ does not refer to a socket
+ * * Errno::EOPNOTSUPP - the socket type of the +socket+ does not support 
+ *   binding to an address
+ * 
+ * On unix-based based systems if the address family of the calling +socket+ is
+ * Socket::AF_UNIX the follow exceptions may be raised if the call to _bind_
+ * fails:
+ * * Errno::EACCES - search permission is denied for a component of the prefix
+ *   path or write access to the +socket+ is denided
+ * * Errno::EDESTADDRREQ - the _sockaddr_ argument is a null pointer
+ * * Errno::EISDIR - same as Errno::EDESTADDRREQ
+ * * Errno::EIO - an i/o error occurred
+ * * Errno::ELOOP - too many symbolic links were encountered in translating
+ *   the pathname in _sockaddr_
+ * * Errno::ENAMETOOLLONG - a component of a pathname exceeded NAME_MAX 
+ *   characters, or an entired pathname exceeded PATH_MAX characters
+ * * Errno::ENOENT - a component of the pathname does not name an existing file
+ *   or the pathname is an empty string
+ * * Errno::ENOTDIR - a component of the path prefix of the pathname in _sockaddr_
+ *   is not a directory
+ * * Errno::EROFS - the name would reside on a read only filesystem
+ * 
+ * === Windows Exceptions
+ * On Windows systems the following system exceptions may be raised if 
+ * the call to _bind_ fails:
+ * * Errno::ENETDOWN-- the network is down
+ * * Errno::EACCES - the attempt to connect the datagram socket to the 
+ *   broadcast address failed
+ * * Errno::EADDRINUSE - the socket's local address is already in use
+ * * Errno::EADDRNOTAVAIL - the specified address is not a valid address for this
+ *   computer
+ * * Errno::EFAULT - the socket's internal address or address length parameter
+ *   is too small or is not a valid part of the user space addressed
+ * * Errno::EINVAL - the +socket+ is already bound to an address
+ * * Errno::ENOBUFS - no buffer space is available
+ * * Errno::ENOTSOCK - the +socket+ argument does not refer to a socket
+ * 
+ * === See
+ * * bind manual pages on unix-based systems
+ * * bind function in Microsoft's Winsock functions reference
+ */ 
+static VALUE
+sock_bind(sock, addr)
+    VALUE sock, addr;
+{
+    OpenFile *fptr;
+
+    StringValue(addr);
+    GetOpenFile(sock, fptr);
+    if (bind(fileno(fptr->f), (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len) < 0)
+	rb_sys_fail("bind(2)");
+
+    return INT2FIX(0);
+}
+
+/*
+ * call-seq:
+ * 	socket.listen( int ) => 0
+ * 
+ * Listens for connections, using the specified +int+ as the backlog. A call
+ * to _listen_ only applies if the +socket+ is of type SOCK_STREAM or 
+ * SOCK_SEQPACKET.
+ * 
+ * === Parameter
+ * * +backlog+ - the maximum length of the queue for pending connections.
+ * 
+ * === Example 1
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
+ * 	socket.bind( sockaddr )
+ * 	socket.listen( 5 )
+ * 
+ * === Example 2 (listening on an arbitary port, unix-based systems only):
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * 	socket.listen( 1 )
+ * 
+ * === Unix-based Exceptions
+ * On unix based systems the above will work because a new +sockaddr+ struct
+ * is created on the address ADDR_ANY, for an arbitrary port number as handed
+ * off by the kernel. It will not work on Windows, because Windows requires that
+ * the +socket+ is bound by calling _bind_ before it can _listen_.
+ * 
+ * If the _backlog_ amount exceeds the implementation-dependent maximum
+ * queue length, the implementation's maximum queue length will be used.
+ * 
+ * On unix-based based systems the following system exceptions may be raised if the
+ * call to _listen_ fails:
+ * * Errno::EBADF - the _socket_ argument is not a valid file descriptor
+ * * Errno::EDESTADDRREQ - the _socket_ is not bound to a local address, and 
+ *   the protocol does not support listening on an unbound socket
+ * * Errno::EINVAL - the _socket_ is already connected
+ * * Errno::ENOTSOCK - the _socket_ argument does not refer to a socket
+ * * Errno::EOPNOTSUPP - the _socket_ protocol does not support listen
+ * * Errno::EACCES - the calling process does not have approriate privileges
+ * * Errno::EINVAL - the _socket_ has been shut down
+ * * Errno::ENOBUFS - insufficient resources are available in the system to 
+ *   complete the call
+ * 
+ * === Windows Exceptions
+ * On Windows systems the following system exceptions may be raised if 
+ * the call to _listen_ fails:
+ * * Errno::ENETDOWN - the network is down
+ * * Errno::EADDRINUSE - the socket's local address is already in use. This 
+ *   usually occurs during the execution of _bind_ but could be delayed
+ *   if the call to _bind_ was to a partially wildcard address (involving
+ *   ADDR_ANY) and if a specific address needs to be commmitted at the 
+ *   time of the call to _listen_
+ * * Errno::EINPROGRESS - a Windows Sockets 1.1 call is in progress or the
+ *   service provider is still processing a callback function
+ * * Errno::EINVAL - the +socket+ has not been bound with a call to _bind_.
+ * * Errno::EISCONN - the +socket+ is already connected
+ * * Errno::EMFILE - no more socket descriptors are available
+ * * Errno::ENOBUFS - no buffer space is available
+ * * Errno::ENOTSOC - +socket+ is not a socket
+ * * Errno::EOPNOTSUPP - the referenced +socket+ is not a type that supports
+ *   the _listen_ method
+ * 
+ * === See
+ * * listen manual pages on unix-based systems
+ * * listen function in Microsoft's Winsock functions reference
+ */
+static VALUE
+sock_listen(sock, log)
+    VALUE sock, log;
+{
+    OpenFile *fptr;
+    int backlog;
+
+    rb_secure(4);
+    backlog = NUM2INT(log);
+    GetOpenFile(sock, fptr);
+    if (listen(fileno(fptr->f), backlog) < 0)
+	rb_sys_fail("listen(2)");
+
+    return INT2FIX(0);
+}
+
+/*
+ * call-seq:
+ * 	socket.recvfrom(maxlen) => [mesg, sender_sockaddr]
+ * 	socket.recvfrom(maxlen, flags) => [mesg, sender_sockaddr]
+ * 
+ * Receives up to _maxlen_ bytes from +socket+. _flags_ is zero or more
+ * of the +MSG_+ options. The first element of the results, _mesg_, is the data
+ * received. The second element, _sender_sockaddr_, contains protocol-specific information
+ * on the sender.
+ * 
+ * === Parameters
+ * * +maxlen+ - the number of bytes to receive from the socket
+ * * +flags+ - zero or more of the +MSG_+ options 
+ * 
+ * === Example
+ * 	# In one file, start this first
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
+ * 	socket.bind( sockaddr )
+ * 	socket.listen( 5 )
+ * 	client, client_sockaddr = socket.accept
+ * 	data = client.recvfrom( 20 )[0].chomp
+ * 	puts "I only received 20 bytes '#{data}'"
+ * 	sleep 1
+ * 	socket.close
+ * 
+ * 	# In another file, start this second
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
+ * 	socket.connect( sockaddr )
+ * 	socket.puts "Watch this get cut short!"
+ * 	socket.close 
+ * 
+ * === Unix-based Exceptions
+ * On unix-based based systems the following system exceptions may be raised if the
+ * call to _recvfrom_ fails:
+ * * Errno::EAGAIN - the +socket+ file descriptor is marked as O_NONBLOCK and no
+ *   data is waiting to be received; or MSG_OOB is set and no out-of-band data
+ *   is available and either the +socket+ file descriptor is marked as 
+ *   O_NONBLOCK or the +socket+ does not support blocking to wait for 
+ *   out-of-band-data
+ * * Errno::EWOULDBLOCK - see Errno::EAGAIN
+ * * Errno::EBADF - the +socket+ is not a valid file descriptor
+ * * Errno::ECONNRESET - a connection was forcibly closed by a peer
+ * * Errno::EFAULT - the socket's internal buffer, address or address length 
+ *   cannot be accessed or written
+ * * Errno::EINTR - a signal interupted _recvfrom_ before any data was available
+ * * Errno::EINVAL - the MSG_OOB flag is set and no out-of-band data is available
+ * * Errno::EIO - an i/o error occurred while reading from or writing to the 
+ *   filesystem
+ * * Errno::ENOBUFS - insufficient resources were available in the system to 
+ *   perform the operation
+ * * Errno::ENOMEM - insufficient memory was available to fulfill the request
+ * * Errno::ENOSR - there were insufficient STREAMS resources available to 
+ *   complete the operation
+ * * Errno::ENOTCONN - a receive is attempted on a connection-mode socket that
+ *   is not connected
+ * * Errno::ENOTSOCK - the +socket+ does not refer to a socket
+ * * Errno::EOPNOTSUPP - the specified flags are not supported for this socket type
+ * * Errno::ETIMEDOUT - the connection timed out during connection establishment
+ *   or due to a transmission timeout on an active connection
+ * 
+ * === Windows Exceptions
+ * On Windows systems the following system exceptions may be raised if 
+ * the call to _recvfrom_ fails:
+ * * Errno::ENETDOWN - the network is down
+ * * Errno::EFAULT - the internal buffer and from parameters on +socket+ are not
+ *   part of the user address space, or the internal fromlen parameter is
+ *   too small to accomodate the peer address
+ * * Errno::EINTR - the (blocking) call was cancelled by an internal call to
+ *   the WinSock function WSACancelBlockingCall
+ * * Errno::EINPROGRESS - a blocking Windows Sockets 1.1 call is in progress or 
+ *   the service provider is still processing a callback function
+ * * Errno::EINVAL - +socket+ has not been bound with a call to _bind_, or an
+ *   unknown flag was specified, or MSG_OOB was specified for a socket with
+ *   SO_OOBINLINE enabled, or (for byte stream-style sockets only) the internal
+ *   len parameter on +socket+ was zero or negative
+ * * Errno::EISCONN - +socket+ is already connected. The call to _recvfrom_ is
+ *   not permitted with a connected socket on a socket that is connetion 
+ *   oriented or connectionless.
+ * * Errno::ENETRESET - the connection has been broken due to the keep-alive 
+ *   activity detecting a failure while the operation was in progress.
+ * * Errno::EOPNOTSUPP - MSG_OOB was specified, but +socket+ is not stream-style
+ *   such as type SOCK_STREAM. OOB data is not supported in the communication
+ *   domain associated with +socket+, or +socket+ is unidirectional and 
+ *   supports only send operations
+ * * Errno::ESHUTDOWN - +socket+ has been shutdown. It is not possible to 
+ *   call _recvfrom_ on a socket after _shutdown_ has been invoked.
+ * * Errno::EWOULDBLOCK - +socket+ is marked as nonblocking and a  call to 
+ *   _recvfrom_ would block.
+ * * Errno::EMSGSIZE - the message was too large to fit into the specified buffer
+ *   and was truncated.
+ * * Errno::ETIMEDOUT - the connection has been dropped, because of a network
+ *   failure or because the system on the other end went down without
+ *   notice
+ * * Errno::ECONNRESET - the virtual circuit was reset by the remote side 
+ *   executing a hard or abortive close. The application should close the
+ *   socket; it is no longer usable. On a UDP-datagram socket this error
+ *   indicates a previous send operation resulted in an ICMP Port Unreachable
+ *   message.
+ */
+static VALUE
+sock_recvfrom(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    return s_recvfrom(sock, argc, argv, RECV_SOCKET);
+}
+
+/*
+ * call-seq:
+ * 	socket.recvfrom_nonblock(maxlen) => [mesg, sender_sockaddr]
+ * 	socket.recvfrom_nonblock(maxlen, flags) => [mesg, sender_sockaddr]
+ * 
+ * Receives up to _maxlen_ bytes from +socket+ using recvfrom(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * _flags_ is zero or more of the +MSG_+ options.
+ * The first element of the results, _mesg_, is the data received.
+ * The second element, _sender_sockaddr_, contains protocol-specific information
+ * on the sender.
+ *
+ * When recvfrom(2) returns 0, Socket#recvfrom_nonblock returns
+ * an empty string as data.
+ * The meaning depends on the socket: EOF on TCP, empty packet on UDP, etc.
+ * 
+ * === Parameters
+ * * +maxlen+ - the number of bytes to receive from the socket
+ * * +flags+ - zero or more of the +MSG_+ options 
+ * 
+ * === Example
+ * 	# In one file, start this first
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
+ * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
+ * 	socket.bind(sockaddr)
+ * 	socket.listen(5)
+ * 	client, client_sockaddr = socket.accept
+ * 	begin
+ * 	  pair = client.recvfrom_nonblock(20)
+ * 	rescue Errno::EAGAIN
+ * 	  IO.select([client])
+ * 	  retry
+ * 	end
+ * 	data = pair[0].chomp
+ * 	puts "I only received 20 bytes '#{data}'"
+ * 	sleep 1
+ * 	socket.close
+ * 
+ * 	# In another file, start this second
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
+ * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
+ * 	socket.connect(sockaddr)
+ * 	socket.puts "Watch this get cut short!"
+ * 	socket.close 
+ * 
+ * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
+ * to _recvfrom_nonblock_ fails. 
+ *
+ * Socket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
+ * including Errno::EAGAIN.
+ *
+ * === See
+ * * Socket#recvfrom
+ */
+static VALUE
+sock_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
+{
+    return s_recvfrom_nonblock(sock, argc, argv, RECV_SOCKET);
+}
+
+/*
+ * call-seq:
+ * 	socket.accept => [ socket, string ]
+ * 
+ * Accepts an incoming connection returning an array containing a new
+ * Socket object and a string holding the +struct+ sockaddr information about 
+ * the caller.
+ * 
+ * === Example
+ * 	# In one script, start this first
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
+ * 	socket.bind( sockaddr )
+ * 	socket.listen( 5 )
+ * 	client, client_sockaddr = socket.accept
+ * 	puts "The client said, '#{client.readline.chomp}'"
+ * 	client.puts "Hello from script one!"
+ * 	socket.close
+ * 
+ * 	# In another script, start this second
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
+ * 	socket.connect( sockaddr )
+ * 	socket.puts "Hello from script 2." 
+ * 	puts "The server said, '#{socket.readline.chomp}'"
+ * 	socket.close 
+ * 
+ * === Unix-based Exceptions
+ * On unix-based based systems the following system exceptions may be raised if the
+ * call to _accept_ fails:
+ * * Errno::EAGAIN - O_NONBLOCK is set for the +socket+ file descriptor and no 
+ *   connections are parent to be accepted
+ * * Errno::EWOULDBLOCK - same as Errno::EAGAIN
+ * * Errno::EBADF - the +socket+ is not a valid file descriptor
+ * * Errno::ECONNABORTED - a connection has been aborted
+ * * Errno::EFAULT - the socket's internal address or address length parameter 
+ *   cannot be access or written
+ * * Errno::EINTR - the _accept_ method was interrupted by a signal that was 
+ *   caught before a valid connection arrived
+ * * Errno::EINVAL - the +socket+ is not accepting connections
+ * * Errno::EMFILE - OPEN_MAX file descriptors are currently open in the calling 
+ *   process
+ * * Errno::ENOBUFS - no buffer space is available
+ * * Errno::ENOMEM - there was insufficient memory available to complete the
+ *   operation
+ * * Errno::ENOSR - there was insufficient STREAMS resources available to 
+ *   complete the operation
+ * * Errno::ENFILE - the maximum number of file descriptors in the system are 
+ *   already open
+ * * Errno::ENOTSOCK - the +socket+ does not refer to a socket
+ * * Errno::EOPNOTSUPP - the socket type for the calling +socket+ does not 
+ *   support accept connections
+ * * Errno::EPROTO - a protocol error has occurred
+ * 
+ * === Windows Exceptions
+ * On Windows systems the following system exceptions may be raised if 
+ * the call to _accept_ fails:
+ * * Errno::ECONNRESET - an incoming connection was indicated, but was 
+ *   terminated by the remote peer prior to accepting the connection
+ * * Errno::EFAULT - the socket's internal address or address length parameter
+ *   is too small or is not a valid part of the user space address
+ * * Errno::EINVAL - the _listen_ method was not invoked prior to calling _accept_
+ * * Errno::EINPROGRESS - a blocking Windows Sockets 1.1 call is in progress or
+ *   the service provider is still processing a callback function
+ * * Errno::EMFILE - the queue is not empty, upong etry to _accept_ and there are
+ *   no socket descriptors available
+ * * Errno::ENETDOWN - the network is down
+ * * Errno::ENOBUFS - no buffer space is available
+ * * Errno::ENOTSOCK - +socket+ is not a socket
+ * * Errno::EOPNOTSUPP - +socket+ is not a type that supports connection-oriented
+ *   service.
+ * * Errno::EWOULDBLOCK - +socket+ is marked as nonblocking and no connections are
+ *   present to be accepted
+ * 
+ * === See
+ * * accept manual pages on unix-based systems
+ * * accept function in Microsoft's Winsock functions reference
+ */
+static VALUE
+sock_accept(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    VALUE sock2;
+    char buf[1024];
+    socklen_t len = sizeof buf;
+
+    GetOpenFile(sock, fptr);
+    sock2 = s_accept(rb_cSocket,fileno(fptr->f),(struct sockaddr*)buf,&len);
+
+    return rb_assoc_new(sock2, rb_str_new(buf, len));
+}
+
+/*
+ * call-seq:
+ *    socket.accept_nonblock => [client_socket, client_sockaddr]
+ * 
+ * Accepts an incoming connection using accept(2) after
+ * O_NONBLOCK is set for the underlying file descriptor.
+ * It returns an array containg the accpeted socket
+ * for the incoming connection, _client_socket_,
+ * and a string that contains the +struct+ sockaddr information
+ * about the caller, _client_sockaddr_.
+ * 
+ * === Example
+ * 	# In one script, start this first
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
+ * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
+ * 	socket.bind(sockaddr)
+ * 	socket.listen(5)
+ * 	begin
+ * 	  client_socket, client_sockaddr = socket.accept_nonblock
+ * 	rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
+ * 	  IO.select([socket])
+ * 	  retry
+ * 	end
+ * 	puts "The client said, '#{client_socket.readline.chomp}'"
+ * 	client_socket.puts "Hello from script one!"
+ * 	socket.close
+ *
+ * 	# In another script, start this second
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
+ * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
+ * 	socket.connect(sockaddr)
+ * 	socket.puts "Hello from script 2." 
+ * 	puts "The server said, '#{socket.readline.chomp}'"
+ * 	socket.close
+ * 
+ * Refer to Socket#accept for the exceptions that may be thrown if the call
+ * to _accept_nonblock_ fails. 
+ *
+ * Socket#accept_nonblock may raise any error corresponding to accept(2) failure,
+ * including Errno::EAGAIN.
+ * 
+ * === See
+ * * Socket#accept
+ */
+static VALUE
+sock_accept_nonblock(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    VALUE sock2;
+    char buf[1024];
+    socklen_t len = sizeof buf;
+
+    GetOpenFile(sock, fptr);
+    sock2 = s_accept_nonblock(rb_cSocket, fptr, (struct sockaddr *)buf, &len);
+    return rb_assoc_new(sock2, rb_str_new(buf, len));
+}
+
+/*
+ * call-seq:
+ * 	socket.sysaccept => [client_socket_fd, client_sockaddr]
+ * 
+ * Accepts an incoming connection returnings an array containg the (integer)
+ * file descriptor for the incoming connection, _client_socket_fd_,
+ * and a string that contains the +struct+ sockaddr information
+ * about the caller, _client_sockaddr_.
+ * 
+ * === Example
+ * 	# In one script, start this first
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
+ * 	socket.bind( sockaddr )
+ * 	socket.listen( 5 )
+ * 	client_fd, client_sockaddr = socket.sysaccept
+ * 	client_socket = Socket.for_fd( client_fd )
+ * 	puts "The client said, '#{client_socket.readline.chomp}'"
+ * 	client_socket.puts "Hello from script one!"
+ * 	socket.close
+ * 
+ * 	# In another script, start this second
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
+ * 	socket.connect( sockaddr )
+ * 	socket.puts "Hello from script 2." 
+ * 	puts "The server said, '#{socket.readline.chomp}'"
+ * 	socket.close
+ * 
+ * Refer to Socket#accept for the exceptions that may be thrown if the call
+ * to _sysaccept_ fails. 
+ * 
+ * === See
+ * * Socket#accept
+ */
+static VALUE
+sock_sysaccept(sock)
+    VALUE sock;
+{
+    OpenFile *fptr;
+    VALUE sock2;
+    char buf[1024];
+    socklen_t len = sizeof buf;
+
+    GetOpenFile(sock, fptr);
+    sock2 = s_accept(0,fileno(fptr->f),(struct sockaddr*)buf,&len);
+
+    return rb_assoc_new(sock2, rb_str_new(buf, len));
+}
+
+#ifdef HAVE_GETHOSTNAME
+static VALUE
+sock_gethostname(obj)
+    VALUE obj;
+{
+    char buf[1024];
+
+    rb_secure(3);
+    if (gethostname(buf, (int)sizeof buf - 1) < 0)
+	rb_sys_fail("gethostname");
+
+    buf[sizeof buf - 1] = '\0';
+    return rb_str_new2(buf);
+}
+#else
+#ifdef HAVE_UNAME
+
+#include <sys/utsname.h>
+
+static VALUE
+sock_gethostname(obj)
+    VALUE obj;
+{
+    struct utsname un;
+
+    rb_secure(3);
+    uname(&un);
+    return rb_str_new2(un.nodename);
+}
+#else
+static VALUE
+sock_gethostname(obj)
+    VALUE obj;
+{
+    rb_notimplement();
+}
+#endif
+#endif
+
+static VALUE
+make_addrinfo(res0)
+    struct addrinfo *res0;
+{
+    VALUE base, ary;
+    struct addrinfo *res;
+
+    if (res0 == NULL) {
+	rb_raise(rb_eSocket, "host not found");
+    }
+    base = rb_ary_new();
+    for (res = res0; res; res = res->ai_next) {
+	ary = ipaddr(res->ai_addr);
+	rb_ary_push(ary, INT2FIX(res->ai_family));
+	rb_ary_push(ary, INT2FIX(res->ai_socktype));
+	rb_ary_push(ary, INT2FIX(res->ai_protocol));
+	rb_ary_push(base, ary);
+    }
+    return base;
+}
+
+/* Returns a String containing the binary value of a struct sockaddr. */
+VALUE
+sock_sockaddr(addr, len)
+    struct sockaddr *addr;
+    size_t len;
+{
+    char *ptr;
+
+    switch (addr->sa_family) {
+      case AF_INET:
+	ptr = (char*)&((struct sockaddr_in*)addr)->sin_addr.s_addr;
+	len = sizeof(((struct sockaddr_in*)addr)->sin_addr.s_addr);
+	break;
+#ifdef INET6
+      case AF_INET6:
+	ptr = (char*)&((struct sockaddr_in6*)addr)->sin6_addr.s6_addr;
+	len = sizeof(((struct sockaddr_in6*)addr)->sin6_addr.s6_addr);
+	break;
+#endif
+      default:
+        rb_raise(rb_eSocket, "unknown socket family:%d", addr->sa_family);
+	break;
+    }
+    return rb_str_new(ptr, len);
+}
+
+/*
+ * Document-class: IPSocket
+ *
+ * IPSocket is the parent of TCPSocket and UDPSocket and implements
+ * functionality common to them.
+ *
+ * A number of APIs in IPSocket, Socket, and their descendants return an
+ * address as an array. The members of that array are:
+ * - address family: A string like "AF_INET" or "AF_INET6" if it is one of the
+ *   commonly used families, the string "unknown:#" (where `#' is the address
+ *   family number) if it is not one of the common ones.  The strings map to
+ *   the Socket::AF_* constants.
+ * - port: The port number.
+ * - name: Either the canonical name from looking the address up in the DNS, or
+ *   the address in presentation format
+ * - address: The address in presentation format (a dotted decimal string for
+ *   IPv4, a hex string for IPv6).
+ *
+ * The address and port can be used directly to create sockets and to bind or
+ * connect them to the address.
+ */
+
+/*
+ * Document-class: Socket
+ *
+ * Socket contains a number of generally useful singleton methods and
+ * constants, as well as offering low-level interfaces that can be used to
+ * develop socket applications using protocols other than TCP, UDP, and UNIX
+ * domain sockets.
+ */
+
+/*
+ * Document-method: gethostbyname
+ * call-seq: Socket.gethostbyname(host) => hostent
+ *
+ * Resolve +host+ and return name and address information for it, similarly to
+ * gethostbyname(3). +host+ can be a domain name or the presentation format of
+ * an address.
+ *
+ * Returns an array of information similar to that found in a +struct hostent+:
+ *   - cannonical name: the cannonical name for host in the DNS, or a
+ *     string representing the address
+ *   - aliases: an array of aliases for the canonical name, there may be no aliases
+ *   - address family: usually one of Socket::AF_INET or Socket::AF_INET6
+ *   - address: a string, the binary value of the +struct sockaddr+ for this name, in
+ *     the indicated address family
+ *   - ...: if there are multiple addresses for this host,  a series of
+ *     strings/+struct sockaddr+s may follow, not all necessarily in the same
+ *     address family. Note that the fact that they may not be all in the same
+ *     address family is a departure from the behaviour of gethostbyname(3).
+ *
+ * Note: I believe that the fact that the multiple addresses returned are not
+ * necessarily in the same address family may be a bug, since if this function
+ * actually called gethostbyname(3), ALL the addresses returned in the trailing
+ * address list (h_addr_list from struct hostent) would be of the same address
+ * family!  Examples from my system, OS X 10.3:
+ *
+ *   ["localhost", [], 30, "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001", "\177\000\000\001"]
+ *     and
+ *   ["ensemble.local", [], 30, "\376\200\000\004\000\000\000\000\002\003\223\377\376\255\010\214", "\300\250{\232" ]
+ *
+ * Similar information can be returned by Socket.getaddrinfo if called as:
+ *
+ *    Socket.getaddrinfo(+host+, 0, Socket::AF_UNSPEC, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME)
+ *
+ * == Examples
+ *   
+ *   Socket.gethostbyname "example.com"                                                           
+ *   => ["example.com", [], 2, "\300\000\"\246"]
+ *   
+ * This name has no DNS aliases, and a single IPv4 address.
+ *   
+ *   Socket.gethostbyname "smtp.telus.net"
+ *   => ["smtp.svc.telus.net", ["smtp.telus.net"], 2, "\307\271\334\371"]
+ *   
+ * This name is an an alias so the canonical name is returned, as well as the
+ * alias and a single IPv4 address.
+ *   
+ *   Socket.gethostbyname "localhost"
+ *   => ["localhost", [], 30, "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001", "\177\000\000\001"]
+ *   
+ * This machine has no aliases, returns an IPv6 address, and has an additional IPv4 address.
+ *
+ * +host+ can also be an IP address in presentation format, in which case a
+ * reverse lookup is done on the address:
+ *
+ *   Socket.gethostbyname("127.0.0.1")
+ *   => ["localhost", [], 2, "\177\000\000\001"]
+ *
+ *   Socket.gethostbyname("192.0.34.166")
+ *   => ["www.example.com", [], 2, "\300\000\"\246"]
+ *
+ *
+ * == See
+ * See: Socket.getaddrinfo
+ */
+static VALUE
+sock_s_gethostbyname(obj, host)
+    VALUE obj, host;
+{
+    rb_secure(3);
+    return make_hostent(host, sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), sock_sockaddr);
+}
+
+static VALUE
+sock_s_gethostbyaddr(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE addr, type;
+    struct hostent *h;
+    struct sockaddr *sa;
+    char **pch;
+    VALUE ary, names;
+    int t = AF_INET;
+
+    rb_scan_args(argc, argv, "11", &addr, &type);
+    sa = (struct sockaddr*)StringValuePtr(addr);
+    if (!NIL_P(type)) {
+	t = NUM2INT(type);
+    }
+#ifdef INET6
+    else if (RSTRING(addr)->len == 16) {
+	t = AF_INET6;
+    }
+#endif
+    h = gethostbyaddr(RSTRING(addr)->ptr, RSTRING(addr)->len, t);
+    if (h == NULL) {
+#ifdef HAVE_HSTRERROR
+	extern int h_errno;
+	rb_raise(rb_eSocket, "%s", (char*)hstrerror(h_errno));
+#else
+	rb_raise(rb_eSocket, "host not found");
+#endif
+    }
+    ary = rb_ary_new();
+    rb_ary_push(ary, rb_str_new2(h->h_name));
+    names = rb_ary_new();
+    rb_ary_push(ary, names);
+    if (h->h_aliases != NULL) {
+	for (pch = h->h_aliases; *pch; pch++) {
+	    rb_ary_push(names, rb_str_new2(*pch));
+	}
+    }
+    rb_ary_push(ary, INT2NUM(h->h_addrtype));
+#ifdef h_addr
+    for (pch = h->h_addr_list; *pch; pch++) {
+	rb_ary_push(ary, rb_str_new(*pch, h->h_length));
+    }
+#else
+    rb_ary_push(ary, rb_str_new(h->h_addr, h->h_length));
+#endif
+
+    return ary;
+}
+
+/*
+ * Document-method: getservbyname
+ * call-seq: Socket.getservbyname(name, proto="tcp") => port
+ *
+ * +name+ is a service name ("ftp", "telnet", ...) and proto is a protocol name
+ * ("udp", "tcp", ...). '/etc/services' (or your system's equivalent) is
+ * searched for a service for +name+ and +proto+, and the port number is
+ * returned.
+ *
+ * Note that unlike Socket.getaddrinfo, +proto+ may not be specified using the
+ * Socket::SOCK_* constants, a string must must be used.
+ */
+static VALUE
+sock_s_getservbyaname(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE service, proto;
+    struct servent *sp;
+    int port;
+
+    rb_scan_args(argc, argv, "11", &service, &proto);
+    if (NIL_P(proto)) proto = rb_str_new2("tcp");
+    StringValue(service);
+    StringValue(proto);
+
+    sp = getservbyname(StringValueCStr(service),  StringValueCStr(proto));
+    if (sp) {
+	port = ntohs(sp->s_port);
+    }
+    else {
+	char *s = RSTRING(service)->ptr;
+	char *end;
+
+	port = strtoul(s, &end, 0);
+	if (*end != '\0') {
+	    rb_raise(rb_eSocket, "no such service %s/%s", s, RSTRING(proto)->ptr);
+	}
+    }
+    return INT2FIX(port);
+}
+
+/*
+Documentation should explain the following:
+
+  $ pp Socket.getaddrinfo("", 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
+  [["AF_INET", 1, "0.0.0.0", "0.0.0.0", 2, 1, 6]]
+
+  $ pp Socket.getaddrinfo(nil, 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
+  [["AF_INET6", 1, "::", "::", 30, 1, 6],
+   ["AF_INET", 1, "0.0.0.0", "0.0.0.0", 2, 1, 6]]
+
+  $ pp Socket.getaddrinfo("localhost", 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
+  [["AF_INET6", 1, "localhost", "::1", 30, 1, 6],
+   ["AF_INET", 1, "localhost", "127.0.0.1", 2, 1, 6]]
+
+  $ pp Socket.getaddrinfo("ensemble.local.", 1, Socket::AF_UNSPEC, Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
+  [["AF_INET", 1, "localhost", "192.168.123.154", 2, 1, 6]]
+
+Does it?
+
+API suggestion: this method has too many arguments, it would be backwards compatible and easier
+to understand if limit args were accepted as :family=>..., :flags=>...
+*/
+
+/*
+ * Document-method: getaddrinfo
+ * call-seq: Socket.getaddrinfo(host, service, family=nil, socktype=nil, protocol=nil, flags=nil) => addrinfo
+ *
+ * Return address information for +host+ and +port+. The remaining arguments
+ * are hints that limit the address information returned.
+ *
+ * This method corresponds closely to the POSIX.1g getaddrinfo() definition.
+ *
+ * === Parameters
+ * - +host+ is a host name or an address string (dotted decimal for IPv4, or a hex string
+ *   for IPv6) for which to return information. A nil is also allowed, its meaning
+ *   depends on +flags+, see below.
+ * - +service+ is a service name ("http", "ssh", ...), or 
+ *   a port number (80, 22, ...), see Socket.getservbyname for more
+ *   information. A nil is also allowed, meaning zero.
+ * - +family+ limits the output to a specific address family, one of the
+ *   Socket::AF_* constants. Socket::AF_INET (IPv4) and Socket::AF_INET6 (IPv6)
+ *   are the most commonly used families. You will usually pass either nil or
+ *   Socket::AF_UNSPEC, allowing the IPv6 information to be returned first if
+ *   +host+ is reachable via IPv6, and IPv4 information otherwise.  The two
+ *   strings "AF_INET" or "AF_INET6" are also allowed, they are converted to
+ *   their respective Socket::AF_* constants.
+ * - +socktype+ limits the output to a specific type of socket, one of the
+ *   Socket::SOCK_* constants. Socket::SOCK_STREAM (for TCP) and
+ *   Socket::SOCK_DGRAM (for UDP) are the most commonly used socket types. If
+ *   nil, then information for all types of sockets supported by +service+ will
+ *   be returned. You will usually know what type of socket you intend to
+ *   create, and should pass that socket type in.
+ * - +protocol+ limits the output to a specific protocol numpber, one of the
+ *   Socket::IPPROTO_* constants. It is usually implied by the socket type
+ *   (Socket::SOCK_STREAM => Socket::IPPROTO_TCP, ...), if you pass other than
+ *   nil you already know what this is for.
+ * - +flags+ is one of the Socket::AI_* constants. They mean:
+ *   - Socket::AI_PASSIVE: when set, if +host+ is nil the 'any' address will be
+ *     returned, Socket::INADDR_ANY or 0 for IPv4, "0::0" or "::" for IPv6.  This
+ *     address is suitable for use by servers that will bind their socket and do
+ *     a passive listen, thus the name of the flag. Otherwise the local or
+ *     loopback address will be returned, this is "127.0.0.1" for IPv4 and "::1'
+ *     for IPv6.
+ *   - ...
+ *
+ *
+ * === Returns
+ *
+ * Returns an array of arrays, where each subarray contains:
+ * - address family, a string like "AF_INET" or "AF_INET6"
+ * - port number, the port number for +service+
+ * - host name, either a canonical name for +host+, or it's address in presentation
+ *   format if the address could not be looked up.
+ * - host IP, the address of +host+ in presentation format
+ * - address family, as a numeric value (one of the Socket::AF_* constants).
+ * - socket type, as a numeric value (one of the Socket::SOCK_* constants).
+ * - protocol number, as a numeric value (one of the Socket::IPPROTO_* constants).
+ *
+ * The first four values are identical to what is commonly returned as an
+ * address array, see IPSocket for more information.
+ *
+ * === Examples
+ *
+ * Not all input combinations are valid, and while there are many combinations,
+ * only a few cases are common.
+ *
+ * A typical client will call getaddrinfo with the +host+ and +service+ it
+ * wants to connect to. It knows that it will attempt to connect with either
+ * TCP or UDP, and specifies +socktype+ accordingly. It loops through all
+ * returned addresses, and try to connect to them in turn:
+ *
+ *   addrinfo = Socket::getaddrinfo('www.example.com', 'www', nil, Socket::SOCK_STREAM)
+ *   addrinfo.each do |af, port, name, addr|
+ *     begin
+ *       sock = TCPSocket.new(addr, port)
+ *       # ...
+ *       exit 1
+ *     rescue
+ *     end
+ *   end
+ *
+ * With UDP you don't know if connect suceeded, but if communication fails,
+ * the next address can be tried.
+ *
+ * A typical server will call getaddrinfo with a +host+ of nil, the +service+
+ * it listens to, and a +flags+ of Socket::AI_PASSIVE. It will listen for
+ * connections on the first returned address:
+ *   addrinfo = Socket::getaddrinfo(nil, 'www', nil, Socket::SOCK_STREAM, nil, Socket::AI_PASSIVE)
+ *   af, port, name, addr = addrinfo.first
+ *   sock = TCPServer(addr, port)
+ *   while( client = s.accept )
+ *     # ...
+ *   end
+ */
+static VALUE
+sock_s_getaddrinfo(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE host, port, family, socktype, protocol, flags, ret;
+    char hbuf[1024], pbuf[1024];
+    char *hptr, *pptr, *ap;
+    struct addrinfo hints, *res;
+    int error;
+
+    host = port = family = socktype = protocol = flags = Qnil;
+    rb_scan_args(argc, argv, "24", &host, &port, &family, &socktype, &protocol, &flags);
+    if (NIL_P(host)) {
+	hptr = NULL;
+    }
+    else {
+	strncpy(hbuf, StringValuePtr(host), sizeof(hbuf));
+	hbuf[sizeof(hbuf) - 1] = '\0';
+	hptr = hbuf;
+    }
+    if (NIL_P(port)) {
+	pptr = NULL;
+    }
+    else if (FIXNUM_P(port)) {
+	snprintf(pbuf, sizeof(pbuf), "%ld", FIX2LONG(port));
+	pptr = pbuf;
+    }
+    else {
+	strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
+	pbuf[sizeof(pbuf) - 1] = '\0';
+	pptr = pbuf;
+    }
+
+    MEMZERO(&hints, struct addrinfo, 1);
+    if (NIL_P(family)) {
+	hints.ai_family = PF_UNSPEC;
+    }
+    else if (FIXNUM_P(family)) {
+	hints.ai_family = FIX2INT(family);
+    }
+    else if ((ap = StringValuePtr(family)) != 0) {
+	if (strcmp(ap, "AF_INET") == 0) {
+	    hints.ai_family = PF_INET;
+	}
+#ifdef INET6
+	else if (strcmp(ap, "AF_INET6") == 0) {
+	    hints.ai_family = PF_INET6;
+	}
+#endif
+    }
+
+    if (!NIL_P(socktype)) {
+	hints.ai_socktype = NUM2INT(socktype);
+    }
+    if (!NIL_P(protocol)) {
+	hints.ai_protocol = NUM2INT(protocol);
+    }
+    if (!NIL_P(flags)) {
+	hints.ai_flags = NUM2INT(flags);
+    }
+    error = getaddrinfo(hptr, pptr, &hints, &res);
+    if (error) {
+	rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
+    }
+
+    ret = make_addrinfo(res);
+    freeaddrinfo(res);
+    return ret;
+}
+
+static VALUE
+sock_s_getnameinfo(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags, tmp;
+    char *hptr, *pptr;
+    char hbuf[1024], pbuf[1024];
+    int fl;
+    struct addrinfo hints, *res = NULL, *r;
+    int error;
+    struct sockaddr_storage ss;
+    struct sockaddr *sap;
+    char *ap;
+
+    sa = flags = Qnil;
+    rb_scan_args(argc, argv, "11", &sa, &flags);
+
+    fl = 0;
+    if (!NIL_P(flags)) {
+	fl = NUM2INT(flags);
+    }
+    tmp = rb_check_string_type(sa);
+    if (!NIL_P(tmp)) {
+	sa = tmp;
+	if (sizeof(ss) < RSTRING(sa)->len) {
+	    rb_raise(rb_eTypeError, "sockaddr length too big");
+	}
+	memcpy(&ss, RSTRING(sa)->ptr, RSTRING(sa)->len);
+	if (RSTRING(sa)->len != SA_LEN((struct sockaddr*)&ss)) {
+	    rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
+	}
+	sap = (struct sockaddr*)&ss;
+	goto call_nameinfo;
+    }
+    tmp = rb_check_array_type(sa);
+    if (!NIL_P(tmp)) {
+	sa = tmp;
+	MEMZERO(&hints, struct addrinfo, 1);
+	if (RARRAY(sa)->len == 3) {
+	    af = RARRAY(sa)->ptr[0];
+	    port = RARRAY(sa)->ptr[1];
+	    host = RARRAY(sa)->ptr[2];
+	}
+	else if (RARRAY(sa)->len >= 4) {
+	    af = RARRAY(sa)->ptr[0];
+	    port = RARRAY(sa)->ptr[1];
+	    host = RARRAY(sa)->ptr[3];
+	    if (NIL_P(host)) {
+		host = RARRAY(sa)->ptr[2];
+	    }
+	    else {
+		/*
+		 * 4th element holds numeric form, don't resolve.
+		 * see ipaddr().
+		 */
+#ifdef AI_NUMERICHOST /* AIX 4.3.3 doesn't have AI_NUMERICHOST. */
+		hints.ai_flags |= AI_NUMERICHOST;
+#endif
+	    }
+	}
+	else {
+	    rb_raise(rb_eArgError, "array size should be 3 or 4, %ld given",
+		     RARRAY(sa)->len);
+	}
+	/* host */
+	if (NIL_P(host)) {
+	    hptr = NULL;
+	}
+	else {
+	    strncpy(hbuf, StringValuePtr(host), sizeof(hbuf));
+	    hbuf[sizeof(hbuf) - 1] = '\0';
+	    hptr = hbuf;
+	}
+	/* port */
+	if (NIL_P(port)) {
+	    strcpy(pbuf, "0");
+	    pptr = NULL;
+	}
+	else if (FIXNUM_P(port)) {
+	    snprintf(pbuf, sizeof(pbuf), "%ld", NUM2LONG(port));
+	    pptr = pbuf;
+	}
+	else {
+	    strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
+	    pbuf[sizeof(pbuf) - 1] = '\0';
+	    pptr = pbuf;
+	}
+	hints.ai_socktype = (fl & NI_DGRAM) ? SOCK_DGRAM : SOCK_STREAM;
+	/* af */
+	if (NIL_P(af)) {
+	    hints.ai_family = PF_UNSPEC;
+	}
+	else if (FIXNUM_P(af)) {
+	    hints.ai_family = FIX2INT(af);
+	}
+	else if ((ap = StringValuePtr(af)) != 0) {
+	    if (strcmp(ap, "AF_INET") == 0) {
+		hints.ai_family = PF_INET;
+	    }
+#ifdef INET6
+	    else if (strcmp(ap, "AF_INET6") == 0) {
+		hints.ai_family = PF_INET6;
+	    }
+#endif
+	}
+	error = getaddrinfo(hptr, pptr, &hints, &res);
+	if (error) goto error_exit_addr;
+	sap = res->ai_addr;
+    }
+    else {
+	rb_raise(rb_eTypeError, "expecting String or Array");
+    }
+
+  call_nameinfo:
+    error = getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf),
+			pbuf, sizeof(pbuf), fl);
+    if (error) goto error_exit_name;
+    if (res) {
+	for (r = res->ai_next; r; r = r->ai_next) {
+	    char hbuf2[1024], pbuf2[1024];
+
+	    sap = r->ai_addr;
+	    error = getnameinfo(sap, SA_LEN(sap), hbuf2, sizeof(hbuf2),
+				pbuf2, sizeof(pbuf2), fl);
+	    if (error) goto error_exit_name;
+	    if (strcmp(hbuf, hbuf2) != 0|| strcmp(pbuf, pbuf2) != 0) {
+		freeaddrinfo(res);
+		rb_raise(rb_eSocket, "sockaddr resolved to multiple nodename");
+	    }
+	}
+	freeaddrinfo(res);
+    }
+    return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf));
+
+  error_exit_addr:
+    if (res) freeaddrinfo(res);
+    rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
+
+  error_exit_name:
+    if (res) freeaddrinfo(res);
+    rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
+}
+
+static VALUE
+sock_s_pack_sockaddr_in(self, port, host)
+    VALUE self, port, host;
+{
+    struct addrinfo *res = sock_addrinfo(host, port, 0, 0);
+    VALUE addr = rb_str_new((char*)res->ai_addr, res->ai_addrlen);
+
+    freeaddrinfo(res);
+    OBJ_INFECT(addr, port);
+    OBJ_INFECT(addr, host);
+
+    return addr;
+}
+
+static VALUE
+sock_s_unpack_sockaddr_in(self, addr)
+    VALUE self, addr;
+{
+    struct sockaddr_in * sockaddr;
+    VALUE host;
+
+    sockaddr = (struct sockaddr_in*)StringValuePtr(addr);
+    if (((struct sockaddr *)sockaddr)->sa_family != AF_INET
+#ifdef INET6
+        && ((struct sockaddr *)sockaddr)->sa_family != AF_INET6
+#endif
+        ) {
+#ifdef INET6
+        rb_raise(rb_eArgError, "not an AF_INET/AF_INET6 sockaddr");
+#else
+        rb_raise(rb_eArgError, "not an AF_INET sockaddr");
+#endif
+    }
+    host = make_ipaddr((struct sockaddr*)sockaddr);
+    OBJ_INFECT(host, addr);
+    return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host);
+}
+
+#ifdef HAVE_SYS_UN_H
+static VALUE
+sock_s_pack_sockaddr_un(self, path)
+    VALUE self, path;
+{
+    struct sockaddr_un sockaddr;
+    char *sun_path;
+    VALUE addr;
+
+    MEMZERO(&sockaddr, struct sockaddr_un, 1);
+    sockaddr.sun_family = AF_UNIX;
+    sun_path = StringValueCStr(path);
+    if (sizeof(sockaddr.sun_path) <= strlen(sun_path)) {
+        rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)",
+            (int)sizeof(sockaddr.sun_path)-1);
+    }
+    strncpy(sockaddr.sun_path, sun_path, sizeof(sockaddr.sun_path)-1);
+    addr = rb_str_new((char*)&sockaddr, sizeof(sockaddr));
+    OBJ_INFECT(addr, path);
+
+    return addr;
+}
+
+static VALUE
+sock_s_unpack_sockaddr_un(self, addr)
+    VALUE self, addr;
+{
+    struct sockaddr_un * sockaddr;
+    char *sun_path;
+    VALUE path;
+
+    sockaddr = (struct sockaddr_un*)StringValuePtr(addr);
+    if (((struct sockaddr *)sockaddr)->sa_family != AF_UNIX) {
+        rb_raise(rb_eArgError, "not an AF_UNIX sockaddr");
+    }
+    if (sizeof(struct sockaddr_un) < RSTRING(addr)->len) {
+        rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
+		 RSTRING(addr)->len, sizeof(struct sockaddr_un));
+    }
+    sun_path = unixpath(sockaddr, RSTRING(addr)->len);
+    if (sizeof(struct sockaddr_un) == RSTRING(addr)->len &&
+        sun_path == sockaddr->sun_path &&
+        sun_path + strlen(sun_path) == RSTRING(addr)->ptr + RSTRING(addr)->len) {
+        rb_raise(rb_eArgError, "sockaddr_un.sun_path not NUL terminated");
+    }
+    path = rb_str_new2(sun_path);
+    OBJ_INFECT(path, addr);
+    return path;
+}
+#endif
+
+static VALUE mConst;
+
+static void
+sock_define_const(name, value)
+    char *name;
+    int value;
+{
+    rb_define_const(rb_cSocket, name, INT2FIX(value));
+    rb_define_const(mConst, name, INT2FIX(value));
+}
+
+/*
+ * Class +Socket+ provides access to the underlying operating system
+ * socket implementations. It can be used to provide more operating system
+ * specific functionality than the protocol-specific socket classes but at the
+ * expense of greater complexity. In particular, the class handles addresses
+ * using +struct sockaddr+ structures packed into Ruby strings, which can be
+ * a joy to manipulate.
+ * 
+ * === Exception Handling
+ * Ruby's implementation of +Socket+ causes an exception to be raised
+ * based on the error generated by the system dependent implementation.
+ * This is why the methods are documented in a way that isolate
+ * Unix-based system exceptions from Windows based exceptions. If more
+ * information on particular exception is needed please refer to the 
+ * Unix manual pages or the Windows WinSock reference.
+ * 
+ * 
+ * === Documentation by
+ * * Zach Dennis
+ * * Sam Roberts
+ * * <em>Programming Ruby</em> from The Pragmatic Bookshelf.  
+ * 
+ * Much material in this documentation is taken with permission from  
+ * <em>Programming Ruby</em> from The Pragmatic Bookshelf.  
+ */
+void
+Init_socket()
+{
+    rb_eSocket = rb_define_class("SocketError", rb_eStandardError);
+
+    rb_cBasicSocket = rb_define_class("BasicSocket", rb_cIO);
+    rb_undef_method(rb_cBasicSocket, "initialize");
+
+    rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup",
+			       bsock_do_not_rev_lookup, 0);
+    rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup=",
+			       bsock_do_not_rev_lookup_set, 1);
+    rb_define_singleton_method(rb_cBasicSocket, "for_fd", bsock_s_for_fd, 1);
+
+    rb_define_method(rb_cBasicSocket, "close_read", bsock_close_read, 0);
+    rb_define_method(rb_cBasicSocket, "close_write", bsock_close_write, 0);
+    rb_define_method(rb_cBasicSocket, "shutdown", bsock_shutdown, -1);
+    rb_define_method(rb_cBasicSocket, "setsockopt", bsock_setsockopt, 3);
+    rb_define_method(rb_cBasicSocket, "getsockopt", bsock_getsockopt, 2);
+    rb_define_method(rb_cBasicSocket, "getsockname", bsock_getsockname, 0);
+    rb_define_method(rb_cBasicSocket, "getpeername", bsock_getpeername, 0);
+    rb_define_method(rb_cBasicSocket, "send", bsock_send, -1);
+    rb_define_method(rb_cBasicSocket, "recv", bsock_recv, -1);
+    rb_define_method(rb_cBasicSocket, "recv_nonblock", bsock_recv_nonblock, -1);
+
+    rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket);
+    rb_define_global_const("IPsocket", rb_cIPSocket);
+    rb_define_method(rb_cIPSocket, "addr", ip_addr, 0);
+    rb_define_method(rb_cIPSocket, "peeraddr", ip_peeraddr, 0);
+    rb_define_method(rb_cIPSocket, "recvfrom", ip_recvfrom, -1);
+    rb_define_singleton_method(rb_cIPSocket, "getaddress", ip_s_getaddress, 1);
+
+    rb_cTCPSocket = rb_define_class("TCPSocket", rb_cIPSocket);
+    rb_define_global_const("TCPsocket", rb_cTCPSocket);
+    rb_define_singleton_method(rb_cTCPSocket, "gethostbyname", tcp_s_gethostbyname, 1);
+    rb_define_method(rb_cTCPSocket, "initialize", tcp_init, -1);
+
+#ifdef SOCKS
+    rb_cSOCKSSocket = rb_define_class("SOCKSSocket", rb_cTCPSocket);
+    rb_define_global_const("SOCKSsocket", rb_cSOCKSSocket);
+    rb_define_method(rb_cSOCKSSocket, "initialize", socks_init, 2);
+#ifdef SOCKS5
+    rb_define_method(rb_cSOCKSSocket, "close", socks_s_close, 0);
+#endif
+#endif
+
+    rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket);
+    rb_define_global_const("TCPserver", rb_cTCPServer);
+    rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0);
+    rb_define_method(rb_cTCPServer, "accept_nonblock", tcp_accept_nonblock, 0);
+    rb_define_method(rb_cTCPServer, "sysaccept", tcp_sysaccept, 0);
+    rb_define_method(rb_cTCPServer, "initialize", tcp_svr_init, -1);
+    rb_define_method(rb_cTCPServer, "listen", sock_listen, 1);
+
+    rb_cUDPSocket = rb_define_class("UDPSocket", rb_cIPSocket);
+    rb_define_global_const("UDPsocket", rb_cUDPSocket);
+    rb_define_method(rb_cUDPSocket, "initialize", udp_init, -1);
+    rb_define_method(rb_cUDPSocket, "connect", udp_connect, 2);
+    rb_define_method(rb_cUDPSocket, "bind", udp_bind, 2);
+    rb_define_method(rb_cUDPSocket, "send", udp_send, -1);
+    rb_define_method(rb_cUDPSocket, "recvfrom_nonblock", udp_recvfrom_nonblock, -1);
+
+#ifdef HAVE_SYS_UN_H
+    rb_cUNIXSocket = rb_define_class("UNIXSocket", rb_cBasicSocket);
+    rb_define_global_const("UNIXsocket", rb_cUNIXSocket);
+    rb_define_method(rb_cUNIXSocket, "initialize", unix_init, 1);
+    rb_define_method(rb_cUNIXSocket, "path", unix_path, 0);
+    rb_define_method(rb_cUNIXSocket, "addr", unix_addr, 0);
+    rb_define_method(rb_cUNIXSocket, "peeraddr", unix_peeraddr, 0);
+    rb_define_method(rb_cUNIXSocket, "recvfrom", unix_recvfrom, -1);
+    rb_define_method(rb_cUNIXSocket, "send_io", unix_send_io, 1);
+    rb_define_method(rb_cUNIXSocket, "recv_io", unix_recv_io, -1);
+    rb_define_singleton_method(rb_cUNIXSocket, "socketpair", unix_s_socketpair, -1);
+    rb_define_singleton_method(rb_cUNIXSocket, "pair", unix_s_socketpair, -1);
+
+    rb_cUNIXServer = rb_define_class("UNIXServer", rb_cUNIXSocket);
+    rb_define_global_const("UNIXserver", rb_cUNIXServer);
+    rb_define_method(rb_cUNIXServer, "initialize", unix_svr_init, 1);
+    rb_define_method(rb_cUNIXServer, "accept", unix_accept, 0);
+    rb_define_method(rb_cUNIXServer, "accept_nonblock", unix_accept_nonblock, 0);
+    rb_define_method(rb_cUNIXServer, "sysaccept", unix_sysaccept, 0);
+    rb_define_method(rb_cUNIXServer, "listen", sock_listen, 1);
+#endif
+
+    rb_cSocket = rb_define_class("Socket", rb_cBasicSocket);
+
+    rb_define_method(rb_cSocket, "initialize", sock_initialize, 3);
+    rb_define_method(rb_cSocket, "connect", sock_connect, 1);
+    rb_define_method(rb_cSocket, "connect_nonblock", sock_connect_nonblock, 1);
+    rb_define_method(rb_cSocket, "bind", sock_bind, 1);
+    rb_define_method(rb_cSocket, "listen", sock_listen, 1);
+    rb_define_method(rb_cSocket, "accept", sock_accept, 0);
+    rb_define_method(rb_cSocket, "accept_nonblock", sock_accept_nonblock, 0);
+    rb_define_method(rb_cSocket, "sysaccept", sock_sysaccept, 0);
+
+    rb_define_method(rb_cSocket, "recvfrom", sock_recvfrom, -1);
+    rb_define_method(rb_cSocket, "recvfrom_nonblock", sock_recvfrom_nonblock, -1);
+
+    rb_define_singleton_method(rb_cSocket, "socketpair", sock_s_socketpair, 3);
+    rb_define_singleton_method(rb_cSocket, "pair", sock_s_socketpair, 3);
+    rb_define_singleton_method(rb_cSocket, "gethostname", sock_gethostname, 0);
+    rb_define_singleton_method(rb_cSocket, "gethostbyname", sock_s_gethostbyname, 1);
+    rb_define_singleton_method(rb_cSocket, "gethostbyaddr", sock_s_gethostbyaddr, -1);
+    rb_define_singleton_method(rb_cSocket, "getservbyname", sock_s_getservbyaname, -1);
+    rb_define_singleton_method(rb_cSocket, "getaddrinfo", sock_s_getaddrinfo, -1);
+    rb_define_singleton_method(rb_cSocket, "getnameinfo", sock_s_getnameinfo, -1);
+    rb_define_singleton_method(rb_cSocket, "sockaddr_in", sock_s_pack_sockaddr_in, 2);
+    rb_define_singleton_method(rb_cSocket, "pack_sockaddr_in", sock_s_pack_sockaddr_in, 2);
+    rb_define_singleton_method(rb_cSocket, "unpack_sockaddr_in", sock_s_unpack_sockaddr_in, 1);
+#ifdef HAVE_SYS_UN_H
+    rb_define_singleton_method(rb_cSocket, "sockaddr_un", sock_s_pack_sockaddr_un, 1);
+    rb_define_singleton_method(rb_cSocket, "pack_sockaddr_un", sock_s_pack_sockaddr_un, 1);
+    rb_define_singleton_method(rb_cSocket, "unpack_sockaddr_un", sock_s_unpack_sockaddr_un, 1);
+#endif
+
+    /* constants */
+    mConst = rb_define_module_under(rb_cSocket, "Constants");
+    sock_define_const("SOCK_STREAM", SOCK_STREAM);
+    sock_define_const("SOCK_DGRAM", SOCK_DGRAM);
+#ifdef SOCK_RAW
+    sock_define_const("SOCK_RAW", SOCK_RAW);
+#endif
+#ifdef SOCK_RDM
+    sock_define_const("SOCK_RDM", SOCK_RDM);
+#endif
+#ifdef SOCK_SEQPACKET
+    sock_define_const("SOCK_SEQPACKET", SOCK_SEQPACKET);
+#endif
+#ifdef SOCK_PACKET
+    sock_define_const("SOCK_PACKET", SOCK_PACKET);
+#endif
+
+    sock_define_const("AF_INET", AF_INET);
+#ifdef PF_INET
+    sock_define_const("PF_INET", PF_INET);
+#endif
+#ifdef AF_UNIX
+    sock_define_const("AF_UNIX", AF_UNIX);
+    sock_define_const("PF_UNIX", PF_UNIX);
+#endif
+#ifdef AF_AX25
+    sock_define_const("AF_AX25", AF_AX25);
+    sock_define_const("PF_AX25", PF_AX25);
+#endif
+#ifdef AF_IPX
+    sock_define_const("AF_IPX", AF_IPX);
+    sock_define_const("PF_IPX", PF_IPX);
+#endif
+#ifdef AF_APPLETALK
+    sock_define_const("AF_APPLETALK", AF_APPLETALK);
+    sock_define_const("PF_APPLETALK", PF_APPLETALK);
+#endif
+#ifdef AF_UNSPEC
+    sock_define_const("AF_UNSPEC", AF_UNSPEC);
+    sock_define_const("PF_UNSPEC", PF_UNSPEC);
+#endif
+#ifdef INET6
+    sock_define_const("AF_INET6", AF_INET6);
+#endif
+#ifdef INET6
+    sock_define_const("PF_INET6", PF_INET6);
+#endif
+#ifdef AF_LOCAL
+    sock_define_const("AF_LOCAL", AF_LOCAL);
+#endif
+#ifdef PF_LOCAL
+    sock_define_const("PF_LOCAL", PF_LOCAL);
+#endif
+#ifdef AF_IMPLINK
+    sock_define_const("AF_IMPLINK", AF_IMPLINK);
+#endif
+#ifdef PF_IMPLINK
+    sock_define_const("PF_IMPLINK", PF_IMPLINK);
+#endif
+#ifdef AF_PUP
+    sock_define_const("AF_PUP", AF_PUP);
+#endif
+#ifdef PF_PUP
+    sock_define_const("PF_PUP", PF_PUP);
+#endif
+#ifdef AF_CHAOS
+    sock_define_const("AF_CHAOS", AF_CHAOS);
+#endif
+#ifdef PF_CHAOS
+    sock_define_const("PF_CHAOS", PF_CHAOS);
+#endif
+#ifdef AF_NS
+    sock_define_const("AF_NS", AF_NS);
+#endif
+#ifdef PF_NS
+    sock_define_const("PF_NS", PF_NS);
+#endif
+#ifdef AF_ISO
+    sock_define_const("AF_ISO", AF_ISO);
+#endif
+#ifdef PF_ISO
+    sock_define_const("PF_ISO", PF_ISO);
+#endif
+#ifdef AF_OSI
+    sock_define_const("AF_OSI", AF_OSI);
+#endif
+#ifdef PF_OSI
+    sock_define_const("PF_OSI", PF_OSI);
+#endif
+#ifdef AF_ECMA
+    sock_define_const("AF_ECMA", AF_ECMA);
+#endif
+#ifdef PF_ECMA
+    sock_define_const("PF_ECMA", PF_ECMA);
+#endif
+#ifdef AF_DATAKIT
+    sock_define_const("AF_DATAKIT", AF_DATAKIT);
+#endif
+#ifdef PF_DATAKIT
+    sock_define_const("PF_DATAKIT", PF_DATAKIT);
+#endif
+#ifdef AF_CCITT
+    sock_define_const("AF_CCITT", AF_CCITT);
+#endif
+#ifdef PF_CCITT
+    sock_define_const("PF_CCITT", PF_CCITT);
+#endif
+#ifdef AF_SNA
+    sock_define_const("AF_SNA", AF_SNA);
+#endif
+#ifdef PF_SNA
+    sock_define_const("PF_SNA", PF_SNA);
+#endif
+#ifdef AF_DEC
+    sock_define_const("AF_DEC", AF_DEC);
+#endif
+#ifdef PF_DEC
+    sock_define_const("PF_DEC", PF_DEC);
+#endif
+#ifdef AF_DLI
+    sock_define_const("AF_DLI", AF_DLI);
+#endif
+#ifdef PF_DLI
+    sock_define_const("PF_DLI", PF_DLI);
+#endif
+#ifdef AF_LAT
+    sock_define_const("AF_LAT", AF_LAT);
+#endif
+#ifdef PF_LAT
+    sock_define_const("PF_LAT", PF_LAT);
+#endif
+#ifdef AF_HYLINK
+    sock_define_const("AF_HYLINK", AF_HYLINK);
+#endif
+#ifdef PF_HYLINK
+    sock_define_const("PF_HYLINK", PF_HYLINK);
+#endif
+#ifdef AF_ROUTE
+    sock_define_const("AF_ROUTE", AF_ROUTE);
+#endif
+#ifdef PF_ROUTE
+    sock_define_const("PF_ROUTE", PF_ROUTE);
+#endif
+#ifdef AF_LINK
+    sock_define_const("AF_LINK", AF_LINK);
+#endif
+#ifdef PF_LINK
+    sock_define_const("PF_LINK", PF_LINK);
+#endif
+#ifdef AF_COIP
+    sock_define_const("AF_COIP", AF_COIP);
+#endif
+#ifdef PF_COIP
+    sock_define_const("PF_COIP", PF_COIP);
+#endif
+#ifdef AF_CNT
+    sock_define_const("AF_CNT", AF_CNT);
+#endif
+#ifdef PF_CNT
+    sock_define_const("PF_CNT", PF_CNT);
+#endif
+#ifdef AF_SIP
+    sock_define_const("AF_SIP", AF_SIP);
+#endif
+#ifdef PF_SIP
+    sock_define_const("PF_SIP", PF_SIP);
+#endif
+#ifdef AF_NDRV
+    sock_define_const("AF_NDRV", AF_NDRV);
+#endif
+#ifdef PF_NDRV
+    sock_define_const("PF_NDRV", PF_NDRV);
+#endif
+#ifdef AF_ISDN
+    sock_define_const("AF_ISDN", AF_ISDN);
+#endif
+#ifdef PF_ISDN
+    sock_define_const("PF_ISDN", PF_ISDN);
+#endif
+#ifdef AF_NATM
+    sock_define_const("AF_NATM", AF_NATM);
+#endif
+#ifdef PF_NATM
+    sock_define_const("PF_NATM", PF_NATM);
+#endif
+#ifdef AF_SYSTEM
+    sock_define_const("AF_SYSTEM", AF_SYSTEM);
+#endif
+#ifdef PF_SYSTEM
+    sock_define_const("PF_SYSTEM", PF_SYSTEM);
+#endif
+#ifdef AF_NETBIOS
+    sock_define_const("AF_NETBIOS", AF_NETBIOS);
+#endif
+#ifdef PF_NETBIOS
+    sock_define_const("PF_NETBIOS", PF_NETBIOS);
+#endif
+#ifdef AF_PPP
+    sock_define_const("AF_PPP", AF_PPP);
+#endif
+#ifdef PF_PPP
+    sock_define_const("PF_PPP", PF_PPP);
+#endif
+#ifdef AF_ATM
+    sock_define_const("AF_ATM", AF_ATM);
+#endif
+#ifdef PF_ATM
+    sock_define_const("PF_ATM", PF_ATM);
+#endif
+#ifdef AF_NETGRAPH
+    sock_define_const("AF_NETGRAPH", AF_NETGRAPH);
+#endif
+#ifdef PF_NETGRAPH
+    sock_define_const("PF_NETGRAPH", PF_NETGRAPH);
+#endif
+#ifdef AF_MAX
+    sock_define_const("AF_MAX", AF_MAX);
+#endif
+#ifdef PF_MAX
+    sock_define_const("PF_MAX", PF_MAX);
+#endif
+#ifdef AF_E164
+    sock_define_const("AF_E164", AF_E164);
+#endif
+#ifdef PF_XTP
+    sock_define_const("PF_XTP", PF_XTP);
+#endif
+#ifdef PF_RTIP
+    sock_define_const("PF_RTIP", PF_RTIP);
+#endif
+#ifdef PF_PIP
+    sock_define_const("PF_PIP", PF_PIP);
+#endif
+#ifdef PF_KEY
+    sock_define_const("PF_KEY", PF_KEY);
+#endif
+
+    sock_define_const("MSG_OOB", MSG_OOB);
+#ifdef MSG_PEEK
+    sock_define_const("MSG_PEEK", MSG_PEEK);
+#endif
+#ifdef MSG_DONTROUTE
+    sock_define_const("MSG_DONTROUTE", MSG_DONTROUTE);
+#endif
+#ifdef MSG_EOR
+    sock_define_const("MSG_EOR", MSG_EOR);
+#endif
+#ifdef MSG_TRUNC
+    sock_define_const("MSG_TRUNC", MSG_TRUNC);
+#endif
+#ifdef MSG_CTRUNC
+    sock_define_const("MSG_CTRUNC", MSG_CTRUNC);
+#endif
+#ifdef MSG_WAITALL
+    sock_define_const("MSG_WAITALL", MSG_WAITALL);
+#endif
+#ifdef MSG_DONTWAIT
+    sock_define_const("MSG_DONTWAIT", MSG_DONTWAIT);
+#endif
+#ifdef MSG_EOF
+    sock_define_const("MSG_EOF", MSG_EOF);
+#endif
+#ifdef MSG_FLUSH
+    sock_define_const("MSG_FLUSH", MSG_FLUSH);
+#endif
+#ifdef MSG_HOLD
+    sock_define_const("MSG_HOLD", MSG_HOLD);
+#endif
+#ifdef MSG_SEND
+    sock_define_const("MSG_SEND", MSG_SEND);
+#endif
+#ifdef MSG_HAVEMORE
+    sock_define_const("MSG_HAVEMORE", MSG_HAVEMORE);
+#endif
+#ifdef MSG_RCVMORE
+    sock_define_const("MSG_RCVMORE", MSG_RCVMORE);
+#endif
+#ifdef MSG_COMPAT
+    sock_define_const("MSG_COMPAT", MSG_COMPAT);
+#endif
+
+    sock_define_const("SOL_SOCKET", SOL_SOCKET);
+#ifdef SOL_IP
+    sock_define_const("SOL_IP", SOL_IP);
+#endif
+#ifdef SOL_IPX
+    sock_define_const("SOL_IPX", SOL_IPX);
+#endif
+#ifdef SOL_AX25
+    sock_define_const("SOL_AX25", SOL_AX25);
+#endif
+#ifdef SOL_ATALK
+    sock_define_const("SOL_ATALK", SOL_ATALK);
+#endif
+#ifdef SOL_TCP
+    sock_define_const("SOL_TCP", SOL_TCP);
+#endif
+#ifdef SOL_UDP
+    sock_define_const("SOL_UDP", SOL_UDP);
+#endif
+
+#ifdef	IPPROTO_IP
+    sock_define_const("IPPROTO_IP", IPPROTO_IP);
+#else
+    sock_define_const("IPPROTO_IP", 0);
+#endif
+#ifdef	IPPROTO_ICMP
+    sock_define_const("IPPROTO_ICMP", IPPROTO_ICMP);
+#else
+    sock_define_const("IPPROTO_ICMP", 1);
+#endif
+#ifdef	IPPROTO_IGMP
+    sock_define_const("IPPROTO_IGMP", IPPROTO_IGMP);
+#endif
+#ifdef	IPPROTO_GGP
+    sock_define_const("IPPROTO_GGP", IPPROTO_GGP);
+#endif
+#ifdef	IPPROTO_TCP
+    sock_define_const("IPPROTO_TCP", IPPROTO_TCP);
+#else
+    sock_define_const("IPPROTO_TCP", 6);
+#endif
+#ifdef	IPPROTO_EGP
+    sock_define_const("IPPROTO_EGP", IPPROTO_EGP);
+#endif
+#ifdef	IPPROTO_PUP
+    sock_define_const("IPPROTO_PUP", IPPROTO_PUP);
+#endif
+#ifdef	IPPROTO_UDP
+    sock_define_const("IPPROTO_UDP", IPPROTO_UDP);
+#else
+    sock_define_const("IPPROTO_UDP", 17);
+#endif
+#ifdef	IPPROTO_IDP
+    sock_define_const("IPPROTO_IDP", IPPROTO_IDP);
+#endif
+#ifdef	IPPROTO_HELLO
+    sock_define_const("IPPROTO_HELLO", IPPROTO_HELLO);
+#endif
+#ifdef	IPPROTO_ND
+    sock_define_const("IPPROTO_ND", IPPROTO_ND);
+#endif
+#ifdef	IPPROTO_TP
+    sock_define_const("IPPROTO_TP", IPPROTO_TP);
+#endif
+#ifdef	IPPROTO_XTP
+    sock_define_const("IPPROTO_XTP", IPPROTO_XTP);
+#endif
+#ifdef	IPPROTO_EON
+    sock_define_const("IPPROTO_EON", IPPROTO_EON);
+#endif
+#ifdef	IPPROTO_BIP
+    sock_define_const("IPPROTO_BIP", IPPROTO_BIP);
+#endif
+/**/
+#ifdef	IPPROTO_RAW
+    sock_define_const("IPPROTO_RAW", IPPROTO_RAW);
+#else
+    sock_define_const("IPPROTO_RAW", 255);
+#endif
+#ifdef	IPPROTO_MAX
+    sock_define_const("IPPROTO_MAX", IPPROTO_MAX);
+#endif
+
+	/* Some port configuration */
+#ifdef	IPPORT_RESERVED
+    sock_define_const("IPPORT_RESERVED", IPPORT_RESERVED);
+#else
+    sock_define_const("IPPORT_RESERVED", 1024);
+#endif
+#ifdef	IPPORT_USERRESERVED
+    sock_define_const("IPPORT_USERRESERVED", IPPORT_USERRESERVED);
+#else
+    sock_define_const("IPPORT_USERRESERVED", 5000);
+#endif
+	/* Some reserved IP v.4 addresses */
+#ifdef	INADDR_ANY
+    sock_define_const("INADDR_ANY", INADDR_ANY);
+#else
+    sock_define_const("INADDR_ANY", 0x00000000);
+#endif
+#ifdef	INADDR_BROADCAST
+    sock_define_const("INADDR_BROADCAST", INADDR_BROADCAST);
+#else
+    sock_define_const("INADDR_BROADCAST", 0xffffffff);
+#endif
+#ifdef	INADDR_LOOPBACK
+    sock_define_const("INADDR_LOOPBACK", INADDR_LOOPBACK);
+#else
+    sock_define_const("INADDR_LOOPBACK", 0x7F000001);
+#endif
+#ifdef	INADDR_UNSPEC_GROUP
+    sock_define_const("INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP);
+#else
+    sock_define_const("INADDR_UNSPEC_GROUP", 0xe0000000);
+#endif
+#ifdef	INADDR_ALLHOSTS_GROUP
+    sock_define_const("INADDR_ALLHOSTS_GROUP", INADDR_ALLHOSTS_GROUP);
+#else
+    sock_define_const("INADDR_ALLHOSTS_GROUP", 0xe0000001);
+#endif
+#ifdef	INADDR_MAX_LOCAL_GROUP
+    sock_define_const("INADDR_MAX_LOCAL_GROUP", INADDR_MAX_LOCAL_GROUP);
+#else
+    sock_define_const("INADDR_MAX_LOCAL_GROUP", 0xe00000ff);
+#endif
+#ifdef	INADDR_NONE
+    sock_define_const("INADDR_NONE", INADDR_NONE);
+#else
+    sock_define_const("INADDR_NONE", 0xffffffff);
+#endif
+	/* IP [gs]etsockopt options */
+#ifdef	IP_OPTIONS
+    sock_define_const("IP_OPTIONS", IP_OPTIONS);
+#endif
+#ifdef	IP_HDRINCL
+    sock_define_const("IP_HDRINCL", IP_HDRINCL);
+#endif
+#ifdef	IP_TOS
+    sock_define_const("IP_TOS", IP_TOS);
+#endif
+#ifdef	IP_TTL
+    sock_define_const("IP_TTL", IP_TTL);
+#endif
+#ifdef	IP_RECVOPTS
+    sock_define_const("IP_RECVOPTS", IP_RECVOPTS);
+#endif
+#ifdef	IP_RECVRETOPTS
+    sock_define_const("IP_RECVRETOPTS", IP_RECVRETOPTS);
+#endif
+#ifdef	IP_RECVDSTADDR
+    sock_define_const("IP_RECVDSTADDR", IP_RECVDSTADDR);
+#endif
+#ifdef	IP_RETOPTS
+    sock_define_const("IP_RETOPTS", IP_RETOPTS);
+#endif
+#ifdef	IP_MULTICAST_IF
+    sock_define_const("IP_MULTICAST_IF", IP_MULTICAST_IF);
+#endif
+#ifdef	IP_MULTICAST_TTL
+    sock_define_const("IP_MULTICAST_TTL", IP_MULTICAST_TTL);
+#endif
+#ifdef	IP_MULTICAST_LOOP
+    sock_define_const("IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
+#endif
+#ifdef	IP_ADD_MEMBERSHIP
+    sock_define_const("IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
+#endif
+#ifdef	IP_DROP_MEMBERSHIP
+    sock_define_const("IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP);
+#endif
+#ifdef	IP_DEFAULT_MULTICAST_TTL
+    sock_define_const("IP_DEFAULT_MULTICAST_TTL", IP_DEFAULT_MULTICAST_TTL);
+#endif
+#ifdef	IP_DEFAULT_MULTICAST_LOOP
+    sock_define_const("IP_DEFAULT_MULTICAST_LOOP", IP_DEFAULT_MULTICAST_LOOP);
+#endif
+#ifdef	IP_MAX_MEMBERSHIPS
+    sock_define_const("IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
+#endif
+#ifdef SO_DEBUG
+    sock_define_const("SO_DEBUG", SO_DEBUG);
+#endif
+    sock_define_const("SO_REUSEADDR", SO_REUSEADDR);
+#ifdef SO_REUSEPORT
+    sock_define_const("SO_REUSEPORT", SO_REUSEPORT);
+#endif
+#ifdef SO_TYPE
+    sock_define_const("SO_TYPE", SO_TYPE);
+#endif
+#ifdef SO_ERROR
+    sock_define_const("SO_ERROR", SO_ERROR);
+#endif
+#ifdef SO_DONTROUTE
+    sock_define_const("SO_DONTROUTE", SO_DONTROUTE);
+#endif
+#ifdef SO_BROADCAST
+    sock_define_const("SO_BROADCAST", SO_BROADCAST);
+#endif
+#ifdef SO_SNDBUF
+    sock_define_const("SO_SNDBUF", SO_SNDBUF);
+#endif
+#ifdef SO_RCVBUF
+    sock_define_const("SO_RCVBUF", SO_RCVBUF);
+#endif
+#ifdef SO_KEEPALIVE
+    sock_define_const("SO_KEEPALIVE", SO_KEEPALIVE);
+#endif
+#ifdef SO_OOBINLINE
+    sock_define_const("SO_OOBINLINE", SO_OOBINLINE);
+#endif
+#ifdef SO_NO_CHECK
+    sock_define_const("SO_NO_CHECK", SO_NO_CHECK);
+#endif
+#ifdef SO_PRIORITY
+    sock_define_const("SO_PRIORITY", SO_PRIORITY);
+#endif
+#ifdef SO_LINGER
+    sock_define_const("SO_LINGER", SO_LINGER);
+#endif
+#ifdef SO_PASSCRED
+    sock_define_const("SO_PASSCRED", SO_PASSCRED);
+#endif
+#ifdef SO_PEERCRED
+    sock_define_const("SO_PEERCRED", SO_PEERCRED);
+#endif
+#ifdef SO_RCVLOWAT
+    sock_define_const("SO_RCVLOWAT", SO_RCVLOWAT);
+#endif
+#ifdef SO_SNDLOWAT
+    sock_define_const("SO_SNDLOWAT", SO_SNDLOWAT);
+#endif
+#ifdef SO_RCVTIMEO
+    sock_define_const("SO_RCVTIMEO", SO_RCVTIMEO);
+#endif
+#ifdef SO_SNDTIMEO
+    sock_define_const("SO_SNDTIMEO", SO_SNDTIMEO);
+#endif
+#ifdef SO_ACCEPTCONN
+    sock_define_const("SO_ACCEPTCONN", SO_ACCEPTCONN);
+#endif
+#ifdef SO_USELOOPBACK
+    sock_define_const("SO_USELOOPBACK", SO_USELOOPBACK);
+#endif
+#ifdef SO_ACCEPTFILTER
+    sock_define_const("SO_ACCEPTFILTER", SO_ACCEPTFILTER);
+#endif
+#ifdef SO_DONTTRUNC
+    sock_define_const("SO_DONTTRUNC", SO_DONTTRUNC);
+#endif
+#ifdef SO_WANTMORE
+    sock_define_const("SO_WANTMORE", SO_WANTMORE);
+#endif
+#ifdef SO_WANTOOBFLAG
+    sock_define_const("SO_WANTOOBFLAG", SO_WANTOOBFLAG);
+#endif
+#ifdef SO_NREAD
+    sock_define_const("SO_NREAD", SO_NREAD);
+#endif
+#ifdef SO_NKE
+    sock_define_const("SO_NKE", SO_NKE);
+#endif
+#ifdef SO_NOSIGPIPE
+    sock_define_const("SO_NOSIGPIPE", SO_NOSIGPIPE);
+#endif
+
+#ifdef SO_SECURITY_AUTHENTICATION
+    sock_define_const("SO_SECURITY_AUTHENTICATION", SO_SECURITY_AUTHENTICATION);
+#endif
+#ifdef SO_SECURITY_ENCRYPTION_TRANSPORT
+    sock_define_const("SO_SECURITY_ENCRYPTION_TRANSPORT", SO_SECURITY_ENCRYPTION_TRANSPORT);
+#endif
+#ifdef SO_SECURITY_ENCRYPTION_NETWORK
+    sock_define_const("SO_SECURITY_ENCRYPTION_NETWORK", SO_SECURITY_ENCRYPTION_NETWORK);
+#endif
+
+#ifdef SO_BINDTODEVICE
+    sock_define_const("SO_BINDTODEVICE", SO_BINDTODEVICE);
+#endif
+#ifdef SO_ATTACH_FILTER
+    sock_define_const("SO_ATTACH_FILTER", SO_ATTACH_FILTER);
+#endif
+#ifdef SO_DETACH_FILTER
+    sock_define_const("SO_DETACH_FILTER", SO_DETACH_FILTER);
+#endif
+#ifdef SO_PEERNAME
+    sock_define_const("SO_PEERNAME", SO_PEERNAME);
+#endif
+#ifdef SO_TIMESTAMP
+    sock_define_const("SO_TIMESTAMP", SO_TIMESTAMP);
+#endif
+
+#ifdef SOPRI_INTERACTIVE
+    sock_define_const("SOPRI_INTERACTIVE", SOPRI_INTERACTIVE);
+#endif
+#ifdef SOPRI_NORMAL
+    sock_define_const("SOPRI_NORMAL", SOPRI_NORMAL);
+#endif
+#ifdef SOPRI_BACKGROUND
+    sock_define_const("SOPRI_BACKGROUND", SOPRI_BACKGROUND);
+#endif
+
+#ifdef IPX_TYPE
+    sock_define_const("IPX_TYPE", IPX_TYPE);
+#endif
+
+#ifdef TCP_NODELAY
+    sock_define_const("TCP_NODELAY", TCP_NODELAY);
+#endif
+#ifdef TCP_MAXSEG
+    sock_define_const("TCP_MAXSEG", TCP_MAXSEG);
+#endif
+
+#ifdef EAI_ADDRFAMILY
+    sock_define_const("EAI_ADDRFAMILY", EAI_ADDRFAMILY);
+#endif
+#ifdef EAI_AGAIN
+    sock_define_const("EAI_AGAIN", EAI_AGAIN);
+#endif
+#ifdef EAI_BADFLAGS
+    sock_define_const("EAI_BADFLAGS", EAI_BADFLAGS);
+#endif
+#ifdef EAI_FAIL
+    sock_define_const("EAI_FAIL", EAI_FAIL);
+#endif
+#ifdef EAI_FAMILY
+    sock_define_const("EAI_FAMILY", EAI_FAMILY);
+#endif
+#ifdef EAI_MEMORY
+    sock_define_const("EAI_MEMORY", EAI_MEMORY);
+#endif
+#ifdef EAI_NODATA
+    sock_define_const("EAI_NODATA", EAI_NODATA);
+#endif
+#ifdef EAI_NONAME
+    sock_define_const("EAI_NONAME", EAI_NONAME);
+#endif
+#ifdef EAI_SERVICE
+    sock_define_const("EAI_SERVICE", EAI_SERVICE);
+#endif
+#ifdef EAI_SOCKTYPE
+    sock_define_const("EAI_SOCKTYPE", EAI_SOCKTYPE);
+#endif
+#ifdef EAI_SYSTEM
+    sock_define_const("EAI_SYSTEM", EAI_SYSTEM);
+#endif
+#ifdef EAI_BADHINTS
+    sock_define_const("EAI_BADHINTS", EAI_BADHINTS);
+#endif
+#ifdef EAI_PROTOCOL
+    sock_define_const("EAI_PROTOCOL", EAI_PROTOCOL);
+#endif
+#ifdef EAI_MAX
+    sock_define_const("EAI_MAX", EAI_MAX);
+#endif
+#ifdef AI_PASSIVE
+    sock_define_const("AI_PASSIVE", AI_PASSIVE);
+#endif
+#ifdef AI_CANONNAME
+    sock_define_const("AI_CANONNAME", AI_CANONNAME);
+#endif
+#ifdef AI_NUMERICHOST
+    sock_define_const("AI_NUMERICHOST", AI_NUMERICHOST);
+#endif
+#ifdef AI_MASK
+    sock_define_const("AI_MASK", AI_MASK);
+#endif
+#ifdef AI_ALL
+    sock_define_const("AI_ALL", AI_ALL);
+#endif
+#ifdef AI_V4MAPPED_CFG
+    sock_define_const("AI_V4MAPPED_CFG", AI_V4MAPPED_CFG);
+#endif
+#ifdef AI_ADDRCONFIG
+    sock_define_const("AI_ADDRCONFIG", AI_ADDRCONFIG);
+#endif
+#ifdef AI_V4MAPPED
+    sock_define_const("AI_V4MAPPED", AI_V4MAPPED);
+#endif
+#ifdef AI_DEFAULT
+    sock_define_const("AI_DEFAULT", AI_DEFAULT);
+#endif
+#ifdef NI_MAXHOST
+    sock_define_const("NI_MAXHOST", NI_MAXHOST);
+#endif
+#ifdef NI_MAXSERV
+    sock_define_const("NI_MAXSERV", NI_MAXSERV);
+#endif
+#ifdef NI_NOFQDN
+    sock_define_const("NI_NOFQDN", NI_NOFQDN);
+#endif
+#ifdef NI_NUMERICHOST
+    sock_define_const("NI_NUMERICHOST", NI_NUMERICHOST);
+#endif
+#ifdef NI_NAMEREQD
+    sock_define_const("NI_NAMEREQD", NI_NAMEREQD);
+#endif
+#ifdef NI_NUMERICSERV
+    sock_define_const("NI_NUMERICSERV", NI_NUMERICSERV);
+#endif
+#ifdef NI_DGRAM
+    sock_define_const("NI_DGRAM", NI_DGRAM);
+#endif
+#ifdef SHUT_RD
+    sock_define_const("SHUT_RD", SHUT_RD);
+#else
+    sock_define_const("SHUT_RD", 0);
+#endif
+#ifdef SHUT_WR
+    sock_define_const("SHUT_WR", SHUT_WR);
+#else
+    sock_define_const("SHUT_WR", 1);
+#endif
+#ifdef SHUT_RDWR
+    sock_define_const("SHUT_RDWR", SHUT_RDWR);
+#else
+    sock_define_const("SHUT_RDWR", 2);
+#endif
+}
diff --git a/ruby_1_8_6/ext/socket/sockport.h b/ruby_1_8_6/ext/socket/sockport.h
new file mode 100644
index 0000000000..e1cddf53f4
--- /dev/null
+++ b/ruby_1_8_6/ext/socket/sockport.h
@@ -0,0 +1,76 @@
+/************************************************
+
+  sockport.h -
+
+  $Author$
+  $Date$
+  created at: Fri Apr 30 23:19:34 JST 1999
+
+************************************************/
+
+#ifndef SOCKPORT_H
+#define SOCKPORT_H
+
+#ifndef SA_LEN
+# ifdef HAVE_SA_LEN
+#  define SA_LEN(sa) (sa)->sa_len
+# else
+#  ifdef INET6
+#   define SA_LEN(sa) \
+	(((sa)->sa_family == AF_INET6) ? sizeof(struct sockaddr_in6) \
+				       : sizeof(struct sockaddr))
+#  else
+    /* by tradition, sizeof(struct sockaddr) covers most of the sockaddrs */
+#   define SA_LEN(sa)	(sizeof(struct sockaddr))
+#  endif
+# endif
+#endif
+
+#ifdef HAVE_SA_LEN
+# define SET_SA_LEN(sa, len) (sa)->sa_len = (len)
+#else
+# define SET_SA_LEN(sa, len) (len)
+#endif
+
+#ifdef HAVE_SIN_LEN
+# define SIN_LEN(si) (si)->sin_len
+# define SET_SIN_LEN(si,len) (si)->sin_len = (len)
+#else
+# define SIN_LEN(si) sizeof(struct sockaddr_in)
+# define SET_SIN_LEN(si,len)
+#endif
+
+#ifndef IN_MULTICAST
+# define IN_CLASSD(i)	(((long)(i) & 0xf0000000) == 0xe0000000)
+# define IN_MULTICAST(i)	IN_CLASSD(i)
+#endif
+
+#ifndef IN_EXPERIMENTAL
+# define IN_EXPERIMENTAL(i) ((((long)(i)) & 0xe0000000) == 0xe0000000)
+#endif
+
+#ifndef IN_CLASSA_NSHIFT
+# define IN_CLASSA_NSHIFT 24
+#endif
+
+#ifndef IN_LOOPBACKNET
+# define IN_LOOPBACKNET 127
+#endif
+
+#ifndef AF_UNSPEC
+# define AF_UNSPEC 0
+#endif
+
+#ifndef PF_UNSPEC
+# define PF_UNSPEC AF_UNSPEC
+#endif
+
+#ifndef PF_INET
+# define PF_INET AF_INET
+#endif
+
+#if defined(HOST_NOT_FOUND) && !defined(h_errno) && !defined(__CYGWIN__)
+extern int h_errno;
+#endif
+
+#endif
diff --git a/ruby_1_8_6/ext/stringio/.cvsignore b/ruby_1_8_6/ext/stringio/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/stringio/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/stringio/README b/ruby_1_8_6/ext/stringio/README
new file mode 100644
index 0000000000..c4031f7e97
--- /dev/null
+++ b/ruby_1_8_6/ext/stringio/README
@@ -0,0 +1,19 @@
+-*- rd -*-
+$Author$
+$Date$
+
+=begin
+
+= StringIO
+Pseudo (({IO})) class from/to (({String})).
+
+This library is based on MoonWolf version written in Ruby.  Thanks a lot.
+
+= Differences to (({IO}))
+
+* not implemented: (({fcntl})), (({reopen})).
+* (({fileno})) returns nil.
+* (({pos=})) returns new position, not 0.
+* (({ungetc})) does nothing at start of the string. 
+
+=end
diff --git a/ruby_1_8_6/ext/stringio/depend b/ruby_1_8_6/ext/stringio/depend
new file mode 100644
index 0000000000..cc9eae3f55
--- /dev/null
+++ b/ruby_1_8_6/ext/stringio/depend
@@ -0,0 +1,2 @@
+stringio.o: stringio.c $(hdrdir)/ruby.h $(topdir)/config.h \
+  $(hdrdir)/defines.h $(hdrdir)/intern.h $(hdrdir)/rubyio.h
diff --git a/ruby_1_8_6/ext/stringio/extconf.rb b/ruby_1_8_6/ext/stringio/extconf.rb
new file mode 100644
index 0000000000..8fc84b3735
--- /dev/null
+++ b/ruby_1_8_6/ext/stringio/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('stringio')
diff --git a/ruby_1_8_6/ext/stringio/stringio.c b/ruby_1_8_6/ext/stringio/stringio.c
new file mode 100644
index 0000000000..a64aaf837c
--- /dev/null
+++ b/ruby_1_8_6/ext/stringio/stringio.c
@@ -0,0 +1,1308 @@
+/**********************************************************************
+
+  stringio.c -
+
+  $Author$
+  $Date$
+  $RoughId: stringio.c,v 1.13 2002/03/14 03:24:18 nobu Exp $
+  created at: Tue Feb 19 04:10:38 JST 2002
+
+  All the files in this distribution are covered under the Ruby's
+  license (see the file COPYING).
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "rubyio.h"
+#if defined(HAVE_FCNTL_H) || defined(_WIN32)
+#include <fcntl.h>
+#elif defined(HAVE_SYS_FCNTL_H)
+#include <sys/fcntl.h>
+#endif
+
+#define STRIO_EOF FMODE_SYNC
+
+struct StringIO {
+    VALUE string;
+    long pos;
+    long lineno;
+    int flags;
+    int count;
+};
+
+static struct StringIO* strio_alloc _((void));
+static void strio_mark _((struct StringIO *));
+static void strio_free _((struct StringIO *));
+static struct StringIO* check_strio _((VALUE));
+static struct StringIO* get_strio _((VALUE));
+static struct StringIO* readable _((struct StringIO *));
+static struct StringIO* writable _((struct StringIO *));
+static void check_modifiable _((struct StringIO *));
+
+#define IS_STRIO(obj) (RDATA(obj)->dmark == (RUBY_DATA_FUNC)strio_mark)
+#define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg))
+
+static struct StringIO *
+strio_alloc()
+{
+    struct StringIO *ptr = ALLOC(struct StringIO);
+    ptr->string = Qnil;
+    ptr->pos = 0;
+    ptr->lineno = 0;
+    ptr->flags = 0;
+    ptr->count = 1;
+    return ptr;
+}
+
+static void
+strio_mark(ptr)
+    struct StringIO *ptr;
+{
+    if (ptr) {
+	rb_gc_mark(ptr->string);
+    }
+}
+
+static void
+strio_free(ptr)
+    struct StringIO *ptr;
+{
+    if (--ptr->count <= 0) {
+	xfree(ptr);
+    }
+}
+
+static struct StringIO*
+check_strio(self)
+    VALUE self;
+{
+    Check_Type(self, T_DATA);
+    if (!IS_STRIO(self)) {
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected StringIO)",
+		 rb_class2name(CLASS_OF(self)));
+    }
+    return DATA_PTR(self);
+}
+
+static struct StringIO*
+get_strio(self)
+    VALUE self;
+{
+    struct StringIO *ptr = check_strio(self);
+
+    if (!ptr) {
+	rb_raise(rb_eIOError, "uninitialized stream");
+    }
+    return ptr;
+}
+
+#define StringIO(obj) get_strio(obj)
+
+#define CLOSED(ptr) (!((ptr)->flags & FMODE_READWRITE))
+#define READABLE(ptr) ((ptr)->flags & FMODE_READABLE)
+#define WRITABLE(ptr) ((ptr)->flags & FMODE_WRITABLE)
+
+static struct StringIO*
+readable(ptr)
+    struct StringIO *ptr;
+{
+    if (!READABLE(ptr)) {
+	rb_raise(rb_eIOError, "not opened for reading");
+    }
+    return ptr;
+}
+
+static struct StringIO*
+writable(ptr)
+    struct StringIO *ptr;
+{
+    if (!WRITABLE(ptr)) {
+	rb_raise(rb_eIOError, "not opened for writing");
+    }
+    if (!OBJ_TAINTED(ptr->string)) {
+	rb_secure(4);
+    }
+    return ptr;
+}
+
+static void
+check_modifiable(ptr)
+    struct StringIO *ptr;
+{
+    if (OBJ_FROZEN(ptr->string)) {
+	rb_raise(rb_eIOError, "not modifiable string");
+    }
+}
+
+static VALUE strio_s_allocate _((VALUE));
+static VALUE strio_s_open _((int, VALUE *, VALUE));
+static VALUE strio_initialize _((int, VALUE *, VALUE));
+static VALUE strio_finalize _((VALUE));
+static VALUE strio_self _((VALUE));
+static VALUE strio_false _((VALUE));
+static VALUE strio_nil _((VALUE));
+static VALUE strio_0 _((VALUE));
+static VALUE strio_first _((VALUE, VALUE));
+static VALUE strio_unimpl _((int, VALUE *, VALUE));
+static VALUE strio_get_string _((VALUE));
+static VALUE strio_set_string _((VALUE, VALUE));
+static VALUE strio_close _((VALUE));
+static VALUE strio_close_read _((VALUE));
+static VALUE strio_close_write _((VALUE));
+static VALUE strio_closed _((VALUE));
+static VALUE strio_closed_read _((VALUE));
+static VALUE strio_closed_write _((VALUE));
+static VALUE strio_eof _((VALUE));
+static VALUE strio_get_lineno _((VALUE));
+static VALUE strio_set_lineno _((VALUE, VALUE));
+static VALUE strio_get_pos _((VALUE));
+static VALUE strio_set_pos _((VALUE, VALUE));
+static VALUE strio_rewind _((VALUE));
+static VALUE strio_seek _((int, VALUE *, VALUE));
+static VALUE strio_get_sync _((VALUE));
+static VALUE strio_each_byte _((VALUE));
+static VALUE strio_getc _((VALUE));
+static VALUE strio_ungetc _((VALUE, VALUE));
+static VALUE strio_readchar _((VALUE));
+static VALUE strio_getline _((int, VALUE *, struct StringIO *));
+static VALUE strio_gets _((int, VALUE *, VALUE));
+static VALUE strio_readline _((int, VALUE *, VALUE));
+static VALUE strio_each _((int, VALUE *, VALUE));
+static VALUE strio_readlines _((int, VALUE *, VALUE));
+static VALUE strio_write _((VALUE, VALUE));
+static VALUE strio_putc _((VALUE, VALUE));
+static VALUE strio_read _((int, VALUE *, VALUE));
+static VALUE strio_size _((VALUE));
+static VALUE strio_truncate _((VALUE, VALUE));
+void Init_stringio _((void));
+
+/* Boyer-Moore search: copied from regex.c */
+static void bm_init_skip _((long *, const char *, long));
+static long bm_search _((const char *, long, const char *, long, const long *));
+
+static VALUE
+strio_s_allocate(klass)
+    VALUE klass;
+{
+    return Data_Wrap_Struct(klass, strio_mark, strio_free, 0);
+}
+
+/*
+ * call-seq: StringIO.open(string=""[, mode]) {|strio| ...}
+ *
+ * Equivalent to StringIO.new except that when it is called with a block, it
+ * yields with the new instance and closes it, and returns the result which
+ * returned from the block.
+ */
+static VALUE
+strio_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE obj = rb_class_new_instance(argc, argv, klass);
+    if (!rb_block_given_p()) return obj;
+    return rb_ensure(rb_yield, obj, strio_finalize, obj);
+}
+
+/*
+ * call-seq: StringIO.new(string=""[, mode])
+ *
+ * Creates new StringIO instance from with _string_ and _mode_.
+ */
+static VALUE
+strio_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct StringIO *ptr = check_strio(self);
+    VALUE string, mode;
+    int trunc = Qfalse;
+
+    if (!ptr) {
+	DATA_PTR(self) = ptr = strio_alloc();
+    }
+    rb_call_super(0, 0);
+    switch (rb_scan_args(argc, argv, "02", &string, &mode)) {
+      case 2:
+	if (FIXNUM_P(mode)) {
+	    int flags = FIX2INT(mode);
+	    ptr->flags = rb_io_modenum_flags(flags);
+	    trunc = flags & O_TRUNC;
+	}
+	else {
+	    const char *m = StringValueCStr(mode);
+	    ptr->flags = rb_io_mode_flags(m);
+	    trunc = *m == 'w';
+	}
+	StringValue(string);
+	if ((ptr->flags & FMODE_WRITABLE) && OBJ_FROZEN(string)) {
+	    errno = EACCES;
+	    rb_sys_fail(0);
+	}
+	if (trunc) {
+	    rb_str_resize(string, 0);
+	}
+	break;
+      case 1:
+	StringValue(string);
+	ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
+	break;
+      case 0:
+	string = rb_str_new("", 0);
+	ptr->flags = FMODE_READWRITE;
+	break;
+    }
+    ptr->string = string;
+    return self;
+}
+
+static VALUE
+strio_finalize(self)
+    VALUE self;
+{
+    struct StringIO *ptr = StringIO(self);
+    ptr->string = Qnil;
+    ptr->flags &= ~FMODE_READWRITE;
+    return self;
+}
+
+/*
+ * Returns +false+.  Just for compatibility to IO.
+ */
+static VALUE
+strio_false(self)
+    VALUE self;
+{
+    StringIO(self);
+    return Qfalse;
+}
+
+/*
+ * Returns +nil+.  Just for compatibility to IO.
+ */
+static VALUE
+strio_nil(self)
+    VALUE self;
+{
+    StringIO(self);
+    return Qnil;
+}
+
+/*
+ * Returns *strio* itself.  Just for compatibility to IO.
+ */
+static VALUE
+strio_self(self)
+    VALUE self;
+{
+    StringIO(self);
+    return self;
+}
+
+/*
+ * Returns 0.  Just for compatibility to IO.
+ */
+static VALUE
+strio_0(self)
+    VALUE self;
+{
+    StringIO(self);
+    return INT2FIX(0);
+}
+
+/*
+ * Returns the argument unchanged.  Just for compatibility to IO.
+ */
+static VALUE
+strio_first(self, arg)
+    VALUE self, arg;
+{
+    StringIO(self);
+    return arg;
+}
+
+/*
+ * Raises NotImplementedError.
+ */
+static VALUE
+strio_unimpl(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    StringIO(self);
+    rb_notimplement();
+    return Qnil;		/* not reached */
+}
+
+/*
+ * call-seq: strio.string     -> string
+ *
+ * Returns underlying String object, the subject of IO.
+ */
+static VALUE
+strio_get_string(self)
+    VALUE self;
+{
+    return StringIO(self)->string;
+}
+
+/*
+ * call-seq:
+ *   strio.string = string  -> string
+ *
+ * Changes underlying String object, the subject of IO.
+ */
+static VALUE
+strio_set_string(self, string)
+    VALUE self, string;
+{
+    struct StringIO *ptr = StringIO(self);
+
+    if (!OBJ_TAINTED(self)) rb_secure(4);
+    ptr->flags &= ~FMODE_READWRITE;
+    StringValue(string);
+    ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
+    ptr->pos = 0;
+    ptr->lineno = 0;
+    return ptr->string = string;
+}
+
+/*
+ * call-seq:
+ *   strio.close  -> nil
+ *
+ * Closes strio.  The *strio* is unavailable for any further data 
+ * operations; an +IOError+ is raised if such an attempt is made.
+ */
+static VALUE
+strio_close(self)
+    VALUE self;
+{
+    struct StringIO *ptr = StringIO(self);
+    if (CLOSED(ptr)) {
+	rb_raise(rb_eIOError, "closed stream");
+    }
+    ptr->flags &= ~FMODE_READWRITE;
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   strio.close_read    -> nil
+ *
+ * Closes the read end of a StringIO.  Will raise an +IOError+ if the
+ * *strio* is not readable.
+ */
+static VALUE
+strio_close_read(self)
+    VALUE self;
+{
+    struct StringIO *ptr = StringIO(self);
+    if (!READABLE(ptr)) {
+	rb_raise(rb_eIOError, "closing non-duplex IO for reading");
+    }
+    ptr->flags &= ~FMODE_READABLE;
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   strio.close_write    -> nil
+ *
+ * Closes the write end of a StringIO.  Will raise an  +IOError+ if the
+ * *strio* is not writeable.
+ */
+static VALUE
+strio_close_write(self)
+    VALUE self;
+{
+    struct StringIO *ptr = StringIO(self);
+    if (!WRITABLE(ptr)) {
+	rb_raise(rb_eIOError, "closing non-duplex IO for writing");
+    }
+    ptr->flags &= ~FMODE_WRITABLE;
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   strio.closed?    -> true or false
+ *
+ * Returns +true+ if *strio* is completely closed, +false+ otherwise.
+ */
+static VALUE
+strio_closed(self)
+    VALUE self;
+{
+    struct StringIO *ptr = StringIO(self);
+    if (!CLOSED(ptr)) return Qfalse;
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *   strio.closed_read?    -> true or false
+ *
+ * Returns +true+ if *strio* is not readable, +false+ otherwise.
+ */
+static VALUE
+strio_closed_read(self)
+    VALUE self;
+{
+    struct StringIO *ptr = StringIO(self);
+    if (READABLE(ptr)) return Qfalse;
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *   strio.closed_write?    -> true or false
+ *
+ * Returns +true+ if *strio* is not writable, +false+ otherwise.
+ */
+static VALUE
+strio_closed_write(self)
+    VALUE self;
+{
+    struct StringIO *ptr = StringIO(self);
+    if (WRITABLE(ptr)) return Qfalse;
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *   strio.eof     -> true or false
+ *   strio.eof?    -> true or false
+ *
+ * Returns true if *strio* is at end of file. The stringio must be  
+ * opened for reading or an +IOError+ will be raised.
+ */
+static VALUE
+strio_eof(self)
+    VALUE self;
+{
+    struct StringIO *ptr = readable(StringIO(self));
+    if (ptr->pos < RSTRING(ptr->string)->len) return Qfalse;
+    return Qtrue;
+}
+
+/* :nodoc: */
+static VALUE
+strio_copy(copy, orig)
+    VALUE copy, orig;
+{
+    struct StringIO *ptr;
+
+    orig = rb_convert_type(orig, T_DATA, "StringIO", "to_strio");
+    if (copy == orig) return copy;
+    ptr = StringIO(orig);
+    if (check_strio(copy)) {
+	strio_free(DATA_PTR(copy));
+    }
+    DATA_PTR(copy) = ptr;
+    OBJ_INFECT(copy, orig);
+    ++ptr->count;
+    return copy;
+}
+
+/*
+ * call-seq:
+ *   strio.lineno    -> integer
+ *
+ * Returns the current line number in *strio*. The stringio must be
+ * opened for reading. +lineno+ counts the number of times  +gets+ is
+ * called, rather than the number of newlines  encountered. The two
+ * values will differ if +gets+ is  called with a separator other than
+ * newline.  See also the  <code>$.</code> variable.
+ */
+static VALUE
+strio_get_lineno(self)
+    VALUE self;
+{
+    return LONG2NUM(StringIO(self)->lineno);
+}
+
+/*
+ * call-seq:
+ *   strio.lineno = integer    -> integer
+ *
+ * Manually sets the current line number to the given value.
+ * <code>$.</code> is updated only on the next read.
+ */
+static VALUE
+strio_set_lineno(self, lineno)
+    VALUE self, lineno;
+{
+    StringIO(self)->lineno = NUM2LONG(lineno);
+    return lineno;
+}
+
+/* call-seq: strio.binmode -> true */
+#define strio_binmode strio_self
+
+/* call-seq: strio.fcntl */
+#define strio_fcntl strio_unimpl
+
+/* call-seq: strio.flush -> strio */
+#define strio_flush strio_self
+
+/* call-seq: strio.fsync -> 0 */
+#define strio_fsync strio_0
+
+/*
+ * call-seq:
+ *   strio.reopen(other_StrIO)     -> strio
+ *   strio.reopen(string, mode)    -> strio
+ *
+ * Reinitializes *strio* with the given <i>other_StrIO</i> or _string_ 
+ * and _mode_ (see StringIO#new).
+ */
+static VALUE
+strio_reopen(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    if (!OBJ_TAINTED(self)) rb_secure(4);
+    if (argc == 1 && TYPE(*argv) != T_STRING) {
+	return strio_copy(self, *argv);
+    }
+    return strio_initialize(argc, argv, self);
+}
+
+/*
+ * call-seq:
+ *   strio.pos     -> integer
+ *   strio.tell    -> integer
+ *
+ * Returns the current offset (in bytes) of *strio*.
+ */
+static VALUE
+strio_get_pos(self)
+    VALUE self;
+{
+    return LONG2NUM(StringIO(self)->pos);
+}
+
+/*
+ * call-seq:
+ *   strio.pos = integer    -> integer
+ *
+ * Seeks to the given position (in bytes) in *strio*.
+ */
+static VALUE
+strio_set_pos(self, pos)
+    VALUE self;
+    VALUE pos;
+{
+    struct StringIO *ptr = StringIO(self);
+    long p = NUM2LONG(pos);
+    if (p < 0) {
+	error_inval(0);
+    }
+    ptr->pos = p;
+    ptr->flags &= ~STRIO_EOF;
+    return pos;
+}
+
+/*
+ * call-seq:
+ *   strio.rewind    -> 0
+ *
+ * Positions *strio* to the beginning of input, resetting
+ * +lineno+ to zero.
+ */
+static VALUE
+strio_rewind(self)
+    VALUE self;
+{
+    struct StringIO *ptr = StringIO(self);
+    ptr->pos = 0;
+    ptr->lineno = 0;
+    ptr->flags &= ~STRIO_EOF;
+    return INT2FIX(0);
+}
+
+/*
+ * call-seq:
+ *   strio.seek(amount, whence=SEEK_SET) -> 0
+ *
+ * Seeks to a given offset _amount_ in the stream according to
+ * the value of _whence_ (see IO#seek).
+ */
+static VALUE
+strio_seek(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE whence;
+    struct StringIO *ptr = StringIO(self);
+    long offset;
+
+    rb_scan_args(argc, argv, "11", NULL, &whence);
+    offset = NUM2LONG(argv[0]);
+    switch (NIL_P(whence) ? 0 : NUM2LONG(whence)) {
+      case 0:
+	break;
+      case 1:
+	offset += ptr->pos;
+	break;
+      case 2:
+	offset += RSTRING(ptr->string)->len;
+	break;
+      default:
+	rb_raise(rb_eArgError, "invalid whence %ld", NUM2LONG(whence));
+    }
+    if (offset < 0) {
+	error_inval(0);
+    }
+    ptr->pos = offset;
+    ptr->flags &= ~STRIO_EOF;
+    return INT2FIX(0);
+}
+
+/*
+ * call-seq:
+ *   strio.sync    -> true
+ *
+ * Returns +true+ always.
+ */
+static VALUE
+strio_get_sync(self)
+    VALUE self;
+{
+    StringIO(self);
+    return Qtrue;
+}
+
+/* call-seq: strio.sync = boolean -> boolean */
+#define strio_set_sync strio_first
+
+#define strio_tell strio_get_pos
+
+/*
+ * call-seq:
+ *   strio.each_byte {|byte| block }  -> strio
+ *
+ * See IO#each_byte.
+ */
+static VALUE
+strio_each_byte(self)
+    VALUE self;
+{
+    struct StringIO *ptr = readable(StringIO(self));
+    while (ptr->pos < RSTRING(ptr->string)->len) {
+	char c = RSTRING(ptr->string)->ptr[ptr->pos++];
+	rb_yield(CHR2FIX(c));
+    }
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   strio.getc   -> fixnum or nil
+ *
+ * See IO#getc.
+ */
+static VALUE
+strio_getc(self)
+    VALUE self;
+{
+    struct StringIO *ptr = readable(StringIO(self));
+    int c;
+    if (ptr->pos >= RSTRING(ptr->string)->len) {
+	ptr->flags |= STRIO_EOF;
+	return Qnil;
+    }
+    c = RSTRING(ptr->string)->ptr[ptr->pos++];
+    return CHR2FIX(c);
+}
+
+static void
+strio_extend(ptr, pos, len)
+    struct StringIO *ptr;
+    long pos, len;
+{
+    long olen;
+
+    check_modifiable(ptr);
+    olen = RSTRING(ptr->string)->len;
+    if (pos + len > olen) {
+	rb_str_resize(ptr->string, pos + len);
+	if (pos > olen)
+	    MEMZERO(RSTRING(ptr->string)->ptr + olen, char, pos - olen);
+    }
+    else {
+	rb_str_modify(ptr->string);
+    }
+}
+
+/*
+ * call-seq:
+ *   strio.ungetc(integer)   -> nil
+ *
+ * Pushes back one character (passed as a parameter) onto *strio*
+ * such that a subsequent buffered read will return it.  Pushing back 
+ * behind the beginning of the buffer string is not possible.  Nothing
+ * will be done if such an attempt is made.
+ * In other case, there is no limitation for multiple pushbacks.
+ */
+static VALUE
+strio_ungetc(self, ch)
+    VALUE self, ch;
+{
+    struct StringIO *ptr = readable(StringIO(self));
+    int cc = NUM2INT(ch);
+    long len, pos = ptr->pos;
+
+    if (cc != EOF && pos > 0) {
+	if ((len = RSTRING(ptr->string)->len) < pos-- ||
+	    (unsigned char)RSTRING(ptr->string)->ptr[pos] !=
+	    (unsigned char)cc) {
+	    strio_extend(ptr, pos, 1);
+	    RSTRING(ptr->string)->ptr[pos] = cc;
+	    OBJ_INFECT(ptr->string, self);
+	}
+	--ptr->pos;
+	ptr->flags &= ~STRIO_EOF;
+    }
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   strio.readchar   -> fixnum
+ *
+ * See IO#readchar.
+ */
+static VALUE
+strio_readchar(self)
+    VALUE self;
+{
+    VALUE c = strio_getc(self);
+    if (NIL_P(c)) rb_eof_error();
+    return c;
+}
+
+static void
+bm_init_skip(skip, pat, m)
+     long *skip;
+     const char *pat;
+     long m;
+{
+    int c;
+
+    for (c = 0; c < (1 << CHAR_BIT); c++) {
+	skip[c] = m;
+    }
+    while (--m) {
+	skip[(unsigned char)*pat++] = m;
+    }
+}
+
+static long
+bm_search(little, llen, big, blen, skip)
+    const char *little;
+    long llen;
+    const char *big;
+    long blen;
+    const long *skip;
+{
+    long i, j, k;
+
+    i = llen - 1;
+    while (i < blen) {
+	k = i;
+	j = llen - 1;
+	while (j >= 0 && big[k] == little[j]) {
+	    k--;
+	    j--;
+	}
+	if (j < 0) return k + 1;
+	i += skip[(unsigned char)big[i]];
+    }
+    return -1;
+}
+
+static VALUE
+strio_getline(argc, argv, ptr)
+    int argc;
+    VALUE *argv;
+    struct StringIO *ptr;
+{
+    const char *s, *e, *p;
+    long n;
+    VALUE str;
+
+    if (argc == 0) {
+	str = rb_rs;
+    }
+    else {
+	rb_scan_args(argc, argv, "1", &str);
+	if (!NIL_P(str)) StringValue(str);
+    }
+
+    if (ptr->pos >= (n = RSTRING(ptr->string)->len)) {
+	ptr->flags |= STRIO_EOF;
+	return Qnil;
+    }
+    s = RSTRING(ptr->string)->ptr;
+    e = s + RSTRING(ptr->string)->len;
+    s += ptr->pos;
+    if (NIL_P(str)) {
+	str = rb_str_substr(ptr->string, ptr->pos, e - s);
+    }
+    else if ((n = RSTRING(str)->len) == 0) {
+	p = s;
+	while (*p == '\n') {
+	    if (++p == e) {
+		ptr->flags |= STRIO_EOF;
+		return Qnil;
+	    }
+	}
+	s = p;
+	while ((p = memchr(p, '\n', e - p)) && (p != e)) {
+	    if (*++p == '\n') {
+		e = p;
+		break;
+	    }
+	}
+	str = rb_str_substr(ptr->string, s - RSTRING(ptr->string)->ptr, e - s); 
+    }
+    else if (n == 1) {
+	if ((p = memchr(s, RSTRING(str)->ptr[0], e - s)) != 0) {
+	    e = p + 1;
+	}
+	str = rb_str_substr(ptr->string, ptr->pos, e - s);
+    }
+    else {
+	if (n < e - s) {
+	    if (e - s < 1024) {
+		for (p = s; p + n <= e; ++p) {
+		    if (MEMCMP(p, RSTRING(str)->ptr, char, n) == 0) {
+			e = p + n;
+			break;
+		    }
+		}
+	    }
+	    else {
+		long skip[1 << CHAR_BIT], pos;
+		p = RSTRING(str)->ptr;
+		bm_init_skip(skip, p, n);
+		if ((pos = bm_search(p, n, s, e - s, skip)) >= 0) {
+		    e = s + pos + n;
+		}
+	    }
+	}
+	str = rb_str_substr(ptr->string, ptr->pos, e - s);
+    }
+    ptr->pos = e - RSTRING(ptr->string)->ptr;
+    ptr->lineno++;
+    return str;
+}
+
+/*
+ * call-seq:
+ *   strio.gets(sep_string=$/)   -> string or nil
+ *
+ * See IO#gets.
+ */
+static VALUE
+strio_gets(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE str = strio_getline(argc, argv, readable(StringIO(self)));
+
+    rb_lastline_set(str);
+    return str;
+}
+
+/*
+ * call-seq:
+ *   strio.readline(sep_string=$/)   -> string
+ *
+ * See IO#readline.
+ */
+static VALUE
+strio_readline(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE line = strio_getline(argc, argv, readable(StringIO(self)));
+    if (NIL_P(line)) rb_eof_error();
+    return line;
+}
+
+/*
+ * call-seq:
+ *   strio.each(sep_string=$/)      {|line| block }  -> strio
+ *   strio.each_line(sep_string=$/) {|line| block }  -> strio
+ *
+ * See IO#each.
+ */
+static VALUE
+strio_each(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct StringIO *ptr = StringIO(self);
+    VALUE line;
+
+    while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
+	rb_yield(line);
+    }
+    return self;
+}
+
+/*
+ * call-seq:
+ *   strio.readlines(sep_string=$/)  ->   array
+ *
+ * See IO#readlines.
+ */
+static VALUE
+strio_readlines(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct StringIO *ptr = StringIO(self);
+    VALUE ary = rb_ary_new(), line;
+    while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
+	rb_ary_push(ary, line);
+    }
+    return ary;
+}
+
+/*
+ * call-seq:
+ *   strio.write(string)    -> integer
+ *   strio.syswrite(string) -> integer
+ *
+ * Appends the given string to the underlying buffer string of *strio*.
+ * The stream must be opened for writing.  If the argument is not a
+ * string, it will be converted to a string using <code>to_s</code>.
+ * Returns the number of bytes written.  See IO#write.
+ */
+static VALUE
+strio_write(self, str)
+    VALUE self, str;
+{
+    struct StringIO *ptr = writable(StringIO(self));
+    long len, olen;
+
+    if (TYPE(str) != T_STRING)
+	str = rb_obj_as_string(str);
+    len = RSTRING(str)->len;
+    if (!len) return INT2FIX(0);
+    check_modifiable(ptr);
+    olen = RSTRING(ptr->string)->len;
+    if (ptr->flags & FMODE_APPEND) {
+	ptr->pos = olen;
+    }
+    if (ptr->pos == olen) {
+	rb_str_cat(ptr->string, RSTRING(str)->ptr, len);
+    }
+    else {
+	strio_extend(ptr, ptr->pos, len);
+	rb_str_update(ptr->string, ptr->pos, len, str);
+    }
+    OBJ_INFECT(ptr->string, self);
+    ptr->pos += len;
+    return LONG2NUM(len);
+}
+
+/*
+ * call-seq:
+ *   strio << obj     -> strio
+ *
+ * See IO#<<.
+ */
+#define strio_addstr rb_io_addstr
+
+/*
+ * call-seq:
+ *   strio.print()             -> nil
+ *   strio.print(obj, ...)     -> nil
+ *
+ * See IO#print.
+ */
+#define strio_print rb_io_print
+
+/*
+ * call-seq:
+ *   strio.printf(format_string [, obj, ...] )   -> nil
+ *
+ * See IO#printf.
+ */
+#define strio_printf rb_io_printf
+
+/*
+ * call-seq:
+ *   strio.putc(obj)    -> obj
+ *
+ * See IO#putc.
+ */
+static VALUE
+strio_putc(self, ch)
+    VALUE self, ch;
+{
+    struct StringIO *ptr = writable(StringIO(self));
+    int c = NUM2CHR(ch);
+    long olen;
+
+    check_modifiable(ptr);
+    olen = RSTRING(ptr->string)->len;
+    if (ptr->flags & FMODE_APPEND) {
+	ptr->pos = olen;
+    }
+    strio_extend(ptr, ptr->pos, 1);
+    RSTRING(ptr->string)->ptr[ptr->pos++] = c;
+    OBJ_INFECT(ptr->string, self);
+    return ch;
+}
+
+/*
+ * call-seq:
+ *   strio.puts(obj, ...)    -> nil
+ *
+ * See IO#puts.
+ */
+#define strio_puts rb_io_puts
+
+/*
+ * call-seq:
+ *   strio.read([length [, buffer]])    -> string, buffer, or nil
+ *
+ * See IO#read.
+ */
+static VALUE
+strio_read(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct StringIO *ptr = readable(StringIO(self));
+    VALUE str = Qnil;
+    long len, olen;
+
+    switch (argc) {
+      case 2:
+	str = argv[1];
+	StringValue(str);
+	rb_str_modify(str);
+      case 1:
+	if (!NIL_P(argv[0])) {
+	    len = olen = NUM2LONG(argv[0]);
+	    if (len < 0) {
+		rb_raise(rb_eArgError, "negative length %ld given", len);
+	    }
+	    if (len > 0 && ptr->pos >= RSTRING(ptr->string)->len) {
+		ptr->flags |= STRIO_EOF;
+		if (!NIL_P(str)) rb_str_resize(str, 0);
+		return Qnil;
+	    }
+	    else if (ptr->flags & STRIO_EOF) {
+		if (!NIL_P(str)) rb_str_resize(str, 0);
+		return Qnil;
+	    }
+	    break;
+	}
+	/* fall through */
+      case 0:
+	olen = -1;
+	len = RSTRING(ptr->string)->len;
+	if (len <= ptr->pos) {
+	    ptr->flags |= STRIO_EOF;
+	    if (NIL_P(str)) {
+		str = rb_str_new(0, 0);
+	    }
+	    else {
+		rb_str_resize(str, 0);
+	    }
+	    return str;
+	}
+	else {
+	    len -= ptr->pos;
+	}
+	break;
+      default:
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+    }
+    if (NIL_P(str)) {
+	str = rb_str_substr(ptr->string, ptr->pos, len);
+    }
+    else {
+	long rest = RSTRING(ptr->string)->len - ptr->pos;
+	if (len > rest) len = rest;
+	rb_str_resize(str, len);
+	MEMCPY(RSTRING(str)->ptr, RSTRING(ptr->string)->ptr + ptr->pos, char, len);
+    }
+    if (NIL_P(str)) {
+	if (!(ptr->flags & STRIO_EOF)) str = rb_str_new(0, 0);
+	len = 0;
+    }
+    else {
+	ptr->pos += len = RSTRING(str)->len;
+    }
+    if (olen < 0 || olen > len) ptr->flags |= STRIO_EOF;
+    return str;
+}
+
+/*
+ * call-seq:
+ *   strio.sysread(integer[, outbuf])    -> string
+ *
+ * Similar to #read, but raises +EOFError+ at end of string instead of
+ * returning +nil+, as well as IO#sysread does.
+ */
+static VALUE
+strio_sysread(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE val = strio_read(argc, argv, self);
+    if (NIL_P(val) || RSTRING(val)->len == 0) {
+	rb_eof_error();
+    }
+    return val;
+}
+
+#define strio_syswrite strio_write
+
+/* call-seq: strio.path -> nil */
+#define strio_path strio_nil
+
+/*
+ * call-seq:
+ *   strio.isatty -> nil
+ *   strio.tty? -> nil
+ *
+ */
+#define strio_isatty strio_false
+
+/* call-seq: strio.pid -> nil */
+#define strio_pid strio_nil
+
+/* call-seq: strio.fileno -> nil */
+#define strio_fileno strio_nil
+
+/*
+ * call-seq:
+ *   strio.size   -> integer
+ *
+ * Returns the size of the buffer string.
+ */
+static VALUE
+strio_size(self)
+    VALUE self;
+{
+    VALUE string = StringIO(self)->string;
+    if (NIL_P(string)) {
+	rb_raise(rb_eIOError, "not opened");
+    }
+    return ULONG2NUM(RSTRING(string)->len);
+}
+
+/*
+ * call-seq:
+ *   strio.truncate(integer)    -> 0
+ *
+ * Truncates the buffer string to at most _integer_ bytes. The *strio*
+ * must be opened for writing.
+ */
+static VALUE
+strio_truncate(self, len)
+    VALUE self, len;
+{
+    VALUE string = writable(StringIO(self))->string;
+    long l = NUM2LONG(len);
+    long plen = RSTRING(string)->len;
+    if (l < 0) {
+	error_inval("negative legnth");
+    }
+    rb_str_resize(string, l);
+    if (plen < l) {
+	MEMZERO(RSTRING(string)->ptr + plen, char, l - plen);
+    }
+    return len;
+}
+
+/*
+ * Pseudo I/O on String object.
+ */
+void
+Init_stringio()
+{
+    VALUE StringIO = rb_define_class("StringIO", rb_cData);
+
+    rb_include_module(StringIO, rb_mEnumerable);
+    rb_define_alloc_func(StringIO, strio_s_allocate);
+    rb_define_singleton_method(StringIO, "open", strio_s_open, -1);
+    rb_define_method(StringIO, "initialize", strio_initialize, -1);
+    rb_define_method(StringIO, "initialize_copy", strio_copy, 1);
+    rb_define_method(StringIO, "reopen", strio_reopen, -1);
+
+    rb_define_method(StringIO, "string", strio_get_string, 0);
+    rb_define_method(StringIO, "string=", strio_set_string, 1);
+    rb_define_method(StringIO, "lineno", strio_get_lineno, 0);
+    rb_define_method(StringIO, "lineno=", strio_set_lineno, 1);
+
+    rb_define_method(StringIO, "binmode", strio_binmode, 0);
+    rb_define_method(StringIO, "close", strio_close, 0);
+    rb_define_method(StringIO, "close_read", strio_close_read, 0);
+    rb_define_method(StringIO, "close_write", strio_close_write, 0);
+    rb_define_method(StringIO, "closed?", strio_closed, 0);
+    rb_define_method(StringIO, "closed_read?", strio_closed_read, 0);
+    rb_define_method(StringIO, "closed_write?", strio_closed_write, 0);
+    rb_define_method(StringIO, "eof", strio_eof, 0);
+    rb_define_method(StringIO, "eof?", strio_eof, 0);
+    rb_define_method(StringIO, "fcntl", strio_fcntl, -1);
+    rb_define_method(StringIO, "flush", strio_flush, 0);
+    rb_define_method(StringIO, "fsync", strio_fsync, 0);
+    rb_define_method(StringIO, "pos", strio_get_pos, 0);
+    rb_define_method(StringIO, "pos=", strio_set_pos, 1);
+    rb_define_method(StringIO, "rewind", strio_rewind, 0);
+    rb_define_method(StringIO, "seek", strio_seek, -1);
+    rb_define_method(StringIO, "sync", strio_get_sync, 0);
+    rb_define_method(StringIO, "sync=", strio_set_sync, 1);
+    rb_define_method(StringIO, "tell", strio_tell, 0);
+    rb_define_method(StringIO, "path", strio_path, 0);
+
+    rb_define_method(StringIO, "each", strio_each, -1);
+    rb_define_method(StringIO, "each_byte", strio_each_byte, 0);
+    rb_define_method(StringIO, "each_line", strio_each, -1);
+    rb_define_method(StringIO, "getc", strio_getc, 0);
+    rb_define_method(StringIO, "ungetc", strio_ungetc, 1);
+    rb_define_method(StringIO, "readchar", strio_readchar, 0);
+    rb_define_method(StringIO, "gets", strio_gets, -1);
+    rb_define_method(StringIO, "readline", strio_readline, -1);
+    rb_define_method(StringIO, "readlines", strio_readlines, -1);
+    rb_define_method(StringIO, "read", strio_read, -1);
+    rb_define_method(StringIO, "sysread", strio_sysread, -1);
+
+    rb_define_method(StringIO, "write", strio_write, 1);
+    rb_define_method(StringIO, "<<", strio_addstr, 1);
+    rb_define_method(StringIO, "print", strio_print, -1);
+    rb_define_method(StringIO, "printf", strio_printf, -1);
+    rb_define_method(StringIO, "putc", strio_putc, 1);
+    rb_define_method(StringIO, "puts", strio_puts, -1);
+    rb_define_method(StringIO, "syswrite", strio_syswrite, 1);
+
+    rb_define_method(StringIO, "isatty", strio_isatty, 0);
+    rb_define_method(StringIO, "tty?", strio_isatty, 0);
+    rb_define_method(StringIO, "pid", strio_pid, 0);
+    rb_define_method(StringIO, "fileno", strio_fileno, 0);
+    rb_define_method(StringIO, "size", strio_size, 0);
+    rb_define_method(StringIO, "length", strio_size, 0);
+    rb_define_method(StringIO, "truncate", strio_truncate, 1);
+}
diff --git a/ruby_1_8_6/ext/strscan/.cvsignore b/ruby_1_8_6/ext/strscan/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/strscan/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/strscan/depend b/ruby_1_8_6/ext/strscan/depend
new file mode 100644
index 0000000000..9199574c3f
--- /dev/null
+++ b/ruby_1_8_6/ext/strscan/depend
@@ -0,0 +1 @@
+strscan.o: strscan.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ruby_1_8_6/ext/strscan/extconf.rb b/ruby_1_8_6/ext/strscan/extconf.rb
new file mode 100644
index 0000000000..0d21966fc2
--- /dev/null
+++ b/ruby_1_8_6/ext/strscan/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile 'strscan'
diff --git a/ruby_1_8_6/ext/strscan/strscan.c b/ruby_1_8_6/ext/strscan/strscan.c
new file mode 100644
index 0000000000..b5ee20282c
--- /dev/null
+++ b/ruby_1_8_6/ext/strscan/strscan.c
@@ -0,0 +1,1320 @@
+/*
+    $Id$
+
+    Copyright (c) 1999-2006 Minero Aoki
+
+    This program is free software.
+    You can distribute/modify this program under the terms of
+    the Ruby License. For details, see the file COPYING.
+*/
+
+#include "ruby.h"
+#include "re.h"
+
+#define STRSCAN_VERSION "0.7.0"
+
+/* =======================================================================
+                         Data Type Definitions
+   ======================================================================= */
+
+static VALUE StringScanner;
+static VALUE ScanError;
+
+struct strscanner
+{
+    /* multi-purpose flags */
+    unsigned long flags;
+#define FLAG_MATCHED (1 << 0)
+
+    /* the string to scan */
+    VALUE str;
+    
+    /* scan pointers */
+    long prev;   /* legal only when MATCHED_P(s) */
+    long curr;   /* always legal */
+
+    /* the regexp register; legal only when MATCHED_P(s) */
+    struct re_registers regs;
+};
+
+#define MATCHED_P(s)          ((s)->flags & FLAG_MATCHED)
+#define MATCHED(s)             (s)->flags |= FLAG_MATCHED
+#define CLEAR_MATCH_STATUS(s)  (s)->flags &= ~FLAG_MATCHED
+
+#define S_PBEG(s)  (RSTRING((s)->str)->ptr)
+#define S_LEN(s)  (RSTRING((s)->str)->len)
+#define S_PEND(s)  (S_PBEG(s) + S_LEN(s))
+#define CURPTR(s) (S_PBEG(s) + (s)->curr)
+#define S_RESTLEN(s) (S_LEN(s) - (s)->curr)
+
+#define EOS_P(s) ((s)->curr >= RSTRING(p->str)->len)
+
+#define GET_SCANNER(obj,var) do {\
+    Data_Get_Struct(obj, struct strscanner, var);\
+    if (NIL_P(var->str)) rb_raise(rb_eArgError, "uninitialized StringScanner object");\
+} while (0)
+
+/* =======================================================================
+                            Function Prototypes
+   ======================================================================= */
+
+static VALUE infect _((VALUE str, struct strscanner *p));
+static VALUE extract_range _((struct strscanner *p, long beg_i, long end_i));
+static VALUE extract_beg_len _((struct strscanner *p, long beg_i, long len));
+
+static void check_strscan _((VALUE obj));
+static void strscan_mark _((struct strscanner *p));
+static void strscan_free _((struct strscanner *p));
+static VALUE strscan_s_allocate _((VALUE klass));
+static VALUE strscan_initialize _((int argc, VALUE *argv, VALUE self));
+static VALUE strscan_init_copy _((VALUE vself, VALUE vorig));
+
+static VALUE strscan_s_mustc _((VALUE self));
+static VALUE strscan_terminate _((VALUE self));
+static VALUE strscan_clear _((VALUE self));
+static VALUE strscan_get_string _((VALUE self));
+static VALUE strscan_set_string _((VALUE self, VALUE str));
+static VALUE strscan_concat _((VALUE self, VALUE str));
+static VALUE strscan_get_pos _((VALUE self));
+static VALUE strscan_set_pos _((VALUE self, VALUE pos));
+static VALUE strscan_do_scan _((VALUE self, VALUE regex,
+                                int succptr, int getstr, int headonly));
+static VALUE strscan_scan _((VALUE self, VALUE re));
+static VALUE strscan_match_p _((VALUE self, VALUE re));
+static VALUE strscan_skip _((VALUE self, VALUE re));
+static VALUE strscan_check _((VALUE self, VALUE re));
+static VALUE strscan_scan_full _((VALUE self, VALUE re,
+                                  VALUE succp, VALUE getp));
+static VALUE strscan_scan_until _((VALUE self, VALUE re));
+static VALUE strscan_skip_until _((VALUE self, VALUE re));
+static VALUE strscan_check_until _((VALUE self, VALUE re));
+static VALUE strscan_search_full _((VALUE self, VALUE re,
+                                    VALUE succp, VALUE getp));
+static void adjust_registers_to_matched _((struct strscanner *p));
+static VALUE strscan_getch _((VALUE self));
+static VALUE strscan_get_byte _((VALUE self));
+static VALUE strscan_getbyte _((VALUE self));
+static VALUE strscan_peek _((VALUE self, VALUE len));
+static VALUE strscan_peep _((VALUE self, VALUE len));
+static VALUE strscan_unscan _((VALUE self));
+static VALUE strscan_bol_p _((VALUE self));
+static VALUE strscan_eos_p _((VALUE self));
+static VALUE strscan_empty_p _((VALUE self));
+static VALUE strscan_rest_p _((VALUE self));
+static VALUE strscan_matched_p _((VALUE self));
+static VALUE strscan_matched _((VALUE self));
+static VALUE strscan_matched_size _((VALUE self));
+static VALUE strscan_aref _((VALUE self, VALUE idx));
+static VALUE strscan_pre_match _((VALUE self));
+static VALUE strscan_post_match _((VALUE self));
+static VALUE strscan_rest _((VALUE self));
+static VALUE strscan_rest_size _((VALUE self));
+
+static VALUE strscan_inspect _((VALUE self));
+static VALUE inspect1 _((struct strscanner *p));
+static VALUE inspect2 _((struct strscanner *p));
+
+/* =======================================================================
+                                   Utils
+   ======================================================================= */
+
+static VALUE
+infect(VALUE str, struct strscanner *p)
+{
+    OBJ_INFECT(str, p->str);
+    return str;
+}
+
+static VALUE
+extract_range(struct strscanner *p, long beg_i, long end_i)
+{
+    if (beg_i > S_LEN(p)) return Qnil;
+    if (end_i > S_LEN(p))
+        end_i = S_LEN(p);
+    return infect(rb_str_new(S_PBEG(p) + beg_i, end_i - beg_i), p);
+}
+
+static VALUE
+extract_beg_len(struct strscanner *p, long beg_i, long len)
+{
+    if (beg_i > S_LEN(p)) return Qnil;
+    if (beg_i + len > S_LEN(p))
+        len = S_LEN(p) - beg_i;
+    return infect(rb_str_new(S_PBEG(p) + beg_i, len), p);
+}
+
+/* =======================================================================
+                               Constructor
+   ======================================================================= */
+
+static void
+strscan_mark(struct strscanner *p)
+{
+    rb_gc_mark(p->str);
+}
+
+static void
+strscan_free(struct strscanner *p)
+{
+    re_free_registers(&(p->regs));
+    free(p);
+}
+
+static VALUE
+strscan_s_allocate(VALUE klass)
+{
+    struct strscanner *p;
+    
+    p = ALLOC(struct strscanner);
+    MEMZERO(p, struct strscanner, 1);
+    CLEAR_MATCH_STATUS(p);
+    MEMZERO(&(p->regs), struct re_registers, 1);
+    p->str = Qnil;
+    return Data_Wrap_Struct(klass, strscan_mark, strscan_free, p);
+}
+
+/*
+ * call-seq: StringScanner.new(string, dup = false)
+ *
+ * Creates a new StringScanner object to scan over the given +string+.
+ * +dup+ argument is obsolete and not used now.
+ */
+static VALUE
+strscan_initialize(int argc, VALUE *argv, VALUE self)
+{
+    struct strscanner *p;
+    VALUE str, need_dup;
+
+    Data_Get_Struct(self, struct strscanner, p);
+    rb_scan_args(argc, argv, "11", &str, &need_dup);
+    StringValue(str);
+    p->str = str;
+
+    return self;
+}
+
+static void
+check_strscan(VALUE obj)
+{
+    if (TYPE(obj) != T_DATA || RDATA(obj)->dmark != (RUBY_DATA_FUNC)strscan_mark) {
+        rb_raise(rb_eTypeError,
+                 "wrong argument type %s (expected StringScanner)",
+                 rb_obj_classname(obj));
+    }
+}
+
+/*
+ * call-seq:
+ *   dup
+ *   clone
+ *
+ * Duplicates a StringScanner object.
+ */
+static VALUE
+strscan_init_copy(VALUE vself, VALUE vorig)
+{
+    struct strscanner *self, *orig;
+
+    Data_Get_Struct(vself, struct strscanner, self);
+    check_strscan(vorig);
+    Data_Get_Struct(vorig, struct strscanner, orig);
+    if (self != orig) {
+        self->flags = orig->flags;
+        self->str = orig->str;
+        self->prev = orig->prev;
+        self->curr = orig->curr;
+        re_copy_registers(&self->regs, &orig->regs);
+    }
+    return vself;
+}
+
+/* =======================================================================
+                          Instance Methods
+   ======================================================================= */
+
+/*
+ * call-seq: StringScanner.must_C_version
+ *
+ * This method is defined for backward compatibility.
+ */
+static VALUE
+strscan_s_mustc(VALUE self)
+{
+    return self;
+}
+
+/*
+ * Reset the scan pointer (index 0) and clear matching data.
+ */
+static VALUE
+strscan_reset(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    p->curr = 0;
+    CLEAR_MATCH_STATUS(p);
+    return self;
+}
+
+/*
+ * call-seq:
+ *   terminate
+ *   clear
+ *
+ * Set the scan pointer to the end of the string and clear matching data.
+ */
+static VALUE
+strscan_terminate(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    p->curr = S_LEN(p);
+    CLEAR_MATCH_STATUS(p);
+    return self;
+}
+
+/*
+ * Equivalent to #terminate.
+ * This method is obsolete; use #terminate instead.
+ */
+static VALUE
+strscan_clear(VALUE self)
+{
+    rb_warning("StringScanner#clear is obsolete; use #terminate instead");
+    return strscan_terminate(self);
+}
+
+/*
+ * Returns the string being scanned.
+ */
+static VALUE
+strscan_get_string(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    return p->str;
+}
+
+/*
+ * call-seq: string=(str)
+ *
+ * Changes the string being scanned to +str+ and resets the scanner.
+ * Returns +str+.
+ */
+static VALUE
+strscan_set_string(VALUE self, VALUE str)
+{
+    struct strscanner *p;
+
+    Data_Get_Struct(self, struct strscanner, p);
+    StringValue(str);
+    p->str = rb_str_dup(str);
+    rb_obj_freeze(p->str);
+    p->curr = 0;
+    CLEAR_MATCH_STATUS(p);
+    return str;
+}
+
+/*
+ * call-seq:
+ *   concat(str)
+ *   <<(str)
+ *
+ * Appends +str+ to the string being scanned.
+ * This method does not affect scan pointer.
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.scan(/Fri /)
+ *   s << " +1000 GMT"
+ *   s.string            # -> "Fri Dec 12 1975 14:39 +1000 GMT"
+ *   s.scan(/Dec/)       # -> "Dec"
+ */
+static VALUE
+strscan_concat(VALUE self, VALUE str)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    StringValue(str);
+    rb_str_append(p->str, str);
+    return self;
+}
+
+/*
+ * Returns the position of the scan pointer.  In the 'reset' position, this
+ * value is zero.  In the 'terminated' position (i.e. the string is exhausted),
+ * this value is the length of the string.
+ *
+ * In short, it's a 0-based index into the string.
+ *
+ *   s = StringScanner.new('test string')
+ *   s.pos               # -> 0
+ *   s.scan_until /str/  # -> "test str"
+ *   s.pos               # -> 8
+ *   s.terminate         # -> #<StringScanner fin>
+ *   s.pos               # -> 11
+ */
+static VALUE
+strscan_get_pos(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    return INT2FIX(p->curr);
+}
+
+/*
+ * call-seq: pos=(n)
+ *
+ * Modify the scan pointer.
+ *
+ *   s = StringScanner.new('test string')
+ *   s.pos = 7            # -> 7
+ *   s.rest               # -> "ring"
+ */
+static VALUE
+strscan_set_pos(VALUE self, VALUE v)
+{
+    struct strscanner *p;
+    long i;
+
+    GET_SCANNER(self, p);
+    i = NUM2INT(v);
+    if (i < 0) i += S_LEN(p);
+    if (i < 0) rb_raise(rb_eRangeError, "index out of range");
+    if (i > S_LEN(p)) rb_raise(rb_eRangeError, "index out of range");
+    p->curr = i;
+    return INT2NUM(i);
+}
+
+static VALUE
+strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
+{
+    struct strscanner *p;
+    int ret;
+
+    Check_Type(regex, T_REGEXP);
+    GET_SCANNER(self, p);
+
+    CLEAR_MATCH_STATUS(p);
+    if (S_RESTLEN(p) < 0) {
+        return Qnil;
+    }
+    rb_kcode_set_option(regex);
+    if (headonly) {
+        ret = re_match(RREGEXP(regex)->ptr,
+                       CURPTR(p), S_RESTLEN(p),
+                       0,
+                       &(p->regs));
+    }
+    else {
+        ret = re_search(RREGEXP(regex)->ptr,
+                        CURPTR(p), S_RESTLEN(p),
+                        0,
+                        S_RESTLEN(p),
+                        &(p->regs));
+    }
+    rb_kcode_reset_option();
+
+    if (ret == -2) rb_raise(ScanError, "regexp buffer overflow");
+    if (ret < 0) {
+        /* not matched */
+        return Qnil;
+    }
+
+    MATCHED(p);
+    p->prev = p->curr;
+    if (succptr) {
+        p->curr += p->regs.end[0];
+    }
+    if (getstr) {
+        return extract_beg_len(p, p->prev, p->regs.end[0]);
+    }
+    else {
+        return INT2FIX(p->regs.end[0]);
+    }
+}
+
+/*
+ * call-seq: scan(pattern) => String
+ *
+ * Tries to match with +pattern+ at the current position. If there's a match,
+ * the scanner advances the "scan pointer" and returns the matched string.
+ * Otherwise, the scanner returns +nil+.
+ *
+ *   s = StringScanner.new('test string')
+ *   p s.scan(/\w+/)   # -> "test"
+ *   p s.scan(/\w+/)   # -> nil
+ *   p s.scan(/\s+/)   # -> " "
+ *   p s.scan(/\w+/)   # -> "string"
+ *   p s.scan(/./)     # -> nil
+ *
+ */
+static VALUE
+strscan_scan(VALUE self, VALUE re)
+{
+    return strscan_do_scan(self, re, 1, 1, 1);
+}
+
+/*
+ * call-seq: match?(pattern)
+ *
+ * Tests whether the given +pattern+ is matched from the current scan pointer.
+ * Returns the length of the match, or +nil+.  The scan pointer is not advanced.
+ *
+ *   s = StringScanner.new('test string')
+ *   p s.match?(/\w+/)   # -> 4
+ *   p s.match?(/\w+/)   # -> 4
+ *   p s.match?(/\s+/)   # -> nil
+ */
+static VALUE
+strscan_match_p(VALUE self, VALUE re)
+{
+    return strscan_do_scan(self, re, 0, 0, 1);
+}
+
+/*
+ * call-seq: skip(pattern)
+ *
+ * Attempts to skip over the given +pattern+ beginning with the scan pointer.
+ * If it matches, the scan pointer is advanced to the end of the match, and the
+ * length of the match is returned.  Otherwise, +nil+ is returned.
+ *
+ * It's similar to #scan, but without returning the matched string.
+ *
+ *   s = StringScanner.new('test string')
+ *   p s.skip(/\w+/)   # -> 4
+ *   p s.skip(/\w+/)   # -> nil
+ *   p s.skip(/\s+/)   # -> 1
+ *   p s.skip(/\w+/)   # -> 6
+ *   p s.skip(/./)     # -> nil
+ *
+ */
+static VALUE
+strscan_skip(VALUE self, VALUE re)
+{
+    return strscan_do_scan(self, re, 1, 0, 1);
+}
+
+/*
+ * call-seq: check(pattern)
+ *
+ * This returns the value that #scan would return, without advancing the scan
+ * pointer.  The match register is affected, though.
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.check /Fri/               # -> "Fri"
+ *   s.pos                       # -> 0
+ *   s.matched                   # -> "Fri"
+ *   s.check /12/                # -> nil
+ *   s.matched                   # -> nil
+ *
+ * Mnemonic: it "checks" to see whether a #scan will return a value.
+ */
+static VALUE
+strscan_check(VALUE self, VALUE re)
+{
+    return strscan_do_scan(self, re, 0, 1, 1);
+}
+
+/*
+ * call-seq: scan_full(pattern, return_string_p, advance_pointer_p)
+ *
+ * Tests whether the given +pattern+ is matched from the current scan pointer.
+ * Returns the matched string if +return_string_p+ is true.
+ * Advances the scan pointer if +advance_pointer_p+ is true.
+ * The match register is affected.
+ *
+ * "full" means "#scan with full parameters".
+ */
+static VALUE
+strscan_scan_full(VALUE self, VALUE re, VALUE s, VALUE f)
+{
+    return strscan_do_scan(self, re, RTEST(s), RTEST(f), 1);
+}
+
+
+/*
+ * call-seq: scan_until(pattern)
+ *
+ * Scans the string _until_ the +pattern+ is matched.  Returns the substring up
+ * to and including the end of the match, advancing the scan pointer to that
+ * location. If there is no match, +nil+ is returned.
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.scan_until(/1/)        # -> "Fri Dec 1"
+ *   s.pre_match              # -> "Fri Dec "
+ *   s.scan_until(/XYZ/)      # -> nil
+ */
+static VALUE
+strscan_scan_until(VALUE self, VALUE re)
+{
+    return strscan_do_scan(self, re, 1, 1, 0);
+}
+
+/*
+ * call-seq: exist?(pattern)
+ *
+ * Looks _ahead_ to see if the +pattern+ exists _anywhere_ in the string,
+ * without advancing the scan pointer.  This predicates whether a #scan_until
+ * will return a value.
+ *
+ *   s = StringScanner.new('test string')
+ *   s.exist? /s/            # -> 3
+ *   s.scan /test/           # -> "test"
+ *   s.exist? /s/            # -> 6
+ *   s.exist? /e/            # -> nil
+ */
+static VALUE
+strscan_exist_p(VALUE self, VALUE re)
+{
+    return strscan_do_scan(self, re, 0, 0, 0);
+}
+
+/*
+ * call-seq: skip_until(pattern)
+ *
+ * Advances the scan pointer until +pattern+ is matched and consumed.  Returns
+ * the number of bytes advanced, or +nil+ if no match was found.
+ *
+ * Look ahead to match +pattern+, and advance the scan pointer to the _end_
+ * of the match.  Return the number of characters advanced, or +nil+ if the
+ * match was unsuccessful.
+ *
+ * It's similar to #scan_until, but without returning the intervening string.
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.skip_until /12/           # -> 10
+ *   s                           # 
+ */
+static VALUE
+strscan_skip_until(VALUE self, VALUE re)
+{
+    return strscan_do_scan(self, re, 1, 0, 0);
+}
+
+/*
+ * call-seq: check_until(pattern)
+ *
+ * This returns the value that #scan_until would return, without advancing the
+ * scan pointer.  The match register is affected, though.
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.check_until /12/          # -> "Fri Dec 12"
+ *   s.pos                       # -> 0
+ *   s.matched                   # -> 12
+ *
+ * Mnemonic: it "checks" to see whether a #scan_until will return a value.
+ */
+static VALUE
+strscan_check_until(VALUE self, VALUE re)
+{
+    return strscan_do_scan(self, re, 0, 1, 0);
+}
+
+/*
+ * call-seq: search_full(pattern, return_string_p, advance_pointer_p)
+ *
+ * Scans the string _until_ the +pattern+ is matched.
+ * Returns the matched string if +return_string_p+ is true, otherwise
+ * returns the number of bytes advanced.
+ * Advances the scan pointer if +advance_pointer_p+, otherwise not.
+ * This method does affect the match register.
+ */
+static VALUE
+strscan_search_full(VALUE self, VALUE re, VALUE s, VALUE f)
+{
+    return strscan_do_scan(self, re, RTEST(s), RTEST(f), 0);
+}
+
+/* DANGEROUS; need to synchronize with regex.c */
+static void
+adjust_registers_to_matched(struct strscanner *p)
+{
+    if (p->regs.allocated == 0) {
+        p->regs.beg = ALLOC_N(int, RE_NREGS);
+        p->regs.end = ALLOC_N(int, RE_NREGS);
+        p->regs.allocated = RE_NREGS;
+    }
+    p->regs.num_regs = 1;
+    p->regs.beg[0] = 0;
+    p->regs.end[0] = p->curr - p->prev;
+}
+
+/*
+ * Scans one character and returns it.
+ * This method is multi-byte character sensitive.
+ * See also #get_byte.
+ *
+ *   s = StringScanner.new('ab')
+ *   s.getch           # => "a"
+ *   s.getch           # => "b"
+ *   s.getch           # => nil
+ *
+ *   $KCODE = 'EUC'
+ *   s = StringScanner.new("\244\242")
+ *   s.getch           # => "\244\242"   # Japanese hira-kana "A" in EUC-JP
+ *   s.getch           # => nil
+ */
+static VALUE
+strscan_getch(VALUE self)
+{
+    struct strscanner *p;
+    long len;
+
+    GET_SCANNER(self, p);
+    CLEAR_MATCH_STATUS(p);
+    if (EOS_P(p))
+        return Qnil;
+    len = mbclen(*CURPTR(p));
+    if (p->curr + len > S_LEN(p)) {
+        len = S_LEN(p) - p->curr;
+    }
+    p->prev = p->curr;
+    p->curr += len;
+    MATCHED(p);
+    adjust_registers_to_matched(p);
+    return extract_range(p, p->prev + p->regs.beg[0],
+                            p->prev + p->regs.end[0]);
+}
+
+/*
+ * Scans one byte and returns it.
+ * This method is NOT multi-byte character sensitive.
+ * See also #getch.
+ *
+ *   s = StringScanner.new('ab')
+ *   s.get_byte         # => "a"
+ *   s.get_byte         # => "b"
+ *   s.get_byte         # => nil
+ *
+ *   s = StringScanner.new("\244\242")
+ *   s.get_byte         # => "\244"
+ *   s.get_byte         # => "\242"
+ *   s.get_byte         # => nil
+ */
+static VALUE
+strscan_get_byte(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    CLEAR_MATCH_STATUS(p);
+    if (EOS_P(p)) {
+        return Qnil;
+    }
+    p->prev = p->curr;
+    p->curr++;
+    MATCHED(p);
+    adjust_registers_to_matched(p);
+    return extract_range(p, p->prev + p->regs.beg[0],
+                            p->prev + p->regs.end[0]);
+}
+
+/*
+ * Equivalent to #get_byte.
+ * This method is obsolete; use #get_byte instead.
+ */
+static VALUE
+strscan_getbyte(VALUE self)
+{
+    rb_warning("StringScanner#getbyte is obsolete; use #get_byte instead");
+    return strscan_get_byte(self);
+}
+
+/*
+ * call-seq: peek(len)
+ *
+ * Extracts a string corresponding to <tt>string[pos,len]</tt>, without
+ * advancing the scan pointer.
+ *
+ *   s = StringScanner.new('test string')
+ *   s.peek(7)          # => "test st"
+ *   s.peek(7)          # => "test st"
+ *
+ */
+static VALUE
+strscan_peek(VALUE self, VALUE vlen)
+{
+    struct strscanner *p;
+    long len;
+
+    GET_SCANNER(self, p);
+    len = NUM2LONG(vlen);
+    if (EOS_P(p)) {
+        return infect(rb_str_new("", 0), p);
+    }
+    if (p->curr + len > S_LEN(p)) {
+        len = S_LEN(p) - p->curr;
+    }
+    return extract_beg_len(p, p->curr, len);
+}
+
+/*
+ * Equivalent to #peek.
+ * This method is obsolete; use #peek instead.
+ */
+static VALUE
+strscan_peep(VALUE self, VALUE vlen)
+{
+    rb_warning("StringScanner#peep is obsolete; use #peek instead");
+    return strscan_peek(self, vlen);
+}
+
+/*
+ * Set the scan pointer to the previous position.  Only one previous position is
+ * remembered, and it changes with each scanning operation.
+ *
+ *   s = StringScanner.new('test string')
+ *   s.scan(/\w+/)        # => "test"
+ *   s.unscan
+ *   s.scan(/../)         # => "te"
+ *   s.scan(/\d/)         # => nil
+ *   s.unscan             # ScanError: unscan failed: previous match had failed
+ */
+static VALUE
+strscan_unscan(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    if (! MATCHED_P(p)) {
+        rb_raise(ScanError, "unscan failed: previous match had failed");
+    }
+    p->curr = p->prev;
+    CLEAR_MATCH_STATUS(p);
+    return self;
+}
+
+/*
+ * Returns +true+ iff the scan pointer is at the beginning of the line.
+ *
+ *   s = StringScanner.new("test\ntest\n")
+ *   s.bol?           # => true
+ *   s.scan(/te/)
+ *   s.bol?           # => false
+ *   s.scan(/st\n/)
+ *   s.bol?           # => true
+ *   s.terminate
+ *   s.bol?           # => true
+ */
+static VALUE
+strscan_bol_p(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    if (CURPTR(p) > S_PEND(p)) return Qnil;
+    if (p->curr == 0) return Qtrue;
+    return (*(CURPTR(p) - 1) == '\n') ? Qtrue : Qfalse;
+}
+
+/*
+ * Returns +true+ if the scan pointer is at the end of the string.
+ *
+ *   s = StringScanner.new('test string')
+ *   p s.eos?          # => false
+ *   s.scan(/test/)
+ *   p s.eos?          # => false
+ *   s.terminate
+ *   p s.eos?          # => true
+ */
+static VALUE
+strscan_eos_p(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    return EOS_P(p) ? Qtrue : Qfalse;
+}
+
+/*
+ * Equivalent to #eos?.
+ * This method is obsolete, use #eos? instead.
+ */
+static VALUE
+strscan_empty_p(VALUE self)
+{
+    rb_warning("StringScanner#empty? is obsolete; use #eos? instead");
+    return strscan_eos_p(self);
+}
+
+/*
+ * Returns true iff there is more data in the string.  See #eos?.
+ * This method is obsolete; use #eos? instead.
+ *
+ *   s = StringScanner.new('test string')
+ *   s.eos?              # These two
+ *   s.rest?             # are opposites.
+ */
+static VALUE
+strscan_rest_p(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    return EOS_P(p) ? Qfalse : Qtrue;
+}
+
+/*
+ * Returns +true+ iff the last match was successful.
+ *
+ *   s = StringScanner.new('test string')
+ *   s.match?(/\w+/)     # => 4
+ *   s.matched?          # => true
+ *   s.match?(/\d+/)     # => nil
+ *   s.matched?          # => false
+ */
+static VALUE
+strscan_matched_p(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    return MATCHED_P(p) ? Qtrue : Qfalse;
+}
+
+/*
+ * Returns the last matched string.
+ * 
+ *   s = StringScanner.new('test string')
+ *   s.match?(/\w+/)     # -> 4
+ *   s.matched           # -> "test"
+ */
+static VALUE
+strscan_matched(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    if (! MATCHED_P(p)) return Qnil;
+
+    return extract_range(p, p->prev + p->regs.beg[0],
+                            p->prev + p->regs.end[0]);
+}
+
+/*
+ * Returns the size of the most recent match (see #matched), or +nil+ if there
+ * was no recent match.
+ *
+ *   s = StringScanner.new('test string')
+ *   s.check /\w+/           # -> "test"
+ *   s.matched_size          # -> 4
+ *   s.check /\d+/           # -> nil
+ *   s.matched_size          # -> nil
+ */
+static VALUE
+strscan_matched_size(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    if (! MATCHED_P(p)) return Qnil;
+
+    return INT2NUM(p->regs.end[0] - p->regs.beg[0]);
+}
+
+/*
+ * Equivalent to #matched_size.
+ * This method is obsolete; use #matched_size instead.
+ */
+static VALUE
+strscan_matchedsize(VALUE self)
+{
+    rb_warning("StringScanner#matchedsize is obsolete; use #matched_size instead");
+    return strscan_matched_size(self);
+}
+
+/*
+ * call-seq: [](n)
+ *
+ * Return the n-th subgroup in the most recent match.
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.scan(/(\w+) (\w+) (\d+) /)       # -> "Fri Dec 12 "
+ *   s[0]                               # -> "Fri Dec 12 "
+ *   s[1]                               # -> "Fri"
+ *   s[2]                               # -> "Dec"
+ *   s[3]                               # -> "12"
+ *   s.post_match                       # -> "1975 14:39"
+ *   s.pre_match                        # -> ""
+ */
+static VALUE
+strscan_aref(VALUE self, VALUE idx)
+{
+    struct strscanner *p;
+    long i;
+
+    GET_SCANNER(self, p);
+    if (! MATCHED_P(p))        return Qnil;
+    
+    i = NUM2LONG(idx);
+    if (i < 0)
+        i += p->regs.num_regs;
+    if (i < 0)                 return Qnil;
+    if (i >= p->regs.num_regs) return Qnil;
+    if (p->regs.beg[i] == -1)  return Qnil;
+
+    return extract_range(p, p->prev + p->regs.beg[i],
+                            p->prev + p->regs.end[i]);
+}
+
+/*
+ * Return the <i><b>pre</b>-match</i> (in the regular expression sense) of the last scan.
+ *
+ *   s = StringScanner.new('test string')
+ *   s.scan(/\w+/)           # -> "test"
+ *   s.scan(/\s+/)           # -> " "
+ *   s.pre_match             # -> "test"
+ *   s.post_match            # -> "string"
+ */
+static VALUE
+strscan_pre_match(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    if (! MATCHED_P(p)) return Qnil;
+
+    return extract_range(p, 0, p->prev + p->regs.beg[0]);
+}
+
+/*
+ * Return the <i><b>post</b>-match</i> (in the regular expression sense) of the last scan.
+ *
+ *   s = StringScanner.new('test string')
+ *   s.scan(/\w+/)           # -> "test"
+ *   s.scan(/\s+/)           # -> " "
+ *   s.pre_match             # -> "test"
+ *   s.post_match            # -> "string"
+ */
+static VALUE
+strscan_post_match(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    if (! MATCHED_P(p)) return Qnil;
+
+    return extract_range(p, p->prev + p->regs.end[0], S_LEN(p));
+}
+
+/*
+ * Returns the "rest" of the string (i.e. everything after the scan pointer).
+ * If there is no more data (eos? = true), it returns <tt>""</tt>.
+ */
+static VALUE
+strscan_rest(VALUE self)
+{
+    struct strscanner *p;
+
+    GET_SCANNER(self, p);
+    if (EOS_P(p)) {
+        return infect(rb_str_new("", 0), p);
+    }
+    return extract_range(p, p->curr, S_LEN(p));
+}
+
+/*
+ * <tt>s.rest_size</tt> is equivalent to <tt>s.rest.size</tt>.
+ */
+static VALUE
+strscan_rest_size(VALUE self)
+{
+    struct strscanner *p;
+    long i;
+
+    GET_SCANNER(self, p);
+    if (EOS_P(p)) {
+        return INT2FIX(0);
+    }
+
+    i = S_LEN(p) - p->curr;
+    return INT2FIX(i);
+}
+
+/*
+ * <tt>s.restsize</tt> is equivalent to <tt>s.rest_size</tt>.
+ * This method is obsolete; use #rest_size instead.
+ */
+static VALUE
+strscan_restsize(VALUE self)
+{
+    rb_warning("StringScanner#restsize is obsolete; use #rest_size instead");
+    return strscan_rest_size(self);
+}
+
+#define INSPECT_LENGTH 5
+#define BUFSIZE 256
+
+/*
+ * Returns a string that represents the StringScanner object, showing:
+ * - the current position
+ * - the size of the string
+ * - the characters surrounding the scan pointer
+ *
+ *   s = StringScanner.new("Fri Dec 12 1975 14:39")
+ *   s.inspect            # -> '#<StringScanner 0/21 @ "Fri D...">'
+ *   s.scan_until /12/    # -> "Fri Dec 12"
+ *   s.inspect            # -> '#<StringScanner 10/21 "...ec 12" @ " 1975...">'
+ */
+static VALUE
+strscan_inspect(VALUE self)
+{
+    struct strscanner *p;
+    char buf[BUFSIZE];
+    long len;
+    VALUE a, b;
+
+    Data_Get_Struct(self, struct strscanner, p);
+    if (NIL_P(p->str)) {
+        len = snprintf(buf, BUFSIZE, "#<%s (uninitialized)>",
+                       rb_class2name(CLASS_OF(self)));
+        return infect(rb_str_new(buf, len), p);
+    }
+    if (EOS_P(p)) {
+        len = snprintf(buf, BUFSIZE, "#<%s fin>",
+                       rb_class2name(CLASS_OF(self)));
+        return infect(rb_str_new(buf, len), p);
+    }
+    if (p->curr == 0) {
+        b = inspect2(p);
+        len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld @ %s>",
+                       rb_class2name(CLASS_OF(self)),
+                       p->curr, S_LEN(p),
+                       RSTRING(b)->ptr);
+        return infect(rb_str_new(buf, len), p);
+    }
+    a = inspect1(p);
+    b = inspect2(p);
+    len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld %s @ %s>",
+                   rb_class2name(CLASS_OF(self)),
+                   p->curr, S_LEN(p),
+                   RSTRING(a)->ptr,
+                   RSTRING(b)->ptr);
+    return infect(rb_str_new(buf, len), p);
+}
+
+static VALUE
+inspect1(struct strscanner *p)
+{
+    char buf[BUFSIZE];
+    char *bp = buf;
+    long len;
+
+    if (p->curr == 0) return rb_str_new2("");
+    if (p->curr > INSPECT_LENGTH) {
+        strcpy(bp, "..."); bp += 3;
+        len = INSPECT_LENGTH;
+    }
+    else {
+        len = p->curr;
+    }
+    memcpy(bp, CURPTR(p) - len, len); bp += len;
+    return rb_str_dump(rb_str_new(buf, bp - buf));
+}
+
+static VALUE
+inspect2(struct strscanner *p)
+{
+    char buf[BUFSIZE];
+    char *bp = buf;
+    long len;
+
+    if (EOS_P(p)) return rb_str_new2("");
+    len = S_LEN(p) - p->curr;
+    if (len > INSPECT_LENGTH) {
+        len = INSPECT_LENGTH;
+        memcpy(bp, CURPTR(p), len); bp += len;
+        strcpy(bp, "..."); bp += 3;
+    }
+    else {
+        memcpy(bp, CURPTR(p), len); bp += len;
+    }
+    return rb_str_dump(rb_str_new(buf, bp - buf));
+}
+
+/* =======================================================================
+                              Ruby Interface
+   ======================================================================= */
+
+/*
+ * Document-class: StringScanner
+ * 
+ * StringScanner provides for lexical scanning operations on a String.  Here is
+ * an example of its usage:
+ *
+ *   s = StringScanner.new('This is an example string')
+ *   s.eos?               # -> false
+ *   
+ *   p s.scan(/\w+/)      # -> "This"
+ *   p s.scan(/\w+/)      # -> nil
+ *   p s.scan(/\s+/)      # -> " "
+ *   p s.scan(/\s+/)      # -> nil
+ *   p s.scan(/\w+/)      # -> "is"
+ *   s.eos?               # -> false
+ *   
+ *   p s.scan(/\s+/)      # -> " "
+ *   p s.scan(/\w+/)      # -> "an"
+ *   p s.scan(/\s+/)      # -> " "
+ *   p s.scan(/\w+/)      # -> "example"
+ *   p s.scan(/\s+/)      # -> " "
+ *   p s.scan(/\w+/)      # -> "string"
+ *   s.eos?               # -> true
+ *   
+ *   p s.scan(/\s+/)      # -> nil
+ *   p s.scan(/\w+/)      # -> nil
+ *
+ * Scanning a string means remembering the position of a <i>scan pointer</i>,
+ * which is just an index.  The point of scanning is to move forward a bit at
+ * a time, so matches are sought after the scan pointer; usually immediately
+ * after it.
+ *
+ * Given the string "test string", here are the pertinent scan pointer
+ * positions:
+ *
+ *     t e s t   s t r i n g
+ *   0 1 2 ...             1
+ *                         0
+ *
+ * When you #scan for a pattern (a regular expression), the match must occur
+ * at the character after the scan pointer.  If you use #scan_until, then the
+ * match can occur anywhere after the scan pointer.  In both cases, the scan
+ * pointer moves <i>just beyond</i> the last character of the match, ready to
+ * scan again from the next character onwards.  This is demonstrated by the
+ * example above.
+ *
+ * == Method Categories
+ *
+ * There are other methods besides the plain scanners.  You can look ahead in
+ * the string without actually scanning.  You can access the most recent match.
+ * You can modify the string being scanned, reset or terminate the scanner,
+ * find out or change the position of the scan pointer, skip ahead, and so on.
+ * 
+ * === Advancing the Scan Pointer
+ *
+ * - #getch
+ * - #get_byte
+ * - #scan
+ * - #scan_until
+ * - #skip
+ * - #skip_until
+ *
+ * === Looking Ahead
+ *
+ * - #check
+ * - #check_until
+ * - #exist?
+ * - #match?
+ * - #peek
+ *
+ * === Finding Where we Are
+ *
+ * - #beginning_of_line? (#bol?)
+ * - #eos?
+ * - #rest?
+ * - #rest_size
+ * - #pos
+ *
+ * === Setting Where we Are
+ *
+ * - #reset
+ * - #terminate
+ * - #pos=
+ * 
+ * === Match Data
+ *
+ * - #matched
+ * - #matched?
+ * - #matched_size
+ * - []
+ * - #pre_match
+ * - #post_match
+ *
+ * === Miscellaneous
+ *
+ * - <<
+ * - #concat
+ * - #string
+ * - #string=
+ * - #unscan
+ *
+ * There are aliases to several of the methods.
+ */
+void
+Init_strscan(void)
+{
+    ID id_scanerr = rb_intern("ScanError");
+    VALUE tmp;
+
+    StringScanner = rb_define_class("StringScanner", rb_cObject);
+    ScanError = rb_define_class_under(StringScanner, "Error", rb_eStandardError);
+    if (!rb_const_defined(rb_cObject, id_scanerr)) {
+	rb_const_set(rb_cObject, id_scanerr, ScanError);
+    }
+    tmp = rb_str_new2(STRSCAN_VERSION);
+    rb_obj_freeze(tmp);
+    rb_const_set(StringScanner, rb_intern("Version"), tmp);
+    tmp = rb_str_new2("$Id$");
+    rb_obj_freeze(tmp);
+    rb_const_set(StringScanner, rb_intern("Id"), tmp);
+    
+    rb_define_alloc_func(StringScanner, strscan_s_allocate);
+    rb_define_private_method(StringScanner, "initialize", strscan_initialize, -1);
+    rb_define_private_method(StringScanner, "initialize_copy", strscan_init_copy, 1);
+    rb_define_singleton_method(StringScanner, "must_C_version", strscan_s_mustc, 0);
+    rb_define_method(StringScanner, "reset",       strscan_reset,       0);
+    rb_define_method(StringScanner, "terminate",   strscan_terminate,   0);
+    rb_define_method(StringScanner, "clear",       strscan_clear,       0);
+    rb_define_method(StringScanner, "string",      strscan_get_string,  0);
+    rb_define_method(StringScanner, "string=",     strscan_set_string,  1);
+    rb_define_method(StringScanner, "concat",      strscan_concat,      1);
+    rb_define_method(StringScanner, "<<",          strscan_concat,      1);
+    rb_define_method(StringScanner, "pos",         strscan_get_pos,     0);
+    rb_define_method(StringScanner, "pos=",        strscan_set_pos,     1);
+    rb_define_method(StringScanner, "pointer",     strscan_get_pos,     0);
+    rb_define_method(StringScanner, "pointer=",    strscan_set_pos,     1);
+
+    rb_define_method(StringScanner, "scan",        strscan_scan,        1);
+    rb_define_method(StringScanner, "skip",        strscan_skip,        1);
+    rb_define_method(StringScanner, "match?",      strscan_match_p,     1);
+    rb_define_method(StringScanner, "check",       strscan_check,       1);
+    rb_define_method(StringScanner, "scan_full",   strscan_scan_full,   3);
+
+    rb_define_method(StringScanner, "scan_until",  strscan_scan_until,  1);
+    rb_define_method(StringScanner, "skip_until",  strscan_skip_until,  1);
+    rb_define_method(StringScanner, "exist?",      strscan_exist_p,     1);
+    rb_define_method(StringScanner, "check_until", strscan_check_until, 1);
+    rb_define_method(StringScanner, "search_full", strscan_search_full, 3);
+
+    rb_define_method(StringScanner, "getch",       strscan_getch,       0);
+    rb_define_method(StringScanner, "get_byte",    strscan_get_byte,    0);
+    rb_define_method(StringScanner, "getbyte",     strscan_getbyte,     0);
+    rb_define_method(StringScanner, "peek",        strscan_peek,        1);
+    rb_define_method(StringScanner, "peep",        strscan_peep,        1);
+
+    rb_define_method(StringScanner, "unscan",      strscan_unscan,      0);
+
+    rb_define_method(StringScanner, "beginning_of_line?", strscan_bol_p, 0);
+    rb_alias(StringScanner, rb_intern("bol?"), rb_intern("beginning_of_line?"));
+    rb_define_method(StringScanner, "eos?",        strscan_eos_p,       0);
+    rb_define_method(StringScanner, "empty?",      strscan_empty_p,     0);
+    rb_define_method(StringScanner, "rest?",       strscan_rest_p,      0);
+
+    rb_define_method(StringScanner, "matched?",    strscan_matched_p,   0);
+    rb_define_method(StringScanner, "matched",     strscan_matched,     0);
+    rb_define_method(StringScanner, "matched_size", strscan_matched_size, 0);
+    rb_define_method(StringScanner, "matchedsize", strscan_matchedsize, 0);
+    rb_define_method(StringScanner, "[]",          strscan_aref,        1);
+    rb_define_method(StringScanner, "pre_match",   strscan_pre_match,   0);
+    rb_define_method(StringScanner, "post_match",  strscan_post_match,  0);
+
+    rb_define_method(StringScanner, "rest",        strscan_rest,        0);
+    rb_define_method(StringScanner, "rest_size",   strscan_rest_size,   0);
+    rb_define_method(StringScanner, "restsize",    strscan_restsize,    0);
+
+    rb_define_method(StringScanner, "inspect",     strscan_inspect,     0);
+}
diff --git a/ruby_1_8_6/ext/syck/.cvsignore b/ruby_1_8_6/ext/syck/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/syck/bytecode.c b/ruby_1_8_6/ext/syck/bytecode.c
new file mode 100644
index 0000000000..567aaf52a8
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/bytecode.c
@@ -0,0 +1,1166 @@
+/* Generated by re2c 0.9.10 on Mon Sep 19 23:21:26 2005 */
+#line 1 "bytecode.re"
+/*
+ * bytecode.re
+ *
+ * $Author$
+ * $Date$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+#include "ruby.h"
+#include "syck.h"
+#include "gram.h"
+
+#define QUOTELEN 128
+
+/*
+ * They do my bidding...
+ */
+#define YYCTYPE     char
+#define YYCURSOR    parser->cursor
+#define YYMARKER    parser->marker
+#define YYLIMIT     parser->limit
+#define YYTOKEN     parser->token
+#define YYTOKTMP    parser->toktmp
+#define YYLINEPTR   parser->lineptr
+#define YYLINECTPTR parser->linectptr
+#define YYLINE      parser->linect
+#define YYFILL(n)   syck_parser_read(parser)
+
+extern SyckParser *syck_parser_ptr;
+
+char *get_inline( SyckParser *parser );
+
+/*
+ * Repositions the cursor at `n' offset from the token start.
+ * Only works in `Header' and `Document' sections.
+ */
+#define YYPOS(n)    YYCURSOR = YYTOKEN + n
+
+/*
+ * Track line numbers
+ */
+#define CHK_NL(ptr)    if ( *( ptr - 1 ) == '\n' && ptr > YYLINECTPTR ) { YYLINEPTR = ptr; YYLINE++; YYLINECTPTR = YYLINEPTR; }
+
+/*
+ * I like seeing the level operations as macros...
+ */
+#define ADD_LEVEL(len, status)  syck_parser_add_level( parser, len, status )
+#define POP_LEVEL()     syck_parser_pop_level( parser )
+#define CURRENT_LEVEL() syck_parser_current_level( parser )
+
+/*
+ * Force a token next time around sycklex()
+ */
+#define FORCE_NEXT_TOKEN(tok)    parser->force_token = tok;
+
+/*
+ * Adding levels in bytecode requires us to make sure
+ * we've got all our tokens worked out.
+ */
+#define ADD_BYTE_LEVEL(lvl, len, s ) \
+        switch ( lvl->status ) \
+        { \
+            case syck_lvl_seq: \
+                lvl->ncount++; \
+                ADD_LEVEL(len, syck_lvl_open); \
+                YYPOS(0); \
+            return '-'; \
+        \
+            case syck_lvl_map: \
+                lvl->ncount++; \
+                ADD_LEVEL(len, s); \
+            break; \
+        \
+            case syck_lvl_open: \
+                lvl->status = s; \
+            break; \
+        \
+            default: \
+                ADD_LEVEL(len, s); \
+            break; \
+        }
+
+/*
+ * Nice little macro to ensure we're YAML_IOPENed to the current level.
+ * * Only use this macro in the "Document" section *
+ */
+#define ENSURE_YAML_IOPEN(last_lvl, lvl_type, to_len, reset) \
+        if ( last_lvl->spaces < to_len ) \
+        { \
+            if ( last_lvl->status == syck_lvl_iseq || last_lvl->status == syck_lvl_imap ) \
+            { \
+                goto Document; \
+            } \
+            else \
+            { \
+                ADD_LEVEL( to_len, lvl_type ); \
+                if ( reset == 1 ) YYPOS(0); \
+                return YAML_IOPEN; \
+            } \
+        } 
+
+/*
+ * Nice little macro to ensure closure of levels.
+ * * Only use this macro in the "Document" section *
+ */
+#define ENSURE_YAML_IEND(last_lvl, to_len) \
+        if ( last_lvl->spaces > to_len ) \
+        { \
+            syck_parser_pop_level( parser ); \
+            YYPOS(0); \
+            return YAML_IEND; \
+        }
+
+/*
+ * Concatenates string items and manages allocation
+ * to the string
+ */
+#define CAT(s, c, i, l) \
+        { \
+            if ( i + 1 >= c ) \
+            { \
+                c += QUOTELEN; \
+                S_REALLOC_N( s, char, c ); \
+            } \
+            s[i++] = l; \
+            s[i] = '\0'; \
+        }
+
+/*
+ * Parser for standard YAML Bytecode [UTF-8]
+ */
+int
+sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
+{
+    SyckLevel *lvl;
+    syck_parser_ptr = parser;
+    if ( YYCURSOR == NULL ) 
+    {
+        syck_parser_read( parser );
+    }
+
+    if ( parser->force_token != 0 )
+    {
+        int t = parser->force_token;
+        parser->force_token = 0;
+        return t;
+    }
+
+#line 172 "bytecode.re"
+
+
+    lvl = CURRENT_LEVEL();
+    if ( lvl->status == syck_lvl_doc )
+    {
+        goto Document;
+    }
+
+/* Header: */
+
+    YYTOKEN = YYCURSOR;
+
+
+#line 165 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy0;
+	++YYCURSOR;
+yy0:
+	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy2;
+	case 'D':	goto yy3;
+	default:	goto yy5;
+	}
+yy2:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy4;
+	}
+yy3:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 0x0A:	goto yy6;
+	case 0x0D:	goto yy8;
+	default:	goto yy4;
+	}
+yy4:
+#line 199 "bytecode.re"
+{   YYPOS(0);
+            goto Document;
+        }
+#line 195 "<stdout>"
+yy5:	yych = *++YYCURSOR;
+	goto yy4;
+yy6:	++YYCURSOR;
+	goto yy7;
+yy7:
+#line 186 "bytecode.re"
+{   if ( lvl->status == syck_lvl_header )
+            {
+                CHK_NL(YYCURSOR);
+                goto Directive;
+            }
+            else
+            {
+                ENSURE_YAML_IEND(lvl, -1);
+                YYPOS(0);
+                return 0;
+            }
+        }
+#line 214 "<stdout>"
+yy8:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy6;
+	default:	goto yy2;
+	}
+}
+#line 203 "bytecode.re"
+
+
+Document:
+    {
+        lvl = CURRENT_LEVEL();
+        if ( lvl->status == syck_lvl_header )
+        {
+            lvl->status = syck_lvl_doc;
+        }
+
+        YYTOKEN = YYCURSOR;
+
+
+#line 235 "<stdout>"
+{
+	YYCTYPE yych;
+	goto yy9;
+	++YYCURSOR;
+yy9:
+	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy30;
+	case 0x0A:	goto yy27;
+	case 0x0D:	goto yy29;
+	case 'A':	goto yy19;
+	case 'D':	goto yy12;
+	case 'E':	goto yy16;
+	case 'M':	goto yy14;
+	case 'P':	goto yy13;
+	case 'Q':	goto yy15;
+	case 'R':	goto yy21;
+	case 'S':	goto yy17;
+	case 'T':	goto yy23;
+	case 'c':	goto yy25;
+	default:	goto yy11;
+	}
+yy11:yy12:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy41;
+	case 0x0D:	goto yy44;
+	default:	goto yy11;
+	}
+yy13:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy41;
+	case 0x0D:	goto yy43;
+	default:	goto yy11;
+	}
+yy14:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy38;
+	case 0x0D:	goto yy40;
+	default:	goto yy11;
+	}
+yy15:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy35;
+	case 0x0D:	goto yy37;
+	default:	goto yy11;
+	}
+yy16:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy32;
+	case 0x0D:	goto yy34;
+	default:	goto yy11;
+	}
+yy17:	++YYCURSOR;
+	goto yy18;
+yy18:
+#line 288 "bytecode.re"
+{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str); 
+            goto Scalar;
+        }
+#line 296 "<stdout>"
+yy19:	++YYCURSOR;
+	goto yy20;
+yy20:
+#line 292 "bytecode.re"
+{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
+            sycklval->name = get_inline( parser );
+            syck_hdlr_remove_anchor( parser, sycklval->name );
+            CHK_NL(YYCURSOR);
+            return YAML_ANCHOR;
+        }
+#line 307 "<stdout>"
+yy21:	++YYCURSOR;
+	goto yy22;
+yy22:
+#line 299 "bytecode.re"
+{   ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str);
+            sycklval->name = get_inline( parser );
+            POP_LEVEL();
+            if ( *( YYCURSOR - 1 ) == '\n' ) YYCURSOR--;
+            return YAML_ALIAS;
+        }
+#line 318 "<stdout>"
+yy23:	++YYCURSOR;
+	goto yy24;
+yy24:
+#line 306 "bytecode.re"
+{   char *qstr;
+            ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
+            qstr = get_inline( parser );
+            CHK_NL(YYCURSOR);
+            if ( qstr[0] == '!' )
+            {
+                int qidx = strlen( qstr );
+                if ( qstr[1] == '\0' )
+                {
+                    free( qstr );
+                    return YAML_ITRANSFER;
+                }
+
+                lvl = CURRENT_LEVEL();
+
+                /*
+                 * URL Prefixing
+                 */
+                if ( qstr[1] == '^' )
+                {
+                    sycklval->name = S_ALLOC_N( char, qidx + strlen( lvl->domain ) );
+                    sycklval->name[0] = '\0';
+                    strcat( sycklval->name, lvl->domain );
+                    strncat( sycklval->name, qstr + 2, qidx - 2 );
+                    free( qstr );
+                }
+                else
+                {
+                    char *carat = qstr + 1;
+                    char *qend = qstr + qidx;
+                    while ( (++carat) < qend )
+                    {
+                        if ( *carat == '^' )
+                            break;
+                    }
+
+                    if ( carat < qend )
+                    {
+                        free( lvl->domain );
+                        lvl->domain = syck_strndup( qstr + 1, carat - ( qstr + 1 ) );
+                        sycklval->name = S_ALLOC_N( char, ( qend - carat ) + strlen( lvl->domain ) );
+                        sycklval->name[0] = '\0';
+                        strcat( sycklval->name, lvl->domain );
+                        strncat( sycklval->name, carat + 1, ( qend - carat ) - 1 );
+                        free( qstr );
+                    }
+                    else
+                    {
+                        sycklval->name = S_ALLOC_N( char, strlen( qstr ) );
+                        sycklval->name[0] = '\0';
+                        S_MEMCPY( sycklval->name, qstr + 1, char, strlen( qstr ) );
+                        free( qstr );
+                    }
+                }
+                return YAML_TRANSFER;
+            }
+            sycklval->name = qstr;
+            return YAML_TAGURI;
+        }
+#line 382 "<stdout>"
+yy25:	++YYCURSOR;
+	goto yy26;
+yy26:
+#line 366 "bytecode.re"
+{   goto Comment; }
+#line 388 "<stdout>"
+yy27:	++YYCURSOR;
+	goto yy28;
+yy28:
+#line 368 "bytecode.re"
+{   CHK_NL(YYCURSOR);
+            if ( lvl->status == syck_lvl_seq )
+            {
+                return YAML_INDENT; 
+            }
+            else if ( lvl->status == syck_lvl_map )
+            {
+                if ( lvl->ncount % 2 == 1 ) return ':';
+                else                        return YAML_INDENT;
+            }
+            goto Document;
+        }
+#line 405 "<stdout>"
+yy29:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy27;
+	default:	goto yy11;
+	}
+yy30:	++YYCURSOR;
+	goto yy31;
+yy31:
+#line 381 "bytecode.re"
+{   ENSURE_YAML_IEND(lvl, -1);
+            YYPOS(0);
+            return 0;
+        }
+#line 419 "<stdout>"
+yy32:	++YYCURSOR;
+	goto yy33;
+yy33:
+#line 252 "bytecode.re"
+{   if ( lvl->status == syck_lvl_seq && lvl->ncount == 0 )
+            {
+                lvl->ncount++;
+                YYPOS(0);
+                FORCE_NEXT_TOKEN( ']' );
+                return '[';
+            }
+            else if ( lvl->status == syck_lvl_map && lvl->ncount == 0 )
+            {
+                lvl->ncount++;
+                YYPOS(0);
+                FORCE_NEXT_TOKEN( '}' );
+                return '{';
+            }
+            
+            POP_LEVEL();
+            lvl = CURRENT_LEVEL();
+            if ( lvl->status == syck_lvl_seq )
+            {
+                FORCE_NEXT_TOKEN(YAML_INDENT);   
+            }
+            else if ( lvl->status == syck_lvl_map )
+            {
+                if ( lvl->ncount % 2 == 1 )
+                {
+                    FORCE_NEXT_TOKEN(':');
+                }
+                else
+                {
+                    FORCE_NEXT_TOKEN(YAML_INDENT);
+                }
+            }
+            CHK_NL(YYCURSOR);
+            return YAML_IEND;
+        }
+#line 459 "<stdout>"
+yy34:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy32;
+	default:	goto yy11;
+	}
+yy35:	++YYCURSOR;
+	goto yy36;
+yy36:
+#line 237 "bytecode.re"
+{   int complex = 0;
+            if ( lvl->ncount % 2 == 0 && ( lvl->status == syck_lvl_map || lvl->status == syck_lvl_seq ) )
+            {
+                complex = 1;
+            }
+            ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_seq);
+            CHK_NL(YYCURSOR);
+            if ( complex )
+            {
+                FORCE_NEXT_TOKEN( YAML_IOPEN );
+                return '?';
+            }
+            return YAML_IOPEN;
+        }
+#line 483 "<stdout>"
+yy37:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy35;
+	default:	goto yy11;
+	}
+yy38:	++YYCURSOR;
+	goto yy39;
+yy39:
+#line 222 "bytecode.re"
+{   int complex = 0;
+            if ( lvl->ncount % 2 == 0 && ( lvl->status == syck_lvl_map || lvl->status == syck_lvl_seq ) )
+            {
+                complex = 1;
+            }
+            ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_map); 
+            CHK_NL(YYCURSOR);
+            if ( complex )
+            {
+                FORCE_NEXT_TOKEN( YAML_IOPEN );
+                return '?';
+            }
+            return YAML_IOPEN;
+        }
+#line 507 "<stdout>"
+yy40:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy38;
+	default:	goto yy11;
+	}
+yy41:	++YYCURSOR;
+	goto yy42;
+yy42:
+#line 217 "bytecode.re"
+{   ENSURE_YAML_IEND(lvl, -1);
+                YYPOS(0);
+                return 0;
+            }
+#line 521 "<stdout>"
+yy43:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy41;
+	default:	goto yy11;
+	}
+yy44:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy41;
+	default:	goto yy11;
+	}
+}
+#line 386 "bytecode.re"
+
+
+    }
+
+Directive:
+    {
+        YYTOKEN = YYCURSOR;
+
+
+#line 543 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy45;
+	++YYCURSOR;
+yy45:
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy47;
+	case 'V':	goto yy48;
+	default:	goto yy50;
+	}
+yy47:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy49;
+	}
+yy48:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case '.':
+	case '/':
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	case ':':
+	case ';':
+	case '<':
+	case '=':
+	case '>':
+	case '?':
+	case '@':
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	case '[':
+	case '\\':
+	case ']':
+	case '^':
+	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy51;
+	default:	goto yy49;
+	}
+yy49:
+#line 399 "bytecode.re"
+{   YYCURSOR = YYTOKEN;
+               return YAML_DOCSEP;
+           }
+#line 646 "<stdout>"
+yy50:	yych = *++YYCURSOR;
+	goto yy49;
+yy51:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	goto yy52;
+yy52:	switch(yych){
+	case '.':
+	case '/':
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case ';':
+	case '<':
+	case '=':
+	case '>':
+	case '?':
+	case '@':
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	case '[':
+	case '\\':
+	case ']':
+	case '^':
+	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy51;
+	case ':':	goto yy53;
+	default:	goto yy47;
+	}
+yy53:	yych = *++YYCURSOR;
+	switch(yych){
+	case '.':
+	case '/':
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	case ':':
+	case ';':
+	case '<':
+	case '=':
+	case '>':
+	case '?':
+	case '@':
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	case '[':
+	case '\\':
+	case ']':
+	case '^':
+	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy54;
+	default:	goto yy47;
+	}
+yy54:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	goto yy55;
+yy55:	switch(yych){
+	case 0x0A:	goto yy56;
+	case 0x0D:	goto yy58;
+	case '.':
+	case '/':
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	case ':':
+	case ';':
+	case '<':
+	case '=':
+	case '>':
+	case '?':
+	case '@':
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	case '[':
+	case '\\':
+	case ']':
+	case '^':
+	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy54;
+	default:	goto yy47;
+	}
+yy56:	++YYCURSOR;
+	goto yy57;
+yy57:
+#line 396 "bytecode.re"
+{   CHK_NL(YYCURSOR);
+               goto Directive; }
+#line 899 "<stdout>"
+yy58:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy56;
+	default:	goto yy47;
+	}
+}
+#line 402 "bytecode.re"
+
+
+    }
+
+Comment:
+    {
+        YYTOKEN = YYCURSOR;
+
+
+#line 916 "<stdout>"
+{
+	YYCTYPE yych;
+	goto yy59;
+	++YYCURSOR;
+yy59:
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy61;
+	case 0x0A:	goto yy62;
+	case 0x0D:	goto yy64;
+	default:	goto yy66;
+	}
+yy61:yy62:	++YYCURSOR;
+	goto yy63;
+yy63:
+#line 412 "bytecode.re"
+{   CHK_NL(YYCURSOR);
+                goto Document; }
+#line 936 "<stdout>"
+yy64:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy67;
+	default:	goto yy65;
+	}
+yy65:
+#line 415 "bytecode.re"
+{   goto Comment; }
+#line 945 "<stdout>"
+yy66:	yych = *++YYCURSOR;
+	goto yy65;
+yy67:	++YYCURSOR;
+	yych = *YYCURSOR;
+	goto yy63;
+}
+#line 417 "bytecode.re"
+
+
+    }
+
+Scalar:
+    {
+    int idx = 0;
+    int cap = 100;
+    char *str = S_ALLOC_N( char, cap );
+    char *tok;
+
+    str[0] = '\0';
+
+Scalar2:
+    tok = YYCURSOR;
+
+
+#line 970 "<stdout>"
+{
+	YYCTYPE yych;
+	goto yy68;
+	++YYCURSOR;
+yy68:
+	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy74;
+	case 0x0A:	goto yy70;
+	case 0x0D:	goto yy72;
+	default:	goto yy76;
+	}
+yy70:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 'C':	goto yy78;
+	case 'N':	goto yy80;
+	case 'Z':	goto yy83;
+	default:	goto yy71;
+	}
+yy71:
+#line 461 "bytecode.re"
+{   YYCURSOR = tok;
+            goto ScalarEnd; 
+        }
+#line 996 "<stdout>"
+yy72:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy77;
+	default:	goto yy73;
+	}
+yy73:
+#line 469 "bytecode.re"
+{   CAT(str, cap, idx, tok[0]);
+            goto Scalar2; 
+        }
+#line 1007 "<stdout>"
+yy74:	++YYCURSOR;
+	goto yy75;
+yy75:
+#line 465 "bytecode.re"
+{   YYCURSOR = tok;
+            goto ScalarEnd;
+        }
+#line 1015 "<stdout>"
+yy76:	yych = *++YYCURSOR;
+	goto yy73;
+yy77:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'C':	goto yy78;
+	case 'N':	goto yy80;
+	case 'Z':	goto yy83;
+	default:	goto yy71;
+	}
+yy78:	++YYCURSOR;
+	goto yy79;
+yy79:
+#line 435 "bytecode.re"
+{   CHK_NL(tok+1);
+            goto Scalar2; }
+#line 1031 "<stdout>"
+yy80:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy81;
+yy81:	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy80;
+	default:	goto yy82;
+	}
+yy82:
+#line 438 "bytecode.re"
+{   CHK_NL(tok+1);
+            if ( tok + 2 < YYCURSOR )
+            {
+                char *count = tok + 2;
+                int total = strtod( count, NULL );
+                int i;
+                for ( i = 0; i < total; i++ )
+                {
+                    CAT(str, cap, idx, '\n');
+                }
+            }
+            else
+            {
+                CAT(str, cap, idx, '\n');
+            }
+            goto Scalar2;
+        }
+#line 1068 "<stdout>"
+yy83:	++YYCURSOR;
+	goto yy84;
+yy84:
+#line 456 "bytecode.re"
+{   CHK_NL(tok+1);
+            CAT(str, cap, idx, '\0');
+            goto Scalar2; 
+        }
+#line 1077 "<stdout>"
+}
+#line 473 "bytecode.re"
+
+
+ScalarEnd:
+        {
+            SyckNode *n = syck_alloc_str();
+            n->data.str->ptr = str;
+            n->data.str->len = idx;
+            sycklval->nodeData = n;
+            POP_LEVEL();
+            if ( parser->implicit_typing == 1 )
+            {
+                try_tag_implicit( sycklval->nodeData, parser->taguri_expansion );
+            }
+            return YAML_PLAIN;
+        }
+    }
+
+}
+
+char *
+get_inline( SyckParser *parser )
+{
+    int idx = 0;
+    int cap = 100;
+    char *str = S_ALLOC_N( char, cap );
+    char *tok;
+
+    str[0] = '\0';
+
+Inline:
+    {
+        tok = YYCURSOR;
+
+
+#line 1114 "<stdout>"
+{
+	YYCTYPE yych;
+	goto yy85;
+	++YYCURSOR;
+yy85:
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy91;
+	case 0x0A:	goto yy87;
+	case 0x0D:	goto yy89;
+	default:	goto yy93;
+	}
+yy87:	++YYCURSOR;
+	goto yy88;
+yy88:
+#line 508 "bytecode.re"
+{   CHK_NL(YYCURSOR);
+                return str; }
+#line 1134 "<stdout>"
+yy89:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy94;
+	default:	goto yy90;
+	}
+yy90:
+#line 515 "bytecode.re"
+{   CAT(str, cap, idx, tok[0]);
+                goto Inline; 
+            }
+#line 1145 "<stdout>"
+yy91:	++YYCURSOR;
+	goto yy92;
+yy92:
+#line 511 "bytecode.re"
+{   YYCURSOR = tok;
+                return str;
+            }
+#line 1153 "<stdout>"
+yy93:	yych = *++YYCURSOR;
+	goto yy90;
+yy94:	++YYCURSOR;
+	yych = *YYCURSOR;
+	goto yy88;
+}
+#line 519 "bytecode.re"
+
+
+    }
+
+}
+
diff --git a/ruby_1_8_6/ext/syck/depend b/ruby_1_8_6/ext/syck/depend
new file mode 100644
index 0000000000..3eec4de72a
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/depend
@@ -0,0 +1,12 @@
+ruby_headers = $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
+  $(hdrdir)/missing.h $(hdrdir)/intern.h $(hdrdir)/st.h
+bytecode.o: bytecode.c syck.h gram.h $(ruby_headers)
+emitter.o: emitter.c syck.h $(ruby_headers)
+gram.o: gram.c syck.h $(hdrdir)/st.h
+handler.o: handler.c syck.h $(ruby_headers)
+implicit.o: implicit.c syck.h $(ruby_headers)
+node.o: node.c syck.h $(ruby_headers)
+rubyext.o: rubyext.c syck.h $(ruby_headers)
+syck.o: syck.c syck.h $(ruby_headers)
+token.o: token.c syck.h gram.h $(ruby_headers)
+yaml2byte.o: yaml2byte.c syck.h yamlbyte.h $(ruby_headers)
diff --git a/ruby_1_8_6/ext/syck/emitter.c b/ruby_1_8_6/ext/syck/emitter.c
new file mode 100644
index 0000000000..9c8ab8d49b
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/emitter.c
@@ -0,0 +1,1242 @@
+/*
+ * emitter.c
+ *
+ * $Author$
+ * $Date$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ * 
+ * All Base64 code from Ruby's pack.c.
+ * Ruby is Copyright (C) 1993-2003 Yukihiro Matsumoto 
+ */
+#include "ruby.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "syck.h"
+
+#define DEFAULT_ANCHOR_FORMAT "id%03d"
+
+const char hex_table[] = 
+"0123456789ABCDEF";
+static char b64_table[] =
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+/*
+ * Built-in base64 (from Ruby's pack.c)
+ */
+char *
+syck_base64enc( char *s, long len )
+{
+    long i = 0;
+    int padding = '=';
+    char *buff = S_ALLOC_N(char, len * 4 / 3 + 6);
+
+    while (len >= 3) {
+        buff[i++] = b64_table[077 & (*s >> 2)];
+        buff[i++] = b64_table[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))];
+        buff[i++] = b64_table[077 & (((s[1] << 2) & 074) | ((s[2] >> 6) & 03))];
+        buff[i++] = b64_table[077 & s[2]];
+        s += 3;
+        len -= 3;
+    }
+    if (len == 2) {
+        buff[i++] = b64_table[077 & (*s >> 2)];
+        buff[i++] = b64_table[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))];
+        buff[i++] = b64_table[077 & (((s[1] << 2) & 074) | (('\0' >> 6) & 03))];
+        buff[i++] = padding;
+    }
+    else if (len == 1) {
+        buff[i++] = b64_table[077 & (*s >> 2)];
+        buff[i++] = b64_table[077 & (((*s << 4) & 060) | (('\0' >> 4) & 017))];
+        buff[i++] = padding;
+        buff[i++] = padding;
+    }
+    buff[i++] = '\n';
+    return buff;
+}
+
+char *
+syck_base64dec( char *s, long len )
+{
+    int a = -1,b = -1,c = 0,d;
+    static int first = 1;
+    static int b64_xtable[256];
+    char *ptr = syck_strndup( s, len );
+    char *end = ptr;
+    char *send = s + len;
+
+    if (first) {
+        int i;
+        first = 0;
+
+        for (i = 0; i < 256; i++) {
+        b64_xtable[i] = -1;
+        }
+        for (i = 0; i < 64; i++) {
+        b64_xtable[(int)b64_table[i]] = i;
+        }
+    }
+    while (s < send) {
+        while (s[0] == '\r' || s[0] == '\n') { s++; }
+        if ((a = b64_xtable[(int)s[0]]) == -1) break;
+        if ((b = b64_xtable[(int)s[1]]) == -1) break;
+        if ((c = b64_xtable[(int)s[2]]) == -1) break;
+        if ((d = b64_xtable[(int)s[3]]) == -1) break;
+        *end++ = a << 2 | b >> 4;
+        *end++ = b << 4 | c >> 2;
+        *end++ = c << 6 | d;
+        s += 4;
+    }
+    if (a != -1 && b != -1) {
+        if (s + 2 < send && s[2] == '=')
+        *end++ = a << 2 | b >> 4;
+        if (c != -1 && s + 3 < send && s[3] == '=') {
+        *end++ = a << 2 | b >> 4;
+        *end++ = b << 4 | c >> 2;
+        }
+    }
+    *end = '\0';
+    /*RSTRING(buf)->len = ptr - RSTRING(buf)->ptr;*/
+    return ptr;
+}
+
+/*
+ * Allocate an emitter
+ */
+SyckEmitter *
+syck_new_emitter()
+{
+    SyckEmitter *e;
+    e = S_ALLOC( SyckEmitter );
+    e->headless = 0;
+    e->use_header = 0;
+    e->use_version = 0;
+    e->sort_keys = 0;
+    e->anchor_format = NULL;
+    e->explicit_typing = 0;
+    e->best_width = 80;
+    e->style = scalar_none;
+    e->stage = doc_open;
+    e->indent = 2;
+    e->level = -1;
+    e->anchors = NULL;
+    e->markers = NULL;
+    e->anchored = NULL;
+    e->bufsize = SYCK_BUFFERSIZE;
+    e->buffer = NULL;
+    e->marker = NULL;
+    e->bufpos = 0;
+    e->emitter_handler = NULL;
+    e->output_handler = NULL;
+    e->lvl_idx = 0;
+    e->lvl_capa = ALLOC_CT;
+    e->levels = S_ALLOC_N( SyckLevel, e->lvl_capa ); 
+    syck_emitter_reset_levels( e );
+    e->bonus = NULL;
+    return e;
+}
+
+int
+syck_st_free_anchors( char *key, char *name, char *arg )
+{
+    S_FREE( name );
+    return ST_CONTINUE;
+}
+
+void
+syck_emitter_st_free( SyckEmitter *e )
+{
+    /*
+     * Free the anchor tables
+     */
+    if ( e->anchors != NULL )
+    {
+        st_foreach( e->anchors, syck_st_free_anchors, 0 );
+        st_free_table( e->anchors );
+        e->anchors = NULL;
+    }
+
+    if ( e->anchored != NULL )
+    {
+        st_free_table( e->anchored );
+        e->anchored = NULL;
+    }
+
+    /*
+     * Free the markers tables
+     */
+    if ( e->markers != NULL )
+    {
+        st_free_table( e->markers );
+        e->markers = NULL;
+    }
+}
+
+SyckLevel *
+syck_emitter_current_level( SyckEmitter *e )
+{
+    return &e->levels[e->lvl_idx-1];
+}
+
+SyckLevel *
+syck_emitter_parent_level( SyckEmitter *e )
+{
+    return &e->levels[e->lvl_idx-2];
+}
+
+void
+syck_emitter_pop_level( SyckEmitter *e )
+{
+    ASSERT( e != NULL );
+
+    /* The root level should never be popped */
+    if ( e->lvl_idx <= 1 ) return;
+
+    e->lvl_idx -= 1;
+    free( e->levels[e->lvl_idx].domain );
+}
+
+void 
+syck_emitter_add_level( SyckEmitter *e, int len, enum syck_level_status status )
+{
+    ASSERT( e != NULL );
+    if ( e->lvl_idx + 1 > e->lvl_capa )
+    {
+        e->lvl_capa += ALLOC_CT;
+        S_REALLOC_N( e->levels, SyckLevel, e->lvl_capa );
+    }
+
+    ASSERT( len > e->levels[e->lvl_idx-1].spaces );
+    e->levels[e->lvl_idx].spaces = len;
+    e->levels[e->lvl_idx].ncount = 0;
+    e->levels[e->lvl_idx].domain = syck_strndup( e->levels[e->lvl_idx-1].domain, strlen( e->levels[e->lvl_idx-1].domain ) );
+    e->levels[e->lvl_idx].status = status;
+    e->levels[e->lvl_idx].anctag = 0;
+    e->lvl_idx += 1;
+}
+
+void
+syck_emitter_reset_levels( SyckEmitter *e )
+{
+    while ( e->lvl_idx > 1 )
+    {
+        syck_emitter_pop_level( e );
+    }
+
+    if ( e->lvl_idx < 1 )
+    {
+        e->lvl_idx = 1;
+        e->levels[0].spaces = -1;
+        e->levels[0].ncount = 0;
+        e->levels[0].domain = syck_strndup( "", 0 );
+        e->levels[0].anctag = 0;
+    }
+    e->levels[0].status = syck_lvl_header;
+}
+
+void
+syck_emitter_handler( SyckEmitter *e, SyckEmitterHandler hdlr )
+{
+    e->emitter_handler = hdlr;
+}
+
+void
+syck_output_handler( SyckEmitter *e, SyckOutputHandler hdlr )
+{
+    e->output_handler = hdlr;
+}
+
+void
+syck_free_emitter( SyckEmitter *e )
+{
+    /*
+     * Free tables
+     */
+    syck_emitter_st_free( e );
+    syck_emitter_reset_levels( e );
+    S_FREE( e->levels[0].domain );
+    S_FREE( e->levels );
+    if ( e->buffer != NULL )
+    {
+        S_FREE( e->buffer );
+    }
+    S_FREE( e );
+}
+
+void
+syck_emitter_clear( SyckEmitter *e )
+{
+    if ( e->buffer == NULL )
+    {
+        e->buffer = S_ALLOC_N( char, e->bufsize );
+        S_MEMZERO( e->buffer, char, e->bufsize );
+    }
+    e->buffer[0] = '\0';
+    e->marker = e->buffer;
+    e->bufpos = 0;
+}
+
+/*
+ * Raw write to the emitter buffer.
+ */
+void
+syck_emitter_write( SyckEmitter *e, char *str, long len )
+{
+    long at;
+    ASSERT( str != NULL )
+    if ( e->buffer == NULL )
+    {
+        syck_emitter_clear( e );
+    }
+    
+    /*
+     * Flush if at end of buffer
+     */
+    at = e->marker - e->buffer;
+    if ( len + at >= e->bufsize )
+    {
+        syck_emitter_flush( e, 0 );
+	for (;;) {
+	    long rest = e->bufsize - (e->marker - e->buffer);
+	    if (len <= rest) break;
+	    S_MEMCPY( e->marker, str, char, rest );
+	    e->marker += rest;
+	    str += rest;
+	    len -= rest;
+	    syck_emitter_flush( e, 0 );
+	}
+    }
+
+    /*
+     * Write to buffer
+     */
+    S_MEMCPY( e->marker, str, char, len );
+    e->marker += len;
+}
+
+/*
+ * Write a chunk of data out.
+ */
+void
+syck_emitter_flush( SyckEmitter *e, long check_room )
+{
+    /*
+     * Check for enough space in the buffer for check_room length.
+     */
+    if ( check_room > 0 )
+    {
+        if ( e->bufsize > ( e->marker - e->buffer ) + check_room )
+        {
+            return;
+        }
+    }
+    else
+    {
+        check_room = e->bufsize;
+    }
+
+    /*
+     * Commit buffer.
+     */
+    if ( check_room > e->marker - e->buffer )
+    {
+        check_room = e->marker - e->buffer;
+    }
+    (e->output_handler)( e, e->buffer, check_room );
+    e->bufpos += check_room;
+    e->marker -= check_room;
+}
+
+/*
+ * Start emitting from the given node, check for anchoring and then
+ * issue the callback to the emitter handler.
+ */
+void
+syck_emit( SyckEmitter *e, st_data_t n )
+{
+    SYMID oid;
+    char *anchor_name = NULL;
+    int indent = 0;
+    long x = 0;
+    SyckLevel *lvl = syck_emitter_current_level( e );
+    
+    /*
+     * Determine headers.
+     */
+    if ( e->stage == doc_open && ( e->headless == 0 || e->use_header == 1 ) )
+    {
+        if ( e->use_version == 1 )
+        {
+            char *header = S_ALLOC_N( char, 64 );
+            S_MEMZERO( header, char, 64 );
+            sprintf( header, "--- %%YAML:%d.%d ", SYCK_YAML_MAJOR, SYCK_YAML_MINOR );
+            syck_emitter_write( e, header, strlen( header ) );
+            S_FREE( header );
+        }
+        else
+        {
+            syck_emitter_write( e, "--- ", 4 );
+        }
+        e->stage = doc_processing;
+    }
+
+    /* Add new level */
+    if ( lvl->spaces >= 0 ) {
+        indent = lvl->spaces + e->indent;
+    }
+    syck_emitter_add_level( e, indent, syck_lvl_open );
+    lvl = syck_emitter_current_level( e );
+
+    /* Look for anchor */
+    if ( e->anchors != NULL &&
+        st_lookup( e->markers, n, (st_data_t *)&oid ) &&
+        st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
+    {
+        if ( e->anchored == NULL )
+        {
+            e->anchored = st_init_numtable();
+        }
+
+        if ( ! st_lookup( e->anchored, (st_data_t)anchor_name, (st_data_t *)&x ) )
+        {
+            char *an = S_ALLOC_N( char, strlen( anchor_name ) + 3 );
+            sprintf( an, "&%s ", anchor_name );
+            syck_emitter_write( e, an, strlen( anchor_name ) + 2 );
+            free( an );
+
+            x = 1;
+            st_insert( e->anchored, (st_data_t)anchor_name, (st_data_t)x );
+            lvl->anctag = 1;
+        }
+        else
+        {
+            char *an = S_ALLOC_N( char, strlen( anchor_name ) + 2 );
+            sprintf( an, "*%s", anchor_name );
+            syck_emitter_write( e, an, strlen( anchor_name ) + 1 );
+            free( an );
+
+            goto end_emit;
+        }
+    }
+
+    (e->emitter_handler)( e, n );
+
+    /* Pop the level */
+end_emit:
+    syck_emitter_pop_level( e );
+    if ( e->lvl_idx == 1 ) {
+        syck_emitter_write( e, "\n", 1 );
+        e->headless = 0;
+        e->stage = doc_open;
+    }
+}
+
+/*
+ * Determine what tag needs to be written, based on the taguri of the node
+ * and the implicit tag which would be assigned to this node.  If a tag is
+ * required, write the tag.
+ */
+void syck_emit_tag( SyckEmitter *e, char *tag, char *ignore )
+{
+    SyckLevel *lvl;
+    if ( tag == NULL ) return;
+    if ( ignore != NULL && syck_tagcmp( tag, ignore ) == 0 && e->explicit_typing == 0 ) return;
+    lvl = syck_emitter_current_level( e );
+
+    /* implicit */
+    if ( strlen( tag ) == 0 ) {
+        syck_emitter_write( e, "! ", 2 );
+
+    /* global types */
+    } else if ( strncmp( tag, "tag:", 4 ) == 0 ) {
+        int taglen = strlen( tag );
+        syck_emitter_write( e, "!", 1 );
+        if ( strncmp( tag + 4, YAML_DOMAIN, strlen( YAML_DOMAIN ) ) == 0 ) {
+            int skip = 4 + strlen( YAML_DOMAIN ) + 1;
+            syck_emitter_write( e, tag + skip, taglen - skip );
+        } else {
+            char *subd = tag + 4;
+            while ( *subd != ':' && *subd != '\0' ) subd++;
+            if ( *subd == ':' ) {
+                if ( subd - tag > ( strlen( YAML_DOMAIN ) + 5 ) &&
+                     strncmp( subd - strlen( YAML_DOMAIN ), YAML_DOMAIN, strlen( YAML_DOMAIN ) ) == 0 ) {
+                    syck_emitter_write( e, tag + 4, subd - strlen( YAML_DOMAIN ) - ( tag + 4 ) - 1 );
+                    syck_emitter_write( e, "/", 1 );
+                    syck_emitter_write( e, subd + 1, ( tag + taglen ) - ( subd + 1 ) );
+                } else {
+                    syck_emitter_write( e, tag + 4, subd - ( tag + 4 ) );
+                    syck_emitter_write( e, "/", 1 );
+                    syck_emitter_write( e, subd + 1, ( tag + taglen ) - ( subd + 1 ) );
+                }
+            } else {
+                /* TODO: Invalid tag (no colon after domain) */
+                return;
+            }
+        }
+        syck_emitter_write( e, " ", 1 );
+
+    /* private types */
+    } else if ( strncmp( tag, "x-private:", 10 ) == 0 ) {
+        syck_emitter_write( e, "!!", 2 );
+        syck_emitter_write( e, tag + 10, strlen( tag ) - 10 );
+        syck_emitter_write( e, " ", 1 );
+    }
+    lvl->anctag = 1;
+}
+
+/* 
+ * Emit a newline and an appropriately spaced indent.
+ */
+void syck_emit_indent( SyckEmitter *e )
+{
+    int i;
+    SyckLevel *lvl = syck_emitter_current_level( e );
+    if ( e->bufpos == 0 && ( e->marker - e->buffer ) == 0 ) return;
+    if ( lvl->spaces >= 0 ) {
+        char *spcs = S_ALLOC_N( char, lvl->spaces + 2 );
+
+        spcs[0] = '\n'; spcs[lvl->spaces + 1] = '\0';
+        for ( i = 0; i < lvl->spaces; i++ ) spcs[i+1] = ' ';
+        syck_emitter_write( e, spcs, lvl->spaces + 1 );
+        free( spcs );
+    }
+}
+
+/* Clear the scan */
+#define SCAN_NONE       0
+/* All printable characters? */
+#define SCAN_NONPRINT   1
+/* Any indented lines? */
+#define SCAN_INDENTED   2
+/* Larger than the requested width? */
+#define SCAN_WIDE       4
+/* Opens or closes with whitespace? */
+#define SCAN_WHITEEDGE  8
+/* Contains a newline */
+#define SCAN_NEWLINE    16
+/* Contains a single quote */
+#define SCAN_SINGLEQ    32
+/* Contains a double quote */
+#define SCAN_DOUBLEQ    64
+/* Starts with a token */
+#define SCAN_INDIC_S    128
+/* Contains a flow indicator */
+#define SCAN_INDIC_C    256
+/* Ends without newlines */
+#define SCAN_NONL_E     512
+/* Ends with many newlines */
+#define SCAN_MANYNL_E   1024
+/* Contains flow map indicators */
+#define SCAN_FLOWMAP    2048
+/* Contains flow seq indicators */
+#define SCAN_FLOWSEQ    4096
+/* Contains a valid doc separator */
+#define SCAN_DOCSEP     8192
+
+/*
+ * Basic printable test for LATIN-1 characters.
+ */
+int
+syck_scan_scalar( int req_width, char *cursor, long len )
+{
+    long i = 0, start = 0;
+    int flags = SCAN_NONE;
+
+    if ( len < 1 )  return flags;
+
+    /* c-indicators from the spec */
+    if ( cursor[0] == '[' || cursor[0] == ']' ||
+         cursor[0] == '{' || cursor[0] == '}' ||
+         cursor[0] == '!' || cursor[0] == '*' ||
+         cursor[0] == '&' || cursor[0] == '|' ||
+         cursor[0] == '>' || cursor[0] == '\'' ||
+         cursor[0] == '"' || cursor[0] == '#' ||
+         cursor[0] == '%' || cursor[0] == '@' ||
+         cursor[0] == '&' ) {
+            flags |= SCAN_INDIC_S;
+    }
+    if ( ( cursor[0] == '-' || cursor[0] == ':' ||
+           cursor[0] == '?' || cursor[0] == ',' ) &&
+           ( len == 1 || cursor[1] == ' ' || cursor[1] == '\n' ) )
+    {
+            flags |= SCAN_INDIC_S;
+    }
+
+    /* whitespace edges */
+    if ( cursor[len-1] != '\n' ) {
+        flags |= SCAN_NONL_E;
+    } else if ( len > 1 && cursor[len-2] == '\n' ) {
+        flags |= SCAN_MANYNL_E;
+    }
+    if ( 
+        ( len > 0 && ( cursor[0] == ' ' || cursor[0] == '\t' ) ) ||
+        ( len > 1 && ( cursor[len-1] == ' ' || cursor[len-1] == '\t' ) )
+    ) {
+        flags |= SCAN_WHITEEDGE;
+    }
+
+    /* opening doc sep */
+    if ( len >= 3 && strncmp( cursor, "---", 3 ) == 0 )
+        flags |= SCAN_DOCSEP;
+
+    /* scan string */
+    for ( i = 0; i < len; i++ ) {
+
+        if ( ! ( cursor[i] == 0x9 ||
+                 cursor[i] == 0xA ||
+                 cursor[i] == 0xD ||
+               ( cursor[i] >= 0x20 && cursor[i] <= 0x7E ) )
+        ) {
+            flags |= SCAN_NONPRINT;
+        }
+        else if ( cursor[i] == '\n' ) {
+            flags |= SCAN_NEWLINE;
+            if ( len - i >= 3 && strncmp( &cursor[i+1], "---", 3 ) == 0 )
+                flags |= SCAN_DOCSEP;
+            if ( cursor[i+1] == ' ' || cursor[i+1] == '\t' ) 
+                flags |= SCAN_INDENTED;
+            if ( req_width > 0 && i - start > req_width )
+                flags |= SCAN_WIDE;
+            start = i;
+        }
+        else if ( cursor[i] == '\'' )
+        {
+            flags |= SCAN_SINGLEQ;
+        }
+        else if ( cursor[i] == '"' )
+        {
+            flags |= SCAN_DOUBLEQ;
+        }
+        else if ( cursor[i] == ']' )
+        {
+            flags |= SCAN_FLOWSEQ;
+        }
+        else if ( cursor[i] == '}' )
+        {
+            flags |= SCAN_FLOWMAP;
+        }
+        /* remember, if plain collections get implemented, to add nb-plain-flow-char */
+        else if ( ( cursor[i] == ' ' && cursor[i+1] == '#' ) ||
+                  ( cursor[i] == ':' && 
+                    ( cursor[i+1] == ' ' || cursor[i+1] == '\n' || i == len - 1 ) ) )
+        {
+            flags |= SCAN_INDIC_C;
+        }
+        else if ( cursor[i] == ',' && 
+                  ( cursor[i+1] == ' ' || cursor[i+1] == '\n' || i == len - 1 ) )
+        {
+            flags |= SCAN_FLOWMAP;
+            flags |= SCAN_FLOWSEQ;
+        }
+    }
+
+    /* printf( "---STR---\n%s\nFLAGS: %d\n", cursor, flags ); */
+    return flags;
+}
+/*
+ * All scalars should be emitted through this function, which determines an appropriate style,
+ * tag and indent.
+ */
+void syck_emit_scalar( SyckEmitter *e, char *tag, enum scalar_style force_style, int force_indent, int force_width,
+                       char keep_nl, char *str, long len )
+{
+    enum scalar_style favor_style = scalar_literal;
+    SyckLevel *parent = syck_emitter_parent_level( e );
+    SyckLevel *lvl = syck_emitter_current_level( e );
+    int scan = 0;
+    char *implicit;
+    
+    if ( str == NULL ) str = "";
+
+    /* No empty nulls as map keys */
+    if ( len == 0 && ( parent->status == syck_lvl_map || parent->status == syck_lvl_imap ) && 
+         parent->ncount % 2 == 1 && syck_tagcmp( tag, "tag:yaml.org,2002:null" ) == 0 ) 
+    {
+        str = "~";
+        len = 1;
+    }
+
+    scan = syck_scan_scalar( force_width, str, len );
+    implicit = syck_match_implicit( str, len );
+
+    /* quote strings which default to implicits */
+    implicit = syck_taguri( YAML_DOMAIN, implicit, strlen( implicit ) );
+    if ( syck_tagcmp( tag, implicit ) != 0 && syck_tagcmp( tag, "tag:yaml.org,2002:str" ) == 0 ) {
+        force_style = scalar_2quote;
+    } else {
+        /* complex key */
+        if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 &&
+             ( !( tag == NULL || 
+             ( implicit != NULL && syck_tagcmp( tag, implicit ) == 0 && e->explicit_typing == 0 ) ) ) ) 
+        {
+            syck_emitter_write( e, "? ", 2 );
+            parent->status = syck_lvl_mapx;
+        }
+        syck_emit_tag( e, tag, implicit );
+    }
+    S_FREE( implicit );
+
+    /* if still arbitrary, sniff a good block style. */
+    if ( force_style == scalar_none ) {
+        if ( scan & SCAN_NEWLINE ) {
+            force_style = scalar_literal;
+        } else {
+            force_style = scalar_plain;
+        }
+    }
+
+    if ( e->style == scalar_fold ) {
+        favor_style = scalar_fold;
+    }
+
+    /* Determine block style */
+    if ( scan & SCAN_NONPRINT ) {
+        force_style = scalar_2quote;
+    } else if ( scan & SCAN_WHITEEDGE ) {
+        force_style = scalar_2quote;
+    } else if ( force_style != scalar_fold && ( scan & SCAN_INDENTED ) ) {
+        force_style = scalar_literal;
+    } else if ( force_style == scalar_plain && ( scan & SCAN_NEWLINE ) ) {
+        force_style = favor_style;
+    } else if ( force_style == scalar_plain && parent->status == syck_lvl_iseq && ( scan & SCAN_FLOWSEQ ) ) {
+        force_style = scalar_2quote;
+    } else if ( force_style == scalar_plain && parent->status == syck_lvl_imap && ( scan & SCAN_FLOWMAP ) ) {
+        force_style = scalar_2quote;
+    /* } else if ( force_style == scalar_fold && ( ! ( scan & SCAN_WIDE ) ) ) {
+        force_style = scalar_literal; */
+    } else if ( force_style == scalar_plain && ( scan & SCAN_INDIC_S || scan & SCAN_INDIC_C ) ) {
+        if ( scan & SCAN_NEWLINE ) {
+            force_style = favor_style;
+        } else {
+            force_style = scalar_2quote;
+        }
+    }
+
+    if ( force_indent > 0 ) {
+        lvl->spaces = parent->spaces + force_indent;
+    } else if ( scan & SCAN_DOCSEP ) {
+        lvl->spaces = parent->spaces + e->indent;
+    }
+
+    /* For now, all ambiguous keys are going to be double-quoted */
+    if ( ( parent->status == syck_lvl_map || parent->status == syck_lvl_mapx ) && parent->ncount % 2 == 1 ) {
+        if ( force_style != scalar_plain ) {
+            force_style = scalar_2quote;
+        }
+    }
+
+    /* If the parent is an inline, double quote anything complex */
+    if ( parent->status == syck_lvl_imap || parent->status == syck_lvl_iseq ) {
+        if ( force_style != scalar_plain && force_style != scalar_1quote ) {
+            force_style = scalar_2quote;
+        }
+    }
+
+    /* Fix the ending newlines */
+    if ( scan & SCAN_NONL_E ) {
+        keep_nl = NL_CHOMP;
+    } else if ( scan & SCAN_MANYNL_E ) {
+        keep_nl = NL_KEEP;
+    }
+
+    /* Write the text node */
+    switch ( force_style )
+    {
+        case scalar_1quote:
+            syck_emit_1quoted( e, force_width, str, len );
+        break;
+
+        case scalar_none:
+        case scalar_2quote:
+            syck_emit_2quoted( e, force_width, str, len );
+        break;
+
+        case scalar_fold:
+            syck_emit_folded( e, force_width, keep_nl, str, len );
+        break;
+
+        case scalar_literal:
+            syck_emit_literal( e, keep_nl, str, len );
+        break;
+
+        case scalar_plain:
+            syck_emitter_write( e, str, len );
+        break;
+    }
+
+    if ( parent->status == syck_lvl_mapx )
+    {
+        syck_emitter_write( e, "\n", 1 );
+    }
+}
+
+void
+syck_emitter_escape( SyckEmitter *e, char *src, long len )
+{
+    int i;
+    for( i = 0; i < len; i++ )
+    {
+        if( (src[i] < 0x20) || (0x7E < src[i]) )
+        {
+            syck_emitter_write( e, "\\", 1 );
+            if( '\0' == src[i] )
+                syck_emitter_write( e, "0", 1 );
+            else
+            {
+                syck_emitter_write( e, "x", 1 );
+                syck_emitter_write( e, (char *)hex_table + ((src[i] & 0xF0) >> 4), 1 );
+                syck_emitter_write( e, (char *)hex_table + (src[i] & 0x0F), 1 );
+            }
+        }
+        else
+        {
+            syck_emitter_write( e, src + i, 1 );
+            if( '\\' == src[i] )
+                syck_emitter_write( e, "\\", 1 );
+        }
+    }
+}
+
+/*
+ * Outputs a single-quoted block.
+ */
+void syck_emit_1quoted( SyckEmitter *e, int width, char *str, long len )
+{
+    char do_indent = 0;
+    char *mark = str;
+    char *start = str;
+    char *end = str;
+    syck_emitter_write( e, "'", 1 );
+    while ( mark < str + len ) {
+        if ( do_indent ) {
+            syck_emit_indent( e );
+            do_indent = 0;
+        }
+        switch ( *mark ) {
+            case '\'':  syck_emitter_write( e, "'", 1 ); break;
+
+            case '\n':
+                end = mark + 1;
+                if ( *start != ' ' && *start != '\n' && *end != '\n' && *end != ' ' ) {
+                    syck_emitter_write( e, "\n\n", 2 );
+                } else {
+                    syck_emitter_write( e, "\n", 1 );
+                }
+                do_indent = 1;
+                start = mark + 1;
+            break;
+
+            case ' ':
+                if ( width > 0 && *start != ' ' && mark - end > width ) {
+                    do_indent = 1;
+                    end = mark + 1;
+                } else {
+                    syck_emitter_write( e, " ", 1 );
+                }
+            break;
+
+            default:
+                syck_emitter_write( e, mark, 1 );
+            break;
+        }
+        mark++;
+    }
+    syck_emitter_write( e, "'", 1 );
+}
+
+/*
+ * Outputs a double-quoted block.
+ */
+void syck_emit_2quoted( SyckEmitter *e, int width, char *str, long len )
+{
+    char do_indent = 0;
+    char *mark = str;
+    char *start = str;
+    char *end = str;
+    syck_emitter_write( e, "\"", 1 );
+    while ( mark < str + len ) {
+        if ( do_indent > 0 ) {
+            if ( do_indent == 2 ) {
+                syck_emitter_write( e, "\\", 1 );
+            }
+            syck_emit_indent( e );
+            do_indent = 0;
+        }
+        switch ( *mark ) {
+
+            /* Escape sequences allowed within double quotes. */
+            case '"':  syck_emitter_write( e, "\\\"", 2 ); break;
+            case '\\': syck_emitter_write( e, "\\\\", 2 ); break;
+            case '\0': syck_emitter_write( e, "\\0",  2 ); break;
+            case '\a': syck_emitter_write( e, "\\a",  2 ); break;
+            case '\b': syck_emitter_write( e, "\\b",  2 ); break;
+            case '\f': syck_emitter_write( e, "\\f",  2 ); break;
+            case '\r': syck_emitter_write( e, "\\r",  2 ); break;
+            case '\t': syck_emitter_write( e, "\\t",  2 ); break;
+            case '\v': syck_emitter_write( e, "\\v",  2 ); break;
+            case 0x1b: syck_emitter_write( e, "\\e",  2 ); break;
+
+            case '\n':
+                end = mark + 1;
+                syck_emitter_write( e, "\\n", 2 );
+                do_indent = 2;
+                start = mark + 1;
+                if ( start < str + len && ( *start == ' ' || *start == '\n' ) ) {
+                    do_indent = 0;
+                }
+            break;
+
+            case ' ':
+                if ( width > 0 && *start != ' ' && mark - end > width ) {
+                    do_indent = 1;
+                    end = mark + 1;
+                } else {
+                    syck_emitter_write( e, " ", 1 );
+                }
+            break;
+
+            default:
+                syck_emitter_escape( e, mark, 1 );
+            break;
+        }
+        mark++;
+    }
+    syck_emitter_write( e, "\"", 1 );
+}
+
+/*
+ * Outputs a literal block.
+ */
+void syck_emit_literal( SyckEmitter *e, char keep_nl, char *str, long len )
+{
+    char *mark = str;
+    char *start = str;
+    char *end = str;
+    syck_emitter_write( e, "|", 1 );
+    if ( keep_nl == NL_CHOMP ) {
+        syck_emitter_write( e, "-", 1 );
+    } else if ( keep_nl == NL_KEEP ) {
+        syck_emitter_write( e, "+", 1 );
+    }
+    syck_emit_indent( e );
+    while ( mark < str + len ) {
+        if ( *mark == '\n' ) {
+            end = mark;
+            if ( *start != ' ' && *start != '\n' && *end != '\n' && *end != ' ' ) end += 1;
+            syck_emitter_write( e, start, end - start );
+            if ( mark + 1 == str + len ) {
+                if ( keep_nl != NL_KEEP ) syck_emitter_write( e, "\n", 1 );
+            } else {
+                syck_emit_indent( e );
+            }
+            start = mark + 1;
+        }
+        mark++;
+    }
+    end = str + len;
+    if ( start < end ) {
+        syck_emitter_write( e, start, end - start );
+    }
+}
+
+/*
+ * Outputs a folded block.
+ */
+void syck_emit_folded( SyckEmitter *e, int width, char keep_nl, char *str, long len )
+{
+    char *mark = str;
+    char *start = str;
+    char *end = str;
+    syck_emitter_write( e, ">", 1 );
+    if ( keep_nl == NL_CHOMP ) {
+        syck_emitter_write( e, "-", 1 );
+    } else if ( keep_nl == NL_KEEP ) {
+        syck_emitter_write( e, "+", 1 );
+    }
+    syck_emit_indent( e );
+    if ( width <= 0 ) width = e->best_width;
+    while ( mark < str + len ) {
+        switch ( *mark ) {
+            case '\n':
+                syck_emitter_write( e, end, mark - end );
+                end = mark + 1;
+                if ( *start != ' ' && *start != '\n' && *end != '\n' && *end != ' ' ) {
+                    syck_emitter_write( e, "\n", 1 );
+                }
+                if ( mark + 1 == str + len ) {
+                    if ( keep_nl != NL_KEEP ) syck_emitter_write( e, "\n", 1 );
+                } else {
+                    syck_emit_indent( e );
+                }
+                start = mark + 1;
+            break;
+
+            case ' ':
+                if ( *start != ' ' ) {
+                    if ( mark - end > width ) {
+                        syck_emitter_write( e, end, mark - end );
+                        syck_emit_indent( e );
+                        end = mark + 1;
+                    }
+                }
+            break;
+        }
+        mark++;
+    }
+    if ( end < mark ) {
+        syck_emitter_write( e, end, mark - end );
+    }
+}
+
+/*
+ * Begins emission of a sequence.
+ */
+void syck_emit_seq( SyckEmitter *e, char *tag, enum seq_style style )
+{
+    SyckLevel *parent = syck_emitter_parent_level( e );
+    SyckLevel *lvl = syck_emitter_current_level( e );
+    syck_emit_tag( e, tag, "tag:yaml.org,2002:seq" );
+    if ( style == seq_inline || ( parent->status == syck_lvl_imap || parent->status == syck_lvl_iseq ) ) {
+        syck_emitter_write( e, "[", 1 );
+        lvl->status = syck_lvl_iseq;
+    } else {
+        /* complex key */
+        if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 ) {
+            syck_emitter_write( e, "? ", 2 );
+            parent->status = syck_lvl_mapx;
+        }
+        lvl->status = syck_lvl_seq;
+    }
+}
+
+/*
+ * Begins emission of a mapping.
+ */
+void syck_emit_map( SyckEmitter *e, char *tag, enum map_style style )
+{
+    SyckLevel *parent = syck_emitter_parent_level( e );
+    SyckLevel *lvl = syck_emitter_current_level( e );
+    syck_emit_tag( e, tag, "tag:yaml.org,2002:map" );
+    if ( style == map_inline || ( parent->status == syck_lvl_imap || parent->status == syck_lvl_iseq ) ) {
+        syck_emitter_write( e, "{", 1 );
+        lvl->status = syck_lvl_imap;
+    } else {
+        /* complex key */
+        if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 ) {
+            syck_emitter_write( e, "? ", 2 );
+            parent->status = syck_lvl_mapx;
+        }
+        lvl->status = syck_lvl_map;
+    }
+}
+
+/*
+ * Handles emitting of a collection item (for both
+ * sequences and maps)
+ */
+void syck_emit_item( SyckEmitter *e, st_data_t n )
+{
+    SyckLevel *lvl = syck_emitter_current_level( e );
+    switch ( lvl->status )
+    {
+        case syck_lvl_seq:
+        {
+            SyckLevel *parent = syck_emitter_parent_level( e );
+
+            /* seq-in-map shortcut -- the lvl->anctag check should be unneccesary but
+             * there is a nasty shift/reduce in the parser on this point and
+             * i'm not ready to tickle it. */
+            if ( lvl->anctag == 0 && parent->status == syck_lvl_map && lvl->ncount == 0 ) {
+                lvl->spaces = parent->spaces;
+            }
+
+            /* seq-in-seq shortcut */
+            else if ( lvl->anctag == 0 && parent->status == syck_lvl_seq && lvl->ncount == 0 ) {
+                int spcs = ( lvl->spaces - parent->spaces ) - 2;
+                if ( spcs >= 0 ) {
+                    int i = 0;
+                    for ( i = 0; i < spcs; i++ ) {
+                        syck_emitter_write( e, " ", 1 );
+                    }
+                    syck_emitter_write( e, "- ", 2 );
+                    break;
+                }
+            }
+
+            syck_emit_indent( e );
+            syck_emitter_write( e, "- ", 2 );
+        }
+        break;
+
+        case syck_lvl_iseq:
+        {
+            if ( lvl->ncount > 0 ) {
+                syck_emitter_write( e, ", ", 2 );
+            }
+        }
+        break;
+
+        case syck_lvl_map:
+        {
+            SyckLevel *parent = syck_emitter_parent_level( e );
+
+            /* map-in-seq shortcut */
+            if ( lvl->anctag == 0 && parent->status == syck_lvl_seq && lvl->ncount == 0 ) {
+                int spcs = ( lvl->spaces - parent->spaces ) - 2;
+                if ( spcs >= 0 ) {
+                    int i = 0;
+                    for ( i = 0; i < spcs; i++ ) {
+                        syck_emitter_write( e, " ", 1 );
+                    }
+                    break;
+                }
+            }
+
+            if ( lvl->ncount % 2 == 0 ) {
+                syck_emit_indent( e );
+            } else {
+                syck_emitter_write( e, ": ", 2 );
+            }
+        }
+        break;
+
+        case syck_lvl_mapx:
+        {
+            if ( lvl->ncount % 2 == 0 ) {
+                syck_emit_indent( e );
+                lvl->status = syck_lvl_map;
+            } else {
+                int i;
+                if ( lvl->spaces > 0 ) {
+                    char *spcs = S_ALLOC_N( char, lvl->spaces + 1 );
+
+                    spcs[lvl->spaces] = '\0';
+                    for ( i = 0; i < lvl->spaces; i++ ) spcs[i] = ' ';
+                    syck_emitter_write( e, spcs, lvl->spaces );
+                    S_FREE( spcs );
+                }
+                syck_emitter_write( e, ": ", 2 );
+            }
+        }
+        break;
+
+        case syck_lvl_imap:
+        {
+            if ( lvl->ncount > 0 ) {
+                if ( lvl->ncount % 2 == 0 ) {
+                    syck_emitter_write( e, ", ", 2 );
+                } else {
+                    syck_emitter_write( e, ": ", 2 );
+                }
+            }
+        }
+        break;
+
+        default: break;
+    }
+    lvl->ncount++;
+
+    syck_emit( e, n );
+}
+
+/*
+ * Closes emission of a collection.
+ */
+void syck_emit_end( SyckEmitter *e )
+{
+    SyckLevel *lvl = syck_emitter_current_level( e );
+    SyckLevel *parent = syck_emitter_parent_level( e );
+    switch ( lvl->status )
+    {
+        case syck_lvl_seq:
+            if ( lvl->ncount == 0 ) {
+                syck_emitter_write( e, "[]\n", 3 );
+            } else if ( parent->status == syck_lvl_mapx ) {
+                syck_emitter_write( e, "\n", 1 );
+            }
+        break;
+
+        case syck_lvl_iseq:
+            syck_emitter_write( e, "]\n", 1 );
+        break;
+
+        case syck_lvl_map:
+            if ( lvl->ncount == 0 ) {
+                syck_emitter_write( e, "{}\n", 3 );
+            } else if ( lvl->ncount % 2 == 1 ) {
+                syck_emitter_write( e, ":\n", 1 );
+            } else if ( parent->status == syck_lvl_mapx ) {
+                syck_emitter_write( e, "\n", 1 );
+            }
+        break;
+
+        case syck_lvl_imap:
+            syck_emitter_write( e, "}\n", 1 );
+        break;
+
+        default: break;
+    }
+}
+
+/*
+ * Fill markers table with emitter nodes in the
+ * soon-to-be-emitted tree.
+ */
+SYMID
+syck_emitter_mark_node( SyckEmitter *e, st_data_t n )
+{
+    SYMID oid = 0;
+    char *anchor_name = NULL;
+
+    /*
+     * Ensure markers table is initialized.
+     */
+    if ( e->markers == NULL )
+    {
+        e->markers = st_init_numtable();
+    }
+
+    /*
+     * Markers table initially marks the string position of the
+     * object.  Doesn't yet create an anchor, simply notes the
+     * position.
+     */
+    if ( ! st_lookup( e->markers, n, (st_data_t *)&oid ) )
+    {
+        /*
+         * Store all markers
+         */
+        oid = e->markers->num_entries + 1;
+        st_insert( e->markers, n, (st_data_t)oid );
+    }
+    else
+    {
+        if ( e->anchors == NULL )
+        {
+            e->anchors = st_init_numtable();
+        }
+
+        if ( ! st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
+        {
+            int idx = 0;
+            char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );
+
+            /*
+             * Second time hitting this object, let's give it an anchor
+             */
+            idx = e->anchors->num_entries + 1;
+            anchor_name = S_ALLOC_N( char, strlen( anc ) + 10 );
+            S_MEMZERO( anchor_name, char, strlen( anc ) + 10 );
+            sprintf( anchor_name, anc, idx );
+
+            /*
+             * Insert into anchors table
+             */
+            st_insert( e->anchors, (st_data_t)oid, (st_data_t)anchor_name );
+        }
+    }
+    return oid;
+}
+
diff --git a/ruby_1_8_6/ext/syck/extconf.rb b/ruby_1_8_6/ext/syck/extconf.rb
new file mode 100644
index 0000000000..6c10448c70
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/extconf.rb
@@ -0,0 +1,5 @@
+require 'mkmf'
+
+have_header( "st.h" )
+create_makefile( "syck" )
+
diff --git a/ruby_1_8_6/ext/syck/gram.c b/ruby_1_8_6/ext/syck/gram.c
new file mode 100644
index 0000000000..615a594f61
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/gram.c
@@ -0,0 +1,1894 @@
+/* A Bison parser, made by GNU Bison 1.875d.  */
+
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Written by Richard Stallman by simplifying the original so called
+   ``semantic'' parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 1
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+/* If NAME_PREFIX is specified substitute the variables and functions
+   names.  */
+#define yyparse syckparse
+#define yylex   sycklex
+#define yyerror syckerror
+#define yylval  sycklval
+#define yychar  syckchar
+#define yydebug syckdebug
+#define yynerrs sycknerrs
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     YAML_ANCHOR = 258,
+     YAML_ALIAS = 259,
+     YAML_TRANSFER = 260,
+     YAML_TAGURI = 261,
+     YAML_ITRANSFER = 262,
+     YAML_WORD = 263,
+     YAML_PLAIN = 264,
+     YAML_BLOCK = 265,
+     YAML_DOCSEP = 266,
+     YAML_IOPEN = 267,
+     YAML_INDENT = 268,
+     YAML_IEND = 269
+   };
+#endif
+#define YAML_ANCHOR 258
+#define YAML_ALIAS 259
+#define YAML_TRANSFER 260
+#define YAML_TAGURI 261
+#define YAML_ITRANSFER 262
+#define YAML_WORD 263
+#define YAML_PLAIN 264
+#define YAML_BLOCK 265
+#define YAML_DOCSEP 266
+#define YAML_IOPEN 267
+#define YAML_INDENT 268
+#define YAML_IEND 269
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 14 "gram.y"
+
+
+#include "syck.h"
+
+void apply_seq_in_map( SyckParser *parser, SyckNode *n );
+
+#define YYPARSE_PARAM   parser
+#define YYLEX_PARAM     parser
+
+#define NULL_NODE(parser, node) \
+        SyckNode *node = syck_new_str( "", scalar_plain ); \
+        if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
+        { \
+            node->type_id = syck_taguri( YAML_DOMAIN, "null", 4 ); \
+        } \
+        else \
+        { \
+            node->type_id = syck_strndup( "null", 4 ); \
+        }
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 35 "gram.y"
+typedef union YYSTYPE {
+    SYMID nodeId;
+    SyckNode *nodeData;
+    char *name;
+} YYSTYPE;
+/* Line 191 of yacc.c.  */
+#line 140 "gram.c"
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 214 of yacc.c.  */
+#line 152 "gram.c"
+
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
+
+# ifndef YYFREE
+#  define YYFREE free
+# endif
+# ifndef YYMALLOC
+#  define YYMALLOC malloc
+# endif
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   define YYSTACK_ALLOC alloca
+#  endif
+# else
+#  if defined (alloca) || defined (_ALLOCA_H)
+#   define YYSTACK_ALLOC alloca
+#  else
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+# else
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
+#  endif
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+# endif
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+
+
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  short int yyss;
+  YYSTYPE yyvs;
+  };
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined (__GNUC__) && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  register YYSIZE_T yyi;		\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (0)
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (0)
+
+#endif
+
+#if defined (__STDC__) || defined (__cplusplus)
+   typedef signed char yysigned_char;
+#else
+   typedef short int yysigned_char;
+#endif
+
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL  52
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   396
+
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS  23
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS  29
+/* YYNRULES -- Number of rules. */
+#define YYNRULES  79
+/* YYNRULES -- Number of states. */
+#define YYNSTATES  128
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   269
+
+#define YYTRANSLATE(YYX) 						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const unsigned char yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,    21,    15,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    16,     2,
+       2,     2,     2,    22,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    17,     2,    18,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    19,     2,    20,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const unsigned char yyprhs[] =
+{
+       0,     0,     3,     5,     8,     9,    11,    13,    15,    18,
+      21,    24,    28,    30,    32,    36,    37,    40,    43,    46,
+      49,    51,    54,    56,    58,    60,    63,    66,    69,    72,
+      75,    77,    79,    81,    85,    87,    89,    91,    93,    95,
+      99,   103,   106,   110,   113,   117,   120,   124,   127,   129,
+     133,   136,   140,   143,   145,   149,   151,   153,   157,   161,
+     165,   168,   172,   175,   179,   182,   184,   188,   190,   194,
+     196,   200,   204,   207,   211,   215,   218,   220,   224,   226
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const yysigned_char yyrhs[] =
+{
+      24,     0,    -1,    25,    -1,    11,    27,    -1,    -1,    33,
+      -1,    26,    -1,    34,    -1,     5,    26,    -1,     6,    26,
+      -1,     3,    26,    -1,    29,    26,    32,    -1,    25,    -1,
+      28,    -1,    29,    28,    30,    -1,    -1,     7,    28,    -1,
+       5,    28,    -1,     6,    28,    -1,     3,    28,    -1,    12,
+      -1,    29,    13,    -1,    14,    -1,    13,    -1,    14,    -1,
+      31,    32,    -1,     5,    33,    -1,     6,    33,    -1,     7,
+      33,    -1,     3,    33,    -1,     4,    -1,     8,    -1,     9,
+      -1,    29,    33,    32,    -1,    10,    -1,    35,    -1,    39,
+      -1,    42,    -1,    49,    -1,    29,    37,    30,    -1,    29,
+      38,    30,    -1,    15,    27,    -1,     5,    31,    38,    -1,
+       5,    37,    -1,     6,    31,    38,    -1,     6,    37,    -1,
+       3,    31,    38,    -1,     3,    37,    -1,    36,    -1,    38,
+      31,    36,    -1,    38,    31,    -1,    17,    40,    18,    -1,
+      17,    18,    -1,    41,    -1,    40,    21,    41,    -1,    25,
+      -1,    48,    -1,    29,    43,    30,    -1,    29,    47,    30,
+      -1,     5,    31,    47,    -1,     5,    43,    -1,     6,    31,
+      47,    -1,     6,    43,    -1,     3,    31,    47,    -1,     3,
+      43,    -1,    33,    -1,    22,    25,    31,    -1,    27,    -1,
+      44,    16,    45,    -1,    46,    -1,    47,    31,    36,    -1,
+      47,    31,    46,    -1,    47,    31,    -1,    25,    16,    27,
+      -1,    19,    50,    20,    -1,    19,    20,    -1,    51,    -1,
+      50,    21,    51,    -1,    25,    -1,    48,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const unsigned short int yyrline[] =
+{
+       0,    56,    56,    60,    65,    70,    71,    74,    75,    80,
+      85,    94,   100,   101,   104,   109,   113,   121,   126,   131,
+     145,   146,   149,   152,   155,   156,   164,   169,   174,   182,
+     186,   194,   207,   208,   218,   219,   220,   221,   222,   228,
+     232,   238,   244,   249,   254,   259,   264,   268,   274,   278,
+     283,   292,   296,   302,   306,   313,   314,   320,   325,   332,
+     337,   342,   347,   352,   356,   362,   363,   369,   379,   396,
+     397,   409,   417,   426,   434,   438,   444,   445,   454,   461
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "YAML_ANCHOR", "YAML_ALIAS",
+  "YAML_TRANSFER", "YAML_TAGURI", "YAML_ITRANSFER", "YAML_WORD",
+  "YAML_PLAIN", "YAML_BLOCK", "YAML_DOCSEP", "YAML_IOPEN", "YAML_INDENT",
+  "YAML_IEND", "'-'", "':'", "'['", "']'", "'{'", "'}'", "','", "'?'",
+  "$accept", "doc", "atom", "ind_rep", "atom_or_empty", "empty",
+  "indent_open", "indent_end", "indent_sep", "indent_flex_end", "word_rep",
+  "struct_rep", "implicit_seq", "basic_seq", "top_imp_seq",
+  "in_implicit_seq", "inline_seq", "in_inline_seq", "inline_seq_atom",
+  "implicit_map", "top_imp_map", "complex_key", "complex_value",
+  "complex_mapping", "in_implicit_map", "basic_mapping", "inline_map",
+  "in_inline_map", "inline_map_atom", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const unsigned short int yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,    45,    58,    91,    93,   123,
+     125,    44,    63
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const unsigned char yyr1[] =
+{
+       0,    23,    24,    24,    24,    25,    25,    26,    26,    26,
+      26,    26,    27,    27,    28,    28,    28,    28,    28,    28,
+      29,    29,    30,    31,    32,    32,    33,    33,    33,    33,
+      33,    33,    33,    33,    34,    34,    34,    34,    34,    35,
+      35,    36,    37,    37,    37,    37,    37,    37,    38,    38,
+      38,    39,    39,    40,    40,    41,    41,    42,    42,    43,
+      43,    43,    43,    43,    43,    44,    44,    45,    46,    47,
+      47,    47,    47,    48,    49,    49,    50,    50,    51,    51
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const unsigned char yyr2[] =
+{
+       0,     2,     1,     2,     0,     1,     1,     1,     2,     2,
+       2,     3,     1,     1,     3,     0,     2,     2,     2,     2,
+       1,     2,     1,     1,     1,     2,     2,     2,     2,     2,
+       1,     1,     1,     3,     1,     1,     1,     1,     1,     3,
+       3,     2,     3,     2,     3,     2,     3,     2,     1,     3,
+       2,     3,     2,     1,     3,     1,     1,     3,     3,     3,
+       2,     3,     2,     3,     2,     1,     3,     1,     3,     1,
+       3,     3,     2,     3,     3,     2,     1,     3,     1,     1
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const unsigned char yydefact[] =
+{
+       4,     0,    30,     0,     0,     0,    31,    32,    34,    15,
+      20,     0,     0,     0,     2,     6,     0,     5,     7,    35,
+      36,    37,    38,    10,    29,     8,    26,     9,    27,     0,
+       0,     0,     0,    28,    15,    15,    15,    15,    12,     3,
+      13,    15,    52,    55,     0,    53,    56,    75,    78,    79,
+       0,    76,     1,     0,     0,     0,    21,    15,     0,     0,
+      65,    48,     0,     0,     0,     0,    69,     0,     0,    19,
+      17,    18,    15,    15,    15,    16,    15,    15,    15,    15,
+       0,    15,    51,     0,    74,     0,    23,     0,    47,    64,
+       0,    43,    60,     0,    45,    62,    41,     0,    24,     0,
+      11,    33,    22,    39,    40,    50,    57,    15,    58,    72,
+      14,    73,    54,    77,    65,    46,    63,    42,    59,    44,
+      61,    66,    25,    49,    67,    68,    70,    71
+};
+
+/* YYDEFGOTO[NTERM-NUM]. */
+static const yysigned_char yydefgoto[] =
+{
+      -1,    13,    38,    15,    39,    40,    16,   103,    99,   101,
+      17,    18,    19,    61,    62,    63,    20,    44,    45,    21,
+      64,    65,   125,    66,    67,    46,    22,    50,    51
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -97
+static const short int yypact[] =
+{
+     250,   318,   -97,   318,   318,   374,   -97,   -97,   -97,   335,
+     -97,   267,   232,     7,   -97,   -97,   192,   -97,   -97,   -97,
+     -97,   -97,   -97,   -97,   -97,   -97,   -97,   -97,   -97,   374,
+     374,   374,   352,   -97,   335,   335,   335,   384,   -97,   -97,
+     -97,   212,   -97,    10,     0,   -97,   -97,   -97,    10,   -97,
+      -4,   -97,   -97,   284,   284,   284,   -97,   335,   318,    30,
+      30,   -97,    -2,    36,    -2,    16,   -97,    36,    30,   -97,
+     -97,   -97,   384,   384,   384,   -97,   363,   301,   301,   301,
+      -2,   335,   -97,   318,   -97,   318,   -97,   158,   -97,   -97,
+     158,   -97,   -97,   158,   -97,   -97,   -97,    24,   -97,    30,
+     -97,   -97,   -97,   -97,   -97,    26,   -97,   335,   -97,   158,
+     -97,   -97,   -97,   -97,   -97,    24,    24,    24,    24,    24,
+      24,   -97,   -97,   -97,   -97,   -97,   -97,   -97
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yysigned_char yypgoto[] =
+{
+     -97,   -97,     8,    81,   -56,   109,    33,   -53,    74,   -54,
+      -1,   -97,   -97,   -96,   -31,   -32,   -97,   -97,   -44,   -97,
+      77,   -97,   -97,   -52,     9,    -6,   -97,   -97,   -29
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -1
+static const unsigned char yytable[] =
+{
+      24,    96,    26,    28,    33,   100,    49,    52,    14,   123,
+     104,   106,   102,   126,   108,    60,    84,    85,    82,    43,
+      48,    83,    88,    91,    94,   111,    81,   110,    24,    26,
+      28,    68,   107,    24,    26,    28,    33,    86,    32,   112,
+      60,    57,    41,    86,    98,   122,    88,    91,    94,    86,
+     102,   124,    24,    26,    28,   115,   113,   127,   117,     0,
+       0,   119,    32,    32,    32,    32,    97,    41,    41,    41,
+      76,    24,    26,    28,    41,    68,    24,    26,    28,    49,
+       0,     0,    23,     0,    25,    27,   114,     0,     0,   114,
+      41,    43,   114,    48,     0,     0,   116,    59,     0,   118,
+       0,     0,   120,     0,     0,    76,    76,    76,   114,    76,
+      41,    41,    41,     0,    41,    23,    25,    27,     0,     0,
+      32,     0,    59,    32,     0,     0,    32,    87,    90,    93,
+      89,    92,    95,     0,    23,    25,    27,   105,     0,     0,
+      41,   109,    32,    69,    70,    71,    75,     0,     0,     0,
+      80,    87,    90,    93,    89,    92,    95,     0,    23,    25,
+      27,    29,     2,    30,    31,     5,     6,     7,     0,     0,
+      10,   121,     0,    57,     0,     0,     0,     0,     0,     0,
+      58,    69,    70,    71,     0,    80,    69,    70,    71,   105,
+     109,   105,   109,   105,   109,    53,     2,    54,    55,     5,
+       6,     7,     8,     0,    10,    56,     0,    57,     0,    11,
+       0,    12,     0,     0,    58,    77,     2,    78,    79,    37,
+       6,     7,     8,     0,    10,    56,     0,    57,     0,    11,
+       0,    12,     0,     0,    58,     1,     2,     3,     4,     5,
+       6,     7,     8,     0,    10,     0,     0,     0,     0,    11,
+       0,    12,    47,     1,     2,     3,     4,     5,     6,     7,
+       8,     9,    10,     0,     0,     0,     0,    11,     0,    12,
+       1,     2,     3,     4,     5,     6,     7,     8,     0,    10,
+       0,     0,     0,     0,    11,    42,    12,    53,     2,    54,
+      55,     5,     6,     7,     8,     0,    10,    86,     0,     0,
+       0,    11,     0,    12,    77,     2,    78,    79,    37,     6,
+       7,     8,     0,    10,    86,     0,     0,     0,    11,     0,
+      12,     1,     2,     3,     4,     5,     6,     7,     8,     0,
+      10,     0,     0,     0,     0,    11,     0,    12,    34,     2,
+      35,    36,    37,     6,     7,     8,     0,    10,     0,     0,
+       0,     0,    11,     0,    12,    29,     2,    30,    31,     5,
+       6,     7,     0,     0,    10,    56,    72,     2,    73,    74,
+      37,     6,     7,     0,     0,    10,    56,    29,     2,    30,
+      31,     5,     6,     7,     0,     0,    10,    72,     2,    73,
+      74,    37,     6,     7,     0,     0,    10
+};
+
+static const yysigned_char yycheck[] =
+{
+       1,    57,     3,     4,     5,    59,    12,     0,     0,   105,
+      63,    64,    14,   109,    67,    16,    20,    21,    18,    11,
+      12,    21,    53,    54,    55,    81,    16,    80,    29,    30,
+      31,    32,    16,    34,    35,    36,    37,    13,     5,    83,
+      41,    15,     9,    13,    14,    99,    77,    78,    79,    13,
+      14,   107,    53,    54,    55,    87,    85,   109,    90,    -1,
+      -1,    93,    29,    30,    31,    32,    58,    34,    35,    36,
+      37,    72,    73,    74,    41,    76,    77,    78,    79,    85,
+      -1,    -1,     1,    -1,     3,     4,    87,    -1,    -1,    90,
+      57,    83,    93,    85,    -1,    -1,    87,    16,    -1,    90,
+      -1,    -1,    93,    -1,    -1,    72,    73,    74,   109,    76,
+      77,    78,    79,    -1,    81,    34,    35,    36,    -1,    -1,
+      87,    -1,    41,    90,    -1,    -1,    93,    53,    54,    55,
+      53,    54,    55,    -1,    53,    54,    55,    63,    -1,    -1,
+     107,    67,   109,    34,    35,    36,    37,    -1,    -1,    -1,
+      41,    77,    78,    79,    77,    78,    79,    -1,    77,    78,
+      79,     3,     4,     5,     6,     7,     8,     9,    -1,    -1,
+      12,    97,    -1,    15,    -1,    -1,    -1,    -1,    -1,    -1,
+      22,    72,    73,    74,    -1,    76,    77,    78,    79,   115,
+     116,   117,   118,   119,   120,     3,     4,     5,     6,     7,
+       8,     9,    10,    -1,    12,    13,    -1,    15,    -1,    17,
+      -1,    19,    -1,    -1,    22,     3,     4,     5,     6,     7,
+       8,     9,    10,    -1,    12,    13,    -1,    15,    -1,    17,
+      -1,    19,    -1,    -1,    22,     3,     4,     5,     6,     7,
+       8,     9,    10,    -1,    12,    -1,    -1,    -1,    -1,    17,
+      -1,    19,    20,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    -1,    -1,    -1,    -1,    17,    -1,    19,
+       3,     4,     5,     6,     7,     8,     9,    10,    -1,    12,
+      -1,    -1,    -1,    -1,    17,    18,    19,     3,     4,     5,
+       6,     7,     8,     9,    10,    -1,    12,    13,    -1,    -1,
+      -1,    17,    -1,    19,     3,     4,     5,     6,     7,     8,
+       9,    10,    -1,    12,    13,    -1,    -1,    -1,    17,    -1,
+      19,     3,     4,     5,     6,     7,     8,     9,    10,    -1,
+      12,    -1,    -1,    -1,    -1,    17,    -1,    19,     3,     4,
+       5,     6,     7,     8,     9,    10,    -1,    12,    -1,    -1,
+      -1,    -1,    17,    -1,    19,     3,     4,     5,     6,     7,
+       8,     9,    -1,    -1,    12,    13,     3,     4,     5,     6,
+       7,     8,     9,    -1,    -1,    12,    13,     3,     4,     5,
+       6,     7,     8,     9,    -1,    -1,    12,     3,     4,     5,
+       6,     7,     8,     9,    -1,    -1,    12
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const unsigned char yystos[] =
+{
+       0,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    17,    19,    24,    25,    26,    29,    33,    34,    35,
+      39,    42,    49,    26,    33,    26,    33,    26,    33,     3,
+       5,     6,    29,    33,     3,     5,     6,     7,    25,    27,
+      28,    29,    18,    25,    40,    41,    48,    20,    25,    48,
+      50,    51,     0,     3,     5,     6,    13,    15,    22,    26,
+      33,    36,    37,    38,    43,    44,    46,    47,    33,    28,
+      28,    28,     3,     5,     6,    28,    29,     3,     5,     6,
+      28,    16,    18,    21,    20,    21,    13,    31,    37,    43,
+      31,    37,    43,    31,    37,    43,    27,    25,    14,    31,
+      32,    32,    14,    30,    30,    31,    30,    16,    30,    31,
+      30,    27,    41,    51,    33,    38,    47,    38,    47,    38,
+      47,    31,    32,    36,    27,    45,    36,    46
+};
+
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# endif
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK;						\
+      goto yybackup;						\
+    }								\
+  else								\
+    { 								\
+      yyerror ("syntax error: cannot back up");\
+      YYERROR;							\
+    }								\
+while (0)
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+   are run).  */
+
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)		\
+   ((Current).first_line   = (Rhs)[1].first_line,	\
+    (Current).first_column = (Rhs)[1].first_column,	\
+    (Current).last_line    = (Rhs)[N].last_line,	\
+    (Current).last_column  = (Rhs)[N].last_column)
+#endif
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (&yylval, YYLEX_PARAM)
+#else
+# define YYLEX yylex (&yylval)
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (0)
+
+# define YYDSYMPRINT(Args)			\
+do {						\
+  if (yydebug)					\
+    yysymprint Args;				\
+} while (0)
+
+# define YYDSYMPRINTF(Title, Token, Value, Location)		\
+do {								\
+  if (yydebug)							\
+    {								\
+      YYFPRINTF (stderr, "%s ", Title);				\
+      yysymprint (stderr, 					\
+                  Token, Value);	\
+      YYFPRINTF (stderr, "\n");					\
+    }								\
+} while (0)
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_stack_print (short int *bottom, short int *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    short int *bottom;
+    short int *top;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (/* Nothing. */; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_reduce_print (int yyrule)
+#else
+static void
+yy_reduce_print (yyrule)
+    int yyrule;
+#endif
+{
+  int yyi;
+  unsigned int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+             yyrule - 1, yylno);
+  /* Print the symbols being reduced, and their result.  */
+  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
+  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (Rule);		\
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YYDSYMPRINT(Args)
+# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
+# undef YYMAXDEPTH
+#endif
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined (__GLIBC__) && defined (_STRING_H)
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+#   if defined (__STDC__) || defined (__cplusplus)
+yystrlen (const char *yystr)
+#   else
+yystrlen (yystr)
+     const char *yystr;
+#   endif
+{
+  register const char *yys = yystr;
+
+  while (*yys++ != '\0')
+    continue;
+
+  return yys - yystr - 1;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+#   if defined (__STDC__) || defined (__cplusplus)
+yystpcpy (char *yydest, const char *yysrc)
+#   else
+yystpcpy (yydest, yysrc)
+     char *yydest;
+     const char *yysrc;
+#   endif
+{
+  register char *yyd = yydest;
+  register const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+#endif /* !YYERROR_VERBOSE */
+
+
+
+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yysymprint (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+
+  if (yytype < YYNTOKENS)
+    {
+      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+    }
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  switch (yytype)
+    {
+      default:
+        break;
+    }
+  YYFPRINTF (yyoutput, ")");
+}
+
+#endif /* ! YYDEBUG */
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yydestruct (int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yytype, yyvaluep)
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+
+  switch (yytype)
+    {
+
+      default:
+        break;
+    }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM);
+# else
+int yyparse ();
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM)
+# else
+int yyparse (YYPARSE_PARAM)
+  void *YYPARSE_PARAM;
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+  /* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+  register int yystate;
+  register int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  short int yyssa[YYINITDEPTH];
+  short int *yyss = yyssa;
+  register short int *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  register YYSTYPE *yyvsp;
+
+
+
+#define YYPOPSTACK   (yyvsp--, yyssp--)
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
+  /* When reducing, the number of symbols on the RHS of the reduced
+     rule.  */
+  int yylen;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed. so pushing a state here evens the stacks.
+     */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack. Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	short int *yyss1 = yyss;
+
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow ("parser stack overflow",
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyoverflowlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyoverflowlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	short int *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyoverflowlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+/* Do appropriate processing given the current state.  */
+/* Read a lookahead token if we need one and don't already have one.  */
+/* yyresume: */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  /* Shift the lookahead token.  */
+  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+
+  /* Discard the token being shifted unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  *++yyvsp = yylval;
+
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 57 "gram.y"
+    {
+           ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
+        }
+    break;
+
+  case 3:
+#line 61 "gram.y"
+    {
+           ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
+        }
+    break;
+
+  case 4:
+#line 65 "gram.y"
+    {
+           ((SyckParser *)parser)->eof = 1;
+        }
+    break;
+
+  case 8:
+#line 76 "gram.y"
+    { 
+            syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+            yyval.nodeData = yyvsp[0].nodeData;
+        }
+    break;
+
+  case 9:
+#line 81 "gram.y"
+    {
+            syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
+            yyval.nodeData = yyvsp[0].nodeData;
+        }
+    break;
+
+  case 10:
+#line 86 "gram.y"
+    { 
+           /*
+            * _Anchors_: The language binding must keep a separate symbol table
+            * for anchors.  The actual ID in the symbol table is returned to the
+            * higher nodes, though.
+            */
+           yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
+        }
+    break;
+
+  case 11:
+#line 95 "gram.y"
+    {
+           yyval.nodeData = yyvsp[-1].nodeData;
+        }
+    break;
+
+  case 14:
+#line 105 "gram.y"
+    {
+                    yyval.nodeData = yyvsp[-1].nodeData;
+                }
+    break;
+
+  case 15:
+#line 109 "gram.y"
+    {
+                    NULL_NODE( parser, n );
+                    yyval.nodeData = n;
+                }
+    break;
+
+  case 16:
+#line 114 "gram.y"
+    { 
+                   if ( ((SyckParser *)parser)->implicit_typing == 1 )
+                   {
+                      try_tag_implicit( yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+                   }
+                   yyval.nodeData = yyvsp[0].nodeData;
+                }
+    break;
+
+  case 17:
+#line 122 "gram.y"
+    { 
+                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+                    yyval.nodeData = yyvsp[0].nodeData;
+                }
+    break;
+
+  case 18:
+#line 127 "gram.y"
+    {
+                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
+                    yyval.nodeData = yyvsp[0].nodeData;
+                }
+    break;
+
+  case 19:
+#line 132 "gram.y"
+    { 
+                   /*
+                    * _Anchors_: The language binding must keep a separate symbol table
+                    * for anchors.  The actual ID in the symbol table is returned to the
+                    * higher nodes, though.
+                    */
+                   yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
+                }
+    break;
+
+  case 26:
+#line 165 "gram.y"
+    { 
+               syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+               yyval.nodeData = yyvsp[0].nodeData;
+            }
+    break;
+
+  case 27:
+#line 170 "gram.y"
+    { 
+               syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
+               yyval.nodeData = yyvsp[0].nodeData;
+            }
+    break;
+
+  case 28:
+#line 175 "gram.y"
+    { 
+               if ( ((SyckParser *)parser)->implicit_typing == 1 )
+               {
+                  try_tag_implicit( yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+               }
+               yyval.nodeData = yyvsp[0].nodeData;
+            }
+    break;
+
+  case 29:
+#line 183 "gram.y"
+    { 
+               yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
+            }
+    break;
+
+  case 30:
+#line 187 "gram.y"
+    {
+               /*
+                * _Aliases_: The anchor symbol table is scanned for the anchor name.
+                * The anchor's ID in the language's symbol table is returned.
+                */
+               yyval.nodeData = syck_hdlr_get_anchor( (SyckParser *)parser, yyvsp[0].name );
+            }
+    break;
+
+  case 31:
+#line 195 "gram.y"
+    { 
+               SyckNode *n = yyvsp[0].nodeData;
+               if ( ((SyckParser *)parser)->taguri_expansion == 1 )
+               {
+                   n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
+               }
+               else
+               {
+                   n->type_id = syck_strndup( "str", 3 );
+               }
+               yyval.nodeData = n;
+            }
+    break;
+
+  case 33:
+#line 209 "gram.y"
+    {
+               yyval.nodeData = yyvsp[-1].nodeData;
+            }
+    break;
+
+  case 39:
+#line 229 "gram.y"
+    { 
+                    yyval.nodeData = yyvsp[-1].nodeData;
+                }
+    break;
+
+  case 40:
+#line 233 "gram.y"
+    { 
+                    yyval.nodeData = yyvsp[-1].nodeData;
+                }
+    break;
+
+  case 41:
+#line 239 "gram.y"
+    { 
+                    yyval.nodeId = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
+                }
+    break;
+
+  case 42:
+#line 245 "gram.y"
+    { 
+                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+                    yyval.nodeData = yyvsp[0].nodeData;
+                }
+    break;
+
+  case 43:
+#line 250 "gram.y"
+    { 
+                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+                    yyval.nodeData = yyvsp[0].nodeData;
+                }
+    break;
+
+  case 44:
+#line 255 "gram.y"
+    { 
+                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
+                    yyval.nodeData = yyvsp[0].nodeData;
+                }
+    break;
+
+  case 45:
+#line 260 "gram.y"
+    { 
+                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
+                    yyval.nodeData = yyvsp[0].nodeData;
+                }
+    break;
+
+  case 46:
+#line 265 "gram.y"
+    { 
+                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
+                }
+    break;
+
+  case 47:
+#line 269 "gram.y"
+    { 
+                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
+                }
+    break;
+
+  case 48:
+#line 275 "gram.y"
+    {
+                    yyval.nodeData = syck_new_seq( yyvsp[0].nodeId );
+                }
+    break;
+
+  case 49:
+#line 279 "gram.y"
+    { 
+                    syck_seq_add( yyvsp[-2].nodeData, yyvsp[0].nodeId );
+                    yyval.nodeData = yyvsp[-2].nodeData;
+				}
+    break;
+
+  case 50:
+#line 284 "gram.y"
+    { 
+                    yyval.nodeData = yyvsp[-1].nodeData;
+				}
+    break;
+
+  case 51:
+#line 293 "gram.y"
+    { 
+                    yyval.nodeData = yyvsp[-1].nodeData;
+                }
+    break;
+
+  case 52:
+#line 297 "gram.y"
+    { 
+                    yyval.nodeData = syck_alloc_seq();
+                }
+    break;
+
+  case 53:
+#line 303 "gram.y"
+    {
+                    yyval.nodeData = syck_new_seq( syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
+                }
+    break;
+
+  case 54:
+#line 307 "gram.y"
+    { 
+                    syck_seq_add( yyvsp[-2].nodeData, syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
+                    yyval.nodeData = yyvsp[-2].nodeData;
+				}
+    break;
+
+  case 57:
+#line 321 "gram.y"
+    { 
+                    apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
+                    yyval.nodeData = yyvsp[-1].nodeData;
+                }
+    break;
+
+  case 58:
+#line 326 "gram.y"
+    { 
+                    apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
+                    yyval.nodeData = yyvsp[-1].nodeData;
+                }
+    break;
+
+  case 59:
+#line 333 "gram.y"
+    { 
+                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+                    yyval.nodeData = yyvsp[0].nodeData;
+                }
+    break;
+
+  case 60:
+#line 338 "gram.y"
+    { 
+                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+                    yyval.nodeData = yyvsp[0].nodeData;
+                }
+    break;
+
+  case 61:
+#line 343 "gram.y"
+    { 
+                    syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
+                    yyval.nodeData = yyvsp[0].nodeData;
+                }
+    break;
+
+  case 62:
+#line 348 "gram.y"
+    { 
+                    syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
+                    yyval.nodeData = yyvsp[0].nodeData;
+                }
+    break;
+
+  case 63:
+#line 353 "gram.y"
+    { 
+                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
+                }
+    break;
+
+  case 64:
+#line 357 "gram.y"
+    { 
+                    yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
+                }
+    break;
+
+  case 66:
+#line 364 "gram.y"
+    {
+                    yyval.nodeData = yyvsp[-1].nodeData;
+                }
+    break;
+
+  case 68:
+#line 380 "gram.y"
+    {
+                    yyval.nodeData = syck_new_map( 
+                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ), 
+                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
+                }
+    break;
+
+  case 70:
+#line 398 "gram.y"
+    {
+                    if ( yyvsp[-2].nodeData->shortcut == NULL )
+                    {
+                        yyvsp[-2].nodeData->shortcut = syck_new_seq( yyvsp[0].nodeId );
+                    }
+                    else
+                    {
+                        syck_seq_add( yyvsp[-2].nodeData->shortcut, yyvsp[0].nodeId );
+                    }
+                    yyval.nodeData = yyvsp[-2].nodeData;
+                }
+    break;
+
+  case 71:
+#line 410 "gram.y"
+    {
+                    apply_seq_in_map( (SyckParser *)parser, yyvsp[-2].nodeData );
+                    syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
+                    syck_free_node( yyvsp[0].nodeData );
+                    yyvsp[0].nodeData = NULL;
+                    yyval.nodeData = yyvsp[-2].nodeData;
+                }
+    break;
+
+  case 72:
+#line 418 "gram.y"
+    {
+                    yyval.nodeData = yyvsp[-1].nodeData;
+                }
+    break;
+
+  case 73:
+#line 427 "gram.y"
+    {
+                    yyval.nodeData = syck_new_map( 
+                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ), 
+                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
+                }
+    break;
+
+  case 74:
+#line 435 "gram.y"
+    {
+                    yyval.nodeData = yyvsp[-1].nodeData;
+                }
+    break;
+
+  case 75:
+#line 439 "gram.y"
+    {
+                    yyval.nodeData = syck_alloc_map();
+                }
+    break;
+
+  case 77:
+#line 446 "gram.y"
+    {
+                    syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
+                    syck_free_node( yyvsp[0].nodeData );
+                    yyvsp[0].nodeData = NULL;
+                    yyval.nodeData = yyvsp[-2].nodeData;
+				}
+    break;
+
+  case 78:
+#line 455 "gram.y"
+    {
+                    NULL_NODE( parser, n );
+                    yyval.nodeData = syck_new_map( 
+                        syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ), 
+                        syck_hdlr_add_node( (SyckParser *)parser, n ) );
+                }
+    break;
+
+
+    }
+
+/* Line 1010 of yacc.c.  */
+#line 1651 "gram.c"
+
+  yyvsp -= yylen;
+  yyssp -= yylen;
+
+
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if YYERROR_VERBOSE
+      yyn = yypact[yystate];
+
+      if (YYPACT_NINF < yyn && yyn < YYLAST)
+	{
+	  YYSIZE_T yysize = 0;
+	  int yytype = YYTRANSLATE (yychar);
+	  const char* yyprefix;
+	  char *yymsg;
+	  int yyx;
+
+	  /* Start YYX at -YYN if negative to avoid negative indexes in
+	     YYCHECK.  */
+	  int yyxbegin = yyn < 0 ? -yyn : 0;
+
+	  /* Stay within bounds of both yycheck and yytname.  */
+	  int yychecklim = YYLAST - yyn;
+	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+	  int yycount = 0;
+
+	  yyprefix = ", expecting ";
+	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	      {
+		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
+		yycount += 1;
+		if (yycount == 5)
+		  {
+		    yysize = 0;
+		    break;
+		  }
+	      }
+	  yysize += (sizeof ("syntax error, unexpected ")
+		     + yystrlen (yytname[yytype]));
+	  yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg != 0)
+	    {
+	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+	      yyp = yystpcpy (yyp, yytname[yytype]);
+
+	      if (yycount < 5)
+		{
+		  yyprefix = ", expecting ";
+		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+		      {
+			yyp = yystpcpy (yyp, yyprefix);
+			yyp = yystpcpy (yyp, yytname[yyx]);
+			yyprefix = " or ";
+		      }
+		}
+	      yyerror (yymsg);
+	      YYSTACK_FREE (yymsg);
+	    }
+	  else
+	    yyerror ("syntax error; also virtual memory exhausted");
+	}
+      else
+#endif /* YYERROR_VERBOSE */
+	yyerror ("syntax error");
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+	 error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* If at end of input, pop the error token,
+	     then the rest of the stack, then return failure.  */
+	  if (yychar == YYEOF)
+	     for (;;)
+	       {
+		 YYPOPSTACK;
+		 if (yyssp == yyss)
+		   YYABORT;
+		 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+		 yydestruct (yystos[*yyssp], yyvsp);
+	       }
+        }
+      else
+	{
+	  YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+	  yydestruct (yytoken, &yylval);
+	  yychar = YYEMPTY;
+
+	}
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+#ifdef __GNUC__
+  /* Pacify GCC when the user code never invokes YYERROR and the label
+     yyerrorlab therefore never appears in user code.  */
+  if (0)
+     goto yyerrorlab;
+#endif
+
+  yyvsp -= yylen;
+  yyssp -= yylen;
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+      yydestruct (yystos[yystate], yyvsp);
+      YYPOPSTACK;
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  YYDPRINTF ((stderr, "Shifting error token, "));
+
+  *++yyvsp = yylval;
+
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here.  |
+`----------------------------------------------*/
+yyoverflowlab:
+  yyerror ("parser stack overflow");
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+  return yyresult;
+}
+
+
+#line 464 "gram.y"
+
+
+void
+apply_seq_in_map( SyckParser *parser, SyckNode *n )
+{
+    long map_len;
+    if ( n->shortcut == NULL )
+    {
+        return;
+    }
+
+    map_len = syck_map_count( n );
+    syck_map_assign( n, map_value, map_len - 1,
+        syck_hdlr_add_node( parser, n->shortcut ) );
+
+    n->shortcut = NULL;
+}
+
+
diff --git a/ruby_1_8_6/ext/syck/gram.h b/ruby_1_8_6/ext/syck/gram.h
new file mode 100644
index 0000000000..547149ab4b
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/gram.h
@@ -0,0 +1,79 @@
+/* A Bison parser, made by GNU Bison 1.875d.  */
+
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     YAML_ANCHOR = 258,
+     YAML_ALIAS = 259,
+     YAML_TRANSFER = 260,
+     YAML_TAGURI = 261,
+     YAML_ITRANSFER = 262,
+     YAML_WORD = 263,
+     YAML_PLAIN = 264,
+     YAML_BLOCK = 265,
+     YAML_DOCSEP = 266,
+     YAML_IOPEN = 267,
+     YAML_INDENT = 268,
+     YAML_IEND = 269
+   };
+#endif
+#define YAML_ANCHOR 258
+#define YAML_ALIAS 259
+#define YAML_TRANSFER 260
+#define YAML_TAGURI 261
+#define YAML_ITRANSFER 262
+#define YAML_WORD 263
+#define YAML_PLAIN 264
+#define YAML_BLOCK 265
+#define YAML_DOCSEP 266
+#define YAML_IOPEN 267
+#define YAML_INDENT 268
+#define YAML_IEND 269
+
+
+
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 35 "gram.y"
+typedef union YYSTYPE {
+    SYMID nodeId;
+    SyckNode *nodeData;
+    char *name;
+} YYSTYPE;
+/* Line 1285 of yacc.c.  */
+#line 71 "gram.h"
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+
+
diff --git a/ruby_1_8_6/ext/syck/handler.c b/ruby_1_8_6/ext/syck/handler.c
new file mode 100644
index 0000000000..56fe838fbd
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/handler.c
@@ -0,0 +1,174 @@
+/*
+ * handler.c
+ *
+ * $Author$
+ * $Date$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+
+#include "ruby.h"
+#include "syck.h"
+
+SYMID 
+syck_hdlr_add_node( SyckParser *p, SyckNode *n )
+{
+    SYMID id;
+
+    if ( ! n->id ) 
+    {
+        n->id = (p->handler)( p, n );
+    }
+    id = n->id;
+
+    if ( n->anchor == NULL )
+    {
+        syck_free_node( n );
+    }
+    return id;
+}
+
+SyckNode *
+syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
+{
+    SyckNode *ntmp = NULL;
+
+    n->anchor = a;
+    if ( p->bad_anchors != NULL )
+    {
+        SyckNode *bad;
+        if ( st_lookup( p->bad_anchors, (st_data_t)a, (st_data_t *)&bad ) )
+        {
+            if ( n->kind != syck_str_kind )
+            {
+                n->id = bad->id;
+                (p->handler)( p, n );
+            }
+        }
+    }
+    if ( p->anchors == NULL )
+    {
+        p->anchors = st_init_strtable();
+    }
+    if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&ntmp ) )
+    {
+        if ( ntmp != (void *)1 )
+        {
+            syck_free_node( ntmp );
+        }
+    }
+    st_insert( p->anchors, (st_data_t)a, (st_data_t)n );
+    return n;
+}
+
+void
+syck_hdlr_remove_anchor( SyckParser *p, char *a )
+{
+    char *atmp = a;
+    SyckNode *ntmp;
+    if ( p->anchors == NULL )
+    {
+        p->anchors = st_init_strtable();
+    }
+    if ( st_delete( p->anchors, (st_data_t *)&atmp, (st_data_t *)&ntmp ) )
+    {
+        if ( ntmp != (void *)1 )
+        {
+            syck_free_node( ntmp );
+        }
+    }
+    st_insert( p->anchors, (st_data_t)a, (st_data_t)1 );
+}
+
+SyckNode *
+syck_hdlr_get_anchor( SyckParser *p, char *a )
+{
+    SyckNode *n = NULL;
+
+    if ( p->anchors != NULL )
+    {
+        if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&n ) )
+        {
+            if ( n != (void *)1 )
+            {    
+                S_FREE( a );
+                return n;
+            }
+            else
+            {
+                if ( p->bad_anchors == NULL )
+                {
+                    p->bad_anchors = st_init_strtable();
+                }
+                if ( ! st_lookup( p->bad_anchors, (st_data_t)a, (st_data_t *)&n ) )
+                {
+                    n = (p->bad_anchor_handler)( p, a );
+                    st_insert( p->bad_anchors, (st_data_t)a, (st_data_t)n );
+                }
+            }
+        }
+    }
+
+    if ( n == NULL )
+    {
+        n = (p->bad_anchor_handler)( p, a );
+    }
+
+    if ( n->anchor )
+    {
+        S_FREE( a );
+    } 
+    else
+    {
+        n->anchor = a;
+    }
+
+    return n;
+}
+
+void
+syck_add_transfer( char *uri, SyckNode *n, int taguri )
+{
+    if ( n->type_id != NULL )
+    {
+        S_FREE( n->type_id );
+    }
+
+    if ( taguri == 0 )
+    {
+        n->type_id = uri;
+        return;
+    }
+
+    n->type_id = syck_type_id_to_uri( uri );
+    S_FREE( uri );
+}
+
+char *
+syck_xprivate( char *type_id, int type_len )
+{
+    char *uri = S_ALLOC_N( char, type_len + 14 );
+    uri[0] = '\0';
+    strcat( uri, "x-private:" );
+    strncat( uri, type_id, type_len );
+    return uri;
+}
+
+char *
+syck_taguri( char *domain, char *type_id, int type_len )
+{
+    char *uri = S_ALLOC_N( char, strlen( domain ) + type_len + 14 );
+    uri[0] = '\0';
+    strcat( uri, "tag:" );
+    strcat( uri, domain );
+    strcat( uri, ":" );
+    strncat( uri, type_id, type_len );
+    return uri;
+}
+
+int 
+syck_try_implicit( SyckNode *n )
+{
+    return 1;
+}
+
diff --git a/ruby_1_8_6/ext/syck/implicit.c b/ruby_1_8_6/ext/syck/implicit.c
new file mode 100644
index 0000000000..d356faf7d9
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/implicit.c
@@ -0,0 +1,2990 @@
+/* Generated by re2c 0.9.10 on Mon Sep 19 21:46:50 2005 */
+#line 1 "implicit.re"
+/*
+ * implicit.re
+ *
+ * $Author$
+ * $Date$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+
+#include "ruby.h"
+#include "syck.h"
+
+#define YYCTYPE     char
+#define YYCURSOR    cursor
+#define YYMARKER    marker
+#define YYLIMIT     limit
+#define YYFILL(n)
+
+void
+try_tag_implicit( SyckNode *n, int taguri )
+{
+    char *tid = "";
+    switch ( n->kind )
+    {
+        case syck_str_kind:
+            tid = syck_match_implicit( n->data.str->ptr, n->data.str->len );
+        break;
+
+        case syck_seq_kind:
+            tid = "seq";
+        break;
+
+        case syck_map_kind:
+            tid = "map";
+        break;
+    }
+    if ( n->type_id != NULL ) S_FREE( n->type_id );
+    if ( taguri == 1 )
+    {
+        n->type_id = syck_taguri( YAML_DOMAIN, tid, strlen( tid ) );
+    } else {
+        n->type_id = syck_strndup( tid, strlen( tid ) );
+    }
+}
+
+char *syck_match_implicit( char *str, size_t len )
+{
+    char *cursor, *limit, *marker;
+    cursor = str;
+    limit = str + len;
+
+
+#line 55 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy0;
+	++YYCURSOR;
+yy0:
+	if((YYLIMIT - YYCURSOR) < 26) YYFILL(26);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy6;
+	case '+':	goto yy16;
+	case '-':	goto yy17;
+	case '.':	goto yy20;
+	case '0':	goto yy18;
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy19;
+	case '<':	goto yy22;
+	case '=':	goto yy21;
+	case 'F':	goto yy15;
+	case 'N':	goto yy5;
+	case 'O':	goto yy13;
+	case 'T':	goto yy11;
+	case 'Y':	goto yy9;
+	case 'f':	goto yy14;
+	case 'n':	goto yy4;
+	case 'o':	goto yy12;
+	case 't':	goto yy10;
+	case 'y':	goto yy8;
+	case '~':	goto yy2;
+	default:	goto yy23;
+	}
+yy2:	++YYCURSOR;
+	if((yych = *YYCURSOR) <= 0x00)	goto yy6;
+	goto yy3;
+yy3:
+#line 123 "implicit.re"
+{   return "str"; }
+#line 100 "<stdout>"
+yy4:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 'o':	goto yy172;
+	case 'u':	goto yy200;
+	default:	goto yy3;
+	}
+yy5:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 'O':	case 'o':	goto yy172;
+	case 'U':	goto yy195;
+	case 'u':	goto yy196;
+	default:	goto yy3;
+	}
+yy6:	++YYCURSOR;
+	goto yy7;
+yy7:
+#line 85 "implicit.re"
+{   return "null"; }
+#line 121 "<stdout>"
+yy8:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 'e':	goto yy194;
+	default:	goto yy3;
+	}
+yy9:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 'E':	goto yy192;
+	case 'e':	goto yy193;
+	default:	goto yy3;
+	}
+yy10:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 'r':	goto yy190;
+	default:	goto yy3;
+	}
+yy11:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 'R':	goto yy186;
+	case 'r':	goto yy187;
+	default:	goto yy3;
+	}
+yy12:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 'f':	goto yy185;
+	case 'n':	goto yy182;
+	default:	goto yy3;
+	}
+yy13:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 'F':	goto yy180;
+	case 'N':	case 'n':	goto yy182;
+	case 'f':	goto yy181;
+	default:	goto yy3;
+	}
+yy14:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 'a':	goto yy177;
+	default:	goto yy3;
+	}
+yy15:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 'A':	goto yy168;
+	case 'a':	goto yy169;
+	default:	goto yy3;
+	}
+yy16:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case '.':	goto yy167;
+	case '0':	goto yy158;
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy47;
+	default:	goto yy3;
+	}
+yy17:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case '.':	goto yy157;
+	case '0':	goto yy158;
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy47;
+	default:	goto yy3;
+	}
+yy18:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 0x00:	goto yy52;
+	case ',':	goto yy142;
+	case '.':	goto yy50;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':	goto yy140;
+	case '8':
+	case '9':	goto yy141;
+	case ':':	goto yy49;
+	case 'x':	goto yy144;
+	default:	goto yy3;
+	}
+yy19:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 0x00:	goto yy52;
+	case ',':	goto yy47;
+	case '.':	goto yy50;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy46;
+	case ':':	goto yy49;
+	default:	goto yy3;
+	}
+yy20:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 'I':	goto yy33;
+	case 'N':	goto yy31;
+	case 'i':	goto yy32;
+	case 'n':	goto yy30;
+	default:	goto yy3;
+	}
+yy21:	yych = *++YYCURSOR;
+	if(yych <= 0x00)	goto yy28;
+	goto yy3;
+yy22:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case '<':	goto yy24;
+	default:	goto yy3;
+	}
+yy23:	yych = *++YYCURSOR;
+	goto yy3;
+yy24:	yych = *++YYCURSOR;
+	if(yych <= 0x00)	goto yy26;
+	goto yy25;
+yy25:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy3;
+	}
+yy26:	++YYCURSOR;
+	goto yy27;
+yy27:
+#line 121 "implicit.re"
+{   return "merge"; }
+#line 279 "<stdout>"
+yy28:	++YYCURSOR;
+	goto yy29;
+yy29:
+#line 119 "implicit.re"
+{   return "default"; }
+#line 285 "<stdout>"
+yy30:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'a':	goto yy45;
+	default:	goto yy25;
+	}
+yy31:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'A':	goto yy40;
+	case 'a':	goto yy41;
+	default:	goto yy25;
+	}
+yy32:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'n':	goto yy39;
+	default:	goto yy25;
+	}
+yy33:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'N':	goto yy34;
+	case 'n':	goto yy35;
+	default:	goto yy25;
+	}
+yy34:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'F':	goto yy36;
+	default:	goto yy25;
+	}
+yy35:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'f':	goto yy36;
+	default:	goto yy25;
+	}
+yy36:	yych = *++YYCURSOR;
+	if(yych >= 0x01)	goto yy25;
+	goto yy37;
+yy37:	++YYCURSOR;
+	goto yy38;
+yy38:
+#line 105 "implicit.re"
+{   return "float#inf"; }
+#line 326 "<stdout>"
+yy39:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'f':	goto yy36;
+	default:	goto yy25;
+	}
+yy40:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'N':	goto yy42;
+	default:	goto yy25;
+	}
+yy41:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'N':	goto yy42;
+	default:	goto yy25;
+	}
+yy42:	yych = *++YYCURSOR;
+	if(yych >= 0x01)	goto yy25;
+	goto yy43;
+yy43:	++YYCURSOR;
+	goto yy44;
+yy44:
+#line 109 "implicit.re"
+{   return "float#nan"; }
+#line 350 "<stdout>"
+yy45:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'n':	goto yy42;
+	default:	goto yy25;
+	}
+yy46:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy74;
+	default:	goto yy48;
+	}
+yy47:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy48;
+yy48:	switch(yych){
+	case 0x00:	goto yy52;
+	case ',':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy47;
+	case '.':	goto yy50;
+	case ':':	goto yy49;
+	default:	goto yy25;
+	}
+yy49:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':	goto yy66;
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy67;
+	default:	goto yy25;
+	}
+yy50:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+	yych = *YYCURSOR;
+	goto yy51;
+yy51:	switch(yych){
+	case 0x00:	goto yy56;
+	case ',':	goto yy54;
+	case '.':	goto yy58;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy50;
+	case 'E':	case 'e':	goto yy60;
+	default:	goto yy25;
+	}
+yy52:	++YYCURSOR;
+	goto yy53;
+yy53:
+#line 97 "implicit.re"
+{   return "int"; }
+#line 432 "<stdout>"
+yy54:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy55;
+yy55:	switch(yych){
+	case 0x00:	goto yy56;
+	case ',':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy54;
+	default:	goto yy25;
+	}
+yy56:	++YYCURSOR;
+	goto yy57;
+yy57:
+#line 99 "implicit.re"
+{   return "float#fix"; }
+#line 456 "<stdout>"
+yy58:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+	yych = *YYCURSOR;
+	goto yy59;
+yy59:	switch(yych){
+	case '.':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy58;
+	case 'E':	case 'e':	goto yy60;
+	default:	goto yy25;
+	}
+yy60:	yych = *++YYCURSOR;
+	switch(yych){
+	case '+':	case '-':	goto yy61;
+	default:	goto yy25;
+	}
+yy61:	yych = *++YYCURSOR;
+	if(yych <= 0x00)	goto yy25;
+	goto yy63;
+yy62:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy63;
+yy63:	switch(yych){
+	case 0x00:	goto yy64;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy62;
+	default:	goto yy25;
+	}
+yy64:	++YYCURSOR;
+	goto yy65;
+yy65:
+#line 101 "implicit.re"
+{   return "float#exp"; }
+#line 506 "<stdout>"
+yy66:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy70;
+	case '.':	goto yy68;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy67;
+	case ':':	goto yy49;
+	default:	goto yy25;
+	}
+yy67:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy70;
+	case '.':	goto yy68;
+	case ':':	goto yy49;
+	default:	goto yy25;
+	}
+yy68:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy69;
+yy69:	switch(yych){
+	case 0x00:	goto yy72;
+	case ',':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy68;
+	default:	goto yy25;
+	}
+yy70:	++YYCURSOR;
+	goto yy71;
+yy71:
+#line 95 "implicit.re"
+{   return "int#base60"; }
+#line 558 "<stdout>"
+yy72:	++YYCURSOR;
+	goto yy73;
+yy73:
+#line 103 "implicit.re"
+{   return "float#base60"; }
+#line 564 "<stdout>"
+yy74:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy75;
+	default:	goto yy48;
+	}
+yy75:	yych = *++YYCURSOR;
+	switch(yych){
+	case '-':	goto yy76;
+	default:	goto yy48;
+	}
+yy76:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy77;
+	default:	goto yy25;
+	}
+yy77:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy78;
+	default:	goto yy25;
+	}
+yy78:	yych = *++YYCURSOR;
+	switch(yych){
+	case '-':	goto yy79;
+	default:	goto yy25;
+	}
+yy79:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy80;
+	default:	goto yy25;
+	}
+yy80:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy81;
+	default:	goto yy25;
+	}
+yy81:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy82;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy25;
+	case 'T':	goto yy84;
+	case 't':	goto yy85;
+	default:	goto yy87;
+	}
+yy82:	++YYCURSOR;
+	goto yy83;
+yy83:
+#line 111 "implicit.re"
+{   return "timestamp#ymd"; }
+#line 667 "<stdout>"
+yy84:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy126;
+	default:	goto yy25;
+	}
+yy85:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy108;
+	default:	goto yy25;
+	}
+yy86:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
+	yych = *YYCURSOR;
+	goto yy87;
+yy87:	switch(yych){
+	case 0x09:	case ' ':	goto yy86;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy88;
+	default:	goto yy25;
+	}
+yy88:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy89;
+	default:	goto yy25;
+	}
+yy89:	yych = *++YYCURSOR;
+	switch(yych){
+	case ':':	goto yy90;
+	default:	goto yy25;
+	}
+yy90:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy91;
+	default:	goto yy25;
+	}
+yy91:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy92;
+	default:	goto yy25;
+	}
+yy92:	yych = *++YYCURSOR;
+	switch(yych){
+	case ':':	goto yy93;
+	default:	goto yy25;
+	}
+yy93:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy94;
+	default:	goto yy25;
+	}
+yy94:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy95;
+	default:	goto yy25;
+	}
+yy95:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x09:	case ' ':	goto yy98;
+	case '.':	goto yy96;
+	default:	goto yy25;
+	}
+yy96:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy97;
+yy97:	switch(yych){
+	case 0x09:	case ' ':	goto yy98;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy96;
+	default:	goto yy25;
+	}
+yy98:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+	yych = *YYCURSOR;
+	goto yy99;
+yy99:	switch(yych){
+	case 0x09:	case ' ':	goto yy98;
+	case '+':	case '-':	goto yy101;
+	case 'Z':	goto yy100;
+	default:	goto yy25;
+	}
+yy100:	yych = *++YYCURSOR;
+	if(yych <= 0x00)	goto yy105;
+	goto yy25;
+yy101:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy102;
+	default:	goto yy25;
+	}
+yy102:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy103;
+	default:	goto yy25;
+	}
+yy103:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy105;
+	case ':':	goto yy104;
+	default:	goto yy25;
+	}
+yy104:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy107;
+	default:	goto yy25;
+	}
+yy105:	++YYCURSOR;
+	goto yy106;
+yy106:
+#line 115 "implicit.re"
+{   return "timestamp#spaced"; }
+#line 884 "<stdout>"
+yy107:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy100;
+	default:	goto yy25;
+	}
+yy108:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy109;
+	default:	goto yy25;
+	}
+yy109:	yych = *++YYCURSOR;
+	switch(yych){
+	case ':':	goto yy110;
+	default:	goto yy25;
+	}
+yy110:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy111;
+	default:	goto yy25;
+	}
+yy111:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy112;
+	default:	goto yy25;
+	}
+yy112:	yych = *++YYCURSOR;
+	switch(yych){
+	case ':':	goto yy113;
+	default:	goto yy25;
+	}
+yy113:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy114;
+	default:	goto yy25;
+	}
+yy114:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy115;
+	default:	goto yy25;
+	}
+yy115:	yych = *++YYCURSOR;
+	switch(yych){
+	case '.':	goto yy116;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy25;
+	default:	goto yy117;
+	}
+yy116:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+	yych = *YYCURSOR;
+	goto yy117;
+yy117:	switch(yych){
+	case '+':	case '-':	goto yy119;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy116;
+	case 'Z':	goto yy118;
+	default:	goto yy25;
+	}
+yy118:	yych = *++YYCURSOR;
+	if(yych <= 0x00)	goto yy123;
+	goto yy25;
+yy119:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy120;
+	default:	goto yy25;
+	}
+yy120:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy121;
+	default:	goto yy25;
+	}
+yy121:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy123;
+	case ':':	goto yy122;
+	default:	goto yy25;
+	}
+yy122:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy125;
+	default:	goto yy25;
+	}
+yy123:	++YYCURSOR;
+	goto yy124;
+yy124:
+#line 113 "implicit.re"
+{   return "timestamp#iso8601"; }
+#line 1069 "<stdout>"
+yy125:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy118;
+	default:	goto yy25;
+	}
+yy126:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy127;
+	default:	goto yy25;
+	}
+yy127:	yych = *++YYCURSOR;
+	switch(yych){
+	case ':':	goto yy128;
+	default:	goto yy25;
+	}
+yy128:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy129;
+	default:	goto yy25;
+	}
+yy129:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy130;
+	default:	goto yy25;
+	}
+yy130:	yych = *++YYCURSOR;
+	switch(yych){
+	case ':':	goto yy131;
+	default:	goto yy25;
+	}
+yy131:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy132;
+	default:	goto yy25;
+	}
+yy132:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy133;
+	default:	goto yy25;
+	}
+yy133:	yych = *++YYCURSOR;
+	switch(yych){
+	case '.':	goto yy134;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy25;
+	case 'Z':	goto yy136;
+	default:	goto yy135;
+	}
+yy134:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+	yych = *YYCURSOR;
+	goto yy135;
+yy135:	switch(yych){
+	case '+':	case '-':	goto yy119;
+	case '0':	goto yy134;
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy138;
+	case 'Z':	goto yy118;
+	default:	goto yy25;
+	}
+yy136:	yych = *++YYCURSOR;
+	if(yych >= 0x01)	goto yy25;
+	goto yy137;
+yy137:	yych = *++YYCURSOR;
+	goto yy124;
+yy138:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+	yych = *YYCURSOR;
+	goto yy139;
+yy139:	switch(yych){
+	case '+':	case '-':	goto yy119;
+	case '0':	goto yy134;
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy138;
+	case 'Z':	goto yy136;
+	default:	goto yy25;
+	}
+yy140:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':	goto yy155;
+	case '8':
+	case '9':	goto yy153;
+	default:	goto yy143;
+	}
+yy141:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy153;
+	default:	goto yy152;
+	}
+yy142:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy143;
+yy143:	switch(yych){
+	case 0x00:	goto yy149;
+	case ',':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':	goto yy142;
+	case '.':	goto yy50;
+	case '8':
+	case '9':	goto yy151;
+	case ':':	goto yy49;
+	default:	goto yy25;
+	}
+yy144:	yych = *++YYCURSOR;
+	if(yych <= 0x00)	goto yy25;
+	goto yy146;
+yy145:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy146;
+yy146:	switch(yych){
+	case 0x00:	goto yy147;
+	case ',':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':	goto yy145;
+	default:	goto yy25;
+	}
+yy147:	++YYCURSOR;
+	goto yy148;
+yy148:
+#line 91 "implicit.re"
+{   return "int#hex"; }
+#line 1307 "<stdout>"
+yy149:	++YYCURSOR;
+	goto yy150;
+yy150:
+#line 93 "implicit.re"
+{   return "int#oct"; }
+#line 1313 "<stdout>"
+yy151:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy152;
+yy152:	switch(yych){
+	case ',':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy151;
+	case '.':	goto yy50;
+	case ':':	goto yy49;
+	default:	goto yy25;
+	}
+yy153:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy154;
+	default:	goto yy152;
+	}
+yy154:	yych = *++YYCURSOR;
+	switch(yych){
+	case '-':	goto yy76;
+	default:	goto yy152;
+	}
+yy155:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':	goto yy156;
+	case '8':
+	case '9':	goto yy154;
+	default:	goto yy143;
+	}
+yy156:	yych = *++YYCURSOR;
+	switch(yych){
+	case '-':	goto yy76;
+	default:	goto yy143;
+	}
+yy157:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'I':	goto yy160;
+	case 'i':	goto yy159;
+	default:	goto yy25;
+	}
+yy158:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy52;
+	case 'x':	goto yy144;
+	default:	goto yy143;
+	}
+yy159:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'n':	goto yy166;
+	default:	goto yy25;
+	}
+yy160:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'N':	goto yy161;
+	case 'n':	goto yy162;
+	default:	goto yy25;
+	}
+yy161:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'F':	goto yy163;
+	default:	goto yy25;
+	}
+yy162:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'f':	goto yy163;
+	default:	goto yy25;
+	}
+yy163:	yych = *++YYCURSOR;
+	if(yych >= 0x01)	goto yy25;
+	goto yy164;
+yy164:	++YYCURSOR;
+	goto yy165;
+yy165:
+#line 107 "implicit.re"
+{   return "float#neginf"; }
+#line 1412 "<stdout>"
+yy166:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'f':	goto yy163;
+	default:	goto yy25;
+	}
+yy167:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'I':	goto yy33;
+	case 'i':	goto yy32;
+	default:	goto yy25;
+	}
+yy168:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'L':	goto yy175;
+	default:	goto yy25;
+	}
+yy169:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'l':	goto yy170;
+	default:	goto yy25;
+	}
+yy170:	yych = *++YYCURSOR;
+	switch(yych){
+	case 's':	goto yy171;
+	default:	goto yy25;
+	}
+yy171:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'e':	goto yy172;
+	default:	goto yy25;
+	}
+yy172:	yych = *++YYCURSOR;
+	if(yych >= 0x01)	goto yy25;
+	goto yy173;
+yy173:	++YYCURSOR;
+	goto yy174;
+yy174:
+#line 89 "implicit.re"
+{   return "bool#no"; }
+#line 1452 "<stdout>"
+yy175:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'S':	goto yy176;
+	default:	goto yy25;
+	}
+yy176:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'E':	goto yy172;
+	default:	goto yy25;
+	}
+yy177:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'l':	goto yy178;
+	default:	goto yy25;
+	}
+yy178:	yych = *++YYCURSOR;
+	switch(yych){
+	case 's':	goto yy179;
+	default:	goto yy25;
+	}
+yy179:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'e':	goto yy172;
+	default:	goto yy25;
+	}
+yy180:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'F':	goto yy172;
+	default:	goto yy25;
+	}
+yy181:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'f':	goto yy172;
+	default:	goto yy25;
+	}
+yy182:	yych = *++YYCURSOR;
+	if(yych >= 0x01)	goto yy25;
+	goto yy183;
+yy183:	++YYCURSOR;
+	goto yy184;
+yy184:
+#line 87 "implicit.re"
+{   return "bool#yes"; }
+#line 1496 "<stdout>"
+yy185:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'f':	goto yy172;
+	default:	goto yy25;
+	}
+yy186:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'U':	goto yy189;
+	default:	goto yy25;
+	}
+yy187:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'u':	goto yy188;
+	default:	goto yy25;
+	}
+yy188:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'e':	goto yy182;
+	default:	goto yy25;
+	}
+yy189:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'E':	goto yy182;
+	default:	goto yy25;
+	}
+yy190:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'u':	goto yy191;
+	default:	goto yy25;
+	}
+yy191:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'e':	goto yy182;
+	default:	goto yy25;
+	}
+yy192:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'S':	goto yy182;
+	default:	goto yy25;
+	}
+yy193:	yych = *++YYCURSOR;
+	switch(yych){
+	case 's':	goto yy182;
+	default:	goto yy25;
+	}
+yy194:	yych = *++YYCURSOR;
+	switch(yych){
+	case 's':	goto yy182;
+	default:	goto yy25;
+	}
+yy195:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'L':	goto yy199;
+	default:	goto yy25;
+	}
+yy196:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'l':	goto yy197;
+	default:	goto yy25;
+	}
+yy197:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'l':	goto yy198;
+	default:	goto yy25;
+	}
+yy198:	yych = *++YYCURSOR;
+	if(yych <= 0x00)	goto yy6;
+	goto yy25;
+yy199:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'L':	goto yy198;
+	default:	goto yy25;
+	}
+yy200:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'l':	goto yy201;
+	default:	goto yy25;
+	}
+yy201:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 'l':	goto yy198;
+	default:	goto yy25;
+	}
+}
+#line 125 "implicit.re"
+
+
+}
+
+/* Remove ending fragment and compare types */
+int
+syck_tagcmp( char *tag1, char *tag2 )
+{
+    if ( tag1 == tag2 ) return 1;
+    if ( tag1 == NULL || tag2 == NULL ) return 0;
+    else {
+        int i;
+        char *othorpe;
+        char *tmp1 = syck_strndup( tag1, strlen( tag1 ) );
+        char *tmp2 = syck_strndup( tag2, strlen( tag2 ) );
+        othorpe = strstr( tmp1, "#" );
+		if ( othorpe != NULL ) {
+            othorpe[0] = '\0';
+        }
+        othorpe = strstr( tmp2, "#" );
+		if ( othorpe != NULL ) {
+            othorpe[0] = '\0';
+        }
+        i = strcmp( tmp1, tmp2 );
+        S_FREE( tmp1 ); S_FREE( tmp2 );
+        return i;
+    }
+}
+
+char *
+syck_type_id_to_uri( char *type_id )
+{
+    char *cursor, *limit, *marker;
+
+    cursor = type_id;
+    limit = type_id + strlen( type_id );
+
+
+#line 1620 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy202;
+	++YYCURSOR;
+yy202:
+	if((YYLIMIT - YYCURSOR) < 11) YYFILL(11);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy204;
+	case '!':	goto yy208;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':	case 'u':
+	case 'v':
+	case 'w':	case 'y':
+	case 'z':	goto yy210;
+	case 't':	goto yy205;
+	case 'x':	goto yy207;
+	default:	goto yy211;
+	}
+yy204:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy206;
+	}
+yy205:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case ',':	goto yy216;
+	case '-':	goto yy212;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy214;
+	case 'a':	goto yy246;
+	default:	goto yy206;
+	}
+yy206:
+#line 202 "implicit.re"
+{   return syck_taguri( YAML_DOMAIN, type_id, strlen( type_id ) ); }
+#line 1768 "<stdout>"
+yy207:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case ',':	case '.':
+	case '/':
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy215;
+	case '-':	goto yy236;
+	default:	goto yy206;
+	}
+yy208:	++YYCURSOR;
+	goto yy209;
+yy209:
+#line 176 "implicit.re"
+{   return syck_xprivate( type_id + 1, strlen( type_id ) - 1 ); }
+#line 1842 "<stdout>"
+yy210:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case ',':	goto yy216;
+	case '-':	goto yy212;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy214;
+	default:	goto yy206;
+	}
+yy211:	yych = *++YYCURSOR;
+	goto yy206;
+yy212:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy213;
+yy213:	switch(yych){
+	case '-':	goto yy212;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy214;
+	default:	goto yy204;
+	}
+yy214:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	goto yy215;
+yy215:	switch(yych){
+	case ',':	goto yy216;
+	case '-':	goto yy212;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy214;
+	default:	goto yy204;
+	}
+yy216:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy224;
+	default:	goto yy204;
+	}
+yy217:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy220;
+	default:	goto yy204;
+	}
+yy218:	++YYCURSOR;
+	goto yy219;
+yy219:
+#line 178 "implicit.re"
+{   char *domain = S_ALLOC_N( char, ( YYCURSOR - type_id ) + 15 );
+                    char *uri;
+
+                    domain[0] = '\0';
+                    strncat( domain, type_id, ( YYCURSOR - type_id ) - 1 );
+                    strcat( domain, "." );
+                    strcat( domain, YAML_DOMAIN );
+                    uri = syck_taguri( domain, YYCURSOR, YYLIMIT - YYCURSOR );
+
+                    S_FREE( domain );
+                    return uri;
+                }
+#line 2149 "<stdout>"
+yy220:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
+	yych = *YYCURSOR;
+	goto yy221;
+yy221:	switch(yych){
+	case ',':	goto yy216;
+	case '-':	goto yy222;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy220;
+	default:	goto yy204;
+	}
+yy222:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy223;
+yy223:	switch(yych){
+	case '-':	goto yy222;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy220;
+	default:	goto yy204;
+	}
+yy224:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy225;
+	default:	goto yy204;
+	}
+yy225:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy226;
+	default:	goto yy204;
+	}
+yy226:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy227;
+	default:	goto yy204;
+	}
+yy227:	yych = *++YYCURSOR;
+	switch(yych){
+	case '-':	goto yy228;
+	case '/':	goto yy229;
+	default:	goto yy204;
+	}
+yy228:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy231;
+	default:	goto yy204;
+	}
+yy229:	++YYCURSOR;
+	goto yy230;
+yy230:
+#line 191 "implicit.re"
+{   char *domain = S_ALLOC_N( char, YYCURSOR - type_id );
+                               char *uri;
+
+                               domain[0] = '\0';
+                               strncat( domain, type_id, ( YYCURSOR - type_id ) - 1 );
+                               uri = syck_taguri( domain, YYCURSOR, YYLIMIT - YYCURSOR );
+
+                               S_FREE( domain );
+                               return uri;
+                            }
+#line 2365 "<stdout>"
+yy231:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy232;
+	default:	goto yy204;
+	}
+yy232:	yych = *++YYCURSOR;
+	switch(yych){
+	case '-':	goto yy233;
+	case '/':	goto yy229;
+	default:	goto yy204;
+	}
+yy233:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy234;
+	default:	goto yy204;
+	}
+yy234:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy235;
+	default:	goto yy204;
+	}
+yy235:	yych = *++YYCURSOR;
+	switch(yych){
+	case '/':	goto yy229;
+	default:	goto yy204;
+	}
+yy236:	yych = *++YYCURSOR;
+	switch(yych){
+	case 'p':	goto yy237;
+	default:	goto yy213;
+	}
+yy237:	yych = *++YYCURSOR;
+	switch(yych){
+	case ',':	goto yy216;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case 'r':	goto yy238;
+	default:	goto yy213;
+	}
+yy238:	yych = *++YYCURSOR;
+	switch(yych){
+	case ',':	goto yy216;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case 'i':	goto yy239;
+	default:	goto yy213;
+	}
+yy239:	yych = *++YYCURSOR;
+	switch(yych){
+	case ',':	goto yy216;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case 'v':	goto yy240;
+	default:	goto yy213;
+	}
+yy240:	yych = *++YYCURSOR;
+	switch(yych){
+	case ',':	goto yy216;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case 'a':	goto yy241;
+	default:	goto yy213;
+	}
+yy241:	yych = *++YYCURSOR;
+	switch(yych){
+	case ',':	goto yy216;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case 't':	goto yy242;
+	default:	goto yy213;
+	}
+yy242:	yych = *++YYCURSOR;
+	switch(yych){
+	case ',':	goto yy216;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case 'e':	goto yy243;
+	default:	goto yy213;
+	}
+yy243:	yych = *++YYCURSOR;
+	switch(yych){
+	case ',':	goto yy216;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case ':':	goto yy244;
+	default:	goto yy213;
+	}
+yy244:	++YYCURSOR;
+	goto yy245;
+yy245:
+#line 174 "implicit.re"
+{   return syck_strndup( type_id, strlen( type_id ) ); }
+#line 2485 "<stdout>"
+yy246:	yych = *++YYCURSOR;
+	switch(yych){
+	case ',':	goto yy216;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case 'g':	goto yy247;
+	default:	goto yy213;
+	}
+yy247:	yych = *++YYCURSOR;
+	switch(yych){
+	case ',':	goto yy216;
+	case '.':	goto yy217;
+	case '/':	goto yy218;
+	case ':':	goto yy248;
+	default:	goto yy213;
+	}
+yy248:	yych = *++YYCURSOR;
+	switch(yych){
+	case ',':
+	case '-':
+	case '.':	goto yy204;
+	default:	goto yy250;
+	}
+yy249:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	goto yy250;
+yy250:	switch(yych){
+	case ',':	goto yy253;
+	case '-':	goto yy251;
+	case '.':	goto yy254;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy249;
+	default:	goto yy204;
+	}
+yy251:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy252;
+yy252:	switch(yych){
+	case '-':	goto yy251;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy249;
+	default:	goto yy204;
+	}
+yy253:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy259;
+	default:	goto yy204;
+	}
+yy254:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy255;
+	default:	goto yy204;
+	}
+yy255:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
+	yych = *YYCURSOR;
+	goto yy256;
+yy256:	switch(yych){
+	case ',':	goto yy253;
+	case '-':	goto yy257;
+	case '.':	goto yy254;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy255;
+	default:	goto yy204;
+	}
+yy257:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy258;
+yy258:	switch(yych){
+	case '-':	goto yy257;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy255;
+	default:	goto yy204;
+	}
+yy259:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy260;
+	default:	goto yy204;
+	}
+yy260:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy261;
+	default:	goto yy204;
+	}
+yy261:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy262;
+	default:	goto yy204;
+	}
+yy262:	yych = *++YYCURSOR;
+	switch(yych){
+	case '-':	goto yy263;
+	case ':':	goto yy264;
+	default:	goto yy204;
+	}
+yy263:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy266;
+	default:	goto yy204;
+	}
+yy264:	++YYCURSOR;
+	goto yy265;
+yy265:
+#line 172 "implicit.re"
+{   return syck_strndup( type_id, strlen( type_id ) ); }
+#line 2932 "<stdout>"
+yy266:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy267;
+	default:	goto yy204;
+	}
+yy267:	yych = *++YYCURSOR;
+	switch(yych){
+	case '-':	goto yy268;
+	case ':':	goto yy264;
+	default:	goto yy204;
+	}
+yy268:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy269;
+	default:	goto yy204;
+	}
+yy269:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy270;
+	default:	goto yy204;
+	}
+yy270:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case ':':	goto yy264;
+	default:	goto yy204;
+	}
+}
+#line 204 "implicit.re"
+
+
+}
diff --git a/ruby_1_8_6/ext/syck/node.c b/ruby_1_8_6/ext/syck/node.c
new file mode 100644
index 0000000000..28fc78c077
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/node.c
@@ -0,0 +1,408 @@
+/*
+ * node.c
+ *
+ * $Author$
+ * $Date$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+
+#include "ruby.h"
+#include "syck.h"
+
+/*
+ * Node allocation functions
+ */
+SyckNode *
+syck_alloc_node( enum syck_kind_tag type )
+{
+    SyckNode *s;
+
+    s = S_ALLOC( SyckNode );
+    s->kind = type;
+    s->id = 0;
+    s->type_id = NULL;
+    s->anchor = NULL;
+    s->shortcut = NULL;
+
+    return s;
+}
+
+void
+syck_free_node( SyckNode *n )
+{
+    syck_free_members( n );
+    if ( n->type_id != NULL )
+    {
+        S_FREE( n->type_id );
+        n->type_id = NULL;
+    }
+    if ( n->anchor != NULL )
+    {
+        S_FREE( n->anchor );
+        n->anchor = NULL;
+    }
+    S_FREE( n );
+}
+
+SyckNode *
+syck_alloc_map()
+{
+    SyckNode *n;
+    struct SyckMap *m;
+
+    m = S_ALLOC( struct SyckMap );
+    m->style = map_none;
+    m->idx = 0;
+    m->capa = ALLOC_CT;
+    m->keys = S_ALLOC_N( SYMID, m->capa );
+    m->values = S_ALLOC_N( SYMID, m->capa );
+
+    n = syck_alloc_node( syck_map_kind );
+    n->data.pairs = m;
+    
+    return n;
+}
+
+SyckNode *
+syck_alloc_seq()
+{
+    SyckNode *n;
+    struct SyckSeq *s;
+
+    s = S_ALLOC( struct SyckSeq );
+    s->style = seq_none;
+    s->idx = 0;
+    s->capa = ALLOC_CT;
+    s->items = S_ALLOC_N( SYMID, s->capa );
+
+    n = syck_alloc_node( syck_seq_kind );
+    n->data.list = s;
+
+    return n;
+}
+
+SyckNode *
+syck_alloc_str()
+{
+    SyckNode *n;
+    struct SyckStr *s;
+
+    s = S_ALLOC( struct SyckStr );
+    s->len = 0;
+    s->ptr = NULL;
+    s->style = scalar_none;
+
+    n = syck_alloc_node( syck_str_kind );
+    n->data.str = s;
+    
+    return n;
+}
+
+SyckNode *
+syck_new_str( char *str, enum scalar_style style )
+{
+    return syck_new_str2( str, strlen( str ), style );
+}
+
+SyckNode *
+syck_new_str2( char *str, long len, enum scalar_style style )
+{
+    SyckNode *n;
+
+    n = syck_alloc_str();
+    n->data.str->ptr = S_ALLOC_N( char, len + 1 );
+    n->data.str->len = len;
+    n->data.str->style = style;
+    memcpy( n->data.str->ptr, str, len );
+    n->data.str->ptr[len] = '\0';
+
+    return n;
+}
+
+void
+syck_replace_str( SyckNode *n, char *str, enum scalar_style style )
+{
+    syck_replace_str2( n, str, strlen( str ), style );
+}
+
+void
+syck_replace_str2( SyckNode *n, char *str, long len, enum scalar_style style )
+{
+    if ( n->data.str != NULL ) 
+    {
+        S_FREE( n->data.str->ptr );
+        n->data.str->ptr = NULL;
+        n->data.str->len = 0;
+    }
+    n->data.str->ptr = S_ALLOC_N( char, len + 1 );
+    n->data.str->len = len;
+    n->data.str->style = style;
+    memcpy( n->data.str->ptr, str, len );
+    n->data.str->ptr[len] = '\0';
+}
+
+void
+syck_str_blow_away_commas( SyckNode *n )
+{
+    char *go, *end;
+
+    go = n->data.str->ptr;
+    end = go + n->data.str->len;
+    while ( *(++go) != '\0' )
+    {
+        if ( *go == ',' )
+        {
+            n->data.str->len -= 1;
+            memmove( go, go + 1, end - go );
+            end -= 1;
+        }
+    }
+}
+
+char *
+syck_str_read( SyckNode *n )
+{
+    ASSERT( n != NULL );
+    return n->data.str->ptr;
+}
+
+SyckNode *
+syck_new_map( SYMID key, SYMID value )
+{
+    SyckNode *n;
+
+    n = syck_alloc_map();
+    syck_map_add( n, key, value );
+
+    return n;
+}
+
+void
+syck_map_empty( SyckNode *n )
+{
+    struct SyckMap *m;
+    ASSERT( n != NULL );
+    ASSERT( n->data.list != NULL );
+
+    S_FREE( n->data.pairs->keys );
+    S_FREE( n->data.pairs->values );
+    m = n->data.pairs;
+    m->idx = 0;
+    m->capa = ALLOC_CT;
+    m->keys = S_ALLOC_N( SYMID, m->capa );
+    m->values = S_ALLOC_N( SYMID, m->capa );
+}
+
+void
+syck_map_add( SyckNode *map, SYMID key, SYMID value )
+{
+    struct SyckMap *m;
+    long idx;
+
+    ASSERT( map != NULL );
+    ASSERT( map->data.pairs != NULL );
+    
+    m = map->data.pairs;
+    idx = m->idx;
+    m->idx += 1;
+    if ( m->idx > m->capa )
+    {
+        m->capa += ALLOC_CT;
+        S_REALLOC_N( m->keys, SYMID, m->capa );
+        S_REALLOC_N( m->values, SYMID, m->capa );
+    }
+    m->keys[idx] = key;
+    m->values[idx] = value;
+}
+
+void
+syck_map_update( SyckNode *map1, SyckNode *map2 )
+{
+    struct SyckMap *m1, *m2;
+    long new_idx, new_capa;
+    ASSERT( map1 != NULL );
+    ASSERT( map2 != NULL );
+
+    m1 = map1->data.pairs;
+    m2 = map2->data.pairs;
+    if ( m2->idx < 1 ) return;
+        
+    new_idx = m1->idx;
+    new_idx += m2->idx;
+    new_capa = m1->capa;
+    while ( new_idx > new_capa )
+    {
+        new_capa += ALLOC_CT;
+    }
+    if ( new_capa > m1->capa )
+    {
+        m1->capa = new_capa;
+        S_REALLOC_N( m1->keys, SYMID, m1->capa );
+        S_REALLOC_N( m1->values, SYMID, m1->capa );
+    }
+    for ( new_idx = 0; new_idx < m2->idx; m1->idx++, new_idx++ )
+    {
+        m1->keys[m1->idx] = m2->keys[new_idx]; 
+        m1->values[m1->idx] = m2->values[new_idx]; 
+    }
+}
+
+long
+syck_map_count( SyckNode *map )
+{
+    ASSERT( map != NULL );
+    ASSERT( map->data.pairs != NULL );
+    return map->data.pairs->idx;
+}
+
+void
+syck_map_assign( SyckNode *map, enum map_part p, long idx, SYMID id )
+{
+    struct SyckMap *m;
+
+    ASSERT( map != NULL );
+    m = map->data.pairs;
+    ASSERT( m != NULL );
+    if ( p == map_key )
+    {
+        m->keys[idx] = id;
+    }
+    else
+    {
+        m->values[idx] = id;
+    }
+}
+
+SYMID
+syck_map_read( SyckNode *map, enum map_part p, long idx )
+{
+    struct SyckMap *m;
+
+    ASSERT( map != NULL );
+    m = map->data.pairs;
+    ASSERT( m != NULL );
+    if ( p == map_key )
+    {
+        return m->keys[idx];
+    }
+    else
+    {
+        return m->values[idx];
+    }
+}
+
+SyckNode *
+syck_new_seq( SYMID value )
+{
+    SyckNode *n;
+
+    n = syck_alloc_seq();
+    syck_seq_add( n, value );
+
+    return n;
+}
+
+void
+syck_seq_empty( SyckNode *n )
+{
+    struct SyckSeq *s;
+    ASSERT( n != NULL );
+    ASSERT( n->data.list != NULL );
+
+    S_FREE( n->data.list->items );
+    s = n->data.list;
+    s->idx = 0;
+    s->capa = ALLOC_CT;
+    s->items = S_ALLOC_N( SYMID, s->capa );
+}
+
+void
+syck_seq_add( SyckNode *arr, SYMID value )
+{
+    struct SyckSeq *s;
+    long idx;
+
+    ASSERT( arr != NULL );
+    ASSERT( arr->data.list != NULL );
+    
+    s = arr->data.list;
+    idx = s->idx;
+    s->idx += 1;
+    if ( s->idx > s->capa )
+    {
+        s->capa += ALLOC_CT;
+        S_REALLOC_N( s->items, SYMID, s->capa );
+    }
+    s->items[idx] = value;
+}
+
+long
+syck_seq_count( SyckNode *seq )
+{
+    ASSERT( seq != NULL );
+    ASSERT( seq->data.list != NULL );
+    return seq->data.list->idx;
+}
+
+void
+syck_seq_assign( SyckNode *seq, long idx, SYMID id )
+{
+    struct SyckSeq *s;
+
+    ASSERT( map != NULL );
+    s = seq->data.list;
+    ASSERT( m != NULL );
+    s->items[idx] = id;
+}
+
+SYMID
+syck_seq_read( SyckNode *seq, long idx )
+{
+    struct SyckSeq *s;
+
+    ASSERT( seq != NULL );
+    s = seq->data.list;
+    ASSERT( s != NULL );
+    return s->items[idx];
+}
+
+void
+syck_free_members( SyckNode *n )
+{
+    if ( n == NULL ) return;
+
+    switch ( n->kind  )
+    {
+        case syck_str_kind:
+            if ( n->data.str != NULL ) 
+            {
+                S_FREE( n->data.str->ptr );
+                n->data.str->ptr = NULL;
+                n->data.str->len = 0;
+                S_FREE( n->data.str );
+                n->data.str = NULL;
+            }
+        break;
+
+        case syck_seq_kind:
+            if ( n->data.list != NULL )
+            {
+                S_FREE( n->data.list->items );
+                S_FREE( n->data.list );
+                n->data.list = NULL;
+            }
+        break;
+
+        case syck_map_kind:
+            if ( n->data.pairs != NULL )
+            {
+                S_FREE( n->data.pairs->keys );
+                S_FREE( n->data.pairs->values );
+                S_FREE( n->data.pairs );
+                n->data.pairs = NULL;
+            }
+        break;
+    }
+}
+
diff --git a/ruby_1_8_6/ext/syck/rubyext.c b/ruby_1_8_6/ext/syck/rubyext.c
new file mode 100644
index 0000000000..078de4f78d
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/rubyext.c
@@ -0,0 +1,2367 @@
+/* -*- indent-tabs-mode: nil -*- */
+/*
+ * rubyext.c
+ *
+ * $Author$
+ * $Date$
+ *
+ * Copyright (C) 2003-2005 why the lucky stiff
+ */
+
+#include "ruby.h"
+#include "syck.h"
+#include <sys/types.h>
+#include <time.h>
+
+typedef struct RVALUE {
+    union {
+#if 0
+    struct {
+        unsigned long flags;    /* always 0 for freed obj */
+        struct RVALUE *next;
+    } free;
+#endif
+    struct RBasic  basic;
+    struct RObject object;
+    struct RClass  klass;
+    /*struct RFloat  flonum;*/
+    /*struct RString string;*/
+    struct RArray  array;
+    /*struct RRegexp regexp;*/
+    struct RHash   hash;
+    /*struct RData   data;*/
+    struct RStruct rstruct;
+    /*struct RBignum bignum;*/
+    /*struct RFile   file;*/
+    } as;
+} RVALUE;
+
+typedef struct {
+   long hash;
+   char *buffer;
+   long length;
+   long remaining;
+   int  printed;
+} bytestring_t;
+
+#define RUBY_DOMAIN   "ruby.yaml.org,2002"
+
+/*
+ * symbols and constants
+ */
+static ID s_new, s_utc, s_at, s_to_f, s_to_i, s_read, s_binmode, s_call, s_cmp, s_transfer, s_update, s_dup, s_haskey, s_match, s_keys, s_unpack, s_tr_bang, s_default_set, s_tag_read_class, s_tag_subclasses, s_resolver, s_push, s_emitter, s_level, s_detect_implicit, s_node_import, s_out, s_input, s_intern, s_transform, s_yaml_new, s_yaml_initialize, s_node_export, s_to_yaml, s_write, s_set_resolver;
+static ID s_tags, s_domain, s_kind, s_name, s_options, s_type_id, s_type_id_set, s_style, s_style_set, s_value, s_value_set;
+static VALUE sym_model, sym_generic, sym_input, sym_bytecode;
+static VALUE sym_scalar, sym_seq, sym_map;
+static VALUE sym_1quote, sym_2quote, sym_fold, sym_literal, sym_plain, sym_inline;
+static VALUE cDate, cNode, cMap, cSeq, cScalar, cOut, cParser, cResolver, cPrivateType, cDomainType, cYObject, cBadAlias, cDefaultKey, cMergeKey, cEmitter;
+static VALUE oDefaultResolver, oGenericResolver;
+
+/*
+ * my private collection of numerical oddities.
+ */
+static double S_zero()    { return 0.0; }
+static double S_one() { return 1.0; }
+static double S_inf() { return S_one() / S_zero(); }
+static double S_nan() { return S_zero() / S_zero(); }
+
+static VALUE syck_node_transform( VALUE );
+
+/*
+ * handler prototypes
+ */
+SYMID rb_syck_load_handler _((SyckParser *, SyckNode *));
+void rb_syck_err_handler _((SyckParser *, char *));
+SyckNode * rb_syck_bad_anchor_handler _((SyckParser *, char *));
+void rb_syck_output_handler _((SyckEmitter *, char *, long));
+void rb_syck_emitter_handler _((SyckEmitter *, st_data_t));
+int syck_parser_assign_io _((SyckParser *, VALUE *));
+VALUE syck_scalar_alloc _((VALUE class));
+VALUE syck_seq_alloc _((VALUE class));
+VALUE syck_map_alloc _((VALUE class));
+
+struct parser_xtra {
+    VALUE data;  /* Borrowed this idea from marshal.c to fix [ruby-core:8067] problem */
+    VALUE proc;
+    VALUE resolver;
+    int taint;
+};
+
+struct emitter_xtra {
+    VALUE oid;
+    VALUE data;
+    VALUE port;
+};
+
+/*
+ * Convert YAML to bytecode
+ */
+VALUE
+rb_syck_compile(self, port)
+    VALUE self, port;
+{
+    SYMID oid;
+    int taint;
+    char *ret;
+    VALUE bc;
+    bytestring_t *sav; 
+
+    SyckParser *parser = syck_new_parser();
+    taint = syck_parser_assign_io(parser, &port);
+    syck_parser_handler( parser, syck_yaml2byte_handler );
+    syck_parser_error_handler( parser, NULL );
+    syck_parser_implicit_typing( parser, 0 );
+    syck_parser_taguri_expansion( parser, 0 );
+    oid = syck_parse( parser );
+    syck_lookup_sym( parser, oid, (char **)&sav );
+
+    ret = S_ALLOCA_N( char, strlen( sav->buffer ) + 3 );
+    ret[0] = '\0';
+    strcat( ret, "D\n" );
+    strcat( ret, sav->buffer );
+
+    syck_free_parser( parser );
+
+    bc = rb_str_new2( ret );
+    if ( taint )      OBJ_TAINT( bc );
+    return bc;
+}
+
+/*
+ * read from io.
+ */
+long
+rb_syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
+{
+    long len = 0;
+
+    ASSERT( str != NULL );
+    max_size -= skip;
+
+    if ( max_size <= 0 ) max_size = 0;
+    else
+    {
+        /*
+         * call io#read.
+         */
+        VALUE src = (VALUE)str->ptr;
+        VALUE n = LONG2NUM(max_size);
+        VALUE str2 = rb_funcall2(src, s_read, 1, &n);
+        if (!NIL_P(str2))
+        {
+            StringValue(str2);
+            len = RSTRING(str2)->len;
+            memcpy( buf + skip, RSTRING(str2)->ptr, len );
+        }
+    }
+    len += skip;
+    buf[len] = '\0';
+    return len;
+}
+
+/*
+ * determine: are we reading from a string or io?
+ * (returns tainted? boolean)
+ */
+int
+syck_parser_assign_io(parser, pport)
+    SyckParser *parser;
+    VALUE *pport;
+{
+    int taint = Qtrue;
+    VALUE tmp, port = *pport;
+    if (!NIL_P(tmp = rb_check_string_type(port))) {
+        taint = OBJ_TAINTED(port); /* original taintedness */
+        port = tmp;
+        syck_parser_str( parser, RSTRING(port)->ptr, RSTRING(port)->len, NULL );
+    }
+    else if (rb_respond_to(port, s_read)) {
+        if (rb_respond_to(port, s_binmode)) {
+            rb_funcall2(port, s_binmode, 0, 0);
+        }
+        syck_parser_str( parser, (char *)port, 0, rb_syck_io_str_read );
+    }
+    else {
+        rb_raise(rb_eTypeError, "instance of IO needed");
+    }
+    *pport = port;
+    return taint;
+}
+
+/*
+ * Get value in hash by key, forcing an empty hash if nil.
+ */
+VALUE
+syck_get_hash_aref(hsh, key)
+    VALUE hsh, key;
+{
+   VALUE val = rb_hash_aref( hsh, key );
+   if ( NIL_P( val ) ) 
+   {
+       val = rb_hash_new();
+       rb_hash_aset(hsh, key, val);
+   }
+   return val;
+}
+
+/*
+ * creating timestamps
+ */
+SYMID
+rb_syck_mktime(str, len)
+    char *str;
+    long len;
+{
+    VALUE time;
+    char *ptr = str;
+    VALUE year = INT2FIX(0);
+    VALUE mon = INT2FIX(0);
+    VALUE day = INT2FIX(0);
+    VALUE hour = INT2FIX(0);
+    VALUE min = INT2FIX(0);
+    VALUE sec = INT2FIX(0);
+    long usec;
+
+    /* Year*/
+    if ( ptr[0] != '\0' && len > 0 ) {
+        year = INT2FIX(strtol(ptr, NULL, 10));
+    }
+
+    /* Month*/
+    ptr += 4;
+    if ( ptr[0] != '\0' && len > ptr - str ) {
+        while ( !ISDIGIT( *ptr ) ) ptr++;
+        mon = INT2FIX(strtol(ptr, NULL, 10));
+    }
+
+    /* Day*/
+    ptr += 2;
+    if ( ptr[0] != '\0' && len > ptr - str ) {
+        while ( !ISDIGIT( *ptr ) ) ptr++;
+        day = INT2FIX(strtol(ptr, NULL, 10));
+    }
+
+    /* Hour*/
+    ptr += 2;
+    if ( ptr[0] != '\0' && len > ptr - str ) {
+        while ( !ISDIGIT( *ptr ) ) ptr++;
+        hour = INT2FIX(strtol(ptr, NULL, 10));
+    }
+
+    /* Minute */
+    ptr += 2;
+    if ( ptr[0] != '\0' && len > ptr - str ) {
+        while ( !ISDIGIT( *ptr ) ) ptr++;
+        min = INT2FIX(strtol(ptr, NULL, 10));
+    }
+
+    /* Second */
+    ptr += 2;
+    if ( ptr[0] != '\0' && len > ptr - str ) {
+        while ( !ISDIGIT( *ptr ) ) ptr++;
+        sec = INT2FIX(strtol(ptr, NULL, 10));
+    }
+
+    /* Millisecond */
+    ptr += 2;
+    if ( len > ptr - str && *ptr == '.' )
+    {
+        char padded[] = "000000";
+        char *end = ptr + 1;
+        while ( isdigit( *end ) ) end++;
+        MEMCPY(padded, ptr + 1, char, end - (ptr + 1));
+        usec = strtol(padded, NULL, 10);
+    }
+    else
+    {
+        usec = 0;
+    }
+
+    /* Time Zone*/
+    while ( len > ptr - str && *ptr != 'Z' && *ptr != '+' && *ptr != '-' && *ptr != '\0' ) ptr++;
+    if ( len > ptr - str && ( *ptr == '-' || *ptr == '+' ) )
+    {
+        time_t tz_offset = strtol(ptr, NULL, 10) * 3600;
+        time_t tmp;
+
+        while ( *ptr != ':' && *ptr != '\0' ) ptr++;
+        if ( *ptr == ':' )
+        {
+            ptr += 1;
+            if ( tz_offset < 0 )
+            {
+                tz_offset -= strtol(ptr, NULL, 10) * 60;
+            }
+            else
+            {
+                tz_offset += strtol(ptr, NULL, 10) * 60;
+            }
+        }
+
+        /* Make TZ time*/
+        time = rb_funcall(rb_cTime, s_utc, 6, year, mon, day, hour, min, sec);
+        tmp = NUM2LONG(rb_funcall(time, s_to_i, 0)) - tz_offset;
+        return rb_funcall(rb_cTime, s_at, 2, LONG2NUM(tmp), LONG2NUM(usec));
+    }
+    else
+    {
+        /* Make UTC time*/
+        return rb_funcall(rb_cTime, s_utc, 7, year, mon, day, hour, min, sec, LONG2NUM(usec));
+    }
+}
+
+/*
+ * handles merging of an array of hashes
+ * (see http://www.yaml.org/type/merge/)
+ */
+VALUE
+syck_merge_i( entry, hsh )
+    VALUE entry, hsh;
+{
+    VALUE tmp;
+    if ( !NIL_P(tmp = rb_check_convert_type(entry, T_HASH, "Hash", "to_hash")) )
+    {
+        entry = tmp;
+        rb_funcall( hsh, s_update, 1, entry );
+    }
+    return Qnil;
+}
+
+/*
+ * default handler for ruby.yaml.org types
+ */
+int
+yaml_org_handler( n, ref )
+    SyckNode *n;
+    VALUE *ref;
+{
+    char *type_id = n->type_id;
+    int transferred = 0;
+    long i = 0;
+    VALUE obj = Qnil;
+
+    if ( type_id != NULL && strncmp( type_id, "tag:yaml.org,2002:", 18 ) == 0 )
+    {
+        type_id += 18;
+    }
+
+    switch (n->kind)
+    {
+        case syck_str_kind:
+            transferred = 1;
+            if ( type_id == NULL )
+            {
+                obj = rb_str_new( n->data.str->ptr, n->data.str->len );
+            }
+            else if ( strcmp( type_id, "null" ) == 0 )
+            {
+                obj = Qnil;
+            }
+            else if ( strcmp( type_id, "binary" ) == 0 )
+            {
+                VALUE arr;
+                obj = rb_str_new( n->data.str->ptr, n->data.str->len );
+                rb_funcall( obj, s_tr_bang, 2, rb_str_new2( "\n\t " ), rb_str_new2( "" ) );
+                arr = rb_funcall( obj, s_unpack, 1, rb_str_new2( "m" ) );
+                obj = rb_ary_shift( arr );
+            }
+            else if ( strcmp( type_id, "bool#yes" ) == 0 )
+            {
+                obj = Qtrue;
+            }
+            else if ( strcmp( type_id, "bool#no" ) == 0 )
+            {
+                obj = Qfalse;
+            }
+            else if ( strcmp( type_id, "int#hex" ) == 0 )
+            {
+                syck_str_blow_away_commas( n );
+                obj = rb_cstr2inum( n->data.str->ptr, 16 );
+            }
+            else if ( strcmp( type_id, "int#oct" ) == 0 )
+            {
+                syck_str_blow_away_commas( n );
+                obj = rb_cstr2inum( n->data.str->ptr, 8 );
+            }
+            else if ( strcmp( type_id, "int#base60" ) == 0 )
+            {
+                char *ptr, *end;
+                long sixty = 1;
+                long total = 0;
+                syck_str_blow_away_commas( n );
+                ptr = n->data.str->ptr;
+                end = n->data.str->ptr + n->data.str->len;
+                while ( end > ptr )
+                {
+                    long bnum = 0;
+                    char *colon = end - 1;
+                    while ( colon >= ptr && *colon != ':' )
+                    {
+                        colon--;
+                    }
+                    if ( colon >= ptr && *colon == ':' ) *colon = '\0';
+
+                    bnum = strtol( colon + 1, NULL, 10 );
+                    total += bnum * sixty;
+                    sixty *= 60;
+                    end = colon;
+                }
+                obj = INT2FIX(total);
+            }
+            else if ( strncmp( type_id, "int", 3 ) == 0 )
+            {
+                syck_str_blow_away_commas( n );
+                obj = rb_cstr2inum( n->data.str->ptr, 10 );
+            }
+            else if ( strcmp( type_id, "float#base60" ) == 0 )
+            {
+                char *ptr, *end;
+                long sixty = 1;
+                double total = 0.0;
+                syck_str_blow_away_commas( n );
+                ptr = n->data.str->ptr;
+                end = n->data.str->ptr + n->data.str->len;
+                while ( end > ptr )
+                {
+                    double bnum = 0;
+                    char *colon = end - 1;
+                    while ( colon >= ptr && *colon != ':' )
+                    {
+                        colon--;
+                    }
+                    if ( colon >= ptr && *colon == ':' ) *colon = '\0';
+
+                    bnum = strtod( colon + 1, NULL );
+                    total += bnum * sixty;
+                    sixty *= 60;
+                    end = colon;
+                }
+                obj = rb_float_new( total );
+            }
+            else if ( strcmp( type_id, "float#nan" ) == 0 )
+            {
+                obj = rb_float_new( S_nan() );
+            }
+            else if ( strcmp( type_id, "float#inf" ) == 0 )
+            {
+                obj = rb_float_new( S_inf() );
+            }
+            else if ( strcmp( type_id, "float#neginf" ) == 0 )
+            {
+                obj = rb_float_new( -S_inf() );
+            }
+            else if ( strncmp( type_id, "float", 5 ) == 0 )
+            {
+                double f;
+                syck_str_blow_away_commas( n );
+                f = strtod( n->data.str->ptr, NULL );
+                obj = rb_float_new( f );
+            }
+            else if ( strcmp( type_id, "timestamp#iso8601" ) == 0 )
+            {
+                obj = rb_syck_mktime( n->data.str->ptr, n->data.str->len );
+            }
+            else if ( strcmp( type_id, "timestamp#spaced" ) == 0 )
+            {
+                obj = rb_syck_mktime( n->data.str->ptr, n->data.str->len );
+            }
+            else if ( strcmp( type_id, "timestamp#ymd" ) == 0 )
+            {
+                char *ptr = n->data.str->ptr;
+                VALUE year, mon, day;
+
+                /* Year*/
+                ptr[4] = '\0';
+                year = INT2FIX(strtol(ptr, NULL, 10));
+
+                /* Month*/
+                ptr += 4;
+                while ( !ISDIGIT( *ptr ) ) ptr++;
+                mon = INT2FIX(strtol(ptr, NULL, 10));
+
+                /* Day*/
+                ptr += 2;
+                while ( !ISDIGIT( *ptr ) ) ptr++;
+                day = INT2FIX(strtol(ptr, NULL, 10));
+
+                if ( !cDate ) {
+                    /*
+                     * Load Date module
+                     */
+                    rb_require( "date" );
+                    cDate = rb_const_get( rb_cObject, rb_intern("Date") );
+                }
+
+                obj = rb_funcall( cDate, s_new, 3, year, mon, day );
+            }
+            else if ( strncmp( type_id, "timestamp", 9 ) == 0 )
+            {
+                obj = rb_syck_mktime( n->data.str->ptr, n->data.str->len );
+            }
+            else if ( strncmp( type_id, "merge", 5 ) == 0 )
+            {
+                obj = rb_funcall( cMergeKey, s_new, 0 );
+            }
+            else if ( strncmp( type_id, "default", 7 ) == 0 )
+            {
+                obj = rb_funcall( cDefaultKey, s_new, 0 );
+            }
+            else if ( n->data.str->style == scalar_plain &&
+                      n->data.str->len > 1 && 
+                      strncmp( n->data.str->ptr, ":", 1 ) == 0 )
+            {
+                obj = rb_funcall( oDefaultResolver, s_transfer, 2, 
+                                  rb_str_new2( "tag:ruby.yaml.org,2002:sym" ), 
+                                  rb_str_new( n->data.str->ptr + 1, n->data.str->len - 1 ) );
+            }
+            else if ( strcmp( type_id, "str" ) == 0 )
+            {
+                obj = rb_str_new( n->data.str->ptr, n->data.str->len );
+            }
+            else
+            {
+                transferred = 0;
+                obj = rb_str_new( n->data.str->ptr, n->data.str->len );
+            }
+        break;
+
+        case syck_seq_kind:
+            if ( type_id == NULL || strcmp( type_id, "seq" ) == 0 )
+            {
+                transferred = 1;
+            }
+            obj = rb_ary_new2( n->data.list->idx );
+            for ( i = 0; i < n->data.list->idx; i++ )
+            {
+                rb_ary_store( obj, i, syck_seq_read( n, i ) );
+            }
+        break;
+
+        case syck_map_kind:
+            if ( type_id == NULL || strcmp( type_id, "map" ) == 0 )
+            {
+                transferred = 1;
+            }
+            obj = rb_hash_new();
+            for ( i = 0; i < n->data.pairs->idx; i++ )
+            {
+                VALUE k = syck_map_read( n, map_key, i );
+                VALUE v = syck_map_read( n, map_value, i );
+                int skip_aset = 0;
+
+                /*
+                 * Handle merge keys
+                 */
+                if ( rb_obj_is_kind_of( k, cMergeKey ) )
+                {
+                    VALUE tmp;
+                    if ( !NIL_P(tmp = rb_check_convert_type(v, T_HASH, "Hash", "to_hash")) )
+                    {
+                        VALUE dup = rb_funcall( tmp, s_dup, 0 );
+                        rb_funcall( dup, s_update, 1, obj );
+                        obj = dup;
+                        skip_aset = 1;
+                    }
+                    else if ( !NIL_P(tmp = rb_check_array_type(v)) )
+                    {
+                        VALUE end = rb_ary_pop( tmp );
+                        VALUE tmph = rb_check_convert_type(end, T_HASH, "Hash", "to_hash");
+                        if ( !NIL_P(tmph) )
+                        {
+                            VALUE dup = rb_funcall( tmph, s_dup, 0 );
+                            tmp = rb_ary_reverse( tmp );
+                            rb_ary_push( tmp, obj );
+                            rb_iterate( rb_each, tmp, syck_merge_i, dup );
+                            obj = dup;
+                            skip_aset = 1;
+                        }
+                    }
+                }
+                else if ( rb_obj_is_kind_of( k, cDefaultKey ) )
+                {
+                    rb_funcall( obj, s_default_set, 1, v );
+                    skip_aset = 1;
+                }
+
+                if ( ! skip_aset )
+                {
+                    rb_hash_aset( obj, k, v );
+                }
+            }
+        break;
+    }
+
+    *ref = obj;
+    return transferred;
+}
+
+static void syck_node_mark( SyckNode *n );
+
+/*
+ * {native mode} node handler
+ * - Converts data into native Ruby types
+ */
+SYMID
+rb_syck_load_handler(p, n)
+    SyckParser *p;
+    SyckNode *n;
+{
+    VALUE obj = Qnil;
+    struct parser_xtra *bonus = (struct parser_xtra *)p->bonus;
+    VALUE resolver = bonus->resolver;
+    if ( NIL_P( resolver ) )
+    {
+        resolver = oDefaultResolver;
+    }
+
+    /*
+     * Create node, 
+     */
+    obj = rb_funcall( resolver, s_node_import, 1, Data_Wrap_Struct( cNode, NULL, NULL, n ) );
+
+    /*
+     * ID already set, let's alter the symbol table to accept the new object
+     */
+    if (n->id > 0 && !NIL_P(obj))
+    {
+        MEMCPY((void *)n->id, (void *)obj, RVALUE, 1);
+        MEMZERO((void *)obj, RVALUE, 1);
+        obj = n->id;
+    }
+
+    if ( bonus->taint)      OBJ_TAINT( obj );
+    if ( bonus->proc != 0 ) rb_funcall(bonus->proc, s_call, 1, obj);
+
+    rb_hash_aset(bonus->data, INT2FIX(RHASH(bonus->data)->tbl->num_entries), obj);
+    return obj;
+}
+
+/*
+ * friendly errors.
+ */
+void
+rb_syck_err_handler(p, msg)
+    SyckParser *p;
+    char *msg;
+{
+    char *endl = p->cursor;
+
+    while ( *endl != '\0' && *endl != '\n' )
+        endl++;
+
+    endl[0] = '\0';
+    rb_raise(rb_eArgError, "%s on line %d, col %d: `%s'",
+           msg,
+           p->linect,
+           p->cursor - p->lineptr, 
+           p->lineptr); 
+}
+
+/*
+ * provide bad anchor object to the parser.
+ */
+SyckNode *
+rb_syck_bad_anchor_handler(p, a)
+    SyckParser *p;
+    char *a;
+{
+    VALUE anchor_name = rb_str_new2( a );
+    SyckNode *badanc = syck_new_map( rb_str_new2( "name" ), anchor_name );
+    badanc->type_id = syck_strndup( "tag:ruby.yaml.org,2002:object:YAML::Syck::BadAlias", 53 );
+    return badanc;
+}
+
+/*
+ * data loaded based on the model requested.
+ */
+void
+syck_set_model( p, input, model )
+    VALUE p, input, model;
+{
+    SyckParser *parser;
+    Data_Get_Struct(p, SyckParser, parser);
+    syck_parser_handler( parser, rb_syck_load_handler );
+    /* WARN: gonna be obsoleted soon!! */
+    if ( model == sym_generic )
+    {
+        rb_funcall( p, s_set_resolver, 1, oGenericResolver );
+    }
+    syck_parser_implicit_typing( parser, 1 );
+    syck_parser_taguri_expansion( parser, 1 );
+
+    if ( NIL_P( input ) )
+    {
+        input = rb_ivar_get( p, s_input ); 
+    }
+    if ( input == sym_bytecode )
+    {
+        syck_parser_set_input_type( parser, syck_bytecode_utf8 );
+    }
+    else
+    {
+        syck_parser_set_input_type( parser, syck_yaml_utf8 );
+    }
+    syck_parser_error_handler( parser, rb_syck_err_handler );
+    syck_parser_bad_anchor_handler( parser, rb_syck_bad_anchor_handler );
+}
+
+static int
+syck_st_mark_nodes( char *key, SyckNode *n, char *arg )
+{
+    if ( n != (void *)1 ) syck_node_mark( n );
+    return ST_CONTINUE;
+}
+
+/*
+ * mark parser nodes
+ */
+static void
+syck_mark_parser(parser)
+    SyckParser *parser;
+{
+    struct parser_xtra *bonus = (struct parser_xtra *)parser->bonus;
+    rb_gc_mark_maybe(parser->root);
+    rb_gc_mark_maybe(parser->root_on_error);
+    rb_gc_mark( bonus->data );
+    rb_gc_mark( bonus->proc );
+    rb_gc_mark( bonus->resolver );
+
+    if ( parser->anchors != NULL )
+    {
+        st_foreach( parser->anchors, syck_st_mark_nodes, 0 );
+    }
+    if ( parser->bad_anchors != NULL )
+    {
+        st_foreach( parser->bad_anchors, syck_st_mark_nodes, 0 );
+    }
+}
+
+/*
+ * Free the parser and any bonus attachment.
+ */
+void
+rb_syck_free_parser(p)
+    SyckParser *p;
+{
+    S_FREE( p->bonus );
+    syck_free_parser(p);
+}
+
+/*
+ * YAML::Syck::Parser.allocate
+ */
+VALUE syck_parser_s_alloc _((VALUE));
+VALUE 
+syck_parser_s_alloc(class)
+    VALUE class;
+{
+    VALUE pobj;
+    SyckParser *parser = syck_new_parser();
+
+    parser->bonus = S_ALLOC( struct parser_xtra );
+    S_MEMZERO( parser->bonus, struct parser_xtra, 1 );
+
+    pobj = Data_Wrap_Struct( class, syck_mark_parser, rb_syck_free_parser, parser );
+
+    syck_parser_set_root_on_error( parser, Qnil );
+
+    return pobj;
+}
+
+/*
+ * YAML::Syck::Parser.initialize( resolver, options )
+ */
+static VALUE
+syck_parser_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE options;
+    if (rb_scan_args(argc, argv, "01", &options) == 0)
+    {
+        options = rb_hash_new();
+    }
+    else
+    {
+        Check_Type(options, T_HASH);
+    }
+    rb_ivar_set(self, s_options, options);
+    rb_ivar_set(self, s_input, Qnil);
+    return self;
+}
+
+/*
+ * YAML::Syck::Parser.bufsize = Integer
+ */
+static VALUE
+syck_parser_bufsize_set( self, size )
+    VALUE self, size;
+{
+    SyckParser *parser;
+
+    if ( rb_respond_to( size, s_to_i ) ) {
+        int n = NUM2INT(rb_funcall(size, s_to_i, 0));
+        Data_Get_Struct(self, SyckParser, parser);
+        parser->bufsize = n;
+    }
+    return self;
+}
+
+/*
+ * YAML::Syck::Parser.bufsize => Integer
+ */
+static VALUE
+syck_parser_bufsize_get( self )
+    VALUE self;
+{
+    SyckParser *parser;
+
+    Data_Get_Struct(self, SyckParser, parser);
+    return INT2FIX( parser->bufsize );
+}
+
+/*
+ * YAML::Syck::Parser.load( IO or String )
+ */
+VALUE
+syck_parser_load(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE port, proc, model, input;
+    SyckParser *parser;
+    struct parser_xtra *bonus;
+
+    rb_scan_args(argc, argv, "11", &port, &proc);
+
+    input = rb_hash_aref( rb_attr_get( self, s_options ), sym_input );
+    model = rb_hash_aref( rb_attr_get( self, s_options ), sym_model );
+    Data_Get_Struct(self, SyckParser, parser);
+    syck_set_model( self, input, model );
+
+    bonus = (struct parser_xtra *)parser->bonus;
+    bonus->taint = syck_parser_assign_io(parser, &port);
+    bonus->data = rb_hash_new();
+    bonus->resolver = rb_attr_get( self, s_resolver );
+    if ( NIL_P( proc ) ) bonus->proc = 0;
+    else                 bonus->proc = proc;
+
+    return syck_parse( parser );
+}
+
+/*
+ * YAML::Syck::Parser.load_documents( IO or String ) { |doc| }
+ */
+VALUE
+syck_parser_load_documents(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE port, proc, v, input, model;
+    SyckParser *parser;
+    struct parser_xtra *bonus;
+
+    rb_scan_args(argc, argv, "1&", &port, &proc);
+
+    input = rb_hash_aref( rb_attr_get( self, s_options ), sym_input );
+    model = rb_hash_aref( rb_attr_get( self, s_options ), sym_model );
+    Data_Get_Struct(self, SyckParser, parser);
+    syck_set_model( self, input, model );
+    
+    bonus = (struct parser_xtra *)parser->bonus;
+    bonus->taint = syck_parser_assign_io(parser, &port);
+    bonus->resolver = rb_attr_get( self, s_resolver );
+    bonus->proc = 0;
+
+    while ( 1 )
+    {
+        /* Reset hash for tracking nodes */
+        bonus->data = rb_hash_new();
+
+        /* Parse a document */
+        v = syck_parse( parser );
+        if ( parser->eof == 1 )
+        {
+            break;
+        }
+
+        /* Pass document to block */
+        rb_funcall( proc, s_call, 1, v );
+    }
+
+    return Qnil;
+}
+
+/*
+ * YAML::Syck::Parser#set_resolver
+ */
+VALUE
+syck_parser_set_resolver( self, resolver )
+    VALUE self, resolver;
+{
+    rb_ivar_set( self, s_resolver, resolver );
+    return self;
+}
+
+/*
+ * YAML::Syck::Resolver.initialize
+ */
+static VALUE
+syck_resolver_initialize( self )
+    VALUE self;
+{
+    VALUE tags = rb_hash_new();
+    rb_ivar_set(self, s_tags, rb_hash_new());
+    return self;
+}
+
+/*
+ * YAML::Syck::Resolver#add_type
+ */
+VALUE
+syck_resolver_add_type( self, taguri, cls )
+    VALUE self, taguri, cls;
+{
+    VALUE tags = rb_attr_get(self, s_tags);
+    rb_hash_aset( tags, taguri, cls );
+    return Qnil;
+}
+
+/*
+ * YAML::Syck::Resolver#use_types_at
+ */
+VALUE
+syck_resolver_use_types_at( self, hsh )
+    VALUE self, hsh;
+{
+    rb_ivar_set( self, s_tags, hsh );
+    return Qnil;
+}
+
+/*
+ * YAML::Syck::Resolver#detect_implicit 
+ */
+VALUE
+syck_resolver_detect_implicit( self, val )
+    VALUE self, val;
+{
+    char *type_id;
+    return rb_str_new2( "" );
+}
+
+/*
+ * YAML::Syck::Resolver#node_import
+ */
+VALUE
+syck_resolver_node_import( self, node )
+    VALUE self, node;
+{
+    SyckNode *n;
+    VALUE obj;
+    int i = 0;
+    Data_Get_Struct(node, SyckNode, n);
+
+    switch (n->kind)
+    {
+        case syck_str_kind:
+            obj = rb_str_new( n->data.str->ptr, n->data.str->len );
+        break;
+
+        case syck_seq_kind:
+            obj = rb_ary_new2( n->data.list->idx );
+            for ( i = 0; i < n->data.list->idx; i++ )
+            {
+                rb_ary_store( obj, i, syck_seq_read( n, i ) );
+            }
+        break;
+
+        case syck_map_kind:
+            obj = rb_hash_new();
+            for ( i = 0; i < n->data.pairs->idx; i++ )
+            {
+                VALUE k = syck_map_read( n, map_key, i );
+                VALUE v = syck_map_read( n, map_value, i );
+                int skip_aset = 0;
+
+                /*
+                 * Handle merge keys
+                 */
+                if ( rb_obj_is_kind_of( k, cMergeKey ) )
+                {
+                    if ( rb_obj_is_kind_of( v, rb_cHash ) )
+                    {
+                        VALUE dup = rb_funcall( v, s_dup, 0 );
+                        rb_funcall( dup, s_update, 1, obj );
+                        obj = dup;
+                        skip_aset = 1;
+                    }
+                    else if ( rb_obj_is_kind_of( v, rb_cArray ) )
+                    {
+                        VALUE end = rb_ary_pop( v );
+                        if ( rb_obj_is_kind_of( end, rb_cHash ) )
+                        {
+                            VALUE dup = rb_funcall( end, s_dup, 0 );
+                            v = rb_ary_reverse( v );
+                            rb_ary_push( v, obj );
+                            rb_iterate( rb_each, v, syck_merge_i, dup );
+                            obj = dup;
+                            skip_aset = 1;
+                        }
+                    }
+                }
+                else if ( rb_obj_is_kind_of( k, cDefaultKey ) )
+                {
+                    rb_funcall( obj, s_default_set, 1, v );
+                    skip_aset = 1;
+                }
+
+                if ( ! skip_aset )
+                {
+                    rb_hash_aset( obj, k, v );
+                }
+            }
+        break;
+    }
+
+    if ( n->type_id != NULL )
+    {
+        obj = rb_funcall( self, s_transfer, 2, rb_str_new2( n->type_id ), obj );
+    }
+    return obj;
+}
+
+/*
+ * Set instance variables
+ */
+VALUE
+syck_set_ivars( vars, obj )
+        VALUE vars, obj;
+{
+    VALUE ivname = rb_ary_entry( vars, 0 );
+    char *ivn;
+    StringValue( ivname );
+    ivn = S_ALLOCA_N( char, RSTRING(ivname)->len + 2 );
+    ivn[0] = '@';
+    ivn[1] = '\0';
+    strncat( ivn, RSTRING(ivname)->ptr, RSTRING(ivname)->len );
+    rb_iv_set( obj, ivn, rb_ary_entry( vars, 1 ) );
+    return Qnil;
+}
+
+/*
+ * YAML::Syck::Resolver#const_find
+ */
+VALUE
+syck_const_find( const_name )
+    VALUE const_name;
+{
+    VALUE tclass = rb_cObject;
+    VALUE tparts = rb_str_split( const_name, "::" );
+    int i = 0;
+    for ( i = 0; i < RARRAY(tparts)->len; i++ ) {
+        VALUE tpart = rb_to_id( rb_ary_entry( tparts, i ) );
+        if ( !rb_const_defined( tclass, tpart ) ) return Qnil;
+        tclass = rb_const_get( tclass, tpart );
+    }
+    return tclass;
+}
+
+/*
+ * YAML::Syck::Resolver#transfer
+ */
+VALUE
+syck_resolver_transfer( self, type, val )
+    VALUE self, type, val;
+{
+    if (NIL_P(type) || RSTRING(StringValue(type))->len == 0) 
+    {
+        type = rb_funcall( self, s_detect_implicit, 1, val );
+    }
+
+    if ( ! (NIL_P(type) || RSTRING(StringValue(type))->len == 0) )
+    {
+        VALUE str_xprivate = rb_str_new2( "x-private" );
+        VALUE colon = rb_str_new2( ":" );
+        VALUE tags = rb_attr_get(self, s_tags);
+        VALUE target_class = rb_hash_aref( tags, type );
+        VALUE subclass = target_class;
+        VALUE obj = Qnil;
+
+        /*
+         * Should no tag match exactly, check for subclass format
+         */
+        if ( NIL_P( target_class ) )
+        {
+            VALUE subclass_parts = rb_ary_new();
+            VALUE parts = rb_str_split( type, ":" );
+
+            while ( RARRAY(parts)->len > 1 )
+            {
+                VALUE partial;
+                rb_ary_unshift( subclass_parts, rb_ary_pop( parts ) );
+                partial = rb_ary_join( parts, colon );
+                target_class = rb_hash_aref( tags, partial );
+                if ( NIL_P( target_class ) )
+                {
+                    rb_str_append( partial, colon );
+                    target_class = rb_hash_aref( tags, partial );
+                }
+
+                /*
+                 * Possible subclass found, see if it supports subclassing
+                 */
+                if ( ! NIL_P( target_class ) )
+                {
+                    subclass = target_class;
+                    if ( RARRAY(subclass_parts)->len > 0 && rb_respond_to( target_class, s_tag_subclasses ) &&
+                         RTEST( rb_funcall( target_class, s_tag_subclasses, 0 ) ) )
+                    {
+                        VALUE subclass_v;
+                        subclass = rb_ary_join( subclass_parts, colon );
+                        subclass = rb_funcall( target_class, s_tag_read_class, 1, subclass );
+                        subclass_v = syck_const_find( subclass );
+
+                        if ( subclass_v != Qnil ) 
+                        {
+                            subclass = subclass_v;
+                        }
+                        else if ( rb_cObject == target_class && subclass_v == Qnil )
+                        {
+                            target_class = cYObject;
+                            type = subclass;
+                            subclass = cYObject;
+                        }
+                        else /* workaround for SEGV. real fix please */
+                        {
+                            rb_raise( rb_eTypeError, "invalid subclass" );
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+
+        /* rb_raise(rb_eTypeError, "invalid typing scheme: %s given",
+         *         scheme);
+         */
+
+        if ( rb_respond_to( target_class, s_call ) )
+        {
+            obj = rb_funcall( target_class, s_call, 2, type, val );
+        }
+        else
+        {
+            if ( rb_respond_to( target_class, s_yaml_new ) )
+            {
+                obj = rb_funcall( target_class, s_yaml_new, 3, subclass, type, val );
+            }
+            else if ( !NIL_P( target_class ) )
+            {
+                if ( subclass == rb_cBignum )
+                {
+                    obj = rb_str2inum( val, 10 ); /* for yaml dumped by 1.8.3 [ruby-core:6159] */
+                }
+                else
+                {
+                    obj = rb_obj_alloc( subclass );
+                }
+
+                if ( rb_respond_to( obj, s_yaml_initialize ) )
+                {
+                    rb_funcall( obj, s_yaml_initialize, 2, type, val );
+                }
+                else if ( !NIL_P( obj ) && rb_obj_is_instance_of( val, rb_cHash ) )
+                {
+                    rb_iterate( rb_each, val, syck_set_ivars, obj );
+                }
+            }
+            else 
+            {
+                VALUE parts = rb_str_split( type, ":" );
+                VALUE scheme = rb_ary_shift( parts );
+                if ( rb_str_cmp( scheme, str_xprivate ) == 0 )
+                {
+                    VALUE name = rb_ary_join( parts, colon );
+                    obj = rb_funcall( cPrivateType, s_new, 2, name, val );
+                }
+                else
+                {
+                    VALUE domain = rb_ary_shift( parts );
+                    VALUE name = rb_ary_join( parts, colon );
+                    obj = rb_funcall( cDomainType, s_new, 3, domain, name, val );
+                }
+            }
+        }
+        val = obj;
+    }
+
+    return val;
+}
+
+/*
+ * YAML::Syck::Resolver#tagurize
+ */
+VALUE
+syck_resolver_tagurize( self, val )
+    VALUE self, val;
+{
+    VALUE tmp = rb_check_string_type(val);
+
+    if ( !NIL_P(tmp) )
+    {
+        char *taguri = syck_type_id_to_uri( RSTRING(tmp)->ptr );
+        val = rb_str_new2( taguri );
+        S_FREE( taguri );
+    }
+
+    return val;
+}
+
+/*
+ * YAML::Syck::DefaultResolver#detect_implicit 
+ */
+VALUE
+syck_defaultresolver_detect_implicit( self, val )
+    VALUE self, val;
+{
+    char *type_id;
+    VALUE tmp = rb_check_string_type(val);
+
+    if ( !NIL_P(tmp) )
+    {
+        val = tmp;
+        type_id = syck_match_implicit( RSTRING(val)->ptr, RSTRING(val)->len );
+        return rb_str_new2( type_id );
+    }
+
+    return rb_str_new2( "" );
+}
+
+/*
+ * YAML::Syck::DefaultResolver#node_import
+ */
+VALUE
+syck_defaultresolver_node_import( self, node )
+    VALUE self, node;
+{
+    SyckNode *n;
+    VALUE obj;
+    Data_Get_Struct( node, SyckNode, n );
+    if ( !yaml_org_handler( n, &obj ) )
+    {
+        obj = rb_funcall( self, s_transfer, 2, rb_str_new2( n->type_id ), obj );
+    }
+    return obj;
+}
+
+/*
+ * YAML::Syck::GenericResolver#node_import
+ */
+VALUE
+syck_genericresolver_node_import( self, node )
+    VALUE self, node;
+{
+    SyckNode *n;
+    int i = 0;
+    VALUE t = Qnil, obj = Qnil, v = Qnil, style = Qnil;
+    Data_Get_Struct(node, SyckNode, n);
+
+    if ( n->type_id != NULL )
+    {
+        t = rb_str_new2(n->type_id);
+    }
+
+    switch (n->kind)
+    {
+        case syck_str_kind:
+        {
+            v = rb_str_new( n->data.str->ptr, n->data.str->len );
+            if ( n->data.str->style == scalar_1quote )
+            {
+                style = sym_1quote;
+            } 
+            else if ( n->data.str->style == scalar_2quote )
+            {
+                style = sym_2quote;
+            } 
+            else if ( n->data.str->style == scalar_fold )
+            {
+                style = sym_fold;
+            } 
+            else if ( n->data.str->style == scalar_literal )
+            {
+                style = sym_literal;
+            } 
+            else if ( n->data.str->style == scalar_plain )
+            {
+                style = sym_plain;
+            }
+            obj = rb_funcall( cScalar, s_new, 3, t, v, style );
+        }
+        break;
+
+        case syck_seq_kind:
+            rb_iv_set(obj, "@kind", sym_seq);
+            v = rb_ary_new2( syck_seq_count( n ) );
+            for ( i = 0; i < syck_seq_count( n ); i++ )
+            {
+                rb_ary_store( v, i, syck_seq_read( n, i ) );
+            }
+            if ( n->data.list->style == seq_inline )
+            {
+                style = sym_inline;
+            } 
+            obj = rb_funcall( cSeq, s_new, 3, t, v, style );
+        break;
+
+        case syck_map_kind:
+            rb_iv_set(obj, "@kind", sym_map);
+            v = rb_hash_new();
+            for ( i = 0; i < syck_map_count( n ); i++ )
+            {
+                rb_hash_aset( v, syck_map_read( n, map_key, i ), syck_map_read( n, map_value, i ) );
+            }
+            if ( n->data.pairs->style == map_inline )
+            {
+                style = sym_inline;
+            } 
+            obj = rb_funcall( cMap, s_new, 3, t, v, style );
+        break;
+    }
+
+    return obj;
+}
+
+/*
+ * YAML::Syck::BadAlias.initialize
+ */
+VALUE
+syck_badalias_initialize( self, val )
+    VALUE self, val;
+{
+    rb_iv_set( self, "@name", val );
+    return self;
+}
+
+/*
+ * YAML::Syck::BadAlias.<=>
+ */
+VALUE
+syck_badalias_cmp( alias1, alias2 )
+    VALUE alias1, alias2;
+{
+    VALUE str1 = rb_ivar_get( alias1, s_name ); 
+    VALUE str2 = rb_ivar_get( alias2, s_name ); 
+    VALUE val = rb_funcall( str1, s_cmp, 1, str2 );
+    return val;
+}
+
+/*
+ * YAML::DomainType.initialize
+ */
+VALUE
+syck_domaintype_initialize( self, domain, type_id, val )
+    VALUE self, domain, type_id, val;
+{
+    rb_iv_set( self, "@domain", domain );
+    rb_iv_set( self, "@type_id", type_id );
+    rb_iv_set( self, "@value", val );
+    return self;
+}
+
+/*
+ * YAML::Object.initialize
+ */
+VALUE
+syck_yobject_initialize( self, klass, ivars )
+    VALUE self, klass, ivars;
+{
+    rb_iv_set( self, "@class", klass );
+    rb_iv_set( self, "@ivars", ivars );
+    return self;
+}
+
+/*
+ * YAML::PrivateType.initialize
+ */
+VALUE
+syck_privatetype_initialize( self, type_id, val )
+    VALUE self, type_id, val;
+{
+    rb_iv_set( self, "@type_id", type_id );
+    rb_iv_set( self, "@value", val );
+    return self;
+}
+
+/*
+ * Mark node contents.
+ */
+static void
+syck_node_mark( n )
+    SyckNode *n;
+{
+    int i;
+    rb_gc_mark_maybe( n->id );
+    switch ( n->kind )
+    {
+        case syck_seq_kind:
+            for ( i = 0; i < n->data.list->idx; i++ )
+            {
+                rb_gc_mark( syck_seq_read( n, i ) );
+            }
+        break;
+
+        case syck_map_kind:
+            for ( i = 0; i < n->data.pairs->idx; i++ )
+            {
+                rb_gc_mark( syck_map_read( n, map_key, i ) );
+                rb_gc_mark( syck_map_read( n, map_value, i ) );
+            }
+        break;
+    }
+#if 0 /* maybe needed */
+    if ( n->shortcut ) syck_node_mark( n->shortcut ); /* caution: maybe cyclic */
+#endif
+}
+
+/*
+ * YAML::Syck::Scalar.allocate
+ */
+VALUE
+syck_scalar_alloc( class )
+    VALUE class;
+{
+    SyckNode *node = syck_alloc_str();
+    VALUE obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
+    node->id = obj;
+    return obj;
+}
+
+/*
+ * YAML::Syck::Scalar.initialize
+ */
+VALUE
+syck_scalar_initialize( self, type_id, val, style )
+    VALUE self, type_id, val, style;
+{
+    rb_iv_set( self, "@kind", sym_scalar );
+    rb_funcall( self, s_type_id_set, 1, type_id );
+    rb_funcall( self, s_value_set, 1, val );
+    rb_funcall( self, s_style_set, 1, style );
+    return self;
+}
+
+/*
+ * YAML::Syck::Scalar.style=
+ */
+VALUE
+syck_scalar_style_set( self, style )
+    VALUE self, style;
+{
+    SyckNode *node;
+    Data_Get_Struct( self, SyckNode, node );
+
+    if ( NIL_P( style ) )
+    {
+        node->data.str->style = scalar_none;
+    } 
+    else if ( style == sym_1quote )
+    {
+        node->data.str->style = scalar_1quote;
+    } 
+    else if ( style == sym_2quote )
+    {
+        node->data.str->style = scalar_2quote;
+    } 
+    else if ( style == sym_fold )
+    {
+        node->data.str->style = scalar_fold;
+    } 
+    else if ( style == sym_literal )
+    {
+        node->data.str->style = scalar_literal;
+    } 
+    else if ( style == sym_plain )
+    {
+        node->data.str->style = scalar_plain;
+    }
+
+    rb_iv_set( self, "@style", style );
+    return self;
+}
+
+/*
+ * YAML::Syck::Scalar.value=
+ */
+VALUE
+syck_scalar_value_set( self, val )
+    VALUE self, val;
+{
+    SyckNode *node;
+    Data_Get_Struct( self, SyckNode, node );
+
+    StringValue( val );
+    node->data.str->ptr = syck_strndup( RSTRING(val)->ptr, RSTRING(val)->len );
+    node->data.str->len = RSTRING(val)->len;
+    node->data.str->style = scalar_none;
+
+    rb_iv_set( self, "@value", val );
+    return val;
+}
+
+/*
+ * YAML::Syck::Seq.allocate
+ */
+VALUE
+syck_seq_alloc( class )
+    VALUE class;
+{
+    SyckNode *node;
+    VALUE obj;
+    node = syck_alloc_seq();
+    obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
+    node->id = obj;
+    return obj;
+}
+
+/*
+ * YAML::Syck::Seq.initialize
+ */
+VALUE
+syck_seq_initialize( self, type_id, val, style )
+    VALUE self, type_id, val, style;
+{
+    SyckNode *node;
+    Data_Get_Struct( self, SyckNode, node );
+
+    rb_iv_set( self, "@kind", sym_seq );
+    rb_funcall( self, s_type_id_set, 1, type_id );
+    rb_funcall( self, s_value_set, 1, val );
+    rb_funcall( self, s_style_set, 1, style );
+    return self;
+}
+
+/*
+ * YAML::Syck::Seq.value=
+ */
+VALUE
+syck_seq_value_set( self, val )
+    VALUE self, val;
+{
+    SyckNode *node;
+    Data_Get_Struct( self, SyckNode, node );
+
+    val = rb_check_array_type( val );
+    if ( !NIL_P( val ) ) {
+        int i;
+        syck_seq_empty( node );
+        for ( i = 0; i < RARRAY( val )->len; i++ )
+        {
+            syck_seq_add( node, rb_ary_entry(val, i) );
+        }
+    }
+
+    rb_iv_set( self, "@value", val );
+    return val;
+}
+
+/*
+ * YAML::Syck::Seq.add
+ */
+VALUE
+syck_seq_add_m( self, val )
+    VALUE self, val;
+{
+    SyckNode *node;
+    VALUE emitter = rb_ivar_get( self, s_emitter );
+    Data_Get_Struct( self, SyckNode, node );
+
+    if ( rb_respond_to( emitter, s_node_export ) ) {
+        val = rb_funcall( emitter, s_node_export, 1, val );
+    }
+    syck_seq_add( node, val );
+    rb_ary_push( rb_ivar_get( self, s_value ), val );
+
+    return self;
+}
+
+/*
+ * YAML::Syck::Seq.style=
+ */
+VALUE
+syck_seq_style_set( self, style )
+    VALUE self, style;
+{
+    SyckNode *node;
+    Data_Get_Struct( self, SyckNode, node );
+
+    if ( style == sym_inline )
+    {
+        node->data.list->style = seq_inline;
+    } 
+    else
+    {
+        node->data.list->style = seq_none;
+    }
+
+    rb_iv_set( self, "@style", style );
+    return self;
+}
+
+/*
+ * YAML::Syck::Map.allocate
+ */
+VALUE
+syck_map_alloc( class )
+    VALUE class;
+{
+    SyckNode *node;
+    VALUE obj;
+    node = syck_alloc_map();
+    obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
+    node->id = obj;
+    return obj;
+}
+
+/*
+ * YAML::Syck::Map.initialize
+ */
+VALUE
+syck_map_initialize( self, type_id, val, style )
+    VALUE self, type_id, val, style;
+{
+    SyckNode *node;
+    Data_Get_Struct( self, SyckNode, node );
+
+    if ( !NIL_P( val ) )
+    {
+        VALUE hsh = rb_check_convert_type(val, T_HASH, "Hash", "to_hash");
+        VALUE keys;
+        int i;
+        if ( NIL_P(hsh) )
+        {
+            rb_raise( rb_eTypeError, "wrong argument type" );
+        }
+
+        keys = rb_funcall( hsh, s_keys, 0 );
+        for ( i = 0; i < RARRAY(keys)->len; i++ )
+        {
+            VALUE key = rb_ary_entry(keys, i);
+            syck_map_add( node, key, rb_hash_aref(hsh, key) );
+        }
+    }
+
+    rb_iv_set( self, "@kind", sym_seq );
+    rb_funcall( self, s_type_id_set, 1, type_id );
+    rb_funcall( self, s_value_set, 1, val );
+    rb_funcall( self, s_style_set, 1, style );
+    return self;
+}
+
+/*
+ * YAML::Syck::Map.value=
+ */
+VALUE
+syck_map_value_set( self, val )
+    VALUE self, val;
+{
+    SyckNode *node;
+    Data_Get_Struct( self, SyckNode, node );
+
+    if ( !NIL_P( val ) )
+    {
+        VALUE hsh = rb_check_convert_type(val, T_HASH, "Hash", "to_hash");
+        VALUE keys;
+        int i;
+        if ( NIL_P(hsh) )
+        {
+            rb_raise( rb_eTypeError, "wrong argument type" );
+        }
+
+        syck_map_empty( node );
+        keys = rb_funcall( hsh, s_keys, 0 );
+        for ( i = 0; i < RARRAY(keys)->len; i++ )
+        {
+            VALUE key = rb_ary_entry(keys, i);
+            syck_map_add( node, key, rb_hash_aref(hsh, key) );
+        }
+    }
+
+    rb_iv_set( self, "@value", val );
+    return val;
+}
+
+/*
+ * YAML::Syck::Map.add
+ */
+VALUE
+syck_map_add_m( self, key, val )
+    VALUE self, key, val;
+{
+    SyckNode *node;
+    VALUE emitter = rb_ivar_get( self, s_emitter );
+    Data_Get_Struct( self, SyckNode, node );
+
+    if ( rb_respond_to( emitter, s_node_export ) ) {
+        key = rb_funcall( emitter, s_node_export, 1, key );
+        val = rb_funcall( emitter, s_node_export, 1, val );
+    }
+    syck_map_add( node, key, val );
+    rb_hash_aset( rb_ivar_get( self, s_value ), key, val );
+
+    return self;
+}
+
+/*
+ * YAML::Syck::Map.style=
+ */
+VALUE
+syck_map_style_set( self, style )
+    VALUE self, style;
+{
+    SyckNode *node;
+    Data_Get_Struct( self, SyckNode, node );
+
+    if ( style == sym_inline )
+    {
+        node->data.pairs->style = map_inline;
+    } 
+    else
+    {
+        node->data.pairs->style = map_none;
+    }
+
+    rb_iv_set( self, "@style", style );
+    return self;
+}
+
+/*
+ * Cloning method for all node types
+ */
+VALUE
+syck_node_init_copy( copy, orig )
+    VALUE copy, orig;
+{
+    SyckNode *copy_n;
+    SyckNode *orig_n;
+
+    if ( copy == orig )
+        return copy;
+
+    if ( TYPE( orig ) != T_DATA )
+    {
+        rb_raise( rb_eTypeError, "wrong argument type" );
+    }
+
+    Data_Get_Struct( orig, SyckNode, orig_n );
+    Data_Get_Struct( copy, SyckNode, copy_n );
+    MEMCPY( copy_n, orig_n, SyckNode, 1 );
+    return copy;
+}
+
+/*
+ * YAML::Syck::Node#type_id=
+ */
+VALUE
+syck_node_type_id_set( self, type_id )
+    VALUE self, type_id;
+{
+    SyckNode *node;
+    Data_Get_Struct( self, SyckNode, node );
+
+    S_FREE( node->type_id );
+
+    if ( !NIL_P( type_id ) ) {
+        StringValue( type_id );
+        node->type_id = syck_strndup( RSTRING(type_id)->ptr, RSTRING(type_id)->len );
+    }
+
+    rb_iv_set( self, "@type_id", type_id );
+    return type_id;
+}
+
+/*
+ * YAML::Syck::Node.transform
+ */
+VALUE
+syck_node_transform( self )
+    VALUE self;
+{
+    VALUE t;
+    SyckNode *n;
+    SyckNode *orig_n;
+    Data_Get_Struct(self, SyckNode, orig_n);
+    t = Data_Wrap_Struct( cNode, syck_node_mark, syck_free_node, 0 );
+
+    switch (orig_n->kind)
+    {
+        case syck_map_kind:
+            {
+                int i;
+                DATA_PTR(t) = n = syck_alloc_map();
+                for ( i = 0; i < orig_n->data.pairs->idx; i++ )
+                {
+                    syck_map_add( n, rb_funcall( syck_map_read( orig_n, map_key, i ), s_transform, 0 ),
+                                     rb_funcall( syck_map_read( orig_n, map_value, i ), s_transform, 0 ) );
+                }
+            }
+        break;
+
+        case syck_seq_kind:
+            {
+                int i;
+                DATA_PTR(t) = n = syck_alloc_seq();
+                for ( i = 0; i < orig_n->data.list->idx; i++ )
+                {
+                    syck_seq_add( n, rb_funcall( syck_seq_read( orig_n, i ), s_transform, 0 ) );
+                }
+            }
+        break;
+
+        case syck_str_kind:
+            DATA_PTR(t) = n = syck_new_str2( orig_n->data.str->ptr, orig_n->data.str->len, orig_n->data.str->style );
+        break;
+    }
+
+    if ( orig_n->type_id != NULL )
+    {
+        n->type_id = syck_strndup( orig_n->type_id, strlen( orig_n->type_id ) );
+    }
+    if ( orig_n->anchor != NULL )
+    {
+        n->anchor = syck_strndup( orig_n->anchor, strlen( orig_n->anchor ) );
+    }
+    n->id = t;
+    return rb_funcall( oDefaultResolver, s_node_import, 1, t );
+}
+
+/*
+ * Emitter callback: assembles YAML document events from
+ * Ruby symbols.  This is a brilliant way to do it.
+ * No one could possibly object.
+ */
+void
+rb_syck_emitter_handler(e, data)
+    SyckEmitter *e;
+    st_data_t data;
+{
+    SyckNode *n;
+    Data_Get_Struct((VALUE)data, SyckNode, n);
+
+    switch (n->kind)
+    {
+        case syck_map_kind:
+            {
+                int i;
+                syck_emit_map( e, n->type_id, n->data.pairs->style );
+                for ( i = 0; i < n->data.pairs->idx; i++ )
+                {
+                    syck_emit_item( e, syck_map_read( n, map_key, i ) );
+                    syck_emit_item( e, syck_map_read( n, map_value, i ) );
+                }
+                syck_emit_end( e );
+            }
+        break;
+
+        case syck_seq_kind:
+            {
+                int i;
+                syck_emit_seq( e, n->type_id, n->data.list->style );
+                for ( i = 0; i < n->data.list->idx; i++ )
+                {
+                    syck_emit_item( e, syck_seq_read( n, i ) );
+                }
+                syck_emit_end( e );
+            }
+        break;
+
+        case syck_str_kind:
+            {
+                syck_emit_scalar( e, n->type_id, n->data.str->style, 0, 0, 0, n->data.str->ptr, n->data.str->len );
+            }
+        break;
+    }
+}
+
+/*
+ * Handle output from the emitter
+ */
+void 
+rb_syck_output_handler( emitter, str, len )
+    SyckEmitter *emitter;
+    char *str;
+    long len;
+{
+    struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
+    VALUE dest = bonus->port;
+    if (TYPE(dest) == T_STRING) {
+        rb_str_cat( dest, str, len );
+    } else {
+        rb_io_write( dest, rb_str_new( str, len ) );
+    }
+}
+
+/*
+ * Helper function for marking nodes in the anchor
+ * symbol table.
+ */
+void
+syck_out_mark( emitter, node )
+    VALUE emitter, node;
+{
+    SyckEmitter *emitterPtr;
+    struct emitter_xtra *bonus;
+    Data_Get_Struct(emitter, SyckEmitter, emitterPtr);
+    bonus = (struct emitter_xtra *)emitterPtr->bonus;
+    rb_ivar_set( node, s_emitter, emitter );
+    /* syck_emitter_mark_node( emitterPtr, (st_data_t)node ); */
+    if ( !NIL_P( bonus->oid ) ) {
+        rb_hash_aset( bonus->data, bonus->oid, node );
+    }
+}
+
+/*
+ * Mark emitter values.
+ */
+static void
+syck_mark_emitter(emitter)
+    SyckEmitter *emitter;
+{
+    struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
+    rb_gc_mark( bonus->oid  );
+    rb_gc_mark( bonus->data );
+    rb_gc_mark( bonus->port );
+}
+
+/*
+ * Free the emitter and any bonus attachment.
+ */
+void
+rb_syck_free_emitter(e)
+    SyckEmitter *e;
+{
+    S_FREE( e->bonus );
+    syck_free_emitter(e);
+}
+
+/*
+ * YAML::Syck::Emitter.allocate
+ */
+VALUE syck_emitter_s_alloc _((VALUE));
+VALUE 
+syck_emitter_s_alloc(class)
+    VALUE class;
+{
+    VALUE pobj;
+    SyckEmitter *emitter = syck_new_emitter();
+
+    emitter->bonus = S_ALLOC( struct emitter_xtra );
+    S_MEMZERO( emitter->bonus, struct emitter_xtra, 1 );
+
+    pobj = Data_Wrap_Struct( class, syck_mark_emitter, rb_syck_free_emitter, emitter );
+    syck_emitter_handler( emitter, rb_syck_emitter_handler );
+    syck_output_handler( emitter, rb_syck_output_handler );
+
+    rb_ivar_set( pobj, s_out, rb_funcall( cOut, s_new, 1, pobj ) );
+    return pobj;
+}
+
+/*
+ * YAML::Syck::Emitter.reset( options )
+ */
+VALUE
+syck_emitter_reset( argc, argv, self )
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE options, tmp;
+    SyckEmitter *emitter;
+    struct emitter_xtra *bonus;
+
+    Data_Get_Struct(self, SyckEmitter, emitter);
+    bonus = (struct emitter_xtra *)emitter->bonus;
+
+    bonus->oid = Qnil;
+    bonus->port = rb_str_new2( "" );
+    bonus->data = rb_hash_new();
+
+    if (rb_scan_args(argc, argv, "01", &options) == 0)
+    {
+        options = rb_hash_new();
+        rb_ivar_set(self, s_options, options);
+    }
+    else if ( !NIL_P(tmp = rb_check_string_type(options)) )
+    {
+        bonus->port = tmp;
+    }
+    else if ( rb_respond_to( options, s_write ) )
+    {
+        bonus->port = options;
+    }
+    else
+    {
+        Check_Type(options, T_HASH);
+        rb_ivar_set(self, s_options, options);
+    }
+    
+    emitter->headless = 0;
+    rb_ivar_set(self, s_level, INT2FIX(0));
+    rb_ivar_set(self, s_resolver, Qnil);
+    return self;
+}
+
+/*
+ * YAML::Syck::Emitter.emit( object_id ) { |out| ... }
+ */
+VALUE
+syck_emitter_emit( argc, argv, self )
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE oid, proc;
+    char *anchor_name;
+    SyckEmitter *emitter;
+    struct emitter_xtra *bonus;
+    SYMID symple;
+    int level = FIX2INT(rb_ivar_get(self, s_level)) + 1;
+    rb_ivar_set(self, s_level, INT2FIX(level));
+
+    rb_scan_args(argc, argv, "1&", &oid, &proc);
+    Data_Get_Struct(self, SyckEmitter, emitter);
+    bonus = (struct emitter_xtra *)emitter->bonus;
+
+    /* Calculate anchors, normalize nodes, build a simpler symbol table */
+    bonus->oid = oid;
+    if ( !NIL_P( oid ) && RTEST( rb_funcall( bonus->data, s_haskey, 1, oid ) ) ) {
+        symple = rb_hash_aref( bonus->data, oid );
+    } else {
+        symple = rb_funcall( proc, s_call, 1, rb_ivar_get( self, s_out ) );
+    }
+    syck_emitter_mark_node( emitter, (st_data_t)symple );
+
+    /* Second pass, build emitted string */
+    level -= 1;
+    rb_ivar_set(self, s_level, INT2FIX(level));
+    if ( level == 0 ) 
+    {
+        syck_emit(emitter, (st_data_t)symple);
+        syck_emitter_flush(emitter, 0);
+
+        return bonus->port;
+    }
+    
+    return symple;
+}
+
+/*
+ * YAML::Syck::Emitter#node_export
+ */
+VALUE
+syck_emitter_node_export( self, node )
+    VALUE self, node;
+{
+    return rb_funcall( node, s_to_yaml, 1, self );
+}
+
+/*
+ * YAML::Syck::Emitter#set_resolver
+ */
+VALUE
+syck_emitter_set_resolver( self, resolver )
+    VALUE self, resolver;
+{
+    rb_ivar_set( self, s_resolver, resolver );
+    return self;
+}
+
+/*
+ * YAML::Syck::Out::initialize
+ */
+VALUE
+syck_out_initialize( self, emitter )
+    VALUE self, emitter;
+{
+    rb_ivar_set( self, s_emitter, emitter );
+    return self;
+}
+
+/*
+ * YAML::Syck::Out::map
+ */
+VALUE
+syck_out_map( argc, argv, self )
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE type_id, style, map;
+    if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
+        style = Qnil;
+    }
+    map = rb_funcall( cMap, s_new, 3, type_id, rb_hash_new(), style );
+    syck_out_mark( rb_ivar_get( self, s_emitter ), map );
+    rb_yield( map );
+    return map;
+}
+
+/*
+ * YAML::Syck::Out::seq
+ */
+VALUE
+syck_out_seq( argc, argv, self )
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE type_id, style, seq;
+    if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
+        style = Qnil;
+    }
+    seq = rb_funcall( cSeq, s_new, 3, type_id, rb_ary_new(), style );
+    syck_out_mark( rb_ivar_get( self, s_emitter ), seq );
+    rb_yield( seq );
+    return seq;
+}
+
+/*
+ * YAML::Syck::Out::scalar
+syck_out_scalar( self, type_id, str, style )
+    VALUE self, type_id, str, style;
+ */
+VALUE
+syck_out_scalar( argc, argv, self )
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE type_id, str, style, scalar;
+    if (rb_scan_args(argc, argv, "21", &type_id, &str, &style) == 2) {
+        style = Qnil;
+    }
+    scalar = rb_funcall( cScalar, s_new, 3, type_id, str, style );
+    syck_out_mark( rb_ivar_get( self, s_emitter ), scalar );
+    return scalar;
+}
+
+/*
+ * Initialize Syck extension
+ */
+void
+Init_syck()
+{
+    VALUE rb_yaml = rb_define_module( "YAML" );
+    VALUE rb_syck = rb_define_module_under( rb_yaml, "Syck" );
+    rb_define_const( rb_syck, "VERSION", rb_str_new2( SYCK_VERSION ) );
+    rb_define_module_function( rb_syck, "compile", rb_syck_compile, 1 );
+
+    /*
+     * Global symbols
+     */
+    s_new = rb_intern("new");
+    s_utc = rb_intern("utc");
+    s_at = rb_intern("at");
+    s_to_f = rb_intern("to_f");
+    s_to_i = rb_intern("to_i");
+    s_read = rb_intern("read");
+    s_binmode = rb_intern("binmode");
+    s_transfer = rb_intern("transfer");
+    s_call = rb_intern("call");
+    s_cmp = rb_intern("<=>");
+    s_intern = rb_intern("intern");
+    s_update = rb_intern("update");
+    s_detect_implicit = rb_intern("detect_implicit");
+    s_dup = rb_intern("dup");
+    s_default_set = rb_intern("default=");
+    s_match = rb_intern("match");
+    s_push = rb_intern("push");
+    s_haskey = rb_intern("has_key?");
+    s_keys = rb_intern("keys");
+    s_node_import = rb_intern("node_import");
+    s_tr_bang = rb_intern("tr!");
+    s_unpack = rb_intern("unpack");
+    s_write = rb_intern("write");
+    s_tag_read_class = rb_intern( "yaml_tag_read_class" );
+    s_tag_subclasses = rb_intern( "yaml_tag_subclasses?" );
+    s_emitter = rb_intern( "emitter" );
+    s_set_resolver = rb_intern( "set_resolver" );
+    s_node_export = rb_intern( "node_export" );
+    s_to_yaml = rb_intern( "to_yaml" );
+    s_transform = rb_intern( "transform" );
+    s_yaml_new = rb_intern("yaml_new");
+    s_yaml_initialize = rb_intern("yaml_initialize");
+
+    s_tags = rb_intern("@tags");
+    s_name = rb_intern("@name");
+    s_options = rb_intern("@options");
+    s_kind = rb_intern("@kind");
+    s_type_id = rb_intern("@type_id");
+    s_type_id_set = rb_intern("type_id=");
+    s_resolver = rb_intern("@resolver");
+    s_level = rb_intern( "@level" );
+    s_style = rb_intern("@style");
+    s_style_set = rb_intern("style=");
+    s_value = rb_intern("@value");
+    s_value_set = rb_intern("value=");
+    s_out = rb_intern("@out");
+    s_input = rb_intern("@input");
+
+    sym_model = ID2SYM(rb_intern("Model"));
+    sym_generic = ID2SYM(rb_intern("Generic"));
+    sym_bytecode = ID2SYM(rb_intern("bytecode"));
+    sym_map = ID2SYM(rb_intern("map"));
+    sym_scalar = ID2SYM(rb_intern("scalar"));
+    sym_seq = ID2SYM(rb_intern("seq"));
+    sym_1quote = ID2SYM(rb_intern("quote1"));
+    sym_2quote = ID2SYM(rb_intern("quote2"));
+    sym_fold = ID2SYM(rb_intern("fold"));
+    sym_literal = ID2SYM(rb_intern("literal"));
+    sym_plain = ID2SYM(rb_intern("plain"));
+    sym_inline = ID2SYM(rb_intern("inline"));
+
+    /*
+     * Define YAML::Syck::Resolver class
+     */
+    cResolver = rb_define_class_under( rb_syck, "Resolver", rb_cObject );
+    rb_define_attr( cResolver, "tags", 1, 1 );
+    rb_define_method( cResolver, "initialize", syck_resolver_initialize, 0 );
+    rb_define_method( cResolver, "add_type", syck_resolver_add_type, 2 );
+    rb_define_method( cResolver, "use_types_at", syck_resolver_use_types_at, 1 );
+    rb_define_method( cResolver, "detect_implicit", syck_resolver_detect_implicit, 1 );
+    rb_define_method( cResolver, "transfer", syck_resolver_transfer, 2 );
+    rb_define_method( cResolver, "node_import", syck_resolver_node_import, 1 );
+    rb_define_method( cResolver, "tagurize", syck_resolver_tagurize, 1 );
+
+    rb_global_variable( &oDefaultResolver );
+    oDefaultResolver = rb_funcall( cResolver, rb_intern( "new" ), 0 );
+    rb_define_singleton_method( oDefaultResolver, "node_import", syck_defaultresolver_node_import, 1 );
+    rb_define_singleton_method( oDefaultResolver, "detect_implicit", syck_defaultresolver_detect_implicit, 1 );
+    rb_define_const( rb_syck, "DefaultResolver", oDefaultResolver );
+    rb_global_variable( &oGenericResolver );
+    oGenericResolver = rb_funcall( cResolver, rb_intern( "new" ), 0 );
+    rb_define_singleton_method( oGenericResolver, "node_import", syck_genericresolver_node_import, 1 );
+    rb_define_const( rb_syck, "GenericResolver", oGenericResolver );
+
+    /*
+     * Define YAML::Syck::Parser class
+     */
+    cParser = rb_define_class_under( rb_syck, "Parser", rb_cObject );
+    rb_define_attr( cParser, "options", 1, 1 );
+    rb_define_attr( cParser, "resolver", 1, 1 );
+    rb_define_attr( cParser, "input", 1, 1 );
+    rb_define_alloc_func( cParser, syck_parser_s_alloc );
+    rb_define_method(cParser, "initialize", syck_parser_initialize, -1 );
+    rb_define_method(cParser, "bufsize=", syck_parser_bufsize_set, 1 );
+    rb_define_method(cParser, "bufsize", syck_parser_bufsize_get, 0 );
+    rb_define_method(cParser, "load", syck_parser_load, -1);
+    rb_define_method(cParser, "load_documents", syck_parser_load_documents, -1);
+    rb_define_method(cParser, "set_resolver", syck_parser_set_resolver, 1);
+
+    /*
+     * Define YAML::Syck::Node class
+     */
+    cNode = rb_define_class_under( rb_syck, "Node", rb_cObject );
+    rb_define_method( cNode, "initialize_copy", syck_node_init_copy, 1 );
+    rb_define_attr( cNode, "emitter", 1, 1 );
+    rb_define_attr( cNode, "resolver", 1, 1 );
+    rb_define_attr( cNode, "kind", 1, 0 );
+    rb_define_attr( cNode, "type_id", 1, 0 );
+    rb_define_attr( cNode, "value", 1, 0 );
+    rb_define_method( cNode, "type_id=", syck_node_type_id_set, 1 );
+    rb_define_method( cNode, "transform", syck_node_transform, 0);
+
+    /*
+     * Define YAML::Syck::Scalar, YAML::Syck::Seq, YAML::Syck::Map --
+     *     all are the publicly usable variants of YAML::Syck::Node
+     */
+    cScalar = rb_define_class_under( rb_syck, "Scalar", cNode );
+    rb_define_alloc_func( cScalar, syck_scalar_alloc );
+    rb_define_attr( cNode, "value", 1, 0 );
+    rb_define_method( cScalar, "initialize", syck_scalar_initialize, 3 );
+    rb_define_method( cScalar, "value=", syck_scalar_value_set, 1 );
+    rb_define_method( cScalar, "style=", syck_scalar_style_set, 1 );
+    cSeq = rb_define_class_under( rb_syck, "Seq", cNode );
+    rb_define_alloc_func( cSeq, syck_seq_alloc );
+    rb_define_method( cSeq, "initialize", syck_seq_initialize, 3 );
+    rb_define_method( cSeq, "value=", syck_seq_value_set, 1 );
+    rb_define_method( cSeq, "add", syck_seq_add_m, 1 );
+    rb_define_method( cSeq, "style=", syck_seq_style_set, 1 );
+    cMap = rb_define_class_under( rb_syck, "Map", cNode );
+    rb_define_alloc_func( cMap, syck_map_alloc );
+    rb_define_method( cMap, "initialize", syck_map_initialize, 3 );
+    rb_define_method( cMap, "value=", syck_map_value_set, 1 );
+    rb_define_method( cMap, "add", syck_map_add_m, 2 );
+    rb_define_method( cMap, "style=", syck_map_style_set, 1 );
+
+    /*
+     * Define YAML::PrivateType class
+     */
+    cPrivateType = rb_define_class_under( rb_yaml, "PrivateType", rb_cObject );
+    rb_define_attr( cPrivateType, "type_id", 1, 1 );
+    rb_define_attr( cPrivateType, "value", 1, 1 );
+    rb_define_method( cPrivateType, "initialize", syck_privatetype_initialize, 2);
+
+    /*
+     * Define YAML::DomainType class
+     */
+    cDomainType = rb_define_class_under( rb_yaml, "DomainType", rb_cObject );
+    rb_define_attr( cDomainType, "domain", 1, 1 );
+    rb_define_attr( cDomainType, "type_id", 1, 1 );
+    rb_define_attr( cDomainType, "value", 1, 1 );
+    rb_define_method( cDomainType, "initialize", syck_domaintype_initialize, 3);
+
+    /*
+     * Define YAML::Object class
+     */
+    cYObject = rb_define_class_under( rb_yaml, "Object", rb_cObject );
+    rb_define_attr( cYObject, "class", 1, 1 );
+    rb_define_attr( cYObject, "ivars", 1, 1 );
+    rb_define_method( cYObject, "initialize", syck_yobject_initialize, 2);
+    rb_define_method( cYObject, "yaml_initialize", syck_yobject_initialize, 2);
+
+    /*
+     * Define YAML::Syck::BadAlias class
+     */
+    cBadAlias = rb_define_class_under( rb_syck, "BadAlias", rb_cObject );
+    rb_define_attr( cBadAlias, "name", 1, 1 );
+    rb_define_method( cBadAlias, "initialize", syck_badalias_initialize, 1);
+    rb_define_method( cBadAlias, "<=>", syck_badalias_cmp, 1);
+    rb_include_module( cBadAlias, rb_const_get( rb_cObject, rb_intern("Comparable") ) );
+
+    /*
+     * Define YAML::Syck::MergeKey class
+     */
+    cMergeKey = rb_define_class_under( rb_syck, "MergeKey", rb_cObject );
+
+    /*
+     * Define YAML::Syck::DefaultKey class
+     */
+    cDefaultKey = rb_define_class_under( rb_syck, "DefaultKey", rb_cObject );
+
+    /*
+     * Define YAML::Syck::Out classes
+     */
+    cOut = rb_define_class_under( rb_syck, "Out", rb_cObject );
+    rb_define_attr( cOut, "emitter", 1, 1 );
+    rb_define_method( cOut, "initialize", syck_out_initialize, 1 );
+    rb_define_method( cOut, "map", syck_out_map, -1 );
+    rb_define_method( cOut, "seq", syck_out_seq, -1 );
+    rb_define_method( cOut, "scalar", syck_out_scalar, -1 );
+
+    /*
+     * Define YAML::Syck::Emitter class
+     */
+    cEmitter = rb_define_class_under( rb_syck, "Emitter", rb_cObject );
+    rb_define_attr( cEmitter, "level", 1, 1 );
+    rb_define_alloc_func( cEmitter, syck_emitter_s_alloc );
+    rb_define_method( cEmitter, "initialize", syck_emitter_reset, -1 );
+    rb_define_method( cEmitter, "reset", syck_emitter_reset, -1 );
+    rb_define_method( cEmitter, "emit", syck_emitter_emit, -1 );
+    rb_define_method( cEmitter, "set_resolver", syck_emitter_set_resolver, 1);
+    rb_define_method( cEmitter, "node_export", syck_emitter_node_export, 1);
+}
+
diff --git a/ruby_1_8_6/ext/syck/syck.c b/ruby_1_8_6/ext/syck/syck.c
new file mode 100644
index 0000000000..a83c8813c1
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/syck.c
@@ -0,0 +1,504 @@
+/*
+ * syck.c
+ *
+ * $Author$
+ * $Date$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+#include "ruby.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "syck.h"
+
+void syck_parser_pop_level( SyckParser * );
+
+/*
+ * Custom assert
+ */
+void 
+syck_assert( char *file_name, unsigned line_num )
+{
+    fflush( NULL );
+    fprintf( stderr, "\nAssertion failed: %s, line %u\n",
+             file_name, line_num );
+    fflush( stderr );
+    abort();
+}
+
+/*
+ * Allocates and copies a string
+ */
+char *
+syck_strndup( char *buf, long len )
+{
+    char *new = S_ALLOC_N( char, len + 1 );
+    S_MEMZERO( new, char, len + 1 );
+    S_MEMCPY( new, buf, char, len );
+    return new;
+}
+
+/*
+ * Default FILE IO function
+ */
+long
+syck_io_file_read( char *buf, SyckIoFile *file, long max_size, long skip )
+{
+    long len = 0;
+
+    ASSERT( file != NULL );
+
+    max_size -= skip;
+    len = fread( buf + skip, sizeof( char ), max_size, file->ptr );
+    len += skip;
+    buf[len] = '\0';
+
+    return len;
+}
+
+/*
+ * Default string IO function
+ */
+long
+syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
+{
+    char *beg;
+    long len = 0;
+
+    ASSERT( str != NULL );
+    beg = str->ptr;
+    if ( max_size >= 0 )
+    {
+        max_size -= skip;
+        if ( max_size <= 0 )  max_size = 0;
+        else                  str->ptr += max_size;
+
+        if ( str->ptr > str->end )
+        {
+            str->ptr = str->end;
+        }
+    }
+    else
+    {
+        /* Use exact string length */
+        while ( str->ptr < str->end ) {
+            if (*(str->ptr++) == '\n') break;
+        }
+    }
+    if ( beg < str->ptr )
+    {
+        len = ( str->ptr - beg );
+        S_MEMCPY( buf + skip, beg, char, len );
+    }
+    len += skip;
+    buf[len] = '\0';
+
+    return len;
+}
+
+void
+syck_parser_reset_levels( SyckParser *p )
+{
+    while ( p->lvl_idx > 1 )
+    {
+        syck_parser_pop_level( p );
+    }
+
+    if ( p->lvl_idx < 1 )
+    {
+        p->lvl_idx = 1;
+        p->levels[0].spaces = -1;
+        p->levels[0].ncount = 0;
+        p->levels[0].domain = syck_strndup( "", 0 );
+    }
+    p->levels[0].status = syck_lvl_header;
+}
+
+void
+syck_parser_reset_cursor( SyckParser *p )
+{
+    if ( p->buffer == NULL )
+    {
+        p->buffer = S_ALLOC_N( char, p->bufsize );
+        S_MEMZERO( p->buffer, char, p->bufsize );
+    }
+    p->buffer[0] = '\0';
+
+    p->cursor = NULL;
+    p->lineptr = NULL;
+    p->linectptr = NULL;
+    p->token = NULL;
+    p->toktmp = NULL;
+    p->marker = NULL;
+    p->limit = NULL;
+
+    p->root = 0;
+    p->root_on_error = 0;
+    p->linect = 0;
+    p->eof = 0;
+    p->last_token = 0;
+    p->force_token = 0;
+}
+
+/*
+ * Value to return on a parse error
+ */
+void
+syck_parser_set_root_on_error( SyckParser *p, SYMID roer )
+{
+    p->root_on_error = roer;
+}
+
+/*
+ * Allocate the parser
+ */
+SyckParser *
+syck_new_parser()
+{
+    SyckParser *p;
+    p = S_ALLOC( SyckParser );
+    S_MEMZERO( p, SyckParser, 1 );
+    p->lvl_capa = ALLOC_CT;
+    p->levels = S_ALLOC_N( SyckLevel, p->lvl_capa ); 
+    p->input_type = syck_yaml_utf8;
+    p->io_type = syck_io_str;
+    p->io.str = NULL;
+    p->syms = NULL;
+    p->anchors = NULL;
+    p->bad_anchors = NULL;
+    p->implicit_typing = 1;
+    p->taguri_expansion = 0;
+    p->bufsize = SYCK_BUFFERSIZE;
+    p->buffer = NULL;
+    p->lvl_idx = 0;
+    syck_parser_reset_levels( p );
+    return p;
+}
+
+int
+syck_add_sym( SyckParser *p, char *data )
+{
+    SYMID id = 0;
+    if ( p->syms == NULL )
+    {
+        p->syms = st_init_numtable();
+    }
+    id = p->syms->num_entries + 1;
+    st_insert( p->syms, id, (st_data_t)data );
+    return id;
+}
+
+int
+syck_lookup_sym( SyckParser *p, SYMID id, char **data )
+{
+    if ( p->syms == NULL ) return 0;
+    return st_lookup( p->syms, id, (st_data_t *)data );
+}
+
+int
+syck_st_free_nodes( char *key, SyckNode *n, char *arg )
+{
+    if ( n != (void *)1 ) syck_free_node( n );
+    n = NULL;
+    return ST_CONTINUE;
+}
+
+void
+syck_st_free( SyckParser *p )
+{
+    /*
+     * Free the anchor tables
+     */
+    if ( p->anchors != NULL )
+    {
+        st_foreach( p->anchors, syck_st_free_nodes, 0 );
+        st_free_table( p->anchors );
+        p->anchors = NULL;
+    }
+
+    if ( p->bad_anchors != NULL )
+    {
+        st_foreach( p->bad_anchors, syck_st_free_nodes, 0 );
+        st_free_table( p->bad_anchors );
+        p->bad_anchors = NULL;
+    }
+}
+
+void
+syck_free_parser( SyckParser *p )
+{
+    /*
+     * Free the adhoc symbol table
+     */
+    if ( p->syms != NULL )
+    {
+        st_free_table( p->syms );
+        p->syms = NULL;
+    }
+
+    /*
+     * Free tables, levels
+     */
+    syck_st_free( p );
+    syck_parser_reset_levels( p );
+    S_FREE( p->levels[0].domain );
+    S_FREE( p->levels );
+
+    if ( p->buffer != NULL )
+    {
+        S_FREE( p->buffer );
+    }
+    free_any_io( p );
+    S_FREE( p );
+}
+
+void
+syck_parser_handler( SyckParser *p, SyckNodeHandler hdlr )
+{
+    ASSERT( p != NULL );
+    p->handler = hdlr;
+}
+
+void
+syck_parser_implicit_typing( SyckParser *p, int flag )
+{
+    p->implicit_typing = ( flag == 0 ? 0 : 1 );
+}
+
+void
+syck_parser_taguri_expansion( SyckParser *p, int flag )
+{
+    p->taguri_expansion = ( flag == 0 ? 0 : 1 );
+}
+
+void
+syck_parser_error_handler( SyckParser *p, SyckErrorHandler hdlr )
+{
+    ASSERT( p != NULL );
+    p->error_handler = hdlr;
+}
+
+void
+syck_parser_bad_anchor_handler( SyckParser *p, SyckBadAnchorHandler hdlr )
+{
+    ASSERT( p != NULL );
+    p->bad_anchor_handler = hdlr;
+}
+
+void
+syck_parser_set_input_type( SyckParser *p, enum syck_parser_input input_type )
+{
+    ASSERT( p != NULL );
+    p->input_type = input_type;
+}
+
+void
+syck_parser_file( SyckParser *p, FILE *fp, SyckIoFileRead read )
+{
+    ASSERT( p != NULL );
+    free_any_io( p );
+	syck_parser_reset_cursor( p );
+    p->io_type = syck_io_file;
+    p->io.file = S_ALLOC( SyckIoFile );
+    p->io.file->ptr = fp;
+    if ( read != NULL )
+    {
+        p->io.file->read = read;
+    }
+    else
+    {
+        p->io.file->read = syck_io_file_read;
+    }
+}
+
+void
+syck_parser_str( SyckParser *p, char *ptr, long len, SyckIoStrRead read )
+{
+    ASSERT( p != NULL );
+    free_any_io( p );
+	syck_parser_reset_cursor( p );
+    p->io_type = syck_io_str;
+    p->io.str = S_ALLOC( SyckIoStr );
+    p->io.str->beg = ptr;
+    p->io.str->ptr = ptr;
+    p->io.str->end = ptr + len;
+    if ( read != NULL )
+    {
+        p->io.str->read = read;
+    }
+    else
+    {
+        p->io.str->read = syck_io_str_read;
+    }
+}
+
+void
+syck_parser_str_auto( SyckParser *p, char *ptr, SyckIoStrRead read )
+{
+    syck_parser_str( p, ptr, strlen( ptr ), read );
+}
+
+SyckLevel *
+syck_parser_current_level( SyckParser *p )
+{
+    return &p->levels[p->lvl_idx-1];
+}
+
+void
+syck_parser_pop_level( SyckParser *p )
+{
+    ASSERT( p != NULL );
+
+    /* The root level should never be popped */
+    if ( p->lvl_idx <= 1 ) return;
+
+    p->lvl_idx -= 1;
+    free( p->levels[p->lvl_idx].domain );
+}
+
+void 
+syck_parser_add_level( SyckParser *p, int len, enum syck_level_status status )
+{
+    ASSERT( p != NULL );
+    if ( p->lvl_idx + 1 > p->lvl_capa )
+    {
+        p->lvl_capa += ALLOC_CT;
+        S_REALLOC_N( p->levels, SyckLevel, p->lvl_capa );
+    }
+
+    ASSERT( len > p->levels[p->lvl_idx-1].spaces );
+    p->levels[p->lvl_idx].spaces = len;
+    p->levels[p->lvl_idx].ncount = 0;
+    p->levels[p->lvl_idx].domain = syck_strndup( p->levels[p->lvl_idx-1].domain, strlen( p->levels[p->lvl_idx-1].domain ) );
+    p->levels[p->lvl_idx].status = status;
+    p->lvl_idx += 1;
+}
+
+void
+free_any_io( SyckParser *p )
+{
+    ASSERT( p != NULL );
+    switch ( p->io_type )
+    {
+        case syck_io_str:
+            if ( p->io.str != NULL ) 
+            {
+                S_FREE( p->io.str );
+                p->io.str = NULL;
+            }
+        break;
+
+        case syck_io_file:
+            if ( p->io.file != NULL ) 
+            {
+                S_FREE( p->io.file );
+                p->io.file = NULL;
+            }
+        break;
+    }
+}
+
+long
+syck_move_tokens( SyckParser *p )
+{
+    long count, skip;
+    ASSERT( p->buffer != NULL );
+
+    if ( p->token == NULL )
+        return 0;
+
+    skip = p->limit - p->token;
+    if ( ( count = p->token - p->buffer ) )
+    {
+	if (skip > 0)
+	    S_MEMMOVE( p->buffer, p->token, char, skip );
+        p->token = p->buffer;
+        p->marker -= count;
+        p->cursor -= count;
+        p->toktmp -= count;
+        p->limit -= count;
+        p->lineptr -= count;
+        p->linectptr -= count;
+    }
+    return skip;
+}
+
+void
+syck_check_limit( SyckParser *p, long len )
+{
+    if ( p->cursor == NULL )
+    {
+        p->cursor = p->buffer;
+        p->lineptr = p->buffer;
+        p->linectptr = p->buffer;
+        p->marker = p->buffer;
+    }
+    p->limit = p->buffer + len;
+}
+
+long
+syck_parser_read( SyckParser *p )
+{
+    long len = 0;
+    long skip = 0;
+    ASSERT( p != NULL );
+    switch ( p->io_type )
+    {
+        case syck_io_str:
+            skip = syck_move_tokens( p );
+            len = (p->io.str->read)( p->buffer, p->io.str, SYCK_BUFFERSIZE - 1, skip );
+            break;
+
+        case syck_io_file:
+            skip = syck_move_tokens( p );
+            len = (p->io.file->read)( p->buffer, p->io.file, SYCK_BUFFERSIZE - 1, skip );
+            break;
+    }
+    syck_check_limit( p, len );
+    return len;
+}
+
+long
+syck_parser_readlen( SyckParser *p, long max_size )
+{
+    long len = 0;
+    long skip = 0;
+    ASSERT( p != NULL );
+    switch ( p->io_type )
+    {
+        case syck_io_str:
+            skip = syck_move_tokens( p );
+            len = (p->io.str->read)( p->buffer, p->io.str, max_size, skip );
+            break;
+
+        case syck_io_file:
+            skip = syck_move_tokens( p );
+            len = (p->io.file->read)( p->buffer, p->io.file, max_size, skip );
+            break;
+    }
+    syck_check_limit( p, len );
+    return len;
+}
+
+SYMID
+syck_parse( SyckParser *p )
+{
+    ASSERT( p != NULL );
+
+    syck_st_free( p );
+    syck_parser_reset_levels( p );
+    syckparse( p );
+    return p->root;
+}
+
+void
+syck_default_error_handler( SyckParser *p, char *msg )
+{
+    printf( "Error at [Line %d, Col %d]: %s\n", 
+        p->linect,
+        p->cursor - p->lineptr,
+        msg );
+}
+
diff --git a/ruby_1_8_6/ext/syck/syck.h b/ruby_1_8_6/ext/syck/syck.h
new file mode 100644
index 0000000000..e7d07e9c0d
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/syck.h
@@ -0,0 +1,458 @@
+/*
+ * syck.h
+ *
+ * $Author$
+ * $Date$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+
+#ifndef SYCK_H
+#define SYCK_H
+
+#define SYCK_YAML_MAJOR 1
+#define SYCK_YAML_MINOR 0
+
+#define SYCK_VERSION    "0.60"
+#define YAML_DOMAIN     "yaml.org,2002"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include "st.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*
+ * Memory Allocation
+ */
+#if defined(HAVE_ALLOCA_H) && !defined(__GNUC__)
+#include <alloca.h>
+#endif
+
+#if DEBUG
+  void syck_assert( char *, unsigned );
+# define ASSERT(f) \
+    if ( f ) \
+        {}   \
+    else     \
+        syck_assert( __FILE__, __LINE__ )
+#else
+# define ASSERT(f)
+#endif
+
+#ifndef NULL
+# define NULL (void *)0
+#endif
+
+#define ALLOC_CT 8
+#define SYCK_BUFFERSIZE 4096
+#define S_ALLOC_N(type,n) (type*)malloc(sizeof(type)*(n))
+#define S_ALLOC(type) (type*)malloc(sizeof(type))
+#define S_REALLOC_N(var,type,n) (var)=(type*)realloc((char*)(var),sizeof(type)*(n))
+#define S_FREE(n) if (n) { free(n); n = NULL; }
+
+#define S_ALLOCA_N(type,n) (type*)alloca(sizeof(type)*(n))
+
+#define S_MEMZERO(p,type,n) memset((p), 0, sizeof(type)*(n))
+#define S_MEMCPY(p1,p2,type,n) memcpy((p1), (p2), sizeof(type)*(n))
+#define S_MEMMOVE(p1,p2,type,n) memmove((p1), (p2), sizeof(type)*(n))
+#define S_MEMCMP(p1,p2,type,n) memcmp((p1), (p2), sizeof(type)*(n))
+
+#define BLOCK_FOLD  10
+#define BLOCK_LIT   20
+#define BLOCK_PLAIN 30
+#define NL_CHOMP    40
+#define NL_KEEP     50
+
+/*
+ * Node definitions
+ */
+#ifndef ST_DATA_T_DEFINED
+typedef long st_data_t;
+#endif
+
+#define SYMID unsigned long
+
+typedef struct _syck_node SyckNode;
+
+enum syck_kind_tag {
+    syck_map_kind,
+    syck_seq_kind,
+    syck_str_kind
+};
+
+enum map_part {
+    map_key,
+    map_value
+};
+
+enum map_style {
+    map_none,
+    map_inline
+};
+
+enum seq_style {
+    seq_none,
+    seq_inline
+};
+
+enum scalar_style {
+    scalar_none,
+    scalar_1quote,
+    scalar_2quote,
+    scalar_fold,
+    scalar_literal,
+    scalar_plain
+};
+
+/*
+ * Node metadata struct
+ */
+struct _syck_node {
+    /* Symbol table ID */
+    SYMID id;
+    /* Underlying kind */
+    enum syck_kind_tag kind;
+    /* Fully qualified tag-uri for type */
+    char *type_id;
+    /* Anchor name */
+    char *anchor;
+    union {
+        /* Storage for map data */
+        struct SyckMap {
+            enum map_style style;
+            SYMID *keys;
+            SYMID *values;
+            long capa;
+            long idx;
+        } *pairs;
+        /* Storage for sequence data */
+        struct SyckSeq {
+            enum seq_style style;
+            SYMID *items;
+            long capa;
+            long idx;
+        } *list;
+        /* Storage for string data */
+        struct SyckStr {
+            enum scalar_style style;
+            char *ptr;
+            long len;
+        } *str;
+    } data;
+    /* Shortcut node */
+    void *shortcut;
+};
+
+/*
+ * Parser definitions
+ */
+typedef struct _syck_parser SyckParser;
+typedef struct _syck_file SyckIoFile;
+typedef struct _syck_str SyckIoStr;
+typedef struct _syck_level SyckLevel;
+
+typedef SYMID (*SyckNodeHandler)(SyckParser *, SyckNode *);
+typedef void (*SyckErrorHandler)(SyckParser *, char *);
+typedef SyckNode * (*SyckBadAnchorHandler)(SyckParser *, char *);
+typedef long (*SyckIoFileRead)(char *, SyckIoFile *, long, long); 
+typedef long (*SyckIoStrRead)(char *, SyckIoStr *, long, long);
+
+enum syck_io_type {
+    syck_io_str,
+    syck_io_file
+};
+
+enum syck_parser_input {
+    syck_yaml_utf8,
+    syck_yaml_utf16,
+    syck_yaml_utf32,
+    syck_bytecode_utf8
+};
+
+enum syck_level_status {
+    syck_lvl_header,
+    syck_lvl_doc,
+    syck_lvl_open,
+    syck_lvl_seq,
+    syck_lvl_map,
+    syck_lvl_block,
+    syck_lvl_str,
+    syck_lvl_iseq,
+    syck_lvl_imap,
+    syck_lvl_end,
+    syck_lvl_pause,
+    syck_lvl_anctag,
+    syck_lvl_mapx,
+    syck_lvl_seqx
+};
+
+/*
+ * Parser structs
+ */
+struct _syck_file {
+    /* File pointer */
+    FILE *ptr;
+    /* Function which FILE -> buffer */
+    SyckIoFileRead read;
+};
+
+struct _syck_str {
+    /* String buffer pointers */
+    char *beg, *ptr, *end;
+    /* Function which string -> buffer */
+    SyckIoStrRead read;
+};
+
+struct _syck_level {
+    /* Indent */
+    int spaces;
+    /* Counts nodes emitted at this level, useful for parsing 
+     * keys and pairs in bytecode */
+    int ncount;
+    /* Does node have anchors or tags? */
+    int anctag;
+    /* Domain prefixing at the given level */
+    char *domain;
+    /* Keeps a node status */
+    enum syck_level_status status;
+};
+
+struct _syck_parser {
+    /* Root node */
+    SYMID root, root_on_error;
+    /* Implicit typing flag */
+    int implicit_typing, taguri_expansion;
+    /* Scripting language function to handle nodes */
+    SyckNodeHandler handler;
+    /* Error handler */
+    SyckErrorHandler error_handler;
+    /* InvalidAnchor handler */
+    SyckBadAnchorHandler bad_anchor_handler;
+    /* Parser input type */
+    enum syck_parser_input input_type;
+    /* IO type */
+    enum syck_io_type io_type;
+    /* Custom buffer size */
+    size_t bufsize;
+    /* Buffer pointers */
+    char *buffer, *linectptr, *lineptr, *toktmp, *token, *cursor, *marker, *limit;
+    /* Line counter */
+    int linect;
+    /* Last token from yylex() */
+    int last_token;
+    /* Force a token upon next call to yylex() */
+    int force_token;
+    /* EOF flag */
+    int eof;
+    union {
+        SyckIoFile *file;
+        SyckIoStr *str;
+    } io;
+    /* Symbol table for anchors */
+    st_table *anchors, *bad_anchors;
+    /* Optional symbol table for SYMIDs */
+    st_table *syms;
+    /* Levels of indentation */
+    SyckLevel *levels;
+    int lvl_idx;
+    int lvl_capa;
+    /* Pointer for extension's use */
+    void *bonus;
+};
+
+/*
+ * Emitter definitions
+ */
+typedef struct _syck_emitter SyckEmitter;
+typedef struct _syck_emitter_node SyckEmitterNode;
+
+typedef void (*SyckOutputHandler)(SyckEmitter *, char *, long); 
+typedef void (*SyckEmitterHandler)(SyckEmitter *, st_data_t); 
+
+enum doc_stage {
+    doc_open,
+    doc_processing
+};
+
+/*
+ * Emitter struct
+ */
+struct _syck_emitter {
+    /* Headerless doc flag */
+    int headless;
+    /* Force header? */
+    int use_header;
+    /* Force version? */
+    int use_version;
+    /* Sort hash keys */
+    int sort_keys;
+    /* Anchor format */
+    char *anchor_format;
+    /* Explicit typing on all collections? */
+    int explicit_typing;
+    /* Best width on folded scalars */
+    int best_width;
+    /* Use literal[1] or folded[2] blocks on all text? */
+    enum scalar_style style;
+    /* Stage of written document */
+    enum doc_stage stage;
+    /* Level counter */
+    int level;
+    /* Default indentation */
+    int indent;
+    /* Object ignore ID */
+    SYMID ignore_id;
+    /* Symbol table for anchors */
+    st_table *markers, *anchors, *anchored;
+    /* Custom buffer size */
+    size_t bufsize;
+    /* Buffer */
+    char *buffer, *marker;
+    /* Absolute position of the buffer */
+    long bufpos;
+    /* Handler for emitter nodes */
+    SyckEmitterHandler emitter_handler;
+    /* Handler for output */
+    SyckOutputHandler output_handler;
+    /* Levels of indentation */
+    SyckLevel *levels;
+    int lvl_idx;
+    int lvl_capa;
+    /* Pointer for extension's use */
+    void *bonus;
+};
+
+/*
+ * Emitter node metadata struct
+ */
+struct _syck_emitter_node {
+    /* Node buffer position */
+    long pos;
+    /* Current indent */
+    long indent;
+    /* Collection? */
+    int is_shortcut;
+};
+
+/*
+ * Handler prototypes
+ */
+SYMID syck_hdlr_add_node( SyckParser *, SyckNode * );
+SyckNode *syck_hdlr_add_anchor( SyckParser *, char *, SyckNode * );
+void syck_hdlr_remove_anchor( SyckParser *, char * );
+SyckNode *syck_hdlr_get_anchor( SyckParser *, char * );
+void syck_add_transfer( char *, SyckNode *, int );
+char *syck_xprivate( char *, int );
+char *syck_taguri( char *, char *, int );
+int syck_tagcmp( char *, char * );
+int syck_add_sym( SyckParser *, char * );
+int syck_lookup_sym( SyckParser *, SYMID, char ** );
+int syck_try_implicit( SyckNode * );
+char *syck_type_id_to_uri( char * );
+void try_tag_implicit( SyckNode *, int );
+char *syck_match_implicit( char *, size_t );
+
+/*
+ * API prototypes
+ */
+char *syck_strndup( char *, long );
+long syck_io_file_read( char *, SyckIoFile *, long, long );
+long syck_io_str_read( char *, SyckIoStr *, long, long );
+char *syck_base64enc( char *, long );
+char *syck_base64dec( char *, long );
+SyckEmitter *syck_new_emitter();
+SYMID syck_emitter_mark_node( SyckEmitter *, st_data_t );
+void syck_emitter_ignore_id( SyckEmitter *, SYMID );
+void syck_output_handler( SyckEmitter *, SyckOutputHandler );
+void syck_emitter_handler( SyckEmitter *, SyckEmitterHandler );
+void syck_free_emitter( SyckEmitter * );
+void syck_emitter_clear( SyckEmitter * );
+void syck_emitter_write( SyckEmitter *, char *, long );
+void syck_emitter_escape( SyckEmitter *, char *, long );
+void syck_emitter_flush( SyckEmitter *, long );
+void syck_emit( SyckEmitter *, st_data_t );
+void syck_emit_scalar( SyckEmitter *, char *, enum scalar_style, int, int, char, char *, long );
+void syck_emit_1quoted( SyckEmitter *, int, char *, long );
+void syck_emit_2quoted( SyckEmitter *, int, char *, long );
+void syck_emit_folded( SyckEmitter *, int, char, char *, long );
+void syck_emit_literal( SyckEmitter *, char, char *, long );
+void syck_emit_seq( SyckEmitter *, char *, enum seq_style );
+void syck_emit_item( SyckEmitter *, st_data_t );
+void syck_emit_map( SyckEmitter *, char *, enum map_style );
+void syck_emit_end( SyckEmitter * );
+void syck_emit_tag( SyckEmitter *, char *, char * );
+void syck_emit_indent( SyckEmitter * );
+SyckLevel *syck_emitter_current_level( SyckEmitter * );
+SyckLevel *syck_emitter_parent_level( SyckEmitter * );
+void syck_emitter_pop_level( SyckEmitter * );
+void syck_emitter_add_level( SyckEmitter *, int, enum syck_level_status );
+void syck_emitter_reset_levels( SyckEmitter * );
+SyckParser *syck_new_parser();
+void syck_free_parser( SyckParser * );
+void syck_parser_set_root_on_error( SyckParser *, SYMID );
+void syck_parser_implicit_typing( SyckParser *, int );
+void syck_parser_taguri_expansion( SyckParser *, int );
+int syck_scan_scalar( int, char *, long );
+void syck_parser_handler( SyckParser *, SyckNodeHandler );
+void syck_parser_error_handler( SyckParser *, SyckErrorHandler );
+void syck_parser_bad_anchor_handler( SyckParser *, SyckBadAnchorHandler );
+void syck_parser_set_input_type( SyckParser *, enum syck_parser_input );
+void syck_parser_file( SyckParser *, FILE *, SyckIoFileRead );
+void syck_parser_str( SyckParser *, char *, long, SyckIoStrRead );
+void syck_parser_str_auto( SyckParser *, char *, SyckIoStrRead );
+SyckLevel *syck_parser_current_level( SyckParser * );
+void syck_parser_add_level( SyckParser *, int, enum syck_level_status );
+void syck_parser_pop_level( SyckParser * );
+void free_any_io( SyckParser * );
+long syck_parser_read( SyckParser * );
+long syck_parser_readlen( SyckParser *, long );
+SYMID syck_parse( SyckParser * );
+void syck_default_error_handler( SyckParser *, char * );
+SYMID syck_yaml2byte_handler( SyckParser *, SyckNode * );
+char *syck_yaml2byte( char * );
+
+/*
+ * Allocation prototypes
+ */
+SyckNode *syck_alloc_map();
+SyckNode *syck_alloc_seq();
+SyckNode *syck_alloc_str();
+void syck_free_node( SyckNode * );
+void syck_free_members( SyckNode * );
+SyckNode *syck_new_str( char *, enum scalar_style );
+SyckNode *syck_new_str2( char *, long, enum scalar_style );
+void syck_replace_str( SyckNode *, char *, enum scalar_style );
+void syck_replace_str2( SyckNode *, char *, long, enum scalar_style );
+void syck_str_blow_away_commas( SyckNode * );
+char *syck_str_read( SyckNode * );
+SyckNode *syck_new_map( SYMID, SYMID );
+void syck_map_empty( SyckNode * );
+void syck_map_add( SyckNode *, SYMID, SYMID );
+SYMID syck_map_read( SyckNode *, enum map_part, long );
+void syck_map_assign( SyckNode *, enum map_part, long, SYMID );
+long syck_map_count( SyckNode * );
+void syck_map_update( SyckNode *, SyckNode * );
+SyckNode *syck_new_seq( SYMID );
+void syck_seq_empty( SyckNode * );
+void syck_seq_add( SyckNode *, SYMID );
+void syck_seq_assign( SyckNode *, long, SYMID );
+SYMID syck_seq_read( SyckNode *, long );
+long syck_seq_count( SyckNode * );
+
+/*
+ * Lexer prototypes
+ */
+void syckerror( char * );
+int syckparse( void * );
+union YYSTYPE;
+int sycklex( union YYSTYPE *, SyckParser * );
+
+#if defined(__cplusplus)
+}  /* extern "C" { */
+#endif
+
+#endif /* ifndef SYCK_H */
diff --git a/ruby_1_8_6/ext/syck/token.c b/ruby_1_8_6/ext/syck/token.c
new file mode 100644
index 0000000000..3c6cd1a9cf
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/token.c
@@ -0,0 +1,2725 @@
+/* Generated by re2c 0.9.10 on Tue Sep 20 17:46:17 2005 */
+#line 1 "token.re"
+/*
+ * token.re
+ *
+ * $Author$
+ * $Date$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+#include "ruby.h"
+#include "syck.h"
+#include "gram.h"
+
+/*
+ * Allocate quoted strings in chunks
+ */
+#define QUOTELEN    1024
+
+/*
+ * They do my bidding...
+ */
+#define YYCTYPE     char
+#define YYCURSOR    parser->cursor
+#define YYMARKER    parser->marker
+#define YYLIMIT     parser->limit
+#define YYTOKEN     parser->token
+#define YYTOKTMP    parser->toktmp
+#define YYLINEPTR   parser->lineptr
+#define YYLINECTPTR parser->linectptr
+#define YYLINE      parser->linect
+#define YYFILL(n)   syck_parser_read(parser)
+
+/*
+ * Repositions the cursor at `n' offset from the token start.
+ * Only works in `Header' and `Document' sections.
+ */
+#define YYPOS(n)    YYCURSOR = YYTOKEN + n
+
+/*
+ * Track line numbers
+ */
+#define NEWLINE(ptr)    YYLINEPTR = ptr + newline_len(ptr); if ( YYLINEPTR > YYLINECTPTR ) { YYLINE++; YYLINECTPTR = YYLINEPTR; }
+
+/*
+ * I like seeing the level operations as macros...
+ */
+#define ADD_LEVEL(len, status)  syck_parser_add_level( parser, len, status )
+#define POP_LEVEL()     syck_parser_pop_level( parser )
+#define CURRENT_LEVEL() syck_parser_current_level( parser )
+
+/*
+ * Force a token next time around sycklex()
+ */
+#define FORCE_NEXT_TOKEN(tok)    parser->force_token = tok;
+
+/*
+ * Nice little macro to ensure we're YAML_IOPENed to the current level.
+ * * Only use this macro in the "Document" section *
+ */
+#define ENSURE_YAML_IOPEN(last_lvl, to_len, reset) \
+        if ( last_lvl->spaces < to_len ) \
+        { \
+            if ( last_lvl->status == syck_lvl_iseq || last_lvl->status == syck_lvl_imap ) \
+            { \
+                goto Document; \
+            } \
+            else \
+            { \
+                ADD_LEVEL( to_len, syck_lvl_doc ); \
+                if ( reset == 1 ) YYPOS(0); \
+                return YAML_IOPEN; \
+            } \
+        } 
+
+/*
+ * Nice little macro to ensure closure of levels.
+ * * Only use this macro in the "Document" section *
+ */
+#define ENSURE_YAML_IEND(last_lvl, to_len) \
+        if ( last_lvl->spaces > to_len ) \
+        { \
+            syck_parser_pop_level( parser ); \
+            YYPOS(0); \
+            return YAML_IEND; \
+        }
+
+/*
+ * Concatenates quoted string items and manages allocation
+ * to the quoted string
+ */
+#define QUOTECAT(s, c, i, l) \
+        { \
+            if ( i + 1 >= c ) \
+            { \
+                c += QUOTELEN; \
+                S_REALLOC_N( s, char, c ); \
+            } \
+            s[i++] = l; \
+            s[i] = '\0'; \
+        }
+
+#define QUOTECATS(s, c, i, cs, cl) \
+        { \
+            while ( i + cl >= c ) \
+            { \
+                c += QUOTELEN; \
+                S_REALLOC_N( s, char, c ); \
+            } \
+            S_MEMCPY( s + i, cs, char, cl ); \
+            i += cl; \
+            s[i] = '\0'; \
+        }
+
+/*
+ * Tags a plain scalar with a transfer method
+ * * Use only in "Plain" section *
+ */
+#define RETURN_IMPLICIT() \
+    { \
+        SyckNode *n = syck_alloc_str(); \
+        YYCURSOR = YYTOKEN; \
+        n->data.str->ptr = qstr; \
+        n->data.str->len = qidx; \
+        n->data.str->style = scalar_plain; \
+        sycklval->nodeData = n; \
+        if ( parser->implicit_typing == 1 ) \
+        { \
+            try_tag_implicit( sycklval->nodeData, parser->taguri_expansion ); \
+        } \
+        return YAML_PLAIN; \
+    }
+
+/* concat the inline characters to the plain scalar */
+#define PLAIN_NOT_INL() \
+    if ( *(YYCURSOR - 1) == ' ' || is_newline( YYCURSOR - 1 ) ) \
+    { \
+        YYCURSOR--; \
+    } \
+    QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN); \
+    goto Plain2;
+
+/* trim spaces off the end in case of indent */
+#define PLAIN_IS_INL() \
+    char *walker = qstr + qidx - 1; \
+    while ( walker > qstr && ( *walker == '\n' || *walker == ' ' || *walker == '\t' ) ) \
+    { \
+        qidx--; \
+        walker[0] = '\0'; \
+        walker--; \
+    }
+
+/*
+ * Keep or chomp block?
+ * * Use only in "ScalarBlock" section *
+ */
+#define RETURN_YAML_BLOCK() \
+    { \
+        SyckNode *n = syck_alloc_str(); \
+        if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
+        { \
+            n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 ); \
+        } \
+        else \
+        { \
+            n->type_id = syck_strndup( "str", 3 ); \
+        } \
+        n->data.str->ptr = qstr; \
+        n->data.str->len = qidx; \
+        if ( blockType == BLOCK_LIT ) { \
+            n->data.str->style = scalar_literal; \
+        } else { \
+            n->data.str->style = scalar_fold; \
+        } \
+        if ( qidx > 0 ) \
+        { \
+            if ( nlDoWhat != NL_KEEP ) \
+            { \
+                char *fc = n->data.str->ptr + n->data.str->len - 1; \
+                while ( is_newline( fc ) ) fc--; \
+                if ( nlDoWhat != NL_CHOMP && fc < n->data.str->ptr + n->data.str->len - 1 ) \
+                    fc += 1; \
+                n->data.str->len = fc - n->data.str->ptr + 1; \
+            } \
+        } \
+        sycklval->nodeData = n; \
+        return YAML_BLOCK; \
+    }
+
+/*
+ * Handles newlines, calculates indent
+ */
+#define GOBBLE_UP_YAML_INDENT( ict, start ) \
+    char *indent = start; \
+    NEWLINE(indent); \
+    while ( indent < YYCURSOR ) \
+    { \
+        if ( is_newline( ++indent ) ) \
+        { \
+            NEWLINE(indent); \
+        } \
+    } \
+    ict = 0; \
+    if ( *YYCURSOR == '\0' ) \
+    { \
+        ict = -1; \
+        start = YYCURSOR - 1; \
+    } \
+    else if ( *YYLINEPTR == ' ' ) \
+    { \
+        ict = YYCURSOR - YYLINEPTR; \
+    }
+
+/*
+ * If an indent exists at the current level, back up.
+ */
+#define GET_TRUE_YAML_INDENT(indt_len) \
+    { \
+        SyckLevel *lvl_deep = CURRENT_LEVEL(); \
+        indt_len = lvl_deep->spaces; \
+        if ( lvl_deep->status == syck_lvl_seq || ( indt_len == YYCURSOR - YYLINEPTR && lvl_deep->status != syck_lvl_map )  ) \
+        { \
+            SyckLevel *lvl_over; \
+            parser->lvl_idx--; \
+            lvl_over = CURRENT_LEVEL(); \
+            indt_len = lvl_over->spaces; \
+            parser->lvl_idx++; \
+        } \
+    }
+
+/*
+ * Argjh!  I hate globals!  Here for syckerror() only!
+ */
+SyckParser *syck_parser_ptr = NULL;
+
+/*
+ * Accessory funcs later in this file.
+ */
+void eat_comments( SyckParser * );
+char escape_seq( char );
+int is_newline( char *ptr );
+int newline_len( char *ptr );
+int sycklex_yaml_utf8( YYSTYPE *, SyckParser * );
+int sycklex_bytecode_utf8( YYSTYPE *, SyckParser * );
+int syckwrap();
+
+/*
+ * My own re-entrant sycklex() using re2c.
+ * You really get used to the limited regexp.
+ * It's really nice to not rely on backtracking and such.
+ */
+int
+sycklex( YYSTYPE *sycklval, SyckParser *parser )
+{
+    switch ( parser->input_type )
+    {
+        case syck_yaml_utf8:
+        return sycklex_yaml_utf8( sycklval, parser );
+
+        case syck_yaml_utf16:
+            syckerror( "UTF-16 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
+        break;
+
+        case syck_yaml_utf32:
+            syckerror( "UTF-32 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
+        break;
+
+        case syck_bytecode_utf8:
+        return sycklex_bytecode_utf8( sycklval, parser );
+    }
+    return YAML_DOCSEP;
+}
+
+/*
+ * Parser for standard YAML [UTF-8]
+ */
+int
+sycklex_yaml_utf8( YYSTYPE *sycklval, SyckParser *parser )
+{
+    int doc_level = 0;
+    syck_parser_ptr = parser;
+    if ( YYCURSOR == NULL ) 
+    {
+        syck_parser_read( parser );
+    }
+
+    if ( parser->force_token != 0 )
+    {
+        int t = parser->force_token;
+        parser->force_token = 0;
+        return t;
+    }
+
+#line 315 "token.re"
+
+
+    if ( YYLINEPTR != YYCURSOR )
+    {
+        goto Document;
+    }
+
+Header:
+
+    YYTOKEN = YYCURSOR;
+
+
+#line 307 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy0;
+	++YYCURSOR;
+yy0:
+	if((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy7;
+	case 0x09:	case ' ':	goto yy12;
+	case 0x0A:	goto yy9;
+	case 0x0D:	goto yy11;
+	case '#':	goto yy5;
+	case '-':	goto yy2;
+	case '.':	goto yy4;
+	default:	goto yy14;
+	}
+yy2:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case '-':	goto yy28;
+	default:	goto yy3;
+	}
+yy3:
+#line 374 "token.re"
+{   YYPOS(0);
+                        goto Document; 
+                    }
+#line 337 "<stdout>"
+yy4:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case '.':	goto yy21;
+	default:	goto yy3;
+	}
+yy5:	++YYCURSOR;
+	goto yy6;
+yy6:
+#line 356 "token.re"
+{   eat_comments( parser ); 
+                        goto Header;
+                    }
+#line 351 "<stdout>"
+yy7:	++YYCURSOR;
+	goto yy8;
+yy8:
+#line 360 "token.re"
+{   SyckLevel *lvl = CURRENT_LEVEL();
+                        ENSURE_YAML_IEND(lvl, -1);
+                        YYPOS(0);
+                        return 0; 
+                    }
+#line 361 "<stdout>"
+yy9:	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	goto yy18;
+yy10:
+#line 366 "token.re"
+{   GOBBLE_UP_YAML_INDENT( doc_level, YYTOKEN );
+                        goto Header; 
+                    }
+#line 370 "<stdout>"
+yy11:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy17;
+	default:	goto yy3;
+	}
+yy12:	++YYCURSOR;
+	yych = *YYCURSOR;
+	goto yy16;
+yy13:
+#line 370 "token.re"
+{   doc_level = YYCURSOR - YYLINEPTR;
+                        goto Header;
+                    }
+#line 384 "<stdout>"
+yy14:	yych = *++YYCURSOR;
+	goto yy3;
+yy15:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy16;
+yy16:	switch(yych){
+	case 0x09:	case ' ':	goto yy15;
+	default:	goto yy13;
+	}
+yy17:	yyaccept = 1;
+	YYMARKER = ++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy18;
+yy18:	switch(yych){
+	case 0x0A:	case ' ':	goto yy17;
+	case 0x0D:	goto yy19;
+	default:	goto yy10;
+	}
+yy19:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy17;
+	default:	goto yy20;
+	}
+yy20:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 1:	goto yy10;
+	case 0:	goto yy3;
+	}
+yy21:	yych = *++YYCURSOR;
+	switch(yych){
+	case '.':	goto yy22;
+	default:	goto yy20;
+	}
+yy22:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy23;
+	case 0x0D:	goto yy27;
+	case ' ':	goto yy25;
+	default:	goto yy20;
+	}
+yy23:	++YYCURSOR;
+	goto yy24;
+yy24:
+#line 342 "token.re"
+{   SyckLevel *lvl = CURRENT_LEVEL();
+                        if ( lvl->status == syck_lvl_header )
+                        {
+                            goto Header; 
+                        }
+                        else
+                        {
+                            ENSURE_YAML_IEND(lvl, -1);
+                            YYPOS(0);
+                            return 0; 
+                        }
+                        return 0; 
+                    }
+#line 446 "<stdout>"
+yy25:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy26;
+yy26:	switch(yych){
+	case ' ':	goto yy25;
+	default:	goto yy24;
+	}
+yy27:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy23;
+	default:	goto yy20;
+	}
+yy28:	yych = *++YYCURSOR;
+	switch(yych){
+	case '-':	goto yy29;
+	default:	goto yy20;
+	}
+yy29:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy30;
+	case 0x0D:	goto yy34;
+	case ' ':	goto yy32;
+	default:	goto yy20;
+	}
+yy30:	++YYCURSOR;
+	goto yy31;
+yy31:
+#line 328 "token.re"
+{   SyckLevel *lvl = CURRENT_LEVEL();
+                        if ( lvl->status == syck_lvl_header )
+                        {
+                            YYPOS(3);
+                            goto Directive; 
+                        }
+                        else
+                        {
+                            ENSURE_YAML_IEND(lvl, -1);
+                            YYPOS(0);
+                            return 0; 
+                        }
+                    }
+#line 489 "<stdout>"
+yy32:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy33;
+yy33:	switch(yych){
+	case ' ':	goto yy32;
+	default:	goto yy31;
+	}
+yy34:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy30;
+	default:	goto yy20;
+	}
+}
+#line 378 "token.re"
+
+
+Document:
+    {
+        SyckLevel *lvl = CURRENT_LEVEL();
+        if ( lvl->status == syck_lvl_header )
+        {
+            lvl->status = syck_lvl_doc;
+        }
+
+        YYTOKEN = YYCURSOR;
+
+
+#line 518 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy35;
+	++YYCURSOR;
+yy35:
+	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy62;
+	case 0x09:	case ' ':	goto yy60;
+	case 0x0A:	goto yy37;
+	case 0x0D:	goto yy39;
+	case '!':	goto yy51;
+	case '"':	goto yy55;
+	case '#':	goto yy58;
+	case '&':	goto yy49;
+	case '\'':	goto yy53;
+	case '*':	goto yy50;
+	case ',':	case ':':	goto yy47;
+	case '-':	case '?':	goto yy48;
+	case '>':	case '|':	goto yy57;
+	case '[':	goto yy41;
+	case ']':	case '}':	goto yy45;
+	case '{':	goto yy43;
+	default:	goto yy64;
+	}
+yy37:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	goto yy92;
+yy38:
+#line 392 "token.re"
+{   /* Isolate spaces */
+                        int indt_len;
+                        GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
+                        lvl = CURRENT_LEVEL();
+                        doc_level = 0;
+
+                        /* XXX: Comment lookahead */
+                        if ( *YYCURSOR == '#' )
+                        {
+                            goto Document;
+                        }
+
+                        /* Ignore indentation inside inlines */
+                        if ( lvl->status == syck_lvl_iseq || lvl->status == syck_lvl_imap )
+                        {
+                            goto Document;
+                        }
+
+                        /* Check for open indent */
+                        ENSURE_YAML_IEND(lvl, indt_len);
+                        ENSURE_YAML_IOPEN(lvl, indt_len, 0);
+                        if ( indt_len == -1 )
+                        {
+                            return 0;
+                        }
+                        return YAML_INDENT;
+                    }
+#line 578 "<stdout>"
+yy39:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy91;
+	default:	goto yy40;
+	}
+yy40:
+#line 497 "token.re"
+{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+                        goto Plain; 
+                    }
+#line 589 "<stdout>"
+yy41:	++YYCURSOR;
+	goto yy42;
+yy42:
+#line 420 "token.re"
+{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+                        lvl = CURRENT_LEVEL();
+                        ADD_LEVEL(lvl->spaces + 1, syck_lvl_iseq);
+                        return YYTOKEN[0]; 
+                    }
+#line 599 "<stdout>"
+yy43:	++YYCURSOR;
+	goto yy44;
+yy44:
+#line 426 "token.re"
+{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+                        lvl = CURRENT_LEVEL();
+                        ADD_LEVEL(lvl->spaces + 1, syck_lvl_imap);
+                        return YYTOKEN[0]; 
+                    }
+#line 609 "<stdout>"
+yy45:	++YYCURSOR;
+	goto yy46;
+yy46:
+#line 432 "token.re"
+{   POP_LEVEL();
+                        return YYTOKEN[0]; 
+                    }
+#line 617 "<stdout>"
+yy47:	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 0x0A:	goto yy86;
+	case 0x0D:	goto yy90;
+	case ' ':	goto yy88;
+	default:	goto yy40;
+	}
+yy48:	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 0x0A:	goto yy81;
+	case 0x0D:	goto yy85;
+	case ' ':	goto yy83;
+	default:	goto yy40;
+	}
+yy49:	yych = *++YYCURSOR;
+	switch(yych){
+	case '-':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy78;
+	default:	goto yy40;
+	}
+yy50:	yych = *++YYCURSOR;
+	switch(yych){
+	case '-':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy75;
+	default:	goto yy40;
+	}
+yy51:	++YYCURSOR;
+	goto yy52;
+yy52:
+#line 471 "token.re"
+{   goto TransferMethod; }
+#line 767 "<stdout>"
+yy53:	++YYCURSOR;
+	goto yy54;
+yy54:
+#line 473 "token.re"
+{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+                        goto SingleQuote; }
+#line 774 "<stdout>"
+yy55:	++YYCURSOR;
+	goto yy56;
+yy56:
+#line 476 "token.re"
+{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+                        goto DoubleQuote; }
+#line 781 "<stdout>"
+yy57:	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 0x0A:	goto yy70;
+	case 0x0D:	goto yy74;
+	case ' ':	goto yy72;
+	case '+':	case '-':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy67;
+	default:	goto yy40;
+	}
+yy58:	++YYCURSOR;
+	goto yy59;
+yy59:
+#line 486 "token.re"
+{   eat_comments( parser ); 
+                        goto Document;
+                    }
+#line 807 "<stdout>"
+yy60:	++YYCURSOR;
+	yych = *YYCURSOR;
+	goto yy66;
+yy61:
+#line 490 "token.re"
+{   goto Document; }
+#line 814 "<stdout>"
+yy62:	++YYCURSOR;
+	goto yy63;
+yy63:
+#line 492 "token.re"
+{   ENSURE_YAML_IEND(lvl, -1);
+                        YYPOS(0);
+                        return 0; 
+                    }
+#line 823 "<stdout>"
+yy64:	yych = *++YYCURSOR;
+	goto yy40;
+yy65:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy66;
+yy66:	switch(yych){
+	case 0x09:	case ' ':	goto yy65;
+	default:	goto yy61;
+	}
+yy67:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	goto yy68;
+yy68:	switch(yych){
+	case 0x0A:	goto yy70;
+	case 0x0D:	goto yy74;
+	case ' ':	goto yy72;
+	case '+':	case '-':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy67;
+	default:	goto yy69;
+	}
+yy69:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy38;
+	case 1:	goto yy40;
+	}
+yy70:	++YYCURSOR;
+	goto yy71;
+yy71:
+#line 479 "token.re"
+{   if ( is_newline( YYCURSOR - 1 ) ) 
+                        {
+                            YYCURSOR--;
+                        }
+                        goto ScalarBlock; 
+                    }
+#line 869 "<stdout>"
+yy72:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy73;
+yy73:	switch(yych){
+	case ' ':	goto yy72;
+	default:	goto yy71;
+	}
+yy74:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy70;
+	default:	goto yy69;
+	}
+yy75:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy76;
+yy76:	switch(yych){
+	case '-':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy75;
+	default:	goto yy77;
+	}
+yy77:
+#line 466 "token.re"
+{   ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+                        sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
+                        return YAML_ALIAS;
+                    }
+#line 956 "<stdout>"
+yy78:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy79;
+yy79:	switch(yych){
+	case '-':	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy78;
+	default:	goto yy80;
+	}
+yy80:
+#line 455 "token.re"
+{   sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
+
+                        /*
+                         * Remove previous anchors of the same name.  Since the parser will likely
+                         * construct deeper nodes first, we want those nodes to be placed in the
+                         * queue for matching at a higher level of indentation.
+                         */
+                        syck_hdlr_remove_anchor(parser, sycklval->name);
+                        return YAML_ANCHOR;
+                    }
+#line 1036 "<stdout>"
+yy81:	++YYCURSOR;
+	goto yy82;
+yy82:
+#line 441 "token.re"
+{   ENSURE_YAML_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1);
+                        FORCE_NEXT_TOKEN(YAML_IOPEN);
+                        if ( *YYCURSOR == '#' || is_newline( YYCURSOR ) || is_newline( YYCURSOR - 1 ) )
+                        {
+                            YYCURSOR--; 
+                            ADD_LEVEL((YYTOKEN + 1) - YYLINEPTR, syck_lvl_seq);
+                        }
+                        else /* spaces followed by content uses the space as indentation */
+                        {
+                            ADD_LEVEL(YYCURSOR - YYLINEPTR, syck_lvl_seq);
+                        }
+                        return YYTOKEN[0]; 
+                    }
+#line 1054 "<stdout>"
+yy83:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy84;
+yy84:	switch(yych){
+	case ' ':	goto yy83;
+	default:	goto yy82;
+	}
+yy85:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy81;
+	default:	goto yy69;
+	}
+yy86:	++YYCURSOR;
+	goto yy87;
+yy87:
+#line 436 "token.re"
+{   if ( *YYTOKEN == ':' && lvl->status != syck_lvl_imap ) lvl->status = syck_lvl_map;
+                        YYPOS(1); 
+                        return YYTOKEN[0]; 
+                    }
+#line 1076 "<stdout>"
+yy88:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy89;
+yy89:	switch(yych){
+	case ' ':	goto yy88;
+	default:	goto yy87;
+	}
+yy90:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy86;
+	default:	goto yy69;
+	}
+yy91:	yyaccept = 0;
+	YYMARKER = ++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy92;
+yy92:	switch(yych){
+	case 0x0A:	case ' ':	goto yy91;
+	case 0x0D:	goto yy93;
+	default:	goto yy38;
+	}
+yy93:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy91;
+	default:	goto yy69;
+	}
+}
+#line 501 "token.re"
+
+    }
+
+Directive:
+    {
+        YYTOKTMP = YYCURSOR;
+
+
+#line 1117 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy94;
+	++YYCURSOR;
+yy94:
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy96;
+	case 0x09:	case ' ':	goto yy99;
+	case '%':	goto yy97;
+	default:	goto yy101;
+	}
+yy96:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy98;
+	}
+yy97:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case '.':
+	case '/':
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	case ':':
+	case ';':
+	case '<':
+	case '=':
+	case '>':
+	case '?':
+	case '@':
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	case '[':
+	case '\\':
+	case ']':
+	case '^':
+	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy104;
+	default:	goto yy98;
+	}
+yy98:
+#line 514 "token.re"
+{   YYCURSOR = YYTOKTMP;
+                        return YAML_DOCSEP;
+                    }
+#line 1221 "<stdout>"
+yy99:	++YYCURSOR;
+	yych = *YYCURSOR;
+	goto yy103;
+yy100:
+#line 512 "token.re"
+{   goto Directive; }
+#line 1228 "<stdout>"
+yy101:	yych = *++YYCURSOR;
+	goto yy98;
+yy102:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy103;
+yy103:	switch(yych){
+	case 0x09:	case ' ':	goto yy102;
+	default:	goto yy100;
+	}
+yy104:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	goto yy105;
+yy105:	switch(yych){
+	case '.':
+	case '/':
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case ';':
+	case '<':
+	case '=':
+	case '>':
+	case '?':
+	case '@':
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	case '[':
+	case '\\':
+	case ']':
+	case '^':
+	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy104;
+	case ':':	goto yy106;
+	default:	goto yy96;
+	}
+yy106:	yych = *++YYCURSOR;
+	switch(yych){
+	case '.':
+	case '/':
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	case ':':
+	case ';':
+	case '<':
+	case '=':
+	case '>':
+	case '?':
+	case '@':
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	case '[':
+	case '\\':
+	case ']':
+	case '^':
+	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy107;
+	default:	goto yy96;
+	}
+yy107:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy108;
+yy108:	switch(yych){
+	case '.':
+	case '/':
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	case ':':
+	case ';':
+	case '<':
+	case '=':
+	case '>':
+	case '?':
+	case '@':
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	case '[':
+	case '\\':
+	case ']':
+	case '^':
+	case '_':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy107;
+	default:	goto yy109;
+	}
+yy109:
+#line 510 "token.re"
+{   goto Directive; }
+#line 1484 "<stdout>"
+}
+#line 517 "token.re"
+
+
+    }
+
+Plain:
+    {
+        int qidx = 0;
+        int qcapa = 100;
+        char *qstr = S_ALLOC_N( char, qcapa );
+        SyckLevel *plvl;
+        int parentIndent;
+
+        YYCURSOR = YYTOKEN;
+        plvl = CURRENT_LEVEL();
+        GET_TRUE_YAML_INDENT(parentIndent);
+
+Plain2: 
+        YYTOKEN = YYCURSOR;
+
+Plain3:
+
+
+#line 1509 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy110;
+	++YYCURSOR;
+yy110:
+	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy124;
+	case 0x09:	goto yy126;
+	case 0x0A:	goto yy112;
+	case 0x0D:	goto yy114;
+	case ' ':	goto yy122;
+	case ',':	goto yy117;
+	case ':':	goto yy116;
+	case ']':	goto yy120;
+	case '}':	goto yy118;
+	default:	goto yy127;
+	}
+yy112:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	goto yy142;
+yy113:
+#line 540 "token.re"
+{   int indt_len, nl_count = 0;
+                        SyckLevel *lvl;
+                        char *tok = YYTOKEN;
+                        GOBBLE_UP_YAML_INDENT( indt_len, tok );
+                        lvl = CURRENT_LEVEL();
+
+                        if ( indt_len <= parentIndent )
+                        {
+                            RETURN_IMPLICIT();
+                        }
+
+                        while ( YYTOKEN < YYCURSOR )
+                        {
+                            int nl_len = newline_len( YYTOKEN++ );
+                            if ( nl_len )
+                            {
+                                nl_count++;
+                                YYTOKEN += nl_len - 1;
+                            }
+                        }
+                        if ( nl_count <= 1 )
+                        {
+                            QUOTECAT(qstr, qcapa, qidx, ' ');
+                        }
+                        else
+                        {
+                            int i;
+                            for ( i = 0; i < nl_count - 1; i++ )
+                            {
+                                QUOTECAT(qstr, qcapa, qidx, '\n');
+                            }
+                        }
+
+                        goto Plain2; 
+                    }
+#line 1570 "<stdout>"
+yy114:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy141;
+	default:	goto yy115;
+	}
+yy115:
+#line 627 "token.re"
+{   QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN);
+                        goto Plain2;
+                    }
+#line 1581 "<stdout>"
+yy116:	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 0x0A:	goto yy136;
+	case 0x0D:	goto yy140;
+	case ' ':	goto yy138;
+	default:	goto yy115;
+	}
+yy117:	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 0x0A:	goto yy130;
+	case 0x0D:	goto yy134;
+	case ' ':	goto yy132;
+	default:	goto yy115;
+	}
+yy118:	++YYCURSOR;
+	goto yy119;
+yy119:
+#line 589 "token.re"
+{   if ( plvl->status != syck_lvl_imap )
+                        {
+                            PLAIN_NOT_INL();
+                        }
+                        else
+                        {
+                            PLAIN_IS_INL();
+                        }
+                        RETURN_IMPLICIT();
+                    }
+#line 1612 "<stdout>"
+yy120:	++YYCURSOR;
+	goto yy121;
+yy121:
+#line 600 "token.re"
+{   if ( plvl->status != syck_lvl_iseq )
+                        {
+                            PLAIN_NOT_INL();
+                        }
+                        else
+                        {
+                            PLAIN_IS_INL();
+                        }
+                        RETURN_IMPLICIT();
+                    }
+#line 1627 "<stdout>"
+yy122:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case '#':	goto yy128;
+	default:	goto yy123;
+	}
+yy123:
+#line 617 "token.re"
+{   if ( qidx == 0 ) 
+                        {
+                            goto Plain2;
+                        }
+                        else
+                        {
+                            goto Plain3; 
+                        }
+                    }
+#line 1644 "<stdout>"
+yy124:	++YYCURSOR;
+	goto yy125;
+yy125:
+#line 615 "token.re"
+{   RETURN_IMPLICIT(); }
+#line 1650 "<stdout>"
+yy126:	yych = *++YYCURSOR;
+	goto yy123;
+yy127:	yych = *++YYCURSOR;
+	goto yy115;
+yy128:	++YYCURSOR;
+	goto yy129;
+yy129:
+#line 611 "token.re"
+{   eat_comments( parser ); 
+                        RETURN_IMPLICIT();
+                    }
+#line 1662 "<stdout>"
+yy130:	++YYCURSOR;
+	goto yy131;
+yy131:
+#line 578 "token.re"
+{   if ( plvl->status != syck_lvl_iseq && plvl->status != syck_lvl_imap )
+                        {
+                            PLAIN_NOT_INL();
+                        }
+                        else
+                        {
+                            PLAIN_IS_INL();
+                        }
+                        RETURN_IMPLICIT();
+                    }
+#line 1677 "<stdout>"
+yy132:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy133;
+yy133:	switch(yych){
+	case ' ':	goto yy132;
+	default:	goto yy131;
+	}
+yy134:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy130;
+	default:	goto yy135;
+	}
+yy135:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy113;
+	case 1:	goto yy115;
+	}
+yy136:	++YYCURSOR;
+	goto yy137;
+yy137:
+#line 576 "token.re"
+{   RETURN_IMPLICIT(); }
+#line 1701 "<stdout>"
+yy138:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy139;
+yy139:	switch(yych){
+	case ' ':	goto yy138;
+	default:	goto yy137;
+	}
+yy140:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy136;
+	default:	goto yy135;
+	}
+yy141:	yyaccept = 0;
+	YYMARKER = ++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy142;
+yy142:	switch(yych){
+	case 0x0A:	case ' ':	goto yy141;
+	case 0x0D:	goto yy143;
+	default:	goto yy113;
+	}
+yy143:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy141;
+	default:	goto yy135;
+	}
+}
+#line 631 "token.re"
+
+    }
+
+SingleQuote:
+    {
+        int qidx = 0;
+        int qcapa = 100;
+        char *qstr = S_ALLOC_N( char, qcapa );
+
+SingleQuote2:
+        YYTOKEN = YYCURSOR;
+
+
+#line 1747 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy144;
+	++YYCURSOR;
+yy144:
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy152;
+	case 0x0A:	goto yy146;
+	case 0x0D:	goto yy148;
+	case '\'':	goto yy150;
+	default:	goto yy153;
+	}
+yy146:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	goto yy157;
+yy147:
+#line 645 "token.re"
+{   int indt_len;
+                        int nl_count = 0;
+                        SyckLevel *lvl;
+                        GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
+                        lvl = CURRENT_LEVEL();
+
+                        if ( lvl->status != syck_lvl_str )
+                        {
+                            ADD_LEVEL( indt_len, syck_lvl_str );
+                        }
+                        else if ( indt_len < lvl->spaces )
+                        {
+                            /* Error! */
+                        }
+
+                        while ( YYTOKEN < YYCURSOR )
+                        {
+                            int nl_len = newline_len( YYTOKEN++ );
+                            if ( nl_len )
+                            {
+                                nl_count++;
+                                YYTOKEN += nl_len - 1;
+                            }
+                        }
+                        if ( nl_count <= 1 )
+                        {
+                            QUOTECAT(qstr, qcapa, qidx, ' ');
+                        }
+                        else
+                        {
+                            int i;
+                            for ( i = 0; i < nl_count - 1; i++ )
+                            {
+                                QUOTECAT(qstr, qcapa, qidx, '\n');
+                            }
+                        }
+
+                        goto SingleQuote2; 
+                    }
+#line 1807 "<stdout>"
+yy148:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy156;
+	default:	goto yy149;
+	}
+yy149:
+#line 712 "token.re"
+{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
+                        goto SingleQuote2; 
+                    }
+#line 1818 "<stdout>"
+yy150:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case '\'':	goto yy154;
+	default:	goto yy151;
+	}
+yy151:
+#line 689 "token.re"
+{   SyckLevel *lvl;
+                        SyckNode *n = syck_alloc_str();
+                        lvl = CURRENT_LEVEL();
+
+                        if ( lvl->status == syck_lvl_str )
+                        {
+                            POP_LEVEL();
+                        }
+                        if ( ((SyckParser *)parser)->taguri_expansion == 1 )
+                        {
+                            n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
+                        }
+                        else
+                        {
+                            n->type_id = syck_strndup( "str", 3 );
+                        }
+                        n->data.str->ptr = qstr;
+                        n->data.str->len = qidx;
+                        n->data.str->style = scalar_1quote;
+                        sycklval->nodeData = n;
+                        return YAML_PLAIN; 
+                    }
+#line 1848 "<stdout>"
+yy152:	yych = *++YYCURSOR;
+	goto yy151;
+yy153:	yych = *++YYCURSOR;
+	goto yy149;
+yy154:	++YYCURSOR;
+	goto yy155;
+yy155:
+#line 685 "token.re"
+{   QUOTECAT(qstr, qcapa, qidx, '\'');
+                        goto SingleQuote2; 
+                    }
+#line 1860 "<stdout>"
+yy156:	yyaccept = 0;
+	YYMARKER = ++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy157;
+yy157:	switch(yych){
+	case 0x0A:	case ' ':	goto yy156;
+	case 0x0D:	goto yy158;
+	default:	goto yy147;
+	}
+yy158:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy156;
+	default:	goto yy159;
+	}
+yy159:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy147;
+	}
+}
+#line 716 "token.re"
+
+
+    }
+
+
+DoubleQuote:
+    {
+        int keep_nl = 1;
+        int qidx = 0;
+        int qcapa = 100;
+        char *qstr = S_ALLOC_N( char, qcapa );
+
+DoubleQuote2:
+        YYTOKEN = YYCURSOR;
+
+
+
+#line 1901 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy160;
+	++YYCURSOR;
+yy160:
+	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy167;
+	case 0x0A:	goto yy162;
+	case 0x0D:	goto yy164;
+	case '"':	goto yy169;
+	case '\\':	goto yy166;
+	default:	goto yy170;
+	}
+yy162:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	goto yy184;
+yy163:
+#line 734 "token.re"
+{   int indt_len;
+                        int nl_count = 0;
+                        SyckLevel *lvl;
+                        GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
+                        lvl = CURRENT_LEVEL();
+
+                        if ( lvl->status != syck_lvl_str )
+                        {
+                            ADD_LEVEL( indt_len, syck_lvl_str );
+                        }
+                        else if ( indt_len < lvl->spaces )
+                        {
+                            /* FIXME */
+                        }
+
+                        if ( keep_nl == 1 )
+                        {
+                            while ( YYTOKEN < YYCURSOR )
+                            {
+                                int nl_len = newline_len( YYTOKEN++ );
+                                if ( nl_len )
+                                {
+                                    nl_count++;
+                                    YYTOKEN += nl_len - 1;
+                                }
+                            }
+                            if ( nl_count <= 1 )
+                            {
+                                QUOTECAT(qstr, qcapa, qidx, ' ');
+                            }
+                            else
+                            {
+                                int i;
+                                for ( i = 0; i < nl_count - 1; i++ )
+                                {
+                                    QUOTECAT(qstr, qcapa, qidx, '\n');
+                                }
+                            }
+                        }
+
+                        keep_nl = 1;
+                        goto DoubleQuote2; 
+                    }
+#line 1966 "<stdout>"
+yy164:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy183;
+	default:	goto yy165;
+	}
+yy165:
+#line 820 "token.re"
+{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
+                        goto DoubleQuote2; 
+                    }
+#line 1977 "<stdout>"
+yy166:	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case 0x0A:	goto yy174;
+	case 0x0D:	goto yy176;
+	case ' ':	goto yy171;
+	case '"':	case '0':	case '\\':	case 'a':
+	case 'b':	case 'e':
+	case 'f':	case 'n':	case 'r':	case 't':	case 'v':	goto yy178;
+	case 'x':	goto yy177;
+	default:	goto yy165;
+	}
+yy167:	++YYCURSOR;
+	goto yy168;
+yy168:
+#line 797 "token.re"
+{   SyckLevel *lvl;
+                        SyckNode *n = syck_alloc_str();
+                        lvl = CURRENT_LEVEL();
+
+                        if ( lvl->status == syck_lvl_str )
+                        {
+                            POP_LEVEL();
+                        }
+                        if ( ((SyckParser *)parser)->taguri_expansion == 1 )
+                        {
+                            n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
+                        }
+                        else
+                        {
+                            n->type_id = syck_strndup( "str", 3 );
+                        }
+                        n->data.str->ptr = qstr;
+                        n->data.str->len = qidx;
+                        n->data.str->style = scalar_2quote;
+                        sycklval->nodeData = n;
+                        return YAML_PLAIN; 
+                    }
+#line 2016 "<stdout>"
+yy169:	yych = *++YYCURSOR;
+	goto yy168;
+yy170:	yych = *++YYCURSOR;
+	goto yy165;
+yy171:	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	goto yy172;
+yy172:	switch(yych){
+	case 0x0A:	goto yy174;
+	case 0x0D:	goto yy176;
+	case ' ':	goto yy171;
+	default:	goto yy173;
+	}
+yy173:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy163;
+	case 1:	goto yy165;
+	}
+yy174:	++YYCURSOR;
+	goto yy175;
+yy175:
+#line 792 "token.re"
+{   keep_nl = 0;
+                        YYCURSOR--;
+                        goto DoubleQuote2; 
+                    }
+#line 2044 "<stdout>"
+yy176:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy174;
+	default:	goto yy173;
+	}
+yy177:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':	goto yy180;
+	default:	goto yy173;
+	}
+yy178:	++YYCURSOR;
+	goto yy179;
+yy179:
+#line 778 "token.re"
+{   char ch = *( YYCURSOR - 1 );
+                        QUOTECAT(qstr, qcapa, qidx, escape_seq( ch ));
+                        goto DoubleQuote2; 
+                    }
+#line 2082 "<stdout>"
+yy180:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':	goto yy181;
+	default:	goto yy173;
+	}
+yy181:	++YYCURSOR;
+	goto yy182;
+yy182:
+#line 783 "token.re"
+{   long ch;
+                        char *chr_text = syck_strndup( YYTOKEN, 4 );
+                        chr_text[0] = '0';
+                        ch = strtol( chr_text, NULL, 16 );
+                        free( chr_text );
+                        QUOTECAT(qstr, qcapa, qidx, ch);
+                        goto DoubleQuote2; 
+                    }
+#line 2119 "<stdout>"
+yy183:	yyaccept = 0;
+	YYMARKER = ++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy184;
+yy184:	switch(yych){
+	case 0x0A:	case ' ':	goto yy183;
+	case 0x0D:	goto yy185;
+	default:	goto yy163;
+	}
+yy185:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy183;
+	default:	goto yy173;
+	}
+}
+#line 824 "token.re"
+
+    }
+
+TransferMethod:
+    {
+        int qidx = 0;
+        int qcapa = 100;
+        char *qstr = S_ALLOC_N( char, qcapa );
+
+TransferMethod2:
+        YYTOKTMP = YYCURSOR;
+
+
+#line 2152 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy186;
+	++YYCURSOR;
+yy186:
+	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy188;
+	case 0x0A:	goto yy190;
+	case 0x0D:	goto yy192;
+	case ' ':	goto yy191;
+	case '\\':	goto yy194;
+	default:	goto yy195;
+	}
+yy188:	++YYCURSOR;
+	goto yy189;
+yy189:
+#line 838 "token.re"
+{   SyckLevel *lvl;
+                        YYCURSOR = YYTOKTMP;
+                        if ( YYCURSOR == YYTOKEN + 1 )
+                        {
+                            free( qstr );
+                            return YAML_ITRANSFER;
+                        }
+
+                        lvl = CURRENT_LEVEL();
+
+                        /*
+                         * URL Prefixing
+                         */
+                        if ( *qstr == '^' )
+                        {
+                            sycklval->name = S_ALLOC_N( char, qidx + strlen( lvl->domain ) );
+                            sycklval->name[0] = '\0';
+                            strcat( sycklval->name, lvl->domain );
+                            strncat( sycklval->name, qstr + 1, qidx - 1 );
+                            free( qstr );
+                        }
+                        else
+                        {
+                            char *carat = qstr;
+                            char *qend = qstr + qidx;
+                            while ( (++carat) < qend )
+                            {
+                                if ( *carat == '^' )
+                                    break;
+                            }
+
+                            if ( carat < qend )
+                            {
+                                free( lvl->domain );
+                                lvl->domain = syck_strndup( qstr, carat - qstr );
+                                sycklval->name = S_ALLOC_N( char, ( qend - carat ) + strlen( lvl->domain ) );
+                                sycklval->name[0] = '\0';
+                                strcat( sycklval->name, lvl->domain );
+                                strncat( sycklval->name, carat + 1, ( qend - carat ) - 1 );
+                                free( qstr );
+                            }
+                            else
+                            {
+                                sycklval->name = qstr;
+                            }
+                        }
+
+                        return YAML_TRANSFER; 
+                    }
+#line 2222 "<stdout>"
+yy190:	yych = *++YYCURSOR;
+	goto yy189;
+yy191:	yych = *++YYCURSOR;
+	goto yy204;
+yy192:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy188;
+	default:	goto yy193;
+	}
+yy193:
+#line 905 "token.re"
+{   QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1)); 
+                        goto TransferMethod2;
+                    }
+#line 2237 "<stdout>"
+yy194:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case '"':	case '0':	case '\\':	case 'a':
+	case 'b':	case 'e':
+	case 'f':	case 'n':	case 'r':	case 't':	case 'v':	goto yy198;
+	case 'x':	goto yy196;
+	default:	goto yy193;
+	}
+yy195:	yych = *++YYCURSOR;
+	goto yy193;
+yy196:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':	goto yy200;
+	default:	goto yy197;
+	}
+yy197:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy193;
+	}
+yy198:	++YYCURSOR;
+	goto yy199;
+yy199:
+#line 891 "token.re"
+{  char ch = *( YYCURSOR - 1 );
+                        QUOTECAT(qstr, qcapa, qidx, escape_seq( ch ));
+                        goto TransferMethod2;
+                    }
+#line 2285 "<stdout>"
+yy200:	yych = *++YYCURSOR;
+	switch(yych){
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':	goto yy201;
+	default:	goto yy197;
+	}
+yy201:	++YYCURSOR;
+	goto yy202;
+yy202:
+#line 896 "token.re"
+{   long ch;
+                        char *chr_text = syck_strndup( YYTOKTMP, 4 );
+                        chr_text[0] = '0';
+                        ch = strtol( chr_text, NULL, 16 );
+                        free( chr_text );
+                        QUOTECAT(qstr, qcapa, qidx, ch);
+                        goto TransferMethod2;
+                    }
+#line 2322 "<stdout>"
+yy203:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy204;
+yy204:	switch(yych){
+	case ' ':	goto yy203;
+	default:	goto yy189;
+	}
+}
+#line 910 "token.re"
+
+    }
+
+ScalarBlock:
+    {
+        int qidx = 0;
+        int qcapa = 100;
+        char *qstr = S_ALLOC_N( char, qcapa );
+        int blockType = 0;
+        int nlDoWhat = 0;
+        int lastIndent = 0;
+        int forceIndent = -1;
+        char *yyt = YYTOKEN;
+        SyckLevel *lvl = CURRENT_LEVEL();
+        int parentIndent = -1;
+
+        switch ( *yyt )
+        {
+            case '|': blockType = BLOCK_LIT; break;
+            case '>': blockType = BLOCK_FOLD; break;
+        }
+
+        while ( ++yyt <= YYCURSOR )
+        {
+            if ( *yyt == '-' )
+            {
+                nlDoWhat = NL_CHOMP;
+            }
+            else if ( *yyt == '+' )
+            {
+                nlDoWhat = NL_KEEP;
+            }
+            else if ( isdigit( *yyt ) )
+            {
+                forceIndent = strtol( yyt, NULL, 10 );
+            }
+        }
+
+        qstr[0] = '\0';
+        YYTOKEN = YYCURSOR;
+
+ScalarBlock2:
+        YYTOKEN = YYCURSOR;
+
+
+#line 2378 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy205;
+	++YYCURSOR;
+yy205:
+	if((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy213;
+	case 0x0A:	goto yy207;
+	case 0x0D:	goto yy209;
+	case '#':	goto yy211;
+	case '-':	goto yy215;
+	default:	goto yy216;
+	}
+yy207:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	goto yy226;
+yy208:
+#line 956 "token.re"
+{   char *pacer;
+                        char *tok = YYTOKEN;
+                        int indt_len = 0, nl_count = 0, fold_nl = 0, nl_begin = 0;
+                        GOBBLE_UP_YAML_INDENT( indt_len, tok );
+                        lvl = CURRENT_LEVEL();
+
+                        if ( lvl->status != syck_lvl_block )
+                        {
+                            GET_TRUE_YAML_INDENT(parentIndent);
+                            if ( forceIndent > 0 ) forceIndent += parentIndent;
+                            if ( indt_len > parentIndent )
+                            {
+                                int new_spaces = forceIndent > 0 ? forceIndent : indt_len;
+                                ADD_LEVEL( new_spaces, syck_lvl_block );
+                                lastIndent = indt_len - new_spaces;
+                                nl_begin = 1;
+                                lvl = CURRENT_LEVEL();
+                            }
+                            else
+                            {
+                                YYCURSOR = YYTOKEN;
+                                RETURN_YAML_BLOCK();
+                            }
+                        }
+
+                        /*
+                         * Fold only in the event of two lines being on the leftmost
+                         * indentation.
+                         */
+                        if ( blockType == BLOCK_FOLD && lastIndent == 0 && ( indt_len - lvl->spaces ) == 0 )
+                        {
+                            fold_nl = 1;
+                        }
+
+                        pacer = YYTOKEN;
+                        while ( pacer < YYCURSOR )
+                        {
+                            int nl_len = newline_len( pacer++ );
+                            if ( nl_len )
+                            {
+                                nl_count++;
+                                pacer += nl_len - 1;
+                            }
+                        }
+
+                        if ( fold_nl == 1 || nl_begin == 1 )
+                        {
+                            nl_count--;
+                        }
+
+                        if ( nl_count < 1 && nl_begin == 0 )
+                        {
+                            QUOTECAT(qstr, qcapa, qidx, ' ');
+                        }
+                        else
+                        {
+                            int i;
+                            for ( i = 0; i < nl_count; i++ )
+                            {
+                                QUOTECAT(qstr, qcapa, qidx, '\n');
+                            }
+                        }
+
+                        lastIndent = indt_len - lvl->spaces;
+                        YYCURSOR -= lastIndent;
+
+                        if ( indt_len < lvl->spaces )
+                        {
+                            POP_LEVEL();
+                            YYCURSOR = YYTOKEN;
+                            RETURN_YAML_BLOCK();
+                        }
+                        goto ScalarBlock2;
+                    }
+#line 2474 "<stdout>"
+yy209:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy225;
+	default:	goto yy210;
+	}
+yy210:
+#line 1070 "token.re"
+{   QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
+                        goto ScalarBlock2;
+                    }
+#line 2485 "<stdout>"
+yy211:	++YYCURSOR;
+	goto yy212;
+yy212:
+#line 1032 "token.re"
+{   lvl = CURRENT_LEVEL();
+                        if ( lvl->status != syck_lvl_block )
+                        {
+                            eat_comments( parser );
+                            YYTOKEN = YYCURSOR;
+                        }
+                        else
+                        {
+                            QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
+                        }
+                        goto ScalarBlock2;
+                    }
+#line 2502 "<stdout>"
+yy213:	++YYCURSOR;
+	goto yy214;
+yy214:
+#line 1046 "token.re"
+{   YYCURSOR--;
+                        POP_LEVEL();
+                        RETURN_YAML_BLOCK(); 
+                    }
+#line 2511 "<stdout>"
+yy215:	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch(yych){
+	case '-':	goto yy217;
+	default:	goto yy210;
+	}
+yy216:	yych = *++YYCURSOR;
+	goto yy210;
+yy217:	yych = *++YYCURSOR;
+	switch(yych){
+	case '-':	goto yy219;
+	default:	goto yy218;
+	}
+yy218:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy208;
+	case 1:	goto yy210;
+	}
+yy219:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy220;
+	case 0x0D:	goto yy224;
+	case ' ':	goto yy222;
+	default:	goto yy218;
+	}
+yy220:	++YYCURSOR;
+	goto yy221;
+yy221:
+#line 1051 "token.re"
+{   if ( YYTOKEN == YYLINEPTR )
+                        {
+                            if ( blockType == BLOCK_FOLD && qidx > 0 )
+                            {
+                                qidx -= 1;
+                            }
+                            QUOTECAT(qstr, qcapa, qidx, '\n');
+                            POP_LEVEL();
+                            YYCURSOR = YYTOKEN;
+                            RETURN_YAML_BLOCK();
+                        }
+                        else
+                        {
+                            QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
+                            YYCURSOR = YYTOKEN + 1;
+                            goto ScalarBlock2;
+                        }
+                    }
+#line 2559 "<stdout>"
+yy222:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy223;
+yy223:	switch(yych){
+	case ' ':	goto yy222;
+	default:	goto yy221;
+	}
+yy224:	yych = *++YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy220;
+	default:	goto yy218;
+	}
+yy225:	yyaccept = 0;
+	YYMARKER = ++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy226;
+yy226:	switch(yych){
+	case 0x0A:	case ' ':	goto yy225;
+	case 0x0D:	goto yy227;
+	default:	goto yy208;
+	}
+yy227:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy225;
+	default:	goto yy218;
+	}
+}
+#line 1075 "token.re"
+
+    }
+
+    return 0;
+
+}
+
+void
+eat_comments( SyckParser *parser )
+{
+Comment:
+    {
+        YYTOKEN = YYCURSOR;
+
+
+#line 2607 "<stdout>"
+{
+	YYCTYPE yych;
+	unsigned int yyaccept;
+	goto yy228;
+	++YYCURSOR;
+yy228:
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x00:	goto yy230;
+	case 0x0A:	goto yy232;
+	case 0x0D:	goto yy233;
+	default:	goto yy235;
+	}
+yy230:	++YYCURSOR;
+	goto yy231;
+yy231:
+#line 1091 "token.re"
+{   YYCURSOR = YYTOKEN;
+                        return;
+                    }
+#line 2629 "<stdout>"
+yy232:	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	goto yy237;
+yy233:	++YYCURSOR;
+	switch((yych = *YYCURSOR)) {
+	case 0x0A:	goto yy236;
+	default:	goto yy234;
+	}
+yy234:
+#line 1095 "token.re"
+{   goto Comment; 
+                    }
+#line 2642 "<stdout>"
+yy235:	yych = *++YYCURSOR;
+	goto yy234;
+yy236:	yyaccept = 0;
+	YYMARKER = ++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy237;
+yy237:	switch(yych){
+	case 0x0A:	goto yy236;
+	case 0x0D:	goto yy238;
+	default:	goto yy231;
+	}
+yy238:	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch(yych){
+	case 0x0A:	goto yy236;
+	default:	goto yy239;
+	}
+yy239:	YYCURSOR = YYMARKER;
+	switch(yyaccept){
+	case 0:	goto yy231;
+	}
+}
+#line 1098 "token.re"
+
+
+    }
+
+}
+
+char
+escape_seq( char ch )
+{
+    switch ( ch )
+    {
+        case '0': return '\0';
+        case 'a': return 7;
+        case 'b': return '\010';
+        case 'e': return '\033';
+        case 'f': return '\014';
+        case 'n': return '\n';
+        case 'r': return '\015';
+        case 't': return '\t';
+        case 'v': return '\013';
+        default: return ch;
+    }
+}
+
+int
+is_newline( char *ptr )
+{
+    return newline_len( ptr );
+}
+
+int
+newline_len( char *ptr )
+{
+    if ( *ptr == '\n' )
+        return 1;
+    
+    if ( *ptr == '\r' && *( ptr + 1 ) == '\n' )
+        return 2;
+
+    return 0;
+}
+
+int 
+syckwrap()
+{
+    return 1;
+}
+
+void 
+syckerror( char *msg )
+{
+    if ( syck_parser_ptr->error_handler == NULL )
+        syck_parser_ptr->error_handler = syck_default_error_handler;
+
+    syck_parser_ptr->root = syck_parser_ptr->root_on_error;
+    (syck_parser_ptr->error_handler)(syck_parser_ptr, msg);
+}
+
diff --git a/ruby_1_8_6/ext/syck/yaml2byte.c b/ruby_1_8_6/ext/syck/yaml2byte.c
new file mode 100644
index 0000000000..821a3cd5b5
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/yaml2byte.c
@@ -0,0 +1,257 @@
+/*
+ * yaml2byte.c
+ *
+ * $Author$
+ * $Date$
+ *
+ * Copyright (C) 2003 why the lucky stiff, clark evans
+ *
+ *   WARNING WARNING WARNING  --- THIS IS *NOT JUST* PLAYING
+ *   ANYMORE! -- WHY HAS EMBRACED THIS AS THE REAL THING!
+ */ 
+#include "ruby.h"
+#include <syck.h>
+#include <assert.h>
+#define YAMLBYTE_UTF8
+#include "yamlbyte.h"
+
+#include <stdio.h>
+#define TRACE0(a)  \
+    do { printf(a); printf("\n"); fflush(stdout); } while(0)
+#define TRACE1(a,b) \
+    do { printf(a,b); printf("\n"); fflush(stdout); } while(0)
+#define TRACE2(a,b,c) \
+    do { printf(a,b,c); printf("\n"); fflush(stdout); } while(0)
+#define TRACE3(a,b,c,d) \
+    do { printf(a,b,c,d); printf("\n"); fflush(stdout); } while(0)
+
+/* Reinvent the wheel... */
+#define CHUNKSIZE 64
+#define HASH ((long)0xCAFECAFE)
+typedef struct {
+   long hash;
+   char *buffer;
+   long length;
+   long remaining;
+   int  printed;
+} bytestring_t;
+bytestring_t *bytestring_alloc() {
+    bytestring_t *ret; 
+    /*TRACE0("bytestring_alloc()");*/
+    ret = S_ALLOC(bytestring_t);
+    ret->hash   = HASH;
+    ret->length = CHUNKSIZE;
+    ret->remaining = ret->length;
+    ret->buffer = S_ALLOC_N(char, ret->length + 1 );
+    ret->buffer[0] = 0;
+    ret->printed = 0;
+    return ret;
+}
+void bytestring_append(bytestring_t *str, char code, 
+                       char *start, char *finish) 
+{
+    long grow;
+    long length = 2;   /* CODE + LF */
+    char *curr;
+    assert(str && HASH == str->hash);
+    /*TRACE0("bytestring_append()");*/
+    if(start) {
+        if(!finish)
+            finish = start + strlen(start);
+        length += (finish-start);
+    }
+    if(length > str->remaining) {
+        grow = (length - str->remaining) + CHUNKSIZE;
+        str->remaining += grow;
+        str->length    += grow; 
+        str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 );
+        assert(str->buffer);
+    }
+    curr = str->buffer + (str->length - str->remaining);
+    *curr = code;
+    curr += 1;
+    if(start) 
+        while(start < finish)
+            *curr ++ = *start ++;
+    *curr = '\n';
+    curr += 1;
+    *curr = 0;
+    str->remaining = str->remaining - length;
+    assert( (str->buffer + str->length) - str->remaining );
+}
+void bytestring_extend(bytestring_t *str, bytestring_t *ext)
+{
+    char *from;
+    char *curr;
+    char *stop;
+    long grow;
+    long length;
+    assert(str && HASH == str->hash);
+    assert(ext && HASH == ext->hash);
+    if(ext->printed) {
+        assert(ext->buffer[0] ==YAMLBYTE_ANCHOR);
+        curr = ext->buffer;
+        while( '\n' != *curr)
+            curr++;
+        bytestring_append(str, YAMLBYTE_ALIAS, ext->buffer + 1, curr);
+    } else {
+        ext->printed = 1;
+        length  = (ext->length - ext->remaining);
+        if(length > str->remaining) {
+            grow = (length - str->remaining) + CHUNKSIZE;
+            str->remaining += grow;
+            str->length    += grow; 
+            str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 );
+        }
+        curr = str->buffer + (str->length - str->remaining);
+        from = ext->buffer;
+        stop = ext->buffer + length;
+        while( from < stop )
+            *curr ++ = *from ++;
+        *curr = 0;
+        str->remaining = str->remaining - length;
+        assert( (str->buffer + str->length) - str->remaining );
+    }
+}
+
+/* convert SyckNode into yamlbyte_buffer_t objects */
+SYMID
+syck_yaml2byte_handler(p, n)
+    SyckParser *p;
+    SyckNode *n;
+{
+    SYMID oid;
+    long i;
+    char ch;
+    char nextcode;
+    char *start;
+    char *current;
+    char *finish;
+    bytestring_t *val = NULL;
+    bytestring_t *sav = NULL;
+    /*TRACE0("syck_yaml2byte_handler()");*/
+    val = bytestring_alloc();
+    if(n->anchor) bytestring_append(val,YAMLBYTE_ANCHOR, n->anchor, NULL);
+    if ( n->type_id )
+    {
+        if ( p->taguri_expansion )
+        {
+            bytestring_append(val,YAMLBYTE_TRANSFER, n->type_id, NULL);
+        }
+        else
+        {
+            char *type_tag = S_ALLOC_N( char, strlen( n->type_id ) + 1 );
+            type_tag[0] = '\0';
+            strcat( type_tag, "!" );
+            strcat( type_tag, n->type_id );
+            bytestring_append( val, YAMLBYTE_TRANSFER, type_tag, NULL);
+	    S_FREE(type_tag);
+        }
+    }
+    switch (n->kind)
+    {
+        case syck_str_kind:
+            nextcode = YAMLBYTE_SCALAR;
+            start  = n->data.str->ptr;
+            finish = start + n->data.str->len - 1;
+            current = start;
+            /*TRACE2("SCALAR: %s %d", start, n->data.str->len); */
+            while(1) {
+                ch = *current;
+                if('\n' == ch || 0 == ch || current > finish) {
+                    if(current >= start) {
+                        bytestring_append(val, nextcode, start, current);
+                        nextcode = YAMLBYTE_CONTINUE;
+                    }
+                    start = current + 1;
+                    if(current > finish)
+                    {
+                        break;
+                    }
+                    else if('\n' == ch )
+                    {
+                        bytestring_append(val,YAMLBYTE_NEWLINE,NULL,NULL);
+                    }
+                    else if(0 == ch)
+                    {
+                        bytestring_append(val,YAMLBYTE_NULLCHAR,NULL,NULL);
+                    }
+                    else 
+                    {
+                        assert("oops");
+                    }
+                }
+                current += 1;
+            }
+        break;
+        case syck_seq_kind:
+            bytestring_append(val,YAMLBYTE_SEQUENCE,NULL,NULL);
+            for ( i = 0; i < n->data.list->idx; i++ )
+            {
+                oid = syck_seq_read( n, i );
+                syck_lookup_sym( p, oid, (char **)&sav );
+                bytestring_extend(val, sav);
+            }
+            bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
+        break;
+        case syck_map_kind:
+            bytestring_append(val,YAMLBYTE_MAPPING,NULL,NULL);
+            for ( i = 0; i < n->data.pairs->idx; i++ )
+            {
+                oid = syck_map_read( n, map_key, i );
+                syck_lookup_sym( p, oid, (char **)&sav );
+                bytestring_extend(val, sav);
+                oid = syck_map_read( n, map_value, i );
+                syck_lookup_sym( p, oid, (char **)&sav );
+                bytestring_extend(val, sav);
+            }
+            bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
+        break;
+    }
+    oid = syck_add_sym( p, (char *) val );
+    /*TRACE1("Saving: %s", val->buffer );*/
+    return oid;
+}
+
+char *
+syck_yaml2byte(char *yamlstr)
+{
+    SYMID oid;
+    char *ret;
+    bytestring_t *sav; 
+
+    SyckParser *parser = syck_new_parser();
+    syck_parser_str_auto( parser, yamlstr, NULL );
+    syck_parser_handler( parser, syck_yaml2byte_handler );
+    syck_parser_error_handler( parser, NULL );
+    syck_parser_implicit_typing( parser, 1 );
+    syck_parser_taguri_expansion( parser, 1 );
+    oid = syck_parse( parser );
+
+    if ( syck_lookup_sym( parser, oid, (char **)&sav ) == 1 ) {
+        ret = S_ALLOC_N( char, strlen( sav->buffer ) + 3 );
+        ret[0] = '\0';
+        strcat( ret, "D\n" );
+        strcat( ret, sav->buffer );
+    }
+    else
+    {
+        ret = NULL;
+    }
+
+    syck_free_parser( parser );
+    return ret;
+}
+
+#ifdef TEST_YBEXT
+#include <stdio.h>
+int main() {
+   char *yaml = "test: 1\nand: \"with new\\nline\\n\"\nalso: &3 three\nmore: *3";
+   printf("--- # YAML \n");
+   printf(yaml);
+   printf("\n...\n");
+   printf(syck_yaml2byte(yaml));
+   return 0;
+}
+#endif
+
diff --git a/ruby_1_8_6/ext/syck/yamlbyte.h b/ruby_1_8_6/ext/syck/yamlbyte.h
new file mode 100644
index 0000000000..0fe4e7b576
--- /dev/null
+++ b/ruby_1_8_6/ext/syck/yamlbyte.h
@@ -0,0 +1,170 @@
+/*  yamlbyte.h
+ *
+ *  The YAML bytecode "C" interface header file.   See the YAML bytecode
+ *  reference for bytecode sequence rules and for the meaning of each
+ *  bytecode.
+ */
+
+#ifndef YAMLBYTE_H
+#define YAMLBYTE_H
+#include <stddef.h>
+
+/* define what a character is */
+typedef unsigned char yamlbyte_utf8_t;
+typedef unsigned short yamlbyte_utf16_t;
+#ifdef YAMLBYTE_UTF8
+  #ifdef YAMLBYTE_UTF16
+    #error Must only define YAMLBYTE_UTF8 or YAMLBYTE_UTF16
+  #endif
+  typedef yamlbyte_utf8_t yamlbyte_char_t;
+#else
+  #ifdef YAMLBYTE_UTF16
+    typedef yamlbyte_utf16_t yamlbyte_char_t;
+  #else
+    #error Must define YAMLBYTE_UTF8 or YAMLBYTE_UTF16
+  #endif
+#endif
+
+/* specify list of bytecodes */
+#define YAMLBYTE_FINISH          ((yamlbyte_char_t) 0)
+#define YAMLBYTE_DOCUMENT        ((yamlbyte_char_t)'D')
+#define YAMLBYTE_DIRECTIVE       ((yamlbyte_char_t)'V')
+#define YAMLBYTE_PAUSE           ((yamlbyte_char_t)'P')
+#define YAMLBYTE_MAPPING         ((yamlbyte_char_t)'M')
+#define YAMLBYTE_SEQUENCE        ((yamlbyte_char_t)'Q')
+#define YAMLBYTE_END_BRANCH      ((yamlbyte_char_t)'E')
+#define YAMLBYTE_SCALAR          ((yamlbyte_char_t)'S')
+#define YAMLBYTE_CONTINUE        ((yamlbyte_char_t)'C')
+#define YAMLBYTE_NEWLINE         ((yamlbyte_char_t)'N')
+#define YAMLBYTE_NULLCHAR        ((yamlbyte_char_t)'Z')
+#define YAMLBYTE_ANCHOR          ((yamlbyte_char_t)'A')
+#define YAMLBYTE_ALIAS           ((yamlbyte_char_t)'R')
+#define YAMLBYTE_TRANSFER        ((yamlbyte_char_t)'T')
+/* formatting bytecodes */
+#define YAMLBYTE_COMMENT         ((yamlbyte_char_t)'c')
+#define YAMLBYTE_INDENT          ((yamlbyte_char_t)'i')
+#define YAMLBYTE_STYLE           ((yamlbyte_char_t)'s')
+/* other bytecodes */
+#define YAMLBYTE_LINE_NUMBER     ((yamlbyte_char_t)'#')
+#define YAMLBYTE_WHOLE_SCALAR    ((yamlbyte_char_t)'<')
+#define YAMLBYTE_NOTICE          ((yamlbyte_char_t)'!')
+#define YAMLBYTE_SPAN            ((yamlbyte_char_t)')')
+#define YAMLBYTE_ALLOC           ((yamlbyte_char_t)'@')
+
+/* second level style bytecodes, ie "s>" */
+#define YAMLBYTE_FLOW            ((yamlbyte_char_t)'>')
+#define YAMLBYTE_LITERAL         ((yamlbyte_char_t)'|')
+#define YAMLBYTE_BLOCK           ((yamlbyte_char_t)'b')
+#define YAMLBYTE_PLAIN           ((yamlbyte_char_t)'p')
+#define YAMLBYTE_INLINE_MAPPING  ((yamlbyte_char_t)'{')
+#define YAMLBYTE_INLINE_SEQUENCE ((yamlbyte_char_t)'[')
+#define YAMLBYTE_SINGLE_QUOTED   ((yamlbyte_char_t)39)
+#define YAMLBYTE_DOUBLE_QUOTED   ((yamlbyte_char_t)'"')
+
+/*
+ * The "C" API has two variants, one based on instructions,
+ * with events delivered via pointers; and the other one
+ * is character based where one or more instructions are
+ * serialized into a buffer.
+ *
+ * Note: In the instruction based API, WHOLE_SCALAR does
+ *       not have the '<here' marshalling stuff.
+ */
+
+typedef void * yamlbyte_consumer_t;
+typedef void * yamlbyte_producer_t;
+
+/* push and pull APIs need a way to communicate results */
+typedef enum {
+    YAMLBYTE_OK          = 0,     /* proceed                        */
+    YAMLBYTE_E_MEMORY    = 'M',   /* could not allocate memory      */
+    YAMLBYTE_E_READ      = 'R',   /* input stream read error        */
+    YAMLBYTE_E_WRITE     = 'W',   /* output stream write error      */
+    YAMLBYTE_E_OTHER     = '?',   /* some other error condition     */
+    YAMLBYTE_E_PARSE     = 'P',   /* parse error, check bytecodes   */
+} yamlbyte_result_t;
+ 
+typedef const yamlbyte_char_t *yamlbyte_buff_t; 
+
+/* 
+ *  The "Instruction" API 
+ */
+
+typedef struct yaml_instruction {
+    yamlbyte_char_t bytecode;
+    yamlbyte_buff_t start;
+    yamlbyte_buff_t finish;  /* open range, *finish is _not_ part */
+} *yamlbyte_inst_t;
+
+/* producer pushes the instruction with one bytecode event to the 
+ * consumer; if the consumer's result is not YAMLBYTE_OK, then
+ * the producer should stop */
+typedef
+  yamlbyte_result_t
+   (*yamlbyte_push_t)(
+     yamlbyte_consumer_t self,
+     yamlbyte_inst_t  inst
+   );
+
+/* consumer pulls a bytecode instruction from the producer; in this
+ * case the instruction (and is buffer) are owned by the producer and
+ * will remain valid till the pull function is called once again;
+ * if the instruction is NULL, then there are no more results; and
+ * it is important to call the pull function till it returns NULL so 
+ * that the producer can clean up its memory allocations */
+typedef 
+   yamlbyte_result_t
+    (*yamlbyte_pull_t)(
+      yamlbyte_producer_t self,
+      yamlbyte_inst_t *inst   /* to be filled in by the producer */
+    ); 
+
+/*
+ *  Buffer based API
+ */
+
+/* producer pushes a null terminated buffer filled with one or more
+ * bytecode events to the consumer; if the consumer's result is not
+ * YAMLBYTE_OK, then the producer should stop */
+typedef
+  yamlbyte_result_t
+   (*yamlbyte_pushbuff_t)(
+     yamlbyte_consumer_t self,
+     yamlbyte_buff_t  buff
+   );
+
+/* consumer pulls bytecode events from the producer; in this case
+ * the buffer is owned by the producer, and will remain valid till
+ * the pull function is called once again; if the buffer pointer
+ * is set to NULL, then there are no more results; it is important
+ * to call the pull function till it returns NULL so that the
+ * producer can clean up its memory allocations */
+typedef 
+   yamlbyte_result_t
+    (*yamlbyte_pullbuff_t)(
+      yamlbyte_producer_t self,
+      yamlbyte_buff_t *buff   /* to be filled in by the producer */
+    ); 
+
+/* convert a pull interface to a push interface; the reverse process
+ * requires threads and thus is language dependent */
+#define YAMLBYTE_PULL2PUSH(pull,producer,push,consumer,result)       \
+    do {                                                         \
+        yamlbyte_pullbuff_t _pull = (pull);                              \
+        yamlbyte_pushbuff_t _push = (push);                              \
+        yamlbyte_result_t _result = YAMLBYTE_OK;                         \
+        yamlbyte_producer_t _producer = (producer);                  \
+        yamlbyte_consumer_t _consumer = (consumer);                  \
+        while(1) {                                               \
+            yamlbyte_buff_t buff = NULL;                           \
+            _result = _pull(_producer,&buff);                    \
+            if(YAMLBYTE_OK != result || NULL == buff)                \
+                break;                                           \
+            _result = _push(_consumer,buff);                     \
+            if(YAMLBYTE_OK != result)                                \
+                break;                                           \
+        }                                                        \
+        (result) = _result;                                      \
+    } while(0)
+
+#endif
diff --git a/ruby_1_8_6/ext/syslog/.cvsignore b/ruby_1_8_6/ext/syslog/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/syslog/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/syslog/depend b/ruby_1_8_6/ext/syslog/depend
new file mode 100644
index 0000000000..45cbea293a
--- /dev/null
+++ b/ruby_1_8_6/ext/syslog/depend
@@ -0,0 +1,2 @@
+syslog.o: syslog.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
+  $(hdrdir)/intern.h
diff --git a/ruby_1_8_6/ext/syslog/extconf.rb b/ruby_1_8_6/ext/syslog/extconf.rb
new file mode 100644
index 0000000000..0fa0bc339b
--- /dev/null
+++ b/ruby_1_8_6/ext/syslog/extconf.rb
@@ -0,0 +1,10 @@
+# $RoughId: extconf.rb,v 1.3 2001/11/24 17:49:26 knu Exp $
+# $Id$
+
+require 'mkmf'
+
+have_header("syslog.h") &&
+  have_func("openlog") &&
+  have_func("setlogmask") &&
+  create_makefile("syslog")
+
diff --git a/ruby_1_8_6/ext/syslog/syslog.c b/ruby_1_8_6/ext/syslog/syslog.c
new file mode 100644
index 0000000000..477489ddfe
--- /dev/null
+++ b/ruby_1_8_6/ext/syslog/syslog.c
@@ -0,0 +1,394 @@
+/* 
+ * UNIX Syslog extension for Ruby
+ * Amos Gouaux, University of Texas at Dallas
+ * <amos+ruby@utdallas.edu>
+ *
+ * $RoughId: syslog.c,v 1.21 2002/02/25 12:21:17 knu Exp $
+ * $Id$
+ */
+
+#include "ruby.h"
+#include "util.h"
+#include <syslog.h>
+
+/* Syslog class */
+static VALUE mSyslog, mSyslogConstants;
+static const char *syslog_ident = NULL;
+static int syslog_options = -1, syslog_facility = -1, syslog_mask = -1;
+static int syslog_opened = 0;
+
+/* Package helper routines */
+static void syslog_write(int pri, int argc, VALUE *argv)
+{
+    VALUE str;
+
+    if (argc < 1) {
+        rb_raise(rb_eArgError, "no log message supplied");
+    }
+
+    if (!syslog_opened) {
+        rb_raise(rb_eRuntimeError, "must open syslog before write");
+    }
+
+    str = rb_f_sprintf(argc, argv);
+
+    syslog(pri, "%s", RSTRING(str)->ptr);
+}
+
+/* Syslog module methods */
+static VALUE mSyslog_close(VALUE self)
+{
+    if (!syslog_opened) {
+        rb_raise(rb_eRuntimeError, "syslog not opened");
+    }
+
+    closelog();
+
+    free((void *)syslog_ident);
+    syslog_ident = NULL;
+    syslog_options = syslog_facility = syslog_mask = -1;
+    syslog_opened = 0;
+
+    return Qnil;
+}
+
+static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
+{
+    VALUE ident, opt, fac;
+
+    if (syslog_opened) {
+        rb_raise(rb_eRuntimeError, "syslog already open");
+    }
+
+    rb_scan_args(argc, argv, "03", &ident, &opt, &fac);
+
+    if (NIL_P(ident)) {
+        ident = rb_gv_get("$0"); 
+    }
+#ifdef SafeStringValue
+    SafeStringValue(ident);
+#else
+    Check_SafeStr(ident);
+#endif
+    syslog_ident = strdup(RSTRING(ident)->ptr);
+
+    if (NIL_P(opt)) {
+	syslog_options = LOG_PID | LOG_CONS;
+    } else {
+	syslog_options = NUM2INT(opt);
+    }
+
+    if (NIL_P(fac)) {
+	syslog_facility = LOG_USER;
+    } else {
+	syslog_facility = NUM2INT(fac);
+    }
+
+    openlog(syslog_ident, syslog_options, syslog_facility);
+
+    syslog_opened = 1;
+
+    setlogmask(syslog_mask = setlogmask(0));
+
+    /* be like File.new.open {...} */
+    if (rb_block_given_p()) {
+        rb_ensure(rb_yield, self, mSyslog_close, self);
+    }
+
+    return self;
+}
+
+static VALUE mSyslog_reopen(int argc, VALUE *argv, VALUE self)
+{
+    mSyslog_close(self);
+
+    return mSyslog_open(argc, argv, self);
+}
+
+static VALUE mSyslog_isopen(VALUE self)
+{
+    return syslog_opened ? Qtrue : Qfalse;
+}
+
+static VALUE mSyslog_ident(VALUE self)
+{
+    return syslog_opened ? rb_str_new2(syslog_ident) : Qnil;
+}
+
+static VALUE mSyslog_options(VALUE self)
+{
+    return syslog_opened ? INT2NUM(syslog_options) : Qnil;
+}
+
+static VALUE mSyslog_facility(VALUE self)
+{
+    return syslog_opened ? INT2NUM(syslog_facility) : Qnil;
+}
+
+static VALUE mSyslog_get_mask(VALUE self)
+{
+    return syslog_opened ? INT2NUM(syslog_mask) : Qnil;
+}
+
+static VALUE mSyslog_set_mask(VALUE self, VALUE mask)
+{
+    if (!syslog_opened) {
+        rb_raise(rb_eRuntimeError, "must open syslog before setting log mask");
+    }
+
+    setlogmask(syslog_mask = NUM2INT(mask));
+
+    return mask;
+}
+
+static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
+{
+    VALUE pri;
+
+    if (argc < 2) {
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2+)", argc);
+    }
+
+    argc--;
+    pri = *argv++;
+
+    if (!FIXNUM_P(pri)) {
+      rb_raise(rb_eTypeError, "type mismatch: %s given", rb_class2name(CLASS_OF(pri)));
+    }
+
+    syslog_write(FIX2INT(pri), argc, argv);
+
+    return self;
+}
+
+static VALUE mSyslog_inspect(VALUE self)
+{
+    char buf[1024];
+
+    if (syslog_opened) {
+	snprintf(buf, sizeof(buf),
+	  "<#%s: opened=true, ident=\"%s\", options=%d, facility=%d, mask=%d>",
+	  rb_class2name(self),
+	  syslog_ident,
+	  syslog_options,
+	  syslog_facility,
+	  syslog_mask);
+    } else {
+	snprintf(buf, sizeof(buf),
+	  "<#%s: opened=false>", rb_class2name(self));
+    }
+
+    return rb_str_new2(buf);
+}
+
+static VALUE mSyslog_instance(VALUE self)
+{
+    return self;
+}
+
+#define define_syslog_shortcut_method(pri, name) \
+static VALUE mSyslog_##name(int argc, VALUE *argv, VALUE self) \
+{ \
+    syslog_write(pri, argc, argv); \
+\
+    return self; \
+}
+
+#ifdef LOG_EMERG
+define_syslog_shortcut_method(LOG_EMERG, emerg)
+#endif
+#ifdef LOG_ALERT
+define_syslog_shortcut_method(LOG_ALERT, alert)
+#endif
+#ifdef LOG_CRIT
+define_syslog_shortcut_method(LOG_CRIT, crit)
+#endif
+#ifdef LOG_ERR
+define_syslog_shortcut_method(LOG_ERR, err)
+#endif
+#ifdef LOG_WARNING
+define_syslog_shortcut_method(LOG_WARNING, warning)
+#endif
+#ifdef LOG_NOTICE
+define_syslog_shortcut_method(LOG_NOTICE, notice)
+#endif
+#ifdef LOG_INFO
+define_syslog_shortcut_method(LOG_INFO, info)
+#endif
+#ifdef LOG_DEBUG
+define_syslog_shortcut_method(LOG_DEBUG, debug)
+#endif
+
+static VALUE mSyslogConstants_LOG_MASK(VALUE klass, VALUE pri)
+{
+    return INT2FIX(LOG_MASK(FIX2INT(pri)));
+}
+
+static VALUE mSyslogConstants_LOG_UPTO(VALUE klass, VALUE pri)
+{
+    return INT2FIX(LOG_UPTO(FIX2INT(pri)));
+}
+
+/* Init for package syslog */
+void Init_syslog()
+{
+    mSyslog = rb_define_module("Syslog");
+ 
+    mSyslogConstants = rb_define_module_under(mSyslog, "Constants");
+
+    rb_include_module(mSyslog, mSyslogConstants);
+
+    rb_define_module_function(mSyslog, "open", mSyslog_open, -1);
+    rb_define_module_function(mSyslog, "reopen", mSyslog_reopen, -1);
+    rb_define_module_function(mSyslog, "open!", mSyslog_reopen, -1);
+    rb_define_module_function(mSyslog, "opened?", mSyslog_isopen, 0);
+
+    rb_define_module_function(mSyslog, "ident", mSyslog_ident, 0);
+    rb_define_module_function(mSyslog, "options", mSyslog_options, 0);
+    rb_define_module_function(mSyslog, "facility", mSyslog_facility, 0);
+
+    rb_define_module_function(mSyslog, "log", mSyslog_log, -1);
+    rb_define_module_function(mSyslog, "close", mSyslog_close, 0);
+    rb_define_module_function(mSyslog, "mask", mSyslog_get_mask, 0);
+    rb_define_module_function(mSyslog, "mask=", mSyslog_set_mask, 1);
+
+    rb_define_module_function(mSyslog, "LOG_MASK", mSyslogConstants_LOG_MASK, 1);
+    rb_define_module_function(mSyslog, "LOG_UPTO", mSyslogConstants_LOG_UPTO, 1);
+
+    rb_define_module_function(mSyslog, "inspect", mSyslog_inspect, 0);
+    rb_define_module_function(mSyslog, "instance", mSyslog_instance, 0);
+
+    rb_define_module_function(mSyslogConstants, "LOG_MASK", mSyslogConstants_LOG_MASK, 1);
+    rb_define_module_function(mSyslogConstants, "LOG_UPTO", mSyslogConstants_LOG_UPTO, 1);
+
+#define rb_define_syslog_const(id) \
+    rb_define_const(mSyslogConstants, #id, INT2NUM(id))
+
+    /* Various options when opening log */
+#ifdef LOG_PID
+    rb_define_syslog_const(LOG_PID);
+#endif
+#ifdef LOG_CONS
+    rb_define_syslog_const(LOG_CONS);
+#endif
+#ifdef LOG_ODELAY
+    rb_define_syslog_const(LOG_ODELAY); /* deprecated */
+#endif
+#ifdef LOG_NDELAY
+    rb_define_syslog_const(LOG_NDELAY);
+#endif
+#ifdef LOG_NOWAIT
+    rb_define_syslog_const(LOG_NOWAIT); /* deprecated */
+#endif
+#ifdef LOG_PERROR
+    rb_define_syslog_const(LOG_PERROR);
+#endif
+
+    /* Various syslog facilities */
+#ifdef LOG_AUTH
+    rb_define_syslog_const(LOG_AUTH);
+#endif
+#ifdef LOG_AUTHPRIV
+    rb_define_syslog_const(LOG_AUTHPRIV);
+#endif
+#ifdef LOG_CONSOLE
+    rb_define_syslog_const(LOG_CONSOLE);
+#endif
+#ifdef LOG_CRON
+    rb_define_syslog_const(LOG_CRON);
+#endif
+#ifdef LOG_DAEMON
+    rb_define_syslog_const(LOG_DAEMON);
+#endif
+#ifdef LOG_FTP
+    rb_define_syslog_const(LOG_FTP);
+#endif
+#ifdef LOG_KERN
+    rb_define_syslog_const(LOG_KERN);
+#endif
+#ifdef LOG_LPR
+    rb_define_syslog_const(LOG_LPR);
+#endif
+#ifdef LOG_MAIL
+    rb_define_syslog_const(LOG_MAIL);
+#endif
+#ifdef LOG_NEWS
+    rb_define_syslog_const(LOG_NEWS);
+#endif
+#ifdef LOG_NTP
+   rb_define_syslog_const(LOG_NTP);
+#endif
+#ifdef LOG_SECURITY
+    rb_define_syslog_const(LOG_SECURITY);
+#endif
+#ifdef LOG_SYSLOG
+    rb_define_syslog_const(LOG_SYSLOG);
+#endif
+#ifdef LOG_USER
+    rb_define_syslog_const(LOG_USER);
+#endif
+#ifdef LOG_UUCP
+    rb_define_syslog_const(LOG_UUCP);
+#endif
+#ifdef LOG_LOCAL0
+    rb_define_syslog_const(LOG_LOCAL0);
+#endif
+#ifdef LOG_LOCAL1
+    rb_define_syslog_const(LOG_LOCAL1);
+#endif
+#ifdef LOG_LOCAL2
+    rb_define_syslog_const(LOG_LOCAL2);
+#endif
+#ifdef LOG_LOCAL3
+    rb_define_syslog_const(LOG_LOCAL3);
+#endif
+#ifdef LOG_LOCAL4
+    rb_define_syslog_const(LOG_LOCAL4);
+#endif
+#ifdef LOG_LOCAL5
+    rb_define_syslog_const(LOG_LOCAL5);
+#endif
+#ifdef LOG_LOCAL6
+    rb_define_syslog_const(LOG_LOCAL6);
+#endif
+#ifdef LOG_LOCAL7
+    rb_define_syslog_const(LOG_LOCAL7);
+#endif
+
+#define rb_define_syslog_shortcut(name) \
+    rb_define_module_function(mSyslog, #name, mSyslog_##name, -1)
+
+    /* Various syslog priorities and the shortcut methods */
+#ifdef LOG_EMERG
+    rb_define_syslog_const(LOG_EMERG);
+    rb_define_syslog_shortcut(emerg);
+#endif
+#ifdef LOG_ALERT
+    rb_define_syslog_const(LOG_ALERT);
+    rb_define_syslog_shortcut(alert);
+#endif
+#ifdef LOG_CRIT
+    rb_define_syslog_const(LOG_CRIT);
+    rb_define_syslog_shortcut(crit);
+#endif
+#ifdef LOG_ERR
+    rb_define_syslog_const(LOG_ERR);
+    rb_define_syslog_shortcut(err);
+#endif
+#ifdef LOG_WARNING
+    rb_define_syslog_const(LOG_WARNING);
+    rb_define_syslog_shortcut(warning);
+#endif
+#ifdef LOG_NOTICE
+    rb_define_syslog_const(LOG_NOTICE);
+    rb_define_syslog_shortcut(notice);
+#endif
+#ifdef LOG_INFO
+    rb_define_syslog_const(LOG_INFO);
+    rb_define_syslog_shortcut(info);
+#endif
+#ifdef LOG_DEBUG
+    rb_define_syslog_const(LOG_DEBUG);
+    rb_define_syslog_shortcut(debug);
+#endif
+}
diff --git a/ruby_1_8_6/ext/syslog/syslog.txt b/ruby_1_8_6/ext/syslog/syslog.txt
new file mode 100644
index 0000000000..9aed35133d
--- /dev/null
+++ b/ruby_1_8_6/ext/syslog/syslog.txt
@@ -0,0 +1,121 @@
+.\" syslog.txt -  -*- Indented-Text -*-
+$RoughId: syslog.txt,v 1.18 2002/02/25 08:20:14 knu Exp $
+$Id$
+
+UNIX Syslog extension for Ruby
+Amos Gouaux, University of Texas at Dallas
+<amos+ruby@utdallas.edu>
+&
+Akinori MUSHA
+<knu@ruby-lang.org>
+
+** Syslog(Module)
+
+Included Modules: Syslog::Constants
+
+require 'syslog'
+
+A Simple wrapper for the UNIX syslog system calls that might be handy
+if you're writing a server in Ruby.  For the details of the syslog(8)
+architecture and constants, see the syslog(3) manual page of your
+platform.
+
+Module Methods:
+
+   open(ident = $0, logopt = Syslog::LOG_PID | Syslog::LOG_CONS,
+		facility = Syslog::LOG_USER) [{ |syslog| ... }]
+
+	Opens syslog with the given options and returns the module
+	itself.  If a block is given, calls it with an argument of
+	itself.  If syslog is already opened, raises RuntimeError.
+
+	Example:
+	  Syslog.open('ftpd', Syslog::LOG_PID | Syslog::LOG_NDELAY,
+			      Syslog::LOG_FTP)
+
+   open!(ident = $0, logopt = Syslog::LOG_PID | Syslog::LOG_CONS,
+		facility = Syslog::LOG_USER)
+   reopen(ident = $0, logopt = Syslog::LOG_PID | Syslog::LOG_CONS,
+		facility = Syslog::LOG_USER)
+
+	Same as open, but does a close first.
+
+   opened?
+
+	Returns true if syslog opened, otherwise false.
+
+   ident
+   options
+   facility
+
+	Returns the parameters given in the last open, respectively.
+	Every call of Syslog::open resets these values.
+
+   log(pri, message, ...)
+
+	Writes message to syslog.
+
+	Example:
+	  Syslog.log(Syslog::LOG_CRIT, "the sky is falling in %d seconds!", 10)
+
+   crit(message, ...)
+   emerg(message, ...)
+   alert(message, ...)
+   err(message, ...)
+   warning(message, ...)
+   notice(message, ...)
+   info(message, ...)
+   debug(message, ...)
+
+	These are shortcut methods of Syslog::log().  The lineup may
+	vary depending on what priorities are defined on your system.
+
+	Example:
+	  Syslog.crit("the sky is falling in %d seconds!", 5)
+ 
+   mask
+   mask=(mask)
+
+	Returns or sets the log priority mask.  The value of the mask
+	is persistent and will not be reset by Syslog::open or
+	Syslog::close.
+
+	Example:
+	  Syslog.mask = Syslog::LOG_UPTO(Syslog::LOG_ERR)
+
+   close 
+
+	Closes syslog.
+
+   inspect
+
+	Returns the "inspect" string of the Syslog module.
+
+   instance
+
+	Returns the module itself. (Just for backward compatibility)
+
+   LOG_MASK(pri)
+
+	Creates a mask for one priority.
+
+   LOG_UPTO(pri)
+
+	Creates a mask for all priorities up to pri.
+
+** Syslog::Constants(Module)
+
+require 'syslog'
+include Syslog::Constants
+
+This module includes the LOG_* constants available on the system.
+
+Module Methods:
+
+   LOG_MASK(pri)
+
+	Creates a mask for one priority.
+
+   LOG_UPTO(pri)
+
+	Creates a mask for all priorities up to pri.
diff --git a/ruby_1_8_6/ext/syslog/test.rb b/ruby_1_8_6/ext/syslog/test.rb
new file mode 100644
index 0000000000..cfa33eff8f
--- /dev/null
+++ b/ruby_1_8_6/ext/syslog/test.rb
@@ -0,0 +1,164 @@
+#!/usr/bin/env ruby
+# $RoughId: test.rb,v 1.9 2002/02/25 08:20:14 knu Exp $
+# $Id$
+
+# Please only run this test on machines reasonable for testing.
+# If in doubt, ask your admin.
+
+require 'test/unit'
+
+# Prepend current directory to load path for testing.
+$:.unshift('.')
+
+require 'syslog'
+
+class TestSyslog < Test::Unit::TestCase
+  def test_new
+    assert_raises(NoMethodError) {
+      Syslog.new
+    }
+  end
+
+  def test_instance
+    sl1 = Syslog.instance
+    sl2 = Syslog.open
+    sl3 = Syslog.instance
+
+    assert_equal(Syslog, sl1)
+    assert_equal(Syslog, sl2)
+    assert_equal(Syslog, sl3)
+  ensure
+    Syslog.close if Syslog.opened?
+  end
+
+  def test_open
+    # default parameters
+    Syslog.open
+
+    assert_equal($0, Syslog.ident)
+    assert_equal(Syslog::LOG_PID | Syslog::LOG_CONS, Syslog.options)
+    assert_equal(Syslog::LOG_USER, Syslog.facility)
+
+    # open without close
+    assert_raises(RuntimeError) {
+      Syslog.open
+    }
+
+    Syslog.close
+
+    # given parameters
+    Syslog.open("foo", Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog::LOG_DAEMON) 
+
+    assert_equal('foo', Syslog.ident)
+    assert_equal(Syslog::LOG_NDELAY | Syslog::LOG_PERROR, Syslog.options)
+    assert_equal(Syslog::LOG_DAEMON, Syslog.facility)
+
+    Syslog.close
+
+    # default parameters again (after close)
+    Syslog.open
+    Syslog.close
+
+    assert_equal(nil, Syslog.ident)
+    assert_equal(nil, Syslog.options)
+    assert_equal(nil, Syslog.facility)
+
+    # block
+    param = nil
+    Syslog.open { |param| }
+    assert_equal(Syslog, param)
+  ensure
+    Syslog.close if Syslog.opened?
+  end
+
+  def test_opened?
+    assert_equal(false, Syslog.opened?)
+
+    Syslog.open
+    assert_equal(true, Syslog.opened?)
+
+    Syslog.close
+    assert_equal(false, Syslog.opened?)
+
+    Syslog.open {
+      assert_equal(true, Syslog.opened?)
+    }
+
+    assert_equal(false, Syslog.opened?)
+  end
+
+  def test_close
+    assert_raises(RuntimeError) {
+      Syslog.close
+    }
+  end
+
+  def test_mask
+    assert_equal(nil, Syslog.mask)
+
+    Syslog.open
+
+    orig = Syslog.mask
+
+    Syslog.mask = Syslog.LOG_UPTO(Syslog::LOG_ERR)
+    assert_equal(Syslog.LOG_UPTO(Syslog::LOG_ERR), Syslog.mask)
+
+    Syslog.mask = Syslog.LOG_MASK(Syslog::LOG_CRIT)
+    assert_equal(Syslog.LOG_MASK(Syslog::LOG_CRIT), Syslog.mask)
+
+    Syslog.mask = orig
+  ensure
+    Syslog.close if Syslog.opened?
+  end
+
+  def test_log
+    stderr = IO::pipe
+
+    pid = fork {
+      stderr[0].close
+      STDERR.reopen(stderr[1])
+      stderr[1].close
+
+      options = Syslog::LOG_PERROR | Syslog::LOG_NDELAY
+
+      Syslog.open("syslog_test", options) { |sl|
+	sl.log(Syslog::LOG_NOTICE, "test1 - hello, %s!", "world")
+	sl.notice("test1 - hello, %s!", "world")
+      }
+
+      Syslog.open("syslog_test", options | Syslog::LOG_PID) { |sl|
+	sl.log(Syslog::LOG_CRIT, "test2 - pid")
+	sl.crit("test2 - pid")
+      }
+      exit!
+    }
+
+    stderr[1].close
+    Process.waitpid(pid)
+
+    # LOG_PERROR is not yet implemented on Cygwin.
+    return if RUBY_PLATFORM =~ /cygwin/
+
+    2.times {
+      assert_equal("syslog_test: test1 - hello, world!\n", stderr[0].gets)
+    }
+
+    2.times {
+      assert_equal(format("syslog_test[%d]: test2 - pid\n", pid), stderr[0].gets)
+    }
+  end
+
+  def test_inspect
+    Syslog.open { |sl|
+      assert_equal(format('<#%s: opened=true, ident="%s", options=%d, facility=%d, mask=%d>',
+			  Syslog,
+			  sl.ident,
+			  sl.options,
+			  sl.facility,
+			  sl.mask),
+		   sl.inspect)
+    }
+
+    assert_equal(format('<#%s: opened=false>', Syslog), Syslog.inspect)
+  end
+end
diff --git a/ruby_1_8_6/ext/thread/extconf.rb b/ruby_1_8_6/ext/thread/extconf.rb
new file mode 100644
index 0000000000..2f984efc6d
--- /dev/null
+++ b/ruby_1_8_6/ext/thread/extconf.rb
@@ -0,0 +1,9 @@
+require 'mkmf'
+
+enable_config('fastthread', true) or exit
+
+if with_config('mem-pools', true)
+  $CPPFLAGS << ' -DUSE_MEM_POOLS'
+end
+
+create_makefile("thread")
diff --git a/ruby_1_8_6/ext/thread/lib/thread.rb b/ruby_1_8_6/ext/thread/lib/thread.rb
new file mode 100644
index 0000000000..6c533aba39
--- /dev/null
+++ b/ruby_1_8_6/ext/thread/lib/thread.rb
@@ -0,0 +1,5 @@
+unless defined? Thread
+  fail "Thread not available for this ruby interpreter"
+end
+
+require 'thread.so'
diff --git a/ruby_1_8_6/ext/thread/thread.c b/ruby_1_8_6/ext/thread/thread.c
new file mode 100644
index 0000000000..43dfc348ed
--- /dev/null
+++ b/ruby_1_8_6/ext/thread/thread.c
@@ -0,0 +1,1216 @@
+/*
+ * Optimized Ruby Mutex implementation, loosely based on thread.rb by
+ * Yukihiro Matsumoto <matz@ruby-lang.org>
+ *
+ *  Copyright 2006-2007  MenTaLguY <mental@rydia.net>
+ *
+ * RDoc taken from original.
+ *
+ * This file is made available under the same terms as Ruby.
+ */
+
+#include <ruby.h>
+#include <intern.h>
+#include <rubysig.h>
+#include <node.h>
+
+enum rb_thread_status rb_thread_status _((VALUE));
+
+static VALUE rb_cMutex;
+static VALUE rb_cConditionVariable;
+static VALUE rb_cQueue;
+static VALUE rb_cSizedQueue;
+
+static VALUE set_critical(VALUE value);
+
+static VALUE
+thread_exclusive_do(void)
+{
+    rb_thread_critical = 1;
+
+    return rb_yield(Qundef);
+}
+
+/*
+ *  call-seq:
+ *     Thread.exclusive { block }   => obj
+ *  
+ *  Wraps a block in Thread.critical, restoring the original value
+ *  upon exit from the critical section, and returns the value of the
+ *  block.
+ */
+
+static VALUE
+rb_thread_exclusive(void)
+{
+    return rb_ensure(thread_exclusive_do, Qundef, set_critical, rb_thread_critical);
+}
+
+typedef struct _Entry {
+    VALUE value;
+    struct _Entry *next;
+} Entry;
+
+typedef struct _List {
+    Entry *entries;
+    Entry *last_entry;
+    Entry *entry_pool;
+    unsigned long size;
+} List;
+
+static void
+init_list(List *list)
+{
+    list->entries = NULL;
+    list->last_entry = NULL;
+    list->entry_pool = NULL;
+    list->size = 0;
+}
+
+static void
+mark_list(List *list)
+{
+    Entry *entry;
+    for (entry = list->entries; entry; entry = entry->next) {
+        rb_gc_mark(entry->value);
+    }
+}
+
+static void
+free_entries(Entry *first)
+{
+    Entry *next;
+    while (first) {
+        next = first->next;
+        xfree(first);
+        first = next;
+    }
+}
+
+static void
+finalize_list(List *list)
+{
+    free_entries(list->entries);
+    free_entries(list->entry_pool);
+}
+
+static void
+push_list(List *list, VALUE value)
+{
+    Entry *entry;
+
+    if (list->entry_pool) {
+        entry = list->entry_pool;
+        list->entry_pool = entry->next;
+    } else {
+        entry = ALLOC(Entry);
+    }
+
+    entry->value = value;
+    entry->next = NULL;
+
+    if (list->last_entry) {
+        list->last_entry->next = entry;
+    } else {
+        list->entries = entry;
+    }
+    list->last_entry = entry;
+
+    ++list->size;
+}
+
+static void
+push_multiple_list(List *list, VALUE *values, unsigned count)
+{
+    unsigned i;
+    for (i = 0; i < count; i++) {
+        push_list(list, values[i]);
+    }
+}
+
+static void
+recycle_entries(List *list, Entry *first_entry, Entry *last_entry)
+{
+#ifdef USE_MEM_POOLS
+    last_entry->next = list->entry_pool;
+    list->entry_pool = first_entry;
+#else
+    last_entry->next = NULL;
+    free_entries(first_entry);
+#endif
+}
+
+static VALUE
+shift_list(List *list)
+{
+    Entry *entry;
+    VALUE value;
+
+    entry = list->entries;
+    if (!entry) return Qundef;
+
+    list->entries = entry->next;
+    if (entry == list->last_entry) {
+        list->last_entry = NULL;
+    }
+
+    --list->size;
+
+    value = entry->value;
+    recycle_entries(list, entry, entry);
+
+    return value;
+}
+
+static void
+remove_one(List *list, VALUE value)
+{
+    Entry **ref;
+    Entry *prev;
+    Entry *entry;
+
+    for (ref = &list->entries, prev = NULL, entry = list->entries;
+              entry != NULL;
+              ref = &entry->next, prev = entry, entry = entry->next) {
+        if (entry->value == value) {
+            *ref = entry->next;
+            list->size--;
+            if (!entry->next) {
+                list->last_entry = prev;
+            }
+            recycle_entries(list, entry, entry);
+            break;
+        }
+    }
+}
+
+static void
+clear_list(List *list)
+{
+    if (list->last_entry) {
+        recycle_entries(list, list->entries, list->last_entry);
+        list->entries = NULL;
+        list->last_entry = NULL;
+        list->size = 0;
+    }
+}
+
+static VALUE
+array_from_list(List const *list)
+{
+    VALUE ary;
+    Entry *entry;
+    ary = rb_ary_new();
+    for (entry = list->entries; entry; entry = entry->next) {
+        rb_ary_push(ary, entry->value);
+    }
+    return ary;
+}
+
+static VALUE
+wake_thread(VALUE thread)
+{
+    return rb_thread_wakeup_alive(thread);
+}
+
+static VALUE
+run_thread(VALUE thread)
+{
+    thread = wake_thread(thread);
+    if (RTEST(thread) && !rb_thread_critical)
+	rb_thread_schedule();
+    return thread;
+}
+
+static VALUE
+wake_one(List *list)
+{
+    VALUE waking;
+
+    waking = Qnil;
+    while (list->entries && !RTEST(waking)) {
+	waking = shift_list(list);
+	if (waking == Qundef) break;
+	waking = wake_thread(waking);
+    }
+
+    return waking;
+}
+
+static VALUE
+wake_all(List *list)
+{
+    while (list->entries) {
+        wake_one(list);
+    }
+    return Qnil;
+}
+
+static VALUE
+wait_list_inner(List *list)
+{
+    push_list(list, rb_thread_current());
+    rb_thread_stop();
+    return Qnil;
+}
+
+static VALUE
+wait_list_cleanup(List *list)
+{
+    /* cleanup in case of spurious wakeups */
+    remove_one(list, rb_thread_current());
+    return Qnil;
+}
+
+static void
+wait_list(List *list)
+{
+    rb_ensure(wait_list_inner, (VALUE)list, wait_list_cleanup, (VALUE)list);
+}
+
+static void
+assert_no_survivors(List *waiting, const char *label, void *addr)
+{
+    Entry *entry;
+    VALUE ths = 0;
+
+    for (entry = waiting->entries; entry; entry = entry->next) {
+	if (RTEST(wake_thread(entry->value))) {
+	    if (!ths) ths = rb_ary_new();
+	    rb_ary_push(ths, entry->value);
+	}
+    }
+    if (ths) {
+	rb_bug("%s %p freed with live thread(s) %s waiting",
+	       label, addr, RSTRING_PTR(rb_inspect(ths)));
+    }
+}
+
+/*
+ * Document-class: Mutex
+ *
+ * Mutex implements a simple semaphore that can be used to coordinate access to
+ * shared data from multiple concurrent threads.
+ *
+ * Example:
+ *
+ *   require 'thread'
+ *   semaphore = Mutex.new
+ *
+ *   a = Thread.new {
+ *     semaphore.synchronize {
+ *       # access shared resource
+ *     }
+ *   }
+ *
+ *   b = Thread.new {
+ *     semaphore.synchronize {
+ *       # access shared resource
+ *     }
+ *   }
+ *
+ */
+
+typedef struct _Mutex {
+    VALUE owner;
+    List waiting;
+} Mutex;
+
+#define MUTEX_LOCKED_P(mutex) (RTEST((mutex)->owner) && rb_thread_alive_p((mutex)->owner))
+
+static void
+mark_mutex(Mutex *mutex)
+{
+    rb_gc_mark(mutex->owner);
+    mark_list(&mutex->waiting);
+}
+
+static void
+finalize_mutex(Mutex *mutex)
+{
+    finalize_list(&mutex->waiting);
+}
+
+static void
+free_mutex(Mutex *mutex)
+{
+    assert_no_survivors(&mutex->waiting, "mutex", mutex);
+    finalize_mutex(mutex);
+    xfree(mutex);
+}
+
+static void
+init_mutex(Mutex *mutex)
+{
+    mutex->owner = Qnil;
+    init_list(&mutex->waiting);
+}
+
+/*
+ * Document-method: new
+ * call-seq: Mutex.new
+ * 
+ * Creates a new Mutex
+ *
+ */
+
+static VALUE 
+rb_mutex_alloc(VALUE klass)
+{
+    Mutex *mutex;
+    mutex = ALLOC(Mutex);
+    init_mutex(mutex);
+    return Data_Wrap_Struct(klass, mark_mutex, free_mutex, mutex);
+}
+
+/*
+ * Document-method: locked?
+ * call-seq: locked?
+ *
+ * Returns +true+ if this lock is currently held by some thread.
+ *
+ */
+
+static VALUE
+rb_mutex_locked_p(VALUE self)
+{
+    Mutex *mutex;
+    Data_Get_Struct(self, Mutex, mutex);
+    return MUTEX_LOCKED_P(mutex) ? Qtrue : Qfalse;
+}
+
+/*
+ * Document-method: try_lock
+ * call-seq: try_lock
+ *
+ * Attempts to obtain the lock and returns immediately. Returns +true+ if the
+ * lock was granted.
+ *
+ */
+
+static VALUE
+rb_mutex_try_lock(VALUE self)
+{
+    Mutex *mutex;
+
+    Data_Get_Struct(self, Mutex, mutex);
+
+    if (MUTEX_LOCKED_P(mutex))
+        return Qfalse;
+
+    mutex->owner = rb_thread_current();
+    return Qtrue;
+}
+
+/*
+ * Document-method: lock
+ * call-seq: lock
+ *
+ * Attempts to grab the lock and waits if it isn't available.
+ *
+ */
+
+static VALUE
+lock_mutex(Mutex *mutex)
+{
+    VALUE current;
+    current = rb_thread_current();
+
+    rb_thread_critical = 1;
+
+    if (!MUTEX_LOCKED_P(mutex)) {
+	mutex->owner = current;
+    }
+    else {
+	push_list(&mutex->waiting, current);
+	do {
+	    rb_thread_stop();
+	    rb_thread_critical = 1;
+	    if (!MUTEX_LOCKED_P(mutex)) {
+		mutex->owner = current;
+		break;
+	    }
+	} while (mutex->owner != current);
+    }
+
+    rb_thread_critical = 0;
+    return Qnil;
+}
+
+static VALUE
+rb_mutex_lock(VALUE self)
+{
+    Mutex *mutex;
+    Data_Get_Struct(self, Mutex, mutex);
+    lock_mutex(mutex);
+    return self;
+}
+
+static VALUE
+relock_mutex(Mutex *mutex)
+{
+    VALUE current = rb_thread_current();
+
+    switch (rb_thread_status(current)) {
+      case THREAD_RUNNABLE:
+      case THREAD_STOPPED:
+	lock_mutex(mutex);
+	break;
+      default:
+	break;
+    }
+    return Qundef;
+}
+
+/*
+ * Document-method: unlock
+ *
+ * Releases the lock. Returns +nil+ if ref wasn't locked.
+ *
+ */
+
+static VALUE
+unlock_mutex_inner(Mutex *mutex)
+{
+    VALUE waking;
+
+    if (mutex->owner != rb_thread_current()) {
+	rb_raise(rb_eThreadError, "not owner");
+    }
+
+    waking = wake_one(&mutex->waiting);
+    mutex->owner = waking;
+
+    return waking;
+}
+
+static VALUE
+set_critical(VALUE value)
+{
+    rb_thread_critical = (int)value;
+    return Qundef;
+}
+
+static VALUE
+unlock_mutex(Mutex *mutex)
+{
+    VALUE waking;
+
+    rb_thread_critical = 1;
+    waking = rb_ensure(unlock_mutex_inner, (VALUE)mutex, set_critical, 0);
+    if (!RTEST(waking)) {
+        return Qfalse;
+    }
+
+    run_thread(waking);
+
+    return Qtrue;
+}
+
+static VALUE
+rb_mutex_unlock(VALUE self)
+{
+    Mutex *mutex;
+    Data_Get_Struct(self, Mutex, mutex);
+
+    if (RTEST(unlock_mutex(mutex))) {
+        return self;
+    } else {
+        return Qnil;
+    }
+}
+
+/*
+ * Document-method: exclusive_unlock
+ * call-seq: exclusive_unlock { ... }
+ *
+ * If the mutex is locked, unlocks the mutex, wakes one waiting thread, and
+ * yields in a critical section.
+ *
+ */
+
+static VALUE
+rb_mutex_exclusive_unlock_inner(Mutex *mutex)
+{
+    VALUE waking;
+    waking = unlock_mutex_inner(mutex);
+    rb_yield(Qundef);
+    return waking;
+}
+
+static VALUE
+rb_mutex_exclusive_unlock(VALUE self)
+{
+    Mutex *mutex;
+    VALUE waking;
+    Data_Get_Struct(self, Mutex, mutex);
+
+    rb_thread_critical = 1;
+    waking = rb_ensure(rb_mutex_exclusive_unlock_inner, (VALUE)mutex, set_critical, 0);
+
+    if (waking == Qundef || !RTEST(waking)) {
+        return Qnil;
+    }
+
+    run_thread(waking);
+
+    return self;
+}
+
+/*
+ * Document-method: synchronize
+ * call-seq: synchronize { ... }
+ *
+ * Obtains a lock, runs the block, and releases the lock when the block
+ * completes.  See the example under Mutex.
+ *
+ */
+
+static VALUE
+rb_mutex_synchronize(VALUE self)
+{
+    rb_mutex_lock(self);
+    return rb_ensure(rb_yield, Qundef, rb_mutex_unlock, self);
+}
+
+/*
+ * Document-class: ConditionVariable
+ *
+ * ConditionVariable objects augment class Mutex. Using condition variables,
+ * it is possible to suspend while in the middle of a critical section until a
+ * resource becomes available.
+ *
+ * Example:
+ *
+ *   require 'thread'
+ *
+ *   mutex = Mutex.new
+ *   resource = ConditionVariable.new
+ *
+ *   a = Thread.new {
+ *     mutex.synchronize {
+ *       # Thread 'a' now needs the resource
+ *       resource.wait(mutex)
+ *       # 'a' can now have the resource
+ *     }
+ *   }
+ *
+ *   b = Thread.new {
+ *     mutex.synchronize {
+ *       # Thread 'b' has finished using the resource
+ *       resource.signal
+ *     }
+ *   }
+ *
+ */
+
+typedef struct _ConditionVariable {
+    List waiting;
+} ConditionVariable;
+
+static void
+mark_condvar(ConditionVariable *condvar)
+{
+    mark_list(&condvar->waiting);
+}
+
+static void
+finalize_condvar(ConditionVariable *condvar)
+{
+    finalize_list(&condvar->waiting);
+}
+
+static void
+free_condvar(ConditionVariable *condvar)
+{
+    assert_no_survivors(&condvar->waiting, "condition variable", condvar);
+    finalize_condvar(condvar);
+    xfree(condvar);
+}
+
+static void
+init_condvar(ConditionVariable *condvar)
+{
+    init_list(&condvar->waiting);
+}
+
+/*
+ * Document-method: new
+ * call-seq: ConditionVariable.new
+ *
+ * Creates a new ConditionVariable
+ *
+ */
+
+static VALUE
+rb_condvar_alloc(VALUE klass)
+{
+    ConditionVariable *condvar;
+
+    condvar = ALLOC(ConditionVariable);
+    init_condvar(condvar);
+
+    return Data_Wrap_Struct(klass, mark_condvar, free_condvar, condvar);
+}
+
+/*
+ * Document-method: wait
+ * call-seq: wait
+ *
+ * Releases the lock held in +mutex+ and waits; reacquires the lock on wakeup.
+ *
+ */
+
+static void
+wait_condvar(ConditionVariable *condvar, Mutex *mutex)
+{
+    VALUE waking;
+
+    rb_thread_critical = 1;
+    if (rb_thread_current() != mutex->owner) {
+        rb_thread_critical = 0;
+        rb_raise(rb_eThreadError, "not owner of the synchronization mutex");
+    }
+    waking = unlock_mutex_inner(mutex);
+    if (RTEST(waking)) {
+	wake_thread(waking);
+    }
+    rb_ensure(wait_list, (VALUE)&condvar->waiting, relock_mutex, (VALUE)mutex);
+}
+
+static VALUE
+legacy_exclusive_unlock(VALUE mutex)
+{
+    return rb_funcall(mutex, rb_intern("exclusive_unlock"), 0);
+}
+
+typedef struct {
+    ConditionVariable *condvar;
+    VALUE mutex;
+} legacy_wait_args;
+
+static VALUE
+legacy_wait(VALUE unused, legacy_wait_args *args)
+{
+    wait_list(&args->condvar->waiting);
+    rb_funcall(args->mutex, rb_intern("lock"), 0);
+    return Qnil;
+}
+
+static VALUE
+rb_condvar_wait(VALUE self, VALUE mutex_v)
+{
+    ConditionVariable *condvar;
+    Data_Get_Struct(self, ConditionVariable, condvar);
+
+    if (CLASS_OF(mutex_v) != rb_cMutex) {
+        /* interoperate with legacy mutex */
+        legacy_wait_args args;
+        args.condvar = condvar;
+        args.mutex = mutex_v;
+        rb_iterate(legacy_exclusive_unlock, mutex_v, legacy_wait, (VALUE)&args);
+    } else {
+        Mutex *mutex;
+        Data_Get_Struct(mutex_v, Mutex, mutex);
+        wait_condvar(condvar, mutex);
+    }
+
+    return self;
+}
+
+/*
+ * Document-method: broadcast
+ * call-seq: broadcast
+ *
+ * Wakes up all threads waiting for this condition.
+ *
+ */
+
+static VALUE
+rb_condvar_broadcast(VALUE self)
+{
+    ConditionVariable *condvar;
+
+    Data_Get_Struct(self, ConditionVariable, condvar);
+  
+    rb_thread_critical = 1;
+    rb_ensure(wake_all, (VALUE)&condvar->waiting, set_critical, 0);
+    rb_thread_schedule();
+
+    return self;
+}
+
+/*
+ * Document-method: signal
+ * call-seq: signal
+ *
+ * Wakes up the first thread in line waiting for this condition.
+ *
+ */
+
+static void
+signal_condvar(ConditionVariable *condvar)
+{
+    VALUE waking;
+    rb_thread_critical = 1;
+    waking = rb_ensure(wake_one, (VALUE)&condvar->waiting, set_critical, 0);
+    if (RTEST(waking)) {
+        run_thread(waking);
+    }
+}
+
+static VALUE
+rb_condvar_signal(VALUE self)
+{
+    ConditionVariable *condvar;
+    Data_Get_Struct(self, ConditionVariable, condvar);
+    signal_condvar(condvar);
+    return self;
+}
+
+/*
+ * Document-class: Queue
+ *
+ * This class provides a way to synchronize communication between threads.
+ *
+ * Example:
+ *
+ *   require 'thread'
+ *
+ *   queue = Queue.new
+ *
+ *   producer = Thread.new do
+ *     5.times do |i|
+ *       sleep rand(i) # simulate expense
+ *       queue << i
+ *       puts "#{i} produced"
+ *     end
+ *   end
+ *
+ *   consumer = Thread.new do
+ *     5.times do |i|
+ *       value = queue.pop
+ *       sleep rand(i/2) # simulate expense
+ *       puts "consumed #{value}"
+ *     end
+ *   end
+ *
+ *   consumer.join
+ *
+ */
+
+typedef struct _Queue {
+    Mutex mutex;
+    ConditionVariable value_available;
+    ConditionVariable space_available;
+    List values;
+    unsigned long capacity;
+} Queue;
+
+static void
+mark_queue(Queue *queue)
+{
+    mark_mutex(&queue->mutex);
+    mark_condvar(&queue->value_available);
+    mark_condvar(&queue->space_available);
+    mark_list(&queue->values);
+}
+
+static void
+finalize_queue(Queue *queue)
+{
+    finalize_mutex(&queue->mutex);
+    finalize_condvar(&queue->value_available);
+    finalize_condvar(&queue->space_available);
+    finalize_list(&queue->values);
+}
+
+static void
+free_queue(Queue *queue)
+{
+    assert_no_survivors(&queue->mutex.waiting, "queue", queue);
+    assert_no_survivors(&queue->space_available.waiting, "queue", queue);
+    assert_no_survivors(&queue->value_available.waiting, "queue", queue);
+    finalize_queue(queue);
+    xfree(queue);
+}
+
+static void
+init_queue(Queue *queue)
+{
+    init_mutex(&queue->mutex);
+    init_condvar(&queue->value_available);
+    init_condvar(&queue->space_available);
+    init_list(&queue->values);
+    queue->capacity = 0;
+}
+
+/*
+ * Document-method: new
+ * call-seq: new
+ *
+ * Creates a new queue.
+ *
+ */
+
+static VALUE
+rb_queue_alloc(VALUE klass)
+{
+    Queue *queue;
+    queue = ALLOC(Queue);
+    init_queue(queue);
+    return Data_Wrap_Struct(klass, mark_queue, free_queue, queue);
+}
+
+static VALUE
+rb_queue_marshal_load(VALUE self, VALUE data)
+{
+    Queue *queue;
+    VALUE array;
+    Data_Get_Struct(self, Queue, queue);
+
+    array = rb_marshal_load(data);
+    if (TYPE(array) != T_ARRAY) {
+	rb_raise(rb_eTypeError, "expected Array of queue data");
+    }
+    if (RARRAY(array)->len < 1) {
+	rb_raise(rb_eArgError, "missing capacity value");
+    }
+    queue->capacity = NUM2ULONG(rb_ary_shift(array));
+    push_multiple_list(&queue->values, RARRAY(array)->ptr, (unsigned)RARRAY(array)->len);
+
+    return self;
+}
+
+static VALUE
+rb_queue_marshal_dump(VALUE self)
+{
+    Queue *queue;
+    VALUE array;
+    Data_Get_Struct(self, Queue, queue);
+
+    array = array_from_list(&queue->values);
+    rb_ary_unshift(array, ULONG2NUM(queue->capacity));
+    return rb_marshal_dump(array, Qnil);
+}
+
+/*
+ * Document-method: clear
+ * call-seq: clear
+ *
+ * Removes all objects from the queue.
+ *
+ */
+
+static VALUE
+rb_queue_clear(VALUE self)
+{
+    Queue *queue;
+    Data_Get_Struct(self, Queue, queue);
+
+    lock_mutex(&queue->mutex);
+    clear_list(&queue->values);
+    signal_condvar(&queue->space_available);
+    unlock_mutex(&queue->mutex);
+
+    return self;
+}
+
+/*
+ * Document-method: empty?
+ * call-seq: empty?
+ *
+ * Returns +true+ if the queue is empty.
+ *
+ */
+
+static VALUE
+rb_queue_empty_p(VALUE self)
+{
+    Queue *queue;
+    VALUE result;
+    Data_Get_Struct(self, Queue, queue);
+
+    lock_mutex(&queue->mutex);
+    result = queue->values.size == 0 ? Qtrue : Qfalse;
+    unlock_mutex(&queue->mutex);
+
+    return result;
+}
+
+/*
+ * Document-method: length
+ * call-seq: length
+ *
+ * Returns the length of the queue.
+ *
+ */
+
+static VALUE
+rb_queue_length(VALUE self)
+{
+    Queue *queue;
+    VALUE result;
+    Data_Get_Struct(self, Queue, queue);
+
+    lock_mutex(&queue->mutex);
+    result = ULONG2NUM(queue->values.size);
+    unlock_mutex(&queue->mutex);
+
+    return result;
+}
+
+/*
+ * Document-method: num_waiting
+ * call-seq: num_waiting
+ *
+ * Returns the number of threads waiting on the queue.
+ *
+ */
+
+static VALUE
+rb_queue_num_waiting(VALUE self)
+{
+    Queue *queue;
+    VALUE result;
+    Data_Get_Struct(self, Queue, queue);
+
+    lock_mutex(&queue->mutex);
+    result = ULONG2NUM(queue->value_available.waiting.size +
+      queue->space_available.waiting.size);
+    unlock_mutex(&queue->mutex);
+
+    return result;
+}
+
+/*
+ * Document-method: pop
+ * call_seq: pop(non_block=false)
+ *
+ * Retrieves data from the queue.  If the queue is empty, the calling thread is
+ * suspended until data is pushed onto the queue.  If +non_block+ is true, the
+ * thread isn't suspended, and an exception is raised.
+ *
+ */
+
+static VALUE
+rb_queue_pop(int argc, VALUE *argv, VALUE self)
+{
+    Queue *queue;
+    int should_block;
+    VALUE result;
+    Data_Get_Struct(self, Queue, queue);
+
+    if (argc == 0) {
+        should_block = 1;
+    } else if (argc == 1) {
+        should_block = !RTEST(argv[0]);
+    } else {
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+    }
+
+    lock_mutex(&queue->mutex);
+    if (!queue->values.entries && !should_block) {
+        unlock_mutex(&queue->mutex);
+        rb_raise(rb_eThreadError, "queue empty");
+    }
+
+    while (!queue->values.entries) {
+        wait_condvar(&queue->value_available, &queue->mutex);
+    }
+
+    result = shift_list(&queue->values);
+    if (queue->capacity && queue->values.size < queue->capacity) {
+        signal_condvar(&queue->space_available);
+    }
+    unlock_mutex(&queue->mutex);
+
+    return result;
+}
+
+/*
+ * Document-method: push
+ * call-seq: push(obj)
+ *
+ * Pushes +obj+ to the queue.
+ *
+ */
+
+static VALUE
+rb_queue_push(VALUE self, VALUE value)
+{
+    Queue *queue;
+    Data_Get_Struct(self, Queue, queue);
+
+    lock_mutex(&queue->mutex);
+    while (queue->capacity && queue->values.size >= queue->capacity) {
+        wait_condvar(&queue->space_available, &queue->mutex);
+    }
+    push_list(&queue->values, value);
+    signal_condvar(&queue->value_available);
+    unlock_mutex(&queue->mutex);
+
+    return self;
+}
+
+/*
+ * Document-class: SizedQueue
+ *
+ * This class represents queues of specified size capacity.  The push operation
+ * may be blocked if the capacity is full.
+ *
+ * See Queue for an example of how a SizedQueue works.
+ *
+ */
+
+/*
+ * Document-method: new
+ * call-seq: new
+ *
+ * Creates a fixed-length queue with a maximum size of +max+.
+ *
+ */
+
+/*
+ * Document-method: max
+ * call-seq: max
+ *
+ * Returns the maximum size of the queue.
+ *
+ */
+
+static VALUE
+rb_sized_queue_max(VALUE self)
+{
+    Queue *queue;
+    VALUE result;
+    Data_Get_Struct(self, Queue, queue);
+
+    lock_mutex(&queue->mutex);
+    result = ULONG2NUM(queue->capacity);
+    unlock_mutex(&queue->mutex);
+
+    return result;
+}
+
+/*
+ * Document-method: max=
+ * call-seq: max=(size)
+ *
+ * Sets the maximum size of the queue.
+ *
+ */
+
+static VALUE
+rb_sized_queue_max_set(VALUE self, VALUE value)
+{
+    Queue *queue;
+    unsigned long new_capacity;
+    unsigned long difference;
+    Data_Get_Struct(self, Queue, queue);
+
+    new_capacity = NUM2ULONG(value);
+
+    if (new_capacity < 1) {
+        rb_raise(rb_eArgError, "value must be positive");
+    }
+
+    lock_mutex(&queue->mutex);
+    if (queue->capacity && new_capacity > queue->capacity) {
+        difference = new_capacity - queue->capacity;
+    } else {
+        difference = 0;
+    }
+    queue->capacity = new_capacity;
+    for (; difference > 0; --difference) {
+        signal_condvar(&queue->space_available);
+    }
+    unlock_mutex(&queue->mutex);
+
+    return self;
+}
+
+/*
+ * Document-method: push
+ * call-seq: push(obj)
+ *
+ * Pushes +obj+ to the queue.  If there is no space left in the queue, waits
+ * until space becomes available.
+ *
+ */
+
+/*
+ * Document-method: pop
+ * call-seq: pop(non_block=false)
+ *
+ * Retrieves data from the queue and runs a waiting thread, if any.
+ *
+ */
+
+/* for marshalling mutexes and condvars */
+
+static VALUE
+dummy_load(VALUE self, VALUE string)
+{
+    return Qnil;
+}
+
+static VALUE
+dummy_dump(VALUE self)
+{
+    return rb_str_new2("");
+}
+
+void
+Init_thread(void)
+{
+    rb_define_singleton_method(rb_cThread, "exclusive", rb_thread_exclusive, 0);
+
+    rb_cMutex = rb_define_class("Mutex", rb_cObject);
+    rb_define_alloc_func(rb_cMutex, rb_mutex_alloc);
+    rb_define_method(rb_cMutex, "marshal_load", dummy_load, 1);
+    rb_define_method(rb_cMutex, "marshal_dump", dummy_dump, 0);
+    rb_define_method(rb_cMutex, "locked?", rb_mutex_locked_p, 0);
+    rb_define_method(rb_cMutex, "try_lock", rb_mutex_try_lock, 0);
+    rb_define_method(rb_cMutex, "lock", rb_mutex_lock, 0);
+    rb_define_method(rb_cMutex, "unlock", rb_mutex_unlock, 0);
+    rb_define_method(rb_cMutex, "exclusive_unlock", rb_mutex_exclusive_unlock, 0);
+    rb_define_method(rb_cMutex, "synchronize", rb_mutex_synchronize, 0);
+
+    rb_cConditionVariable = rb_define_class("ConditionVariable", rb_cObject);
+    rb_define_alloc_func(rb_cConditionVariable, rb_condvar_alloc);
+    rb_define_method(rb_cConditionVariable, "marshal_load", dummy_load, 1);
+    rb_define_method(rb_cConditionVariable, "marshal_dump", dummy_dump, 0);
+    rb_define_method(rb_cConditionVariable, "wait", rb_condvar_wait, 1);
+    rb_define_method(rb_cConditionVariable, "broadcast", rb_condvar_broadcast, 0);
+    rb_define_method(rb_cConditionVariable, "signal", rb_condvar_signal, 0);
+
+    rb_cQueue = rb_define_class("Queue", rb_cObject);
+    rb_define_alloc_func(rb_cQueue, rb_queue_alloc);
+    rb_define_method(rb_cQueue, "marshal_load", rb_queue_marshal_load, 1);
+    rb_define_method(rb_cQueue, "marshal_dump", rb_queue_marshal_dump, 0);
+    rb_define_method(rb_cQueue, "clear", rb_queue_clear, 0);
+    rb_define_method(rb_cQueue, "empty?", rb_queue_empty_p, 0);
+    rb_define_method(rb_cQueue, "length", rb_queue_length, 0);
+    rb_define_method(rb_cQueue, "num_waiting", rb_queue_num_waiting, 0);
+    rb_define_method(rb_cQueue, "pop", rb_queue_pop, -1);
+    rb_define_method(rb_cQueue, "push", rb_queue_push, 1);
+    rb_alias(rb_cQueue, rb_intern("enq"), rb_intern("push"));
+    rb_alias(rb_cQueue, rb_intern("<<"), rb_intern("push"));
+    rb_alias(rb_cQueue, rb_intern("deq"), rb_intern("pop"));
+    rb_alias(rb_cQueue, rb_intern("shift"), rb_intern("pop"));
+    rb_alias(rb_cQueue, rb_intern("size"), rb_intern("length"));
+
+    rb_cSizedQueue = rb_define_class("SizedQueue", rb_cQueue);
+    rb_define_method(rb_cSizedQueue, "initialize", rb_sized_queue_max_set, 1);
+    rb_define_method(rb_cSizedQueue, "num_waiting", rb_queue_num_waiting, 0);
+    rb_define_method(rb_cSizedQueue, "pop", rb_queue_pop, -1);
+    rb_define_method(rb_cSizedQueue, "push", rb_queue_push, 1);
+    rb_define_method(rb_cSizedQueue, "max", rb_sized_queue_max, 0);
+    rb_define_method(rb_cSizedQueue, "max=", rb_sized_queue_max_set, 1);
+    rb_alias(rb_cSizedQueue, rb_intern("enq"), rb_intern("push"));
+    rb_alias(rb_cSizedQueue, rb_intern("<<"), rb_intern("push"));
+    rb_alias(rb_cSizedQueue, rb_intern("deq"), rb_intern("pop"));
+    rb_alias(rb_cSizedQueue, rb_intern("shift"), rb_intern("pop"));
+}
+
diff --git a/ruby_1_8_6/ext/tk/.cvsignore b/ruby_1_8_6/ext/tk/.cvsignore
new file mode 100644
index 0000000000..44e7f262dc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.log
diff --git a/ruby_1_8_6/ext/tk/ChangeLog.tkextlib b/ruby_1_8_6/ext/tk/ChangeLog.tkextlib
new file mode 100644
index 0000000000..359b466a32
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/ChangeLog.tkextlib
@@ -0,0 +1,918 @@
+2007-05-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/tcllib/tablelist.rb: fix typo.
+
+	* ext/tk/lib/tkextlib/tile/dialog.rb: forget to give an argument.
+
+	* ext/tk/lib/tkextlib/version.rb: update RELEASE_DATE.
+
+2007-01-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/iwidgets/checkbox.rb: wrong number of arguments 
+	  [ruby-Bugs-7776].
+
+	* ext/tk/lib/tkextlib/iwidgets/radiobox.rb: ditto.
+
+	* ext/tk/lib/tkextlib/blt/tile/checkbutton.rb: change primary name 
+	  of class [ruby-dev:30080].
+
+	* ext/tk/lib/tkextlib/blt/tile/radiobutton.rb: ditto.
+
+2006-11-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile/treeview.rb : minor bug fix.
+
+	* lib/tkextlib/blt/table.rb: fix bugs which forbade use of 
+	  '::blt::table' command. Now, probably, it'll works properly.
+
+2006-11-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/version.rb: keep release date of tkextlib on 
+	  "Tk::Tkextlib_RELEASE_DATE".
+
+	* lib/tkextlib/tile/treeview.rb : support Tile 0.7.8. 
+	  Now, you can handle tree items as objects. 
+
+2006-10-04  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile.rb, lib/tkextlib/tile/* : support Tile 0.7.6.
+
+2006-10-03  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/SUPPORT_STATUS: [ruby-talk:211939] check links
+	  of extensions.
+
+	* lib/tkextlib/blt/container.rb: define instance methods properly.
+
+        * lib/tkextlib/tile/tcombobox.rb: bug fix [ruby-talk:213003].
+
+	* lib/tkextlib/tile/tnotebook.rb: ditto.
+
+	* lib/tkextlib/tile/treeview.rb: ditto.
+
+	* lib/tkextlib/tile/sizegrip.rb: [new] add 'ttk::sizegrip' widget.
+
+2006-08-31  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt.rb: double dashes (--) option doesn't work
+	  properly on some versions of BLT (wrong description on the
+	  manual of `blt::bgexec'?).
+
+2005-12-11  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/SUPPORT_STATUS: update to support libraries in
+          ActiveTcl8.4.12.0.
+
+	* lib/tkextlib/tile/tnotebook.rb: add Tk::Tile::TNotebook#insert.
+
+	* sample/tkextlib/tile/demo.rb: improve the look of a part of the demo.
+
+2005-11-25  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/tile/demo.rb: bug fix
+
+	* sample/tkextlib/tile/themes/*: add some themes (blue,
+	  keramik, and plastik; require Tile-0.5 or later).
+
+2005-11-22  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE
+	  is not defined).
+
+2005-11-19  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/treectrl/demo.rb: remove dependency on Ruby's 
+	  version (1.8 or 1.9).
+
+2005-10-23  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/*: update to support ActiveTcl8.4.11.2
+
+	* lib/tkextlib/trofs/*: support Trofs 0.4.3
+
+	* lib/tkextlib/tile/*: support Tile 0.7.2
+
+	* lib/tkextlib/vu/*: support vu 2.3.0
+
+	* lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3 part only)
+
+	* lib/tkextlib/*: improve conversion of option values
+
+2005-10-04  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tktable/tktable.rb: border_* instance methods
+	  don't call 'border' subcommands.
+
+2005-08-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/component.rb: didn't check
+	  __item_ruby2val_optkeys().
+
+2005-08-09  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/barchart.rb: support to treat tkvariable-type
+	  configure options.
+
+	* lib/tkextlib/blt/component.rb: ditto.
+
+	* lib/tkextlib/blt/dragdrop.rb: ditto.
+
+	* lib/tkextlib/blt/treeview.rb: ditto.
+
+	* lib/tkextlib/bwidget/button.rb: ditto.
+
+	* lib/tkextlib/bwidget/entry.rb: ditto.
+
+	* lib/tkextlib/bwidget/label.rb: ditto.
+
+	* lib/tkextlib/bwidget/labelentry.rb: ditto.
+
+	* lib/tkextlib/bwidget/labelframe.rb: ditto.
+
+	* lib/tkextlib/bwidget/mainframe.rb: ditto.
+
+	* lib/tkextlib/bwidget/passwddlg.rb: ditto.
+
+	* lib/tkextlib/bwidget/spinbox.rb: ditto.
+
+	* lib/tkextlib/bwidget/tree.rb: ditto.
+
+	* lib/tkextlib/iwidgets/calendar.rb: ditto.
+
+	* lib/tkextlib/iwidgets/entryfield.rb: ditto.
+
+	* lib/tkextlib/iwidgets/hierarchy.rb: ditto.
+
+	* lib/tkextlib/iwidgets/labeledframe.rb: ditto.
+
+	* lib/tkextlib/iwidgets/labeledwidget.rb: ditto.
+
+	* lib/tkextlib/iwidgets/menubar.rb: ditto.
+
+	* lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto.
+
+	* lib/tkextlib/iwidgets/spinner.rb: ditto.
+
+	* lib/tkextlib/iwidgets/toolbar.rb: ditto.
+
+	* lib/tkextlib/tkimg/pixmap.rb: ditto.
+
+	* lib/tkextlib/tktable/tktable.rb: ditto.
+
+2005-08-06  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/demo.rb: use Tk::Tile::Scale#variable.
+
+2005-08-04  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/demo.rb: followed previous changes.
+
+2005-08-04  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile/t*.rb: aliased class names starting with 'T'
+	  to non 'T' ones. (ie. Tk::Tile::TButton -> Tk::Tile::Button)
+	  [ruby-dev:26724]
+
+	* lib/tkextlib/tile.rb: ditto. (autoload support)
+
+2005-08-04  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/demo.rb: fixed: Tk::Tile::TProgressbar is
+	  supported on tile 0.6 or later, not tile 0.5.
+
+	* sample/tkextlib/tile/demo.rb: updated scales demo to use
+	  Tk::Tile::TProgressbar for tile 0.6 or later.
+
+	* sample/tkextlib/tile/demo.rb: set some TkVariable default values.
+
+2005-08-03  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile/treeview.rb: Tk::Tile::Treeview#headingconfigure
+	  is now working and more. [ruby-dev:26716]
+
+	* sample/tkextlib/tile/demo.rb: use Tk::Tile::Treeview#headingconfigure 	  instead of direct Tk.tk_call.
+
+2005-08-02  ocean  <ocean@ruby-lang.org>
+
+	* lib/tkextlib/tile/tprogressbar.rb: Tk::Tile::TProgressbar#start
+	  takes optional argument `interval'.
+
+	* sample/tkextlib/tile/demo.rb: emulate Tk::Tile::TProgressbar
+	  with Tk::Tile::TProgress in tile 0.4. (repeating buttons demo)
+
+2005-08-02  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/demo.rb: added repeating buttons demo.
+
+	* sample/tkextlib/tile/repeater.tcl: ditto. (new file)
+
+2005-08-01  ocean  <ocean@ruby-lang.org>
+
+	* lib/tkextlib/tile.rb: fixed autoload for Treeview.
+
+	* lib/tkextlib/tile/treeview.rb: replaced `ary2tk_list(items)' with
+	  `*items'.
+
+	* sample/tkextlib/tile/demo.rb: added treeview demo. (tile 0.5 or
+	  later is required) [ruby-dev:26668]
+
+2005-08-01  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/demo.rb: added combobox demo.
+
+2005-07-27  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/demo.rb: fixed typo.
+
+2005-06-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/SUPPOPRT_STATUS: add RELEASE_DATE information.
+
+	* lib/tkextlib/tile/style.rb: add "style element options <elem>"
+	  command support.
+
+2005-06-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/ICONS/icons.rb: fail to create instances of
+	  Tk::ICONS [ruby-dev:26305].
+
+2005-06-07  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/themes/kroc.{rb,tcl}: also support tile 0.4.
+
+2005-06-07  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/themes/kroc.{rb,tcl}: support tile 0.5 or later.
+	  ("pixmap" element constructor replaced by "image")
+
+2005-06-05  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/tile/demo.rb: fix TypeError & create Console
+
+2005-05-30  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt.rb: add PACKAGE_NAME information of Tcl/Tk
+          Extension.
+
+	* lib/tkextlib/bwidget.rb: ditto.
+
+	* lib/tkextlib/iwidgets.rb: ditto.
+
+	* lib/tkextlib/tile.rb: ditto.
+
+	* lib/tkextlib/tkimg.rb: ditto.
+
+	* lib/tkextlib/vu.rb: ditto.
+
+	* lib/tkextlib/ICONS/icons.rb: ditto.
+
+	* lib/tkextlib/itcl/incr_tcl.rb: ditto.
+
+	* lib/tkextlib/itk/incr_tk.rb: ditto.
+
+	* lib/tkextlib/tcllib/autoscroll.rb: ditto.
+
+	* lib/tkextlib/tcllib/ctext.rb: ditto.
+
+	* lib/tkextlib/tcllib/cursor.rb: ditto.
+
+	* lib/tkextlib/tcllib/datefield.rb: ditto.
+
+	* lib/tkextlib/tcllib/ico.rb: ditto.
+
+	* lib/tkextlib/tcllib/ip_entry.rb: ditto.
+
+	* lib/tkextlib/tcllib/plotchart.rb: ditto.
+
+	* lib/tkextlib/tcllib/style.rb: ditto.
+
+	* lib/tkextlib/tcllib/tkpiechart.rb: ditto.
+
+	* lib/tkextlib/tclx/tclx.rb: ditto.
+
+	* lib/tkextlib/tkDND/shape.rb: ditto.
+
+	* lib/tkextlib/tkDND/tkdnd.rb: ditto.
+
+	* lib/tkextlib/tkHTML/htmlwidget.rb: ditto.
+
+	* lib/tkextlib/tkimg/bmp.rb: ditto.
+
+	* lib/tkextlib/tkimg/gif.rb: ditto.
+
+	* lib/tkextlib/tkimg/ico.rb: ditto.
+
+	* lib/tkextlib/tkimg/jpeg.rb: ditto.
+
+	* lib/tkextlib/tkimg/pcx.rb: ditto.
+
+	* lib/tkextlib/tkimg/pixmap.rb: ditto.
+
+	* lib/tkextlib/tkimg/png.rb: ditto.
+
+	* lib/tkextlib/tkimg/ppm.rb: ditto.
+
+	* lib/tkextlib/tkimg/ps.rb: ditto.
+
+	* lib/tkextlib/tkimg/sgi.rb: ditto.
+
+	* lib/tkextlib/tkimg/sun.rb: ditto.
+
+	* lib/tkextlib/tkimg/tga.rb: ditto.
+
+	* lib/tkextlib/tkimg/tiff.rb: ditto.
+
+	* lib/tkextlib/tkimg/window.rb: ditto.
+
+	* lib/tkextlib/tkimg/xbm.rb: ditto.
+
+	* lib/tkextlib/tkimg/xpm.rb: ditto.
+
+	* lib/tkextlib/tktable/tktable.rb: ditto.
+
+	* lib/tkextlib/tktrans/tktrans.rb: ditto.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: ditto.
+
+	* lib/tkextlib/winico/winico.rb: ditto.
+
+2005-05-25  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/iwidgets/scrolledlistbox.rb: follow the change
+          of tk.rb. modify to attend encoding.
+
+	* lib/tkextlib/iwidgets/scrolledtext.rb: ditto.
+
+	* lib/tkextlib/iwidgets/scrolledcanvas.rb: bug fix on
+	  TkCanvas#delete when given non-TkcItem arguments. 
+
+2005-05-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/winop.rb: fix typo
+
+2005-05-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/vu/pie.rb: fix typo
+
+2005-04-10  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/mailwasher.rb: fixed typo. [ruby-dev:26008]
+
+2005-04-09  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/tile/demo.rb: new demo of Tile extension.
+
+	* sample/tkextlib/tile/iconlib.tcl: part of the demo.
+
+	* sample/tkextlib/tile/toolbutton.tcl: ditto.
+
+	* sample/tkextlib/tile/readme.txt: document of the demo.
+
+	* sample/tkextlib/tile/Orig_LICENSE.txt: ditto.
+
+	* sample/tkextlib/tile/themes/kroc.tcl: sample theme written with Tcl.
+
+	* sample/tkextlib/tile/themes/pkgIndex.tcl: pkgIndex of kroc.tcl.
+
+	* sample/tkextlib/tile/themes/kroc.rb: Kroc theme written with Ruby.
+
+	* sample/tkextlib/tile/themes/kroc/button-h.gif: images for Kroc theme.
+
+	* sample/tkextlib/tile/themes/kroc/button-n.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/button-p.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/check-hc.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/check-hu.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/check-nc.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/check-nu.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/radio-hc.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/radio-hu.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/radio-nc.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/radio-nu.gif: ditto.
+
+	* lib/tkextlib/tile.rb: bug fix (tested on the new demo).
+
+	* lib/tkextlib/tile/style.rb: ditto.
+
+	* lib/tkextlib/tile/tbutton.rb: ditto.
+
+	* lib/tkextlib/tile/tcheckbutton.rb: ditto.
+
+	* lib/tkextlib/tile/tcombobox.rb: ditto.
+
+	* lib/tkextlib/tile/tentry.rb: ditto.
+
+	* lib/tkextlib/tile/tframe.rb: ditto.
+
+	* lib/tkextlib/tile/tlabel.rb: ditto.
+
+	* lib/tkextlib/tile/tlabelframe.rb: ditto.
+
+	* lib/tkextlib/tile/tmenubutton.rb: ditto.
+
+	* lib/tkextlib/tile/tnotebook.rb: ditto.
+
+	* lib/tkextlib/tile/tprogressbar.rb: ditto.
+
+	* lib/tkextlib/tile/tradiobutton.rb: ditto.
+
+	* lib/tkextlib/tile/treeview.rb: ditto.
+
+	* lib/tkextlib/tile/tscrollbar.rb: ditto.
+
+	* lib/tkextlib/tile/tseparator.rb: ditto.
+
+	* lib/tkextlib/tile/tsquare.rb: ditto.
+
+	* lib/tkextlib/tile/tpaned.rb: new library
+
+	* lib/tkextlib/tile/tscale.rb: ditto.
+
+	* lib/tkextlib/SUPPORT_STATUS: update support status of Tile extension.
+
+	* lib/tkextlib/tcllib/ctext.rb: use TkCommandNames on create_self().
+
+	* lib/tkextlib/tcllib/datefield.rb: ditto.
+
+	* lib/tkextlib/tcllib/ip_entry.rb: ditto.
+
+	* lib/tkextlib/tkHTML/htmlwidget.rb: ditto.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: ditto.
+
+2005-04-09  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/explorer.rb: File.executable? returns true
+	  even if it's plain text file. (this function only checks access right)
+
+2005-04-09  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/{help,www-options}.rb: fixed typo.
+	  (click or resize column header)
+
+2005-04-09  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/imovie.rb: fixed typo. (click on clip title)
+
+2005-04-08  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/random.rb: fixed typo. (drop node outside of
+	  widget, or reenter widget while draggging)
+
+2005-04-08  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/outlook-newgrounp.rb: image had disappered when
+	  node was selected.
+
+2005-04-08  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/{random,outlook-newgroup}.rb:
+	  tk::treectrl uses 'afterId' not 'afterID'.
+
+	* sample/tkextlib/treectrl/{random,outlook-newgroup}.rb:
+	  item_firstchild can return empty string. (drop node to leaf node)
+
+	* sample/tkextlib/treectrl/random.rb: Enumerable#find didn't work properly
+	  because tried to compare String with Integer. (drag node and leave widget)
+
+	* sample/tkextlib/treectrl/random.rb: and some fixes.
+
+2005-04-08  ocean  <ocean@ruby-lang.org>
+
+	* lib/tkextlib/treectrl/tktreectrl.rb (selection_clear): fixed typo.
+
+	* sample/tkextlib/treectrl/random.rb: node deselection now works.
+
+	* sample/tkextlib/treectrl/demo.rb: fixed typo. (popup menu on column header)
+
+2005-04-08  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/help.rb: fixed typo. (wrong color)
+
+2005-04-08  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/random.rb: fixed typo. (wrong itemheight)
+
+	* sample/tkextlib/treectrl/outlook-newgroup.rb: ditto.
+
+	* sample/tkextlib/treectrl/explorer.rb: ditto.
+
+	* sample/tkextlib/treectrl/help.rb: ditto.
+
+2005-04-07  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/*.rb: some speed up... cache the result of
+	  version checking.
+
+2005-04-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: performance tuning by calling
+	  tk_send_without_enc. [ruby-dev:25997]
+
+2005-04-04  ocean  <ocean@ruby-lang.org>
+
+	* lib/tkextlib/tktable/tktable.rb: added Tk::TkTable#selection_present.
+
+2005-04-02  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: support TreeCtrl's cvs head.
+
+2005-04-02  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/component.rb: add TreeCtrl#legend_window_create().
+
+	* sample/tkextlib/blt/graph6.rb: use legend_window_create().
+
+	* lib/tkextlib/blt/tree.rb: forget to call tagid().
+
+	* lib/tkextlib/blt/treeview.rb: ditto.
+
+2005-04-01  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/treectrl/demo.rb: bridge the gap of
+	  Hash#index or Hash#key between ruby 1.8 and 1.9
+
+2005-04-01  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/component.rb: bug fix on treatment of
+	  component objects.
+
+	* sample/tkextlib/blt/graph6.rb: a new sample script. 
+
+2005-03-31  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/demo.rb: should use Hash#index.
+
+	* sample/tkextlib/treectrl/demo.rb: TkImage was not
+	  cached properly.
+
+	* sample/tkextlib/treectrl/random.rb: fixed typo.
+
+2005-03-31  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/iwidgets/sample/hierarchy.rb: show basename
+	  only [ruby-dev:25970]
+
+	* sample/tkextlib/treectrl/demo.rb: add check for existence of 
+	  'backgroundimage' option.
+
+	* sample/tkextlib/treectrl/bitmaps.rb: ditto.
+
+	* sample/tkextlib/treectrl/outlook-newgroup.rb: lack of '%I'
+	  event callback argument.
+
+2005-03-31  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/iwidgets/sample/hierarchy.rb: fail to treat
+	  Japanese (i18n?) filenames.
+
+2005-03-30  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/bwidget/tree.rb: use 'return' in the Proc object.
+
+	* sample/tkextlib/tkHTML/hv.rb: ditto.
+
+	* sample/tkextlib/tkHTML/ss.rb: ditto.
+
+	* sample/tkextlib/tktable/basic.rb: ditto.
+
+	* sample/tkextlib/tktable/command.rb: ditto.
+
+	* sample/tkextlib/tktable/debug.rb: ditto.
+
+	* sample/tkextlib/tktable/maxsize.rb: ditto.
+
+	* sample/tkextlib/treectrl/demo.rb: ditto.
+
+2005-03-29  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/component.rb: cannot create elements except
+	  default type of element. 
+
+	* lib/tkextlib/blt/barchart.rb: ditto.
+
+	* lib/tkextlib/blt/graph.rb: ditto.
+
+	* lib/tkextlib/blt/stripchart.rb: ditto.
+
+	* lib/tkextlib/blt/component.rb: axis command option gets
+	  proper object type of arguments.
+
+	* sample/tkextlib/blt/calendar.rb: new sample.
+
+	* sample/tkextlib/blt/pareto.rb: ditto.
+
+2005-03-28  ocean  <ocean@ruby-lang.org>
+
+	* lib/tkextlib/iwidgets/notebook.rb: fixed typo.
+
+2005-03-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt.rb: add commands for zooming.
+
+	* lib/tkextlib/blt/bitmap.rb (new_with_name): add for using
+          given name.
+
+	* lib/tkextlib/blt/busy.rb: bug fix on Tk::BLT::Busy::Shild class.
+
+	* lib/tkextlib/blt/component.rb: typo fix.
+
+	* lib/tkextlib/blt/component.rb: fix lack of *_create methods
+
+	* lib/tkextlib/blt/component.rb: proper call on xaxis_* and so on.
+
+	* lib/tkextlib/blt/htext.rb: add TkVariable object to access
+          special Tcl variables. 
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: typo fix.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: proper treatment
+          of 'font' option of element_configure.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: bug fix on item_sort.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: add methods to
+          call TreeCtrl commands for bindings.
+
+	* sample/tkextlib/blt/*: add some sample scripts.
+
+	* sample/tkextlib/treectrl/*: add some sample scripts.
+
+2005-03-18  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: bug fix and define some
+	  classes for components of Tk::TreeCtrl
+
+2005-03-17  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: call wrong method in
+	  Tk::TreeCtrl#*_configinfo and current_*_configinfo method
+
+2005-03-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/SUPPORT_STATUS: change the status of TkImg
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: bug fix and support
+	  TkTreeCtrl-1.1
+
+	* lib/tkextlib/SUPPORT_STATUS: change the supported version of
+	  TkTreeCtrl
+
+2005-03-15  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/tkimg: add sample
+
+2005-03-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/SUPPORT_STATUS: add version info of each extension
+
+2005-03-05  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile.rb: lack of "autoload TProgressbar"
+
+2005-03-05  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile.rb: support tile-0.6
+
+	* lib/tkextlib/tile/tbutton.rb: ditto
+
+	* lib/tkextlib/tile/tcheckbutton.rb: ditto
+
+	* lib/tkextlib/tile/tlabel.rb: ditto
+
+	* lib/tkextlib/tile/tmenubutton.rb: ditto
+
+	* lib/tkextlib/tile/tnotebook.rb: ditto
+
+	* lib/tkextlib/tile/tradiobutton.rb: ditto
+
+	* lib/tkextlib/tile/tcombobox.rb: [new] ditto
+
+	* lib/tkextlib/tile/tentry.rb: [new] ditto
+
+	* lib/tkextlib/tile/tframe.rb: [new] ditto
+
+	* lib/tkextlib/tile/tlabelframe.rb: [new] ditto
+
+	* lib/tkextlib/tile/tprogressbar.rb: [new] ditto
+
+	* lib/tkextlib/tile/treeview.rb: [new] ditto
+
+	* lib/tkextlib/tile/tscrollbar.rb: [new] ditto
+
+	* lib/tkextlib/tile/tseparator.rb: [new] ditto
+
+	* lib/tkextlib/tile/tsquare.rb: [new] ditto
+
+2005-02-20  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tclx/tclx.rb: warning TclX's 'signal' command.
+
+2005-01-25  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/component.rb: bug fix. cannot accept
+          a callback ID string for a command argument. [ruby-dev:25479]
+
+	* lib/tkextlib/blt/tabset.rb: ditto
+
+	* lib/tkextlib/blt/treeview.rb: ditto
+
+	* lib/tkextlib/bwidget/labelentry.rb: ditto
+
+	* lib/tkextlib/bwidget/listbox.rb: ditto
+
+	* lib/tkextlib/bwidget/notebook.rb: ditto
+
+	* lib/tkextlib/bwidget/spinbox.rb: ditto
+
+	* lib/tkextlib/bwidget/tree.rb: ditto
+
+	* lib/tkextlib/itk/incr_tk.rb: ditto
+
+	* lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto
+
+	* lib/tkextlib/tkDND/tkdnd.rb: ditto
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
+
+	* sample/tkextlib/tkHTML/ss.rb: local variable scope bug fix
+          [ruby-dev:25479]
+
+	* sample/tkextlib/vu/vu_demo.rb: rename from vu.rb; avoid the bug on
+	  Windows version of Tcl/Tk. The trouble based on the bug occurs when
+	  the script name (without extension) is a same name as a Tcl/Tk's
+	  library file name (without extension) required in the script.
+
+2004-12-24  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt: add BLT extension support
+
+2004-12-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/bwidget/labelentry.rb: use TkCore.callback_obj?()
+
+	* lib/tkextlib/bwidget/listbox.rb: ditto
+
+	* lib/tkextlib/bwidget/notebook.rb: ditto
+
+	* lib/tkextlib/bwidget/spinbox.rb: ditto
+
+	* lib/tkextlib/itk/incr_tk.rb: ditto
+
+	* lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto
+
+	* lib/tkextlib/tkDND/tkdnd.rb: ditto
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
+
+	* lib/tkextlib/winico/winico.rb: ditto
+
+2004-12-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile/style.rb: 'theme_use' method bug fix
+
+2004-12-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/bwidget/notebook.rb: raise method cannot return
+          the raised page.
+
+	* lib/tkextlib/bwidget/labelentry.rb: bind methods accept
+          subst_args + block
+
+	* lib/tkextlib/bwidget/listbox.rb: ditto
+
+	* lib/tkextlib/bwidget/notebook.rb: ditto
+
+	* lib/tkextlib/bwidget/spinbox.rb: ditto
+
+	* lib/tkextlib/bwidget/tree.rb: ditto
+
+	* lib/tkextlib/itk/incr_tk.rb: ditto
+
+	* lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto
+
+	* lib/tkextlib/tkDND/tkdnd.rb: ditto
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
+
+2004-11-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/bwidget/notebook.rb: uses epath
+
+	* lib/tkextlib/bwidget/widget.rb: ditto
+
+	* lib/tkextlib/tktable/tktable.rb: ditto
+
+	* lib/tkextlib/tcllib/cursor.rb: ditto, and bug fix
+
+2004-11-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile/style.rb: bug fix
+
+2004-11-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/iwidgets/scrolledcanvas.rb: bind-event methods
+	  accept multi substitution arguments.
+
+	* lib/tkextlib/tktable/tktable.rb: ditto.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
+
+2004-11-03  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/SUPPORT_STATUS: BLT moves to 'plan to support'
+          from 'not determined'
+
+	* lib/tkextlib/itk/incr_tk.rb: __cget_cmd and __config_cmd are
+          private methods
+
+	* lib/tkextlib/tcllib/autoscroll.rb: extend TkCore
+
+	* lib/tkextlib/tcllib/cursor.rb: ditto.
+
+	* lib/tkextlib/tcllib/plotchart.rb: ditto.
+
+	* lib/tkextlib/tcllib/style.rb: ditto.
+
+	* lib/tkextlib/tile/style.rb: ditto.
+
+	* lib/tkextlib/tkDND/shape.rb: ditto.
+
+2004-10-24  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/bwidget/tree.rb: bug fix on Windows
+
+2004-10-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tcllib/ico.rb: new library (Tk::Tcllib:ICO)
+
+	* lib/tkextlib/tcllib.rb: add Tk::Tcllib::ICO (based on tcllib 1.7)
+
+2004-10-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/bwidget.rb (BWidget.grab): bug fix
+
+	* lib/tkextlib/tcllib.rb: typo fix
+
+2004-07-28  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/add winico support
+
+2004-07-23  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/add TclX support (partially; infox command and
+          XPG/3 MsgCat only)
+
+2004-07-15  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* bug fix
+
+	* support TkTable extension
+
+2004-07-12  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* bug fix
+
+	* support Iwidgets extension
+
+2004-07-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* bug fix
+
+	* add more part of [incr Widget] support (about 65%? are complete)
+
+	* use Tk::ValidateConfigure.__def_validcmd() method
+          (new function to define validatecommand methods easier)
+
+	* tcllib.rb : avoid the loading trouble that almost all part of 
+	  the extension is not available when some libraries are invalid. 
+
+2004-07-09  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* add some part of [incr Widget] support (about 50%? are complete)
+
+2004-07-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* add [incr Tck], [incr Tk] support
+
+2004-07-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* support BWidget extension
+
+	* add BWidget extension demo
+
+	* add ICONS extension demo
+
+	* many bug fix 
+
+2004-07-01  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* 1st release of tkextlib ( to support Tcl/Tk extensions )
diff --git a/ruby_1_8_6/ext/tk/MANUAL_tcltklib.eng b/ruby_1_8_6/ext/tk/MANUAL_tcltklib.eng
new file mode 100644
index 0000000000..1db61f228e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/MANUAL_tcltklib.eng
@@ -0,0 +1,445 @@
+(tof)
+                                    2005/07/05  Hidetoshi NAGAI
+
+This document discribes about the 'tcltklib' library. Although there
+is the 'tcltk' library (tcltk.rb) under this directory, no description
+in this document (because it is not maintained recently). 
+
+==============================================================
+module TclTklib
+  : Defines methods to do operations which are independed on 
+  : Tcl/Tk interpreters
+
+  module TclTkLib::EventFlag
+    : Defines flags to define taget events on 'do_one_event' methos. 
+    : When to give, please use bit-operator (e.g. WINDOW | DONT_WAIT). 
+
+    [constants]
+       NONE
+         : Is 0. It means "there is no target". But on the real
+         : operation, it is same to ALL.
+
+       WINDOW
+         : 'window' event is processed.
+
+       FILE
+         : 'file' event is processed.
+
+       TIMER
+         : 'timer' event is processed.
+
+       IDLE
+         : 'idle' operation (e.g. 're-draw'; the operations when the
+         : other kinds of events doesn't occur) is processed. 
+
+       ALL
+         : All kinds of events are processed. 
+         : Same to 'WINDOW | FILE | TIMER | IDLE'. 
+
+       DONT_WAIT
+         : Without this flag, 'do_one_event' waits the occurence of 
+         : a target event. With this flag, doesn't wait and returns 
+         : false if there is no target event for processing. 
+
+  module TclTkLib::VarAccessFlag
+    : Defines flags to give '_get_variable' and so on. When to give, 
+    : please use bit-operator (e.g. GLOBAL_ONLY | LEAVE_ERR_MSG ). 
+
+    [constants]
+       NONE
+         : Is 0. It means "set no flag". 
+
+       GLOBAL_ONLY
+         : (site Tcl/Tk's man page)
+         : Under normal circumstances the procedures look up 
+         : variables as follows: If a procedure call is active 
+         : in interp, a variable is looked up at the current
+         : level of procedure call. Otherwise, a variable is
+         : looked up first in the current namespace,  then  in
+         : the global namespace. However, if this bit is set
+         : in flags then the variable is looked up only in the
+         : global namespace even if there is a procedure call
+         : active. If both GLOBAL_ONLY and NAMESPACE_ONLY are
+         : given, GLOBAL_ONLY is ignored.
+         :
+         :  *** ATTENTION ***
+         : Tcl7.6 doesn't have namespaces. So NAMESPACE_ONLY 
+         : is defined as 0, and then GLOBAL_ONLY is available
+         : even if flag is (GLOBAL_ONLY | NAMESPACE_ONLY). 
+
+       NAMESPACE_ONLY
+         : (site Tcl/Tk's man page)
+         : Under normal circumstances the procedures look up
+         : variables as follows: If a procedure call is active
+         : in interp, a variable is looked up at the current
+         : level of procedure call. Otherwise, a variable is
+         : looked up first in the current namespace, then in
+         : the global namespace. However, if this bit is set
+         : in flags then the variable is looked up only in the
+         : current namespace even if there is a procedure call
+         : active.
+         :
+         :  *** ATTENTION ***
+         : Tcl7.6 doesn't have namespaces. So NAMESPACE_ONLY 
+         : is defined as 0.
+
+       LEAVE_ERR_MSG
+         : (site Tcl/Tk's man page)
+         : If an error is returned and this bit is set in flags, 
+         : then an error message will be left in the interpreter's
+         : result, where it can be retrieved with Tcl_GetObjResult
+         : or Tcl_GetStringResult. If this flag bit isn't set then 
+         : no error message is left and the interpreter's result 
+         : will not be modified.
+
+       APPEND_VALUE
+         : (site Tcl/Tk's man page)
+         : If this bit is set then newValue is appended to the
+         : current value, instead of replacing it. If the variable
+         : is currently undefined, then this bit is ignored.
+
+       LIST_ELEMENT
+         : (site Tcl/Tk's man page)
+         : If this bit is set, then newValue is converted to a
+         : valid Tcl list element before setting (or appending
+         : to) the variable. A separator space is appended before
+         : the new list element unless the list element is going
+         : to be the first element in a list or sublist (i.e. the 
+         : variable's current value is empty, or contains the 
+         : single character ``{'', or ends  in `` }'').
+
+       PARSE_VARNAME
+         : (site Tcl/Tk's man page)
+         : If this bit is set when calling _set_variable and so 
+         : on, var_name argument may contain both an array and an
+         : element name: if the name contains an open parenthesis 
+         : and ends with a close parenthesis, then the value 
+         : between the parentheses is treated as an element name 
+         : (which can have any string value) and the characters
+         : before  the first open parenthesis are treated as the 
+         : name of an array variable. If the flag PARSE_VARNAME
+         : is given, index_name argument should be 'nil' since the 
+         : array and element names are taken from var_name.
+         :
+         :  *** ATTENTION ***
+         : Tcl7.6 doesn't have this flag. So PARSE_VARNAME is 
+         : defined as 0. 
+
+  [module methods]
+     mainloop(check_root = true)
+       : Starts the eventloop. If 'check_root' is true, this method 
+       : doesn't return when a root widget exists. 
+       : If 'check_root' is false, doen't return by the other
+       : reasons than exceptions.
+
+    mainloop_thread?
+       : Returns whether the current thread executes the eventloop. 
+       : If true, the eventloop is working on the current thread. 
+       : If no eventloop is working, this method returns nil.
+       : And if the other thread executes the eventloop, returns false.
+       : 
+       :  *** ATTENTION ***
+       : When this methods returns false, it is dangerous to call a Tk 
+       : interpreter directly.
+
+    mainloop_watchdog(check_root = true)
+       : On the normal eventloop, some kinds of callback operations 
+       : cause deadlock. To avoid some of such deadlocks, this
+       : method starts an eventloop and a watchdog-thread.
+
+    do_one_event(flag = TclTkLib::EventFlag::ALL | 
+                          TclTkLib::EventFlag::DONT_WAIT)
+       : Do one event for processing. When processed an event, 
+       : returns true. 
+       : If NOT set DONT_WAIT flag, this method waits occurrence of
+       : a target event. 
+       : If set DONT_WAIT flag and no event for processing, returns 
+       : false immediately. 
+       : If $SAFE >= 4,  or $SAFE >= 1 and the flag is tainted, 
+       : force to set DONT_WAIT flag.
+
+    set_eventloop_tick(timer_tick)
+       : Define the interval of thread-switching with an integer
+       : value of mili-seconds. 
+       : Default timer_tick is 0. It means that thread-switching 
+       : is based on the count of processed events. 
+       : ( see 'set_eventloop_weight' method )
+       : However, if the eventloop thread is the only thread, 
+       : timer_tick cannt be set to 0. If 0, then is set to 100 ms 
+       : automatically (see NO_THREAD_INTERRUPT_TIME on tcltklib.c). 
+       : On $SAFE >= 4, cannot call this method. 
+
+    get_eventloop_tick
+       : Get current value of 'timer_tick'
+
+    set_no_event_wait(no_event_wait)
+       : Define sleeping time of the eventloop when two or more 
+       : thread are running and there is no event for processing. 
+       : Default value is 20 (ms).
+       : If the eventloop thread is the only thread, this value is 
+       : invalid. 
+       : On $SAFE >= 4, cannot call this method. 
+
+    get_no_event_wait
+       : Get current value of 'no_event_wait'.
+
+    set_eventloop_weight(loop_max, no_event_tick)
+       : Define the weight parameters for the eventloop thread. 
+       : That is invalid when the eventloop is the only thread. 
+       : 'loop_max' is the max events for thread-switching. 
+       : 'no_event_tick' is the increment value of the event count 
+       : when no event for processing (And then, the eventloop thead
+       : sleeps 'no_event_wait' mili-seconds). 
+       : 'loop_max == 800' and 'no_event_tick == 10' are defalut. 
+       : On $SAFE >= 4, cannot call this method. 
+
+    get_eventloop_weight
+       : Get current values of 'loop_max' and 'no_event_tick'.
+
+    mainloop_abort_on_exception=(bool)
+       : Define whether the eventloop stops on exception or not. 
+       : If true (default value), stops on exception. 
+       : If false, show a warinig message but ignore the exception.
+       : If nil, no warning message and ignore the excepsion. 
+       : This parameter is sometimes useful when multiple Tk
+       : interpreters are working. Because the only one eventloop 
+       : admins all Tk interpreters, sometimes exception on a
+       : interpreter kills the eventloop thread. Even if such
+       : situation, when abort_on_exception == false or nil, 
+       : the eventloop ignores the exception and continue to working. 
+       : On $SAFE >= 4, cannot call this method. 
+
+    mainloop_abort_on_exception
+       : Get current status of that. 
+
+    num_of_mainwindows
+       : Returns the number of main-windows (root-widget). 
+       : Because there is only one main-window for one Tk interpreter, 
+       : the value is same to the number of interpreters which has 
+       : available Tk functions.
+
+    _merge_tklist(str, str, ... )
+       : Get a Tcl's list string from arguments with a Tcl/Tk's 
+       : library function. Each arguemnt is converted to a valid 
+       : Tcl list element. 
+
+    _conv_listelement(str)
+       : Convert the argument to a valid Tcl list element with
+       : Tcl/Tk's library function.
+
+    _toUTF8(str, encoding=nil)
+    _fromUTF8(str, encoding=nil)
+       : Call the function (which is internal function of Tcl/Tk) to
+       : convert to/from a UTF8 string.
+
+    _subst_UTF_backslash(str)
+    _subst_Tcl_backslash(str)
+       : Substitute backslash sequence with Tcl's rule (include \uhhhh;
+       : give a sixteen-bit hexadecimal value for Unicode character).
+       : _subst_Tcl_backslash method parses all backslash sequence. 
+       : _subst_UTF_backslash method parses \uhhhh only.
+
+    encoding_system
+    encoding_system=(encoding)
+       : Get and set Tcl's system encoding.
+
+    encoding
+    encoding=(encoding)
+       : alias of encoding_system / encoding_system=
+       : ( probably, Ruby/Tk's tk.rb will override them )
+
+
+class TclTkIp
+  [class methods]
+    new(ip_name=nil, options='')
+       : Generate an instance of TclTkIp class. 
+       : If 'ip_name' argument is given as a string, it is the name
+       : of the Tk interpreter which is shown by 'winfo interps'
+       : command. 
+       : 'options' argument accepts a string which is the command 
+       : line options of wish; such as '-geometry' or '-use'. 
+       : The information is used to generate the root widget of the 
+       : interpreter. 
+       : ( e.g. TclTkIp.new('FOO', '-geometry 500x200 -use 0x2200009') )
+       : If is given nil or falsr for the 'option' argument, generates
+       : the Tcl interpreter without Tk library. Then the interpreter 
+       : doesn't need GUI environment. Therefore, even if a window
+       : system doesn't exist or cannot be used, Ruby can control the
+       : Tcl interpreter and the extention libraries loaded on the 
+       : interpreter. 
+
+  [instance methods]
+    create_slave(name, safe=false)
+       : Create a slave interpreter. 
+       : The parent of the interpreter is the receiver of this method.
+       : The name of the slave interpreter is given by 'name' argument. 
+       : The 'safe' argument decides whether the slave interpreter is
+       : created as a safe interpreter or not. If true, create a safe
+       : interpreter. Default is false. However, if the parent
+       : interpreter is a safe interpreter, the created interpreter is
+       : a safe interpreter (ignore 'safe' argument value). 
+       : If $SAFE >= 4, can create a safe interpreter only. 
+
+    make_safe
+       : Make the interpreter to the safe interpreter, and returns
+       : self. If fail, raise RuntimeError.
+
+    safe?
+       : Check whether the interpreter is the safe interpreter. 
+       : If is the safe interpreter, returns true. 
+
+    allow_ruby_exit?
+       : Return the mode whether 'exit' function of ruby or 'exit' 
+       : command of Tcl/Tk can quit the ruby process or not on the 
+       : interpreter. If false, such a command quit the interpreter 
+       : only.
+       : The default value for a master interpreter is true, and 
+       : for a slave interpreter is false.
+
+    allow_ruby_exit=(mode)
+       : Change the mode of 'allow_ruby_exit?'.
+       : If $SAFE >= 4 or the interpreter is a "safe" interpreter, 
+       : this is not permitted (raise an exception). 
+
+    delete
+       : Delete the interpreter. 
+       : The deleted interpreter doesn't accept command and then
+       : raise an exception.
+
+    deleted?
+       : Check whether the interpreter is already deleted.
+       : If deleted, returns true. 
+
+    has_mainwindow?
+       : Check whether the interpreter has a MainWindow (root widget).
+       : If has, returns true. If doesn't, returns false.  
+       : If IP is already deleted, returns nil. 
+
+    restart
+       : Restart Tk part of the interpreter. 
+       : Use this when you need Tk functions after destroying the
+       : root widget. 
+       : On $SAFE >= 4, cannot call this method. 
+
+    _eval(str)
+    _invoke(*args)
+       : Estimates the arguments as a command on the Tk interpreter. 
+       : The argument of _eval is a script of Tcl/Tk.
+       : Each argument of _invoke is a token of one command line of
+       : Tcl/Tk. 
+       : Because the operation of _invoke doesn't through the
+       : command line parser of Tk interpreter, the cost of
+       : estimation is smaller than _eval. However, auto_load
+       : mechanism of the Tk interpreter doesn't work on _invoke. 
+       : So _invoke can call only the command which already
+       : registered on the interpreter by 'load' command and so on. 
+       : On _eval command, auto_load mechanism words. So if succeed 
+       : to _eval and regist the command once, after that, the
+       : command can be called by _invoke. 
+
+    _toUTF8(str, encoding=nil)
+    _fromUTF8(str, encoding=nil)
+       : Call the function (which is internal function of Tcl/Tk) to
+       : convert to/from a UTF8 string.
+
+    _thread_vwait(var_name)
+    _thread_tkwait(mode, target)
+       : 'vwait' or 'tkwait' with thread support. 
+       : The difference from normal 'vwait' or 'tkwait' command is 
+       : doing independent wait from the vwait stack when they are
+       : called on the other thread than the eventloop thread.
+       : In the case of Tcl/Tk's vwait / tkwait, if 2nd vwait /
+       : tkwait is called on waiting for 1st vwait / tkwait, 
+       : returns the order of [2nd]->[1st] regardless of the order
+       : of when the wait condition was fulfilled.  
+       : If _thread_vwait / _thread_tkwait is called on the
+       : eventloop thread, there is no difference from vwait /
+       : tkwait. But if called on the other thread than the
+       : eventloop, stops the thread.  And when the wait condition 
+       : is fulfilled, the thread restarts. The meaning of
+       : "independent from the vwait stack" is that the timing of 
+       : restarting is independent from the waiting status of the 
+       : other threads. That is, even if the eventloop thread is 
+       : waiting by vwait and is not fulfilled the condition, 
+       : _thread_vwait completes the waiting when its waiting
+       : condition is fulfilled and the thread which stopped by
+       : _thread_vwait can continue the operation. 
+
+    _return_value
+       : Get the last result value on the interpreter. 
+
+    _get_variable(var_name, flag)
+    _get_variable2(var_name, index_name, flag)
+       : Get the current value of a variable. If specified a 
+       : index_name (see also the PARSE_VARNAME flag), get the 
+       : value of the index_name element. 
+
+    _set_variable(var_name, value, flag)
+    _set_variable2(var_name, index_name, value, flag)
+       : Create or modify a variable. If specified a index_name 
+       : (see also the PARSE_VARNAME flag), create or modify the 
+       : index_name element. 
+
+    _unset_variable(var_name)
+    _unset_variable2(var_name, index_name)
+       : Remove a variable. If specified a index_name (see also 
+       : the PARSE_VARNAME flag), remove the index_name element. 
+
+    _get_global_var(var_name)
+    _get_global_var2(var_name, index_name)
+    _set_global_var(var_name, value)
+    _set_global_var2(var_name, index_name, value)
+    _unset_global_var(var_name)
+    _unset_global_var2(var_name, index_name)
+       : Call the associated method with the flag argument
+       : (GLOBAL_ONLY | LEAVE_ERR_MSG).
+
+    _split_tklist(str)
+       : Split the argument with Tcl/Tk's library function and 
+       : get an array as a list of Tcl list elements.
+
+    _merge_tklist(str, str, ... )
+       : Get a Tcl's list string from arguments with a Tcl/Tk's 
+       : library function. Each arguemnt is converted to a valid 
+       : Tcl list element. 
+
+    _conv_listelement(str)
+       : Convert the argument to a valid Tcl list element with
+       : Tcl/Tk's library function.
+
+    mainloop
+    mainloop_watchdog
+       : If on the slave interpreter, never start an eventloop and
+       : returns nil. 
+       : With the exception that, same to the TclTkLib module method
+       : with the same name. 
+
+    do_one_event
+       : With the exception that the argument is forced to set
+       : DONT_WAIT flag on the slave interpreter, same to
+       : TclTkLib#do_one_event. 
+
+    set_eventloop_tick
+    get_eventloop_tick
+    set_no_event_wait
+    get_no_event_wait
+    set_eventloop_weight
+    get_eventloop_weight
+    mainloop_abort_on_exception
+    mainloop_abort_on_exception=
+       : With the exception that it is ignored to set value on the
+       : slave interpreter, same to the TclTkLib module method with
+       : the same name. 
+
+class TkCallbackBreak < StandardError
+class TkCallbackContinue < StandardError
+  : They are exception classes to break or continue the Tk callback 
+  : operation. 
+  : If raise TkCallbackBreak on the callback procedure, Ruby returns 
+  : 'break' code to Tk interpreter (Then the Tk interpreter will 
+  : break the operation for the current event). 
+  : If raise TkCallbackContinue, returns 'continue' code (Then the Tk
+  : interpreter will break the operateion for the current bindtag and 
+  : starts the operation for the next buindtag for the current event).
+
+(eof)
diff --git a/ruby_1_8_6/ext/tk/MANUAL_tcltklib.eucj b/ruby_1_8_6/ext/tk/MANUAL_tcltklib.eucj
new file mode 100644
index 0000000000..5dd36726ba
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/MANUAL_tcltklib.eucj
@@ -0,0 +1,557 @@
+(tof)
+                                    2005/07/05  Hidetoshi NAGAI
+
+本ドキュメントには古い tcltk ライブラリ，tcltklib ライブラリの説明
+が含まれていますが，その記述内容は古いものとなっています．
+
+tcltk ライブラリ（tcltk.rb）は現在ではメンテナンスが事実上行われて
+いないため，古いドキュメントの説明がそのまま有効です．それに対し，
+tcltklib ライブラリについては，現在の Ruby/Tk（tk.rb 以下のライブラ
+リ群）を稼働させるための中心としてメンテナンスされているため，少々
+違いが生じています．
+
+そこで，まず古い説明文書を示した後，現在の tcltklib ライブラリにつ
+いての説明を加えます．
+
+以下がライブラリの古い説明文書です．
+==============================================================
+	MANUAL.euc
+		Sep. 19, 1997	Y. Shigehiro
+
+以下, 「tcl/tk」という表記は, tclsh や wish を実現している, 一般でいう
+ところの tcl/tk を指します. 「tcltk ライブラリ」, 「tcltklib ライブラ
+リ」という表記は, 本パッケージに含まれる ruby 用のライブラリを指します.
+
+<< tcltk ライブラリ >>
+
+tcl/tk の C ライブラリを利用するための高(中?)水準インターフェースを提
+供します.
+
+このライブラリは ruby から tcl/tk ライブラリを利用するためのもので, 内
+部で tcltklib ライブラリを利用しています.
+
+[説明]
+
+tcl/tk インタプリタでは, ウィジェットに何か指示を送るには, ウィジェッ
+ト名に続いてパラメータを書きます. したがって, ウィジェットがオブジェク
+トであり, それに対してメソッドを送っている, とみなすことができます. さ
+て, tcl/tk インタプリタでは, 組み込みコマンドも, 前述のウィジェットと
+同じような書式の命令で実行されます. すなわち, コマンドもオブジェクトで
+あると考えることができます.
+
+このような考えに基づき, tcltk ライブラリでは, tcl/tk のコマンドやウィ
+ジェットに対応するオブジェクトを生成します. オブジェクトに対するメソッ
+ド呼び出しは, e() メソッドにより実行されます. 例えば, tcl/tk の info 
+コマンドに対応する ruby のオブジェクトが info という名前であるとすると,
+tcl/tk の
+	info commands
+という命令は tcltk ライブラリでは
+	info.e("commands")
+と記述されます. また, 「.」というウィジェット (wish 実行時に自動的に生
+成されるルートウィジェット) に対応する ruby のオブジェクトが root とい
+う名前であるとすると,
+	. configure -height 300 -width 300
+という tcl/tk の命令は
+	root.e("configure -height 300 -width 300")
+と記述されます. このような記述は, 見ためには美しくありませんが, そして, 
+スクリプトを読む人には見づらいかも知れませんが, 実際にスクリプトを書い
+てみると予想外に手軽です.
+
+[使用法]
+
+1. ライブラリを読み込む.
+     require "tcltk"
+
+2. tcl/tk インタプリタを生成する.
+     ip = TclTkInterpreter.new()
+
+3. tcl/tk のコマンドに対応するオブジェクトを変数に代入しておく.
+     # コマンドに対応するオブジェクトが入った Hash を取り出す.
+     c = ip.commands()
+     # 使いたいコマンドに対応するオブジェクトを個別の変数に代入する.
+     bind, button, info, wm = c.indexes("bind", "button", "info", "wm")
+
+4. 必要な処理を行う.
+     詳しくは, サンプルを参照のこと.
+
+5. 準備ができたら, イベントループに入る.
+     TclTk.mainloop()
+
+(( 以下, モジュール, クラス等の説明を書く予定.))
+
+
+
+<< tcltklib ライブラリ >>
+
+tcl/tk の C ライブラリを利用するための低水準インターフェースを提供しま
+す.
+
+コンパイル/実行には, tcl/tk の C ライブラリが必要です.
+
+[説明]
+
+このライブラリを用いると, ruby から tcl/tk の C ライブラリを利用できま
+す. 具体的には, ruby インタプリタから tcl/tk インタプリタを呼び出すこ
+とができます. さらに, その(ruby インタプリタから呼び出した) tcl/tk イ
+ンタプリタから, 逆に ruby インタプリタを呼び出すこともできます.
+
+[使用法]
+
+require "tcltklib" すると, 以下のモジュール, クラスが利用可能です.
+
+モジュール TclTkLib
+    tcl/tk ライブラリを呼び出すメソッドを集めたモジュールです. ただし,
+    tcl/tk インタプリタ関係のメソッドはクラス TclTkIp にあります.
+
+  モジュールメソッド mainloop()
+      Tk_MainLoop を実行します. 全ての tk のウインドウが無くなると終了
+      します(例えば, tcl/tk で書くところの "destroy ." をした場合等).
+    引数: 無し
+    戻り値: nil
+
+クラス TclTkIp
+    インスタンスが tcl/tk のインタプリタに対応します. tcl/tk のライブ
+    ラリの仕様通り, インスタンスを複数個生成しても正しく動作します(そ
+    んなことをする必要はあまり無いはずですが). インタプリタは wish の
+    tcl/tk コマンドを実行できます. さらに, 以下のコマンドを実行できま
+    す.
+      コマンド ruby
+	引数を ruby で実行します(ruby_eval_string を実行します). 引数
+	は 1 つでなければなりません. 戻り値は ruby の実行結果です.
+	ruby の実行結果は nil か String でなければなりません.
+
+  クラスメソッド new()
+      TclTkIp クラスのインスタンスを生成します
+    引数: 無し
+    戻り値 (TclTkIp): 生成されたインスタンス
+
+  メソッド _eval(script)
+      インタプリタで script を評価します(Tcl_Eval を実行します). 前述
+      のように, ruby コマンドにより script 内から ruby スクリプトを実
+      行できます.
+    引数: script (String) - インタプリタで評価するスクリプト文字列
+    戻り値 (String): 評価結果 ((Tcl_Interp *)->result)
+
+  メソッド _return_value()
+      直前の Tcl_Eval の戻り値を返します. 0(TCL_OK) で正常終了です.
+    引数: 無し
+    戻り値 (Fixnum): 直前の Tcl_Eval() が返した値.
+
+==============================================================
+
+以下が本ドキュメント作成時点での tcltklib ライブラリの説明です．
+==============================================================
+モジュール TclTkLib
+   : 個々の Tcl/Tk インタープリタに依存しない処理 ( == イベントルー
+   : プに関する処理 ) を呼び出すメソッドを定義したモジュール．
+
+   モジュール TclTkLib::EventFlag
+      : do_one_event を呼び出す際の処理対象イベントを指定するための
+      : フラグ ( WINDOW|DONT_WAIT というようにビット演算子で連結して
+      : 指定 ) を定数として定義したモジュール．以下の定数が含まれる．
+
+      定数  NONE
+         : 値は 0 で，値としてはいかなる種類のイベントも指定していない
+         : ことになるが，実際の処理上は ALL と同じとして扱われる．
+
+      定数  WINDOW
+         : window イベントを処理対象とする
+
+      定数  FILE
+         : file イベントを処理対象とする
+
+      定数  TIMER
+         : timer イベントを処理対象とする
+
+      定数  IDLE
+         : アイドルループ処理 ( 再描画など，他の種類のイベントが発生
+         : していないときに行われる処理 ) を処理対象とする
+
+      定数  ALL
+         : すべての種類のイベントを処理対象とする
+         : WINDOW|FILE|TIMER|IDLE と同じ
+
+      定数  DONT_WAIT
+         : 処理対象イベントが存在しない場合に，イベント発生を待たず
+         : に do_one_event を終了 ( false を返す ) する 
+
+   モジュール TclTkLib::VarAccessFlag
+      : _get_variable などでのフラグを指定するためのもの．フラグに
+      : は以下の定数を OR で連結して与える．
+
+      定数  NONE
+         : 値は 0 で，何もフラグを指定していないのに等しい．
+
+      定数  GLOBAL_ONLY
+         : 通常，変数の検索はまず手続き呼び出しを行ったレベルで検
+         : 索し，次に現在の名前空間で検索，最後にグローバル空間で
+         : 検索を行う．しかし，このフラグが指定された場合には，グ
+         : ローバル空間でのみ検索する．
+         : もし GLOBAL_ONLY と NAMESPACE_ONLY とが両方指定された場
+         : 合には，GLOBAL_ONLY の指定は無視される．
+
+      定数  NAMESPACE_ONLY
+         : このフラグが指定された場合には，現在の名前空間でのみ変
+         : 数の検索を行う．GLOBAL_ONLY の説明も参照すること．
+
+      定数  LEAVE_ERR_MSG
+         : 変数アクセスにおいてエラーが発生した場合，このフラグが
+         : 指定されていれば，実行結果として Tcl インタープリタにエ
+         : ラーメッセージが残される．このフラグが指定されていなけ
+         : れば，エラーメッセージは一切残されない．
+
+      定数  APPEND_VALUE
+         : このフラグが指定されていた場合，変数の値を置き換えので
+         : はなく，現在の値に代入値が追加 (append; 文字列連結) さ
+         : れる．変数が未定義あった場合，このフラグは無視される．
+
+      定数  LIST_ELEMENT
+         : このフラグが指定されていた場合，代入値はまず Tcl のリス
+         : ト要素として適切となるように変換される．代入値がリスト
+         : (またはサブリスト) の最初の要素となるのでない限り，代入
+         : 値の直前には空白文字が追加される．
+
+      定数  PARSE_VARNAME
+         : _set_variable などの呼び出しにおいてこのフラグが指定さ
+         : れていた場合，var_name 引数が連想配列名と要素名とを両方
+         : 含む可能性がある (開き括弧を含み，閉じ括弧で終わる) こ
+         : とを示す．その場合，括弧の間が要素名指定，最初の開き括
+         : 弧までが連想配列名として扱われる．_set_variable2 などで
+         : このフラグを指定する場合，連想配列名と要素名は var_name 
+         : から抽出されるはずであるから，index_name 引数は nil と
+         : せねばならない．
+
+   モジュールメソッド
+      mainloop(check_root = true)
+         : イベントループを起動する．check_root が true であれば，
+         : root widget が存在する限り，このメソッドは終了しない．
+         : check_root が false の場合は，root widget が消滅しても
+         : このメソッドは終了しない ( root widget が消滅しても，
+         : WINDOW 以外のイベントは発生しうるため )．終了には，外部
+         : からの働き掛け ( スレッドを活用するなど ) が必要．
+
+      mainloop_thread?
+         : カレントスレッドがイベントループを実行しているスレッド
+         : かどうかを返す．
+         : イベントループを実行しているスレッドであれば true を，
+         : どのスレッドでもイベントループが実行されていない場合は 
+         : nil を，他のスレッドでイベントループが実行されている場
+         : 合は false を返す．
+         : false の際に Tk インタープリタを直接呼ぶのは危険である．
+
+      mainloop_watchdog(check_root = true)
+         : 通常のイベントループでは，イベント処理の内容によっては
+         : デッドロックを引き起こす可能性がある (例えばイベントに
+         : 対するコールバック処理中で widget 操作をし，その終了を
+         : 待つなど)．このメソッドは，そうしたデッドロックを回避す
+         : るための監視スレッド付きでイベントループを起動する
+         : ( 監視スレッドを生成した後にイベントループを実行する )．
+         : 引数の意味は mainloop と同じである．
+
+      do_one_event(flag = TclTkLib::EventFlag::ALL | 
+                            TclTkLib::EventFlag::DONT_WAIT)
+         : 処理待ちのイベント 1 個を実行する．
+         : イベントを処理した場合は true を返す．
+         : フラグで DONT_WAIT を指定していない場合，フラグで処理対
+         : 象となっている種類のイベントが発生するまで待ち続ける．
+         : DONT_WAIT を指定していた場合，処理対象イベントがなくても
+         : すぐに終了し false を返す．
+         : $SAFE >= 4 か，$SAFE >= 1 かつ flag が汚染されているならば
+         : flag には DONT_WAIT が強制的に付けられる．
+
+      set_eventloop_tick(timer_tick)
+         : イベントループと同時に別スレッドが稼働している場合に，時
+         : 間に基づいた強制的なスレッドスイッチングをどの程度の頻度
+         : ( 時間間隔 ) で発生させるかをミリ秒単位の整数値で指定する．
+         : 0 を指定すると，この強制的なスイッチングは行われない．
+         : 標準では 0 に設定されており，イベント処理数に基づくスイッ
+         : チングだけが行われる ( see set_eventloop_weight )．
+         : ただし，稼働しているスレッドがイベントループだけの場合，
+         : timer_tick を 0 に設定することはできない．もし設定されて
+         : いたら，100 ms ( see NO_THREAD_INTERRUPT_TIME ) に自動設
+         : 定される．
+         : 詳細な説明は略すが，これは CPU パワーを節約しつつ安全で
+         : 安定した動作を実現するために実装した仕様である．
+         : $SAFE >= 4 では実行が禁止される．
+
+      get_eventloop_tick
+         : timer_tick の現在値を返す．
+
+      set_no_event_wait(no_event_wait)
+         : 複数のスレッドが稼働している場合で，処理待ちイベントが全
+         : く存在しなかった際に sleep 状態に入る時間長を指定する．
+         : 稼働スレッドがイベントループだけの場合には意味をなさない．
+         : デフォルトの値は 20 (ms)
+         : $SAFE >= 4 では実行が禁止される．
+
+      get_no_event_wait
+         : no_event_wait の現在値を返す．
+
+      set_eventloop_weight(loop_max, no_event_tick)
+         : 複数のスレッドが稼働している際に Ruby/Tk のイベントルー
+         : プに割り当てる比重を定めるためのパラメータを設定する．
+         : 稼働スレッドがイベントループだけの場合には意味をなさない．
+         : 一度のスレッド切り替えの間に処理するイベントの最大数と，
+         : 処理待ちのイベントが存在しない際の加算数とを設定する．
+         : 処理待ちイベントが存在しない場合は no_event_wait ( see 
+         : set_no_event_wait ) だけの間 sleep 状態に入る．
+         : デフォルトではそれぞれ 800 回と 10 回，つまり，800 個のイ
+         : ベント (アイドルイベントを含む) を処理するとか，イベント
+         : が全く発生しないままに 80 回の処理待ちイベント検査が完了
+	 : するとかでカウントが 800 以上になるとスレッドスイッチング
+         : が発生することになる．
+         : $SAFE >= 4 では実行が禁止される．
+
+      get_eventloop_weight
+         : 現在の loop_max と no_event_tick との値を返す．
+         : ( see set_eventloop_wait )
+
+      mainloop_abort_on_exception=(bool)
+         : Tk インタープリタ上で例外を発生した際に，イベントループを
+         : エラー停止させるかどうかを指定する．true を指定した場合は
+         : エラー停止するが，false の場合は例外を無視してイベントルー
+         : プを継続する．さらに nil の場合は警告モードでない限りはエ
+         : ラーメッセージの出力すら省略して，例外を無視する．
+	 : デフォルトでは true に設定されている．
+         : １個のインタープリタだけを使っている場合にはエラー時にその
+         : まま停止しても通常は問題ないが，複数のインタープリタが同時
+         : に動作している場合には，それらを管理するイベントループは１
+         : 個だけであるため，いずれかのインタープリタのエラーが原因で，
+         : 他のインタープリタの処理継続が不可能になることがある．その
+         : ような場合でもエラーを無視してイベントループが稼働を続ける
+         : ことで，他のインタープリタが正常に動作し続けることができる．
+         : $SAFE >= 4 では実行が禁止される．
+
+      mainloop_abort_on_exception
+         : Tk インタープリタ上で例外を発生した際に，イベントループをエ
+         : ラー停止させるかどうかの設定状態を true/false で得る．
+
+      num_of_mainwindows
+         : 現在のメインウィンドウ (ルートウィジェット) の数を返す．
+         : メインウィンドウは一つのインタープリタに付き最大一つである
+         : ので，この値は現在 Tk の機能が有効であるインタープリタの総
+         : 数に等しい．
+
+      _merge_tklist(str, str, ... )
+         : Tcl/Tk のライブラリ関数を使って，引数の文字列がそれぞれ
+         : 正しく一つのリスト要素となるように連結した文字列を返す．
+
+      _conv_listelement(str)
+         : Tcl/Tk のライブラリ関数を使って，引数の文字列が Tcl の
+         : 一つのリスト要素として適切な表現になるように変換した文
+         : 字列を返す．
+
+      _toUTF8(str, encoding=nil)
+      _fromUTF8(str, encoding=nil)
+         : Tcl/Tk が内蔵している UTF8 変換処理を呼び出す．
+
+      _subst_UTF_backslash(str)
+      _subst_Tcl_backslash(str)
+         : Tcl のルールでバックスラッシュ記法 ( \uhhhh による 
+         : Unicode 文字表現を含む ) を解析する．
+         : _subst_Tcl_backslash はすべてのバックスラッシュ記法を
+         : 置き換えるのに対し，_subst_UTF_backslash は \uhhhh 
+         : による Unicode 文字表現だけを置き換える．
+
+      encoding_system
+      encoding_system=(encoding)
+         : Tcl の system encoding の獲得および設定
+
+      encoding
+      encoding=(encoding)
+         : encoding_system / encoding_system= の alias
+         : ( Ruby/Tk の tk.rb では置き換えられる予定のもの．)
+
+
+クラス TclTkIp
+   クラスメソッド
+      new(ip_name=nil, options='')
+         : TclTkIp クラスのインスタンスを生成する．
+         : ip_name に文字列を与えた場合は，それが winfo interps などで
+         : 表示される名前になる．
+         : options には，-geometry や -use など，wish のコマンドライン
+         : 引数として与えるオプションと同様の情報を文字列として与える．
+         : 与えられた情報は，root widget 生成の際に用いられる．
+         : ( e.g. TclTkIp.new('FOO', '-geometry 500x200 -use 0x2200009') )
+         : もし options に敢えて nil または false を与えた場合，Tk ライ
+         : ブラリが導入されていない (つまりは Tcl のみの) インタープリ
+         : タを生成する．この場合は GUI 環境は必要ないため，ウインドウ
+         : システムが存在しない，または使用できない環境でも Tcl インター
+         : プリタを生成し，Tcl やその拡張ライブラリを活用することができる．
+
+   インスタンスメソッド
+      create_slave(name, safe=false)
+         : レシーバを親とする name という名前のスレーブインタープリタを
+	 : 生成する．
+	 : safe には生成するインタープリタを safe インタープリタとする
+         : かを指定する．デフォルトは false ということになっているが，
+         : たとえ明確に false を指定していたとしても，親となるインター
+         : プリタが safe インタープリタであれば，その設定を引き継いで 
+         : safe インタープリタとして生成される．
+         : $SAFE >= 4 では，safe インタープリタ以外の生成が禁止される．
+
+      make_safe
+         : Tcl/Tk インタープリタを safe インタープリタに変更する．
+         : 戻り値はレシーバであるインタープリタ自身である．
+         : 失敗した場合は RuntimeError の例外を発生する．
+
+      safe?
+         : Tcl/Tk インタープリタが safe インタープリタであるかを調べる．
+         : safe インタープリタであれば true を返す．
+
+      allow_ruby_exit?
+         : 対象となるインタープリタ上の評価で，ruby の exit 関数または 
+         : Tcl/Tk 上の exit コマンドによって ruby 自体を終了させること
+         : を許すかどうかを返す．
+	 : 許さない場合は対象のインタープリタだけが終了する．
+         : マスターインタープリタのデフォルト値は true，スレーブインター
+         : プリタのデフォルト値は false である．
+
+      allow_ruby_exit=(mode)
+         : 対象となるインタープリタの allow_ruby_exit? の状態を変更する．
+	 : $SAFE >= 4 またはインタープリタが safe インタープリタの場合は
+	 : 変更が許されない (例外を発生)．
+
+      delete
+         : Tcl/Tk インタープリタを delete する．
+         : delete されたインタープリタは，以後一切の操作ができなくなり，
+         : コマンドを送っても例外を発生するようになる．
+
+      deleted?
+         : Tcl/Tk インタープリタがすでに delete されているかを調べる．
+         : delete 済みでコマンドを受け付けない状態になっているならば
+         : true を返す．
+
+      has_mainwindow?
+         : Tcl/Tk インタープリタにメインウィンドウ (root widget) が
+         : 存在すれば true を，存在しなければ false を返す．
+         : インタープリタが既に delete 済みであれば nil を返す．
+
+      restart
+         : Tcl/Tk インタープリタの Tk 部分の初期化，再起動を行う．
+         : 一旦 root widget を破壊した後に再度 Tk の機能が必要と
+         : なった場合に用いる．
+         : $SAFE >= 4 では実行が禁止される．
+
+      _eval(str)
+      _invoke(*args)
+         : Tcl/Tk インタープリタ上で評価を行う．
+         : _eval は評価スクリプトが一つの文字列であることに対し，
+         : _invoke は評価スクリプトの token ごとに一つの引数とな
+         : るように与える．
+         : _invoke の方は Tcl/Tk インタープリタの字句解析器を用い
+         : ないため，評価の負荷がより少なくてすむ．ただし，その代
+         : わりに auto_load のような機構は働かず，load 等によって
+         : Tcl/Tk インタープリタ上に既に登録済みのコマンドしか呼
+         : び出すことができない．
+         : _eval では auto_load 機構が働くため，一度 _eval を実行
+         : して登録に成功しさえすれば，以降は _invoke でも利用で
+         : きるようになる．
+
+      _toUTF8(str, encoding=nil)
+      _fromUTF8(str, encoding=nil)
+         : Tcl/Tk が内蔵している UTF8 変換処理を呼び出す．
+
+      _thread_vwait(var_name)
+      _thread_tkwait(mode, target)
+         : スレッド対応の vwait あるいは tkwait 相当のメソッド．
+         : 通常の vwait あるいは tkwait コマンドと異なるのは，イベン
+         : トループとは異なるスレッドから呼び出した場合に vwait 等の
+         : スタックとは独立に条件の成立待ちがなされることである．
+         : 通常の vwait / tkwait では，vwait / tkwait (1) の待ちの途
+         : 中でさらに vwait / tkwait (2) が呼ばれた場合，待ちの対象
+         : となっている条件の成立順序がどうあれ，(2)->(1) の順で待ち
+         : を終了して戻ってくる．
+         : _thread_vwait / _thread_tkwait は，イベントループのスレッ
+         : ドで呼ばれた場合は通常の vwait / tkwait と同様に動作する
+         : が，イベントループ以外のスレッドで呼ばれた場合にはそのス
+         : レッドを停止させて待ちに入り，条件が成立した時にスレッド
+         : の実行を再開する．「vwait 等の待ちスタックとは独立」とい
+         : う意味は，この再開のタイミングが他のスレッドでの待ち状況
+         : とは無関係ということである．つまり，イベントループ等の他
+         : のスレッドで vwait 等で待ちの状態にあったとしてもその完了
+         : を待つことなく，自らの待ち条件が成立次第，処理を継続する
+         : ことになる．
+
+      _return_value
+         : 直前の Tcl/Tk 上での評価の実行結果としての戻り値を返す．
+
+      _get_variable(var_name, flag)
+      _get_variable2(var_name, index_name, flag)
+         : Tcl/Tk 上の var という変数名の変数の値を返す．
+         : もし index_name が指定 (PARSE_VARNAME フラグの説明も参照) 
+         : された場合は連想配列 var_name の index_name の要素を返す．
+         : flag には変数を検索する際の条件を指定する．flag に与える
+         : 値はモジュール TclTkLib::VarAccessFlag を参照すること．
+
+      _set_variable(var_name, value, flag)
+      _set_variable2(var_name, index_name, value, flag)
+         : Tcl/Tk 上の var という変数名の変数に値を設定する．
+         : もし index_name が指定 (PARSE_VARNAME フラグの説明も参照) 
+         : された場合は連想配列 var_name の index_name の要素を設定
+         : する．
+         : flag には変数を検索する際の条件を指定する．flag に与える
+         : 値はモジュール TclTkLib::VarAccessFlag を参照すること．
+
+      _unset_variable(var_name)
+      _unset_variable2(var_name, index_name)
+         : Tcl/Tk 上の var_name という変数名の変数を消去する．
+         : もし index_name が指定 (PARSE_VARNAME フラグの説明も参照) 
+         : された場合は連想配列 var_name から index_name の要素だけ
+         : を消去する．
+
+      _get_global_var(var_name)
+      _get_global_var2(var_name, index_name)
+      _set_global_var(var_name, value)
+      _set_global_var2(var_name, index_name, value)
+      _unset_global_var(var_name)
+      _unset_global_var2(var_name, index_name)
+         : それぞれ，対応する変数アクセスメソッドの flag に対して
+         : (GLOBAL_ONLY | LEAVE_ERR_MSG) を与えたもの．
+
+      _split_tklist(str)
+         : Tcl/Tk のライブラリ関数を使って，文字列 str をリストに
+         : 分割する (文字列の配列として返す)．
+
+      _merge_tklist(str, str, ... )
+         : Tcl/Tk のライブラリ関数を使って，引数の文字列がそれぞれ
+         : 正しく一つのリスト要素となるように連結した文字列を返す．
+
+      _conv_listelement(str)
+         : Tcl/Tk のライブラリ関数を使って，引数の文字列が Tcl の
+         : 一つのリスト要素として適切な表現になるように変換した文
+         : 字列を返す．
+
+      mainloop
+      mainloop_watchdog
+         : スレーブ IP の場合にはイベントループを起動せずに nil を返す．
+         : それ以外の点では引数を含めて TclTkLib の同名メソッドに同じ．
+
+      do_one_event
+         : スレーブ IP の場合には引数のイベントフラグに DONT_WAIT が
+         : 強制的に追加される (イベント待ちでスリープすることは禁止)．
+         : それ以外の点では引数を含めて TclTkLib の同名メソッドに同じ．
+
+      set_eventloop_tick
+      get_eventloop_tick
+      set_no_event_wait
+      get_no_event_wait
+      set_eventloop_weight
+      get_eventloop_weight
+      mainloop_abort_on_exception
+      mainloop_abort_on_exception=
+         : スレーブ IP の場合には値の設定が許されない (無視される)．
+         : それ以外の点では引数を含めて TclTkLib の同名メソッドに同じ．
+
+クラス TkCallbackBreak < StandardError
+クラス TkCallbackContinue < StandardError
+   : これらはイベントコールバックにおいて，コールバック処理を適切に中
+   : 断したり，次のバインドタグのバインディング処理に進めたりすること
+   : を可能にするための例外クラスである．
+   : コールバックで break や continue を実現するためには，コールバック
+   : である Ruby 手続きが Tcl/Tk インタープリタ側に適切なリターンコー
+   : ドを返す必要がある．Ruby の手続きが普通に値を返すのでは，それが普
+   : 通の戻り値であるのか否かを区別ができないため，例外発生を利用した
+   : 実装を行っている．
+
+(eof)
diff --git a/ruby_1_8_6/ext/tk/README.1st b/ruby_1_8_6/ext/tk/README.1st
new file mode 100644
index 0000000000..df6c819d26
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/README.1st
@@ -0,0 +1,22 @@
+If you want to use Ruby/Tk (tk.rb and so on), you must have tcltklib.so 
+which is working correctly. If you fail to call 'require "tcltklib"', 
+you may not have tcltklib.so. When you have some troubles on compiling
+tcltklib, please read README files on tcltklib. 
+Even if there is a tcltklib.so on your Ruby library directry, it will not 
+work without Tcl/Tk libraries (e.g. libtcl8.4.so) on your environment. 
+You must also check that your Tcl/Tk is installed properly. 
+
+--------------------------------------------
+ ( the following is written in EUC-JP )
+
+Ruby/Tk (tk.rb など) を使いたい場合には，tcltklib.so が正しく動いて
+いなければなりません．もし 'require "tcltklib"' に失敗するようなら，
+tcltklib.so がインストールされていないのかもしれません．tcltklib の
+コンパイル時に何か問題が生じている場合は，tcltklib の README ファイル
+を見てください．
+たとえ Ruby のライブラリディレクトリに tcltklib.so が存在していたとして
+も，実行環境に Tcl/Tk ライブラリ (libtcl8.4.so など) がなければ機能しま
+せん．Tcl/Tk が正しくインストールされているかもチェックしてください．
+
+==========================================================
+                Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ruby_1_8_6/ext/tk/README.ActiveTcl b/ruby_1_8_6/ext/tk/README.ActiveTcl
new file mode 100644
index 0000000000..3afb3f4cf6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/README.ActiveTcl
@@ -0,0 +1,49 @@
+ActiveTcl is ActiveState's quality-assured distribution of Tcl. 
+
+# see <http://www.activestate.com/Products/ActiveTcl/>
+#     <http://www.tcl.tk/>
+
+If you want to use ActiveTcl binary package as the Tcl/Tk libraries, 
+please use the following configure options.
+
+   --with-tcl-dir=<ActiveTcl_root>
+   --with-tk-dir=<ActiveTcl_root>
+
+And use the followings if you need.
+
+   --with-tcllib=<libname>
+   --with-tklib=<libname>
+   --enable-tcltk-stubs
+
+For example, when you install ActiveTcl-8.4.x to '/usr/local/ActiveTcl', 
+
+   configure --with-tcl-dir=/usr/local/ActiveTcl/  \
+             --with-tk-dir=/usr/local/ActiveTcl/   \
+             --with-tcllib=tclstub8.4              \
+             --with-tklib=tkstub8.4                \
+             --enable-tcltk-stubs
+
+It depends on your environment that you have to add the directory of 
+ActiveTcl's libraries to your library path when execute Ruby/Tk. 
+One of the way is to add entries to TCLLIBPATH environment variable, 
+and one of the others add to LD_LIBRARY_PATH environment variable
+
+Probably, using TCLLIBPATH is better. The value is appended at the 
+head of Tcl's 'auto_path' variable. You can see the value of the 
+variable by using 'Tk::AUTO_PATH.value' or 'Tk::AUTO_PATH.list'.
+
+For example, on Linux, one of the ways is to use LD_LIBRARY_PATH 
+environment variable. 
+-------------------------------------------------------------------------
+ [bash]$ LD_LIBRARY_PATH=/usr/local/ActiveTcl/lib:$LD_LIBRARY_PATH \
+         ruby your-Ruby/Tk-script
+
+ [bash]$ LD_LIBRARY_PATH=/usr/local/ActiveTcl/lib:$LD_LIBRARY_PATH irb
+-------------------------------------------------------------------------
+Based on it, the Tcl interpreter changes auto_path variable's value.
+
+Then, you'll be able to use Tcl/Tk extension libraries included in the
+ActiveTcl package (e.g. call TkPackage.require('BWidget'), and then,
+use functions/widgets of BWidget extention). 
+
+                                  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ruby_1_8_6/ext/tk/README.fork b/ruby_1_8_6/ext/tk/README.fork
new file mode 100644
index 0000000000..707d78fc12
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/README.fork
@@ -0,0 +1,34 @@
+Ruby/Tk does NOT support forking the process on which Tk interpreter
+is running (unless NEVER control Tk interpreter under the forked child 
+process). In the library 'tk.rb', a Tk interpreter is initialized. 
+Therefore, if you want running Tk under a child process, please call
+"require 'tk'" in the child process. 
+
+# If do fork and exec(<new Ruby/Tk>) on the child process, you can 
+# control Ruby/Tk interpreter on the child process by 'send' command 
+# of Tcl/Tk. About this, please see Tk.appsend and Tk.rb_appsend, or 
+# 'remote-tk.rb' and the sample 'sample/remote-ip_sample.rb'. 
+
+For example, the following sample1 will NOT work, and sample2 will
+work properly.
+
+---<sample1: NOT work>---------------------------------------
+require 'tk'  ## init Tk interpreter under parent process
+
+exit! if fork ## exit parent process
+
+## child process
+TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack
+Tk.mainloop
+-------------------------------------------------------------
+
+---<sample2: will work>--------------------------------------
+exit! if fork ## exit main process
+
+## child process
+require 'tk'  ## init Tk interpreter under child process
+TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack
+Tk.mainloop
+-------------------------------------------------------------
+
+                                         2004/05/22  Hidetoshi NAGAI
diff --git a/ruby_1_8_6/ext/tk/README.macosx-aqua b/ruby_1_8_6/ext/tk/README.macosx-aqua
new file mode 100644
index 0000000000..25a8ed827c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/README.macosx-aqua
@@ -0,0 +1,67 @@
+
+  *** for MacOS X Aqua (Tcl/Tk Aqua) users ***
+
+First of all, please read README.tcltklib to use Tcl/Tk Aqua Framework.
+
+With Tcl/Tk Aqua libraries, current tcltklib somtimes freezes when 
+using Aqua specific dialogs (e.g. Tk.messageBox). 
+This is a known bug of Ruby-1.8.4 release.
+
+When you meet the trouble on your GUI, you'll be able to avoid the trouble 
+by Tcl/Tk's traditional dialogs. 
+If you want to do that, please call some of the following bits of script 
+after "reqruie 'tk'".
+
+=================================================================
+# use a traditional dialog for Tk.chooseColor()
+Tk.ip_eval(<<'EOS')
+    proc ::tk_chooseColor {args} {
+        return [eval tk::dialog::color:: $args]
+    }
+EOS
+
+# use a traditional dialog for Tk.getOpenFile() and Tk.getMultipleOpenFile()
+Tk.ip_eval(<<'EOS')
+    proc ::tk_getOpenFile {args} {
+        if {$::tk_strictMotif} {
+            return [eval tk::MotifFDialog open $args]
+        } else {
+            return [eval ::tk::dialog::file:: open $args]
+        }
+    }
+EOS
+
+# use a traditional dialog for Tk.getSaveFile() and Tk.getMultipleSaveFile()
+Tk.ip_eval(<<'EOS')
+    proc ::tk_getSaveFile {args} {
+        if {$::tk_strictMotif} {
+            return [eval tk::MotifFDialog save $args]
+        } else {
+            return [eval ::tk::dialog::file:: save $args]
+        }
+    }
+EOS
+
+# use a traditional dialog for Tk.messageBox()
+Tk.ip_eval(<<'EOS')
+    proc ::tk_messageBox {args} {
+        return [eval tk::MessageBox $args]
+    }
+EOS
+
+# use a traditional dialog for Tk.chooseDirectory()
+Tk.ip_eval(<<'EOS')
+    proc ::tk_chooseDirectory {args} {
+        return [eval ::tk::dialog::file::chooseDir:: $args]
+    }
+EOS
+=================================================================
+
+Each of them replaces the platform specific dialog command to the 
+traditional one. 
+
+If you use some MultiTkIp objects, probably, you'll have to call the 
+bits of script for each MultiTkIp object. 
+
+-- 
+Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ruby_1_8_6/ext/tk/README.tcltklib b/ruby_1_8_6/ext/tk/README.tcltklib
new file mode 100644
index 0000000000..e939ba1f51
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/README.tcltklib
@@ -0,0 +1,81 @@
+To compile 'tcltklib', you must have Tcl/Tk libraries on your environment. 
+Although 'extconf.rb' script searches Tcl/Tk libraries and header files, 
+sometimes fails to find them. And then, 'tcltklib' cannot be compiled. If 
+Tcl/Tk libraries or header files are installed but are not found, you can 
+give the information by arguments of the 'configure' script. Please give 
+some or all of the following options. 
+
+ --with-tcllib=<libname>       (e.g. libtcl8.4.so ==> --with-tcllib=tcl8.4)
+ --with-tklib=<libname>        (e.g. libtk8.4.so  ==> --with-tklib=tk8.4)
+
+ --enable-tcltk_stubs          (if you force to enable stubs)
+
+ --with-tcl-dir=<path> 
+      equal to "--with-tcl-include=<path>/include --with-tcl-lib=<path>/lib"
+
+ --with-tk-dir=<path> 
+      equal to "--with-tk-include=<path>/include --with-tk-lib=<path>/lib"
+
+ --with-tcl-include=<dir>      the directry containts 'tcl.h'
+ --with-tk-include=<dir>       the directry containts 'tk.h'
+
+ --with-tcl-lib=<dir>          the directry containts 'libtcl<version>.so'
+ --with-tk-lib=<dir>           the directry containts 'libtk<version>.so'
+
+ --enable-mac-tcltk-framework  (MacOS X) use Tcl/Tk framework
+                               (Obsolete. Please use '--enable-tcltk-framework'.)
+
+ --enable-tcltk-framework      use Tcl/Tk framework
+
+ --with-tcltk-framework=<dir>  the directory containts Tcl/Tk framework; 
+                               "<dir>/Tcl.framework" and "<dir>/Tk.framework".
+                               When this option is given, it is assumed that 
+                               --enable-tcltk-framework option is given also.
+
+ --with-tcl-framework-header=<dir>
+      Tcl framework headers directory 
+      (e.g. "/Library/Frameworks/Tcl.framework/Headers")
+
+ --with-tk-framework-header=<dir>
+      Tk framework headers directory 
+      (e.g. "/Library/Frameworks/Tk.framework/Headers")
+
+
+ --with-X11 / --without-X11    use / not use the X Window System
+
+ --with-X11-dir=<path> 
+      equal to "--with-X11-include=<path>/include --with-X11-lib=<path>/lib"
+
+ --with-X11-include=<dir>      the directry contains X11 header files
+ --with-X11-lib=<dir>          the directry contains X11 libraries
+
+
+If you forgot to give the options when do 'configure' on toplevel
+directry of Ruby sources, please try something like as the followings.
+
+ $ cd ext/tcltklib
+ $ rm Makefile
+ $ CONFIGURE_ARGS='--with-tcl-include=/usr/local/include/tcl8.4/ --with-tcllib=tcl8.4 --with-tklib=tk8.4' ruby extconf.rb
+
+
+ *** ATTENTION ***
+When your Tcl/Tk libraries are compiled with "pthread support", 
+Ruby/Tk may cause "Hang-up" or "Segmentation Fault" frequently. 
+If you have such a trouble, please try to use the '--enable-pthread' 
+option of the 'configure' command and re-compile Ruby sources. 
+It may help you to avoid this trouble. The following configure 
+options may be useful.
+
+  --enable-tcl-thread/--disable-tcl-thread
+  --with-tclConfig-file=<path of 'tclConfig.sh'>
+
+It is not need that 'tclConfig.sh' is a normal Tcl/Tk's tclConfig.sh. 
+But the file is expected to include the line "TCL_THREADS=0" or "...=1".
+When no "TCL_THREADS=?" line, if Tcl version is 7.x or 8.0 which is 
+given by "TCL_MAJOR_VERSION=?" line and "TCL_MINOR_VERSION=?" line, 
+then --disable-tcl-thread is expected. Else, ignore the 'tclConfig.sh'.
+If --enable-tcl-thread or --disable-tcl-thread option is given, then 
+--with-tclConfig-file option is ignored. 
+
+==========================================================
+                Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ruby_1_8_6/ext/tk/depend b/ruby_1_8_6/ext/tk/depend
new file mode 100644
index 0000000000..2cd9c400f7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/depend
@@ -0,0 +1,2 @@
+tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ruby_1_8_6/ext/tk/extconf.rb b/ruby_1_8_6/ext/tk/extconf.rb
new file mode 100644
index 0000000000..5ed86a8b76
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/extconf.rb
@@ -0,0 +1,312 @@
+# extconf.rb for tcltklib
+
+require 'mkmf'
+
+is_win32 = (/mswin32|mingw|cygwin|bccwin32/ =~ RUBY_PLATFORM)
+#is_macosx = (/darwin/ =~ RUBY_PLATFORM)
+
+def find_framework(tcl_hdr, tk_hdr)
+  if framework_dir = with_config("tcltk-framework")
+    paths = [framework_dir]
+  else
+    unless tcl_hdr || tk_hdr ||
+        enable_config("tcltk-framework", false) ||
+        enable_config("mac-tcltk-framework", false)
+      return false
+    end
+    paths = ["/Library/Frameworks", "/System/Library/Frameworks"]
+  end
+
+  checking_for('Tcl/Tk Framework') {
+    paths.find{|dir|
+      dir.strip!
+      dir.chomp!('/')
+      (tcl_hdr || FileTest.directory?(dir + "/Tcl.framework/") ) &&
+        (tk_hdr || FileTest.directory?(dir + "/Tk.framework/") )
+    }
+  }
+end
+
+tcl_framework_header = with_config("tcl-framework-header")
+tk_framework_header  = with_config("tk-framework-header")
+
+tcltk_framework = find_framework(tcl_framework_header, tk_framework_header)
+
+unless is_win32
+  have_library("nsl", "t_open")
+  have_library("socket", "socket")
+  have_library("dl", "dlopen")
+  have_library("m", "log") 
+end
+
+dir_config("tk")
+dir_config("tcl")
+dir_config("X11")
+
+tklib = with_config("tklib")
+tcllib = with_config("tcllib")
+stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
+
+use_X = with_config("X11", (! is_win32))
+
+def find_tcl(tcllib, stubs)
+  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+  if stubs
+    func = "Tcl_InitStubs"
+    lib = "tclstub"
+  else
+    func = "Tcl_FindExecutable"
+    lib = "tcl"
+  end
+  if tcllib
+    find_library(tcllib, func, *paths)
+  elsif find_library(lib, func, *paths)
+    true
+  else
+    %w[8.5 8.4 8.3 8.2 8.1 8.0 7.6].find { |ver|
+      find_library("#{lib}#{ver}", func, *paths) or
+        find_library("#{lib}#{ver.delete('.')}", func, *paths) or
+        find_library("tcl#{ver}", func, *paths) or
+        find_library("tcl#{ver.delete('.')}", func, *paths)
+    }
+  end
+end
+
+def find_tk(tklib, stubs)
+  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+  if stubs
+    func = "Tk_InitStubs"
+    lib = "tkstub"
+  else
+    func = "Tk_Init"
+    lib = "tk"
+  end
+  if tklib
+    find_library(tklib, func, *paths)
+  elsif find_library(lib, func, *paths)
+    true
+  else
+    %w[8.5 8.4 8.3 8.2 8.1 8.0 4.2].find { |ver|
+      find_library("#{lib}#{ver}", func, *paths) or
+        find_library("#{lib}#{ver.delete('.')}", func, *paths) or
+        find_library("tk#{ver}", func, *paths) or
+        find_library("tk#{ver.delete('.')}", func, *paths)
+    }
+  end
+end
+
+def pthread_check()
+  tcl_major_ver = nil
+  tcl_minor_ver = nil
+
+  # Is tcl-thread given by user ?
+  case enable_config("tcl-thread")
+  when true
+    tcl_enable_thread = true
+  when false
+    tcl_enable_thread = false
+  else
+    tcl_enable_thread = nil
+  end
+
+  if (tclConfig = with_config("tclConfig-file"))
+    if tcl_enable_thread == true
+      puts("Warning: --with-tclConfig-file option is ignored, because --enable-tcl-thread option is given.")
+    elsif tcl_enable_thread == false
+      puts("Warning: --with-tclConfig-file option is ignored, because --disable-tcl-thread option is given.")
+    else
+      # tcl-thread is unknown and tclConfig.sh is given
+      begin
+        open(tclConfig, "r") do |cfg|
+          while line = cfg.gets()
+            if line =~ /^\s*TCL_THREADS=(0|1)/
+              tcl_enable_thread = ($1 == "1")
+              break
+            end
+
+            if line =~ /^\s*TCL_MAJOR_VERSION=("|')(\d+)\1/
+              tcl_major_ver = $2
+              if tcl_major_ver =~ /^[1-7]$/
+                tcl_enable_thread = false
+                break
+              end
+              if tcl_major_ver == "8" && tcl_minor_ver == "0"
+                tcl_enable_thread = false
+                break
+              end
+            end
+
+            if line =~ /^\s*TCL_MINOR_VERSION=("|')(\d+)\1/
+              tcl_minor_ver = $2
+              if tcl_major_ver == "8" && tcl_minor_ver == "0"
+                tcl_enable_thread = false
+                break
+              end
+            end
+          end
+        end
+
+        if tcl_enable_thread == nil
+          # not find definition
+          if tcl_major_ver
+            puts("Warning: '#{tclConfig}' doesn't include TCL_THREADS definition.")
+          else
+            puts("Warning: '#{tclConfig}' may not be a tclConfig file.")
+          end
+          tclConfig = false
+        end
+      rescue Exception
+        puts("Warning: fail to read '#{tclConfig}'!! --> ignore the file")
+        tclConfig = false
+      end
+    end
+  end
+
+  if tcl_enable_thread == nil && !tclConfig
+    # tcl-thread is unknown and tclConfig is unavailable
+    begin
+      try_run_available = try_run("int main() { exit(0); }")
+    rescue Exception
+      # cannot try_run. Is CROSS-COMPILE environment?
+      puts(%Q'\
+*****************************************************************************
+**
+** PTHREAD SUPPORT CHECK WARNING: 
+**
+**   We cannot check the consistency of pthread support between Ruby 
+**   and the Tcl/Tk library in your environment (are you perhaps
+**   cross-compiling?). If pthread support for these 2 packages is
+**   inconsistent you may find you get errors when running Ruby/Tk
+**   (e.g. hangs or segmentation faults).  We strongly recommend
+**   you to check the consistency manually.
+**
+*****************************************************************************
+')
+      return true
+    end
+  end
+
+  if tcl_enable_thread == nil
+    # tcl-thread is unknown
+    if try_run(<<EOF)
+#include <tcl.h>
+int main() { 
+   Tcl_Interp *ip;
+   ip = Tcl_CreateInterp();
+   exit((Tcl_Eval(ip, "set tcl_platform(threaded)") == TCL_OK)? 0: 1);
+}
+EOF
+      tcl_enable_thread = true
+    elsif try_run(<<EOF)
+#include <tcl.h>
+static Tcl_ThreadDataKey dataKey;
+int main() { exit((Tcl_GetThreadData(&dataKey, 1) == dataKey)? 1: 0); }
+EOF
+      tcl_enable_thread = true
+    else
+      tcl_enable_thread = false
+    end
+  end
+
+  # check pthread mode
+  if (macro_defined?('HAVE_NATIVETHREAD', '#include "ruby.h"'))
+    # ruby -> enable
+    unless tcl_enable_thread
+      # ruby -> enable && tcl -> disable
+      puts(%Q'\
+*****************************************************************************
+**
+** PTHREAD SUPPORT MODE WARNING: 
+**
+**   Ruby is compiled with --enable-pthread, but your Tcl/Tk library
+**   seems to be compiled without pthread support. Although you can
+**   create the tcltklib library, this combination may cause errors
+**   (e.g. hangs or segmentation faults). If you have no reason to
+**   keep the current pthread support status, we recommend you reconfigure
+**   and recompile the libraries so that both or neither support pthreads.
+**
+**   If you want change the status of pthread support, please recompile 
+**   Ruby without "--enable-pthread" configure option or recompile Tcl/Tk 
+**   with "--enable-threads" configure option (if your Tcl/Tk is later 
+**   than or equal to Tcl/Tk 8.1).
+**
+*****************************************************************************
+')
+    end
+
+    # ruby -> enable && tcl -> enable/disable
+    if tcl_enable_thread
+      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
+    else
+      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
+    end
+
+    return true
+
+  else
+    # ruby -> disable
+    if tcl_enable_thread
+      # ruby -> disable && tcl -> enable
+      puts(%Q'\
+*****************************************************************************
+**
+** PTHREAD SUPPORT MODE ERROR: 
+**
+**   Ruby is not compiled with --enable-pthread, but your Tcl/Tk 
+**   library seems to be compiled with pthread support. This
+**   combination may cause frequent hang or segmentation fault
+**   errors when Ruby/Tk is working. We recommend that you NEVER
+**   create the library with such a combination of pthread support.
+**
+**   Please recompile Ruby with the "--enable-pthread" configure option
+**   or recompile Tcl/Tk with the "--disable-threads" configure option.
+**
+*****************************************************************************
+')
+      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=1'
+      return false
+    else
+      # ruby -> disable && tcl -> disable
+      $CPPFLAGS += ' -DWITH_TCL_ENABLE_THREAD=0'
+      return true
+    end
+  end
+end
+
+if tcltk_framework || 
+   (have_header("tcl.h") && have_header("tk.h") &&
+      ( !use_X || find_library("X11", "XOpenDisplay",
+                               "/usr/X11/lib", "/usr/lib/X11", 
+                               "/usr/X11R6/lib", "/usr/openwin/lib")) &&
+    find_tcl(tcllib, stubs) &&
+    find_tk(tklib, stubs))
+  $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
+  $CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
+
+  if tcltk_framework
+    if tcl_framework_header
+      $CPPFLAGS += " -I#{tcl_framework_header}"
+    else
+      $CPPFLAGS += " -I#{tcltk_framework}/Tcl.framework/Headers"
+    end
+
+    if tk_framework_header
+      $CPPFLAGS += " -I#{tk_framework_header}"
+    else
+      $CPPFLAGS += " -I#{tcltk_framework}/Tk.framework/Headers"
+    end
+
+    $LDFLAGS += ' -framework Tk -framework Tcl'
+  end
+
+  if stubs or pthread_check
+    # create Makefile
+
+    # for SUPPORT_STATUS
+    $INSTALLFILES ||= []
+    $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
+
+    # create
+    create_makefile("tcltklib")
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/README b/ruby_1_8_6/ext/tk/lib/README
new file mode 100644
index 0000000000..5918fe4bf0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/README
@@ -0,0 +1,30 @@
+README		this file
+multi-tk.rb	multiple Tk interpreter (included safe-Tk) support
+remotei-tk.rb	control remote Tk interpreter on the other process support
+tk.rb		Tk interface
+
+tk/             library files construct Ruby/Tk
+
+tkextlib/       non-standard Tcl/Tk extension support libraries
+
+*********************************************************************
+***  The followings exists for backward compatibility only.
+***  The only thing which they work is that requires current 
+***  library files ( tk/*.rb ). 
+*********************************************************************
+tkafter.rb	handles Tcl after
+tkbgerror.rb	Tk error module
+tkcanvas.rb	Tk canvas interface
+tkclass.rb	provides generic names for Tk classes
+tkconsole.rb	console command support
+tkdialog.rb	Tk dialog class
+tkentry.rb	Tk entry class
+tkfont.rb	Tk font support
+tkmacpkg.rb	Mac resource support
+tkmenubar.rb	TK menubar utility
+tkmngfocus.rb	focus manager
+tkpalette.rb	pallete support
+tkscrollbox.rb	scroll box, also example of compound widget
+tktext.rb	text classes
+tkvirtevent.rb	virtual event support
+tkwinpkg.rb	Win DDE and registry support
diff --git a/ruby_1_8_6/ext/tk/lib/multi-tk.rb b/ruby_1_8_6/ext/tk/lib/multi-tk.rb
new file mode 100644
index 0000000000..78ed1aa6ee
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/multi-tk.rb
@@ -0,0 +1,3233 @@
+#
+#               multi-tk.rb - supports multi Tk interpreters
+#                       by Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+require 'tcltklib'
+require 'tkutil'
+require 'thread'
+
+if defined? Tk
+  fail RuntimeError,"'multi-tk' library must be required before requiring 'tk'"
+end
+
+################################################
+# ignore exception on the mainloop?
+
+TclTkLib.mainloop_abort_on_exception = true
+# TclTkLib.mainloop_abort_on_exception = false
+# TclTkLib.mainloop_abort_on_exception = nil
+
+
+################################################
+# add ThreadGroup check to TclTkIp.new
+class << TclTkIp
+  alias __new__ new
+  private :__new__
+
+  def new(*args)
+    if Thread.current.group != ThreadGroup::Default
+      raise SecurityError, 'only ThreadGroup::Default can call TclTkIp.new'
+    end
+    __new__(*args)
+  end
+end
+
+
+################################################
+# use pseudo-toplevel feature of MultiTkIp ?
+if (!defined?(Use_PseudoToplevel_Feature_of_MultiTkIp) || 
+      Use_PseudoToplevel_Feature_of_MultiTkIp)
+  module MultiTkIp_PseudoToplevel_Evaluable
+    #def pseudo_toplevel_eval(body = Proc.new)
+    #  Thread.current[:TOPLEVEL] = self
+    #  begin
+    #    body.call
+    #  ensure
+    #    Thread.current[:TOPLEVEL] = nil
+    #  end
+    #end
+
+    def pseudo_toplevel_evaluable?
+      @pseudo_toplevel_evaluable
+    end
+
+    def pseudo_toplevel_evaluable=(mode)
+      @pseudo_toplevel_evaluable = (mode)? true: false
+    end
+
+    def self.extended(mod)
+      mod.__send__(:extend_object, mod)
+      mod.instance_variable_set('@pseudo_toplevel_evaluable', true)
+    end
+  end
+
+  class Object
+    alias __method_missing_alias_for_MultiTkIp__ method_missing
+    private :__method_missing_alias_for_MultiTkIp__
+
+    def method_missing(id, *args)
+      begin
+        has_top = (top = MultiTkIp.__getip.__pseudo_toplevel) && 
+          top.respond_to?(:pseudo_toplevel_evaluable?) && 
+          top.pseudo_toplevel_evaluable? && 
+          top.respond_to?(id)
+      rescue Exception => e
+        has_top = false
+      end
+
+      if has_top
+        top.__send__(id, *args)
+      else
+        __method_missing_alias_for_MultiTkIp__(id, *args)
+      end
+    end
+  end
+else
+  # dummy
+  module MultiTkIp_PseudoToplevel_Evaluable
+    def pseudo_toplevel_evaluable?
+      false
+    end
+  end
+end
+
+################################################
+# exceptiopn to treat the return value from IP
+class MultiTkIp_OK < Exception
+  def self.send(thread, ret=nil)
+    thread.raise self.new(ret)
+  end
+
+  def initialize(ret=nil)
+    super('succeed')
+    @return_value = ret
+  end
+
+  attr_reader :return_value
+  alias value return_value
+end
+MultiTkIp_OK.freeze
+
+
+################################################
+# methods for construction
+class MultiTkIp
+  BASE_DIR = File.dirname(__FILE__)
+
+  @@SLAVE_IP_ID = ['slave'.freeze, '0'.taint].freeze
+
+  @@IP_TABLE = {}.taint unless defined?(@@IP_TABLE)
+
+  @@INIT_IP_ENV  = [].taint unless defined?(@@INIT_IP_ENV)  # table of Procs
+  @@ADD_TK_PROCS = [].taint unless defined?(@@ADD_TK_PROCS) # table of [name, args, body]
+
+  @@TK_TABLE_LIST = [].taint unless defined?(@@TK_TABLE_LIST)
+
+  unless defined?(@@TK_CMD_TBL)
+    @@TK_CMD_TBL = Object.new.taint
+
+    @@TK_CMD_TBL.instance_variable_set('@tbl', {}.taint)
+
+    class << @@TK_CMD_TBL
+      allow = [
+        '__send__', '__id__', 'freeze', 'inspect', 'kind_of?', 
+        '[]', '[]=', 'delete', 'each', 'has_key?'
+      ]
+      instance_methods.each{|m| undef_method(m) unless allow.index(m)}
+
+      def kind_of?(klass)
+        @tbl.kind_of?(klass)
+      end
+
+      def inspect
+        if Thread.current.group == ThreadGroup::Default
+          @tbl.inspect
+        else
+          ip = MultiTkIp.__getip
+          @tbl.reject{|idx, ent| ent.respond_to?(:ip) && ent.ip != ip}.inspect
+        end
+      end
+
+      def [](idx)
+        return unless (ent = @tbl[idx])
+        if Thread.current.group == ThreadGroup::Default
+          ent
+        elsif ent.respond_to?(:ip)
+          (ent.ip == MultiTkIp.__getip)? ent: nil
+        else
+          ent
+        end
+      end
+
+      def []=(idx,val)
+        if self.has_key?(idx) && Thread.current.group != ThreadGroup::Default
+          fail SecurityError,"cannot change the entried command"
+        end
+        @tbl[idx] = val
+      end
+
+      def delete(idx, &blk)
+        # if gets an entry, is permited to delete
+        if self[idx]
+          @tbl.delete(idx) 
+        elsif blk
+          blk.call(idx)
+        else
+          nil
+        end
+      end
+
+      def each(&blk)
+        if Thread.current.group == ThreadGroup::Default
+          @tbl.each(&blk)
+        else
+          ip = MultiTkIp.__getip
+          @tbl.each{|idx, ent|
+            blk.call(idx, ent) unless ent.respond_to?(:ip) && ent.ip != ip
+          }
+        end
+        self
+      end
+
+      def has_key?(k)
+        @tbl.has_key?(k)
+      end
+      alias include? has_key?
+      alias key? has_key?
+      alias member? has_key?
+    end
+
+    @@TK_CMD_TBL.freeze
+  end
+
+  ######################################
+
+  @@CB_ENTRY_CLASS = Class.new(TkCallbackEntry){
+    def initialize(ip, cmd)
+      @ip = ip
+      @cmd = cmd
+      freeze
+    end
+    attr_reader :ip, :cmd
+    def inspect
+      cmd.inspect
+    end
+    def call(*args)
+      unless @ip.deleted?
+        current = Thread.current
+        backup_ip = current['callback_ip']
+        current['callback_ip'] = @ip
+        begin
+          ret = @ip.cb_eval(@cmd, *args)
+          fail ret if ret.kind_of?(Exception)
+          ret
+        rescue TkCallbackBreak, TkCallbackContinue => e
+          fail e
+	rescue SecurityError => e
+          # in 'exit', 'exit!', and 'abort' : security error --> delete IP
+          if e.backtrace[0] =~ /^(.+?):(\d+):in `(exit|exit!|abort)'/
+	    @ip.delete
+          elsif @ip.safe?
+	    if @ip.respond_to?(:cb_error)
+              @ip.cb_error(e)
+            else
+              nil # ignore
+            end
+          else
+            fail e
+          end
+        rescue Exception => e
+          fail e if e.message =~ /^TkCallback/
+
+          if @ip.safe?
+	    if @ip.respond_to?(:cb_error)
+              @ip.cb_error(e)
+            else
+              nil # ignore
+            end
+          else
+            fail e
+          end
+        ensure
+          current['callback_ip'] = backup_ip
+        end
+      end
+    end
+  }.freeze
+
+  ######################################
+
+  def _keys2opts(src_keys)
+    return nil if src_keys == nil
+    keys = {}; src_keys.each{|k, v| keys[k.to_s] = v}
+    #keys.collect{|k,v| "-#{k} #{v}"}.join(' ')
+    keys.collect{|k,v| "-#{k} #{TclTkLib._conv_listelement(TkComm::_get_eval_string(v))}"}.join(' ')
+  end
+  private :_keys2opts
+
+  def _check_and_return(thread, exception, wait=0)
+    unless thread
+      unless exception.kind_of?(MultiTkIp_OK)
+        msg = "#{exception.class}: #{exception.message}"
+
+        if @interp.deleted?
+          warn("Warning (#{self}): " + msg)
+          return nil
+        end
+
+        if safe?
+          warn("Warning (#{self}): " + msg) if $DEBUG
+          return nil
+        end
+
+        begin
+          @interp._eval_without_enc(@interp._merge_tklist('bgerror', msg))
+        rescue Exception => e
+          warn("Warning (#{self}): " + msg)
+        end
+      end
+      return nil
+    end
+
+    if wait == 0
+      # no wait
+      Thread.pass
+      if thread.stop?
+        thread.raise exception
+      end
+      return thread
+    end
+
+    # wait to stop the caller thread
+    wait.times{
+      if thread.stop?
+        # ready to send exception
+        thread.raise exception
+        return thread
+      end
+
+      # wait
+      Thread.pass
+    }
+
+    # unexpected error
+    thread.raise RuntimeError, "the thread may not wait for the return value"
+    return thread
+  end
+
+  ######################################
+
+  def set_cb_error(cmd = Proc.new)
+    @cb_error_proc[0] = cmd
+  end
+
+  def cb_error(e)
+    if @cb_error_proc[0].respond_to?(:call)
+      @cb_error_proc[0].call(e)
+    end
+  end
+
+  ######################################
+
+  def set_safe_level(safe)
+    if safe > @safe_level[0]
+      @safe_level[0] = safe
+      @cmd_queue.enq([@system, 'set_safe_level', safe])
+    end
+    @safe_level[0]
+  end
+  def safe_level=(safe)
+    set_safe_level(safe)
+  end
+  def self.set_safe_level(safe)
+    __getip.set_safe_level(safe)
+  end
+  def self.safe_level=(safe)
+    self.set_safe_level(safe)
+  end
+  def safe_level
+    @safe_level[0]
+  end
+  def self.safe_level
+    __getip.safe_level
+  end
+
+  def wait_on_mainloop?
+    @wait_on_mainloop[0]
+  end
+  def wait_on_mainloop=(bool)
+    @wait_on_mainloop[0] = bool
+  end
+
+  def running_mainloop?
+    @wait_on_mainloop[1] > 0
+  end
+
+  def _destroy_slaves_of_slaveIP(ip)
+    unless ip.deleted?
+      # ip._split_tklist(ip._invoke('interp', 'slaves')).each{|name|
+      ip._split_tklist(ip._invoke_without_enc('interp', 'slaves')).each{|name|
+        name = _fromUTF8(name)
+        begin
+          # ip._eval_without_enc("#{name} eval {foreach i [after info] {after cancel $i}}")
+          after_ids = ip._eval_without_enc("#{name} eval {after info}")
+          ip._eval_without_enc("#{name} eval {foreach i {#{after_ids}} {after cancel $i}}")
+        rescue Exception
+        end
+        begin
+          # ip._invoke('interp', 'eval', name, 'destroy', '.')
+          ip._invoke(name, 'eval', 'destroy', '.')
+        rescue Exception
+        end
+
+        # safe_base?
+        if ip._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
+          begin
+            ip._eval_without_enc("::safe::interpDelete #{name}")
+          rescue Exception
+          end
+        end
+=begin
+        if ip._invoke('interp', 'exists', name) == '1'
+          begin
+            ip._invoke(name, 'eval', 'exit')
+          rescue Exception
+          end
+        end
+=end
+        unless ip.deleted?
+          if ip._invoke('interp', 'exists', name) == '1'
+            begin
+              ip._invoke('interp', 'delete', name)
+            rescue Exception
+            end
+          end
+        end
+      }
+    end
+  end
+
+  def _receiver_eval_proc_core(safe_level, thread, cmd, *args)
+    begin
+      #ret = proc{$SAFE = safe_level; cmd.call(*args)}.call
+      #ret = cmd.call(safe_level, *args)
+      normal_ret = false
+      ret = catch(:IRB_EXIT) do  # IRB hack
+        retval = cmd.call(safe_level, *args)
+        normal_ret = true
+        retval
+      end
+      unless normal_ret
+        # catch IRB_EXIT
+        exit(ret)
+      end
+      ret
+    rescue SystemExit => e
+      # delete IP
+      unless @interp.deleted?
+        @slave_ip_tbl.each{|name, subip| 
+          _destroy_slaves_of_slaveIP(subip)
+          begin
+            # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
+            after_ids = subip._eval_without_enc("after info")
+            subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+          rescue Exception
+          end
+=begin
+          begin
+            subip._invoke('destroy', '.') unless subip.deleted?
+          rescue Exception
+          end
+=end
+          # safe_base?
+          if @interp._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
+            begin
+              @interp._eval_without_enc("::safe::interpDelete #{name}")
+            rescue Exception
+            else
+              next if subip.deleted?
+            end
+          end
+          if subip.respond_to?(:safe_base?) && subip.safe_base? && 
+              !subip.deleted?
+            # do 'exit' to call the delete_hook procedure
+            begin
+              subip._eval_without_enc('exit') 
+            rescue Exception
+            end
+          else
+            begin
+              subip.delete unless subip.deleted?
+            rescue Exception
+            end
+          end
+        }
+
+        begin
+          # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
+          after_ids = @interp._eval_without_enc("after info")
+          @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+        rescue Exception
+        end
+        begin
+          @interp._invoke('destroy', '.') unless @interp.deleted?
+        rescue Exception
+        end
+        if @safe_base && !@interp.deleted?
+          # do 'exit' to call the delete_hook procedure
+          @interp._eval_without_enc('exit')
+        else
+          @interp.delete unless @interp.deleted?
+        end
+      end
+
+      if e.backtrace[0] =~ /^(.+?):(\d+):in `(exit|exit!|abort)'/
+        _check_and_return(thread, MultiTkIp_OK.new($3 == 'exit'))
+      else
+        _check_and_return(thread, MultiTkIp_OK.new(nil))
+      end
+
+      # if master? && !safe? && allow_ruby_exit?
+      if !@interp.deleted? && master? && !safe? && allow_ruby_exit?
+=begin
+        ObjectSpace.each_object(TclTkIp){|obj|
+          obj.delete unless obj.deleted?
+        }
+=end
+        #exit(e.status)
+        fail e
+      end
+      # break
+
+    rescue SecurityError => e
+      # in 'exit', 'exit!', and 'abort' : security error --> delete IP
+      if e.backtrace[0] =~ /^(.+?):(\d+):in `(exit|exit!|abort)'/
+        ret = ($3 == 'exit')
+        unless @interp.deleted?
+          @slave_ip_tbl.each{|name, subip|
+            _destroy_slaves_of_slaveIP(subip)
+            begin
+              # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
+              after_ids = subip._eval_without_enc("after info")
+              subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+            rescue Exception
+            end
+=begin
+            begin
+              subip._invoke('destroy', '.') unless subip.deleted?
+            rescue Exception
+            end
+=end
+            # safe_base?
+            if @interp._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
+              begin
+                @interp._eval_without_enc("::safe::interpDelete #{name}")
+              rescue Exception
+              else
+                next if subip.deleted?
+              end
+            end
+            if subip.respond_to?(:safe_base?) && subip.safe_base? && 
+                !subip.deleted?
+              # do 'exit' to call the delete_hook procedure
+              begin
+                subip._eval_without_enc('exit') 
+              rescue Exception
+              end
+            else
+              begin
+                subip.delete unless subip.deleted?
+              rescue Exception
+              end
+            end
+          }
+
+          begin
+            # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
+            after_ids = @interp._eval_without_enc("after info")
+            @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+          rescue Exception
+          end
+=begin
+          begin
+            @interp._invoke('destroy', '.') unless @interp.deleted?
+          rescue Exception
+          end
+=end
+          if @safe_base && !@interp.deleted?
+            # do 'exit' to call the delete_hook procedure
+            @interp._eval_without_enc('exit')
+          else
+            @interp.delete unless @interp.deleted?
+          end
+        end
+        _check_and_return(thread, MultiTkIp_OK.new(ret))
+        # break
+
+      else
+        # raise security error
+        _check_and_return(thread, e)
+      end
+
+    rescue Exception => e
+      # raise exception
+      begin
+        bt = _toUTF8(e.backtrace.join("\n"))
+        bt.instance_variable_set(:@encoding, 'utf-8')
+      rescue Exception
+        bt = e.backtrace.join("\n")
+      end
+      begin
+        @interp._set_global_var('errorInfo', bt)
+      rescue Exception
+      end
+      _check_and_return(thread, e)
+
+    else
+      # no exception
+      _check_and_return(thread, MultiTkIp_OK.new(ret))
+    end
+  end
+
+  def _receiver_eval_proc(last_thread, safe_level, thread, cmd, *args)
+    if thread
+      Thread.new{
+        last_thread.join if last_thread
+        unless @interp.deleted?
+          _receiver_eval_proc_core(safe_level, thread, cmd, *args)
+        end
+      }
+    else
+      Thread.new{
+        unless  @interp.deleted?
+          _receiver_eval_proc_core(safe_level, thread, cmd, *args)
+        end
+      }
+      last_thread
+    end
+  end
+
+  private :_receiver_eval_proc, :_receiver_eval_proc_core
+
+  def _receiver_mainloop(check_root)
+    if @evloop_thread[0] && @evloop_thread[0].alive?
+      @evloop_thread[0]
+    else
+      @evloop_thread[0] = Thread.new{
+	while !@interp.deleted?
+	  #if check_root
+	  #  inf = @interp._invoke_without_enc('info', 'command', '.')
+	  #  break if !inf.kind_of?(String) || inf != '.'
+	  #end
+          break if check_root && !@interp.has_mainwindow?
+	  sleep 0.5
+	end
+      }
+      @evloop_thread[0]
+    end
+  end
+
+  def _create_receiver_and_watchdog(lvl = $SAFE)
+    lvl = $SAFE if lvl < $SAFE
+
+    # command-procedures receiver
+    receiver = Thread.new(lvl){|safe_level|
+      last_thread = {}
+
+      loop do
+        break if @interp.deleted?
+        thread, cmd, *args = @cmd_queue.deq
+        if thread == @system
+          # control command
+          case cmd
+          when 'set_safe_level'
+            begin
+              safe_level = args[0] if safe_level < args[0] 
+            rescue Exception
+            end
+          when 'call_mainloop'
+            thread = args.shift
+            _check_and_return(thread, 
+                              MultiTkIp_OK.new(_receiver_mainloop(*args)))
+          else
+            # ignore
+          end
+
+        else
+          # procedure
+          last_thread[thread] = _receiver_eval_proc(last_thread[thread], 
+						    safe_level, thread, 
+						    cmd, *args)
+        end
+      end
+    }
+
+    # watchdog of receiver
+    watchdog = Thread.new{
+      begin
+        loop do
+          sleep 1
+          receiver.kill if @interp.deleted?
+          break unless receiver.alive?
+        end
+      rescue Exception
+        # ignore all kind of Exception
+      end
+      # receiver is dead
+      loop do
+        thread, cmd, *args = @cmd_queue.deq
+        next unless thread
+        if thread.alive?
+          if @interp.deleted?
+            thread.raise RuntimeError, 'the interpreter is already deleted'
+          else
+            thread.raise RuntimeError, 
+              'the interpreter no longer receives command procedures'
+          end
+        end
+      end
+    }
+
+    # return threads
+    [receiver, watchdog]
+  end
+  private :_check_and_return, :_create_receiver_and_watchdog
+
+  ######################################
+
+  if self.const_defined? :DEFAULT_MASTER_NAME
+    name = DEFAULT_MASTER_NAME.to_s
+  else
+    name = nil
+  end
+  if self.const_defined?(:DEFAULT_MASTER_OPTS) &&
+      DEFAULT_MASTER_OPTS.kind_of?(Hash)
+    keys = DEFAULT_MASTER_OPTS
+  else
+    keys = {}
+  end
+
+  @@DEFAULT_MASTER = self.allocate
+  @@DEFAULT_MASTER.instance_eval{
+    @tk_windows = {}.taint
+
+    @tk_table_list = [].taint
+
+    @slave_ip_tbl = {}.taint
+
+    @slave_ip_top = {}.taint
+
+    @evloop_thread = [].taint
+
+    unless keys.kind_of? Hash
+      fail ArgumentError, "expecting a Hash object for the 2nd argument"
+    end
+
+    @interp = TclTkIp.new(name, _keys2opts(keys))
+    @ip_name = nil
+
+    @callback_status = [].taint
+
+    @system = Object.new
+
+    @wait_on_mainloop = [true, 0].taint
+
+    @threadgroup  = Thread.current.group
+
+    @safe_base = false
+
+    @safe_level = [$SAFE]
+
+    @cmd_queue = Queue.new
+
+    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
+
+    @threadgroup.add @cmd_receiver
+    @threadgroup.add @receiver_watchdog
+
+    # NOT enclose @threadgroup for @@DEFAULT_MASTER
+
+    @@IP_TABLE[ThreadGroup::Default] = self
+    @@IP_TABLE[@threadgroup] = self
+
+    #################################
+
+    @pseudo_toplevel = [false, nil]
+
+    def self.__pseudo_toplevel
+      Thread.current.group == ThreadGroup::Default && 
+        MultiTkIp.__getip == @@DEFAULT_MASTER &&
+        self.__pseudo_toplevel_evaluable? && @pseudo_toplevel[1]
+    end
+
+    def self.__pseudo_toplevel=(m)
+      unless (Thread.current.group == ThreadGroup::Default && 
+                MultiTkIp.__getip == @@DEFAULT_MASTER)
+        fail SecurityError, "no permission to manipulate"
+      end
+
+      # if m.kind_of?(Module) && m.respond_to?(:pseudo_toplevel_evaluable?)
+      if m.respond_to?(:pseudo_toplevel_evaluable?)
+        @pseudo_toplevel[0] = true
+        @pseudo_toplevel[1] = m
+      else
+        fail ArgumentError, 'fail to set pseudo-toplevel'
+      end
+      self
+    end
+
+    def self.__pseudo_toplevel_evaluable?
+      begin
+        @pseudo_toplevel[0] && @pseudo_toplevel[1].pseudo_toplevel_evaluable?
+      rescue Exception
+        false
+      end
+    end
+
+    def self.__pseudo_toplevel_evaluable=(mode)
+      unless (Thread.current.group == ThreadGroup::Default && 
+                MultiTkIp.__getip == @@DEFAULT_MASTER)
+        fail SecurityError, "no permission to manipulate"
+      end
+
+      @pseudo_toplevel[0] = (mode)? true: false
+    end
+
+    #################################
+
+    @assign_request = Class.new(Exception){
+      def self.new(target, ret)
+        obj = super()
+        obj.target = target
+        obj.ret = ret
+        obj
+      end
+      attr_accessor :target, :ret
+    }
+
+    @assign_thread = Thread.new{
+      loop do
+        begin
+          Thread.stop
+        rescue @assign_request=>req
+          begin
+            req.ret[0] = req.target.instance_eval{
+              @cmd_receiver, @receiver_watchdog = 
+                _create_receiver_and_watchdog(@safe_level[0])
+              @threadgroup.add @cmd_receiver
+              @threadgroup.add @receiver_watchdog
+              @threadgroup.enclose
+              true
+            }
+          rescue Exception=>e
+            begin
+              req.ret[0] = e
+            rescue Exception
+              # ignore
+            end
+          end
+        rescue Exception
+          # ignore
+        end
+      end
+    }
+
+    def self.assign_receiver_and_watchdog(target)
+      ret = [nil]
+      @assign_thread.raise(@assign_request.new(target, ret))
+      while ret[0] == nil
+        unless @assign_thread.alive?
+          raise RuntimeError, 'lost the thread to assign a receiver and a watchdog thread'
+        end
+      end
+      if ret[0].kind_of?(Exception)
+        raise ret[0]
+      else
+        ret[0]
+      end
+    end
+
+    #################################
+
+    @init_ip_env_queue = Queue.new
+    Thread.new{
+      current = Thread.current
+      loop {
+        mtx, ret, table, script = @init_ip_env_queue.deq
+        begin        
+          ret[0] = table.each{|tg, ip| ip._init_ip_env(script) }
+        rescue Exception => e
+          ret[0] = e
+        ensure
+          mtx.unlock
+        end
+      }
+    }
+
+    def self.__init_ip_env__(table, script)
+      ret = []
+      mtx = Mutex.new.lock
+      @init_ip_env_queue.enq([mtx, ret, table, script])
+      mtx.lock
+      if ret[0].kind_of?(Exception)
+        raise ret[0]
+      else
+        ret[0]
+      end
+    end
+
+    #################################
+
+    class << self
+      undef :instance_eval
+    end
+  }
+
+  @@DEFAULT_MASTER.freeze # defend against modification
+
+  ######################################
+
+  def self.inherited(subclass)
+    # trust if on ThreadGroup::Default or @@DEFAULT_MASTER's ThreadGroup
+    if @@IP_TABLE[Thread.current.group] == @@DEFAULT_MASTER
+      begin
+        class << subclass
+          self.methods.each{|m|
+            begin
+              unless m == '__id__' || m == '__send__' || m == 'freeze'
+                undef_method(m)
+              end
+            rescue Exception
+              # ignore all exceptions
+            end
+          }
+        end
+      ensure
+        subclass.freeze
+        fail SecurityError, 
+          "cannot create subclass of MultiTkIp on a untrusted ThreadGroup"
+      end
+    end
+  end
+
+  ######################################
+
+  @@SAFE_OPT_LIST = [
+    'accessPath'.freeze, 
+    'statics'.freeze, 
+    'nested'.freeze, 
+    'deleteHook'.freeze
+  ].freeze
+
+  def _parse_slaveopts(keys)
+    name = nil
+    safe = false
+    safe_opts = {}
+    tk_opts   = {}
+
+    keys.each{|k,v|
+      k_str = k.to_s
+      if k_str == 'name'
+        name = v 
+      elsif k_str == 'safe'
+        safe = v
+      elsif @@SAFE_OPT_LIST.member?(k_str)
+        safe_opts[k_str] = v
+      else
+        tk_opts[k_str] = v
+      end
+    }
+
+    if keys['without_tk'] || keys[:without_tk]
+      [name, safe, safe_opts, nil]
+    else
+      [name, safe, safe_opts, tk_opts]
+    end
+  end
+  private :_parse_slaveopts
+
+  def _create_slave_ip_name
+    name = @@SLAVE_IP_ID.join('')
+    @@SLAVE_IP_ID[1].succ!
+    name.freeze
+  end
+  private :_create_slave_ip_name
+
+  ######################################
+
+  def __check_safetk_optkeys(optkeys)
+    # based on 'safetk.tcl'
+    new_keys = {}
+    optkeys.each{|k,v| new_keys[k.to_s] = v}
+
+    # check 'display'
+    if !new_keys.key?('display')
+      begin
+        #new_keys['display'] = @interp._invoke('winfo screen .')
+        new_keys['display'] = @interp._invoke('winfo', 'screen', '.')
+      rescue
+        if ENV[DISPLAY]
+          new_keys['display'] = ENV[DISPLAY]
+        elsif !new_keys.key?('use')
+          warn "Warning: no screen info or ENV[DISPLAY], so use ':0.0'"
+          new_keys['display'] = ':0.0'
+        end
+      end
+    end
+
+    # check 'use'
+    if new_keys.key?('use')
+      # given 'use'
+      case new_keys['use']
+      when TkWindow
+        new_keys['use'] = TkWinfo.id(new_keys['use'])
+        #assoc_display = @interp._eval('winfo screen .')
+        assoc_display = @interp._invoke('winfo', 'screen', '.')
+      when /^\..*/
+        new_keys['use'] = @interp._invoke('winfo', 'id', new_keys['use'])
+        assoc_display = @interp._invoke('winfo', 'screen', new_keys['use'])
+      else
+        begin
+          pathname = @interp._invoke('winfo', 'pathname', new_keys['use'])
+          assoc_display = @interp._invoke('winfo', 'screen', pathname)
+        rescue
+          assoc_display = new_keys['display']
+        end
+      end
+
+      # match display?
+      if assoc_display != new_keys['display']
+        if optkeys.key?(:display) || optkeys.key?('display')
+          fail RuntimeError, 
+            "conflicting 'display'=>#{new_keys['display']} " + 
+            "and display '#{assoc_display}' on 'use'=>#{new_keys['use']}"
+        else
+          new_keys['display'] = assoc_display
+        end
+      end
+    end
+
+    # return
+    new_keys
+  end
+  private :__check_safetk_optkeys
+
+  def __create_safetk_frame(slave_ip, slave_name, app_name, keys)
+    # display option is used by ::safe::loadTk
+    loadTk_keys = {}
+    loadTk_keys['display'] = keys['display']
+    dup_keys = keys.dup
+
+    # keys for toplevel : allow followings
+    toplevel_keys = {}
+    ['height', 'width', 'background', 'menu'].each{|k|
+      toplevel_keys[k] = dup_keys.delete(k) if dup_keys.key?(k)
+    }
+    toplevel_keys['classname'] = 'SafeTk'
+    toplevel_keys['screen'] = dup_keys.delete('display')
+
+    # other keys used by pack option of container frame
+
+    # create toplevel widget
+    begin
+      top = TkToplevel.new(toplevel_keys)
+    rescue NameError => e
+      fail e unless @interp.safe?
+      fail SecurityError, "unable create toplevel on the safe interpreter"
+    end
+    msg = "Untrusted Ruby/Tk applet (#{slave_name})"
+    if app_name.kind_of?(String)
+      top.title "#{app_name} (#{slave_name})"
+    else
+      top.title msg
+    end
+
+    # procedure to delete slave interpreter
+    slave_delete_proc = proc{
+      unless slave_ip.deleted?
+        #if slave_ip._invoke('info', 'command', '.') != ""
+        #  slave_ip._invoke('destroy', '.')
+        #end
+        #slave_ip.delete
+        slave_ip._eval_without_enc('exit')
+      end
+      begin
+        top.destroy if top.winfo_exist?
+      rescue
+        # ignore
+      end
+    }
+    tag = TkBindTag.new.bind('Destroy', slave_delete_proc)
+
+    top.bindtags = top.bindtags.unshift(tag)
+
+    # create control frame
+    TkFrame.new(top, :bg=>'red', :borderwidth=>3, :relief=>'ridge') {|fc|
+      fc.bindtags = fc.bindtags.unshift(tag)
+
+      TkFrame.new(fc, :bd=>0){|f|
+        TkButton.new(f, 
+                     :text=>'Delete', :bd=>1, :padx=>2, :pady=>0, 
+                     :highlightthickness=>0, :command=>slave_delete_proc
+                     ).pack(:side=>:right, :fill=>:both)
+        f.pack(:side=>:right, :fill=>:both, :expand=>true)
+      }
+
+      TkLabel.new(fc, :text=>msg, :padx=>2, :pady=>0, 
+                  :anchor=>:w).pack(:side=>:left, :fill=>:both, :expand=>true)
+
+      fc.pack(:side=>:bottom, :fill=>:x)
+    }
+
+    # container frame for slave interpreter
+    dup_keys['fill'] = :both  unless dup_keys.key?('fill')
+    dup_keys['expand'] = true unless dup_keys.key?('expand')
+    c = TkFrame.new(top, :container=>true).pack(dup_keys)
+    c.bind('Destroy', proc{top.destroy})
+
+    # return keys
+    loadTk_keys['use'] = TkWinfo.id(c)
+    [loadTk_keys, top.path]
+  end
+  private :__create_safetk_frame
+
+  def __create_safe_slave_obj(safe_opts, app_name, tk_opts)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    # safe interpreter
+    ip_name = _create_slave_ip_name
+    slave_ip = @interp.create_slave(ip_name, true)
+    @slave_ip_tbl[ip_name] = slave_ip
+    def slave_ip.safe_base?
+      true
+    end
+
+    @interp._eval("::safe::interpInit #{ip_name}")
+
+    slave_ip._invoke('set', 'argv0', app_name) if app_name.kind_of?(String)
+
+    if tk_opts
+      tk_opts = __check_safetk_optkeys(tk_opts)
+      if tk_opts.key?('use')
+        @slave_ip_top[ip_name] = ''
+      else
+        tk_opts, top_path = __create_safetk_frame(slave_ip, ip_name, app_name, 
+                                                  tk_opts)
+        @slave_ip_top[ip_name] = top_path
+      end
+      @interp._eval("::safe::loadTk #{ip_name} #{_keys2opts(tk_opts)}")
+    else
+      @slave_ip_top[ip_name] = nil
+    end
+
+    if safe_opts.key?('deleteHook') || safe_opts.key?(:deleteHook)
+      @interp._eval("::safe::interpConfigure #{ip_name} " + 
+                    _keys2opts(safe_opts))
+    else
+      @interp._eval("::safe::interpConfigure #{ip_name} " + 
+                    _keys2opts(safe_opts) + '-deleteHook {' + 
+                    TkComm._get_eval_string(proc{|slave|
+                                              self._default_delete_hook(slave)
+                                            }) + '}')
+    end
+
+    [slave_ip, ip_name]
+  end
+
+  def __create_trusted_slave_obj(name, keys)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    ip_name = _create_slave_ip_name
+    slave_ip = @interp.create_slave(ip_name, false)
+    slave_ip._invoke('set', 'argv0', name) if name.kind_of?(String)
+    slave_ip._invoke('set', 'argv', _keys2opts(keys))
+    @interp._invoke('load', '', 'Tk', ip_name)
+    @slave_ip_tbl[ip_name] = slave_ip
+    [slave_ip, ip_name]
+  end
+
+  ######################################
+
+  def _create_slave_object(keys={})
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    ip = MultiTkIp.new_slave(self, keys={})
+    @slave_ip_tbl[ip.name] = ip
+  end
+
+  ######################################
+
+  def initialize(master, safeip=true, keys={})
+    if $SAFE >= 4
+      fail SecurityError, "cannot create a new interpreter at level #{$SAFE}"
+    end
+
+    if safeip == nil && $SAFE >= 2
+      fail SecurityError, "cannot create a master-ip at level #{$SAFE}"
+    end
+
+    if master.deleted? && safeip == nil
+      fail RuntimeError, "cannot create a slave of a deleted interpreter"
+    end
+
+    if !master.deleted? && !master.master? && master.safe?
+      fail SecurityError, "safe-slave-ip cannot create a new interpreter"
+    end
+
+    if safeip == nil && !master.master?
+      fail SecurityError, "slave-ip cannot create a master-ip"
+    end
+
+    unless keys.kind_of? Hash
+      fail ArgumentError, "expecting a Hash object for the 2nd argument"
+    end
+
+    @tk_windows = {}
+    @tk_table_list = []
+    @slave_ip_tbl = {}
+    @slave_ip_top = {}
+    @cb_error_proc = []
+    @evloop_thread = []
+
+    @tk_windows.taint unless @tk_windows.tainted?
+    @tk_table_list.taint unless @tk_table_list.tainted?
+    @slave_ip_tbl.taint unless @slave_ip_tbl.tainted?
+    @slave_ip_top.taint unless @slave_ip_top.tainted?
+    @cb_error_proc.taint unless @cb_error_proc.tainted?
+    @evloop_thread.taint unless @evloop_thread.tainted?
+
+    @callback_status = []
+
+    name, safe, safe_opts, tk_opts = _parse_slaveopts(keys)
+
+    safe = 4 if safe && !safe.kind_of?(Fixnum)
+
+    @safe_base = false
+
+    if safeip == nil
+      # create master-ip
+      @interp = TclTkIp.new(name, _keys2opts(tk_opts))
+
+      @ip_name = nil
+      if safe
+        safe = $SAFE if safe < $SAFE
+        @safe_level = [safe]
+      else
+        @safe_level = [$SAFE]
+      end
+    else
+      # create slave-ip
+      if safeip || master.safe?
+        @safe_base = true
+        @interp, @ip_name = master.__create_safe_slave_obj(safe_opts, 
+                                                           name, tk_opts)
+        if safe
+          safe = master.safe_level if safe < master.safe_level
+          @safe_level = [safe]
+        else
+          @safe_level = [4]
+        end
+      else
+        @interp, @ip_name = master.__create_trusted_slave_obj(name, tk_opts)
+        if safe
+          safe = master.safe_level if safe < master.safe_level
+          @safe_level = [safe]
+        else
+          @safe_level = [master.safe_level]
+        end
+      end
+      @set_alias_proc = proc{|name| 
+        master._invoke('interp', 'alias', @ip_name, name, '', name)
+      }.freeze
+    end
+
+    @system = Object.new
+
+    @wait_on_mainloop = [true, 0].taint
+    # @wait_on_mainloop = [false, 0].taint
+
+    @threadgroup  = ThreadGroup.new
+
+    @pseudo_toplevel = [false, nil]
+
+    @cmd_queue = Queue.new
+
+=begin
+    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
+
+    @threadgroup.add @cmd_receiver
+    @threadgroup.add @receiver_watchdog
+
+    @threadgroup.enclose
+=end
+    @@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
+
+    @@IP_TABLE[@threadgroup] = self
+    _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
+    @@TK_TABLE_LIST.size.times{ 
+      (tbl = {}).tainted? || tbl.taint
+      @tk_table_list << tbl
+    }
+
+    class << self
+      undef :instance_eval
+    end
+
+    # dummy call for initialization
+    self.eval_proc{ Tk.tk_call('set', 'tcl_patchLevel') }
+
+    self.freeze  # defend against modification
+  end
+
+  ######################################
+
+  def _default_delete_hook(slave)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @slave_ip_tbl.delete(slave)
+    top = @slave_ip_top.delete(slave)
+    if top.kind_of?(String)
+      # call default hook of safetk.tcl (ignore exceptions)
+      if top == ''
+        begin
+          @interp._eval("::safe::disallowTk #{slave}")
+        rescue
+          warn("Waring: fail to call '::safe::disallowTk'") if $DEBUG
+        end
+      else # toplevel path
+        begin
+          @interp._eval("::safe::tkDelete {} #{top} #{slave}")
+        rescue
+          warn("Waring: fail to call '::safe::tkDelete'") if $DEBUG
+          begin
+            @interp._eval("destroy #{top}")
+          rescue
+            warn("Waring: fail to destroy toplevel") if $DEBUG
+          end
+        end
+      end
+    end
+  end
+
+end
+
+
+# get target IP
+class MultiTkIp
+  def self._ip_id_
+    __getip._ip_id_
+  end
+  def _ip_id_
+    # for RemoteTkIp
+    ''
+  end
+
+  def self.__getip
+    current = Thread.current
+    if TclTkLib.mainloop_thread? != false && current['callback_ip']
+      return current['callback_ip']
+    end
+    if current.group == ThreadGroup::Default
+      @@DEFAULT_MASTER
+    else
+      ip = @@IP_TABLE[current.group]
+      unless ip
+        fail SecurityError, 
+          "cannot call Tk methods on #{Thread.current.inspect}"
+      end
+      ip
+    end
+  end
+end
+
+
+# aliases of constructor
+class << MultiTkIp
+  alias __new new
+  private :__new
+
+
+  def new_master(safe=nil, keys={})
+    if safe.kind_of?(Hash)
+      keys = safe
+    elsif safe.kind_of?(Integer)
+      raise ArgumentError, "unexpected argument(s)" unless keys.kind_of?(Hash)
+      if !keys.key?(:safe) && !keys.key?('safe')
+        keys[:safe] = safe
+      end
+    elsif safe == nil
+      # do nothing
+    else
+      raise ArgumentError, "unexpected argument(s)"
+    end
+
+    ip = __new(__getip, nil, keys)
+    #ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
+     if block_given?
+       Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
+     end
+    ip
+  end
+
+  alias new new_master
+
+  def new_slave(safe=nil, keys={})
+    if safe.kind_of?(Hash)
+      keys = safe
+    elsif safe.kind_of?(Integer)
+      raise ArgumentError, "unexpected argument(s)" unless keys.kind_of?(Hash)
+      if !keys.key?(:safe) && !keys.key?('safe')
+        keys[:safe] = safe
+      end
+    elsif safe == nil
+      # do nothing
+    else
+      raise ArgumentError, "unexpected argument(s)"
+    end
+
+    ip = __new(__getip, false, keys)
+    # ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
+    if block_given?
+      Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
+    end
+    ip
+  end
+  alias new_trusted_slave new_slave
+
+  def new_safe_slave(safe=4, keys={})
+    if safe.kind_of?(Hash)
+      keys = safe
+    elsif safe.kind_of?(Integer)
+      raise ArgumentError, "unexpected argument(s)" unless keys.kind_of?(Hash)
+      if !keys.key?(:safe) && !keys.key?('safe')
+        keys[:safe] = safe
+      end
+    else
+      raise ArgumentError, "unexpected argument(s)"
+    end
+
+    ip = __new(__getip, true, keys)
+    # ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call) if block_given?
+    if block_given?
+      Thread.new{ip.eval_proc(proc{$SAFE=ip.safe_level; Proc.new}.call)}
+    end
+    ip
+  end
+  alias new_safeTk new_safe_slave
+end
+
+
+# get info
+class MultiTkIp
+  def inspect
+    s = self.to_s.chop!
+    if self.manipulable?
+      if master?
+        if @interp.deleted?
+          s << ':deleted-master'
+        else
+          s << ':master'
+        end
+      else
+        if @interp.deleted?
+          s << ':deleted-slave'
+        elsif @interp.safe?
+          s << ':safe-slave'
+        else
+          s << ':trusted-slave'
+        end
+      end
+    end
+    s << '>'
+  end
+
+  def master?
+    if @ip_name
+      false
+    else
+      true
+    end
+  end
+  def self.master?
+    __getip.master?
+  end
+
+  def slave?
+    not master?
+  end
+  def self.slave?
+    not self.master?
+  end
+
+  def alive?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    begin
+      return false unless @cmd_receiver.alive?
+      return false if @interp.deleted?
+      return false if @interp._invoke('interp', 'exists', '') == '0'
+    rescue Exception
+      return false
+    end
+    true
+  end
+  def self.alive?
+    __getip.alive?
+  end
+
+  def path
+    @ip_name || ''
+  end
+  def self.path
+    __getip.path
+  end
+  def ip_name
+    @ip_name || ''
+  end
+  def self.ip_name
+    __getip.ip_name
+  end
+  def to_eval
+    @ip_name || ''
+  end
+  def self.to_eval
+    __getip.to_eval
+  end
+
+  def slaves(all = false)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp','slaves').split.map!{|name| 
+      if @slave_ip_tbl.key?(name)
+        @slave_ip_tbl[name]
+      elsif all
+        name
+      else
+        nil
+      end
+    }.compact!
+  end
+  def self.slaves(all = false)
+    __getip.slaves(all)
+  end
+
+  def manipulable?
+    return true if (Thread.current.group == ThreadGroup::Default)
+    ip = MultiTkIp.__getip
+    (ip == self) || ip._is_master_of?(@interp)
+  end
+  def self.manipulable?
+    true
+  end
+
+  def _is_master_of?(tcltkip_obj)
+    tcltkip_obj.slave_of?(@interp)
+  end
+  protected :_is_master_of?
+end
+
+
+# instance methods to treat tables
+class MultiTkIp
+  def _tk_cmd_tbl
+    tbl = {}
+    MultiTkIp.tk_cmd_tbl.each{|id, ent| tbl[id] = ent if ent.ip == self }
+    tbl
+  end
+
+  def _tk_windows
+    @tk_windows
+  end
+
+  def _tk_table_list
+    @tk_table_list
+  end
+
+  def _add_new_tables
+    (@@TK_TABLE_LIST.size - @tk_table_list.size).times{ 
+      (tbl = {}).tainted? || tbl.taint
+      @tk_table_list << tbl
+    }
+  end
+
+  def _init_ip_env(script)
+    self.eval_proc{script.call(self)}
+  end
+
+  def _add_tk_procs(name, args, body)
+    return if slave?
+    @interp._invoke('proc', name, args, body) if args && body
+    @interp._invoke('interp', 'slaves').split.each{|slave|
+      @interp._invoke('interp', 'alias', slave, name, '', name)
+    }
+  end
+
+  def _remove_tk_procs(*names)
+    return if slave?
+    names.each{|name|
+      name = name.to_s
+      @interp._invoke('rename', name, '')
+      @interp._invoke('interp', 'slaves').split.each{|slave|
+        @interp._invoke('interp', 'alias', slave, name, '') rescue nil
+      }
+    }
+  end
+
+  def _init_ip_internal(init_ip_env, add_tk_procs)
+    #init_ip_env.each{|script| self.eval_proc{script.call(self)}}
+    init_ip_env.each{|script| self._init_ip_env(script)}
+    add_tk_procs.each{|name, args, body| 
+      if master?
+        @interp._invoke('proc', name, args, body) if args && body
+      else
+        @set_alias_proc.call(name)
+      end
+    }
+  end
+end
+
+
+# class methods to treat tables
+class MultiTkIp
+  def self.tk_cmd_tbl
+    @@TK_CMD_TBL
+  end
+  def self.tk_windows
+    __getip._tk_windows
+  end
+  def self.tk_object_table(id)
+    __getip._tk_table_list[id]
+  end
+  def self.create_table
+    if __getip.slave? 
+      begin
+        raise SecurityError, "slave-IP has no permission creating a new table"
+      rescue SecurityError => e
+        #p e.backtrace
+        # Is called on a Ruby/Tk library?
+        caller_info = e.backtrace[1]
+        if caller_info =~ %r{^#{MultiTkIp::BASE_DIR}/(tk|tkextlib)/[^:]+\.rb:}
+          # Probably, caller is a Ruby/Tk library  -->  allow creating
+        else
+          raise e
+        end
+      end
+    end
+
+    id = @@TK_TABLE_LIST.size
+    obj = Object.new
+    @@TK_TABLE_LIST << obj
+    obj.instance_eval <<-EOD
+      def self.method_missing(m, *args)
+         MultiTkIp.tk_object_table(#{id}).__send__(m, *args)
+      end
+    EOD
+    obj.freeze
+    @@IP_TABLE.each{|tg, ip| ip._add_new_tables }
+    return obj
+  end
+
+  def self.init_ip_env(script = Proc.new)
+    @@INIT_IP_ENV << script
+    if __getip.slave?
+      begin
+        raise SecurityError, "slave-IP has no permission initializing IP env"
+      rescue SecurityError => e
+        #p e.backtrace
+        # Is called on a Ruby/Tk library?
+        caller_info = e.backtrace[1]
+        if caller_info =~ %r{^#{MultiTkIp::BASE_DIR}/(tk|tkextlib)/[^:]+\.rb:}
+          # Probably, caller is a Ruby/Tk library  -->  allow creating
+        else
+          raise e
+        end
+      end
+    end
+
+    # @@IP_TABLE.each{|tg, ip| 
+    #   ip._init_ip_env(script)
+    # }
+    @@DEFAULT_MASTER.__init_ip_env__(@@IP_TABLE, script)
+  end
+
+  def self.add_tk_procs(name, args=nil, body=nil)
+    if name.kind_of?(Array) # => an array of [name, args, body]
+      name.each{|param| self.add_tk_procs(*param)}
+    else
+      name = name.to_s
+      @@ADD_TK_PROCS << [name, args, body]
+      @@IP_TABLE.each{|tg, ip| 
+        ip._add_tk_procs(name, args, body)
+      }
+    end
+  end
+
+  def self.remove_tk_procs(*names)
+    names.each{|name|
+      name = name.to_s
+      @@ADD_TK_PROCS.delete_if{|elem| 
+        elem.kind_of?(Array) && elem[0].to_s == name
+      }
+    }
+    @@IP_TABLE.each{|tg, ip| 
+      ip._remove_tk_procs(*names)
+    }
+  end
+
+  def self.init_ip_internal
+    __getip._init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
+  end
+end
+
+
+# for callback operation
+class MultiTkIp
+  def self.cb_entry_class
+    @@CB_ENTRY_CLASS
+  end
+  def self.get_cb_entry(cmd)
+    @@CB_ENTRY_CLASS.new(__getip, cmd).freeze
+  end
+
+=begin
+  def cb_eval(cmd, *args)
+    #self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
+    #ret = self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
+    ret = self.eval_callback(*args){|safe, *params|
+      $SAFE=safe if $SAFE < safe
+      TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
+    }
+    if ret.kind_of?(Exception)
+      raise ret
+    end
+    ret
+  end
+=end
+  def cb_eval(cmd, *args)
+    self.eval_callback(*args){|safe, *params|
+      $SAFE=safe if $SAFE < safe
+      # TkUtil.eval_cmd(cmd, *params)
+      TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
+    }
+  end
+=begin
+  def cb_eval(cmd, *args)
+    @callback_status[0] ||= TkVariable.new
+    @callback_status[1] ||= TkVariable.new
+    st, val = @callback_status
+    th = Thread.new{
+      self.eval_callback(*args){|safe, *params|
+        #p [status, val, safe, *params]
+        $SAFE=safe if $SAFE < safe
+        begin
+          TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
+        rescue TkCallbackContinue
+          st.value = 4
+        rescue TkCallbackBreak
+          st.value = 3
+        rescue TkCallbackReturn
+          st.value = 2
+        rescue Exception => e
+          val.value = e.message
+          st.value = 1
+        else
+          st.value = 0
+        end
+      }
+    }
+    begin
+      st.wait
+      status = st.numeric
+      retval = val.value
+    rescue => e
+      fail e
+    end
+
+    if status == 1
+      fail RuntimeError, retval
+    elsif status == 2
+      fail TkCallbackReturn, "Tk callback returns 'return' status"
+    elsif status == 3
+      fail TkCallbackBreak, "Tk callback returns 'break' status"
+    elsif status == 4
+      fail TkCallbackContinue, "Tk callback returns 'continue' status"
+    else
+      ''
+    end
+  end
+=end
+
+end
+
+# pseudo-toplevel operation support
+class MultiTkIp
+  # instance method
+  def __pseudo_toplevel
+    ip = MultiTkIp.__getip
+    (ip == @@DEFAULT_MASTER || ip == self) &&
+      self.__pseudo_toplevel_evaluable? && @pseudo_toplevel[1]
+  end
+
+  def __pseudo_toplevel=(m)
+    unless (Thread.current.group == ThreadGroup::Default && 
+              MultiTkIp.__getip == @@DEFAULT_MASTER)
+      fail SecurityError, "no permission to manipulate"
+    end
+
+    # if m.kind_of?(Module) && m.respond_to?(:pseudo_toplevel_evaluable?)
+    if m.respond_to?(:pseudo_toplevel_evaluable?)
+      @pseudo_toplevel[0] = true
+      @pseudo_toplevel[1] = m
+    else
+      fail ArgumentError, 'fail to set pseudo-toplevel'
+    end
+    self
+  end
+
+  def __pseudo_toplevel_evaluable?
+    begin
+      @pseudo_toplevel[0] && @pseudo_toplevel[1].pseudo_toplevel_evaluable?
+    rescue Exception
+      false
+    end
+  end
+
+  def __pseudo_toplevel_evaluable=(mode)
+    unless (Thread.current.group == ThreadGroup::Default && 
+              MultiTkIp.__getip == @@DEFAULT_MASTER)
+      fail SecurityError, "no permission to manipulate"
+    end
+
+    @pseudo_toplevel[0] = (mode)? true: false
+  end
+end
+
+# evaluate a procedure on the proper interpreter
+class MultiTkIp
+  # instance method
+  def eval_proc_core(req_val, cmd, *args)
+    # check
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    unless cmd.kind_of?(Proc) || cmd.kind_of?(Method)
+      raise RuntimeError, "A Proc/Method object is expected for the 'cmd' argument"
+    end
+
+    # on IP thread
+    if @cmd_receiver == Thread.current || 
+        (!req_val && TclTkLib.mainloop_thread? != false) # callback
+      begin
+        ret = cmd.call(safe_level, *args)
+      rescue SystemExit => e
+        # exit IP
+        warn("Warning: "+ $! + " on " + self.inspect) if $DEBUG
+        begin
+          self._eval_without_enc('exit')
+        rescue Exception
+        end
+        self.delete
+        ret = nil
+      rescue Exception => e
+        if $DEBUG
+          warn("Warning: " + e.class.inspect + 
+               ((e.message.length > 0)? ' "' + e.message + '"': '') +  
+               " on " + self.inspect)
+        end
+=begin
+        begin
+          bt = _toUTF8(e.backtrace.join("\n"))
+          bt.instance_variable_set(:@encoding, 'utf-8')
+        rescue Exception
+          bt = e.backtrace.join("\n")
+        end
+        begin
+          @interp._set_global_var('errorInfo', bt)
+        rescue Exception
+        end
+=end
+        ret = e
+      end
+      return ret
+    end
+
+    # send cmd to the proc-queue
+    unless req_val
+      begin
+        @cmd_queue.enq([nil, cmd, *args])
+      rescue Exception => e
+        # ignore
+        if $DEBUG
+          warn("Warning: " + e.class.inspect + 
+               ((e.message.length > 0)? ' "' + e.message + '"': '') +  
+               " on " + self.inspect) 
+        end
+        return e
+      end
+      return nil
+    end
+
+    # send and get return value by exception
+    begin
+      @cmd_queue.enq([Thread.current, cmd, *args])
+      Thread.stop
+    rescue MultiTkIp_OK => ret
+      # return value
+      return ret.value
+    rescue SystemExit => e
+      # exit IP
+      warn("Warning: " + $! + " on " + self.inspect) if $DEBUG
+      begin
+        self._eval_without_enc('exit')
+      rescue Exception
+      end
+      if !self.deleted? && !safe? && allow_ruby_exit?
+        self.delete
+        fail e
+      else
+        self.delete
+      end
+    rescue Exception => e
+      if $DEBUG
+        warn("Warning: " + e.class.inspect + 
+             ((e.message.length > 0)? ' "' + e.message + '"': '') +  
+             " on " + self.inspect) 
+      end
+      return e
+    end
+    return nil
+  end
+  private :eval_proc_core
+
+  def eval_callback(*args)
+    if block_given?
+      cmd = Proc.new
+    else
+      cmd = args.shift
+    end
+    current = Thread.current
+    backup_ip = current['callback_ip']
+    current['callback_ip'] = self
+    begin
+      eval_proc_core(false, cmd, *args)
+    ensure
+      current['callback_ip'] = backup_ip
+    end
+  end
+
+  def eval_proc(*args)
+    # The scope of the eval-block of 'eval_proc' method is different from 
+    # the external. If you want to pass local values to the eval-block, 
+    # use arguments of eval_proc method. They are passed to block-arguments.
+    if block_given?
+      cmd = Proc.new
+    else
+      unless (cmd = args.shift)
+        fail ArgumentError, "A Proc or Method object is expected for 1st argument"
+      end
+    end
+    if TclTkLib.mainloop_thread? == true
+      # call from eventloop
+      current = Thread.current
+      backup_ip = current['callback_ip']
+      current['callback_ip'] = self
+      begin
+        eval_proc_core(false, 
+	               proc{|safe, *params|
+		         $SAFE=safe if $SAFE < safe
+                         cmd.call(*params)
+                       }, *args)
+      ensure
+        current['callback_ip'] = backup_ip
+      end
+    else
+      eval_proc_core(true, 
+                     proc{|safe, *params| 
+                       $SAFE=safe if $SAFE < safe
+                       Thread.new(*params, &cmd).value
+                     },
+                     *args)
+    end
+  end
+  alias call eval_proc
+
+  def bg_eval_proc(*args)
+    if block_given?
+      cmd = Proc.new
+    else
+      unless (cmd = args.shift)
+        fail ArgumentError, "A Proc or Method object is expected for 1st argument"
+      end
+    end
+    Thread.new{
+      eval_proc(cmd, *args)
+=begin
+      eval_proc_core(false, 
+                     proc{|safe, *params| 
+                       $SAFE=safe if $SAFE < safe
+                       Thread.new(*params, &cmd).value
+                     },
+                     safe_level, *args)
+=end
+    }
+  end
+  alias background_eval_proc bg_eval_proc
+  alias thread_eval_proc bg_eval_proc
+  alias bg_call bg_eval_proc
+  alias background_call bg_eval_proc
+
+  def eval_string(cmd, *eval_args)
+    # cmd string ==> proc
+    unless cmd.kind_of?(String)
+      raise RuntimeError, "A String object is expected for the 'cmd' argument"
+    end
+
+    eval_proc_core(true, 
+                   proc{|safe| 
+                     Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
+                                 *eval_args)
+                   })
+  end
+  alias eval_str eval_string
+
+  def bg_eval_string(cmd, *eval_args)
+    # cmd string ==> proc
+    unless cmd.kind_of?(String)
+      raise RuntimeError, "A String object is expected for the 'cmd' argument"
+    end
+    Thread.new{
+      eval_proc_core(true, 
+                     proc{|safe| 
+                       Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
+                                   *eval_args)
+                     })
+    }
+  end
+  alias background_eval_string bg_eval_string
+  alias bg_eval_str bg_eval_string
+  alias background_eval_str bg_eval_string
+
+  def eval(*args, &blk)
+    if block_given?
+      eval_proc(*args, &blk)
+    elsif args[0]
+      if args[0].respond_to?(:call)
+        eval_proc(*args)
+      else
+        eval_string(*args)
+      end
+    else
+      fail ArgumentError, "no argument to eval"
+    end
+  end
+
+  def bg_eval(*args, &blk)
+    if block_given?
+      bg_eval_proc(*args, &blk)
+    elsif args[0]
+      if args[0].respond_to?(:call)
+        bg_eval_proc(*args)
+      else
+        bg_eval_string(*args)
+      end
+    else
+      fail ArgumentError, "no argument to eval"
+    end
+  end
+  alias background_eval bg_eval
+end
+
+class << MultiTkIp
+  # class method
+  def eval_proc(*args, &blk)
+    # class ==> interp object
+    __getip.eval_proc(*args, &blk)
+  end
+  alias call eval_proc
+
+  def bg_eval_proc(*args, &blk)
+    # class ==> interp object
+    __getip.bg_eval_proc(*args, &blk)
+  end
+  alias background_eval_proc bg_eval_proc
+  alias thread_eval_proc bg_eval_proc
+  alias bg_call bg_eval_proc
+  alias background_call bg_eval_proc
+
+  def eval_string(cmd, *eval_args)
+    # class ==> interp object
+    __getip.eval_string(cmd, *eval_args)
+  end
+  alias eval_str eval_string
+
+  def bg_eval_string(cmd, *eval_args)
+    # class ==> interp object
+    __getip.bg_eval_string(cmd, *eval_args)
+  end
+  alias background_eval_string bg_eval_string
+  alias bg_eval_str bg_eval_string
+  alias background_eval_str bg_eval_string
+
+  def eval(*args, &blk)
+    # class ==> interp object
+    __getip.eval(*args, &blk)
+  end
+  def bg_eval(*args, &blk)
+    # class ==> interp object
+    __getip.bg_eval(*args, &blk)
+  end
+  alias background_eval bg_eval
+end
+
+
+# event loop
+# all master/slave IPs are controled by only one event-loop
+class << MultiTkIp
+  def mainloop(check_root = true)
+    __getip.mainloop(check_root)
+  end
+  def mainloop_watchdog(check_root = true)
+    __getip.mainloop_watchdog(check_root)
+  end
+  def do_one_event(flag = TclTkLib::EventFlag::ALL)
+    __getip.do_one_event(flag)
+  end
+  def mainloop_abort_on_exception
+    # __getip.mainloop_abort_on_exception
+    TclTkLib.mainloop_abort_on_exception
+  end
+  def mainloop_abort_on_exception=(mode)
+    # __getip.mainloop_abort_on_exception=(mode)
+    TclTkLib.mainloop_abort_on_exception=(mode)
+  end
+  def set_eventloop_tick(tick)
+    __getip.set_eventloop_tick(tick)
+  end
+  def get_eventloop_tick
+    __getip.get_eventloop_tick
+  end
+  def set_no_event_wait(tick)
+    __getip.set_no_event_wait(tick)
+  end
+  def get_no_event_wait
+    __getip.get_no_event_wait
+  end
+  def set_eventloop_weight(loop_max, no_event_tick)
+    __getip.set_eventloop_weight(loop_max, no_event_tick)
+  end
+  def get_eventloop_weight
+    __getip.get_eventloop_weight
+  end
+end
+
+# class methods to delegate to TclTkIp
+class << MultiTkIp
+  def method_missing(id, *args)
+    __getip.__send__(id, *args)
+  end
+
+  def make_safe
+    __getip.make_safe
+  end
+
+  def safe?
+    __getip.safe?
+  end
+
+  def safe_base?
+    begin
+      __getip.safe_base?
+    rescue
+      false
+    end
+  end
+
+  def allow_ruby_exit?
+    __getip.allow_ruby_exit?
+  end
+
+  def allow_ruby_exit= (mode)
+    __getip.allow_ruby_exit = mode
+  end
+
+  def delete
+    __getip.delete
+  end
+
+  def deleted?
+    __getip.deleted?
+  end
+
+  def has_mainwindow?
+    __getip.has_mainwindow?
+  end
+
+  def invalid_namespace?
+    __getip.invalid_namespace?
+  end
+
+  def abort(msg = nil)
+    __getip.abort(msg)
+  end
+
+  def exit(st = true)
+    __getip.exit(st)
+  end
+
+  def exit!(st = false)
+    __getip.exit!(st)
+  end
+
+  def restart(app_name = nil, keys = {})
+    init_ip_internal
+
+    __getip._invoke('set', 'argv0', app_name) if app_name
+    if keys.kind_of?(Hash)
+      __getip._invoke('set', 'argv', _keys2opts(keys))
+    end
+
+    __getip.restart
+  end
+
+  def _eval(str)
+    __getip._eval(str)
+  end
+
+  def _invoke(*args)
+    __getip._invoke(*args)
+  end
+
+  def _eval_without_enc(str)
+    __getip._eval_without_enc(str)
+  end
+
+  def _invoke_without_enc(*args)
+    __getip._invoke_without_enc(*args)
+  end
+
+  def _eval_with_enc(str)
+    __getip._eval_with_enc(str)
+  end
+
+  def _invoke_with_enc(*args)
+    __getip._invoke_with_enc(*args)
+  end
+
+  def _toUTF8(str, encoding=nil)
+    __getip._toUTF8(str, encoding)
+  end
+
+  def _fromUTF8(str, encoding=nil)
+    __getip._fromUTF8(str, encoding)
+  end
+
+  def _thread_vwait(var)
+    __getip._thread_vwait(var)
+  end
+
+  def _thread_tkwait(mode, target)
+    __getip._thread_tkwait(mode, target)
+  end
+
+  def _return_value
+    __getip._return_value
+  end
+
+  def _get_variable(var, flag)
+    __getip._get_variable(var, flag)
+  end
+  def _get_variable2(var, idx, flag)
+    __getip._get_variable2(var, idx, flag)
+  end
+  def _set_variable(var, value, flag)
+    __getip._set_variable(var, value, flag)
+  end
+  def _set_variable2(var, idx, value, flag)
+    __getip._set_variable2(var, idx, value, flag)
+  end
+  def _unset_variable(var, flag)
+    __getip._unset_variable(var, flag)
+  end
+  def _unset_variable2(var, idx, flag)
+    __getip._unset_variable2(var, idx, flag)
+  end
+
+  def _get_global_var(var)
+    __getip._get_global_var(var)
+  end
+  def _get_global_var2(var, idx)
+    __getip._get_global_var2(var, idx)
+  end
+  def _set_global_var(var, value)
+    __getip._set_global_var(var, value)
+  end
+  def _set_global_var2(var, idx, value)
+    __getip._set_global_var2(var, idx, value)
+  end
+  def _unset_global_var(var)
+    __getip._unset_global_var(var)
+  end
+  def _unset_global_var2(var, idx)
+    __getip._unset_global_var2(var, idx)
+  end
+
+  def _make_menu_embeddable(menu_path)
+    __getip._make_menu_embeddable(menu_path)
+  end
+
+  def _split_tklist(str)
+    __getip._split_tklist(str)
+  end
+  def _merge_tklist(*args)
+    __getip._merge_tklist(*args)
+  end
+  def _conv_listelement(arg)
+    __getip._conv_listelement(arg)
+  end
+
+  def _create_console
+    __getip._create_console
+  end
+end
+
+
+# wrap methods on TclTkLib : not permit calling TclTkLib module methods
+class << TclTkLib
+  def mainloop(check_root = true)
+    MultiTkIp.mainloop(check_root)
+  end
+  def mainloop_watchdog(check_root = true)
+    MultiTkIp.mainloop_watchdog(check_root)
+  end
+  def do_one_event(flag = TclTkLib::EventFlag::ALL)
+    MultiTkIp.do_one_event(flag)
+  end
+  #def mainloop_abort_on_exception
+  #  MultiTkIp.mainloop_abort_on_exception
+  #end
+  #def mainloop_abort_on_exception=(mode)
+  #  MultiTkIp.mainloop_abort_on_exception=(mode)
+  #end
+  def set_eventloop_tick(tick)
+    MultiTkIp.set_eventloop_tick(tick)
+  end
+  def get_eventloop_tick
+    MultiTkIp.get_eventloop_tick
+  end
+  def set_no_event_wait(tick)
+    MultiTkIp.set_no_event_wait(tick)
+  end
+  def get_no_event_wait
+    MultiTkIp.get_no_event_wait
+  end
+  def set_eventloop_weight(loop_max, no_event_tick)
+    MultiTkIp.set_eventloop_weight(loop_max, no_event_tick)
+  end
+  def get_eventloop_weight
+    MultiTkIp.get_eventloop_weight
+  end
+  def restart(*args)
+    MultiTkIp.restart(*args)
+  end
+
+  def _merge_tklist(*args)
+    MultiTkIp._merge_tklist(*args)
+  end
+  def _conv_listelement(arg)
+    MultiTkIp._conv_listelement(arg)
+  end
+end
+
+
+# depend on TclTkIp
+class MultiTkIp
+  def mainloop(check_root = true, restart_on_dead = true)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    #return self if self.slave?
+    #return self if self != @@DEFAULT_MASTER
+    if self != @@DEFAULT_MASTER
+      if @wait_on_mainloop[0]
+        begin
+          @wait_on_mainloop[1] += 1
+          if $SAFE >= 4
+	    _receiver_mainloop(check_root).join
+          else
+            @cmd_queue.enq([@system, 'call_mainloop', 
+                            Thread.current, check_root])
+            Thread.stop
+          end
+        rescue MultiTkIp_OK => ret
+          # return value
+          if ret.value.kind_of?(Thread)
+            return ret.value.value
+          else
+            return ret.value
+          end
+        rescue SystemExit => e
+          # exit IP
+          warn("Warning: " + $! + " on " + self.inspect) if $DEBUG
+          begin
+            self._eval_without_enc('exit')
+          rescue Exception
+          end
+          self.delete
+        rescue StandardError => e
+          if $DEBUG
+            warn("Warning: " + e.class.inspect + 
+                 ((e.message.length > 0)? ' "' + e.message + '"': '') +  
+                 " on " + self.inspect) 
+          end
+          return e
+        rescue Exception => e
+	  return e
+        ensure
+          @wait_on_mainloop[1] -= 1
+        end
+      end
+      return
+    end
+
+    unless restart_on_dead
+      @wait_on_mainloop[1] += 1
+=begin
+      begin
+        @interp.mainloop(check_root)
+      rescue StandardError => e
+        if $DEBUG
+          warn("Warning: " + e.class.inspect + 
+               ((e.message.length > 0)? ' "' + e.message + '"': '') +  
+               " on " + self.inspect) 
+        end
+      end
+=end
+      begin
+	@interp.mainloop(check_root)
+      ensure
+	@wait_on_mainloop[1] -= 1
+      end
+    else
+      loop do
+        break unless self.alive?
+        if check_root
+          begin
+            break if TclTkLib.num_of_mainwindows == 0
+          rescue StandardError
+            break
+          end
+        end
+        break if @interp.deleted?
+        begin
+	  @wait_on_mainloop[1] += 1
+          @interp.mainloop(check_root)
+        rescue StandardError => e
+          if TclTkLib.mainloop_abort_on_exception != nil
+            #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect, 
+            #             " exception (ignore) : ", $!.message, "\n");
+            if $DEBUG
+              warn("Warning: Tk mainloop receives " << e.class.inspect <<
+                   " exception (ignore) : " << e.message);
+            end
+          end
+          #raise e
+        rescue Exception => e
+=begin
+          if TclTkLib.mainloop_abort_on_exception != nil
+            #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect, 
+            #             " exception (ignore) : ", $!.message, "\n");
+            if $DEBUG
+              warn("Warning: Tk mainloop receives " << e.class.inspect <<
+                   " exception (ignore) : " << e.message);
+            end
+          end
+=end
+          raise e
+        ensure
+          @wait_on_mainloop[1] -= 1
+          Thread.pass  # avoid eventloop conflict
+        end
+      end
+    end
+    self
+  end
+
+  def make_safe
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.make_safe
+  end
+
+  def safe?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.safe?
+  end
+
+  def safe_base?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @safe_base
+  end
+
+  def allow_ruby_exit?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.allow_ruby_exit?
+  end
+
+  def allow_ruby_exit= (mode)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.allow_ruby_exit = mode
+  end
+
+  def delete
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @slave_ip_tbl.each{|name, subip|
+      _destroy_slaves_of_slaveIP(subip)
+=begin
+      begin
+        subip._invoke('destroy', '.') unless subip.deleted?
+      rescue Exception
+      end
+=end
+      begin
+        # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
+	unless subip.deleted?
+	  after_ids = subip._eval_without_enc("after info")
+	  subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+	end
+      rescue Exception
+      end
+
+      # safe_base?
+      if @interp._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
+        begin
+          @interp._eval_without_enc("::safe::interpDelete #{name}")
+        rescue Exception
+        else
+          next if subip.deleted?
+        end
+      end
+      if subip.respond_to?(:safe_base?) && subip.safe_base? && 
+          !subip.deleted?
+        # do 'exit' to call the delete_hook procedure
+        begin
+          subip._eval_without_enc('exit') 
+        rescue Exception
+        end
+      else
+        begin
+          subip.delete unless subip.deleted?
+        rescue Exception
+        end
+      end
+    }
+
+    begin
+      # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
+      after_ids = @interp._eval_without_enc("after info")
+      @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+    rescue Exception
+    end
+
+    begin
+      @interp._invoke('destroy', '.') unless @interp.deleted?
+    rescue Exception
+    end
+
+    if @safe_base && !@interp.deleted?
+      # do 'exit' to call the delete_hook procedure
+      @interp._eval_without_enc('exit')
+    end
+    @interp.delete
+    self
+  end
+
+  def deleted?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.deleted?
+  end
+
+  def has_mainwindow?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.has_mainwindow?
+  end
+
+  def invalid_namespace?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.invalid_namespace?
+  end
+
+  def abort(msg = nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if master? && !safe? && allow_ruby_exit?
+      if msg
+        Kernel.abort(msg)
+      else
+        Kernel.abort
+      end
+    else
+      # ignore msg
+      delete
+      1
+    end
+  end
+
+  def exit(st = true)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if master? && !safe? && allow_ruby_exit?
+      Kernel.exit(st)
+    else
+      delete
+      st
+    end
+  end
+
+  def exit!(st = false)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if master? && !safe? && allow_ruby_exit?
+      Kernel.exit!(st)
+    else
+      delete
+      st
+    end
+  end
+
+  def restart(app_name = nil, keys = {})
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
+
+    @interp._invoke('set', 'argv0', app_name) if app_name
+    if keys.kind_of?(Hash)
+      @interp._invoke('set', 'argv', _keys2opts(keys))
+    end
+
+    @interp.restart
+  end
+
+  def __eval(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.__eval(str)
+  end
+
+  def __invoke(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.__invoke(*args)
+  end
+
+  def _eval(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._eval(str)
+  end
+
+  def _invoke(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke(*args)
+  end
+
+  def _eval_without_enc(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._eval_without_enc(str)
+  end
+
+  def _invoke_without_enc(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke_without_enc(*args)
+  end
+
+  def _eval_with_enc(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._eval_with_enc(str)
+  end
+
+  def _invoke_with_enc(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke_with_enc(*args)
+  end
+
+  def _toUTF8(str, encoding=nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._toUTF8(str, encoding)
+  end
+
+  def _fromUTF8(str, encoding=nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._fromUTF8(str, encoding)
+  end
+
+  def _thread_vwait(var)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._thread_vwait(var)
+  end
+
+  def _thread_tkwait(mode, target)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._thread_tkwait(mode, target)
+  end
+
+  def _return_value
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._return_value
+  end
+
+  def _get_variable(var, flag)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._get_variable(var, flag)
+  end
+  def _get_variable2(var, idx, flag)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._get_variable2(var, idx, flag)
+  end
+  def _set_variable(var, value, flag)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._set_variable(var, value, flag)
+  end
+  def _set_variable2(var, idx, value, flag)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._set_variable2(var, idx, value, flag)
+  end
+  def _unset_variable(var, flag)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._unset_variable(var, flag)
+  end
+  def _unset_variable2(var, idx, flag)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._unset_variable2(var, idx, flag)
+  end
+
+  def _get_global_var(var)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._get_global_var(var)
+  end
+  def _get_global_var2(var, idx)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._get_global_var2(var, idx)
+  end
+  def _set_global_var(var, value)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._set_global_var(var, value)
+  end
+  def _set_global_var2(var, idx, value)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._set_global_var2(var, idx, value)
+  end
+  def _unset_global_var(var)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._unset_global_var(var)
+  end
+  def _unset_global_var2(var, idx)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._unset_global_var2(var, idx)
+  end
+
+  def _make_menu_embeddable(menu_path)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._make_menu_embeddable(menu_path)
+  end
+
+  def _split_tklist(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._split_tklist(str)
+  end
+  def _merge_tklist(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._merge_tklist(*args)
+  end
+  def _conv_listelement(arg)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._conv_listelement(arg)
+  end
+end
+
+
+# interp command support
+class MultiTkIp
+  def _lst2ary(str)
+    return [] if str == ""
+    idx = str.index('{')
+    while idx and idx > 0 and str[idx-1] == ?\\
+      idx = str.index('{', idx+1)
+    end
+    return str.split unless idx
+
+    list = str[0,idx].split
+    str = str[idx+1..-1]
+    i = -1
+    brace = 1
+    str.each_byte {|c|
+      i += 1
+      brace += 1 if c == ?{
+      brace -= 1 if c == ?}
+      break if brace == 0
+    }
+    if i == 0
+      list.push ''
+    elsif str[0, i] == ' '
+      list.push ' '
+    else
+      list.push str[0..i-1]
+    end
+    #list += _lst2ary(str[i+1..-1])
+    list.concat(_lst2ary(str[i+1..-1]))
+    list
+  end
+  private :_lst2ary
+
+  def _slavearg(slave)
+    if slave.kind_of?(MultiTkIp)
+      slave.path
+    elsif slave.kind_of?(String)
+      slave
+    else
+      slave.to_s
+    end
+  end
+  private :_slavearg
+
+  def alias_info(slave, cmd_name)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    _lst2ary(@interp._invoke('interp', 'alias', _slavearg(slave), cmd_name))
+  end
+  def self.alias_info(slave, cmd_name)
+    __getip.alias_info(slave, cmd_name)
+  end
+
+  def alias_delete(slave, cmd_name)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'alias', _slavearg(slave), cmd_name, '')
+    self
+  end
+  def self.alias_delete(slave, cmd_name)
+    __getip.alias_delete(slave, cmd_name)
+    self
+  end
+
+  def def_alias(slave, new_cmd, org_cmd, *args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    ret = @interp._invoke('interp', 'alias', _slavearg(slave), new_cmd, 
+                          '', org_cmd, *args)
+    (ret == new_cmd)? self: nil
+  end
+  def self.def_alias(slave, new_cmd, org_cmd, *args)
+    ret = __getip.def_alias(slave, new_cmd, org_cmd, *args)
+    (ret == new_cmd)? self: nil
+  end
+
+  def aliases(slave = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    _lst2ary(@interp._invoke('interp', 'aliases', _slavearg(slave)))
+  end
+  def self.aliases(slave = '')
+    __getip.aliases(slave)
+  end
+
+  def delete_slaves(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    slaves = args.collect{|s| _slavearg(s)}
+    @interp._invoke('interp', 'delete', *slaves) if slaves.size > 0
+    self
+  end
+  def self.delete_slaves(*args)
+    __getip.delete_slaves(*args)
+    self
+  end
+
+  def exist?(slave = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    ret = @interp._invoke('interp', 'exists', _slavearg(slave))
+    (ret == '1')? true: false
+  end
+  def self.exist?(slave = '')
+    __getip.exist?(slave)
+  end
+
+  def delete_cmd(slave, cmd)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    slave_invoke = @interp._invoke('list', 'rename', cmd, '')
+    @interp._invoke('interp', 'eval', _slavearg(slave), slave_invoke)
+    self
+  end
+  def self.delete_cmd(slave, cmd)
+    __getip.delete_cmd(slave, cmd)
+    self
+  end
+
+  def expose_cmd(slave, cmd, aliasname = nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if aliasname
+      @interp._invoke('interp', 'expose', _slavearg(slave), cmd, aliasname)
+    else
+      @interp._invoke('interp', 'expose', _slavearg(slave), cmd)
+    end
+    self
+  end
+  def self.expose_cmd(slave, cmd, aliasname = nil)
+    __getip.expose_cmd(slave, cmd, aliasname)
+    self
+  end
+
+  def hide_cmd(slave, cmd, aliasname = nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if aliasname
+      @interp._invoke('interp', 'hide', _slavearg(slave), cmd, aliasname)
+    else
+      @interp._invoke('interp', 'hide', _slavearg(slave), cmd)
+    end
+    self
+  end
+  def self.hide_cmd(slave, cmd, aliasname = nil)
+    __getip.hide_cmd(slave, cmd, aliasname)
+    self
+  end
+
+  def hidden_cmds(slave = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    _lst2ary(@interp._invoke('interp', 'hidden', _slavearg(slave)))
+  end
+  def self.hidden_cmds(slave = '')
+    __getip.hidden_cmds(slave)
+  end
+
+  def invoke_hidden(slave, cmd, *args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+    else
+      keys = []
+    end
+    keys << _slavearg(slave)
+    if Tk::TCL_MAJOR_VERSION > 8 ||
+        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5) 
+      keys << '--'
+    end
+    keys << cmd
+    keys.concat(args)
+    @interp._invoke('interp', 'invokehidden', *keys)
+  end
+  def self.invoke_hidden(slave, cmd, *args)
+    __getip.invoke_hidden(slave, cmd, *args)
+  end
+
+  def invoke_hidden_on_global(slave, cmd, *args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+    else
+      keys = []
+    end
+    keys << _slavearg(slave)
+    keys << '-global'
+    if Tk::TCL_MAJOR_VERSION > 8 ||
+        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5) 
+      keys << '--'
+    end
+    keys << cmd
+    keys.concat(args)
+    @interp._invoke('interp', 'invokehidden', *keys)
+  end
+  def self.invoke_hidden_on_global(slave, cmd, *args)
+    __getip.invoke_hidden_on_global(slave, cmd, *args)
+  end
+
+  def invoke_hidden_on_namespace(slave, ns, cmd, *args)
+    # for Tcl8.5 or later
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+    else
+      keys = []
+    end
+    keys << _slavearg(slave)
+    keys << '-namespace' << TkComm._get_eval_string(ns)
+    keys << '--' << cmd
+    keys.concat(args)
+    @interp._invoke('interp', 'invokehidden', *keys)
+  end
+  def self.invoke_hidden_on_namespace(slave, ns, cmd, *args)
+    __getip.invoke_hidden_on_namespace(slave, ns, cmd, *args)
+  end
+
+  def mark_trusted(slave = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'marktrusted', _slavearg(slave))
+    self
+  end
+  def self.mark_trusted(slave = '')
+    __getip.mark_trusted(slave)
+    self
+  end
+
+  def set_bgerror_handler(cmd = Proc.new, slave = nil, &b)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    unless TkComm._callback_entry?(cmd)
+      if !slave && b
+        slave = cmd
+        cmd = Proc.new(&b)
+      end
+    end
+    slave = '' unless slave
+
+    @interp._invoke('interp', 'bgerror', _slavearg(slave), cmd)
+  end
+  def self.bgerror(cmd = Proc.new, slave = nil, &b)
+    __getip.bgerror(cmd, slave, &b)
+  end
+
+  def get_bgerror_handler(slave = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    procedure(@interp._invoke('interp', 'bgerror', _slavearg(slave)))
+  end
+  def self.bgerror(slave = '')
+    __getip.bgerror(slave)
+  end
+
+  def set_limit(limit_type, slave = '', opts = {})
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'limit', _slavearg(slave), limit_type, opts)
+  end
+  def self.set_limit(limit_type, slave = '', opts = {})
+    __getip.set_limit(limit_type, slave, opts)
+  end
+
+  def get_limit(limit_type, slave = '', slot = nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    if slot
+      num_or_str(@interp._invoke('interp', 'limit', _slavearg(slave), 
+                                 limit_type, slot))
+    else
+      l = @interp._split_tklist(@interp._invoke_without_enc('interp', 'limit', 
+                                                            _slavearg(slave), 
+                                                            limit_type))
+      l.map!{|s| _fromUTF8(s)}
+      r = {}
+      until l.empty?
+        key = l.shift[1..-1]
+        val = l.shift
+        val = num_or_str(val) if val
+        r[key] = val
+      end
+      r
+    end
+  end
+  def self.get_limit(limit_type, slave = '', slot = nil)
+    __getip.get_limit(limit_type, slave, slot)
+  end
+
+  def recursion_limit(slave = '', limit = None)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    number(@interp._invoke('interp', 'recursionlimit', 
+                           _slavearg(slave), limit))
+  end
+  def self.recursion_limit(slave = '', limit = None)
+    __getip.recursion_limit(slave)
+  end
+
+  def alias_target(aliascmd, slave = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'target', _slavearg(slave), aliascmd)
+  end
+  def self.alias_target(aliascmd, slave = '')
+    __getip.alias_target(aliascmd, slave)
+  end
+
+  def share_stdin(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'share', src, 'stdin', dist)
+    self
+  end
+  def self.share_stdin(dist, src = '')
+    __getip.share_stdin(dist, src)
+    self
+  end
+
+  def share_stdout(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'share', src, 'stdout', dist)
+    self
+  end
+  def self.share_stdout(dist, src = '')
+    __getip.share_stdout(dist, src)
+    self
+  end
+
+  def share_stderr(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'share', src, 'stderr', dist)
+    self
+  end
+  def self.share_stderr(dist, src = '')
+    __getip.share_stderr(dist, src)
+    self
+  end
+
+  def transfer_stdin(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'transfer', src, 'stdin', dist)
+    self
+  end
+  def self.transfer_stdin(dist, src = '')
+    __getip.transfer_stdin(dist, src)
+    self
+  end
+
+  def transfer_stdout(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'transfer', src, 'stdout', dist)
+    self
+  end
+  def self.transfer_stdout(dist, src = '')
+    __getip.transfer_stdout(dist, src)
+    self
+  end
+
+  def transfer_stderr(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'transfer', src, 'stderr', dist)
+    self
+  end
+  def self.transfer_stderr(dist, src = '')
+    __getip.transfer_stderr(dist, src)
+    self
+  end
+
+  def share_stdio(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'share', src, 'stdin',  dist)
+    @interp._invoke('interp', 'share', src, 'stdout', dist)
+    @interp._invoke('interp', 'share', src, 'stderr', dist)
+    self
+  end
+  def self.share_stdio(dist, src = '')
+    __getip.share_stdio(dist, src)
+    self
+  end
+
+  def transfer_stdio(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'transfer', src, 'stdin',  dist)
+    @interp._invoke('interp', 'transfer', src, 'stdout', dist)
+    @interp._invoke('interp', 'transfer', src, 'stderr', dist)
+    self
+  end
+  def self.transfer_stdio(dist, src = '')
+    __getip.transfer_stdio(dist, src)
+    self
+  end
+end
+
+
+# Safe Base :: manipulating safe interpreter
+class MultiTkIp
+  def safeip_configure(slot, value=None)
+    # use for '-noStatics' option ==> {statics=>false}
+    #     for '-nestedLoadOk' option ==> {nested=>true}
+    if slot.kind_of?(Hash)
+      ip = MultiTkIp.__getip
+      ip._eval('::safe::interpConfigure ' + @ip_name + ' ' + _keys2opts(slot))
+    else
+      ip._eval('::safe::interpConfigure ' + @ip_name + ' ' + 
+               "-#{slot} #{_get_eval_string(value)}")
+    end
+    self
+  end
+
+  def safeip_configinfo(slot = nil)
+    ip = MultiTkIp.__getip
+    ret = {}
+    if slot
+      conf = _lst2ary(ip._eval("::safe::interpConfigure " + 
+                               @ip_name + " -#{slot}"))
+      if conf[0] == '-deleteHook'
+=begin
+        if conf[1] =~ /^rb_out\S* (c(_\d+_)?\d+)/
+          ret[conf[0][1..-1]] = MultiTkIp._tk_cmd_tbl[$1]
+=end
+        if conf[1] =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
+          ret[conf[0][1..-1]] = MultiTkIp._tk_cmd_tbl[$4]
+        else
+          ret[conf[0][1..-1]] = conf[1]
+        end
+      else
+        ret[conf[0][1..-1]] = conf[1]
+      end
+    else
+      Hash[*_lst2ary(ip._eval("::safe::interpConfigure " + 
+                              @ip_name))].each{|k, v|
+        if k == '-deleteHook'
+=begin
+          if v =~ /^rb_out\S* (c(_\d+_)?\d+)/
+            ret[k[1..-1]] = MultiTkIp._tk_cmd_tbl[$1]
+=end
+          if v =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
+            ret[k[1..-1]] = MultiTkIp._tk_cmd_tbl[$4]
+          else
+            ret[k[1..-1]] = v
+          end
+        else
+          ret[k[1..-1]] = v
+        end
+      }
+    end
+    ret
+  end
+
+  def safeip_delete
+    ip = MultiTkIp.__getip
+    ip._eval("::safe::interpDelete " + @ip_name)
+  end
+
+  def safeip_add_to_access_path(dir)
+    ip = MultiTkIp.__getip
+    ip._eval("::safe::interpAddToAccessPath #{@ip_name} #{dir}")
+  end
+
+  def safeip_find_in_access_path(dir)
+    ip = MultiTkIp.__getip
+    ip._eval("::safe::interpFindInAccessPath #{@ip_name} #{dir}")
+  end
+
+  def safeip_set_log_cmd(cmd = Proc.new)
+    ip = MultiTkIp.__getip
+    ip._eval("::safe::setLogCmd #{@ip_name} #{_get_eval_string(cmd)}")
+  end
+end
+
+
+# encoding convert
+class MultiTkIp
+  def encoding
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.encoding
+  end
+  def encoding=(enc)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.encoding = enc
+  end
+
+  def encoding_convertfrom(str, enc=None)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.encoding_convertfrom(str, enc)
+  end
+  alias encoding_convert_from encoding_convertfrom
+
+  def encoding_convertto(str, enc=None)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.encoding_convertto(str, enc)
+  end
+  alias encoding_convert_to encoding_convertto
+end
+
+
+# remove methods for security
+class MultiTkIp
+  # undef_method :instance_eval
+  undef_method :instance_variable_get
+  undef_method :instance_variable_set
+end
+
+
+# end of MultiTkIp definition
+
+# defend against modification
+#MultiTkIp.freeze
+#TclTkLib.freeze
+
+########################################
+#  start Tk which depends on MultiTkIp
+module TkCore
+  INTERP = MultiTkIp
+end
+require 'tk'
diff --git a/ruby_1_8_6/ext/tk/lib/remote-tk.rb b/ruby_1_8_6/ext/tk/lib/remote-tk.rb
new file mode 100644
index 0000000000..70115a60aa
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/remote-tk.rb
@@ -0,0 +1,526 @@
+#
+#               remote-tk.rb - supports to control remote Tk interpreters
+#                       by Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+if defined? MultiTkIp
+  fail RuntimeError, "'remote-tk' library must be required before requiring 'multi-tk'"
+end
+
+class MultiTkIp; end
+class RemoteTkIp < MultiTkIp; end
+
+class MultiTkIp
+  @@IP_TABLE = {}.taint unless defined?(@@IP_TABLE)
+  @@TK_TABLE_LIST = [].taint unless defined?(@@TK_TABLE_LIST)
+  def self._IP_TABLE; @@IP_TABLE; end
+  def self._TK_TABLE_LIST; @@TK_TABLE_LIST; end
+
+  @flag = true
+  def self._DEFAULT_MASTER
+    # work only once
+    if @flag
+      @flag = nil
+      @@DEFAULT_MASTER
+    else
+      nil
+    end
+  end
+end
+class RemoteTkIp
+  @@IP_TABLE = MultiTkIp._IP_TABLE unless defined?(@@IP_TABLE)
+  @@TK_TABLE_LIST = MultiTkIp._TK_TABLE_LIST unless defined?(@@TK_TABLE_LIST)
+end
+class << MultiTkIp
+  undef _IP_TABLE
+  undef _TK_TABLE_LIST
+end
+
+require 'multi-tk'
+
+class RemoteTkIp
+  if defined?(@@DEFAULT_MASTER)
+    MultiTkIp._DEFAULT_MASTER
+  else
+    @@DEFAULT_MASTER = MultiTkIp._DEFAULT_MASTER
+  end
+end
+
+
+###############################
+
+class << RemoteTkIp
+  undef new_master, new_slave, new_safe_slave
+  undef new_trusted_slave, new_safeTk
+
+  def new(*args, &b)
+    ip = __new(*args)
+    ip.eval_proc(&b) if b
+    ip
+  end
+end
+
+class RemoteTkIp
+  def initialize(remote_ip, displayof=nil, timeout=5)
+    if $SAFE >= 4
+      fail SecurityError, "cannot access another interpreter at level #{$SAFE}"
+    end
+
+    @interp = MultiTkIp.__getip
+    if @interp.safe?
+      fail SecurityError, "safe-IP cannot create RemoteTkIp"
+    end
+
+
+    @interp.allow_ruby_exit = false
+    @appname = @interp._invoke('tk', 'appname')
+    @remote = remote_ip.to_s.dup.freeze
+    if displayof.kind_of?(TkWindow)
+      @displayof = displayof.path.dup.freeze
+    else
+      @displayof = nil
+    end
+    if self.deleted?
+      fail RuntimeError, "no Tk application named \"#{@remote}\""
+    end
+
+    @tk_windows = {}
+    @tk_table_list = []
+    @slave_ip_tbl = {}
+    @slave_ip_top = {}
+
+    @tk_windows.taint unless @tk_windows.tainted?
+    @tk_table_list.taint unless @tk_table_list.tainted?
+    @slave_ip_tbl.taint unless @slave_ip_tbl.tainted?
+    @slave_ip_top.taint unless @slave_ip_top.tainted?
+
+    @system = Object.new
+
+    @threadgroup  = ThreadGroup.new
+
+    @safe_level = [$SAFE]
+
+    @wait_on_mainloop = [true, 0]
+
+    @cmd_queue = Queue.new
+
+=begin
+    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog()
+
+    @threadgroup.add @cmd_receiver
+    @threadgroup.add @receiver_watchdog
+
+    @threadgroup.enclose
+=end
+    @@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
+
+    @@IP_TABLE[@threadgroup] = self
+    @@TK_TABLE_LIST.size.times{ 
+      (tbl = {}).tainted? || tbl.taint
+      @tk_table_list << tbl
+    }
+
+    @ret_val = TkVariable.new
+    if timeout > 0 && ! _available_check(timeout)
+      fail RuntimeError, "cannot create connection"
+    end
+    @ip_id = _create_connection
+
+    class << self
+      undef :instance_eval
+    end
+
+    self.freeze  # defend against modification
+  end
+
+  def manipulable?
+    return true if (Thread.current.group == ThreadGroup::Default)
+    MultiTkIp.__getip == @interp && ! @interp.safe?
+  end
+  def self.manipulable?
+    true
+  end
+
+  def _is_master_of?(tcltkip_obj)
+    tcltkip_obj == @interp
+  end
+  protected :_is_master_of?
+
+  def _ip_id_
+    @ip_id
+  end
+
+  def _available_check(timeout = 5)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    return nil if timeout < 1
+    @ret_val.value = ''
+    @interp._invoke('send', '-async', @remote, 
+                    'send', '-async', Tk.appname, 
+                    "set #{@ret_val.id} ready")
+    Tk.update
+    if @ret_val != 'ready'
+      (1..(timeout*5)).each{
+        sleep 0.2 
+        Tk.update
+        break if @ret_val == 'ready'
+      }
+    end
+    @ret_val.value == 'ready'
+  end
+  private :_available_check
+
+  def _create_connection
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    ip_id = '_' + @interp._invoke('send', @remote, <<-'EOS') + '_'
+      if {[catch {set _rubytk_control_ip_id_} ret] != 0} {
+        set _rubytk_control_ip_id_ 0
+      } else {
+        set _rubytk_control_ip_id_ [expr $ret + 1]
+      }
+      return $_rubytk_control_ip_id_
+    EOS
+
+    @interp._invoke('send', @remote, <<-EOS)
+      proc rb_out#{ip_id} args {
+        send #{@appname} rb_out \$args
+      }
+    EOS
+
+    ip_id
+  end
+  private :_create_connection
+
+  def _appsend(enc_mode, async, *cmds)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    p ['_appsend', [@remote, @displayof], enc_mode, async, cmds] if $DEBUG
+    if $SAFE >= 4
+      fail SecurityError, "cannot send commands at level 4"
+    elsif $SAFE >= 1 && cmds.find{|obj| obj.tainted?}
+      fail SecurityError, "cannot send tainted commands at level #{$SAFE}"
+    end
+
+    cmds = @interp._merge_tklist(*TkUtil::_conv_args([], enc_mode, *cmds))
+    if @displayof
+      if async
+        @interp.__invoke('send', '-async', '-displayof', @displayof, 
+                         '--', @remote, *cmds)
+      else
+        @interp.__invoke('send', '-displayof', @displayof, 
+                         '--', @remote, *cmds)
+      end
+    else
+      if async
+        @interp.__invoke('send', '-async', '--', @remote, *cmds)
+      else
+        @interp.__invoke('send', '--', @remote, *cmds)
+      end
+    end
+  end
+  private :_appsend
+
+  def ready?(timeout=5)
+    if timeout < 0
+      fail ArgumentError, "timeout must be positive number"
+    end
+    _available_check(timeout)
+  end
+
+  def is_rubytk?
+    return false if _appsend(false, false, 'info', 'command', 'ruby') == ""
+    [ _appsend(false, false, 'ruby', 'RUBY_VERSION'), 
+      _appsend(false, false, 'set', 'tk_patchLevel') ]
+  end
+
+  def appsend(async, *args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    if async != true && async != false && async != nil
+      args.unshift(async)
+      async = false
+    end
+    if @displayof
+      Tk.appsend_displayof(@remote, @displayof, async, *args)
+    else
+      Tk.appsend(@remote, async, *args)
+    end
+  end
+
+  def rb_appsend(async, *args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    if async != true && async != false && async != nil
+      args.unshift(async)
+      async = false
+    end
+    if @displayof
+      Tk.rb_appsend_displayof(@remote, @displayof, async, *args)
+    else
+      Tk.rb_appsend(@remote, async, *args)
+    end
+  end
+
+  def create_slave(name, safe=false)
+    if safe
+      safe_opt = ''
+    else
+      safe_opt = '-safe'
+    end
+    _appsend(false, false, "interp create #{safe_opt} -- #{name}")
+  end
+
+  def make_safe
+    fail RuntimeError, 'cannot change safe mode of the remote interpreter'
+  end
+
+  def safe?
+    _appsend(false, false, 'interp issafe')
+  end
+
+  def safe_base?
+    false
+  end
+
+  def allow_ruby_exit?
+    false
+  end
+
+  def allow_ruby_exit= (mode)
+    fail RuntimeError, 'cannot change mode of the remote interpreter'
+  end
+
+  def delete
+    _appsend(false, true, 'exit')
+  end
+
+  def deleted?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    if @displayof
+      lst = @interp._invoke_without_enc('winfo', 'interps', 
+                                        '-displayof', @displayof)
+    else
+      lst = @interp._invoke_without_enc('winfo', 'interps')
+    end
+    # unless @interp._split_tklist(lst).index(@remote)
+    unless @interp._split_tklist(lst).index(_toUTF8(@remote))
+      true
+    else
+      false
+    end
+  end
+
+  def has_mainwindow?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    begin
+      inf = @interp._invoke_without_enc('info', 'command', '.')
+    rescue Exception
+      return nil
+    end
+    if !inf.kind_of?(String) || inf != '.'
+      false
+    else
+      true
+    end
+  end
+
+  def invalid_namespace?
+    false
+  end
+
+  def restart
+    fail RuntimeError, 'cannot restart the remote interpreter'
+  end
+
+  def __eval(str)
+    _appsend(false, false, str)
+  end
+  def _eval(str)
+    _appsend(nil, false, str)
+  end
+  def _eval_without_enc(str)
+    _appsend(false, false, str)
+  end
+  def _eval_with_enc(str)
+    _appsend(true, false, str)
+  end
+
+  def _invoke(*args)
+    _appsend(nil, false, *args)
+  end
+
+  def __invoke(*args)
+    _appsend(false, false, *args)
+  end
+  def _invoke(*args)
+    _appsend(nil, false, *args)
+  end
+  def _invoke_without_enc(*args)
+    _appsend(false, false, *args)
+  end
+  def _invoke_with_enc(*args)
+    _appsend(true, false, *args)
+  end
+
+  def _toUTF8(str, encoding=nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._toUTF8(str, encoding)
+  end
+
+  def _fromUTF8(str, encoding=nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._fromUTF8(str, encoding)
+  end
+
+  def _thread_vwait(var_name)
+    _appsend(false, 'thread_vwait', varname)
+  end
+
+  def _thread_tkwait(mode, target)
+    _appsend(false, 'thread_tkwait', mode, target)
+  end
+
+  def _return_value
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._return_value
+  end
+
+  def _get_variable(var_name, flag)
+    # ignore flag
+    _appsend(false, 'set', TkComm::_get_eval_string(var_name))
+  end
+  def _get_variable2(var_name, index_name, flag)
+    # ignore flag
+    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})")
+  end
+
+  def _set_variable(var_name, value, flag)
+    # ignore flag
+    _appsend(false, 'set', TkComm::_get_eval_string(var_name), TkComm::_get_eval_string(value))
+  end
+  def _set_variable2(var_name, index_name, value, flag)
+    # ignore flag
+    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})", TkComm::_get_eval_string(value))
+  end
+
+  def _unset_variable(var_name, flag)
+    # ignore flag
+    _appsend(false, 'unset', TkComm::_get_eval_string(var_name))
+  end
+  def _unset_variable2(var_name, index_name, flag)
+    # ignore flag
+    _appsend(false, 'unset', "#{var_name}(#{index_name})")
+  end
+
+  def _get_global_var(var_name)
+    _appsend(false, 'set', TkComm::_get_eval_string(var_name))
+  end
+  def _get_global_var2(var_name, index_name)
+    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})")
+  end
+
+  def _set_global_var(var_name, value)
+    _appsend(false, 'set', TkComm::_get_eval_string(var_name), TkComm::_get_eval_string(value))
+  end
+  def _set_global_var2(var_name, index_name, value)
+    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})", TkComm::_get_eval_string(value))
+  end
+
+  def _unset_global_var(var_name)
+    _appsend(false, 'unset', TkComm::_get_eval_string(var_name))
+  end
+  def _unset_global_var2(var_name, index_name)
+    _appsend(false, 'unset', "#{var_name}(#{index_name})")
+  end
+
+  def _split_tklist(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._split_tklist(str)
+  end
+
+  def _merge_tklist(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._merge_tklist(*args)
+  end
+
+  def _conv_listelement(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._conv_listelement(str)
+  end
+
+  def _create_console
+    fail RuntimeError, 'not support "_create_console" on the remote interpreter'
+  end
+
+  def mainloop
+    fail RuntimeError, 'not support "mainloop" on the remote interpreter'
+  end
+  def mainloop_watchdog
+    fail RuntimeError, 'not support "mainloop_watchdog" on the remote interpreter'
+  end
+  def do_one_evant(flag = nil)
+    fail RuntimeError, 'not support "do_one_event" on the remote interpreter'
+  end
+  def mainloop_abort_on_exception
+    fail RuntimeError, 'not support "mainloop_abort_on_exception" on the remote interpreter'
+  end
+  def mainloop_abort_on_exception=(mode)
+    fail RuntimeError, 'not support "mainloop_abort_on_exception=" on the remote interpreter'
+  end
+  def set_eventloop_tick(*args)
+    fail RuntimeError, 'not support "set_eventloop_tick" on the remote interpreter'
+  end
+  def get_eventloop_tick
+    fail RuntimeError, 'not support "get_eventloop_tick" on the remote interpreter'
+  end
+  def set_no_event_wait(*args)
+    fail RuntimeError, 'not support "set_no_event_wait" on the remote interpreter'
+  end
+  def get_no_event_wait
+    fail RuntimeError, 'not support "get_no_event_wait" on the remote interpreter'
+  end
+  def set_eventloop_weight(*args)
+    fail RuntimeError, 'not support "set_eventloop_weight" on the remote interpreter'
+  end
+  def get_eventloop_weight
+    fail RuntimeError, 'not support "get_eventloop_weight" on the remote interpreter'
+  end
+end
+
+class << RemoteTkIp
+  def mainloop(*args)
+    fail RuntimeError, 'not support "mainloop" on the remote interpreter'
+  end
+  def mainloop_watchdog(*args)
+    fail RuntimeError, 'not support "mainloop_watchdog" on the remote interpreter'
+  end
+  def do_one_evant(flag = nil)
+    fail RuntimeError, 'not support "do_one_event" on the remote interpreter'
+  end
+  def mainloop_abort_on_exception
+    fail RuntimeError, 'not support "mainloop_abort_on_exception" on the remote interpreter'
+  end
+  def mainloop_abort_on_exception=(mode)
+    fail RuntimeError, 'not support "mainloop_abort_on_exception=" on the remote interpreter'
+  end
+  def set_eventloop_tick(*args)
+    fail RuntimeError, 'not support "set_eventloop_tick" on the remote interpreter'
+  end
+  def get_eventloop_tick
+    fail RuntimeError, 'not support "get_eventloop_tick" on the remote interpreter'
+  end
+  def set_no_event_wait(*args)
+    fail RuntimeError, 'not support "set_no_event_wait" on the remote interpreter'
+  end
+  def get_no_event_wait
+    fail RuntimeError, 'not support "get_no_event_wait" on the remote interpreter'
+  end
+  def set_eventloop_weight(*args)
+    fail RuntimeError, 'not support "set_eventloop_weight" on the remote interpreter'
+  end
+  def get_eventloop_weight
+    fail RuntimeError, 'not support "get_eventloop_weight" on the remote interpreter'
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tcltk.rb b/ruby_1_8_6/ext/tk/lib/tcltk.rb
new file mode 100644
index 0000000000..1a6694dbff
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tcltk.rb
@@ -0,0 +1,367 @@
+# tof
+
+#### tcltk library, more direct manipulation of tcl/tk
+####    Sep. 5, 1997    Y. Shigehiro
+
+require "tcltklib"
+
+################
+
+# module TclTk: collection of tcl/tk utilities (supplies namespace.)
+module TclTk
+
+  # initialize Hash to hold unique symbols and such
+  @namecnt = {}
+
+  # initialize Hash to hold callbacks
+  @callback = {}
+end
+
+# TclTk.mainloop(): call TclTkLib.mainloop()
+def TclTk.mainloop()
+  print("mainloop: start\n") if $DEBUG
+  TclTkLib.mainloop()
+  print("mainloop: end\n") if $DEBUG
+end
+
+# TclTk.deletecallbackkey(ca): remove callback from TclTk module
+#     this does not remove callbacks from tcl/tk interpreter
+#     without calling this method, TclTkInterpreter will not be GCed
+#   ca: callback(TclTkCallback)
+def TclTk.deletecallbackkey(ca)
+  print("deletecallbackkey: ", ca.to_s(), "\n") if $DEBUG
+  @callback.delete(ca.to_s)
+end
+
+# TclTk.dcb(ca, wid, W): call TclTk.deletecallbackkey() for each callbacks
+#     in an array.
+#     this is for callback for top-level <Destroy>
+#   ca: array of callbacks(TclTkCallback)
+#   wid: top-level widget(TclTkWidget)
+#   w: information about window given by %W(String)
+def TclTk.dcb(ca, wid, w)
+  if wid.to_s() == w
+    ca.each{|i|
+      TclTk.deletecallbackkey(i)
+    }
+  end
+end
+
+# TclTk._addcallback(ca): register callback
+#   ca: callback(TclTkCallback)
+def TclTk._addcallback(ca)
+  print("_addcallback: ", ca.to_s(), "\n") if $DEBUG
+  @callback[ca.to_s()] = ca
+end
+
+# TclTk._callcallback(key, arg): invoke registered callback
+#   key: key to select callback (to_s value of the TclTkCallback)
+#   arg: parameter from tcl/tk interpreter
+def TclTk._callcallback(key, arg)
+  print("_callcallback: ", @callback[key].inspect, "\n") if $DEBUG
+  @callback[key]._call(arg)
+  # throw out callback value
+  # should return String to satisfy rb_eval_string()
+  return ""
+end
+
+# TclTk._newname(prefix): generate unique name(String)
+#   prefix: prefix of the unique name
+def TclTk._newname(prefix)
+  # generated name counter is stored in @namecnt
+  if !@namecnt.key?(prefix)
+    # first appearing prefix, initialize
+    @namecnt[prefix] = 1
+  else
+    # already appeared prefix, generate next name
+    @namecnt[prefix] += 1
+  end
+  return "#{prefix}#{@namecnt[prefix]}"
+end
+
+################
+
+# class TclTkInterpreter: tcl/tk interpreter
+class TclTkInterpreter
+
+  # initialize(): 
+  def initialize()
+    # generate interpreter object
+    @ip = TclTkIp.new()
+
+    # add ruby_fmt command to tcl interpreter
+    # ruby_fmt command format arguments by `format' and call `ruby' command
+    # (notice ruby command receives only one argument)
+    if $DEBUG
+      @ip._eval("proc ruby_fmt {fmt args} { puts \"ruby_fmt: $fmt $args\" ; set cmd [list ruby [format $fmt $args]] ; uplevel $cmd }")
+    else
+      @ip._eval("proc ruby_fmt {fmt args} { set cmd [list ruby [format $fmt $args]] ; uplevel $cmd }")
+    end
+
+    # @ip._get_eval_string(*args): generate string to evaluate in tcl interpreter
+    #   *args: script which is going to be evaluated under tcl/tk
+    def @ip._get_eval_string(*args)
+      argstr = ""
+      args.each{|arg|
+        argstr += " " if argstr != ""
+        # call to_eval if it is defined
+        if (arg.respond_to?(:to_eval))
+          argstr += arg.to_eval()
+        else
+          # call to_s unless defined
+          argstr += arg.to_s()
+        end
+      }
+      return argstr
+    end
+
+    # @ip._eval_args(*args): evaluate string under tcl/tk interpreter
+    #     returns result string.
+    #   *args: script which is going to be evaluated under tcl/tk
+    def @ip._eval_args(*args)
+      # calculate the string to eval in the interpreter
+      argstr = _get_eval_string(*args)
+
+      # evaluate under the interpreter
+      print("_eval: \"", argstr, "\"") if $DEBUG
+      res = _eval(argstr)
+      if $DEBUG
+        print(" -> \"", res, "\"\n")
+      elsif  _return_value() != 0
+        print(res, "\n")
+      end
+      fail(%Q/can't eval "#{argstr}"/) if _return_value() != 0 #'
+      return res
+    end
+
+    # generate tcl/tk command object and register in the hash
+    @commands = {}
+    # for all commands registered in tcl/tk interpreter:
+    @ip._eval("info command").split(/ /).each{|comname|
+      if comname =~ /^[.]/
+        # if command is a widget (path), generate TclTkWidget,
+        # and register it in the hash
+        @commands[comname] = TclTkWidget.new(@ip, comname)
+      else
+        # otherwise, generate TclTkCommand
+        @commands[comname] = TclTkCommand.new(@ip, comname)
+      end
+    }
+  end
+
+  # commands(): returns hash of the tcl/tk commands
+  def commands()
+    return @commands
+  end
+
+  # rootwidget(): returns root widget(TclTkWidget)
+  def rootwidget()
+    return @commands["."]
+  end
+
+  # _tcltkip(): returns @ip(TclTkIp)
+  def _tcltkip()
+    return @ip
+  end
+
+  # method_missing(id, *args): execute undefined method as tcl/tk command
+  #   id: method symbol
+  #   *args: method arguments
+  def method_missing(id, *args)
+    # if command named by id registered, then execute it
+    if @commands.key?(id.id2name)
+      return @commands[id.id2name].e(*args)
+    else
+      # otherwise, exception
+      super
+    end
+  end
+end
+
+# class TclTkObject: base class of the tcl/tk objects
+class TclTkObject
+
+  # initialize(ip, exp): 
+  #   ip: interpreter(TclTkIp)
+  #   exp: tcl/tk representation
+  def initialize(ip, exp)
+    fail("type is not TclTkIp") if !ip.kind_of?(TclTkIp)
+    @ip = ip
+    @exp = exp
+  end
+
+  # to_s(): returns tcl/tk representation
+  def to_s()
+    return @exp
+  end
+end
+
+# class TclTkCommand: tcl/tk commands
+# you should not call TclTkCommand.new()
+# commands are created by TclTkInterpreter:initialize()
+class TclTkCommand < TclTkObject
+
+  # e(*args): execute command.  returns String (e is for exec or eval)
+  #   *args: command arguments
+  def e(*args)
+    return @ip._eval_args(to_s(), *args)
+  end
+end
+
+# class TclTkLibCommand: tcl/tk commands in the library
+class TclTkLibCommand < TclTkCommand
+
+  # initialize(ip, name): 
+  #   ip: interpreter(TclTkInterpreter)
+  #   name: command name (String)
+  def initialize(ip, name)
+    super(ip._tcltkip, name)
+  end
+end
+
+# class TclTkVariable: tcl/tk variable
+class TclTkVariable < TclTkObject
+
+  # initialize(interp, dat): 
+  #   interp: interpreter(TclTkInterpreter)
+  #   dat: the value to set(String)
+  #       if nil, not initialize variable
+  def initialize(interp, dat)
+    # auto-generate tcl/tk representation (variable name)
+    exp = TclTk._newname("v_")
+    # initialize TclTkObject
+    super(interp._tcltkip(), exp)
+    # safe this for `set' command
+    @set = interp.commands()["set"]
+    # set value
+    set(dat) if dat
+  end
+
+  # although you can set/refer variable by using set in tcl/tk,
+  # we provide the method for accessing variables
+
+  # set(data): set tcl/tk variable using `set'
+  #   data: new value
+  def set(data)
+    @set.e(to_s(), data.to_s())
+  end
+
+  # get(): read tcl/tk variable(String) using `set'
+  def get()
+    return @set.e(to_s())
+  end
+end
+
+# class TclTkWidget: tcl/tk widget
+class TclTkWidget < TclTkCommand
+
+  # initialize(*args): 
+  #   *args: parameters
+  def initialize(*args)
+    if args[0].kind_of?(TclTkIp)
+      # in case the 1st argument is TclTkIp:
+
+      # Wrap tcl/tk widget by TclTkWidget
+      # (used in TclTkInterpreter#initialize())
+
+      # need two arguments
+      fail("illegal # of parameter") if args.size != 2
+
+      # ip: interpreter(TclTkIp)
+      # exp: tcl/tk representation
+      ip, exp = args
+
+      # initialize TclTkObject
+      super(ip, exp)
+    elsif args[0].kind_of?(TclTkInterpreter)
+      # in case 1st parameter is TclTkInterpreter:
+
+      # generate new widget from parent widget
+
+      # interp: interpreter(TclTkInterpreter)
+      # parent: parent widget
+      # command: widget generating tk command(label 等)
+      # *args: argument to the command 
+      interp, parent, command, *args = args
+
+      # generate widget name
+      exp = parent.to_s()
+      exp += "." if exp !~ /[.]$/
+      exp += TclTk._newname("w_")
+      # initialize TclTkObject
+      super(interp._tcltkip(), exp)
+      # generate widget
+      res = @ip._eval_args(command, exp, *args)
+#      fail("can't create Widget") if res != exp
+      # for tk_optionMenu, it is legal res != exp
+    else
+      fail("first parameter is not TclTkInterpreter")
+    end
+  end
+end
+
+# class TclTkCallback: tcl/tk callbacks
+class TclTkCallback < TclTkObject
+
+  # initialize(interp, pr, arg): 
+  #   interp: interpreter(TclTkInterpreter)
+  #   pr: callback procedure(Proc)
+  #   arg: string to pass as block parameters of pr
+  #       bind command of tcl/tk uses % replacement for parameters
+  #       pr can receive replaced data using block parameter
+  #       its format is specified by arg string
+  #       You should not specify arg for the command like 
+  #       scrollbar with -command option, which receives parameters
+  #       without specifying any replacement
+  def initialize(interp, pr, arg = nil)
+    # auto-generate tcl/tk representation (variable name)
+    exp = TclTk._newname("c_")
+    # initialize TclTkObject
+    super(interp._tcltkip(), exp)
+    # save parameters
+    @pr = pr
+    @arg = arg
+    # register in the module
+    TclTk._addcallback(self)
+  end
+
+  # to_eval(): retuens string representation for @ip._eval_args
+  def to_eval()
+    if @arg
+      # bind replaces %s before calling ruby_fmt, so %%s is used
+      s = %Q/{ruby_fmt {TclTk._callcallback("#{to_s()}", "%%s")} #{@arg}}/
+    else
+      s = %Q/{ruby_fmt {TclTk._callcallback("#{to_s()}", "%s")}}/
+    end
+
+    return s
+  end
+
+  # _call(arg): invoke callback
+  #   arg: callback parameter
+  def _call(arg)
+    @pr.call(arg)
+  end
+end
+
+# class TclTkImage: tcl/tk images
+class TclTkImage < TclTkCommand
+
+  # initialize(interp, t, *args): 
+  #     generating image is done by TclTkImage.new()
+  #     destrying is done by image delete (inconsistent, sigh)
+  #   interp: interpreter(TclTkInterpreter)
+  #   t: image type (photo, bitmap, etc.)
+  #   *args: command argument
+  def initialize(interp, t, *args)
+    # auto-generate tcl/tk representation
+    exp = TclTk._newname("i_")
+    # initialize TclTkObject
+    super(interp._tcltkip(), exp)
+    # generate image
+    res = @ip._eval_args("image create", t, exp, *args)
+    fail("can't create Image") if res != exp
+  end
+end
+
+# eof
diff --git a/ruby_1_8_6/ext/tk/lib/tk.rb b/ruby_1_8_6/ext/tk/lib/tk.rb
new file mode 100644
index 0000000000..32b5e20bc5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk.rb
@@ -0,0 +1,4617 @@
+#
+#               tk.rb - Tk interface module using tcltklib
+#                       $Date$
+#                       by Yukihiro Matsumoto <matz@netlab.jp>
+
+# use Shigehiro's tcltklib
+require 'tcltklib'
+require 'tkutil'
+
+# autoload
+require 'tk/autoload'
+
+class TclTkIp
+  # backup original (without encoding) _eval and _invoke
+  alias _eval_without_enc _eval
+  alias _invoke_without_enc _invoke
+
+  def _ip_id_
+    # for RemoteTkIp
+    ''
+  end
+end
+
+# define TkComm module (step 1: basic functions)
+module TkComm
+  include TkUtil
+  extend TkUtil
+
+  WidgetClassNames = {}.taint
+  TkExtlibAutoloadModule = [].taint
+
+  # None = Object.new  ### --> definition is moved to TkUtil module
+  # def None.to_s
+  #   'None'
+  # end
+  # None.freeze
+
+  #Tk_CMDTBL = {}
+  #Tk_WINDOWS = {}
+  Tk_IDs = ["00000".taint, "00000".taint].freeze  # [0]-cmdid, [1]-winid
+
+  # for backward compatibility
+  Tk_CMDTBL = Object.new
+  def Tk_CMDTBL.method_missing(id, *args)
+    TkCore::INTERP.tk_cmd_tbl.__send__(id, *args)
+  end
+  Tk_CMDTBL.freeze
+  Tk_WINDOWS = Object.new
+  def Tk_WINDOWS.method_missing(id, *args)
+    TkCore::INTERP.tk_windows.__send__(id, *args)
+  end
+  Tk_WINDOWS.freeze
+
+  self.instance_eval{
+    @cmdtbl = [].taint
+  }
+
+  unless const_defined?(:GET_CONFIGINFO_AS_ARRAY)
+    # GET_CONFIGINFO_AS_ARRAY = false => returns a Hash { opt =>val, ... }
+    #                           true  => returns an Array [[opt,val], ... ]
+    # val is a list which includes resource info. 
+    GET_CONFIGINFO_AS_ARRAY = true
+  end
+  unless const_defined?(:GET_CONFIGINFOwoRES_AS_ARRAY)
+    # for configinfo without resource info; list of [opt, value] pair
+    #           false => returns a Hash { opt=>val, ... }
+    #           true  => returns an Array [[opt,val], ... ]
+    GET_CONFIGINFOwoRES_AS_ARRAY = true
+  end
+  #  *** ATTENTION ***
+  # 'current_configinfo' method always returns a Hash under all cases of above.
+
+  def error_at
+    frames = caller()
+    frames.delete_if do |c|
+      c =~ %r!/tk(|core|thcore|canvas|text|entry|scrollbox)\.rb:\d+!
+    end
+    frames
+  end
+  private :error_at
+
+  def _genobj_for_tkwidget(path)
+    return TkRoot.new if path == '.'
+
+    begin
+      #tk_class = TkCore::INTERP._invoke('winfo', 'class', path)
+      tk_class = Tk.ip_invoke_without_enc('winfo', 'class', path)
+    rescue
+      return path
+    end
+
+    if ruby_class = WidgetClassNames[tk_class]
+      ruby_class_name = ruby_class.name
+      # gen_class_name = ruby_class_name + 'GeneratedOnTk'
+      gen_class_name = ruby_class_name
+      classname_def = ''
+    else # ruby_class == nil
+      mods = TkExtlibAutoloadModule.find_all{|m| m.const_defined?(tk_class)}
+      mods.each{|mod|
+        begin
+          mod.const_get(tk_class)  # auto_load
+          break if (ruby_class = WidgetClassNames[tk_class])
+        rescue LoadError
+          # ignore load error
+        end
+      }
+
+      unless ruby_class
+        std_class = 'Tk' << tk_class
+        if Object.const_defined?(std_class)
+          Object.const_get(std_class)  # auto_load
+          ruby_class = WidgetClassNames[tk_class]
+        end
+      end
+
+      if ruby_class
+        # found
+        ruby_class_name = ruby_class.name
+        gen_class_name = ruby_class_name
+        classname_def = ''
+      else
+        # unknown
+        ruby_class_name = 'TkWindow'
+        gen_class_name = 'TkWidget_' + tk_class
+        classname_def = "WidgetClassName = '#{tk_class}'.freeze"
+      end
+    end
+
+###################################
+=begin
+    if ruby_class = WidgetClassNames[tk_class]
+      ruby_class_name = ruby_class.name
+      # gen_class_name = ruby_class_name + 'GeneratedOnTk'
+      gen_class_name = ruby_class_name
+      classname_def = ''
+    else
+      mod = TkExtlibAutoloadModule.find{|m| m.const_defined?(tk_class)}
+      if mod
+        ruby_class_name = mod.name + '::' + tk_class
+        gen_class_name = ruby_class_name
+        classname_def = ''
+      elsif Object.const_defined?('Tk' + tk_class)
+        ruby_class_name = 'Tk' + tk_class
+        # gen_class_name = ruby_class_name + 'GeneratedOnTk'
+        gen_class_name = ruby_class_name
+        classname_def = ''
+      else
+        ruby_class_name = 'TkWindow'
+        # gen_class_name = ruby_class_name + tk_class + 'GeneratedOnTk'
+        gen_class_name = 'TkWidget_' + tk_class
+        classname_def = "WidgetClassName = '#{tk_class}'.freeze"
+      end
+    end
+=end
+
+=begin
+    unless Object.const_defined? gen_class_name
+      Object.class_eval "class #{gen_class_name}<#{ruby_class_name}
+                           #{classname_def}
+                         end"
+    end
+    Object.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}', 
+                                             'without_creating'=>true)"
+=end
+    base = Object
+    gen_class_name.split('::').each{|klass|
+      next if klass == ''
+      if base.const_defined?(klass)
+        base = base.class_eval klass
+      else
+        base = base.class_eval "class #{klass}<#{ruby_class_name}
+                                  #{classname_def}
+                                end
+                                #{klass}"
+      end
+    }
+    base.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}', 
+                                           'without_creating'=>true)"
+  end
+  private :_genobj_for_tkwidget
+  module_function :_genobj_for_tkwidget
+
+  def _at(x,y=nil)
+    if y
+      "@#{Integer(x)},#{Integer(y)}"
+    else
+      "@#{Integer(x)}"
+    end
+  end
+  module_function :_at
+
+  def tk_tcl2ruby(val, enc_mode = false, listobj = true)
+=begin
+    if val =~ /^rb_out\S* (c(_\d+_)?\d+)/
+      #return Tk_CMDTBL[$1]
+      return TkCore::INTERP.tk_cmd_tbl[$1]
+      #cmd_obj = TkCore::INTERP.tk_cmd_tbl[$1]
+      #if cmd_obj.kind_of?(Proc) || cmd_obj.kind_of?(Method)
+      #  cmd_obj
+      #else
+      #  cmd_obj.cmd
+      #end
+    end
+=end
+    if val =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
+      return TkCore::INTERP.tk_cmd_tbl[$4]
+    end
+    #if val.include? ?\s
+    #  return val.split.collect{|v| tk_tcl2ruby(v)}
+    #end
+    case val
+    when /\A@font\S+\z/
+      TkFont.get_obj(val)
+    when /\A-?\d+\z/
+      val.to_i
+    when /\A\.\S*\z/
+      #Tk_WINDOWS[val] ? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
+      TkCore::INTERP.tk_windows[val]? 
+           TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val)
+    when /\Ai(_\d+_)?\d+\z/
+      TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
+    when /\A-?\d+\.?\d*(e[-+]?\d+)?\z/
+      val.to_f
+    when /\\ /
+      val.gsub(/\\ /, ' ')
+    when /[^\\] /
+      if listobj
+        #tk_split_escstr(val).collect{|elt|
+        #  tk_tcl2ruby(elt, enc_mode, listobj)
+        #}
+        val = _toUTF8(val) unless enc_mode
+        tk_split_escstr(val, false, false).collect{|elt|
+          tk_tcl2ruby(elt, true, listobj)
+        }
+      elsif enc_mode
+        _fromUTF8(val)
+      else
+        val
+      end
+    else
+      if enc_mode
+        _fromUTF8(val)
+      else
+        val
+      end
+    end
+  end
+
+  private :tk_tcl2ruby
+  module_function :tk_tcl2ruby
+  #private_class_method :tk_tcl2ruby
+
+unless const_defined?(:USE_TCLs_LIST_FUNCTIONS)
+  USE_TCLs_LIST_FUNCTIONS = true
+end
+
+if USE_TCLs_LIST_FUNCTIONS
+  ###########################################################################
+  # use Tcl function version of split_list
+  ###########################################################################
+
+  def tk_split_escstr(str, src_enc=true, dst_enc=true)
+    str = _toUTF8(str) if src_enc
+    if dst_enc
+      TkCore::INTERP._split_tklist(str).map!{|s| _fromUTF8(s)}
+    else
+      TkCore::INTERP._split_tklist(str)
+    end
+  end
+
+  def tk_split_sublist(str, depth=-1, src_enc=true, dst_enc=true)
+    # return [] if str == ""
+    # list = TkCore::INTERP._split_tklist(str)
+    str = _toUTF8(str) if src_enc
+
+    if depth == 0
+      return "" if str == ""
+      list = [str]
+    else
+      return [] if str == ""
+      list = TkCore::INTERP._split_tklist(str)
+    end
+    if list.size == 1
+      # tk_tcl2ruby(list[0], nil, false)
+      tk_tcl2ruby(list[0], dst_enc, false)
+    else
+      list.collect{|token| tk_split_sublist(token, depth - 1, false, dst_enc)}
+    end
+  end
+
+  def tk_split_list(str, depth=0, src_enc=true, dst_enc=true)
+    return [] if str == ""
+    str = _toUTF8(str) if src_enc
+    TkCore::INTERP._split_tklist(str).map!{|token|
+      tk_split_sublist(token, depth - 1, false, dst_enc)
+    }
+  end
+
+  def tk_split_simplelist(str, src_enc=true, dst_enc=true)
+    #lst = TkCore::INTERP._split_tklist(str)
+    #if (lst.size == 1 && lst =~ /^\{.*\}$/)
+    #  TkCore::INTERP._split_tklist(str[1..-2])
+    #else
+    #  lst
+    #end
+
+    str = _toUTF8(str) if src_enc
+    if dst_enc
+      TkCore::INTERP._split_tklist(str).map!{|s| _fromUTF8(s)}
+    else
+      TkCore::INTERP._split_tklist(str)
+    end
+  end
+
+  def array2tk_list(ary, enc=nil)
+    return "" if ary.size == 0
+
+    sys_enc = TkCore::INTERP.encoding
+    sys_enc = TclTkLib.encoding_system unless sys_enc
+
+    dst_enc = (enc == nil)? sys_enc: enc
+
+    dst = ary.collect{|e|
+      if e.kind_of? Array
+        s = array2tk_list(e, enc)
+      elsif e.kind_of? Hash
+        tmp_ary = []
+        #e.each{|k,v| tmp_ary << k << v }
+        e.each{|k,v| tmp_ary << "-#{_get_eval_string(k)}" << v }
+        s = array2tk_list(tmp_ary, enc)
+      else
+        s = _get_eval_string(e, enc)
+      end
+
+      if dst_enc != true && dst_enc != false
+        if (s_enc = s.instance_variable_get(:@encoding))
+          s_enc = s_enc.to_s
+        else
+          s_enc = sys_enc
+        end
+        dst_enc = true if s_enc != dst_enc
+      end
+
+      s
+    }
+
+    if sys_enc && dst_enc
+      dst.map!{|s| _toUTF8(s)}
+      ret = TkCore::INTERP._merge_tklist(*dst)
+      if dst_enc.kind_of?(String)
+        ret = _fromUTF8(ret, dst_enc)
+        ret.instance_variable_set(:@encoding, dst_enc)
+      else
+        ret.instance_variable_set(:@encoding, 'utf-8')
+      end
+      ret
+    else
+      TkCore::INTERP._merge_tklist(*dst)
+    end
+  end
+
+else
+  ###########################################################################
+  # use Ruby script version of split_list (traditional methods)
+  ###########################################################################
+
+  def tk_split_escstr(str, src_enc=true, dst_enc=true)
+    return [] if str == ""
+    list = []
+    token = nil
+    escape = false
+    brace = 0
+    str.split('').each {|c|
+      brace += 1 if c == '{' && !escape
+      brace -= 1 if c == '}' && !escape
+      if brace == 0 && c == ' ' && !escape
+        list << token.gsub(/^\{(.*)\}$/, '\1') if token
+        token = nil
+      else
+        token = (token || "") << c
+      end
+      escape = (c == '\\' && !escape)
+    }
+    list << token.gsub(/^\{(.*)\}$/, '\1') if token
+    list
+  end
+
+  def tk_split_sublist(str, depth=-1, src_enc=true, dst_enc=true)
+    #return [] if str == ""
+    #return [tk_split_sublist(str[1..-2])] if str =~ /^\{.*\}$/
+    #list = tk_split_escstr(str)
+    if depth == 0
+      return "" if str == ""
+      str = str[1..-2] if str =~ /^\{.*\}$/
+      list = [str]
+    else
+      return [] if str == []
+      return [tk_split_sublist(str[1..-2], depth - 1)] if str =~ /^\{.*\}$/
+      list = tk_split_escstr(str)
+    end
+    if list.size == 1
+      tk_tcl2ruby(list[0], nil, false)
+    else
+      list.collect{|token| tk_split_sublist(token, depth - 1)}
+    end
+  end
+
+  def tk_split_list(str, depth=0, src_enc=true, dst_enc=true)
+    return [] if str == ""
+    tk_split_escstr(str).collect{|token| 
+      tk_split_sublist(token, depth - 1)
+    }
+  end
+=begin
+  def tk_split_list(str)
+    return [] if str == ""
+    idx = str.index('{')
+    while idx and idx > 0 and str[idx-1] == ?\\
+      idx = str.index('{', idx+1)
+    end
+    unless idx
+      list = tk_tcl2ruby(str)
+      unless Array === list
+        list = [list]
+      end
+      return list
+    end
+
+    list = tk_tcl2ruby(str[0,idx])
+    list = [] if list == ""
+    str = str[idx+1..-1]
+    i = -1
+    escape = false
+    brace = 1
+    str.each_byte {|c|
+      i += 1
+      brace += 1 if c == ?{ && !escape
+      brace -= 1 if c == ?} && !escape
+      escape = (c == ?\\)
+      break if brace == 0
+    }
+    if str.size == i + 1
+      return tk_split_list(str[0, i])
+    end
+    if str[0, i] == ' '
+      list.push ' '
+    else
+      list.push tk_split_list(str[0, i])
+    end
+    list += tk_split_list(str[i+1..-1])
+    list
+  end
+=end
+
+  def tk_split_simplelist(str, src_enc=true, dst_enc=true)
+    return [] if str == ""
+    list = []
+    token = nil
+    escape = false
+    brace = 0
+    str.split('').each {|c|
+      if c == '\\' && !escape
+        escape = true
+        token = (token || "") << c if brace > 0
+        next
+      end
+      brace += 1 if c == '{' && !escape
+      brace -= 1 if c == '}' && !escape
+      if brace == 0 && c == ' ' && !escape
+        list << token.gsub(/^\{(.*)\}$/, '\1') if token
+        token = nil
+      else
+        token = (token || "") << c
+      end
+      escape = false
+    }
+    list << token.gsub(/^\{(.*)\}$/, '\1') if token
+    list
+  end
+
+  def array2tk_list(ary, enc=nil)
+    ary.collect{|e|
+      if e.kind_of? Array
+        "{#{array2tk_list(e, enc)}}"
+      elsif e.kind_of? Hash
+        # "{#{e.to_a.collect{|ee| array2tk_list(ee)}.join(' ')}}"
+        e.each{|k,v| tmp_ary << "-#{_get_eval_string(k)}" << v }
+        array2tk_list(tmp_ary, enc)
+      else
+        s = _get_eval_string(e, enc)
+        (s.index(/\s/) || s.size == 0)? "{#{s}}": s
+      end
+    }.join(" ")
+  end
+end
+
+  private :tk_split_escstr, :tk_split_sublist
+  private :tk_split_list, :tk_split_simplelist
+  private :array2tk_list
+
+  module_function :tk_split_escstr, :tk_split_sublist
+  module_function :tk_split_list, :tk_split_simplelist
+  module_function :array2tk_list
+
+  private_class_method :tk_split_escstr, :tk_split_sublist
+  private_class_method :tk_split_list, :tk_split_simplelist
+#  private_class_method :array2tk_list
+
+=begin
+  ### --> definition is moved to TkUtil module
+  def _symbolkey2str(keys)
+    h = {}
+    keys.each{|key,value| h[key.to_s] = value}
+    h
+  end
+  private :_symbolkey2str
+  module_function :_symbolkey2str
+=end
+
+=begin
+  ### --> definition is moved to TkUtil module
+  # def hash_kv(keys, enc_mode = nil, conf = [], flat = false)
+  def hash_kv(keys, enc_mode = nil, conf = nil)
+    # Hash {key=>val, key=>val, ... } or Array [ [key, val], [key, val], ... ]
+    #     ==> Array ['-key', val, '-key', val, ... ]
+    dst = []
+    if keys and keys != None
+      keys.each{|k, v|
+        #dst.push("-#{k}")
+        dst.push('-' + k.to_s)
+        if v != None
+          # v = _get_eval_string(v, enc_mode) if (enc_mode || flat)
+          v = _get_eval_string(v, enc_mode) if enc_mode
+          dst.push(v)
+        end
+      }
+    end
+    if conf
+      conf + dst
+    else
+      dst
+    end
+  end
+  private :hash_kv
+  module_function :hash_kv
+=end
+
+=begin
+  ### --> definition is moved to TkUtil module
+  def bool(val)
+    case val
+    when "1", 1, 'yes', 'true'
+      true
+    else
+      false
+    end
+  end
+
+  def number(val)
+    case val
+    when /^-?\d+$/
+      val.to_i
+    when /^-?\d+\.?\d*(e[-+]?\d+)?$/
+      val.to_f
+    else
+      fail(ArgumentError, "invalid value for Number:'#{val}'")
+    end
+  end
+  def string(val)
+    if val == "{}"
+      ''
+    elsif val[0] == ?{ && val[-1] == ?}
+      val[1..-2]
+    else
+      val
+    end
+  end
+  def num_or_str(val)
+    begin
+      number(val)
+    rescue ArgumentError
+      string(val)
+    end
+  end
+=end
+
+  def list(val, depth=0, enc=true)
+    tk_split_list(val, depth, enc, enc)
+  end
+  def simplelist(val, src_enc=true, dst_enc=true)
+    tk_split_simplelist(val, src_enc, dst_enc)
+  end
+  def window(val)
+    if val =~ /^\./
+      #Tk_WINDOWS[val]? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
+      TkCore::INTERP.tk_windows[val]? 
+           TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val)
+    else
+      nil
+    end
+  end
+  def image_obj(val)
+    if val =~ /^i(_\d+_)?\d+$/
+      TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
+    else
+      val
+    end
+  end
+  def procedure(val)
+=begin
+    if val =~ /^rb_out\S* (c(_\d+_)?\d+)/
+      #Tk_CMDTBL[$1]
+      #TkCore::INTERP.tk_cmd_tbl[$1]
+      TkCore::INTERP.tk_cmd_tbl[$1].cmd
+=end
+    if val =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
+      return TkCore::INTERP.tk_cmd_tbl[$4].cmd
+    else
+      #nil
+      val
+    end
+  end
+  private :bool, :number, :string, :num_or_str
+  private :list, :simplelist, :window, :procedure
+  module_function :bool, :number, :num_or_str, :string
+  module_function :list, :simplelist, :window, :image_obj, :procedure
+
+  def subst(str, *opts)
+    # opts := :nobackslashes | :nocommands | novariables
+    tk_call('subst', 
+            *(opts.collect{|opt|
+                opt = opt.to_s
+                (opt[0] == ?-)? opt: '-' << opt
+              } << str))
+  end
+
+  def _toUTF8(str, encoding = nil)
+    TkCore::INTERP._toUTF8(str, encoding)
+  end
+  def _fromUTF8(str, encoding = nil)
+    TkCore::INTERP._fromUTF8(str, encoding)
+  end
+  private :_toUTF8, :_fromUTF8
+  module_function :_toUTF8, :_fromUTF8
+
+  def _callback_entry_class?(cls)
+    cls <= Proc || cls <= Method || cls <= TkCallbackEntry
+  end
+  private :_callback_entry_class?
+  module_function :_callback_entry_class?
+
+  def _callback_entry?(obj)
+    obj.kind_of?(Proc) || obj.kind_of?(Method) || obj.kind_of?(TkCallbackEntry)
+  end
+  private :_callback_entry?
+  module_function :_callback_entry?
+
+=begin
+  ### --> definition is moved to TkUtil module
+  def _get_eval_string(str, enc_mode = nil)
+    return nil if str == None
+    if str.kind_of?(TkObject)
+      str = str.path
+    elsif str.kind_of?(String)
+      str = _toUTF8(str) if enc_mode
+    elsif str.kind_of?(Symbol)
+      str = str.id2name
+      str = _toUTF8(str) if enc_mode
+    elsif str.kind_of?(Hash)
+      str = hash_kv(str, enc_mode).join(" ")
+    elsif str.kind_of?(Array)
+      str = array2tk_list(str)
+      str = _toUTF8(str) if enc_mode
+    elsif str.kind_of?(Proc)
+      str = install_cmd(str)
+    elsif str == nil
+      str = ""
+    elsif str == false
+      str = "0"
+    elsif str == true
+      str = "1"
+    elsif (str.respond_to?(:to_eval))
+      str = str.to_eval()
+      str = _toUTF8(str) if enc_mode
+    else
+      str = str.to_s() || ''
+      unless str.kind_of? String
+        fail RuntimeError, "fail to convert the object to a string" 
+      end
+      str = _toUTF8(str) if enc_mode
+    end
+    return str
+  end
+=end
+=begin
+  def _get_eval_string(obj, enc_mode = nil)
+    case obj
+    when Numeric
+      obj.to_s
+    when String
+      (enc_mode)? _toUTF8(obj): obj
+    when Symbol
+      (enc_mode)? _toUTF8(obj.id2name): obj.id2name
+    when TkObject
+      obj.path
+    when Hash
+      hash_kv(obj, enc_mode).join(' ')
+    when Array
+      (enc_mode)? _toUTF8(array2tk_list(obj)): array2tk_list(obj)
+    when Proc, Method, TkCallbackEntry
+      install_cmd(obj)
+    when false
+      '0'
+    when true
+      '1'
+    when nil
+      ''
+    when None
+      nil
+    else
+      if (obj.respond_to?(:to_eval))
+        (enc_mode)? _toUTF8(obj.to_eval): obj.to_eval
+      else
+        begin
+          obj = obj.to_s || ''
+        rescue
+          fail RuntimeError, "fail to convert object '#{obj}' to string" 
+        end
+        (enc_mode)? _toUTF8(obj): obj
+      end
+    end
+  end
+  private :_get_eval_string
+  module_function :_get_eval_string
+=end
+
+=begin
+  ### --> definition is moved to TkUtil module
+  def _get_eval_enc_str(obj)
+    return obj if obj == None
+    _get_eval_string(obj, true)
+  end
+  private :_get_eval_enc_str
+  module_function :_get_eval_enc_str
+=end
+
+=begin
+  ### --> obsolete
+  def ruby2tcl(v, enc_mode = nil)
+    if v.kind_of?(Hash)
+      v = hash_kv(v)
+      v.flatten!
+      v.collect{|e|ruby2tcl(e, enc_mode)}
+    else
+      _get_eval_string(v, enc_mode)
+    end
+  end
+  private :ruby2tcl
+=end
+
+=begin
+  ### --> definition is moved to TkUtil module
+  def _conv_args(args, enc_mode, *src_args)
+    conv_args = []
+    src_args.each{|arg|
+      conv_args << _get_eval_string(arg, enc_mode) unless arg == None
+      # if arg.kind_of?(Hash)
+      # arg.each{|k, v|
+      #   args << '-' + k.to_s
+      #   args << _get_eval_string(v, enc_mode)
+      # }
+      # elsif arg != None
+      #   args << _get_eval_string(arg, enc_mode)
+      # end
+    }
+    args + conv_args
+  end
+  private :_conv_args
+=end
+
+  def _curr_cmd_id
+    #id = format("c%.4d", Tk_IDs[0])
+    id = "c" + TkCore::INTERP._ip_id_ + TkComm::Tk_IDs[0]
+  end
+  def _next_cmd_id
+    id = _curr_cmd_id
+    #Tk_IDs[0] += 1
+    TkComm::Tk_IDs[0].succ!
+    id
+  end
+  private :_curr_cmd_id, :_next_cmd_id
+  module_function :_curr_cmd_id, :_next_cmd_id
+
+  def install_cmd(cmd)
+    return '' if cmd == ''
+    begin
+      ns = TkCore::INTERP._invoke_without_enc('namespace', 'current')
+      ns = nil if ns == '::' # for backward compatibility
+    rescue
+      # probably, Tcl7.6
+      ns = nil
+    end
+    id = _next_cmd_id
+    #Tk_CMDTBL[id] = cmd
+    if cmd.kind_of?(TkCallbackEntry)
+      TkCore::INTERP.tk_cmd_tbl[id] = cmd
+    else
+      TkCore::INTERP.tk_cmd_tbl[id] = TkCore::INTERP.get_cb_entry(cmd)
+    end
+    @cmdtbl = [] unless defined? @cmdtbl
+    @cmdtbl.taint unless @cmdtbl.tainted?
+    @cmdtbl.push id
+    #return Kernel.format("rb_out %s", id);
+    if ns
+      'rb_out' << TkCore::INTERP._ip_id_ << ' ' << ns << ' ' << id
+    else
+      'rb_out' << TkCore::INTERP._ip_id_ << ' ' << id
+    end
+  end
+  def uninstall_cmd(id)
+    #id = $1 if /rb_out\S* (c(_\d+_)?\d+)/ =~ id
+    id = $4 if id =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
+    #Tk_CMDTBL.delete(id)
+    TkCore::INTERP.tk_cmd_tbl.delete(id)
+  end
+  # private :install_cmd, :uninstall_cmd
+  module_function :install_cmd, :uninstall_cmd
+
+=begin
+  def install_win(ppath,name=nil)
+    if !name or name == ''
+      #name = format("w%.4d", Tk_IDs[1])
+      #Tk_IDs[1] += 1
+      name = "w" + Tk_IDs[1]
+      Tk_IDs[1].succ!
+    end
+    if name[0] == ?.
+      @path = name.dup
+    elsif !ppath or ppath == "."
+      @path = Kernel.format(".%s", name);
+    else
+      @path = Kernel.format("%s.%s", ppath, name)
+    end
+    #Tk_WINDOWS[@path] = self
+    TkCore::INTERP.tk_windows[@path] = self
+  end
+=end
+  def install_win(ppath,name=nil)
+    if name
+      if name == ''
+        raise ArgumentError, "invalid wiget-name '#{name}'"
+      end
+      if name[0] == ?.
+        @path = '' + name
+        @path.freeze
+        return TkCore::INTERP.tk_windows[@path] = self
+      end
+    else
+      name = "w" + TkCore::INTERP._ip_id_ + Tk_IDs[1]
+      Tk_IDs[1].succ!
+    end
+    if !ppath or ppath == '.'
+      @path = '.' + name
+    else
+      @path = ppath + '.' + name
+    end
+    @path.freeze
+    TkCore::INTERP.tk_windows[@path] = self
+  end
+
+  def uninstall_win()
+    #Tk_WINDOWS.delete(@path)
+    TkCore::INTERP.tk_windows.delete(@path)
+  end
+  private :install_win, :uninstall_win
+
+  def _epath(win)
+    if win.kind_of?(TkObject)
+      win.epath
+    elsif win.respond_to?(:epath)
+      win.epath
+    else
+      win
+    end
+  end
+  private :_epath
+end
+
+# define TkComm module (step 2: event binding)
+module TkComm
+  include TkEvent
+  extend TkEvent
+
+  def tk_event_sequence(context)
+    if context.kind_of? TkVirtualEvent
+      context = context.path
+    end
+    if context.kind_of? Array
+      context = context.collect{|ev|
+        if ev.kind_of? TkVirtualEvent
+          ev.path
+        else
+          ev
+        end
+      }.join("><")
+    end
+    if /,/ =~ context
+      context = context.split(/\s*,\s*/).join("><")
+    else
+      context
+    end
+  end
+
+  def _bind_core(mode, what, context, cmd, *args)
+    id = install_bind(cmd, *args) if cmd
+    begin
+      tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", 
+                              mode + id]))
+    rescue
+      uninstall_cmd(id) if cmd
+      fail
+    end
+  end
+
+  def _bind(what, context, cmd, *args)
+    _bind_core('', what, context, cmd, *args)
+  end
+
+  def _bind_append(what, context, cmd, *args)
+    _bind_core('+', what, context, cmd, *args)
+  end
+
+  def _bind_remove(what, context)
+    tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", '']))
+  end
+
+  def _bindinfo(what, context=nil)
+    if context
+      tk_call_without_enc(*what+["<#{tk_event_sequence(context)}>"]) .collect {|cmdline|
+=begin
+        if cmdline =~ /^rb_out\S* (c(?:_\d+_)?\d+)\s+(.*)$/
+          #[Tk_CMDTBL[$1], $2]
+          [TkCore::INTERP.tk_cmd_tbl[$1], $2]
+=end
+        if cmdline =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
+          [TkCore::INTERP.tk_cmd_tbl[$4], $5]
+        else
+          cmdline
+        end
+      }
+    else
+      tk_split_simplelist(tk_call_without_enc(*what)).collect!{|seq|
+        l = seq.scan(/<*[^<>]+>*/).collect!{|subseq|
+          case (subseq)
+          when /^<<[^<>]+>>$/
+            TkVirtualEvent.getobj(subseq[1..-2])
+          when /^<[^<>]+>$/
+            subseq[1..-2]
+          else
+            subseq.split('')
+          end
+        }.flatten
+        (l.size == 1) ? l[0] : l
+      }
+    end
+  end
+
+  def _bind_core_for_event_class(klass, mode, what, context, cmd, *args)
+    id = install_bind_for_event_class(klass, cmd, *args) if cmd
+    begin
+      tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", 
+                              mode + id]))
+    rescue
+      uninstall_cmd(id) if cmd
+      fail
+    end
+  end
+
+  def _bind_for_event_class(klass, what, context, cmd, *args)
+    _bind_core_for_event_class(klass, '', what, context, cmd, *args)
+  end
+
+  def _bind_append_for_event_class(klass, what, context, cmd, *args)
+    _bind_core_for_event_class(klass, '+', what, context, cmd, *args)
+  end
+
+  def _bind_remove_for_event_class(klass, what, context)
+    _bind_remove(what, context)
+  end
+
+  def _bindinfo_for_event_class(klass, what, context=nil)
+    _bindinfo(what, context)
+  end
+
+  private :tk_event_sequence
+  private :_bind_core, :_bind, :_bind_append, :_bind_remove, :_bindinfo
+  private :_bind_core_for_event_class, :_bind_for_event_class, 
+          :_bind_append_for_event_class, :_bind_remove_for_event_class, 
+          :_bindinfo_for_event_class
+
+  #def bind(tagOrClass, context, cmd=Proc.new, *args)
+  #  _bind(["bind", tagOrClass], context, cmd, *args)
+  #  tagOrClass
+  #end
+  def bind(tagOrClass, context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind(["bind", tagOrClass], context, cmd, *args)
+    tagOrClass
+  end
+
+  #def bind_append(tagOrClass, context, cmd=Proc.new, *args)
+  #  _bind_append(["bind", tagOrClass], context, cmd, *args)
+  #  tagOrClass
+  #end
+  def bind_append(tagOrClass, context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append(["bind", tagOrClass], context, cmd, *args)
+    tagOrClass
+  end
+
+  def bind_remove(tagOrClass, context)
+    _bind_remove(['bind', tagOrClass], context)
+    tagOrClass
+  end
+
+  def bindinfo(tagOrClass, context=nil)
+    _bindinfo(['bind', tagOrClass], context)
+  end
+
+  #def bind_all(context, cmd=Proc.new, *args)
+  #  _bind(['bind', 'all'], context, cmd, *args)
+  #  TkBindTag::ALL
+  #end
+  def bind_all(context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind(['bind', 'all'], context, cmd, *args)
+    TkBindTag::ALL
+  end
+
+  #def bind_append_all(context, cmd=Proc.new, *args)
+  #  _bind_append(['bind', 'all'], context, cmd, *args)
+  #  TkBindTag::ALL
+  #end
+  def bind_append_all(context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append(['bind', 'all'], context, cmd, *args)
+    TkBindTag::ALL
+  end
+
+  def bind_remove_all(context)
+    _bind_remove(['bind', 'all'], context)
+    TkBindTag::ALL
+  end
+
+  def bindinfo_all(context=nil)
+    _bindinfo(['bind', 'all'], context)
+  end
+end
+
+
+module TkCore
+  include TkComm
+  extend TkComm
+
+  unless self.const_defined? :INTERP
+    if self.const_defined? :IP_NAME
+      name = IP_NAME.to_s
+    else
+      #name = nil
+      name = $0
+    end
+    if self.const_defined? :IP_OPTS
+      if IP_OPTS.kind_of?(Hash)
+        opts = hash_kv(IP_OPTS).join(' ')
+      else
+        opts = IP_OPTS.to_s
+      end
+    else
+      opts = ''
+    end
+
+    INTERP = TclTkIp.new(name, opts)
+
+    def INTERP.__getip
+      self
+    end
+
+    INTERP.instance_eval{
+      @tk_cmd_tbl = {}.taint
+      def @tk_cmd_tbl.[]=(idx,val)
+        if self.has_key?(idx) && Thread.current.group != ThreadGroup::Default
+          fail SecurityError,"cannot change the entried command"
+        end
+        super(idx,val)
+      end
+
+      @tk_windows = {}.taint
+
+      @tk_table_list = [].taint
+
+      @init_ip_env  = [].taint  # table of Procs
+      @add_tk_procs = [].taint  # table of [name, args, body]
+
+      @cb_entry_class = Class.new(TkCallbackEntry){
+        class << self
+          def inspect
+            sprintf("#<Class(TkCallbackEntry):%0x>", self.__id__)
+          end
+          alias to_s inspect
+        end
+
+        def initialize(ip, cmd)
+          @ip = ip
+          @cmd = cmd
+        end
+        attr_reader :ip, :cmd
+        def call(*args)
+          @ip.cb_eval(@cmd, *args)
+        end
+        def inspect
+          sprintf("#<cb_entry:%0x>", self.__id__)
+        end
+        alias to_s inspect
+      }.freeze
+    }
+
+    def INTERP.cb_entry_class
+      @cb_entry_class
+    end
+    def INTERP.tk_cmd_tbl
+      @tk_cmd_tbl
+    end
+    def INTERP.tk_windows
+      @tk_windows
+    end
+
+    class Tk_OBJECT_TABLE
+      def initialize(id)
+        @id = id
+      end
+      def method_missing(m, *args, &b)
+        TkCore::INTERP.tk_object_table(@id).__send__(m, *args, &b)
+      end
+    end
+
+    def INTERP.tk_object_table(id)
+      @tk_table_list[id]
+    end
+    def INTERP.create_table
+      id = @tk_table_list.size
+      (tbl = {}).tainted? || tbl.taint
+      @tk_table_list << tbl
+#      obj = Object.new
+#      obj.instance_eval <<-EOD
+#        def self.method_missing(m, *args)
+#         TkCore::INTERP.tk_object_table(#{id}).send(m, *args)
+#        end
+#      EOD
+#      return obj
+      Tk_OBJECT_TABLE.new(id)
+    end
+
+    def INTERP.get_cb_entry(cmd)
+      @cb_entry_class.new(__getip, cmd).freeze
+    end
+    def INTERP.cb_eval(cmd, *args)
+      TkUtil._get_eval_string(TkUtil.eval_cmd(cmd, *args))
+    end
+
+    def INTERP.init_ip_env(script = Proc.new)
+      @init_ip_env << script
+      script.call(self)
+    end
+    def INTERP.add_tk_procs(name, args = nil, body = nil)
+      if name.kind_of?(Array)
+        name.each{|param| self.add_tk_procs(*param)}
+      else
+        name = name.to_s
+        @add_tk_procs << [name, args, body]
+        self._invoke('proc', name, args, body) if args && body
+      end
+    end
+    def INTERP.remove_tk_procs(*names)
+      names.each{|name|
+        name = name.to_s
+        @add_tk_procs.delete_if{|elem| 
+          elem.kind_of?(Array) && elem[0].to_s == name
+        }
+        self._invoke('rename', name, '')
+      }
+    end
+    def INTERP.init_ip_internal
+      ip = self
+      @init_ip_env.each{|script| script.call(ip)}
+      @add_tk_procs.each{|name,args,body| ip._invoke('proc',name,args,body)}
+    end
+  end
+
+  WIDGET_DESTROY_HOOK = '<WIDGET_DESTROY_HOOK>'
+  INTERP._invoke_without_enc('event', 'add', 
+                             "<#{WIDGET_DESTROY_HOOK}>", '<Destroy>')
+  INTERP._invoke_without_enc('bind', 'all', "<#{WIDGET_DESTROY_HOOK}>",
+                             install_cmd(proc{|path|
+                                unless TkCore::INTERP.deleted?
+                                  begin
+                                    if (widget=TkCore::INTERP.tk_windows[path])
+                                      if widget.respond_to?(:__destroy_hook__)
+                                        widget.__destroy_hook__
+                                      end
+                                    end
+                                  rescue Exception=>e
+                                      p e if $DEBUG
+                                  end
+                                end
+                             }) << ' %W')
+
+  INTERP.add_tk_procs(TclTkLib::FINALIZE_PROC_NAME, '', 
+                      "bind all <#{WIDGET_DESTROY_HOOK}> {}")
+
+  INTERP.add_tk_procs('rb_out', 'ns args', <<-'EOL')
+    if [regexp {^::} $ns] {
+      set cmd {namespace eval $ns {ruby_cmd TkCore callback} $args}
+    } else {
+      set cmd {eval {ruby_cmd TkCore callback} $ns $args}
+    }
+    if {[set st [catch $cmd ret]] != 0} {
+       #return -code $st $ret
+       set idx [string first "\n\n" $ret]
+       if {$idx > 0} {
+          return -code $st \
+                 -errorinfo [string range $ret [expr $idx + 2] \
+                                               [string length $ret]] \
+                 [string range $ret 0 [expr $idx - 1]]
+       } else {
+          return -code $st $ret
+       }
+    } else {
+        return $ret
+    }
+  EOL
+=begin
+  INTERP.add_tk_procs('rb_out', 'args', <<-'EOL')
+    if {[set st [catch {eval {ruby_cmd TkCore callback} $args} ret]] != 0} {
+       #return -code $st $ret
+       set idx [string first "\n\n" $ret]
+       if {$idx > 0} {
+          return -code $st \
+                 -errorinfo [string range $ret [expr $idx + 2] \
+                                               [string length $ret]] \
+                 [string range $ret 0 [expr $idx - 1]]
+       } else {
+          return -code $st $ret
+       }
+    } else {
+        return $ret
+    }
+  EOL
+=end
+=begin
+  INTERP.add_tk_procs('rb_out', 'args', <<-'EOL')
+    #regsub -all {\\} $args {\\\\} args
+    #regsub -all {!} $args {\\!} args
+    #regsub -all "{" $args "\\{" args
+    regsub -all {(\\|!|\{|\})} $args {\\\1} args
+    if {[set st [catch {ruby [format "TkCore.callback %%Q!%s!" $args]} ret]] != 0} {
+       #return -code $st $ret
+       set idx [string first "\n\n" $ret]
+       if {$idx > 0} {
+          return -code $st \
+                 -errorinfo [string range $ret [expr $idx + 2] \
+                                               [string length $ret]] \
+                 [string range $ret 0 [expr $idx - 1]]
+       } else {
+          return -code $st $ret
+       }
+    } else {
+        return $ret
+    }
+  EOL
+=end
+
+  at_exit{ INTERP.remove_tk_procs(TclTkLib::FINALIZE_PROC_NAME) }
+
+  EventFlag = TclTkLib::EventFlag
+
+  def callback_break
+    fail TkCallbackBreak, "Tk callback returns 'break' status"
+  end
+
+  def callback_continue
+    fail TkCallbackContinue, "Tk callback returns 'continue' status"
+  end
+
+  def callback_return
+    fail TkCallbackReturn, "Tk callback returns 'return' status"
+  end
+
+  def TkCore.callback(*arg)
+    begin
+      if TkCore::INTERP.tk_cmd_tbl.kind_of?(Hash)
+        #TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
+        normal_ret = false
+        ret = catch(:IRB_EXIT) do  # IRB hack
+          retval = TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
+          normal_ret = true
+          retval
+        end
+        unless normal_ret
+          # catch IRB_EXIT
+          exit(ret)
+        end
+        ret
+      end
+    rescue SystemExit=>e
+      exit(e.status)
+    rescue Interrupt=>e
+      fail(e)
+    rescue Exception => e
+      begin
+        msg = _toUTF8(e.class.inspect) + ': ' + 
+              _toUTF8(e.message) + "\n" + 
+              "\n---< backtrace of Ruby side >-----\n" + 
+              _toUTF8(e.backtrace.join("\n")) + 
+              "\n---< backtrace of Tk side >-------"
+        msg.instance_variable_set(:@encoding, 'utf-8')
+      rescue Exception
+        msg = e.class.inspect + ': ' + e.message + "\n" + 
+              "\n---< backtrace of Ruby side >-----\n" + 
+              e.backtrace.join("\n") + 
+              "\n---< backtrace of Tk side >-------"
+      end
+      # TkCore::INTERP._set_global_var('errorInfo', msg)
+      # fail(e)
+      fail(e, msg)
+    end
+  end
+=begin
+  def TkCore.callback(arg_str)
+    # arg = tk_split_list(arg_str)
+    arg = tk_split_simplelist(arg_str)
+    #_get_eval_string(TkUtil.eval_cmd(Tk_CMDTBL[arg.shift], *arg))
+    #_get_eval_string(TkUtil.eval_cmd(TkCore::INTERP.tk_cmd_tbl[arg.shift], 
+    #                        *arg))
+    # TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
+    begin
+      TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
+    rescue Exception => e
+      raise(e, e.class.inspect + ': ' + e.message + "\n" + 
+               "\n---< backtrace of Ruby side >-----\n" + 
+               e.backtrace.join("\n") + 
+               "\n---< backtrace of Tk side >-------")
+    end
+#=begin
+#    cb_obj = TkCore::INTERP.tk_cmd_tbl[arg.shift]
+#    unless $DEBUG
+#      cb_obj.call(*arg)
+#    else
+#      begin
+#       raise 'check backtrace'
+#      rescue
+#       # ignore backtrace before 'callback'
+#       pos = -($!.backtrace.size)
+#      end
+#      begin
+#       cb_obj.call(*arg)
+#      rescue
+#       trace = $!.backtrace
+#       raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" + 
+#                 "\tfrom #{trace[1..pos].join("\n\tfrom ")}"
+#      end
+#    end
+#=end
+  end
+=end
+
+  def load_cmd_on_ip(tk_cmd)
+    bool(tk_call('auto_load', tk_cmd))
+  end
+
+  def after(ms, cmd=Proc.new)
+    crit_bup = Thread.critical
+    Thread.critical = true
+
+    myid = _curr_cmd_id
+    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(myid); ret})
+
+    Thread.critical = crit_bup
+
+    tk_call_without_enc("after",ms,cmdid)  # return id
+#    return
+#    if false #defined? Thread
+#      Thread.start do
+#       ms = Float(ms)/1000
+#       ms = 10 if ms == 0
+#       sleep ms/1000
+#       cmd.call
+#      end
+#    else
+#      cmdid = install_cmd(cmd)
+#      tk_call("after",ms,cmdid)
+#    end
+  end
+
+  def after_idle(cmd=Proc.new)
+    crit_bup = Thread.critical
+    Thread.critical = true
+
+    myid = _curr_cmd_id
+    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(myid); ret})
+
+    Thread.critical = crit_bup
+
+    tk_call_without_enc('after','idle',cmdid)
+  end
+
+  def after_cancel(afterId)
+    tk_call_without_enc('after','cancel',afterId)
+  end
+
+  def windowingsystem
+    tk_call_without_enc('tk', 'windowingsystem')
+  end
+
+  def scaling(scale=nil)
+    if scale
+      tk_call_without_enc('tk', 'scaling', scale)
+    else
+      Float(number(tk_call_without_enc('tk', 'scaling')))
+    end
+  end
+  def scaling_displayof(win, scale=nil)
+    if scale
+      tk_call_without_enc('tk', 'scaling', '-displayof', win, scale)
+    else
+      Float(number(tk_call_without_enc('tk', '-displayof', win, 'scaling')))
+    end
+  end
+
+  def inactive
+    Integer(tk_call_without_enc('tk', 'inactive'))
+  end
+  def inactive_displayof(win)
+    Integer(tk_call_without_enc('tk', 'inactive', '-displayof', win))
+  end
+  def reset_inactive
+    tk_call_without_enc('tk', 'inactive', 'reset')
+  end
+  def reset_inactive_displayof(win)
+    tk_call_without_enc('tk', 'inactive', '-displayof', win, 'reset')
+  end
+
+  def appname(name=None)
+    tk_call('tk', 'appname', name)
+  end
+
+  def appsend_deny
+    tk_call('rename', 'send', '')
+  end
+
+  def appsend(interp, async, *args)
+    if $SAFE >= 4
+      fail SecurityError, "cannot send Tk commands at level 4"
+    elsif $SAFE >= 1 && args.find{|obj| obj.tainted?}
+      fail SecurityError, "cannot send tainted Tk commands at level #{$SAFE}"
+    end
+    if async != true && async != false && async != nil
+      args.unshift(async)
+      async = false
+    end
+    if async
+      tk_call('send', '-async', '--', interp, *args)
+    else
+      tk_call('send', '--', interp, *args)
+    end
+  end
+
+  def rb_appsend(interp, async, *args)
+    if $SAFE >= 4
+      fail SecurityError, "cannot send Ruby commands at level 4"
+    elsif $SAFE >= 1 && args.find{|obj| obj.tainted?}
+      fail SecurityError, "cannot send tainted Ruby commands at level #{$SAFE}"
+    end
+    if async != true && async != false && async != nil
+      args.unshift(async)
+      async = false
+    end
+    #args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
+    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"\\]/, '\\\\\&')}
+    # args.push(').to_s"')
+    # appsend(interp, async, 'ruby "(', *args)
+    args.push('}.call)"')
+    appsend(interp, async, 'ruby "TkComm._get_eval_string(proc{', *args)
+  end
+
+  def appsend_displayof(interp, win, async, *args)
+    if $SAFE >= 4
+      fail SecurityError, "cannot send Tk commands at level 4"
+    elsif $SAFE >= 1 && args.find{|obj| obj.tainted?}
+      fail SecurityError, "cannot send tainted Tk commands at level #{$SAFE}"
+    end
+    win = '.' if win == nil
+    if async != true && async != false && async != nil
+      args.unshift(async)
+      async = false
+    end
+    if async
+      tk_call('send', '-async', '-displayof', win, '--', interp, *args)
+    else
+      tk_call('send', '-displayor', win, '--', interp, *args)
+    end
+  end
+
+  def rb_appsend_displayof(interp, win, async, *args)
+    if $SAFE >= 4
+      fail SecurityError, "cannot send Ruby commands at level 4"
+    elsif $SAFE >= 1 && args.find{|obj| obj.tainted?}
+      fail SecurityError, "cannot send tainted Ruby commands at level #{$SAFE}"
+    end
+    win = '.' if win == nil
+    if async != true && async != false && async != nil
+      args.unshift(async)
+      async = false
+    end
+    #args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
+    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"\\]/, '\\\\\&')}
+    # args.push(').to_s"')
+    # appsend_displayof(interp, win, async, 'ruby "(', *args)
+    args.push('}.call)"')
+    appsend(interp, win, async, 'ruby "TkComm._get_eval_string(proc{', *args)
+  end
+
+  def info(*args)
+    tk_call('info', *args)
+  end
+
+  def mainloop(check_root = true)
+    TclTkLib.mainloop(check_root)
+  end
+
+  def mainloop_thread?
+    # true  : current thread is mainloop
+    # nil   : there is no mainloop
+    # false : mainloop is running on the other thread
+    #         ( At then, it is dangerous to call Tk interpreter directly. )
+    TclTkLib.mainloop_thread?
+  end
+
+  def mainloop_exist?
+    TclTkLib.mainloop_thread? != nil
+  end
+
+  def is_mainloop?
+    TclTkLib.mainloop_thread? == true
+  end
+
+  def mainloop_watchdog(check_root = true)
+    # watchdog restarts mainloop when mainloop is dead
+    TclTkLib.mainloop_watchdog(check_root)
+  end
+
+  def do_one_event(flag = TclTkLib::EventFlag::ALL)
+    TclTkLib.do_one_event(flag)
+  end
+
+  def set_eventloop_tick(timer_tick)
+    TclTkLib.set_eventloop_tick(timer_tick)
+  end
+
+  def get_eventloop_tick()
+    TclTkLib.get_eventloop_tick
+  end
+
+  def set_no_event_wait(wait)
+    TclTkLib.set_no_even_wait(wait)
+  end
+
+  def get_no_event_wait()
+    TclTkLib.get_no_eventloop_wait
+  end
+
+  def set_eventloop_weight(loop_max, no_event_tick)
+    TclTkLib.set_eventloop_weight(loop_max, no_event_tick)
+  end
+
+  def get_eventloop_weight()
+    TclTkLib.get_eventloop_weight
+  end
+
+  def restart(app_name = nil, keys = {})
+    TkCore::INTERP.init_ip_internal
+
+    tk_call('set', 'argv0', app_name) if app_name
+    if keys.kind_of?(Hash)
+      # tk_call('set', 'argc', keys.size * 2)
+      tk_call('set', 'argv', hash_kv(keys).join(' '))
+    end
+
+    INTERP.restart
+    nil
+  end
+
+  def event_generate(win, context, keys=nil)
+    #win = win.path if win.kind_of?(TkObject)
+    if context.kind_of?(TkEvent::Event)
+      context.generate(win, ((keys)? keys: {}))
+    elsif keys
+      tk_call_without_enc('event', 'generate', win, 
+                          "<#{tk_event_sequence(context)}>", 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc('event', 'generate', win, 
+                          "<#{tk_event_sequence(context)}>")
+    end
+    nil
+  end
+
+  def messageBox(keys)
+    tk_call('tk_messageBox', *hash_kv(keys))
+  end
+
+  def getOpenFile(keys = nil)
+    tk_call('tk_getOpenFile', *hash_kv(keys))
+  end
+  def getMultipleOpenFile(keys = nil)
+    simplelist(tk_call('tk_getOpenFile', '-multiple', '1', *hash_kv(keys)))
+  end
+
+  def getSaveFile(keys = nil)
+    tk_call('tk_getSaveFile', *hash_kv(keys))
+  end
+  def getMultipleSaveFile(keys = nil)
+    simplelist(tk_call('tk_getSaveFile', '-multiple', '1', *hash_kv(keys)))
+  end
+
+  def chooseColor(keys = nil)
+    tk_call('tk_chooseColor', *hash_kv(keys))
+  end
+
+  def chooseDirectory(keys = nil)
+    tk_call('tk_chooseDirectory', *hash_kv(keys))
+  end
+
+  def _ip_eval_core(enc_mode, cmd_string)
+    case enc_mode
+    when nil
+      res = INTERP._eval(cmd_string)
+    when false
+      res = INTERP._eval_without_enc(cmd_string)
+    when true
+      res = INTERP._eval_with_enc(cmd_string)
+    end
+    if  INTERP._return_value() != 0
+      fail RuntimeError, res, error_at
+    end
+    return res
+  end
+  private :_ip_eval_core
+
+  def ip_eval(cmd_string)
+    _ip_eval_core(nil, cmd_string)
+  end
+
+  def ip_eval_without_enc(cmd_string)
+    _ip_eval_core(false, cmd_string)
+  end
+
+  def ip_eval_with_enc(cmd_string)
+    _ip_eval_core(true, cmd_string)
+  end
+
+  def _ip_invoke_core(enc_mode, *args)
+    case enc_mode
+    when false
+      res = INTERP._invoke_without_enc(*args)
+    when nil
+      res = INTERP._invoke(*args)
+    when true
+      res = INTERP._invoke_with_enc(*args)
+    end
+    if  INTERP._return_value() != 0
+      fail RuntimeError, res, error_at
+    end
+    return res
+  end
+  private :_ip_invoke_core
+
+  def ip_invoke(*args)
+    _ip_invoke_core(nil, *args)
+  end
+
+  def ip_invoke_without_enc(*args)
+    _ip_invoke_core(false, *args)
+  end
+
+  def ip_invoke_with_enc(*args)
+    _ip_invoke_core(true, *args)
+  end
+
+  def _tk_call_core(enc_mode, *args)
+    ### puts args.inspect if $DEBUG
+    #args.collect! {|x|ruby2tcl(x, enc_mode)}
+    #args.compact!
+    #args.flatten!
+    args = _conv_args([], enc_mode, *args)
+    puts 'invoke args => ' + args.inspect if $DEBUG
+    ### print "=> ", args.join(" ").inspect, "\n" if $DEBUG
+    begin
+      # res = INTERP._invoke(*args).taint
+      # res = INTERP._invoke(enc_mode, *args)
+      res = _ip_invoke_core(enc_mode, *args)
+      # >>>>>  _invoke returns a TAINTED string  <<<<<
+    rescue NameError => err
+      # err = $!
+      begin
+        args.unshift "unknown"
+        #res = INTERP._invoke(*args).taint 
+        #res = INTERP._invoke(enc_mode, *args) 
+        res = _ip_invoke_core(enc_mode, *args) 
+        # >>>>>  _invoke returns a TAINTED string  <<<<<
+      rescue StandardError => err2
+        fail err2 unless /^invalid command/ =~ err2.message
+        fail err
+      end
+    end
+    if  INTERP._return_value() != 0
+      fail RuntimeError, res, error_at
+    end
+    ### print "==> ", res.inspect, "\n" if $DEBUG
+    return res
+  end
+  private :_tk_call_core
+
+  def tk_call(*args)
+    _tk_call_core(nil, *args)
+  end
+
+  def tk_call_without_enc(*args)
+    _tk_call_core(false, *args)
+  end
+
+  def tk_call_with_enc(*args)
+    _tk_call_core(true, *args)
+  end
+
+  def _tk_call_to_list_core(depth, arg_enc, val_enc, *args)
+    args = _conv_args([], arg_enc, *args)
+    val = _tk_call_core(false, *args)
+    if !depth.kind_of?(Integer) || depth == 0
+      tk_split_simplelist(val, false, val_enc)
+    else
+      tk_split_list(val, depth, false, val_enc)
+    end
+  end
+  #private :_tk_call_to_list_core
+
+  def tk_call_to_list(*args)
+    _tk_call_to_list_core(-1, nil, true, *args)
+  end
+
+  def tk_call_to_list_without_enc(*args)
+    _tk_call_to_list_core(-1, false, false, *args)
+  end
+
+  def tk_call_to_list_with_enc(*args)
+    _tk_call_to_list_core(-1, true, true, *args)
+  end
+
+  def tk_call_to_simplelist(*args)
+    _tk_call_to_list_core(0, nil, true, *args)
+  end
+
+  def tk_call_to_simplelist_without_enc(*args)
+    _tk_call_to_list_core(0, false, false, *args)
+  end
+
+  def tk_call_to_simplelist_with_enc(*args)
+    _tk_call_to_list_core(0, true, true, *args)
+  end
+end
+
+
+module Tk
+  include TkCore
+  extend Tk
+
+  TCL_VERSION = INTERP._invoke_without_enc("info", "tclversion").freeze
+  TCL_PATCHLEVEL = INTERP._invoke_without_enc("info", "patchlevel").freeze
+
+  major, minor = TCL_VERSION.split('.')
+  TCL_MAJOR_VERSION = major.to_i
+  TCL_MINOR_VERSION = minor.to_i
+
+  TK_VERSION  = INTERP._invoke_without_enc("set", "tk_version").freeze
+  TK_PATCHLEVEL  = INTERP._invoke_without_enc("set", "tk_patchLevel").freeze
+
+  major, minor = TK_VERSION.split('.')
+  TK_MAJOR_VERSION = major.to_i
+  TK_MINOR_VERSION = minor.to_i
+
+  JAPANIZED_TK = (INTERP._invoke_without_enc("info", "commands", 
+                                             "kanji") != "").freeze
+
+  def Tk.const_missing(sym)
+    case(sym)
+    when :TCL_LIBRARY
+      INTERP._invoke_without_enc('global', 'tcl_library')
+      INTERP._invoke("set", "tcl_library").freeze
+
+    when :TK_LIBRARY
+      INTERP._invoke_without_enc('global', 'tk_library')
+      INTERP._invoke("set", "tk_library").freeze
+
+    when :LIBRARY
+      INTERP._invoke("info", "library").freeze
+
+    #when :PKG_PATH, :PACKAGE_PATH, :TCL_PACKAGE_PATH
+    #  INTERP._invoke_without_enc('global', 'tcl_pkgPath')
+    #  tk_split_simplelist(INTERP._invoke('set', 'tcl_pkgPath'))
+
+    #when :LIB_PATH, :LIBRARY_PATH, :TCL_LIBRARY_PATH
+    #  INTERP._invoke_without_enc('global', 'tcl_libPath')
+    #  tk_split_simplelist(INTERP._invoke('set', 'tcl_libPath'))
+
+    when :PLATFORM, :TCL_PLATFORM
+      if $SAFE >= 4
+        fail SecurityError, "can't get #{sym} when $SAFE >= 4"
+      end
+      INTERP._invoke_without_enc('global', 'tcl_platform')
+      Hash[*tk_split_simplelist(INTERP._invoke_without_enc('array', 'get', 
+                                                           'tcl_platform'))]
+
+    when :ENV
+      INTERP._invoke_without_enc('global', 'env')
+      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 'env'))]
+
+    #when :AUTO_PATH   #<=== 
+    #  tk_split_simplelist(INTERP._invoke('set', 'auto_path'))
+
+    #when :AUTO_OLDPATH
+    #  tk_split_simplelist(INTERP._invoke('set', 'auto_oldpath'))
+
+    when :AUTO_INDEX
+      INTERP._invoke_without_enc('global', 'auto_index')
+      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 'auto_index'))]
+
+    when :PRIV, :PRIVATE, :TK_PRIV
+      priv = {}
+      if INTERP._invoke_without_enc('info', 'vars', 'tk::Priv') != ""
+        var_nam = 'tk::Priv'
+      else
+        var_nam = 'tkPriv'
+      end
+      INTERP._invoke_without_enc('global', var_nam)
+      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 
+                                               var_nam))].each{|k,v|
+        k.freeze
+        case v
+        when /^-?\d+$/
+          priv[k] = v.to_i
+        when /^-?\d+\.?\d*(e[-+]?\d+)?$/
+          priv[k] = v.to_f
+        else
+          priv[k] = v.freeze
+        end
+      }
+      priv
+
+    else
+      raise NameError, 'uninitialized constant Tk::' + sym.id2name
+    end
+  end
+
+  def Tk.errorInfo
+    INTERP._invoke_without_enc('global', 'errorInfo')
+    INTERP._invoke_without_enc('set', 'errorInfo')
+  end
+
+  def Tk.errorCode
+    INTERP._invoke_without_enc('global', 'errorCode')
+    code = tk_split_simplelist(INTERP._invoke_without_enc('set', 'errorCode'))
+    case code[0]
+    when 'CHILDKILLED', 'CHILDSTATUS', 'CHILDSUSP'
+      begin
+        pid = Integer(code[1])
+        code[1] = pid
+      rescue
+      end
+    end
+    code
+  end
+
+  def Tk.has_mainwindow?
+    INTERP.has_mainwindow?
+  end
+
+  def root
+    TkRoot.new
+  end
+
+  def Tk.load_tclscript(file, enc=nil)
+    if enc
+      # TCL_VERSION >= 8.5
+      tk_call('source', '-encoding', enc, file)
+    else
+      tk_call('source', file)
+    end
+  end
+
+  def Tk.load_tcllibrary(file, pkg_name=None, interp=None)
+    tk_call('load', file, pkg_name, interp)
+  end
+
+  def Tk.unload_tcllibrary(*args)
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+      nocomp = (keys['nocomplain'])? '-nocomplain': None
+      keeplib = (keys['keeplibrary'])? '-keeplibrary': None
+      tk_call('unload', nocomp, keeplib, '--', *args)
+    else
+      tk_call('unload', *args)
+    end
+  end
+
+  def Tk.pkgconfig_list(mod)
+    # Tk8.5 feature
+    if mod.kind_of?(Module)
+      if mod.respond_to?(:package_name)
+        pkgname = mod.package_name
+      elsif mod.const_defined?(:PACKAGE_NAME)
+        pkgname = mod::PACKAGE_NAME
+      else
+        fail NotImplementedError, 'may not be a module for a Tcl extension'
+      end
+    else
+      pkgname = mod.to_s
+    end
+
+    pkgname = '::' << pkgname unless pkgname =~ /^::/
+
+    tk_split_list(tk_call(pkgname + '::pkgconfig', 'list'))
+  end
+
+  def Tk.pkgconfig_get(mod, key)
+    # Tk8.5 feature
+    if mod.kind_of?(Module)
+      if mod.respond_to?(:package_name)
+        pkgname = mod.package_name
+      else
+        fail NotImplementedError, 'may not be a module for a Tcl extension'
+      end
+    else
+      pkgname = mod.to_s
+    end
+
+    pkgname = '::' << pkgname unless pkgname =~ /^::/
+
+    tk_call(pkgname + '::pkgconfig', 'get', key)
+  end
+
+  def Tk.tcl_pkgconfig_list
+    # Tk8.5 feature
+    Tk.pkgconfig_list('::tcl')
+  end
+
+  def Tk.tcl_pkgconfig_get(key)
+    # Tk8.5 feature
+    Tk.pkgconfig_get('::tcl', key)
+  end
+
+  def Tk.tk_pkgconfig_list
+    # Tk8.5 feature
+    Tk.pkgconfig_list('::tk')
+  end
+
+  def Tk.tk_pkgconfig_get(key)
+    # Tk8.5 feature
+    Tk.pkgconfig_get('::tk', key)
+  end
+
+  def Tk.bell(nice = false)
+    if nice
+      tk_call_without_enc('bell', '-nice')
+    else
+      tk_call_without_enc('bell')
+    end
+    nil
+  end
+
+  def Tk.bell_on_display(win, nice = false)
+    if nice
+      tk_call_without_enc('bell', '-displayof', win, '-nice')
+    else
+      tk_call_without_enc('bell', '-displayof', win)
+    end
+    nil
+  end
+
+  def Tk.destroy(*wins)
+    #tk_call_without_enc('destroy', *wins)
+    tk_call_without_enc('destroy', *(wins.collect{|win|
+                                       if win.kind_of?(TkWindow)
+                                         win.epath
+                                       else
+                                         win
+                                       end
+                                     }))
+  end
+
+  def Tk.exit
+    tk_call_without_enc('destroy', '.')
+  end
+
+  def Tk.pack(*args)
+    TkPack.configure(*args)
+  end
+  def Tk.pack_forget(*args)
+    TkPack.forget(*args)
+  end
+  def Tk.unpack(*args)
+    TkPack.forget(*args)
+  end
+
+  def Tk.grid(*args)
+    TkGrid.configure(*args)
+  end
+  def Tk.grid_forget(*args)
+    TkGrid.forget(*args)
+  end
+  def Tk.ungrid(*args)
+    TkGrid.forget(*args)
+  end
+
+  def Tk.place(*args)
+    TkPlace.configure(*args)
+  end
+  def Tk.place_forget(*args)
+    TkPlace.forget(*args)
+  end
+  def Tk.unplace(*args)
+    TkPlace.forget(*args)
+  end
+
+  def Tk.update(idle=nil)
+    if idle
+      tk_call_without_enc('update', 'idletasks')
+    else
+      tk_call_without_enc('update')
+    end
+  end
+  def Tk.update_idletasks
+    update(true)
+  end
+  def update(idle=nil)
+    # only for backward compatibility (This never be recommended to use)
+    Tk.update(idle)
+    self
+  end
+
+  # NOTE::
+  #   If no eventloop-thread is running, "thread_update" method is same 
+  #   to "update" method. Else, "thread_update" method waits to complete 
+  #   idletask operation on the eventloop-thread. 
+  def Tk.thread_update(idle=nil)
+    if idle
+      tk_call_without_enc('thread_update', 'idletasks')
+    else
+      tk_call_without_enc('thread_update')
+    end
+  end
+  def Tk.thread_update_idletasks
+    thread_update(true)
+  end
+
+  def Tk.lower_window(win, below=None)
+    tk_call('lower', _epath(win), _epath(below))
+    nil
+  end
+  def Tk.raise_window(win, above=None)
+    tk_call('raise', _epath(win), _epath(above))
+    nil
+  end
+
+  def Tk.current_grabs(win = nil)
+    if win
+      window(tk_call_without_enc('grab', 'current', win))
+    else
+      tk_split_list(tk_call_without_enc('grab', 'current'))
+    end
+  end
+
+  def Tk.focus(display=nil)
+    if display == nil
+      window(tk_call_without_enc('focus'))
+    else
+      window(tk_call_without_enc('focus', '-displayof', display))
+    end
+  end
+
+  def Tk.focus_to(win, force=false)
+    if force
+      tk_call_without_enc('focus', '-force', win)
+    else
+      tk_call_without_enc('focus', win)
+    end
+  end
+
+  def Tk.focus_lastfor(win)
+    window(tk_call_without_enc('focus', '-lastfor', win))
+  end
+
+  def Tk.focus_next(win)
+    TkManageFocus.next(win)
+  end
+
+  def Tk.focus_prev(win)
+    TkManageFocus.prev(win)
+  end
+
+  def Tk.strictMotif(mode=None)
+    bool(tk_call_without_enc('set', 'tk_strictMotif', mode))
+  end
+
+  def Tk.show_kinsoku(mode='both')
+    begin
+      if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
+        tk_split_simplelist(tk_call('kinsoku', 'show', mode))
+      end
+    rescue
+    end
+  end
+  def Tk.add_kinsoku(chars, mode='both')
+    begin
+      if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
+        tk_split_simplelist(tk_call('kinsoku', 'add', mode, 
+                                    *(chars.split(''))))
+      else
+        []
+      end
+    rescue
+      []
+    end
+  end
+  def Tk.delete_kinsoku(chars, mode='both')
+    begin
+      if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
+        tk_split_simplelist(tk_call('kinsoku', 'delete', mode, 
+                            *(chars.split(''))))
+      end
+    rescue
+    end
+  end
+
+  def Tk.toUTF8(str, encoding = nil)
+    _toUTF8(str, encoding)
+  end
+  
+  def Tk.fromUTF8(str, encoding = nil)
+    _fromUTF8(str, encoding)
+  end
+end
+
+###########################################
+#  string with Tcl's encoding
+###########################################
+module Tk
+  def Tk.subst_utf_backslash(str)
+    Tk::EncodedString.subst_utf_backslash(str)
+  end
+  def Tk.subst_tk_backslash(str)
+    Tk::EncodedString.subst_tk_backslash(str)
+  end
+  def Tk.utf_to_backslash_sequence(str)
+    Tk::EncodedString.utf_to_backslash_sequence(str)
+  end
+  def Tk.utf_to_backslash(str)
+    Tk::EncodedString.utf_to_backslash_sequence(str)
+  end
+  def Tk.to_backslash_sequence(str)
+    Tk::EncodedString.to_backslash_sequence(str)
+  end
+end
+
+
+###########################################
+#  convert kanji string to/from utf-8
+###########################################
+if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
+  class TclTkIp
+    # from tkencoding.rb by ttate@jaist.ac.jp
+    attr_accessor :encoding
+
+    alias __eval _eval
+    alias __invoke _invoke
+
+    alias __toUTF8 _toUTF8
+    alias __fromUTF8 _fromUTF8
+
+=begin
+    #### --> definition is moved to TclTkIp module
+
+    def _toUTF8(str, encoding = nil)
+      # decide encoding
+      if encoding
+        encoding = encoding.to_s
+      elsif str.kind_of?(Tk::EncodedString) && str.encoding != nil
+        encoding = str.encoding.to_s
+      elsif str.instance_variable_get(:@encoding)
+        encoding = str.instance_variable_get(:@encoding).to_s
+      elsif defined?(@encoding) && @encoding != nil
+        encoding = @encoding.to_s
+      else
+        encoding = __invoke('encoding', 'system')
+      end
+
+      # convert
+      case encoding
+      when 'utf-8', 'binary'
+        str
+      else
+        __toUTF8(str, encoding)
+      end
+    end
+
+    def _fromUTF8(str, encoding = nil)
+      unless encoding
+        if defined?(@encoding) && @encoding != nil
+          encoding = @encoding.to_s
+        else
+          encoding = __invoke('encoding', 'system')
+        end
+      end
+
+      if str.kind_of?(Tk::EncodedString)
+        if str.encoding == 'binary'
+          str
+        else
+          __fromUTF8(str, encoding)
+        end
+      elsif str.instance_variable_get(:@encoding).to_s == 'binary'
+        str
+      else
+        __fromUTF8(str, encoding)
+      end
+    end
+=end
+
+    def _eval(cmd)
+      _fromUTF8(__eval(_toUTF8(cmd)))
+    end
+
+    def _invoke(*cmds)
+      _fromUTF8(__invoke(*(cmds.collect{|cmd| _toUTF8(cmd)})))
+    end
+
+    alias _eval_with_enc _eval
+    alias _invoke_with_enc _invoke
+
+=begin
+    def _eval(cmd)
+      if defined?(@encoding) && @encoding != 'utf-8'
+        ret = if cmd.kind_of?(Tk::EncodedString)
+                case cmd.encoding
+                when 'utf-8', 'binary'
+                  __eval(cmd)
+                else
+                  __eval(_toUTF8(cmd, cmd.encoding))
+                end
+              elsif cmd.instance_variable_get(:@encoding) == 'binary'
+                __eval(cmd)
+              else
+                __eval(_toUTF8(cmd, @encoding))
+              end
+        if ret.kind_of?(String) && ret.instance_variable_get(:@encoding) == 'binary'
+          ret
+        else
+          _fromUTF8(ret, @encoding)
+        end
+      else
+        __eval(cmd)
+      end
+    end
+
+    def _invoke(*cmds)
+      if defined?(@encoding) && @encoding != 'utf-8'
+        cmds = cmds.collect{|cmd|
+          if cmd.kind_of?(Tk::EncodedString)
+            case cmd.encoding
+            when 'utf-8', 'binary'
+              cmd
+            else
+              _toUTF8(cmd, cmd.encoding)
+            end
+          elsif cmd.instance_variable_get(:@encoding) == 'binary'
+            cmd
+          else
+            _toUTF8(cmd, @encoding)
+          end
+        }
+        ret = __invoke(*cmds)
+        if ret.kind_of?(String) && ret.instance_variable_get(:@encoding) == 'binary'
+          ret
+        else
+          _fromUTF8(ret, @encoding)
+        end
+      else
+        __invoke(*cmds)
+        end
+    end
+=end
+  end
+
+  module TclTkLib
+    class << self
+      alias _encoding encoding
+      alias _encoding= encoding=
+      def encoding=(name)
+        TkCore::INTERP.encoding = name
+      end
+      def encoding
+        TkCore::INTERP.encoding
+      end
+    end
+  end
+
+  module Tk
+    module Encoding
+      extend Encoding
+
+      TkCommandNames = ['encoding'.freeze].freeze
+
+      def encoding=(name)
+        TkCore::INTERP.encoding = name
+      end
+
+      def encoding
+        TkCore::INTERP.encoding
+      end
+
+      def encoding_names
+        TkComm.simplelist(Tk.tk_call('encoding', 'names'))
+      end
+
+      def encoding_system
+        Tk.tk_call('encoding', 'system')
+      end
+
+      def encoding_system=(enc)
+        Tk.tk_call('encoding', 'system', enc)
+      end
+
+      def encoding_convertfrom(str, enc=nil)
+        # str is an usual enc string or a Tcl's internal string expression
+        # in enc (which is returned from 'encoding_convertto' method). 
+        # the return value is a UTF-8 string.
+        enc = encoding_system unless enc
+        ret = TkCore::INTERP.__invoke('encoding', 'convertfrom', enc, str)
+        ret.instance_variable_set('@encoding', 'utf-8')
+        ret
+      end
+      alias encoding_convert_from encoding_convertfrom
+
+      def encoding_convertto(str, enc=nil)
+        # str must be a UTF-8 string.
+        # The return value is a Tcl's internal string expression in enc. 
+        # To get an usual enc string, use Tk.fromUTF8(ret_val, enc).
+        enc = encoding_system unless enc
+        ret = TkCore::INTERP.__invoke('encoding', 'convertto', enc, str)
+        ret.instance_variable_set('@encoding', 'binary')
+        ret
+      end
+      alias encoding_convert_to encoding_convertto
+
+      def encoding_dirs
+        # Tcl8.5 feature
+        TkComm.simplelist(Tk.tk_call_without_enc('encoding', 'dirs'))
+      end
+
+      def encoding_dirs=(dir_list) # an array or a Tcl's list string
+        # Tcl8.5 feature
+        Tk.tk_call_without_enc('encoding', 'dirs', dir_list)
+      end
+    end
+
+    extend Encoding
+  end
+
+  # estimate encoding
+  case $KCODE
+  when /^e/i  # EUC
+    Tk.encoding = 'euc-jp'
+    Tk.encoding_system = 'euc-jp'
+  when /^s/i  # SJIS
+    begin
+      if Tk.encoding_system == 'cp932'
+        Tk.encoding = 'cp932'
+      else
+        Tk.encoding = 'shiftjis'
+        Tk.encoding_system = 'shiftjis'
+      end
+    rescue StandardError, NameError
+      Tk.encoding = 'shiftjis'
+      Tk.encoding_system = 'shiftjis'
+    end
+  when /^u/i  # UTF8
+    Tk.encoding = 'utf-8'
+    Tk.encoding_system = 'utf-8'
+  else        # NONE
+    if defined? DEFAULT_TK_ENCODING
+      Tk.encoding_system = DEFAULT_TK_ENCODING
+    end
+    begin
+      Tk.encoding = Tk.encoding_system
+    rescue StandardError, NameError
+      Tk.encoding = 'utf-8'
+      Tk.encoding_system = 'utf-8'
+    end
+  end
+
+else
+  # dummy methods
+  class TclTkIp
+    attr_accessor :encoding
+
+    alias __eval _eval
+    alias __invoke _invoke
+
+    alias _eval_with_enc _eval
+    alias _invoke_with_enc _invoke
+  end
+
+  module Tk
+    module Encoding
+      extend Encoding
+
+      def encoding=(name)
+        nil
+      end
+      def encoding
+        nil
+      end
+      def encoding_names
+        nil
+      end
+      def encoding_system
+        nil
+      end
+      def encoding_system=(enc)
+        nil
+      end
+
+      def encoding_convertfrom(str, enc=None)
+        str
+      end
+      alias encoding_convert_from encoding_convertfrom
+
+      def encoding_convertto(str, enc=None)
+        str
+      end
+      alias encoding_convert_to encoding_convertto
+      def encoding_dirs
+        nil
+      end
+      def encoding_dirs=(dir_array)
+        nil
+      end
+    end
+
+    extend Encoding
+  end
+end
+
+
+module TkBindCore
+  #def bind(context, cmd=Proc.new, *args)
+  #  Tk.bind(self, context, cmd, *args)
+  #end
+  def bind(context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    Tk.bind(self, context, cmd, *args)
+  end
+
+  #def bind_append(context, cmd=Proc.new, *args)
+  #  Tk.bind_append(self, context, cmd, *args)
+  #end
+  def bind_append(context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    Tk.bind_append(self, context, cmd, *args)
+  end
+
+  def bind_remove(context)
+    Tk.bind_remove(self, context)
+  end
+
+  def bindinfo(context=nil)
+    Tk.bindinfo(self, context)
+  end
+end
+
+
+module TkTreatFont
+  def __font_optkeys
+    ['font']
+  end
+  private :__font_optkeys
+
+  def __pathname
+    self.path
+  end
+  private :__pathname
+
+  ################################
+
+  def font_configinfo(key = nil)
+    optkeys = __font_optkeys
+    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
+      fail ArgumentError, "unknown font option name `#{key}'"
+    end
+
+    win, tag = __pathname.split(':')
+
+    if key
+      pathname = [win, tag, key].join(';')
+      TkFont.used_on(pathname) || 
+        TkFont.init_widget_font(pathname, *__confinfo_cmd)
+    elsif optkeys.size == 1
+      pathname = [win, tag, optkeys[0]].join(';')
+      TkFont.used_on(pathname) || 
+        TkFont.init_widget_font(pathname, *__confinfo_cmd)
+    else
+      fonts = {}
+      optkeys.each{|key|
+        key = key.to_s
+        pathname = [win, tag, key].join(';')
+        fonts[key] = 
+          TkFont.used_on(pathname) || 
+          TkFont.init_widget_font(pathname, *__confinfo_cmd)
+      }
+      fonts
+    end
+  end
+  alias fontobj font_configinfo
+
+  def font_configure(slot)
+    pathname = __pathname
+
+    slot = _symbolkey2str(slot)
+
+    __font_optkeys.each{|optkey|
+      optkey = optkey.to_s
+      l_optkey = 'latin' << optkey
+      a_optkey = 'ascii' << optkey
+      k_optkey = 'kanji' << optkey
+
+      if slot.key?(optkey)
+        fnt = slot.delete(optkey)
+        if fnt.kind_of?(TkFont)
+          slot.delete(l_optkey)
+          slot.delete(a_optkey)
+          slot.delete(k_optkey)
+
+          fnt.call_font_configure([pathname, optkey], *(__config_cmd << {}))
+          next
+        else
+          if fnt
+            if (slot.key?(l_optkey) || 
+                slot.key?(a_optkey) || 
+                slot.key?(k_optkey))
+              fnt = TkFont.new(fnt)
+
+              lfnt = slot.delete(l_optkey)
+              lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
+              kfnt = slot.delete(k_optkey)
+
+              fnt.latin_replace(lfnt) if lfnt
+              fnt.kanji_replace(kfnt) if kfnt
+
+              fnt.call_font_configure([pathname, optkey], 
+                                      *(__config_cmd << {}))
+              next
+            else
+              fnt = hash_kv(fnt) if fnt.kind_of?(Hash)
+              tk_call(*(__config_cmd << "-#{optkey}" << fnt))
+            end
+          end
+          next
+        end
+      end
+
+      lfnt = slot.delete(l_optkey)
+      lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
+      kfnt = slot.delete(k_optkey)
+
+      if lfnt && kfnt
+        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey], 
+                                                   *(__config_cmd << {}))
+      elsif lfnt
+        latinfont_configure([lfnt, optkey])
+      elsif kfnt
+        kanjifont_configure([kfnt, optkey])
+      end
+    }
+
+    # configure other (without font) options
+    tk_call(*(__config_cmd.concat(hash_kv(slot)))) if slot != {}
+    self
+  end
+
+  def latinfont_configure(ltn, keys=nil)
+    if ltn.kind_of?(Array)
+      key = ltn[1]
+      ltn = ltn[0]
+    else
+      key = nil
+    end
+
+    optkeys = __font_optkeys
+    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
+      fail ArgumentError, "unknown font option name `#{key}'"
+    end
+
+    win, tag = __pathname.split(':')
+
+    optkeys = [key] if key
+
+    optkeys.each{|optkey|
+      optkey = optkey.to_s
+
+      pathname = [win, tag, optkey].join(';')
+
+      if (fobj = TkFont.used_on(pathname))
+        fobj = TkFont.new(fobj) # create a new TkFont object
+      elsif Tk::JAPANIZED_TK
+        fobj = fontobj          # create a new TkFont object
+      else
+        ltn = hash_kv(ltn) if ltn.kind_of?(Hash)
+        tk_call(*(__config_cmd << "-#{optkey}" << ltn))
+        next
+      end
+
+      if fobj.kind_of?(TkFont)
+        if ltn.kind_of?(TkFont)
+          conf = {}
+          ltn.latin_configinfo.each{|key,val| conf[key] = val}
+          if keys
+            fobj.latin_configure(conf.update(keys))
+          else
+            fobj.latin_configure(conf)
+          end
+        else
+          fobj.latin_replace(ltn)
+        end
+      end
+
+      fobj.call_font_configure([pathname, optkey], *(__config_cmd << {}))
+    }
+    self
+  end
+  alias asciifont_configure latinfont_configure
+
+  def kanjifont_configure(knj, keys=nil)
+    if knj.kind_of?(Array)
+      key = knj[1]
+      knj = knj[0]
+    else
+      key = nil
+    end
+
+    optkeys = __font_optkeys
+    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
+      fail ArgumentError, "unknown font option name `#{key}'"
+    end
+
+    win, tag = __pathname.split(':')
+
+    optkeys = [key] if key
+
+    optkeys.each{|optkey|
+      optkey = optkey.to_s
+
+      pathname = [win, tag, optkey].join(';')
+
+      if (fobj = TkFont.used_on(pathname))
+        fobj = TkFont.new(fobj) # create a new TkFont object
+      elsif Tk::JAPANIZED_TK
+        fobj = fontobj          # create a new TkFont object
+      else
+        knj = hash_kv(knj) if knj.kind_of?(Hash)
+        tk_call(*(__config_cmd << "-#{optkey}" << knj))
+        next
+      end
+
+      if fobj.kind_of?(TkFont)
+        if knj.kind_of?(TkFont)
+          conf = {}
+          knj.kanji_configinfo.each{|key,val| conf[key] = val}
+          if keys
+            fobj.kanji_configure(conf.update(keys))
+          else
+            fobj.kanji_configure(conf)
+          end
+        else
+          fobj.kanji_replace(knj)
+        end
+      end
+
+      fobj.call_font_configure([pathname, optkey], *(__config_cmd << {}))
+    }
+    self
+  end
+
+  def font_copy(win, wintag=nil, winkey=nil, targetkey=nil)
+    if wintag
+      if winkey
+        fnt = win.tagfontobj(wintag, winkey).dup
+      else
+        fnt = win.tagfontobj(wintag).dup
+      end
+    else
+      if winkey
+        fnt = win.fontobj(winkey).dup
+      else
+        fnt = win.fontobj.dup
+      end
+    end
+
+    if targetkey
+      fnt.call_font_configure([__pathname, targetkey], *(__config_cmd << {}))
+    else
+      fnt.call_font_configure(__pathname, *(__config_cmd << {}))
+    end
+    self
+  end
+
+  def latinfont_copy(win, wintag=nil, winkey=nil, targetkey=nil)
+    if targetkey
+      fontobj(targetkey).dup.call_font_configure([__pathname, targetkey], 
+                                                 *(__config_cmd << {}))
+    else
+      fontobj.dup.call_font_configure(__pathname, *(__config_cmd << {}))
+    end
+
+    if wintag
+      if winkey
+        fontobj.latin_replace(win.tagfontobj(wintag, winkey).latin_font_id)
+      else
+        fontobj.latin_replace(win.tagfontobj(wintag).latin_font_id)
+      end
+    else
+      if winkey
+        fontobj.latin_replace(win.fontobj(winkey).latin_font_id)
+      else
+        fontobj.latin_replace(win.fontobj.latin_font_id)
+      end
+    end
+    self
+  end
+  alias asciifont_copy latinfont_copy
+
+  def kanjifont_copy(win, wintag=nil, winkey=nil, targetkey=nil)
+    if targetkey
+      fontobj(targetkey).dup.call_font_configure([__pathname, targetkey], 
+                                                 *(__config_cmd << {}))
+    else
+        fontobj.dup.call_font_configure(__pathname, *(__config_cmd << {}))
+    end
+
+    if wintag
+      if winkey
+        fontobj.kanji_replace(win.tagfontobj(wintag, winkey).kanji_font_id)
+      else
+        fontobj.kanji_replace(win.tagfontobj(wintag).kanji_font_id)
+      end
+    else
+      if winkey
+        fontobj.kanji_replace(win.fontobj(winkey).kanji_font_id)
+      else
+        fontobj.kanji_replace(win.fontobj.kanji_font_id)
+      end
+    end
+    self
+  end
+end
+
+
+module TkConfigMethod
+  include TkUtil
+  include TkTreatFont
+
+  def __cget_cmd
+    [self.path, 'cget']
+  end
+  private :__cget_cmd
+
+  def __config_cmd
+    [self.path, 'configure']
+  end
+  private :__config_cmd
+
+  def __confinfo_cmd
+    __config_cmd
+  end
+  private :__confinfo_cmd
+
+  def __configinfo_struct
+    {:key=>0, :alias=>1, :db_name=>1, :db_class=>2, 
+      :default_value=>3, :current_value=>4}
+  end
+  private :__configinfo_struct
+
+  def __numval_optkeys
+    []
+  end
+  private :__numval_optkeys
+
+  def __numstrval_optkeys
+    []
+  end
+  private :__numstrval_optkeys
+
+  def __boolval_optkeys
+    ['exportselection', 'jump', 'setgrid', 'takefocus']
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    [
+      'text', 'label', 'show', 'data', 'file', 
+      'activebackground', 'activeforeground', 'background', 
+      'disabledforeground', 'disabledbackground', 'foreground', 
+      'highlightbackground', 'highlightcolor', 'insertbackground', 
+      'selectbackground', 'selectforeground', 'troughcolor'
+    ]
+  end
+  private :__strval_optkeys
+
+  def __listval_optkeys
+    []
+  end
+  private :__listval_optkeys
+
+  def __numlistval_optkeys
+    []
+  end
+  private :__numlistval_optkeys
+
+  def __tkvariable_optkeys
+    ['variable', 'textvariable']
+  end
+  private :__tkvariable_optkeys
+
+  def __val2ruby_optkeys  # { key=>proc, ... }
+    # The method is used to convert a opt-value to a ruby's object.
+    # When get the value of the option "key", "proc.call(value)" is called.
+    {}
+  end
+  private :__val2ruby_optkeys
+
+  def __ruby2val_optkeys  # { key=>proc, ... }
+    # The method is used to convert a ruby's object to a opt-value.
+    # When set the value of the option "key", "proc.call(value)" is called.
+    # That is, "-#{key} #{proc.call(value)}".
+    {}
+  end
+  private :__ruby2val_optkeys
+
+  def __methodcall_optkeys  # { key=>method, ... }
+    # The method is used to both of get and set.
+    # Usually, the 'key' will not be a widget option.
+    {}
+  end
+  private :__methodcall_optkeys
+
+  def __keyonly_optkeys  # { def_key=>undef_key or nil, ... }
+    {}
+  end
+  private :__keyonly_optkeys
+
+  def __conv_keyonly_opts(keys)
+    return keys unless keys.kind_of?(Hash)
+    keyonly = __keyonly_optkeys
+    keys2 = {}
+    keys.each{|k, v|
+      optkey = keyonly.find{|kk,vv| kk.to_s == k.to_s}
+      if optkey
+        defkey, undefkey = optkey
+        if v
+          keys2[defkey.to_s] = None
+        elsif undefkey
+          keys2[undefkey.to_s] = None
+        else
+          # remove key
+        end
+      else
+        keys2[k.to_s] = v
+      end
+    }
+    keys2
+  end
+  private :__conv_keyonly_opts
+
+  def config_hash_kv(keys, enc_mode = nil, conf = nil)
+    hash_kv(__conv_keyonly_opts(keys), enc_mode, conf)
+  end
+
+  ################################
+
+  def [](id)
+    cget(id)
+  end
+
+  def []=(id, val)
+    configure(id, val)
+    val
+  end
+
+  def cget(slot)
+    orig_slot = slot
+    slot = slot.to_s
+ 
+   if slot.length == 0
+      fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
+    end
+
+    if ( method = _symbolkey2str(__val2ruby_optkeys())[slot] )
+      optval = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
+      begin
+        return method.call(optval)
+      rescue => e
+        warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+        return optval
+      end
+    end
+
+    if ( method = _symbolkey2str(__methodcall_optkeys)[slot] )
+      return self.__send__(method)
+    end
+
+    case slot
+    when /^(#{__numval_optkeys.join('|')})$/
+      begin
+        number(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+      rescue
+        nil
+      end
+
+    when /^(#{__numstrval_optkeys.join('|')})$/
+      num_or_str(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+
+    when /^(#{__boolval_optkeys.join('|')})$/
+      begin
+        bool(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+      rescue
+        nil
+      end
+
+    when /^(#{__listval_optkeys.join('|')})$/
+      simplelist(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+
+    when /^(#{__numlistval_optkeys.join('|')})$/
+      conf = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
+      if conf =~ /^[0-9+-]/
+        list(conf)
+      else
+        conf
+      end
+
+    when /^(#{__strval_optkeys.join('|')})$/
+      _fromUTF8(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+
+    when /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/
+      fontcode = $1
+      fontkey  = $2
+      fnt = tk_tcl2ruby(tk_call_without_enc(*(__cget_cmd << "-#{fontkey}")), true)
+      unless fnt.kind_of?(TkFont)
+        fnt = fontobj(fontkey)
+      end
+      if fontcode == 'kanji' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+
+    when /^(#{__tkvariable_optkeys.join('|')})$/
+      v = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
+      (v.empty?)? nil: TkVarAccess.new(v)
+
+    else
+      tk_tcl2ruby(tk_call_without_enc(*(__cget_cmd << "-#{slot}")), true)
+    end
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of? Hash
+      slot = _symbolkey2str(slot)
+
+      __methodcall_optkeys.each{|key, method|
+        value = slot.delete(key.to_s)
+        self.__send__(method, value) if value
+      }
+
+      __ruby2val_optkeys.each{|key, method|
+        key = key.to_s
+        slot[key] = method.call(slot[key]) if slot.has_key?(key)
+      }
+
+      __keyonly_optkeys.each{|defkey, undefkey|
+        conf = slot.find{|kk, vv| kk == defkey.to_s}
+        if conf
+          k, v = conf
+          if v
+            slot[k] = None
+          else
+            slot[undefkey.to_s] = None if undefkey
+            slot.delete(k)
+          end
+        end
+      }
+
+      if (slot.find{|k, v| k =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/})
+        font_configure(slot)
+      elsif slot.size > 0
+        tk_call(*(__config_cmd.concat(hash_kv(slot))))
+      end
+
+    else
+      orig_slot = slot
+      slot = slot.to_s
+      if slot.length == 0
+        fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
+      end
+
+      if ( conf = __keyonly_optkeys.find{|k, v| k.to_s == slot} )
+        defkey, undefkey = conf
+        if value
+          tk_call(*(__config_cmd << "-#{defkey}"))
+        elsif undefkey
+          tk_call(*(__config_cmd << "-#{undefkey}"))
+        end
+      elsif ( method = _symbolkey2str(__ruby2val_optkeys)[slot] )
+        tk_call(*(__config_cmd << "-#{slot}" << method.call(value)))
+      elsif ( method = _symbolkey2str(__methodcall_optkeys)[slot] )
+        self.__send__(method, value)
+      elsif (slot =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
+        if value == None
+          fontobj($2)
+        else
+          font_configure({slot=>value})
+        end
+      else
+        tk_call(*(__config_cmd << "-#{slot}" << value))
+      end
+    end
+    self
+  end
+
+  def configure_cmd(slot, value)
+    configure(slot, install_cmd(value))
+  end
+
+  def configinfo(slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if (slot && 
+          slot.to_s =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
+        fontkey  = $2
+        # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}"))))
+        conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}")), false, true)
+        conf[__configinfo_struct[:key]] = 
+          conf[__configinfo_struct[:key]][1..-1]
+        if ( ! __configinfo_struct[:alias] \
+            || conf.size > __configinfo_struct[:alias] + 1 )
+          conf[__configinfo_struct[:current_value]] = fontobj(fontkey)
+        elsif ( __configinfo_struct[:alias] \
+               && conf.size == __configinfo_struct[:alias] + 1 \
+               && conf[__configinfo_struct[:alias]][0] == ?- )
+          conf[__configinfo_struct[:alias]] = 
+            conf[__configinfo_struct[:alias]][1..-1]
+        end
+        conf
+      else
+        if slot
+          slot = slot.to_s
+          case slot
+          when /^(#{__val2ruby_optkeys().keys.join('|')})$/
+            method = _symbolkey2str(__val2ruby_optkeys())[slot]
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd() << "-#{slot}")), false, true)
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] )
+              optval = conf[__configinfo_struct[:default_value]]
+              begin
+                val = method.call(optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__configinfo_struct[:default_value]] = val
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              optval = conf[__configinfo_struct[:current_value]]
+              begin
+                val = method.call(optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__configinfo_struct[:current_value]] = val
+            end
+
+          when /^(#{__methodcall_optkeys.keys.join('|')})$/
+            method = _symbolkey2str(__methodcall_optkeys)[slot]
+            return [slot, '', '', '', self.__send__(method)]
+
+          when /^(#{__numval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]])
+              begin
+                conf[__configinfo_struct[:default_value]] = 
+                  number(conf[__configinfo_struct[:default_value]])
+              rescue
+                conf[__configinfo_struct[:default_value]] = nil
+              end
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              begin
+                conf[__configinfo_struct[:current_value]] = 
+                  number(conf[__configinfo_struct[:current_value]])
+              rescue
+                conf[__configinfo_struct[:current_value]] = nil
+              end
+            end
+
+          when /^(#{__numstrval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]])
+              conf[__configinfo_struct[:default_value]] = 
+                num_or_str(conf[__configinfo_struct[:default_value]])
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              conf[__configinfo_struct[:current_value]] = 
+                num_or_str(conf[__configinfo_struct[:current_value]])
+            end
+
+          when /^(#{__boolval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]])
+              begin
+                conf[__configinfo_struct[:default_value]] = 
+                  bool(conf[__configinfo_struct[:default_value]])
+              rescue
+                conf[__configinfo_struct[:default_value]] = nil
+              end
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              begin
+                conf[__configinfo_struct[:current_value]] = 
+                  bool(conf[__configinfo_struct[:current_value]])
+              rescue
+                conf[__configinfo_struct[:current_value]] = nil
+              end
+            end
+
+          when /^(#{__listval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]])
+              conf[__configinfo_struct[:default_value]] = 
+                simplelist(conf[__configinfo_struct[:default_value]])
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              conf[__configinfo_struct[:current_value]] = 
+                simplelist(conf[__configinfo_struct[:current_value]])
+            end
+
+          when /^(#{__numlistval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] \
+                && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
+              conf[__configinfo_struct[:default_value]] = 
+                list(conf[__configinfo_struct[:default_value]])
+            end
+            if ( conf[__configinfo_struct[:current_value]] \
+                && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
+              conf[__configinfo_struct[:current_value]] = 
+                list(conf[__configinfo_struct[:current_value]])
+            end
+
+          when /^(#{__strval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+          when /^(#{__tkvariable_optkeys.join('|')})$/
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]])
+              v = conf[__configinfo_struct[:default_value]]
+              if v.empty?
+                conf[__configinfo_struct[:default_value]] = nil
+              else
+                conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
+              end
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              v = conf[__configinfo_struct[:current_value]]
+              if v.empty?
+                conf[__configinfo_struct[:current_value]] = nil
+              else
+                conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
+              end
+            end
+
+          else
+            # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
+          end
+          conf[__configinfo_struct[:key]] = 
+            conf[__configinfo_struct[:key]][1..-1]
+
+          if ( __configinfo_struct[:alias] \
+              && conf.size == __configinfo_struct[:alias] + 1 \
+              && conf[__configinfo_struct[:alias]][0] == ?- )
+            conf[__configinfo_struct[:alias]] = 
+              conf[__configinfo_struct[:alias]][1..-1]
+          end
+
+          conf
+
+        else
+          # ret = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*__confinfo_cmd))).collect{|conflist|
+          #  conf = tk_split_simplelist(conflist)
+          ret = tk_split_simplelist(tk_call_without_enc(*__confinfo_cmd), false, false).collect{|conflist|
+            conf = tk_split_simplelist(conflist, false, true)
+            conf[__configinfo_struct[:key]] = 
+              conf[__configinfo_struct[:key]][1..-1]
+
+            optkey = conf[__configinfo_struct[:key]]
+            case optkey
+            when /^(#{__val2ruby_optkeys().keys.join('|')})$/
+              method = _symbolkey2str(__val2ruby_optkeys())[optkey]
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                optval = conf[__configinfo_struct[:default_value]]
+                begin
+                  val = method.call(optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__configinfo_struct[:default_value]] = val
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                optval = conf[__configinfo_struct[:current_value]]
+                begin
+                  val = method.call(optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__configinfo_struct[:current_value]] = val
+              end
+
+            when /^(#{__strval_optkeys.join('|')})$/
+              # do nothing
+
+            when /^(#{__numval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                begin
+                  conf[__configinfo_struct[:default_value]] = 
+                    number(conf[__configinfo_struct[:default_value]])
+                rescue
+                  conf[__configinfo_struct[:default_value]] = nil
+                end
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                begin
+                  conf[__configinfo_struct[:current_value]] = 
+                    number(conf[__configinfo_struct[:current_value]])
+                rescue
+                  conf[__configinfo_struct[:current_value]] = nil
+                end
+              end
+
+            when /^(#{__numstrval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                conf[__configinfo_struct[:default_value]] = 
+                  num_or_str(conf[__configinfo_struct[:default_value]])
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                conf[__configinfo_struct[:current_value]] = 
+                  num_or_str(conf[__configinfo_struct[:current_value]])
+              end
+
+            when /^(#{__boolval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                begin
+                  conf[__configinfo_struct[:default_value]] = 
+                    bool(conf[__configinfo_struct[:default_value]])
+                rescue
+                  conf[__configinfo_struct[:default_value]] = nil
+                end
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                begin
+                  conf[__configinfo_struct[:current_value]] = 
+                    bool(conf[__configinfo_struct[:current_value]])
+                rescue
+                  conf[__configinfo_struct[:current_value]] = nil
+                end
+              end
+
+            when /^(#{__listval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                conf[__configinfo_struct[:default_value]] = 
+                  simplelist(conf[__configinfo_struct[:default_value]])
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                conf[__configinfo_struct[:current_value]] = 
+                  simplelist(conf[__configinfo_struct[:current_value]])
+              end
+
+            when /^(#{__numlistval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] \
+                  && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
+                conf[__configinfo_struct[:default_value]] = 
+                  list(conf[__configinfo_struct[:default_value]])
+              end
+              if ( conf[__configinfo_struct[:current_value]] \
+                  && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
+                conf[__configinfo_struct[:current_value]] = 
+                  list(conf[__configinfo_struct[:current_value]])
+              end
+
+            when /^(#{__tkvariable_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                v = conf[__configinfo_struct[:default_value]]
+                if v.empty?
+                  conf[__configinfo_struct[:default_value]] = nil
+                else
+                  conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
+                end
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                v = conf[__configinfo_struct[:current_value]]
+                if v.empty?
+                  conf[__configinfo_struct[:current_value]] = nil
+                else
+                  conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
+                end
+              end
+
+            else
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                if conf[__configinfo_struct[:default_value]].index('{')
+                  conf[__configinfo_struct[:default_value]] = 
+                    tk_split_list(conf[__configinfo_struct[:default_value]]) 
+                else
+                  conf[__configinfo_struct[:default_value]] = 
+                    tk_tcl2ruby(conf[__configinfo_struct[:default_value]]) 
+                end
+              end
+              if conf[__configinfo_struct[:current_value]]
+                if conf[__configinfo_struct[:current_value]].index('{')
+                  conf[__configinfo_struct[:current_value]] = 
+                    tk_split_list(conf[__configinfo_struct[:current_value]]) 
+                else
+                  conf[__configinfo_struct[:current_value]] = 
+                    tk_tcl2ruby(conf[__configinfo_struct[:current_value]]) 
+                end
+              end
+            end
+
+            if ( __configinfo_struct[:alias] \
+                && conf.size == __configinfo_struct[:alias] + 1 \
+                && conf[__configinfo_struct[:alias]][0] == ?- )
+              conf[__configinfo_struct[:alias]] = 
+                conf[__configinfo_struct[:alias]][1..-1]
+            end
+
+            conf
+          }
+
+          __font_optkeys.each{|optkey|
+            optkey = optkey.to_s
+            fontconf = ret.assoc(optkey)
+            if fontconf && fontconf.size > 2
+              ret.delete_if{|inf| inf[0] =~ /^(|latin|ascii|kanji)#{optkey}$/}
+              fontconf[__configinfo_struct[:current_value]] = fontobj(optkey)
+              ret.push(fontconf)
+            end
+          }
+
+          __methodcall_optkeys.each{|optkey, method|
+            ret << [optkey.to_s, '', '', '', self.__send__(method)]
+          }
+
+          ret
+        end
+      end
+
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if (slot && 
+          slot.to_s =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
+        fontkey  = $2
+        # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}"))))
+        conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{fontkey}")), false, true)
+        conf[__configinfo_struct[:key]] = 
+          conf[__configinfo_struct[:key]][1..-1]
+
+        if ( ! __configinfo_struct[:alias] \
+            || conf.size > __configinfo_struct[:alias] + 1 )
+          conf[__configinfo_struct[:current_value]] = fontobj(fontkey)
+          { conf.shift => conf }
+        elsif ( __configinfo_struct[:alias] \
+               && conf.size == __configinfo_struct[:alias] + 1 )
+          if conf[__configinfo_struct[:alias]][0] == ?-
+            conf[__configinfo_struct[:alias]] = 
+              conf[__configinfo_struct[:alias]][1..-1]
+          end
+          { conf[0] => conf[1] }
+        else
+          { conf.shift => conf }
+        end
+      else
+        if slot
+          slot = slot.to_s
+          case slot
+          when /^(#{__val2ruby_optkeys().keys.join('|')})$/
+            method = _symbolkey2str(__val2ruby_optkeys())[slot]
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] )
+              optval = conf[__configinfo_struct[:default_value]]
+              begin
+                val = method.call(optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__configinfo_struct[:default_value]] = val
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              optval = conf[__configinfo_struct[:current_value]]
+              begin
+                val = method.call(optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__configinfo_struct[:current_value]] = val
+            end
+
+          when /^(#{__methodcall_optkeys.keys.join('|')})$/
+            method = _symbolkey2str(__methodcall_optkeys)[slot]
+            return {slot => ['', '', '', self.__send__(method)]}
+
+          when /^(#{__numval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] )
+              begin
+                conf[__configinfo_struct[:default_value]] = 
+                  number(conf[__configinfo_struct[:default_value]])
+              rescue
+                conf[__configinfo_struct[:default_value]] = nil
+              end
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              begin
+                conf[__configinfo_struct[:current_value]] = 
+                  number(conf[__configinfo_struct[:current_value]])
+              rescue
+                conf[__configinfo_struct[:current_value]] = nil
+              end
+            end
+
+          when /^(#{__numstrval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] )
+              conf[__configinfo_struct[:default_value]] = 
+                num_or_str(conf[__configinfo_struct[:default_value]])
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              conf[__configinfo_struct[:current_value]] = 
+                num_or_str(conf[__configinfo_struct[:current_value]])
+            end
+
+          when /^(#{__boolval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] )
+              begin
+                conf[__configinfo_struct[:default_value]] = 
+                  bool(conf[__configinfo_struct[:default_value]])
+              rescue
+                conf[__configinfo_struct[:default_value]] = nil
+              end
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              begin
+                conf[__configinfo_struct[:current_value]] = 
+                  bool(conf[__configinfo_struct[:current_value]])
+              rescue
+                conf[__configinfo_struct[:current_value]] = nil
+              end
+            end
+
+          when /^(#{__listval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] )
+              conf[__configinfo_struct[:default_value]] = 
+                simplelist(conf[__configinfo_struct[:default_value]])
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              conf[__configinfo_struct[:current_value]] = 
+                simplelist(conf[__configinfo_struct[:current_value]])
+            end
+
+          when /^(#{__numlistval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] \
+                && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
+              conf[__configinfo_struct[:default_value]] = 
+                list(conf[__configinfo_struct[:default_value]])
+            end
+            if ( conf[__configinfo_struct[:current_value]] \
+                && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
+              conf[__configinfo_struct[:current_value]] = 
+                list(conf[__configinfo_struct[:current_value]])
+            end
+
+          when /^(#{__tkvariable_optkeys.join('|')})$/
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] )
+              v = conf[__configinfo_struct[:default_value]]
+              if v.empty?
+                conf[__configinfo_struct[:default_value]] = nil
+              else
+                conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
+              end
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              v = conf[__configinfo_struct[:current_value]]
+              if v.empty?
+                conf[__configinfo_struct[:current_value]] = nil
+              else
+                conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
+              end
+            end
+
+          when /^(#{__strval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+          else
+            # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
+          end
+          conf[__configinfo_struct[:key]] = 
+            conf[__configinfo_struct[:key]][1..-1]
+
+          if ( __configinfo_struct[:alias] \
+              && conf.size == __configinfo_struct[:alias] + 1 )
+            if conf[__configinfo_struct[:alias]][0] == ?-
+              conf[__configinfo_struct[:alias]] = 
+                conf[__configinfo_struct[:alias]][1..-1]
+            end
+            { conf[0] => conf[1] }
+          else
+            { conf.shift => conf }
+          end
+
+        else
+          ret = {}
+          # tk_split_simplelist(_fromUTF8(tk_call_without_enc(*__confinfo_cmd))).each{|conflist|
+          #  conf = tk_split_simplelist(conflist)
+          tk_split_simplelist(tk_call_without_enc(*__confinfo_cmd), false, false).each{|conflist|
+            conf = tk_split_simplelist(conflist, false, true)
+            conf[__configinfo_struct[:key]] = 
+              conf[__configinfo_struct[:key]][1..-1]
+
+            optkey = conf[__configinfo_struct[:key]]
+            case optkey
+            when /^(#{__val2ruby_optkeys().keys.join('|')})$/
+              method = _symbolkey2str(__val2ruby_optkeys())[optkey]
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                optval = conf[__configinfo_struct[:default_value]]
+                begin
+                  val = method.call(optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__configinfo_struct[:default_value]] = val
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                optval = conf[__configinfo_struct[:current_value]]
+                begin
+                  val = method.call(optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__configinfo_struct[:current_value]] = val
+              end
+
+            when /^(#{__strval_optkeys.join('|')})$/
+              # do nothing
+
+            when /^(#{__numval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                begin
+                  conf[__configinfo_struct[:default_value]] = 
+                    number(conf[__configinfo_struct[:default_value]])
+                rescue
+                  conf[__configinfo_struct[:default_value]] = nil
+                end
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                begin
+                  conf[__configinfo_struct[:current_value]] = 
+                    number(conf[__configinfo_struct[:current_value]])
+                rescue
+                  conf[__configinfo_struct[:current_value]] = nil
+                end
+              end
+
+            when /^(#{__numstrval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                conf[__configinfo_struct[:default_value]] = 
+                  num_or_str(conf[__configinfo_struct[:default_value]])
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                conf[__configinfo_struct[:current_value]] = 
+                  num_or_str(conf[__configinfo_struct[:current_value]])
+              end
+
+            when /^(#{__boolval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                begin
+                  conf[__configinfo_struct[:default_value]] = 
+                    bool(conf[__configinfo_struct[:default_value]])
+                rescue
+                  conf[__configinfo_struct[:default_value]] = nil
+                end
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                begin
+                  conf[__configinfo_struct[:current_value]] = 
+                    bool(conf[__configinfo_struct[:current_value]])
+                rescue
+                  conf[__configinfo_struct[:current_value]] = nil
+                end
+              end
+
+            when /^(#{__listval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                conf[__configinfo_struct[:default_value]] = 
+                  simplelist(conf[__configinfo_struct[:default_value]])
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                conf[__configinfo_struct[:current_value]] = 
+                  simplelist(conf[__configinfo_struct[:current_value]])
+              end
+
+            when /^(#{__numlistval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] \
+                  && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
+                conf[__configinfo_struct[:default_value]] = 
+                  list(conf[__configinfo_struct[:default_value]])
+              end
+              if ( conf[__configinfo_struct[:current_value]] \
+                  && conf[__configinfo_struct[:current_value]] =~ /^[0-9]/ )
+                conf[__configinfo_struct[:current_value]] = 
+                  list(conf[__configinfo_struct[:current_value]])
+              end
+
+            when /^(#{__tkvariable_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                v = conf[__configinfo_struct[:default_value]]
+                if v.empty?
+                  conf[__configinfo_struct[:default_value]] = nil
+                else
+                  conf[__configinfo_struct[:default_value]] = TkVarAccess.new
+                end
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                v = conf[__configinfo_struct[:current_value]]
+                if v.empty?
+                  conf[__configinfo_struct[:current_value]] = nil
+                else
+                  conf[__configinfo_struct[:current_value]] = TkVarAccess.new
+                end
+              end
+
+            else
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                if conf[__configinfo_struct[:default_value]].index('{')
+                  conf[__configinfo_struct[:default_value]] = 
+                    tk_split_list(conf[__configinfo_struct[:default_value]]) 
+                else
+                  conf[__configinfo_struct[:default_value]] = 
+                    tk_tcl2ruby(conf[__configinfo_struct[:default_value]]) 
+                end
+              end
+              if conf[__configinfo_struct[:current_value]]
+                if conf[__configinfo_struct[:current_value]].index('{')
+                  conf[__configinfo_struct[:current_value]] = 
+                    tk_split_list(conf[__configinfo_struct[:current_value]]) 
+                else
+                  conf[__configinfo_struct[:current_value]] = 
+                    tk_tcl2ruby(conf[__configinfo_struct[:current_value]]) 
+                end
+              end
+            end
+
+            if ( __configinfo_struct[:alias] \
+                && conf.size == __configinfo_struct[:alias] + 1 )
+              if conf[__configinfo_struct[:alias]][0] == ?-
+                conf[__configinfo_struct[:alias]] = 
+                  conf[__configinfo_struct[:alias]][1..-1]
+              end
+              ret[conf[0]] = conf[1]
+            else
+              ret[conf.shift] = conf
+            end
+          }
+
+          __font_optkeys.each{|optkey|
+            optkey = optkey.to_s
+            fontconf = ret[optkey]
+            if fontconf.kind_of?(Array)
+              ret.delete(optkey)
+              ret.delete('latin' << optkey)
+              ret.delete('ascii' << optkey)
+              ret.delete('kanji' << optkey)
+              fontconf[__configinfo_struct[:current_value]] = fontobj(optkey)
+              ret[optkey] = fontconf
+            end
+          }
+
+          __methodcall_optkeys.each{|optkey, method|
+            ret[optkey.to_s] = ['', '', '', self.__send__(method)]
+          }
+
+          ret
+        end
+      end
+    end
+  end
+
+  def current_configinfo(slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        org_slot = slot
+        begin
+          conf = configinfo(slot)
+          if ( ! __configinfo_struct[:alias] \
+              || conf.size > __configinfo_struct[:alias] + 1 )
+            return {conf[0] => conf[-1]}
+          end
+          slot = conf[__configinfo_struct[:alias]]
+        end while(org_slot != slot)
+        fail RuntimeError, 
+          "there is a configure alias loop about '#{org_slot}'"
+      else
+        ret = {}
+        configinfo().each{|conf|
+          if ( ! __configinfo_struct[:alias] \
+              || conf.size > __configinfo_struct[:alias] + 1 )
+            ret[conf[0]] = conf[-1]
+          end
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      configinfo(slot).each{|key, conf| 
+        ret[key] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+end
+
+class TkObject<TkKernel
+  extend  TkCore
+  include Tk
+  include TkConfigMethod
+  include TkBindCore
+
+### --> definition is moved to TkUtil module
+#  def path
+#    @path
+#  end
+
+  def epath
+    @path
+  end
+
+  def to_eval
+    @path
+  end
+
+  def tk_send(cmd, *rest)
+    tk_call(path, cmd, *rest)
+  end
+  def tk_send_without_enc(cmd, *rest)
+    tk_call_without_enc(path, cmd, *rest)
+  end
+  def tk_send_with_enc(cmd, *rest)
+    tk_call_with_enc(path, cmd, *rest)
+  end
+  # private :tk_send, :tk_send_without_enc, :tk_send_with_enc
+
+  def tk_send_to_list(cmd, *rest)
+    tk_call_to_list(path, cmd, *rest)
+  end
+  def tk_send_to_list_without_enc(cmd, *rest)
+    tk_call_to_list_without_enc(path, cmd, *rest)
+  end
+  def tk_send_to_list_with_enc(cmd, *rest)
+    tk_call_to_list_with_enc(path, cmd, *rest)
+  end
+  def tk_send_to_simplelist(cmd, *rest)
+    tk_call_to_simplelist(path, cmd, *rest)
+  end
+  def tk_send_to_simplelist_without_enc(cmd, *rest)
+    tk_call_to_simplelist_without_enc(path, cmd, *rest)
+  end
+  def tk_send_to_simplelist_with_enc(cmd, *rest)
+    tk_call_to_simplelist_with_enc(path, cmd, *rest)
+  end
+
+  def method_missing(id, *args)
+    name = id.id2name
+    case args.length
+    when 1
+      if name[-1] == ?=
+        configure name[0..-2], args[0]
+        args[0]
+      else
+        configure name, args[0]
+        self
+      end
+    when 0
+      begin
+        cget(name)
+      rescue
+        super(id, *args)
+#        fail NameError, 
+#             "undefined local variable or method `#{name}' for #{self.to_s}", 
+#             error_at
+      end
+    else
+      super(id, *args)
+#      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
+    end
+  end
+
+=begin
+  def [](id)
+    cget(id)
+  end
+
+  def []=(id, val)
+    configure(id, val)
+    val
+  end
+=end
+
+  def event_generate(context, keys=nil)
+    if context.kind_of?(TkEvent::Event)
+      context.generate(self, ((keys)? keys: {}))
+    elsif keys
+      #tk_call('event', 'generate', path, 
+      #       "<#{tk_event_sequence(context)}>", *hash_kv(keys))
+      tk_call_without_enc('event', 'generate', path, 
+                          "<#{tk_event_sequence(context)}>", 
+                          *hash_kv(keys, true))
+    else
+      #tk_call('event', 'generate', path, "<#{tk_event_sequence(context)}>")
+      tk_call_without_enc('event', 'generate', path, 
+                          "<#{tk_event_sequence(context)}>")
+    end
+  end
+
+  def tk_trace_variable(v)
+    #unless v.kind_of?(TkVariable)
+    #  fail(ArgumentError, "type error (#{v.class}); must be TkVariable object")
+    #end
+    v
+  end
+  private :tk_trace_variable
+
+  def destroy
+    #tk_call 'trace', 'vdelete', @tk_vn, 'w', @var_id if @var_id
+  end
+end
+
+
+class TkWindow<TkObject
+  include TkWinfo
+  extend TkBindCore
+
+  TkCommandNames = [].freeze
+  ## ==> If TkCommandNames[0] is a string (not a null string), 
+  ##     assume the string is a Tcl/Tk's create command of the widget class. 
+  WidgetClassName = ''.freeze
+  # WidgetClassNames[WidgetClassName] = self  
+  ## ==> If self is a widget class, entry to the WidgetClassNames table.
+  def self.to_eval
+    self::WidgetClassName
+  end
+
+  def initialize(parent=nil, keys=nil)
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      parent = keys.delete('parent')
+      widgetname = keys.delete('widgetname')
+      install_win(if parent then parent.path end, widgetname)
+      without_creating = keys.delete('without_creating')
+      # if without_creating && !widgetname 
+      #   fail ArgumentError, 
+      #        "if set 'without_creating' to true, need to define 'widgetname'"
+      # end
+    elsif keys
+      keys = _symbolkey2str(keys)
+      widgetname = keys.delete('widgetname')
+      install_win(if parent then parent.path end, widgetname)
+      without_creating = keys.delete('without_creating')
+      # if without_creating && !widgetname 
+      #   fail ArgumentError, 
+      #        "if set 'without_creating' to true, need to define 'widgetname'"
+      # end
+    else
+      install_win(if parent then parent.path end)
+    end
+    if self.method(:create_self).arity == 0
+      p 'create_self has no arg' if $DEBUG
+      create_self unless without_creating
+      if keys
+        # tk_call @path, 'configure', *hash_kv(keys)
+        configure(keys)
+      end
+    else
+      p 'create_self has args' if $DEBUG
+      fontkeys = {}
+      methodkeys = {}
+      if keys
+        #['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
+        #  fontkeys[key] = keys.delete(key) if keys.key?(key)
+        #}
+        __font_optkeys.each{|key|
+          fkey = key.to_s
+          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+          fkey = "kanji#{key}"
+          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+          fkey = "latin#{key}"
+          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+          fkey = "ascii#{key}"
+          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+        }
+
+        __methodcall_optkeys.each{|key|
+          key = key.to_s
+          methodkeys[key] = keys.delete(key) if keys.key?(key)
+        }
+
+        __ruby2val_optkeys.each{|key, method|
+          key = key.to_s
+          keys[key] = method.call(keys[key]) if keys.has_key?(key)
+        }
+      end
+      if without_creating && keys
+        #configure(keys)
+        configure(__conv_keyonly_opts(keys))
+      else
+        #create_self(keys)
+        create_self(__conv_keyonly_opts(keys))
+      end
+      font_configure(fontkeys) unless fontkeys.empty?
+      configure(methodkeys) unless methodkeys.empty?
+    end
+  end
+
+  def create_self(keys)
+    # may need to override
+    begin
+      cmd = self.class::TkCommandNames[0]
+      fail unless (cmd.kind_of?(String) && cmd.length > 0)
+    rescue
+      fail RuntimeError, "class #{self.class} may be an abstract class"
+    end
+
+    if keys and keys != None
+      tk_call_without_enc(cmd, @path, *hash_kv(keys, true))
+    else
+      tk_call_without_enc(cmd, @path)
+    end
+  end
+  private :create_self
+
+  def exist?
+    TkWinfo.exist?(self)
+  end
+
+  def bind_class
+    @db_class || self.class()
+  end
+
+  def database_classname
+    TkWinfo.classname(self)
+  end
+  def database_class
+    name = database_classname()
+    if WidgetClassNames[name]
+      WidgetClassNames[name]
+    else
+      TkDatabaseClass.new(name)
+    end
+  end
+  def self.database_classname
+    self::WidgetClassName
+  end
+  def self.database_class
+    WidgetClassNames[self::WidgetClassName]
+  end
+
+  def pack(keys = nil)
+    #tk_call_without_enc('pack', epath, *hash_kv(keys, true))
+    if keys
+      TkPack.configure(self, keys)
+    else
+      TkPack.configure(self)
+    end
+    self
+  end
+
+  def pack_in(target, keys = nil)
+    if keys
+      keys = keys.dup
+      keys['in'] = target
+    else
+      keys = {'in'=>target}
+    end
+    #tk_call 'pack', epath, *hash_kv(keys)
+    TkPack.configure(self, keys)
+    self
+  end
+
+  def pack_forget
+    #tk_call_without_enc('pack', 'forget', epath)
+    TkPack.forget(self)
+    self
+  end
+  alias unpack pack_forget
+
+  def pack_config(slot, value=None)
+    #if slot.kind_of? Hash
+    #  tk_call 'pack', 'configure', epath, *hash_kv(slot)
+    #else
+    #  tk_call 'pack', 'configure', epath, "-#{slot}", value
+    #end
+    if slot.kind_of? Hash
+      TkPack.configure(self, slot)
+    else
+      TkPack.configure(self, slot=>value)
+    end
+  end
+  alias pack_configure pack_config
+
+  def pack_info()
+    #ilist = list(tk_call('pack', 'info', epath))
+    #info = {}
+    #while key = ilist.shift
+    #  info[key[1..-1]] = ilist.shift
+    #end
+    #return info
+    TkPack.info(self)
+  end
+
+  def pack_propagate(mode=None)
+    #if mode == None
+    #  bool(tk_call('pack', 'propagate', epath))
+    #else
+    #  tk_call('pack', 'propagate', epath, mode)
+    #  self
+    #end
+    if mode == None
+      TkPack.propagate(self)
+    else
+      TkPack.propagate(self, mode)
+      self
+    end
+  end
+
+  def pack_slaves()
+    #list(tk_call('pack', 'slaves', epath))
+    TkPack.slaves(self)
+  end
+
+  def grid(keys = nil)
+    #tk_call 'grid', epath, *hash_kv(keys)
+    if keys
+      TkGrid.configure(self, keys)
+    else
+      TkGrid.configure(self)
+    end
+    self
+  end
+
+  def grid_in(target, keys = nil)
+    if keys
+      keys = keys.dup
+      keys['in'] = target
+    else
+      keys = {'in'=>target}
+    end
+    #tk_call 'grid', epath, *hash_kv(keys)
+    TkGrid.configure(self, keys)
+    self
+  end
+
+  def grid_forget
+    #tk_call('grid', 'forget', epath)
+    TkGrid.forget(self)
+    self
+  end
+  alias ungrid grid_forget
+
+  def grid_bbox(*args)
+    #list(tk_call('grid', 'bbox', epath, *args))
+    TkGrid.bbox(self, *args)
+  end
+
+  def grid_config(slot, value=None)
+    #if slot.kind_of? Hash
+    #  tk_call 'grid', 'configure', epath, *hash_kv(slot)
+    #else
+    #  tk_call 'grid', 'configure', epath, "-#{slot}", value
+    #end
+    if slot.kind_of? Hash
+      TkGrid.configure(self, slot)
+    else
+      TkGrid.configure(self, slot=>value)
+    end
+  end
+  alias grid_configure grid_config
+
+  def grid_columnconfig(index, keys)
+    #tk_call('grid', 'columnconfigure', epath, index, *hash_kv(keys))
+    TkGrid.columnconfigure(self, index, keys)
+  end
+  alias grid_columnconfigure grid_columnconfig
+
+  def grid_rowconfig(index, keys)
+    #tk_call('grid', 'rowconfigure', epath, index, *hash_kv(keys))
+    TkGrid.rowconfigure(self, index, keys)
+  end
+  alias grid_rowconfigure grid_rowconfig
+
+  def grid_columnconfiginfo(index, slot=nil)
+    #if slot
+    #  tk_call('grid', 'columnconfigure', epath, index, "-#{slot}").to_i
+    #else
+    #  ilist = list(tk_call('grid', 'columnconfigure', epath, index))
+    #  info = {}
+    #  while key = ilist.shift
+    #   info[key[1..-1]] = ilist.shift
+    #  end
+    #  info
+    #end
+    TkGrid.columnconfiginfo(self, index, slot)
+  end
+
+  def grid_rowconfiginfo(index, slot=nil)
+    #if slot
+    #  tk_call('grid', 'rowconfigure', epath, index, "-#{slot}").to_i
+    #else
+    #  ilist = list(tk_call('grid', 'rowconfigure', epath, index))
+    #  info = {}
+    #  while key = ilist.shift
+    #   info[key[1..-1]] = ilist.shift
+    #  end
+    #  info
+    #end
+    TkGrid.rowconfiginfo(self, index, slot)
+  end
+
+  def grid_info()
+    #list(tk_call('grid', 'info', epath))
+    TkGrid.info(self)
+  end
+
+  def grid_location(x, y)
+    #list(tk_call('grid', 'location', epath, x, y))
+    TkGrid.location(self, x, y)
+  end
+
+  def grid_propagate(mode=None)
+    #if mode == None
+    #  bool(tk_call('grid', 'propagate', epath))
+    #else
+    #  tk_call('grid', 'propagate', epath, mode)
+    #  self
+    #end
+    if mode == None
+      TkGrid.propagate(self)
+    else
+      TkGrid.propagate(self, mode)
+      self
+    end
+  end
+
+  def grid_remove()
+    #tk_call 'grid', 'remove', epath
+    TkGrid.remove(self)
+    self
+  end
+
+  def grid_size()
+    #list(tk_call('grid', 'size', epath))
+    TkGrid.size(self)
+  end
+
+  def grid_slaves(args)
+    #list(tk_call('grid', 'slaves', epath, *hash_kv(args)))
+    TkGrid.slaves(self, args)
+  end
+
+  def place(keys)
+    #tk_call 'place', epath, *hash_kv(keys)
+    TkPlace.configure(self, keys)
+    self
+  end
+
+  def place_in(target, keys = nil)
+    if keys
+      keys = keys.dup
+      keys['in'] = target
+    else
+      keys = {'in'=>target}
+    end
+    #tk_call 'place', epath, *hash_kv(keys)
+    TkPlace.configure(self, keys)
+    self
+  end
+
+  def  place_forget
+    #tk_call 'place', 'forget', epath
+    TkPlace.forget(self)
+    self
+  end
+  alias unplace place_forget
+
+  def place_config(slot, value=None)
+    #if slot.kind_of? Hash
+    #  tk_call 'place', 'configure', epath, *hash_kv(slot)
+    #else
+    #  tk_call 'place', 'configure', epath, "-#{slot}", value
+    #end
+    TkPlace.configure(self, slot, value)
+  end
+  alias place_configure place_config
+
+  def place_configinfo(slot = nil)
+    # for >= Tk8.4a2 ?
+    #if slot
+    #  conf = tk_split_list(tk_call('place', 'configure', epath, "-#{slot}") )
+    #  conf[0] = conf[0][1..-1]
+    #  conf
+    #else
+    #  tk_split_simplelist(tk_call('place', 
+    #                             'configure', epath)).collect{|conflist|
+    #   conf = tk_split_simplelist(conflist)
+    #   conf[0] = conf[0][1..-1]
+    #   conf
+    #  }
+    #end
+    TkPlace.configinfo(self, slot)
+  end
+
+  def place_info()
+    #ilist = list(tk_call('place', 'info', epath))
+    #info = {}
+    #while key = ilist.shift
+    #  info[key[1..-1]] = ilist.shift
+    #end
+    #return info
+    TkPlace.info(self)
+  end
+
+  def place_slaves()
+    #list(tk_call('place', 'slaves', epath))
+    TkPlace.slaves(self)
+  end
+
+  def set_focus(force=false)
+    if force
+      tk_call_without_enc('focus', '-force', path)
+    else
+      tk_call_without_enc('focus', path)
+    end
+    self
+  end
+  alias focus set_focus
+
+  def grab(opt = nil)
+    unless opt
+      tk_call_without_enc('grab', 'set', path)
+      return self
+    end
+
+    case opt
+    when 'set', :set
+      tk_call_without_enc('grab', 'set', path)
+      return self
+    when 'global', :global
+      #return(tk_call('grab', 'set', '-global', path))
+      tk_call_without_enc('grab', 'set', '-global', path)
+      return self
+    when 'release', :release
+      #return tk_call('grab', 'release', path)
+      tk_call_without_enc('grab', 'release', path)
+      return self
+    when 'current', :current
+      return window(tk_call_without_enc('grab', 'current', path))
+    when 'status', :status
+      return tk_call_without_enc('grab', 'status', path)
+    else
+      return tk_call_without_enc('grab', opt, path)
+    end
+  end
+
+  def grab_current
+    grab('current')
+  end
+  alias current_grab grab_current
+  def grab_release
+    grab('release')
+  end
+  alias release_grab grab_release
+  def grab_set
+    grab('set')
+  end
+  alias set_grab grab_set
+  def grab_set_global
+    grab('global')
+  end
+  alias set_global_grab grab_set_global
+  def grab_status
+    grab('status')
+  end
+
+  def lower(below=None)
+    # below = below.epath if below.kind_of?(TkObject)
+    below = _epath(below)
+    tk_call 'lower', epath, below
+    self
+  end
+  alias lower_window lower
+  def raise(above=None)
+    #above = above.epath if above.kind_of?(TkObject)
+    above = _epath(above)
+    tk_call 'raise', epath, above
+    self
+  end
+  alias raise_window raise
+
+  def command(cmd=nil, &b)
+    if cmd
+      configure_cmd('command', cmd)
+    elsif b
+      configure_cmd('command', Proc.new(&b))
+    else
+      cget('command')
+    end
+  end
+
+  def colormodel(model=None)
+    tk_call('tk', 'colormodel', path, model)
+    self
+  end
+
+  def caret(keys=nil)
+    TkXIM.caret(path, keys)
+  end
+
+  def destroy
+    super
+    children = []
+    rexp = /^#{self.path}\.[^.]+$/
+    TkCore::INTERP.tk_windows.each{|path, obj|
+      children << [path, obj] if path =~ rexp
+    }
+    if defined?(@cmdtbl)
+      for id in @cmdtbl
+        uninstall_cmd id
+      end
+    end
+
+    children.each{|path, obj|
+      if defined?(@cmdtbl)
+        for id in @cmdtbl
+          uninstall_cmd id
+        end
+      end
+      TkCore::INTERP.tk_windows.delete(path)
+    }
+
+    begin
+      tk_call_without_enc('destroy', epath)
+    rescue
+    end
+    uninstall_win
+  end
+
+  def wait_visibility(on_thread = true)
+    if $SAFE >= 4
+      fail SecurityError, "can't wait visibility at $SAFE >= 4"
+    end
+    on_thread &= (Thread.list.size != 1)
+    if on_thread
+      INTERP._thread_tkwait('visibility', path)
+    else
+      INTERP._invoke('tkwait', 'visibility', path)
+    end
+  end
+  def eventloop_wait_visibility
+    wait_visibility(false)
+  end
+  def thread_wait_visibility
+    wait_visibility(true)
+  end
+  alias wait wait_visibility
+  alias tkwait wait_visibility
+  alias eventloop_wait eventloop_wait_visibility
+  alias eventloop_tkwait eventloop_wait_visibility
+  alias eventloop_tkwait_visibility eventloop_wait_visibility
+  alias thread_wait thread_wait_visibility
+  alias thread_tkwait thread_wait_visibility
+  alias thread_tkwait_visibility thread_wait_visibility
+
+  def wait_destroy(on_thread = true)
+    if $SAFE >= 4
+      fail SecurityError, "can't wait destroy at $SAFE >= 4"
+    end
+    on_thread &= (Thread.list.size != 1)
+    if on_thread
+      INTERP._thread_tkwait('window', epath)
+    else
+      INTERP._invoke('tkwait', 'window', epath)
+    end
+  end
+  alias wait_window wait_destroy
+  def eventloop_wait_destroy
+    wait_destroy(false)
+  end
+  alias eventloop_wait_window eventloop_wait_destroy
+  def thread_wait_destroy
+    wait_destroy(true)
+  end
+  alias thread_wait_window thread_wait_destroy
+
+  alias tkwait_destroy wait_destroy
+  alias tkwait_window wait_destroy
+
+  alias eventloop_tkwait_destroy eventloop_wait_destroy
+  alias eventloop_tkwait_window eventloop_wait_destroy
+
+  alias thread_tkwait_destroy thread_wait_destroy
+  alias thread_tkwait_window thread_wait_destroy
+
+  def bindtags(taglist=nil)
+    if taglist
+      fail ArgumentError, "taglist must be Array" unless taglist.kind_of? Array
+      tk_call('bindtags', path, taglist)
+      taglist
+    else
+      list(tk_call('bindtags', path)).collect{|tag|
+        if tag.kind_of?(String) 
+          if cls = WidgetClassNames[tag]
+            cls
+          elsif btag = TkBindTag.id2obj(tag)
+            btag
+          else
+            tag
+          end
+        else
+          tag
+        end
+      }
+    end
+  end
+
+  def bindtags=(taglist)
+    bindtags(taglist)
+    taglist
+  end
+
+  def bindtags_shift
+    taglist = bindtags
+    tag = taglist.shift
+    bindtags(taglist)
+    tag
+  end
+
+  def bindtags_unshift(tag)
+    bindtags(bindtags().unshift(tag))
+  end
+end
+
+
+# freeze core modules
+#TclTkLib.freeze
+#TclTkIp.freeze
+#TkUtil.freeze
+#TkKernel.freeze
+#TkComm.freeze
+#TkComm::Event.freeze
+#TkCore.freeze
+#Tk.freeze
+
+module Tk
+  RELEASE_DATE = '2007-01-26'.freeze
+
+  autoload :AUTO_PATH,        'tk/variable'
+  autoload :TCL_PACKAGE_PATH, 'tk/variable'
+  autoload :PACKAGE_PATH,     'tk/variable'
+  autoload :TCL_LIBRARY_PATH, 'tk/variable'
+  autoload :LIBRARY_PATH,     'tk/variable'
+  autoload :TCL_PRECISION,    'tk/variable'
+end
+
+# call setup script for Tk extension libraries (base configuration)
+begin
+  require 'tkextlib/version.rb'
+  require 'tkextlib/setup.rb'
+rescue LoadError
+  # ignore
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/after.rb b/ruby_1_8_6/ext/tk/lib/tk/after.rb
new file mode 100644
index 0000000000..8c58210331
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/after.rb
@@ -0,0 +1,6 @@
+#
+#   tk/after.rb : methods for Tcl/Tk after command
+#
+#   $Id$
+#
+require 'tk/timer'
diff --git a/ruby_1_8_6/ext/tk/lib/tk/autoload.rb b/ruby_1_8_6/ext/tk/lib/tk/autoload.rb
new file mode 100644
index 0000000000..6b3773f4ea
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/autoload.rb
@@ -0,0 +1,196 @@
+#
+#  autoload
+#
+
+#######################
+#  geometry manager
+autoload :TkGrid,             'tk/grid'
+def TkGrid(*args); TkGrid.configure(*args); end
+
+autoload :TkPack,             'tk/pack'
+def TkPack(*args); TkPack.configure(*args); end
+
+autoload :TkPlace,            'tk/place'
+def TkPlace(*args); TkPlace.configure(*args); end
+
+
+#######################
+# others
+autoload :TkBgError,          'tk/bgerror'
+
+autoload :TkBindTag,          'tk/bindtag'
+autoload :TkBindTagAll,       'tk/bindtag'
+autoload :TkDatabaseClass,    'tk/bindtag'
+
+autoload :TkButton,           'tk/button'
+
+autoload :TkConsole,          'tk/console'
+
+autoload :TkCanvas,           'tk/canvas'
+
+autoload :TkcTagAccess,       'tk/canvastag'
+autoload :TkcTag,             'tk/canvastag'
+autoload :TkcTagString,       'tk/canvastag'
+autoload :TkcNamedTag,        'tk/canvastag'
+autoload :TkcTagAll,          'tk/canvastag'
+autoload :TkcTagCurrent,      'tk/canvastag'
+autoload :TkcTagGroup,        'tk/canvastag'
+
+autoload :TkCheckButton,      'tk/checkbutton'
+autoload :TkCheckbutton,      'tk/checkbutton'
+
+autoload :TkClipboard,        'tk/clipboard'
+
+autoload :TkComposite,        'tk/composite'
+
+autoload :TkConsole,          'tk/console'
+
+autoload :TkDialog,           'tk/dialog'
+autoload :TkDialog2,          'tk/dialog'
+autoload :TkDialogObj,        'tk/dialog'
+autoload :TkWarning,          'tk/dialog'
+autoload :TkWarning2,         'tk/dialog'
+autoload :TkWarningObj,       'tk/dialog'
+
+autoload :TkEntry,            'tk/entry'
+
+autoload :TkEvent,            'tk/event'
+
+autoload :TkFont,             'tk/font'
+autoload :TkTreatTagFont,     'tk/font'
+
+autoload :TkFrame,            'tk/frame'
+
+autoload :TkImage,            'tk/image'
+autoload :TkBitmapImage,      'tk/image'
+autoload :TkPhotoImage,       'tk/image'
+
+autoload :TkItemConfigMethod, 'tk/itemconfig'
+
+autoload :TkTreatItemFont,    'tk/itemfont'
+
+autoload :TkKinput,           'tk/kinput'
+
+autoload :TkLabel,            'tk/label'
+
+autoload :TkLabelFrame,       'tk/labelframe'
+autoload :TkLabelframe,       'tk/labelframe'
+
+autoload :TkListbox,          'tk/listbox'
+
+autoload :TkMacResource,      'tk/macpkg'
+
+autoload :TkMenu,             'tk/menu'
+autoload :TkMenuClone,        'tk/menu'
+autoload :TkSystemMenu,       'tk/menu'
+autoload :TkSysMenu_Help,     'tk/menu'
+autoload :TkSysMenu_System,   'tk/menu'
+autoload :TkSysMenu_Apple,    'tk/menu'
+autoload :TkMenubutton,       'tk/menu'
+autoload :TkOptionMenubutton, 'tk/menu'
+
+autoload :TkMenubar,          'tk/menubar'
+
+autoload :TkMenuSpec,         'tk/menuspec'
+
+autoload :TkMessage,          'tk/message'
+
+autoload :TkManageFocus,      'tk/mngfocus'
+
+autoload :TkMsgCatalog,       'tk/msgcat'
+autoload :TkMsgCat,           'tk/msgcat'
+
+autoload :TkNamespace,        'tk/namespace'
+
+autoload :TkOptionDB,         'tk/optiondb'
+autoload :TkOption,           'tk/optiondb'
+autoload :TkResourceDB,       'tk/optiondb'
+
+autoload :TkPackage,          'tk/package'
+
+autoload :TkPalette,          'tk/palette'
+
+autoload :TkPanedWindow,      'tk/panedwindow'
+autoload :TkPanedwindow,      'tk/panedwindow'
+
+autoload :TkRadioButton,      'tk/radiobutton'
+autoload :TkRadiobutton,      'tk/radiobutton'
+
+autoload :TkRoot,             'tk/root'
+
+autoload :TkScale,            'tk/scale'
+
+autoload :TkScrollbar,        'tk/scrollbar'
+autoload :TkXScrollbar,       'tk/scrollbar'
+autoload :TkYScrollbar,       'tk/scrollbar'
+
+autoload :TkScrollbox,        'tk/scrollbox'
+
+autoload :TkSelection,        'tk/selection'
+
+autoload :TkSpinbox,          'tk/spinbox'
+
+autoload :TkTreatTagFont,     'tk/tagfont'
+
+autoload :TkText,             'tk/text'
+
+autoload :TkTextImage,        'tk/textimage'
+
+autoload :TkTextMark,         'tk/textmark'
+autoload :TkTextNamedMark,    'tk/textmark'
+autoload :TkTextMarkInsert,   'tk/textmark'
+autoload :TkTextMarkCurrent,  'tk/textmark'
+autoload :TkTextMarkAnchor,   'tk/textmark'
+
+autoload :TkTextTag,          'tk/texttag'
+autoload :TkTextNamedTag,     'tk/texttag'
+autoload :TkTextTagSel,       'tk/texttag'
+
+autoload :TkTextWindow,       'tk/textwindow'
+
+autoload :TkAfter,            'tk/timer'
+autoload :TkTimer,            'tk/timer'
+autoload :TkRTTimer,          'tk/timer'
+
+autoload :TkToplevel,         'tk/toplevel'
+
+autoload :TkTextWin,          'tk/txtwin_abst'
+
+autoload :TkValidation,       'tk/validation'
+
+autoload :TkVariable,         'tk/variable'
+autoload :TkVarAccess,        'tk/variable'
+
+autoload :TkVirtualEvent,     'tk/virtevent'
+autoload :TkNamedVirtualEvent,'tk/virtevent'
+
+autoload :TkWinfo,            'tk/winfo'
+
+autoload :TkWinDDE,           'tk/winpkg'
+autoload :TkWinRegistry,      'tk/winpkg'
+
+autoload :TkXIM,              'tk/xim'
+
+
+#######################
+# sub-module of Tk
+module Tk
+  autoload :Clock,            'tk/clock'
+  autoload :OptionObj,        'tk/optionobj'
+  autoload :X_Scrollable,     'tk/scrollable'
+  autoload :Y_Scrollable,     'tk/scrollable'
+  autoload :Scrollable,       'tk/scrollable'
+  autoload :Wm,               'tk/wm'
+
+  autoload :ValidateConfigure,     'tk/validation'
+  autoload :ItemValidateConfigure, 'tk/validation'
+
+  autoload :EncodedString,    'tk/encodedstr'
+  def Tk.EncodedString(str, enc = nil); Tk::EncodedString.new(str, enc); end
+
+  autoload :BinaryString,     'tk/encodedstr'
+  def Tk.BinaryString(str); Tk::BinaryString.new(str); end
+
+  autoload :UTF8_String,      'tk/encodedstr'
+  def Tk.UTF8_String(str); Tk::UTF8_String.new(str); end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/bgerror.rb b/ruby_1_8_6/ext/tk/lib/tk/bgerror.rb
new file mode 100644
index 0000000000..c82a8e046b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/bgerror.rb
@@ -0,0 +1,29 @@
+#
+#  tkbgerror -- bgerror ( tkerror ) module
+#                     1998/07/16 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+require 'tk'
+
+module TkBgError
+  extend Tk
+
+  TkCommandNames = ['bgerror'.freeze].freeze
+
+  def bgerror(message)
+    tk_call('bgerror', message)
+  end
+  alias tkerror bgerror
+  alias show bgerror
+  module_function :bgerror, :tkerror, :show
+
+  def set_handler(hdlr = Proc.new) #==> handler :: proc{|msg| ...body... }
+    tk_call('proc', 'bgerror', 'msg', install_cmd(hdlr) + ' $msg')
+  end
+  def set_default
+    begin
+      tk_call('rename', 'bgerror', '')
+    rescue RuntimeError
+    end
+  end
+  module_function :set_handler, :set_default
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/bindtag.rb b/ruby_1_8_6/ext/tk/lib/tk/bindtag.rb
new file mode 100644
index 0000000000..9023a08e06
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/bindtag.rb
@@ -0,0 +1,81 @@
+#
+# tk/bind.rb : control event binding
+#
+require 'tk'
+
+class TkBindTag
+  include TkBindCore
+
+  #BTagID_TBL = {}
+  BTagID_TBL = TkCore::INTERP.create_table
+  Tk_BINDTAG_ID = ["btag".freeze, "00000".taint].freeze
+
+  TkCore::INTERP.init_ip_env{ BTagID_TBL.clear }
+
+  def TkBindTag.id2obj(id)
+    BTagID_TBL[id]? BTagID_TBL[id]: id
+  end
+
+  def TkBindTag.new_by_name(name, *args, &b)
+    return BTagID_TBL[name] if BTagID_TBL[name]
+    self.new.instance_eval{
+      BTagID_TBL.delete @id
+      @id = name
+      BTagID_TBL[@id] = self
+      bind(*args, &b) if args != []
+      self
+    }
+  end
+
+  def initialize(*args, &b)
+    # @id = Tk_BINDTAG_ID.join('')
+    @id = Tk_BINDTAG_ID.join(TkCore::INTERP._ip_id_)
+    Tk_BINDTAG_ID[1].succ!
+    BTagID_TBL[@id] = self
+    bind(*args, &b) if args != []
+  end
+
+  ALL = self.new_by_name('all')
+
+  def name
+    @id
+  end
+
+  def to_eval
+    @id
+  end
+
+  def inspect
+    #Kernel.format "#<TkBindTag: %s>", @id
+    '#<TkBindTag: ' + @id + '>'
+  end
+end
+
+
+class TkBindTagAll<TkBindTag
+  def TkBindTagAll.new(*args, &b)
+    $stderr.puts "Warning: TkBindTagALL is obsolete. Use TkBindTag::ALL\n"
+
+    TkBindTag::ALL.bind(*args, &b) if args != []
+    TkBindTag::ALL
+  end
+end
+
+
+class TkDatabaseClass<TkBindTag
+  def self.new(name, *args, &b)
+    return BTagID_TBL[name] if BTagID_TBL[name]
+    super(name, *args, &b)
+  end
+
+  def initialize(name, *args, &b)
+    @id = name
+    BTagID_TBL[@id] = self
+    bind(*args, &b) if args != []
+  end
+
+  def inspect
+    #Kernel.format "#<TkDatabaseClass: %s>", @id
+    '#<TkDatabaseClass: ' + @id + '>'
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/button.rb b/ruby_1_8_6/ext/tk/lib/tk/button.rb
new file mode 100644
index 0000000000..407a47c400
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/button.rb
@@ -0,0 +1,27 @@
+#
+# tk/button.rb : treat button widget
+#
+require 'tk'
+require 'tk/label'
+
+class TkButton<TkLabel
+  TkCommandNames = ['button'.freeze].freeze
+  WidgetClassName = 'Button'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('button', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('button', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def invoke
+    _fromUTF8(tk_send_without_enc('invoke'))
+  end
+  def flash
+    tk_send_without_enc('flash')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/canvas.rb b/ruby_1_8_6/ext/tk/lib/tk/canvas.rb
new file mode 100644
index 0000000000..c30fd79bb9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/canvas.rb
@@ -0,0 +1,759 @@
+#
+#               tk/canvas.rb - Tk canvas classes
+#                       $Date$
+#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
+#
+require 'tk'
+require 'tk/canvastag'
+require 'tk/itemconfig'
+require 'tk/scrollable'
+
+module TkCanvasItemConfig
+  include TkItemConfigMethod
+
+  def __item_strval_optkeys(id)
+    # maybe need to override
+    super(id) + [
+      'fill', 'activefill', 'disabledfill', 
+      'outline', 'activeoutline', 'disabledoutline'
+    ]
+  end
+  private :__item_strval_optkeys
+
+  def __item_methodcall_optkeys(id)
+    {'coords'=>'coords'}
+  end
+  private :__item_methodcall_optkeys
+
+  def __item_val2ruby_optkeys(id)  # { key=>proc, ... }
+    super(id).update('window'=>proc{|i, v| window(v)})
+  end
+  private :__item_val2ruby_optkeys
+
+  def __item_pathname(tagOrId)
+    if tagOrId.kind_of?(TkcItem) || tagOrId.kind_of?(TkcTag)
+      self.path + ';' + tagOrId.id.to_s
+    else
+      self.path + ';' + tagOrId.to_s
+    end
+  end
+  private :__item_pathname
+end
+
+class TkCanvas<TkWindow
+  include TkCanvasItemConfig
+  include Tk::Scrollable
+
+  TkCommandNames = ['canvas'.freeze].freeze
+  WidgetClassName = 'Canvas'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __destroy_hook__
+    TkcItem::CItemID_TBL.delete(@path)
+  end
+
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('canvas', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('canvas', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def __numval_optkeys
+    super() + ['closeenough']
+  end
+  private :__numval_optkeys
+
+  def __boolval_optkeys
+    super() + ['confine']
+  end
+  private :__boolval_optkeys
+
+  def tagid(tag)
+    if tag.kind_of?(TkcItem) || tag.kind_of?(TkcTag)
+      tag.id
+    else
+      tag  # maybe an Array of configure paramters
+    end
+  end
+  private :tagid
+
+
+  # create a canvas item without creating a TkcItem object
+  def create(type, *args)
+    type.create(self, *args)
+  end
+
+
+  def addtag(tag, mode, *args)
+    mode = mode.to_s
+    if args[0] && mode =~ /^(above|below|with(tag)?)$/
+      args[0] = tagid(args[0])
+    end
+    tk_send_without_enc('addtag', tagid(tag), mode, *args)
+    self
+  end
+  def addtag_above(tagOrId, target)
+    addtag(tagOrId, 'above', tagid(target))
+  end
+  def addtag_all(tagOrId)
+    addtag(tagOrId, 'all')
+  end
+  def addtag_below(tagOrId, target)
+    addtag(tagOrId, 'below', tagid(target))
+  end
+  def addtag_closest(tagOrId, x, y, halo=None, start=None)
+    addtag(tagOrId, 'closest', x, y, halo, start)
+  end
+  def addtag_enclosed(tagOrId, x1, y1, x2, y2)
+    addtag(tagOrId, 'enclosed', x1, y1, x2, y2)
+  end
+  def addtag_overlapping(tagOrId, x1, y1, x2, y2)
+    addtag(tagOrId, 'overlapping', x1, y1, x2, y2)
+  end
+  def addtag_withtag(tagOrId, tag)
+    addtag(tagOrId, 'withtag', tagid(tag))
+  end
+
+  def bbox(tagOrId, *tags)
+    list(tk_send_without_enc('bbox', tagid(tagOrId), 
+                             *tags.collect{|t| tagid(t)}))
+  end
+
+  #def itembind(tag, context, cmd=Proc.new, *args)
+  #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
+  #  self
+  #end
+  def itembind(tag, context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([path, "bind", tagid(tag)], context, cmd, *args)
+    self
+  end
+
+  #def itembind_append(tag, context, cmd=Proc.new, *args)
+  #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
+  #  self
+  #end
+  def itembind_append(tag, context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
+    self
+  end
+
+  def itembind_remove(tag, context)
+    _bind_remove([path, "bind", tagid(tag)], context)
+    self
+  end
+
+  def itembindinfo(tag, context=nil)
+    _bindinfo([path, "bind", tagid(tag)], context)
+  end
+
+  def canvasx(screen_x, *args)
+    #tk_tcl2ruby(tk_send_without_enc('canvasx', screen_x, *args))
+    number(tk_send_without_enc('canvasx', screen_x, *args))
+  end
+  def canvasy(screen_y, *args)
+    #tk_tcl2ruby(tk_send_without_enc('canvasy', screen_y, *args))
+    number(tk_send_without_enc('canvasy', screen_y, *args))
+  end
+
+  def coords(tag, *args)
+    if args == []
+      tk_split_list(tk_send_without_enc('coords', tagid(tag)))
+    else
+      tk_send_without_enc('coords', tagid(tag), *(args.flatten))
+      self
+    end
+  end
+
+  def dchars(tag, first, last=None)
+    tk_send_without_enc('dchars', tagid(tag), 
+                        _get_eval_enc_str(first), _get_eval_enc_str(last))
+    self
+  end
+
+  def delete(*args)
+    if TkcItem::CItemID_TBL[self.path]
+      args.each{|tag|
+        find('withtag', tag).each{|item|
+          if item.kind_of?(TkcItem)
+            TkcItem::CItemID_TBL[self.path].delete(item.id)
+          end
+        }
+      }
+    end
+    tk_send_without_enc('delete', *args.collect{|t| tagid(t)})
+    self
+  end
+  alias remove delete
+
+  def dtag(tag, tag_to_del=None)
+    tk_send_without_enc('dtag', tagid(tag), tagid(tag_to_del))
+    self
+  end
+  alias deltag dtag
+
+  def find(mode, *args)
+    list(tk_send_without_enc('find', mode, *args)).collect!{|id| 
+      TkcItem.id2obj(self, id)
+    }
+  end
+  def find_above(target)
+    find('above', tagid(target))
+  end
+  def find_all
+    find('all')
+  end
+  def find_below(target)
+    find('below', tagid(target))
+  end
+  def find_closest(x, y, halo=None, start=None)
+    find('closest', x, y, halo, start)
+  end
+  def find_enclosed(x1, y1, x2, y2)
+    find('enclosed', x1, y1, x2, y2)
+  end
+  def find_overlapping(x1, y1, x2, y2)
+    find('overlapping', x1, y1, x2, y2)
+  end
+  def find_withtag(tag)
+    find('withtag', tag)
+  end
+
+  def itemfocus(tagOrId=nil)
+    if tagOrId
+      tk_send_without_enc('focus', tagid(tagOrId))
+      self
+    else
+      ret = tk_send_without_enc('focus')
+      if ret == ""
+        nil
+      else
+        TkcItem.id2obj(self, ret)
+      end
+    end
+  end
+
+  def gettags(tagOrId)
+    list(tk_send_without_enc('gettags', tagid(tagOrId))).collect{|tag|
+      TkcTag.id2obj(self, tag)
+    }
+  end
+
+  def icursor(tagOrId, index)
+    tk_send_without_enc('icursor', tagid(tagOrId), index)
+    self
+  end
+
+  def index(tagOrId, idx)
+    number(tk_send_without_enc('index', tagid(tagOrId), idx))
+  end
+
+  def insert(tagOrId, index, string)
+    tk_send_without_enc('insert', tagid(tagOrId), index, 
+                        _get_eval_enc_str(string))
+    self
+  end
+
+=begin
+  def itemcget(tagOrId, option)
+    case option.to_s
+    when 'dash', 'activedash', 'disableddash'
+      conf = tk_send_without_enc('itemcget', tagid(tagOrId), "-#{option}")
+      if conf =~ /^[0-9]/
+        list(conf)
+      else
+        conf
+      end
+    when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
+      _fromUTF8(tk_send_without_enc('itemcget', tagid(tagOrId), "-#{option}"))
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_send('itemcget', tagid(tagOrId), "-#{option}"))
+      fnt = tk_tcl2ruby(_fromUTF8(tk_send_with_enc('itemcget', tagid(tagOrId), '-font')))
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(tagid(tagOrId), fnt)
+      end
+      if option.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', tagid(tagOrId), 
+                                                "-#{option}")))
+    end
+  end
+
+  def itemconfigure(tagOrId, key, value=None)
+    if key.kind_of? Hash
+      key = _symbolkey2str(key)
+      coords = key.delete('coords')
+      self.coords(tagOrId, coords) if coords
+
+      if ( key['font'] || key['kanjifont'] \
+          || key['latinfont'] || key['asciifont'] )
+        tagfont_configure(tagid(tagOrId), key.dup)
+      else
+        _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), 
+                                      *hash_kv(key, true)))
+      end
+
+    else
+      if ( key == 'coords' || key == :coords )
+        self.coords(tagOrId, value)
+      elsif ( key == 'font' || key == :font || 
+              key == 'kanjifont' || key == :kanjifont || 
+              key == 'latinfont' || key == :latinfont || 
+              key == 'asciifont' || key == :asciifont )
+        if value == None
+          tagfontobj(tagid(tagOrId))
+        else
+          tagfont_configure(tagid(tagOrId), {key=>value})
+        end
+      else
+        _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), 
+                                      "-#{key}", _get_eval_enc_str(value)))
+      end
+    end
+    self
+  end
+#  def itemconfigure(tagOrId, key, value=None)
+#    if key.kind_of? Hash
+#      tk_send 'itemconfigure', tagid(tagOrId), *hash_kv(key)
+#    else
+#      tk_send 'itemconfigure', tagid(tagOrId), "-#{key}", value
+#    end
+#  end
+#  def itemconfigure(tagOrId, keys)
+#    tk_send 'itemconfigure', tagid(tagOrId), *hash_kv(keys)
+#  end
+
+  def itemconfiginfo(tagOrId, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'coords'
+          return ['coords', '', '', '', self.coords(tagOrId)]
+        when 'dash', 'activedash', 'disableddash'
+          conf = tk_split_simplelist(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}"))
+          if conf[3] && conf[3] =~ /^[0-9]/
+            conf[3] = list(conf[3])
+          end
+          if conf[4] && conf[4] =~ /^[0-9]/
+            conf[4] = list(conf[4])
+          end
+        when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),"-#{key}")))
+          conf[4] = tagfont_configinfo(tagid(tagOrId), conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        ret = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId)))).collect{|conflist|
+          conf = tk_split_simplelist(conflist)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
+          when 'dash', 'activedash', 'disableddash'
+            if conf[3] && conf[3] =~ /^[0-9]/
+              conf[3] = list(conf[3])
+            end
+            if conf[4] && conf[4] =~ /^[0-9]/
+              conf[4] = list(conf[4])
+            end
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4]) 
+              else
+                conf[4] = tk_tcl2ruby(conf[4]) 
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+
+        fontconf = ret.assoc('font')
+        if fontconf
+          ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
+          fontconf[4] = tagfont_configinfo(tagid(tagOrId), fontconf[4])
+          ret.push(fontconf)
+        end
+
+        ret << ['coords', '', '', '', self.coords(tagOrId)]
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'coords'
+          {'coords' => ['', '', '', self.coords(tagOrId)]}
+        when 'dash', 'activedash', 'disableddash'
+          conf = tk_split_simplelist(tk_send_without_enc('itemconfigure', 
+                                                         tagid(tagOrId), 
+                                                         "-#{key}"))
+          if conf[3] && conf[3] =~ /^[0-9]/
+            conf[3] = list(conf[3])
+          end
+          if conf[4] && conf[4] =~ /^[0-9]/
+            conf[4] = list(conf[4])
+          end
+        when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),"-#{key}")))
+          conf[4] = tagfont_configinfo(tagid(tagOrId), conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId)))).each{|conflist|
+          conf = tk_split_simplelist(conflist)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
+          when 'dash', 'activedash', 'disableddash'
+            if conf[2] && conf[2] =~ /^[0-9]/
+              conf[2] = list(conf[2])
+            end
+            if conf[3] && conf[3] =~ /^[0-9]/
+              conf[3] = list(conf[3])
+            end
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2]) 
+              else
+                conf[2] = tk_tcl2ruby(conf[2]) 
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+
+        fontconf = ret['font']
+        if fontconf
+          ret.delete('font')
+          ret.delete('kanjifont')
+          fontconf[3] = tagfont_configinfo(tagid(tagOrId), fontconf[3])
+          ret['font'] = fontconf
+        end
+
+        ret['coords'] = ['', '', '', self.coords(tagOrId)]
+
+        ret
+      end
+    end
+  end
+
+  def current_itemconfiginfo(tagOrId, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        conf = itemconfiginfo(tagOrId, key)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        itemconfiginfo(tagOrId).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      itemconfiginfo(tagOrId, key).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+=end
+
+  def lower(tag, below=nil)
+    if below
+      tk_send_without_enc('lower', tagid(tag), tagid(below))
+    else
+      tk_send_without_enc('lower', tagid(tag))
+    end
+    self
+  end
+
+  def move(tag, x, y)
+    tk_send_without_enc('move', tagid(tag), x, y)
+    self
+  end
+
+  def postscript(keys)
+    tk_send("postscript", *hash_kv(keys))
+  end
+
+  def raise(tag, above=nil)
+    if above
+      tk_send_without_enc('raise', tagid(tag), tagid(above))
+    else
+      tk_send_without_enc('raise', tagid(tag))
+    end
+    self
+  end
+
+  def scale(tag, x, y, xs, ys)
+    tk_send_without_enc('scale', tagid(tag), x, y, xs, ys)
+    self
+  end
+
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y, gain=None)
+    tk_send_without_enc('scan', 'dragto', x, y, gain)
+    self
+  end
+
+  def select(mode, *args)
+    r = tk_send_without_enc('select', mode, *args)
+    (mode == 'item')? TkcItem.id2obj(self, r): self
+  end
+  def select_adjust(tagOrId, index)
+    select('adjust', tagid(tagOrId), index)
+  end
+  def select_clear
+    select('clear')
+  end
+  def select_from(tagOrId, index)
+    select('from', tagid(tagOrId), index)
+  end
+  def select_item
+    select('item')
+  end
+  def select_to(tagOrId, index)
+    select('to', tagid(tagOrId), index)
+  end
+
+  def itemtype(tag)
+    TkcItem.type2class(tk_send('type', tagid(tag)))
+  end
+end
+
+class TkcItem<TkObject
+  extend Tk
+  include TkcTagAccess
+  extend TkItemFontOptkeys
+  extend TkItemConfigOptkeys
+
+  CItemTypeName = nil
+  CItemTypeToClass = {}
+  CItemID_TBL = TkCore::INTERP.create_table
+
+  TkCore::INTERP.init_ip_env{ CItemID_TBL.clear }
+
+  def TkcItem.type2class(type)
+    CItemTypeToClass[type]
+  end
+
+  def TkcItem.id2obj(canvas, id)
+    cpath = canvas.path
+    return id unless CItemID_TBL[cpath]
+    CItemID_TBL[cpath][id]? CItemID_TBL[cpath][id]: id
+  end
+
+  ########################################
+  def self._parse_create_args(args)
+    fontkeys = {}
+    methodkeys = {}
+    if args[-1].kind_of? Hash
+      keys = _symbolkey2str(args.pop)
+      if args.size == 0
+        args = keys.delete('coords')
+        unless args.kind_of?(Array)
+          fail "coords parameter must be given by an Array"
+        end
+      end
+
+      #['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
+      #  fontkeys[key] = keys.delete(key) if keys.key?(key)
+      #}
+      __item_font_optkeys(nil).each{|key|
+        fkey = key.to_s
+        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+        fkey = "kanji#{key}"
+        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+        fkey = "latin#{key}"
+        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+        fkey = "ascii#{key}"
+        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+      }
+
+      __item_methodcall_optkeys(nil).each{|key|
+        key = key.to_s
+        methodkeys[key] = keys.delete(key) if keys.key?(key)
+      }
+
+      __item_ruby2val_optkeys(nil).each{|key, method|
+        key = key.to_s
+        keys[key] = method.call(keys[key]) if keys.has_key?(key)
+      }
+
+      #args = args.flatten.concat(hash_kv(keys))
+      args = args.flatten.concat(itemconfig_hash_kv(nil, keys))
+    else
+      args = args.flatten
+    end
+
+    [args, fontkeys]
+  end
+  private_class_method :_parse_create_args
+
+  def self.create(canvas, *args)
+    unless self::CItemTypeName
+      fail RuntimeError, "#{self} is an abstract class"
+    end
+    args, fontkeys = _parse_create_args(args)
+    idnum = tk_call_without_enc(canvas.path, 'create', 
+                                self::CItemTypeName, *args)
+    canvas.itemconfigure(idnum, fontkeys) unless fontkeys.empty?
+    idnum.to_i  # 'canvas item id' is an integer number
+  end
+  ########################################
+
+  def initialize(parent, *args)
+    #unless parent.kind_of?(TkCanvas)
+    #  fail ArgumentError, "expect TkCanvas for 1st argument"
+    #end
+    @parent = @c = parent
+    @path = parent.path
+
+    @id = create_self(*args) # an integer number as 'canvas item id'
+    CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
+    CItemID_TBL[@path][@id] = self
+  end
+  def create_self(*args)
+    self.class.create(@c, *args) # return an integer number as 'canvas item id'
+  end
+  private :create_self
+
+  def id
+    @id
+  end
+
+  def exist?
+    if @c.find_withtag(@id)
+      true
+    else
+      false
+    end
+  end
+
+  def delete
+    @c.delete @id
+    CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
+    self
+  end
+  alias remove  delete
+  alias destroy delete
+end
+
+class TkcArc<TkcItem
+  CItemTypeName = 'arc'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcBitmap<TkcItem
+  CItemTypeName = 'bitmap'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcImage<TkcItem
+  CItemTypeName = 'image'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcLine<TkcItem
+  CItemTypeName = 'line'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcOval<TkcItem
+  CItemTypeName = 'oval'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcPolygon<TkcItem
+  CItemTypeName = 'polygon'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcRectangle<TkcItem
+  CItemTypeName = 'rectangle'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcText<TkcItem
+  CItemTypeName = 'text'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+  def self.create(canvas, *args)
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+      txt = keys['text']
+      keys['text'] = _get_eval_enc_str(txt) if txt
+      args.push(keys)
+    end
+    super(canvas, *args)
+  end
+end
+
+class TkcWindow<TkcItem
+  CItemTypeName = 'window'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+  def self.create(canvas, *args)
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+      win = keys['window']
+      # keys['window'] = win.epath if win.kind_of?(TkWindow)
+      keys['window'] = _epath(win) if win
+      args.push(keys)
+    end
+    super(canvas, *args)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/canvastag.rb b/ruby_1_8_6/ext/tk/lib/tk/canvastag.rb
new file mode 100644
index 0000000000..a5650ee68b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/canvastag.rb
@@ -0,0 +1,375 @@
+#
+# tk/canvastag.rb - methods for treating canvas tags
+#
+require 'tk'
+require 'tk/tagfont'
+
+module TkcTagAccess
+  include TkComm
+  include TkTreatTagFont
+end
+
+require 'tk/canvas'
+
+module TkcTagAccess
+  def addtag(tag)
+    @c.addtag(tag, 'withtag', @id)
+    self
+  end
+
+  def bbox
+    @c.bbox(@id)
+  end
+
+  #def bind(seq, cmd=Proc.new, *args)
+  #  @c.itembind(@id, seq, cmd, *args)
+  #  self
+  #end
+  def bind(seq, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    @c.itembind(@id, seq, cmd, *args)
+    self
+  end
+
+  #def bind_append(seq, cmd=Proc.new, *args)
+  #  @c.itembind_append(@id, seq, cmd, *args)
+  #  self
+  #end
+  def bind_append(seq, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    @c.itembind_append(@id, seq, cmd, *args)
+    self
+  end
+
+  def bind_remove(seq)
+    @c.itembind_remove(@id, seq)
+    self
+  end
+
+  def bindinfo(seq=nil)
+    @c.itembindinfo(@id, seq)
+  end
+
+  def cget(option)
+    @c.itemcget(@id, option)
+  end
+
+  def configure(key, value=None)
+    @c.itemconfigure(@id, key, value)
+    self
+  end
+#  def configure(keys)
+#    @c.itemconfigure @id, keys
+#  end
+
+  def configinfo(key=nil)
+    @c.itemconfiginfo(@id, key)
+  end
+
+  def current_configinfo(key=nil)
+    @c.current_itemconfiginfo(@id, key)
+  end
+
+  def coords(*args)
+    @c.coords(@id, *args)
+  end
+
+  def dchars(first, last=None)
+    @c.dchars(@id, first, last)
+    self
+  end
+
+  def dtag(tag_to_del=None)
+    @c.dtag(@id, tag_to_del)
+    self
+  end
+  alias deltag dtag
+
+  def find
+    @c.find('withtag', @id)
+  end
+  alias list find
+
+  def focus
+    @c.itemfocus(@id)
+  end
+
+  def gettags
+    @c.gettags(@id)
+  end
+
+  def icursor(index)
+    @c.icursor(@id, index)
+    self
+  end
+
+  def index(idx)
+    @c.index(@id, idx)
+  end
+
+  def insert(beforethis, string)
+    @c.insert(@id, beforethis, string)
+    self
+  end
+
+  def lower(belowthis=None)
+    @c.lower(@id, belowthis)
+    self
+  end
+
+  def move(xamount, yamount)
+    @c.move(@id, xamount, yamount)
+    self
+  end
+
+  def raise(abovethis=None)
+    @c.raise(@id, abovethis)
+    self
+  end
+
+  def scale(xorigin, yorigin, xscale, yscale)
+    @c.scale(@id, xorigin, yorigin, xscale, yscale)
+    self
+  end
+
+  def select_adjust(index)
+    @c.select('adjust', @id, index)
+    self
+  end
+  def select_from(index)
+    @c.select('from', @id, index)
+    self
+  end
+  def select_to(index)
+    @c.select('to', @id, index)
+    self
+  end
+
+  def itemtype
+    @c.itemtype(@id)
+  end
+
+  # Following operators support logical expressions of canvas tags
+  # (for Tk8.3+).
+  # If tag1.path is 't1' and tag2.path is 't2', then
+  #      ltag = tag1 & tag2; ltag.path => "(t1)&&(t2)"
+  #      ltag = tag1 | tag2; ltag.path => "(t1)||(t2)"
+  #      ltag = tag1 ^ tag2; ltag.path => "(t1)^(t2)"
+  #      ltag = - tag1;      ltag.path => "!(t1)"
+  def & (tag)
+    if tag.kind_of? TkObject
+      TkcTagString.new(@c, '(' + @id + ')&&(' + tag.path + ')')
+    else
+      TkcTagString.new(@c, '(' + @id + ')&&(' + tag.to_s + ')')
+    end
+  end
+
+  def | (tag)
+    if tag.kind_of? TkObject
+      TkcTagString.new(@c, '(' + @id + ')||(' + tag.path + ')')
+    else
+      TkcTagString.new(@c, '(' + @id + ')||(' + tag.to_s + ')')
+    end
+  end
+
+  def ^ (tag)
+    if tag.kind_of? TkObject
+      TkcTagString.new(@c, '(' + @id + ')^(' + tag.path + ')')
+    else
+      TkcTagString.new(@c, '(' + @id + ')^(' + tag.to_s + ')')
+    end
+  end
+
+  def -@
+    TkcTagString.new(@c, '!(' + @id + ')')
+  end
+end
+
+class TkcTag<TkObject
+  include TkcTagAccess
+
+  CTagID_TBL = TkCore::INTERP.create_table
+  Tk_CanvasTag_ID = ['ctag'.freeze, '00000'.taint].freeze
+
+  TkCore::INTERP.init_ip_env{ CTagID_TBL.clear }
+
+  def TkcTag.id2obj(canvas, id)
+    cpath = canvas.path
+    return id unless CTagID_TBL[cpath]
+    CTagID_TBL[cpath][id]? CTagID_TBL[cpath][id]: id
+  end
+
+  def initialize(parent, mode=nil, *args)
+    #unless parent.kind_of?(TkCanvas)
+    #  fail ArgumentError, "expect TkCanvas for 1st argument"
+    #end
+    @c = parent
+    @cpath = parent.path
+    # @path = @id = Tk_CanvasTag_ID.join('')
+    @path = @id = Tk_CanvasTag_ID.join(TkCore::INTERP._ip_id_)
+    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+    CTagID_TBL[@cpath][@id] = self
+    Tk_CanvasTag_ID[1].succ!
+    if mode
+      tk_call_without_enc(@c.path, "addtag", @id, mode, *args)
+    end
+  end
+  def id
+    @id
+  end
+
+  def exist?
+    if @c.find_withtag(@id)
+      true
+    else
+      false
+    end
+  end
+
+  def delete
+    @c.delete @id
+    CTagID_TBL[@cpath].delete(@id) if CTagID_TBL[@cpath]
+    self
+  end
+  alias remove  delete
+  alias destroy delete
+
+  def set_to_above(target)
+    @c.addtag_above(@id, target)
+    self
+  end
+  alias above set_to_above
+
+  def set_to_all
+    @c.addtag_all(@id)
+    self
+  end
+  alias all set_to_all
+
+  def set_to_below(target)
+    @c.addtag_below(@id, target)
+    self
+  end
+  alias below set_to_below
+
+  def set_to_closest(x, y, halo=None, start=None)
+    @c.addtag_closest(@id, x, y, halo, start)
+    self
+  end
+  alias closest set_to_closest
+
+  def set_to_enclosed(x1, y1, x2, y2)
+    @c.addtag_enclosed(@id, x1, y1, x2, y2)
+    self
+  end
+  alias enclosed set_to_enclosed
+
+  def set_to_overlapping(x1, y1, x2, y2)
+    @c.addtag_overlapping(@id, x1, y1, x2, y2)
+    self
+  end
+  alias overlapping set_to_overlapping
+
+  def set_to_withtag(target)
+    @c.addtag_withtag(@id, target)
+    self
+  end
+  alias withtag set_to_withtag
+end
+
+class TkcTagString<TkcTag
+  def self.new(parent, name, *args)
+    if CTagID_TBL[parent.path] && CTagID_TBL[parent.path][name]
+      return CTagID_TBL[parent.path][name]
+    else
+      super(parent, name, *args)
+    end
+  end
+
+  def initialize(parent, name, mode=nil, *args)
+    #unless parent.kind_of?(TkCanvas)
+    #  fail ArgumentError, "expect TkCanvas for 1st argument"
+    #end
+    @c = parent
+    @cpath = parent.path
+    @path = @id = name
+    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+    CTagID_TBL[@cpath][@id] = self
+    if mode
+      tk_call_without_enc(@c.path, "addtag", @id, mode, *args)
+    end
+  end
+end
+TkcNamedTag = TkcTagString
+
+class TkcTagAll<TkcTag
+  def initialize(parent)
+    #unless parent.kind_of?(TkCanvas)
+    #  fail ArgumentError, "expect TkCanvas for 1st argument"
+    #end
+    @c = parent
+    @cpath = parent.path
+    @path = @id = 'all'
+    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+    CTagID_TBL[@cpath][@id] = self
+  end
+end
+
+class TkcTagCurrent<TkcTag
+  def initialize(parent)
+    #unless parent.kind_of?(TkCanvas)
+    #  fail ArgumentError, "expect TkCanvas for 1st argument"
+    #end
+    @c = parent
+    @cpath = parent.path
+    @path = @id = 'current'
+    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+    CTagID_TBL[@cpath][@id] = self
+  end
+end
+
+class TkcGroup<TkcTag
+  Tk_cGroup_ID = ['tkcg'.freeze, '00000'.taint].freeze
+  #def create_self(parent, *args)
+  def initialize(parent, *args)
+    #unless parent.kind_of?(TkCanvas)
+    #  fail ArgumentError, "expect TkCanvas for 1st argument"
+    #end
+    @c = parent
+    @cpath = parent.path
+    # @path = @id = Tk_cGroup_ID.join('')
+    @path = @id = Tk_cGroup_ID.join(TkCore::INTERP._ip_id_)
+    CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+    CTagID_TBL[@cpath][@id] = self
+    Tk_cGroup_ID[1].succ!
+    include(*args) if args != []
+  end
+  #private :create_self
+  
+  def include(*tags)
+    for i in tags
+      #i.addtag(@id)
+      @c.addtag_withtag(@id, i)
+    end
+    self
+  end
+  alias add include
+
+  def exclude(*tags)
+    for i in tags
+      #i.dtag(@id)
+      @c.dtag(i, @id)
+    end
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/checkbutton.rb b/ruby_1_8_6/ext/tk/lib/tk/checkbutton.rb
new file mode 100644
index 0000000000..d76d99c0f2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/checkbutton.rb
@@ -0,0 +1,25 @@
+#
+# tk/checkbutton.rb : treat checkbutton widget
+#
+require 'tk'
+require 'tk/radiobutton'
+
+class TkCheckButton<TkRadioButton
+  TkCommandNames = ['checkbutton'.freeze].freeze
+  WidgetClassName = 'Checkbutton'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('checkbutton', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('checkbutton', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def toggle
+    tk_send_without_enc('toggle')
+    self
+  end
+end
+TkCheckbutton = TkCheckButton
diff --git a/ruby_1_8_6/ext/tk/lib/tk/clipboard.rb b/ruby_1_8_6/ext/tk/lib/tk/clipboard.rb
new file mode 100644
index 0000000000..d4205a5c28
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/clipboard.rb
@@ -0,0 +1,75 @@
+#
+# tk/clipboard.rb : methods to treat clipboard
+#
+require 'tk'
+
+module TkClipboard
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['clipboard'.freeze].freeze
+
+  def self.clear(win=nil)
+    if win
+      tk_call_without_enc('clipboard', 'clear', '-displayof', win)
+    else
+      tk_call_without_enc('clipboard', 'clear')
+    end
+  end
+  def self.clear_on_display(win)
+    tk_call_without_enc('clipboard', 'clear', '-displayof', win)
+  end
+
+  def self.get(type=nil)
+    if type
+      tk_call_without_enc('clipboard', 'get', '-type', type)
+    else
+      tk_call_without_enc('clipboard', 'get')
+    end
+  end
+  def self.get_on_display(win, type=nil)
+    if type
+      tk_call_without_enc('clipboard', 'get', '-displayof', win, '-type', type)
+    else
+      tk_call_without_enc('clipboard', 'get', '-displayof', win)
+    end
+  end
+
+  def self.set(data, keys=nil)
+    clear
+    append(data, keys)
+  end
+  def self.set_on_display(win, data, keys=nil)
+    clear(win)
+    append_on_display(win, data, keys)
+  end
+
+  def self.append(data, keys=nil)
+    args = ['clipboard', 'append']
+    args.concat(hash_kv(keys))
+    args.concat(['--', data])
+    tk_call(*args)
+  end
+  def self.append_on_display(win, data, keys=nil)
+    args = ['clipboard', 'append', '-displayof', win]
+    args.concat(hash_kv(keys))
+    args.concat(['--', data])
+    tk_call(*args)
+  end
+
+  def clear
+    TkClipboard.clear_on_display(self)
+    self
+  end
+  def get(type=nil)
+    TkClipboard.get_on_display(self, type)
+  end
+  def set(data, keys=nil)
+    TkClipboard.set_on_display(self, data, keys)
+    self
+  end
+  def append(data, keys=nil)
+    TkClipboard.append_on_display(self, data, keys)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/clock.rb b/ruby_1_8_6/ext/tk/lib/tk/clock.rb
new file mode 100644
index 0000000000..4e9438f5ab
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/clock.rb
@@ -0,0 +1,71 @@
+#
+# tk/clock.rb : methods for clock command
+#
+require 'tk'
+
+module Tk
+  module Clock
+    include Tk
+    extend TkCore
+
+    def self.add(clk, *args)
+      tk_call_without_enc('clock','add', clk, *args).to_i
+    end
+
+    def self.clicks(ms=nil)
+      ms = ms.to_s if ms.kind_of?(Symbol)
+      case ms
+      when nil, ''
+        tk_call_without_enc('clock','clicks').to_i
+      when /^mic/
+        tk_call_without_enc('clock','clicks','-microseconds').to_i
+      when /^mil/
+        tk_call_without_enc('clock','clicks','-milliseconds').to_i
+      else
+        tk_call_without_enc('clock','clicks','-milliseconds').to_i
+      end
+    end
+
+    def self.format(clk, form=nil)
+      if form
+        tk_call('clock','format',clk,'-format',form)
+      else
+        tk_call('clock','format',clk)
+      end
+    end
+
+    def self.formatGMT(clk, form=nil)
+      if form
+        tk_call('clock','format',clk,'-format',form,'-gmt','1')
+      else
+        tk_call('clock','format',clk,'-gmt','1')
+      end
+    end
+
+    def self.scan(str, base=nil)
+      if base
+        tk_call('clock','scan',str,'-base',base).to_i
+      else
+        tk_call('clock','scan',str).to_i
+      end
+    end
+
+    def self.scanGMT(str, base=nil)
+      if base
+        tk_call('clock','scan',str,'-base',base,'-gmt','1').to_i
+      else
+        tk_call('clock','scan',str,'-gmt','1').to_i
+      end
+    end
+
+    def self.seconds
+      tk_call_without_enc('clock','seconds').to_i
+    end
+    def self.milliseconds
+      tk_call_without_enc('clock','milliseconds').to_i
+    end
+    def self.microseconds
+      tk_call_without_enc('clock','microseconds').to_i
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/composite.rb b/ruby_1_8_6/ext/tk/lib/tk/composite.rb
new file mode 100644
index 0000000000..eaed8ed363
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/composite.rb
@@ -0,0 +1,394 @@
+#
+# tk/composite.rb : 
+#
+require 'tk'
+
+module TkComposite
+  include Tk
+  extend Tk
+
+=begin
+  def initialize(parent=nil, *args)
+    @delegates = {}
+    @option_methods = {}
+    @option_setting = {}
+
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      parent = keys.delete('parent')
+      @frame = TkFrame.new(parent)
+      @path = @epath = @frame.path
+      initialize_composite(keys)
+    else
+      @frame = TkFrame.new(parent)
+      @path = @epath = @frame.path
+      initialize_composite(*args)
+    end
+  end
+=end
+
+  def _choice_classname_of_baseframe
+    base_class_name = nil
+
+    klass = WidgetClassNames[self.class::WidgetClassName]
+
+    if klass
+      # WidgetClassName is a known class
+      if klass <= TkFrame || klass < TkComposite
+        # klass is valid for the base frame
+        if self.class <= klass
+          # use my classname
+          base_class_name = self.class.name
+          if base_class_name == ''
+            # anonymous class -> use ancestor's name
+            base_class_name = klass.name
+          end
+        else
+          # not subclass -> use WidgetClassName
+          base_class_name = klass.name
+        end
+
+      else
+        # klass is invalid for the base frame
+        if self.class < TkFrame || self.class.superclass < TkComposite
+          # my class name is valid for the base frame -> use my classname
+          base_class_name = self.class.name
+          if base_class_name == ''
+            # anonymous class -> use TkFrame
+            base_class_name = nil
+          end
+        else
+          # no idea for the base frame -> use TkFrame
+          base_class_name = nil
+        end
+      end
+
+    elsif self.class::WidgetClassName && ! self.class::WidgetClassName.empty?
+      # unknown WidgetClassName is defined -> use it for the base frame
+      base_class_name = self.class::WidgetClassName
+
+    else
+      # no valid WidgetClassName
+      if self.class < TkFrame || self.class.superclass < TkComposite
+        # my class name is valid for the base frame -> use my classname
+        base_class_name = self.class.name
+        if base_class_name == ''
+          # anonymous class -> use TkFrame
+          base_class_name = nil
+        end
+      else
+        # no idea for the base frame -> use TkFrame
+        base_class_name = nil
+      end
+    end
+
+    base_class_name
+  end
+  private :_choice_classname_of_baseframe
+
+  # def initialize(parent=nil, *args)
+  def initialize(*args)
+    @delegates = {}
+    @option_methods = {}
+    @option_setting = {}
+
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+    else
+      keys = {}
+    end
+    parent = args.shift
+    parent = keys.delete('parent') if keys.has_key?('parent')
+
+    if keys.key?('classname')
+      keys['class'] = keys.delete('classname')
+    end
+    if (base_class_name = (keys.delete('class')).to_s).empty?
+      base_class_name = _choice_classname_of_baseframe
+    end
+
+    if base_class_name
+      @frame = TkFrame.new(parent, :class=>base_class_name)
+    else
+      @frame = TkFrame.new(parent)
+    end
+    @path = @epath = @frame.path
+
+    args.push(keys) unless keys.empty?
+    initialize_composite(*args)
+  end
+
+  def database_classname
+    @frame.database_classname
+  end
+
+  def database_class
+    @frame.database_class
+  end
+
+  def epath
+    @epath
+  end
+
+  def initialize_composite(*args) end
+  private :initialize_composite
+
+  def option_methods(*opts)
+    opts.each{|m_set, m_cget, m_info|
+      m_set  = m_set.to_s
+      m_cget = m_set if !m_cget && self.method(m_set).arity == -1
+      m_cget = m_cget.to_s if m_cget
+      m_info = m_info.to_s if m_info
+      @option_methods[m_set] = {
+        :set  => m_set, :cget => m_cget, :info => m_info
+      }
+    }
+  end
+
+  def delegate_alias(alias_opt, option, *wins)
+    if wins.length == 0
+      fail ArgumentError, "target widgets are not given"
+    end
+    if alias_opt != option && (alias_opt == 'DEFAULT' || option == 'DEFAULT')
+      fail ArgumentError, "cannot alias 'DEFAULT' option"
+    end
+    alias_opt = alias_opt.to_s
+    option = option.to_s
+    if @delegates[alias_opt].kind_of?(Array)
+      if (elem = @delegates[alias_opt].assoc(option))
+        wins.each{|w| elem[1].push(w)}
+      else
+        @delegates[alias_opt] << [option, wins]
+      end
+    else
+      @delegates[alias_opt] = [ [option, wins] ]
+    end
+  end
+
+  def delegate(option, *wins)
+    delegate_alias(option, option, *wins)
+  end
+
+  def cget(slot)
+    slot = slot.to_s
+
+    if @option_methods.include?(slot)
+      if @option_methods[slot][:cget]
+        return self.__send__(@option_methods[slot][:cget])
+      else
+        if @option_setting[slot]
+          return @option_setting[slot]
+        else
+          return ''
+        end
+      end
+    end
+
+    tbl = @delegates[slot]
+    tbl = @delegates['DEFAULT'] unless tbl
+
+    begin
+      if tbl
+        opt, wins = tbl[-1]
+        opt = slot if opt == 'DEFAULT'
+        if wins && wins[-1]
+          return wins[-1].cget(opt)
+        end
+      end
+    rescue
+    end
+
+    super(slot)
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of? Hash
+      slot.each{|slot,value| configure slot, value}
+      return self
+    end
+
+    slot = slot.to_s
+
+    if @option_methods.include?(slot)
+      unless @option_methods[slot][:cget]
+        if value.kind_of?(Symbol)
+          @option_setting[slot] = value.to_s
+        else
+          @option_setting[slot] = value
+        end
+      end
+      return self.__send__(@option_methods[slot][:set], value)
+    end
+
+    tbl = @delegates[slot]
+    tbl = @delegates['DEFAULT'] unless tbl
+
+    begin
+      if tbl
+        last = nil
+        tbl.each{|opt, wins|
+          opt = slot if opt == 'DEFAULT'
+          wins.each{|w| last = w.configure(opt, value)}
+        }
+        return last
+      end
+    rescue
+    end
+
+    super(slot, value)
+  end
+
+  def configinfo(slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        slot = slot.to_s
+        if @option_methods.include?(slot)
+          if @option_methods[slot][:info]
+            return self.__send__(@option_methods[slot][:info])
+          else
+            return [slot, '', '', '', self.cget(slot)]
+          end
+        end
+
+        tbl = @delegates[slot]
+        tbl = @delegates['DEFAULT'] unless tbl
+
+        begin
+          if tbl
+            if tbl.length == 1
+              opt, wins = tbl[0]
+              if slot == opt || opt == 'DEFAULT'
+                return wins[-1].configinfo(slot)
+              else
+                info = wins[-1].configinfo(opt)
+                info[0] = slot
+                return info
+              end
+            else
+              opt, wins = tbl[-1]
+              return [slot, '', '', '', wins[-1].cget(opt)]
+            end
+          end
+        rescue
+        end
+
+        super(slot)
+
+      else # slot == nil
+        info_list = super(slot)
+
+        tbl = @delegates['DEFAULT']
+        if tbl
+          wins = tbl[0][1]
+          if wins && wins[-1]
+            wins[-1].configinfo.each{|info|
+              slot = info[0]
+              info_list.delete_if{|i| i[0] == slot} << info
+            }
+          end
+        end
+
+        @delegates.each{|slot, tbl|
+          next if slot == 'DEFAULT'
+          if tbl.length == 1
+            opt, wins = tbl[0]
+            next unless wins && wins[-1]
+            if slot == opt
+              info_list.delete_if{|i| i[0] == slot} << 
+                wins[-1].configinfo(slot)
+            else
+              info = wins[-1].configinfo(opt)
+              info[0] = slot
+              info_list.delete_if{|i| i[0] == slot} << info
+            end
+          else
+            opt, wins = tbl[-1]
+            info_list.delete_if{|i| i[0] == slot} << 
+              [slot, '', '', '', wins[-1].cget(opt)]
+          end
+        }
+
+        @option_methods.each{|slot, m|
+          if m[:info]
+            info = self.__send__(m[:info])
+          else
+            info = [slot, '', '', '', self.cget(slot)]
+          end
+          info_list.delete_if{|i| i[0] == slot} << info
+        }
+
+        info_list
+      end
+
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        slot = slot.to_s
+        if @option_methods.include?(slot)
+          if @option_methods[slot][:info]
+            return self.__send__(@option_methods[slot][:info])
+          else
+            return {slot => ['', '', '', self.cget(slot)]}
+          end
+        end
+
+        tbl = @delegates[slot]
+        tbl = @delegates['DEFAULT'] unless tbl
+
+        begin
+          if tbl
+            if tbl.length == 1
+              opt, wins = tbl[0]
+              if slot == opt || opt == 'DEFAULT'
+                return wins[-1].configinfo(slot)
+              else
+                return {slot => wins[-1].configinfo(opt)[opt]}
+              end
+            else
+              opt, wins = tbl[-1]
+              return {slot => ['', '', '', wins[-1].cget(opt)]}
+            end
+          end
+        rescue
+        end
+
+        super(slot)
+
+      else # slot == nil
+        info_list = super(slot)
+
+        tbl = @delegates['DEFAULT']
+        if tbl
+          wins = tbl[0][1]
+          info_list.update(wins[-1].configinfo) if wins && wins[-1]
+        end
+
+        @delegates.each{|slot, tbl|
+          next if slot == 'DEFAULT'
+          if tbl.length == 1
+            opt, wins = tbl[0]
+            next unless wins && wins[-1]
+            if slot == opt
+              info_list.update(wins[-1].configinfo(slot))
+            else
+              info_list.update({slot => wins[-1].configinfo(opt)[opt]})
+            end
+          else
+            opt, wins = tbl[-1]
+            info_list.update({slot => ['', '', '', wins[-1].cget(opt)]})
+          end
+        }
+
+        @option_methods.each{|slot, m|
+          if m[:info]
+            info = self.__send__(m[:info])
+          else
+            info = {slot => ['', '', '', self.cget(slot)]}
+          end
+          info_list.update(info)
+        }
+
+        info_list
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/console.rb b/ruby_1_8_6/ext/tk/lib/tk/console.rb
new file mode 100644
index 0000000000..26ce262caa
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/console.rb
@@ -0,0 +1,52 @@
+#
+#   tk/console.rb : control the console on system without a real console
+#
+require 'tk'
+
+module TkConsole
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['console'.freeze, 'consoleinterp'.freeze].freeze
+
+  def self.create
+    TkCore::INTERP._create_console
+  end
+  self.create  # initialize console
+
+  def self.title(str=None)
+    tk_call 'console', str
+  end
+  def self.hide
+    tk_call_without_enc('console', 'hide')
+  end
+  def self.show
+    tk_call_without_enc('console', 'show')
+  end
+  def self.eval(tcl_script)
+    #
+    # supports a Tcl script only
+    # I have no idea to support a Ruby script seamlessly.
+    #
+    _fromUTF8(tk_call_without_enc('console', 'eval', 
+                                  _get_eval_enc_str(tcl_script)))
+  end
+  def self.maininterp_eval(tcl_script)
+    #
+    # supports a Tcl script only
+    # I have no idea to support a Ruby script seamlessly.
+    #
+    _fromUTF8(tk_call_without_enc('consoleinterp', 'eval', 
+                                  _get_eval_enc_str(tcl_script)))
+
+  end
+  def self.maininterp_record(tcl_script)
+    #
+    # supports a Tcl script only
+    # I have no idea to support a Ruby script seamlessly.
+    #
+    _fromUTF8(tk_call_without_enc('consoleinterp', 'record', 
+                                  _get_eval_enc_str(tcl_script)))
+
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/dialog.rb b/ruby_1_8_6/ext/tk/lib/tk/dialog.rb
new file mode 100644
index 0000000000..180da101e3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/dialog.rb
@@ -0,0 +1,326 @@
+#
+#   tk/dialog.rb : create dialog boxes
+#
+require 'tk'
+require 'tk/variable.rb'
+
+class TkDialogObj < TkWindow
+  extend Tk
+
+  TkCommandNames = ['tk_dialog'.freeze].freeze
+
+  def self.show(*args)
+    dlog = self.new(*args)
+    dlog.show
+    dlog
+  end
+
+  def _set_button_config(configs)
+    set_config = proc{|c,i|
+      if $VERBOSE && (c.has_key?('command') || c.has_key?(:command))
+        STDERR.print("Warning: cannot give a command option " + 
+                     "to the dialog button#{i}. It was removed.\n")
+      end
+      c.delete('command'); c.delete(:command)
+      # @config << Kernel.format("%s.button%s configure %s; ", 
+      #                                @path, i, hash_kv(c).join(' '))
+      # @config << @path+'.button'+i.to_s+' configure '+hash_kv(c).join(' ')+'; '
+      @config << @path+'.button'+i.to_s+' configure '+
+                   array2tk_list(hash_kv(c))+'; '
+    }
+    case configs
+    when Proc
+      @buttons.each_index{|i|
+        if (c = configs.call(i)).kind_of?(Hash)
+          set_config.call(c,i)
+        end
+      }
+
+    when Array
+      @buttons.each_index{|i|
+        if (c = configs[i]).kind_of?(Hash)
+          set_config.call(c,i)
+        end
+      }
+
+    when Hash
+      @buttons.each_with_index{|s,i|
+        if (c = configs[s]).kind_of?(Hash)
+          set_config.call(c,i)
+        end
+      }
+    end
+    # @config = 'after idle {' + @config + '};' if @config != ""
+    @config = array2tk_list(['after', 'idle', @config]) << ';' if @config != ""
+  end
+  private :_set_button_config
+
+  # initialize tk_dialog
+  def create_self(keys)
+    # @var = TkVariable.new
+    @val = nil
+
+    @title   = title
+
+    @message = message
+    @message_config = message_config
+    @msgframe_config = msgframe_config
+
+    @bitmap  = bitmap
+    @bitmap_config = message_config
+
+    @default_button = default_button
+
+    @buttons = buttons
+    @button_configs = proc{|num| button_configs(num)}
+    @btnframe_config = btnframe_config
+
+    #@config = "puts [winfo children .w0000];"
+    @config = ""
+
+    @command = prev_command
+
+    if keys.kind_of?(Hash)
+      @title   = keys['title'] if keys.key? 'title'
+      @message = keys['message'] if keys.key? 'message'
+      @bitmap  = keys['bitmap'] if keys.key? 'bitmap'
+      # @bitmap  = '{}' if @bitmap == nil || @bitmap == ""
+      @bitmap  = '' unless @bitmap
+      @default_button = keys['default'] if keys.key? 'default'
+      @buttons = keys['buttons'] if keys.key? 'buttons'
+
+      @command = keys['prev_command'] if keys.key? 'prev_command'
+
+      @message_config = keys['message_config'] if keys.key? 'message_config'
+      @msgframe_config = keys['msgframe_config'] if keys.key? 'msgframe_config'
+      @bitmap_config  = keys['bitmap_config']  if keys.key? 'bitmap_config'
+      @button_configs = keys['button_configs'] if keys.key? 'button_configs'
+      @btnframe_config = keys['btnframe_config'] if keys.key? 'btnframe_config'
+    end
+
+    #if @title.include? ?\s
+    #  @title = '{' + @title + '}'
+    #end
+
+    if @buttons.kind_of?(Array)
+      _set_button_config(@buttons.collect{|cfg| 
+                           (cfg.kind_of? Array)? cfg[1]: nil})
+      @buttons = @buttons.collect{|cfg| (cfg.kind_of? Array)? cfg[0]: cfg}
+    end
+    if @buttons.kind_of?(Hash)
+      _set_button_config(@buttons)
+      @buttons = @buttons.keys
+    end
+    @buttons = tk_split_simplelist(@buttons) if @buttons.kind_of?(String)
+    @buttons = [] unless @buttons
+=begin
+    @buttons = @buttons.collect{|s|
+      if s.kind_of?(Array)
+        s = s.join(' ')
+      end
+      if s.include? ?\s
+        '{' + s + '}'
+      else
+        s
+      end
+    }
+=end
+
+    if @message_config.kind_of?(Hash)
+      # @config << Kernel.format("%s.msg configure %s;", 
+      #                        @path, hash_kv(@message_config).join(' '))
+      # @config << @path+'.msg configure '+hash_kv(@message_config).join(' ')+';'
+      @config << @path+'.msg configure '+
+                   array2tk_list(hash_kv(@message_config))+';'
+    end
+
+    if @msgframe_config.kind_of?(Hash)
+      # @config << Kernel.format("%s.top configure %s;", 
+      #                        @path, hash_kv(@msgframe_config).join(' '))
+      # @config << @path+'.top configure '+hash_kv(@msgframe_config).join(' ')+';'
+      @config << @path+'.top configure '+
+                   array2tk_list(hash_kv(@msgframe_config))+';'
+    end
+
+    if @btnframe_config.kind_of?(Hash)
+      # @config << Kernel.format("%s.bot configure %s;", 
+      #                        @path, hash_kv(@btnframe_config).join(' '))
+      # @config << @path+'.bot configure '+hash_kv(@btnframe_config).join(' ')+';'
+      @config << @path+'.bot configure '+
+                   array2tk_list(hash_kv(@btnframe_config))+';'
+    end
+
+    if @bitmap_config.kind_of?(Hash)
+      # @config << Kernel.format("%s.bitmap configure %s;", 
+      #                        @path, hash_kv(@bitmap_config).join(' '))
+      # @config << @path+'.bitmap configure '+hash_kv(@bitmap_config).join(' ')+';'
+      @config << @path+'.bitmap configure '+
+                    array2tk_list(hash_kv(@bitmap_config))+';'
+    end
+
+    _set_button_config(@button_configs) if @button_configs
+  end
+  private :create_self
+
+  def show
+    # if @command.kind_of?(Proc)
+    if TkComm._callback_entry?(@command)
+      @command.call(self)
+    end
+
+    if @default_button.kind_of?(String)
+      default_button = @buttons.index(@default_button)
+    else
+      default_button = @default_button
+    end
+    # default_button = '{}' if default_button == nil
+    default_button = '' if default_button == nil
+    #Tk.ip_eval('eval {global '+@var.id+';'+@config+
+    #          'set '+@var.id+' [tk_dialog '+ 
+    #          @path+" "+@title+" {#{@message}} "+@bitmap+" "+
+    #          String(default_button)+" "+@buttons.join(' ')+']}')
+    Tk.ip_eval(@config)
+    # @val = Tk.ip_eval('tk_dialog ' + @path + ' ' + @title + 
+    #                 ' {' + @message + '} ' + @bitmap + ' ' + 
+    #                 String(default_button) + ' ' + @buttons.join(' ')).to_i
+    # @val = Tk.ip_eval(self.class::TkCommandNames[0] + ' ' + @path + ' ' + 
+    #                   @title + ' {' + @message + '} ' + @bitmap + ' ' + 
+    #                   String(default_button) + ' ' + @buttons.join(' ')).to_i
+    @val = Tk.ip_eval(array2tk_list([
+                                      self.class::TkCommandNames[0], 
+                                      @path, @title, @message, @bitmap, 
+                                      String(default_button)
+                                    ].concat(@buttons))).to_i
+  end
+
+  def value
+    # @var.value.to_i
+    @val
+  end
+
+  def name
+    (@val)? @buttons[@val]: nil
+  end
+
+  ############################################################
+  #                                                          #
+  #  following methods should be overridden for each dialog  #
+  #                                                          #
+  ############################################################
+  private
+
+  def title
+    # returns a title string of the dialog window
+    return "DIALOG"
+  end
+  def message
+    # returns a message text to display on the dialog
+    return "MESSAGE"
+  end
+  def message_config
+    # returns a Hash {option=>value, ...} for the message text
+    return nil
+  end
+  def msgframe_config
+    # returns a Hash {option=>value, ...} for the message text frame
+    return nil
+  end
+  def bitmap
+    # returns a bitmap name or a bitmap file path 
+    # (@ + path ; e.g. '@/usr/share/bitmap/sample.xbm')
+    return "info"
+  end
+  def bitmap_config
+    # returns nil or a Hash {option=>value, ...} for the bitmap
+    return nil
+  end
+  def default_button
+    # returns a default button's number or name
+    # if nil or null string, set no-default
+    return 0
+  end
+  def buttons
+    #return "BUTTON1 BUTTON2"
+    return ["BUTTON1", "BUTTON2"]
+  end
+  def button_configs(num)
+    # returns nil / Proc / Array or Hash (see _set_button_config)
+    return nil
+  end
+  def btnframe_config
+    # returns nil or a Hash {option=>value, ...} for the button frame
+    return nil
+  end
+  def prev_command
+    # returns nil or a Proc
+    return nil
+  end
+end
+TkDialog2 = TkDialogObj
+
+#
+# TkDialog : with showing at initialize
+#
+class TkDialog < TkDialogObj
+  def self.show(*args)
+    self.new(*args)
+  end
+
+  def initialize(*args)
+    super(*args)
+    show
+  end
+end
+
+
+#
+# dialog for warning
+#
+class TkWarningObj < TkDialogObj
+  def initialize(parent = nil, mes = nil)
+    if !mes
+      if parent.kind_of?(TkWindow)
+        mes = ""
+      else
+        mes = parent.to_s
+        parent = nil
+      end
+    end
+    super(parent, :message=>mes)
+  end
+
+  def show(mes = nil)
+    mes_bup = @message
+    @message = mes if mes
+    ret = super()
+    @message = mes_bup
+    ret
+  end
+
+  #######
+  private
+
+  def title
+    return "WARNING";
+  end
+  def bitmap
+    return "warning";
+  end
+  def default_button
+    return 0;
+  end
+  def buttons
+    return "OK";
+  end
+end
+TkWarning2 = TkWarningObj
+
+class TkWarning < TkWarningObj
+  def self.show(*args)
+    self.new(*args)
+  end
+  def initialize(*args)
+    super(*args)
+    show
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/encodedstr.rb b/ruby_1_8_6/ext/tk/lib/tk/encodedstr.rb
new file mode 100644
index 0000000000..797e514a4c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/encodedstr.rb
@@ -0,0 +1,111 @@
+#
+# tk/encodedstr.rb : Tk::EncodedString class
+#
+require 'tk'
+
+###########################################
+#  string with Tcl's encoding
+###########################################
+module Tk
+  class EncodedString < String
+    Encoding = nil
+
+    def self.subst_utf_backslash(str)
+      # str.gsub(/\\u([0-9A-Fa-f]{1,4})/){[$1.hex].pack('U')}
+      TclTkLib._subst_UTF_backslash(str)
+    end
+    def self.utf_backslash(str)
+      self.subst_utf_backslash(str)
+    end
+
+    def self.subst_tk_backslash(str)
+      TclTkLib._subst_Tcl_backslash(str)
+    end
+
+    def self.utf_to_backslash_sequence(str)
+      str.unpack('U*').collect{|c|
+        if c <= 0xFF  # ascii character
+          c.chr
+        else
+          format('\u%X', c)
+        end
+      }.join('')
+    end
+    def self.utf_to_backslash(str)
+      self.utf_to_backslash_sequence(str)
+    end
+
+    def self.to_backslash_sequence(str)
+      str.unpack('U*').collect{|c|
+        if c <= 0x1F  # control character
+          case c
+          when 0x07; '\a'
+          when 0x08; '\b'
+          when 0x09; '\t'
+          when 0x0a; '\n'
+          when 0x0b; '\v'
+          when 0x0c; '\f'
+          when 0x0d; '\r'
+          else
+            format('\x%02X', c)
+          end
+        elsif c <= 0xFF  # ascii character
+          c.chr
+        else
+          format('\u%X', c)
+        end
+      }.join('')
+    end
+
+    def self.new_with_utf_backslash(str, enc = nil)
+      self.new('', enc).replace(self.subst_utf_backslash(str))
+    end
+
+    def self.new_without_utf_backslash(str, enc = nil)
+      self.new('', enc).replace(str)
+    end
+
+    def initialize(str, enc = nil)
+      super(str)
+      # @encoding = ( enc || 
+      #              ((self.class::Encoding)? 
+      #                  self.class::Encoding : Tk.encoding_system) )
+      @encoding = ( enc || 
+                   ((self.class::Encoding)?
+                         self.class::Encoding : 
+                         ((Tk.encoding)? Tk.encoding : Tk.encoding_system) ) )
+    end
+
+    attr_reader :encoding
+  end
+  # def Tk.EncodedString(str, enc = nil)
+  #   Tk::EncodedString.new(str, enc)
+  # end
+
+  ##################################
+
+  class BinaryString < EncodedString
+    Encoding = 'binary'.freeze
+  end
+  # def Tk.BinaryString(str)
+  #   Tk::BinaryString.new(str)
+  # end
+
+  ##################################
+
+  class UTF8_String < EncodedString
+    Encoding = 'utf-8'.freeze
+    def self.new(str)
+      super(self.subst_utf_backslash(str))
+    end
+
+    def to_backslash_sequence
+      Tk::EncodedString.utf_to_backslash_sequence(self)
+    end
+    alias to_backslash to_backslash_sequence
+  end
+  # def Tk.UTF8_String(str)
+  #   Tk::UTF8_String.new(str)
+  # end
+
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/entry.rb b/ruby_1_8_6/ext/tk/lib/tk/entry.rb
new file mode 100644
index 0000000000..4ac3f28229
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/entry.rb
@@ -0,0 +1,117 @@
+#
+#               tk/entry.rb - Tk entry classes
+#                       $Date$
+#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
+
+require 'tk'
+require 'tk/label'
+require 'tk/scrollable'
+require 'tk/validation'
+
+class TkEntry<TkLabel
+  include X_Scrollable
+  include TkValidation
+
+  TkCommandNames = ['entry'.freeze].freeze
+  WidgetClassName = 'Entry'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  #def create_self(keys)
+  #  super(__conv_vcmd_on_hash_kv(keys))
+  #end
+  #private :create_self
+
+  def __strval_optkeys
+    super() + ['show', 'disabledbackground', 'readonlybackground']
+  end
+  private :__strval_optkeys
+
+  def bbox(index)
+    list(tk_send_without_enc('bbox', index))
+  end
+  def cursor
+    number(tk_send_without_enc('index', 'insert'))
+  end
+  alias icursor cursor
+  def cursor=(index)
+    tk_send_without_enc('icursor', index)
+    #self
+    index
+  end
+  alias icursor= cursor=
+  def index(idx)
+    number(tk_send_without_enc('index', idx))
+  end
+  def insert(pos,text)
+    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
+    self
+  end
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+  def mark(pos)
+    tk_send_without_enc('scan', 'mark', pos)
+    self
+  end
+  def dragto(pos)
+    tk_send_without_enc('scan', 'dragto', pos)
+    self
+  end
+  def selection_adjust(index)
+    tk_send_without_enc('selection', 'adjust', index)
+    self
+  end
+  def selection_clear
+    tk_send_without_enc('selection', 'clear')
+    self
+  end
+  def selection_from(index)
+    tk_send_without_enc('selection', 'from', index)
+    self
+  end
+  def selection_present()
+    bool(tk_send_without_enc('selection', 'present'))
+  end
+  def selection_range(s, e)
+    tk_send_without_enc('selection', 'range', s, e)
+    self
+  end
+  def selection_to(index)
+    tk_send_without_enc('selection', 'to', index)
+    self
+  end
+
+  def invoke_validate
+    bool(tk_send_without_enc('validate'))
+  end
+  def validate(mode = nil)
+    if mode
+      configure 'validate', mode
+    else
+      invoke_validate
+    end
+  end
+
+  def value
+    _fromUTF8(tk_send_without_enc('get'))
+  end
+  def value= (val)
+    tk_send_without_enc('delete', 0, 'end')
+    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
+    val
+  end
+  alias get value
+  alias set value=
+
+  def [](*args)
+    self.value[*args]
+  end
+  def []=(*args)
+    val = args.pop
+    str = self.value
+    str[*args] = val
+    self.value = str
+    val
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/event.rb b/ruby_1_8_6/ext/tk/lib/tk/event.rb
new file mode 100644
index 0000000000..70a1e38bbe
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/event.rb
@@ -0,0 +1,488 @@
+#
+#  tk/event.rb - module for event
+#
+
+module TkEvent
+end
+
+########################
+
+require 'tkutil'
+require 'tk'
+
+########################
+
+module TkEvent
+  class Event < TkUtil::CallbackSubst
+    module Grp
+      KEY         =           0x1
+      BUTTON      =           0x2
+      MOTION      =           0x4
+      CROSSING    =           0x8
+      FOCUS       =           0x10
+      EXPOSE      =           0x20
+      VISIBILITY  =           0x40
+      CREATE      =           0x80
+      DESTROY     =           0x100
+      UNMAP       =           0x200
+      MAP         =           0x400
+      REPARENT    =           0x800
+      CONFIG      =           0x1000
+      GRAVITY     =           0x2000
+      CIRC        =           0x4000
+      PROP        =           0x8000
+      COLORMAP    =           0x10000
+      VIRTUAL     =           0x20000
+      ACTIVATE    =           0x40000
+      MAPREQ      =           0x80000
+      CONFIGREQ   =           0x100000
+      RESIZEREQ   =           0x200000
+      CIRCREQ     =           0x400000
+
+      MWHEEL      =           0x10000000
+
+      ALL         =           0xFFFFFFFF
+
+      KEY_BUTTON_MOTION_VIRTUAL  = (KEY|MWHEEL|BUTTON|MOTION|VIRTUAL)
+      KEY_BUTTON_MOTION_CROSSING = (KEY|MWHEEL|BUTTON|MOTION|CROSSING|VIRTUAL)
+    end
+
+    type_data = [
+      #-----+-------------------+------------------+-----------------------#
+      #  ID |  const            |  group_flag      |  context_name         #
+      #-----+-------------------+------------------+-----------------------#
+      [  2,  :KeyPress,          Grp::KEY,         'KeyPress',    'Key'    ], 
+      [  3,  :KeyRelease,        Grp::KEY,         'KeyRelease'            ], 
+      [  4,  :ButtonPress,       Grp::BUTTON,      'ButtonPress', 'Button' ], 
+      [  5,  :ButtonRelease,     Grp::BUTTON,      'ButtonRelease'         ], 
+      [  6,  :MotionNotify,      Grp::MOTION,      'Motion'                ], 
+      [  7,  :EnterNotify,       Grp::CROSSING,    'Enter'                 ], 
+      [  8,  :LeaveNotify,       Grp::CROSSING,    'Leave'                 ], 
+      [  9,  :FocusIn,           Grp::FOCUS,       'FocusIn'               ], 
+      [ 10,  :FocusOut,          Grp::FOCUS,       'FocusOut'              ], 
+      [ 11,  :KeymapNotify,      0,                                        ], 
+      [ 12,  :Expose,            Grp::EXPOSE,      'Expose'                ], 
+      [ 13,  :GraphicsExpose,    Grp::EXPOSE,                              ], 
+      [ 14,  :NoExpose,          0,                                        ], 
+      [ 15,  :VisibilityNotify,  Grp::VISIBILITY,  'Visibility'            ], 
+      [ 16,  :CreateNotify,      Grp::CREATE,      'Create'                ], 
+      [ 17,  :DestroyNotify,     Grp::DESTROY,     'Destroy'               ], 
+      [ 18,  :UnmapNotify,       Grp::UNMAP,       'Unmap'                 ], 
+      [ 19,  :MapNotify,         Grp::MAP,         'Map'                   ], 
+      [ 20,  :MapRequest,        Grp::MAPREQ,      'MapRequest'            ], 
+      [ 21,  :ReparentNotify,    Grp::REPARENT,    'Reparent'              ], 
+      [ 22,  :ConfigureNotify,   Grp::CONFIG,      'Configure'             ], 
+      [ 23,  :ConfigureRequest,  Grp::CONFIGREQ,   'ConfigureRequest'      ], 
+      [ 24,  :GravityNotify,     Grp::GRAVITY,     'Gravity'               ], 
+      [ 25,  :ResizeRequest,     Grp::RESIZEREQ,   'ResizeRequest'         ], 
+      [ 26,  :CirculateNotify,   Grp::CIRC,        'Circulate'             ], 
+      [ 27,  :CirculateRequest,  0,                'CirculateRequest'      ], 
+      [ 28,  :PropertyNotify,    Grp::PROP,        'Property'              ], 
+      [ 29,  :SelectionClear,    0,                                        ], 
+      [ 30,  :SelectionRequest,  0,                                        ], 
+      [ 31,  :SelectionNotify,   0,                                        ], 
+      [ 32,  :ColormapNotify,    Grp::COLORMAP,    'Colormap'              ], 
+      [ 33,  :ClientMessage,     0,                                        ], 
+      [ 34,  :MappingNotify,     0,                                        ], 
+      [ 35,  :VirtualEvent,      Grp::VIRTUAL,                             ],
+      [ 36,  :ActivateNotify,    Grp::ACTIVATE,    'Activate'              ],
+      [ 37,  :DeactivateNotify,  Grp::ACTIVATE,    'Deactivate'            ],
+      [ 38,  :MouseWheelEvent,   Grp::MWHEEL,      'MouseWheel'            ],
+      [ 39,  :TK_LASTEVENT,      0,                                        ]
+    ]
+
+    module TypeNum
+    end
+
+    TYPE_NAME_TBL  = Hash.new
+    TYPE_ID_TBL    = Hash.new
+    TYPE_GROUP_TBL = Hash.new
+
+    type_data.each{|id, c_name, g_flag, *t_names|
+      TypeNum.const_set(c_name, id)
+      t_names.each{|t_name| t_name.freeze; TYPE_NAME_TBL[t_name] = id }
+      TYPE_ID_TBL[id]    = t_names
+      TYPE_GROUP_TBL[id] = g_flag
+    }
+
+    TYPE_NAME_TBL.freeze
+    TYPE_ID_TBL.freeze
+
+    def self.type_id(name)
+      TYPE_NAME_TBL[name.to_s]
+    end
+
+    def self.type_name(id)
+      TYPE_ID_TBL[id] && TYPE_ID_TBL[id][0]
+    end
+
+    def self.group_flag(id)
+      TYPE_GROUP_TBL[id] || 0
+    end
+
+    #############################################
+
+    module StateMask
+      ShiftMask      =        (1<<0)
+      LockMask       =        (1<<1)
+      ControlMask    =        (1<<2)
+      Mod1Mask       =        (1<<3)
+      Mod2Mask       =        (1<<4)
+      Mod3Mask       =        (1<<5)
+      Mod4Mask       =        (1<<6)
+      Mod5Mask       =        (1<<7)
+      Button1Mask    =        (1<<8)
+      Button2Mask    =        (1<<9)
+      Button3Mask    =        (1<<10)
+      Button4Mask    =        (1<<11)
+      Button5Mask    =        (1<<12)
+
+      AnyModifier    =        (1<<15)
+
+      META_MASK      =  (AnyModifier<<1)
+      ALT_MASK       =  (AnyModifier<<2)
+      EXTENDED_MASK  =  (AnyModifier<<3)
+
+      CommandMask    =  Mod1Mask
+      OptionMask     =  Mod2Mask
+    end
+
+    #############################################
+
+    FIELD_FLAG = {
+      # key  =>  flag
+      'above'       => Grp::CONFIG, 
+      'borderwidth' => (Grp::CREATE|Grp::CONFIG),
+      'button'      => Grp::BUTTON, 
+      'count'       => Grp::EXPOSE, 
+      'data'        => Grp::VIRTUAL, 
+      'delta'       => Grp::MWHEEL, 
+      'detail'      => (Grp::FOCUS|Grp::CROSSING),
+      'focus'       => Grp::CROSSING,
+      'height'      => (Grp::EXPOSE|Grp::CONFIG),
+      'keycode'     => Grp::KEY,
+      'keysym'      => Grp::KEY,
+      'mode'        => (Grp::CROSSING|Grp::FOCUS),
+      'override'    => (Grp::CREATE|Grp::MAP|Grp::REPARENT|Grp::CONFIG),
+      'place'       => Grp::CIRC,
+      'root'        => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
+      'rootx'       => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
+      'rooty'       => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
+      'sendevent'   => Grp::ALL,
+      'serial'      => Grp::ALL,
+      'state'       => (Grp::KEY_BUTTON_MOTION_VIRTUAL|
+                        Grp::CROSSING|Grp::VISIBILITY),
+      'subwindow'   => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
+      'time'        => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING|
+                        Grp::PROP),
+      'warp'        => Grp::KEY_BUTTON_MOTION_VIRTUAL,
+      'width'       => (Grp::EXPOSE|Grp::CREATE|Grp::CONFIG),
+      'window'      => (Grp::CREATE|Grp::UNMAP|Grp::MAP|Grp::REPARENT|
+                        Grp::CONFIG|Grp::GRAVITY|Grp::CIRC),
+      'when'        => Grp::ALL,
+      'x'           => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING|
+                        Grp::EXPOSE|Grp::CREATE|Grp::CONFIG|Grp::GRAVITY|
+                        Grp::REPARENT),
+      'y'           => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING|
+                        Grp::EXPOSE|Grp::CREATE|Grp::CONFIG|Grp::GRAVITY|
+                        Grp::REPARENT),
+    }
+
+    FIELD_OPERATION = {
+      'root' => proc{|val| 
+        begin
+          Tk.tk_call_without_enc('winfo', 'pathname', val)
+          val
+        rescue
+          nil
+        end
+      }, 
+
+      'subwindow' => proc{|val| 
+        begin
+          Tk.tk_call_without_enc('winfo', 'pathname', val)
+          val
+        rescue
+          nil
+        end
+      }, 
+
+      'window' => proc{|val| nil}
+    }
+
+    #-------------------------------------------
+
+    def valid_fields(group_flag=nil)
+      group_flag = self.class.group_flag(self.type) unless group_flag
+
+      fields = {}
+      FIELD_FLAG.each{|key, flag|
+        next if (flag & group_flag) == 0
+        begin
+          val = self.__send__(key)
+        rescue
+          next
+        end
+        next if !val || val == '??'
+        fields[key] = val
+      }
+
+      fields
+    end
+
+    def valid_for_generate(group_flag=nil)
+      fields = valid_fields(group_flag)
+
+      FIELD_OPERATION.each{|key, cmd|
+        next unless fields.has_key?(key)
+        val = FIELD_OPERATION[key].call(fields[key])
+        if val
+          fields[key] = val
+        else
+          fields.delete(key)
+        end
+      }
+
+      fields
+    end
+
+    def generate(win, modkeys={})
+      klass = self.class
+
+      if modkeys.has_key?(:type) || modkeys.has_key?('type')
+        modkeys = TkComm._symbolkey2str(modkeys)
+        type_id = modkeys.delete('type')
+      else
+        type_id = self.type
+      end
+
+      type_name  = klass.type_name(type_id)
+      unless type_name
+        fail RuntimeError, "type_id #{type_id} is invalid"
+      end
+
+      group_flag = klass.group_flag(type_id)
+
+      opts = valid_for_generate(group_flag)
+
+      modkeys.each{|key, val|
+        if val
+          opts[key.to_s] = val
+        else
+          opts.delete(key.to_s)
+        end
+      }
+
+      if group_flag != Grp::KEY
+        Tk.event_generate(win, type_name, opts)
+      else
+        # If type is KEY event, focus should be set to target widget.
+        # If not set, original widget will get the same event. 
+        # That will make infinite loop.
+        w = Tk.tk_call_without_enc('focus')
+        begin
+          Tk.tk_call_without_enc('focus', win)
+          Tk.event_generate(win, type_name, opts)
+        ensure
+          Tk.tk_call_without_enc('focus', w)
+        end
+      end
+    end
+
+    #############################################
+
+    # [ <'%' subst-key char>, <proc type char>, <instance var (accessor) name>]
+    KEY_TBL = [
+      [ ?#, ?n, :serial ], 
+      [ ?a, ?s, :above ], 
+      [ ?b, ?n, :num ], 
+      [ ?c, ?n, :count ], 
+      [ ?d, ?s, :detail ], 
+      [ ?f, ?b, :focus ], 
+      [ ?h, ?n, :height ], 
+      [ ?i, ?s, :win_hex ], 
+      [ ?k, ?n, :keycode ], 
+      [ ?m, ?s, :mode ], 
+      [ ?o, ?b, :override ], 
+      [ ?p, ?s, :place ], 
+      [ ?s, ?x, :state ], 
+      [ ?t, ?n, :time ], 
+      [ ?w, ?n, :width ], 
+      [ ?x, ?n, :x ], 
+      [ ?y, ?n, :y ], 
+      [ ?A, ?s, :char ], 
+      [ ?B, ?n, :borderwidth ], 
+      [ ?D, ?n, :wheel_delta ], 
+      [ ?E, ?b, :send_event ], 
+      [ ?K, ?s, :keysym ], 
+      [ ?N, ?n, :keysym_num ], 
+      [ ?P, ?s, :property ], 
+      [ ?R, ?s, :rootwin_id ], 
+      [ ?S, ?s, :subwindow ], 
+      [ ?T, ?n, :type ], 
+      [ ?W, ?w, :widget ], 
+      [ ?X, ?n, :x_root ], 
+      [ ?Y, ?n, :y_root ], 
+      nil
+    ]
+
+    # [ <proc type char>, <proc/method to convert tcl-str to ruby-obj>]
+    PROC_TBL = [
+      [ ?n, TkComm.method(:num_or_str) ], 
+      [ ?s, TkComm.method(:string) ], 
+      [ ?b, TkComm.method(:bool) ], 
+      [ ?w, TkComm.method(:window) ], 
+
+      [ ?x, proc{|val|
+          begin
+            TkComm::number(val)
+          rescue ArgumentError
+            val
+          end
+        }
+      ], 
+
+      nil
+    ]
+
+    # setup tables to be used by scan_args, _get_subst_key, _get_all_subst_keys
+    #
+    #     _get_subst_key() and _get_all_subst_keys() generates key-string 
+    #     which describe how to convert callback arguments to ruby objects. 
+    #     When binding parameters are given, use _get_subst_key(). 
+    #     But when no parameters are given, use _get_all_subst_keys() to 
+    #     create a Event class object as a callback parameter. 
+    #
+    #     scan_args() is used when doing callback. It convert arguments 
+    #     ( which are Tcl strings ) to ruby objects based on the key string 
+    #     that is generated by _get_subst_key() or _get_all_subst_keys(). 
+    #
+    _setup_subst_table(KEY_TBL, PROC_TBL);
+
+    #
+    # NOTE: The order of parameters which passed to callback procedure is 
+    #        <extra_arg>, <extra_arg>, ... , <subst_arg>, <subst_arg>, ...
+    #
+
+    # If you need support extra arguments given by Tcl/Tk, 
+    # please override _get_extra_args_tbl
+    #
+    #def self._get_extra_args_tbl
+    #  # return an array of convert procs
+    #  []
+    #end
+
+=begin
+    alias button num
+    alias delta  wheel_delta
+    alias root   rootwin_id
+    alias rootx  x_root
+    alias root_x x_root
+    alias rooty  y_root
+    alias root_y y_root
+    alias sendevent send_event
+=end
+    ALIAS_TBL = {
+      :button    => :num, 
+      :data      => :detail, 
+      :delta     => :wheel_delta, 
+      :root      => :rootwin_id, 
+      :rootx     => :x_root, 
+      :root_x    => :x_root, 
+      :rooty     => :y_root, 
+      :root_y    => :y_root, 
+      :sendevent => :send_event, 
+      :window    => :widget
+    }
+
+    _define_attribute_aliases(ALIAS_TBL)
+
+  end
+
+  ###############################################
+
+  def install_bind_for_event_class(klass, cmd, *args)
+    extra_args_tbl = klass._get_extra_args_tbl
+
+    if args.compact.size > 0
+      args = args.join(' ')
+      keys = klass._get_subst_key(args)
+
+      if cmd.kind_of?(String)
+        id = cmd
+      elsif cmd.kind_of?(TkCallbackEntry)
+        id = install_cmd(cmd)
+      else
+        id = install_cmd(proc{|*arg|
+          ex_args = []
+          extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
+          begin
+            TkUtil.eval_cmd(cmd, *(ex_args.concat(klass.scan_args(keys, arg))))
+          rescue Exception=>e
+            if TkCore::INTERP.kind_of?(TclTkIp)
+              fail e
+            else
+              # MultiTkIp
+              fail Exception, "#{e.class}: #{e.message.dup}"
+            end
+          end
+        })
+      end
+    else
+      keys, args = klass._get_all_subst_keys
+
+      if cmd.kind_of?(String)
+        id = cmd
+      elsif cmd.kind_of?(TkCallbackEntry)
+        id = install_cmd(cmd)
+      else
+        id = install_cmd(proc{|*arg|
+          ex_args = []
+          extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
+          begin
+            TkUtil.eval_cmd(cmd, *(ex_args << klass.new(*klass.scan_args(keys, arg))))
+          rescue Exception=>e
+            if TkCore::INTERP.kind_of?(TclTkIp)
+              fail e
+            else
+              # MultiTkIp
+              fail Exception, "#{e.class}: #{e.message.dup}"
+            end
+          end
+        })
+      end
+    end
+
+    if TkCore::INTERP.kind_of?(TclTkIp)
+      id + ' ' + args
+    else
+      # MultiTkIp
+      "if {[set st [catch {#{id} #{args}} ret]] != 0} {
+         if {$st == 4} {
+           return -code continue $ret
+         } elseif {$st == 3} {
+           return -code break $ret
+         } elseif {$st == 2} {
+           return -code return $ret
+         } elseif {[regexp {^Exception: (TkCallbackContinue: .*)$} \
+                                                               $ret m msg]} {
+           return -code continue $msg
+         } elseif {[regexp {^Exception: (TkCallbackBreak: .*)$} $ret m msg]} {
+           return -code break $msg
+         } elseif {[regexp {^Exception: (TkCallbackReturn: .*)$} $ret m msg]} {
+           return -code return $msg
+         } elseif {[regexp {^Exception: (\\S+: .*)$} $ret m msg]} {
+           return -code return $msg
+         } else {
+           return -code error $ret
+         }
+       } else {
+          set ret
+       }"
+    end
+  end
+
+  def install_bind(cmd, *args)
+    install_bind_for_event_class(TkEvent::Event, cmd, *args)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/font.rb b/ruby_1_8_6/ext/tk/lib/tk/font.rb
new file mode 100644
index 0000000000..ab58ac5762
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/font.rb
@@ -0,0 +1,1762 @@
+#
+#  tk/font.rb - the class to treat fonts on Ruby/Tk
+#
+#                               by  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+class TkFont
+  include Tk
+  extend TkCore
+
+  TkCommandNames = ['font'.freeze].freeze
+
+  Tk_FontID = ["@font".freeze, "00000".taint].freeze
+  Tk_FontNameTBL = TkCore::INTERP.create_table
+  Tk_FontUseTBL  = TkCore::INTERP.create_table
+
+  TkCore::INTERP.init_ip_env{ 
+    Tk_FontNameTBL.clear
+    Tk_FontUseTBL.clear
+  }
+
+  # option_type : default => string
+  OptionType = Hash.new(?s)
+  OptionType['size'] = ?n
+  OptionType['pointadjust'] = ?n
+  OptionType['underline'] = ?b
+  OptionType['overstrike'] = ?b
+
+  # metric_type : default => num_or_str
+  MetricType = Hash.new(?n)
+  MetricType['fixed'] = ?b
+
+  # set default font
+  case Tk::TK_VERSION
+  when /^4\.*/
+    DEFAULT_LATIN_FONT_NAME = 'a14'.freeze
+    DEFAULT_KANJI_FONT_NAME = 'k14'.freeze
+
+  when /^8\.*/
+    if JAPANIZED_TK
+      begin
+        fontnames = tk_call('font', 'names')
+        case fontnames
+        when /defaultgui/
+          # Tcl/Tk-JP for Windows
+          ltn = 'defaultgui'
+          knj = 'defaultgui'
+        when /Mincho:Helvetica-Bold-12/
+          # Tcl/Tk-JP for UNIX/X
+          ltn, knj = tk_split_simplelist(tk_call('font', 'configure', 
+                                                 'Mincho:Helvetica-Bold-12', 
+                                                 '-compound'))
+        else
+          # unknown Tcl/Tk-JP
+          #platform = tk_call('set', 'tcl_platform(platform)')
+          platform = Tk::PLATFORM['platform']
+          case platform
+          when 'unix'
+            ltn = {'family'=>'Helvetica'.freeze, 
+                   'size'=>-12, 'weight'=>'bold'.freeze}
+            #knj = 'k14'
+            #knj = '-misc-fixed-medium-r-normal--14-*-*-*-c-*-jisx0208.1983-0'
+            knj = '-*-fixed-bold-r-normal--12-*-*-*-c-*-jisx0208.1983-0'
+          when 'windows'
+            ltn = {'family'=>'MS Sans Serif'.freeze, 'size'=>8}
+            knj = 'mincho'
+          when 'macintosh'
+            ltn = 'system'
+            knj = 'mincho'
+          else # unknown
+            ltn = 'Helvetica'
+            knj = 'mincho'
+          end
+        end
+      rescue
+        ltn = 'Helvetica'
+        knj = 'mincho'
+      end
+
+    else # not JAPANIZED_TK
+      begin
+        #platform = tk_call('set', 'tcl_platform(platform)')
+        platform = Tk::PLATFORM['platform']
+        case platform
+        when 'unix'
+          ltn = {'family'=>'Helvetica'.freeze, 
+                 'size'=>-12, 'weight'=>'bold'.freeze}
+        when 'windows'
+          ltn = {'family'=>'MS Sans Serif'.freeze, 'size'=>8}
+        when 'macintosh'
+          ltn = 'system'
+        else # unknown
+          ltn = 'Helvetica'
+        end
+      rescue
+        ltn = 'Helvetica'
+      end
+
+      knj = ltn.dup
+    end
+
+    DEFAULT_LATIN_FONT_NAME = ltn.freeze
+    DEFAULT_KANJI_FONT_NAME = knj.freeze
+
+  else # unknown version
+    DEFAULT_LATIN_FONT_NAME = 'Helvetica'.freeze
+    DEFAULT_KANJI_FONT_NAME = 'mincho'.freeze
+
+  end
+
+  if $DEBUG
+    print "default latin font = "; p DEFAULT_LATIN_FONT_NAME
+    print "default kanji font = "; p DEFAULT_KANJI_FONT_NAME
+  end
+
+
+  ###################################
+  class DescendantFont
+    def initialize(compound, type)
+      unless compound.kind_of?(TkFont)
+        fail ArgumentError, "a TkFont object is expected for the 1st argument"
+      end
+      @compound = compound
+      case type
+      when 'kanji', 'latin', 'ascii'
+        @type = type
+      when :kanji, :latin, :ascii
+        @type = type.to_s
+      else
+        fail ArgumentError, "unknown type '#{type}'"
+      end
+    end
+
+    def dup
+      fail RuntimeError, "cannot dupulicate a descendant font"
+    end
+    def clone
+      fail RuntimeError, "cannot clone a descendant font"
+    end
+
+    def to_eval
+      @compound.__send__(@type + '_font_id')
+    end
+    def font
+      @compound.__send__(@type + '_font_id')
+    end
+
+    def [](slot)
+      @compound.__send__(@type + '_configinfo', slot)
+    end
+    def []=(slot, value)
+      @compound.__send__(@type + '_configure', slot, value)
+      value
+    end
+
+    def method_missing(id, *args)
+      @compound.__send__(@type + '_' + id.id2name, *args)
+    end
+  end
+
+
+  ###################################
+  # class methods
+  ###################################
+  def TkFont.actual(fnt, option=nil)
+    fnt = '{}' if fnt == ''
+    if fnt.kind_of?(TkFont)
+     fnt.actual(option)
+    else
+      actual_core(fnt, nil, option)
+    end
+  end
+
+  def TkFont.actual_displayof(fnt, win, option=nil)
+    fnt = '{}' if fnt == ''
+    if fnt.kind_of?(TkFont)
+     fnt.actual_displayof(win, option)
+    else
+      win = '.' unless win
+      actual_core(fnt, win, option)
+    end
+  end
+
+  def TkFont.configure(fnt, slot, value=None)
+    if fnt.kind_of?(TkFont)
+      fnt.configure(fnt, slot, value)
+    else
+      configure_core(fnt, slot, value)
+    end
+    fnt
+  end
+
+  def TkFont.configinfo(fnt, slot=nil)
+    if fnt.kind_of?(TkFont)
+      fnt.configinfo(fnt, slot)
+    else
+      configinfo_core(fnt, slot)
+    end
+  end
+
+  def TkFont.current_configinfo(fnt, slot=nil)
+    if fnt.kind_of?(TkFont)
+      fnt.current_configinfo(fnt, slot)
+    else
+      current_configinfo_core(fnt, slot)
+    end
+  end
+
+  def TkFont.measure(fnt, text)
+    fnt = '{}' if fnt == ''
+    if fnt.kind_of?(TkFont)
+      fnt.measure(text)
+    else
+      measure_core(fnt, nil, text)
+    end
+  end
+
+  def TkFont.measure_displayof(fnt, win, text)
+    fnt = '{}' if fnt == ''
+    if fnt.kind_of?(TkFont)
+      fnt.measure_displayof(win, text)
+    else
+      win = '.' unless win
+      measure_core(fnt, win, text)
+    end
+  end
+
+  def TkFont.metrics(fnt, option=nil)
+    fnt = '{}' if fnt == ''
+    if fnt.kind_of?(TkFont)
+      fnt.metrics(option)
+    else
+      metrics_core(fnt, nil, option)
+    end
+  end
+
+  def TkFont.metrics_displayof(fnt, win, option=nil)
+    fnt = '{}' if fnt == ''
+    if fnt.kind_of?(TkFont)
+      font.metrics_displayof(win, option=nil)
+    else
+      win = '.' unless win
+      metrics_core(fnt, win, option)
+    end
+  end
+
+  def TkFont.families(win=nil)
+    case (Tk::TK_VERSION)
+    when /^4\.*/
+      ['fixed']
+
+    when /^8\.*/
+      if win
+        tk_split_simplelist(tk_call('font', 'families', '-displayof', win))
+      else
+        tk_split_simplelist(tk_call('font', 'families'))
+      end
+    end
+  end
+
+  def TkFont.names
+    case (Tk::TK_VERSION)
+    when /^4\.*/
+      r = ['fixed']
+      r += ['a14', 'k14'] if JAPANIZED_TK
+      Tk_FontNameTBL.each_value{|obj| r.push(obj)}
+      r | []
+
+    when /^8\.*/
+      tk_split_simplelist(tk_call('font', 'names'))
+
+    end
+  end
+
+  def TkFont.create_copy(font)
+    fail 'source-font must be a TkFont object' unless font.kind_of? TkFont
+    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      keys = {}
+      font.configinfo.each{|key,value| keys[key] = value }
+      TkFont.new(font.latin_font_id, font.kanji_font_id, keys)
+    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      TkFont.new(font.latin_font_id, font.kanji_font_id, font.configinfo)
+    end
+  end
+
+  def TkFont.get_obj(name)
+    if name =~ /^(@font[0-9]+)(|c|l|k)$/
+      Tk_FontNameTBL[$1]
+    else
+      nil
+    end
+  end
+
+  def TkFont.init_widget_font(pathname, *args)
+    win, tag, key = pathname.split(';')
+    key = 'font' if key == nil || key == ''
+    path = [win, tag, key].join(';')
+
+    case (Tk::TK_VERSION)
+    when /^4\.*/
+      regexp = /^-(|kanji)#{key} /
+
+      conf_list = tk_split_simplelist(tk_call(*args)).
+        find_all{|prop| prop =~ regexp}.
+        collect{|prop| tk_split_simplelist(prop)}
+
+      if conf_list.size == 0
+        raise RuntimeError, "the widget may not support 'font' option"
+      end
+
+      args << {}
+
+      ltn_key = "-#{key}"
+      knj_key = "-kanji#{key}"
+
+      ltn_info = conf_list.find{|conf| conf[0] == ltn_key}
+      ltn = ltn_info[-1]
+      ltn = nil if ltn == [] || ltn == ""
+
+      knj_info = conf_list.find{|conf| conf[0] == knj_key}
+      knj = knj_info[-1]
+      knj = nil if knj == [] || knj == ""
+
+      TkFont.new(ltn, knj).call_font_configure([path, key], *args)
+
+    when /^8\.*/
+      regexp = /^-#{key} /
+
+      conf_list = tk_split_simplelist(tk_call(*args)).
+        find_all{|prop| prop =~ regexp}.
+        collect{|prop| tk_split_simplelist(prop)}
+
+      if conf_list.size == 0
+        raise RuntimeError, "the widget may not support 'font' option"
+      end
+
+      args << {}
+
+      optkey = "-#{key}"
+
+      info = conf_list.find{|conf| conf[0] == optkey}
+      fnt = info[-1]
+      fnt = nil if fnt == [] || fnt == ""
+
+      unless fnt
+        # create dummy
+        # TkFont.new(nil, nil).call_font_configure([path, key], *args)
+        dummy_fnt = TkFont.allocate
+        dummy_fnt.instance_eval{ init_dummy_fontobj() }
+        dummy_fnt
+      else
+        begin
+          compound = tk_split_simplelist(
+              Hash[*tk_split_simplelist(tk_call('font', 'configure', 
+                                                fnt))].collect{|k,v|
+                [k[1..-1], v]
+              }.assoc('compound')[1])
+        rescue
+          compound = []
+        end
+        if compound == []
+          TkFont.new(fnt).call_font_configure([path, key], *args)
+        else
+          TkFont.new(compound[0], 
+                     compound[1]).call_font_configure([path, key], *args)
+        end
+      end
+    end
+  end
+
+  def TkFont.used_on(path=nil)
+    if path
+      Tk_FontUseTBL[path]
+    else
+      Tk_FontUseTBL.values | []
+    end
+  end
+
+  def TkFont.failsafe(font)
+    begin
+      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
+        tk_call('font', 'failsafe', font)
+      end
+    rescue
+    end
+  end
+
+  ###################################
+  # instance methods
+  ###################################
+  private
+  ###################################
+  def init_dummy_fontobj
+    @id = Tk_FontID.join(TkCore::INTERP._ip_id_)
+    Tk_FontID[1].succ!
+    Tk_FontNameTBL[@id] = self
+
+    @latin_desscendant = nil
+    @kanji_desscendant = nil
+
+    case (Tk::TK_VERSION)
+    when /^4\.*/
+      @latinfont = ""
+      @kanjifont = ""
+      if JAPANIZED_TK
+        @compoundfont = [[@latinfont], [@kanjifont]]
+        @fontslot = {'font'=>@latinfont, 'kanjifont'=>@kanjifont}
+      else
+        @compoundfont = @latinfont
+        @fontslot = {'font'=>@latinfont}
+      end
+    else
+      @latinfont = @id + 'l'
+      @kanjifont = @id + 'k'
+      @compoundfont = @id + 'c'
+
+      if JAPANIZED_TK
+        tk_call('font', 'create', @latinfont, '-charset', 'iso8859')
+        tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
+        tk_call('font', 'create', @compoundfont, 
+                '-compound', [@latinfont, @kanjifont])
+      else
+        tk_call('font', 'create', @latinfont)
+        tk_call('font', 'create', @kanjifont)
+        tk_call('font', 'create', @compoundfont)
+      end
+
+      @fontslot = {'font'=>@compoundfont}
+    end
+
+    self
+  end
+
+  def initialize(ltn=nil, knj=nil, keys=nil)
+    ltn = '{}' if ltn == ''
+    knj = '{}' if knj == ''
+
+    # @id = Tk_FontID.join('')
+    @id = Tk_FontID.join(TkCore::INTERP._ip_id_)
+    Tk_FontID[1].succ!
+    Tk_FontNameTBL[@id] = self
+
+    @latin_desscendant = nil
+    @kanji_desscendant = nil
+
+    if knj.kind_of?(Hash) && !keys
+      keys = knj
+      knj = nil
+    end
+
+    # compound font check
+    if Tk::TK_VERSION == '8.0' && JAPANIZED_TK
+      begin
+        compound = tk_split_simplelist(tk_call('font', 'configure', 
+                                               ltn, '-compound'))
+        if knj == nil
+          if compound != []
+            ltn, knj = compound
+          end
+        else
+          if compound != []
+            ltn = compound[0]
+          end
+          compound = tk_split_simplelist(tk_call('font', 'configure', 
+                                                 knj, '-compound'))
+          if compound != []
+            knj = compound[1]
+          end
+        end
+      rescue
+      end
+    end
+
+    if ltn
+      if JAPANIZED_TK && !knj
+        if Tk::TK_VERSION =~ /^4.*/
+          knj = DEFAULT_KANJI_FONT_NAME
+        else
+          knj = ltn 
+        end
+      end
+    else
+      ltn = DEFAULT_LATIN_FONT_NAME
+      knj = DEFAULT_KANJI_FONT_NAME if JAPANIZED_TK && !knj
+    end
+
+    create_compoundfont(ltn, knj, keys)
+  end
+
+  def initialize_copy(font)
+    unless font.kind_of?(TkFont)
+      fail TypeError, '"initialize_copy should take same class object'
+    end
+    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      keys = {}
+      font.configinfo.each{|key,value| keys[key] = value }
+      initialize(font.latin_font_id, font.kanji_font_id, keys)
+    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      initialize(font.latin_font_id, font.kanji_font_id, font.configinfo)
+    end
+  end
+
+  def _get_font_info_from_hash(font)
+    font = _symbolkey2str(font)
+    foundry  = (info = font['foundry'] .to_s)?  info: '*'
+    family   = (info = font['family']  .to_s)?  info: '*'
+    weight   = (info = font['weight']  .to_s)?  info: '*'
+    slant    = (info = font['slant']   .to_s)?  info: '*'
+    swidth   = (info = font['swidth']  .to_s)?  info: '*'
+    adstyle  = (info = font['adstyle'] .to_s)?  info: '*'
+    pixels   = (info = font['pixels']  .to_s)?  info: '*'
+    points   = (info = font['points']  .to_s)?  info: '*'
+    resx     = (info = font['resx']    .to_s)?  info: '*'
+    resy     = (info = font['resy']    .to_s)?  info: '*'
+    space    = (info = font['space']   .to_s)?  info: '*'
+    avgWidth = (info = font['avgWidth'].to_s)?  info: '*'
+    charset  = (info = font['charset'] .to_s)?  info: '*'
+    encoding = (info = font['encoding'].to_s)?  info: '*'
+
+    [foundry, family, weight, slant, swidth, adstyle,
+      pixels, points, resx, resy, space, avgWidth, charset, encoding]
+  end
+
+  def create_latinfont_tk4x(font)
+    if font.kind_of? Hash
+      @latinfont = '-' + _get_font_info_from_hash(font).join('-') + '-'
+
+    elsif font.kind_of? Array
+      finfo = {}
+      finfo['family'] = font[0].to_s
+      if font[1]
+        fsize = font[1].to_s
+        if fsize != '0' && fsize =~ /^(|\+|-)([0-9]+)$/
+          if $1 == '-'
+            finfo['pixels'] = $2
+          else
+            finfo['points'] = $2
+          end
+        else
+          finfo['points'] = '13'
+        end
+      end
+      font[2..-1].each{|style|
+        case (style)
+        when 'normal'
+          finfo['weight'] = style
+        when 'bold'
+          finfo['weight'] = style
+        when 'roman'
+          finfo['slant'] = 'r'
+        when 'italic'
+          finfo['slant'] = 'i'
+        end
+      }
+
+      @latinfont = '-' + _get_font_info_from_hash(finfo).join('-') + '-'
+
+    elsif font.kind_of? TkFont
+      @latinfont = font.latin_font
+
+    else
+      if font
+        @latinfont = font
+      else
+        @latinfont = DEFAULT_LATIN_FONT_NAME
+      end
+
+    end
+  end
+
+  def create_kanjifont_tk4x(font)
+    unless JAPANIZED_TK
+      @kanjifont = ""
+      return
+    end
+
+    if font.kind_of? Hash
+      @kanjifont = '-' + _get_font_info_from_hash(font).join('-') + '-'
+
+    elsif font.kind_of? Array
+      finfo = {}
+      finfo['family'] = font[0].to_s
+      if font[1]
+        fsize = font[1].to_s
+        if fsize != '0' && fsize =~ /^(|\+|-)([0-9]+)$/
+          if $1 == '-'
+            finfo['pixels'] = $2
+          else
+            finfo['points'] = $2
+          end
+        else
+          finfo['points'] = '13'
+        end
+      end
+      font[2..-1].each{|style|
+        case (style)
+        when 'normal'
+          finfo['weight'] = style
+        when 'bold'
+          finfo['weight'] = style
+        when 'roman'
+          finfo['slant'] = 'r'
+        when 'italic'
+          finfo['slant'] = 'i'
+        end
+      }
+
+      @kanjifont = '-' + _get_font_info_from_hash(finfo).join('-') + '-'
+    elsif font.kind_of? TkFont
+      @kanjifont = font.kanji_font_id
+    else
+      if font
+        @kanjifont = font
+      else
+        @kanjifont = DEFAULT_KANJI_FONT_NAME
+      end
+    end
+  end
+
+  def create_compoundfont_tk4x(ltn, knj, keys)
+    create_latinfont(ltn)
+    create_kanjifont(knj)
+
+    if JAPANIZED_TK
+      @compoundfont = [[@latinfont], [@kanjifont]]
+      @fontslot = {'font'=>@latinfont, 'kanjifont'=>@kanjifont}
+    else
+      @compoundfont = @latinfont
+      @fontslot = {'font'=>@latinfont}
+    end
+  end
+
+  def create_latinfont_tk8x(font)
+    @latinfont = @id + 'l'
+
+    if JAPANIZED_TK
+      if font.kind_of? Hash
+        if font[:charset] || font['charset']
+          tk_call('font', 'create', @latinfont, *hash_kv(font))
+        else
+          tk_call('font', 'create', @latinfont, 
+                  '-charset', 'iso8859', *hash_kv(font))
+        end
+      elsif font.kind_of? Array
+        tk_call('font', 'create', @latinfont, '-copy', array2tk_list(font))
+        tk_call('font', 'configure', @latinfont, '-charset', 'iso8859')
+      elsif font.kind_of? TkFont
+        tk_call('font', 'create', @latinfont, '-copy', font.latin_font)
+      elsif font
+        tk_call('font', 'create', @latinfont, '-copy', font, 
+                '-charset', 'iso8859')
+      else
+        tk_call('font', 'create', @latinfont, '-charset', 'iso8859')
+      end
+    else
+      if font.kind_of? Hash
+        tk_call('font', 'create', @latinfont, *hash_kv(font))
+      else
+        keys = {}
+        if font.kind_of? Array
+          actual_core(array2tk_list(font)).each{|key,val| keys[key] = val}
+        elsif font.kind_of? TkFont
+          actual_core(font.latin_font).each{|key,val| keys[key] = val}
+        elsif font
+          actual_core(font).each{|key,val| keys[key] = val}
+        end
+        tk_call('font', 'create', @latinfont, *hash_kv(keys))
+      end
+
+      if font && @compoundfont
+        keys = {}
+        actual_core(@latinfont).each{|key,val| keys[key] = val}
+        tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
+      end
+    end
+  end
+
+  def create_kanjifont_tk8x(font)
+    @kanjifont = @id + 'k'
+
+    if JAPANIZED_TK
+      if font.kind_of? Hash
+        if font[:charset] || font['charset']
+          tk_call('font', 'create', @kanjifont, *hash_kv(font))
+        else
+          tk_call('font', 'create', @kanjifont, 
+                  '-charset', 'jisx0208.1983', *hash_kv(font))
+        end
+      elsif font.kind_of? Array
+        tk_call('font', 'create', @kanjifont, '-copy', array2tk_list(font))
+        tk_call('font', 'configure', @kanjifont, '-charset', 'jisx0208.1983')
+      elsif font.kind_of? TkFont
+        tk_call('font', 'create', @kanjifont, '-copy', font.kanji_font_id)
+      elsif font
+        tk_call('font', 'create', @kanjifont, '-copy', font, 
+                '-charset', 'jisx0208.1983')
+      else
+        tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
+      end
+      # end of JAPANIZED_TK
+
+    else
+      if font.kind_of? Hash
+        tk_call('font', 'create', @kanjifont, *hash_kv(font))
+      else
+        keys = {}
+        if font.kind_of? Array
+          actual_core(array2tk_list(font)).each{|key,val| keys[key] = val}
+        elsif font.kind_of? TkFont
+          actual_core(font.kanji_font_id).each{|key,val| keys[key] = val}
+        elsif font
+          actual_core(font).each{|key,val| keys[key] = val}
+        end
+        tk_call('font', 'create', @kanjifont, *hash_kv(keys))
+      end
+
+      if font && @compoundfont
+        keys = {}
+        actual_core(@kanjifont).each{|key,val| keys[key] = val}
+        tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
+      end
+    end
+  end
+
+  def create_compoundfont_tk8x(ltn, knj, keys)
+    if knj
+      create_latinfont(ltn)
+      create_kanjifont(knj)
+    else
+      cfnt = ltn
+      create_kanjifont(cfnt)
+      create_latinfont(cfnt)
+    end
+
+    @compoundfont = @id + 'c'
+
+    if JAPANIZED_TK
+      unless keys
+        keys = {}
+      else
+        keys = keys.dup
+      end
+      if (tk_call('font', 'configure', @latinfont, '-underline') == '1' &&
+          tk_call('font', 'configure', @kanjifont, '-underline') == '1' &&
+          !keys.key?('underline'))
+        keys['underline'] = true
+      end
+      if (tk_call('font', 'configure', @latinfont, '-overstrike') == '1' &&
+          tk_call('font', 'configure', @kanjifont, '-overstrike') == '1' &&
+          !keys.key?('overstrike'))
+        keys['overstrike'] = true
+      end
+
+      @fontslot = {'font'=>@compoundfont}
+      begin
+        tk_call('font', 'create', @compoundfont, 
+                '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
+      rescue RuntimeError => e
+        if ltn == knj
+          if e.message =~ /kanji font .* specified/
+            tk_call('font', 'delete', @latinfont)
+            create_latinfont(DEFAULT_LATIN_FONT_NAME)
+            opts = []
+            Hash[*(tk_split_simplelist(tk_call('font', 'configure', 
+                                               @kanjifont)))].each{|k,v|
+              case k
+              when '-size', '-weight', '-slant', '-underline', '-overstrike'
+                opts << k << v
+              end
+            }
+            tk_call('font', 'configure', @latinfont, *opts)
+            tk_call('font', 'create', @compoundfont, 
+                    '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
+
+          elsif e.message =~ /ascii font .* specified/
+            tk_call('font', 'delete', @kanjifont)
+            create_kanjifont(DEFAULT_KANJI_FONT_NAME)
+            opts = []
+            Hash[*(tk_split_simplelist(tk_call('font', 'configure', 
+                                               @latinfont)))].each{|k,v|
+              case k
+              when '-size', '-weight', '-slant', '-underline', '-overstrike'
+                opts << k << v
+              end
+            }
+            tk_call('font', 'configure', @kanjifont, *opts)
+            tk_call('font', 'create', @compoundfont, 
+                    '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
+
+          else
+            raise e
+          end
+        else
+          raise e
+        end
+      end
+    else
+      tk_call('font', 'create', @compoundfont)
+
+      latinkeys = {}
+      begin
+        actual_core(@latinfont).each{|key,val| latinkeys[key] = val}
+      rescue
+        latinkeys = {}
+      end
+      if latinkeys != {}
+        tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
+      end
+
+      if knj
+        compoundkeys = nil
+        kanjikeys = {}
+        begin
+          actual_core(@kanjifont).each{|key,val| kanjikeys[key] = val}
+        rescue
+          kanjikeys = {}
+        end
+        if kanjikeys != {}
+          tk_call('font', 'configure', @compoundfont, *hash_kv(kanjikeys))
+        end
+      end
+
+      if cfnt
+        if cfnt.kind_of?(Hash)
+          compoundkeys = cfnt.dup
+        else
+          compoundkeys = {}
+          actual_core(cfnt).each{|key,val| compoundkeys[key] = val}
+        end
+        compoundkeys.update(_symbolkey2str(keys))
+        keys = compoundkeys
+      end
+
+      @fontslot = {'font'=>@compoundfont}
+      tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
+    end
+  end
+
+  ###################################
+  public
+  ###################################
+  def inspect
+    sprintf("#<%s:%0x:%s>", self.class.inspect, self.__id__, @compoundfont)
+  end
+
+  def method_missing(id, *args)
+    name = id.id2name
+    case args.length
+    when 1
+      if name[-1] == ?=
+        configure name[0..-2], args[0]
+        args[0]
+      else
+        configure name, args[0]
+        self
+      end
+    when 0
+      begin
+        configinfo name
+      rescue
+        super(id, *args)
+#        fail NameError, "undefined local variable or method `#{name}' for #{self.to_s}", error_at
+      end
+    else
+      super(id, *args)
+#      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
+    end
+  end
+
+  def call_font_configure(path, *args)
+    if path.kind_of?(Array)
+      # [path, optkey]
+      win, tag = path[0].split(';')
+      optkey = path[1].to_s
+    else
+      win, tag, optkey = path.split(';')
+    end
+
+    fontslot = _symbolkey2str(@fontslot)
+    if optkey && optkey != ""
+      ltn = fontslot.delete('font')
+      knj = fontslot.delete('kanjifont')
+      fontslot[optkey] = ltn if ltn
+      fontslot["kanji#{optkey}"] = knj if knj
+    end
+
+    keys = _symbolkey2str(args.pop).update(fontslot)
+    args.concat(hash_kv(keys))
+    tk_call(*args)
+    Tk_FontUseTBL[[win, tag, optkey].join(';')] = self
+    self
+  end
+
+  def used
+    ret = []
+    Tk_FontUseTBL.each{|key,value|
+      next unless self == value
+      if key.include?(';')
+        win, tag, optkey = key.split(';')
+        winobj = tk_tcl2ruby(win)
+        if winobj.kind_of? TkText
+          if optkey
+            ret.push([winobj, winobj.tagid2obj(tag), optkey])
+          else
+            ret.push([winobj, winobj.tagid2obj(tag)])
+          end
+        elsif winobj.kind_of? TkCanvas
+          if (tagobj = TkcTag.id2obj(winobj, tag)).kind_of? TkcTag
+            if optkey
+              ret.push([winobj, tagobj, optkey])
+            else
+              ret.push([winobj, tagobj])
+            end
+          elsif (tagobj = TkcItem.id2obj(winobj, tag)).kind_of? TkcItem
+            if optkey
+              ret.push([winobj, tagobj, optkey])
+            else
+              ret.push([winobj, tagobj])
+            end
+          else
+            if optkey
+              ret.push([winobj, tag, optkey])
+            else
+              ret.push([winobj, tag])
+            end
+          end
+        elsif winobj.kind_of? TkMenu
+          if optkey
+            ret.push([winobj, tag, optkey])
+          else
+            ret.push([winobj, tag])
+          end
+        else
+          if optkey
+            ret.push([win, tag, optkey])
+          else
+            ret.push([win, tag])
+          end
+        end
+      else
+        ret.push(tk_tcl2ruby(key))
+      end
+    }
+    ret
+  end
+
+  def id
+    @id
+  end
+
+  def to_eval
+    font
+  end
+
+  def font
+    @compoundfont
+  end
+  alias font_id font
+
+  def latin_font_id
+    @latinfont
+  end
+
+  def latin_font
+    # @latinfont
+    if @latin_descendant
+      @latin_descendant
+    else
+      @latin_descendant = DescendantFont.new(self, 'latin')
+    end
+  end
+  alias latinfont latin_font
+
+  def kanji_font_id
+    @kanjifont
+  end
+
+  def kanji_font
+    # @kanjifont
+    if @kanji_descendant
+      @kanji_descendant
+    else
+      @kanji_descendant = DescendantFont.new(self, 'kanji')
+    end
+  end
+  alias kanjifont kanji_font
+
+  def actual(option=nil)
+    actual_core(@compoundfont, nil, option)
+  end
+
+  def actual_displayof(win, option=nil)
+    win = '.' unless win
+    actual_core(@compoundfont, win, option)
+  end
+
+  def latin_actual(option=nil)
+    actual_core(@latinfont, nil, option)
+  end
+
+  def latin_actual_displayof(win, option=nil)
+    win = '.' unless win
+    actual_core(@latinfont, win, option)
+  end
+
+  def kanji_actual(option=nil)
+    #if JAPANIZED_TK
+    if @kanjifont != ""
+      actual_core(@kanjifont, nil, option)
+    else
+      actual_core_tk4x(nil, nil, option)
+    end
+  end
+
+  def kanji_actual_displayof(win, option=nil)
+    #if JAPANIZED_TK
+    if @kanjifont != ""
+      win = '.' unless win
+      actual_core(@kanjifont, win, option)
+    else
+      actual_core_tk4x(nil, win, option)
+    end
+  end
+
+  def [](slot)
+    configinfo slot
+  end
+
+  def []=(slot, val)
+    configure slot, val
+    val
+  end
+
+  def configure(slot, value=None)
+    configure_core(@compoundfont, slot, value)
+    self
+  end
+
+  def configinfo(slot=nil)
+    configinfo_core(@compoundfont, slot)
+  end
+
+  def current_configinfo(slot=nil)
+    current_configinfo_core(@compoundfont, slot)
+  end
+
+  def delete
+    delete_core
+  end
+
+  def latin_configure(slot, value=None)
+    if JAPANIZED_TK
+      configure_core(@latinfont, slot, value)
+    else
+      configure(slot, value)
+    end
+    self
+  end
+
+  def latin_configinfo(slot=nil)
+    if JAPANIZED_TK
+      configinfo_core(@latinfont, slot)
+    else
+      configinfo(slot)
+    end
+  end
+
+  def kanji_configure(slot, value=None)
+    #if JAPANIZED_TK
+    if @kanjifont != ""
+      configure_core(@kanjifont, slot, value)
+      configure('size'=>configinfo('size')) # to reflect new configuration
+    else
+      #""
+      configure(slot, value)
+    end
+    self
+  end
+
+  def kanji_configinfo(slot=nil)
+    #if JAPANIZED_TK
+    if @kanjifont != ""
+      configinfo_core(@kanjifont, slot)
+    else
+      #[]
+      configinfo(slot)
+    end
+  end
+
+  def replace(ltn, knj=None)
+    knj = ltn if knj == None
+    latin_replace(ltn)
+    kanji_replace(knj)
+    self
+  end
+
+  def latin_replace(ltn)
+    latin_replace_core(ltn)
+    reset_pointadjust
+    self
+  end
+
+  def kanji_replace(knj)
+    kanji_replace_core(knj)
+    reset_pointadjust
+    self
+  end
+
+  def measure(text)
+    measure_core(@compoundfont, nil, text)
+  end
+
+  def measure_displayof(win, text)
+    win = '.' unless win
+    measure_core(@compoundfont, win, text)
+  end
+
+  def metrics(option=nil)
+    metrics_core(@compoundfont, nil, option)
+  end
+
+  def metrics_displayof(win, option=nil)
+    win = '.' unless win
+    metrics_core(@compoundfont, win, option)
+  end
+
+  def latin_metrics(option=nil)
+    metrics_core(@latinfont, nil, option)
+  end
+
+  def latin_metrics_displayof(win, option=nil)
+    win = '.' unless win
+    metrics_core(@latinfont, win, option)
+  end
+
+  def kanji_metrics(option=nil)
+    if JAPANIZED_TK
+      metrics_core(@kanjifont, nil, option)
+    else
+      metrics_core_tk4x(nil, nil, option)
+    end
+  end
+
+  def kanji_metrics_displayof(win, option=nil)
+    if JAPANIZED_TK
+      win = '.' unless win
+      metrics_core(@kanjifont, win, option)
+    else
+      metrics_core_tk4x(nil, win, option)
+    end
+  end
+
+  def reset_pointadjust
+    begin
+      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
+        configure('pointadjust' => latin_actual.assoc('size')[1].to_f / 
+                                      kanji_actual.assoc('size')[1].to_f )
+      end
+    rescue
+    end
+    self
+  end
+
+  ###################################
+  # private alias
+  ###################################
+  case (Tk::TK_VERSION)
+  when /^4\.*/
+    alias create_latinfont        create_latinfont_tk4x
+    alias create_kanjifont        create_kanjifont_tk4x
+    alias create_compoundfont     create_compoundfont_tk4x
+
+  when /^8\.[0-5]/
+    alias create_latinfont        create_latinfont_tk8x
+    alias create_kanjifont        create_kanjifont_tk8x
+    alias create_compoundfont     create_compoundfont_tk8x
+
+  else
+    alias create_latinfont        create_latinfont_tk8x
+    alias create_kanjifont        create_kanjifont_tk8x
+    alias create_compoundfont     create_compoundfont_tk8x
+
+  end
+
+  ###################################
+  # public alias
+  ###################################
+  alias ascii_font             latin_font
+  alias asciifont              latinfont
+  alias create_asciifont       create_latinfont
+  alias ascii_actual           latin_actual
+  alias ascii_actual_displayof latin_actual_displayof
+  alias ascii_configure        latin_configure
+  alias ascii_configinfo       latin_configinfo
+  alias ascii_replace          latin_replace
+  alias ascii_metrics          latin_metrics
+
+  ###################################
+=begin
+  def dup
+    TkFont.new(self)
+  end
+  def clone
+    TkFont.new(self)
+  end
+=end
+end
+
+module TkFont::CoreMethods
+  include Tk
+  extend TkCore
+
+  private
+
+  def actual_core_tk4x(font, win=nil, option=nil)
+    # dummy
+    if option == 'pointadjust' || option == :pointadjust
+        1.0
+    elsif option
+      case TkFont::OptionType[option.to_s]
+      when ?n
+        0
+      when ?b
+        false
+      else
+        ''
+      end
+    else
+      [['family',''], ['size',0], ['weight',''], ['slant',''], 
+        ['underline',false], ['overstrike',false], ['charset',''], 
+        ['pointadjust',0]]
+    end
+  end
+
+  def actual_core_tk8x(font, win=nil, option=nil)
+    font = '{}' if font == ''
+
+    if option == 'compound' || option == :compound
+      ""
+    elsif option
+      if win
+        val = tk_call('font', 'actual', font, 
+                      "-displayof", win, "-#{option}")
+      else
+        val = tk_call('font', 'actual', font, "-#{option}")
+      end
+      case TkFont::OptionType[option.to_s]
+      when ?n
+        num_or_str(val)
+      when ?b
+        bool(val)
+      else
+        val
+      end
+    else
+      l = tk_split_simplelist(if win
+                                 tk_call('font', 'actual', font, 
+                                                     "-displayof", win)
+                              else
+                                 tk_call('font', 'actual', font)
+                              end)
+      r = []
+      while key=l.shift
+        if key == '-compound'
+          l.shift
+        else
+          key = key[1..-1]
+          val = l.shift
+          case TkFont::OptionType[key]
+          when ?n
+            r.push [key, num_or_str(val)]
+          when ?b
+            r.push [key, bool(val)]
+          else
+            r.push [key, val]
+          end
+        end
+      end
+      r
+    end
+  end
+
+  def configure_core_tk4x(font, slot, value=None)
+    #""
+    self
+  end
+
+  def configinfo_core_tk4x(font, option=nil)
+    # dummy
+    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      if option == 'pointadjust' || option == :pointadjust
+        1.0
+      elsif option
+        case TkFont::OptionType[option.to_s]
+        when ?n
+          0
+        when ?b
+          false
+        else
+          ''
+        end
+      else
+        [['family',''], ['size',0], ['weight',''], ['slant',''], 
+          ['underline',false], ['overstrike',false], ['charset',''], 
+          ['pointadjust',1.0]]
+      end
+    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      current_configinfo_core_tk4x(font, option)
+    end
+  end
+
+  def current_configinfo_core_tk4x(font, option=nil)
+    if option
+      case TkFont::OptionType[option.to_s]
+      when ?n
+        0
+      when ?b
+        false
+      else
+        ''
+      end
+    else
+      {'family'=>'', 'size'=>0, 'weight'=>'', 'slant'=>'', 
+        'underline'=>false, 'overstrike'=>false, 
+        'charset'=>false, 'pointadjust'=>1.0}
+    end
+  end
+
+  def configure_core_tk8x(font, slot, value=None)
+    if JAPANIZED_TK
+      begin
+        padjust = tk_call('font', 'configure', font, '-pointadjust')
+      rescue
+        padjust = nil
+      end
+    else
+      padjust = nil
+    end
+    if slot.kind_of? Hash
+      if JAPANIZED_TK && (slot.key?('family') || slot.key?(:family))
+        slot = _symbolkey2str(slot)
+        configure_core_tk8x(font, 'family', slot.delete('family'))
+      end
+
+      if ((slot.key?('size') || slot.key?(:size)) && 
+          padjust && !slot.key?('pointadjust') && !slot.key?(:pointadjust))
+        tk_call('font', 'configure', font, 
+                '-pointadjust', padjust, *hash_kv(slot))
+      else
+        tk_call('font', 'configure', font, *hash_kv(slot))
+      end
+    elsif (slot == 'size' || slot == :size) && padjust != nil
+      tk_call('font', 'configure', font, 
+              "-#{slot}", value, '-pointadjust', padjust)
+    elsif JAPANIZED_TK && (slot == 'family' || slot == :family)
+      # coumpund font?
+      begin
+        compound = tk_split_simplelist(tk_call('font', 'configure', 
+                                               font, '-compound'))
+      rescue
+        tk_call('font', 'configure', font, '-family', value)
+        return self
+      end
+      if compound == []
+        tk_call('font', 'configure', font, '-family', value)
+        return self
+      end
+      ltn, knj = compound
+
+      lfnt = tk_call('font', 'create', '-copy', ltn)
+      begin
+        tk_call('font', 'configure', lfnt, '-family', value)
+        latin_replace_core_tk8x(lfnt)
+      rescue RuntimeError => e
+        fail e if $DEBUG
+      ensure
+        tk_call('font', 'delete', lfnt) if lfnt != ''
+      end
+
+      kfnt = tk_call('font', 'create', '-copy', knj)
+      begin
+        tk_call('font', 'configure', kfnt, '-family', value)
+        kanji_replace_core_tk8x(lfnt)
+      rescue RuntimeError => e
+        fail e if $DEBUG
+      ensure
+        tk_call('font', 'delete', kfnt) if kfnt != ''
+      end
+      
+    else
+      tk_call('font', 'configure', font, "-#{slot}", value)
+    end
+    self
+  end
+
+  def configinfo_core_tk8x(font, option=nil)
+    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      if option == 'compound' || option == :compound
+        ""
+      elsif option
+        val = tk_call('font', 'configure', font, "-#{option}")
+        case TkFont::OptionType[option.to_s]
+        when ?n
+          num_or_str(val)
+        when ?b
+          bool(val)
+        else
+          val
+        end
+      else
+        l = tk_split_simplelist(tk_call('font', 'configure', font))
+        r = []
+        while key=l.shift
+          if key == '-compound'
+            l.shift
+          else
+            key = key[1..-1]
+            val = l.shift
+            case TkFont::OptionType[key]
+            when ?n
+              r.push [key, num_or_str(val)]
+            when ?b
+              r.push [key, bool(val)]
+            else
+              r.push [key, val]
+            end
+          end
+        end
+        r
+      end
+    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      current_configinfo_core_tk8x(font, option)
+    end
+  end
+
+  def current_configinfo_core_tk8x(font, option=nil)
+    if option == 'compound'
+      ""
+    elsif option
+      val = tk_call('font', 'configure', font, "-#{option}")
+      case TkFont::OptionType[option.to_s]
+      when ?n
+        num_or_str(val)
+      when ?b
+        bool(val)
+      else
+        val
+      end
+    else
+      l = tk_split_simplelist(tk_call('font', 'configure', font))
+      h = {}
+      while key=l.shift
+        if key == '-compound'
+          l.shift
+        else
+          key = key[1..-1]
+          val = l.shift
+          case TkFont::OptionType[key]
+          when ?n
+            h[key] = num_or_str(val)
+          when ?b
+            h[key] = bool(val)
+          else
+            h[key] = val
+          end
+        end
+      end
+      h
+    end
+  end
+
+  def delete_core_tk4x
+    TkFont::Tk_FontNameTBL.delete(@id)
+    TkFont::Tk_FontUseTBL.delete_if{|key,value| value == self}
+  end
+
+  def delete_core_tk8x
+    begin
+      tk_call('font', 'delete', @latinfont)
+    rescue
+    end
+    begin
+      tk_call('font', 'delete', @kanjifont)
+    rescue
+    end
+    begin
+      tk_call('font', 'delete', @compoundfont)
+    rescue
+    end
+    TkFont::Tk_FontNameTBL.delete(@id)
+    TkFont::Tk_FontUseTBL.delete_if{|key,value| value == self}
+  end
+
+  def latin_replace_core_tk4x(ltn)
+    create_latinfont_tk4x(ltn)
+    @compoundfont[0] = [@latinfont] if JAPANIZED_TK
+    @fontslot['font'] = @latinfont
+    TkFont::Tk_FontUseTBL.dup.each{|w, fobj|
+      if self == fobj
+        begin
+          if w.include?(';')
+            win, tag, optkey = w.split(';')
+            optkey = 'font' if optkey == nil || optkey == ''
+            winobj = tk_tcl2ruby(win)
+#           winobj.tagfont_configure(tag, {'font'=>@latinfont})
+            if winobj.kind_of? TkText
+              tk_call(win, 'tag', 'configure', tag, "-#{optkey}", @latinfont)
+            elsif winobj.kind_of? TkCanvas
+              tk_call(win, 'itemconfigure', tag, "-#{optkey}", @latinfont)
+            elsif winobj.kind_of? TkMenu
+              tk_call(win, 'entryconfigure', tag, "-#{optkey}", @latinfont)
+            else
+              raise RuntimeError, "unknown widget type"
+            end
+          else
+#           tk_tcl2ruby(w).font_configure('font'=>@latinfont)
+            tk_call(w, 'configure', '-font', @latinfont)
+          end
+        rescue
+          TkFont::Tk_FontUseTBL.delete(w)
+        end
+      end
+    }
+    self
+  end
+
+  def kanji_replace_core_tk4x(knj)
+    return self unless JAPANIZED_TK
+
+    create_kanjifont_tk4x(knj)
+    @compoundfont[1] = [@kanjifont]
+    @fontslot['kanjifont'] = @kanjifont
+    TkFont::Tk_FontUseTBL.dup.each{|w, fobj|
+      if self == fobj
+        begin
+          if w.include?(';')
+            win, tag, optkey = w.split(';')
+            optkey = 'kanjifont' unless optkey
+            winobj = tk_tcl2ruby(win)
+#           winobj.tagfont_configure(tag, {'kanjifont'=>@kanjifont})
+            if winobj.kind_of? TkText
+              tk_call(win, 'tag', 'configure', tag, "-#{optkey}", @kanjifont)
+            elsif winobj.kind_of? TkCanvas
+              tk_call(win, 'itemconfigure', tag, "-#{optkey}", @kanjifont)
+            elsif winobj.kind_of? TkMenu
+              tk_call(win, 'entryconfigure', tag, "-#{optkey}", @latinfont)
+            else
+              raise RuntimeError, "unknown widget type"
+            end
+          else
+#           tk_tcl2ruby(w).font_configure('kanjifont'=>@kanjifont)
+            tk_call(w, 'configure', '-kanjifont', @kanjifont)
+          end
+        rescue
+          TkFont::Tk_FontUseTBL.delete(w)
+        end
+      end
+    }
+    self
+  end
+
+  def latin_replace_core_tk8x(ltn)
+    ltn = '{}' if ltn == ''
+
+    if JAPANIZED_TK
+      begin
+        tk_call('font', 'delete', '@font_tmp')
+      rescue
+      end
+      begin
+        fnt_bup = tk_call('font', 'create', '@font_tmp', '-copy', @latinfont)
+      rescue
+        #fnt_bup = ''
+        fnt_bup = TkFont::DEFAULT_LATIN_FONT_NAME
+      end
+    end
+
+    begin
+      tk_call('font', 'delete', @latinfont)
+    rescue
+    end
+    create_latinfont(ltn)
+
+    if JAPANIZED_TK
+      keys = self.configinfo
+      tk_call('font', 'delete', @compoundfont)
+      begin
+        tk_call('font', 'create', @compoundfont, 
+                '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
+=begin
+        latinkeys = {}
+        begin
+          actual_core(@latinfont).each{|key,val| latinkeys[key] = val}
+        rescue
+          latinkeys = {}
+        end
+        if latinkeys != {}
+          tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
+        end
+=end
+      rescue RuntimeError => e
+        tk_call('font', 'delete', @latinfont)
+        if fnt_bup && fnt_bup != ''
+          tk_call('font', 'create', @latinfont, '-copy', fnt_bup)
+          tk_call('font', 'create', @compoundfont, 
+                  '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
+          tk_call('font', 'delete', fnt_bup)
+        else
+          fail e
+        end
+      end
+
+    else
+      latinkeys = {}
+      begin
+        actual_core(@latinfont).each{|key,val| latinkeys[key] = val}
+      rescue
+        latinkeys = {}
+      end
+      if latinkeys != {}
+        tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
+      end
+    end    
+    self
+  end
+
+  def kanji_replace_core_tk8x(knj)
+    knj = '{}' if knj == ''
+
+    if JAPANIZED_TK
+      begin
+        tk_call('font', 'delete', '@font_tmp')
+      rescue
+      end
+      begin
+        fnt_bup = tk_call('font', 'create', '@font_tmp', '-copy', @kanjifont)
+      rescue
+        #fnt_bup = ''
+        fnt_bup = TkFont::DEFAULT_KANJI_FONT_NAME
+      end
+    end
+
+    begin
+      tk_call('font', 'delete', @kanjifont)
+    rescue
+    end
+    create_kanjifont(knj)
+
+    if JAPANIZED_TK
+      keys = self.configinfo
+      tk_call('font', 'delete', @compoundfont)
+      begin
+        tk_call('font', 'create', @compoundfont, 
+                '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
+      rescue RuntimeError => e
+        tk_call('font', 'delete', @kanjifont)
+        if fnt_bup && fnt_bup != ''
+          tk_call('font', 'create', @kanjifont, '-copy', fnt_bup)
+          tk_call('font', 'create', @compoundfont, 
+                  '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
+          tk_call('font', 'delete', fnt_bup)
+        else
+          fail e
+        end
+      end
+    end    
+    self
+  end
+
+  def measure_core_tk4x(font, win, text)
+    0
+  end
+
+  def measure_core_tk8x(font, win, text)
+    font = '{}' if font == ''
+
+    if win
+      number(tk_call('font', 'measure', font, 
+                     '-displayof', win, text))
+    else
+      number(tk_call('font', 'measure', font, text))
+    end
+  end
+
+  def metrics_core_tk4x(font, win, option=nil)
+    # dummy
+    if option
+      ""
+    else
+      [['ascent',[]], ['descent',[]], ['linespace',[]], ['fixed',[]]]
+    end
+  end
+
+  def metrics_core_tk8x(font, win, option=nil)
+    font = '{}' if font == ''
+
+    if option
+      if win
+        number(tk_call('font', 'metrics', font, 
+                       "-displayof", win, "-#{option}"))
+      else
+        number(tk_call('font', 'metrics', font, "-#{option}"))
+      end
+    else
+      l = tk_split_list(if win
+                          tk_call('font','metrics',font,"-displayof",win)
+                        else
+                          tk_call('font','metrics',font)
+                        end)
+      r = []
+      while key=l.shift
+        r.push [key[1..-1], l.shift.to_i]
+      end
+      r
+    end
+  end
+
+  ###################################
+  # private alias
+  ###################################
+  case (Tk::TK_VERSION)
+  when /^4\.*/
+    alias actual_core             actual_core_tk4x
+    alias configure_core          configure_core_tk4x
+    alias configinfo_core         configinfo_core_tk4x
+    alias current_configinfo_core current_configinfo_core_tk4x
+    alias delete_core             delete_core_tk4x
+    alias latin_replace_core      latin_replace_core_tk4x
+    alias kanji_replace_core      kanji_replace_core_tk4x
+    alias measure_core            measure_core_tk4x
+    alias metrics_core            metrics_core_tk4x
+
+  when /^8\.[0-5]/
+    alias actual_core             actual_core_tk8x
+    alias configure_core          configure_core_tk8x
+    alias configinfo_core         configinfo_core_tk8x
+    alias current_configinfo_core current_configinfo_core_tk8x
+    alias delete_core             delete_core_tk8x
+    alias latin_replace_core      latin_replace_core_tk8x
+    alias kanji_replace_core      kanji_replace_core_tk8x
+    alias measure_core            measure_core_tk8x
+    alias metrics_core            metrics_core_tk8x
+
+  else
+    alias actual_core             actual_core_tk8x
+    alias configure_core          configure_core_tk8x
+    alias configinfo_core         configinfo_core_tk8x
+    alias current_configinfo_core current_configinfo_core_tk8x
+    alias delete_core             delete_core_tk8x
+    alias latin_replace_core      latin_replace_core_tk8x
+    alias kanji_replace_core      kanji_replace_core_tk8x
+    alias measure_core            measure_core_tk8x
+    alias metrics_core            metrics_core_tk8x
+
+  end
+end
+
+class TkFont
+  include TkFont::CoreMethods
+  extend  TkFont::CoreMethods
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/frame.rb b/ruby_1_8_6/ext/tk/lib/tk/frame.rb
new file mode 100644
index 0000000000..6636fef5b5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/frame.rb
@@ -0,0 +1,128 @@
+#
+# tk/frame.rb : treat frame widget
+#
+require 'tk'
+
+class TkFrame<TkWindow
+  TkCommandNames = ['frame'.freeze].freeze
+  WidgetClassName = 'Frame'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+################# old version
+#  def initialize(parent=nil, keys=nil)
+#    if keys.kind_of? Hash
+#      keys = keys.dup
+#      @classname = keys.delete('classname') if keys.key?('classname')
+#      @colormap  = keys.delete('colormap')  if keys.key?('colormap')
+#      @container = keys.delete('container') if keys.key?('container')
+#      @visual    = keys.delete('visual')    if keys.key?('visual')
+#    end
+#    super(parent, keys)
+#  end
+#
+#  def create_self
+#    s = []
+#    s << "-class"     << @classname if @classname
+#    s << "-colormap"  << @colormap  if @colormap
+#    s << "-container" << @container if @container
+#    s << "-visual"    << @visual    if @visual
+#    tk_call 'frame', @path, *s
+#  end
+#################
+
+  def __boolval_optkeys
+    super() << 'container'
+  end
+  private :__boolval_optkeys
+
+  def initialize(parent=nil, keys=nil)
+    my_class_name = nil
+    if self.class < WidgetClassNames[self.class::WidgetClassName]
+      my_class_name = self.class.name
+      my_class_name = nil if my_class_name == ''
+    end
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+    else
+      if keys
+        keys = _symbolkey2str(keys)
+        keys['parent'] = parent
+      else
+        keys = {'parent'=>parent}
+      end
+    end
+    if keys.key?('classname')
+       keys['class'] = keys.delete('classname')
+    end
+    @classname = keys['class']
+    @colormap  = keys['colormap']
+    @container = keys['container']
+    @visual    = keys['visual']
+    if !@classname && my_class_name
+      keys['class'] = @classname = my_class_name
+    end
+    if @classname.kind_of? TkBindTag
+      @db_class = @classname
+      @classname = @classname.id
+    elsif @classname
+      @db_class = TkDatabaseClass.new(@classname)
+    else
+      @db_class = self.class
+      @classname = @db_class::WidgetClassName
+    end
+    super(keys)
+  end
+
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('frame', @path, *hash_kv(keys))
+  #  else
+  #    tk_call_without_enc( 'frame', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def database_classname
+    @classname
+  end
+
+  def self.database_class
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      self
+    else
+      TkDatabaseClass.new(self.name)
+    end
+  end
+  def self.database_classname
+    self.database_class.name
+  end
+
+  def self.bind(*args, &b)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args, &b)
+    else
+      TkDatabaseClass.new(self.name).bind(*args, &b)
+    end
+  end
+  def self.bind_append(*args, &b)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args, &b)
+    else
+      TkDatabaseClass.new(self.name).bind_append(*args, &b)
+    end
+  end
+  def self.bind_remove(*args)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args)
+    else
+      TkDatabaseClass.new(self.name).bind_remove(*args)
+    end
+  end
+  def self.bindinfo(*args)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args)
+    else
+      TkDatabaseClass.new(self.name).bindinfo(*args)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/grid.rb b/ruby_1_8_6/ext/tk/lib/tk/grid.rb
new file mode 100644
index 0000000000..10fdf3569b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/grid.rb
@@ -0,0 +1,220 @@
+#
+# tk/grid.rb : control grid geometry manager
+#
+require 'tk'
+
+module TkGrid
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['grid'.freeze].freeze
+
+  def anchor(master, anchor=None)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    tk_call_without_enc('grid', 'anchor', master, anchor)
+  end
+
+  def bbox(master, *args)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    args.unshift(master)
+    list(tk_call_without_enc('grid', 'bbox', *args))
+  end
+
+  def configure(win, *args)
+    if args[-1].kind_of?(Hash)
+      opts = args.pop
+    else
+      opts = {}
+    end
+    params = []
+    params.push(_epath(win))
+    args.each{|win|
+      case win
+      when '-', 'x', '^'  # RELATIVE PLACEMENT
+        params.push(win)
+      else
+        params.push(_epath(win))
+      end
+    }
+    opts.each{|k, v|
+      params.push("-#{k}")
+      params.push((v.kind_of?(TkObject))? v.epath: v)
+    }
+    if Tk::TCL_MAJOR_VERSION < 8 ||
+        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION <= 3)
+      if params[0] == '-' || params[0] == 'x' || params[0] == '^'
+        tk_call_without_enc('grid', *params)
+      else
+        tk_call_without_enc('grid', 'configure', *params)
+      end
+    else
+      tk_call_without_enc('grid', 'configure', *params)
+    end
+  end
+  alias grid configure
+
+  def columnconfigure(master, index, args)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    tk_call_without_enc("grid", 'columnconfigure', 
+                        master, index, *hash_kv(args))
+  end
+
+  def rowconfigure(master, index, args)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    tk_call_without_enc("grid", 'rowconfigure', master, index, *hash_kv(args))
+  end
+
+  def columnconfiginfo(master, index, slot=nil)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    if slot
+      case slot
+      when 'uniform', :uniform
+        tk_call_without_enc('grid', 'columnconfigure', 
+                            master, index, "-#{slot}")
+      else
+        num_or_str(tk_call_without_enc('grid', 'columnconfigure', 
+                                       master, index, "-#{slot}"))
+      end
+    else
+      #ilist = list(tk_call_without_enc('grid','columnconfigure',master,index))
+      ilist = simplelist(tk_call_without_enc('grid', 'columnconfigure', 
+                                             master, index))
+      info = {}
+      while key = ilist.shift
+        case key
+        when 'uniform'
+          info[key[1..-1]] = ilist.shift
+        else
+          info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
+        end
+      end
+      info
+    end
+  end
+
+  def rowconfiginfo(master, index, slot=nil)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    if slot
+      case slot
+      when 'uniform', :uniform
+        tk_call_without_enc('grid', 'rowconfigure', 
+                            master, index, "-#{slot}")
+      else
+        num_or_str(tk_call_without_enc('grid', 'rowconfigure', 
+                                       master, index, "-#{slot}"))
+      end
+    else
+      #ilist = list(tk_call_without_enc('grid', 'rowconfigure', master, index))
+      ilist = simplelist(tk_call_without_enc('grid', 'rowconfigure', 
+                                             master, index))
+      info = {}
+      while key = ilist.shift
+        case key
+        when 'uniform'
+          info[key[1..-1]] = ilist.shift
+        else
+          info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
+        end
+      end
+      info
+    end
+  end
+
+  def add(widget, *args)
+    configure(widget, *args)
+  end
+
+  def forget(*args)
+    return '' if args.size == 0
+    wins = args.collect{|win|
+      # (win.kind_of?(TkObject))? win.epath: win
+      _epath(win)
+    }
+    tk_call_without_enc('grid', 'forget', *wins)
+  end
+
+  def info(slave)
+    # slave = slave.epath if slave.kind_of?(TkObject)
+    slave = _epath(slave)
+    #ilist = list(tk_call_without_enc('grid', 'info', slave))
+    ilist = simplelist(tk_call_without_enc('grid', 'info', slave))
+    info = {}
+    while key = ilist.shift
+      #info[key[1..-1]] = ilist.shift
+      info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
+    end
+    return info
+  end
+
+  def location(master, x, y)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    list(tk_call_without_enc('grid', 'location', master, x, y))
+  end
+
+  def propagate(master, mode=None)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    if mode == None
+      bool(tk_call_without_enc('grid', 'propagate', master))
+    else
+      tk_call_without_enc('grid', 'propagate', master, mode)
+    end
+  end
+
+  def remove(*args)
+    return '' if args.size == 0
+    wins = args.collect{|win|
+      # (win.kind_of?(TkObject))? win.epath: win
+      _epath(win)
+    }
+    tk_call_without_enc('grid', 'remove', *wins)
+  end
+
+  def size(master)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    list(tk_call_without_enc('grid', 'size', master))
+  end
+
+  def slaves(master, args)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    list(tk_call_without_enc('grid', 'slaves', master, *hash_kv(args)))
+  end
+
+  module_function :bbox, :forget, :propagate, :info
+  module_function :remove, :size, :slaves, :location
+  module_function :grid, :configure, :columnconfigure, :rowconfigure
+  module_function :columnconfiginfo, :rowconfiginfo
+end
+=begin
+def TkGrid(win, *args)
+  if args[-1].kind_of?(Hash)
+    opts = args.pop
+  else
+    opts = {}
+  end
+  params = []
+  params.push((win.kind_of?(TkObject))? win.epath: win)
+  args.each{|win|
+    case win
+    when '-', 'x', '^'  # RELATIVE PLACEMENT
+      params.push(win)
+    else
+      params.push((win.kind_of?(TkObject))? win.epath: win)
+    end
+  }
+  opts.each{|k, v|
+    params.push("-#{k}")
+    params.push((v.kind_of?(TkObject))? v.epath: v)
+  }
+  tk_call_without_enc("grid", *params)
+end
+=end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/image.rb b/ruby_1_8_6/ext/tk/lib/tk/image.rb
new file mode 100644
index 0000000000..35e2c4e394
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/image.rb
@@ -0,0 +1,237 @@
+#
+# tk/image.rb : treat Tk image objects
+#
+
+require 'tk'
+
+class TkImage<TkObject
+  include Tk
+
+  TkCommandNames = ['image'.freeze].freeze
+
+  Tk_IMGTBL = TkCore::INTERP.create_table
+  Tk_Image_ID = ['i'.freeze, '00000'.taint].freeze
+
+  TkCore::INTERP.init_ip_env{ Tk_IMGTBL.clear }
+
+  def self.new(keys=nil)
+    if keys.kind_of?(Hash)
+      name = nil
+      if keys.key?(:imagename)
+        name = keys[:imagename]
+      elsif keys.key?('imagename')
+        name = keys['imagename']
+      end
+      if name
+        if name.kind_of?(TkImage)
+          obj = name
+        else
+          name = _get_eval_string(name)
+          obj = Tk_IMGTBL[name]
+        end
+        if obj
+          if !(keys[:without_creating] || keys['without_creating'])
+            keys = _symbolkey2str(keys)
+            keys.delete('imagename')
+            keys.delete('without_creating')
+            obj.instance_eval{
+              tk_call_without_enc('image', 'create', 
+                                  @type, @path, *hash_kv(keys, true))
+            }
+          end
+          return obj
+        end
+      end
+    end
+    super(keys)
+  end
+
+  def initialize(keys=nil)
+    @path = nil
+    without_creating = false
+    if keys.kind_of?(Hash)
+      keys = _symbolkey2str(keys)
+      @path = keys.delete('imagename')
+      without_creating = keys.delete('without_creating')
+    end
+    unless @path
+      # @path = Tk_Image_ID.join('')
+      @path = Tk_Image_ID.join(TkCore::INTERP._ip_id_)
+      Tk_Image_ID[1].succ!
+    end
+    unless without_creating
+      tk_call_without_enc('image', 'create', 
+                          @type, @path, *hash_kv(keys, true))
+    end
+    Tk_IMGTBL[@path] = self
+  end
+
+  def delete
+    Tk_IMGTBL.delete(@id) if @id
+    tk_call_without_enc('image', 'delete', @path)
+    self
+  end
+  def height
+    number(tk_call_without_enc('image', 'height', @path))
+  end
+  def inuse
+    bool(tk_call_without_enc('image', 'inuse', @path))
+  end
+  def itemtype
+    tk_call_without_enc('image', 'type', @path)
+  end
+  def width
+    number(tk_call_without_enc('image', 'width', @path))
+  end
+
+  def TkImage.names
+    Tk.tk_call_without_enc('image', 'names').split.collect!{|id|
+      (Tk_IMGTBL[id])? Tk_IMGTBL[id] : id
+    }
+  end
+
+  def TkImage.types
+    Tk.tk_call_without_enc('image', 'types').split
+  end
+end
+
+class TkBitmapImage<TkImage
+  def __strval_optkeys
+    super() + ['maskdata', 'maskfile']
+  end
+  private :__strval_optkeys
+
+  def initialize(*args)
+    @type = 'bitmap'
+    super(*args)
+  end
+end
+
+class TkPhotoImage<TkImage
+  NullArgOptionKeys = [ "shrink", "grayscale" ]
+
+  def _photo_hash_kv(keys)
+    keys = _symbolkey2str(keys)
+    NullArgOptionKeys.collect{|opt|
+      if keys[opt]
+        keys[opt] = None
+      else
+        keys.delete(opt)
+      end
+    }
+    keys.collect{|k,v|
+      ['-' << k, v]
+    }.flatten
+  end
+  private :_photo_hash_kv
+
+  def initialize(*args)
+    @type = 'photo'
+    super(*args)
+  end
+
+  def blank
+    tk_send_without_enc('blank')
+    self
+  end
+
+  def cget(option)
+    case option.to_s
+    when 'data', 'file'
+      tk_send 'cget', '-' << option.to_s
+    else
+      tk_tcl2ruby(tk_send('cget', '-' << option.to_s))
+    end
+  end
+
+  def copy(src, *opts)
+    if opts.size == 0
+      tk_send('copy', src)
+    elsif opts.size == 1 && opts[0].kind_of?(Hash)
+      tk_send('copy', src, *_photo_hash_kv(opts[0]))
+    else
+      # for backward compatibility
+      args = opts.collect{|term|
+        if term.kind_of?(String) && term.include?(?\s)
+          term.split
+        else
+          term
+        end
+      }.flatten
+      tk_send('copy', src, *args)
+    end
+    self
+  end
+
+  def data(keys={})
+    #tk_send('data', *_photo_hash_kv(keys))
+    tk_split_list(tk_send('data', *_photo_hash_kv(keys)))
+  end
+
+  def get(x, y)
+    tk_send('get', x, y).split.collect{|n| n.to_i}
+  end
+
+  def put(data, *opts)
+    if opts == []
+      tk_send('put', data)
+    elsif opts.size == 1 && opts[0].kind_of?(Hash)
+      tk_send('put', data, *_photo_hash_kv(opts[0]))
+    else
+      # for backward compatibility
+      tk_send('put', data, '-to', *opts)
+    end
+    self
+  end
+
+  def read(file, *opts)
+    if opts.size == 0
+      tk_send('read', file)
+    elsif opts.size == 1 && opts[0].kind_of?(Hash)
+      tk_send('read', file, *_photo_hash_kv(opts[0]))
+    else
+      # for backward compatibility
+      args = opts.collect{|term|
+        if term.kind_of?(String) && term.include?(?\s)
+          term.split
+        else
+          term
+        end
+      }.flatten
+      tk_send('read', file, *args)
+    end
+    self
+  end
+
+  def redither
+    tk_send 'redither'
+    self
+  end
+
+  def get_transparency(x, y)
+    bool(tk_send('transparency', 'get', x, y))
+  end
+  def set_transparency(x, y, st)
+    tk_send('transparency', 'set', x, y, st)
+    self
+  end
+
+  def write(file, *opts)
+    if opts.size == 0
+      tk_send('write', file)
+    elsif opts.size == 1 && opts[0].kind_of?(Hash)
+      tk_send('write', file, *_photo_hash_kv(opts[0]))
+    else
+      # for backward compatibility
+      args = opts.collect{|term|
+        if term.kind_of?(String) && term.include?(?\s)
+          term.split
+        else
+          term
+        end
+      }.flatten
+      tk_send('write', file, *args)
+    end
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/itemconfig.rb b/ruby_1_8_6/ext/tk/lib/tk/itemconfig.rb
new file mode 100644
index 0000000000..a7885e74f3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/itemconfig.rb
@@ -0,0 +1,1061 @@
+#
+# tk/itemconfig.rb : control item/tag configuration of widget
+#
+require 'tk'
+require 'tkutil'
+require 'tk/itemfont.rb'
+
+module TkItemConfigOptkeys
+  include TkUtil
+
+  def __item_numval_optkeys(id)
+    []
+  end
+  private :__item_numval_optkeys
+
+  def __item_numstrval_optkeys(id)
+    []
+  end
+  private :__item_numstrval_optkeys
+
+  def __item_boolval_optkeys(id)
+    ['exportselection', 'jump', 'setgrid', 'takefocus']
+  end
+  private :__item_boolval_optkeys
+
+  def __item_strval_optkeys(id)
+    # maybe need to override
+    [
+      'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile', 
+      'activebackground', 'activeforeground', 'background', 
+      'disabledforeground', 'disabledbackground', 'foreground', 
+      'highlightbackground', 'highlightcolor', 'insertbackground', 
+      'selectbackground', 'selectforeground', 'troughcolor'
+    ]
+  end
+  private :__item_strval_optkeys
+
+  def __item_listval_optkeys(id)
+    []
+  end
+  private :__item_listval_optkeys
+
+  def __item_numlistval_optkeys(id)
+    # maybe need to override
+    ['dash', 'activedash', 'disableddash']
+  end
+  private :__item_numlistval_optkeys
+
+  def __item_tkvariable_optkeys(id)
+    ['variable', 'textvariable']
+  end
+  private :__item_tkvariable_optkeys
+
+  def __item_val2ruby_optkeys(id)  # { key=>method, ... }
+    # The method is used to convert a opt-value to a ruby's object.
+    # When get the value of the option "key", "method.call(id, val)" is called.
+    {}
+  end
+  private :__item_val2ruby_optkeys
+
+  def __item_ruby2val_optkeys(id)  # { key=>method, ... }
+    # The method is used to convert a ruby's object to a opt-value.
+    # When set the value of the option "key", "method.call(id, val)" is called.
+    # That is, "-#{key} #{method.call(id, value)}".
+    {}
+  end
+  private :__item_ruby2val_optkeys
+
+  def __item_methodcall_optkeys(id)  # { key=>method, ... }
+    # Use the method for both of get and set.
+    # Usually, the 'key' will not be a widget option.
+    #
+    # maybe need to override
+    # {'coords'=>'coords'}
+    {}
+  end
+  private :__item_methodcall_optkeys
+
+  ################################################
+
+  def __item_keyonly_optkeys(id)  # { def_key=>(undef_key|nil), ... }
+    # maybe need to override
+    {}
+  end
+  private :__item_keyonly_optkeys
+
+
+  def __conv_item_keyonly_opts(id, keys)
+    return keys unless keys.kind_of?(Hash)
+    keyonly = __item_keyonly_optkeys(id)
+    keys2 = {}
+    keys.each{|k, v|
+      optkey = keyonly.find{|kk,vv| kk.to_s == k.to_s}
+      if optkey
+        defkey, undefkey = optkey
+        if v
+          keys2[defkey.to_s] = None
+        else
+          keys2[undefkey.to_s] = None
+        end
+      else
+        keys2[k.to_s] = v
+      end
+    }
+    keys2
+  end
+
+  def itemconfig_hash_kv(id, keys, enc_mode = nil, conf = nil)
+    hash_kv(__conv_item_keyonly_opts(id, keys), enc_mode, conf)
+  end
+end
+
+module TkItemConfigMethod
+  include TkUtil
+  include TkTreatItemFont
+  include TkItemConfigOptkeys
+
+  def __item_cget_cmd(id)
+    # maybe need to override
+    [self.path, 'itemcget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    # maybe need to override
+    [self.path, 'itemconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_confinfo_cmd(id)
+    # maybe need to override
+    __item_config_cmd(id)
+  end
+  private :__item_confinfo_cmd
+
+  def __item_configinfo_struct(id)
+    # maybe need to override
+    {:key=>0, :alias=>1, :db_name=>1, :db_class=>2, 
+      :default_value=>3, :current_value=>4}
+  end
+  private :__item_configinfo_struct
+
+  ################################################
+
+  def tagid(tagOrId)
+    # maybe need to override
+    tagOrId
+  end
+
+  ################################################
+
+  def itemcget(tagOrId, option)
+    orig_opt = option
+    option = option.to_s
+
+    if option.length == 0
+      fail ArgumentError, "Invalid option `#{orig_opt.inspect}'"
+    end
+
+    if ( method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[option] )
+      optval = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
+      begin
+        return method.call(tagOrId, optval)
+      rescue => e
+        warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+        return optval
+      end
+    end
+
+    if ( method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[option] )
+      return self.__send__(method, tagOrId)
+    end
+
+    case option
+    when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+      begin
+        number(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
+      rescue
+        nil
+      end
+
+    when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+      num_or_str(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
+
+    when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+      begin
+        bool(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
+      rescue
+        nil
+      end
+
+    when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+      simplelist(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
+
+    when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+      conf = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
+      if conf =~ /^[0-9]/
+        list(conf)
+      else
+        conf
+      end
+
+    when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+      v = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
+      (v.empty?)? nil: TkVarAccess.new(v)
+
+    when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+      _fromUTF8(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
+
+    when /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/
+      fontcode = $1
+      fontkey  = $2
+      fnt = tk_tcl2ruby(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{fontkey}")), true)
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(tagid(tagOrId), fontkey)
+      end
+      if fontcode == 'kanji' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")), true)
+    end
+  end
+
+  def itemconfigure(tagOrId, slot, value=None)
+    if slot.kind_of? Hash
+      slot = _symbolkey2str(slot)
+
+      __item_methodcall_optkeys(tagid(tagOrId)).each{|key, method|
+        value = slot.delete(key.to_s)
+        self.__send__(method, tagOrId, value) if value
+      }
+
+      __item_ruby2val_optkeys(tagid(tagOrId)).each{|key, method|
+        key = key.to_s
+        slot[key] = method.call(tagOrId, slot[key]) if slot.has_key?(key)
+      }
+
+      __item_keyonly_optkeys(tagid(tagOrId)).each{|defkey, undefkey|
+        conf = slot.find{|kk, vv| kk == defkey.to_s}
+        if conf
+          k, v = conf
+          if v
+            slot[k] = None
+          else
+            slot[undefkey.to_s] = None if undefkey
+            slot.delete(k)
+          end
+        end
+      }
+
+      if (slot.find{|k, v| k =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/})
+        tagfont_configure(tagid(tagOrId), slot)
+      elsif slot.size > 0
+        tk_call(*(__item_config_cmd(tagid(tagOrId)).concat(hash_kv(slot))))
+      end
+
+    else
+      orig_slot = slot
+      slot = slot.to_s
+      if slot.length == 0
+        fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
+      end
+
+      if ( conf = __item_keyonly_optkeys(tagid(tagOrId)).find{|k, v| k.to_s == slot } )
+        defkey, undefkey = conf
+        if value
+          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{defkey}"))
+        elsif undefkey
+          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{undefkey}"))
+        end
+      elsif ( method = _symbolkey2str(__item_ruby2val_optkeys(tagid(tagOrId)))[slot] )
+        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{slot}" << method.call(tagOrId, value)))
+      elsif ( method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot] )
+        self.__send__(method, tagOrId, value)
+      elsif (slot =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
+        if value == None
+          tagfontobj(tagid(tagOrId), $2)
+        else
+          tagfont_configure(tagid(tagOrId), {slot=>value})
+        end
+      else
+        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{slot}" << value))
+      end
+    end
+    self
+  end
+
+  def __itemconfiginfo_core(tagOrId, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
+        fontkey  = $2
+        # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}"))))
+        conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}")), false, true)
+        conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
+          conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
+        if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
+            || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+          conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), fontkey)
+        elsif ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
+               && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
+               && conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
+          conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
+            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
+        end
+        conf
+      else
+        if slot
+          slot = slot.to_s
+          case slot
+          when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+              begin
+                val = method.call(tagOrId, optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+              begin
+                val = method.call(tagOrId, optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}lcall(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
+            end
+
+          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
+            return [slot, '', '', '', self.__send__(method, tagOrId)]
+
+          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              begin
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              rescue
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+              end
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              begin
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              rescue
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+              end
+            end
+
+          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+            end
+
+          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              begin
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              rescue
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+              end
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              begin
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              rescue
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+              end
+            end
+
+          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+            end
+
+          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+            end
+
+          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+              if v.empty?
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+              else
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
+              end
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+              if v.empty?
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+              else
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
+              end
+            end
+
+          else
+            # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_list(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), 0, false, true)
+          end
+          conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
+            conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
+
+          if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
+              && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
+              && conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
+            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
+          end
+
+          conf
+
+        else
+          # ret = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))))).collect{|conflist|
+          #   conf = tk_split_simplelist(conflist)
+          ret = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false).collect{|conflist|
+            conf = tk_split_simplelist(conflist, false, true)
+            conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
+
+            optkey = conf[__item_configinfo_struct(tagid(tagOrId))[:key]]
+            case optkey
+            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[optkey]
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+                begin
+                  val = method(tagOrId, optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+                begin
+                  val = method.call(tagOrId, optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
+              end
+
+            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+              # do nothing
+
+            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                begin
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+                rescue
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+                end
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                begin
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+                rescue
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+                end
+              end
+
+            when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              end
+
+            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                begin
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+                rescue
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+                end
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                begin
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+                rescue
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+                end
+              end
+
+            when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              end
+
+            when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              end
+
+            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+                if v.empty?
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
+                end
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+                if v.empty?
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
+                end
+              end
+
+            else
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                if conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]].index('{')
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]) 
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]) 
+                end
+              end
+              if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+                if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]].index('{')
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]) 
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]) 
+                end
+              end
+            end
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
+                && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?- )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
+            end
+
+            conf
+          }
+
+          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
+            optkey = optkey.to_s
+            fontconf = ret.assoc(optkey)
+            if fontconf && fontconf.size > 2
+              ret.delete_if{|inf| inf[0] =~ /^(|latin|ascii|kanji)#{optkey}$/}
+              fontconf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), optkey)
+              ret.push(fontconf)
+            end
+          }
+
+          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
+            ret << [optkey.to_s, '', '', '', self.__send__(method, tagOrId)]
+          }
+
+          ret
+        end
+      end
+
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
+        fontkey  = $2
+        # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}"))))
+        conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}")), false, true)
+        conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
+          conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
+
+        if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
+            || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+          conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = fontobj(tagid(tagOrId), fontkey)
+          { conf.shift => conf }
+        elsif ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
+               && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+          if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
+            conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
+          end
+          { conf[0] => conf[1] }
+        else
+          { conf.shift => conf }
+        end
+      else
+        if slot
+          slot = slot.to_s
+          case slot
+          when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+              begin
+                val = method.call(tagOrId, optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+              begin
+                val = method.call(tagOrId, optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
+            end
+
+          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
+            return {slot => ['', '', '', self.__send__(method, tagOrId)]}
+
+          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              begin
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              rescue
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+              end
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              begin
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              rescue
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+              end
+            end
+
+          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                num_or_stre(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+            end
+
+          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              begin
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              rescue
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+              end
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              begin
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              rescue
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+              end
+            end
+
+          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+            end
+
+          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+            end
+
+          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+              if v.empty?
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+              else
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
+              end
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+              if v.empty?
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+              else
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
+              end
+            end
+
+          else
+            # conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_list(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), 0, false, true)
+          end
+          conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
+            conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
+
+          if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
+              && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+            if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
+              conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
+                conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
+            end
+            { conf[0] => conf[1] }
+          else
+            { conf.shift => conf }
+          end
+
+        else
+          ret = {}
+          # tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))))).each{|conflist|
+          #   conf = tk_split_simplelist(conflist)
+          tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false).each{|conflist|
+            conf = tk_split_simplelist(conflist, false, true)
+            conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
+              conf[__item_configinfo_struct(tagid(tagOrId))[:key]][1..-1]
+
+            optkey = conf[__item_configinfo_struct(tagid(tagOrId))[:key]]
+            case optkey
+            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[optkey]
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+                begin
+                  val = method.call(tagOrId, optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+                begin
+                  val = method.call(tagOrId, optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
+              end
+
+            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+              # do nothing
+
+            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                begin
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+                rescue
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+                end
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                begin
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+                rescue
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+                end
+              end
+
+            when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              end
+
+            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                begin
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+                rescue
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+                end
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                begin
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+                rescue
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+                end
+              end
+
+            when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              end
+
+            when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] =~ /^[0-9]/ )
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =~ /^[0-9]/ )
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              end
+
+            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+                if v.empty?
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
+                end
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+                if v.empty?
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
+                end
+              end
+
+            else
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                if conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]].index('{')
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]) 
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = 
+                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+                end
+              end
+              if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+                if conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]].index('{')
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                    tk_split_list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]) 
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = 
+                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+                end
+              end
+            end
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:alias] \
+                && conf.size == __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+              if conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][0] == ?-
+                conf[__item_configinfo_struct(tagid(tagOrId))[:alias]] = 
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:alias]][1..-1]
+              end
+              ret[conf[0]] = conf[1]
+            else
+              ret[conf.shift] = conf
+            end
+          }
+
+          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
+            optkey = optkey.to_s
+            fontconf = ret[optkey]
+            if fontconf.kind_of?(Array)
+              ret.delete(optkey)
+              ret.delete('latin' << optkey)
+              ret.delete('ascii' << optkey)
+              ret.delete('kanji' << optkey)
+              fontconf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = tagfontobj(tagid(tagOrId), optkey)
+              ret[optkey] = fontconf
+            end
+          }
+
+          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
+            ret[optkey.to_s] = ['', '', '', self.__send__(method, tagOrId)]
+          }
+
+          ret
+        end
+      end
+    end
+  end
+  private :__itemconfiginfo_core
+
+  def itemconfiginfo(tagOrId, slot = nil)
+    __itemconfiginfo_core(tagOrId, slot)
+  end
+
+  def current_itemconfiginfo(tagOrId, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        org_slot = slot
+        begin
+          conf = __itemconfiginfo_core(tagOrId, slot)
+          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
+              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+            return {conf[0] => conf[-1]}
+          end
+          slot = conf[__item_configinfo_struct(tagid(tagOrId))[:alias]]
+        end while(org_slot != slot)
+        fail RuntimeError, 
+          "there is a configure alias loop about '#{org_slot}'"
+      else
+        ret = {}
+        __itemconfiginfo_core(tagOrId).each{|conf|
+          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
+              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+            ret[conf[0]] = conf[-1]
+          end
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      __itemconfiginfo_core(tagOrId, slot).each{|key, conf|
+        ret[key] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/itemfont.rb b/ruby_1_8_6/ext/tk/lib/tk/itemfont.rb
new file mode 100644
index 0000000000..ab9e3ff6c9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/itemfont.rb
@@ -0,0 +1,300 @@
+#
+# tk/itemfont.rb : control font of widget items
+#
+require 'tk'
+
+module TkItemFontOptkeys
+  def __item_font_optkeys(id)
+    # maybe need to override
+    ['font']
+  end
+  private :__item_font_optkeys
+end
+
+module TkTreatItemFont
+  include TkItemFontOptkeys
+
+  def __item_pathname(id)
+    # maybe need to override
+    [self.path, id].join(';')
+  end
+  private :__item_pathname
+
+  ################################################
+
+  def tagfont_configinfo(tagOrId, key = nil)
+    optkeys = __item_font_optkeys(tagid(tagOrId))
+    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
+      fail ArgumentError, "unknown font option name `#{key}'"
+    end
+
+    win, tag = __item_pathname(tagid(tagOrId)).split(';')
+
+    if key
+      pathname = [win, tag, key].join(';')
+      TkFont.used_on(pathname) || 
+        TkFont.init_widget_font(pathname, 
+                                *(__item_confinfo_cmd(tagid(tagOrId))))
+    elsif optkeys.size == 1
+      pathname = [win, tag, optkeys[0]].join(';')
+      TkFont.used_on(pathname) || 
+        TkFont.init_widget_font(pathname, 
+                                *(__item_confinfo_cmd(tagid(tagOrId))))
+    else
+      fonts = {}
+      optkeys.each{|key|
+        key = key.to_s
+        pathname = [win, tag, key].join(';')
+        fonts[key] = 
+          TkFont.used_on(pathname) || 
+          TkFont.init_widget_font(pathname, 
+                                  *(__item_confinfo_cmd(tagid(tagOrId))))
+      }
+      fonts
+    end
+  end
+  alias tagfontobj tagfont_configinfo
+
+  def tagfont_configure(tagOrId, slot)
+    pathname = __item_pathname(tagid(tagOrId))
+
+    slot = _symbolkey2str(slot)
+
+    __item_font_optkeys(tagid(tagOrId)).each{|optkey|
+      optkey = optkey.to_s
+      l_optkey = 'latin' << optkey
+      a_optkey = 'ascii' << optkey
+      k_optkey = 'kanji' << optkey
+
+      if slot.key?(optkey)
+        fnt = slot.delete(optkey)
+        if fnt.kind_of?(TkFont)
+          slot.delete(l_optkey)
+          slot.delete(a_optkey)
+          slot.delete(k_optkey)
+
+          fnt.call_font_configure([pathname, optkey], 
+                                  *(__item_config_cmd(tagid(tagOrId)) << {}))
+          next
+        else
+          if fnt
+            if (slot.key?(l_optkey) || 
+                slot.key?(a_optkey) || 
+                slot.key?(k_optkey))
+              fnt = TkFont.new(fnt)
+
+              lfnt = slot.delete(l_optkey)
+              lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
+              kfnt = slot.delete(k_optkey)
+
+              fnt.latin_replace(lfnt) if lfnt
+              fnt.kanji_replace(kfnt) if kfnt
+
+              fnt.call_font_configure([pathname, optkey], 
+                                      *(__item_config_cmd(tagid(tagOrId)) << {}))
+              next
+            else
+              tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << fnt))
+            end
+          end
+          next
+        end
+      end
+
+      lfnt = slot.delete(l_optkey)
+      lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
+      kfnt = slot.delete(k_optkey)
+
+      if lfnt && kfnt
+        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey], 
+                                                   *(__item_config_cmd(tagid(tagOrId)) << {}))
+      elsif lfnt
+        latintagfont_configure([lfnt, optkey])
+      elsif kfnt
+        kanjitagfont_configure([kfnt, optkey])
+      end
+    }
+
+    # configure other (without font) options
+    tk_call(*(__item_config_cmd(tagid(tagOrId)).concat(hash_kv(slot)))) if slot != {}
+    self
+  end
+
+  def latintagfont_configure(tagOrId, ltn, keys=nil)
+    if ltn.kind_of?(Array)
+      key = ltn[1]
+      ltn = ltn[0]
+    else
+      key = nil
+    end
+
+    optkeys = __item_font_optkeys(tagid(tagOrId))
+    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
+      fail ArgumentError, "unknown font option name `#{key}'"
+    end
+
+    win, tag = __item_pathname(tagid(tagOrId)).split(';')
+
+    optkeys = [key] if key
+
+    optkeys.each{|optkey|
+      optkey = optkey.to_s
+
+      pathname = [win, tag, optkey].join(';')
+
+      if (fobj = TkFont.used_on(pathname))
+        fobj = TkFont.new(fobj) # create a new TkFont object
+      elsif Tk::JAPANIZED_TK
+        fobj = fontobj          # create a new TkFont object
+      else
+        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << ltn))
+        next
+      end
+
+      if fobj.kind_of?(TkFont)
+        if ltn.kind_of?(TkFont)
+          conf = {}
+          ltn.latin_configinfo.each{|key,val| conf[key] = val}
+          if keys
+            fobj.latin_configure(conf.update(keys))
+          else
+            fobj.latin_configure(conf)
+          end
+        else
+          fobj.latin_replace(ltn)
+        end
+      end
+
+      fobj.call_font_configure([pathname, optkey], *(__item_config_cmd(tagid(tagOrId)) << {}))
+    }
+    self
+  end
+  alias asciitagfont_configure latintagfont_configure
+
+  def kanjitagfont_configure(tagOrId, knj, keys=nil)
+    if knj.kind_of?(Array)
+      key = knj[1]
+      knj = knj[0]
+    else
+      key = nil
+    end
+
+    optkeys = __item_font_optkeys(tagid(tagOrId))
+    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
+      fail ArgumentError, "unknown font option name `#{key}'"
+    end
+
+    win, tag = __item_pathname(tagid(tagOrId)).split(';')
+
+    optkeys = [key] if key
+
+    optkeys.each{|optkey|
+      optkey = optkey.to_s
+
+      pathname = [win, tag, optkey].join(';')
+
+      if (fobj = TkFont.used_on(pathname))
+        fobj = TkFont.new(fobj) # create a new TkFont object
+      elsif Tk::JAPANIZED_TK
+        fobj = fontobj          # create a new TkFont object
+      else
+        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{optkey}" << knj))
+        next
+      end
+
+      if fobj.kind_of?(TkFont)
+        if knj.kind_of?(TkFont)
+          conf = {}
+          knj.kanji_configinfo.each{|key,val| conf[key] = val}
+          if keys
+            fobj.kanji_configure(conf.update(keys))
+          else
+            fobj.kanji_configure(conf)
+          end
+        else
+          fobj.kanji_replace(knj)
+        end
+      end
+
+      fobj.call_font_configure([pathname, optkey], *(__item_config_cmd(tagid(tagOrId)) << {}))
+    }
+    self
+  end
+
+  def tagfont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
+    if wintag
+      if winkey
+        fnt = win.tagfontobj(wintag, winkey).dup
+      else
+        fnt = win.tagfontobj(wintag).dup
+      end
+    else
+      if winkey
+        fnt = win.fontobj(winkey).dup
+      else
+        fnt = win.fontobj.dup
+      end
+    end
+
+    if targetkey
+      fnt.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey], 
+                              *(__item_config_cmd(tagid(tagOrId)) << {}))
+    else
+      fnt.call_font_configure(__item_pathname(tagid(tagOrId)), 
+                              *(__item_config_cmd(tagid(tagOrId)) << {}))
+    end
+    self
+  end
+
+
+  def latintagfont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
+    if targetkey
+      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey], 
+                                                 *(__item_config_cmd(tagid(tagOrId)) << {}))
+    else
+      fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)), 
+                                      *(__item_config_cmd(tagid(tagOrId)) << {}))
+    end
+
+    if wintag
+      if winkey
+        fontobj.latin_replace(win.tagfontobj(wintag, winkey).latin_font_id)
+      else
+        fontobj.latin_replace(win.tagfontobj(wintag).latin_font_id)
+      end
+    else
+      if winkey
+        fontobj.latin_replace(win.fontobj(winkey).latin_font_id)
+      else
+        fontobj.latin_replace(win.fontobj.latin_font_id)
+      end
+    end
+    self
+  end
+  alias asciitagfont_copy latintagfont_copy
+
+  def kanjifont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
+    if targetkey
+      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey], 
+                                                 *(__item_config_cmd(tagid(tagOrId)) << {}))
+    else
+        fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)), 
+                                        *(__item_config_cmd(tagid(tagOrId)) << {}))
+    end
+
+    if wintag
+      if winkey
+        fontobj.kanji_replace(win.tagfontobj(wintag, winkey).kanji_font_id)
+      else
+        fontobj.kanji_replace(win.tagfontobj(wintag).kanji_font_id)
+      end
+    else
+      if winkey
+        fontobj.kanji_replace(win.fontobj(winkey).kanji_font_id)
+      else
+        fontobj.kanji_replace(win.fontobj.kanji_font_id)
+      end
+    end
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/kinput.rb b/ruby_1_8_6/ext/tk/lib/tk/kinput.rb
new file mode 100644
index 0000000000..a29dbcdb72
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/kinput.rb
@@ -0,0 +1,71 @@
+#
+# tk/kinput.rb : control kinput
+#
+require 'tk'
+
+module TkKinput
+  include Tk
+  extend Tk
+
+  TkCommandNames = [
+    'kinput_start'.freeze, 
+    'kinput_send_spot'.freeze, 
+    'kanjiInput'.freeze
+  ].freeze
+
+  def TkKinput.start(win, style=None)
+    tk_call('kinput_start', win, style)
+  end
+  def kinput_start(style=None)
+    TkKinput.start(self, style)
+  end
+
+  def TkKinput.send_spot(win)
+    tk_call('kinput_send_spot', win)
+  end
+  def kinput_send_spot
+    TkKinput.send_spot(self)
+  end
+
+  def TkKinput.input_start(win, keys=nil)
+    tk_call('kanjiInput', 'start', win, *hash_kv(keys))
+  end
+  def kanji_input_start(keys=nil)
+    TkKinput.input_start(self, keys)
+  end
+
+  def TkKinput.attribute_config(win, slot, value=None)
+    if slot.kind_of? Hash
+      tk_call('kanjiInput', 'attribute', win, *hash_kv(slot))
+    else
+      tk_call('kanjiInput', 'attribute', win, "-#{slot}", value)
+    end
+  end
+  def kinput_attribute_config(slot, value=None)
+    TkKinput.attribute_config(self, slot, value)
+  end
+
+  def TkKinput.attribute_info(win, slot=nil)
+    if slot
+      conf = tk_split_list(tk_call('kanjiInput', 'attribute', 
+                                   win, "-#{slot}"))
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      tk_split_list(tk_call('kanjiInput', 'attribute', win)).collect{|conf|
+        conf[0] = conf[0][1..-1]
+        conf
+      }
+    end
+  end
+  def kinput_attribute_info(slot=nil)
+    TkKinput.attribute_info(self, slot)
+  end
+
+  def TkKinput.input_end(win)
+    tk_call('kanjiInput', 'end', win)
+  end
+  def kanji_input_end
+    TkKinput.input_end(self)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/label.rb b/ruby_1_8_6/ext/tk/lib/tk/label.rb
new file mode 100644
index 0000000000..8b45db9b30
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/label.rb
@@ -0,0 +1,18 @@
+#
+# tk/label.rb : treat label widget
+#
+require 'tk'
+
+class TkLabel<TkWindow
+  TkCommandNames = ['label'.freeze].freeze
+  WidgetClassName = 'Label'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('label', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('label', @path)
+  #  end
+  #end
+  #private :create_self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/labelframe.rb b/ruby_1_8_6/ext/tk/lib/tk/labelframe.rb
new file mode 100644
index 0000000000..73d5603200
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/labelframe.rb
@@ -0,0 +1,25 @@
+#
+# tk/labelframe.rb : treat labelframe widget
+#
+require 'tk'
+require 'tk/frame'
+
+class TkLabelFrame<TkFrame
+  TkCommandNames = ['labelframe'.freeze].freeze
+  WidgetClassName = 'Labelframe'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('labelframe', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('labelframe', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def __val2ruby_optkeys  # { key=>proc, ... }
+    super().update('labelwidget'=>proc{|v| window(v)})
+  end
+  private :__val2ruby_optkeys
+end
+TkLabelframe = TkLabelFrame
diff --git a/ruby_1_8_6/ext/tk/lib/tk/listbox.rb b/ruby_1_8_6/ext/tk/lib/tk/listbox.rb
new file mode 100644
index 0000000000..41d02d279e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/listbox.rb
@@ -0,0 +1,279 @@
+#
+# tk/listbox.rb : treat listbox widget
+#
+require 'tk'
+require 'tk/itemconfig'
+require 'tk/scrollable'
+require 'tk/txtwin_abst'
+
+module TkListItemConfig
+  include TkItemConfigMethod
+
+  def __item_listval_optkeys(id)
+    []
+  end
+  private :__item_listval_optkeys
+end
+
+class TkListbox<TkTextWin
+  include TkListItemConfig
+  include Scrollable
+
+  TkCommandNames = ['listbox'.freeze].freeze
+  WidgetClassName = 'Listbox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('listbox', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('listbox', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def __tkvariable_optkeys
+    super() << 'listvariable'
+  end
+  private :__tkvariable_optkeys
+
+  def tagid(id)
+    #id.to_s
+    _get_eval_string(id)
+  end
+
+  def activate(y)
+    tk_send_without_enc('activate', y)
+    self
+  end
+  def curselection
+    list(tk_send_without_enc('curselection'))
+  end
+  def get(first, last=nil)
+    if last
+      # tk_split_simplelist(_fromUTF8(tk_send_without_enc('get', first, last)))
+      tk_split_simplelist(tk_send_without_enc('get', first, last), false, true)
+    else
+      _fromUTF8(tk_send_without_enc('get', first))
+    end
+  end
+  def nearest(y)
+    tk_send_without_enc('nearest', y).to_i
+  end
+  def size
+    tk_send_without_enc('size').to_i
+  end
+  def selection_anchor(index)
+    tk_send_without_enc('selection', 'anchor', index)
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send_without_enc('selection', 'clear', first, last)
+    self
+  end
+  def selection_includes(index)
+    bool(tk_send_without_enc('selection', 'includes', index))
+  end
+  def selection_set(first, last=None)
+    tk_send_without_enc('selection', 'set', first, last)
+    self
+  end
+
+  def index(idx)
+    tk_send_without_enc('index', idx).to_i
+  end
+
+  def value
+    get('0', 'end')
+  end
+
+  def value= (vals)
+    unless vals.kind_of?(Array)
+      fail ArgumentError, 'an Array is expected'
+    end
+    tk_send_without_enc('delete', '0', 'end')
+    tk_send_without_enc('insert', '0', 
+                        *(vals.collect{|v| _get_eval_enc_str(v)}))
+    vals
+  end
+
+  def clear
+    tk_send_without_enc('delete', '0', 'end')
+    self
+  end
+  alias erase clear
+
+=begin
+  def itemcget(index, key)
+    case key.to_s
+    when 'text', 'label', 'show'
+      _fromUTF8(tk_send_without_enc('itemcget', index, "-#{key}"))
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_send('itemcget', index, "-#{key}"))
+      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', index, 
+                                                      '-font')))
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(index, fnt)
+      end
+      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', index, "-#{key}")))
+    end
+  end
+  def itemconfigure(index, key, val=None)
+    if key.kind_of? Hash
+      if (key['font'] || key[:font] || 
+          key['kanjifont'] || key[:kanjifont] || 
+          key['latinfont'] || key[:latinfont] || 
+          key['asciifont'] || key[:asciifont] )
+        tagfont_configure(index, _symbolkey2str(key))
+      else
+        tk_send_without_enc('itemconfigure', index, *hash_kv(key, true))
+      end
+
+    else
+      if (key == 'font' || key == :font || 
+          key == 'kanjifont' || key == :kanjifont || 
+          key == 'latinfont' || key == :latinfont || 
+          key == 'asciifont' || key == :asciifont )
+        if val == None
+          tagfontobj(index)
+        else
+          tagfont_configure(index, {key=>val})
+        end
+      else
+        tk_call('itemconfigure', index, "-#{key}", val)
+      end
+    end
+    self
+  end
+
+  def itemconfiginfo(index, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'text', 'label', 'show'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
+          conf[4] = tagfont_configinfo(index, conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        ret = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', index))).collect{|conflist|
+          conf = tk_split_simplelist(conflist)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show'
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4]) 
+              else
+                conf[4] = tk_tcl2ruby(conf[4]) 
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+        fontconf = ret.assoc('font')
+        if fontconf
+          ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
+          fontconf[4] = tagfont_configinfo(index, fontconf[4])
+          ret.push(fontconf)
+        else
+          ret
+        end
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'text', 'label', 'show'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
+          conf[4] = tagfont_configinfo(index, conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', index))).each{|conflist|
+          conf = tk_split_simplelist(conflist)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show'
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2]) 
+              else
+                conf[2] = tk_tcl2ruby(conf[2]) 
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        fontconf = ret['font']
+        if fontconf
+          ret.delete('font')
+          ret.delete('kanjifont')
+          fontconf[3] = tagfont_configinfo(index, fontconf[3])
+          ret['font'] = fontconf
+        end
+        ret
+      end
+    end
+  end
+
+  def current_itemconfiginfo(index, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        conf = itemconfiginfo(index, key)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        itemconfiginfo(index).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      itemconfiginfo(index, key).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+=end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/macpkg.rb b/ruby_1_8_6/ext/tk/lib/tk/macpkg.rb
new file mode 100644
index 0000000000..1802073f46
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/macpkg.rb
@@ -0,0 +1,73 @@
+#
+#   tk/macpkg.rb : methods for Tcl/Tk packages for Macintosh
+#                     2000/11/22 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+#     ATTENTION !!
+#         This is NOT TESTED. Because I have no test-environment.
+#
+#
+require 'tk'
+
+module Tk
+  def Tk.load_tclscript_rsrc(resource_name, file=None)
+    # Mac only
+    tk_call('source', '-rsrc', resource_name, file)
+  end
+
+  def Tk.load_tclscript_rsrcid(resource_id, file=None)
+    # Mac only
+    tk_call('source', '-rsrcid', resource_id, file)
+  end
+end
+
+module TkMacResource
+  extend Tk
+  extend TkMacResource
+
+  TkCommandNames = ['resource'.freeze].freeze
+
+  PACKAGE_NAME = 'resource'.freeze
+  def self.package_name
+    PACKAGE_NAME
+  end
+
+  tk_call_without_enc('package', 'require', 'resource')
+
+  def close(rsrcRef)
+    tk_call('resource', 'close', rsrcRef)
+  end
+
+  def delete(rsrcType, opts=nil)
+    tk_call('resource', 'delete', *(hash_kv(opts) << rsrcType))
+  end
+
+  def files(rsrcRef=nil)
+    if rsrcRef
+      tk_call('resource', 'files', rsrcRef)
+    else
+      tk_split_simplelist(tk_call('resource', 'files'))
+    end
+  end
+
+  def list(rsrcType, rsrcRef=nil)
+    tk_split_simplelist(tk_call('resource', 'list', rsrcType, rsrcRef))
+  end
+
+  def open(fname, access=nil)
+    tk_call('resource', 'open', fname, access)
+  end
+
+  def read(rsrcType, rsrcID, rsrcRef=nil)
+    tk_call('resource', 'read', rsrcType, rsrcID, rsrcRef)
+  end
+
+  def types(rsrcRef=nil)
+    tk_split_simplelist(tk_call('resource', 'types', rsrcRef))
+  end
+
+  def write(rsrcType, data, opts=nil)
+    tk_call('resource', 'write', *(hash_kv(opts) << rsrcType << data))
+  end
+
+  module_function :close, :delete, :files, :list, :open, :read, :types, :write
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/menu.rb b/ruby_1_8_6/ext/tk/lib/tk/menu.rb
new file mode 100644
index 0000000000..ddddc8e53e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/menu.rb
@@ -0,0 +1,632 @@
+#
+# tk/menu.rb : treat menu and menubutton
+#
+require 'tk'
+require 'tk/itemconfig'
+require 'tk/menuspec'
+
+module TkMenuEntryConfig
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'entrycget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'entryconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_strval_optkeys(id)
+    super(id) << 'selectcolor'
+  end
+  private :__item_strval_optkeys
+
+  def __item_listval_optkeys(id)
+    []
+  end
+  private :__item_listval_optkeys
+
+  def __item_val2ruby_optkeys(id)  # { key=>proc, ... }
+    super(id).update('menu'=>proc{|i, v| window(v)})
+  end
+  private :__item_val2ruby_optkeys
+
+  alias entrycget itemcget
+  alias entryconfigure itemconfigure
+  alias entryconfiginfo itemconfiginfo
+  alias current_entryconfiginfo current_itemconfiginfo
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+end
+
+class TkMenu<TkWindow
+  include Wm
+  include TkMenuEntryConfig
+  extend TkMenuSpec
+
+  TkCommandNames = ['menu'.freeze].freeze
+  WidgetClassName = 'Menu'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('menu', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('menu', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def __strval_optkeys
+    super() << 'selectcolor' << 'title'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'tearoff'
+  end
+  private :__boolval_optkeys
+
+  def self.new_menuspec(menu_spec, parent = nil, tearoff = false, keys = nil)
+    if parent.kind_of?(Hash)
+      keys = _symbolkey2str(parent)
+      parent = keys.delete('parent')
+      tearoff = keys.delete('tearoff')
+    elsif tearoff.kind_of?(Hash)
+      keys = _symbolkey2str(tearoff)
+      tearoff = keys.delete('tearoff')
+    elsif keys
+      keys = _symbolkey2str(keys)
+    else
+      keys = {}
+    end
+
+    widgetname = keys.delete('widgetname')
+    _create_menu(parent, menu_spec, widgetname, tearoff, keys)
+  end
+
+  def tagid(id)
+    #id.to_s
+    _get_eval_string(id)
+  end
+
+  def activate(index)
+    tk_send_without_enc('activate', _get_eval_enc_str(index))
+    self
+  end
+  def add(type, keys=nil)
+    tk_send_without_enc('add', type, *hash_kv(keys, true))
+    self
+  end
+  def add_cascade(keys=nil)
+    add('cascade', keys)
+  end
+  def add_checkbutton(keys=nil)
+    add('checkbutton', keys)
+  end
+  def add_command(keys=nil)
+    add('command', keys)
+  end
+  def add_radiobutton(keys=nil)
+    add('radiobutton', keys)
+  end
+  def add_separator(keys=nil)
+    add('separator', keys)
+  end
+
+  def clone_menu(*args)
+    if args[0].kind_of?(TkWindow)
+      parent = args.shift
+    else
+      parent = self
+    end
+
+    if args[0].kind_of?(String) || args[0].kind_of?(Symbol) # menu type
+      type = args.shift
+    else
+      type = None # 'normal'
+    end
+
+    if args[0].kind_of?(Hash)
+      keys = _symbolkey2str(args.shift)
+    else
+      keys = {}
+    end
+
+    parent = keys.delete('parent') if keys.has_key?('parent')
+    type = keys.delete('type') if keys.has_key?('type')
+
+    if keys.empty?
+      TkMenuClone.new(self, parent, type)
+    else
+      TkMenuClone.new(self, parent, type, keys)
+    end
+  end
+
+  def index(idx)
+    ret = tk_send_without_enc('index', _get_eval_enc_str(idx))
+    (ret == 'none')? nil: number(ret)
+  end
+  def invoke(index)
+    _fromUTF8(tk_send_without_enc('invoke', _get_eval_enc_str(index)))
+  end
+  def insert(index, type, keys=nil)
+    tk_send_without_enc('insert', _get_eval_enc_str(index), 
+                        type, *hash_kv(keys, true))
+    self
+  end
+  def delete(first, last=nil)
+    if last
+      tk_send_without_enc('delete', _get_eval_enc_str(first), 
+                          _get_eval_enc_str(last))
+    else
+      tk_send_without_enc('delete', _get_eval_enc_str(first))
+    end
+    self
+  end
+  def popup(x, y, index=nil)
+    if index
+      tk_call_without_enc('tk_popup', path, x, y, 
+                          _get_eval_enc_str(index))
+    else
+      tk_call_without_enc('tk_popup', path, x, y)
+    end
+    self
+  end
+  def post(x, y)
+    _fromUTF8(tk_send_without_enc('post', x, y))
+  end
+  def postcascade(index)
+    tk_send_without_enc('postcascade', _get_eval_enc_str(index))
+    self
+  end
+  def postcommand(cmd=Proc.new)
+    configure_cmd 'postcommand', cmd
+    self
+  end
+  def set_focus
+    tk_call_without_enc('tk_menuSetFocus', path)
+    self
+  end
+  def tearoffcommand(cmd=Proc.new)
+    configure_cmd 'tearoffcommand', cmd
+    self
+  end
+  def menutype(index)
+    tk_send_without_enc('type', _get_eval_enc_str(index))
+  end
+  def unpost
+    tk_send_without_enc('unpost')
+    self
+  end
+  def yposition(index)
+    number(tk_send_without_enc('yposition', _get_eval_enc_str(index)))
+  end
+
+=begin
+  def entrycget(index, key)
+    case key.to_s
+    when 'text', 'label', 'show'
+      _fromUTF8(tk_send_without_enc('entrycget', 
+                                    _get_eval_enc_str(index), "-#{key}"))
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_send('entrycget', index, "-#{key}"))
+      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('entrycget', _get_eval_enc_str(index), '-font')))
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(index, fnt)
+      end
+      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('entrycget', _get_eval_enc_str(index), "-#{key}")))
+    end
+  end
+  def entryconfigure(index, key, val=None)
+    if key.kind_of? Hash
+      if (key['font'] || key[:font] || 
+          key['kanjifont'] || key[:kanjifont] || 
+          key['latinfont'] || key[:latinfont] || 
+          key['asciifont'] || key[:asciifont])
+        tagfont_configure(index, _symbolkey2str(key))
+      else
+        tk_send_without_enc('entryconfigure', _get_eval_enc_str(index), 
+                            *hash_kv(key, true))
+      end
+
+    else
+      if (key == 'font' || key == :font || 
+          key == 'kanjifont' || key == :kanjifont || 
+          key == 'latinfont' || key == :latinfont || 
+          key == 'asciifont' || key == :asciifont )
+        if val == None
+          tagfontobj(index)
+        else
+          tagfont_configure(index, {key=>val})
+        end
+      else
+        tk_call('entryconfigure', index, "-#{key}", val)
+      end
+    end
+    self
+  end
+
+  def entryconfiginfo(index, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'text', 'label', 'show'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
+          conf[4] = tagfont_configinfo(index, conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        ret = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure', _get_eval_enc_str(index)))).collect{|conflist|
+          conf = tk_split_simplelist(conflist)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show'
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4]) 
+              else
+                conf[4] = tk_tcl2ruby(conf[4]) 
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+        if fontconf
+          ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
+          fontconf[4] = tagfont_configinfo(index, fontconf[4])
+          ret.push(fontconf)
+        else
+          ret
+        end
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'text', 'label', 'show'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
+          conf[4] = tagfont_configinfo(index, conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure', _get_eval_enc_str(index)))).each{|conflist|
+          conf = tk_split_simplelist(conflist)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show'
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2]) 
+              else
+                conf[2] = tk_tcl2ruby(conf[2]) 
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        fontconf = ret['font']
+        if fontconf
+          ret.delete('font')
+          ret.delete('kanjifont')
+          fontconf[3] = tagfont_configinfo(index, fontconf[3])
+          ret['font'] = fontconf
+        end
+        ret
+      end
+    end
+  end
+
+  def current_entryconfiginfo(index, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        conf = entryconfiginfo(index, key)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        entryconfiginfo(index).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      entryconfiginfo(index, key).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+=end
+end
+
+
+class TkMenuClone<TkMenu
+=begin
+  def initialize(parent, type=None)
+    widgetname = nil
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      parent = keys.delete('parent')
+      widgetname = keys.delete('widgetname')
+      type = keys.delete('type'); type = None unless type
+    end
+    #unless parent.kind_of?(TkMenu)
+    #  fail ArgumentError, "parent must be TkMenu"
+    #end
+    @parent = parent
+    install_win(@parent.path, widgetname)
+    tk_call_without_enc(@parent.path, 'clone', @path, type)
+  end
+=end
+  def initialize(src_menu, *args)
+    widgetname = nil
+
+    if args[0].kind_of?(TkWindow)  # parent window
+      parent = args.shift
+    else
+      parent = src_menu
+    end
+
+    if args[0].kind_of?(String) || args[0].kind_of?(Symbol)  # menu type
+      type = args.shift
+    else
+      type = None  # 'normal'
+    end
+
+    if args[0].kind_of?(Hash)
+      keys = _symbolkey2str(args.shift)
+      parent = keys.delete('parent') if keys.has_key?('parent')
+      widgetname = keys.delete('widgetname')
+      type = keys.delete('type') if keys.has_key?('type')
+    else
+      keys = nil
+    end
+
+    @src_menu = src_menu
+    @parent = parent
+    @type = type
+    install_win(@parent.path, widgetname)
+    tk_call_without_enc(@src_menu.path, 'clone', @path, @type)
+    configure(keys) if keys && !keys.empty?
+  end
+
+  def source_menu
+    @src_menu
+  end
+end
+TkCloneMenu = TkMenuClone
+
+module TkSystemMenu
+  def initialize(parent, keys=nil)
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      parent = keys.delete('parent')
+    end
+    #unless parent.kind_of? TkMenu
+    #  fail ArgumentError, "parent must be a TkMenu object"
+    #end
+    # @path = Kernel.format("%s.%s", parent.path, self.class::SYSMENU_NAME)
+    @path = parent.path + '.' + self.class::SYSMENU_NAME
+    #TkComm::Tk_WINDOWS[@path] = self
+    TkCore::INTERP.tk_windows[@path] = self
+    if self.method(:create_self).arity == 0
+      p 'create_self has no arg' if $DEBUG
+      create_self
+      configure(keys) if keys
+    else
+      p 'create_self has an arg' if $DEBUG
+      create_self(keys)
+    end
+  end
+end
+
+
+class TkSysMenu_Help<TkMenu
+  # for all platform
+  include TkSystemMenu
+  SYSMENU_NAME = 'help'
+end
+
+
+class TkSysMenu_System<TkMenu
+  # for Windows
+  include TkSystemMenu
+  SYSMENU_NAME = 'system'
+end
+
+
+class TkSysMenu_Apple<TkMenu
+  # for Machintosh
+  include TkSystemMenu
+  SYSMENU_NAME = 'apple'
+end
+
+
+class TkMenubutton<TkLabel
+  TkCommandNames = ['menubutton'.freeze].freeze
+  WidgetClassName = 'Menubutton'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  def create_self(keys)
+    if keys and keys != None
+      # tk_call_without_enc('menubutton', @path, *hash_kv(keys, true))
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      # tk_call_without_enc('menubutton', @path)
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def __boolval_optkeys
+    super() << 'indicatoron'
+  end
+  private :__boolval_optkeys
+
+end
+TkMenuButton = TkMenubutton
+
+
+class TkOptionMenubutton<TkMenubutton
+  TkCommandNames = ['tk_optionMenu'.freeze].freeze
+
+  class OptionMenu<TkMenu
+    def initialize(path)  #==> return value of tk_optionMenu
+      @path = path
+      #TkComm::Tk_WINDOWS[@path] = self
+      TkCore::INTERP.tk_windows[@path] = self
+    end
+  end
+
+  def initialize(*args)
+    # args :: [parent,] [var,] [value[, ...],] [keys]
+    #    parent --> TkWindow or nil
+    #    var    --> TkVariable or nil
+    #    keys   --> Hash
+    #       keys[:parent] or keys['parent']     --> parent
+    #       keys[:variable] or keys['variable'] --> var
+    #       keys[:values] or keys['values']     --> value, ...
+    #       other Hash keys are menubutton options
+    keys = {}
+    keys = args.pop if args[-1].kind_of?(Hash)
+    keys = _symbolkey2str(keys)
+
+    parent = nil
+    if args[0].kind_of?(TkWindow) || args[0] == nil
+      keys.delete('parent') # ignore
+      parent = args.shift 
+    else
+      parent = keys.delete('parent')
+    end
+
+    @variable = nil
+    if args[0].kind_of?(TkVariable) || args[0] == nil
+      keys.delete('variable') # ignore
+      @variable = args.shift 
+    else
+      @variable = keys.delete('variable')
+    end
+    @variable = TkVariable.new unless @variable
+
+    (args = keys.delete('values') || []) if args.empty?
+    if args.empty?
+      args << @variable.value
+    else
+      @variable.value = args[0]
+    end
+
+    install_win(if parent then parent.path end)
+    @menu = OptionMenu.new(tk_call('tk_optionMenu', 
+                                   @path, @variable.id, *args))
+
+    configure(keys) if keys
+  end
+
+  def value
+    @variable.value
+  end
+
+  def value=(val)
+    @variable.value = val
+  end
+
+  def activate(index)
+    @menu.activate(index)
+    self
+  end
+  def add(value)
+    @menu.add('radiobutton', 'variable'=>@variable, 
+              'label'=>value, 'value'=>value)
+    self
+  end
+  def index(index)
+    @menu.index(index)
+  end
+  def invoke(index)
+    @menu.invoke(index)
+  end
+  def insert(index, value)
+    @menu.insert(index, 'radiobutton', 'variable'=>@variable, 
+              'label'=>value, 'value'=>value)
+    self
+  end
+  def delete(index, last=None)
+    @menu.delete(index, last)
+    self
+  end
+  def yposition(index)
+    @menu.yposition(index)
+  end
+  def menu
+    @menu
+  end
+  def menucget(key)
+    @menu.cget(key)
+  end
+  def menuconfigure(key, val=None)
+    @menu.configure(key, val)
+    self
+  end
+  def menuconfiginfo(key=nil)
+    @menu.configinfo(key)
+  end
+  def current_menuconfiginfo(key=nil)
+    @menu.current_configinfo(key)
+  end
+  def entrycget(index, key)
+    @menu.entrycget(index, key)
+  end
+  def entryconfigure(index, key, val=None)
+    @menu.entryconfigure(index, key, val)
+    self
+  end
+  def entryconfiginfo(index, key=nil)
+    @menu.entryconfiginfo(index, key)
+  end
+  def current_entryconfiginfo(index, key=nil)
+    @menu.current_entryconfiginfo(index, key)
+  end
+end
+TkOptionMenuButton = TkOptionMenubutton
diff --git a/ruby_1_8_6/ext/tk/lib/tk/menubar.rb b/ruby_1_8_6/ext/tk/lib/tk/menubar.rb
new file mode 100644
index 0000000000..392b6fbd4e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/menubar.rb
@@ -0,0 +1,131 @@
+#
+# tk/menubar.rb
+#
+# Original version:
+#   Copyright (C) 1998 maeda shugo. All rights reserved. 
+#   This file can be distributed under the terms of the Ruby.
+
+# Usage:
+#
+# menu_spec = [
+#   [['File', 0],
+#     ['Open', proc{puts('Open clicked')}, 0],
+#     '---',
+#     ['Quit', proc{exit}, 0]],
+#   [['Edit', 0],
+#     ['Cut', proc{puts('Cut clicked')}, 2],
+#     ['Copy', proc{puts('Copy clicked')}, 0],
+#     ['Paste', proc{puts('Paste clicked')}, 0]]
+# ]
+# menubar = TkMenubar.new(nil, menu_spec,
+#                       'tearoff'=>false,
+#                       'foreground'=>'grey40',
+#                       'activeforeground'=>'red',
+#                       'font'=>'-adobe-helvetica-bold-r-*--12-*-iso8859-1')
+# menubar.pack('side'=>'top', 'fill'=>'x')
+#
+#
+# OR
+#
+#
+# menubar = TkMenubar.new
+# menubar.add_menu([['File', 0],
+#                  ['Open', proc{puts('Open clicked')}, 0],
+#                  '---',
+#                  ['Quit', proc{exit}, 0]])
+# menubar.add_menu([['Edit', 0],
+#                  ['Cut', proc{puts('Cut clicked')}, 2],
+#                  ['Copy', proc{puts('Copy clicked')}, 0],
+#                  ['Paste', proc{puts('Paste clicked')}, 0]])
+# menubar.configure('tearoff', false)
+# menubar.configure('foreground', 'grey40')
+# menubar.configure('activeforeground', 'red')
+# menubar.configure('font', '-adobe-helvetica-bold-r-*--12-*-iso8859-1')
+# menubar.pack('side'=>'top', 'fill'=>'x')
+#
+#
+# OR
+#
+# radio_var = TkVariable.new('y')
+# menu_spec = [
+#   [['File', 0],
+#     {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
+#     '---',
+#     ['Check_A', TkVariable.new(true), 6],
+#     {:type=>'checkbutton', :label=>'Check_B', 
+#                 :variable=>TkVariable.new, :underline=>6},
+#     '---',
+#     ['Radio_X', [radio_var, 'x'], 6],
+#     ['Radio_Y', [radio_var, 'y'], 6],
+#     ['Radio_Z', [radio_var, 'z'], 6],
+#     '---',
+#     ['cascade', [ 
+#                    ['sss', proc{p 'sss'}, 0], 
+#                    ['ttt', proc{p 'ttt'}, 0], 
+#                    ['uuu', proc{p 'uuu'}, 0], 
+#                    ['vvv', proc{p 'vvv'}, 0], 
+#                 ], 0],
+#     '---',
+#     ['Quit', proc{exit}, 0]],
+#   [['Edit', 0],
+#     ['Cut', proc{puts('Cut clicked')}, 2],
+#     ['Copy', proc{puts('Copy clicked')}, 0],
+#     ['Paste', proc{puts('Paste clicked')}, 0]]
+# ]
+# menubar = TkMenubar.new(nil, menu_spec,
+#                        'tearoff'=>false,
+#                        'foreground'=>'grey40',
+#                        'activeforeground'=>'red',
+#                        'font'=>'Helvetia 12 bold')
+# menubar.pack('side'=>'top', 'fill'=>'x')
+
+# See tk/menuspce.rb about the format of the menu_spec
+
+# To use add_menu, configuration must be done by calling configure after
+# adding all menus by add_menu, not by the constructor arguments.
+
+require 'tk'
+require 'tk/frame'
+require 'tk/composite'
+require 'tk/menuspec'
+
+class TkMenubar<TkFrame
+  include TkComposite
+  include TkMenuSpec
+  
+  def initialize(parent = nil, spec = nil, options = nil)
+    if parent.kind_of? Hash
+      options = _symbolkey2str(parent)
+      spec = options.delete('spec')
+      super(options)
+    else
+      super(parent, options)
+    end
+
+    @menus = []
+    
+    spec.each{|info| add_menu(info)} if spec
+
+    options.each{|key, value| configure(key, value)} if options
+  end
+
+  def add_menu(menu_info)
+    mbtn, menu = _create_menubutton(@frame, menu_info)
+
+    submenus = _get_cascade_menus(menu).flatten
+
+    @menus.push([mbtn, menu])
+    delegate('tearoff', menu, *submenus)
+    delegate('foreground', mbtn, menu, *submenus)
+    delegate('background', mbtn, menu, *submenus)
+    delegate('disabledforeground', mbtn, menu, *submenus)
+    delegate('activeforeground', mbtn, menu, *submenus)
+    delegate('activebackground', mbtn, menu, *submenus)
+    delegate('font', mbtn, menu, *submenus)
+    delegate('kanjifont', mbtn, menu, *submenus)
+  end
+  
+  def [](index)
+    return @menus[index]
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/menuspec.rb b/ruby_1_8_6/ext/tk/lib/tk/menuspec.rb
new file mode 100644
index 0000000000..118a4f42b1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/menuspec.rb
@@ -0,0 +1,269 @@
+#
+# tk/menuspec.rb
+#                              Hidethoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+# based on tkmenubar.rb :
+#   Copyright (C) 1998 maeda shugo. All rights reserved. 
+#   This file can be distributed under the terms of the Ruby.
+#
+# The format of the menu_spec is:
+#   [ menu_info, menu_info, ... ]
+#
+# And the format of the menu_info is:
+#   [
+#     [text, underline, configs], # menu button/entry (*1)
+#     [label, command, underline, accelerator, configs],   # command entry
+#     [label, TkVar_obj, underline, accelerator, configs], # checkbutton entry
+#     [label, [TkVar_obj, value], 
+#                        underline, accelerator, configs], # radiobutton entry
+#     [label, [[...menu_info...], [...menu_info...], ...], 
+#                        underline, accelerator, configs], # cascade entry (*2)
+#     '---', # separator
+#     ...
+#   ]
+#
+# underline, accelerator, and configs are optional pearameters. 
+# Hashes are OK instead of Arrays. Then the entry type ('command', 
+# 'checkbutton', 'radiobutton' or 'cascade') is given by 'type' key
+# (e.g. :type=>'cascade'). When type is 'cascade', an array of menu_info
+# is acceptable for 'menu' key (then, create sub-menu).
+#
+# NOTE: (*1)
+#   If you want to make special menus (*.help for UNIX, *.system for Win, 
+#   and *.apple for Mac), append 'menu_name'=>name (name is 'help' for UNIX, 
+#   'system' for Win, and 'apple' for Mac) option to the configs hash of 
+#   menu button/entry information.
+#
+# NOTE: (*2)
+#   If you want to configure a cascade menu, add :menu_config=>{...configs..}
+#   to the configs of the cascade entry.
+
+module TkMenuSpec
+  def _create_menu(parent, menu_info, menu_name = nil, 
+                   tearoff = false, default_opts = nil)
+    if tearoff.kind_of?(Hash)
+      default_opts = tearoff
+      tearoff = false
+    end
+
+    if menu_name.kind_of?(Hash)
+      default_opts = menu_name
+      menu_name = nil
+      tearoff = false
+    end
+
+    if default_opts.kind_of?(Hash)
+      orig_opts = _symbolkey2str(default_opts)
+    else
+      orig_opts = {}
+    end
+
+    tearoff = orig_opts.delete('tearoff') if orig_opts.key?('tearoff')
+
+    if menu_name
+      menu = TkMenu.new(parent, :widgetname=>menu_name, :tearoff=>tearoff)
+    else
+      menu = TkMenu.new(parent, :tearoff=>tearoff)
+    end
+
+    for item_info in menu_info
+      if item_info.kind_of?(Hash)
+        options = orig_opts.dup
+        options.update(_symbolkey2str(item_info))
+        item_type = (options.delete('type') || 'command').to_s
+        menu_name = options.delete('menu_name')
+        menu_opts = orig_opts.dup
+        menu_opts.update(_symbolkey2str(options.delete('menu_config') || {}))
+        if item_type == 'cascade' && options['menu'].kind_of?(Array)
+          # create cascade menu
+          submenu = _create_menu(menu, options['menu'], menu_name, 
+                                 tearoff, menu_opts)
+          options['menu'] = submenu
+        end
+        menu.add(item_type, options)
+
+      elsif item_info.kind_of?(Array)
+        options = orig_opts.dup
+
+        options['label'] = item_info[0] if item_info[0]
+
+        case item_info[1]
+        when TkVariable
+          # checkbutton
+          item_type = 'checkbutton'
+          options['variable'] = item_info[1]
+          options['onvalue']  = true
+          options['offvalue'] = false
+
+        when Array
+          # radiobutton or cascade
+          if item_info[1][0].kind_of?(TkVariable)
+            # radiobutton
+            item_type = 'radiobutton'
+            options['variable'] = item_info[1][0]
+            options['value'] = item_info[1][1] if item_info[1][1]
+
+          else
+            # cascade
+            item_type = 'cascade'
+            menu_opts = orig_opts.dup
+            if item_info[4] && item_info[4].kind_of?(Hash)
+              opts = _symbolkey2str(item_info[4])
+              menu_name = opts.delete('menu_name')
+              menu_config = opts.delete('menu_config') || {}
+              menu_opts.update(_symbolkey2str(menu_config))
+            end
+            submenu = _create_menu(menu, item_info[1], menu_name, 
+                                   tearoff, menu_opts)
+            options['menu'] = submenu
+          end
+
+        else
+          # command
+          item_type = 'command'
+          options['command'] = item_info[1] if item_info[1]
+        end
+
+        options['underline'] = item_info[2] if item_info[2]
+        options['accelerator'] = item_info[3] if item_info[3]
+        if item_info[4] && item_info[4].kind_of?(Hash)
+          opts = _symbolkey2str(item_info[4])
+          if item_type == 'cascade'
+            opts.delete('menu_name')
+            opts.delete('menu_config')
+          end
+          options.update(opts)
+        end
+        menu.add(item_type, options)
+
+      elsif /^-+$/ =~ item_info
+        menu.add('separator')
+
+      else
+        menu.add('command', 'label' => item_info)
+      end
+    end
+
+    menu
+  end
+  private :_create_menu
+
+  def _use_menubar?(parent)
+    use_menubar = false
+    if parent.kind_of?(TkRoot) || parent.kind_of?(TkToplevel)
+      return true 
+    else
+      begin
+        parent.cget('menu')
+        return true 
+      rescue
+      end
+    end
+    false
+  end
+  private :_use_menubar?
+
+  def _create_menu_for_menubar(parent)
+    unless (mbar = parent.menu).kind_of?(TkMenu)
+      mbar = TkMenu.new(parent, :tearoff=>false)
+      parent.menu(mbar)
+    end
+    mbar
+  end
+  private :_create_menu_for_menubar
+
+  def _create_menubutton(parent, menu_info, tearoff=false, default_opts = nil)
+    btn_info = menu_info[0]
+
+    if tearoff.kind_of?(Hash)
+      default_opts = tearoff
+      tearoff = false
+    end
+
+    if default_opts.kind_of?(Hash)
+      keys = _symbolkey2str(default_opts)
+    else
+      keys = {}
+    end
+
+    tearoff = keys.delete('tearoff') if keys.key?('tearoff')
+
+    if _use_menubar?(parent)
+      # menubar by menu entries
+
+      mbar = _create_menu_for_menubar(parent)
+
+      menu_name = nil
+
+      if btn_info.kind_of?(Hash)
+        keys.update(_symbolkey2str(btn_info))
+        menu_name = keys.delete('menu_name')
+        keys['label'] = keys.delete('text') if keys.key?('text')
+      elsif btn_info.kind_of?(Array)
+        keys['label'] = btn_info[0] if btn_info[0]
+        keys['underline'] = btn_info[1] if btn_info[1]
+        if btn_info[2]&&btn_info[2].kind_of?(Hash)
+          keys.update(_symbolkey2str(btn_info[2]))
+          menu_name = keys.delete('menu_name')
+        end
+      else
+        keys = {:label=>btn_info}
+      end
+
+      menu = _create_menu(mbar, menu_info[1..-1], menu_name, 
+                          tearoff, default_opts)
+      menu.tearoff(tearoff)
+
+      keys['menu'] = menu
+      mbar.add('cascade', keys)
+
+      [mbar, menu]
+
+    else
+      # menubar by menubuttons
+      mbtn = TkMenubutton.new(parent)
+
+      menu_name = nil
+
+      if btn_info.kind_of?(Hash)
+        keys.update(_symbolkey2str(btn_info))
+        menu_name = keys.delete('menu_name')
+        keys['text'] = keys.delete('label') if keys.key?('label')
+        mbtn.configure(keys)
+      elsif btn_info.kind_of?(Array)
+        mbtn.configure('text', btn_info[0]) if btn_info[0]
+        mbtn.configure('underline', btn_info[1]) if btn_info[1]
+        # mbtn.configure('accelerator', btn_info[2]) if btn_info[2]
+        if btn_info[2]&&btn_info[2].kind_of?(Hash)
+          keys.update(_symbolkey2str(btn_info[2]))
+          menu_name = keys.delete('menu_name')
+          mbtn.configure(keys)
+        end
+      else
+        mbtn.configure('text', btn_info)
+      end
+
+      mbtn.pack('side' => 'left')
+
+      menu = _create_menu(mbtn, menu_info[1..-1], menu_name, 
+                          tearoff, default_opts)
+    
+      mbtn.menu(menu)
+
+      [mbtn, menu]
+    end
+  end
+  private :_create_menubutton
+
+  def _get_cascade_menus(menu)
+    menus = []
+    (0..(menu.index('last'))).each{|idx|
+      if menu.menutype(idx) == 'cascade'
+        submenu = menu.entrycget(idx, 'menu')
+        menus << [submenu, _get_cascade_menus(submenu)]
+      end
+    }
+    menus
+  end
+  private :_get_cascade_menus
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/message.rb b/ruby_1_8_6/ext/tk/lib/tk/message.rb
new file mode 100644
index 0000000000..79121bebb3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/message.rb
@@ -0,0 +1,19 @@
+#
+# tk/message.rb : treat message widget
+#
+require 'tk'
+require 'tk/label'
+
+class TkMessage<TkLabel
+  TkCommandNames = ['message'.freeze].freeze
+  WidgetClassName = 'Message'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('message', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('message', @path)
+  #  end
+  #end
+  private :create_self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/mngfocus.rb b/ruby_1_8_6/ext/tk/lib/tk/mngfocus.rb
new file mode 100644
index 0000000000..1a2049c8a8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/mngfocus.rb
@@ -0,0 +1,33 @@
+#
+#   tk/mngfocus.rb : methods for Tcl/Tk standard library 'focus.tcl'
+#                           by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+require 'tk'
+
+module TkManageFocus
+  extend Tk
+
+  TkCommandNames = [
+    'tk_focusFollowMouse'.freeze, 
+    'tk_focusNext'.freeze, 
+    'tk_focusPrev'.freeze
+  ].freeze
+
+  def TkManageFocus.followsMouse
+    tk_call_without_enc('tk_focusFollowsMouse')
+  end
+
+  def TkManageFocus.next(win)
+    tk_tcl2ruby(tk_call('tk_focusNext', win))
+  end
+  def focusNext
+    TkManageFocus.next(self)
+  end
+
+  def TkManageFocus.prev(win)
+    tk_tcl2ruby(tk_call('tk_focusPrev', win))
+  end
+  def focusPrev
+    TkManageFocus.prev(self)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/msgcat.rb b/ruby_1_8_6/ext/tk/lib/tk/msgcat.rb
new file mode 100644
index 0000000000..061e43fd89
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/msgcat.rb
@@ -0,0 +1,292 @@
+#
+#   tk/msgcat.rb : methods for Tcl message catalog
+#                     by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+require 'tk'
+
+#class TkMsgCatalog
+class TkMsgCatalog < TkObject
+  include TkCore
+  extend Tk
+  #extend TkMsgCatalog
+
+  TkCommandNames = [
+    '::msgcat::mc'.freeze, 
+    '::msgcat::mcmax'.freeze, 
+    '::msgcat::mclocale'.freeze, 
+    '::msgcat::mcpreferences'.freeze, 
+    '::msgcat::mcload'.freeze, 
+    '::msgcat::mcset'.freeze, 
+    '::msgcat::mcmset'.freeze, 
+    '::msgcat::mcunknown'.freeze
+  ].freeze
+
+  tk_call_without_enc('package', 'require', 'Tcl', '8.2')
+
+  PACKAGE_NAME = 'msgcat'.freeze
+  def self.package_name
+    PACKAGE_NAME
+  end
+
+  if self.const_defined? :FORCE_VERSION
+    tk_call_without_enc('package', 'require', 'msgcat', FORCE_VERSION)
+  else
+    tk_call_without_enc('package', 'require', 'msgcat')
+  end
+
+  MSGCAT_EXT = '.msg'
+
+  UNKNOWN_CBTBL = Hash.new{|hash,key| hash[key] = {}}.taint
+
+  TkCore::INTERP.add_tk_procs('::msgcat::mcunknown', 'args', <<-'EOL')
+    if {[set st [catch {eval {ruby_cmd TkMsgCatalog callback} [namespace current] $args} ret]] != 0} {
+       #return -code $st $ret
+       set idx [string first "\n\n" $ret]
+       if {$idx > 0} {
+          return -code $st \
+                 -errorinfo [string range $ret [expr $idx + 2] \
+                                               [string length $ret]] \
+                 [string range $ret 0 [expr $idx - 1]]
+       } else {
+          return -code $st $ret
+       }
+    } else {
+        return $ret
+    }
+  EOL
+
+  def self.callback(namespace, locale, src_str, *args)
+    src_str = sprintf(src_str, *args) unless args.empty?
+    cmd_tbl = TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip]
+    cmd = cmd_tbl[namespace]
+    cmd = cmd_tbl['::'] unless cmd  # use global scope as interp default
+    return src_str unless cmd       # no cmd -> return src-str (default action)
+    begin
+      cmd.call(locale, src_str)
+    rescue SystemExit
+      exit(0)
+    rescue Interrupt
+      exit!(1)
+    rescue Exception => e
+      begin
+        msg = _toUTF8(e.class.inspect) + ': ' + 
+              _toUTF8(e.message) + "\n" + 
+              "\n---< backtrace of Ruby side >-----\n" + 
+              _toUTF8(e.backtrace.join("\n")) + 
+              "\n---< backtrace of Tk side >-------"
+        msg.instance_variable_set(:@encoding, 'utf-8')
+      rescue Exception
+        msg = e.class.inspect + ': ' + e.message + "\n" + 
+              "\n---< backtrace of Ruby side >-----\n" + 
+              e.backtrace.join("\n") + 
+              "\n---< backtrace of Tk side >-------"
+      end
+      fail(e, msg)
+    end
+  end
+
+  def initialize(namespace = nil)
+    if namespace.kind_of?(TkNamespace)
+      @namespace = namespace
+    elsif namespace == nil
+      @namespace = TkNamespace.new('::')  # global namespace
+    else
+      @namespace = TkNamespace.new(namespace)
+    end
+    @path = @namespace.path
+
+    @msgcat_ext = '.msg'
+  end
+  attr_accessor :msgcat_ext
+
+  def method_missing(id, *args)
+    # locale(src, trans) ==> set_translation(locale, src, trans)
+    loc = id.id2name
+    case args.length
+    when 0 # set locale
+      self.locale=(loc)
+
+    when 1 # src only, or trans_list
+      if args[0].kind_of?(Array)
+        # trans_list
+        #list = args[0].collect{|src, trans|
+        #  [ Tk::UTF8_String.new(src), Tk::UTF8_String.new(trans) ]
+        #}
+        self.set_translation_list(loc, args[0])
+      else
+        # src
+        #self.set_translation(loc, Tk::UTF8_String.new(args[0]))
+        self.set_translation(loc, args[0])
+      end
+
+    when 2 # src and trans, or, trans_list and enc
+      if args[0].kind_of?(Array)
+      else
+        #self.set_translation(loc, args[0], Tk::UTF8_String.new(args[1]))
+        self.set_translation(loc, *args)
+      end
+
+    when 3 # src and trans and enc
+      self.set_translation(loc, *args)
+
+    else
+      super(id, *args)
+#      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
+
+    end
+  end
+
+  # *args ::= form, arg, arg, ...
+  def self.translate(*args)
+    dst = args.collect{|src|
+      tk_call_without_enc('::msgcat::mc', _get_eval_string(src, true))
+    }
+    Tk.UTF8_String(sprintf(*dst))
+  end
+  class << self
+    alias mc translate
+    alias [] translate
+  end
+  def translate(*args)
+    dst = args.collect{|src|
+      @namespace.eval{tk_call_without_enc('::msgcat::mc', 
+                                          _get_eval_string(src, true))}
+    }
+    Tk.UTF8_String(sprintf(*dst))
+  end
+  alias mc translate
+  alias [] translate
+
+  def self.maxlen(*src_strings)
+    tk_call('::msgcat::mcmax', *src_strings).to_i
+  end
+  def maxlen(*src_strings)
+    @namespace.eval{tk_call('::msgcat::mcmax', *src_strings).to_i}
+  end
+
+  def self.locale
+    tk_call('::msgcat::mclocale')
+  end
+  def locale
+    @namespace.eval{tk_call('::msgcat::mclocale')}
+  end
+
+  def self.locale=(locale)
+    tk_call('::msgcat::mclocale', locale)
+  end
+  def locale=(locale)
+    @namespace.eval{tk_call('::msgcat::mclocale', locale)}
+  end
+
+  def self.preferences
+    tk_split_simplelist(tk_call('::msgcat::mcpreferences'))
+  end
+  def preferences
+    tk_split_simplelist(@namespace.eval{tk_call('::msgcat::mcpreferences')})
+  end
+
+  def self.load_tk(dir)
+    number(tk_call('::msgcat::mcload', dir))
+  end
+
+  def self.load_rb(dir)
+    count = 0
+    preferences().each{|loc|
+      file = File.join(dir, loc + self::MSGCAT_EXT)
+      if File.readable?(file)
+        count += 1
+        eval(open(file){|f| f.read})
+      end
+    }
+    count
+  end
+
+  def load_tk(dir)
+    number(@namespace.eval{tk_call('::msgcat::mcload', dir)})
+  end
+
+  def load_rb(dir)
+    count = 0
+    preferences().each{|loc|
+      file = File.join(dir, loc + @msgcat_ext)
+      if File.readable?(file)
+        count += 1
+        @namespace.eval(open(file){|f| f.read})
+      end
+    }
+    count
+  end
+
+  def self.load(dir)
+    self.load_rb(dir)
+  end
+  alias load load_rb
+
+  def self.set_translation(locale, src_str, trans_str=None, enc='utf-8')
+    if trans_str && trans_str != None
+      trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc))
+      Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset', 
+                                         locale, 
+                                         _get_eval_string(src_str, true), 
+                                         trans_str))
+    else
+      Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset', 
+                                         locale, 
+                                         _get_eval_string(src_str, true)))
+    end
+  end
+  def set_translation(locale, src_str, trans_str=None, enc='utf-8')
+    if trans_str && trans_str != None
+      trans_str = Tk.UTF8_String(_toUTF8(trans_str, enc)) 
+      Tk.UTF8_String(@namespace.eval{
+                       tk_call_without_enc('::msgcat::mcset', 
+                                           locale, 
+                                           _get_eval_string(src_str, true), 
+                                           trans_str)
+                     })
+    else
+      Tk.UTF8_String(@namespace.eval{
+                       tk_call_without_enc('::msgcat::mcset', 
+                                           locale, 
+                                           _get_eval_string(src_str, true))})
+    end
+  end
+
+  def self.set_translation_list(locale, trans_list, enc='utf-8')
+    # trans_list ::= [ [src, trans], [src, trans], ... ]
+    list = []
+    trans_list.each{|src, trans|
+      if trans && trans != None
+        list << _get_eval_string(src, true) 
+        list << Tk.UTF8_Stirng(_toUTF8(trans, enc))
+      else
+        list << _get_eval_string(src, true) << ''
+      end
+    }
+    number(tk_call_without_enc('::msgcat::mcmset', locale, list))
+  end
+  def set_translation_list(locale, trans_list, enc='utf-8')
+    # trans_list ::= [ [src, trans], [src, trans], ... ]
+    list = []
+    trans_list.each{|src, trans|
+      if trans && trans != None
+        list << _get_eval_string(src, true) 
+        list << Tk.UTF8_String(_toUTF8(trans, enc))
+      else
+        list << _get_eval_string(src, true) << ''
+      end
+    }
+    number(@namespace.eval{
+             tk_call_without_enc('::msgcat::mcmset', locale, list)
+           })
+  end
+
+  def self.def_unknown_proc(cmd=Proc.new)
+    TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip]['::'] = cmd
+  end
+  def def_unknown_proc(cmd=Proc.new)
+    TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip][@namespace.path] = cmd
+  end
+end
+
+TkMsgCat = TkMsgCatalog
diff --git a/ruby_1_8_6/ext/tk/lib/tk/namespace.rb b/ruby_1_8_6/ext/tk/lib/tk/namespace.rb
new file mode 100644
index 0000000000..5bf6474c5b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/namespace.rb
@@ -0,0 +1,500 @@
+#
+#   tk/namespace.rb : methods to manipulate Tcl/Tk namespace
+#                           by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+require 'tk'
+
+class TkNamespace < TkObject
+  extend Tk
+
+  TkCommandNames = [
+    'namespace'.freeze, 
+  ].freeze
+
+  Tk_Namespace_ID_TBL = TkCore::INTERP.create_table
+  Tk_Namespace_ID = ["ns".freeze, "00000".taint].freeze
+
+  Tk_NsCode_RetObjID_TBL = TkCore::INTERP.create_table
+
+  TkCore::INTERP.init_ip_env{
+    Tk_Namespace_ID_TBL.clear
+    Tk_NsCode_RetObjID_TBL.clear
+  }
+
+  def TkNamespace.id2obj(id)
+    Tk_Namespace_ID_TBL[id]? Tk_Namespace_ID_TBL[id]: id
+  end
+
+  #####################################
+
+  class Ensemble < TkObject
+    def __cget_cmd
+      ['namespace', 'ensemble', 'configure', self.path]
+    end
+    private :__cget_cmd
+
+    def __config_cmd
+      ['namespace', 'ensemble', 'configure', self.path]
+    end
+    private :__config_cmd
+
+    def __configinfo_struct
+      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil, 
+        :default_value=>nil, :current_value=>2}
+    end
+    private :__configinfo_struct
+
+    def __boolval_optkeys
+      ['prefixes']
+    end
+    private :__boolval_optkeys
+
+    def __listval_optkeys
+      ['map', 'subcommands', 'unknown']
+    end
+    private :__listval_optkeys
+
+    def self.exist?(ensemble)
+      bool(tk_call('namespace', 'ensemble', 'exists', ensemble))
+    end
+
+    def initialize(keys = {})
+      @ensemble = @path = tk_call('namespace', 'ensemble', 'create', keys)
+    end
+
+    def cget(slot)
+      if slot == :namespace || slot == 'namespace'
+        ns = super(slot)
+        if TkNamespace::Tk_Namespace_ID_TBL.key?(ns)
+          TkNamespace::Tk_Namespace_ID_TBL[ns]
+        else
+          ns
+        end
+      else
+        super(slot)
+      end
+    end
+
+    def configinfo(slot = nil)
+      if slot
+        if slot == :namespace || slot == 'namespace'
+          val = super(slot)
+          if TkNamespace::Tk_Namespace_ID_TBL.key?(val)
+            val = TkNamespace::Tk_Namespace_ID_TBL[val]
+          end
+        else
+          val = super(slot)
+        end
+
+        if TkComm::GET_CONFIGINFO_AS_ARRAY
+          [slot.to_s, val]
+        else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+          {slot.to_s => val}
+        end
+
+      else
+        info = super()
+
+        if TkComm::GET_CONFIGINFO_AS_ARRAY
+          info.map!{|inf| 
+            if inf[0] == 'namespace' && 
+                TkNamespace::Tk_Namespace_ID_TBL.key?(inf[-1])
+              [inf[0], TkNamespace::Tk_Namespace_ID_TBL[inf[-1]]]
+            else
+              inf
+            end
+          }
+        else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+          val = info['namespace']
+          if TkNamespace::Tk_Namespace_ID_TBL.key?(val)
+            info['namespace'] = TkNamespace::Tk_Namespace_ID_TBL[val]
+          end
+        end
+
+        info
+      end
+    end
+
+    def exists?
+      bool(tk_call('namespace', 'ensemble', 'exists', @path))
+    end
+  end
+
+  #####################################
+
+  class ScopeArgs < Array
+    include Tk
+
+    # alias __tk_call             tk_call
+    # alias __tk_call_without_enc tk_call_without_enc
+    # alias __tk_call_with_enc    tk_call_with_enc
+    def tk_call(*args)
+      #super('namespace', 'eval', @namespace, *args)
+      args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
+      super('namespace', 'eval', @namespace, 
+            TkCore::INTERP._merge_tklist(*args))
+    end
+    def tk_call_without_enc(*args)
+      #super('namespace', 'eval', @namespace, *args)
+      args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
+      super('namespace', 'eval', @namespace, 
+            TkCore::INTERP._merge_tklist(*args))
+    end
+    def tk_call_with_enc(*args)
+      #super('namespace', 'eval', @namespace, *args)
+      args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
+      super('namespace', 'eval', @namespace, 
+            TkCore::INTERP._merge_tklist(*args))
+    end
+
+    def initialize(namespace, *args)
+      @namespace = namespace
+      super(args.size)
+      self.replace(args)
+    end
+  end
+
+  #####################################
+
+  class NsCode < TkObject
+    def initialize(scope, use_obj_id = false)
+      @scope = scope + ' '
+      @use_obj_id = use_obj_id
+    end
+    def path
+      @scope
+    end
+    def to_eval
+      @scope
+    end
+    def call(*args)
+      ret = TkCore::INTERP._eval_without_enc(@scope + array2tk_list(args))
+      if @use_obj_id
+        ret = TkNamespace::Tk_NsCode_RetObjID_TBL.delete(ret.to_i)
+      end
+      ret
+    end
+  end
+
+  #####################################
+
+  def install_cmd(cmd)
+    lst = tk_split_simplelist(super(cmd), false, false)
+    if lst[1] =~ /^::/
+      lst[1] = @fullname
+    else
+      lst.insert(1, @fullname)
+    end
+    TkCore::INTERP._merge_tklist(*lst)
+  end
+
+  alias __tk_call             tk_call
+  alias __tk_call_without_enc tk_call_without_enc
+  alias __tk_call_with_enc    tk_call_with_enc
+  def tk_call(*args)
+    #super('namespace', 'eval', @fullname, *args)
+    args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
+    super('namespace', 'eval', @fullname, 
+          TkCore::INTERP._merge_tklist(*args))
+  end
+  def tk_call_without_enc(*args)
+    #super('namespace', 'eval', @fullname, *args)
+    args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
+    super('namespace', 'eval', @fullname,  
+          TkCore::INTERP._merge_tklist(*args))
+  end
+  def tk_call_with_enc(*args)
+    #super('namespace', 'eval', @fullname, *args)
+    args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
+    super('namespace', 'eval', @fullname, 
+          TkCore::INTERP._merge_tklist(*args))
+  end
+  alias ns_tk_call             tk_call
+  alias ns_tk_call_without_enc tk_call_without_enc
+  alias ns_tk_call_with_enc    tk_call_with_enc
+
+  def initialize(name = nil, parent = nil)
+    unless name
+      # name = Tk_Namespace_ID.join('')
+      name = Tk_Namespace_ID.join(TkCore::INTERP._ip_id_)
+      Tk_Namespace_ID[1].succ!
+    end
+    name = __tk_call('namespace', 'current') if name == ''
+    if parent
+      if parent =~ /^::/
+        if name =~ /^::/
+          @fullname = parent + name
+        else
+          @fullname = parent +'::'+ name
+        end
+      else
+        ancestor = __tk_call('namespace', 'current')
+        ancestor = '' if ancestor == '::'
+        if name =~ /^::/
+          @fullname = ancestor + '::' + parent + name
+        else
+          @fullname = ancestor + '::'+ parent +'::'+ name
+        end
+      end
+    else # parent == nil
+      ancestor = __tk_call('namespace', 'current')
+      ancestor = '' if ancestor == '::'
+      if name =~ /^::/
+        @fullname = name
+      else
+        @fullname = ancestor + '::' + name
+      end
+    end
+    @path = @fullname
+    @parent = __tk_call('namespace', 'qualifiers', @fullname)
+    @name = __tk_call('namespace', 'tail', @fullname)
+
+    # create namespace
+    __tk_call('namespace', 'eval', @fullname, '')
+
+    Tk_Namespace_ID_TBL[@fullname] = self
+  end
+
+  def self.children(*args)
+    # args ::= [<namespace>] [<pattern>]
+    # <pattern> must be glob-style pattern
+    tk_split_simplelist(tk_call('namespace', 'children', *args)).collect{|ns|
+      # ns is fullname
+      if Tk_Namespace_ID_TBL.key?(ns)
+        Tk_Namespace_ID_TBL[ns]
+      else
+        ns
+      end
+    }
+  end
+  def children(pattern=None)
+    TkNamespace.children(@fullname, pattern)
+  end
+
+  def self.code(script = Proc.new)
+    TkNamespace.new('').code(script)
+  end
+=begin
+  def code(script = Proc.new)
+    if script.kind_of?(String)
+      cmd = proc{|*args| ScopeArgs.new(@fullname,*args).instance_eval(script)}
+    elsif script.kind_of?(Proc)
+      cmd = proc{|*args| ScopeArgs.new(@fullname,*args).instance_eval(&script)}
+    else
+      fail ArgumentError, "String or Proc is expected"
+    end
+    TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code', 
+                                                _get_eval_string(cmd, false)))
+  end
+=end
+  def code(script = Proc.new)
+    if script.kind_of?(String)
+      cmd = proc{|*args|
+        ret = ScopeArgs.new(@fullname,*args).instance_eval(script)
+        id = ret.object_id
+        TkNamespace::Tk_NsCode_RetObjID_TBL[id] = ret
+        id
+      }
+    elsif script.kind_of?(Proc)
+      cmd = proc{|*args|
+        ret = ScopeArgs.new(@fullname,*args).instance_eval(&script)
+        id = ret.object_id
+        TkNamespace::Tk_NsCode_RetObjID_TBL[id] = ret
+        id
+      }
+    else
+      fail ArgumentError, "String or Proc is expected"
+    end
+    TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code', 
+                                                _get_eval_string(cmd, false)), 
+                            true)
+  end
+
+  def self.current_path
+    tk_call('namespace', 'current')
+  end
+  def current_path
+    @fullname
+  end
+
+  def self.current
+    ns = self.current_path
+    if Tk_Namespace_ID_TBL.key?(ns)
+      Tk_Namespace_ID_TBL[ns]
+    else
+      ns
+    end
+  end
+  def current_namespace
+    # ns_tk_call('namespace', 'current')
+    # @fullname
+    self
+  end
+  alias current current_namespace
+
+  def self.delete(*ns_list)
+    tk_call('namespace', 'delete', *ns_list)
+    ns_list.each{|ns|
+      if ns.kind_of?(TkNamespace)
+        Tk_Namespace_ID_TBL.delete(ns.path)
+      else
+        Tk_Namespace_ID_TBL.delete(ns.to_s)
+      end
+    }
+  end
+  def delete
+    TkNamespece.delete(@fullname)
+  end
+
+  def self.ensemble_create(*keys)
+    tk_call('namespace', 'ensemble', 'create', *hash_kv(keys))
+  end
+  def self.ensemble_configure(cmd, slot, value=None)
+    if slot.kind_of?(Hash)
+      tk_call('namespace', 'ensemble', 'configure', cmd, *hash_kv(slot))
+    else
+      tk_call('namespace', 'ensemble', 'configure', cmd, '-'+slot.to_s, value)
+    end
+  end
+  def self.ensemble_configinfo(cmd, slot = nil)
+    if slot
+      tk_call('namespace', 'ensemble', 'configure', cmd, '-' + slot.to_s)
+    else
+      inf = {}
+      Hash(*tk_split_simplelist(tk_call('namespace', 'ensemble', 'configure', cmd))).each{|k, v| inf[k[1..-1]] = v}
+      inf
+    end
+  end
+  def self.ensemble_exist?(cmd)
+    bool(tk_call('namespace', 'ensemble', 'exists', cmd))
+  end
+
+  def self.eval(namespace, cmd = Proc.new, *args)
+    #tk_call('namespace', 'eval', namespace, cmd, *args)
+    TkNamespace.new(namespece).eval(cmd, *args)
+  end
+=begin
+  def eval(cmd = Proc.new, *args)
+    #TkNamespace.eval(@fullname, cmd, *args)
+    #ns_tk_call(cmd, *args)
+    code_obj = code(cmd)
+    ret = code_obj.call(*args)
+    # uninstall_cmd(TkCore::INTERP._split_tklist(code_obj.path)[-1])
+    uninstall_cmd(_fromUTF8(TkCore::INTERP._split_tklist(_toUTF8(code_obj.path))[-1]))
+    tk_tcl2ruby(ret)
+  end
+=end
+  def eval(cmd = Proc.new, *args)
+    code_obj = code(cmd)
+    ret = code_obj.call(*args)
+    uninstall_cmd(_fromUTF8(TkCore::INTERP._split_tklist(_toUTF8(code_obj.path))[-1]))
+    ret
+  end
+
+  def self.exist?(ns)
+    bool(tk_call('namespace', 'exists', ns))
+  end
+  def exist?
+    TkNamespece.exist?(@fullname)
+  end
+
+  def self.export(*patterns)
+    tk_call('namespace', 'export', *patterns)
+  end
+  def self.export_with_clear(*patterns)
+    tk_call('namespace', 'export', '-clear', *patterns)
+  end
+  def export
+    TkNamespace.export(@fullname)
+  end
+  def export_with_clear
+    TkNamespace.export_with_clear(@fullname)
+  end
+
+  def self.forget(*patterns)
+    tk_call('namespace', 'forget', *patterns)
+  end
+  def forget
+    TkNamespace.forget(@fullname)
+  end
+
+  def self.import(*patterns)
+    tk_call('namespace', 'import', *patterns)
+  end
+  def self.force_import(*patterns)
+    tk_call('namespace', 'import', '-force', *patterns)
+  end
+  def import
+    TkNamespace.import(@fullname)
+  end
+  def force_import
+    TkNamespace.force_import(@fullname)
+  end
+
+  def self.inscope(namespace, script, *args)
+    tk_call('namespace', 'inscope', namespace, script, *args)
+  end
+  def inscope(script, *args)
+    TkNamespace.inscope(@fullname, script, *args)
+  end
+
+  def self.origin(cmd)
+    tk_call('namespace', 'origin', cmd)
+  end
+
+  def self.parent(namespace=None)
+    ns = tk_call('namespace', 'parent', namespace)
+    if Tk_Namespace_ID_TBL.key?(ns)
+      Tk_Namespace_ID_TBL[ns]
+    else
+      ns
+    end
+  end
+  def parent
+    tk_call('namespace', 'parent', @fullname)
+  end
+
+  def self.get_path
+    tk_call('namespace', 'path')
+  end
+  def self.set_path(*namespace_list)
+    tk_call('namespace', 'path', array2tk_list(namespace_list))
+  end
+  def set_path
+    tk_call('namespace', 'path', @fullname)
+  end
+
+  def self.qualifiers(str)
+    tk_call('namespace', 'qualifiers', str)
+  end
+
+  def self.tail(str)
+    tk_call('namespace', 'tail', str)
+  end
+
+  def self.upvar(namespace, *var_pairs)
+    tk_call('namespace', 'upvar', namespace, *(var_pairs.flatten))
+  end
+  def upvar(*var_pairs)
+    TkNamespace.inscope(@fullname, *(var_pairs.flatten))
+  end
+
+  def self.get_unknown_handler
+    tk_tcl2ruby(tk_call('namespace', 'unknown'))
+  end
+  def self.set_unknown_handler(cmd = Proc.new)
+    tk_call('namespace', 'unknown', cmd)
+  end
+
+  def self.which(name)
+    tk_call('namespace', 'which', name)
+  end
+  def self.which_command(name)
+    tk_call('namespace', 'which', '-command', name)
+  end
+  def self.which_variable(name)
+    tk_call('namespace', 'which', '-variable', name)
+  end
+end
+
+TkNamespace::Global = TkNamespace.new('::')
diff --git a/ruby_1_8_6/ext/tk/lib/tk/optiondb.rb b/ruby_1_8_6/ext/tk/lib/tk/optiondb.rb
new file mode 100644
index 0000000000..a806f3971d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/optiondb.rb
@@ -0,0 +1,371 @@
+#
+# tk/optiondb.rb : treat option database
+#
+require 'tk'
+
+module TkOptionDB
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['option'.freeze].freeze
+  CmdClassID = ['CMD_CLASS'.freeze, '00000'.taint].freeze
+
+  module Priority
+    WidgetDefault = 20
+    StartupFile   = 40
+    UserDefault   = 60
+    Interactive   = 80
+  end
+
+  def add(pat, value, pri=None)
+    # if $SAFE >= 4
+    #   fail SecurityError, "can't call 'TkOptionDB.add' at $SAFE >= 4"
+    # end
+    tk_call('option', 'add', pat, value, pri)
+  end
+  def clear
+    # if $SAFE >= 4
+    #   fail SecurityError, "can't call 'TkOptionDB.crear' at $SAFE >= 4"
+    # end
+    tk_call_without_enc('option', 'clear')
+  end
+  def get(win, name, klass)
+    tk_call('option', 'get', win ,name, klass)
+  end
+  def readfile(file, pri=None)
+    tk_call('option', 'readfile', file, pri)
+  end
+  alias read_file readfile
+  module_function :add, :clear, :get, :readfile, :read_file
+
+  def read_entries(file, f_enc=nil)
+    if TkCore::INTERP.safe?
+      fail SecurityError, 
+        "can't call 'TkOptionDB.read_entries' on a safe interpreter"
+    end
+
+    i_enc = ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
+
+    unless f_enc
+      f_enc = i_enc
+    end
+
+    ent = []
+    cline = ''
+    open(file, 'r') {|f|
+      while line = f.gets
+        #cline += line.chomp!
+        cline.concat(line.chomp!)
+        case cline
+        when /\\$/    # continue
+          cline.chop!
+          next
+        when /^\s*(!|#)/     # coment
+          cline = ''
+          next
+        when /^([^:]+):(.*)$/
+          pat = $1.strip
+          val = $2.lstrip
+          p "ResourceDB: #{[pat, val].inspect}" if $DEBUG
+          pat = TkCore::INTERP._toUTF8(pat, f_enc)
+          pat = TkCore::INTERP._fromUTF8(pat, i_enc)
+          val = TkCore::INTERP._toUTF8(val, f_enc)
+          val = TkCore::INTERP._fromUTF8(val, i_enc)
+          ent << [pat, val]
+          cline = ''
+        else          # unknown --> ignore
+          cline = ''
+          next
+        end
+      end
+    }
+    ent
+  end
+  module_function :read_entries
+      
+  def read_with_encoding(file, f_enc=nil, pri=None)
+    # try to read the file as an OptionDB file
+    read_entries(file, f_enc).each{|pat, val|
+      add(pat, val, pri)
+    }
+
+=begin
+    i_enc = Tk.encoding()
+
+    unless f_enc
+      f_enc = i_enc
+    end
+
+    cline = ''
+    open(file, 'r') {|f|
+      while line = f.gets
+        cline += line.chomp!
+        case cline
+        when /\\$/    # continue
+          cline.chop!
+          next
+        when /^\s*!/     # coment
+          cline = ''
+          next
+        when /^([^:]+):\s(.*)$/
+          pat = $1
+          val = $2
+          p "ResourceDB: #{[pat, val].inspect}" if $DEBUG
+          pat = TkCore::INTERP._toUTF8(pat, f_enc)
+          pat = TkCore::INTERP._fromUTF8(pat, i_enc)
+          val = TkCore::INTERP._toUTF8(val, f_enc)
+          val = TkCore::INTERP._fromUTF8(val, i_enc)
+          add(pat, val, pri)
+          cline = ''
+        else          # unknown --> ignore
+          cline = ''
+          next
+        end
+      end
+    }
+=end
+  end
+  module_function :read_with_encoding
+
+  # support procs on the resource database
+  @@resource_proc_class = Class.new
+
+  @@resource_proc_class.const_set(:CARRIER, '.'.freeze)
+
+  @@resource_proc_class.instance_variable_set('@method_tbl', 
+                                              TkCore::INTERP.create_table)
+  @@resource_proc_class.instance_variable_set('@add_method', false)
+  @@resource_proc_class.instance_variable_set('@safe_mode', 4)
+
+  class << @@resource_proc_class
+    private :new
+
+=begin 
+    CARRIER    = '.'.freeze
+    METHOD_TBL = TkCore::INTERP.create_table
+    ADD_METHOD = false
+    SAFE_MODE  = 4
+=end
+
+=begin
+    def __closed_block_check__(str)
+      depth = 0
+      str.scan(/[{}]/){|x|
+        if x == "{"
+          depth += 1
+        elsif x == "}"
+          depth -= 1
+        end
+        if depth <= 0 && !($' =~ /\A\s*\Z/)
+          fail RuntimeError, "bad string for procedure : #{str.inspect}"
+        end
+      }
+      str
+    end
+    private :__closed_block_check__
+=end
+
+    def __check_proc_string__(str)
+      # If you want to check the proc_string, do it in this method.
+      # Please define this in the block given to 'new_proc_class' method. 
+      str
+    end
+
+    def method_missing(id, *args)
+      #res_proc, proc_str = self::METHOD_TBL[id]
+      res_proc, proc_str = @method_tbl[id]
+
+      proc_source = TkOptionDB.get(self::CARRIER, id.id2name, '').strip
+      res_proc = nil if proc_str != proc_source # resource is changed
+
+      # unless res_proc.kind_of?(Proc)
+      unless TkComm._callback_entry?(res_proc)
+        #if id == :new || !(self::METHOD_TBL.has_key?(id) || self::ADD_METHOD)
+        if id == :new || !(@method_tbl.has_key?(id) || @add_method)
+          raise NoMethodError, 
+                "not support resource-proc '#{id.id2name}' for #{self.name}"
+        end
+        proc_str = proc_source
+        proc_str = '{' + proc_str + '}' unless /\A\{.*\}\Z/ =~ proc_str
+        #proc_str = __closed_block_check__(proc_str)
+        proc_str = __check_proc_string__(proc_str)
+        res_proc = proc{ 
+          begin
+            #eval("$SAFE = #{self::SAFE_MODE};\nProc.new" + proc_str)
+            eval("$SAFE = #{@safe_mode};\nProc.new" + proc_str)
+          rescue SyntaxError=>err
+            raise SyntaxError, 
+              TkCore::INTERP._toUTF8(err.message.gsub(/\(eval\):\d:/, 
+                                                      "(#{id.id2name}):"))
+          end
+        }.call
+        #self::METHOD_TBL[id] = [res_proc, proc_source]
+        @method_tbl[id] = [res_proc, proc_source]
+      end
+      res_proc.call(*args)
+    end
+
+    private :__check_proc_string__, :method_missing
+  end
+  @@resource_proc_class.freeze
+
+=begin
+  def __create_new_class(klass, func, safe = 4, add = false, parent = nil)
+    klass = klass.to_s if klass.kind_of? Symbol
+    unless (?A..?Z) === klass[0]
+      fail ArgumentError, "bad string '#{klass}' for class name"
+    end
+    unless func.kind_of? Array
+      fail ArgumentError, "method-list must be Array"
+    end
+    func_str = func.join(' ')
+    if parent == nil
+      install_win(parent)
+    elsif parent <= @@resource_proc_class
+      install_win(parent::CARRIER)
+    else
+      fail ArgumentError, "parent must be Resource-Proc class"
+    end
+    carrier = Tk.tk_call_without_enc('frame', @path, '-class', klass)
+
+    body = <<-"EOD"
+      class #{klass} < TkOptionDB.module_eval('@@resource_proc_class')
+        CARRIER    = '#{carrier}'.freeze
+        METHOD_TBL = TkCore::INTERP.create_table
+        ADD_METHOD = #{add}
+        SAFE_MODE  = #{safe}
+        %w(#{func_str}).each{|f| METHOD_TBL[f.intern] = nil }
+      end
+    EOD
+
+    if parent.kind_of?(Class) && parent <= @@resource_proc_class
+      parent.class_eval(body)
+      eval(parent.name + '::' + klass)
+    else
+      eval(body)
+      eval('TkOptionDB::' + klass)
+    end
+  end
+=end
+  def __create_new_class(klass, func, safe = 4, add = false, parent = nil)
+    if klass.kind_of?(TkWindow)
+      carrier = klass.path
+      klass = CmdClassID.join(TkCore::INTERP._ip_id_)
+      CmdClassID[1].succ!
+      parent = nil # ignore parent
+    else
+      klass = klass.to_s if klass.kind_of?(Symbol)
+      unless (?A..?Z) === klass[0]
+        fail ArgumentError, "bad string '#{klass}' for class name"
+      end
+      if parent == nil
+        install_win(nil)
+      elsif parent.kind_of?(TkWindow)
+        install_win(parent.path)
+      elsif parent <= @@resource_proc_class
+        install_win(parent::CARRIER)
+      else
+        fail ArgumentError, "parent must be Resource-Proc class"
+      end
+      carrier = Tk.tk_call_without_enc('frame', @path, '-class', klass)
+    end
+
+    unless func.kind_of?(Array)
+      fail ArgumentError, "method-list must be Array"
+    end
+    func_str = func.join(' ')
+
+    if parent.kind_of?(Class) && parent <= @@resource_proc_class
+      cmd_klass = Class.new(parent)
+    else
+      cmd_klass = Class.new(TkOptionDB.module_eval('@@resource_proc_class'))
+    end
+    cmd_klass.const_set(:CARRIER, carrier.dup.freeze)
+
+    cmd_klass.instance_variable_set('@method_tbl', TkCore::INTERP.create_table)
+    cmd_klass.instance_variable_set('@add_method', add)
+    cmd_klass.instance_variable_set('@safe_mode', safe)
+    func.each{|f| 
+      cmd_klass.instance_variable_get('@method_tbl')[f.to_s.intern] = nil
+    }
+=begin
+    cmd_klass.const_set(:METHOD_TBL, TkCore::INTERP.create_table)
+    cmd_klass.const_set(:ADD_METHOD, add)
+    cmd_klass.const_set(:SAFE_MODE, safe)
+    func.each{|f| cmd_klass::METHOD_TBL[f.to_s.intern] = nil }
+=end
+
+    cmd_klass
+  end
+  module_function :__create_new_class
+  private_class_method :__create_new_class
+
+  def __remove_methods_of_proc_class(klass)
+    # for security, make these methods invalid
+    class << klass
+      def __null_method(*args); nil; end
+      [ :class_eval, :name, :superclass, :clone, :dup, :autoload, :autoload?, 
+        :ancestors, :const_defined?, :const_get, :const_set, :const_missing, 
+        :class_variables, :constants, :included_modules, :instance_methods, 
+        :method_defined?, :module_eval, :private_instance_methods, 
+        :protected_instance_methods, :public_instance_methods, 
+        :singleton_methods, :remove_const, :remove_method, :undef_method, 
+        :to_s, :inspect, :display, :method, :methods, :respond_to?, 
+        :instance_variable_get, :instance_variable_set, :instance_method, 
+        :instance_eval, :instance_variables, :kind_of?, :is_a?,
+        :private_methods, :protected_methods, :public_methods ].each{|m|
+        alias_method(m, :__null_method)
+      }
+    end
+  end
+  module_function :__remove_methods_of_proc_class
+  private_class_method :__remove_methods_of_proc_class
+
+  RAND_BASE_CNT = [0]
+  RAND_BASE_HEAD = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+  RAND_BASE_CHAR = RAND_BASE_HEAD + 'abcdefghijklmnopqrstuvwxyz0123456789_'
+  def __get_random_basename
+    name = '%s%03d' % [RAND_BASE_HEAD[rand(RAND_BASE_HEAD.size),1], 
+                       RAND_BASE_CNT[0]]
+    len = RAND_BASE_CHAR.size
+    (6+rand(10)).times{
+      name << RAND_BASE_CHAR[rand(len),1]
+    }
+    RAND_BASE_CNT[0] = RAND_BASE_CNT[0] + 1
+    name
+  end
+  module_function :__get_random_basename
+  private_class_method :__get_random_basename
+
+  # define new proc class :
+  # If you want to modify the new class or create a new subclass, 
+  # you must do such operation in the block parameter. 
+  # Because the created class is flozen after evaluating the block. 
+  def new_proc_class(klass, func, safe = 4, add = false, parent = nil, &b)
+    new_klass = __create_new_class(klass, func, safe, add, parent)
+    new_klass.class_eval(&b) if block_given?
+    __remove_methods_of_proc_class(new_klass)
+    new_klass.freeze
+    new_klass
+  end
+  module_function :new_proc_class
+
+  def eval_under_random_base(parent = nil, &b)
+    new_klass = __create_new_class(__get_random_basename(), 
+                                   [], 4, false, parent)
+    ret = new_klass.class_eval(&b) if block_given?
+    __remove_methods_of_proc_class(new_klass)
+    new_klass.freeze
+    ret
+  end
+  module_function :eval_under_random_base
+
+  def new_proc_class_random(klass, func, safe = 4, add = false, &b)
+    eval_under_random_base(){
+      TkOption.new_proc_class(klass, func, safe, add, self, &b)
+    }
+  end
+  module_function :new_proc_class_random
+end
+TkOption = TkOptionDB
+TkResourceDB = TkOptionDB
diff --git a/ruby_1_8_6/ext/tk/lib/tk/optionobj.rb b/ruby_1_8_6/ext/tk/lib/tk/optionobj.rb
new file mode 100644
index 0000000000..8fe7e0ee5a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/optionobj.rb
@@ -0,0 +1,212 @@
+#
+# tk/optionobj.rb : control options for a group of widgets
+#
+#  NOTE: If you want to use key-only option (no value), 
+#        use Tk::None for the value of the key-only option. 
+#
+#        e.g. hash_kv({'aaa'=>1, 'bbb'=>Tk::None, 'ccc'=>3}) 
+#                 => ["-aaa", 1, "-bbb", "-ccc", 3]
+#
+require 'tk'
+
+module Tk
+  class OptionObj < Hash
+    include TkUtil
+
+    def initialize(hash = nil)
+      super()
+      @observ = []
+      update_without_notify(_symbolkey2str(hash)) if hash
+    end
+
+    def observ_info
+      @observ.dup
+    end
+
+    def observs
+      @observ.collect{|win|
+        if win.kind_of?(Array)
+          win[0]
+        else
+          win
+        end
+      }
+    end
+
+    def _remove_win(win)
+      if win.kind_of?(Array)
+        widget, method = win
+        @observ.delete_if{|x| 
+          if x.kind_of?(Array)
+            x[0] == widget
+          else
+            x == widget
+          end
+        }
+      else
+        @observ.delete_if{|x|
+          if x.kind_of?(Array)
+            x[0] == win
+          else
+            x == win
+          end
+        }
+      end
+    end
+    private :_remove_win
+
+    def assign(*wins)
+      # win := 
+      #   widget             #==> call widget.configure(hash)
+      #   [widget]           #==> call widget.configure(hash)
+      #   [widget, nil, {src=>target, ... }]
+      #                      #==> call widget.configure(hash) 
+      #                               with converting hash-key
+      #   [widget, method]   #==> call widget.method(hash)
+      #   [widget, method, {src=>target, ... }]
+      #                      #==> call widget.method(hash) 
+      #                               with converting hash-key
+      #   [widget [receiver, method, arg, ... ]]
+      #                      #==> call receiver.method(arg, ... , hash)
+      #   [widget [receiver, method, arg, ... ], {src=>target, ... }]
+      #                      #==> call receiver.method(arg, ... , hash)
+      #                               with onverting hash-key
+      #
+      # src := option_name_on_optobj
+      #
+      # target := 
+      #   nil                #==> not use the src
+      #   option_name_on_target_widget
+      #   [ option_name_on_target_widget, ... ]
+      #                      #==> set all of them
+      #
+      wins.each{|win|
+        _remove_win(win)
+        @observ << win
+        notify(win)
+      }
+      self
+    end
+
+    def unassign(*wins)
+      wins.each{|win|
+        _remove_win(win)
+      }
+      self
+    end
+
+    def notify(target = nil)
+      if target
+        targets = [target]
+      elsif @observ.empty?
+        return self
+      else
+        targets = @observ.dup
+      end
+
+      return self if empty?
+
+      org_hash = _symbolkey2str(self)
+
+      targets.each{|win|
+        widget = receiver = win
+        hash = org_hash
+        begin
+          if win.kind_of?(Array)
+            widget, method, conv_tbl = win
+            receiver = widget
+
+            if conv_tbl
+              hash = {}
+              org_hash.each{|key, val|
+                key = conv_tbl[key] if conv_tbl.key?(key)
+                next unless key
+                if key.kind_of?(Array)
+                  key.each{|k| hash[k] = val}
+                else              
+                  hash[key] = val
+                end
+              }
+            end
+
+            if method.kind_of?(Array)
+              receiver, method, *args = method
+              receiver.__send__(method, *(args << hash))
+            elsif method
+              widget.__send__(method, hash)
+            else
+              widget.configure(hash)
+            end
+
+          else
+            widget.configure(self)
+          end
+        rescue => e
+          if ( ( widget.kind_of?(TkObject) \
+                && widget.respond_to?('exist?') \
+                && ! receiver.exist? ) \
+            || ( receiver.kind_of?(TkObject) \
+                && receiver.respond_to?('exist?') \
+                && ! receiver.exist? ) )
+            @observ.delete(win)
+          else
+            fail e
+          end
+        end
+      }
+
+      self
+    end
+    alias apply notify
+
+    def +(hash)
+      unless hash.kind_of?(Hash)
+        fail ArgumentError, "expect a Hash"
+      end
+      new_obj = self.dup
+      new_obj.update_without_notify(_symbolkey2str(hash))
+      new_obj
+    end
+
+    alias update_without_notify update
+
+    def update(hash)
+      update_without_notify(_symbolkey2str(hash))
+      notify
+    end
+
+    def configure(key, value=nil)
+      if key.kind_of?(Hash)
+        update(key)
+      else
+        store(key,value)
+      end
+    end
+
+    def [](key)
+      super(key.to_s)
+    end
+    alias cget []
+
+    def store(key, val)
+      key = key.to_s
+      super(key, val)
+      notify
+    end
+    def []=(key, val)
+      store(key,val)
+    end
+
+    def replace(hash)
+      super(_symbolkey2str(hash))
+      notify
+    end
+
+    def default(opt)
+      fail RuntimeError, "unknown option `#{opt}'"
+    end
+    private :default
+
+    undef :default=
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/pack.rb b/ruby_1_8_6/ext/tk/lib/tk/pack.rb
new file mode 100644
index 0000000000..8fab363121
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/pack.rb
@@ -0,0 +1,90 @@
+#
+# tk/pack.rb : control pack geometry manager
+#
+require 'tk'
+
+module TkPack
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['pack'.freeze].freeze
+
+  def configure(win, *args)
+    if args[-1].kind_of?(Hash)
+      opts = args.pop
+    else
+      opts = {}
+    end
+    params = []
+    # params.push((win.kind_of?(TkObject))? win.epath: win)
+    params.push(_epath(win))
+    args.each{|win|
+      # params.push((win.kind_of?(TkObject))? win.epath: win)
+      params.push(_epath(win))
+    }
+    opts.each{|k, v|
+      params.push("-#{k}")
+      # params.push((v.kind_of?(TkObject))? v.epath: v)
+      params.push(_epath(v))
+    }
+    tk_call_without_enc("pack", 'configure', *params)
+  end
+  alias pack configure
+
+  def forget(*args)
+    return '' if args.size == 0
+    wins = args.collect{|win|
+      # (win.kind_of?(TkObject))? win.epath: win
+      _epath(win)
+    }
+    tk_call_without_enc('pack', 'forget', *wins)
+  end
+
+  def info(slave)
+    # slave = slave.epath if slave.kind_of?(TkObject)
+    slave = _epath(slave)
+    ilist = list(tk_call_without_enc('pack', 'info', slave))
+    info = {}
+    while key = ilist.shift
+      info[key[1..-1]] = ilist.shift
+    end
+    return info
+  end
+
+  def propagate(master, mode=None)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    if mode == None
+      bool(tk_call_without_enc('pack', 'propagate', master))
+    else
+      tk_call_without_enc('pack', 'propagate', master, mode)
+    end
+  end
+
+  def slaves(master)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    list(tk_call_without_enc('pack', 'slaves', master))
+  end
+
+  module_function :pack, :configure, :forget, :info, :propagate, :slaves
+end
+=begin
+def TkPack(win, *args)
+  if args[-1].kind_of?(Hash)
+    opts = args.pop
+  else
+    opts = {}
+  end
+  params = []
+  params.push((win.kind_of?(TkObject))? win.epath: win)
+  args.each{|win|
+    params.push((win.kind_of?(TkObject))? win.epath: win)
+  }
+  opts.each{|k, v|
+    params.push("-#{k}")
+    params.push((v.kind_of?(TkObject))? v.epath: v)
+  }
+  tk_call_without_enc("pack", *params)
+end
+=end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/package.rb b/ruby_1_8_6/ext/tk/lib/tk/package.rb
new file mode 100644
index 0000000000..d1eb27674d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/package.rb
@@ -0,0 +1,139 @@
+#
+# tk/package.rb : package command
+#
+require 'tk'
+
+module TkPackage
+  include TkCore
+  extend TkPackage
+
+  TkCommandNames = ['package'.freeze].freeze
+
+  def add_path(path)
+    Tk::AUTO_PATH.value = Tk::AUTO_PATH.to_a << path
+  end
+
+  def forget(package)
+    tk_call('package', 'forget', package)
+    nil
+  end
+
+  def if_needed(pkg, ver, *arg, &b)
+    size = arg.size
+
+    if size==0 && !b
+      # proc info
+      procedure(tk_call('package', 'ifneeded', pkg, ver))
+
+    elsif size==0 && b
+      # set proc
+      cmd = proc(&b)
+      tk_call('package', 'ifneeded', pkg, ver, cmd)
+      cmd
+
+    elsif size==1 && !b
+      # set proc
+      cmd = arg[0]
+      if cmd
+        tk_call('package', 'ifneeded', pkg, ver, cmd)
+        cmd
+      else
+        # remove proc
+        tk_call('package', 'ifneeded', pkg, ver, '')
+        nil
+      end
+
+    else
+      fail ArgumentError, 'too many arguments'
+    end
+  end
+
+  def names
+    tk_split_simplelist(tk_call('package', 'names'))
+  end
+
+  def provide(package, version=nil)
+    if version
+      tk_call('package', 'provide', package, version)
+    end
+    if (ret = tk_call('package', 'provide', package)) == ''
+      nil
+    else
+      ret
+    end
+  end
+
+  def present(package, version=None)
+    begin
+      tk_call('package', 'present', package, version)
+    rescue => e
+      fail e.class, 'TkPackage ' << e.message
+    end
+  end
+
+  def present_exact(package, version)
+    begin
+      tk_call('package', 'present', '-exact', package, version)
+    rescue => e
+      fail e.class, 'TkPackage ' << e.message
+    end
+  end
+
+  def require(package, version=None)
+    begin
+      tk_call('package', 'require', package, version)
+    rescue => e
+      fail e.class, 'TkPackage ' << e.message
+    end
+  end
+
+  def require_exact(package, version)
+    begin
+      tk_call('package', 'require', '-exact', package, version)
+    rescue => e
+      fail e.class, 'TkPackage ' << e.message
+    end
+  end
+
+  def unknown_proc(*arg, &b)
+    size = arg.size
+
+    if size==0 && !b
+      # proc info
+      procedure(tk_call('package', 'unknown'))
+
+    elsif size==0 && b
+      # set proc
+      cmd = proc(&b)
+      tk_call('package', 'unknown', cmd)
+      cmd
+
+    elsif size==1 && !b
+      # set proc
+      cmd = arg[0]
+      if cmd
+        tk_call('package', 'unknown', cmd)
+        cmd
+      else
+        # remove proc
+        tk_call('package', 'unknown', '')
+        nil
+      end
+
+    else
+      fail ArgumentError, 'too many arguments'
+    end
+  end
+
+  def versions(package)
+    tk_split_simplelist(tk_call('package', 'versions', package))
+  end
+
+  def vcompare(version1, version2)
+    number(tk_call('package', 'vcompare', version1, version2))
+  end
+
+  def vsatisfies(version1, version2)
+    bool(tk_call('package', 'vsatisfies', version1, version2))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/palette.rb b/ruby_1_8_6/ext/tk/lib/tk/palette.rb
new file mode 100644
index 0000000000..2b6fdf5d90
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/palette.rb
@@ -0,0 +1,55 @@
+#
+#   tk/palette.rb : methods for Tcl/Tk standard library 'palette.tcl'
+#                     1998/06/21 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+require 'tk'
+
+module TkPalette
+  include Tk
+  extend Tk
+
+  TkCommandNames = [
+    'tk_setPalette'.freeze, 
+    'tk_bisque'.freeze, 
+    'tkDarken'.freeze
+  ].freeze
+
+  def TkPalette.set(*args)
+    args = args.to_a.flatten if args.kind_of? Hash
+    tk_call('tk_setPalette', *args)
+  end
+  def TkPalette.setPalette(*args)
+    TkPalette.set(*args)
+  end
+
+  def TkPalette.bisque
+    tk_call('tk_bisque')
+  end
+
+  def TkPalette.darken(color, percent)
+    tk_call('tkDarken', color, percent)
+  end
+
+  def TkPalette.recolorTree(win, colors)
+    if not colors.kind_of?(Hash)
+      fail "2nd arg need to be Hash"
+    end
+
+    tk_call('global', "tkPalette")
+    colors.each{|key, value|
+      begin
+        if win.cget(key) == tk_call('set', "tkPalette(#{key})")
+          win[key] = colors[key]
+        end
+      rescue
+        # ignore
+      end
+    }
+
+    TkWinfo.children(win).each{|w| TkPalette.recolorTree(w, colors)}
+  end
+
+  def recolorTree(colors)
+    TkPalette.recolorTree(self, colors)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/panedwindow.rb b/ruby_1_8_6/ext/tk/lib/tk/panedwindow.rb
new file mode 100644
index 0000000000..c6cf3cd11f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/panedwindow.rb
@@ -0,0 +1,232 @@
+#
+# tk/panedwindow.rb : treat panedwindow
+#
+require 'tk'
+
+class TkPanedWindow<TkWindow
+  TkCommandNames = ['panedwindow'.freeze].freeze
+  WidgetClassName = 'Panedwindow'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('panedwindow', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('panedwindow', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def add(*args)
+    keys = args.pop
+    fail ArgumentError, "no window in arguments" unless keys
+    if keys && keys.kind_of?(Hash)
+      fail ArgumentError, "no window in arguments" if args == []
+      # args = args.collect{|w| (w.kind_of?(TkObject))? w.epath: w }
+      args = args.collect{|w| _epath(w) }
+      #args.push(hash_kv(keys))
+      args.concat(hash_kv(keys))
+    else
+      args.push(keys) if keys
+      # args = args.collect{|w| (w.kind_of?(TkObject))? w.epath: w }
+      args = args.collect{|w| _epath(w) }
+    end
+    tk_send_without_enc('add', *args)
+    self
+  end
+
+  def forget(win, *wins)
+    wins.unshift(win)
+    # tk_send_without_enc('forget', *((w.kind_of?(TkObject))? w.epath: w))
+    tk_send_without_enc('forget', *(wins.collect{|w| _epath(w)}))
+    self
+  end
+  alias del forget
+  alias delete forget
+  alias remove forget
+
+  def identify(x, y)
+    list(tk_send_without_enc('identify', x, y))
+  end
+
+  def proxy_coord
+    list(tk_send_without_enc('proxy', 'coord'))
+  end
+  def proxy_forget
+    tk_send_without_enc('proxy', 'forget')
+    self
+  end
+  def proxy_place(x, y)
+    tk_send_without_enc('proxy', 'place', x, y)
+    self
+  end
+
+  def sash_coord(index)
+    list(tk_send('sash', 'coord', index))
+  end
+  def sash_dragto(index, x, y)
+    tk_send('sash', 'dragto', index, x, y)
+    self
+  end
+  def sash_mark(index, x, y)
+    tk_send('sash', 'mark', index, x, y)
+    self
+  end
+  def sash_place(index, x, y)
+    tk_send('sash', 'place', index, x, y)
+    self
+  end
+
+  def panecget(win, key)
+    # win = win.epath if win.kind_of?(TkObject)
+    win = _epath(win)
+    tk_tcl2ruby(tk_send_without_enc('panecget', win, "-#{key}"))
+  end
+
+  def paneconfigure(win, key, value=nil)
+    # win = win.epath if win.kind_of?(TkObject)
+    win = _epath(win)
+    if key.kind_of? Hash
+      params = []
+      key.each{|k, v|
+        params.push("-#{k}")
+        # params.push((v.kind_of?(TkObject))? v.epath: v)
+        params.push(_epath(v))
+      }
+      tk_send_without_enc('paneconfigure', win, *params)
+    else
+      # value = value.epath if value.kind_of?(TkObject)
+      value = _epath(value)
+      tk_send_without_enc('paneconfigure', win, "-#{key}", value)
+    end
+    self
+  end
+  alias pane_config paneconfigure
+
+  def paneconfiginfo(win, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      # win = win.epath if win.kind_of?(TkObject)
+      win = _epath(win)
+      if key
+        #conf = tk_split_list(tk_send_without_enc('paneconfigure', 
+        #                                         win, "-#{key}"))
+        conf = tk_split_list(tk_send_without_enc('paneconfigure', 
+                                                 win, "-#{key}"), 
+                             false, true)
+        conf[0] = conf[0][1..-1]
+        if conf[0] == 'hide'
+          conf[3] = bool(conf[3]) unless conf[3].empty?
+          conf[4] = bool(conf[4]) unless conf[4].empty?
+        end
+        conf
+      else
+        #tk_split_simplelist(tk_send_without_enc('paneconfigure', 
+        #                                        win)).collect{|conflist|
+        #  conf = tk_split_simplelist(conflist)
+        tk_split_simplelist(tk_send_without_enc('paneconfigure', win), 
+                            false, false).collect{|conflist|
+          conf = tk_split_simplelist(conflist, false, true)
+          conf[0] = conf[0][1..-1]
+          if conf[3]
+            if conf[0] == 'hide'
+              conf[3] = bool(conf[3]) unless conf[3].empty?
+            elsif conf[3].index('{')
+              conf[3] = tk_split_list(conf[3]) 
+            else
+              conf[3] = tk_tcl2ruby(conf[3]) 
+            end
+          end
+          if conf[4]
+            if conf[0] == 'hide'
+              conf[4] = bool(conf[4]) unless conf[4].empty?
+            elsif conf[4].index('{')
+              conf[4] = tk_split_list(conf[4]) 
+            else
+              conf[4] = tk_tcl2ruby(conf[4]) 
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      # win = win.epath if win.kind_of?(TkObject)
+      win = _epath(win)
+      if key
+        #conf = tk_split_list(tk_send_without_enc('paneconfigure', 
+        #                                         win, "-#{key}"))
+        conf = tk_split_list(tk_send_without_enc('paneconfigure', 
+                                                 win, "-#{key}"), 
+                             false, true)
+        key = conf.shift[1..-1]
+        if key == 'hide'
+          conf[2] = bool(conf[2]) unless conf[2].empty?
+          conf[3] = bool(conf[3]) unless conf[3].empty?
+        end
+        { key => conf }
+      else
+        ret = {}
+        #tk_split_simplelist(tk_send_without_enc('paneconfigure', 
+        #                                        win)).each{|conflist|
+        #  conf = tk_split_simplelist(conflist)
+        tk_split_simplelist(tk_send_without_enc('paneconfigure', win), 
+                            false, false).each{|conflist|
+          conf = tk_split_simplelist(conflist, false, true)
+          key = conf.shift[1..-1]
+          if key
+            if key == 'hide'
+              conf[2] = bool(conf[2]) unless conf[2].empty?
+            elsif conf[2].index('{')
+              conf[2] = tk_split_list(conf[2]) 
+            else
+              conf[2] = tk_tcl2ruby(conf[2]) 
+            end
+          end
+          if conf[3]
+            if key == 'hide'
+              conf[3] = bool(conf[3]) unless conf[3].empty?
+            elsif conf[3].index('{')
+              conf[3] = tk_split_list(conf[3]) 
+            else
+              conf[3] = tk_tcl2ruby(conf[3]) 
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        ret
+      end
+    end
+  end
+  alias pane_configinfo paneconfiginfo
+
+  def current_paneconfiginfo(win, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        conf = paneconfiginfo(win, key)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        paneconfiginfo(win).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      paneconfiginfo(win, key).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+
+  alias current_pane_configinfo current_paneconfiginfo
+
+  def panes
+    list(tk_send_without_enc('panes'))
+  end
+end
+TkPanedwindow = TkPanedWindow
diff --git a/ruby_1_8_6/ext/tk/lib/tk/place.rb b/ruby_1_8_6/ext/tk/lib/tk/place.rb
new file mode 100644
index 0000000000..f7ebdfcbd6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/place.rb
@@ -0,0 +1,128 @@
+#
+# tk/place.rb : control place geometry manager
+#
+require 'tk'
+
+module TkPlace
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['place'.freeze].freeze
+
+  def configure(win, slot, value=None)
+    # for >= Tk8.4a2 ?
+    # win = win.epath if win.kind_of?(TkObject)
+    win = _epath(win)
+    if slot.kind_of? Hash
+      params = []
+      slot.each{|k, v|
+        params.push("-#{k}")
+        # params.push((v.kind_of?(TkObject))? v.epath: v)
+        params.push(_epath(v))
+      }
+      tk_call_without_enc('place', 'configure', win, *params)
+    else
+      # value = value.epath if value.kind_of?(TkObject)
+      value = _epath(value)
+      tk_call_without_enc('place', 'configure', win, "-#{slot}", value)
+    end
+  end
+  alias place configure
+
+  def configinfo(win, slot = nil)
+    # for >= Tk8.4a2 ?
+    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      # win = win.epath if win.kind_of?(TkObject)
+      win = _epath(win)
+      if slot
+        #conf = tk_split_list(tk_call_without_enc('place', 'configure', 
+        #                                        win, "-#{slot}") )
+        conf = tk_split_simplelist(tk_call_without_enc('place', 'configure', 
+                                                       win, "-#{slot}") )
+        conf[0] = conf[0][1..-1]
+        conf[1] = tk_tcl2ruby(conf[1])
+        conf[2] = tk_tcl2ruby(conf[1])
+        conf[3] = tk_tcl2ruby(conf[1])
+        conf[4] = tk_tcl2ruby(conf[1])
+        conf
+      else
+        tk_split_simplelist(tk_call_without_enc('place', 'configure', 
+                                                win)).collect{|conflist|
+          #conf = list(conflist)
+          conf = simplelist(conflist).collect!{|inf| tk_tcl2ruby(inf)}
+          conf[0] = conf[0][1..-1]
+          conf
+        }
+      end
+    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      current_configinfo(win, slot)
+    end
+  end
+
+  def current_configinfo(win, slot = nil)
+    # win = win.epath if win.kind_of?(TkObject)
+    win = _epath(win)
+    if slot
+      #conf = tk_split_list(tk_call_without_enc('place', 'configure', 
+      #                                         win, "-#{slot}") )
+      conf = tk_split_simplelist(tk_call_without_enc('place', 'configure', 
+                                                     win, "-#{slot}") )
+      # { conf[0][1..-1] => conf[1] }
+      { conf[0][1..-1] => tk_tcl2ruby(conf[4]) }
+    else
+      ret = {}
+      #tk_split_list(tk_call_without_enc('place','configure',win)).each{|conf|
+      tk_split_simplelist(tk_call_without_enc('place', 'configure', 
+                                              win)).each{|conf_list|
+        #ret[conf[0][1..-1]] = conf[1]
+        conf = simplelist(conf_list)
+        ret[conf[0][1..-1]] = tk_tcl2ruby(conf[4])
+      }
+      ret
+    end
+  end
+
+  def forget(win)
+    # win = win.epath if win.kind_of?(TkObject)
+    win = _epath(win)
+    tk_call_without_enc('place', 'forget', win)
+  end
+
+  def info(win)
+    # win = win.epath if win.kind_of?(TkObject)
+    win = _epath(win)
+    #ilist = list(tk_call_without_enc('place', 'info', win))
+    ilist = simplelist(tk_call_without_enc('place', 'info', win))
+    info = {}
+    while key = ilist.shift
+      #info[key[1..-1]] = ilist.shift
+      info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
+    end
+    return info
+  end
+
+  def slaves(master)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    list(tk_call('place', 'slaves', master))
+  end
+
+  module_function :place, :configure, :configinfo, :current_configinfo
+  module_function :forget, :info, :slaves
+end
+=begin
+def TkPlace(win, slot, value=None)
+  win = win.epath if win.kind_of?(TkObject)
+  if slot.kind_of? Hash
+    params = []
+    slot.each{|k, v|
+      params.push("-#{k}")
+      params.push((v.kind_of?(TkObject))? v.epath: v)
+    }
+    tk_call_without_enc('place', win, *params)
+  else
+    value = value.epath if value.kind_of?(TkObject)
+    tk_call_without_enc('place', win, "-#{slot}", value)
+  end
+end
+=end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/radiobutton.rb b/ruby_1_8_6/ext/tk/lib/tk/radiobutton.rb
new file mode 100644
index 0000000000..f8f67d709a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/radiobutton.rb
@@ -0,0 +1,66 @@
+#
+# tk/radiobutton.rb : treat radiobutton widget
+#
+require 'tk'
+require 'tk/button'
+
+class TkRadioButton<TkButton
+  TkCommandNames = ['radiobutton'.freeze].freeze
+  WidgetClassName = 'Radiobutton'.freeze
+  WidgetClassNames[WidgetClassName] = self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('radiobutton', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('radiobutton', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def __boolval_optkeys
+    super() << 'indicatoron'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'selectcolor'
+  end
+  private :__strval_optkeys
+
+  def __ruby2val_optkeys  # { key=>proc, ... }
+    {
+      'variable'=>proc{|v| tk_trace_variable(v)}  # for backward compatibility
+    }
+  end
+  private :__ruby2val_optkeys
+
+
+  def deselect
+    tk_send_without_enc('deselect')
+    self
+  end
+  def select
+    tk_send_without_enc('select')
+    self
+  end
+
+  def get_value
+    var = tk_send_without_enc('cget', '-variable')
+    if TkVariable::USE_TCLs_SET_VARIABLE_FUNCTIONS
+      _fromUTF8(INTERP._get_global_var(var))
+    else
+      INTERP._eval(Kernel.format('global %s; set %s', var, var))
+    end
+  end
+
+  def set_value(val)
+    var = tk_send_without_enc('cget', '-variable')
+    if TkVariable::USE_TCLs_SET_VARIABLE_FUNCTIONS
+      _fromUTF8(INTERP._set_global_var(var, _get_eval_string(val, true)))
+    else
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(Kernel.format('global %s; set %s %s', var, var, s))
+    end
+  end
+end
+TkRadiobutton = TkRadioButton
diff --git a/ruby_1_8_6/ext/tk/lib/tk/root.rb b/ruby_1_8_6/ext/tk/lib/tk/root.rb
new file mode 100644
index 0000000000..0e5584c7c1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/root.rb
@@ -0,0 +1,108 @@
+#
+# tk/root.rb : treat root widget
+#
+require 'tk'
+require 'tk/wm'
+require 'tk/menuspec'
+
+class TkRoot<TkWindow
+  include Wm
+  include TkMenuSpec
+
+  def __methodcall_optkeys  # { key=>method, ... }
+    TOPLEVEL_METHODCALL_OPTKEYS
+  end
+  private :__methodcall_optkeys
+
+=begin
+  ROOT = []
+  def TkRoot.new(keys=nil)
+    if ROOT[0]
+      Tk_WINDOWS["."] = ROOT[0]
+      return ROOT[0]
+    end
+    new = super(:without_creating=>true, :widgetname=>'.')
+    if keys  # wm commands
+      keys.each{|k,v|
+        if v.kind_of? Array
+          new.send(k,*v)
+        else
+          new.send(k,v)
+        end
+      }
+    end
+    ROOT[0] = new
+    Tk_WINDOWS["."] = new
+  end
+=end
+  def TkRoot.new(keys=nil, &b)
+    unless TkCore::INTERP.tk_windows['.']
+      TkCore::INTERP.tk_windows['.'] = 
+        super(:without_creating=>true, :widgetname=>'.'){}
+    end
+    root = TkCore::INTERP.tk_windows['.']
+
+    keys = _symbolkey2str(keys)
+
+    # wm commands
+    root.instance_eval{
+      __methodcall_optkeys.each{|key, method|
+        value = keys.delete(key.to_s)
+        self.__send__(method, value) if value
+      }
+    }
+
+    if keys  # wm commands ( for backward comaptibility )
+      keys.each{|k,v|
+        if v.kind_of? Array
+          root.__send__(k,*v)
+        else
+          root.__send__(k,v)
+        end
+      }
+    end
+
+    root.instance_eval(&b) if block_given?
+    root
+  end
+
+  WidgetClassName = 'Tk'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.to_eval
+    # self::WidgetClassName
+    '.'
+  end
+
+  def create_self
+    @path = '.'
+  end
+  private :create_self
+
+  def path
+    "."
+  end
+
+  def add_menu(menu_info, tearoff=false, opts=nil)
+    # See tk/menuspec.rb for menu_info.
+    # opts is a hash of default configs for all of cascade menus. 
+    # Configs of menu_info can override it. 
+    if tearoff.kind_of?(Hash)
+      opts = tearoff
+      tearoff = false
+    end
+    _create_menubutton(self, menu_info, tearoff, opts)
+  end
+
+  def add_menubar(menu_spec, tearoff=false, opts=nil)
+    # See tk/menuspec.rb for menu_spec.
+    # opts is a hash of default configs for all of cascade menus.
+    # Configs of menu_spec can override it. 
+    menu_spec.each{|info| add_menu(info, tearoff, opts)}
+    self.menu
+  end
+
+  def TkRoot.destroy
+    TkCore::INTERP._invoke('destroy', '.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/scale.rb b/ruby_1_8_6/ext/tk/lib/tk/scale.rb
new file mode 100644
index 0000000000..0b703aa055
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/scale.rb
@@ -0,0 +1,86 @@
+#
+# tk/scale.rb : treat scale widget
+#
+require 'tk'
+
+class TkScale<TkWindow
+  TkCommandNames = ['scale'.freeze].freeze
+  WidgetClassName = 'Scale'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def create_self(keys)
+    if keys and keys != None
+      if keys.key?('command') && ! keys['command'].kind_of?(String)
+        cmd = keys.delete('command')
+        keys['command'] = proc{|val| cmd.call(val.to_f)}
+      end
+      #tk_call_without_enc('scale', @path, *hash_kv(keys, true))
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      #tk_call_without_enc('scale', @path)
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def __strval_optkeys
+    super() << 'label'
+  end
+  private :__strval_optkeys
+
+  def _wrap_command_arg(cmd)
+    proc{|val|
+      if val.kind_of?(String)
+        cmd.call(number(val))
+      else
+        cmd.call(val)
+      end
+    }
+  end
+  private :_wrap_command_arg
+
+  def configure_cmd(slot, value)
+    configure(slot=>value)
+  end
+
+  def configure(slot, value=None)
+    if (slot == 'command' || slot == :command)
+      configure('command'=>value)
+    elsif slot.kind_of?(Hash) && 
+        (slot.key?('command') || slot.key?(:command))
+      slot = _symbolkey2str(slot)
+      slot['command'] = _wrap_command_arg(slot.delete('command'))
+    end
+    super(slot, value)
+  end
+
+  def command(cmd=Proc.new)
+    configure('command'=>cmd)
+  end
+
+  def get(x=None, y=None)
+    number(tk_send_without_enc('get', x, y))
+  end
+
+  def coords(val=None)
+    tk_split_list(tk_send_without_enc('coords', val))
+  end
+
+  def identify(x, y)
+    tk_send_without_enc('identify', x, y)
+  end
+
+  def set(val)
+    tk_send_without_enc('set', val)
+  end
+
+  def value
+    get
+  end
+
+  def value= (val)
+    set(val)
+    val
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/scrollable.rb b/ruby_1_8_6/ext/tk/lib/tk/scrollable.rb
new file mode 100644
index 0000000000..96959b7a4b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/scrollable.rb
@@ -0,0 +1,82 @@
+#
+# tk/scrollable.rb : module for scrollable widget
+#
+require 'tk'
+
+module Tk
+  module XScrollable
+    def xscrollcommand(cmd=Proc.new)
+      configure_cmd 'xscrollcommand', cmd
+      # Tk.update  # avoid scrollbar trouble
+      self
+    end
+
+    def xview(*index)
+      if index.size == 0
+        list(tk_send_without_enc('xview'))
+      else
+        tk_send_without_enc('xview', *index)
+        self
+      end
+    end
+    def xview_moveto(*index)
+      xview('moveto', *index)
+    end
+    def xview_scroll(*index)
+      xview('scroll', *index)
+    end
+
+    def xscrollbar(bar=nil)
+      if bar
+        @xscrollbar = bar
+        @xscrollbar.orient 'horizontal'
+        self.xscrollcommand {|*arg| @xscrollbar.set(*arg)}
+        @xscrollbar.command {|*arg| self.xview(*arg)}
+        Tk.update  # avoid scrollbar trouble
+      end
+      @xscrollbar
+    end
+  end
+
+  module YScrollable
+    def yscrollcommand(cmd=Proc.new)
+      configure_cmd 'yscrollcommand', cmd
+      # Tk.update  # avoid scrollbar trouble
+      self
+    end
+
+    def yview(*index)
+      if index.size == 0
+        list(tk_send_without_enc('yview'))
+      else
+        tk_send_without_enc('yview', *index)
+        self
+      end
+    end
+    def yview_moveto(*index)
+      yview('moveto', *index)
+    end
+    def yview_scroll(*index)
+      yview('scroll', *index)
+    end
+
+    def yscrollbar(bar=nil)
+      if bar
+        @yscrollbar = bar
+        @yscrollbar.orient 'vertical'
+        self.yscrollcommand {|*arg| @yscrollbar.set(*arg)}
+        @yscrollbar.command {|*arg| self.yview(*arg)}
+        Tk.update  # avoid scrollbar trouble
+      end
+      @yscrollbar
+    end
+  end
+
+  X_Scrollable = XScrollable
+  Y_Scrollable = YScrollable
+
+  module Scrollable
+    include XScrollable
+    include YScrollable
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/scrollbar.rb b/ruby_1_8_6/ext/tk/lib/tk/scrollbar.rb
new file mode 100644
index 0000000000..70aadfdd4c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/scrollbar.rb
@@ -0,0 +1,124 @@
+#
+# tk/scrollbar.rb : treat scrollbar widget
+#
+require 'tk'
+
+class TkScrollbar<TkWindow
+  TkCommandNames = ['scrollbar'.freeze].freeze
+  WidgetClassName = 'Scrollbar'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def create_self(keys)
+    @assigned = []
+    @scroll_proc = proc{|*args| 
+      if self.orient == 'horizontal'
+        @assigned.each{|w| w.xview(*args)}
+      else # 'vertical'
+        @assigned.each{|w| w.yview(*args)}
+      end
+    }
+
+    if keys and keys != None
+      #tk_call_without_enc('scrollbar', @path, *hash_kv(keys, true))
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      #tk_call_without_enc('scrollbar', @path)
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def propagate_set(src_win, first, last)
+    self.set(first, last)
+    if self.orient == 'horizontal'
+      @assigned.each{|w| w.xview('moveto', first) if w != src_win}
+    else # 'vertical'
+      @assigned.each{|w| w.yview('moveto', first) if w != src_win}
+    end
+  end
+
+  def assign(*wins)
+    begin
+      self.command(@scroll_proc) if self.cget('command').cmd != @scroll_proc
+    rescue Exception
+      self.command(@scroll_proc)
+    end
+    orient = self.orient
+    wins.each{|w|
+      @assigned << w unless @assigned.index(w)
+      if orient == 'horizontal'
+        w.xscrollcommand proc{|first, last| self.propagate_set(w, first, last)}
+      else # 'vertical'
+        w.yscrollcommand proc{|first, last| self.propagate_set(w, first, last)}
+      end
+    }
+    Tk.update  # avoid scrollbar trouble
+    self
+  end
+
+  def assigned_list
+    begin
+      return @assigned.dup if self.cget('command').cmd == @scroll_proc
+    rescue Exception
+    end
+    fail RuntimeError, "not depend on the assigned_list"
+  end
+
+  def configure(*args)
+    ret = super(*args)
+    # Tk.update  # avoid scrollbar trouble
+    ret
+  end
+
+  #def delta(deltax=None, deltay=None)
+  def delta(deltax, deltay)
+    number(tk_send_without_enc('delta', deltax, deltay))
+  end
+
+  #def fraction(x=None, y=None)
+  def fraction(x, y)
+    number(tk_send_without_enc('fraction', x, y))
+  end
+
+  def identify(x, y)
+    tk_send_without_enc('identify', x, y)
+  end
+
+  def get
+    #ary1 = tk_send('get').split
+    #ary2 = []
+    #for i in ary1
+    #  ary2.push number(i)
+    #end
+    #ary2
+    list(tk_send_without_enc('get'))
+  end
+
+  def set(first, last)
+    tk_send_without_enc('set', first, last)
+    self
+  end
+
+  def activate(element=None)
+    tk_send_without_enc('activate', element)
+  end
+end
+
+class TkXScrollbar<TkScrollbar
+  def create_self(keys)
+    keys = {} unless keys
+    keys['orient'] = 'horizontal'
+    super(keys)
+  end
+  private :create_self
+end
+
+class TkYScrollbar<TkScrollbar
+  def create_self(keys)
+    keys = {} unless keys
+    keys['orient'] = 'vertical'
+    super(keys)
+  end
+  private :create_self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/scrollbox.rb b/ruby_1_8_6/ext/tk/lib/tk/scrollbox.rb
new file mode 100644
index 0000000000..fd04057fb6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/scrollbox.rb
@@ -0,0 +1,36 @@
+#
+#               tk/scrollbox.rb - Tk Listbox with Scrollbar
+#                                 as an example of Composite Widget
+#                       $Date$
+#                       by Yukihiro Matsumoto <matz@netlab.co.jp>
+#
+require 'tk'
+require 'tk/listbox'
+
+class TkScrollbox<TkListbox
+  include TkComposite
+  def initialize_composite(keys=nil)
+    list = TkListbox.new(@frame)
+    scroll = TkScrollbar.new(@frame)
+    @path = list.path
+
+=begin
+    list.configure 'yscroll', scroll.path+" set"
+    list.pack 'side'=>'left','fill'=>'both','expand'=>'yes'
+    scroll.configure 'command', list.path+" yview"
+    scroll.pack 'side'=>'right','fill'=>'y'
+=end
+    list.yscrollbar(scroll)
+    list.pack('side'=>'left','fill'=>'both','expand'=>'yes')
+    scroll.pack('side'=>'right','fill'=>'y')
+
+    delegate('DEFAULT', list)
+    delegate('foreground', list)
+    delegate('background', list, scroll)
+    delegate('borderwidth', @frame)
+    delegate('relief', @frame)
+
+    configure keys if keys
+  end
+  private :initialize_composite
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/selection.rb b/ruby_1_8_6/ext/tk/lib/tk/selection.rb
new file mode 100644
index 0000000000..5caa6ef8ef
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/selection.rb
@@ -0,0 +1,86 @@
+#
+# tk/selection.rb : control selection
+#
+require 'tk'
+
+module TkSelection
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['selection'.freeze].freeze
+
+  def self.clear(sel=nil)
+    if sel
+      tk_call_without_enc('selection', 'clear', '-selection', sel)
+    else
+      tk_call_without_enc('selection', 'clear')
+    end
+  end
+  def self.clear_on_display(win, sel=nil)
+    if sel
+      tk_call_without_enc('selection', 'clear', 
+                          '-displayof', win, '-selection', sel)
+    else
+      tk_call_without_enc('selection', 'clear', '-displayof', win)
+    end
+  end
+  def clear(sel=nil)
+    TkSelection.clear_on_display(self, sel)
+    self
+  end
+
+  def self.get(keys=nil)
+    #tk_call('selection', 'get', *hash_kv(keys))
+    _fromUTF8(tk_call_without_enc('selection', 'get', *hash_kv(keys)))
+  end
+  def self.get_on_display(win, keys=nil)
+    #tk_call('selection', 'get', '-displayof', win, *hash_kv(keys))
+    _fromUTF8(tk_call_without_enc('selection', 'get', '-displayof', 
+                                  win, *hash_kv(keys)))
+  end
+  def get(keys=nil)
+    TkSelection.get_on_display(self, sel)
+  end
+
+  def self.handle(win, func=Proc.new, keys=nil, &b)
+    if func.kind_of?(Hash) && keys == nil
+      keys = func
+      func = Proc.new(&b)
+    end
+    args = ['selection', 'handle']
+    args.concat(hash_kv(keys))
+    args.concat([win, func])
+    tk_call_without_enc(*args)
+  end
+  def handle(func=Proc.new, keys=nil, &b)
+    TkSelection.handle(self, func, keys, &b)
+  end
+
+  def self.get_owner(sel=nil)
+    if sel
+      window(tk_call_without_enc('selection', 'own', '-selection', sel))
+    else
+      window(tk_call_without_enc('selection', 'own'))
+    end
+  end
+  def self.get_owner_on_display(win, sel=nil)
+    if sel
+      window(tk_call_without_enc('selection', 'own', 
+                                 '-displayof', win, '-selection', sel))
+    else
+      window(tk_call_without_enc('selection', 'own', '-displayof', win))
+    end
+  end
+  def get_owner(sel=nil)
+    TkSelection.get_owner_on_display(self, sel)
+    self
+  end
+
+  def self.set_owner(win, keys=nil)
+    tk_call_without_enc('selection', 'own', *(hash_kv(keys) << win))
+  end
+  def set_owner(keys=nil)
+    TkSelection.set_owner(self, keys)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/spinbox.rb b/ruby_1_8_6/ext/tk/lib/tk/spinbox.rb
new file mode 100644
index 0000000000..9a10977d12
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/spinbox.rb
@@ -0,0 +1,99 @@
+#
+#               tk/spinbox.rb - Tk spinbox classes
+#                       $Date$
+#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
+#
+require 'tk'
+require 'tk/entry'
+
+class TkSpinbox<TkEntry
+  TkCommandNames = ['spinbox'.freeze].freeze
+  WidgetClassName = 'Spinbox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  class SpinCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?d, ?s, :direction ], 
+        [ ?s, ?e, :current ], 
+        [ ?W, ?w, :widget ], 
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?s, TkComm.method(:string) ], 
+        [ ?w, TkComm.method(:window) ], 
+
+        [ ?e, proc{|val|
+            #enc = Tk.encoding
+            enc = ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
+            if enc
+              Tk.fromUTF8(TkComm::string(val), enc)
+            else
+              TkComm::string(val)
+            end
+          }
+        ], 
+
+        nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        (val)? '1': '0'
+      end
+    end
+
+    def self._config_keys
+      ['command']
+    end
+  end
+
+  def __validation_class_list
+    super() << SpinCommand
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, SpinCommand)
+
+  #def create_self(keys)
+  #  tk_call_without_enc('spinbox', @path)
+  #  if keys and keys != None
+  #    configure(keys)
+  #  end
+  #end
+  #private :create_self
+
+  def __boolval_optkeys
+    super() << 'wrap'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'buttonbackground' << 'format'
+  end
+  private :__strval_optkeys
+
+  def __listval_optkeys
+    super() << 'values'
+  end
+  private :__listval_optkeys
+
+  def identify(x, y)
+    tk_send_without_enc('identify', x, y)
+  end
+
+  def spinup
+    tk_send_without_enc('invoke', 'spinup')
+    self
+  end
+
+  def spindown
+    tk_send_without_enc('invoke', 'spindown')
+    self
+  end
+
+  def set(str)
+    _fromUTF8(tk_send_without_enc('set', _get_eval_enc_str(str)))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/tagfont.rb b/ruby_1_8_6/ext/tk/lib/tk/tagfont.rb
new file mode 100644
index 0000000000..a1807395d2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/tagfont.rb
@@ -0,0 +1,43 @@
+#
+# tk/tagfont.rb : control font of tags
+#
+require 'tk'
+
+module TkTreatTagFont
+  def font_configinfo
+    @parent.tagfont_configinfo(@id)
+  end
+#  alias font font_configinfo
+
+  def font_configure(slot)
+    @parent.tagfont_configure(@id, slot)
+    self
+  end
+
+  def latinfont_configure(ltn, keys=nil)
+    @parent.latintagfont_configure(@id, ltn, keys)
+    self
+  end
+  alias asciifont_configure latinfont_configure
+
+  def kanjifont_configure(knj, keys=nil)
+    @parent.kanjitagfont_configure(@id, ltn, keys)
+    self
+  end
+
+  def font_copy(win, wintag=nil)
+    @parent.tagfont_copy(@id, win, wintag)
+    self
+  end
+
+  def latinfont_copy(win, wintag=nil)
+    @parent.latintagfont_copy(@id, win, wintag)
+    self
+  end
+  alias asciifont_copy latinfont_copy
+
+  def kanjifont_copy(win, wintag=nil)
+    @parent.kanjitagfont_copy(@id, win, wintag)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/text.rb b/ruby_1_8_6/ext/tk/lib/tk/text.rb
new file mode 100644
index 0000000000..49d4b5625b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/text.rb
@@ -0,0 +1,1550 @@
+#
+#               tk/text.rb - Tk text classes
+#                       $Date$
+#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
+require 'tk'
+require 'tk/itemfont'
+require 'tk/itemconfig'
+require 'tk/scrollable'
+require 'tk/txtwin_abst'
+
+module TkTextTagConfig
+  include TkTreatItemFont
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)  # id := [ type, tagOrId ]
+    [self.path, id[0], 'cget', id[1]]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)  # id := [ type, tagOrId ]
+    [self.path, id[0], 'configure', id[1]]
+  end
+  private :__item_config_cmd
+
+  def __item_pathname(id)
+    if id.kind_of?(Array)
+      id = tagid(id[1])
+    end
+    [self.path, id].join(';')
+  end
+  private :__item_pathname
+
+  def tag_cget(tagOrId, option)
+    itemcget(['tag', tagOrId], option)
+  end
+  def tag_configure(tagOrId, slot, value=None)
+    itemconfigure(['tag', tagOrId], slot, value)
+  end
+  def tag_configinfo(tagOrId, slot=nil)
+    itemconfigure(['tag', tagOrId], slot)
+  end
+  def current_tag_configinfo(tagOrId, slot=nil)
+    itemconfigure(['tag', tagOrId], slot)
+  end
+
+  def window_cget(tagOrId, option)
+    itemcget(['window', tagOrId], option)
+  end
+  def window_configure(tagOrId, slot, value=None)
+    itemconfigure(['window', tagOrId], slot, value)
+  end
+  def window_configinfo(tagOrId, slot=nil)
+    itemconfigure(['window', tagOrId], slot)
+  end
+  def current_window_configinfo(tagOrId, slot=nil)
+    itemconfigure(['window', tagOrId], slot)
+  end
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+end
+
+class TkText<TkTextWin
+  ItemConfCMD = ['tag'.freeze, 'configure'.freeze].freeze
+  #include TkTreatTextTagFont
+  include TkTextTagConfig
+  include Scrollable
+
+  #######################################
+
+  module IndexModMethods
+    def +(mod)
+      return chars(mod) if mod.kind_of?(Numeric)
+
+      mod = mod.to_s
+      if mod =~ /^\s*[+-]?\d/
+        TkText::IndexString.new(String.new(id) << ' + ' << mod)
+      else
+        TkText::IndexString.new(String.new(id) << ' ' << mod)
+      end
+    end
+
+    def -(mod)
+      return chars(-mod) if mod.kind_of?(Numeric)
+
+      mod = mod.to_s
+      if mod =~ /^\s*[+-]?\d/
+        TkText::IndexString.new(String.new(id) << ' - ' << mod)
+      elsif mod =~ /^\s*[-]\s+(\d.*)$/
+        TkText::IndexString.new(String.new(id) << ' - -' << $1)
+      else
+        TkText::IndexString.new(String.new(id) << ' ' << mod)
+      end
+    end
+
+    def chars(mod)
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' chars')
+      else
+        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' chars')
+      end
+    end
+    alias char chars
+
+    def display_chars(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display chars')
+      else
+        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display chars')
+      end
+    end
+    alias display_char display_chars
+
+    def any_chars(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any chars')
+      else
+        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any chars')
+      end
+    end
+    alias any_char any_chars
+
+    def indices(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' indices')
+      else
+        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' indices')
+      end
+    end
+
+    def display_indices(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display indices')
+      else
+        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display indices')
+      end
+    end
+
+    def any_indices(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any indices')
+      else
+        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any indices')
+      end
+    end
+
+    def lines(mod)
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' lines')
+      else
+        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' lines')
+      end
+    end
+    alias line lines
+
+    def display_lines(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display_lines')
+      else
+        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display lines')
+      end
+    end
+    alias display_line display_lines
+
+    def any_lines(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        TkText::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any_lines')
+      else
+        TkText::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any lines')
+      end
+    end
+    alias any_line any_lines
+
+    def linestart
+      TkText::IndexString.new(String.new(id) << ' linestart')
+    end
+    def lineend
+      TkText::IndexString.new(String.new(id) << ' lineend')
+    end
+
+    def display_linestart
+      # Tk8.5 feature
+      TkText::IndexString.new(String.new(id) << ' display linestart')
+    end
+    def display_lineend
+      # Tk8.5 feature
+      TkText::IndexString.new(String.new(id) << ' display lineend')
+    end
+
+    def wordstart
+      TkText::IndexString.new(String.new(id) << ' wordstart')
+    end
+    def wordend
+      TkText::IndexString.new(String.new(id) << ' wordend')
+    end
+
+    def display_wordstart
+      # Tk8.5 feature
+      TkText::IndexString.new(String.new(id) << ' display wordstart')
+    end
+    def display_wordend
+      # Tk8.5 feature
+      TkText::IndexString.new(String.new(id) << ' display wordend')
+    end
+  end
+
+  class IndexString < String
+    include IndexModMethods
+
+    def self.at(x,y)
+      self.new("@#{x},#{y}")
+    end
+
+    def self.new(str)
+      if str.kind_of?(String)
+        super(str)
+      elsif str.kind_of?(Symbol)
+        super(str.to_s)
+      else
+        str
+      end
+    end
+
+    def id
+      self
+    end
+  end
+
+  #######################################
+
+  TkCommandNames = ['text'.freeze].freeze
+  WidgetClassName = 'Text'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.new(*args, &block)
+    obj = super(*args){}
+    obj.init_instance_variable
+    obj.instance_eval(&block) if defined? yield
+    obj
+  end
+
+  def init_instance_variable
+    @cmdtbl = []
+    @tags = {}
+  end
+
+  def __destroy_hook__
+    TkTextTag::TTagID_TBL.delete(@path)
+    TkTextMark::TMarkID_TBL.delete(@path)
+  end
+
+  def create_self(keys)
+    #if keys and keys != None
+    #  #tk_call_without_enc('text', @path, *hash_kv(keys, true))
+    #  tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+    #                     *hash_kv(keys, true))
+    #else
+    #  #tk_call_without_enc('text', @path)
+    #  tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    #end
+    super(keys)
+    init_instance_variable
+  end
+  private :create_self
+
+  def __strval_optkeys
+    super() << 'inactiveseletcionbackground'
+  end
+  private :__strval_optkeys
+
+  def self.at(x, y)
+    TkText::IndexString.at(x, y)
+  end
+
+  def at(x, y)
+    TkText::IndexString.at(x, y)
+  end
+
+  def index(idx)
+    TkText::IndexString.new(tk_send_without_enc('index', 
+                                                _get_eval_enc_str(idx)))
+  end
+
+  def get_displaychars(*index)
+    # Tk8.5 feature
+    get('-displaychars', *index)
+  end
+
+  def value
+    _fromUTF8(tk_send_without_enc('get', "1.0", "end - 1 char"))
+  end
+
+  def value= (val)
+    tk_send_without_enc('delete', "1.0", 'end')
+    tk_send_without_enc('insert', "1.0", _get_eval_enc_str(val))
+    val
+  end
+
+  def clear
+    tk_send_without_enc('delete', "1.0", 'end')
+    self
+  end
+  alias erase clear
+
+  def _addcmd(cmd)
+    @cmdtbl.push cmd
+  end
+
+  def _addtag(name, obj)
+    @tags[name] = obj
+  end
+
+  def tagid(tag)
+    if tag.kind_of?(TkTextTag) \
+      || tag.kind_of?(TkTextMark) \
+      || tag.kind_of?(TkTextImage) \
+      || tag.kind_of?(TkTextWindow)
+      tag.id
+    else
+      tag  # maybe an Array of configure paramters
+    end
+  end
+  private :tagid
+
+  def tagid2obj(tagid)
+    if @tags[tagid]
+      @tags[tagid]
+    else
+      tagid
+    end
+  end
+
+  def tag_names(index=None)
+    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag', 'names', _get_eval_enc_str(index)))).collect{|elt|
+    tk_split_simplelist(tk_send_without_enc('tag', 'names', _get_eval_enc_str(index)), false, true).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def mark_names
+    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('mark', 'names'))).collect{|elt|
+    tk_split_simplelist(tk_send_without_enc('mark', 'names'), false, true).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def mark_gravity(mark, direction=nil)
+    if direction
+      tk_send_without_enc('mark', 'gravity', 
+                          _get_eval_enc_str(mark), direction)
+      self
+    else
+      tk_send_without_enc('mark', 'gravity', _get_eval_enc_str(mark))
+    end
+  end
+
+  def mark_set(mark, index)
+    tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark), 
+                        _get_eval_enc_str(index))
+    self
+  end
+  alias set_mark mark_set
+
+  def mark_unset(*marks)
+    tk_send_without_enc('mark', 'unset', 
+                        *(marks.collect{|mark| _get_eval_enc_str(mark)}))
+    self
+  end
+  alias unset_mark mark_unset
+
+  def mark_next(index)
+    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next', 
+                                            _get_eval_enc_str(index))))
+  end
+  alias next_mark mark_next
+
+  def mark_previous(index)
+    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous', 
+                                            _get_eval_enc_str(index))))
+  end
+  alias previous_mark mark_previous
+
+  def image_cget(index, slot)
+    case slot.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      _fromUTF8(tk_send_without_enc('image', 'cget', 
+                                    _get_eval_enc_str(index), "-#{slot}"))
+    else
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget', 
+                                                _get_eval_enc_str(index), 
+                                                "-#{slot}")))
+    end
+  end
+
+  def image_configure(index, slot, value=None)
+    if slot.kind_of?(Hash)
+      _fromUTF8(tk_send_without_enc('image', 'configure', 
+                                    _get_eval_enc_str(index), 
+                                    *hash_kv(slot, true)))
+    else
+      _fromUTF8(tk_send_without_enc('image', 'configure', 
+                                    _get_eval_enc_str(index), 
+                                    "-#{slot}", 
+                                    _get_eval_enc_str(value)))
+    end
+    self
+  end
+
+  def image_configinfo(index, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        case slot.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
+        else
+          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        # tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).collect{|conflist|
+        #  conf = tk_split_simplelist(conflist)
+        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).collect{|conflist|
+          conf = tk_split_simplelist(conflist, false, true)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4]) 
+              else
+                conf[4] = tk_tcl2ruby(conf[4]) 
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        case slot.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
+        else
+          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).each{|conflist|
+        #  conf = tk_split_simplelist(conflist)
+        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).each{|conflist|
+          conf = tk_split_simplelist(conflist, false, true)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2]) 
+              else
+                conf[2] = tk_tcl2ruby(conf[2]) 
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        ret
+      end
+    end
+  end
+
+  def current_image_configinfo(index, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        conf = image_configinfo(index, slot)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        image_configinfo(index).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      image_configinfo(index, slot).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+
+  def image_names
+    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'names'))).collect{|elt|
+    tk_split_simplelist(tk_send_without_enc('image', 'names'), false, true).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def set_insert(index)
+    tk_send_without_enc('mark','set','insert', _get_eval_enc_str(index))
+    self
+  end
+
+  def set_current(index)
+    tk_send_without_enc('mark','set','current', _get_eval_enc_str(index))
+    self
+  end
+
+  def insert(index, chars, *tags)
+    if tags[0].kind_of?(Array)
+      # multiple chars-taglist argument :: str, [tag,...], str, [tag,...], ...
+      args = [chars]
+      while tags.size > 0
+        args << tags.shift.collect{|x|_get_eval_string(x)}.join(' ')  # taglist
+        args << tags.shift if tags.size > 0                           # chars
+      end
+      super(index, *args)
+    else
+      # single chars-taglist argument :: str, tag, tag, ...
+      if tags.size == 0
+        super(index, chars)
+      else
+        super(index, chars, tags.collect{|x|_get_eval_string(x)}.join(' '))
+      end
+    end
+  end
+
+  def destroy
+    @tags = {} unless @tags
+    @tags.each_value do |t|
+      t.destroy
+    end
+    super()
+  end
+
+  def backspace
+    self.delete 'insert'
+  end
+
+  def bbox(index)
+    list(tk_send_without_enc('bbox', _get_eval_enc_str(index)))
+  end
+
+  def compare(idx1, op, idx2)
+    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1), 
+                             op, _get_eval_enc_str(idx2)))
+  end
+
+  def count(idx1, idx2, *opts)
+    # opts are Tk8.5 feature
+    cnt = 0
+    args = opts.collect{|opt|
+      str = opt.to_s
+      cnt += 1 if str != 'update'
+      '-' + str
+    }
+    args << _get_eval_enc_str(idx1) << _get_eval_enc_str(idx2)
+    if cnt <= 1
+      number(tk_send_without_enc('count', *opts))
+    else
+      list(tk_send_without_enc('count', *opts))
+    end
+  end
+
+  def count_info(idx1, idx2, update=true)
+    # Tk8.5 feature
+    opts = [
+      :chars, :displaychars, :displayindices, :displaylines, 
+      :indices, :lines, :xpixels, :ypixels
+    ]
+    if update
+      lst = count(idx1, idx2, :update, *opts)
+    else
+      lst = count(idx1, idx2, *opts)
+    end
+    info = {}
+    opts.each_with_index{|key, idx| info[key] = lst[idx]}
+    info
+  end
+
+  def peer_names()
+    # Tk8.5 feature
+    list(tk_send_without_enc('peer', 'names'))
+  end
+
+  def replace(idx1, idx2, *opts)
+    tk_send('replace', idx1, idx2, *opts)
+    self
+  end
+
+  def debug
+    bool(tk_send_without_enc('debug'))
+  end
+  def debug=(boolean)
+    tk_send_without_enc('debug', boolean)
+    #self
+    boolean
+  end
+
+  def dlineinfo(index)
+    list(tk_send_without_enc('dlineinfo', _get_eval_enc_str(index)))
+  end
+
+  def modified?
+    bool(tk_send_without_enc('edit', 'modified'))
+  end
+  def modified(mode)
+    tk_send_without_enc('edit', 'modified', mode)
+    self
+  end
+  def modified=(mode)
+    modified(mode)
+    mode
+  end
+
+  def edit_redo
+    tk_send_without_enc('edit', 'redo')
+    self
+  end
+  def edit_reset
+    tk_send_without_enc('edit', 'reset')
+    self
+  end
+  def edit_separator
+    tk_send_without_enc('edit', 'separator')
+    self
+  end
+  def edit_undo
+    tk_send_without_enc('edit', 'undo')
+    self
+  end
+
+  def xview_pickplace(index)
+    tk_send_without_enc('xview', '-pickplace', _get_eval_enc_str(index))
+    self
+  end
+
+  def yview_pickplace(index)
+    tk_send_without_enc('yview', '-pickplace', _get_eval_enc_str(index))
+    self
+  end
+
+  def text_copy
+    # Tk8.4 feature
+    tk_call_without_enc('tk_textCopy', @path)
+    self
+  end
+
+  def text_cut
+    # Tk8.4 feature
+    tk_call_without_enc('tk_textCut', @path)
+    self
+  end
+
+  def text_paste
+    # Tk8.4 feature
+    tk_call_without_enc('tk_textPaste', @path)
+    self
+  end
+
+  def tag_add(tag, index1, index2=None)
+    tk_send_without_enc('tag', 'add', _get_eval_enc_str(tag), 
+                        _get_eval_enc_str(index1), 
+                        _get_eval_enc_str(index2))
+    self
+  end
+  alias addtag tag_add
+  alias add_tag tag_add
+
+  def tag_delete(*tags)
+    tk_send_without_enc('tag', 'delete', 
+                        *(tags.collect{|tag| _get_eval_enc_str(tag)}))
+    if TkTextTag::TTagID_TBL[@path]
+      tags.each{|tag|
+        if tag.kind_of?(TkTextTag)
+          TkTextTag::TTagID_TBL[@path].delete(tag.id) 
+        else
+          TkTextTag::TTagID_TBL[@path].delete(tag) 
+        end
+      }
+    end
+    self
+  end
+  alias deltag tag_delete
+  alias delete_tag tag_delete
+
+  #def tag_bind(tag, seq, cmd=Proc.new, *args)
+  #  _bind([@path, 'tag', 'bind', tag], seq, cmd, *args)
+  #  self
+  #end
+  def tag_bind(tag, seq, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([@path, 'tag', 'bind', tag], seq, cmd, *args)
+    self
+  end
+
+  #def tag_bind_append(tag, seq, cmd=Proc.new, *args)
+  #  _bind_append([@path, 'tag', 'bind', tag], seq, cmd, *args)
+  #  self
+  #end
+  def tag_bind_append(tag, seq, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([@path, 'tag', 'bind', tag], seq, cmd, *args)
+    self
+  end
+
+  def tag_bind_remove(tag, seq)
+    _bind_remove([@path, 'tag', 'bind', tag], seq)
+    self
+  end
+
+  def tag_bindinfo(tag, context=nil)
+    _bindinfo([@path, 'tag', 'bind', tag], context)
+  end
+
+=begin
+  def tag_cget(tag, key)
+    case key.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      tk_call_without_enc(@path, 'tag', 'cget', 
+                          _get_eval_enc_str(tag), "-#{key}")
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_send('tag', 'cget', tag, "-#{key}"))
+      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('tag','cget',_get_eval_enc_str(tag),'-font')))
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(tag, fnt)
+      end
+      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@path,'tag','cget',_get_eval_enc_str(tag),"-#{key}")))
+    end
+  end
+
+  def tag_configure(tag, key, val=None)
+    if key.kind_of?(Hash)
+      key = _symbolkey2str(key)
+      if ( key['font'] || key['kanjifont'] \
+          || key['latinfont'] || key['asciifont'] )
+        tagfont_configure(tag, key)
+      else
+        tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag), 
+                            *hash_kv(key, true))
+      end
+
+    else
+      if  key == 'font' || key == :font || 
+          key == 'kanjifont' || key == :kanjifont ||
+          key == 'latinfont' || key == :latinfont || 
+          key == 'asciifont' || key == :asciifont
+        if val == None
+          tagfontobj(tag)
+        else
+          tagfont_configure(tag, {key=>val})
+        end
+      else
+        tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag), 
+                            "-#{key}", _get_eval_enc_str(val))
+      end
+    end
+    self
+  end
+
+  def tag_configinfo(tag, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
+          conf[4] = tagfont_configinfo(tag, conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        ret = tk_split_simplelist(_fromUTF8(tk_send('tag','configure',_get_eval_enc_str(tag)))).collect{|conflist|
+          conf = tk_split_simplelist(conflist)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4]) 
+              else
+                conf[4] = tk_tcl2ruby(conf[4]) 
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+        fontconf = ret.assoc('font')
+        if fontconf
+          ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
+          fontconf[4] = tagfont_configinfo(tag, fontconf[4])
+          ret.push(fontconf)
+        else
+          ret
+        end
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
+          conf[4] = tagfont_configinfo(tag, conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        tk_split_simplelist(_fromUTF8(tk_send('tag','configure',_get_eval_enc_str(tag)))).each{|conflist|
+          conf = tk_split_simplelist(conflist)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2]) 
+              else
+                conf[2] = tk_tcl2ruby(conf[2]) 
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        fontconf = ret['font']
+        if fontconf
+          ret.delete('font')
+          ret.delete('kanjifont')
+          fontconf[3] = tagfont_configinfo(tag, fontconf[3])
+          ret['font'] = fontconf
+        end
+        ret
+      end
+    end
+  end
+
+  def current_tag_configinfo(tag, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        conf = tag_configinfo(tag, key)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        tag_configinfo(tag).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      tag_configinfo(tag, key).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+=end
+
+  def tag_raise(tag, above=None)
+    tk_send_without_enc('tag', 'raise', _get_eval_enc_str(tag), 
+                        _get_eval_enc_str(above))
+    self
+  end
+
+  def tag_lower(tag, below=None)
+    tk_send_without_enc('tag', 'lower', _get_eval_enc_str(tag), 
+                        _get_eval_enc_str(below))
+    self
+  end
+
+  def tag_remove(tag, *indices)
+    tk_send_without_enc('tag', 'remove', _get_eval_enc_str(tag), 
+                        *(indices.collect{|idx| _get_eval_enc_str(idx)}))
+    self
+  end
+
+  def tag_ranges(tag)
+    #l = tk_split_simplelist(tk_send_without_enc('tag', 'ranges',
+    #                                            _get_eval_enc_str(tag)))
+    l = tk_split_simplelist(tk_send_without_enc('tag', 'ranges',
+                                                _get_eval_enc_str(tag)), 
+                            false, true)
+    r = []
+    while key=l.shift
+      r.push [TkText::IndexString.new(key), TkText::IndexString.new(l.shift)]
+    end
+    r
+  end
+
+  def tag_nextrange(tag, first, last=None)
+    simplelist(tk_send_without_enc('tag', 'nextrange', 
+                                   _get_eval_enc_str(tag), 
+                                   _get_eval_enc_str(first), 
+                                   _get_eval_enc_str(last))).collect{|idx|
+      TkText::IndexString.new(idx)
+    }
+  end
+
+  def tag_prevrange(tag, first, last=None)
+    simplelist(tk_send_without_enc('tag', 'prevrange', 
+                                   _get_eval_enc_str(tag), 
+                                   _get_eval_enc_str(first), 
+                                   _get_eval_enc_str(last))).collect{|idx|
+      TkText::IndexString.new(idx)
+    }
+  end
+
+=begin
+  def window_cget(index, slot)
+    case slot.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      _fromUTF8(tk_send_without_enc('window', 'cget', 
+                                    _get_eval_enc_str(index), "-#{slot}"))
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_send('window', 'cget', index, "-#{slot}"))
+      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('window', 'cget', _get_eval_enc_str(index), '-font')))
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(index, fnt)
+      end
+      if slot.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('window', 'cget', _get_eval_enc_str(index), "-#{slot}")))
+    end
+  end
+
+  def window_configure(index, slot, value=None)
+    if index.kind_of?(TkTextWindow)
+      index.configure(slot, value)
+    else
+      if slot.kind_of?(Hash)
+        slot = _symbolkey2str(slot)
+        win = slot['window']
+        # slot['window'] = win.epath if win.kind_of?(TkWindow)
+        slot['window'] = _epath(win) if win
+        if slot['create']
+          p_create = slot['create']
+          if p_create.kind_of?(Proc)
+#=begin
+            slot['create'] = install_cmd(proc{
+                                           id = p_create.call
+                                           if id.kind_of?(TkWindow)
+                                             id.epath
+                                           else
+                                             id
+                                           end
+                                         })
+#=end
+            slot['create'] = install_cmd(proc{_epath(p_create.call)})
+          end
+        end
+        tk_send_without_enc('window', 'configure', 
+                            _get_eval_enc_str(index), 
+                            *hash_kv(slot, true))
+      else
+        if slot == 'window' || slot == :window
+          # id = value 
+          # value = id.epath if id.kind_of?(TkWindow)
+          value = _epath(value)
+        end
+        if slot == 'create' || slot == :create
+          p_create = value
+          if p_create.kind_of?(Proc)
+#=begin
+            value = install_cmd(proc{
+                                  id = p_create.call
+                                  if id.kind_of?(TkWindow)
+                                    id.epath
+                                  else
+                                    id
+                                  end
+                                })
+#=end
+            value = install_cmd(proc{_epath(p_create.call)})
+          end
+        end
+        tk_send_without_enc('window', 'configure', 
+                            _get_eval_enc_str(index), 
+                            "-#{slot}", _get_eval_enc_str(value))
+      end
+    end
+    self
+  end
+
+  def window_configinfo(win, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        case slot.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          conf = tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
+        else
+          conf = tk_split_list(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win)))).collect{|conflist|
+          conf = tk_split_simplelist(conflist)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4]) 
+              else
+                conf[4] = tk_tcl2ruby(conf[4]) 
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        case slot.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          conf = tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
+        else
+          conf = tk_split_list(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win)))).each{|conflist|
+          conf = tk_split_simplelist(conflist)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2]) 
+              else
+                conf[2] = tk_tcl2ruby(conf[2]) 
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        ret
+      end
+    end
+  end
+
+  def current_window_configinfo(win, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        conf = window_configinfo(win, slot)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        window_configinfo(win).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      window_configinfo(win, slot).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+=end
+
+  def window_names
+    # tk_split_simplelist(_fromUTF8(tk_send_without_enc('window', 'names'))).collect{|elt|
+    tk_split_simplelist(tk_send_without_enc('window', 'names'), false, true).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def _ktext_length(txt)
+    if $KCODE !~ /n/i
+      return txt.gsub(/[^\Wa-zA-Z_\d]/, ' ').length
+    end
+
+    # $KCODE == 'NONE'
+    if JAPANIZED_TK
+      tk_call_without_enc('kstring', 'length', 
+                          _get_eval_enc_str(txt)).to_i
+    else
+      begin
+        tk_call_without_enc('encoding', 'convertto', 'ascii', 
+                            _get_eval_enc_str(txt)).length
+      rescue StandardError, NameError
+        # sorry, I have no plan
+        txt.length
+      end
+    end
+  end
+  private :_ktext_length
+
+  def tksearch(*args)
+    # call 'search' subcommand of text widget
+    #   args ::= [<array_of_opts>] <pattern> <start_index> [<stop_index>]
+    # If <pattern> is regexp, then it must be a regular expression of Tcl
+    nocase = false
+    if args[0].kind_of?(Array)
+      opts = args.shift.collect{|opt|
+        s_opt = opt.to_s
+        nocase = true if s_opt == 'nocase'
+        '-' + s_opt
+      }
+    else
+      opts = []
+    end
+
+    if args[0].kind_of?(Regexp)
+      regexp = args.shift
+      if !nocase && (regexp.options & Regexp::IGNORECASE) != 0
+        opts << '-nocase'
+      end
+      args.unshift(regexp.source)
+    end
+
+    opts << '--'
+
+    ret = tk_send('search', *(opts + args))
+    if ret == ""
+      nil
+    else
+      TkText::IndexString.new(ret)
+    end
+  end
+
+  def tksearch_with_count(*args)
+    # call 'search' subcommand of text widget
+    #   args ::= [<array_of_opts>] <var> <pattern> <start_index> [<stop_index>]
+    # If <pattern> is regexp, then it must be a regular expression of Tcl
+    nocase = false
+    if args[0].kind_of?(Array)
+      opts = args.shift.collect{|opt|
+        s_opt = opt.to_s
+        nocase = true if s_opt == 'nocase'
+        '-' + s_opt
+      }
+    else
+      opts = []
+    end
+
+    opts << '-count' << args.shift
+
+    if args[0].kind_of?(Regexp)
+      regexp = args.shift
+      if !nocase && (regexp.options & Regexp::IGNORECASE) != 0
+        opts << '-nocase'
+      end
+      args.unshift(regexp.source)
+    end
+
+    opts << '--'
+
+    ret = tk_send('search', *(opts + args))
+    if ret == ""
+      nil
+    else
+      TkText::IndexString.new(ret)
+    end
+  end
+
+  def search_with_length(pat,start,stop=None)
+    pat = pat.chr if pat.kind_of?(Integer)
+    if stop != None
+      return ["", 0] if compare(start,'>=',stop)
+      txt = get(start,stop)
+      if (pos = txt.index(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+        if pat.kind_of?(String)
+          #return [index(start + " + #{pos} chars"), pat.split('').length]
+          return [index(start + " + #{pos} chars"), 
+                  _ktext_length(pat), pat.dup]
+        else
+          #return [index(start + " + #{pos} chars"), $&.split('').length]
+          return [index(start + " + #{pos} chars"), 
+                  _ktext_length(match), match]
+        end
+      else
+        return ["", 0]
+      end
+    else
+      txt = get(start,'end - 1 char')
+      if (pos = txt.index(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+        if pat.kind_of?(String)
+          #return [index(start + " + #{pos} chars"), pat.split('').length]
+          return [index(start + " + #{pos} chars"), 
+                  _ktext_length(pat), pat.dup]
+        else
+          #return [index(start + " + #{pos} chars"), $&.split('').length]
+          return [index(start + " + #{pos} chars"), 
+                  _ktext_length(match), match]
+        end
+      else
+        txt = get('1.0','end - 1 char')
+        if (pos = txt.index(pat))
+          match = $&
+          #pos = txt[0..(pos-1)].split('').length if pos > 0
+          pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+          if pat.kind_of?(String)
+            #return [index("1.0 + #{pos} chars"), pat.split('').length]
+            return [index("1.0 + #{pos} chars"), 
+                    _ktext_length(pat), pat.dup]
+          else
+            #return [index("1.0 + #{pos} chars"), $&.split('').length]
+            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+          end
+        else
+          return ["", 0]
+        end
+      end
+    end
+  end
+
+  def search(pat,start,stop=None)
+    search_with_length(pat,start,stop)[0]
+  end
+
+  def rsearch_with_length(pat,start,stop=None)
+    pat = pat.chr if pat.kind_of?(Integer)
+    if stop != None
+      return ["", 0] if compare(start,'<=',stop)
+      txt = get(stop,start)
+      if (pos = txt.rindex(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+        if pat.kind_of?(String)
+          #return [index(stop + " + #{pos} chars"), pat.split('').length]
+          return [index(stop + " + #{pos} chars"), _ktext_length(pat), pat.dup]
+        else
+          #return [index(stop + " + #{pos} chars"), $&.split('').length]
+          return [index(stop + " + #{pos} chars"), _ktext_length(match), match]
+        end
+      else
+        return ["", 0]
+      end
+    else
+      txt = get('1.0',start)
+      if (pos = txt.rindex(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+        if pat.kind_of?(String)
+          #return [index("1.0 + #{pos} chars"), pat.split('').length]
+          return [index("1.0 + #{pos} chars"), _ktext_length(pat), pat.dup]
+        else
+          #return [index("1.0 + #{pos} chars"), $&.split('').length]
+          return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+        end
+      else
+        txt = get('1.0','end - 1 char')
+        if (pos = txt.rindex(pat))
+          match = $&
+          #pos = txt[0..(pos-1)].split('').length if pos > 0
+          pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+          if pat.kind_of?(String)
+            #return [index("1.0 + #{pos} chars"), pat.split('').length]
+            return [index("1.0 + #{pos} chars"), _ktext_length(pat), pat.dup]
+          else
+            #return [index("1.0 + #{pos} chars"), $&.split('').length]
+            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+          end
+        else
+          return ["", 0]
+        end
+      end
+    end
+  end
+
+  def rsearch(pat,start,stop=None)
+    rsearch_with_length(pat,start,stop)[0]
+  end
+
+  def dump(type_info, *index, &block)
+    if type_info.kind_of?(Symbol)
+      type_info = [ type_info.to_s ]
+    elsif type_info.kind_of?(String)
+      type_info = [ type_info ]
+    end
+    args = type_info.collect{|inf| '-' + inf}
+    args << '-command' << block if block
+    str = tk_send('dump', *(args + index))
+    result = []
+    sel = nil
+    i = 0
+    while i < str.size
+      # retrieve key
+      idx = str.index(/ /, i)
+      result.push str[i..(idx-1)]
+      i = idx + 1
+      
+      # retrieve value
+      case result[-1]
+      when 'text'
+        if str[i] == ?{
+          # text formed as {...}
+          val, i = _retrieve_braced_text(str, i)
+          result.push val
+        else
+          # text which may contain backslahes
+          val, i = _retrieve_backslashed_text(str, i)
+          result.push val
+        end
+      else
+        idx = str.index(/ /, i)
+        val = str[i..(idx-1)]
+        case result[-1]
+        when 'mark'
+          case val
+          when 'insert'
+            result.push TkTextMarkInsert.new(self)
+          when 'current'
+            result.push TkTextMarkCurrent.new(self)
+          when 'anchor'
+            result.push TkTextMarkAnchor.new(self)
+          else
+            result.push tk_tcl2ruby(val)
+          end
+        when 'tagon'
+          if val == 'sel'
+            if sel
+              result.push sel
+            else
+              result.push TkTextTagSel.new(self)
+            end
+          else
+            result.push tk_tcl2ruby(val)
+          end
+        when 'tagoff'
+            result.push tk_tcl2ruby(val)
+        when 'window'
+          result.push tk_tcl2ruby(val)
+        when 'image'
+          result.push tk_tcl2ruby(val)
+        end
+        i = idx + 1
+      end
+
+      # retrieve index
+      idx = str.index(/ /, i)
+      if idx
+        result.push(TkText::IndexString.new(str[i..(idx-1)]))
+        i = idx + 1
+      else
+        result.push(TkText::IndexString.new(str[i..-1]))
+        break
+      end
+    end
+    
+    kvis = []
+    until result.empty?
+      kvis.push [result.shift, result.shift, result.shift]
+    end
+    kvis  # result is [[key1, value1, index1], [key2, value2, index2], ...]
+  end
+
+  def _retrieve_braced_text(str, i)
+    cnt = 0
+    idx = i
+    while idx < str.size
+      case str[idx]
+      when ?{
+        cnt += 1
+      when ?}
+        cnt -= 1
+        if cnt == 0
+          break
+        end
+      end
+      idx += 1
+    end
+    return str[i+1..idx-1], idx + 2
+  end
+  private :_retrieve_braced_text
+
+  def _retrieve_backslashed_text(str, i)
+    j = i
+    idx = nil
+    loop {
+      idx = str.index(/ /, j)
+      if str[idx-1] == ?\\
+        j += 1
+      else
+        break
+      end
+    }
+    val = str[i..(idx-1)]
+    val.gsub!(/\\( |\{|\})/, '\1')
+    return val, idx + 1
+  end
+  private :_retrieve_backslashed_text
+
+  def dump_all(*index, &block)
+    dump(['all'], *index, &block)
+  end
+  def dump_mark(*index, &block)
+    dump(['mark'], *index, &block)
+  end
+  def dump_tag(*index, &block)
+    dump(['tag'], *index, &block)
+  end
+  def dump_text(*index, &block)
+    dump(['text'], *index, &block)
+  end
+  def dump_window(*index, &block)
+    dump(['window'], *index, &block)
+  end
+  def dump_image(*index, &block)
+    dump(['image'], *index, &block)
+  end
+end
+
+#######################################
+
+class TkText::Peer < TkText
+  # Tk8.5 feature
+  def initialize(text, parent=nil, keys={})
+    unless text.kind_of?(TkText)
+      fail ArgumentError, "TkText is expected for 1st argument"
+    end
+    @src_text = text
+    super(parent, keys)
+  end
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(@src_text.path, 'peer', 'create', @path)
+    else
+      tk_call_without_enc(@src_text.path, 'peer', 'create', @path)
+    end
+  end
+  private :create_self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/textimage.rb b/ruby_1_8_6/ext/tk/lib/tk/textimage.rb
new file mode 100644
index 0000000000..a29b23c7dd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/textimage.rb
@@ -0,0 +1,82 @@
+#
+# tk/textimage.rb - treat Tk text image object
+#
+require 'tk'
+require 'tk/text'
+
+class TkTextImage<TkObject
+  include TkText::IndexModMethods
+
+  def initialize(parent, index, keys)
+    #unless parent.kind_of?(TkText)
+    #  fail ArgumentError, "expect TkText for 1st argument"
+    #end
+    @t = parent
+    if index == 'end' || index == :end
+      @path = TkTextMark.new(@t, tk_call(@t.path, 'index', 'end - 1 chars'))
+    elsif index.kind_of? TkTextMark
+      if tk_call_without_enc(@t.path,'index',index.path) == tk_call_without_enc(@t.path,'index','end')
+        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
+                                                       'end - 1 chars'))
+      else
+        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
+                                                       index.path))
+      end
+    else
+      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
+                                                     _get_eval_enc_str(index)))
+    end
+    @path.gravity = 'left'
+    @index = @path.path
+    @id = tk_call_without_enc(@t.path, 'image', 'create', @index, 
+                              *hash_kv(keys, true)).freeze
+    @path.gravity = 'right'
+  end
+
+  def id
+    TkText::IndexString.new(@id)
+  end
+  def mark
+    @path
+  end
+
+  def [](slot)
+    cget(slot)
+  end
+  def []=(slot, value)
+    configure(slot, value)
+    value
+  end
+
+  def cget(slot)
+    @t.image_cget(@index, slot)
+  end
+
+  def configure(slot, value=None)
+    @t.image_configure(@index, slot, value)
+    self
+  end
+#  def configure(slot, value)
+#    tk_call @t.path, 'image', 'configure', @index, "-#{slot}", value
+#  end
+
+  def configinfo(slot = nil)
+    @t.image_configinfo(@index, slot)
+  end
+
+  def current_configinfo(slot = nil)
+    @t.current_image_configinfo(@index, slot)
+  end
+
+  def image
+    img = tk_call_without_enc(@t.path, 'image', 'cget', @index, '-image')
+    TkImage::Tk_IMGTBL[img]? TkImage::Tk_IMGTBL[img] : img
+  end
+
+  def image=(value)
+    tk_call_without_enc(@t.path, 'image', 'configure', @index, '-image', 
+                        _get_eval_enc_str(value))
+    #self
+    value
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/textmark.rb b/ruby_1_8_6/ext/tk/lib/tk/textmark.rb
new file mode 100644
index 0000000000..650d95af70
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/textmark.rb
@@ -0,0 +1,166 @@
+#
+# tk/textmark.rb - methods for treating text marks
+#
+require 'tk'
+require 'tk/text'
+
+class TkTextMark<TkObject
+  include TkText::IndexModMethods
+
+  TMarkID_TBL = TkCore::INTERP.create_table
+  Tk_TextMark_ID = ['mark'.freeze, '00000'.taint].freeze
+
+  TkCore::INTERP.init_ip_env{ TMarkID_TBL.clear }
+
+  def TkTextMark.id2obj(text, id)
+    tpath = text.path
+    return id unless TMarkID_TBL[tpath]
+    TMarkID_TBL[tpath][id]? TMarkID_TBL[tpath][id]: id
+  end
+
+  def initialize(parent, index)
+    #unless parent.kind_of?(TkText)
+    #  fail ArgumentError, "expect TkText for 1st argument"
+    #end
+    @parent = @t = parent
+    @tpath = parent.path
+    # @path = @id = Tk_TextMark_ID.join('')
+    @path = @id = Tk_TextMark_ID.join(TkCore::INTERP._ip_id_).freeze
+    TMarkID_TBL[@id] = self
+    TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
+    TMarkID_TBL[@tpath][@id] = self
+    Tk_TextMark_ID[1].succ!
+    tk_call_without_enc(@t.path, 'mark', 'set', @id, 
+                        _get_eval_enc_str(index))
+    @t._addtag id, self
+  end
+
+  def id
+    TkText::IndexString.new(@id)
+  end
+
+  def exist?
+    #if ( tk_split_simplelist(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'names'))).find{|id| id == @id } )
+    if ( tk_split_simplelist(tk_call_without_enc(@t.path, 'mark', 'names'), false, true).find{|id| id == @id } )
+      true
+    else
+      false
+    end
+  end
+
+=begin
+  # move to TkText::IndexModMethods module
+  def +(mod)
+    return chars(mod) if mod.kind_of?(Numeric)
+
+    mod = mod.to_s
+    if mod =~ /^\s*[+-]?\d/
+      TkText::IndexString.new(@id + ' + ' + mod)
+    else
+      TkText::IndexString.new(@id + ' ' + mod)
+    end
+  end
+
+  def -(mod)
+    return chars(-mod) if mod.kind_of?(Numeric)
+
+    mod = mod.to_s
+    if mod =~ /^\s*[+-]?\d/
+      TkText::IndexString.new(@id + ' - ' + mod)
+    elsif mod =~ /^\s*[-]\s+(\d.*)$/
+      TkText::IndexString.new(@id + ' - -' + $1)
+    else
+      TkText::IndexString.new(@id + ' ' + mod)
+    end
+  end
+=end
+
+  def pos
+    @t.index(@id)
+  end
+
+  def pos=(where)
+    set(where)
+  end
+
+  def set(where)
+    tk_call_without_enc(@t.path, 'mark', 'set', @id, 
+                        _get_eval_enc_str(where))
+    self
+  end
+
+  def unset
+    tk_call_without_enc(@t.path, 'mark', 'unset', @id)
+    self
+  end
+  alias destroy unset
+
+  def gravity
+    tk_call_without_enc(@t.path, 'mark', 'gravity', @id)
+  end
+
+  def gravity=(direction)
+    tk_call_without_enc(@t.path, 'mark', 'gravity', @id, direction)
+    #self
+    direction
+  end
+
+  def next(index = nil)
+    if index
+      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'next', _get_eval_enc_str(index))))
+    else
+      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'next', @id)))
+    end
+  end
+
+  def previous(index = nil)
+    if index
+      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'previous', _get_eval_enc_str(index))))
+    else
+      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'previous', @id)))
+    end
+  end
+end
+
+class TkTextNamedMark<TkTextMark
+  def self.new(parent, name, *args)
+    if TMarkID_TBL[parent.path] && TMarkID_TBL[parent.path][name]
+      return TMarkID_TBL[parent.path][name]
+    else
+      super(parent, name, *args)
+    end
+  end
+
+  def initialize(parent, name, index=nil)
+    #unless parent.kind_of?(TkText)
+    #  fail ArgumentError, "expect TkText for 1st argument"
+    #end
+    @parent = @t = parent
+    @tpath = parent.path
+    @path = @id = name
+    TMarkID_TBL[@id] = self
+    TMarkID_TBL[@tpath] = {} unless TMarkID_TBL[@tpath]
+    TMarkID_TBL[@tpath][@id] = self unless TMarkID_TBL[@tpath][@id]
+    tk_call_without_enc(@t.path, 'mark', 'set', @id, 
+                        _get_eval_enc_str(index)) if index
+    @t._addtag id, self
+  end
+end
+
+class TkTextMarkInsert<TkTextNamedMark
+  def self.new(parent,*args)
+    super(parent, 'insert', *args)
+  end
+end
+
+class TkTextMarkCurrent<TkTextNamedMark
+  def self.new(parent,*args)
+    super(parent, 'current', *args)
+  end
+end
+
+class TkTextMarkAnchor<TkTextNamedMark
+  def self.new(parent,*args)
+    super(parent, 'anchor', *args)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/texttag.rb b/ruby_1_8_6/ext/tk/lib/tk/texttag.rb
new file mode 100644
index 0000000000..cc2c56210f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/texttag.rb
@@ -0,0 +1,279 @@
+#
+# tk/texttag.rb - methods for treating text tags
+#
+require 'tk'
+require 'tk/text'
+require 'tk/tagfont'
+
+class TkTextTag<TkObject
+  include TkTreatTagFont
+  include TkText::IndexModMethods
+
+  TTagID_TBL = TkCore::INTERP.create_table
+  Tk_TextTag_ID = ['tag'.freeze, '00000'.taint].freeze
+
+  TkCore::INTERP.init_ip_env{ TTagID_TBL.clear }
+
+  def TkTextTag.id2obj(text, id)
+    tpath = text.path
+    return id unless TTagID_TBL[tpath]
+    TTagID_TBL[tpath][id]? TTagID_TBL[tpath][id]: id
+  end
+
+  def initialize(parent, *args)
+    #unless parent.kind_of?(TkText)
+    #  fail ArgumentError, "expect TkText for 1st argument"
+    #end
+    @parent = @t = parent
+    @tpath = parent.path
+    # @path = @id = Tk_TextTag_ID.join('')
+    @path = @id = Tk_TextTag_ID.join(TkCore::INTERP._ip_id_).freeze
+    # TTagID_TBL[@id] = self
+    TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
+    TTagID_TBL[@tpath][@id] = self
+    Tk_TextTag_ID[1].succ!
+    #tk_call @t.path, "tag", "configure", @id, *hash_kv(keys)
+    if args != []
+      keys = args.pop
+      if keys.kind_of?(Hash)
+        add(*args) if args != []
+        configure(keys)
+      else
+        args.push keys
+        add(*args)
+      end
+    end
+    @t._addtag id, self
+  end
+
+  def id
+    TkText::IndexString.new(@id)
+  end
+
+  def exist?
+    #if ( tk_split_simplelist(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'names'))).find{|id| id == @id } )
+    if ( tk_split_simplelist(tk_call_without_enc(@t.path, 'tag', 'names'), false, true).find{|id| id == @id } )
+      true
+    else
+      false
+    end
+  end
+
+  def first
+    TkText::IndexString.new(@id + '.first')
+  end
+
+  def last
+    TkText::IndexString.new(@id + '.last')
+  end
+
+  def add(*indices)
+    tk_call_without_enc(@t.path, 'tag', 'add', @id, 
+                        *(indices.collect{|idx| _get_eval_enc_str(idx)}))
+    self
+  end
+
+  def remove(*indices)
+    tk_call_without_enc(@t.path, 'tag', 'remove', @id, 
+                        *(indices.collect{|idx| _get_eval_enc_str(idx)}))
+    self
+  end
+
+  def ranges
+    l = tk_split_simplelist(tk_call_without_enc(@t.path, 'tag', 'ranges', @id))
+    r = []
+    while key=l.shift
+      r.push [TkText::IndexString.new(key), TkText::IndexString.new(l.shift)]
+    end
+    r
+  end
+
+  def nextrange(first, last=None)
+    simplelist(tk_call_without_enc(@t.path, 'tag', 'nextrange', @id, 
+                                   _get_eval_enc_str(first), 
+                                   _get_eval_enc_str(last))).collect{|idx|
+      TkText::IndexString.new(idx)
+    }
+  end
+
+  def prevrange(first, last=None)
+    simplelist(tk_call_without_enc(@t.path, 'tag', 'prevrange', @id, 
+                                   _get_eval_enc_str(first), 
+                                   _get_eval_enc_str(last))).collect{|idx|
+      TkText::IndexString.new(idx)
+    }
+  end
+
+  def [](key)
+    cget key
+  end
+
+  def []=(key,val)
+    configure key, val
+    val
+  end
+
+  def cget(key)
+    @t.tag_cget @id, key
+  end
+=begin
+  def cget(key)
+    case key.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      _fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget', @id, "-#{key}"))
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_call(@t.path, 'tag', 'cget', @id, "-#{key}"))
+      fnt = tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget', 
+                                                      @id, '-font')))
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(@id, fnt)
+      end
+      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget', 
+                                                @id, "-#{key}")))
+    end
+  end
+=end
+
+  def configure(key, val=None)
+    @t.tag_configure @id, key, val
+  end
+#  def configure(key, val=None)
+#    if key.kind_of?(Hash)
+#      tk_call @t.path, 'tag', 'configure', @id, *hash_kv(key)
+#    else
+#      tk_call @t.path, 'tag', 'configure', @id, "-#{key}", val
+#    end
+#  end
+#  def configure(key, value)
+#    if value == FALSE
+#      value = "0"
+#    elsif value.kind_of?(Proc)
+#      value = install_cmd(value)
+#    end
+#    tk_call @t.path, 'tag', 'configure', @id, "-#{key}", value
+#  end
+
+  def configinfo(key=nil)
+    @t.tag_configinfo @id, key
+  end
+
+  def current_configinfo(key=nil)
+    @t.current_tag_configinfo @id, key
+  end
+
+  #def bind(seq, cmd=Proc.new, *args)
+  #  _bind([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
+  #  self
+  #end
+  def bind(seq, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
+    self
+  end
+
+  #def bind_append(seq, cmd=Proc.new, *args)
+  #  _bind_append([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
+  #  self
+  #end
+  def bind_append(seq, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
+    self
+  end
+
+  def bind_remove(seq)
+    _bind_remove([@t.path, 'tag', 'bind', @id], seq)
+    self
+  end
+
+  def bindinfo(context=nil)
+    _bindinfo([@t.path, 'tag', 'bind', @id], context)
+  end
+
+  def raise(above=None)
+    tk_call_without_enc(@t.path, 'tag', 'raise', @id, 
+                        _get_eval_enc_str(above))
+    self
+  end
+
+  def lower(below=None)
+    tk_call_without_enc(@t.path, 'tag', 'lower', @id, 
+                        _get_eval_enc_str(below))
+    self
+  end
+
+  def destroy
+    tk_call_without_enc(@t.path, 'tag', 'delete', @id)
+    TTagID_TBL[@tpath].delete(@id) if TTagID_TBL[@tpath]
+    self
+  end
+end
+
+class TkTextNamedTag<TkTextTag
+  def self.new(parent, name, *args)
+    if TTagID_TBL[parent.path] && TTagID_TBL[parent.path][name]
+      tagobj = TTagID_TBL[parent.path][name]
+      if args != []
+        keys = args.pop
+        if keys.kind_of?(Hash)
+          tagobj.add(*args) if args != []
+          tagobj.configure(keys)
+        else
+          args.push keys
+          tagobj.add(*args)
+        end
+      end
+      return tagobj
+    else
+      super(parent, name, *args)
+    end
+  end
+
+  def initialize(parent, name, *args)
+    #unless parent.kind_of?(TkText)
+    #  fail ArgumentError, "expect TkText for 1st argument"
+    #end
+    @parent = @t = parent
+    @tpath = parent.path
+    @path = @id = name
+    TTagID_TBL[@tpath] = {} unless TTagID_TBL[@tpath]
+    TTagID_TBL[@tpath][@id] = self unless TTagID_TBL[@tpath][@id]
+    #if mode
+    #  tk_call @t.path, "addtag", @id, *args
+    #end
+    if args != []
+      keys = args.pop
+      if keys.kind_of?(Hash)
+        add(*args) if args != []
+        configure(keys)
+      else
+        args.push keys
+        add(*args)
+      end
+    end
+    @t._addtag id, self
+  end
+end
+
+class TkTextTagSel<TkTextNamedTag
+  def self.new(parent, *args)
+    super(parent, 'sel', *args)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/textwindow.rb b/ruby_1_8_6/ext/tk/lib/tk/textwindow.rb
new file mode 100644
index 0000000000..605c40addd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/textwindow.rb
@@ -0,0 +1,149 @@
+#
+# tk/textwindow.rb - treat Tk text window object
+#
+require 'tk'
+require 'tk/text'
+
+class TkTextWindow<TkObject
+  include TkText::IndexModMethods
+
+  def initialize(parent, index, keys = {})
+    #unless parent.kind_of?(TkText)
+    #  fail ArgumentError, "expect TkText for 1st argument"
+    #end
+    @t = parent
+    if index == 'end' || index == :end
+      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
+                                                     'end - 1 chars'))
+    elsif index.kind_of?(TkTextMark)
+      if tk_call_without_enc(@t.path,'index',index.path) == tk_call_without_enc(@t.path,'index','end')
+        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
+                                                       'end - 1 chars'))
+      else
+        @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', 
+                                                       index.path))
+      end
+    else
+      @path = TkTextMark.new(@t, tk_call_without_enc(@t.path, 'index', _get_eval_enc_str(index)))
+    end
+    @path.gravity = 'left'
+    @index = @path.path
+    keys = _symbolkey2str(keys)
+    @id = keys['window']
+    # keys['window'] = @id.epath if @id.kind_of?(TkWindow)
+    keys['window'] = _epath(@id) if @id
+    if keys['create']
+      @p_create = keys['create']
+      # if @p_create.kind_of?(Proc)
+      if TkComm._callback_entry?(@p_create)
+=begin
+        keys['create'] = install_cmd(proc{
+                                       @id = @p_create.call
+                                       if @id.kind_of?(TkWindow)
+                                         @id.epath
+                                       else
+                                         @id
+                                       end
+                                     })
+=end
+        keys['create'] = install_cmd(proc{@id = @p_create.call; _epath(@id)})
+      end
+    end
+    tk_call_without_enc(@t.path, 'window', 'create', @index, 
+                        *hash_kv(keys, true))
+    @path.gravity = 'right'
+  end
+
+  def id
+    TkText::IndexString.new(_epath(@id))
+  end
+  def mark
+    @path
+  end
+
+  def [](slot)
+    cget(slot)
+  end
+  def []=(slot, value)
+    configure(slot, value)
+    value
+  end
+
+  def cget(slot)
+    @t.window_cget(@index, slot)
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of?(Hash)
+      slot = _symbolkey2str(slot)
+      if slot['window']
+        @id = slot['window'] 
+        # slot['window'] = @id.epath if @id.kind_of?(TkWindow)
+        slot['window'] = _epath(@id) if @id
+      end
+      if slot['create']
+        self.create=slot.delete('create')
+      end
+      if slot.size > 0
+        tk_call_without_enc(@t.path, 'window', 'configure', @index, 
+                            *hash_kv(slot, true))
+      end
+    else
+      if slot == 'window' || slot == :window
+        @id = value 
+        # value = @id.epath if @id.kind_of?(TkWindow)
+        value = _epath(@id) if @id
+      end
+      if slot == 'create' || slot == :create
+        self.create=value
+      else
+        tk_call_without_enc(@t.path, 'window', 'configure', @index, 
+                            "-#{slot}", _get_eval_enc_str(value))
+      end
+    end
+    self
+  end
+
+  def configinfo(slot = nil)
+    @t.window_configinfo(@index, slot)
+  end
+
+  def current_configinfo(slot = nil)
+    @t.current_window_configinfo(@index, slot)
+  end
+
+  def window
+    @id
+  end
+
+  def window=(value)
+    @id = value
+    # value = @id.epath if @id.kind_of?(TkWindow)
+    value = _epath(@id) if @id
+    tk_call_without_enc(@t.path, 'window', 'configure', @index, 
+                        '-window', _get_eval_enc_str(value))
+    value
+  end
+
+  def create
+    @p_create
+  end
+
+  def create=(value)
+    @p_create = value
+    # if @p_create.kind_of?(Proc)
+    if TkComm._callback_entry?(@p_create)
+      value = install_cmd(proc{
+                            @id = @p_create.call
+                            if @id.kind_of?(TkWindow)
+                              @id.epath
+                            else
+                              @id
+                            end
+                          })
+    end
+    tk_call_without_enc(@t.path, 'window', 'configure', @index, 
+                        '-create', _get_eval_enc_str(value))
+    value
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/timer.rb b/ruby_1_8_6/ext/tk/lib/tk/timer.rb
new file mode 100644
index 0000000000..47f2b79350
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/timer.rb
@@ -0,0 +1,634 @@
+#
+#   tk/timer.rb : methods for Tcl/Tk after command
+#
+#   $Id$
+#
+require 'tk'
+
+class TkTimer
+  include TkCore
+  extend TkCore
+
+  TkCommandNames = ['after'.freeze].freeze
+
+  Tk_CBID = ['a'.freeze, '00000'.taint].freeze
+  Tk_CBTBL = {}.taint
+
+  TkCore::INTERP.add_tk_procs('rb_after', 'id', <<-'EOL')
+    if {[set st [catch {eval {ruby_cmd TkTimer callback} $id} ret]] != 0} {
+        return -code $st $ret
+    } {
+        return $ret
+    }
+  EOL
+
+  DEFAULT_IGNORE_EXCEPTIONS = [ NameError, RuntimeError ].freeze
+
+  ###############################
+  # class methods
+  ###############################
+  def self.start(*args, &b)
+    self.new(*args, &b).start
+  end
+
+  def self.callback(obj_id)
+    ex_obj = Tk_CBTBL[obj_id]
+    return "" if ex_obj == nil; # canceled
+    ex_obj.cb_call
+  end
+
+  def self.info(obj = nil)
+    if obj
+      if obj.kind_of?(TkTimer)
+        if obj.after_id
+          inf = tk_split_list(tk_call_without_enc('after','info',obj.after_id))
+          [Tk_CBTBL[inf[0][1]], inf[1]]
+        else
+          nil
+        end
+      else
+        fail ArgumentError, "TkTimer object is expected"
+      end
+    else
+      tk_call_without_enc('after', 'info').split(' ').collect!{|id|
+        ret = Tk_CBTBL.find{|key,val| val.after_id == id}
+        (ret == nil)? id: ret[1]
+      }
+    end
+  end
+
+
+  ###############################
+  # instance methods
+  ###############################
+  def do_callback
+    @in_callback = true
+    @after_id = nil
+    begin
+      @return_value = @current_proc.call(self)
+    rescue SystemExit
+      exit(0)
+    rescue Interrupt
+      exit!(1)
+    rescue Exception => e
+      if @cancel_on_exception && 
+          @cancel_on_exception.find{|exc| e.kind_of?(exc)}
+        cancel
+        @return_value = e
+        @in_callback = false
+        return e
+      else
+        fail e
+      end
+    end
+    if @set_next
+      set_next_callback(@current_args)
+    else
+      @set_next = true
+    end
+    @in_callback = false
+    @return_value
+  end
+
+  def set_callback(sleep, args=nil)
+    if TkCore::INTERP.deleted?
+      self.cancel
+      return self
+    end
+    @after_script = "rb_after #{@id}"
+    @after_id = tk_call_without_enc('after', sleep, @after_script)
+    @current_args = args
+    @current_script = [sleep, @after_script]
+    self
+  end
+
+  def set_next_callback(args)
+    if @running == false || @proc_max == 0 || @do_loop == 0
+      Tk_CBTBL.delete(@id) ;# for GC
+      @running = false
+      @wait_var.value = 0
+      return
+    end
+    if @current_pos >= @proc_max
+      if @do_loop < 0 || (@do_loop -= 1) > 0
+        @current_pos = 0
+      else
+        Tk_CBTBL.delete(@id) ;# for GC
+        @running = false
+        @wait_var.value = 0
+        return
+      end
+    end
+
+    @current_args = args
+
+    # if @sleep_time.kind_of?(Proc)
+    if TkComm._callback_entry?(@sleep_time)
+      sleep = @sleep_time.call(self)
+    else
+      sleep = @sleep_time
+    end
+    @current_sleep = sleep
+
+    cmd, *cmd_args = @loop_proc[@current_pos]
+    @current_pos += 1
+    @current_proc = cmd
+
+    set_callback(sleep, cmd_args)
+  end
+
+  def initialize(*args, &b)
+    # @id = Tk_CBID.join('')
+    @id = Tk_CBID.join(TkCore::INTERP._ip_id_)
+    Tk_CBID[1].succ!
+
+    @wait_var = TkVariable.new(0)
+
+    @cb_cmd = TkCore::INTERP.get_cb_entry(self.method(:do_callback))
+
+    @set_next = true
+
+    @init_sleep = 0
+    @init_proc = nil
+    @init_args = []
+
+    @current_script = []
+    @current_proc = nil
+    @current_args = nil
+    @return_value = nil
+
+    @sleep_time = 0
+    @current_sleep = 0
+    @loop_exec = 0
+    @do_loop = 0
+    @loop_proc = []
+    @proc_max = 0
+    @current_pos = 0
+
+    @after_id = nil
+    @after_script = nil
+
+    @cancel_on_exception = DEFAULT_IGNORE_EXCEPTIONS
+    # Unless @cancel_on_exception, Ruby/Tk shows an error dialog box when 
+    # an excepsion is raised on TkTimer callback procedure. 
+    # If @cancel_on_exception is an array of exception classes and the raised 
+    # exception is included in the array, Ruby/Tk cancels executing TkTimer 
+    # callback procedures silently (TkTimer#cancel is called and no dialog is 
+    # shown). 
+
+    if b
+      case args.size
+      when 0
+        add_procs(b)
+      when 1
+        args << -1 << b
+      else
+        args << b
+      end
+    end
+
+    set_procs(*args) if args != []
+
+    @running = false
+    @in_callback = false
+  end
+
+  attr :after_id
+  attr :after_script
+  attr :current_proc
+  attr :current_args
+  attr :current_sleep
+  alias :current_interval :current_sleep
+  attr :return_value
+
+  attr_accessor :loop_exec
+
+  def cb_call
+    @cb_cmd.call
+  end
+
+  def get_procs
+    [@init_sleep, @init_proc, @init_args, @sleep_time, @loop_exec, @loop_proc]
+  end
+
+  def current_status
+    [@running, @current_sleep, @current_proc, @current_args, 
+      @do_loop, @cancel_on_exception]
+  end
+
+  def cancel_on_exception?
+    @cancel_on_exception
+  end
+
+  def cancel_on_exception=(mode)
+    if mode.kind_of?(Array)
+      @cancel_on_exception = mode
+    elsif mode
+      @cancel_on_exception = DEFAULT_IGNORE_EXCEPTIONS
+    else
+      @cancel_on_exception = false
+    end
+    #self
+  end
+
+  def running?
+    @running
+  end
+
+  def loop_rest
+    @do_loop
+  end
+
+  def loop_rest=(rest)
+    @do_loop = rest
+    #self
+  end
+
+  def set_interval(interval)
+    #if interval != 'idle' && interval != :idle \
+    #  && !interval.kind_of?(Integer) && !interval.kind_of?(Proc)
+    if interval != 'idle' && interval != :idle \
+      && !interval.kind_of?(Integer) && !TkComm._callback_entry?(interval)
+      fail ArgumentError, "expect Integer or Proc"
+    end
+    @sleep_time = interval
+  end
+
+  def set_procs(interval, loop_exec, *procs)
+    #if interval != 'idle' && interval != :idle \
+    #   && !interval.kind_of?(Integer) && !interval.kind_of?(Proc)
+    if interval != 'idle' && interval != :idle \
+      && !interval.kind_of?(Integer) && !TkComm._callback_entry?(interval)
+      fail ArgumentError, "expect Integer or Proc for 1st argument"
+    end
+    @sleep_time = interval
+
+    @loop_proc = []
+    procs.each{|e|
+      # if e.kind_of?(Proc)
+      if TkComm._callback_entry?(e)
+        @loop_proc.push([e])
+      else
+        @loop_proc.push(e)
+      end
+    }
+    @proc_max = @loop_proc.size
+    @current_pos = 0
+
+    if loop_exec.kind_of?(Integer) && loop_exec < 0
+      @loop_exec = -1
+    elsif loop_exec == true
+      @loop_exec = -1
+    elsif loop_exec == nil || loop_exec == false || loop_exec == 0
+      @loop_exec = 0
+    else
+      if not loop_exec.kind_of?(Integer)
+        fail ArgumentError, "expect Integer for 2nd argument"
+      end
+      @loop_exec = loop_exec
+    end
+    @do_loop = @loop_exec
+
+    self
+  end
+
+  def add_procs(*procs)
+    procs.each{|e|
+      # if e.kind_of?(Proc)
+      if TkComm._callback_entry?(e)
+        @loop_proc.push([e])
+      else
+        @loop_proc.push(e)
+      end
+    }
+    @proc_max = @loop_proc.size
+
+    self
+  end
+
+  def delete_procs(*procs)
+    procs.each{|e|
+      # if e.kind_of?(Proc)
+      if TkComm._callback_entry?(e)
+        @loop_proc.delete([e])
+      else
+        @loop_proc.delete(e)
+      end
+    }
+    @proc_max = @loop_proc.size
+
+    cancel if @proc_max == 0
+
+    self
+  end
+
+  def delete_at(n)
+    @loop_proc.delete_at(n)
+    @proc_max = @loop_proc.size
+    cancel if @proc_max == 0
+    self
+  end
+
+  def set_start_proc(sleep=nil, init_proc=nil, *init_args, &b)
+    # set parameters for 'restart'
+    sleep = @init_sleep unless sleep
+
+    if sleep != 'idle' && sleep != :idle && !sleep.kind_of?(Integer)
+      fail ArgumentError, "expect Integer or 'idle' for 1st argument"
+    end
+
+    @init_sleep = sleep
+    @init_proc = init_proc
+    @init_args = init_args
+
+    @init_proc = b if !@init_proc && b
+    @init_proc = proc{|*args| } if @init_sleep > 0 && !@init_proc
+
+    self
+  end
+
+  def start(*init_args, &b)
+    return nil if @running
+
+    Tk_CBTBL[@id] = self
+    @do_loop = @loop_exec
+    @current_pos = 0
+    @return_value = nil
+    @after_id = nil
+
+    @init_sleep = 0
+    @init_proc  = nil
+    @init_args  = nil
+
+    argc = init_args.size
+    if argc > 0
+      sleep = init_args.shift
+      if sleep != 'idle' && sleep != :idle && !sleep.kind_of?(Integer)
+        fail ArgumentError, "expect Integer or 'idle' for 1st argument"
+      end
+      @init_sleep = sleep
+    end
+    @init_proc = init_args.shift if argc > 1
+    @init_args = init_args if argc > 2
+
+    @init_proc = b if !@init_proc && b
+    @init_proc = proc{|*args| } if @init_sleep > 0 && !@init_proc
+
+    @current_sleep = @init_sleep
+    @running = true
+    if @init_proc
+      # if not @init_proc.kind_of?(Proc)
+      if !TkComm._callback_entry?(@init_proc)
+        fail ArgumentError, "Argument '#{@init_proc}' need to be Proc"
+      end
+      @current_proc = @init_proc
+      set_callback(@init_sleep, @init_args)
+      @set_next = false if @in_callback
+    else
+      set_next_callback(@init_args)
+    end
+
+    self
+  end
+
+  def reset(*reset_args)
+    restart() if @running
+
+    if @init_proc
+      @return_value = @init_proc.call(self)
+    else
+      @return_value = nil
+    end
+
+    @current_pos   = 0
+    @current_args  = @init_args
+    @current_script = []
+
+    @set_next = false if @in_callback
+
+    self
+  end
+
+  def restart(*restart_args, &b)
+    cancel if @running
+    if restart_args == [] && !b
+      start(@init_sleep, @init_proc, *@init_args)
+    else
+      start(*restart_args, &b)
+    end
+  end
+
+  def cancel
+    @running = false
+    @wait_var.value = 0
+    tk_call 'after', 'cancel', @after_id if @after_id
+    @after_id = nil
+
+    Tk_CBTBL.delete(@id) ;# for GC
+    self
+  end
+  alias stop cancel
+
+  def continue(wait=nil)
+    fail RuntimeError, "is already running" if @running
+    return restart() if @current_script.empty?
+    sleep, cmd = @current_script
+    fail RuntimeError, "no procedure to continue" unless cmd
+    if wait
+      unless wait.kind_of?(Integer)
+        fail ArgumentError, "expect Integer for 1st argument"
+      end
+      sleep = wait
+    end
+    Tk_CBTBL[@id] = self
+    @running = true
+    @after_id = tk_call_without_enc('after', sleep, cmd)
+    self
+  end
+
+  def skip
+    fail RuntimeError, "is not running now" unless @running
+    cancel
+    Tk_CBTBL[@id] = self
+    @running = true
+    set_next_callback(@current_args)
+    self
+  end
+
+  def info
+    if @after_id
+      inf = tk_split_list(tk_call_without_enc('after', 'info', @after_id))
+      [Tk_CBTBL[inf[0][1]], inf[1]]
+    else
+      nil
+    end
+  end
+
+  def wait(on_thread = true, check_root = false)
+    if $SAFE >= 4
+      fail SecurityError, "can't wait timer at $SAFE >= 4"
+    end
+
+    unless @running
+      if @return_value.kind_of?(Exception)
+        fail @return_value 
+      else
+        return @return_value 
+      end
+    end
+
+    @wait_var.wait(on_thread, check_root)
+    if @return_value.kind_of?(Exception)
+      fail @return_value 
+    else
+      @return_value 
+    end
+  end
+  def eventloop_wait(check_root = false)
+    wait(false, check_root)
+  end
+  def thread_wait(check_root = false)
+    wait(true, check_root)
+  end
+  def tkwait(on_thread = true)
+    wait(on_thread, true)
+  end
+  def eventloop_tkwait
+    wait(false, true)
+  end
+  def thread_tkwait
+    wait(true, true)
+  end
+end
+
+TkAfter = TkTimer
+
+
+class TkRTTimer < TkTimer
+  DEFAULT_OFFSET_LIST_SIZE = 5
+
+  def initialize(*args, &b)
+    super(*args, &b)
+
+    @offset_list = Array.new(DEFAULT_OFFSET_LIST_SIZE){ [0, 0] }
+    @offset_s = 0
+    @offset_u = 0
+    @est_time = nil
+  end
+
+  def start(*args, &b)
+    return nil if @running
+    @est_time = nil
+    @cb_start_time = Time.now
+    super(*args, &b)
+  end
+
+  def cancel
+    super()
+    @est_time = nil
+    @cb_start_time = Time.now
+    self
+  end
+  alias stop cancel
+
+  def continue(wait=nil)
+    fail RuntimeError, "is already running" if @running
+    @cb_start_time = Time.now
+    super(wait)
+  end
+
+  def set_interval(interval)
+    super(interval)
+    @est_time = nil
+  end
+
+  def _offset_ave
+    size = 0
+    d_sec = 0; d_usec = 0
+    @offset_list.each_with_index{|offset, idx|
+      # weight = 1
+      weight = idx + 1
+      size += weight
+      d_sec += offset[0] * weight
+      d_usec += offset[1] * weight
+    }
+    offset_s, mod = d_sec.divmod(size)
+    offset_u = ((mod * 1000000 + d_usec) / size.to_f).round
+    [offset_s, offset_u]
+  end
+  private :_offset_ave
+
+  def set_next_callback(args)
+    if @running == false || @proc_max == 0 || @do_loop == 0
+      Tk_CBTBL.delete(@id) ;# for GC
+      @running = false
+      @wait_var.value = 0
+      return
+    end
+    if @current_pos >= @proc_max
+      if @do_loop < 0 || (@do_loop -= 1) > 0
+        @current_pos = 0
+      else
+        Tk_CBTBL.delete(@id) ;# for GC
+        @running = false
+        @wait_var.value = 0
+        return
+      end
+    end
+
+    @current_args = args
+
+    cmd, *cmd_args = @loop_proc[@current_pos]
+    @current_pos += 1
+    @current_proc = cmd
+
+    @offset_s, @offset_u = _offset_ave
+
+    if TkComm._callback_entry?(@sleep_time)
+      sleep = @sleep_time.call(self)
+    else
+      sleep = @sleep_time
+    end
+
+    if @est_time
+      @est_time = Time.at(@est_time.to_i, @est_time.usec + sleep*1000)
+    else
+      @est_time = Time.at(@cb_start_time.to_i, 
+                          @cb_start_time.usec + sleep*1000)
+    end
+
+    now = Time.now
+    real_sleep = ((@est_time.to_i - now.to_i + @offset_s)*1000.0 + 
+                  (@est_time.usec - now.usec + @offset_u)/1000.0).round
+    if real_sleep <= 0
+      real_sleep = 0
+      @offset_s = now.to_i
+      @offset_u = now.usec
+    end
+    @current_sleep = real_sleep
+
+    set_callback(real_sleep, cmd_args)
+  end
+
+  def cb_call
+    if @est_time
+      @offset_list.shift
+
+      @cb_start_time = Time.now
+
+      if @current_sleep == 0
+        @offset_list.push([
+                            @offset_s - @cb_start_time.to_i, 
+                            @offset_u - @cb_start_time.usec
+                          ])
+      else
+        @offset_list.push([
+                            @offset_s + (@est_time.to_i - @cb_start_time.to_i),
+                            @offset_u + (@est_time.usec - @cb_start_time.usec)
+                          ])
+      end
+    end
+
+    @cb_cmd.call
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/toplevel.rb b/ruby_1_8_6/ext/tk/lib/tk/toplevel.rb
new file mode 100644
index 0000000000..5e199e1330
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/toplevel.rb
@@ -0,0 +1,257 @@
+#
+# tk/toplevel.rb : treat toplevel widget
+#
+require 'tk'
+require 'tk/wm'
+require 'tk/menuspec'
+
+class TkToplevel<TkWindow
+  include Wm
+  include TkMenuSpec
+
+  TkCommandNames = ['toplevel'.freeze].freeze
+  WidgetClassName = 'Toplevel'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+################# old version
+#  def initialize(parent=nil, screen=nil, classname=nil, keys=nil)
+#    if screen.kind_of? Hash
+#      keys = screen.dup
+#    else
+#      @screen = screen
+#    end
+#    @classname = classname
+#    if keys.kind_of? Hash
+#      keys = keys.dup
+#      @classname = keys.delete('classname') if keys.key?('classname')
+#      @colormap  = keys.delete('colormap')  if keys.key?('colormap')
+#      @container = keys.delete('container') if keys.key?('container')
+#      @screen    = keys.delete('screen')    if keys.key?('screen')
+#      @use       = keys.delete('use')       if keys.key?('use')
+#      @visual    = keys.delete('visual')    if keys.key?('visual')
+#    end
+#    super(parent, keys)
+#  end
+#
+#  def create_self
+#    s = []
+#    s << "-class"     << @classname if @classname
+#    s << "-colormap"  << @colormap  if @colormap
+#    s << "-container" << @container if @container
+#    s << "-screen"    << @screen    if @screen 
+#    s << "-use"       << @use       if @use
+#    s << "-visual"    << @visual    if @visual
+#    tk_call 'toplevel', @path, *s
+#  end
+#################
+
+  def __boolval_optkeys
+    super() << 'container'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'screen'
+  end
+  private :__strval_optkeys
+
+  def __val2ruby_optkeys  # { key=>proc, ... }
+    super().update('menu'=>proc{|v| window(v)})
+  end
+  private :__val2ruby_optkeys
+
+  def __methodcall_optkeys  # { key=>method, ... }
+    TOPLEVEL_METHODCALL_OPTKEYS
+  end
+  private :__methodcall_optkeys
+
+  def _wm_command_option_chk(keys)
+    keys = {} unless keys
+    new_keys = {}
+    wm_cmds = {}
+
+    conf_methods = _symbolkey2str(__methodcall_optkeys())
+
+    keys.each{|k,v|
+      if conf_methods.key?(k)
+        wm_cmds[conf_methods[k]] = v
+      elsif Wm.method_defined?(k)
+        case k
+        when 'screen','class','colormap','container','use','visual'
+          new_keys[k] = v
+        else
+          case self.method(k).arity
+          when -1,1
+            wm_cmds[k] = v
+          else
+            new_keys[k] = v
+          end
+        end
+      else
+        new_keys[k] = v
+      end
+    }
+    [new_keys, wm_cmds]
+  end
+  private :_wm_command_option_chk
+
+  def initialize(parent=nil, screen=nil, classname=nil, keys=nil)
+    my_class_name = nil
+    if self.class < WidgetClassNames[WidgetClassName]
+      my_class_name = self.class.name
+      my_class_name = nil if my_class_name == ''
+    end
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      if keys.key?('classname')
+        keys['class'] = keys.delete('classname')
+      end
+      @classname = keys['class']
+      @colormap  = keys['colormap']
+      @container = keys['container']
+      @screen    = keys['screen']
+      @use       = keys['use']
+      @visual    = keys['visual']
+      if !@classname && my_class_name
+        keys['class'] = @classname = my_class_name 
+      end
+      if @classname.kind_of? TkBindTag
+        @db_class = @classname
+        @classname = @classname.id
+      elsif @classname
+        @db_class = TkDatabaseClass.new(@classname)
+      else
+        @db_class = self.class
+        @classname = @db_class::WidgetClassName
+      end
+      keys, cmds = _wm_command_option_chk(keys)
+      super(keys)
+      cmds.each{|k,v| 
+        if v.kind_of? Array
+          self.__send__(k,*v)
+        else
+          self.__send__(k,v)
+        end
+      }
+      return
+    end
+
+    if screen.kind_of? Hash
+      keys = screen
+    else
+      @screen = screen
+      if classname.kind_of? Hash
+        keys = classname
+      else
+        @classname = classname
+      end
+    end
+    if keys.kind_of? Hash
+      keys = _symbolkey2str(keys)
+      if keys.key?('classname')
+        keys['class'] = keys.delete('classname')
+      end
+      @classname = keys['class']  unless @classname
+      @colormap  = keys['colormap']
+      @container = keys['container']
+      @screen    = keys['screen'] unless @screen
+      @use       = keys['use']
+      @visual    = keys['visual']
+    else
+      keys = {}
+    end
+    if !@classname && my_class_name
+      keys['class'] = @classname = my_class_name 
+    end
+    if @classname.kind_of? TkBindTag
+      @db_class = @classname
+      @classname = @classname.id
+    elsif @classname
+      @db_class = TkDatabaseClass.new(@classname)
+    else
+      @db_class = self.class
+      @classname = @db_class::WidgetClassName
+    end
+    keys, cmds = _wm_command_option_chk(keys)
+    super(parent, keys)
+    cmds.each{|k,v| 
+      if v.kind_of? Array
+        self.send(k,*v)
+      else
+        self.send(k,v)
+      end
+    }
+  end
+
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('toplevel', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('toplevel', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def specific_class
+    @classname
+  end
+
+  def add_menu(menu_info, tearoff=false, opts=nil)
+    # See tk/menuspec.rb for menu_info.
+    # opts is a hash of default configs for all of cascade menus. 
+    # Configs of menu_info can override it. 
+    if tearoff.kind_of?(Hash)
+      opts = tearoff
+      tearoff = false
+    end
+    _create_menubutton(self, menu_info, tearoff, opts)
+  end
+
+  def add_menubar(menu_spec, tearoff=false, opts=nil)
+    # See tk/menuspec.rb for menu_spec.
+    # opts is a hash of default configs for all of cascade menus.
+    # Configs of menu_spec can override it. 
+    menu_spec.each{|info| add_menu(info, tearoff, opts)}
+    self.menu
+  end
+
+  def self.database_class
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      self
+    else
+      TkDatabaseClass.new(self.name)
+    end
+  end
+  def self.database_classname
+    self.database_class.name
+  end
+
+  def self.bind(*args, &b)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args, &b)
+    else
+      TkDatabaseClass.new(self.name).bind(*args, &b)
+    end
+  end
+  def self.bind_append(*args, &b)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args, &b)
+    else
+      TkDatabaseClass.new(self.name).bind_append(*args, &b)
+    end
+  end
+  def self.bind_remove(*args)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args)
+    else
+      TkDatabaseClass.new(self.name).bind_remove(*args)
+    end
+  end
+  def self.bindinfo(*args)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args)
+    else
+      TkDatabaseClass.new(self.name).bindinfo(*args)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/txtwin_abst.rb b/ruby_1_8_6/ext/tk/lib/tk/txtwin_abst.rb
new file mode 100644
index 0000000000..540f806d17
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/txtwin_abst.rb
@@ -0,0 +1,39 @@
+#
+# tk/txtwin_abst.rb : TkTextWin abstruct class
+#
+require 'tk'
+
+class TkTextWin<TkWindow
+  TkCommandNames = [].freeze
+  #def create_self
+  #  fail RuntimeError, "TkTextWin is an abstract class"
+  #end
+  #private :create_self
+
+  def bbox(index)
+    list(tk_send_without_enc('bbox', index))
+  end
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+  def get(*index)
+    _fromUTF8(tk_send_without_enc('get', *index))
+  end
+  def insert(index, *args)
+    tk_send('insert', index, *args)
+    self
+  end
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+  def see(index)
+    tk_send_without_enc('see', index)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/validation.rb b/ruby_1_8_6/ext/tk/lib/tk/validation.rb
new file mode 100644
index 0000000000..0c5b5c61b9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/validation.rb
@@ -0,0 +1,376 @@
+#
+#  tk/validation.rb - validation support module for entry, spinbox, and so on
+#
+require 'tk'
+
+module Tk
+  module ValidateConfigure
+    def self.__def_validcmd(scope, klass, keys=nil)
+      keys = klass._config_keys unless keys
+      keys.each{|key|
+        eval("def #{key}(*args, &b)
+                 __validcmd_call(#{klass.name}, '#{key}', *args, &b)
+              end", scope)
+      }
+    end
+
+    def __validcmd_call(klass, key, *args, &b)
+      return cget(key) if args.empty? && !b
+
+      cmd = (b)? proc(&b) : args.shift
+
+      if cmd.kind_of?(klass)
+        configure(key, cmd)
+      elsif !args.empty?
+        configure(key, [cmd, args])
+      else
+        configure(key, cmd)
+      end
+    end
+
+    def __validation_class_list
+      # maybe need to override
+      []
+    end
+
+    def __get_validate_key2class
+      k2c = {}
+      __validation_class_list.each{|klass|
+        klass._config_keys.each{|key|
+          k2c[key.to_s] = klass
+        }
+      }
+      k2c
+    end
+
+    def __conv_vcmd_on_hash_kv(keys)
+      key2class = __get_validate_key2class
+
+      keys = _symbolkey2str(keys)
+      key2class.each{|key, klass|
+        if keys[key].kind_of?(Array)
+          cmd, *args = keys[key]
+          keys[key] = klass.new(cmd, args.join(' '))
+        # elsif keys[key].kind_of?(Proc) ||  keys[key].kind_of?(Method)
+        elsif TkComm._callback_entry?(keys[key])
+          keys[key] = klass.new(keys[key])
+        end
+      }
+      keys
+    end
+
+    def create_self(keys)
+      super(__conv_vcmd_on_hash_kv(keys))
+    end
+    private :create_self
+
+    def configure(slot, value=TkComm::None)
+      if slot.kind_of?(Hash)
+        super(__conv_vcmd_on_hash_kv(slot))
+      else
+        super(__conv_vcmd_on_hash_kv(slot=>value))
+      end
+      self
+    end
+=begin
+    def configure(slot, value=TkComm::None)
+      key2class = __get_validate_key2class
+
+      if slot.kind_of?(Hash)
+        slot = _symbolkey2str(slot)
+        key2class.each{|key, klass|
+          if slot[key].kind_of?(Array)
+            cmd, *args = slot[key]
+            slot[key] = klass.new(cmd, args.join(' '))
+          elsif slot[key].kind_of?(Proc) || slot[key].kind_of?(Method)
+            slot[key] = klass.new(slot[key])
+          end
+        }
+        super(slot)
+
+      else
+        slot = slot.to_s
+        if (klass = key2class[slot])
+          if value.kind_of?(Array)
+            cmd, *args = value
+            value = klass.new(cmd, args.join(' '))
+          elsif value.kind_of?(Proc) || value.kind_of?(Method)
+            value = klass.new(value)
+          end
+        end
+        super(slot, value)
+      end
+
+      self
+    end
+=end
+  end
+
+  module ItemValidateConfigure
+    def self.__def_validcmd(scope, klass, keys=nil)
+      keys = klass._config_keys unless keys
+      keys.each{|key|
+        eval("def item_#{key}(id, *args, &b)
+                 __item_validcmd_call(#{klass.name}, '#{key}', id, *args, &b)
+              end", scope)
+      }
+    end
+
+    def __item_validcmd_call(tagOrId, klass, key, *args, &b)
+      return itemcget(tagid(tagOrId), key) if args.empty? && !b
+
+      cmd = (b)? proc(&b) : args.shift
+
+      if cmd.kind_of?(klass)
+        itemconfigure(tagid(tagOrId), key, cmd)
+      elsif !args.empty?
+        itemconfigure(tagid(tagOrId), key, [cmd, args])
+      else
+        itemconfigure(tagid(tagOrId), key, cmd)
+      end
+    end
+
+    def __item_validation_class_list(id)
+      # maybe need to override
+      []
+    end
+
+    def __get_item_validate_key2class(id)
+      k2c = {}
+      __item_validation_class_list(id).each{|klass|
+        klass._config_keys.each{|key|
+          k2c[key.to_s] = klass
+        }
+      }
+    end
+
+    def __conv_item_vcmd_on_hash_kv(keys)
+      key2class = __get_item_validate_key2class(tagid(tagOrId))
+
+      keys = _symbolkey2str(keys)
+      key2class.each{|key, klass|
+        if keys[key].kind_of?(Array)
+          cmd, *args = keys[key]
+          keys[key] = klass.new(cmd, args.join(' '))
+        # elsif keys[key].kind_of?(Proc) || keys[key].kind_of?(Method)
+        elsif TkComm._callback_entry?(keys[key])
+          keys[key] = klass.new(keys[key])
+        end
+      }
+      keys
+    end
+
+    def itemconfigure(tagOrId, slot, value=TkComm::None)
+      if slot.kind_of?(Hash)
+        super(__conv_item_vcmd_on_hash_kv(slot))
+      else
+        super(__conv_item_vcmd_on_hash_kv(slot=>value))
+      end
+      self
+    end
+=begin
+    def itemconfigure(tagOrId, slot, value=TkComm::None)
+      key2class = __get_item_validate_key2class(tagid(tagOrId))
+
+      if slot.kind_of?(Hash)
+        slot = _symbolkey2str(slot)
+        key2class.each{|key, klass|
+          if slot[key].kind_of?(Array)
+            cmd, *args = slot[key]
+            slot[key] = klass.new(cmd, args.join(' '))
+          elsif slot[key].kind_of?(Proc) ||  slot[key].kind_of?(Method)
+            slot[key] = klass.new(slot[key])
+          end
+        }
+        super(slot)
+
+      else
+        slot = slot.to_s
+        if (klass = key2class[slot])
+          if value.kind_of?(Array)
+            cmd, *args = value
+            value = klass.new(cmd, args.join(' '))
+          elsif value.kind_of?(Proc) || value.kind_of?(Method)
+            value = klass.new(value)
+          end
+        end
+        super(slot, value)
+      end
+
+      self
+    end
+=end
+  end
+end
+
+class TkValidateCommand
+  include TkComm
+  extend  TkComm
+
+  class ValidateArgs < TkUtil::CallbackSubst
+    KEY_TBL = [
+      [ ?d, ?n, :action ], 
+      [ ?i, ?x, :index ], 
+      [ ?s, ?e, :current ], 
+      [ ?v, ?s, :type ], 
+      [ ?P, ?e, :value ], 
+      [ ?S, ?e, :string ], 
+      [ ?V, ?s, :triggered ], 
+      [ ?W, ?w, :widget ], 
+      nil
+    ]
+
+    PROC_TBL = [
+      [ ?n, TkComm.method(:number) ], 
+      [ ?s, TkComm.method(:string) ], 
+      [ ?w, TkComm.method(:window) ], 
+
+      [ ?e, proc{|val|
+          #enc = Tk.encoding
+          enc = ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
+          if enc
+            Tk.fromUTF8(TkComm::string(val), enc)
+          else
+            TkComm::string(val)
+          end
+        }
+      ], 
+
+      [ ?x, proc{|val|
+          idx = TkComm::number(val)
+          if idx < 0
+            nil
+          else
+            idx
+          end
+        }
+      ], 
+
+      nil
+    ]
+
+    _setup_subst_table(KEY_TBL, PROC_TBL);
+
+    #
+    # NOTE: The order of parameters which passed to callback procedure is 
+    #        <extra_arg>, <extra_arg>, ... , <subst_arg>, <subst_arg>, ...
+    #
+
+    #def self._get_extra_args_tbl
+    #  # return an array of convert procs
+    #  []
+    #end
+
+    def self.ret_val(val)
+      (val)? '1': '0'
+    end
+  end
+
+  ###############################################
+
+  def self._config_keys
+    # array of config-option key (string or symbol)
+    ['vcmd', 'validatecommand', 'invcmd', 'invalidcommand']
+  end
+
+  def _initialize_for_cb_class(klass, cmd = Proc.new, *args)
+    extra_args_tbl = klass._get_extra_args_tbl
+
+    if args.compact.size > 0
+      args = args.join(' ')
+      keys = klass._get_subst_key(args)
+      if cmd.kind_of?(String)
+        id = cmd
+      elsif cmd.kind_of?(TkCallbackEntry)
+        @id = install_cmd(cmd)
+      else
+        @id = install_cmd(proc{|*arg|
+             ex_args = []
+             extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
+             klass.ret_val(cmd.call(
+               *(ex_args.concat(klass.scan_args(keys, arg)))
+             ))
+        }) + ' ' + args
+      end
+    else
+      keys, args = klass._get_all_subst_keys
+      if cmd.kind_of?(String)
+        id = cmd
+      elsif cmd.kind_of?(TkCallbackEntry)
+        @id = install_cmd(cmd)
+      else
+        @id = install_cmd(proc{|*arg|
+             ex_args = []
+             extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
+             klass.ret_val(cmd.call(
+               *(ex_args << klass.new(*klass.scan_args(keys, arg)))
+             ))
+        }) + ' ' + args
+      end
+    end
+  end
+
+  def initialize(cmd = Proc.new, *args)
+    _initialize_for_cb_class(self.class::ValidateArgs, cmd, *args)
+  end
+
+  def to_eval
+    @id
+  end
+end
+
+module TkValidation
+  include Tk::ValidateConfigure
+
+  class ValidateCmd < TkValidateCommand
+    module Action
+      Insert = 1
+      Delete = 0
+      Others = -1
+      Focus  = -1
+      Forced = -1
+      Textvariable = -1
+      TextVariable = -1
+    end
+  end
+
+  #####################################
+
+  def __validation_class_list
+    super() << ValidateCmd
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, ValidateCmd)
+
+=begin
+  def validatecommand(cmd = Proc.new, args = nil)
+    if cmd.kind_of?(ValidateCmd)
+      configure('validatecommand', cmd)
+    elsif args
+      configure('validatecommand', [cmd, args])
+    else
+      configure('validatecommand', cmd)
+    end
+  end
+=end
+#  def validatecommand(*args, &b)
+#    __validcmd_call(ValidateCmd, 'validatecommand', *args, &b)
+#  end
+#  alias vcmd validatecommand
+
+=begin
+  def invalidcommand(cmd = Proc.new, args = nil)
+    if cmd.kind_of?(ValidateCmd)
+      configure('invalidcommand', cmd)
+    elsif args
+      configure('invalidcommand', [cmd, args])
+    else
+      configure('invalidcommand', cmd)
+    end
+  end
+=end
+#  def invalidcommand(*args, &b)
+#    __validcmd_call(ValidateCmd, 'invalidcommand', *args, &b)
+#  end
+#  alias invcmd invalidcommand
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/variable.rb b/ruby_1_8_6/ext/tk/lib/tk/variable.rb
new file mode 100644
index 0000000000..e5cacadc1a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/variable.rb
@@ -0,0 +1,1651 @@
+#
+# tk/variable.rb : treat Tk variable object
+#
+require 'tk'
+
+class TkVariable
+  include Tk
+  extend TkCore
+
+  include Comparable
+
+  #TkCommandNames = ['tkwait'.freeze].freeze
+  TkCommandNames = ['vwait'.freeze].freeze
+
+  #TkVar_CB_TBL = {}
+  #TkVar_ID_TBL = {}
+  TkVar_CB_TBL = TkCore::INTERP.create_table
+  TkVar_ID_TBL = TkCore::INTERP.create_table
+  Tk_VARIABLE_ID = ["v".freeze, "00000".taint].freeze
+
+  #TkCore::INTERP.add_tk_procs('rb_var', 'args', 
+  #     "ruby [format \"TkVariable.callback %%Q!%s!\" $args]")
+TkCore::INTERP.add_tk_procs('rb_var', 'args', <<-'EOL')
+    if {[set st [catch {eval {ruby_cmd TkVariable callback} $args} ret]] != 0} {
+       set idx [string first "\n\n" $ret]
+       if {$idx > 0} {
+          global errorInfo
+          set tcl_backtrace $errorInfo
+          set errorInfo [string range $ret [expr $idx + 2] \
+                                           [string length $ret]]
+          append errorInfo "\n" $tcl_backtrace
+          bgerror [string range $ret 0 [expr $idx - 1]]
+       } else {
+          bgerror $ret
+       }
+       return ""
+       #return -code $st $ret
+    } else {
+        return $ret
+    }
+  EOL
+
+  #def TkVariable.callback(args)
+  def TkVariable.callback(id, name1, name2, op)
+    #name1,name2,op = tk_split_list(args)
+    #name1,name2,op = tk_split_simplelist(args)
+    if TkVar_CB_TBL[id]
+      #_get_eval_string(TkVar_CB_TBL[name1].trace_callback(name2,op))
+      begin
+        _get_eval_string(TkVar_CB_TBL[id].trace_callback(name2, op))
+      rescue SystemExit
+        exit(0)
+      rescue Interrupt
+        exit!(1)
+      rescue Exception => e
+        begin
+          msg = _toUTF8(e.class.inspect) + ': ' + 
+                _toUTF8(e.message) + "\n" + 
+                "\n---< backtrace of Ruby side >-----\n" + 
+                _toUTF8(e.backtrace.join("\n")) + 
+                "\n---< backtrace of Tk side >-------"
+          msg.instance_variable_set(:@encoding, 'utf-8')
+        rescue Exception
+          msg = e.class.inspect + ': ' + e.message + "\n" + 
+                "\n---< backtrace of Ruby side >-----\n" + 
+                e.backtrace.join("\n") + 
+                "\n---< backtrace of Tk side >-------"
+        end
+        fail(e, msg)
+      end
+=begin
+      begin
+        raise 'check backtrace'
+      rescue
+        # ignore backtrace before 'callback'
+        pos = -($!.backtrace.size)
+      end
+      begin
+        _get_eval_string(TkVar_CB_TBL[name1].trace_callback(name2,op))
+      rescue
+        trace = $!.backtrace
+        raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" + 
+                  "\tfrom #{trace[1..pos].join("\n\tfrom ")}"
+      end
+=end
+    else
+      ''
+    end
+  end
+
+  def self.new_hash(val = {})
+    if val.kind_of?(Hash)
+      self.new(val)
+    else
+      fail ArgumentError, 'Hash is expected'
+    end
+  end
+
+  #
+  # default_value is available only when the variable is an assoc array. 
+  #
+  def default_value(val=nil, &b)
+    if b
+      @def_default = :proc
+      @default_val = proc(&b)
+    else
+      @def_default = :val
+      @default_val = val
+    end
+    self
+  end
+  def set_default_value(val)
+    @def_default = :val
+    @default_val = val
+    self
+  end
+  alias default_value= set_default_value
+  def default_proc(cmd = Proc.new)
+    @def_default = :proc
+    @default_val = cmd
+    self
+  end
+
+  def undef_default
+    @default_val = nil
+    @def_default = false
+    self
+  end
+
+  def default_value_type
+    @type
+  end
+  def default_element_value_type(idxs)
+    if idxs.kind_of?(Array)
+      index = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
+    else
+      index = _get_eval_string(idxs, true)
+    end
+    @element_type[index]
+  end
+
+  def _set_default_value_type_core(type, idxs)
+    if type.kind_of?(Class)
+      if type == NilClass
+        type = nil
+      elsif type == Numeric
+        type = :numeric
+      elsif type == TrueClass || type == FalseClass
+        type = :bool
+      elsif type == String
+        type = :string
+      elsif type == Symbol
+        type = :symbol
+      elsif type == Array
+        type = :list
+      elsif type <= TkVariable
+        type = :variable
+      elsif type <= TkWindow
+        type = :window
+      elsif TkComm._callback_entry_class?(type)
+        type = :procedure
+      else
+        type = nil
+      end
+    else
+      case(type)
+      when nil
+        type = nil
+      when :numeric, 'numeric'
+        type = :numeric
+      when true, false, :bool, 'bool'
+        type = :bool
+      when :string, 'string'
+        type = :string
+      when :symbol, 'symbol'
+        type = :symbol
+      when :list, 'list'
+        type = :list
+      when :numlist, 'numlist'
+        type = :numlist
+      when :variable, 'variable'
+        type = :variable
+      when :window, 'window'
+        type = :window
+      when :procedure, 'procedure'
+        type = :procedure
+      else
+        return _set_default_value_type_core(type.class, idxs)
+      end
+    end
+    if idxs
+      if idxs.kind_of?(Array)
+        index = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
+      else
+        index = _get_eval_string(idxs, true)
+      end
+      @element_type[index] = type
+    else
+      @type = type
+    end
+    type
+  end
+  private :_set_default_value_type_core
+
+  def set_default_value_type(type)
+    _set_default_value_type_core(type, nil)
+    self
+  end
+  alias default_value_type= set_default_value_type
+
+  def set_default_element_value_type(idxs, type)
+    _set_default_value_type_core(type, idxs)
+    self
+  end
+
+  def _to_default_type(val, idxs = nil)
+    if idxs
+      if idxs.kind_of?(Array)
+        index = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
+      else
+        index = _get_eval_string(idxs, true)
+      end
+      type = @element_type[index]
+    else
+      type = @type
+    end
+    return val unless type
+    if val.kind_of?(Hash)
+      val.keys.each{|k| val[k] = _to_default_type(val[k], idxs) }
+      val
+    else
+      begin
+        case(type)
+        when :numeric
+          number(val)
+        when :bool
+          TkComm.bool(val)
+        when :string
+          val
+        when :symbol
+          val.intern
+        when :list
+          tk_split_simplelist(val)
+        when :numlist
+          tk_split_simplelist(val).collect!{|v| number(v)}
+        when :variable
+          TkVarAccess.new(val)
+        when :window
+          TkComm.window(val)
+        when :procedure
+          TkComm.procedure(val)
+        else
+          val
+        end
+      rescue
+        val
+      end
+    end
+  end
+  private :_to_default_type
+
+  def _to_default_element_type(idxs, val)
+    _to_default_type(val, idxs)
+  end
+  private :_to_default_element_type
+
+  def initialize(val="", type=nil)
+    # @id = Tk_VARIABLE_ID.join('')
+    begin
+      @id = Tk_VARIABLE_ID.join(TkCore::INTERP._ip_id_)
+      Tk_VARIABLE_ID[1].succ!
+    end until INTERP._invoke_without_enc('info', 'globals', @id).empty?
+
+    TkVar_ID_TBL[@id] = self
+
+    @var  = @id
+    @elem = nil
+
+    @def_default = false
+    @default_val = nil
+
+    @trace_var  = nil
+    @trace_elem = nil
+    @trace_opts = nil
+
+    @type = nil
+    var = self
+    @element_type = Hash.new{|k,v| var.default_value_type }
+
+    self.default_value_type = type
+
+    # teach Tk-ip that @id is global var
+    INTERP._invoke_without_enc('global', @id)
+    #INTERP._invoke('global', @id)
+
+    # create and init
+    if val.kind_of?(Hash)
+      # assoc-array variable
+      self[''] = 0
+      self.clear
+    end
+    self.value = val
+
+=begin
+    if val == []
+      # INTERP._eval(format('global %s; set %s(0) 0; unset %s(0)', 
+      #                     @id, @id, @id))
+    elsif val.kind_of?(Array)
+      a = []
+      # val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))}
+      # s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      val.each_with_index{|e,i| a.push(i); a.push(e)}
+      #s = '"' + array2tk_list(a).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      s = '"' + array2tk_list(a).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(format('global %s; array set %s %s', @id, @id, s))
+    elsif  val.kind_of?(Hash)
+      #s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+      #             .gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+                   .gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(format('global %s; array set %s %s', @id, @id, s))
+    else
+      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(format('global %s; set %s %s', @id, @id, s))
+    end
+=end
+=begin
+    if  val.kind_of?(Hash)
+      #s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+      #             .gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+                   .gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(Kernel.format('global %s; array set %s %s', @id, @id, s))
+    else
+      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
+    end
+=end
+  end
+
+  def wait(on_thread = false, check_root = false)
+    if $SAFE >= 4
+      fail SecurityError, "can't wait variable at $SAFE >= 4"
+    end
+    on_thread &= (Thread.list.size != 1)
+    if on_thread
+      if check_root
+        INTERP._thread_tkwait('variable', @id)
+      else
+        INTERP._thread_vwait(@id)
+      end
+    else 
+      if check_root
+        INTERP._invoke_without_enc('tkwait', 'variable', @id)
+      else
+        INTERP._invoke_without_enc('vwait', @id)
+      end
+    end
+  end
+  def eventloop_wait(check_root = false)
+    wait(false, check_root)
+  end
+  def thread_wait(check_root = false)
+    wait(true, check_root)
+  end
+  def tkwait(on_thread = true)
+    wait(on_thread, true)
+  end
+  def eventloop_tkwait
+    wait(false, true)
+  end
+  def thread_tkwait
+    wait(true, true)
+  end
+
+  def id
+    @id
+  end
+
+  def ref(*idxs)
+    # "#{@id}(#{idxs.collect{|idx| _get_eval_string(idx)}.join(',')})"
+    TkVarAccess.new("#{@id}(#{idxs.collect{|idx| _get_eval_string(idx)}.join(',')})")
+  end
+
+  def is_hash?
+    #ITNERP._eval("global #{@id}; array exist #{@id}") == '1'
+    INTERP._invoke_without_enc('global', @id)
+    # INTERP._invoke_without_enc('array', 'exist', @id) == '1'
+    TkComm.bool(INTERP._invoke_without_enc('array', 'exist', @id))
+  end
+
+  def is_scalar?
+    ! is_hash?
+  end
+
+  def exist?(*elems)
+    INTERP._invoke_without_enc('global', @id)
+    if elems.empty?
+      TkComm.bool(tk_call('info', 'exist', @id))
+    else
+      # array
+      index = elems.collect{|idx| _get_eval_string(idx, true)}.join(',')
+      TkComm.bool(tk_call('info', 'exist', "#{@id}")) && 
+        TkComm.bool(tk_call('info', 'exist', "#{@id}(#{index})"))
+    end
+  end
+
+  def keys
+    if (is_scalar?)
+      fail RuntimeError, 'cannot get keys from a scalar variable'
+    end
+    #tk_split_simplelist(INTERP._eval("global #{@id}; array get #{@id}"))
+    INTERP._invoke_without_enc('global', @id)
+    #tk_split_simplelist(INTERP._fromUTF8(INTERP._invoke_without_enc('array', 'names', @id)))
+    tk_split_simplelist(INTERP._invoke_without_enc('array', 'names', @id), 
+                        false, true)
+  end
+
+  def size
+    INTERP._invoke_without_enc('global', @id)
+    TkComm.number(INTERP._invoke_without_enc('array', 'size', @id))
+  end
+
+  def clear
+    if (is_scalar?)
+      fail RuntimeError, 'cannot clear a scalar variable'
+    end
+    keys.each{|k| unset(k)}
+    self
+  end
+
+  def update(hash)
+    if (is_scalar?)
+      fail RuntimeError, 'cannot update a scalar variable'
+    end
+    hash.each{|k,v| self[k] = v}
+    self
+  end
+
+unless const_defined?(:USE_TCLs_SET_VARIABLE_FUNCTIONS)
+  USE_TCLs_SET_VARIABLE_FUNCTIONS = true
+end
+
+if USE_TCLs_SET_VARIABLE_FUNCTIONS
+  ###########################################################################
+  # use Tcl function version of set tkvariable
+  ###########################################################################
+
+  def _value
+    #if INTERP._eval("global #{@id}; array exist #{@id}") == '1'
+    INTERP._invoke_without_enc('global', @id)
+    # if INTERP._invoke('array', 'exist', @id) == '1'
+    if TkComm.bool(INTERP._invoke('array', 'exist', @id))
+      #Hash[*tk_split_simplelist(INTERP._eval("global #{@id}; array get #{@id}"))]
+      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', @id))]
+    else
+      _fromUTF8(INTERP._get_global_var(@id))
+    end
+  end
+
+  def value=(val)
+    val = val._value if !@type && @type != :variable && val.kind_of?(TkVariable)
+    if val.kind_of?(Hash)
+      self.clear
+      val.each{|k, v|
+        #INTERP._set_global_var2(@id, _toUTF8(_get_eval_string(k)), 
+        #                       _toUTF8(_get_eval_string(v)))
+        INTERP._set_global_var2(@id, _get_eval_string(k, true), 
+                                _get_eval_string(v, true))
+      }
+      self.value
+#    elsif val.kind_of?(Array)
+=begin
+      INTERP._set_global_var(@id, '')
+      val.each{|v|
+        #INTERP._set_variable(@id, _toUTF8(_get_eval_string(v)), 
+        INTERP._set_variable(@id, _get_eval_string(v, true), 
+                             TclTkLib::VarAccessFlag::GLOBAL_ONLY   | 
+                             TclTkLib::VarAccessFlag::LEAVE_ERR_MSG |
+                             TclTkLib::VarAccessFlag::APPEND_VALUE  | 
+                             TclTkLib::VarAccessFlag::LIST_ELEMENT)
+      }
+      self.value
+=end
+#      _fromUTF8(INTERP._set_global_var(@id, array2tk_list(val, true)))
+    else
+      #_fromUTF8(INTERP._set_global_var(@id, _toUTF8(_get_eval_string(val))))
+      _fromUTF8(INTERP._set_global_var(@id, _get_eval_string(val, true)))
+    end
+  end
+
+  def _element_value(*idxs)
+    index = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
+    begin
+      _fromUTF8(INTERP._get_global_var2(@id, index))
+    rescue => e
+      case @def_default
+      when :proc
+        @default_val.call(self, *idxs)
+      when :val
+        @default_val
+      else
+        fail e
+      end
+    end
+    #_fromUTF8(INTERP._get_global_var2(@id, index))
+    #_fromUTF8(INTERP._get_global_var2(@id, _toUTF8(_get_eval_string(index))))
+    #_fromUTF8(INTERP._get_global_var2(@id, _get_eval_string(index, true)))
+  end
+
+  def []=(*args)
+    val = args.pop
+    type = default_element_value_type(args)
+    val = val._value if !type && type != :variable && val.kind_of?(TkVariable)
+    index = args.collect{|idx| _get_eval_string(idx, true)}.join(',')
+    _fromUTF8(INTERP._set_global_var2(@id, index, _get_eval_string(val, true)))
+    #_fromUTF8(INTERP._set_global_var2(@id, _toUTF8(_get_eval_string(index)), 
+    #                                 _toUTF8(_get_eval_string(val))))
+    #_fromUTF8(INTERP._set_global_var2(@id, _get_eval_string(index, true), 
+    #                                 _get_eval_string(val, true)))
+  end
+
+  def unset(*elems)
+    if elems.empty?
+      INTERP._unset_global_var(@id)
+    else
+      index = elems.collect{|idx| _get_eval_string(idx, true)}.join(',')
+      INTERP._unset_global_var2(@id, index)
+    end
+  end
+  alias remove unset
+
+else
+  ###########################################################################
+  # use Ruby script version of set tkvariable (traditional methods)
+  ###########################################################################
+
+  def _value
+    begin
+      INTERP._eval(Kernel.format('global %s; set %s', @id, @id))
+      #INTERP._eval(Kernel.format('set %s', @id))
+      #INTERP._invoke_without_enc('set', @id)
+    rescue
+      if INTERP._eval(Kernel.format('global %s; array exists %s', 
+                            @id, @id)) != "1"
+      #if INTERP._eval(Kernel.format('array exists %s', @id)) != "1"
+      #if INTERP._invoke_without_enc('array', 'exists', @id) != "1"
+        fail
+      else
+        Hash[*tk_split_simplelist(INTERP._eval(Kernel.format('global %s; array get %s', @id, @id)))]
+        #Hash[*tk_split_simplelist(_fromUTF8(INTERP._invoke_without_enc('array', 'get', @id)))]
+      end
+    end
+  end
+
+  def value=(val)
+    val = val._value if !@type && @type != :variable && val.kind_of?(TkVariable)
+    begin
+      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
+      #INTERP._eval(Kernel.format('set %s %s', @id, s))
+      #_fromUTF8(INTERP._invoke_without_enc('set', @id, _toUTF8(s)))
+    rescue
+      if INTERP._eval(Kernel.format('global %s; array exists %s', 
+                            @id, @id)) != "1"
+      #if INTERP._eval(Kernel.format('array exists %s', @id)) != "1"
+      #if INTERP._invoke_without_enc('array', 'exists', @id) != "1"
+        fail
+      else
+        if val == []
+          INTERP._eval(Kernel.format('global %s; unset %s; set %s(0) 0; unset %s(0)', @id, @id, @id, @id))
+          #INTERP._eval(Kernel.format('unset %s; set %s(0) 0; unset %s(0)', 
+          #                          @id, @id, @id))
+          #INTERP._invoke_without_enc('unset', @id)
+          #INTERP._invoke_without_enc('set', @id+'(0)', 0)
+          #INTERP._invoke_without_enc('unset', @id+'(0)')
+        elsif val.kind_of?(Array)
+          a = []
+          val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e, true))}
+          #s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
+          s = '"' + a.join(" ").gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+          INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s', 
+                                     @id, @id, @id, s))
+          #INTERP._eval(Kernel.format('unset %s; array set %s %s', 
+          #                          @id, @id, s))
+          #INTERP._invoke_without_enc('unset', @id)
+          #_fromUTF8(INTERP._invoke_without_enc('array','set', @id, _toUTF8(s)))
+        elsif  val.kind_of?(Hash)
+          #s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+          #                      .gsub(/[\[\]$"]/, '\\\\\&') + '"'
+          s = '"' + val.to_a.collect{|e| array2tk_list(e, true)}.join(" ")\
+                                .gsub(/[\[\]$\\"]/, '\\\\\&') + '"'
+          INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s', 
+                                     @id, @id, @id, s))
+          #INTERP._eval(Kernel.format('unset %s; array set %s %s', 
+          #                          @id, @id, s))
+          #INTERP._invoke_without_enc('unset', @id)
+          #_fromUTF8(INTERP._invoke_without_enc('array','set', @id, _toUTF8(s)))
+        else
+          fail
+        end
+      end
+    end
+  end
+
+  def _element_value(*idxs)
+    index = idxs.collect{|idx| _get_eval_string(idx)}.join(',')
+    begin
+      INTERP._eval(Kernel.format('global %s; set %s(%s)', @id, @id, index))
+    rescue => e
+      case @def_default
+      when :proc
+        @default_val.call(self, *idxs)
+      when :val
+        @default_val
+      else
+        fail e
+      end
+    end
+    #INTERP._eval(Kernel.format('global %s; set %s(%s)', @id, @id, index))
+    #INTERP._eval(Kernel.format('global %s; set %s(%s)', 
+    #                           @id, @id, _get_eval_string(index)))
+    #INTERP._eval(Kernel.format('set %s(%s)', @id, _get_eval_string(index)))
+    #INTERP._eval('set ' + @id + '(' + _get_eval_string(index) + ')')
+  end
+
+  def []=(*args)
+    val = args.pop
+    type = default_element_value_type(args)
+    val = val._value if !type && type != :variable && val.kind_of?(TkVariable)
+    index = args.collect{|idx| _get_eval_string(idx)}.join(',')
+    INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id, 
+                              index, _get_eval_string(val)))
+    #INTERP._eval(Kernel.format('global %s; set %s(%s) %s', @id, @id, 
+    #                          _get_eval_string(index), _get_eval_string(val)))
+    #INTERP._eval(Kernel.format('set %s(%s) %s', @id, 
+    #                          _get_eval_string(index), _get_eval_string(val)))
+    #INTERP._eval('set ' + @id + '(' + _get_eval_string(index) + ') ' + 
+    #            _get_eval_string(val))
+  end
+
+  def unset(*elems)
+    if elems.empty?
+      INTERP._eval(Kernel.format('global %s; unset %s', @id, @id))
+      #INTERP._eval(Kernel.format('unset %s', @id))
+      #INTERP._eval('unset ' + @id)
+    else
+      index = elems.collect{|idx| _get_eval_string(idx, true)}.join(',')
+      INTERP._eval(Kernel.format('global %s; unset %s(%s)', @id, @id, index))
+      #INTERP._eval(Kernel.format('global %s; unset %s(%s)', 
+      #                           @id, @id, _get_eval_string(elem)))
+      #INTERP._eval(Kernel.format('unset %s(%s)', @id, tk_tcl2ruby(elem)))
+      #INTERP._eval('unset ' + @id + '(' + _get_eval_string(elem) + ')')
+    end
+  end
+  alias remove unset
+
+end
+
+  protected :_value, :_element_value
+
+  def value
+    _to_default_type(_value)
+  end
+
+  def [](*idxs)
+    _to_default_element_type(idxs, _element_value(*idxs))
+  end
+
+  def set_value(val)
+    self.value = val
+    self
+  end
+
+  def set_element_value(idxs, val)
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+
+  def set_value_type(val)
+    self.default_value_type = val.class
+    self.value = val
+    self
+  end
+
+  alias value_type= set_value_type
+
+  def set_element_value_type(idxs, val)
+    self.set_default_element_value_type(idxs, val.class)
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+
+  def numeric
+    number(_value)
+  end
+  def numeric_element(*idxs)
+    number(_element_value(*idxs))
+  end
+  def set_numeric(val)
+    case val
+    when Numeric
+      self.value=(val)
+    when TkVariable
+      self.value=(val.numeric)
+    else
+      raise ArgumentError, "Numeric is expected"
+    end
+    self
+  end
+  alias numeric= set_numeric
+  def set_numeric_element(idxs, val)
+    case val
+    when Numeric
+      val
+    when TkVariable
+      val = val.numeric
+    else
+      raise ArgumentError, "Numeric is expected"
+    end
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+  def set_numeric_type(val)
+    @type = :numeric
+    self.numeric=(val)
+    self
+  end
+  alias numeric_type= set_numeric_type
+  def set_numeric_element_type(idxs, val)
+    self.set_default_element_value_type(idxs, :numeric)
+    self.set_numeric_element(idxs, val)
+  end
+
+  def bool
+    TkComm.bool(_value)
+=begin
+    # see Tcl_GetBoolean man-page
+    case _value.downcase
+    when '0', 'false', 'no', 'off'
+      false
+    else
+      true
+    end
+=end
+  end
+  def bool_element(*idxs)
+    TkComm.bool(_element_value(*idxs))
+  end
+  def set_bool(val)
+    if ! val
+      self.value = '0'
+    else
+      case val.to_s.downcase
+      when 'false', '0', 'no', 'off'
+        self.value = '0'
+      else
+        self.value = '1'
+      end
+    end
+    self
+  end
+  alias bool= set_bool
+  def set_bool_element(idxs, val)
+    if ! val
+      val = '0'
+    else
+      case val.to_s.downcase
+      when 'false', '0', 'no', 'off'
+        val = '0'
+      else
+        val = '1'
+      end
+    end
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+  def set_bool_type(val)
+    @type = :bool
+    self.bool=(val)
+    self
+  end
+  alias bool_type= set_bool_type
+  def set_bool_element_type(idxs, val)
+    self.set_default_element_value_type(idxs, :bool)
+    self.set_bool_element(idxs, val)
+  end
+
+  def variable
+    # keeps a Tcl's variable name
+    TkVarAccess.new(self._value)
+  end
+  def variable_element(*idxs)
+    TkVarAccess.new(_element_value(*idxs))
+  end
+  def set_variable(var)
+    var = var.id if var.kind_of?(TkVariable)
+    self.value = var
+    self
+  end
+  alias variable= set_variable
+  def set_variable_element(idxs, var)
+    var = var.id if var.kind_of?(TkVariable)
+    if idxs.kind_of?(Array)
+      self[*idxs]=var
+    else
+      self[idxs]=var
+    end
+    self
+  end
+  def set_variable_type(var)
+    @type = :variable
+    var = var.id if var.kind_of?(TkVariable)
+    self.value = var
+    self
+  end
+  alias variable_type= set_variable_type
+  def set_variable_element_type(idxs, var)
+    self.set_default_element_value_type(idxs, :variable)
+    self.set_variable_element(idxs, var)
+  end
+
+  def window
+    TkComm.window(self._value)
+  end
+  def window_element(*idxs)
+    TkComm.window(_element_value(*idxs))
+  end
+  def set_window(win)
+    win = win._value if win.kind_of?(TkVariable)
+    self.value = win
+    self
+  end
+  alias window= set_window
+  def set_window_element(idxs, win)
+    win = win._value if win.kind_of?(TkVariable)
+    if idxs.kind_of?(Array)
+      self[*idxs]=win
+    else
+      self[idxs]=win
+    end
+    self
+  end
+  def set_window_type(win)
+    @type = :window
+    self.window=(win)
+    self
+  end
+  alias window_type= set_window_type
+  def set_window_element_type(idxs, win)
+    self.set_default_element_value_type(idxs, :window)
+    self.set_window_element(idxs, win)
+  end
+
+  def procedure
+    TkComm.procedure(self._value)
+  end
+  def procedure_element(*idxs)
+    TkComm.procedure(_element_value(*idxs))
+  end
+  def set_procedure(cmd)
+    self.value = cmd
+    self
+  end
+  alias procedure= set_procedure
+  def set_procedure_element(idxs, cmd)
+    cmd = cmd._value if cmd.kind_of?(TkVariable)
+    if idxs.kind_of?(Array)
+      self[*idxs]=cmd
+    else
+      self[idxs]=cmd
+    end
+    self
+  end
+  def set_procedure_type(cmd)
+    @type = :procedure
+    self.procedure=(cmd)
+    self
+  end
+  alias procedure_type= set_procedure_type
+  def set_procedure_element_type(idxs, cmd)
+    self.set_default_element_value_type(idxs, :procedure)
+    self.set_proceure_element(idxs, cmd)
+  end
+
+  def to_i
+    number(_value).to_i
+  end
+  def element_to_i(*idxs)
+    number(_element_value(*idxs)).to_i
+  end
+
+  def to_f
+    number(_value).to_f
+  end
+  def element_to_f(*idxs)
+    number(_element_value(*idxs)).to_f
+  end
+
+  def to_s
+    #string(value).to_s
+    _value
+  end
+  alias string to_s
+  def element_to_s(*idxs)
+    _element_value(*idxs)
+  end
+  def string_element(*idxs)
+    _element_value(*idxs)
+  end
+  def set_string(val)
+    val = val._value if val.kind_of?(TkVariable)
+    self.value=val
+    self
+  end
+  alias string= set_string
+  def set_string_element(idxs, val)
+    val = val._value if val.kind_of?(TkVariable)
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+  def set_string_type(val)
+    @type = :string
+    self.string=(val)
+    self
+  end
+  alias string_type= set_string_type
+  def set_string_element_type(idxs, val)
+    self.set_default_element_value_type(idxs, :string)
+    self.set_string_element(idxs, val)
+  end
+
+  def to_sym
+    _value.intern
+  end
+  alias symbol to_sym
+  def element_to_sym(*idxs)
+    _element_value(*idxs).intern
+  end
+  alias symbol_element element_to_sym
+  def set_symbol(val)
+    val = val._value if val.kind_of?(TkVariable)
+    self.value=val
+    self
+  end
+  alias symbol= set_symbol
+  def set_symbol_element(idxs, val)
+    val = val._value if val.kind_of?(TkVariable)
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+  def set_symbol_type(val)
+    @type = :symbol
+    self.value=(val)
+    self
+  end
+  alias symbol_type= set_symbol_type
+  def set_symbol_element_type(idxs, val)
+    self.set_default_element_value_type(idxs, :symbol)
+    self.set_symbol_element(idxs, val)
+  end
+
+  def list
+    #tk_split_list(value)
+    tk_split_simplelist(_value)
+  end
+  alias to_a list
+  def list_element(*idxs)
+    tk_split_simplelist(_element_value(*idxs))
+  end
+  alias element_to_a list_element
+
+  def numlist
+    list.collect!{|val| number(val)}
+  end
+  def numlist_element(*idxs)
+    list_element(*idxs).collect!{|val| number(val)}
+  end
+
+  def set_list(val)
+    case val
+    when Array
+      self.value=(val)
+    when TkVariable
+      self.value=(val.list)
+    else
+      raise ArgumentError, "Array is expected"
+    end
+    self
+  end
+  alias list= set_list
+
+  alias set_numlist set_list
+  alias numlist= set_numlist
+
+  def set_list_element(idxs, val)
+    case val
+    when Array
+      val
+    when TkVariable
+      val = val.list
+    else
+      raise ArgumentError, "Array is expected"
+    end
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+  alias set_numlist_element set_list_element
+
+  def set_list_type(val)
+    @type = :list
+    self.list=(val)
+    self
+  end
+  alias list_type= set_list_type
+  def set_list_element_type(idxs, val)
+    self.set_default_element_value_type(idxs, :list)
+    self.set_list_element(idxs, val)
+  end
+  def set_numlist_type(val)
+    @type = :numlist
+    self.numlist=(val)
+    self
+  end
+  alias numlist_type= set_numlist_type
+  def set_numlist_element_type(idxs, val)
+    self.set_default_element_value_type(idxs, :numlist)
+    self.set_numlist_element(idxs, val)
+  end
+
+  def lappend(*elems)
+    tk_call('lappend', @id, *elems)
+    self
+  end
+  def element_lappend(idxs, *elems)
+    if idxs.kind_of?(Array)
+      idxs = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
+    end
+    tk_call('lappend', "#{@id}(#{idxs})", *elems)
+    self
+  end
+
+  def lindex(idx)
+    tk_call('lindex', self._value, idx)
+  end
+  alias lget lindex
+  def element_lindex(elem_idxs, idx)
+    if elem_idxs.kind_of?(Array)
+      val = _element_value(*elem_idxs)
+    else
+      val = _element_value(elem_idxs)
+    end
+    tk_call('lindex', val, idx)
+  end
+  alias element_lget element_lindex
+
+  def lget_i(idx)
+    number(lget(idx)).to_i
+  end
+  def element_lget_i(elem_idxs, idx)
+    number(element_lget(elem_idxs, idx)).to_i
+  end
+
+  def lget_f(idx)
+    number(lget(idx)).to_f
+  end
+  def element_lget_f(elem_idxs, idx)
+    number(element_lget(elem_idxs, idx)).to_f
+  end
+
+  def lset(idx, val)
+    tk_call('lset', @id, idx, val)
+    self
+  end
+  def element_lset(elem_idxs, idx, val)
+    if elem_idxs.kind_of?(Array)
+      idxs = elem_idxs.collect{|i| _get_eval_string(i, true)}.join(',')
+    end
+    tk_call('lset', "#{@id}(#{idxs})", idx, val)
+    self
+  end
+
+  def inspect
+    #Kernel.format "#<TkVariable: %s>", @id
+    '#<TkVariable: ' + @id + '>'
+  end
+
+  def coerce(other)
+    case other
+    when TkVariable
+      [other._value, self._value]
+    when String
+      [other, self.to_s]
+    when Symbol
+      [other, self.to_sym]
+    when Integer
+      [other, self.to_i]
+    when Float
+      [other, self.to_f]
+    when Array
+      [other, self.to_a]
+    else
+      [other, self._value]
+    end
+  end
+
+  def &(other)
+    if other.kind_of?(Array)
+      self.to_a & other.to_a
+    else
+      self.to_i & other.to_i
+    end
+  end
+  def |(other)
+    if other.kind_of?(Array)
+      self.to_a | other.to_a
+    else
+      self.to_i | other.to_i
+    end
+  end
+  def +(other)
+    case other
+    when Array
+      self.to_a + other
+    when String
+      self._value + other
+    else
+      begin
+        number(self._value) + other
+      rescue
+        self._value + other.to_s
+      end
+    end
+  end
+  def -(other)
+    if other.kind_of?(Array)
+      self.to_a - other
+    else
+      number(self._value) - other
+    end
+  end
+  def *(other)
+    num_or_str(self._value) * other.to_i
+    #begin
+    #  number(self._value) * other
+    #rescue
+    #  self._value * other
+    #end
+  end
+  def /(other)
+    number(self._value) / other
+  end
+  def %(other)
+    num_or_str(self._value) % other.to_i
+    #begin
+    #  number(self._value) % other
+    #rescue
+    #  self._value % other
+    #end
+  end
+  def **(other)
+    number(self._value) ** other
+  end
+  def =~(other)
+    self._value =~ other
+  end
+
+  def ==(other)
+    case other
+    when TkVariable
+      #self.equal?(other)
+      self._value == other._value
+    when String
+      self.to_s == other
+    when Symbol
+      self.to_sym == other
+    when Integer
+      self.to_i == other
+    when Float
+      self.to_f == other
+    when Array
+      self.to_a == other
+    when Hash
+      # false if self is not an assoc array
+      self._value == other
+    else
+      # false
+      self._value == _get_eval_string(other)
+    end
+  end
+
+  def zero?
+    numeric.zero?
+  end
+  def nonzero?
+    !(numeric.zero?)
+  end
+
+  def <=>(other)
+    if other.kind_of?(TkVariable)
+      begin
+        val = other.numeric
+        other = val
+      rescue
+        other = other._value
+      end
+    elsif other.kind_of?(Numeric)
+      begin
+        return self.numeric <=> other
+      rescue
+        return self._value <=> other.to_s
+      end
+    elsif other.kind_of?(Array)
+      return self.list <=> other
+    else
+      return self._value <=> other
+    end
+  end
+
+  def to_eval
+    @id
+  end
+
+  def trace_callback(elem, op)
+    if @trace_var.kind_of? Array
+      @trace_var.each{|m,e| e.call(self,elem,op) if m.index(op)}
+    end
+    if elem.kind_of?(String) && elem != ''
+      if @trace_elem.kind_of?(Hash) && @trace_elem[elem].kind_of?(Array)
+        @trace_elem[elem].each{|m,e| e.call(self,elem,op) if m.index(op)}
+      end
+    end
+  end
+
+  def trace(opts, cmd = Proc.new)
+    @trace_var = [] if @trace_var == nil
+    #opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
+    opts = opts.to_s
+    opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
+    @trace_var.unshift([opts,cmd])
+    if @trace_opts == nil
+      TkVar_CB_TBL[@id] = self
+      @trace_opts = opts.dup
+      Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 
+                             'rb_var ' << @id)
+=begin
+      if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
+        # TCL_VERSION >= 8.4
+        Tk.tk_call_without_enc('trace', 'add', 'variable', 
+                               @id, @trace_opts, 'rb_var')
+      else
+        # TCL_VERSION <= 8.3
+        Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 'rb_var')
+      end
+=end
+    else
+      newopts = @trace_opts.dup
+      #opts.each_byte{|c| newopts += c.chr unless newopts.index(c)}
+      opts.each_byte{|c| newopts.concat(c.chr) unless newopts.index(c)}
+      if newopts != @trace_opts
+        Tk.tk_call_without_enc('trace', 'vdelete', @id, @trace_opts, 
+                               'rb_var ' << @id)
+        @trace_opts.replace(newopts)
+        Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 
+                               'rb_var ' << @id)
+=begin
+        if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
+          # TCL_VERSION >= 8.4
+          Tk.tk_call_without_enc('trace', 'remove', 'variable', 
+                                 @id, @trace_opts, 'rb_var')
+          @trace_opts.replace(newopts)
+          Tk.tk_call_without_enc('trace', 'add', 'variable', 
+                                 @id, @trace_opts, 'rb_var')
+        else
+          # TCL_VERSION <= 8.3
+          Tk.tk_call_without_enc('trace', 'vdelete', 
+                                 @id, @trace_opts, 'rb_var')
+          @trace_opts.replace(newopts)
+          Tk.tk_call_without_enc('trace', 'variable', 
+                                 @id, @trace_opts, 'rb_var')
+        end
+=end
+      end
+    end
+    self
+  end
+
+  def trace_element(elem, opts, cmd = Proc.new)
+    if @elem
+      fail(RuntimeError, 
+           "invalid for a TkVariable which denotes an element of Tcl's array")
+    end
+    @trace_elem = {} if @trace_elem == nil
+    @trace_elem[elem] = [] if @trace_elem[elem] == nil
+    opts = opts.to_s
+    opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
+    @trace_elem[elem].unshift([opts,cmd])
+    if @trace_opts == nil
+      TkVar_CB_TBL[@id] = self
+      @trace_opts = opts.dup
+      Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 
+                             'rb_var ' << @id)
+=begin
+      if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
+        # TCL_VERSION >= 8.4
+        Tk.tk_call_without_enc('trace', 'add', 'variable', 
+                               @id, @trace_opts, 'rb_var')
+      else
+        # TCL_VERSION <= 8.3
+        Tk.tk_call_without_enc('trace', 'variable', 
+                               @id, @trace_opts, 'rb_var')
+      end
+=end
+    else
+      newopts = @trace_opts.dup
+      # opts.each_byte{|c| newopts += c.chr unless newopts.index(c)}
+      opts.each_byte{|c| newopts.concat(c.chr) unless newopts.index(c)}
+      if newopts != @trace_opts
+        Tk.tk_call_without_enc('trace', 'vdelete', @id, @trace_opts, 
+                               'rb_var ' << @id)
+        @trace_opts.replace(newopts)
+        Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 
+                               'rb_var ' << @id)
+=begin
+        if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
+          # TCL_VERSION >= 8.4
+          Tk.tk_call_without_enc('trace', 'remove', 'variable', 
+                                 @id, @trace_opts, 'rb_var')
+          @trace_opts.replace(newopts)
+          Tk.tk_call_without_enc('trace', 'add', 'variable', 
+                                 @id, @trace_opts, 'rb_var')
+        else
+          # TCL_VERSION <= 8.3
+          Tk.tk_call_without_enc('trace', 'vdelete', 
+                                 @id, @trace_opts, 'rb_var')
+          @trace_opts.replace(newopts)
+          Tk.tk_call_without_enc('trace', 'variable', 
+                                 @id, @trace_opts, 'rb_var')
+        end
+=end
+      end
+    end
+    self
+  end
+
+  def trace_vinfo
+    return [] unless @trace_var
+    @trace_var.dup
+  end
+
+  def _trace_vinfo_for_element(elem)
+    if @elem
+      fail(RuntimeError, 
+           "invalid for a TkVariable which denotes an element of Tcl's array")
+    end
+    return [] unless @trace_elem
+    return [] unless @trace_elem[elem]
+    @trace_elem[elem].dup
+  end
+
+  def trace_vdelete(opts,cmd)
+    return self unless @trace_var.kind_of? Array
+    opts = opts.to_s
+    opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
+    idx = -1
+    newopts = ''
+    @trace_var.each_with_index{|e,i| 
+      if idx < 0 && e[0] == opts && e[1] == cmd
+        idx = i
+        next
+      end
+      # e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
+      e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c)}
+    }
+    if idx >= 0
+      @trace_var.delete_at(idx) 
+    else
+      return self
+    end
+
+    @trace_elem.each{|elem|
+      @trace_elem[elem].each{|e|
+        # e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
+        e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c)}
+      }
+    }
+
+    newopts = newopts.to_s
+    newopts = ['r','w','u'].find_all{|c| newopts.index(c)}.join('')
+    if newopts != @trace_opts
+      Tk.tk_call_without_enc('trace', 'vdelete', @id, @trace_opts, 
+                             'rb_var ' << @id)
+=begin
+      if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
+        # TCL_VERSION >= 8.4
+        Tk.tk_call_without_enc('trace', 'remove', 'variable', 
+                               @id, @trace_opts, 'rb_var')
+      else
+        # TCL_VERSION <= 8.3
+        Tk.tk_call_without_enc('trace', 'vdelete', 
+                               @id, @trace_opts, 'rb_var')
+      end
+=end
+      @trace_opts.replace(newopts)
+      if @trace_opts != ''
+        Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 
+                               'rb_var ' << @id)
+=begin
+        if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
+          # TCL_VERSION >= 8.4
+          Tk.tk_call_without_enc('trace', 'add', 'variable', 
+                                 @id, @trace_opts, 'rb_var')
+        else
+          # TCL_VERSION <= 8.3
+          Tk.tk_call_without_enc('trace', 'variable', 
+                                 @id, @trace_opts, 'rb_var')
+        end
+=end
+      end
+    end
+
+    self
+  end
+
+  def trace_vdelete_for_element(elem,opts,cmd)
+    if @elem
+      fail(RuntimeError, 
+           "invalid for a TkVariable which denotes an element of Tcl's array")
+    end
+    return self unless @trace_elem.kind_of? Hash
+    return self unless @trace_elem[elem].kind_of? Array
+    opts = opts.to_s
+    opts = ['r','w','u'].find_all{|c| opts.index(c)}.join('')
+    idx = -1
+    @trace_elem[elem].each_with_index{|e,i| 
+      if idx < 0 && e[0] == opts && e[1] == cmd
+        idx = i
+        next
+      end
+    }
+    if idx >= 0
+      @trace_elem[elem].delete_at(idx)
+    else
+      return self
+    end
+
+    newopts = ''
+    @trace_var.each{|e| 
+      # e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
+      e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c)}
+    }
+    @trace_elem.each{|elem|
+      @trace_elem[elem].each{|e|
+        # e[0].each_byte{|c| newopts += c.chr unless newopts.index(c)}
+        e[0].each_byte{|c| newopts.concat(c.chr) unless newopts.index(c)}
+      }
+    }
+
+    newopts = newopts.to_s
+    newopts = ['r','w','u'].find_all{|c| newopts.index(c)}.join('')
+    if newopts != @trace_opts
+      Tk.tk_call_without_enc('trace', 'vdelete', @id, @trace_opts, 
+                             'rb_var ' << @id)
+=begin
+      if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
+        # TCL_VERSION >= 8.4
+        Tk.tk_call_without_enc('trace', 'remove', 'variable', 
+                               @id, @trace_opts, 'rb_var')
+      else
+        # TCL_VERSION <= 8.3
+        Tk.tk_call_without_enc('trace', 'vdelete', 
+                               @id, @trace_opts, 'rb_var')
+      end
+=end
+      @trace_opts.replace(newopts)
+      if @trace_opts != ''
+        Tk.tk_call_without_enc('trace', 'variable', @id, @trace_opts, 
+                               'rb_var ' << @id)
+=begin
+        if /^(8\.([4-9]|[1-9][0-9])|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION
+          # TCL_VERSION >= 8.4
+          Tk.tk_call_without_enc('trace', 'add', 'variable', 
+                                 @id, @trace_opts, 'rb_var')
+        else
+          # TCL_VERSION <= 8.3
+          Tk.tk_call_without_enc('trace', 'variable', @id, 
+                                 @trace_opts, 'rb_var')
+        end
+=end
+      end
+    end
+
+    self
+  end
+end
+
+class TkVarAccess<TkVariable
+  def self.new(name, *args)
+    if name.kind_of?(TkVariable)
+      name.value = args[0] unless args.empty?
+      return name 
+    end
+
+    if v = TkVar_ID_TBL[name]
+      v.value = args[0] unless args.empty?
+      return v
+    end
+
+    super(name, *args)
+  end
+
+  def self.new_hash(name, *args)
+    if name.kind_of?(TkVariable)
+      unless name.is_hash?
+        fail ArgumentError, "already exist as a scalar variable"
+      end
+      name.value = args[0] unless args.empty?
+      return name 
+    end
+
+    if v = TkVar_ID_TBL[name]
+      unless v.is_hash?
+        fail ArgumentError, "already exist as a scalar variable"
+      end
+      v.value = args[0] unless args.empty?
+      return v
+    end
+
+    INTERP._invoke_without_enc('global', name)
+    if args.empty? && INTERP._invoke_without_enc('array', 'exist', name) == '0'
+      self.new(name, {})  # force creating
+    else
+      self.new(name, *args)
+    end
+  end
+
+  def initialize(varname, val=nil)
+    @id = varname
+    TkVar_ID_TBL[@id] = self
+
+    @var  = @id
+    @elem = nil
+
+    @def_default = false
+    @default_val = nil
+
+    @trace_var  = nil
+    @trace_elem = nil
+    @trace_opts = nil
+
+    @type = nil
+    var = self
+    @element_type = Hash.new{|k,v| var.default_value_type }
+
+    # is an element?
+    if @id =~ /^([^(]+)\((.+)\)$/
+      # is an element --> var == $1, elem == $2
+      @var  = $1
+      @elem = $2
+    end
+
+    # teach Tk-ip that @id is global var
+    INTERP._invoke_without_enc('global', @var)
+=begin
+    begin
+      INTERP._invoke_without_enc('global', @id)
+    rescue => e
+      if @id =~ /^(.+)\([^()]+\)$/
+        # is an element --> varname == $1
+        INTERP._invoke_without_enc('global', $1)
+      else
+        fail e
+      end
+    end
+=end
+
+    if val
+      if val.kind_of?(Hash)
+        # assoc-array variable
+        self[''] = 0
+        self.clear
+      end
+      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"' #"
+      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"' #"
+      #INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
+      #INTERP._set_global_var(@id, _toUTF8(_get_eval_string(val)))
+      self.value = val
+    end
+  end
+end
+
+module Tk
+  begin
+    INTERP._invoke_without_enc('global', 'auto_path')
+    auto_path = INTERP._invoke('set', 'auto_path')
+  rescue => e
+    begin
+      INTERP._invoke_without_enc('global', 'env')
+      auto_path = INTERP._invoke('set', 'env(TCLLIBPATH)')
+    rescue => e
+      auto_path = Tk::LIBRARY
+    end
+  end
+
+  AUTO_PATH = TkVarAccess.new('auto_path', auto_path)
+
+=begin
+  AUTO_OLDPATH = tk_split_simplelist(INTERP._invoke('set', 'auto_oldpath'))
+  AUTO_OLDPATH.each{|s| s.freeze}
+  AUTO_OLDPATH.freeze
+=end
+
+  TCL_PACKAGE_PATH = TkVarAccess.new('tcl_pkgPath')
+  PACKAGE_PATH = TCL_PACKAGE_PATH
+
+  TCL_LIBRARY_PATH = TkVarAccess.new('tcl_libPath')
+  LIBRARY_PATH = TCL_LIBRARY_PATH
+
+  TCL_PRECISION = TkVarAccess.new('tcl_precision')
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/virtevent.rb b/ruby_1_8_6/ext/tk/lib/tk/virtevent.rb
new file mode 100644
index 0000000000..d47e80aecd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/virtevent.rb
@@ -0,0 +1,106 @@
+#
+#   tk/virtevent.rb : treats virtual events
+#                     1998/07/16 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+require 'tk'
+
+class TkVirtualEvent<TkObject
+  extend Tk
+
+  TkCommandNames = ['event'.freeze].freeze
+
+  TkVirtualEventID = ["VirtEvent".freeze, "00000".taint].freeze
+  TkVirtualEventTBL = TkCore::INTERP.create_table
+
+  TkCore::INTERP.init_ip_env{ TkVirtualEventTBL.clear }
+
+  class PreDefVirtEvent<self
+    def self.new(event, *sequences)
+      if event =~ /^<(<.*>)>$/
+        event = $1
+      elsif event !~ /^<.*>$/
+        event = '<' + event + '>'
+      end
+      if TkVirtualEvent::TkVirtualEventTBL.has_key?(event)
+        TkVirtualEvent::TkVirtualEventTBL[event]
+      else
+        super(event, *sequences)
+      end
+    end
+
+    def initialize(event, *sequences)
+      @path = @id = event
+      TkVirtualEvent::TkVirtualEventTBL[@id] = self
+      add(*sequences)
+    end
+  end
+
+  def TkVirtualEvent.getobj(event)
+    obj = TkVirtualEventTBL[event]
+    if obj
+      obj
+    else
+      if tk_call_without_enc('event', 'info').index("<#{event}>")
+        PreDefVirtEvent.new(event)
+      else
+        fail ArgumentError, "undefined virtual event '<#{event}>'"
+      end
+    end
+  end
+
+  def TkVirtualEvent.info
+    tk_call_without_enc('event', 'info').split(/\s+/).collect!{|seq|
+      TkVirtualEvent.getobj(seq[1..-2])
+    }
+  end
+
+  def initialize(*sequences)
+    # @path = @id = '<' + TkVirtualEventID.join('') + '>'
+    @path = @id = '<' + TkVirtualEventID.join(TkCore::INTERP._ip_id_) + '>'
+    TkVirtualEventID[1].succ!
+    add(*sequences)
+  end
+
+  def add(*sequences)
+    if sequences != []
+      tk_call_without_enc('event', 'add', "<#{@id}>", 
+                          *(sequences.collect{|seq| 
+                              "<#{tk_event_sequence(seq)}>"
+                            }) )
+      TkVirtualEventTBL[@id] = self
+    end
+    self
+  end
+
+  def delete(*sequences)
+    if sequences == []
+      tk_call_without_enc('event', 'delete', "<#{@id}>")
+      TkVirtualEventTBL.delete(@id)
+    else
+      tk_call_without_enc('event', 'delete', "<#{@id}>", 
+                          *(sequences.collect{|seq| 
+                              "<#{tk_event_sequence(seq)}>"
+                            }) )
+      TkVirtualEventTBL.delete(@id) if info == []
+    end
+    self
+  end
+
+  def info
+    tk_call_without_enc('event','info',"<#{@id}>").split(/\s+/).collect!{|seq|
+      l = seq.scan(/<*[^<>]+>*/).collect!{|subseq|
+        case (subseq)
+        when /^<<[^<>]+>>$/
+          TkVirtualEvent.getobj(subseq[1..-2])
+        when /^<[^<>]+>$/
+          subseq[1..-2]
+        else
+          subseq.split('')
+        end
+      }.flatten
+      (l.size == 1) ? l[0] : l
+    }
+  end
+end
+
+TkNamedVirtualEvent = TkVirtualEvent::PreDefVirtEvent
diff --git a/ruby_1_8_6/ext/tk/lib/tk/winfo.rb b/ruby_1_8_6/ext/tk/lib/tk/winfo.rb
new file mode 100644
index 0000000000..c649b4a0c9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/winfo.rb
@@ -0,0 +1,392 @@
+#
+# tk/winfo.rb : methods for winfo command
+#
+module TkWinfo
+end
+
+require 'tk'
+
+module TkWinfo
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['winfo'.freeze].freeze
+
+  def TkWinfo.atom(name, win=nil)
+    if win
+      number(tk_call_without_enc('winfo', 'atom', '-displayof', win, 
+                                 _get_eval_enc_str(name)))
+    else
+      number(tk_call_without_enc('winfo', 'atom', _get_eval_enc_str(name)))
+    end
+  end
+  def winfo_atom(name)
+    TkWinfo.atom(name, self)
+  end
+
+  def TkWinfo.atomname(id, win=nil)
+    if win
+      _fromUTF8(tk_call_without_enc('winfo', 'atomname', 
+                                    '-displayof', win, id))
+    else
+      _fromUTF8(tk_call_without_enc('winfo', 'atomname', id))
+    end
+  end
+  def winfo_atomname(id)
+    TkWinfo.atomname(id, self)
+  end
+
+  def TkWinfo.cells(win)
+    number(tk_call_without_enc('winfo', 'cells', win))
+  end
+  def winfo_cells
+    TkWinfo.cells self
+  end
+
+  def TkWinfo.children(win)
+    list(tk_call_without_enc('winfo', 'children', win))
+  end
+  def winfo_children
+    TkWinfo.children self
+  end
+
+  def TkWinfo.classname(win)
+    tk_call_without_enc('winfo', 'class', win)
+  end
+  def winfo_classname
+    TkWinfo.classname self
+  end
+  alias winfo_class winfo_classname
+
+  def TkWinfo.colormapfull(win)
+     bool(tk_call_without_enc('winfo', 'colormapfull', win))
+  end
+  def winfo_colormapfull
+    TkWinfo.colormapfull self
+  end
+
+  def TkWinfo.containing(rootX, rootY, win=nil)
+    if win
+      window(tk_call_without_enc('winfo', 'containing', 
+                                 '-displayof', win, rootX, rootY))
+    else
+      window(tk_call_without_enc('winfo', 'containing', rootX, rootY))
+    end
+  end
+  def winfo_containing(x, y)
+    TkWinfo.containing(x, y, self)
+  end
+
+  def TkWinfo.depth(win)
+    number(tk_call_without_enc('winfo', 'depth', win))
+  end
+  def winfo_depth
+    TkWinfo.depth self
+  end
+
+  def TkWinfo.exist?(win)
+    bool(tk_call_without_enc('winfo', 'exists', win))
+  end
+  def winfo_exist?
+    TkWinfo.exist? self
+  end
+
+  def TkWinfo.fpixels(win, dist)
+    number(tk_call_without_enc('winfo', 'fpixels', win, dist))
+  end
+  def winfo_fpixels(dist)
+    TkWinfo.fpixels self, dist
+  end
+
+  def TkWinfo.geometry(win)
+    tk_call_without_enc('winfo', 'geometry', win)
+  end
+  def winfo_geometry
+    TkWinfo.geometry self
+  end
+
+  def TkWinfo.height(win)
+    number(tk_call_without_enc('winfo', 'height', win))
+  end
+  def winfo_height
+    TkWinfo.height self
+  end
+
+  def TkWinfo.id(win)
+    tk_call_without_enc('winfo', 'id', win)
+  end
+  def winfo_id
+    TkWinfo.id self
+  end
+
+  def TkWinfo.interps(win=nil)
+    if win
+      #tk_split_simplelist(tk_call_without_enc('winfo', 'interps',
+      #                                        '-displayof', win))
+      tk_split_simplelist(tk_call_without_enc('winfo', 'interps',
+                                              '-displayof', win),
+                          false, true)
+    else
+      #tk_split_simplelist(tk_call_without_enc('winfo', 'interps'))
+      tk_split_simplelist(tk_call_without_enc('winfo', 'interps'), 
+                          false, true)
+    end
+  end
+  def winfo_interps
+    TkWinfo.interps self
+  end
+
+  def TkWinfo.mapped?(win)
+    bool(tk_call_without_enc('winfo', 'ismapped', win))
+  end
+  def winfo_mapped?
+    TkWinfo.mapped? self
+  end
+
+  def TkWinfo.manager(win)
+    tk_call_without_enc('winfo', 'manager', win)
+  end
+  def winfo_manager
+    TkWinfo.manager self
+  end
+
+  def TkWinfo.appname(win)
+    tk_call('winfo', 'name', win)
+  end
+  def winfo_appname
+    TkWinfo.appname self
+  end
+
+  def TkWinfo.parent(win)
+    window(tk_call_without_enc('winfo', 'parent', win))
+  end
+  def winfo_parent
+    TkWinfo.parent self
+  end
+
+  def TkWinfo.widget(id, win=nil)
+    if win
+      window(tk_call_without_enc('winfo', 'pathname', '-displayof', win, id))
+    else
+      window(tk_call_without_enc('winfo', 'pathname', id))
+    end
+  end
+  def winfo_widget(id)
+    TkWinfo.widget id, self
+  end
+
+  def TkWinfo.pixels(win, dist)
+    number(tk_call_without_enc('winfo', 'pixels', win, dist))
+  end
+  def winfo_pixels(dist)
+    TkWinfo.pixels self, dist
+  end
+
+  def TkWinfo.reqheight(win)
+    number(tk_call_without_enc('winfo', 'reqheight', win))
+  end
+  def winfo_reqheight
+    TkWinfo.reqheight self
+  end
+
+  def TkWinfo.reqwidth(win)
+    number(tk_call_without_enc('winfo', 'reqwidth', win))
+  end
+  def winfo_reqwidth
+    TkWinfo.reqwidth self
+  end
+
+  def TkWinfo.rgb(win, color)
+    list(tk_call_without_enc('winfo', 'rgb', win, color))
+  end
+  def winfo_rgb(color)
+    TkWinfo.rgb self, color
+  end
+
+  def TkWinfo.rootx(win)
+    number(tk_call_without_enc('winfo', 'rootx', win))
+  end
+  def winfo_rootx
+    TkWinfo.rootx self
+  end
+
+  def TkWinfo.rooty(win)
+    number(tk_call_without_enc('winfo', 'rooty', win))
+  end
+  def winfo_rooty
+    TkWinfo.rooty self
+  end
+
+  def TkWinfo.screen(win)
+    tk_call('winfo', 'screen', win)
+  end
+  def winfo_screen
+    TkWinfo.screen self
+  end
+
+  def TkWinfo.screencells(win)
+    number(tk_call_without_enc('winfo', 'screencells', win))
+  end
+  def winfo_screencells
+    TkWinfo.screencells self
+  end
+
+  def TkWinfo.screendepth(win)
+    number(tk_call_without_enc('winfo', 'screendepth', win))
+  end
+  def winfo_screendepth
+    TkWinfo.screendepth self
+  end
+
+  def TkWinfo.screenheight (win)
+    number(tk_call_without_enc('winfo', 'screenheight', win))
+  end
+  def winfo_screenheight
+    TkWinfo.screenheight self
+  end
+
+  def TkWinfo.screenmmheight(win)
+    number(tk_call_without_enc('winfo', 'screenmmheight', win))
+  end
+  def winfo_screenmmheight
+    TkWinfo.screenmmheight self
+  end
+
+  def TkWinfo.screenmmwidth(win)
+    number(tk_call_without_enc('winfo', 'screenmmwidth', win))
+  end
+  def winfo_screenmmwidth
+    TkWinfo.screenmmwidth self
+  end
+
+  def TkWinfo.screenvisual(win)
+    tk_call_without_enc('winfo', 'screenvisual', win)
+  end
+  def winfo_screenvisual
+    TkWinfo.screenvisual self
+  end
+
+  def TkWinfo.screenwidth(win)
+    number(tk_call_without_enc('winfo', 'screenwidth', win))
+  end
+  def winfo_screenwidth
+    TkWinfo.screenwidth self
+  end
+
+  def TkWinfo.server(win)
+    tk_call('winfo', 'server', win)
+  end
+  def winfo_server
+    TkWinfo.server self
+  end
+
+  def TkWinfo.toplevel(win)
+    window(tk_call_without_enc('winfo', 'toplevel', win))
+  end
+  def winfo_toplevel
+    TkWinfo.toplevel self
+  end
+
+  def TkWinfo.visual(win)
+    tk_call_without_enc('winfo', 'visual', win)
+  end
+  def winfo_visual
+    TkWinfo.visual self
+  end
+
+  def TkWinfo.visualid(win)
+    tk_call_without_enc('winfo', 'visualid', win)
+  end
+  def winfo_visualid
+    TkWinfo.visualid self
+  end
+
+  def TkWinfo.visualsavailable(win, includeids=false)
+    if includeids
+      list(tk_call_without_enc('winfo', 'visualsavailable', 
+                               win, "includeids"))
+    else
+      list(tk_call_without_enc('winfo', 'visualsavailable', win))
+    end
+  end
+  def winfo_visualsavailable(includeids=false)
+    TkWinfo.visualsavailable self, includeids
+  end
+
+  def TkWinfo.vrootheight(win)
+    number(tk_call_without_enc('winfo', 'vrootheight', win))
+  end
+  def winfo_vrootheight
+    TkWinfo.vrootheight self
+  end
+
+  def TkWinfo.vrootwidth(win)
+    number(tk_call_without_enc('winfo', 'vrootwidth', win))
+  end
+  def winfo_vrootwidth
+    TkWinfo.vrootwidth self
+  end
+
+  def TkWinfo.vrootx(win)
+    number(tk_call_without_enc('winfo', 'vrootx', win))
+  end
+  def winfo_vrootx
+    TkWinfo.vrootx self
+  end
+
+  def TkWinfo.vrooty(win)
+    number(tk_call_without_enc('winfo', 'vrooty', win))
+  end
+  def winfo_vrooty
+    TkWinfo.vrooty self
+  end
+
+  def TkWinfo.width(win)
+    number(tk_call_without_enc('winfo', 'width', win))
+  end
+  def winfo_width
+    TkWinfo.width self
+  end
+
+  def TkWinfo.x(win)
+    number(tk_call_without_enc('winfo', 'x', win))
+  end
+  def winfo_x
+    TkWinfo.x self
+  end
+
+  def TkWinfo.y(win)
+    number(tk_call_without_enc('winfo', 'y', win))
+  end
+  def winfo_y
+    TkWinfo.y self
+  end
+
+  def TkWinfo.viewable(win)
+    bool(tk_call_without_enc('winfo', 'viewable', win))
+  end
+  def winfo_viewable
+    TkWinfo.viewable self
+  end
+
+  def TkWinfo.pointerx(win)
+    number(tk_call_without_enc('winfo', 'pointerx', win))
+  end
+  def winfo_pointerx
+    TkWinfo.pointerx self
+  end
+
+  def TkWinfo.pointery(win)
+    number(tk_call_without_enc('winfo', 'pointery', win))
+  end
+  def winfo_pointery
+    TkWinfo.pointery self
+  end
+
+  def TkWinfo.pointerxy(win)
+    list(tk_call_without_enc('winfo', 'pointerxy', win))
+  end
+  def winfo_pointerxy
+    TkWinfo.pointerxy self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/winpkg.rb b/ruby_1_8_6/ext/tk/lib/tk/winpkg.rb
new file mode 100644
index 0000000000..737fb959b5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/winpkg.rb
@@ -0,0 +1,143 @@
+#
+#   tk/winpkg.rb : methods for Tcl/Tk packages for Microsoft Windows
+#                     2000/11/22 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+#     ATTENTION !!
+#         This is NOT TESTED. Because I have no test-environment.
+#
+require 'tk'
+
+module TkWinDDE
+  extend Tk
+  extend TkWinDDE
+
+  TkCommandNames = ['dde'.freeze].freeze
+
+  PACKAGE_NAME = 'dde'.freeze
+  def self.package_name
+    PACKAGE_NAME
+  end
+
+  if self.const_defined? :FORCE_VERSION
+    tk_call_without_enc('package', 'require', 'dde', FORCE_VERSION)
+  else
+    tk_call_without_enc('package', 'require', 'dde')
+  end
+
+  #def servername(topic=None)
+  #  tk_call('dde', 'servername', topic)
+  #end
+  def servername(*args)
+    if args.size == 0
+      tk_call('dde', 'servername')
+    else
+      if args[-1].kind_of?(Hash)  # dde 1.2 +
+        keys = _symbolkey2str(args.pop)
+        force = (keys.delete('force'))? '-force': None
+        exact = (keys.delete('exact'))? '-exact': None
+        if keys.size == 0
+          tk_call('dde', 'servername', force, exact)
+        elsif args.size == 0
+          tk_call('dde', 'servername', force, exact, *hash_kv(keys))
+        else
+          tk_call('dde', 'servername', force, exact, 
+                  *((hash_kv(keys) << '--') + args))
+        end
+      else
+        tk_call('dde', 'servername', *args)
+      end
+    end
+  end
+
+  def execute(service, topic, data)
+    tk_call('dde', 'execute', service, topic, data)
+  end
+
+  def async_execute(service, topic, data)
+    tk_call('dde', '-async', 'execute', service, topic, data)
+  end
+
+  def poke(service, topic, item, data)
+    tk_call('dde', 'poke', service, topic, item, data)
+  end
+
+  def request(service, topic, item)
+    tk_call('dde', 'request', service, topic, item)
+  end
+
+  def binary_request(service, topic, item)
+    tk_call('dde', 'request', '-binary', service, topic, item)
+  end
+
+  def services(service, topic)
+    tk_call('dde', 'services', service, topic)
+  end
+
+  def eval(topic, cmd, *args)
+    tk_call('dde', 'eval', topic, cmd, *args)
+  end
+
+  def async_eval(topic, cmd, *args)
+    tk_call('dde', 'eval', -async, topic, cmd, *args)
+  end
+
+  module_function :servername, :execute, :async_execute, 
+                  :poke, :request, :services, :eval
+end
+
+module TkWinRegistry
+  extend Tk
+  extend TkWinRegistry
+
+  TkCommandNames = ['registry'.freeze].freeze
+
+  if self.const_defined? :FORCE_VERSION
+    tk_call('package', 'require', 'registry', FORCE_VERSION)
+  else
+    tk_call('package', 'require', 'registry')
+  end
+
+  def broadcast(keynam, timeout=nil)
+    if timeout
+      tk_call('registry', 'broadcast', keynam, '-timeout', timeout)
+    else
+      tk_call('registry', 'broadcast', keynam)
+    end
+  end
+
+  def delete(keynam, valnam=None)
+    tk_call('registry', 'delete', keynam, valnam)
+  end
+
+  def get(keynam, valnam)
+    tk_call('registry', 'get', keynam, valnam)
+  end
+
+  def keys(keynam, pattern=nil)
+    lst = tk_split_simplelist(tk_call('registry', 'keys', keynam))
+    if pattern
+      lst.find_all{|key| key =~ pattern}
+    else
+      lst
+    end
+  end
+
+  def set(keynam, valnam=None, data=None, dattype=None)
+    tk_call('registry', 'set', keynam, valnam, data, dattype)
+  end
+
+  def type(keynam, valnam)
+    tk_call('registry', 'type', keynam, valnam)
+  end
+
+  def values(keynam, pattern=nil)
+    lst = tk_split_simplelist(tk_call('registry', 'values', keynam))
+    if pattern
+      lst.find_all{|val| val =~ pattern}
+    else
+      lst
+    end
+  end
+
+  module_function :delete, :get, :keys, :set, :type, :values
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/wm.rb b/ruby_1_8_6/ext/tk/lib/tk/wm.rb
new file mode 100644
index 0000000000..1f432a3848
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/wm.rb
@@ -0,0 +1,360 @@
+#
+# tk/wm.rb : methods for wm command
+#
+require 'tk'
+
+module Tk
+  module Wm
+    include TkComm
+
+    TkCommandNames = ['wm'.freeze].freeze
+
+    TOPLEVEL_METHODCALL_OPTKEYS = {}
+
+    def aspect(*args)
+      if args.length == 0
+        list(tk_call_without_enc('wm', 'aspect', path))
+      else
+        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
+        tk_call('wm', 'aspect', path, *args)
+        self
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['aspect'] = 'aspect'
+
+    def attributes(slot=nil,value=None)
+      if slot == nil
+        lst = tk_split_list(tk_call('wm', 'attributes', path))
+        info = {}
+        while key = lst.shift
+          info[key[1..-1]] = lst.shift
+        end
+        info
+      elsif slot.kind_of? Hash
+        tk_call('wm', 'attributes', path, *hash_kv(slot))
+        self
+      elsif value == None
+        tk_call('wm', 'attributes', path, "-#{slot}")
+      else
+        tk_call('wm', 'attributes', path, "-#{slot}", value)
+        self
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['attributes'] = 'attributes'
+
+    def client(name=None)
+      if name == None
+        tk_call('wm', 'client', path)
+      else
+        name = '' if name == nil
+        tk_call('wm', 'client', path, name)
+        self
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['client'] = 'client'
+
+    def colormapwindows(*args)
+      if args.size == 0
+        list(tk_call_without_enc('wm', 'colormapwindows', path))
+      else
+        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
+        tk_call_without_enc('wm', 'colormapwindows', path, *args)
+        self
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['colormapwindows'] = 'colormapwindows'
+
+    def wm_command(value=nil)
+      if value
+        tk_call('wm', 'command', path, value)
+        self
+      else
+        #procedure(tk_call('wm', 'command', path))
+        tk_call('wm', 'command', path)
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['wm_command'] = 'wm_command'
+
+    def deiconify(ex = true)
+      if ex
+        tk_call_without_enc('wm', 'deiconify', path)
+      else
+        self.iconify
+      end
+      self
+    end
+
+    def focusmodel(mode = nil)
+      if mode
+        tk_call_without_enc('wm', 'focusmodel', path, mode)
+        self
+      else
+        tk_call_without_enc('wm', 'focusmodel', path)
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['focusmodel'] = 'focusmodel'
+
+    def frame
+      tk_call_without_enc('wm', 'frame', path)
+    end
+
+    def geometry(geom=nil)
+      if geom
+        tk_call_without_enc('wm', 'geometry', path, geom)
+        self
+      else
+        tk_call_without_enc('wm', 'geometry', path)
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['geometry'] = 'geometry'
+
+    def wm_grid(*args)
+      if args.size == 0
+        list(tk_call_without_enc('wm', 'grid', path))
+      else
+        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
+        tk_call_without_enc('wm', 'grid', path, *args)
+        self
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['wm_grid'] = 'wm_grid'
+
+    def group(leader = nil)
+      if leader
+        tk_call('wm', 'group', path, leader)
+        self
+      else
+        window(tk_call('wm', 'group', path))
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['group'] = 'group'
+
+    def iconbitmap(bmp=nil)
+      if bmp
+        tk_call_without_enc('wm', 'iconbitmap', path, bmp)
+        self
+      else
+        image_obj(tk_call_without_enc('wm', 'iconbitmap', path))
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['iconbitmap'] = 'iconbitmap'
+
+    def iconphoto(*imgs)
+      if imgs.empty?
+        @wm_iconphoto = nil unless defined? @wm_iconphoto
+        return @wm_iconphoto 
+      end
+
+      imgs = imgs[0] if imgs.length == 1 && imgs[0].kind_of?(Array)
+      tk_call_without_enc('wm', 'iconphoto', path, *imgs)
+      @wm_iconphoto = imgs
+      self
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['iconphoto'] = 'iconphoto'
+
+    def iconphoto_default(*imgs)
+      imgs = imgs[0] if imgs.length == 1 && imgs[0].kind_of?(Array)
+      tk_call_without_enc('wm', 'iconphoto', path, '-default', *imgs)
+      self
+    end
+
+    def iconify(ex = true)
+      if ex
+        tk_call_without_enc('wm', 'iconify', path)
+      else
+        self.deiconify
+      end
+      self
+    end
+
+    def iconmask(bmp=nil)
+      if bmp
+        tk_call_without_enc('wm', 'iconmask', path, bmp)
+        self
+      else
+        image_obj(tk_call_without_enc('wm', 'iconmask', path))
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['iconmask'] = 'iconmask'
+
+    def iconname(name=nil)
+      if name
+        tk_call('wm', 'iconname', path, name)
+        self
+      else
+        tk_call('wm', 'iconname', path)
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['iconname'] = 'iconname'
+
+    def iconposition(*args)
+      if args.size == 0
+        list(tk_call_without_enc('wm', 'iconposition', path))
+      else
+        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
+        tk_call_without_enc('wm', 'iconposition', path, *args)
+        self
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['iconposition'] = 'iconposition'
+
+    def iconwindow(win = nil)
+      if win
+        tk_call_without_enc('wm', 'iconwindow', path, win)
+        self
+      else
+        w = tk_call_without_enc('wm', 'iconwindow', path)
+        (w == '')? nil: window(w)
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['iconwindow'] = 'iconwindow'
+
+    def maxsize(*args)
+      if args.size == 0
+        list(tk_call_without_enc('wm', 'maxsize', path))
+      else
+        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
+        tk_call_without_enc('wm', 'maxsize', path, *args)
+        self
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['maxsize'] = 'maxsize'
+
+    def minsize(*args)
+      if args.size == 0
+        list(tk_call_without_enc('wm', 'minsize', path))
+      else
+        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
+        tk_call_without_enc('wm', 'minsize', path, *args)
+        self
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['minsize'] = 'minsize'
+
+    def overrideredirect(mode=None)
+      if mode == None
+        bool(tk_call_without_enc('wm', 'overrideredirect', path))
+      else
+        tk_call_without_enc('wm', 'overrideredirect', path, mode)
+        self
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['overrideredirect'] = 'overrideredirect'
+
+    def positionfrom(who=None)
+      if who == None
+        r = tk_call_without_enc('wm', 'positionfrom', path)
+        (r == "")? nil: r
+      else
+        tk_call_without_enc('wm', 'positionfrom', path, who)
+        self
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['positionfrom'] = 'positionfrom'
+
+    def protocol(name=nil, cmd=nil, &b)
+      if cmd
+        tk_call_without_enc('wm', 'protocol', path, name, cmd)
+        self
+      elsif b
+        tk_call_without_enc('wm', 'protocol', path, name, proc(&b))
+        self
+      elsif name
+        result = tk_call_without_enc('wm', 'protocol', path, name)
+        (result == "")? nil : tk_tcl2ruby(result)
+      else
+        tk_split_simplelist(tk_call_without_enc('wm', 'protocol', path))
+      end
+    end
+
+    def protocols(kv=nil)
+      unless kv
+        ret = {}
+        self.protocol.each{|name|
+          ret[name] = self.protocol(name)
+        }
+        return ret
+      end
+
+      unless kv.kind_of?(Hash)
+        fail ArgumentError, 'expect a hash of protocol=>command'
+      end
+      kv.each{|k, v| self.protocol(k, v)}
+      self
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['protocols'] = 'protocols'
+
+    def resizable(*args)
+      if args.length == 0
+        list(tk_call_without_enc('wm', 'resizable', path)).collect{|e| bool(e)}
+      else
+        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
+        tk_call_without_enc('wm', 'resizable', path, *args)
+        self
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['resizable'] = 'resizable'
+
+    def sizefrom(who=None)
+      if who == None
+        r = tk_call_without_enc('wm', 'sizefrom', path)
+        (r == "")? nil: r
+      else
+        tk_call_without_enc('wm', 'sizefrom', path, who)
+        self
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['sizefrom'] = 'sizefrom'
+
+    def stackorder
+      list(tk_call('wm', 'stackorder', path))
+    end
+
+    def stackorder_isabove(win)
+      bool(tk_call('wm', 'stackorder', path, 'isabove', win))
+    end
+
+    def stackorder_isbelow(win)
+      bool(tk_call('wm', 'stackorder', path, 'isbelow', win))
+    end
+
+    def state(st=nil)
+      if st
+        tk_call_without_enc('wm', 'state', path, st)
+        self
+      else
+        tk_call_without_enc('wm', 'state', path)
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['state'] = 'state'
+
+    def title(str=nil)
+      if str
+        tk_call('wm', 'title', path, str)
+        self
+      else
+        tk_call('wm', 'title', path)
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['title'] = 'title'
+
+    def transient(master=nil)
+      if master
+        tk_call_without_enc('wm', 'transient', path, master)
+        self
+      else
+        window(tk_call_without_enc('wm', 'transient', path))
+      end
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['transient'] = 'transient'
+
+    def withdraw(ex = true)
+      if ex
+        tk_call_without_enc('wm', 'withdraw', path)
+      else
+        self.deiconify
+      end
+      self
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tk/xim.rb b/ruby_1_8_6/ext/tk/lib/tk/xim.rb
new file mode 100644
index 0000000000..0ac8559bb9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tk/xim.rb
@@ -0,0 +1,122 @@
+#
+# tk/xim.rb : control imput_method
+#
+require 'tk'
+
+module TkXIM
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['imconfigure'.freeze].freeze
+
+  def TkXIM.useinputmethods(value = None, win = nil)
+    if value == None
+      if win
+        bool(tk_call_without_enc('tk', 'useinputmethods', 
+                                 '-displayof', win))
+      else
+        bool(tk_call_without_enc('tk', 'useinputmethods'))
+      end
+    else
+      if win
+        bool(tk_call_without_enc('tk', 'useinputmethods', 
+                                 '-displayof', win, value))
+      else
+        bool(tk_call_without_enc('tk', 'useinputmethods', value))
+      end
+    end
+  end
+
+  def TkXIM.useinputmethods_displayof(win, value = None)
+    TkXIM.useinputmethods(value, win)
+  end
+
+  def TkXIM.caret(win, keys=nil)
+    if keys
+      tk_call_without_enc('tk', 'caret', win, *hash_kv(keys))
+      self
+    else
+      lst = tk_split_list(tk_call_without_enc('tk', 'caret', win))
+      info = {}
+      while key = lst.shift
+        info[key[1..-1]] = lst.shift
+      end
+      info
+    end
+  end
+
+  def TkXIM.configure(win, slot, value=None)
+    begin
+      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
+        if slot.kind_of? Hash
+          tk_call('imconfigure', win, *hash_kv(slot))
+        else
+          tk_call('imconfigure', win, "-#{slot}", value)
+        end
+      end
+    rescue
+    end
+  end
+
+  def TkXIM.configinfo(win, slot=nil)
+    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      begin
+        if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
+          if slot
+            conf = tk_split_list(tk_call('imconfigure', win, "-#{slot}"))
+            conf[0] = conf[0][1..-1]
+            conf
+          else
+            tk_split_list(tk_call('imconfigure', win)).collect{|conf|
+              conf[0] = conf[0][1..-1]
+              conf
+            }
+          end
+        else
+          []
+        end
+      rescue
+        []
+      end
+    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      TkXIM.current_configinfo(win, slot)
+    end
+  end
+
+  def TkXIM.current_configinfo(win, slot=nil)
+    begin
+      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
+        if slot
+          conf = tk_split_list(tk_call('imconfigure', win, "-#{slot}"))
+          { conf[0][1..-1] => conf[1] }
+        else
+          ret = {}
+          tk_split_list(tk_call('imconfigure', win)).each{|conf|
+            ret[conf[0][1..-1]] = conf[1]
+          }
+          ret
+        end
+      else
+        {}
+      end
+    rescue
+      {}
+    end
+  end
+
+  def useinputmethods(value=None)
+    TkXIM.useinputmethods(value, self)
+  end
+
+  def caret(keys=nil)
+    TkXIM.caret(self, keys=nil)
+  end
+
+  def imconfigure(slot, value=None)
+    TkXIM.configure(self, slot, value)
+  end
+
+  def imconfiginfo(slot=nil)
+    TkXIM.configinfo(self, slot)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkafter.rb b/ruby_1_8_6/ext/tk/lib/tkafter.rb
new file mode 100644
index 0000000000..f65945884c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkafter.rb
@@ -0,0 +1,4 @@
+#
+#   tkafter.rb - load tk/after.rb
+#
+require 'tk/timer'
diff --git a/ruby_1_8_6/ext/tk/lib/tkbgerror.rb b/ruby_1_8_6/ext/tk/lib/tkbgerror.rb
new file mode 100644
index 0000000000..deba7a57fa
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkbgerror.rb
@@ -0,0 +1,4 @@
+#
+#   tkbgerror.rb - load tk/bgerror.rb
+#
+require 'tk/bgerror'
diff --git a/ruby_1_8_6/ext/tk/lib/tkcanvas.rb b/ruby_1_8_6/ext/tk/lib/tkcanvas.rb
new file mode 100644
index 0000000000..9524614291
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkcanvas.rb
@@ -0,0 +1,4 @@
+#
+#   tkcanvas.rb - load tk/canvas.rb
+#
+require 'tk/canvas'
diff --git a/ruby_1_8_6/ext/tk/lib/tkclass.rb b/ruby_1_8_6/ext/tk/lib/tkclass.rb
new file mode 100644
index 0000000000..87f5acc453
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkclass.rb
@@ -0,0 +1,47 @@
+#
+#               tkclass.rb - Tk classes
+#                       Date: 2000/11/27 09:23:36
+#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
+#
+#                       $Id$
+
+require "tk"
+
+TopLevel = TkToplevel
+Frame = TkFrame
+Label = TkLabel
+Button = TkButton
+Radiobutton = TkRadioButton
+Checkbutton = TkCheckButton
+Message = TkMessage
+Entry = TkEntry
+Spinbox = TkSpinbox
+Text = TkText
+Scale = TkScale
+Scrollbar = TkScrollbar
+Listbox = TkListbox
+Menu = TkMenu
+Menubutton = TkMenubutton
+Canvas = TkCanvas
+Arc = TkcArc
+Bitmap = TkcBitmap
+Line = TkcLine
+Oval = TkcOval
+Polygon = TkcPolygon
+Rectangle = TkcRectangle
+TextItem = TkcText
+WindowItem = TkcWindow
+BitmapImage = TkBitmapImage
+PhotoImage = TkPhotoImage
+Selection = TkSelection
+Winfo = TkWinfo
+Pack = TkPack
+Grid = TkGrid
+Place = TkPlace
+Variable = TkVariable
+Font = TkFont
+VirtualEvent = TkVirtualEvent
+
+def Mainloop
+  Tk.mainloop
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkconsole.rb b/ruby_1_8_6/ext/tk/lib/tkconsole.rb
new file mode 100644
index 0000000000..9960ddb8ac
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkconsole.rb
@@ -0,0 +1,4 @@
+#
+#   tkconsole.rb - load tk/console.rb
+#
+require 'tk/console'
diff --git a/ruby_1_8_6/ext/tk/lib/tkdialog.rb b/ruby_1_8_6/ext/tk/lib/tkdialog.rb
new file mode 100644
index 0000000000..bec5e5d29a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkdialog.rb
@@ -0,0 +1,4 @@
+#
+#   tkdialog.rb - load tk/dialog.rb
+#
+require 'tk/dialog'
diff --git a/ruby_1_8_6/ext/tk/lib/tkentry.rb b/ruby_1_8_6/ext/tk/lib/tkentry.rb
new file mode 100644
index 0000000000..2dcfcab5da
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkentry.rb
@@ -0,0 +1,4 @@
+#
+#   tkentry.rb - load tk/entry.rb
+#
+require 'tk/entry'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/ICONS.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/ICONS.rb
new file mode 100644
index 0000000000..18d84c05e9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/ICONS.rb
@@ -0,0 +1,13 @@
+#
+#  ICONS support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/ICONS/setup.rb'
+
+# load library
+require 'tkextlib/ICONS/icons'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/ICONS/icons.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/ICONS/icons.rb
new file mode 100644
index 0000000000..b430bae55d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/ICONS/icons.rb
@@ -0,0 +1,129 @@
+#
+#  tkextlib/ICONS/icons.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/ICONS/setup.rb'
+
+# TkPackage.require('icons', '1.0')
+TkPackage.require('icons')
+
+module Tk
+  class ICONS < TkImage
+    extend Tk
+
+    PACKAGE_NAME = 'icons'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('icons')
+      rescue
+        ''
+      end
+    end
+
+    def self.create(*args)  # icon, icon, ..., ?option=>value, ...?
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        icons = simplelist(tk_call('::icons::icons', 'create', 
+                                   *(hash_kv(keys) << (args.flatten))))
+      else
+        icons = simplelist(tk_call('::icons::icons', 'create', 
+                                   args.flatten))
+      end
+
+      icons.collect{|icon| self.new(icon, :without_creating=>true)}
+    end
+
+    def self.delete(*icons)  # icon, icon, ...
+      icons = icons.flatten
+      return if icons.empty?
+      icons.map!{|icon|
+        if icon.kind_of?(Tk::ICONS)
+          Tk_IMGTBL.delete(icon.path)
+          icon.name
+        elsif icon.to_s =~ /^::icon::(.*)/
+          name = $1
+          Tk_IMGTBL.delete(icon)
+          name
+        else
+          Tk_IMGTBL.delete("::icon::#{icon}")
+          icon
+        end
+      }
+      tk_call('::icons::icons', 'delete', icons)
+    end
+
+    def self.query(*args)  # icon, icon, ..., ?option=>value, ...?
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        simplelist(tk_call('::icons::icons', 'query', 
+                           *(hash_kv(keys) << (args.flatten))))
+      else
+        simplelist(tk_call('::icons::icons', 'query', args.flatten))
+      end . map{|inf| list(inf) }
+    end
+
+    ##########################################
+
+    class << self
+      alias _new new
+
+      def new(name, keys=nil)
+        if obj = Tk_IMGTBL["::icon::#{name}"]
+          if keys
+            keys = _symbolkey2str(keys)
+            unless keys.delete('without_creating')
+              tk_call('::icons::icons', 'create', *(hash_kv(keys) << obj.name))
+            end
+          end
+        else
+          obj = _new(name, keys)
+        end
+        obj
+      end
+    end
+
+    ##########################################
+
+    def initialize(name, keys=nil)
+      if name.kind_of?(String) && name =~ /^::icon::(.+)$/
+          @name = $1
+          @path = name
+      else
+        @name = name.to_s
+        @path = "::icon::#{@name}"
+      end
+      keys = _symbolkey2str(keys)
+      unless keys.delete('without_creating')
+        tk_call('::icons::icons', 'create', *(hash_kv(keys) << @name))
+      end
+      Tk_IMGTBL[@path] = self
+    end
+
+    def name
+      @name
+    end
+
+    def delete
+      Tk_IMGTBL.delete(@path)
+      tk_call('::icons::icons', 'delete', @name)
+      self
+    end
+
+    def query(keys={})
+      list(simplelist(tk_call('::icons::icons', 'query', 
+                               *(hash_kv(keys) << @name))
+                      )[0])
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/ICONS/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/ICONS/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/ICONS/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/SUPPORT_STATUS b/ruby_1_8_6/ext/tk/lib/tkextlib/SUPPORT_STATUS
new file mode 100644
index 0000000000..15925cba72
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/SUPPORT_STATUS
@@ -0,0 +1,196 @@
+
+  [ current support status of Tcl/Tk extensions ]
+
+  *** RELEASE_DATE of the libraries => see 'tkextlib/version.rb' ***
+
+The following list shows *CURRENT* status when this file was modifyed
+at last. If you want to add other Tcl/Tk extensions to the planed list
+(or change its status position), please request them at the ruby-talk,
+ruby-list, or ruby-dev ML. Although we cannot promise to support your 
+requests, we'll try to do. 
+
+If you want to check that wrapper libraries are ready to use on your 
+environment, please execute 'pkg_checker.rb' with no arguments. The 
+script may give you some hints about that.
+
+
+  ***** IMPORTANT NOTE **********************************************
+
+    'support' means that Ruby/Tk's wrapper libraries are released. 
+    'not support' does *NOT* mean that the extension doesn't work
+    on Ruby/Tk. 
+
+    The version number of each extension means the latest version
+    which is checked its feature. That is, it does NOT means only 
+    version of working. Library files maybe include some features 
+    which is included in the former version but removed from the 
+    latest, and maybe able to support the later version then the 
+    shown version.
+
+    Even if the status of the extension is 'not support', you can 
+    control the functions/widgets of the extension without wrapper 
+    libraries by Tk.tk_call(), Tk.ip_eval(), and so on. 
+
+    If you cannot use installed Tcl/Tk extension, please check the 
+    followings. 
+
+     (1) On your Tcl/Tk, does the extention work?
+
+     (2) Do DLL libraries of the extension exist on DLL load-path?
+         (See also "<ruby archive>/ext/tcltklib/README.ActiveTcl")
+
+     (3) Is the Tcl library directory of the extension included in 
+         library search-path of the Tcl interpreter linked Ruby/Tk?
+
+    The check results may request you to do some setup operations 
+    before using the extension. If so, then please write the step 
+    of setup oprations into the "setup.rb" file in the directory 
+    of the wrapper libraries for the extention (It is the wrapper
+    libraries have the standard structure of the libraries in this 
+    directory). The "setup" file is required before requiring the 
+    Tcl library package (TkPackage.require(<libname>)). 
+
+  *******************************************************************
+
+
+===< support with some examples (may be beta quality) >=======================
+
+Tcllib       1.8     
+Tklib        0.4.1   http://sourceforge.net/projects/tcllib      ==> tcllib
+
+IWidgets     4.0.2   http://sourceforge.net/projects/incrtcl     ==> iwidgets
+
+BWidgets     1.7     http://sourceforge.net/projects/tcllib      ==> bwidget
+
+TkTable      2.9     http://sourceforge.net/projects/tktable     ==> tktable
+                         * see also <http://www.korus.hu/~fery/ruby/tktable.rb>
+                                    written by Ferenc Engard (ferenc@engard.hu)
+
+vu           2.3.0   http://sourceforge.net/projects/tktable     ==> vu
+
+TkHTML       2.0     http://www.hwaci.com/sw/tkhtml/             ==> tkHTML
+
+ICONS        1.0     http://www.satisoft.com/tcltk/icons/        ==> ICONS
+
+TkImg        1.3     http://sourceforge.net/projects/tkimg       ==> tkimg
+
+
+BLT          2.4z    http://sourceforge.net/projects/blt
+                        * see also tcltk-ext library on RAA 
+                                (http://raa.ruby-lang.org/)
+                      ==> blt
+
+TkTreeCtrl   CVS/Hd(2005-12-02)
+                     http://sourceforge.net/projects/tktreectrl  ==> treectrl
+
+Tile         0.7.8
+                     http://sourceforge.net/projects/tktable     ==> tile
+
+
+
+===< support (may be alpha or beta quality) >=================================
+
+IncrTcl      CVS/Hd(2005-02-14)
+                     http://sourceforge.net/projects/incrtcl     ==> itcl, itk
+
+TclX         CVS/Hd(2005-02-07)
+                     http://sourceforge.net/projects/tclx
+                       ==> tclx (partial support; infox command and 
+                                                   XPG/3 message catalogs only)
+
+Trofs        0.4.3   http://math.nist.gov/~DPorter/tcltk/trofs/
+
+
+
+===< possibly available (not tested; alpha quality) >=========================
+
+winico       0.6
+                     http://sourceforge.net/projects/tktable
+                       ==> winico (win32 only)
+
+TkTrans      latest(2004-10-11)
+                     http://www2.cmp.uea.ac.uk/~fuzz/tktrans/default.html
+                       ==>  tktrans (win32 only)
+
+TkDND        1.0a2   http://sourceforge.net/projects/tkdnd       ==> tkDND
+
+
+
+===< plan to support (alpha quality libraries may be included) >==============
+
+GraphViz     ***     http://www.graphviz.org/
+
+Tkgeomap     ***     http://tkgeomap.sourceforge.net/index.html
+
+
+
+===< not determined to supprt or not >========================================
+
+Tix          ***     http://tixlibrary.sourceforge.net/
+                        * see also tcltk-ext library on RAA 
+                                (http://raa.ruby-lang.org/)
+
+TkZinc       ***     http://www.tkzinc.org/
+
+Wbc          ***     http://home.t-online.de/home/csaba.nemethi/
+
+Mentry       ***     http://home.t-online.de/home/csaba.nemethi/
+
+Tablelist    ***     http://home.t-online.de/home/csaba.nemethi/
+
+ANIGIF       ***     http://cardtable.sourceforge.net/tcltk/
+
+IMG_ROTATE   ***     http://cardtable.sourceforge.net/tcltk/
+
+TclVfs       ***     http://sourceforge.net/projects/tclvfs/
+
+vfwtcl       ***     http://sourceforge.net/projects/avicaptcl
+                        * Win32 only
+
+multicast    ***     http://sourceforge.net/projects/avicaptcl
+                        * Win32 only
+
+XBit         ***     http://www.geocities.com/~chengye/
+                        * current implementation is for Windows only
+
+QuickTimeTcl ***     http://hem.fyristorg.com/matben/qt/
+                        * works under Mac OS (8,9,X) or Windows
+
+
+
+===< may not support (already exist, out of Ruby/Tk scope, and so on) >=======
+
+TkCon        ***     http://sourceforge.net/projects/tkcon
+
+Expect       ***     http://sourceforge.net/projects/expect
+
+TclXML       ***     http://sourceforge.net/projects/tclxml
+
+TclXSLT      ***     http://sourceforge.net/projects/tclxml
+
+TclDOM       ***     http://sourceforge.net/projects/tclxml
+
+TclSOAP      ***     http://sourceforge.net/projects/tclsoap
+
+Snack        ***     http://www.speech.kth.se/~kare/snack2.2.tar.gz
+                        * use Snack for Ruby 
+                              (see http://rbsnack.sourceforge.net/)
+
+Tcom         ***     http://www.vex.net/~cthuang/tcom/
+
+tDOM         ***     http://www.tdom.org
+
+Mk4tcl       ***     http://www.equi4.com/metakit/tcl.html
+
+Memchan      ***     http://sourceforge.net/projects/memchan
+
+XOTcl        ***     http://www.xotcl.org/
+
+
+===< tool (may not supprt) >==================================================
+
+tbcload/tclcompiler 
+             ***     http://www.tcl.tk/software/tclpro/
+
+
+(End of List)
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt.rb
new file mode 100644
index 0000000000..115eb927ba
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt.rb
@@ -0,0 +1,187 @@
+#
+#  BLT support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/variable'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/blt/setup.rb'
+
+# load all image format handlers
+#TkPackage.require('BLT', '2.4')
+TkPackage.require('BLT')
+
+module Tk
+  module BLT
+    TkComm::TkExtlibAutoloadModule.unshift(self)
+
+    extend TkCore
+
+    VERSION = tk_call('set', 'blt_version')
+    PATCH_LEVEL = tk_call('set', 'blt_patchLevel')
+
+    begin
+      lib = INTERP._invoke('set', 'blt_library')
+    rescue
+      lib = ''
+    end
+    LIBRARY  = TkVarAccess.new('blt_library', lib)
+
+    begin
+      lib = INTERP._invoke('set', 'blt_libPath')
+    rescue
+      lib = ''
+    end
+    LIB_PATH = TkVarAccess.new('blt_libPath', lib)
+
+    PACKAGE_NAME = 'BLT'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('BLT')
+      rescue
+        ''
+      end
+    end
+
+    ####################################################
+
+    def self.beep(percent = 50)
+      tk_call('::blt::beep', percent)
+    end
+
+    def self.bgexec(*args)
+      if args[0].kind_of?(TkVariable)
+        var = args.shift
+      else
+        var = TkVariable.new
+      end
+      params = [var]
+
+      params.concat(hash_kv(args.shift, true)) if args[0].kind_of?(Hash)
+
+      params << '--' if args[0] =~ /^\s*-[^-]/
+      params.concat(args)
+
+      tk_call('::blt::bgexec', *params)
+      var
+    end
+
+    def self.detach_bgexec(*args)
+      if args[0].kind_of?(TkVariable)
+        var = args.shift
+      else
+        var = TkVariable.new
+      end
+      params = [var]
+
+      params.concat(hash_kv(args.shift, true)) if args[0].kind_of?(Hash)
+
+      params << '--' if args[0] =~ /^\s*-[^-]/
+      params.concat(args)
+      params << '&'
+
+      [var, tk_split_list(tk_call('::blt::bgexec', *params))]
+    end
+
+    def self.bltdebug(lvl = nil)
+      if lvl
+        tk_call('::blt::bltdebug', lvl)
+      else
+        number(tk_call('::blt::bltdebug'))
+      end
+    end
+
+    def self.crc32_file(name)
+      tk_call_without_enc('::blt::crc32', name)
+    end
+    def self.crc32_data(dat)
+      tk_call_without_enc('::blt::crc32', '-data', dat)
+    end
+
+    ####################################################
+
+    def self.active_legend(graph)
+      tk_call_without_enc('Blt_ActiveLegend', graph)
+    end
+    def self.crosshairs(graph)
+      tk_call_without_enc('Blt_Crosshairs', graph)
+    end
+    def self.zoom_stack(graph)
+      tk_call_without_enc('Blt_ZoomStack', graph)
+    end
+    def self.print_key(graph)
+      tk_call_without_enc('Blt_PrintKey', graph)
+    end
+    def self.closest_point(graph)
+      tk_call_without_enc('Blt_ClosestPoint', graph)
+    end
+
+    module GraphCommand
+      def active_legend
+        tk_call_without_enc('Blt_ActiveLegend', @path)
+        self
+      end
+      def crosshairs
+        tk_call_without_enc('Blt_Crosshairs', @path)
+        self
+      end
+      def zoom_stack
+        tk_call_without_enc('Blt_ZoomStack', @path)
+        self
+      end
+      def print_key
+        tk_call_without_enc('Blt_PrintKey', @path)
+        self
+      end
+      def closest_point
+        tk_call_without_enc('Blt_ClosestPoint', @path)
+        self
+      end
+    end
+
+    ####################################################
+
+    autoload :PlotComponent,'tkextlib/blt/component.rb'
+
+    autoload :Barchart,     'tkextlib/blt/barchart.rb'
+    autoload :Bitmap,       'tkextlib/blt/bitmap.rb'
+    autoload :Busy,         'tkextlib/blt/busy.rb'
+    autoload :Container,    'tkextlib/blt/container.rb'
+    autoload :CutBuffer,    'tkextlib/blt/cutbuffer.rb'
+    autoload :DragDrop,     'tkextlib/blt/dragdrop.rb'
+    autoload :EPS,          'tkextlib/blt/eps.rb'
+    autoload :Htext,        'tkextlib/blt/htext.rb'
+    autoload :Graph,        'tkextlib/blt/graph.rb'
+    autoload :Spline,       'tkextlib/blt/spline.rb'
+    autoload :Stripchart,   'tkextlib/blt/stripchart.rb'
+    autoload :Table,        'tkextlib/blt/table.rb'
+    autoload :Tabnotebook,  'tkextlib/blt/tabnotebook.rb'
+    autoload :Tabset,       'tkextlib/blt/tabset.rb'
+    autoload :Ted,          'tkextlib/blt/ted.rb'
+    autoload :Tile,         'tkextlib/blt/tile.rb'
+    autoload :Tree,         'tkextlib/blt/tree.rb'
+    autoload :TreeView,     'tkextlib/blt/treeview.rb'
+    autoload :Hiertable,    'tkextlib/blt/treeview.rb'
+    # Hierbox is obsolete
+    autoload :Vector,       'tkextlib/blt/vector.rb'
+    autoload :VectorAccess, 'tkextlib/blt/vector.rb'
+    autoload :Watch,        'tkextlib/blt/watch.rb'
+    autoload :Winop,        'tkextlib/blt/winop.rb'
+    autoload :WinOp,        'tkextlib/blt/winop.rb'
+
+    # Unix only
+    autoload :DnD,          'tkextlib/blt/unix_dnd.rb'
+
+    # Windows only
+    autoload :Printer,      'tkextlib/blt/win_printer.rb'
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/barchart.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/barchart.rb
new file mode 100644
index 0000000000..cb481c5889
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/barchart.rb
@@ -0,0 +1,79 @@
+#
+#  tkextlib/blt/barchart.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+require 'tkextlib/blt/component.rb'
+
+module Tk::BLT
+  class Barchart < TkWindow
+    TkCommandNames = ['::blt::barchart'.freeze].freeze
+    WidgetClassName = 'Barchart'.freeze
+    WidgetClassNames[WidgetClassName] = self
+
+    include PlotComponent
+    include GraphCommand
+
+    def __boolval_optkeys
+      ['bufferelements', 'buffergraph', 'invertxy']
+    end
+    private :__boolval_optkeys
+
+    def __strval_optkeys
+      ['text', 'label', 'title', 'file', 
+        'background', 'plotbackground']
+    end
+    private :__strval_optkeys
+
+    def __tkvariable_optkeys
+      super() << 'colormap' << 'fontmap'
+    end
+    private :__tkvariable_optkeys
+
+=begin
+    BarElement_ID = ['blt_barchart_bar'.freeze, '00000'.taint].freeze
+
+    def bar(elem=nil, keys={})
+      if elem.kind_of?(Hash)
+        keys = elem
+        elem = nil
+      end
+      unless elem
+        elem = BarElement_ID.join(TkCore::INTERP._ip_id_).freeze
+        BarElement_ID[1].succ!
+      end
+      tk_send('bar', elem, keys)
+      Element.new(self, elem, :without_creating=>true)
+    end
+=end
+
+    def extents(item)
+      num_or_str(tk_send_without_enc('extents', item))
+    end
+
+    def invtransform(x, y)
+      list(tk_send_without_enc('invtransform', x, y))
+    end
+
+    def inside(x, y)
+      bool(tk_send_without_enc('inside', x, y))
+    end
+
+    def metafile(file=None)
+      # Windows only
+      tk_send('metafile', file)
+      self
+    end
+
+    def snap(output, keys={})
+      tk_send_without_enc('snap', *(hash_kv(keys, false) + output))
+      self
+    end
+
+    def transform(x, y)
+      list(tk_send_without_enc('transform', x, y))
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/bitmap.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/bitmap.rb
new file mode 100644
index 0000000000..31cf8d4229
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/bitmap.rb
@@ -0,0 +1,99 @@
+#
+#  tkextlib/blt/bitmap.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Bitmap < TkObject
+    extend TkCore
+
+    TkCommandNames = ['::blt::bitmap'.freeze].freeze
+
+    BITMAP_ID_TBL = TkCore::INTERP.create_table
+    BITMAP_ID = ['blt_bitmap_id'.freeze, '00000'.taint].freeze
+
+    def self.data(name)
+      dat = tk_simple_list(tk_call('::blt::bitmap', 'data', name))
+      [ tk_split_list(dat[0]), tk_simple_list(dat[1]) ]
+    end
+
+    def self.exist?(name)
+      bool(tk_call('::blt::bitmap', 'exists', name))
+    end
+
+    def self.height(name)
+      number(tk_call('::blt::bitmap', 'height', name))
+    end
+
+    def self.width(name)
+      number(tk_call('::blt::bitmap', 'width', name))
+    end
+
+    def self.source(name)
+      tk_simple_list(tk_call('::blt::bitmap', 'source', name))
+    end
+
+    #################################
+
+    class << self
+      alias _new new
+
+      def new(data, keys={})
+        _new(:data, nil, data, keys)
+      end
+      alias define new
+
+      def new_with_name(name, data, keys={})
+        _new(:data, name, data, keys)
+      end
+      alias define_with_name new_with_name
+
+      def compose(text, keys={})
+        _new(:text, nil, text, keys)
+      end
+
+      def compose_with_name(name, text, keys={})
+        _new(:text, name, text, keys)
+      end
+    end
+
+    def initialize(type, name, data, keys = {})
+      if name
+        @id = name
+      else
+        @id = BITMAP_ID.join(TkCore::INTERP._ip_id_)
+        BITMAP_ID[1].succ!
+        BITMAP_ID_TBL[@id] = self
+      end
+
+      @path = @id
+
+      unless bool(tk_call('::blt::bitmap', 'exists', @id))
+        if type == :text
+          tk_call('::blt::bitmap', 'compose', @id, data, *hash_kv(keys))
+        else # :data
+          tk_call('::blt::bitmap', 'define', @id, data, *hash_kv(keys))
+        end
+      end
+    end
+
+    def exist?
+      bool(tk_call('::blt::bitmap', 'exists', @id))
+    end
+
+    def height
+      number(tk_call('::blt::bitmap', 'height', @id))
+    end
+
+    def width
+      number(tk_call('::blt::bitmap', 'width', @id))
+    end
+
+    def source
+      tk_simple_list(tk_call('::blt::bitmap', 'source', @id))
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/busy.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/busy.rb
new file mode 100644
index 0000000000..4726e466f4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/busy.rb
@@ -0,0 +1,82 @@
+#
+#  tkextlib/blt/busy.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/itemconfig.rb'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module Busy
+    extend TkCore
+    extend TkItemConfigMethod
+
+    TkCommandNames = ['::blt::busy'.freeze].freeze
+
+    ###########################
+
+    class Shield < TkWindow
+      def self.shield_path(win)
+        win = window(win) unless win.kind_of?(TkWindow)
+        if win.kind_of?(TkToplevel)
+          win.path + '._Busy'
+        else
+          win.path + '_Busy'
+        end
+      end
+
+      def initialize(win)
+        @path = self.class.shield_path(win)
+      end
+    end
+
+    def self.shield_path(win)
+      Tk::BLT::Busy::Shield.shield_path(win)
+    end
+  end
+end
+
+class << Tk::BLT::Busy
+  def __item_config_cmd(win)
+    ['::blt::busy', 'configure', win]
+  end
+  private :__item_config_cmd
+
+  undef itemcget
+  alias configure itemconfigure
+  alias configinfo itemconfiginfo
+  alias current_configinfo current_itemconfiginfo
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  ##################################
+
+  def hold(win, keys={})
+    tk_call('::blt::busy', 'hold', win, *hash_kv(keys))
+  end
+
+  def release(*wins)
+    tk_call('::blt::busy', 'release', *wins)
+  end
+
+  def forget(*wins)
+    tk_call('::blt::busy', 'forget', *wins)
+  end
+
+  def is_busy(pat=None)
+    tk_split_list(tk_call('::blt::busy', 'isbusy', pat))
+  end
+
+  def names(pat=None)
+    tk_split_list(tk_call('::blt::busy', 'names', pat))
+  end
+  alias windows names
+
+  def check(win)
+    bool(tk_call('::blt::busy', 'check', win))
+  end
+
+  def status(win)
+    bool(tk_call('::blt::busy', 'status', win))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/component.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/component.rb
new file mode 100644
index 0000000000..ad78a5430b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/component.rb
@@ -0,0 +1,1835 @@
+#
+#  tkextlib/blt/component.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module PlotComponent
+    include TkItemConfigMethod
+
+    module OptKeys
+      def __item_font_optkeys(id)
+        ['font', 'tickfont', 'titlefont']
+      end
+      private :__item_font_optkeys
+
+      def __item_numstrval_optkeys(id)
+        ['xoffset', 'yoffset']
+      end
+      private :__item_numstrval_optkeys
+
+      def __item_boolval_optkeys(id)
+        ['hide', 'under', 'descending', 'logscale', 'loose', 'showticks', 
+          'titlealternate', 'scalesymbols', 'minor', 'raised', 
+          'center', 'decoration', 'landscape', 'maxpect']
+      end
+      private :__item_boolval_optkeys
+
+      def __item_strval_optkeys(id)
+        ['text', 'label', 'limits', 'title', 
+          'show', 'file', 'maskdata', 'maskfile', 
+          'color', 'titlecolor', 'fill', 'outline', 'offdash']
+      end
+      private :__item_strval_optkeys
+
+      def __item_listval_optkeys(id)
+        ['bindtags']
+      end
+      private :__item_listval_optkeys
+
+      def __item_numlistval_optkeys(id)
+        ['dashes', 'majorticks', 'minorticks']
+      end
+      private :__item_numlistval_optkeys
+
+      def __item_tkvariable_optkeys(id)
+        ['variable', 'textvariable', 'colormap', 'fontmap']
+      end
+      private :__item_tkvariable_optkeys
+    end
+
+    include OptKeys
+
+    def __item_cget_cmd(id)
+      if id.kind_of?(Array)
+        # id := [ type, name ]
+        [self.path, id[0], 'cget', id[1]]
+      else
+        [self.path, id, 'cget']
+      end
+    end
+    private :__item_cget_cmd
+
+    def __item_config_cmd(id)
+      if id.kind_of?(Array)
+        # id := [ type, name, ... ]
+        type, *names = id
+        [self.path, type, 'configure'].concat(names)
+      else
+        [self.path, id, 'configure']
+      end
+    end
+    private :__item_config_cmd
+
+    def __item_pathname(id)
+      if id.kind_of?(Array)
+        id = tagid(id[1])
+      end
+      [self.path, id].join(';')
+    end
+    private :__item_pathname
+
+    def axis_cget(id, option)
+      ret = itemcget(['axis', tagid(id)], option)
+    end
+    def axis_configure(*args)
+      slot = args.pop
+      if slot.kind_of?(Hash)
+        value = None
+        slot = _symbolkey2str(slot)
+        if cmd = slot.delete('command')
+          slot['command'] = proc{|w, tick| 
+            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+          }
+        end
+      else
+        value = slot
+        slot = args.pop
+        if slot == :command || slot == 'command'
+          cmd = value
+          value = proc{|w, tick| 
+            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+          }
+        end
+      end
+      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('axis')
+      itemconfigure(id_list, slot, value)
+    end
+    def axis_configinfo(id, slot=nil)
+      itemconfiginfo(['axis', tagid(id)], slot)
+    end
+    def current_axis_configinfo(id, slot=nil)
+      current_itemconfiginfo(['axis', tagid(id)], slot)
+    end
+
+    def crosshairs_cget(option)
+      itemcget('crosshairs', option)
+    end
+    def crosshairs_configure(slot, value=None)
+      itemconfigure('crosshairs', slot, value)
+    end
+    def crosshairs_configinfo(slot=nil)
+      itemconfiginfo('crosshairs', slot)
+    end
+    def current_crosshairs_configinfo(slot=nil)
+      current_itemconfiginfo('crosshairs', slot)
+    end
+
+    def element_cget(id, option)
+      itemcget(['element', tagid(id)], option)
+    end
+    def element_configure(*args)
+      slot = args.pop
+      if slot.kind_of?(Hash)
+        value = None
+      else
+        value = slot
+        slot = args.pop
+      end
+      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('element')
+      itemconfigure(id_list, slot, value)
+    end
+    def element_configinfo(id, slot=nil)
+      itemconfiginfo(['element', tagid(id)], slot)
+    end
+    def current_element_configinfo(id, slot=nil)
+      current_itemconfiginfo(['element', tagid(id)], slot)
+    end
+
+    def bar_cget(id, option)
+      itemcget(['bar', tagid(id)], option)
+    end
+    def bar_configure(*args)
+      slot = args.pop
+      if slot.kind_of?(Hash)
+        value = None
+      else
+        value = slot
+        slot = args.pop
+      end
+      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('bar')
+      itemconfigure(id_list, slot, value)
+    end
+    def bar_configinfo(id, slot=nil)
+      itemconfiginfo(['bar', tagid(id)], slot)
+    end
+    def current_bar_configinfo(id, slot=nil)
+      current_itemconfiginfo(['bar', tagid(id)], slot)
+    end
+
+    def line_cget(id, option)
+      itemcget(['line', tagid(id)], option)
+    end
+    def line_configure(*args)
+      slot = args.pop
+      if slot.kind_of?(Hash)
+        value = None
+      else
+        value = slot
+        slot = args.pop
+      end
+      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('line')
+      itemconfigure(id_list, slot, value)
+    end
+    def line_configinfo(id, slot=nil)
+      itemconfiginfo(['line', tagid(id)], slot)
+    end
+    def current_line_configinfo(id, slot=nil)
+      current_itemconfiginfo(['line', tagid(id)], slot)
+    end
+
+    def gridline_cget(option)
+      itemcget('grid', option)
+    end
+    def gridline_configure(slot, value=None)
+      itemconfigure('grid', slot, value)
+    end
+    def gridline_configinfo(slot=nil)
+      itemconfiginfo('grid', slot)
+    end
+    def current_gridline_configinfo(slot=nil)
+      current_itemconfiginfo('grid', slot)
+    end
+
+    def legend_cget(option)
+      itemcget('legend', option)
+    end
+    def legend_configure(slot, value=None)
+      itemconfigure('legend', slot, value)
+    end
+    def legend_configinfo(slot=nil)
+      itemconfiginfo('legend', slot)
+    end
+    def current_legend_configinfo(slot=nil)
+      current_itemconfiginfo('legend', slot)
+    end
+
+    def pen_cget(id, option)
+      itemcget(['pen', tagid(id)], option)
+    end
+    def pen_configure(*args)
+      slot = args.pop
+      if slot.kind_of?(Hash)
+        value = None
+      else
+        value = slot
+        slot = args.pop
+      end
+      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('pen')
+      itemconfigure(id_list, slot, value)
+    end
+    def pen_configinfo(id, slot=nil)
+      itemconfiginfo(['pen', tagid(id)], slot)
+    end
+    def current_pen_configinfo(id, slot=nil)
+      current_itemconfiginfo(['pen', tagid(id)], slot)
+    end
+
+    def postscript_cget(option)
+      itemcget('postscript', option)
+    end
+    def postscript_configure(slot, value=None)
+      itemconfigure('postscript', slot, value)
+    end
+    def postscript_configinfo(slot=nil)
+      itemconfiginfo('postscript', slot)
+    end
+    def current_postscript_configinfo(slot=nil)
+      current_itemconfiginfo('postscript', slot)
+    end
+
+    def marker_cget(id, option)
+      itemcget(['marker', tagid(id)], option)
+    end
+    def marker_configure(*args)
+      slot = args.pop
+      if slot.kind_of?(Hash)
+        value = None
+      else
+        value = slot
+        slot = args.pop
+      end
+      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('marker')
+      itemconfigure(id_list, slot, value)
+    end
+    def marker_configinfo(id, slot=nil)
+      itemconfiginfo(['marker', tagid(id)], slot)
+    end
+    def current_marker_configinfo(id, slot=nil)
+      current_itemconfiginfo(['marker', tagid(id)], slot)
+    end
+
+    alias __itemcget itemcget
+    alias __itemconfiginfo itemconfiginfo
+    alias __current_itemconfiginfo current_itemconfiginfo
+    private :__itemcget, :__itemconfiginfo, :__current_itemconfiginfo
+
+    def itemcget(tagOrId, option)
+      ret = __itemcget(tagid(tagOrId), option)
+      if option == 'bindtags' || option == :bindtags
+        ret.collect{|tag| TkBindTag.id2obj(tag)}
+      else
+        ret
+      end
+    end
+    def itemconfiginfo(tagOrId, slot = nil)
+      ret = __itemconfiginfo(tagid(tagOrId), slot)
+
+      if TkComm::GET_CONFIGINFO_AS_ARRAY
+        if slot
+          if slot == 'bindtags' || slot == :bindtags
+            ret[-2] = ret[-2].collect{|tag| TkBindTag.id2obj(tag)}
+            ret[-1] = ret[-1].collect{|tag| TkBindTag.id2obj(tag)}
+          end
+        else
+          if (inf = ret.assoc('bindtags'))
+            inf[-2] = inf[-2].collect{|tag| TkBindTag.id2obj(tag)}
+            inf[-1] = inf[-1].collect{|tag| TkBindTag.id2obj(tag)}
+          end
+        end
+
+      else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+        if (inf = ret['bindtags'])
+          inf[-2] = inf[-2].collect{|tag| TkBindTag.id2obj(tag)}
+          inf[-1] = inf[-1].collect{|tag| TkBindTag.id2obj(tag)}
+          ret['bindtags'] = inf
+        end
+      end
+
+      ret
+    end
+    def current_itemconfiginfo(tagOrId, slot = nil)
+      ret = __current_itemconfiginfo(tagid(tagOrId), slot)
+
+      if (val = ret['bindtags'])
+        ret['bindtags'] = val.collect{|tag| TkBindTag.id2obj(tag)}
+      end
+
+      ret
+    end
+
+    private :itemcget, :itemconfigure
+    private :itemconfiginfo, :current_itemconfiginfo
+
+    #################
+
+    class Axis < TkObject
+      OBJ_ID = ['blt_chart_axis'.freeze, '00000'.taint].freeze
+      OBJ_TBL={}
+
+      def self.id2obj(chart, id)
+        cpath = chart.path
+        return id unless OBJ_TBL[cpath]
+        OBJ_TBL[cpath][id]? OBJ_TBL[cpath][id]: id
+      end
+
+      def self.new(chart, axis=nil, keys={})
+        if axis.kind_of?(Hash)
+          keys = axis
+          axis = nil
+        end
+        OBJ_TBL[chart.path] = {} unless OBJ_TBL[chart.path]
+        return OBJ_TBL[chart.path][axis] if axis && OBJ_TBL[chart.path][axis]
+        super(chart, axis, keys)
+      end
+
+      def initialize(chart, axis=nil, keys={})
+        if axis.kind_of?(Hash)
+          keys = axis
+          axis = nil
+        end
+        if axis
+          @axis = @id = axis.to_s
+        else
+          @axis = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
+          OBJ_ID[1].succ!
+        end
+        @path = @id
+        @parent = @chart = chart
+        @cpath = @chart.path
+        Axis::OBJ_TBL[@cpath][@axis] = self
+        keys = _symbolkey2str(keys)
+        unless keys.delete('without_creating')
+          # @chart.axis_create(@axis, keys)
+          tk_call(@chart, 'axis', 'create', @axis, keys)
+        end
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @id
+      end
+
+      def cget(option)
+        @chart.axis_cget(@id, option)
+      end
+      def configure(key, value=None)
+        @chart.axis_configure(@id, key, value)
+        self
+      end
+      def configinfo(key=nil)
+        @chart.axis_configinfo(@id, key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_axis_configinfo(@id, key)
+      end
+
+      def command(cmd=nil, &b)
+        if cmd
+          configure('command', cmd)
+        elsif b
+          configure('command', Proc.new(&b))
+        else
+          cget('command')
+        end
+      end
+
+      def delete
+        @chart.axis_delete(@id)
+        self
+      end
+
+      def invtransform(val)
+        @chart.axis_invtransform(@id, val)
+      end
+
+      def limits
+        @chart.axis_limits(@id)
+      end
+
+      def name
+        @axis
+      end
+        
+      def transform(val)
+        @chart.axis_transform(@id, val)
+      end
+
+      def view
+        @chart.axis_view(@id)
+        self
+      end
+
+      def use(name=None) # if @id == xaxis | x2axis | yaxis | y2axis
+        @chart.axis_use(@id, name)
+      end
+
+      def use_as(axis) # axis := xaxis | x2axis | yaxis | y2axis
+        @chart.axis_use(axis, @id)
+      end
+    end
+
+    #################
+
+    class Crosshairs < TkObject
+      OBJ_TBL={}
+
+      def self.new(chart, keys={})
+        return OBJ_TBL[chart.path] if OBJ_TBL[chart.path]
+        super(chart, keys)
+      end
+
+      def initialize(chart, keys={})
+        @parent = @chart = chart
+        @cpath = @chart.path
+        Crosshairs::OBJ_TBL[@cpath] = self
+        @chart.crosshair_configure(keys) unless keys.empty?
+        @path = @id = 'crosshairs'
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @id
+      end
+
+      def cget(option)
+        @chart.crosshair_cget(option)
+      end
+      def configure(key, value=None)
+        @chart.crosshair_configure(key, value)
+        self
+      end
+      def configinfo(key=nil)
+        @chart.crosshair_configinfo(key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_crosshair_configinfo(key)
+      end
+
+      def off
+        @chart.crosshair_off
+        self
+      end
+      def on
+        @chart.crosshair_on
+        self
+      end
+      def toggle
+        @chart.crosshair_toggle
+        self
+      end
+    end
+
+    #################
+
+    class Element < TkObject
+      extend Tk
+      extend TkItemFontOptkeys
+      extend TkItemConfigOptkeys
+
+      extend Tk::BLT::PlotComponent::OptKeys
+
+      ElementTypeName = 'element'
+      ElementTypeToClass = { ElementTypeName=>self }
+      ElementID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{ ElementID_TBL.clear }
+
+      OBJ_ID = ['blt_chart_element'.freeze, '00000'.taint].freeze
+      OBJ_TBL={}
+
+      def Element.type2class(type)
+        ElementTypeToClass[type]
+      end
+
+      def Element.id2obj(chart, id)
+        cpath = chart.path
+        return id unless OBJ_TBL[cpath]
+        OBJ_TBL[cpath][id]? OBJ_TBL[cpath][id]: id
+      end
+
+      def self.new(chart, element=nil, keys={})
+        if element.kind_of?(Hash)
+          keys = element
+          element = nil
+        end
+        OBJ_TBL[chart.path] = {} unless OBJ_TBL[chart.path]
+        if element && OBJ_TBL[chart.path][element]
+          return OBJ_TBL[chart.path][element]
+        end
+        super(chart, element, keys)
+      end
+
+      def initialize(chart, element=nil, keys={})
+        if element.kind_of?(Hash)
+          keys = element
+          element = nil
+        end
+        if element
+          @element = @id = element.to_s
+        else
+          @element = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
+          OBJ_ID[1].succ!
+        end
+        @path = @id
+        @parent = @chart = chart
+        @cpath = @chart.path
+        @typename = self.class::ElementTypeName
+        Element::OBJ_TBL[@cpath][@element] = self
+        keys = _symbolkey2str(keys)
+        unless keys.delete('without_creating')
+          # @chart.element_create(@element, keys)
+          tk_call(@chart, @typename, 'create', @element, keys)
+        end
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @id
+      end
+
+      def cget(option)
+        # @chart.element_cget(@id, option)
+        @chart.__send__(@typename + '_cget', @id, option)
+      end
+      def configure(key, value=None)
+        # @chart.element_configure(@id, key, value)
+        @chart.__send__(@typename + '_configure', @id, key, value)
+        self
+      end
+      def configinfo(key=nil)
+        # @chart.element_configinfo(@id, key)
+        @chart.__send__(@typename + '_configinfo', @id, key)
+      end
+      def current_configinfo(key=nil)
+        # @chart.current_element_configinfo(@id, key)
+        @chart.__send__('current_' << @typename << '_configinfo', @id, key)
+      end
+
+      def activate(*args)
+        @chart.element_activate(@id, *args)
+      end
+
+      def closest(x, y, var, keys={})
+        # @chart.element_closest(x, y, var, @id, keys)
+        @chart.__send__(@typename + '_closest', x, y, var, @id, keys)
+      end
+
+      def deactivate
+        @chart.element_deactivate(@id)
+        self
+      end
+
+      def delete
+        @chart.element_delete(@id)
+        self
+      end
+
+      def exist?
+        @chart.element_exist?(@id)
+      end
+
+      def name
+        @element
+      end
+
+      def type
+        @chart.element_type(@id)
+      end
+    end
+
+    class Bar < Element
+      ElementTypeName = 'bar'.freeze
+      ElementTypeToClass[ElementTypeName] = self
+    end
+    class Line < Element
+      ElementTypeName = 'line'.freeze
+      ElementTypeToClass[ElementTypeName] = self
+    end
+
+    #################
+
+    class GridLine < TkObject
+      OBJ_TBL={}
+
+      def self.new(chart, keys={})
+        return OBJ_TBL[chart.path] if OBJ_TBL[chart.path]
+        super(chart, keys)
+      end
+
+      def initialize(chart, keys={})
+        @parent = @chart = chart
+        @cpath = @chart.path
+        GridLine::OBJ_TBL[@cpath] = self
+        @chart.gridline_configure(keys) unless keys.empty?
+        @path = @id = 'grid'
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @id
+      end
+
+      def cget(option)
+        @chart.gridline_cget(option)
+      end
+      def configure(key, value=None)
+        @chart.gridline_configure(key, value)
+        self
+      end
+      def configinfo(key=nil)
+        @chart.gridline_configinfo(key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_gridline_configinfo(key)
+      end
+
+      def off
+        @chart.gridline_off
+        self
+      end
+      def on
+        @chart.gridline_on
+        self
+      end
+      def toggle
+        @chart.gridline_toggle
+        self
+      end
+    end
+
+    #################
+
+    class Legend < TkObject
+      OBJ_TBL={}
+
+      def self.new(chart, keys={})
+        return OBJ_TBL[chart.path] if OBJ_TBL[chart.path]
+        super(chart, keys)
+      end
+
+      def initialize(chart, keys={})
+        @parent = @chart = chart
+        @cpath = @chart.path
+        Crosshairs::OBJ_TBL[@cpath] = self
+        @chart.crosshair_configure(keys) unless keys.empty?
+        @path = @id = 'legend'
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @id
+      end
+
+      def cget(option)
+        @chart.legend_cget(option)
+      end
+      def configure(key, value=None)
+        @chart.legend_configure(key, value)
+        self
+      end
+      def configinfo(key=nil)
+        @chart.legend_configinfo(key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_legend_configinfo(key)
+      end
+
+      def activate(*args)
+        @chart.legend_activate(*args)
+      end
+
+      def deactivate(*args)
+        @chart.legend_deactivate(*args)
+      end
+
+      def get(pos, y=nil)
+        @chart.legend_get(pos, y)
+      end
+    end
+
+    #################
+
+    class Pen < TkObject
+      OBJ_ID = ['blt_chart_pen'.freeze, '00000'.taint].freeze
+      OBJ_TBL={}
+
+      def self.id2obj(chart, id)
+        cpath = chart.path
+        return id unless OBJ_TBL[cpath]
+        OBJ_TBL[cpath][id]? OBJ_TBL[cpath][id]: id
+      end
+
+      def self.new(chart, pen=nil, keys={})
+        if pen.kind_of?(Hash)
+          keys = pen
+          pen = nil
+        end
+        OBJ_TBL[chart.path] = {} unless OBJ_TBL[chart.path]
+        return OBJ_TBL[chart.path][pen] if pen && OBJ_TBL[chart.path][pen]
+        super(chart, pen, keys)
+      end
+
+      def initialize(chart, pen=nil, keys={})
+        if pen.kind_of?(Hash)
+          keys = pen
+          pen = nil
+        end
+        if pen
+          @pen = @id = pen.to_s
+        else
+          @pen = @id = OBJ_ID.join(TkCore::INTERP._ip_id_).freeze
+          OBJ_ID[1].succ!
+        end
+        @path = @id
+        @parent = @chart = chart
+        @cpath = @chart.path
+        Pen::OBJ_TBL[@cpath][@pen] = self
+        keys = _symbolkey2str(keys)
+        unless keys.delete('without_creating')
+          # @chart.pen_create(@pen, keys)
+          tk_call(@chart, 'pen', 'create', @pen, keys)
+        end
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @id
+      end
+
+      def cget(option)
+        @chart.pen_cget(@id, option)
+      end
+      def configure(key, value=None)
+        @chart.pen_configure(@id, key, value)
+        self
+      end
+      def configinfo(key=nil)
+        @chart.pen_configinfo(@id, key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_pen_configinfo(@id, key)
+      end
+
+      def delete
+        @chart.pen_delete(@id)
+        self
+      end
+
+      def name
+        @pen
+      end
+    end
+
+    #################
+
+    class Postscript < TkObject
+      OBJ_TBL={}
+
+      def self.new(chart, keys={})
+        return OBJ_TBL[chart.path] if OBJ_TBL[chart.path]
+        super(chart, keys)
+      end
+
+      def initialize(chart, keys={})
+        @parent = @chart = chart
+        @cpath = @chart.path
+        Postscript::OBJ_TBL[@cpath] = self
+        @chart.postscript_configure(keys) unless keys.empty?
+        @path = @id = 'postscript'
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @id
+      end
+
+      def cget(option)
+        @chart.postscript_cget(option)
+      end
+      def configure(key, value=None)
+        @chart.postscript_configure(key, value)
+        self
+      end
+      def configinfo(key=nil)
+        @chart.postscript_configinfo(key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_postscript_configinfo(key)
+      end
+
+      def output(file=nil, keys={})
+        if file.kind_of?(Hash)
+          keys = file
+          file = nil
+        end
+
+        ret = @chart.postscript_output(file, keys)
+
+        if file
+          self
+        else
+          ret
+        end
+      end
+    end
+
+    #################
+    class Marker < TkObject
+      extend Tk
+      extend TkItemFontOptkeys
+      extend TkItemConfigOptkeys
+
+      extend Tk::BLT::PlotComponent::OptKeys
+
+      MarkerTypeName = nil
+      MarkerTypeToClass = {}
+      MarkerID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{ MarkerID_TBL.clear }
+
+      def Marker.type2class(type)
+        MarkerTypeToClass[type]
+      end
+
+      def Marker.id2obj(chart, id)
+        cpath = chart.path
+        return id unless MarkerID_TBL[cpath]
+        MarkerID_TBL[cpath][id]? MarkerID_TBL[cpath][id]: id
+      end
+
+      def self._parse_create_args(keys)
+        fontkeys = {}
+        methodkeys = {}
+        if keys.kind_of? Hash
+          keys = _symbolkey2str(keys)
+
+          __item_font_optkeys(nil).each{|key|
+            fkey = key.to_s
+            fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+            fkey = "kanji#{key}"
+            fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+            fkey = "latin#{key}"
+            fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+            fkey = "ascii#{key}"
+            fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+          }
+
+          __item_methodcall_optkeys(nil).each{|key|
+            key = key.to_s
+            methodkeys[key] = keys.delete(key) if keys.key?(key)
+          }
+
+          __item_ruby2val_optkeys(nil).each{|key, method|
+            key = key.to_s
+            keys[key] = method.call(keys[key]) if keys.has_key?(key)
+          }
+
+          args = itemconfig_hash_kv(nil, keys)
+        else
+          args = []
+        end
+
+        [args, fontkeys]
+      end
+      private_class_method :_parse_create_args
+
+      def self.create(chart, keys={})
+        unless self::MarkerTypeName
+          fail RuntimeError, "#{self} is an abstract class"
+        end
+        args, fontkeys = _parse_create_args(keys)
+        idnum = tk_call_without_enc(chart.path, 'marker', 'create', 
+                                    self::MarkerTypeName, *args)
+        chart.marker_configure(idnum, fontkeys) unless fontkeys.empty?
+        idnum.to_i  # 'item id' is an integer number
+      end
+
+      def self.create_type(chart, type, keys={})
+        args, fontkeys = _parse_create_args(keys)
+        idnum = tk_call_without_enc(chart.path, 'marker', 'create', 
+                                    type, *args)
+        chart.marker_configure(idnum, fontkeys) unless fontkeys.empty?
+        id = idnum.to_i  # 'item id' is an integer number
+        obj = self.allocate
+        obj.instance_eval{
+          @parent = @chart = chart
+          @cpath = chart.path
+          @id = id
+          unless Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath]
+            Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath] = {}
+          end
+          Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath][@id] = self
+        }
+        obj
+      end
+
+      def initialize(parent, *args)
+        @parent = @chart = parent
+        @cpath = parent.path
+
+        @path = @id = create_self(*args) # an integer number as 'item id'
+        unless Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath]
+          Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath] = {}
+        end
+        Tk::BLT::PlotComponent::Marker::MarkerID_TBL[@cpath][@id] = self
+      end
+      def create_self(*args)
+        self.class.create(@chart, *args) # return an integer as 'item id'
+      end
+      private :create_self
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @id
+      end
+
+      def cget(option)
+        @chart.marker_cget(@id, option)
+      end
+      def configure(key, value=None)
+        @chart.marker_configure(@id, key, value)
+        self
+      end
+      def configinfo(key=nil)
+        @chart.marker_configinfo(@id, key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_marker_configinfo(@id, key)
+      end
+
+      def after(target=None)
+        @chart.marker_after(@id, target)
+      end
+
+      def before(target=None)
+        @chart.marker_before(@id, target)
+      end
+
+      def delete
+        @chart.marker_delete(@id)
+      end
+
+      def exist?
+        @chart.marker_exist(@id)
+      end
+
+      def type
+        @chart.marker_type(@id)
+      end
+    end
+
+    class TextMarker < Marker
+      MarkerTypeName = 'text'.freeze
+      MarkerTypeToClass[MarkerTypeName] = self
+    end
+    class LineMarker < Marker
+      MarkerTypeName = 'line'.freeze
+      MarkerTypeToClass[MarkerTypeName] = self
+    end
+    class BitmapMarker < Marker
+      MarkerTypeName = 'bitmap'.freeze
+      MarkerTypeToClass[MarkerTypeName] = self
+    end
+    class ImageMarker < Marker
+      MarkerTypeName = 'image'.freeze
+      MarkerTypeToClass[MarkerTypeName] = self
+    end
+    class PolygonMarker < Marker
+      MarkerTypeName = 'polygon'.freeze
+      MarkerTypeToClass[MarkerTypeName] = self
+    end
+    class WindowMarker < Marker
+      MarkerTypeName = 'window'.freeze
+      MarkerTypeToClass[MarkerTypeName] = self
+    end
+
+    #################
+
+    def __destroy_hook__
+      Axis::OBJ_TBL.delete(@path)
+      Crosshairs::OBJ_TBL.delete(@path)
+      Element::OBJ_TBL.delete(@path)
+      GridLine::OBJ_TBL.delete(@path)
+      Legend::OBJ_TBL.delete(@path)
+      Pen::OBJ_TBL.delete(@path)
+      Postscript::OBJ_TBL.delete(@path)
+      Marker::OBJ_TBL.delete(@path)
+      super()
+    end
+
+    #################
+
+    def tagid(tag)
+      if tag.kind_of?(Axis) ||
+          tag.kind_of?(Crosshairs) ||
+          tag.kind_of?(Element) ||
+          tag.kind_of?(GridLine) ||
+          tag.kind_of?(Legend) ||
+          tag.kind_of?(Pen) ||
+          tag.kind_of?(Postscript) ||
+          tag.kind_of?(Marker)
+        tag.id
+      else
+        tag  # maybe an Array of configure paramters
+      end
+    end
+
+    def _component_bind(target, tag, context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind([path, target, 'bind', tagid(tag)], context, cmd, *args)
+      self
+    end
+    def _component_bind_append(target, tag, context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind_append([path, target, 'bind', tagid(tag)], context, cmd, *args)
+      self
+    end
+    def _component_bind_remove(target, tag, context)
+      _bind_remove([path, target, 'bind', tagid(tag)], context)
+      self
+    end
+    def _component_bindinfo(target, tag, context=nil)
+      _bindinfo([path, target, 'bind', tagid(tag)], context)
+    end
+    private :_component_bind, :_component_bind_append
+    private :_component_bind_remove, :_component_bindinfo
+
+    def axis_bind(tag, context, *args)
+      _component_bind('axis', tag, context, *args)
+    end
+    def axis_bind_append(tag, context, *args)
+      _component_bind_append('axis', tag, context, *args)
+    end
+    def axis_bind_remove(tag, context)
+      _component_bind_remove('axis', tag, context)
+    end
+    def axis_bindinfo(tag, context=nil)
+      _component_bindinfo('axis', tag, context)
+    end
+
+    def element_bind(tag, context, *args)
+      _component_bind('element', tag, context, *args)
+    end
+    def element_bind_append(tag, context, *args)
+      _component_bind_append('element', tag, context, *args)
+    end
+    def element_bind_remove(tag, context)
+      _component_bind_remove('element', tag, context)
+    end
+    def element_bindinfo(tag, context=nil)
+      _component_bindinfo('element', tag, context)
+    end
+
+    def bar_bind(tag, context, *args)
+      _component_bind('bar', tag, context, *args)
+    end
+    def bar_bind_append(tag, context, *args)
+      _component_bind_append('bar', tag, context, *args)
+    end
+    def bar_bind_remove(tag, context)
+      _component_bind_remove('bar', tag, context)
+    end
+    def bar_bindinfo(tag, context=nil)
+      _component_bindinfo('bar', tag, context)
+    end
+
+    def line_bind(tag, context, *args)
+      _component_bind('line', tag, context, *args)
+    end
+    def line_bind_append(tag, context, *args)
+      _component_bind_append('line', tag, context, *args)
+    end
+    def line_bind_remove(tag, context)
+      _component_bind_remove('line', tag, context)
+    end
+    def line_bindinfo(tag, context=nil)
+      _component_bindinfo('line', tag, context)
+    end
+
+    def legend_bind(tag, context, *args)
+      _component_bind('legend', tag, context, *args)
+    end
+    def legend_bind_append(tag, context, *args)
+      _component_bind_append('legend', tag, context, *args)
+    end
+    def legend_bind_remove(tag, context)
+      _component_bind_remove('legend', tag, context)
+    end
+    def legend_bindinfo(tag, context=nil)
+      _component_bindinfo('legend', tag, context)
+    end
+
+    def marker_bind(tag, context, *args)
+      _component_bind('marker', tag, context, *args)
+    end
+    def marker_bind_append(tag, context, *args)
+      _component_bind_append('marker', tag, context, *args)
+    end
+    def marker_bind_remove(tag, context)
+      _component_bind_remove('marker', tag, context)
+    end
+    def marker_bindinfo(tag, context=nil)
+      _component_bindinfo('marker', tag, context)
+    end
+
+    ###################
+
+    def axis_create(id=nil, keys={})
+      # tk_send('axis', 'create', tagid(id), keys)
+      Tk::BLT::PlotComponent::Axis.new(self, tagid(id), keys)
+    end
+    def axis_delete(*ids)
+      tk_send('axis', 'delete', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def axis_invtransform(id, val)
+      list(tk_send('axis', 'invtransform', tagid(id), val))
+    end
+    def axis_limits(id)
+      list(tk_send('axis', 'limits', tagid(id)))
+    end
+    def axis_names(*pats)
+      simplelist(tk_send('axis', 'names', 
+                         *(pats.collect{|pat| tagid(pat)}))).collect{|axis|
+        Tk::BLT::PlotComponent::Axis.id2obj(self, axis)
+      }
+    end
+    def axis_transform(id, val)
+      list(tk_send('axis', 'transform', tagid(id), val))
+    end
+    def axis_view(id)
+      tk_send('axis', 'view', tagid(id))
+      self
+    end
+    def axis_use(id, target=nil)
+      if target
+        Tk::BLT::PlotComponent::Axis.id2obj(self, 
+                                            tk_send('axis', 'use', 
+                                                    tagid(id), tagid(target)))
+      else
+        Tk::BLT::PlotComponent::Axis.id2obj(self, 
+                                            tk_send('axis', 'use', tagid(id)))
+      end
+    end
+
+    ###################
+
+    def crosshairs_off
+      tk_send_without_enc('crosshairs', 'off')
+      self
+    end
+    def crosshairs_on
+      tk_send_without_enc('crosshairs', 'on')
+      self
+    end
+    def crosshairs_toggle
+      tk_send_without_enc('crosshairs', 'toggle')
+      self
+    end
+
+    ###################
+
+    def element_create(id=nil, keys={})
+      # tk_send('element', 'create', tagid(id), keys)
+      Tk::BLT::PlotComponent::Element.new(self, tagid(id), keys)
+    end
+    def element_activate(*args)
+      if args.empty?
+        list(tk_send('element', 'activate')).collect{|elem|
+          Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+        }
+      else
+        # id, *indices
+        id = args.shift
+        tk_send('element', 'activate', tagid(id), *args)
+      end
+    end
+    def element_closest(x, y, var, *args)
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        bool(tk_send('element', 'closest', x, y, var, 
+                     *(hash_kv(keys).concat(args.collect{|id| tagid(id)}))))
+      else
+        bool(tk_send('element', 'closest', x, y, var, 
+                     *(args.collect{|id| tagid(id)})))
+      end
+    end
+    def element_deactivate(*ids)
+      tk_send('element', 'deactivate', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def element_delete(*ids)
+      tk_send('element', 'delete', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def element_exist?(id)
+      bool(tk_send('element', 'exists', tagid(id)))
+    end
+    def element_names(*pats)
+      simplelist(tk_send('element', 'names', 
+                         *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
+        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+      }
+    end
+    def element_show(*names)
+      if names.empty?
+        simplelist(tk_send('element', 'show'))
+      else
+        tk_send('element', 'show', *(names.collect{|n| tagid(n)}))
+        self
+      end
+    end
+    def element_type(id)
+      tk_send('element', 'type', tagid(id))
+    end
+
+    ###################
+
+    def bar_create(id=nil, keys={})
+      # tk_send('bar', 'create', tagid(id), keys)
+      Tk::BLT::PlotComponent::Bar.new(self, tagid(id), keys)
+    end
+    alias bar bar_create
+    def bar_activate(*args)
+      if args.empty?
+        list(tk_send('bar', 'activate')).collect{|elem|
+          Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+        }
+      else
+        # id, *indices
+        id = args.shift
+        tk_send('bar', 'activate', tagid(id), *args)
+      end
+    end
+    def bar_closest(x, y, var, *args)
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        bool(tk_send('bar', 'closest', x, y, var, 
+                     *(hash_kv(keys).concat(args.collect{|id| tagid(id)}))))
+      else
+        bool(tk_send('bar', 'closest', x, y, var, 
+                     *(args.collect{|id| tagid(id)})))
+      end
+    end
+    def bar_deactivate(*ids)
+      tk_send('bar', 'deactivate', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def bar_delete(*ids)
+      tk_send('bar', 'delete', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def bar_exist?(id)
+      bool(tk_send('bar', 'exists', tagid(id)))
+    end
+    def bar_names(*pats)
+      simplelist(tk_send('bar', 'names', 
+                         *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
+        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+      }
+    end
+    def bar_show(*names)
+      if names.empty?
+        simplelist(tk_send('bar', 'show'))
+      else
+        tk_send('bar', 'show', *(names.collect{|n| tagid(n)}))
+        self
+      end
+    end
+    def bar_type(id)
+      tk_send('bar', 'type', tagid(id))
+    end
+
+    ###################
+
+    def line_create(id=nil, keys={})
+      # tk_send('line', 'create', tagid(id), keys)
+      Tk::BLT::PlotComponent::Line.new(self, tagid(id), keys)
+    end
+    alias bar line_create
+    def line_activate(*args)
+      if args.empty?
+        list(tk_send('line', 'activate')).collect{|elem|
+          Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+        }
+      else
+        # id, *indices
+        id = args.shift
+        tk_send('line', 'activate', tagid(id), *args)
+      end
+    end
+    def line_closest(x, y, var, *args)
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        bool(tk_send('line', 'closest', x, y, var, 
+                     *(hash_kv(keys).concat(args.collect{|id| tagid(id)}))))
+      else
+        bool(tk_send('line', 'closest', x, y, var, 
+                     *(args.collect{|id| tagid(id)})))
+      end
+    end
+    def line_deactivate(*ids)
+      tk_send('line', 'deactivate', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def line_delete(*ids)
+      tk_send('line', 'delete', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def line_exist?(id)
+      bool(tk_send('line', 'exists', tagid(id)))
+    end
+    def line_names(*pats)
+      simplelist(tk_send('line', 'names', 
+                         *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
+        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+      }
+    end
+    def line_show(*names)
+      if names.empty?
+        simplelist(tk_send('line', 'show'))
+      else
+        tk_send('line', 'show', *(names.collect{|n| tagid(n)}))
+        self
+      end
+    end
+    def line_type(id)
+      tk_send('line', 'type', tagid(id))
+    end
+
+    ###################
+
+    def gridline_off
+      tk_send_without_enc('grid', 'off')
+      self
+    end
+    def gridline_on
+      tk_send_without_enc('grid', 'on')
+      self
+    end
+    def gridline_toggle
+      tk_send_without_enc('grid', 'toggle')
+      self
+    end
+
+    ###################
+
+    def legend_window_create(parent=nil, keys=nil)
+      if parent.kind_of?(Hash)
+        keys = _symbolkey2str(parent)
+        parent = keys.delete('parent')
+        widgetname = keys.delete('widgetname')
+        keys.delete('without_creating')
+      elsif keys
+        keys = _symbolkey2str(keys)
+        widgetname = keys.delete('widgetname')
+        keys.delete('without_creating')
+      end
+
+      legend = self.class.new(parent, :without_creating=>true, 
+                              :widgetname=>widgetname)
+      class << legend
+        def __destroy_hook__
+          TkCore::INTERP.tk_windows.delete(@path)
+        end
+      end
+
+      if keys
+        self.legend_configure(keys.update('position'=>legend))
+      else
+        self.legend_configure('position'=>legend)
+      end
+      legend
+    end
+
+    def legend_activate(*pats)
+      list(tk_send('legend', 'activate', 
+                   *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
+        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+      }
+    end
+    def legend_deactivate(*pats)
+      list(tk_send('legend', 'deactivate', 
+                   *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
+        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+      }
+    end
+    def legend_get(pos, y=nil)
+      if y
+        Tk::BLT::PlotComponent::Element.id2obj(self, 
+                                               tk_send('legend', 'get', 
+                                                       _at(pos, y)))
+      else
+        Tk::BLT::PlotComponent::Element.id2obj(self, 
+                                               tk_send('legend', 'get', pos))
+      end
+    end
+
+    ###################
+
+    def pen_create(id=nil, keys={})
+      # tk_send('pen', 'create', tagid(id), keys)
+      Tk::BLT::PlotComponent::Pen.new(self, tagid(id), keys)
+    end
+    def pen_delete(*ids)
+      tk_send('pen', 'delete', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def pen_names(*pats)
+      simplelist(tk_send('pen', 'names', 
+                         *(pats.collect{|pat| tagid(pat)}))).collect{|pen|
+        Tk::BLT::PlotComponent::Pen.id2obj(self, pen)
+      }
+    end
+
+    ###################
+
+    def postscript_output(file=nil, keys={})
+      if file.kind_of?(Hash)
+        keys = file
+        file = nil
+      end
+
+      if file
+        tk_send('postscript', 'output', file, keys)
+        self
+      else
+        tk_send('postscript', 'output', keys)
+      end
+    end
+
+    ###################
+
+    def marker_create(type, keys={})
+      case type
+      when :text, 'text'
+        Tk::BLT::PlotComponent::TextMarker.new(self, keys)
+      when :line, 'line'
+        Tk::BLT::PlotComponent::LineMarker.new(self, keys)
+      when :bitmap, 'bitmap'
+        Tk::BLT::PlotComponent::BitmapMarker.new(self, keys)
+      when :image, 'image'
+        Tk::BLT::PlotComponent::ImageMarker.new(self, keys)
+      when :polygon, 'polygon'
+        Tk::BLT::PlotComponent::PolygonMarker.new(self, keys)
+      when :window, 'window'
+        Tk::BLT::PlotComponent::WindowMarker.new(self, keys)
+      else
+        if type.kind_of?(Tk::BLT::PlotComponent::Marker)
+          type.new(self, keys)
+        else
+          Tk::BLT::PlotComponent::Marker.create_type(self, type, keys)
+        end
+      end
+    end
+    def marker_after(id, target=nil)
+      if target
+        tk_send_without_enc('marker', 'after', tagid(id), tagid(target))
+      else
+        tk_send_without_enc('marker', 'after', tagid(id))
+      end
+      self
+    end
+    def marker_before(id, target=None)
+      if target
+        tk_send_without_enc('marker', 'before', tagid(id), tagid(target))
+      else
+        tk_send_without_enc('marker', 'before', tagid(id))
+      end
+      self
+    end
+    def marker_delete(*ids)
+      tk_send('marker', 'delete', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def marker_exist?(id)
+      bool(tk_send('marker', 'exists', tagid(id)))
+    end
+    def marker_names(*pats)
+      simplelist(tk_send('marker', 'names', 
+                         *(pats.collect{|pat| tagid(pat)}))).collect{|id|
+        Tk::BLT::PlotComponent::Marker.id2obj(self, id)
+      }
+    end
+    def marker_type(id)
+      tk_send('marker', 'type', tagid(id))
+    end
+
+    ###################
+
+    def xaxis_cget(option)
+      itemcget('xaxis', option)
+    end
+    def xaxis_configure(slot, value=None)
+      if slot.kind_of?(Hash)
+        slot = _symbolkey2str(slot)
+        if cmd = slot.delete('command')
+          slot['command'] = proc{|w, tick| 
+            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+          }
+        end
+      elsif slot == :command || slot == 'command'
+        cmd = value
+        value = proc{|w, tick| 
+          cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+        }
+      end
+      itemconfigure('xaxis', slot, value)
+    end
+    def xaxis_configinfo(slot=nil)
+      itemconfiginfo('xaxis', slot)
+    end
+    def current_xaxis_configinfo(slot=nil)
+      current_itemconfiginfo('xaxis', slot)
+    end
+    def xaxis_bind(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind([path, 'xaxis', 'bind'], context, cmd, *args)
+      self
+    end
+    def xaxis_bind_append(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind_append([path, 'xaxis', 'bind'], context, cmd, *args)
+      self
+    end
+    def xaxis_bind_remove(context)
+      _bind_remove([path, 'xaxis', 'bind'], context)
+      self
+    end
+    def xaxis_bindinfo(context=nil)
+      _bindinfo([path, 'xaxis', 'bind'], context)
+    end
+    def xaxis_invtransform(val)
+      list(tk_send('xaxis', 'invtransform', val))
+    end
+    def xaxis_limits
+      list(tk_send('xaxis', 'limits'))
+    end
+    def xaxis_transform(val)
+      list(tk_send('xaxis', 'transform', val))
+    end
+    def xaxis_use(target=nil)
+      if target
+        Tk::BLT::PlotComponent::Axis.id2obj(self, 
+                                            tk_send('xaxis', 'use', 
+                                                    tagid(target)))
+      else
+        Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('xaxis', 'use'))
+      end
+    end
+
+    def x2axis_cget(option)
+      itemcget('x2axis', option)
+    end
+    def x2axis_configure(slot, value=None)
+      if slot.kind_of?(Hash)
+        slot = _symbolkey2str(slot)
+        if cmd = slot.delete('command')
+          slot['command'] = proc{|w, tick| 
+            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+          }
+        end
+      elsif slot == :command || slot == 'command'
+        cmd = value
+        value = proc{|w, tick| 
+          cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+        }
+      end
+      itemconfigure('x2axis', slot, value)
+    end
+    def x2axis_configinfo(slot=nil)
+      itemconfiginfo('x2axis', slot)
+    end
+    def current_x2axis_configinfo(slot=nil)
+      current_itemconfiginfo('x2axis', slot)
+    end
+    def x2axis_bind(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind([path, 'x2axis', 'bind'], context, cmd, *args)
+      self
+    end
+    def x2axis_bind_append(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind_append([path, 'x2axis', 'bind'], context, cmd, *args)
+      self
+    end
+    def x2axis_bind_remove(context)
+      _bind_remove([path, 'x2axis', 'bind'], context)
+      self
+    end
+    def x2axis_bindinfo(context=nil)
+      _bindinfo([path, 'x2axis', 'bind'], context)
+    end
+    def x2axis_invtransform(val)
+      list(tk_send('x2axis', 'invtransform', val))
+    end
+    def x2axis_limits
+      list(tk_send('x2axis', 'limits'))
+    end
+    def x2axis_transform(val)
+      list(tk_send('x2axis', 'transform', val))
+    end
+    def x2axis_use(target=nil)
+      if target
+        Tk::BLT::PlotComponent::Axis.id2obj(self, 
+                                            tk_send('x2axis', 'use', 
+                                                    tagid(target)))
+      else
+        Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('x2axis', 'use'))
+      end
+    end
+
+    def yaxis_cget(option)
+      itemcget('yaxis', option)
+    end
+    def yaxis_configure(slot, value=None)
+      if slot.kind_of?(Hash)
+        slot = _symbolkey2str(slot)
+        if cmd = slot.delete('command')
+          slot['command'] = proc{|w, tick| 
+            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+          }
+        end
+      elsif slot == :command || slot == 'command'
+        cmd = value
+        value = proc{|w, tick| 
+          cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+        }
+      end
+      itemconfigure('yaxis', slot, value)
+    end
+    def yaxis_configinfo(slot=nil)
+      itemconfiginfo('yaxis', slot)
+    end
+    def current_yaxis_configinfo(slot=nil)
+      current_itemconfiginfo('yaxis', slot)
+    end
+    def yaxis_bind(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind([path, 'yaxis', 'bind'], context, cmd, *args)
+      self
+    end
+    def yaxis_bind_append(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind_append([path, 'yaxis', 'bind'], context, cmd, *args)
+      self
+    end
+    def yaxis_bind_remove(context)
+      _bind_remove([path, 'yaxis', 'bind'], context)
+      self
+    end
+    def yaxis_bindinfo(context=nil)
+      _bindinfo([path, 'yaxis', 'bind'], context)
+    end
+    def yaxis_invtransform(val)
+      list(tk_send('yaxis', 'invtransform', val))
+    end
+    def yaxis_limits
+      list(tk_send('yaxis', 'limits'))
+    end
+    def yaxis_transform(val)
+      list(tk_send('yaxis', 'transform', val))
+    end
+    def yaxis_use(target=nil)
+      if target
+        Tk::BLT::PlotComponent::Axis.id2obj(self, 
+                                            tk_send('yaxis', 'use', 
+                                                    tagid(target)))
+      else
+        Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('yaxis', 'use'))
+      end
+    end
+
+    def y2axis_cget(option)
+      itemcget('y2axis', option)
+    end
+    def y2axis_configure(slot, value=None)
+      if slot.kind_of?(Hash)
+        slot = _symbolkey2str(slot)
+        if cmd = slot.delete('command')
+          slot['command'] = proc{|w, tick| 
+            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+          }
+        end
+      elsif slot == :command || slot == 'command'
+        cmd = value
+        value = proc{|w, tick| 
+          cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+        }
+      end
+      itemconfigure('y2axis', slot, value)
+    end
+    def y2axis_configinfo(slot=nil)
+      axis_configinfo('y2axis', slot)
+    end
+    def current_y2axis_configinfo(slot=nil)
+      current_itemconfiginfo('y2axis', slot)
+    end
+    def y2axis_bind(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind([path, 'y2axis', 'bind'], context, cmd, *args)
+      self
+    end
+    def y2axis_bind_append(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind_append([path, 'y2axis', 'bind'], context, cmd, *args)
+      self
+    end
+    def y2axis_bind_remove(context)
+      _bind_remove([path, 'y2axis', 'bind'], context)
+      self
+    end
+    def y2axis_bindinfo(context=nil)
+      _bindinfo([path, 'y2axis', 'bind'], context)
+    end
+    def y2axis_invtransform(val)
+      list(tk_send('y2axis', 'invtransform', val))
+    end
+    def y2axis_limits
+      list(tk_send('y2axis', 'limits'))
+    end
+    def y2axis_transform(val)
+      list(tk_send('y2axis', 'transform', val))
+    end
+    def y2axis_use(target=nil)
+      if target
+        Tk::BLT::PlotComponent::Axis.id2obj(self, 
+                                            tk_send('y2axis', 'use', 
+                                                    tagid(target)))
+      else
+        Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('y2axis', 'use'))
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/container.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/container.rb
new file mode 100644
index 0000000000..cdbec21f25
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/container.rb
@@ -0,0 +1,28 @@
+#
+#  tkextlib/blt/container.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Container < TkWindow
+    TkCommandNames = ['::blt::container'.freeze].freeze
+    WidgetClassName = 'Container'.freeze
+    WidgetClassNames[WidgetClassName] = self
+
+    def __strval_optkeys
+      super() << 'name'
+    end
+    private :__strval_optkeys
+
+    def find_command(pat)
+      Hash[*simplelist(tk_send_without_enc('find', '-command', pat))]
+    end
+
+    def find_name(pat)
+      Hash[*simplelist(tk_send_without_enc('find', '-name', pat))]
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/cutbuffer.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/cutbuffer.rb
new file mode 100644
index 0000000000..1cc39dfb94
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/cutbuffer.rb
@@ -0,0 +1,23 @@
+#
+#  tkextlib/blt/cutbuffer.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module CutBuffer
+    TkCommandNames = ['::blt::cutbuffer'.freeze].freeze
+
+    def self.get(num = 0)
+      Tk.tk_call('::blt::cutbuffer', 'get', num)
+    end
+    def self.rotate(count = 1)
+      Tk.tk_call('::blt::cutbuffer', 'rotate', count)
+    end
+    def self.set(val, num = 0)
+      Tk.tk_call('::blt::cutbuffer', 'set', val, num)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/dragdrop.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/dragdrop.rb
new file mode 100644
index 0000000000..68fb9e591a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/dragdrop.rb
@@ -0,0 +1,214 @@
+#
+#  tkextlib/blt/dragdrop.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/itemconfig'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module DragDrop
+    extend TkCore
+
+    TkCommandNames = ['::blt::drag&drop'.freeze].freeze
+
+    class Token < TkWindow
+      WidgetClassName = 'DragDropToken'.freeze
+      WidgetClassNames[WidgetClassName] = self
+
+      def initialize(arg)
+        if arg.kind_of?(Hash) # arg is a hash includes the widgetpath of token
+          arg = _symbolkey2str(arg)
+          install_win(nil, arg['widgetname'])
+        else  # arg is a drag&drop source
+          tk_call('::blt::drag&drop', 'source', arg)
+          install_win(nil, tk_call('::blt::drag&drop', 'token', arg))
+        end
+      end
+    end
+
+    ###################################
+
+    extend TkItemConfigMethod
+    extend Tk::ValidateConfigure
+
+    class << self
+      def __item_config_cmd(id)  # id := ['source'|'target', win]
+        ['::blt::drag&drop', id[0], id[1]]
+      end
+      private :__item_config_cmd
+
+      def __item_boolval_optkeys(id)
+        super(id) << 'selftarget'
+      end
+      private :__item_boolval_optkeys
+
+      def __item_listval_optkeys(id)
+        super(id) << 'send'
+      end
+      private :__item_listval_optkeys
+
+      def __item_strval_optkeys(id)
+        super(id) << 'rejectbg' << 'rejectfg' << 'tokenbg'
+      end
+      private :__item_strval_optkeys
+
+      undef itemcget
+      private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+      def source_configure(win, slot, value=None)
+        itemconfigure(['source', win], slot, value)
+      end
+      def source_configinfo(win, slot=nil)
+        itemconfiginfo(['source', win], slot)
+      end
+      def current_source_configinfo(win, slot=nil)
+        current_itemconfiginfo(['source', win], slot)
+      end
+    end
+
+    class PackageCommand < TkValidateCommand
+      class ValidateArgs < TkUtil::CallbackSubst
+        KEY_TBL = [
+          [ ?t, ?w, :token ],
+          [ ?W, ?w, :widget ],
+          nil
+        ]
+
+        PROC_TBL = [
+          [ ?w, TkComm.method(:window) ], 
+          nil
+        ]
+
+        _setup_subst_table(KEY_TBL, PROC_TBL)
+
+        def self.ret_val(val)
+          val
+        end
+      end
+
+      def self._config_keys
+        ['packagecmd']
+      end
+    end
+
+    class SiteCommand < TkValidateCommand
+      class ValidateArgs < TkUtil::CallbackSubst
+        KEY_TBL = [
+          [ ?s, ?b, :compatible ],
+          [ ?t, ?w, :token ],
+          nil
+        ]
+
+        PROC_TBL = [
+          [ ?b, TkComm.method(:bool) ], 
+          [ ?w, TkComm.method(:window) ], 
+          nil
+        ]
+
+        _setup_subst_table(KEY_TBL, PROC_TBL)
+
+        def self.ret_val(val)
+          val
+        end
+      end
+
+      def self._config_keys
+        ['sitecmd']
+      end
+    end
+
+    def self.__validation_class_list
+      super() << PackageCommand << SiteCommand
+    end
+
+    class << self
+      Tk::ValidateConfigure.__def_validcmd(binding, PackageCommand)
+      Tk::ValidateConfigure.__def_validcmd(binding, SiteCommand)
+    end
+
+    ###################################
+
+    class DnD_Handle < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?i, ?s, :ip_name ],
+        [ ?v, ?v, :value ],
+        [ ?W, ?w, :widget ],
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?i, TkComm.method(:string) ], 
+        [ ?v, TkComm.method(:tk_tcl2ruby) ], 
+        [ ?w, TkComm.method(:window) ], 
+        nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL)
+    end
+
+    def self.source_handler(win, datatype, cmd=Proc.new, *args)
+      _bind_for_event_class(DnD_Handle, 
+                            ['::blt::drag&drop', 'source', win, 'handler'], 
+                            cmd, *args)
+    end
+
+    def self.target_handler(win, datatype, cmd=Proc.new, *args)
+      _bind_for_event_class(DnD_Handle, 
+                            ['::blt::drag&drop', 'target', win, 'handler'], 
+                            cmd, *args)
+    end
+
+    ###################################
+
+    def self.init_source(win)
+      tk_call('::blt::drag&drop', 'source', win)
+    end
+
+    def self.source()
+      list(tk_call('::blt::drag&drop', 'source'))
+    end
+
+    def self.source_handler_list(win)
+      simplelist(tk_call('::blt::drag&drop', 'source', win, 'handler'))
+    end
+    def self.source_handler_info(win, type)
+      tk_tcl2ruby(tk_call('::blt::drag&drop', 'source', win, 'handler', type))
+    end
+
+    def self.target
+      list(tk_call('::blt::drag&drop', 'target'))
+    end
+    def self.target_handler_list(win)
+      simplelist(tk_call('::blt::drag&drop', 'target', win, 'handler'))
+    end
+
+    def self.handle_target(win, type, val=None)
+      tk_call('::blt::drag&drop', 'target', win, 'handle', type, val)
+    end
+
+    def self.token(win)
+      window(tk_call('::blt::drag&drop', 'token', win))
+    end
+
+    def self.drag(win, x, y)
+      tk_call('::blt::drag&drop', 'drag', win, x, y)
+    end
+    def self.drop(win, x, y)
+      tk_call('::blt::drag&drop', 'drop', win, x, y)
+    end
+
+    def self.errors(cmd=Proc.new)
+      tk_call('::blt::drag&drop', 'errors', cmd)
+    end
+
+    def self.active
+      bool(tk_call('::blt::drag&drop', 'active'))
+    end
+
+    def self.location(x=None, y=None)
+      list(tk_call('::blt::drag&drop', 'location', x, y))
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/eps.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/eps.rb
new file mode 100644
index 0000000000..586a42470c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/eps.rb
@@ -0,0 +1,32 @@
+#
+#  tkextlib/blt/eps.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/canvas'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class EPS < TkcItem
+    CItemTypeName = 'eps'.freeze
+    CItemTypeToClass[CItemTypeName] = self
+  end
+end
+
+class TkCanvas
+  alias __BLT_EPS_item_strval_optkeys __item_strval_optkeys
+  def __item_strval_optkeys(id)
+    __BLT_EPS_item_strval_optkeys(id) + [
+      'shadowcolor', 'title', 'titlecolor'
+    ]
+  end
+  private :__item_strval_optkeys
+
+  alias __BLT_EPS_item_boolval_optkeys __item_boolval_optkeys
+  def __item_boolval_optkeys(id)
+    __BLT_EPS_item_boolval_optkeys(id) + ['showimage']
+  end
+  private :__item_boolval_optkeys
+end
+
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/graph.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/graph.rb
new file mode 100644
index 0000000000..9ae99bff5c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/graph.rb
@@ -0,0 +1,67 @@
+#
+#  tkextlib/blt/graph.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+require 'tkextlib/blt/component.rb'
+
+module Tk::BLT
+  class Graph < TkWindow
+    TkCommandNames = ['::blt::graph'.freeze].freeze
+    WidgetClassName = 'Graph'.freeze
+    WidgetClassNames[WidgetClassName] = self
+
+    include PlotComponent
+    include GraphCommand
+
+    def __boolval_optkeys
+      ['bufferelements', 'invertxy']
+    end
+    private :__boolval_optkeys
+
+    def __strval_optkeys
+      ['text', 'label', 'title', 'file', 'plotbackground']
+    end
+    private :__strval_optkeys
+
+=begin
+    BarElement_ID = ['blt_graph_bar'.freeze, '00000'.taint].freeze
+
+    def bar(elem=nil, keys={})
+      if elem.kind_of?(Hash)
+        keys = elem
+        elem = nil
+      end
+      unless elem
+        elem = BarElement_ID.join(TkCore::INTERP._ip_id_).freeze
+        BarElement_ID[1].succ!
+      end
+      tk_send('bar', elem, keys)
+      Element.new(self, elem, :without_creating=>true)
+    end
+=end
+
+    def extents(item)
+      num_or_str(tk_send_without_enc('extents', item))
+    end
+
+    def invtransform(x, y)
+      list(tk_send_without_enc('invtransform', x, y))
+    end
+
+    def inside(x, y)
+      bool(tk_send_without_enc('inside', x, y))
+    end
+
+    def snap(output, keys={})
+      tk_send_without_enc('snap', *(hash_kv(keys, false) + output))
+      self
+    end
+
+    def transform(x, y)
+      list(tk_send_without_enc('transform', x, y))
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/htext.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/htext.rb
new file mode 100644
index 0000000000..a0cf3dc036
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/htext.rb
@@ -0,0 +1,110 @@
+#
+#  tkextlib/blt/htext.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/itemconfig.rb'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Htext<TkWindow
+    Htext_Var = TkVarAccess.new_hash('htext')
+    Htext_Widget = TkVarAccess.new('htext(widget)', :window)
+    Htext_File = TkVarAccess.new('htext(file)')
+    Htext_Line = TkVarAccess.new('htext(line)')
+
+    include TkItemConfigMethod
+    include Scrollable
+
+    TkCommandNames = ['::blt::htext'.freeze].freeze
+    WidgetClassName = 'Htext'.freeze
+    WidgetClassNames[WidgetClassName] = self
+
+    alias window_cget itemcget
+    alias window_configure itemconfigure
+    alias window_configuinfo itemconfiginfo
+    alias current_window_configuinfo current_itemconfiginfo
+
+    def __strval_optkeys
+      super() << 'filename'
+    end
+  private :__strval_optkeys
+
+    def append(win, keys={})
+      tk_send('append', _epath(win), keys)
+      self
+    end
+
+    def goto_line(idx)
+      tk_send_without_enc('gotoline', idx)
+      self
+    end
+    def current_line
+      number(tk_send_without_enc('gotoline'))
+    end
+
+    def index(str)
+      number(tk_send('index', str))
+    end
+
+    def line_pos(str)
+      tk_send('linepos', str)
+    end
+
+    def range(from=None, to=None)
+      tk_send_without_enc('range', from, to)
+    end
+
+    def scan_mark(pos)
+      tk_send_without_enc('scan', 'mark', pos)
+      self
+    end
+
+    def scan_dragto(pos)
+      tk_send_without_enc('scan', 'dragto', pos)
+      self
+    end
+
+    def search(pat, from=None, to=None)
+      num = number(tk_send('search', pat, from, to))
+      (num < 0)? nil: num
+    end
+
+    def selection_adjust(index)
+      tk_send_without_enc('selection', 'adjust', index)
+      self
+    end
+    def selection_clear()
+      tk_send_without_enc('selection', 'clear')
+      self
+    end
+    def selection_from(index)
+      tk_send_without_enc('selection', 'from', index)
+      self
+    end
+    def selection_line(index)
+      tk_send_without_enc('selection', 'line', index)
+      self
+    end
+    def selection_present()
+      bool(tk_send_without_enc('selection', 'present'))
+    end
+    def selection_range(first, last)
+      tk_send_without_enc('selection', 'range', first, last)
+      self
+    end
+    def selection_to(index)
+      tk_send_without_enc('selection', 'to', index)
+      self
+    end
+    def selection_word(index)
+      tk_send_without_enc('selection', 'word', index)
+      self
+    end
+
+    def windows(pat=None)
+      list(tk_send('windows', pat))
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/spline.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/spline.rb
new file mode 100644
index 0000000000..9f75a0b217
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/spline.rb
@@ -0,0 +1,23 @@
+#
+#  tkextlib/blt/spline.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module Spline
+    extend TkCore
+
+    TkCommandNames = ['::blt::spline'.freeze].freeze
+
+    def self.natural(x, y, sx, sy)
+      tk_call('::blt::spline', 'natural', x, y, sx, sy)
+    end
+
+    def self.quadratic(x, y, sx, sy)
+      tk_call('::blt::spline', 'quadratic', x, y, sx, sy)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/stripchart.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/stripchart.rb
new file mode 100644
index 0000000000..fe5afbb095
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/stripchart.rb
@@ -0,0 +1,74 @@
+#
+#  tkextlib/blt/stripchart.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+require 'tkextlib/blt/component.rb'
+
+module Tk::BLT
+  class Stripchart < TkWindow
+    TkCommandNames = ['::blt::stripchart'.freeze].freeze
+    WidgetClassName = 'Stripchart'.freeze
+    WidgetClassNames[WidgetClassName] = self
+
+    include PlotComponent
+    include GraphCommand
+
+    def __boolval_optkeys
+      ['bufferelements', 'buffergraph', 'invertxy']
+    end
+    private :__boolval_optkeys
+
+    def __strval_optkeys
+      ['text', 'label', 'title', 'file', 
+        'background', 'plotbackground']
+    end
+    private :__strval_optkeys
+
+=begin
+    BarElement_ID = ['blt_stripchart_bar'.freeze, '00000'.taint].freeze
+
+    def bar(elem=nil, keys={})
+      if elem.kind_of?(Hash)
+        keys = elem
+        elem = nil
+      end
+      unless elem
+        elem = BarElement_ID.join(TkCore::INTERP._ip_id_).freeze
+        BarElement_ID[1].succ!
+      end
+      tk_send('bar', elem, keys)
+      Element.new(self, elem, :without_creating=>true)
+    end
+=end
+
+    def extents(item)
+      num_or_str(tk_send_without_enc('extents', item))
+    end
+
+    def invtransform(x, y)
+      list(tk_send_without_enc('invtransform', x, y))
+    end
+
+    def inside(x, y)
+      bool(tk_send_without_enc('inside', x, y))
+    end
+
+    def metafile(file=None)
+      # Windows only
+      tk_send('metafile', file)
+      self
+    end
+
+    def snap(output, keys={})
+      tk_send_without_enc('snap', *(hash_kv(keys, false) + output))
+      self
+    end
+
+    def transform(x, y)
+      list(tk_send_without_enc('transform', x, y))
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/table.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/table.rb
new file mode 100644
index 0000000000..0be9d8d42a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/table.rb
@@ -0,0 +1,386 @@
+#
+#  tkextlib/blt/table.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/itemconfig.rb'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module Table
+    include Tk
+    extend Tk
+    extend TkItemConfigMethod
+
+    TkCommandNames = ['::blt::table'.freeze].freeze
+
+    module TableContainer
+      def blt_table_add(*args)
+        Tk::BLT::Table.add(self, *args)
+        self
+      end
+
+      def blt_table_arrange()
+        Tk::BLT::Table.arrange(self)
+        self
+      end
+
+      def blt_table_cget(*args)
+        Tk::BLT::Table.cget(self, *args)
+      end
+
+      def blt_table_configure(*args)
+        Tk::BLT::Table.configure(self, *args)
+        self
+      end
+
+      def blt_table_configinfo(*args)
+        Tk::BLT::Table.configinfo(self, *args)
+      end
+
+      def blt_table_current_configinfo(*args)
+        Tk::BLT::Table.current_configinfo(self, *args)
+      end
+
+      def blt_table_locate(x, y)
+        Tk::BLT::Table.locate(self, x, y)
+      end
+
+      def blt_table_delete(*args)
+        Tk::BLT::Table.delete(self, *args)
+        self
+      end
+
+      def blt_table_extents(item)
+        Tk::BLT::Table.extents(self, item)
+      end
+
+      def blt_table_insert(*args)
+        Tk::BLT::Table.insert(self, *args)
+        self
+      end
+
+      def blt_table_insert_before(*args)
+        Tk::BLT::Table.insert_before(self, *args)
+        self
+      end
+
+      def blt_table_insert_after(*args)
+        Tk::BLT::Table.insert_after(self, *args)
+        self
+      end
+
+      def blt_table_join(first, last)
+        Tk::BLT::Table.join(self, first, last)
+        self
+      end
+
+      def blt_table_save()
+        Tk::BLT::Table.save(self)
+      end
+
+      def blt_table_search(*args)
+        Tk::BLT::Table.search(self, *args)
+      end
+
+      def blt_table_split(*args)
+        Tk::BLT::Table.split(self, *args)
+        self
+      end
+
+      def blt_table_itemcget(*args)
+        Tk::BLT::Table.itemcget(self, *args)
+      end
+
+      def blt_table_itemconfigure(*args)
+        Tk::BLT::Table.itemconfigure(self, *args)
+        self
+      end
+
+      def blt_table_itemconfiginfo(*args)
+        Tk::BLT::Table.itemconfiginfo(self, *args)
+      end
+
+      def blt_table_current_itemconfiginfo(*args)
+        Tk::BLT::Table.current_itemconfiginfo(self, *args)
+      end
+
+      def blt_table_iteminfo(item)
+        Tk::BLT::Table.iteminfo(self, item)
+      end
+    end
+  end
+end
+
+
+############################################
+class << Tk::BLT::Table
+  def __item_cget_cmd(id) # id := [ container, item ]
+    win = (id[0].kind_of?(TkWindow))? id[0].path: id[0].to_s
+    ['::blt::table', 'cget', win, id[1]]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id) # id := [ container, item, ... ]
+    container, *items = id
+    win = (container.kind_of?(TkWindow))? container.path: container.to_s
+    ['::blt::table', 'configure', win, *items]
+  end
+  private :__item_config_cmd
+
+  def __item_pathname(id)
+    win = (id[0].kind_of?(TkWindow))? id[0].path: id[0].to_s
+    win + ';'
+  end
+  private :__item_pathname
+
+  alias __itemcget itemcget
+  alias __itemconfigure itemconfigure
+  alias __itemconfiginfo itemconfiginfo
+  alias __current_itemconfiginfo current_itemconfiginfo
+
+  private :__itemcget, :__itemconfigure
+  private :__itemconfiginfo, :__current_itemconfiginfo
+
+  def __boolval_optkeys
+    super() << 'propagate'
+  end
+  private :__boolval_optkeys
+
+  def tagid(tag)
+    if tag.kind_of?(Array)
+      case tag[0]
+      when Integer
+        # [row, col]
+        tag.join(',')
+      when :c, :C, 'c', 'C', :r, :R, 'r', 'R'
+        # c0 or r1 or C*, and so on
+        tag.collect{|elem| elem.to_s}.join('')
+      else
+        tag
+      end
+    elsif tag.kind_of?(TkWindow)
+      _epath(tag)
+    else
+      tag
+    end
+  end
+
+  def tagid2obj(tagid)
+    tagid
+  end
+
+  ############################################
+
+  def cget(container, option)
+    __itemcget([container], option)
+  end
+
+  def configure(container, *args)
+    __itemconfigure([container], *args)
+  end
+
+  def configinfo(container, *args)
+    __itemconfiginfo([container], *args)
+  end
+
+  def current_configinfo(container, *args)
+    __current_itemconfiginfo([container], *args)
+  end
+
+  def itemcget(container, item, option)
+    __itemcget([container, tagid(item)], option)
+  end
+
+  def itemconfigure(container, *args)
+    if args[-1].kind_of?(Hash)
+      # container, item, item, ... , hash_optkeys
+      keys = args.pop
+      fail ArgumentError, 'no item is given' if args.empty?
+      id = [container]
+      args.each{|item| id << tagid(item)}
+      __itemconfigure(id, keys)
+    else
+      # container, item, item, ... , option, value
+      val = args.pop
+      opt = args.pop
+      fail ArgumentError, 'no item is given' if args.empty?
+      id = [container]
+      args.each{|item| id << tagid(item)}
+      __itemconfigure(id, opt, val)
+    end
+    container
+  end
+
+  def itemconfiginfo(container, *args)
+    slot = args[-1]
+    if slot.kind_of?(String) || slot.kind_of?(Symbol)
+      slot = slot.to_s
+      if slot[0] == ?. || slot =~ /^\d+,\d+$/ || slot =~ /^(c|C|r|R)(\*|\d+)/
+        #   widget     ||    row,col          ||    Ci or Ri
+        slot = nil
+      else
+        # option
+        slot = args.pop
+      end
+    else
+      slot = nil
+    end
+
+    fail ArgumentError, 'no item is given' if args.empty?
+
+    id = [container]
+    args.each{|item| id << tagid(item)}
+    __itemconfiginfo(id, slot)
+  end
+
+  def current_itemconfiginfo(container, *args)
+    slot = args[-1]
+    if slot.kind_of?(String) || slot.kind_of?(Symbol)
+      slot = slot.to_s
+      if slot[0] == ?. || slot =~ /^\d+,\d+$/ || slot =~ /^(c|C|r|R)(\*|\d+)/
+        #   widget     ||    row,col          ||    Ci or Ri
+        slot = nil
+      else
+        # option
+        slot = args.pop
+      end
+    else
+      slot = nil
+    end
+
+    fail ArgumentError, 'no item is given' if args.empty?
+
+    id = [container]
+    args.each{|item| id << tagid(item)}
+    __current_itemconfiginfo(id, slot)
+  end
+
+  def info(container)
+    ret = {}
+    inf = list(tk_call('::blt::table', 'info', container))
+    until inf.empty?
+      opt = inf.slice!(0..1)
+      ret[opt[1..-1]] = opt[1]
+    end
+    ret
+  end
+
+  def iteminfo(container, item)
+    inf = list(tk_call('::blt::table', 'info', container, tagid(item)).chomp)
+
+    ret = []
+    until inf.empty? || (inf[0].kind_of?(String) && inf[0] =~ /^-/)
+      ret << inf.shift
+    end
+
+    if inf.length > 1
+      keys = {}
+      while inf.length > 1
+        opt = inf.slice!(0..1)
+        keys[opt[0][1..-1]] = opt[1]
+      end
+      ret << keys
+    end
+
+    ret
+  end
+
+  ############################################
+
+  def create_container(container)
+    tk_call('::blt::table', container)
+    begin
+      class << container
+        include Tk::BLT::Table::TableContainer
+      end
+    rescue
+      warn('fail to include TableContainer methods (frozen object?)')
+    end
+    container
+  end
+
+  def add(container, *args)
+    if args.empty?
+      tk_call('::blt::table', container)
+    else
+      args = args.collect{|arg|
+        if arg.kind_of?(TkWindow)
+          _epath(arg)
+        elsif arg.kind_of?(Array)  # index
+          arg.join(',')
+        else
+          arg
+        end
+      }
+      tk_call('::blt::table', container, *args)
+    end
+    container
+  end
+
+  def arrange(container)
+    tk_call('::blt::table', 'arrange', container)
+    container
+  end
+
+  def delete(container, *args)
+    tk_call('::blt::table', 'delete', container, *args)
+  end
+
+  def extents(container, item)
+    ret = []
+    inf = list(tk_call('::blt::table', 'extents', container, item))
+    ret << inf.slice!(0..4) until inf.empty?
+    ret
+  end
+
+  def forget(*wins)
+    wins = wins.collect{|win| _epath(win)}
+    tk_call('::blt::table', 'forget', *wins)
+  end
+
+  def insert(container, *args)
+    tk_call('::blt::table', 'insert', container, *args)
+  end
+
+  def insert_before(container, *args)
+    tk_call('::blt::table', 'insert', container, '-before', *args)
+  end
+
+  def insert_after(container, *args)
+    tk_call('::blt::table', 'insert', container, '-after', *args)
+  end
+
+  def join(container, first, last)
+    tk_call('::blt::table', 'join', container, first, last)
+  end
+
+  def locate(container, x, y)
+    tk_call('::blt::table', 'locate', container, x, y)
+  end
+
+  def containers(arg={})
+    list(tk_call('::blt::table', 'containers', *hash_kv(arg)))
+  end
+
+  def containers_pattern(pat)
+    list(tk_call('::blt::table', 'containers', '-pattern', pat))
+  end
+
+  def containers_slave(win)
+    list(tk_call('::blt::table', 'containers', '-slave', win))
+  end
+
+  def save(container)
+    tk_call('::blt::table', 'save', container)
+  end
+
+  def search(container, keys={})
+    list(tk_call('::blt::table', 'containers', *hash_kv(keys)))
+  end
+
+  def split(container, *args)
+    tk_call('::blt::table', 'split', container, *args)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tabnotebook.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tabnotebook.rb
new file mode 100644
index 0000000000..508fa2b82f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tabnotebook.rb
@@ -0,0 +1,21 @@
+#
+#  tkextlib/blt/tabnotebook.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+require 'tkextlib/blt/tabset.rb'
+
+module Tk::BLT
+  class Tabnotebook < Tabset
+    TkCommandNames = ['::blt::tabnotebook'.freeze].freeze
+    WidgetClassName = 'Tabnotebook'.freeze
+    WidgetClassNames[WidgetClassName] = self
+
+    def get_tab(index)
+      Tk::BLT::Tabset::Tab.id2obj(tk_send_without_enc('id', tagindex(index)))
+    end
+    alias get_id get_tab
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tabset.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tabset.rb
new file mode 100644
index 0000000000..c26b6ee001
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tabset.rb
@@ -0,0 +1,401 @@
+#
+#  tkextlib/blt/tabset.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Tabset < TkWindow
+    class Tab < TkObject
+      include TkTreatItemFont
+
+      TabID_TBL = TkCore::INTERP.create_table
+      TabsetTab_ID = ['blt_tabset_tab'.freeze, '00000'.taint].freeze
+
+      TkCore::INTERP.init_ip_env{ TabID_TBL.clear }
+
+      def self.id2obj(tabset, id)
+        tpath = tabset.path
+        return id unless TabID_TBL[tpath]
+        TabID_TBL[tpath][id]? TabID_TBL[tpath]: id
+      end
+
+      def self.new(parent, pos=nil, name=nil, keys={})
+        if pos.kind_of?(Hash)
+          keys = pos
+          name = nil
+          pos  = nil
+        end
+        if name.kind_of?(Hash)
+          keys = name
+          name = nil
+        end
+
+        if name && TabID_TBL[parent.path] && TabID_TBL[parent.path][name]
+          TabID_TBL[parent.path][name]
+        else
+          super(parent, pos, name, keys)
+        end
+      end
+
+      def initialize(parent, pos, name, keys)
+        @t = parent
+        @tpath = parent.path
+        if name
+          @path = @id = name
+          TabID_TBL[@tpath] = {} unless TabID_TBL[@tpath]
+          TabID_TBL[@tpath][@id] = self
+
+          unless (list(tk_call(@tpath, 'tab', 'names', @id)).empty?)
+            if pos
+              idx = tk_call(@tpath, 'index', '-name', @id)
+              if pos.to_s == 'end'
+                tk_call(@tpath, idx, 'moveto', 'after', 'end')
+              else
+                tk_call(@tpath, idx, 'moveto', 'before', pos)
+              end
+            end
+            tk_call(@tpath, 'tab', 'configure', @id, keys)
+            return
+          end
+
+        else
+          @path = @id = TabsetTab_ID.join(TkCore::INTERP._ip_id_)
+          TabID_TBL[@tpath] = {} unless TabID_TBL[@tpath]
+          TabID_TBL[@tpath][@id] = self
+          TabsetTab_ID[1].succ!
+        end
+
+        pos = 'end' unless pos
+        tk_call(@tpath, 'insert', pos, @id, keys)
+      end
+
+      #def bind(context, cmd=Proc.new, *args)
+      #  @t.tab_bind(@id, context, cmd, *args)
+      #  self
+      #end
+      def bind(context, *args)
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0]) || !block_given?
+          cmd = args.shift
+        else
+          cmd = Proc.new
+        end
+        @t.tab_bind(@id, context, cmd, *args)
+        self
+      end
+      #def bind_append(context, cmd=Proc.new, *args)
+      #  @t.tab_bind_append(@id, context, cmd, *args)
+      #  self
+      #end
+      def bind_append(context, *args)
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0]) || !block_given?
+          cmd = args.shift
+        else
+          cmd = Proc.new
+        end
+        @t.tab_bind_append(@id, context, cmd, *args)
+        self
+      end
+      def bind_remove(context)
+        @t.tab_bind_remove(@id, context)
+        self
+      end
+      def bindinfo(context=nil)
+        @t.tab_bindinfo(@id, context)
+      end
+
+      def cget(*args)
+        @t.tab_cget(@id, *args)
+      end
+      def configure(*args)
+        @t.tab_configure(@id, *args)
+      end
+      def configinfo(*args)
+        @t.tab_configinfo(@id, *args)
+      end
+      def current_configinfo(*args)
+        @t.current_tab_configinfo(@id, *args)
+      end
+
+      def delete()
+        @t.delete(@id)
+        TabID_TBL[@tpath].delete(@id)
+        self
+      end
+
+      def get_name()
+        @id.dup
+      end
+
+      def focus()
+        @t.focus(self.index)
+      end
+
+      def index()
+        @t.index_name(@id)
+      end
+
+      def invoke()
+        @t.invoke(self.index)
+      end
+
+      def move_before(idx)
+        @t.move_before(self.index, idx)
+      end
+      def move_after(idx)
+        @t.move_after(self.index, idx)
+      end
+
+      def perforation_highlight(mode)
+        @t.perforation.highlight(self.index, mode)
+      end
+      def perforation_invoke()
+        @t.perforation.invoke(self.index)
+      end
+
+      def see()
+        @t.see(self.index)
+      end
+
+      def tearoff(name=None)
+        @t.tab_tearoff(self.index, *args)
+      end
+    end
+
+    ########################################
+
+    class NamedTab < Tab
+      def self.new(parent, name)
+        super(parent, nil, name, {})
+      end
+    end
+
+    ########################################
+
+    include X_Scrollable
+    include TkItemConfigMethod
+
+    TkCommandNames = ['::blt::tabset'.freeze].freeze
+    WidgetClassName = 'Tabset'.freeze
+    WidgetClassNames[WidgetClassName] = self
+
+    def __destroy_hook__
+      Tk::BLT::Tabset::Tab::TabID_TBL.delete(@path)
+    end
+
+    ########################################
+
+    def __boolval_optkeys
+      super() << 'samewidth' << 'tearoff'
+    end
+    private :__strval_optkeys
+
+    def __strval_optkeys
+      super() << 'tabbackground' << 'tabforeground'
+    end
+    private :__strval_optkeys
+
+    def __item_cget_cmd(id)
+      [self.path, 'tab', 'cget', id]
+    end
+    private :__item_cget_cmd
+
+    def __item_config_cmd(id)
+      [self.path, 'tab', 'configure', id]
+    end
+    private :__item_config_cmd
+
+    def __item_pathname(tagOrId)
+      if tagOrId.kind_of?(Tk::BLT::Tabset::Tab)
+        self.path + ';' + tagOrId.id.to_s
+      else
+        self.path + ';' + tagOrId.to_s
+      end
+    end
+    private :__item_pathname
+
+    alias tab_cget itemcget
+    alias tab_configure itemconfigure
+    alias tab_configinfo itemconfiginfo
+    alias current_tab_configinfo current_itemconfiginfo
+
+    def __item_strval_optkeys(id)
+      super(id) << 'shadow'
+    end
+    private :__item_strval_optkeys
+
+    def tagid(tab)
+      if tab.kind_of?(Tk::BLT::Tabset::Tab)
+        tab.id
+      else
+        tab
+      end
+    end
+
+    def tagindex(tab)
+      if tab.kind_of?(Tk::BLT::Tabset::Tab)
+        tab.index
+      else
+        tab
+      end
+    end
+
+    ########################################
+
+    def activate(index)
+      tk_send('activate', tagindex(index))
+      self
+    end
+    alias highlight activate
+
+    #def tabbind(tag, context, cmd=Proc.new, *args)
+    #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
+    #  self
+    #end
+    def tabbind(tag, context, *args)
+      # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind([path, "bind", tagid(tag)], context, cmd, *args)
+      self
+    end
+    #def tabbind_append(tag, context, cmd=Proc.new, *args)
+    #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
+    #  self
+    #end
+    def tabbind_append(tag, context, *args)
+      # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
+      self
+    end
+    def tabbind_remove(tag, context)
+      _bind_remove([path, "bind", tagid(tag)], context)
+      self
+    end
+    def tabbindinfo(tag, context=nil)
+      _bindinfo([path, "bind", tagid(tag)], context)
+    end
+
+    def delete(first, last=None)
+      tk_send('delete', tagindex(first), tagindex(last))
+      if first.kind_of?(Tk::BLT::Tabset::Tab)
+        TabID_TBL[@path].delete(first.id)
+      end
+      # middle tabs of the range are unknown
+      if last.kind_of?(Tk::BLT::Tabset::Tab)
+        TabID_TBL[@path].delete(last.id)
+      end
+      self
+    end
+
+    def focus(index)
+      tk_send('focus', tagindex(index))
+      self
+    end
+
+    def get_tab(index)
+      Tk::BLT::Tabset::Tab.id2obj(tk_send_without_enc('get', tagindex(index)))
+    end
+
+    def index(str)
+      num_or_str(tk_send('index', str))
+    end
+    def index_name(tab)
+      num_or_str(tk_send('index', '-mame', tagid(tab)))
+    end
+
+    def insert(pos, tab, keys={})
+      Tk::BLT::Tabset::Tab.new(self, tagindex(pos), tagid(tab), keys)
+    end
+
+    def invoke(index)
+      tk_send('invoke', tagindex(index))
+    end
+
+    def move_before(index, base_idx)
+      tk_send('move', tagindex(index), 'before', tagindex(base_idx))
+      self
+    end
+    def move_after(index, base_idx)
+      tk_send('move', tagindex(index), 'after', tagindex(base_idx))
+      self
+    end
+
+    def nearest(x, y)
+      Tk::BLT::Tabset::Tab.id2obj(num_or_str(tk_send_without_enc('nearest', x, y)))
+    end
+
+    def perforation_highlight(index, mode)
+      tk_send('perforation', 'highlight', tagindex(index), mode)
+      self
+    end
+    def perforation_invoke(index)
+      tk_send('perforation', 'invoke', tagindex(index))
+    end
+
+    def scan_mark(x, y)
+      tk_send_without_enc('scan', 'mark', x, y)
+      self
+    end
+    def scan_dragto(x, y)
+      tk_send_without_enc('scan', 'dragto', x, y)
+      self
+    end
+
+    def see(index)
+      tk_send('see', tagindex(index))
+      self
+    end
+
+    def size()
+      number(tk_send_without_enc('size'))
+    end
+
+    def select(index)
+      tk_send('select', tagindex(index))
+      self
+    end
+
+    def tab_names(pat=None)
+      simplelist(tk_send('tab', 'names', pat)).collect{|name|
+        Tk::BLT::Tabset::Tab.id2obj(name)
+      }
+    end
+
+    def tab_tearoff(index, name=None)
+      window(tk_send('tab', 'tearoff', tagindex(index), name))
+    end
+
+    def xscrollcommand(cmd=Proc.new)
+      configure_cmd 'scrollcommand', cmd
+      self
+    end
+    alias scrollcommand xscrollcommand
+
+    def xview(*index)
+      if index.empty?
+        list(tk_send_without_enc('view'))
+      else
+        tk_send_without_enc('view', *index)
+        self
+      end
+    end
+    alias view xview
+    alias view_moveto xview_moveto
+    alias view_scroll xview_scroll
+
+    alias scrollbar xscrollbar
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/ted.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/ted.rb
new file mode 100644
index 0000000000..39495842b4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/ted.rb
@@ -0,0 +1,62 @@
+#
+#  tkextlib/blt/ted.rb
+#
+#    *** This is alpha version, because there is no document on BLT. ***
+#
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module Ted
+    extend TkCore
+
+    TkCommandNames = ['::blt::ted'.freeze].freeze
+
+    ##############################
+
+    extend TkItemConfigMethod
+
+    class << self
+      def __item_cget_cmd(id)
+        ['::blt::ted', 'cget', id]
+      end
+      private :__item_cget_cmd
+
+      def __item_config_cmd(id)
+        ['::blt::ted', 'configure', id]
+      end
+      private :__item_config_cmd
+
+      private :itemcget, :itemconfigure
+      private :itemconfiginfo, :current_itemconfiginfo
+
+      def cget(master, option)
+        itemconfigure(master, slot, value)
+      end
+      def configure(master, slot, value=None)
+        itemconfigure(master, slot, value)
+      end
+      def configinfo(master, slot=nil)
+        itemconfiginfo(master, slot)
+      end
+      def current_configinfo(master, slot=nil)
+        current_itemconfiginfo(master, slot)
+      end
+    end
+
+    ##############################
+
+    def self.edit(master, *args)
+      tk_call('::blt::ted', 'edit', master, *args)
+    end
+    def self.rep(master, *args)
+      tk_call('::blt::ted', 'rep', master, *args)
+    end
+    def self.select(master, *args)
+      tk_call('::blt::ted', 'select', master, *args)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile.rb
new file mode 100644
index 0000000000..5f5242f299
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile.rb
@@ -0,0 +1,21 @@
+#
+#  tkextlib/blt/tile.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module Tile
+    autoload :Button,      'tkextlib/blt/tile/button.rb'
+    autoload :CheckButton, 'tkextlib/blt/tile/checkbutton.rb'
+    autoload :Checkbutton, 'tkextlib/blt/tile/checkbutton.rb'
+    autoload :Radiobutton, 'tkextlib/blt/tile/radiobutton.rb'
+    autoload :RadioButton, 'tkextlib/blt/tile/radiobutton.rb'
+    autoload :Frame,       'tkextlib/blt/tile/frame.rb'
+    autoload :Label,       'tkextlib/blt/tile/label.rb'
+    autoload :Scrollbar,   'tkextlib/blt/tile/scrollbar.rb'
+    autoload :Toplevel,    'tkextlib/blt/tile/toplevel.rb'
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/button.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/button.rb
new file mode 100644
index 0000000000..dd715c8b98
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/button.rb
@@ -0,0 +1,16 @@
+#
+#  tkextlib/blt/tile/button.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/button'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class Button < TkButton
+      TkCommandNames = ['::blt::tile::button'.freeze].freeze
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
new file mode 100644
index 0000000000..ad58999d86
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
@@ -0,0 +1,17 @@
+#
+#  tkextlib/blt/tile/checkbutton.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/checkbutton'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class CheckButton < TkCheckButton
+      TkCommandNames = ['::blt::tile::checkbutton'.freeze].freeze
+    end
+    Checkbutton = CheckButton
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/frame.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/frame.rb
new file mode 100644
index 0000000000..10469fd35f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/frame.rb
@@ -0,0 +1,16 @@
+#
+#  tkextlib/blt/tile/frame.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class Frame < TkFrame
+      TkCommandNames = ['::blt::tile::frame'.freeze].freeze
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/label.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/label.rb
new file mode 100644
index 0000000000..ec67babd58
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/label.rb
@@ -0,0 +1,16 @@
+#
+#  tkextlib/blt/tile/label.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/label'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class Label < TkLabel
+      TkCommandNames = ['::blt::tile::label'.freeze].freeze
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
new file mode 100644
index 0000000000..2316923b19
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
@@ -0,0 +1,17 @@
+#
+#  tkextlib/blt/tile/radiobutton.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/radiobutton'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class RadioButton < TkRadioButton
+      TkCommandNames = ['::blt::tile::radiobutton'.freeze].freeze
+    end
+    Radiobutton = RadioButton
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb
new file mode 100644
index 0000000000..ba3bf316f0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb
@@ -0,0 +1,16 @@
+#
+#  tkextlib/blt/tile/scrollbar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/scrollbar'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class Scrollbar < TkScrollbar
+      TkCommandNames = ['::blt::tile::scrollbar'.freeze].freeze
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/toplevel.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/toplevel.rb
new file mode 100644
index 0000000000..6cc2c91415
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tile/toplevel.rb
@@ -0,0 +1,16 @@
+#
+#  tkextlib/blt/tile/toplevel.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/toplevel'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class Toplevel < TkToplevel
+      TkCommandNames = ['::blt::tile::toplevel'.freeze].freeze
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tree.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tree.rb
new file mode 100644
index 0000000000..07dc7ef7e8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/tree.rb
@@ -0,0 +1,923 @@
+#
+#  tkextlib/blt/tree.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Tree < TkObject
+    TkCommandNames = ['::blt::tree'.freeze].freeze
+
+    ###################################
+
+   class Node < TkObject
+      TreeNodeID_TBL = TkCore::INTERP.create_table
+      TkCore::INTERP.init_ip_env{ TreeNodeID_TBL.clear }
+
+      def self.id2obj(tree, id)
+        tpath = tree.path
+        return id unless TreeNodeID_TBL[tpath]
+        if TreeNodeID_TBL[tpath][id]
+          TreeNodeID_TBL[tpath][id]
+        else
+          begin
+            self.new(tree, nil, 'node'=>Integer(id))
+          rescue
+            id
+          end
+        end
+      end
+
+      def self.new(tree, parent, keys={})
+        keys = _symbolkey2str(keys)
+        tpath = tree.path
+
+        if (id = keys['node']) && (obj = TreeNodeID_TBL[tpath][id])
+          keys.delete('node')
+          tk_call(tree.path, 'move', id, parent, keys) if parent
+          return obj
+        end
+
+        super(tree, parent, keys)
+      end
+
+      def initialize(tree, parent, keys={})
+        @parent = @tree = tree
+        @tpath = @parent.path
+
+        parent = tk_call(@tpath, 'root') unless parent
+
+        if (id = keys['node']) && bool(tk_call(@tpath, 'exists', id))
+          @path = @id = id
+          keys.delete('node')
+          tk_call(@tpath, 'move', @id, parent, keys) if parent
+        else
+          @path = @id = tk_call(@tpath, 'insert', parent, keys)
+        end
+
+        TreeNodeID_TBL[@tpath] = {} unless TreeNodeID_TBL[@tpath]
+        TreeNodeID_TBL[@tpath][@id] = self
+      end
+
+      def id
+        @id
+      end
+
+      def apply(keys={})
+        @tree.apply(@id, keys)
+        self
+      end
+
+      def children()
+        @tree.children(@id)
+      end
+
+      def copy(parent, keys={})
+        @tree.copy(@id, parent, keys)
+      end
+      def copy_to(dest_tree, parent, keys={})
+        @tree.copy_to(@id, dest_tree, parent, keys)
+      end
+
+      def degree()
+        @tree.degree(@id)
+      end
+
+      def delete()
+        @tree.delete(@id)
+        self
+      end
+
+      def depth()
+        @tree.depth(@id)
+      end
+
+      def dump()
+        @tree.dump(@id)
+      end
+
+      def dump_to_file(file)
+        @tree.dump_to_file(@id, file)
+        self
+      end
+
+      def exist?(keys={})
+        @tree.exist?(@id, keys)
+      end
+
+      def find(keys={})
+        @tree.find(@id, keys)
+      end
+
+      def find_child(label)
+        @tree.find_child(@id, label)
+      end
+
+      def first_child()
+        @tree.first_child(@id)
+      end
+
+      def get()
+        @tree.get(@id)
+      end
+      def get_value(key, default_val=None)
+        @tree.get_value(@id, key, default_val)
+      end
+
+      def index()
+        @tree.index(@id)
+      end
+
+      def leaf?()
+        @tree.leaf?(@id)
+      end
+      def link?()
+        @tree.link?(@id)
+      end
+      def root?()
+        @tree.root?(@id)
+      end
+
+      def keys()
+        @tree.keys(@id)
+      end
+
+      def label(text = nil)
+        @tree.label(@id, nil)
+      end
+      def label=(text)
+        @tree.label(@id, text)
+      end
+
+      def last_child()
+        @tree.last_child(@id)
+      end
+
+      def move(dest, keys={})
+        @tree.keys(@id, dest, keys)
+        self
+      end      
+
+      def next()
+        @tree.next(@id)
+      end
+
+      def next_sibling()
+        @tree.next_sibling(@id)
+      end
+
+      def parent()
+        @tree.parent(@id)
+      end
+
+      def fullpath()
+        @tree.fullpath(@id)
+      end
+
+      def position()
+        @tree.position(@id)
+      end
+
+      def previous()
+        @tree.previous(@id)
+      end
+
+      def prev_sibling()
+        @tree.prev_sibling(@id)
+      end
+
+      def restore(str, keys={})
+        @tree.restore(@id, str, keys)
+        self
+      end
+      def restore_overwrite(str, keys={})
+        @tree.restore_overwrite(@id, str, keys)
+        self
+      end
+
+      def restore_from_file(file, keys={})
+        @tree.restore_from_file(@id, file, keys)
+        self
+      end
+      def restore_overwrite_from_file(file, keys={})
+        @tree.restore_overwrite_from_file(@id, file, keys)
+        self
+      end
+
+      def root()
+        @tree.root(@id)
+        self
+      end
+
+      def set(data)
+        @tree.set(@id, data)
+        self
+      end
+
+      def size()
+        @tree.size(@id)
+      end
+
+      def sort(keys={})
+        @tree.sort(@id, keys)
+        self
+      end
+
+      def type(key)
+        @tree.type(@id, key)
+      end
+
+      def unset(*keys)
+        @tree.unset(@id, *keys)
+        self
+      end
+
+      def values(key=None)
+        @tree.values(@id, key)
+      end
+    end
+
+    ###################################
+
+    class Tag < TkObject
+      TreeTagID_TBL = TkCore::INTERP.create_table
+      TkCore::INTERP.init_ip_env{ TreeTagID_TBL.clear }
+      TreeTag_ID = ['blt_tree_tag'.freeze, '00000'.taint].freeze
+
+      def self.id2obj(tree, id)
+        tpath = tree.path
+        return id unless TreeTagID_TBL[tpath]
+        if TreeTagID_TBL[tpath][id]
+          TreeTagID_TBL[tpath][id]
+        else
+          self.new(tree, id)
+        end
+      end
+
+      def initialize(tree, tag_str = nil)
+        @parent = @tree = tree
+        @tpath = @parent.path
+
+        if tag_str
+          @path = @id = tag_str.dup.freeze
+        else
+          @path = @id = TreeTag_ID.join(TkCore::INTERP._ip_id_)
+          TreeTagID_TBL[@id] = self
+          TreeTag_ID[1].succ!
+        end
+        TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
+        TreeTagID_TBL[@tpath][@id] = self
+      end
+
+      def id
+        @id
+      end
+
+      def add(*nodes)
+        tk_call(@tpath, 'tag', 'add', @id, *nodes)
+        self
+      end
+
+      def delete(*nodes)
+        tk_call(@tpath, 'tag', 'delete', @id, *nodes)
+        self
+      end
+
+      def forget()
+        tk_call(@tpath, 'tag', 'forget', @id)
+        TreeTagID_TBL[@tpath].delete(@id)
+        self
+      end
+
+      def nodes()
+        simplelist(tk_call(@tpath, 'tag', 'nodes', @id)).collect{|node|
+          Tk::BLT::Tree::Node.id2obj(@path, node)
+        }
+      end
+
+      def set(node)
+        tk_call(@tpath, 'tag', 'set', node, @id)
+        self
+      end
+
+      def unset(node)
+        tk_call(@tpath, 'tag', 'unset', node, @id)
+        self
+      end
+    end
+
+    ###################################
+
+    class Notify < TkObject
+      NotifyID_TBL = TkCore::INTERP.create_table
+      TkCore::INTERP.init_ip_env{ NotifyID_TBL.clear }
+
+      def self.id2obj(tree, id)
+        tpath = tree.path
+        return id unless NotifyID_TBL[tpath]
+        if NotifyID_TBL[tpath][id]
+          NotifyID_TBL[tpath][id]
+        else
+          begin
+            self.new([tree, id])
+          rescue
+            id
+          end
+        end
+      end
+
+      def self.new(tree, *args, &b)
+        if tree.kind_of?(Array)
+          # not create
+          if obj = NotifyID_TBL[tree[0].path][tree[1]]
+            return obj
+          else
+            return super(false, tree[0], tree[1])
+          end
+        end
+
+        super(true, tree, *args, &b)
+      end
+
+      def initialize(create, tree, *args, &b)
+        @parent = @tree = tree
+        @tpath = @parent.path
+
+        unless create
+          @path = @id = args[0]
+          return
+        end
+
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0])
+          cmd = args.shift
+        # elsif args[-1].kind_of?(Proc) || args[-1].kind_of?(Method)
+        elsif TkComm._callback_entry?(args[-1])
+          cmd = args.pop
+        elsif b
+          cmd = Proc.new(&b)
+        else
+          fail ArgumentError, "lack of 'command' argument"
+        end
+
+        args = args.collect{|arg| '-' << arg.to_s}
+
+        args << proc{|id, type|
+          cmd.call(Tk::BLT::Tree::Node.id2obj(@tree, id), 
+                   ((type[0] == ?-)? type[1..-1]: type))
+        }
+
+        @path = @id = tk_call(@tpath, 'notify', 'create', *args)
+      end
+
+      def id
+        @id
+      end
+
+      def delete()
+        tk_call(@tpath, 'notify', 'delete', @id)
+        NotifyID_TBL[tpath].delete(@id)
+        self
+      end
+
+      def info()
+        lst = simplelist(tk_call(@tpath, 'notify', 'info', id))
+        lst[0] = Tk::BLT::Tree::Notify.id2obj(@tree, lst[0])
+        lst[1] = simplelist(lst[1]).collect{|flag| flag[1..-1]}
+        lst[2] = tk_tcl2ruby(lst[2])
+        lst
+      end
+    end
+
+    ###################################
+
+    class Trace < TkObject
+      TraceID_TBL = TkCore::INTERP.create_table
+      TkCore::INTERP.init_ip_env{ TraceID_TBL.clear }
+
+      def self.id2obj(tree, id)
+        tpath = tree.path
+        return id unless TraceID_TBL[tpath]
+        if TraceID_TBL[tpath][id]
+          TraceID_TBL[tpath][id]
+        else
+          begin
+            self.new([tree, id])
+          rescue
+            id
+          end
+        end
+      end
+
+      def self.new(tree, *args, &b)
+        if tree.kind_of?(Array)
+          # not create
+          if obj = TraceID_TBL[tree[0].path][tree[1]]
+            return obj
+          else
+            return super(false, tree[0], tree[1])
+          end
+        end
+
+        super(true, tree, *args, &b)
+      end
+
+      def initialize(create, tree, node, key, opts, cmd=nil, &b)
+        @parent = @tree = tree
+        @tpath = @parent.path
+
+        unless create
+          @path = @id = node  # == traceID
+          return
+        end
+
+        if !cmd
+          if b
+            cmd = Proc.new(&b)
+          else
+            fail ArgumentError, "lack of 'command' argument"
+          end
+        end
+
+        @path = @id = tk_call(@tpath, 'trace', 'create', node, key, opts, 
+                              proc{|t, id, k, ops| 
+                                tobj = Tk::BLT::Tree.id2obj(t)
+                                if tobj.kind_of?(Tk::BLT::Tree)
+                                  nobj = Tk::BLT::Tree::Node.id2obj(tobj, id)
+                                else
+                                  nobj = id
+                                end
+                                cmd.call(tobj, nobj, k, ops)
+                              })
+      end
+
+      def id
+        @id
+      end
+
+      def delete()
+        tk_call(@tpath, 'trace', 'delete', @id)
+        TraceID_TBL[tpath].delete(@id)
+        self
+      end
+
+      def info()
+        lst = simplelist(tk_call(@tpath, 'trace', 'info', id))
+        lst[0] = Tk::BLT::Tree::Trace.id2obj(@tree, lst[0])
+        lst[2] = simplelist(lst[2])
+        lst[3] = tk_tcl2ruby(lst[3])
+        lst
+      end
+    end
+
+    ###################################
+
+    TreeID_TBL = TkCore::INTERP.create_table
+    Tree_ID = ['blt_tree'.freeze, '00000'.taint].freeze
+
+    def __keyonly_optkeys
+      {
+        # apply / find  command
+        'invert'=>nil, 'leafonly'=>nil, 'nocase'=>nil,
+
+        # apply / find / sort command
+        'path'=>nil,
+
+        # copy / restore / restorefile command
+        'overwrite'=>nil,
+
+        # copy command
+        'recurse'=>nil, 'tags'=>nil,
+
+        # sort command
+        'ascii'=>nil, 'decreasing'=>nil, 'disctionary'=>nil, 
+        'integer'=>nil, 'real'=>nil, 'recurse'=>nil, 'reorder'=>nil, 
+      }
+    end
+
+    def self.id2obj(id)
+      TreeID_TBL[id]? TreeID_TBL[id]: id
+    end
+
+    def self.names(pat = None)
+      simplelist(tk_call('::blt::tree', 'names', pat)).collect{|name|
+        id2obj(name)
+      }
+    end
+
+    def self.destroy(*names)
+      tk_call('::blt::tree', 'destroy',
+              *(names.collect{|n| (n.kind_of?(Tk::BLT::Tree))? n.id: n }) )
+    end
+
+    def self.new(name = nil)
+      return TreeID_TBL[name] if name && TreeID_TBL[name]
+      super(name)
+    end
+
+    def initialzie(name = nil)
+      if name
+        @path = @id = name
+      else
+        @path = @id = Tree_ID.join(TkCore::INTERP._ip_id_)
+        TreeID_TBL[@id] = self
+        Tree_ID[1].succ!
+      end
+      TreeID_TBL[@id] = self
+      tk_call('::blt::tree', 'create', @id)
+    end
+
+    def __destroy_hook__
+      Tk::BLT::Tree::Node::TreeNodeID_TBL.delete(@path)
+      Tk::BLT::Tree::Tag::TreeTagID_TBL.delete(@path)
+      Tk::BLT::Tree::Notify::NotifyID_TBL.delete(@path)
+      Tk::BLT::Tree::Trace::TraceID_TBL.delete(@path)
+    end
+
+    def tagid(tag)
+      if tag.kind_of?(Tk::BLT::Tree::Node) ||
+          tag.kind_of?(Tk::BLT::Tree::Tag) ||
+          tag.kind_of?(Tk::BLT::Tree::Notify) ||
+          tag.kind_of?(Tk::BLT::Tree::Trace)
+        tag.id
+      else
+        tag  # maybe an Array of configure paramters
+      end
+    end
+
+    def destroy()
+      tk_call('::blt::tree', 'destroy', @id)
+      self
+    end
+
+    def ancestor(node1, node2)
+      Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'ancestor', 
+                                               tagid(node1), tagid(node2)))
+    end
+
+    def apply(node, keys={})
+      tk_call('::blt::tree', 'apply', tagid(node), __conv_keyonly_opts(keys))
+      self
+    end
+
+    def attach(tree_obj)
+      tk_call('::blt::tree', 'attach', tree_obj)
+      self
+    end
+
+    def children(node)
+      simplelist(tk_call('::blt::tree', 'children', tagid(node))).collect{|n|
+        Tk::BLT::Tree::Node.id2obj(self, n)
+      }
+    end
+
+    def copy(src, parent, keys={})
+      id = tk_call('::blt::tree', 'copy', tagid(src), tagid(parent), 
+                   __conv_keyonly_opts(keys))
+      Tk::BLT::Tree::Node.new(self, nil, 'node'=>id)
+    end
+    def copy_to(src, dest_tree, parent, keys={})
+      return copy(src, parent, keys={}) unless dest_tree
+
+      id = tk_call('::blt::tree', 'copy', tagid(src), dest_tree, 
+                   tagid(parent), __conv_keyonly_opts(keys))
+      Tk::BLT::Tree::Node.new(dest_tree, nil, 'node'=>id)
+    end
+
+    def degree(node)
+      number(tk_call('::blt::tree', 'degree', tagid(node)))
+    end
+
+    def delete(*nodes)
+      tk_call('::blt::tree', 'delete', *(nodes.collect{|node| tagid(node)}))
+      nodes.each{|node|
+        if node.kind_of?(Tk::BLT::Tree::Node)
+          Tk::BLT::Tree::Node::TreeNodeID_TBL[@path].delete(node.id)
+        else
+          Tk::BLT::Tree::Node::TreeNodeID_TBL[@path].delete(node.to_s)
+        end
+      }
+      self
+    end
+
+    def depth(node)
+      number(tk_call('::blt::tree', 'depth', tagid(node)))
+    end
+
+    def dump(node)
+      simplelist(tk_call('::blt::tree', 'dump', tagid(node))).collect{|n|
+        simplelist(n)
+      }
+    end
+
+    def dump_to_file(node, file)
+      tk_call('::blt::tree', 'dumpfile', tagid(node), file)
+      self
+    end
+
+    def exist?(node, key=None)
+      bool(tk_call('::blt::tree', 'exists', tagid(node), key))
+    end
+
+    def find(node, keys={})
+      simplelist(tk_call('::blt::tree', 'find', tagid(node), 
+                         __conv_keyonly_opts(keys))).collect{|n|
+        Tk::BLT::Tree::Node.id2obj(self, n)
+      }
+    end
+
+    def find_child(node, label)
+      ret = tk_call('::blt::tree', 'findchild', tagid(node), label)
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def first_child(node)
+      ret = tk_call('::blt::tree', 'firstchild', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def get(node)
+      Hash[*simplelist(tk_call('::blt::tree', 'get', tagid(node)))]
+    end
+    def get_value(node, key, default_val=None)
+      tk_call('::blt::tree', 'get', tagid(node), key, default_val)
+    end
+
+    def index(node)
+      Tk::BLT::Tree::Node.id2obj(self, 
+                                 tk_call('::blt::tree', 'index', tagid(node)))
+    end
+
+    def insert(parent, keys={})
+      id = tk_call('::blt::tree', 'insert', tagid(parent), keys)
+      Tk::BLT::Tree::Node.new(self, nil, 'node'=>id)
+    end
+
+    def ancestor?(node1, node2)
+      bool(tk_call('::blt::tree', 'is', 'ancestor', 
+                   tagid(node1), tagid(node2)))
+    end
+    def before?(node1, node2)
+      bool(tk_call('::blt::tree', 'is', 'before', 
+                   tagid(node1), tagid(node2)))
+    end
+    def leaf?(node)
+      bool(tk_call('::blt::tree', 'is', 'leaf', tagid(node)))
+    end
+    def link?(node)
+      bool(tk_call('::blt::tree', 'is', 'link', tagid(node)))
+    end
+    def root?(node)
+      bool(tk_call('::blt::tree', 'is', 'root', tagid(node)))
+    end
+
+    def keys(node, *nodes)
+      if nodes.empty?
+        simplelist(tk_call('blt::tree', 'keys', tagid(node)))
+      else
+        simplelist(tk_call('blt::tree', 'keys', tagid(node), 
+                           *(nodes.collect{|n| tagid(n)}))).collect{|lst|
+          simplelist(lst)
+        }
+      end
+    end
+
+    def label(node, text=nil)
+      if text
+        tk_call('::blt::tree', 'label', tagid(node), text)
+        text
+      else
+        tk_call('::blt::tree', 'label', tagid(node))
+      end
+    end
+
+    def last_child(node)
+      ret = tk_call('::blt::tree', 'lastchild', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def link(parent, node, keys={})
+      ret = tk_call('::blt::tree', 'link', tagid(parent), tagid(node), 
+                    __conv_keyonly_opts(keys))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def move(node, dest, keys={})
+      tk_call('::blt::tree', 'move', tagid(node), tagid(dest), keys)
+      self
+    end
+
+    def next(node)
+      ret = tk_call('::blt::tree', 'next', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def next_sibling(node)
+      ret = tk_call('::blt::tree', 'nextsibling', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def notify_create(*args, &b)
+      Tk::BLT::Tree::Notify.new(self, *args, &b)
+    end
+
+    def notify_delete(id)
+      if id.kind_of?(Tk::BLT::Tree::Notify)
+        id.delete
+      else
+        tk_call(@path, 'notify', 'delete', id)
+        Tk::BLT::Tree::Notify::NotifyID_TBL[@path].delete(id.to_s)
+      end
+      self
+    end
+
+    def notify_info(id)
+      lst = simplelist(tk_call(@path, 'notify', 'info', tagid(id)))
+      lst[0] = Tk::BLT::Tree::Notify.id2obj(self, lst[0])
+      lst[1] = simplelist(lst[1]).collect{|flag| flag[1..-1]}
+      lst[2] = tk_tcl2ruby(lst[2])
+      lst
+    end
+
+    def notify_names()
+      tk_call(@path, 'notify', 'names').collect{|id|
+        Tk::BLT::Tree::Notify.id2obj(self, id)
+      }
+    end
+
+    def parent(node)
+      ret = tk_call('::blt::tree', 'parent', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def fullpath(node)
+      tk_call('::blt::tree', 'path', tagid(node))
+    end
+
+    def position(node)
+      number(tk_call('::blt::tree', 'position', tagid(node)))
+    end
+
+    def previous(node)
+      ret = tk_call('::blt::tree', 'previous', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def prev_sibling(node)
+      ret = tk_call('::blt::tree', 'prevsibling', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def restore(node, str, keys={})
+      tk_call('::blt::tree', 'restore', tagid(node), str, 
+              __conv_keyonly_opts(keys))
+      self
+    end
+    def restore_overwrite(node, str, keys={})
+      keys = __conv_keyonly_opts(keys)
+      keys.delete('overwrite')
+      keys.delete(:overwrite)
+      tk_call('::blt::tree', 'restore', tagid(node), str, '-overwrite', keys)
+      self
+    end
+
+    def restore_from_file(node, file, keys={})
+      tk_call('::blt::tree', 'restorefile', tagid(node), file, 
+              __conv_keyonly_opts(keys))
+      self
+    end
+    def restore_overwrite_from_file(node, file, keys={})
+      keys = __conv_keyonly_opts(keys)
+      keys.delete('overwrite')
+      keys.delete(:overwrite)
+      tk_call('::blt::tree', 'restorefile', tagid(node), file, 
+              '-overwrite', keys)
+      self
+    end
+
+    def root(node=None)
+      Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'root', 
+                                               tagid(node)))
+    end
+
+    def set(node, data)
+      unless data.kind_of?(Hash)
+        fail ArgumentError, 'Hash is expected for data'
+      end
+      args = []
+      data.each{|k, v|  args << k << v}
+      tk_call('::blt::tree', 'set', tagid(node), *args)
+      self
+    end
+
+    def size(node)
+      number(tk_call('::blt::tree', 'size', tagid(node)))
+    end
+
+    def sort(node, keys={})
+      tk_call('::blt::tree', 'sort', tagid(node), __conv_keyonly_opts(keys))
+      self
+    end
+
+    def tag_add(tag, *nodes)
+      tk_call(@path, 'tag', 'add', tagid(tag), *(nodes.collect{|n| tagid(n)}))
+      self
+    end
+
+    def tag_delete(tag, *nodes)
+      tk_call(@path, 'tag', 'delete', tagid(tag), 
+              *(nodes.collect{|n| tagid(n)}))
+      self
+    end
+
+    def tag_forget(tag)
+      tag = tag.id if tag.kind_of?(Tk::BLT::Tree::Tag)
+      tk_call(@path, 'tag', 'forget', tag)
+      TreeTagID_TBL[@path].delete(tag)
+      self
+    end
+
+    def tag_get(node, *patterns)
+      simplelist(tk_call(@tpath, 'tag', 'get', tagid(node), 
+                         *(patterns.collect{|pat| tagid(pat)}))).collect{|str|
+        Tk::BLT::Tree::Tag.id2obj(self, str)
+      }
+    end
+
+    def tag_names(node = None)
+      simplelist(tk_call(@tpath, 'tag', 'names', tagid(node))).collect{|str|
+        Tk::BLT::Tree::Tag.id2obj(self, str)
+      }
+    end
+
+    def tag_nodes(tag)
+      simplelist(tk_call(@tpath, 'tag', 'nodes', tagid(tag))).collect{|node|
+        Tk::BLT::Tree::Node.id2obj(self, node)
+      }
+    end
+
+    def tag_set(node, *tags)
+      tk_call(@path, 'tag', 'set', tagid(node), *(tags.collect{|t| tagid(t)}))
+      self
+    end
+
+    def tag_unset(node, *tags)
+      tk_call(@path, 'tag', 'unset', tagid(node), 
+              *(tags.collect{|t| tagid(t)}))
+      self
+    end
+
+    def trace_create(*args, &b)
+      Tk::BLT::Tree::Trace.new(self, *args, &b)
+    end
+
+=begin
+    def trace_delete(*args)
+      args.each{|id|
+        if id.kind_of?(Tk::BLT::Tree::Trace)
+          id.delete
+        else
+          tk_call(@path, 'trace', 'delete', id)
+          Tk::BLT::Tree::Trace::TraceID_TBL[@path].delete(id.to_s)
+        end
+        self
+      }
+    end
+=end
+    def trace_delete(*args)
+      args = args.collect{|id| tagid(id)}
+      tk_call(@path, 'trace', 'delete', *args)
+      args.each{|id| Tk::BLT::Tree::Trace::TraceID_TBL[@path].delete(id.to_s)}
+      self
+    end
+
+    def trace_info(id)
+      lst = simplelist(tk_call(@path, 'trace', 'info', tagid(id)))
+      lst[0] = Tk::BLT::Tree::Trace.id2obj(self, lst[0])
+      lst[2] = simplelist(lst[2])
+      lst[3] = tk_tcl2ruby(lst[3])
+      lst
+    end
+
+    def trace_names()
+      tk_call(@path, 'trace', 'names').collect{|id|
+        Tk::BLT::Tree::Trace.id2obj(self, id)
+      }
+    end
+
+    def type(node, key)
+      tk_call('::blt::tree', 'type', tagid(node), key)
+    end
+
+    def unset(node, *keys)
+      tk_call('::blt::tree', 'unset', tagid(node), *keys)
+      self
+    end
+
+    def values(node, key=None)
+      simplelist(tk_call('::blt::tree', 'values', tagid(node), key))
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/treeview.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/treeview.rb
new file mode 100644
index 0000000000..0343d28b9c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/treeview.rb
@@ -0,0 +1,1146 @@
+#
+#  tkextlib/blt/treeview.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+require 'tk/validation.rb'
+
+module Tk::BLT
+  class Treeview < TkWindow
+    module ConfigMethod
+    end
+
+    module TagOrID_Methods
+    end
+
+    class Node < TkObject
+    end
+
+    class Tag < TkObject
+    end
+  end
+
+  class Hiertable < Treeview
+  end
+end
+
+######################################
+
+module Tk::BLT::Treeview::ConfigMethod
+  include TkItemConfigMethod
+
+  def __item_boolval_optkeys(id)
+    case id
+    when Array
+      # id := [ 'column', name ]
+      ['edit', 'hide']
+    when 'sort'
+      ['decreasing']
+    else
+      []
+    end
+  end
+  private :__item_boolval_optkeys
+
+  def __item_strval_optkeys(id)
+    case id
+    when Array
+      # id := [ 'column', name ]
+      super() << 'titleforeground' << 'titleshadow'
+    when 'sort'
+      ['decreasing']
+    else
+      []
+    end
+  end
+  private :__item_strval_optkeys
+
+  def __item_listval_optkeys(id)
+    case id
+    when 'entry'
+      ['bindtags']
+    else
+      []
+    end
+  end
+  private :__item_listval_optkeys
+
+  def __item_cget_cmd(id)
+    if id.kind_of?(Array)
+      # id := [ type, name ]
+      [self.path, id[0], 'cget', id[1]]
+    else
+      [self.path, id, 'cget']
+    end
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    if id.kind_of?(Array)
+      # id := [ type, name ]
+      [self.path, id[0], 'configure', id[1]]
+    else
+      [self.path, id, 'configure']
+    end
+  end
+  private :__item_config_cmd
+
+  def __item_pathname(id)
+    if id.kind_of?(Array)
+      id = tagid(id[1])
+    end
+    [self.path, id].join(';')
+  end
+  private :__item_pathname
+
+  def column_cget(name, option)
+    itemcget(['column', name], option)
+  end
+  def column_configure(name, slot, value=None)
+    itemconfigure(['column', name], slot, value)
+  end
+  def column_configinfo(name, slot=nil)
+    itemconfiginfo(['column', name], slot)
+  end
+  def current_column_configinfo(name, slot=nil)
+    current_itemconfiginfo(['column', name], slot)
+  end
+
+  def button_cget(option)
+    itemcget('button', option)
+  end
+  def button_configure(slot, value=None)
+    itemconfigure('button', slot, value)
+  end
+  def button_configinfo(slot=nil)
+    itemconfiginfo('button', slot)
+  end
+  def current_button_configinfo(slot=nil)
+    current_itemconfiginfo('button', slot)
+  end
+
+  def entry_cget(option)
+    ret = itemcget('entry', option)
+    if option == 'bindtags' || option == :bindtags
+      ret.collect{|tag| TkBindTag.id2obj(tag)}
+    else
+      ret
+    end
+  end
+  def entry_configure(slot, value=None)
+    itemconfigure('entry', slot, value)
+  end
+  def entry_configinfo(slot=nil)
+    ret = itemconfiginfo('entry', slot)
+
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        if slot == 'bindtags' || slot == :bindtags
+          ret[-2] = ret[-2].collect{|tag| TkBindTag.id2obj(tag)}
+          ret[-1] = ret[-1].collect{|tag| TkBindTag.id2obj(tag)}
+        end
+      else
+        inf = ret.assoc('bindtags')
+        inf[-2] = inf[-2].collect{|tag| TkBindTag.id2obj(tag)}
+        inf[-1] = inf[-1].collect{|tag| TkBindTag.id2obj(tag)}
+      end
+
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if (inf = ret['bindtags'])
+        inf[-2] = inf[-2].collect{|tag| TkBindTag.id2obj(tag)}
+        inf[-1] = inf[-1].collect{|tag| TkBindTag.id2obj(tag)}
+        ret['bindtags'] = inf
+      end
+    end
+
+    ret
+  end
+  def current_entry_configinfo(slot=nil)
+    ret = current_itemconfiginfo('entry', slot)
+
+    if (val = ret['bindtags'])
+      ret['bindtags'] = val.collect{|tag| TkBindTag.id2obj(tag)}
+    end
+
+    ret
+  end
+
+  def sort_cget(option)
+    itemcget('sort', option)
+  end
+  def sort_configure(slot, value=None)
+    itemconfigure('sort', slot, value)
+  end
+  def sort_configinfo(slot=nil)
+    itemconfiginfo('sort', slot)
+  end
+  def current_sort_configinfo(slot=nil)
+    current_itemconfiginfo('sort', slot)
+  end
+
+  def text_cget(option)
+    itemcget('text', option)
+  end
+  def text_configure(slot, value=None)
+    itemconfigure('text', slot, value)
+  end
+  def text_configinfo(slot=nil)
+    itemconfiginfo('text', slot)
+  end
+  def current_text_configinfo(slot=nil)
+    current_itemconfiginfo('text', slot)
+  end
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+end
+
+class Tk::BLT::Treeview
+  TkCommandNames = ['::blt::treeview'.freeze].freeze
+  WidgetClassName = 'TreeView'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  include Scrollable
+  include ValidateConfigure
+  include ItemValidateConfigure
+  include Tk::BLT::Treeview::ConfigMethod
+
+  ########################
+
+  def __boolval_optkeys
+    ['autocreate', 'allowduplicates', 'exportselection', 'flat', 'hideroot', 
+      'newtags', 'showtitles', 'sortselection']
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() + ['focusforeground', 'linecolor', 'separator', 'trim']
+  end
+  private :__strval_optkeys
+
+  ########################
+
+  class OpenCloseCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?W, ?w, :widget ], 
+        [ ?p, ?s, :name ], 
+        [ ?P, ?s, :fullpath ], 
+        [ ?#, ?x, :node_id ], 
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?x, TkComm.method(:num_or_str) ], 
+        [ ?s, TkComm.method(:string) ], 
+        [ ?w, TkComm.method(:window) ], 
+        nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        val
+      end
+    end
+
+    def self._config_keys
+      ['opencommand', 'closecomand']
+    end
+  end
+
+  def __validation_class_list
+    super() << OpenCloseCommand
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, OpenCloseCommand)
+
+  ########################
+
+  def __item_validation_class_list(id)
+    case id
+    when 'entry'
+      super(id) << OpenCloseCommand
+    else
+      super(id)
+    end
+  end
+
+  Tk::ItemValidateConfigure.__def_validcmd(binding, OpenCloseCommand)
+
+  ########################
+
+  def __destroy_hook__
+    Tk::BLT::Treeview::Node::TreeNodeID_TBL.delete(@path)
+    Tk::BLT::Treeview::Tag::TreeTagID_TBL.delete(@path)
+  end
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::BLT::Treeview::Node) \
+      || tag.kind_of?(Tk::BLT::Treeview::Tag)
+      tag.id
+    else
+      tag  # maybe an Array of configure paramters
+    end
+  end
+  private :tagid
+
+  def tagid2obj(tagid)
+    if tagid.kind_of?(Integer)
+      Tk::BLT::Treeview::Node.id2obj(self, tagid.to_s)
+    elsif tagid.kind_of?(String)
+      if tagid =~ /^\d+$/
+        Tk::BLT::Treeview::Node.id2obj(self, tagid)
+      else
+        Tk::BLT::Treeview::Tag.id2obj(self, tagid)
+      end
+    else
+      tagid
+    end
+  end
+
+  def bbox(*tags)
+    list(tk_send('bbox', *(tags.collect{|tag| tagid(tag)})))
+  end
+
+  def screen_bbox(*tags)
+    list(tk_send('bbox', '-screen', *(tags.collect{|tag| tagid(tag)})))
+  end
+
+  def tag_bind(tag, seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([@path, 'bind', tagid(tag)], seq, cmd, *args)
+    self
+  end
+  def tag_bind_append(tag, seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([@path, 'bind', tagid(tag)], seq, cmd, *args)
+    self
+  end
+  def tag_bind_remove(tag, seq)
+    _bind_remove([@path, 'bind', tagid(tag)], seq)
+    self
+  end
+  def tag_bindinfo(tag, seq=nil)
+    _bindinfo([@path, 'bind', tagid(tag)], seq)
+  end
+
+  def button_activate(tag)
+    tk_send('button', 'activate', tagid(tag))
+    self
+  end
+
+  def button_bind(tag, seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([@path, 'button', 'bind', tagid(tag)], seq, cmd, *args)
+    self
+  end
+  def button_bind_append(tag, seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([@path, 'button', 'bind', tagid(tag)], seq, cmd, *args)
+    self
+  end
+  def button_bind_remove(tag, seq)
+    _bind_remove([@path, 'button', 'bind', tagid(tag)], seq)
+    self
+  end
+  def button_bindinfo(tag, seq=nil)
+    _bindinfo([@path, 'button', 'bind', tagid(tag)], seq)
+  end
+
+  def close(*tags)
+    tk_send('close', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+  def close_recurse(*tags)
+    tk_send('close', '-recurse', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+
+  def column_activate(column=None)
+    if column == None
+      tk_send('column', 'activate')
+    else
+      tk_send('column', 'activate', column)
+      self
+    end
+  end
+
+  def column_delete(*fields)
+    tk_send('column', 'delete', *fields)
+    self
+  end
+  def column_insert(pos, field, *opts)
+    tk_send('column', 'insert', pos, field, *opts)
+    self
+  end
+  def column_invoke(field)
+    tk_send('column', 'invoke', field)
+    self
+  end
+  def column_move(name, dest)
+    tk_send('column', 'move', name, dest)
+    self
+  end
+  def column_names()
+    simplelist(tk_send('column', 'names'))
+  end
+  def column_nearest(x, y=None)
+    tk_send('column', 'nearest', x, y)
+  end
+
+  def curselection
+    simplelist(tk_send('curselection')).collect{|id| tagid2obj(id)}
+  end
+
+  def delete(*tags)
+    tk_send('delete', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+
+  def entry_activate(tag)
+    tk_send('entry', 'activate', tagid(tag))
+    self
+  end
+  def entry_children(tag, first=None, last=None)
+    simplelist(tk_send('entry', 'children', tagid(tag), 
+                       first, last)).collect{|id| tagid2obj(id)}
+  end
+  def entry_delete(tag, first=None, last=None)
+    tk_send('entry', 'delete', tagid(tag), first, last)
+  end
+  def entry_before?(tag1, tag2)
+    bool(tk_send('entry', 'isbefore', tagid(tag1), tagid(tag2)))
+  end
+  def entry_hidden?(tag)
+    bool(tk_send('entry', 'ishidden', tagid(tag)))
+  end
+  def entry_open?(tag)
+    bool(tk_send('entry', 'isopen', tagid(tag)))
+  end
+
+  def entry_size(tag)
+    number(tk_send('entry', 'size', tagid(tag)))
+  end
+  def entry_size_recurse(tag)
+    number(tk_send('entry', 'size', '-recurse', tagid(tag)))
+  end
+
+  def _search_flags(keys)
+    keys = _symbolkey2str(keys)
+    keys['exact'] = None if keys.delete('exact')
+    keys['glob'] = None if keys.delete('glob')
+    keys['regexp'] = None if keys.delete('regexp')
+    keys['nonmatching'] = None if keys.delete('nonmatching')
+  end
+  private :_search_flags
+
+  ################################
+
+  class FindExecFlagValue < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?W, ?w, :widget ], 
+        [ ?p, ?s, :name ], 
+        [ ?P, ?s, :fullpath ], 
+        [ ?#, ?x, :node_id ], 
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?x, TkComm.method(:num_or_str) ], 
+        [ ?s, TkComm.method(:string) ], 
+        [ ?w, TkComm.method(:window) ], 
+        nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        val
+      end
+    end
+
+    def self._config_keys
+      []
+    end
+  end
+
+  def _find_exec_flag_value(val)
+    if val.kind_of?(Array)
+      cmd, *args = val
+      FindExecFlagValue.new(cmd, args.join(' '))
+    elsif TkComm._callback_entry?(val)
+      FindExecFlagValue.new(val)
+    else
+      val
+    end
+  end
+
+  ################################
+
+  def find(first, last, keys={})
+    keys = _search_flags(keys)
+    keys['exec'] = _find_exec_flag_value(keys['exec']) if keys.key?('exec')
+    args = hash_kv(keys) << '--' << tagid(first) << tagid(last)
+    simplelist(tk_send('find', *args)).collect{|id| tagid2obj(id)}
+  end
+
+  def tag_focus(tag)
+    tk_send('focus', tagid(tag))
+    self
+  end
+  def get(*tags)
+    simplelist(tk_send('get', *(tags.collect{|tag| tagid(tag)})))
+  end
+  def get_full(*tags)
+    simplelist(tk_send('get', '-full', *(tags.collect{|tag| tagid(tag)})))
+  end
+
+  def hide(*tags)
+    if tags[-1].kind_of?(Hash)
+      keys = tags.pop
+    else
+      keys = {}
+    end
+    keys = _search_flags(keys)
+    args = hash_kv(keys) << '--'
+    args.concat(tags.collect{|t| tagid(t)})
+    tk_send('hide', *args)
+    self
+  end
+
+  def index(str)
+    tagid2obj(tk_send('index', str))
+  end
+  def index_at(tag, str)
+    tagid2obj(tk_send('index', '-at', tagid(tag), str))
+  end
+  def index_at_path(tag, str)
+    tagid2obj(tk_send('index', '-at', tagid(tag), '-path', str))
+  end
+
+  def insert(pos, parent=nil, keys={})
+    Tk::BLT::Treeview::Node.new(pos, parent, keys)
+  end
+  def insert_at(tag, pos, parent=nil, keys={})
+    if parent.kind_of?(Hash)
+      keys = parent
+      parent = nil
+    end
+
+    keys = _symbolkey2str(keys)
+    keys['at'] = tagid(tag)
+
+    Tk::BLT::Treeview::Node.new(pos, parent, keys)
+  end
+
+  def move_before(tag, dest)
+    tk_send('move', tagid(tag), 'before', tagid(dest))
+    self
+  end
+  def move_after(tag, dest)
+    tk_send('move', tagid(tag), 'after', tagid(dest))
+    self
+  end
+  def move_into(tag, dest)
+    tk_send('move', tagid(tag), 'into', tagid(dest))
+    self
+  end
+
+  def nearest(x, y, var=None)
+    tagid2obj(tk_send('nearest', x, y, var))
+  end
+
+  def open(*tags)
+    tk_send('open', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+  def open_recurse(*tags)
+    tk_send('open', '-recurse', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+
+  def range(first, last)
+    simplelist(tk_send('range', tagid(first), tagid(last))).collect{|id|
+      tagid2obj(id)
+    }
+  end
+  def range_open(first, last)
+    simplelist(tk_send('range', '-open', 
+                       tagid(first), tagid(last))).collect{|id|
+      tagid2obj(id)
+    }
+  end
+
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+
+  def see(tag)
+    tk_send_without_enc('see', tagid(tag))
+    self
+  end
+  def see_anchor(anchor, tag)
+    tk_send_without_enc('see', '-anchor', anchor, tagid(tag))
+    self
+  end
+
+  def selection_anchor(tag)
+    tk_send_without_enc('selection', 'anchor', tagid(tag))
+    self
+  end
+  def selection_cancel()
+    tk_send_without_enc('selection', 'cancel')
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send_without_enc('selection', 'clear', tagid(first), tagid(last))
+    self
+  end
+  def selection_clear_all()
+    tk_send_without_enc('selection', 'clearall')
+    self
+  end
+  def selection_mark(tag)
+    tk_send_without_enc('selection', 'mark', tagid(tag))
+    self
+  end
+  def selection_include?(tag)
+    bool(tk_send('selection', 'include', tagid(tag)))
+  end
+  def selection_present?()
+    bool(tk_send('selection', 'present'))
+  end
+  def selection_set(first, last=None)
+    tk_send_without_enc('selection', 'set', tagid(first), tagid(last))
+    self
+  end
+  def selection_toggle(first, last=None)
+    tk_send_without_enc('selection', 'toggle', tagid(first), tagid(last))
+    self
+  end
+
+  def show(*tags)
+    if tags[-1].kind_of?(Hash)
+      keys = tags.pop
+    else
+      keys = {}
+    end
+    keys = _search_flags(keys)
+    args = hash_kv(keys) << '--'
+    args.concat(tags.collect{|t| tagid(t)})
+    tk_send('show', *args)
+    self
+  end
+
+  def sort_auto(mode)
+    tk_send('sort', 'auto', mode)
+    self
+  end
+  def sort_auto=(mode)
+    tk_send('sort', 'auto', mode)
+    mode
+  end
+  def sort_auto?
+    bool(tk_send('sort', 'auto'))
+  end
+  def sort_once(*tags)
+    tk_send('sort', 'once', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+  def sort_once_recurse(*tags)
+    tk_send('sort', 'once', '-recurse', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+
+  def tag_add(tag, *ids)
+    tk_send('tag', 'add', tagid(tag), *ids)
+    self
+  end
+  def tag_delete(tag, *ids)
+    tk_send('tag', 'delete', tagid(tag), *ids)
+    self
+  end
+  def tag_forget(tag)
+    tk_send('tag', 'forget', tagid(tag))
+    self
+  end
+  def tag_names(id=nil)
+    id = (id)? tagid(id): None
+
+    simplelist(tk_send('tag', 'nodes', id)).collect{|tag|
+      Tk::BLT::Treeview::Tag.id2obj(self, tag)
+    }
+  end
+  def tag_nodes(tag)
+    simplelist(tk_send('tag', 'nodes', tagid(tag))).collect{|id|
+      Tk::BLT::Treeview::Node.id2obj(self, id)
+    }
+  end
+
+  def text_apply
+    tk_send('text', 'apply')
+    self
+  end
+  def text_cancel
+    tk_send('text', 'cancel')
+    self
+  end
+
+  def text_delete(first, last)
+    tk_send('text', 'delete', first, last)
+    self
+  end
+  def text_get(x, y)
+    tk_send('text', 'get', x, y)
+  end
+  def text_get_root(x, y)
+    tk_send('text', 'get', '-root', x, y)
+  end
+  def text_icursor(idx)
+    tk_send('text', 'icursor', idx)
+    self
+  end
+  def text_index(idx)
+    num_or_str(tk_send('text', 'index', idx))
+  end
+  def text_insert(idx, str)
+    tk_send('text', 'insert', idx, str)
+    self
+  end
+
+  def text_selection_adjust(idx)
+    tk_send('text', 'selection', 'adjust', idx)
+    self
+  end
+  def text_selection_clear
+    tk_send('text', 'selection', 'clear')
+    self
+  end
+  def text_selection_from(idx)
+    tk_send('text', 'selection', 'from', idx)
+    self
+  end
+  def text_selection_present
+    num_or_str(tk_send('text', 'selection', 'present'))
+  end
+  def text_selection_range(start, last)
+    tk_send('text', 'selection', 'range', start, last)
+    self
+  end
+  def text_selection_to(idx)
+    tk_send('text', 'selection', 'to', idx)
+    self
+  end
+
+  def toggle(tag)
+    tk_send('toggle', tagid(tag))
+    self
+  end
+end
+
+######################################
+
+module Tk::BLT::Treeview::TagOrID_Methods
+  def bbox
+    @tree.bbox(self)
+  end
+  def screen_bbox
+    @tree.screen_bbox(self)
+  end
+
+  def bind(seq, *args)
+    @tree.tag_bind(self, seq, *args)
+    self
+  end
+  def bind_append(seq, *args)
+    @tree.tag_bind_append(self, seq, *args)
+    self
+  end
+  def bind_remove(seq)
+    @tree.tag_bind_remove(self, seq)
+    self
+  end
+  def bindinfo(seq=nil)
+    @tree.tag_bindinfo(self, seq)
+  end
+
+  def button_activate
+    @tree.button_activate(self)
+    self
+  end
+
+  def button_bind(seq, *args)
+    @tree.button_bind(self, seq, *args)
+    self
+  end
+  def button_bind_append(seq, *args)
+    @tree.button_bind_append(self, seq, *args)
+    self
+  end
+  def button_bind_remove(seq)
+    @tree.button_bind_remove(self, seq)
+    self
+  end
+  def button_bindinfo(seq=nil)
+    @tree.button_bindinfo(self, seq)
+  end
+
+  def close
+    @tree.close(self)
+    self
+  end
+  def close_recurse
+    @tree.close_recurse(self)
+    self
+  end
+
+  def delete
+    @tree.delete(self)
+    self
+  end
+
+  def entry_activate
+    @tree.entry_activate(self)
+    self
+  end
+  def entry_children(first=None, last=None)
+    @tree.entry_children(self, first, last)
+  end
+  def entry_delete(first=None, last=None)
+    @tree.entry_delete(self, first, last)
+  end
+  def entry_before?(tag)
+    @tree.entry_before?(self, tag)
+  end
+  def entry_hidden?
+    @tree.entry_before?(self)
+  end
+  def entry_open?
+    @tree.entry_open?(self)
+  end
+
+  def entry_size
+    @tree.entry_size(self)
+  end
+  def entry_size_recurse
+    @tree.entry_size_recurse(self)
+  end
+
+  def focus
+    @tree.tag_focus(self)
+    self
+  end
+
+  def get
+    @tree.get(self)
+  end
+  def get_full
+    @tree.get_full(self)
+  end
+
+  def hide
+    @tree.hide(self)
+    self
+  end
+
+  def index(str)
+    @tree.index_at(self, str)
+  end
+  def index_path(str)
+    @tree.index_at_path(self, str)
+  end
+
+  def insert(pos, parent=nil, keys={})
+    @tree.insert_at(self, pos, parent, keys)
+  end
+
+  def move_before(dest)
+    @tree.move_before(self, dest)
+    self
+  end
+  def move_after(dest)
+    @tree.move_after(self, dest)
+    self
+  end
+  def move_into(dest)
+    @tree.move_into(self, dest)
+    self
+  end
+
+  def open
+    @tree.open(self)
+    self
+  end
+  def open_recurse
+    @tree.open_recurse(self)
+    self
+  end
+
+  def range_to(tag)
+    @tree.range(self, tag)
+  end
+  def range_open_to(tag)
+    @tree.range(self, tag)
+  end
+
+  def see
+    @tree.see(self)
+    self
+  end
+  def see_anchor(anchor)
+    @tree.see_anchor(anchor, self)
+    self
+  end
+
+  def selection_anchor
+    @tree.selection_anchor(self)
+    self
+  end
+  def selection_clear
+    @tree.selection_clear(self)
+    self
+  end
+  def selection_mark
+    @tree.selection_mark(self)
+    self
+  end
+  def selection_include?
+    @tree.selection_include?(self)
+  end
+  def selection_set
+    @tree.selection_set(self)
+    self
+  end
+  def selection_toggle
+    @tree.selection_toggle(self)
+    self
+  end
+
+  def show
+    @tree.show(self)
+    self
+  end
+
+  def sort_once
+    @tree.sort_once(self)
+    self
+  end
+  def sort_once_recurse
+    @tree.sort_once_recurse(self)
+    self
+  end
+
+  def toggle
+    @tree.toggle(self)
+    self
+  end
+end
+
+######################################
+
+class Tk::BLT::Treeview::Node < TkObject
+  include Tk::BLT::Treeview::TagOrID_Methods
+
+  TreeNodeID_TBL = TkCore::INTERP.create_table
+  TreeNode_ID = ['blt_treeview_node'.freeze, '00000'.taint].freeze
+
+  TkCore::INTERP.init_ip_env{ TreeNodeID_TBL.clear }
+
+  def self.id2obj(tree, id)
+    tpath = tree.path
+    return id unless TreeNodeID_TBL[tpath]
+    if TreeNodeID_TBL[tpath][id]
+      TreeNodeID_TBL[tpath][id]
+    else
+      begin
+        self.new(tree, nil, nil, 'node'=>Integer(id))
+      rescue
+        id
+      end
+    end
+  end
+
+  def self.new(tree, pos, parent=nil, keys={})
+    if parent.kind_of?(Hash)
+      keys = parent
+      parent = nil
+    end
+
+    keys = _symbolkey2str(keys)
+    tpath = tree.path
+
+    if (id = keys['node']) && (obj = TreeNodeID_TBL[tpath][id])
+      keys.delete('node')
+      tk_call(tree.path, 'move', id, pos, parent) if parent
+      return obj
+    end
+
+    super(tree, pos, parent, keys)
+  end
+
+  def initialize(tree, pos, parent, keys)
+    @parent = @tree = tree
+    @tpath = @parent.path
+
+    if (id = keys['node'])
+      @path = @id = id
+      tk_call(@tpath, 'move', @id, pos, tagid(parent)) if parent
+    else
+      name = TreeNode_ID.join(TkCore::INTERP._ip_id_).freeze
+      TreeNode_ID[1].succ!
+
+      at = keys.delete['at']
+
+      if parent
+        if parent.kind_of?(Tk::BLT::Treeview::Node) || 
+            parent.kind_of?(Tk::BLT::Treeview::Tag)
+          path = [get_full(parent.id)[0], name]
+          at = nil # ignore 'at' option
+        else
+          path = [parent.to_s, name]
+        end
+      else
+        path = name
+      end
+
+      if at
+        @id = tk_call(@tpath, 'insert', '-at', tagid(at), pos, path, keys)
+      else
+        @id = tk_call(@tpath, 'insert', pos, path, keys)
+      end
+      @path = @id
+    end
+
+    TreeNodeID_TBL[@tpath] = {} unless TreeNodeID_TBL[@tpath]
+    TreeNodeID_TBL[@tpath][@id] = self
+  end
+
+  def id
+    @id
+  end
+end
+
+######################################
+
+class Tk::BLT::Treeview::Tag < TkObject
+  include Tk::BLT::Treeview::TagOrID_Methods
+
+  TreeTagID_TBL = TkCore::INTERP.create_table
+  TreeTag_ID = ['blt_treeview_tag'.freeze, '00000'.taint].freeze
+
+  TkCore::INTERP.init_ip_env{ TreeTagID_TBL.clear }
+
+  def self.id2obj(tree, id)
+    tpath = tree.path
+    return id unless TreeTagID_TBL[tpath]
+    if TreeTagID_TBL[tpath][id]
+      TreeTagID_TBL[tpath][id]
+    else
+      begin
+        self.new(tree, nil, nil, 'name'=>Integer(id))
+      rescue
+        id
+      end
+    end
+  end
+
+  def self.new_by_name(tree, name, *ids)
+    if (obj = TreeTagID_TBL[tree.path][name])
+      return obj
+    end
+    new([tree, name], ids)
+  end
+
+  def self.new(tree, *ids)
+    if tree.kind_of?(Array)
+      super(tree[0], tree[1], ids)
+    else
+      super(tree, nil, ids)
+    end
+  end
+
+  def initialize(tree, name, ids)
+    @parent = @tree = tree
+    @tpath = @parent.path
+
+    if name
+      @path = @id = name
+    else
+      @path = @id = TreeTag_ID.join(TkCore::INTERP._ip_id_).freeze
+      TreeTag_ID[1].succ!
+    end
+
+    TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
+    TreeTagID_TBL[@tpath][@id] = self
+
+    unless ids.empty?
+      tk_call(@tpath, 'tag', 'add', @id, *(ids.collect{|id| tagid(id)}))
+    end
+  end
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::BLT::Treeview::Node) \
+      || tag.kind_of?(Tk::BLT::Treeview::Tag)
+      tag.id
+    else
+      tag
+    end
+  end
+  private :tagid
+
+  def id
+    @id
+  end
+
+  def add(*ids)
+    tk_call(@tpath, 'tag', 'add', @id, *(ids{|id| tagid(id)}))
+    self
+  end
+
+  def remove(*ids)
+    tk_call(@tpath, 'tag', 'delete', @id, *(ids{|id| tagid(id)}))
+    self
+  end
+
+  def forget
+    tk_call(@tpath, 'tag', 'forget', @id)
+    self
+  end
+
+  def nodes
+    simplelist(tk_call(@tpath, 'tag', 'nodes', @id)).collect{|id|
+      Tk::BLT::Treeview::Node.id2obj(@tree, id)
+    }
+  end
+end
+
+class Tk::BLT::Hiertable
+  TkCommandNames = ['::blt::hiertable'.freeze].freeze
+  WidgetClassName = 'Hiertable'.freeze
+  WidgetClassNames[WidgetClassName] = self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/unix_dnd.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/unix_dnd.rb
new file mode 100644
index 0000000000..3130c1e56f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/unix_dnd.rb
@@ -0,0 +1,129 @@
+#
+#  tkextlib/blt/unix_dnd.rb
+#
+#    *** This is alpha version, because there is no document on BLT. ***
+#
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module DnD
+    extend TkCore
+
+    TkCommandNames = ['::blt::dnd'.freeze].freeze
+
+    ##############################
+
+    extend TkItemConfigMethod
+
+    class << self
+      def __item_cget_cmd(id)
+        ['::blt::dnd', *id]
+      end
+      private :__item_cget_cmd
+
+      def __item_config_cmd(id)
+        ['::blt::dnd', *id]
+      end
+      private :__item_config_cmd
+
+      private :itemcget, :itemconfigure
+      private :itemconfiginfo, :current_itemconfiginfo
+
+      def cget(win, option)
+        itemconfigure(['cget', win], slot, value)
+      end
+      def configure(win, slot, value=None)
+        itemconfigure(['configure', win], slot, value)
+      end
+      def configinfo(win, slot=nil)
+        itemconfiginfo(['configure', win], slot)
+      end
+      def current_configinfo(win, slot=nil)
+        current_itemconfiginfo(['configure', win], slot)
+      end
+
+      def tokwn_cget(win, option)
+        itemconfigure(['token', 'cget', win], slot, value)
+      end
+      def token_configure(win, slot, value=None)
+        itemconfigure(['token', 'configure', win], slot, value)
+      end
+      def token_configinfo(win, slot=nil)
+        itemconfiginfo(['token', 'configure', win], slot)
+      end
+      def current_token_configinfo(win, slot=nil)
+        current_itemconfiginfo(['token', 'configure', win], slot)
+      end
+
+      def token_windowconfigure(win, slot, value=None)
+        itemconfigure(['token', 'window', win], slot, value)
+      end
+      def token_windowconfiginfo(win, slot=nil)
+        itemconfiginfo(['token', 'window', win], slot)
+      end
+      def current_token_windowconfiginfo(win, slot=nil)
+        current_itemconfiginfo(['token', 'window', win], slot)
+      end
+    end
+
+    ##############################
+
+    def self.cancel(win)
+      tk_call('::blt::dnd', 'cancel', *wins)
+    end
+    def self.delete(*wins)
+      tk_call('::blt::dnd', 'delete', *wins)
+    end
+    def self.delete_source(*wins)
+      tk_call('::blt::dnd', 'delete', '-source', *wins)
+    end
+    def self.delete_target(*wins)
+      tk_call('::blt::dnd', 'delete', '-target', *wins)
+    end
+    def self.drag(win, x, y, token=None)
+      tk_call('::blt::dnd', 'drag', win, x, y, token)
+    end
+    def self.drop(win, x, y, token=None)
+      tk_call('::blt::dnd', 'drop', win, x, y, token)
+    end
+    def self.get_data(win, fmt=nil, cmd=nil)
+      if fmt
+        tk_call('::blt::dnd', 'getdata', win, fmt, cmd)
+      else
+        list(tk_call('::blt::dnd', 'getdata', win))
+      end
+    end
+    def self.names(pat=None)
+      list(tk_call('::blt::dnd', 'names', pat))
+    end
+    def self.source_names(pat=None)
+      list(tk_call('::blt::dnd', 'names', '-source', pat))
+    end
+    def self.target_names(pat=None)
+      list(tk_call('::blt::dnd', 'names', '-target', pat))
+    end
+    def self.pull(win, fmt)
+      tk_call('::blt::dnd', 'pull', win, fmt)
+    end
+    def self.register(win, keys={})
+      tk_call('::blt::dnd', 'register', win, keys)
+    end
+    def self.select(win, x, y, timestamp)
+      tk_call('::blt::dnd', 'select', win, x, y, timestamp)
+    end
+    def self.set_data(win, fmt=nil, cmd=nil)
+      if fmt
+        tk_call('::blt::dnd', 'setdata', win, fmt, cmd)
+      else
+        list(tk_call('::blt::dnd', 'setdata', win))
+      end
+    end
+    def self.token(*args)
+      tk_call('::blt::dnd', 'token', *args)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/vector.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/vector.rb
new file mode 100644
index 0000000000..540b6b9102
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/vector.rb
@@ -0,0 +1,243 @@
+#
+#  tkextlib/blt/vector.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Vector < TkVariable
+    TkCommandNames = ['::blt::vector'.freeze].freeze
+
+    def self.create(*args)
+      tk_call('::blt::vector', 'create', *args)
+    end
+
+    def self.destroy(*args)
+      tk_call('::blt::vector', 'destroy', *args)
+    end
+
+    def self.expr(expression)
+      tk_call('::blt::vector', 'expr', expression)
+    end
+
+    def self.names(pat=None)
+      simplelist(tk_call('::blt::vector', 'names', pat)).collect{|name|
+        if TkVar_ID_TBL[name]
+          TkVar_ID_TBL[name]
+        elsif name[0..1] == '::' && TkVar_ID_TBL[name[2..-1]]
+          TkVar_ID_TBL[name[2..-1]]
+        else
+          name
+        end
+      }
+    end
+
+    ####################################
+
+    def initialize(size=nil, keys={})
+      if size.kind_of?(Hash)
+        keys = size
+        size = nil
+      end
+      if size.kind_of?(Array)
+        # [first, last]
+        size = size.join(':')
+      end
+      if size
+        @id = INTERP._invoke('::blt::vector', 'create', 
+                             "#auto(#{size})", *hash_kv(keys))
+      else
+        @id = INTERP._invoke('::blt::vector', 'create', 
+                             "#auto", *hash_kv(keys))
+      end
+
+      TkVar_ID_TBL[@id] = self
+
+      @def_default = false
+      @default_val = nil
+
+      @trace_var  = nil
+      @trace_elem = nil
+      @trace_opts = nil
+
+      # teach Tk-ip that @id is global var
+      INTERP._invoke_without_enc('global', @id)
+    end
+
+    def destroy
+      tk_call('::blt::vector', 'destroy', @id)
+    end
+
+    def inspect
+      '#<Tk::BLT::Vector: ' + @id + '>'
+    end
+
+    def to_s
+      @id
+    end
+
+    def *(item)
+      list(tk_call(@id, '*', item))
+    end
+
+    def +(item)
+      list(tk_call(@id, '+', item))
+    end
+
+    def -(item)
+      list(tk_call(@id, '-', item))
+    end
+
+    def /(item)
+      list(tk_call(@id, '/', item))
+    end
+
+    def append(*vectors)
+      tk_call(@id, 'append', *vectors)
+    end
+
+    def binread(channel, len=None, keys={})
+      if len.kind_of?(Hash)
+        keys = len
+        len = None
+      end
+      keys = _symbolkey2str(keys)
+      keys['swap'] = None if keys.delete('swap')
+      tk_call(@id, 'binread', channel, len, keys)
+    end
+
+    def clear()
+      tk_call(@id, 'clear')
+      self
+    end
+
+    def delete(*indices)
+      tk_call(@id, 'delete', *indices)
+      self
+    end
+
+    def dup_vector(vec)
+      tk_call(@id, 'dup', vec)
+      self
+    end
+
+    def expr(expression)
+      tk_call(@id, 'expr', expression)
+      self
+    end
+
+    def index(idx, val=None)
+      number(tk_call(@id, 'index', idx, val))
+    end
+
+    def [](idx)
+      index(idx)
+    end
+
+    def []=(idx, val)
+      index(idx, val)
+    end
+
+    def length()
+      number(tk_call(@id, 'length'))
+    end
+
+    def length=(size)
+      number(tk_call(@id, 'length', size))
+    end
+
+    def merge(*vectors)
+      tk_call(@id, 'merge', *vectors)
+      self
+    end
+
+    def normalize(vec=None)
+      tk_call(@id, 'normalize', vec)
+      self
+    end
+
+    def notify(keyword)
+      tk_call(@id, 'notify', keyword)
+      self
+    end
+
+    def offset()
+      number(tk_call(@id, 'offset'))
+    end
+
+    def offset=(val)
+      number(tk_call(@id, 'offset', val))
+    end
+
+    def random()
+      tk_call(@id, 'random')
+    end
+
+    def populate(vector, density=None)
+      tk_call(@id, 'populate', vector, density)
+      self
+    end
+
+    def range(first, last=None)
+      list(tk_call(@id, 'range', first, last))
+    end
+
+    def search(val1, val2=None)
+      list(tk_call(@id, 'search', val1, val2))
+    end
+
+    def set(item)
+      tk_call(@id, 'set', item)
+      self
+    end
+
+    def seq(start, finish=None, step=None)
+      tk_call(@id, 'seq', start, finish, step)
+      self
+    end
+
+    def sort(*vectors)
+      tk_call(@id, 'sort', *vectors)
+      self
+    end
+
+    def sort_reverse(*vectors)
+      tk_call(@id, 'sort', '-reverse', *vectors)
+      self
+    end
+
+    def split(*vectors)
+      tk_call(@id, 'split', *vectors)
+      self
+    end
+
+    def variable(var)
+      tk_call(@id, 'variable', var)
+      self
+    end
+  end
+
+  class VectorAccess < Vector
+    def self.new(name)
+      return TkVar_ID_TBL[name] if TkVar_ID_TBL[name]
+      super(name, size=nil, keys={})
+    end
+
+    def initialize(vec_name)
+      @id = vec_name
+      TkVar_ID_TBL[@id] = self
+
+      @def_default = false
+      @default_val = nil
+
+      @trace_var  = nil
+      @trace_elem = nil
+      @trace_opts = nil
+
+      # teach Tk-ip that @id is global var
+      INTERP._invoke_without_enc('global', @id)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/watch.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/watch.rb
new file mode 100644
index 0000000000..ae5e50f126
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/watch.rb
@@ -0,0 +1,142 @@
+#
+#  tkextlib/blt/watch.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Watch < TkObject
+    extend TkCore
+
+    TkCommandNames = ['::blt::watch'.freeze].freeze
+
+    WATCH_ID_TBL = TkCore::INTERP.create_table
+    BLT_WATCH_ID = ['blt_watch_id'.freeze, '00000'.taint].freeze
+
+    def self.names(state = None)
+      tk_split_list(tk_call('::blt::watch', 'names', state)).collect{|name|
+        WATCH_ID_TBL[name] || name
+      }
+    end
+
+    def __numval_optkeys
+      ['maxlevel']
+    end
+    private :__numval_optkeys
+
+    def __boolval_optkeys
+      ['active']
+    end
+    private :__boolval_optkeys
+
+    def __config_cmd
+      ['::blt::watch', 'configure', self.path]
+    end
+    private :__config_cmd
+
+    def initialize(name = nil, keys = {})
+      if name.kind_of?(Hash)
+        keys = name
+        name = nil
+      end
+
+      if name
+        @id = name.to_s
+      else
+        @id = BLT_WATCH_ID.join(TkCore::INTERP._ip_id_)
+        BLT_WATCH_ID[1].succ!
+      end
+
+      @path = @id
+
+      WATCH_ID_TBL[@id] = self
+      tk_call('::blt::watch', 'create', @id, *hash_kv(keys))
+    end
+
+    def activate
+      tk_call('::blt::watch', 'activate', @id)
+      self
+    end
+    def deactivate
+      tk_call('::blt::watch', 'deactivate', @id)
+      self
+    end
+    def delete
+      tk_call('::blt::watch', 'delete', @id)
+      self
+    end
+    def info
+      ret = []
+      lst = tk_split_simplelist(tk_call('::blt::watch', 'info', @id))
+      until lst.empty?
+        k, v, *lst = lst
+        k = k[1..-1]
+        case k
+        when /^(#{__strval_optkeys.join('|')})$/
+          # do nothing
+
+        when /^(#{__numval_optkeys.join('|')})$/
+          begin
+            v = number(v)
+          rescue
+            v = nil
+          end
+
+        when /^(#{__numstrval_optkeys.join('|')})$/
+          v = num_or_str(v)
+
+        when /^(#{__boolval_optkeys.join('|')})$/
+          begin
+            v = bool(v)
+          rescue
+            v = nil
+          end
+
+        when /^(#{__listval_optkeys.join('|')})$/
+          v = simplelist(v)
+
+        when /^(#{__numlistval_optkeys.join('|')})$/
+          v = list(v)
+
+        else
+          if v.index('{')
+            v = tk_split_list(v)
+          else
+            v = tk_tcl2ruby(v)
+          end
+        end
+
+        ret << [k, v]
+      end
+
+      ret
+    end
+    def configinfo(slot = nil)
+      if slot
+        slot = slot.to_s
+        v = cget(slot)
+        if TkComm::GET_CONFIGINFO_AS_ARRAY
+          [slot, v]
+        else
+          {slot=>v}
+        end
+      else
+        if TkComm::GET_CONFIGINFO_AS_ARRAY
+          info
+        else
+          Hash[*(info.flatten)]
+        end
+      end
+    end
+    def cget(key)
+      key = key.to_s
+      begin
+        info.assoc(key)[1]
+      rescue
+        fail ArgumentError, "unknown option '#{key}'"
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/win_printer.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/win_printer.rb
new file mode 100644
index 0000000000..7ac6a0dcfc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/win_printer.rb
@@ -0,0 +1,61 @@
+#
+#  tkextlib/blt/win_printer.rb
+#
+#      *** Windows only ***
+#
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Printer < TkObject
+    extend TkCore
+
+    TkCommandNames = ['::blt::printer'.freeze].freeze
+
+    def self.enum(attribute)
+      simplelist(tk_call('::blt::printer', 'enum', attribute))
+    end
+
+    def self.names(pat=None)
+      simplelist(tk_call('::blt::printer', 'names', pat))
+    end
+
+    def self.open(printer)
+      self.new(printer)
+    end
+
+    #################################
+
+    def initialize(printer)
+      @printer_id = tk_call('::blt::printer', 'open', printer)
+    end
+
+    def close
+      tk_call('::blt::print', 'close', @printer_id)
+      self
+    end
+    def get_attrs(var)
+      tk_call('::blt::print', 'getattrs', @printer_id, var)
+      var
+    end
+    def set_attrs(var)
+      tk_call('::blt::print', 'setattrs', @printer_id, var)
+      self
+    end
+    def snap(win)
+      tk_call('::blt::print', 'snap', @printer_id, win)
+      self
+    end
+    def write(str)
+      tk_call('::blt::print', 'write', @printer_id, str)
+      self
+    end
+    def write_with_title(title, str)
+      tk_call('::blt::print', 'write', @printer_id, title, str)
+      self
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/blt/winop.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/winop.rb
new file mode 100644
index 0000000000..e371d28ab7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/blt/winop.rb
@@ -0,0 +1,107 @@
+#
+#  tkextlib/blt/winop.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module Winop
+    extend TkCore
+
+    TkCommandNames = ['::blt::winop'.freeze].freeze
+  end
+  WinOp = Winop
+end
+
+class << Tk::BLT::Winop
+  def changes(win)
+    tk_call('::blt::winop', 'changes', win)
+  end
+
+  def colormap(win)
+    Hash[*list(tk_call('::blt::winop', 'colormap', win))]
+  end
+
+  def convolve(src, dest, filter)
+    tk_call('::blt::winop', 'convolve', src, dest, filter)
+  end
+
+  def image_convolve(src, dest, filter)
+    tk_call('::blt::winop', 'image', 'convolve', src, dest, filter)
+  end
+  def image_gradient(photo, left, right, type)
+    tk_call('::blt::winop', 'image', 'gradient', photo, left, right, type)
+  end
+  def image_read_jpeg(file, photo)
+    tk_call('::blt::winop', 'image', 'readjpeg', file, photo)
+  end
+  def image_resample(src, dest, horiz_filter=None, vert_filter=None)
+    tk_call('::blt::winop', 'image', 'resample', 
+            src, dest, horiz_filter, vert_filter)
+  end
+  def image_rotate(src, dest, angle)
+    tk_call('::blt::winop', 'image', 'rotate', src, dest, angle)
+  end
+  def image_snap(win, photo, width=None, height=None)
+    tk_call('::blt::winop', 'image', 'snap', win, photo, width, height)
+  end
+  def image_subsample(src, dest, x, y, width, height, 
+                      horiz_filter=None, vert_filter=None)
+    tk_call('::blt::winop', 'image', 'subsample', 
+            src, dest, x, y, width, height, horiz_filter, vert_filter)
+  end
+
+  def quantize(src, dest, colors)
+    tk_call('::blt::winop', 'quantize', src, dest, colors)
+  end
+
+  def query()
+    tk_call('::blt::winop', 'query')
+  end
+
+  def read_jpeg(file, photo)
+    tk_call('::blt::winop', 'readjpeg', file, photo)
+  end
+
+  def resample(src, dest, horiz_filter=None, vert_filter=None)
+    tk_call('::blt::winop', 'resample', 
+            src, dest, horiz_filter, vert_filter)
+  end
+
+  def subsample(src, dest, x, y, width, height, 
+                horiz_filter=None, vert_filter=None)
+    tk_call('::blt::winop', 'subsample', 
+            src, dest, x, y, width, height, horiz_filter, vert_filter)
+  end
+
+  def raise(*wins)
+    tk_call('::blt::winop', 'raise', *wins)
+  end
+
+  def lower(*wins)
+    tk_call('::blt::winop', 'lower', *wins)
+  end
+
+  def map(*wins)
+    tk_call('::blt::winop', 'map', *wins)
+  end
+
+  def unmap(*wins)
+    tk_call('::blt::winop', 'unmap', *wins)
+  end
+
+  def move(win, x, y)
+    tk_call('::blt::winop', 'move', win, x, y)
+  end
+
+  def snap(win, photo)
+    tk_call('::blt::winop', 'snap', win, photo)
+  end
+
+  def warpto(win = None)
+    tk_call('::blt::winop', 'warpto', win)
+  end
+  alias warp_to warpto
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget.rb
new file mode 100644
index 0000000000..62631d8b54
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget.rb
@@ -0,0 +1,151 @@
+#
+#  BWidget extension support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/bwidget/setup.rb'
+
+# load all image format handlers
+#TkPackage.require('BWidget', '1.7')
+TkPackage.require('BWidget')
+
+module Tk
+  module BWidget
+    TkComm::TkExtlibAutoloadModule.unshift(self)
+
+    extend TkCore
+
+    LIBRARY = tk_call('set', '::BWIDGET::LIBRARY')
+
+    PACKAGE_NAME = 'BWidget'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('BWidget')
+      rescue
+        ''
+      end
+    end
+
+    def self.XLFDfont(cmd, *args)
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        args.concat(hash_kv(keys))
+      end
+      tk_call('BWidget::XLFDfont', cmd, *args)
+    end
+
+    def self.assert(exp, msg=None)
+      tk_call('BWidget::assert', exp, msg)
+    end
+
+    def self.badOptionString(type, value, list)
+      tk_call('BWidget::badOptionString', type, value, list)
+    end
+
+    def self.bindMouseWheel(widget)
+      tk_call('BWidget::bindMouseWheel', widget)
+    end
+
+    def self.classes(klass)
+      list(tk_call('BWidget::classes', klass))
+    end
+
+    def self.clonename(menu)
+      tk_call('BWidget::clonename', menu)
+    end
+
+    def self.focus(opt, path)
+      tk_call('BWidget::focus', opt, path)
+    end
+
+    def self.get3dcolor(path, bgcolor)
+      tk_call('BWidget::get3dcolor', path, bgcolor)
+    end
+
+    def self.getname(name)
+      tk_call('BWidget::getname', name)
+    end
+
+    def self.grab(opt, path)
+      tk_call('BWidget::grab', opt, path)
+    end
+
+    def self.inuse(klass)
+      bool(tk_call('BWidget::inuse', klass))
+    end
+
+    def self.library(klass, *klasses)
+      tk_call('BWidget::library', klass, *klasses)
+    end
+
+    def self.lreorder(list, neworder)
+      tk_call('BWidget::lreorder', list, neworder)
+    end
+
+    def self.parsetext(text)
+      tk_call('BWidget::parsetext', text)
+    end
+
+    def self.place(path, w, h, *args)
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        args.concat(hash_kv(keys))
+      end
+      tk_call('BWidget::place', path, w, h, *(args.flatten))
+    end
+
+    def self.write(file, mode=None)
+      tk_call('BWidget::write', file, mode)
+    end
+
+    def self.wrongNumArgsString(str)
+      tk_call('BWidget::wrongNumArgsString', str)
+    end
+
+    ####################################################
+
+    autoload :ArrowButton,     'tkextlib/bwidget/arrowbutton'
+    autoload :Bitmap,          'tkextlib/bwidget/bitmap'
+    autoload :Button,          'tkextlib/bwidget/button'
+    autoload :ButtonBox,       'tkextlib/bwidget/buttonbox'
+    autoload :ComboBox,        'tkextlib/bwidget/combobox'
+    autoload :Dialog,          'tkextlib/bwidget/dialog'
+    autoload :DragSite,        'tkextlib/bwidget/dragsite'
+    autoload :DropSite,        'tkextlib/bwidget/dropsite'
+    autoload :DynamicHelp,     'tkextlib/bwidget/dynamichelp'
+    autoload :Entry,           'tkextlib/bwidget/entry'
+    autoload :Label,           'tkextlib/bwidget/label'
+    autoload :LabelEntry,      'tkextlib/bwidget/labelentry'
+    autoload :LabelFrame,      'tkextlib/bwidget/labelframe'
+    autoload :ListBox,         'tkextlib/bwidget/listbox'
+    autoload :MainFrame,       'tkextlib/bwidget/mainframe'
+    autoload :MessageDlg,      'tkextlib/bwidget/messagedlg'
+    autoload :NoteBook,        'tkextlib/bwidget/notebook'
+    autoload :PagesManager,    'tkextlib/bwidget/pagesmanager'
+    autoload :PanedWindow,     'tkextlib/bwidget/panedwindow'
+    autoload :PasswdDlg,       'tkextlib/bwidget/passwddlg'
+    autoload :ProgressBar,     'tkextlib/bwidget/progressbar'
+    autoload :ProgressDlg,     'tkextlib/bwidget/progressdlg'
+    autoload :ScrollableFrame, 'tkextlib/bwidget/scrollableframe'
+    autoload :ScrolledWindow,  'tkextlib/bwidget/scrolledwindow'
+    autoload :ScrollView,      'tkextlib/bwidget/scrollview'
+    autoload :SelectColor,     'tkextlib/bwidget/selectcolor'
+    autoload :SelectFont,      'tkextlib/bwidget/selectfont'
+    autoload :Separator,       'tkextlib/bwidget/separator'
+    autoload :SpinBox,         'tkextlib/bwidget/spinbox'
+    autoload :TitleFrame,      'tkextlib/bwidget/titleframe'
+    autoload :Tree,            'tkextlib/bwidget/tree'
+    autoload :Widget,          'tkextlib/bwidget/widget'
+
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
new file mode 100644
index 0000000000..770e5e9ef1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
@@ -0,0 +1,21 @@
+#
+#  tkextlib/bwidget/arrowbutton.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/button'
+
+module Tk
+  module BWidget
+    class ArrowButton < Tk::BWidget::Button
+    end
+  end
+end
+
+class Tk::BWidget::ArrowButton
+  TkCommandNames = ['ArrowButton'.freeze].freeze
+  WidgetClassName = 'ArrowButton'.freeze
+  WidgetClassNames[WidgetClassName] = self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/bitmap.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/bitmap.rb
new file mode 100644
index 0000000000..6cfde203e8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/bitmap.rb
@@ -0,0 +1,21 @@
+#
+#  tkextlib/bwidget/bitmap.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tk/image'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class Bitmap < TkPhotoImage
+    end
+  end
+end
+
+class Tk::BWidget::Bitmap
+  def initialize(name)
+    @path = tk_call_without_enc('Bitmap::get', name)
+    Tk_IMGTBL[@path] = self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/button.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/button.rb
new file mode 100644
index 0000000000..4a9d4a7948
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/button.rb
@@ -0,0 +1,31 @@
+#
+#  tkextlib/bwidget/button.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/button'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class Button < TkButton
+    end
+  end
+end
+
+class Tk::BWidget::Button
+  TkCommandNames = ['Button'.freeze].freeze
+  WidgetClassName = 'Button'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'helptext'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/buttonbox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
new file mode 100644
index 0000000000..ef999239f9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
@@ -0,0 +1,78 @@
+#
+#  tkextlib/bwidget/buttonbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/button'
+
+module Tk
+  module BWidget
+    class ButtonBox < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::ButtonBox
+  TkCommandNames = ['ButtonBox'.freeze].freeze
+  WidgetClassName = 'ButtonBox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  include TkItemConfigMethod
+
+  def __boolval_optkeys
+    super() << 'homogeneous'
+  end
+  private :__boolval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::BWidget::Button)
+      name = tagOrId[:name]
+      return index(name) unless name.empty?
+    end
+    if tagOrId.kind_of?(TkButton)
+      return index(tagOrId[:text])
+    end
+    # index(tagOrId.to_s)
+    index(_get_eval_string(tagOrId))
+  end
+
+  def add(keys={}, &b)
+    win = window(tk_send('add', *hash_kv(keys)))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def delete(idx)
+    tk_send('delete', tagid(idx))
+    self
+  end
+
+  def index(idx)
+    if idx.kind_of?(Tk::BWidget::Button)
+      name = idx[:name]
+      idx = name unless name.empty?
+    end
+    if idx.kind_of?(TkButton)
+      idx = idx[:text]
+    end
+    number(tk_send('index', idx.to_s))
+  end
+
+  def insert(idx, keys={}, &b)
+    win = window(tk_send('insert', tagid(idx), *hash_kv(keys)))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def invoke(idx)
+    tk_send('invoke', tagid(idx))
+    self
+  end
+
+  def set_focus(idx)
+    tk_send('setfocus', tagid(idx))
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/combobox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/combobox.rb
new file mode 100644
index 0000000000..31f71c3aaf
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/combobox.rb
@@ -0,0 +1,45 @@
+#
+#  tkextlib/bwidget/combobox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/entry'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/listbox'
+require 'tkextlib/bwidget/spinbox'
+
+module Tk
+  module BWidget
+    class ComboBox < Tk::BWidget::SpinBox
+    end
+  end
+end
+
+class Tk::BWidget::ComboBox
+  include Scrollable
+
+  TkCommandNames = ['ComboBox'.freeze].freeze
+  WidgetClassName = 'ComboBox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def get_listbox(&b)
+    win = window(tk_send_without_enc('getlistbox'))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def icursor(idx)
+    tk_send_without_enc('icursor', idx)
+  end
+
+  def post
+    tk_send_without_enc('post')
+    self
+  end
+
+  def unpost
+    tk_send_without_enc('unpost')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/dialog.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/dialog.rb
new file mode 100644
index 0000000000..2790d88d24
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/dialog.rb
@@ -0,0 +1,157 @@
+#
+#  tkextlib/bwidget/dialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/buttonbox'
+
+module Tk
+  module BWidget
+    class Dialog < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::Dialog
+  TkCommandNames = ['Dialog'.freeze].freeze
+  WidgetClassName = 'Dialog'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  include TkItemConfigMethod
+
+  def __strval_optkeys
+    super() << 'title'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'transient' << 'homogeneous'
+  end
+  private :__boolval_optkeys
+
+  def initialize(parent=nil, keys=nil)
+    @relative = ''
+    if parent.kind_of?(Hash)
+      keys = _symbolkey2str(parent)
+      @relative = keys['parent'] if keys.key?('parent')
+      @relative = keys.delete('relative') if keys.key?('relative')
+      super(keys)
+    elsif keys
+      keys = _symbolkey2str(keys)
+      @relative = keys.delete('parent') if keys.key?('parent')
+      @relative = keys.delete('relative') if keys.key?('relative')
+      super(parent, keys)
+    else
+      super(parent)
+    end
+  end
+
+  def create_self(keys)
+    cmd = self.class::TkCommandNames[0]
+    if keys and keys != None
+      tk_call_without_enc(cmd, @path, '-parent', @relative, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(cmd, @path, '-parent', @relative)
+    end
+  end
+
+  def cget(slot)
+    if slot.to_s == 'relative'
+      super('parent')
+    else
+      super(slot)
+    end
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of?(Hash)
+      slot = _symbolkey2str(slot)
+      slot['parent'] = slot.delete('relative') if slot.key?('relative')
+      super(slot)
+    else
+      if slot.to_s == 'relative'
+        super('parent', value)
+      else
+        super(slot, value)
+      end
+    end
+  end
+
+  def configinfo(slot=nil)
+    if slot
+      if slot.to_s == 'relative'
+        super('parent')
+      else
+        super(slot)
+      end
+    else
+      ret = super()
+      if TkComm::GET_CONFIGINFO_AS_ARRAY
+        ret << ['relative', 'parent']
+      else
+        ret['relative'] = 'parent'
+      end
+    end
+  end
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::BWidget::Button)
+      name = tagOrId[:name]
+      return index(name) unless name.empty?
+    end
+    if tagOrId.kind_of?(TkButton)
+      return index(tagOrId[:text])
+    end
+    # index(tagOrId.to_s)
+    index(_get_eval_string(tagOrId))
+  end
+
+  def add(keys={}, &b)
+    win = window(tk_send('add', *hash_kv(keys)))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def get_frame(&b)
+    win = window(tk_send('getframe'))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def get_buttonbox(&b)
+    win = window(@path + '.bbox')
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def draw(focus_win=None)
+    tk_send('draw', focus_win)
+  end
+
+  def enddialog(ret)
+    tk_send('enddialog', ret)
+  end
+
+  def index(idx)
+    get_buttonbox.index(idx)
+  end
+
+  def invoke(idx)
+    tk_send('invoke', tagid(idx))
+    self
+  end
+
+  def set_focus(idx)
+    tk_send('setfocus', tagid(idx))
+    self
+  end
+
+  def withdraw
+    tk_send('withdraw')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/dragsite.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/dragsite.rb
new file mode 100644
index 0000000000..4d4de1780c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/dragsite.rb
@@ -0,0 +1,31 @@
+#
+#  tkextlib/bwidget/dragsite.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    module DragSite
+    end
+  end
+end
+
+module Tk::BWidget::DragSite
+  include Tk
+  extend Tk
+
+  def self.include(klass, type, event)
+    tk_call('DragSite::include', klass, type, event)
+  end
+
+  def self.register(path, keys={})
+    tk_call('DragSite::register', path, *hash_kv(keys))
+  end
+
+  def self.set_drag(path, subpath, initcmd, endcmd, force=None)
+    tk_call('DragSite::setdrag', path, subpath, initcmd, endcmd, force)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/dropsite.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/dropsite.rb
new file mode 100644
index 0000000000..e5e98fbc51
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/dropsite.rb
@@ -0,0 +1,39 @@
+#
+#  tkextlib/bwidget/dropsite.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    module DropSite
+    end
+  end
+end
+
+module Tk::BWidget::DropSite
+  include Tk
+  extend Tk
+
+  def self.include(klass, type)
+    tk_call('DropSite::include', klass, type)
+  end
+
+  def self.register(path, keys={})
+    tk_call('DropSite::register', path, *hash_kv(keys))
+  end
+
+  def self.set_cursor(cursor)
+    tk_call('DropSite::setcursor', cursor)
+  end
+
+  def self.set_drop(path, subpath, dropover, drop, force=None)
+    tk_call('DropSite::setdrop', path, subpath, dropover, drop, force)
+  end
+
+  def self.set_operation(op)
+    tk_call('DropSite::setoperation', op)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb
new file mode 100644
index 0000000000..224304f2ab
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb
@@ -0,0 +1,56 @@
+#
+#  tkextlib/bwidget/dynamichelp.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    module DynamicHelp
+    end
+  end
+end
+
+module Tk::BWidget::DynamicHelp
+  include Tk
+  extend Tk
+
+  def self.__pathname
+    'DynamicHelp::configure'
+  end
+
+  def __strval_optkeys
+    super() << 'topbackground'
+  end
+  private :__strval_optkeys
+
+  def self.__cget_cmd
+    ['DynamicHelp::configure']
+  end
+
+  def self.__config_cmd
+    ['DynamicHelp::configure']
+  end
+
+  def self.cget(slot)
+    self.current_configinfo(slot).values[0]
+  end
+
+  def self.add(widget, keys={})
+    tk_call('DynamicHelp::add', widget, *hash_kv(keys))
+  end
+
+  def self.delete(widget)
+    tk_call('DynamicHelp::delete', widget)
+  end
+
+  def self.include(klass, type)
+    tk_call('DynamicHelp::include', klass, type)
+  end
+
+  def self.sethelp(path, subpath, force=None)
+    tk_call('DynamicHelp::sethelp', path, subpath, force)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/entry.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/entry.rb
new file mode 100644
index 0000000000..aafb4aa7ff
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/entry.rb
@@ -0,0 +1,43 @@
+#
+#  tkextlib/bwidget/entry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/entry'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class Entry < TkEntry
+    end
+  end
+end
+
+class Tk::BWidget::Entry
+  include Scrollable
+
+  TkCommandNames = ['Entry'.freeze].freeze
+  WidgetClassName = 'Entry'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'helptext' << 'insertbackground'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'dragenabled' << 'dropenabled' << 'editable'
+  end
+  private :__boolval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+
+  def invoke
+    tk_send_without_enc('invoke')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/label.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/label.rb
new file mode 100644
index 0000000000..ce10ecaf8b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/label.rb
@@ -0,0 +1,41 @@
+#
+#  tkextlib/bwidget/label.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/label'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class Label < TkLabel
+    end
+  end
+end
+
+class Tk::BWidget::Label
+  TkCommandNames = ['Label'.freeze].freeze
+  WidgetClassName = 'Label'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'helptext'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'dragenabled' << 'dropenabled'
+  end
+  private :__boolval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+
+  def set_focus
+    tk_send_without_enc('setfocus')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/labelentry.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/labelentry.rb
new file mode 100644
index 0000000000..931feb9b48
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/labelentry.rb
@@ -0,0 +1,80 @@
+#
+#  tkextlib/bwidget/labelentry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/entry'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/labelframe'
+require 'tkextlib/bwidget/entry'
+
+module Tk
+  module BWidget
+    class LabelEntry < TkEntry
+    end
+  end
+end
+
+class Tk::BWidget::LabelEntry
+  include Scrollable
+
+  TkCommandNames = ['LabelEntry'.freeze].freeze
+  WidgetClassName = 'LabelEntry'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'helptext' << 'insertbackground' << 'entryfg' << 'entrybg'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+
+  def __font_optkeys
+    super() << 'labelfont'
+  end
+  private :__font_optkeys
+
+  #def entrybind(*args)
+  #  _bind([path, 'bind'], *args)
+  #  self
+  #end
+  def entrybind(context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([path, 'bind'], context, cmd, *args)
+    self
+  end
+
+  #def entrybind_append(*args)
+  #  _bind_append([path, 'bind'], *args)
+  #  self
+  #end
+  def entrybind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([path, 'bind'], context, cmd, *args)
+    self
+  end
+
+  def entrybind_remove(*args)
+    _bind_remove([path, 'bind'], *args)
+    self
+  end
+
+  def entrybindinfo(*args)
+    _bindinfo([path, 'bind'], *args)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/labelframe.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/labelframe.rb
new file mode 100644
index 0000000000..f7b267eebb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/labelframe.rb
@@ -0,0 +1,46 @@
+#
+#  tkextlib/bwidget/labelframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/label'
+
+module Tk
+  module BWidget
+    class LabelFrame < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::LabelFrame
+  TkCommandNames = ['LabelFrame'.freeze].freeze
+  WidgetClassName = 'LabelFrame'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'helptext'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'dragenabled' << 'dropenabled'
+  end
+  private :__boolval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+
+  def self.align(*args)
+    tk_call('LabelFrame::align', *args)
+  end
+  def get_frame(&b)
+    win = window(tk_send_without_enc('getframe'))
+    win.instance_eval(&b) if b
+    win
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/listbox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/listbox.rb
new file mode 100644
index 0000000000..1267500661
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/listbox.rb
@@ -0,0 +1,339 @@
+#
+#  tkextlib/bwidget/listbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/canvas'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class ListBox < TkWindow
+      # is NOT a subclass of a listbox widget class.
+      # because it constructed on a canvas widget. 
+
+      class Item < TkObject
+      end
+    end
+  end
+end
+
+class Tk::BWidget::ListBox
+  include TkItemConfigMethod
+  include Scrollable
+
+  TkCommandNames = ['ListBox'.freeze].freeze
+  WidgetClassName = 'ListBox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  class Event_for_Items < TkEvent::Event
+    def self._get_extra_args_tbl
+      [ 
+        TkComm.method(:string)   # item idenfier
+      ]
+    end
+  end
+
+  def __boolval_optkeys
+    super() << 'autofocus' << 'dragenabled' << 'dropenabled' << 'selectfill'
+  end
+  private :__boolval_optkeys
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::BWidget::ListBox::Item)
+      tag.id
+    else
+      # tag
+      _get_eval_string(tag)
+    end
+  end
+
+  #def imagebind(*args)
+  #  _bind_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+  #  self
+  #end
+  def imagebind(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_for_event_class(Event_for_Items, [path, 'bindImage'], 
+                          context, cmd, *args)
+    self
+  end
+
+  #def imagebind_append(*args)
+  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+  #  self
+  #end
+  def imagebind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], 
+                                 context, cmd, *args)
+    self
+  end
+
+  def imagebind_remove(*args)
+    _bind_remove_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+    self
+  end
+
+  def imagebindinfo(*args)
+    _bindinfo_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+  end
+
+  #def textbind(*args)
+  #  _bind_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+  #  self
+  #end
+  def textbind(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_for_event_class(Event_for_Items, [path, 'bindText'], 
+                          context, cmd, *args)
+    self
+  end
+
+  #def textbind_append(*args)
+  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+  #  self
+  #end
+  def textbind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], 
+                                 context, cmd, *args)
+    self
+  end
+
+  def textbind_remove(*args)
+    _bind_remove_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+    self
+  end
+
+  def textbindinfo(*args)
+    _bindinfo_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+  end
+
+  def delete(*args)
+    tk_send('delete', *args)
+    self
+  end
+
+  def edit(item, text, *args)
+    tk_send('edit', tagid(item), text, *args)
+    self
+  end
+
+  def exist?(item)
+    bool(tk_send('exists', tagid(item)))
+  end
+
+  def index(item)
+    num_or_str(tk_send('index', tagid(item)))
+  end
+
+  def insert(idx, item, keys={})
+    tk_send('insert', idx, tagid(item), *hash_kv(keys))
+    self
+  end
+
+  def get_item(idx)
+    tk_send('items', idx)
+  end
+
+  def items(first=None, last=None)
+    list(tk_send('items', first, last))
+  end
+
+  def move(item, idx)
+    tk_send('move', tagid(item), idx)
+    self
+  end
+
+  def reorder(neworder)
+    tk_send('reorder', neworder)
+    self
+  end
+
+  def see(item)
+    tk_send('see', tagid(item))
+    self
+  end
+
+  def selection_clear
+    tk_send_without_enc('selection', 'clear')
+    self
+  end
+
+  def selection_set(*args)
+    tk_send_without_enc('selection', 'set', 
+                        *(args.collect{|item| tagid(item)}))
+    self
+  end
+
+  def selection_add(*args)
+    tk_send_without_enc('selection', 'add', 
+                        *(args.collect{|item| tagid(item)}))
+    self
+  end
+
+  def selection_remove(*args)
+    tk_send_without_enc('selection', 'remove', 
+                        *(args.collect{|item| tagid(item)}))
+    self
+  end
+
+  def selection_get(*args)
+    simplelist(tk_send_without_enc('selection', 'get')).collect{|item|
+      Tk::BWidget::ListBox::Item.id2obj(self, item)
+    }
+  end
+end
+
+class Tk::BWidget::ListBox::Item
+  include TkTreatTagFont
+
+  ListItem_TBL = TkCore::INTERP.create_table
+  ListItem_ID = ['bw:item'.freeze, '00000'.taint].freeze
+
+  TkCore::INTERP.init_ip_env{ ListItem_TBL.clear }
+
+  def self.id2obj(lbox, id)
+    lpath = lbox.path
+    return id unless ListItem_TBL[lpath]
+    ListItem_TBL[lpath][id]? ListItem_TBL[lpath][id]: id
+  end
+
+  def initialize(lbox, *args)
+    if lbox.kind_of?(Tk::BWidget::ListBox)
+      @listbox = lbox
+    else
+      fail RuntimeError, 
+        "expect Tk::BWidget::ListBox or Tk::BWidget::ListBox::Item for 1st argument"
+    end
+
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+    else
+      keys = {}
+    end
+
+    index = keys.delete('index')
+    unless args.empty?
+      index = args.shift
+    end
+    index = 'end' unless index
+
+    unless args.empty?
+      fail RuntimeError, 'too much arguments'
+    end
+
+    @lpath = @listbox.path
+
+    if keys.key?('itemname')
+      @path = @id = keys.delete('itemname')
+    else
+      @path = @id = ListItem_ID.join(TkCore::INTERP._ip_id_)
+      ListItem_ID[1].succ!
+    end
+
+    ListItem_TBL[@id] = self
+    ListItem_TBL[@lpath] = {} unless ListItem_TBL[@lpath]
+    ListItem_TBL[@lpath][@id] = self
+
+    @listbox.insert(index, @id, keys)
+  end
+
+  def listbox
+    @listbox
+  end
+
+  def id
+    @id
+  end
+
+  def [](key)
+    cget(key)
+  end
+
+  def []=(key, val)
+    configure(key, val)
+    val
+  end
+
+  def cget(key)
+    @listbox.itemcget(@id, key)
+  end
+
+  def configure(key, val=None)
+    @listbox.itemconfigure(@id, key, val)
+  end
+
+  def configinfo(key=nil)
+    @listbox.itemconfiginfo(@id, key)
+  end
+
+  def current_configinfo(key=nil)
+    @listbox.current_itemconfiginfo(@id, key)
+  end
+
+  def delete
+    @listbox.delete(@id)
+    self
+  end
+
+  def edit(*args)
+    @listbox.edit(@id, *args)
+    self
+  end
+
+  def exist?
+    @listbox.exist?(@id)
+  end
+
+  def index
+    @listbox.index(@id)
+  end
+
+  def move(index)
+    @listbox.move(@id, index)
+  end
+
+  def see
+    @listbox.see(@id)
+  end
+
+  def selection_add
+    @listbox.selection_add(@id)
+  end
+
+  def selection_remove
+    @listbox.selection_remove(@id)
+  end
+
+  def selection_set
+    @listbox.selection_set(@id)
+  end
+
+  def selection_toggle
+    @listbox.selection_toggle(@id)
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/mainframe.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/mainframe.rb
new file mode 100644
index 0000000000..c54e878557
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/mainframe.rb
@@ -0,0 +1,92 @@
+#
+#  tkextlib/bwidget/mainframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/progressbar'
+
+module Tk
+  module BWidget
+    class MainFrame < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::MainFrame
+  TkCommandNames = ['MainFrame'.freeze].freeze
+  WidgetClassName = 'MainFrame'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'progressfg'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'progressvar'
+  end
+  private :__tkvariable_optkeys
+
+  def __val2ruby_optkeys  # { key=>proc, ... }
+    # The method is used to convert a opt-value to a ruby's object.
+    # When get the value of the option "key", "proc.call(value)" is called.
+    {
+      'menu'=>proc{|v| simplelist(v).collect!{|elem| simplelist(v)}}
+    }
+  end
+  private :__val2ruby_optkeys
+
+  def add_indicator(keys={}, &b)
+    win = window(tk_send('addindicator', *hash_kv(keys)))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def add_toolbar(&b)
+    win = window(tk_send('addtoolbar'))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def get_frame(&b)
+    win = window(tk_send('getframe'))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def get_indicator(idx, &b)
+    win = window(tk_send('getindicator', idx))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def get_menu(menu_id, &b)
+    win = window(tk_send('getmenu', menu_id))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def get_toolbar(idx, &b)
+    win = window(tk_send('gettoolbar', idx))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def set_menustate(tag, state)
+    tk_send('setmenustate', tag, state)
+    self
+  end
+
+  def show_statusbar(name)
+    tk_send('showstatusbar', name)
+    self
+  end
+
+  def show_toolbar(idx, mode)
+    tk_send('showtoolbar', idx, mode)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/messagedlg.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
new file mode 100644
index 0000000000..9c946d0630
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
@@ -0,0 +1,178 @@
+#
+#  tkextlib/bwidget/messagedlg.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/dialog.rb'
+
+module Tk
+  module BWidget
+    class MessageDlg < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::MessageDlg
+  TkCommandNames = ['MessageDlg'.freeze].freeze
+  WidgetClassName = 'MessageDlg'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def initialize(parent=nil, keys=nil)
+    @relative = ''
+    if parent.kind_of?(Hash)
+      keys = _symbolkey2str(parent)
+      @relative = keys['parent'] if keys.key?('parent')
+      @relative = keys.delete('relative') if keys.key?('relative')
+      super(keys)
+    elsif keys
+      keys = _symbolkey2str(keys)
+      @relative = keys.delete('parent') if keys.key?('parent')
+      @relative = keys.delete('relative') if keys.key?('relative')
+      super(parent, keys)
+    else
+      super(parent)
+    end
+  end
+
+  def create_self(keys)
+    # NOT create widget.
+    # Because the widget no longer exist when returning from creation.
+    @keys = _symbolkey2str(keys).update('parent'=>@relative)
+    @info = nil
+  end
+  private :create_self
+
+  def __strval_optkeys
+    super() << 'message' << 'title'
+  end
+  private :__strval_optkeys
+
+  def __listval_optkeys
+    super() << 'buttons'
+  end
+  private :__listval_optkeys
+
+  def cget(slot)
+    slot = slot.to_s
+    if slot == 'relative'
+      slot = 'parent'
+    end
+    if winfo_exist?
+      val = super(slot)
+      @keys[slot] = val
+    end
+    @keys[slot]
+  end
+
+  def configure(slot, value=None)
+    if winfo_exist?
+      super(slot, value)
+    end
+    if slot.kind_of?(Hash)
+      slot = _symbolkey2str(slot)
+      slot['parent'] = slot.delete('relative') if slot.key?('relative')
+      @keys.update(slot)
+
+      if @info
+        # update @info
+        slot.each{|k, v|
+          if TkComm::GET_CONFIGINFO_AS_ARRAY
+            if (inf = @info.assoc(k))
+              inf[-1] = v
+            else
+              @info << [k, '', '', '', v]
+            end
+          else
+            if (inf = @info[k])
+              inf[-1] = v
+            else
+              @info[k] = ['', '', '', v]
+            end
+          end
+        }
+      end
+
+    else # ! Hash
+      slot = slot.to_s
+      slot = 'parent' if slot == 'relative'
+      @keys[slot] = value
+
+      if @info
+        # update @info
+        if TkComm::GET_CONFIGINFO_AS_ARRAY
+          if (inf = @info.assoc(slot))
+            inf[-1] = value
+          else
+            @info << [slot, '', '', '', value]
+          end
+        else
+          if (inf = @info[slot])
+            inf[-1] = value
+          else
+            @info[slot] = ['', '', '', value]
+          end
+        end
+      end
+    end
+
+    self
+  end
+
+  def configinfo(slot=nil)
+    if winfo_exist?
+      @info = super()
+      if TkComm::GET_CONFIGINFO_AS_ARRAY
+        @info << ['relative', 'parent']
+      else
+        @info['relative'] = 'parent'
+      end
+    end
+
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if @info
+        if winfo_exist?
+          # update @keys
+          @info.each{|inf| @keys[inf[0]] = inf[-1] if inf.size > 2 }
+        end
+      else
+        @info = []
+        @keys.each{|k, v|
+          @info << [k, '', '', '', v]
+        }
+        @info << ['relative', 'parent']
+      end
+
+      if slot
+        @info.asoc(slot.to_s).dup
+      else
+        @info.dup
+      end
+
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if @info
+        if winfo_exist?
+          # update @keys
+          @info.each{|k, inf| @keys[k] = inf[-1] if inf.size > 2 }
+        end
+      else
+        @info = {}
+        @keys.each{|k, v|
+          @info[k] = ['', '', '', v]
+        }
+        @info['relative'] = 'parent'
+      end
+
+      if slot
+        @info[slot.to_s].dup
+      else
+        @info.dup
+      end
+    end
+  end
+
+  def create
+    num_or_str(tk_call(self.class::TkCommandNames[0], @path, *hash_kv(@keys)))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/notebook.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/notebook.rb
new file mode 100644
index 0000000000..5146d4915d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/notebook.rb
@@ -0,0 +1,148 @@
+#
+#  tkextlib/bwidget/notebook.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class NoteBook < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::NoteBook
+  include TkItemConfigMethod
+
+  TkCommandNames = ['NoteBook'.freeze].freeze
+  WidgetClassName = 'NoteBook'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  class Event_for_Tabs < TkEvent::Event
+    def self._get_extra_args_tbl
+      [ 
+        TkComm.method(:string)   # page idenfier
+      ]
+    end
+  end
+
+  def __boolval_optkeys
+    super() << 'homogeneous'
+  end
+  private :__boolval_optkeys
+
+  def tagid(id)
+    if id.kind_of?(TkWindow)
+      #id.path
+      id.epath
+    elsif id.kind_of?(TkObject)
+      id.to_eval
+    else
+      # id.to_s
+      _get_eval_string(id)
+    end
+  end
+
+  #def tabbind(*args)
+  #  _bind_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
+  #  self
+  #end
+  def tabbind(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_for_event_class(Event_for_Tabs, [path, 'bindtabs'], 
+                          context, cmd, *args)
+    self
+  end
+
+  #def tabbind_append(*args)
+  #  _bind_append_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
+  #  self
+  #end
+  def tabbind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append_for_event_class(Event_for_Tabs, [path, 'bindtabs'], 
+                                 context, cmd, *args)
+    self
+  end
+
+  def tabbind_remove(*args)
+    _bind_remove_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
+    self
+  end
+
+  def tabbindinfo(*args)
+    _bindinfo_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
+  end
+
+  def add(page, &b)
+    win = window(tk_send('add', tagid(page)))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def compute_size
+    tk_send('compute_size')
+    self
+  end
+
+  def delete(page, destroyframe=None)
+    tk_send('delete', tagid(page), destroyframe)
+    self
+  end
+
+  def get_frame(page, &b)
+    win = window(tk_send('getframe', tagid(page)))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def index(page)
+    num_or_str(tk_send('index', tagid(page)))
+  end
+
+  def insert(index, page, keys={}, &b)
+    win = window(tk_send('insert', index, tagid(page), *hash_kv(keys)))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def move(page, index)
+    tk_send('move', tagid(page), index)
+    self
+  end
+
+  def get_page(page)
+    tk_send('pages', page)
+  end
+
+  def pages(first=None, last=None)
+    list(tk_send('pages', first, last))
+  end
+
+  def raise(page=nil)
+    if page
+      tk_send('raise', page)
+      self
+    else
+      tk_send('raise')
+    end
+  end
+
+  def see(page)
+    tk_send('see', page)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
new file mode 100644
index 0000000000..fc01284be6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
@@ -0,0 +1,61 @@
+#
+#  tkextlib/bwidget/pagesmanager.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class PagesManager < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::PagesManager
+  TkCommandNames = ['PagesManager'.freeze].freeze
+  WidgetClassName = 'PagesManager'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def tagid(id)
+    # id.to_s
+    _get_eval_string(id)
+  end
+
+  def add(page, &b)
+    win = window(tk_send('add', tagid(page)))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def compute_size
+    tk_send('compute_size')
+    self
+  end
+
+  def delete(page)
+    tk_send('delete', tagid(page))
+    self
+  end
+
+  def get_frame(page, &b)
+    win = window(tk_send('getframe', tagid(page)))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def get_page(page)
+    tk_send('pages', page)
+  end
+
+  def pages(first=None, last=None)
+    list(tk_send('pages', first, last))
+  end
+
+  def raise(page=None)
+    tk_send('raise', page)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/panedwindow.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
new file mode 100644
index 0000000000..19982c6095
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
@@ -0,0 +1,31 @@
+#
+#  tkextlib/bwidget/panedwindow.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class PanedWindow < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::PanedWindow
+  TkCommandNames = ['PanedWindow'.freeze].freeze
+  WidgetClassName = 'PanedWindow'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def add(keys={})
+    window(tk_send('add', *hash_kv(keys)))
+  end
+
+  def get_frame(idx, &b)
+    win = window(tk_send_without_enc('getframe', idx))
+    win.instance_eval(&b) if b
+    win
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/panelframe.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/panelframe.rb
new file mode 100644
index 0000000000..13f8817d74
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/panelframe.rb
@@ -0,0 +1,51 @@
+#
+#  tkextlib/bwidget/panelframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class PanelFrame < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::PanelFrame
+  TkCommandNames = ['PanelFrame'.freeze].freeze
+  WidgetClassName = 'PanelFrame'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() + ['panelforeground', 'panelbackground']
+  end
+  private :__strval_optkeys
+
+  def add(win, keys={})
+    tk_send('add', win, keys)
+    self
+  end
+
+  def delete(*wins)
+    tk_send('delete', *wins)
+    self
+  end
+
+  def get_frame(&b)
+    win = window(tk_send_without_enc('getframe'))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def items
+    list(tk_send('items'))
+  end
+
+  def remove(*wins)
+    tk_send('remove', *wins)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/passwddlg.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
new file mode 100644
index 0000000000..0b635d97bb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
@@ -0,0 +1,44 @@
+#
+#  tkextlib/bwidget/passwddlg.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/messagedlg'
+
+module Tk
+  module BWidget
+    class PasswdDlg < Tk::BWidget::MessageDlg
+    end
+  end
+end
+
+class Tk::BWidget::PasswdDlg
+  TkCommandNames = ['PasswdDlg'.freeze].freeze
+  WidgetClassName = 'PasswdDlg'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'loginhelptext' << 'loginlabel' << 'logintext' << 
+      'passwdlabel' << 'passwdtext'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'passwdeditable' << 'homogeneous'
+  end
+  private :__boolval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'loginhelpvar' << 'logintextvariable' << 
+      'passwdhelpvar' << 'passwdtextvariable'
+  end
+  private :__tkvariable_optkeys
+
+  def create
+    login, passwd = simplelist(tk_call(self.class::TkCommandNames[0], 
+                                       @path, *hash_kv(@keys)))
+    [login, passwd]
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/progressbar.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/progressbar.rb
new file mode 100644
index 0000000000..0253ce2ada
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/progressbar.rb
@@ -0,0 +1,20 @@
+#
+#  tkextlib/bwidget/progressbar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class ProgressBar < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::ProgressBar
+  TkCommandNames = ['ProgressBar'.freeze].freeze
+  WidgetClassName = 'ProgressBar'.freeze
+  WidgetClassNames[WidgetClassName] = self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/progressdlg.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
new file mode 100644
index 0000000000..fbf00f3b00
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
@@ -0,0 +1,54 @@
+#
+#  tkextlib/bwidget/progressdlg.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/variable'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/progressbar'
+require 'tkextlib/bwidget/messagedlg'
+
+module Tk
+  module BWidget
+    class ProgressDlg < Tk::BWidget::MessageDlg
+    end
+  end
+end
+
+class Tk::BWidget::ProgressDlg
+  TkCommandNames = ['ProgressDlg'.freeze].freeze
+  WidgetClassName = 'ProgressDlg'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def create_self(keys)
+    # NOT create widget for reusing the object
+    super(keys)
+    @keys['textvariable'] = TkVariable.new unless @keys.key?('textvariable')
+    @keys['variable']     = TkVariable.new unless @keys.key?('variable')
+  end
+
+  def textvariable
+    @keys['textvariable']
+  end
+
+  def text
+    @keys['textvariable'].value
+  end
+
+  def text= (txt)
+    @keys['textvariable'].value = txt
+  end
+
+  def variable
+    @keys['variable']
+  end
+
+  def value
+    @keys['variable'].value
+  end
+
+  def value= (val)
+    @keys['variable'].value = val
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
new file mode 100644
index 0000000000..a3986681a5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
@@ -0,0 +1,34 @@
+#
+#  tkextlib/bwidget/scrollableframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class ScrollableFrame < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::ScrollableFrame
+  include Scrollable
+
+  TkCommandNames = ['ScrollableFrame'.freeze].freeze
+  WidgetClassName = 'ScrollableFrame'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def get_frame(&b)
+    win = window(tk_send_without_enc('getframe'))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def see(win, vert=None, horiz=None)
+    tk_send_without_enc('see', win, vert, horiz)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
new file mode 100644
index 0000000000..e9e53235b7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
@@ -0,0 +1,32 @@
+#
+#  tkextlib/bwidget/scrolledwindow.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class ScrolledWindow < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::ScrolledWindow
+  TkCommandNames = ['ScrolledWindow'.freeze].freeze
+  WidgetClassName = 'ScrolledWindow'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def get_frame(&b)
+    win = window(tk_send_without_enc('getframe'))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def set_widget(win)
+    tk_send_without_enc('setwidget', win)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/scrollview.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/scrollview.rb
new file mode 100644
index 0000000000..0546af2c43
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/scrollview.rb
@@ -0,0 +1,25 @@
+#
+#  tkextlib/bwidget/scrollview.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class ScrollView < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::ScrollView
+  TkCommandNames = ['ScrollView'.freeze].freeze
+  WidgetClassName = 'ScrollView'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'fill'
+  end
+  private :__strval_optkeys
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/selectcolor.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
new file mode 100644
index 0000000000..742a84cd84
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
@@ -0,0 +1,45 @@
+#
+#  tkextlib/bwidget/selectcolor.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/messagedlg'
+
+module Tk
+  module BWidget
+    class SelectColor < Tk::BWidget::MessageDlg
+    end
+  end
+end
+
+class Tk::BWidget::SelectColor
+  extend Tk
+
+  TkCommandNames = ['SelectColor'.freeze].freeze
+  WidgetClassName = 'SelectColor'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def dialog(keys={})
+    newkeys = @keys.dup
+    newkeys.update(_symbolkey2str(keys))
+    tk_call('SelectColor::dialog', @path, *hash_kv(newkeys))
+  end
+
+  def menu(*args)
+    if args[-1].kind_of?(Hash)
+      keys = args.pop
+    else
+      keys = {}
+    end
+    place = args.flatten
+    newkeys = @keys.dup
+    newkeys.update(_symbolkey2str(keys))
+    tk_call('SelectColor::menu', @path, place, *hash_kv(newkeys))
+  end
+
+  def self.set_color(idx, color)
+    tk_call('SelectColor::setcolor', idx, color)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/selectfont.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/selectfont.rb
new file mode 100644
index 0000000000..478787602a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/selectfont.rb
@@ -0,0 +1,85 @@
+#
+#  tkextlib/bwidget/selectfont.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/messagedlg'
+
+module Tk
+  module BWidget
+    class SelectFont < Tk::BWidget::MessageDlg
+      class Dialog < Tk::BWidget::SelectFont
+      end
+      class Toolbar < TkWindow
+      end
+    end
+  end
+end
+
+class Tk::BWidget::SelectFont
+  extend Tk
+
+  TkCommandNames = ['SelectFont'.freeze].freeze
+  WidgetClassName = 'SelectFont'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'sampletext' <<  'title'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    [] # without fontobj operation
+  end
+  private :__font_optkeys
+
+  def create
+    tk_call(self.class::TkCommandNames[0], @path, *hash_kv(@keys))
+  end
+
+  def self.load_font
+    tk_call('SelectFont::loadfont')
+  end
+end
+
+class Tk::BWidget::SelectFont::Dialog
+  def __font_optkeys
+    [] # without fontobj operation
+  end
+
+  def create_self(keys)
+    super(keys)
+    @keys['type'] = 'dialog'
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of?(Hash)
+      slot.delete['type']
+      slot.delete[:type]
+      return self if slot.empty?
+    else
+      return self if slot == 'type' || slot == :type
+    end
+    super(slot, value)
+  end
+
+  def create
+    @keys['type'] = 'dialog'
+    tk_call(Tk::BWidget::SelectFont::TkCommandNames[0], @path, *hash_kv(@keys))
+  end
+end
+
+class Tk::BWidget::SelectFont::Toolbar
+  def __font_optkeys
+    [] # without fontobj operation
+  end
+
+  def create_self(keys)
+    keys = {} unless keys
+    keys = _symbolkey2str(keys)
+    keys['type'] = 'toolbar'
+    tk_call(Tk::BWidget::SelectFont::TkCommandNames[0], @path, *hash_kv(keys))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/separator.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/separator.rb
new file mode 100644
index 0000000000..d9c3458e51
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/separator.rb
@@ -0,0 +1,20 @@
+#
+#  tkextlib/bwidget/separator.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class Separator < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::Separator
+  TkCommandNames = ['Separator'.freeze].freeze
+  WidgetClassName = 'Separator'.freeze
+  WidgetClassNames[WidgetClassName] = self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/spinbox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/spinbox.rb
new file mode 100644
index 0000000000..ca4c046e5c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/spinbox.rb
@@ -0,0 +1,98 @@
+#
+#  tkextlib/bwidget/entry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/arrowbutton'
+require 'tkextlib/bwidget/entry'
+
+module Tk
+  module BWidget
+    class SpinBox < TkEntry
+    end
+  end
+end
+
+class Tk::BWidget::SpinBox
+  include Scrollable
+
+  TkCommandNames = ['SpinBox'.freeze].freeze
+  WidgetClassName = 'SpinBox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'helptext' << 'insertbackground' << 'entryfg' << 'entrybg'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'dragenabled' << 'dropenabled' << 'editable'
+  end
+  private :__boolval_optkeys
+
+  def __listval_optkeys
+    super() << 'values'
+  end
+  private :__listval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+
+  #def entrybind(*args)
+  #  _bind([path, 'bind'], *args)
+  #  self
+  #end
+  def entrybind(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([path, 'bind'], context, cmd, *args)
+    self
+  end
+
+  #def entrybind_append(*args)
+  #  _bind_append([path, 'bind'], *args)
+  #  self
+  #end
+  def entrybind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([path, 'bind'], context, cmd, *args)
+    self
+  end
+
+  def entrybind_remove(*args)
+    _bind_remove([path, 'bind'], *args)
+    self
+  end
+
+  def entrybindinfo(*args)
+    _bindinfo([path, 'bind'], *args)
+    self
+  end
+
+  def get_index_of_value
+    number(tk_send_without_enc('getvalue'))
+  end
+  alias get_value get_index_of_value
+  alias get_value_index get_index_of_value
+
+  def set_value_by_index(idx)
+    idx = "@#{idx}" if idx.kind_of?(Integer)
+    tk_send_without_enc('setvalue', idx)
+    self
+  end
+  alias set_value set_value_by_index
+  alias set_index_value set_value_by_index
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/statusbar.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/statusbar.rb
new file mode 100644
index 0000000000..df16e4c0b7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/statusbar.rb
@@ -0,0 +1,46 @@
+#
+#  tkextlib/bwidget/statusbar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class StatusBar < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::StatusBar
+  TkCommandNames = ['StatusBar'.freeze].freeze
+  WidgetClassName = 'StatusBar'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'showresize'
+  end
+  private :__boolval_optkeys
+
+  def add(win, keys={})
+    tk_send('add', win, keys)
+    self
+  end
+
+  def delete(*wins)
+    tk_send('delete', *wins)
+    self
+  end
+
+  def get_frame(&b)
+    win = window(tk_send_without_enc('getframe'))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def items
+    list(tk_send('items'))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/titleframe.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/titleframe.rb
new file mode 100644
index 0000000000..f519490430
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/titleframe.rb
@@ -0,0 +1,27 @@
+#
+#  tkextlib/bwidget/titleframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class TitleFrame < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::TitleFrame
+  TkCommandNames = ['TitleFrame'.freeze].freeze
+  WidgetClassName = 'TitleFrame'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def get_frame(&b)
+    win = window(tk_send_without_enc('getframe'))
+    win.instance_eval(&b) if b
+    win
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/tree.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/tree.rb
new file mode 100644
index 0000000000..e7178debe2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/tree.rb
@@ -0,0 +1,434 @@
+#
+#  tkextlib/bwidget/tree.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/canvas'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class Tree < TkWindow
+      class Node < TkObject
+      end
+    end
+  end
+end
+
+class Tk::BWidget::Tree
+  include TkItemConfigMethod
+  include Scrollable
+
+  TkCommandNames = ['Tree'.freeze].freeze
+  WidgetClassName = 'Tree'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  class Event_for_Items < TkEvent::Event
+    def self._get_extra_args_tbl
+      [ 
+        TkComm.method(:string)   # item idenfier
+      ]
+    end
+  end
+
+  def __strval_optkeys
+    super() << 'crossfill' << 'linesfill'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'dragenabled' << 'dropenabled' << 
+      'redraw' << 'selectfill' << 'showlines'
+  end
+  private :__boolval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::BWidget::Tree::Node)
+      tag.id
+    else
+      # tag
+      _get_eval_string(tag)
+    end
+  end
+
+  #def imagebind(*args)
+  #  _bind_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+  #  self
+  #end
+  def imagebind(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_for_event_class(Event_for_Items, [path, 'bindImage'], 
+                          context, cmd, *args)
+    self
+  end
+
+  #def imagebind_append(*args)
+  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+  #  self
+  #end
+  def imagebind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], 
+                                 context, cmd, *args)
+    self
+  end
+
+  def imagebind_remove(*args)
+    _bind_remove_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+    self
+  end
+
+  def imagebindinfo(*args)
+    _bindinfo_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+  end
+
+  #def textbind(*args)
+  #  _bind_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+  #  self
+  #end
+  def textbind(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_for_event_class(Event_for_Items, [path, 'bindText'], 
+                          context, cmd, *args)
+    self
+  end
+
+  #def textbind_append(*args)
+  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+  #  self
+  #end
+  def textbind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], 
+                                 context, cmd, *args)
+    self
+  end
+
+  def textbind_remove(*args)
+    _bind_remove_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+    self
+  end
+
+  def textbindinfo(*args)
+    _bindinfo_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+  end
+
+  def close_tree(node, recurse=None)
+    tk_send('closetree', tagid(node), recurse)
+    self
+  end
+
+  def delete(*args)
+    tk_send('delete', *(args.collect{|node| tagid(node)}))
+    self
+  end
+
+  def edit(node, text, *args)
+    tk_send('edit', tagid(node), text, *args)
+    self
+  end
+
+  def exist?(node)
+    bool(tk_send('exists', tagid(node)))
+  end
+
+  def index(node)
+    num_or_str(tk_send('index', tagid(node)))
+  end
+
+  def insert(idx, parent, node, keys={})
+    tk_send('insert', idx, tagid(parent), tagid(node), *hash_kv(keys))
+    self
+  end
+
+  def move(parent, node, idx)
+    tk_send('move', tagid(parent), tagid(node), idx)
+    self
+  end
+
+  def get_node(node, idx)
+    Tk::BWidget::Tree::Node.id2obj(self, tk_send('nodes', tagid(node), idx))
+  end
+
+  def nodes(node, first=None, last=None)
+    simplelist(tk_send('nodes', tagid(node), first, last)).collect{|node|
+      Tk::BWidget::Tree::Node.id2obj(self, node)
+    }
+  end
+
+  def open?(node)
+    bool(@tree.itemcget(tagid(node), 'open'))
+  end
+
+  def open_tree(node, recurse=None)
+    tk_send('opentree', tagid(node), recurse)
+    self
+  end
+
+  def parent(node)
+    Tk::BWidget::Tree::Node.id2obj(self, tk_send('parent', tagid(node)))
+  end
+
+  def reorder(node, neworder)
+    tk_send('reorder', tagid(node), neworder)
+    self
+  end
+
+  def see(node)
+    tk_send('see', tagid(node))
+    self
+  end
+
+  def selection_add(*args)
+    tk_send_without_enc('selection', 'add', 
+                        *(args.collect{|node| tagid(node)}))
+    self
+  end
+
+  def selection_clear
+    tk_send_without_enc('selection', 'clear')
+    self
+  end
+
+  def selection_get
+    list(tk_send_without_enc('selection', 'get'))
+  end
+
+  def selection_include?(*args)
+    bool(tk_send_without_enc('selection', 'get', 
+                             *(args.collect{|node| tagid(node)})))
+  end
+
+  def selection_range(*args)
+    tk_send_without_enc('selection', 'range', 
+                        *(args.collect{|node| tagid(node)}))
+    self
+  end
+
+  def selection_remove(*args)
+    tk_send_without_enc('selection', 'remove', 
+                        *(args.collect{|node| tagid(node)}))
+    self
+  end
+
+  def selection_set(*args)
+    tk_send_without_enc('selection', 'set', 
+                        *(args.collect{|node| tagid(node)}))
+    self
+  end
+
+  def selection_toggle(*args)
+    tk_send_without_enc('selection', 'toggle', 
+                        *(args.collect{|node| tagid(node)}))
+    self
+  end
+
+  def toggle(node)
+    tk_send_without_enc('toggle', tagid(node))
+    self
+  end
+
+  def visible(node)
+    bool(tk_send_without_enc('visible', tagid(node)))
+  end
+end
+
+class Tk::BWidget::Tree::Node
+  include TkTreatTagFont
+
+  TreeNode_TBL = TkCore::INTERP.create_table
+  TreeNode_ID = ['bw:node'.freeze, '00000'.taint].freeze
+
+  TkCore::INTERP.init_ip_env{ TreeNode_TBL.clear }
+
+  def self.id2obj(tree, id)
+    tpath = tree.path
+    return id unless TreeNode_TBL[tpath]
+    TreeNode_TBL[tpath][id]? TreeNode_TBL[tpath][id]: id
+  end
+
+  def initialize(tree, *args)
+    if tree.kind_of?(Tk::BWidget::Tree)
+      @tree = tree
+      parent = args.shift
+      if parent.kind_of?(Tk::BWidget::Tree::Node)
+        if parent.tree.path != @tree.path
+          fail RuntimeError, 'tree of parent node is not match'
+        end
+      end
+    elsif tree.kind_of?(Tk::BWidget::Tree::Node)
+      @tree = tree.tree
+      parent = tree.parent
+    else
+      fail RuntimeError, 
+        "expect Tk::BWidget::Tree or Tk::BWidget::Tree::Node for 1st argument"
+    end
+
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+    else
+      keys = {}
+    end
+
+    index = keys.delete('index')
+    unless args.empty?
+      index = args.shift
+    end
+    index = 'end' unless index
+
+    unless args.empty?
+      fail RuntimeError, 'too much arguments'
+    end
+
+    @tpath = @tree.path
+
+    if keys.key?('nodename')
+      @path = @id = keys.delete('nodename')
+    else
+      @path = @id = TreeNode_ID.join(TkCore::INTERP._ip_id_)
+      TreeNode_ID[1].succ!
+    end
+
+    TreeNode_TBL[@id] = self
+    TreeNode_TBL[@tpath] = {} unless TreeNode_TBL[@tpath]
+    TreeNode_TBL[@tpath][@id] = self
+
+    @tree.insert(index, parent, @id, keys)
+  end
+
+  def tree
+    @tree
+  end
+
+  def id
+    @id
+  end
+
+  def [](key)
+    cget(key)
+  end
+
+  def []=(key, val)
+    configure(key, val)
+    val
+  end
+
+  def cget(key)
+    @tree.itemcget(@id, key)
+  end
+
+  def configure(key, val=None)
+    @tree.itemconfigure(@id, key, val)
+  end
+
+  def configinfo(key=nil)
+    @tree.itemconfiginfo(@id, key)
+  end
+
+  def current_configinfo(key=nil)
+    @tree.current_itemconfiginfo(@id, key)
+  end
+
+  def close_tree(recurse=None)
+    @tree.close_tree(@id, recurse)
+    self
+  end
+
+  def delete
+    @tree.delete(@id)
+    self
+  end
+
+  def edit(*args)
+    @tree.edit(@id, *args)
+    self
+  end
+
+  def exist?
+    @tree.exist?(@id)
+  end
+
+  def index
+    @tree.index(@id)
+  end
+
+  def move(index, parent=nil)
+    if parent
+      @tree.move(parent, @id, index)
+    else
+      @tree.move(self.parent, @id, index)
+    end
+  end
+
+  def open_tree(recurse=None)
+    @tree.open_tree(@id, recurse)
+    self
+  end
+
+  def open?
+    bool(@tree.itemcget(@id, 'open'))
+  end
+
+  def parent
+    @tree.parent(@id)
+  end
+
+  def reorder(neworder)
+    @tree.reorder(@id, neworder)
+  end
+
+  def see
+    @tree.see(@id)
+  end
+
+  def selection_add
+    @tree.selection_add(@id)
+  end
+
+  def selection_remove
+    @tree.selection_remove(@id)
+  end
+
+  def selection_set
+    @tree.selection_set(@id)
+  end
+
+  def selection_toggle
+    @tree.selection_toggle(@id)
+  end
+
+  def toggle
+    @tree.toggle(@id)
+  end
+
+  def visible
+    @tree.visible(@id)
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/widget.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/widget.rb
new file mode 100644
index 0000000000..568e503a8b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/bwidget/widget.rb
@@ -0,0 +1,113 @@
+#
+#  tkextlib/bwidget/widget.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    module Widget
+    end
+  end
+end
+
+module Tk::BWidget::Widget
+  include Tk
+  extend Tk
+
+  def self.__pathname
+    'Widget::configure'
+  end
+
+  def self.__cget_cmd
+    ['Widget::cget']
+  end
+
+  def self.__config_cmd
+    ['Widget::configure']
+  end
+
+  def self.cget(slot)
+    self.current_configinfo(slot).values[0]
+  end
+
+  def self.add_map(klass, subclass, subpath, opts)
+    tk_call('Widget::addmap', klass, subclass, subpath, opts)
+  end
+
+  def self.bwinclude(klass, subclass, subpath, *args)
+    tk_call('Widget::bwinclude', klass, subclass, subpath, *args)
+  end
+
+  def self.create(klass, path, rename=None, &b)
+    win = window(tk_call('Widget::create', klass, path, rename))
+    win.instance_eval(&b) if b
+    win
+  end
+
+  def self.declare(klass, optlist)
+    tk_call('Widget::declare', klass, optlist)
+  end
+
+  def self.define(klass, filename, *args)
+    tk_call('Widget::define', klass, filename, *args)
+  end
+
+  def self.destroy(win)
+    tk_call('Widget::destroy', _epath(win))
+  end
+
+  def self.focus_next(win)
+    tk_call('Widget::focusNext', win)
+  end
+
+  def self.focus_ok(win)
+    tk_call('Widget::focusOk', win)
+  end
+
+  def self.focus_prev(win)
+    tk_call('Widget::focusPrev', win)
+  end
+
+  def self.generate_doc(dir, widgetlist)
+    tk_call('Widget::generate-doc', dir, widgetlist)
+  end
+
+  def self.generate_widget_doc(klass, iscmd, file)
+    tk_call('Widget::generate-widget-doc', klass, iscmd, file)
+  end
+
+  def self.get_option(win, option)
+    tk_call('Widget::getoption', win, option)
+  end
+
+  def self.get_variable(win, varname, my_varname=None)
+    tk_call('Widget::getVariable', win, varname, my_varname)
+  end
+
+  def self.has_changed(win, option, pvalue)
+    tk_call('Widget::hasChanged', win, option, pvalue)
+  end
+
+  def self.init(klass, win, options)
+    tk_call('Widget::init', klass, win, options)
+  end
+
+  def self.set_option(win, option, value)
+    tk_call('Widget::setoption', win, option, value)
+  end
+
+  def self.sub_cget(win, subwidget)
+    tk_call('Widget::subcget', win, subwidget)
+  end
+
+  def self.sync_options(klass, subclass, subpath, options)
+    tk_call('Widget::syncoptions', klass, subclass, subpath, options)
+  end
+
+  def self.tkinclude(klass, tkwidget, subpath, *args)
+    tk_call('Widget::tkinclude', klass, tkwidget, subpath, *args)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/itcl.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/itcl.rb
new file mode 100644
index 0000000000..1d6ecf04f2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/itcl.rb
@@ -0,0 +1,13 @@
+#
+#  [incr Tcl] support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/itcl/setup.rb'
+
+# load library
+require 'tkextlib/itcl/incr_tcl.rb'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/itcl/incr_tcl.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
new file mode 100644
index 0000000000..07abf3a7bf
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
@@ -0,0 +1,172 @@
+#
+#  tkextlib/itk/incr_tcl.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script
+require 'tkextlib/itcl.rb'
+
+# TkPackage.require('Itcl', '3.2')
+TkPackage.require('Itcl')
+
+module Tk
+  module Itcl
+    include Tk
+    extend Tk
+
+    LIBRARY = TkVarAccess.new('::itcl::library')
+    PURIST = TkVarAccess.new('::itcl::purist')
+
+    VERSION    = TkCore::INTERP._invoke("set", "::itcl::version").freeze
+    PATCHLEVEL = TkCore::INTERP._invoke("set", "::itcl::patchLevel").freeze
+
+    PACKAGE_NAME = 'Itcl'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('Itcl')
+      rescue
+        ''
+      end
+    end
+
+    ##############################################
+
+    class ItclObject < TkObject
+      ITCL_CLASSNAME = ''.freeze
+
+      ITCL_OBJ_ID = ['itclobj'.freeze, '00000'.taint].freeze
+      ITCL_OBJ_TBL = {}.taint
+
+      def initialize(*args)
+        if (@klass = self.class::ITCL_CLASSNAME).empty?
+          fail RuntimeError, 'unknown itcl class (abstract class?)'
+        end
+        @id = Tk::Itcl::ItclObject::TCL_OBJ_ID.join(TkCore::INTERP._ip_id_)
+        @path = @id
+        Tk::Itcl::ItclObject::ITCL_OBJ_ID[1].succ!
+      end
+
+      def self.call_proc(name, *args)
+        tk_call("#{ITCL_CLASSNAME}::#{cmd}", *args)
+      end
+
+      def call_method(name, *args)
+        tk_call(@path, name, *args)
+      end
+
+      def isa(klass)
+        bool(tk_call(@path, 'isa', klass))
+      end
+      alias itcl_kind_of? isa
+
+      def info_class
+        tk_call(@path, 'info', 'class')
+      end
+
+      def info_inherit
+        simplelist(tk_call(@path, 'info', 'inherit'))
+      end
+
+      def info_heritage
+        list(tk_call(@path, 'info', 'heritage'))
+      end
+
+      def info_function(*args)
+        if args[-1].kind_of?(Array)
+          params = args.pop
+          params.each{|param|
+            param = param.to_s
+            args << ( (param[0] == ?-)? param: "-#{param}" )
+          }
+        end
+        list(tk_call(@path, 'info', 'function', *args))
+      end
+
+      def info_variable(*args)
+        if args[-1].kind_of?(Array)
+          params = args.pop
+          params.each{|param|
+            param = param.to_s
+            args << ( (param[0] == ?-)? param: "-#{param}" )
+          }
+        end
+        list(tk_call(@path, 'info', 'variable', *args))
+      end
+    end
+
+    ##############################################
+
+    def self.body(klass, func, args, body)
+      tk_call('::itcl::body', "#{klass}::#{func}", args, body)
+    end
+
+    def self.code(cmd, *args)
+      tk_call('::itcl::code', cmd, *args)
+    end
+
+    def self.code_in_namespace(namespace, cmd, *args)
+      tk_call('::itcl::code', '-namespace', namespace, cmd, *args)
+    end
+
+    def self.configbody(klass, var, body)
+      tk_call('::itcl::configbody', "#{klass}::#{var}", body)
+    end
+
+    def self.create_itcl_class(name, body)
+      TkCore::INTERP._invoke('::itcl::class', name, body)
+      klass = Class.new(Tk::Itcl::ItclObject)
+      klass.const_set('ITCL_CLASSNAME', name.dup.freeze)
+      klass
+    end
+
+    def self.delete_itcl_class(*names)
+      tk_call('::itcl::delete', 'class',  *names)
+    end
+
+    def self.delete_itcl_object(*names)
+      tk_call('::itcl::delete', 'object',  *names)
+    end
+
+    def self.delete_namespace(*names)
+      tk_call('::itcl::delete', 'namespace',  *names)
+    end
+
+    def self.ensemble(name, *args)
+      tk_call('::itcl::ensemble', name, *args)
+    end
+
+    def self.find_classes(pat=None)
+      simplelist(tk_call('::itcl::find', 'classes', pat))
+    end
+
+    def self.find_objects(*args)
+      simplelist(tk_call('::itcl::find', 'objects', *args))
+    end
+
+    def self.is_itcl_class(target)
+      bool(tk_call('::itcl::is', 'class', target))
+    end
+
+    def self.is_itcl_object(target)
+      bool(tk_call('::itcl::is', 'object', target))
+    end
+
+    def self.create_local_obj(klass, name, *args)
+      tk_call('::itcl::local', klass, name, *args)
+    end
+
+    def self.is_itcl_instance(klass, target)
+      bool(tk_call('::itcl::is', 'object', '-class', klass, target))
+    end
+
+    def self.scope(var)
+      tk_call('::itcl::scope', var)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/itcl/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/itcl/setup.rb
new file mode 100644
index 0000000000..5be0588703
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/itcl/setup.rb
@@ -0,0 +1,13 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
+
+
+# set [incr Tcl] library directory
+
+# ENV['ITCL_LIBRARY'] = '/usr/local/ActiveTcl/lib/itcl3.2/'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/itk.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/itk.rb
new file mode 100644
index 0000000000..7492bd3eb4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/itk.rb
@@ -0,0 +1,13 @@
+#
+#  [incr Tk] support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/itk/setup.rb'
+
+# load library
+require 'tkextlib/itk/incr_tk.rb'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/itk/incr_tk.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/itk/incr_tk.rb
new file mode 100644
index 0000000000..0626536e36
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/itk/incr_tk.rb
@@ -0,0 +1,428 @@
+#
+#  tkextlib/itk/incr_tk.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/menuspec'
+require 'tkextlib/itcl.rb'
+
+# call setup script
+require 'tkextlib/itk.rb'
+
+#TkPackage.require('Itk', '3.2')
+TkPackage.require('Itk')
+
+module Tk
+  module Itk
+    include Tk
+    extend Tk
+
+    LIBRARY = TkVarAccess.new('::itk::library')
+
+    PACKAGE_NAME = 'Itk'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('Itk')
+      rescue
+        ''
+      end
+    end
+
+    def self.usual(arg, *args)
+      tk_call('::itk::usual', arg, *args)
+    end
+
+    def self.usual_names
+      list(tk_call('::itk::usual'))
+    end
+
+    ############################
+
+    class Archetype < TkWindow
+      TkCommandNames = [].freeze
+      # WidgetClassName = 'Archetype'.freeze
+      # WidgetClassNames[WidgetClassName] = self
+
+      def self.to_eval
+        '::itk::' << self::WidgetClassName
+      end
+
+      def __destroy_hook__
+        Tk::Itk::Component::ComponentID_TBL.delete(self.path)
+      end
+
+      #### [incr Tk] public methods
+      def component
+        simplelist(tk_send('component'))
+      end
+
+      def component_path(name)
+        window(tk_send('component', name))
+      end
+      alias component_widget component_path
+
+      def component_invoke(name, cmd, *args)
+        window(tk_send('component', name, cmd, *args))
+      end
+
+      def component_obj(*names)
+        names = component if names.empty?
+        names.collect{|name| Tk::Itk::Component.new(self.path, name) }
+      end
+
+      #### [incr Tk] protected methods
+=begin
+      def itk_component_add(visibility, name, create_cmds, option_cmds=None)
+        args = []
+        visibility.each{|v| v = v.to_s; args << ( (v[0] == ?-)? v: "-#{v}" )}
+        args << '--' << name << create_cmd << option_cmds
+        tk_call('itk_component', 'add', *args)
+      end
+
+      def itk_component_delete(*names)
+        tk_call('itk_component', 'delete', *names)
+      end
+
+      def itk_initialize(keys={})
+        tk_call('itk_initialize', keys)
+      end
+
+      def itk_option_add(*args)
+        tk_call('itk_option', 'add', *args)
+      end
+
+      def itk_option_define(name, resource, klass, init, config=None)
+        tk_call('itk_option', 'define', name, resource, klass, init, config)
+      end
+      
+      def itk_option_remove(*args)
+        tk_call('itk_option', 'remove', *args)
+      end
+=end
+    end
+
+    ############################
+
+    class Toplevel < Archetype
+      TkCommandNames = ['::itk::Toplevel'].freeze
+      WidgetClassName = 'Toplevel'.freeze
+      WidgetClassNames[WidgetClassName] = self
+
+      include Wm
+      include TkMenuSpec
+
+      def __strval_optkeys
+        super() << 'title'
+      end
+      private :__strval_optkeys
+    end
+
+    ############################
+
+    class Widget < Archetype
+      TkCommandNames = ['::itk::Widget'].freeze
+      WidgetClassName = 'Widget'.freeze
+      WidgetClassNames[WidgetClassName] = self
+    end
+
+
+    ############################
+
+    class Component < TkObject
+      def __cget_cmd
+        [self.master, 'component', self.name, 'cget']
+      end
+      private :__cget_cmd
+
+      def __config_cmd
+        [self.master, 'component', self.name, 'configure']
+      end
+      private :__config_cmd
+
+      ComponentID_TBL = TkCore::INTERP.create_table
+      Itk_Component_ID = ['itk:component'.freeze, '00000'.taint].freeze
+
+      TkCore::INTERP.init_ip_env{ ComponentID_TBL.clear }
+
+      def self.id2obj(master, id)
+        if master.kind_of?(TkObject)
+          master = master.path
+        else
+          master = master.to_s
+        end
+        return id unless ComponentID_TBL.key?(master)
+        (ComponentID_TBL.key?(id))? ComponentID_TBL[master][id]: id
+      end
+
+      def self.new(master, component=nil)
+        if master.kind_of?(TkObject)
+          master = master.path
+        else
+          master = master.to_s
+        end
+
+        if component.kind_of?(Tk::Itk::Component)
+          component = component.name
+        elsif component
+          component = component.to_s
+        else
+          component = Itk_Component_ID.join(TkCore::INTERP._ip_id_)
+          Itk_Component_ID[1].succ!
+        end
+
+        if ComponentID_TBL.key?(master)
+          if ComponentID_TBL[master].key?(component)
+            return ComponentID_TBL[master][component] 
+          end
+        else
+          ComponentID_TBL[master] = {}
+        end
+
+        super(master, component)
+      end
+
+      def initialize(master, component)
+        @master = master
+        @component = component
+
+        ComponentID_TBL[@master][@component] = self
+
+        begin
+          @widget = window(tk_call(@master, 'component', @component))
+          @path = @widget.path
+        rescue
+          @widget = nil
+          @path = nil
+        end
+      end
+
+      def path
+        unless @path
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          rescue
+            fail RuntimeError, 'component is not assigned to a widget'
+          end
+        end
+        @path
+      end
+
+      def epath
+        path()
+      end
+
+      def to_eval
+        path()
+      end
+
+      def master
+        @master
+      end
+
+      def name
+        @component
+      end
+
+      def widget
+        unless @widget
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          rescue
+            fail RuntimeError, 'component is not assigned to a widget'
+          end
+        end
+        @widget
+      end
+
+      def widget_class
+        unless @widget
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+            @widget.classname
+          rescue
+            nil
+          end
+        end
+      end
+
+      def method_missing(id, *args)
+        name = id.id2name
+
+        # try 1 : component command
+        begin
+          return tk_call(@master, 'component', @component, name, *args)
+        rescue
+        end
+
+        # try 2 : component configure
+        len = args.length
+        begin
+          case len
+          when 1
+            if name[-1] == ?=
+              return configure(name[0..-2], args[0])
+            else
+              return configure(name, args[0])
+            end
+          when 0
+            return cget(name)
+          end
+        rescue
+        end
+
+        # try 3 : widget method or widget configure
+        begin
+          unless @widget
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          end
+          @widget.__send__(id, *args)
+        rescue
+        end
+
+        # unknown method
+        super(id, *args)
+        # fail RuntimeError, "unknown method '#{name}' for #{self.inspect}"
+      end
+
+      def tk_send(cmd, *rest)
+        begin
+          tk_call(@master, 'component', @component, cmd, *rest)
+        rescue
+          unless @path
+            begin
+              @widget = window(tk_call(@master, 'component', @component))
+              @path = @widget.path
+            rescue
+              fail RuntimeError, 'component is not assigned to a widget'
+            end
+          end
+          tk_call(@path, cmd, *rest)
+        end
+      end
+
+      def tk_send_without_enc(cmd, *rest)
+        begin
+          tk_call_without_enc(@master, 'component', @component, cmd, *rest)
+        rescue
+          unless @path
+            begin
+              @widget = window(tk_call(@master, 'component', @component))
+              @path = @widget.path
+            rescue
+              fail RuntimeError, 'component is not assigned to a widget'
+            end
+          end
+          tk_call_without_enc(@path, cmd, *rest)
+        end
+      end
+
+      def tk_send_with_enc(cmd, *rest)
+        begin
+          tk_call_with_enc(@master, 'component', @component, cmd, *rest)
+        rescue
+          unless @path
+            begin
+              @widget = window(tk_call(@master, 'component', @component))
+              @path = @widget.path
+            rescue
+              fail RuntimeError, 'component is not assigned to a widget'
+            end
+          end
+          tk_call_with_enc(@path, cmd, *rest)
+        end
+      end
+
+      #def bind(*args)
+      #  unless @widget
+      #    begin
+      #      @widget = window(tk_call(@master, 'component', @component))
+      #      @path = @widget.path
+      #    rescue
+      #      fail RuntimeError, 'component is not assigned to a widget'
+      #    end
+      #  end
+      #  @widget.bind(*args)
+      #end
+      def bind(context, *args)
+        unless @widget
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          rescue
+            fail RuntimeError, 'component is not assigned to a widget'
+          end
+        end
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0]) || !block_given?
+          cmd = args.shift
+        else
+          cmd = Proc.new
+        end
+        @widget.bind(context, cmd, *args)
+      end
+
+      #def bind_append(*args)
+      #  unless @widget
+      #    begin
+      #      @widget = window(tk_call(@master, 'component', @component))
+      #      @path = @widget.path
+      #    rescue
+      #      fail RuntimeError, 'component is not assigned to a widget'
+      #    end
+      #  end
+      #  @widget.bind_append(*args)
+      #end
+      def bind_append(context, *args)
+        unless @widget
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          rescue
+            fail RuntimeError, 'component is not assigned to a widget'
+          end
+        end
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0]) || !block_given?
+          cmd = args.shift
+        else
+          cmd = Proc.new
+        end
+        @widget.bind_append(context, cmd, *args)
+      end
+
+      def bind_remove(*args)
+        unless @widget
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          rescue
+            fail RuntimeError, 'component is not assigned to a widget'
+          end
+        end
+        @widget.bind_remove(*args)
+      end
+
+      def bindinfo(*args)
+        unless @widget
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          rescue
+            fail RuntimeError, 'component is not assigned to a widget'
+          end
+        end
+        @widget.bindinfo(*args)
+      end
+
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/itk/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/itk/setup.rb
new file mode 100644
index 0000000000..e47b64adae
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/itk/setup.rb
@@ -0,0 +1,13 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
+
+
+# set [incr Tk] library directory
+
+# ENV['ITK_LIBRARY'] = '/usr/local/ActiveTcl/lib/itk3.2/'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets.rb
new file mode 100644
index 0000000000..ebd4cf7507
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets.rb
@@ -0,0 +1,94 @@
+#
+#  [incr Widgets] support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/itcl'
+require 'tkextlib/itk'
+
+# call setup script for general 'tkextlib' libraries
+#require 'tkextlib/setup.rb'
+
+# call setup script
+#require 'tkextlib/iwidgets/setup.rb'
+
+# load all image format handlers
+#TkPackage.require('Iwidgets', '4.0')
+TkPackage.require('Iwidgets')
+
+module Tk
+  module Iwidgets
+    TkComm::TkExtlibAutoloadModule.unshift(self)
+
+    extend TkCore
+
+    PACKAGE_NAME = 'Iwidgets'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('Iwidgets')
+      rescue
+        ''
+      end
+    end
+
+    ####################################################
+
+    autoload :Buttonbox,             'tkextlib/iwidgets/buttonbox'
+    autoload :Calendar,              'tkextlib/iwidgets/calendar'
+    autoload :Canvasprintbox,        'tkextlib/iwidgets/canvasprintbox'
+    autoload :Canvasprintdialog,     'tkextlib/iwidgets/canvasprintdialog'
+    autoload :Checkbox,              'tkextlib/iwidgets/checkbox'
+    autoload :Combobox,              'tkextlib/iwidgets/combobox'
+    autoload :Dateentry,             'tkextlib/iwidgets/dateentry'
+    autoload :Datefield,             'tkextlib/iwidgets/datefield'
+    autoload :Dialog,                'tkextlib/iwidgets/dialog'
+    autoload :Dialogshell,           'tkextlib/iwidgets/dialogshell'
+    autoload :Disjointlistbox,       'tkextlib/iwidgets/disjointlistbox'
+    autoload :Entryfield,            'tkextlib/iwidgets/entryfield'
+    autoload :Extbutton,             'tkextlib/iwidgets/extbutton'
+    autoload :Extfileselectionbox,   'tkextlib/iwidgets/extfileselectionbox'
+    autoload :Extfileselectiondialog,'tkextlib/iwidgets/extfileselectiondialog'
+    autoload :Feedback,              'tkextlib/iwidgets/feedback'
+    autoload :Fileselectionbox,      'tkextlib/iwidgets/fileselectionbox'
+    autoload :Fileselectiondialog,   'tkextlib/iwidgets/fileselectiondialog'
+    autoload :Finddialog,            'tkextlib/iwidgets/finddialog'
+    autoload :Hierarchy,             'tkextlib/iwidgets/hierarchy'
+    autoload :Hyperhelp,             'tkextlib/iwidgets/hyperhelp'
+    autoload :Labeledframe,          'tkextlib/iwidgets/labeledframe'
+    autoload :Labeledwidget,         'tkextlib/iwidgets/labeledwidget'
+    autoload :Mainwindow,            'tkextlib/iwidgets/mainwindow'
+    autoload :Menubar,               'tkextlib/iwidgets/menubar'
+    autoload :Messagebox,            'tkextlib/iwidgets/messagebox'
+    autoload :Messagedialog,         'tkextlib/iwidgets/messagedialog'
+    autoload :Notebook,              'tkextlib/iwidgets/notebook'
+    autoload :Optionmenu,            'tkextlib/iwidgets/optionmenu'
+    autoload :Panedwindow,           'tkextlib/iwidgets/panedwindow'
+    autoload :Pushbutton,            'tkextlib/iwidgets/pushbutton'
+    autoload :Promptdialog,          'tkextlib/iwidgets/promptdialog'
+    autoload :Radiobox,              'tkextlib/iwidgets/radiobox'
+    autoload :Scrolledcanvas,        'tkextlib/iwidgets/scrolledcanvas'
+    autoload :Scrolledframe,         'tkextlib/iwidgets/scrolledframe'
+    autoload :Scrolledhtml,          'tkextlib/iwidgets/scrolledhtml'
+    autoload :Scrolledlistbox,       'tkextlib/iwidgets/scrolledlistbox'
+    autoload :Scrolledtext,          'tkextlib/iwidgets/scrolledtext'
+    autoload :Scrolledwidget,        'tkextlib/iwidgets/scrolledwidget'
+    autoload :Selectionbox,          'tkextlib/iwidgets/selectionbox'
+    autoload :Selectiondialog,       'tkextlib/iwidgets/selectiondialog'
+    autoload :Shell,                 'tkextlib/iwidgets/shell'
+    autoload :Spindate,              'tkextlib/iwidgets/spindate'
+    autoload :Spinint,               'tkextlib/iwidgets/spinint'
+    autoload :Spinner,               'tkextlib/iwidgets/spinner'
+    autoload :Spintime,              'tkextlib/iwidgets/spintime'
+    autoload :Tabnotebook,           'tkextlib/iwidgets/tabnotebook'
+    autoload :Tabset,                'tkextlib/iwidgets/tabset'
+    autoload :Timeentry,             'tkextlib/iwidgets/timeentry'
+    autoload :Timefield,             'tkextlib/iwidgets/timefield'
+    autoload :Toolbar,               'tkextlib/iwidgets/toolbar'
+    autoload :Watch,                 'tkextlib/iwidgets/watch'
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
new file mode 100644
index 0000000000..a055e07ac9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
@@ -0,0 +1,119 @@
+#
+#  tkextlib/iwidgets/buttonbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Buttonbox < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Buttonbox
+  TkCommandNames = ['::iwidgets::buttonbox'.freeze].freeze
+  WidgetClassName = 'Buttonbox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'buttoncget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'buttonconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_boolval_optkeys(id)
+    super(id) << 'defaultring'
+  end
+  private :__item_boolval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  alias buttoncget itemcget
+  alias buttonconfigure itemconfigure
+  alias buttonconfiginfo itemconfiginfo
+  alias current_buttonconfiginfo current_itemconfiginfo
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def add(tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'add', tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def default(idx)
+    tk_call(@path, 'default', index(idx))
+    self
+  end
+
+  def delete(idx)
+    tk_call(@path, 'delete', index(idx))
+    self
+  end
+
+  def hide(idx)
+    tk_call(@path, 'hide', index(idx))
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def invoke(idx=nil)
+    if idx
+      tk_call(@path, 'invoke', index(idx))
+    else
+      tk_call(@path, 'invoke')
+    end
+    self
+  end
+
+  def show(idx)
+    tk_call(@path, 'show', index(idx))
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/calendar.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/calendar.rb
new file mode 100644
index 0000000000..0152f8593a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/calendar.rb
@@ -0,0 +1,106 @@
+#
+#  tkextlib/iwidgets/calendar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Calendar < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Calendar
+  TkCommandNames = ['::iwidgets::calendar'.freeze].freeze
+  WidgetClassName = 'Calendar'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() + [
+      'buttonforeground', 'outline', 'selectcolor', 
+      'weekdaybackground', 'weekendbackground'
+    ]
+  end
+  private :__strval_optkeys
+
+  def __listval_optkeys
+    super() << 'days'
+  end
+  private :__listval_optkeys
+
+  def __font_optkeys
+    super() + ['currentdatefont', 'datefont', 'dayfont', 'titlefont']
+  end
+  private :__font_optkeys
+
+  ####################################
+
+  include Tk::ValidateConfigure
+
+  class CalendarCommand < TkValidateCommand
+    #class CalCmdArgs < TkUtil::CallbackSubst
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL  = [ [?d, ?s, :date], nil ]
+      PROC_TBL = [ [?s, TkComm.method(:string) ], nil ]
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        val
+      end
+    end
+
+    def self._config_keys
+      # array of config-option key (string or symbol)
+      ['command']
+    end
+
+    #def initialize(cmd = Proc.new, *args)
+    #  _initialize_for_cb_class(CalCmdArgs, cmd, *args)
+    #end
+  end
+
+  def __validation_class_list
+    super() << CalendarCommand
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, CalendarCommand)
+=begin
+  def command(cmd = Proc.new, args = nil)
+    if cmd.kind_of?(CalendarCommand)
+      configure('command', cmd)
+    elsif args
+      configure('command', [cmd, args])
+    else
+      configure('command', cmd)
+    end
+  end
+=end
+
+  ####################################
+
+  def get_string
+    tk_call(@path, 'get', '-string')
+  end
+  alias get get_string
+
+  def get_clicks
+    number(tk_call(@path, 'get', '-clicks'))
+  end
+
+  def select(date)
+    tk_call(@path, 'select', date)
+    self
+  end
+
+  def show(date)
+    tk_call(@path, 'show', date)
+    self
+  end
+  def show_now
+    tk_call(@path, 'show', 'now')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
new file mode 100644
index 0000000000..fa5e90ad05
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
@@ -0,0 +1,53 @@
+#
+#  tkextlib/iwidgets/canvasprintbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Canvasprintbox < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Canvasprintbox
+  TkCommandNames = ['::iwidgets::canvasprintbox'.freeze].freeze
+  WidgetClassName = 'Canvasprintbox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'filename'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'stretch'
+  end
+  private :__boolval_optkeys
+
+  def get_output
+    tk_call(@path, 'getoutput')
+  end
+
+  def print
+    bool(tk_call(@path, 'print'))
+  end
+
+  def refresh
+    tk_call(@path, 'refresh')
+    self
+  end
+
+  def set_canvas(win)
+    tk_call(@path, 'setcanvas', win)
+    self
+  end
+
+  def stop
+    tk_call(@path, 'stop')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
new file mode 100644
index 0000000000..bbf507677c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
@@ -0,0 +1,38 @@
+#
+#  tkextlib/iwidgets/canvasprintdialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Canvasprintdialog < Tk::Iwidgets::Dialog
+    end
+  end
+end
+
+class Tk::Iwidgets::Canvasprintdialog
+  TkCommandNames = ['::iwidgets::canvasprintdialog'.freeze].freeze
+  WidgetClassName = 'Canvasprintdialog'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def get_output
+    tk_call(@path, 'getoutput')
+  end
+
+  def print
+    bool(tk_call(@path, 'print'))
+  end
+
+  def refresh
+    tk_call(@path, 'refresh')
+    self
+  end
+
+  def set_canvas(win)
+    tk_call(@path, 'setcanvas', win)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/checkbox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
new file mode 100644
index 0000000000..46ca389db2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
@@ -0,0 +1,116 @@
+#
+#  tkextlib/iwidgets/checkbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Checkbox < Tk::Iwidgets::Labeledframe
+    end
+  end
+end
+
+class Tk::Iwidgets::Checkbox
+  TkCommandNames = ['::iwidgets::checkbox'.freeze].freeze
+  WidgetClassName = 'Checkbox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'buttoncget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'buttonconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_boolval_optkeys(id)
+    super(id) << 'defaultring'
+  end
+  private :__item_boolval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  alias buttoncget itemcget
+  alias buttonconfigure itemconfigure
+  alias buttonconfiginfo itemconfiginfo
+  alias current_buttonconfiginfo current_itemconfiginfo
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def add(tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'add', tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def delete(idx)
+    tk_call(@path, 'delete', index(idx))
+    self
+  end
+
+  def deselect(idx)
+    tk_call(@path, 'deselect', index(idx))
+    self
+  end
+
+  def flash(idx)
+    tk_call(@path, 'flash', index(idx))
+    self
+  end
+
+  def get(idx)
+    simplelist(tk_call(@path, 'get', index(idx))).collect{|id|
+      Tk::Itk::Component.id2obj(self, id)
+    }
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def select(idx)
+    tk_call(@path, 'select', index(idx))
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/combobox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/combobox.rb
new file mode 100644
index 0000000000..a6d54d78fa
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/combobox.rb
@@ -0,0 +1,104 @@
+#
+#  tkextlib/iwidgets/combobox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Combobox < Tk::Iwidgets::Entryfield
+    end
+  end
+end
+
+class Tk::Iwidgets::Combobox
+  TkCommandNames = ['::iwidgets::combobox'.freeze].freeze
+  WidgetClassName = 'Combobox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'completion' << 'dropdown' << 'editable' << 'unique'
+  end
+  private :__boolval_optkeys
+
+  def clear(component=None)
+    tk_call(@path, 'clear', component)
+    self
+  end
+
+  def delete_list(first, last=None)
+    tk_call(@path, 'delete', 'list', first, last)
+    self
+  end
+
+  def delete_entry(first, last=None)
+    tk_call(@path, 'delete', 'entry', first, last)
+    self
+  end
+
+  def get_list_contents(index)
+    tk_call(@path, 'get', index)
+  end
+
+  def insert_list(idx, *elems)
+    tk_call(@path, 'insert', 'list', idx, *elems)
+    self
+  end
+
+  def insert_entry(idx, *elems)
+    tk_call(@path, 'insert', 'entry', idx, *elems)
+    self
+  end
+
+  # listbox methods
+  def size
+    tk_send_without_enc('size').to_i
+  end
+  def see(index)
+    tk_send_without_enc('see', index)
+    self
+  end
+  def selection_anchor(index)
+    tk_send_without_enc('selection', 'anchor', index)
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send_without_enc('selection', 'clear', first, last)
+    self
+  end
+  def selection_includes(index)
+    bool(tk_send_without_enc('selection', 'includes', index))
+  end
+  def selection_set(first, last=None)
+    tk_send_without_enc('selection', 'set', first, last)
+    self
+  end
+
+  # scrolledlistbox methods
+  def get_curselection
+    tk_call(@path, 'getcurselection')
+  end
+  def justify(dir)
+    tk_call(@path, 'justify', dir)
+    self
+  end
+  def sort(*params, &b)
+    # see 'lsort' man page about params
+    if b
+      tk_call(@path, 'sort', '-command', proc(&b), *params)
+    else
+      tk_call(@path, 'sort', *params)
+    end
+    self
+  end
+  def sort_ascending
+    tk_call(@path, 'sort', 'ascending')
+    self
+  end
+  def sort_descending
+    tk_call(@path, 'sort', 'descending')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/dateentry.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
new file mode 100644
index 0000000000..0a8897f50d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
@@ -0,0 +1,20 @@
+#
+#  tkextlib/iwidgets/dateentry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Dateentry < Tk::Iwidgets::Datefield
+    end
+  end
+end
+
+class Tk::Iwidgets::Dateentry
+  TkCommandNames = ['::iwidgets::dateentry'.freeze].freeze
+  WidgetClassName = 'Dateentry'.freeze
+  WidgetClassNames[WidgetClassName] = self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/datefield.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/datefield.rb
new file mode 100644
index 0000000000..632f3334dc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/datefield.rb
@@ -0,0 +1,58 @@
+#
+#  tkextlib/iwidgets/datefield.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Datefield < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Datefield
+  TkCommandNames = ['::iwidgets::datefield'.freeze].freeze
+  WidgetClassName = 'Datefield'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'gmt'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    super() << 'textfont'
+  end
+  private :__font_optkeys
+
+  def get_string
+    tk_call(@path, 'get', '-string')
+  end
+  alias get get_string
+
+  def get_clicks
+    number(tk_call(@path, 'get', '-clicks'))
+  end
+
+  def valid?
+    bool(tk_call(@path, 'isvalid'))
+  end
+  alias isvalid? valid?
+
+  def show(date=None)
+    tk_call(@path, 'show', date)
+    self
+  end
+  def show_now
+    tk_call(@path, 'show', 'now')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/dialog.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/dialog.rb
new file mode 100644
index 0000000000..8540eae1b5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/dialog.rb
@@ -0,0 +1,20 @@
+#
+#  tkextlib/iwidgets/dialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Dialog < Tk::Iwidgets::Dialogshell
+    end
+  end
+end
+
+class Tk::Iwidgets::Dialog
+  TkCommandNames = ['::iwidgets::dialog'.freeze].freeze
+  WidgetClassName = 'Dialog'.freeze
+  WidgetClassNames[WidgetClassName] = self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
new file mode 100644
index 0000000000..d6c668621d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
@@ -0,0 +1,119 @@
+#
+#  tkextlib/iwidgets/dialogshell.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Dialogshell < Tk::Iwidgets::Shell
+    end
+  end
+end
+
+class Tk::Iwidgets::Dialogshell
+  TkCommandNames = ['::iwidgets::dialogshell'.freeze].freeze
+  WidgetClassName = 'Dialogshell'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'buttoncget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'buttonconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_boolval_optkeys(id)
+    super(id) << 'defaultring'
+  end
+  private :__item_boolval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  alias buttoncget itemcget
+  alias buttonconfigure itemconfigure
+  alias buttonconfiginfo itemconfiginfo
+  alias current_buttonconfiginfo current_itemconfiginfo
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def add(tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'add', tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def default(idx)
+    tk_call(@path, 'default', index(idx))
+    self
+  end
+
+  def delete(idx)
+    tk_call(@path, 'delete', index(idx))
+    self
+  end
+
+  def hide(idx)
+    tk_call(@path, 'hide', index(idx))
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def invoke(idx=nil)
+    if idx
+      tk_call(@path, 'invoke', index(idx))
+    else
+      tk_call(@path, 'invoke')
+    end
+    self
+  end
+
+  def show(idx)
+    tk_call(@path, 'show', index(idx))
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
new file mode 100644
index 0000000000..9bc063ba69
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
@@ -0,0 +1,50 @@
+#
+#  tkextlib/iwidgets/disjointlistbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Disjointlistbox < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Disjointlistbox
+  TkCommandNames = ['::iwidgets::disjointlistbox'.freeze].freeze
+  WidgetClassName = 'Disjointlistbox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'lhslabeltext' << 'rhslabeltext' << 'lhsbuttonlabel' << 'rhsbuttonlabel'
+  end
+  private :__strval_optkeys
+
+  def set_lhs(*items)
+    tk_call(@path, 'setlhs', items)
+    self
+  end
+  def set_rhs(*items)
+    tk_call(@path, 'setrhs', items)
+    self
+  end
+
+  def get_lhs
+    simplelist(tk_call(@path, 'getlhs'))
+  end
+  def get_rhs
+    simplelist(tk_call(@path, 'getrhs'))
+  end
+
+  def insert_lhs(*items)
+    tk_call(@path, 'insertlhs', items)
+    self
+  end
+  def insert_rhs(*items)
+    tk_call(@path, 'insertrhs', items)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/entryfield.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
new file mode 100644
index 0000000000..6aa933ce06
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
@@ -0,0 +1,166 @@
+#
+#  tkextlib/iwidgets/entryfield.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Entryfield < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Entryfield
+  TkCommandNames = ['::iwidgets::entryfield'.freeze].freeze
+  WidgetClassName = 'Entryfield'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __font_optkeys
+    super() << 'textfont'
+  end
+  private :__font_optkeys
+
+  ####################################
+
+  include Tk::ValidateConfigure
+
+  class EntryfieldValidate < TkValidateCommand
+    #class CalCmdArgs < TkUtil::CallbackSubst
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL  = [ 
+        [ ?c, ?s, :char ], 
+        [ ?P, ?s, :post ], 
+        [ ?S, ?s, :current ], 
+        [ ?W, ?w, :widget ], 
+        nil
+      ]
+      PROC_TBL = [ 
+        [ ?s, TkComm.method(:string) ], 
+        [ ?w, TkComm.method(:window) ], 
+        nil
+      ]
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+    end
+
+    def self._config_keys
+      ['validate', 'invalid']
+    end
+  end
+
+  def __validation_class_list
+    super() << EntryfieldValidate
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, EntryfieldValidate)
+=begin
+  def validate(cmd = Proc.new, args = nil)
+    if cmd.kind_of?(ValidateCmd)
+      configure('validate', cmd)
+    elsif args
+      configure('validate', [cmd, args])
+    else
+      configure('validate', cmd)
+    end
+  end
+
+  def invalid(cmd = Proc.new, args = nil)
+    if cmd.kind_of?(ValidateCmd)
+      configure('invalid', cmd)
+    elsif args
+      configure('invalid', [cmd, args])
+    else
+      configure('invalid', cmd)
+    end
+  end
+=end
+
+  ####################################
+
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+
+  def value
+    _fromUTF8(tk_send_without_enc('get'))
+  end
+  def value= (val)
+    tk_send_without_enc('delete', 0, 'end')
+    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
+    val
+  end
+  alias get value
+  alias set value=
+
+  def cursor=(index)
+    tk_send_without_enc('icursor', index)
+    #self
+    index
+  end
+  alias icursor cursor=
+
+  def index(index)
+    number(tk_send_without_enc('index', index))
+  end
+
+  def insert(pos,text)
+    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
+    self
+  end
+
+  def mark(pos)
+    tk_send_without_enc('scan', 'mark', pos)
+    self
+  end
+  def dragto(pos)
+    tk_send_without_enc('scan', 'dragto', pos)
+    self
+  end
+  def selection_adjust(index)
+    tk_send_without_enc('selection', 'adjust', index)
+    self
+  end
+  def selection_clear
+    tk_send_without_enc('selection', 'clear')
+    self
+  end
+  def selection_from(index)
+    tk_send_without_enc('selection', 'from', index)
+    self
+  end
+  def selection_present()
+    bool(tk_send_without_enc('selection', 'present'))
+  end
+  def selection_range(s, e)
+    tk_send_without_enc('selection', 'range', s, e)
+    self
+  end
+  def selection_to(index)
+    tk_send_without_enc('selection', 'to', index)
+    self
+  end
+
+  # based on tk/scrollable.rb
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/extbutton.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
new file mode 100644
index 0000000000..158d9d474a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
@@ -0,0 +1,40 @@
+#
+#  tkextlib/iwidgets/extbutton.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Extbutton < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Extbutton
+  TkCommandNames = ['::iwidgets::extbutton'.freeze].freeze
+  WidgetClassName = 'Extbutton'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'bitmapforeground' << 'ringbackground'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'defaultring'
+  end
+  private :__boolval_optkeys
+
+  def invoke
+    tk_call(@path, 'invoke')
+    self
+  end
+
+  def flash
+    tk_call(@path, 'flash')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
new file mode 100644
index 0000000000..501f4c90a0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
@@ -0,0 +1,46 @@
+#
+#  tkextlib/iwidgets/extfileselectionbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Extfileselectionbox < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Extfileselectionbox
+  TkCommandNames = ['::iwidgets::extfileselectionbox'.freeze].freeze
+  WidgetClassName = 'Extfileselectionbox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() + [
+      'dirslabel', 'fileslabel', 'filterlabel', 'mask', 'nomatchstring', 
+      'selectionlabel'
+    ]
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() + ['dirson', 'fileson', 'filteron', 'selectionon']
+  end
+  private :__boolval_optkeys
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def filter
+    tk_call(@path, 'filter')
+    self
+  end
+
+  def get
+    tk_call(@path, 'get')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
new file mode 100644
index 0000000000..14388be7c4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
@@ -0,0 +1,33 @@
+#
+#  tkextlib/iwidgets/extfileselectiondialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Extfileselectiondialog < Tk::Iwidgets::Dialog
+    end
+  end
+end
+
+class Tk::Iwidgets::Extfileselectiondialog
+  TkCommandNames = ['::iwidgets::extfileselectiondialog'.freeze].freeze
+  WidgetClassName = 'Extfileselectiondialog'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def filter
+    tk_call(@path, 'filter')
+    self
+  end
+
+  def get
+    tk_call(@path, 'get')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/feedback.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/feedback.rb
new file mode 100644
index 0000000000..0a25237a24
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/feedback.rb
@@ -0,0 +1,35 @@
+#
+#  tkextlib/iwidgets/feedback.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Feedback < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Feedback
+  TkCommandNames = ['::iwidgets::feedback'.freeze].freeze
+  WidgetClassName = 'Feedback'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'barcolor'
+  end
+  private :__strval_optkeys
+
+  def reset
+    tk_call(@path, 'reset')
+    self
+  end
+
+  def step(inc=1)
+    tk_call(@path, 'step', inc)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
new file mode 100644
index 0000000000..7b331d0b40
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
@@ -0,0 +1,46 @@
+#
+#  tkextlib/iwidgets/fileselectionbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Fileselectionbox < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Fileselectionbox
+  TkCommandNames = ['::iwidgets::fileselectionbox'.freeze].freeze
+  WidgetClassName = 'Fileselectionbox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() + [
+      'directory', 'dirslabel', 'fileslabel', 'filterlabel', 'mask', 
+      'nomatchstring', 'selectionlabel'
+    ]
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() + ['dirson', 'fileson', 'filteron', 'selectionon']
+  end
+  private :__boolval_optkeys
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def filter
+    tk_call(@path, 'filter')
+    self
+  end
+
+  def get
+    tk_call(@path, 'get')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
new file mode 100644
index 0000000000..50f459e56d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
@@ -0,0 +1,33 @@
+#
+#  tkextlib/iwidgets/fileselectiondialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Fileselectiondialog < Tk::Iwidgets::Dialog
+    end
+  end
+end
+
+class Tk::Iwidgets::Fileselectiondialog
+  TkCommandNames = ['::iwidgets::fileselectiondialog'.freeze].freeze
+  WidgetClassName = 'Fileselectiondialog'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def filter
+    tk_call(@path, 'filter')
+    self
+  end
+
+  def get
+    tk_call(@path, 'get')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/finddialog.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
new file mode 100644
index 0000000000..75e219c37e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
@@ -0,0 +1,42 @@
+#
+#  tkextlib/iwidgets/finddialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Finddialog < Tk::Iwidgets::Dialogshell
+    end
+  end
+end
+
+class Tk::Iwidgets::Finddialog
+  TkCommandNames = ['::iwidgets::finddialog'.freeze].freeze
+  WidgetClassName = 'Finddialog'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() + [
+      'patternbackground', 'patternforeground', 
+      'searchbackground', 'searchforeground'
+    ]
+  end
+  private :__strval_optkeys
+
+  def __val2ruby_optkeys  # { key=>proc, ... }
+    super().update('textwidget'=>proc{|v| window(v)})
+  end
+  private :__val2ruby_optkeys
+
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def find
+    tk_call(@path, 'find')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
new file mode 100644
index 0000000000..4cc6aeecbd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
@@ -0,0 +1,309 @@
+#
+#  tkextlib/iwidgets/hierarchy.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/text'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Hierarchy < Tk::Iwidgets::Scrolledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Hierarchy
+  ItemConfCMD = ['tag'.freeze, 'configure'.freeze].freeze
+  include TkTextTagConfig
+
+  TkCommandNames = ['::iwidgets::hierarchy'.freeze].freeze
+  WidgetClassName = 'Hierarchy'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ####################################
+
+  include Tk::ValidateConfigure
+
+  class QueryCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL  = [ [?n, ?s, :node], nil ]
+      PROC_TBL = [ [?s, TkComm.method(:string) ], nil ]
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        val
+      end
+    end
+
+    def self._config_keys
+      # array of config-option key (string or symbol)
+      ['querycommand']
+    end
+  end
+
+  class IndicatorCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL  = [ 
+        [ ?n, ?s, :node ], 
+        [ ?s, ?b, :status ], 
+        nil
+      ]
+
+      PROC_TBL = [ 
+        [ ?s, TkComm.method(:string) ], 
+        [ ?b, TkComm.method(:bool) ], 
+        nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        val
+      end
+    end
+
+    def self._config_keys
+      # array of config-option key (string or symbol)
+      ['iconcommand', 'icondblcommand', 'imagedblcommand']
+    end
+  end
+
+  class IconCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL  = [ 
+        [ ?n, ?s, :node ], 
+        [ ?i, ?s, :icon ], 
+        nil
+      ]
+      PROC_TBL = [ [ ?s, TkComm.method(:string) ], nil ]
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        val
+      end
+    end
+
+    def self._config_keys
+      # array of config-option key (string or symbol)
+      ['dblclickcommand', 'imagecommand', 'selectcommand']
+    end
+  end
+
+  def __validation_class_list
+    super() << QueryCommand << IndicatorCommand << IconCommand
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, QueryCommand)
+  Tk::ValidateConfigure.__def_validcmd(binding, IndicatorCommand)
+  Tk::ValidateConfigure.__def_validcmd(binding, IconCommand)
+
+  ####################################
+
+  def __boolval_optkeys
+    super() << 'alwaysquery' << 'expanded' << 'filter'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'markbackground' << 'markforeground' << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    super() << 'textfont'
+  end
+  private :__font_optkeys
+
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def collapse(node)
+    tk_call(@path, 'collapse')
+    self
+  end
+
+  def current
+    tk_call(@path, 'current')
+  end
+
+  def draw(mode=None)
+    case mode
+    when None
+      # do nothing
+    when 'now', :now
+      mode = '-now'
+    when 'eventually', :eventually
+      mode = '-eventually'
+    when String, Symbol
+      mode = mode.to_s
+      mode = '-' << mode if mode[0] != ?-
+    end
+    tk_call(@path, 'draw', mode)
+  end
+
+  def expand(node)
+    tk_call(@path, 'expand', node)
+    self
+  end
+
+  def expanded?(node)
+    bool(tk_call(@path, 'expanded', node))
+  end
+
+  def exp_state
+    list(tk_call(@path, 'expState'))
+  end
+  alias expand_state  exp_state
+  alias expanded_list exp_state
+
+  def mark_clear
+    tk_call(@path, 'mark', 'clear')
+    self
+  end
+  def mark_add(*nodes)
+    tk_call(@path, 'mark', 'add', *nodes)
+    self
+  end
+  def mark_remove(*nodes)
+    tk_call(@path, 'mark', 'remove', *nodes)
+    self
+  end
+  def mark_get
+    list(tk_call(@path, 'mark', 'get'))
+  end
+
+  def refresh(node)
+    tk_call(@path, 'refresh', node)
+    self
+  end
+
+  def prune(node)
+    tk_call(@path, 'prune', node)
+    self
+  end
+
+  def selection_clear
+    tk_call(@path, 'selection', 'clear')
+    self
+  end
+  def selection_add(*nodes)
+    tk_call(@path, 'selection', 'add', *nodes)
+    self
+  end
+  def selection_remove(*nodes)
+    tk_call(@path, 'selection', 'remove', *nodes)
+    self
+  end
+  def selection_get
+    list(tk_call(@path, 'selection', 'get'))
+  end
+
+  def toggle(node)
+    tk_call(@path, 'toggle', node)
+    self
+  end
+
+  # based on TkText widget
+
+  def bbox(index)
+    list(tk_send_without_enc('bbox', _get_eval_enc_str(index)))
+  end
+
+  def compare(idx1, op, idx2)
+    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1), 
+                             op, _get_eval_enc_str(idx2)))
+  end
+
+  def debug
+    bool(tk_send_without_enc('debug'))
+  end
+  def debug=(boolean)
+    tk_send_without_enc('debug', boolean)
+    #self
+    boolean
+  end
+
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+
+  def dlineinfo(index)
+    list(tk_send_without_enc('dlineinfo', _get_eval_enc_str(index)))
+  end
+
+  def get(*index)
+    _fromUTF8(tk_send_without_enc('get', *index))
+  end
+
+  def index(index)
+    tk_send_without_enc('index', _get_eval_enc_str(index))
+  end
+
+  def insert(index, chars, *tags)
+    if tags[0].kind_of? Array
+      # multiple chars-taglist argument :: str, [tag,...], str, [tag,...], ...
+      args = [chars]
+      while tags.size > 0
+        args << tags.shift.collect{|x|_get_eval_string(x)}.join(' ')  # taglist
+        args << tags.shift if tags.size > 0                           # chars
+      end
+      super(index, *args)
+    else
+      # single chars-taglist argument :: str, tag, tag, ...
+      if tags.size == 0
+        super(index, chars)
+      else
+        super(index, chars, tags.collect{|x|_get_eval_string(x)}.join(' '))
+      end
+    end
+  end
+
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+  def see(index)
+    tk_send_without_enc('see', index)
+    self
+  end
+
+  # based on tk/scrollable.rb
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+
+  def yview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('yview'))
+    else
+      tk_send_without_enc('yview', *index)
+      self
+    end
+  end
+  def yview_moveto(*index)
+    yview('moveto', *index)
+  end
+  def yview_scroll(*index)
+    yview('scroll', *index)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
new file mode 100644
index 0000000000..77b0e090cd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
@@ -0,0 +1,50 @@
+#
+#  tkextlib/iwidgets/hyperhelp.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Hyperhelp < Tk::Iwidgets::Shell
+    end
+  end
+end
+
+class Tk::Iwidgets::Hyperhelp
+  TkCommandNames = ['::iwidgets::hyperhelp'.freeze].freeze
+  WidgetClassName = 'Hyperhelp'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'helpdir'
+  end
+  private :__strval_optkeys
+
+  def __listval_optkeys
+    super() << 'topics'
+  end
+  private :__listval_optkeys
+
+  def show_topic(topic)
+    tk_call(@path, 'showtopic', topic)
+    self
+  end
+
+  def follow_link(href)
+    tk_call(@path, 'followlink', href)
+    self
+  end
+
+  def forward
+    tk_call(@path, 'forward')
+    self
+  end
+
+  def back
+    tk_call(@path, 'back')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
new file mode 100644
index 0000000000..e77e85045d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
@@ -0,0 +1,39 @@
+#
+#  tkextlib/iwidgets/labeledframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Labeledframe < Tk::Itk::Archetype
+    end
+  end
+end
+
+class Tk::Iwidgets::Labeledframe
+  TkCommandNames = ['::iwidgets::labeledframe'.freeze].freeze
+  WidgetClassName = 'Labeledframe'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'labeltext'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'labelvariable'
+  end
+  private :__tkvariable_optkeys
+
+  def __font_optkeys
+    super() << 'labelfont'
+  end
+  private :__font_optkeys
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
new file mode 100644
index 0000000000..99387710cb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
@@ -0,0 +1,45 @@
+#
+#  tkextlib/iwidgets/labeledwidget.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Labeledwidget < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Labeledwidget
+  extend TkCore
+
+  TkCommandNames = ['::iwidgets::labeledwidget'.freeze].freeze
+  WidgetClassName = 'Labeledwidget'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'labeltext'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'labelvariable'
+  end
+  private :__tkvariable_optkeys
+
+  def __font_optkeys
+    super() << 'labelfont'
+  end
+  private :__font_optkeys
+
+  def self.alignlabels(*wins)
+    tk_call('::iwidgets::Labeledwidget::alignlabels', *wins)
+  end
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
new file mode 100644
index 0000000000..4b2541b997
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
@@ -0,0 +1,67 @@
+#
+#  tkextlib/iwidgets/mainwindow.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Mainwindow < Tk::Iwidgets::Shell
+    end
+  end
+end
+
+class Tk::Iwidgets::Mainwindow
+  TkCommandNames = ['::iwidgets::mainwindow'.freeze].freeze
+  WidgetClassName = 'Mainwindow'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'helpline' << 'statusline'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'menubarbackground' << 'menubarforeground' << 'toolbarforeground'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    super() << 'menubarfont' << 'toolbarfont'
+  end
+  private :__font_optkeys
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def menubar(*args)
+    unless args.empty?
+      tk_call(@path, 'menubar', *args)
+    end
+    window(tk_call(@path, 'menubar'))
+  end
+
+  def mousebar(*args)
+    unless args.empty?
+      tk_call(@path, 'mousebar', *args)
+    end
+    window(tk_call(@path, 'mousebar'))
+  end
+
+  def msgd(*args)
+    unless args.empty?
+      tk_call(@path, 'msgd', *args)
+    end
+    window(tk_call(@path, 'msgd'))
+  end
+
+  def toolbar(*args)
+    unless args.empty?
+      tk_call(@path, 'toolbar', *args)
+    end
+    window(tk_call(@path, 'toolbar'))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/menubar.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/menubar.rb
new file mode 100644
index 0000000000..dea3d34c2a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/menubar.rb
@@ -0,0 +1,210 @@
+#
+#  tkextlib/iwidgets/menubar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Menubar < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Menubar
+  TkCommandNames = ['::iwidgets::menubar'.freeze].freeze
+  WidgetClassName = 'Menubar'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'menubuttons'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvariable'
+  end
+  private :__tkvariable_optkeys
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'menucget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'menuconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_strval_optkeys(id)
+    super(id) << 'selectcolor'
+  end
+  private :__item_strval_optkeys
+
+  def __item_tkvariable_optkeys(id)
+    super(id) << 'helpstr'
+  end
+  private :__item_tkvariable_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  alias menucget itemcget
+  alias menuconfigure itemconfigure
+  alias menuconfiginfo itemconfiginfo
+  alias current_menuconfiginfo current_itemconfiginfo
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def __methodcall_optkeys
+    {'menubuttons'=>'menubuttons'}
+  end
+
+  def menubuttons(val = nil)
+    unless val
+      return tk_call(@path, 'cget', '-menubuttons')
+    end
+
+    tk_call(@path, 'configure', '-menubuttons', _parse_menu_spec(val))
+    self
+  end
+
+  def _parse_menu_spec(menu_spec)
+    ret = ''
+    menu_spec.each{|spec|
+      next unless spec
+
+      if spec.kind_of?(Hash)
+        args = [spec]
+        type = 'options'
+      else
+        type, *args = spec
+      end
+
+      type = type.to_s
+      case type
+      when 'options'
+        keys = args[0]
+        ary = [type]
+        ary.concat(hash_kv(keys))
+        ret << array2tk_list(ary) << "\n"
+
+      when 'menubutton', 'cascade'
+        name, keys = args
+        if keys
+          ary = [type, name]
+          keys = _symbolkey2str(keys)
+          keys['menu'] = _parse_menu_spec(keys['menu']) if keys.key?('menu')
+          ary.concat(hash_kv(keys))
+          ret << array2tk_list(ary) << "\n"
+        else
+          ret << array2tk_list([type, name]) << "\n"
+        end
+
+      else
+        name, keys = args
+        if keys
+          ary = [type, name]
+          ary.concat(hash_kv(keys))
+          ret << array2tk_list(ary) << "\n"
+        else
+          ret << array2tk_list([type, name]) << "\n"
+        end
+      end
+    }
+    ret
+  end
+
+  ####################################
+
+  def add(type, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    keys = _symbolkey2str(keys)
+    keys['menu'] = _parse_menu_spec(keys['menu']) if keys.key?('menu')
+    tk_call(@path, 'add', type, tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def delete(path1, path2=nil)
+    if path2
+    else
+      tk_call(@path, 'delete', index(idx))
+    end
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, type, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    keys = _symbolkey2str(keys)
+    keys['menu'] = _parse_menu_spec(keys['menu']) if keys.key?('menu')
+    tk_call(@path, 'insert', index(idx), type, tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def invoke(idx)
+    tk_call(@path, 'invoke', index(idx))
+    self
+  end
+
+  def menupath(pat)
+    if (win = tk_call(@path, 'path', pat)) == '-1'
+      return nil
+    end
+    window(win)
+  end
+  def menupath_glob(pat)
+    if (win = tk_call(@path, 'path', '-glob', pat)) == '-1'
+      return nil
+    end
+    window(win)
+  end
+  def menupath_tclregexp(pat)
+    if (win = tk_call(@path, 'path', '-regexp', pat)) == '-1'
+      return nil
+    end
+    window(win)
+  end
+
+  def type(path)
+    tk_call(@path, 'type', path)
+  end
+
+  def yposition(path)
+    number(tk_call(@path, 'yposition', path))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/messagebox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
new file mode 100644
index 0000000000..2bbbec7666
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
@@ -0,0 +1,91 @@
+#
+#  tkextlib/iwidgets/messagebox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Messagebox < Tk::Iwidgets::Scrolledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Messagebox
+  TkCommandNames = ['::iwidgets::messagebox'.freeze].freeze
+  WidgetClassName = 'Messagebox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'type', 'cget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'type', 'configure', id]
+  end
+  private :__item_config_cmd
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  def __item_boolval_optkeys(id)
+    super(id) << 'bell' << 'show'
+  end
+  private :__item_boolval_optkeys
+
+  alias typecget itemcget
+  alias typeconfigure itemconfigure
+  alias typeconfiginfo itemconfiginfo
+  alias current_typeconfiginfo current_itemconfiginfo
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def __strval_optkeys
+    super() << 'filename' << 'savedir'
+  end
+  private :__strval_optkeys
+
+  def type_add(tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    unless tag
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'type', 'add', tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def export(file)
+    tk_call(@path, 'export', file)
+    self
+  end
+
+  def issue(string, type=None, *args)
+    tk_call(@path, 'issue', string, tagid(type), *args)
+    self
+  end
+
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
new file mode 100644
index 0000000000..c19b83e517
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
@@ -0,0 +1,20 @@
+#
+#  tkextlib/iwidgets/messagedialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Messagedialog < Tk::Iwidgets::Dialog
+    end
+  end
+end
+
+class Tk::Iwidgets::Messagedialog
+  TkCommandNames = ['::iwidgets::messagedialog'.freeze].freeze
+  WidgetClassName = 'Messagedialog'.freeze
+  WidgetClassNames[WidgetClassName] = self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/notebook.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/notebook.rb
new file mode 100644
index 0000000000..0f9d713ea1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/notebook.rb
@@ -0,0 +1,168 @@
+#
+#  tkextlib/iwidgets/notebook.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Notebook < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Notebook
+  TkCommandNames = ['::iwidgets::notebook'.freeze].freeze
+  WidgetClassName = 'Notebook'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'pagecget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'pageconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  alias pagecget itemcget
+  alias pageconfigure itemconfigure
+  alias pageconfiginfo itemconfiginfo
+  alias current_pageconfiginfo current_itemconfiginfo
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def __boolval_optkeys
+    super() << 'auto'
+  end
+  private :__boolval_optkeys
+
+  def add(keys={})
+    window(tk_call(@path, 'add', *hash_kv(keys)))
+  end
+
+  def child_site_list
+    list(tk_call(@path, 'childsite'))
+  end
+
+  def child_site(idx)
+    if (new_idx = self.index(idx)) < 0
+      new_idx = tagid(idx)
+    end
+    window(tk_call(@path, 'childsite', new_idx))
+  end
+
+  def delete(idx1, idx2=nil)
+    if (new_idx1 = self.index(idx1)) < 0
+      new_idx1 = tagid(idx1)
+    end
+    if idx2
+      if (new_idx2 = self.index(idx2)) < 0
+        new_idx2 = tagid(idx2)
+      end
+      tk_call(@path, 'delete', new_idx1, new_idx2)
+    else
+      tk_call(@path, 'delete', new_idx1)
+    end
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, keys={})
+    if (new_idx = self.index(idx)) < 0
+      new_idx = tagid(idx)
+    end
+    window(tk_call(@path, 'insert', new_idx, *hash_kv(keys)))
+  end
+
+  def next
+    tk_call(@path, 'next')
+    self
+  end
+
+  def prev
+    tk_call(@path, 'prev')
+    self
+  end
+
+  def select(idx)
+    if (new_idx = self.index(idx)) < 0
+      new_idx = tagid(idx)
+    end
+    tk_call(@path, 'select', new_idx)
+    self
+  end
+
+  def scrollcommand(cmd=Proc.new)
+    configure_cmd 'scrollcommand', cmd
+    self
+  end
+  alias xscrollcommand scrollcommand
+  alias yscrollcommand scrollcommand
+
+  def xscrollbar(bar=nil)
+    if bar
+      @scrollbar = bar
+      @scrollbar.orient 'horizontal'
+      self.scrollcommand {|*arg| @scrollbar.set(*arg)}
+      @scrollbar.command {|*arg| self.xview(*arg)}
+      Tk.update  # avoid scrollbar trouble
+    end
+    @scrollbar
+  end
+  def yscrollbar(bar=nil)
+    if bar
+      @scrollbar = bar
+      @scrollbar.orient 'vertical'
+      self.scrollcommand {|*arg| @scrollbar.set(*arg)}
+      @scrollbar.command {|*arg| self.yview(*arg)}
+      Tk.update  # avoid scrollbar trouble
+    end
+    @scrollbar
+  end
+  alias scrollbar yscrollbar
+
+  def view(*idxs)
+    if idxs.size == 0
+      window(tk_send_without_enc('view'))
+    else
+      tk_send_without_enc('view', *idxs)
+      self
+    end
+  end
+  alias xview view
+  alias yview view
+
+  def view_moveto(*idxs)
+    view('moveto', *idxs)
+  end
+  alias xview_moveto view_moveto
+  alias yview_moveto view_moveto
+  def view_scroll(*idxs)
+    view('scroll', *idxs)
+  end
+  alias xview_scroll view_scroll
+  alias yview_scroll view_scroll
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
new file mode 100644
index 0000000000..0c74440be7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
@@ -0,0 +1,92 @@
+#
+#  tkextlib/iwidgets/optionmenu.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Optionmenu < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Optionmenu
+  TkCommandNames = ['::iwidgets::optionmenu'.freeze].freeze
+  WidgetClassName = 'Optionmenu'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'cyclicon'
+  end
+  private :__boolval_optkeys
+
+  def delete(first, last=nil)
+    if last
+      tk_call(@path, 'delete', first, last)
+    else
+      tk_call(@path, 'delete', first)
+    end
+    self
+  end
+
+  def disable(idx)
+    tk_call(@path, 'disable', idx)
+    self
+  end
+
+  def enable(idx)
+    tk_call(@path, 'enable', idx)
+    self
+  end
+
+  def get(first=nil, last=nil)
+    if last
+      simplelist(tk_call(@path, 'get', first, last))
+    elsif first
+      tk_call(@path, 'get', first)
+    else
+      tk_call(@path, 'get')
+    end
+  end
+  def get_range(first, last)
+    get(first, last)
+  end
+  def get_selected
+    get()
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', idx))
+  end
+
+  def insert(idx, *args)
+    tk_call(@path, 'insert', idx, *args)
+    self
+  end
+
+  def select(idx)
+    tk_call(@path, 'select', idx)
+    self
+  end
+
+  def sort(*params, &b)
+    # see 'lsort' man page about params
+    if b
+      tk_call(@path, 'sort', '-command', proc(&b), *params)
+    else
+      tk_call(@path, 'sort', *params)
+    end
+    self
+  end
+  def sort_ascending
+    tk_call(@path, 'sort', 'ascending')
+    self
+  end
+  def sort_descending
+    tk_call(@path, 'sort', 'descending')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
new file mode 100644
index 0000000000..035df0a5b8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
@@ -0,0 +1,132 @@
+#
+#  tkextlib/iwidgets/panedwindow.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Panedwindow < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Panedwindow
+  TkCommandNames = ['::iwidgets::panedwindow'.freeze].freeze
+  WidgetClassName = 'Panedwindow'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'panecget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'paneconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  alias panecget itemcget
+  alias paneconfigure itemconfigure
+  alias paneconfiginfo itemconfiginfo
+  alias current_paneconfiginfo current_itemconfiginfo
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def __boolval_optkeys
+    super() << 'showhandle'
+  end
+  private :__boolval_optkeys
+
+  def add(tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    window(tk_call(@path, 'add', tagid(tag), *hash_kv(keys)))
+    tag
+  end
+
+  def child_site_list
+    list(tk_call(@path, 'childsite'))
+  end
+
+  def child_site(idx)
+    window(tk_call(@path, 'childsite', index(idx)))
+  end
+
+  def delete(idx)
+    tk_call(@path, 'delete', index(idx))
+    self
+  end
+
+  def fraction(*percentages)
+    tk_call(@path, 'fraction', *percentages)
+    self
+  end
+
+  def hide(idx)
+    tk_call(@path, 'hide', index(idx))
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    window(tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys)))
+    tag
+  end
+
+  def invoke(idx=nil)
+    if idx
+      tk_call(@path, 'invoke', index(idx))
+    else
+      tk_call(@path, 'invoke')
+    end
+    self
+  end
+
+  def reset
+    tk_call(@path, 'reset')
+    self
+  end
+
+  def show(idx)
+    tk_call(@path, 'show', index(idx))
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
new file mode 100644
index 0000000000..620b14b5d5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
@@ -0,0 +1,131 @@
+#
+#  tkextlib/iwidgets/promptdialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Promptdialog < Tk::Iwidgets::Dialog
+    end
+  end
+end
+
+class Tk::Iwidgets::Promptdialog
+  TkCommandNames = ['::iwidgets::promptdialog'.freeze].freeze
+  WidgetClassName = 'Promptdialog'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  # index method is not available, because it shows index of the entry field
+  def default(name)
+    tk_call(@path, 'default', tagid(name))
+    self
+  end
+
+  def hide(name)
+    tk_call(@path, 'hide', tagid(name))
+    self
+  end
+
+  def invoke(name=nil)
+    if name
+      tk_call(@path, 'invoke', tagid(name))
+    else
+      tk_call(@path, 'invoke')
+    end
+    self
+  end
+
+  def show(name)
+    tk_call(@path, 'show', tagid(name))
+    self
+  end
+
+
+  # based on Tk::Iwidgets::Entryfield
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+
+  def value
+    _fromUTF8(tk_send_without_enc('get'))
+  end
+  def value= (val)
+    tk_send_without_enc('delete', 0, 'end')
+    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
+    val
+  end
+  alias get value
+  alias set value=
+
+  def cursor=(index)
+    tk_send_without_enc('icursor', index)
+    #self
+    index
+  end
+  alias icursor cursor=
+
+  def index(idx)
+    number(tk_send_without_enc('index', idx))
+  end
+
+  def insert(pos,text)
+    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
+    self
+  end
+
+  def mark(pos)
+    tk_send_without_enc('scan', 'mark', pos)
+    self
+  end
+  def dragto(pos)
+    tk_send_without_enc('scan', 'dragto', pos)
+    self
+  end
+  def selection_adjust(index)
+    tk_send_without_enc('selection', 'adjust', index)
+    self
+  end
+  def selection_clear
+    tk_send_without_enc('selection', 'clear')
+    self
+  end
+  def selection_from(index)
+    tk_send_without_enc('selection', 'from', index)
+    self
+  end
+  def selection_present()
+    bool(tk_send_without_enc('selection', 'present'))
+  end
+  def selection_range(s, e)
+    tk_send_without_enc('selection', 'range', s, e)
+    self
+  end
+  def selection_to(index)
+    tk_send_without_enc('selection', 'to', index)
+    self
+  end
+
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
new file mode 100644
index 0000000000..c21007ca6c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
@@ -0,0 +1,35 @@
+#
+#  tkextlib/iwidgets/pushbutton.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Pushbutton < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Pushbutton
+  TkCommandNames = ['::iwidgets::pushbutton'.freeze].freeze
+  WidgetClassName = 'Pushbutton'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'defaultring'
+  end
+  private :__boolval_optkeys
+
+  def invoke
+    tk_call_without_enc(@path, 'invoke')
+    self
+  end
+
+  def flash
+    tk_call_without_enc(@path, 'flash')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/radiobox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
new file mode 100644
index 0000000000..1a2821bd6a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
@@ -0,0 +1,116 @@
+#
+#  tkextlib/iwidgets/radiobox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Radiobox < Tk::Iwidgets::Labeledframe
+    end
+  end
+end
+
+class Tk::Iwidgets::Radiobox
+  TkCommandNames = ['::iwidgets::radiobox'.freeze].freeze
+  WidgetClassName = 'Radiobox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'buttoncget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'buttonconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_boolval_optkeys(id)
+    super(id) << 'defaultring'
+  end
+  private :__item_boolval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  alias buttoncget itemcget
+  alias buttonconfigure itemconfigure
+  alias buttonconfiginfo itemconfiginfo
+  alias current_buttonconfiginfo current_itemconfiginfo
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def add(tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'add', tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def delete(idx)
+    tk_call(@path, 'delete', index(idx))
+    self
+  end
+
+  def deselect(idx)
+    tk_call(@path, 'deselect', index(idx))
+    self
+  end
+
+  def flash(idx)
+    tk_call(@path, 'flash', index(idx))
+    self
+  end
+
+  def get(idx)
+    simplelist(tk_call(@path, 'get', index(idx))).collect{|id|
+      Tk::Itk::Component.id2obj(self, id)
+    }
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def select(idx)
+    tk_call(@path, 'select', index(idx))
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
new file mode 100644
index 0000000000..bddef50841
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
@@ -0,0 +1,24 @@
+#
+#  tkextlib/iwidgets/buttonbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scopedobject < TkObject
+    end
+  end
+end
+
+class Tk::Iwidgets::Scopedobject
+  TkCommandNames = ['::iwidgets::scopedobject'.freeze].freeze
+  WidgetClassName = 'Scopedobject'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def initialize(obj_name, keys={})
+    @path = tk_call(self.class::TkCommandNames[0], obj_name, *hash_kv(keys))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
new file mode 100644
index 0000000000..407c8f2aad
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
@@ -0,0 +1,347 @@
+#
+#  tkextlib/iwidgets/scrolledcanvas.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/canvas'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scrolledcanvas < Tk::Iwidgets::Scrolledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Scrolledcanvas
+  TkCommandNames = ['::iwidgets::scrolledcanvas'.freeze].freeze
+  WidgetClassName = 'Scrolledcanvas'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ################################
+
+  def __boolval_optkeys
+    super() << 'autoresize'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def initialize(*args)
+    super(*args)
+    @canvas = component_widget('canvas')
+  end
+
+  def method_missing(id, *args)
+    if @canvas.methods.include?(id.id2name)
+      @canvas.__send__(id, *args)
+    else
+      super(id, *args)
+    end
+  end
+
+  ################################
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def justify(dir)
+    tk_call(@path, 'justify', dir)
+    self
+  end
+
+  ##########################
+  include TkCanvasItemConfig
+
+  def tagid(tag)
+    if tag.kind_of?(TkcItem) || tag.kind_of?(TkcTag)
+      tag.id
+    elsif tag.kind_of?(Tk::Itk::Component)
+      tag.name
+    else
+      tag  # maybe an Array of configure paramters
+    end
+  end
+  private :tagid
+
+  # create a canvas item without creating a TkcItem object
+  def create(type, *args)
+    type.create(self, *args)
+  end
+
+  #######################
+
+  def addtag(tag, mode, *args)
+    tk_send_without_enc('addtag', tagid(tag), mode, *args)
+    self
+  end
+  def addtag_above(tagOrId, target)
+    addtag(tagOrId, 'above', tagid(target))
+  end
+  def addtag_all(tagOrId)
+    addtag(tagOrId, 'all')
+  end
+  def addtag_below(tagOrId, target)
+    addtag(tagOrId, 'below', tagid(target))
+  end
+  def addtag_closest(tagOrId, x, y, halo=None, start=None)
+    addtag(tagOrId, 'closest', x, y, halo, start)
+  end
+  def addtag_enclosed(tagOrId, x1, y1, x2, y2)
+    addtag(tagOrId, 'enclosed', x1, y1, x2, y2)
+  end
+  def addtag_overlapping(tagOrId, x1, y1, x2, y2)
+    addtag(tagOrId, 'overlapping', x1, y1, x2, y2)
+  end
+  def addtag_withtag(tagOrId, tag)
+    addtag(tagOrId, 'withtag', tagid(tag))
+  end
+
+  def bbox(tagOrId, *tags)
+    list(tk_send_without_enc('bbox', tagid(tagOrId), 
+                             *tags.collect{|t| tagid(t)}))
+  end
+
+  #def itembind(tag, context, cmd=Proc.new, *args)
+  #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
+  #  self
+  #end
+  def itembind(tag, context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([path, "bind", tagid(tag)], context, cmd, *args)
+    self
+  end
+
+  #def itembind_append(tag, context, cmd=Proc.new, *args)
+  #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
+  #  self
+  #end
+  def itembind_append(tag, context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
+    self
+  end
+
+  def itembind_remove(tag, context)
+    _bind_remove([path, "bind", tagid(tag)], context)
+    self
+  end
+
+  def itembindinfo(tag, context=nil)
+    _bindinfo([path, "bind", tagid(tag)], context)
+  end
+
+  def canvasx(screen_x, *args)
+    #tk_tcl2ruby(tk_send_without_enc('canvasx', screen_x, *args))
+    number(tk_send_without_enc('canvasx', screen_x, *args))
+  end
+  def canvasy(screen_y, *args)
+    #tk_tcl2ruby(tk_send_without_enc('canvasy', screen_y, *args))
+    number(tk_send_without_enc('canvasy', screen_y, *args))
+  end
+
+  def coords(tag, *args)
+    if args == []
+      tk_split_list(tk_send_without_enc('coords', tagid(tag)))
+    else
+      tk_send_without_enc('coords', tagid(tag), *(args.flatten))
+      self
+    end
+  end
+
+  def dchars(tag, first, last=None)
+    tk_send_without_enc('dchars', tagid(tag), 
+                        _get_eval_enc_str(first), _get_eval_enc_str(last))
+    self
+  end
+
+  def delete(*args)
+    if TkcItem::CItemID_TBL[self.path]
+      find('withtag', *args).each{|item| 
+        if item.kind_of?(TkcItem)
+          TkcItem::CItemID_TBL[self.path].delete(item.id)
+        end
+      }
+    end
+    tk_send_without_enc('delete', *args.collect{|t| tagid(t)})
+    self
+  end
+  alias remove delete
+
+  def dtag(tag, tag_to_del=None)
+    tk_send_without_enc('dtag', tagid(tag), tag_to_del)
+    self
+  end
+
+  def find(mode, *args)
+    list(tk_send_without_enc('find', mode, *args)).collect!{|id| 
+      TkcItem.id2obj(self, id)
+    }
+  end
+  def find_above(target)
+    find('above', tagid(target))
+  end
+  def find_all
+    find('all')
+  end
+  def find_below(target)
+    find('below', tagid(target))
+  end
+  def find_closest(x, y, halo=None, start=None)
+    find('closest', x, y, halo, start)
+  end
+  def find_enclosed(x1, y1, x2, y2)
+    find('enclosed', x1, y1, x2, y2)
+  end
+  def find_overlapping(x1, y1, x2, y2)
+    find('overlapping', x1, y1, x2, y2)
+  end
+  def find_withtag(tag)
+    find('withtag', tag)
+  end
+
+  def itemfocus(tagOrId=nil)
+    if tagOrId
+      tk_send_without_enc('focus', tagid(tagOrId))
+      self
+    else
+      ret = tk_send_without_enc('focus')
+      if ret == ""
+        nil
+      else
+        TkcItem.id2obj(self, ret)
+      end
+    end
+  end
+
+  def gettags(tagOrId)
+    list(tk_send_without_enc('gettags', tagid(tagOrId))).collect{|tag|
+      TkcTag.id2obj(self, tag)
+    }
+  end
+
+  def icursor(tagOrId, index)
+    tk_send_without_enc('icursor', tagid(tagOrId), index)
+    self
+  end
+
+  def index(tagOrId, idx)
+    number(tk_send_without_enc('index', tagid(tagOrId), idx))
+  end
+
+  def insert(tagOrId, index, string)
+    tk_send_without_enc('insert', tagid(tagOrId), index, 
+                        _get_eval_enc_str(string))
+    self
+  end
+
+  def lower(tag, below=nil)
+    if below
+      tk_send_without_enc('lower', tagid(tag), tagid(below))
+    else
+      tk_send_without_enc('lower', tagid(tag))
+    end
+    self
+  end
+
+  def move(tag, x, y)
+    tk_send_without_enc('move', tagid(tag), x, y)
+    self
+  end
+
+  def postscript(keys)
+    tk_send("postscript", *hash_kv(keys))
+  end
+
+  def raise(tag, above=nil)
+    if above
+      tk_send_without_enc('raise', tagid(tag), tagid(above))
+    else
+      tk_send_without_enc('raise', tagid(tag))
+    end
+    self
+  end
+
+  def scale(tag, x, y, xs, ys)
+    tk_send_without_enc('scale', tagid(tag), x, y, xs, ys)
+    self
+  end
+
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+
+  def select(mode, *args)
+    r = tk_send_without_enc('select', mode, *args)
+    (mode == 'item')? TkcItem.id2obj(self, r): self
+  end
+  def select_adjust(tagOrId, index)
+    select('adjust', tagid(tagOrId), index)
+  end
+  def select_clear
+    select('clear')
+  end
+  def select_from(tagOrId, index)
+    select('from', tagid(tagOrId), index)
+  end
+  def select_item
+    select('item')
+  end
+  def select_to(tagOrId, index)
+    select('to', tagid(tagOrId), index)
+  end
+
+  def itemtype(tag)
+    TkcItem.type2class(tk_send('type', tagid(tag)))
+  end
+
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+
+  def yview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('yview'))
+    else
+      tk_send_without_enc('yview', *index)
+      self
+    end
+  end
+  def yview_moveto(*index)
+    yview('moveto', *index)
+  end
+  def yview_scroll(*index)
+    yview('scroll', *index)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
new file mode 100644
index 0000000000..8b47460357
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
@@ -0,0 +1,59 @@
+#
+#  tkextlib/iwidgets/scrolledframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scrolledframe < Tk::Iwidgets::Scrolledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Scrolledframe
+  TkCommandNames = ['::iwidgets::scrolledframe'.freeze].freeze
+  WidgetClassName = 'Scrolledframe'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def justify(dir)
+    tk_call(@path, 'justify', dir)
+    self
+  end
+
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+
+  def yview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('yview'))
+    else
+      tk_send_without_enc('yview', *index)
+      self
+    end
+  end
+  def yview_moveto(*index)
+    yview('moveto', *index)
+  end
+  def yview_scroll(*index)
+    yview('scroll', *index)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
new file mode 100644
index 0000000000..9b69ef07fe
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
@@ -0,0 +1,58 @@
+#
+#  tkextlib/iwidgets/scrolledhtml.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scrolledhtml < Tk::Iwidgets::Scrolledtext
+    end
+  end
+end
+
+class Tk::Iwidgets::Scrolledhtml
+  TkCommandNames = ['::iwidgets::scrolledhtml'.freeze].freeze
+  WidgetClassName = 'Scrolledhtml'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'update'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'fontname' << 'link' << 'alink' << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    super() << 'fixedfont'
+  end
+  private :__font_optkeys
+
+  def import(href)
+    tk_call(@path, 'import', href)
+    self
+  end
+
+  def import_link(href)
+    tk_call(@path, 'import', '-link', href)
+    self
+  end
+
+  def pwd
+    tk_call(@path, 'pwd')
+  end
+
+  def render(htmltext, workdir=None)
+    tk_call(@path, 'render', htmltext, workdir)
+    self
+  end
+
+  def title
+    tk_call(@path, 'title')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
new file mode 100644
index 0000000000..cd1f6f0f79
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
@@ -0,0 +1,207 @@
+#
+#  tkextlib/iwidgets/scrolledlistbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/listbox'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scrolledlistbox < Tk::Iwidgets::Scrolledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Scrolledlistbox
+  TkCommandNames = ['::iwidgets::scrolledlistbox'.freeze].freeze
+  WidgetClassName = 'Scrolledlistbox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'listvariable'
+  end
+  private :__tkvariable_optkeys
+
+  def __font_optkeys
+    super() << 'textfont'
+  end
+  private :__font_optkeys
+
+  ################################
+
+  def initialize(*args)
+    super(*args)
+    @listbox = component_widget('listbox')
+  end
+
+  def method_missing(id, *args)
+    if @listbox.methods.include?(id.id2name)
+      @listbox.__send__(id, *args)
+    else
+      super(id, *args)
+    end
+  end
+
+  ################################
+
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def get_curselection
+    tk_call(@path, 'getcurselection')
+  end
+
+  def justify(dir)
+    tk_call(@path, 'justify', dir)
+    self
+  end
+
+  def selected_item_count
+    number(tk_call(@path, 'selecteditemcount'))
+  end
+
+  def sort(*params, &b)
+    # see 'lsort' man page about params
+    if b
+      tk_call(@path, 'sort', '-command', proc(&b), *params)
+    else
+      tk_call(@path, 'sort', *params)
+    end
+    self
+  end
+  def sort_ascending
+    tk_call(@path, 'sort', 'ascending')
+    self
+  end
+  def sort_descending
+    tk_call(@path, 'sort', 'descending')
+    self
+  end
+
+  #####################################
+
+  def bbox(index)
+    list(tk_send_without_enc('bbox', index))
+  end
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+  def get(*index)
+    _fromUTF8(tk_send_without_enc('get', *index))
+  end
+  def insert(index, *args)
+    tk_send('insert', index, *args)
+    self
+  end
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+  def see(index)
+    tk_send_without_enc('see', index)
+    self
+  end
+
+  #####################################
+
+  include TkListItemConfig
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::Itk::Component)
+      tag.name
+    else
+      super(tag)
+    end
+  end
+  private :tagid
+
+  #####################################
+
+  def activate(y)
+    tk_send_without_enc('activate', y)
+    self
+  end
+  def curselection
+    list(tk_send_without_enc('curselection'))
+  end
+  def get(first, last=nil)
+    if last
+      # tk_split_simplelist(_fromUTF8(tk_send_without_enc('get', first, last)))
+      tk_split_simplelist(tk_send_without_enc('get', first, last), 
+                          false, true)
+    else
+      _fromUTF8(tk_send_without_enc('get', first))
+    end
+  end
+  def nearest(y)
+    tk_send_without_enc('nearest', y).to_i
+  end
+  def size
+    tk_send_without_enc('size').to_i
+  end
+  def selection_anchor(index)
+    tk_send_without_enc('selection', 'anchor', index)
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send_without_enc('selection', 'clear', first, last)
+    self
+  end
+  def selection_includes(index)
+    bool(tk_send_without_enc('selection', 'includes', index))
+  end
+  def selection_set(first, last=None)
+    tk_send_without_enc('selection', 'set', first, last)
+    self
+  end
+
+  def index(idx)
+    tk_send_without_enc('index', idx).to_i
+  end
+
+  #####################################
+
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+
+  def yview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('yview'))
+    else
+      tk_send_without_enc('yview', *index)
+      self
+    end
+  end
+  def yview_moveto(*index)
+    yview('moveto', *index)
+  end
+  def yview_scroll(*index)
+    yview('scroll', *index)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
new file mode 100644
index 0000000000..fdafc8dc7f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
@@ -0,0 +1,538 @@
+#
+#  tkextlib/iwidgets/scrolledtext.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/text'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scrolledtext < Tk::Iwidgets::Scrolledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Scrolledtext
+  TkCommandNames = ['::iwidgets::scrolledtext'.freeze].freeze
+  WidgetClassName = 'Scrolledtext'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    super() << 'textfont'
+  end
+  private :__font_optkeys
+
+  ################################
+
+  def initialize(*args)
+    super(*args)
+    @text = component_widget('text')
+  end
+
+  def method_missing(id, *args)
+    if @text.methods.include?(id.id2name)
+      @text.__send__(id, *args)
+    else
+      super(id, *args)
+    end
+  end
+
+  ################################
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def import(file, idx=nil)
+    if idx
+      tk_call(@path, 'import', file, index(idx))
+    else
+      tk_call(@path, 'import', file)
+    end
+    self
+  end
+
+  def export(file)
+    tk_call(@path, 'export', file)
+    self
+  end
+
+  #####################################
+
+  include TkTextTagConfig
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::Itk::Component)
+      tag.name
+    else
+      super(tag)
+    end
+  end
+  private :tagid
+
+  def bbox(index)
+    list(tk_send('bbox', index))
+  end
+  def compare(idx1, op, idx2)
+    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1), 
+                             op, _get_eval_enc_str(idx2)))
+  end
+
+  def debug
+    bool(tk_send_without_enc('debug'))
+  end
+  def debug=(boolean)
+    tk_send_without_enc('debug', boolean)
+    #self
+    boolean
+  end
+
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+
+  def dlineinfo(index)
+    list(tk_send_without_enc('dlineinfo', _get_eval_enc_str(index)))
+  end
+
+  def get(*index)
+    _fromUTF8(tk_send_without_enc('get', *index))
+  end
+  def get_displaychars(*index)
+    # Tk8.5 feature
+    get('-displaychars', *index)
+  end
+
+  def image_cget(index, slot)
+    case slot.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      _fromUTF8(tk_send_without_enc('image', 'cget', 
+                                    _get_eval_enc_str(index), "-#{slot}"))
+    else
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('image', 'cget', 
+                                                _get_eval_enc_str(index), 
+                                                "-#{slot}")))
+    end
+  end
+
+  def image_configure(index, slot, value=None)
+    if slot.kind_of? Hash
+      _fromUTF8(tk_send_without_enc('image', 'configure', 
+                                    _get_eval_enc_str(index), 
+                                    *hash_kv(slot, true)))
+    else
+      _fromUTF8(tk_send_without_enc('image', 'configure', 
+                                    _get_eval_enc_str(index), 
+                                    "-#{slot}", 
+                                    _get_eval_enc_str(value)))
+    end
+    self
+  end
+
+  def image_configinfo(index, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        case slot.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
+        else
+          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).collect{|conflist|
+        #  conf = tk_split_simplelist(conflist)
+        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).collect{|conflist|
+          conf = tk_split_simplelist(conflist, false, true)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4]) 
+              else
+                conf[4] = tk_tcl2ruby(conf[4]) 
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        case slot.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
+        else
+          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).each{|conflist|
+        #  conf = tk_split_simplelist(conflist)
+        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).each{|conflist|
+          conf = tk_split_simplelist(conflist, false, true)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2]) 
+              else
+                conf[2] = tk_tcl2ruby(conf[2]) 
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3]) 
+              else
+                conf[3] = tk_tcl2ruby(conf[3]) 
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        ret
+      end
+    end
+  end
+
+  def current_image_configinfo(index, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        conf = image_configinfo(index, slot)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        image_configinfo(index).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      image_configinfo(index, slot).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+
+  def image_names
+    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'names'))).collect{|elt|
+    tk_split_simplelist(tk_send_without_enc('image', 'names'), false, true).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def index(idx)
+    tk_send_without_enc('index', _get_eval_enc_str(idx))
+  end
+
+  def insert(index, *args)
+    tk_send('insert', index, *args)
+    self
+  end
+
+  def mark_names
+    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('mark', 'names'))).collect{|elt|
+    tk_split_simplelist(tk_send_without_enc('mark', 'names'), false, true).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def mark_gravity(mark, direction=nil)
+    if direction
+      tk_send_without_enc('mark', 'gravity', 
+                          _get_eval_enc_str(mark), direction)
+      self
+    else
+      tk_send_without_enc('mark', 'gravity', _get_eval_enc_str(mark))
+    end
+  end
+
+  def mark_set(mark, index)
+    tk_send_without_enc('mark', 'set', _get_eval_enc_str(mark), 
+                        _get_eval_enc_str(index))
+    self
+  end
+  alias set_mark mark_set
+
+  def mark_unset(*marks)
+    tk_send_without_enc('mark', 'unset', 
+                        *(marks.collect{|mark| _get_eval_enc_str(mark)}))
+    self
+  end
+  alias unset_mark mark_unset
+
+  def mark_next(index)
+    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'next', 
+                                            _get_eval_enc_str(index))))
+  end
+  alias next_mark mark_next
+
+  def mark_previous(index)
+    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous', 
+                                            _get_eval_enc_str(index))))
+  end
+  alias previous_mark mark_previous
+
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+
+
+  def _ktext_length(txt)
+    if $KCODE !~ /n/i
+      return txt.gsub(/[^\Wa-zA-Z_\d]/, ' ').length
+    end
+
+    # $KCODE == 'NONE'
+    if JAPANIZED_TK
+      tk_call_without_enc('kstring', 'length', 
+                          _get_eval_enc_str(txt)).to_i
+    else
+      begin
+        tk_call_without_enc('encoding', 'convertto', 'ascii', 
+                            _get_eval_enc_str(txt)).length
+      rescue StandardError, NameError
+        # sorry, I have no plan
+        txt.length
+      end
+    end
+  end
+  private :_ktext_length
+
+  def tksearch(*args)
+    # call 'search' subcommand of text widget
+    #   args ::= [<array_of_opts>] <pattern> <start_index> [<stop_index>]
+    # If <pattern> is regexp, then it must be a regular expression of Tcl
+    if args[0].kind_of?(Array)
+      opts = args.shift.collect{|opt| '-' + opt.to_s }
+    else
+      opts = []
+    end
+
+    opts << '--'
+
+    ret = tk_send('search', *(opts + args))
+    if ret == ""
+      nil
+    else
+      ret
+    end
+  end
+
+  def tksearch_with_count(*args)
+    # call 'search' subcommand of text widget
+    #   args ::= [<array_of_opts>] <var> <pattern> <start_index> [<stop_index>]
+    # If <pattern> is regexp, then it must be a regular expression of Tcl
+    if args[0].kind_of?(Array)
+      opts = args.shift.collect{|opt| '-' + opt.to_s }
+    else
+      opts = []
+    end
+
+    opts << '-count' << args.shift << '--'
+
+    ret = tk_send('search', *(opts + args))
+    if ret == ""
+      nil
+    else
+      ret
+    end
+  end
+
+  def search_with_length(pat,start,stop=None)
+    pat = pat.chr if pat.kind_of? Integer
+    if stop != None
+      return ["", 0] if compare(start,'>=',stop)
+      txt = get(start,stop)
+      if (pos = txt.index(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+        if pat.kind_of? String
+          #return [index(start + " + #{pos} chars"), pat.split('').length]
+          return [index(start + " + #{pos} chars"), 
+                  _ktext_length(pat), pat.dup]
+        else
+          #return [index(start + " + #{pos} chars"), $&.split('').length]
+          return [index(start + " + #{pos} chars"), 
+                  _ktext_length(match), match]
+        end
+      else
+        return ["", 0]
+      end
+    else
+      txt = get(start,'end - 1 char')
+      if (pos = txt.index(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+        if pat.kind_of? String
+          #return [index(start + " + #{pos} chars"), pat.split('').length]
+          return [index(start + " + #{pos} chars"), 
+                  _ktext_length(pat), pat.dup]
+        else
+          #return [index(start + " + #{pos} chars"), $&.split('').length]
+          return [index(start + " + #{pos} chars"), 
+                  _ktext_length(match), match]
+        end
+      else
+        txt = get('1.0','end - 1 char')
+        if (pos = txt.index(pat))
+          match = $&
+          #pos = txt[0..(pos-1)].split('').length if pos > 0
+          pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+          if pat.kind_of? String
+            #return [index("1.0 + #{pos} chars"), pat.split('').length]
+            return [index("1.0 + #{pos} chars"), 
+                    _ktext_length(pat), pat.dup]
+          else
+            #return [index("1.0 + #{pos} chars"), $&.split('').length]
+            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+          end
+        else
+          return ["", 0]
+        end
+      end
+    end
+  end
+
+  def search(pat,start,stop=None)
+    search_with_length(pat,start,stop)[0]
+  end
+
+  def rsearch_with_length(pat,start,stop=None)
+    pat = pat.chr if pat.kind_of? Integer
+    if stop != None
+      return ["", 0] if compare(start,'<=',stop)
+      txt = get(stop,start)
+      if (pos = txt.rindex(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+        if pat.kind_of? String
+          #return [index(stop + " + #{pos} chars"), pat.split('').length]
+          return [index(stop + " + #{pos} chars"), _ktext_length(pat), pat.dup]
+        else
+          #return [index(stop + " + #{pos} chars"), $&.split('').length]
+          return [index(stop + " + #{pos} chars"), _ktext_length(match), match]
+        end
+      else
+        return ["", 0]
+      end
+    else
+      txt = get('1.0',start)
+      if (pos = txt.rindex(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+        if pat.kind_of? String
+          #return [index("1.0 + #{pos} chars"), pat.split('').length]
+          return [index("1.0 + #{pos} chars"), _ktext_length(pat), pat.dup]
+        else
+          #return [index("1.0 + #{pos} chars"), $&.split('').length]
+          return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+        end
+      else
+        txt = get('1.0','end - 1 char')
+        if (pos = txt.rindex(pat))
+          match = $&
+          #pos = txt[0..(pos-1)].split('').length if pos > 0
+          pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+          if pat.kind_of? String
+            #return [index("1.0 + #{pos} chars"), pat.split('').length]
+            return [index("1.0 + #{pos} chars"), _ktext_length(pat), pat.dup]
+          else
+            #return [index("1.0 + #{pos} chars"), $&.split('').length]
+            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+          end
+        else
+          return ["", 0]
+        end
+      end
+    end
+  end
+
+  def rsearch(pat,start,stop=None)
+    rsearch_with_length(pat,start,stop)[0]
+  end
+
+  def see(index)
+    tk_send_without_enc('see', index)
+    self
+  end
+
+  ###############################
+
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+
+  def yview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('yview'))
+    else
+      tk_send_without_enc('yview', *index)
+      self
+    end
+  end
+  def yview_moveto(*index)
+    yview('moveto', *index)
+  end
+  def yview_scroll(*index)
+    yview('scroll', *index)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
new file mode 100644
index 0000000000..eef093d314
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
@@ -0,0 +1,20 @@
+#
+#  tkextlib/iwidgets/scrolledwidget.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scrolledwidget < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Scrolledwidget
+  TkCommandNames = ['::iwidgets::scrolledwidget'.freeze].freeze
+  WidgetClassName = 'Scrolledwidget'.freeze
+  WidgetClassNames[WidgetClassName] = self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
new file mode 100644
index 0000000000..bb81fcca5e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
@@ -0,0 +1,102 @@
+#
+#  tkextlib/iwidgets/selectionbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Selectionbox < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Selectionbox
+  TkCommandNames = ['::iwidgets::selectionbox'.freeze].freeze
+  WidgetClassName = 'Selectionbox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'itemson' << 'selectionon'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'itemslabel' << 'selectionlabel'
+  end
+  private :__strval_optkeys
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def clear_items
+    tk_call(@path, 'clear', 'items')
+    self
+  end
+
+  def clear_selection
+    tk_call(@path, 'clear', 'selection')
+    self
+  end
+
+  def get
+    tk_call(@path, 'get')
+  end
+
+  def insert_items(idx, *args)
+    tk_call(@path, 'insert', 'items', idx, *args)
+  end
+
+  def insert_selection(pos, text)
+    tk_call(@path, 'insert', 'selection', pos, text)
+  end
+
+  def select_item
+    tk_call(@path, 'selectitem')
+    self
+  end
+
+  # based on TkListbox ( and TkTextWin )
+  def curselection
+    list(tk_send_without_enc('curselection'))
+  end
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+  def index(idx)
+    tk_send_without_enc('index', idx).to_i
+  end
+  def nearest(y)
+    tk_send_without_enc('nearest', y).to_i
+  end
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+  def selection_anchor(index)
+    tk_send_without_enc('selection', 'anchor', index)
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send_without_enc('selection', 'clear', first, last)
+    self
+  end
+  def selection_includes(index)
+    bool(tk_send_without_enc('selection', 'includes', index))
+  end
+  def selection_set(first, last=None)
+    tk_send_without_enc('selection', 'set', first, last)
+    self
+  end
+  def size
+    tk_send_without_enc('size').to_i
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
new file mode 100644
index 0000000000..ab790e97a6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
@@ -0,0 +1,92 @@
+#
+#  tkextlib/iwidgets/selectiondialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Selectiondialog < Tk::Iwidgets::Dialog
+    end
+  end
+end
+
+class Tk::Iwidgets::Selectiondialog
+  TkCommandNames = ['::iwidgets::selectiondialog'.freeze].freeze
+  WidgetClassName = 'Selectiondialog'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def clear_items
+    tk_call(@path, 'clear', 'items')
+    self
+  end
+
+  def clear_selection
+    tk_call(@path, 'clear', 'selection')
+    self
+  end
+
+  def get
+    tk_call(@path, 'get')
+  end
+
+  def insert_items(idx, *args)
+    tk_call(@path, 'insert', 'items', idx, *args)
+  end
+
+  def insert_selection(pos, text)
+    tk_call(@path, 'insert', 'selection', pos, text)
+  end
+
+  def select_item
+    tk_call(@path, 'selectitem')
+    self
+  end
+
+  # based on TkListbox ( and TkTextWin )
+  def curselection
+    list(tk_send_without_enc('curselection'))
+  end
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+  def index(idx)
+    tk_send_without_enc('index', idx).to_i
+  end
+  def nearest(y)
+    tk_send_without_enc('nearest', y).to_i
+  end
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+  def selection_anchor(index)
+    tk_send_without_enc('selection', 'anchor', index)
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send_without_enc('selection', 'clear', first, last)
+    self
+  end
+  def selection_includes(index)
+    bool(tk_send_without_enc('selection', 'includes', index))
+  end
+  def selection_set(first, last=None)
+    tk_send_without_enc('selection', 'set', first, last)
+    self
+  end
+  def size
+    tk_send_without_enc('size').to_i
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/shell.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/shell.rb
new file mode 100644
index 0000000000..dabf2e6f25
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/shell.rb
@@ -0,0 +1,38 @@
+#
+#  tkextlib/iwidgets/shell.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Shell < Tk::Itk::Toplevel
+    end
+  end
+end
+
+class Tk::Iwidgets::Shell
+  TkCommandNames = ['::iwidgets::shell'.freeze].freeze
+  WidgetClassName = 'Shell'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def activate
+    tk_call(@path, 'activate')  # may return val of deactibate method
+  end
+
+  def center(win=None)
+    tk_call(@path, 'center', win)
+    self
+  end
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def deactivate(val=None)
+    tk_call(@path, 'deactivate', val)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/spindate.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/spindate.rb
new file mode 100644
index 0000000000..2c98eb4629
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/spindate.rb
@@ -0,0 +1,48 @@
+#
+#  tkextlib/iwidgets/spindate.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Spindate < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Spindate
+  TkCommandNames = ['::iwidgets::spindate'.freeze].freeze
+  WidgetClassName = 'Spindate'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'dayon' << 'monthon' << 'yearon'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'daylabel' << 'monthformat' << 'monthlabel' << 'yearlabel'
+  end
+  private :__strval_optkeys
+
+  def get_string
+    tk_call(@path, 'get', '-string')
+  end
+  alias get get_string
+
+  def get_clicks
+    number(tk_call(@path, 'get', '-clicks'))
+  end
+
+  def show(date=None)
+    tk_call(@path, 'show', date)
+    self
+  end
+  def show_now
+    tk_call(@path, 'show', 'now')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/spinint.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/spinint.rb
new file mode 100644
index 0000000000..5eb944d081
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/spinint.rb
@@ -0,0 +1,30 @@
+#
+#  tkextlib/iwidgets/spinint.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Spinint < Tk::Iwidgets::Spinner
+    end
+  end
+end
+
+class Tk::Iwidgets::Spinint
+  TkCommandNames = ['::iwidgets::spinint'.freeze].freeze
+  WidgetClassName = 'Spinint'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'wrap'
+  end
+  private :__boolval_optkeys
+
+  def __numlistval_optkeys
+    super() << 'range'
+  end
+  private :__numlistval_optkeys
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/spinner.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/spinner.rb
new file mode 100644
index 0000000000..174b9bd506
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/spinner.rb
@@ -0,0 +1,150 @@
+#
+#  tkextlib/iwidgets/spinner.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Spinner < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Spinner
+  TkCommandNames = ['::iwidgets::spinner'.freeze].freeze
+  WidgetClassName = 'Spinner'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ####################################
+
+  include Tk::ValidateConfigure
+
+  class EntryfieldValidate < TkValidateCommand
+    #class CalCmdArgs < TkUtil::CallbackSubst
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL  = [ 
+        [ ?c, ?s, :char ], 
+        [ ?P, ?s, :post ], 
+        [ ?S, ?s, :current ], 
+        [ ?W, ?w, :widget ], 
+        nil
+      ]
+      PROC_TBL = [ 
+        [ ?s, TkComm.method(:string) ], 
+        [ ?w, TkComm.method(:window) ], 
+        nil
+      ]
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+    end
+
+    def self._config_keys
+      ['validate', 'invalid']
+    end
+  end
+
+  def __validation_class_list
+    super() << EntryfieldValidate
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, EntryfieldValidate)
+
+  ####################################
+
+  def up
+    tk_call_without_enc(@path, 'up')
+    self
+  end
+
+  def down
+    tk_call_without_enc(@path, 'down')
+    self
+  end
+
+  def clear
+    tk_call_without_enc(@path, 'clear')
+    self
+  end
+
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+
+  def value
+    _fromUTF8(tk_send_without_enc('get'))
+  end
+  def value= (val)
+    tk_send_without_enc('delete', 0, 'end')
+    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
+    val
+  end
+  alias get value
+  alias set value=
+
+  def cursor=(index)
+    tk_send_without_enc('icursor', index)
+    #self
+    index
+  end
+  alias icursor cursor=
+
+  def index(idx)
+    number(tk_send_without_enc('index', idx))
+  end
+
+  def insert(pos,text)
+    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
+    self
+  end
+
+  def mark(pos)
+    tk_send_without_enc('scan', 'mark', pos)
+    self
+  end
+  def dragto(pos)
+    tk_send_without_enc('scan', 'dragto', pos)
+    self
+  end
+  def selection_adjust(index)
+    tk_send_without_enc('selection', 'adjust', index)
+    self
+  end
+  def selection_clear
+    tk_send_without_enc('selection', 'clear')
+    self
+  end
+  def selection_from(index)
+    tk_send_without_enc('selection', 'from', index)
+    self
+  end
+  def selection_present()
+    bool(tk_send_without_enc('selection', 'present'))
+  end
+  def selection_range(s, e)
+    tk_send_without_enc('selection', 'range', s, e)
+    self
+  end
+  def selection_to(index)
+    tk_send_without_enc('selection', 'to', index)
+    self
+  end
+
+  # based on tk/scrollable.rb
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/spintime.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/spintime.rb
new file mode 100644
index 0000000000..0ff683ab56
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/spintime.rb
@@ -0,0 +1,48 @@
+#
+#  tkextlib/iwidgets/spintime.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Spintime < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Spintime
+  TkCommandNames = ['::iwidgets::spintime'.freeze].freeze
+  WidgetClassName = 'Spintime'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'houron' << 'militaryon' << 'minutelabel' << 'secondlabel'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'hourlabel' << 'minuteon' << 'secondon'
+  end
+  private :__strval_optkeys
+
+  def get_string
+    tk_call(@path, 'get', '-string')
+  end
+  alias get get_string
+
+  def get_clicks
+    number(tk_call(@path, 'get', '-clicks'))
+  end
+
+  def show(date=None)
+    tk_call(@path, 'show', date)
+    self
+  end
+  def show_now
+    tk_call(@path, 'show', 'now')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
new file mode 100644
index 0000000000..0d9715f87b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
@@ -0,0 +1,169 @@
+#
+#  tkextlib/iwidgets/tabnotebook.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Tabnotebook < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Tabnotebook
+  TkCommandNames = ['::iwidgets::tabnotebook'.freeze].freeze
+  WidgetClassName = 'Tabnotebook'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'pagecget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'pageconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_strval_optkeys(id)
+    super(id) << 'tabbackground' << 'tabforeground'
+  end
+  private :__item_strval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  alias pagecget itemcget
+  alias pageconfigure itemconfigure
+  alias pageconfiginfo itemconfiginfo
+  alias current_pageconfiginfo current_itemconfiginfo
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def __boolval_optkeys
+    super() << 'auto' << 'equaltabs' << 'raiseselect' << 'tabborders'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'backdrop' << 'tabbackground' << 'tabforeground'
+  end
+  private :__strval_optkeys
+
+  def initialize(*args)
+    super(*args)
+    @tabset = self.component_widget('tabset')
+  end
+
+  def add(keys={})
+    window(tk_call(@path, 'add', *hash_kv(keys)))
+  end
+
+  def child_site_list
+    list(tk_call(@path, 'childsite'))
+  end
+
+  def child_site(idx)
+    window(tk_call(@path, 'childsite', index(idx)))
+  end
+
+  def delete(idx1, idx2=nil)
+    if idx2
+      tk_call(@path, 'delete', index(idx1), index(idx2))
+    else
+      tk_call(@path, 'delete', index(idx1))
+    end
+    self
+  end
+
+  def index(idx)
+    #number(tk_call(@path, 'index', tagid(idx)))
+    @tabset.index(tagid(idx))
+  end
+
+  def insert(idx, keys={})
+    window(tk_call(@path, 'insert', index(idx), *hash_kv(keys)))
+  end
+
+  def next
+    tk_call(@path, 'next')
+    self
+  end
+
+  def prev
+    tk_call(@path, 'prev')
+    self
+  end
+
+  def select(idx)
+    tk_call(@path, 'select', index(idx))
+    self
+  end
+
+  def scrollcommand(cmd=Proc.new)
+    configure_cmd 'scrollcommand', cmd
+    self
+  end
+  alias xscrollcommand scrollcommand
+  alias yscrollcommand scrollcommand
+
+  def xscrollbar(bar=nil)
+    if bar
+      @scrollbar = bar
+      @scrollbar.orient 'horizontal'
+      self.scrollcommand {|*arg| @scrollbar.set(*arg)}
+      @scrollbar.command {|*arg| self.xview(*arg)}
+      Tk.update  # avoid scrollbar trouble
+    end
+    @scrollbar
+  end
+  def yscrollbar(bar=nil)
+    if bar
+      @scrollbar = bar
+      @scrollbar.orient 'vertical'
+      self.scrollcommand {|*arg| @scrollbar.set(*arg)}
+      @scrollbar.command {|*arg| self.yview(*arg)}
+      Tk.update  # avoid scrollbar trouble
+    end
+    @scrollbar
+  end
+  alias scrollbar yscrollbar
+
+  def view(*index)
+    if index.size == 0
+      window(tk_send_without_enc('view'))
+    else
+      tk_send_without_enc('view', *index)
+      self
+    end
+  end
+  alias xview view
+  alias yview view
+
+  def view_moveto(*index)
+    view('moveto', *index)
+  end
+  alias xview_moveto view_moveto
+  alias yview_moveto view_moveto
+  def view_scroll(*index)
+    view('scroll', *index)
+  end
+  alias xview_scroll view_scroll
+  alias yview_scroll view_scroll
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/tabset.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/tabset.rb
new file mode 100644
index 0000000000..54e56d0514
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/tabset.rb
@@ -0,0 +1,99 @@
+#
+#  tkextlib/iwidgets/tabset.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Tabset < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Tabset
+  TkCommandNames = ['::iwidgets::tabset'.freeze].freeze
+  WidgetClassName = 'Tabset'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'tabcget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'tabconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  alias tabcget itemcget
+  alias tabconfigure itemconfigure
+  alias tabconfiginfo itemconfiginfo
+  alias current_tabconfiginfo current_itemconfiginfo
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def __boolval_optkeys
+    super() << 'equaltabs' << 'raiseselect' << 'tabborders'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'backdrop'
+  end
+  private :__strval_optkeys
+
+  def add(keys={})
+    window(tk_call(@path, 'add', *hash_kv(keys)))
+  end
+
+  def delete(idx1, idx2=nil)
+    if idx2
+      tk_call(@path, 'delete', index(idx1), index(idx2))
+    else
+      tk_call(@path, 'delete', index(idx1))
+    end
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, keys={})
+    window(tk_call(@path, 'insert', index(idx), *hash_kv(keys)))
+  end
+
+  def next
+    tk_call(@path, 'next')
+    self
+  end
+
+  def prev
+    tk_call(@path, 'prev')
+    self
+  end
+
+  def select(idx)
+    tk_call(@path, 'select', index(idx))
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/timeentry.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
new file mode 100644
index 0000000000..588da77dc8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
@@ -0,0 +1,25 @@
+#
+#  tkextlib/iwidgets/timeentry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Timeentry < Tk::Iwidgets::Timefield
+    end
+  end
+end
+
+class Tk::Iwidgets::Timeentry
+  TkCommandNames = ['::iwidgets::timeentry'.freeze].freeze
+  WidgetClassName = 'Timeentry'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __strval_optkeys
+    super() << 'closetext'
+  end
+  private :__strval_optkeys
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/timefield.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/timefield.rb
new file mode 100644
index 0000000000..28e1504797
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/timefield.rb
@@ -0,0 +1,58 @@
+#
+#  tkextlib/iwidgets/timefield.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Timefield < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Timefield
+  TkCommandNames = ['::iwidgets::timefield'.freeze].freeze
+  WidgetClassName = 'Timefield'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'gmt'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    super() << 'textfont'
+  end
+  private :__font_optkeys
+
+  def get_string
+    tk_call(@path, 'get', '-string')
+  end
+  alias get get_string
+
+  def get_clicks
+    number(tk_call(@path, 'get', '-clicks'))
+  end
+
+  def valid?
+    bool(tk_call(@path, 'isvalid'))
+  end
+  alias isvalid? valid?
+
+  def show(time=None)
+    tk_call(@path, 'show', time)
+    self
+  end
+  def show_now
+    tk_call(@path, 'show', 'now')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/toolbar.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
new file mode 100644
index 0000000000..17cfa62156
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
@@ -0,0 +1,112 @@
+#
+#  tkextlib/iwidgets/toolbar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Toolbar < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Toolbar
+  TkCommandNames = ['::iwidgets::toolbar'.freeze].freeze
+  WidgetClassName = 'Toolbar'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __tkvariable_optkeys
+    super() << 'helpvariable'
+  end
+  private :__tkvariable_optkeys
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'itemcget', self.index(id)]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'itemconfigure', self.index(id)]
+  end
+  private :__item_config_cmd
+
+  def __item_strval_optkeys(id)
+    super(id) << 'helpstr' << 'balloonstr'
+  end
+  private :__item_strval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  ####################################
+
+  def __strval_optkeys
+    super() << 'balloonbackground' << 'balloonforeground'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvariable'
+  end
+  private :__tkvariable_optkeys
+
+  def __font_optkeys
+    super() << 'balloonfont'
+  end
+  private :__font_optkeys
+
+  def add(type, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    window(tk_call(@path, 'add', type, tagid(tag), *hash_kv(keys)))
+    tag
+  end
+
+  def delete(idx1, idx2=nil)
+    if idx2
+      tk_call(@path, 'delete', index(idx1), index(idx2))
+    else
+      tk_call(@path, 'delete', index(idx1))
+    end
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, type, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    window(tk_call(@path, 'insert', index(idx), type, 
+                   tagid(tag), *hash_kv(keys)))
+    tag
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/watch.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/watch.rb
new file mode 100644
index 0000000000..ab2b687cf9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/iwidgets/watch.rb
@@ -0,0 +1,56 @@
+#
+#  tkextlib/iwidgets/watch.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Watch < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Watch
+  TkCommandNames = ['::iwidgets::watch'.freeze].freeze
+  WidgetClassName = 'Watch'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'showampm'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'clockcolor' << 'hourcolor' << 'minutecolor' << 
+      'pivotcolor' << 'secondcolor' << 'tickcolor'
+  end
+  private :__strval_optkeys
+
+  def get_string
+    tk_call(@path, 'get', '-string')
+  end
+  alias get get_string
+
+  def get_clicks
+    number(tk_call(@path, 'get', '-clicks'))
+  end
+
+  def show(time=None)
+    tk_call(@path, 'show', time)
+    self
+  end
+  def show_now
+    tk_call(@path, 'show', 'now')
+    self
+  end
+
+  def watch(*args)
+    unless args.empty?
+      tk_call(@path, 'watch', *args)
+    end
+    component_path('canvas')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/pkg_checker.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/pkg_checker.rb
new file mode 100755
index 0000000000..5002ed7ff8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/pkg_checker.rb
@@ -0,0 +1,184 @@
+#!/usr/bin/env ruby
+#
+#  Ruby/Tk extension library checker
+#
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+TkRoot.new.withdraw  # hide root window
+
+name = File.basename(__FILE__)
+
+add_path = false
+verbose  = false
+
+def help_msg
+  print "Usage: #{$0} [-l] [-v] [-h] [--] [dir]\n"
+  print "\tIf dir is omitted, check the directry that this command exists.\n"
+  print "\tAvailable options are \n"
+  print "\t  -l : Add dir to $LOAD_PATH\n"
+  print "\t       (If dir == '<parent>/tkextlib', add <parent> also.)\n"
+  print "\t  -v : Verbose mode (show reason of fail)\n"
+  print "\t  -h : Show this message\n"
+  print "\t  -- : End of options\n"
+end
+
+while(ARGV[0] && ARGV[0][0] == ?-)
+  case ARGV[0]
+  when '--'
+    ARGV.shift
+    break;
+  when '-l'
+    ARGV.shift
+    add_path = true
+  when '-v'
+    ARGV.shift
+    verbose = true
+  when '-h'
+    help_msg
+    exit(0)
+  else
+    print "Argument Error!! : unknown option '#{ARGV[0]}'\n"
+    help_msg
+    exit(1)
+  end
+end
+
+if ARGV[0]
+  dir = File.expand_path(ARGV[0])
+else
+  dir = File.dirname(File.expand_path(__FILE__))
+end
+
+if add_path
+  $LOAD_PATH.unshift(dir)
+  if File.basename(dir) == 'tkextlib'
+    $LOAD_PATH.unshift(File.dirname(dir))
+  end
+end
+
+print "\nRuby/Tk extension library checker\n"
+print "( Note:: This check is very simple one. Shown status may be wrong. )\n"
+print "\n check directory :: #{dir}"
+print "\n $LOAD_PATH :: #{$LOAD_PATH.inspect}\n"
+
+def get_pkg_list(file)
+  pkg_list = []
+
+  File.foreach(file){|l|
+    if l =~ /^(?:[^#]+\s|\s*)(?:|;\s*)TkPackage\s*\.\s*require\s*\(?\s*(["'])((\w|:)+)\1/
+      pkg = [$2, :package]
+      pkg_list << pkg unless pkg_list.member?(pkg)
+    end
+    if l =~ /^(?:[^#]+\s|\s*)(?:|;\s*)Tk\s*\.\s*load_tcllibrary\s*\(?\s*(["'])((\w|:)+)\1/
+      pkg = [$2, :library]
+      pkg_list << pkg unless pkg_list.member?(pkg)
+    end
+    if l =~ /^(?:[^#]+\s|\s*)(?:|;\s*)Tk\s*\.\s*load_tclscript\s*\(?\s*(["'])((\w|:)+)\1/
+      pkg = [$2, :script]
+      pkg_list << pkg unless pkg_list.member?(pkg)
+    end
+    if l =~ /^(?:[^#]+\s|\s*)(?:|;\s*)require\s*\(?\s*(["'])((\w|\/|:)+)\1/
+      pkg = [$2, :require_ruby_lib]
+      pkg_list << pkg unless pkg_list.member?(pkg)
+    end
+  }
+
+  pkg_list
+end
+
+def check_pkg(file, verbose=false)
+  pkg_list = get_pkg_list(file)
+
+  error_list = []
+  success_list = {}
+
+  pkg_list.each{|name, type|
+    next if success_list[name]
+
+    begin
+      case type
+      when :package
+        ver = TkPackage.require(name)
+        success_list[name] = ver
+        error_list.delete_if{|n, t| n == name}
+
+      when :library
+        Tk.load_tcllibrary(name)
+        success_list[name] = :library
+        error_list.delete_if{|n, t| n == name}
+
+      when :script
+        Tk.load_tclscript(name)
+        success_list[name] = :script
+        error_list.delete_if{|n, t| n == name}
+
+      when :require_ruby_lib
+        require name
+
+      end
+    rescue => e
+      if verbose
+        error_list << [name, type, e.message]
+      else
+        error_list << [name, type]
+      end
+    end
+  }
+
+  success_list.dup.each{|name, ver|
+    unless ver.kind_of?(String)
+      begin
+        ver = TkPackage.require(name)
+        sccess_list[name] = ver
+      rescue
+      end
+    end
+  }
+
+  [success_list, error_list]
+end
+
+def subdir_check(dir, verbose=false)
+  Dir.foreach(dir){|f|
+    next if f == '.' || f == '..'
+    if File.directory?(f)
+      subdir_check(File.join(dir, f))
+    elsif File.extname(f) == '.rb'
+      path = File.join(dir, f)
+      suc, err = check_pkg(path, verbose)
+      if err.empty?
+        print 'Ready : ', path, ' : require->', suc.inspect, "\n"
+      else
+        print '*LACK : ', path, ' : require->', suc.inspect, 
+          '  FAIL->', err.inspect, "\n"
+      end
+    end
+  }
+end
+
+Dir.chdir(dir)
+
+(Dir['*.rb'] - ['setup.rb', name]).each{|f|
+  subdir = File.basename(f, '.*')
+=begin
+  begin
+    # read 'setup.rb' as if the library has standard structure
+    require File.join(subdir, 'setup.rb')
+  rescue LoadError
+    # ignore error
+  end
+=end
+  print "\n"
+
+  suc, err = check_pkg(f, verbose)
+  if err.empty?
+    print 'Ready : ', f, ' : require->', suc.inspect, "\n"
+  else
+    print '*LACK : ', f, ' : require->', suc.inspect, 
+      '  FAIL->', err.inspect, "\n"
+  end
+
+  subdir_check(subdir, verbose) if File.directory?(subdir)
+}
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/setup.rb
new file mode 100644
index 0000000000..12867e8f9c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before using Tk extension libraries
+#
+#    If you need some setup operations for Tk extensions (for example, 
+#    modify the dynamic library path) required, please write the setup 
+#    operations in this file. This file is required at the last of 
+#    "require 'tk'". 
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib.rb
new file mode 100644
index 0000000000..c6138f4275
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib.rb
@@ -0,0 +1,90 @@
+#
+#  tcllib extension support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tcllib/setup.rb'
+
+err = ''
+
+# package:: autoscroll
+target = 'tkextlib/tcllib/autoscroll'
+begin
+  require target
+rescue => e
+  err << "\n  ['" << target << "'] "  << e.class.name << ' : ' << e.message
+end
+
+# package:: cursor
+target = 'tkextlib/tcllib/cursor'
+begin
+  require target
+rescue => e
+  err << "\n  ['" << target << "'] "  << e.class.name << ' : ' << e.message
+end
+
+# package:: style
+target = 'tkextlib/tcllib/style'
+begin
+  require target
+rescue => e
+  err << "\n  ['" << target << "'] "  << e.class.name << ' : ' << e.message
+end
+
+# autoload
+module Tk
+  module Tcllib
+    TkComm::TkExtlibAutoloadModule.unshift(self)
+
+    # package:: ctext
+    autoload :CText,              'tkextlib/tcllib/ctext'
+
+    # package:: getstring
+    autoload :GetString_Dialog,   'tkextlib/tcllib/getstring'
+
+    # package:: history
+    autoload :History,            'tkextlib/tcllib/history'
+
+    # package:: datefield
+    autoload :Datefield,          'tkextlib/tcllib/datefield'
+    autoload :DateField,          'tkextlib/tcllib/datefield'
+
+    # package:: ico
+    autoload :ICO,                'tkextlib/tcllib/ico'
+
+    # package:: ipentry
+    autoload :IP_Entry,           'tkextlib/tcllib/ip_entry'
+    autoload :IPEntry,            'tkextlib/tcllib/ip_entry'
+
+    # package:: swaplist
+    autoload :Swaplist_Dialog,    'tkextlib/tcllib/swaplist'
+
+    # package:: Plotchart
+    autoload :Plotchart,          'tkextlib/tcllib/plotchart'
+
+    # package:: tablelist
+    autoload :Tablelist,           'tkextlib/tcllib/tablelist'
+    autoload :TableList,           'tkextlib/tcllib/tablelist'
+    autoload :Tablelist_Tile,      'tkextlib/tcllib/tablelist_tile'
+    autoload :TableList_Tile,      'tkextlib/tcllib/tablelist_tile'
+
+    # package:: tkpiechart
+    autoload :Tkpiechart,         'tkextlib/tcllib/tkpiechart'
+
+    # package:: tooltip
+    autoload :Tooltip,            'tkextlib/tcllib/tooltip'
+
+    # package:: widget
+    autoload :Wdiget,             'tkextlib/tcllib/widget'
+  end
+end
+
+if $VERBOSE && !err.empty?
+  warn("Warning: some sub-packages are failed to require : " + err)
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/README b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/README
new file mode 100644
index 0000000000..953239befa
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/README
@@ -0,0 +1,135 @@
+
+ [ tcllib extension support files ]
+
+Tcllib includes many utilities. But currently, supports TKLib part
+only (see the following 'tcllib contents').
+
+If you request to support others, please send your message to one of 
+ruby-talk/ruby-list/ruby-dev/ruby-ext mailing lists. 
+
+-----<from "What is tcllib?">----------------------------
+Tcllib is a collection of utility modules for Tcl. These modules provide 
+a wide variety of functionality, from implementations of standard data 
+structures to implementations of common networking protocols. The intent 
+is to collect commonly used function into a single library, which users 
+can rely on to be available and stable.
+---------------------------------------------------------
+
+-----< tcllib contents (based on tcllib-1.6.1) >---------
+Programming tools
+    * cmdline - Procedures to process command lines and options.
+    * comm - A remote communications facility for Tcl (7.6, 8.0, and later)
+    * control - Procedures for control flow structures.
+    * fileutil - Procedures implementing some file utilities
+    * log - Procedures to log messages of libraries and applications.
+    * logger - System to control logging of events.
+    * multiplexer - One-to-many communication with sockets.
+    * snit - Snit's Not Incr Tcl
+    * snitfaq - Snit Frequently Asked Questions
+    * stooop - Object oriented extension.
+    * stoop - Simple Tcl Only Object Oriented Programming
+    * switched - stooop switched class
+    * profiler - Tcl source code profiler
+
+Mathematics
+    * math::statistics - Basic statistical functions and procedures
+    * math::calculus - Integration and ordinary differential equations
+    * math::optimize - Optimisation routines
+    * math::fuzzy - Fuzzy comparison of floating-point numbers
+    * counter - Procedures for counters and histograms
+    * combinatorics - Combinatorial functions in the Tcl Math Library
+
+Data structures
+    * struct::list - Procedures for manipulating lists
+    * struct::set - Procedures for manipulating sets
+    * struct::stack - Create and manipulate stack objects
+    * struct::queue - Create and manipulate queue objects
+    * struct::prioqueue - Create and manipulate prioqueue objects
+    * struct::skiplist - Create and manipulate skiplists
+    * struct::tree - Create and manipulate tree objects
+    * struct::graph - Create and manipulate directed graph objects
+    * struct::record - Define and create records (similar to 'C' structures)
+    * struct::matrix - Create and manipulate matrix objects
+    * struct::pool - Create and manipulate pool objects (of discrete items)
+    * report - Create and manipulate report objects
+
+Text processing
+    * expander - Procedures to process templates and expand text.
+    * base64 - Procedures to encode and decode base64
+    * yencode - encode/decoding a binary file
+    * uuencode - encode/decoding a binary file
+    * csv - Procedures to handle CSV data.
+    * inifile - Parsing of Windows INI files
+    * htmlparse - Procedures to parse HTML strings
+    * mime - Manipulation of MIME body parts
+    * Tcl MIME - generates and parses MIME body parts
+    * textutil - Procedures to manipulate texts and strings.
+    * exif - Tcl EXIF extracts and parses EXIF fields from digital images
+    * EXIF - extract and parse EXIF fields from digital images
+
+Hashes, checksums, and encryption
+    * cksum - calculate a cksum(1) compatible checksum
+    * crc16 - Perform a 16bit Cyclic Redundancy Check
+    * crc32 - Perform a 32bit Cyclic Redundancy Check
+    * des - Perform DES encryption of Tcl data
+    * md4 - MD4 Message-Digest Algorithm
+    * md5 - MD5 Message-Digest Algorithm
+    * ripemd160 - RIPEMD-160 Message-Digest Algorithm
+    * ripemd128 - RIPEMD-128 Message-Digest Algorithm
+    * md5crypt - MD5-based password encryption
+    * sha1 - Perform sha1 hashing
+    * sum - calculate a sum(1) compatible checksum
+    * soundex - Soundex
+
+Documentation tools
+    * mpexpand - Markup processor
+    * doctools - Create and manipulate doctools converter object
+    * doctoc_fmt - Specification of simple tcl markup for table of contents
+    * doctools_api - Interface specification for formatter code
+    * doctools_fmt - Specification of simple tcl markup for manpages
+    * docidx - Create and manipulate docidx converter objects
+    * docidx_api - Interface specification for index formatting code
+    * docidx_fmt - Specification of simple tcl markup for an index
+    * doctoc - Create and manipulate doctoc converter objects
+    * doctoc_api - Interface specification for toc formatting code
+    * doctools::changelog - Handle text in Emacs ChangeLog format
+    * doctools::cvs - Handle text in 'cvs log' format
+
+Networking
+    * uri - URI utilities
+    * dns - Tcl Domain Name Service Client
+    * ntp_time - Tcl Time Service Client
+    * nntp - Tcl client for the NNTP protocol
+    * pop3 - Tcl client for POP3 email protocol
+    * pop3d - Tcl POP3 server implementation
+    * pop3d::udb - Simple user database for pop3d
+    * pop3d::dbox - Simple mailbox database for pop3d
+    * ftp - Client-side tcl implementation of the ftp protocol
+    * ftp - Client-side tcl implementation of the ftp protocol
+    * ftpd - Tcl FTP server implementation
+    * smtp - Client-side tcl implementation of the smtp protocol
+    * smtpd - Tcl SMTP server implementation
+    * irc - Create IRC connection and interface.
+
+CGI programming
+    * ncgi - Procedures to manipulate CGI values.
+    * html - Procedures to generate HTML structures
+    * javascript - Procedures to generate HTML and Java Script structures.
+
+Grammars and finite automata
+    * grammar::fa - Create and manipulate finite automatons
+    * grammar::fa::op - Operations on finite automatons
+    * grammar::dacceptor - Create and use deterministic acceptors
+    * grammar::dexec - Execute deterministic finite automatons
+
+TKLib
+    * Plotchart - Simple plotting and charting package
+    * autoscroll - Provides for a scrollbar to automatically mapped and 
+                   unmapped as needed
+    * ctext - An extended text widget with customizable Syntax highlighting
+    * cursor - Procedures to handle CURSOR data
+    * datefield - Tk datefield widget
+    * style - Changes default Tk look&feel
+    * ipentry - An IP address entry widget
+    * tkpiechart - Creates and dynamically updates 2D or 3D pie charts
+---------------------------------------------------------
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/autoscroll.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
new file mode 100644
index 0000000000..6940a9174c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
@@ -0,0 +1,158 @@
+#
+#  tkextlib/tcllib/autoscroll.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Provides for a scrollbar to automatically mapped and unmapped as needed
+#
+# (The following is the original description of the library.)
+#
+# This package allows scrollbars to be mapped and unmapped as needed 
+# depending on the size and content of the scrollbars scrolled widget. 
+# The scrollbar must be managed by either pack or grid, other geometry 
+# managers are not supported.
+#
+# When managed by pack, any geometry changes made in the scrollbars parent 
+# between the time a scrollbar is unmapped, and when it is mapped will be 
+# lost. It is an error to destroy any of the scrollbars siblings while the 
+# scrollbar is unmapped. When managed by grid, if anything becomes gridded 
+# in the same row and column the scrollbar occupied it will be replaced by 
+# the scrollbar when remapped.
+#
+# This package may be used on any scrollbar-like widget as long as it 
+# supports the set subcommand in the same style as scrollbar. If the set 
+# subcommand is not used then this package will have no effect.
+#
+
+require 'tk'
+require 'tk/scrollbar'
+require 'tkextlib/tcllib.rb'
+
+module Tk
+  module Tcllib
+    module Autoscroll
+      PACKAGE_NAME = 'autoscroll'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('autoscroll')
+        rescue
+          ''
+        end
+      end
+
+      def self.not_available
+        fail RuntimeError, "'tkextlib/tcllib/autoscroll' extension is not available on your current environment."
+      end
+
+      def self.autoscroll(win)
+        Tk::Tcllib::Autoscroll.not_available
+      end
+
+      def self.unautoscroll(win)
+        Tk::Tcllib::Autoscroll.not_available
+      end
+    end
+  end
+end
+
+module Tk
+  module Scrollable
+    def autoscroll(mode = nil)
+      case mode
+      when :x, 'x'
+        if @xscrollbar
+          Tk::Tcllib::Autoscroll.autoscroll(@xscrollbar)
+        end
+      when :y, 'y'
+        if @yscrollbar
+          Tk::Tcllib::Autoscroll.autoscroll(@yscrollbar)
+        end
+      when nil, :both, 'both'
+        if @xscrollbar
+          Tk::Tcllib::Autoscroll.autoscroll(@xscrollbar)
+        end
+        if @yscrollbar
+          Tk::Tcllib::Autoscroll.autoscroll(@yscrollbar)
+        end
+      else
+        fail ArgumentError, "'x', 'y' or 'both' (String or Symbol) is expected"
+      end
+      self
+    end
+    def unautoscroll(mode = nil)
+      case mode
+      when :x, 'x'
+        if @xscrollbar
+          Tk::Tcllib::Autoscroll.unautoscroll(@xscrollbar)
+        end
+      when :y, 'y'
+        if @yscrollbar
+          Tk::Tcllib::Autoscroll.unautoscroll(@yscrollbar)
+        end
+      when nil, :both, 'both'
+        if @xscrollbar
+          Tk::Tcllib::Autoscroll.unautoscroll(@xscrollbar)
+        end
+        if @yscrollbar
+          Tk::Tcllib::Autoscroll.unautoscroll(@yscrollbar)
+        end
+      else
+        fail ArgumentError, "'x', 'y' or 'both' (String or Symbol) is expected"
+      end
+      self
+    end
+  end
+end
+
+class TkScrollbar
+  def autoscroll
+    # Arranges for the already existing scrollbar to be mapped 
+    # and unmapped as needed.
+    #tk_call_without_enc('::autoscroll::autoscroll', @path)
+    Tk::Tcllib::Autoscroll.autoscroll(self)
+    self
+  end
+  def unautoscroll
+    #     Returns the scrollbar to its original static state. 
+    #tk_call_without_enc('::autoscroll::unautoscroll', @path)
+    Tk::Tcllib::Autoscroll.unautoscroll(self)
+    self
+  end
+end
+
+# TkPackage.require('autoscroll', '1.0')
+# TkPackage.require('autoscroll', '1.1')
+TkPackage.require('autoscroll')
+
+module Tk
+  module Tcllib
+    class << Autoscroll
+      undef not_available
+    end
+
+    module Autoscroll
+      extend TkCore
+      def self.autoscroll(win)
+        tk_call_without_enc('::autoscroll::autoscroll', win.path)
+      end
+
+      def self.unautoscroll(win)
+        tk_call_without_enc('::autoscroll::unautoscroll', win.path)
+      end
+
+      def self.wrap
+        # v1.1
+        tk_call_without_enc('::autoscroll::wrap')
+      end
+
+      def self.unwrap
+        # v1.1
+        tk_call_without_enc('::autoscroll::unwrap')
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/ctext.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/ctext.rb
new file mode 100644
index 0000000000..70a45dd8e7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/ctext.rb
@@ -0,0 +1,160 @@
+#
+#  tkextlib/tcllib/ctext.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Overloads the text widget and provides new commands
+#
+
+require 'tk'
+require 'tk/text'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('ctext', '3.1')
+TkPackage.require('ctext')
+
+module Tk
+  module Tcllib
+    class CText < TkText
+      PACKAGE_NAME = 'ctext'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('ctext')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+class Tk::Tcllib::CText
+  TkCommandNames = ['ctext'.freeze].freeze
+  WidgetClassName = 'Ctext'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def __strval_optkeys
+    super() << 'linemapfg' << 'linemapbg' << 
+      'linemap_select_fg' << 'linemap_select_bg'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'highlight' << 'linemap_markable'
+  end
+  private :__boolval_optkeys
+
+  def append(*args)
+    tk_send('append', *args)
+  end
+
+  def copy
+    tk_send('copy')
+  end
+
+  def cut
+    tk_send('cut')
+  end
+
+  def fast_delete(*args)
+    tk_send('fastdelete', *args)
+  end
+
+  def fast_insert(*args)
+    tk_send('fastinsert', *args)
+  end
+
+  def highlight(*args)
+    tk_send('highlight', *args)
+  end
+
+  def paste
+    tk_send('paste')
+  end
+
+  def edit(*args)
+    tk_send('edit', *args)
+  end
+
+  def add_highlight_class(klass, col, *keywords)
+    tk_call('ctext::addHighlightClass', @path, klass, col, keywords.flatten)
+    self
+  end
+
+  def add_highlight_class_for_special_chars(klass, col, *chrs)
+    tk_call('ctext::addHighlightClassForSpecialChars', 
+            @path, klass, col, chrs.join(''))
+    self
+  end
+
+  def add_highlight_class_for_regexp(klass, col, tcl_regexp)
+    tk_call('ctext::addHighlightClassForRegexp', 
+            @path, klass, col, tcl_regexp)
+    self
+  end
+
+  def add_highlight_class_with_only_char_start(klass, col, chr)
+    tk_call('ctext::addHighlightClassWithOnlyCharStart', 
+            @path, klass, col, chr)
+    self
+  end
+
+  def clear_highlight_classes
+    tk_call('ctext::clearHighlightClasses', @path)
+    self
+  end
+
+  def get_highlight_classes
+    tk_split_simplelist(tk_call('ctext::getHighlightClasses', @path))
+  end
+
+  def delete_highlight_class(klass)
+    tk_call('ctext::deleteHighlightClass', @path, klass)
+    self
+  end
+
+  def enable_C_comments
+    tk_call('ctext::enableComments', @path)
+    self
+  end
+
+  def disable_C_comments
+    tk_call('ctext::disableComments', @path)
+    self
+  end
+
+  def find_next_char(idx, chr)
+    tk_call('ctext::findNextChar', @path, idx, chr)
+  end
+
+  def find_next_space(idx)
+    tk_call('ctext::findNextSpace', @path, idx)
+  end
+
+  def find_previous_space(idx)
+    tk_call('ctext::findPreviousSpace', @path, idx)
+  end
+
+  def set_update_proc(cmd=Proc.new)
+    tk_call('proc', 'ctext::update', '', cmd)
+    self
+  end
+
+  def modified?(mode)
+    bool(tk_call('ctext::modified', @path, mode))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/cursor.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/cursor.rb
new file mode 100644
index 0000000000..9bb828e8dd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/cursor.rb
@@ -0,0 +1,97 @@
+#
+#  tkextlib/tcllib/cursor.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Procedures to handle CURSOR data
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+module Tk
+  module Tcllib
+    module Cursor
+      PACKAGE_NAME = 'cursor'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('cursor')
+        rescue
+          ''
+        end
+      end
+
+      def self.not_available
+        fail RuntimeError, "'tkextlib/tcllib/cursor' extension is not available on your current environment."
+      end
+
+      def self.cursor_display(win=None)
+        Tk::Tcllib::Cursor.not_available
+      end
+
+      def self.cursor_propagate(win, cursor)
+        Tk::Tcllib::Cursor.not_available
+      end
+
+      def self.cursor_restore(win, cursor = None)
+        Tk::Tcllib::Cursor.not_available
+      end
+    end
+  end
+
+  def self.cursor_display(parent=None)
+    # Pops up a dialog with a listbox containing all the cursor names. 
+    # Selecting a cursor name will display it in that dialog. 
+    # This is simply for viewing any available cursors on the platform .
+    #tk_call_without_enc('::cursor::display', parent)
+    Tk::Tcllib::Cursor.cursor_display(parent)
+  end
+end
+
+class TkWindow
+  def cursor_propagate(cursor)
+    # Sets the cursor for self and all its descendants to cursor. 
+    #tk_call_without_enc('::cursor::propagate', @path, cursor)
+    Tk::Tcllib::Cursor.cursor_propagate(self, cursor)
+  end
+  def cursor_restore(cursor = None)
+    # Restore the original or previously set cursor for self and all its 
+    # descendants. If cursor is specified, that will be used if on any 
+    # widget that did not have a preset cursor (set by a previous call 
+    # to TkWindow#cursor_propagate). 
+    #tk_call_without_enc('::cursor::restore', @path, cursor)
+    Tk::Tcllib::Cursor.cursor_restore(self, cursor)
+  end
+end
+
+# TkPackage.require('cursor', '0.1')
+TkPackage.require('cursor')
+
+module Tk
+  module Tcllib
+    class << Cursor
+      undef not_available
+    end
+
+    module Cursor
+      extend TkCore
+      def self.cursor_display(win=None)
+        tk_call_without_enc('::cursor::display', _epath(win))
+      end
+
+      def self.cursor_propagate(win, cursor)
+        #tk_call_without_enc('::cursor::propagate', win.path, cursor)
+        tk_call_without_enc('::cursor::propagate', _epath(win), cursor)
+      end
+
+      def self.cursor_restore(win, cursor = None)
+        #tk_call_without_enc('::cursor::restore', win.path, cursor)
+        tk_call_without_enc('::cursor::restore', _epath(win), cursor)
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/datefield.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/datefield.rb
new file mode 100644
index 0000000000..bd84488101
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/datefield.rb
@@ -0,0 +1,57 @@
+#
+#  tkextlib/tcllib/datefield.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Tk datefield widget
+#
+# (The following is the original description of the library.)
+#
+# The datefield package provides the datefield widget which is an enhanced 
+# text entry widget for the purpose of date entry. Only valid dates of the 
+# form MM/DD/YYYY can be entered.
+# 
+# The datefield widget is, in fact, just an entry widget with specialized 
+# bindings. This means all the command and options for an entry widget apply 
+# equally here.
+
+require 'tk'
+require 'tk/entry'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('datefield', '0.1')
+TkPackage.require('datefield')
+
+module Tk
+  module Tcllib
+    class Datefield < TkEntry
+      PACKAGE_NAME = 'datefield'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('datefield')
+        rescue
+          ''
+        end
+      end
+    end
+    DateField = Datefield
+  end
+end
+
+class Tk::Tcllib::Datefield
+  TkCommandNames = ['::datefield::datefield'.freeze].freeze
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/dialog.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/dialog.rb
new file mode 100644
index 0000000000..825621b5a1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/dialog.rb
@@ -0,0 +1,84 @@
+#
+#  tkextlib/tcllib/dialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Generic dialog widget (themed)
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::dialog', '1.2')
+TkPackage.require('widget::dialog')
+
+module Tk::Tcllib
+  module Widget
+    class Dialog < TkWindow
+      PACKAGE_NAME = 'widget::dialog'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::dialog')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+class Tk::Tcllib::Widget::Dialog
+  TkCommandNames = ['::widget::dialog'.freeze].freeze
+
+  def __boolval_optkeys
+    ['separator', 'synchronous', 'transient']
+  end
+  private :__boolval_optkeys
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def add(what, *args)
+    window(tk_send('add', *args))
+  end
+
+  def get_frame
+    window(tk_send('getframe'))
+  end
+
+  def set_widget(widget)
+    tk_send('setwidget', widget)
+    self
+  end
+
+  def display
+    tk_send('display')
+    self
+  end
+  alias show display
+
+  def cancel
+    tk_send('cancel')
+    self
+  end
+
+  def close(reason = None)
+    tk_send('close', reason)
+  end
+
+  def withdraw
+    tk_send('withdraw')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/getstring.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/getstring.rb
new file mode 100644
index 0000000000..bf5e54e8cf
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/getstring.rb
@@ -0,0 +1,131 @@
+#
+#  tkextlib/tcllib/getstring.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * A dialog which consists of an Entry, OK, and Cancel buttons.
+#
+
+require 'tk'
+require 'tk/entry'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('getstring', '0.1')
+TkPackage.require('getstring')
+
+module Tk::Tcllib
+  class GetString_Dialog < TkWindow
+    PACKAGE_NAME = 'getstring'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('getstring')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+
+class Tk::Tcllib::GetString_Dialog
+  TkCommandNames = ['::getstring::tk_getString'.freeze].freeze
+  WidgetClassName = 'TkSDialog'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.show(*args)
+    dialog = self.new(*args)
+    dialog.show
+    [dialog.status, dialog.value]
+  end
+  def self.display(*args)
+    self.show(*args)
+  end
+
+  def initialize(*args)   # args = (parent=nil, text='', keys=nil)
+    keys = args.pop
+    if keys.kind_of?(Hash)
+      text = args.pop
+      @keys = _symbolkey2str(keys)
+      args.push(keys)
+    else
+      text = keys
+      @keys = {}
+    end
+    if text
+      @text = text.dup
+    else
+      @text = ''
+    end
+
+    @variable = TkVariable.new
+    @status = nil
+
+    super(*args)
+  end
+
+  def create_self(keys)
+    # dummy
+  end
+  private :create_self
+
+  def show
+    @variable.value = ''
+    @status = bool(tk_call(self.class::TkCommandNames[0], 
+                           @path, @variable, @text, *hash_kv(@keys)))
+  end
+  alias display show
+
+  def status
+    @status
+  end
+
+  def value
+    @variable.value
+  end
+
+  def cget(slot)
+    slot = slot.to_s
+    if slot == 'text'
+      @text
+    else
+      @keys[slot]
+    end
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of?(Hash)
+      slot.each{|k, v| configure(k, v)}
+    else
+      slot = slot.to_s
+      value = _symbolkey2str(value) if value.kind_of?(Hash)
+      if value && value != None
+        if slot == 'text'
+          @text = value.to_s
+        else
+          @keys[slot] = value
+        end
+      else
+        if slot == 'text'
+          @text = ''
+        else
+          @keys.delete(slot)
+        end
+      end
+    end
+    self
+  end
+
+  def configinfo(slot = nil)
+    if slot
+      slot = slot.to_s
+      [ slot, nil, nil, nil, ( (slot == 'text')? @text: @keys[slot] ) ]
+    else
+      @keys.collect{|k, v| [ k, nil, nil, nil, v ] }   \
+      << [ 'text', nil, nil, nil, @text ]
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/history.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/history.rb
new file mode 100644
index 0000000000..a01a4ebfcc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/history.rb
@@ -0,0 +1,73 @@
+#
+#  tkextlib/tcllib/history.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Provides a history for Entry widgets
+#
+
+require 'tk'
+require 'tk/entry'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('history', '0.1')
+TkPackage.require('history')
+
+module Tk::Tcllib
+  module History
+    PACKAGE_NAME = 'history'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('history')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+module Tk::Tcllib::History
+  extend TkCore
+
+  def self.init(entry, length=None)
+    tk_call_without_enc('::history::init', entry.path, length)
+    entry.extend(self)  # add methods to treat history to the entry widget
+  end
+
+  def self.remove(entry)
+    tk_call_without_enc('::history::remove', entry.path)
+    entry
+  end
+
+  def history_remove
+    tk_call_without_enc('::history::remove', @path)
+    self
+  end
+
+  def history_add(text)
+    tk_call('::history::add', @path, text)
+    self
+  end
+
+  def history_get
+    simplelist(tk_call_without_enc('::history::get', @path))
+  end
+
+  def history_clear
+    tk_call_without_enc('::history::clear', @path)
+    self
+  end
+
+  def history_configure(opt, value)
+    tk_call('::history::configure', @path, opt, value)
+    self
+  end
+
+  def history_configinfo(opt)
+    tk_call('::history::configure', @path, opt)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/ico.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/ico.rb
new file mode 100644
index 0000000000..3beeb11a4d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/ico.rb
@@ -0,0 +1,114 @@
+#
+#  tkextlib/tcllib/ico.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Reading and writing windows icons
+#
+
+require 'tk'
+require 'tk/image'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('ico', '0.3')
+TkPackage.require('ico')
+
+module Tk
+  module Tcllib
+    class ICO < TkImage
+      PACKAGE_NAME = 'ico'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('ico')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+class Tk::Tcllib::ICO
+  def self.list(file, keys=nil)
+    tk_split_list(tk_call_without_enc('::ico::getIconList', file,
+                                      *hash_kv(keys, true)))
+  end
+
+  def self.get(file, index, keys=nil)
+    tk_call_without_enc('::ico::getIcon', file, index, *hash_kv(keys, true))
+  end
+
+  def self.get_image(file, index, keys={})
+    keys = _symbolkey2str(keys)
+    keys.delete('format')
+    self.new(file, index, keys)
+  end
+
+  def self.get_data(file, index, keys={})
+    keys['format'] = 'data'
+    tk_split_list(tk_call_without_enc('::ico::getIcon', file, index, 
+                                      *hash_kv(keys, true)))
+  end
+
+  def self.write(file, index, depth, data, keys=nil)
+    tk_call_without_enc('::ico::writeIcon', file, index, depth, data, 
+                        *hash_kv(keys, true))
+  end
+
+  def self.copy(from_file, from_index, to_file, to_index, keys=nil)
+    tk_call_without_enc('::ico::copyIcon', 
+                        from_file, from_index, to_file, to_index, 
+                        *hash_kv(keys, true))
+  end
+
+  def self.exe_to_ico(exe_file, ico_file, keys=nil)
+    tk_call_without_enc('::ico::copyIcon', exe_file, ico_file, 
+                        *hash_kv(keys, true))
+  end
+
+  def self.clear_cache(file=None)
+    tk_call_without_enc('::ico::clearCache', file)
+  end
+
+  def self.transparent_color(image, color)
+    if image.kind_of?(Array)
+      tk_split_list(tk_call_without_enc('::ico::transparentColor', 
+                                        image, color))
+    else
+      tk_call_without_enc('::ico::transparentColor', image, color)
+    end
+  end
+
+  def self.show(file, keys=nil)
+    tk_call_without_enc('::ico::Show', file, *hash_kv(keys, true))
+  end
+
+  ###########################
+
+  def initialize(file, index, keys=nil)
+    keys = _symbolkey2str(keys)
+    if keys.key?('name')
+      @path = keys['name'].to_s
+    else
+      @path = Tk_Image_ID.join(TkCore::INTERP._ip_id_)
+      Tk_Image_ID[1].succ!
+    end
+    tk_call_without_enc('::ico::getIcon', file, index, '-name', @path, 
+                        '-format', 'image', *hash_kv(keys, true))
+    Tk_IMGTBL[@path] = self
+  end
+
+  def write(file, index, depth, keys=nil)
+    Tk::Tcllib::ICO.write(file, index, depth, @path, keys=nil)
+    self
+  end
+
+  def transparent_color(color)
+    tk_call_without_enc('::ico::transparentColor', @path, color)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/ip_entry.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
new file mode 100644
index 0000000000..8c9e0bd683
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
@@ -0,0 +1,66 @@
+#
+#  tkextlib/tcllib/ip_entry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * An IP address entry widget
+#
+# (The following is the original description of the library.)
+#
+# This package provides a widget for the entering of a IP address. 
+# It guarantees a valid address at all times.
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('ipentry', '0.1')
+TkPackage.require('ipentry')
+
+module Tk
+  module Tcllib
+    class IP_Entry < TkEntry
+      PACKAGE_NAME = 'ipentry'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('ipentry')
+        rescue
+          ''
+        end
+      end
+    end
+    IPEntry = IP_Entry
+  end
+end
+
+class Tk::Tcllib::IP_Entry
+  TkCommandNames = ['::ipentry::ipentry'.freeze].freeze
+  WidgetClassName = 'IPEntry'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def __strval_optkeys
+    super() << 'fg' << 'bg' << 'insertbackground'
+  end
+  private :__strval_optkeys
+
+  def complete?
+    bool(tk_send_without_enc('complete'))
+  end
+
+  def insert(*ip)
+    tk_send_without_enc('insert', array2tk_list(ip.flatten))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/panelframe.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/panelframe.rb
new file mode 100644
index 0000000000..2a4562e779
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/panelframe.rb
@@ -0,0 +1,72 @@
+#
+#  tkextlib/tcllib/panelframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Create PanelFrame widgets.
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::panelframe', '1.0')
+TkPackage.require('widget::panelframe')
+
+module Tk::Tcllib
+  module Widget
+    class PanelFrame < TkWindow
+      PACKAGE_NAME = 'widget::panelframe'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::panelframe')
+        rescue
+          ''
+        end
+      end
+    end
+    Panelframe = PanelFrame
+  end
+end
+
+class Tk::Tcllib::Widget::PanelFrame
+  TkCommandNames = ['::widget::panelframe'.freeze].freeze
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def add(what, *args)
+    window(tk_send('add', *args))
+  end
+
+  #def get_frame
+  #  window(tk_send('getframe'))
+  #end
+
+  def set_widget(widget)
+    tk_send('setwidget', widget)
+    self
+  end
+
+  def remove(*wins)
+    tk_send('remove', *wins)
+  end
+  def remove_destroy(*wins)
+    tk_send('remove', '-destroy', *wins)
+  end
+  alias delete remove_destroy
+
+  def items
+    simplelist(tk_send('items')).collect!{|w| window(w)}
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/plotchart.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/plotchart.rb
new file mode 100644
index 0000000000..f5f344ceb3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/plotchart.rb
@@ -0,0 +1,865 @@
+#
+#  tkextlib/tcllib/plotchart.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Simple plotting and charting package
+#
+# (The following is the original description of the library.)
+#
+# Plotchart is a Tcl-only package that focuses on the easy creation of 
+# xy-plots, barcharts and other common types of graphical presentations. 
+# The emphasis is on ease of use, rather than flexibility. The procedures 
+# that create a plot use the entire canvas window, making the layout of the 
+# plot completely automatic.
+#
+# This results in the creation of an xy-plot in, say, ten lines of code:
+# --------------------------------------------------------------------
+#    package require Plotchart
+#
+#    canvas .c -background white -width 400 -height 200
+#    pack   .c -fill both
+#
+#    #
+#    # Create the plot with its x- and y-axes
+#    #
+#    set s [::Plotchart::createXYPlot .c {0.0 100.0 10.0} {0.0 100.0 20.0}]
+#
+#    foreach {x y} {0.0 32.0 10.0 50.0 25.0 60.0 78.0 11.0 } {
+#        $s plot series1 $x $y
+#    }
+#
+#    $s title "Data series"
+# --------------------------------------------------------------------
+#
+# A drawback of the package might be that it does not do any data management. 
+# So if the canvas that holds the plot is to be resized, the whole plot must 
+# be redrawn. The advantage, though, is that it offers a number of plot and 
+# chart types:
+#
+#    * XY-plots like the one shown above with any number of data series.
+#    * Stripcharts, a kind of XY-plots where the horizontal axis is adjusted 
+#      automatically. The result is a kind of sliding window on the data 
+#      series.
+#    * Polar plots, where the coordinates are polar instead of cartesian.
+#    * Isometric plots, where the scale of the coordinates in the two 
+#      directions is always the same, i.e. a circle in world coordinates 
+#      appears as a circle on the screen.
+#      You can zoom in and out, as well as pan with these plots (Note: this 
+#      works best if no axes are drawn, the zooming and panning routines do 
+#      not distinguish the axes), using the mouse buttons with the control 
+#      key and the arrow keys with the control key.
+#    * Piecharts, with automatic scaling to indicate the proportions.
+#    * Barcharts, with either vertical or horizontal bars, stacked bars or 
+#      bars side by side.
+#    * Timecharts, where bars indicate a time period and milestones or other 
+#      important moments in time are represented by triangles.
+#    * 3D plots (both for displaying surfaces and 3D bars)
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('Plotchart', '0.9')
+# TkPackage.require('Plotchart', '1.1')
+TkPackage.require('Plotchart')
+
+module Tk
+  module Tcllib
+    module Plotchart
+      PACKAGE_NAME = 'Plotchart'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('Plotchart')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+module Tk::Tcllib::Plotchart
+  extend TkCore
+  ############################
+  def self.view_port(w, *args) # args := pxmin, pymin, pxmax, pymax
+    tk_call_without_enc('::Plotchart::viewPort', w.path, *(args.flatten))
+  end
+
+  def self.world_coordinates(w, *args) # args := xmin, ymin, xmax, ymax
+    tk_call_without_enc('::Plotchart::worldCoordinates', 
+                        w.path, *(args.flatten))
+  end
+
+  def self.world_3D_coordinates(w, *args) 
+    # args := xmin, ymin, zmin, xmax, ymax, zmax
+    tk_call_without_enc('::Plotchart::world3DCoordinates', 
+                        w.path, *(args.flatten))
+  end
+
+  def self.coords_to_pixel(w, x, y)
+    list(tk_call_without_enc('::Plotchart::coordsToPixel', w.path, x, y))
+  end
+
+  def self.coords_3D_to_pixel(w, x, y, z)
+    list(tk_call_without_enc('::Plotchart::coords3DToPixel', w.path, x, y, z))
+  end
+
+  def self.polar_coordinates(w, radmax)
+    tk_call_without_enc('::Plotchart::polarCoordinates', w.path, radmax)
+  end
+
+  def self.polar_to_pixel(w, rad, phi)
+    list(tk_call_without_enc('::Plotchart::polarToPixel', w.path, rad, phi))
+  end
+
+  def self.pixel_to_coords(w, x, y)
+    list(tk_call_without_enc('::Plotchart::coordsToPixel', w.path, x, y))
+  end
+
+  def self.determine_scale(w, xmax, ymax)
+    tk_call_without_enc('::Plotchart::determineScale', w.path, xmax, ymax)
+  end
+
+  def self.set_zoom_pan(w)
+    tk_call_without_enc('::Plotchart::setZoomPan', w.path)
+  end
+
+  ############################
+  module ChartMethod
+    include TkCore
+
+    def title(str)
+      tk_call_without_enc(@chart, 'title', _get_eval_enc_str(str))
+      self
+    end
+
+    def save_plot(filename)
+      tk_call_without_enc(@chart, 'saveplot', filename)
+      self
+    end
+
+    def xtext(str)
+      tk_call_without_enc(@chart, 'xtext', _get_eval_enc_str(str))
+      self
+    end
+
+    def ytext(str)
+      tk_call_without_enc(@chart, 'ytext', _get_eval_enc_str(str))
+      self
+    end
+
+    def xconfig(key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'xconfig', *hash_kv(key, true))
+      else
+        tk_call_without_enc(@chart, 'xconfig', 
+                            "-#{key}", _get_eval_enc_str(value))
+      end
+      self
+    end
+
+    def yconfig(key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'yconfig', *hash_kv(key, true))
+      else
+        tk_call_without_enc(@chart, 'yconfig', 
+                            "-#{key}", _get_eval_enc_str(value))
+      end
+      self
+    end
+
+    ############################
+    def view_port(*args) # args := pxmin, pymin, pxmax, pymax
+      tk_call_without_enc('::Plotchart::viewPort', @path, *(args.flatten))
+      self
+    end
+
+    def world_coordinates(*args) # args := xmin, ymin, xmax, ymax
+      tk_call_without_enc('::Plotchart::worldCoordinates', 
+                          @path, *(args.flatten))
+      self
+    end
+
+    def world_3D_coordinates(*args) 
+      # args := xmin, ymin, zmin, xmax, ymax, zmax
+      tk_call_without_enc('::Plotchart::world3DCoordinates', 
+                          @path, *(args.flatten))
+      self
+    end
+
+    def coords_to_pixel(x, y)
+      list(tk_call_without_enc('::Plotchart::coordsToPixel', @path, x, y))
+    end
+
+    def coords_3D_to_pixel(x, y, z)
+      list(tk_call_without_enc('::Plotchart::coords3DToPixel', @path, x, y, z))
+    end
+
+    def polar_coordinates(radmax)
+      tk_call_without_enc('::Plotchart::polarCoordinates', @path, radmax)
+      self
+    end
+
+    def polar_to_pixel(rad, phi)
+      list(tk_call_without_enc('::Plotchart::polarToPixel', @path, rad, phi))
+    end
+
+    def pixel_to_coords(x, y)
+      list(tk_call_without_enc('::Plotchart::coordsToPixel', @path, x, y))
+    end
+
+    def determine_scale(xmax, ymax)
+      tk_call_without_enc('::Plotchart::determineScale', @path, xmax, ymax)
+      self
+    end
+
+    def set_zoom_pan()
+      tk_call_without_enc('::Plotchart::setZoomPan', @path)
+      self
+    end
+  end
+
+  ############################
+  class XYPlot < TkCanvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze, 
+      '::Plotchart::createXYPlot'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] xaxis, yaxis [, keys])
+                          # xaxis := Array of [minimum, maximum, stepsize]
+                          # yaxis := Array of [minimum, maximum, stepsize]
+      if args[0].kind_of?(Array)
+        @xaxis = args.shift
+        @yaxis = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @xaxis = args.shift
+        @yaxis = args.shift
+
+        if parent.kind_of?(TkCanvas)
+          @path = parent.path
+        else
+          super(parent, *args) # create canvas widget
+        end
+      end
+
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
+                          array2tk_list(@xaxis), array2tk_list(@yaxis))
+    end
+    private :_create_chart
+
+    def __destroy_hook__
+      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
+    end
+
+    def plot(series, x, y)
+      tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(series), x, y)
+      self
+    end
+
+    def contourlines(xcrd, ycrd, vals, clss=None)
+      xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
+      ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
+      vals = array2tk_list(vals) if vals.kind_of?(Array)
+      clss = array2tk_list(clss) if clss.kind_of?(Array)
+
+      tk_call_without_enc(@chart, 'contourlines', xcrd, ycrd, vals, clss)
+      self
+    end
+
+    def contourfill(xcrd, ycrd, vals, klasses=None)
+      xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
+      ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
+      vals = array2tk_list(vals) if vals.kind_of?(Array)
+      clss = array2tk_list(clss) if clss.kind_of?(Array)
+
+      tk_call_without_enc(@chart, 'contourfill', xcrd, ycrd, vals, clss)
+      self
+    end
+
+    def contourbox(xcrd, ycrd, vals, klasses=None)
+      xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
+      ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
+      vals = array2tk_list(vals) if vals.kind_of?(Array)
+      clss = array2tk_list(clss) if clss.kind_of?(Array)
+
+      tk_call_without_enc(@chart, 'contourbox', xcrd, ycrd, vals, clss)
+      self
+    end
+
+    def color_map(colors)
+      colors = array2tk_list(colors) if colors.kind_of?(Array)
+
+      tk_call_without_enc(@chart, 'colorMap', colors)
+      self
+    end
+
+    def grid_cells(xcrd, ycrd)
+      xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
+      ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
+
+      tk_call_without_enc(@chart, 'grid', xcrd, ycrd)
+      self
+    end
+
+    def dataconfig(series, key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'dataconfig', series, *hash_kv(key, true))
+      else
+        tk_call_without_enc(@chart, 'dataconfig', series, 
+                            "-#{key}", _get_eval_enc_str(value))
+      end
+    end
+  end
+
+  ############################
+  class Stripchart < XYPlot
+    TkCommandNames = [
+      'canvas'.freeze, 
+      '::Plotchart::createStripchart'.freeze
+    ].freeze
+  end
+
+  ############################
+  class PolarPlot < TkCanvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze, 
+      '::Plotchart::createPolarplot'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] radius_data [, keys])
+                          # radius_data := Array of [maximum_radius, stepsize]
+      if args[0].kind_of?(Array)
+        @radius_data = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @radius_data = args.shift
+
+        if parent.kind_of?(TkCanvas)
+          @path = parent.path
+        else
+          super(parent, *args) # create canvas widget
+        end
+      end
+
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
+                          array2tk_list(@radius_data))
+    end
+    private :_create_chart
+
+    def __destroy_hook__
+      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
+    end
+
+    def plot(series, radius, angle)
+      tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(series), 
+                          radius, angle)
+      self
+    end
+
+    def dataconfig(series, key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'dataconfig', series, *hash_kv(key, true))
+      else
+        tk_call_without_enc(@chart, 'dataconfig', series, 
+                            "-#{key}", _get_eval_enc_str(value))
+      end
+    end
+  end
+  Polarplot = PolarPlot
+
+  ############################
+  class IsometricPlot < TkCanvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze, 
+      '::Plotchart::createIsometricPlot'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] xaxis, yaxis, [, step] [, keys])
+                          # xaxis := Array of [minimum, maximum]
+                          # yaxis := Array of [minimum, maximum]
+                          # step := Float of stepsize | "noaxes" | :noaxes
+      if args[0].kind_of?(Array)
+        @xaxis = args.shift
+        @yaxis = args.shift
+
+        if args[0].kind_of?(Hash)
+          @stepsize = :noaxes
+        else
+          @stepsize = args.shift
+        end
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @xaxis = args.shift
+        @yaxis = args.shift
+
+        if args[0].kind_of?(Hash)
+          @stepsize = :noaxes
+        else
+          @stepsize = args.shift
+        end
+
+        if parent.kind_of?(TkCanvas)
+          @path = parent.path
+        else
+          super(parent, *args) # create canvas widget
+        end
+      end
+
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
+                          array2tk_list(@xaxis), array2tk_list(@yaxis), 
+                          @stepsize)
+    end
+    private :_create_chart
+
+    def plot(type, *args)
+      self.__send__("plot_#{type.to_s.tr('-', '_')}", *args)
+    end
+
+    def plot_rectangle(*args) # args := x1, y1, x2, y2, color
+      tk_call_without_enc(@chart, 'plot', 'rectangle', *(args.flatten))
+      self
+    end
+
+    def plot_filled_rectangle(*args) # args := x1, y1, x2, y2, color
+      tk_call_without_enc(@chart, 'plot', 'filled-rectangle', *(args.flatten))
+      self
+    end
+
+    def plot_circle(*args) # args := xc, yc, radius, color
+      tk_call_without_enc(@chart, 'plot', 'circle', *(args.flatten))
+      self
+    end
+
+    def plot_filled_circle(*args) # args := xc, yc, radius, color
+      tk_call_without_enc(@chart, 'plot', 'filled-circle', *(args.flatten))
+      self
+    end
+  end
+  Isometricplot = IsometricPlot
+
+  ############################
+  class Plot3D < TkCanvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze, 
+      '::Plotchart::create3DPlot'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] xaxis, yaxis, zaxis [, keys])
+                          # xaxis := Array of [minimum, maximum, stepsize]
+                          # yaxis := Array of [minimum, maximum, stepsize]
+                          # zaxis := Array of [minimum, maximum, stepsize]
+      if args[0].kind_of?(Array)
+        @xaxis = args.shift
+        @yaxis = args.shift
+        @zaxis = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @xaxis = args.shift
+        @yaxis = args.shift
+        @zaxis = args.shift
+
+        if parent.kind_of?(TkCanvas)
+          @path = parent.path
+        else
+          super(parent, *args) # create canvas widget
+        end
+      end
+
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
+                          array2tk_list(@xaxis), 
+                          array2tk_list(@yaxis), 
+                          array2tk_list(@zaxis))
+    end
+    private :_create_chart
+
+    def plot_function(cmd=Proc.new)
+      Tk.ip_eval("proc #{@path}_#{@chart} {x y} {#{install_cmd(cmd)} $x $y}")
+      tk_call_without_enc(@chart, 'plotfunc', "#{@path}_#{@chart}")
+      self
+    end
+
+    def plot_funcont(conts, cmd=Proc.new)
+      conts = array2tk_list(conts) if conts.kind_of?(Array)
+      Tk.ip_eval("proc #{@path}_#{@chart} {x y} {#{install_cmd(cmd)} $x $y}")
+      tk_call_without_enc(@chart, 'plotfuncont', "#{@path}_#{@chart}", conts)
+      self
+    end
+
+    def grid_size(nxcells, nycells)
+      tk_call_without_enc(@chart, 'gridsize', nxcells, nycells)
+      self
+    end
+
+    def plot_data(dat)
+      # dat has to be provided as a 2 level array. 
+      # 1st level contains rows, drawn in y-direction, 
+      # and each row is an array whose elements are drawn in x-direction, 
+      # for the columns. 
+      tk_call_without_enc(@chart, 'plotdata', dat)
+      self
+    end
+
+    def colour(fill, border)
+      # configure the colours to use for polygon borders and inner area
+      tk_call_without_enc(@chart, 'colour', fill, border)
+      self
+    end
+    alias colours colour
+    alias colors  colour
+    alias color   colour
+  end
+
+  ############################
+  class Piechart < TkCanvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze, 
+      '::Plotchart::createPiechart'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent] [, keys])
+      if args[0].kind_of?(TkCanvas)
+        parent = args.shift
+        @path = parent.path
+      else
+        super(*args) # create canvas widget
+      end
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path)
+    end
+    private :_create_chart
+
+    def plot(*dat)  # argument is a list of [label, value]
+      tk_call_without_enc(@chart, 'plot', dat.flatten)
+      self
+    end
+  end
+
+  ############################
+  class Barchart < TkCanvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze, 
+      '::Plotchart::createBarchart'.freeze
+    ].freeze
+
+    def initialize(*args) 
+      # args := ([parent,] xlabels, ylabels [, series] [, keys])
+      # xlabels, ylabels := labels | axis ( depend on normal or horizontal )
+      # labels := Array of [label, label, ...]
+      #   (It determines the number of bars that will be plotted per series.)
+      # axis := Array of [minimum, maximum, stepsize]
+      # series := Integer number of data series | 'stacked' | :stacked
+      if args[0].kind_of?(Array)
+        @xlabels = args.shift
+        @ylabels  = args.shift
+
+        if args[0].kind_of?(Hash)
+          @series_size = :stacked
+        else
+          @series_size  = args.shift
+        end
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @xlabels = args.shift
+        @ylabels = args.shift
+
+        if args[0].kind_of?(Hash)
+          @series_size = :stacked
+        else
+          @series_size  = args.shift
+        end
+
+        if parent.kind_of?(TkCanvas)
+          @path = parent.path
+        else
+          super(parent, *args) # create canvas widget
+        end
+      end
+
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
+                          array2tk_list(@xlabels), array2tk_list(@ylabels), 
+                          @series_size)
+    end
+    private :_create_chart
+
+    def __destroy_hook__
+      Tk::Tcllib::Plotchart::PlotSeries::SeriesID_TBL.delete(@path)
+    end
+
+    def plot(series, dat, col=None)
+      tk_call_without_enc(@chart, 'plot', series, dat, col)
+      self
+    end
+
+    def colours(*cols)
+      # set the colours to be used
+      tk_call_without_enc(@chart, 'colours', *cols)
+      self
+    end
+    alias colour colours
+    alias colors colours
+    alias color  colours
+  end
+
+  ############################
+  class HorizontalBarchart < Barchart
+    TkCommandNames = [
+      'canvas'.freeze, 
+      '::Plotchart::createHorizontalBarchart'.freeze
+    ].freeze
+  end
+
+  ############################
+  class Timechart < TkCanvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createTimechart'.freeze
+    ].freeze
+
+    def initialize(*args)
+      # args := ([parent,] time_begin, time_end, items [, keys])
+      # time_begin := String of time format (e.g. "1 january 2004")
+      # time_end   := String of time format (e.g. "1 january 2004")
+      # items := Expected/maximum number of items
+      #          ( This determines the vertical spacing. )
+      if args[0].kind_of?(String)
+        @time_begin = args.shift
+        @time_end   = args.shift
+        @items      = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @time_begin = args.shift
+        @time_end   = args.shift
+        @items      = args.shift
+
+        if parent.kind_of?(TkCanvas)
+          @path = parent.path
+        else
+          super(parent, *args) # create canvas widget
+        end
+      end
+
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
+                          @time_begin, @time_end, @items)
+    end
+    private :_create_chart
+
+    def period(txt, time_begin, time_end, col=None)
+      tk_call_without_enc(@chart, 'period', txt, time_begin, time_end, col)
+      self
+    end
+
+    def milestone(txt, time, col=None)
+      tk_call_without_enc(@chart, 'milestone', txt, time, col)
+      self
+    end
+
+    def vertline(txt, time)
+      tk_call_without_enc(@chart, 'vertline', txt, time)
+      self
+    end
+  end
+
+  ############################
+  class Gnattchart < TkCanvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createGnattchart'.freeze
+    ].freeze
+
+    def initialize(*args)
+      # args := ([parent,] time_begin, time_end, items [, text_width] [, keys])
+      # time_begin := String of time format (e.g. "1 january 2004")
+      # time_end   := String of time format (e.g. "1 january 2004")
+      # items := Expected/maximum number of items
+      #          ( This determines the vertical spacing. )
+      if args[0].kind_of?(String)
+        @time_begin = args.shift
+        @time_end   = args.shift
+        @items      = args.shift
+
+        if args[0].kind_of?(Fixnum)
+          @text_width = args.shift
+        else
+          @text_width = None
+        end
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @time_begin = args.shift
+        @time_end   = args.shift
+        @items      = args.shift
+
+        if args[0].kind_of?(Fixnum)
+          @text_width = args.shift
+        else
+          @text_width = None
+        end
+
+        if parent.kind_of?(TkCanvas)
+          @path = parent.path
+        else
+          super(parent, *args) # create canvas widget
+        end
+      end
+
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path, 
+                          @time_begin, @time_end, @items, @text_width)
+    end
+    private :_create_chart
+
+    def task(txt, time_begin, time_end, completed=0.0)
+      list(tk_call_without_enc(@chart, 'task', txt, time_begin, time_end, 
+                               completed)).collect!{|id|
+        TkcItem.id2obj(self, id)
+      }
+    end
+
+    def milestone(txt, time, col=None)
+      tk_call_without_enc(@chart, 'milestone', txt, time, col)
+      self
+    end
+
+    def vertline(txt, time)
+      tk_call_without_enc(@chart, 'vertline', txt, time)
+      self
+    end
+
+    def connect(from_task, to_task)
+      from_task = array2tk_list(from_task) if from_task.kind_of?(Array)
+      to_task   = array2tk_list(to_task)   if to_task.kind_of?(Array)
+
+      tk_call_without_enc(@chart, 'connect', from_task, to_task)
+      self
+    end
+
+    def summary(txt, tasks)
+      tasks = array2tk_list(tasks) if tasks.kind_of?(Array)
+      tk_call_without_enc(@chart, 'summary', tasks)
+      self
+    end
+
+    def color_of_part(keyword, newcolor)
+      tk_call_without_enc(@chart, 'color', keyword, newcolor)
+      self
+    end
+
+    def font_of_part(keyword, newfont)
+      tk_call_without_enc(@chart, 'font', keyword, newfont)
+      self
+    end
+  end
+
+  ############################
+  class PlotSeries < TkObject
+    SeriesID_TBL = TkCore::INTERP.create_table
+    Series_ID = ['series'.freeze, '00000'.taint].freeze
+    TkCore::INTERP.init_ip_env{ SeriesID_TBL.clear }
+
+    def self.id2obj(chart, id)
+      path = chart.path
+      return id unless SeriesID_TBL[path]
+      SeriesID_TBL[path][id]? SeriesID_TBL[path][id]: id
+    end
+
+    def initialize(chart, keys=nil)
+      @parent = @chart_obj = chart
+      @ppath = @chart_obj.path
+      @path = @series = @id = Series_ID.join(TkCore::INTERP._ip_id_)
+      # SeriesID_TBL[@id] = self
+      SeriesID_TBL[@ppath] = {} unless SeriesID_TBL[@ppath]
+      SeriesID_TBL[@ppath][@id] = self
+      Series_ID[1].succ!
+      dataconfig(keys) if keys.kind_of?(Hash)
+    end
+
+    def plot(*args)
+      @chart_obj.plot(@series, *args)
+    end
+
+    def dataconfig(key, value=None)
+      @chart_obj.dataconfig(@series, key, value)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/ruler.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/ruler.rb
new file mode 100644
index 0000000000..88ffb2c912
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/ruler.rb
@@ -0,0 +1,65 @@
+#
+#  tkextlib/tcllib/ruler.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * ruler widget
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::ruler', '1.0')
+TkPackage.require('widget::ruler')
+
+module Tk::Tcllib
+  module Widget
+    class Ruler < TkWindow
+      PACKAGE_NAME = 'widget::ruler'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::ruler')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+class Tk::Tcllib::Widget::Ruler
+  TkCommandNames = ['::widget::ruler'.freeze].freeze
+
+  def __boolval_optkeys
+    ['showvalues', 'outline', 'grid']
+  end
+  private :__boolval_optkeys
+
+  def __numlistval_optkeys
+    ['interval', 'sizes']
+  end
+  private :__numlistval_optkeys
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def redraw
+    tk_send('redraw')
+    self
+  end
+
+  def shade(org, dest, frac)
+    tk_send('shade', org, dest, frac)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/screenruler.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/screenruler.rb
new file mode 100644
index 0000000000..1b4067e2f0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/screenruler.rb
@@ -0,0 +1,68 @@
+#
+#  tkextlib/tcllib/screenruler.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * screenruler dialog
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::screenruler', '1.1')
+TkPackage.require('widget::screenruler')
+
+module Tk::Tcllib
+  module Widget
+    class ScreenRuler < TkWindow
+      PACKAGE_NAME = 'widget::ruler'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::screenruler')
+        rescue
+          ''
+        end
+      end
+    end
+    Screenruler = ScreenRuler
+  end
+end
+
+class Tk::Tcllib::Widget::ScreenRuler
+  TkCommandNames = ['::widget::screenruler'.freeze].freeze
+
+  def __boolval_optkeys
+    ['topmost', 'reflect']
+  end
+  private :__boolval_optkeys
+
+  def __numlistval_optkeys
+    ['alpha']
+  end
+  private :__numlistval_optkeys
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def display
+    tk_send('display')
+    self
+  end
+  alias show display
+
+  def hide
+    tk_send('hide')
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/scrollwin.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
new file mode 100644
index 0000000000..717728e34a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
@@ -0,0 +1,61 @@
+#
+#  tkextlib/tcllib/scrollwin.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Scrolled widget
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::scrolledwindow', '1.0')
+TkPackage.require('widget::scrolledwindow')
+
+module Tk::Tcllib
+  module Widget
+    class ScrolledWindow < TkWindow
+      PACKAGE_NAME = 'widget::scrolledwindow'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::scrolledwindow')
+        rescue
+          ''
+        end
+      end
+    end
+    Scrolledwindow = ScrolledWindow
+  end
+end
+
+class Tk::Tcllib::Widget::ScrolledWindow
+  TkCommandNames = ['::widget::scrolledwindow'.freeze].freeze
+
+  def __numlistval_optkeys
+    ['ipad']
+  end
+  private :__numlistval_optkeys
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def get_frame
+    window(tk_send('getframe'))
+  end
+
+  def set_widget(widget)
+    tk_send('setwidget', widget)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/style.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/style.rb
new file mode 100644
index 0000000000..dac6916e46
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/style.rb
@@ -0,0 +1,61 @@
+#
+#  tkextlib/tcllib/style.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * select and use some 'style' of option (resource) DB
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+module Tk::Tcllib
+  module Style
+    PACKAGE_NAME = 'style'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('style')
+      rescue
+        ''
+      end
+    end
+
+    def self.not_available
+      fail RuntimeError, "'tkextlib/tcllib/style' extension is not available on your current environment."
+    end
+
+    def self.names
+      Tk::Tcllib::Style.not_available
+    end
+
+    def self.use(style)
+      Tk::Tcllib::Style.not_available
+    end
+  end
+end
+
+# TkPackage.require('style', '0.1')
+# TkPackage.require('style', '0.3')
+TkPackage.require('style')
+
+module Tk::Tcllib
+  class << Style
+    undef not_available
+  end
+
+  module Style
+    extend TkCore
+
+    def self.names
+      tk_split_simplelist(tk_call('style::names'))
+    end
+
+    def self.use(style)
+      tk_call('style::use', style)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/superframe.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/superframe.rb
new file mode 100644
index 0000000000..35da37efbf
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/superframe.rb
@@ -0,0 +1,51 @@
+#
+#  tkextlib/tcllib/superframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Superframe widget - enhanced labelframe widget
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::superframe', '1.0')
+TkPackage.require('widget::superframe')
+
+module Tk::Tcllib
+  module Widget
+    class SuperFrame < TkWindow
+      PACKAGE_NAME = 'widget::superframe'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::superframe')
+        rescue
+          ''
+        end
+      end
+    end
+    Superframe = SuperlFrame
+  end
+end
+
+class Tk::Tcllib::Widget::SuperFrame
+  TkCommandNames = ['::widget::superframe'.freeze].freeze
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def labelwidget
+    window(tk_send('labelwidget'))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/swaplist.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/swaplist.rb
new file mode 100644
index 0000000000..97de0a27c1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/swaplist.rb
@@ -0,0 +1,147 @@
+#
+#  tkextlib/tcllib/swaplist.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * A dialog which allows a user to move options between two lists
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('swaplist', '0.1')
+TkPackage.require('swaplist')
+
+module Tk::Tcllib
+  class Swaplist_Dialog < TkWindow
+    PACKAGE_NAME = 'swaplist'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('swaplist')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+
+class Tk::Tcllib::Swaplist_Dialog
+  TkCommandNames = ['::swaplist::swaplist'.freeze].freeze
+  WidgetClassName = 'Swaplist'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.show(*args)
+    dialog = self.new(*args)
+    dialog.show
+    [dialog.status, dialog.value]
+  end
+  def self.display(*args)
+    self.show(*args)
+  end
+
+  def initialize(*args) 
+    # args = (parent=nil, complete_list=[], selected_list=[], keys=nil)
+    keys = args.pop
+    if keys.kind_of?(Hash)
+      @selected_list = args.pop
+      @complete_list = args.pop
+      @keys = _symbolkey2str(keys)
+      args.push(keys)
+    else
+      @selected_list = keys
+      @complete_list = args.pop
+      @keys = {}
+    end
+
+    @selected_list = [] unless @selected_list
+    @complete_list = [] unless @complete_list
+
+    @variable = TkVariable.new
+    @status = nil
+
+    super(*args)
+  end
+
+  def create_self(keys)
+    # dummy
+  end
+  private :create_self
+
+  def show
+    @variable.value = ''
+    @status = bool(tk_call(self.class::TkCommandNames[0], 
+                           @path, @variable, 
+                           @complete_list, @selected_list, 
+                           *hash_kv(@keys)))
+  end
+  alias display show
+
+  def status
+    @status
+  end
+
+  def value
+    @variable.list
+  end
+  alias selected value
+
+  def cget(slot)
+    slot = slot.to_s
+    if slot == 'complete_list'
+      @complete_list
+    elsif slot == 'selected_list'
+      @selected_list
+    else
+      @keys[slot]
+    end
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of?(Hash)
+      slot.each{|k, v| configure(k, v)}
+    else
+      slot = slot.to_s
+      value = _symbolkey2str(value) if value.kind_of?(Hash)
+      if value && value != None
+        if slot == 'complete_list'
+          @complete_list = value
+        elsif slot == 'selected_list'
+          @selected_list = value
+        else
+          @keys[slot] = value
+        end
+      else
+        if slot == 'complete_list'
+          @complete_list = []
+        elsif slot == 'selected_list'
+          @selected_list = []
+        else
+          @keys.delete(slot)
+        end
+      end
+    end
+    self
+  end
+
+  def configinfo(slot = nil)
+    if slot
+      slot = slot.to_s
+      if slot == 'complete_list'
+        [ slot, nil, nil, nil, @complete_list ]
+      elsif slot == 'selected_list'
+        [ slot, nil, nil, nil, @selected_list ]
+      else
+        [ slot, nil, nil, nil, @keys[slot] ]
+      end
+    else
+      @keys.collect{|k, v| [ k, nil, nil, nil, v ] }           \
+      << [ 'complete_list', nil, nil, nil, @complete_list ]   \
+      << [ 'selected_list', nil, nil, nil, @selected_list ]
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tablelist.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tablelist.rb
new file mode 100644
index 0000000000..efeb8fbbac
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tablelist.rb
@@ -0,0 +1,27 @@
+#
+#  tkextlib/tcllib/tablelist.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * A multi-column listbox
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# check Tile extension :: If already loaded, use tablelist_tile.
+unless defined? Tk::Tcllib::Tablelist_usingTile
+  Tk::Tcllib::Tablelist_usingTile = TkPackage.provide('tile')
+end
+
+if Tk::Tcllib::Tablelist_usingTile
+  # with Tile
+  require 'tkextlib/tcllib/tablelist_tile'
+
+else
+  # without Tile
+
+  # TkPackage.require('Tablelist', '4.2')
+  TkPackage.require('Tablelist')
+
+  require 'tkextlib/tcllib/tablelist_core'
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
new file mode 100644
index 0000000000..a939a58331
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
@@ -0,0 +1,770 @@
+#
+#  tkextlib/tcllib/tablelist_core.rb
+#
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * This file is required by 'tkextlib/tcllib/tablelist.rb' or 
+#     'tkextlib/tcllib/tablelist_tile.rb'.
+#
+
+module Tk
+  module Tcllib
+    class Tablelist < TkWindow
+      if Tk::Tcllib::Tablelist_usingTile
+        PACKAGE_NAME = 'Tablelist_tile'.freeze
+      else
+        PACKAGE_NAME = 'Tablelist'.freeze
+      end
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require(self.package_name)
+        rescue
+          ''
+        end
+      end
+
+      def self.use_Tile?
+        (Tk::Tcllib::Tablelist_usingTile)? true: false
+      end
+    end
+    TableList = Tablelist
+  end
+end
+
+module Tk::Tcllib::TablelistItemConfig
+  include TkItemConfigMethod
+
+  def _to_idx(idx)
+    if idx.kind_of?(Array)
+      idx.collect{|elem| _get_eval_string(elem)}.join(',')
+    else
+      idx
+    end
+  end
+  def _from_idx(idx)
+    return idx unless idx.kind_of?(String)
+
+    if idx[0] == ?@  # '@x,y'
+      idx
+    elsif idx =~ /([^,]+),([^,]+)/
+      row = $1, column = $2
+      [num_or_str(row), num_or_str(column)]
+    else 
+      num_or_str(idx)
+    end
+  end
+  private :_to_idx, :_from_idx
+
+  def __item_cget_cmd(mixed_id)
+    [self.path, mixed_id[0] + 'cget', _to_idx(mixed_id[1])]
+  end
+  def __item_config_cmd(mixed_id)
+    [self.path, mixed_id[0] + 'configure', _to_idx(mixed_id[1])]
+  end
+
+  def cell_cget(tagOrId, option)
+    itemcget(['cell', tagOrId], option)
+  end
+  def cell_configure(tagOrId, slot, value=None)
+    itemconfigure(['cell', tagOrId], slot, value)
+  end
+  def cell_configinfo(tagOrId, slot=nil)
+    itemconfiginfo(['cell', tagOrId], slot)
+  end
+  def current_cell_configinfo(tagOrId, slot=nil)
+    current_itemconfiginfo(['cell', tagOrId], slot)
+  end
+  alias cellcget cell_cget
+  alias cellconfigure cell_configure
+  alias cellconfiginfo cell_configinfo
+  alias current_cellconfiginfo current_cell_configinfo
+
+  def column_cget(tagOrId, option)
+    itemcget(['column', tagOrId], option)
+  end
+  def column_configure(tagOrId, slot, value=None)
+    itemconfigure(['column', tagOrId], slot, value)
+  end
+  def column_configinfo(tagOrId, slot=nil)
+    itemconfiginfo(['column', tagOrId], slot)
+  end
+  def current_column_configinfo(tagOrId, slot=nil)
+    current_itemconfiginfo(['column', tagOrId], slot)
+  end
+  alias columncget column_cget
+  alias columnconfigure column_configure
+  alias columnconfiginfo column_configinfo
+  alias current_columnconfiginfo current_column_configinfo
+
+  def row_cget(tagOrId, option)
+    itemcget(['row', tagOrId], option)
+  end
+  def row_configure(tagOrId, slot, value=None)
+    itemconfigure(['row', tagOrId], slot, value)
+  end
+  def row_configinfo(tagOrId, slot=nil)
+    itemconfiginfo(['row', tagOrId], slot)
+  end
+  def current_row_configinfo(tagOrId, slot=nil)
+    current_itemconfiginfo(['row', tagOrId], slot)
+  end
+  alias rowcget row_cget
+  alias rowconfigure row_configure
+  alias rowconfiginfo row_configinfo
+  alias current_rowconfiginfo current_row_configinfo
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+end
+
+class Tk::Tcllib::Tablelist
+  include Tk::Tcllib::TablelistItemConfig
+  include Scrollable
+
+  TkCommandNames = ['::tablelist::tablelist'.freeze].freeze
+  WidgetClassName = 'Tablelist'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  ##########################
+
+  def __numval_optkeys
+    super() + ['titlecolumns']
+  end
+  private :__numval_optkeys
+
+  def __strval_optkeys
+    super() + ['snipstring']
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() + [
+      'forceeditendcommand', 'movablecolumns', 'movablerows', 
+      'protecttitlecolumns', 'resizablecolumns', 
+      'showarrow', 'showlabels', 'showseparators'
+    ]
+  end
+  private :__boolval_optkeys
+
+  def __listval_optkeys
+    super() + ['columns']
+  end
+  private :__listval_optkeys
+
+  def __tkvariable_optkeys
+    super() + ['listvariable']
+  end
+  private :__tkvariable_optkeys
+
+  def __val2ruby_optkeys  # { key=>proc, ... }
+    # The method is used to convert a opt-value to a ruby's object.
+    # When get the value of the option "key", "proc.call(value)" is called.
+    super().update('stretch'=>proc{|v| (v == 'all')? v: simplelist(v)})
+  end
+  private :__val2ruby_optkeys
+
+  def __ruby2val_optkeys  # { key=>proc, ... }
+    # The method is used to convert a ruby's object to a opt-value.
+    # When set the value of the option "key", "proc.call(value)" is called.
+    # That is, "-#{key} #{proc.call(value)}".
+    super().update('stretch'=>proc{|v| 
+                     (v.kind_of?(Array))? v.collect{|e| _to_idx(e)}: v
+                   })
+  end
+  private :__ruby2val_optkeys
+
+  def __font_optkeys
+    super() + ['labelfont']
+  end
+  private :__font_optkeys
+
+  ##########################
+
+  def __item_strval_optkeys(id)
+    if id[0] == 'cell'
+      super(id) + ['title']
+    else
+      super(id) - ['text'] + ['title']
+    end
+  end
+  private :__item_strval_optkeys
+
+  def __item_boolval_optkeys(id)
+    super(id) + [
+      'editable', 'hide', 'resizable', 'showarrow', 'stretchable', 
+    ]
+  end
+  private :__item_boolval_optkeys
+
+  def __item_listval_optkeys(id)
+    if id[0] == 'cell'
+      super(id)
+    else
+      super(id) + ['text']
+    end
+  end
+  private :__item_listval_optkeys
+
+  def __item_font_optkeys(id)
+    # maybe need to override
+    super(id) + ['labelfont']
+  end
+  private :__item_font_optkeys
+
+  ##########################
+
+  def activate(index)
+    tk_send('activate', _to_idx(index))
+    self
+  end
+
+  def activate_cell(index)
+    tk_send('activatecell', _to_idx(index))
+    self
+  end
+  alias activatecell activate_cell 
+
+  def get_attrib(name=nil)
+    if name && name != None
+      tk_send('attrib', name)
+    else
+      ret = []
+      lst = simplelist(tk_send('attrib'))
+      until lst.empty?
+        ret << ( [lst.shift] << lst.shift )
+      end
+      ret
+    end
+  end
+  def set_attrib(*args)
+    tk_send('attrib', *(args.flatten))
+    self
+  end
+
+  def bbox(index)
+    list(tk_send('bbox', _to_idx(index)))
+  end
+
+  def bodypath
+    window(tk_send('bodypath'))
+  end
+
+  def bodytag
+    TkBindTag.new_by_name(tk_send('bodytag'))
+  end
+
+  def cancel_editing 
+    tk_send('cancelediting')
+    self
+  end
+  alias cancelediting cancel_editing
+
+  def cellindex(idx)
+    _from_idx(tk_send('cellindex', _to_idx(idx)))
+  end
+
+  def cellselection_anchor(idx)
+    tk_send('cellselection', 'anchor', _to_idx(idx))
+    self
+  end
+
+  def cellselection_clear(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('cellselection', 'clear', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('cellselection', 'clear', first, last)
+    end
+    self
+  end
+
+  def cellselection_includes(idx)
+    bool(tk_send('cellselection', 'includes', _to_idx(idx)))
+  end
+
+  def cellselection_set(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('cellselection', 'set', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('cellselection', 'set', first, last)
+    end
+    self
+  end
+
+  def columncount
+    number(tk_send('columncount'))
+  end
+
+  def columnindex(idx)
+    number(tk_send('columnindex', _to_idx(idx)))
+  end
+
+  def containing(y)
+    idx = num_or_str(tk_send('containing', y))
+    (idx.kind_of?(Fixnum) && idx < 0)?  nil: idx
+  end
+
+  def containing_cell(x, y)
+    idx = _from_idx(tk_send('containingcell', x, y))
+    if idx.kind_of?(Array)
+      [
+        ((idx[0].kind_of?(Fixnum) && idx[0] < 0)?  nil: idx[0]), 
+        ((idx[1].kind_of?(Fixnum) && idx[1] < 0)?  nil: idx[1])
+      ]
+    else
+      idx
+    end
+  end
+  alias containingcell containing_cell
+
+  def containing_column(x)
+    idx = num_or_str(tk_send('containingcolumn', x))
+    (idx.kind_of?(Fixnum) && idx < 0)?  nil: idx
+  end
+  alias containingcolumn containing_column
+
+  def curcellselection
+    simplelist(tk_send('curcellselection')).collect!{|idx| _from_idx(idx)}
+  end
+
+  def curselection
+    list(tk_send('curselection'))
+  end
+
+  def delete_items(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('delete', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('delete', first, last)
+    end
+    self
+  end
+  alias delete delete_items
+  alias deleteitems delete_items
+
+  def delete_columns(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('deletecolumns', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('deletecolumns', first, last)
+    end
+    self
+  end
+  alias deletecolumns delete_columns
+
+  def edit_cell(idx)
+    tk_send('editcell', _to_idx(idx))
+    self
+  end
+  alias editcell edit_cell
+
+  def editwinpath
+    window(tk_send('editwinpath'))
+  end
+
+  def entrypath
+    window(tk_send('entrypath'))
+  end
+
+  def fill_column(idx, txt)
+    tk_send('fillcolumn', _to_idx(idx), txt)
+    self
+  end
+  alias fillcolumn fill_column
+
+  def finish_editing
+    tk_send('finishediting')
+    self
+  end
+  alias finishediting finish_editing
+
+  def get(first, last=nil)
+    if first.kind_of?(Array)
+      simplelist(tk_send('get', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      simplelist(tk_send('get', first, last))
+    end
+  end
+
+  def get_cells(first, last=nil)
+    if first.kind_of?(Array)
+      simplelist(tk_send('getcells', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      simplelist(tk_send('getcells', first, last))
+    end
+  end
+  alias getcells get_cells
+
+  def get_columns(first, last=nil)
+    if first.kind_of?(Array)
+      simplelist(tk_send('getcolumns', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      simplelist(tk_send('getcolumns', first, last))
+    end
+  end
+  alias getcolumns get_columns
+
+  def get_keys(first, last=nil)
+    if first.kind_of?(Array)
+      simplelist(tk_send('getkeys', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      simplelist(tk_send('getkeys', first, last))
+    end
+  end
+  alias getkeys get_keys
+
+  def imagelabelpath(idx)
+    window(tk_send('imagelabelpath', _to_idx(idx)))
+  end
+
+  def index(idx)
+    number(tk_send('index', _to_idx(idx)))
+  end
+
+  def insert(idx, *items)
+    tk_send('insert', _to_idx(idx), *items)
+    self
+  end
+
+  def insert_columnlist(idx, columnlist)
+    tk_send('insertcolumnlist', _to_idx(idx), columnlist)
+    self
+  end
+  alias insertcolumnlist insert_columnlist
+
+  def insert_columns(idx, *args)
+    tk_send('insertcolums', _to_idx(idx), *args)
+    self
+  end
+  alias insertcolumns insert_columns
+
+  def insert_list(idx, list)
+    tk_send('insertlist', _to_idx(idx), list)
+    self
+  end
+  alias insertlist insert_list
+
+  def itemlistvar
+    TkVarAccess.new(tk_send('itemlistvar'))
+  end
+
+  def labelpath(idx)
+    window(tk_send('labelpath', _to_idx(idx)))
+  end
+
+  def labels
+    simplelist(tk_send('labels'))
+  end
+
+  def move(src, target)
+    tk_send('move', _to_idx(src), _to_idx(target))
+    self
+  end
+
+  def move_column(src, target)
+    tk_send('movecolumn', _to_idx(src), _to_idx(target))
+    self
+  end
+  alias movecolumn move_column
+
+  def nearest(y)
+    _from_idx(tk_send('nearest', y))
+  end
+
+  def nearest_cell(x, y)
+    _from_idx(tk_send('nearestcell', x, y))
+  end
+  alias nearestcell nearest_cell
+
+  def nearest_column(x)
+    _from_idx(tk_send('nearestcolumn', x))
+  end
+  alias nearestcolumn nearest_column
+
+  def reject_input
+    tk_send('rejectinput')
+    self
+  end
+  alias rejectinput reject_input
+
+  def reset_sortinfo
+    tk_send('resetsortinfo')
+    self
+  end
+  alias resetsortinfo reset_sortinfo
+
+  def scan_mark(x, y)
+    tk_send('scan', 'mark', x, y)
+    self
+  end
+
+  def scan_dragto(x, y)
+    tk_send('scan', 'dragto', x, y)
+    self
+  end
+
+  def see(idx)
+    tk_send('see', _to_idx(idx))
+    self
+  end
+
+  def see_cell(idx)
+    tk_send('seecell', _to_idx(idx))
+    self
+  end
+  alias seecell see_cell
+
+  def see_column(idx)
+    tk_send('seecolumn', _to_idx(idx))
+    self
+  end
+  alias seecolumn see_column
+
+  def selection_anchor(idx)
+    tk_send('selection', 'anchor', _to_idx(idx))
+    self
+  end
+
+  def selection_clear(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('selection', 'clear', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('selection', 'clear', first, last)
+    end
+    self
+  end
+
+  def selection_includes(idx)
+    bool(tk_send('selection', 'includes', _to_idx(idx)))
+  end
+
+  def selection_set(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('selection', 'set', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('selection', 'set', first, last)
+    end
+    self
+  end
+
+  def separatorpath(idx=nil)
+    if idx
+      window(tk_send('separatorpath', _to_idx(idx)))
+    else
+      window(tk_send('separatorpath'))
+    end
+  end
+
+  def separators
+    simplelist(tk_send('separators')).collect!{|w| window(w)}
+  end
+
+  def size
+    number(tk_send('size'))
+  end
+
+  def sort(order=nil)
+    if order
+      order = order.to_s
+      order = '-' << order if order[0] != ?-
+      if order.length < 2
+        order = nil
+      end
+    end
+    if order
+      tk_send('sort', order)
+    else
+      tk_send('sort')
+    end
+    self
+  end
+  def sort_increasing
+    tk_send('sort', '-increasing')
+    self
+  end
+  def sort_decreasing
+    tk_send('sort', '-decreasing')
+    self
+  end
+
+  DEFAULT_sortByColumn_cmd = '::tablelist::sortByColumn'
+
+  def sort_by_column(idx, order=nil)
+    if order
+      order = order.to_s
+      order = '-' << order if order[0] != ?-
+      if order.length < 2
+        order = nil
+      end
+    end
+    if order
+      tk_send('sortbycolumn', _to_idx(idx), order)
+    else
+      tk_send('sortbycolumn', _to_idx(idx))
+    end
+    self
+  end
+  def sort_by_column_increasing(idx)
+    tk_send('sortbycolumn', _to_idx(idx), '-increasing')
+    self
+  end
+  def sort_by_column_decreasing(idx)
+    tk_send('sortbycolumn', _to_idx(idx), '-decreasing')
+    self
+  end
+
+  def sortcolumn
+    idx = num_or_str(tk_send('sortcolum'))
+    (idx.kind_of?(Fixnum) && idx < 0)?  nil: idx
+  end
+
+  def sortorder
+    tk_send('sortorder')
+  end
+
+  def toggle_visibility(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('togglevisibility', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('togglevisibility', first, last)
+    end
+    self
+  end
+  alias togglevisibility toggle_visibility
+
+  def windowpath(idx)
+    window(tk_send('windowpath', _to_idx(idx)))
+  end
+end
+
+class << Tk::Tcllib::Tablelist
+  ############################################################
+  # helper commands
+  def getTablelistPath(descendant)
+    window(Tk.tk_call('::tablelist::getTablelistPath', descendant))
+  end
+
+  def convEventFields(descendant, x, y)
+    window(Tk.tk_call('::tablelist::convEventFields', descendant, x, y))
+  end
+
+
+  ############################################################
+  # with the BWidget package 
+  def addBWidgetEntry(name=None)
+    Tk.tk_call('::tablelist::addBWidgetEntry', name)
+  end
+
+  def addBWidgetSpinBox(name=None)
+    Tk.tk_call('::tablelist::addBWidgetSpinBox', name)
+  end
+
+  def addBWidgetComboBox(name=None)
+    Tk.tk_call('::tablelist::addBWidgetComboBox', name)
+  end
+
+
+  ############################################################
+  # with the Iwidgets ([incr Widgets]) package 
+  def addIncrEntryfield(name=None)
+    Tk.tk_call('::tablelist::addIncrEntry', name)
+  end
+
+  def addIncrDateTimeWidget(type, seconds=false, name=None)
+    # type := 'datefield'|'dateentry'|timefield'|'timeentry'
+    if seconds && seconds != None
+      seconds = '-seconds'
+    else
+      seconds = None
+    end
+    Tk.tk_call('::tablelist::addDateTimeWidget', type, seconds, name)
+  end
+
+  def addIncrSpinner(name=None)
+    Tk.tk_call('::tablelist::addIncrSpinner', name)
+  end
+
+  def addIncrSpinint(name=None)
+    Tk.tk_call('::tablelist::addIncrSpinint', name)
+  end
+
+  def addIncrCombobox(name=None)
+    Tk.tk_call('::tablelist::addIncrCombobox', name)
+  end
+
+
+  ############################################################
+  # with Bryan Oakley's combobox package
+  def addOakleyCombobox(name=None)
+    Tk.tk_call('::tablelist::addOakleyCombobox', name)
+  end
+
+  ############################################################
+  # with the multi-entry package Mentry is a library extension
+  def addDateMentry(format, separator, gmt=false, name=None)
+    if gmt && gmt != None
+      gmt = '-gmt'
+    else
+      gmt = None
+    end
+    Tk.tk_call('::tablelist::addDateMentry', format, separator, gmt, name)
+  end
+
+  def addTimeMentry(format, separator, gmt=false, name=None)
+    if gmt && gmt != None
+      gmt = '-gmt'
+    else
+      gmt = None
+    end
+    Tk.tk_call('::tablelist::addTimeMentry', format, separator, gmt, name)
+  end
+
+  def addFixedPointMentry(count1, count2, comma=false, name=None)
+    if comma && comma != None
+      comma = '-comma'
+    else
+      comma = None
+    end
+    Tk.tk_call('::tablelist::addFixedPoingMentry', count1, count2, comma, name)
+  end
+
+  def addIPAddrMentry(name=None)
+    Tk.tk_call('::tablelist::addIPAddrMentry', name)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
new file mode 100644
index 0000000000..0cb4eb735d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
@@ -0,0 +1,25 @@
+#
+#  tkextlib/tcllib/tablelist_tlie.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * A multi-column listbox
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('tablelist_tile', '4.2')
+TkPackage.require('Tablelist_tile')
+
+unless defined? Tk::Tcllib::Tablelist_usingTile
+  Tk::Tcllib::Tablelist_usingTile = true
+end
+
+requrie 'tkextlib/tcllib/tablelist_core'
+
+module Tk
+  module Tcllib
+    Tablelist_Tile = Tablelist
+    TableList_Tile = Tablelist
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
new file mode 100644
index 0000000000..92dde65ce7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
@@ -0,0 +1,308 @@
+#
+#  tkextlib/tcllib/tkpiechart.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Create 2D or 3D pies with labels in Tcl canvases
+#
+
+require 'tk'
+require 'tk/canvas'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('tkpiechart', '6.6')
+TkPackage.require('tkpiechart')
+
+module Tk
+  module Tcllib
+    module Tkpiechart
+    end
+  end
+end
+
+module Tk::Tcllib::Tkpiechart
+  PACKAGE_NAME = 'tkpiechart'.freeze
+  def self.package_name
+    PACKAGE_NAME
+  end
+
+  def self.package_version
+    begin
+      TkPackage.require('tkpiechart')
+    rescue
+      ''
+    end
+  end
+
+  module ConfigMethod
+    include TkConfigMethod
+
+    def __pathname
+      self.path + ';' + self.tag
+    end
+    private :__pathname
+
+    def __cget_cmd
+      ['::switched::cget', self.tag]
+    end
+
+    def __config_cmd
+      ['::switched::configure', self.tag]
+    end
+    private :__config_cmd
+
+    def __configinfo_struct
+      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil, 
+        :default_value=>1, :current_value=>2}
+    end
+    private :__configinfo_struct
+
+    def __boolval_optkeys
+      super() << 'select' << 'autoupdate' << 'selectable'
+    end
+    private :__boolval_optkeys
+
+    def __strval_optkeys
+      super() << 'bordercolor' << 'textbackground' << 
+        'widestvaluetext' << 'title'
+    end
+    private :__strval_optkeys
+
+    def __listval_optkeys
+      super() << 'colors'
+    end
+    private :__listval_optkeys
+  end
+
+  ####################################
+  class PieChartObj < TkcItem
+    include ConfigMethod
+
+    def __font_optkeys
+      ['titlefont']
+    end
+    private :__font_optkeys
+  end
+
+  ####################################
+  class Pie < TkcItem
+    include ConfigMethod
+
+    def create_self(x, y, width, height, keys=None)
+      if keys and keys != None
+        @tag_key = tk_call_without_enc('::stooop::new', 'pie', 
+                                       @c, x, y, *hash_kv(keys, true))
+      else
+        @tag_key = tk_call_without_enc('::stooop::new', 'pie', @c, x, y)
+      end
+
+      @slice_tbl = {}
+
+      id = "pie(#{@tag_key})"
+
+      @tag = @tag_pie = TkcNamedTag(@c, id)
+      @tag_slices = TkcNamedTag(@c, "pieSlices(#{@tag_key})")
+
+      id
+    end
+    private :create_self
+
+    def tag_key
+      @tag_key
+    end
+    def tag
+      @tag
+    end
+    def canvas
+      @c
+    end
+    def _entry_slice(slice)
+      @slice_tbl[slice.to_eval] = slice
+    end
+    def _delete_slice(slice)
+      @slice_tbl.delete(slice.to_eval)
+    end
+
+    def delete
+      tk_call_without_enc('::stooop::delete', @tag_key)
+      CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
+      self
+    end
+
+    def new_slice(text=None)
+      Slice.new(self, text)
+    end
+
+    def delete_slice(slice)
+      unless slice.kind_of?(Slice)
+        unless (slice = @slice_tbl[slice])
+          return tk_call_without_enc('pie::deleteSlice', @tag_key, slice)
+        end
+      end
+      unless slice.kind_of?(Slice) && slice.pie == self
+        fail ArgumentError, "argument is not a slice of self"
+      end
+      slice.delete
+    end
+
+    def selected_slices
+      tk_split_simplelist(tk_call_without_enc('pie::selectedSlices', 
+                                              @tag_key)).collect{|slice|
+        @slice_tbl[slice] || Slice.new(:no_create, self, slice)
+      }
+    end
+  end
+
+  ####################################
+  class Slice < TkcItem
+    include ConfigMethod
+
+    def __config_cmd
+      ['::switched::configure', self.tag]
+    end
+    private :__config_cmd
+
+    #------------------------
+
+    def initialize(pie, *args)
+      unless pie.kind_of?(Pie) && pie != :no_create
+        fail ArgumentError, "expects TkPiechart::Pie for 1st argument"
+      end
+
+      if pie == :no_create
+        @pie, @tag_key = args
+      else
+        text = args[0] || None
+        @pie = pie
+        @tag_key = tk_call_without_enc('pie::newSlice', @pie.tag_key, text)
+      end
+      @parent = @c = @pie.canvas
+      @path = @parent.path
+
+      @pie._entry_slice(self)
+
+      @id = "slices(#{@tag_key})"
+      @tag = TkcNamedTag.new(@pie.canvas, @id)
+
+      CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
+      CItemID_TBL[@path][@id] = self
+    end
+
+    def tag_key
+      @tag_key
+    end
+    def tag
+      @tag
+    end
+    def pie
+      @pie
+    end
+
+    def delete
+      tk_call_without_enc('pie::deleteSlice', @pie.tag_key, @tag_key)
+      CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
+      @pie._delete_slice(self)
+      self
+    end
+
+    def size(share, disp=None)
+      tk_call_without_enc('pie::sizeSlice', 
+                          @pie.tag_key, @tag_key, share, disp)
+      self
+    end
+
+    def label(text)
+      tk_call_without_enc('pie::labelSlice', @pie.tag_key, @tag_key, text)
+      self
+    end
+  end
+
+  ####################################
+  class BoxLabeler < TkcItem
+    include ConfigMethod
+
+    def __config_cmd
+      ['::switched::configure', self.tag]
+    end
+    private :__config_cmd
+
+    #------------------------
+
+    def create_self(keys=None)
+      if keys and keys != None
+        @tag_key = tk_call_without_enc('::stooop::new', 'pieBoxLabeler', 
+                                       *hash_kv(keys, true))
+      else
+        @tag_key = tk_call_without_enc('::stooop::new', 'pieBoxLabeler')
+      end
+
+      id = "pieBoxLabeler(#{@tag_key})"
+      @tag = TkcNamedTag(@c, id)
+
+      id
+    end
+    private :create_self
+  end
+
+  ####################################
+  class PeripheralLabeler < TkcItem
+    include ConfigMethod
+
+    def __font_optkeys
+      ['font', 'smallfont']
+    end
+    private :__font_optkeys
+
+    def __config_cmd
+      ['::switched::configure', self.tag]
+    end
+    private :__config_cmd
+
+    #------------------------
+
+    def create_self(keys=None)
+      if keys and keys != None
+        @tag_key = tk_call_without_enc('::stooop::new', 
+                                       'piePeripheralLabeler', 
+                                       *hash_kv(keys, true))
+      else
+        @tag_key = tk_call_without_enc('::stooop::new', 'piePeripheralLabeler')
+      end
+
+      id = "piePeripheralLabeler(#{@tag_key})"
+      @tag = TkcNamedTag(@c, id)
+
+      id
+    end
+    private :create_self
+  end
+
+  ####################################
+  class Label < TkcItem
+    include ConfigMethod
+
+    def __config_cmd
+      ['::switched::configure', self.tag]
+    end
+    private :__config_cmd
+
+    #------------------------
+
+    def create_self(x, y, keys=None)
+      if keys and keys != None
+        @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel', 
+                                       @c, x, y, width, height, 
+                                       *hash_kv(keys, true))
+      else
+        @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel', 
+                                       @c, x, y, width, height)
+      end
+
+      id = "canvasLabel(#{@tag_key})"
+      @tag = TkcNamedTag(@c, id)
+
+      id
+    end
+    private :create_self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tooltip.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tooltip.rb
new file mode 100644
index 0000000000..4301b39fd3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/tooltip.rb
@@ -0,0 +1,95 @@
+#
+#  tkextlib/tcllib/tooltip.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Provides tooltips, a small text message that is displayed when the 
+#     mouse hovers over a widget.
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('tooltip', '1.1')
+TkPackage.require('tooltip')
+
+module Tk::Tcllib
+  module Tooltip
+    PACKAGE_NAME = 'tooltip'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('tooltip')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+module Tk::Tcllib::Tooltip
+  extend TkCore
+
+  WidgetClassName = 'Tooltip'.freeze
+  def self.database_classname
+    self::WidgetClassName
+  end
+  def self.database_class
+    WidgetClassNames[self::WidgetClassName]
+  end
+
+  def self.clear(glob_path_pat = None)
+    self.clear_glob(glob_path_pat)
+  end
+
+  def self.clear_glob(glob_path_pat)
+    tk_call_without_enc('::tooltip::tooltip', 'clear', glob_path_pat)
+  end
+
+  def self.clear_widgets(*args)
+    self.clear_glob("{#{args.collect{|w| _get_eval_string(w)}.join(',')}}")
+  end
+
+  def self.clear_children(*args)
+    self.clear_glob("{#{args.collect{|w| s = _get_eval_string(w); "#{s},#{s}.*"}.join(',')}}")
+  end
+
+  def self.delay(millisecs=None)
+    number(tk_call_without_enc('::tooltip::tooltip', 'delay', millisecs))
+  end
+  def self.delay=(millisecs)
+    self.delay(millisecs)
+  end
+
+  def self.disable
+    tk_call_without_enc('::tooltip::tooltip', 'disable')
+    false
+  end
+  def self.off
+    self.disable
+  end
+
+  def self.enable
+    tk_call_without_enc('::tooltip::tooltip', 'enable')
+    true
+  end
+  def self.on
+    self.enable
+  end
+
+  def self.register(widget, msg, keys=nil)
+    if keys.kind_of?(Hash)
+      args = hash_kv(keys) << msg
+    else
+      args = msg
+    end
+    tk_call_without_enc('::tooltip::tooltip', widget.path, *args)
+  end
+
+  def self.erase(widget)
+    tk_call_without_enc('::tooltip::tooltip', widget.path, '')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/widget.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/widget.rb
new file mode 100644
index 0000000000..ed69f67ce6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tcllib/widget.rb
@@ -0,0 +1,48 @@
+#
+#  tkextlib/tcllib/widget.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * megawidget package that uses snit as the object system (snidgets)
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget', '3.0')
+TkPackage.require('widget')
+
+module Tk::Tcllib
+  module Widget
+    PACKAGE_NAME = 'widget'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('widget')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+module Tk::Tcllib::Widget
+  autoload :Dialog,             'tkextlib/tcllib/dialog'
+
+  autoload :Panelframe,         'tkextlib/tcllib/panelframe'
+  autoload :PanelFrame,         'tkextlib/tcllib/panelframe'
+
+  autoload :Ruler,              'tkextlib/tcllib/ruler'
+
+  autoload :Screenruler,        'tkextlib/tcllib/screenruler'
+  autoload :ScreenRuler,        'tkextlib/tcllib/screenruler'
+
+  autoload :Scrolledwindow,     'tkextlib/tcllib/scrollwin'
+  autoload :ScrolledWindow,     'tkextlib/tcllib/scrollwin'
+
+  autoload :Superframe,         'tkextlib/tcllib/superframe'
+  autoload :SuperFrame,         'tkextlib/tcllib/superframe'
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tclx.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tclx.rb
new file mode 100644
index 0000000000..3a4ff27644
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tclx.rb
@@ -0,0 +1,13 @@
+#
+#  TclX support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tclx/setup.rb'
+
+# load library
+require 'tkextlib/tclx/tclx'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tclx/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tclx/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tclx/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tclx/tclx.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tclx/tclx.rb
new file mode 100644
index 0000000000..5a908fcd0b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tclx/tclx.rb
@@ -0,0 +1,74 @@
+#
+#  tclx/tclx.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tclx/setup.rb'
+
+# TkPackage.require('Tclx', '8.0')
+TkPackage.require('Tclx')
+
+module Tk
+  module TclX
+    PACKAGE_NAME = 'Tclx'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('Tclx')
+      rescue
+        ''
+      end
+    end
+
+    def self.infox(*args)
+      Tk.tk_call('infox', *args)
+    end
+
+    def self.signal(*args)
+      warn("Warning: Don't recommend to use TclX's 'signal' command. Please use Ruby's 'Signal.trap' method")
+      Tk.tk_call('signal', *args)
+    end
+
+    def self.signal_restart(*args)
+      warn("Warning: Don't recommend to use TclX's 'signal' command. Please use Ruby's 'Signal.trap' method")
+      Tk.tk_call('signal', '-restart', *args)
+    end
+
+    ##############################
+
+    class XPG3_MsgCat
+      class << self
+        alias open new
+      end
+
+      def initialize(catname, fail_mode=false)
+        if fail_mode
+          @msgcat_id = Tk.tk_call('catopen', '-fail', catname)
+        else
+          @msgcat_id = Tk.tk_call('catopen', '-nofail', catname)
+        end
+      end
+
+      def close(fail_mode=false)
+        if fail_mode
+          Tk.tk_call('catclose', '-fail', @msgcat_id)
+        else
+          Tk.tk_call('catclose', '-nofail', @msgcat_id)
+        end
+        self
+      end
+
+      def get(setnum, msgnum, defaultstr)
+        Tk.tk_call('catgets', @msgcat_id, setnum, msgnum, defaultstr)
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile.rb
new file mode 100644
index 0000000000..acc7bebe4e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile.rb
@@ -0,0 +1,230 @@
+#
+#  Tile theme engin (tile widget set) support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# library directory
+require 'tkextlib/tile/setup.rb'
+
+# load package
+# TkPackage.require('tile', '0.4')
+# TkPackage.require('tile', '0.6')
+# TkPackage.require('tile', '0.7')
+verstr = TkPackage.require('tile')
+ver = verstr.split('.')
+if ver[0].to_i == 0 && ver[1].to_i <= 4
+  # version 0.4 or former
+  module Tk
+    module Tile
+      USE_TILE_NAMESPACE = true
+      USE_TTK_NAMESPACE  = false
+      TILE_SPEC_VERSION_ID = 0
+    end
+  end
+elsif ver[0].to_i == 0 && ver[1].to_i <= 6
+  # version 0.5 -- version 0.6
+  module Tk
+    module Tile
+      USE_TILE_NAMESPACE = true
+      USE_TTK_NAMESPACE  = true
+      TILE_SPEC_VERSION_ID = 5
+    end
+  end
+else
+  # version 0.7 or later
+  module Tk
+    module Tile
+      USE_TILE_NAMESPACE = false
+      USE_TTK_NAMESPACE  = true
+      TILE_SPEC_VERSION_ID = 7
+    end
+  end
+end
+
+# autoload
+module Tk
+  module Tile
+    TkComm::TkExtlibAutoloadModule.unshift(self)
+
+    PACKAGE_NAME = 'tile'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('tile')
+      rescue
+        ''
+      end
+    end
+
+    def self.__Import_Tile_Widgets__!
+      Tk.tk_call('namespace', 'import', '-force', 'ttk::*')
+    end
+
+    def self.load_images(imgdir, pat=TkComm::None)
+      images = Hash[*TkComm.simplelist(Tk.tk_call('::tile::LoadImages', 
+                                                  imgdir, pat))]
+      images.keys.each{|k|
+        images[k] = TkPhotoImage.new(:imagename=>images[k], 
+                                     :without_creating=>true)
+      }
+
+      images
+    end
+
+    def self.style(*args)
+      args.map!{|arg| TkComm._get_eval_string(arg)}.join('.')
+    end
+
+    module KeyNav
+      def self.enableMnemonics(w)
+        Tk.tk_call('::keynav::enableMnemonics', w)
+      end
+      def self.defaultButton(w)
+        Tk.tk_call('::keynav::defaultButton', w)
+      end
+    end
+
+    module Font
+      Default      = 'TkDefaultFont'
+      Text         = 'TkTextFont'
+      Heading      = 'TkHeadingFont'
+      Caption      = 'TkCaptionFont'
+      Tooltip      = 'TkTooltipFont'
+
+      Fixed        = 'TkFixedFont'
+      Menu         = 'TkMenuFont'
+      SmallCaption = 'TkSmallCaptionFont'
+      Icon         = 'TkIconFont'
+    end
+
+    module ParseStyleLayout
+      def _style_layout(lst)
+        ret = []
+        until lst.empty?
+          sub = [lst.shift]
+          keys = {}
+
+          until lst.empty?
+            if lst[0][0] == ?-
+              k = lst.shift[1..-1]
+              children = lst.shift 
+              children = _style_layout(children) if children.kind_of?(Array)
+              keys[k] = children
+            else
+              break
+            end
+          end
+
+          sub << keys unless keys.empty?
+          ret << sub
+        end
+        ret
+      end
+      private :_style_layout
+    end
+
+    module TileWidget
+      include Tk::Tile::ParseStyleLayout
+
+      def __val2ruby_optkeys  # { key=>proc, ... }
+        # The method is used to convert a opt-value to a ruby's object.
+        # When get the value of the option "key", "proc.call(value)" is called.
+        super().update('style'=>proc{|v| _style_layout(list(v))})
+      end
+      private :__val2ruby_optkeys
+
+      def instate(state, script=nil, &b)
+        if script
+          tk_send('instate', state, script)
+        elsif b
+          tk_send('instate', state, Proc.new(&b))
+        else
+          bool(tk_send('instate', state))
+        end
+      end
+
+      def state(state=nil)
+        if state
+          tk_send('state', state)
+        else
+          list(tk_send('state'))
+        end
+      end
+
+      def identify(x, y)
+        ret = tk_send_without_enc('identify', x, y)
+        (ret.empty?)? nil: ret
+      end
+    end
+
+    ######################################
+
+    autoload :TButton,       'tkextlib/tile/tbutton'
+    autoload :Button,        'tkextlib/tile/tbutton'
+
+    autoload :TCheckButton,  'tkextlib/tile/tcheckbutton'
+    autoload :CheckButton,   'tkextlib/tile/tcheckbutton'
+    autoload :TCheckbutton,  'tkextlib/tile/tcheckbutton'
+    autoload :Checkbutton,   'tkextlib/tile/tcheckbutton'
+
+    autoload :Dialog,        'tkextlib/tile/dialog'
+
+    autoload :TEntry,        'tkextlib/tile/tentry'
+    autoload :Entry,         'tkextlib/tile/tentry'
+
+    autoload :TCombobox,     'tkextlib/tile/tcombobox'
+    autoload :Combobox,      'tkextlib/tile/tcombobox'
+
+    autoload :TFrame,        'tkextlib/tile/tframe'
+    autoload :Frame,         'tkextlib/tile/tframe'
+
+    autoload :TLabelframe,   'tkextlib/tile/tlabelframe'
+    autoload :Labelframe,    'tkextlib/tile/tlabelframe'
+
+    autoload :TLabel,        'tkextlib/tile/tlabel'
+    autoload :Label,         'tkextlib/tile/tlabel'
+
+    autoload :TMenubutton,   'tkextlib/tile/tmenubutton'
+    autoload :Menubutton,    'tkextlib/tile/tmenubutton'
+
+    autoload :TNotebook,     'tkextlib/tile/tnotebook'
+    autoload :Notebook,      'tkextlib/tile/tnotebook'
+
+    autoload :TPaned,        'tkextlib/tile/tpaned'
+    autoload :Paned,         'tkextlib/tile/tpaned'
+
+    autoload :TProgressbar,  'tkextlib/tile/tprogressbar'
+    autoload :Progressbar,   'tkextlib/tile/tprogressbar'
+
+    autoload :TRadioButton,  'tkextlib/tile/tradiobutton'
+    autoload :RadioButton,   'tkextlib/tile/tradiobutton'
+    autoload :TRadiobutton,  'tkextlib/tile/tradiobutton'
+    autoload :Radiobutton,   'tkextlib/tile/tradiobutton'
+
+    autoload :TScale,        'tkextlib/tile/tscale'
+    autoload :Scale,         'tkextlib/tile/tscale'
+    autoload :TProgress,     'tkextlib/tile/tscale'
+    autoload :Progress,      'tkextlib/tile/tscale'
+
+    autoload :TScrollbar,    'tkextlib/tile/tscrollbar'
+    autoload :Scrollbar,     'tkextlib/tile/tscrollbar'
+
+    autoload :TSeparator,    'tkextlib/tile/tseparator'
+    autoload :Separator,     'tkextlib/tile/tseparator'
+
+    autoload :TSquare,       'tkextlib/tile/tsquare'
+    autoload :Square,        'tkextlib/tile/tsquare'
+
+    autoload :Treeview,      'tkextlib/tile/treeview'
+
+    autoload :Style,         'tkextlib/tile/style'
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/dialog.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/dialog.rb
new file mode 100644
index 0000000000..b10378d7de
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/dialog.rb
@@ -0,0 +1,84 @@
+#
+#  ttk::dialog  (tile-0.7+)
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class Dialog < TkWindow
+    end
+  end
+end
+
+class Tk::Tile::Dialog
+  TkCommandNames = ['::ttk::dialog'.freeze].freeze
+
+  def self.show(*args)
+    dialog = self.new(*args)
+    dialog.show
+    [dialog.status, dialog.value]
+  end
+  def self.display(*args)
+    self.show(*args)
+  end
+
+  def self.define_dialog_type(name, keys)
+    Tk.tk_call('::ttk::dialog::define', name, keys)
+    name
+  end
+
+  def self.style(*args)
+    ['Dialog', *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+
+  #########################
+
+  def initialize(keys={})
+    @keys = _symbolkey2str(keys)
+    super(*args)
+  end
+
+  def create_self(keys)
+    # dummy
+  end
+  private :create_self
+
+  def show
+    tk_call(self.class::TkCommandNames[0], @path, *hash_kv(@keys))
+  end
+  alias display show
+
+  def client_frame
+    window(tk_call_without_enc('::ttk::dialog::clientframe', @path))
+  end
+
+  def cget(slot)
+    @keys[slot]
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of?(Hash)
+      slot.each{|k, v| configure(k, v)}
+    else
+      slot = slot.to_s
+      value = _symbolkey2str(value) if value.kind_of?(Hash)
+      if value && value != None
+        @keys[slot] = value
+      else
+        @keys.delete(slot)
+      end
+    end
+    self
+  end
+
+  def configinfo(slot = nil)
+    if slot
+      slot = slot.to_s
+      [ slot, nil, nil, nil, @keys[slot] ]
+    else
+      @keys.collect{|k, v| [ k, nil, nil, nil, v ] }
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/sizegrip.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/sizegrip.rb
new file mode 100644
index 0000000000..ea796583b0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/sizegrip.rb
@@ -0,0 +1,25 @@
+#
+#  ttk::sizegrip widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class SizeGrip < TkWindow
+    end
+  end
+end
+
+class Tk::Tile::SizeGrip < TkWindow
+  include Tk::Tile::TileWidget
+
+  TkCommandNames = ['::ttk::sizegrip'.freeze].freeze
+  WidgetClassName = 'TSizegrip'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/style.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/style.rb
new file mode 100644
index 0000000000..59bc4b0d78
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/style.rb
@@ -0,0 +1,107 @@
+#
+#  style commands
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    module Style
+    end
+  end
+end
+
+module Tk::Tile::Style
+  extend TkCore
+end
+
+class << Tk::Tile::Style
+  def configure(style=nil, keys=nil)
+    if style.kind_of?(Hash)
+      keys = style
+      style = nil
+    end
+    style = '.' unless style
+
+    if Tk::Tile::TILE_SPEC_VERSION_ID < 7
+      sub_cmd = 'default'
+    else
+      sub_cmd = 'configure'
+    end
+
+    if keys && keys != None
+      tk_call('style', sub_cmd, style, *hash_kv(keys))
+    else
+      tk_call('style', sub_cmd, style)
+    end
+  end
+  alias default configure
+
+  def map(style=nil, keys=nil)
+    if style.kind_of?(Hash)
+      keys = style
+      style = nil
+    end
+    style = '.' unless style
+
+    if keys && keys != None
+      tk_call('style', 'map', style, *hash_kv(keys))
+    else
+      tk_call('style', 'map', style)
+    end
+  end
+
+  def lookup(style, opt, state=None, fallback_value=None)
+    tk_call('style', 'lookup', style, '-' << opt.to_s, state, fallback_value)
+  end
+
+  include Tk::Tile::ParseStyleLayout
+
+  def layout(style=nil, spec=nil)
+    if style.kind_of?(Hash)
+      spec = style
+      style = nil
+    end
+    style = '.' unless style
+
+    if spec
+      tk_call('style', 'layout', style, spec)
+    else
+      _style_layout(list(tk_call('style', 'layout', style)))
+    end
+  end
+
+  def element_create(name, type, *args)
+    tk_call('style', 'element', 'create', name, type, *args)
+  end
+
+  def element_names()
+    list(tk_call('style', 'element', 'names'))
+  end
+
+  def element_options(elem)
+    simplelist(tk_call('style', 'element', 'options', elem))
+  end
+
+  def theme_create(name, keys=nil)
+    if keys && keys != None
+      tk_call('style', 'theme', 'create', name, *hash_kv(keys))
+    else
+      tk_call('style', 'theme', 'create', name)
+    end
+  end
+
+  def theme_settings(name, cmd=nil, &b)
+    cmd = Proc.new(&b) if !cmd && b
+    tk_call('style', 'theme', 'settings', name, cmd)
+  end
+
+  def theme_names()
+    list(tk_call('style', 'theme', 'names'))
+  end
+
+  def theme_use(name)
+    tk_call('style', 'theme', 'use', name)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tbutton.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tbutton.rb
new file mode 100644
index 0000000000..1142a27100
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tbutton.rb
@@ -0,0 +1,30 @@
+#
+#  tbutton widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TButton < TkButton
+    end
+    Button = TButton
+  end
+end
+
+class Tk::Tile::TButton < TkButton
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::button'.freeze].freeze
+  else
+    TkCommandNames = ['::tbutton'.freeze].freeze
+  end
+  WidgetClassName = 'TButton'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tcheckbutton.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
new file mode 100644
index 0000000000..fce799683d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
@@ -0,0 +1,32 @@
+#
+#  tcheckbutton widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TCheckButton < TkCheckButton
+    end
+    TCheckbutton = TCheckButton
+    CheckButton  = TCheckButton
+    Checkbutton  = TCheckButton
+  end
+end
+
+class Tk::Tile::TCheckButton < TkCheckButton
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::checkbutton'.freeze].freeze
+  else
+    TkCommandNames = ['::tcheckbutton'.freeze].freeze
+  end
+  WidgetClassName = 'TCheckbutton'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tcombobox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tcombobox.rb
new file mode 100644
index 0000000000..e8e042fbd9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tcombobox.rb
@@ -0,0 +1,51 @@
+#
+#  tcombobox widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TCombobox < Tk::Tile::TEntry
+    end
+    Combobox = TCombobox
+  end
+end
+
+class Tk::Tile::TCombobox < Tk::Tile::TEntry
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::combobox'.freeze].freeze
+  else
+    TkCommandNames = ['::tcombobox'.freeze].freeze
+  end
+  WidgetClassName = 'TCombobox'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'exportselection'
+  end
+  private :__boolval_optkeys
+
+  def __listval_optkeys
+    super() << 'values'
+  end
+  private :__listval_optkeys
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+
+  def current
+    number(tk_send_without_enc('current'))
+  end
+  def current=(idx)
+    tk_send_without_enc('current', idx)
+  end
+
+  def set(val)
+    tk_send('set', val)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tentry.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tentry.rb
new file mode 100644
index 0000000000..4d57ce7756
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tentry.rb
@@ -0,0 +1,40 @@
+#
+#  tentry widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TEntry < TkEntry
+    end
+    Entry = TEntry
+  end
+end
+
+class Tk::Tile::TEntry < TkEntry
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::entry'.freeze].freeze
+  else
+    TkCommandNames = ['::tentry'.freeze].freeze
+  end
+  WidgetClassName = 'TEntry'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __boolval_optkeys
+    super() << 'exportselection'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'show'
+  end
+  private :__strval_optkeys
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tframe.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tframe.rb
new file mode 100644
index 0000000000..691c9c42af
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tframe.rb
@@ -0,0 +1,30 @@
+#
+#  tframe widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TFrame < TkFrame
+    end
+    Frame = TFrame
+  end
+end
+
+class Tk::Tile::TFrame < TkFrame
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::frame'.freeze].freeze
+  else
+    TkCommandNames = ['::tframe'.freeze].freeze
+  end
+  WidgetClassName = 'TFrame'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tlabel.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tlabel.rb
new file mode 100644
index 0000000000..4111d1906a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tlabel.rb
@@ -0,0 +1,30 @@
+#
+#  tlabel widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TLabel < TkLabel
+    end
+    Label = TLabel
+  end
+end
+
+class Tk::Tile::TLabel < TkLabel
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::label'.freeze].freeze
+  else
+    TkCommandNames = ['::tlabel'.freeze].freeze
+  end
+  WidgetClassName = 'TLabel'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tlabelframe.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tlabelframe.rb
new file mode 100644
index 0000000000..8981232b25
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tlabelframe.rb
@@ -0,0 +1,30 @@
+#
+#  tlabelframe widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TLabelframe < Tk::Tile::TFrame
+    end
+    Labelframe = TLabelframe
+  end
+end
+
+class Tk::Tile::TLabelframe < Tk::Tile::TFrame
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::labelframe'.freeze].freeze
+  else
+    TkCommandNames = ['::tlabelframe'.freeze].freeze
+  end
+  WidgetClassName = 'TLabelframe'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tmenubutton.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tmenubutton.rb
new file mode 100644
index 0000000000..4b81fa1c81
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tmenubutton.rb
@@ -0,0 +1,30 @@
+#
+#  tmenubutton widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TMenubutton < TkMenubutton
+    end
+    Menubutton = TMenubutton
+  end
+end
+
+class Tk::Tile::TMenubutton < TkMenubutton
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::menubutton'.freeze].freeze
+  else
+    TkCommandNames = ['::tmenubutton'.freeze].freeze
+  end
+  WidgetClassName = 'TMenubutton'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tnotebook.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tnotebook.rb
new file mode 100644
index 0000000000..a928e64b61
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tnotebook.rb
@@ -0,0 +1,114 @@
+#
+#  tnotebook widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TNotebook < TkWindow
+    end
+    Notebook = TNotebook
+  end
+end
+
+class Tk::Tile::TNotebook < TkWindow
+  ################################
+  include TkItemConfigMethod
+  
+  def __item_cget_cmd(id)
+    [self.path, 'tab', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'tab', id]
+  end
+  private :__item_config_cmd
+
+  def __item_listval_optkeys(id)
+    []
+  end
+  private :__item_listval_optkeys
+
+  def __item_methodcall_optkeys(id)  # { key=>method, ... }
+    {}
+  end
+  private :__item_methodcall_optkeys
+
+  #alias tabcget itemcget
+  alias tabconfigure itemconfigure
+  alias tabconfiginfo itemconfiginfo
+  alias current_tabconfiginfo current_itemconfiginfo
+
+  def tabcget(tagOrId, option)
+    tabconfigure(tagOrId, option)[-1]
+  end
+  ################################
+
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::notebook'.freeze].freeze
+  else
+    TkCommandNames = ['::tnotebook'.freeze].freeze
+  end
+  WidgetClassName = 'TNotebook'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+
+  def enable_traversal()
+    if Tk::Tile::TILE_SPEC_VERSION_ID < 5
+      tk_call_without_enc('::tile::enableNotebookTraversal', @path)
+    elsif Tk::Tile::TILE_SPEC_VERSION_ID < 7
+      tk_call_without_enc('::tile::notebook::enableTraversal', @path)
+    else
+      tk_call_without_enc('::ttk::notebook::enableTraversal', @path)
+    end
+    self
+  end
+
+  def add(child, keys=nil)
+    if keys && keys != None
+      tk_send_without_enc('add', _epath(child), *hash_kv(keys))
+    else
+      tk_send_without_enc('add', _epath(child))
+    end
+    self
+  end
+
+  def forget(idx)
+    tk_send('forget', idx)
+    self
+  end    
+
+  def index(idx)
+    number(tk_send('index', idx))
+  end
+
+  def insert(idx, subwin, keys=nil)
+    if keys && keys != None
+      tk_send('insert', idx, subwin, *hash_kv(keys))
+    else
+      tk_send('insert', idx, subwin)
+    end
+    self
+  end
+
+  def select(idx)
+    tk_send('select', idx)
+    self
+  end
+
+  def selected
+    window(tk_send_without_enc('select'))
+  end
+
+  def tabs
+    list(tk_send('tabs'))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tpaned.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tpaned.rb
new file mode 100644
index 0000000000..11178b19d3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tpaned.rb
@@ -0,0 +1,188 @@
+#
+#  tpaned widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TPaned < TkWindow
+    end
+    Paned = TPaned
+  end
+end
+
+class Tk::Tile::TPaned < TkWindow
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::paned'.freeze].freeze
+  else
+    TkCommandNames = ['::tpaned'.freeze].freeze
+  end
+  WidgetClassName = 'TPaned'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+
+  def add(win, keys)
+    win = _epath(win)
+    tk_send_without_enc('add', win, *hash_kv(keys))
+    self
+  end
+
+  def forget(pane)
+    pane = _epath(pane)
+    tk_send_without_enc('forget', pane)
+    self
+  end
+
+  def insert(pos, win, keys)
+    win = _epath(win)
+    tk_send_without_enc('insert', pos, win, *hash_kv(keys))
+    self
+  end
+
+  def panecget(pane, slot)
+    pane = _epath(pane)
+    tk_tcl2ruby(tk_send_without_enc('pane', pane, "-#{slot}"))
+  end
+  alias pane_cget panecget
+
+  def paneconfigure(pane, key, value=nil)
+    pane = _epath(pane)
+    if key.kind_of? Hash
+      params = []
+      key.each{|k, v|
+        params.push("-#{k}")
+        # params.push((v.kind_of?(TkObject))? v.epath: v)
+        params.push(_epath(v))
+      }
+      tk_send_without_enc('pane', pane, *params)
+    else
+      # value = value.epath if value.kind_of?(TkObject)
+      value = _epath(value)
+      tk_send_without_enc('pane', pane, "-#{key}", value)
+    end
+    self
+  end
+  alias pane_config paneconfigure
+  alias pane_configure paneconfigure
+
+  def paneconfiginfo(win)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      win = _epath(win)
+      if key
+        conf = tk_split_list(tk_send_without_enc('pane', win, "-#{key}"))
+        conf[0] = conf[0][1..-1]
+        if conf[0] == 'hide'
+          conf[3] = bool(conf[3]) unless conf[3].empty?
+          conf[4] = bool(conf[4]) unless conf[4].empty?
+        end
+        conf
+      else
+        tk_split_simplelist(tk_send_without_enc('pane', 
+                                                win)).collect{|conflist|
+          conf = tk_split_simplelist(conflist)
+          conf[0] = conf[0][1..-1]
+          if conf[3]
+            if conf[0] == 'hide'
+              conf[3] = bool(conf[3]) unless conf[3].empty?
+            elsif conf[3].index('{')
+              conf[3] = tk_split_list(conf[3]) 
+            else
+              conf[3] = tk_tcl2ruby(conf[3]) 
+            end
+          end
+          if conf[4]
+            if conf[0] == 'hide'
+              conf[4] = bool(conf[4]) unless conf[4].empty?
+            elsif conf[4].index('{')
+              conf[4] = tk_split_list(conf[4]) 
+            else
+              conf[4] = tk_tcl2ruby(conf[4]) 
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      win = _epath(win)
+      if key
+        conf = tk_split_list(tk_send_without_enc('pane', win, "-#{key}"))
+        key = conf.shift[1..-1]
+        if key == 'hide'
+          conf[2] = bool(conf[2]) unless conf[2].empty?
+          conf[3] = bool(conf[3]) unless conf[3].empty?
+        end
+        { key => conf }
+      else
+        ret = {}
+        tk_split_simplelist(tk_send_without_enc('pane', 
+                                                win)).each{|conflist|
+          conf = tk_split_simplelist(conflist)
+          key = conf.shift[1..-1]
+          if key
+            if key == 'hide'
+              conf[2] = bool(conf[2]) unless conf[2].empty?
+            elsif conf[2].index('{')
+              conf[2] = tk_split_list(conf[2]) 
+            else
+              conf[2] = tk_tcl2ruby(conf[2]) 
+            end
+          end
+          if conf[3]
+            if key == 'hide'
+              conf[3] = bool(conf[3]) unless conf[3].empty?
+            elsif conf[3].index('{')
+              conf[3] = tk_split_list(conf[3]) 
+            else
+              conf[3] = tk_tcl2ruby(conf[3]) 
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        ret
+      end
+    end
+  end
+  alias pane_configinfo paneconfiginfo
+
+  def current_paneconfiginfo(win, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        conf = paneconfiginfo(win, key)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        paneconfiginfo(win).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      paneconfiginfo(win, key).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+  alias current_pane_configinfo current_paneconfiginfo
+
+  def identify(x, y)
+    list(tk_send_without_enc('identify', x, y))
+  end
+
+  def sashpos(idx, newpos=None)
+    num_or_str(tk_send_without_enc('sashpos', idx, newpos))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tprogressbar.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tprogressbar.rb
new file mode 100644
index 0000000000..36c1c75c23
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tprogressbar.rb
@@ -0,0 +1,53 @@
+#
+#  tprogressbar widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TProgressbar < TkWindow
+    end
+    Progressbar = TProgressbar
+  end
+end
+
+class Tk::Tile::TProgressbar
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::progressbar'.freeze].freeze
+  else
+    TkCommandNames = ['::tprogressbar'.freeze].freeze
+  end
+  WidgetClassName = 'TProgressbar'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+
+  def step(amount=None)
+    tk_send_without_enc('step', amount).to_f
+  end
+  #def step=(amount)
+  #  tk_send_without_enc('step', amount)
+  #end
+
+  def start(interval=None)
+    if Tk::Tile::TILE_SPEC_VERSION_ID < 5
+      tk_call_without_enc('::tile::progressbar::start', @path, interval)
+    else
+      tk_send_without_enc('start', interval)
+    end
+  end
+
+  def stop(amount=None)
+    if Tk::Tile::TILE_SPEC_VERSION_ID < 5
+      tk_call_without_enc('::tile::progressbar::stop', @path)
+    else
+      tk_send_without_enc('stop', amount)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tradiobutton.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tradiobutton.rb
new file mode 100644
index 0000000000..e2f614cb97
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tradiobutton.rb
@@ -0,0 +1,32 @@
+#
+#  tradiobutton widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TRadioButton < TkRadioButton
+    end
+    TRadiobutton = TRadioButton
+    RadioButton  = TRadioButton
+    Radiobutton  = TRadioButton
+  end
+end
+
+class Tk::Tile::TRadioButton < TkRadioButton
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::radiobutton'.freeze].freeze
+  else
+    TkCommandNames = ['::tradiobutton'.freeze].freeze
+  end
+  WidgetClassName = 'TRadiobutton'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/treeview.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/treeview.rb
new file mode 100644
index 0000000000..68e478896c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/treeview.rb
@@ -0,0 +1,1133 @@
+#
+#  treeview widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class Treeview < TkWindow
+    end
+  end
+end
+
+module Tk::Tile::TreeviewConfig
+  include TkItemConfigMethod
+
+  def __item_configinfo_struct(id)
+    # maybe need to override
+    {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil, 
+      :default_value=>nil, :current_value=>1}
+  end
+  private :__item_configinfo_struct
+
+  def __itemconfiginfo_core(tagOrId, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
+        fontkey  = $2
+        return [slot.to_s, tagfontobj(tagid(tagOrId), fontkey)]
+      else
+        if slot
+          slot = slot.to_s
+          case slot
+          when /^(#{__tile_specific_item_optkeys(tagid(tagOrId)).join('|')})$/
+            begin
+              # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
+              val = tk_call(*(__item_confinfo_cmd(tagid(tagOrId)) << slot))
+            rescue
+              # Maybe, 'state' option has '-' in future.
+              val = tk_call(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            end
+            return [slot, val]
+
+          when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
+            optval = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            begin
+              val = method.call(tagOrId, optval)
+            rescue => e
+              warn("Warning:: #{e.message} (when #{method}lcall(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+              val = optval
+            end
+            return [slot, val]
+
+          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
+            return [slot, self.__send__(method, tagOrId)]
+
+          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+            begin
+              val = number(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            rescue
+              val = nil
+            end
+            return [slot, val]
+
+          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = num_or_str(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            return [slot, val]
+
+          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+            begin
+              val = bool(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            rescue
+              val = nil
+            end
+            return [slot, val]
+
+          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            return [slot, val]
+
+          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            if val =~ /^[0-9]/
+              return [slot, list(val)]
+            else
+              return [slot, val]
+            end
+
+          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            return [slot, val]
+
+          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            if val.empty?
+              return [slot, nil]
+            else
+              return [slot, TkVarAccess.new(val)]
+            end
+
+          else
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            if val.index('{')
+              return [slot, tk_split_list(val)]
+            else
+              return [slot, tk_tcl2ruby(val)]
+            end
+          end
+
+        else # ! slot
+          ret = Hash[*(tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false))].to_a.collect{|conf|
+            conf[0] = conf[0][1..-1] if conf[0][0] == ?-
+            case conf[0]
+            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[conf[0]]
+              optval = conf[1]
+              begin
+                val = method.call(tagOrId, optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[1] = val
+
+            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+              # do nothing
+
+            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+              begin
+                conf[1] = number(conf[1])
+              rescue
+                conf[1] = nil
+              end
+
+            when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+              conf[1] = num_or_str(conf[1])
+
+            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+              begin
+                conf[1] = bool(conf[1])
+              rescue
+                conf[1] = nil
+              end
+
+            when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+              conf[1] = simplelist(conf[1])
+
+            when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+              if conf[1] =~ /^[0-9]/
+                conf[1] = list(conf[1])
+              end
+
+            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+              if conf[1].empty?
+                conf[1] = nil
+              else
+                conf[1] = TkVarAccess.new(conf[1])
+              end
+
+            else
+              if conf[1].index('{')
+                conf[1] = tk_split_list(conf[1])
+              else
+                conf[1] = tk_tcl2ruby(conf[1])
+              end
+            end
+
+            conf
+          }
+
+          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
+            optkey = optkey.to_s
+            fontconf = ret.assoc(optkey)
+            if fontconf
+              ret.delete_if{|inf| inf[0] =~ /^(|latin|ascii|kanji)#{optkey}$/}
+              fontconf[1] = tagfontobj(tagid(tagOrId), optkey)
+              ret.push(fontconf)
+            end
+          }
+
+          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
+            ret << [optkey.to_s, self.__send__(method, tagOrId)]
+          }
+
+          ret
+        end
+      end
+
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
+        fontkey  = $2
+        return {slot.to_s => tagfontobj(tagid(tagOrId), fontkey)}
+      else
+        if slot
+          slot = slot.to_s
+          case slot
+          when /^(#{__tile_specific_item_optkeys(tagid(tagOrId)).join('|')})$/
+            begin
+              # On tile-0.7.{2-8}, 'state' option has no '-' at its head.
+              val = tk_call(*(__item_confinfo_cmd(tagid(tagOrId)) << slot))
+            rescue
+              # Maybe, 'state' option has '-' in future.
+              val = tk_call(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            end
+            return {slot => val}
+
+          when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
+            optval = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            begin
+              val = method.call(tagOrId, optval)
+            rescue => e
+              warn("Warning:: #{e.message} (when #{method}lcall(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+              val = optval
+            end
+            return {slot => val}
+
+          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
+            return {slot => self.__send__(method, tagOrId)}
+
+          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+            begin
+              val = number(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            rescue
+              val = nil
+            end
+            return {slot => val}
+
+          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = num_or_str(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            return {slot => val}
+
+          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+            begin
+              val = bool(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            rescue
+              val = nil
+            end
+            return {slot => val}
+
+          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            return {slot => val}
+
+          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            if val =~ /^[0-9]/
+              return {slot => list(val)}
+            else
+              return {slot => val}
+            end
+
+          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            return {slot => val}
+
+          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            if val.empty?
+              return {slot => nil}
+            else
+              return {slot => TkVarAccess.new(val)}
+            end
+
+          else
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            if val.index('{')
+              return {slot => tk_split_list(val)}
+            else
+              return {slot => tk_tcl2ruby(val)}
+            end
+          end
+
+        else # ! slot
+          ret = {}
+          ret = Hash[*(tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false))].to_a.collect{|conf|
+            conf[0] = conf[0][1..-1] if conf[0][0] == ?-
+
+            optkey = conf[0]
+            case optkey
+            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[optkey]
+              optval = conf[1]
+              begin
+                val = method.call(tagOrId, optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[1] = val
+
+            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+              # do nothing
+
+            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+              begin
+                conf[1] = number(conf[1])
+              rescue
+                conf[1] = nil
+              end
+
+            when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+              conf[1] = num_or_str(conf[1])
+
+            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+              begin
+                conf[1] = bool(conf[1])
+              rescue
+                conf[1] = nil
+              end
+
+            when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+              conf[1] = simplelist(conf[1])
+
+            when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+              if conf[1] =~ /^[0-9]/
+                conf[1] = list(conf[1])
+              end
+
+            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+              if conf[1].empty?
+                conf[1] = nil
+              else
+                conf[1] = TkVarAccess.new(conf[1])
+              end
+
+            else
+              if conf[1].index('{')
+                return [slot, tk_split_list(conf[1])]
+              else
+                return [slot, tk_tcl2ruby(conf[1])]
+              end
+            end
+
+            ret[conf[0]] = conf[1]
+          }
+
+          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
+            optkey = optkey.to_s
+            fontconf = ret[optkey]
+            if fontconf.kind_of?(Array)
+              ret.delete(optkey)
+              ret.delete('latin' << optkey)
+              ret.delete('ascii' << optkey)
+              ret.delete('kanji' << optkey)
+              fontconf[1] = tagfontobj(tagid(tagOrId), optkey)
+              ret[optkey] = fontconf
+            end
+          }
+
+          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
+            ret[optkey.to_s] = self.__send__(method, tagOrId)
+          }
+
+          ret
+        end
+      end
+    end
+  end
+
+  ###################
+
+  def __item_cget_cmd(id)
+    [self.path, id[0], id[1]]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, id[0], id[1]]
+  end
+  private :__item_config_cmd
+
+  def __item_numstrval_optkeys(id)
+    case id[0]
+    when :item, 'item'
+      ['width']
+    when :column, 'column'
+      super(id[1])
+    when :tag, 'tag'
+      super(id[1])
+    when :heading, 'heading'
+      super(id[1])
+    else
+      super(id[1])
+    end
+  end
+  private :__item_numstrval_optkeys
+
+  def __item_strval_optkeys(id)
+    case id[0]
+    when :item, 'item'
+      super(id) + ['id']
+    when :column, 'column'
+      super(id[1])
+    when :tag, 'tag'
+      super(id[1])
+    when :heading, 'heading'
+      super(id[1])
+    else
+      super(id[1])
+    end
+  end
+  private :__item_strval_optkeys
+
+  def __item_boolval_optkeys(id)
+    case id[0]
+    when :item, 'item'
+      ['open']
+    when :column, 'column'
+      super(id[1])
+    when :tag, 'tag'
+      super(id[1])
+    when :heading, 'heading'
+      super(id[1])
+    end
+  end
+  private :__item_boolval_optkeys
+
+  def __item_listval_optkeys(id)
+    case id[0]
+    when :item, 'item'
+      ['values']
+    when :column, 'column'
+      []
+    when :heading, 'heading'
+      []
+    else
+      []
+    end
+  end
+  private :__item_listval_optkeys
+
+  def __item_val2ruby_optkeys(id)
+    case id[0]
+    when :item, 'item'
+      { 
+        'tags'=>proc{|arg_id, val|
+          simplelist(val).collect{|tag|
+            Tk::Tile::Treeview::Tag.id2obj(self, tag)
+          }
+        }
+      }
+    when :column, 'column'
+      {}
+    when :heading, 'heading'
+      {}
+    else
+      {}
+    end
+  end
+  private :__item_val2ruby_optkeys
+
+  def __tile_specific_item_optkeys(id)
+    case id[0]
+    when :item, 'item'
+      []
+    when :column, 'column'
+      []
+    when :heading, 'heading'
+      ['state']  # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
+    else
+      []
+    end
+  end
+  private :__item_val2ruby_optkeys
+
+  def itemconfiginfo(tagOrId, slot = nil)
+    __itemconfiginfo_core(tagOrId, slot)
+  end
+
+  def current_itemconfiginfo(tagOrId, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        org_slot = slot
+        begin
+          conf = __itemconfiginfo_core(tagOrId, slot)
+          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
+              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+            return {conf[0] => conf[-1]}
+          end
+          slot = conf[__item_configinfo_struct(tagid(tagOrId))[:alias]]
+        end while(org_slot != slot)
+        fail RuntimeError, 
+          "there is a configure alias loop about '#{org_slot}'"
+      else
+        ret = {}
+        __itemconfiginfo_core(tagOrId).each{|conf|
+          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
+              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+            ret[conf[0]] = conf[-1]
+          end
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      __itemconfiginfo_core(tagOrId, slot).each{|key, conf|
+        ret[key] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+
+  alias __itemcget itemcget
+  alias __itemconfigure itemconfigure
+  alias __itemconfiginfo itemconfiginfo
+  alias __current_itemconfiginfo current_itemconfiginfo
+
+  private :__itemcget, :__itemconfigure
+  private :__itemconfiginfo, :__current_itemconfiginfo
+
+  # Treeview Item
+  def itemcget(tagOrId, option)
+    __itemcget([:item, tagOrId], option)
+  end
+  def itemconfigure(tagOrId, slot, value=None)
+    __itemconfigure([:item, tagOrId], slot, value)
+  end
+  def itemconfiginfo(tagOrId, slot=nil)
+    __itemconfiginfo([:item, tagOrId], slot)
+  end
+  def current_itemconfiginfo(tagOrId, slot=nil)
+    __current_itemconfiginfo([:item, tagOrId], slot)
+  end
+
+  # Treeview Column
+  def columncget(tagOrId, option)
+    __itemcget([:column, tagOrId], option)
+  end
+  def columnconfigure(tagOrId, slot, value=None)
+    __itemconfigure([:column, tagOrId], slot, value)
+  end
+  def columnconfiginfo(tagOrId, slot=nil)
+    __itemconfiginfo([:column, tagOrId], slot)
+  end
+  def current_columnconfiginfo(tagOrId, slot=nil)
+    __current_itemconfiginfo([:column, tagOrId], slot)
+  end
+  alias column_cget columncget
+  alias column_configure columnconfigure
+  alias column_configinfo columnconfiginfo
+  alias current_column_configinfo current_columnconfiginfo
+
+  # Treeview Heading
+  def headingcget(tagOrId, option)
+    if __tile_specific_item_optkeys([:heading, tagOrId]).index(option.to_s)
+      begin
+        # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
+        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << option.to_s))
+      rescue
+        # Maybe, 'state' option has '-' in future.
+        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << "-#{option}"))
+      end
+    else
+      __itemcget([:heading, tagOrId], option)
+    end
+  end
+  def headingconfigure(tagOrId, slot, value=None)
+    if slot.kind_of?(Hash)
+      slot = _symbolkey2str(slot)
+      sp_kv = []
+      __tile_specific_item_optkeys([:heading, tagOrId]).each{|k|
+        sp_kv << k << _get_eval_string(slot.delete(k)) if slot.has_key?(k)
+      }
+      tk_call(*(__item_config_cmd([:heading, tagOrId]).concat(sp_kv)))
+      tk_call(*(__item_config_cmd([:heading, tagOrId]).concat(hash_kv(slot))))
+    elsif __tile_specific_item_optkeys([:heading, tagOrId]).index(slot.to_s)
+      begin
+        # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
+        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << slot.to_s << value))
+      rescue
+        # Maybe, 'state' option has '-' in future.
+        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << "-#{slot}" << value))
+      end
+    else
+      __itemconfigure([:heading, tagOrId], slot, value)
+    end
+    self
+  end
+  def headingconfiginfo(tagOrId, slot=nil)
+    __itemconfiginfo([:heading, tagOrId], slot)
+  end
+  def current_headingconfiginfo(tagOrId, slot=nil)
+    __current_itemconfiginfo([:heading, tagOrId], slot)
+  end
+  alias heading_cget headingcget
+  alias heading_configure headingconfigure
+  alias heading_configinfo headingconfiginfo
+  alias current_heading_configinfo current_headingconfiginfo
+
+  # Treeview Tag
+  def tagcget(tagOrId, option)
+    __itemcget([:tag, tagOrId], option)
+  end
+  def tagconfigure(tagOrId, slot, value=None)
+    __itemconfigure([:tag, tagOrId], slot, value)
+  end
+  def tagconfiginfo(tagOrId, slot=nil)
+    __itemconfiginfo([:tag, tagOrId], slot)
+  end
+  def current_tagconfiginfo(tagOrId, slot=nil)
+    __current_itemconfiginfo([:tag, tagOrId], slot)
+  end
+  alias tag_cget tagcget
+  alias tag_configure tagconfigure
+  alias tag_configinfo tagconfiginfo
+  alias current_tag_configinfo current_tagconfiginfo
+end
+
+########################
+
+class Tk::Tile::Treeview::Item < TkObject
+  ItemID_TBL = TkCore::INTERP.create_table
+  TkCore::INTERP.init_ip_env{ Tk::Tile::Treeview::Item::ItemID_TBL.clear }
+
+  def self.id2obj(tree, id)
+    tpath = tree.path
+    return id unless Tk::Tile::Treeview::Item::ItemID_TBL[tpath]
+    (Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id])? \
+          Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]: id
+  end
+
+  def self.assign(tree, id)
+    tpath = tree.path
+    if Tk::Tile::Treeview::Item::ItemID_TBL[tpath] &&
+        Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]
+      return Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id]
+    end
+
+    obj = self.allocate
+    obj.instance_eval{
+      @parent = @t = tree
+      @tpath = tpath
+      @path = @id = id
+    }
+    ItemID_TBL[tpath] = {} unless ItemID_TBL[tpath]
+    Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id] = obj
+    obj
+  end
+
+  def _insert_item(tree, parent_item, idx, keys={})
+    keys = _symbolkey2str(keys)
+    id = keys.delete('id')
+    if id
+      num_or_str(tk_call(tree, 'insert', 
+                         parent_item, idx, '-id', id, *hash_kv(keys)))
+    else
+      num_or_str(tk_call(tree, 'insert', parent_item, idx, *hash_kv(keys)))
+    end
+  end
+  private :_insert_item
+
+  def initialize(tree, parent_item = '', idx = 'end', keys = {})
+    if parent_item.kind_of?(Hash)
+      keys = parent_item
+      idx = 'end'
+      parent_item = ''
+    elsif idx.kind_of?(Hash)
+      keys = idx
+      idx = 'end'
+    end
+
+    @parent = @t = tree
+    @tpath = tree.path
+    @path = @id = _insert_item(@t, parent_item, idx, keys)
+    ItemID_TBL[@tpath] = {} unless ItemID_TBL[@tpath]
+    ItemID_TBL[@tpath][@id] = self
+  end
+  def id
+    @id
+  end
+
+  def cget(option)
+    @t.itemcget(@id, option)
+  end
+
+  def configure(key, value=None)
+    @t.itemconfigure(@id, key, value)
+    self
+  end
+
+  def configinfo(key=nil)
+    @t.itemconfiginfo(@id, key)
+  end
+
+  def current_configinfo(key=nil)
+    @t.current_itemconfiginfo(@id, key)
+  end
+
+  def open?
+    cget('open')
+  end
+  def open
+    configure('open', true)
+    self
+  end
+  def close
+    configure('open', false)
+    self
+  end
+
+  def bbox(column=None)
+    @t.bbox(@id, column)
+  end
+
+  def children
+    @t.children(@id)
+  end
+  def set_children(*items)
+    @t.set_children(@id, *items)
+    self
+  end
+
+  def delete
+    @t.delete(@id)
+    self
+  end
+
+  def detach
+    @t.detach(@id)
+    self
+  end
+
+  def exist?
+    @t.exist?(@id)
+  end
+
+  def focus
+    @t.focus_item(@id)
+  end
+
+  def index
+    @t.index(@id)
+  end
+
+  def insert(idx='end', keys={})
+    @t.insert(@id, idx, keys)
+  end
+
+  def move(parent, idx)
+    @t.move(@id, parent, idx)
+    self
+  end
+
+  def next_item
+    @t.next_item(@id)
+  end
+
+  def parent_item
+    @t.parent_item(@id)
+  end
+
+  def prev_item
+    @t.prev_item(@id)
+  end
+
+  def see
+    @t.see(@id)
+    self
+  end
+
+  def selection_add
+    @t.selection_add(@id)
+    self
+  end
+
+  def selection_remove
+    @t.selection_remove(@id)
+    self
+  end
+
+  def selection_set
+    @t.selection_set(@id)
+    self
+  end
+
+  def selection_toggle
+    @t.selection_toggle(@id)
+    self
+  end
+
+  def get_directory
+    @t.get_directory(@id)
+  end
+  alias get_dictionary get_directory
+
+  def get(col)
+    @t.get(@id, col)
+  end
+
+  def set(col, value)
+    @t.set(@id, col, value)
+  end
+end
+
+########################
+
+class Tk::Tile::Treeview::Root < Tk::Tile::Treeview::Item
+  def self.new(tree, keys = {})
+    tpath = tree.path
+    if Tk::Tile::Treeview::Item::ItemID_TBL[tpath] &&
+        Tk::Tile::Treeview::Item::ItemID_TBL[tpath]['']
+      Tk::Tile::Treeview::Item::ItemID_TBL[tpath]['']
+    else
+      super(tree, keys)
+    end
+  end
+
+  def initialize(tree, keys = {})
+    @parent = @t = tree
+    @tpath = tree.path
+    @path = @id = ''
+    unless Tk::Tile::Treeview::Item::ItemID_TBL[@tpath]
+      Tk::Tile::Treeview::Item::ItemID_TBL[@tpath] = {}
+    end
+    Tk::Tile::Treeview::Item::ItemID_TBL[@tpath][@id] = self
+  end
+end
+
+########################
+
+class Tk::Tile::Treeview::Tag < TkObject
+  include TkTreatTagFont
+
+  TagID_TBL = TkCore::INTERP.create_table
+  Tag_ID = ['tile_treeview_tag'.freeze, '00000'.taint].freeze
+
+  TkCore::INTERP.init_ip_env{ Tk::Tile::Treeview::Tag::TagID_TBL.clear }
+
+  def self.id2obj(tree, id)
+    tpath = tree.path
+    return id unless Tk::Tile::Treeview::Tag::TagID_TBL[tpath]
+    (Tk::Tile::Treeview::Tag::TagID_TBL[tpath][id])? \
+          Tk::Tile::Treeview::Tag::TagID_TBL[tpath][id]: id
+  end
+
+  def initialize(tree, keys=nil)
+    @parent = @t = tree
+    @tpath = tree.path
+    @path = @id = Tag_ID.join(TkCore::INTERP._ip_id_)
+    TagID_TBL[@tpath] = {} unless TagID_TBL[@tpath]
+    TagID_TBL[@tpath][@id] = self
+    Tag_ID[1].succ!
+    if keys && keys != None
+      tk_call_without_enc(@tpath, 'tag', 'configure', *hash_kv(keys, true))
+    end
+  end
+  def id
+    @id
+  end
+
+  def bind(seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    @t.tag_bind(@id, seq, cmd, *args)
+    self
+  end
+
+  def bind_append(seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    @t.tag_bind_append(@id, seq, cmd, *args)
+    self
+  end
+
+  def bind_remove(seq)
+    @t.tag_bind_remove(@id, seq)
+    self
+  end
+
+  def bindinfo(seq=nil)
+    @t.tag_bindinfo(@id, seq)
+  end
+
+  def cget(option)
+    @t.tagcget(@id, option)
+  end
+
+  def configure(key, value=None)
+    @t.tagconfigure(@id, key, value)
+    self
+  end
+
+  def configinfo(key=nil)
+    @t.tagconfiginfo(@id, key)
+  end
+
+  def current_configinfo(key=nil)
+    @t.current_tagconfiginfo(@id, key)
+  end
+end
+
+########################
+
+class Tk::Tile::Treeview < TkWindow
+  include Tk::Tile::TileWidget
+  include Scrollable
+
+  include Tk::Tile::TreeviewConfig
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::treeview'.freeze].freeze
+  else
+    TkCommandNames = ['::treeview'.freeze].freeze
+  end
+  WidgetClassName = 'Treeview'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __destroy_hook__
+    Tk::Tile::Treeview::Item::ItemID_TBL.delete(@path)
+    Tk::Tile::Treeview::Tag::ItemID_TBL.delete(@path)
+  end
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+
+  def tagid(id)
+    if id.kind_of?(Tk::Tile::Treeview::Item) || 
+        id.kind_of?(Tk::Tile::Treeview::Tag)
+      id.id
+    elsif id.kind_of?(Array)
+      [id[0], _get_eval_string(id[1])]
+    else
+      _get_eval_string(id)
+    end
+  end
+
+  def root
+    Tk::Tile::Treeview::Root.new(self)
+  end
+
+  def bbox(item, column=None)
+    list(tk_send('item', 'bbox', item, column))
+  end
+
+  def children(item)
+    simplelist(tk_send_without_enc('children', item)).collect{|id|
+      Tk::Tile::Treeview::Item.id2obj(self, id)
+    }
+  end
+  def set_children(item, *items)
+    tk_send_without_enc('children', item, 
+                        array2tk_list(items.flatten, true))
+    self
+  end
+
+  def delete(*items)
+    tk_send_without_enc('delete', array2tk_list(items.flatten, true))
+    self
+  end
+
+  def detach(*items)
+    tk_send_without_enc('detach', array2tk_list(items.flatten, true))
+    self
+  end
+
+  def exist?(item)
+    bool(tk_send_without_enc('exists', _get_eval_enc_str(item)))
+  end
+
+  def focus_item(item = nil)
+    if item
+      tk_send('focus', item)
+      item
+    else
+      id = tk_send('focus')
+      (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
+    end
+  end
+
+  def identify(x, y)
+    # tile-0.7.2 or previous
+    ret = simplelist(tk_send('identify', x, y))
+    case ret[0]
+    when 'heading', 'separator'
+      ret[-1] = num_or_str(ret[-1])
+    when 'cell'
+      ret[1] = Tk::Tile::Treeview::Item.id2obj(self, ret[1])
+      ret[-1] = num_or_str(ret[-1])
+    when 'item', 'row'
+      ret[1] = Tk::Tile::Treeview::Item.id2obj(self, ret[1])
+    end
+  end
+
+  def row_identify(x, y)
+    id = tk_send('identify', 'row', x, y)
+    (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
+  end
+
+  def column_identify(x, y)
+    tk_send('identify', 'column', x, y)
+  end
+
+  def index(item)
+    number(tk_send('index', item))
+  end
+
+  # def insert(parent, idx='end', keys={})
+  #   keys = _symbolkey2str(keys)
+  #   id = keys.delete('id')
+  #   if id
+  #     num_or_str(tk_send('insert', parent, idx, '-id', id, *hash_kv(keys)))
+  #   else
+  #     num_or_str(tk_send('insert', parent, idx, *hash_kv(keys)))
+  #   end
+  # end
+  def insert(parent, idx='end', keys={})
+    Tk::Tile::Treeview::Item.new(self, parent, idx, keys)
+  end
+
+  # def instate(spec, cmd=Proc.new)
+  #   tk_send('instate', spec, cmd)
+  # end
+  # def state(spec=None)
+  #   tk_send('state', spec)
+  # end
+
+  def move(item, parent, idx)
+    tk_send('move', item, parent, idx)
+    self
+  end
+
+  def next_item(item)
+    id = tk_send('next', item)
+    (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
+  end
+
+  def parent_item(item)
+    if (id = tk_send('parent', item)).empty?
+      Tk::Tile::Treeview::Root.new(self)
+    else
+      Tk::Tile::Treeview::Item.id2obj(self, id)
+    end
+  end
+
+  def prev_item(item)
+    id = tk_send('prev', item)
+    (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
+  end
+
+  def see(item)
+    tk_send('see', item)
+    self
+  end
+
+  def selection
+    simplelist(tk_send('selection')).collect{|id|
+      Tk::Tile::Treeview::Item.id2obj(self, id)
+    }
+  end
+  alias selection_get selection
+
+  def selection_add(*items)
+    tk_send('selection', 'add', array2tk_list(items.flatten, true))
+    self
+  end
+  def selection_remove(*items)
+    tk_send('selection', 'remove', array2tk_list(items.flatten, true))
+    self
+  end
+  def selection_set(*items)
+    tk_send('selection', 'set', array2tk_list(items.flatten, true))
+    self
+  end
+  def selection_toggle(*items)
+    tk_send('selection', 'toggle', array2tk_list(items.flatten, true))
+    self
+  end
+
+  def get_directory(item)
+    # tile-0.7+
+    ret = []
+    lst = simplelist(tk_send('set', item))
+    until lst.empty?
+      col = lst.shift
+      val = lst.shift
+      ret << [col, val]
+    end
+    ret
+  end
+  alias get_dictionary get_directory
+
+  def get(item, col)
+    tk_send('set', item, col)
+  end
+  def set(item, col, value)
+    tk_send('set', item, col, value)
+    self
+  end
+
+  def tag_bind(tag, seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([@path, 'tag', 'bind', tag], seq, cmd, *args)
+    self
+  end
+  alias tagbind tag_bind
+
+  def tag_bind_append(tag, seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([@path, 'tag', 'bind', tag], seq, cmd, *args)
+    self
+  end
+  alias tagbind_append tag_bind_append
+
+  def tag_bind_remove(tag, seq)
+    _bind_remove([@path, 'tag', 'bind', tag], seq)
+    self
+  end
+  alias tagbind_remove tag_bind_remove
+
+  def tag_bindinfo(tag, context=nil)
+    _bindinfo([@path, 'tag', 'bind', tag], context)
+  end
+  alias tagbindinfo tag_bindinfo
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tscale.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tscale.rb
new file mode 100644
index 0000000000..7ec72e3515
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tscale.rb
@@ -0,0 +1,50 @@
+#
+#  tscale & tprogress widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TScale < TkScale
+    end
+    Scale = TScale
+
+    class TProgress < TScale
+    end
+    Progress = TProgress
+  end
+end
+
+class Tk::Tile::TScale < TkScale
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::scale'.freeze].freeze
+  else
+    TkCommandNames = ['::tscale'.freeze].freeze
+  end
+  WidgetClassName = 'TScale'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
+
+class Tk::Tile::TProgress < Tk::Tile::TScale
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::progress'.freeze].freeze
+  else
+    TkCommandNames = ['::tprogress'.freeze].freeze
+  end
+  WidgetClassName = 'TProgress'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tscrollbar.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tscrollbar.rb
new file mode 100644
index 0000000000..bd49ae18e3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tscrollbar.rb
@@ -0,0 +1,30 @@
+#
+#  tscrollbar widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TScrollbar < TkScrollbar
+    end
+    Scrollbar = TScrollbar
+  end
+end
+
+class Tk::Tile::TScrollbar < TkScrollbar
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::scrollbar'.freeze].freeze
+  else
+    TkCommandNames = ['::tscrollbar'.freeze].freeze
+  end
+  WidgetClassName = 'TScrollbar'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tseparator.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tseparator.rb
new file mode 100644
index 0000000000..ca731d4e5b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tseparator.rb
@@ -0,0 +1,30 @@
+#
+#  tseparator widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TSeparator < TkWindow
+    end
+    Separator = TSeparator
+  end
+end
+
+class Tk::Tile::TSeparator < TkWindow
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::separator'.freeze].freeze
+  else
+    TkCommandNames = ['::tseparator'.freeze].freeze
+  end
+  WidgetClassName = 'TSeparator'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tsquare.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tsquare.rb
new file mode 100644
index 0000000000..600b55e4e7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tile/tsquare.rb
@@ -0,0 +1,30 @@
+#
+#  tsquare widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TSquare < TkWindow
+    end
+    Square = TSquare
+  end
+end
+
+class Tk::Tile::TSquare < TkWindow
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::square'.freeze].freeze
+  else
+    TkCommandNames = ['::tsquare'.freeze].freeze
+  end
+  WidgetClassName = 'TSquare'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkDND.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkDND.rb
new file mode 100644
index 0000000000..5d52e34418
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkDND.rb
@@ -0,0 +1,18 @@
+#
+#  TkDND (Tk Drag & Drop Extension) support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkDND/setup.rb'
+
+module Tk
+  module TkDND
+    autoload :DND,   'tkextlib/tkDND/tkdnd'
+    autoload :Shape, 'tkextlib/tkDND/shape'
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkDND/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkDND/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkDND/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkDND/shape.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkDND/shape.rb
new file mode 100644
index 0000000000..570c93b0d9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkDND/shape.rb
@@ -0,0 +1,123 @@
+#
+#  tkextlib/tkDND/shape.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkDND/setup.rb'
+
+# TkPackage.require('shape', '0.3')
+TkPackage.require('shape')
+
+module Tk
+  module TkDND
+    module Shape
+      extend TkCore
+
+      PACKAGE_NAME = 'shape'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+=begin
+      def self.package_version
+        begin
+          TkPackage.require('shape')
+        rescue
+          ''
+        end
+      end
+=end
+      def self.package_version
+        Tk.tk_call('set', 'shape_version')
+      end
+      alias shape_version package_version
+
+      def self.package_patchlevel
+        Tk.tk_call('set', 'shape_patchlevel')
+      end
+      alias shape_patchlevel package_patchlevel
+
+      def self.version
+        tk_call('shape', 'version')
+      end
+      alias xshape_version version
+
+      ############################
+
+      def shape_bounds(kind=nil)
+        if kind
+          ret = tk_call('shape', 'bounds', @path, "-#{kind}")
+        else
+          ret = tk_call('shape', 'bounds', @path)
+        end
+        if ret == ""
+          nil
+        else
+          list(ret)
+        end
+      end
+
+      def shape_get(kind=nil)
+        if kind
+          list(tk_call('shape', 'get', @path, "-#{kind}"))
+        else
+          list(tk_call('shape', 'get', @path))
+        end
+      end
+
+      def shape_offset(x, y, kind=nil)
+        if kind
+          tk_call('shape', 'get', @path, "-#{kind}", x, y)
+        else
+          tk_call('shape', 'get', @path, x, y)
+        end
+        self
+      end
+
+      def _parse_shapespec_param(args)
+        cmd = []
+
+        kind_keys    = ['bounding', 'clip', 'both']
+        offset_keys  = ['offset']
+        srckind_keys = ['bitmap', 'rectangles', 'reset', 'test', 'window']
+
+        cmd << "-#{args.shift}" if kind_keys.member?(args[0].to_s)
+
+        if offset_keys.member?(args[0].to_s)
+          cmd << "-#{args.shift}"
+          cmd << args.shift # xOffset
+          cmd << args.shift # yOffset
+        end
+
+        if srckind_keys.member?(args[0].to_s)
+          cmd << "-#{args.shift}"
+        end
+
+        cmd.concat(args)
+
+        cmd
+      end
+      private :_parse_shapespec_param
+
+      def shape_set(*args) # ?kind? ?offset <x> <y>? srckind ?arg ...?
+        tk_call('shape', 'set', @path, *(_parse_shapespec_param(args)))
+        self
+      end
+
+      def shape_update(op, *args) # ?kind? ?offset <x> <y>? srckind ?arg ...?
+        tk_call('shape', 'update', @path, op, *(_parse_shapespec_param(args)))
+        self
+      end
+    end
+  end
+end
+
+class TkWindow
+  include Tk::TkDND::Shape
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkDND/tkdnd.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
new file mode 100644
index 0000000000..a040532eb6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkDND/tkdnd.rb
@@ -0,0 +1,164 @@
+#
+#  tkextlib/tkDND/tkdnd.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkDND/setup.rb'
+
+TkPackage.require('tkdnd')
+
+module Tk
+  module TkDND
+    PACKAGE_NAME = 'tkdnd'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('tkdnd')
+      rescue
+        ''
+      end
+    end
+
+    class DND_Subst < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?a, ?l, :actions ], 
+        [ ?A, ?s, :action ], 
+        [ ?b, ?L, :codes ], 
+        [ ?c, ?s, :code ], 
+        [ ?d, ?l, :descriptions ], 
+        [ ?D, ?l, :data ], 
+        [ ?L, ?l, :source_types ], 
+        [ ?m, ?l, :modifiers ], 
+        [ ?t, ?l, :types ], 
+        [ ?T, ?s, :type ], 
+        [ ?W, ?w, :widget ], 
+        [ ?x, ?n, :x ], 
+        [ ?X, ?n, :x_root ], 
+        [ ?y, ?n, :y ], 
+        [ ?Y, ?n, :y_root ], 
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?n, TkComm.method(:num_or_str) ], 
+        [ ?s, TkComm.method(:string) ], 
+        [ ?l, TkComm.method(:list) ], 
+        [ ?L, TkComm.method(:simplelist) ], 
+        [ ?w, TkComm.method(:window) ], 
+        nil
+      ]
+
+      # setup tables
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+    end
+
+    module DND
+      def self.version
+        begin
+          TkPackage.require('tkdnd')
+        rescue
+          ''
+        end
+      end
+
+      def dnd_bindtarget_info(type=nil, event=nil)
+        if event
+          procedure(tk_call('dnd', 'bindtarget', @path, type, event))
+        elsif type
+          procedure(tk_call('dnd', 'bindtarget', @path, type))
+        else
+          simplelist(tk_call('dnd', 'bindtarget', @path))
+        end
+      end
+
+      #def dnd_bindtarget(type, event, cmd=Proc.new, prior=50, *args)
+      #  event = tk_event_sequence(event)
+      #  if prior.kind_of?(Numeric)
+      #    tk_call('dnd', 'bindtarget', @path, type, event, 
+      #            install_bind_for_event_class(DND_Subst, cmd, *args), 
+      #            prior)
+      #  else
+      #    tk_call('dnd', 'bindtarget', @path, type, event, 
+      #            install_bind_for_event_class(DND_Subst, cmd, prior, *args))
+      #  end
+      #  self
+      #end
+      def dnd_bindtarget(type, event, *args)
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0]) || !block_given?
+          cmd = args.shift
+        else
+          cmd = Proc.new
+        end
+
+        prior = 50
+        prior = args.shift unless args.empty?
+
+        event = tk_event_sequence(event)
+        if prior.kind_of?(Numeric)
+          tk_call('dnd', 'bindtarget', @path, type, event, 
+                  install_bind_for_event_class(DND_Subst, cmd, *args), 
+                  prior)
+        else
+          tk_call('dnd', 'bindtarget', @path, type, event, 
+                  install_bind_for_event_class(DND_Subst, cmd, prior, *args))
+        end
+        self
+      end
+
+      def dnd_cleartarget
+        tk_call('dnd', 'cleartarget', @path)
+        self
+      end
+
+      def dnd_bindsource_info(type=nil)
+        if type
+          procedure(tk_call('dnd', 'bindsource', @path, type))
+        else
+          simplelist(tk_call('dnd', 'bindsource', @path))
+        end
+      end
+
+      #def dnd_bindsource(type, cmd=Proc.new, prior=None)
+      #  tk_call('dnd', 'bindsource', @path, type, cmd, prior)
+      #  self
+      #end
+      def dnd_bindsource(type, *args)
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0]) || !block_given?
+          cmd = args.shift
+        else
+          cmd = Proc.new
+        end
+
+        args = [None] if args.empty
+
+        tk_call('dnd', 'bindsource', @path, type, cmd, *args)
+        self
+      end
+
+      def dnd_clearsource()
+        tk_call('dnd', 'clearsource', @path)
+        self
+      end
+
+      def dnd_drag(keys=nil)
+        tk_call('dnd', 'drag', @path, *hash_kv(keys))
+        self
+      end
+    end
+  end
+end
+
+class TkWindow
+  include Tk::TkDND::DND
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkHTML.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkHTML.rb
new file mode 100644
index 0000000000..5fddde72ff
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkHTML.rb
@@ -0,0 +1,13 @@
+#
+#  TkHtml support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkHTML/setup.rb'
+
+# load library
+require 'tkextlib/tkHTML/htmlwidget'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
new file mode 100644
index 0000000000..8527f61df1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb
@@ -0,0 +1,444 @@
+#
+#  tkextlib/tkHTML/htmlwidget.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkHTML/setup.rb'
+
+# TkPackage.require('Tkhtml', '2.0')
+TkPackage.require('Tkhtml')
+
+module Tk
+  class HTML_Widget < TkWindow
+    PACKAGE_NAME = 'Tkhtml'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('Tkhtml')
+      rescue
+        ''
+      end
+    end
+
+    class ClippingWindow < TkWindow
+    end
+  end
+end
+
+class Tk::HTML_Widget::ClippingWindow
+  WidgetClassName = 'HtmlClip'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  HtmlClip_TBL = TkCore::INTERP.create_table
+  TkCore::INTERP.init_ip_env{ HtmlClip_TBL.clear }
+
+  def self.new(parent, keys={})
+    if parent.kind_of?(Hash)
+      keys = TkComm._symbolkey2str(parent)
+      parent = keys.delete('parent')
+    end
+
+    if parent.kind_of?(String)
+      ppath = parent.path
+    elsif parent
+      ppath = parent
+    else
+      ppath = ''
+    end
+    return HtmlClip_TBL[ppath] if HtmlClip_TBL[ppath]
+
+    widgetname = keys.delete('widgetname')
+    if widgetname =~ /^(.*)\.[^.]+$/
+      ppath2 = $1
+      if ppath2[0] != ?.
+        ppath2 = ppath + '.' + ppath2
+      end
+      return HtmlClip_TBL[ppath2] if HtmlClip_TBL[ppath2]
+
+      ppath = ppath2
+    end
+    
+    parent = TkComm._genobj_for_tkwidget(ppath)
+    unless parent.kind_of?(Tk::HTML_Widget)
+      fail ArgumentError, "parent must be a Tk::HTML_Widget instance"
+    end
+
+    super(parent)
+  end
+
+  def initialize(parent)
+    @parent = parent
+    @ppath = parent.path
+    @path = @id = @ppath + '.x'
+    HtmlClip_TBL[@ppath] = self
+  end
+
+  def method_missing(m, *args, &b)
+    @parent.__send__(m, *args, &b)
+  end
+end
+
+class Tk::HTML_Widget
+  include Scrollable
+
+  TkCommandNames = ['html'.freeze].freeze
+  WidgetClassName = 'Html'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  def __strval_optkeys
+    super() << 'base' << 'selectioncolor' << 'unvisitedcolor' << 'visitedcolor'
+  end
+  private :__strval_optkeys
+
+  ###################################
+  #  class methods
+  ###################################
+  def self.reformat(src, dst, txt)
+    tk_call('html', 'reformat', src, dst, txt)
+  end
+
+  def self.url_join(*args) # args := sheme authority path query fragment
+    tk_call('html', 'urljoin', *args)
+  end
+
+  def self.url_split(uri)
+    tk_call('html', 'urlsplit', uri)
+  end
+
+  def self.lockcopy(src, dst)
+    tk_call('html', 'lockcopy', src, dst)
+  end
+
+  def self.gzip_file(file, dat)
+    tk_call('html', 'gzip', 'file', file, dat)
+  end
+
+  def self.gunzip_file(file, dat)
+    tk_call('html', 'gunzip', 'file', filet)
+  end
+
+  def self.gzip_data(dat)
+    tk_call('html', 'gzip', 'data', file, dat)
+  end
+
+  def self.gunzip_data(dat)
+    tk_call('html', 'gunzip', 'data', filet)
+  end
+
+  def self.base64_encode(dat)
+    tk_call('html', 'base64', 'encode', dat)
+  end
+
+  def self.base64_decode(dat)
+    tk_call('html', 'base64', 'encode', dat)
+  end
+
+  def self.text_format(dat, len)
+    tk_call('html', 'text', 'format', dat, len)
+  end
+
+  def self.xor(cmd, *args)
+    tk_call('html', 'xor', cmd, *args)
+  end
+
+  def self.stdchan(cmd, channel)
+    tk_call('html', 'stdchan', cmd, channel)
+  end
+
+  def self.crc32(data)
+    tk_call('html', 'crc32', data)
+  end
+
+  ###################################
+  #  instance methods
+  ###################################
+  def clipping_window
+    ClippingWindow.new(self)
+  end
+  alias clipwin  clipping_window
+  alias htmlclip clipping_window
+
+  def bgimage(image, tid=None)
+    tk_send('bgimage', image, tid)
+    self
+  end
+
+  def clear()
+    tk_send('clear')
+    self
+  end
+
+  def coords(index=None, percent=None)
+    tk_send('coords', index, percent)
+  end
+
+  def forminfo(*args)
+    tk_send('forminfo', *args)
+  end
+  alias form_info forminfo
+
+  def href(x, y)
+    simplelist(tk_send('href', x, y))
+  end
+
+  def image_add(id, img)
+    tk_send('imageadd', id, img)
+    self
+  end
+
+  def image_at(x, y)
+    tk_send('imageat', x, y)
+  end
+
+  def images()
+    list(tk_send('images'))
+  end
+
+  def image_set(id, num)
+    tk_send('imageset', id, num)
+    self
+  end
+
+  def image_update(id, imgs)
+    tk_send('imageupdate', id, imgs)
+    self
+  end
+
+  def index(idx, count=None, unit=None)
+    tk_send('index', idx, count, unit)
+  end
+
+  def insert_cursor(idx)
+    tk_send('insert', idx)
+  end
+
+  def names()
+    simple_list(tk_send('names'))
+  end
+
+  def on_screen(id, x, y)
+    bool(tk_send('onscreen', id, x, y))
+  end
+
+  def over(x, y)
+    list(tk_send('over', x, y))
+  end
+
+  def over_markup(x, y)
+    list(tk_send('over', x, y, '-muponly'))
+  end
+
+  def over_attr(x, y, attrs)
+    list(tk_send('overattr', x, y, attrs))
+  end
+
+  def parse(txt)
+    tk_send('parse', txt)
+    self
+  end
+
+  def resolver(*uri_args)
+    tk_send('resolver', *uri_args)
+  end
+
+  def selection_clear()
+    tk_send('selection', 'clear')
+    self
+  end
+
+  def selection_set(first, last)
+    tk_send('selection', 'set', first, last)
+    self
+  end
+
+  def refresh(*opts)
+    tk_send('refresh', *opts)
+  end
+
+  def layout()
+    tk_send('layout')
+  end
+
+  def sizewindow(*args)
+    tk_send('sizewindow', *args)
+  end
+
+  def postscript(*args)
+    tk_send('postscript', *args)
+  end
+
+  def source()
+    tk_send('source')
+  end
+
+  def plain_text(first, last)
+    tk_send('text', 'ascii', first, last)
+  end
+  alias ascii_text plain_text
+  alias text_ascii plain_text
+
+  def text_delete(first, last)
+    tk_send('text', 'delete', first, last)
+    self
+  end
+
+  def html_text(first, last)
+    tk_send('text', 'html', first, last)
+  end
+  alias text_html html_text
+
+  def text_insert(idx, txt)
+    tk_send('text', 'insert', idx, txt)
+    self
+  end
+
+  def break_text(idx)
+    tk_send('text', 'break', idx)
+  end
+  alias text_break break_text
+
+  def text_find(txt, *args)
+    tk_send('text', 'find', txt, *args)
+  end
+
+  def text_table(idx, imgs=None, attrs=None)
+    tk_send('text', 'table', idx, imgs, attrs)
+  end
+
+  def token_append(tag, *args)
+    tk_send('token', 'append', tag, *args)
+    self
+  end
+
+  def token_delete(first, last=None)
+    tk_send('token', 'delete', first, last)
+    self
+  end
+
+  def token_define(*args)
+    tk_send('token', 'defile', *args)
+    self
+  end
+
+  def token_find(tag, *args)
+    list(tk_send('token', 'find', tag, *args))
+  end
+
+  def token_get(first, last=None)
+    list(tk_send('token', 'get', first, last))
+  end
+
+  def token_list(first, last=None)
+    list(tk_send('token', 'list', first, last))
+  end
+
+  def token_markup(first, last=None)
+    list(tk_send('token', 'markup', first, last))
+  end
+
+  def token_DOM(first, last=None)
+    list(tk_send('token', 'domtokens', first, last))
+  end
+  alias token_dom token_DOM
+  alias token_domtokens token_DOM
+  alias token_dom_tokens token_DOM
+
+  def token_get_end(idx)
+    tk_send('token', 'getend', idx)
+  end
+  alias token_getend token_get_end
+
+  def token_offset(start, num1, num2)
+    list(tk_send('token', 'offset', start, num1, num2))
+  end
+
+  def token_get_attr(idx, name=None)
+    list(tk_send('token', 'attr', idx, name))
+  end
+
+  def token_set_attr(idx, name=None, val=None)
+    tk_send('token', 'attr', idx, name, val)
+    self
+  end
+
+  def token_handler(tag, cmd=nil, &b)
+    cmd = Proc.new(&b) if !cmd && b
+    if cmd
+      tk_send('token', 'handler', tag, cmd)
+      return self
+    else
+      return tk_send('token', 'handler', tag)
+    end
+  end
+
+  def token_insert(idx, tag, *args)
+    tk_send('token', 'insert', idx, tag, *args)
+    self
+  end
+
+  def token_attrs(*args)
+    list(tk_send('token', 'attrs', *args))
+  end
+
+  def token_unique(*args)
+    list(tk_send('token', 'unique', *args))
+  end
+
+  def token_on_events(*args)
+    list(tk_send('token', 'onEvents', *args))
+  end
+
+  def dom_nameidx(tag, name)
+    number(tk_send('dom', 'nameidx', tag, name))
+  end
+  alias dom_name_index dom_nameidx
+
+  def dom_radioidx(tag, name)
+    number(tk_send('dom', 'radioidx', tag, name))
+  end
+  alias dom_radio_index dom_radioidx
+
+  def dom_id(*spec)
+    tk_send('dom', 'id', *spec)
+  end
+
+  def dom_ids(*spec)
+    list(tk_send('dom', 'ids', *spec))
+  end
+
+  def dom_value(*spec)
+    list(tk_send('dom', 'value', *spec))
+  end
+
+  def dom_attr(idx)
+    tk_send('dom', 'attr', idx)
+  end
+
+  def dom_formel(name)
+    tk_send('dom', 'formel', name)
+  end
+  alias dom_form_element dom_formel
+
+  def dom_tree(idx, val)
+    list(tk_send('dom', 'tree', idx, val))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkHTML/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkHTML/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkHTML/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg.rb
new file mode 100644
index 0000000000..c01359d3ef
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg.rb
@@ -0,0 +1,36 @@
+#
+#  TkImg extension support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# load all image format handlers
+#TkPackage.require('Img', '1.3')
+TkPackage.require('Img')
+
+module Tk
+  module Img
+    PACKAGE_NAME = 'Img'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('Img')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+# autoload
+autoload :TkPixmapImage, 'tkextlib/tkimg/pixmap'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/README b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/README
new file mode 100644
index 0000000000..65d36365d0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/README
@@ -0,0 +1,26 @@
+
+ [ Tcl/Tk Image formats (TkImg) support ]
+
+TkImg contains a collection of format handlers for the Tk photo
+image type, and a new image type, pixmaps.  
+
+Supported formats of TkImg version 1.3 are
+-------------------------------------------------------
+   bmp    : Windows Bitmap Format
+   gif    : Graphics Interchange Format
+   ico    : Windows Icon Format
+   jpeg   : Joint Picture Expert Group format
+   pcx    : Paintbrush Format
+   pixmap : Pixmap Image type
+   png    : Portable Network Graphics format
+   ppm    : Portable Pixmap format
+   ps     : Adobe PostScript Format
+   sgi    : SGI Native Format
+   sun    : Sun Raster Format
+   tga    : Truevision Targa Format
+   tiff   : Tagged Image File Format
+   window : Tk Windows
+   xbm    : X Window Bitmap Format
+   xpm    : X Window Pixmap Format
+-------------------------------------------------------
+
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/bmp.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/bmp.rb
new file mode 100644
index 0000000000..ea90181aa3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/bmp.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'bmp'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+#TkPackage.require('img::bmp', '1.3')
+TkPackage.require('img::bmp')
+
+module Tk
+  module Img
+    module BMP
+      PACKAGE_NAME = 'img::bmp'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::bmp')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/gif.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/gif.rb
new file mode 100644
index 0000000000..d542d47561
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/gif.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'gif'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::gif', '1.3')
+TkPackage.require('img::gif')
+
+module Tk
+  module Img
+    module GIF
+      PACKAGE_NAME = 'img::gif'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::gif')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/ico.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/ico.rb
new file mode 100644
index 0000000000..e79bdf45e9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/ico.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'ico'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::ico', '1.3')
+TkPackage.require('img::ico')
+
+module Tk
+  module Img
+    module ICO
+      PACKAGE_NAME = 'img::ico'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::ico')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/jpeg.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/jpeg.rb
new file mode 100644
index 0000000000..2126120161
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/jpeg.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'jpeg'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::jpeg', '1.3')
+TkPackage.require('img::jpeg')
+
+module Tk
+  module Img
+    module JPEG
+      PACKAGE_NAME = 'img::jpeg'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::jpeg')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/pcx.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/pcx.rb
new file mode 100644
index 0000000000..6831f4d35b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/pcx.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'pcx'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::pcx', '1.3')
+TkPackage.require('img::pcx')
+
+module Tk
+  module Img
+    module PCX
+      PACKAGE_NAME = 'img::pcx'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::pcx')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/pixmap.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/pixmap.rb
new file mode 100644
index 0000000000..bd1b870af7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/pixmap.rb
@@ -0,0 +1,44 @@
+#
+#  TkImg - format 'pixmap'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::pixmap', '1.3')
+TkPackage.require('img::pixmap')
+
+module Tk
+  module Img
+    module PIXMAP
+      PACKAGE_NAME = 'img::pixmap'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::pixmap')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+class TkPixmapImage<TkImage
+  def self.version
+    Tk::Img::PIXMAP.version
+  end
+
+  def initialize(*args)
+    @type = 'pixmap'
+    super(*args)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/png.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/png.rb
new file mode 100644
index 0000000000..5c829f48d2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/png.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'png'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::png', '1.3')
+TkPackage.require('img::png')
+
+module Tk
+  module Img
+    module PNG
+      PACKAGE_NAME = 'img::png'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::png')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/ppm.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/ppm.rb
new file mode 100644
index 0000000000..eacfae467d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/ppm.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'ppm'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::ppm', '1.3')
+TkPackage.require('img::ppm')
+
+module Tk
+  module Img
+    module PPM
+      PACKAGE_NAME = 'img::ppm'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::ppm')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/ps.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/ps.rb
new file mode 100644
index 0000000000..68e9178ac0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/ps.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'ps'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::ps', '1.3')
+TkPackage.require('img::ps')
+
+module Tk
+  module Img
+    module PS
+      PACKAGE_NAME = 'img::ps'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::ps')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/sgi.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/sgi.rb
new file mode 100644
index 0000000000..ec7038bf0e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/sgi.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'sgi'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::sgi', '1.3')
+TkPackage.require('img::sgi')
+
+module Tk
+  module Img
+    module SGI
+      PACKAGE_NAME = 'img::sgi'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::sgi')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/sun.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/sun.rb
new file mode 100644
index 0000000000..651f946497
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/sun.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'sun'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::sun', '1.3')
+TkPackage.require('img::sun')
+
+module Tk
+  module Img
+    module SUN
+      PACKAGE_NAME = 'img::sun'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::sun')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/tga.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/tga.rb
new file mode 100644
index 0000000000..1eae407c0a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/tga.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'tga'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::tga', '1.3')
+TkPackage.require('img::tga')
+
+module Tk
+  module Img
+    module TGA
+      PACKAGE_NAME = 'img::tga'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::tga')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/tiff.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/tiff.rb
new file mode 100644
index 0000000000..ed271c2600
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/tiff.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'tiff'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::tiff', '1.3')
+TkPackage.require('img::tiff')
+
+module Tk
+  module Img
+    module TIFF
+      PACKAGE_NAME = 'img::tiff'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::tiff')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/window.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/window.rb
new file mode 100644
index 0000000000..3b5906fab6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/window.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'window'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::window', '1.3')
+TkPackage.require('img::window')
+
+module Tk
+  module Img
+    module WINDOW
+      PACKAGE_NAME = 'img::window'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::window')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/xbm.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/xbm.rb
new file mode 100644
index 0000000000..f4bea030be
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/xbm.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'xbm'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::xbm', '1.3')
+TkPackage.require('img::xbm')
+
+module Tk
+  module Img
+    module XBM
+      PACKAGE_NAME = 'img::xbm'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::xbm')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/xpm.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/xpm.rb
new file mode 100644
index 0000000000..5119c8710b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tkimg/xpm.rb
@@ -0,0 +1,33 @@
+#
+#  TkImg - format 'xpm'
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tkimg/setup.rb'
+
+# TkPackage.require('img::xpm', '1.3')
+TkPackage.require('img::xpm')
+
+module Tk
+  module Img
+    module XPM
+      PACKAGE_NAME = 'img::xpm'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('img::xpm')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tktable.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tktable.rb
new file mode 100644
index 0000000000..385eb13497
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tktable.rb
@@ -0,0 +1,14 @@
+#
+#  TkTable support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tktable/setup.rb'
+
+# load library
+require 'tkextlib/tktable/tktable'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tktable/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tktable/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tktable/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tktable/tktable.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tktable/tktable.rb
new file mode 100644
index 0000000000..4edaabc847
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tktable/tktable.rb
@@ -0,0 +1,839 @@
+#
+#  tkextlib/tktable/tktable.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/validation'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tktable/setup.rb'
+
+# TkPackage.require('Tktable', '2.8')
+TkPackage.require('Tktable')
+
+module Tk
+  class TkTable < TkWindow
+    PACKAGE_NAME = 'Tktable'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('Tktable')
+      rescue
+        ''
+      end
+    end
+
+    class CellTag < TkObject
+    end
+
+    module ConfigMethod
+    end
+  end
+end
+
+module Tk::TkTable::ConfigMethod
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)  # id := [ type, tagOrId ]
+    [self.path, id[0], 'cget', id[1]]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)  # id := [ type, tagOrId ]
+    [self.path, id[0], 'configure', id[1]]
+  end
+  private :__item_config_cmd
+
+  def __item_pathname(id)
+    if id.kind_of?(Array)
+      id = tagid(id[1])
+    end
+    [self.path, id].join(';')
+  end
+  private :__item_pathname
+
+  def __item_boolval_optkeys(id)
+    super(id) << 'multiline' << 'showtext' << 'wrap'
+  end
+  private :__item_boolval_optkeys
+
+  def __item_strval_optkeys(id)
+    super(id) << 'ellipsis'
+  end
+  private :__item_strval_optkeys
+
+  def __item_val2ruby_optkeys(id)  # { key=>method, ... }
+    super(id).update('window'=>proc{|v| window(v)})
+  end
+  private :__item_val2ruby_optkeys
+
+  def tag_cget(tagOrId, option)
+    itemcget(['tag', tagid(tagOrId)], option)
+  end
+  def tag_configure(tagOrId, slot, value=None)
+    itemconfigure(['tag', tagid(tagOrId)], slot, value)
+  end
+  def tag_configinfo(tagOrId, slot=nil)
+    itemconfiginfo(['tag', tagid(tagOrId)], slot)
+  end
+  def current_tag_configinfo(tagOrId, slot=nil)
+    current_itemconfiginfo(['tag', tagid(tagOrId)], slot)
+  end
+
+  def window_cget(tagOrId, option)
+    itemcget(['window', tagid(tagOrId)], option)
+  end
+  def window_configure(tagOrId, slot, value=None)
+    if slot == :window || slot == 'window'
+      value = _epath(value)
+    elsif slot.kind_of?(Hash)
+      if slot.key?(:window) || slot.key?('window')
+        slot = _symbolkey2str(slot)
+        slot['window'] = _epath(slot['window'])
+      end
+    end
+    itemconfigure(['window', tagid(tagOrId)], slot, value)
+  end
+  def window_configinfo(tagOrId, slot=nil)
+    itemconfiginfo(['window', tagid(tagOrId)], slot)
+  end
+  def current_window_configinfo(tagOrId, slot=nil)
+    current_itemconfiginfo(['window', tagid(tagOrId)], slot)
+  end
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+end
+
+#####################################################
+
+class Tk::TkTable::CellTag
+  include TkTreatTagFont
+
+  CellTagID_TBL = TkCore::INTERP.create_table
+  CellTag_ID = ['tktbl:celltag'.freeze, '00000'.taint].freeze
+
+  TkCore::INTERP.init_ip_env{ CellTagID_TBL.clear }
+
+  def self.id2obj(table, id)
+    tpath = table.path
+    return id unless CellTagID_TBL[tpath]
+    CellTagID_TBL[tpath][id]? CellTagID_TBL[tpath][id] : id
+  end
+
+  def initialize(parent, keys=nil)
+    @parent = @t = parent
+    @tpath - parent.path
+    @path = @id = CellTag_ID.join(TkCore::INTERP._ip_id_)
+    CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
+    CellTagID_TBL[@tpath][@id] = self
+    CellTag_ID[1].succ!
+    configure(keys) if keys
+  end
+
+  def id
+    @id
+  end
+
+  def destroy
+    tk_call(@tpath, 'tag', 'delete', @id)
+    CellTagID_TBL[@tpath].delete(@id) if CellTagID_TBL[@tpath]
+    self
+  end
+  alias delete destroy
+
+  def exist?
+    @t.tag_exist?(@id)
+  end
+  def include?(idx)
+    @t.tag_include?(@id, idx)
+  end
+
+  def add_cell(*args)
+    @t.tag_cell(@id, *args)
+  end
+  def add_col(*args)
+    @t.tag_col(@id, *args)
+  end
+  def add_row(*args)
+    @t.tag_row(@id, *args)
+  end
+
+  def raise(target=None)
+    @t.tag_raise(@id, target)
+  end
+  def lower(target=None)
+    @t.tag_lower(@id, target)
+  end
+
+  def cget(key)
+    @t.tag_cget(@id, key)
+  end
+  def configure(key, val=None)
+    @t.tag_configure(@id, key, val)
+  end
+  def configinfo(key=nil)
+    @t.tag_configinfo(@id, key)
+  end
+  def current_configinfo(key=nil)
+    @t.current_tag_configinfo(@id, key)
+  end
+end
+
+class Tk::TkTable::NamedCellTag < Tk::TkTable::CellTag
+  def self.new(parent, name, keys=nil)
+    if CellTagID_TBL[parent.path] && CellTagID_TBL[parent.path][name]
+      cell = CellTagID_TBL[parent.path][name]
+      cell.configure(keys) if keys
+      return cell
+    else
+      super(parent, name, keys)
+    end
+  end
+
+  def initialize(parent, name, keys=nil)
+    @parent = @t = parent
+    @tpath - parent.path
+    @path = @id = name
+    CellTagID_TBL[@tpath] = {} unless CellTagID_TBL[@tpath]
+    CellTagID_TBL[@tpath][@id] = self
+    configure(keys) if keys
+  end
+end
+
+#####################################################
+
+class Tk::TkTable
+  TkCommandNames = ['table'.freeze].freeze
+  WidgetClassName = 'Table'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  include Scrollable
+  include Tk::TkTable::ConfigMethod
+  include Tk::ValidateConfigure
+
+  def __destroy_hook__
+    Tk::TkTable::CelTag::CellTagID_TBL.delete(@path)
+  end
+
+  def __boolval_optkeys
+    super() << 'autoclear' << 'flashmode' << 'invertselected' <<
+      'multiline' << 'selecttitle' << 'wrap'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'colseparator' << 'ellipsis' << 'rowseparator' << 'sparsearray'
+  end
+  private :__strval_optkeys
+
+
+  #################################
+
+  class BrowseCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?c, ?n, :column ], 
+        [ ?C, ?s, :index ], 
+        [ ?i, ?x, :cursor ], 
+        [ ?r, ?n, :row ], 
+        [ ?s, ?s, :last_index ], 
+        [ ?S, ?s, :new_index ], 
+        [ ?W, ?w, :widget ], 
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?n, TkComm.method(:number) ], 
+        [ ?x, TkComm.method(:num_or_str) ], 
+        [ ?s, TkComm.method(:string) ], 
+        [ ?w, TkComm.method(:window) ], 
+        nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        val
+      end
+    end
+
+    def self._config_keys
+      ['browsecommand', 'browsecmd']
+    end
+  end
+  #--------------------------------
+  class CellCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?c, ?n, :column ], 
+        [ ?C, ?s, :index ], 
+        [ ?i, ?m, :rw_mode ], 
+        [ ?r, ?n, :row ], 
+        [ ?s, ?v, :value ], 
+        [ ?W, ?w, :widget ], 
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?n, TkComm.method(:number) ], 
+        [ ?s, TkComm.method(:string) ], 
+        [ ?w, TkComm.method(:window) ], 
+        [ ?m, proc{|val| (val == '0')? (:r) : (:w)} ], 
+        [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ], 
+        nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        TkComm._get_eval_string(val)
+      end
+    end
+
+    def self._config_keys
+      ['command']
+    end
+  end
+  #--------------------------------
+  class SelectionCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?c, ?n, :sel_columns ], 
+        [ ?C, ?s, :sel_area ], 
+        [ ?i, ?n, :total ], 
+        [ ?r, ?n, :sel_rows ], 
+        [ ?s, ?s, :value ], 
+        [ ?W, ?w, :widget ], 
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?n, TkComm.method(:number) ], 
+        [ ?s, TkComm.method(:string) ], 
+        [ ?w, TkComm.method(:window) ], 
+        nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        val.to_s
+      end
+    end
+
+    def self._config_keys
+      ['selectioncommand', 'selcmd']
+    end
+  end
+  #--------------------------------
+  class ValidateCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?c, ?n, :column ], 
+        [ ?C, ?s, :index ], 
+        [ ?i, ?x, :cursor ], 
+        [ ?r, ?n, :row ], 
+        [ ?s, ?v, :current_value ], 
+        [ ?S, ?v, :new_value ], 
+        [ ?W, ?w, :widget ], 
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?n, TkComm.method(:number) ], 
+        [ ?x, TkComm.method(:num_or_str) ], 
+        [ ?s, TkComm.method(:string) ], 
+        [ ?w, TkComm.method(:window) ], 
+        [ ?v, proc{|val| TkComm.tk_tcl2ruby(val, true, false)} ], 
+        nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+    end
+
+    def self._config_keys
+      ['vcmd', 'validatecommand']
+    end
+  end
+
+  #################################
+
+  def __validation_class_list
+    super() << 
+      BrowseCommand << CellCommand << SelectionCommand << ValidateCommand
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, BrowseCommand)
+  Tk::ValidateConfigure.__def_validcmd(binding, CellCommand)
+  Tk::ValidateConfigure.__def_validcmd(binding, SelectionCommand)
+  Tk::ValidateConfigure.__def_validcmd(binding, ValidateCommand)
+
+  #################################
+
+  def activate(idx)
+    tk_send('activate', tagid(idx))
+  end
+
+  def bbox(idx)
+    list(tk_send('bbox', tagid(idx)))
+  end
+
+  def border_mark(x, y)
+    simplelist(tk_send('border', 'mark', x, y))
+  end
+  def border_mark_row(x, y)
+    tk_send('border', 'mark', x, y, 'row')
+  end
+  def border_mark_col(x, y)
+    tk_send('border', 'mark', x, y, 'col')
+  end
+  def border_dragto(x, y)
+    tk_send('border', 'dragto', x, y)
+  end
+
+  def clear_cache(first=None, last=None)
+    tk_send('clear', 'cache', tagid(first), tagid(last))
+    self
+  end
+  def clear_sizes(first=None, last=None)
+    tk_send('clear', 'sizes', tagid(first), tagid(last))
+    self
+  end
+  def clear_tags(first=None, last=None)
+    tk_send('clear', 'tags', tagid(first), tagid(last))
+    self
+  end
+  def clear_all(first=None, last=None)
+    tk_send('clear', 'all', tagid(first), tagid(last))
+    self
+  end
+
+  def curselection
+    simplelist(tk_send('curselection'))
+  end
+  def curselection=(val)
+    tk_send('curselection', val)
+    val
+  end
+
+  def curvalue
+    tk_tcl2ruby(tk_send('curvalue'), true, false)
+  end
+  def curvalue=(val)
+    tk_send('curvalue', val)
+    val
+  end
+
+  def delete_active(idx1, idx2=None)
+    tk_send('delete', 'active', tagid(idx1), tagid(idx2))
+    self
+  end
+  def delete_cols(*args) # ?switches_array?, index, ?count?
+    params = []
+    if args[0].kind_of?(Array)
+      switches = args.shift
+      switches.each{|k| params << "-#{k}"}
+    end
+    params << '--'
+    params << tagid(args.shift)
+    params.concat(args)
+    tk_send('delete', 'cols', *params)
+    self
+  end
+  def delete_rows(*args) # ?switches_array?, index, ?count?
+    params = []
+    if args[0].kind_of?(Array)
+      switches = args.shift
+      switches.each{|k| params << "-#{k}"}
+    end
+    params << '--'
+    params << tagid(args.shift)
+    params.concat(args)
+    tk_send('delete', 'rows', *params)
+    self
+  end
+
+  def get(idx)
+    tk_tcl2ruby(tk_send('get', tagid(idx)), true, false)
+  end
+  def get_area(idx1, idx2)
+    simplelist(tk_send('get', tagid(idx1), tagid(idx2))).collect{|v|
+      tk_tcl2ruby(v, true, false)
+    }
+  end
+
+  def height_list
+    list(tk_send('height'))
+  end
+  def height(row)
+    number(tk_send('height', row))
+  end
+  def set_height(*pairs)
+    tk_send('height', *(pairs.flatten))
+    self
+  end
+
+  def hidden_list
+    simplelist(tk_send('hidden'))
+  end 
+  def hidden?(idx, *args)
+    if args.empty?
+      if (ret = tk_send('hidden', tagid(idx))) == ''
+        false
+      else
+        ret
+      end
+    else
+      bool(tk_send('hidden', tagid(idx), *(args.collect{|i| tagid(i)})))
+    end
+  end
+
+  def icursor
+    number(tk_send('icursor'))
+  end
+  def icursor_set(idx)
+    number(tk_send('icursor', tagid(idx)))
+  end
+
+  def index(idx)
+    tk_send('index', tagid(idx))
+  end
+  def row_index(idx)
+    number(tk_send('index', tagid(idx), 'row'))
+  end
+  def col_index(idx)
+    number(tk_send('index', tagid(idx), 'col'))
+  end
+
+  def insert_active(idx, val)
+    tk_send('insert', 'active', tagid(idx), val)
+    self
+  end
+  def insert_cols(*args) # ?switches_array?, index, ?count?
+    params = []
+    if args[0].kind_of?(Array)
+      switches = args.shift
+      switches.each{|k| params << "-#{k}"}
+    end
+    params << '--'
+    params.concat(args)
+    params << tagid(args.shift)
+    tk_send('insert', 'cols', *params)
+    self
+  end
+  def insert_rows(*args) # ?switches_array?, index, ?count?
+    params = []
+    if args[0].kind_of?(Array)
+      switches = args.shift
+      switches.each{|k| params << "-#{k}"}
+    end
+    params << '--'
+    params << tagid(args.shift)
+    params.concat(args)
+    tk_send('insert', 'rows', *params)
+    self
+  end
+
+  # def postscript(*args)
+  #   tk_send('postscript', *args)
+  # end
+
+  def reread
+    tk_send('reread')
+    self
+  end
+
+  def scan_mark(x, y)
+    tk_send('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send('scan', 'dragto', x, y)
+    self
+  end
+
+  def see(idx)
+    tk_send('see', tagid(idx))
+    self
+  end
+
+  def selection_anchor(idx)
+    tk_send('selection', 'anchor', tagid(idx))
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send('selection', 'clear', tagid(first), tagid(last))
+    self
+  end
+  def selection_clear_all
+    selection_clear('all')
+  end
+  def selection_include?(idx)
+    bool(tk_send('selection', 'includes', tagid(idx)))
+  end
+  def selection_present
+    bool(tk_send('selection', 'present'))
+  end
+  def selection_set(first, last=None)
+    tk_send('selection', 'set', tagid(first), tagid(last))
+    self
+  end
+
+  def set(*pairs) # idx, val, idx, val, ... 
+    args = []
+    0.step(pairs.size-1, 2){|i|
+      args << tagid(pairs[i])
+      args << pairs[i+1]
+    }
+    tk_send('set', *args)
+    self
+  end
+  def set_row(*pairs) # idx, val, idx, val, ... 
+    args = []
+    0.step(pairs.size-1, 2){|i|
+      args << tagid(pairs[i])
+      args << pairs[i+1]
+    }
+    tk_send('set', 'row', *args)
+    self
+  end
+  def set_col(*pairs) # idx, val, idx, val, ... 
+    args = []
+    0.step(pairs.size-1, 2){|i|
+      args << tagid(pairs[i])
+      args << pairs[i+1]
+    }
+    tk_send('set', 'col', *args)
+    self
+  end
+=begin
+  def set(*pairs) # idx, val, idx, val, ...  OR [idx, val], [idx, val], ...
+    if pairs[0].kind_of?(Array)
+      # [idx, val], [idx, val], ...
+      args = []
+      pairs.each{|idx, val| args << tagid(idx) << val }
+      tk_send('set', *args)
+    else
+      # idx, val, idx, val, ... 
+      args = []
+      0.step(pairs.size-1, 2){|i|
+        args << tagid(pairs[i])
+        args << pairs[i+1]
+      }
+      tk_send('set', *args)
+    end
+    self
+  end
+  def set_row(*pairs)
+    if pairs[0].kind_of?(Array)
+      # [idx, val], [idx, val], ...
+      args = []
+      pairs.each{|idx, val| args << tagid(idx) << val }
+      tk_send('set', 'row', *args)
+    else
+      # idx, val, idx, val, ... 
+      args = []
+      0.step(pairs.size-1, 2){|i|
+        args << tagid(pairs[i])
+        args << pairs[i+1]
+      }
+      tk_send('set', 'row', *args)
+    end
+    self
+  end
+  def set_col(*pairs)
+    if pairs[0].kind_of?(Array)
+      # [idx, val], [idx, val], ...
+      args = []
+      pairs.each{|idx, val| args << idx << val }
+      tk_send('set', 'col', *args)
+    else
+      # idx, val, idx, val, ... 
+      args = []
+      0.step(pairs.size-1, 2){|i|
+        args << tagid(pairs[i])
+        args << pairs[i+1]
+      }
+      tk_send('set', 'col', *args)
+    end
+    self
+  end
+=end
+
+  def spans
+    simplelist(tk_send('spans')).collect{|inf|
+      lst = simplelist(inf)
+      idx = lst[0]
+      rows, cols = lst[1].split(',').map!{|n| Integer(n)}
+      [idx [rows, cols]]
+    }
+  end
+  alias span_list spans
+  def span(idx)
+    lst = simplelist(tk_send('spans', tagid(idx)))
+    idx = lst[0]
+    rows, cols = lst[1].split(',').map!{|n| Integer(n)}
+    [idx [rows, cols]]
+  end
+  def set_spans(*pairs)
+    # idx, val, idx, val, ... 
+    args = []
+    0.step(pairs.size-1, 2){|i|
+      args << tagid(pairs[i])
+      val = pairs[i+1]
+      if val.kind_of?(Array)
+        args << val.join(',')
+      else
+        args << val
+      end
+    }
+    tk_send('spans', *args)
+    self
+  end
+=begin
+  def set_spans(*pairs)
+    if pairs[0].kind_of?(Array)
+      # [idx, val], [idx, val], ...
+      args = []
+      pairs.each{|idx, val|
+        args << tagid(idx)
+        if val.kind_of?(Array)
+          args << val.join(',')
+        else
+          args << val
+        end
+      }
+      tk_send('spans', *args)
+    else
+      # idx, val, idx, val, ... 
+      args = []
+      0.step(pairs.size-1, 2){|i|
+        args << tagid(pairs[i])
+        val = pairs[i+1]
+        if val.kind_of?(Array)
+          args << val.join(',')
+        else
+          args << val
+        end
+      }
+      tk_send('spans', *args)
+    end
+    self
+  end
+=end
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::TkTable::CellTag)
+      tag.id
+    elsif tag.kind_of?(Array)
+      if tag[0].kind_of?(Integer) && tag[1].kind_of?(Integer)
+        # [row, col]
+        tag.join(',')
+      else
+        tag
+      end
+    else
+      tag
+    end
+  end
+
+  def tagid2obj(tagid)
+    if Tk::TkTable::CellTag::CellTagID_TBL.key?(@path)
+      if Tk::TkTable::CellTag::CellTagID_TBL[@path].key?(tagid)
+        Tk::TkTable::CellTag::CellTagID_TBL[@path][tagid]
+      else
+        tagid
+      end
+    else
+      tagid
+    end
+  end
+
+  def tag_cell(tag, *cells)
+    tk_send('tag', 'cell', tagid(tag), *(cells.collect{|idx| tagid(idx)}))
+    self
+  end
+  def tag_reset(*cells)
+    tk_send('tag', 'cell', '', *(cells.collect{|idx| tagid(idx)}))
+    self
+  end
+  def tag_col(tag, *cols)
+    tk_send('tag', 'col', tagid(tag), *cols)
+    self
+  end
+  def tag_col_reset(*cols)
+    tk_send('tag', 'col', '', *cols)
+    self
+  end
+  def tag_delete(tag)
+    tk_send('tag', 'delete', tagid(tag))
+    if Tk::TkTable::CellTag::CellTagID_TBL[@path]
+      if tag.kind_of? Tk::TkTable::CellTag
+        Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag.id) 
+      else
+        Tk::TkTable::CellTag::CellTagID_TBL[@path].delete(tag) 
+      end
+    end
+    self
+  end
+  def tag_exist?(tag)
+    bool(tk_send('tag', 'exists', tagid(tag)))
+  end
+  def tag_include?(tag, idx)
+    bool(tk_send('tag', 'includes', tagid(tag), tagid(idx)))
+  end
+  def tag_lower(tag, target=None)
+    tk_send('tag', 'lower', tagid(tag), tagid(target))
+    self
+  end
+  def tag_names(pat=None)
+    simplelist(tk_send('tag', 'names', pat)).collect{|tag| tagid2obj(tag)}
+  end
+  def tag_raise(tag, target=None)
+    tk_send('tag', 'raise', tagid(tag), tagid(target))
+    self
+  end
+  def tag_row(tag, *rows)
+    tk_send('tag', 'row', tagid(tag), *rows)
+    self
+  end
+  def tag_row_reset(*rows)
+    tk_send('tag', 'row', '', *rows)
+    self
+  end
+
+  def validate(idx)
+    bool(tk_send('validate', tagid(idx)))
+  end
+
+  def width_list
+    list(tk_send('width'))
+  end
+  def width(row)
+    number(tk_send('width', row))
+  end
+  def set_width(*pairs)
+    tk_send('width', *(pairs.flatten))
+    self
+  end
+
+  def window_delete(*args)
+    tk_send('window', 'delete', *(args.collect{|idx| tagid(idx)}))
+    self
+  end
+  def window_move(from_idx, to_idx)
+    tk_send('window', 'move', tagid(from_idx), tagid(to_idx))
+    self
+  end
+  def window_names(pat=None)
+    simplelist(tk_send('window', 'names', pat))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tktrans.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tktrans.rb
new file mode 100644
index 0000000000..c5de5be5e6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tktrans.rb
@@ -0,0 +1,14 @@
+#
+#  TkTrans support (win32 only)
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tktrans/setup.rb'
+
+# load library
+require 'tkextlib/tktrans/tktrans'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tktrans/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tktrans/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tktrans/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/tktrans/tktrans.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/tktrans/tktrans.rb
new file mode 100644
index 0000000000..665c57af0c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/tktrans/tktrans.rb
@@ -0,0 +1,64 @@
+#
+#  TkTrans support (win32 only)
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tktrans/setup.rb'
+
+TkPackage.require('tktrans') rescue Tk.load_tcllibrary('tktrans')
+
+module Tk
+  module TkTrans
+    PACKAGE_NAME = 'tktrans'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('tktrans')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+class TkWindow
+  def tktrans_set_image(img)
+    tk_send('tktrans::setwidget', @path, img)
+    self
+  end
+  def tktrans_get_image()
+    tk_send('tktrans::setwidget', @path)
+  end
+end
+
+class TkRoot
+  undef tktrans_set_image, tktrans_get_image
+
+  def tktrans_set_image(img)
+    tk_send('tktrans::settoplevel', @path, img)
+    self
+  end
+  def tktrans_get_image()
+    tk_send('tktrans::settoplevel', @path)
+  end
+end
+
+class TkToplevel
+  undef tktrans_set_image, tktrans_get_image
+
+  def tktrans_set_image(img)
+    tk_send('tktrans::settoplevel', @path, img)
+    self
+  end
+  def tktrans_get_image()
+    tk_send('tktrans::settoplevel', @path)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/treectrl.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/treectrl.rb
new file mode 100644
index 0000000000..1944fb83e3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/treectrl.rb
@@ -0,0 +1,13 @@
+#
+#  TkTreeCtrl support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/treectrl/setup.rb'
+
+# load library
+require 'tkextlib/treectrl/tktreectrl'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/treectrl/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/treectrl/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/treectrl/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
new file mode 100644
index 0000000000..12f7cffabf
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb
@@ -0,0 +1,2311 @@
+#
+#  tkextlib/treectrl/tktreectrl.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/treectrl/setup.rb'
+
+# TkPackage.require('treectrl', '1.0')
+# TkPackage.require('treectrl', '1.1')
+TkPackage.require('treectrl')
+
+module Tk
+  class TreeCtrl < TkWindow
+    BindTag_FileList = TkBindTag.new_by_name('TreeCtrlFileList')
+
+    PACKAGE_NAME = 'treectrl'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('treectrl')
+      rescue
+        ''
+      end
+    end
+
+    HasColumnCreateCommand = 
+      (TkPackage.vcompare(self.package_version, '1.1') >= 0)
+
+    # dummy :: 
+    #  pkgIndex.tcl of TreeCtrl-1.0 doesn't support auto_load for 
+    #  'loupe' command (probably it is bug, I think). 
+    #  So, calling a 'treectrl' command for loading the dll with 
+    #  the auto_load facility. 
+    begin
+      tk_call('treectrl')
+    rescue
+    end
+    def self.loupe(img, x, y, w, h, zoom)
+      # NOTE: platform == 'unix' only
+
+      # img  => TkPhotoImage
+      # x, y => screen coords 
+      # w, h => magnifier width and height
+      # zoom => zooming rate
+      Tk.tk_call_without_enc('loupe', img, x, y, w, h, zoom)
+    end
+
+    def self.text_layout(font, text, keys={})
+      TkComm.list(Tk.tk_call_without_enc('textlayout', font, text, keys))
+    end
+
+    def self.image_tint(img, color, alpha)
+      Tk.tk_call_without_enc('imagetint', img, color, alpha)
+    end
+
+    class NotifyEvent < TkUtil::CallbackSubst
+    end
+
+    module ConfigMethod
+    end
+  end
+  TreeCtrl_Widget = TreeCtrl
+end
+
+##############################################
+
+class Tk::TreeCtrl::NotifyEvent
+  # [ <'%' subst-key char>, <proc type char>, <instance var (accessor) name>]
+  KEY_TBL = [
+    [ ?c, ?n, :item_num ], 
+    [ ?d, ?s, :detail ], 
+    [ ?D, ?l, :items ], 
+    [ ?e, ?e, :event ], 
+    [ ?I, ?n, :id ], 
+    [ ?l, ?n, :lower_bound ], 
+    [ ?p, ?n, :active_id ], 
+    [ ?P, ?e, :pattern ], 
+    [ ?S, ?l, :sel_items ], 
+    [ ?T, ?w, :widget ], 
+    [ ?u, ?n, :upper_bound ], 
+    [ ?W, ?o, :object ], 
+    [ ??, ?x, :parm_info ], 
+    nil
+  ]
+
+  # [ <proc type char>, <proc/method to convert tcl-str to ruby-obj>]
+  PROC_TBL = [
+    [ ?n, TkComm.method(:num_or_str) ], 
+    [ ?s, TkComm.method(:string) ], 
+    [ ?l, TkComm.method(:list) ], 
+    [ ?w, TkComm.method(:window) ], 
+
+    [ ?e, proc{|val|
+        case val
+        when /^<<[^<>]+>>$/
+          TkVirtualEvent.getobj(val[1..-2])
+        when /^<[^<>]+>$/
+          val[1..-2]
+        else
+          val
+        end
+      }
+    ], 
+
+    [ ?o, proc{|val| TkComm.tk_tcl2ruby(val)} ], 
+
+    [ ?x, proc{|val|
+        begin
+          inf = {}
+          Hash[*(TkComm.list(val))].each{|k, v|
+            if keyinfo = KEY_TBL.assoc(k[0])
+              if cmd = PROC_TBL.assoc(keyinfo[1])
+                begin
+                  new_v = cmd.call(v)
+                  v = new_v
+                rescue
+                end
+              end
+            end
+            inf[k] = v
+          }
+          inf
+        rescue
+          val
+        end
+      } ], 
+
+    nil
+  ]
+
+  # setup tables to be used by scan_args, _get_subst_key, _get_all_subst_keys
+  #
+  #     _get_subst_key() and _get_all_subst_keys() generates key-string 
+  #     which describe how to convert callback arguments to ruby objects. 
+  #     When binding parameters are given, use _get_subst_key(). 
+  #     But when no parameters are given, use _get_all_subst_keys() to 
+  #     create a Event class object as a callback parameter. 
+  #
+  #     scan_args() is used when doing callback. It convert arguments 
+  #     ( which are Tcl strings ) to ruby objects based on the key string 
+  #     that is generated by _get_subst_key() or _get_all_subst_keys(). 
+  #
+  _setup_subst_table(KEY_TBL, PROC_TBL);
+end
+
+##############################################
+
+module Tk::TreeCtrl::ConfigMethod
+  include TkItemConfigMethod
+
+  def treectrl_tagid(key, obj)
+    if key.kind_of?(Array)
+      key = key.join(' ')
+    else
+      key = key.to_s
+    end
+
+    if (obj.kind_of?(Tk::TreeCtrl::Column) ||
+        obj.kind_of?(Tk::TreeCtrl::Element) ||
+        obj.kind_of?(Tk::TreeCtrl::Item) ||
+        obj.kind_of?(Tk::TreeCtrl::Style)) 
+      obj = obj.id
+    end
+
+    case key
+    when 'column'
+      obj
+
+    when 'debug'
+      None
+
+    when 'dragimage'
+      None
+
+    when 'element'
+      obj
+
+    when 'item element'
+      obj
+
+    when 'marquee'
+      None
+
+    when 'notify'
+      obj
+
+    when 'style'
+      obj
+
+    else
+      obj
+    end
+  end
+
+  def tagid(mixed_id)
+    if mixed_id == 'debug'
+      ['debug', None]
+    elsif mixed_id == 'dragimage'
+      ['dragimage', None]
+    elsif mixed_id == 'marquee'
+      ['marquee', None]
+    elsif mixed_id.kind_of?(Array)
+      [mixed_id[0], treectrl_tagid(*mixed_id)]
+    else
+      tagid(mixed_id.split(':'))
+    end
+  end
+
+  def __item_cget_cmd(mixed_id)
+    if mixed_id[0] == 'column' && mixed_id[1] == 'drag'
+      return [self.path, 'column', 'dragcget']
+    end 
+
+    if mixed_id[1].kind_of?(Array)
+      id = mixed_id[1]
+    else
+      id = [mixed_id[1]]
+    end
+
+    if mixed_id[0].kind_of?(Array)
+      ([self.path].concat(mixed_id[0]) << 'cget').concat(id)
+    else
+      [self.path, mixed_id[0], 'cget'].concat(id)
+    end
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(mixed_id)
+    if mixed_id[0] == 'column' && mixed_id[1] == 'drag'
+      return [self.path, 'column', 'dragconfigure']
+    end 
+
+    if mixed_id[1].kind_of?(Array)
+      id = mixed_id[1]
+    else
+      id = [mixed_id[1]]
+    end
+
+    if mixed_id[0].kind_of?(Array)
+      ([self.path].concat(mixed_id[0]) << 'configure').concat(id)
+    else
+      [self.path, mixed_id[0], 'configure'].concat(id)
+    end
+  end
+  private :__item_config_cmd
+
+  def __item_pathname(id)
+    if id.kind_of?(Array)
+      key = id[0]
+      if key.kind_of?(Array)
+        key = key.join(' ')
+      end
+
+      tag = id[1]
+      if tag.kind_of?(Array)
+        tag = tag.join(' ')
+      end
+
+      id = [key, tag].join(':')
+    end
+    [self.path, id].join(';')
+  end
+  private :__item_pathname
+
+  def __item_configinfo_struct(id)
+    if id.kind_of?(Array) && id[0].to_s == 'notify'
+      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil, 
+        :default_value=>nil, :current_value=>1}
+    else
+      {:key=>0, :alias=>1, :db_name=>1, :db_class=>2, 
+        :default_value=>3, :current_value=>4}
+    end
+  end
+  private :__item_configinfo_struct
+
+
+  def __item_font_optkeys(id)
+    if id.kind_of?(Array) && (id[0] == 'element' || 
+                              (id[0].kind_of?(Array) && id[0][1] == 'element'))
+      []
+    else
+      ['font']
+    end
+  end
+  private :__item_font_optkeys
+
+  def __item_numstrval_optkeys(id)
+    if id == 'debug'
+      ['displaydelay']
+    else
+      super(id)
+    end
+  end
+  private :__item_numstrval_optkeys
+
+  def __item_boolval_optkeys(id)
+    if id == 'debug'
+      ['data', 'display', 'enable']
+    elsif id == 'dragimage'
+      ['visible']
+    elsif id == 'marquee'
+      ['visible']
+    elsif id.kind_of?(Array)
+      case id[0]
+      when 'item'
+        ['button', 'visible']
+      when 'column'
+        if id[1] == 'drag'
+          ['enable']
+        else
+          ['button', 'expand', 'resize', 'squeeze', 'sunken', 
+            'visible', 'widthhack']
+        end
+      when 'element'
+        ['draw', 'filled', 'showfocus', 'destroy']
+      when 'notify'
+        ['active']
+      when 'style'
+        ['detach']
+      else
+        if id[0].kind_of?(Array) && id[0][1] == 'element'
+          ['filled', 'showfocus']
+        else
+          super(id)
+        end
+      end
+    else
+      super(id)
+    end
+  end
+  private :__item_boolval_optkeys
+
+  def __item_strval_optkeys(id)
+    if id == 'debug'
+      ['erasecolor']
+    elsif id.kind_of?(Array)
+      case id[0]
+      when 'column'
+        if id[1] == 'drag'
+          ['indicatorcolor']
+        else
+          super(id) << 'textcolor'
+        end
+      when 'element'
+        super(id) << 'fill' << 'outline' << 'format'
+      else
+        super(id)
+      end
+    else
+      super(id)
+    end
+  end
+  private :__item_strval_optkeys
+
+  def __item_listval_optkeys(id)
+    if id.kind_of?(Array)
+      case id[0]
+      when 'column'
+        ['itembackground']
+      when 'element'
+        ['relief']
+      when 'style'
+        ['union']
+      else
+        if id[0].kind_of?(Array) && id[0][1] == 'element'
+          ['relief']
+        else
+          []
+        end
+      end
+    else
+      []
+    end
+  end
+  private :__item_listval_optkeys
+
+  def __item_keyonly_optkeys(id)  # { def_key=>(undef_key|nil), ... }
+    {
+      'notreally'=>nil, 
+      'increasing'=>'decreasing',
+      'decreasing'=>'increasing', 
+      'ascii'=>nil,
+      'dictionary'=>nil, 
+      'integer'=>nil, 
+      'real'=>nil
+    }
+  end
+  private :__item_keyonly_optkeys
+
+  def column_cget(tagOrId, option)
+    itemcget(['column', tagOrId], option)
+  end
+  def column_configure(tagOrId, slot, value=None)
+    itemconfigure(['column', tagOrId], slot, value)
+  end
+  def column_configinfo(tagOrId, slot=nil)
+    itemconfiginfo(['column', tagOrId], slot)
+  end
+  def current_column_configinfo(tagOrId, slot=nil)
+    current_itemconfiginfo(['column', tagOrId], slot)
+  end
+
+  def column_dragcget(option)
+    itemcget(['column', 'drag'], option)
+  end
+  def column_dragconfigure(slot, value=None)
+    itemconfigure(['column', 'drag'], slot, value)
+  end
+  def column_dragconfiginfo(slot=nil)
+    itemconfiginfo(['column', 'drag'], slot)
+  end
+  def current_column_dragconfiginfo(slot=nil)
+    current_itemconfiginfo(['column', 'drag'], slot)
+  end
+
+  def debug_cget(option)
+    itemcget('debug', option)
+  end
+  def debug_configure(slot, value=None)
+    itemconfigure('debug', slot, value)
+  end
+  def debug_configinfo(slot=nil)
+    itemconfiginfo('debug', slot)
+  end
+  def current_debug_configinfo(slot=nil)
+    current_itemconfiginfo('debug', slot)
+  end
+
+  def dragimage_cget(option)
+    itemcget('dragimage', option)
+  end
+  def dragimage_configure(slot, value=None)
+    itemconfigure('dragimage', slot, value)
+  end
+  def dragimage_configinfo(slot=nil)
+    itemconfiginfo('dragimage', slot)
+  end
+  def current_dragimage_configinfo(slot=nil)
+    current_itemconfiginfo('dragimage', slot)
+  end
+
+  def element_cget(tagOrId, option)
+    itemcget(['element', tagOrId], option)
+  end
+  def element_configure(tagOrId, slot, value=None)
+    itemconfigure(['element', tagOrId], slot, value)
+  end
+  def element_configinfo(tagOrId, slot=nil)
+    itemconfiginfo(['element', tagOrId], slot)
+  end
+  def current_element_configinfo(tagOrId, slot=nil)
+    current_itemconfiginfo(['element', tagOrId], slot)
+  end
+
+  def item_cget(tagOrId, option)
+    itemcget(['item', tagOrId], option)
+  end
+  def item_configure(tagOrId, slot, value=None)
+    itemconfigure(['item', tagOrId], slot, value)
+  end
+  def item_configinfo(tagOrId, slot=nil)
+    itemconfiginfo(['item', tagOrId], slot)
+  end
+  def current_item_configinfo(tagOrId, slot=nil)
+    current_itemconfiginfo(['item', tagOrId], slot)
+  end
+
+  def item_element_cget(item, column, elem, option)
+    itemcget([['item', 'element'], [item, column, elem]], option)
+  end
+  def item_element_configure(item, column, elem, slot, value=None)
+    itemconfigure([['item', 'element'], [item, column, elem]], slot, value)
+  end
+  def item_element_configinfo(item, column, elem, slot=nil)
+    itemconfiginfo([['item', 'element'], [item, column, elem]], slot)
+  end
+  def current_item_element_configinfo(item, column, elem, slot=nil)
+    current_itemconfiginfo([['item', 'element'], [item, column, elem]], slot)
+  end
+
+  def marquee_cget(option)
+    itemcget('marquee', option)
+  end
+  def marquee_configure(slot, value=None)
+    itemconfigure('marquee', slot, value)
+  end
+  def marquee_configinfo(slot=nil)
+    itemconfiginfo('marquee', slot)
+  end
+  def current_marquee_configinfo(slot=nil)
+    current_itemconfiginfo('marquee', slot)
+  end
+
+  def notify_cget(win, pattern, option)
+    pattern = "<#{pattern}>"
+    itemconfigure(['notify', [win, pattern]], option)
+  end
+  def notify_configure(win, pattern, slot, value=None)
+    pattern = "<#{pattern}>"
+    itemconfigure(['notify', [win, pattern]], slot, value)
+  end
+  def notify_configinfo(win, pattern, slot=nil)
+    pattern = "<#{pattern}>"
+    itemconfiginfo(['notify', [win, pattern]], slot)
+  end
+  alias current_notify_configinfo notify_configinfo
+
+  def style_cget(tagOrId, option)
+    itemcget(['style', tagOrId], option)
+  end
+  def style_configure(tagOrId, slot, value=None)
+    itemconfigure(['style', tagOrId], slot, value)
+  end
+  def style_configinfo(tagOrId, slot=nil)
+    itemconfiginfo(['style', tagOrId], slot)
+  end
+  def current_style_configinfo(tagOrId, slot=nil)
+    current_itemconfiginfo(['style', tagOrId], slot)
+  end
+
+  private :itemcget, :itemconfigure
+  private :itemconfiginfo, :current_itemconfiginfo
+end
+
+##############################################
+
+class Tk::TreeCtrl
+  include Tk::TreeCtrl::ConfigMethod
+  include Scrollable
+
+  TkCommandNames = ['treectrl'.freeze].freeze
+  WidgetClassName = 'TreeCtrl'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  #########################
+
+  def __destroy_hook__
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.delete(@path)
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.delete(@path)
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.delete(@path)
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.delete(@path)
+  end
+
+  #########################
+
+  def __strval_optkeys
+    super() + [
+      'buttoncolor', 'columnprefix', 'itemprefix', 'linecolor'
+    ]
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    [
+      'itemwidthequal', 'usetheme', 
+      'showbuttons', 'showheader', 'showlines', 'showroot', 
+      'showrootbutton', 'showrootlines',
+    ]
+  end
+  private :__boolval_optkeys
+
+  def __listval_optkeys
+    [ 'defaultstyle' ]
+  end
+  private :__listval_optkeys
+
+  #########################
+
+  def install_bind(cmd, *args)
+    install_bind_for_event_class(Tk::TreeCtrl::NotifyEvent, cmd, *args)
+  end
+
+  #########################
+
+  def create_self(keys)
+    if keys and keys != None
+      tk_call_without_enc(self.class::TkCommandNames[0], @path, 
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    end
+  end
+  private :create_self
+
+  #########################
+
+  def activate(desc)
+    tk_send('activate', desc)
+    self
+  end
+
+  def canvasx(x)
+    number(tk_send('canvasx', x))
+  end
+
+  def canvasy(y)
+    number(tk_send('canvasy', y))
+  end
+
+  def collapse(*dsc)
+    tk_send_without_enc('collapse', *(dsc.map!{|d| _get_eval_string(d, true)}))
+    self
+  end
+
+  def collapse_recurse(*dsc)
+    tk_send_without_enc('collapse', '-recurse', 
+                        *(dsc.map!{|d| _get_eval_string(d, true)}))
+    self
+  end
+
+  def column_bbox(idx)
+    list(tk_send('column', 'bbox', idx))
+  end
+
+  def column_compare(column1, op, column2)
+    bool(tk_send('column', 'compare', column1, op, column2))
+  end
+
+  def column_count
+    num_or_str(tk_send('column', 'count'))
+  end
+
+  def column_create(keys=nil)
+    if keys && keys.kind_of?(Hash)
+      num_or_str(tk_send('column', 'create', *hash_kv(keys)))
+    else
+      num_or_str(tk_send('column', 'create'))
+    end
+  end
+
+  def column_delete(idx)
+    if Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path]
+      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[self.path].delete(idx)
+    end
+    tk_send('column', 'delete', idx)
+    self
+  end
+
+  def column_index(idx)
+    num_or_str(tk_send('column', 'index', idx))
+  end
+
+  def column_id(idx)
+    tk_send('column', 'id', idx)
+  end
+
+  def column_list(visible=false)
+    if visible
+      simplelist(tk_send('column', 'list', '-visible'))
+    else
+      simplelist(tk_send('column', 'list'))
+    end
+  end
+  def column_visible_list
+    column_list(true)
+  end
+
+  def column_move(idx, before)
+    tk_send('column', 'move', idx, before)
+    self
+  end
+
+  def column_needed_width(idx)
+    num_or_str(tk_send('column', 'neededwidth', idx))
+  end
+  alias column_neededwidth column_needed_width
+
+  def column_order(column, visible=false)
+    if visible
+      num_or_str(tk_send('column', 'order', column, '-visible'))
+    else
+      num_or_str(tk_send('column', 'order', column))
+    end
+  end
+  def column_visible_order(column)
+    column_order(column, true)
+  end
+
+  def column_width(idx)
+    num_or_str(tk_send('column', 'width', idx))
+  end
+
+  def compare(item1, op, item2)
+    bool(tk_send('compare', item1, op, item2))
+  end
+
+  def contentbox()
+    list(tk_send('contentbox'))
+  end
+
+  def depth(item=None)
+    num_or_str(tk_send_without_enc('depth', _get_eval_string(item, true)))
+  end
+
+  def dragimage_add(item, *args)
+    tk_send('dragimage', 'add', item, *args)
+    self
+  end
+
+  def dragimage_clear()
+    tk_send('dragimage', 'clear')
+    self
+  end
+
+  def dragimage_offset(*args) # x, y
+    if args.empty?
+      list(tk_send('dragimage', 'offset'))
+    else
+      tk_send('dragimage', 'offset', *args)
+      self
+    end
+  end
+
+  def dragimage_visible(*args) # mode
+    if args..empty?
+      bool(tk_send('dragimage', 'visible'))
+    else
+      tk_send('dragimage', 'visible', *args)
+      self
+    end
+  end
+  def dragimage_visible?
+    dragimage_visible()
+  end
+
+  def debug_dinfo
+    tk_send('debug', 'dinfo')
+    self
+  end
+
+  def debug_scroll
+    tk_send('debug', 'scroll')
+  end
+
+  def element_create(elem, type, keys=nil)
+    if keys && keys.kind_of?(Hash)
+      tk_send('element', 'create', elem, type, *hash_kv(keys))
+    else
+      tk_send('element', 'create', elem, type)
+    end
+  end
+
+  def element_delete(*elems)
+    if Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path]
+      elems.each{|elem|
+        Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[self.path].delete(elem)
+      }
+    end
+    tk_send('element', 'delete', *elems)
+    self
+  end
+
+  def element_names()
+    list(tk_send('element', 'names')).collect!{|elem|
+      Tk::TreeCtrl::Element.id2obj(self, elem)
+    }
+  end
+
+  def _conv_element_perstate_val(opt, val)
+    case opt
+    when 'background', 'foreground', 'fill', 'outline', 'format'
+      val
+    when 'draw', 'filled', 'showfocus', 'destroy'
+      bool(val)
+    else
+      tk_tcl2ruby(val)
+    end
+  end
+  private :_conv_element_perstate_val
+
+  def element_perstate(elem, opt, st_list)
+    tk_send('element', 'perstate', elem, "-{opt}", st_list)
+  end
+
+  def element_type(elem)
+    tk_send('element', 'type', elem)
+  end
+
+  def element_class(elem)
+    Tk::TreeCtrl::Element.type2class(element_type(elem))
+  end
+
+  def expand(*dsc)
+    tk_send('expand', *dsc)
+    self
+  end
+
+  def expand_recurse(*dsc)
+    tk_send('expand', '-recurse', *dsc)
+    self
+  end
+
+  def identify(x, y)
+    lst = list(tk_send('identify', x, y))
+
+    if lst[0] == 'item'
+      lst[1] = Tk::TreeCtrl::Item.id2obj(self, lst[1])
+      size = lst.size
+      i = 2
+      while i < size
+        case lst[i]
+        when 'line'
+          i += 1
+          lst[i] = Tk::TreeCtrl::Item.id2obj(self, lst[i])
+          i += 1
+
+        when 'button'
+          i += 1
+
+        when 'column'
+          i += 2
+
+        when 'elem'
+          i += 1
+          lst[i] = Tk::TreeCtrl::Element.id2obj(self, lst[i])
+          i += 1
+
+        else
+          i += 1
+        end
+      end
+    end
+
+    lst
+  end
+
+  def index(idx)
+    num_or_str(tk_send('index', idx))
+  end
+
+  def item_ancestors(item)
+    list(tk_send('item', 'ancestors', item)).collect!{|id|
+      Tk::TreeCtrl::Item.id2obj(self, id)
+    }
+  end
+
+  def item_bbox(item, *args)
+    list(tk_send('item', 'bbox', item, *args))
+  end
+
+  def item_children(item)
+    list(tk_send('item', 'children', item)).collect!{|id|
+      Tk::TreeCtrl::Item.id2obj(self, id)
+    }
+  end
+
+  def item_collapse(item)
+    tk_send_without_enc('item', 'collapse', _get_eval_string(item, true))
+    self
+  end
+
+  def item_collapse_recurse(item)
+    tk_send_without_enc('item', 'collapse', 
+                        _get_eval_string(item, true), '-recurse')
+    self
+  end
+
+  def item_compare(item1, op, item2)
+    bool(tk_send('item', 'compare', item1, op, item2))
+  end
+
+  def item_complex(item, *args)
+    tk_send_without_enc('item', 'complex', 
+                        _get_eval_string(item, true), 
+                        *(args.map!{|arg| _get_eval_string(arg, true)}))
+    self
+  end
+
+  def item_count
+    num_or_str(tk_send('item', 'count'))
+  end
+
+  def item_create(keys={})
+    num_or_str(tk_send_without_enc('item', 'create', *hash_kv(keys, true)))
+  end
+
+  def _erase_children(item)
+    item_children(item).each{|i| _erase_children(i)}
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].delete(item)
+  end
+  private :_erase_children
+
+  def item_delete(first, last=None)
+    if Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path]
+      if first == 'all' || first == :all || last == 'all' || last == :all
+        Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[self.path].clear
+      elsif last == None
+        _erase_children(first)
+      else
+        self.range(first, last).each{|id|
+          _erase_children(id)
+        }
+      end
+    end
+    tk_send('item', 'delete', first, last)
+    self
+  end
+
+  def item_dump(item)
+    list(tk_send('item', 'dump', item))
+  end
+
+  def item_dump_hash(item)
+    Hash[*list(tk_send('item', 'dump', item))]
+  end
+
+  def item_element_actual(item, column, elem, key)
+    tk_send('item', 'element', 'actual', item, column, elem, "-#{key}")
+  end
+
+  def item_element_perstate(elem, opt, st_list)
+    tk_send('item', 'element', 'perstate', elem, "-{opt}", st_list)
+  end
+
+  def item_expand(item)
+    tk_send('item', 'expand', item)
+    self
+  end
+
+  def item_expand_recurse(item)
+    tk_send('item', 'expand', item, '-recurse')
+    self
+  end
+
+  def item_firstchild(parent, child=nil)
+    if child
+      tk_send_without_enc('item', 'firstchild', 
+                          _get_eval_string(parent, true), 
+                          _get_eval_string(child, true))
+      self
+    else
+      id = num_or_str(tk_send_without_enc('item', 'firstchild', 
+                                          _get_eval_string(parent, true)))
+      Tk::TreeCtrl::Item.id2obj(self, id)
+    end
+  end
+  alias item_first_child item_firstchild
+
+  def item_hasbutton(item, st=None)
+    if st == None
+      bool(tk_send_without_enc('item', 'hasbutton', 
+                               _get_eval_string(item, true)))
+    else
+      tk_send_without_enc('item', 'hasbutton', 
+                          _get_eval_string(item, true), 
+                          _get_eval_string(st))
+      self
+    end
+  end
+  alias item_has_button item_hasbutton
+
+  def item_hasbutton?(item)
+    item_hasbutton(item)
+  end
+  alias item_has_button? item_hasbutton?
+
+  def item_id(item)
+    tk_send('item', 'id', item)
+  end
+
+  def item_image(item, column=nil, *args)
+    if args.empty?
+      if column
+        img = tk_send('item', 'image', item, column)
+        TkImage::Tk_IMGTBL[img]? TkImage::Tk_IMGTBL[img] : img
+      else
+        simplelist(tk_send('item', 'image', item)).collect!{|img|
+          TkImage::Tk_IMGTBL[img]? TkImage::Tk_IMGTBL[img] : img
+        }
+      end
+    else
+      tk_send('item', 'image', item, column, *args)
+      self
+    end
+  end
+  def get_item_image(item, column=nil)
+    item_image(item, column)
+  end
+  def set_item_image(item, col, img, *args)
+    item_image(item, col, img, *args)
+  end
+
+  def item_index(item)
+    list(tk_send('item', 'index', item))
+  end
+
+  def item_isancestor(item, des)
+    bool(tk_send('item', 'isancestor', item, des))
+  end
+  alias item_is_ancestor  item_isancestor
+  alias item_isancestor?  item_isancestor
+  alias item_is_ancestor? item_isancestor
+
+  def item_isopen(item)
+    bool(tk_send('item', 'isopen', item))
+  end
+  alias item_is_open    item_isopen
+  alias item_isopen?    item_isopen
+  alias item_is_open?   item_isopen
+  alias item_isopened?  item_isopen
+  alias item_is_opened? item_isopen
+
+  def item_lastchild(parent, child=nil)
+    if child
+      tk_send_without_enc('item', 'lastchild', 
+                          _get_eval_string(parent, true),
+                          _get_eval_string(child, true))
+      self
+    else
+      id = num_or_str(tk_send_without_enc('item', 'lastchild', 
+                                          _get_eval_string(parent, true)))
+      Tk::TreeCtrl::Item.id2obj(self, id)
+    end
+  end
+  alias item_last_child item_lastchild
+
+  def item_nextsibling(sibling, nxt=nil)
+    if nxt
+      tk_send('item', 'nextsibling', sibling, nxt)
+      self
+    else
+      id = num_or_str(tk_send('item', 'nextsibling', sibling))
+      Tk::TreeCtrl::Item.id2obj(self, id)
+    end
+  end
+  alias item_next_sibling item_nextsibling
+
+  def item_numchildren(item)
+    number(tk_send_without_enc('item', 'numchildren', 
+                               _get_eval_string(item, true)))
+  end
+  alias item_num_children  item_numchildren
+  alias item_children_size item_numchildren
+
+  def item_order(item, visible=false)
+    if visible
+      ret = num_or_str(tk_send('item', 'order', item, '-visible'))
+    else
+      ret = num_or_str(tk_send('item', 'order', item))
+    end
+
+    (ret.kind_of?(Fixnum) && ret < 0)? nil: ret
+  end
+  def item_visible_order(item)
+    item_order(item, true)
+  end
+
+  def item_parent(item)
+    id = num_or_str(tk_send('item', 'parent', item))
+    Tk::TreeCtrl::Item.id2obj(self, id)
+  end
+
+  def item_prevsibling(sibling, prev=nil)
+    if prev
+      tk_send('item', 'prevsibling', sibling, prev)
+      self
+    else
+      id = num_or_str(tk_send('item', 'prevsibling', sibling))
+      Tk::TreeCtrl::Item.id2obj(self, id)
+    end
+  end
+  alias item_prev_sibling item_prevsibling
+
+  def item_range(first, last)
+    simplelist(tk_send('item', 'range', first, last))
+  end
+
+  def item_remove(item)
+    tk_send('item', 'remove', item)
+    self
+  end
+
+  def item_rnc(item)
+    list(tk_send('item', 'rnc', item))
+  end
+
+  def _item_sort_core(real_sort, item, *opts)
+    # opts ::= sort_param [, sort_param, ... ]
+    # sort_param ::= {key=>val, ...}
+    #                [type, desc, {key=>val, ...}]
+    #                param
+    opts = opts.collect{|param|
+      if param.kind_of?(Hash)
+        param = _symbolkey2str(param)
+        if param.key?('column')
+          key = '-column'
+          desc = param.delete('column')
+        elsif param.key?('element')
+          key = '-element'
+          desc = param.delete('element')
+        else
+          key = nil
+        end
+
+        if param.empty?
+          param = None
+        else
+          param = hash_kv(__conv_item_keyonly_opts(item, param))
+        end
+
+        if key
+          [key, desc].concat(param)
+        else
+          param
+        end
+
+      elsif param.kind_of?(Array)
+        if param[2].kind_of?(Hash)
+          param[2] = hash_kv(__conv_item_keyonly_opts(item, param[2]))
+        end
+        param
+
+      elsif param.kind_of?(String) && param =~ /\A[a-z]+\Z/
+        '-' << param
+
+      elsif param.kind_of?(Symbol)
+        '-' << param.to_s
+
+      else
+        param
+      end
+    }.flatten
+
+    if real_sort
+      tk_send('item', 'sort', item, *opts)
+      self
+    else
+      list(tk_send('item', 'sort', item, '-notreally', *opts))
+    end
+  end
+  private :_item_sort_core
+
+  def item_sort(item, *opts)
+    _item_sort_core(true, item, *opts)
+  end
+  def item_sort_not_really(item, *opts)
+    _item_sort_core(false, item, *opts)
+  end
+
+  def item_span(item, column=nil, *args)
+    if args.empty?
+      if column
+        list(tk_send('item', 'span', item, column))
+      else
+        simplelist(tk_send('item', 'span', item)).collect!{|elem| list(elem)}
+      end
+    else
+      tk_send('item', 'span', item, column, *args)
+      self
+    end
+  end
+  def get_item_span(item, column=nil)
+    item_span(item, column)
+  end
+  def set_item_span(item, col, num, *args)
+    item_span(item, col, num, *args)
+  end
+
+  def item_state_forcolumn(item, column, *args)
+    tk_send('item', 'state', 'forcolumn', item, column, *args)
+  end
+  alias item_state_for_column item_state_forcolumn
+
+  def item_state_get(item, *args)
+    if args.empty?
+      list(tk_send('item', 'state', 'get', item *args))
+    else
+      bool(tk_send('item', 'state', 'get', item))
+    end
+  end
+
+  def item_state_set(item, *args)
+    tk_send('item', 'state', 'set', item, *args)
+  end
+
+  def item_style_elements(item, column)
+    list(tk_send('item', 'style', 'elements', item, column)).collect!{|id|
+      Tk::TreeCtrl::Style.id2obj(self, id)
+    }
+  end
+
+  def item_style_map(item, column, style, map)
+    tk_send('item', 'style', 'map', item, column, style, map)
+    self
+  end
+
+  def item_style_set(item, column=nil, *args)
+    if args.empty?
+      if column
+        id = tk_send_without_enc('item', 'style', 'set', 
+                                 _get_eval_string(item, true), 
+                                 _get_eval_string(column, true))
+        Tk::TreeCtrl::Style.id2obj(self, id)
+      else
+        list(tk_send_without_enc('item', 'style', 'set', 
+                                 _get_eval_string(item, true))).collect!{|id|
+          Tk::TreeCtrl::Style.id2obj(self, id)
+        }
+      end
+    else
+      tk_send_without_enc('item', 'style', 'set', 
+                          _get_eval_string(item, true), 
+                          _get_eval_string(column, true), 
+                          *(args.flatten.map!{|arg|
+                              _get_eval_string(arg, true)
+                            }))
+      self
+    end
+  end
+
+  def item_text(item, column, txt=nil, *args)
+    if args.empty?
+      if txt
+        tk_send('item', 'text', item, column, txt)
+        self
+      else
+        tk_send('item', 'text', item, column)
+      end
+    else
+      tk_send('item', 'text', item, column, txt, *args)
+      self
+    end
+  end
+
+  def item_toggle(item)
+    tk_send('item', 'toggle', item)
+    self
+  end
+
+  def item_toggle_recurse(item)
+    tk_send('item', 'toggle', item, '-recurse')
+    self
+  end
+
+  def item_visible(item, st=None)
+    if st == None
+      bool(tk_send('item', 'visible', item))
+    else
+      tk_send('item', 'visible', item, st)
+      self
+    end
+  end
+  def item_visible?(item)
+    item_visible(item)
+  end
+
+  def marquee_anchor(*args)
+    if args.empty?
+      list(tk_send('marquee', 'anchor'))
+    else
+      tk_send('marquee', 'anchor', *args)
+      self
+    end
+  end
+
+  def marquee_coords(*args)
+    if args.empty?
+      list(tk_send('marquee', 'coords'))
+    else
+      tk_send('marquee', 'coords', *args)
+      self
+    end
+  end
+
+  def marquee_corner(*args)
+    if args.empty?
+      tk_send('marquee', 'corner')
+    else
+      tk_send('marquee', 'corner', *args)
+      self
+    end
+  end
+
+  def marquee_identify()
+    list(tk_send('marquee', 'identify')).collect!{|id|
+      Tk::TreeCtrl::Item.id2obj(self, id)
+    }
+  end
+
+  def marquee_visible(st=None)
+    if st == None
+      bool(tk_send('marquee', 'visible'))
+    else
+      tk_send('marquee', 'visible', st)
+      self
+    end
+  end
+  def marquee_visible?()
+    marquee_visible()
+  end
+
+  #def notify_bind(obj, event, cmd=Proc.new, *args)
+  #  _bind([@path, 'notify', 'bind', obj], event, cmd, *args)
+  #  self
+  #end
+  def notify_bind(obj, event, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([@path, 'notify', 'bind', obj], event, cmd, *args)
+    self
+  end
+
+  #def notify_bind_append(obj, event, cmd=Proc.new, *args)
+  #  _bind_append([@path, 'notify', 'bind', obj], event, cmd, *args)
+  #  self
+  #end
+  def notify_bind_append(obj, event, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([@path, 'notify', 'bind', obj], event, cmd, *args)
+    self
+  end
+
+  def notify_bind_remove(obj, event)
+    _bind_remove([@path, 'notify', 'bind', obj], event)
+    self
+  end
+
+  def notify_bindinfo(obj, event=nil)
+    _bindinfo([@path, 'notify', 'bind', obj], event)
+  end
+
+  def notify_detailnames(event)
+    list(tk_send('notify', 'detailnames', event))
+  end
+
+  def notify_eventnames()
+    list(tk_send('notify', 'eventnames'))
+  end
+
+  def notify_generate(pattern, char_map=None, percents_cmd=None)
+    pattern = "<#{pattern}>"
+    tk_send('notify', 'generate', pattern, char_map, percents_cmd)
+    self
+  end
+
+  def notify_install(pattern, percents_cmd=nil, &b)
+    pattern = "<#{pattern}>"
+    percents_cmd = Proc.new(&b) if !percents_cmd && b
+    if percents_cmd
+      procedure(tk_send('notify', 'install', pattern, percents_cmd))
+    else
+      procedure(tk_send('notify', 'install', pattern))
+    end
+  end
+
+  def notify_install_detail(event, detail, percents_cmd=nil, &b)
+    percents_cmd = Proc.new(&b) if !percents_cmd && b
+    if percents_cmd
+      tk_send('notify', 'install', 'detail', event, detail, percents_cmd)
+    else
+      tk_send('notify', 'install', 'detail', event, detail)
+    end
+  end
+
+  def notify_install_event(event, percents_cmd=nil, &b)
+    percents_cmd = Proc.new(&b) if !percents_cmd && b
+    if percents_cmd
+      tk_send('notify', 'install', 'event', event, percents_cmd)
+    else
+      tk_send('notify', 'install', 'event', event)
+    end
+  end
+
+  def notify_linkage(pattern, detail=None)
+    if detail != None
+      tk_send('notify', 'linkage', pattern, detail)
+    else
+      begin
+        if pattern.to_s.index(?-)
+          # TreeCtrl 1.1 format?
+          begin
+            tk_send('notify', 'linkage', "<#{pattern}>")
+          rescue
+            # TreeCtrl 1.0?
+            tk_send('notify', 'linkage', pattern)
+          end
+        else
+          # TreeCtrl 1.0 format?
+          begin
+            tk_send('notify', 'linkage', pattern)
+          rescue
+            # TreeCtrl 1.1?
+            tk_send('notify', 'linkage', "<#{pattern}>")
+          end
+        end
+      end
+    end
+  end
+
+  def notify_unbind(pattern=nil)
+    if pattern
+      tk_send('notify', 'unbind', "<#{pattern}>")
+    else
+      tk_send('notify', 'unbind')
+    end
+    self
+  end
+
+  def notify_uninstall(pattern)
+    pattern = "<#{pattern}>"
+    tk_send('notify', 'uninstall', pattern)
+    self
+  end
+
+  def notify_uninstall_detail(event, detail)
+    tk_send('notify', 'uninstall', 'detail', event, detail)
+    self
+  end
+
+  def notify_uninstall_event(event)
+    tk_send('notify', 'uninstall', 'event', event)
+    self
+  end
+
+  def numcolumns()
+    num_or_str(tk_send('numcolumns'))
+  end
+  alias num_columns  numcolumns
+  alias columns_size numcolumns
+
+  def numitems()
+    num_or_str(tk_send('numitems'))
+  end
+  alias num_items  numitems
+  alias items_size numitems
+
+  def orphans()
+    list(tk_send('orphans')).collect!{|id|
+      Tk::TreeCtrl::Item.id2obj(self, id)
+    }
+  end
+
+  def range(first, last)
+    list(tk_send('range', first, last)).collect!{|id|
+      Tk::TreeCtrl::Item.id2obj(self, id)
+    }
+  end
+
+  def state_define(name)
+    tk_send('state', 'define', name)
+    self
+  end
+
+  def state_linkage(name)
+    tk_send('state', 'linkage', name)
+  end
+
+  def state_names()
+    list(tk_send('state', 'names'))
+  end
+
+  def state_undefine(*names)
+    tk_send('state', 'undefine', *names)
+    self
+  end
+
+  def see(item)
+    tk_send('see', item)
+    self
+  end
+
+  def selection_add(first, last=None)
+    tk_send('selection', 'add', first, last)
+    self
+  end
+
+  def selection_anchor(item=None)
+    id = num_or_str(tk_send('selection', 'anchor', item))
+    Tk::TreeCtrl::Item.id2obj(self, id)
+  end
+
+  def selection_clear(*args) # first, last
+    tk_send('selection', 'clear', *args)
+    self
+  end
+
+  def selection_count()
+    number(tk_send('selection', 'count'))
+  end
+
+  def selection_get()
+    list(tk_send('selection', 'get')).collect!{|id|
+      Tk::TreeCtrl::Item.id2obj(self, id)
+    }
+  end
+
+  def selection_includes(item)
+    bool(tk_send('selection', 'includes', item))
+  end
+
+  def selection_modify(sel, desel)
+    tk_send('selection', 'modify', sel, desel)
+    self
+  end
+
+  def style_create(style, keys=None)
+    if keys && keys != None
+      tk_send('style', 'create', style, *hash_kv(keys))
+    else
+      tk_send('style', 'create', style)
+    end
+  end
+
+  def style_delete(*args)
+    if Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path]
+      args.each{|sty|
+        Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[self.path].delete(sty)
+      }
+    end
+    tk_send('style', 'delete', *args)
+    self
+  end
+
+  def style_elements(style, *elems)
+    if elems.empty?
+      list(tk_send('style', 'elements', style)).collect!{|id|
+        Tk::TreeCtrl::Element.id2obj(self, id)
+      }
+    else
+      tk_send('style', 'elements', style, elems.flatten)
+      self
+    end
+  end
+
+  def _conv_style_layout_val(sty, val)
+    case sty.to_s
+    when 'padx', 'pady', 'ipadx', 'ipady'
+      lst = list(val)
+      (lst.size == 1)? lst[0]: lst
+    when 'detach', 'indent'
+      bool(val)
+    when 'union'
+      simplelist(val).collect!{|elem|
+        Tk::TreeCtrl::Element.id2obj(self, elem)
+      }
+    else
+      val
+    end
+  end
+  private :_conv_style_layout_val
+
+  def style_layout(style, elem, keys=None)
+    if keys && keys != None
+      if keys.kind_of?(Hash)
+        tk_send('style', 'layout', style, elem, *hash_kv(keys))
+        self
+      else
+        _conv_style_layout_val(keys, 
+                               tk_send('style', 'layout', 
+                                       style, elem, "-#{keys}"))
+      end
+    else
+      ret = Hash.new
+      Hash[*simplelist(tk_send('style', 'layout', style, elem))].each{|k, v|
+        k = k[1..-1]
+        ret[k] = _conv_style_layout_val(k, v)
+      }
+      ret
+    end
+  end
+  def get_style_layout(style, elem, opt=None)
+    style_layout(style, elem, opt)
+  end
+  def set_style_layout(style, elem, slot, value=None)
+    if slot.kind_of?(Hash)
+      style_layout(style, elem, slot)
+    else
+      style_layout(style, elem, {slot=>value})
+    end
+  end
+
+  def style_names()
+    list(tk_send('style', 'names')).collect!{|id|
+      Tk::TreeCtrl::Style.id2obj(self, id)
+    }
+  end
+
+  def toggle(*items)
+    tk_send('toggle', *items)
+    self
+  end
+
+  def toggle_recurse()
+    tk_send('toggle', '-recurse', *items)
+    self
+  end
+end
+
+#####################
+
+class Tk::TreeCtrl::Column < TkObject
+  TreeCtrlColumnID_TBL = TkCore::INTERP.create_table
+  TreeCtrlColumnID = ['treectrl_column'.freeze, '00000'.taint].freeze
+
+  TkCore::INTERP.init_ip_env{Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL.clear}
+
+  def self.id2obj(tree, id)
+    tpath = tree.path
+    return id unless Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath]
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id]? \
+                 Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[tpath][id] : id
+  end
+
+  def initialize(parent, keys={})
+    @tree = parent
+    @tpath = parent.path
+
+    keys = _symbolkey2str(keys)
+
+    @path = @id = 
+      keys.delete('tag') ||
+      Tk::TreeCtrl::Column::TreeCtrlColumnID.join(TkCore::INTERP._ip_id_)
+
+    keys['tag'] = @id
+
+    unless Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath]
+      Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath] = {} 
+    end
+    Tk::TreeCtrl::Column::TreeCtrlColumnID_TBL[@tpath][@id] = self
+    Tk::TreeCtrl::Column::TreeCtrlColumnID[1].succ!
+
+    @tree.column_create(keys)
+  end
+
+  def id
+    @id
+  end
+
+  def to_s
+    @id.to_s.dup
+  end
+
+  def cget(opt)
+    @tree.column_cget(@tree.column_index(@id), opt)
+  end
+
+  def configure(*args)
+    @tree.column_configure(@tree.column_index(@id), *args)
+  end
+
+  def configinfo(*args)
+    @tree.column_configinfo(@tree.column_index(@id), *args)
+  end
+
+  def current_configinfo(*args)
+    @tree.current_column_configinfo(@tree.column_index(@id), *args)
+  end
+
+  def delete
+    @tree.column_delete(@tree.column_index(@id))
+    self
+  end
+
+  def index
+    @tree.column_index(@id)
+  end
+
+  def move(before)
+    @tree.column_move(@tree.column_index(@id), before)
+    self
+  end
+
+  def needed_width
+    @tree.column_needed_width(@tree.column_index(@id))
+  end
+  alias neededwidth needed_width
+
+  def current_width
+    @tree.column_width(@tree.column_index(@id))
+  end
+end
+
+#####################
+
+class Tk::TreeCtrl::Element < TkObject
+  TreeCtrlElementID_TBL = TkCore::INTERP.create_table
+  TreeCtrlElementID = ['treectrl_element'.freeze, '00000'.taint].freeze
+  TreeCtrlElemTypeToClass = {}
+
+  TkCore::INTERP.init_ip_env{
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL.clear
+  }
+
+  def self.type2class(type)
+    TreeCtrlElemTypeToClass[type] || type
+  end
+
+  def self.id2obj(tree, id)
+    tpath = tree.path
+    return id unless Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath]
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id]? \
+                 Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[tpath][id] : id
+  end
+
+  def initialize(parent, type, keys=nil)
+    @tree = parent
+    @tpath = parent.path
+    @type = type.to_s
+    @path = @id = 
+      Tk::TreeCtrl::Element::TreeCtrlElementID.join(TkCore::INTERP._ip_id_)
+    unless Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath]
+      Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath] = {} 
+    end
+    Tk::TreeCtrl::Element::TreeCtrlElementID_TBL[@tpath][@id] = self
+    Tk::TreeCtrl::Element::TreeCtrlElementID[1].succ!
+
+    @tree.element_create(@id, @type, keys)
+  end
+
+  def id
+    @id
+  end
+
+  def to_s
+    @id.dup
+  end
+
+  def cget(opt)
+    @tree.element_cget(@id, opt)
+  end
+
+  def configure(*args)
+    @tree.element_configure(@id, *args)
+  end
+
+  def configinfo(*args)
+    @tree.element_configinfo(@id, *args)
+  end
+
+  def current_configinfo(*args)
+    @tree.current_element_configinfo(@id, *args)
+  end
+
+  def delete
+    @tree.element_delete(@id)
+    self
+  end
+
+  def element_type
+    @tree.element_type(@id)
+  end
+
+  def element_class
+    @tree.element_class(@id)
+  end
+end
+
+class Tk::TreeCtrl::BitmapElement < Tk::TreeCtrl::Element
+  TreeCtrlElemTypeToClass['bitmap'] = self
+
+  def initialize(parent, keys=nil)
+    super(parent, 'bitmap', keys)
+  end
+end
+
+class Tk::TreeCtrl::BorderElement < Tk::TreeCtrl::Element
+  TreeCtrlElemTypeToClass['border'] = self
+
+  def initialize(parent, keys=nil)
+    super(parent, 'border', keys)
+  end
+end
+
+class Tk::TreeCtrl::ImageElement < Tk::TreeCtrl::Element
+  TreeCtrlElemTypeToClass['image'] = self
+
+  def initialize(parent, keys=nil)
+    super(parent, 'image', keys)
+  end
+end
+
+class Tk::TreeCtrl::RectangleElement < Tk::TreeCtrl::Element
+  TreeCtrlElemTypeToClass['rect'] = self
+
+  def initialize(parent, keys=nil)
+    super(parent, 'rect', keys)
+  end
+end
+
+#####################
+
+class Tk::TreeCtrl::Item < TkObject
+  TreeCtrlItemID_TBL = TkCore::INTERP.create_table
+
+  TkCore::INTERP.init_ip_env{Tk::TreeCtrl::Item::TreeCtrlItemID_TBL.clear}
+
+  def self.id2obj(tree, id)
+    tpath = tree.path
+    return id unless Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath]
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id]? \
+                 Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[tpath][id] : id
+  end
+
+  def initialize(parent, keys={})
+    @tree = parent
+    @tpath = parent.path
+    @path = @id = @tree.item_create(keys)
+
+    unless Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath]
+      Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath] = {} 
+    end
+    Tk::TreeCtrl::Item::TreeCtrlItemID_TBL[@tpath][@id] = self
+  end
+
+  def id
+    @id
+  end
+
+  def to_s
+    @id.to_s.dup
+  end
+
+  def ancestors
+    @tree.item_ancestors(@id)
+  end
+
+  def bbox(*args)
+    @tree.item_bbox(@id, *args)
+  end
+
+  def children
+    @tree.item_children(@id)
+  end
+
+  def collapse
+    @tree.item_collapse(@id)
+    self
+  end
+
+  def collapse_recurse
+    @tree.item_collapse_recurse(@id)
+    self
+  end
+
+  def complex(*args)
+    @tree.item_complex(@id, *args)
+    self
+  end
+
+  def cget(opt)
+    @tree.item_cget(@id, opt)
+  end
+
+  def configure(*args)
+    @tree.item_configure(@id, *args)
+  end
+
+  def configinfo(*args)
+    @tree.item_configinfo(@id, *args)
+  end
+
+  def current_configinfo(*args)
+    @tree.current_item_configinfo(@id, *args)
+  end
+
+  def delete
+    @tree.item_delete(@id)
+    self
+  end
+
+  def element_dump
+    @tree.item_dump(@id)
+  end
+
+  def element_dump_hash
+    @tree.item_dump_hash(@id)
+  end
+
+  def element_actual(column, elem, key)
+    @tree.item_element_actual(@id, column, elem, key)
+  end
+
+  def element_cget(opt)
+    @tree.item_element_cget(@id, opt)
+  end
+
+  def element_configure(*args)
+    @tree.item_element_configure(@id, *args)
+  end
+
+  def element_configinfo(*args)
+    @tree.item_element_configinfo(@id, *args)
+  end
+
+  def current_element_configinfo(*args)
+    @tree.current_item_element_configinfo(@id, *args)
+  end
+
+  def expand
+    @tree.item_expand(@id)
+    self
+  end
+
+  def expand_recurse
+    @tree.item_expand_recurse(@id)
+    self
+  end
+
+  def firstchild(child=nil)
+    if child
+      @tree.item_firstchild(@id, child)
+      self
+    else
+      @tree.item_firstchild(@id)
+    end
+  end
+  alias first_child firstchild
+
+  def hasbutton(st=None)
+    if st == None
+      @tree.item_hasbutton(@id)
+    else
+      @tree.item_hasbutton(@id, st)
+      self
+    end
+  end
+  alias has_button hasbutton
+
+  def hasbutton?
+    @tree.item_hasbutton(@id)
+  end
+  alias has_button? hasbutton?
+
+  def index
+    @tree.item_index(@id)
+  end
+
+  def isancestor(des)
+    @tree.item_isancestor(@id, des)
+  end
+  alias is_ancestor  isancestor
+  alias isancestor?  isancestor
+  alias is_ancestor? isancestor
+  alias ancestor?    isancestor
+
+  def isopen
+    @tree.item_isopen(@id)
+  end
+  alias is_open    isopen
+  alias isopen?    isopen
+  alias is_open?   isopen
+  alias isopened?  isopen
+  alias is_opened? isopen
+  alias open?      isopen
+
+  def lastchild(child=nil)
+    if child
+      @tree.item_lastchild(@id, child)
+      self
+    else
+      @tree.item_lastchild(@id)
+    end
+  end
+  alias last_child lastchild
+
+  def nextsibling(nxt=nil)
+    if nxt
+      @tree.item_nextsibling(@id, nxt)
+      self
+    else
+      @tree.item_nextsibling(@id)
+    end
+  end
+  alias next_sibling nextsibling
+
+  def numchildren
+    @tree.item_numchildren(@id)
+  end
+  alias num_children  numchildren
+  alias children_size numchildren
+
+  def parent_index
+    @tree.item_parent(@id)
+  end
+
+  def prevsibling(nxt=nil)
+    if nxt
+      @tree.item_prevsibling(@id, nxt)
+      self
+    else
+      @tree.item_prevsibling(@id)
+    end
+  end
+  alias prev_sibling prevsibling
+
+  def remove
+    @tree.item_remove(@id)
+  end
+
+  def rnc
+    @tree.item_rnc(@id)
+  end
+
+  def sort(*opts)
+    @tree.item_sort(@id, *opts)
+  end
+  def sort_not_really(*opts)
+    @tree.item_sort_not_really(@id, *opts)
+    self
+  end
+
+  def state_forcolumn(column, *args)
+    @tree.item_state_forcolumn(@id, column, *args)
+    self
+  end
+  alias state_for_column state_forcolumn
+
+  def state_get(*args)
+    @tree.item_state_get(@id, *args)
+  end
+
+  def state_set(*args)
+    @tree.item_state_set(@id, *args)
+    self
+  end
+
+  def style_elements(column)
+    @tree.item_style_elements(@id, column)
+  end
+
+  def style_map(column, style, map)
+    @tree.item_style_map(@id, column, style, map)
+    self
+  end
+
+  def style_set(column=nil, *args)
+    if args.empty?
+      @tree.item_style_set(@id, column)
+    else
+      @tree.item_style_set(@id, column, *args)
+      self
+    end
+  end
+
+  def item_text(column, txt=nil, *args)
+    if args.empty?
+      if txt
+        @tree.item_text(@id, column, txt)
+        self
+      else
+        @tree.item_text(@id, column)
+      end
+    else
+      @tree.item_text(@id, column, txt, *args)
+      self
+    end
+  end
+
+  def toggle
+    @tree.item_toggle(@id)
+    self
+  end
+
+  def toggle_recurse
+    @tree.item_toggle_recurse(@id)
+    self
+  end
+
+  def visible(st=None)
+    if st == None
+      @tree.item_visible(@id)
+    else
+      @tree.item_visible(@id, st)
+      self
+    end
+  end
+end
+
+#####################
+
+class Tk::TreeCtrl::Style < TkObject
+  TreeCtrlStyleID_TBL = TkCore::INTERP.create_table
+  TreeCtrlStyleID = ['treectrl_style'.freeze, '00000'.taint].freeze
+
+  TkCore::INTERP.init_ip_env{ Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL.clear }
+
+  def self.id2obj(tree, id)
+    tpath = tree.path
+    return id unless Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath]
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id]? \
+                 Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[tpath][id] : id
+  end
+
+  def initialize(parent, keys=nil)
+    @tree = parent
+    @tpath = parent.path
+    @path = @id = 
+      Tk::TreeCtrl::Style::TreeCtrlStyleID.join(TkCore::INTERP._ip_id_)
+    unless Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath]
+      Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath] = {} 
+    end
+    Tk::TreeCtrl::Style::TreeCtrlStyleID_TBL[@tpath][@id] = self
+    Tk::TreeCtrl::Style::TreeCtrlStyleID[1].succ!
+
+    @tree.style_create(@id, keys)
+  end
+
+  def id
+    @id
+  end
+
+  def to_s
+    @id.dup
+  end
+
+  def cget(opt)
+    @tree.style_cget(@id, opt)
+  end
+
+  def configure(*args)
+    @tree.style_configure(@id, *args)
+  end
+
+  def configinfo(*args)
+    @tree.style_configinfo(@id, *args)
+  end
+
+  def current_configinfo(*args)
+    @tree.current_style_configinfo(@id, *args)
+  end
+
+  def delete
+    @tree.style_delete(@id)
+    self
+  end
+
+  def elements(*elems)
+    if elems.empty?
+      @tree.style_elements(@id)
+    else
+      @tree.style_elements(@id, *elems)
+      self
+    end
+  end
+
+  def layout(elem, keys=None)
+    if keys && keys != None && keys.kind_of?(Hash)
+      @tree.style_layout(@id, elem, keys)
+      self
+    else
+      @tree.style_layout(@id, elem, keys)
+    end
+  end
+end
+
+module Tk::TreeCtrl::BindCallback
+  include Tk
+  extend Tk
+end
+
+class << Tk::TreeCtrl::BindCallback
+  def percentsCmd(*args)
+    tk_call('::TreeCtrl::PercentsCmd', *args)
+  end
+  def cursorCheck(w, x, y)
+    tk_call('::TreeCtrl::CursorCheck', w, x, y)
+  end
+  def cursorCheckAux(w)
+    tk_call('::TreeCtrl::CursorCheckAux', w)
+  end
+  def cursorCancel(w)
+    tk_call('::TreeCtrl::CursorCancel', w)
+  end
+  def buttonPress1(w, x, y)
+    tk_call('::TreeCtrl::ButtonPress1', w, x, y)
+  end
+  def doubleButton1(w, x, y)
+    tk_call('::TreeCtrl::DoubleButton1', w, x, y)
+  end
+  def motion1(w, x, y)
+    tk_call('::TreeCtrl::Motion1', w, x, y)
+  end
+  def leave1(w, x, y)
+    tk_call('::TreeCtrl::Leave1', w, x, y)
+  end
+  def release1(w, x, y)
+    tk_call('::TreeCtrl::Release1', w, x, y)
+  end
+  def beginSelect(w, el)
+    tk_call('::TreeCtrl::BeginSelect', w, el)
+  end
+  def motion(w, le)
+    tk_call('::TreeCtrl::Motion', w, el)
+  end
+  def beginExtend(w, el)
+    tk_call('::TreeCtrl::BeginExtend', w, el)
+  end
+  def beginToggle(w, el)
+    tk_call('::TreeCtrl::BeginToggle', w, el)
+  end
+  def cancelRepeat
+    tk_call('::TreeCtrl::CancelRepeat')
+  end
+  def autoScanCheck(w, x, y)
+    tk_call('::TreeCtrl::AutoScanCheck', w, x, y)
+  end
+  def autoScanCheckAux(w)
+    tk_call('::TreeCtrl::AutoScanCheckAux', w)
+  end
+  def autoScanCancel(w)
+    tk_call('::TreeCtrl::AutoScanCancel', w)
+  end
+  def up_down(w, n)
+    tk_call('::TreeCtrl::UpDown', w, n)
+  end
+  def left_right(w, n)
+    tk_call('::TreeCtrl::LeftRight', w, n)
+  end
+  def setActiveItem(w, idx)
+    tk_call('::TreeCtrl::SetActiveItem', w, idx)
+  end
+  def extendUpDown(w, amount)
+    tk_call('::TreeCtrl::ExtendUpDown', w, amount)
+  end
+  def dataExtend(w, el)
+    tk_call('::TreeCtrl::DataExtend', w, el)
+  end
+  def cancel(w)
+    tk_call('::TreeCtrl::Cancel', w)
+  end
+  def selectAll(w)
+    tk_call('::TreeCtrl::selectAll', w)
+  end
+  def marqueeBegin(w, x, y)
+    tk_call('::TreeCtrl::MarqueeBegin', w, x, y)
+  end
+  def marqueeUpdate(w, x, y)
+    tk_call('::TreeCtrl::MarqueeUpdate', w, x, y)
+  end
+  def marqueeEnd(w, x, y)
+    tk_call('::TreeCtrl::MarqueeEnd', w, x, y)
+  end
+  def scanMark(w, x, y)
+    tk_call('::TreeCtrl::ScanMark', w, x, y)
+  end
+  def scanDrag(w, x, y)
+    tk_call('::TreeCtrl::ScanDrag', w, x, y)
+  end
+
+  # filelist-bindings
+  def fileList_button1(w, x, y)
+    tk_call('::TreeCtrl::FileListButton1', w, x, y)
+  end
+  def fileList_motion1(w, x, y)
+    tk_call('::TreeCtrl::FileListMotion1', w, x, y)
+  end
+  def fileList_motion(w, x, y)
+    tk_call('::TreeCtrl::FileListMotion', w, x, y)
+  end
+  def fileList_leave1(w, x, y)
+    tk_call('::TreeCtrl::FileListLeave1', w, x, y)
+  end
+  def fileList_release1(w, x, y)
+    tk_call('::TreeCtrl::FileListRelease1', w, x, y)
+  end
+  def fileList_edit(w, i, s, e)
+    tk_call('::TreeCtrl::FileListEdit', w, i, s, e)
+  end
+  def fileList_editCancel(w)
+    tk_call('::TreeCtrl::FileListEditCancel', w)
+  end
+  def fileList_autoScanCheck(w, x, y)
+    tk_call('::TreeCtrl::FileListAutoScanCheck', w, x, y)
+  end
+  def fileList_autoScanCheckAux(w)
+    tk_call('::TreeCtrl::FileListAutoScanCheckAux', w)
+  end
+
+  def entryOpen(w, item, col, elem)
+    tk_call('::TreeCtrl::EntryOpen', w, item, col, elem)
+  end
+  def entryExpanderOpen(w, item, col, elem)
+    tk_call('::TreeCtrl::EntryExpanderOpen', w, item, col, elem)
+  end
+  def entryClose(w, accept)
+    tk_call('::TreeCtrl::EntryClose', w, accept)
+  end
+  def entryExpanderKeypress(w)
+    tk_call('::TreeCtrl::EntryExpanderKeypress', w)
+  end
+  def textOpen(w, item, col, elem, width=0, height=0)
+    tk_call('::TreeCtrl::TextOpen', w, item, col, elem, width, height)
+  end
+  def textExpanderOpen(w, item, col, elem, width)
+    tk_call('::TreeCtrl::TextOpen', w, item, col, elem, width)
+  end
+  def textClose(w, accept)
+    tk_call('::TreeCtrl::TextClose', w, accept)
+  end
+  def textExpanderKeypress(w)
+    tk_call('::TreeCtrl::TextExpanderKeypress', w)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/trofs.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/trofs.rb
new file mode 100644
index 0000000000..5914e5165f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/trofs.rb
@@ -0,0 +1,13 @@
+#
+#  trofs support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/trofs/setup.rb'
+
+# load library
+require 'tkextlib/trofs/trofs.rb'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/trofs/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/trofs/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/trofs/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/trofs/trofs.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/trofs/trofs.rb
new file mode 100644
index 0000000000..7a2606a275
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/trofs/trofs.rb
@@ -0,0 +1,51 @@
+#
+#  tkextlib/trofs/trofs.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/trofs/setup.rb'
+
+# TkPackage.require('trofs', '0.4')
+TkPackage.require('trofs')
+
+module Tk
+  module Trofs
+    extend TkCore
+
+    PACKAGE_NAME = 'trofs'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('trofs')
+      rescue
+        ''
+      end
+    end
+
+    ##############################################
+
+    def self.create_archive(dir, archive)
+      tk_call('::trofs::archive', dir, archive)
+      archive
+    end
+
+    def self.mount(archive, mountpoint=None)
+      # returns the normalized path to mountpoint
+      tk_call('::trofs::mount', archive, mountpoint)
+    end
+
+    def self.umount(mountpoint)
+      tk_call('::trofs::umount', mountpoint)
+      mountpoint
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/version.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/version.rb
new file mode 100644
index 0000000000..c7816fd4a5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/version.rb
@@ -0,0 +1,6 @@
+#
+# release date of tkextlib
+#
+module Tk
+  Tkextlib_RELEASE_DATE = '2007-05-26'.freeze
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/vu.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/vu.rb
new file mode 100644
index 0000000000..d2234eb2a8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/vu.rb
@@ -0,0 +1,48 @@
+#
+#  The vu widget set support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/vu/setup.rb'
+
+# load package
+# TkPackage.require('vu', '2.1')
+TkPackage.require('vu')
+
+# autoload
+module Tk
+  module Vu
+    TkComm::TkExtlibAutoloadModule.unshift(self)
+
+    PACKAGE_NAME = 'vu'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('vu')
+      rescue
+        ''
+      end
+    end
+
+    ##########################################
+
+    autoload :Dial,          'tkextlib/vu/dial'
+
+    autoload :Pie,           'tkextlib/vu/pie'
+    autoload :PieSlice,      'tkextlib/vu/pie'
+    autoload :NamedPieSlice, 'tkextlib/vu/pie'
+
+    autoload :Spinbox,       'tkextlib/vu/spinbox'
+
+    autoload :Bargraph,      'tkextlib/vu/bargraph'
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/vu/bargraph.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/vu/bargraph.rb
new file mode 100644
index 0000000000..27ff3c7cd0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/vu/bargraph.rb
@@ -0,0 +1,61 @@
+#
+#  ::vu::bargraph widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# create module/class
+module Tk
+  module Vu
+    class Bargraph < TkWindow
+    end
+  end
+end
+
+
+# call setup script  --  <libdir>/tkextlib/vu.rb
+require 'tkextlib/vu.rb'
+
+class Tk::Vu::Bargraph < TkWindow
+  TkCommandNames = ['::vu::bargraph'.freeze].freeze
+  WidgetClassName = 'Bargraph'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ###############################
+
+  def __boolval_optkeys
+    ['showminmax', 'showvalue']
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() + [
+      'title', 
+      'barbackground', 'barcolor', 'barcolour', 
+      'tickcolor', 'tickcolour', 
+      'textcolor', 'textcolour', 
+    ]
+  end
+  private :__strval_optkeys
+
+  def __listval_optkeys
+    ['alabels', 'blabels']
+  end
+  private :__listval_optkeys
+
+  def __font_optkeys
+    ['alabfont', 'blabfont']
+  end
+  private :__font_optkeys
+
+  ###############################
+
+  def set(val = None)
+    tk_call_without_enc(@path, 'set', val)
+    self
+  end
+
+  def get()
+    num_or_str(tk_call_without_enc(@path, 'get'))
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/vu/charts.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/vu/charts.rb
new file mode 100644
index 0000000000..ee4298fa1c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/vu/charts.rb
@@ -0,0 +1,53 @@
+#
+#  charts -- Create and manipulate canvas Add-On Items
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tk/canvas'
+
+# call setup script  --  <libdir>/tkextlib/vu.rb
+require 'tkextlib/vu.rb'
+
+module Tk
+  module Vu
+    module ChartsConfig
+      include TkItemConfigOptkeys
+      def __item_boolval_optkeys(id)
+        super(id) << 'lefttrunc' << 'autocolor'
+      end
+      private :__item_boolval_optkeys
+
+      def __item_strval_optkeys(id)
+        super(id) << 'bar' << 'color' << 'outline' << 
+          'fill' << 'scaleline' << 'stripline'
+      end
+      private :__item_strval_optkeys
+
+      def __item_listval_optkeys(id)
+        super(id) << 'values' << 'tags'
+      end
+      private :__item_listval_optkeys
+    end
+
+    class TkcSticker < TkcItem
+      include ChartsConfig
+
+      CItemTypeName = 'sticker'.freeze
+      CItemTypeToClass[CItemTypeName] = self
+    end
+
+    class TkcStripchart < TkcItem
+      include ChartsConfig
+
+      CItemTypeName = 'stripchart'.freeze
+      CItemTypeToClass[CItemTypeName] = self
+    end
+
+    class TkcBarchart < TkcItem
+      include ChartsConfig
+
+      CItemTypeName = 'barchart'.freeze
+      CItemTypeToClass[CItemTypeName] = self
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/vu/dial.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/vu/dial.rb
new file mode 100644
index 0000000000..e27a38ae42
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/vu/dial.rb
@@ -0,0 +1,102 @@
+#
+#  ::vu::dial widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# create module/class
+module Tk
+  module Vu
+    class Dial < TkWindow
+    end
+  end
+end
+
+# call setup script  --  <libdir>/tkextlib/vu.rb
+require 'tkextlib/vu.rb'
+
+# define module/class
+class Tk::Vu::Dial < TkWindow
+  TkCommandNames = ['::vu::dial'.freeze].freeze
+  WidgetClassName = 'Dial'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  ###############################
+
+  def __methodcall_optkeys  # { key=>method, ... }
+    {'coords'=>'coords'}
+  end
+  private :__methodcall_optkeys
+
+  ###############################
+
+  def coords(val = nil)
+    if val
+      tk_split_list(tk_send_without_enc('coords'))
+    else
+      tk_send_without_enc('coords', val)
+      self
+    end
+  end
+
+  def constrain(val = None)
+    num_or_str(tk_call(@path, 'constrain', val))
+  end
+
+  def get(*args)
+    num_or_str(tk_call(@path, 'get', *args))
+  end
+
+  def identify(x, y)
+    tk_call(@path, 'identify', x, y)
+  end
+
+  def get_label(val=nil)
+    if val
+      tk_call(@path, 'label', val)
+    else
+      ret = []
+      lst = simplelist(tk_call(@path, 'label'))
+      while lst.size > 0
+        ret << ([num_or_str(lst.shift)] << lst.shift)
+      end
+    end
+  end
+
+  def set_label(val, str, *args)
+    tk_call(@path, 'label', val, str, *args)
+    self
+  end
+
+  def set_label_constrain(val, str, *args)
+    tk_call(@path, 'label', '-constrain', val, str, *args)
+    self
+  end
+
+  def get_tag(val=nil)
+    if val
+      tk_call(@path, 'tag', val)
+    else
+      ret = []
+      lst = simplelist(tk_call(@path, 'tag'))
+      while lst.size > 0
+        ret << ([num_or_str(lst.shift)] << lst.shift)
+      end
+    end
+  end
+
+  def set_tag(val, str, *args)
+    tk_call(@path, 'tag', val, str, *args)
+    self
+  end
+
+  def set_tag_constrain(val, str, *args)
+    tk_call(@path, 'tag', '-constrain', val, str, *args)
+    self
+  end
+
+  def set(val = None)
+    tk_call_without_enc(@path, 'set', val)
+    self
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/vu/pie.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/vu/pie.rb
new file mode 100644
index 0000000000..78f3fa54da
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/vu/pie.rb
@@ -0,0 +1,235 @@
+#
+#  ::vu::pie widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# create module/class
+module Tk
+  module Vu
+    module PieSliceConfigMethod
+    end
+    class Pie < TkWindow
+    end
+    class PieSlice < TkObject
+    end
+    class NamedPieSlice < PieSlice
+    end
+  end
+end
+
+# call setup script  --  <libdir>/tkextlib/vu.rb
+require 'tkextlib/vu.rb'
+
+module Tk::Vu::PieSliceConfigMethod
+  include TkItemConfigMethod
+
+  def __item_pathname(tagOrId)
+    if tagOrId.kind_of?(Tk::Vu::PieSlice)
+      self.path + ';' + tagOrId.id.to_s
+    else
+      self.path + ';' + tagOrId.to_s
+    end
+  end
+  private :__item_pathname
+end
+
+class Tk::Vu::Pie < TkWindow
+  TkCommandNames = ['::vu::pie'.freeze].freeze
+  WidgetClassName = 'Pie'.freeze
+  WidgetClassNames[WidgetClassName] = self
+
+  def __destroy_hook__
+    Tk::Vu::PieSlice::SliceID_TBL.delete(@path)
+  end
+
+  ###############################
+
+  include Tk::Vu::PieSliceConfigMethod
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::Vu::PieSlice)
+      tag.id
+    else
+      # tag
+      _get_eval_string(tag)
+    end
+  end
+
+  ###############################
+
+  def delete(*glob_pats)
+    tk_call(@path, 'delete', *glob_pats)
+    self
+  end
+
+  def explode(slice, *args)
+    tk_call(@path, 'explode', slice, *args)
+    self
+  end
+
+  def explode_value(slice)
+    num_or_str(tk_call(@path, 'explode', slice))
+  end
+
+  def lower(slice, below=None)
+    tk_call(@path, 'lower', slice, below)
+    self
+  end
+
+  def names(*glob_pats)
+    simplelist(tk_call(@path, 'names', *glob_pats))
+  end
+  alias slices names
+
+  def order(*args)
+    tk_call(@path, 'order', *args)
+    self
+  end
+
+  def raise(slice, above=None)
+    tk_call(@path, 'raise', slice, above)
+    self
+  end
+
+  def swap(slice1, slice2)
+    tk_call(@path, 'swap', slice1, slice2)
+    self
+  end
+
+  def set(slice, *args)
+    num_or_str(tk_call(@path, 'set', slice, *args))
+  end
+  alias set_value  set
+  alias set_values set
+  alias create     set
+
+  def slice_value(slice)
+    num_or_str(tk_call(@path, 'set', slice))
+  end
+
+  def value(val = None)
+    num_or_str(tk_call_without_enc(@path, 'value'))
+  end
+  alias sum_value value
+end
+
+class Tk::Vu::PieSlice
+  SliceID_TBL = TkCore::INTERP.create_table
+  Pie_Slice_ID = ['vu:pie'.freeze, '00000'.taint].freeze
+  TkCore::INTERP.init_ip_env{ SliceID_TBL.clear }
+
+  def self.id2obj(pie, id)
+    pie_path = pie.path
+    return id unless SliceID_TBL[pie_path]
+    SliceID_TBL[pie_path][id]? SliceID_TBL[pie_path][id]: id
+  end
+
+  def initialize(parent, *args)
+    unless parent.kind_of?(Tk::Vu::Pie)
+      fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
+    end
+    @parent = @pie = parent
+    @ppath = parent.path
+    @path = @id = Pie_Slice_ID.join(TkCore::INTERP._ip_id_)
+    SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
+    SliceID_TBL[@ppath][@id] = self
+    Pie_Slice_ID[1].succ!
+
+    if args[-1].kind_of?(Hash)
+      keys = args.unshift
+    end
+    @pie.set(@id, *args)
+    configure(keys)
+  end
+
+  def id
+    @id
+  end
+
+  def [](key)
+    cget key
+  end
+
+  def []=(key,val)
+    configure key, val
+    val
+  end
+
+  def cget(slot)
+    @pie.itemcget(@id, slot)
+  end
+
+  def configure(*args)
+    @pie.itemconfigure(@id, *args)
+    self
+  end
+
+  def configinfo(*args)
+    @pie.itemconfiginfo(@id, *args)
+  end
+
+  def current_configinfo(*args)
+    @pie.current_itemconfiginfo(@id, *args)
+  end
+
+  def delete
+    @pie.delete(@id)
+  end
+
+  def explode(value)
+    @pie.explode(@id, value)
+    self
+  end
+
+  def explode_value
+    @pie.explode_value(@id)
+  end
+
+  def lower(other=None)
+    @pie.lower(@id, other)
+    self
+  end
+
+  def raise(other=None)
+    @pie.raise(@id, other)
+    self
+  end
+
+  def set(value)
+    @pie.set(@id, value)
+    self
+  end
+  alias set_value set
+
+  def value
+    @pie.set(@id)
+  end
+end
+
+class Tk::Vu::NamedPieSlice
+  def self.new(parent, name, *args)
+    if SliceID_TBL[parent.path] && SliceID_TBL[parent.path][name]
+      return SliceID_TBL[parent.path][name]
+    else
+      super(parent, name, *args)
+    end
+  end
+
+  def initialize(parent, name, *args)
+    unless parent.kind_of?(Tk::Vu::Pie)
+      fail ArgumentError, "expect a Tk::Vu::Pie instance for 1st argument"
+    end
+    @parent = @pie = parent
+    @ppath = parent.path
+    @path = @id = name.to_s
+    SliceID_TBL[@ppath] = {} unless SliceID_TBL[@ppath]
+    SliceID_TBL[@ppath][@id] = self
+
+    if args[-1].kind_of?(Hash)
+      keys = args.unshift
+    end
+    @pie.set(@id, *args)
+    configure(keys)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/vu/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/vu/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/vu/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/vu/spinbox.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/vu/spinbox.rb
new file mode 100644
index 0000000000..b6499645a3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/vu/spinbox.rb
@@ -0,0 +1,22 @@
+#
+#  ::vu::spinbox widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#  a standard spinbox (<= 8.3)
+#  This is the same as the 8.4 core spinbox widget.
+#
+require 'tk'
+
+if (Tk::TK_MAJOR_VERSION < 8 || 
+    (Tk::TK_MAJOR_VERSION == 8 && Tk::TK_MINOR_VERSION < 4))
+  # call setup script  --  <libdir>/tkextlib/vu.rb
+  require 'tkextlib/vu.rb'
+
+  Tk.tk_call('namespace', 'import', '::vu::spinbox')
+end
+
+module Tk
+  module Vu
+    Spinbox = TkSpinbox
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/winico.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/winico.rb
new file mode 100644
index 0000000000..ce7b8eac5c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/winico.rb
@@ -0,0 +1,14 @@
+#
+#  winico -- Windows Icon extension support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tktable/setup.rb'
+
+# load library
+require 'tkextlib/winico/winico'
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/winico/setup.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/winico/setup.rb
new file mode 100644
index 0000000000..ce0f0bd4d4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/winico/setup.rb
@@ -0,0 +1,8 @@
+#
+#  setup.rb   --   setup script before calling TkPackage.require()
+#
+#    If you need some setup operations (for example, add a library path
+#    to the library search path) before using Tcl/Tk library packages 
+#    wrapped by Ruby scripts in this directory, please write the setup 
+#    operations in this file.
+#
diff --git a/ruby_1_8_6/ext/tk/lib/tkextlib/winico/winico.rb b/ruby_1_8_6/ext/tk/lib/tkextlib/winico/winico.rb
new file mode 100644
index 0000000000..c53a3ff48c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkextlib/winico/winico.rb
@@ -0,0 +1,189 @@
+#
+#  tkextlib/winico/winico.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/winico/setup.rb'
+
+# TkPackage.require('winico', '0.5')
+# TkPackage.require('winico', '0.6')
+TkPackage.require('winico')
+
+module Tk
+  class Winico < TkObject
+    PACKAGE_NAME = 'winico'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('winico')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+class Tk::Winico
+  WinicoID_TBL = TkCore::INTERP.create_table
+  TkCore::INTERP.init_ip_env{ WinicoID_TBL.clear }
+
+  def self.id2obj(id)
+    (WinicoID_TBL.key?(id))? WinicoID_TBL[id] : id
+  end
+
+  def self.info
+    simplelist(Tk.tk_call('winico', 'info')).collect{|id| 
+      Tk::Winico.id2obj(id)
+    }
+  end
+
+  def self.icon_info(id)
+    simplelist(Tk.tk_call('winico', 'info', id)).collect{|inf|
+      h = Hash[*list(inf)]
+      h.keys.each{|k| h[k[1..-1]] = h.delete(k)}
+    }
+  end
+
+  #################################
+
+  def self.new_from_file(file_name)
+    self.new(file_name)
+  end
+
+  def self.new_from_resource(resource_name, file_name = nil)
+    self.new(file_name, resource_name)
+  end
+
+  def initialize(file_name, resource_name=nil, winico_id=nil)
+    if resource_name
+      # from resource
+      if file_name
+        @id = Tk.tk_call('winico', 'load', resource_name, file_name)
+      else
+        @id = Tk.tk_call('winico', 'load', resource_name)
+      end
+    elsif file_name
+      # from .ico file
+      @id = Tk.tk_call('winico', 'createfrom', file_name)
+    elsif winico_id
+      @id = winico_id
+    else
+      fail ArgumentError, 
+           "must be given proper information from where loading icons"
+    end
+    @path = @id
+    WinicoID_TBL[@id] = self
+  end
+
+  def id
+    @id
+  end
+
+  def set_window(win_id, *opts) # opts := ?'big'|'small'?, ?pos?
+    # NOTE:: the window, which is denoted by win_id, MUST BE MAPPED. 
+    #        If not, then this may fail or crash.
+    tk_call('winico', 'setwindow', win_id, @id, *opts)
+  end
+
+  def delete
+    tk_call('winico', 'delete', @id)
+    WinicoID_TBL.delete(@id)
+    self
+  end
+  alias destroy delete
+
+  def info
+    Tk::Winico.icon_info(@id)
+  end
+
+  #################################
+
+  class Winico_callback < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?m, ?s, :message ], 
+        [ ?i, ?x, :icon ], 
+        [ ?x, ?n, :x ], 
+        [ ?y, ?n, :y ], 
+        [ ?X, ?n, :last_x ], 
+        [ ?Y, ?n, :last_y ], 
+        [ ?t, ?n, :tickcount ], 
+        [ ?w, ?n, :icon_idnum ], 
+        [ ?l, ?n, :msg_idnum ], 
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?n, TkComm.method(:number) ], 
+        [ ?s, TkComm.method(:string) ], 
+        [ ?x, proc{|id| 
+            if Tk::Winico::WinicoID_TBL.key?(id)
+              Tk::Winico::WinicoID_TBL[id]
+            else
+              Tk::Winico.new(nil, nil, id)
+            end
+          } ], 
+        nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        val
+      end
+    end
+
+    def self._config_keys
+      ['callback']
+    end
+  end
+
+  #################################
+
+  def add_to_taskbar(keys = {})
+    keys = _symbolkey2str(keys)
+    Winico_callback._config_keys.each{|k|
+      if keys[k].kind_of?(Array)
+        cmd, *args = keys[k]
+        keys[k] = Winico_callback.new(cmd, args.join(' '))
+       # elsif keys[k].kind_of?(Proc)
+      elsif TkComm._callback_entry?(keys[k])
+        keys[k] = Winico_callback.new(keys[k])
+      end
+    }
+    tk_call('winico', 'taskbar', 'add', @id, *(hash_kv(keys)))
+    self
+  end
+  alias taskbar_add add_to_taskbar
+
+  def modify_taskbar(keys = {})
+    keys = _symbolkey2str(keys)
+    Winico_callback._config_keys.each{|k|
+      if keys[k].kind_of?(Array)
+        cmd, *args = keys[k]
+        keys[k] = Winico_callback.new(cmd, args.join(' '))
+      # elsif keys[k].kind_of?(Proc)
+      elsif TkComm._callback_entry?(keys[k])
+        keys[k] = Winico_callback.new(keys[k])
+      end
+    }
+    tk_call('winico', 'taskbar', 'modify', @id, *(hash_kv(keys)))
+    self
+  end
+  alias taskbar_modify modify_taskbar
+
+  def delete_from_taskbar
+    tk_call('winico', 'taskbar', 'delete', @id)
+    self
+  end
+  alias taskbar_delete delete_from_taskbar
+end
diff --git a/ruby_1_8_6/ext/tk/lib/tkfont.rb b/ruby_1_8_6/ext/tk/lib/tkfont.rb
new file mode 100644
index 0000000000..38a96633de
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkfont.rb
@@ -0,0 +1,4 @@
+#
+#   tkfont.rb - load tk/font.rb
+#
+require 'tk/font'
diff --git a/ruby_1_8_6/ext/tk/lib/tkmacpkg.rb b/ruby_1_8_6/ext/tk/lib/tkmacpkg.rb
new file mode 100644
index 0000000000..35560e78ce
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkmacpkg.rb
@@ -0,0 +1,4 @@
+#
+#   tkmacpkg.rb - load tk/macpkg.rb
+#
+require 'tk/macpkg'
diff --git a/ruby_1_8_6/ext/tk/lib/tkmenubar.rb b/ruby_1_8_6/ext/tk/lib/tkmenubar.rb
new file mode 100644
index 0000000000..70214fda1a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkmenubar.rb
@@ -0,0 +1,4 @@
+#
+#   tkmenubar.rb - load tk/menubar.rb
+#
+require 'tk/menubar'
diff --git a/ruby_1_8_6/ext/tk/lib/tkmngfocus.rb b/ruby_1_8_6/ext/tk/lib/tkmngfocus.rb
new file mode 100644
index 0000000000..fe70950e8e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkmngfocus.rb
@@ -0,0 +1,4 @@
+#
+#   tkmngfocus.rb - load tk/mngfocus.rb
+#
+require 'tk/mngfocus'
diff --git a/ruby_1_8_6/ext/tk/lib/tkpalette.rb b/ruby_1_8_6/ext/tk/lib/tkpalette.rb
new file mode 100644
index 0000000000..56b203bbb9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkpalette.rb
@@ -0,0 +1,4 @@
+#
+#   tkpalette.rb - load tk/palette.rb
+#
+require 'tk/palette'
diff --git a/ruby_1_8_6/ext/tk/lib/tkscrollbox.rb b/ruby_1_8_6/ext/tk/lib/tkscrollbox.rb
new file mode 100644
index 0000000000..6093b2e4e7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkscrollbox.rb
@@ -0,0 +1,4 @@
+#
+#   tkscrollbox.rb - load tk/scrollbox.rb
+#
+require 'tk/scrollbox'
diff --git a/ruby_1_8_6/ext/tk/lib/tktext.rb b/ruby_1_8_6/ext/tk/lib/tktext.rb
new file mode 100644
index 0000000000..97ad62a3ea
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tktext.rb
@@ -0,0 +1,4 @@
+#
+#   tktext.rb - load tk/text.rb
+#
+require 'tk/text'
diff --git a/ruby_1_8_6/ext/tk/lib/tkvirtevent.rb b/ruby_1_8_6/ext/tk/lib/tkvirtevent.rb
new file mode 100644
index 0000000000..f4fae19a0a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkvirtevent.rb
@@ -0,0 +1,4 @@
+#
+#   tkvirtevent.rb - load tk/virtevent.rb
+#
+require 'tk/virtevent'
diff --git a/ruby_1_8_6/ext/tk/lib/tkwinpkg.rb b/ruby_1_8_6/ext/tk/lib/tkwinpkg.rb
new file mode 100644
index 0000000000..83371c546d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/lib/tkwinpkg.rb
@@ -0,0 +1,4 @@
+#
+#   tkwinpkg.rb - load tk/winpkg.rb
+#
+require 'tk/winpkg'
diff --git a/ruby_1_8_6/ext/tk/old-README.tcltklib.eucj b/ruby_1_8_6/ext/tk/old-README.tcltklib.eucj
new file mode 100644
index 0000000000..fd75202c18
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/old-README.tcltklib.eucj
@@ -0,0 +1,159 @@
+(tof)
+                                    2003/06/19  Hidetoshi NAGAI
+
+本ドキュメントには古い tcltk ライブラリ，tcltklib ライブラリの説明
+が含まれていますが，その記述内容は古いものとなっています．
+
+まず，現在の Ruby/Tk の中心である tk.rb は wish を呼び出したりはせ
+ず，tcltklib ライブラリを wrap して動作するものとなっています．その
+ため，古い説明記述で述べられているようなプロセス間通信によるオーバ
+ヘッドは存在しません．
+
+現在の tcltklib ライブラリでも，Tcl/Tk の C ライブラリをリンクして
+直接に動かすことで，オーバヘッドを押さえつつ Tcl/Tk インタープリタ
+のほぼ全機能（拡張ライブラリを含む）を使える点は同じです．しかし，
+その役割はほぼ「tk.rb 以下のライブラリを効果的に働かせるためのもの」
+と見なされており，その目的でメンテナンスされています．
+
+tk.rb の高機能化に伴って，中水準のライブラリである tcltk ライブラリ
+（tcltk.rb）はその存在意義を減じており，現在ではメンテナンスは行わ
+れていません．
+
+なお，古い説明ではバインディングにおけるスクリプトの追加はできないこ
+ととなっていますが，現在の tk.rb ではこれも可能であることを補足して
+おきます．
+
+以下がライブラリの古い説明文書です．
+==============================================================
+	tcltk ライブラリ
+	tcltklib ライブラリ
+		Sep. 19, 1997	Y. Shigehiro
+
+以下, 「tcl/tk」という表記は, tclsh や wish を実現している, 一般でいう
+ところの tcl/tk を指します. 「tcltk ライブラリ」, 「tcltklib ライブラ
+リ」という表記は, 本パッケージに含まれる ruby 用のライブラリを指します.
+
+[ファイルについて]
+
+README.euc : このファイル(注意, 特徴, インストールの方法).
+MANUAL.euc : マニュアル.
+
+lib/, ext/ : ライブラリの実体.
+
+sample/ : マニュアル代わりのサンプルプログラム.
+sample/sample0.rb : tcltklib ライブラリのテスト.
+sample/sample1.rb : tcltk ライブラリのテスト.
+    tcl/tk (wish) でできそうなことを一通り書いてみました.
+sample/sample2.rb : tcltk ライブラリのサンプル.
+    maeda shugo (shugo@po.aianet.ne.jp) 氏による
+    (`rb.tk' で書かれていた) ruby のサンプルプログラム
+	http://www.aianet.or.jp/~shugo/ruby/othello.rb.gz
+    を tcltk ライブラリを使うように, 機械的に変更してみました.
+
+demo/ : 100 本の線を 100 回描くデモプログラム.
+    最初に空ループの時間を測定し, 続いて実際に線を引く時間を測定します.
+    tcl/tk は(再)描画のときに backing store を使わずに律義に 10000 本(?)
+    線を引くので, (再)描画を始めると, マシンがかなり重くなります.
+demo/lines0.tcl : wish 用のスクリプト.
+demo/lines1.rb : `tk.rb' 用のスクリプト.
+demo/lines2.rb : tcltk ライブラリ用のスクリプト.
+
+[注意]
+
+コンパイル/実行には, tcl/tk の C ライブラリが必要です.
+
+このライブラリは,
+
+	ruby-1.0-970701, ruby-1.0-970911, ruby-1.0-970919
+	FreeBSD 2.2.2-RELEASE
+	およびそのパッケージ jp-tcl-7.6.tgz, jp-tk-4.2.tgz
+
+で作成/動作確認しました. 他の環境では動作するかどうかわかりません.
+
+TclTkLib.mainloop を実行中に Control-C が効かないのは不便なので, ruby 
+のソースを参考に, #include "sig.h" して trap_immediate を操作していま
+すが, ruby の README.EXT にも書いてないのに, こんなことをして良いのか
+どうかわかりません.
+
+-d オプションでデバッグ情報を表示させるために, ruby のソースを参考に,
+debug という大域変数を参照していますが, ruby の README.EXT にも書いて
+ないのに, こんなことをして良いのかどうかわかりません.
+
+extconf.rb は書きましたが, (いろいろな意味で)これで良いのか良く分かり
+ません.
+
+[特徴]
+
+ruby から tcl/tk ライブラリを利用できます.
+
+tcl/tk インタプリタのスクリプトは, 機械的に tcltk ライブラリ用の ruby 
+スクリプトに変換できます.
+
+(`tk.rb' との違い)
+
+1. tcl/tk インタプリタのスクリプトが, どのように, tcltk ライブラリ用の 
+   ruby スクリプトに変換されるかが理解できれば, マニュアル類が無いに等
+   しい `tk.rb' とは異なり
+
+	tcl/tk のマニュアルやオンラインドキュメントを用いて
+
+   効率良くプログラミングを行うことができます.
+   記述方法がわからない, コマンドに与えるパラメータがわからない...
+     - Canvas.new { ... } と, なぜイテレータブロックを書けるの??
+     - Canvas の bbox は数値のリストを返すのに, xview は文字列を返すの??
+   と, いちいち, ライブラリのソースを追いかける必要はありません.
+
+2. 個々の機能(オプション)を個別処理によりサポートしており, そのためサ
+   ポートしていない機能は使うことができない(本当は使えないこともないの
+   ですが) `tk.rb' とは異なり, tcl/tk インタプリタで可能なことは
+
+	ほとんど
+
+   ruby からも実行できます. 現在, ruby から実行できないことが確認され
+   ているのは,
+
+	bind コマンドでスクリプトを追加する構文
+	「bind tag sequence +script」
+                            ^
+
+   のみです.
+     - `. configure -width' をしようとして, `Tk.root.height()' と書い
+      たのに, `undefined method `height'' と怒られてしまった. tk.rb を
+      読んでみて, ガーン. できないのか...
+   ということはありません.
+
+3. wish プロセスを起動しプロセス間通信で wish を利用する `tk.rb' とは
+   異なり, tcl/tk の C ライブラリをリンクし
+
+	より高速に (といっても, 思った程は速くないですが)
+
+   処理を行います.
+
+4. `tk.rb' ほど, 高水準なインターフェースを備えていないため, tcl/tk イ
+   ンタプリタの生成等
+
+	何から何まで自分で記述
+
+   しなければなりません(その代わり, tcl/tk ライブラリの仕様通り,
+   tcl/tk インタプリタを複数生成することもできますが).
+   インターフェースは(おそらく) ruby の思想に沿ったものではありません. 
+   また, スクリプトの記述は
+
+	ダサダサ
+
+   です. スクリプトは, 一見, 読みづらいものとなります. が, 書く人にとっ
+   ては, それほど煩わしいものではないと思います.
+
+[インストールの方法]
+
+0. ruby のソースファイル(ruby-1.0-なんたら.tgz)を展開しておきます.
+
+1. ruby-1.0-なんたら/ext に ext/tcltklib をコピーします.
+	cp -r ext/tcltklib ???/ruby-1.0-なんたら/ext/
+
+2. ruby のインストール法に従い make 等をします.
+
+3. ruby のライブラリ置場に lib/* をコピーします.
+	cp lib/* /usr/local/lib/ruby/
+
+(eof)
diff --git a/ruby_1_8_6/ext/tk/sample/24hr_clock.rb b/ruby_1_8_6/ext/tk/sample/24hr_clock.rb
new file mode 100644
index 0000000000..60d8072c57
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/24hr_clock.rb
@@ -0,0 +1,286 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+
+class Clock
+  def initialize(clock24 = true)
+    @clock = (clock24)? 24: 12
+
+    @size = 200
+    @cdot_size = 5
+
+    @cdot_color        = 'black'
+    @hour_hand_color   = 'black'
+    @minute_hand_color = 'gray25'
+    @second_hand_color = 'gray50'
+
+    @mark_font     = 'Helvetica -14'
+    @mark_width    = 3
+    @mark_color    = 'black'
+    @submark_color = 'gray50'
+
+    @c = TkCanvas.new(:width=>2*@size, :height=>2*@size, 
+                     :scrollregion=>[-@size, -@size, @size, @size]
+                     ).pack(:fill=>:both, :expand=>true)
+
+    @tag = TkcTag.new(@c)
+    @hand_tag = TkcTag.new(@c)
+
+    @circle_coords = [[-0.9*@size, -0.9*@size], [0.9*@size, 0.9*@size]]
+    @oval = TkcOval.new(@c, @circle_coords, :fill=>'white', :tags=>[@tag])
+
+    f = TkFrame.new.pack
+    TkLabel.new(f, :text=>'CURRENT:').pack(:side=>:left)
+    @now = TkLabel.new(f, :text=>'00:00:00').pack(:side=>:left, :padx=>2)
+    TkLabel.new(f, :text=>'  ').pack(:side=>:left)
+    TkLabel.new(f, :text=>'  ').pack(:side=>:right)
+    @l = TkLabel.new(f, :text=>'00:00').pack(:side=>:right, :padx=>2)
+    TkLabel.new(f, :text=>'MOUSE-POINTER:').pack(:side=>:right)
+
+    cmd = proc{|x, y|
+      @l.text = '%02d:%02d' % coords_to_time(@c.canvasx(x), @c.canvasy(y))
+    }
+    @c.bind('Motion', cmd, '%x %y')
+    @tag.bind('Motion', cmd, '%x %y')
+
+    _create_hands
+    _create_marks
+
+    timer_proc = proc{
+      t = Time.now
+      @now.text = '%02d:%02d:%02d' % [t.hour, t.min, t.sec]
+      set_hands(t.hour, t.min, t.sec)
+    }
+
+    timer_proc.call
+    @timer = TkRTTimer.start(100, -1, timer_proc)
+  end
+
+  def _create_marks
+    @mark_tag = TkcTag.new(@c)
+
+    TkcLine.new(@c, 0, -0.90*@size, 0, -0.85*@size, 
+                :tags=>[@tag, @mark_tag], 
+                :width=>@mark_width, :fill=>@mark_color)
+    TkcLine.new(@c, 0.90*@size, 0, 0.85*@size, 0, 
+                :tags=>[@tag, @mark_tag], 
+                :width=>@mark_width, :fill=>@mark_color)
+    TkcLine.new(@c, 0, 0.90*@size, 0, 0.85*@size, 
+                :tags=>[@tag, @mark_tag], 
+                :width=>@mark_width, :fill=>@mark_color)
+    TkcLine.new(@c, -0.90*@size, 0, -0.85*@size, 0, 
+                :tags=>[@tag, @mark_tag], 
+                :width=>@mark_width, :fill=>@mark_color)
+
+    TkcText.new(@c, [0, -0.92*@size], :text=>0, 
+                :anchor=>'s', :fill=>@mark_color)
+    TkcText.new(@c, [0.92*@size, 0], :text=>@clock.div(4), 
+                :anchor=>'w', :fill=>@mark_color)
+    TkcText.new(@c, [0, 0.92*@size], :text=>@clock.div(2), 
+                :anchor=>'n', :fill=>@mark_color)
+    TkcText.new(@c, [-0.92*@size, 0], :text=>@clock.div(4)*3, 
+                :anchor=>'e', :fill=>@mark_color)
+
+    [30.0, 60.0].each{|angle|
+      rad = Math::PI * angle / 180.0
+      x_base = @size*Math::sin(rad)
+      y_base = @size*Math::cos(rad)
+
+      x1 = 0.90*x_base
+      y1 = 0.90*y_base
+
+      x2 = 0.85*x_base
+      y2 = 0.85*y_base
+
+      TkcLine.new(@c, x1, y1, x2, y2, 
+                  :tags=>[@tag, @mark_tag], 
+                  :width=>@mark_width, :fill=>@mark_color)
+      TkcLine.new(@c, x1, -y1, x2, -y2, 
+                  :tags=>[@tag, @mark_tag], 
+                  :width=>@mark_width, :fill=>@mark_color)
+      TkcLine.new(@c, -x1, y1, -x2, y2, 
+                  :tags=>[@tag, @mark_tag], 
+                  :width=>@mark_width, :fill=>@mark_color)
+      TkcLine.new(@c, -x1, -y1, -x2, -y2, 
+                  :tags=>[@tag, @mark_tag], 
+                  :width=>@mark_width, :fill=>@mark_color)
+
+      x3 = 0.92*x_base
+      y3 = 0.92*y_base
+
+      if @clock == 24
+        dh = angle.to_i/15
+      else # @clock == 12
+        dh = angle.to_i/30
+      end
+
+      TkcText.new(@c, x3, -y3, :text=>dh, 
+                  :anchor=>'sw', :fill=>@mark_color)
+      TkcText.new(@c, x3, y3, :text=>@clock.div(2)-dh, 
+                  :anchor=>'nw', :fill=>@mark_color)
+      TkcText.new(@c, -x3, y3, :text=>@clock.div(2)+dh, 
+                  :anchor=>'ne', :fill=>@mark_color)
+      TkcText.new(@c, -x3, -y3, :text=>@clock-dh, 
+                  :anchor=>'se', :fill=>@mark_color)
+    }
+
+    if @clock == 24
+      [15.0, 45.0, 75.0].each{|angle|
+        rad = Math::PI * angle / 180.0
+        x_base = @size*Math::sin(rad)
+        y_base = @size*Math::cos(rad)
+
+        x1 = 0.90*x_base
+        y1 = 0.90*y_base
+
+        x2 = 0.875*x_base
+        y2 = 0.875*y_base
+
+        TkcLine.new(@c, x1, y1, x2, y2, 
+                    :tags=>[@tag, @mark_tag], 
+                    :width=>@mark_width, :fill=>@submark_color)
+        TkcLine.new(@c, x1, -y1, x2, -y2, 
+                    :tags=>[@tag, @mark_tag], 
+                    :width=>@mark_width, :fill=>@submark_color)
+        TkcLine.new(@c, -x1, y1, -x2, y2, 
+                    :tags=>[@tag, @mark_tag], 
+                    :width=>@mark_width, :fill=>@submark_color)
+        TkcLine.new(@c, -x1, -y1, -x2, -y2, 
+                    :tags=>[@tag, @mark_tag], 
+                    :width=>@mark_width, :fill=>@submark_color)
+      }
+    end
+  end
+
+  def _create_hands
+    hour_hand_len   = 0.55*@size
+    minute_hand_len = 0.85*@size
+    second_hand_len = 0.88*@size
+
+    hour_hand_width   = 1.8*@cdot_size
+    minute_hand_width = 1.0*@cdot_size
+    second_hand_width = 1 # 0.4*@cdot_size
+
+    @hour_hand_coords = [
+      [0, -0.5*@cdot_size], 
+      [hour_hand_width, -0.5*@cdot_size-hour_hand_width], 
+      [hour_hand_width, -hour_hand_len+hour_hand_width], 
+      [0, -hour_hand_len], 
+      [-hour_hand_width, -hour_hand_len+hour_hand_width], 
+      [-hour_hand_width, -0.5*@cdot_size-hour_hand_width], 
+    ]
+    @minute_hand_coords = [
+      [0, -0.5*@cdot_size], 
+      [minute_hand_width, -0.5*@cdot_size - minute_hand_width], 
+      [minute_hand_width, -minute_hand_len+minute_hand_width], 
+      [0, -minute_hand_len], 
+      [-minute_hand_width, -minute_hand_len+minute_hand_width], 
+      [-minute_hand_width, -0.5*@cdot_size-minute_hand_width], 
+    ]
+    @second_hand_coords = [
+      [0, -0.5*@cdot_size], 
+      [second_hand_width, -0.5*@cdot_size - second_hand_width], 
+      [second_hand_width, -second_hand_len+second_hand_width], 
+      [0, -second_hand_len], 
+      [-second_hand_width, -second_hand_len+second_hand_width], 
+      [-second_hand_width, -0.5*@cdot_size-second_hand_width], 
+    ]
+
+    @hour_hand = TkcPolygon.new(@c, @hour_hand_coords, 
+                                :tags=>[@tag, @hand_tag], 
+                                :outline=>@hour_hand_color, 
+                                :fill=>@hour_hand_color)
+
+    @minute_hand = TkcPolygon.new(@c, @minute_hand_coords, 
+                                  :tags=>[@tag, @hand_tag], 
+                                  :outline=>@minute_hand_color, 
+                                  :fill=>@minute_hand_color)
+
+    @second_hand = TkcPolygon.new(@c, @second_hand_coords, 
+                                  :tags=>[@tag, @hand_tag], 
+                                  :outline=>@second_hand_color, 
+                                  :fill=>@second_hand_color)
+
+    @center_dot = TkcOval.new(@c, 
+                              [-@cdot_size, -@cdot_size], 
+                              [@cdot_size, @cdot_size], 
+                              :outline=>@cdot_color, :fill=>@cdot_color)
+  end
+  private :_create_hands
+
+  def _raise_hands
+    @hour_hand.raise
+    @minute_hand.raise
+    @second_hand.raise
+    @center_dot.raise
+  end
+  private :_raise_hands
+
+  def _raise_marks
+    @mark_tag.raise
+  end
+  private :_raise_marks
+
+  def set_hands(hh, mm, ss)
+    ss_angle = Math::PI * ss / 30.0
+    mm_angle = Math::PI * (mm + ss/60.0) / 30.0
+    hh_angle = Math::PI * (hh + (mm + ss/60.0)/60.0) / (@clock.div(2))
+
+    @second_hand.coords = @second_hand_coords.collect{|x, y|
+      r = Math::hypot(y, x)
+      a = Math::atan2(y, x) + ss_angle
+      [Math::cos(a) * r, Math::sin(a) * r]
+    }
+
+    @minute_hand.coords = @minute_hand_coords.collect{|x, y|
+      r = Math::hypot(y, x)
+      a = Math::atan2(y, x) + mm_angle
+      [Math::cos(a) * r, Math::sin(a) * r]
+    }
+
+    @hour_hand.coords = @hour_hand_coords.collect{|x, y|
+      r = Math::hypot(y, x)
+      a = Math::atan2(y, x) + hh_angle
+      [Math::cos(a) * r, Math::sin(a) * r]
+    }
+
+    _raise_hands
+    _raise_marks
+  end
+
+  def coords_to_time(x, y)
+    return ((y < 0)? [0, 0]: [@clock.div(2), 0])  if x == 0
+    if @clock == 24
+      offset = (x<0&&y<0)? 1800.0: 360.0
+      m_half = 720.0
+    else # @clock == 12
+      offset = (x<0&&y<0)? 900.0: 180.0
+      m_half = 360.0
+    end
+    (offset + m_half*Math.atan2(y,x)/Math::PI).round.divmod(60)
+  end
+
+  def create_pie(hh, mm, span, color='red')
+    if @clock == 24
+      start  = 90.0 - (hh*60 + mm)/4.0  # 360.0*(hh*60+mm)/(24*60)
+      extent = -span/4.0
+    else # @clock == 12
+      start  = 90.0 - (hh*60 + mm)/2.0  # 360.0*(hh*60+mm)/(12*60)
+      extent = -span/2.0
+    end
+
+    pie = TkcArc.new(@c, @circle_coords, :tags=>[@tag], 
+                     :outline=>'black', 'fill'=>color, 
+                     :start=>start, :extent=>extent)
+    _raise_hands
+    _raise_marks
+    pie
+  end
+end
+
+sched = Clock.new
+sched.create_pie(0,0, 60)            #  60 minutes from 00:00
+sched.create_pie(6,30, 280, 'green') # 280 minutes from 06:30
+sched.create_pie(15,20, 90, 'blue')  #  90 minutes from 15:20
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/binding_sample.rb b/ruby_1_8_6/ext/tk/sample/binding_sample.rb
new file mode 100644
index 0000000000..693cc7de2f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/binding_sample.rb
@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+
+class Button_clone < TkLabel
+  def initialize(*args)
+    @command = nil
+
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+      @command = keys.delete('command')
+
+      keys['highlightthickness'] = 1 unless keys.key?('highlightthickness')
+      keys['padx'] = '3m' unless keys.key?('padx')
+      keys['pady'] = '1m' unless keys.key?('pady')
+      keys['relief'] = 'raised' unless keys.key?('relief')
+
+      args.push(keys)
+    end
+
+    super(*args)
+
+    @press = false
+
+    self.bind('Enter', proc{self.background(self.activebackground)})
+    self.bind('Leave', proc{
+                @press = false
+                self.background(self.highlightbackground)
+                self.relief('raised')
+              })
+
+    self.bind('ButtonPress-1', proc{@press = true; self.relief('sunken')})
+    self.bind('ButtonRelease-1', proc{
+                self.relief('raised')
+                @command.call if @press && @command
+                @press = false
+              })
+  end
+
+  def command(cmd = Proc.new)
+    @command = cmd
+  end
+
+  def invoke
+    if @command
+      @command.call 
+    else
+      ''
+    end
+  end
+end
+
+TkLabel.new(:text=><<EOT).pack
+This is a sample of 'event binding'.
+The first button is a normal button widget.
+And the second one is a normal label widget 
+but with some bindings like a button widget.
+EOT
+
+lbl = TkLabel.new(:foreground=>'red').pack(:pady=>3)
+
+v = TkVariable.new(0)
+
+TkFrame.new{|f|
+  TkLabel.new(f, :text=>'click count : ').pack(:side=>:left)
+  TkLabel.new(f, :textvariable=>v).pack(:side=>:left)
+}.pack
+
+TkButton.new(:text=>'normal Button widget', 
+             :command=>proc{
+               puts 'button is clicked!!'
+               lbl.text 'button is clicked!!'
+               v.numeric += 1
+             }){
+  pack(:fill=>:x, :expand=>true)
+}
+
+Button_clone.new(:text=>'Label with Button binding', 
+                 :command=>proc{
+                   puts 'label is clicked!!'
+                   lbl.text 'label is clicked!!'
+                   v.numeric += 1
+                 }){
+  pack(:fill=>:x, :expand=>true)
+}
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/bindtag_sample.rb b/ruby_1_8_6/ext/tk/sample/bindtag_sample.rb
new file mode 100644
index 0000000000..8c93b4a260
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/bindtag_sample.rb
@@ -0,0 +1,127 @@
+#!/usr/bin/env ruby
+require 'tk'
+
+TkLabel.new(:text=><<EOT, :justify=>:left).pack
+This is a sample of bindtags and usage of 
+Tk.callback_break/Tk.callback_continue. 
+Please check the work of following buttons 
+(attend the difference between before/after 
+ pressing the bottom button), and see the 
+source code.
+EOT
+
+def set_class_bind
+  TkButton.bind('ButtonPress-1', 
+                proc{puts 'bind "ButtonPress-1" of TkButton class'})
+  TkButton.bind('ButtonRelease-1', 
+                proc{puts 'bind "ButtonRelease-1" of TkButton class'})
+end
+
+# set root binding
+r = TkRoot.new
+r.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of root widget'})
+r.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of root widget'})
+
+# set 'all' binding
+TkBindTag::ALL.bind('ButtonPress-1', 
+                    proc{puts 'bind "ButtonPress-1" of the tag "all"'})
+TkBindTag::ALL.bind('ButtonRelease-1', 
+                    proc{puts 'bind "ButtonRelease-1" of the tag "all"'})
+
+# create buttons
+b1 = TkButton.new(:text=>'button-1', 
+                  :command=>proc{puts "command of button-1"}).pack
+b2 = TkButton.new(:text=>'button-2', 
+                  :command=>proc{puts "command of button-2"}).pack
+b3 = TkButton.new(:text=>'button-3', 
+                  :command=>proc{puts "command of button-3"}).pack
+b4 = TkButton.new(:text=>'button-4', 
+                  :command=>proc{puts "command of button-4"}).pack
+b5 = TkButton.new(:text=>'button-5', 
+                  :command=>proc{puts "command of button-5"}).pack
+
+# set button binding
+b1.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-1'})
+b1.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-1'})
+
+b2.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-2'})
+b2.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-2'})
+
+b3.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-3'})
+b3.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-3'})
+
+b4.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-4'})
+b4.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-4'})
+
+b5.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of button-5'})
+b5.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of button-5'})
+
+# create bindtag and set binding
+tag1 = TkBindTag.new
+tag1.bind('ButtonPress-1',   proc{puts 'bind "ButtonPress-1" of tag1'})
+tag1.bind('ButtonRelease-1', proc{puts 'bind "ButtonRelease-1" of tag1'})
+
+tag2 = TkBindTag.new
+tag2.bind('ButtonPress-1',   
+          proc{
+            puts 'bind "ButtonPress-1" of tag2'
+            puts 'call Tk.callback_continue'
+            Tk.callback_continue
+            puts 'never see this message'
+          })
+tag2.bind('ButtonRelease-1', 
+          proc{
+            puts 'bind "ButtonRelease-1" of tag2'
+            puts 'call Tk.callback_continue'
+            Tk.callback_continue
+            puts 'never see this message'
+          })
+
+tag3 = TkBindTag.new
+tag3.bind('ButtonPress-1',   
+          proc{
+            puts 'bind "ButtonPress-1" of tag3'
+            puts 'call Tk.callback_break'
+            Tk.callback_break
+            puts 'never see this message'
+          })
+tag3.bind('ButtonRelease-1', 
+          proc{
+            puts 'bind "ButtonRelease-1" of tag3'
+            puts 'call Tk.callback_break'
+            Tk.callback_break
+            puts 'never see this message'
+          })
+
+# set bindtags
+p b1.bindtags
+
+tags = b2.bindtags
+tags[2,0] = tag1
+tags[0,0] = tag1
+b2.bindtags(tags)
+p b2.bindtags
+
+tags = b3.bindtags
+tags[2,0] = tag2
+tags[0,0] = tag2
+b3.bindtags(tags)
+p b3.bindtags
+
+tags = b4.bindtags
+tags[2,0] = tag3
+tags[0,0] = tag3
+b4.bindtags(tags)
+p b4.bindtags
+
+b5.bindtags([tag1, TkButton, tag2, b5])
+
+# create button to set button class binding
+TkButton.new(:text=>'set binding to TkButton class', 
+             :command=>proc{
+               puts 'call "set_class_bind"'
+               set_class_bind
+             }).pack(:pady=>7)
+
+# start event-loop
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/binstr_usage.rb b/ruby_1_8_6/ext/tk/sample/binstr_usage.rb
new file mode 100644
index 0000000000..91692856f9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/binstr_usage.rb
@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+require "tk"
+
+TkMessage.new(:width=>360, :text=><<EOM).pack
+This sample shows how to use a binary sequence between Ruby and Tk. \
+This reads the image data from the file as the binary sequence.
+
+To treat the difference of encodings between on Ruby and on Tk seamlessly, \
+Ruby/Tk converts the encoding of string arguments automatically. \
+I think it is comfortable for users on almost all situations. \
+However, when treats a binary sequence, the convert process makes troubles.
+
+Tk::BinaryString class (subclass of Tk::EncodedString class) is the class \
+to avoid such troubles. Please see the source code of this sample. \
+A Tk::BinaryString instance is used to create the image for the center button. 
+EOM
+
+ImgFile=['images','tcllogo.gif'].join(File::Separator)
+
+ph1 = TkPhotoImage.new(:file=>ImgFile)
+p ph1.configinfo
+
+b_str = Tk::BinaryString(IO.read(ImgFile))
+p [b_str, b_str.encoding]
+
+ph2 = TkPhotoImage.new(:data=>b_str)
+p ph2.configinfo
+p ph2.data(:grayscale=>true)
+
+ph3 = TkPhotoImage.new()
+ph3.put(ph2.data(:grayscale=>true))
+
+f = TkFrame.new.pack
+TkButton.new(:parent=>f, :image=>ph1, :command=>proc{exit}).pack(:side=>:left)
+TkButton.new(:parent=>f, :image=>ph2, :command=>proc{exit}).pack(:side=>:left)
+TkButton.new(:parent=>f, :image=>ph3, :command=>proc{exit}).pack(:side=>:left)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/btn_with_frame.rb b/ruby_1_8_6/ext/tk/sample/btn_with_frame.rb
new file mode 100644
index 0000000000..d04c95a289
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/btn_with_frame.rb
@@ -0,0 +1,20 @@
+require 'tk'
+
+class Button_with_Frame < TkButton
+  def create_self(keys)
+    @frame = TkFrame.new('widgetname'=>@path, 'background'=>'yellow')
+    install_win(@path) # create new @path which is a daughter of old @path
+    super(keys)
+    TkPack(@path, :padx=>7, :pady=>7)
+    @epath = @frame.path
+  end
+  def epath
+    @epath
+  end
+end
+
+Button_with_Frame.new(:text=>'QUIT', :command=>proc{exit}) {
+  pack(:padx=>15, :pady=>5)
+}
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/cd_timer.rb b/ruby_1_8_6/ext/tk/sample/cd_timer.rb
new file mode 100644
index 0000000000..9154e89bfe
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/cd_timer.rb
@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+#
+#   countdown timer
+#     usage: cd_timer min [, min ... ]
+#            ( e.g. cd_timer 0.5 1 3 5 10 )
+#
+require 'tk'
+
+if ARGV.empty?
+  $stderr.puts 'Error:: No time arguments for counting down' 
+  exit(1)
+end
+
+width = 10
+
+TkButton.new(:text=>'exit', 
+             :command=>proc{exit}).pack(:side=>:bottom, :fill=>:x)
+
+b = TkButton.new(:text=>'start').pack(:side=>:top, :fill=>:x)
+
+f = TkFrame.new(:relief=>:ridge, :borderwidth=>2).pack(:fill=>:x)
+TkLabel.new(f, :relief=>:flat, :pady=>3, 
+            :background=>'black', :foreground=>'white', 
+            :text=>'  elapsed: ').pack(:fill=>:x, :side=>:left, :expand=>true)
+now = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w, 
+                  :background=>'black', :foreground=>'white', 
+                  :text=>'%4d:%02d.00' % [0, 0]).pack(:side=>:right)
+
+timers = [ TkRTTimer.new(10){|tm|
+    t = (tm.return_value || 0) + 1
+    s, u = t.divmod(100)
+    m, s = s.divmod(60)
+    now.text('%4d:%02d.%02d' % [m, s, u])
+    t
+  }.set_start_proc(0, proc{
+                     now.text('%4d:%02d.00' % [0,0])
+                     now.foreground('white')
+                     0
+                   })
+]
+
+ARGV.collect{|arg| (Float(arg) * 60).to_i}.sort.each_with_index{|time, idx|
+  f = TkFrame.new(:relief=>:ridge, :borderwidth=>2).pack(:fill=>:x)
+  TkLabel.new(f, :relief=>:flat, :pady=>3, 
+              :text=>'  %4d:%02d  --> ' % (time.divmod(60))).pack(:side=>:left)
+  l = TkLabel.new(f, :width=>width, :relief=>:flat, :pady=>3, :anchor=>:w, 
+                  :text=>'%4d:%02d' % (time.divmod(60))).pack(:side=>:right)
+  timers << TkRTTimer.new(1000){|tm|
+    t = (tm.return_value || time) - 1
+    if t < 0
+      l.text('%4d:%02d' % ((-t).divmod(60)))
+    else
+      l.text('%4d:%02d' % (t.divmod(60)))
+    end
+    if t.zero?
+      l.foreground('red')
+      idx.times{Tk.bell}
+    end
+    t
+  }.set_start_proc(0, proc{
+                     l.text('%4d:%02d' % (time.divmod(60)))
+                     l.foreground('black')
+                     time
+                   })
+}
+
+mode = :start
+b.command(proc{
+            if mode == :start
+              timers.each{|timer| timer.restart}
+              b.text('reset')
+              mode = :reset
+            else
+              timers.each{|timer| timer.stop.reset}
+              b.text('start')
+              mode = :start
+            end
+          })
+
+Tk.mainloop
+
diff --git a/ruby_1_8_6/ext/tk/sample/cmd_res_test.rb b/ruby_1_8_6/ext/tk/sample/cmd_res_test.rb
new file mode 100644
index 0000000000..6e954f26ee
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/cmd_res_test.rb
@@ -0,0 +1,17 @@
+require 'tk'
+TkOptionDB.readfile(File.expand_path('cmd_resource', 
+                                     File.dirname(__FILE__)))
+f = TkFrame.new(:class=>'BtnFrame').pack
+b = TkButton.new(:parent=>f, :widgetname=>'hello').pack
+cmd1 = TkOptionDB.new_proc_class(b, [:show_msg, :bye_msg], 3)
+cmd2 = TkOptionDB.new_proc_class(:ZZZ, [:show_msg, :bye_msg], 3, false, cmd1)
+cmd3 = TkOptionDB.new_proc_class(:ZZZ, [:show_msg, :bye_msg], 3, false, b)
+cmd4 = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3){
+  def self.__check_proc_string__(str)
+    "{|arg| print [arg, $SAFE].inspect, ': '; Proc.new#{str}.call(arg)}"
+  end
+}
+cmd1.show_msg('cmd1')
+cmd2.show_msg('cmd2')
+cmd3.show_msg('cmd3')
+cmd4.show_msg('cmd4')
diff --git a/ruby_1_8_6/ext/tk/sample/cmd_resource b/ruby_1_8_6/ext/tk/sample/cmd_resource
new file mode 100644
index 0000000000..9cc4915546
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/cmd_resource
@@ -0,0 +1,5 @@
+*BtnFrame.hello.text: HELLO
+*BtnFrame.hello.command: ruby {puts "Hello World!!"}
+*BTN_CMD.show_msg: {|arg| print "Hello, #{arg}!!\n"}
+*hello.show_msg: {|arg| print "Hello, Hello, #{arg}!!\n"}
+*hello.ZZZ.show_msg: {|arg| print "Hello, Hello, ZZZ:#{arg}!!\n"}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/ChangeLog b/ruby_1_8_6/ext/tk/sample/demos-en/ChangeLog
new file mode 100644
index 0000000000..c3f66cf409
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/ChangeLog
@@ -0,0 +1,64 @@
+2002-08-29 16:30  matt
+
+	* ChangeLog: ChangeLog is auto-generated *from* CVS log.
+
+2002-08-29 16:27  matt
+
+	* ChangeLog.prev: [no log message]
+
+2002-08-28 18:07  matt
+
+	* browse1, browse2, hello, ixset, rmt, rolodex, rolodex-j, square,
+	tcolor, timer, widget: Changed #! lines to the slightly more
+	portable '#!/usr/bin/env ruby'.
+
+2002-08-28 17:56  matt
+
+	* icon.rb, items.rb, label.rb, menu.rb, ruler.rb: Changed bitmap
+	file extensions from .bmp to .xbm.
+
+2002-08-28 17:55  matt
+
+	* images/: face.bmp, face.xbm, flagdown.bmp, flagdown.xbm,
+	flagup.bmp, flagup.xbm, gray25.bmp, gray25.xbm, letters.bmp,
+	letters.xbm, noletter.bmp, noletter.xbm, pattern.bmp, pattern.xbm:
+	Changed X bitmap file extensions from .bmp to the more intuitive
+	.xbm.
+
+2002-08-28 17:35  matt
+
+	* bitmap.rb, colors.rb, cscroll.rb, ctext.rb, hello, ixset,
+	menubu.rb, patch_1.1c1, rmt, style.rb, timer, ChangeLog, README,
+	README.tkencoding, arrow.rb, bind.rb, browse1, browse2, button.rb,
+	check.rb, clrpick.rb, dialog1.rb, dialog2.rb, entry1.rb, entry2.rb,
+	filebox.rb, floor.rb, form.rb, hscale.rb, icon.rb, image1.rb,
+	image2.rb, items.rb, label.rb, menu.rb, msgbox.rb, plot.rb,
+	puzzle.rb, radio.rb, rolodex, rolodex-j, ruler.rb, sayings.rb,
+	search.rb, square, states.rb, tcolor, text.rb, tkencoding.rb,
+	twind.rb, vscale.rb, widget, doc.org/README, doc.org/README.JP,
+	doc.org/README.tk80, doc.org/license.terms,
+	doc.org/license.terms.tk80, images/earth.gif, images/earthris.gif,
+	images/face.bmp, images/flagdown.bmp, images/flagup.bmp,
+	images/gray25.bmp, images/grey.25, images/grey.5,
+	images/letters.bmp, images/noletter.bmp, images/pattern.bmp,
+	images/tcllogo.gif, images/teapot.ppm: Initial revision
+
+2002-08-28 17:35  matt
+
+	* bitmap.rb, colors.rb, cscroll.rb, ctext.rb, hello, ixset,
+	menubu.rb, patch_1.1c1, rmt, style.rb, timer, ChangeLog, README,
+	README.tkencoding, arrow.rb, bind.rb, browse1, browse2, button.rb,
+	check.rb, clrpick.rb, dialog1.rb, dialog2.rb, entry1.rb, entry2.rb,
+	filebox.rb, floor.rb, form.rb, hscale.rb, icon.rb, image1.rb,
+	image2.rb, items.rb, label.rb, menu.rb, msgbox.rb, plot.rb,
+	puzzle.rb, radio.rb, rolodex, rolodex-j, ruler.rb, sayings.rb,
+	search.rb, square, states.rb, tcolor, text.rb, tkencoding.rb,
+	twind.rb, vscale.rb, widget, doc.org/README, doc.org/README.JP,
+	doc.org/README.tk80, doc.org/license.terms,
+	doc.org/license.terms.tk80, images/earth.gif, images/earthris.gif,
+	images/face.bmp, images/flagdown.bmp, images/flagup.bmp,
+	images/gray25.bmp, images/grey.25, images/grey.5,
+	images/letters.bmp, images/noletter.bmp, images/pattern.bmp,
+	images/tcllogo.gif, images/teapot.ppm: Taking over demo package
+	from Jonathan Conway.
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/ChangeLog.prev b/ruby_1_8_6/ext/tk/sample/demos-en/ChangeLog.prev
new file mode 100644
index 0000000000..536ce30abe
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/ChangeLog.prev
@@ -0,0 +1,9 @@
+2001-07-26      <rise@leannan.knavery.net>
+
+	* Moved files to directory ruby-tk81-demos-english in tarball.
+
+2001-07-26      <rise@knavery.net>
+
+	* Added test to widget and hello versus Tk::TCL_VERSION & Tk::JAPANIZED_TK (per Guy Decoux in [ruby-talk:18559]) before requiring tkencoding.rb.
+
+	
\ No newline at end of file
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/README b/ruby_1_8_6/ext/tk/sample/demos-en/README
new file mode 100644
index 0000000000..2908aa38e4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/README
@@ -0,0 +1,138 @@
+Current Maintainer: 
+	Jonathan Conway
+	rise@knavery.net
+
+	Please direct all bug reports/requests/suggestions to the above 
+	address.
+
+
+Notes:
+
+* 	The files hello and widget have been changed to test Tk::TCL_VERSION 
+	and Tk::JAPANIZED_TK before requiring tkencoding.rb to prevent an
+	infinite loop.  This test was taken from a message in
+	[ruby-talk:18559] by Guy Decoux.
+
+*	The .bmp files in the images directory are X bitmaps (i.e. XBM to many
+	graphics packages), not Windows bitmaps (.bmp).  You will not be
+	able to use images exported by a graphics program as Windows
+	bitmaps with this demo collection nor will you be able to edit the
+	included images without setting the file type correctly.
+	
+-- Jonathan Conway, 2001-07-26
+
+
+#------------------------------------------------------------------------------
+# ==== Introduction. ====
+#
+# To create this version of the Ruby/Tk widget demo, I took the
+# ruby-tk81-demos and removed all the Kanji strings and comments.  I
+# have tried to restore the original English strings and comments
+# using the Tcl/Tk8.2.2 version of the widget demo. 
+#
+# When I tried running the Kanji version, all I got was a mostly blank
+# panel with a non-functional "File" button. I disovered that if all
+# non-ASCII characters were replaced with blanks, then I could get the
+# gutted stuff running.  
+#
+# Since English Ruby/Tk documentation is lacking and I needed this
+# code to see how it worked and to use as the basis of my try-it
+# prototype (The Ruby Yielding Interactive Toolkit), plus the fact
+# that no help was forthcoming for making the Kanji version work (plus
+# the fact that I can't read Kanji anyway), I decided to embark on
+# this English restoration project. 
+#
+# Thanks to everyone who worked on the original Ruby/Tk widget demo
+# (and the preceding Tcl/Tk version for that matter).  The
+# comparatively simple task of changing text strings and comments has
+# made me appreciate the great amount of original work that went into
+# this.
+#
+# -- Conrad Schneiker, 2000-07-23.
+#------------------------------------------------------------------------------
+
+#------------------------------------------------------------------------------
+# ==== Known bugs. ====
+#
+# ^C-ing the demo gives Ruby interrupt and stack message; clean exit needed.
+# Font settings don't work correctly.
+# Dismissing the embedded windows demo (tkwind.rb) kills the widget demo.
+# Rerunning the canvas item demo from the code widow get errors.
+# The "press me" button in the canvas item demo doesn't time out.
+# The simple 2 d plot starts up extremely slow compared to the Tcl version.
+# The first item message on the icon menu on the menu and cascades demo doesn't work.
+#------------------------------------------------------------------------------
+
+
+###################### Original README ########################################
+
+  Ruby/Tk81 widget-demo			1999/08/13
+
+					北陸先端大情報科学研究科
+					立石 <ttate@jaist.ac.jp>
+
+Tcl/Tk8.1ではunicode(UTF8)が採用され、unicodeに変換された日本語であれば
+Widgetに表示させることが可能です。本アーカイブには以前に永井さんが中心と
+なられて作成されたRuby/Tkのサンプルに修正を加え、以下の環境においてで動作
+を確認したものです。
+
+* ruby-1.3.7,ruby-1.4.0
+* tcl8.1, tk8.1
+* linux-2.2
+
+Windows(Cygwin)において、サンプルを動かすにはrubyを-Keというオプションを付
+けて起動させると良いそうです。
+					情報提供：渡辺さん
+					<eban@os.rim.or.jp>
+
+----------------------------------------------------------------------------
+  Ruby/Tk widget-demo 
+                              version 1.1 ( 1998/07/24 )
+                              永井＠知能．九工大 (nagai@ai.kyutech.ac.jp)
+
+標準配布の Tcl/Tk 拡張パッケージを取り込んだ Ruby (以下 Ruby/Tk と呼びます) 
+では，Tk widget を用いた GUI の作成を行うことができます．実際に GUI を作成
+していく場合には様々な実例がサンプルとして存在すると便利なのですが，Ruby/Tk 
+にはそのような適当なサンプルスクリプト集合は存在しませんでした．それに対し，
+拡張パッケージの元である Tcl/Tk には，Tk widget を用いてどのようなことがで
+きるかを示すものとして widget-demo が存在しおり，Tcl/Tk を用いた GUI の作成
+を習得する際の代表的サンプルとなっています．本アーカイブは，Ruby/Tk の習得の
+ための代表的なサンプルスクリプトとすべく，Tcl/Tk の widget-demo を移植したも
+のです．
+
+本アーカイブに含まれるスクリプトを実行するためには，ruby-1.1c2 以上であるこ
+とが必要です．1.1c1 の場合は，本アーカイブに含まれる patck_1.1c1 を Ruby の
+ライブラリにあててください．組み込む Tk のバージョンは，4.2 でも 8.0 でも修
+正なく動かせるはずです．ただし，日本語版での移植となっているため，日本語化さ
+れた Tk をご利用ください．スクリプトのテストは，Tk4.2jp と Tk8.0jp の上で行
+いました (完璧にではないですが)．
+
+本アーカイブに含まれるスクリプトの多くは，元となっている Tcl/Tk 版に比較的近
+いスクリプト記述となるようにしています．そのため，Ruby/Tk のサンプルと言うに
+は，あまり Ruby らしくないとも言えるでしょう．にもかかわらず，そのような記述
+を取っている理由は，Ruby/Tk のドキュメント不足にあります．
+
+Tcl/Tk には適当な参考書が何冊か存在していますから，Ruby/Tk スクリプトを作成
+する際は，そのような Tcl/Tk の参考書で情報を補いながら作成することになると思
+います．各 widget の使用例として，Tcl/Tk の widget-demo を参照することもある
+でしょう．Ruby/Tk 版の記述を widget-demo を Tcl/Tk 版の記述に近いものにして
+おけば，その対比によって，Ruby/Tk の理解を早めることができると考えられます．
+一旦 Ruby/Tk での 各 widget の使用方法を習得してしまえば，Ruby らしいスクリ
+プトを作成することは難しくないでしょう．本アーカイブのスクリプトは，Ruby/Tk 
+を最初に習得するまでの踏台として利用していただければ幸いです．
+
+widget-demo の移植にあたっては，次の方にも移植したスクリプトを提供していただ
+きました．ここに感謝の意を表します．
+
+    立石＠JAIST (ttate@jaist.ac.jp) さん 
+    平松祥史 (hiramatu@cdrom.co.jp) さん
+
+平松さんによる Ruby/Tk 入門の Web page (http://www.cdrom.co.jp/~hiramatu/) 
+も Ruby/Tk の習得に有用と思えますので，ぜひご参照ください．
+
+また，前橋 (maebashi@iij.ad.jp) さんをはじめとして，widget-demo の移植に際し
+て必要となった Ruby の Tk 関連ライブラリ修正について，問題点，バグの指摘をし
+ていただいた方々にも感謝致します．
+
+そして最後に最大の感謝を Ruby 設計者の まつもと ゆきひろ (matz@netlab.co.jp) 
+さんに捧げたいと思います．
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/README.1st b/ruby_1_8_6/ext/tk/sample/demos-en/README.1st
new file mode 100644
index 0000000000..e031f123d2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/README.1st
@@ -0,0 +1,18 @@
+There are Ruby/Tk demo scripts.
+
+Files with '.rb' extension are sub-scripts which are launched 'widget'
+script. Those files don't work independently. Please call them from 
+'widget' script.
+
+If you want start some sub-scripts at same time when the launcher
+script tarts, please give the sub-script names as arguments. 
+(e.g. /usr/local/bin/ruby widget button.rb entry1.rb text.rb )
+You can ommit '.rb' of the sub-scripts
+(e.g. /usr/local/bin/ruby widget button entry1 text )
+
+If you don't need launcher's main window, give -n option. 
+(e.g. /usr/local/bin/ruby widget -n button.rb entry1.rb text.rb )
+
+Others (browse1, hello, and so on) are standalone scripts. 
+
+          2004/04/14  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/README.tkencoding b/ruby_1_8_6/ext/tk/sample/demos-en/README.tkencoding
new file mode 100644
index 0000000000..f576bc593e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/README.tkencoding
@@ -0,0 +1,29 @@
+This is a original document of 'tkencoding.rb'. 
+The library 'tkencoding.rb' is obsolete. 
+Functions of tkencoding.rb is already included into Ruby/Tk.
+
+-------------------------------------------------
+tkencoding.rbを用いた日本語の表示について
+
+Copyright (C) 1999/07, Takaaki Tateishi <ttate@jaist.ac.jp>
+
+
+1. tkencoding.rbとは？
+
+tkencoding.rbはTcl/Tk8.1を利用したRuby/Tkのためのライブラリ
+です。tkencoding.rbをrequireすることによってWedgetに表示さ
+れるテキストは全てunicode(UTF8)へ変換されます。
+
+
+2. 使い方
+
+tkencoding.rbをrequireしてTk.encodingで使用している文字コード
+を指定して下さい。例えば以下のような感じになります。
+
+----
+require 'tk'
+require 'tkencoding'
+
+Tk.encoding = "euc-jp"
+# Tk.encoding = "shiftjis"
+---
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/anilabel.rb b/ruby_1_8_6/ext/tk/sample/demos-en/anilabel.rb
new file mode 100644
index 0000000000..f063bc53a4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/anilabel.rb
@@ -0,0 +1,172 @@
+#
+# animated label widget demo (called by 'widget')
+#
+# based on Tcl/Tk8.5a2 widget demos
+
+if defined?($anilabel_demo) && $anilabel_demo
+  $anilabel_demo.destroy 
+  $anilabel_demo = nil
+end
+
+# demo toplevel widget
+$anilabel_demo = TkToplevel.new {|w|
+  title("Animated Label Demonstration")
+  iconname("anilabel")
+  positionWindow(w)
+}
+
+# label
+msg = TkLabel.new($anilabel_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "Four animated labels are displayed below; each of the labels on the left is animated by making the text message inside it appear to scroll, and the label on the right is animated by animating the image that it displays."
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($anilabel_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $anilabel_demo
+      $anilabel_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'See Code'
+    command proc{showCode 'anilabel'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# create frame for label demo
+f_left = TkLabelFrame.new($anilabel_demo,  :text=>'Scrolling Texts')
+f_right = TkLabelFrame.new($anilabel_demo, :text=>'GIF Image')
+Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both', 
+        'padx'=>10, 'pady'=>10)
+
+# animated label
+class AnimatedTextLabel < TkLabel
+  def initialize(*args)
+    super(*args)
+    @timer = TkTimer.new{ _animation_callback }
+    @timer.loop_exec = -1
+    # bind('Destroy'){ @timer.stop }
+    @btag = TkBindTag.new('Destroy'){ @timer.stop }
+    self.bindtags_unshift(@btag)
+  end
+
+  def _animation_callback()
+    txt = self.text
+    self.text = (txt[1..-1] << txt[0])
+  end
+  private :_animation_callback
+
+  def start(interval)
+    @timer.set_interval(interval)
+    @timer.start
+  end
+
+  def stop
+    @timer.stop
+  end
+end
+
+# animated image
+class AnimatedImageLabel < AnimatedTextLabel
+  def initialize(*args)
+    super(*args)
+    @destroy_image = false
+    @btag.bind_append('Destroy'){
+      if @destroy_image
+        begin
+          self.image.delete 
+        rescue
+        end
+      end
+    }
+  end
+  attr_accessor :destroy_image
+
+  def _animation_callback()
+    img = self.image
+
+    fmt = img.format
+    if fmt.kind_of?(Array)
+      if fmt[1].kind_of?(Hash)
+        # fmt == ['GIF', {'index'=>idx}]
+        idx = fmt[1]['index']
+      else
+        # fmt == ['GIF', '-index', idx]  :: Ruby1.8.2 returns this.
+        idx = fmt[2]
+      end
+    elsif fmt.kind_of?(String) && fmt =~ /GIF -index (\d+)/
+      idx = $1.to_i
+    else
+      idx = -1
+    end
+
+    begin
+      img.format("GIF -index #{idx + 1}")
+    rescue => e
+      img.format("GIF -index 0")
+    end
+  end
+  private :_animation_callback
+end
+
+# create labels
+l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge, 
+                           :font=>{:family=>'Courier', :size=>10})
+l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove, 
+                           :font=>{:family=>'Courier', :size=>10})
+l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat, 
+                           :font=>{:family=>'Courier', :size=>10}, :width=>18)
+Tk.pack(l1, l2, l3, 
+        :side=>:top, :expand=>true, :anchor=>:w, :padx=>10, :pady=>10)
+
+limg = AnimatedImageLabel.new(f_right, :borderwidth=>0)
+limg.pack(:side=>:top, :expand=>true, :padx=>10, :pady=>10)
+
+# base64-encoded animated GIF file
+tclPowerdData = <<EOD
+    R0lGODlhKgBAAPQAAP//////zP//AP/MzP/Mmf/MAP+Zmf+ZZv+ZAMz//8zM
+    zMyZmcyZZsxmZsxmAMwzAJnMzJmZzJmZmZlmmZlmZplmM5kzM2aZzGZmzGZm
+    mWZmZmYzZmYzMzNmzDMzZgAzmSH+IE1hZGUgd2l0aCBHSU1QIGJ5IExARGVt
+    YWlsbHkuY29tACH5BAVkAAEALAAAAAAqAEAAAAX+YCCOZEkyTKM2jOm66yPP
+    dF03bx7YcuHIDkGBR7SZeIyhTID4FZ+4Es8nQyCe2EeUNJ0peY2s9mi7PhAM
+    ngEAMGRbUpvzSxskLh1J+Hkg134OdDIDEB+GHxtYMEQMTjMGEYeGFoomezaC
+    DZGSHFmLXTQKkh8eNQVpZ2afmDQGHaOYSoEyhhcklzVmMpuHnaZmDqiGJbg0
+    qFqvh6UNAwB7VA+OwydEjgujkgrPNhbTI8dFvNgEYcHcHx0lB1kX2IYeA2G6
+    NN0YfkXJ2BsAMuAzHB9cZMk3qoEbRzUACsRCUBK5JxsC3iMiKd8GN088SIyT
+    0RAFSROyeEg38caDiB/+JEgqxsODrZJ1BkT0oHKSmI0ceQxo94HDpg0qsuDk
+    UmRAMgu8OgwQ+uIJgUMVeGXA+IQkzEeHGvD8cIGlDXsLiRjQ+EHroQhea7xY
+    8IQBSgYYDi1IS+OFBCgaDMGVS3fGi5BPJpBaENdQ0EomKGD56IHwO39EXiSC
+    Ysgxor5+Xfgq0qByYUpiXmwuoredB2aYH4gWWda0B7SeNENpEJHC1ghi+pS4
+    AJpIAwWvKPBi+8YEht5EriEqpFfMlhEdkBNpx0HUhwypx5T4IB1MBg/Ws2sn
+    wV3MSQOkzI8fUd48Aw3dOZto71x85hHtHijYv18Gf/3GqCdDCXHNoICBobSo
+    IqBqJLyCoH8JPrLgdh88CKCFD0CGmAiGYPgffwceZh6FC2ohIIklnkhehTNY
+    4CIHHGzgwYw01ujBBhvAqKOLLq5AAk9kuSPkkKO40NB+h1gnypJIIvkBf09a
+    N5QIRz5p5ZJXJpmlIVhOGQA2TmIJZZhKKmmll2BqyWSXWUrZpQtpatlmk1c2
+    KaWRHeTZEJF8SqLDn/hhsOeQgBbqAh6DGqronxeARUIIACH5BAUeAAAALAUA
+    LgAFAAUAAAUM4CeKz/OV5YmqaRkCACH5BAUeAAEALAUALgAKAAUAAAUUICCK
+    z/OdJVCaa7p+7aOWcDvTZwgAIfkEBR4AAQAsCwAuAAkABQAABRPgA4zP95zA
+    eZqoWqqpyqLkZ38hACH5BAUKAAEALAcALgANAA4AAAU7ICA+jwiUJEqeKau+
+    r+vGaTmac63v/GP9HM7GQyx+jsgkkoRUHJ3Qx0cK/VQVTKtWwbVKn9suNunc
+    WkMAIfkEBQoAAAAsBwA3AAcABQAABRGgIHzk842j+Yjlt5KuO8JmCAAh+QQF
+    CgAAACwLADcABwAFAAAFEeAnfN9TjqP5oOWziq05lmUIACH5BAUKAAAALA8A
+    NwAHAAUAAAUPoPCJTymS3yiQj4qOcPmEACH5BAUKAAAALBMANwAHAAUAAAUR
+    oCB+z/MJX2o+I2miKimiawgAIfkEBQoAAAAsFwA3AAcABQAABRGgIHzfY47j
+    Q4qk+aHl+pZmCAAh+QQFCgAAACwbADcABwAFAAAFEaAgfs/zCV9qPiNJouo7
+    ll8IACH5BAUKAAAALB8ANwADAAUAAAUIoCB8o0iWZggAOw==
+EOD
+
+l1.text('* Slow Animation *').start(300)
+l2.text('* Fast Animation *').start(80)
+l3.text('This is a longer scrolling text in a widget that will not show the whole message at once. ').start(150)
+
+limg.destroy_image = true
+limg.image(TkPhotoImage.new(:format=>'GIF', :data=>tclPowerdData)).start(100)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/aniwave.rb b/ruby_1_8_6/ext/tk/sample/demos-en/aniwave.rb
new file mode 100644
index 0000000000..ebe27b875f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/aniwave.rb
@@ -0,0 +1,115 @@
+#
+# animated wave demo (called by 'widget')
+#
+# based on Tcl/Tk8.5a2 widget demos
+
+# destroy toplevel widget for this demo script
+if defined?($aniwave_demo) && $aniwave_demo
+  $aniwave_demo.destroy 
+  $aniwave_demo = nil
+end
+
+# create toplevel widget
+$aniwave_demo = TkToplevel.new {|w|
+  title("Animated Wave Demonstration")
+  iconname("aniwave")
+  positionWindow(w)
+}
+
+# create label
+msg = TkLabel.new($aniwave_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text 'This demonstration contains a canvas widget with a line item inside it. The animation routines work by adjusting the coordinates list of the line.'
+}
+msg.pack('side'=>'top')
+
+# create frame
+TkFrame.new($aniwave_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $aniwave_demo
+      $aniwave_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'See Code'
+    command proc{showCode 'aniwave'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# animated wave
+class AnimatedWaveDemo
+  def initialize(frame, dir=:left)
+    @direction = dir
+
+    # create canvas widget
+    @c = TkCanvas.new(frame, :width=>300, :height=>200, 
+                      :background=>'black')
+    @c.pack(:padx=>10, :pady=>10, :expand=>true)
+
+    # Creates a coordinates list of a wave. 
+    @waveCoords = []
+    @backupCoords = []
+    n = 0
+    (-10..300).step(5){|n| @waveCoords << [n, 100]; @backupCoords << [n, 100] }
+    @waveCoords << [n, 0]; @backupCoords << [n, 0]
+    @waveCoords << [n+5, 200]; @backupCoords << [n+5, 200]
+    @coordsLen = @waveCoords.length
+
+    # Create a smoothed line and arrange for its coordinates to be the
+    # contents of the variable waveCoords.
+    @line = TkcLine.new(@c, @waveCoords, 
+                        :width=>1, :fill=>'green', :smooth=>true)
+
+    # Main animation "loop". 
+    # Theoretically 100 frames-per-second (==10ms between frames)
+    @timer = TkTimer.new(10){ basicMotion; reverser }
+
+    # Arrange for the animation loop to stop when the canvas is deleted
+    @c.bindtags_unshift(TkBindTag.new('Destroy'){ @timer.stop })
+  end
+
+  # Basic motion handler. Given what direction the wave is travelling
+  # in, it advances the y coordinates in the coordinate-list one step in
+  # that direction.
+  def basicMotion
+    @backupCoords, @waveCoords = @waveCoords, @backupCoords
+    (0...@coordsLen).each{|idx|
+      if @direction == :left
+        @waveCoords[idx][1] = @backupCoords[(idx+1 == @coordsLen)? 0: idx+1][1]
+      else
+        @waveCoords[idx][1] = @backupCoords[(idx == 0)? -1: idx-1][1]
+      end
+    }
+    @line.coords(@waveCoords)
+  end
+
+  # Oscillation handler. This detects whether to reverse the direction
+  # of the wave by checking to see if the peak of the wave has moved off
+  # the screen (whose size we know already.)
+  def reverser
+    if @waveCoords[0][1] < 10
+      @direction = :right
+    elsif @waveCoords[-1][1] < 10
+      @direction = :left
+    end
+  end
+
+  # animation control
+  def move
+    @timer.start
+  end
+
+  def stop
+    @timer.stop
+  end
+end
+
+# Start the animation processing
+AnimatedWaveDemo.new($aniwave_demo, :left).move
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/arrow.rb b/ruby_1_8_6/ext/tk/sample/demos-en/arrow.rb
new file mode 100644
index 0000000000..b62e1966eb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/arrow.rb
@@ -0,0 +1,239 @@
+# arrow.rb
+#
+# This demonstration script creates a canvas widget that displays a
+# large line with an arrowhead whose shape can be edited interactively.
+#
+# arrowhead widget demo (called by 'widget')
+#
+
+# arrowSetup --
+# This method regenerates all the text and graphics in the canvas
+# window.  It's called when the canvas is initially created, and also
+# whenever any of the parameters of the arrow head are changed
+# interactively.
+#
+# Arguments:
+# c -           Name of the canvas widget.
+
+def arrowSetup(c)
+  v = $demo_arrowInfo
+
+  # Remember the current box, if there is one.
+  tags = c.gettags('current')
+  if tags != []
+    cur = tags.find{|t| t.kind_of?(String) && t =~ /^box[1-3]$/ }
+  else
+    cur = nil
+  end
+
+  # Create the arrow and outline.
+  c.delete('all')
+  TkcLine.new(c, v.x1, v.y, v.x2, v.y, 
+              { 'width'=>10 * v.width, 
+                'arrowshape'=>[10*v.a, 10*v.b, 10*v.c], 
+                'arrow'=>'last' 
+              }.update(v.bigLineStyle) )
+  xtip = v.x2 - 10*v.b
+  deltaY = 10*v.c + 5*v.width
+  TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY, 
+              v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y, 
+              'width'=>2, 'capstyle'=>'round', 'joinstyle'=>'round')
+
+  # Create the boxes for reshaping the line and arrowhead.
+  TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5, 
+                   {'tags'=>['box1', $arrowTag_box]}.update(v.boxStyle) )
+  TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5, 
+                   {'tags'=>['box2', $arrowTag_box]}.update(v.boxStyle) )
+  TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5, 
+                   {'tags'=>['box3', $arrowTag_box]}.update(v.boxStyle) )
+  c.itemconfigure cur, v.activeStyle if cur
+
+  # Create three arrows in actual size with the same parameters
+  TkcLine.new(c, v.x2+50, 0, v.x2+50, 1000, 'width'=>2)
+  tmp = v.x2+100
+  TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width, 
+              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
+  TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width, 
+              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
+  TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width, 
+              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
+
+  # Create a bunch of other arrows and text items showing the 
+  # current dimensions.
+  tmp = v.x2+10
+  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY, 
+              'arrow'=>'both', 'arrowshape'=>v.smallTips)
+  TkcText.new(c, v.x2+15, v.y-deltaY+5*v.c, 'text'=>v.c, 'anchor'=>'w')
+  tmp = v.x1-10
+  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width, 
+              'arrow'=>'both', 'arrowshape'=>v.smallTips)
+  TkcText.new(c, v.x1-15, v.y, 'text'=>v.width, 'anchor'=>'e')
+  tmp = v.y+5*v.width+10*v.c+10
+  TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp, 
+              'arrow'=>'both', 'arrowshape'=>v.smallTips)
+  TkcText.new(c, v.x2-5*v.a, tmp+5, 'text'=>v.a, 'anchor'=>'n')
+  tmp = tmp+25
+  TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp, 
+              'arrow'=>'both', 'arrowshape'=>v.smallTips)
+  TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
+
+  TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w', 
+              'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+  TkcText.new(c, v.x1, 330, 
+              'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]", 'anchor'=>'w', 
+              'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+
+  v.count += 1
+end
+
+# toplevel widget
+if defined?($arrow_demo) && $arrow_demo
+  $arrow_demo.destroy 
+  $arrow_demo = nil
+end
+
+# demo toplevel widget
+$arrow_demo = TkToplevel.new {|w|
+  title("Arrowhead Editor Demonstration")
+  iconname("arrow")
+  positionWindow(w)
+}
+
+# label
+TkLabel.new($arrow_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+            'text'=>"This widget allows you to experiment with different widths and arrowhead shapes for lines in canvases.  To change the line width or the shape of the arrowhead, drag any of the three boxes attached to the oversized arrow.  The arrows on the right give examples at normal scale.  The text at the bottom shows the configuration options as you'd enter them for a canvas line item."){
+  pack('side'=>'top')
+}
+
+# frame
+$arrow_buttons = TkFrame.new($arrow_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $arrow_demo
+      $arrow_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'arrow'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# canvas 
+$arrow_canvas = TkCanvas.new($arrow_demo, 'width'=>500, 'height'=>350, 
+                             'relief'=>'sunken', 'borderwidth'=>2)
+$arrow_canvas.pack('expand'=>'yes', 'fill'=>'both')
+
+# 
+unless Struct.const_defined?("ArrowInfo")
+  $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc, 
+                               :x1, :x2, :y, :smallTips, :count, 
+                               :bigLineStyle, :boxStyle, :activeStyle).new
+end
+$demo_arrowInfo.a = 8
+$demo_arrowInfo.b = 10
+$demo_arrowInfo.c = 3
+$demo_arrowInfo.width = 2
+$demo_arrowInfo.motionProc = proc{}
+$demo_arrowInfo.x1 = 40
+$demo_arrowInfo.x2 = 350
+$demo_arrowInfo.y = 150
+$demo_arrowInfo.smallTips = [5, 5, 2]
+$demo_arrowInfo.count = 0
+if TkWinfo.depth($arrow_canvas) > 1
+  $demo_arrowInfo.bigLineStyle = {'fill'=>'SkyBlue1'}
+  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
+  $demo_arrowInfo.activeStyle = {'fill'=>'red', 'outline'=>'black', 'width'=>1}
+else
+  $demo_arrowInfo.bigLineStyle = {'fill'=>'black', 
+    'stipple'=>'@'+[$demo_dir,'..','images','grey.25'].join(File::Separator)}
+  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
+  $demo_arrowInfo.activeStyle = {'fill'=>'black','outline'=>'black','width'=>1}
+end
+$arrowTag_box = TkcTag.new($arrow_canvas)
+arrowSetup $arrow_canvas
+$arrowTag_box.bind('Enter', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.activeStyle)})
+$arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.boxStyle)})
+$arrowTag_box.bind('B1-Enter', proc{})
+$arrowTag_box.bind('B1-Leave', proc{})
+$arrow_canvas.itembind('box1', '1', 
+                       proc{$demo_arrowInfo.motionProc \
+                         = proc{|x,y| arrowMove1 $arrow_canvas, x, y}})
+$arrow_canvas.itembind('box2', '1', 
+                       proc{$demo_arrowInfo.motionProc \
+                         = proc{|x,y| arrowMove2 $arrow_canvas, x, y}})
+$arrow_canvas.itembind('box3', '1', 
+                       proc{$demo_arrowInfo.motionProc \
+                         = proc{|x,y| arrowMove3 $arrow_canvas, x, y}})
+$arrowTag_box.bind('B1-Motion', 
+                  proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
+$arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
+
+# arrowMove1 --
+# This method is called for each mouse motion event on box1 (the
+# one at the vertex of the arrow).  It updates the controlling parameters
+# for the line and arrowhead.
+#
+# Arguments:
+# c -           The name of the canvas window.
+# x, y -        The coordinates of the mouse.
+
+def arrowMove1(c,x,y)
+  v = $demo_arrowInfo
+  newA = (v.x2+5-c.canvasx(x).round)/10
+  newA = 0 if newA < 0
+  newA = 25 if newA > 25
+  if newA != v.a
+    c.move('box1', 10*(v.a-newA), 0)
+    v.a = newA
+  end
+end
+
+# arrowMove2 --
+# This method is called for each mouse motion event on box2 (the
+# one at the trailing tip of the arrowhead).  It updates the controlling
+# parameters for the line and arrowhead.
+#
+# Arguments:
+# c -           The name of the canvas window.
+# x, y -        The coordinates of the mouse.
+
+def arrowMove2(c,x,y)
+  v = $demo_arrowInfo
+  newB = (v.x2+5-c.canvasx(x).round)/10
+  newB = 0 if newB < 0
+  newB = 25 if newB > 25
+  newC = (v.y+5-c.canvasy(y).round-5*v.width)/10
+  newC = 0 if newC < 0
+  newC = 20 if newC > 20
+  if newB != v.b || newC != v.c
+    c.move('box2', 10*(v.b-newB), 10*(v.c-newC))
+    v.b = newB
+    v.c = newC
+  end
+end
+
+# arrowMove3 --
+# This method is called for each mouse motion event on box3 (the
+# one that controls the thickness of the line).  It updates the
+# controlling parameters for the line and arrowhead.
+#
+# Arguments:
+# c -           The name of the canvas window.
+# x, y -        The coordinates of the mouse.
+
+def arrowMove3(c,x,y)
+  v = $demo_arrowInfo
+  newWidth = (v.y+2-c.canvasy(y).round)/5
+  newWidth = 0 if newWidth < 0
+  newWidth = 20 if newWidth > 20
+  if newWidth != v.width
+    c.move('box3', 0, 5*(v.width-newWidth))
+    v.width = newWidth
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/bind.rb b/ruby_1_8_6/ext/tk/sample/demos-en/bind.rb
new file mode 100644
index 0000000000..aabe7f0849
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/bind.rb
@@ -0,0 +1,128 @@
+# bind.rb
+#
+# This demonstration script creates a text widget with bindings set
+# up for hypertext-like effects.
+#
+# text (tag bindings) widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($bind_demo) && $bind_demo
+  $bind_demo.destroy 
+  $bind_demo = nil
+end
+
+# demo toplevel widget
+$bind_demo = TkToplevel.new {|w|
+  title("Text Demonstration - Tag Bindings")
+  iconname("bind")
+  positionWindow(w)
+}
+
+# frame
+TkFrame.new($bind_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $bind_demo
+      $bind_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'bind'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# bind 
+def tag_binding_for_bind_demo(tag, enter_style, leave_style)
+  tag.bind('Any-Enter', proc{tag.configure enter_style})
+  tag.bind('Any-Leave', proc{tag.configure leave_style})
+end
+
+# text 
+TkText.new($bind_demo){|t|
+  # 
+  setgrid 'true'
+  width  60
+  height 24
+  font $font
+  wrap 'word'
+  TkScrollbar.new($bind_demo) {|s|
+    pack('side'=>'right', 'fill'=>'y')
+    command proc{|*args| t.yview(*args)}
+    t.yscrollcommand proc{|first,last| s.set first,last}
+  }
+  pack('expand'=>'yes', 'fill'=>'both')
+
+  # 
+  if TkWinfo.depth($root).to_i > 1
+    tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised', 
+                     'borderwidth'=>1}
+    tagstyle_normal = {'background'=>'', 'relief'=>'flat'}
+  else
+    tagstyle_bold = {'foreground'=>'white', 'background'=>'black'}
+    tagstyle_normal = {'foreground'=>'', 'background'=>''}
+  end
+
+  # insert text
+  insert 'insert', "The same tag mechanism that controls display styles in text widgets can also be used to associate Tcl commands with regions of text, so that mouse or keyboard actions on the text cause particular Tcl commands to be invoked.  For example, in the text below the descriptions of the canvas demonstrations have been tagged.  When you move the mouse over a demo description the description lights up, and when you press button 1 over a description then that particular demonstration is invoked.
+
+"
+  insert('end', '1. Samples of all the different types of items that can be created in canvas widgets.', (d1 = TkTextTag.new(t)) )
+  insert('end', "\n\n")
+  insert('end', '2. A simple two-dimensional plot that allows you to adjust the positions of the data points.', (d2 = TkTextTag.new(t)) )
+  insert('end', "\n\n")
+  insert('end', '3. Anchoring and justification modes for text items.', 
+         (d3 = TkTextTag.new(t)) )
+  insert('end', "\n\n")
+  insert('end', '4. An editor for arrow-head shapes for line items.', 
+         (d4 = TkTextTag.new(t)) )
+  insert('end', "\n\n")
+  insert('end', '5. A ruler with facilities for editing tab stops.', 
+         (d5 = TkTextTag.new(t)) )
+  insert('end', "\n\n")
+  insert('end', 
+         '6. A grid that demonstrates how canvases can be scrolled.', 
+         (d6 = TkTextTag.new(t)) )
+
+  # binding
+  [d1, d2, d3, d4, d5, d6].each{|tag|
+    tag_binding_for_bind_demo(tag, tagstyle_bold, tagstyle_normal)
+  }
+  d1.bind('1', 
+          proc{
+            eval(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 
+                 _null_binding)
+          })
+  d2.bind('1', 
+          proc{
+            eval(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 
+                 _null_binding)
+          })
+  d3.bind('1', 
+          proc{
+            eval(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 
+                 _null_binding)
+          })
+  d4.bind('1', 
+          proc{
+            eval(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 
+                 _null_binding)
+          })
+  d5.bind('1', 
+          proc{
+            eval(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 
+                 _null_binding)
+          })
+  d6.bind('1', 
+          proc{
+            eval(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 
+                 _null_binding)
+          })
+
+  TkTextMarkInsert.new(t, '0.0')
+  configure('state','disabled')
+}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/bitmap.rb b/ruby_1_8_6/ext/tk/sample/demos-en/bitmap.rb
new file mode 100644
index 0000000000..7fd551c7a5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/bitmap.rb
@@ -0,0 +1,73 @@
+# bitmap.rb
+#
+# This demonstration script creates a toplevel window that displays
+# all of Tk's built-in bitmaps.#
+# bitmap widget demo (called by 'widget')
+#
+
+# bitmapRow --
+# Create a row of bitmap items in a window.
+#
+# Arguments:
+# w -           The parent window that is to contain the row.
+# args -        The names of one or more bitmaps, which will be displayed
+#               in a new row across the bottom of w along with their
+#               names.
+
+def bitmapRow(w,*args)
+  TkFrame.new(w){|row|
+    pack('side'=>'top', 'fill'=>'both')
+    for bitmap in args 
+      TkFrame.new(row){|base|
+        pack('side'=>'left', 'fill'=>'both', 'pady'=>'.25c', 'padx'=>'.25c')
+        TkLabel.new(base, 'text'=>bitmap, 'width'=>9).pack('side'=>'bottom')
+        TkLabel.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
+      }
+    end
+  }
+end
+
+# toplevel widget
+if defined?($bitmap_demo) && $bitmap_demo
+  $bitmap_demo.destroy 
+  $bitmap_demo = nil
+end
+
+# demo toplevel widget
+$bitmap_demo = TkToplevel.new {|w|
+  title("Bitmap Demonstration")
+  iconname("bitmap")
+  positionWindow(w)
+}
+
+# label
+TkLabel.new($bitmap_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left', 
+            'text'=>"This window displays all of Tk's built-in bitmaps, along with the names you can use for them in Tcl scripts."){
+  pack('side'=>'top')
+}
+
+# frame
+$bitmap_buttons = TkFrame.new($bitmap_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $bitmap_demo
+      $bitmap_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'bitmap'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 
+TkFrame.new($bitmap_demo){|f|
+  bitmapRow(f,'error','gray25','gray50','hourglass')
+  bitmapRow(f,'info','question','questhead','warning')
+  pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
+}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/browse1 b/ruby_1_8_6/ext/tk/sample/demos-en/browse1
new file mode 100644
index 0000000000..03e251035a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/browse1
@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+
+# browse --
+# This script generates a directory browser, which lists the working 
+# directory and allow you to open files or subdirectories by 
+# double-clicking. 
+
+require 'tk'
+
+# Create a scrollbar on the right side of the main window and a listbox 
+# on the left side.
+
+listbox = TkListbox.new(nil, 'relief'=>'sunken', 
+			'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
+  TkScrollbar.new(nil, 'command'=>proc{|*args| l.yview *args}) {|s|
+    pack('side'=>'right', 'fill'=>'y')
+    l.yscrollcommand(proc{|first,last| s.set(first,last)})
+  }
+
+  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
+}
+
+root = TkRoot.new
+root.minsize(1,1)
+
+# The procedure below is invoked to open a browser on a given file;  if the 
+# file is a directory then another instance of this program is invoked; if 
+# the file is a regular file then the Mx editor is invoked to display 
+# the file. 
+
+def browse (dir, file)
+  file = dir + File::Separator + file if dir != '.'
+  type = File.ftype(file)
+  if type == 'directory'
+    system($0 + ' ' + file + ' &')
+  else
+    if type == 'file'
+      if ENV['EDITOR']
+	system(ENV['EDITOR'] + ' ' + file + ' &')
+      else
+	system('xedit ' + file + ' &')
+      end
+    else
+      STDOUT.print "\"#{file}\" isn't a directory or regular file"
+    end
+  end
+end
+
+# Fill the listbox with a list of all the files in the directory (run 
+# the "ls" command to get that information).
+
+dir = ARGV[0] ?  ARGV[0] : '.'
+open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
+  listbox.insert('end', fname.chomp)
+}
+
+# Set up bindings for the browser.
+
+Tk.bind_all('Control-c', proc{root.destroy})
+listbox.bind('Double-Button-1', 
+	     proc{TkSelection.get.each{|f| browse dir, f}})
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/browse2 b/ruby_1_8_6/ext/tk/sample/demos-en/browse2
new file mode 100644
index 0000000000..edad04dbcb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/browse2
@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+
+# browse --
+# This script generates a directory browser, which lists the working 
+# directory and allow you to open files or subdirectories by 
+# double-clicking. 
+
+require 'tk'
+
+class Browse
+  BROWSE_WIN_COUNTER = TkVariable.new(0)
+
+  def initialize(dir)
+    BROWSE_WIN_COUNTER.value = BROWSE_WIN_COUNTER.to_i + 1
+
+    # create base frame
+    base = TkToplevel.new {
+      minsize(1,1)
+      title('Browse : ' + dir)
+    }
+
+    # Create a scrollbar on the right side of the main window and a listbox 
+    # on the left side.
+    list = TkListbox.new(base, 'relief'=>'sunken', 
+			 'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
+      TkScrollbar.new(base, 'command'=>proc{|*args| l.yview *args}) {|s|
+	pack('side'=>'right', 'fill'=>'y')
+	l.yscrollcommand(proc{|first,last| s.set(first,last)})
+      }
+
+      pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
+
+      # Fill the listbox with a list of all the files in the directory (run 
+      # the "ls" command to get that information).
+      open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
+	l.insert('end', fname.chomp)
+      }
+
+    }
+
+    # Set up bindings for the browser.
+    base.bind('Destroy', proc{
+		Browse::BROWSE_WIN_COUNTER.value = \
+		                Browse::BROWSE_WIN_COUNTER.to_i - 1
+	      })
+    base.bind('Control-c', proc{base.destroy})
+    list.bind('Double-Button-1', 
+	 proc{TkSelection.get.each{|f| self.browse dir, f}})
+  end
+
+  # The method below is invoked to open a browser on a given file;  if the 
+  # file is a directory then another instance of this program is invoked; if 
+  # the file is a regular file then the Mx editor is invoked to display 
+  # the file. 
+  def browse (dir, file)
+    file = dir + File::Separator + file if dir != '.'
+    type = File.ftype(file)
+    if type == 'directory'
+      Browse.new(file)
+    else
+      if type == 'file'
+	if ENV['EDITOR']
+	  system(ENV['EDITOR'] + ' ' + file + ' &')
+	else
+	  system('xedit ' + file + ' &')
+	end
+      else
+	STDOUT.print "\"#{file}\" isn't a directory or regular file"
+      end
+    end
+  end
+
+end
+
+Browse.new(ARGV[0] ? ARGV[0] : '.')
+
+TkRoot.new {
+  withdraw
+  Browse::BROWSE_WIN_COUNTER.trace('w', proc{exit if Browse::BROWSE_WIN_COUNTER.to_i == 0})
+}
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/button.rb b/ruby_1_8_6/ext/tk/sample/demos-en/button.rb
new file mode 100644
index 0000000000..6614d99c92
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/button.rb
@@ -0,0 +1,84 @@
+# button.rb
+#
+# This demonstration script creates a toplevel window containing
+# several button widgets.
+#
+# button widget demo (called by 'widget')
+#
+
+# toplevel widget 
+if defined?($button_demo) && $button_demo
+  $button_demo.destroy 
+  $button_demo = nil
+end
+
+# demo toplevel widget 
+$button_demo = TkToplevel.new {|w|
+  title("Button Demonstration")
+  iconname("button")
+  positionWindow(w)
+}
+
+# label 
+msg = TkLabel.new($button_demo) {
+  font $kanji_font
+  wraplength '4i'
+  justify 'left'
+  text "If you click on any of the four buttons below, the background of the button area will change to the color indicated in the button.  You can press Tab to move among the buttons, then press Space to invoke the current button."
+}
+msg.pack('side'=>'top')
+
+# frame 
+$button_buttons = TkFrame.new($button_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $button_demo
+      $button_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'See Code'
+    command proc{showCode 'button'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# button
+TkButton.new($button_demo){
+  text "Peach Puff"
+  width 10
+  command proc{
+    $button_demo.configure('bg','PeachPuff1')
+    $button_buttons.configure('bg','PeachPuff1')
+  }
+}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
+
+TkButton.new($button_demo){
+  text "Light Blue"
+  width 10
+  command proc{
+    $button_demo.configure('bg','LightBlue1')
+    $button_buttons.configure('bg','LightBlue1')
+  }
+}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
+
+TkButton.new($button_demo){
+  text "Sea Green"
+  width 10
+  command proc{
+    $button_demo.configure('bg','SeaGreen2')
+    $button_buttons.configure('bg','SeaGreen2')
+  }
+}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
+
+TkButton.new($button_demo){
+  text "Yellow"
+  width 10
+  command proc{
+    $button_demo.configure('bg','Yellow1')
+    $button_buttons.configure('bg','Yellow1')
+  }
+}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/check.rb b/ruby_1_8_6/ext/tk/sample/demos-en/check.rb
new file mode 100644
index 0000000000..971a8fea73
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/check.rb
@@ -0,0 +1,70 @@
+# check.rb
+#
+# This demonstration script creates a toplevel window containing
+# several checkbuttons.
+#
+# checkbutton widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($check_demo) && $check_demo
+  $check_demo.destroy 
+  $check_demo = nil
+end
+
+# demo toplevel widget
+$check_demo = TkToplevel.new {|w|
+  title("Checkbutton Demonstration")
+  iconname("check")
+  positionWindow(w)
+}
+
+# label 
+msg = TkLabel.new($check_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "Three checkbuttons are displayed below.  If you click on a button, it will toggle the button's selection state and set a Tcl variable to a value indicating the state of the checkbutton.  Click the \"See Variables\" button to see the current values of the variables."
+}
+msg.pack('side'=>'top')
+
+# 
+wipers = TkVariable.new(0)
+brakes = TkVariable.new(0)
+sober  = TkVariable.new(0)
+
+# frame 
+TkFrame.new($check_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $check_demo
+      $check_demo = nil
+      $showVarsWin[tmppath.path] = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'check'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+
+  TkButton.new(frame) {
+    text 'See Variables'
+    command proc{
+      showVars($check_demo, 
+               ['wipers', wipers], ['brakes', brakes], ['sober', sober])
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+
+# checkbutton
+[ TkCheckButton.new($check_demo, 'text'=>'Wipers  OK', 'variable'=>wipers),
+  TkCheckButton.new($check_demo, 'text'=>'Brakes  OK', 'variable'=>brakes),
+  TkCheckButton.new($check_demo, 'text'=>'Driver Sober', 'variable'=>sober)
+].each{|w| w.relief('flat'); w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/check2.rb b/ruby_1_8_6/ext/tk/sample/demos-en/check2.rb
new file mode 100644
index 0000000000..97d61fba0c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/check2.rb
@@ -0,0 +1,107 @@
+#
+# checkbutton widget demo2 (called by 'widget')
+#
+
+# delete old toplevel widget
+if defined?($check2_demo) && $check2_demo
+  $check2_demo.destroy 
+  $check2_demo = nil
+end
+
+# create demo toplevel widget
+$check2_demo = TkToplevel.new {|w|
+  title("Checkbutton Demonstration 2")
+  iconname("check2")
+  positionWindow(w)
+}
+
+# label
+msg = TkLabel.new($check2_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "Four checkbuttons are displayed below.  If you click on a button, it will toggle the button's selection state and set a Tcl variable to a value indicating the state of the checkbutton.  The first button also follows the state of the other three.  If only some of the three are checked, the first button will display the tri-state mode. Click the \"See Variables\" button to see the current values of the variables."
+}
+msg.pack('side'=>'top')
+
+# variable
+safety = TkVariable.new(0)
+wipers = TkVariable.new(0)
+brakes = TkVariable.new(0)
+sober  = TkVariable.new(0)
+
+# frame
+TkFrame.new($check2_demo) {|frame|
+  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2), 
+         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x', 
+         TkButton.new(frame, :text=>'See Variables', 
+                      :image=>$image['view'], :compound=>:left, 
+                      :command=>proc{
+                        showVars($check2_demo, 
+                                 ['safety', safety], ['wipers', wipers], 
+                                 ['brakes', brakes], ['sober', sober])
+                      }), 
+         TkButton.new(frame, :text=>'See Code', 
+                      :image=>$image['view'], :compound=>:left, 
+                      :command=>proc{showCode 'check2'}), 
+         TkButton.new(frame, :text=>'Dismiss', 
+                      :image=>$image['delete'], :compound=>:left, 
+                      :command=>proc{
+                        tmppath = $check2_demo
+                        $check2_demo = nil
+                        $showVarsWin[tmppath.path] = nil
+                        tmppath.destroy
+                      }), 
+         :padx=>4, :pady=>4)
+  frame.grid_columnconfigure(0, :weight=>1)
+}.pack('side'=>'bottom', 'fill'=>'x')
+
+
+# checkbutton
+TkCheckButton.new($check2_demo, :text=>'Safety Check', :variable=>safety, 
+                  :relief=>:flat, :onvalue=>'all', :offvalue=>'none', 
+                  :tristatevalue=>'partial'){
+  pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
+}
+
+[ TkCheckButton.new($check2_demo, 'text'=>'Wipers OK', 'variable'=>wipers),
+  TkCheckButton.new($check2_demo, 'text'=>'Brakes OK', 'variable'=>brakes),
+  TkCheckButton.new($check2_demo, 'text'=>'Driver Sober', 'variable'=>sober)
+].each{|w| 
+  w.relief('flat')
+  w.pack('side'=>'top', 'padx'=>15, 'pady'=>2, 'anchor'=>'w')
+}
+
+# tristate check
+in_check = false
+tristate_check = proc{|n1,n2,op|
+  unless in_check
+    in_check = true
+    begin
+      if n1 == safety
+        if safety == 'none'
+          wipers.value = 0
+          brakes.value = 0
+          sober.value  = 0
+        elsif safety == 'all'
+          wipers.value = 1
+          brakes.value = 1
+          sober.value  = 1
+        end
+      else
+        if wipers == 1 && brakes == 1 && sober == 1
+          safety.value = 'all'
+        elsif wipers == 1 || brakes == 1 || sober == 1
+          safety.value = 'partial'
+        else
+          safety.value = 'none'
+        end
+      end
+    ensure
+      in_check = false
+    end
+  end
+}
+
+[wipers, brakes, sober, safety].each{|v| v.trace('w', tristate_check)}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/clrpick.rb b/ruby_1_8_6/ext/tk/sample/demos-en/clrpick.rb
new file mode 100644
index 0000000000..9486fde314
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/clrpick.rb
@@ -0,0 +1,77 @@
+# clrpick.rb
+#
+# This demonstration script prompts the user to select a color.
+#
+# widget demo prompts the user to select a color (called by 'widget')
+#
+
+# toplevel widget
+if defined?($clrpick_demo) && $clrpick_demo
+  $clrpick_demo.destroy 
+  $clrpick_demo = nil
+end
+
+# demo toplevel widget
+$clrpick_demo = TkToplevel.new {|w|
+  title("Color Selection Dialogs")
+  iconname("colors")
+  positionWindow(w)
+}
+
+# label
+TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+            'text'=>"Press the buttons below to choose the foreground and background colors for the widgets in this window.").pack('side'=>'top')
+
+# frame
+TkFrame.new($clrpick_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $clrpick_demo
+      $clrpick_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'clrpick'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# button 
+TkButton.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
+  command(proc{setColor $clrpick_demo, b, 'background', 
+              ['background', 'highlightbackground']})
+  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
+}
+
+TkButton.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
+  command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
+  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
+}
+
+def setColor(w,button,name,options)
+  w.grab
+  initialColor = button[name]
+  color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w, 
+                         'initialcolor'=>initialColor)
+  if color != ""
+    setColor_helper(w,options,color)
+  end
+
+  w.grab('release')
+end
+
+def setColor_helper(w, options, color)
+  options.each{|opt|
+    begin
+      w[opt] = color
+    rescue
+    end
+  }
+  TkWinfo.children(w).each{|child|
+    setColor_helper child, options, color
+  }
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/colors.rb b/ruby_1_8_6/ext/tk/sample/demos-en/colors.rb
new file mode 100644
index 0000000000..66fb0afa36
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/colors.rb
@@ -0,0 +1,148 @@
+# colors.rb
+#
+# This demonstration script creates a listbox widget that displays
+# many of the colors from the X color database.  You can click on
+# a color to change the application's palette.
+#
+# listbox widget demo 'colors' (called by 'widget')
+#
+
+# toplevel widget
+if defined?($colors_demo) && $colors_demo
+  $colors_demo.destroy 
+  $colors_demo = nil
+end
+
+# demo toplevel widget
+$colors_demo = TkToplevel.new {|w|
+  title("Listbox Demonstration (colors)")
+  iconname("colors")
+  positionWindow(w)
+}
+
+# label
+msg = TkLabel.new($colors_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "A listbox containing several color names is displayed below, along with a scrollbar.  You can scan the list either using the scrollbar or by dragging in the listbox window with button 2 pressed.  If you double-click button 1 on a color, then the application's color palette will be set to match that color"
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($colors_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $colors_demo
+      $colors_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'colors'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame
+colors_lbox = nil
+TkFrame.new($colors_demo, 'borderwidth'=>10) {|w|
+  s = TkScrollbar.new(w)
+  colors_lbox = TkListbox.new(w) {
+    setgrid 1
+    width  10
+    height 12
+    yscrollcommand proc{|first,last| s.set first,last}
+  }
+  s.command(proc{|*args| colors_lbox.yview(*args)})
+  s.pack('side'=>'right', 'fill'=>'y')
+  colors_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
+}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
+
+colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
+
+ins_data = [
+  'gray60','gray70','gray80','gray85','gray90','gray95',
+  'snow1','snow2','snow3','snow4','seashell1','seashell2',
+  'seashell3','seashell4','AntiqueWhite1','AntiqueWhite2',
+  'AntiqueWhite3','AntiqueWhite4','bisque1','bisque2',
+  'bisque3','bisque4','PeachPuff1','PeachPuff2',
+  'PeachPuff3','PeachPuff4','NavajoWhite1','NavajoWhite2',
+  'NavajoWhite3','NavajoWhite4','LemonChiffon1',
+  'LemonChiffon2','LemonChiffon3','LemonChiffon4',
+  'cornsilk1','cornsilk2','cornsilk3','cornsilk4',
+  'ivory1','ivory2','ivory3','ivory4','honeydew1',
+  'honeydew2','honeydew3','honeydew4','LavenderBlush1',
+  'LavenderBlush2','LavenderBlush3','LavenderBlush4',
+  'MistyRose1','MistyRose2','MistyRose3','MistyRose4',
+  'azure1','azure2','azure3','azure4','SlateBlue1',
+  'SlateBlue2','SlateBlue3','SlateBlue4','RoyalBlue1',
+  'RoyalBlue2','RoyalBlue3','RoyalBlue4','blue1','blue2',
+  'blue3','blue4','DodgerBlue1','DodgerBlue2',
+  'DodgerBlue3','DodgerBlue4','SteelBlue1','SteelBlue2',
+  'SteelBlue3','SteelBlue4','DeepSkyBlue1','DeepSkyBlue2',
+  'DeepSkyBlue3','DeepSkyBlue4','SkyBlue1','SkyBlue2',
+  'SkyBlue3','SkyBlue4','LightSkyBlue1','LightSkyBlue2',
+  'LightSkyBlue3','LightSkyBlue4','SlateGray1',
+  'SlateGray2','SlateGray3','SlateGray4',
+  'LightSteelBlue1','LightSteelBlue2','LightSteelBlue3',
+  'LightSteelBlue4','LightBlue1','LightBlue2',
+  'LightBlue3','LightBlue4','LightCyan1','LightCyan2',
+  'LightCyan3','LightCyan4','PaleTurquoise1',
+  'PaleTurquoise2','PaleTurquoise3','PaleTurquoise4',
+  'CadetBlue1','CadetBlue2','CadetBlue3','CadetBlue4',
+  'turquoise1','turquoise2','turquoise3','turquoise4',
+  'cyan1','cyan2','cyan3','cyan4','DarkSlateGray1',
+  'DarkSlateGray2','DarkSlateGray3','DarkSlateGray4',
+  'aquamarine1','aquamarine2','aquamarine3','aquamarine4',
+  'DarkSeaGreen1','DarkSeaGreen2','DarkSeaGreen3',
+  'DarkSeaGreen4','SeaGreen1','SeaGreen2','SeaGreen3',
+  'SeaGreen4','PaleGreen1','PaleGreen2','PaleGreen3',
+  'PaleGreen4','SpringGreen1','SpringGreen2',
+  'SpringGreen3','SpringGreen4','green1','green2',
+  'green3','green4','chartreuse1','chartreuse2',
+  'chartreuse3','chartreuse4','OliveDrab1','OliveDrab2',
+  'OliveDrab3','OliveDrab4','DarkOliveGreen1',
+  'DarkOliveGreen2','DarkOliveGreen3','DarkOliveGreen4',
+  'khaki1','khaki2','khaki3','khaki4','LightGoldenrod1',
+  'LightGoldenrod2','LightGoldenrod3','LightGoldenrod4',
+  'LightYellow1','LightYellow2','LightYellow3',
+  'LightYellow4','yellow1','yellow2','yellow3','yellow4',
+  'gold1','gold2','gold3','gold4','goldenrod1',
+  'goldenrod2','goldenrod3','goldenrod4','DarkGoldenrod1',
+  'DarkGoldenrod2','DarkGoldenrod3','DarkGoldenrod4',
+  'RosyBrown1','RosyBrown2','RosyBrown3','RosyBrown4',
+  'IndianRed1','IndianRed2','IndianRed3','IndianRed4',
+  'sienna1','sienna2','sienna3','sienna4','burlywood1',
+  'burlywood2','burlywood3','burlywood4','wheat1',
+  'wheat2','wheat3','wheat4','tan1','tan2','tan3','tan4',
+  'chocolate1','chocolate2','chocolate3','chocolate4',
+  'firebrick1','firebrick2','firebrick3','firebrick4',
+  'brown1','brown2','brown3','brown4','salmon1','salmon2',
+  'salmon3','salmon4','LightSalmon1','LightSalmon2',
+  'LightSalmon3','LightSalmon4','orange1','orange2',
+  'orange3','orange4','DarkOrange1','DarkOrange2',
+  'DarkOrange3','DarkOrange4','coral1','coral2','coral3',
+  'coral4','tomato1','tomato2','tomato3','tomato4',
+  'OrangeRed1','OrangeRed2','OrangeRed3','OrangeRed4',
+  'red1','red2','red3','red4','DeepPink1','DeepPink2',
+  'DeepPink3','DeepPink4','HotPink1','HotPink2',
+  'HotPink3','HotPink4','pink1','pink2','pink3','pink4',
+  'LightPink1','LightPink2','LightPink3','LightPink4',
+  'PaleVioletRed1','PaleVioletRed2','PaleVioletRed3',
+  'PaleVioletRed4','maroon1','maroon2','maroon3',
+  'maroon4','VioletRed1','VioletRed2','VioletRed3',
+  'VioletRed4','magenta1','magenta2','magenta3',
+  'magenta4','orchid1','orchid2','orchid3','orchid4',
+  'plum1','plum2','plum3','plum4','MediumOrchid1',
+  'MediumOrchid2','MediumOrchid3','MediumOrchid4',
+  'DarkOrchid1','DarkOrchid2','DarkOrchid3',
+  'DarkOrchid4','purple1','purple2','purple3','purple4',
+  'MediumPurple1','MediumPurple2','MediumPurple3',
+  'MediumPurple4','thistle1','thistle2','thistle3', 'thistle4'
+]
+
+colors_lbox.insert(0, *ins_data)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/cscroll.rb b/ruby_1_8_6/ext/tk/sample/demos-en/cscroll.rb
new file mode 100644
index 0000000000..0838dfbe08
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/cscroll.rb
@@ -0,0 +1,134 @@
+# cscroll.rb
+#
+# This demonstration script creates a simple canvas that can be
+# scrolled in two dimensions.
+#
+# simple scrollable canvas widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($cscroll_demo) && $cscroll_demo
+  $cscroll_demo.destroy 
+  $cscroll_demo = nil
+end
+
+# demo toplevel widget
+$cscroll_demo = TkToplevel.new {|w|
+  title("Scrollable Canvas Demonstration")
+  iconname("cscroll")
+  positionWindow(w)
+}
+
+# label
+TkLabel.new($cscroll_demo, 'font'=>$font, 'wraplength'=>'4i', 
+            'justify'=>'left', 'text'=>"This window displays a canvas widget that can be scrolled either using the scrollbars or by dragging with button 2 in the canvas.  If you click button 1 on one of the rectangles, its indices will be printed on stdout."){
+  pack('side'=>'top')
+}
+
+# frame
+$cscroll_buttons = TkFrame.new($cscroll_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $cscroll_demo
+      $cscroll_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'cscroll'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 
+unless $tk_version =~ /^4\.[01]/
+  $cscroll_grid = TkFrame.new($cscroll_demo) {
+    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
+  }
+  TkGrid.rowconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
+  TkGrid.columnconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
+end
+
+# canvas
+$cscroll_canvas = TkCanvas.new($cscroll_demo, 
+                               'relief'=>'sunken', 'borderwidth'=>2,
+                               'scrollregion'=>['-11c', '-11c', '50c', '20c']
+                               ) {|c|
+  if $tk_version =~ /^4\.[01]/
+    pack('expand'=>'yes', 'fill'=>'both') 
+  else
+    grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+         'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+  end
+
+  TkScrollbar.new($cscroll_demo, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
+    c.yscrollcommand(proc{|first,last| vs.set first,last})
+    if $tk_version =~ /^4\.[01]/
+      pack('side'=>'right', 'fill'=>'y')
+    else
+      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    end
+  }
+
+  TkScrollbar.new($cscroll_demo, 'orient'=>'horiz', 
+                  'command'=>proc{|*args| c.xview(*args)}) {|hs|
+    c.xscrollcommand(proc{|first,last| hs.set first,last})
+    if $tk_version =~ /^4\.[01]/
+      pack('side'=>'bottom', 'fill'=>'x') 
+    else
+      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    end
+  }
+}
+
+bg = $cscroll_canvas.configinfo('bg')[4]
+(0..19).each{|i|
+  x = -10+3*i
+  y = -10
+  (0..9).each{|j|
+    TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c", 
+                     'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
+    TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c", 
+                'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
+    y += 3
+  }
+}
+
+$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
+$cscroll_canvas.itembind('all', 'Any-Leave', proc{scrollLeave $cscroll_canvas})
+$cscroll_canvas.itembind('all', '1', proc{scrollButton $cscroll_canvas})
+$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
+$cscroll_canvas.bind('2', proc{|x,y| $cscroll_canvas.scan_mark(x,y)}, '%x %y')
+$cscroll_canvas.bind('B2-Motion', 
+                     proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
+
+def scrollEnter(c)
+  id = c.find_withtag('current')[0].id
+  id -= 1 if c.gettags('current').include?('text')
+  $oldFill = c.itemconfiginfo(id, 'fill')[4]
+  if TkWinfo.depth(c) > 1
+    c.itemconfigure(id, 'fill'=>'SeaGreen1')
+  else
+    c.itemconfigure(id, 'fill'=>'black')
+    c.itemconfigure(id+1, 'fill'=>'white')
+  end
+end
+
+def scrollLeave(c)
+  id = c.find_withtag('current')[0].id
+  id -= 1 if c.gettags('current').include?('text')
+  c.itemconfigure(id, 'fill'=>$oldFill)
+  c.itemconfigure(id+1, 'fill'=>'black')
+end
+
+def scrollButton(c)
+  id = c.find_withtag('current')[0].id
+  id += 1 unless c.gettags('current').include?('text')
+  print "You buttoned at #{c.itemconfiginfo(id,'text')[4]}\n"
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/ctext.rb b/ruby_1_8_6/ext/tk/sample/demos-en/ctext.rb
new file mode 100644
index 0000000000..dbb5e32638
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/ctext.rb
@@ -0,0 +1,186 @@
+# ctext.rb
+#
+# This demonstration script creates a canvas widget with a text
+# item that can be edited and reconfigured in various ways.
+#
+# Canvas Text widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($ctext_demo) && $ctext_demo
+  $ctext_demo.destroy 
+  $ctext_demo = nil
+end
+
+# demo toplevel widget
+$ctext_demo = TkToplevel.new {|w|
+  title("Canvas Text Demonstration")
+  iconname("Text")
+  positionWindow(w)
+}
+
+# label
+TkLabel.new($ctext_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+            'text'=>"This window displays a string of text to demonstrate the text facilities of canvas widgets.  You can click in the boxes to adjust the position of the text relative to its positioning point or change its justification.  The text also supports the following simple bindings for editing:
+  1. You can point, click, and type.
+  2. You can also select with button 1.
+  3. You can copy the selection to the mouse position with button 2.
+  4. Backspace and Control+h delete the selection if there is one;
+     otherwise they delete the character just before the insertion cursor.
+  5. Delete deletes the selection if there is one; otherwise it deletes
+     the character just after the insertion cursor."){
+  pack('side'=>'top')
+}
+
+# frame
+$ctext_buttons = TkFrame.new($ctext_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $ctext_demo
+      $ctext_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'ctext'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# canvas 
+$ctext_canvas = TkCanvas.new($ctext_demo, 'relief'=>'flat', 
+                             'borderwidth'=>0, 'width'=>500, 'height'=>350)
+$ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
+
+# font 
+textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
+
+# canvas 
+TkcRectangle.new($ctext_canvas, 245, 195, 255, 205, 
+                 'outline'=>'black', 'fill'=>'red')
+
+$ctag_text = TkcTag.new($ctext_canvas)
+$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, 
+                               'text'=>"This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been been defined to support editing (see above).",
+                               'width'=>440, 'anchor'=>'n', 
+                               'font'=>'-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*', 
+                               'kanjifont'=>'-*--24-*-jisx0208.1983-0', 
+                               'justify'=>'left') )
+
+$ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
+$ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
+$ctag_text.bind('Shift-1', 
+        proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"}, 
+        "%x %y")
+$ctag_text.bind('Shift-B1-Motion', 
+                proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
+$ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
+$ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
+$ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
+$ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
+$ctag_text.bind('Delete', proc{textDel $ctext_canvas})
+$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"}, 
+                "%x %y")
+
+# Next, create some items that allow the text's anchor position 
+# to be edited.
+
+def mkTextConfig(w,x,y,option,value,color)
+  item = TkcRectangle.new(w, x, y, x+30, y+30, 
+                          'outline'=>'black', 'fill'=>color, 'width'=>1)
+  item.bind('1', proc{$ctag_text.configure option, value})
+  w.addtag_withtag('config', item)
+end
+
+x = 50
+y = 50
+color = 'LightSkyBlue1'
+mkTextConfig $ctext_canvas, x, y, 'anchor', 'se', color
+mkTextConfig $ctext_canvas, x+30, y, 'anchor', 's', color
+mkTextConfig $ctext_canvas, x+60, y, 'anchor', 'sw', color
+mkTextConfig $ctext_canvas, x, y+30, 'anchor', 'e', color
+mkTextConfig $ctext_canvas, x+30, y+30, 'anchor', 'center', color
+mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
+mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
+mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
+mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
+item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50, 
+                        'outline'=>'black', 'fill'=>'red')
+item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
+TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 'anchor'=>'s', 
+            'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
+            'fill'=>'brown')
+
+# Lastly, create some items that allow the text's justification to be
+# changed.
+
+x = 350
+y = 50
+color = 'SeaGreen2'
+mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
+mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
+mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
+TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 'anchor'=>'s', 
+            'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
+            'fill'=>'brown')
+
+$ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
+$ctext_canvas.itembind('config', 'Leave', 
+                       proc{$ctext_canvas\
+                             .itemconfigure('current', 
+                                            'fill'=>$textConfigFill)})
+
+$textConfigFill = ''
+
+def textEnter(w)
+  $textConfigFill = (w.itemconfiginfo 'current', 'fill')[4]
+  w.itemconfigure 'current', 'fill', 'black'
+end
+
+def textInsert(w, string)
+  return if string == ""
+  begin
+    $ctag_text.dchars 'sel.first', 'sel.last'
+  rescue
+  end
+  $ctag_text.insert 'insert', string
+end
+
+def textPaste(w, pos)
+  begin
+    $ctag_text.insert pos, TkSelection.get
+  rescue
+  end
+end
+
+def textB1Press(w,x,y)
+  w.icursor 'current', "@#{x},#{y}"
+  w.itemfocus 'current'
+  w.focus
+  w.select_from 'current', "@#{x},#{y}"
+end
+
+def textB1Move(w,x,y)
+  w.select_to 'current', "@#{x},#{y}"
+end
+
+def textBs(w)
+  begin
+    $ctag_text.dchars 'sel.first', 'sel.last'
+  rescue
+    char = $ctag_text.index('insert').to_i - 1
+    $ctag_text.dchars(char) if char >= 0
+  end
+end
+
+def textDel(w)
+  begin
+    $ctag_text.dchars 'sel.first', 'sel.last'
+  rescue
+    $ctag_text.dchars 'insert'
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/dialog1.rb b/ruby_1_8_6/ext/tk/sample/demos-en/dialog1.rb
new file mode 100644
index 0000000000..af476ecd05
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/dialog1.rb
@@ -0,0 +1,38 @@
+#
+# a dialog box with a local grab (called by 'widget')
+#
+class TkDialog_Demo1 < TkDialog
+  ###############
+  private
+  ###############
+  def title
+    "Dialog with local grab"
+  end
+
+  def message
+    'This is a modal dialog box.  It uses Tk\'s "grab" command to create a "local grab" on the dialog box.  The grab prevents any pointer-related events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below.  However, you can still interact with other applications.'
+  end
+
+  def bitmap
+    'info'
+  end
+
+  def default_button
+    0
+  end
+
+  def buttons
+    # ["Dismiss", "", "Show Code"]
+    ["OK", "Cancel", "Show Code"]
+  end
+end
+
+ret =  TkDialog_Demo1.new('message_config'=>{'wraplength'=>'4i'}).value
+case ret
+when 0
+  print "You pressed OK\n"
+when 1
+  print "You pressed Cancel\n"
+when 2
+  showCode 'dialog1'
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/dialog2.rb b/ruby_1_8_6/ext/tk/sample/demos-en/dialog2.rb
new file mode 100644
index 0000000000..efc4b714da
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/dialog2.rb
@@ -0,0 +1,41 @@
+#
+# a dialog box with a global grab (called by 'widget')
+#
+class TkDialog_Demo2 < TkDialog
+  ###############
+  private
+  ###############
+  def title
+    "Dialog with global grab"
+  end
+
+  def message
+    "This dialog box uses a global grab, so it prevents you from interacting with anything on your display until you invoke one of the buttons below.  Global grabs are almost always a bad idea; don't use them unless you're truly desperate."
+  end
+
+  def bitmap
+    'info'
+  end
+
+  def default_button
+    0
+  end
+
+  def buttons
+    ["OK", "Cancel", "Show Code"]
+  end
+end
+
+ret =  TkDialog_Demo2.new('message_config'=>{'wraplength'=>'4i'},
+                          'prev_command'=>proc{|dialog|
+                            Tk.after 100, proc{dialog.grab('global')}
+                          }).value
+case ret
+when 0
+  print "\You pressed OK\n"
+when 1
+  print "You pressed Cancel\n"
+when 2
+  showCode 'dialog2'
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/README b/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/README
new file mode 100644
index 0000000000..90677d3316
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/README
@@ -0,0 +1,7 @@
+This directory contains a collection of demonstration programs that
+are translated into Japanese.  You need to use a Japanized "wish" to
+see these Japanese-translated demonstration programs.  You also need
+to put this directory ("demos.jp") at the next to "demos" since some
+of the programs refer to the image files at "demos".
+
+Please refer to the README file at "demos" for more detail.
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/README.JP b/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/README.JP
new file mode 100644
index 0000000000..42b4929378
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/README.JP
@@ -0,0 +1,14 @@
+This directory contains "widget" demo for the Japanized Tcl7.6/Tk4.2.
+Most of the messages in the original are translated to Japanese.
+But other tools in this directory are not translated.
+
+Following 2 kanji fonts are defined at the beginning of the file "widget."
+
+	-*--24-*-jisx0208.1983-0
+	-*--16-*-jisx0208.1983-0
+
+These fonts are all part of the core distribution of X11R5, so
+if you are running X11R5, you don't have to modify the file.
+
+But if you don't have these fonts, replace them with appropriate ones.
+"-*--14-*-jisx0208.1983-0" will be a good choice.
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/README.tk80 b/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/README.tk80
new file mode 100644
index 0000000000..c71f977d74
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/README.tk80
@@ -0,0 +1,46 @@
+This directory contains a collection of programs to demonstrate
+the features of the Tk toolkit.  The programs are all scripts for
+"wish", a windowing shell.  If wish has been installed in /usr/local
+then you can invoke any of the programs in this directory just
+by typing its file name to your command shell.  Otherwise invoke
+wish with the file as its first argument, e.g., "wish hello".
+The rest of this file contains a brief description of each program.
+Files with names ending in ".tcl" are procedure packages used by one
+or more of the demo programs;  they can't be used as programs by
+themselves so they aren't described below.
+
+hello -		Creates a single button;  if you click on it, a message
+		is typed and the application terminates.
+
+widget -	Contains a collection of demonstrations of the widgets
+		currently available in the Tk library.  Most of the .tcl
+		files are scripts for individual demos available through
+		the "widget" program.
+
+ixset -		A simple Tk-based wrapper for the "xset" program, which
+		allows you to interactively query and set various X options
+		such as mouse acceleration and bell volume.  Thanks to
+		Pierre David for contributing this example.
+
+rolodex -	A mock-up of a simple rolodex application.  It has much of
+		the user interface for such an application but no back-end
+		database.  This program was written in response to Tom
+		LaStrange's toolkit benchmark challenge.
+
+tcolor -	A color editor.  Allows you to edit colors in several
+		different ways, and will also perform automatic updates
+		using "send".
+
+rmt -		Allows you to "hook-up" remotely to any Tk application
+		on the display.  Select an application with the menu,
+		then just type commands:  they'll go to that application.
+
+timer -		Displays a seconds timer with start and stop buttons.
+		Control-c and control-q cause it to exit.
+
+browse -	A simple directory browser.  Invoke it with and argument
+		giving the name of the directory you'd like to browse.
+		Double-click on files or subdirectories to browse them.
+		Control-c and control-q cause the program to exit.
+
+sccs id = SCCS: @(#) README 1.3 96/02/16 10:49:14
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/license.terms b/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/license.terms
new file mode 100644
index 0000000000..03ca6fcb31
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/license.terms
@@ -0,0 +1,39 @@
+This software is copyrighted by the Regents of the University of
+California, Sun Microsystems, Inc., and other parties.  The following
+terms apply to all files associated with the software unless explicitly
+disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license.
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/license.terms.tk80 b/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/license.terms.tk80
new file mode 100644
index 0000000000..03ca6fcb31
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/doc.org/license.terms.tk80
@@ -0,0 +1,39 @@
+This software is copyrighted by the Regents of the University of
+California, Sun Microsystems, Inc., and other parties.  The following
+terms apply to all files associated with the software unless explicitly
+disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license.
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/entry1.rb b/ruby_1_8_6/ext/tk/sample/demos-en/entry1.rb
new file mode 100644
index 0000000000..29bc693395
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/entry1.rb
@@ -0,0 +1,56 @@
+#
+# entry (no scrollbars) widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($entry1_demo) && $entry1_demo
+  $entry1_demo.destroy 
+  $entry1_demo = nil
+end
+
+# demo toplevel widget
+$entry1_demo = TkToplevel.new {|w|
+  title("Entry Demonstration (no scrollbars)")
+  iconname("entry1")
+  positionWindow(w)
+}
+
+# label
+msg = TkLabel.new($entry1_demo) {
+  font $font
+  wraplength '5i'
+  justify 'left'
+  text "Three different entries are displayed below.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries by dragging with mouse button2 pressed."
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($entry1_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $entry1_demo
+      $entry1_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'entry1'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# 
+e1 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
+e2 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
+e3 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
+[e1,e2,e3].each{|w| w.pack('side'=>'top', 'padx'=>10, 'pady'=>5, 'fill'=>'x')}
+
+# 
+e1.insert(0, 'Initial value')
+e2.insert('end', "This entry contains a long value, much too long ")
+e2.insert('end', "to fit in the window at one time, so long in fact ")
+e2.insert('end', "that you'll have to scan or scroll to see the end.")
+e2.insert('end', "")
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/entry2.rb b/ruby_1_8_6/ext/tk/sample/demos-en/entry2.rb
new file mode 100644
index 0000000000..d4e58d7dd5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/entry2.rb
@@ -0,0 +1,91 @@
+# entry2.rb
+#
+# This demonstration script is the same as the entry1.tcl script
+# except that it creates scrollbars for the entries.
+#
+# entry (with scrollbars) widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($entry2_demo) && $entry2_demo
+  $entry2_demo.destroy 
+  $entry2_demo = nil
+end
+
+# demo toplevel widget
+$entry2_demo = TkToplevel.new {|w|
+  title("Entry Demonstration (with scrollbars)")
+  iconname("entry2")
+  positionWindow(w)
+}
+
+# label
+msg = TkLabel.new($entry2_demo) {
+  font $font
+  wraplength '5i'
+  justify 'left'
+  text "Three different entries are displayed below, with a scrollbar for each entry.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries with the scrollbars, or by dragging with mouse button2 pressed."
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($entry2_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $entry2_demo
+      $entry2_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'entry2'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame
+TkFrame.new($entry2_demo, 'borderwidth'=>10) {|w|
+  # entry 1
+  s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
+  e1 = TkEntry.new(w, 'relief'=>'sunken') {
+    xscrollcommand proc{|first,last| s1.set first,last}
+  }
+  s1.command(proc{|*args| e1.xview(*args)})
+  e1.pack('side'=>'top', 'fill'=>'x')
+  s1.pack('side'=>'top', 'fill'=>'x')
+
+  # spacer
+  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
+
+  # entry 2
+  s2 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
+  e2 = TkEntry.new(w, 'relief'=>'sunken') {
+    xscrollcommand proc{|first,last| s2.set first,last}
+  }
+  s2.command(proc{|*args| e2.xview(*args)})
+  e2.pack('side'=>'top', 'fill'=>'x')
+  s2.pack('side'=>'top', 'fill'=>'x')
+
+  # spacer
+  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
+
+  # entry 3
+  s3 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
+  e3 = TkEntry.new(w, 'relief'=>'sunken') {
+    xscrollcommand proc{|first,last| s3.set first,last}
+  }
+  s3.command(proc{|*args| e3.xview(*args)})
+  e3.pack('side'=>'top', 'fill'=>'x')
+  s3.pack('side'=>'top', 'fill'=>'x')
+
+  # 
+  e1.insert(0, 'Initial value')
+  e2.insert('end', "This entry contains a long value, much too long ")
+  e2.insert('end', "to fit in the window at one time, so long in fact ")
+  e2.insert('end', "that you'll have to scan or scroll to see the end.")
+  e2.insert('end', "")
+
+}.pack('side'=>'top', 'fill'=>'x', 'expand'=>'yes')
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/entry3.rb b/ruby_1_8_6/ext/tk/sample/demos-en/entry3.rb
new file mode 100644
index 0000000000..415b45f86c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/entry3.rb
@@ -0,0 +1,200 @@
+# entry3.rb --
+#
+# This demonstration script creates several entry widgets whose
+# permitted input is constrained in some way.  It also shows off a
+# password entry.
+#
+# based on Tcl/Tk8.4.4 widget demos
+
+if defined?($entry3_demo) && $entry3_demo
+  $entry3_demo.destroy 
+  $entry3_demo = nil
+end
+
+$entry3_demo = TkToplevel.new {|w|
+  title("Constrained Entry Demonstration")
+  iconname("entry3")
+  positionWindow(w)
+}
+
+TkLabel.new($entry3_demo, 
+            :font=>$font, :wraplength=>'5i', :justify=>:left, 
+            :text=><<EOL).pack(:side=>:top)
+Four different entries are displayed below.  You can add characters \
+by pointing, clicking and typing, though each is constrained in what \
+it will accept.  The first only accepts integers or the empty string \
+(checking when focus leaves it) and will flash to indicate any \
+problem.  The second only accepts strings with fewer than ten \
+characters and sounds the bell when an attempt to go over the limit \
+is made.  The third accepts US phone numbers, mapping letters to \
+their digit equivalent and sounding the bell on encountering an \
+illegal character or if trying to type over a character that is not \
+a digit.  The fourth is a password field that accepts up to eight \
+characters (silently ignoring further ones), and displaying them as \
+asterisk characters.
+EOL
+
+TkFrame.new($entry3_demo){|f|
+  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
+
+  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
+                 $entry3_demo.destroy
+                 $entry3_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
+                 showCode 'entry3'
+               }).pack(:side=>:left, :expand=>true)
+}
+
+# focusAndFlash --
+# Error handler for entry widgets that forces the focus onto the
+# widget and makes the widget flash by exchanging the foreground and
+# background colours at intervals of 200ms (i.e. at approximately
+# 2.5Hz).
+#
+# Arguments:
+# widget -      entry widget to flash
+# fg -          Initial foreground colour
+# bg -          Initial background colour
+# count -       Counter to control the number of times flashed
+def focusAndFlash(widget, fg, bg, count=5)
+  return if count <= 0
+  TkTimer.new(200, count, 
+              proc{widget.configure(:foreground=>bg, :background=>fg)}, 
+              proc{widget.configure(:foreground=>fg, :background=>bg)}
+              ).start
+  widget.focus(true)
+end
+
+l1 = TkLabelFrame.new($entry3_demo, :text=>"Integer Entry")
+TkEntry.new(l1, :validate=>:focus, 
+            :vcmd=>[
+              proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
+            ]) {|e|
+  invalidcommand [proc{|w| focusAndFlash(w, e.fg, e.bg)}, '%W']
+  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
+}
+
+l2 = TkLabelFrame.new($entry3_demo, :text=>"Length-Constrained Entry")
+TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell}, 
+            :vcmd=>[proc{|s| s.length < 10}, '%P']
+            ).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
+
+### PHONE NUMBER ENTRY ###
+# Note that the source to this is quite a bit longer as the behaviour
+# demonstrated is a lot more ambitious than with the others.
+
+# Initial content for the third entry widget
+entry3content = TkVariable.new("1-(000)-000-0000")
+
+# Mapping from alphabetic characters to numbers.
+$phoneNumberMap = {}
+Hash[*(%w(abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9))].each{|chars, n|
+  chars.split('').each{|c|
+    $phoneNumberMap[c] = n
+    $phoneNumberMap[c.upcase] = n
+  }
+}
+
+# phoneSkipLeft --
+# Skip over fixed characters in a phone-number string when moving left.
+#
+# Arguments:
+# widget -      The entry widget containing the phone-number.
+def phoneSkipLeft(widget)
+  idx = widget.index('insert')
+  if idx == 8
+    # Skip back two extra characters
+    widget.cursor = idx - 2
+  elsif idx == 7 || idx == 12
+    # Skip back one extra character
+    widget.cursor = idx - 1
+  elsif idx <= 3
+    # Can't move any further
+    Tk.bell
+    Tk.callback_break
+  end
+end
+
+# phoneSkipRight --
+# Skip over fixed characters in a phone-number string when moving right.
+#
+# Arguments:
+# widget -      The entry widget containing the phone-number.
+# add - Offset to add to index before calculation (used by validation.)
+def phoneSkipRight(widget, add = 0)
+  idx = widget.index('insert')
+  if (idx + add == 5)
+    # Skip forward two extra characters
+    widget.cursor = idx + 2
+  elsif (idx + add == 6 || idx + add == 10)
+    # Skip forward one extra character
+    widget.cursor = idx + 1
+  elsif (idx + add == 15 && add == 0)
+    # Can't move any further
+    Tk.bell
+    Tk.callback_break
+  end
+end
+
+# validatePhoneChange --
+# Checks that the replacement (mapped to a digit) of the given
+# character in an entry widget at the given position will leave a
+# valid phone number in the widget.
+#
+# widget - entry widget to validate
+# vmode -  The widget's validation mode
+# idx -    The index where replacement is to occur
+# char -   The character (or string, though that will always be
+#          refused) to be overwritten at that point.
+
+def validatePhoneChange(widget, vmode, idx, char)
+  return true if idx == nil
+  Tk.after_idle(proc{widget.configure(:validate=>vmode, 
+                                      :invcmd=>proc{Tk.bell})})
+  if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
+    widget.delete(idx)
+    widget.insert(idx, $phoneNumberMap[char] || char)
+    Tk.after_idle(proc{phoneSkipRight(widget, -1)})
+    return true
+    # Tk.update(true) # Don't work 'update' inter validation callback.
+                      # It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1). 
+  end
+  return false
+end
+
+
+l3 = TkLabelFrame.new($entry3_demo, :text=>"US Phone-Number Entry")
+TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell}, 
+            :textvariable=>entry3content, 
+            :vcmd=>[
+              proc{|w,v,i,s| validatePhoneChange(w,v,i,s)}, 
+              "%W %v %i %S"
+            ]){|e|
+  # Click to focus goes to the first editable character...
+  bind('FocusIn', proc{|d,w|
+         if d != "NotifyAncestor"
+           w.cursor = 3
+           Tk.after_idle(proc{w.selection_clear})
+         end
+       }, '%d %W')
+  bind('Left',  proc{|w| phoneSkipLeft(w)},  '%W')
+  bind('Right', proc{|w| phoneSkipRight(w)}, '%W')
+  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
+}
+
+l4 = TkLabelFrame.new($entry3_demo, :text=>"Password Entry")
+TkEntry.new(l4, :validate=>:key, :show=>'*', 
+            :vcmd=>[
+              proc{|s| s.length <= 8}, 
+              '%P'
+            ]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
+
+TkFrame.new($entry3_demo){|f|
+  lower
+  TkGrid.configure(l1, l2, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
+  TkGrid.configure(l3, l4, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
+  TkGrid.columnconfigure(f, [0,1], :uniform=>1)
+  pack(:fill=>:both, :expand=>true)
+}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/filebox.rb b/ruby_1_8_6/ext/tk/sample/demos-en/filebox.rb
new file mode 100644
index 0000000000..36b19de557
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/filebox.rb
@@ -0,0 +1,97 @@
+# filebox.rb
+#
+# This demonstration script prompts the user to select a file.#
+# widget demo prompts the user to select a file (called by 'widget')
+#
+
+# toplevel widget
+if defined?($filebox_demo) && $filebox_demo
+  $filebox_demo.destroy 
+  $filebox_demo = nil
+end
+
+# demo toplevel widget
+$filebox_demo = TkToplevel.new {|w|
+  title("File Selection Dialogs")
+  iconname("filebox")
+  positionWindow(w)
+}
+
+# label
+TkLabel.new($filebox_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+            'text'=>"Enter a file name in the entry box or click on the \"Browse\" buttons to select a file name using the file selection dialog.").pack('side'=>'top')
+
+# frame
+TkFrame.new($filebox_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $filebox_demo
+      $filebox_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'filebox'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame
+['open', 'save'].each{|type|
+  TkFrame.new($filebox_demo) {|f|
+    TkLabel.new(f, 'text'=>"Select a file to #{type}: ", 'anchor'=>'e')\
+    .pack('side'=>'left')
+
+    TkEntry.new(f, 'width'=>20) {|e|
+      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
+
+      TkButton.new(f, 'text'=>'Browse ...', 
+                   'command'=>proc{fileDialog $filebox_demo,e,type})\
+      .pack('side'=>'left')
+    }
+
+    pack('fill'=>'x', 'padx'=>'1c', 'pady'=>3)
+  }
+}
+
+$tk_strictMotif = TkVarAccess.new('tk_strictMotif')
+if ($tk_platform['platform'] == 'unix')
+  TkCheckButton.new($filebox_demo, 
+                    'text'=>'Use Motif Style Dialog', 
+                    'variable'=>$tk_strictMotif, 
+                    'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
+end
+
+def fileDialog(w,ent,operation)
+  #    Type names         Extension(s)             Mac File Type(s)
+  #
+  #--------------------------------------------------------
+  types = [
+    ['Text files',       ['.txt','.doc']          ], 
+    ['Text files',       [],                      'TEXT' ], 
+    ['Ruby Scripts',     ['.rb'],                 'TEXT' ], 
+    ['Tcl Scripts',      ['.tcl'],                'TEXT' ], 
+    ['C Source Files',   ['.c','.h']              ], 
+    ['All Source Files', ['.rb','.tcl','.c','.h'] ], 
+    ['Image Files',      ['.gif']                 ], 
+    ['Image Files',      ['.jpeg','.jpg']         ], 
+    ['Image Files',      [],                      ['GIFF','JPEG']], 
+    ['All files',        '*'                      ]
+  ]
+
+  if operation == 'open'
+    file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
+  else
+    file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w, 
+                          'initialfile'=>'Untitled', 
+                          'defaultextension'=>'.txt')
+  end
+  if file != ""
+    ent.delete 0, 'end'
+    ent.insert 0, file
+    ent.xview 'end'
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/floor.rb b/ruby_1_8_6/ext/tk/sample/demos-en/floor.rb
new file mode 100644
index 0000000000..53adcf96b6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/floor.rb
@@ -0,0 +1,1721 @@
+# floor.rb
+#
+# This demonstration script creates a canvas widet that displays the
+# floorplan for DEC's Western Research Laboratory.
+#
+# floorDisplay widget demo (called by 'widget')
+#
+
+# floorDisplay --
+# Recreate the floorplan display in the canvas given by "w".  The
+# floor given by "active" is displayed on top with its office structure
+# visible.
+#
+# Arguments:
+# w -           Name of the canvas window.
+# active -      Number of active floor (1, 2, or 3).
+
+def floorDisplay(w,active)
+  return if $activeFloor == active
+
+  w.delete('all')
+  $activeFloor = active
+
+  # First go through the three floors, displaying the backgrounds for 
+  # each floor.
+
+  floor_bg1(w,$floor_colors['bg1'],$floor_colors['outline1'])
+  floor_bg2(w,$floor_colors['bg2'],$floor_colors['outline2'])
+  floor_bg3(w,$floor_colors['bg3'],$floor_colors['outline3'])
+
+  # Raise the background for the active floor so that it's on top.
+
+  w.raise("floor#{active}")
+
+  # Create a dummy item just to mark this point in the display list, 
+  # so we can insert highlights here.
+
+  TkcRectangle.new(w,0,100,1,101, 'fill'=>'', 'outline'=>'', 'tags'=>'marker')
+
+  # Add the walls and labels for the active floor, along with 
+  # transparent polygons that define the rooms on the floor.
+  # Make sure that the room polygons are on top.
+
+  $floorLabels.clear
+  $floorItems.clear
+  send("floor_fg#{active}", w, $floor_colors['offices'])
+  w.raise('room')
+
+  # Offset the floors diagonally from each other.
+
+  w.move('floor1', '2c', '2c')
+  w.move('floor2', '1c', '1c')
+
+  # Create items for the room entry and its label.
+  TkcWindow.new(w, 600, 100, 'anchor'=>'w', 'window'=>$floor_entry)
+  TkcText.new(w, 600, 100, 'anchor'=>'e', 'text'=>"Room: ")
+  w['scrollregion'] = w.bbox('all')
+end
+
+# newRoom --
+# This method is invoked whenever the mouse enters a room
+# in the floorplan.  It changes tags so that the current room is
+# highlighted.
+#
+# Arguments:
+# w  -          The name of the canvas window.
+
+def newRoom(w)
+  id = w.find_withtag('current')[0]
+  $currentRoom.value = $floorLabels[id.id] if id != ""
+  Tk.update(true)
+end
+
+# roomChanged --
+# This method is invoked whenever the currentRoom variable changes.
+# It highlights the current room and unhighlights any previous room.
+#
+# Arguments:
+# w -           The canvas window displaying the floorplan.
+# args -        Not used.
+
+def roomChanged(w,*args)
+  w.delete('highlight')
+  item = $floorItems[$currentRoom.value]
+  return if item == nil
+  new = TkcPolygon.new(w, *(w.coords(item)))
+  new.configure('fill'=>$floor_colors['active'], 'tags'=>'highlight')
+  w.raise(new, 'marker')
+end
+
+# floor_bg1 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the background information for the first
+# floor.
+#
+# Arguments:
+# w -           The canvas window.
+# fill -        Fill color to use for the floor's background.
+# outline -     Color to use for the floor's outline.
+
+def floor_bg1(w,fill,outline)
+  TkcPolygon.new(w,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
+                 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
+                 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
+                 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
+                 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
+                 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
+                 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
+                 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
+                 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
+                 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
+                 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
+                 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
+                 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
+  TkcLine.new(w,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
+end
+
+# floor_bg2 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the background information for the first
+# floor.
+#
+# Arguments:
+# w -           The canvas window.
+# fill -        Fill color to use for the floor's background.
+# outline -     Color to use for the floor's outline.
+
+def floor_bg2(w,fill,outline)
+  TkcPolygon.new(w,559,129,484,129,484,162,398,162,398,129,315,129,
+                 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
+                 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
+                 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
+                 367,802,367,802,129,725,129,725,133,559,133,559,129,
+                 'tags'=>['floor2','bg'], 'fill'=>fill)
+  TkcLine.new(w,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+end
+
+# floor_bg3 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the background information for the first
+# floor.
+#
+# Arguments:
+# w -           The canvas window.
+# fill -        Fill color to use for the floor's background.
+# outline -     Color to use for the floor's outline.
+
+def floor_bg3(w,fill,outline)
+  TkcPolygon.new(w,159,300,107,300,107,248,159,248,159,129,96,129,96,
+                 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
+                 'tags'=>['floor3','bg'], 'fill'=>fill)
+  TkcPolygon.new(w,258,370,258,329,350,329,350,311,399,311,399,129,
+                 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
+                 'tags'=>['floor3','bg'], 'fill'=>fill)
+  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,107,300,159,300,159,248,107,248,107,300, 
+              'fill'=>outline, 'tags'=>['floor3','bg'])
+end
+
+# floor_fg1 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the foreground information for the first
+# floor (office outlines and numbers).
+#
+# Arguments:
+# w -           The canvas window.
+# color -       Color to use for drawing foreground information.
+
+def floor_fg1(w,color)
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '101'
+  $floorItems['101'] = i
+  TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Pub Lift1'
+  $floorItems['Pub Lift1'] = i
+  TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Priv Lift1'
+  $floorItems['Priv Lift1'] = i
+  TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '110'
+  $floorItems['110'] = i
+  TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '109'
+  $floorItems['109'] = i
+  TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '111'
+  $floorItems['111'] = i
+  TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '117B'
+  $floorItems['117B'] = i
+  TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '112'
+  $floorItems['112'] = i
+  TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '113'
+  $floorItems['113'] = i
+  TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '117A'
+  $floorItems['117A'] = i
+  TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '117'
+  $floorItems['117'] = i
+  TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '114'
+  $floorItems['114'] = i
+  TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '115'
+  $floorItems['115'] = i
+  TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '116'
+  $floorItems['116'] = i
+  TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '118'
+  $floorItems['118'] = i
+  TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
+                     163,91,163,112,149,112,149,128, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '120'
+  $floorItems['120'] = i
+  TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
+                     156,192,156,169,175,169,175,246,79,246, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '122'
+  $floorItems['122'] = i
+  TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '121'
+  $floorItems['121'] = i
+  TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '106A'
+  $floorItems['106A'] = i
+  TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '105'
+  $floorItems['105'] = i
+  TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '106B'
+  $floorItems['106B'] = i
+  TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '104'
+  $floorItems['104'] = i
+  TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '108'
+  $floorItems['108'] = i
+  TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '107'
+  $floorItems['107'] = i
+  TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Smoking'
+  $floorItems['Smoking'] = i
+  TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '123'
+  $floorItems['123'] = i
+  TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '103'
+  $floorItems['103'] = i
+  TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '124'
+  $floorItems['124'] = i
+  TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '125'
+  $floorItems['125'] = i
+  TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '126'
+  $floorItems['126'] = i
+  TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
+                     486,253,486,239,474,239,474,209, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '127'
+  $floorItems['127'] = i
+  TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
+                     490,188,490,204,476,204,476,164, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'MShower'
+  $floorItems['MShower'] = i
+  TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Closet'
+  $floorItems['Closet'] = i
+  TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'WShower'
+  $floorItems['WShower'] = i
+  TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
+                     697,166,697,275,553,275,531,254,515,254,
+                     515,174,503,174,503,161,486,161, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '130'
+  $floorItems['130'] = i
+  TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
+                     342,246,397,246,397,276,393,276,
+                     393,309,300,309,300,248,308,248, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '102'
+  $floorItems['102'] = i
+  TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '128'
+  $floorItems['128'] = i
+  TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
+                     552,277,561,277,561,325,510,325,
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '129'
+  $floorItems['129'] = i
+  TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
+                     642,389,561,389,561,277,696,277, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '133'
+  $floorItems['133'] = i
+  TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '132'
+  $floorItems['132'] = i
+  TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '134'
+  $floorItems['134'] = i
+  TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '135'
+  $floorItems['135'] = i
+  TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
+                     304,312,396,312,396,288,400,288,404,288,
+                     409,290,413,292,418,297,421,302,422,309,
+                     421,318,417,325,411,330,405,332,397,333,
+                     344,333,340,334,336,336,335,338,332,342,
+                     331,347,332,351,334,354,336,357,341,359, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Ramona Stair'
+  $floorItems['Ramona Stair'] = i
+  TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
+                     122,28,123,32,123,68,220,68,220,87,90,87,90,23, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'University Stair'
+  $floorItems['University Stair'] = i
+  TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
+                     358,48,363,39,365,29,348,25,335,22,321,14,
+                     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
+                     227,13,223,17,221,22,220,34,260,34, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Plaza Stair'
+  $floorItems['Plaza Stair'] = i
+  TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
+                     323,56,337,70,350,83,365,94,377,100,
+                     386,104,386,128,220,128, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Plaza Deck'
+  $floorItems['Plaza Deck'] = i
+  TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '106'
+  $floorItems['106'] = i
+  TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
+                     95,128,114,128,114,151,157,151,157,153,112,153,
+                     112,130,97,130,97,168,175,168,175,131,146,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '119'
+  $floorItems['119'] = i
+  TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  TkcLine.new(w,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+end
+
+# floor_fg2 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the foreground information for the second
+# floor (office outlines and numbers).
+#
+# Arguments:
+# w -           The canvas window.
+# color -       Color to use for drawing foreground information.
+
+def floor_fg2(w,color)
+  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
+                     800,222,800,168,748,168, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '238'
+  $floorItems['238'] = i
+  TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '237'
+  $floorItems['237'] = i
+  TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
+                     643,324,643,291,641,291,641,205,696,205,
+                     696,291,694,291,694,314,715,314,715,291,
+                     715,205,755,205,755,190,724,190,724,187, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '246'
+  $floorItems['246'] = i
+  TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '247'
+  $floorItems['247'] = i
+  TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
+                     397,246,397,255,476,255,476,250,482,250,559,250,
+                     559,274,482,274,482,278,396,278,396,274,232,274, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '202'
+  $floorItems['202'] = i
+  TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
+                     306,196,306,180,175,180,175,169,156,169,
+                     156,196,176,196,176,228, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '206'
+  $floorItems['206'] = i
+  TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '212'
+  $floorItems['212'] = i
+  TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '245'
+  $floorItems['245'] = i
+  TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '244'
+  $floorItems['244'] = i
+  TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '243'
+  $floorItems['243'] = i
+  TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '242'
+  $floorItems['242'] = i
+  TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = 'Barbecue Deck'
+  $floorItems['Barbecue Deck'] = i
+  TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '240'
+  $floorItems['240'] = i
+  TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '241'
+  $floorItems['241'] = i
+  TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '239'
+  $floorItems['239'] = i
+  TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '248'
+  $floorItems['248'] = i
+  TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '236'
+  $floorItems['236'] = i
+  TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '235'
+  $floorItems['235'] = i
+  TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
+                     572,143,579,143,579,185,626,185, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '234'
+  $floorItems['234'] = i
+  TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
+                     578,185,527,185,527,131,557,131, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '233'
+  $floorItems['233'] = i
+  TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '230'
+  $floorItems['230'] = i
+  TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '232'
+  $floorItems['232'] = i
+  TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '229'
+  $floorItems['229'] = i
+  TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '227'
+  $floorItems['227'] = i
+  TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '228'
+  $floorItems['228'] = i
+  TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '226'
+  $floorItems['226'] = i
+  TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '225'
+  $floorItems['225'] = i
+  TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '224'
+  $floorItems['224'] = i
+  TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '223'
+  $floorItems['223'] = i
+  TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '222'
+  $floorItems['222'] = i
+  TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '221'
+  $floorItems['221'] = i
+  TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '204'
+  $floorItems['204'] = i
+  TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '205'
+  $floorItems['205'] = i
+  TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '207'
+  $floorItems['207'] = i
+  TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '208'
+  $floorItems['208'] = i
+  TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '209'
+  $floorItems['209'] = i
+  TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '217'
+  $floorItems['217'] = i
+  TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '217A'
+  $floorItems['217A'] = i
+  TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '216'
+  $floorItems['216'] = i
+  TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '215'
+  $floorItems['215'] = i
+  TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '214'
+  $floorItems['214'] = i
+  TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '213'
+  $floorItems['213'] = i
+  TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '210'
+  $floorItems['210'] = i
+  TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '211'
+  $floorItems['211'] = i
+  TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '203'
+  $floorItems['203'] = i
+  TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
+                     154,198,154,192,109,192,109,169,99,169, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '220'
+  $floorItems['220'] = i
+  TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = 'Priv Lift2'
+  $floorItems['Priv Lift2'] = i
+  TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = 'Pub Lift 2'
+  $floorItems['Pub Lift 2'] = i
+  TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '218'
+  $floorItems['218'] = i
+  TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '219'
+  $floorItems['219'] = i
+  TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '201'
+  $floorItems['201'] = i
+  TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  TkcLine.new(w,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
+end
+
+# floor_fg3 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the foreground information for the third
+# floor (office outlines and numbers).
+#
+# Arguments:
+# w -           The canvas window.
+# color -       Color to use for drawing foreground information.
+
+def floor_fg3(w,color)
+  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '316'
+  $floorItems['316'] = i
+  TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '309'
+  $floorItems['309'] = i
+  TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '308'
+  $floorItems['308'] = i
+  TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '307'
+  $floorItems['307'] = i
+  TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '305'
+  $floorItems['305'] = i
+  TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '324B'
+  $floorItems['324B'] = i
+  TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '324A'
+  $floorItems['324A'] = i
+  TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '320'
+  $floorItems['320'] = i
+  TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '310'
+  $floorItems['310'] = i
+  TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '312'
+  $floorItems['312'] = i
+  TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '313'
+  $floorItems['313'] = i
+  TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '314'
+  $floorItems['314'] = i
+  TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '315'
+  $floorItems['315'] = i
+  TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '316B'
+  $floorItems['316B'] = i
+  TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '316A'
+  $floorItems['316A'] = i
+  TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
+                     174,198,174,226,101,226,101,179,97,179, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '319'
+  $floorItems['319'] = i
+  TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '311'
+  $floorItems['311'] = i
+  TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '318'
+  $floorItems['318'] = i
+  TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '317'
+  $floorItems['317'] = i
+  TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '323'
+  $floorItems['323'] = i
+  TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '325'
+  $floorItems['325'] = i
+  TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '321'
+  $floorItems['321'] = i
+  TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
+                     264,181,264,135,314,135, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '322'
+  $floorItems['322'] = i
+  TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = 'Pub Lift3'
+  $floorItems['Pub Lift3'] = i
+  TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = 'Priv Lift3'
+  $floorItems['Priv Lift3'] = i
+  TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '303'
+  $floorItems['303'] = i
+  TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
+                     244,230,244,221,252,221,252,203, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '324'
+  $floorItems['324'] = i
+  TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '304'
+  $floorItems['304'] = i
+  TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '301'
+  $floorItems['301'] = i
+  TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '327'
+  $floorItems['327'] = i
+  TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '326'
+  $floorItems['326'] = i
+  TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
+                     375,274,397,274,397,248,339,248,339,242,308,242, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '302'
+  $floorItems['302'] = i
+  TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
+                     272,193,263,180,242,180,175,180,175,169,156,169,
+                     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
+                     107,248,160,248,160,301,107,301,107,275,70,275, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '306'
+  $floorItems['306'] = i
+  TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+end
+
+# Below is the "main program" that creates the floorplan demonstration.
+
+# toplevel widget
+if defined?($floor_demo) && $floor_demo
+  $floor_demo.destroy 
+  $floor_demo = nil
+end
+
+# demo toplevel widget
+$floor_demo = TkToplevel.new {|w|
+  title("Floorplan Canvas Demonstration")
+  iconname("Floorplan")
+  positionWindow(w)
+  geometry('+20+20')
+  minsize(100,100)
+}
+
+# label
+TkLabel.new($floor_demo, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
+            'text'=>"This window contains a canvas widget showing the floorplan of Digital Equipment Corporation's Western Research Laboratory.  It has three levels.  At any given time one of the levels is active, meaning that you can see its room structure.  To activate a level, click the left mouse button anywhere on it.  As the mouse moves over the active level, the room under the mouse lights up and its room number appears in the \"Room:\" entry.  You can also type a room number in the entry and the room will light up."){
+  pack('side'=>'top')
+}
+
+# frame
+$floor_buttons = TkFrame.new($floor_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $floor_demo
+      $floor_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'floor'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$floor_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# 
+$floorLabels = {}
+$floorItems = {}
+
+# canvas 
+if $tk_version =~ /^4\.[01]/
+  $floor_canvas_frame = TkFrame.new($floor_demo,'bd'=>2,'relief'=>'sunken',
+                                    'highlightthickness'=>2)
+  $floor_canvas = TkCanvas.new($floor_canvas_frame, 
+                               'width'=>900, 'height'=>500, 'borderwidth'=>0, 
+                               'highlightthickness'=>0) {|c|
+    TkScrollbar.new($floor_demo, 'orient'=>'horiz', 
+                    'command'=>proc{|*args| c.xview(*args)}){|hs|
+      c.xscrollcommand(proc{|first,last| hs.set first,last})
+      pack('side'=>'bottom', 'fill'=>'x')
+    }
+    TkScrollbar.new($floor_demo, 'command'=>proc{|*args| c.yview(*args)}){|vs|
+      c.yscrollcommand(proc{|first,last| vs.set first,last})
+      pack('side'=>'right', 'fill'=>'y')
+    }
+  }
+  $floor_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
+  $floor_canvas.pack('expand'=>'yes', 'fill'=>'both')
+
+else
+  TkFrame.new($floor_demo) {|f|
+    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
+
+    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
+    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
+
+    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
+      $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500, 
+                                   'borderwidth'=>0, 
+                                   'highlightthickness'=>0) {
+        xscrollcommand(proc{|first,last| h.set first,last})
+        yscrollcommand(proc{|first,last| v.set first,last})
+        pack('expand'=>'yes', 'fill'=>'both')
+      }
+      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    }
+
+    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+
+    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+
+    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
+
+    v.command(proc{|*args| $floor_canvas.yview(*args)})
+    h.command(proc{|*args| $floor_canvas.xview(*args)})
+  }
+end
+
+
+# Create an entry for displaying and typing in current room.
+
+$currentRoom = TkVariable.new
+$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken', 
+                           'bd'=>2, 'textvariable'=>$currentRoom)
+
+# Choose colors, then fill in the floorplan.
+
+$floor_colors = {}
+if TkWinfo.depth($floor_canvas) > 1
+  $floor_colors['bg1'] = '#a9c1da'
+  $floor_colors['outline1'] = '#77889a'
+  $floor_colors['bg2'] = '#9ab0c6'
+  $floor_colors['outline2'] = '#687786'
+  $floor_colors['bg3'] = '#8ba0b3'
+  $floor_colors['outline3'] = '#596673'
+  $floor_colors['offices'] = 'Black'
+  $floor_colors['active'] = '#c4d1df'
+else
+  $floor_colors['bg1'] = 'white'
+  $floor_colors['outline1'] = 'black'
+  $floor_colors['bg2'] = 'white'
+  $floor_colors['outline2'] = 'black'
+  $floor_colors['bg3'] = 'white'
+  $floor_colors['outline3'] = 'black'
+  $floor_colors['offices'] = 'Black'
+  $floor_colors['active'] = 'black'
+end
+
+$activeFloor = ''
+floorDisplay $floor_canvas,3
+
+# Set up event bindings for canvas:
+
+$floor_canvas.itembind('floor1', '1', proc{floorDisplay $floor_canvas,1})
+$floor_canvas.itembind('floor2', '1', proc{floorDisplay $floor_canvas,2})
+$floor_canvas.itembind('floor3', '1', proc{floorDisplay $floor_canvas,3})
+$floor_canvas.itembind('room', 'Enter', proc{newRoom $floor_canvas})
+$floor_canvas.itembind('room', 'Leave', proc{$currentRoom.value = ''})
+$floor_canvas.bind('2', proc{|x,y| $floor_canvas.scan_mark x,y}, '%x %y')
+$floor_canvas.bind('B2-Motion', 
+                   proc{|x,y| $floor_canvas.scan_dragto x,y}, '%x %y')
+$floor_canvas.bind('Destroy', proc{$currentRoom.unset})
+$currentRoom.value = ''
+$currentRoom.trace('w',proc{roomChanged $floor_canvas})
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/floor2.rb b/ruby_1_8_6/ext/tk/sample/demos-en/floor2.rb
new file mode 100644
index 0000000000..efaf9e250d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/floor2.rb
@@ -0,0 +1,1720 @@
+%# floor2.rb
+#
+# This demonstration script creates a canvas widet that displays the
+# floorplan for DEC's Western Research Laboratory.
+#
+# floorDisplay widget demo (called by 'widget')
+#
+
+# floorDisplay2 --
+# Recreate the floorplan display in the canvas given by "w".  The
+# floor given by "active" is displayed on top with its office structure
+# visible.
+#
+# Arguments:
+# w -           Name of the canvas window.
+# active -      Number of active floor (1, 2, or 3).
+
+def floorDisplay2(w,active)
+  return if $activeFloor2 == active
+
+  w.delete('all')
+  $activeFloor2 = active
+
+  # First go through the three floors, displaying the backgrounds for 
+  # each floor.
+
+  floor2_bg1(w,$floor2_colors['bg1'],$floor2_colors['outline1'])
+  floor2_bg2(w,$floor2_colors['bg2'],$floor2_colors['outline2'])
+  floor2_bg3(w,$floor2_colors['bg3'],$floor2_colors['outline3'])
+
+  # Raise the background for the active floor so that it's on top.
+
+  w.raise("floor#{active}")
+
+  # Create a dummy item just to mark this point in the display list, 
+  # so we can insert highlights here.
+
+  w.create(TkcRectangle,0,100,1,101,'fill'=>'','outline'=>'','tags'=>'marker')
+
+  # Add the walls and labels for the active floor, along with 
+  # transparent polygons that define the rooms on the floor.
+  # Make sure that the room polygons are on top.
+
+  $floorLabels2.clear
+  $floorItems2.clear
+  send("floor2_fg#{active}", w, $floor2_colors['offices'])
+  w.raise('room')
+
+  # Offset the floors diagonally from each other.
+
+  w.move('floor1', '2c', '2c')
+  w.move('floor2', '1c', '1c')
+
+  # Create items for the room entry and its label.
+  w.create(TkcWindow, 600, 100, 'anchor'=>'w', 'window'=>$floor2_entry)
+  w.create(TkcText, 600, 100, 'anchor'=>'e', 'text'=>"Room: ")
+  w['scrollregion'] = w.bbox('all')
+end
+
+# newRoom2 --
+# This method is invoked whenever the mouse enters a room
+# in the floorplan.  It changes tags so that the current room is
+# highlighted.
+#
+# Arguments:
+# w  -          The name of the canvas window.
+
+def newRoom2(w)
+  id = w.find_withtag('current')[0]
+  $currentRoom2.value = $floorLabels2[id.id] if id != ""
+  Tk.update(true)
+end
+
+# roomChanged2 --
+# This method is invoked whenever the currentRoom variable changes.
+# It highlights the current room and unhighlights any previous room.
+#
+# Arguments:
+# w -           The canvas window displaying the floorplan.
+# args -        Not used.
+
+def roomChanged2(w,*args)
+  w.delete('highlight')
+  item = $floorItems2[$currentRoom2.value]
+  return if item == nil
+  new = TkcPolygon.new(w, *(w.coords(item)))
+  new.configure('fill'=>$floor2_colors['active'], 'tags'=>'highlight')
+  w.raise(new, 'marker')
+end
+
+# floor2_bg1 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the background information for the first
+# floor.
+#
+# Arguments:
+# w -           The canvas window.
+# fill -        Fill color to use for the floor's background.
+# outline -     Color to use for the floor's outline.
+
+def floor2_bg1(w,fill,outline)
+  w.create(TkcPolygon,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
+                 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
+                 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
+                 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
+                 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
+                 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
+                 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
+                 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
+                 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
+                 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
+                 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
+                 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
+                 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
+  w.create(TkcLine,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
+end
+
+# floor2_bg2 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the background information for the first
+# floor.
+#
+# Arguments:
+# w -           The canvas window.
+# fill -        Fill color to use for the floor's background.
+# outline -     Color to use for the floor's outline.
+
+def floor2_bg2(w,fill,outline)
+  w.create(TkcPolygon,559,129,484,129,484,162,398,162,398,129,315,129,
+                 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
+                 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
+                 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
+                 367,802,367,802,129,725,129,725,133,559,133,559,129,
+                 'tags'=>['floor2','bg'], 'fill'=>fill)
+  w.create(TkcLine,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+end
+
+# floor2_bg3 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the background information for the first
+# floor.
+#
+# Arguments:
+# w -           The canvas window.
+# fill -        Fill color to use for the floor's background.
+# outline -     Color to use for the floor's outline.
+
+def floor2_bg3(w,fill,outline)
+  w.create(TkcPolygon,159,300,107,300,107,248,159,248,159,129,96,129,96,
+                 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
+                 'tags'=>['floor3','bg'], 'fill'=>fill)
+  w.create(TkcPolygon,258,370,258,329,350,329,350,311,399,311,399,129,
+                 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
+                 'tags'=>['floor3','bg'], 'fill'=>fill)
+  w.create(TkcLine,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,107,300,159,300,159,248,107,248,107,300, 
+              'fill'=>outline, 'tags'=>['floor3','bg'])
+end
+
+# floor2_fg1 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the foreground information for the first
+# floor (office outlines and numbers).
+#
+# Arguments:
+# w -           The canvas window.
+# color -       Color to use for drawing foreground information.
+
+def floor2_fg1(w,color)
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '101'
+  $floorItems2['101'] = i
+  w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Pub Lift1'
+  $floorItems2['Pub Lift1'] = i
+  w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Priv Lift1'
+  $floorItems2['Priv Lift1'] = i
+  w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '110'
+  $floorItems2['110'] = i
+  w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '109'
+  $floorItems2['109'] = i
+  w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '111'
+  $floorItems2['111'] = i
+  w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '117B'
+  $floorItems2['117B'] = i
+  w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '112'
+  $floorItems2['112'] = i
+  w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '113'
+  $floorItems2['113'] = i
+  w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '117A'
+  $floorItems2['117A'] = i
+  w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '117'
+  $floorItems2['117'] = i
+  w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '114'
+  $floorItems2['114'] = i
+  w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '115'
+  $floorItems2['115'] = i
+  w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '116'
+  $floorItems2['116'] = i
+  w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '118'
+  $floorItems2['118'] = i
+  w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
+                     163,91,163,112,149,112,149,128, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '120'
+  $floorItems2['120'] = i
+  w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
+                     156,192,156,169,175,169,175,246,79,246, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '122'
+  $floorItems2['122'] = i
+  w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '121'
+  $floorItems2['121'] = i
+  w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '106A'
+  $floorItems2['106A'] = i
+  w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '105'
+  $floorItems2['105'] = i
+  w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '106B'
+  $floorItems2['106B'] = i
+  w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '104'
+  $floorItems2['104'] = i
+  w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '108'
+  $floorItems2['108'] = i
+  w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '107'
+  $floorItems2['107'] = i
+  w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Smoking'
+  $floorItems2['Smoking'] = i
+  w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '123'
+  $floorItems2['123'] = i
+  w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '103'
+  $floorItems2['103'] = i
+  w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '124'
+  $floorItems2['124'] = i
+  w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '125'
+  $floorItems2['125'] = i
+  w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '126'
+  $floorItems2['126'] = i
+  w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
+                     486,253,486,239,474,239,474,209, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '127'
+  $floorItems2['127'] = i
+  w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
+                     490,188,490,204,476,204,476,164, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'MShower'
+  $floorItems2['MShower'] = i
+  w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Closet'
+  $floorItems2['Closet'] = i
+  w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'WShower'
+  $floorItems2['WShower'] = i
+  w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
+                     697,166,697,275,553,275,531,254,515,254,
+                     515,174,503,174,503,161,486,161, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '130'
+  $floorItems2['130'] = i
+  w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
+                     342,246,397,246,397,276,393,276,
+                     393,309,300,309,300,248,308,248, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '102'
+  $floorItems2['102'] = i
+  w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '128'
+  $floorItems2['128'] = i
+  w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
+                     552,277,561,277,561,325,510,325,
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '129'
+  $floorItems2['129'] = i
+  w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
+                     642,389,561,389,561,277,696,277, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '133'
+  $floorItems2['133'] = i
+  w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '132'
+  $floorItems2['132'] = i
+  w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '134'
+  $floorItems2['134'] = i
+  w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '135'
+  $floorItems2['135'] = i
+  w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
+                     304,312,396,312,396,288,400,288,404,288,
+                     409,290,413,292,418,297,421,302,422,309,
+                     421,318,417,325,411,330,405,332,397,333,
+                     344,333,340,334,336,336,335,338,332,342,
+                     331,347,332,351,334,354,336,357,341,359, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Ramona Stair'
+  $floorItems2['Ramona Stair'] = i
+  w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
+                     122,28,123,32,123,68,220,68,220,87,90,87,90,23, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'University Stair'
+  $floorItems2['University Stair'] = i
+  w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
+                     358,48,363,39,365,29,348,25,335,22,321,14,
+                     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
+                     227,13,223,17,221,22,220,34,260,34, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Plaza Stair'
+  $floorItems2['Plaza Stair'] = i
+  w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
+                     323,56,337,70,350,83,365,94,377,100,
+                     386,104,386,128,220,128, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Plaza Deck'
+  $floorItems2['Plaza Deck'] = i
+  w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '106'
+  $floorItems2['106'] = i
+  w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
+                     95,128,114,128,114,151,157,151,157,153,112,153,
+                     112,130,97,130,97,168,175,168,175,131,146,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '119'
+  $floorItems2['119'] = i
+  w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  w.create(TkcLine,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+end
+
+# floor2_fg2 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the foreground information for the second
+# floor (office outlines and numbers).
+#
+# Arguments:
+# w -           The canvas window.
+# color -       Color to use for drawing foreground information.
+
+def floor2_fg2(w,color)
+  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
+                     800,222,800,168,748,168, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '238'
+  $floorItems2['238'] = i
+  w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '237'
+  $floorItems2['237'] = i
+  w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
+                     643,324,643,291,641,291,641,205,696,205,
+                     696,291,694,291,694,314,715,314,715,291,
+                     715,205,755,205,755,190,724,190,724,187, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '246'
+  $floorItems2['246'] = i
+  w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '247'
+  $floorItems2['247'] = i
+  w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
+                     397,246,397,255,476,255,476,250,482,250,559,250,
+                     559,274,482,274,482,278,396,278,396,274,232,274, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '202'
+  $floorItems2['202'] = i
+  w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
+                     306,196,306,180,175,180,175,169,156,169,
+                     156,196,176,196,176,228, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '206'
+  $floorItems2['206'] = i
+  w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '212'
+  $floorItems2['212'] = i
+  w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '245'
+  $floorItems2['245'] = i
+  w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '244'
+  $floorItems2['244'] = i
+  w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '243'
+  $floorItems2['243'] = i
+  w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '242'
+  $floorItems2['242'] = i
+  w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = 'Barbecue Deck'
+  $floorItems2['Barbecue Deck'] = i
+  w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '240'
+  $floorItems2['240'] = i
+  w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '241'
+  $floorItems2['241'] = i
+  w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '239'
+  $floorItems2['239'] = i
+  w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '248'
+  $floorItems2['248'] = i
+  w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '236'
+  $floorItems2['236'] = i
+  w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '235'
+  $floorItems2['235'] = i
+  w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
+                     572,143,579,143,579,185,626,185, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '234'
+  $floorItems2['234'] = i
+  w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
+                     578,185,527,185,527,131,557,131, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '233'
+  $floorItems2['233'] = i
+  w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '230'
+  $floorItems2['230'] = i
+  w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '232'
+  $floorItems2['232'] = i
+  w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '229'
+  $floorItems2['229'] = i
+  w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '227'
+  $floorItems2['227'] = i
+  w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '228'
+  $floorItems2['228'] = i
+  w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '226'
+  $floorItems2['226'] = i
+  w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '225'
+  $floorItems2['225'] = i
+  w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '224'
+  $floorItems2['224'] = i
+  w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '223'
+  $floorItems2['223'] = i
+  w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '222'
+  $floorItems2['222'] = i
+  w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '221'
+  $floorItems2['221'] = i
+  w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '204'
+  $floorItems2['204'] = i
+  w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '205'
+  $floorItems2['205'] = i
+  w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '207'
+  $floorItems2['207'] = i
+  w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '208'
+  $floorItems2['208'] = i
+  w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '209'
+  $floorItems2['209'] = i
+  w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '217'
+  $floorItems2['217'] = i
+  w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '217A'
+  $floorItems2['217A'] = i
+  w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '216'
+  $floorItems2['216'] = i
+  w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '215'
+  $floorItems2['215'] = i
+  w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '214'
+  $floorItems2['214'] = i
+  w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '213'
+  $floorItems2['213'] = i
+  w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '210'
+  $floorItems2['210'] = i
+  w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '211'
+  $floorItems2['211'] = i
+  w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '203'
+  $floorItems2['203'] = i
+  w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
+                     154,198,154,192,109,192,109,169,99,169, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '220'
+  $floorItems2['220'] = i
+  w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = 'Priv Lift2'
+  $floorItems2['Priv Lift2'] = i
+  w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = 'Pub Lift 2'
+  $floorItems2['Pub Lift 2'] = i
+  w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '218'
+  $floorItems2['218'] = i
+  w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '219'
+  $floorItems2['219'] = i
+  w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '201'
+  $floorItems2['201'] = i
+  w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  w.create(TkcLine,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
+end
+
+# floor2_fg3 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the foreground information for the third
+# floor (office outlines and numbers).
+#
+# Arguments:
+# w -           The canvas window.
+# color -       Color to use for drawing foreground information.
+
+def floor2_fg3(w,color)
+  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '316'
+  $floorItems2['316'] = i
+  w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '309'
+  $floorItems2['309'] = i
+  w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '308'
+  $floorItems2['308'] = i
+  w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '307'
+  $floorItems2['307'] = i
+  w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '305'
+  $floorItems2['305'] = i
+  w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '324B'
+  $floorItems2['324B'] = i
+  w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '324A'
+  $floorItems2['324A'] = i
+  w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '320'
+  $floorItems2['320'] = i
+  w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '310'
+  $floorItems2['310'] = i
+  w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '312'
+  $floorItems2['312'] = i
+  w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '313'
+  $floorItems2['313'] = i
+  w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '314'
+  $floorItems2['314'] = i
+  w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '315'
+  $floorItems2['315'] = i
+  w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '316B'
+  $floorItems2['316B'] = i
+  w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '316A'
+  $floorItems2['316A'] = i
+  w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
+                     174,198,174,226,101,226,101,179,97,179, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '319'
+  $floorItems2['319'] = i
+  w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '311'
+  $floorItems2['311'] = i
+  w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '318'
+  $floorItems2['318'] = i
+  w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '317'
+  $floorItems2['317'] = i
+  w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '323'
+  $floorItems2['323'] = i
+  w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '325'
+  $floorItems2['325'] = i
+  w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '321'
+  $floorItems2['321'] = i
+  w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
+                     264,181,264,135,314,135, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '322'
+  $floorItems2['322'] = i
+  w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = 'Pub Lift3'
+  $floorItems2['Pub Lift3'] = i
+  w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = 'Priv Lift3'
+  $floorItems2['Priv Lift3'] = i
+  w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '303'
+  $floorItems2['303'] = i
+  w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
+                     244,230,244,221,252,221,252,203, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '324'
+  $floorItems2['324'] = i
+  w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '304'
+  $floorItems2['304'] = i
+  w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '301'
+  $floorItems2['301'] = i
+  w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '327'
+  $floorItems2['327'] = i
+  w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '326'
+  $floorItems2['326'] = i
+  w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
+                     375,274,397,274,397,248,339,248,339,242,308,242, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '302'
+  $floorItems2['302'] = i
+  w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
+                     272,193,263,180,242,180,175,180,175,169,156,169,
+                     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
+                     107,248,160,248,160,301,107,301,107,275,70,275, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '306'
+  $floorItems2['306'] = i
+  w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+end
+
+# Below is the "main program" that creates the floorplan demonstration.
+
+# toplevel widget
+if defined?($floor2_demo) && $floor2_demo
+  $floor2_demo.destroy 
+  $floor2_demo = nil
+end
+
+# demo toplevel widget
+$floor2_demo = TkToplevel.new {|w|
+  title("Floorplan Canvas Demonstration 2")
+  iconname("Floorplan2")
+  positionWindow(w)
+  geometry('+20+20')
+  minsize(100,100)
+}
+
+# label
+TkLabel.new($floor2_demo, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
+            'text'=>"This window contains a canvas widget showing the floorplan of Digital Equipment Corporation's Western Research Laboratory.  It has three levels.  At any given time one of the levels is active, meaning that you can see its room structure.  To activate a level, click the left mouse button anywhere on it.  As the mouse moves over the active level, the room under the mouse lights up and its room number appears in the \"Room:\" entry.  You can also type a room number in the entry and the room will light up."){
+  pack('side'=>'top')
+}
+
+# frame
+$floor2_buttons = TkFrame.new($floor2_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $floor2_demo
+      $floor2_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'floor2'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$floor2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# 
+$floorLabels2 = {}
+$floorItems2 = {}
+
+# canvas 
+if $tk_version =~ /^4\.[01]/
+  $floor2_canvas_frame = TkFrame.new($floor2_demo,'bd'=>2,'relief'=>'sunken',
+                                    'highlightthickness'=>2)
+  $floor2_canvas = TkCanvas.new($floor2_canvas_frame, 
+                               'width'=>900, 'height'=>500, 'borderwidth'=>0, 
+                               'highlightthickness'=>0) {|c|
+    TkScrollbar.new($floor2_demo, 'orient'=>'horiz', 
+                    'command'=>proc{|*args| c.xview(*args)}){|hs|
+      c.xscrollcommand(proc{|first,last| hs.set first,last})
+      pack('side'=>'bottom', 'fill'=>'x')
+    }
+    TkScrollbar.new($floor2_demo, 'command'=>proc{|*args| c.yview(*args)}){|vs|
+      c.yscrollcommand(proc{|first,last| vs.set first,last})
+      pack('side'=>'right', 'fill'=>'y')
+    }
+  }
+  $floor2_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
+  $floor2_canvas.pack('expand'=>'yes', 'fill'=>'both')
+
+else
+  TkFrame.new($floor2_demo) {|f|
+    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
+
+    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
+    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
+
+    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
+      $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500, 
+                                   'borderwidth'=>0, 
+                                   'highlightthickness'=>0) {
+        xscrollcommand(proc{|first,last| h.set first,last})
+        yscrollcommand(proc{|first,last| v.set first,last})
+        pack('expand'=>'yes', 'fill'=>'both')
+      }
+      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    }
+
+    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+
+    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+
+    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
+
+    v.command(proc{|*args| $floor2_canvas.yview(*args)})
+    h.command(proc{|*args| $floor2_canvas.xview(*args)})
+  }
+end
+
+
+# Create an entry for displaying and typing in current room.
+
+$currentRoom2 = TkVariable.new
+$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken', 
+                           'bd'=>2, 'textvariable'=>$currentRoom2)
+
+# Choose colors, then fill in the floorplan.
+
+$floor2_colors = {}
+if TkWinfo.depth($floor2_canvas) > 1
+  $floor2_colors['bg1'] = '#a9c1da'
+  $floor2_colors['outline1'] = '#77889a'
+  $floor2_colors['bg2'] = '#9ab0c6'
+  $floor2_colors['outline2'] = '#687786'
+  $floor2_colors['bg3'] = '#8ba0b3'
+  $floor2_colors['outline3'] = '#596673'
+  $floor2_colors['offices'] = 'Black'
+  $floor2_colors['active'] = '#c4d1df'
+else
+  $floor2_colors['bg1'] = 'white'
+  $floor2_colors['outline1'] = 'black'
+  $floor2_colors['bg2'] = 'white'
+  $floor2_colors['outline2'] = 'black'
+  $floor2_colors['bg3'] = 'white'
+  $floor2_colors['outline3'] = 'black'
+  $floor2_colors['offices'] = 'Black'
+  $floor2_colors['active'] = 'black'
+end
+
+$activeFloor2 = ''
+floorDisplay2 $floor2_canvas,3
+
+# Set up event bindings for canvas:
+
+$floor2_canvas.itembind('floor1', '1', proc{floorDisplay2 $floor2_canvas,1})
+$floor2_canvas.itembind('floor2', '1', proc{floorDisplay2 $floor2_canvas,2})
+$floor2_canvas.itembind('floor3', '1', proc{floorDisplay2 $floor2_canvas,3})
+$floor2_canvas.itembind('room', 'Enter', proc{newRoom2 $floor2_canvas})
+$floor2_canvas.itembind('room', 'Leave', proc{$currentRoom2.value = ''})
+$floor2_canvas.bind('2', proc{|x,y| $floor2_canvas.scan_mark x,y}, '%x %y')
+$floor2_canvas.bind('B2-Motion', 
+                   proc{|x,y| $floor2_canvas.scan_dragto x,y}, '%x %y')
+$floor2_canvas.bind('Destroy', proc{$currentRoom2.unset})
+$currentRoom2.value = ''
+$currentRoom2.trace('w',proc{roomChanged2 $floor2_canvas})
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/form.rb b/ruby_1_8_6/ext/tk/sample/demos-en/form.rb
new file mode 100644
index 0000000000..dbb14302dc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/form.rb
@@ -0,0 +1,62 @@
+#
+# form widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($form_demo) && $form_demo
+  $form_demo.destroy 
+  $form_demo = nil
+end
+
+# demo toplevel widget
+$form_demo = TkToplevel.new {|w|
+  title("Form Demonstration")
+  iconname("form")
+  positionWindow(w)
+}
+
+# label
+msg = TkLabel.new($form_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "This window contains a simple form where you can type in the various entries and use tabs to move circularly between the entries."
+}
+msg.pack('side'=>'top', 'fill'=>'x')
+
+# frame
+TkFrame.new($form_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $form_demo
+      $form_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'form'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# entry 
+form_data = []
+(1..5).each{|i|
+  f = TkFrame.new($form_demo, 'bd'=>2)
+  e = TkEntry.new(f, 'relief'=>'sunken', 'width'=>40)
+  l = TkLabel.new(f)
+  e.pack('side'=>'right')
+  l.pack('side'=>'left')
+  form_data[i] = {'frame'=>f, 'entry'=>e, 'label'=>l}
+}
+
+# 
+form_data[1]['label'].text('Name:')
+form_data[2]['label'].text('Address:')
+form_data[5]['label'].text('Phone:')
+
+# pack
+(1..5).each{|i| form_data[i]['frame'].pack('side'=>'top', 'fill'=>'x')}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/goldberg.rb b/ruby_1_8_6/ext/tk/sample/demos-en/goldberg.rb
new file mode 100644
index 0000000000..8d3f6d14f7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/goldberg.rb
@@ -0,0 +1,1999 @@
+#
+# Ruby/Tk Goldverg demo (called by 'widget')
+#
+# Based on Tcl/Tk8.5a2 widget demos.
+# The following is the original comment of TkGoldberg.tcl.
+#
+#>>##+#################################################################
+#>>#
+#>># TkGoldberg.tcl
+#>># by Keith Vetter, March 13, 2003
+#>>#
+#>># "Man will always find a difficult means to perform a simple task"
+#>># Rube Goldberg
+#>>#
+#>># Reproduced here with permission.
+#>>#
+#>>##+#################################################################
+#>>#
+#>># Keith Vetter 2003-03-21: this started out as a simple little program
+#>># but was so much fun that it grew and grew. So I apologize about the
+#>># size but I just couldn't resist sharing it.
+#>>#
+#>># This is a whizzlet that does a Rube Goldberg type animation, the
+#>># design of which comes from an New Years e-card from IncrediMail.
+#>># That version had nice sound effects which I eschewed. On the other
+#>># hand, that version was in black and white (actually dark blue and
+#>># light blue) and this one is fully colorized.
+#>>#
+#>># One thing I learned from this project is that drawing filled complex
+#>># objects on a canvas is really hard. More often than not I had to
+#>># draw each item twice--once with the desired fill color but no
+#>># outline, and once with no fill but with the outline. Another trick
+#>># is erasing by drawing with the background color. Having a flood fill
+#>># command would have been extremely helpful.
+#>>#
+#>># Two wiki pages were extremely helpful: Drawing rounded rectangles
+#>># which I generalized into Drawing rounded polygons, and regular
+#>># polygons which allowed me to convert ovals and arcs into polygons
+#>># which could then be rotated (see Canvas Rotation). I also wrote
+#>># Named Colors to aid in the color selection.
+#>>#
+#>># I could comment on the code, but it's just 26 state machines with
+#>># lots of canvas create and move calls.
+
+if defined?($goldberg_demo) && $goldberg_demo
+  $goldberg_demo.destroy 
+  $goldberg_demo = nil
+end
+
+# demo toplevel widget
+$goldberg_demo = TkToplevel.new {|w|
+  title("Tk Goldberg (demonstration)")
+  iconname("goldberg")
+#  positionWindow(w)
+}
+
+=begin
+# label
+msg = TkLabel.new($goldberg_demo) {
+  font 'Arial 10'
+  wraplength '4i'
+  justify 'left'
+  text "This is a demonstration of just how complex you can make your animations become. Click the ball to start things moving!\n\n\"Man will always find a difficult means to perform a simple task\"\n - Rube Goldberg"
+}
+msg.pack('side'=>'top')
+=end
+
+=begin
+# frame
+TkFrame.new($goldberg_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $goldberg_demo
+      $goldberg_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'See Code'
+    command proc{showCode 'goldberg'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+=end
+
+#########################################
+
+class TkGoldberg_Demo
+  def initialize(parent)
+    @parent = parent
+
+    @S = {}
+    @S['title']   = 'Tk Goldberg'
+    @S['speed']   = TkVariable.new(5)
+    @S['cnt']     = TkVariable.new(0)
+    @S['message'] = TkVariable.new("\\nWelcome\\nto\\nRuby/Tk")
+    @S['pause']   = TkVariable.new
+    @S['details'] = TkVariable.new(true)
+
+    @S['mode'] = TkVariable.new(:MSTART, :symbol) 
+    #            :MSTART, :MGO, :MPAUSE, :MSSTEP, :MBSTEP, :MDONE, :MDEBUG
+
+    #         0,  1,  2,  3,  4,  5,   6,   7,   8,   9,  10
+    @speed = [1, 10, 20, 50, 80, 100, 150, 200, 300, 400, 500]
+
+    # colors
+    @C = {}
+    @C['fg'] = 'black'
+    # @C['bg'] = 'gray75'
+    @C['bg'] = 'cornflowerblue'
+
+    @C['0'] = 'white';         @C['1a'] = 'darkgreen';   @C['1b'] = 'yellow'
+    @C['2'] = 'red';           @C['3a'] = 'green';       @C['3b'] = 'darkblue'
+    @C['4'] = @C['fg'];        @C['5a'] = 'brown';       @C['5b'] = 'white'
+    @C['6'] = 'magenta';       @C['7'] = 'green';        @C['8'] = @C['fg']
+    @C['9'] = 'blue4';         @C['10a'] = 'white';      @C['10b'] = 'cyan'
+    @C['11a'] = 'yellow';      @C['11b'] = 'mediumblue'; @C['12'] = 'tan2'
+    @C['13a'] = 'yellow';      @C['13b'] = 'red';        @C['14'] = 'white'
+    @C['15a'] = 'green';       @C['15b'] = 'yellow';     @C['16'] = 'gray65'
+    @C['17'] = '#A65353';     @C['18'] = @C['fg'];      @C['19'] = 'gray50'
+    @C['20'] = 'cyan';         @C['21'] = 'gray65';      @C['22'] = @C['20']
+    @C['23a'] = 'blue';        @C['23b'] = 'red';        @C['23c'] = 'yellow'
+    @C['24a'] = 'red';         @C['24b'] = 'white';
+
+    @STEP = TkVariable.new_hash
+    @STEP.default_value_type = :numeric
+
+    @XY = {}
+
+    @XY6 = {
+      '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192], 
+      '-5'=>[340, 190], '-6'=>[349, 177], '-7'=>[366, 177], '-8'=>[380, 176],
+      '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164], 
+      '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151], 
+      '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219], 
+      '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324], 
+      '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346], 
+      '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391], 
+      '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456], 
+      '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443], 
+      '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437], 
+      '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424], 
+      '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412], 
+      '13,15'=>[376, 410], '13,16'=>[360, 403]
+    }
+
+    @timer = TkTimer.new(@speed[@S['speed'].numeric]){|timer|
+      timer.set_interval(go)
+    }
+
+    do_display
+    reset
+
+    # Start everything going
+    @timer.start
+  end
+
+  def do_display()
+    @ctrl = TkFrame.new(@parent, :relief=>:ridge, :bd=>2, :padx=>5, :pady=>5)
+    @screen = TkFrame.new(@parent, :bd=>2, 
+                         :relief=>:raised).pack(:side=>:left, :fill=>:both, 
+                                                :expand=>true)
+
+    @canvas = TkCanvas.new(@parent, :width=>850, :height=>700, 
+                          :bg=>@C['bg'], :highlightthickness=>0){
+      scrollregion([0, 0, 1000, 1000]) # Kludge to move everything up
+      yview_moveto(0.05)
+    }.pack(:in=>@screen, :side=>:top, :fill=>:both, :expand=>true)
+
+    @canvas.bind('3'){ @pause.invoke }
+    @canvas.bind('Destroy'){ @timer.stop }
+
+    do_ctrl_frame
+    do_detail_frame
+
+    msg = TkLabel.new(@parent, :bg=>@C['bg'], :fg=>'white') {
+      font 'Arial 10'
+      wraplength 600
+      justify 'left'
+      text "This is a demonstration of just how complex you can make your animations become. Click the ball to start things moving!\n\"Man will always find a difficult means to perform a simple task\" - Rube Goldberg"
+    }
+    msg.place(:in=>@canvas, :relx=>0, :rely=>0, :anchor=>:nw)
+
+    frame = TkFrame.new(@parent, :bg=>@C['bg'])
+
+    TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
+      text 'Dismiss'
+      command proc{
+        tmppath = $goldberg_demo
+        $goldberg_demo = nil
+        tmppath.destroy
+      }
+    }.pack('side'=>'left')
+
+    TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
+      text 'See Code'
+      command proc{showCode 'goldberg'}
+    }.pack('side'=>'left', 'padx'=>5)
+
+    @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl}, 
+                         :bg=>@C['bg'], :activebackground=>@C['bg'])
+    @show.pack('side'=>'left')
+    frame.place(:in=>@canvas, :relx=>1, :rely=>0, :anchor=>:ne)
+
+    Tk.update
+  end
+
+  def do_ctrl_frame
+    @start = TkButton.new(@parent, :text=>'Start', :bd=>6, 
+                          :command=>proc{do_button(0)})
+    @start.font(@start['font'].weight('bold'))
+    font = @start['font']
+
+    @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font, 
+                               :command=>proc{do_button(1)}, :relief=>:raised, 
+                               :variable=>@S['pause'])
+
+    @step  = TkButton.new(@parent, :text=>'Single Step', :font=>font, 
+                          :command=>proc{do_button(2)})
+    @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font, 
+                          :command=>proc{do_button(4)})
+    @reset = TkButton.new(@parent, :text=>'Reset', :font=>font, 
+                          :command=>proc{do_button(3)})
+
+    @details = TkFrame.new(@parent, :bd=>2, :relief=>:ridge)
+    @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font, 
+                               :relief=>:raised, :variable=>@S['details'])
+
+    @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'], 
+                             :justify=>:center)
+    @speed_scale = TkScale.new(@parent, :orient=>:horizontal, 
+                               :from=>1, :to=>10, :font=>font, 
+                               :variable=>@S['speed'], :bd=>2, 
+                               :relief=>:ridge, :showvalue=>false)
+    @about = TkButton.new(@parent, :text=>'About', 
+                          :command=>proc{about}, :font=>font)
+
+    Tk.grid(@start, :in=>@ctrl, :row=>0, :sticky=>:ew)
+    @ctrl.grid_rowconfigure(1, :minsize=>10)
+    Tk.grid(@pause, :in=>@ctrl, :row=>2, :sticky=>:ew)
+    Tk.grid(@step,  :in=>@ctrl, :sticky=>:ew)
+    Tk.grid(@bstep, :in=>@ctrl, :sticky=>:ew)
+    Tk.grid(@reset, :in=>@ctrl, :sticky=>:ew)
+    @ctrl.grid_rowconfigure(10, :minsize=>20)
+    Tk.grid(@details, :in=>@ctrl, :row=>11, :sticky=>:ew)
+    Tk.grid(@detail, :in=>@details, :row=>0, :sticky=>:ew)
+    @ctrl.grid_rowconfigure(50, :weight=>1)
+
+    @S['mode'].trace('w', proc{|*args| active_GUI(*args)})
+    @S['details'].trace('w', proc{|*args| active_GUI(*args)})
+    @S['speed'].trace('w', proc{|*args| active_GUI(*args)})
+
+    Tk.grid(@msg_entry, :in=>@ctrl, :row=>98, :sticky=>:ew, :pady=>5)
+    Tk.grid(@speed_scale, :in=>@ctrl, :row=>99, :sticky=>:ew)
+    Tk.grid(@about, :in=>@ctrl, :row=>100, :sticky=>:ew)
+
+    @reset.bind('3'){@S['mode'].value = -1}  # Debugging
+  end
+
+  def do_detail_frame
+    @f_details = TkFrame.new(@details)
+
+    @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'], 
+                         :bd=>1, :relief=>:solid, :bg=>'white')
+    Tk.grid(@label, '-', '-', '-', :sticky=>:ew, :row=>0)
+
+    idx = 1
+    loop {
+      break unless respond_to?("move#{idx}")
+      l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e, 
+                      :width=>2, :bd=>1, :relief=>:solid, :bg=>'white')
+      @STEP[idx] = 0
+      ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx), 
+                       :width=>5, :bd=>1, :relief=>:solid, :bg=>'white')
+      row = (idx + 1)/2
+      col = ((idx + 1) & 1) * 2
+      Tk.grid(l, :sticky=>:ew, :row=>row, :column=>col)
+      Tk.grid(ll, :sticky=>:ew, :row=>row, :column=>(col + 1))
+      idx += 1
+    }
+    @f_details.grid_columnconfigure(1, :weight=>1)
+  end
+
+  def show_ctrl
+    if @ctrl.winfo_mapped?
+      @ctrl.pack_forget
+      @show.text('>>')
+    else
+      @ctrl.pack(:side=>:right, :fill=>:both, :ipady=>5)
+      @show.text('<<')
+    end
+  end
+
+  def draw_all
+    reset_step
+    @canvas.delete(:all)
+    idx = 0
+    loop{
+      m = "draw#{idx}"
+      break unless respond_to?(m)
+      send(m)
+      idx += 1
+    }
+  end
+
+  def active_GUI(var1, var2, op)
+    st = {false=>:disabled, true=>:normal}
+
+    m = @S['mode'].to_sym
+    @S['pause'].value = (m == :MPAUSE)
+    @start.state(st[m != :MGO])
+    @pause.state(st[m != :MSTART && m != :MDONE])
+    @step.state(st[m != :MGO && m != :MDONE])
+    @bstep.state(st[m != :MGO && m != :MDONE])
+    @reset.state(st[m != :MSTART])
+
+    if @S['details'].bool
+      Tk.grid(@f_details, :in=>@details, :row=>2, :sticky=>:ew)
+    else
+      Tk.grid_forget(@f_details)
+    end
+    @speed_scale.label("Speed: #{@S['speed'].value}")
+  end
+
+  def start
+    @S['mode'].value = :MGO
+  end
+
+  def do_button(what)
+    case what
+    when 0  # Start
+      reset if @S['mode'].to_sym == :MDONE
+      @S['mode'].value = :MGO
+
+    when 1  # Pause
+      @S['mode'].value = ((@S['pause'].bool)? :MPAUSE: :MGO)
+
+    when 2  # Step
+      @S['mode'].value = :MSSTEP
+
+    when 3  # Reset
+      reset
+
+    when 4  # Big step
+      @S['mode'].value = :MBSTEP
+    end
+  end
+
+  def go(who = nil)
+    now = Tk::Clock.clicks(:miliseconds)
+    if who  # Start here for debugging
+      @S['active'] = [who]
+      @S['mode'].value = :MGO
+    end
+    return if @S['mode'].to_sym == :MDEBUG  # Debugging
+    # If not paused, do the next move
+    n = next_step if @S['mode'].to_sym != :MPAUSE
+    @S['mode'].value = :MPAUSE if @S['mode'].to_sym == :MSSTEP  # Single step
+    @S['mode'].value = :MSSTEP if @S['mode'].to_sym == :MBSTEP && n  # big step
+    elapsed = Tk::Clock.clicks(:miliseconds) - now
+    delay = @speed[@S['speed'].to_i] - elapsed
+    delay = 1 if delay <= 0
+    return delay
+  end
+
+  def next_step
+    retval = false   # Return value
+
+    if @S['mode'].to_sym != :MSTART && @S['mode'].to_sym != :MDONE
+      @S['cnt'].numeric += 1
+    end
+    alive = []
+    @S['active'].each{|who|
+      who = who.to_i
+      n = send("move#{who}")
+      if (n & 1).nonzero?          # This guy still alive
+        alive << who 
+      end
+      if (n & 2).nonzero?          # Next guy is active
+        alive << (who + 1)
+        retval = true
+      end
+      if (n & 4).nonzero?          # End of puzzle flag
+        @S['mode'].value = :MDONE  # Done mode
+        @S['active'] = []          # No more animation
+        return true
+      end
+    }
+    @S['active'] = alive
+    return retval
+  end
+
+  def about
+    msg = "Ruby/Tk Version ::\nby Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)\n\n"
+    msg += "Original Version ::\n"
+    msg += "#{@S['title']}\nby Keith Vetter, March 2003\n(Reproduced by kind permission of the author)\n\n"
+    msg += "Man will always find a difficult means to perform a simple task"
+    msg += "\nRube Goldberg"
+    Tk.messageBox(:message=>msg, :title=>'About')
+  end
+
+  ################################################################
+  #
+  # All the drawing and moving routines
+  #
+
+  # START HERE! banner
+  def draw0
+    color = @C['0']
+    TkcText.new(@canvas, [579, 119], :text=>'START HERE!', 
+                :fill=>color, :anchor=>:w, 
+                :tag=>'I0', :font=>['Times Roman', 12, :italic, :bold])
+    TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color, 
+                :width=>5, :arrow=>:last, :arrowshape=>[18, 18, 5])
+    @canvas.itembind('I0', '1'){ start }
+  end
+
+  def move0(step = nil)
+    step = get_step(0, step)
+
+    if @S['mode'].to_sym != :MSTART    # Start the ball rolling
+      move_abs('I0', [-100, -100])     # Hide the banner
+      return 2
+    end
+
+    pos = [
+      [673, 119], [678, 119], [683, 119], [688, 119], 
+      [693, 119], [688, 119], [683, 119], [678, 119]
+    ]
+    step = step % pos.length
+    move_abs('I0', pos[step])
+    return 1
+  end
+
+  # Dropping ball
+  def draw1
+    color = @C['1a']
+    color2 = @C['1b']
+    TkcPolygon.new(@canvas, 
+                   [ 844, 133, 800, 133, 800, 346, 820, 346, 
+                     820, 168, 844, 168, 844, 133 ], 
+                   :width=>3, :fill=>color, :outline=>'')
+    TkcPolygon.new(@canvas, 
+                   [ 771, 133, 685, 133, 685, 168, 751, 168, 
+                     751, 346, 771, 346, 771, 133 ], 
+                   :width=>3, :fill=>color, :outline=>'')
+    TkcOval.new(@canvas, box(812, 122, 9), 
+                :tag=>'I1', :fill=>color2, :outline=>'')
+
+    @canvas.itembind('I1', '1'){ start }
+  end
+
+  def move1(step = nil)
+    step = get_step(1, step)
+    pos = [
+      [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153], 
+      [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438], 
+      [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601], 
+      [-100, -100]
+    ]
+    return 0 if step >= pos.length
+    where = pos[step]
+    move_abs('I1', where)
+    move15a if where[2] == :y
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # Lighting the match
+  def draw2
+    color = @C['2']
+
+    # Fulcrum
+    TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392], 
+                   :fill=>@C['fg'], :outline=>@C['fg'])
+
+    # Strike box
+    TkcRectangle.new(@canvas, [628, 335, 660, 383], 
+                     :fill=>'', :outline=>@C['fg'])
+    (0..2).each{|y|
+      yy = 335 + y*16
+      TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25', 
+                    :anchor=>:nw, :foreground=>@C['fg'])
+      TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25', 
+                    :anchor=>:nw, :foreground=>@C['fg'])
+    }
+
+    # Lever
+    TkcLine.new(@canvas, [702, 366, 798, 366], 
+                :fill=>@C['fg'], :width=>6, :tag=>'I2_0')
+
+    # R strap
+    TkcLine.new(@canvas, [712, 363, 712, 355], 
+                :fill=>@C['fg'], :width=>3, :tag=>'I2_1')
+
+    # L strap
+    TkcLine.new(@canvas, [705, 363, 705, 355], 
+                :fill=>@C['fg'], :width=>3, :tag=>'I2_2')
+
+    # Match stick
+    TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356], 
+                :fill=>@C['fg'], :width=>3, :tag=>'I2_3')
+
+    # Match head
+    TkcPolygon.new(@canvas, 
+                   [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1, 
+                     671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ], 
+                   :fill=>color, :outline=>color, :tag=>'I2_4')
+  end
+
+  def move2(step = nil)
+    step = get_step(2, step)
+
+    stages = [0, 0, 1, 2, 0, 2, 1, 0, 1, 2, 0, 2, 1]
+    xy = []
+    xy[0] = [
+      686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307, 
+      662, 318, 662, 328, 671, 336
+    ]
+    xy[1] = [
+      687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311, 
+      661, 327, 671, 335
+    ]
+    xy[2] = [
+      686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298, 
+      666, 309, 660, 324, 672, 336
+    ]
+
+    if step >= stages.length
+      @canvas.delete('I2')
+      return 0
+    end
+
+    if step == 0  # Rotate the match
+      beta = 20
+      
+      ox, oy = anchor('I2_0', :s)  # Where to pivot
+
+      i = 0
+      until @canvas.find_withtag("I2_#{i}").empty?
+        rotate_item("I2_#{i}", ox, oy, beta)
+        i += 1
+      end
+
+      # For the flame
+      TkcPolygon.new(@canvas, [], :tag=>'I2', :smooth=>true, :fill=>@C['2'])
+
+      return 1
+    end
+    @canvas.coords('I2', xy[stages[step]])
+    return ((step == 7)? 3: 1)
+  end
+
+  # Weight and pulleys
+  def draw3
+    color = @C['3a']
+    color2 = @C['3b']
+
+    xy = [ [602, 296], [577, 174], [518, 174] ]
+    xy.each{|x, y| # 3 Pulleys
+      TkcOval.new(@canvas, box(x, y, 13), 
+                  :fill=>color, :outline=>@C['fg'], :width=>3)
+      TkcOval.new(@canvas, box(x, y, 2), :fill=>@C['fg'], :outline=>@C['fg'])
+    }
+
+    # Wall to flame
+    TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s', 
+                :width=>3, :fill=>@C['fg'], :smooth=>true)
+
+    # Flame to pulley 1
+    TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0', 
+                :width=>3, :fill=>@C['fg'], :smooth=>true)
+    TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1', 
+                :width=>3, :fill=>@C['fg'], :smooth=>true)
+
+    # Pulley 1 half way to 2
+    TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2', 
+                :width=>3, :fill=>@C['fg'])
+
+    # Pulley 1 other half to 2
+    TkcLine.new(@canvas, [589, 235, 589, 174], :width=>3, :fill=>@C['fg'])
+
+    # Across the top
+    TkcLine.new(@canvas, [577, 161, 518, 161], :width=>3, :fill=>@C['fg'])
+
+    # Down to weight
+    TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w', 
+                :width=>3, :fill=>@C['fg'])
+
+    # Draw the weight as 2 circles, two rectangles and 1 rounded rectangle
+    x1, y1, x2, y2 = [515, 207, 495, 207]
+    TkcOval.new(@canvas, box(x1, y1, 6), 
+                :tag=>'I3_', :fill=>color2, :outline=>color2)
+    TkcOval.new(@canvas, box(x2, y2, 6), 
+                :tag=>'I3_', :fill=>color2, :outline=>color2)
+    TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6, 
+                     :tag=>'I3_', :fill=>color2, :outline=>color2)
+    
+    TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15), 
+                   :smooth=>true, :tag=>'I3_', :fill=>color2, :outline=>color2)
+
+    TkcLine.new(@canvas, [500, 217, 511, 217], 
+                :tag=>'I3_', :fill=>color2, :width=>10)
+
+    # Bottom weight target
+    TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465], 
+                :tag=>'I3__', :fill=>@C['fg'], :joinstyle=>:miter, :width=>10)
+  end
+
+  def move3(step = nil)
+    step = get_step(3, step)
+
+    pos = [ [505, 247], [505, 297], [505, 386.5], [505, 386.5] ]
+    rope = []
+    rope[0] = [750, 309, 729, 301, 711, 324, 690, 300]
+    rope[1] = [750, 309, 737, 292, 736, 335, 717, 315, 712, 320]
+    rope[2] = [750, 309, 737, 309, 740, 343, 736, 351, 725, 340]
+    rope[3] = [750, 309, 738, 321, 746, 345, 742, 356]
+
+    return 0 if step >= pos.length
+
+    @canvas.delete("I3_#{step}")        # Delete part of the rope
+    move_abs('I3_', pos[step])          # Move weight down
+    @canvas.coords('I3_s', rope[step])  # Flapping rope end
+    @canvas.coords('I3_w', [505, 174].concat(pos[step]))
+    if step == 2
+      @canvas.move('I3__', 0, 30)
+      return 2
+    end
+    return 1
+  end
+
+  # Cage and door
+  def draw4
+    color = @C['4']
+    x0, y0, x1, y1 = [527, 356, 611, 464]
+
+    # Horizontal bars
+    y0.step(y1, 12){|y|
+      TkcLine.new(@canvas, [x0, y, x1, y], :fill=>color, :width=>1)
+    }
+
+    # Vertical bars
+    x0.step(x1, 12){|x|
+      TkcLine.new(@canvas, [x, y0, x, y1], :fill=>color, :width=>1)
+    }
+
+    # Swing gate
+    TkcLine.new(@canvas, [518, 464, 518, 428], 
+                :tag=>'I4', :fill=>color, :width=>1)
+  end
+
+  def move4(step = nil)
+    step = get_step(4, step)
+
+    angles = [-10, -20, -30, -30]
+    return 0 if step >= angles.length
+
+    rotate_item('I4', 518, 464, angles[step])
+    @canvas.raise('I4')
+
+    return((step == 3)? 3: 1)
+  end
+
+  # Mouse
+  def draw5
+    color  = @C['5a']
+    color2 = @C['5b']
+
+    xy = [377, 248, 410, 248, 410, 465, 518, 465]  # Mouse course
+    xy.concat [518, 428, 451, 428, 451, 212, 377, 212]
+
+    TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], :width=>3)
+
+    xy = [
+      534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446, 
+      575, 452, 574, 454, 566, 456, 554, 456, 545, 456, 537, 454, 530, 452
+    ]
+    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_0'], :fill=>color)
+
+    TkcLine.new(@canvas, [573, 452, 592, 458, 601, 460, 613, 456], # Tail
+                :tag=>['I5', 'I5_1'], :fill=>color, :smooth=>true, :width=>3)
+
+    xy = box(540, 446, 2)   # Eye
+    xy = [540, 444, 541, 445, 541, 447, 540, 448, 538, 447, 538, 445]
+    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'], 
+                   :outline=>'', :smooth=>true)
+
+    xy = [538, 454, 535, 461] # Front leg
+    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_3'], :fill=>color, :width=>2)
+
+    xy = [566, 455, 569, 462] # Back leg
+    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_4'], :fill=>color, :width=>2)
+
+    xy = [544, 455, 545, 460] # 2nd front leg
+    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_5'], :fill=>color, :width=>2)
+
+    xy = [560, 455, 558, 460] # 2nd back leg
+    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_6'], :fill=>color, :width=>2)
+  end
+
+  def move5(step = nil)
+    step = get_step(5, step)
+
+    pos = [
+      [553, 452], [533, 452], [513, 452], [493, 452], [473, 452], 
+      [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414], 
+      [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294], 
+      [422, 274, -30], [422, 260.5, -30, :x], [422.5, 248.5, -28], [425, 237]
+    ]
+
+    return 0 if step >= pos.length
+
+    x, y, beta, nxt = pos[step]
+    move_abs('I5', [x, y])
+    if beta
+      ox, oy = centroid('I5_0')
+      (0..6).each{|id| rotate_item("I5_#{id}", ox, oy, beta) }
+    end
+    return 3 if nxt == :x
+    return 1
+  end
+
+  # Dropping gumballs
+  def draw6
+    color = @C['6']
+    xy = [324, 130, 391, 204] # Ball holder
+    xy = round_rect(xy, 10)
+    TkcPolygon.new(@canvas, xy, :smooth=>true, 
+                   :outline=>@C['fg'], :width=>3, :fill=>color)
+    xy = [339, 204, 376, 253] # Below the ball holder
+    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3, 
+                     :fill=>color, :tag=>'I6c')
+    xy = box(346, 339, 28)
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'') # Roter
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc, 
+               :start=>80, :extent=>205)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc, 
+               :start=>-41, :extent=>85)
+
+    xy = box(346, 339, 15) # Center of rotor
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['fg'], :tag=>'I6m')
+    xy = [352, 312, 352, 254, 368, 254, 368, 322] # Top drop to rotor
+    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'')
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
+
+    xy = [353, 240, 367, 300] # Poke bottom hole
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
+    xy = [341, 190, 375, 210] # Poke another hole
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
+
+    xy = [
+      368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403, 
+      352, 403, 352, 366
+    ]
+    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', 
+                   :width=>2) # Below rotor
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
+    xy = box(275, 342, 7) # On/off rotor
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['fg'])
+    xy = [276, 334, 342, 325] # Fan belt top
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+    xy = [276, 349, 342, 353] # Fan belt bottom
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+
+    xy = [337, 212, 337, 247] # What the mouse pushes
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I6_')
+    xy = [392, 212, 392, 247]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I6_')
+    xy = [337, 230, 392, 230]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>7, :tag=>'I6_')
+
+    who = -1 # All the balls
+    colors = %w(red cyan orange green blue darkblue)
+    colors *= 3
+
+    (0..16).each{|i|
+      loc = -i
+      color = colors[i]
+      x, y = @XY6["#{loc}"]
+      TkcOval.new(@canvas, box(x, y, 5), 
+                  :fill=>color, :outline=>color, :tag=>"I6_b#{i}")
+    }
+    draw6a(12) # The wheel
+  end
+
+  def draw6a(beta)
+    @canvas.delete('I6_0')
+    ox, oy = [346, 339]
+    (0..3).each{|i|
+      b = beta + i * 45
+      x, y = rotate_c(28, 0, 0, 0, b)
+      xy = [ox + x, oy + y, ox - x, oy - y]
+      TkcLine.new(@canvas, xy, :tag=>'I6_0', :fill=>@C['fg'], :width=>2)
+    }
+  end
+
+  def move6(step = nil)
+    step = get_step(6, step)
+
+    return 0 if step > 62
+
+    if step < 2  # Open gate for balls to drop
+      @canvas.move('I6_', -7, 0)
+      if step == 1  # Poke a hole
+        xy = [348, 226, 365, 240]
+        TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill), 
+                         :outline=>'')
+      end
+      return 1
+    end
+
+    s = step - 1  # Do the gumball drop dance
+    (0..(((s - 1)/3).to_i)).each{|i|
+      tag = "I6_b#{i}"
+      break if @canvas.find_withtag(tag).empty?
+      loc = s - 3*i
+
+      if @XY6["#{loc},#{i}"]
+        move_abs(tag, @XY6["#{loc},#{i}"])
+      elsif @XY6["#{loc}"]
+        move_abs(tag, @XY6["#{loc}"])
+      end
+    }
+    if s % 3 == 1
+      first = (s + 2)/3
+      i = first
+      loop {
+        tag = "I6_b#{i}"
+        break if @canvas.find_withtag(tag).empty?
+        loc = first - i
+        move_abs(tag, @XY6["#{loc}"])
+        i += 1
+      }
+    end
+    if s >= 3  # Rotate the motor
+      idx = s % 3
+      draw6a(12 + s * 15)
+    end
+    return((s == 3)? 3 : 1)
+  end
+
+  # On/off switch
+  def draw7
+    color = @C['7']
+    xy = [198, 306, 277, 374]  # Box
+    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2, 
+                     :fill=>color, :tag=>'I7z')
+    @canvas.lower('I7z')
+    xy = [275, 343, 230, 349]
+    TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last, 
+                :arrowshape=>[23, 23, 8], :width=>6)
+    xy = [225, 324]  # On button
+    x, y = xy
+    TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
+    xy = [218, 323]  # On text
+    font = ['Times Roman', 8]
+    TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e, 
+                :fill=>@C['fg'], :font=>font)
+    xy = [225, 350]  # Off button
+    x, y = xy
+    TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
+    xy = [218, 349]  # Off text
+    TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e, 
+                :fill=>@C['fg'], :font=>font)
+  end
+
+  def move7(step = nil)
+    step = get_step(7, step)
+
+    numsteps = 30
+    return 0 if step > numsteps
+    beta = 30.0 / numsteps
+    rotate_item('I7', 275, 343, beta)
+
+    return((step == numsteps)? 3: 1)
+  end
+
+  # Electricity to the fan
+  def draw8
+    sine([271, 248, 271, 306], 5, 8, :tag=>'I8_s', :fill=>@C['8'], :width=>3)
+  end
+
+  def move8(step = nil)
+    step = get_step(8, step)
+
+    return 0 if step > 3
+    if step == 0
+      sparkle(anchor('I8_s', :s), 'I8')
+      return 1
+    elsif step == 1
+      move_abs('I8', anchor('I8_s', :c))
+    elsif step == 2
+      move_abs('I8', anchor('I8_s', :n))
+    else
+      @canvas.delete('I8')
+    end
+    return((step == 2)? 3: 1)
+  end
+
+  # Fan
+  def draw9
+    color = @C['9']
+    xy = [266, 194, 310, 220]
+    TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
+    xy = [280, 209, 296, 248]
+    TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
+    xy = [
+      288, 249, 252, 249, 260, 240, 280, 234, 
+      296, 234, 316, 240, 324, 249, 288, 249
+    ]
+    TkcPolygon.new(@canvas, xy, :fill=>color, :smooth=>true)
+
+    xy = [248, 205, 265, 214, 264, 205, 265, 196]  # Spinner
+    TkcPolygon.new(@canvas, xy, :fill=>color)
+
+    xy = [255, 206, 265, 234]  # Fan blades
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+                :width=>3, :tag=>'I9_0')
+    xy = [255, 176, 265, 204]
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+                :width=>3, :tag=>'I9_0')
+    xy = [255, 206, 265, 220]
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+                :width=>1, :tag=>'I9_1')
+    xy = [255, 190, 265, 204]
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+                :width=>1, :tag=>'I9_1')
+  end
+
+  def move9(step = nil)
+    step = get_step(9, step)
+
+    if (step & 1).nonzero?
+      @canvas.itemconfigure('I9_0', :width=>4)
+      @canvas.itemconfigure('I9_1', :width=>1)
+      @canvas.lower('I9_1', 'I9_0')
+    else
+      @canvas.itemconfigure('I9_0', :width=>1)
+      @canvas.itemconfigure('I9_1', :width=>4)
+      @canvas.lower('I9_0', 'I9_1')
+    end
+    return 3 if step == 0
+    return 1
+  end
+
+  # Boat
+  def draw10
+    color  = @C['10a']
+    color2 = @C['10b']
+    xy = [191, 230, 233, 230, 233, 178, 191, 178]  # Sail
+    TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'], 
+                   :tag=>'I10')
+    xy = box(209, 204, 31)  # Front
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie, 
+               :start=>120, :extent=>120, :tag=>'I10')
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+               :start=>120, :extent=>120, :tag=>'I10')
+    xy = box(249, 204, 31)  # Back
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3, 
+               :style=>:pie, :start=>120, :extent=>120, :tag=>'I10')
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+               :start=>120, :extent=>120, :tag=>'I10')
+
+    xy = [200, 171, 200, 249]  # Mast
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I10')
+    xy = [159, 234, 182, 234]  # Bow sprit
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I10')
+    xy = [180, 234, 180, 251, 220, 251]  # Hull
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>6, :tag=>'I10')
+
+    xy = [92, 255, 221, 255]  # Waves
+    sine(xy, 2, 25, :fill=>color2, :width=>1, :tag=>'I10w')
+
+    xy = @canvas.coords('I10w')[4..-5]  # Water
+    xy.concat([222, 266, 222, 277, 99, 277])
+    TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>color2)
+    xy = [222, 266, 222, 277, 97, 277, 97, 266]  # Water bottom
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+
+    xy = box(239, 262, 17)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+               :start=>95, :extent=>103)
+    xy = box(76, 266, 21)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+               :extent=>190)
+  end
+
+  def move10(step = nil)
+    step = get_step(10, step)
+
+    pos = [
+      [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212], 
+      [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212], 
+      [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212], 
+      [116, 212], [111, 212]
+    ]
+
+    return 0 if step >= pos.length
+
+    where = pos[step]
+    move_abs('I10', where)
+
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # 2nd ball drop
+  def draw11
+    color  = @C['11a']
+    color2 = @C['11b']
+    xy = [23, 264, 55, 591]  # Color the down tube
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
+    xy = box(71, 460, 48)    # Color the outer loop
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
+
+    xy = [55, 264, 55, 458]  # Top right side
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+    xy = [55, 504, 55, 591]  # Bottom right side
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+    xy = box(71, 460, 48)    # Outer loop
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+               :start=>110, :extent=>-290, :tag=>'I11i')
+    xy = box(71, 460, 16)    # Inner loop
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'', 
+                :width=>3, :tag=>'I11i')
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['bg'], :width=>3)
+
+    xy = [23, 264, 23, 591]  # Left side
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+    xy = box(1, 266, 23)     # Top left curve
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, 
+               :style=>:arc, :extent=>90)
+
+    xy = box(75, 235, 9)     # The ball
+    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'', 
+                :width=>3, :tag=>'I11')
+  end
+
+  def move11(step = nil)
+    step = get_step(11, step)
+
+    pos = [
+      [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266], 
+      [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472], 
+      [100, 437], [65, 423], [-100, -100], [38, 505], [38, 527, :x], [38, 591]
+    ]
+
+    return 0 if step >= pos.length
+    where = pos[step]
+    move_abs('I11', where)
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # Hand
+  def draw12
+    xy = [
+      20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590, 
+      60, 590, 60, 610, 60, 610
+    ]
+    xy.concat([60, 610, 65, 620, 60, 631])  # Thumb
+    xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669, 
+                56, 669, 50, 669, 50, 662, 50, 637])
+
+    y0 = 637  # Bumps for fingers
+    y1 = 645
+    50.step(21, -10){|x|
+      x1 = x - 5
+      x2 = x - 10
+      xy << x << y0 << x1 << y1 << x2 << y0
+    }
+    TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'], 
+                   :smooth=>true, :tag=>'I12', :width=>3)
+  end
+
+  def move12(step = nil)
+    step = get_step(12, step)
+
+    pos = [[42.5, 641, :x]]
+    return 0 if step >= pos.length
+    where = pos[step]
+    move_abs('I12', where)
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # Fax
+  def draw13
+    color = @C['13a']
+    xy = [86, 663, 149, 663, 149, 704, 50, 704, 50, 681, 64, 681, 86, 671]
+    xy2 = [
+      784, 663, 721, 663, 721, 704, 820, 704, 820, 681, 806, 681, 784, 671
+    ]
+    radii = [2, 9, 9, 8, 5, 5, 2]
+
+    round_poly(@canvas, xy, radii, :width=>3, 
+               :outline=>@C['fg'], :fill=>color)
+    round_poly(@canvas, xy2, radii, :width=>3, 
+               :outline=>@C['fg'], :fill=>color)
+
+    xy = [56, 677]
+    x, y = xy
+    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'], 
+                     :width=>3, :tag=>'I13')
+    xy = [809, 677]
+    x, y = xy
+    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'], 
+                     :width=>3, :tag=>'I13R')
+
+    xy = [112, 687]  # Label
+    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'], 
+                :font=>['Times Roman', 12, :bold])
+    xy = [762, 687]
+    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'], 
+                :font=>['Times Roman', 12, :bold])
+
+    xy = [138, 663, 148, 636, 178, 636]  # Paper guide
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
+    xy = [732, 663, 722, 636, 692, 636]
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
+
+    sine([149, 688, 720, 688], 5, 15, 
+         :tag=>'I13_s', :fill=>@C['fg'],  :width=>3)
+  end
+
+  def move13(step = nil)
+    step = get_step(13, step)
+
+    numsteps = 7
+
+    if step == numsteps + 2
+      move_abs('I13_star', [-100, -100])
+      @canvas.itemconfigure('I13R', :fill=>@C['13b'], :width=>2)
+      return 2
+    end
+    if step == 0  # Button down
+      @canvas.delete('I13')
+      sparkle([-100, -100], 'I13_star')  # Create off screen
+      return 1
+    end
+    x0, y0 = anchor('I13_s', :w)
+    x1, y1 = anchor('I13_s', :e)
+    x = x0 + (x1 - x0) * (step - 1) / numsteps.to_f
+    move_abs('I13_star', [x, y0])
+    return 1
+  end
+
+  # Paper in fax
+  def draw14
+    color = @C['14']
+    xy = [102, 661, 113, 632, 130, 618]  # Left paper edge
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+                :width=>3, :tag=>'I14L_0')
+    xy = [148, 629, 125, 640, 124, 662]  # Right paper edge
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+                :width=>3, :tag=>'I14L_1')
+    draw14a('L')
+
+    xy = [
+      768.0, 662.5, 767.991316225, 662.433786215, 767.926187912, 662.396880171
+    ]
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+                :width=>3, :tag=>'I14R_0')
+    @canvas.lower('I14R_0')
+    # NB. these numbers are VERY sensitive, you must start with final size
+    # and shrink down to get the values
+    xy = [
+      745.947897349, 662.428358855, 745.997829056, 662.452239237, 746.0, 662.5
+    ]
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+                :width=>3, :tag=>'I14R_1')
+    @canvas.lower('I14R_1')
+  end
+
+  def draw14a(side)
+    color = @C['14']
+    xy = @canvas.coords("I14#{side}_0")
+    xy2 = @canvas.coords("I14#{side}_1")
+    x0, y0, x1, y1, x2, y2 = xy
+    x3, y3, x4, y4, x5, y5 = xy2
+
+    zz = [
+      x0, y0, x0, y0, xy, x2, y2, x2, y2, 
+      x3, y3, x3, y3, xy2, x5, y5, x5, y5
+    ].flatten
+    @canvas.delete("I14#{side}")
+    TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true, 
+                   :fill=>color, :outline=>color, :width=>3)
+    @canvas.lower("I14#{side}")
+  end
+
+  def move14(step = nil)
+    step = get_step(14, step)
+
+    # Paper going down
+    sc = 0.9 - 0.05*step
+    if sc < 0.3
+      @canvas.delete('I14L')
+      return 0
+    end
+
+    ox, oy = @canvas.coords('I14L_0')
+    @canvas.scale('I14L_0', ox, oy, sc, sc)
+    ox, oy = @canvas.coords('I14L_1')[-2..-1]
+    @canvas.scale('I14L_1', ox, oy, sc, sc)
+    draw14a('L')
+
+    # Paper going up
+    sc = 0.35 + 0.05*step
+    sc = 1/sc
+
+    ox, oy = @canvas.coords('I14R_0')
+    @canvas.scale('I14R_0', ox, oy, sc, sc)
+    ox, oy = @canvas.coords('I14R_1')[-2..-1]
+    @canvas.scale('I14R_1', ox, oy, sc, sc)
+    draw14a('R')
+
+    return((step == 10)? 3: 1)
+  end
+
+  # Light beam
+  def draw15
+    color = @C['15a']
+    xy = [824, 599, 824, 585, 820, 585, 829, 585]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I15a')
+    xy = [789, 599, 836, 643]
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
+    xy = [778, 610, 788, 632]
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
+    xy = [766, 617, 776, 625]
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
+
+    xy = [633, 600, 681, 640]
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
+    xy = [635, 567, 657, 599]
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
+    xy = [765, 557, 784, 583]
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
+
+    sine([658, 580, 765, 580], 3, 15, 
+         :tag=>'I15_s', :fill=>@C['fg'], :width=>3)
+  end
+
+  def move15a
+    color = @C['15b']
+    @canvas.scale('I15a', 824, 599, 1, 0.3)  # Button down
+    xy = [765, 621, 681, 621]
+    TkcLine.new(@canvas, xy, :dash=>'-', :width=>3, :fill=>color, :tag=>'I15')
+  end
+
+  def move15(step = nil)
+    step = get_step(15, step)
+
+    numsteps = 6
+
+    if step == numsteps + 2
+      move_abs('I15_star', [-100, -100])
+      return 2
+    end
+    if step == 0  # Break the light beam
+      sparkle([-100, -100], 'I15_star')
+      xy = [765, 621, 745, 621]
+      @canvas.coords('I15', xy)
+      return 1
+    end
+    x0, y0 = anchor('I15_s', :w)
+    x1, y1 = anchor('I15_s', :e)
+    x = x0 + (x1 - x0) * (step - 1) / numsteps.to_f
+    move_abs('I15_star', [x, y0])
+    return 1
+  end
+
+  # Bell
+  def draw16
+    color = @C['16']
+    xy = [722, 485, 791, 556]
+    TkcRectangle.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>3)
+    xy = box(752, 515, 25)  # Bell
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black', 
+                :tag=>'I16b', :width=>2)
+    xy = box(752, 515, 5)   # Bell button
+    TkcOval.new(@canvas, xy, :fill=>'black', :outline=>'black', :tag=>'I16b')
+
+    xy = [784, 523, 764, 549]  # Clapper
+    TkcLine.new(@canvas, xy, :width=>3, :tag=>'I16c', :fill=>@C['fg'])
+    xy = box(784, 523, 4)
+    TkcOval.new(@canvas, xy, :fill=>@C['fg'], :outline=>@C['fg'], :tag=>'I16d')
+  end
+
+  def move16(step = nil)
+    step = get_step(16, step)
+
+    # Note: we never stop
+    ox, oy = [760, 553]
+    if (step & 1).nonzero?
+      beta = 12
+      @canvas.move('I16b', 3, 0)
+    else
+      beta = -12
+      @canvas.move('I16b', -3, 0)
+    end
+    rotate_item('I16c', ox, oy, beta)
+    rotate_item('I16d', ox, oy, beta)
+
+    return ((step == 1)? 3: 1)
+  end
+
+  # Cat
+  def draw17
+    color = @C['17']
+
+    xy = [584, 556, 722, 556]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+    xy = [584, 485, 722, 485]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+
+    xy = [664, 523, 717, 549]  # Body
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3, 
+               :style=>:chord, :start=>128, :extent=>260, :tag=>'I17')
+
+    xy = [709, 554, 690, 543]  # Paw
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, 
+                :width=>3, :tag=>'I17')
+    xy = [657, 544, 676, 555]
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, 
+                :width=>3, :tag=>'I17')
+
+    xy = box(660, 535, 15)     # Lower face
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+               :start=>150, :extent=>240, :tag=>'I17_')
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+               :style=>:chord, :start=>150, :extent=>240, :tag=>'I17_')
+    xy = [674, 529, 670, 513, 662, 521, 658, 521, 650, 513, 647, 529]  # Ears
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1, 
+                   :tag=>['I17_', 'I17_c'])
+    xy = [652, 542, 628, 539]  # Whiskers
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+    xy = [652, 543, 632, 545]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+    xy = [652, 546, 632, 552]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+
+    xy = [668, 543, 687, 538]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+                :tag=>['I17_', 'I17_w'])
+    xy = [668, 544, 688, 546]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+                :tag=>['I17_', 'I17_w'])
+    xy = [668, 547, 688, 553]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+                :tag=>['I17_', 'I17_w'])
+
+    xy = [649, 530, 654, 538, 659, 530]  # Left eye
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, 
+                :smooth=>true, :tag=>'I17')
+    xy = [671, 530, 666, 538, 661, 530]  # Right eye
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, 
+                :smooth=>true, :tag=>'I17')
+    xy = [655, 543, 660, 551, 665, 543]  # Mouth
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, 
+                :smooth=>true, :tag=>'I17')
+  end
+
+  def move17(step = nil)
+    step = get_step(17, step)
+
+    if step == 0
+      @canvas.delete('I17')  # Delete most of the cat
+      xy = [655, 543, 660, 535, 665, 543]  # Mouth
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
+                  :smooth=>true, :tag=>'I17_')
+      xy = box(654, 530, 4)  # Left eye
+      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'', 
+                  :tag=>'I17_')
+      xy = box(666, 530, 4)  # Right eye
+      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'', 
+                  :tag=>'I17_')
+
+      @canvas.move('I17_', 0, -20) # Move face up
+      xy = [652, 528, 652, 554]    # Front leg
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+      xy = [670, 528, 670, 554]    # 2nd front leg
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+
+      xy = [ # Body
+        675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525, 
+        716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527, 
+        668, 527, 668, 527, 675, 522, 676, 517, 677, 512
+      ]
+      TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill), 
+                     :outline=>@C['fg'], :width=>3, :smooth=>true, 
+                     :tag=>'I17_')
+      xy = [716, 514, 716, 554]  # Back leg
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+      xy = [694, 532, 694, 554]  # 2nd back leg
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+      xy = [715, 514, 718, 506, 719, 495, 716, 488]  # Tail
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+                  :smooth=>true, :tag=>'I17_')
+
+      @canvas.raise('I17w')       # Make whiskers visible
+      @canvas.move('I17_', -5, 0) # Move away from the wall a bit
+      return 2
+    end
+    return 0
+  end
+
+  # Sling shot
+  def draw18
+    color = @C['18']
+    xy = [721, 506, 627, 506]  # Sling hold
+    TkcLine.new(@canvas, xy, :width=>4, :fill=>@C['fg'], :tag=>'I18')
+
+    xy = [607, 500, 628, 513]  # Sling rock
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :tag=>'I18a')
+
+    xy = [526, 513, 606, 507, 494, 502]  # Sling band
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>4, :tag=>'I18b')
+    xy = [485, 490, 510, 540, 510, 575, 510, 540, 535, 491]  # Sling
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>6)
+  end
+
+  def move18(step = nil)
+    step = get_step(18, step)
+
+    pos = [
+      [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x], 
+      [136, 506], [16, 506], [-100, -100]
+    ]
+
+    b = []
+    b[0] = [490, 502, 719, 507, 524, 512]  # Band collapsing
+    b[1] = [
+      491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525, 
+      553, 536, 538, 534, 532, 519, 529, 499
+    ]
+    b[2] = [
+      491, 503, 508, 563, 542, 533, 551, 526, 561, 539, 549, 550, 530, 500
+    ]
+    b[3] = [
+      491, 503, 508, 563, 530, 554, 541, 562, 525, 568, 519, 544, 530, 501
+    ]
+
+    return 0 if step >= pos.length
+
+    if step == 0
+      @canvas.delete('I18')
+      @canvas.itemconfigure('I18b', :smooth=>true)
+    end
+    if b[step]
+      @canvas.coords('I18b', b[step])
+    end
+
+    where = pos[step]
+    move_abs('I18a', where)
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # Water pipe
+  def draw19
+    color = @C['19']
+    xx = [[249, 181], [155, 118], [86, 55], [22, 0]]
+    xx.each{|x1, x2|
+      TkcRectangle.new(@canvas, x1, 453, x2, 467, 
+                       :fill=>color, :outline=>'', :tag=>'I19')
+      TkcLine.new(@canvas, x1, 453, x2, 453, 
+                  :fill=>@C['fg'], :width=>1) # Pipe top
+      TkcLine.new(@canvas, x1, 467, x2, 467, 
+                  :fill=>@C['fg'], :width=>1) # Pipe bottom
+    }
+    @canvas.raise('I11i')
+
+    xy = box(168, 460, 16)  # Bulge by the joint
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc, 
+               :start=>21, :extent=>136)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc, 
+               :start=>-21, :extent=>-130)
+
+    xy = [249, 447, 255, 473]  # First joint 26x6
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
+
+    xy = box(257, 433, 34)     # Bend up
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+               :style=>:pie, :start=>0, :extent=>-91)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+               :style=>:arc, :start=>0, :extent=>-90)
+    xy = box(257, 433, 20)
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1, 
+               :style=>:pie, :start=>0, :extent=>-92)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+               :style=>:arc, :start=>0, :extent=>-90)
+    xy = box(257, 421, 34)     # Bend left
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+               :style=>:pie, :start=>0, :extent=>91)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+               :style=>:arc, :start=>0, :extent=>90)
+    xy = box(257, 421, 20)
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1, 
+               :style=>:pie, :start=>0, :extent=>90)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+               :style=>:arc, :start=>0, :extent=>90)
+    xy = box(243, 421, 34)     # Bend down
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+               :style=>:pie, :start=>90, :extent=>90)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+               :style=>:arc, :start=>90, :extent=>90)
+    xy = box(243, 421, 20)
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1, 
+               :style=>:pie, :start=>90, :extent=>90)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+               :style=>:arc, :start=>90, :extent=>90)
+
+    xy = [270, 427, 296, 433]  # 2nd joint bottom
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
+    xy = [270, 421, 296, 427]  # 2nd joint top
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
+    xy = [249, 382, 255, 408]  # Third joint right
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
+    xy = [243, 382, 249, 408]  # Third joint left
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
+    xy = [203, 420, 229, 426]  # Last joint
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
+
+    xy = box(168, 460, 6)      # Handle joint
+    TkcOval.new(@canvas, xy, :fill=>@C['fg'], :outline=>'', :tag=>'I19a')
+    xy = [168, 460, 168, 512]  # Handle bar
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>5, :tag=>'I19b')
+  end
+
+  def move19(step = nil)
+    step = get_step(19, step)
+
+     angles = [30, 30, 30]
+    return 2 if step == angles.length
+    ox, oy = centroid('I19a')
+    rotate_item('I19b', ox, oy, angles[step])
+
+    return 1
+  end
+
+  # Water pouring
+  def draw20
+    # do nothing
+  end
+
+  def move20(step = nil)
+    step = get_step(20, step)
+
+    pos  = [451, 462, 473, 484, 496, 504, 513, 523, 532]
+    freq  = [20,  40,  40,  40,  40,  40,  40,  40,  40]
+    pos = [
+      [451, 20], [462, 40], [473, 40], [484, 40], [496, 40], 
+      [504, 40], [513, 40], [523, 40], [532, 40, :x]
+    ]
+    return 0 if step >= pos.length
+
+    @canvas.delete('I20')
+    where = pos[step]
+    y, f = where
+    h20(y, f)
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  def h20(y, f)
+    color = @C['20']
+    @canvas.delete('I20')
+
+    sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'], 
+         :width=>3, :fill=>color, :smooth=>true)
+    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3, 
+                :fill=>color, :smooth=>1, :tag=>['I20', 'I20a'])
+    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3, 
+                :fill=>color, :smooth=>1, :tag=>['I20', 'I20b'])
+    @canvas.move('I20a', 8, 0)
+    @canvas.move('I20b', 16, 0)
+  end
+
+  # Bucket
+  def draw21
+    color = @C['21']
+    xy = [217, 451, 244, 490]  # Right handle
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21_a')
+    xy = [201, 467, 182, 490]  # Left handle
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21_a')
+
+    xy = [245, 490, 237, 535]  # Right side
+    xy2 = [189, 535, 181, 490] # Left side
+    TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'', 
+                   :tag=>['I21', 'I21f'])
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21')
+    TkcLine.new(@canvas, xy2, :fill=>@C['fg'], :width=>2, :tag=>'I21')
+
+    xy = [182, 486, 244, 498]  # Top
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2, 
+                :tag=>['I21', 'I21f'])
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2, 
+                :tag=>['I21', 'I21t'])
+    xy = [189, 532, 237, 540]  # Bottom
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2, 
+                :tag=>['I21', 'I21b'])
+  end
+
+  def move21(step = nil)
+    step = get_step(21, step)
+
+    numsteps = 30
+    return 0 if step >= numsteps
+
+    x1, y1, x2, y2 = @canvas.coords('I21b')
+    # lx1, ly1, lx2, ly2 = @canvas.coords('I21t')
+    lx1, ly1, lx2, ly2 = [183, 492, 243, 504]
+
+    f = step / numsteps.to_f
+    y2 = y2 - 3
+    xx1 = x1 + (lx1 - x1) * f
+    yy1 = y1 + (ly1 - y1) * f
+    xx2 = x2 + (lx2 - x2) * f
+    yy2 = y2 + (ly2 - y2) * f
+
+    @canvas.itemconfigure('I21b', :fill=>@C['20'])
+    @canvas.delete('I21w')
+    TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1, 
+                   :tag=>['I21', 'I21w'], :outline=>'', :fill=>@C['20'])
+    @canvas.lower('I21w', 'I21')
+    @canvas.raise('I21b')
+    @canvas.lower('I21f')
+
+    return((step == numsteps - 1)? 3: 1)
+  end
+
+  # Bucket drop
+  def draw22
+    # do nothing
+  end
+
+  def move22(step = nil)
+    step = get_step(22, step)
+    pos = [[213, 513], [213, 523], [213, 543, :x], [213, 583], [213, 593]]
+
+    @canvas.itemconfigure('I21f', :fill=>@C['22']) if step == 0
+    return 0 if step >= pos.length
+    where = pos[step]
+    move_abs('I21', where)
+    h20(where[1], 40)
+    @canvas.delete('I21_a')  # Delete handles
+
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # Blow dart
+  def draw23
+    color  = @C['23a']
+    color2 = @C['23b']
+    color3 = @C['23c']
+
+    xy = [185, 623, 253, 650]  # Block
+    TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'], 
+                     :width=>2, :tag=>'I23a')
+    xy = [187, 592, 241, 623]  # Balloon
+    TkcOval.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b', 
+               :style=>:arc, :start=>12, :extent=>336)
+    xy = [239, 604, 258, 589, 258, 625, 239, 610]  # Balloon nozzle
+    TkcPolygon.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23b')
+
+    xy = [285, 611, 250, 603]  # Dart body
+    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], 
+                :width=>3, :tag=>'I23d')
+    xy = [249, 596, 249, 618, 264, 607, 249, 596]  # Dart tail
+    TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'], 
+                   :width=>3, :tag=>'I23d')
+    xy = [249, 607, 268, 607]  # Dart detail
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
+    xy = [285, 607, 305, 607]  # Dart needle
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
+  end
+
+  def move23(step = nil)
+    step = get_step(23, step)
+
+    pos = [
+      [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607], 
+      [487, 607], [587, 607], [687, 607], [787, 607], [-100, -100]
+    ]
+
+    return 0 if step >= pos.length
+    if step <= 1
+      ox, oy = anchor('I23a', :n)
+      @canvas.scale('I23b', ox, oy, 0.9, 0.5)
+    end
+    where = pos[step]
+    move_abs('I23d', where)
+
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # Balloon
+  def draw24
+    color = @C['24a']
+    xy = [366, 518, 462, 665]  # Balloon
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], 
+                :width=>3, :tag=>'I24')
+    xy = [414, 666, 414, 729]  # String
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I24')
+    xy = [410, 666, 404, 673, 422, 673, 418, 666]  # Nozzle
+    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
+                   :width=>3, :tag=>'I24')
+
+    xy = [387, 567, 390, 549, 404, 542]  # Reflections
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+                :width=>2, :tag=>'I24')
+    xy = [395, 568, 399, 554, 413, 547]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+                :width=>2, :tag=>'I24')
+    xy = [403, 570, 396, 555, 381, 553]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+                :width=>2, :tag=>'I24')
+    xy = [408, 564, 402, 547, 386, 545]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+                :width=>2, :tag=>'I24')
+  end
+
+  def move24(step = nil)
+    step = get_step(24, step)
+
+    return 0 if step > 4
+    return 2 if step == 4
+
+    if step == 0
+      @canvas.delete('I24')  # Exploding balloon
+      xy = [
+        347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594, 
+        259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738, 
+        436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613, 
+        548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508, 
+        431, 441, 431, 440, 400, 502, 347, 465, 347, 465
+      ]
+      TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'], 
+                     :outline=>@C['24a'], :width=>10, :smooth=>true)
+      msg = Tk.subst(@S['message'].value)
+      TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'], 
+                  :justify=>:center, :font=>['Times Roman', 18, :bold])
+      return 1
+    end
+
+    @canvas.itemconfigure('I24t', :font=>['Times Roman', 18 + 6*step, :bold])
+    @canvas.move('I24', 0, -60)
+    ox, oy = centroid('I24')
+    @canvas.scale('I24', ox, oy, 1.25, 1.25)
+    return 1
+  end
+
+  # Displaying the message
+  def move25(step = nil)
+    step = get_step(25, step)
+
+    if step == 0
+      @XY['25'] = Tk::Clock.clicks(:miliseconds)
+      return 1
+    end
+    elapsed = Tk::Clock.clicks(:miliseconds) - @XY['25']
+    return 1 if elapsed < 5000
+    return 2
+  end
+
+  # Collapsing balloon
+  def move26(step = nil)
+    step = get_step(26, step)
+
+    if step >= 3
+      @canvas.delete('I24', 'I26')
+      TkcText.new(@canvas, 430, 740, :anchor=>:s, :tag=>'I26', 
+                  :text=>'click to continue', 
+                  :font=>['Times Roman', 24, :bold])
+      @canvas.bind('1', proc{reset})
+      return 4
+    end
+
+    ox, oy = centroid('I24')
+    @canvas.scale('I24', ox, oy, 0.8, 0.8)
+    @canvas.move('I24', 0, 60)
+    @canvas.itemconfigure('I24t', :font=>['Times Roman', 30 - 6*step, :bold])
+    return 1
+  end
+
+  ################################################################
+  #
+  # Helper functions
+  #
+  def box(x, y, r)
+    [x - r, y - r, x + r, y + r]
+  end
+
+  def move_abs(item, xy)
+    x, y = xy
+    ox, oy = centroid(item)
+    dx = x - ox
+    dy = y - oy
+    @canvas.move(item, dx, dy)
+  end
+
+  def rotate_item(item, ox, oy, beta)
+    xy = @canvas.coords(item)
+    xy2 = []
+    0.step(xy.length - 1, 2){|idx|
+      x, y = xy[idx, 2]
+      xy2.concat(rotate_c(x, y, ox, oy, beta))
+    }
+    @canvas.coords(item, xy2)
+  end
+
+  def rotate_c(x, y, ox, oy, beta)
+    # rotates vector (ox,oy)->(x,y) by beta degrees clockwise
+
+    x -= ox    # Shift to origin
+    y -= oy
+
+    beta = beta * Math.atan(1) * 4 / 180.0        # Radians
+    xx = x * Math.cos(beta) - y * Math.sin(beta)  # Rotate
+    yy = x * Math.sin(beta) + y * Math.cos(beta)
+
+    xx += ox  # Shift back
+    yy += oy
+
+    [xx, yy]
+  end
+
+  def reset
+    draw_all
+    @canvas.bind_remove('1')
+    @S['mode'].value = :MSTART
+    @S['active'] = [0]
+  end
+
+  # Each Move## keeps its state info in STEP, this retrieves and increments it
+  def get_step(who, step)
+    if step
+      @STEP[who] = step
+    else
+      if !@STEP.exist?(who) || @STEP[who] == ""
+        @STEP[who] = 0
+      else
+        @STEP[who] += 1
+      end
+    end
+    @STEP[who]
+  end
+
+  def reset_step
+    @S['cnt'].value = 0
+    @STEP.keys.each{|k| @STEP[k] = ''}
+  end
+
+  def sine(xy0, amp, freq, opts = {})
+    x0, y0, x1, y1 = xy0
+    step = 2
+    xy = []
+    if y0 == y1  # Horizontal
+      x0.step(x1, step){|x|
+        beta = (x - x0) * 2 * Math::PI / freq
+        y = y0 + amp * Math.sin(beta)
+        xy << x << y
+      }
+    else
+      y0.step(y1, step){|y|
+        beta = (y - y0) * 2 * Math::PI / freq
+        x = x0 + amp * Math.sin(beta)
+        xy << x << y
+      }
+    end
+    TkcLine.new(@canvas, xy, opts)
+  end
+
+  def round_rect(xy, radius, opts={})
+    x0, y0, x3, y3 = xy
+    r = @canvas.winfo_pixels(radius)
+    d = 2 * r
+
+    # Make sure that the radius of the curve is less than 3/8 size of the box!
+    maxr = 0.75
+    if d > maxr * (x3 - x0)
+      d = maxr * (x3 - x0)
+    end
+    if d > maxr * (y3 - y0)
+      d = maxr * (y3 - y0)
+    end
+
+    x1 = x0 + d
+    x2 = x3 - d
+    y1 = y0 + d
+    y2 = y3 - d
+
+    xy = [x0, y0, x1, y0, x2, y0, x3, y0, x3, y1, x3, y2]
+    xy.concat([x3, y3, x2, y3, x1, y3, x0, y3, x0, y2, x0, y1])
+    return xy
+  end
+
+  def round_poly(canv, xy, radii, opts)
+    lenXY = xy.length
+    lenR = radii.length
+    if lenXY != 2*lenR
+      raise "wrong number of vertices and radii"
+    end
+
+    knots = []
+    x0 = xy[-2]; y0 = xy[-1]
+    x1 = xy[0];  y1 = xy[1]
+    xy << xy[0] << xy[1]
+
+    0.step(lenXY - 1, 2){|i|
+      radius = radii[i/2]
+      r = canv.winfo_pixels(radius)
+
+      x2 = xy[i+2];  y2 = xy[i+3]
+      z = _round_poly2(x0, y0, x1, y1, x2, y2, r)
+      knots.concat(z)
+
+      x0 = x1;  y0 = y1
+      x1 = x2;  y1 = y2
+    }
+    TkcPolygon.new(canv, knots, {:smooth=>true}.update(opts))
+  end
+
+  def _round_poly2(x0, y0, x1, y1, x2, y2, radius)
+    d = 2 * radius
+    maxr = 0.75
+
+    v1x = x0 - x1
+    v1y = y0 - y1
+    v2x = x2 - x1
+    v2y = y2 - y1
+
+    vlen1 = Math.sqrt(v1x*v1x + v1y*v1y)
+    vlen2 = Math.sqrt(v2x*v2x + v2y*v2y)
+
+    if d > maxr * vlen1
+      d = maxr * vlen1
+    end
+    if d > maxr * vlen2
+      d = maxr * vlen2
+    end
+
+    xy = []
+    xy << (x1 + d * v1x / vlen1) << (y1 + d * v1y / vlen1)
+    xy << x1 << y1
+    xy << (x1 + d * v2x / vlen2) << (y1 + d * v2y / vlen2)
+
+    return xy
+  end
+
+  def sparkle(oxy, tag)
+    xy = [
+      [299, 283], [298, 302], [295, 314], [271, 331], 
+      [239, 310], [242, 292], [256, 274], [281, 273]
+    ]
+    xy.each{|x, y|
+      TkcLine.new(@canvas, 271, 304, x, y, 
+                  :fill=>'white', :width=>3, :tag=>tag)
+    }
+    move_abs(tag, oxy)
+  end
+
+  def centroid(item)
+    anchor(item, :c)
+  end
+
+  def anchor(item, where)
+    x1, y1, x2, y2 = @canvas.bbox(item)
+    case(where)
+    when :n
+      y = y1
+    when :s
+      y = y2
+    else
+      y = (y1 + y2) / 2.0
+    end
+    case(where)
+    when :w
+      x = x1
+    when :e
+      x = x2
+    else
+      x = (x1 + x2) / 2.0
+    end
+    return [x, y]
+  end
+end
+
+TkGoldberg_Demo.new($goldberg_demo)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/hello b/ruby_1_8_6/ext/tk/sample/demos-en/hello
new file mode 100644
index 0000000000..f06eabe518
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/hello
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+require 'tk'
+
+unless /^8\.[1-9]/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK
+  require 'tkencoding'
+end
+
+TkButton.new(nil,
+	'text'=>"Hello Ruby world!",
+	'font'=>TkFont.new('k14'),
+	'command'=>proc{print "Hello Ruby world!\n"; exit}
+).pack
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/hscale.rb b/ruby_1_8_6/ext/tk/sample/demos-en/hscale.rb
new file mode 100644
index 0000000000..14e395b61a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/hscale.rb
@@ -0,0 +1,74 @@
+require "tkcanvas"
+
+if defined?($hscale_demo) && $hscale_demo
+  $hscale_demo.destroy
+  $hscale_demo = nil
+end
+
+$hscale_demo = TkToplevel.new {|w|
+  title("Horizontal Scale Demonstration")
+  iconname("hscale")
+}
+positionWindow($hscale_demo)
+
+
+msg = TkLabel.new($hscale_demo) {
+  font $font
+  wraplength '3.5i'
+  justify 'left'
+  text "An arrow and a horizontal scale are displayed below.  If you click or drag mouse button 1 in the scale, you can change the length of the arrow."
+}
+msg.pack('side'=>'top')
+
+TkFrame.new($hscale_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc {
+      tmppath = $hscale_demo
+      $hscale_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc { showCode 'hscale' }
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+TkFrame.new($hscale_demo) {|frame|
+  canvas = TkCanvas.new(frame) {|c|
+    width 50
+    height 50
+    bd 0
+    highlightthickness 0
+    TkcPolygon.new(c, '0', '0', '1', '1', '2', '2') {
+      fill 'DeepSkyBlue'
+      tags 'poly'
+    }
+    TkcLine.new(c, '0', '0', '1', '1', '2', '2', '0', '0') {
+      fill 'black'
+      tags 'line'
+    }
+  }.pack('side'=>'top', 'expand'=>'yes', 'anchor'=>'s', 'fill'=>'x', 'padx'=>'15')
+  scale = TkScale.new(frame) {
+    orient 'horizontal'
+    length 284
+    from 0
+    to 250
+    command proc{|value| setWidth(canvas, value)}
+    tickinterval 50
+  }.pack('side'=>'bottom', 'expand'=>'yes', 'anchor'=>'n')
+  scale.set 75
+}.pack('side'=>'top', 'fill'=>'x')
+
+
+def setWidth(w, width)
+  width = width + 21
+  x2 = width - 30
+  if x2 < 21
+    x2 = 21
+  end
+  w.coords 'poly',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
+  w.coords 'line',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/icon.rb b/ruby_1_8_6/ext/tk/sample/demos-en/icon.rb
new file mode 100644
index 0000000000..58aca2df07
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/icon.rb
@@ -0,0 +1,99 @@
+# icon.rb
+#
+# This demonstration script creates a toplevel window containing
+# buttons that display bitmaps instead of text.
+#
+# iconic button widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($icon_demo) && $icon_demo
+  $icon_demo.destroy 
+  $icon_demo = nil
+end
+
+# demo toplevel widget
+$icon_demo = TkToplevel.new {|w|
+  title("Iconic Button Demonstration")
+  iconname("icon")
+  positionWindow(w)
+}
+
+# label
+msg = TkLabel.new($icon_demo) {
+  font $font
+  wraplength '5i'
+  justify 'left'
+  text "This window shows three ways of using bitmaps or images in radiobuttons and checkbuttons.  On the left are two radiobuttons, each of which displays a bitmap and an indicator.  In the middle is a checkbutton that displays a different image depending on whether it is selected or not.  On the right is a checkbutton that displays a single bitmap but changes its background color to indicate whether or not it is selected. (This change is visible when the mouse pointer is not directy over the button.)"
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($icon_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $icon_demo
+      $icon_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'icon'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# image 
+flagup = \
+TkBitmapImage.new('file'=>[$demo_dir,'..',
+                           'images','flagup.xbm'].join(File::Separator),
+                  'maskfile'=>\
+                  [$demo_dir,'..','images','flagup.xbm'].join(File::Separator))
+flagdown = \
+TkBitmapImage.new('file'=>[$demo_dir,'..',
+                           'images','flagdown.xbm'].join(File::Separator),
+                  'maskfile'=>\
+                  [$demo_dir,'..',
+                    'images','flagdown.xbm'].join(File::Separator))
+
+# create variable
+letters = TkVariable.new
+
+# frame
+TkFrame.new($icon_demo, 'borderwidth'=>10){|w|
+  TkFrame.new(w) {|f|
+    TkRadioButton.new(f){
+      bitmap '@' + [$demo_dir,'..',
+                    'images','letters.xbm'].join(File::Separator)
+      variable letters
+      value 'full'
+    }.pack('side'=>'top', 'expand'=>'yes')
+
+    TkRadioButton.new(f){
+      bitmap '@' + [$demo_dir,'..',
+                     'images','noletter.xbm'].join(File::Separator)
+      variable letters
+      value 'empty'
+    }.pack('side'=>'top', 'expand'=>'yes')
+
+  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
+
+  TkCheckButton.new(w) {
+    image flagdown
+    selectimage flagup
+    indicatoron 0
+    selectcolor self['background']
+  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
+
+  TkCheckButton.new(w) {
+    bitmap '@' + [$demo_dir,'..',
+                   'images','letters.xbm'].join(File::Separator)
+    indicatoron 0
+    selectcolor 'SeaGreen1'
+  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
+
+}.pack('side'=>'top')
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/image1.rb b/ruby_1_8_6/ext/tk/sample/demos-en/image1.rb
new file mode 100644
index 0000000000..05c9705c9c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/image1.rb
@@ -0,0 +1,60 @@
+## image1.rb
+#
+# This demonstration script displays two image widgets.
+#
+# two image widgets demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($image1_demo) && $image1_demo
+  $image1_demo.destroy 
+  $image1_demo = nil
+end
+
+# demo toplevel widget
+$image1_demo = TkToplevel.new {|w|
+  title('Image Demonstration #1')
+  iconname("Image1")
+  positionWindow(w)
+}
+
+# label
+msg = TkLabel.new($image1_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "This demonstration displays two images, each in a separate label widget."
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($image1_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $image1_demo
+      $image1_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'image1'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# image
+image1a = \
+TkPhotoImage.new('file'=>[$demo_dir,'..',
+                          'images','earth.gif'].join(File::Separator))
+image1b = \
+TkPhotoImage.new('file'=>[$demo_dir,'..',
+                          'images','earthris.gif'].join(File::Separator))
+
+# label
+[ TkLabel.new($image1_demo, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
+  TkLabel.new($image1_demo, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
+].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/image2.rb b/ruby_1_8_6/ext/tk/sample/demos-en/image2.rb
new file mode 100644
index 0000000000..1aff7173be
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/image2.rb
@@ -0,0 +1,105 @@
+# image2.rb
+#
+# This demonstration script creates a simple collection of widgets
+# that allow you to select and view images in a Tk label.
+#
+# widget demo 'load image' (called by 'widget')
+#
+
+# toplevel widget
+if defined?($image2_demo) && $image2_demo
+  $image2_demo.destroy 
+  $image2_demo = nil
+end
+
+# demo toplevel widget
+$image2_demo = TkToplevel.new {|w|
+  title('Image Demonstration #2')
+  iconname("Image2")
+  positionWindow(w)
+}
+
+# label
+msg = TkLabel.new($image2_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "This demonstration allows you to view images using a Tk \"photo\" image.  First type a directory name in the listbox, then press Enter to load the directory into the listbox.  Then double-click on a file name in the listbox to see that image."
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($image2_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $image2_demo
+      $image2_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'image2'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# create variable
+$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
+
+# image
+$image2a = TkPhotoImage.new
+
+#
+TkLabel.new($image2_demo, 'text'=>'Directory:')\
+.pack('side'=>'top', 'anchor'=>'w')
+
+image2_e = TkEntry.new($image2_demo) {
+  width 30
+  textvariable $dirName
+}.pack('side'=>'top', 'anchor'=>'w')
+
+TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20)\
+.pack('side'=>'top', 'anchor'=>'w')
+
+TkLabel.new($image2_demo, 'text'=>'File:')\
+.pack('side'=>'top', 'anchor'=>'w')
+
+TkFrame.new($image2_demo){|w|
+  s = TkScrollbar.new(w)
+  l = TkListbox.new(w) {
+    width 20
+    height 10
+    yscrollcommand proc{|first,last| s.set first,last}
+  }
+  s.command(proc{|*args| l.yview(*args)})
+  l.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
+  s.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
+  #l.insert(0,'earth.gif', 'earthris.gif', 'mickey.gif', 'teapot.ppm')
+  l.insert(0,'earth.gif', 'earthris.gif', 'teapot.ppm')
+  l.bind('Double-1', proc{|x,y| loadImage $image2a,l,x,y}, '%x %y')
+
+  image2_e.bind 'Return', proc{loadDir l}
+
+}.pack('side'=>'top', 'anchor'=>'w')
+
+# image 
+[ TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20),
+  TkLabel.new($image2_demo, 'text'=>'Image:'),
+  TkLabel.new($image2_demo, 'image'=>$image2a)
+].each{|w| w.pack('side'=>'top', 'anchor'=>'w')}
+
+# 
+def loadDir(w)
+  w.delete(0,'end')
+  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
+    w.insert('end',File.basename(f))
+  }
+end
+
+def loadImage(img,w,x,y)
+  img.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/image3.rb b/ruby_1_8_6/ext/tk/sample/demos-en/image3.rb
new file mode 100644
index 0000000000..e46d3796f2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/image3.rb
@@ -0,0 +1,122 @@
+# image3.rb
+#
+# This demonstration script creates a simple collection of widgets
+# that allow you to select and view images in a Tk label.
+#
+# widget demo 'load image' (called by 'widget')
+#
+
+# toplevel widget
+if defined?($image3_demo) && $image3_demo
+  $image3_demo.destroy 
+  $image3_demo = nil
+end
+
+# demo toplevel widget
+$image3_demo = TkToplevel.new {|w|
+  title('Image Demonstration #3')
+  iconname("Image3")
+  positionWindow(w)
+}
+
+# 
+def loadDir(w)
+  w.delete(0,'end')
+  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
+    w.insert('end',File.basename(f))
+  }
+end
+
+# selectAndLoadDir --
+# This procedure pops up a dialog to ask for a directory to load into
+# the listobx and (if the user presses OK) reloads the directory
+# listbox from the directory named in the demo's entry.
+#
+# Arguments:
+# w -                   Name of the toplevel window of the demo.
+def selectAndLoadDir(w, lbox)
+  dir = Tk.chooseDirectory(:initialdir=>$dirName.value, 
+                           :parent=>w, :mustexist=>true)
+  if dir.length > 0
+    $dirName.value = dir 
+    loadDir(lbox)
+  end
+end
+
+def loadImage(w,x,y)
+  $image3a.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
+end
+
+
+# label
+msg = TkLabel.new($image3_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "This demonstration allows you to view images using a Tk \"photo\" image.  First type a directory name in the listbox, then type Return to load the directory into the listbox.  Then double-click on a file name in the listbox to see that image."
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($image3_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $image3_demo
+      $image3_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'image3'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# variable
+$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
+
+# image
+begin
+  $image3a.delete
+rescue
+end
+$image3a = TkPhotoImage.new
+
+#
+image3_f = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
+
+image3_df = TkLabelFrame.new($image3_demo, :text=>'Directory:')
+
+image3_ff = TkLabelFrame.new($image3_demo, :text=>'File:', 
+                             :padx=>'2m', :pady=>'2m')
+image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
+  pack(:side=>:left, :fill=>:y, :expand=>true)
+  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y, 
+                                             :expand=>true))
+  insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
+  bind('Double-1', proc{|x,y| loadImage(self, x, y)}, '%x %y')
+}
+
+image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
+  pack(:side=>:left, :fill=>:both, :padx=>'2m', :pady=>'2m', :expand=>true)
+  bind('Return', proc{loadDir(image3_lbx)})
+}
+
+TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"Select Dir.", 
+             :command=>proc{selectAndLoadDir(image3_ent, image3_lbx)}) {
+  pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
+}
+
+image3_if = TkLabelFrame.new($image3_demo, :text=>'Image:') {|f|
+  TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
+}
+
+Tk.grid(image3_df,  '-',
+        :sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
+Tk.grid(image3_ff, image3_if, 
+        :sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
+TkGrid.columnconfigure(image3_f, 1, :weight=>1)
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/items.rb b/ruby_1_8_6/ext/tk/sample/demos-en/items.rb
new file mode 100644
index 0000000000..8ab7668a07
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/items.rb
@@ -0,0 +1,374 @@
+# items.rb
+#
+# This demonstration script creates a canvas that displays the
+# canvas item types.
+#
+# canvas item types widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($items_demo) && $items_demo
+  $items_demo.destroy 
+  $items_demo = nil
+end
+
+# demo toplevel widget
+$items_demo = TkToplevel.new {|w|
+  title("Canvas Item Demonstration")
+  iconname("Items")
+  positionWindow(w)
+}
+
+# label
+TkLabel.new($items_demo) {
+  font $font
+  wraplength '5i'
+  justify 'left'
+  text "This window contains a canvas widget with examples of the various kinds of items supported by canvases.  The following operations are supported:\n  Button-1 drag:\tmoves item under pointer.\n  Button-2 drag:\trepositions view.\n  Button-3 drag:\tstrokes out area.\n  Ctrl+f:\t\tprints items under area."
+}.pack('side'=>'top')
+
+# frame
+TkFrame.new($items_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $items_demo
+      $items_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'items'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame
+cvs = nil
+TkFrame.new($items_demo) {|cf|
+  # canvas 
+  cvs = TkCanvas.new(cf) {|c|
+    focus
+    scrollregion '0c 0c 30c 24c'
+    width  '15c'
+    height '10c'
+    relief 'sunken'
+    borderwidth 2
+
+    hs = TkScrollbar.new(cf) {|s|
+      orient 'horizontal'
+      command proc{|*args| c.xview(*args)}
+      c.xscrollcommand proc{|first,last| s.set first,last}
+    }
+
+    vs = TkScrollbar.new(cf) {|s|
+      command proc{|*args| c.yview(*args)}
+      c.yscrollcommand proc{|first,last| s.set first,last}
+    }
+
+    if $tk_version =~ /^4\.[01]/
+      hs.pack('side'=>'bottom', 'fill'=>'x')
+      vs.pack('side'=>'right', 'fill'=>'y')
+      c.pack('in'=>cf, 'expand'=>'yes', 'fill'=>'both')
+
+    else
+      c.grid('in'=>cf, 'row'=>0, 'column'=>0, 
+             'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+      vs.grid('row'=>0, 'column'=>1, 
+              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+      hs.grid('row'=>1, 'column'=>0, 
+              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+      TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
+      TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
+
+    end
+
+  }
+}.pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
+
+# Display a 3x3 rectangular grid
+TkcRectangle.new(cvs, '0c', '0c', '30c', '24c', 'width'=>2)
+TkcLine.new(cvs, '0c', '8c', '30c', '8c', 'width'=>2)
+TkcLine.new(cvs, '0c', '16c', '30c', '16c', 'width'=>2)
+TkcLine.new(cvs, '10c', '0c', '10c', '24c', 'width'=>2)
+TkcLine.new(cvs, '20c', '0c', '20c', '24c', 'width'=>2)
+
+font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
+font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
+if TkWinfo.depth($root).to_i > 1
+  blue   = 'DeepSkyBlue3'
+  red    = 'red'
+  bisque = 'bisque3'
+  green  = 'SeaGreen3'
+else
+  blue   = 'black'
+  red    = 'black'
+  bisque = 'black'
+  green  = 'black'
+end
+
+# tag 
+$tag_item = TkcGroup.new(cvs)
+
+# Set up demos within each of the areas of the grid.
+TkcText.new(cvs, '5c', '.2c', 'text'=>'Lines', 'anchor'=>'n')
+TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c', 
+            'width'=>2, 'fill'=>blue, 'capstyle'=>'butt', 
+            'join'=>'miter', 'tags'=>$tag_item )
+TkcLine.new(cvs, '4.67c','1c','4.67c','4c', 'arrow'=>'last', 'tags'=>$tag_item)
+TkcLine.new(cvs, '6.33c','1c','6.33c','4c', 'arrow'=>'both', 'tags'=>$tag_item)
+TkcLine.new(cvs, '5c','6c','9c','6c','9c','1c','8c','1c','8c','4.8c','8.8c',
+            '4.8c','8.8c','1.2c','8.2c','1.2c','8.2c','4.6c','8.6c','4.6c',
+            '8.6c','1.4c','8.4c','1.4c','8.4c','4.4c',
+            'width'=>3, 'fill'=>red, 'tags'=>$tag_item )
+TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c', 
+            'stipple'=>'@'+[$demo_dir,'..',
+                            'images','gray25.xbm'].join(File::Separator), 
+            'arrow'=>'both', 'arrowshape'=>'15 15 7', 'tags'=>$tag_item )
+TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
+            'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round', 
+            'tags'=>$tag_item )
+
+TkcText.new(cvs, '15c', '.2c', 
+            'text'=>'Curves (smoothed lines)', 'anchor'=>'n')
+TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c', 
+            'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
+TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c', 
+            'smooth'=>'on', 'arrow'=>'both', 'width'=>3, 'tags'=>$tag_item )
+TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c', 
+            '16.5c','4.5c','13.5c','7.5c','12c','6c',
+            'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round', 
+            'stipple'=>'@'+[$demo_dir, '..',
+                            'images', 'gray25.xbm'].join(File::Separator), 
+            'fill'=>red, 'tags'=>$tag_item )
+
+TkcText.new(cvs, '25c', '.2c', 'text'=>'Polygons', 'anchor'=>'n')
+TkcPolygon.new(cvs, '21c','1.0c','22.5c','1.75c','24c','1.0c','23.25c','2.5c',
+               '24c','4.0c','22.5c','3.25c','21c','4.0c','21.75c','2.5c',
+               'fill'=>'green', 'outline'=>'black', 'width'=>4, 
+               'tags'=>$tag_item )
+TkcPolygon.new(cvs, '25c','4c','25c','4c','25c','1c','26c','1c','27c','4c',
+               '28c','1c','29c','1c','29c','4c','29c','4c',
+               'fill'=>red, 'smooth'=>'on', 'tags'=> $tag_item)
+TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
+               '28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
+               '7.5c','22c','7.5c', 
+               'stipple'=>'@' + [$demo_dir, '..',
+                                 'images', 'gray25.xbm'].join(File::Separator),
+               'outline'=>'black', 'tags'=>$tag_item )
+
+TkcText.new(cvs, '5c', '8.2c', 'text'=>'Rectangles', 'anchor'=>'n')
+TkcRectangle.new(cvs, '1c','9.5c','4c','12.5c',
+                 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
+TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c', 
+                 'fill'=>green, 'tags'=>$tag_item )
+TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
+                 'stipple'=>'@'+[$demo_dir,'..',
+                                 'images','gray25.xbm'].join(File::Separator),
+                 'fill'=>blue, 'tags'=>$tag_item )
+
+TkcText.new(cvs, '15c', '8.2c', 'text'=>'Ovals', 'anchor'=>'n')
+TkcOval.new(cvs, '11c','9.5c','14c','12.5c',
+                 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
+TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c', 
+                 'fill'=>green, 'tags'=>$tag_item )
+TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
+                 'stipple'=>'@'+[$demo_dir,'..',
+                                 'images','gray25.xbm'].join(File::Separator),
+                 'fill'=>blue, 'tags'=>$tag_item )
+
+TkcText.new(cvs, '25c', '8.2c', 'text'=>'Text', 'anchor'=>'n')
+TkcRectangle.new(cvs, '22.4c','8.9c','22.6c','9.1c')
+TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c', 
+            'text'=>'A short string of text, word-wrapped, justified left, and anchored north (at the top).  The rectangles show the anchor points for each piece of text.', 'tags'=>$tag_item )
+TkcRectangle.new(cvs, '25.4c','10.9c','25.6c','11.1c')
+TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue, 
+            'text'=>"Several lines,\n each centered\nindividually,\nand all anchored\nat the left edge.", 'justify'=>'center', 'tags'=>$tag_item )
+TkcRectangle.new(cvs, '24.9c','13.9c','25.1c','14.1c')
+if $tk_version =~ /^4\.[01]/
+  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red, 
+              'stipple'=>'@' + [$demo_dir, '..',
+                                'images', 'grey.5'].join(File::Separator),
+              'text'=>'Stippled characters', 'tags'=>$tag_item )
+else
+  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red, 
+              'stipple'=>'gray50', 'text'=>'Stippled characters', 
+              'tags'=>$tag_item )
+end
+
+TkcText.new(cvs, '5c', '16.2c', 'text'=>'Arcs', 'anchor'=>'n')
+TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black', 
+           'start'=>45, 'extent'=>270, 'style'=>'pieslice', 'tags'=>$tag_item)
+#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc', 
+#          'outline'=>blue, 'start'=>135, 'extent'=>270, 
+#          'outlinestipple'=>'@' + ['images', 'grey.25'].join(File::Separator),
+#          'tags'=>$tag_item)
+TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc', 
+           'outline'=>blue, 'start'=>135, 'extent'=>270, 
+           'outlinestipple'=>'@'+[$demo_dir, '..',
+                                  'images','gray25.xbm'].join(File::Separator),
+           'tags'=>$tag_item)
+TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice', 
+           'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90, 
+           'tags'=>$tag_item)
+TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
+           'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270, 
+           'tags'=>$tag_item)
+
+TkcText.new(cvs, '15c', '16.2c', 'text'=>'Bitmaps', 'anchor'=>'n')
+#TkcBitmap.new(cvs, '13c','20c',
+#             'bitmap'=>'@' + ['images', 'face'].join(File::Separator),
+#             'tags'=>$tag_item)
+TkcBitmap.new(cvs, '13c','20c',
+              'bitmap'=>'@' + [$demo_dir, '..',
+                               'images', 'face.xbm'].join(File::Separator),
+              'tags'=>$tag_item)
+#TkcBitmap.new(cvs, '17c','18.5c',
+#             'bitmap'=>'@' + ['images', 'noletters'].join(File::Separator),
+#             'tags'=>$tag_item)
+TkcBitmap.new(cvs, '17c','18.5c',
+              'bitmap'=>'@' + [$demo_dir, '..',
+                               'images', 'noletter.xbm'].join(File::Separator),
+              'tags'=>$tag_item)
+#TkcBitmap.new(cvs, '17c','21.5c',
+#             'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
+#             'tags'=>$tag_item)
+# 
+TkcBitmap.new(cvs, '17c','21.5c') {
+  bitmap '@' + [$demo_dir, '..', 'images', 'letters.xbm'].join(File::Separator)
+  tags $tag_item
+}
+#TkcBitmap.new(cvs, '17c','21.5c') {
+#  bitmap '@' + ['images', 'letters'].join(File::Separator)
+#  tags $tag_item
+#}
+
+TkcText.new(cvs, '25c', '16.2c', 'text'=>'Windows', 'anchor'=>'n')
+TkButton.new(cvs) {|b|
+  text 'Press Me'
+  command proc{butPress cvs, red}
+  TkcWindow.new(cvs, '21c','18c', 
+                'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
+}
+TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
+  insert 'end', 'Edit this text'
+  TkcWindow.new(cvs, '21c','21c', 
+                'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
+}
+TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c', 
+            'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
+  TkcWindow.new(cvs, '28.5c','17.5c', 
+                'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
+}
+TkcText.new(cvs, '21c', '17.9c', 'text'=>'Button:', 'anchor'=>'sw')
+TkcText.new(cvs, '21c', '20.9c', 'text'=>'Entry:', 'anchor'=>'sw')
+TkcText.new(cvs, '28.5c', '17.4c', 'text'=>'Scale:', 'anchor'=>'s')
+
+# Set up event bindings for canvas:
+cvs.itembind($tag_item, 'Any-Enter', proc{itemEnter cvs})
+cvs.itembind($tag_item, 'Any-Leave', proc{itemLeave cvs})
+cvs.bind('2', proc{|x,y| cvs.scan_mark x,y}, '%x %y')
+cvs.bind('B2-Motion', proc{|x,y| cvs.scan_dragto x,y}, '%x %y')
+cvs.bind('3', proc{|x,y| itemMark cvs,x,y}, '%x %y')
+cvs.bind('B3-Motion', proc{|x,y| itemStroke cvs,x,y}, '%x %y')
+cvs.bind('Control-f', proc{itemsUnderArea cvs})
+cvs.bind('1', proc{|x,y| itemStartDrag cvs,x,y}, '%x %y')
+cvs.bind('B1-Motion', proc{|x,y| itemDrag cvs,x,y}, '%x %y')
+# Utility methods for highlighting the item under the pointer
+
+$restoreCmd = nil
+def itemEnter (c)
+  if TkWinfo.depth(c).to_i == 1
+    $restoreCmd = nil
+    return
+  end
+  type = c.itemtype('current')
+  if type == TkcWindow
+    $restoreCmd = nil
+    return
+  end
+  if type == TkcBitmap
+    bg = (c.itemconfiginfo('current', 'background'))[4]
+    $restoreCmd = proc{c.itemconfigure 'current', 'background', bg}
+    c.itemconfigure 'current', 'background', 'SteelBlue2'
+    return
+  end
+  fill = (c.itemconfiginfo('current', 'fill'))[4]
+  if (type == TkcRectangle || type == TkcOval || type == TkcArc) && fill == []
+    outline = (c.itemconfiginfo('current', 'outline'))[4]
+    $restoreCmd = proc{c.itemconfigure 'current', 'outline', outline}
+    c.itemconfigure 'current', 'outline', 'SteelBlue2'
+  else
+    $restoreCmd = proc{c.itemconfigure 'current', 'fill', fill}
+    c.itemconfigure 'current', 'fill', 'SteelBlue2'
+  end
+end
+
+def itemLeave(c)
+  $restoreCmd.call if $restoreCmd
+end
+
+# Utility methods for stroking out a rectangle and printing what's 
+# underneath the rectangle's area.
+
+def itemMark(c,x,y)
+  $areaX1 = c.canvasx(x)
+  $areaY1 = c.canvasy(y)
+  c.delete 'area'
+end
+
+def itemStroke(c,x,y)
+  x = c.canvasx(x)
+  y = c.canvasy(y)
+  if $areaX1 != x && $areaY1 != y
+    c.delete 'area'
+    c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y, 
+                                              '-outline', 'black')
+    $areaX2 = x
+    $areaY2 = y
+  end
+end
+
+def itemsUnderArea(c)
+  area = c.find_withtag('area')
+  items = []
+  c.find_enclosed($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
+    items.push(i) if i.gettags.include?($tag_item)
+  }
+  print "Items enclosed by area: #{items.inspect}\n"; STDOUT.flush
+  items.clear
+  c.find_overlapping($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
+    items.push(i) if i.gettags.include?($tag_item)
+  }
+  print "Items overlapping area: #{items.inspect}\n"; STDOUT.flush
+end
+
+$areaX1 = 0
+$areaY1 = 0
+$areaX2 = 0
+$areaY2 = 0
+
+# Utility methods to support dragging of items.
+
+def itemStartDrag(c,x,y)
+  $lastX = c.canvasx(x)
+  $lastY = c.canvasy(y)
+end
+
+def itemDrag(c,x,y)
+  x = c.canvasx(x)
+  y = c.canvasy(y)
+  c.move 'current', x - $lastX, y - $lastY
+  $lastX = x
+  $lastY = y
+end
+
+# Method that's invoked when the button embedded in the canvas 
+# is invoked.
+
+def butPress(w,color)
+  i = TkcText.new(w, '25c', '18.1c', 
+                  'text'=>'Ouch!!', 'fill'=>color, 'anchor'=>'n')
+  Tk.after(500, proc{w.delete i})
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/ixset b/ruby_1_8_6/ext/tk/sample/demos-en/ixset
new file mode 100644
index 0000000000..979894fcb8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/ixset
@@ -0,0 +1,333 @@
+#!/usr/bin/env ruby
+
+# ixset --
+# A nice interface to "xset" to change X server settings
+#
+
+require 'tk'
+
+class Xsettings
+  #
+  # Button actions
+  #
+  def quit
+    @root.destroy
+  end
+
+  def ok
+    writesettings
+    quit
+  end
+
+  def cancel
+    readsettings
+    dispsettings
+  end
+
+  # apply is just "writesettings"
+
+
+  #
+  # Read current settings
+  #
+  def readsettings
+    xfd = open("|xset q", 'r')
+    xfd.readlines.each{|line|
+      fields = line.chomp.strip.split(/\s+/)
+      case fields[0]
+      when "auto"
+	if fields[1] == 'repeat:'
+	  @kbdrep = fields[2]
+	  @w_kbdrep.set(@kbdrep)
+	  @kbdcli = fields[6]
+	end
+
+      when "bell"
+	@bellvol = fields[2]
+	@bellpit = fields[5]
+	@belldur = fields[8]
+
+      when "acceleration:"
+	@mouseacc = fields[1]
+	@mousethr = fields[3]
+
+      when "prefer"
+	if fields[2] == 'yes'
+	  @screenbla = 'blank'
+	else
+	  @screenbla = 'noblank'
+	end
+	@w_screenbla.set(@screenbla)
+
+      when "timeout:"
+	@screentim = fields[1]
+	@screencyc = fields[3]
+
+      end
+    }
+
+    xfd.close
+  end
+
+  #
+  # Write settings into the X server
+  #
+  def writesettings
+    @bellvol = @w_bellvol.get
+    @bellpit = @w_bellpit.get
+    @belldur = @w_belldur.get
+
+    @kbdrep = @w_kbdrep.get
+    if @kbdrep == 'on'
+      @kbdcli = @w_kbdcli.get
+    else
+      @kbdcli = 'off'
+    end
+
+    @mouseacc = @w_mouseacc.get
+    @mousethr = @w_mousethr.get
+
+    @screentim = @w_screentim.get
+    @screencyc = @w_screencyc.get
+    @screenbla = @w_screenbla.get
+
+    system("xset \
+            b #{@bellvol} #{@bellpit} #{@belldur} \
+            c #{@kbdcli} \
+            r #{@kbdrep} \
+            m #{@mouseacc} #{@mousethr} \
+            s #{@screentim} #{@screencyc} \
+            s #{@screenbla}")
+  end
+
+  #
+  # Sends all settings to the window
+  #
+  def dispsettings
+    @w_bellvol.set(@bellvol)
+    @w_bellpit.set(@bellpit)
+    @w_belldur.set(@belldur)
+
+    @w_kbdonoff.set(@w_kbdrep.get)
+    @w_kbdcli.set(@kbdcli)
+
+    @w_mouseacc.set(@mouseacc)
+    @w_mousethr.set(@mousethr)
+
+    @w_screenblank.set(@w_screenbla.get)
+    @w_screenpat.set(@w_screenbla.get)
+
+    @w_screentim.set(@screentim)
+    @w_screencyc.set(@screencyc)
+  end
+
+  #
+  # Create all windows, and pack them
+  #
+  class LabelEntry
+    def initialize(parent, text, length)
+      @frame = TkFrame.new(parent)
+      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left','expand'=>'y')
+      @entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken') {
+	pack('side'=>'left','expand'=>'y')
+      }
+    end
+    def pack(keys)
+      @frame.pack(keys)
+    end
+    def get
+      @entry.value
+    end
+    def set(value)
+      @entry.delete(0,'end')
+      @entry.insert(0, value)
+    end
+  end
+
+  def createwindows
+    win = self
+
+    #
+    # Buttons
+    #
+    buttons = TkFrame.new(@root) {|f|
+      [ TkButton.new(f, 'command'=>proc{win.ok}, 'text'=>'Ok'),
+	TkButton.new(f, 'command'=>proc{win.writesettings}, 'text'=>'Apply'),
+	TkButton.new(f, 'command'=>proc{win.cancel}, 'text'=>'Cancel'),
+	TkButton.new(f, 'command'=>proc{win.quit}, 'text'=>'Quit') ].each{|b|
+	b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5)
+      }
+    }
+
+    #
+    # Bell settings
+    #
+    bell = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
+    l = TkLabel.new(bell, 'text'=>'Bell Settings')
+    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200, 
+			     'tickinterval'=>20, 'orient'=>'horizontal', 
+			     'label'=>"Volume (%)")
+
+    f = TkFrame.new(bell)
+    @w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6)
+    @w_bellpit.pack('side'=>'left', 'padx'=>5)
+    @w_belldur = LabelEntry.new(f, "Duration (ms)", 6)
+    @w_belldur.pack('side'=>'right', 'padx'=>5)
+
+    l.pack('side'=>'top', 'expand'=>'yes')
+    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
+    f.pack('side'=>'top', 'expand'=>'yes')
+
+    #
+    # Keyboard settings
+    # 
+    kbdonoff = nil
+    kbdcli = nil
+    kbd = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
+    l = TkLabel.new(kbd, 'text'=>'Keyboard Repeat Settings')
+    f = TkFrame.new(kbd)
+    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat', 
+				    'onvalue'=>'on', 'offvalue'=>'off',
+				    'variable'=>@w_kbdrep ) {
+      def self.set(value)
+	if value == 'on'
+	  self.select
+	else
+	  self.deselect
+	end
+      end
+      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
+    }
+    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200, 
+			 'tickinterval'=>20, 'orient'=>'horizontal', 
+			 'label'=>'Click Volume (%)')
+    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes')
+    l.pack('side'=>'top', 'expand'=>'yes')
+    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
+
+    #
+    # Mouse settings
+    #
+    mouse = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
+    l = TkLabel.new(mouse, 'text'=>'Mouse Settings')
+    f = TkFrame.new(mouse)
+    @w_mouseacc = LabelEntry.new(f, 'Acceleration', 3)
+    @w_mouseacc.pack('side'=>'left')
+    @w_mousethr = LabelEntry.new(f, 'Threshold (pixels)', 3)
+    @w_mousethr.pack('side'=>'right')
+    l.pack('side'=>'top')
+    f.pack('side'=>'top', 'expand'=>'yes')
+
+    #
+    # Screen Saver settings
+    #
+    screen = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
+    l = TkLabel.new(screen, 'text'=>'Screen-saver Settings')
+    f = TkFrame.new(screen)
+    ff1 = TkFrame.new(f)
+    [ @w_screenblank = TkRadioButton.new(ff1, 'text'=>'Blank', 
+					 'relief'=>'flat', 
+					 'variable'=>@w_screenbla, 
+					 'value'=>'blank') {
+	def self.set(value)
+	  if value == 'blank'
+	    self.select
+	  else
+	    self.deselect
+	  end
+	end
+      }, 
+      @w_screenpat = TkRadioButton.new(ff1, 'text'=>'Pattern', 
+				       'relief'=>'flat', 
+				       'variable'=>@w_screenbla, 
+				       'value'=>'noblank') {
+	def self.set(value)
+	  if value != 'blank'
+	    self.select
+	  else
+	    self.deselect
+	  end
+	end
+      }
+    ].each {|w| w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w') }
+
+    ff2 = TkFrame.new(f)
+    [ @w_screentim = LabelEntry.new(ff2, 'Timeout (s)', 5), 
+      @w_screencyc = LabelEntry.new(ff2, 'Cycle (s)', 5) ].each{|w|
+      w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'e')
+    }
+
+    ff1.pack('side'=>'left')
+    ff2.pack('side'=>'left')
+
+    l.pack('side'=>'top')
+    f.pack('side'=>'top', 'expand'=>'yes')
+
+    #
+    # Main window
+    #
+    buttons.pack('side'=>'top', 'fill'=>'both')
+    bell.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
+    kbd.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
+    mouse.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
+    screen.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
+
+    #
+    # Let the user resize our window
+    #
+    @root.minsize(10,10)
+  end
+
+  def initialize
+    @root = TkRoot.new
+
+    @kbdrep = 'on'
+    @w_kbdrep = TkVariable.new(@kbdrep)
+    def @w_kbdrep.get
+      self.value
+    end
+    def @w_kbdrep.set(val)
+      self.value=val
+    end
+
+    @kbdcli = 0
+
+    @bellvol = 100
+    @bellpit = 440
+    @belldur = 100
+
+    @mouseacc = "3/1"
+    @mousethr = 4
+
+    @screenbla = "blank"
+    @w_screenbla = TkVariable.new(@screenbla)
+    def @w_screenbla.get
+      self.value
+    end
+    def @w_screenbla.set(val)
+      self.value=val
+    end
+
+    @screentim = 600
+    @screencyc = 600
+
+    #
+    # Listen what "xset" tells us...
+    #
+    readsettings
+
+    #
+    # Create all windows
+    #
+    createwindows
+
+    #
+    # Write xset parameters
+    #
+    dispsettings
+  end
+end
+
+Xsettings.new
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/ixset2 b/ruby_1_8_6/ext/tk/sample/demos-en/ixset2
new file mode 100644
index 0000000000..ce8472abe0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/ixset2
@@ -0,0 +1,367 @@
+#!/usr/bin/env ruby
+#
+# ixset --
+# A nice interface to "xset" to change X server settings
+#
+
+require 'tk'
+
+class Xsettings
+  #
+  # Button actions
+  #
+  def quit
+    @root.destroy
+  end
+
+  def ok
+    writesettings
+    quit
+  end
+
+  def cancel
+    readsettings
+    dispsettings
+    @btn_APPLY.state(:disabled)
+    @btn_CANCEL.state(:disabled)
+  end
+
+  # apply is just "writesettings"
+  def apply
+    writesettings
+    @btn_APPLY.state(:disabled)
+    @btn_CANCEL.state(:disabled)
+  end
+
+  #
+  # Read current settings
+  #
+  def readsettings
+    xfd = open("|xset q", 'r')
+    xfd.readlines.each{|line|
+      fields = line.chomp.strip.split(/\s+/)
+      case fields[0]
+      when "auto"
+	if fields[1] == 'repeat:'
+	  @kbdrep = fields[2]
+	  @w_kbdrep.set(@kbdrep)
+	  @kbdcli = fields[6]
+	end
+
+      when "bell"
+	@bellvol = fields[2]
+	@bellpit = fields[5]
+	@belldur = fields[8]
+
+      when "acceleration:"
+	@mouseacc = fields[1]
+	@mousethr = fields[3]
+
+      when "prefer"
+	if fields[2] == 'yes'
+	  @screenbla = 'blank'
+	else
+	  @screenbla = 'noblank'
+	end
+	@w_screenbla.set(@screenbla)
+
+      when "timeout:"
+	@screentim = fields[1]
+	@screencyc = fields[3]
+
+      end
+    }
+
+    xfd.close
+  end
+
+  #
+  # Write settings into the X server
+  #
+  def writesettings
+    @bellvol = @w_bellvol.get
+    @bellpit = @w_bellpit.get
+    @belldur = @w_belldur.get
+
+    @kbdrep = @w_kbdrep.get
+    if @kbdrep == 'on'
+      @kbdcli = @w_kbdcli.get
+    else
+      @kbdcli = 'off'
+    end
+
+    @mouseacc = @w_mouseacc.get
+    @mousethr = @w_mousethr.get
+
+    @screentim = @w_screentim.get
+    @screencyc = @w_screencyc.get
+    @screenbla = @w_screenbla.get
+
+    system("xset \
+            b #{@bellvol} #{@bellpit} #{@belldur} \
+            c #{@kbdcli} \
+            r #{@kbdrep} \
+            m #{@mouseacc} #{@mousethr} \
+            s #{@screentim} #{@screencyc} \
+            s #{@screenbla}")
+  end
+
+  #
+  # Sends all settings to the window
+  #
+  def dispsettings
+    @w_bellvol.set(@bellvol)
+    @w_bellpit.set(@bellpit)
+    @w_belldur.set(@belldur)
+
+    @w_kbdonoff.set(@w_kbdrep.get)
+    @w_kbdcli.set(@kbdcli)
+
+    @w_mouseacc.set(@mouseacc)
+    @w_mousethr.set(@mousethr)
+
+    @w_screenblank.set(@w_screenbla.get)
+    @w_screenpat.set(@w_screenbla.get)
+
+    @w_screentim.set(@screentim)
+    @w_screencyc.set(@screencyc)
+  end
+
+  #
+  # Create all windows, and pack them
+  #
+  class LabelEntry
+    def initialize(parent, text, length, range=[])
+      @frame = TkFrame.new(parent)
+      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left')
+      if range.size > 0 
+	@entry = TkSpinbox.new(@frame, 'width'=>length, 'relief'=>'sunken', 
+			       'from'=>range[0], 'to'=>range[1])
+      else
+	@entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken')
+      end
+      @entry.pack('side'=>'right','expand'=>'y', 'fill'=>'x')
+    end
+    def epath
+      @frame
+    end
+    def pack(keys)
+      @frame.pack(keys)
+    end
+    def get
+      @entry.value
+    end
+    def set(value)
+      @entry.delete(0,'end')
+      @entry.insert(0, value)
+    end
+  end
+
+  def createwindows
+    win = self
+
+    #
+    # Buttons
+    #
+    btn_frame = TkFrame.new(@root)
+    buttons = [ 
+      @btn_OK = TkButton.new(btn_frame, 'command'=>proc{win.ok}, 
+			     'default'=>'active', 'text'=>'Ok'),
+      @btn_APPLY = TkButton.new(btn_frame, 'command'=>proc{win.writesettings}, 
+				'default'=>'normal', 'text'=>'Apply', 
+				'state'=>'disabled'),
+      @btn_CANCEL = TkButton.new(btn_frame, 'command'=>proc{win.cancel}, 
+				 'default'=>'normal', 'text'=>'Cancel', 
+				'state'=>'disabled'),
+      @btn_QUIT = TkButton.new(btn_frame, 'command'=>proc{win.quit}, 
+			       'default'=>'normal', 'text'=>'Quit')
+    ]
+    buttons.each{|b| b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5) }
+
+    @root.bind('Return', proc{@btn_OK.flash; @btn_OK.invoke})
+    @root.bind('Escape', proc{@btn_QUIT.flash; @btn_QUIT.invoke})
+    @root.bind('1', proc{|w|
+		 unless buttons.index(w)
+		   @btn_APPLY.state(:normal)
+		   @btn_CANCEL.state(:normal)
+		 end
+	       }, '%W')
+    @root.bind('Key', proc{|w, k|
+		 unless buttons.index(w)
+		   case k
+		   when 'Return', 'Escape', 'Tab', /.*Shift.*/
+		     # do nothing
+		   else
+		     @btn_APPLY.state(:normal)
+		     @btn_CANCEL.state(:normal)
+		   end
+		 end
+	       }, '%W %K')
+
+    #
+    # Bell settings
+    #
+    bell = TkLabelframe.new(@root, 'text'=>'Bell Settings', 
+			    'padx'=>'1.5m', 'pady'=>'1.5m')
+    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200, 
+			     'tickinterval'=>20, 'orient'=>'horizontal', 
+			     'label'=>"Volume (%)")
+
+    f = TkFrame.new(bell)
+    @w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6, [25, 20000])
+    @w_bellpit.pack('side'=>'left', 'padx'=>5)
+    @w_belldur = LabelEntry.new(f, "Duration (ms)", 6, [1, 10000])
+    @w_belldur.pack('side'=>'right', 'padx'=>5)
+
+    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
+    f.pack('side'=>'top', 'expand'=>'yes')
+
+    #
+    # Keyboard settings
+    # 
+    kbdonoff = nil
+    kbdcli = nil
+    kbd = TkLabelframe.new(@root, 'text'=>'Keyboard Repeat Settings', 
+			   'padx'=>'1.5m', 'pady'=>'1.5m')
+    f = TkFrame.new(kbd)
+    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat', 
+				    'onvalue'=>'on', 'offvalue'=>'off',
+				    'variable'=>@w_kbdrep ) {
+      def self.set(value)
+	if value == 'on'
+	  self.select
+	else
+	  self.deselect
+	end
+      end
+      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x', 'padx'=>[0, '1m'])
+    }
+    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200, 
+			 'tickinterval'=>20, 'orient'=>'horizontal', 
+			 'label'=>'Click Volume (%)')
+    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes', 
+		   'fill'=>'x', 'padx'=>['1m', 0])
+    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
+
+    #
+    # Mouse settings
+    #
+    mouse = TkLabelframe.new(@root, 'text'=>'Mouse Settings', 
+			     'padx'=>'1.5m', 'pady'=>'1.5m')
+    f = TkFrame.new(mouse)
+    @w_mouseacc = LabelEntry.new(f, 'Acceleration', 5)
+    @w_mouseacc.pack('side'=>'left', 'padx'=>[0, '1m'])
+    @w_mousethr = LabelEntry.new(f, 'Threshold (pixels)', 3, [1, 2000])
+    @w_mousethr.pack('side'=>'right', 'padx'=>['1m', 0])
+    f.pack('side'=>'top', 'expand'=>'yes')
+
+    #
+    # Screen Saver settings
+    #
+    screen = TkLabelframe.new(@root, 'text'=>'Screen-saver Settings', 
+			     'padx'=>'1.5m', 'pady'=>'1.5m')
+    @w_screenblank = TkRadioButton.new(screen, 'text'=>'Blank', 
+				       'relief'=>'flat', 'anchor'=>'w', 
+				       'variable'=>@w_screenbla, 
+				       'value'=>'blank') {
+      def self.set(value)
+	if value == 'blank'
+	  self.select
+	else
+	  self.deselect
+	end
+      end
+    }
+
+    @w_screenpat = TkRadioButton.new(screen, 'text'=>'Pattern', 
+				     'relief'=>'flat', 'anchor'=>'w', 
+				     'variable'=>@w_screenbla, 
+				     'value'=>'noblank') {
+      def self.set(value)
+	if value != 'blank'
+	  self.select
+	else
+	  self.deselect
+	end
+      end
+    }
+
+    @w_screentim = LabelEntry.new(screen, 'Timeout (s)', 5, [1, 100000])
+    @w_screencyc = LabelEntry.new(screen, 'Cycle (s)', 5, [1, 100000])
+
+    Tk.grid(@w_screenblank, @w_screentim, 'sticky'=>'e')
+    Tk.grid(@w_screenpat, @w_screencyc, 'sticky'=>'e')
+    TkGrid.configure(@w_screenblank, @w_screenpat, 'sticky'=>'ew')
+
+    #
+    # Main window
+    #
+    param = {
+      'side'=>'top', 'fill'=>'both', 'expand'=>'yes', 
+      'padx'=>'1m', 'pady'=>'1m'
+    }
+    btn_frame.pack('side'=>'top', 'fill'=>'both')
+    bell.pack(param)
+    kbd.pack(param)
+    mouse.pack(param)
+    screen.pack(param)
+
+    #
+    # Let the user resize our window
+    #
+    @root.minsize(10,10)
+  end
+
+  def initialize(title)
+    @root = TkRoot.new('title'=>title)
+
+    @kbdrep = 'on'
+    @w_kbdrep = TkVariable.new(@kbdrep)
+    def @w_kbdrep.get
+      self.value
+    end
+    def @w_kbdrep.set(val)
+      self.value=val
+    end
+
+    @kbdcli = 0
+
+    @bellvol = 100
+    @bellpit = 440
+    @belldur = 100
+
+    @mouseacc = "3/1"
+    @mousethr = 4
+
+    @screenbla = "blank"
+    @w_screenbla = TkVariable.new(@screenbla)
+    def @w_screenbla.get
+      self.value
+    end
+    def @w_screenbla.set(val)
+      self.value=val
+    end
+
+    @screentim = 600
+    @screencyc = 600
+
+    #
+    # Listen what "xset" tells us...
+    #
+    readsettings
+
+    #
+    # Create all windows
+    #
+    createwindows
+
+    #
+    # Write xset parameters
+    #
+    dispsettings
+  end
+end
+
+Xsettings.new(File.basename($0,'.rb'))
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/label.rb b/ruby_1_8_6/ext/tk/sample/demos-en/label.rb
new file mode 100644
index 0000000000..55e07a5ebc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/label.rb
@@ -0,0 +1,69 @@
+# label.rb
+#
+# This demonstration script creates a toplevel window containing
+# several label widgets.
+#
+# label widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($label_demo) && $label_demo
+  $label_demo.destroy 
+  $label_demo = nil
+end
+
+# demo toplevel widget 
+$label_demo = TkToplevel.new {|w|
+  title("Label Demonstration")
+  iconname("label")
+  positionWindow(w)
+}
+
+# label 
+msg = TkLabel.new($label_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "Five labels are displayed below: three textual ones on the left, and a bitmap label and a text label on the right.  Labels are pretty boring because you can't do anything with them."
+}
+msg.pack('side'=>'top')
+
+# frame 
+TkFrame.new($label_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $label_demo
+      $label_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'See Code'
+    command proc{showCode 'label'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# label demo 
+f_left = TkFrame.new($label_demo)
+f_right = TkFrame.new($label_demo)
+[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes', 
+                                  'padx'=>10, 'pady'=>10, 'fill'=>'both')}
+
+# label 
+[ TkLabel.new(f_left, 'text'=>'First label'),
+  TkLabel.new(f_left, 'text'=>'Second label, raised', 
+              'relief'=>'raised'),
+  TkLabel.new(f_left, 'text'=>'Third label, sunken', 'relief'=>'sunken')
+].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
+
+TkLabel.new(f_right) {
+  bitmap('@' + [$demo_dir,'..','images','face.xbm'].join(File::Separator))
+  borderwidth 2
+  relief 'sunken'
+}.pack('side'=>'top')
+
+TkLabel.new(f_right) { text 'Tcl/Tk Proprietor' }.pack('side'=>'top')
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/labelframe.rb b/ruby_1_8_6/ext/tk/sample/demos-en/labelframe.rb
new file mode 100644
index 0000000000..842a4f6c04
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/labelframe.rb
@@ -0,0 +1,93 @@
+# labelframe.rb
+#
+# This demonstration script creates a toplevel window containing
+# several labelframe widgets.
+#
+# based on "Id: labelframe.tcl,v 1.2 2001/10/30 11:21:50 dkf Exp"
+
+
+if defined?($labelframe_demo) && $labelframe_demo
+  $labelframe_demo.destroy 
+  $labelframe_demo = nil
+end
+
+$labelframe_demo = TkToplevel.new {|w|
+  title("Labelframe Demonstration")
+  iconname("labelframe")
+  positionWindow(w)
+}
+
+# Some information
+TkLabel.new($labelframe_demo, 
+            :font=>$font, :wraplength=>'4i', :justify=>:left, 
+            :text=><<EOL).pack(:side=>:top)
+Labelframes are used to group related widgets together. \
+The label may be either plain text or another widget. \
+If your Tk library linked to Ruby doesn't include a 'labelframe' widget, \
+this demo doesn't work. Please use later version of Tk \
+which supports a 'labelframe' widget.
+EOL
+
+# The bottom buttons
+TkFrame.new($labelframe_demo){|f|
+  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
+
+  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
+                 $labelframe_demo.destroy
+                 $labelframe_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
+                 showCode 'labelframe'
+               }).pack(:side=>:left, :expand=>true)
+}
+
+# Demo area
+w = TkFrame.new($labelframe_demo).pack(:side=>:bottom, :fill=>:both, 
+                                       :expand=>true)
+
+# A group of radiobuttons in a labelframe
+TkLabelFrame.new(w, :text=>'Value', 
+                 :padx=>2, :pady=>2) {|f|
+  grid(:row=>0, :column=>0, :pady=>'2m', :padx=>'2m')
+
+  v = TkVariable.new
+  (1..4).each{|i|
+    TkRadiobutton.new(f, :text=>"This is value #{i}", 
+                      :variable=>v, :value=>i) {
+      pack(:side=>:top, :fill=>:x, :pady=>2)
+    }
+  }
+}
+
+
+# Using a label window to control a group of options.
+$lfdummy = TkVariable.new(0)
+
+def lfEnableButtons(w)
+  TkWinfo.children(w).each{|child|
+    next if child.path =~ /\.cb$/
+    if $lfdummy == 1
+      child.state(:normal)
+    else
+      child.state(:disabled)
+    end
+  }
+end
+
+TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
+  TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy, 
+                    :text=>"Use this option.", :padx=>0) {|cb|
+    command proc{lfEnableButtons(f)}
+    f.labelwidget(cb)
+  }
+  grid(:row=>0, :column=>1, :pady=>'2m', :padx=>'2m')
+
+  %w(Option1 Option2 Option3).each{|str|
+    TkCheckbutton.new(f, :text=>str).pack(:side=>:top, :fill=>:x, :pady=>2)
+  }
+
+  lfEnableButtons(f)
+}
+
+TkGrid.columnconfigure(w, [0,1], :weight=>1)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/menu.rb b/ruby_1_8_6/ext/tk/sample/demos-en/menu.rb
new file mode 100644
index 0000000000..8370d2f5f0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/menu.rb
@@ -0,0 +1,194 @@
+#
+# menus widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($menu_demo) && $menu_demo
+  $menu_demo.destroy 
+  $menu_demo = nil
+end
+
+# demo toplevel widget
+$menu_demo = TkToplevel.new {|w|
+  title("File Selection Dialogs")
+  iconname("menu")
+  positionWindow(w)
+}
+
+# menu frame
+$menu_frame = TkFrame.new($menu_demo, 'relief'=>'raised', 'bd'=>2)
+$menu_frame.pack('side'=>'top', 'fill'=>'x')
+
+begin
+  windowingsystem = Tk.windowingsystem()
+rescue
+  windowingsystem = ""
+end
+
+# label
+TkLabel.new($menu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+  if $tk_platform['platform'] == 'macintosh' ||
+      windowingsystem == "classic" || windowingsystem == "aqua"
+    text("This window contains a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by dragging outside of its bounds and releasing the mouse.")
+  else
+    text("This window contains a menubar with cascaded menus.  You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu.  You can then traverse among the menus using the arrow keys.  When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character.  If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu.")
+  end
+}.pack('side'=>'top')
+
+# frame
+TkFrame.new($menu_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $menu_demo
+      $menu_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'menu'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# menu 
+TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
+  pack('side'=>'left')
+  TkMenu.new(m, 'tearoff'=>false) {|file_menu|
+    m.configure('menu'=>file_menu)
+    add('command', 'label'=>'Open...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Open..." entry'})
+    add('command', 'label'=>'New', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "New" entry'})
+    add('command', 'label'=>'Save', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save" entry'})
+    add('command', 'label'=>'Save As...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save As..." entry'})
+    add('separator')
+    add('command', 'label'=>'Print Setup...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print Setup..." entry'})
+    add('command', 'label'=>'Print...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print..." entry'})
+    add('separator')
+    add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu_demo.destroy})
+  }
+}
+
+if $tk_platform['platform'] == 'macintosh' ||
+    windowingsystem == "classic" || windowingsystem == "aqua"
+  modifier = 'Command'
+elsif $tk_platform['platform'] == 'windows'
+  modifier = 'Control'
+else
+  modifier = 'Meta'
+end
+
+TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
+  pack('side'=>'left')
+  TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
+    m.configure('menu'=>basic_menu)
+    add('command', 'label'=>'Long entry that does nothing')
+    ['A','B','C','D','E','F','G'].each{|c|
+      add('command', 'label'=>"Print letter \"#{c}\"", 
+          'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+          'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
+      $menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
+    }
+  }
+}
+
+TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
+  pack('side'=>'left')
+  TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
+    m.configure('menu'=>cascade_menu)
+    add('command', 'label'=>'Print hello', 
+        'command'=>proc{print "Hello\n"}, 
+        'accelerator'=>"#{modifier}+H", 'underline'=>6)
+    $menu_demo.bind("#{modifier}-h", proc{print "Hello\n"})
+    add('command', 'label'=>'Print goodbye', 
+        'command'=>proc{print "Goodbye\n"}, 
+        'accelerator'=>"#{modifier}+G", 'underline'=>6)
+    $menu_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
+
+    TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
+      cascade_menu.add('cascade', 'label'=>'Check buttons', 
+                       'menu'=>cascade_check, 'underline'=>0)
+      oil = TkVariable.new(0)
+      add('check', 'label'=>'Oil checked', 'variable'=>oil)
+      trans = TkVariable.new(0)
+      add('check', 'label'=>'Transmission checked', 'variable'=>trans)
+      brakes = TkVariable.new(0)
+      add('check', 'label'=>'Brakes checked', 'variable'=>brakes)
+      lights = TkVariable.new(0)
+      add('check', 'label'=>'Lights checked', 'variable'=>lights)
+      add('separator')
+      add('command', 'label'=>'Show current values', 
+          'command'=>proc{showVars($menu_demo, 
+                                   ['oil', oil], 
+                                   ['trans', trans], 
+                                   ['brakes', brakes], 
+                                   ['lights', lights])} )
+      invoke 1
+      invoke 3
+    }
+
+    TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
+      cascade_menu.add('cascade', 'label'=>'Radio buttons', 
+                       'menu'=>cascade_radio, 'underline'=>0)
+      pointSize = TkVariable.new
+      add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
+      add('radio', 'label'=>'14 point', 'variable'=>pointSize, 'value'=>14)
+      add('radio', 'label'=>'18 point', 'variable'=>pointSize, 'value'=>18)
+      add('radio', 'label'=>'24 point', 'variable'=>pointSize, 'value'=>24)
+      add('radio', 'label'=>'32 point', 'variable'=>pointSize, 'value'=>32)
+      add('separator')
+      style = TkVariable.new
+      add('radio', 'label'=>'Roman', 'variable'=>style, 'value'=>'roman')
+      add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
+      add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
+      add('separator')
+      add('command', 'label'=>'Show current values', 
+          'command'=>proc{showVars($menu_demo, 
+                                   ['pointSize', pointSize], 
+                                   ['style', style])} )
+      invoke 1
+      invoke 7
+    }
+  }
+}
+
+TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
+  pack('side'=>'left')
+  TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
+    m.configure('menu'=>icon_menu)
+    add('command', 
+        'bitmap'=>'@'+[$demo_dir,'..',
+                        'images','pattern.xbm'].join(File::Separator),
+        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
+                                     'text'=>'The menu entry you invoked displays a bitmap rather than a text string.  Other than this, it is just like any other menu entry.',
+                                     'bitmap'=>'', 'default'=>0, 
+                                     'buttons'=>'Dismiss')} )
+    ['info', 'questhead', 'error'].each{|icon|
+      add('command', 'bitmap'=>icon, 
+          'command'=>proc{print "You invoked the #{icon} bitmap\n"})
+    }
+  }
+}
+
+TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
+  pack('side'=>'left')
+  TkMenu.new(m, 'tearoff'=>false) {|more_menu|
+    m.configure('menu'=>more_menu)
+    [ 'An entry','Another entry','Does nothing','Does almost nothing',
+      'Make life meaningful' ].each{|i|
+      add('command', 'label'=>i, 
+          'command'=>proc{print "You invoked \"#{i}\"\n"})
+    }
+  }
+}
+
+TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
+  pack('side'=>'left')
+  TkMenu.new(m) {|colors_menu|
+    m.configure('menu'=>colors_menu)
+    ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
+      add('command', 'label'=>c, 'background'=>c, 
+          'command'=>proc{print "You invoked \"#{c}\"\n"})
+    }
+  }
+}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/menu84.rb b/ruby_1_8_6/ext/tk/sample/demos-en/menu84.rb
new file mode 100644
index 0000000000..cb616d8461
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/menu84.rb
@@ -0,0 +1,213 @@
+#
+# menus widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($menu84_demo) && $menu84_demo
+  $menu84_demo.destroy 
+  $menu84_demo = nil
+end
+
+# demo toplevel widget
+$menu84_demo = TkToplevel.new {|w|
+  title("File Selection Dialogs")
+  iconname("menu84")
+  positionWindow(w)
+}
+
+begin
+  windowingsystem = Tk.windowingsystem()
+rescue
+  windowingsystem = ""
+end
+
+# label
+TkLabel.new($menu84_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+  if $tk_platform['platform'] == 'macintosh' ||
+      windowingsystem == "classic" || windowingsystem == "aqua"
+    text("This window contains a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by dragging outside of its bounds and releasing the mouse.")
+  else
+    text("This window contains a menubar with cascaded menus.  You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu.  You can then traverse among the menus using the arrow keys.  When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character.  If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu.")
+  end
+}.pack('side'=>'top')
+
+
+menustatus = TkVariable.new("    ")
+TkFrame.new($menu84_demo) {|frame|
+  TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken', 
+              'bd'=>1, 'font'=>['Helvetica', '10'], 
+              'anchor'=>'w').pack('side'=>'left', 'padx'=>2, 
+                                  'expand'=>true, 'fill'=>'both')
+  pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
+}
+
+
+# frame
+TkFrame.new($menu84_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $menu84_demo
+      $menu84_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'menu84'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+
+# create menu frame
+$menu84_frame = TkMenu.new($menu84_demo, 'tearoff'=>false)
+
+# menu
+TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
+  $menu84_frame.add('cascade', 'label'=>'File', 'menu'=>m, 'underline'=>0)
+  add('command', 'label'=>'Open...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Open..." entry'})
+  add('command', 'label'=>'New', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "New" entry'})
+  add('command', 'label'=>'Save', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save" entry'})
+  add('command', 'label'=>'Save As...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Save As..." entry'})
+  add('separator')
+  add('command', 'label'=>'Print Setup...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print Setup..." entry'})
+  add('command', 'label'=>'Print...', 'command'=>proc{fail 'this is just a demo: no action has been defined for the "Print..." entry'})
+  add('separator')
+  add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu84_demo.destroy})
+}
+
+if $tk_platform['platform'] == 'macintosh' ||
+    windowingsystem = "classic" || windowingsystem = "aqua"
+  modifier = 'Command'
+elsif $tk_platform['platform'] == 'windows'
+  modifier = 'Control'
+else
+  modifier = 'Meta'
+end
+
+TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
+  $menu84_frame.add('cascade', 'label'=>'Basic', 'menu'=>m, 'underline'=>0)
+  add('command', 'label'=>'Long entry that does nothing')
+  ['A','B','C','D','E','F','G'].each{|c|
+    add('command', 'label'=>"Print letter \"#{c}\"", 
+        'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+        'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
+    $menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
+  }
+}
+
+TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
+  $menu84_frame.add('cascade', 'label'=>'Cascades', 'menu'=>m, 'underline'=>0)
+  add('command', 'label'=>'Print hello', 
+      'command'=>proc{print "Hello\n"}, 
+      'accelerator'=>"#{modifier}+H", 'underline'=>6)
+  $menu84_demo.bind("#{modifier}-h", proc{print "Hello\n"})
+  add('command', 'label'=>'Print goodbye', 
+      'command'=>proc{print "Goodbye\n"}, 
+      'accelerator'=>"#{modifier}+G", 'underline'=>6)
+  $menu84_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
+
+  TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
+    m.add('cascade', 'label'=>'Check buttons', 
+          'menu'=>cascade_check, 'underline'=>0)
+    oil = TkVariable.new(0)
+    add('check', 'label'=>'Oil checked', 'variable'=>oil)
+    trans = TkVariable.new(0)
+    add('check', 'label'=>'Transmission checked', 'variable'=>trans)
+    brakes = TkVariable.new(0)
+    add('check', 'label'=>'Brakes checked', 'variable'=>brakes)
+    lights = TkVariable.new(0)
+    add('check', 'label'=>'Lights checked', 'variable'=>lights)
+    add('separator')
+    add('command', 'label'=>'Show current values', 
+        'command'=>proc{showVars($menu84_demo, 
+                                 ['oil', oil], 
+                                 ['trans', trans], 
+                                 ['brakes', brakes], 
+                                 ['lights', lights])} )
+    invoke 1
+    invoke 3
+  }
+
+  TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
+    m.add('cascade', 'label'=>'Radio buttons', 
+          'menu'=>cascade_radio, 'underline'=>0)
+    pointSize = TkVariable.new
+    add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
+    add('radio', 'label'=>'14 point', 'variable'=>pointSize, 'value'=>14)
+    add('radio', 'label'=>'18 point', 'variable'=>pointSize, 'value'=>18)
+    add('radio', 'label'=>'24 point', 'variable'=>pointSize, 'value'=>24)
+    add('radio', 'label'=>'32 point', 'variable'=>pointSize, 'value'=>32)
+    add('separator')
+    style = TkVariable.new
+    add('radio', 'label'=>'Roman', 'variable'=>style, 'value'=>'roman')
+    add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
+    add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
+    add('separator')
+    add('command', 'label'=>'Show current values', 
+        'command'=>proc{showVars($menu84_demo, 
+                                 ['pointSize', pointSize], 
+                                 ['style', style])} )
+    invoke 1
+    invoke 7
+  }
+}
+
+TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
+  $menu84_frame.add('cascade', 'label'=>'Icons', 'menu'=>m, 'underline'=>0)
+  add('command', 'hidemargin'=>1, 
+      'bitmap'=>'@'+[$demo_dir,'..',
+                      'images','pattern.xbm'].join(File::Separator),
+      'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
+                                   'text'=>'The menu entry you invoked displays a bitmap rather than a text string.  Other than this, it is just like any other menu entry.',
+                                   'bitmap'=>'', 'default'=>0, 
+                                   'buttons'=>'Dismiss')} )
+  ['info', 'questhead', 'error'].each{|icon|
+    add('command', 'bitmap'=>icon, 'hidemargin'=>1, 
+        'command'=>proc{print "You invoked the #{icon} bitmap\n"})
+  }
+
+  entryconfigure(2, :columnbreak=>true)
+}
+
+TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
+  $menu84_frame.add('cascade', 'label'=>'More', 'menu'=>m, 'underline'=>0)
+  [ 'An entry','Another entry','Does nothing','Does almost nothing',
+    'Make life meaningful' ].each{|i|
+    add('command', 'label'=>i, 
+        'command'=>proc{print "You invoked \"#{i}\"\n"})
+  }
+
+  m.entryconfigure('Does almost nothing', 
+                   'bitmap'=>'questhead', 'compound'=>'left', 
+                   'command'=>proc{
+                     TkDialog.new('title'=>'Compound Menu Entry', 
+                                  'message'=>'The menu entry you invoked'+
+                                             'displays both a bitmap and '+
+                                             'a text string.  Other than '+
+                                             'this, it isjust like any '+
+                                             'other menu entry.', 
+                                  'buttons'=>['OK'], 'bitmap'=>'')
+                   })
+}
+
+TkMenu.new($menu84_frame) {|m|
+  $menu84_frame.add('cascade', 'label'=>'Colors', 'menu'=>m, 'underline'=>0)
+  ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
+    add('command', 'label'=>c, 'background'=>c, 
+        'command'=>proc{print "You invoked \"#{c}\"\n"})
+  }
+}
+
+$menu84_demo.menu($menu84_frame)
+
+TkMenu.bind('<MenuSelect>', proc{|w|
+              begin
+                label = w.entrycget('active', 'label')
+              rescue
+                label = "    "
+              end
+              menustatus.value = label
+              Tk.update(true)
+            }, '%W')
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/menubu.rb b/ruby_1_8_6/ext/tk/sample/demos-en/menubu.rb
new file mode 100644
index 0000000000..e2ddd07bc6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/menubu.rb
@@ -0,0 +1,235 @@
+# menubutton.rb
+#
+# This demonstration script creates a window with a bunch of menus
+# and cascaded menus using menubuttons.
+
+require "tkcanvas"
+
+def optionMenu(menubutton, varName, firstValue, *rest)
+  varName.value = firstValue
+  configoptions = {'textvariable'=>varName,'indicatoron'=>'on',
+    'relief'=>'raised','borderwidth'=>2,'highlightthickness'=>2,
+    'anchor'=>'c','direction'=>'flush'}
+  configoptions.each {|key, value|
+    menubutton.configure(key, value)
+  }
+  menu = TkMenu.new(menubutton) {
+    tearoff 'off'
+    add 'radio', 'label'=>firstValue, 'variable'=>varName
+  }
+  menubutton.menu(menu)
+  for i in rest
+    menu.add 'radio', 'label'=>i, 'variable'=>varName
+  end
+  
+  return menu
+end
+
+if defined?($menubu_demo) && $menubu_demo
+  $menubu_demo.destroy
+  $menubu_demo = nil
+end
+
+$menubu_demo = TkToplevel.new {|w|
+  title("Menu Button Demonstration")
+  iconname("menubutton")
+}
+
+positionWindow($menubu_demo)
+
+# version check
+if $tk_version.to_f < 8.0
+
+# label
+TkLabel.new($menubu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+    text("This is a demonstration of menubuttons. The \"Below\" menubutton pops its menu below the button; the \"Right\" button pops to the right, etc. There are two option menus directly below this text; one is just a standard menu and the other is a 16-color palette.")
+}.pack('side'=>'top')
+
+# frame
+TkFrame.new($menubu_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $menubu_demo
+      $menubu_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'menubu'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+else ; # Tk8.x
+
+body = TkFrame.new($menubu_demo)
+body.pack('expand'=>'yes', 'fill'=>'both')
+
+below = TkMenubutton.new(body) {
+  text "Below"
+  underline 0
+  direction 'below'
+  relief 'raised'
+}
+belowMenu = TkMenu.new(below) {
+  tearoff 0
+  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
+  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
+}
+below.menu(belowMenu)
+below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
+
+below = TkMenubutton.new(body) {
+  text "Below"
+  underline 0
+  direction 'below'
+  relief 'raised'
+}
+belowMenu = TkMenu.new(below) {
+  tearoff 0
+  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
+  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
+}
+below.menu(belowMenu)
+below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
+
+below = TkMenubutton.new(body) {
+  text "Below"
+  underline 0
+  direction 'below'
+  relief 'raised'
+}
+belowMenu = TkMenu.new(below) {
+  tearoff 0
+  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
+  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
+}
+below.menu(belowMenu)
+below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
+
+right = TkMenubutton.new(body) {
+  text "Right"
+  underline 0
+  direction 'right'
+  relief 'raised'
+}
+rightMenu = TkMenu.new(right) {
+  tearoff 0
+  add 'command', 'label'=>"Right menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
+  add 'command', 'label'=>"Right menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Right menu.\""}
+}
+right.menu(rightMenu)
+right.grid('row'=>1, 'column'=>0, 'sticky'=>'w')
+
+left = TkMenubutton.new(body) {
+  text "Left"
+  underline 0
+  direction 'left'
+  relief 'raised'
+}
+leftMenu = TkMenu.new(left) {
+  tearoff 0
+  add 'command', 'label'=>"Left menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
+  add 'command', 'label'=>"Left menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Left menu.\""}
+}
+left.menu(leftMenu)
+left.grid('row'=>1, 'column'=>2, 'sticky'=>'e')
+
+center = TkFrame.new(body) {
+  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
+}
+
+above = TkMenubutton.new(body) {
+  text "Above"
+  underline 0
+  direction 'above'
+  relief 'raised'
+}
+aboveMenu = TkMenu.new(above) {
+  tearoff 0
+  add 'command', 'label'=>"Above menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Above menu.\""}
+  add 'command', 'label'=>"Above menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Above menu.\""}
+}
+above.menu(aboveMenu)
+above.grid('row'=>2, 'column'=>1, 'sticky'=>'s')
+
+center = TkFrame.new(body) {
+  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
+}
+
+TkFrame.new($menubu_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc {
+      tmppath = $menubu_demo
+      $menubu_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc { showCode 'menubu' }
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x', 'pady'=>'2m')
+
+msg = TkLabel.new(center) {
+#  font $font
+  wraplength '4i'
+  justify 'left'
+  text "This is a demonstration of menubuttons. The \"Below\" menubutton pops its menu below the button; the \"Right\" button pops to the right, etc. There are two option menus directly below this text; one is just a standard menu and the other is a 16-color palette."
+}
+msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
+
+TkFrame.new(center) {|f|
+  menubuttonoptions = TkVariable.new
+  mbutton = TkMenubutton.new(f)
+  options = optionMenu(mbutton, menubuttonoptions, 
+                       'one', 'two', 'three')
+  mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
+  paletteColor = TkVariable.new
+  colors = ['Black','red4','DarkGreen','NavyBlue', 'gray75',
+    'Red','Green','Blue','gray50','Yellow','Cyan','Magenta',
+    'White','Brown','DarkSeaGreen','DarkViolet']
+  colorMenuButton = TkMenubutton.new(f)
+  m = optionMenu(colorMenuButton, paletteColor, *colors)
+  begin
+    windowingsystem = Tk.windowingsystem()
+  rescue
+    windowingsystem = ""
+  end
+  if windowingsystem == "classic" || windowingsystem == "aqua"
+    topBorderColor = 'Black'
+    bottomBorderColor = 'Black'
+  else
+    topBorderColor = 'gray50'
+    bottomBorderColor = 'gray75'
+  end
+  for i in 0..15
+    image = TkPhotoImage.new('height'=>16, 'width'=>16)
+    image.put(topBorderColor, 0, 0, 16, 1)
+    image.put(topBorderColor, 0, 1, 1, 16)
+    image.put(bottomBorderColor, 0, 15, 16, 16)
+    image.put(bottomBorderColor, 15, 1, 16, 16)
+    image.put(colors[i], 1, 1, 15, 15)
+
+    selectimage = TkPhotoImage.new('height'=>16, 'width'=>16)
+    selectimage.put('Black', 0, 0, 16, 2)
+    selectimage.put('Black', 0, 2, 2, 16)
+    selectimage.put('Black', 2, 14, 16, 16)
+    selectimage.put('Black', 14, 2, 16, 14)
+    selectimage.put(colors[i], 2, 2, 14, 14)
+
+    m.entryconfigure(i, 'image'=>image, 'selectimage'=>selectimage, 'hidemargin'=>'on')
+  end
+  m.configure('tearoff', 'on')
+  for c in ['Black', 'gray75', 'gray50', 'White']
+    m.entryconfigure(c, 'columnbreak'=>1)
+  end
+  colorMenuButton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
+  pack 'padx'=>25, 'pady'=>25
+}
+
+end ; # Tk8.x
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/msgbox.rb b/ruby_1_8_6/ext/tk/sample/demos-en/msgbox.rb
new file mode 100644
index 0000000000..aab1b619cf
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/msgbox.rb
@@ -0,0 +1,88 @@
+# msgbox.rb
+#
+# This demonstration script creates message boxes of various type
+#
+# message boxes widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($msgbox_demo) && $msgbox_demo
+  $msgbox_demo.destroy 
+  $msgbox_demo = nil
+end
+
+# demo toplevel widget
+$msgbox_demo = TkToplevel.new {|w|
+  title("Message Box Demonstration")
+  iconname("messagebox")
+  positionWindow(w)
+}
+
+# label
+TkLabel.new($msgbox_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
+            'text'=>"Choose the icon and type option of the message box. Then press the \"Message Box\" button to see the message box.").pack('side'=>'top')
+
+# frame
+TkFrame.new($msgbox_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $msgbox_demo
+      $msgbox_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'msgbox'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Message Box'
+    command proc{showMessageBox $msgbox_demo}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame
+$msgbox_leftframe  = TkFrame.new($msgbox_demo)
+$msgbox_rightframe = TkFrame.new($msgbox_demo)
+$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
+                        'pady'=>'.5c', 'padx'=>'.5c')
+$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
+                        'pady'=>'.5c', 'padx'=>'.5c')
+
+TkLabel.new($msgbox_leftframe, 'text'=>'Icon').pack('side'=>'top')
+TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
+.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
+
+$msgboxIcon = TkVariable.new('info')
+['error', 'info', 'question', 'warning'].each {|icon|
+  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon, 
+                    'relief'=>'flat', 'value'=>icon, 'width'=>16, 
+                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2, 
+                                        'anchor'=>'w', 'fill'=>'x')
+}
+
+TkLabel.new($msgbox_rightframe, 'text'=>'Type').pack('side'=>'top')
+TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
+.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
+
+$msgboxType = TkVariable.new('ok')
+['abortretryignore', 'ok', 'okcancel', 
+  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
+  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType, 
+                    'relief'=>'flat', 'value'=>type, 'width'=>16, 
+                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2, 
+                                        'anchor'=>'w', 'fill'=>'x')
+}
+
+def showMessageBox(w)
+  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value, 
+                         'title'=>'Message', 'parent'=>w,
+                         'message'=>"This is a \"#{$msgboxType.value}\" type messagebox with the \"#{$msgboxIcon.value}\" icon")
+
+  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w, 
+                'message'=>"You have selected  \"#{button}\"")
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/paned1.rb b/ruby_1_8_6/ext/tk/sample/demos-en/paned1.rb
new file mode 100644
index 0000000000..48ba86de02
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/paned1.rb
@@ -0,0 +1,45 @@
+# paned1.rb
+#
+# This demonstration script creates a toplevel window containing
+# a paned window that separates two windows horizontally.
+#
+# based on "Id: paned1.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
+
+if defined?($paned1_demo) && $paned1_demo
+  $paned1_demo.destroy 
+  $paned1_demo = nil
+end
+
+$paned1_demo = TkToplevel.new {|w|
+  title("Horizontal Paned Window Demonstration")
+  iconname("paned1")
+  positionWindow(w)
+}
+
+TkLabel.new($paned1_demo, 
+            :font=>$font, :wraplength=>'4i', :justify=>:left, 
+            :text=><<EOL).pack(:side=>:top)
+The sash between the two coloured windows below can be used to divide the area between them.  Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)
+If your Tk library linked to Ruby doesn't include a 'panedwindow', this demo doesn't work. Please use later version of Tk which supports a 'panedwindow'.
+EOL
+
+# The bottom buttons
+TkFrame.new($paned1_demo){|f|
+  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
+
+  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
+                 $paned1_demo.destroy
+                 $paned1_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
+                 showCode 'paned1'
+               }).pack(:side=>:left, :expand=>true)
+}
+
+TkPanedwindow.new($paned1_demo){|f|
+  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
+
+  add(TkLabel.new(f, :text=>"This is the\nleft side", :bg=>'yellow'), 
+      TkLabel.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
+}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/paned2.rb b/ruby_1_8_6/ext/tk/sample/demos-en/paned2.rb
new file mode 100644
index 0000000000..5911cadab6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/paned2.rb
@@ -0,0 +1,92 @@
+# paned2.rb --
+#
+# This demonstration script creates a toplevel window containing
+# a paned window that separates two windows vertically.
+#
+# based on "Id: paned2.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
+
+if defined?($paned2_demo) && $paned2_demo
+  $paned2_demo.destroy 
+  $paned2_demo = nil
+end
+
+$paned2_demo = TkToplevel.new {|w|
+  title("Vertical Paned Window Demonstration")
+  iconname("paned2")
+  positionWindow(w)
+}
+
+TkLabel.new($paned2_demo, 
+            :font=>$font, :wraplength=>'4i', :justify=>:left, 
+            :text=><<EOL).pack(:side=>:top)
+The sash between the two scrolled windows below can be used to divide the area between them.  Use the left mouse button to resize without redrawing by just moving the sash, and use the middle mouse button to resize opaquely (always redrawing the windows in each position.)
+If your Tk library linked to Ruby doesn't include a 'panedwindow', this demo doesn't work. Please use later version of Tk which supports a 'panedwindow'.
+EOL
+
+# The bottom buttons
+TkFrame.new($paned2_demo){|f|
+  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
+
+  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
+                 $paned2_demo.destroy
+                 $paned2_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
+                 showCode 'paned2'
+               }).pack(:side=>:left, :expand=>true)
+}
+
+paneList = TkVariable.new  # define as normal variable (not array)
+paneList.value = [         # ruby's array --> tcl's list
+    'List of Ruby/Tk Widgets',
+    'TkButton', 
+    'TkCanvas', 
+    'TkCheckbutton', 
+    'TkEntry', 
+    'TkFrame', 
+    'TkLabel', 
+    'TkLabelframe', 
+    'TkListbox', 
+    'TkMenu', 
+    'TkMenubutton', 
+    'TkMessage', 
+    'TkPanedwindow', 
+    'TkRadiobutton', 
+    'TkScale', 
+    'TkScrollbar', 
+    'TkSpinbox', 
+    'TkText', 
+    'TkToplevel'
+]
+
+# Create the pane itself
+TkPanedwindow.new($paned2_demo, :orient=>:vertical){|f|
+  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
+
+  add(TkFrame.new(f){|paned2_top|
+        TkListbox.new(paned2_top, :listvariable=>paneList) {
+          # Invert the first item to highlight it
+          itemconfigure(0, :background=>self.cget(:foreground), 
+                           :foreground=>self.cget(:background) )
+          yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right, 
+                                                      :fill=>:y))
+          pack(:fill=>:both, :expand=>true)
+        }
+      }, 
+
+      TkFrame.new(f, :height=>120) {|paned2_bottom|
+        # The bottom window is a text widget with scrollbar
+        paned2_xscr = TkScrollbar.new(paned2_bottom)
+        paned2_yscr = TkScrollbar.new(paned2_bottom)
+        paned2_text = TkText.new(paned2_bottom, :width=>30, :wrap=>:non) {
+          insert('1.0', "This is just a normal text widget")
+          xscrollbar(paned2_xscr)
+          yscrollbar(paned2_yscr)
+        }
+        Tk.grid(paned2_text, paned2_yscr, :sticky=>'nsew')
+        Tk.grid(paned2_xscr, :sticky=>'nsew')
+        TkGrid.columnconfigure(paned2_bottom, 0, :weight=>1)
+        TkGrid.rowconfigure(paned2_bottom, 0, :weight=>1)
+      } )
+}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/patch_1.1c1 b/ruby_1_8_6/ext/tk/sample/demos-en/patch_1.1c1
new file mode 100644
index 0000000000..d3952e71eb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/patch_1.1c1
@@ -0,0 +1,93 @@
+--- /usr/src/ruby-1.1c1/lib/tkcanvas.rb	Tue Jul 21 18:18:02 1998
++++ tkcanvas.rb	Fri Jul 24 20:38:24 1998
+@@ -310,7 +310,7 @@
+ 	  || key == 'latinfont' || key == 'asciifont' )
+ 	tagfont_configure(tagid(tagOrId), {key=>value})
+       else
+-	tk_call 'itemconfigure', tagid(tagOrId), "-#{key}", value
++	tk_send 'itemconfigure', tagid(tagOrId), "-#{key}", value
+       end
+     end
+   end
+--- /usr/src/ruby-1.1c1/lib/tkfont.rb	Fri Jul 17 23:43:28 1998
++++ tkfont.rb	Fri Jul 24 17:46:22 1998
+@@ -42,7 +42,7 @@
+       r | []
+ 
+     when /^8\.*/
+-      list(tk_call('font', 'names'))
++      tk_split_simplelist(tk_call('font', 'names'))
+ 
+     end
+   end
+@@ -89,10 +89,14 @@
+       if fnt == []
+ 	TkFont.new(nil, nil).call_font_configure(path, *(args + [{}]))
+       else
+-	compound = Hash[*list(tk_call('font', 'configure', 
+-				      fnt))].collect{|key,value|
+-	  [key[1..-1], value]
+-	}.assoc('compound')[1]
++	begin
++	  compound = Hash[*list(tk_call('font', 'configure', 
++					fnt))].collect{|key,value|
++	    [key[1..-1], value]
++	  }.assoc('compound')[1]
++	rescue
++	  compound = []
++	end
+ 	if compound == []
+ 	  TkFont.new(fnt, DEFAULT_KANJI_FONT_NAME) \
+ 	  .call_font_configure(path, *(args + [{}]))
+@@ -156,14 +160,19 @@
+     elsif font.kind_of? Array
+       finfo = {}
+       finfo['family'] = font[0].to_s
+-      if font[1] && font[1] != '0' && font[1] =~ /^(|\+|-)([0-9]+)$/
+-	if $1 == '-'
+-	  finfo['pixels'] = font[1].to_s
++      if font[1]
++	fsize = font[1].to_s
++	if fsize != '0' && fsize =~ /^(|\+|-)([0-9]+)$/
++	  if $1 == '-'
++	    finfo['pixels'] = $2
++	  else
++	    finfo['points'] = $2
++	  end
+ 	else
+-	  finfo['points'] = font[1].to_s
++	  finfo['points'] = '13'
+ 	end
+       end
+-      finfo[2..-1].each{|style|
++      font[2..-1].each{|style|
+ 	case (style)
+ 	when 'normal'
+ 	  finfo['weight'] = style
+@@ -199,16 +208,19 @@
+     elsif font.kind_of? Array
+       finfo = {}
+       finfo['family'] = font[0].to_s
+-      if font[1] && font[1] != '0' && font[1] =~ /^(|\+|-)([0-9]+)$/
+-	if $1 == '-'
+-	  finfo['pixels'] = $2
++      if font[1]
++	fsize = font[1].to_s
++	if fsize != '0' && fsize =~ /^(|\+|-)([0-9]+)$/
++	  if $1 == '-'
++	    finfo['pixels'] = $2
++	  else
++	    finfo['points'] = $2
++	  end
+ 	else
+-	  finfo['points'] = $2
++	  finfo['points'] = '13'
+ 	end
+-      else
+-	finfo['points'] = '13'
+       end
+-      finfo[2..-1].each{|style|
++      font[2..-1].each{|style|
+ 	case (style)
+ 	when 'normal'
+ 	  finfo['weight'] = style
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/pendulum.rb b/ruby_1_8_6/ext/tk/sample/demos-en/pendulum.rb
new file mode 100644
index 0000000000..36bb44edec
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/pendulum.rb
@@ -0,0 +1,223 @@
+#
+# This demonstration illustrates how Tcl/Tk can be used to construct
+# simulations of physical systems.
+# (called by 'widget')
+#
+# based on Tcl/Tk8.5a2 widget demos
+
+# destroy toplevel widget for this demo script
+if defined?($pendulum_demo) && $pendulum_demo
+  $pendulum_demo.destroy 
+  $pendulum_demo = nil
+end
+
+# create toplevel widget
+$pendulum_demo = TkToplevel.new {|w|
+  title("Pendulum Animation Demonstration")
+  iconname("pendulum")
+  positionWindow(w)
+}
+
+# create label
+msg = TkLabel.new($pendulum_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text 'This demonstration shows how Ruby/Tk can be used to carry out animations that are linked to simulations of physical systems. In the left canvas is a graphical representation of the physical system itself, a simple pendulum, and in the right canvas is a graph of the phase space of the system, which is a plot of the angle (relative to the vertical) against the angular velocity. The pendulum bob may be repositioned by clicking and dragging anywhere on the left canvas.'
+}
+msg.pack('side'=>'top')
+
+# create frame
+TkFrame.new($pendulum_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $pendulum_demo
+      $pendulum_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'See Code'
+    command proc{showCode 'pendulum'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# animated wave
+class PendulumAnimationDemo
+  def initialize(frame)
+    # Create some structural widgets
+    pane = TkPanedWindow.new(frame).pack(:fill=>:both, :expand=>true)
+    pane.add(@lf1 = TkLabelFrame.new(pane, :text=>'Pendulum Simulation'))
+    pane.add(@lf2 = TkLabelFrame.new(pane, :text=>'Phase Space'))
+
+    # Create the canvas containing the graphical representation of the
+    # simulated system.
+    @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white', 
+                      :borderwidth=>2, :relief=>:sunken)
+    TkcText.new(@c, 5, 5, :anchor=>:nw, 
+                :text=>'Click to Adjust Bob Start Position')
+    # Coordinates of these items don't matter; they will be set properly below
+    @plate = TkcLine.new(@c, 0, 25, 320, 25, :width=>2, :fill=>'grey50')
+    @rod = TkcLine.new(@c, 1, 1, 1, 1, :width=>3, :fill=>'black')
+    @bob = TkcOval.new(@c, 1, 1, 2, 2, 
+                       :width=>3, :fill=>'yellow', :outline=>'black')
+    TkcOval.new(@c, 155, 20, 165, 30, :fill=>'grey50', :outline=>'')
+
+    # pack
+    @c.pack(:fill=>:both, :expand=>true)
+
+    # Create the canvas containing the phase space graph; this consists of
+    # a line that gets gradually paler as it ages, which is an extremely
+    # effective visual trick.
+    @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white', 
+                      :borderwidth=>2, :relief=>:sunken)
+    @y_axis = TkcLine.new(@k, 160, 200, 160, 0, :fill=>'grey75', :arrow=>:last)
+    @x_axis = TkcLine.new(@k, 0, 100, 320, 100, :fill=>'grey75', :arrow=>:last)
+
+    @graph = {}
+    90.step(0, -10){|i|
+      # Coordinates of these items don't matter; 
+      # they will be set properly below
+      @graph[i] = TkcLine.new(@k, 0, 0, 1, 1, :smooth=>true, :fill=>"grey#{i}")
+    }
+
+    # labels
+    @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne, 
+                               :text=>'q', :font=>'Symbol 8')
+    @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne, 
+                               :text=>'dq', :font=>'Symbol 8')
+
+    # pack
+    @k.pack(:fill=>:both, :expand=>true)
+
+    # Initialize some variables
+    @points = []
+    @theta = 45.0
+    @dTheta = 0.0
+    @length = 150
+
+    # init display
+    showPendulum
+
+    # animation loop
+    @timer = TkTimer.new(15){ repeat }
+
+    # binding
+    @c.bindtags_unshift(btag = TkBindTag.new)
+    btag.bind('Destroy'){ @timer.stop }
+    btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x, y)}, '%x %y')
+    btag.bind('B1-Motion', proc{|x, y| showPendulum(x, y)}, '%x %y')
+    btag.bind('ButtonRelease-1', 
+              proc{|x, y| showPendulum(x, y); @timer.start }, '%x %y')
+
+    btag.bind('Configure', proc{|w| @plate.coords(0, 25, w, 25)}, '%w')
+
+    @k.bind('Configure', proc{|h, w| 
+              @psh = h/2; 
+              @psw = w/2
+              @x_axis.coords(2, @psh, w-2, @psh)
+              @y_axis.coords(@psw, h-2, @psw, 2)
+              @label_theta.coords(@psw-4, 6)
+              @label_dtheta.coords(w-6, @psh+4)
+            }, '%h %w')
+
+    # animation start
+    @timer.start(500)
+  end
+
+  # This procedure makes the pendulum appear at the correct place on the
+  # canvas. If the additional arguments x, y are passed instead of computing 
+  # the position of the pendulum from the length of the pendulum rod and its 
+  # angle, the length and angle are computed in reverse from the given 
+  # location (which is taken to be the centre of the pendulum bob.)
+  def showPendulum(x=nil, y=nil)
+    if x && y && (x != 160 || y != 25)
+      @dTheta = 0.0
+      x2 = x - 160
+      y2 = y - 25
+      @length = Math.hypot(x2, y2)
+      @theta = Math.atan2(x2,y2)*180/Math::PI
+    else
+      angle = @theta*Math::PI/180
+      x = 160 + @length*Math.sin(angle)
+      y = 25 + @length*Math.cos(angle)
+    end
+
+    @rod.coords(160, 25, x, y)
+    @bob.coords(x-15, y-15, x+15, y+15)
+  end
+
+  # Update the phase-space graph according to the current angle and the
+  # rate at which the angle is changing (the first derivative with
+  # respect to time.)
+  def showPhase
+    @points << @theta + @psw << -20*@dTheta + @psh
+    if @points.length > 100
+      @points = @points[-100..-1]
+    end
+    (0...100).step(10){|i|
+      first = - i
+      last = 11 - i
+      last = -1 if last >= 0
+      next if first > last
+      lst = @points[first..last]
+      @graph[i].coords(lst) if lst && lst.length >= 4
+    }
+  end
+
+  # This procedure is the "business" part of the simulation that does
+  # simple numerical integration of the formula for a simple rotational
+  # pendulum.
+  def recomputeAngle
+    scaling = 3000.0/@length/@length
+
+    # To estimate the integration accurately, we really need to
+    # compute the end-point of our time-step.  But to do *that*, we
+    # need to estimate the integration accurately!  So we try this
+    # technique, which is inaccurate, but better than doing it in a
+    # single step.  What we really want is bound up in the
+    # differential equation:
+    #       ..             - sin theta
+    #      theta + theta = -----------
+    #                         length
+    # But my math skills are not good enough to solve this!
+
+    # first estimate
+    firstDDTheta = -Math.sin(@theta * Math::PI/180) * scaling
+    midDTheta = @dTheta + firstDDTheta
+    midTheta = @theta + (@dTheta + midDTheta)/2
+    # second estimate
+    midDDTheta = -Math.sin(midTheta * Math::PI/180) * scaling
+    midDTheta = @dTheta + (firstDDTheta + midDDTheta)/2
+    midTheta = @theta + (@dTheta + midDTheta)/2
+    # Now we do a double-estimate approach for getting the final value
+    # first estimate
+    midDDTheta = -Math.sin(midTheta * Math::PI/180) * scaling
+    lastDTheta = midDTheta + midDDTheta
+    lastTheta = midTheta + (midDTheta+ lastDTheta)/2
+    # second estimate
+    lastDDTheta = -Math.sin(lastTheta * Math::PI/180) * scaling
+    lastDTheta = midDTheta + (midDDTheta + lastDDTheta)/2
+    lastTheta = midTheta + (midDTheta + lastDTheta)/2
+    # Now put the values back in our globals
+    @dTheta = lastDTheta
+    @theta = lastTheta
+  end
+
+  # This method ties together the simulation engine and the graphical
+  # display code that visualizes it.
+  def repeat
+    # Simulate
+    recomputeAngle
+
+    # Update the display
+    showPendulum
+    showPhase
+  end
+end
+
+# Start the animation processing
+PendulumAnimationDemo.new($pendulum_demo)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/plot.rb b/ruby_1_8_6/ext/tk/sample/demos-en/plot.rb
new file mode 100644
index 0000000000..6d01deeef5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/plot.rb
@@ -0,0 +1,122 @@
+# plot.rb
+#
+# This demonstration script creates a canvas widget showing a 2-D
+# plot with data points that can be dragged with the mouse.
+#
+# 2-D plot widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($plot_demo) && $plot_demo
+  $plot_demo.destroy 
+  $plot_demo = nil
+end
+
+# demo toplevel widget
+$plot_demo = TkToplevel.new {|w|
+  title("Plot Demonstration")
+  iconname("Plot")
+  positionWindow(w)
+}
+
+# label
+TkLabel.new($plot_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left', 
+            'text'=>"This window displays a canvas widget containing a simple 2-dimensional plot.  You can doctor the data by dragging any of the points with mouse button 1."){
+  pack('side'=>'top')
+}
+
+# frame
+$plot_buttons = TkFrame.new($plot_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $plot_demo
+      $plot_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'plot'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# font 
+plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+
+# canvas 
+$plot_canvas = TkCanvas.new($plot_demo,'relief'=>'raised','width'=>450,'height'=>300)
+$plot_canvas.pack('side'=>'top', 'fill'=>'x')
+
+# plot 
+TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
+TkcLine.new($plot_canvas, 100, 250, 100,  50, 'width'=>2)
+TkcText.new($plot_canvas, 225, 20, 
+            'text'=>"A Simple Plot", 'font'=>plotFont, 'fill'=>'brown')
+
+(0..10).each {|i|
+  x = 100 + (i * 30)
+  TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
+  TkcText.new($plot_canvas, x, 254, 
+              'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
+}
+(0..5).each {|i|
+  y = 250 - (i * 40)
+  TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
+  TkcText.new($plot_canvas, 96, y, 
+              'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
+}
+
+for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
+  x = 100 + (3*xx)
+  y = 250 - (4*yy)/5
+  item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6, 
+                     'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
+  item.addtag 'point'
+end
+
+$plot_canvas.itembind('point', 'Any-Enter', 
+                      proc{$plot_canvas.itemconfigure 'current','fill','red'})
+$plot_canvas.itembind('point', 'Any-Leave', 
+                      proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
+$plot_canvas.itembind('point', '1', 
+                      proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
+$plot_canvas.itembind('point', 'ButtonRelease-1', 
+                      proc{$plot_canvas.dtag 'selected'})
+$plot_canvas.bind('B1-Motion', 
+                  proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
+
+$plot = {'lastX'=>0, 'lastY'=>0}
+
+# plotDown --
+# This method is invoked when the mouse is pressed over one of the 
+# data points.  It sets up state to allow the point to be dragged.
+#
+# Arguments:
+# w -           The canvas window.
+# x, y -        The coordinates of the mouse press.
+
+def plotDown (w, x, y)
+  w.dtag 'selected'
+  w.addtag_withtag 'selected', 'current'
+  w.raise 'current'
+  $plot['lastX'] = x
+  $plot['lastY'] = y
+end
+
+# plotMove --
+# This method is invoked during mouse motion events.  It drags the
+# current item.
+#
+# Arguments:
+# w -           The canvas window.
+# x, y -        The coordinates of the mouse.
+
+def plotMove (w, x, y)
+  w.move 'selected', x - $plot['lastX'], y - $plot['lastY']
+  $plot['lastX'] = x
+  $plot['lastY'] = y
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/puzzle.rb b/ruby_1_8_6/ext/tk/sample/demos-en/puzzle.rb
new file mode 100644
index 0000000000..0885cf2975
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/puzzle.rb
@@ -0,0 +1,120 @@
+# puzzle.rb
+#
+# This demonstration script creates a 15-puzzle game using a collection
+# of buttons.
+#
+# widet demo 'puzzle' (called by 'widget')
+#
+
+# toplevel widget
+if defined?($puzzle_demo) && $puzzle_demo
+  $puzzle_demo.destroy 
+  $puzzle_demo = nil
+end
+
+# demo toplevel widget
+$puzzle_demo = TkToplevel.new {|w|
+  title("15-Puzzle Demonstration")
+  iconname("15-Puzzle")
+  positionWindow(w)
+}
+
+# label
+msg = TkLabel.new($puzzle_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "A 15-puzzle appears below as a collection of buttons.  Click on any of the pieces next to the space, and that piece will slide over the space.  Continue this until the pieces are arranged in numerical order from upper-left to lower-right."
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($puzzle_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $puzzle_demo
+      $puzzle_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'puzzle'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame
+
+# Special trick: select a darker color for the space by creating a
+# scrollbar widget and using its trough color.
+begin
+  if Tk.windowingsystem() == 'aqua'
+    frameSize = 160
+  else
+    frameSize = 120
+  end
+rescue
+  frameSize = 120
+end
+ 
+s = TkScrollbar.new($puzzle_demo)
+base = TkFrame.new($puzzle_demo) {
+  width  frameSize
+  height frameSize
+  borderwidth 2
+  relief 'sunken'
+  bg s['troughcolor']
+}
+s.destroy
+base.pack('side'=>'top', 'padx'=>'1c', 'pady'=>'1c')
+
+def def_puzzleswitch_proc(w, num)
+  proc{puzzleSwitch w, num}
+end
+
+$xpos = {}
+$ypos = {}
+order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
+(0..14).each{|i|
+  num = order[i]
+  $xpos[num] = (i % 4) * 0.25
+  $ypos[num] = (i / 4) * 0.25
+  TkButton.new(base) {|w|
+    relief 'raised'
+    text num
+    highlightthickness 0
+    command def_puzzleswitch_proc(w, num)
+  }.place('relx'=>$xpos[num], 'rely'=>$ypos[num], 
+          'relwidth'=>0.25, 'relheight'=>0.25)
+}
+$xpos['space'] = 0.75
+$ypos['space'] = 0.75
+
+
+# puzzleSwitch --
+# This procedure is invoked when the user clicks on a particular button;
+# if the button is next to the empty space, it moves the button into the
+# empty space.
+
+def puzzleSwitch(w, num)
+  if ( ($ypos[num] >= ($ypos['space'] - 0.01))     \
+      && ($ypos[num] <= ($ypos['space'] + 0.01))   \
+      && ($xpos[num] >= ($xpos['space'] - 0.26))   \
+      && ($xpos[num] <= ($xpos['space'] + 0.26)))  \
+    || (($xpos[num] >= ($xpos['space'] - 0.01))    \
+        && ($xpos[num] <= ($xpos['space'] + 0.01)) \
+        && ($ypos[num] >= ($ypos['space'] - 0.26)) \
+        && ($ypos[num] <= ($ypos['space'] + 0.26)))
+    tmp = $xpos['space']
+    $xpos['space'] = $xpos[num]
+    $xpos[num] = tmp
+    tmp = $ypos['space']
+    $ypos['space'] = $ypos[num]
+    $ypos[num] = tmp
+    w.place('relx'=>$xpos[num], 'rely'=>$ypos[num])
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/radio.rb b/ruby_1_8_6/ext/tk/sample/demos-en/radio.rb
new file mode 100644
index 0000000000..96cdc4c54a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/radio.rb
@@ -0,0 +1,84 @@
+# radio.rb
+#
+# This demonstration script creates a toplevel window containing
+# several radiobutton widgets.
+#
+# radiobutton widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($radio_demo) && $radio_demo
+  $radio_demo.destroy 
+  $radio_demo = nil
+end
+
+# demo toplevel widget
+$radio_demo = TkToplevel.new {|w|
+  title("Radiobutton Demonstration")
+  iconname("radio")
+  positionWindow(w)
+}
+
+# label 
+msg = TkLabel.new($radio_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "Two groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  Click the \"See Variables\" button to see the current values of the variables."
+}
+msg.pack('side'=>'top')
+
+# 
+size = TkVariable.new
+color = TkVariable.new
+
+# frame 
+TkFrame.new($radio_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $radio_demo
+      $radio_demo = nil
+      $showVarsWin[tmppath.path] = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'radio'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'See Variables'
+    command proc{
+      showVars($radio_demo, ['size', size], ['color', color])
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 
+f_left = TkFrame.new($radio_demo)
+f_right = TkFrame.new($radio_demo)
+f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
+f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
+
+# radiobutton 
+[10, 12, 18, 24].each {|sz|
+  TkRadioButton.new(f_left) {
+    text "Point Size #{sz}"
+    variable size
+    relief 'flat'
+    value sz
+  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
+}
+
+['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
+  TkRadioButton.new(f_right) {
+    text col
+    variable color
+    relief 'flat'
+    value col.downcase
+  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
+}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/radio2.rb b/ruby_1_8_6/ext/tk/sample/demos-en/radio2.rb
new file mode 100644
index 0000000000..2b56ccc9b1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/radio2.rb
@@ -0,0 +1,106 @@
+# radio2.rb
+#
+# This demonstration script creates a toplevel window containing
+# several radiobutton widgets.
+#
+# radiobutton widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($radio2_demo) && $radio2_demo
+  $radio2_demo.destroy 
+  $radio2_demo = nil
+end
+
+# demo toplevel widget
+$radio2_demo = TkToplevel.new {|w|
+  title("Radiobutton Demonstration 2")
+  iconname("radio2")
+  positionWindow(w)
+}
+
+# label 
+msg = TkLabel.new($radio2_demo) {
+  font $font
+  wraplength '5i'
+  justify 'left'
+  text "Three groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  Click the \"See Variables\" button to see the current values of the variables."
+}
+msg.pack('side'=>'top')
+
+# 
+size = TkVariable.new
+color = TkVariable.new
+align = TkVariable.new
+
+# frame 
+TkFrame.new($radio2_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $radio2_demo
+      $radio2_demo = nil
+      $showVarsWin[tmppath.path] = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'radio2'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'See Variables'
+    command proc{
+      showVars($radio2_demo, 
+               ['size', size], ['color', color], ['compound', align])
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 
+f_left  = TkLabelFrame.new($radio2_demo, 'text'=>'Point Size', 
+                           'pady'=>2, 'padx'=>2)
+f_mid   = TkLabelFrame.new($radio2_demo, 'text'=>'Color', 
+                           'pady'=>2, 'padx'=>2)
+f_right = TkLabelFrame.new($radio2_demo, 'text'=>'Alignment', 
+                           'pady'=>2, 'padx'=>2)
+f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
+f_mid.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
+f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
+
+# radiobutton 
+[10, 12, 18, 24].each {|sz|
+  TkRadioButton.new(f_left) {
+    text "Point Size #{sz}"
+    variable size
+    relief 'flat'
+    value sz
+  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
+}
+
+['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
+  TkRadioButton.new(f_mid) {
+    text col
+    variable color
+    relief 'flat'
+    value col.downcase
+    anchor 'w'
+  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
+}
+
+label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead', 
+                    'compound'=>'left')
+label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
+label.height(TkWinfo.reqheight(label))
+abtn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
+  lower = a.downcase
+  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat', 
+                    'value'=>lower, 'indicatoron'=>0, 'width'=>7, 
+                    'command'=>proc{label.compound(align.value)})
+}
+
+Tk.grid('x', abtn[0])
+Tk.grid(abtn[1], label, abtn[2])
+Tk.grid('x', abtn[3])
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/radio3.rb b/ruby_1_8_6/ext/tk/sample/demos-en/radio3.rb
new file mode 100644
index 0000000000..70c4abb3b5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/radio3.rb
@@ -0,0 +1,114 @@
+# radio3.rb
+#
+# This demonstration script creates a toplevel window containing
+# several radiobutton widgets.
+#
+# radiobutton widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($radio3_demo) && $radio3_demo
+  $radio3_demo.destroy 
+  $radio3_demo = nil
+end
+
+# demo toplevel widget
+$radio3_demo = TkToplevel.new {|w|
+  title("Radiobutton Demonstration 3")
+  iconname("radio3")
+  positionWindow(w)
+}
+
+# label 
+msg = TkLabel.new($radio3_demo) {
+  font $font
+  wraplength '5i'
+  justify 'left'
+  text "Three groups of radiobuttons are displayed below.  If you click on a button then the button will become selected exclusively among all the buttons in its group.  A Tcl variable is associated with each group to indicate which of the group's buttons is selected.  When the 'Tristate' button is pressed, the radio buttons will display the tri-state mode. Selecting any radio button will return the buttons to their respective on/off state. Click the \"See Variables\" button to see the current values of the variables."
+}
+msg.grid(:row=>0, :column=>0, :columnspan=>3, :sticky=>'nsew')
+
+# variable
+size = TkVariable.new
+color = TkVariable.new
+align = TkVariable.new
+
+# frame 
+TkFrame.new($radio3_demo) {|frame|
+  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2), 
+         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x', 
+         TkButton.new(frame, :text=>'See Variables', 
+                      :image=>$image['view'], :compound=>:left, 
+                      :command=>proc{
+                        showVars($radio3_demo, ['size', size], 
+                                 ['color', color], ['compound', align])
+                      }), 
+         TkButton.new(frame, :text=>'See Code', 
+                      :image=>$image['view'], :compound=>:left, 
+                      :command=>proc{showCode 'radio3'}), 
+         TkButton.new(frame, :text=>'Dismiss', 
+                      :image=>$image['delete'], :compound=>:left, 
+                      :command=>proc{
+                        tmppath = $radio3_demo
+                        $radio3_demo = nil
+                        $showVarsWin[tmppath.path] = nil
+                        tmppath.destroy
+                      }), 
+         :padx=>4, :pady=>4)
+  frame.grid_columnconfigure(0, :weight=>1)
+  TkGrid(frame, :row=>3, :column=>0, :columnspan=>3, :sticky=>'nsew')
+}
+
+# frame 
+f_left  = TkLabelFrame.new($radio3_demo, 'text'=>'Point Size', 
+                           'pady'=>2, 'padx'=>2)
+f_mid   = TkLabelFrame.new($radio3_demo, 'text'=>'Color', 
+                           'pady'=>2, 'padx'=>2)
+f_right = TkLabelFrame.new($radio3_demo, 'text'=>'Alignment', 
+                           'pady'=>2, 'padx'=>2)
+f_left .grid('column'=>0, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
+f_mid  .grid('column'=>1, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
+f_right.grid('column'=>2, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c')
+
+TkButton.new($radio3_demo, 'text'=>'Tristate', 
+             'command'=>proc{size.value = 'multi'; color.value = 'multi'}){
+  grid('column'=>2, 'row'=>2, 'pady'=>'.5c', 'padx'=>'.5c')
+}
+
+# radiobutton 
+[10, 12, 14, 18, 24].each {|sz|
+  TkRadioButton.new(f_left) {
+    text "Point Size #{sz}"
+    variable size
+    relief 'flat'
+    value sz
+    tristatevalue 'multi'
+  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
+}
+
+['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
+  TkRadioButton.new(f_mid) {
+    text col
+    variable color
+    relief 'flat'
+    value col.downcase
+    anchor 'w'
+    tristatevalue 'multi'
+    command proc{f_mid.fg(color.value)}
+  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
+}
+
+label = TkLabel.new(f_right, 'text'=>'Label', 'bitmap'=>'questhead', 
+                    'compound'=>'left')
+label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
+label.height(TkWinfo.reqheight(label))
+a_btn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
+  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat', 
+                    'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7, 
+                    'command'=>proc{label.compound(align.value)})
+}
+
+Tk.grid('x', a_btn[0])
+Tk.grid(a_btn[1], label, a_btn[2])
+Tk.grid('x', a_btn[3])
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/rmt b/ruby_1_8_6/ext/tk/sample/demos-en/rmt
new file mode 100644
index 0000000000..73f631180a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/rmt
@@ -0,0 +1,268 @@
+#!/usr/bin/env ruby
+
+# rmt -- 
+# This script implements a simple remote-control mechanism for 
+# Tk applications.  It allows you to select an application and 
+# then type commands to that application. 
+
+require 'tk'
+
+class Rmt
+  def initialize(parent=nil)
+    win = self
+
+    unless parent
+      parent = TkRoot.new
+    end
+    root = TkWinfo.toplevel(parent)
+    root.minsize(1,1)
+
+    # The instance variable below keeps track of the remote application 
+    # that we're sending to.  If it's an empty string then we execute 
+    # the commands locally. 
+    @app = 'local'
+    @mode = 'Ruby'
+
+    # The instance variable below keeps track of whether we're in the 
+    # middle of executing a command entered via the text. 
+    @executing = 0
+
+    # The instance variable below keeps track of the last command executed, 
+    # so it can be re-executed in response to !! commands. 
+    @lastCommand = ""
+
+    # Create menu bar.  Arrange to recreate all the information in the 
+    # applications sub-menu whenever it is cascaded to. 
+
+    TkFrame.new(root, 'relief'=>'raised', 'bd'=>2) {|f|
+      pack('side'=>'top', 'fill'=>'x')
+      TkMenubutton.new(f, 'text'=>'File', 'underline'=>0) {|mb|
+	TkMenu.new(mb) {|mf|
+	  mb.menu(mf)
+	  TkMenu.new(mf) {|ma| 
+	    postcommand proc{win.fillAppsMenu ma}
+	    mf.add('cascade', 'label'=>'Select Application', 
+		   'menu'=>ma, 'underline'=>0)
+	  }
+	  add('command', 'label'=>'Quit', 
+	      'command'=>proc{root.destroy}, 'underline'=>0)
+	}
+	pack('side'=>'left')
+      }
+    }
+
+    # Create text window and scrollbar. 
+
+    @txt = TkText.new(root, 'relief'=>'sunken', 'bd'=>2, 'setgrid'=>true) {
+      yscrollbar(TkScrollbar.new(root){pack('side'=>'right', 'fill'=>'y')})
+      pack('side'=>'left')
+    }
+
+    @promptEnd = TkTextMark.new(@txt, 'insert')
+
+    # Create a binding to forward commands to the target application, 
+    # plus modify many of the built-in bindings so that only information 
+    # in the current command can be deleted (can still set the cursor 
+    # earlier in the text and select and insert;  just can't delete).
+
+    @txt.bindtags([@txt, TkText, root, 'all'])
+    @txt.bind('Return', proc{
+		@txt.set_insert('end - 1c')
+		@txt.insert('insert', "\n")
+		win.invoke
+		Tk.callback_break
+	      })
+    @txt.bind('Delete', proc{
+		begin
+		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
+		rescue
+		end
+		if @txt.tag_nextrange('sel', '1.0', 'end') == []
+		  if @txt.compare('insert', '<', @promptEnd)
+		    Tk.callback_break
+		  end
+		end
+	      })
+    @txt.bind('BackSpace', proc{
+		begin
+		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
+		rescue
+		end
+		if @txt.tag_nextrange('sel', '1.0', 'end') == []
+		  if @txt.compare('insert', '<', @promptEnd)
+		    Tk.callback_break
+		  end
+		end
+	      })
+    @txt.bind('Control-d', proc{
+		if @txt.compare('insert', '<', @promptEnd)
+		  Tk.callback_break
+		end
+	      })
+    @txt.bind('Control-k', proc{
+		if @txt.compare('insert', '<', @promptEnd)
+		  @txt.set_insert(@promptEnd)
+		end
+	      })
+    @txt.bind('Control-t', proc{
+		if @txt.compare('insert', '<', @promptEnd)
+		  Tk.callback_break
+		end
+	      })
+    @txt.bind('Meta-d', proc{
+		if @txt.compare('insert', '<', @promptEnd)
+		  Tk.callback_break
+		end
+	      })
+    @txt.bind('Meta-BackSpace', proc{
+		if @txt.compare('insert', '<=', @promptEnd)
+		  Tk.callback_break
+		end
+	      })
+    @txt.bind('Control-h', proc{
+		if @txt.compare('insert', '<=', @promptEnd)
+		  Tk.callback_break
+		end
+	      })
+
+    @txt.tag_configure('bold', 'font'=>['Courier', 12, 'bold'])
+
+    @app = Tk.appname('rmt')
+    if (@app =~ /^rmt(.*)$/)
+      root.title("Tk Remote Controller#{$1}")
+      root.iconname("Tk Remote#{$1}")
+    end
+    prompt
+    @txt.focus
+    #@app = TkWinfo.appname(TkRoot.new)
+  end
+
+  def tkTextInsert(w,s)
+    return if s == ""
+    begin
+      if w.compare('sel.first','<=','insert') \
+	&& w.compare('sel.last','>=','insert')
+	w.tag_remove('sel', 'sel.first', @promptEnd)
+	w.delete('sel.first', 'sel.last')
+      end
+    rescue
+    end
+    w.insert('insert', s)
+    w.see('insert')
+  end
+
+  # The method below is used to print out a prompt at the 
+  # insertion point (which should be at the beginning of a line 
+  # right now).
+
+  def prompt
+    @txt.insert('insert', "#{@app}: ")
+    @promptEnd.set('insert')
+    @promptEnd.gravity = 'left'
+    @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
+  end
+
+  # The method below executes a command (it takes everything on the 
+  # current line after the prompt and either sends it to the remote 
+  # application or executes it locally, depending on "app".
+
+  def invoke
+    cmd = @txt.get(@promptEnd, 'insert')
+    @executing += 1
+    case (@mode)
+    when 'Tcl'
+      if Tk.info('complete', cmd)
+	if (cmd == "!!\n")
+	  cmd = @lastCommand
+	else
+	  @lastCommand = cmd
+	end
+	begin
+	  msg = Tk.appsend(@app, false, cmd)
+	rescue
+	  msg = "Error: #{$!}"
+	end
+	@txt.insert('insert', msg + "\n") if msg != ""
+	prompt
+	@promptEnd.set('insert')
+      end
+
+    when 'Ruby'
+      if (cmd == "!!\n")
+	cmd = @lastCommand
+      end
+      complete = true
+      begin
+	eval("proc{#{cmd}}")
+      rescue
+	complete = false
+      end
+      if complete
+	@lastCommand = cmd
+	begin
+#	  msg = Tk.appsend(@app, false, 
+#			   'ruby', 
+#			   '"(' + cmd.gsub(/[][$"]/, '\\\\\&') + ').to_s"')
+	  msg = Tk.rb_appsend(@app, false, cmd)
+	rescue
+	  msg = "Error: #{$!}"
+	end
+	@txt.insert('insert', msg + "\n") if msg != ""
+	prompt
+	@promptEnd.set('insert')
+      end
+    end
+
+    @executing -= 1
+    @txt.yview_pickplace('insert')
+  end
+
+  # The following method is invoked to change the application that
+  # we're talking to.  It also updates the prompt for the current 
+  # command, unless we're in the middle of executing a command from 
+  # the text item (in which case a new prompt is about to be output 
+  # so there's no need to change the old one). 
+
+  def newApp(appName, mode)
+    @app = appName
+    @mode = mode
+    if @executing == 0
+      @promptEnd.gravity = 'right'
+      @txt.delete("#{@promptEnd.path} linestart", @promptEnd)
+      @txt.insert(@promptEnd, "#{appName}: ")
+      @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
+      @promptEnd.gravity = 'left'
+    end
+  end
+
+  # The method below will fill in the applications sub-menu with a list
+  # of all the applications that currently exist. 
+
+  def fillAppsMenu(menu)
+    win = self
+    begin
+      menu.delete(0,'last')
+    rescue
+    end
+    TkWinfo.interps.sort.each{|ip|
+      begin
+	if Tk.appsend(ip, false, 'info commands ruby') == ""
+	  mode = 'Tcl'
+	else
+	  mode = 'Ruby'
+	end
+	menu.add('command', 'label'=>format("%s    (#{mode}/Tk)", ip), 
+		 'command'=>proc{win.newApp ip, mode})
+      rescue
+	menu.add('command', 'label'=>format("%s (unknown Tk)", ip), 
+		 'command'=>proc{win.newApp ip, mode}, 'state'=>'disabled')
+      end
+    }
+    menu.add('command', 'label'=>format("local    (Ruby/Tk)"), 
+	     'command'=>proc{win.newApp 'local', 'Ruby'})
+  end
+end
+
+Rmt.new
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/rolodex b/ruby_1_8_6/ext/tk/sample/demos-en/rolodex
new file mode 100644
index 0000000000..9a4030e902
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/rolodex
@@ -0,0 +1,320 @@
+#!/usr/bin/env ruby
+#
+# rolodex --
+# This script is a part of Tom LaStrange's rolodex
+# 
+# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
+# Time-stamp: "03/08/02 06:23:06 nagai"
+#
+
+require "tk"
+
+
+def show_help(topic,x=0,y=0)
+  if( topic.is_a?(TkWindow) )
+    w = TkWinfo.containing(x,y)
+    if( TkWinfo.exist?(w) )
+      topic = w
+    end
+  end
+  
+  if( $helpTopics.include?(topic) )
+    msg = $helpTopics[topic]
+  else
+    msg = "Sorry, but no help is available for this topic"
+  end
+  TkDialog.new("title"=>"Rolodex Help",
+	       "message"=>"Information on #{topic}:\n\n#{msg}",
+	       "default_button"=>0,
+	       "buttons"=>["OK"])
+end
+
+def fillCard
+  clearAction
+  $root.frame.entry[1].insert(0,"Takaaki Tateishi")
+  $root.frame.entry[2].insert(0,"Japan Advanced Institute of Science and Techonology")
+  $root.frame.entry[3].insert(0,"1-1 Asahidai, Tatsunokuchi")
+  $root.frame.entry[4].insert(0,"Ishikawa 923-1292, Japan")
+  $root.frame.entry[5].insert(0,"private")
+    $root.frame.entry[6].insert(0,"***-***-****")
+  $root.frame.entry[7].insert(0,"***-***-****")
+end
+
+def addAction
+  for i in 1..7
+    STDERR.print format("%-12s %s\n",
+			RolodexFrame::LABEL[i],
+			$root.frame.entry[i].value)
+  end
+end
+
+def clearAction
+  for i in 1..7
+    $root.frame.entry[i].delete(0,"end")
+  end
+end
+
+def fileAction
+  TkDialog.new("title"=>"File Selection",
+	       "message"=>"This is a dummy file selection dialog box.\n",
+	       "default_button"=>0,
+	       "buttons"=>["OK"])
+  STDERR.print "dummy file name\n"
+end
+
+def deleteAction
+  result = TkDialog.new("title"=>"Confirm Action",
+			"message"=>"Are you sure?",
+			"default_button"=>0,
+			"buttons"=>["Cancel"])
+  if( result.value == 0 )
+    clearAction
+  end
+end
+
+
+class RolodexFrame < TkFrame
+  attr_reader :entry, :label
+
+  LABEL = ["","Name:","Address:","","","Home Phone:","Work Phone:","Fax:"]
+
+  def initialize(parent=nil,keys=nil)
+    super(parent,keys)
+    self["relief"] = "flat"
+    
+    @i = []
+    @label = []
+    @entry = []
+    for i in 1..7
+      @i[i] = TkFrame.new(self)
+      @i[i].pack("side"=>"top",
+		 "pady"=>2,
+		 "anchor"=>"e")
+      @label[i] = TkLabel.new(@i[i],
+			      "text"=>LABEL[i],
+			      "anchor"=>"e")
+      @entry[i] = TkEntry.new(@i[i],
+			      "width"=>30,
+			      "relief"=>"sunken")
+      @entry[i].pack("side"=>"right")
+      @label[i].pack("side"=>"right")
+    end
+  end
+end
+
+class RolodexButtons < TkFrame
+  attr_reader :clear, :add, :search, :delete
+
+  def initialize(parent,keys=nil)
+    super(parent,keys)
+    @clear = TkButton.new(self,
+			  "text" => "Clear")
+    @add = TkButton.new(self,
+			"text" => "Add")
+    @search = TkButton.new(self,
+			   "text" => "Search")
+    @delete = TkButton.new(self,
+			   "text" => "Delete")
+    for w in [@clear,@add,@search,@delete]
+      w.pack("side"=>"left", "padx"=>2)
+    end
+  end
+end
+
+class RolodexMenuFrame < TkFrame
+  attr_reader :file_menu, :help_menu, :file, :help
+
+  def initialize(parent,keys=nil)
+    super(parent,keys)
+    configure("relief"=>"raised",
+	      "borderwidth"=>1)
+
+    @file = TkMenubutton.new(self,
+			     "text"=>"File",
+			     "underline"=>0)
+    @file_menu = TkMenu.new(@file)
+    @file_menu.add("command",
+		   "label" => "Load ...",
+		   "command" => proc{fileAction},
+		   "underline" => 0)
+    @file_menu.add("command",
+		   "label" => "Exit",
+		   "command" => proc{$root.destroy},
+		   "underline" => 0)
+    @file.menu(@file_menu)
+    @file.pack("side"=>"left")
+
+    @help = TkMenubutton.new(self,
+			     "text"=>"Help",
+			     "underline"=>0)
+    @help_menu = TkMenu.new(@help)
+    @help_menu.add("command",
+		   "label"=>"On Context...",
+		   "command"=>proc{show_help("context")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=>"On Help...",
+		   "command"=>proc{show_help("help")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=>"On Window...",
+		   "command"=>proc{show_help("window")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=>"On Keys...",
+		   "command"=>proc{show_help("keys")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=>"On version...",
+		   "command"=>proc{show_help("version")},
+		   "underline"=>3)
+    @help.menu(@help_menu)
+    @help.pack("side"=>"right")
+  end
+end
+
+class Rolodex < TkRoot
+  attr_reader :frame, :buttons, :menu
+
+  def initialize(*args)
+    super(*args)
+    @frame = RolodexFrame.new(self)
+    @frame.pack("side"=>"top",
+		"fill"=>"y",
+		"anchor"=>"center")
+    @buttons = RolodexButtons.new(self)
+    @buttons.pack("side"=>"bottom",
+		  "pady"=>2,
+		  "anchor"=>"center")
+    @menu = RolodexMenuFrame.new(self)
+    @menu.pack("before"=>@frame,
+	       "side"=>"top",
+	       "fill"=>"x")
+  end
+end
+
+$root = Rolodex.new
+
+$root.buttons.delete.configure("command"=>proc{deleteAction})
+$root.buttons.add.configure("command"=>proc{addAction})
+$root.buttons.clear.configure("command"=>proc{clearAction})
+$root.buttons.search.configure("command"=>proc{addAction; fillCard})
+
+$root.buttons.clear.configure("text"=>"Clear   Ctrl+C")
+$root.bind("Control-c",proc{clearAction})
+
+$root.buttons.add.configure("text"=>"Add   Ctrl+A")
+$root.bind("Control-a",proc{addAction})
+
+$root.buttons.search.configure("text"=>"Search   Ctrl+S")
+$root.bind("Control-s",proc{addAction; fillCard})
+
+$root.buttons.delete.configure("text"=>"Delete...   Ctrl+D")
+$root.bind("Control-d",proc{deleteAction})
+
+$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
+$root.bind("Control-f",proc{fileAction})
+
+$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
+$root.bind("Control-q",proc{$root.destroy})
+
+$root.frame.entry[1].focus
+
+$root.bind("Any-F1",
+	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
+$root.bind("Any-Help",
+	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
+
+
+$helpTopics = {}
+
+$helpTopics[$root.menu.file] = <<EOF
+This is the "file" menu. It can be used to invoke\
+some overall operations on the rolodex applications,\
+such as loading a file or exiting.
+EOF
+
+$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
+The "Load" entry in the "File" menu posts a dialog box\
+that you can use to select a rolodex file
+EOF
+
+$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
+The "Exit" entry in the "File" menu causes the rolodex\
+application to terminate
+EOF
+
+$helpTopics[$root.frame.entry[1]] = <<EOF
+In this field of the rolodex entry you should\
+type the person's name
+EOF
+
+$helpTopics[$root.frame.entry[2]] = <<EOF
+In this field of the rolodex entry you should\
+type the first line of the person's address
+EOF
+
+$helpTopics[$root.frame.entry[3]] = <<EOF
+In this field of the rolodex entry you should\
+type the second line of the person's address
+EOF
+
+$helpTopics[$root.frame.entry[4]] = <<EOF
+In this field of the rolodex entry you should\
+type the third line of the person's address
+EOF
+
+$helpTopics[$root.frame.entry[5]] = <<EOF
+In this field of the rolodex entry you should\
+type the person's home phone number, or "private"\
+if the person doesn't want his or he number publicized
+EOF
+
+$helpTopics[$root.frame.entry[6]] = <<EOF
+In this field of the rolodex entry you should\
+type the person's work phone number
+EOF
+
+$helpTopics[$root.frame.entry[7]] = <<EOF
+In this field of the rolodex entry you should\
+type the phone number for the person's FAX machine
+EOF
+
+$helpTopics["context"] = <<EOF
+Unfortunately, this application doesn't support context-sensitive\
+help in the usual way, because when this demo was written Ruby/Tk\
+didn't have a grab mechanism and this is needed for context-sensitive\
+help. Instead, you can achive much the same effect by simply moving\
+the mouse over the window you're curious about and pressing the\
+Help or F1 keys. You can do this anytime.
+EOF
+
+$helpTopics["help"] = <<EOF
+This application provides only very crude help. Besides the\
+entries in this menu, you can get help on individual windows\
+by moving the mouse cursor over the window and pressing the\
+Help or F1 keys.
+EOF
+
+$helpTopics["window"] = <<EOF
+This window is a dummy rolodex application created as part of\
+Tom LaStrange's toolkit benchmark. It doesn't really do anything\
+useful except to demonstrate a few features of the Ruby/Tk.
+EOF
+
+$helpTopics["keys"] = <<EOF
+The following accelerator keys are defined for this application\
+(in addition to those already available for the entry windows):
+Ctrl+A:		Add
+Ctrl+C:		Clear
+Ctrl+D:		Delete
+Ctrl+F:		Enter file name
+Ctrl+Q:		Exit application (quit)
+Ctrl+S:		Search (dummy operation)
+EOF
+
+$helpTopics["version"] = <<EOF
+This is version 1.0.1.
+EOF
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/rolodex-j b/ruby_1_8_6/ext/tk/sample/demos-en/rolodex-j
new file mode 100644
index 0000000000..27e2bc9da0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/rolodex-j
@@ -0,0 +1,323 @@
+#!/usr/bin/env ruby
+#
+# rolodex --
+# このスクリプトは Tom LaStrange の rolodex の一部です。
+# 
+# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
+# Time-stamp: "03/08/02 14:02:04 nagai"
+#
+
+require "tk"
+
+Tk.encoding = "euc-jp"
+$font = TkFont.new('k14')
+
+def show_help(topic,x=0,y=0)
+  if( topic.is_a?(TkWindow) )
+    w = TkWinfo.containing(x,y)
+    if( w.is_a?(TkWindow) )
+      if( TkWinfo.exist?(w) )
+	topic = w
+      end
+    end
+  end
+  
+  if( $helpTopics.include?(topic) )
+    msg = $helpTopics[topic]
+  else
+    msg = "このトピックについてのヘルプはまだ使用できません"
+  end
+  TkDialog.new("title"=>"Rolodex Help",
+	       "message"=>"「#{topic}」\n\n#{msg}",
+	       "font"=>$font,
+	       "default_button"=>0,
+	       "buttons"=>["OK"])
+end
+
+def fillCard
+  clearAction
+  $root.frame.entry[1].insert(0, "立石 孝彰")
+  $root.frame.entry[2].insert(0, "923-1292 石川県")
+  $root.frame.entry[3].insert(0, "辰口町 旭台 1-1")
+  $root.frame.entry[4].insert(0, "北陸先端科学技術大学院大学")
+  $root.frame.entry[5].insert(0,"private")
+  $root.frame.entry[6].insert(0,"***-***-****")
+  $root.frame.entry[7].insert(0,"***-***-****")
+end
+
+def addAction
+  for i in 1..7
+    STDERR.print format("%-12s %s\n",
+			RolodexFrame::LABEL[i],
+			$root.frame.entry[i].value)
+  end
+end
+
+def clearAction
+  for i in 1..7
+    $root.frame.entry[i].delete(0,"end")
+  end
+end
+
+def fileAction
+  TkDialog.new("title"=>"File Selection",
+	       "message"=>"これはファイル選択ダイアログのダミーです。\n",
+	       "font"=>$font,
+	       "default_button"=>0,
+	       "buttons"=>["OK"])
+  STDERR.print "dummy file name\n"
+end
+
+def deleteAction
+  result = TkDialog.new("title"=>"Confirm Action",
+			"message"=>"よろしいですか？",
+			"font"=>$font,
+			"default_button"=>0,
+			"buttons"=>["キャンセル"])
+  if( result.value == 0 )
+    clearAction
+  end
+end
+
+
+class RolodexFrame < TkFrame
+  attr_reader :entry, :label
+
+  LABEL = ["","名前:","住所","","","電話(自宅):","電話(会社):","Fax:"]
+
+  def initialize(parent=nil,keys=nil)
+    super(parent,keys)
+    self["relief"] = "flat"
+    @i = []
+    @label = []
+    @entry = []
+    for i in 1..7
+      @i[i] = TkFrame.new(self)
+      @i[i].pack("side"=>"top",
+		 "pady"=>2,
+		 "anchor"=>"e")
+      @label[i] = TkLabel.new(@i[i],
+			      "text"=>LABEL[i],
+			      "anchor"=>"e",
+			      "font" => $font)
+      @entry[i] = TkEntry.new(@i[i],
+			      "width"=>30,
+			      "relief"=>"sunken",
+			      "font" => $font)
+      @entry[i].pack("side"=>"right")
+      @label[i].pack("side"=>"right")
+    end
+  end
+end
+
+class RolodexButtons < TkFrame
+  attr_reader :clear, :add, :search, :delete
+
+  def initialize(parent,keys=nil)
+    super(parent,keys)
+    @clear = TkButton.new(self,
+			  "text" => "クリアー",
+			  "font" => $font)
+    @add = TkButton.new(self,
+			"text" => "追加",
+			"font" => $font)
+    @search = TkButton.new(self,
+			   "text" => "検索",
+			   "font" => $font)
+    @delete = TkButton.new(self,
+			   "text" => "消去",
+			   "font" => $font)
+    for w in [@clear,@add,@search,@delete]
+      w.pack("side"=>"left", "padx"=>2)
+    end
+  end
+end
+
+class RolodexMenuFrame < TkFrame
+  attr_reader :file_menu, :help_menu, :file, :help
+
+  def initialize(parent,keys=nil)
+    super(parent,keys)
+    configure("relief"=>"raised",
+	      "borderwidth"=>1)
+
+    @file = TkMenubutton.new(self,
+			     "text"=> "ファイル",
+			     "font"=> $font,
+			     "underline"=>0)
+    @file_menu = TkMenu.new(@file)
+    @file_menu.add("command",
+		   "label" => "読み込み ...",
+		   "font" => $font,
+		   "command" => proc{fileAction},
+		   "underline" => 0)
+    @file_menu.add("command",
+		   "label" => "終了",
+		   "font" => $font,
+		   "command" => proc{$root.destroy},
+		   "underline" => 0)
+    @file.menu(@file_menu)
+    @file.pack("side"=>"left")
+
+    @help = TkMenubutton.new(self,
+			     "text"=> "ヘルプ",
+			     "font"=> $font,
+			     "underline"=>0)
+    @help_menu = TkMenu.new(@help)
+    @help_menu.add("command",
+		   "label"=> "コンテキストについて",
+		   "font" => $font,
+		   "command"=>proc{show_help("コンテキスト")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=> "ヘルプについて",
+		   "font" => $font,
+		   "command"=>proc{show_help("ヘルプ")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=> "ウィンドウについて",
+		   "font" => $font,
+		   "command"=>proc{show_help("ウィンドウ")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=> "キー操作について",
+		   "font" => $font,
+		   "command"=>proc{show_help("キー操作")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=> "バージョン情報",
+		   "font" => $font,
+		   "command"=>proc{show_help("バージョン情報")},
+		   "underline"=>3)
+    @help.menu(@help_menu)
+    @help.pack("side"=>"right")
+  end
+end
+
+class Rolodex < TkRoot
+  attr_reader :frame, :buttons, :menu
+
+  def initialize(*args)
+    super(*args)
+    @frame = RolodexFrame.new(self)
+    @frame.pack("side"=>"top",
+		"fill"=>"y",
+		"anchor"=>"center")
+    @buttons = RolodexButtons.new(self)
+    @buttons.pack("side"=>"bottom",
+		  "pady"=>2,
+		  "anchor"=>"center")
+    @menu = RolodexMenuFrame.new(self)
+    @menu.pack("before"=>@frame,
+	       "side"=>"top",
+	       "fill"=>"x")
+  end
+end
+
+$root = Rolodex.new
+
+$root.buttons.delete.configure("command"=>proc{deleteAction})
+$root.buttons.add.configure("command"=>proc{addAction})
+$root.buttons.clear.configure("command"=>proc{clearAction})
+$root.buttons.search.configure("command"=>proc{addAction; fillCard})
+
+$root.buttons.clear.configure("text"=> "クリアー   Ctrl+C", "font" => $font)
+$root.bind("Control-c",proc{clearAction})
+
+$root.buttons.add.configure("text"=> "追加   Ctrl+A", "font" => $font)
+$root.bind("Control-a",proc{addAction})
+
+$root.buttons.search.configure("text"=> "検索   Ctrl+S", "font" => $font)
+$root.bind("Control-s",proc{addAction; fillCard})
+
+$root.buttons.delete.configure("text"=> "消去   Ctrl+D", "font" => $font)
+$root.bind("Control-d",proc{deleteAction})
+
+$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
+$root.bind("Control-f",proc{fileAction})
+
+$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
+$root.bind("Control-q",proc{$root.destroy})
+
+$root.frame.entry[1].focus
+
+$root.bind("Any-F1",
+	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
+$root.bind("Any-Help",
+	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
+
+
+$helpTopics = {}
+
+$helpTopics[$root.menu.file] = <<EOF
+これは「ファイル」メニューです。「読み込み」や「終了」などを
+行なうことができます。
+EOF
+
+$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
+ファイルの読み込みを行なうときに使います。
+EOF
+
+$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
+アプリケーションを終了するときに使います。
+EOF
+
+$helpTopics[$root.frame.entry[1]] = <<EOF
+名前を記入するエントリです。
+EOF
+
+$helpTopics[$root.frame.entry[2]] = <<EOF
+住所を記入するエントリです。
+EOF
+
+$helpTopics[$root.frame.entry[3]] = <<EOF
+住所を記入するエントリです。
+EOF
+
+$helpTopics[$root.frame.entry[4]] = <<EOF
+住所を記入するエントリです。
+EOF
+
+$helpTopics[$root.frame.entry[5]] = <<EOF
+自宅の電話番号を記入するエントリです。公開\
+したくないときは private と記入します。
+EOF
+
+$helpTopics[$root.frame.entry[6]] = <<EOF
+会社の電話番号を記入するエントリです。
+EOF
+
+$helpTopics[$root.frame.entry[7]] = <<EOF
+FAX番号を記入するエントリです。
+EOF
+
+$helpTopics["コンテキスト"] = <<EOF
+Ruby/Tkではgrabの機構がないためこのアプリケーションでは\
+コンテキストヘルプはサポートされていません。
+しかし同じような効果をbindとマウスの位置のWedgetを知る\
+ことで得ることができます。
+EOF
+
+$helpTopics["ヘルプ"] = <<EOF
+マウスをウィンドウにあわせてF1キーを押すことによって\
+そのヘルプを見ることができます。
+EOF
+
+$helpTopics["ウィンドウ"] = <<EOF
+このウィンドウはダミーです。
+EOF
+
+$helpTopics["キー操作"] = <<EOF
+Ctrl+A:		追加
+Ctrl+C:		クリアー
+Ctrl+D:		消去
+Ctrl+F:		ファイル選択
+Ctrl+Q:		終了
+Ctrl+S:		検索
+EOF
+
+$helpTopics["バージョン情報"] = <<EOF
+バージョンは 1.0.1e です。
+EOF
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/ruler.rb b/ruby_1_8_6/ext/tk/sample/demos-en/ruler.rb
new file mode 100644
index 0000000000..4299d57b4f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/ruler.rb
@@ -0,0 +1,203 @@
+# ruler.rb
+#
+# This demonstration script creates a canvas widget that displays a ruler
+# with tab stops that can be set, moved, and deleted.
+#
+# ruler widget demo (called by 'widget')
+#
+
+# rulerMkTab --
+# This method creates a new triangular polygon in a canvas to
+# represent a tab stop.
+#
+# Arguments:
+# c -           The canvas window.
+# x, y -        Coordinates at which to create the tab stop.
+
+def rulerMkTab(c,x,y)
+  v = $demo_rulerInfo
+  TkcPolygon.new(c, x, y, x+v.size, y+v.size, x-v.size, y+v.size)
+end
+
+# toplevel widget
+if defined?($ruler_demo) && $ruler_demo
+  $ruler_demo.destroy 
+  $ruler_demo = nil
+end
+
+# demo toplevel widget
+$ruler_demo = TkToplevel.new {|w|
+  title("Ruler Demonstration")
+  iconname("ruler")
+  positionWindow(w)
+}
+
+# label
+TkLabel.new($ruler_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+            'text'=>"This canvas widget shows a mock-up of a ruler.  You can create tab stops by dragging them out of the well to the right of the ruler.  You can also drag existing tab stops.  If you drag a tab stop far enough up or down so that it turns dim, it will be deleted when you release the mouse button."){
+  pack('side'=>'top')
+}
+
+# frame
+$ruler_buttons = TkFrame.new($ruler_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $ruler_demo
+      $ruler_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'ruler'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# canvas 
+$ruler_canvas = TkCanvas.new($ruler_demo, 'width'=>'14.8c', 'height'=>'2.5c')
+$ruler_canvas.pack('side'=>'top', 'fill'=>'x')
+
+# 
+unless Struct.const_defined?("RulerInfo")
+  $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y, 
+                               :top, :bottom, :size, :normalStyle, 
+                               :activeStyle, :deleteStyle).new
+end
+$demo_rulerInfo.grid = '.25c'
+$demo_rulerInfo.left = TkWinfo.fpixels($ruler_canvas, '1c')
+$demo_rulerInfo.right = TkWinfo.fpixels($ruler_canvas, '13c')
+$demo_rulerInfo.top = TkWinfo.fpixels($ruler_canvas, '1c')
+$demo_rulerInfo.bottom = TkWinfo.fpixels($ruler_canvas, '1.5c')
+$demo_rulerInfo.size = TkWinfo.fpixels($ruler_canvas, '.2c')
+$demo_rulerInfo.normalStyle = {'fill'=>'black'}
+if TkWinfo.depth($ruler_canvas) > 1
+  $demo_rulerInfo.activeStyle = {'fill'=>'red', 'stipple'=>''}
+  $demo_rulerInfo.deleteStyle = {'fill'=>'red', 
+    'stipple'=>'@'+[$demo_dir, '..', 
+                     'images', 'gray25.xbm'].join(File::Separator)}
+else
+  $demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
+  $demo_rulerInfo.deleteStyle = {'fill'=>'black', 
+    'stipple'=>'@'+[$demo_dir, '..', 
+                     'images', 'gray25.xbm'].join(File::Separator)}
+end
+
+TkcLine.new($ruler_canvas, 
+            '1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
+(0..11).each{|i|
+  x = i+1
+  TkcLine.new($ruler_canvas, "#{x}c", '1c', "#{x}c", '0.6c', 'width'=>1)
+  TkcLine.new($ruler_canvas, "#{x}.25c", '1c', "#{x}.25c", '0.8c', 'width'=>1)
+  TkcLine.new($ruler_canvas, "#{x}.5c", '1c', "#{x}.5c", '0.7c', 'width'=>1)
+  TkcLine.new($ruler_canvas, "#{x}.75c", '1c', "#{x}.75c", '0.8c', 'width'=>1)
+  TkcText.new($ruler_canvas, "#{x}.15c", '0.75c', 'text'=>i, 'anchor'=>'sw')
+}
+
+$rulerTag_well = TkcTag.new($ruler_canvas)
+$ruler_canvas\
+.addtag_withtag($rulerTag_well,
+                TkcRectangle.new($ruler_canvas, 
+                                 '13.2c', '1c', '13.8c', '0.5c', 
+                                 'outline'=>'black', 
+                                 'fill'=>($ruler_canvas\
+                                          .configinfo('background'))[4]) )
+$ruler_canvas\
+.addtag_withtag($rulerTag_well,
+                rulerMkTab($ruler_canvas, 
+                           TkWinfo.pixels($ruler_canvas, '13.5c'), 
+                           TkWinfo.pixels($ruler_canvas, '.65c') ) )
+
+$rulerTag_well.bind('1', proc{|x,y| rulerNewTab($ruler_canvas,x,y)}, '%x %y')
+$ruler_canvas.itembind('tab', '1', 
+                       proc{|x,y| rulerSelectTab($ruler_canvas,x,y)}, '%x %y')
+$ruler_canvas.bind('B1-Motion', 
+                   proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
+$ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
+
+# rulerNewTab --
+# Does all the work of creating a tab stop, including creating the
+# triangle object and adding tags to it to give it tab behavior.
+#
+# Arguments:
+# c -           The canvas window.
+# x, y -        The coordinates of the tab stop.
+
+def rulerNewTab(c,x,y)
+  v = $demo_rulerInfo
+  c.addtag_withtag('active', rulerMkTab(c,x,y))
+  c.addtag_withtag('tab', 'active')
+  v.x = x
+  v.y = y
+  rulerMoveTab(c,x,y)
+end
+
+# rulerSelectTab --
+# This method is invoked when mouse button 1 is pressed over
+# a tab.  It remembers information about the tab so that it can
+# be dragged interactively.
+#
+# Arguments:
+# c -           The canvas widget.
+# x, y -        The coordinates of the mouse (identifies the point by
+#               which the tab was picked up for dragging).
+
+def rulerSelectTab(c,x,y)
+  v = $demo_rulerInfo
+  v.x = c.canvasx(x, v.grid)
+  v.y = v.top+2
+  c.addtag_withtag('active', 'current')
+  c.itemconfigure('active', v.activeStyle)
+  c.raise('active')
+end
+
+# rulerMoveTab --
+# This method is invoked during mouse motion events to drag a tab.
+# It adjusts the position of the tab, and changes its appearance if
+# it is about to be dragged out of the ruler.
+#
+# Arguments:
+# c -           The canvas widget.
+# x, y -        The coordinates of the mouse.
+
+def rulerMoveTab(c,x,y)
+  v = $demo_rulerInfo
+  return if c.find_withtag('active') == []
+  cx = c.canvasx(x,v.grid)
+  cy = c.canvasy(y)
+  cx = v.left if cx < v.left
+  cx = v.right if cx > v.right
+  if (cy >= v.top && cy <= v.bottom)
+    cy = v.top+2
+    c.itemconfigure('active', v.activeStyle)
+  else
+    cy = cy-v.size-2
+    c.itemconfigure('active', v.deleteStyle)
+  end
+  c.move('active', cx-v.x, cy-v.y)
+  v.x = cx
+  v.y = cy
+end
+
+# rulerReleaseTab --
+# This method is invoked during button release events that end
+# a tab drag operation.  It deselects the tab and deletes the tab if
+# it was dragged out of the ruler.
+#
+# Arguments:
+# c -           The canvas widget.
+# x, y -        The coordinates of the mouse.
+
+def rulerReleaseTab(c)
+  v = $demo_rulerInfo
+  return if c.find_withtag('active') == []
+  if v.y != v.top+2
+    c.delete('active')
+  else
+    c.itemconfigure('active', v.normalStyle)
+    c.dtag('active')
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/sayings.rb b/ruby_1_8_6/ext/tk/sample/demos-en/sayings.rb
new file mode 100644
index 0000000000..cef0f4ecf4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/sayings.rb
@@ -0,0 +1,104 @@
+# sayings.rb
+#
+# This demonstration script creates a listbox that can be scrolled
+# both horizontally and vertically.  It displays a collection of
+# well-known sayings.
+#
+# listbox widget demo 'sayings' (called by 'widget')
+#
+
+# toplevel widget
+if defined?($sayings_demo) && $sayings_demo
+  $sayings_demo.destroy 
+  $sayings_demo = nil
+end
+
+# demo toplevel widget
+$sayings_demo = TkToplevel.new {|w|
+  title("Listbox Demonstration (well-known sayings)")
+  iconname("sayings")
+  positionWindow(w)
+}
+
+# label
+msg = TkLabel.new($sayings_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "The listbox below contains a collection of well-known sayings.  You can scan the list using either of the scrollbars or by dragging in the listbox window with button 2 pressed."
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($sayings_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $sayings_demo
+      $sayings_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'sayings'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame
+sayings_lbox = nil
+TkFrame.new($sayings_demo, 'borderwidth'=>10) {|w|
+  sv = TkScrollbar.new(w)
+  sh = TkScrollbar.new(w, 'orient'=>'horizontal')
+  sayings_lbox = TkListbox.new(w) {
+    setgrid 1
+    width  20
+    height 10
+    yscrollcommand proc{|first,last| sv.set first,last}
+    xscrollcommand proc{|first,last| sh.set first,last}
+  }
+  sv.command(proc{|*args| sayings_lbox.yview(*args)})
+  sh.command(proc{|*args| sayings_lbox.xview(*args)})
+
+  if $tk_version =~ /^4\.[01]/
+    sv.pack('side'=>'right', 'fill'=>'y')
+    sh.pack('side'=>'bottom', 'fill'=>'x')
+    sayings_lbox.pack('expand'=>'yes', 'fill'=>'y')
+
+  else
+    sayings_lbox.grid('row'=>0, 'column'=>0, 
+                      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    sv.grid('row'=>0, 'column'=>1, 
+            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    sh.grid('row'=>1, 'column'=>0, 
+            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
+    TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
+  end
+
+}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
+
+sayings_lbox.insert(0,
+"Waste not, want not",
+"Early to bed and early to rise makes a man healthy, wealthy, and wise",
+"Ask not what your country can do for you, ask what you can do for your country",
+"I shall return",
+"NOT",
+"A picture is worth a thousand words",
+"User interfaces are hard to build",
+"Thou shalt not steal",
+"A penny for your thoughts",
+"Fool me once, shame on you;  fool me twice, shame on me",
+"Every cloud has a silver lining",
+"Where there's smoke there's fire",
+"It takes one to know one",
+"Curiosity killed the cat; but satisfaction brought it back",
+"Take this job and shove it",
+"Up a creek without a paddle",
+"I'm mad as hell and I'm not going to take it any more",
+"An apple a day keeps the doctor away",
+"Don't look a gift horse in the mouth"
+)
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/search.rb b/ruby_1_8_6/ext/tk/sample/demos-en/search.rb
new file mode 100644
index 0000000000..3d3b4aecc8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/search.rb
@@ -0,0 +1,180 @@
+# search.rb
+#
+# This demonstration script creates a collection of widgets that
+# allow you to load a file into a text widget, then perform searches
+# on that file.
+#
+# Text Search widget demo (called by 'widget')
+#
+
+# textLoadFile --
+# This method below loads a file into a text widget, discarding
+# the previous contents of the widget. Tags for the old widget are
+# not affected, however.
+#
+# Arguments:
+# w -           The window into which to load the file.  Must be a
+#               text widget.
+# file -        The name of the file to load.  Must be readable.
+
+def textLoadFile(w,file)
+  w.delete('1.0', 'end')
+  f = open(file, 'r')
+  while(!f.eof?)
+    w.insert('end', f.read(1000))
+  end
+  f.close
+end
+
+# textSearch --
+# Search for all instances of a given string in a text widget and
+# apply a given tag to each instance found.
+#
+# Arguments:
+# w -           The window in which to search.  Must be a text widget.
+# string -      The string to search for.  The search is done using
+#               exact matching only;  no special characters.
+# tag -         Tag to apply to each instance of a matching string.
+
+def textSearch(w, string, tag)
+  tag.remove('0.0', 'end')
+  return if string == ""
+  cur = '1.0'
+  loop {
+    cur, len = w.search_with_length(string, cur, 'end')
+    break if cur == ""
+    tag.add(cur, "#{cur} + #{len} char")
+    cur = w.index("#{cur} + #{len} char")
+  }
+end
+
+# textToggle --
+# This method is invoked repeatedly to invoke two commands at
+# periodic intervals.  It normally reschedules itself after each
+# execution but if an error occurs (e.g. because the window was
+# deleted) then it doesn't reschedule itself.
+#
+# Arguments:
+# cmd1 -        Command to execute when method is called.
+# sleep1 -      Ms to sleep after executing cmd1 before executing cmd2.
+# cmd2 -        Command to execute in the *next* invocation of this method.
+# sleep2 -      Ms to sleep after executing cmd2 before executing cmd1 again.
+
+def textToggle(cmd1,sleep1,cmd2,sleep2)
+  sleep_list = [sleep2, sleep1]
+  TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep}, 
+              -1, cmd1, cmd2).start(sleep1)
+end
+
+# toplevel widget
+if defined?($search_demo) && $search_demo
+  $search_demo.destroy 
+  $search_demo = nil
+end
+
+# demo toplevel widget
+$search_demo = TkToplevel.new {|w|
+  title("Text Demonstration - Search and Highlight")
+  iconname("search")
+  positionWindow(w)
+}
+
+# frame
+$search_buttons = TkFrame.new($search_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $search_demo
+      $search_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'search'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame
+TkFrame.new($search_demo) {|f|
+  TkLabel.new(f, 'text'=>'File name:', 
+              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
+  $search_fileName = TkVariable.new
+  TkEntry.new(f, 'width'=>40, 
+              'textvariable'=>$search_fileName) {
+    pack('side'=>'left')
+    bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
+                        $search_string_entry.focus})
+    focus
+  }
+  TkButton.new(f, 'text'=>'Load File', 
+               'command'=>proc{textLoadFile($search_text, 
+                                            $search_fileName.value)})\
+  .pack('side'=>'left', 'pady'=>5, 'padx'=>10)
+}.pack('side'=>'top', 'fill'=>'x')
+
+TkFrame.new($search_demo) {|f|
+  TkLabel.new(f, 'text'=>'Search string:', 
+              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
+  $search_searchString = TkVariable.new
+  $search_string_entry = TkEntry.new(f, 'width'=>40, 
+                                     'textvariable'=>$search_searchString) {
+    pack('side'=>'left')
+    bind('Return', proc{textSearch($search_text, $search_searchString.value, 
+                                   $search_Tag)})
+  }
+  TkButton.new(f, 'text'=>'Highlight', 
+               'command'=>proc{textSearch($search_text, 
+                                          $search_searchString.value, 
+                                          $search_Tag)}) {
+    pack('side'=>'left', 'pady'=>5, 'padx'=>10)
+  }
+}.pack('side'=>'top', 'fill'=>'x')
+
+$search_text = TkText.new($search_demo, 'setgrid'=>true, 'wrap'=>'word') {|t|
+  $search_Tag = TkTextTag.new(t)
+  TkScrollbar.new($search_demo, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
+    t.yscrollcommand(proc{|first,last| sc.set first,last})
+    pack('side'=>'right', 'fill'=>'y')
+  }
+  pack('expand'=>'yes', 'fill'=>'both')
+}  
+
+# Set up display styles for text highlighting.
+
+if TkWinfo.depth($search_demo) > 1
+  textToggle(proc{
+               $search_Tag.configure('background'=>'#ce5555', 
+                                     'foreground'=>'white')
+             },
+             800, 
+             proc{
+               $search_Tag.configure('background'=>'', 'foreground'=>'')
+             },
+             200 )
+else
+  textToggle(proc{
+               $search_Tag.configure('background'=>'black', 
+                                     'foreground'=>'white')
+             },
+             800, 
+             proc{
+               $search_Tag.configure('background'=>'', 'foreground'=>'')
+             },
+             200 )
+end
+$search_text.insert('1.0', "\
+This window demonstrates how to use the tagging facilities in text \
+widgets to implement a searching mechanism.  First, type a file name \
+in the top entry, then type <Return> or click on \"Load File\".  Then \
+type a string in the lower entry and type <Return> or click on \
+\"Load File\".  This will cause all of the instances of the string to \
+be tagged with the tag \"search\", and it will arrange for the tag\'s \
+display attributes to change to make all of the strings blink.")
+$search_text.set_insert '0.0'
+
+$search_fileName.value = ''
+$search_searchString.value = ''
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/spin.rb b/ruby_1_8_6/ext/tk/sample/demos-en/spin.rb
new file mode 100644
index 0000000000..58616b1e02
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/spin.rb
@@ -0,0 +1,63 @@
+# spin.rb --
+#
+# This demonstration script creates several spinbox widgets.
+#
+# based on Tcl/Tk8.4.4 widget demos
+
+if defined?($spin_demo) && $spin_demo
+  $spin_demo.destroy 
+  $spin_demo = nil
+end
+
+$spin_demo = TkToplevel.new {|w|
+  title("Spinbox Demonstration")
+  iconname("spin")
+  positionWindow(w)
+}
+
+TkLabel.new($spin_demo, 
+            :font=>$font, :wraplength=>'5i', :justify=>:left, 
+            :text=><<EOL).pack(:side=>:top)
+Three different spin-boxes are displayed below.  \
+You can add characters by pointing, clicking and typing.  \
+The normal Motif editing characters are supported, along with \
+many Emacs bindings.  For example, Backspace and Control-h \
+delete the character to the left of the insertion cursor and \
+Delete and Control-d delete the chararacter to the right of the \
+insertion cursor.  For values that are too large to fit in the \
+window all at once, you can scan through the value by dragging \
+with mouse button2 pressed.  Note that the first spin-box will \
+only permit you to type in integers, and the third selects from \
+a list of Australian cities.
+If your Tk library linked to Ruby doesn't include a 'spinbox' widget, \
+this demo doesn't work. Please use later version of Tk \
+which supports a 'spinbox' widget.
+EOL
+
+TkFrame.new($spin_demo){|f|
+  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
+
+  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
+                 $spin_demo.destroy
+                 $spin_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
+                 showCode 'spin'
+               }).pack(:side=>:left, :expand=>true)
+}
+
+australianCities = [
+    'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide', 
+    'Brisbane', 'Hobart', 'Darwin', 'Alice Springs'
+]
+
+[
+  TkSpinbox.new($spin_demo, :from=>1, :to=>10, :width=>10, :validate=>:key, 
+                :validatecommand=>[
+                  proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
+                ]), 
+  TkSpinbox.new($spin_demo, :from=>0, :to=>3, :increment=>0.5, 
+                :format=>'%05.2f', :width=>10), 
+  TkSpinbox.new($spin_demo, :values=>australianCities, :width=>10)
+].each{|sbox| sbox.pack(:side=>:top, :pady=>5, :padx=>10)}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/square b/ruby_1_8_6/ext/tk/sample/demos-en/square
new file mode 100644
index 0000000000..00bfde59ff
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/square
@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+
+# square --
+# This script generates a demo application containing only 
+# a "square" widget.  It's only usable if Tk has been compiled 
+# with tkSquare.c and with the -DSQUARE_DEMO compiler switch. 
+# This demo arranges the following bindings for the widget: 
+#
+# Button-1 press/drag:          moves square to mouse
+# "a":                          toggle size animation on/off
+#
+
+require 'tk'
+require 'tkafter'
+
+class TkSquare<TkWindow
+  def create_self
+    begin
+      tk_call 'square', path
+    rescue
+      STDERR.print "\nSorry. Your Tk interpreter does not contain " +
+	'a "square" demonstration widget.' + 
+	"\n ( See documents included the Tcl/Tk source archive. )\n\n"
+      exit
+    end
+  end
+  def size(amount=nil)
+    if amount
+      tk_send 'size', amount
+    else
+      number(tk_send('size'))
+    end
+  end
+  def position(x,y)
+    tk_send 'position', x, y
+  end
+end
+
+$s = TkSquare.new{
+  pack('expand'=>'yes', 'fill'=>'both')
+  bind('1', proc{|x,y| center(x,y)}, '%s %y')
+  bind('B1-Motion', proc{|x,y| center(x,y)}, '%s %y')
+  bind('a', proc{animate})
+  focus
+}
+TkRoot.new.minsize(1,1)
+
+# The procedure below centers the square on a given position.
+
+def center(x,y)
+  a = $s.size
+  $s.position(x-(a/2), y-(a/2))
+end
+
+# The procedures below provide a simple form of animation where
+# the box changes size in a pulsing pattern: larger, smaller, larger, 
+# and so on.
+
+$inc = 0
+
+def timer_proc
+  a = $s.size
+  return if $inc == 0
+  $inc = -3 if a >= 40
+  $inc =  3 if a <= 10
+  $s.size(a+$inc)
+end
+
+$timer = TkAfter.new(30, -1, proc{timer_proc})
+
+def animate
+  if $inc == 0
+    $inc = 3
+    $timer.start
+  else
+    $inc = 0
+    $timer.stop
+  end
+end
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/states.rb b/ruby_1_8_6/ext/tk/sample/demos-en/states.rb
new file mode 100644
index 0000000000..d38c1245af
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/states.rb
@@ -0,0 +1,78 @@
+# states.rb
+#
+# This demonstration script creates a listbox widget that displays
+# the names of the 50 states in the United States of America.
+#
+# listbox widget demo 'states' (called by 'widget')
+#
+
+# toplevel widget
+if defined?($states_demo) && $states_demo
+  $states_demo.destroy 
+  $states_demo = nil
+end
+
+# demo toplevel widget
+$states_demo = TkToplevel.new {|w|
+  title("Listbox Demonstration (states)")
+  iconname("states")
+  positionWindow(w)
+}
+
+# label
+msg = TkLabel.new($states_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "A listbox containing the 50 states is displayed below, along with a scrollbar.  You can scan the list either using the scrollbar or by scanning.  To scan, press button 2 in the widget and drag up or down."
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($states_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $states_demo
+      $states_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'states'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame
+states_lbox = nil
+TkFrame.new($states_demo, 'borderwidth'=>'.5c') {|w|
+  s = TkScrollbar.new(w)
+  states_lbox = TkListbox.new(w) {
+    setgrid 1
+    height 12
+    yscrollcommand proc{|first,last| s.set first,last}
+  }
+  s.command(proc{|*args| states_lbox.yview(*args)})
+  s.pack('side'=>'right', 'fill'=>'y')
+  states_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
+}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
+
+ins_data = [
+  'Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California', 
+  'Colorado', 'Connecticut', 'Delaware', 'Florida', 'Georgia', 
+  'Hawaii', 'Idaho', 'Illinois', 
+  'Indiana', 'Iowa', 'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland', 
+  'Massachusetts', 'Michigan', 'Minnesota', 'Mississippi', 'Missouri', 
+  'Montana', 'Nebraska', 'Nevada', 'New_Hampshire', 'New_Jersey', 'New_Mexico', 
+  'New_York', 'North_Carolina', 'North_Dakota', 
+  'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania', 'Rhode_Island', 
+  'South_Carolina', 'South_Dakota', 
+  'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington', 
+  'West_Virginia', 'Wisconsin', 'Wyoming'
+]
+
+states_lbox.insert(0, *ins_data)
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/style.rb b/ruby_1_8_6/ext/tk/sample/demos-en/style.rb
new file mode 100644
index 0000000000..5ed11aa459
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/style.rb
@@ -0,0 +1,211 @@
+# style.rb
+#
+# This demonstration script creates a text widget that illustrates the
+# various display styles that may be set for tags.
+#
+# text (display styles) widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($style_demo) && $style_demo
+  $style_demo.destroy 
+  $style_demo = nil
+end
+
+# demo toplevel widget
+$style_demo = TkToplevel.new {|w|
+  title("Text Demonstration - Display Styles")
+  iconname("style")
+  positionWindow(w)
+}
+
+# frame
+TkFrame.new($style_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $style_demo
+      $style_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'style'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# text 
+TkText.new($style_demo){|t|
+  # 
+  setgrid 'true'
+  width  70
+  height 32
+  wrap 'word'
+  TkScrollbar.new($style_demo) {|s|
+    pack('side'=>'right', 'fill'=>'y')
+    command proc{|*args| t.yview(*args)}
+    t.yscrollcommand proc{|first,last| s.set first,last}
+  }
+  pack('expand'=>'yes', 'fill'=>'both')
+
+  # 
+  style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
+  style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
+    style_tag_verybig = TkTextTag.new(t, 'font'=>'-*-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*')
+#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
+    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
+###
+#  case($tk_version)
+#  when /^4.*/
+#    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
+#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
+#  when /^8.*/
+#    unless $style_demo_do_first
+#      $style_demo_do_first = true
+#      Tk.tk_call('font', 'create', '@bigascii', 
+#                '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
+#      Tk.tk_call('font', 'create', '@smallascii', 
+#                '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
+#      Tk.tk_call('font', 'create', '@cBigFont', 
+#                '-compound', '@bigascii @msg_knj')
+#      Tk.tk_call('font', 'create', '@cSmallFont', 
+#                '-compound', '@smallascii @kanji')
+#    end
+#    style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
+#    style_tag_small = TkTextTag.new(t, 'font'=>'@cSmallFont')
+#  end
+
+  # 
+  if TkWinfo.depth($root).to_i > 1
+    style_tag_color1 = TkTextTag.new(t, 'background'=>'#a0b7ce')
+    style_tag_color2 = TkTextTag.new(t, 'foreground'=>'red')
+    style_tag_raised = TkTextTag.new(t, 'relief'=>'raised', 'borderwidth'=>1)
+    style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
+  else
+    style_tag_color1 = TkTextTag.new(t, 'background'=>'black', 
+                                     'foreground'=>'white')
+    style_tag_color2 = TkTextTag.new(t, 'background'=>'black', 
+                                     'foreground'=>'white')
+    style_tag_raised = TkTextTag.new(t, 'background'=>'white', 
+                                     'relief'=>'raised', 'borderwidth'=>1)
+    style_tag_sunken = TkTextTag.new(t, 'background'=>'white', 
+                                     'relief'=>'sunken', 'borderwidth'=>1)
+  end
+
+  # 
+  if $tk_version =~ /^4\.[01]/
+    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
+                                        'borderwidth'=>0, 
+                                        'bgstipple'=>'gray25')
+  else
+    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
+                                        'borderwidth'=>0, 
+                                        'bgstipple'=>'gray12')
+  end
+  style_tag_fgstipple = TkTextTag.new(t, 'fgstipple'=>'gray50')
+  style_tag_underline = TkTextTag.new(t, 'underline'=>'on')
+  style_tag_overstrike = TkTextTag.new(t, 'overstrike'=>'on')
+  style_tag_right  = TkTextTag.new(t, 'justify'=>'right')
+  style_tag_center = TkTextTag.new(t, 'justify'=>'center')
+  style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+  style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+  style_tag_margins = TkTextTag.new(t, 'lmargin1'=>'12m', 'lmargin2'=>'6m',
+                                    'rmargin'=>'10m')
+  style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
+                                    'lmargin1'=>'12m', 'lmargin2'=>'6m',
+                                    'rmargin'=>'10m')
+
+  # 
+  insert('end', 'Text widgets like this one allow you to display information in a
+variety of styles.  Display styles are controlled using a mechanism
+called ')
+  insert('end', 'tags', style_tag_big)
+  insert('end', '. Tags are just textual names that you can apply to one
+or more ranges of characters within a text widget.  You can configure
+tags with various display styles.  If you do this, then the tagged
+characters will be displayed with the styles you chose.  The
+available display styles are:
+')
+  insert('end', "\n1. Font.", style_tag_big)
+  insert('end', "  You can choose any X font, ")
+  insert('end', "large", style_tag_verybig)
+  insert('end', " or ")
+  insert('end', "small.\n")
+  insert('end', "\n2. Color.", style_tag_big)
+  insert('end', "  You can change either the ")
+  insert('end', "background", style_tag_color1)
+  insert('end', " or ")
+  insert('end', "foreground", style_tag_color2)
+  insert('end', "\ncolor, or ")
+  insert('end', "both", style_tag_color1, style_tag_color2)
+  insert('end', ".\n")
+  insert('end', "\n3. Stippling.", style_tag_big)
+  insert('end', "  You can cause either the ")
+  insert('end', "background", style_tag_bgstipple)
+  insert('end', " or ")
+  insert('end', "foreground", style_tag_fgstipple)
+  insert('end', "\ninformation to be drawn with a stipple fill instead of a solid fill.\n")
+  insert('end', "\n4. Underlining.", style_tag_big)
+  insert('end', "  You can ")
+  insert('end', "underline", style_tag_underline)
+  insert('end', " ranges of text.\n")
+  insert('end', "\n5. Overstrikes.", style_tag_big)
+  insert('end', "  You can ")
+  insert('end', "draw lines through", style_tag_overstrike)
+  insert('end', " ranges of text.\n")
+  insert('end', "\n6. 3-D effects.", style_tag_big)
+  insert('end', "  You can arrange for the background to be drawn\nwith a border that makes characters appear either\n")
+  insert('end', "raised", style_tag_raised)
+  insert('end', " or ")
+  insert('end', "sunken", style_tag_sunken)
+  insert('end', ".\n")
+  insert('end', "\n7. Justification.", style_tag_big)
+  insert('end', " You can arrange for lines to be displayed\n")
+  insert('end', "left-justified,\n")
+  insert('end', "right-justified, or\n", style_tag_right)
+  insert('end', "centered.\n", style_tag_center)
+  insert('end', "\n8. Superscripts and subscripts.", style_tag_big)
+  insert('end', " You can control the vertical\n")
+  insert('end', "position of text to generate superscript effects like 10")
+  insert('end', "n", style_tag_super)
+  insert('end', " or\nsubscript effects like X")
+  insert('end', "i", style_tag_sub)
+  insert('end', ".\n")
+  insert('end', "\n9. Margins.", style_tag_big)
+  insert('end', " You can control the amount of extra space left")
+  insert('end', " on\neach side of the text:\n")
+  insert('end', "This paragraph is an example of the use of ", style_tag_margins)
+  insert('end', "margins.  It consists of a single line of text ", style_tag_margins)
+  insert('end', "that wraps around on the screen.  There are two ", style_tag_margins)
+  insert('end', "separate left margin values, one for the first ", style_tag_margins)
+  insert('end', "display line associated with the text line, ", style_tag_margins)
+  insert('end', "and one for the subsequent display lines, which ", style_tag_margins)
+  insert('end', "occur because of wrapping.  There is also a ", style_tag_margins)
+  insert('end', "separate specification for the right margin, ", style_tag_margins)
+  insert('end', "which is used to choose wrap points for lines.\n", style_tag_margins)
+  insert('end', "\n10. Spacing.", style_tag_big)
+  insert('end', " You can control the spacing of lines with three\n")
+  insert('end', "separate parameters.  \"Spacing1\" tells how much ")
+  insert('end', "extra space to leave\nabove a line, \"spacing3\" ")
+  insert('end', "tells how much space to leave below a line,\nand ")
+  insert('end', "if a text line wraps, \"spacing2\" tells how much ")
+  insert('end', "space to leave\nbetween the display lines that ")
+  insert('end', "make up the text line.\n")
+  insert('end', "These indented paragraphs illustrate how spacing ", style_tag_spacing)
+  insert('end', "can be used.  Each paragraph is actually a ", style_tag_spacing)
+  insert('end', "single line in the text widget, which is ", style_tag_spacing)
+  insert('end', "word-wrapped by the widget.\n", style_tag_spacing)
+  insert('end', "Spacing1 is set to 10 points for this text, ", style_tag_spacing)
+  insert('end', "which results in relatively large gaps between ", style_tag_spacing)
+  insert('end', "the paragraphs.  Spacing2 is set to 2 points, ", style_tag_spacing)
+  insert('end', "which results in just a bit of extra space ", style_tag_spacing)
+  insert('end', "within a pararaph.  Spacing3 isn't used ", style_tag_spacing)
+  insert('end', "in this example.\n", style_tag_spacing)
+  insert('end', "To see where the space is, select ranges of ", style_tag_spacing)
+  insert('end', "text within these paragraphs.  The selection ", style_tag_spacing)
+  insert('end', "highlight will cover the extra space.", style_tag_spacing)
+
+}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/tcolor b/ruby_1_8_6/ext/tk/sample/demos-en/tcolor
new file mode 100644
index 0000000000..3c63d6730d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/tcolor
@@ -0,0 +1,526 @@
+#!/usr/bin/env ruby
+#
+# tcolor --
+#   simple color editor which supports RGB, HSB and CYM color space
+#
+# Copyright (C) 1998 Takaaki Tateishi(ttate@jaist.ac.jp)
+# last update: Thu Jun 18 06:32:35 JST 1998
+#
+
+require "tk"
+
+
+# use TkVariable instance for the variable which is changed by Tk interpreter
+
+$colorSpace = TkVariable.new(:rgb)
+$master = nil
+$red = 65535
+$green = 0
+$blue = 0
+$color = "#ffff00000000"
+$updating = TkVariable.new(0)
+$autoUpdate = TkVariable.new(1)
+$name = TkVariable.new($color)
+$command = TkVariable.new("print(%%,\"\n\")")
+# $command = TkVariable.new("")
+$label1 = TkVariable.new("label1")
+$label2 = TkVariable.new("label2")
+$label3 = TkVariable.new("label3")
+
+
+# setup the entry of the resourc database
+if (TkVarAccess.new('tcl_platform')['platform'] == 'unix')
+  TkOptionDB.add('*Entry.background', 'white')
+end
+
+
+# methods for events
+
+def rgbToHsv(red,green,blue)
+
+  if ( red > green )
+    max = red
+    min = green
+  else
+    max = green
+    min = red
+  end
+
+  if ( blue > max )
+    max = blue
+  else
+    if ( blue < min )
+      min = blue
+    end
+  end
+
+  range = max - min
+
+  if ( max == 0 )
+    sat = 0.0
+  else
+    sat = (max-min)/max
+  end
+
+  if ( sat == 0 )
+    hue = 0.0
+  else
+    rc = (max-red)/range
+    gc = (max-green)/range
+    bc = (max-blue)/range
+    if ( red == max )
+      hue = 0.166667 * (bc - gc)
+    else
+      if ( green == max )
+	hue = 0.166667 * (2.0 + rc - bc)
+      else
+	hue = 0.166667 * (4.0 + gc - rc)
+      end
+    end
+    if ( hue < 0.0 )
+      hue = hue + 1.0
+    end
+  end
+
+  [hue,sat,max/65535]
+end
+
+
+def hsbToRgb(hue,sat,value)
+  v = 65535.0 * value
+  if( sat == 0 )
+    ans = [v,v,v]
+  else
+    hue = hue*6.0
+    if ( hue >= 6 )
+      hue = 0.0
+    end
+    i = hue.to_i
+    f = hue - i
+    p = 65535.0 * value * (1.0 - sat)
+    q = 65535.0 * value * (1.0 - (sat * f))
+    t = 65535.0 * value * (1.0 - (sat * (1.0 - f)))
+    case i
+    when 0
+      ans = [v,t,p]
+    when 1
+      ans = [q,v,p]
+    when 2
+      ans = [p,v,t]
+    when 3
+      ans = [p,q,v]
+    when 4
+      ans = [t,p,v]
+    when 5
+      ans = [v,p,q]
+    else
+      raise(eException,"i value #{i} is out of range")
+    end
+  end
+  return ans
+end
+
+
+def _null_binding
+  Module.new.instance_eval{binding}
+end
+private :_null_binding
+
+def doUpdate 
+  newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
+  eval(newCmd, _null_binding)
+end
+
+
+def tc_scaleChanged
+  if( $updating.to_i == 1 )
+    return 
+  end
+
+  $master = :scale if $master == nil
+
+  scale1 = $root.middle.middle.scale1
+  scale2 = $root.middle.middle.scale2
+  scale3 = $root.middle.middle.scale3
+
+  case $colorSpace.value.intern
+  when :rgb
+    $red = (scale1.get * 65.535).to_i
+    $green = (scale2.get * 65.535).to_i
+    $blue = (scale3.get * 65.535).to_i
+  when :cmy
+    $red = (65535 - scale1.get * 65.535).to_i
+    $green = (65535 - scale2.get * 65.535).to_i
+    $blue = (65535 - scale3.get * 65.535).to_i        
+  when :hsb
+    list = hsbToRgb(scale1.get / 1000.0,
+		    scale2.get / 1000.0,
+		    scale3.get / 1000.0)
+    $red = list[0]
+    $green = list[1]
+    $blue = list[2]
+  else
+    raise(Exception,"unknown colorSpace")
+  end
+  $color = format("#%04x%04x%04x",$red.to_i,$green.to_i,$blue.to_i)
+  $name.value = $color if $master == :scale
+  $root.middle.right.set_color($color)
+  if( $autoUpdate.to_i == 1 )
+    doUpdate
+  end
+  Tk.update(true)
+  $master = nil if $master == :scale
+end
+
+
+def tc_setScales
+  $updating.value = 1
+
+  scale1 = $root.middle.middle.scale1
+  scale2 = $root.middle.middle.scale2
+  scale3 = $root.middle.middle.scale3
+  
+  case $colorSpace.value.intern
+  when :rgb
+    scale1.set($red / 65.535)
+    scale2.set($green / 65.535)
+    scale3.set($blue / 65.535)
+  when :cmy
+    scale1.set((65535 - $red) / 65.535)
+    scale2.set((65535 - $green) / 65.535)
+    scale3.set((65535 - $blue) / 65.535)
+  when :hsb
+    list = rgbToHsv($red,$green,$blue)
+    scale1.set( list[0] * 1000.0 )
+    scale2.set( list[1] * 1000.0 )
+    scale3.set( list[2] * 1000.0 )
+  else
+    raise(Exception,"unknown colorSpace")
+  end
+
+  $updating.value = 0
+end
+
+
+def tc_loadNamedColor(name)
+  $name.value = name
+  $master = :name if $master == nil
+  if name[0,1] != "#" 
+    list = TkWinfo.rgb($root.middle.right.swatch,name)
+    $red = list[0]
+    $green = list[1]
+    $blue = list[2]
+  else
+    case name.length
+    when 4
+      fmt = /#(.{1})(.{1})(.{1})/
+      shift = 12
+    when 7
+      fmt = /#(.{2})(.{2})(.{2})/
+      shift = 8
+    when 10
+      fmt = /#(.{3})(.{3})(.{3})/
+      shift = 4
+    when 13
+      fmt = /#(.{4})(.{4})(.{4})/
+      shift = 0
+    else
+      raise(eException,"syntax error in color name \"#{name}\"")
+    end
+    name.scan(fmt){|strlist|
+      if strlist.length != 3
+	raise(eException,"syntax error in color name \"#{name}\"")
+      end
+      $red = strlist[0].hex
+      $green = strlist[1].hex
+      $blue = strlist[2].hex
+    }
+    $red = $red << shift
+    $green = $green << shift
+    $blue = $blue << shift
+  end
+  
+  tc_setScales
+  $color = format("#%04x%04x%04x",$red,$green,$blue)
+  $root.middle.right.set_color($color)
+  if $autoUpdate.to_i == 1
+    doUpdate
+  end
+  Tk.update(true)
+  $master = nil if $master == :name
+end
+
+
+def changeColorSpace(space)
+  case space
+  when :rgb
+    $label1.value = "Red"
+    $label2.value = "Green"
+    $label3.value = "Blue"
+  when :cmy
+    $label1.value = "Cyan"
+    $label2.value = "Magenta"
+    $label3.value = "Yellow"
+  when :hsb
+    $label1.value = "Hue"
+    $label2.value = "Saturation"
+    $label3.value = "Brightness"
+  end
+  tc_setScales
+end
+
+
+# menu
+
+class TkColorMenuFrame<TkFrame
+  def initialize(parent)
+    super(parent,
+	  "relief"=>"raised",
+	  "borderwidth"=>"2")
+
+    # File menubutton
+    @file = TkMenubutton.new(self){|button|
+
+      # File menu
+      @file_menu = TkMenu.new(button){
+	add "radio",
+	  "label" => "RGB color space",
+	  "variable" => $colorSpace,
+	  "value" => :rgb,
+	  "underline" => "0",
+	  "command" => proc{changeColorSpace(:rgb)}
+	add "radio",
+	  "label" => "CMY color space",
+	  "variable" => $colorSpace,
+	  "value" => :cmy,
+	  "underline" => "0",
+	  "command" => proc{changeColorSpace(:cmy)}
+	add "radio",
+	  "label" => "HSB color space",
+	  "variable" => $colorSpace,
+	  "value" => :hsb,
+	  "underline" => "0",
+	  "command" => proc{changeColorSpace(:hsb)}
+	add "separator"
+	add "radio",
+	  "label" => "Automatic updates",
+	  "variable" => $autoUpdate,
+	  "value" => "1",
+	  "underline" => "0"
+	add "radio",
+	  "label" => "Manual updates",
+	  "variable" => $autoUpdate,
+	  "value" => "0",
+	  "underline" => "0"
+	add "separator"
+	add "command",
+	  "label" => "Exit program",
+	  "underline" => "0",
+	  "command" => proc{exit}
+      }
+      
+      # assign File menu to File button
+      menu @file_menu
+
+      text "File"
+      underline "0"
+    }.pack("side"=>"left")
+
+    self
+  end
+end
+
+
+# bottom frame
+class TkColorBotFrame<TkFrame
+  def initialize(parent)
+    super(parent,
+	  "relief"=> "raised",
+	  "borderwidth"=> 2)
+
+    @commandLabel = TkLabel.new(self,
+				"text"=> "Command:")
+    @command = TkEntry.new(self,
+			   "relief"=> "sunken",
+			   "borderwidth"=> "2",
+			   "textvariable"=> $command,
+			   "font"=> "-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
+    @update = TkButton.new(self,
+			   "text"=> "Update",
+			   "command"=> proc{doUpdate})
+    @commandLabel.pack("side"=>"left")
+    @update.pack("side"=>"right","pady"=>".1c","padx"=>".25c")
+    @command.pack("expand"=>"yes","fill"=>"x","ipadx"=>".25c")
+
+    self
+  end
+end    
+
+
+# left side frame of middle level
+class TkColorMiddleLeftFrame<TkFrame
+  def initialize(parent)
+    super(parent)
+
+    for i in ["/usr/local/lib/X11rgb.txt","/usr/lib/X11/rgb.txt",
+	"/X11/R5/lib/X11/rgb.txt","/X11/R4/lib/rgb/rgb.txt",
+	"/usr/openwin/lib/X11/rgb.txt"]
+      if !File.readable?(i)
+	next
+      end
+      f = File.open(i)
+      @scroll = TkScrollbar.new(self,
+				"orient"=>"vertical",
+				"relief"=>"sunken",
+				"borderwidth"=>"2")
+      @scroll.pack("side"=>"right","fill"=>"y")
+      @names = TkListbox.new(self,
+			     "width"=>"20",
+			     "height"=>"12",
+			     "yscrollcommand"=> proc{|first,last| @scroll.set first,last},
+			     "relief"=>"sunken",
+			     "borderwidth"=>"2",
+			     "exportselection"=>"false")
+      @scroll.command(proc{|*args| @names.yview(*args)})
+      @names.bind("Double-1",proc{
+		    tc_loadNamedColor(@names.get(@names.curselection))})
+      @names.pack("side"=>"left")
+      while (line = f.gets)
+	line.chop!
+	linelist = line.split(/[ \t]+/)
+	if linelist.length == 4
+	  @names.insert("end",linelist[3])
+	end
+      end
+      f.close
+      break
+    end
+
+    self
+  end
+end
+
+
+# middle frame of middle level
+class TkColorMiddleMiddleFrame<TkFrame
+  attr_reader :scale1, :scale2, :scale3
+
+  def initialize(parent)
+    super(parent)
+
+    @f1 = TkFrame.new(self)
+    @f2 = TkFrame.new(self)
+    @f3 = TkFrame.new(self)
+    @f4 = TkFrame.new(self)
+
+    for f in [@f1,@f2,@f3]
+      f.pack("side"=>"top","expand"=>"yes")
+    end
+    @f4.pack("side"=>"top","expand"=>"yes","fill"=>"x")
+
+    @label1 = TkLabel.new(self,"textvariable"=>$label1)
+    @scale1 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
+			  "orient"=>"horizontal",
+			  "command"=>proc{tc_scaleChanged})
+    @scale1.pack("side"=>"top","anchor"=>"w")
+    @label1.pack("side"=>"top","anchor"=>"w")
+
+    @label2 = TkLabel.new(self,"textvariable"=>$label2)
+    @scale2 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
+			  "orient"=>"horizontal",
+			  "command"=>proc{tc_scaleChanged})
+    @scale2.pack("side"=>"top","anchor"=>"w")
+    @label2.pack("side"=>"top","anchor"=>"w")
+
+    @label3 = TkLabel.new(self,"textvariable"=>$label3)
+    @scale3 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
+			  "orient"=>"horizontal",
+			  "command"=>proc{tc_scaleChanged})
+    @scale3.pack("side"=>"top","anchor"=>"w")
+    @label3.pack("side"=>"top","anchor"=>"w")
+
+    @nameLabel = TkLabel.new(self,"text"=>"Name:")
+    @name = TkEntry.new(self,"relief"=>"sunken","borderwidth"=>"2",
+			"textvariable"=>$name,"width"=>"10",
+			"font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
+    @nameLabel.pack("side"=>"left")
+    @name.pack("side"=>"right", "expand"=>"1", "fill"=>"x")
+    @name.bind("Return",proc{tc_loadNamedColor $name.to_s})
+
+    self
+  end
+end
+
+
+class TkColorMiddleRightFrame<TkFrame
+  attr_reader :swatch
+
+  def initialize(parent)
+    super(parent)
+    @swatch = TkFrame.new(self, "width"=>"2c", "height"=>"5c",
+			  "background"=>$color)
+    @value = TkLabel.new(self, 
+			 "text"=>$color,
+			 "width"=>"13",
+			 "font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
+    @swatch.pack("side"=>"top","expand"=>"yes","fill"=>"both")
+    @value.pack("side"=>"bottom","pady"=>".25c")
+
+    self
+  end
+
+  def set_color(color)
+    @swatch["background"] = color
+    @value["text"] = color
+  end
+end
+
+
+
+# middle level frame
+class TkColorMiddleFrame<TkFrame
+  attr_reader :left, :middle, :right
+
+  def initialize(parent)
+    super(parent,
+	  "relief"=> "raised",
+	  "borderwidth"=> "2")
+
+    @left = TkColorMiddleLeftFrame.new(self)
+    @left.pack("side"=>"left","padx"=>".25c","pady"=>".25c")
+
+    @middle = TkColorMiddleMiddleFrame.new(self)
+    @middle.pack("side"=>"left","expand"=>"yes","fill"=>"y")
+
+    @right = TkColorMiddleRightFrame.new(self)
+    @right.pack("side"=>"left","padx"=>".25c","pady"=>".25c","anchor"=>"s")
+
+    self
+  end
+end
+
+
+class TkColor<TkRoot
+  attr_reader :menu, :bottom, :middle
+
+  def initialize(*args)
+    super(*args)
+    @menu = TkColorMenuFrame.new(self)
+    @menu.pack("side"=>"top", "fill"=>"x")
+
+    @bottom = TkColorBotFrame.new(self)
+    @bottom.pack("side"=>"bottom","fill"=>"x")
+
+    @middle = TkColorMiddleFrame.new(self)
+    @middle.pack("side"=>"top","fill"=>"both")
+
+    self
+  end
+end
+
+
+$root = TkColor.new
+changeColorSpace :rgb
+
+# start eventloop
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/text.rb b/ruby_1_8_6/ext/tk/sample/demos-en/text.rb
new file mode 100644
index 0000000000..4bb4b6bc7e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/text.rb
@@ -0,0 +1,126 @@
+# text.rb
+#
+# This demonstration script creates a text widget that describes
+# the basic editing functions.
+#
+# text (basic facilities) widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($text_demo) && $text_demo
+  $text_demo.destroy 
+  $text_demo = nil
+end
+
+# demo toplevel widget
+$text_demo = TkToplevel.new {|w|
+  title("Text Demonstration - Basic Facilities")
+  iconname("text")
+  positionWindow(w)
+}
+
+# version check
+if ((Tk::TK_VERSION.split('.').collect{|n| n.to_i} <=> [8,4]) < 0)
+  undo_support = false
+else
+  undo_support = true
+end
+
+# frame
+TkFrame.new($text_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $text_demo
+      $text_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'text'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# text 
+TkText.new($text_demo){|t|
+  relief 'sunken'
+  bd 2
+  setgrid 1
+  height 30
+  if undo_support
+    undo true
+    autoseparators true
+  end
+  TkScrollbar.new($text_demo) {|s|
+    pack('side'=>'right', 'fill'=>'y')
+    command proc{|*args| t.yview(*args)}
+    t.yscrollcommand proc{|first,last| s.set first,last}
+  }
+  pack('expand'=>'yes', 'fill'=>'both')
+
+  # 
+  insert('0.0', <<EOT)
+This window is a text widget.  It displays one or more lines of text
+and allows you to edit the text.  Here is a summary of the things you
+can do to a text widget:
+
+1. Scrolling. Use the scrollbar to adjust the view in the text window.
+
+2. Scanning. Press mouse button 2 in the text window and drag up or down.
+This will drag the text at high speed to allow you to scan its contents.
+
+3. Insert text. Press mouse button 1 to set the insertion cursor, then
+type text.  What you type will be added to the widget.
+
+4. Select. Press mouse button 1 and drag to select a range of characters.
+Once you've released the button, you can adjust the selection by pressing
+button 1 with the shift key down.  This will reset the end of the
+selection nearest the mouse cursor and you can drag that end of the
+selection by dragging the mouse before releasing the mouse button.
+You can double-click to select whole words or triple-click to select
+whole lines.
+
+5. Delete and replace. To delete text, select the characters you'd like
+to delete and type Backspace or Delete.  Alternatively, you can type new
+text, in which case it will replace the selected text.
+
+6. Copy the selection. To copy the selection into this window, select
+what you want to copy (either here or in another application), then
+click button 2 to copy the selection to the point of the mouse cursor.
+
+7. Edit.  Text widgets support the standard Motif editing characters
+plus many Emacs editing characters.  Backspace and Control-h erase the
+character to the left of the insertion cursor.  Delete and Control-d
+erase the character to the right of the insertion cursor.  Meta-backspace
+deletes the word to the left of the insertion cursor, and Meta-d deletes
+the word to the right of the insertion cursor.  Control-k deletes from
+the insertion cursor to the end of the line, or it deletes the newline
+character if that is the only thing left on the line.  Control-o opens
+a new line by inserting a newline character to the right of the insertion
+cursor.  Control-t transposes the two characters on either side of the
+insertion cursor. #{
+      if undo_support
+        undo_text = "Control-z undoes the last editing action performed,\nand "
+        case $tk_platform['platform']
+        when "unix", "macintosh"
+          undo_text << "Control-Shift-z"
+        else # 'windows'
+          undo_text << "Control-y"
+        end
+        undo_text << "redoes undone edits."
+      else
+        ""
+      end
+}
+
+7. Resize the window.  This widget has been configured with the "setGrid"
+option on, so that if you resize the window it will always resize to an
+even number of characters high and wide.  Also, if you make the window
+narrow you can see that long lines automatically wrap around onto
+additional lines so that all the information is always visible.
+EOT
+
+  set_insert('0.0')
+}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/timer b/ruby_1_8_6/ext/tk/sample/demos-en/timer
new file mode 100644
index 0000000000..58a41d00c0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/timer
@@ -0,0 +1,136 @@
+#!/usr/bin/env ruby
+#
+# timer --
+# This script generates a counter with start,stop and reset buttons.
+#
+# Copyright (C) 1998 Takaaki Tateishi (ttate@jaist.ac.jp)
+# last update: Sat Jun 27 12:24:14 JST 1998
+#
+
+require "tk"
+require "thread"
+require "tkafter"
+
+$time = "0.00"
+$m = Mutex.new
+$loop = false
+
+def timer_stop
+  $loop = false
+  $m.lock
+end
+
+def timer_start
+  $loop = true
+  $m.unlock
+end
+
+def timer_reset
+  $time = "0.00"
+  $root.countframe.counter['text'] = $time
+end
+
+def timer_loop
+  if $loop
+    $time = $time.succ
+    $root.countframe.counter['text'] = $time
+  end
+  Tk.after(10,proc{timer_loop})
+end
+
+
+#
+# thread version
+#
+def timer_loop2
+  while true
+    $m.lock
+    $time = $time.succ
+    $root.countframe.counter['text'] = $time
+    sleep(0.01)
+    $m.unlock
+  end
+end
+
+#
+# TkAfter
+#
+def timer_loop3
+  if $loop
+    $time = $time.succ
+    $root.countframe.counter['text'] = $time
+  end
+end
+
+
+class CountFrame < TkFrame
+  attr_reader :counter
+
+  def initialize(parent=nil,keys=nil)
+    super(parent,keys)
+    @counter = TkLabel.new(self,
+			   'text'=>$time, 
+			   'relief'=>'raised')
+    @counter.pack('fill'=>'both')
+    self
+  end
+end
+
+
+class ButtonFrame < TkFrame
+  def initialize(parent=nil,keys=nil)
+    super(parent,keys)
+=begin
+    @stop = TkButton.new(self,
+			 'text'=>'Stop',
+			 'command'=>proc{timer_stop})
+    @start = TkButton.new(self,
+			  'text'=>'Start',
+			  'command'=>proc{timer_start})
+=end
+    @stop  = TkButton.new(self, :text=>'Stop',  :state=>:disabled)
+    @start = TkButton.new(self, :text=>'Start', :state=>:normal)
+
+    @stop.command proc{
+      timer_stop
+      @start.state(:normal)
+      @stop.state(:disabled)
+    }
+    @start.command proc{
+      timer_start
+      @stop.state(:normal)
+      @start.state(:disabled)
+    }
+
+    @reset = TkButton.new(self,
+			  'text'=>'Reset',
+			  'command'=>proc{timer_reset})
+    for b in [@stop,@start,@reset]
+      b.pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
+    end
+  end
+end
+
+
+class Timer < TkRoot
+  attr_reader :countframe
+
+  def initialize(*args)
+    super(*args)
+    @countframe = CountFrame.new(self)
+    @buttonframe = ButtonFrame.new(self)
+    for f in [@buttonframe,@countframe]
+      f.pack('side'=>'top', 'fill'=>'both')
+    end
+    self
+  end
+end
+
+
+$root = Timer.new
+
+#$thread = Thread.start{timer_loop2}
+#timer_loop
+TkAfter.new(10,-1,proc{timer_loop3}).start
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/tkencoding.rb b/ruby_1_8_6/ext/tk/sample/demos-en/tkencoding.rb
new file mode 100644
index 0000000000..727491a6ad
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/tkencoding.rb
@@ -0,0 +1,42 @@
+# -*- ruby -*-
+#
+# tkencoding.rb
+# written by ttate@jaist.ac.jp
+
+class TclTkIp
+  alias __eval _eval
+  alias __invoke _invoke
+  private :__eval
+  private :__invoke
+
+  attr_accessor :encoding
+
+  def _eval(cmd)
+    if( @encoding )
+      _fromUTF8(__eval(_toUTF8(cmd,@encoding)),@encoding)
+    else
+      __eval(cmd)
+    end
+  end
+
+  def _invoke(*cmds)
+    if( @encoding )
+      cmds = cmds.collect{|cmd| _toUTF8(cmd,@encoding)}
+      _fromUTF8(__invoke(*cmds),@encoding)
+    else
+      __invoke(*cmds)
+    end
+  end
+end
+
+module Tk
+  INTERP = TkCore::INTERP
+
+  def encoding=(name)
+    INTERP.encoding = name
+  end
+
+  def encoding
+    INTERP.encoding
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/twind.rb b/ruby_1_8_6/ext/tk/sample/demos-en/twind.rb
new file mode 100644
index 0000000000..24a4bcf706
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/twind.rb
@@ -0,0 +1,285 @@
+# twind.rb
+#
+# This demonstration script creates a text widget with a bunch of
+# embedded windows.
+#
+# text (embedded windows) widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($twind_demo) && $twind_demo
+  $twind_demo.destroy 
+  $twind_demo = nil
+end
+
+# demo toplevel widget
+$twind_demo = TkToplevel.new {|w|
+  title("Text Demonstration - Embedded Windows")
+  iconname("Embedded Windows")
+  positionWindow(w)
+}
+
+# frame
+$twind_buttons = TkFrame.new($twind_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc{
+      tmppath = $twind_demo
+      $twind_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc{showCode 'twind'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame
+$twind_text = nil
+TkFrame.new($twind_demo, 'highlightthickness'=>2, 'borderwidth'=>2, 
+            'relief'=>'sunken') {|f|
+  $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font, 
+                          'width'=>'70', 'height'=>35, 'wrap'=>'word', 
+                          'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
+    TkScrollbar.new(f) {|s|
+      command proc{|*args| t.yview(args)}
+      t.yscrollcommand proc{|first,last| s.set first,last}
+    }.pack('side'=>'right', 'fill'=>'y')
+  }.pack('expand'=>'yes', 'fill'=>'both')
+}.pack('expand'=>'yes', 'fill'=>'both')
+
+# 
+$tag_center = TkTextTag.new($twind_text, 
+                            'justify' =>'center',
+                            'spacing1'=>'5m',
+                            'spacing3'=>'5m'  )
+$tag_buttons = TkTextTag.new($twind_text, 
+                             'lmargin1'=>'1c',
+                             'lmargin2'=>'1c',
+                             'rmargin' =>'1c',
+                             'spacing1'=>'3m',
+                             'spacing2'=>0,
+                             'spacing3'=>0 )
+
+$twind_text.insert('end', "A text widget can contain other widgets embedded ")
+$twind_text.insert('end', "it.  These are called \"embedded windows\", ")
+$twind_text.insert('end', "and they can consist of arbitrary widgets.  ")
+$twind_text.insert('end', "For example, here are two embedded button ")
+$twind_text.insert('end', "widgets.  You can click on the first button to ")
+TkTextWindow.new($twind_text, 'end', 
+                 'window'=>TkButton.new($twind_text) {
+                   #text 'ON'
+                   text 'Turn On'
+                   command proc{textWindOn $twind_text,$twind_buttons}
+                   cursor 'top_left_arrow'
+                 })
+$twind_text.insert('end', " horizontal scrolling, which also turns off ")
+$twind_text.insert('end', "word wrapping.  Or, you can click on the second ")
+$twind_text.insert('end', "button to\n")
+TkTextWindow.new($twind_text, 'end', 
+                 'window'=>TkButton.new($twind_text) {
+                   #text 'OFF'
+                   text 'Turn Off'
+                   command proc{textWindOff $twind_text}
+                   cursor 'top_left_arrow'
+                 })
+
+$twind_text.insert('end', " horizontal scrolling and turn back on word wrapping.\n\n")
+$twind_text.insert('end', "Or, here is another example.  If you ")
+TkTextWindow.new($twind_text, 'end', 
+                 'window'=>TkButton.new($twind_text) {
+                   text 'Click Here'
+                   command proc{textWindPlot $twind_text}
+                   cursor 'top_left_arrow'
+                 })
+$twind_text.insert('end', " a canvas displaying an x-y plot will appear right here.")
+$mark_plot = TkTextMark.new($twind_text, 'insert')
+$mark_plot.gravity='left'
+$twind_text.insert('end', "  You can drag the data points around with the mouse, ")
+$twind_text.insert('end', "or you can click here to ")
+TkTextWindow.new($twind_text, 'end', 
+                 'window'=>TkButton.new($twind_text) {
+                   text 'Delete'
+                   command proc{textWindDel $twind_text}
+                   cursor 'top_left_arrow'
+                 })
+
+$twind_text.insert('end', " the plot again.\n\n")
+$twind_text.insert('end', "You may also find it useful to put embedded windows in ")
+$twind_text.insert('end', "a text without any actual text.  In this case the ")
+$twind_text.insert('end', "text widget acts like a geometry manager.  For ")
+$twind_text.insert('end', "example, here is a collection of buttons laid out ")
+$twind_text.insert('end', "neatly into rows by the text widget.  These buttons ")
+$twind_text.insert('end', "can be used to change the background color of the ")
+$twind_text.insert('end', "text widget (\"Default\" restores the color to ")
+$twind_text.insert('end', "its default).  If you click on the button labeled ")
+$twind_text.insert('end', "\"Short\", it changes to a longer string so that ")
+$twind_text.insert('end', "you can see how the text widget automatically ")
+$twind_text.insert('end', "changes the layout.  Click on the button again ")
+$twind_text.insert('end', "to restore the short string.\n")
+
+
+TkTextWindow.new($twind_text, 'end', 
+                 'window'=>TkButton.new($twind_text) {|b|
+                   text 'Default'
+                   command proc{embDefBg $twind_text}
+                   cursor 'top_left_arrow'
+                   $tag_buttons.add('end')
+                 },
+                 'padx'=>3 )
+embToggle = TkVariable.new('Short')
+TkTextWindow.new($twind_text, 'end', 
+                 'window'=>TkCheckButton.new($twind_text) {
+                   textvariable embToggle
+                   indicatoron 0
+                   variable embToggle
+                   onvalue 'A much longer string'
+                   offvalue 'Short'
+                   cursor 'top_left_arrow'
+                   pady 5
+                   padx 2
+                 },
+                 'padx'=>3, 
+                 'pady'=>2 )
+
+[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4', 
+  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1', 
+  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1', 
+  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4' 
+].each{|twind_color|
+  TkTextWindow.new($twind_text, 'end', 
+                   'window'=>TkButton.new($twind_text) {
+                     text twind_color
+                     cursor 'top_left_arrow'
+                     command proc{$twind_text.bg twind_color}
+                   },
+                   'padx'=>3, 
+                   'pady'=>2 )
+}
+
+# 
+def textWindOn (w,f)
+  if defined? $twind_scroll
+    begin
+      $twind_scroll.destroy
+    rescue
+    end
+    $twind_scroll = nil
+  end
+
+  base = TkWinfo.parent( TkWinfo.parent(w) )
+  $twind_scroll = TkScrollbar.new(base) {|s|
+    orient 'horizontal'
+    command proc{|*args| w.xview(*args)}
+    w.xscrollcommand proc{|first,last| s.set first,last}
+    w.wrap 'none'
+    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
+  }
+
+  return nil
+end
+
+def textWindOff (w)
+  if defined? $twind_scroll
+    begin
+      $twind_scroll.destroy
+    rescue
+    end
+    $twind_scroll = nil
+  end
+  w.xscrollcommand ''
+  w.wrap 'word'
+end
+
+def textWindPlot (t)
+  if (defined? $twind_plot) && TkWinfo.exist?($twind_plot)
+    return
+  end
+
+  $twind_plot = TkCanvas.new(t) {
+    relief 'sunken'
+    width  450
+    height 300
+    cursor 'top_left_arrow'
+  }
+
+  font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+
+  TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
+  TkcLine.new($twind_plot, 100, 250, 100,  50, 'width'=>2)
+  TkcText.new($twind_plot, 225, 20, 
+              'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
+
+  (0..10).each {|i|
+    x = 100 + (i * 30)
+    TkcLine.new($twind_plot, x, 250, x, 245, 'width'=>2)
+    TkcText.new($twind_plot, x, 254, 
+                'text'=>10*i, 'font'=>font, 'anchor'=>'n')
+  }
+  (0..5).each {|i|
+    y = 250 - (i * 40)
+    TkcLine.new($twind_plot, 100, y, 105, y, 'width'=>2)
+    TkcText.new($twind_plot, 96, y, 
+                'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
+  }
+
+  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
+    x = 100 + (3*xx)
+    y = 250 - (4*yy)/5
+    item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6, 
+                       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
+    item.addtag 'point'
+  end
+
+  $twind_plot.itembind('point', 'Any-Enter', 
+                        proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
+  $twind_plot.itembind('point', 'Any-Leave', 
+                        proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
+  $twind_plot.itembind('point', '1', 
+                        proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
+  $twind_plot.itembind('point', 'ButtonRelease-1', 
+                        proc{$twind_plot.dtag 'selected'})
+  $twind_plot.bind('B1-Motion', 
+                    proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
+  while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
+    $twind_text.delete $mark_plot
+  end
+  $twind_text.insert $mark_plot,"\n"
+  TkTextWindow.new($twind_text, $mark_plot, 'window'=>$twind_plot)
+  $tag_center.add $mark_plot
+  $twind_text.insert $mark_plot,"\n"
+end
+
+$embPlot = {'lastX'=>0, 'lastY'=>0}
+
+def embPlotDown (w, x, y)
+  w.dtag 'selected'
+  w.addtag_withtag 'selected', 'current'
+  w.raise 'current'
+  $embPlot['lastX'] = x
+  $embPlot['lastY'] = y
+end
+
+def embPlotMove (w, x, y)
+  w.move 'selected', x - $embPlot['lastX'], y - $embPlot['lastY']
+  $embPlot['lastX'] = x
+  $embPlot['lastY'] = y
+end
+
+def textWindDel (w)
+  if (defined? $twind_text) && TkWinfo.exist?($twind_plot)
+    $twind_text.delete $twind_plot
+    $twind_plot = nil
+    while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
+      $twind_text.delete $mark_plot
+    end
+    $twind_text.insert $mark_plot,"  "
+  end
+end
+
+def embDefBg (w)
+  w['background'] = w.configinfo('background')[3]
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/twind2.rb b/ruby_1_8_6/ext/tk/sample/demos-en/twind2.rb
new file mode 100644
index 0000000000..c42e0999d7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/twind2.rb
@@ -0,0 +1,382 @@
+#
+# text (embedded windows) widget demo 2 (called by 'widget')
+#
+
+# delete toplevel widget
+if defined?($twind2_demo) && $twind2_demo
+  $twind2_demo.destroy 
+  $twind2_demo = nil
+end
+
+# demo toplevel widget
+$twind2_demo = TkToplevel.new {|w|
+  title("Text Demonstration - Embedded Windows 2")
+  iconname("Embedded Windows")
+  positionWindow(w)
+}
+
+# frame
+$twind2_buttons = TkFrame.new($twind2_demo) {|frame|
+  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2), 
+         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x', 
+         TkButton.new(frame, :text=>'See Code', 
+                      :image=>$image['view'], :compound=>:left, 
+                      :command=>proc{showCode 'twind2'}), 
+         TkButton.new(frame, :text=>'Dismiss', 
+                      :image=>$image['delete'], :compound=>:left, 
+                      :command=>proc{
+                        tmppath = $twind2_demo
+                        $twind2_demo = nil
+                        $showVarsWin[tmppath.path] = nil
+                        tmppath.destroy
+                      }), 
+         :padx=>4, :pady=>4)
+  frame.grid_columnconfigure(0, :weight=>1)
+}
+$twind2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame
+$twind2_text = nil
+TkFrame.new($twind2_demo, 'highlightthickness'=>2, 'borderwidth'=>2, 
+            'relief'=>'sunken') {|f|
+  $twind2_text = TkText.new(f, 'setgrid'=>true, 'font'=>$font,
+                            # 'width'=>'70', 'height'=>35, 'wrap'=>'word', 
+                            'width'=>'70', 'height'=>35, 'wrap'=>'char', 
+                            'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
+    TkScrollbar.new(f) {|s|
+      command proc{|*args| t.yview(*args)}
+      t.yscrollcommand proc{|first,last| s.set first,last}
+    }.pack('side'=>'right', 'fill'=>'y')
+  }.pack('expand'=>'yes', 'fill'=>'both')
+}.pack('expand'=>'yes', 'fill'=>'both')
+
+# text tags
+$tag2_center = TkTextTag.new($twind2_text, 
+                            'justify' =>'center',
+                            'spacing1'=>'5m',
+                            'spacing3'=>'5m'  )
+$tag2_buttons = TkTextTag.new($twind2_text, 
+                             'lmargin1'=>'1c',
+                             'lmargin2'=>'1c',
+                             'rmargin' =>'1c',
+                             'spacing1'=>'3m',
+                             'spacing2'=>0,
+                             'spacing3'=>0 )
+
+# insert text
+$twind2_text.insert('end', 
+                  'A text widget can contain many different kinds of items, ')
+$twind2_text.insert('end',
+                  "both active and passive.  It can lay these out in various ")
+$twind2_text.insert('end',
+                   "ways, with wrapping, tabs, centering, etc.  In addition, ")
+$twind2_text.insert('end',
+                    "when the contents are too big for the window, smooth ")
+$twind2_text.insert('end', "scrolling in all directions is provided.\n\n")
+
+$twind2_text.insert('end', "A text widget can contain other widgets embedded ")
+$twind2_text.insert('end', "it.  These are called \"embedded windows\", ")
+$twind2_text.insert('end', "and they can consist of arbitrary widgets.  ")
+$twind2_text.insert('end', "For example, here are two embedded button ")
+$twind2_text.insert('end', "widgets.  You can click on the first button to ")
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text) {
+                   text 'ON'
+                   command proc{textWindOn2 $twind2_text,$twind2_buttons}
+                   cursor 'top_left_arrow'
+                 })
+$twind2_text.insert('end', " horizontal scrolling, which also turns off ")
+$twind2_text.insert('end', "word wrapping.  Or, you can click on the second ")
+$twind2_text.insert('end', "button to\n")
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text) {
+                   text 'OFF'
+                   command proc{textWindOff2 $twind2_text}
+                   cursor 'top_left_arrow'
+                 })
+$twind2_text.insert('end', 
+                   " horizontal scrolling and turn back on word wrapping.\n\n")
+
+$twind2_text.insert('end', "Or, here is another example.  If you ")
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text) {
+                   text 'Click Here'
+                   command proc{textWindPlot2 $twind2_text}
+                   cursor 'top_left_arrow'
+                 })
+$twind2_text.insert('end', 
+                    " a canvas displaying an x-y plot will appear right here.")
+$mark2_plot = TkTextMark.new($twind2_text, 'insert')
+$mark2_plot.gravity='left'
+$twind2_text.insert('end', 
+                    "  You can drag the data points around with the mouse, ")
+$twind2_text.insert('end', "or you can click here to ")
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text) {
+                   text 'Delete'
+                   command proc{textWindDel2 $twind2_text}
+                   cursor 'top_left_arrow'
+                 })
+$twind2_text.insert('end', " the plot again.\n\n")
+
+$twind2_text.insert('end', 
+                    "You may also find it useful to put embedded windows in ")
+$twind2_text.insert('end', 
+                    "a text without any actual text.  In this case the ")
+$twind2_text.insert('end', "text widget acts like a geometry manager.  For ")
+$twind2_text.insert('end', 
+                    "example, here is a collection of buttons laid out ")
+$twind2_text.insert('end', 
+                    "neatly into rows by the text widget.  These buttons ")
+$twind2_text.insert('end', 
+                    "can be used to change the background color of the ")
+$twind2_text.insert('end', "text widget (\"Default\" restores the color to ")
+$twind2_text.insert('end', 
+                    "its default).  If you click on the button labeled ")
+$twind2_text.insert('end', "\"Short\", it changes to a longer string so that ")
+$twind2_text.insert('end', "you can see how the text widget automatically ")
+$twind2_text.insert('end', "changes the layout.  Click on the button again ")
+$twind2_text.insert('end', "to restore the short string.\n")
+
+btn_default = TkButton.new($twind2_text) {|b|
+  text 'Default'
+  command proc{embDefBg2 $twind2_text}
+  cursor 'top_left_arrow'
+}
+TkTextWindow.new($twind2_text, 'end', 'window'=>btn_default, 'padx'=>3)
+embToggle = TkVariable.new('Short')
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkCheckButton.new($twind2_text) {
+                   textvariable embToggle
+                   indicatoron 0
+                   variable embToggle
+                   onvalue 'A much longer string'
+                   offvalue 'Short'
+                   cursor 'top_left_arrow'
+                   pady 5
+                   padx 2
+                 },
+                 'padx'=>3, 
+                 'pady'=>2 )
+
+[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4', 
+  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1', 
+  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1', 
+  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4' 
+].each{|twind_color|
+  TkTextWindow.new($twind2_text, 'end', 
+                   'window'=>TkButton.new($twind2_text) {
+                     text twind_color
+                     cursor 'top_left_arrow'
+                     command proc{$twind2_text.bg twind_color}
+                   },
+                   'padx'=>3, 
+                   'pady'=>2 )
+}
+
+$tag2_buttons.add(btn_default, 'end')
+
+$text_normal2 = {}
+$text_normal2['border'] = $twind2_text.cget('borderwidth')
+$text_normal2['highlight'] = $twind2_text.cget('highlightthickness')
+$text_normal2['pad'] = $twind2_text.cget('padx')
+
+$twind2_text.insert('end', "\nYou can also change the usual border width and ")
+$twind2_text.insert('end', "highlightthickness and padding.\n")
+
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text, :text=>"Big borders", 
+                                        :cursor=>'top_left_arrow', 
+                                        'command'=>proc{
+                                          textWinBigB2 $twind2_text
+                                        }))
+
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text, :text=>"Small borders", 
+                                        :cursor=>'top_left_arrow', 
+                                        'command'=>proc{
+                                          textWinSmallB2 $twind2_text
+                                        }))
+
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text, :text=>"Big highlight", 
+                                        :cursor=>'top_left_arrow', 
+                                        'command'=>proc{
+                                          textWinBigH2 $twind2_text
+                                        }))
+
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text, :text=>"Small highlight",
+                                        :cursor=>'top_left_arrow', 
+                                        'command'=>proc{
+                                          textWinSmallH2 $twind2_text
+                                        }))
+
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text, :text=>"Big pad", 
+                                        :cursor=>'top_left_arrow', 
+                                        'command'=>proc{
+                                          textWinBigP2 $twind2_text
+                                        }))
+
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text, :text=>"Small pad", 
+                                        :cursor=>'top_left_arrow', 
+                                        'command'=>proc{
+                                          textWinSmallP2 $twind2_text
+                                        }))
+
+$twind2_text.insert('end', 
+                    "\n\nFinally, images fit comfortably in text widgets too:")
+
+TkTextImage.new($twind2_text, 'end', 
+                'image'=>TkBitmapImage.new(:file=>[
+                                             $demo_dir, '..', 
+                                             'images', 'face.xbm'
+                                           ].join(File::Separator)))
+
+# methods
+def textWinBigB2(w)
+  w.borderwidth 15
+end
+def textWinSmallB2(w)
+  w.borderwidth $text_normal2['border']
+end
+def textWinBigH2(w)
+  w.highlightthickness 15
+end
+def textWinSmallH2(w)
+  w.highlightthickness $text_normal2['highlight']
+end
+def textWinBigP2(w)
+  w.configure(:padx=>15, :pady=>15)
+end
+def textWinSmallP2(w)
+  w.configure(:padx=>$text_normal2['pad'], :pady=>$text_normal2['pad'])
+end
+
+def textWindOn2 (w,f)
+  if defined? $twind2_scroll
+    begin
+      $twind2_scroll.destroy
+    rescue
+    end
+    $twind2_scroll = nil
+  end
+
+  base = TkWinfo.parent( TkWinfo.parent(w) )
+  $twind2_scroll = TkScrollbar.new(base) {|s|
+    orient 'horizontal'
+    command proc{|*args| w.xview(*args)}
+    w.xscrollcommand proc{|first,last| s.set first,last}
+    w.wrap 'none'
+    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
+  }
+
+  return nil
+end
+
+def textWindOff2 (w)
+  if defined? $twind2_scroll
+    begin
+      $twind2_scroll.destroy
+    rescue
+    end
+    $twind2_scroll = nil
+  end
+  w.xscrollcommand ''
+  #w.wrap 'word'
+  w.wrap 'char'
+end
+
+def textWindPlot2 (t)
+  if (defined? $twind2_plot) && (TkWinfo.exist?($twind2_plot))
+    return
+  end
+
+  $twind2_plot = TkCanvas.new(t) {
+    relief 'sunken'
+    width  450
+    height 300
+    cursor 'top_left_arrow'
+  }
+
+  #font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+  font = 'Helvetica 18'
+
+  TkcLine.new($twind2_plot, 100, 250, 400, 250, 'width'=>2)
+  TkcLine.new($twind2_plot, 100, 250, 100,  50, 'width'=>2)
+  TkcText.new($twind2_plot, 225, 20, 
+              'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
+
+  (0..10).each {|i|
+    x = 100 + (i * 30)
+    TkcLine.new($twind2_plot, x, 250, x, 245, 'width'=>2)
+    TkcText.new($twind2_plot, x, 254, 
+                'text'=>10*i, 'font'=>font, 'anchor'=>'n')
+  }
+  (0..5).each {|i|
+    y = 250 - (i * 40)
+    TkcLine.new($twind2_plot, 100, y, 105, y, 'width'=>2)
+    TkcText.new($twind2_plot, 96, y, 
+                'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
+  }
+
+  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
+    x = 100 + (3*xx)
+    y = 250 - (4*yy)/5
+    item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6, 
+                       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
+    item.addtag 'point'
+  end
+
+  $twind2_plot.itembind('point', 'Any-Enter', 
+                        proc{$twind2_plot.itemconfigure 'current', 'fill', 'red'})
+  $twind2_plot.itembind('point', 'Any-Leave', 
+                        proc{$twind2_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
+  $twind2_plot.itembind('point', '1', 
+                        proc{|x,y| embPlotDown2 $twind2_plot,x,y}, "%x %y")
+  $twind2_plot.itembind('point', 'ButtonRelease-1', 
+                        proc{$twind2_plot.dtag 'selected'})
+  $twind2_plot.bind('B1-Motion', 
+                    proc{|x,y| embPlotMove2 $twind2_plot,x,y}, "%x %y")
+  while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
+    $twind2_text.delete $mark2_plot
+  end
+  $twind2_text.insert $mark2_plot,"\n"
+  TkTextWindow.new($twind2_text, $mark2_plot, 'window'=>$twind2_plot)
+  $tag2_center.add $mark2_plot
+  $twind2_text.insert $mark2_plot,"\n"
+end
+
+$embPlot2 = {'lastX'=>0, 'lastY'=>0}
+
+def embPlotDown2 (w, x, y)
+  w.dtag 'selected'
+  w.addtag_withtag 'selected', 'current'
+  w.raise 'current'
+  $embPlot2['lastX'] = x
+  $embPlot2['lastY'] = y
+end
+
+def embPlotMove2 (w, x, y)
+  w.move 'selected', x - $embPlot2['lastX'], y - $embPlot2['lastY']
+  $embPlot2['lastX'] = x
+  $embPlot2['lastY'] = y
+end
+
+def textWindDel2 (w)
+  if (defined? $twind2_text) && TkWinfo.exist?($twind2_plot)
+    $twind2_text.delete $twind2_plot
+    $twind2_plot = nil
+    while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
+      $twind2_text.delete $mark2_plot
+    end
+    $twind2_text.insert $mark2_plot,"  "
+  end
+end
+
+def embDefBg2 (w)
+  w['background'] = w.configinfo('background')[3]
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/unicodeout.rb b/ruby_1_8_6/ext/tk/sample/demos-en/unicodeout.rb
new file mode 100644
index 0000000000..07e3bf52b5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/unicodeout.rb
@@ -0,0 +1,112 @@
+# unicodeout.rb --
+#
+# This demonstration script shows how you can produce output (in label
+# widgets) using many different alphabets.
+#
+# based on Tcl/Tk8.4.4 widget demos
+
+if defined?($unicodeout_demo) && $unicodeout_demo
+  $unicodeout_demo.destroy 
+  $unicodeout_demo = nil
+end
+
+$unicodeout_demo = TkToplevel.new {|w|
+  title("Unicode Label Demonstration")
+  iconname("unicodeout")
+  positionWindow(w)
+}
+
+TkLabel.new($unicodeout_demo, 
+            :font=>$font, :wraplength=>'5.4i', :justify=>:left, 
+            :text=><<EOL).pack(:side=>:top)
+This is a sample of Tk's support for languages that use non-Western \
+character sets.  However, what you will actually see below depends \
+largely on what character sets you have installed, and what you see \
+for characters that are not present varies greatly between platforms as well. \
+Please try to click the 'See Code' button, \
+and click the 'Rerun Demo' button after editing \
+(the source file is not changed) \
+the definition of @@font on the Unicodeout_SampleFrame class.
+The strings are written in Tcl using UNICODE characters \
+using the \\uXXXX escape so as to do so in a portable fashion.
+
+ATTENTION: 
+The strings are converted to the encoded string objects \
+(completed to rewrite Tcl's escapes) by Tk::UTF8_String method. \
+And the Tk::UTF8_String objects are passed to the label widgets. 
+EOL
+
+TkFrame.new($unicodeout_demo){|f|
+  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
+
+  TkButton.new(f, :text=>'Dismiss', :width=>15, :command=>proc{
+                 $unicodeout_demo.destroy
+                 $unicodeout_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'See Code', :width=>15, :command=>proc{
+                 showCode 'unicodeout'
+               }).pack(:side=>:left, :expand=>true)
+}
+
+wait_msg = TkLabel.new($unicodeout_demo, 
+                       :text=>"Please wait while loading fonts...", 
+                       :font=>"Helvetica 12 italic").pack
+
+class Unicodeout_SampleFrame < TkFrame
+  @@font = $font
+  # @@font = 'Helvetica 14'
+  # @@font = 'Courier 12'
+  # @@font = 'clearlyu 16'
+  # @@font = 'fixed 12'
+  # @@font = 'Times 12'
+  # @@font = 'Newspaper 12'
+  # @@font = '{New century schoolbook} 12'
+
+  def initialize()
+    super($unicodeout_demo)
+    grid_columnconfig(1, :weight=>1)
+  end
+
+  def add_sample(lang, *args)
+    sample_txt = Tk::UTF8_String(args.join(''))
+    l = TkLabel.new(self, :font=>@@font, :text=>lang+':', 
+                    :anchor=>:nw, :pady=>0)
+    #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt, 
+    s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt, 
+                    :anchor=>:nw, :width=>30, :pady=>0)
+    Tk.grid(l, s, :sticky=>:ew, :pady=>0)
+    l.grid_config(:padx, '1m')
+  end
+end
+f = Unicodeout_SampleFrame.new
+f.pack(:expand=>true, :fill=>:both, :padx=>'2m', :pady=>'1m')
+
+# Processing when some characters are missing might take a while, so make
+# sure we're displaying something in the meantime...
+
+oldCursor = $unicodeout_demo.cursor
+$unicodeout_demo.cursor('watch')
+Tk.update
+
+f.add_sample('Arabic', 
+             '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94', 
+             '\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
+f.add_sample('Trad. Chinese', '\u4E2D\u570B\u7684\u6F22\u5B57')
+f.add_sample('Simpl. Chinese', '\u6C49\u8BED')
+f.add_sample('Greek', 
+             '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ', 
+             '\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1')
+f.add_sample('Hebrew', 
+             '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ', 
+             '\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9')
+f.add_sample('Japanese', 
+             '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ', 
+             '\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA')
+f.add_sample('Korean', '\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00')
+f.add_sample('Russian', 
+             '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ', 
+             '\u044F\u0437\u044B\u043A')
+
+wait_msg.destroy
+$unicodeout_demo.cursor(oldCursor)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/vscale.rb b/ruby_1_8_6/ext/tk/sample/demos-en/vscale.rb
new file mode 100644
index 0000000000..636b85813b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/vscale.rb
@@ -0,0 +1,78 @@
+# vscale.rb
+#
+# This demonstration script shows an example with a vertical scale.
+
+require "tkcanvas"
+
+if defined?($vscale_demo) && $vscale_demo
+  $vscale_demo.destroy
+  $vscale_demo = nil
+end
+
+$vscale_demo = TkToplevel.new {|w|
+  title("Vertical Scale Demonstration")
+  iconname("vscale")
+}
+positionWindow($vscale_demo)
+
+msg = TkLabel.new($vscale_demo) {
+  font $font
+  wraplength '3.5i'
+  justify 'left'
+  text "An arrow and a vertical scale are displayed below.  If you click or drag mouse button 1 in the scale, you can change the size of the arrow."
+}
+msg.pack('side'=>'top', 'padx'=>'.5c')
+
+TkFrame.new($vscale_demo) {|frame|
+  TkButton.new(frame) {
+    text 'Dismiss'
+    command proc {
+      tmppath = $vscale_demo
+      $vscale_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'Show Code'
+    command proc { showCode 'vscale' }
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+TkFrame.new($vscale_demo) {|frame|
+  borderwidth 10
+  canvas = TkCanvas.new(frame) {|c|
+    width 50
+    height 50
+    bd 0
+    highlightthickness 0
+    TkcPolygon.new(c, 0, 0, 1, 1, 2, 2) {
+      fill 'SeaGreen3'
+      tags 'poly'
+    }
+    TkcLine.new(c, 0, 0, 1, 1, 2, 2, 0, 0) {
+      fill 'black'
+      tags 'line'
+    }
+  }.pack('side'=>'left',  'anchor'=>'nw', 'fill'=>'y')
+  scale = TkScale.new(frame) {
+    orient 'vertical'
+    length 284
+    from 0
+    to 250
+    command proc{|value| setHeight(canvas, value)}
+    tickinterval 50
+  }.pack('side'=>'left', 'anchor'=>'ne')
+  scale.set 75
+}.pack
+
+
+def setHeight(w, height)
+  height = height + 21
+  y2 = height - 30
+  if y2 < 21
+    y2 = 21
+  end
+  w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
+  w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-en/widget b/ruby_1_8_6/ext/tk/sample/demos-en/widget
new file mode 100644
index 0000000000..3c50582211
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-en/widget
@@ -0,0 +1,944 @@
+#!/usr/bin/env ruby
+
+# widget --
+# This script demonstrates the various widgets provided by Tk,
+# along with many of the features of the Tk toolkit.  This file
+# only contains code to generate the main window for the
+# application, which invokes individual demonstrations.  The
+# code for the actual demonstrations is contained in separate
+# ".rb" files is this directory, which are sourced by this script
+# as needed.
+
+require 'tk'
+# require 'tkafter'
+
+### $DEBUG=1 ##########
+
+#----------------------------------------------------------------
+# The code below create the main window, consisting of a menu bar
+# and a text widget that explains how to use the program, plus lists
+# all of the demos as hypertext items.
+#----------------------------------------------------------------
+
+# widget demo directory
+$demo_dir = File.dirname($0)
+
+# root 
+$root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
+
+# tk 
+$tk_version = Tk::TK_VERSION
+$tk_major_ver, $tk_minor_ver = $tk_version.split('.').map{|n| n.to_i}
+$tk_patchlevel = Tk::TK_PATCHLEVEL
+
+# tcl_platform 
+$tk_platform = TkVarAccess.new('tcl_platform')
+
+#
+case($tk_version)
+when /^4.*/
+  $font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
+else
+  $font = TkFont.new('Helvetica -12')
+end
+
+# images
+$image = {}
+
+if $tk_major_ver >= 8
+$image['refresh'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
+    R0lGODlhEAAQAPMAAMz/zCpnKdb/1z9mPypbKBtLGy9NMPL/9Or+6+P+4j1Y
+    PwQKBP7//xMLFAYBCAEBASH5BAEAAAAALAAAAAAQABAAAwR0EAD3Gn0Vyw0e
+    ++CncU7IIAezMA/nhUqSLJizvSdCEEjy2ZIV46AwDAoDHwPYGSoEiUJAAGJ6
+    EDHBNCFINW5OqABKSFk/B9lUa94IDwIFgewFMwQDQwCZQCztTgM9Sl8SOEMG
+    KSAthiaOjBMPDhQONBiXABEAOw==
+EOD
+end
+
+if $tk_major_ver >= 8
+$image['view'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
+    R0lGODlhEAAQAPMAAMz/zP///8DAwICAgH9/fwAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAwRIcMhJB7h3hM33
+    KFjWdQQYap1QrCaGBmrRrS4nj5b53jOgbwXBKGACoYLDIuAoHCmZyYvR1rT5
+    RMAq8LqcIYGsrjPsW1XOmFUEADs=
+EOD
+end
+
+if $tk_major_ver >= 8
+$image['delete'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
+    R0lGODlhEAAOAKEAAIQAAO/n3v///////yH5BAEKAAIALAAAAAAQAA4AAAIm
+    lI9pAKHbIHNoVhYhTdjlJ2AWKG2g+CldmB6rxo2uybYhbS80eRQAOw==
+EOD
+end
+
+if $tk_major_ver >= 8
+$image['print'] = TkPhotoImage.new(:height=>19, :format=>'GIF', :data=><<EOD)
+    R0lGODlhGgATAPcAACEQOTEpQjEpUkIpc0IxY0I5c0oxjEo5SlJCY1JCe1JK
+    UlpChFpCjFpGkFpSc1paa2NKc2NKnGNja2tapWtjc29KnHNanHNjc3NjrXNr
+    jHNrnHNzc3tjpXtrtXtzhICAgIRzvYSEjIZzqox7tYyEnIyMjJSEtZSEvZSM
+    lJyMtZyMvZyUlJyUrZyUvZycnKWctaWlpa2czq2lzrWtvbWtzrW1tb21xr21
+    1sa9zs693s7OztbO3tbO597W1t7W7+fe7+fn5////+/n7+/v7+/v9////wAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAACH5BAEAAEEALAAAAAAaABMAQAj/AIMIHBhkg0GC
+    CBMGIQEiQgseQT4oeCBBAokgRYYQ0JBixg8hRIiUUEBBYYmTByBwiCBCRYwH
+    CxY8cKFw4AogRXLqLAJkQ80gCBBg3BkxZswTNGh4MGqgQQUMJRHCwMkTSE+D
+    Pn8eCKBhxIMhO3ei2OHDBw6sWSlMMMoWgwwfMDZI8GBjx44NARZwEGGi5MkS
+    PcIWKRGz5YgLbAco+KkQBQoJIRgjdGEVq+SaJajqtNrzMgsPCmoIzqmDgmWE
+    KOBuUKAAwYabYTfs4OHjY0giGyhk4MAWRI4eKyRQqPgggYUXPH4A+XBAgwoK
+    DiIsCFxjA9sFEVQQCRJCAYAFDJxiKhAxvMTonEFimrhhYinTBgWiCvxLNX3M
+    DkkpsKV5OYhjBxCMYAICAigUEAA7
+EOD
+end
+
+# 
+TkMenubar.new($root, 
+              [[['File', 0], 
+                  ['About ... ', proc{aboutBox}, 0, '<F1>'],
+                  '---', 
+                  ['Quit', proc{exit}, 0, 'Meta-Q']
+                ]]).pack('side'=>'top', 'fill'=>'x')
+$root.bind('F1', proc{aboutBox})
+$root.bind('Meta-q', proc{exit})
+
+=begin
+TkFrame.new($root){|frame|
+  TkMenubutton.new(frame){|button|
+    m = TkMenu.new(button) {
+      add 'command', 'label'=>'Quit', 'command'=>proc{exit}, 'underline'=>0
+    }
+    menu m
+    text 'File'
+    underline 0
+  }.pack('side'=>'left')
+}.pack('side'=>'top', 'fill'=>'x')
+=end
+
+# 
+if $tk_version =~ /^4\.[01]/
+  scr = TkScrollbar.new($root, 'orient'=>'vertical')
+  txt = TkText.new($root) {
+    wrap 'word'
+    width 70
+    height 30
+    font $font
+    setgrid 'yes'
+    yscrollcommand proc{|first,last| scr.set first,last}
+  }
+  scr.command(proc{|*args| txt.yview(*args)})
+  scr.pack('side'=>'right', 'fill'=>'y')
+  txt.pack('expand'=>'yes', 'fill'=>'both')
+else
+  textFrame = TkFrame.new($root)
+  scr = TkScrollbar.new($root, 'orient'=>'vertical', 
+                        'highlightthickness'=>0, 'takefocus'=>1) {
+    pack('in'=>textFrame, 'side'=>'right', 'fill'=>'y', 'padx'=>1)
+  }
+  txt = TkText.new($root) {
+    wrap 'word'
+    width 70
+    height 30
+    font $font
+    setgrid 'yes'
+    highlightthickness 0
+    padx 4
+    pady 2
+    takefocus 0
+    bd 1
+    yscrollcommand proc{|first,last| scr.set first,last}
+  }
+  scr.command(proc{|*args| txt.yview(*args)})
+#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both', 'padx'=>1)
+  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
+#  textFrame.pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>2)
+  textFrame.pack('expand'=>'yes', 'fill'=>'both')
+
+  statusBar = TkFrame.new($root) {|f|
+    $statusBarLabel = \
+    TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
+                'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
+        .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
+    TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
+                'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
+        .pack('side'=>'left', 'padx'=>2)
+  }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
+end
+
+# Create a bunch of tags to use in the text widget, such as those for
+# section titles and demo descriptions.  Also define the bindings for
+# tags.
+  
+tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
+
+# We put some "space" characters to the left and right of each demo description
+# so that the descriptions are highlighted only when the mouse cursor
+# is right over them (but not when the cursor is to their left or right)
+
+tag_demospace = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c')
+
+if TkWinfo.depth($root) == 1
+  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
+                           'underline'=>1)
+  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
+                              'underline'=>1)
+  tag_hot = TkTextTag.new(txt, 'background'=>'black', 'foreground'=>'white')
+else
+  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
+                           'foreground'=>'blue', 'underline'=>1)
+  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
+                              'foreground'=>'#303080', 'underline'=>1)
+#  tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1, 
+#                         'background'=>'SeaGreen3')
+  tag_hot = TkTextTag.new(txt, 'borderwidth'=>1, 'foreground'=>'red')
+end
+
+#tag_demo.bind('Button-1', proc{invoke txt, txt.index('current')})
+tag_demo.bind('ButtonRelease-1', 
+              proc{|x,y|invoke txt, txt.index("@#{x},#{y}")}, '%x %y')
+
+lastLine = TkVariable.new("")
+newLine  = TkVariable.new("")
+tag_demo.bind('Enter', proc{|x,y|
+                lastLine.value = txt.index("@#{x},#{y} linestart")
+                tag_hot.add(lastLine.value, "#{lastLine.value} lineend")
+                showStatus txt, txt.index("@#{x},#{y}")
+              },
+              '%x %y')
+tag_demo.bind('Leave', 
+              proc{
+                tag_hot.remove('1.0','end')
+                txt.configure('cursor','xterm')
+                $statusBarLabel.configure('text'=>"")
+              })
+tag_demo.bind('Motion', proc{|x, y|
+                newLine.value = txt.index("@#{x},#{y} linestart")
+                if newLine.value != lastLine.value
+                  tag_hot.remove('1.0','end')
+                  lastLine.value = newLine.value
+                  if ( txt.tag_names("@#{x},#{y}").find{|t| 
+                        t.kind_of?(String) && t =~ /^demo-/
+                      } )
+                    tag_hot.add(lastLine.value, 
+                                "#{lastLine.value} lineend -1 chars")
+                  end
+                end
+                showStatus txt, txt.index("@#{x},#{y}")
+              },
+              '%x %y')
+
+# Create the text for the text widget.
+
+txt.insert('end', "Ruby/Tk Widget Demonstrations\n\n", tag_title)
+txt.insert('end', <<EOT)
+This application provides a front end for several short scripts that \
+demonstrate what you can do with Tk widgets.  Each of the numbered \
+lines below describes a demonstration;  you can click on it to invoke \
+the demonstration.  Once the demonstration window appears, you can \
+click the "See Code" button to see the Ruby/Tk code that created the \
+demonstration.  If you wish, you can edit the code and click the \
+"Rerun Demo" button in the code window to reinvoke the demonstration \
+with the modified code.
+
+Some demo scripts require the recent version of Tk library \
+(e.g. Tk8.4 or later) \
+If your Tk library linked to Ruby doesn't support the functions \
+required by the demo script, the demo doesn't work. \
+In such a case, please re-compile tcltklib with the later Tk library \
+which supports the required functions.
+
+
+EOT
+
+txt.insert('end', "Labels, buttons, checkbuttons, and radiobuttons.\n", tag_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. Labels (text and bitmaps).\n", tag_demo, "demo-label")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. Labels and UNICODE text. (if supported)\n", tag_demo, "demo-unicodeout")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. Buttons.\n", tag_demo, "demo-button")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. Checkbuttons (select any of a group).\n", tag_demo, "demo-check")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "5. Checkbuttons (if supported).\n", tag_demo, "demo-check2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "6. Radiobuttons (select one of a group).\n", tag_demo, "demo-radio")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "7. Radiobuttons (if supported 'compound' option).\n", tag_demo, "demo-radio2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "8. Radiobuttons (if supported).\n", tag_demo, "demo-radio3")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "9. A 15-puzzle game made out of buttons.\n", tag_demo, "demo-puzzle")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "10. Iconic buttons that use bitmaps.\n", tag_demo, "demo-icon")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "11. Two labels displaying images.\n", tag_demo, "demo-image1")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "12. A simple user interface for viewing images.\n", tag_demo, "demo-image2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "13. A simple user interface for viewing images. (if supported)\n", tag_demo, "demo-image3")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "14. Labelled frames (if supported)\n", tag_demo, "demo-labelframe")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+txt.insert('end', "Listboxes\n", tag_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. 50 states.\n", tag_demo, "demo-states")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. Colors: change the color scheme for the application.\n", "#{tag_demo.id} demo-colors")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. A collection of famous sayings.\n", tag_demo, "demo-sayings")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+txt.insert('end', "Entries and Spin-boxes\n", tag_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. Without scrollbars.\n", tag_demo, "demo-entry1")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. With scrollbars.\n", tag_demo, "demo-entry2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', 
+           "3. Validated entries and password fields. (if supported)\n", 
+           tag_demo, "demo-entry3")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. Spin-boxes. (if supported)\n", tag_demo, "demo-spin")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "5. Simple Rolodex-like form.\n", tag_demo, "demo-form")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+txt.insert('end', "Text\n", tag_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. Basic editable text.\n", tag_demo, "demo-text")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. Text display styles.\n", tag_demo, "demo-style")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. Hypertext (tag bindings).\n", tag_demo, "demo-bind")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. A text widget with embedded windows.\n", tag_demo, "demo-twind")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "5. A text widget with embedded windows. (if supported)\n", tag_demo, "demo-twind2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "6. A search tool built with a text widget.\n", tag_demo, "demo-search")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+txt.insert('end', "Canvases\n", tag_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. The canvas item types.\n", tag_demo, "demo-items")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. A simple 2-D plot.\n", tag_demo, "demo-plot")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. Text items in canvases.\n", tag_demo, "demo-ctext")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. An editor for arrowheads on canvas lines.\n", tag_demo, "demo-arrow")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "5. A ruler with adjustable tab stops.\n", tag_demo, "demo-ruler")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "6. A building floor plan.\n", tag_demo, "demo-floor")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "7. A building floor plan. (another way to create canvas items)\n", tag_demo, "demo-floor2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "8. A simple scrollable canvas.\n", tag_demo, "demo-cscroll")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+txt.insert('end', "Scales\n", tag_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. Vertical scale.\n", tag_demo.id, "demo-vscale")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. Horizontal scale.\n", tag_demo.id, "demo-hscale")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+txt.insert('end', "Paned Windows\n", tag_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. Horizontal paned window. (if supported)\n", tag_demo.id, "demo-paned1")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. Vertical paned window. (if supported)\n", tag_demo.id, "demo-paned2")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+txt.insert('end', "Menus\n", tag_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. Menus and cascades.\n", tag_demo, "demo-menu")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. Menus and cascades. (if supported)\n", tag_demo, "demo-menu84")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. Menubuttons\n", tag_demo, "demo-menubu")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+txt.insert('end', "Common Dialogs\n", tag_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. Message boxes.\n", tag_demo, "demo-msgbox")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. File selection dialog.\n", tag_demo, "demo-filebox")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. Color picker.\n", tag_demo, "demo-clrpick")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+txt.insert('end', "Animation\n", tag_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. Animated labels (if supported)\n", tag_demo, "demo-anilabel")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. Animated wave (if supported)\n", tag_demo, "demo-aniwave")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. Pendulum simulation (if supported)\n", tag_demo, "demo-pendulum")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. A celebration of Rube Goldberg (if supported)\n", tag_demo, "demo-goldberg")
+
+txt.insert('end', "\n")
+txt.insert('end', "Miscellaneous\n", tag_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. The built-in bitmaps.\n", tag_demo, "demo-bitmap")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. A dialog box with a local grab.\n", tag_demo, "demo-dialog1")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. A dialog box with a global grab.\n", tag_demo, "demo-dialog2")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.state('disabled')
+scr.focus
+
+# positionWindow --
+# This procedure is invoked by most of the demos to position a
+# new demo window.
+#
+# Arguments:
+# w -           The name of the window to position.
+
+def positionWindow(w)
+  w.geometry('+300+300')
+end
+
+# showVars --
+# Displays the values of one or more variables in a window, and
+# updates the display whenever any of the variables changes.
+#
+# Arguments:
+# w -           Name of new window to create for display.
+# args -        Any number of names of variables.
+
+$showVarsWin = {}
+def showVars1(parent, *args)
+  if $showVarsWin[parent.path]
+    begin
+      $showVarsWin[parent.path].destroy 
+    rescue
+    end
+  end
+  w = TkToplevel.new(parent) {|w|
+    title "Variable values"
+    TkLabel.new(w) {
+      text "Variable values:"
+      width 20
+      anchor 'center'
+      font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
+    }.pack('side'=>'top', 'fill'=>'x')
+    len = 1
+    args.each{|vnam,vbody|
+      len = vnam.to_s.length if vnam.to_s.length > len
+    }
+    args.each{|vnam,vbody|
+      TkFrame.new(w){|f|
+        #TkLabel.new(f, 'text'=>"#{vnam}: ").pack('side'=>'left')
+        TkLabel.new(f, 'text'=>"#{vnam}: ",'width'=>len+2).pack('side'=>'left')
+        TkLabel.new(f, 'textvariable'=>vbody, 'anchor'=>'w')\
+                   .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
+      }.pack('side'=>'top', 'anchor'=>'w', 'fill'=>'x')
+    }
+    TkButton.new(w) {
+      text "OK"
+      command proc{w.destroy}
+    }.pack('side'=>'bottom', 'pady'=>2)
+  }
+  $showVarsWin[parent.path] = w
+end
+
+def showVars2(parent, *args)
+  if $showVarsWin[parent.path]
+    begin
+      $showVarsWin[parent.path].destroy 
+    rescue
+    end
+  end
+  $showVarsWin[parent.path] = TkToplevel.new(parent) {|w|
+    title "Variable values"
+
+    TkLabelFrame.new(w, :text=>"Variable values:", 
+                     :font=>{:family=>'Helvetica', :size=>14}){|f|
+      args.each{|vnam,vbody|
+        TkGrid(TkLabel.new(f, :text=>"#{vnam}: ", :anchor=>'w'), 
+               TkLabel.new(f, :textvariable=>vbody, :anchor=>'w'), 
+               :padx=>2, :pady=>2, :sticky=>'w')
+      }
+
+      f.grid(:sticky=>'news', :padx=>4)
+      f.grid_columnconfig(1, :weight=>1)
+      f.grid_rowconfig(100, :weight=>1)
+    }
+    TkButton.new(w, :text=>"OK", :width=>8, :default=>:active, 
+                 :command=>proc{w.destroy}){|b|
+      w.bind('Return', proc{b.invoke})
+      w.bind('Escape', proc{b.invoke})
+
+      b.grid(:sticky=>'e', :padx=>4, :pady=>[6, 4])
+    }
+    w.grid_columnconfig(0, :weight=>1)
+    w.grid_rowconfig(0, :weight=>1)
+  }
+end
+
+if $tk_major_ver < 8
+  alias showVars showVars1
+elsif $tk_major_ver == 8 && $tk_minor_ver < 4
+  alias showVars showVars1
+else # ver >= 8.4
+  alias showVars showVars2
+end
+
+# Pseudo-Toplevel support
+module PseudoToplevel_Evaluable
+  def pseudo_toplevel_eval(body = Proc.new)
+    Thread.current[:TOPLEVEL] = self
+    begin
+      body.call
+    ensure
+      Thread.current[:TOPLEVEL] = nil
+    end
+  end
+
+  def pseudo_toplevel_evaluable?
+    @pseudo_toplevel_evaluable
+  end
+  def pseudo_toplevel_evaluable=(mode)
+    @pseudo_toplevel_evaluable = (mode)? true: false
+  end
+
+  def self.extended(mod)
+    mod.__send__(:extend_object, mod)
+    mod.instance_variable_set('@pseudo_toplevel_evaluable', true)
+  end
+end
+
+class Object
+  alias __method_missing__ method_missing
+  private :__method_missing__
+
+  def method_missing(id, *args)
+    begin
+      has_top = (top = Thread.current[:TOPLEVEL]) && 
+                   top.respond_to?(:pseudo_toplevel_evaluable?) && 
+                   top.pseudo_toplevel_evaluable? && 
+                   top.respond_to?(id)
+    rescue Exception => e
+      has_top = false
+    end
+
+    if has_top
+      top.__send__(id, *args)
+    else
+      __method_missing__(id, *args)
+    end
+  end
+end
+
+class Proc
+  def initialize(*args, &b)
+    super
+    @__pseudo_toplevel__ = Thread.current[:TOPLEVEL]
+  end
+
+  alias __call__ call
+  def call(*args, &b)
+    if top = @__pseudo_toplevel__
+      orig_top = Thread.current[:TOPLEVEL]
+      Thread.current[:TOPLEVEL] = top
+      begin
+        __call__(*args, &b)
+      ensure
+        Thread.current[:TOPLEVEL] = orig_top
+      end
+    else
+      __call__(*args, &b)
+    end
+  end
+end
+
+def proc(&b)
+  Proc.new(&b)
+end
+def lambda(&b)
+  Proc.new(&b)
+end
+
+def _null_binding
+  Module.new.instance_eval{extend PseudoToplevel_Evaluable}
+  # binding
+  # Module.new.instance_eval{binding}
+end
+private :_null_binding
+
+def eval_samplecode(code)
+  Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }.run
+  Tk.update
+end
+
+# invoke --
+# This procedure is called when the user clicks on a demo description.
+# It is responsible for invoking the demonstration.
+#
+# Arguments:
+# txt -         Name of text widget
+# index -       The index of the character that the user clicked on.
+def invoke(txt, idx)
+  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
+  return unless tag
+
+  cursor = txt.cget('cursor')
+  txt.cursor('watch')
+  Tk.update
+  # eval(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, _null_binding)
+  # Tk.update
+  eval_samplecode(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join)
+  txt.cursor(cursor)
+
+  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
+end
+=begin
+def invoke (txt, idx)
+  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
+  return unless tag
+  current_cursor = txt.cget('cursor')
+  txt.cursor('watch')
+  Tk.update
+#  eval `cat #{tag[5..-1]}.rb`
+#  eval `cat #{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb`
+  eval IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join
+  Tk.update
+#  txt.cursor('xterm')
+  txt.cursor(current_cursor)
+
+  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
+end
+=end
+# showStatus --
+#
+#       Show the name of the demo program in the status bar. This procedure
+#       is called when the user moves the cursor over a demo description.
+#
+
+def showStatus (txt, index)
+  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
+  cursor = txt.cget('cursor')
+  unless tag
+    $statusBarLabel.configure('text', " ")
+    newcursor = 'xterm'
+  else
+    demoname = tag[5..-1]
+    $statusBarLabel.configure('text', 
+                             "Run the \"#{demoname}\" sample program")
+    newcursor = 'hand2'
+  end
+  txt.configure('cursor'=>newcursor) if cursor != newcursor
+end
+
+# showCode --
+# This procedure creates a toplevel window that displays the code for
+# a demonstration and allows it to be edited and reinvoked.
+#
+# Arguments:
+# demo -        The name of the demonstration's window, which can be
+#               used to derive the name of the file containing its code.
+
+def showCode1(demo)
+  file = "#{demo}.rb"
+  $code_window = nil unless defined? $code_window
+  if $code_window == nil || TkWinfo.exist?($code_window) == false
+    $code_window = TkToplevel.new(nil)
+    f = TkFrame.new($code_window)
+    TkButton.new(f) {
+      text "Dismiss"
+      command proc{
+        $code_window.destroy
+        $code_window = nil
+      }
+    }.pack('side'=>'left', 'expand'=>'yes', 'pady'=>2)
+    TkButton.new(f) {
+      text "Rerun Demo"
+      # command proc{eval($code_text.get('1.0','end'), _null_binding)}
+      command proc{eval_samplecode($code_text.get('1.0','end'))}
+    }.pack('side'=>'left', 'expand'=>'yes', 'pady'=>2)
+#    f.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x')
+    f.pack('side'=>'bottom', 'fill'=>'x')
+
+    if $tk_version =~ /^4\.[01]/
+      s = TkScrollbar.new($code_window, 'orient'=>'vertical')
+      $code_text = TkText.new($code_window) {
+        height 40
+        setgrid 'yes'
+        yscrollcommand proc{|first,last| s.set first,last}
+      }
+      s.command(proc{|*args| $code_text.yview(*args)})
+      s.pack('side'=>'right', 'fill'=>'y')
+      $code_text.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
+    else
+      TkFrame.new($code_window) {|f|
+        pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
+
+        hs = TkScrollbar.new($code_window, 'highlightthickness'=>0, 
+                             'orient'=>'horizontal')
+        vs = TkScrollbar.new($code_window, 'highlightthickness'=>0, 
+                             'orient'=>'vertical')
+        $code_text = TkText.new($code_window) {|t|
+          height 40
+          wrap 'word'
+          xscrollcommand proc{|first,last| hs.set first,last}
+          yscrollcommand proc{|first,last| vs.set first,last}
+          setgrid 'yes'
+          highlightthickness 0
+          pady 2
+          padx 3
+          hs.command(proc{|*args| $code_text.xview(*args)})
+          vs.command(proc{|*args| $code_text.yview(*args)})
+        }
+
+        $code_text.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+                        'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+        vs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+                'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+#       xs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+#               'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+
+# JKC 2001-07-26: segfaults under 1.7.1 (2001-06-19) [i686-linux]
+        TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+        TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+      }
+    end
+  else
+    $code_window.deiconify
+    $code_window.raise
+  end
+  $code_window.title("Demo code: #{file}")
+  $code_window.iconname(file)
+#  fid = open(file, 'r')
+  fid = open([$demo_dir, file].join(File::Separator), 'r')
+  $code_text.delete('1.0', 'end')
+  #$code_text.insert('1.0', `cat #{file}`)
+  $code_text.insert('1.0', fid.read)
+  #$code_mark = TkTextMark.new($code_text, '1.0')
+  #$code_text.set_insert('1.0')
+  TkTextMarkInsert.new($code_text,'1.0')
+  fid.close
+end
+
+def showCode2(demo)
+  file = "#{demo}.rb"
+  $code_window = nil unless defined? $code_window
+  if $code_window == nil || TkWinfo.exist?($code_window) == false
+    $code_window = TkToplevel.new(nil)
+    tf = TkFrame.new($code_window)
+    $code_text = TkText.new(tf, :font=>'Courier 10', :height=>30, 
+                            :wrap=>'word', :bd=>1, :setgrid=>true, 
+                            :highlightthickness=>0, :pady=>2, :padx=>3)
+    xscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
+    yscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
+    TkGrid($code_text, yscr, :sticky=>'news')
+    #TkGrid(xscr)
+    tf.grid_rowconfigure(0, :weight=>1)
+    tf.grid_columnconfigure(0, :weight=>1)
+
+    bf = TkFrame.new($code_window)
+    
+    b_dis = TkButton.new(bf, :text=>'Dismiss', :default=>:active, 
+                         :command=>proc{
+                           $code_window.destroy
+                           $code_window = nil
+                         }, 
+                         :image=>$image['delete'], :compound=>:left)
+    b_prn = TkButton.new(bf, :text=>'Print Code', 
+                         :command=>proc{printCode($code_text, file)}, 
+                         :image=>$image['print'], :compound=>:left)
+    b_run = TkButton.new(bf, :text=>'Rerun Demo', 
+                         :command=>proc{
+                           # eval($code_text.get('1.0','end'), _null_binding)
+                           eval_samplecode($code_text.get('1.0','end'))
+                         }, 
+                         :image=>$image['refresh'], :compound=>:left)
+
+    TkGrid('x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
+    bf.grid_columnconfigure(0, :weight=>1)
+
+    TkGrid(tf, :sticky=>'news')
+    TkGrid(bf, :sticky=>'ew')
+    $code_window.grid_columnconfigure(0, :weight=>1)
+    $code_window.grid_rowconfigure(0, :weight=>1)
+
+    $code_window.bind('Return', proc{|win|
+                        b_dis.invoke unless win.kind_of?(TkText)
+                      }, '%W')
+    $code_window.bindinfo('Return').each{|cmd, arg|
+      $code_window.bind_append('Escape', cmd, arg)
+    }
+  else
+    $code_window.deiconify
+    $code_window.raise
+  end
+
+  $code_window.title("Demo code: #{file}")
+  $code_window.iconname(file)
+  fid = open([$demo_dir, file].join(File::Separator), 'r')
+  $code_text.delete('1.0', 'end')
+  $code_text.insert('1.0', fid.read)
+  TkTextMarkInsert.new($code_text,'1.0')
+  fid.close
+end
+
+if $tk_major_ver < 8
+  alias showCode showCode1
+elsif $tk_major_ver == 8 && $tk_minor_ver < 4
+  alias showCode showCode1
+else # ver >= 8.4
+  alias showCode showCode2
+end
+
+
+# printCode --
+# Prints the source code currently displayed in the See Code dialog.
+# Much thanks to Arjen Markus for this.
+#
+# Arguments:
+# txt -         Name of text widget containing code to print
+# file -        Name of the original file (implicitly for title)
+
+def printCode(txt, file)
+  code = txt.get('1.0', 'end - 1c')
+  dir = '.'
+  dir = ENV['HOME'] if ENV['HOME']
+  dir = ENV['TMP'] if ENV['TMP']
+  dir = ENV['TEMP'] if ENV['TEMP']
+
+  fname = [dir, 'tkdemo-' + file].join(File::Separator)
+  open(fname, 'w'){|fid| fid.print(code)}
+  begin
+    case Tk::TCL_PLATFORM('platform')
+    when 'unix'
+      msg = `lp -c #{fname}`
+      unless $?.exitstatus == 0
+        Tk.messageBox(:title=>'Print spooling failure', 
+                      :message=>'Print spooling probably failed: ' + msg)
+      end
+    when 'windows'
+      begin
+        printTextWin32(fname)
+      rescue => e
+        Tk.messageBox(:title=>'Print spooling failure', 
+                      :message=>'Print spooling probably failed: ' + 
+                      e.message)
+      end      
+    when 'macintosh'
+      Tk.messageBox(:title=>'Operation not Implemented', 
+                    :message=>'Oops, sorry: not implemented yet!')
+    else
+      Tk.messageBox(:title=>'Operation not Implemented', 
+                    :message=>'Wow! Unknown platform: ' + 
+                    Tk::TCL_PLATFORM('platform'))
+    end
+  ensure
+    File.delete(fname)
+  end
+end
+
+# printTextWin32 --
+#    Print a file under Windows
+#
+# Arguments:
+# filename -            Name of the file
+#
+def printTextWin32(fname)
+  require 'win32/registry'
+  begin
+    app = Win32::Registry::HKEY_CLASSES_ROOT['.txt']
+    pcmd = nil
+    Win32::Registry::HKEY_CLASSES_ROOT.open("#{app}\\shell\\print"){|reg|
+      pcmd = reg['command']
+    }
+  rescue
+    app = Tk.tk_call('auto_execok', 'notepad.exe')
+    pcmd = "#{app} /p %1"
+  end
+
+  pcmd.gsub!('%1', fname)
+  puts pcmd
+  cmd = Tk.tk_call('auto_execok', 'start') + ' /min ' + pcmd
+  
+  msg = `#{cmd}`
+  unless $?.exitstatus == 0
+    fail RuntimeError, msg
+  end
+end
+
+# aboutBox
+#
+#      Pops up a message box with an "about" message
+#
+def aboutBox
+  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo', 
+                'message'=>"Ruby/Tk widget demonstration Ver.1.6.0-en\n\n" + 
+                           "based on demos of Tk8.1 -- 8.5  " + 
+                           "( Copyright:: " + 
+                           "(c) 1996-1997 Sun Microsystems, Inc. / " + 
+                           "(c) 1997-2000 Ajuba Solutions, Inc. / " + 
+                           "(c) 2001-2003 Donal K. Fellows )\n\n" +
+                           "Your Ruby & Tk Version ::\n" + 
+                           "Ruby#{RUBY_VERSION}(#{RUBY_RELEASE_DATE})[#{RUBY_PLATFORM}] / Tk#{$tk_patchlevel}#{(Tk::JAPANIZED_TK)? '-jp': ''}\n\n" + 
+                           "Ruby/Tk release date :: tcltklib #{TclTkLib::RELEASE_DATE}; tk #{Tk::RELEASE_DATE}")
+end
+
+#########################################
+# start demos if given at command line
+no_launcher = false
+if ARGV[0] == '-n'
+  ARGV.shift
+  no_launcher = true if ARGV.size > 0
+else
+  # show the root widget to make it lower then demo windows
+  Tk.update
+end
+ARGV.each{|cmd| 
+  if cmd =~ /(.*).rb/
+    cmd = $1
+  end
+  #eval(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join, 
+  #     _null_binding)
+  eval_samplecode(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join)
+}
+if no_launcher
+  $root.withdraw  # hide root window
+  Thread.start{
+    loop do
+      count = 0
+      $root.winfo_children.each{|w|
+        count += 1 if w.kind_of?(TkToplevel)
+      }
+      $root.destroy if count == 0
+    end
+  }
+end
+
+#########################################
+# start eventloop
+Tk.mainloop
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/README b/ruby_1_8_6/ext/tk/sample/demos-jp/README
new file mode 100644
index 0000000000..42bec16c60
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/README
@@ -0,0 +1,54 @@
+
+  Ruby/Tk widget-demo 
+                              version 1.2 ( 2000/04/08 )
+                              永井＠知能．九工大 (nagai@ai.kyutech.ac.jp)
+
+標準配布の Tcl/Tk 拡張パッケージを取り込んだ Ruby (以下 Ruby/Tk と呼びます) 
+では，Tk widget を用いた GUI の作成を行うことができます．実際に GUI を作成
+していく場合には様々な実例がサンプルとして存在すると便利なのですが，Ruby/Tk 
+にはそのような適当なサンプルスクリプト集合は存在しませんでした．それに対し，
+拡張パッケージの元である Tcl/Tk には，Tk widget を用いてどのようなことがで
+きるかを示すものとして widget-demo が存在しおり，Tcl/Tk を用いた GUI の作成
+を習得する際の代表的サンプルとなっています．本アーカイブは，Ruby/Tk の習得の
+ための代表的なサンプルスクリプトとすべく，Tcl/Tk の widget-demo を移植したも
+のです．
+
+今回のバージョンは ruby-1.4.x に対応としておきますが，旧バージョンに比べて，
+ほとんど変更はありません．ruby-1.1c2 以上なら動くと思います．ruby-1.5.x につ
+いてはテストしていません．そのため，非互換の影響が出ることがあるかもしれませ
+んが，その場合でも少しの修正で動かせると思います．組み込む Tk のバージョンは，
+4.2 でも 8.0 でも修正なく動かせるはずです．ただし，日本語版での移植となって
+いるため，日本語化された Tk をご利用ください．スクリプトのテストは，旧バージョ
+ンの際に Tk4.2jp と Tk8.0jp の上で行っています (完璧にではないですが)．今回
+のバージョンでは ruby-1.4.x + Tk8.0jp 上での簡単なテストしか行っていませんが，
+修正というほどの修正はしていませんので問題はないと考えています．
+
+本アーカイブに含まれるスクリプトの多くは，元となっている Tcl/Tk 版に比較的近
+いスクリプト記述となるようにしています．そのため，Ruby/Tk のサンプルと言うに
+は，あまり Ruby らしくないとも言えるでしょう．にもかかわらず，そのような記述
+を取っている理由は，Ruby/Tk のドキュメント不足にあります．
+
+Tcl/Tk には適当な参考書が何冊か存在していますから，Ruby/Tk スクリプトを作成
+する際は，そのような Tcl/Tk の参考書で情報を補いながら作成することになると思
+います．各 widget の使用例として，Tcl/Tk の widget-demo を参照することもある
+でしょう．Ruby/Tk 版の記述を widget-demo を Tcl/Tk 版の記述に近いものにして
+おけば，その対比によって，Ruby/Tk の理解を早めることができると考えられます．
+一旦 Ruby/Tk での 各 widget の使用方法を習得してしまえば，Ruby らしいスクリ
+プトを作成することは難しくないでしょう．本アーカイブのスクリプトは，Ruby/Tk 
+を最初に習得するまでの踏台として利用していただければ幸いです．
+
+widget-demo の移植にあたっては，次の方にも移植したスクリプトを提供していただ
+きました．ここに感謝の意を表します．
+
+    立石＠JAIST (ttate@jaist.ac.jp) さん 
+    平松祥史 (hiramatu@cdrom.co.jp) さん
+
+平松さんによる Ruby/Tk 入門の Web page (http://www.cdrom.co.jp/~hiramatu/) 
+も Ruby/Tk の習得に有用と思えますので，ぜひご参照ください．
+
+また，前橋 (maebashi@iij.ad.jp) さんをはじめとして，widget-demo の移植に際し
+て必要となった Ruby の Tk 関連ライブラリ修正について，問題点，バグの指摘をし
+ていただいた方々にも感謝致します．
+
+そして最後に最大の感謝を Ruby 設計者の まつもと ゆきひろ (matz@netlab.co.jp) 
+さんに捧げたいと思います．
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/README.1st b/ruby_1_8_6/ext/tk/sample/demos-jp/README.1st
new file mode 100644
index 0000000000..60b278d7b6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/README.1st
@@ -0,0 +1,20 @@
+このディレクトリには Ruby/Tk のデモスクリプトが収められています．
+
+'.rb' という拡張子を持っているファイルは，ランチャ─スクリプトで
+ある 'widget' から呼び出されるサブスクリプトです．それぞれ独立に
+は動きません．'widget' スクリプトから呼び出してください．
+
+もしランチャ─スクリプト 'widget' の起動と同時にいくつかのサブス
+クリプトを起動したければ，そのサブスクリプトの名前を引数として与
+えてください．
+( 例: /usr/local/bin/ruby widget button.rb entry1.rb text.rb )
+サブスクリプトの拡張子 '.rb' は省略することもできます．
+( 例: /usr/local/bin/ruby widget button entry1 text )
+
+もしランチャ─スクリプトのウィンドウが必要ない場合には，'-n' オ
+プションを与えてください．
+( 例: /usr/local/bin/ruby widget -n button.rb entry1.rb text.rb )
+
+他のファイル (browse1 や hello など) は単独で動かすことが可能です．
+
+          2004/04/14  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/anilabel.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/anilabel.rb
new file mode 100644
index 0000000000..97781fbe77
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/anilabel.rb
@@ -0,0 +1,174 @@
+#
+# animated label widget demo (called by 'widget')
+#
+# based on Tcl/Tk8.5a2 widget demos
+
+# toplevel widget が存在すれば削除する
+if defined?($anilabel_demo) && $anilabel_demo
+  $anilabel_demo.destroy 
+  $anilabel_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$anilabel_demo = TkToplevel.new {|w|
+  title("Animated Label Demonstration")
+  iconname("anilabel")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($anilabel_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "下には4つのアニメーションラベルが表示されています。左側にあるラベルは、内部のテキストメッセージをスクロールしたように見せることで動きを付けています。右側のラベルは、表示するイメージを変化させることで動きを与えています。"
+}
+msg.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($anilabel_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $anilabel_demo
+      $anilabel_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'anilabel'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# label demo 用フレーム生成
+f_left = TkLabelFrame.new($anilabel_demo,  :text=>'Scrolling Texts')
+f_right = TkLabelFrame.new($anilabel_demo, :text=>'GIF Image')
+Tk.pack(f_left, f_right, 'side'=>'left', 'expand'=>'yes', 'fill'=>'both', 
+        'padx'=>10, 'pady'=>10)
+
+# animated label
+class AnimatedTextLabel < TkLabel
+  def initialize(*args)
+    super(*args)
+    @timer = TkTimer.new{ _animation_callback }
+    @timer.loop_exec = -1
+    # bind('Destroy'){ @timer.stop }
+    @btag = TkBindTag.new('Destroy'){ @timer.stop }
+    self.bindtags_unshift(@btag)
+  end
+
+  def _animation_callback()
+    txt = self.text
+    self.text = (txt[1..-1] << txt[0])
+  end
+  private :_animation_callback
+
+  def start(interval)
+    @timer.set_interval(interval)
+    @timer.start
+  end
+
+  def stop
+    @timer.stop
+  end
+end
+
+# animated image
+class AnimatedImageLabel < AnimatedTextLabel
+  def initialize(*args)
+    super(*args)
+    @destroy_image = false
+    @btag.bind_append('Destroy'){
+      if @destroy_image
+        begin
+          self.image.delete 
+        rescue
+        end
+      end
+    }
+  end
+  attr_accessor :destroy_image
+
+  def _animation_callback()
+    img = self.image
+
+    fmt = img.format
+    if fmt.kind_of?(Array)
+      if fmt[1].kind_of?(Hash)
+        # fmt == ['GIF', {'index'=>idx}]
+        idx = fmt[1]['index']
+      else
+        # fmt == ['GIF', '-index', idx]  :: Ruby1.8.2 returns this.
+        idx = fmt[2]
+      end
+    elsif fmt.kind_of?(String) && fmt =~ /GIF -index (\d+)/
+      idx = $1.to_i
+    else
+      idx = -1
+    end
+
+    begin
+      img.format("GIF -index #{idx + 1}")
+    rescue => e
+      img.format("GIF -index 0")
+    end
+  end
+  private :_animation_callback
+end
+
+# label 生成
+l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge, 
+                           :font=>{:family=>'Courier', :size=>10})
+l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove, 
+                           :font=>{:family=>'Courier', :size=>10})
+l3 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:flat, 
+                           :font=>{:family=>'Courier', :size=>10}, :width=>18)
+Tk.pack(l1, l2, l3, 
+        :side=>:top, :expand=>true, :anchor=>:w, :padx=>10, :pady=>10)
+
+limg = AnimatedImageLabel.new(f_right, :borderwidth=>0)
+limg.pack(:side=>:top, :expand=>true, :padx=>10, :pady=>10)
+
+# base64-encoded animated GIF file
+tclPowerdData = <<EOD
+    R0lGODlhKgBAAPQAAP//////zP//AP/MzP/Mmf/MAP+Zmf+ZZv+ZAMz//8zM
+    zMyZmcyZZsxmZsxmAMwzAJnMzJmZzJmZmZlmmZlmZplmM5kzM2aZzGZmzGZm
+    mWZmZmYzZmYzMzNmzDMzZgAzmSH+IE1hZGUgd2l0aCBHSU1QIGJ5IExARGVt
+    YWlsbHkuY29tACH5BAVkAAEALAAAAAAqAEAAAAX+YCCOZEkyTKM2jOm66yPP
+    dF03bx7YcuHIDkGBR7SZeIyhTID4FZ+4Es8nQyCe2EeUNJ0peY2s9mi7PhAM
+    ngEAMGRbUpvzSxskLh1J+Hkg134OdDIDEB+GHxtYMEQMTjMGEYeGFoomezaC
+    DZGSHFmLXTQKkh8eNQVpZ2afmDQGHaOYSoEyhhcklzVmMpuHnaZmDqiGJbg0
+    qFqvh6UNAwB7VA+OwydEjgujkgrPNhbTI8dFvNgEYcHcHx0lB1kX2IYeA2G6
+    NN0YfkXJ2BsAMuAzHB9cZMk3qoEbRzUACsRCUBK5JxsC3iMiKd8GN088SIyT
+    0RAFSROyeEg38caDiB/+JEgqxsODrZJ1BkT0oHKSmI0ceQxo94HDpg0qsuDk
+    UmRAMgu8OgwQ+uIJgUMVeGXA+IQkzEeHGvD8cIGlDXsLiRjQ+EHroQhea7xY
+    8IQBSgYYDi1IS+OFBCgaDMGVS3fGi5BPJpBaENdQ0EomKGD56IHwO39EXiSC
+    Ysgxor5+Xfgq0qByYUpiXmwuoredB2aYH4gWWda0B7SeNENpEJHC1ghi+pS4
+    AJpIAwWvKPBi+8YEht5EriEqpFfMlhEdkBNpx0HUhwypx5T4IB1MBg/Ws2sn
+    wV3MSQOkzI8fUd48Aw3dOZto71x85hHtHijYv18Gf/3GqCdDCXHNoICBobSo
+    IqBqJLyCoH8JPrLgdh88CKCFD0CGmAiGYPgffwceZh6FC2ohIIklnkhehTNY
+    4CIHHGzgwYw01ujBBhvAqKOLLq5AAk9kuSPkkKO40NB+h1gnypJIIvkBf09a
+    N5QIRz5p5ZJXJpmlIVhOGQA2TmIJZZhKKmmll2BqyWSXWUrZpQtpatlmk1c2
+    KaWRHeTZEJF8SqLDn/hhsOeQgBbqAh6DGqronxeARUIIACH5BAUeAAAALAUA
+    LgAFAAUAAAUM4CeKz/OV5YmqaRkCACH5BAUeAAEALAUALgAKAAUAAAUUICCK
+    z/OdJVCaa7p+7aOWcDvTZwgAIfkEBR4AAQAsCwAuAAkABQAABRPgA4zP95zA
+    eZqoWqqpyqLkZ38hACH5BAUKAAEALAcALgANAA4AAAU7ICA+jwiUJEqeKau+
+    r+vGaTmac63v/GP9HM7GQyx+jsgkkoRUHJ3Qx0cK/VQVTKtWwbVKn9suNunc
+    WkMAIfkEBQoAAAAsBwA3AAcABQAABRGgIHzk842j+Yjlt5KuO8JmCAAh+QQF
+    CgAAACwLADcABwAFAAAFEeAnfN9TjqP5oOWziq05lmUIACH5BAUKAAAALA8A
+    NwAHAAUAAAUPoPCJTymS3yiQj4qOcPmEACH5BAUKAAAALBMANwAHAAUAAAUR
+    oCB+z/MJX2o+I2miKimiawgAIfkEBQoAAAAsFwA3AAcABQAABRGgIHzfY47j
+    Q4qk+aHl+pZmCAAh+QQFCgAAACwbADcABwAFAAAFEaAgfs/zCV9qPiNJouo7
+    ll8IACH5BAUKAAAALB8ANwADAAUAAAUIoCB8o0iWZggAOw==
+EOD
+
+l1.text('* Slow Animation *').start(300)
+l2.text('* Fast Animation *').start(80)
+l3.text('This is a longer scrolling text in a widget that will not show the whole message at once. ').start(150)
+
+limg.destroy_image = true
+limg.image(TkPhotoImage.new(:format=>'GIF', :data=>tclPowerdData)).start(100)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/aniwave.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/aniwave.rb
new file mode 100644
index 0000000000..81e2d76b30
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/aniwave.rb
@@ -0,0 +1,116 @@
+#
+# animated wave demo (called by 'widget')
+#
+# based on Tcl/Tk8.5a2 widget demos
+
+# destroy toplevel widget for this demo script
+if defined?($aniwave_demo) && $aniwave_demo
+  $aniwave_demo.destroy 
+  $aniwave_demo = nil
+end
+
+# create toplevel widget
+$aniwave_demo = TkToplevel.new {|w|
+  title("Animated Wave Demonstration")
+  iconname("aniwave")
+  positionWindow(w)
+}
+
+# create label
+msg = TkLabel.new($aniwave_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text 'このデモでは、ラインアイテムが一つだけ描かれたキャンバスウィジェットが表示されています。アニメーション処理は、そのラインアイテムの座標値を変更することで実現しています。'
+}
+msg.pack('side'=>'top')
+
+# create frame
+TkFrame.new($aniwave_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $aniwave_demo
+      $aniwave_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'aniwave'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# animated wave
+class AnimatedWaveDemo
+  def initialize(frame, dir=:left)
+    @direction = dir
+
+    # create canvas widget
+    @c = TkCanvas.new(frame, :width=>300, :height=>200, 
+                      :background=>'black')
+    @c.pack(:padx=>10, :pady=>10, :expand=>true)
+
+    # Creates a coordinates list of a wave. 
+    @waveCoords = []
+    @backupCoords = []
+    n = 0
+    (-10..300).step(5){|n| @waveCoords << [n, 100]; @backupCoords << [n, 100] }
+    @waveCoords << [n, 0]; @backupCoords << [n, 0]
+    @waveCoords << [n+5, 200]; @backupCoords << [n+5, 200]
+    @coordsLen = @waveCoords.length
+
+    # Create a smoothed line and arrange for its coordinates to be the
+    # contents of the variable waveCoords.
+    @line = TkcLine.new(@c, @waveCoords, 
+                        :width=>1, :fill=>'green', :smooth=>true)
+
+    # Main animation "loop". 
+    # Theoretically 100 frames-per-second (==10ms between frames)
+    @timer = TkTimer.new(10){ basicMotion; reverser }
+
+    # Arrange for the animation loop to stop when the canvas is deleted
+    @c.bindtags_unshift(TkBindTag.new('Destroy'){ @timer.stop })
+  end
+
+  # Basic motion handler. Given what direction the wave is travelling
+  # in, it advances the y coordinates in the coordinate-list one step in
+  # that direction.
+  def basicMotion
+    @backupCoords, @waveCoords = @waveCoords, @backupCoords
+    (0...@coordsLen).each{|idx|
+      if @direction == :left
+        @waveCoords[idx][1] = @backupCoords[(idx+1 == @coordsLen)? 0: idx+1][1]
+      else
+        @waveCoords[idx][1] = @backupCoords[(idx == 0)? -1: idx-1][1]
+      end
+    }
+    @line.coords(@waveCoords)
+  end
+
+  # Oscillation handler. This detects whether to reverse the direction
+  # of the wave by checking to see if the peak of the wave has moved off
+  # the screen (whose size we know already.)
+  def reverser
+    if @waveCoords[0][1] < 10
+      @direction = :right
+    elsif @waveCoords[-1][1] < 10
+      @direction = :left
+    end
+  end
+
+  # animation control
+  def move
+    @timer.start
+  end
+
+  def stop
+    @timer.stop
+  end
+end
+
+# Start the animation processing
+AnimatedWaveDemo.new($aniwave_demo, :left).move
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/arrow.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/arrow.rb
new file mode 100644
index 0000000000..477a0abf6f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/arrow.rb
@@ -0,0 +1,236 @@
+#
+# arrowhead widget demo (called by 'widget')
+#
+
+# arrowSetup --
+# This method regenerates all the text and graphics in the canvas
+# window.  It's called when the canvas is initially created, and also
+# whenever any of the parameters of the arrow head are changed
+# interactively.
+#
+# Arguments:
+# c -           Name of the canvas widget.
+
+def arrowSetup(c)
+  v = $demo_arrowInfo
+
+  # Remember the current box, if there is one.
+  tags = c.gettags('current')
+  if tags != []
+    cur = tags.find{|t| t.kind_of?(String) && t =~ /^box[1-3]$/ }
+  else
+    cur = nil
+  end
+
+  # Create the arrow and outline.
+  c.delete('all')
+  TkcLine.new(c, v.x1, v.y, v.x2, v.y, 
+              { 'width'=>10 * v.width, 
+                'arrowshape'=>[10*v.a, 10*v.b, 10*v.c], 
+                'arrow'=>'last' 
+              }.update(v.bigLineStyle) )
+  xtip = v.x2 - 10*v.b
+  deltaY = 10*v.c + 5*v.width
+  TkcLine.new(c, v.x2, v.y, xtip, v.y + deltaY, 
+              v.x2 - 10*v.a, v.y, xtip, v.y - deltaY, v.x2, v.y, 
+              'width'=>2, 'capstyle'=>'round', 'joinstyle'=>'round')
+
+  # Create the boxes for reshaping the line and arrowhead.
+  TkcRectangle.new(c, v.x2-10*v.a-5, v.y-5, v.x2-10*v.a+5, v.y+5, 
+                   {'tags'=>['box1', $arrowTag_box]}.update(v.boxStyle) )
+  TkcRectangle.new(c, xtip-5, v.y-deltaY-5, xtip+5, v.y-deltaY+5, 
+                   {'tags'=>['box2', $arrowTag_box]}.update(v.boxStyle) )
+  TkcRectangle.new(c, v.x1-5, v.y-5*v.width-5, v.x1+5, v.y-5*v.width+5, 
+                   {'tags'=>['box3', $arrowTag_box]}.update(v.boxStyle) )
+  c.itemconfigure cur, v.activeStyle if cur
+
+  # Create three arrows in actual size with the same parameters
+  TkcLine.new(c, v.x2+50, 0, v.x2+50, 1000, 'width'=>2)
+  tmp = v.x2+100
+  TkcLine.new(c, tmp, v.y-125, tmp, v.y-75, 'width'=>v.width, 
+              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
+  TkcLine.new(c, tmp-25, v.y, tmp+25, v.y, 'width'=>v.width, 
+              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
+  TkcLine.new(c, tmp-25, v.y+75, tmp+25, v.y+125, 'width'=>v.width, 
+              'arrow'=>'both', 'arrowshape'=>[v.a, v.b, v.c])
+
+  # Create a bunch of other arrows and text items showing the 
+  # current dimensions.
+  tmp = v.x2+10
+  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y-deltaY, 
+              'arrow'=>'both', 'arrowshape'=>v.smallTips)
+  TkcText.new(c, v.x2+15, v.y-deltaY+5*v.c, 'text'=>v.c, 'anchor'=>'w')
+  tmp = v.x1-10
+  TkcLine.new(c, tmp, v.y-5*v.width, tmp, v.y+5*v.width, 
+              'arrow'=>'both', 'arrowshape'=>v.smallTips)
+  TkcText.new(c, v.x1-15, v.y, 'text'=>v.width, 'anchor'=>'e')
+  tmp = v.y+5*v.width+10*v.c+10
+  TkcLine.new(c, v.x2-10*v.a, tmp, v.x2, tmp, 
+              'arrow'=>'both', 'arrowshape'=>v.smallTips)
+  TkcText.new(c, v.x2-5*v.a, tmp+5, 'text'=>v.a, 'anchor'=>'n')
+  tmp = tmp+25
+  TkcLine.new(c, v.x2-10*v.b, tmp, v.x2, tmp, 
+              'arrow'=>'both', 'arrowshape'=>v.smallTips)
+  TkcText.new(c, v.x2-5*v.b, tmp+5, 'text'=>v.b, 'anchor'=>'n')
+
+  TkcText.new(c, v.x1, 310, 'text'=>"'width'=>#{v.width}", 'anchor'=>'w', 
+              'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+  TkcText.new(c, v.x1, 330, 
+              'text'=>"'arrowshape'=>[#{v.a}, #{v.b}, #{v.c}]", 'anchor'=>'w', 
+              'font'=>'-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*')
+
+  v.count += 1
+end
+
+# toplevel widget が存在すれば削除する
+if defined?($arrow_demo) && $arrow_demo
+  $arrow_demo.destroy 
+  $arrow_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$arrow_demo = TkToplevel.new {|w|
+  title("Arrowhead Editor Demonstration")
+  iconname("arrow")
+  positionWindow(w)
+}
+
+# label 生成
+TkLabel.new($arrow_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+            'text'=>"この widget で、キャンバスで使われるラインについて様々な幅や矢印の頭の形を試してみることができます。線の幅や矢印の形を変えるには、拡大された矢印についている 3つの四角をドラッグしてください。右側の矢印は普通の大きさでのサンプルを示しています。下のテキストはラインアイテムに対する設定オプションです。"){
+  pack('side'=>'top')
+}
+
+# frame 生成
+$arrow_buttons = TkFrame.new($arrow_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $arrow_demo
+      $arrow_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'arrow'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# canvas 設定
+$arrow_canvas = TkCanvas.new($arrow_demo, 'width'=>500, 'height'=>350, 
+                             'relief'=>'sunken', 'borderwidth'=>2)
+$arrow_canvas.pack('expand'=>'yes', 'fill'=>'both')
+
+# 値設定
+unless Struct.const_defined?("ArrowInfo")
+  $demo_arrowInfo = Struct.new("ArrowInfo", :a, :b, :c, :width, :motionProc, 
+                               :x1, :x2, :y, :smallTips, :count, 
+                               :bigLineStyle, :boxStyle, :activeStyle).new
+end
+$demo_arrowInfo.a = 8
+$demo_arrowInfo.b = 10
+$demo_arrowInfo.c = 3
+$demo_arrowInfo.width = 2
+$demo_arrowInfo.motionProc = proc{}
+$demo_arrowInfo.x1 = 40
+$demo_arrowInfo.x2 = 350
+$demo_arrowInfo.y = 150
+$demo_arrowInfo.smallTips = [5, 5, 2]
+$demo_arrowInfo.count = 0
+if TkWinfo.depth($arrow_canvas) > 1
+  $demo_arrowInfo.bigLineStyle = {'fill'=>'SkyBlue1'}
+  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
+  $demo_arrowInfo.activeStyle = {'fill'=>'red', 'outline'=>'black', 'width'=>1}
+else
+  $demo_arrowInfo.bigLineStyle = {'fill'=>'black', 
+    'stipple'=>'@'+[$demo_dir,'..','images','grey.25'].join(File::Separator)}
+  $demo_arrowInfo.boxStyle = {'fill'=>'', 'outline'=>'black', 'width'=>1}
+  $demo_arrowInfo.activeStyle = {'fill'=>'black','outline'=>'black','width'=>1}
+end
+$arrowTag_box = TkcTag.new($arrow_canvas)
+arrowSetup $arrow_canvas
+$arrowTag_box.bind('Enter', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.activeStyle)})
+$arrowTag_box.bind('Leave', proc{$arrow_canvas.itemconfigure('current', $demo_arrowInfo.boxStyle)})
+$arrowTag_box.bind('B1-Enter', proc{})
+$arrowTag_box.bind('B1-Leave', proc{})
+$arrow_canvas.itembind('box1', '1', 
+                       proc{$demo_arrowInfo.motionProc \
+                         = proc{|x,y| arrowMove1 $arrow_canvas, x, y}})
+$arrow_canvas.itembind('box2', '1', 
+                       proc{$demo_arrowInfo.motionProc \
+                         = proc{|x,y| arrowMove2 $arrow_canvas, x, y}})
+$arrow_canvas.itembind('box3', '1', 
+                       proc{$demo_arrowInfo.motionProc \
+                         = proc{|x,y| arrowMove3 $arrow_canvas, x, y}})
+$arrowTag_box.bind('B1-Motion', 
+                  proc{|x,y| $demo_arrowInfo.motionProc.call(x,y)}, "%x %y")
+$arrow_canvas.bind('Any-ButtonRelease-1', proc{arrowSetup $arrow_canvas})
+
+# arrowMove1 --
+# This method is called for each mouse motion event on box1 (the
+# one at the vertex of the arrow).  It updates the controlling parameters
+# for the line and arrowhead.
+#
+# Arguments:
+# c -           The name of the canvas window.
+# x, y -        The coordinates of the mouse.
+
+def arrowMove1(c,x,y)
+  v = $demo_arrowInfo
+  newA = (v.x2+5-c.canvasx(x).round)/10
+  newA = 0 if newA < 0
+  newA = 25 if newA > 25
+  if newA != v.a
+    c.move('box1', 10*(v.a-newA), 0)
+    v.a = newA
+  end
+end
+
+# arrowMove2 --
+# This method is called for each mouse motion event on box2 (the
+# one at the trailing tip of the arrowhead).  It updates the controlling
+# parameters for the line and arrowhead.
+#
+# Arguments:
+# c -           The name of the canvas window.
+# x, y -        The coordinates of the mouse.
+
+def arrowMove2(c,x,y)
+  v = $demo_arrowInfo
+  newB = (v.x2+5-c.canvasx(x).round)/10
+  newB = 0 if newB < 0
+  newB = 25 if newB > 25
+  newC = (v.y+5-c.canvasy(y).round-5*v.width)/10
+  newC = 0 if newC < 0
+  newC = 20 if newC > 20
+  if newB != v.b || newC != v.c
+    c.move('box2', 10*(v.b-newB), 10*(v.c-newC))
+    v.b = newB
+    v.c = newC
+  end
+end
+
+# arrowMove3 --
+# This method is called for each mouse motion event on box3 (the
+# one that controls the thickness of the line).  It updates the
+# controlling parameters for the line and arrowhead.
+#
+# Arguments:
+# c -           The name of the canvas window.
+# x, y -        The coordinates of the mouse.
+
+def arrowMove3(c,x,y)
+  v = $demo_arrowInfo
+  newWidth = (v.y+2-c.canvasy(y).round)/5
+  newWidth = 0 if newWidth < 0
+  newWidth = 20 if newWidth > 20
+  if newWidth != v.width
+    c.move('box3', 0, 5*(v.width-newWidth))
+    v.width = newWidth
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/bind.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/bind.rb
new file mode 100644
index 0000000000..e1e23b9893
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/bind.rb
@@ -0,0 +1,125 @@
+#
+# text (tag bindings) widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($bind_demo) && $bind_demo
+  $bind_demo.destroy 
+  $bind_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$bind_demo = TkToplevel.new {|w|
+  title("Text Demonstration - Tag Bindings")
+  iconname("bind")
+  positionWindow(w)
+}
+
+# frame 生成
+TkFrame.new($bind_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $bind_demo
+      $bind_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'bind'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# bind 用メソッド
+def tag_binding_for_bind_demo(tag, enter_style, leave_style)
+  tag.bind('Any-Enter', proc{tag.configure enter_style})
+  tag.bind('Any-Leave', proc{tag.configure leave_style})
+end
+
+# text 生成
+TkText.new($bind_demo){|t|
+  # 生成
+  setgrid 'true'
+  width  60
+  height 24
+  font $font
+  wrap 'word'
+  TkScrollbar.new($bind_demo) {|s|
+    pack('side'=>'right', 'fill'=>'y')
+    command proc{|*args| t.yview(*args)}
+    t.yscrollcommand proc{|first,last| s.set first,last}
+  }
+  pack('expand'=>'yes', 'fill'=>'both')
+
+  # スタイル設定
+  if TkWinfo.depth($root).to_i > 1
+    tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised', 
+                     'borderwidth'=>1}
+    tagstyle_normal = {'background'=>'', 'relief'=>'flat'}
+  else
+    tagstyle_bold = {'foreground'=>'white', 'background'=>'black'}
+    tagstyle_normal = {'foreground'=>'', 'background'=>''}
+  end
+
+  # テキスト挿入
+  insert 'insert', "テキストwidgetの表示スタイルを制御するのと同じタグのメカニズムを使って、テキストにTclのコマンドを割り当てることができます。これにより、マウスやキーボードのアクションで特定のTclのコマンドが実行されるようになります。例えば、下のキャンバスのデモプログラムについての説明文にはそのようなタグがついています。マウスを説明文の上に持っていくと説明文が光り、ボタン1を押すとその説明のデモが始まります。
+
+"
+  insert('end', '1. キャンバス widget に作ることのできるアイテムの種類全てに関するサンプル。', (d1 = TkTextTag.new(t)) )
+  insert('end', "\n\n")
+  insert('end', '2. 簡単な 2次元のプロット。データを表す点を動かすことができる。', (d2 = TkTextTag.new(t)) )
+  insert('end', "\n\n")
+  insert('end', '3. テキストアイテムのアンカーと行揃え。', 
+         (d3 = TkTextTag.new(t)) )
+  insert('end', "\n\n")
+  insert('end', '4. ラインアイテムのための矢印の頭の形のエディタ。', 
+         (d4 = TkTextTag.new(t)) )
+  insert('end', "\n\n")
+  insert('end', '5. タブストップを変更するための機能つきのルーラー。', 
+         (d5 = TkTextTag.new(t)) )
+  insert('end', "\n\n")
+  insert('end', 
+         '6. キャンバスがどうやってスクロールするのかを示すグリッド。', 
+         (d6 = TkTextTag.new(t)) )
+
+  # binding
+  [d1, d2, d3, d4, d5, d6].each{|tag|
+    tag_binding_for_bind_demo(tag, tagstyle_bold, tagstyle_normal)
+  }
+  d1.bind('1', 
+          proc{
+            eval(`cat #{[$demo_dir,'items.rb'].join(File::Separator)}`, 
+                 _null_binding)
+          })
+  d2.bind('1', 
+          proc{
+            eval(`cat #{[$demo_dir,'plot.rb'].join(File::Separator)}`, 
+                 _null_binding)
+          })
+  d3.bind('1', 
+          proc{
+            eval(`cat #{[$demo_dir,'ctext.rb'].join(File::Separator)}`, 
+                 _null_binding)
+          })
+  d4.bind('1', 
+          proc{
+            eval(`cat #{[$demo_dir,'arrow.rb'].join(File::Separator)}`, 
+                 _null_binding)
+          })
+  d5.bind('1', 
+          proc{
+            eval(`cat #{[$demo_dir,'ruler.rb'].join(File::Separator)}`, 
+                 _null_binding)
+          })
+  d6.bind('1', 
+          proc{
+            eval(`cat #{[$demo_dir,'cscroll.rb'].join(File::Separator)}`, 
+                 _null_binding)
+          })
+
+  TkTextMarkInsert.new(t, '0.0')
+  configure('state','disabled')
+}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/bitmap.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/bitmap.rb
new file mode 100644
index 0000000000..b71c67d3fd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/bitmap.rb
@@ -0,0 +1,71 @@
+#
+# bitmap widget demo (called by 'widget')
+#
+
+# bitmapRow --
+# Create a row of bitmap items in a window.
+#
+# Arguments:
+# w -           The parent window that is to contain the row.
+# args -        The names of one or more bitmaps, which will be displayed
+#               in a new row across the bottom of w along with their
+#               names.
+
+def bitmapRow(w,*args)
+  TkFrame.new(w){|row|
+    pack('side'=>'top', 'fill'=>'both')
+    for bitmap in args 
+      TkFrame.new(row){|base|
+        pack('side'=>'left', 'fill'=>'both', 'pady'=>'.25c', 'padx'=>'.25c')
+        TkLabel.new(base, 'text'=>bitmap, 'width'=>9).pack('side'=>'bottom')
+        TkLabel.new(base, 'bitmap'=>bitmap).pack('side'=>'bottom')
+      }
+    end
+  }
+end
+
+# toplevel widget が存在すれば削除する
+if defined?($bitmap_demo) && $bitmap_demo
+  $bitmap_demo.destroy 
+  $bitmap_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$bitmap_demo = TkToplevel.new {|w|
+  title("Bitmap Demonstration")
+  iconname("bitmap")
+  positionWindow(w)
+}
+
+# label 生成
+TkLabel.new($bitmap_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left', 
+            'text'=>"このウィンドウには、Tk に組み込まれたすべてのビットマップが、それらの名前と共に表示されています。Tcl のスクリプト中では、それぞれの名前を用いて参照します。"){
+  pack('side'=>'top')
+}
+
+# frame 生成
+$bitmap_buttons = TkFrame.new($bitmap_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $bitmap_demo
+      $bitmap_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'bitmap'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$bitmap_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 設定
+TkFrame.new($bitmap_demo){|f|
+  bitmapRow(f,'error','gray25','gray50','hourglass')
+  bitmapRow(f,'info','question','questhead','warning')
+  pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
+}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/browse1 b/ruby_1_8_6/ext/tk/sample/demos-jp/browse1
new file mode 100644
index 0000000000..03e251035a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/browse1
@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+
+# browse --
+# This script generates a directory browser, which lists the working 
+# directory and allow you to open files or subdirectories by 
+# double-clicking. 
+
+require 'tk'
+
+# Create a scrollbar on the right side of the main window and a listbox 
+# on the left side.
+
+listbox = TkListbox.new(nil, 'relief'=>'sunken', 
+			'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
+  TkScrollbar.new(nil, 'command'=>proc{|*args| l.yview *args}) {|s|
+    pack('side'=>'right', 'fill'=>'y')
+    l.yscrollcommand(proc{|first,last| s.set(first,last)})
+  }
+
+  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
+}
+
+root = TkRoot.new
+root.minsize(1,1)
+
+# The procedure below is invoked to open a browser on a given file;  if the 
+# file is a directory then another instance of this program is invoked; if 
+# the file is a regular file then the Mx editor is invoked to display 
+# the file. 
+
+def browse (dir, file)
+  file = dir + File::Separator + file if dir != '.'
+  type = File.ftype(file)
+  if type == 'directory'
+    system($0 + ' ' + file + ' &')
+  else
+    if type == 'file'
+      if ENV['EDITOR']
+	system(ENV['EDITOR'] + ' ' + file + ' &')
+      else
+	system('xedit ' + file + ' &')
+      end
+    else
+      STDOUT.print "\"#{file}\" isn't a directory or regular file"
+    end
+  end
+end
+
+# Fill the listbox with a list of all the files in the directory (run 
+# the "ls" command to get that information).
+
+dir = ARGV[0] ?  ARGV[0] : '.'
+open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
+  listbox.insert('end', fname.chomp)
+}
+
+# Set up bindings for the browser.
+
+Tk.bind_all('Control-c', proc{root.destroy})
+listbox.bind('Double-Button-1', 
+	     proc{TkSelection.get.each{|f| browse dir, f}})
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/browse2 b/ruby_1_8_6/ext/tk/sample/demos-jp/browse2
new file mode 100644
index 0000000000..edad04dbcb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/browse2
@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+
+# browse --
+# This script generates a directory browser, which lists the working 
+# directory and allow you to open files or subdirectories by 
+# double-clicking. 
+
+require 'tk'
+
+class Browse
+  BROWSE_WIN_COUNTER = TkVariable.new(0)
+
+  def initialize(dir)
+    BROWSE_WIN_COUNTER.value = BROWSE_WIN_COUNTER.to_i + 1
+
+    # create base frame
+    base = TkToplevel.new {
+      minsize(1,1)
+      title('Browse : ' + dir)
+    }
+
+    # Create a scrollbar on the right side of the main window and a listbox 
+    # on the left side.
+    list = TkListbox.new(base, 'relief'=>'sunken', 
+			 'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
+      TkScrollbar.new(base, 'command'=>proc{|*args| l.yview *args}) {|s|
+	pack('side'=>'right', 'fill'=>'y')
+	l.yscrollcommand(proc{|first,last| s.set(first,last)})
+      }
+
+      pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
+
+      # Fill the listbox with a list of all the files in the directory (run 
+      # the "ls" command to get that information).
+      open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
+	l.insert('end', fname.chomp)
+      }
+
+    }
+
+    # Set up bindings for the browser.
+    base.bind('Destroy', proc{
+		Browse::BROWSE_WIN_COUNTER.value = \
+		                Browse::BROWSE_WIN_COUNTER.to_i - 1
+	      })
+    base.bind('Control-c', proc{base.destroy})
+    list.bind('Double-Button-1', 
+	 proc{TkSelection.get.each{|f| self.browse dir, f}})
+  end
+
+  # The method below is invoked to open a browser on a given file;  if the 
+  # file is a directory then another instance of this program is invoked; if 
+  # the file is a regular file then the Mx editor is invoked to display 
+  # the file. 
+  def browse (dir, file)
+    file = dir + File::Separator + file if dir != '.'
+    type = File.ftype(file)
+    if type == 'directory'
+      Browse.new(file)
+    else
+      if type == 'file'
+	if ENV['EDITOR']
+	  system(ENV['EDITOR'] + ' ' + file + ' &')
+	else
+	  system('xedit ' + file + ' &')
+	end
+      else
+	STDOUT.print "\"#{file}\" isn't a directory or regular file"
+      end
+    end
+  end
+
+end
+
+Browse.new(ARGV[0] ? ARGV[0] : '.')
+
+TkRoot.new {
+  withdraw
+  Browse::BROWSE_WIN_COUNTER.trace('w', proc{exit if Browse::BROWSE_WIN_COUNTER.to_i == 0})
+}
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/button.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/button.rb
new file mode 100644
index 0000000000..20f8cae299
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/button.rb
@@ -0,0 +1,81 @@
+#
+# button widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($button_demo) && $button_demo
+  $button_demo.destroy 
+  $button_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$button_demo = TkToplevel.new {|w|
+  title("Button Demonstration")
+  iconname("button")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($button_demo) {
+  font $kanji_font
+  wraplength '4i'
+  justify 'left'
+  text "ボタンをクリックすると、ボタンの背景色がそのボタンに書かれている色になります。ボタンからボタンへの移動はタブを押すことでも可能です。またスペースで実行することができます。"
+}
+msg.pack('side'=>'top')
+
+# frame 生成
+$button_buttons = TkFrame.new($button_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $button_demo
+      $button_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'button'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# button 生成
+TkButton.new($button_demo){
+  text "Peach Puff"
+  width 10
+  command proc{
+    $button_demo.configure('bg','PeachPuff1')
+    $button_buttons.configure('bg','PeachPuff1')
+  }
+}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
+
+TkButton.new($button_demo){
+  text "Light Blue"
+  width 10
+  command proc{
+    $button_demo.configure('bg','LightBlue1')
+    $button_buttons.configure('bg','LightBlue1')
+  }
+}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
+
+TkButton.new($button_demo){
+  text "Sea Green"
+  width 10
+  command proc{
+    $button_demo.configure('bg','SeaGreen2')
+    $button_buttons.configure('bg','SeaGreen2')
+  }
+}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
+
+TkButton.new($button_demo){
+  text "Yellow"
+  width 10
+  command proc{
+    $button_demo.configure('bg','Yellow1')
+    $button_buttons.configure('bg','Yellow1')
+  }
+}.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/check.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/check.rb
new file mode 100644
index 0000000000..be675b9042
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/check.rb
@@ -0,0 +1,67 @@
+#
+# checkbutton widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($check_demo) && $check_demo
+  $check_demo.destroy 
+  $check_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$check_demo = TkToplevel.new {|w|
+  title("Checkbutton Demonstration")
+  iconname("check")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($check_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "下には 3 つのチェックボタンが表示されています。クリックするとボタンの選択状態が変わり、Tcl 変数 ( TkVariable オブジェクトでアクセスできます ) にそのボタンの状態を示す値を設定します。現在の変数の値を見るには「変数参照」ボタンをクリックしてください。"
+}
+msg.pack('side'=>'top')
+
+# 変数生成
+wipers = TkVariable.new(0)
+brakes = TkVariable.new(0)
+sober  = TkVariable.new(0)
+
+# frame 生成
+TkFrame.new($check_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $check_demo
+      $check_demo = nil
+      $showVarsWin[tmppath.path] = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'check'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+
+  TkButton.new(frame) {
+    text '変数参照'
+    command proc{
+      showVars($check_demo, 
+               ['wipers', wipers], ['brakes', brakes], ['sober', sober])
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+
+# checkbutton 生成
+[ TkCheckButton.new($check_demo, 'text'=>'ワイパー OK', 'variable'=>wipers),
+  TkCheckButton.new($check_demo, 'text'=>'ブレーキ OK', 'variable'=>brakes),
+  TkCheckButton.new($check_demo, 'text'=>'運転手 素面', 'variable'=>sober)
+].each{|w| w.relief('flat'); w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/check2.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/check2.rb
new file mode 100644
index 0000000000..f681a4d684
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/check2.rb
@@ -0,0 +1,107 @@
+#
+# checkbutton widget demo2 (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($check2_demo) && $check2_demo
+  $check2_demo.destroy 
+  $check2_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$check2_demo = TkToplevel.new {|w|
+  title("Checkbutton Demonstration 2")
+  iconname("check2")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($check2_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "下には４つのチェックボタンが表示されています。クリックするとボタンの選択状態が変わり、Tcl変数（TkVariableオブジェクトでアクセスできます）にそのボタンの状態を示す値を設定します。最初のボタンの状態は他の３つのボタンの状態にも依存して変化します。もし３つのボタンの一部だけにチェックが付けられている場合、最初のボタンはトライステート（３状態）モードでの表示を行います。現在の変数の値を見るには「変数参照」ボタンをクリックしてください。"
+}
+msg.pack('side'=>'top')
+
+# 変数生成
+safety = TkVariable.new(0)
+wipers = TkVariable.new(0)
+brakes = TkVariable.new(0)
+sober  = TkVariable.new(0)
+
+# frame 生成
+TkFrame.new($check2_demo) {|frame|
+  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2), 
+         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x', 
+         TkButton.new(frame, :text=>'変数参照', 
+                      :image=>$image['view'], :compound=>:left, 
+                      :command=>proc{
+                        showVars($check2_demo, 
+                                 ['safety', safety], ['wipers', wipers], 
+                                 ['brakes', brakes], ['sober', sober])
+                      }), 
+         TkButton.new(frame, :text=>'コード参照', 
+                      :image=>$image['view'], :compound=>:left, 
+                      :command=>proc{showCode 'check2'}), 
+         TkButton.new(frame, :text=>'閉じる', 
+                      :image=>$image['delete'], :compound=>:left, 
+                      :command=>proc{
+                        tmppath = $check2_demo
+                        $check2_demo = nil
+                        $showVarsWin[tmppath.path] = nil
+                        tmppath.destroy
+                      }), 
+         :padx=>4, :pady=>4)
+  frame.grid_columnconfigure(0, :weight=>1)
+}.pack('side'=>'bottom', 'fill'=>'x')
+
+
+# checkbutton 生成
+TkCheckButton.new($check2_demo, :text=>'安全性検査', :variable=>safety, 
+                  :relief=>:flat, :onvalue=>'all', :offvalue=>'none', 
+                  :tristatevalue=>'partial'){
+  pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
+}
+
+[ TkCheckButton.new($check2_demo, 'text'=>'ワイパー OK', 'variable'=>wipers),
+  TkCheckButton.new($check2_demo, 'text'=>'ブレーキ OK', 'variable'=>brakes),
+  TkCheckButton.new($check2_demo, 'text'=>'運転手 素面', 'variable'=>sober)
+].each{|w| 
+  w.relief('flat')
+  w.pack('side'=>'top', 'padx'=>15, 'pady'=>2, 'anchor'=>'w')
+}
+
+# tristate check
+in_check = false
+tristate_check = proc{|n1,n2,op|
+  unless in_check
+    in_check = true
+    begin
+      if n1 == safety
+        if safety == 'none'
+          wipers.value = 0
+          brakes.value = 0
+          sober.value  = 0
+        elsif safety == 'all'
+          wipers.value = 1
+          brakes.value = 1
+          sober.value  = 1
+        end
+      else
+        if wipers == 1 && brakes == 1 && sober == 1
+          safety.value = 'all'
+        elsif wipers == 1 || brakes == 1 || sober == 1
+          safety.value = 'partial'
+        else
+          safety.value = 'none'
+        end
+      end
+    ensure
+      in_check = false
+    end
+  end
+}
+
+[wipers, brakes, sober, safety].each{|v| v.trace('w', tristate_check)}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/clrpick.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/clrpick.rb
new file mode 100644
index 0000000000..de8cd80fcd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/clrpick.rb
@@ -0,0 +1,75 @@
+#
+# widget demo prompts the user to select a color (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($clrpick_demo) && $clrpick_demo
+  $clrpick_demo.destroy 
+  $clrpick_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$clrpick_demo = TkToplevel.new {|w|
+  title("Color Selection Dialogs")
+  iconname("colors")
+  positionWindow(w)
+}
+
+# label 生成
+TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+            'text'=>"以下のボタンを押して、このウィンドウ上にあるウィジェットの前景色と背景色を選択して下さい。").pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($clrpick_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $clrpick_demo
+      $clrpick_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'clrpick'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# button 生成
+TkButton.new($clrpick_demo, 'text'=>'背景色を設定 ...') {|b|
+  command(proc{setColor $clrpick_demo, b, 'background', 
+              ['background', 'highlightbackground']})
+  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
+}
+
+TkButton.new($clrpick_demo, 'text'=>'前景色を設定 ...') {|b|
+  command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
+  pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
+}
+
+def setColor(w,button,name,options)
+  w.grab
+  initialColor = button[name]
+  color = Tk.chooseColor('title'=>"Choose a #{name} color", 'parent'=>w, 
+                         'initialcolor'=>initialColor)
+  if color != ""
+    setColor_helper(w,options,color)
+  end
+
+  w.grab('release')
+end
+
+def setColor_helper(w, options, color)
+  options.each{|opt|
+    begin
+      w[opt] = color
+    rescue
+    end
+  }
+  TkWinfo.children(w).each{|child|
+    setColor_helper child, options, color
+  }
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/colors.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/colors.rb
new file mode 100644
index 0000000000..c6128f9c00
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/colors.rb
@@ -0,0 +1,144 @@
+#
+# listbox widget demo 'colors' (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($colors_demo) && $colors_demo
+  $colors_demo.destroy 
+  $colors_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$colors_demo = TkToplevel.new {|w|
+  title("Listbox Demonstration (colors)")
+  iconname("colors")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($colors_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "下には色の名前が入ったスクロールバー付のリストボックスが表示されています。リストをスクロールさせるのはスクロールバーでもできますし、リストボックスの中でマウスのボタン2(中ボタン)を押したままドラッグしてもできます。ある色をボタン1(左ボタン)でダブルクリックするとアプリケーション全体がその色になります。"
+}
+msg.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($colors_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $colors_demo
+      $colors_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'colors'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 生成
+colors_lbox = nil
+TkFrame.new($colors_demo, 'borderwidth'=>10) {|w|
+  s = TkScrollbar.new(w)
+  colors_lbox = TkListbox.new(w) {
+    setgrid 1
+    width  10
+    height 12
+    yscrollcommand proc{|first,last| s.set first,last}
+  }
+  s.command(proc{|*args| colors_lbox.yview(*args)})
+  s.pack('side'=>'right', 'fill'=>'y')
+  colors_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
+}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
+
+colors_lbox.bind('Double-1', proc{TkPalette.setPalette TkSelection.get})
+
+ins_data = [
+  'gray60','gray70','gray80','gray85','gray90','gray95',
+  'snow1','snow2','snow3','snow4','seashell1','seashell2',
+  'seashell3','seashell4','AntiqueWhite1','AntiqueWhite2',
+  'AntiqueWhite3','AntiqueWhite4','bisque1','bisque2',
+  'bisque3','bisque4','PeachPuff1','PeachPuff2',
+  'PeachPuff3','PeachPuff4','NavajoWhite1','NavajoWhite2',
+  'NavajoWhite3','NavajoWhite4','LemonChiffon1',
+  'LemonChiffon2','LemonChiffon3','LemonChiffon4',
+  'cornsilk1','cornsilk2','cornsilk3','cornsilk4',
+  'ivory1','ivory2','ivory3','ivory4','honeydew1',
+  'honeydew2','honeydew3','honeydew4','LavenderBlush1',
+  'LavenderBlush2','LavenderBlush3','LavenderBlush4',
+  'MistyRose1','MistyRose2','MistyRose3','MistyRose4',
+  'azure1','azure2','azure3','azure4','SlateBlue1',
+  'SlateBlue2','SlateBlue3','SlateBlue4','RoyalBlue1',
+  'RoyalBlue2','RoyalBlue3','RoyalBlue4','blue1','blue2',
+  'blue3','blue4','DodgerBlue1','DodgerBlue2',
+  'DodgerBlue3','DodgerBlue4','SteelBlue1','SteelBlue2',
+  'SteelBlue3','SteelBlue4','DeepSkyBlue1','DeepSkyBlue2',
+  'DeepSkyBlue3','DeepSkyBlue4','SkyBlue1','SkyBlue2',
+  'SkyBlue3','SkyBlue4','LightSkyBlue1','LightSkyBlue2',
+  'LightSkyBlue3','LightSkyBlue4','SlateGray1',
+  'SlateGray2','SlateGray3','SlateGray4',
+  'LightSteelBlue1','LightSteelBlue2','LightSteelBlue3',
+  'LightSteelBlue4','LightBlue1','LightBlue2',
+  'LightBlue3','LightBlue4','LightCyan1','LightCyan2',
+  'LightCyan3','LightCyan4','PaleTurquoise1',
+  'PaleTurquoise2','PaleTurquoise3','PaleTurquoise4',
+  'CadetBlue1','CadetBlue2','CadetBlue3','CadetBlue4',
+  'turquoise1','turquoise2','turquoise3','turquoise4',
+  'cyan1','cyan2','cyan3','cyan4','DarkSlateGray1',
+  'DarkSlateGray2','DarkSlateGray3','DarkSlateGray4',
+  'aquamarine1','aquamarine2','aquamarine3','aquamarine4',
+  'DarkSeaGreen1','DarkSeaGreen2','DarkSeaGreen3',
+  'DarkSeaGreen4','SeaGreen1','SeaGreen2','SeaGreen3',
+  'SeaGreen4','PaleGreen1','PaleGreen2','PaleGreen3',
+  'PaleGreen4','SpringGreen1','SpringGreen2',
+  'SpringGreen3','SpringGreen4','green1','green2',
+  'green3','green4','chartreuse1','chartreuse2',
+  'chartreuse3','chartreuse4','OliveDrab1','OliveDrab2',
+  'OliveDrab3','OliveDrab4','DarkOliveGreen1',
+  'DarkOliveGreen2','DarkOliveGreen3','DarkOliveGreen4',
+  'khaki1','khaki2','khaki3','khaki4','LightGoldenrod1',
+  'LightGoldenrod2','LightGoldenrod3','LightGoldenrod4',
+  'LightYellow1','LightYellow2','LightYellow3',
+  'LightYellow4','yellow1','yellow2','yellow3','yellow4',
+  'gold1','gold2','gold3','gold4','goldenrod1',
+  'goldenrod2','goldenrod3','goldenrod4','DarkGoldenrod1',
+  'DarkGoldenrod2','DarkGoldenrod3','DarkGoldenrod4',
+  'RosyBrown1','RosyBrown2','RosyBrown3','RosyBrown4',
+  'IndianRed1','IndianRed2','IndianRed3','IndianRed4',
+  'sienna1','sienna2','sienna3','sienna4','burlywood1',
+  'burlywood2','burlywood3','burlywood4','wheat1',
+  'wheat2','wheat3','wheat4','tan1','tan2','tan3','tan4',
+  'chocolate1','chocolate2','chocolate3','chocolate4',
+  'firebrick1','firebrick2','firebrick3','firebrick4',
+  'brown1','brown2','brown3','brown4','salmon1','salmon2',
+  'salmon3','salmon4','LightSalmon1','LightSalmon2',
+  'LightSalmon3','LightSalmon4','orange1','orange2',
+  'orange3','orange4','DarkOrange1','DarkOrange2',
+  'DarkOrange3','DarkOrange4','coral1','coral2','coral3',
+  'coral4','tomato1','tomato2','tomato3','tomato4',
+  'OrangeRed1','OrangeRed2','OrangeRed3','OrangeRed4',
+  'red1','red2','red3','red4','DeepPink1','DeepPink2',
+  'DeepPink3','DeepPink4','HotPink1','HotPink2',
+  'HotPink3','HotPink4','pink1','pink2','pink3','pink4',
+  'LightPink1','LightPink2','LightPink3','LightPink4',
+  'PaleVioletRed1','PaleVioletRed2','PaleVioletRed3',
+  'PaleVioletRed4','maroon1','maroon2','maroon3',
+  'maroon4','VioletRed1','VioletRed2','VioletRed3',
+  'VioletRed4','magenta1','magenta2','magenta3',
+  'magenta4','orchid1','orchid2','orchid3','orchid4',
+  'plum1','plum2','plum3','plum4','MediumOrchid1',
+  'MediumOrchid2','MediumOrchid3','MediumOrchid4',
+  'DarkOrchid1','DarkOrchid2','DarkOrchid3',
+  'DarkOrchid4','purple1','purple2','purple3','purple4',
+  'MediumPurple1','MediumPurple2','MediumPurple3',
+  'MediumPurple4','thistle1','thistle2','thistle3', 'thistle4'
+]
+
+colors_lbox.insert(0, *ins_data)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/cscroll.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/cscroll.rb
new file mode 100644
index 0000000000..0d6db69af6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/cscroll.rb
@@ -0,0 +1,131 @@
+#
+# simple scrollable canvas widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($cscroll_demo) && $cscroll_demo
+  $cscroll_demo.destroy 
+  $cscroll_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$cscroll_demo = TkToplevel.new {|w|
+  title("Scrollable Canvas Demonstration")
+  iconname("cscroll")
+  positionWindow(w)
+}
+
+# label 生成
+TkLabel.new($cscroll_demo, 'font'=>$font, 'wraplength'=>'4i', 
+            'justify'=>'left', 'text'=>"このウィンドウにはスクロールバーやマウスのボタン2 でスクロールできるキャンバス widget が表示されています。四角の上でボタン1 をクリックすると、そのインデックスが標準出力に出力されます。"){
+  pack('side'=>'top')
+}
+
+# frame 生成
+$cscroll_buttons = TkFrame.new($cscroll_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $cscroll_demo
+      $cscroll_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'cscroll'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$cscroll_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 設定
+unless $tk_version =~ /^4\.[01]/
+  $cscroll_grid = TkFrame.new($cscroll_demo) {
+    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
+  }
+  TkGrid.rowconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
+  TkGrid.columnconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
+end
+
+# canvas 設定
+$cscroll_canvas = TkCanvas.new($cscroll_demo, 
+                               'relief'=>'sunken', 'borderwidth'=>2,
+                               'scrollregion'=>['-11c', '-11c', '50c', '20c']
+                               ) {|c|
+  if $tk_version =~ /^4\.[01]/
+    pack('expand'=>'yes', 'fill'=>'both') 
+  else
+    grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+         'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+  end
+
+  TkScrollbar.new($cscroll_demo, 'command'=>proc{|*args| c.yview(*args)}) {|vs|
+    c.yscrollcommand(proc{|first,last| vs.set first,last})
+    if $tk_version =~ /^4\.[01]/
+      pack('side'=>'right', 'fill'=>'y')
+    else
+      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    end
+  }
+
+  TkScrollbar.new($cscroll_demo, 'orient'=>'horiz', 
+                  'command'=>proc{|*args| c.xview(*args)}) {|hs|
+    c.xscrollcommand(proc{|first,last| hs.set first,last})
+    if $tk_version =~ /^4\.[01]/
+      pack('side'=>'bottom', 'fill'=>'x') 
+    else
+      grid('in'=>$cscroll_grid, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    end
+  }
+}
+
+bg = $cscroll_canvas.configinfo('bg')[4]
+(0..19).each{|i|
+  x = -10+3*i
+  y = -10
+  (0..9).each{|j|
+    TkcRectangle.new($cscroll_canvas, "#{x}c", "#{y}c", "#{x+2}c", "#{y+2}c", 
+                     'outline'=>'black', 'fill'=>bg, 'tags'=>'rect')
+    TkcText.new($cscroll_canvas, "#{x+1}c", "#{y+1}c", 
+                'text'=>"#{i},#{j}", 'anchor'=>'center', 'tags'=>'text')
+    y += 3
+  }
+}
+
+$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
+$cscroll_canvas.itembind('all', 'Any-Leave', proc{scrollLeave $cscroll_canvas})
+$cscroll_canvas.itembind('all', '1', proc{scrollButton $cscroll_canvas})
+$cscroll_canvas.itembind('all', 'Any-Enter', proc{scrollEnter $cscroll_canvas})
+$cscroll_canvas.bind('2', proc{|x,y| $cscroll_canvas.scan_mark(x,y)}, '%x %y')
+$cscroll_canvas.bind('B2-Motion', 
+                     proc{|x,y| $cscroll_canvas.scan_dragto(x,y)}, '%x %y')
+
+def scrollEnter(c)
+  id = c.find_withtag('current')[0].id
+  id -= 1 if c.gettags('current').include?('text')
+  $oldFill = c.itemconfiginfo(id, 'fill')[4]
+  if TkWinfo.depth(c) > 1
+    c.itemconfigure(id, 'fill'=>'SeaGreen1')
+  else
+    c.itemconfigure(id, 'fill'=>'black')
+    c.itemconfigure(id+1, 'fill'=>'white')
+  end
+end
+
+def scrollLeave(c)
+  id = c.find_withtag('current')[0].id
+  id -= 1 if c.gettags('current').include?('text')
+  c.itemconfigure(id, 'fill'=>$oldFill)
+  c.itemconfigure(id+1, 'fill'=>'black')
+end
+
+def scrollButton(c)
+  id = c.find_withtag('current')[0].id
+  id += 1 unless c.gettags('current').include?('text')
+  print "You buttoned at #{c.itemconfiginfo(id,'text')[4]}\n"
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/ctext.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/ctext.rb
new file mode 100644
index 0000000000..66e1fe8107
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/ctext.rb
@@ -0,0 +1,182 @@
+#
+# Canvas Text widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($ctext_demo) && $ctext_demo
+  $ctext_demo.destroy 
+  $ctext_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$ctext_demo = TkToplevel.new {|w|
+  title("Canvas Text Demonstration")
+  iconname("Text")
+  positionWindow(w)
+}
+
+# label 生成
+TkLabel.new($ctext_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+            'text'=>"このウィンドウにはキャンバスwidgetのテキスト機能をデモするためのテキスト文字列が表示されています。マウスを四角の中に持っていき、クリックすると位置ぎめ用の点からの相対位置を変えたり、行揃えを変えたりすることができます。また以下のような編集のための簡単なバインディングをサポートしています。
+
+  1. マウスを持っていき、クリックし、入力できます。
+  2. ボタン1で選択できます。
+  3. マウスの位置にボタン2で選択したテキストをコピーできます。
+  4.バックスペースをコントロール-Hで挿入カーソルの直前の文字を削除します。
+  5. Deleteキーは挿入カーソルの直後の文字を削除します。"){
+  pack('side'=>'top')
+}
+
+# frame 生成
+$ctext_buttons = TkFrame.new($ctext_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $ctext_demo
+      $ctext_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'ctext'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# canvas 生成
+$ctext_canvas = TkCanvas.new($ctext_demo, 'relief'=>'flat', 
+                             'borderwidth'=>0, 'width'=>500, 'height'=>350)
+$ctext_canvas.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'both')
+
+# font 設定
+textFont = '-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*'
+
+# canvas 設定
+TkcRectangle.new($ctext_canvas, 245, 195, 255, 205, 
+                 'outline'=>'black', 'fill'=>'red')
+
+$ctag_text = TkcTag.new($ctext_canvas)
+$ctag_text.withtag(TkcText.new($ctext_canvas, 250, 200, 
+                               'text'=>"これはキャンバスwidgetのテキスト機能をデモするための文字列です。\n上で述べたような編集を可能とするためのバインディングを施しています。",
+                               'width'=>440, 'anchor'=>'n', 
+                               'font'=>'-*-Helvetica-Medium-R-Normal--*-240-*-*-*-*-*-*', 
+                               'kanjifont'=>'-*-r-*--24-*-jisx0208.1983-0', 
+                               'justify'=>'left') )
+
+$ctag_text.bind('1', proc{|x,y| textB1Press $ctext_canvas,x,y}, "%x %y")
+$ctag_text.bind('B1-Motion', proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
+$ctag_text.bind('Shift-1', 
+        proc{|x,y| $ctext_canvas.seleect_adjust 'current', "@#{x},#{y}"}, 
+        "%x %y")
+$ctag_text.bind('Shift-B1-Motion', 
+                proc{|x,y| textB1Move $ctext_canvas,x,y}, "%x %y")
+$ctag_text.bind('KeyPress', proc{|a| textInsert $ctext_canvas,a}, "%A")
+$ctag_text.bind('Return', proc{textInsert $ctext_canvas,"\n"})
+$ctag_text.bind('Control-h', proc{textBs $ctext_canvas})
+$ctag_text.bind('BackSpace', proc{textBs $ctext_canvas})
+$ctag_text.bind('Delete', proc{textDel $ctext_canvas})
+$ctag_text.bind('2', proc{|x,y| textPaste $ctext_canvas, "@#{x},#{y}"}, 
+                "%x %y")
+
+# Next, create some items that allow the text's anchor position 
+# to be edited.
+
+def mkTextConfig(w,x,y,option,value,color)
+  item = TkcRectangle.new(w, x, y, x+30, y+30, 
+                          'outline'=>'black', 'fill'=>color, 'width'=>1)
+  item.bind('1', proc{$ctag_text.configure option, value})
+  w.addtag_withtag('config', item)
+end
+
+x = 50
+y = 50
+color = 'LightSkyBlue1'
+mkTextConfig $ctext_canvas, x, y, 'anchor', 'se', color
+mkTextConfig $ctext_canvas, x+30, y, 'anchor', 's', color
+mkTextConfig $ctext_canvas, x+60, y, 'anchor', 'sw', color
+mkTextConfig $ctext_canvas, x, y+30, 'anchor', 'e', color
+mkTextConfig $ctext_canvas, x+30, y+30, 'anchor', 'center', color
+mkTextConfig $ctext_canvas, x+60, y+30, 'anchor', 'w', color
+mkTextConfig $ctext_canvas, x, y+60, 'anchor', 'ne', color
+mkTextConfig $ctext_canvas, x+30, y+60, 'anchor', 'n', color
+mkTextConfig $ctext_canvas, x+60, y+60, 'anchor', 'nw', color
+item = TkcRectangle.new($ctext_canvas, x+40, y+40, x+50, y+50, 
+                        'outline'=>'black', 'fill'=>'red')
+item.bind('1', proc{$ctag_text.configure 'anchor', 'center'})
+TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Text Position', 'anchor'=>'s', 
+            'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
+            'fill'=>'brown')
+
+# Lastly, create some items that allow the text's justification to be
+# changed.
+
+x = 350
+y = 50
+color = 'SeaGreen2'
+mkTextConfig $ctext_canvas, x, y, 'justify', 'left', color
+mkTextConfig $ctext_canvas, x+30, y, 'justify', 'center', color
+mkTextConfig $ctext_canvas, x+60, y, 'justify', 'right', color
+TkcText.new($ctext_canvas, x+45, y-5, 'text'=>'Justification', 'anchor'=>'s', 
+            'font'=>'-*-times-medium-r-normal--*-240-*-*-*-*-*-*', 
+            'fill'=>'brown')
+
+$ctext_canvas.itembind('config', 'Enter', proc{textEnter $ctext_canvas})
+$ctext_canvas.itembind('config', 'Leave', 
+                       proc{$ctext_canvas\
+                             .itemconfigure('current', 
+                                            'fill'=>$textConfigFill)})
+
+$textConfigFill = ''
+
+def textEnter(w)
+  $textConfigFill = (w.itemconfiginfo 'current', 'fill')[4]
+  w.itemconfigure 'current', 'fill', 'black'
+end
+
+def textInsert(w, string)
+  return if string == ""
+  begin
+    $ctag_text.dchars 'sel.first', 'sel.last'
+  rescue
+  end
+  $ctag_text.insert 'insert', string
+end
+
+def textPaste(w, pos)
+  begin
+    $ctag_text.insert pos, TkSelection.get
+  rescue
+  end
+end
+
+def textB1Press(w,x,y)
+  w.icursor 'current', "@#{x},#{y}"
+  w.itemfocus 'current'
+  w.focus
+  w.select_from 'current', "@#{x},#{y}"
+end
+
+def textB1Move(w,x,y)
+  w.select_to 'current', "@#{x},#{y}"
+end
+
+def textBs(w)
+  begin
+    $ctag_text.dchars 'sel.first', 'sel.last'
+  rescue
+    char = $ctag_text.index('insert').to_i - 1
+    $ctag_text.dchars(char) if char >= 0
+  end
+end
+
+def textDel(w)
+  begin
+    $ctag_text.dchars 'sel.first', 'sel.last'
+  rescue
+    $ctag_text.dchars 'insert'
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/dialog1.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/dialog1.rb
new file mode 100644
index 0000000000..0d6181bfc6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/dialog1.rb
@@ -0,0 +1,38 @@
+#
+# a dialog box with a local grab (called by 'widget')
+#
+class TkDialog_Demo1 < TkDialog
+  ###############
+  private
+  ###############
+  def title
+    "Dialog with local grab"
+  end
+
+  def message
+    'モーダルダイアログボックスです。Tk の "grab" コマンドを使用してダイアログボックスで「ローカルグラブ」しています。下のいずれかのボタンを実行することによって、このダイアログに答えるまで、このグラブによってアプリケーションの他のウィンドウでは、ポインタ関係のイベントを受け取ることができなくなっています。'
+  end
+
+  def bitmap
+    'info'
+  end
+
+  def default_button
+    0
+  end
+
+  def buttons
+#    "了解 キャンセル コード参照"
+    ["了解", "キャンセル", "コード参照"]
+  end
+end
+
+ret =  TkDialog_Demo1.new('message_config'=>{'wraplength'=>'4i'}).value
+case ret
+when 0
+  print "あなたは「了解」を押しましたね。\n"
+when 1
+  print "あなたは「キャンセル」を押しましたね。\n"
+when 2
+  showCode 'dialog1'
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/dialog2.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/dialog2.rb
new file mode 100644
index 0000000000..a934378dda
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/dialog2.rb
@@ -0,0 +1,42 @@
+#
+# a dialog box with a global grab (called by 'widget')
+#
+class TkDialog_Demo2 < TkDialog
+  ###############
+  private
+  ###############
+  def title
+    "Dialog with global grab"
+  end
+
+  def message
+    'このダイアログボックスはグローバルグラブを使用しています。下のボタンを実行するまで、ディスプレイ上のいかなるものとも対話できません。グローバルグラブを使用することは、まず良い考えではありません。どうしても必要になるまで使おうと思わないで下さい。'
+  end
+
+  def bitmap
+    'info'
+  end
+
+  def default_button
+    0
+  end
+
+  def buttons
+#    "了解 キャンセル コード参照"
+    ["了解", "キャンセル", "コード参照"]
+  end
+end
+
+ret =  TkDialog_Demo2.new('message_config'=>{'wraplength'=>'4i'},
+                          'prev_command'=>proc{|dialog|
+                            Tk.after 100, proc{dialog.grab('global')}
+                          }).value
+case ret
+when 0
+  print "あなたは「了解」を押しましたね。\n"
+when 1
+  print "あなたは「キャンセル」を押しましたね。\n"
+when 2
+  showCode 'dialog2'
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/README b/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/README
new file mode 100644
index 0000000000..90677d3316
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/README
@@ -0,0 +1,7 @@
+This directory contains a collection of demonstration programs that
+are translated into Japanese.  You need to use a Japanized "wish" to
+see these Japanese-translated demonstration programs.  You also need
+to put this directory ("demos.jp") at the next to "demos" since some
+of the programs refer to the image files at "demos".
+
+Please refer to the README file at "demos" for more detail.
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/README.JP b/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/README.JP
new file mode 100644
index 0000000000..42b4929378
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/README.JP
@@ -0,0 +1,14 @@
+This directory contains "widget" demo for the Japanized Tcl7.6/Tk4.2.
+Most of the messages in the original are translated to Japanese.
+But other tools in this directory are not translated.
+
+Following 2 kanji fonts are defined at the beginning of the file "widget."
+
+	-*--24-*-jisx0208.1983-0
+	-*--16-*-jisx0208.1983-0
+
+These fonts are all part of the core distribution of X11R5, so
+if you are running X11R5, you don't have to modify the file.
+
+But if you don't have these fonts, replace them with appropriate ones.
+"-*--14-*-jisx0208.1983-0" will be a good choice.
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/README.tk80 b/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/README.tk80
new file mode 100644
index 0000000000..c71f977d74
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/README.tk80
@@ -0,0 +1,46 @@
+This directory contains a collection of programs to demonstrate
+the features of the Tk toolkit.  The programs are all scripts for
+"wish", a windowing shell.  If wish has been installed in /usr/local
+then you can invoke any of the programs in this directory just
+by typing its file name to your command shell.  Otherwise invoke
+wish with the file as its first argument, e.g., "wish hello".
+The rest of this file contains a brief description of each program.
+Files with names ending in ".tcl" are procedure packages used by one
+or more of the demo programs;  they can't be used as programs by
+themselves so they aren't described below.
+
+hello -		Creates a single button;  if you click on it, a message
+		is typed and the application terminates.
+
+widget -	Contains a collection of demonstrations of the widgets
+		currently available in the Tk library.  Most of the .tcl
+		files are scripts for individual demos available through
+		the "widget" program.
+
+ixset -		A simple Tk-based wrapper for the "xset" program, which
+		allows you to interactively query and set various X options
+		such as mouse acceleration and bell volume.  Thanks to
+		Pierre David for contributing this example.
+
+rolodex -	A mock-up of a simple rolodex application.  It has much of
+		the user interface for such an application but no back-end
+		database.  This program was written in response to Tom
+		LaStrange's toolkit benchmark challenge.
+
+tcolor -	A color editor.  Allows you to edit colors in several
+		different ways, and will also perform automatic updates
+		using "send".
+
+rmt -		Allows you to "hook-up" remotely to any Tk application
+		on the display.  Select an application with the menu,
+		then just type commands:  they'll go to that application.
+
+timer -		Displays a seconds timer with start and stop buttons.
+		Control-c and control-q cause it to exit.
+
+browse -	A simple directory browser.  Invoke it with and argument
+		giving the name of the directory you'd like to browse.
+		Double-click on files or subdirectories to browse them.
+		Control-c and control-q cause the program to exit.
+
+sccs id = SCCS: @(#) README 1.3 96/02/16 10:49:14
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/license.terms b/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/license.terms
new file mode 100644
index 0000000000..03ca6fcb31
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/license.terms
@@ -0,0 +1,39 @@
+This software is copyrighted by the Regents of the University of
+California, Sun Microsystems, Inc., and other parties.  The following
+terms apply to all files associated with the software unless explicitly
+disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license.
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/license.terms.tk80 b/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/license.terms.tk80
new file mode 100644
index 0000000000..03ca6fcb31
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/doc.org/license.terms.tk80
@@ -0,0 +1,39 @@
+This software is copyrighted by the Regents of the University of
+California, Sun Microsystems, Inc., and other parties.  The following
+terms apply to all files associated with the software unless explicitly
+disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license.
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/entry1.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/entry1.rb
new file mode 100644
index 0000000000..edf3b5f71d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/entry1.rb
@@ -0,0 +1,57 @@
+#
+# entry (no scrollbars) widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($entry1_demo) && $entry1_demo
+  $entry1_demo.destroy 
+  $entry1_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$entry1_demo = TkToplevel.new {|w|
+  title("Entry Demonstration (no scrollbars)")
+  iconname("entry1")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($entry1_demo) {
+  font $font
+  wraplength '5i'
+  justify 'left'
+  text "3種類の異なるエントリが表示されています。文字を入力するにはポインタを持って行き、クリックしてからタイプしてください。標準的なMotifの編集機能が、Emacsのキーバインドとともに、サポートされています。例えば、バックスペースとコントロール-Hはカーソルの左の文字を削除し、デリートキーとコントロール-Dはカーソルの右側の文字を削除します。長過ぎてウィンドウに入り切らないものは、マウスのボタン2を押したままドラッグすることでスクロールさせることができます。日本語を入力するのはコントロール-バックスラッシュです。kinput2が動いていれば入力することができます。"
+}
+msg.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($entry1_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $entry1_demo
+      $entry1_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'entry1'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# entry 生成
+e1 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
+e2 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
+e3 = TkEntry.new($entry1_demo, 'relief'=>'sunken')
+[e1,e2,e3].each{|w| w.pack('side'=>'top', 'padx'=>10, 'pady'=>5, 'fill'=>'x')}
+
+# 初期値挿入
+e1.insert(0, '初期値')
+e2.insert('end', "このエントリには長い文字列が入っていて、")
+e2.insert('end', "長すぎてウィンドウには入り切らないので、")
+e2.insert('end', "実際の所終りまで見るにはスクロールさせなければ")
+e2.insert('end', "ならないでしょう。")
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/entry2.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/entry2.rb
new file mode 100644
index 0000000000..7d5740e663
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/entry2.rb
@@ -0,0 +1,88 @@
+#
+# entry (with scrollbars) widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($entry2_demo) && $entry2_demo
+  $entry2_demo.destroy 
+  $entry2_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$entry2_demo = TkToplevel.new {|w|
+  title("Entry Demonstration (with scrollbars)")
+  iconname("entry2")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($entry2_demo) {
+  font $font
+  wraplength '5i'
+  justify 'left'
+  text "3種類の異なるエントリが各々スクロールバー付で表示されています。文字を入力するにはポインタを持って行き、クリックしてからタイプしてください。標準的なMotifの編集機能が、Emacsのキーバインドとともに、サポートされています。例えば、バックスペースとコントロール-Hはカーソルの左の文字を削除し、デリートキーとコントロール-Dはカーソルの右側の文字を削除します。長過ぎてウィンドウに入り切らないものは、マウスのボタン2を押したままドラッグすることでスクロールさせることができます。日本語を入力するのはコントロール-バックスラッシュです。kinput2が動いていれば入力することができます。"
+}
+msg.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($entry2_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $entry2_demo
+      $entry2_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'entry2'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 生成
+TkFrame.new($entry2_demo, 'borderwidth'=>10) {|w|
+  # entry 1
+  s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
+  e1 = TkEntry.new(w, 'relief'=>'sunken') {
+    xscrollcommand proc{|first,last| s1.set first,last}
+  }
+  s1.command(proc{|*args| e1.xview(*args)})
+  e1.pack('side'=>'top', 'fill'=>'x')
+  s1.pack('side'=>'top', 'fill'=>'x')
+
+  # spacer
+  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
+
+  # entry 2
+  s2 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
+  e2 = TkEntry.new(w, 'relief'=>'sunken') {
+    xscrollcommand proc{|first,last| s2.set first,last}
+  }
+  s2.command(proc{|*args| e2.xview(*args)})
+  e2.pack('side'=>'top', 'fill'=>'x')
+  s2.pack('side'=>'top', 'fill'=>'x')
+
+  # spacer
+  TkFrame.new(w, 'width'=>20, 'height'=>10).pack('side'=>'top', 'fill'=>'x')
+
+  # entry 3
+  s3 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
+  e3 = TkEntry.new(w, 'relief'=>'sunken') {
+    xscrollcommand proc{|first,last| s3.set first,last}
+  }
+  s3.command(proc{|*args| e3.xview(*args)})
+  e3.pack('side'=>'top', 'fill'=>'x')
+  s3.pack('side'=>'top', 'fill'=>'x')
+
+  # 初期値挿入
+  e1.insert(0, '初期値')
+  e2.insert('end', "このエントリには長い文字列が入っていて、")
+  e2.insert('end', "長すぎてウィンドウには入り切らないので、")
+  e2.insert('end', "実際の所終りまで見るにはスクロールさせなければ")
+  e2.insert('end', "ならないでしょう。")
+
+}.pack('side'=>'top', 'fill'=>'x', 'expand'=>'yes')
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/entry3.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/entry3.rb
new file mode 100644
index 0000000000..f57dc13553
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/entry3.rb
@@ -0,0 +1,204 @@
+# entry3.rb --
+#
+# This demonstration script creates several entry widgets whose
+# permitted input is constrained in some way.  It also shows off a
+# password entry.
+#
+# based on Tcl/Tk8.4.4 widget demos
+
+if defined?($entry3_demo) && $entry3_demo
+  $entry3_demo.destroy 
+  $entry3_demo = nil
+end
+
+$entry3_demo = TkToplevel.new {|w|
+  title("Constrained Entry Demonstration")
+  iconname("entry3")
+  positionWindow(w)
+}
+
+TkLabel.new($entry3_demo, 
+            :font=>$font, :wraplength=>'5i', :justify=>:left, 
+            :text=><<EOL).pack(:side=>:top)
+以下には４種類のエントリボックスが表示されています．各エントリボックスは，\
+マウスクリックで選択し文字を打ち込むことが可能ですが，それぞれがどのような\
+入力を受け付けることができるかには制約が設けられています．\
+一つめのエントリボックスは整数と見なされる文字列か入力文字がない空の状態か\
+の場合だけを受け付け，問題がある場合はエントリボックスが点滅します\
+（フォーカスが去る時にチェックされます）．\
+二つめのエントリボックスは，入力された文字列の長さが\
+１０文字未満の場合だけを受け付け，制限を越えて書き込もうとしたときには\
+ベルを鳴らして知らせます．\
+三つめは米国の電話番号を受け付けるエントリボックスです．\
+アルファベットは，電話機のダイヤル上で対応づけられている数字に変換されます．\
+不適切な文字が入力されたり数字以外の文字の位置に数字を入力しようとしたり\
+した場合には警告のベルが鳴ります．\
+四つめのエントリボックスは，８文字までの入力を受け付ける\
+パスワードフィールドです（８文字以上は特に警告を出すことなく無視されます）．\
+入力された文字はアスタリスク記号に置き換えて表示されます．
+EOL
+
+TkFrame.new($entry3_demo){|f|
+  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
+
+  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
+                 $entry3_demo.destroy
+                 $entry3_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
+                 showCode 'entry3'
+               }).pack(:side=>:left, :expand=>true)
+}
+
+# focusAndFlash --
+# Error handler for entry widgets that forces the focus onto the
+# widget and makes the widget flash by exchanging the foreground and
+# background colours at intervals of 200ms (i.e. at approximately
+# 2.5Hz).
+#
+# Arguments:
+# widget -      entry widget to flash
+# fg -          Initial foreground colour
+# bg -          Initial background colour
+# count -       Counter to control the number of times flashed
+def focusAndFlash(widget, fg, bg, count=5)
+  return if count <= 0
+  TkTimer.new(100, count, 
+              proc{widget.configure(:foreground=>bg, :background=>fg)}, 
+              proc{widget.configure(:foreground=>fg, :background=>bg)}
+              ).start
+  widget.focus(true)
+end
+
+l1 = TkLabelFrame.new($entry3_demo, :text=>"整数エントリ")
+TkEntry.new(l1, :validate=>:focus, 
+            :vcmd=>[
+              proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
+            ]) {|e|
+  invalidcommand [proc{|w| focusAndFlash(w, e.fg, e.bg)}, '%W']
+  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
+}
+
+l2 = TkLabelFrame.new($entry3_demo, :text=>"長さ制約付きエントリ")
+TkEntry.new(l2, :validate=>:key, :invcmd=>proc{Tk.bell}, 
+            :vcmd=>[proc{|s| s.length < 10}, '%P']
+            ).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
+
+### PHONE NUMBER ENTRY ###
+# Note that the source to this is quite a bit longer as the behaviour
+# demonstrated is a lot more ambitious than with the others.
+
+# Initial content for the third entry widget
+entry3content = TkVariable.new("1-(000)-000-0000")
+
+# Mapping from alphabetic characters to numbers.
+$phoneNumberMap = {}
+Hash[*(%w(abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9))].each{|chars, n|
+  chars.split('').each{|c|
+    $phoneNumberMap[c] = n
+    $phoneNumberMap[c.upcase] = n
+  }
+}
+
+# phoneSkipLeft --
+# Skip over fixed characters in a phone-number string when moving left.
+#
+# Arguments:
+# widget -      The entry widget containing the phone-number.
+def phoneSkipLeft(widget)
+  idx = widget.index('insert')
+  if idx == 8
+    # Skip back two extra characters
+    widget.cursor = idx - 2
+  elsif idx == 7 || idx == 12
+    # Skip back one extra character
+    widget.cursor = idx - 1
+  elsif idx <= 3
+    # Can't move any further
+    Tk.bell
+    Tk.callback_break
+  end
+end
+
+# phoneSkipRight --
+# Skip over fixed characters in a phone-number string when moving right.
+#
+# Arguments:
+# widget -      The entry widget containing the phone-number.
+# add - Offset to add to index before calculation (used by validation.)
+def phoneSkipRight(widget, add = 0)
+  idx = widget.index('insert')
+  if (idx + add == 5)
+    # Skip forward two extra characters
+    widget.cursor = idx + 2
+  elsif (idx + add == 6 || idx + add == 10)
+    # Skip forward one extra character
+    widget.cursor = idx + 1
+  elsif (idx + add == 15 && add == 0)
+    # Can't move any further
+    Tk.bell
+    Tk.callback_break
+  end
+end
+
+# validatePhoneChange --
+# Checks that the replacement (mapped to a digit) of the given
+# character in an entry widget at the given position will leave a
+# valid phone number in the widget.
+#
+# widget - entry widget to validate
+# vmode -  The widget's validation mode
+# idx -    The index where replacement is to occur
+# char -   The character (or string, though that will always be
+#          refused) to be overwritten at that point.
+
+def validatePhoneChange(widget, vmode, idx, char)
+  return true if idx == nil
+  Tk.after_idle(proc{widget.configure(:validate=>vmode, 
+                                      :invcmd=>proc{Tk.bell})})
+  if !(idx<3 || idx==6 || idx==7 || idx==11 || idx>15) && char =~ /[0-9A-Za-z]/
+    widget.delete(idx)
+    widget.insert(idx, $phoneNumberMap[char] || char)
+    Tk.after_idle(proc{phoneSkipRight(widget, -1)})
+    # Tk.update(true) # Don't work 'update' inter validation callback.
+                      # It depends on Tcl/Tk side (tested on Tcl/Tk8.5a1). 
+    return true
+  end
+  return false
+end
+
+
+l3 = TkLabelFrame.new($entry3_demo, :text=>"米国電話番号エントリ")
+TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell}, 
+            :textvariable=>entry3content, 
+            :vcmd=>[
+              proc{|w,v,i,s| validatePhoneChange(w,v,i,s)}, 
+              "%W %v %i %S"
+            ]){|e|
+  # Click to focus goes to the first editable character...
+  bind('FocusIn', proc{|d,w|
+         if d != "NotifyAncestor"
+           w.cursor = 3
+           Tk.after_idle(proc{w.selection_clear})
+         end
+       }, '%d %W')
+  bind('Left',  proc{|w| phoneSkipLeft(w)},  '%W')
+  bind('Right', proc{|w| phoneSkipRight(w)}, '%W')
+  pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
+}
+
+l4 = TkLabelFrame.new($entry3_demo, :text=>"パスワードエントリ")
+TkEntry.new(l4, :validate=>:key, :show=>'*', 
+            :vcmd=>[
+              proc{|s| s.length <= 8}, 
+              '%P'
+            ]).pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
+
+TkFrame.new($entry3_demo){|f|
+  lower
+  TkGrid.configure(l1, l2, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
+  TkGrid.configure(l3, l4, :in=>f, :padx=>'3m', :pady=>'1m', :sticky=>:ew)
+  TkGrid.columnconfigure(f, [0,1], :uniform=>1)
+  pack(:fill=>:both, :expand=>true)
+}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/filebox.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/filebox.rb
new file mode 100644
index 0000000000..f3608ab70f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/filebox.rb
@@ -0,0 +1,96 @@
+#
+# widget demo prompts the user to select a file (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($filebox_demo) && $entry2_demo
+  $filebox_demo.destroy 
+  $filebox_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$filebox_demo = TkToplevel.new {|w|
+  title("File Selection Dialogs")
+  iconname("filebox")
+  positionWindow(w)
+}
+
+# label 生成
+TkLabel.new($filebox_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+            'text'=>"エントリにファイル名を直接入力するか、\"Browse\" ボタンを押してファイル選択ダイアログからファイル名を選んで下さい。").pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($filebox_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $filebox_demo
+      $filebox_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'filebox'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 生成
+['開く', '保存'].each{|type|
+  TkFrame.new($filebox_demo) {|f|
+    TkLabel.new(f, 'text'=>"ファイルを#{type}: ", 'anchor'=>'e')\
+    .pack('side'=>'left')
+
+    TkEntry.new(f, 'width'=>20) {|e|
+      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
+
+      TkButton.new(f, 'text'=>'Browse ...', 
+                   'command'=>proc{fileDialog $filebox_demo,e,type})\
+      .pack('side'=>'left')
+    }
+
+    pack('fill'=>'x', 'padx'=>'1c', 'pady'=>3)
+  }
+}
+
+$tk_strictMotif = TkVarAccess.new('tk_strictMotif')
+if ($tk_platform['platform'] == 'unix')
+  TkCheckButton.new($filebox_demo, 
+                    'text'=>'Motifスタイルのダイアログを用いる', 
+                    'variable'=>$tk_strictMotif, 
+                    'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
+end
+
+def fileDialog(w,ent,operation)
+  #    Type names         Extension(s)             Mac File Type(s)
+  #
+  #--------------------------------------------------------
+  types = [
+    ['Text files',       ['.txt','.doc']          ], 
+    ['Text files',       [],                      'TEXT' ], 
+    ['Ruby Scripts',     ['.rb'],                 'TEXT' ], 
+    ['Tcl Scripts',      ['.tcl'],                'TEXT' ], 
+    ['C Source Files',   ['.c','.h']              ], 
+    ['All Source Files', ['.rb','.tcl','.c','.h'] ], 
+    ['Image Files',      ['.gif']                 ], 
+    ['Image Files',      ['.jpeg','.jpg']         ], 
+    ['Image Files',      [],                      ['GIFF','JPEG']], 
+    ['All files',        '*'                      ]
+  ]
+
+  if operation == '開く'
+    file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
+  else
+    file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w, 
+                          'initialfile'=>'Untitled', 
+                          'defaultextension'=>'.txt')
+  end
+  if file != ""
+    ent.delete 0, 'end'
+    ent.insert 0, file
+    ent.xview 'end'
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/floor.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/floor.rb
new file mode 100644
index 0000000000..b029580bd6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/floor.rb
@@ -0,0 +1,1718 @@
+#
+# floorDisplay widget demo (called by 'widget')
+#
+
+# floorDisplay --
+# Recreate the floorplan display in the canvas given by "w".  The
+# floor given by "active" is displayed on top with its office structure
+# visible.
+#
+# Arguments:
+# w -           Name of the canvas window.
+# active -      Number of active floor (1, 2, or 3).
+
+def floorDisplay(w,active)
+  return if $activeFloor == active
+
+  w.delete('all')
+  $activeFloor = active
+
+  # First go through the three floors, displaying the backgrounds for 
+  # each floor.
+
+  floor_bg1(w,$floor_colors['bg1'],$floor_colors['outline1'])
+  floor_bg2(w,$floor_colors['bg2'],$floor_colors['outline2'])
+  floor_bg3(w,$floor_colors['bg3'],$floor_colors['outline3'])
+
+  # Raise the background for the active floor so that it's on top.
+
+  w.raise("floor#{active}")
+
+  # Create a dummy item just to mark this point in the display list, 
+  # so we can insert highlights here.
+
+  TkcRectangle.new(w,0,100,1,101, 'fill'=>'', 'outline'=>'', 'tags'=>'marker')
+
+  # Add the walls and labels for the active floor, along with 
+  # transparent polygons that define the rooms on the floor.
+  # Make sure that the room polygons are on top.
+
+  $floorLabels.clear
+  $floorItems.clear
+  send("floor_fg#{active}", w, $floor_colors['offices'])
+  w.raise('room')
+
+  # Offset the floors diagonally from each other.
+
+  w.move('floor1', '2c', '2c')
+  w.move('floor2', '1c', '1c')
+
+  # Create items for the room entry and its label.
+  TkcWindow.new(w, 600, 100, 'anchor'=>'w', 'window'=>$floor_entry)
+  TkcText.new(w, 600, 100, 'anchor'=>'e', 'text'=>"部屋番号: ")
+  w['scrollregion'] = w.bbox('all')
+end
+
+# newRoom --
+# This method is invoked whenever the mouse enters a room
+# in the floorplan.  It changes tags so that the current room is
+# highlighted.
+#
+# Arguments:
+# w  -          The name of the canvas window.
+
+def newRoom(w)
+  id = w.find_withtag('current')[0]
+  $currentRoom.value = $floorLabels[id.id] if id != ""
+  Tk.update(true)
+end
+
+# roomChanged --
+# This method is invoked whenever the currentRoom variable changes.
+# It highlights the current room and unhighlights any previous room.
+#
+# Arguments:
+# w -           The canvas window displaying the floorplan.
+# args -        Not used.
+
+def roomChanged(w,*args)
+  w.delete('highlight')
+  item = $floorItems[$currentRoom.value]
+  return if item == nil
+  new = TkcPolygon.new(w, *(w.coords(item)))
+  new.configure('fill'=>$floor_colors['active'], 'tags'=>'highlight')
+  w.raise(new, 'marker')
+end
+
+# floor_bg1 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the background information for the first
+# floor.
+#
+# Arguments:
+# w -           The canvas window.
+# fill -        Fill color to use for the floor's background.
+# outline -     Color to use for the floor's outline.
+
+def floor_bg1(w,fill,outline)
+  TkcPolygon.new(w,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
+                 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
+                 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
+                 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
+                 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
+                 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
+                 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
+                 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
+                 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
+                 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
+                 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
+                 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
+                 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
+  TkcLine.new(w,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  TkcLine.new(w,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
+end
+
+# floor_bg2 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the background information for the first
+# floor.
+#
+# Arguments:
+# w -           The canvas window.
+# fill -        Fill color to use for the floor's background.
+# outline -     Color to use for the floor's outline.
+
+def floor_bg2(w,fill,outline)
+  TkcPolygon.new(w,559,129,484,129,484,162,398,162,398,129,315,129,
+                 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
+                 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
+                 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
+                 367,802,367,802,129,725,129,725,133,559,133,559,129,
+                 'tags'=>['floor2','bg'], 'fill'=>fill)
+  TkcLine.new(w,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+end
+
+# floor_bg3 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the background information for the first
+# floor.
+#
+# Arguments:
+# w -           The canvas window.
+# fill -        Fill color to use for the floor's background.
+# outline -     Color to use for the floor's outline.
+
+def floor_bg3(w,fill,outline)
+  TkcPolygon.new(w,159,300,107,300,107,248,159,248,159,129,96,129,96,
+                 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
+                 'tags'=>['floor3','bg'], 'fill'=>fill)
+  TkcPolygon.new(w,258,370,258,329,350,329,350,311,399,311,399,129,
+                 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
+                 'tags'=>['floor3','bg'], 'fill'=>fill)
+  TkcLine.new(w,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  TkcLine.new(w,107,300,159,300,159,248,107,248,107,300, 
+              'fill'=>outline, 'tags'=>['floor3','bg'])
+end
+
+# floor_fg1 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the foreground information for the first
+# floor (office outlines and numbers).
+#
+# Arguments:
+# w -           The canvas window.
+# color -       Color to use for drawing foreground information.
+
+def floor_fg1(w,color)
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '101'
+  $floorItems['101'] = i
+  TkcText.new(w,358,209, 'text'=>'101', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Pub Lift1'
+  $floorItems['Pub Lift1'] = i
+  TkcText.new(w,323,223, 'text'=>'Pub Lift1', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Priv Lift1'
+  $floorItems['Priv Lift1'] = i
+  TkcText.new(w,323,188, 'text'=>'Priv Lift1', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '110'
+  $floorItems['110'] = i
+  TkcText.new(w,21.5,363, 'text'=>'110', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '109'
+  $floorItems['109'] = i
+  TkcText.new(w,67,363, 'text'=>'109', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '111'
+  $floorItems['111'] = i
+  TkcText.new(w,28.5,276.5, 'text'=>'111', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '117B'
+  $floorItems['117B'] = i
+  TkcText.new(w,88.5,278.5, 'text'=>'117B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '112'
+  $floorItems['112'] = i
+  TkcText.new(w,28.5,227.5, 'text'=>'112', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '113'
+  $floorItems['113'] = i
+  TkcText.new(w,28.5,179.5, 'text'=>'113', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '117A'
+  $floorItems['117A'] = i
+  TkcText.new(w,82,180.5, 'text'=>'117A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '117'
+  $floorItems['117'] = i
+  TkcText.new(w,65,235, 'text'=>'117', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '114'
+  $floorItems['114'] = i
+  TkcText.new(w,28.5,135, 'text'=>'114', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '115'
+  $floorItems['115'] = i
+  TkcText.new(w,74,141.5, 'text'=>'115', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '116'
+  $floorItems['116'] = i
+  TkcText.new(w,48.5,70, 'text'=>'116', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '118'
+  $floorItems['118'] = i
+  TkcText.new(w,108.5,102, 'text'=>'118', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
+                     163,91,163,112,149,112,149,128, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '120'
+  $floorItems['120'] = i
+  TkcText.new(w,189.5,111.5, 'text'=>'120', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
+                     156,192,156,169,175,169,175,246,79,246, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '122'
+  $floorItems['122'] = i
+  TkcText.new(w,131,207.5, 'text'=>'122', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '121'
+  $floorItems['121'] = i
+  TkcText.new(w,146,180, 'text'=>'121', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '106A'
+  $floorItems['106A'] = i
+  TkcText.new(w,112.5,304.5, 'text'=>'106A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '105'
+  $floorItems['105'] = i
+  TkcText.new(w,124.5,278.5, 'text'=>'105', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '106B'
+  $floorItems['106B'] = i
+  TkcText.new(w,163,304.5, 'text'=>'106B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '104'
+  $floorItems['104'] = i
+  TkcText.new(w,184,278.5, 'text'=>'104', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '108'
+  $floorItems['108'] = i
+  TkcText.new(w,114.5,361, 'text'=>'108', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '107'
+  $floorItems['107'] = i
+  TkcText.new(w,198,361, 'text'=>'107', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Smoking'
+  $floorItems['Smoking'] = i
+  TkcText.new(w,280,341, 'text'=>'Smoking', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '123'
+  $floorItems['123'] = i
+  TkcText.new(w,245.5,190.5, 'text'=>'123', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '103'
+  $floorItems['103'] = i
+  TkcText.new(w,259,287, 'text'=>'103', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '124'
+  $floorItems['124'] = i
+  TkcText.new(w,356,150, 'text'=>'124', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '125'
+  $floorItems['125'] = i
+  TkcText.new(w,392,217.5, 'text'=>'125', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '126'
+  $floorItems['126'] = i
+  TkcText.new(w,436.5,185.5, 'text'=>'126', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
+                     486,253,486,239,474,239,474,209, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '127'
+  $floorItems['127'] = i
+  TkcText.new(w,436.5,'231', 'text'=>'127', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
+                     490,188,490,204,476,204,476,164, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'MShower'
+  $floorItems['MShower'] = i
+  TkcText.new(w,488.5,'184', 'text'=>'MShower', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Closet'
+  $floorItems['Closet'] = i
+  TkcText.new(w,502.5,190, 'text'=>'Closet', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'WShower'
+  $floorItems['WShower'] = i
+  TkcText.new(w,494.5,230, 'text'=>'WShower', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
+                     697,166,697,275,553,275,531,254,515,254,
+                     515,174,503,174,503,161,486,161, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '130'
+  $floorItems['130'] = i
+  TkcText.new(w,638.5,205, 'text'=>'130', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
+                     342,246,397,246,397,276,393,276,
+                     393,309,300,309,300,248,308,248, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '102'
+  $floorItems['102'] = i
+  TkcText.new(w,367.5,278.5, 'text'=>'102', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '128'
+  $floorItems['128'] = i
+  TkcText.new(w,441.5,265.5, 'text'=>'128', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
+                     552,277,561,277,561,325,510,325,
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '129'
+  $floorItems['129'] = i
+  TkcText.new(w,535.5,293, 'text'=>'129', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
+                     642,389,561,389,561,277,696,277, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '133'
+  $floorItems['133'] = i
+  TkcText.new(w,628.5,335, 'text'=>'133', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '132'
+  $floorItems['132'] = i
+  TkcText.new(w,771,334, 'text'=>'132', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '134'
+  $floorItems['134'] = i
+  TkcText.new(w,749.5,224, 'text'=>'134', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '135'
+  $floorItems['135'] = i
+  TkcText.new(w,763,148.5, 'text'=>'135', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
+                     304,312,396,312,396,288,400,288,404,288,
+                     409,290,413,292,418,297,421,302,422,309,
+                     421,318,417,325,411,330,405,332,397,333,
+                     344,333,340,334,336,336,335,338,332,342,
+                     331,347,332,351,334,354,336,357,341,359, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Ramona Stair'
+  $floorItems['Ramona Stair'] = i
+  TkcText.new(w,368,323, 'text'=>'Ramona Stair', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
+                     122,28,123,32,123,68,220,68,220,87,90,87,90,23, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'University Stair'
+  $floorItems['University Stair'] = i
+  TkcText.new(w,155,77.5, 'text'=>'University Stair', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
+                     358,48,363,39,365,29,348,25,335,22,321,14,
+                     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
+                     227,13,223,17,221,22,220,34,260,34, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Plaza Stair'
+  $floorItems['Plaza Stair'] = i
+  TkcText.new(w,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
+                     323,56,337,70,350,83,365,94,377,100,
+                     386,104,386,128,220,128, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = 'Plaza Deck'
+  $floorItems['Plaza Deck'] = i
+  TkcText.new(w,303,81, 'text'=>'Plaza Deck', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '106'
+  $floorItems['106'] = i
+  TkcText.new(w,131.5,318.5, 'text'=>'106', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
+                     95,128,114,128,114,151,157,151,157,153,112,153,
+                     112,130,97,130,97,168,175,168,175,131,146,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels[i.id] = '119'
+  $floorItems['119'] = i
+  TkcText.new(w,143.5,133, 'text'=>'119', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  TkcLine.new(w,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
+  TkcLine.new(w,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+end
+
+# floor_fg2 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the foreground information for the second
+# floor (office outlines and numbers).
+#
+# Arguments:
+# w -           The canvas window.
+# color -       Color to use for drawing foreground information.
+
+def floor_fg2(w,color)
+  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
+                     800,222,800,168,748,168, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '238'
+  $floorItems['238'] = i
+  TkcText.new(w,774,195, 'text'=>'238', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '237'
+  $floorItems['237'] = i
+  TkcText.new(w,763,148.5, 'text'=>'237', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
+                     643,324,643,291,641,291,641,205,696,205,
+                     696,291,694,291,694,314,715,314,715,291,
+                     715,205,755,205,755,190,724,190,724,187, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '246'
+  $floorItems['246'] = i
+  TkcText.new(w,600,264, 'text'=>'246', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '247'
+  $floorItems['247'] = i
+  TkcText.new(w,668.5,296.5, 'text'=>'247', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
+                     397,246,397,255,476,255,476,250,482,250,559,250,
+                     559,274,482,274,482,278,396,278,396,274,232,274, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '202'
+  $floorItems['202'] = i
+  TkcText.new(w,285.5,260, 'text'=>'202', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
+                     306,196,306,180,175,180,175,169,156,169,
+                     156,196,176,196,176,228, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '206'
+  $floorItems['206'] = i
+  TkcText.new(w,143,267, 'text'=>'206', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '212'
+  $floorItems['212'] = i
+  TkcText.new(w,28.5,307.5, 'text'=>'212', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '245'
+  $floorItems['245'] = i
+  TkcText.new(w,521.5,300.5, 'text'=>'245', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '244'
+  $floorItems['244'] = i
+  TkcText.new(w,579.5,357.5, 'text'=>'244', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '243'
+  $floorItems['243'] = i
+  TkcText.new(w,622,357.5, 'text'=>'243', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '242'
+  $floorItems['242'] = i
+  TkcText.new(w,666.5,340.5, 'text'=>'242', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = 'Barbecue Deck'
+  $floorItems['Barbecue Deck'] = i
+  TkcText.new(w,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '240'
+  $floorItems['240'] = i
+  TkcText.new(w,736,288, 'text'=>'240', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '241'
+  $floorItems['241'] = i
+  TkcText.new(w,722,340.5, 'text'=>'241', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '239'
+  $floorItems['239'] = i
+  TkcText.new(w,736,233.5, 'text'=>'239', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '248'
+  $floorItems['248'] = i
+  TkcText.new(w,669,241.5, 'text'=>'248', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '236'
+  $floorItems['236'] = i
+  TkcText.new(w,700,160, 'text'=>'236', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '235'
+  $floorItems['235'] = i
+  TkcText.new(w,651.5,160, 'text'=>'235', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
+                     572,143,579,143,579,185,626,185, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '234'
+  $floorItems['234'] = i
+  TkcText.new(w,606,160, 'text'=>'234', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
+                     578,185,527,185,527,131,557,131, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '233'
+  $floorItems['233'] = i
+  TkcText.new(w,552.5,158, 'text'=>'233', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '230'
+  $floorItems['230'] = i
+  TkcText.new(w,516.5,227, 'text'=>'230', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '232'
+  $floorItems['232'] = i
+  TkcText.new(w,500.5,158, 'text'=>'232', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '229'
+  $floorItems['229'] = i
+  TkcText.new(w,485.5,195, 'text'=>'229', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '227'
+  $floorItems['227'] = i
+  TkcText.new(w,436.5,185.5, 'text'=>'227', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '228'
+  $floorItems['228'] = i
+  TkcText.new(w,436.5,231, 'text'=>'228', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '226'
+  $floorItems['226'] = i
+  TkcText.new(w,392,217.5, 'text'=>'226', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '225'
+  $floorItems['225'] = i
+  TkcText.new(w,356.5,150, 'text'=>'225', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '224'
+  $floorItems['224'] = i
+  TkcText.new(w,270,223.5, 'text'=>'224', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '223'
+  $floorItems['223'] = i
+  TkcText.new(w,292,157, 'text'=>'223', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '222'
+  $floorItems['222'] = i
+  TkcText.new(w,244.5,157, 'text'=>'222', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '221'
+  $floorItems['221'] = i
+  TkcText.new(w,198,157, 'text'=>'221', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '204'
+  $floorItems['204'] = i
+  TkcText.new(w,324,301.5, 'text'=>'204', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '205'
+  $floorItems['205'] = i
+  TkcText.new(w,265.5,307, 'text'=>'205', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '207'
+  $floorItems['207'] = i
+  TkcText.new(w,234,362.5, 'text'=>'207', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '208'
+  $floorItems['208'] = i
+  TkcText.new(w,187,362.5, 'text'=>'208', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '209'
+  $floorItems['209'] = i
+  TkcText.new(w,138.5,362.5, 'text'=>'209', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '217'
+  $floorItems['217'] = i
+  TkcText.new(w,71,192, 'text'=>'217', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '217A'
+  $floorItems['217A'] = i
+  TkcText.new(w,93,179.5, 'text'=>'217A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '216'
+  $floorItems['216'] = i
+  TkcText.new(w,71,145.5, 'text'=>'216', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '215'
+  $floorItems['215'] = i
+  TkcText.new(w,28.5,157, 'text'=>'215', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '214'
+  $floorItems['214'] = i
+  TkcText.new(w,28.5,203.5, 'text'=>'214', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '213'
+  $floorItems['213'] = i
+  TkcText.new(w,28.5,252, 'text'=>'213', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '210'
+  $floorItems['210'] = i
+  TkcText.new(w,90.5,362.5, 'text'=>'210', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '211'
+  $floorItems['211'] = i
+  TkcText.new(w,33,364.5, 'text'=>'211', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '203'
+  $floorItems['203'] = i
+  TkcText.new(w,367.5,292.5, 'text'=>'203', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
+                     154,198,154,192,109,192,109,169,99,169, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '220'
+  $floorItems['220'] = i
+  TkcText.new(w,132.5,208.5, 'text'=>'220', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = 'Priv Lift2'
+  $floorItems['Priv Lift2'] = i
+  TkcText.new(w,323,188, 'text'=>'Priv Lift2', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = 'Pub Lift 2'
+  $floorItems['Pub Lift 2'] = i
+  TkcText.new(w,323,223, 'text'=>'Pub Lift 2', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '218'
+  $floorItems['218'] = i
+  TkcText.new(w,136,149.5, 'text'=>'218', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '219'
+  $floorItems['219'] = i
+  TkcText.new(w,132.5,180, 'text'=>'219', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels[i.id] = '201'
+  $floorItems['201'] = i
+  TkcText.new(w,358,209, 'text'=>'201', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  TkcLine.new(w,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
+end
+
+# floor_fg3 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the foreground information for the third
+# floor (office outlines and numbers).
+#
+# Arguments:
+# w -           The canvas window.
+# color -       Color to use for drawing foreground information.
+
+def floor_fg3(w,color)
+  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '316'
+  $floorItems['316'] = i
+  TkcText.new(w,79.5,204, 'text'=>'316', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '309'
+  $floorItems['309'] = i
+  TkcText.new(w,138.5,345.5, 'text'=>'309', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '308'
+  $floorItems['308'] = i
+  TkcText.new(w,187.5,345.5, 'text'=>'308', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '307'
+  $floorItems['307'] = i
+  TkcText.new(w,234,345.5, 'text'=>'307', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '305'
+  $floorItems['305'] = i
+  TkcText.new(w,270.5,301.5, 'text'=>'305', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '324B'
+  $floorItems['324B'] = i
+  TkcText.new(w,247.5,211, 'text'=>'324B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '324A'
+  $floorItems['324A'] = i
+  TkcText.new(w,247.5,240.5, 'text'=>'324A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '320'
+  $floorItems['320'] = i
+  TkcText.new(w,200,157, 'text'=>'320', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '310'
+  $floorItems['310'] = i
+  TkcText.new(w,90.5,345.5, 'text'=>'310', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '312'
+  $floorItems['312'] = i
+  TkcText.new(w,45.5,299, 'text'=>'312', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '313'
+  $floorItems['313'] = i
+  TkcText.new(w,45.5,252, 'text'=>'313', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '314'
+  $floorItems['314'] = i
+  TkcText.new(w,40.5,203.5, 'text'=>'314', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '315'
+  $floorItems['315'] = i
+  TkcText.new(w,59,157, 'text'=>'315', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '316B'
+  $floorItems['316B'] = i
+  TkcText.new(w,95,215, 'text'=>'316B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '316A'
+  $floorItems['316A'] = i
+  TkcText.new(w,95,191, 'text'=>'316A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
+                     174,198,174,226,101,226,101,179,97,179, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '319'
+  $floorItems['319'] = i
+  TkcText.new(w,141.5,209, 'text'=>'319', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '311'
+  $floorItems['311'] = i
+  TkcText.new(w,29.5,361, 'text'=>'311', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '318'
+  $floorItems['318'] = i
+  TkcText.new(w,132.5,180, 'text'=>'318', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '317'
+  $floorItems['317'] = i
+  TkcText.new(w,136,149.5, 'text'=>'317', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '323'
+  $floorItems['323'] = i
+  TkcText.new(w,290,207.5, 'text'=>'323', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '325'
+  $floorItems['325'] = i
+  TkcText.new(w,290,235.5, 'text'=>'325', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '321'
+  $floorItems['321'] = i
+  TkcText.new(w,243.5,157, 'text'=>'321', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
+                     264,181,264,135,314,135, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '322'
+  $floorItems['322'] = i
+  TkcText.new(w,293.5,163.5, 'text'=>'322', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = 'Pub Lift3'
+  $floorItems['Pub Lift3'] = i
+  TkcText.new(w,323,223, 'text'=>'Pub Lift3', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = 'Priv Lift3'
+  $floorItems['Priv Lift3'] = i
+  TkcText.new(w,323,188, 'text'=>'Priv Lift3', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '303'
+  $floorItems['303'] = i
+  TkcText.new(w,373.5,292.5, 'text'=>'303', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
+                     244,230,244,221,252,221,252,203, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '324'
+  $floorItems['324'] = i
+  TkcText.new(w,262,226, 'text'=>'324', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '304'
+  $floorItems['304'] = i
+  TkcText.new(w,324,301.5, 'text'=>'304', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '301'
+  $floorItems['301'] = i
+  TkcText.new(w,358,209, 'text'=>'301', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '327'
+  $floorItems['327'] = i
+  TkcText.new(w,387,215.5, 'text'=>'327', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '326'
+  $floorItems['326'] = i
+  TkcText.new(w,365.5,150, 'text'=>'326', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
+                     375,274,397,274,397,248,339,248,339,242,308,242, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '302'
+  $floorItems['302'] = i
+  TkcText.new(w,319.5,261, 'text'=>'302', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
+                     272,193,263,180,242,180,175,180,175,169,156,169,
+                     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
+                     107,248,160,248,160,301,107,301,107,275,70,275, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels[i.id] = '306'
+  $floorItems['306'] = i
+  TkcText.new(w,200.5,284.5, 'text'=>'306', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  TkcLine.new(w,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+  TkcLine.new(w,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+end
+
+# Below is the "main program" that creates the floorplan demonstration.
+
+# toplevel widget が存在すれば削除する
+if defined?($floor_demo) && $floor_demo
+  $floor_demo.destroy 
+  $floor_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$floor_demo = TkToplevel.new {|w|
+  title("Floorplan Canvas Demonstration")
+  iconname("Floorplan")
+  positionWindow(w)
+  geometry('+20+20')
+  minsize(100,100)
+}
+
+# label 生成
+TkLabel.new($floor_demo, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
+            'text'=>"このウィンドウにはディジタルエクイップメント社のウェスタンリサーチラボラトリ (DECWRL) の間取りが書かれたキャンバス widget が入っています。これは 3階建てで、常にそのうちの1階分が選択、つまりその間取りが表示されるようになっています。ある階を選択するには、その上でマウスの左ボタンをクリックしてください。マウスが選択されている階の上を動くと、その下にある部屋の色が変わり、部屋番号が「部屋番号:」エントリに表示されます。また、エントリに部屋番号を書くとその部屋の色が変わります。"){
+  pack('side'=>'top')
+}
+
+# frame 生成
+$floor_buttons = TkFrame.new($floor_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $floor_demo
+      $floor_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'floor'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$floor_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# 変数設定
+$floorLabels = {}
+$floorItems = {}
+
+# canvas 設定
+if $tk_version =~ /^4\.[01]/
+  $floor_canvas_frame = TkFrame.new($floor_demo,'bd'=>2,'relief'=>'sunken',
+                                    'highlightthickness'=>2)
+  $floor_canvas = TkCanvas.new($floor_canvas_frame, 
+                               'width'=>900, 'height'=>500, 'borderwidth'=>0, 
+                               'highlightthickness'=>0) {|c|
+    TkScrollbar.new($floor_demo, 'orient'=>'horiz', 
+                    'command'=>proc{|*args| c.xview(*args)}){|hs|
+      c.xscrollcommand(proc{|first,last| hs.set first,last})
+      pack('side'=>'bottom', 'fill'=>'x')
+    }
+    TkScrollbar.new($floor_demo, 'command'=>proc{|*args| c.yview(*args)}){|vs|
+      c.yscrollcommand(proc{|first,last| vs.set first,last})
+      pack('side'=>'right', 'fill'=>'y')
+    }
+  }
+  $floor_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
+  $floor_canvas.pack('expand'=>'yes', 'fill'=>'both')
+
+else
+  TkFrame.new($floor_demo) {|f|
+    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
+
+    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
+    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
+
+    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
+      $floor_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500, 
+                                   'borderwidth'=>0, 
+                                   'highlightthickness'=>0) {
+        xscrollcommand(proc{|first,last| h.set first,last})
+        yscrollcommand(proc{|first,last| v.set first,last})
+        pack('expand'=>'yes', 'fill'=>'both')
+      }
+      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    }
+
+    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+
+    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+
+    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
+
+    v.command(proc{|*args| $floor_canvas.yview(*args)})
+    h.command(proc{|*args| $floor_canvas.xview(*args)})
+  }
+end
+
+
+# Create an entry for displaying and typing in current room.
+
+$currentRoom = TkVariable.new
+$floor_entry = TkEntry.new($floor_canvas, 'width'=>10, 'relief'=>'sunken', 
+                           'bd'=>2, 'textvariable'=>$currentRoom)
+
+# Choose colors, then fill in the floorplan.
+
+$floor_colors = {}
+if TkWinfo.depth($floor_canvas) > 1
+  $floor_colors['bg1'] = '#a9c1da'
+  $floor_colors['outline1'] = '#77889a'
+  $floor_colors['bg2'] = '#9ab0c6'
+  $floor_colors['outline2'] = '#687786'
+  $floor_colors['bg3'] = '#8ba0b3'
+  $floor_colors['outline3'] = '#596673'
+  $floor_colors['offices'] = 'Black'
+  $floor_colors['active'] = '#c4d1df'
+else
+  $floor_colors['bg1'] = 'white'
+  $floor_colors['outline1'] = 'black'
+  $floor_colors['bg2'] = 'white'
+  $floor_colors['outline2'] = 'black'
+  $floor_colors['bg3'] = 'white'
+  $floor_colors['outline3'] = 'black'
+  $floor_colors['offices'] = 'Black'
+  $floor_colors['active'] = 'black'
+end
+
+$activeFloor = ''
+floorDisplay $floor_canvas,3
+
+# Set up event bindings for canvas:
+
+$floor_canvas.itembind('floor1', '1', proc{floorDisplay $floor_canvas,1})
+$floor_canvas.itembind('floor2', '1', proc{floorDisplay $floor_canvas,2})
+$floor_canvas.itembind('floor3', '1', proc{floorDisplay $floor_canvas,3})
+$floor_canvas.itembind('room', 'Enter', proc{newRoom $floor_canvas})
+$floor_canvas.itembind('room', 'Leave', proc{$currentRoom.value = ''})
+$floor_canvas.bind('2', proc{|x,y| $floor_canvas.scan_mark x,y}, '%x %y')
+$floor_canvas.bind('B2-Motion', 
+                   proc{|x,y| $floor_canvas.scan_dragto x,y}, '%x %y')
+$floor_canvas.bind('Destroy', proc{$currentRoom.unset})
+$currentRoom.value = ''
+$currentRoom.trace('w',proc{roomChanged $floor_canvas})
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/floor2.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/floor2.rb
new file mode 100644
index 0000000000..a20b31d45c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/floor2.rb
@@ -0,0 +1,1716 @@
+#
+# floorDisplay widget demo 2 (called by 'widget')
+#
+
+# floorDisplay2 --
+# Recreate the floorplan display in the canvas given by "w".  The
+# floor given by "active" is displayed on top with its office structure
+# visible.
+#
+# Arguments:
+# w -           Name of the canvas window.
+# active -      Number of active floor (1, 2, or 3).
+
+def floorDisplay2(w,active)
+  return if $activeFloor2 == active
+
+  w.delete('all')
+  $activeFloor2 = active
+
+  # First go through the three floors, displaying the backgrounds for 
+  # each floor.
+
+  floor2_bg1(w,$floor2_colors['bg1'],$floor2_colors['outline1'])
+  floor2_bg2(w,$floor2_colors['bg2'],$floor2_colors['outline2'])
+  floor2_bg3(w,$floor2_colors['bg3'],$floor2_colors['outline3'])
+
+  # Raise the background for the active floor so that it's on top.
+
+  w.raise("floor#{active}")
+
+  # Create a dummy item just to mark this point in the display list, 
+  # so we can insert highlights here.
+
+  w.create(TkcRectangle,0,100,1,101,'fill'=>'','outline'=>'','tags'=>'marker')
+
+  # Add the walls and labels for the active floor, along with 
+  # transparent polygons that define the rooms on the floor.
+  # Make sure that the room polygons are on top.
+
+  $floorLabels2.clear
+  $floorItems2.clear
+  send("floor2_fg#{active}", w, $floor2_colors['offices'])
+  w.raise('room')
+
+  # Offset the floors diagonally from each other.
+
+  w.move('floor1', '2c', '2c')
+  w.move('floor2', '1c', '1c')
+
+  # Create items for the room entry and its label.
+  w.create(TkcWindow, 600, 100, 'anchor'=>'w', 'window'=>$floor2_entry)
+  w.create(TkcText, 600, 100, 'anchor'=>'e', 'text'=>"部屋番号: ")
+  w['scrollregion'] = w.bbox('all')
+end
+
+# newRoom2 --
+# This method is invoked whenever the mouse enters a room
+# in the floorplan.  It changes tags so that the current room is
+# highlighted.
+#
+# Arguments:
+# w  -          The name of the canvas window.
+
+def newRoom2(w)
+  id = w.find_withtag('current')[0]
+  $currentRoom2.value = $floorLabels2[id.id] if id != ""
+  Tk.update(true)
+end
+
+# roomChanged2 --
+# This method is invoked whenever the currentRoom variable changes.
+# It highlights the current room and unhighlights any previous room.
+#
+# Arguments:
+# w -           The canvas window displaying the floorplan.
+# args -        Not used.
+
+def roomChanged2(w,*args)
+  w.delete('highlight')
+  item = $floorItems2[$currentRoom2.value]
+  return if item == nil
+  new = TkcPolygon.new(w, *(w.coords(item)))
+  new.configure('fill'=>$floor2_colors['active'], 'tags'=>'highlight')
+  w.raise(new, 'marker')
+end
+
+# floor2_bg1 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the background information for the first
+# floor.
+#
+# Arguments:
+# w -           The canvas window.
+# fill -        Fill color to use for the floor's background.
+# outline -     Color to use for the floor's outline.
+
+def floor2_bg1(w,fill,outline)
+  w.create(TkcPolygon,347,80,349,82,351,84,353,85,363,92,375,99,386,104,
+                 386,129,398,129,398,162,484,162,484,129,559,129,559,133,725,
+                 133,725,129,802,129,802,389,644,389,644,391,559,391,559,327,
+                 508,327,508,311,484,311,484,278,395,278,395,288,400,288,404,
+                 288,409,290,413,292,418,297,421,302,422,309,421,318,417,325,
+                 411,330,405,332,397,333,344,333,340,334,336,336,335,338,332,
+                 342,331,347,332,351,334,354,336,357,341,359,340,360,335,363,
+                 331,365,326,366,304,366,304,355,258,355,258,387,60,387,60,391,
+                 0,391,0,337,3,337,3,114,8,114,8,25,30,25,30,5,93,5,98,5,104,7,
+                 110,10,116,16,119,20,122,28,123,32,123,68,220,68,220,34,221,
+                 22,223,17,227,13,231,8,236,4,242,2,246,0,260,0,283,1,300,5,
+                 321,14,335,22,348,25,365,29,363,39,358,48,352,56,337,70,
+                 344,76,347,80, 'tags'=>['floor1','bg'], 'fill'=>fill)
+  w.create(TkcLine,386,129,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,258,355,258,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,60,387,60,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,0,337,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,3,114,3,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,258,387,60,387, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,484,162,398,162, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,398,162,398,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,484,278,484,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,484,311,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,508,327,508,311, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,559,327,508,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,644,391,559,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,644,389,644,391, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,559,129,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,484,162,484,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,725,133,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,559,129,559,133, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,725,129,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,802,389,802,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,3,337,0,337, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,559,391,559,327, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,802,389,644,389, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,725,133,725,129, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,8,25,8,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,8,114,3,114, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,30,25,8,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,484,278,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,30,25,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,93,5,30,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,98,5,93,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,104,7,98,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,110,10,104,7, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,116,16,110,10, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,119,20,116,16, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,122,28,119,20, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,123,32,122,28, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,123,68,123,32, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,220,68,123,68, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,386,129,386,104, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,386,104,375,99, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,375,99,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,353,85,363,92, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,220,68,220,34, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,337,70,352,56, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,352,56,358,48, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,358,48,363,39, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,363,39,365,29, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,365,29,348,25, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,348,25,335,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,335,22,321,14, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,321,14,300,5, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,300,5,283,1, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,283,1,260,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,260,0,246,0, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,246,0,242,2, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,242,2,236,4, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,236,4,231,8, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,231,8,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,223,17,227,13, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,221,22,223,17, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,220,34,221,22, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,340,360,335,363, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,335,363,331,365, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,331,365,326,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,326,366,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,304,355,304,366, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,395,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,404,288,400,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,409,290,404,288, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,413,292,409,290, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,418,297,413,292, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,421,302,418,297, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,422,309,421,302, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,421,318,422,309, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,421,318,417,325, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,417,325,411,330, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,411,330,405,332, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,405,332,397,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,397,333,344,333, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,344,333,340,334, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,340,334,336,336, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,336,336,335,338, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,335,338,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,331,347,332,342, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,332,351,331,347, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,334,354,332,351, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,336,357,334,354, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,341,359,336,357, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,341,359,340,360, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,395,288,395,278, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,304,355,258,355, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,347,80,344,76, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,344,76,337,70, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,349,82,347,80, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,351,84,349,82, 'fill'=>outline, 'tags'=>['floor1','bg'])
+  w.create(TkcLine,353,85,351,84, 'fill'=>outline, 'tags'=>['floor1','bg'])
+end
+
+# floor2_bg2 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the background information for the first
+# floor.
+#
+# Arguments:
+# w -           The canvas window.
+# fill -        Fill color to use for the floor's background.
+# outline -     Color to use for the floor's outline.
+
+def floor2_bg2(w,fill,outline)
+  w.create(TkcPolygon,559,129,484,129,484,162,398,162,398,129,315,129,
+                 315,133,176,133,176,129,96,129,96,133,3,133,3,339,0,339,0,391,
+                 60,391,60,387,258,387,258,329,350,329,350,311,395,311,395,280,
+                 484,280,484,311,508,311,508,327,558,327,558,391,644,391,644,
+                 367,802,367,802,129,725,129,725,133,559,133,559,129,
+                 'tags'=>['floor2','bg'], 'fill'=>fill)
+  w.create(TkcLine,350,311,350,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,398,129,398,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,802,367,802,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,802,129,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,725,133,725,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,559,129,559,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,559,133,725,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,484,162,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,559,129,484,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,802,367,644,367, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,644,367,644,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,644,391,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,558,327,558,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,558,327,508,327, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,508,327,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,484,311,508,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,484,280,484,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,398,162,484,162, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,484,280,395,280, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,395,280,395,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,258,387,60,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,3,133,3,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,3,339,0,339, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,0,339,0,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,60,387,60,391, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,258,329,258,387, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,350,329,258,329, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,395,311,350,311, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,398,129,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,176,133,315,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,176,129,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,3,133,96,133, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,315,133,315,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,176,133,176,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+  w.create(TkcLine,96,133,96,129, 'fill'=>outline, 'tags'=>['floor2','bg'])
+end
+
+# floor2_bg3 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the background information for the first
+# floor.
+#
+# Arguments:
+# w -           The canvas window.
+# fill -        Fill color to use for the floor's background.
+# outline -     Color to use for the floor's outline.
+
+def floor2_bg3(w,fill,outline)
+  w.create(TkcPolygon,159,300,107,300,107,248,159,248,159,129,96,129,96,
+                 133,21,133,21,331,0,331,0,391,60,391,60,370,159,370,159,300,
+                 'tags'=>['floor3','bg'], 'fill'=>fill)
+  w.create(TkcPolygon,258,370,258,329,350,329,350,311,399,311,399,129,
+                 315,129,315,133,176,133,176,129,159,129,159,370,258,370,
+                 'tags'=>['floor3','bg'], 'fill'=>fill)
+  w.create(TkcLine,96,133,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,176,129,96,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,176,129,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,315,133,176,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,315,133,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,399,129,315,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,399,311,399,129, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,399,311,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,350,329,350,311, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,350,329,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,258,370,258,329, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,60,370,258,370, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,60,370,60,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,60,391,0,391, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,0,391,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,21,331,0,331, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,21,331,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,96,133,21,133, 'fill'=>outline, 'tags'=>['floor3','bg'])
+  w.create(TkcLine,107,300,159,300,159,248,107,248,107,300, 
+              'fill'=>outline, 'tags'=>['floor3','bg'])
+end
+
+# floor2_fg1 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the foreground information for the first
+# floor (office outlines and numbers).
+#
+# Arguments:
+# w -           The canvas window.
+# color -       Color to use for drawing foreground information.
+
+def floor2_fg1(w,color)
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '101'
+  $floorItems2['101'] = i
+  w.create(TkcText,358,209, 'text'=>'101', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Pub Lift1'
+  $floorItems2['Pub Lift1'] = i
+  w.create(TkcText,323,223, 'text'=>'Pub Lift1', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Priv Lift1'
+  $floorItems2['Priv Lift1'] = i
+  w.create(TkcText,323,188, 'text'=>'Priv Lift1', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,42,389,42,337,1,337,1,389, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '110'
+  $floorItems2['110'] = i
+  w.create(TkcText,21.5,363, 'text'=>'110', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,59,389,59,385,90,385,90,337,44,337,44,389, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '109'
+  $floorItems2['109'] = i
+  w.create(TkcText,67,363, 'text'=>'109', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,51,300,51,253,6,253,6,300, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '111'
+  $floorItems2['111'] = i
+  w.create(TkcText,28.5,276.5, 'text'=>'111', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,98,248,98,309,79,309,79,248, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '117B'
+  $floorItems2['117B'] = i
+  w.create(TkcText,88.5,278.5, 'text'=>'117B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,51,251,51,204,6,204,6,251, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '112'
+  $floorItems2['112'] = i
+  w.create(TkcText,28.5,227.5, 'text'=>'112', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,6,156,51,156,51,203,6,203, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '113'
+  $floorItems2['113'] = i
+  w.create(TkcText,28.5,179.5, 'text'=>'113', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,85,169,79,169,79,192,85,192, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '117A'
+  $floorItems2['117A'] = i
+  w.create(TkcText,82,180.5, 'text'=>'117A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,77,302,77,168,53,168,53,302, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '117'
+  $floorItems2['117'] = i
+  w.create(TkcText,65,235, 'text'=>'117', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,51,155,51,115,6,115,6,155, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '114'
+  $floorItems2['114'] = i
+  w.create(TkcText,28.5,135, 'text'=>'114', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,95,115,53,115,53,168,95,168, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '115'
+  $floorItems2['115'] = i
+  w.create(TkcText,74,141.5, 'text'=>'115', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,87,113,87,27,10,27,10,113, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '116'
+  $floorItems2['116'] = i
+  w.create(TkcText,48.5,70, 'text'=>'116', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,89,91,128,91,128,113,89,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '118'
+  $floorItems2['118'] = i
+  w.create(TkcText,108.5,102, 'text'=>'118', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,178,128,178,132,216,132,216,91,
+                     163,91,163,112,149,112,149,128, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '120'
+  $floorItems2['120'] = i
+  w.create(TkcText,189.5,111.5, 'text'=>'120', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,79,193,87,193,87,169,136,169,136,192,
+                     156,192,156,169,175,169,175,246,79,246, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '122'
+  $floorItems2['122'] = i
+  w.create(TkcText,131,207.5, 'text'=>'122', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,138,169,154,169,154,191,138,191, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '121'
+  $floorItems2['121'] = i
+  w.create(TkcText,146,180, 'text'=>'121', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,99,300,126,300,126,309,99,309, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '106A'
+  $floorItems2['106A'] = i
+  w.create(TkcText,112.5,304.5, 'text'=>'106A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,128,299,128,309,150,309,150,248,99,248,99,299, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '105'
+  $floorItems2['105'] = i
+  w.create(TkcText,124.5,278.5, 'text'=>'105', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,174,309,174,300,152,300,152,309, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '106B'
+  $floorItems2['106B'] = i
+  w.create(TkcText,163,304.5, 'text'=>'106B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,176,299,176,309,216,309,216,248,152,248,152,299, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '104'
+  $floorItems2['104'] = i
+  w.create(TkcText,184,278.5, 'text'=>'104', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,138,385,138,337,91,337,91,385, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '108'
+  $floorItems2['108'] = i
+  w.create(TkcText,114.5,361, 'text'=>'108', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,256,337,140,337,140,385,256,385, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '107'
+  $floorItems2['107'] = i
+  w.create(TkcText,198,361, 'text'=>'107', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,300,353,300,329,260,329,260,353, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Smoking'
+  $floorItems2['Smoking'] = i
+  w.create(TkcText,280,341, 'text'=>'Smoking', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,314,135,314,170,306,170,306,246,177,246,177,135, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '123'
+  $floorItems2['123'] = i
+  w.create(TkcText,245.5,190.5, 'text'=>'123', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,217,248,301,248,301,326,257,326,257,310,217,310, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '103'
+  $floorItems2['103'] = i
+  w.create(TkcText,259,287, 'text'=>'103', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,396,188,377,188,377,169,316,169,316,131,396,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '124'
+  $floorItems2['124'] = i
+  w.create(TkcText,356,150, 'text'=>'124', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,397,226,407,226,407,189,377,189,377,246,397,246, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '125'
+  $floorItems2['125'] = i
+  w.create(TkcText,392,217.5, 'text'=>'125', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,399,187,409,187,409,207,474,207,474,164,399,164, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '126'
+  $floorItems2['126'] = i
+  w.create(TkcText,436.5,185.5, 'text'=>'126', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,409,209,409,229,399,229,399,253,
+                     486,253,486,239,474,239,474,209, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '127'
+  $floorItems2['127'] = i
+  w.create(TkcText,436.5,'231', 'text'=>'127', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,501,164,501,174,495,174,495,188,
+                     490,188,490,204,476,204,476,164, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'MShower'
+  $floorItems2['MShower'] = i
+  w.create(TkcText,488.5,'184', 'text'=>'MShower', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,497,176,513,176,513,204,492,204,492,190,497,190, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Closet'
+  $floorItems2['Closet'] = i
+  w.create(TkcText,502.5,190, 'text'=>'Closet', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,476,237,476,206,513,206,513,254,488,254,488,237, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'WShower'
+  $floorItems2['WShower'] = i
+  w.create(TkcText,494.5,230, 'text'=>'WShower', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,486,131,558,131,558,135,724,135,724,166,
+                     697,166,697,275,553,275,531,254,515,254,
+                     515,174,503,174,503,161,486,161, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '130'
+  $floorItems2['130'] = i
+  w.create(TkcText,638.5,205, 'text'=>'130', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,308,242,339,242,339,248,342,248,
+                     342,246,397,246,397,276,393,276,
+                     393,309,300,309,300,248,308,248, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '102'
+  $floorItems2['102'] = i
+  w.create(TkcText,367.5,278.5, 'text'=>'102', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,397,255,486,255,486,276,397,276, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '128'
+  $floorItems2['128'] = i
+  w.create(TkcText,441.5,265.5, 'text'=>'128', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,510,309,486,309,486,255,530,255,
+                     552,277,561,277,561,325,510,325,
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '129'
+  $floorItems2['129'] = i
+  w.create(TkcText,535.5,293, 'text'=>'129', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,696,281,740,281,740,387,642,387,
+                     642,389,561,389,561,277,696,277, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '133'
+  $floorItems2['133'] = i
+  w.create(TkcText,628.5,335, 'text'=>'133', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,742,387,742,281,800,281,800,387, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '132'
+  $floorItems2['132'] = i
+  w.create(TkcText,771,334, 'text'=>'132', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,800,168,800,280,699,280,699,168, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '134'
+  $floorItems2['134'] = i
+  w.create(TkcText,749.5,224, 'text'=>'134', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,726,131,726,166,800,166,800,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '135'
+  $floorItems2['135'] = i
+  w.create(TkcText,763,148.5, 'text'=>'135', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,340,360,335,363,331,365,326,366,304,366,
+                     304,312,396,312,396,288,400,288,404,288,
+                     409,290,413,292,418,297,421,302,422,309,
+                     421,318,417,325,411,330,405,332,397,333,
+                     344,333,340,334,336,336,335,338,332,342,
+                     331,347,332,351,334,354,336,357,341,359, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Ramona Stair'
+  $floorItems2['Ramona Stair'] = i
+  w.create(TkcText,368,323, 'text'=>'Ramona Stair', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,30,23,30,5,93,5,98,5,104,7,110,10,116,16,119,20,
+                     122,28,123,32,123,68,220,68,220,87,90,87,90,23, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'University Stair'
+  $floorItems2['University Stair'] = i
+  w.create(TkcText,155,77.5, 'text'=>'University Stair', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,282,37,295,40,312,49,323,56,337,70,352,56,
+                     358,48,363,39,365,29,348,25,335,22,321,14,
+                     300,5,283,1,260,0,246,0,242,2,236,4,231,8,
+                     227,13,223,17,221,22,220,34,260,34, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Plaza Stair'
+  $floorItems2['Plaza Stair'] = i
+  w.create(TkcText,317.5,28.5, 'text'=>'Plaza Stair', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,220,34,260,34,282,37,295,40,312,49,
+                     323,56,337,70,350,83,365,94,377,100,
+                     386,104,386,128,220,128, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = 'Plaza Deck'
+  $floorItems2['Plaza Deck'] = i
+  w.create(TkcText,303,81, 'text'=>'Plaza Deck', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,257,336,77,336,6,336,6,301,77,301,77,310,257,310,
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '106'
+  $floorItems2['106'] = i
+  w.create(TkcText,131.5,318.5, 'text'=>'106', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  i = TkcPolygon.new(w,146,110,162,110,162,91,130,91,130,115,95,115,
+                     95,128,114,128,114,151,157,151,157,153,112,153,
+                     112,130,97,130,97,168,175,168,175,131,146,131, 
+                     'fill'=>'', 'tags'=>['floor1','room'])
+  $floorLabels2[i.id] = '119'
+  $floorItems2['119'] = i
+  w.create(TkcText,143.5,133, 'text'=>'119', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor1','label'])
+  w.create(TkcLine,155,191,155,189, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,96,129,96,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,78,169,176,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,176,247,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,340,247,340,224, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,376,246,376,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,307,247,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,147,129,176,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,202,133,176,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,398,129,315,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,258,352,258,387, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,60,387,60,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,0,337,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,3,114,3,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,258,387,60,387, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,237,52,273, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,189,52,225, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,140,52,177, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,395,306,395,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,531,254,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,475,178,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,502,162,398,162, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,398,129,398,188, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,383,188,376,188, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,408,188,408,194, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,398,227,398,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,408,227,398,227, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,408,222,408,227, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,408,206,408,210, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,408,208,475,208, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,484,278,484,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,484,311,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,508,327,508,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,559,327,508,327, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,644,391,559,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,644,389,644,391, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,514,205,475,205, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,496,189,496,187, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,559,129,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,484,162,484,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,725,133,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,559,129,559,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,725,149,725,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,725,129,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,802,389,802,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,739,167,802,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,396,188,408,188, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,0,337,9,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,58,337,21,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,43,391,43,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,105,337,75,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,91,387,91,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,154,337,117,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,139,387,139,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,227,337,166,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,258,337,251,337, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,258,328,302,328, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,302,355,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,395,311,302,311, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,484,278,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,395,294,395,278, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,473,278,473,275, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,473,256,473,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,533,257,531,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,553,276,551,274, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,698,276,553,276, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,559,391,559,327, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,802,389,644,389, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,741,314,741,389, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,698,280,698,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,707,280,698,280, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,802,280,731,280, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,741,280,741,302, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,698,167,727,167, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,725,137,725,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,514,254,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,496,175,514,175, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,502,175,502,162, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,475,166,475,162, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,496,176,496,175, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,491,189,496,189, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,491,205,491,189, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,487,238,475,238, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,487,240,487,238, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,487,252,487,254, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,315,133,304,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,256,133,280,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,78,247,270,247, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,307,247,294,247, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,214,133,232,133, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,217,247,217,266, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,217,309,217,291, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,217,309,172,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,154,309,148,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,175,300,175,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,151,300,175,300, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,151,247,151,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,78,237,78,265, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,78,286,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,106,309,78,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,130,309,125,309, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,99,309,99,247, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,127,299,99,299, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,127,309,127,299, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,155,191,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,137,169,137,191, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,78,171,78,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,78,190,78,218, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,86,192,86,169, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,86,192,78,192, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,301,3,301, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,286,52,301, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,252,3,252, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,203,3,203, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,3,156,52,156, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,8,25,8,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,63,114,3,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,75,114,97,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,108,114,129,114, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,129,114,129,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,52,114,52,128, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,132,89,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,88,25,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,88,114,88,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,218,89,144,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,147,111,147,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,162,111,147,111, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,162,109,162,111, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,162,96,162,89, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,218,89,218,94, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,218,89,218,119, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,8,25,88,25, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,258,337,258,328, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,113,129,96,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,302,355,258,355, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,386,104,386,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,377,100,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,365,94,377,100, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,350,83,365,94, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,337,70,350,83, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,337,70,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,312,49,323,56, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,295,40,312,49, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,282,37,295,40, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,260,34,282,37, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,253,34,260,34, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,386,128,386,104, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,113,152,156,152, 'fill'=>color, 'tags'=>['floor1','wall'])
+  w.create(TkcLine,113,152,113,129, 'fill'=>color, 'tags'=>['floor1','wall'])
+end
+
+# floor2_fg2 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the foreground information for the second
+# floor (office outlines and numbers).
+#
+# Arguments:
+# w -           The canvas window.
+# color -       Color to use for drawing foreground information.
+
+def floor2_fg2(w,color)
+  i = TkcPolygon.new(w,748,188,755,188,755,205,758,205,758,222,
+                     800,222,800,168,748,168, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '238'
+  $floorItems2['238'] = i
+  w.create(TkcText,774,195, 'text'=>'238', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,726,188,746,188,746,166,800,166,800,131,726,131,
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '237'
+  $floorItems2['237'] = i
+  w.create(TkcText,763,148.5, 'text'=>'237', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,497,187,497,204,559,204,559,324,641,324,
+                     643,324,643,291,641,291,641,205,696,205,
+                     696,291,694,291,694,314,715,314,715,291,
+                     715,205,755,205,755,190,724,190,724,187, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '246'
+  $floorItems2['246'] = i
+  w.create(TkcText,600,264, 'text'=>'246', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,694,279,643,279,643,314,694,314, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '247'
+  $floorItems2['247'] = i
+  w.create(TkcText,668.5,296.5, 'text'=>'247', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,232,250,308,250,308,242,339,242,339,246,
+                     397,246,397,255,476,255,476,250,482,250,559,250,
+                     559,274,482,274,482,278,396,278,396,274,232,274, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '202'
+  $floorItems2['202'] = i
+  w.create(TkcText,285.5,260, 'text'=>'202', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,53,228,53,338,176,338,233,338,233,196,
+                     306,196,306,180,175,180,175,169,156,169,
+                     156,196,176,196,176,228, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '206'
+  $floorItems2['206'] = i
+  w.create(TkcText,143,267, 'text'=>'206', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,277,6,277,6,338,51,338, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '212'
+  $floorItems2['212'] = i
+  w.create(TkcText,28.5,307.5, 'text'=>'212', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,557,276,486,276,486,309,510,309,510,325,557,325, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '245'
+  $floorItems2['245'] = i
+  w.create(TkcText,521.5,300.5, 'text'=>'245', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,560,389,599,389,599,326,560,326, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '244'
+  $floorItems2['244'] = i
+  w.create(TkcText,579.5,357.5, 'text'=>'244', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,601,389,601,326,643,326,643,389, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '243'
+  $floorItems2['243'] = i
+  w.create(TkcText,622,357.5, 'text'=>'243', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,688,316,645,316,645,365,688,365, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '242'
+  $floorItems2['242'] = i
+  w.create(TkcText,666.5,340.5, 'text'=>'242', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,802,367,759,367,759,226,802,226, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = 'Barbecue Deck'
+  $floorItems2['Barbecue Deck'] = i
+  w.create(TkcText,780.5,296.5, 'text'=>'Barbecue Deck', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,755,262,755,314,717,314,717,262, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '240'
+  $floorItems2['240'] = i
+  w.create(TkcText,736,288, 'text'=>'240', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,755,316,689,316,689,365,755,365, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '241'
+  $floorItems2['241'] = i
+  w.create(TkcText,722,340.5, 'text'=>'241', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,755,206,717,206,717,261,755,261, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '239'
+  $floorItems2['239'] = i
+  w.create(TkcText,736,233.5, 'text'=>'239', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,695,277,643,277,643,206,695,206, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '248'
+  $floorItems2['248'] = i
+  w.create(TkcText,669,241.5, 'text'=>'248', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,676,135,676,185,724,185,724,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '236'
+  $floorItems2['236'] = i
+  w.create(TkcText,700,160, 'text'=>'236', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,675,135,635,135,635,145,628,145,628,185,675,185, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '235'
+  $floorItems2['235'] = i
+  w.create(TkcText,651.5,160, 'text'=>'235', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,626,143,633,143,633,135,572,135,
+                     572,143,579,143,579,185,626,185, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '234'
+  $floorItems2['234'] = i
+  w.create(TkcText,606,160, 'text'=>'234', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,557,135,571,135,571,145,578,145,
+                     578,185,527,185,527,131,557,131, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '233'
+  $floorItems2['233'] = i
+  w.create(TkcText,552.5,158, 'text'=>'233', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,476,249,557,249,557,205,476,205,
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '230'
+  $floorItems2['230'] = i
+  w.create(TkcText,516.5,227, 'text'=>'230', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,476,164,486,164,486,131,525,131,525,185,476,185, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '232'
+  $floorItems2['232'] = i
+  w.create(TkcText,500.5,158, 'text'=>'232', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,476,186,495,186,495,204,476,204, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '229'
+  $floorItems2['229'] = i
+  w.create(TkcText,485.5,195, 'text'=>'229', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,474,207,409,207,409,187,399,187,399,164,474,164, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '227'
+  $floorItems2['227'] = i
+  w.create(TkcText,436.5,185.5, 'text'=>'227', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,399,228,399,253,474,253,474,209,409,209,409,228, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '228'
+  $floorItems2['228'] = i
+  w.create(TkcText,436.5,231, 'text'=>'228', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,397,246,397,226,407,226,407,189,377,189,377,246, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '226'
+  $floorItems2['226'] = i
+  w.create(TkcText,392,217.5, 'text'=>'226', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,377,169,316,169,316,131,397,131,397,188,377,188, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '225'
+  $floorItems2['225'] = i
+  w.create(TkcText,356.5,150, 'text'=>'225', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,234,198,306,198,306,249,234,249, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '224'
+  $floorItems2['224'] = i
+  w.create(TkcText,270,223.5, 'text'=>'224', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,270,179,306,179,306,170,314,170,314,135,270,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '223'
+  $floorItems2['223'] = i
+  w.create(TkcText,292,157, 'text'=>'223', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,268,179,221,179,221,135,268,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '222'
+  $floorItems2['222'] = i
+  w.create(TkcText,244.5,157, 'text'=>'222', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,177,179,219,179,219,135,177,135, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '221'
+  $floorItems2['221'] = i
+  w.create(TkcText,198,157, 'text'=>'221', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,299,327,349,327,349,284,341,284,341,276,299,276, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '204'
+  $floorItems2['204'] = i
+  w.create(TkcText,324,301.5, 'text'=>'204', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,234,276,297,276,297,327,257,327,257,338,234,338, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '205'
+  $floorItems2['205'] = i
+  w.create(TkcText,265.5,307, 'text'=>'205', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,256,385,256,340,212,340,212,385,
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '207'
+  $floorItems2['207'] = i
+  w.create(TkcText,234,362.5, 'text'=>'207', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,210,340,164,340,164,385,210,385, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '208'
+  $floorItems2['208'] = i
+  w.create(TkcText,187,362.5, 'text'=>'208', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,115,340,162,340,162,385,115,385, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '209'
+  $floorItems2['209'] = i
+  w.create(TkcText,138.5,362.5, 'text'=>'209', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,89,228,89,156,53,156,53,228, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '217'
+  $floorItems2['217'] = i
+  w.create(TkcText,71,192, 'text'=>'217', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,89,169,97,169,97,190,89,190, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '217A'
+  $floorItems2['217A'] = i
+  w.create(TkcText,93,179.5, 'text'=>'217A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,89,156,89,168,95,168,95,135,53,135,53,156, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '216'
+  $floorItems2['216'] = i
+  w.create(TkcText,71,145.5, 'text'=>'216', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,179,51,135,6,135,6,179, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '215'
+  $floorItems2['215'] = i
+  w.create(TkcText,28.5,157, 'text'=>'215', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,227,6,227,6,180,51,180, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '214'
+  $floorItems2['214'] = i
+  w.create(TkcText,28.5,203.5, 'text'=>'214', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,51,275,6,275,6,229,51,229, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '213'
+  $floorItems2['213'] = i
+  w.create(TkcText,28.5,252, 'text'=>'213', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,114,340,67,340,67,385,114,385, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '210'
+  $floorItems2['210'] = i
+  w.create(TkcText,90.5,362.5, 'text'=>'210', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,59,389,59,385,65,385,65,340,1,340,1,389, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '211'
+  $floorItems2['211'] = i
+  w.create(TkcText,33,364.5, 'text'=>'211', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,393,309,350,309,350,282,342,282,342,276,393,276, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '203'
+  $floorItems2['203'] = i
+  w.create(TkcText,367.5,292.5, 'text'=>'203', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,99,191,91,191,91,226,174,226,174,198,
+                     154,198,154,192,109,192,109,169,99,169, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '220'
+  $floorItems2['220'] = i
+  w.create(TkcText,132.5,208.5, 'text'=>'220', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = 'Priv Lift2'
+  $floorItems2['Priv Lift2'] = i
+  w.create(TkcText,323,188, 'text'=>'Priv Lift2', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = 'Pub Lift 2'
+  $floorItems2['Pub Lift 2'] = i
+  w.create(TkcText,323,223, 'text'=>'Pub Lift 2', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '218'
+  $floorItems2['218'] = i
+  w.create(TkcText,136,149.5, 'text'=>'218', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '219'
+  $floorItems2['219'] = i
+  w.create(TkcText,132.5,180, 'text'=>'219', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+                     'fill'=>'', 'tags'=>['floor2','room'])
+  $floorLabels2[i.id] = '201'
+  $floorItems2['201'] = i
+  w.create(TkcText,358,209, 'text'=>'201', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor2','label'])
+  w.create(TkcLine,641,186,678,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,350,757,367, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,634,133,634,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,634,144,627,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,572,133,572,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,572,144,579,144, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,398,129,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,174,197,175,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,175,197,175,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,206,757,221, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,396,188,408,188, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,727,189,725,189, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,747,167,802,167, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,747,167,747,189, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,755,189,739,189, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,769,224,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,802,224,802,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,802,129,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,725,189,725,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,725,186,690,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,676,133,676,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,627,144,627,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,629,186,593,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,579,144,579,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,559,129,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,725,133,559,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,484,162,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,559,129,484,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,526,129,526,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,540,186,581,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,528,186,523,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,511,186,475,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,496,190,496,186, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,496,205,496,202, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,475,205,527,205, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,205,539,205, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,205,558,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,249,475,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,662,206,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,695,206,675,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,695,278,642,278, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,642,291,642,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,695,291,695,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,716,208,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,206,716,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,221,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,793,224,802,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,262,716,262, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,716,220,716,264, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,716,315,716,276, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,315,703,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,325,757,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,757,367,644,367, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,689,367,689,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,647,315,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,659,315,691,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,600,325,600,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,627,325,644,325, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,644,391,644,315, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,615,325,575,325, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,644,391,558,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,563,325,558,325, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,391,558,314, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,327,508,327, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,275,484,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,558,302,558,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,508,327,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,484,311,508,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,484,275,484,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,475,208,408,208, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,408,206,408,210, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,408,222,408,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,408,227,398,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,398,227,398,254, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,408,188,408,194, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,383,188,376,188, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,398,188,398,162, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,398,162,484,162, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,475,162,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,398,254,475,254, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,484,280,395,280, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,395,311,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,307,197,293,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,278,197,233,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,233,197,233,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,307,179,284,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,233,249,278,249, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,269,179,269,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,220,179,220,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,155,191,110,191, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,90,190,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,98,169,98,190, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,133,52,165, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,214,52,177, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,226,52,262, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,274,52,276, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,234,275,234,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,226,339,258,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,211,387,211,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,214,339,177,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,258,387,60,387, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,3,133,3,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,165,339,129,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,117,339,80,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,68,339,59,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,0,339,46,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,0,339,0,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,60,387,60,391, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,258,329,258,387, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,350,329,258,329, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,395,311,350,311, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,398,129,315,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,176,133,315,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,176,129,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,3,133,96,133, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,66,387,66,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,115,387,115,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,163,387,163,339, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,234,275,276,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,288,275,309,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,298,275,298,329, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,341,283,350,283, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,321,275,341,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,375,275,395,275, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,307,250,307,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,376,245,376,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,340,245,340,224, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,293,250,307,250, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,271,179,238,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,226,179,195,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,176,129,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,182,179,176,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,174,169,176,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,162,169,90,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,96,169,96,129, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,175,227,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,90,190,90,227, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,179,3,179, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,228,3,228, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,52,276,3,276, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,110,191,110,169, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,155,189,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,350,283,350,329, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor2','wall'])
+  w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor2','wall'])
+end
+
+# floor2_fg3 --
+# This method represents part of the floorplan database.  When
+# invoked, it instantiates the foreground information for the third
+# floor (office outlines and numbers).
+#
+# Arguments:
+# w -           The canvas window.
+# color -       Color to use for drawing foreground information.
+
+def floor2_fg3(w,color)
+  i = TkcPolygon.new(w,89,228,89,180,70,180,70,228,
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '316'
+  $floorItems2['316'] = i
+  w.create(TkcText,79.5,204, 'text'=>'316', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,115,368,162,368,162,323,115,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '309'
+  $floorItems2['309'] = i
+  w.create(TkcText,138.5,345.5, 'text'=>'309', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,164,323,164,368,211,368,211,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '308'
+  $floorItems2['308'] = i
+  w.create(TkcText,187.5,345.5, 'text'=>'308', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,256,368,212,368,212,323,256,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '307'
+  $floorItems2['307'] = i
+  w.create(TkcText,234,345.5, 'text'=>'307', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,244,276,297,276,297,327,260,327,260,321,244,321, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '305'
+  $floorItems2['305'] = i
+  w.create(TkcText,270.5,301.5, 'text'=>'305', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,251,219,251,203,244,203,244,219,
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '324B'
+  $floorItems2['324B'] = i
+  w.create(TkcText,247.5,211, 'text'=>'324B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,251,249,244,249,244,232,251,232, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '324A'
+  $floorItems2['324A'] = i
+  w.create(TkcText,247.5,240.5, 'text'=>'324A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,223,135,223,179,177,179,177,135, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '320'
+  $floorItems2['320'] = i
+  w.create(TkcText,200,157, 'text'=>'320', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,114,368,114,323,67,323,67,368, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '310'
+  $floorItems2['310'] = i
+  w.create(TkcText,90.5,345.5, 'text'=>'310', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,23,277,23,321,68,321,68,277, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '312'
+  $floorItems2['312'] = i
+  w.create(TkcText,45.5,299, 'text'=>'312', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,23,229,68,229,68,275,23,275, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '313'
+  $floorItems2['313'] = i
+  w.create(TkcText,45.5,252, 'text'=>'313', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,68,227,23,227,23,180,68,180, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '314'
+  $floorItems2['314'] = i
+  w.create(TkcText,40.5,203.5, 'text'=>'314', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,95,179,95,135,23,135,23,179, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '315'
+  $floorItems2['315'] = i
+  w.create(TkcText,59,157, 'text'=>'315', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,99,226,99,204,91,204,91,226, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '316B'
+  $floorItems2['316B'] = i
+  w.create(TkcText,95,215, 'text'=>'316B', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,91,202,99,202,99,180,91,180, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '316A'
+  $floorItems2['316A'] = i
+  w.create(TkcText,95,191, 'text'=>'316A', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,97,169,109,169,109,192,154,192,154,198,
+                     174,198,174,226,101,226,101,179,97,179, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '319'
+  $floorItems2['319'] = i
+  w.create(TkcText,141.5,209, 'text'=>'319', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,65,368,58,368,58,389,1,389,1,333,23,333,23,323,65,323, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '311'
+  $floorItems2['311'] = i
+  w.create(TkcText,29.5,361, 'text'=>'311', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,154,191,111,191,111,169,154,169, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '318'
+  $floorItems2['318'] = i
+  w.create(TkcText,132.5,180, 'text'=>'318', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,175,168,97,168,97,131,175,131, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '317'
+  $floorItems2['317'] = i
+  w.create(TkcText,136,149.5, 'text'=>'317', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,274,194,274,221,306,221,306,194, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '323'
+  $floorItems2['323'] = i
+  w.create(TkcText,290,207.5, 'text'=>'323', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,306,222,274,222,274,249,306,249, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '325'
+  $floorItems2['325'] = i
+  w.create(TkcText,290,235.5, 'text'=>'325', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,263,179,224,179,224,135,263,135, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '321'
+  $floorItems2['321'] = i
+  w.create(TkcText,243.5,157, 'text'=>'321', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,314,169,306,169,306,192,273,192,
+                     264,181,264,135,314,135, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '322'
+  $floorItems2['322'] = i
+  w.create(TkcText,293.5,163.5, 'text'=>'322', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,307,240,339,240,339,206,307,206, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = 'Pub Lift3'
+  $floorItems2['Pub Lift3'] = i
+  w.create(TkcText,323,223, 'text'=>'Pub Lift3', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,339,205,307,205,307,171,339,171, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = 'Priv Lift3'
+  $floorItems2['Priv Lift3'] = i
+  w.create(TkcText,323,188, 'text'=>'Priv Lift3', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,350,284,376,284,376,276,397,276,397,309,350,309, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '303'
+  $floorItems2['303'] = i
+  w.create(TkcText,373.5,292.5, 'text'=>'303', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,272,203,272,249,252,249,252,230,
+                     244,230,244,221,252,221,252,203, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '324'
+  $floorItems2['324'] = i
+  w.create(TkcText,262,226, 'text'=>'324', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,299,276,299,327,349,327,349,284,341,284,341,276, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '304'
+  $floorItems2['304'] = i
+  w.create(TkcText,324,301.5, 'text'=>'304', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,375,246,375,172,341,172,341,246, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '301'
+  $floorItems2['301'] = i
+  w.create(TkcText,358,209, 'text'=>'301', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,397,246,377,246,377,185,397,185, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '327'
+  $floorItems2['327'] = i
+  w.create(TkcText,387,215.5, 'text'=>'327', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,316,131,316,169,377,169,377,185,397,185,397,131, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '326'
+  $floorItems2['326'] = i
+  w.create(TkcText,365.5,150, 'text'=>'326', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,308,251,242,251,242,274,342,274,342,282,375, 282,
+                     375,274,397,274,397,248,339,248,339,242,308,242, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '302'
+  $floorItems2['302'] = i
+  w.create(TkcText,319.5,261, 'text'=>'302', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  i = TkcPolygon.new(w,70,321,242,321,242,200,259,200,259,203,272,203,
+                     272,193,263,180,242,180,175,180,175,169,156,169,
+                     156,196,177,196,177,228,107,228,70,228,70,275,107,275,
+                     107,248,160,248,160,301,107,301,107,275,70,275, 
+                     'fill'=>'', 'tags'=>['floor3','room'])
+  $floorLabels2[i.id] = '306'
+  $floorItems2['306'] = i
+  w.create(TkcText,200.5,284.5, 'text'=>'306', 'fill'=>color, 
+              'anchor'=>'c', 'tags'=>['floor3','label'])
+  w.create(TkcLine,341,275,341,283, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,162,197,155,197, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,396,247,399,247, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,399,129,399,311, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,258,202,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,350,283,350,329, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,251,231,243,231, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,243,220,251,220, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,243,250,243,202, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,155,197,155,190, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,110,192,110,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,155,192,110,192, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,155,177,155,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,176,197,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,69,280,69,274, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,21,276,69,276, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,69,262,69,226, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,21,228,69,228, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,21,179,75,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,69,179,69,214, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,90,220,90,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,90,204,90,202, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,90,203,100,203, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,90,187,90,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,90,227,176,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,100,179,100,227, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,100,179,87,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,96,179,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,162,169,96,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,173,169,176,169, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,182,179,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,176,129,176,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,195,179,226,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,224,133,224,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,264,179,264,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,238,179,264,179, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,207,273,193, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,235,273,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,224,273,219, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,193,307,193, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,222,307,222, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,384,247,376,247, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,340,206,307,206, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,340,187,340,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,340,210,340,201, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,340,247,340,224, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,340,241,307,241, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,376,247,376,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,307,250,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,376,170,307,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,315,129,315,170, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,376,283,366,283, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,376,283,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,399,275,376,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,341,275,320,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,341,283,350,283, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,298,275,298,329, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,308,275,298,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,243,322,243,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,243,275,284,275, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,258,322,226,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,212,370,212,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,214,322,177,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,163,370,163,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,165,322,129,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,84,322,117,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,71,322,64,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,115,322,115,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,66,322,66,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,52,322,21,322, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,21,331,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,21,331,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,96,133,21,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,176,129,96,129, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,315,133,176,133, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,315,129,399,129, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,399,311,350,311, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,350,329,258,329, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,258,322,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,60,370,258,370, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,60,370,60,391, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,0,391,0,331, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,60,391,0,391, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,307,250,307,242, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,273,250,307,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+  w.create(TkcLine,258,250,243,250, 'fill'=>color, 'tags'=>['floor3','wall'])
+end
+
+# Below is the "main program" that creates the floorplan demonstration.
+
+# toplevel widget が存在すれば削除する
+if defined?($floor2_demo) && $floor2_demo
+  $floor2_demo.destroy 
+  $floor2_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$floor2_demo = TkToplevel.new {|w|
+  title("Floorplan Canvas Demonstration 2")
+  iconname("Floorplan2")
+  positionWindow(w)
+  geometry('+20+20')
+  minsize(100,100)
+}
+
+# label 生成
+TkLabel.new($floor2_demo, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left', 
+            'text'=>"このウィンドウにはディジタルエクイップメント社のウェスタンリサーチラボラトリ (DECWRL) の間取りが書かれたキャンバス widget が入っています。これは 3階建てで、常にそのうちの1階分が選択、つまりその間取りが表示されるようになっています。ある階を選択するには、その上でマウスの左ボタンをクリックしてください。マウスが選択されている階の上を動くと、その下にある部屋の色が変わり、部屋番号が「部屋番号:」エントリに表示されます。また、エントリに部屋番号を書くとその部屋の色が変わります。"){
+  pack('side'=>'top')
+}
+
+# frame 生成
+$floor2_buttons = TkFrame.new($floor2_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $floor2_demo
+      $floor2_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'floor2'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$floor2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# 変数設定
+$floorLabels2 = {}
+$floorItems2 = {}
+
+# canvas 設定
+if $tk_version =~ /^4\.[01]/
+  $floor2_canvas_frame = TkFrame.new($floor2_demo,'bd'=>2,'relief'=>'sunken',
+                                    'highlightthickness'=>2)
+  $floor2_canvas = TkCanvas.new($floor2_canvas_frame, 
+                               'width'=>900, 'height'=>500, 'borderwidth'=>0, 
+                               'highlightthickness'=>0) {|c|
+    TkScrollbar.new($floor2_demo, 'orient'=>'horiz', 
+                    'command'=>proc{|*args| c.xview(*args)}){|hs|
+      c.xscrollcommand(proc{|first,last| hs.set first,last})
+      pack('side'=>'bottom', 'fill'=>'x')
+    }
+    TkScrollbar.new($floor2_demo, 'command'=>proc{|*args| c.yview(*args)}){|vs|
+      c.yscrollcommand(proc{|first,last| vs.set first,last})
+      pack('side'=>'right', 'fill'=>'y')
+    }
+  }
+  $floor2_canvas_frame.pack('side'=>'top','fill'=>'both', 'expand'=>'yes')
+  $floor2_canvas.pack('expand'=>'yes', 'fill'=>'both')
+
+else
+  TkFrame.new($floor2_demo) {|f|
+    pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
+
+    h = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'horizontal')
+    v = TkScrollbar.new(f, 'highlightthickness'=>0, 'orient'=>'vertical')
+
+    TkFrame.new(f, 'bd'=>2, 'relief'=>'sunken') {|f1|
+      $floor2_canvas = TkCanvas.new(f1, 'width'=>900, 'height'=>500, 
+                                   'borderwidth'=>0, 
+                                   'highlightthickness'=>0) {
+        xscrollcommand(proc{|first,last| h.set first,last})
+        yscrollcommand(proc{|first,last| v.set first,last})
+        pack('expand'=>'yes', 'fill'=>'both')
+      }
+      grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    }
+
+    v.grid('padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    h.grid('padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+           'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+
+    TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+    TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+
+    pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
+
+    v.command(proc{|*args| $floor2_canvas.yview(*args)})
+    h.command(proc{|*args| $floor2_canvas.xview(*args)})
+  }
+end
+
+# Create an entry for displaying and typing in current room.
+
+$currentRoom2 = TkVariable.new
+$floor2_entry = TkEntry.new($floor2_canvas, 'width'=>10, 'relief'=>'sunken', 
+                           'bd'=>2, 'textvariable'=>$currentRoom2)
+
+# Choose colors, then fill in the floorplan.
+
+$floor2_colors = {}
+if TkWinfo.depth($floor2_canvas) > 1
+  $floor2_colors['bg1'] = '#a9c1da'
+  $floor2_colors['outline1'] = '#77889a'
+  $floor2_colors['bg2'] = '#9ab0c6'
+  $floor2_colors['outline2'] = '#687786'
+  $floor2_colors['bg3'] = '#8ba0b3'
+  $floor2_colors['outline3'] = '#596673'
+  $floor2_colors['offices'] = 'Black'
+  $floor2_colors['active'] = '#c4d1df'
+else
+  $floor2_colors['bg1'] = 'white'
+  $floor2_colors['outline1'] = 'black'
+  $floor2_colors['bg2'] = 'white'
+  $floor2_colors['outline2'] = 'black'
+  $floor2_colors['bg3'] = 'white'
+  $floor2_colors['outline3'] = 'black'
+  $floor2_colors['offices'] = 'Black'
+  $floor2_colors['active'] = 'black'
+end
+
+$activeFloor2 = ''
+floorDisplay2 $floor2_canvas,3
+
+# Set up event bindings for canvas:
+
+$floor2_canvas.itembind('floor1', '1', proc{floorDisplay2 $floor2_canvas,1})
+$floor2_canvas.itembind('floor2', '1', proc{floorDisplay2 $floor2_canvas,2})
+$floor2_canvas.itembind('floor3', '1', proc{floorDisplay2 $floor2_canvas,3})
+$floor2_canvas.itembind('room', 'Enter', proc{newRoom2 $floor2_canvas})
+$floor2_canvas.itembind('room', 'Leave', proc{$currentRoom2.value = ''})
+$floor2_canvas.bind('2', proc{|x,y| $floor2_canvas.scan_mark x,y}, '%x %y')
+$floor2_canvas.bind('B2-Motion', 
+                   proc{|x,y| $floor2_canvas.scan_dragto x,y}, '%x %y')
+$floor2_canvas.bind('Destroy', proc{$currentRoom2.unset})
+$currentRoom2.value = ''
+$currentRoom2.trace('w',proc{roomChanged2 $floor2_canvas})
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/form.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/form.rb
new file mode 100644
index 0000000000..fe456d3943
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/form.rb
@@ -0,0 +1,63 @@
+#
+# form widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($form_demo) && $form_demo
+  $form_demo.destroy 
+  $form_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$form_demo = TkToplevel.new {|w|
+  title("Form Demonstration")
+  iconname("form")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($form_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "このウィンドウは簡単なフォーム入力用になっていて、さまざまなエントリに入力ができます。タブでエントリの切替えができます。"
+}
+msg.pack('side'=>'top', 'fill'=>'x')
+
+# frame 生成
+TkFrame.new($form_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $form_demo
+      $form_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'form'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# entry 生成
+form_data = []
+(1..5).each{|i|
+  f = TkFrame.new($form_demo, 'bd'=>2)
+  e = TkEntry.new(f, 'relief'=>'sunken', 'width'=>40)
+  l = TkLabel.new(f)
+  e.pack('side'=>'right')
+  l.pack('side'=>'left')
+  form_data[i] = {'frame'=>f, 'entry'=>e, 'label'=>l}
+}
+
+# 文字列設定
+form_data[1]['label'].text('名前:')
+form_data[2]['label'].text('住所:')
+form_data[5]['label'].text('電話:')
+
+# pack
+(1..5).each{|i| form_data[i]['frame'].pack('side'=>'top', 'fill'=>'x')}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/goldberg.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/goldberg.rb
new file mode 100644
index 0000000000..592b69f775
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/goldberg.rb
@@ -0,0 +1,2003 @@
+#
+# Ruby/Tk Goldverg demo (called by 'widget')
+#
+# Based on Tcl/Tk8.5a2 widget demos.
+# The following is the original comment of TkGoldberg.tcl.
+#
+#>>##+#################################################################
+#>>#
+#>># TkGoldberg.tcl
+#>># by Keith Vetter, March 13, 2003
+#>>#
+#>># "Man will always find a difficult means to perform a simple task"
+#>># Rube Goldberg
+#>>#
+#>># Reproduced here with permission.
+#>>#
+#>>##+#################################################################
+#>>#
+#>># Keith Vetter 2003-03-21: this started out as a simple little program
+#>># but was so much fun that it grew and grew. So I apologize about the
+#>># size but I just couldn't resist sharing it.
+#>>#
+#>># This is a whizzlet that does a Rube Goldberg type animation, the
+#>># design of which comes from an New Years e-card from IncrediMail.
+#>># That version had nice sound effects which I eschewed. On the other
+#>># hand, that version was in black and white (actually dark blue and
+#>># light blue) and this one is fully colorized.
+#>>#
+#>># One thing I learned from this project is that drawing filled complex
+#>># objects on a canvas is really hard. More often than not I had to
+#>># draw each item twice--once with the desired fill color but no
+#>># outline, and once with no fill but with the outline. Another trick
+#>># is erasing by drawing with the background color. Having a flood fill
+#>># command would have been extremely helpful.
+#>>#
+#>># Two wiki pages were extremely helpful: Drawing rounded rectangles
+#>># which I generalized into Drawing rounded polygons, and regular
+#>># polygons which allowed me to convert ovals and arcs into polygons
+#>># which could then be rotated (see Canvas Rotation). I also wrote
+#>># Named Colors to aid in the color selection.
+#>>#
+#>># I could comment on the code, but it's just 26 state machines with
+#>># lots of canvas create and move calls.
+
+if defined?($goldberg_demo) && $goldberg_demo
+  $goldberg_demo.destroy 
+  $goldberg_demo = nil
+end
+
+# demo toplevel widget
+$goldberg_demo = TkToplevel.new {|w|
+  title("Tk Goldberg (demonstration)")
+  iconname("goldberg")
+#  positionWindow(w)
+}
+
+=begin
+# label
+msg = TkLabel.new($goldberg_demo) {
+  font 'Arial 10'
+  wraplength '4i'
+  justify 'left'
+  text "これは、あなたが自分のアニメーションをいかに入り組んだものにできるかを示すというだけのためのデモです。ボールをクリックすれば物が動き始めます！\n\n\"Man will always find a difficult means to perform a simple task\"\n - Rube Goldberg"
+}
+msg.pack('side'=>'top')
+=end
+
+=begin
+# frame
+TkFrame.new($goldberg_demo) {|frame|
+  TkButton.new(frame) {
+    text '閉じる'
+    command proc{
+      tmppath = $goldberg_demo
+      $goldberg_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'goldberg'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+=end
+
+#########################################
+
+class TkGoldberg_Demo
+  def initialize(parent)
+    @parent = parent
+
+    @S = {}
+    @S['title']   = 'Tk Goldberg'
+    @S['speed']   = TkVariable.new(5)
+    @S['cnt']     = TkVariable.new(0)
+    # @S['message'] = TkVariable.new("\\nWelcome\\nto\\nRuby/Tk")
+    @S['message'] = TkVariable.new("\\n ようこそ！\\nRuby/Tk\\nの\\n世界へ")
+    @S['pause']   = TkVariable.new
+    @S['details'] = TkVariable.new(true)
+
+    @S['mode'] = TkVariable.new(:MSTART, :symbol) 
+    #            :MSTART, :MGO, :MPAUSE, :MSSTEP, :MBSTEP, :MDONE, :MDEBUG
+
+    #         0,  1,  2,  3,  4,  5,   6,   7,   8,   9,  10
+    @speed = [1, 10, 20, 50, 80, 100, 150, 200, 300, 400, 500]
+
+    # colors
+    @C = {}
+    @C['fg'] = 'black'
+    # @C['bg'] = 'gray75'
+    @C['bg'] = 'cornflowerblue'
+
+    @C['0'] = 'white';         @C['1a'] = 'darkgreen';   @C['1b'] = 'yellow'
+    @C['2'] = 'red';           @C['3a'] = 'green';       @C['3b'] = 'darkblue'
+    @C['4'] = @C['fg'];        @C['5a'] = 'brown';       @C['5b'] = 'white'
+    @C['6'] = 'magenta';       @C['7'] = 'green';        @C['8'] = @C['fg']
+    @C['9'] = 'blue4';         @C['10a'] = 'white';      @C['10b'] = 'cyan'
+    @C['11a'] = 'yellow';      @C['11b'] = 'mediumblue'; @C['12'] = 'tan2'
+    @C['13a'] = 'yellow';      @C['13b'] = 'red';        @C['14'] = 'white'
+    @C['15a'] = 'green';       @C['15b'] = 'yellow';     @C['16'] = 'gray65'
+    @C['17'] = '#A65353';     @C['18'] = @C['fg'];      @C['19'] = 'gray50'
+    @C['20'] = 'cyan';         @C['21'] = 'gray65';      @C['22'] = @C['20']
+    @C['23a'] = 'blue';        @C['23b'] = 'red';        @C['23c'] = 'yellow'
+    @C['24a'] = 'red';         @C['24b'] = 'white';
+
+    @STEP = TkVariable.new_hash
+    @STEP.default_value_type = :numeric
+
+    @XY = {}
+
+    @XY6 = {
+      '-1'=>[366, 207], '-2'=>[349, 204], '-3'=>[359, 193], '-4'=>[375, 192], 
+      '-5'=>[340, 190], '-6'=>[349, 177], '-7'=>[366, 177], '-8'=>[380, 176],
+      '-9'=>[332, 172], '-10'=>[342, 161], '-11'=>[357, 164], 
+      '-12'=>[372, 163], '-13'=>[381, 149], '-14'=>[364, 151], 
+      '-15'=>[349, 146], '-16'=>[333, 148], '0'=>[357, 219], 
+      '1'=>[359, 261], '2'=>[359, 291], '3'=>[359, 318], '4'=>[361, 324], 
+      '5'=>[365, 329], '6'=>[367, 334], '7'=>[367, 340], '8'=>[366, 346], 
+      '9'=>[364, 350], '10'=>[361, 355], '11'=>[359, 370], '12'=>[359, 391], 
+      '13,0'=>[360, 456], '13,1'=>[376, 456], '13,2'=>[346, 456], 
+      '13,3'=>[330, 456], '13,4'=>[353, 444], '13,5'=>[368, 443], 
+      '13,6'=>[339, 442], '13,7'=>[359, 431], '13,8'=>[380, 437], 
+      '13,9'=>[345, 428], '13,10'=>[328, 434], '13,11'=>[373, 424], 
+      '13,12'=>[331, 420], '13,13'=>[360, 417], '13,14'=>[345, 412], 
+      '13,15'=>[376, 410], '13,16'=>[360, 403]
+    }
+
+    @timer = TkTimer.new(@speed[@S['speed'].numeric]){|timer|
+      timer.set_interval(go)
+    }
+
+    do_display
+    reset
+
+    # Start everything going
+    @timer.start
+  end
+
+  def do_display()
+    @ctrl = TkFrame.new(@parent, :relief=>:ridge, :bd=>2, :padx=>5, :pady=>5)
+    @screen = TkFrame.new(@parent, :bd=>2, 
+                         :relief=>:raised).pack(:side=>:left, :fill=>:both, 
+                                                :expand=>true)
+
+    @canvas = TkCanvas.new(@parent, :width=>850, :height=>700, 
+                          :bg=>@C['bg'], :highlightthickness=>0){
+      scrollregion([0, 0, 1000, 1000]) # Kludge to move everything up
+      yview_moveto(0.05)
+    }.pack(:in=>@screen, :side=>:top, :fill=>:both, :expand=>true)
+
+    @canvas.bind('3'){ @pause.invoke }
+    @canvas.bind('Destroy'){ @timer.stop }
+
+    do_ctrl_frame
+    do_detail_frame
+
+    msg = TkLabel.new(@parent, :bg=>@C['bg'], :fg=>'white') {
+      font 'Arial 10'
+      wraplength 600
+      justify 'left'
+      text "これは、あなたが自分のアニメーションをいかに入り組んだものにできるかを示すというだけのためのデモです。ボールをクリックすれば物が動き始めます！\n\"Man will always find a difficult means to perform a simple task\" - Rube Goldberg"
+    }
+    msg.place(:in=>@canvas, :relx=>0, :rely=>0, :anchor=>:nw)
+
+    frame = TkFrame.new(@parent, :bg=>@C['bg'])
+
+    TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
+      text '閉じる'
+      command proc{
+        tmppath = $goldberg_demo
+        $goldberg_demo = nil
+        tmppath.destroy
+      }
+    }.pack('side'=>'left')
+
+    TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
+      text 'コード参照'
+      command proc{showCode 'goldberg'}
+    }.pack('side'=>'left', 'padx'=>5)
+
+    @show = TkButton.new(frame, :text=>'>>', :command=>proc{show_ctrl}, 
+                         :bg=>@C['bg'], :activebackground=>@C['bg'])
+    @show.pack('side'=>'left')
+    frame.place(:in=>@canvas, :relx=>1, :rely=>0, :anchor=>:ne)
+
+    Tk.update
+  end
+
+  def do_ctrl_frame
+    @start = TkButton.new(@parent, :text=>'Start', :bd=>6, 
+                          :command=>proc{do_button(0)})
+    @start.font(@start['font'].weight('bold'))
+    font = @start['font']
+
+    @pause = TkCheckbutton.new(@parent, :text=>'Pause', :font=>font, 
+                               :command=>proc{do_button(1)}, :relief=>:raised, 
+                               :variable=>@S['pause'])
+
+    @step  = TkButton.new(@parent, :text=>'Single Step', :font=>font, 
+                          :command=>proc{do_button(2)})
+    @bstep = TkButton.new(@parent, :text=>'Big Step', :font=>font, 
+                          :command=>proc{do_button(4)})
+    @reset = TkButton.new(@parent, :text=>'Reset', :font=>font, 
+                          :command=>proc{do_button(3)})
+
+    @details = TkFrame.new(@parent, :bd=>2, :relief=>:ridge)
+    @detail = TkCheckbutton.new(@parent, :text=>'Details', :font=>font, 
+                               :relief=>:raised, :variable=>@S['details'])
+
+    @msg_entry = TkEntry.new(@parent, :textvariable=>@S['message'], 
+                             :justify=>:center)
+    @speed_scale = TkScale.new(@parent, :orient=>:horizontal, 
+                               :from=>1, :to=>10, :font=>font, 
+                               :variable=>@S['speed'], :bd=>2, 
+                               :relief=>:ridge, :showvalue=>false)
+    @about = TkButton.new(@parent, :text=>'About', 
+                          :command=>proc{about}, :font=>font)
+
+    Tk.grid(@start, :in=>@ctrl, :row=>0, :sticky=>:ew)
+    @ctrl.grid_rowconfigure(1, :minsize=>10)
+    Tk.grid(@pause, :in=>@ctrl, :row=>2, :sticky=>:ew)
+    Tk.grid(@step,  :in=>@ctrl, :sticky=>:ew)
+    Tk.grid(@bstep, :in=>@ctrl, :sticky=>:ew)
+    Tk.grid(@reset, :in=>@ctrl, :sticky=>:ew)
+    @ctrl.grid_rowconfigure(10, :minsize=>20)
+    Tk.grid(@details, :in=>@ctrl, :row=>11, :sticky=>:ew)
+    Tk.grid(@detail, :in=>@details, :row=>0, :sticky=>:ew)
+    @ctrl.grid_rowconfigure(50, :weight=>1)
+
+    @S['mode'].trace('w', proc{|*args| active_GUI(*args)})
+    @S['details'].trace('w', proc{|*args| active_GUI(*args)})
+    @S['speed'].trace('w', proc{|*args| active_GUI(*args)})
+
+    Tk.grid(@msg_entry, :in=>@ctrl, :row=>98, :sticky=>:ew, :pady=>5)
+    Tk.grid(@speed_scale, :in=>@ctrl, :row=>99, :sticky=>:ew)
+    Tk.grid(@about, :in=>@ctrl, :row=>100, :sticky=>:ew)
+
+    @reset.bind('3'){@S['mode'].value = -1}  # Debugging
+  end
+
+  def do_detail_frame
+    @f_details = TkFrame.new(@details)
+
+    @label = TkLabel.new(@f_details, :textvariable=>@S['cnt'], 
+                         :bd=>1, :relief=>:solid, :bg=>'white')
+    Tk.grid(@label, '-', '-', '-', :sticky=>:ew, :row=>0)
+
+    idx = 1
+    loop {
+      break unless respond_to?("move#{idx}")
+      l = TkLabel.new(@f_details, :text=>idx, :anchor=>:e, 
+                      :width=>2, :bd=>1, :relief=>:solid, :bg=>'white')
+      @STEP[idx] = 0
+      ll = TkLabel.new(@f_details, :textvariable=>@STEP.ref(idx), 
+                       :width=>5, :bd=>1, :relief=>:solid, :bg=>'white')
+      row = (idx + 1)/2
+      col = ((idx + 1) & 1) * 2
+      Tk.grid(l, :sticky=>:ew, :row=>row, :column=>col)
+      Tk.grid(ll, :sticky=>:ew, :row=>row, :column=>(col + 1))
+      idx += 1
+    }
+    @f_details.grid_columnconfigure(1, :weight=>1)
+  end
+
+  def show_ctrl
+    if @ctrl.winfo_mapped?
+      @ctrl.pack_forget
+      @show.text('>>')
+    else
+      @ctrl.pack(:side=>:right, :fill=>:both, :ipady=>5)
+      @show.text('<<')
+    end
+  end
+
+  def draw_all
+    reset_step
+    @canvas.delete(:all)
+    idx = 0
+    loop{
+      m = "draw#{idx}"
+      break unless respond_to?(m)
+      send(m)
+      idx += 1
+    }
+  end
+
+  def active_GUI(var1, var2, op)
+    st = {false=>:disabled, true=>:normal}
+
+    m = @S['mode'].to_sym
+    @S['pause'].value = (m == :MPAUSE)
+    @start.state(st[m != :MGO])
+    @pause.state(st[m != :MSTART && m != :MDONE])
+    @step.state(st[m != :MGO && m != :MDONE])
+    @bstep.state(st[m != :MGO && m != :MDONE])
+    @reset.state(st[m != :MSTART])
+
+    if @S['details'].bool
+      Tk.grid(@f_details, :in=>@details, :row=>2, :sticky=>:ew)
+    else
+      Tk.grid_forget(@f_details)
+    end
+    @speed_scale.label("Speed: #{@S['speed'].value}")
+  end
+
+  def start
+    @S['mode'].value = :MGO
+  end
+
+  def do_button(what)
+    case what
+    when 0  # Start
+      reset if @S['mode'].to_sym == :MDONE
+      @S['mode'].value = :MGO
+
+    when 1  # Pause
+      @S['mode'].value = ((@S['pause'].bool)? :MPAUSE: :MGO)
+
+    when 2  # Step
+      @S['mode'].value = :MSSTEP
+
+    when 3  # Reset
+      reset
+
+    when 4  # Big step
+      @S['mode'].value = :MBSTEP
+    end
+  end
+
+  def go(who = nil)
+    now = Tk::Clock.clicks(:miliseconds)
+    if who  # Start here for debugging
+      @S['active'] = [who]
+      @S['mode'].value = :MGO
+    end
+    return if @S['mode'].to_sym == :MDEBUG  # Debugging
+    # If not paused, do the next move
+    n = next_step if @S['mode'].to_sym != :MPAUSE
+    @S['mode'].value = :MPAUSE if @S['mode'].to_sym == :MSSTEP  # Single step
+    @S['mode'].value = :MSSTEP if @S['mode'].to_sym == :MBSTEP && n  # big step
+    elapsed = Tk::Clock.clicks(:miliseconds) - now
+    delay = @speed[@S['speed'].to_i] - elapsed
+    delay = 1 if delay <= 0
+    return delay
+  end
+
+  def next_step
+    retval = false   # Return value
+
+    if @S['mode'].to_sym != :MSTART && @S['mode'].to_sym != :MDONE
+      @S['cnt'].numeric += 1
+    end
+    alive = []
+    @S['active'].each{|who|
+      who = who.to_i
+      n = send("move#{who}")
+      if (n & 1).nonzero?          # This guy still alive
+        alive << who 
+      end
+      if (n & 2).nonzero?          # Next guy is active
+        alive << (who + 1)
+        retval = true
+      end
+      if (n & 4).nonzero?          # End of puzzle flag
+        @S['mode'].value = :MDONE  # Done mode
+        @S['active'] = []          # No more animation
+        return true
+      end
+    }
+    @S['active'] = alive
+    return retval
+  end
+
+  def about
+    msg = "Ruby/Tk Version ::\nby Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)\n\n"
+    msg += "Original Version ::\n"
+    msg += "#{@S['title']}\nby Keith Vetter, March 2003\n(Reproduced by kind permission of the author)\n\n"
+    msg += "Man will always find a difficult means to perform a simple task"
+    msg += "\nRube Goldberg"
+    Tk.messageBox(:message=>msg, :title=>'About')
+  end
+
+  ################################################################
+  #
+  # All the drawing and moving routines
+  #
+
+  # START HERE! banner
+  def draw0
+    color = @C['0']
+    TkcText.new(@canvas, 
+                # [579, 119], :text=>'START HERE!', 
+                [558, 119], :text=>'ここからスタート！', 
+                :fill=>color, :anchor=>:w, 
+                :tag=>'I0', :font=>['Times Roman', 12, :italic, :bold])
+    TkcLine.new(@canvas, [719, 119, 763, 119], :tag=>'I0', :fill=>color, 
+                :width=>5, :arrow=>:last, :arrowshape=>[18, 18, 5])
+    @canvas.itembind('I0', '1'){ start }
+  end
+
+  def move0(step = nil)
+    step = get_step(0, step)
+
+    if @S['mode'].to_sym != :MSTART    # Start the ball rolling
+      move_abs('I0', [-100, -100])     # Hide the banner
+      return 2
+    end
+
+    pos = [
+      [673, 119], [678, 119], [683, 119], [688, 119], 
+      [693, 119], [688, 119], [683, 119], [678, 119]
+    ]
+    step = step % pos.length
+    move_abs('I0', pos[step])
+    return 1
+  end
+
+  # Dropping ball
+  def draw1
+    color = @C['1a']
+    color2 = @C['1b']
+    TkcPolygon.new(@canvas, 
+                   [ 844, 133, 800, 133, 800, 346, 820, 346, 
+                     820, 168, 844, 168, 844, 133 ], 
+                   :width=>3, :fill=>color, :outline=>'')
+    TkcPolygon.new(@canvas, 
+                   [ 771, 133, 685, 133, 685, 168, 751, 168, 
+                     751, 346, 771, 346, 771, 133 ], 
+                   :width=>3, :fill=>color, :outline=>'')
+    TkcOval.new(@canvas, box(812, 122, 9), 
+                :tag=>'I1', :fill=>color2, :outline=>'')
+
+    @canvas.itembind('I1', '1'){ start }
+  end
+
+  def move1(step = nil)
+    step = get_step(1, step)
+    pos = [
+      [807, 122], [802, 122], [797, 123], [793, 124], [789, 129], [785, 153], 
+      [785, 203], [785, 278, :x], [785, 367], [810, 392], [816, 438], 
+      [821, 503], [824, 585, :y], [838, 587], [848, 593], [857, 601], 
+      [-100, -100]
+    ]
+    return 0 if step >= pos.length
+    where = pos[step]
+    move_abs('I1', where)
+    move15a if where[2] == :y
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # Lighting the match
+  def draw2
+    color = @C['2']
+
+    # Fulcrum
+    TkcPolygon.new(@canvas, [750, 369, 740, 392, 760, 392], 
+                   :fill=>@C['fg'], :outline=>@C['fg'])
+
+    # Strike box
+    TkcRectangle.new(@canvas, [628, 335, 660, 383], 
+                     :fill=>'', :outline=>@C['fg'])
+    (0..2).each{|y|
+      yy = 335 + y*16
+      TkcBitmap.new(@canvas, [628, yy], :bitmap=>'gray25', 
+                    :anchor=>:nw, :foreground=>@C['fg'])
+      TkcBitmap.new(@canvas, [644, yy], :bitmap=>'gray25', 
+                    :anchor=>:nw, :foreground=>@C['fg'])
+    }
+
+    # Lever
+    TkcLine.new(@canvas, [702, 366, 798, 366], 
+                :fill=>@C['fg'], :width=>6, :tag=>'I2_0')
+
+    # R strap
+    TkcLine.new(@canvas, [712, 363, 712, 355], 
+                :fill=>@C['fg'], :width=>3, :tag=>'I2_1')
+
+    # L strap
+    TkcLine.new(@canvas, [705, 363, 705, 355], 
+                :fill=>@C['fg'], :width=>3, :tag=>'I2_2')
+
+    # Match stick
+    TkcLine.new(@canvas, [679, 356, 679, 360, 717, 360, 717, 356, 679, 356], 
+                :fill=>@C['fg'], :width=>3, :tag=>'I2_3')
+
+    # Match head
+    TkcPolygon.new(@canvas, 
+                   [ 671, 352, 677.4, 353.9, 680, 358.5, 677.4, 363.1, 
+                     671, 365, 664.6, 363.1, 662, 358.5, 664.6, 353.9 ], 
+                   :fill=>color, :outline=>color, :tag=>'I2_4')
+  end
+
+  def move2(step = nil)
+    step = get_step(2, step)
+
+    stages = [0, 0, 1, 2, 0, 2, 1, 0, 1, 2, 0, 2, 1]
+    xy = []
+    xy[0] = [
+      686, 333, 692, 323, 682, 316, 674, 309, 671, 295, 668, 307, 
+      662, 318, 662, 328, 671, 336
+    ]
+    xy[1] = [
+      687, 331, 698, 322, 703, 295, 680, 320, 668, 297, 663, 311, 
+      661, 327, 671, 335
+    ]
+    xy[2] = [
+      686, 331, 704, 322, 688, 300, 678, 283, 678, 283, 674, 298, 
+      666, 309, 660, 324, 672, 336
+    ]
+
+    if step >= stages.length
+      @canvas.delete('I2')
+      return 0
+    end
+
+    if step == 0  # Rotate the match
+      beta = 20
+      
+      ox, oy = anchor('I2_0', :s)  # Where to pivot
+
+      i = 0
+      until @canvas.find_withtag("I2_#{i}").empty?
+        rotate_item("I2_#{i}", ox, oy, beta)
+        i += 1
+      end
+
+      # For the flame
+      TkcPolygon.new(@canvas, [], :tag=>'I2', :smooth=>true, :fill=>@C['2'])
+
+      return 1
+    end
+    @canvas.coords('I2', xy[stages[step]])
+    return ((step == 7)? 3: 1)
+  end
+
+  # Weight and pulleys
+  def draw3
+    color = @C['3a']
+    color2 = @C['3b']
+
+    xy = [ [602, 296], [577, 174], [518, 174] ]
+    xy.each{|x, y| # 3 Pulleys
+      TkcOval.new(@canvas, box(x, y, 13), 
+                  :fill=>color, :outline=>@C['fg'], :width=>3)
+      TkcOval.new(@canvas, box(x, y, 2), :fill=>@C['fg'], :outline=>@C['fg'])
+    }
+
+    # Wall to flame
+    TkcLine.new(@canvas, [750, 309, 670, 309], :tag=>'I3_s', 
+                :width=>3, :fill=>@C['fg'], :smooth=>true)
+
+    # Flame to pulley 1
+    TkcLine.new(@canvas, [670, 309, 650, 309], :tag=>'I3_0', 
+                :width=>3, :fill=>@C['fg'], :smooth=>true)
+    TkcLine.new(@canvas, [650, 309, 600, 309], :tag=>'I3_1', 
+                :width=>3, :fill=>@C['fg'], :smooth=>true)
+
+    # Pulley 1 half way to 2
+    TkcLine.new(@canvas, [589, 296, 589, 235], :tag=>'I3_2', 
+                :width=>3, :fill=>@C['fg'])
+
+    # Pulley 1 other half to 2
+    TkcLine.new(@canvas, [589, 235, 589, 174], :width=>3, :fill=>@C['fg'])
+
+    # Across the top
+    TkcLine.new(@canvas, [577, 161, 518, 161], :width=>3, :fill=>@C['fg'])
+
+    # Down to weight
+    TkcLine.new(@canvas, [505, 174, 505, 205], :tag=>'I3_w', 
+                :width=>3, :fill=>@C['fg'])
+
+    # Draw the weight as 2 circles, two rectangles and 1 rounded rectangle
+    x1, y1, x2, y2 = [515, 207, 495, 207]
+    TkcOval.new(@canvas, box(x1, y1, 6), 
+                :tag=>'I3_', :fill=>color2, :outline=>color2)
+    TkcOval.new(@canvas, box(x2, y2, 6), 
+                :tag=>'I3_', :fill=>color2, :outline=>color2)
+    TkcRectangle.new(@canvas, x1, y1 - 6, x2, y2 + 6, 
+                     :tag=>'I3_', :fill=>color2, :outline=>color2)
+    
+    TkcPolygon.new(@canvas, round_rect([492, 220, 518, 263], 15), 
+                   :smooth=>true, :tag=>'I3_', :fill=>color2, :outline=>color2)
+
+    TkcLine.new(@canvas, [500, 217, 511, 217], 
+                :tag=>'I3_', :fill=>color2, :width=>10)
+
+    # Bottom weight target
+    TkcLine.new(@canvas, [502, 393, 522, 393, 522, 465], 
+                :tag=>'I3__', :fill=>@C['fg'], :joinstyle=>:miter, :width=>10)
+  end
+
+  def move3(step = nil)
+    step = get_step(3, step)
+
+    pos = [ [505, 247], [505, 297], [505, 386.5], [505, 386.5] ]
+    rope = []
+    rope[0] = [750, 309, 729, 301, 711, 324, 690, 300]
+    rope[1] = [750, 309, 737, 292, 736, 335, 717, 315, 712, 320]
+    rope[2] = [750, 309, 737, 309, 740, 343, 736, 351, 725, 340]
+    rope[3] = [750, 309, 738, 321, 746, 345, 742, 356]
+
+    return 0 if step >= pos.length
+
+    @canvas.delete("I3_#{step}")        # Delete part of the rope
+    move_abs('I3_', pos[step])          # Move weight down
+    @canvas.coords('I3_s', rope[step])  # Flapping rope end
+    @canvas.coords('I3_w', [505, 174].concat(pos[step]))
+    if step == 2
+      @canvas.move('I3__', 0, 30)
+      return 2
+    end
+    return 1
+  end
+
+  # Cage and door
+  def draw4
+    color = @C['4']
+    x0, y0, x1, y1 = [527, 356, 611, 464]
+
+    # Horizontal bars
+    y0.step(y1, 12){|y|
+      TkcLine.new(@canvas, [x0, y, x1, y], :fill=>color, :width=>1)
+    }
+
+    # Vertical bars
+    x0.step(x1, 12){|x|
+      TkcLine.new(@canvas, [x, y0, x, y1], :fill=>color, :width=>1)
+    }
+
+    # Swing gate
+    TkcLine.new(@canvas, [518, 464, 518, 428], 
+                :tag=>'I4', :fill=>color, :width=>1)
+  end
+
+  def move4(step = nil)
+    step = get_step(4, step)
+
+    angles = [-10, -20, -30, -30]
+    return 0 if step >= angles.length
+
+    rotate_item('I4', 518, 464, angles[step])
+    @canvas.raise('I4')
+
+    return((step == 3)? 3: 1)
+  end
+
+  # Mouse
+  def draw5
+    color  = @C['5a']
+    color2 = @C['5b']
+
+    xy = [377, 248, 410, 248, 410, 465, 518, 465]  # Mouse course
+    xy.concat [518, 428, 451, 428, 451, 212, 377, 212]
+
+    TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], :width=>3)
+
+    xy = [
+      534.5, 445.5, 541, 440, 552, 436, 560, 436, 569, 440, 574, 446, 
+      575, 452, 574, 454, 566, 456, 554, 456, 545, 456, 537, 454, 530, 452
+    ]
+    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_0'], :fill=>color)
+
+    TkcLine.new(@canvas, [573, 452, 592, 458, 601, 460, 613, 456], # Tail
+                :tag=>['I5', 'I5_1'], :fill=>color, :smooth=>true, :width=>3)
+
+    xy = box(540, 446, 2)   # Eye
+    xy = [540, 444, 541, 445, 541, 447, 540, 448, 538, 447, 538, 445]
+    TkcPolygon.new(@canvas, xy, :tag=>['I5', 'I5_2'], :fill=>@C['bg'], 
+                   :outline=>'', :smooth=>true)
+
+    xy = [538, 454, 535, 461] # Front leg
+    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_3'], :fill=>color, :width=>2)
+
+    xy = [566, 455, 569, 462] # Back leg
+    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_4'], :fill=>color, :width=>2)
+
+    xy = [544, 455, 545, 460] # 2nd front leg
+    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_5'], :fill=>color, :width=>2)
+
+    xy = [560, 455, 558, 460] # 2nd back leg
+    TkcLine.new(@canvas, xy, :tag=>['I5', 'I5_6'], :fill=>color, :width=>2)
+  end
+
+  def move5(step = nil)
+    step = get_step(5, step)
+
+    pos = [
+      [553, 452], [533, 452], [513, 452], [493, 452], [473, 452], 
+      [463, 442, 30], [445.5, 441.5, 30], [425.5, 434.5, 30], [422, 414], 
+      [422, 394], [422, 374], [422, 354], [422, 334], [422, 314], [422, 294], 
+      [422, 274, -30], [422, 260.5, -30, :x], [422.5, 248.5, -28], [425, 237]
+    ]
+
+    return 0 if step >= pos.length
+
+    x, y, beta, nxt = pos[step]
+    move_abs('I5', [x, y])
+    if beta
+      ox, oy = centroid('I5_0')
+      (0..6).each{|id| rotate_item("I5_#{id}", ox, oy, beta) }
+    end
+    return 3 if nxt == :x
+    return 1
+  end
+
+  # Dropping gumballs
+  def draw6
+    color = @C['6']
+    xy = [324, 130, 391, 204] # Ball holder
+    xy = round_rect(xy, 10)
+    TkcPolygon.new(@canvas, xy, :smooth=>true, 
+                   :outline=>@C['fg'], :width=>3, :fill=>color)
+    xy = [339, 204, 376, 253] # Below the ball holder
+    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>3, 
+                     :fill=>color, :tag=>'I6c')
+    xy = box(346, 339, 28)
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'') # Roter
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc, 
+               :start=>80, :extent=>205)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>2, :style=>:arc, 
+               :start=>-41, :extent=>85)
+
+    xy = box(346, 339, 15) # Center of rotor
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['fg'], :tag=>'I6m')
+    xy = [352, 312, 352, 254, 368, 254, 368, 322] # Top drop to rotor
+    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'')
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
+
+    xy = [353, 240, 367, 300] # Poke bottom hole
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
+    xy = [341, 190, 375, 210] # Poke another hole
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
+
+    xy = [
+      368, 356, 368, 403, 389, 403, 389, 464, 320, 464, 320, 403, 
+      352, 403, 352, 366
+    ]
+    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', 
+                   :width=>2) # Below rotor
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2)
+    xy = box(275, 342, 7) # On/off rotor
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['fg'])
+    xy = [276, 334, 342, 325] # Fan belt top
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+    xy = [276, 349, 342, 353] # Fan belt bottom
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+
+    xy = [337, 212, 337, 247] # What the mouse pushes
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I6_')
+    xy = [392, 212, 392, 247]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I6_')
+    xy = [337, 230, 392, 230]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>7, :tag=>'I6_')
+
+    who = -1 # All the balls
+    colors = %w(red cyan orange green blue darkblue)
+    colors *= 3
+
+    (0..16).each{|i|
+      loc = -i
+      color = colors[i]
+      x, y = @XY6["#{loc}"]
+      TkcOval.new(@canvas, box(x, y, 5), 
+                  :fill=>color, :outline=>color, :tag=>"I6_b#{i}")
+    }
+    draw6a(12) # The wheel
+  end
+
+  def draw6a(beta)
+    @canvas.delete('I6_0')
+    ox, oy = [346, 339]
+    (0..3).each{|i|
+      b = beta + i * 45
+      x, y = rotate_c(28, 0, 0, 0, b)
+      xy = [ox + x, oy + y, ox - x, oy - y]
+      TkcLine.new(@canvas, xy, :tag=>'I6_0', :fill=>@C['fg'], :width=>2)
+    }
+  end
+
+  def move6(step = nil)
+    step = get_step(6, step)
+
+    return 0 if step > 62
+
+    if step < 2  # Open gate for balls to drop
+      @canvas.move('I6_', -7, 0)
+      if step == 1  # Poke a hole
+        xy = [348, 226, 365, 240]
+        TkcRectangle.new(@canvas, xy, :fill=>@canvas.itemcget('I6c', :fill), 
+                         :outline=>'')
+      end
+      return 1
+    end
+
+    s = step - 1  # Do the gumball drop dance
+    (0..(((s - 1)/3).to_i)).each{|i|
+      tag = "I6_b#{i}"
+      break if @canvas.find_withtag(tag).empty?
+      loc = s - 3*i
+
+      if @XY6["#{loc},#{i}"]
+        move_abs(tag, @XY6["#{loc},#{i}"])
+      elsif @XY6["#{loc}"]
+        move_abs(tag, @XY6["#{loc}"])
+      end
+    }
+    if s % 3 == 1
+      first = (s + 2)/3
+      i = first
+      loop {
+        tag = "I6_b#{i}"
+        break if @canvas.find_withtag(tag).empty?
+        loc = first - i
+        move_abs(tag, @XY6["#{loc}"])
+        i += 1
+      }
+    end
+    if s >= 3  # Rotate the motor
+      idx = s % 3
+      draw6a(12 + s * 15)
+    end
+    return((s == 3)? 3 : 1)
+  end
+
+  # On/off switch
+  def draw7
+    color = @C['7']
+    xy = [198, 306, 277, 374]  # Box
+    TkcRectangle.new(@canvas, xy, :outline=>@C['fg'], :width=>2, 
+                     :fill=>color, :tag=>'I7z')
+    @canvas.lower('I7z')
+    xy = [275, 343, 230, 349]
+    TkcLine.new(@canvas, xy, :tag=>'I7', :fill=>@C['fg'], :arrow=>:last, 
+                :arrowshape=>[23, 23, 8], :width=>6)
+    xy = [225, 324]  # On button
+    x, y = xy
+    TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
+    xy = [218, 323]  # On text
+    font = ['Times Roman', 8]
+    TkcText.new(@canvas, xy, :text=>'on', :anchor=>:e, 
+                :fill=>@C['fg'], :font=>font)
+    xy = [225, 350]  # Off button
+    x, y = xy
+    TkcOval.new(@canvas, box(x, y, 3), :fill=>@C['fg'], :outline=>@C['fg'])
+    xy = [218, 349]  # Off text
+    TkcText.new(@canvas, xy, :text=>'off', :anchor=>:e, 
+                :fill=>@C['fg'], :font=>font)
+  end
+
+  def move7(step = nil)
+    step = get_step(7, step)
+
+    numsteps = 30
+    return 0 if step > numsteps
+    beta = 30.0 / numsteps
+    rotate_item('I7', 275, 343, beta)
+
+    return((step == numsteps)? 3: 1)
+  end
+
+  # Electricity to the fan
+  def draw8
+    sine([271, 248, 271, 306], 5, 8, :tag=>'I8_s', :fill=>@C['8'], :width=>3)
+  end
+
+  def move8(step = nil)
+    step = get_step(8, step)
+
+    return 0 if step > 3
+    if step == 0
+      sparkle(anchor('I8_s', :s), 'I8')
+      return 1
+    elsif step == 1
+      move_abs('I8', anchor('I8_s', :c))
+    elsif step == 2
+      move_abs('I8', anchor('I8_s', :n))
+    else
+      @canvas.delete('I8')
+    end
+    return((step == 2)? 3: 1)
+  end
+
+  # Fan
+  def draw9
+    color = @C['9']
+    xy = [266, 194, 310, 220]
+    TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
+    xy = [280, 209, 296, 248]
+    TkcOval.new(@canvas, xy, :outline=>color, :fill=>color)
+    xy = [
+      288, 249, 252, 249, 260, 240, 280, 234, 
+      296, 234, 316, 240, 324, 249, 288, 249
+    ]
+    TkcPolygon.new(@canvas, xy, :fill=>color, :smooth=>true)
+
+    xy = [248, 205, 265, 214, 264, 205, 265, 196]  # Spinner
+    TkcPolygon.new(@canvas, xy, :fill=>color)
+
+    xy = [255, 206, 265, 234]  # Fan blades
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+                :width=>3, :tag=>'I9_0')
+    xy = [255, 176, 265, 204]
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+                :width=>3, :tag=>'I9_0')
+    xy = [255, 206, 265, 220]
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+                :width=>1, :tag=>'I9_1')
+    xy = [255, 190, 265, 204]
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], 
+                :width=>1, :tag=>'I9_1')
+  end
+
+  def move9(step = nil)
+    step = get_step(9, step)
+
+    if (step & 1).nonzero?
+      @canvas.itemconfigure('I9_0', :width=>4)
+      @canvas.itemconfigure('I9_1', :width=>1)
+      @canvas.lower('I9_1', 'I9_0')
+    else
+      @canvas.itemconfigure('I9_0', :width=>1)
+      @canvas.itemconfigure('I9_1', :width=>4)
+      @canvas.lower('I9_0', 'I9_1')
+    end
+    return 3 if step == 0
+    return 1
+  end
+
+  # Boat
+  def draw10
+    color  = @C['10a']
+    color2 = @C['10b']
+    xy = [191, 230, 233, 230, 233, 178, 191, 178]  # Sail
+    TkcPolygon.new(@canvas, xy, :fill=>color, :width=>3, :outline=>@C['fg'], 
+                   :tag=>'I10')
+    xy = box(209, 204, 31)  # Front
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :style=>:pie, 
+               :start=>120, :extent=>120, :tag=>'I10')
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+               :start=>120, :extent=>120, :tag=>'I10')
+    xy = box(249, 204, 31)  # Back
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>3, 
+               :style=>:pie, :start=>120, :extent=>120, :tag=>'I10')
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+               :start=>120, :extent=>120, :tag=>'I10')
+
+    xy = [200, 171, 200, 249]  # Mast
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I10')
+    xy = [159, 234, 182, 234]  # Bow sprit
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I10')
+    xy = [180, 234, 180, 251, 220, 251]  # Hull
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>6, :tag=>'I10')
+
+    xy = [92, 255, 221, 255]  # Waves
+    sine(xy, 2, 25, :fill=>color2, :width=>1, :tag=>'I10w')
+
+    xy = @canvas.coords('I10w')[4..-5]  # Water
+    xy.concat([222, 266, 222, 277, 99, 277])
+    TkcPolygon.new(@canvas, xy, :fill=>color2, :outline=>color2)
+    xy = [222, 266, 222, 277, 97, 277, 97, 266]  # Water bottom
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+
+    xy = box(239, 262, 17)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+               :start=>95, :extent=>103)
+    xy = box(76, 266, 21)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+               :extent=>190)
+  end
+
+  def move10(step = nil)
+    step = get_step(10, step)
+
+    pos = [
+      [195, 212], [193, 212], [190, 212], [186, 212], [181, 212], [176, 212], 
+      [171, 212], [166, 212], [161, 212], [156, 212], [151, 212], [147, 212], 
+      [142, 212], [137, 212], [132, 212, :x], [127, 212], [121, 212], 
+      [116, 212], [111, 212]
+    ]
+
+    return 0 if step >= pos.length
+
+    where = pos[step]
+    move_abs('I10', where)
+
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # 2nd ball drop
+  def draw11
+    color  = @C['11a']
+    color2 = @C['11b']
+    xy = [23, 264, 55, 591]  # Color the down tube
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>'')
+    xy = box(71, 460, 48)    # Color the outer loop
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
+
+    xy = [55, 264, 55, 458]  # Top right side
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+    xy = [55, 504, 55, 591]  # Bottom right side
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+    xy = box(71, 460, 48)    # Outer loop
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+               :start=>110, :extent=>-290, :tag=>'I11i')
+    xy = box(71, 460, 16)    # Inner loop
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>'', 
+                :width=>3, :tag=>'I11i')
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>@C['bg'], :width=>3)
+
+    xy = [23, 264, 23, 591]  # Left side
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+    xy = box(1, 266, 23)     # Top left curve
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, 
+               :style=>:arc, :extent=>90)
+
+    xy = box(75, 235, 9)     # The ball
+    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>'', 
+                :width=>3, :tag=>'I11')
+  end
+
+  def move11(step = nil)
+    step = get_step(11, step)
+
+    pos = [
+      [75, 235], [70, 235], [65, 237], [56, 240], [46, 247], [38, 266], 
+      [38, 296], [38, 333], [38, 399], [38, 475], [74, 496], [105, 472], 
+      [100, 437], [65, 423], [-100, -100], [38, 505], [38, 527, :x], [38, 591]
+    ]
+
+    return 0 if step >= pos.length
+    where = pos[step]
+    move_abs('I11', where)
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # Hand
+  def draw12
+    xy = [
+      20, 637, 20, 617, 20, 610, 20, 590, 40, 590, 40, 590, 
+      60, 590, 60, 610, 60, 610
+    ]
+    xy.concat([60, 610, 65, 620, 60, 631])  # Thumb
+    xy.concat([60, 631, 60, 637, 60, 662, 60, 669, 52, 669, 
+                56, 669, 50, 669, 50, 662, 50, 637])
+
+    y0 = 637  # Bumps for fingers
+    y1 = 645
+    50.step(21, -10){|x|
+      x1 = x - 5
+      x2 = x - 10
+      xy << x << y0 << x1 << y1 << x2 << y0
+    }
+    TkcPolygon.new(@canvas, xy, :fill=>@C['12'], :outline=>@C['fg'], 
+                   :smooth=>true, :tag=>'I12', :width=>3)
+  end
+
+  def move12(step = nil)
+    step = get_step(12, step)
+
+    pos = [[42.5, 641, :x]]
+    return 0 if step >= pos.length
+    where = pos[step]
+    move_abs('I12', where)
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # Fax
+  def draw13
+    color = @C['13a']
+    xy = [86, 663, 149, 663, 149, 704, 50, 704, 50, 681, 64, 681, 86, 671]
+    xy2 = [
+      784, 663, 721, 663, 721, 704, 820, 704, 820, 681, 806, 681, 784, 671
+    ]
+    radii = [2, 9, 9, 8, 5, 5, 2]
+
+    round_poly(@canvas, xy, radii, :width=>3, 
+               :outline=>@C['fg'], :fill=>color)
+    round_poly(@canvas, xy2, radii, :width=>3, 
+               :outline=>@C['fg'], :fill=>color)
+
+    xy = [56, 677]
+    x, y = xy
+    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'], 
+                     :width=>3, :tag=>'I13')
+    xy = [809, 677]
+    x, y = xy
+    TkcRectangle.new(@canvas, box(x, y, 4), :fill=>'', :outline=>@C['fg'], 
+                     :width=>3, :tag=>'I13R')
+
+    xy = [112, 687]  # Label
+    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'], 
+                :font=>['Times Roman', 12, :bold])
+    xy = [762, 687]
+    TkcText.new(@canvas, xy, :text=>'FAX', :fill=>@C['fg'], 
+                :font=>['Times Roman', 12, :bold])
+
+    xy = [138, 663, 148, 636, 178, 636]  # Paper guide
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
+    xy = [732, 663, 722, 636, 692, 636]
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>@C['fg'], :width=>3)
+
+    sine([149, 688, 720, 688], 5, 15, 
+         :tag=>'I13_s', :fill=>@C['fg'],  :width=>3)
+  end
+
+  def move13(step = nil)
+    step = get_step(13, step)
+
+    numsteps = 7
+
+    if step == numsteps + 2
+      move_abs('I13_star', [-100, -100])
+      @canvas.itemconfigure('I13R', :fill=>@C['13b'], :width=>2)
+      return 2
+    end
+    if step == 0  # Button down
+      @canvas.delete('I13')
+      sparkle([-100, -100], 'I13_star')  # Create off screen
+      return 1
+    end
+    x0, y0 = anchor('I13_s', :w)
+    x1, y1 = anchor('I13_s', :e)
+    x = x0 + (x1 - x0) * (step - 1) / numsteps.to_f
+    move_abs('I13_star', [x, y0])
+    return 1
+  end
+
+  # Paper in fax
+  def draw14
+    color = @C['14']
+    xy = [102, 661, 113, 632, 130, 618]  # Left paper edge
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+                :width=>3, :tag=>'I14L_0')
+    xy = [148, 629, 125, 640, 124, 662]  # Right paper edge
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+                :width=>3, :tag=>'I14L_1')
+    draw14a('L')
+
+    xy = [
+      768.0, 662.5, 767.991316225, 662.433786215, 767.926187912, 662.396880171
+    ]
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+                :width=>3, :tag=>'I14R_0')
+    @canvas.lower('I14R_0')
+    # NB. these numbers are VERY sensitive, you must start with final size
+    # and shrink down to get the values
+    xy = [
+      745.947897349, 662.428358855, 745.997829056, 662.452239237, 746.0, 662.5
+    ]
+    TkcLine.new(@canvas, xy, :smooth=>true, :fill=>color, 
+                :width=>3, :tag=>'I14R_1')
+    @canvas.lower('I14R_1')
+  end
+
+  def draw14a(side)
+    color = @C['14']
+    xy = @canvas.coords("I14#{side}_0")
+    xy2 = @canvas.coords("I14#{side}_1")
+    x0, y0, x1, y1, x2, y2 = xy
+    x3, y3, x4, y4, x5, y5 = xy2
+
+    zz = [
+      x0, y0, x0, y0, xy, x2, y2, x2, y2, 
+      x3, y3, x3, y3, xy2, x5, y5, x5, y5
+    ].flatten
+    @canvas.delete("I14#{side}")
+    TkcPolygon.new(@canvas, zz, :tag=>"I14#{side}", :smooth=>true, 
+                   :fill=>color, :outline=>color, :width=>3)
+    @canvas.lower("I14#{side}")
+  end
+
+  def move14(step = nil)
+    step = get_step(14, step)
+
+    # Paper going down
+    sc = 0.9 - 0.05*step
+    if sc < 0.3
+      @canvas.delete('I14L')
+      return 0
+    end
+
+    ox, oy = @canvas.coords('I14L_0')
+    @canvas.scale('I14L_0', ox, oy, sc, sc)
+    ox, oy = @canvas.coords('I14L_1')[-2..-1]
+    @canvas.scale('I14L_1', ox, oy, sc, sc)
+    draw14a('L')
+
+    # Paper going up
+    sc = 0.35 + 0.05*step
+    sc = 1/sc
+
+    ox, oy = @canvas.coords('I14R_0')
+    @canvas.scale('I14R_0', ox, oy, sc, sc)
+    ox, oy = @canvas.coords('I14R_1')[-2..-1]
+    @canvas.scale('I14R_1', ox, oy, sc, sc)
+    draw14a('R')
+
+    return((step == 10)? 3: 1)
+  end
+
+  # Light beam
+  def draw15
+    color = @C['15a']
+    xy = [824, 599, 824, 585, 820, 585, 829, 585]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I15a')
+    xy = [789, 599, 836, 643]
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
+    xy = [778, 610, 788, 632]
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
+    xy = [766, 617, 776, 625]
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
+
+    xy = [633, 600, 681, 640]
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>3)
+    xy = [635, 567, 657, 599]
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
+    xy = [765, 557, 784, 583]
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2)
+
+    sine([658, 580, 765, 580], 3, 15, 
+         :tag=>'I15_s', :fill=>@C['fg'], :width=>3)
+  end
+
+  def move15a
+    color = @C['15b']
+    @canvas.scale('I15a', 824, 599, 1, 0.3)  # Button down
+    xy = [765, 621, 681, 621]
+    TkcLine.new(@canvas, xy, :dash=>'-', :width=>3, :fill=>color, :tag=>'I15')
+  end
+
+  def move15(step = nil)
+    step = get_step(15, step)
+
+    numsteps = 6
+
+    if step == numsteps + 2
+      move_abs('I15_star', [-100, -100])
+      return 2
+    end
+    if step == 0  # Break the light beam
+      sparkle([-100, -100], 'I15_star')
+      xy = [765, 621, 745, 621]
+      @canvas.coords('I15', xy)
+      return 1
+    end
+    x0, y0 = anchor('I15_s', :w)
+    x1, y1 = anchor('I15_s', :e)
+    x = x0 + (x1 - x0) * (step - 1) / numsteps.to_f
+    move_abs('I15_star', [x, y0])
+    return 1
+  end
+
+  # Bell
+  def draw16
+    color = @C['16']
+    xy = [722, 485, 791, 556]
+    TkcRectangle.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>3)
+    xy = box(752, 515, 25)  # Bell
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'black', 
+                :tag=>'I16b', :width=>2)
+    xy = box(752, 515, 5)   # Bell button
+    TkcOval.new(@canvas, xy, :fill=>'black', :outline=>'black', :tag=>'I16b')
+
+    xy = [784, 523, 764, 549]  # Clapper
+    TkcLine.new(@canvas, xy, :width=>3, :tag=>'I16c', :fill=>@C['fg'])
+    xy = box(784, 523, 4)
+    TkcOval.new(@canvas, xy, :fill=>@C['fg'], :outline=>@C['fg'], :tag=>'I16d')
+  end
+
+  def move16(step = nil)
+    step = get_step(16, step)
+
+    # Note: we never stop
+    ox, oy = [760, 553]
+    if (step & 1).nonzero?
+      beta = 12
+      @canvas.move('I16b', 3, 0)
+    else
+      beta = -12
+      @canvas.move('I16b', -3, 0)
+    end
+    rotate_item('I16c', ox, oy, beta)
+    rotate_item('I16d', ox, oy, beta)
+
+    return ((step == 1)? 3: 1)
+  end
+
+  # Cat
+  def draw17
+    color = @C['17']
+
+    xy = [584, 556, 722, 556]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+    xy = [584, 485, 722, 485]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3)
+
+    xy = [664, 523, 717, 549]  # Body
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, :width=>3, 
+               :style=>:chord, :start=>128, :extent=>260, :tag=>'I17')
+
+    xy = [709, 554, 690, 543]  # Paw
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, 
+                :width=>3, :tag=>'I17')
+    xy = [657, 544, 676, 555]
+    TkcOval.new(@canvas, xy, :outline=>@C['fg'], :fill=>color, 
+                :width=>3, :tag=>'I17')
+
+    xy = box(660, 535, 15)     # Lower face
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :style=>:arc, 
+               :start=>150, :extent=>240, :tag=>'I17_')
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+               :style=>:chord, :start=>150, :extent=>240, :tag=>'I17_')
+    xy = [674, 529, 670, 513, 662, 521, 658, 521, 650, 513, 647, 529]  # Ears
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>'', :width=>1, 
+                   :tag=>['I17_', 'I17_c'])
+    xy = [652, 542, 628, 539]  # Whiskers
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+    xy = [652, 543, 632, 545]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+    xy = [652, 546, 632, 552]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+
+    xy = [668, 543, 687, 538]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+                :tag=>['I17_', 'I17_w'])
+    xy = [668, 544, 688, 546]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+                :tag=>['I17_', 'I17_w'])
+    xy = [668, 547, 688, 553]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+                :tag=>['I17_', 'I17_w'])
+
+    xy = [649, 530, 654, 538, 659, 530]  # Left eye
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, 
+                :smooth=>true, :tag=>'I17')
+    xy = [671, 530, 666, 538, 661, 530]  # Right eye
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, 
+                :smooth=>true, :tag=>'I17')
+    xy = [655, 543, 660, 551, 665, 543]  # Mouth
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, 
+                :smooth=>true, :tag=>'I17')
+  end
+
+  def move17(step = nil)
+    step = get_step(17, step)
+
+    if step == 0
+      @canvas.delete('I17')  # Delete most of the cat
+      xy = [655, 543, 660, 535, 665, 543]  # Mouth
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3,
+                  :smooth=>true, :tag=>'I17_')
+      xy = box(654, 530, 4)  # Left eye
+      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'', 
+                  :tag=>'I17_')
+      xy = box(666, 530, 4)  # Right eye
+      TkcOval.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :fill=>'', 
+                  :tag=>'I17_')
+
+      @canvas.move('I17_', 0, -20) # Move face up
+      xy = [652, 528, 652, 554]    # Front leg
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+      xy = [670, 528, 670, 554]    # 2nd front leg
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+
+      xy = [ # Body
+        675, 506, 694, 489, 715, 513, 715, 513, 715, 513, 716, 525, 
+        716, 525, 716, 525, 706, 530, 695, 530, 679, 535, 668, 527, 
+        668, 527, 668, 527, 675, 522, 676, 517, 677, 512
+      ]
+      TkcPolygon.new(@canvas, xy, :fill=>@canvas.itemcget('I17_c', :fill), 
+                     :outline=>@C['fg'], :width=>3, :smooth=>true, 
+                     :tag=>'I17_')
+      xy = [716, 514, 716, 554]  # Back leg
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+      xy = [694, 532, 694, 554]  # 2nd back leg
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I17_')
+      xy = [715, 514, 718, 506, 719, 495, 716, 488]  # Tail
+      TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, 
+                  :smooth=>true, :tag=>'I17_')
+
+      @canvas.raise('I17w')       # Make whiskers visible
+      @canvas.move('I17_', -5, 0) # Move away from the wall a bit
+      return 2
+    end
+    return 0
+  end
+
+  # Sling shot
+  def draw18
+    color = @C['18']
+    xy = [721, 506, 627, 506]  # Sling hold
+    TkcLine.new(@canvas, xy, :width=>4, :fill=>@C['fg'], :tag=>'I18')
+
+    xy = [607, 500, 628, 513]  # Sling rock
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :tag=>'I18a')
+
+    xy = [526, 513, 606, 507, 494, 502]  # Sling band
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>4, :tag=>'I18b')
+    xy = [485, 490, 510, 540, 510, 575, 510, 540, 535, 491]  # Sling
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>6)
+  end
+
+  def move18(step = nil)
+    step = get_step(18, step)
+
+    pos = [
+      [587, 506], [537, 506], [466, 506], [376, 506], [266, 506, :x], 
+      [136, 506], [16, 506], [-100, -100]
+    ]
+
+    b = []
+    b[0] = [490, 502, 719, 507, 524, 512]  # Band collapsing
+    b[1] = [
+      491, 503, 524, 557, 563, 505, 559, 496, 546, 506, 551, 525, 
+      553, 536, 538, 534, 532, 519, 529, 499
+    ]
+    b[2] = [
+      491, 503, 508, 563, 542, 533, 551, 526, 561, 539, 549, 550, 530, 500
+    ]
+    b[3] = [
+      491, 503, 508, 563, 530, 554, 541, 562, 525, 568, 519, 544, 530, 501
+    ]
+
+    return 0 if step >= pos.length
+
+    if step == 0
+      @canvas.delete('I18')
+      @canvas.itemconfigure('I18b', :smooth=>true)
+    end
+    if b[step]
+      @canvas.coords('I18b', b[step])
+    end
+
+    where = pos[step]
+    move_abs('I18a', where)
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # Water pipe
+  def draw19
+    color = @C['19']
+    xx = [[249, 181], [155, 118], [86, 55], [22, 0]]
+    xx.each{|x1, x2|
+      TkcRectangle.new(@canvas, x1, 453, x2, 467, 
+                       :fill=>color, :outline=>'', :tag=>'I19')
+      TkcLine.new(@canvas, x1, 453, x2, 453, 
+                  :fill=>@C['fg'], :width=>1) # Pipe top
+      TkcLine.new(@canvas, x1, 467, x2, 467, 
+                  :fill=>@C['fg'], :width=>1) # Pipe bottom
+    }
+    @canvas.raise('I11i')
+
+    xy = box(168, 460, 16)  # Bulge by the joint
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'')
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc, 
+               :start=>21, :extent=>136)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, :style=>:arc, 
+               :start=>-21, :extent=>-130)
+
+    xy = [249, 447, 255, 473]  # First joint 26x6
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
+
+    xy = box(257, 433, 34)     # Bend up
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+               :style=>:pie, :start=>0, :extent=>-91)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+               :style=>:arc, :start=>0, :extent=>-90)
+    xy = box(257, 433, 20)
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1, 
+               :style=>:pie, :start=>0, :extent=>-92)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+               :style=>:arc, :start=>0, :extent=>-90)
+    xy = box(257, 421, 34)     # Bend left
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+               :style=>:pie, :start=>0, :extent=>91)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+               :style=>:arc, :start=>0, :extent=>90)
+    xy = box(257, 421, 20)
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1, 
+               :style=>:pie, :start=>0, :extent=>90)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+               :style=>:arc, :start=>0, :extent=>90)
+    xy = box(243, 421, 34)     # Bend down
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>color, :width=>1, 
+               :style=>:pie, :start=>90, :extent=>90)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+               :style=>:arc, :start=>90, :extent=>90)
+    xy = box(243, 421, 20)
+    TkcArc.new(@canvas, xy, :outline=>'', :fill=>@C['bg'], :width=>1, 
+               :style=>:pie, :start=>90, :extent=>90)
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>1, 
+               :style=>:arc, :start=>90, :extent=>90)
+
+    xy = [270, 427, 296, 433]  # 2nd joint bottom
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
+    xy = [270, 421, 296, 427]  # 2nd joint top
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
+    xy = [249, 382, 255, 408]  # Third joint right
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
+    xy = [243, 382, 249, 408]  # Third joint left
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
+    xy = [203, 420, 229, 426]  # Last joint
+    TkcRectangle.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>1)
+
+    xy = box(168, 460, 6)      # Handle joint
+    TkcOval.new(@canvas, xy, :fill=>@C['fg'], :outline=>'', :tag=>'I19a')
+    xy = [168, 460, 168, 512]  # Handle bar
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>5, :tag=>'I19b')
+  end
+
+  def move19(step = nil)
+    step = get_step(19, step)
+
+     angles = [30, 30, 30]
+    return 2 if step == angles.length
+    ox, oy = centroid('I19a')
+    rotate_item('I19b', ox, oy, angles[step])
+
+    return 1
+  end
+
+  # Water pouring
+  def draw20
+    # do nothing
+  end
+
+  def move20(step = nil)
+    step = get_step(20, step)
+
+    pos  = [451, 462, 473, 484, 496, 504, 513, 523, 532]
+    freq  = [20,  40,  40,  40,  40,  40,  40,  40,  40]
+    pos = [
+      [451, 20], [462, 40], [473, 40], [484, 40], [496, 40], 
+      [504, 40], [513, 40], [523, 40], [532, 40, :x]
+    ]
+    return 0 if step >= pos.length
+
+    @canvas.delete('I20')
+    where = pos[step]
+    y, f = where
+    h20(y, f)
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  def h20(y, f)
+    color = @C['20']
+    @canvas.delete('I20')
+
+    sine([208, 428, 208, y], 4, f, :tag=>['I20', 'I20s'], 
+         :width=>3, :fill=>color, :smooth=>true)
+    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3, 
+                :fill=>color, :smooth=>1, :tag=>['I20', 'I20a'])
+    TkcLine.new(@canvas, @canvas.coords('I20s'), :width=>3, 
+                :fill=>color, :smooth=>1, :tag=>['I20', 'I20b'])
+    @canvas.move('I20a', 8, 0)
+    @canvas.move('I20b', 16, 0)
+  end
+
+  # Bucket
+  def draw21
+    color = @C['21']
+    xy = [217, 451, 244, 490]  # Right handle
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21_a')
+    xy = [201, 467, 182, 490]  # Left handle
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21_a')
+
+    xy = [245, 490, 237, 535]  # Right side
+    xy2 = [189, 535, 181, 490] # Left side
+    TkcPolygon.new(@canvas, xy + xy2, :fill=>color, :outline=>'', 
+                   :tag=>['I21', 'I21f'])
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>2, :tag=>'I21')
+    TkcLine.new(@canvas, xy2, :fill=>@C['fg'], :width=>2, :tag=>'I21')
+
+    xy = [182, 486, 244, 498]  # Top
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>'', :width=>2, 
+                :tag=>['I21', 'I21f'])
+    TkcOval.new(@canvas, xy, :fill=>'', :outline=>@C['fg'], :width=>2, 
+                :tag=>['I21', 'I21t'])
+    xy = [189, 532, 237, 540]  # Bottom
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], :width=>2, 
+                :tag=>['I21', 'I21b'])
+  end
+
+  def move21(step = nil)
+    step = get_step(21, step)
+
+    numsteps = 30
+    return 0 if step >= numsteps
+
+    x1, y1, x2, y2 = @canvas.coords('I21b')
+    # lx1, ly1, lx2, ly2 = @canvas.coords('I21t')
+    lx1, ly1, lx2, ly2 = [183, 492, 243, 504]
+
+    f = step / numsteps.to_f
+    y2 = y2 - 3
+    xx1 = x1 + (lx1 - x1) * f
+    yy1 = y1 + (ly1 - y1) * f
+    xx2 = x2 + (lx2 - x2) * f
+    yy2 = y2 + (ly2 - y2) * f
+
+    @canvas.itemconfigure('I21b', :fill=>@C['20'])
+    @canvas.delete('I21w')
+    TkcPolygon.new(@canvas, x2, y2, x1, y1, xx1, yy1, xx2, yy1, 
+                   :tag=>['I21', 'I21w'], :outline=>'', :fill=>@C['20'])
+    @canvas.lower('I21w', 'I21')
+    @canvas.raise('I21b')
+    @canvas.lower('I21f')
+
+    return((step == numsteps - 1)? 3: 1)
+  end
+
+  # Bucket drop
+  def draw22
+    # do nothing
+  end
+
+  def move22(step = nil)
+    step = get_step(22, step)
+    pos = [[213, 513], [213, 523], [213, 543, :x], [213, 583], [213, 593]]
+
+    @canvas.itemconfigure('I21f', :fill=>@C['22']) if step == 0
+    return 0 if step >= pos.length
+    where = pos[step]
+    move_abs('I21', where)
+    h20(where[1], 40)
+    @canvas.delete('I21_a')  # Delete handles
+
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # Blow dart
+  def draw23
+    color  = @C['23a']
+    color2 = @C['23b']
+    color3 = @C['23c']
+
+    xy = [185, 623, 253, 650]  # Block
+    TkcRectangle.new(@canvas, xy, :fill=>'black', :outline=>@C['fg'], 
+                     :width=>2, :tag=>'I23a')
+    xy = [187, 592, 241, 623]  # Balloon
+    TkcOval.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
+    TkcArc.new(@canvas, xy, :outline=>@C['fg'], :width=>3, :tag=>'I23b', 
+               :style=>:arc, :start=>12, :extent=>336)
+    xy = [239, 604, 258, 589, 258, 625, 239, 610]  # Balloon nozzle
+    TkcPolygon.new(@canvas, xy, :outline=>'', :fill=>color, :tag=>'I23b')
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23b')
+
+    xy = [285, 611, 250, 603]  # Dart body
+    TkcOval.new(@canvas, xy, :fill=>color2, :outline=>@C['fg'], 
+                :width=>3, :tag=>'I23d')
+    xy = [249, 596, 249, 618, 264, 607, 249, 596]  # Dart tail
+    TkcPolygon.new(@canvas, xy, :fill=>color3, :outline=>@C['fg'], 
+                   :width=>3, :tag=>'I23d')
+    xy = [249, 607, 268, 607]  # Dart detail
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
+    xy = [285, 607, 305, 607]  # Dart needle
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I23d')
+  end
+
+  def move23(step = nil)
+    step = get_step(23, step)
+
+    pos = [
+      [277, 607], [287, 607], [307, 607, :x], [347, 607], [407, 607], 
+      [487, 607], [587, 607], [687, 607], [787, 607], [-100, -100]
+    ]
+
+    return 0 if step >= pos.length
+    if step <= 1
+      ox, oy = anchor('I23a', :n)
+      @canvas.scale('I23b', ox, oy, 0.9, 0.5)
+    end
+    where = pos[step]
+    move_abs('I23d', where)
+
+    return 3 if where[2] == :x
+    return 1
+  end
+
+  # Balloon
+  def draw24
+    color = @C['24a']
+    xy = [366, 518, 462, 665]  # Balloon
+    TkcOval.new(@canvas, xy, :fill=>color, :outline=>@C['fg'], 
+                :width=>3, :tag=>'I24')
+    xy = [414, 666, 414, 729]  # String
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :width=>3, :tag=>'I24')
+    xy = [410, 666, 404, 673, 422, 673, 418, 666]  # Nozzle
+    TkcPolygon.new(@canvas, xy, :fill=>color, :outline=>@C['fg'],
+                   :width=>3, :tag=>'I24')
+
+    xy = [387, 567, 390, 549, 404, 542]  # Reflections
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+                :width=>2, :tag=>'I24')
+    xy = [395, 568, 399, 554, 413, 547]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+                :width=>2, :tag=>'I24')
+    xy = [403, 570, 396, 555, 381, 553]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+                :width=>2, :tag=>'I24')
+    xy = [408, 564, 402, 547, 386, 545]
+    TkcLine.new(@canvas, xy, :fill=>@C['fg'], :smooth=>true, 
+                :width=>2, :tag=>'I24')
+  end
+
+  def move24(step = nil)
+    step = get_step(24, step)
+
+    return 0 if step > 4
+    return 2 if step == 4
+
+    if step == 0
+      @canvas.delete('I24')  # Exploding balloon
+      xy = [
+        347, 465, 361, 557, 271, 503, 272, 503, 342, 574, 259, 594, 
+        259, 593, 362, 626, 320, 737, 320, 740, 398, 691, 436, 738, 
+        436, 739, 476, 679, 528, 701, 527, 702, 494, 627, 548, 613, 
+        548, 613, 480, 574, 577, 473, 577, 473, 474, 538, 445, 508, 
+        431, 441, 431, 440, 400, 502, 347, 465, 347, 465
+      ]
+      TkcPolygon.new(@canvas, xy, :tag=>'I24', :fill=>@C['24b'], 
+                     :outline=>@C['24a'], :width=>10, :smooth=>true)
+      msg = Tk.subst(@S['message'].value)
+      TkcText.new(@canvas, centroid('I24'), :text=>msg, :tag=>['I24', 'I24t'], 
+                  :justify=>:center, :font=>['Times Roman', 18, :bold])
+      return 1
+    end
+
+    @canvas.itemconfigure('I24t', :font=>['Times Roman', 18 + 6*step, :bold])
+    @canvas.move('I24', 0, -60)
+    ox, oy = centroid('I24')
+    @canvas.scale('I24', ox, oy, 1.25, 1.25)
+    return 1
+  end
+
+  # Displaying the message
+  def move25(step = nil)
+    step = get_step(25, step)
+
+    if step == 0
+      @XY['25'] = Tk::Clock.clicks(:miliseconds)
+      return 1
+    end
+    elapsed = Tk::Clock.clicks(:miliseconds) - @XY['25']
+    return 1 if elapsed < 5000
+    return 2
+  end
+
+  # Collapsing balloon
+  def move26(step = nil)
+    step = get_step(26, step)
+
+    if step >= 3
+      @canvas.delete('I24', 'I26')
+      TkcText.new(@canvas, 430, 735, :anchor=>:s, :tag=>'I26', 
+                  #:text=>'click to continue', 
+                  :text=>'クリックでリセットします', 
+                  :font=>['Times Roman', 20, :bold])
+      @canvas.bind('1', proc{reset})
+      return 4
+    end
+
+    ox, oy = centroid('I24')
+    @canvas.scale('I24', ox, oy, 0.8, 0.8)
+    @canvas.move('I24', 0, 60)
+    @canvas.itemconfigure('I24t', :font=>['Times Roman', 30 - 6*step, :bold])
+    return 1
+  end
+
+  ################################################################
+  #
+  # Helper functions
+  #
+  def box(x, y, r)
+    [x - r, y - r, x + r, y + r]
+  end
+
+  def move_abs(item, xy)
+    x, y = xy
+    ox, oy = centroid(item)
+    dx = x - ox
+    dy = y - oy
+    @canvas.move(item, dx, dy)
+  end
+
+  def rotate_item(item, ox, oy, beta)
+    xy = @canvas.coords(item)
+    xy2 = []
+    0.step(xy.length - 1, 2){|idx|
+      x, y = xy[idx, 2]
+      xy2.concat(rotate_c(x, y, ox, oy, beta))
+    }
+    @canvas.coords(item, xy2)
+  end
+
+  def rotate_c(x, y, ox, oy, beta)
+    # rotates vector (ox,oy)->(x,y) by beta degrees clockwise
+
+    x -= ox    # Shift to origin
+    y -= oy
+
+    beta = beta * Math.atan(1) * 4 / 180.0        # Radians
+    xx = x * Math.cos(beta) - y * Math.sin(beta)  # Rotate
+    yy = x * Math.sin(beta) + y * Math.cos(beta)
+
+    xx += ox  # Shift back
+    yy += oy
+
+    [xx, yy]
+  end
+
+  def reset
+    draw_all
+    @canvas.bind_remove('1')
+    @S['mode'].value = :MSTART
+    @S['active'] = [0]
+  end
+
+  # Each Move## keeps its state info in STEP, this retrieves and increments it
+  def get_step(who, step)
+    if step
+      @STEP[who] = step
+    else
+      if !@STEP.exist?(who) || @STEP[who] == ""
+        @STEP[who] = 0
+      else
+        @STEP[who] += 1
+      end
+    end
+    @STEP[who]
+  end
+
+  def reset_step
+    @S['cnt'].value = 0
+    @STEP.keys.each{|k| @STEP[k] = ''}
+  end
+
+  def sine(xy0, amp, freq, opts = {})
+    x0, y0, x1, y1 = xy0
+    step = 2
+    xy = []
+    if y0 == y1  # Horizontal
+      x0.step(x1, step){|x|
+        beta = (x - x0) * 2 * Math::PI / freq
+        y = y0 + amp * Math.sin(beta)
+        xy << x << y
+      }
+    else
+      y0.step(y1, step){|y|
+        beta = (y - y0) * 2 * Math::PI / freq
+        x = x0 + amp * Math.sin(beta)
+        xy << x << y
+      }
+    end
+    TkcLine.new(@canvas, xy, opts)
+  end
+
+  def round_rect(xy, radius, opts={})
+    x0, y0, x3, y3 = xy
+    r = @canvas.winfo_pixels(radius)
+    d = 2 * r
+
+    # Make sure that the radius of the curve is less than 3/8 size of the box!
+    maxr = 0.75
+    if d > maxr * (x3 - x0)
+      d = maxr * (x3 - x0)
+    end
+    if d > maxr * (y3 - y0)
+      d = maxr * (y3 - y0)
+    end
+
+    x1 = x0 + d
+    x2 = x3 - d
+    y1 = y0 + d
+    y2 = y3 - d
+
+    xy = [x0, y0, x1, y0, x2, y0, x3, y0, x3, y1, x3, y2]
+    xy.concat([x3, y3, x2, y3, x1, y3, x0, y3, x0, y2, x0, y1])
+    return xy
+  end
+
+  def round_poly(canv, xy, radii, opts)
+    lenXY = xy.length
+    lenR = radii.length
+    if lenXY != 2*lenR
+      raise "wrong number of vertices and radii"
+    end
+
+    knots = []
+    x0 = xy[-2]; y0 = xy[-1]
+    x1 = xy[0];  y1 = xy[1]
+    xy << xy[0] << xy[1]
+
+    0.step(lenXY - 1, 2){|i|
+      radius = radii[i/2]
+      r = canv.winfo_pixels(radius)
+
+      x2 = xy[i+2];  y2 = xy[i+3]
+      z = _round_poly2(x0, y0, x1, y1, x2, y2, r)
+      knots.concat(z)
+
+      x0 = x1;  y0 = y1
+      x1 = x2;  y1 = y2
+    }
+    TkcPolygon.new(canv, knots, {:smooth=>true}.update(opts))
+  end
+
+  def _round_poly2(x0, y0, x1, y1, x2, y2, radius)
+    d = 2 * radius
+    maxr = 0.75
+
+    v1x = x0 - x1
+    v1y = y0 - y1
+    v2x = x2 - x1
+    v2y = y2 - y1
+
+    vlen1 = Math.sqrt(v1x*v1x + v1y*v1y)
+    vlen2 = Math.sqrt(v2x*v2x + v2y*v2y)
+
+    if d > maxr * vlen1
+      d = maxr * vlen1
+    end
+    if d > maxr * vlen2
+      d = maxr * vlen2
+    end
+
+    xy = []
+    xy << (x1 + d * v1x / vlen1) << (y1 + d * v1y / vlen1)
+    xy << x1 << y1
+    xy << (x1 + d * v2x / vlen2) << (y1 + d * v2y / vlen2)
+
+    return xy
+  end
+
+  def sparkle(oxy, tag)
+    xy = [
+      [299, 283], [298, 302], [295, 314], [271, 331], 
+      [239, 310], [242, 292], [256, 274], [281, 273]
+    ]
+    xy.each{|x, y|
+      TkcLine.new(@canvas, 271, 304, x, y, 
+                  :fill=>'white', :width=>3, :tag=>tag)
+    }
+    move_abs(tag, oxy)
+  end
+
+  def centroid(item)
+    anchor(item, :c)
+  end
+
+  def anchor(item, where)
+    x1, y1, x2, y2 = @canvas.bbox(item)
+    case(where)
+    when :n
+      y = y1
+    when :s
+      y = y2
+    else
+      y = (y1 + y2) / 2.0
+    end
+    case(where)
+    when :w
+      x = x1
+    when :e
+      x = x2
+    else
+      x = (x1 + x2) / 2.0
+    end
+    return [x, y]
+  end
+end
+
+TkGoldberg_Demo.new($goldberg_demo)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/hello b/ruby_1_8_6/ext/tk/sample/demos-jp/hello
new file mode 100644
index 0000000000..859ebd950e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/hello
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require 'tk'
+
+TkButton.new(nil,
+	'text'=>"こんにちは、世界",
+	'command'=>proc{print "こんにちは、世界\n"; exit}
+).pack
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/hscale.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/hscale.rb
new file mode 100644
index 0000000000..37d215435c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/hscale.rb
@@ -0,0 +1,77 @@
+require "tkcanvas"
+
+if defined?($hscale_demo) && $hscale_deom
+  $hscale_demo.destroy
+  $hscale_demo = nil
+end
+
+$hscale_demo = TkToplevel.new {|w|
+  title("Horizontal Scale Demonstration")
+  iconname("hscale")
+}
+positionWindow($hscale_demo)
+
+
+msg = TkLabel.new($hscale_demo) {
+  font $font
+  wraplength '3.5i'
+  justify 'left'
+  text "下には矢印が1つと水平なスケールが表示されています。\
+スケール上でマウスボタン1をクリック、またはドラッグすると\
+矢印の長さを変えることができます。"
+}
+msg.pack('side'=>'top')
+
+TkFrame.new($hscale_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc {
+      tmppath = $hscale_demo
+      $hscale_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc { showCode 'hscale' }
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+TkFrame.new($hscale_demo) {|frame|
+  canvas = TkCanvas.new(frame) {|c|
+    width 50
+    height 50
+    bd 0
+    highlightthickness 0
+    TkcPolygon.new(c, '0', '0', '1', '1', '2', '2') {
+      fill 'DeepSkyBlue'
+      tags 'poly'
+    }
+    TkcLine.new(c, '0', '0', '1', '1', '2', '2', '0', '0') {
+      fill 'black'
+      tags 'line'
+    }
+  }.pack('side'=>'top', 'expand'=>'yes', 'anchor'=>'s', 'fill'=>'x', 'padx'=>'15')
+  scale = TkScale.new(frame) {
+    orient 'horizontal'
+    length 284
+    from 0
+    to 250
+    command proc{|value| setWidth(canvas, value)}
+    tickinterval 50
+  }.pack('side'=>'bottom', 'expand'=>'yes', 'anchor'=>'n')
+  scale.set 75
+}.pack('side'=>'top', 'fill'=>'x')
+
+
+def setWidth(w, width)
+  width = width + 21
+  x2 = width - 30
+  if x2 < 21
+    x2 = 21
+  end
+  w.coords 'poly',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
+  w.coords 'line',20,15,20,35,x2,35,x2,45,width,25,x2,5,x2,15,20,15
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/icon.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/icon.rb
new file mode 100644
index 0000000000..e4fef5cae7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/icon.rb
@@ -0,0 +1,96 @@
+#
+# iconic button widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($icon_demo) && $icon_demo
+  $icon_demo.destroy 
+  $icon_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$icon_demo = TkToplevel.new {|w|
+  title("Iconic Button Demonstration")
+  iconname("icon")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($icon_demo) {
+  font $font
+  wraplength '5i'
+  justify 'left'
+  text "このウィンドウにはラジオボタンとチェックボタン上にビットマップや画像を表示する 3 つの方法を示しています。左にあるのは2つのラジオボタンで、それぞれが、ビットマップと選択を示すインジケータでできています。中央にあるのは、選択済みかどうかによって異なる画像を表示するチェックボタンです。右側にあるのは選択済みかどうかによって背景色が変わるビットマップを表示するチェックボタンです。"
+}
+msg.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($icon_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $icon_demo
+      $icon_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'icon'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# image 生成
+flagup = \
+TkBitmapImage.new('file'=>[$demo_dir,'..',
+                           'images','flagup.xbm'].join(File::Separator),
+                  'maskfile'=>\
+                  [$demo_dir,'..','images','flagup.xbm'].join(File::Separator))
+flagdown = \
+TkBitmapImage.new('file'=>[$demo_dir,'..',
+                           'images','flagdown.xbm'].join(File::Separator),
+                  'maskfile'=>\
+                  [$demo_dir,'..',
+                    'images','flagdown.xbm'].join(File::Separator))
+
+# 変数生成
+letters = TkVariable.new
+
+# frame 生成
+TkFrame.new($icon_demo, 'borderwidth'=>10){|w|
+  TkFrame.new(w) {|f|
+    TkRadioButton.new(f){
+      bitmap '@' + [$demo_dir,'..',
+                     'images','letters.xbm'].join(File::Separator)
+      variable letters
+      value 'full'
+    }.pack('side'=>'top', 'expand'=>'yes')
+
+    TkRadioButton.new(f){
+      bitmap '@' + [$demo_dir,'..',
+                     'images','noletter.xbm'].join(File::Separator)
+      variable letters
+      value 'empty'
+    }.pack('side'=>'top', 'expand'=>'yes')
+
+  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
+
+  TkCheckButton.new(w) {
+    image flagdown
+    selectimage flagup
+    indicatoron 0
+    selectcolor self['background']
+  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
+
+  TkCheckButton.new(w) {
+    bitmap '@' + [$demo_dir,'..',
+                   'images','letters.xbm'].join(File::Separator)
+    indicatoron 0
+    selectcolor 'SeaGreen1'
+  }.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'5m')
+
+}.pack('side'=>'top')
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/image1.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/image1.rb
new file mode 100644
index 0000000000..3d47f844e5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/image1.rb
@@ -0,0 +1,58 @@
+#
+# two image widgets demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($image1_demo) && $image1_demo
+  $image1_demo.destroy 
+  $image1_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$image1_demo = TkToplevel.new {|w|
+  title('Image Demonstration #1')
+  iconname("Image1")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($image1_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "このデモでは2つのラベル上に画像をそれぞれ表示しています。"
+}
+msg.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($image1_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $image1_demo
+      $image1_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'image1'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# image 生成
+image1a = \
+TkPhotoImage.new('file'=>[$demo_dir,'..',
+                          'images','earth.gif'].join(File::Separator))
+image1b = \
+TkPhotoImage.new('file'=>[$demo_dir,'..',
+                          'images','earthris.gif'].join(File::Separator))
+
+# label 生成
+[ TkLabel.new($image1_demo, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
+  TkLabel.new($image1_demo, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
+].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/image2.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/image2.rb
new file mode 100644
index 0000000000..e2e2a2b036
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/image2.rb
@@ -0,0 +1,102 @@
+#
+# widget demo 'load image' (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($image2_demo) && $image2_demo
+  $image2_demo.destroy 
+  $image2_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$image2_demo = TkToplevel.new {|w|
+  title('Image Demonstration #2')
+  iconname("Image2")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($image2_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "このデモではTkの photo image を使用して画像を見ることができます。最初にエントリ内ににディレクトリ名を入れて下さい。次に下のリストボックスにこのディレクトリをロードするため、リターンを押してください。その後、画像を選択するためにリストボックスの中のファイル名をダブルクリックして下さい。"
+}
+msg.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($image2_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $image2_demo
+      $image2_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'image2'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# 変数生成
+$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
+
+# image 生成
+$image2a = TkPhotoImage.new
+
+# ファイル名入力部
+TkLabel.new($image2_demo, 'text'=>'ディレクトリ:')\
+.pack('side'=>'top', 'anchor'=>'w')
+
+image2_e = TkEntry.new($image2_demo) {
+  width 30
+  textvariable $dirName
+}.pack('side'=>'top', 'anchor'=>'w')
+
+TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20)\
+.pack('side'=>'top', 'anchor'=>'w')
+
+TkLabel.new($image2_demo, 'text'=>'ファイル:')\
+.pack('side'=>'top', 'anchor'=>'w')
+
+TkFrame.new($image2_demo){|w|
+  s = TkScrollbar.new(w)
+  l = TkListbox.new(w) {
+    width 20
+    height 10
+    yscrollcommand proc{|first,last| s.set first,last}
+  }
+  s.command(proc{|*args| l.yview(*args)})
+  l.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
+  s.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y')
+  #l.insert(0,'earth.gif', 'earthris.gif', 'mickey.gif', 'teapot.ppm')
+  l.insert(0,'earth.gif', 'earthris.gif', 'teapot.ppm')
+  l.bind('Double-1', proc{|x,y| loadImage $image2a,l,x,y}, '%x %y')
+
+  image2_e.bind 'Return', proc{loadDir l}
+
+}.pack('side'=>'top', 'anchor'=>'w')
+
+# image 配置
+[ TkFrame.new($image2_demo, 'height'=>'3m', 'width'=>20),
+  TkLabel.new($image2_demo, 'text'=>'画像:'),
+  TkLabel.new($image2_demo, 'image'=>$image2a)
+].each{|w| w.pack('side'=>'top', 'anchor'=>'w')}
+
+# メソッド定義
+def loadDir(w)
+  w.delete(0,'end')
+  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
+    w.insert('end',File.basename(f))
+  }
+end
+
+def loadImage(img,w,x,y)
+  img.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/image3.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/image3.rb
new file mode 100644
index 0000000000..d9f378c116
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/image3.rb
@@ -0,0 +1,123 @@
+# image3.rb
+#
+# This demonstration script creates a simple collection of widgets
+# that allow you to select and view images in a Tk label.
+#
+# widget demo 'load image' (called by 'widget')
+#
+
+# toplevel widget
+if defined?($image3_demo) && $image3_demo
+  $image3_demo.destroy 
+  $image3_demo = nil
+end
+
+# demo toplevel widget
+$image3_demo = TkToplevel.new {|w|
+  title('Image Demonstration #3')
+  iconname("Image3")
+  positionWindow(w)
+}
+
+# 
+def loadDir3(w)
+  w.delete(0,'end')
+  Dir.glob([$dirName,'*'].join(File::Separator)).sort.each{|f|
+    w.insert('end',File.basename(f))
+  }
+end
+
+# selectAndLoadDir3 --
+# This procedure pops up a dialog to ask for a directory to load into
+# the listobx and (if the user presses OK) reloads the directory
+# listbox from the directory named in the demo's entry.
+#
+# Arguments:
+# w -                   Name of the toplevel window of the demo.
+def selectAndLoadDir3(w, lbox)
+  dir = Tk.chooseDirectory(:initialdir=>$dirName.value, 
+                           :parent=>w, :mustexist=>true)
+  if dir.length > 0
+    $dirName.value = dir 
+    loadDir3(lbox)
+  end
+end
+
+def loadImage3(w,x,y)
+  $image3a.file([$dirName, w.get("@#{x},#{y}")].join(File::Separator))
+end
+
+
+# label
+msg = TkLabel.new($image3_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "このデモではTkの photo image を使用して画像を 見ることができます。最初にエントリ内ににディレクトリ名を入れて下さい。次に下のリストボックスにこのディレクトリをロードするため、リターンを押してください。その後、画像を選択するためにリストボックスの中のファイル名をダブルクリックして下さい。"
+}
+msg.pack('side'=>'top')
+
+# frame
+TkFrame.new($image3_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $image3_demo
+      $image3_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'image3'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# variable
+$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
+
+# image
+begin
+  $image3a.delete
+rescue
+end
+$image3a = TkPhotoImage.new
+
+#
+image3_f = TkFrame.new($image3_demo).pack(:fill=>:both, :expand=>true)
+
+image3_df = TkLabelFrame.new($image3_demo, :text=>'ディレクトリ:')
+
+image3_ff = TkLabelFrame.new($image3_demo, :text=>'ファイル:', 
+                             :padx=>'2m', :pady=>'2m')
+image3_lbx = TkListbox.new(image3_ff, :width=>20, :height=>10) {
+  pack(:side=>:left, :fill=>:y, :expand=>true)
+  yscrollbar(TkScrollbar.new(image3_ff).pack(:side=>:left, :fill=>:y, 
+                                             :expand=>true))
+  insert(0, *(%w(earth.gif earthris.gif teapot.ppm)))
+  bind('Double-1', proc{|x,y| loadImage3(self, x, y)}, '%x %y')
+}
+
+image3_ent = TkEntry.new(image3_df, :width=>30, :textvariable=>$dirName){
+  pack(:side=>:left, :fill=>:both, :padx=>'2m', :pady=>'2m', :expand=>true)
+  bind('Return', proc{loadDir3(image3_lbx)})
+}
+
+TkButton.new(image3_df, :pady=>0, :padx=>'2m', :text=>"ディレクトリ選択", 
+             :command=>proc{selectAndLoadDir3(image3_ent, image3_lbx)}) {
+  pack(:side=>:left, :fill=>:y, :padx=>[0, '2m'], :pady=>'2m')
+}
+
+image3_if = TkLabelFrame.new($image3_demo, :text=>'イメージ:') {|f|
+  TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
+}
+
+Tk.grid(image3_df,  '-',
+        :sticky=>:ew, :padx=>'1m', :pady=>'1m', :in=>image3_f)
+Tk.grid(image3_ff, image3_if, 
+        :sticky=>:nw, :padx=>'1m', :pady=>'1m', :in=>image3_f)
+TkGrid.columnconfigure(image3_f, 1, :weight=>1)
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/items.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/items.rb
new file mode 100644
index 0000000000..38774d10d2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/items.rb
@@ -0,0 +1,371 @@
+#
+# canvas item types widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($items_demo) && $items_demo
+  $items_demo.destroy 
+  $items_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$items_demo = TkToplevel.new {|w|
+  title("Canvas Item Demonstration")
+  iconname("Items")
+  positionWindow(w)
+}
+
+# label 生成
+TkLabel.new($items_demo) {
+  font $font
+  wraplength '5i'
+  justify 'left'
+  text "このウィンドウにはキャンバス widget が入っており、その中にはキャンバス widget がサポートする様々なタイプのアイテムの例が入っています。次のような操作ができます。\n  ボタン-1 ドラッグ:\tアイテムを動かす。\n  ボタン-2 ドラッグ:\t見えている部分をずらす。\n  ボタン-3 ドラッグ:\t領域を囲う。\n  コントロール-F:\t領域の下のアイテムを表示する。"
+}.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($items_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $items_demo
+      $items_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'items'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 生成
+cvs = nil
+TkFrame.new($items_demo) {|cf|
+  # canvas 生成
+  cvs = TkCanvas.new(cf) {|c|
+    focus
+    scrollregion '0c 0c 30c 24c'
+    width  '15c'
+    height '10c'
+    relief 'sunken'
+    borderwidth 2
+
+    hs = TkScrollbar.new(cf) {|s|
+      orient 'horizontal'
+      command proc{|*args| c.xview(*args)}
+      c.xscrollcommand proc{|first,last| s.set first,last}
+    }
+
+    vs = TkScrollbar.new(cf) {|s|
+      command proc{|*args| c.yview(*args)}
+      c.yscrollcommand proc{|first,last| s.set first,last}
+    }
+
+    if $tk_version =~ /^4\.[01]/
+      hs.pack('side'=>'bottom', 'fill'=>'x')
+      vs.pack('side'=>'right', 'fill'=>'y')
+      c.pack('in'=>cf, 'expand'=>'yes', 'fill'=>'both')
+
+    else
+      c.grid('in'=>cf, 'row'=>0, 'column'=>0, 
+             'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+      vs.grid('row'=>0, 'column'=>1, 
+              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+      hs.grid('row'=>1, 'column'=>0, 
+              'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+      TkGrid.rowconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
+      TkGrid.columnconfigure(cf, 0, 'weight'=>1, 'minsize'=>0)
+
+    end
+
+  }
+}.pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
+
+# Display a 3x3 rectangular grid
+TkcRectangle.new(cvs, '0c', '0c', '30c', '24c', 'width'=>2)
+TkcLine.new(cvs, '0c', '8c', '30c', '8c', 'width'=>2)
+TkcLine.new(cvs, '0c', '16c', '30c', '16c', 'width'=>2)
+TkcLine.new(cvs, '10c', '0c', '10c', '24c', 'width'=>2)
+TkcLine.new(cvs, '20c', '0c', '20c', '24c', 'width'=>2)
+
+font1 = '-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*'
+font2 = '-Adobe-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*'
+if TkWinfo.depth($root).to_i > 1
+  blue   = 'DeepSkyBlue3'
+  red    = 'red'
+  bisque = 'bisque3'
+  green  = 'SeaGreen3'
+else
+  blue   = 'black'
+  red    = 'black'
+  bisque = 'black'
+  green  = 'black'
+end
+
+# tag オブジェクトを生成
+$tag_item = TkcGroup.new(cvs)
+
+# Set up demos within each of the areas of the grid.
+TkcText.new(cvs, '5c', '.2c', 'text'=>'ライン', 'anchor'=>'n')
+TkcLine.new(cvs, '1c', '1c', '3c', '1c', '1c', '4c', '3c', '4c', 
+            'width'=>2, 'fill'=>blue, 'capstyle'=>'butt', 
+            'join'=>'miter', 'tags'=>$tag_item )
+TkcLine.new(cvs, '4.67c','1c','4.67c','4c', 'arrow'=>'last', 'tags'=>$tag_item)
+TkcLine.new(cvs, '6.33c','1c','6.33c','4c', 'arrow'=>'both', 'tags'=>$tag_item)
+TkcLine.new(cvs, '5c','6c','9c','6c','9c','1c','8c','1c','8c','4.8c','8.8c',
+            '4.8c','8.8c','1.2c','8.2c','1.2c','8.2c','4.6c','8.6c','4.6c',
+            '8.6c','1.4c','8.4c','1.4c','8.4c','4.4c',
+            'width'=>3, 'fill'=>red, 'tags'=>$tag_item )
+TkcLine.new(cvs, '1c','5c','7c','5c','7c','7c','9c','7c', 'width'=>'.5c', 
+            'stipple'=>'@'+[$demo_dir,'..',
+                            'images','gray25.xbm'].join(File::Separator), 
+            'arrow'=>'both', 'arrowshape'=>'15 15 7', 'tags'=>$tag_item )
+TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
+            'width'=>'.5c', 'capstyle'=>'round', 'join'=>'round', 
+            'tags'=>$tag_item )
+
+TkcText.new(cvs, '15c', '.2c', 
+            'text'=>'曲線 (滑らかにつないだ直線)', 'anchor'=>'n')
+TkcLine.new(cvs, '11c','4c','11.5c','1c','13.5c','1c','14c','4c', 
+            'smooth'=>'on', 'fill'=>blue, 'tags'=>$tag_item )
+TkcLine.new(cvs, '15.5c','1c','19.5c','1.5c','15.5c','4.5c','19.5c','4c', 
+            'smooth'=>'on', 'arrow'=>'both', 'width'=>3, 'tags'=>$tag_item )
+TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c', 
+            '16.5c','4.5c','13.5c','7.5c','12c','6c',
+            'smooth'=>'on', 'width'=>'3m', 'capstyle'=>'round', 
+            'stipple'=>'@'+[$demo_dir, '..',
+                            'images', 'gray25.xbm'].join(File::Separator), 
+            'fill'=>red, 'tags'=>$tag_item )
+
+TkcText.new(cvs, '25c', '.2c', 'text'=>'多角形', 'anchor'=>'n')
+TkcPolygon.new(cvs, '21c','1.0c','22.5c','1.75c','24c','1.0c','23.25c','2.5c',
+               '24c','4.0c','22.5c','3.25c','21c','4.0c','21.75c','2.5c',
+               'fill'=>'green', 'outline'=>'black', 'width'=>4, 
+               'tags'=>$tag_item )
+TkcPolygon.new(cvs, '25c','4c','25c','4c','25c','1c','26c','1c','27c','4c',
+               '28c','1c','29c','1c','29c','4c','29c','4c',
+               'fill'=>red, 'smooth'=>'on', 'tags'=> $tag_item)
+TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
+               '28c','5.25c','24c','5.25c','24c','6.0c','26c','6c','26c',
+               '7.5c','22c','7.5c', 
+               'stipple'=>'@' + [$demo_dir, '..',
+                                 'images', 'gray25.xbm'].join(File::Separator),
+               'outline'=>'black', 'tags'=>$tag_item )
+
+TkcText.new(cvs, '5c', '8.2c', 'text'=>'矩形', 'anchor'=>'n')
+TkcRectangle.new(cvs, '1c','9.5c','4c','12.5c',
+                 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
+TkcRectangle.new(cvs, '0.5c','13.5c','4.5c','15.5c', 
+                 'fill'=>green, 'tags'=>$tag_item )
+TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
+                 'stipple'=>'@'+[$demo_dir,'..',
+                                 'images','gray25.xbm'].join(File::Separator),
+                 'fill'=>blue, 'tags'=>$tag_item )
+
+TkcText.new(cvs, '15c', '8.2c', 'text'=>'楕円', 'anchor'=>'n')
+TkcOval.new(cvs, '11c','9.5c','14c','12.5c',
+                 'outline'=>red, 'width'=>'3m', 'tags'=>$tag_item)
+TkcOval.new(cvs, '10.5c','13.5c','14.5c','15.5c', 
+                 'fill'=>green, 'tags'=>$tag_item )
+TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
+                 'stipple'=>'@'+[$demo_dir,'..',
+                                 'images','gray25.xbm'].join(File::Separator),
+                 'fill'=>blue, 'tags'=>$tag_item )
+
+TkcText.new(cvs, '25c', '8.2c', 'text'=>'テキスト', 'anchor'=>'n')
+TkcRectangle.new(cvs, '22.4c','8.9c','22.6c','9.1c')
+TkcText.new(cvs, '22.5c', '9c', 'anchor'=>'n', 'font'=>font1, 'width'=>'4c', 
+            'text'=>'短いテキスト。ワードラップ、左揃え、アンカーは北(上)。□は各テキストのアンカーポイントを示す。', 'tags'=>$tag_item )
+TkcRectangle.new(cvs, '25.4c','10.9c','25.6c','11.1c')
+TkcText.new(cvs, '25.5c', '11c', 'anchor'=>'w', 'font'=>font1, 'fill'=>blue, 
+            'text'=>"いくつかの行。\nそれぞれ独立に\n行揃え。\n全て左端がアンカーされている。", 'justify'=>'center', 'tags'=>$tag_item )
+TkcRectangle.new(cvs, '24.9c','13.9c','25.1c','14.1c')
+if $tk_version =~ /^4\.[01]/
+  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red, 
+              'stipple'=>'@' + [$demo_dir, '..',
+                                'images', 'grey.5'].join(File::Separator),
+              'text'=>'Stippled characters', 'tags'=>$tag_item )
+else
+  TkcText.new(cvs, '25c', '14c', 'anchor'=>'c', 'font'=>font2, 'fill'=>red, 
+              'stipple'=>'gray50', 'text'=>'Stippled characters', 
+              'tags'=>$tag_item )
+end
+
+TkcText.new(cvs, '5c', '16.2c', 'text'=>'弧', 'anchor'=>'n')
+TkcArc.new(cvs, '0.5c','17c','7c','20c', 'fill'=>green, 'outline'=>'black', 
+           'start'=>45, 'extent'=>270, 'style'=>'pieslice', 'tags'=>$tag_item)
+#TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc', 
+#          'outline'=>blue, 'start'=>135, 'extent'=>270, 
+#          'outlinestipple'=>'@' + ['images', 'grey.25'].join(File::Separator),
+#          'tags'=>$tag_item)
+TkcArc.new(cvs, '6.5c','17c','9.5c','20c', 'width'=>'4m', 'style'=>'arc', 
+           'outline'=>blue, 'start'=>135, 'extent'=>270, 
+           'outlinestipple'=>'@'+[$demo_dir, '..',
+                                  'images','gray25.xbm'].join(File::Separator),
+           'tags'=>$tag_item)
+TkcArc.new(cvs, '0.5c','20c','9.5c','24c', 'width'=>'4m', 'style'=>'pieslice', 
+           'fill'=>'', 'outline'=>red, 'start'=>225, 'extent'=>90, 
+           'tags'=>$tag_item)
+TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
+           'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270, 
+           'tags'=>$tag_item)
+
+TkcText.new(cvs, '15c', '16.2c', 'text'=>'ビットマップ', 'anchor'=>'n')
+#TkcBitmap.new(cvs, '13c','20c',
+#             'bitmap'=>'@' + ['images', 'face'].join(File::Separator),
+#             'tags'=>$tag_item)
+TkcBitmap.new(cvs, '13c','20c',
+              'bitmap'=>'@' + [$demo_dir, '..',
+                               'images', 'face.xbm'].join(File::Separator),
+              'tags'=>$tag_item)
+#TkcBitmap.new(cvs, '17c','18.5c',
+#             'bitmap'=>'@' + ['images', 'noletters'].join(File::Separator),
+#             'tags'=>$tag_item)
+TkcBitmap.new(cvs, '17c','18.5c',
+              'bitmap'=>'@' + [$demo_dir, '..',
+                               'images', 'noletter.xbm'].join(File::Separator),
+              'tags'=>$tag_item)
+#TkcBitmap.new(cvs, '17c','21.5c',
+#             'bitmap'=>'@' + ['images', 'letters'].join(File::Separator),
+#             'tags'=>$tag_item)
+# ↓の形式でも可能
+TkcBitmap.new(cvs, '17c','21.5c') {
+  bitmap '@' + [$demo_dir, '..', 'images', 'letters.xbm'].join(File::Separator)
+  tags $tag_item
+}
+#TkcBitmap.new(cvs, '17c','21.5c') {
+#  bitmap '@' + ['images', 'letters'].join(File::Separator)
+#  tags $tag_item
+#}
+
+TkcText.new(cvs, '25c', '16.2c', 'text'=>'ウィンドウ', 'anchor'=>'n')
+TkButton.new(cvs) {|b|
+  text '押してね'
+  command proc{butPress cvs, red}
+  TkcWindow.new(cvs, '21c','18c', 
+                'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
+}
+TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
+  insert 'end', '編集してね'
+  TkcWindow.new(cvs, '21c','21c', 
+                'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
+}
+TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c', 
+            'width'=>'.5c', 'tickinterval'=>0 ) {|scl|
+  TkcWindow.new(cvs, '28.5c','17.5c', 
+                'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
+}
+TkcText.new(cvs, '21c', '17.9c', 'text'=>'ボタン:', 'anchor'=>'sw')
+TkcText.new(cvs, '21c', '20.9c', 'text'=>'エントリ:', 'anchor'=>'sw')
+TkcText.new(cvs, '28.5c', '17.4c', 'text'=>'スケール:', 'anchor'=>'s')
+
+# Set up event bindings for canvas:
+cvs.itembind($tag_item, 'Any-Enter', proc{itemEnter cvs})
+cvs.itembind($tag_item, 'Any-Leave', proc{itemLeave cvs})
+cvs.bind('2', proc{|x,y| cvs.scan_mark x,y}, '%x %y')
+cvs.bind('B2-Motion', proc{|x,y| cvs.scan_dragto x,y}, '%x %y')
+cvs.bind('3', proc{|x,y| itemMark cvs,x,y}, '%x %y')
+cvs.bind('B3-Motion', proc{|x,y| itemStroke cvs,x,y}, '%x %y')
+cvs.bind('Control-f', proc{itemsUnderArea cvs})
+cvs.bind('1', proc{|x,y| itemStartDrag cvs,x,y}, '%x %y')
+cvs.bind('B1-Motion', proc{|x,y| itemDrag cvs,x,y}, '%x %y')
+# Utility methods for highlighting the item under the pointer
+
+$restoreCmd = nil
+def itemEnter (c)
+  if TkWinfo.depth(c).to_i == 1
+    $restoreCmd = nil
+    return
+  end
+  type = c.itemtype('current')
+  if type == TkcWindow
+    $restoreCmd = nil
+    return
+  end
+  if type == TkcBitmap
+    bg = (c.itemconfiginfo('current', 'background'))[4]
+    $restoreCmd = proc{c.itemconfigure 'current', 'background', bg}
+    c.itemconfigure 'current', 'background', 'SteelBlue2'
+    return
+  end
+  fill = (c.itemconfiginfo('current', 'fill'))[4]
+  if (type == TkcRectangle || type == TkcOval || type == TkcArc) && fill == []
+    outline = (c.itemconfiginfo('current', 'outline'))[4]
+    $restoreCmd = proc{c.itemconfigure 'current', 'outline', outline}
+    c.itemconfigure 'current', 'outline', 'SteelBlue2'
+  else
+    $restoreCmd = proc{c.itemconfigure 'current', 'fill', fill}
+    c.itemconfigure 'current', 'fill', 'SteelBlue2'
+  end
+end
+
+def itemLeave(c)
+  $restoreCmd.call if $restoreCmd
+end
+
+# Utility methods for stroking out a rectangle and printing what's 
+# underneath the rectangle's area.
+
+def itemMark(c,x,y)
+  $areaX1 = c.canvasx(x)
+  $areaY1 = c.canvasy(y)
+  c.delete 'area'
+end
+
+def itemStroke(c,x,y)
+  x = c.canvasx(x)
+  y = c.canvasy(y)
+  if $areaX1 != x && $areaY1 != y
+    c.delete 'area'
+    c.addtag_withtag 'area', TkcRectangle.new(c, $areaX1, $areaY1, x, y, 
+                                              '-outline', 'black')
+    $areaX2 = x
+    $areaY2 = y
+  end
+end
+
+def itemsUnderArea(c)
+  area = c.find_withtag('area')
+  items = []
+  c.find_enclosed($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
+    items.push(i) if i.gettags.include?($tag_item)
+  }
+  print "Items enclosed by area: #{items.inspect}\n"; STDOUT.flush
+  items.clear
+  c.find_overlapping($areaX1,$areaY1,$areaX2,$areaY2).each{|i|
+    items.push(i) if i.gettags.include?($tag_item)
+  }
+  print "Items overlapping area: #{items.inspect}\n"; STDOUT.flush
+end
+
+$areaX1 = 0
+$areaY1 = 0
+$areaX2 = 0
+$areaY2 = 0
+
+# Utility methods to support dragging of items.
+
+def itemStartDrag(c,x,y)
+  $lastX = c.canvasx(x)
+  $lastY = c.canvasy(y)
+end
+
+def itemDrag(c,x,y)
+  x = c.canvasx(x)
+  y = c.canvasy(y)
+  c.move('current', x - $lastX, y - $lastY)
+  $lastX = x
+  $lastY = y
+end
+
+# Method that's invoked when the button embedded in the canvas 
+# is invoked.
+
+def butPress(w,color)
+  i = TkcText.new(w, '25c', '18.1c', 
+                  'text'=>'いてて!!', 'fill'=>color, 'anchor'=>'n')
+  Tk.after(500, proc{w.delete i})
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/ixset b/ruby_1_8_6/ext/tk/sample/demos-jp/ixset
new file mode 100644
index 0000000000..46c2378073
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/ixset
@@ -0,0 +1,333 @@
+#!/usr/bin/env ruby
+
+# ixset --
+# A nice interface to "xset" to change X server settings
+#
+
+require 'tk'
+
+class Xsettings
+  #
+  # Button actions
+  #
+  def quit
+    @root.destroy
+  end
+
+  def ok
+    writesettings
+    quit
+  end
+
+  def cancel
+    readsettings
+    dispsettings
+  end
+
+  # apply is just "writesettings"
+
+
+  #
+  # Read current settings
+  #
+  def readsettings
+    xfd = open("|xset q", 'r')
+    xfd.readlines.each{|line|
+      fields = line.chomp.strip.split(/\s+/)
+      case fields[0]
+      when "auto"
+	if fields[1] == 'repeat:'
+	  @kbdrep = fields[2]
+	  @w_kbdrep.set(@kbdrep)
+	  @kbdcli = fields[6]
+	end
+
+      when "bell"
+	@bellvol = fields[2]
+	@bellpit = fields[5]
+	@belldur = fields[8]
+
+      when "acceleration:"
+	@mouseacc = fields[1]
+	@mousethr = fields[3]
+
+      when "prefer"
+	if fields[2] == 'yes'
+	  @screenbla = 'blank'
+	else
+	  @screenbla = 'noblank'
+	end
+	@w_screenbla.set(@screenbla)
+
+      when "timeout:"
+	@screentim = fields[1]
+	@screencyc = fields[3]
+
+      end
+    }
+
+    xfd.close
+  end
+
+  #
+  # Write settings into the X server
+  #
+  def writesettings
+    @bellvol = @w_bellvol.get
+    @bellpit = @w_bellpit.get
+    @belldur = @w_belldur.get
+
+    @kbdrep = @w_kbdrep.get
+    if @kbdrep == 'on'
+      @kbdcli = @w_kbdcli.get
+    else
+      @kbdcli = 'off'
+    end
+
+    @mouseacc = @w_mouseacc.get
+    @mousethr = @w_mousethr.get
+
+    @screentim = @w_screentim.get
+    @screencyc = @w_screencyc.get
+    @screenbla = @w_screenbla.get
+
+    system("xset \
+            b #{@bellvol} #{@bellpit} #{@belldur} \
+            c #{@kbdcli} \
+            r #{@kbdrep} \
+            m #{@mouseacc} #{@mousethr} \
+            s #{@screentim} #{@screencyc} \
+            s #{@screenbla}")
+  end
+
+  #
+  # Sends all settings to the window
+  #
+  def dispsettings
+    @w_bellvol.set(@bellvol)
+    @w_bellpit.set(@bellpit)
+    @w_belldur.set(@belldur)
+
+    @w_kbdonoff.set(@w_kbdrep.get)
+    @w_kbdcli.set(@kbdcli)
+
+    @w_mouseacc.set(@mouseacc)
+    @w_mousethr.set(@mousethr)
+
+    @w_screenblank.set(@w_screenbla.get)
+    @w_screenpat.set(@w_screenbla.get)
+
+    @w_screentim.set(@screentim)
+    @w_screencyc.set(@screencyc)
+  end
+
+  #
+  # Create all windows, and pack them
+  #
+  class LabelEntry
+    def initialize(parent, text, length)
+      @frame = TkFrame.new(parent)
+      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left','expand'=>'y')
+      @entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken') {
+	pack('side'=>'left','expand'=>'y')
+      }
+    end
+    def pack(keys)
+      @frame.pack(keys)
+    end
+    def get
+      @entry.value
+    end
+    def set(value)
+      @entry.delete(0,'end')
+      @entry.insert(0, value)
+    end
+  end
+
+  def createwindows
+    win = self
+
+    #
+    # Buttons
+    #
+    buttons = TkFrame.new(@root) {|f|
+      [ TkButton.new(f, 'command'=>proc{win.ok}, 'text'=>'Ok'),
+	TkButton.new(f, 'command'=>proc{win.writesettings}, 'text'=>'Apply'),
+	TkButton.new(f, 'command'=>proc{win.cancel}, 'text'=>'Cancel'),
+	TkButton.new(f, 'command'=>proc{win.quit}, 'text'=>'Quit') ].each{|b|
+	b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5)
+      }
+    }
+
+    #
+    # Bell settings
+    #
+    bell = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
+    l = TkLabel.new(bell, 'text'=>'Bell Settings')
+    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200, 
+			     'tickinterval'=>20, 'orient'=>'horizontal', 
+			     'label'=>"Volume (%)") 
+
+    f = TkFrame.new(bell)
+    @w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6)
+    @w_bellpit.pack('side'=>'left', 'padx'=>5)
+    @w_belldur = LabelEntry.new(f, "Duration (ms)", 6)
+    @w_belldur.pack('side'=>'right', 'padx'=>5)
+
+    l.pack('side'=>'top', 'expand'=>'yes')
+    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
+    f.pack('side'=>'top', 'expand'=>'yes')
+
+    #
+    # Keyboard settings
+    # 
+    kbdonoff = nil
+    kbdcli = nil
+    kbd = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
+    l = TkLabel.new(kbd, 'text'=>'Keyboard Repeat Settings')
+    f = TkFrame.new(kbd)
+    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat', 
+				    'onvalue'=>'on', 'offvalue'=>'off',
+				    'variable'=>@w_kbdrep ) {
+      def self.set(value)
+	if value == 'on'
+	  self.select
+	else
+	  self.deselect
+	end
+      end
+      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
+    }
+    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200, 
+			 'tickinterval'=>20, 'orient'=>'horizontal', 
+			 'label'=>'Click Volume (%)')
+    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes')
+    l.pack('side'=>'top', 'expand'=>'yes')
+    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
+
+    #
+    # Mouse settings
+    #
+    mouse = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
+    l = TkLabel.new(mouse, 'text'=>'Mouse Settings')
+    f = TkFrame.new(mouse)
+    @w_mouseacc = LabelEntry.new(f, 'Acceleration', 3)
+    @w_mouseacc.pack('side'=>'left')
+    @w_mousethr = LabelEntry.new(f, 'Threshold (pixels)', 3)
+    @w_mousethr.pack('side'=>'right')
+    l.pack('side'=>'top')
+    f.pack('side'=>'top', 'expand'=>'yes')
+
+    #
+    # Screen Saver settings
+    #
+    screen = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
+    l = TkLabel.new(screen, 'text'=>'Screen-saver Settings')
+    f = TkFrame.new(screen)
+    ff1 = TkFrame.new(f)
+    [ @w_screenblank = TkRadioButton.new(ff1, 'text'=>'Blank', 
+					 'relief'=>'flat', 
+					 'variable'=>@w_screenbla, 
+					 'value'=>'blank') {
+	def self.set(value)
+	  if value == 'blank'
+	    self.select
+	  else
+	    self.deselect
+	  end
+	end
+      }, 
+      @w_screenpat = TkRadioButton.new(ff1, 'text'=>'Pattern', 
+				       'relief'=>'flat', 
+				       'variable'=>@w_screenbla, 
+				       'value'=>'noblank') {
+	def self.set(value)
+	  if value != 'blank'
+	    self.select
+	  else
+	    self.deselect
+	  end
+	end
+      }
+    ].each {|w| w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w') }
+
+    ff2 = TkFrame.new(f)
+    [ @w_screentim = LabelEntry.new(ff2, 'Timeout (s)', 5), 
+      @w_screencyc = LabelEntry.new(ff2, 'Cycle (s)', 5) ].each{|w|
+      w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'e')
+    }
+
+    ff1.pack('side'=>'left')
+    ff2.pack('side'=>'left')
+
+    l.pack('side'=>'top')
+    f.pack('side'=>'top', 'expand'=>'yes')
+
+    #
+    # Main window
+    #
+    buttons.pack('side'=>'top', 'fill'=>'both')
+    bell.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
+    kbd.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
+    mouse.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
+    screen.pack('side'=>'top', 'fill'=>'both', 'ipady'=>5, 'expand'=>'yes')
+
+    #
+    # Let the user resize our window
+    #
+    @root.minsize(10,10)
+  end
+
+  def initialize
+    @root = TkRoot.new
+
+    @kbdrep = 'on'
+    @w_kbdrep = TkVariable.new(@kbdrep)
+    def @w_kbdrep.get
+      self.value
+    end
+    def @w_kbdrep.set(val)
+      self.value=val
+    end
+
+    @kbdcli = 0
+
+    @bellvol = 100
+    @bellpit = 440
+    @belldur = 100
+
+    @mouseacc = "3/1"
+    @mousethr = 4
+
+    @screenbla = "blank"
+    @w_screenbla = TkVariable.new(@screenbla)
+    def @w_screenbla.get
+      self.value
+    end
+    def @w_screenbla.set(val)
+      self.value=val
+    end
+
+    @screentim = 600
+    @screencyc = 600
+
+    #
+    # Listen what "xset" tells us...
+    #
+    readsettings
+
+    #
+    # Create all windows
+    #
+    createwindows
+
+    #
+    # Write xset parameters
+    #
+    dispsettings
+  end
+end
+
+Xsettings.new
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/ixset2 b/ruby_1_8_6/ext/tk/sample/demos-jp/ixset2
new file mode 100644
index 0000000000..8947daa4b4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/ixset2
@@ -0,0 +1,368 @@
+#!/usr/bin/env ruby
+#
+# ixset --
+# A nice interface to "xset" to change X server settings
+#
+
+require 'tk'
+
+class Xsettings
+  #
+  # Button actions
+  #
+  def quit
+    @root.destroy
+  end
+
+  def ok
+    writesettings
+    quit
+  end
+
+  def cancel
+    readsettings
+    dispsettings
+    @btn_APPLY.state(:disabled)
+    @btn_CANCEL.state(:disabled)
+  end
+
+  # apply is just "writesettings"
+  def apply
+    writesettings
+    @btn_APPLY.state(:disabled)
+    @btn_CANCEL.state(:disabled)
+  end
+
+  #
+  # Read current settings
+  #
+  def readsettings
+    xfd = open("|xset q", 'r')
+    xfd.readlines.each{|line|
+      fields = line.chomp.strip.split(/\s+/)
+      case fields[0]
+      when "auto"
+	if fields[1] == 'repeat:'
+	  @kbdrep = fields[2]
+	  @w_kbdrep.set(@kbdrep)
+	  @kbdcli = fields[6]
+	end
+
+      when "bell"
+	@bellvol = fields[2]
+	@bellpit = fields[5]
+	@belldur = fields[8]
+
+      when "acceleration:"
+	@mouseacc = fields[1]
+	@mousethr = fields[3]
+
+      when "prefer"
+	if fields[2] == 'yes'
+	  @screenbla = 'blank'
+	else
+	  @screenbla = 'noblank'
+	end
+	@w_screenbla.set(@screenbla)
+
+      when "timeout:"
+	@screentim = fields[1]
+	@screencyc = fields[3]
+
+      end
+    }
+
+    xfd.close
+  end
+
+  #
+  # Write settings into the X server
+  #
+  def writesettings
+    @bellvol = @w_bellvol.get
+    @bellpit = @w_bellpit.get
+    @belldur = @w_belldur.get
+
+    @kbdrep = @w_kbdrep.get
+    if @kbdrep == 'on'
+      @kbdcli = @w_kbdcli.get
+    else
+      @kbdcli = 'off'
+    end
+
+    @mouseacc = @w_mouseacc.get
+    @mousethr = @w_mousethr.get
+
+    @screentim = @w_screentim.get
+    @screencyc = @w_screencyc.get
+    @screenbla = @w_screenbla.get
+
+    system("xset \
+            b #{@bellvol} #{@bellpit} #{@belldur} \
+            c #{@kbdcli} \
+            r #{@kbdrep} \
+            m #{@mouseacc} #{@mousethr} \
+            s #{@screentim} #{@screencyc} \
+            s #{@screenbla}")
+  end
+
+  #
+  # Sends all settings to the window
+  #
+  def dispsettings
+    @w_bellvol.set(@bellvol)
+    @w_bellpit.set(@bellpit)
+    @w_belldur.set(@belldur)
+
+    @w_kbdonoff.set(@w_kbdrep.get)
+    @w_kbdcli.set(@kbdcli)
+
+    @w_mouseacc.set(@mouseacc)
+    @w_mousethr.set(@mousethr)
+
+    @w_screenblank.set(@w_screenbla.get)
+    @w_screenpat.set(@w_screenbla.get)
+
+    @w_screentim.set(@screentim)
+    @w_screencyc.set(@screencyc)
+  end
+
+  #
+  # Create all windows, and pack them
+  #
+  class LabelEntry
+    def initialize(parent, text, length, range=[])
+      @frame = TkFrame.new(parent)
+      TkLabel.new(@frame, 'text'=>text).pack('side'=>'left')
+      if range.size > 0 
+	@entry = TkSpinbox.new(@frame, 'width'=>length, 'relief'=>'sunken', 
+			       'from'=>range[0], 'to'=>range[1])
+      else
+	@entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken')
+      end
+      @entry.pack('side'=>'right','expand'=>'y', 'fill'=>'x')
+    end
+    def epath
+      @frame
+    end
+    def pack(keys)
+      @frame.pack(keys)
+    end
+    def get
+      @entry.value
+    end
+    def set(value)
+      @entry.delete(0,'end')
+      @entry.insert(0, value)
+    end
+  end
+
+  def createwindows
+    win = self
+
+    #
+    # Buttons
+    #
+    btn_frame = TkFrame.new(@root)
+    buttons = [ 
+      @btn_OK = TkButton.new(btn_frame, 'command'=>proc{win.ok}, 
+			     'default'=>'active', 'text'=>'了解'),
+      @btn_APPLY = TkButton.new(btn_frame, 'command'=>proc{win.writesettings}, 
+				'default'=>'normal', 'text'=>'適用', 
+				'state'=>'disabled'),
+      @btn_CANCEL = TkButton.new(btn_frame, 'command'=>proc{win.cancel}, 
+				 'default'=>'normal', 'text'=>'取消', 
+				'state'=>'disabled'),
+      @btn_QUIT = TkButton.new(btn_frame, 'command'=>proc{win.quit}, 
+			       'default'=>'normal', 'text'=>'中止')
+    ]
+    buttons.each{|b| b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5) }
+
+    @root.bind('Return', proc{@btn_OK.flash; @btn_OK.invoke})
+    @root.bind('Escape', proc{@btn_QUIT.flash; @btn_QUIT.invoke})
+    @root.bind('1', proc{|w|
+		 unless buttons.index(w)
+		   @btn_APPLY.state(:normal)
+		   @btn_CANCEL.state(:normal)
+		 end
+	       }, '%W')
+    @root.bind('Key', proc{|w, k|
+		 unless buttons.index(w)
+		   case k
+		   when 'Return', 'Escape', 'Tab', /.*Shift.*/
+		     # do nothing
+		   else
+		     @btn_APPLY.state(:normal)
+		     @btn_CANCEL.state(:normal)
+		   end
+		 end
+	       }, '%W %K')
+
+    #
+    # Bell settings
+    #
+    bell = TkLabelframe.new(@root, 'text'=>'ベル設定', 
+			    'padx'=>'1.5m', 'pady'=>'1.5m')
+    @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200, 
+			     'tickinterval'=>20, 'orient'=>'horizontal', 
+			     'label'=>"音量 (%)")
+
+    f = TkFrame.new(bell)
+    @w_bellpit = LabelEntry.new(f, "音程 (Hz)", 6, [25, 20000])
+    @w_bellpit.pack('side'=>'left', 'padx'=>5)
+    @w_belldur = LabelEntry.new(f, "持続時間 (ms)", 6, [1, 10000])
+    @w_belldur.pack('side'=>'right', 'padx'=>5)
+
+    @w_bellvol.pack('side'=>'top', 'expand'=>'yes')
+    f.pack('side'=>'top', 'expand'=>'yes')
+
+    #
+    # Keyboard settings
+    # 
+    kbdonoff = nil
+    kbdcli = nil
+    kbd = TkLabelframe.new(@root, 'text'=>'キーボードリピート設定', 
+			   'padx'=>'1.5m', 'pady'=>'1.5m')
+    f = TkFrame.new(kbd)
+    @w_kbdonoff = TkCheckButton.new(f, 'text'=>'クリック音あり', 
+				    'relief'=>'flat', 
+				    'onvalue'=>'on', 'offvalue'=>'off',
+				    'variable'=>@w_kbdrep ) {
+      def self.set(value)
+	if value == 'on'
+	  self.select
+	else
+	  self.deselect
+	end
+      end
+      pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x', 'padx'=>[0, '1m'])
+    }
+    @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200, 
+			 'tickinterval'=>20, 'orient'=>'horizontal', 
+			 'label'=>'クリック音量 (%)')
+    @w_kbdcli.pack('side'=>'left', 'expand'=>'yes', 
+		   'fill'=>'x', 'padx'=>['1m', 0])
+    f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
+
+    #
+    # Mouse settings
+    #
+    mouse = TkLabelframe.new(@root, 'text'=>'マウス設定', 
+			     'padx'=>'1.5m', 'pady'=>'1.5m')
+    f = TkFrame.new(mouse)
+    @w_mouseacc = LabelEntry.new(f, '加速量', 5)
+    @w_mouseacc.pack('side'=>'left', 'padx'=>[0, '1m'])
+    @w_mousethr = LabelEntry.new(f, '閾値 (pixels)', 3, [1, 2000])
+    @w_mousethr.pack('side'=>'right', 'padx'=>['1m', 0])
+    f.pack('side'=>'top', 'expand'=>'yes')
+
+    #
+    # Screen Saver settings
+    #
+    screen = TkLabelframe.new(@root, 'text'=>'スクリーンセーバ設定', 
+			     'padx'=>'1.5m', 'pady'=>'1.5m')
+    @w_screenblank = TkRadioButton.new(screen, 'text'=>'ブランク表示', 
+				       'relief'=>'flat', 'anchor'=>'w', 
+				       'variable'=>@w_screenbla, 
+				       'value'=>'blank') {
+      def self.set(value)
+	if value == 'blank'
+	  self.select
+	else
+	  self.deselect
+	end
+      end
+    }
+
+    @w_screenpat = TkRadioButton.new(screen, 'text'=>'パターン表示', 
+				     'relief'=>'flat', 'anchor'=>'w', 
+				     'variable'=>@w_screenbla, 
+				     'value'=>'noblank') {
+      def self.set(value)
+	if value != 'blank'
+	  self.select
+	else
+	  self.deselect
+	end
+      end
+    }
+
+    @w_screentim = LabelEntry.new(screen, 'タイムアウト (s)', 5, [1, 100000])
+    @w_screencyc = LabelEntry.new(screen, '周期 (s)', 5, [1, 100000])
+
+    Tk.grid(@w_screenblank, @w_screentim, 'sticky'=>'e')
+    Tk.grid(@w_screenpat, @w_screencyc, 'sticky'=>'e')
+    TkGrid.configure(@w_screenblank, @w_screenpat, 'sticky'=>'ew')
+
+    #
+    # Main window
+    #
+    param = {
+      'side'=>'top', 'fill'=>'both', 'expand'=>'yes', 
+      'padx'=>'1m', 'pady'=>'1m'
+    }
+    btn_frame.pack('side'=>'top', 'fill'=>'both')
+    bell.pack(param)
+    kbd.pack(param)
+    mouse.pack(param)
+    screen.pack(param)
+
+    #
+    # Let the user resize our window
+    #
+    @root.minsize(10,10)
+  end
+
+  def initialize(title)
+    @root = TkRoot.new('title'=>title)
+
+    @kbdrep = 'on'
+    @w_kbdrep = TkVariable.new(@kbdrep)
+    def @w_kbdrep.get
+      self.value
+    end
+    def @w_kbdrep.set(val)
+      self.value=val
+    end
+
+    @kbdcli = 0
+
+    @bellvol = 100
+    @bellpit = 440
+    @belldur = 100
+
+    @mouseacc = "3/1"
+    @mousethr = 4
+
+    @screenbla = "blank"
+    @w_screenbla = TkVariable.new(@screenbla)
+    def @w_screenbla.get
+      self.value
+    end
+    def @w_screenbla.set(val)
+      self.value=val
+    end
+
+    @screentim = 600
+    @screencyc = 600
+
+    #
+    # Listen what "xset" tells us...
+    #
+    readsettings
+
+    #
+    # Create all windows
+    #
+    createwindows
+
+    #
+    # Write xset parameters
+    #
+    dispsettings
+  end
+end
+
+Xsettings.new(File.basename($0,'.rb'))
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/label.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/label.rb
new file mode 100644
index 0000000000..59626289fc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/label.rb
@@ -0,0 +1,65 @@
+#
+# label widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($label_demo) && $label_demo
+  $label_demo.destroy 
+  $label_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$label_demo = TkToplevel.new {|w|
+  title("Label Demonstration")
+  iconname("label")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($label_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "下には5つのラベルが表示されています。左側にはテキストラベルが3つあり、右側にはビットマップラベルとテキストラベルがあります。ラベルというのはあまり面白いものではありません。なぜなら眺める以外何もできないからです。"
+}
+msg.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($label_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $label_demo
+      $label_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'label'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# label demo 用フレーム生成
+f_left = TkFrame.new($label_demo)
+f_right = TkFrame.new($label_demo)
+[f_left, f_right].each{|w| w.pack('side'=>'left', 'expand'=>'yes', 
+                                  'padx'=>10, 'pady'=>10, 'fill'=>'both')}
+
+# label 生成
+[ TkLabel.new(f_left, 'text'=>'最初のラベル'),
+  TkLabel.new(f_left, 'text'=>'2 番目。ちょっと浮き上がらせてみました', 
+              'relief'=>'raised'),
+  TkLabel.new(f_left, 'text'=>'3 番目。沈んでいます ', 'relief'=>'sunken')
+].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
+
+TkLabel.new(f_right) {
+  bitmap('@' + [$demo_dir,'..','images','face.xbm'].join(File::Separator))
+  borderwidth 2
+  relief 'sunken'
+}.pack('side'=>'top')
+
+TkLabel.new(f_right) { text 'Tcl/Tk 所有者' }.pack('side'=>'top')
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/labelframe.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/labelframe.rb
new file mode 100644
index 0000000000..23c974dcc2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/labelframe.rb
@@ -0,0 +1,98 @@
+# labelframe.rb
+#
+# This demonstration script creates a toplevel window containing
+# several labelframe widgets.
+#
+# based on "Id: labelframe.tcl,v 1.2 2001/10/30 11:21:50 dkf Exp"
+
+
+if defined?($labelframe_demo) && $labelframe_demo
+  $labelframe_demo.destroy 
+  $labelframe_demo = nil
+end
+
+$labelframe_demo = TkToplevel.new {|w|
+  title("Labelframe Demonstration")
+  iconname("labelframe")
+  positionWindow(w)
+}
+
+# Some information
+TkLabel.new($labelframe_demo, 
+            :font=>$font, :wraplength=>'4i', :justify=>:left, 
+            :text=><<EOL).pack(:side=>:top)
+TkLabelFrame ウィジェットは関連する widget 
+群をまとめて取り扱うために用いられます。ラ
+ベルは通常の文字列でも何らかのウィジェット
+でもかまいません。もしあなたが使っている 
+Ruby にリンクされている Tk ライブラリが 
+labelframe ウィジェットを実装していない
+場合、このデモはうまく動かないはずです。
+その場合には labelframe ウィジェットが実装
+されているようなより新しいバージョンの Tk 
+を組み合わせて試すようにしてください。
+EOL
+
+# The bottom buttons
+TkFrame.new($labelframe_demo){|f|
+  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
+
+  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
+                 $labelframe_demo.destroy
+                 $labelframe_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
+                 showCode 'labelframe'
+               }).pack(:side=>:left, :expand=>true)
+}
+
+# Demo area
+w = TkFrame.new($labelframe_demo).pack(:side=>:bottom, :fill=>:both, 
+                                       :expand=>true)
+
+# A group of radiobuttons in a labelframe
+TkLabelFrame.new(w, :text=>'選択値', 
+                 :padx=>2, :pady=>2) {|f|
+  grid(:row=>0, :column=>0, :pady=>'2m', :padx=>'2m')
+
+  v = TkVariable.new
+  (1..4).each{|i|
+    TkRadiobutton.new(f, :text=>"This is value #{i}", 
+                      :variable=>v, :value=>i) {
+      pack(:side=>:top, :fill=>:x, :pady=>2)
+    }
+  }
+}
+
+
+# Using a label window to control a group of options.
+$lfdummy = TkVariable.new(0)
+
+def lfEnableButtons(w)
+  TkWinfo.children(w).each{|child|
+    next if child.path =~ /\.cb$/
+    if $lfdummy == 1
+      child.state(:normal)
+    else
+      child.state(:disabled)
+    end
+  }
+end
+
+TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
+  TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy, 
+                    :text=>"オプションを使用", :padx=>0) {|cb|
+    command proc{lfEnableButtons(f)}
+    f.labelwidget(cb)
+  }
+  grid(:row=>0, :column=>1, :pady=>'2m', :padx=>'2m')
+
+  %w(オプション1 オプション2 オプション3).each{|str|
+    TkCheckbutton.new(f, :text=>str).pack(:side=>:top, :fill=>:x, :pady=>2)
+  }
+
+  lfEnableButtons(f)
+}
+
+TkGrid.columnconfigure(w, [0,1], :weight=>1)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/menu.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/menu.rb
new file mode 100644
index 0000000000..add85f7f7b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/menu.rb
@@ -0,0 +1,196 @@
+#
+# menus widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($menu_demo) && $menu_demo
+  $menu_demo.destroy 
+  $menu_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$menu_demo = TkToplevel.new {|w|
+  title("File Selection Dialogs")
+  iconname("menu")
+  positionWindow(w)
+}
+
+# menu frame 生成
+$menu_frame = TkFrame.new($menu_demo, 'relief'=>'raised', 'bd'=>2)
+$menu_frame.pack('side'=>'top', 'fill'=>'x')
+
+begin
+  windowingsystem = Tk.windowingsystem()
+rescue
+  windowingsystem = ""
+end
+
+# label 生成
+TkLabel.new($menu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+  if $tk_platform['platform'] == 'macintosh' ||
+      windowingsystem == "classic" || windowingsystem == "aqua"
+    text("このウィンドウは様々なメニューとカスケードメニューから構成されています。Command-X を入力すると、Xがコマンドキー記号に続いて表示されている文字ならば、アクセラレータを使った項目起動を行うことができます。メニュー要素中、最後のものは、そのメニューの最初の項目を選択することで独立させることができます。")
+  else
+    text("このウィンドウは様々なメニューとカスケードメニューから構成されています。Alt-X を入力すると、Xがメニューにアンダーライン付きで表示されている文字ならば、キーボードからの指定ができます。矢印キーでメニューのトラバースも可能です。メニューが指定された際には、スペースキーで実行することができます。あるいは、アンダーライン付きの文字を入力することでも実行できます。メニューのエントリがアクセラレータを持っている場合は、そのアクセラレータを入力することでメニューを指定することなしに実行することができます。メニュー要素中、最後のものは、そのメニューの最初の項目を選択することで独立させることができます。")
+  end
+}.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($menu_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $menu_demo
+      $menu_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'menu'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# menu 生成
+TkMenubutton.new($menu_frame, 'text'=>'File', 'underline'=>0) {|m|
+  pack('side'=>'left')
+  TkMenu.new(m, 'tearoff'=>false) {|file_menu|
+    m.configure('menu'=>file_menu)
+    add('command', 'label'=>'開く ...', 'command'=>proc{fail 'これは、デモですので"開く ..."に対するアクションは定義されていません。'})
+    add('command', 'label'=>'新規', 'command'=>proc{fail 'これは、デモですので"新規"に対するアクションは定義されていません。'})
+    add('command', 'label'=>'保存', 'command'=>proc{fail 'これは、デモですので"保存"に対するアクションは定義されていません。'})
+    add('command', 'label'=>'保存(指定) ...', 'command'=>proc{fail 'これは、デモですので"保存(指定) ..."に対するアクションは定義されていません。'})
+    add('separator')
+    add('command', 'label'=>'プリント設定 ...', 'command'=>proc{fail 'これは、デモですので"プリント設定 ..."に対するアクションは定義されていません。'})
+    add('command', 'label'=>'プリント ...', 'command'=>proc{fail 'これは、デモですので"プリント ..."に対するアクションは定義されていません。'})
+    add('separator')
+    add('command', 'label'=>'終了', 'command'=>proc{$menu_demo.destroy})
+  }
+}
+
+if $tk_platform['platform'] == 'macintosh' ||
+    windowingsystem == "classic" || windowingsystem == "aqua"
+  modifier = 'Command'
+elsif $tk_platform['platform'] == 'windows'
+  modifier = 'Control'
+else
+  modifier = 'Meta'
+end
+
+TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
+  pack('side'=>'left')
+  TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
+    m.configure('menu'=>basic_menu)
+    add('command', 'label'=>'何もしない長いエントリ')
+    ['A','B','C','D','E','F','G'].each{|c|
+      # add('command', 'label'=>"文字 \"#{c}\" を印字", 'underline'=>4, 
+      add('command', 'label'=>"Print letter \"#{c}\" (文字 \"#{c}\" を印字)", 
+          'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+          'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
+      $menu_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
+    }
+  }
+}
+
+TkMenubutton.new($menu_frame, 'text'=>'Cascades', 'underline'=>0) {|m|
+  pack('side'=>'left')
+  TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
+    m.configure('menu'=>cascade_menu)
+    add('command', 'label'=>'Print hello(こんにちは)', 
+        'command'=>proc{print "Hello(こんにちは)\n"}, 
+        'accelerator'=>"#{modifier}+H", 'underline'=>6)
+    $menu_demo.bind("#{modifier}-h", proc{print "Hello(こんにちは)\n"})
+    add('command', 'label'=>'Print goodbye(さようなら)', 
+        'command'=>proc{print "Goodbye(さようなら)\n"}, 
+        'accelerator'=>"#{modifier}+G", 'underline'=>6)
+    $menu_demo.bind("#{modifier}-g", proc{print "Goodbye(さようなら)\n"})
+
+    TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
+      cascade_menu.add('cascade', 'label'=>'Check buttons(チェックボタン)', 
+                       'menu'=>cascade_check, 'underline'=>0)
+      oil = TkVariable.new(0)
+      add('check', 'label'=>'オイル点検', 'variable'=>oil)
+      trans = TkVariable.new(0)
+      add('check', 'label'=>'トランスミッション点検', 'variable'=>trans)
+      brakes = TkVariable.new(0)
+      add('check', 'label'=>'ブレーキ点検', 'variable'=>brakes)
+      lights = TkVariable.new(0)
+      add('check', 'label'=>'ライト点検', 'variable'=>lights)
+      add('separator')
+      add('command', 'label'=>'現在の値を表示', 
+          'command'=>proc{showVars($menu_demo, 
+                                   ['オイル点検', oil], 
+                                   ['トランスミッション点検', trans], 
+                                   ['ブレーキ点検', brakes], 
+                                   ['ライト点検', lights])} )
+      invoke 1
+      invoke 3
+    }
+
+    TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
+      cascade_menu.add('cascade', 'label'=>'Radio buttons(ラジオボタン)', 
+                       'menu'=>cascade_radio, 'underline'=>0)
+      pointSize = TkVariable.new
+      add('radio', 'label'=>'10 ポイント', 'variable'=>pointSize, 'value'=>10)
+      add('radio', 'label'=>'14 ポイント', 'variable'=>pointSize, 'value'=>14)
+      add('radio', 'label'=>'18 ポイント', 'variable'=>pointSize, 'value'=>18)
+      add('radio', 'label'=>'24 ポイント', 'variable'=>pointSize, 'value'=>24)
+      add('radio', 'label'=>'32 ポイント', 'variable'=>pointSize, 'value'=>32)
+      add('separator')
+      style = TkVariable.new
+      add('radio', 'label'=>'ローマン', 'variable'=>style, 'value'=>'roman')
+      add('radio', 'label'=>'ボールド', 'variable'=>style, 'value'=>'bold')
+      add('radio', 'label'=>'イタリック', 'variable'=>style, 'value'=>'italic')
+      add('separator')
+      add('command', 'label'=>'現在の値を表示', 
+          'command'=>proc{showVars($menu_demo, 
+                                   ['ポイントサイズ', pointSize], 
+                                   ['スタイル', style])} )
+      invoke 1
+      invoke 7
+    }
+  }
+}
+
+TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
+  pack('side'=>'left')
+  TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
+    m.configure('menu'=>icon_menu)
+    add('command', 
+        'bitmap'=>'@'+[$demo_dir,'..',
+                        'images','pattern.xbm'].join(File::Separator),
+        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
+                                     'text'=>'今あなたが選択したメニューの項目はテキストではなくビットマップを表示していました。それ以外の点では他のメニュー項目と変わりません。',
+                                     'bitmap'=>'', 'default'=>0, 
+                                     'buttons'=>'了解')} )
+    ['info', 'questhead', 'error'].each{|icon|
+      add('command', 'bitmap'=>icon, 
+          'command'=>proc{print "You invoked the #{icon} bitmap\n"})
+    }
+  }
+}
+
+TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
+  pack('side'=>'left')
+  TkMenu.new(m, 'tearoff'=>false) {|more_menu|
+    m.configure('menu'=>more_menu)
+    [ 'エントリ','別のエントリ','何もしない','ほとんど何もしない',
+      '人生を意義あるものに' ].each{|i|
+      add('command', 'label'=>i, 
+          'command'=>proc{print "You invoked \"#{i}\"\n"})
+    }
+  }
+}
+
+TkMenubutton.new($menu_frame, 'text'=>'Colors', 'underline'=>0) {|m|
+  pack('side'=>'left')
+  TkMenu.new(m) {|colors_menu|
+    m.configure('menu'=>colors_menu)
+    ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
+      add('command', 'label'=>c, 'background'=>c, 
+          'command'=>proc{print "You invoked \"#{c}\"\n"})
+    }
+  }
+}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/menu84.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/menu84.rb
new file mode 100644
index 0000000000..8c2a815d78
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/menu84.rb
@@ -0,0 +1,210 @@
+#
+# menus widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($menu84_demo) && $menu84_demo
+  $menu84_demo.destroy 
+  $menu84_demo = nil
+end
+
+# demo toplevel widget
+$menu84_demo = TkToplevel.new {|w|
+  title("File Selection Dialogs")
+  iconname("menu84")
+  positionWindow(w)
+}
+
+begin
+  windowingsystem = Tk.windowingsystem()
+rescue
+  windowingsystem = ""
+end
+
+# label
+TkLabel.new($menu84_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+  if $tk_platform['platform'] == 'macintosh' ||
+      windowingsystem == "classic" || windowingsystem == "aqua"
+    text("このウィンドウにはカスケードメニューを持つメニューバーが付けられています。Command+x ('x'はコマンドキーシンボルに続けて表示されている文字です) とタイプすることによっても項目の機能を呼び出すことができます。最後のメニューは、マウスでウィンドウの外にドラッグすることによって、独立したパレットとなるように切り放すことが可能です。")
+  else
+    text("このウィンドウにはカスケードメニューを持つメニューバーが付けられています。Alt+x ('x'はメニュー上で下線が引かれた文字です) とタイプすることによってもメニューを呼び出すことができます。矢印キーを使って、メニュー間を移動することも可能です。メニューが表示されている時には、現在位置の項目をスペースキーで選択したり、下線が引かれた文字を入力することでその項目を選択したりすることができます。もし項目にアクセラレータの指定がなされていたならば、その指定されたキー入力を行うことで、メニューを表示させることなく直接その項目の機能を呼び出せます。最後のメニューは、メニューの最初の項目を選択することによって、独立したパレットとなるように切り放すことが可能です。")
+  end
+}.pack('side'=>'top')
+
+
+menustatus = TkVariable.new("    ")
+TkFrame.new($menu84_demo) {|frame|
+  TkLabel.new(frame, 'textvariable'=>menustatus, 'relief'=>'sunken', 
+              'bd'=>1, 'font'=>['Helvetica', '10'], 
+              'anchor'=>'w').pack('side'=>'left', 'padx'=>2, 
+                                  'expand'=>true, 'fill'=>'both')
+  pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
+}
+
+
+# frame
+TkFrame.new($menu84_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $menu84_demo
+      $menu84_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'menu84'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+
+# create menu frame
+$menu84_frame = TkMenu.new($menu84_demo, 'tearoff'=>false)
+
+# menu
+TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
+  $menu84_frame.add('cascade', 'label'=>'File', 'menu'=>m, 'underline'=>0)
+  add('command', 'label'=>'Open...', 'command'=>proc{fail 'これは単なるデモですから、"Open..." 項目の機能は特に定義されてはいません。'})
+  add('command', 'label'=>'New', 'command'=>proc{fail 'これは単なるデモですから、"New" 項目の機能は特に定義されてはいません。'})
+  add('command', 'label'=>'Save', 'command'=>proc{fail 'これは単なるデモですから、"Save" 項目の機能は特に定義されてはいません。'})
+  add('command', 'label'=>'Save As...', 'command'=>proc{fail 'これは単なるデモですから、"Save As..." 項目の機能は特に定義されてはいません。'})
+  add('separator')
+  add('command', 'label'=>'Print Setup...', 'command'=>proc{fail 'これは単なるデモですから、"Print Setup..." 項目の機能は特に定義されてはいません。'})
+  add('command', 'label'=>'Print...', 'command'=>proc{fail 'これは単なるデモですから、"Print..." 項目の機能は特に定義されてはいません。'})
+  add('separator')
+  add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu84_demo.destroy})
+}
+
+if $tk_platform['platform'] == 'macintosh' ||
+    windowingsystem = "classic" || windowingsystem = "aqua"
+  modifier = 'Command'
+elsif $tk_platform['platform'] == 'windows'
+  modifier = 'Control'
+else
+  modifier = 'Meta'
+end
+
+TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
+  $menu84_frame.add('cascade', 'label'=>'Basic', 'menu'=>m, 'underline'=>0)
+  add('command', 'label'=>'Long entry that does nothing')
+  ['A','B','C','D','E','F','G'].each{|c|
+    add('command', 'label'=>"Print letter \"#{c}\"", 
+        'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+        'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
+    $menu84_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
+  }
+}
+
+TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
+  $menu84_frame.add('cascade', 'label'=>'Cascades', 'menu'=>m, 'underline'=>0)
+  add('command', 'label'=>'Print hello', 
+      'command'=>proc{print "Hello\n"}, 
+      'accelerator'=>"#{modifier}+H", 'underline'=>6)
+  $menu84_demo.bind("#{modifier}-h", proc{print "Hello\n"})
+  add('command', 'label'=>'Print goodbye', 
+      'command'=>proc{print "Goodbye\n"}, 
+      'accelerator'=>"#{modifier}+G", 'underline'=>6)
+  $menu84_demo.bind("#{modifier}-g", proc{print "Goodbye\n"})
+
+  TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
+    m.add('cascade', 'label'=>'Check button', 
+          'menu'=>cascade_check, 'underline'=>0)
+    oil = TkVariable.new(0)
+    add('check', 'label'=>'オイル検査', 'variable'=>oil)
+    trans = TkVariable.new(0)
+    add('check', 'label'=>'トランスミッション検査', 'variable'=>trans)
+    brakes = TkVariable.new(0)
+    add('check', 'label'=>'ブレーキ検査', 'variable'=>brakes)
+    lights = TkVariable.new(0)
+    add('check', 'label'=>'ライト検査', 'variable'=>lights)
+    add('separator')
+    add('command', 'label'=>'Show current values', 
+        'command'=>proc{showVars($menu84_demo, 
+                                 ['オイル', oil], 
+                                 ['トランスミッション', trans], 
+                                 ['ブレーキ', brakes], 
+                                 ['ライト', lights])} )
+    invoke 1
+    invoke 3
+  }
+
+  TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
+    m.add('cascade', 'label'=>'Radio buttons', 
+          'menu'=>cascade_radio, 'underline'=>0)
+    pointSize = TkVariable.new
+    add('radio', 'label'=>'10 point', 'variable'=>pointSize, 'value'=>10)
+    add('radio', 'label'=>'14 point', 'variable'=>pointSize, 'value'=>14)
+    add('radio', 'label'=>'18 point', 'variable'=>pointSize, 'value'=>18)
+    add('radio', 'label'=>'24 point', 'variable'=>pointSize, 'value'=>24)
+    add('radio', 'label'=>'32 point', 'variable'=>pointSize, 'value'=>32)
+    add('separator')
+    style = TkVariable.new
+    add('radio', 'label'=>'Roman', 'variable'=>style, 'value'=>'roman')
+    add('radio', 'label'=>'Bold', 'variable'=>style, 'value'=>'bold')
+    add('radio', 'label'=>'Italic', 'variable'=>style, 'value'=>'italic')
+    add('separator')
+    add('command', 'label'=>'現在値の表示', 
+        'command'=>proc{showVars($menu84_demo, 
+                                 ['pointSize', pointSize], 
+                                 ['style', style])} )
+    invoke 1
+    invoke 7
+  }
+}
+
+TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
+  $menu84_frame.add('cascade', 'label'=>'Icons', 'menu'=>m, 'underline'=>0)
+  add('command', 'hidemargin'=>1, 
+      'bitmap'=>'@'+[$demo_dir,'..',
+                      'images','pattern.xbm'].join(File::Separator),
+      'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
+                                   'text'=>'あなたが選択したメニュー項目は、文字列の代わりにビットマップイメージで項目を表示したものです。それ以外の点では、ほかのメニュー項目との間で特に違いがあるわけではありません。',
+                                   'bitmap'=>'', 'default'=>0, 
+                                   'buttons'=>'閉じる')} )
+  ['info', 'questhead', 'error'].each{|icon|
+    add('command', 'bitmap'=>icon, 'hidemargin'=>1, 
+        'command'=>proc{print "You invoked the #{icon} bitmap\n"})
+  }
+
+  entryconfigure(2, :columnbreak=>true)
+}
+
+TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
+  $menu84_frame.add('cascade', 'label'=>'More', 'menu'=>m, 'underline'=>0)
+  [ 'An entry','Another entry','Does nothing','Does almost nothing',
+    'Make life meaningful' ].each{|i|
+    add('command', 'label'=>i, 
+        'command'=>proc{print "You invoked \"#{i}\"\n"})
+  }
+
+  m.entryconfigure('Does almost nothing', 
+                   'bitmap'=>'questhead', 'compound'=>'left', 
+                   'command'=>proc{
+                     TkDialog.new('title'=>'Compound Menu Entry', 
+                                  'message'=>'あなたが選択したメニュー項目は、ビットマップイメージと文字列とを同時に一つの項目に表示するようにしたものです。それ以外の点では、ほかのメニュー項目との間で特に違いがあるわけではありません。',
+                                  'buttons'=>['了解'], 'bitmap'=>'')
+                   })
+}
+
+TkMenu.new($menu84_frame) {|m|
+  $menu84_frame.add('cascade', 'label'=>'Colors', 'menu'=>m, 'underline'=>0)
+  ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
+    add('command', 'label'=>c, 'background'=>c, 
+        'command'=>proc{print "You invoked \"#{c}\"\n"})
+  }
+}
+
+$menu84_demo.menu($menu84_frame)
+
+TkMenu.bind('<MenuSelect>', proc{|w|
+              begin
+                label = w.entrycget('active', 'label')
+              rescue
+                label = "    "
+              end
+              menustatus.value = label
+              Tk.update(true)
+            }, '%W')
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/menu8x.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/menu8x.rb
new file mode 100644
index 0000000000..050f0decb4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/menu8x.rb
@@ -0,0 +1,230 @@
+#
+# menus widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($menu8x_demo) && $menu8x_demo
+  $menu8x_demo.destroy 
+  $menu8x_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$menu8x_demo = TkToplevel.new {|w|
+  title("Menu Demonstration (Tk8.x)")
+  iconname("menu")
+  positionWindow(w)
+}
+
+# version check
+if $tk_version.to_f < 8.0
+
+# label 生成
+TkLabel.new($menu8x_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+    text("実行しようとしたスクリプトは Tk8.0 以上で利用できる機能を利用しているため、あなたの Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} では正常に実行できません。よってデモの実行を中止しました。ただし、下のコード参照ボタンを押すことで、実行が中止されたスクリプトのソースを参照することは可能です。")
+}.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($menu8x_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $menu8x_demo
+      $menu8x_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'menu8x'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+else ; # Tk8.x
+
+begin
+  windowingsystem = Tk.windowingsystem()
+rescue
+  windowingsystem = ""
+end
+
+# label 生成
+TkLabel.new($menu8x_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+  if $tk_platform['platform'] == 'macintosh' ||
+      windowingsystem == "classic" || windowingsystem == "aqua"
+    text("このウィンドウは様々なメニューとカスケードメニューから構成されています。Command-X を入力すると、Xがコマンドキー記号に続いて表示されている文字ならば、アクセラレータを使った項目起動を行うことができます。メニュー要素中、最後のものは、そのメニューの最初の項目を選択することで独立させることができます。")
+  else
+    text("このウィンドウは様々なメニューとカスケードメニューから構成されています。Alt-X を入力すると、Xがメニューにアンダーライン付きで表示されている文字ならば、キーボードからの指定ができます。矢印キーでメニューのトラバースも可能です。メニューが指定された際には、スペースキーで実行することができます。あるいは、アンダーライン付きの文字を入力することでも実行できます。メニューのエントリがアクセラレータを持っている場合は、そのアクセラレータを入力することでメニューを指定することなしに実行することができます。メニュー要素中、最後のものは、そのメニューの最初の項目を選択することで独立させることができます。")
+  end
+}.pack('side'=>'top')
+
+# 状態表示の生成
+$menu8xstatus = TkVariable.new("    ")
+TkFrame.new($menu8x_demo) {|frame|
+  TkLabel.new(frame, 'textvariable'=>$menu8xstatus, 'relief'=>'sunken', 
+              'bd'=>1, 'font'=>['Helvetica', '10'], 'anchor'=>'w')\
+  .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
+
+# frame 生成
+TkFrame.new($menu8x_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $menu8x_demo
+      $menu8x_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'menu8x'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# menu 生成
+TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
+  TkMenu.new(m, 'tearoff'=>false) {|file_menu|
+    m.add('cascade', 'label'=>'File', 'menu'=>file_menu, 'underline'=>0)
+    add('command', 'label'=>'開く ...', 'command'=>proc{fail 'これは、デモですので"開く ..."に対するアクションは定義されていません。'})
+    add('command', 'label'=>'新規', 'command'=>proc{fail 'これは、デモですので"新規"に対するアクションは定義されていません。'})
+    add('command', 'label'=>'保存', 'command'=>proc{fail 'これは、デモですので"保存"に対するアクションは定義されていません。'})
+    add('command', 'label'=>'保存(指定) ...', 'command'=>proc{fail 'これは、デモですので"保存(指定) ..."に対するアクションは定義されていません。'})
+    add('separator')
+    add('command', 'label'=>'プリント設定 ...', 'command'=>proc{fail 'これは、デモですので"プリント設定 ..."に対するアクションは定義されていません。'})
+    add('command', 'label'=>'プリント ...', 'command'=>proc{fail 'これは、デモですので"プリント ..."に対するアクションは定義されていません。'})
+    add('separator')
+    add('command', 'label'=>'終了', 'command'=>proc{$menu8x_demo.destroy})
+  }
+
+  if $tk_platform['platform'] == 'macintosh' ||
+      windowingsystem == "classic" || windowingsystem == "aqua"
+    modifier = 'Command'
+  elsif $tk_platform['platform'] == 'windows'
+    modifier = 'Control'
+  else
+    modifier = 'Meta'
+  end
+
+  TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
+    m.add('cascade', 'label'=>'Basic', 'menu'=>basic_menu, 'underline'=>0)
+    add('command', 'label'=>'何もしない長いエントリ')
+    ['A','B','C','D','E','F','G'].each{|c|
+      # add('command', 'label'=>"文字 \"#{c}\" を印字", 'underline'=>4, 
+      add('command', 'label'=>"Print letter \"#{c}\" (文字 \"#{c}\" を印字)", 
+          'underline'=>14, 'accelerator'=>"Meta+#{c}", 
+          'command'=>proc{print c,"\n"}, 'accelerator'=>"#{modifier}+#{c}")
+      $menu8x_demo.bind("#{modifier}-#{c.downcase}", proc{print c,"\n"})
+    }
+  }
+
+  TkMenu.new(m, 'tearoff'=>false) {|cascade_menu|
+    m.add('cascade', 'label'=>'Cascades', 'menu'=>cascade_menu, 'underline'=>0)
+    add('command', 'label'=>'Print hello(こんにちは)', 
+        'command'=>proc{print "Hello(こんにちは)\n"}, 
+        'accelerator'=>"#{modifier}+H", 'underline'=>6)
+    $menu8x_demo.bind("#{modifier}-h", proc{print "Hello(こんにちは)\n"})
+    add('command', 'label'=>'Print goodbye(さようなら)', 
+        'command'=>proc{print "Goodbye(さようなら)\n"}, 
+        'accelerator'=>"#{modifier}+G", 'underline'=>6)
+    $menu8x_demo.bind("#{modifier}-g", proc{print "Goodbye(さようなら)\n"})
+
+    TkMenu.new(m, 'tearoff'=>false) {|cascade_check|
+      cascade_menu.add('cascade', 'label'=>'Check buttons(チェックボタン)', 
+                       'menu'=>cascade_check, 'underline'=>0)
+      oil = TkVariable.new(0)
+      add('check', 'label'=>'オイル点検', 'variable'=>oil)
+      trans = TkVariable.new(0)
+      add('check', 'label'=>'トランスミッション点検', 'variable'=>trans)
+      brakes = TkVariable.new(0)
+      add('check', 'label'=>'ブレーキ点検', 'variable'=>brakes)
+      lights = TkVariable.new(0)
+      add('check', 'label'=>'ライト点検', 'variable'=>lights)
+      add('separator')
+      add('command', 'label'=>'現在の値を表示', 
+          'command'=>proc{showVars($menu8x_demo, 
+                                   ['オイル点検', oil], 
+                                   ['トランスミッション点検', trans], 
+                                   ['ブレーキ点検', brakes], 
+                                   ['ライト点検', lights])} )
+      invoke 1
+      invoke 3
+    }
+
+    TkMenu.new(m, 'tearoff'=>false) {|cascade_radio|
+      cascade_menu.add('cascade', 'label'=>'Radio buttons(ラジオボタン)', 
+                       'menu'=>cascade_radio, 'underline'=>0)
+      pointSize = TkVariable.new
+      add('radio', 'label'=>'10 ポイント', 'variable'=>pointSize, 'value'=>10)
+      add('radio', 'label'=>'14 ポイント', 'variable'=>pointSize, 'value'=>14)
+      add('radio', 'label'=>'18 ポイント', 'variable'=>pointSize, 'value'=>18)
+      add('radio', 'label'=>'24 ポイント', 'variable'=>pointSize, 'value'=>24)
+      add('radio', 'label'=>'32 ポイント', 'variable'=>pointSize, 'value'=>32)
+      add('separator')
+      style = TkVariable.new
+      add('radio', 'label'=>'ローマン', 'variable'=>style, 'value'=>'roman')
+      add('radio', 'label'=>'ボールド', 'variable'=>style, 'value'=>'bold')
+      add('radio', 'label'=>'イタリック', 'variable'=>style, 'value'=>'italic')
+      add('separator')
+      add('command', 'label'=>'現在の値を表示', 
+          'command'=>proc{showVars($menu8x_demo, 
+                                   ['ポイントサイズ', pointSize], 
+                                   ['スタイル', style])} )
+      invoke 1
+      invoke 7
+    }
+  }
+
+  TkMenu.new(m, 'tearoff'=>false) {|icon_menu|
+    m.add('cascade', 'label'=>'Icons', 'menu'=>icon_menu, 'underline'=>0)
+    add('command', 
+        'bitmap'=>'@'+[$demo_dir,'..',
+                        'images','pattern.xbm'].join(File::Separator),
+        'hidemargin'=>1, 
+        'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry', 
+                                     'text'=>'今あなたが選択したメニューの項目はテキストではなくビットマップを表示していました。それ以外の点では他のメニュー項目と変わりません。',
+                                     'bitmap'=>'', 'default'=>0, 
+                                     'buttons'=>'了解')} )
+    ['info', 'questhead', 'error'].each{|icon|
+      add('command', 'bitmap'=>icon, 'hidemargin'=>1, 
+          'command'=>proc{print "You invoked the #{icon} bitmap\n"})
+    }
+
+    entryconfigure(2, 'columnbreak'=>1)
+  }
+
+  TkMenu.new(m, 'tearoff'=>false) {|more_menu|
+    m.add('cascade', 'label'=>'More', 'menu'=>more_menu, 'underline'=>0)
+    [ 'エントリ','別のエントリ','何もしない','ほとんど何もしない',
+      '人生を意義あるものに' ].each{|i|
+      add('command', 'label'=>i, 
+          'command'=>proc{print "You invoked \"#{i}\"\n"})
+    }
+  }
+
+  TkMenu.new(m) {|colors_menu|
+    m.add('cascade', 'label'=>'Colors', 'menu'=>colors_menu, 'underline'=>1)
+    ['red', 'orange', 'yellow', 'green', 'blue'].each{|c|
+      add('command', 'label'=>c, 'background'=>c, 
+          'command'=>proc{print "You invoked \"#{c}\"\n"})
+    }
+  }
+
+  $menu8x_demo.configure('menu'=>m)
+}
+
+TkMenu.bind('<MenuSelect>', 
+            proc{|w| 
+              begin
+                label = w.entrycget('active', 'label')
+              rescue
+                label = '    '
+              end
+              $menu8xstatus.value = label
+              Tk.update('idletasks')
+            }, '%W')
+
+end ; # Tk 8.x
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/menubu.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/menubu.rb
new file mode 100644
index 0000000000..aa90a3087f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/menubu.rb
@@ -0,0 +1,235 @@
+require "tkcanvas"
+
+def optionMenu(menubutton, varName, firstValue, *rest)
+  varName.value = firstValue
+  configoptions = {'textvariable'=>varName,'indicatoron'=>'on',
+    'relief'=>'raised','borderwidth'=>2,'highlightthickness'=>2,
+    'anchor'=>'c','direction'=>'flush'}
+  configoptions.each {|key, value|
+    menubutton.configure(key, value)
+  }
+  menu = TkMenu.new(menubutton) {
+    tearoff 'off'
+    add 'radio', 'label'=>firstValue, 'variable'=>varName
+  }
+  menubutton.menu(menu)
+  for i in rest
+    menu.add 'radio', 'label'=>i, 'variable'=>varName
+  end
+  
+  return menu
+end
+
+if defined?($menubu_demo) && $menubu_demo
+  $menubu_demo.destroy
+  $menubu_demo = nil
+end
+
+$menubu_demo = TkToplevel.new {|w|
+  title("Menu Button Demonstration")
+  iconname("menubutton")
+}
+
+positionWindow($menubu_demo)
+
+# version check
+if $tk_version.to_f < 8.0
+
+# label 生成
+TkLabel.new($menubu_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
+    text("実行しようとしたスクリプトは Tk8.0 以上で利用できる機能を利用しているため、あなたの Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} では正常に実行できません。よってデモの実行を中止しました。ただし、下のコード参照ボタンを押すことで、実行が中止されたスクリプトのソースを参照することは可能です。")
+}.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($menubu_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $menubu_demo
+      $menubu_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'menubu'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+else ; # Tk8.x
+
+body = TkFrame.new($menubu_demo)
+body.pack('expand'=>'yes', 'fill'=>'both')
+
+below = TkMenubutton.new(body) {
+  text "Below"
+  underline 0
+  direction 'below'
+  relief 'raised'
+}
+belowMenu = TkMenu.new(below) {
+  tearoff 0
+  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
+  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
+}
+below.menu(belowMenu)
+below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
+
+below = TkMenubutton.new(body) {
+  text "Below"
+  underline 0
+  direction 'below'
+  relief 'raised'
+}
+belowMenu = TkMenu.new(below) {
+  tearoff 0
+  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
+  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
+}
+below.menu(belowMenu)
+below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
+
+below = TkMenubutton.new(body) {
+  text "Below"
+  underline 0
+  direction 'below'
+  relief 'raised'
+}
+belowMenu = TkMenu.new(below) {
+  tearoff 0
+  add 'command', 'label'=>"Below menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Below menu.\""}
+  add 'command', 'label'=>"Below menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Below menu.\""}
+}
+below.menu(belowMenu)
+below.grid('row'=>0, 'column'=>1, 'sticky'=>'n')
+
+right = TkMenubutton.new(body) {
+  text "Right"
+  underline 0
+  direction 'right'
+  relief 'raised'
+}
+rightMenu = TkMenu.new(right) {
+  tearoff 0
+  add 'command', 'label'=>"Right menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
+  add 'command', 'label'=>"Right menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Right menu.\""}
+}
+right.menu(rightMenu)
+right.grid('row'=>1, 'column'=>0, 'sticky'=>'w')
+
+left = TkMenubutton.new(body) {
+  text "Left"
+  underline 0
+  direction 'left'
+  relief 'raised'
+}
+leftMenu = TkMenu.new(left) {
+  tearoff 0
+  add 'command', 'label'=>"Left menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Left menu.\""}
+  add 'command', 'label'=>"Left menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Left menu.\""}
+}
+left.menu(leftMenu)
+left.grid('row'=>1, 'column'=>2, 'sticky'=>'e')
+
+center = TkFrame.new(body) {
+  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
+}
+
+above = TkMenubutton.new(body) {
+  text "Above"
+  underline 0
+  direction 'above'
+  relief 'raised'
+}
+aboveMenu = TkMenu.new(above) {
+  tearoff 0
+  add 'command', 'label'=>"Above menu: first item", 'command'=>proc {puts "\"You have selected the first item from the Above menu.\""}
+  add 'command', 'label'=>"Above menu: second item", 'command'=>proc {puts "\"You have selected the second item from the Above menu.\""}
+}
+above.menu(aboveMenu)
+above.grid('row'=>2, 'column'=>1, 'sticky'=>'s')
+
+center = TkFrame.new(body) {
+  grid('row'=>1, 'column'=>1, 'sticky'=>'news')
+}
+
+TkFrame.new($menubu_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc {
+      tmppath = $menubu_demo
+      $menubu_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc { showCode 'menubu' }
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x', 'pady'=>'2m')
+
+msg = TkLabel.new(center) {
+#  font $font
+  wraplength '4i'
+  justify 'left'
+  text "これはメニューボタンのデモです。\"Below\"のボタンは\
+下にメニューを出し、\"Right\"のボタンは右にメニューを出して、\
+……となります。この文章の下には2つのオプションメニューがあります。\
+1つは普通のメニューで、もう1つは16色のパレットです。"
+}
+msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
+
+TkFrame.new(center) {|f|
+  menubuttonoptions = TkVariable.new
+  mbutton = TkMenubutton.new(f)
+  options = optionMenu(mbutton, menubuttonoptions, 
+                       'one', 'two', 'three')
+  mbutton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
+  paletteColor = TkVariable.new
+  colors = ['Black','red4','DarkGreen','NavyBlue', 'gray75',
+    'Red','Green','Blue','gray50','Yellow','Cyan','Magenta',
+    'White','Brown','DarkSeaGreen','DarkViolet']
+  colorMenuButton = TkMenubutton.new(f)
+  m = optionMenu(colorMenuButton, paletteColor, *colors)
+  begin
+    windowingsystem = Tk.windowingsystem()
+  rescue
+    windowingsystem = ""
+  end
+  if windowingsystem == "classic" || windowingsystem == "aqua"
+    topBorderColor = 'Black'
+    bottomBorderColor = 'Black'
+  else
+    topBorderColor = 'gray50'
+    bottomBorderColor = 'gray75'
+  end
+  for i in 0..15
+    image = TkPhotoImage.new('height'=>16, 'width'=>16)
+    image.put(topBorderColor, 0, 0, 16, 1)
+    image.put(topBorderColor, 0, 1, 1, 16)
+    image.put(bottomBorderColor, 0, 15, 16, 16)
+    image.put(bottomBorderColor, 15, 1, 16, 16)
+    image.put(colors[i], 1, 1, 15, 15)
+
+    selectimage = TkPhotoImage.new('height'=>16, 'width'=>16)
+    selectimage.put('Black', 0, 0, 16, 2)
+    selectimage.put('Black', 0, 2, 2, 16)
+    selectimage.put('Black', 2, 14, 16, 16)
+    selectimage.put('Black', 14, 2, 16, 14)
+    selectimage.put(colors[i], 2, 2, 14, 14)
+
+    m.entryconfigure(i, 'image'=>image, 'selectimage'=>selectimage, 'hidemargin'=>'on')
+  end
+  m.configure('tearoff', 'on')
+  for c in ['Black', 'gray75', 'gray50', 'White']
+    m.entryconfigure(c, 'columnbreak'=>1)
+  end
+  colorMenuButton.pack('side'=>'left', 'padx'=>25, 'pady'=>25)
+  pack 'padx'=>25, 'pady'=>25
+}
+
+end ; # Tk8.x
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/msgbox.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/msgbox.rb
new file mode 100644
index 0000000000..983e6b6589
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/msgbox.rb
@@ -0,0 +1,86 @@
+#
+# message boxes widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($msgbox_demo) && $msgbox_demo
+  $msgbox_demo.destroy 
+  $msgbox_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$msgbox_demo = TkToplevel.new {|w|
+  title("Message Box Demonstration")
+  iconname("messagebox")
+  positionWindow(w)
+}
+
+# label 生成
+TkLabel.new($msgbox_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
+            'text'=>"表示するアイコンとメッセージボックスの種類を選んで下さい。そして \"メッセージボックス\" ボタンを押すと、指定したメッセージボックスが表示されます。").pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($msgbox_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $msgbox_demo
+      $msgbox_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'msgbox'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'メッセージボックス'
+    command proc{showMessageBox $msgbox_demo}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 生成
+$msgbox_leftframe  = TkFrame.new($msgbox_demo)
+$msgbox_rightframe = TkFrame.new($msgbox_demo)
+$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
+                        'pady'=>'.5c', 'padx'=>'.5c')
+$msgbox_rightframe.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y', 
+                        'pady'=>'.5c', 'padx'=>'.5c')
+
+TkLabel.new($msgbox_leftframe, 'text'=>'アイコン').pack('side'=>'top')
+TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
+.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
+
+$msgboxIcon = TkVariable.new('info')
+['error', 'info', 'question', 'warning'].each {|icon|
+  TkRadioButton.new($msgbox_leftframe, 'text'=>icon, 'variable'=>$msgboxIcon, 
+                    'relief'=>'flat', 'value'=>icon, 'width'=>16, 
+                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2, 
+                                        'anchor'=>'w', 'fill'=>'x')
+}
+
+TkLabel.new($msgbox_rightframe, 'text'=>'種類').pack('side'=>'top')
+TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
+.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
+
+$msgboxType = TkVariable.new('ok')
+['abortretryignore', 'ok', 'okcancel', 
+  'retrycancel', 'yesno', 'yesnocancel'].each {|type|
+  TkRadioButton.new($msgbox_rightframe, 'text'=>type, 'variable'=>$msgboxType, 
+                    'relief'=>'flat', 'value'=>type, 'width'=>16, 
+                    'anchor'=>'w').pack('side'=>'top', 'pady'=>2, 
+                                        'anchor'=>'w', 'fill'=>'x')
+}
+
+def showMessageBox(w)
+  button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value, 
+                         'title'=>'Message', 'parent'=>w,
+                         'message'=>"これは \"#{$msgboxType.value}\" という種類のメッセージボックスで、\"#{$msgboxIcon.value}\" のアイコンが表示されています。")
+
+  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w, 
+                'message'=>"あなたは \"#{button}\" を押しましたね。")
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/paned1.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/paned1.rb
new file mode 100644
index 0000000000..8d16d03c08
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/paned1.rb
@@ -0,0 +1,48 @@
+# paned1.rb
+#
+# This demonstration script creates a toplevel window containing
+# a paned window that separates two windows horizontally.
+#
+# based on "Id: paned1.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
+
+if defined?($paned1_demo) && $paned1_demo
+  $paned1_demo.destroy 
+  $paned1_demo = nil
+end
+
+$paned1_demo = TkToplevel.new {|w|
+  title("Horizontal Paned Window Demonstration")
+  iconname("paned1")
+  positionWindow(w)
+}
+
+TkLabel.new($paned1_demo, 
+            :font=>$font, :wraplength=>'4i', :justify=>:left, 
+            :text=><<EOL).pack(:side=>:top)
+下の色付けされた二つのウィンドウの間の仕切り枠は、一つの領域をそれぞれのウィンドウのために分割するためのものです。左ボタンで仕切りを操作すると、分割サイズ変更の操作途中では再表示はなされず、確定させたときに表示が更新されます。マウスによる仕切りの操作に追随してサイズを変更した表示がなわれるようにしたい場合は、マウスの中央ボタンを使ってください。
+もしあなたが使っている Ruby にリンクされている Tk ライブラリが panedwindow を実装していない
+場合、このデモはうまく動かないはずです。その場合には panedwindow が実装されているような
+より新しいバージョンの Tk を組み合わせて試す
+ようにしてください。
+EOL
+
+# The bottom buttons
+TkFrame.new($paned1_demo){|f|
+  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
+
+  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
+                 $paned1_demo.destroy
+                 $paned1_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
+                 showCode 'paned1'
+               }).pack(:side=>:left, :expand=>true)
+}
+
+TkPanedwindow.new($paned1_demo){|f|
+  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
+
+  add(TkLabel.new(f, :text=>"This is the\nleft side", :bg=>'yellow'), 
+      TkLabel.new(f, :text=>"This is the\nright side", :bg=>'cyan'))
+}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/paned2.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/paned2.rb
new file mode 100644
index 0000000000..1e82eddda4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/paned2.rb
@@ -0,0 +1,96 @@
+# paned2.rb --
+#
+# This demonstration script creates a toplevel window containing
+# a paned window that separates two windows vertically.
+#
+# based on "Id: paned2.tcl,v 1.1 2002/02/22 14:07:01 dkf Exp"
+
+if defined?($paned2_demo) && $paned2_demo
+  $paned2_demo.destroy 
+  $paned2_demo = nil
+end
+
+$paned2_demo = TkToplevel.new {|w|
+  title("Vertical Paned Window Demonstration")
+  iconname("paned2")
+  positionWindow(w)
+}
+
+TkLabel.new($paned2_demo, 
+            :font=>$font, :wraplength=>'4i', :justify=>:left, 
+            :text=><<EOL).pack(:side=>:top)
+下のスクロールバー付きのウィジェットが置かれた二つのウィンドウの間の仕切り枠は、一つの領域をそれぞれのウィンドウのために分割するためのものです。左ボタンで仕切りを操作すると、分割サイズ変更の操作途中では再表示はなされず、確定させたときに表示が更新されます。マウスによる仕切りの操作に追随してサイズを変更した表示がなわれるようにしたい場合は、マウスの中央ボタンを使ってください。
+もしあなたが使っている Ruby にリンクされている Tk ライブラリが panedwindow を実装していない
+場合、このデモはうまく動かないはずです。その場合には panedwindow が実装されているような
+より新しいバージョンの Tk を組み合わせて試す
+ようにしてください。
+EOL
+
+# The bottom buttons
+TkFrame.new($paned2_demo){|f|
+  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
+
+  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
+                 $paned2_demo.destroy
+                 $paned2_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
+                 showCode 'paned2'
+               }).pack(:side=>:left, :expand=>true)
+}
+
+paneList = TkVariable.new  # define as normal variable (not array)
+paneList.value = [         # ruby's array --> tcl's list
+    'Ruby/Tk のウィジェット一覧',
+    'TkButton', 
+    'TkCanvas', 
+    'TkCheckbutton', 
+    'TkEntry', 
+    'TkFrame', 
+    'TkLabel', 
+    'TkLabelframe', 
+    'TkListbox', 
+    'TkMenu', 
+    'TkMenubutton', 
+    'TkMessage', 
+    'TkPanedwindow', 
+    'TkRadiobutton', 
+    'TkScale', 
+    'TkScrollbar', 
+    'TkSpinbox', 
+    'TkText', 
+    'TkToplevel'
+]
+
+# Create the pane itself
+TkPanedwindow.new($paned2_demo, :orient=>:vertical){|f|
+  pack(:side=>:top, :expand=>true, :fill=>:both, :pady=>2, :padx=>'2m')
+
+  add(TkFrame.new(f){|paned2_top|
+        TkListbox.new(paned2_top, :listvariable=>paneList) {
+          # Invert the first item to highlight it
+          itemconfigure(0, :background=>self.cget(:foreground), 
+                           :foreground=>self.cget(:background) )
+          yscrollbar(TkScrollbar.new(paned2_top).pack(:side=>:right, 
+                                                      :fill=>:y))
+          pack(:fill=>:both, :expand=>true)
+        }
+      }, 
+
+      TkFrame.new(f, :height=>120) {|paned2_bottom|
+        # The bottom window is a text widget with scrollbar
+        paned2_xscr = TkScrollbar.new(paned2_bottom)
+        paned2_yscr = TkScrollbar.new(paned2_bottom)
+        paned2_text = TkText.new(paned2_bottom, :width=>30, :wrap=>:non) {
+          insert('1.0', 'ここに配置されているのは、' + 
+                        'ごく普通のテキストウィジェットです。')
+          xscrollbar(paned2_xscr)
+          yscrollbar(paned2_yscr)
+        }
+        Tk.grid(paned2_text, paned2_yscr, :sticky=>'nsew')
+        Tk.grid(paned2_xscr, :sticky=>'nsew')
+        TkGrid.columnconfigure(paned2_bottom, 0, :weight=>1)
+        TkGrid.rowconfigure(paned2_bottom, 0, :weight=>1)
+      } )
+}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/pendulum.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/pendulum.rb
new file mode 100644
index 0000000000..d703c74d5a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/pendulum.rb
@@ -0,0 +1,224 @@
+#
+# This demonstration illustrates how Tcl/Tk can be used to construct
+# simulations of physical systems.
+# (called by 'widget')
+#
+# based on Tcl/Tk8.5a2 widget demos
+
+# destroy toplevel widget for this demo script
+if defined?($pendulum_demo) && $pendulum_demo
+  $pendulum_demo.destroy 
+  $pendulum_demo = nil
+end
+
+# create toplevel widget
+$pendulum_demo = TkToplevel.new {|w|
+  title("Pendulum Animation Demonstration")
+  iconname("pendulum")
+  positionWindow(w)
+}
+
+# create label
+msg = TkLabel.new($pendulum_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text 'このデモは、物理系のシミュレーションに関わるようなアニメーション実行するために Ruby/Tk をどのように用いることができるかを示しています。左側のキャンバスは単純な振り子である物理系自体のグラフィカル表現であるのに対し、右側のキャンバスは系の位相空間のグラフ（角速度と角度とをプロットしたもの）になっています。左側のキャンバス上でクリックおよびドラッグを行って振り子の重りの位置を変えてみてください。'
+}
+msg.pack('side'=>'top')
+
+# create frame
+TkFrame.new($pendulum_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $pendulum_demo
+      $pendulum_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'pendulum'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# animated wave
+class PendulumAnimationDemo
+  def initialize(frame)
+    # Create some structural widgets
+    pane = TkPanedWindow.new(frame).pack(:fill=>:both, :expand=>true)
+    pane.add(@lf1 = TkLabelFrame.new(pane, :text=>'Pendulum Simulation'))
+    pane.add(@lf2 = TkLabelFrame.new(pane, :text=>'Phase Space'))
+
+    # Create the canvas containing the graphical representation of the
+    # simulated system.
+    @c = TkCanvas.new(@lf1, :width=>320, :height=>200, :background=>'white', 
+                      :borderwidth=>2, :relief=>:sunken)
+    TkcText.new(@c, 5, 5, :anchor=>:nw, 
+                :text=>'Click to Adjust Bob Start Position')
+    # Coordinates of these items don't matter; they will be set properly below
+    @plate = TkcLine.new(@c, 0, 25, 320, 25, :width=>2, :fill=>'grey50')
+    @rod = TkcLine.new(@c, 1, 1, 1, 1, :width=>3, :fill=>'black')
+    @bob = TkcOval.new(@c, 1, 1, 2, 2, 
+                       :width=>3, :fill=>'yellow', :outline=>'black')
+    TkcOval.new(@c, 155, 20, 165, 30, :fill=>'grey50', :outline=>'')
+
+    # pack
+    @c.pack(:fill=>:both, :expand=>true)
+
+    # Create the canvas containing the phase space graph; this consists of
+    # a line that gets gradually paler as it ages, which is an extremely
+    # effective visual trick.
+    @k = TkCanvas.new(@lf2, :width=>320, :height=>200, :background=>'white', 
+                      :borderwidth=>2, :relief=>:sunken)
+    @y_axis = TkcLine.new(@k, 160, 200, 160, 0, :fill=>'grey75', :arrow=>:last)
+    @x_axis = TkcLine.new(@k, 0, 100, 320, 100, :fill=>'grey75', :arrow=>:last)
+
+    @graph = {}
+    90.step(0, -10){|i|
+      # Coordinates of these items don't matter; 
+      # they will be set properly below
+      @graph[i] = TkcLine.new(@k, 0, 0, 1, 1, :smooth=>true, :fill=>"grey#{i}")
+    }
+
+    # labels
+    @label_theta = TkcText.new(@k, 0, 0, :anchor=>:ne, 
+                               :text=>'q', :font=>'Symbol 8')
+    @label_dtheta = TkcText.new(@k, 0, 0, :anchor=>:ne, 
+                               :text=>'dq', :font=>'Symbol 8')
+
+    # pack
+    @k.pack(:fill=>:both, :expand=>true)
+
+    # Initialize some variables
+    @points = []
+    @theta = 45.0
+    @dTheta = 0.0
+    @length = 150
+
+    # init display
+    showPendulum
+
+    # animation loop
+    @timer = TkTimer.new(15){ repeat }
+
+    # binding
+    @c.bindtags_unshift(btag = TkBindTag.new)
+    btag.bind('Destroy'){ @timer.stop }
+    btag.bind('1', proc{|x, y| @timer.stop; showPendulum(x, y)}, '%x %y')
+    btag.bind('B1-Motion', proc{|x, y| showPendulum(x, y)}, '%x %y')
+    btag.bind('ButtonRelease-1', 
+              proc{|x, y| showPendulum(x, y); @timer.start }, '%x %y')
+
+    btag.bind('Configure', proc{|w| @plate.coords(0, 25, w, 25)}, '%w')
+
+    @k.bind('Configure', proc{|h, w| 
+              @psh = h/2; 
+              @psw = w/2
+              @x_axis.coords(2, @psh, w-2, @psh)
+              @y_axis.coords(@psw, h-2, @psw, 2)
+              @label_theta.coords(@psw-4, 6)
+              @label_dtheta.coords(w-6, @psh+4)
+            }, '%h %w')
+
+    # animation start
+    @timer.start(500)
+  end
+
+  # This procedure makes the pendulum appear at the correct place on the
+  # canvas. If the additional arguments x, y are passed instead of computing 
+  # the position of the pendulum from the length of the pendulum rod and its 
+  # angle, the length and angle are computed in reverse from the given 
+  # location (which is taken to be the centre of the pendulum bob.)
+  def showPendulum(x=nil, y=nil)
+    if x && y && (x != 160 || y != 25)
+      @dTheta = 0.0
+      x2 = x - 160
+      y2 = y - 25
+      @length = Math.hypot(x2, y2)
+      @theta = Math.atan2(x2,y2)*180/Math::PI
+    else
+      angle = @theta*Math::PI/180
+      x = 160 + @length*Math.sin(angle)
+      y = 25 + @length*Math.cos(angle)
+    end
+
+    @rod.coords(160, 25, x, y)
+    @bob.coords(x-15, y-15, x+15, y+15)
+  end
+
+  # Update the phase-space graph according to the current angle and the
+  # rate at which the angle is changing (the first derivative with
+  # respect to time.)
+  def showPhase
+    @points << @theta + @psw << -20*@dTheta + @psh
+    if @points.length > 100
+      @points = @points[-100..-1]
+    end
+    (0...100).step(10){|i|
+      first = - i
+      last = 11 - i
+      last = -1 if last >= 0
+      next if first > last
+      lst = @points[first..last]
+      @graph[i].coords(lst) if lst && lst.length >= 4
+    }
+  end
+
+  # This procedure is the "business" part of the simulation that does
+  # simple numerical integration of the formula for a simple rotational
+  # pendulum.
+  def recomputeAngle
+    scaling = 3000.0/@length/@length
+
+    # To estimate the integration accurately, we really need to
+    # compute the end-point of our time-step.  But to do *that*, we
+    # need to estimate the integration accurately!  So we try this
+    # technique, which is inaccurate, but better than doing it in a
+    # single step.  What we really want is bound up in the
+    # differential equation:
+    #       ..             - sin theta
+    #      theta + theta = -----------
+    #                         length
+    # But my math skills are not good enough to solve this!
+
+    # first estimate
+    firstDDTheta = -Math.sin(@theta * Math::PI/180) * scaling
+    midDTheta = @dTheta + firstDDTheta
+    midTheta = @theta + (@dTheta + midDTheta)/2
+    # second estimate
+    midDDTheta = -Math.sin(midTheta * Math::PI/180) * scaling
+    midDTheta = @dTheta + (firstDDTheta + midDDTheta)/2
+    midTheta = @theta + (@dTheta + midDTheta)/2
+    # Now we do a double-estimate approach for getting the final value
+    # first estimate
+    midDDTheta = -Math.sin(midTheta * Math::PI/180) * scaling
+    lastDTheta = midDTheta + midDDTheta
+    lastTheta = midTheta + (midDTheta+ lastDTheta)/2
+    # second estimate
+    lastDDTheta = -Math.sin(lastTheta * Math::PI/180) * scaling
+    lastDTheta = midDTheta + (midDDTheta + lastDDTheta)/2
+    lastTheta = midTheta + (midDTheta + lastDTheta)/2
+    # Now put the values back in our globals
+    @dTheta = lastDTheta
+    @theta = lastTheta
+  end
+
+  # This method ties together the simulation engine and the graphical
+  # display code that visualizes it.
+  def repeat
+    # Simulate
+    recomputeAngle
+
+    # Update the display
+    showPendulum
+    showPhase
+  end
+end
+
+# Start the animation processing
+PendulumAnimationDemo.new($pendulum_demo)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/plot.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/plot.rb
new file mode 100644
index 0000000000..902b144f72
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/plot.rb
@@ -0,0 +1,119 @@
+#
+# 2-D plot widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($plot_demo) && $plot_demo
+  $plot_demo.destroy 
+  $plot_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$plot_demo = TkToplevel.new {|w|
+  title("Plot Demonstration")
+  iconname("Plot")
+  positionWindow(w)
+}
+
+# label 生成
+TkLabel.new($plot_demo, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left', 
+            'text'=>"このウィンドウは簡単な2次元のプロットを含んだキャンバス widgetです。表示された点をマウスボタン1でドラッグしてデータをいじることができます。"){
+  pack('side'=>'top')
+}
+
+# frame 生成
+$plot_buttons = TkFrame.new($plot_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $plot_demo
+      $plot_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'plot'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# font 設定
+plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+
+# canvas 設定
+$plot_canvas = TkCanvas.new($plot_demo,'relief'=>'raised','width'=>450,'height'=>300)
+$plot_canvas.pack('side'=>'top', 'fill'=>'x')
+
+# plot 生成
+TkcLine.new($plot_canvas, 100, 250, 400, 250, 'width'=>2)
+TkcLine.new($plot_canvas, 100, 250, 100,  50, 'width'=>2)
+TkcText.new($plot_canvas, 225, 20, 
+            'text'=>"簡単なプロット", 'font'=>plotFont, 'fill'=>'brown')
+
+(0..10).each {|i|
+  x = 100 + (i * 30)
+  TkcLine.new($plot_canvas, x, 250, x, 245, 'width'=>2)
+  TkcText.new($plot_canvas, x, 254, 
+              'text'=>10*i, 'font'=>plotFont, 'anchor'=>'n')
+}
+(0..5).each {|i|
+  y = 250 - (i * 40)
+  TkcLine.new($plot_canvas, 100, y, 105, y, 'width'=>2)
+  TkcText.new($plot_canvas, 96, y, 
+              'text'=>"#{i*50}.0", 'font'=>plotFont, 'anchor'=>'e')
+}
+
+for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
+  x = 100 + (3*xx)
+  y = 250 - (4*yy)/5
+  item = TkcOval.new($plot_canvas, x-6, y-6, x+6, y+6, 
+                     'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
+  item.addtag 'point'
+end
+
+$plot_canvas.itembind('point', 'Any-Enter', 
+                      proc{$plot_canvas.itemconfigure 'current','fill','red'})
+$plot_canvas.itembind('point', 'Any-Leave', 
+                      proc{$plot_canvas.itemconfigure 'current','fill','SkyBlue2'})
+$plot_canvas.itembind('point', '1', 
+                      proc{|x,y| plotDown $plot_canvas,x,y}, "%x %y")
+$plot_canvas.itembind('point', 'ButtonRelease-1', 
+                      proc{$plot_canvas.dtag 'selected'})
+$plot_canvas.bind('B1-Motion', 
+                  proc{|x,y| plotMove $plot_canvas,x,y}, "%x %y")
+
+$plot = {'lastX'=>0, 'lastY'=>0}
+
+# plotDown --
+# This method is invoked when the mouse is pressed over one of the 
+# data points.  It sets up state to allow the point to be dragged.
+#
+# Arguments:
+# w -           The canvas window.
+# x, y -        The coordinates of the mouse press.
+
+def plotDown (w, x, y)
+  w.dtag 'selected'
+  w.addtag_withtag 'selected', 'current'
+  w.raise 'current'
+  $plot['lastX'] = x
+  $plot['lastY'] = y
+end
+
+# plotMove --
+# This method is invoked during mouse motion events.  It drags the
+# current item.
+#
+# Arguments:
+# w -           The canvas window.
+# x, y -        The coordinates of the mouse.
+
+def plotMove (w, x, y)
+  w.move 'selected', x - $plot['lastX'], y - $plot['lastY']
+  $plot['lastX'] = x
+  $plot['lastY'] = y
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/puzzle.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/puzzle.rb
new file mode 100644
index 0000000000..ad69775aab
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/puzzle.rb
@@ -0,0 +1,116 @@
+#
+# widet demo 'puzzle' (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($puzzle_demo) && $puzzle_demo
+  $puzzle_demo.destroy 
+  $puzzle_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$puzzle_demo = TkToplevel.new {|w|
+  title("15-Puzzle Demonstration")
+  iconname("15-Puzzle")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($puzzle_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "下の15-パズルはボタンを集めてできています。空いている所の隣のピースをクリックすると、そのピースがその空いている場所にスライドします。この操作を続け、ピースがその数の順に上から下、左から右に並ぶようにしてください。"
+}
+msg.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($puzzle_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $puzzle_demo
+      $puzzle_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'puzzle'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 生成
+#
+# Special trick: scrollbar widget を生成してその trough color を用いることで
+#                空白部分のための暗色を選択し，設定する 
+#
+begin
+  if Tk.windowingsystem() == 'aqua'
+    frameSize = 160
+  else
+    frameSize = 120
+  end
+rescue
+  frameSize = 120
+end
+ 
+s = TkScrollbar.new($puzzle_demo)
+base = TkFrame.new($puzzle_demo) {
+  width  frameSize
+  height frameSize
+  borderwidth 2
+  relief 'sunken'
+  bg s['troughcolor']
+}
+s.destroy
+base.pack('side'=>'top', 'padx'=>'1c', 'pady'=>'1c')
+
+# proc のスコープを閉じるため，proc 生成メソッドを用意
+# こうしておかねば，ループ中で値が変化する num の影響を受けて
+# puzzleSwitch の第 2 引数が変化してしまい，期待通りにはならない．
+def def_puzzleswitch_proc(w, num)
+  proc{puzzleSwitch w, num}
+end
+
+$xpos = {}
+$ypos = {}
+order = [3,1,6,2,5,7,15,13,4,11,8,9,14,10,12]
+(0..14).each{|i|
+  num = order[i]
+  $xpos[num] = (i % 4) * 0.25
+  $ypos[num] = (i / 4) * 0.25
+  TkButton.new(base) {|w|
+    relief 'raised'
+    text num
+    highlightthickness 0
+    command def_puzzleswitch_proc(w, num)
+  }.place('relx'=>$xpos[num], 'rely'=>$ypos[num], 
+          'relwidth'=>0.25, 'relheight'=>0.25)
+}
+$xpos['space'] = 0.75
+$ypos['space'] = 0.75
+
+############
+def puzzleSwitch(w, num)
+  if ( ($ypos[num] >= ($ypos['space'] - 0.01))     \
+      && ($ypos[num] <= ($ypos['space'] + 0.01))   \
+      && ($xpos[num] >= ($xpos['space'] - 0.26))   \
+      && ($xpos[num] <= ($xpos['space'] + 0.26)))  \
+    || (($xpos[num] >= ($xpos['space'] - 0.01))    \
+        && ($xpos[num] <= ($xpos['space'] + 0.01)) \
+        && ($ypos[num] >= ($ypos['space'] - 0.26)) \
+        && ($ypos[num] <= ($ypos['space'] + 0.26)))
+    tmp = $xpos['space']
+    $xpos['space'] = $xpos[num]
+    $xpos[num] = tmp
+    tmp = $ypos['space']
+    $ypos['space'] = $ypos[num]
+    $ypos[num] = tmp
+    w.place('relx'=>$xpos[num], 'rely'=>$ypos[num])
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/radio.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/radio.rb
new file mode 100644
index 0000000000..5858b4222a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/radio.rb
@@ -0,0 +1,81 @@
+#
+# radiobutton widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($radio_demo) && $radio_demo
+  $radio_demo.destroy 
+  $radio_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$radio_demo = TkToplevel.new {|w|
+  title("Radiobutton Demonstration")
+  iconname("radio")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($radio_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "下には2つのラジオボタングループが表示されています。ボタンをクリックすると、そのボタンだけがそのグループの中で選択されます。各グループに対してそのグループの中のどのボタンが選択されているかを示す変数が割り当てられています。現在の変数の値を見るには「変数参照」ボタンをクリックしてください。"
+}
+msg.pack('side'=>'top')
+
+# 変数生成
+size = TkVariable.new
+color = TkVariable.new
+
+# frame 生成
+TkFrame.new($radio_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $radio_demo
+      $radio_demo = nil
+      $showVarsWin[tmppath.path] = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'radio'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text '変数参照'
+    command proc{
+      showVars($radio_demo, ['size', size], ['color', color])
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 生成
+f_left = TkFrame.new($radio_demo)
+f_right = TkFrame.new($radio_demo)
+f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
+f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
+
+# radiobutton 生成
+[10, 12, 18, 24].each {|sz|
+  TkRadioButton.new(f_left) {
+    text "ポイントサイズ #{sz}"
+    variable size
+    relief 'flat'
+    value sz
+  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
+}
+
+['赤', '緑', '青', '黄', '橙', '紫'].each {|col|
+  TkRadioButton.new(f_right) {
+    text col
+    variable color
+    relief 'flat'
+    value col.downcase
+  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
+}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/radio2.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/radio2.rb
new file mode 100644
index 0000000000..5ac877d99a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/radio2.rb
@@ -0,0 +1,107 @@
+# radio2.rb
+#
+# This demonstration script creates a toplevel window containing
+# several radiobutton widgets.
+#
+# radiobutton widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($radio2_demo) && $radio2_demo
+  $radio2_demo.destroy 
+  $radio2_demo = nil
+end
+
+# demo toplevel widget
+$radio2_demo = TkToplevel.new {|w|
+  title("Radiobutton Demonstration 2")
+  iconname("radio2")
+  positionWindow(w)
+}
+
+# label 
+msg = TkLabel.new($radio2_demo) {
+  font $font
+  wraplength '5i'
+  justify 'left'
+  text "下には3つのラジオボタングループが表示されています。ボタンをクリックすると、そのボタンだけがそのグループの中で選択されます。各グループに対してそのグループの中のどのボタンが選択されているかを示す変数が割り当てられています。現在の変数の値を見るには「変数参照」ボタンをクリックしてください。"
+}
+msg.pack('side'=>'top')
+
+# 
+size = TkVariable.new
+color = TkVariable.new
+align = TkVariable.new
+
+# frame 
+TkFrame.new($radio2_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $radio2_demo
+      $radio2_demo = nil
+      $showVarsWin[tmppath.path] = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'radio2'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text '変数参照'
+    command proc{
+      showVars($radio2_demo, 
+               ['size', size], ['color', color], ['compound', align])
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 
+f_left  = TkLabelFrame.new($radio2_demo, 'text'=>'文字サイズ', 
+                           'pady'=>2, 'padx'=>2)
+f_mid   = TkLabelFrame.new($radio2_demo, 'text'=>'色', 
+                           'pady'=>2, 'padx'=>2)
+f_right = TkLabelFrame.new($radio2_demo, 'text'=>'ビットマップ配置', 
+                           'pady'=>2, 'padx'=>2)
+f_left.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
+f_mid.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
+f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
+
+# radiobutton 
+[10, 12, 18, 24].each {|sz|
+  TkRadioButton.new(f_left) {
+    text "ポイントサイズ #{sz}"
+    variable size
+    relief 'flat'
+    value sz
+  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
+}
+
+['赤', '緑', '青', '黄', '橙', '紫'].each {|col|
+  TkRadioButton.new(f_mid) {
+    text col
+    variable color
+    relief 'flat'
+    value col.downcase
+    anchor 'w'
+  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
+}
+
+label = TkLabel.new(f_right, 'text'=>'ラベル', 'bitmap'=>'questhead', 
+                    'compound'=>'left')
+label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
+label.height(TkWinfo.reqheight(label))
+abtn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
+  lower = a.downcase
+  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat', 
+                    'value'=>lower, 'indicatoron'=>0, 'width'=>7, 
+                    'command'=>proc{label.compound(align.value)})
+}
+
+Tk.grid('x', abtn[0])
+Tk.grid(abtn[1], label, abtn[2])
+Tk.grid('x', abtn[3])
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/radio3.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/radio3.rb
new file mode 100644
index 0000000000..6e9a0f750b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/radio3.rb
@@ -0,0 +1,114 @@
+# radio3.rb
+#
+# This demonstration script creates a toplevel window containing
+# several radiobutton widgets.
+#
+# radiobutton widget demo (called by 'widget')
+#
+
+# toplevel widget
+if defined?($radio3_demo) && $radio3_demo
+  $radio3_demo.destroy 
+  $radio3_demo = nil
+end
+
+# demo toplevel widget
+$radio3_demo = TkToplevel.new {|w|
+  title("Radiobutton Demonstration 3")
+  iconname("radio3")
+  positionWindow(w)
+}
+
+# label 
+msg = TkLabel.new($radio3_demo) {
+  font $font
+  wraplength '5i'
+  justify 'left'
+  text '下には3つのラジオボタングループが表示されています。ボタンをクリックすると、そのグループに属するすべてのボタンの中でクリックしたボタンだけが選択された状態になります。各グループには、そのグループの中のどのボタンが選択されているかを示す変数が割り当てられています。「トライステート」ボタンが押されたときには、ラジオボタンの表示がトライステートモードになります。いずれかのボタンを選択すれば、ボタンの状態は元のように個々のボタンのon/off状態を示すようになります。現在の変数の値を見るには「変数参照」ボタンをクリックしてください。'
+}
+msg.grid(:row=>0, :column=>0, :columnspan=>3, :sticky=>'nsew')
+
+# variable
+size = TkVariable.new
+color = TkVariable.new
+align = TkVariable.new
+
+# frame 
+TkFrame.new($radio3_demo) {|frame|
+  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2), 
+         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x', 
+         TkButton.new(frame, :text=>'変数参照', 
+                      :image=>$image['view'], :compound=>:left, 
+                      :command=>proc{
+                        showVars($radio3_demo, ['size', size], 
+                                 ['color', color], ['compound', align])
+                      }), 
+         TkButton.new(frame, :text=>'コード参照', 
+                      :image=>$image['view'], :compound=>:left, 
+                      :command=>proc{showCode 'radio3'}), 
+         TkButton.new(frame, :text=>'閉じる', 
+                      :image=>$image['delete'], :compound=>:left, 
+                      :command=>proc{
+                        tmppath = $radio3_demo
+                        $radio3_demo = nil
+                        $showVarsWin[tmppath.path] = nil
+                        tmppath.destroy
+                      }), 
+         :padx=>4, :pady=>4)
+  frame.grid_columnconfigure(0, :weight=>1)
+  TkGrid(frame, :row=>3, :column=>0, :columnspan=>3, :sticky=>'nsew')
+}
+
+# frame 
+f_left  = TkLabelFrame.new($radio3_demo, 'text'=>'文字サイズ', 
+                           'pady'=>2, 'padx'=>2)
+f_mid   = TkLabelFrame.new($radio3_demo, 'text'=>'色', 
+                           'pady'=>2, 'padx'=>2)
+f_right = TkLabelFrame.new($radio3_demo, 'text'=>'ビットマップ配置', 
+                           'pady'=>2, 'padx'=>2)
+f_left .grid('column'=>0, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
+f_mid  .grid('column'=>1, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c', 'rowspan'=>2)
+f_right.grid('column'=>2, 'row'=>1, 'pady'=>'.5c', 'padx'=>'.5c')
+
+TkButton.new($radio3_demo, 'text'=>'トライステート', 
+             'command'=>proc{size.value = 'multi'; color.value = 'multi'}){
+  grid('column'=>2, 'row'=>2, 'pady'=>'.5c', 'padx'=>'.5c')
+}
+
+# radiobutton 
+[10, 12, 14, 18, 24].each {|sz|
+  TkRadioButton.new(f_left) {
+    text "ポイントサイズ #{sz}"
+    variable size
+    relief 'flat'
+    value sz
+    tristatevalue 'multi'
+  }.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
+}
+
+['Red', 'Green', 'Blue', 'Yellow', 'Orange', 'Purple'].each {|col|
+  TkRadioButton.new(f_mid) {
+    text col
+    variable color
+    relief 'flat'
+    value col.downcase
+    anchor 'w'
+    tristatevalue 'multi'
+    command proc{f_mid.fg(color.value)}
+  }.pack('side'=>'top', 'pady'=>2, 'fill'=>'x')
+}
+
+label = TkLabel.new(f_right, 'text'=>'ラベル', 'bitmap'=>'questhead', 
+                    'compound'=>'left')
+label.configure('width'=>TkWinfo.reqwidth(label), 'compound'=>'top')
+label.height(TkWinfo.reqheight(label))
+a_btn = ['Top', 'Left', 'Right', 'Bottom'].collect{|a|
+  TkRadioButton.new(f_right, 'text'=>a, 'variable'=>align, 'relief'=>'flat', 
+                    'value'=>a.downcase, 'indicatoron'=>0, 'width'=>7, 
+                    'command'=>proc{label.compound(align.value)})
+}
+
+Tk.grid('x', a_btn[0])
+Tk.grid(a_btn[1], label, a_btn[2])
+Tk.grid('x', a_btn[3])
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/rmt b/ruby_1_8_6/ext/tk/sample/demos-jp/rmt
new file mode 100644
index 0000000000..73f631180a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/rmt
@@ -0,0 +1,268 @@
+#!/usr/bin/env ruby
+
+# rmt -- 
+# This script implements a simple remote-control mechanism for 
+# Tk applications.  It allows you to select an application and 
+# then type commands to that application. 
+
+require 'tk'
+
+class Rmt
+  def initialize(parent=nil)
+    win = self
+
+    unless parent
+      parent = TkRoot.new
+    end
+    root = TkWinfo.toplevel(parent)
+    root.minsize(1,1)
+
+    # The instance variable below keeps track of the remote application 
+    # that we're sending to.  If it's an empty string then we execute 
+    # the commands locally. 
+    @app = 'local'
+    @mode = 'Ruby'
+
+    # The instance variable below keeps track of whether we're in the 
+    # middle of executing a command entered via the text. 
+    @executing = 0
+
+    # The instance variable below keeps track of the last command executed, 
+    # so it can be re-executed in response to !! commands. 
+    @lastCommand = ""
+
+    # Create menu bar.  Arrange to recreate all the information in the 
+    # applications sub-menu whenever it is cascaded to. 
+
+    TkFrame.new(root, 'relief'=>'raised', 'bd'=>2) {|f|
+      pack('side'=>'top', 'fill'=>'x')
+      TkMenubutton.new(f, 'text'=>'File', 'underline'=>0) {|mb|
+	TkMenu.new(mb) {|mf|
+	  mb.menu(mf)
+	  TkMenu.new(mf) {|ma| 
+	    postcommand proc{win.fillAppsMenu ma}
+	    mf.add('cascade', 'label'=>'Select Application', 
+		   'menu'=>ma, 'underline'=>0)
+	  }
+	  add('command', 'label'=>'Quit', 
+	      'command'=>proc{root.destroy}, 'underline'=>0)
+	}
+	pack('side'=>'left')
+      }
+    }
+
+    # Create text window and scrollbar. 
+
+    @txt = TkText.new(root, 'relief'=>'sunken', 'bd'=>2, 'setgrid'=>true) {
+      yscrollbar(TkScrollbar.new(root){pack('side'=>'right', 'fill'=>'y')})
+      pack('side'=>'left')
+    }
+
+    @promptEnd = TkTextMark.new(@txt, 'insert')
+
+    # Create a binding to forward commands to the target application, 
+    # plus modify many of the built-in bindings so that only information 
+    # in the current command can be deleted (can still set the cursor 
+    # earlier in the text and select and insert;  just can't delete).
+
+    @txt.bindtags([@txt, TkText, root, 'all'])
+    @txt.bind('Return', proc{
+		@txt.set_insert('end - 1c')
+		@txt.insert('insert', "\n")
+		win.invoke
+		Tk.callback_break
+	      })
+    @txt.bind('Delete', proc{
+		begin
+		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
+		rescue
+		end
+		if @txt.tag_nextrange('sel', '1.0', 'end') == []
+		  if @txt.compare('insert', '<', @promptEnd)
+		    Tk.callback_break
+		  end
+		end
+	      })
+    @txt.bind('BackSpace', proc{
+		begin
+		  @txt.tag_remove('sel', 'sel.first', @promptEnd)
+		rescue
+		end
+		if @txt.tag_nextrange('sel', '1.0', 'end') == []
+		  if @txt.compare('insert', '<', @promptEnd)
+		    Tk.callback_break
+		  end
+		end
+	      })
+    @txt.bind('Control-d', proc{
+		if @txt.compare('insert', '<', @promptEnd)
+		  Tk.callback_break
+		end
+	      })
+    @txt.bind('Control-k', proc{
+		if @txt.compare('insert', '<', @promptEnd)
+		  @txt.set_insert(@promptEnd)
+		end
+	      })
+    @txt.bind('Control-t', proc{
+		if @txt.compare('insert', '<', @promptEnd)
+		  Tk.callback_break
+		end
+	      })
+    @txt.bind('Meta-d', proc{
+		if @txt.compare('insert', '<', @promptEnd)
+		  Tk.callback_break
+		end
+	      })
+    @txt.bind('Meta-BackSpace', proc{
+		if @txt.compare('insert', '<=', @promptEnd)
+		  Tk.callback_break
+		end
+	      })
+    @txt.bind('Control-h', proc{
+		if @txt.compare('insert', '<=', @promptEnd)
+		  Tk.callback_break
+		end
+	      })
+
+    @txt.tag_configure('bold', 'font'=>['Courier', 12, 'bold'])
+
+    @app = Tk.appname('rmt')
+    if (@app =~ /^rmt(.*)$/)
+      root.title("Tk Remote Controller#{$1}")
+      root.iconname("Tk Remote#{$1}")
+    end
+    prompt
+    @txt.focus
+    #@app = TkWinfo.appname(TkRoot.new)
+  end
+
+  def tkTextInsert(w,s)
+    return if s == ""
+    begin
+      if w.compare('sel.first','<=','insert') \
+	&& w.compare('sel.last','>=','insert')
+	w.tag_remove('sel', 'sel.first', @promptEnd)
+	w.delete('sel.first', 'sel.last')
+      end
+    rescue
+    end
+    w.insert('insert', s)
+    w.see('insert')
+  end
+
+  # The method below is used to print out a prompt at the 
+  # insertion point (which should be at the beginning of a line 
+  # right now).
+
+  def prompt
+    @txt.insert('insert', "#{@app}: ")
+    @promptEnd.set('insert')
+    @promptEnd.gravity = 'left'
+    @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
+  end
+
+  # The method below executes a command (it takes everything on the 
+  # current line after the prompt and either sends it to the remote 
+  # application or executes it locally, depending on "app".
+
+  def invoke
+    cmd = @txt.get(@promptEnd, 'insert')
+    @executing += 1
+    case (@mode)
+    when 'Tcl'
+      if Tk.info('complete', cmd)
+	if (cmd == "!!\n")
+	  cmd = @lastCommand
+	else
+	  @lastCommand = cmd
+	end
+	begin
+	  msg = Tk.appsend(@app, false, cmd)
+	rescue
+	  msg = "Error: #{$!}"
+	end
+	@txt.insert('insert', msg + "\n") if msg != ""
+	prompt
+	@promptEnd.set('insert')
+      end
+
+    when 'Ruby'
+      if (cmd == "!!\n")
+	cmd = @lastCommand
+      end
+      complete = true
+      begin
+	eval("proc{#{cmd}}")
+      rescue
+	complete = false
+      end
+      if complete
+	@lastCommand = cmd
+	begin
+#	  msg = Tk.appsend(@app, false, 
+#			   'ruby', 
+#			   '"(' + cmd.gsub(/[][$"]/, '\\\\\&') + ').to_s"')
+	  msg = Tk.rb_appsend(@app, false, cmd)
+	rescue
+	  msg = "Error: #{$!}"
+	end
+	@txt.insert('insert', msg + "\n") if msg != ""
+	prompt
+	@promptEnd.set('insert')
+      end
+    end
+
+    @executing -= 1
+    @txt.yview_pickplace('insert')
+  end
+
+  # The following method is invoked to change the application that
+  # we're talking to.  It also updates the prompt for the current 
+  # command, unless we're in the middle of executing a command from 
+  # the text item (in which case a new prompt is about to be output 
+  # so there's no need to change the old one). 
+
+  def newApp(appName, mode)
+    @app = appName
+    @mode = mode
+    if @executing == 0
+      @promptEnd.gravity = 'right'
+      @txt.delete("#{@promptEnd.path} linestart", @promptEnd)
+      @txt.insert(@promptEnd, "#{appName}: ")
+      @txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
+      @promptEnd.gravity = 'left'
+    end
+  end
+
+  # The method below will fill in the applications sub-menu with a list
+  # of all the applications that currently exist. 
+
+  def fillAppsMenu(menu)
+    win = self
+    begin
+      menu.delete(0,'last')
+    rescue
+    end
+    TkWinfo.interps.sort.each{|ip|
+      begin
+	if Tk.appsend(ip, false, 'info commands ruby') == ""
+	  mode = 'Tcl'
+	else
+	  mode = 'Ruby'
+	end
+	menu.add('command', 'label'=>format("%s    (#{mode}/Tk)", ip), 
+		 'command'=>proc{win.newApp ip, mode})
+      rescue
+	menu.add('command', 'label'=>format("%s (unknown Tk)", ip), 
+		 'command'=>proc{win.newApp ip, mode}, 'state'=>'disabled')
+      end
+    }
+    menu.add('command', 'label'=>format("local    (Ruby/Tk)"), 
+	     'command'=>proc{win.newApp 'local', 'Ruby'})
+  end
+end
+
+Rmt.new
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/rolodex b/ruby_1_8_6/ext/tk/sample/demos-jp/rolodex
new file mode 100644
index 0000000000..9f87ae2829
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/rolodex
@@ -0,0 +1,320 @@
+#!/usr/bin/env ruby
+#
+# rolodex --
+# This script is a part of Tom LaStrange's rolodex
+# 
+# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
+# Time-stamp: "03/08/02 12:45:21 nagai"
+#
+
+require "tk"
+
+
+def show_help(topic,x=0,y=0)
+  if( topic.is_a?(TkWindow) )
+    w = TkWinfo.containing(x,y)
+    if( TkWinfo.exist?(w) )
+      topic = w
+    end
+  end
+  
+  if( $helpTopics.include?(topic) )
+    msg = $helpTopics[topic]
+  else
+    msg = "Sorry, but no help is available for this topic"
+  end
+  TkDialog.new("title"=>"Rolodex Help",
+	       "message"=>"Information on #{topic}:\n\n#{msg}",
+	       "default_button"=>0,
+	       "buttons"=>["OK"])
+end
+
+def fillCard
+  clearAction
+  $root.frame.entry[1].insert(0,"Takaaki Tateishi")
+  $root.frame.entry[2].insert(0,"Japan Advanced Institute of Science and Techonology")
+  $root.frame.entry[3].insert(0,"1-1 Asahidai, Tatsunokuchi")
+  $root.frame.entry[4].insert(0,"Ishikawa 923-1292, Japan")
+  $root.frame.entry[5].insert(0,"private")
+    $root.frame.entry[6].insert(0,"***-***-****")
+  $root.frame.entry[7].insert(0,"***-***-****")
+end
+
+def addAction
+  for i in 1..7
+    STDERR.print format("%-12s %s\n",
+			RolodexFrame::LABEL[i],
+			$root.frame.entry[i].value)
+  end
+end
+
+def clearAction
+  for i in 1..7
+    $root.frame.entry[i].delete(0,"end")
+  end
+end
+
+def fileAction
+  TkDialog.new("title"=>"File Selection",
+	       "message"=>"This is a dummy file selection dialog box.\n",
+	       "default_button"=>0,
+	       "buttons"=>["OK"])
+  STDERR.print "dummy file name\n"
+end
+
+def deleteAction
+  result = TkDialog.new("title"=>"Confirm Action",
+			"message"=>"Are you sure?",
+			"default_button"=>0,
+			"buttons"=>["Cancel"])
+  if( result.value == 0 )
+    clearAction
+  end
+end
+
+
+class RolodexFrame < TkFrame
+  attr_reader :entry, :label
+
+  LABEL = ["","Name:","Address:","","","Home Phone:","Work Phone:","Fax:"]
+
+  def initialize(parent=nil,keys=nil)
+    super(parent,keys)
+    self["relief"] = "flat"
+    
+    @i = []
+    @label = []
+    @entry = []
+    for i in 1..7
+      @i[i] = TkFrame.new(self)
+      @i[i].pack("side"=>"top",
+		 "pady"=>2,
+		 "anchor"=>"e")
+      @label[i] = TkLabel.new(@i[i],
+			      "text"=>LABEL[i],
+			      "anchor"=>"e")
+      @entry[i] = TkEntry.new(@i[i],
+			      "width"=>30,
+			      "relief"=>"sunken")
+      @entry[i].pack("side"=>"right")
+      @label[i].pack("side"=>"right")
+    end
+  end
+end
+
+class RolodexButtons < TkFrame
+  attr_reader :clear, :add, :search, :delete
+
+  def initialize(parent,keys=nil)
+    super(parent,keys)
+    @clear = TkButton.new(self,
+			  "text" => "Clear")
+    @add = TkButton.new(self,
+			"text" => "Add")
+    @search = TkButton.new(self,
+			   "text" => "Search")
+    @delete = TkButton.new(self,
+			   "text" => "Delete")
+    for w in [@clear,@add,@search,@delete]
+      w.pack("side"=>"left", "padx"=>2)
+    end
+  end
+end
+
+class RolodexMenuFrame < TkFrame
+  attr_reader :file_menu, :help_menu, :file, :help
+
+  def initialize(parent,keys=nil)
+    super(parent,keys)
+    configure("relief"=>"raised",
+	      "borderwidth"=>1)
+
+    @file = TkMenubutton.new(self,
+			     "text"=>"File",
+			     "underline"=>0)
+    @file_menu = TkMenu.new(@file)
+    @file_menu.add("command",
+		   "label" => "Load ...",
+		   "command" => proc{fileAction},
+		   "underline" => 0)
+    @file_menu.add("command",
+		   "label" => "Exit",
+		   "command" => proc{$root.destroy},
+		   "underline" => 0)
+    @file.menu(@file_menu)
+    @file.pack("side"=>"left")
+
+    @help = TkMenubutton.new(self,
+			     "text"=>"Help",
+			     "underline"=>0)
+    @help_menu = TkMenu.new(@help)
+    @help_menu.add("command",
+		   "label"=>"On Context...",
+		   "command"=>proc{show_help("context")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=>"On Help...",
+		   "command"=>proc{show_help("help")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=>"On Window...",
+		   "command"=>proc{show_help("window")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=>"On Keys...",
+		   "command"=>proc{show_help("keys")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=>"On version...",
+		   "command"=>proc{show_help("version")},
+		   "underline"=>3)
+    @help.menu(@help_menu)
+    @help.pack("side"=>"right")
+  end
+end
+
+class Rolodex < TkRoot
+  attr_reader :frame, :buttons, :menu
+
+  def initialize(*args)
+    super(*args)
+    @frame = RolodexFrame.new(self)
+    @frame.pack("side"=>"top",
+		"fill"=>"y",
+		"anchor"=>"center")
+    @buttons = RolodexButtons.new(self)
+    @buttons.pack("side"=>"bottom",
+		  "pady"=>2,
+		  "anchor"=>"center")
+    @menu = RolodexMenuFrame.new(self)
+    @menu.pack("before"=>@frame,
+	       "side"=>"top",
+	       "fill"=>"x")
+  end
+end
+
+$root = Rolodex.new
+
+$root.buttons.delete.configure("command"=>proc{deleteAction})
+$root.buttons.add.configure("command"=>proc{addAction})
+$root.buttons.clear.configure("command"=>proc{clearAction})
+$root.buttons.search.configure("command"=>proc{addAction; fillCard})
+
+$root.buttons.clear.configure("text"=>"Clear   Ctrl+C")
+$root.bind("Control-c",proc{clearAction})
+
+$root.buttons.add.configure("text"=>"Add   Ctrl+A")
+$root.bind("Control-a",proc{addAction})
+
+$root.buttons.search.configure("text"=>"Search   Ctrl+S")
+$root.bind("Control-s",proc{addAction; fillCard})
+
+$root.buttons.delete.configure("text"=>"Delete...   Ctrl+D")
+$root.bind("Control-d",proc{deleteAction})
+
+$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
+$root.bind("Control-f",proc{fileAction})
+
+$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
+$root.bind("Control-q",proc{$root.destroy})
+
+$root.frame.entry[1].focus
+
+$root.bind("Any-F1",
+	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
+$root.bind("Any-Help",
+	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
+
+
+$helpTopics = {}
+
+$helpTopics[$root.menu.file] = <<EOF
+This is the "file" menu. It can be used to invoke\
+some overall operations on the rolodex applications,\
+such as loading a file or exiting.
+EOF
+
+$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
+The "Load" entry in the "File" menu posts a dialog box\
+that you can use to select a rolodex file
+EOF
+
+$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
+The "Exit" entry in the "File" menu causes the rolodex\
+application to terminate
+EOF
+
+$helpTopics[$root.frame.entry[1]] = <<EOF
+In this field of the rolodex entry you should\
+type the person's name
+EOF
+
+$helpTopics[$root.frame.entry[2]] = <<EOF
+In this field of the rolodex entry you should\
+type the first line of the person's address
+EOF
+
+$helpTopics[$root.frame.entry[3]] = <<EOF
+In this field of the rolodex entry you should\
+type the second line of the person's address
+EOF
+
+$helpTopics[$root.frame.entry[4]] = <<EOF
+In this field of the rolodex entry you should\
+type the third line of the person's address
+EOF
+
+$helpTopics[$root.frame.entry[5]] = <<EOF
+In this field of the rolodex entry you should\
+type the person's home phone number, or "private"\
+if the person doesn't want his or he number publicized
+EOF
+
+$helpTopics[$root.frame.entry[6]] = <<EOF
+In this field of the rolodex entry you should\
+type the person's work phone number
+EOF
+
+$helpTopics[$root.frame.entry[7]] = <<EOF
+In this field of the rolodex entry you should\
+type the phone number for the person's FAX machine
+EOF
+
+$helpTopics["context"] = <<EOF
+Unfortunately, this application doesn't support context-sensitive\
+help in the usual way, because when this demo was written Ruby/Tk\
+didn't have a grab mechanism and this is needed for context-sensitive\
+help. Instead, you can achive much the same effect by simply moving\
+the mouse over the window you're curious about and pressing the\
+Help or F1 keys. You can do this anytime.
+EOF
+
+$helpTopics["help"] = <<EOF
+This application provides only very crude help. Besides the\
+entries in this menu, you can get help on individual windows\
+by moving the mouse cursor over the window and pressing the\
+Help or F1 keys.
+EOF
+
+$helpTopics["window"] = <<EOF
+This window is a dummy rolodex application created as part of\
+Tom LaStrange's toolkit benchmark. It doesn't really do anything\
+useful except to demonstrate a few features of the Ruby/Tk.
+EOF
+
+$helpTopics["keys"] = <<EOF
+The following accelerator keys are defined for this application\
+(in addition to those already available for the entry windows):
+Ctrl+A:		Add
+Ctrl+C:		Clear
+Ctrl+D:		Delete
+Ctrl+F:		Enter file name
+Ctrl+Q:		Exit application (quit)
+Ctrl+S:		Search (dummy operation)
+EOF
+
+$helpTopics["version"] = <<EOF
+This is version 1.0.1.
+EOF
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/rolodex-j b/ruby_1_8_6/ext/tk/sample/demos-jp/rolodex-j
new file mode 100644
index 0000000000..dcc18cfa51
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/rolodex-j
@@ -0,0 +1,299 @@
+#!/usr/bin/env ruby
+#
+# rolodex --
+# このスクリプトは Tom LaStrange の rolodex の一部です。
+# 
+# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
+# Time-stamp: "04/04/09 00:32:12 nagai"
+#
+
+require "tk"
+Tk.encoding = "euc-jp"
+
+def show_help(topic,x=0,y=0)
+  if( topic.is_a?(TkWindow) )
+    w = TkWinfo.containing(x,y)
+    if( w.is_a?(TkWindow) )
+      if( TkWinfo.exist?(w) )
+	topic = w
+      end
+    end
+  end
+  
+  if( $helpTopics.include?(topic) )
+    msg = $helpTopics[topic]
+  else
+    msg = "このトピックについてのヘルプはまだ使用できません"
+  end
+  TkDialog.new("title"=>"Rolodex Help",
+	       "message"=>"「#{topic}」\n\n#{msg}",
+	       "default_button"=>0,
+	       "buttons"=>["OK"])
+end
+
+def fillCard
+  clearAction
+  $root.frame.entry[1].insert(0, "立石 孝彰")
+  $root.frame.entry[2].insert(0, "923-1292 石川県")
+  $root.frame.entry[3].insert(0, "辰口町 旭台 1-1")
+  $root.frame.entry[4].insert(0, "北陸先端科学技術大学院大学")
+  $root.frame.entry[5].insert(0,"private")
+  $root.frame.entry[6].insert(0,"***-***-****")
+  $root.frame.entry[7].insert(0,"***-***-****")
+end
+
+def addAction
+  for i in 1..7
+    STDERR.print format("%-12s %s\n",
+			RolodexFrame::LABEL[i],
+			$root.frame.entry[i].value)
+  end
+end
+
+def clearAction
+  for i in 1..7
+    $root.frame.entry[i].delete(0,"end")
+  end
+end
+
+def fileAction
+  TkDialog.new("title"=>"File Selection",
+	       "message"=>"これはファイル選択ダイアログのダミーです。\n",
+	       "default_button"=>0,
+	       "buttons"=>["OK"])
+  STDERR.print "dummy file name\n"
+end
+
+def deleteAction
+  result = TkDialog.new("title"=>"Confirm Action",
+			"message"=>"よろしいですか？",
+			"default_button"=>0,
+			"buttons"=>["キャンセル"])
+  if( result.value == 0 )
+    clearAction
+  end
+end
+
+
+class RolodexFrame < TkFrame
+  attr_reader :entry, :label
+
+  LABEL = ["","名前:","住所","","","電話(自宅):","電話(会社):","Fax:"]
+
+  def initialize(parent=nil,keys=nil)
+    super(parent,keys)
+    self["relief"] = "flat"
+    @i = []
+    @label = []
+    @entry = []
+    for i in 1..7
+      @i[i] = TkFrame.new(self)
+      @i[i].pack("side"=>"top",
+		 "pady"=>2,
+		 "anchor"=>"e")
+      @label[i] = TkLabel.new(@i[i],
+			      "text"=>LABEL[i],
+			      "anchor"=>"e")
+      @entry[i] = TkEntry.new(@i[i],
+			      "width"=>30,
+			      "relief"=>"sunken")
+      @entry[i].pack("side"=>"right")
+      @label[i].pack("side"=>"right")
+    end
+  end
+end
+
+class RolodexButtons < TkFrame
+  attr_reader :clear, :add, :search, :delete
+
+  def initialize(parent,keys=nil)
+    super(parent,keys)
+    @clear = TkButton.new(self,"text" => "クリアー")
+    @add = TkButton.new(self,  "text" => "追加")
+    @search = TkButton.new(self, "text" => "検索")
+    @delete = TkButton.new(self,  "text" => "消去")
+    for w in [@clear,@add,@search,@delete]
+      w.pack("side"=>"left", "padx"=>2)
+    end
+  end
+end
+
+class RolodexMenuFrame < TkFrame
+  attr_reader :file_menu, :help_menu, :file, :help
+
+  def initialize(parent,keys=nil)
+    super(parent,keys)
+    configure("relief"=>"raised",
+	      "borderwidth"=>1)
+
+    @file = TkMenubutton.new(self,
+			     "text"=> "ファイル",
+			     "underline"=>0)
+    @file_menu = TkMenu.new(@file)
+    @file_menu.add("command",
+		   "label" => "読み込み ...",
+		   "command" => proc{fileAction},
+		   "underline" => 0)
+    @file_menu.add("command",
+		   "label" => "終了",
+		   "command" => proc{$root.destroy},
+		   "underline" => 0)
+    @file.menu(@file_menu)
+    @file.pack("side"=>"left")
+
+    @help = TkMenubutton.new(self,
+			     "text"=> "ヘルプ",
+			     "underline"=>0)
+    @help_menu = TkMenu.new(@help)
+    @help_menu.add("command",
+		   "label"=> "コンテキストについて",
+		   "command"=>proc{show_help("コンテキスト")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=> "ヘルプについて",
+		   "command"=>proc{show_help("ヘルプ")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=> "ウィンドウについて",
+		   "command"=>proc{show_help("ウィンドウ")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=> "キー操作について",
+		   "command"=>proc{show_help("キー操作")},
+		   "underline"=>3)
+    @help_menu.add("command",
+		   "label"=> "バージョン情報",
+		   "command"=>proc{show_help("バージョン情報")},
+		   "underline"=>3)
+    @help.menu(@help_menu)
+    @help.pack("side"=>"right")
+  end
+end
+
+class Rolodex < TkRoot
+  attr_reader :frame, :buttons, :menu
+
+  def initialize(*args)
+    super(*args)
+    @frame = RolodexFrame.new(self)
+    @frame.pack("side"=>"top",
+		"fill"=>"y",
+		"anchor"=>"center")
+    @buttons = RolodexButtons.new(self)
+    @buttons.pack("side"=>"bottom",
+		  "pady"=>2,
+		  "anchor"=>"center")
+    @menu = RolodexMenuFrame.new(self)
+    @menu.pack("before"=>@frame,
+	       "side"=>"top",
+	       "fill"=>"x")
+  end
+end
+
+$root = Rolodex.new
+
+$root.buttons.delete.configure("command"=>proc{deleteAction})
+$root.buttons.add.configure("command"=>proc{addAction})
+$root.buttons.clear.configure("command"=>proc{clearAction})
+$root.buttons.search.configure("command"=>proc{addAction; fillCard})
+
+$root.buttons.clear.configure("text"=> "クリアー   Ctrl+C")
+$root.bind("Control-c",proc{clearAction})
+
+$root.buttons.add.configure("text"=> "追加   Ctrl+A")
+$root.bind("Control-a",proc{addAction})
+
+$root.buttons.search.configure("text"=> "検索   Ctrl+S")
+$root.bind("Control-s",proc{addAction; fillCard})
+
+$root.buttons.delete.configure("text"=> "消去   Ctrl+D")
+$root.bind("Control-d",proc{deleteAction})
+
+$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
+$root.bind("Control-f",proc{fileAction})
+
+$root.menu.file_menu.entryconfigure(2, "accel"=>"Ctrl+Q")
+$root.bind("Control-q",proc{$root.destroy})
+
+$root.frame.entry[1].focus
+
+$root.bind("Any-F1",
+	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
+$root.bind("Any-Help",
+	   proc{|event| show_help(event.widget, event.x_root, event.y_root)})
+
+
+$helpTopics = {}
+
+$helpTopics[$root.menu.file] = <<EOF
+これは「ファイル」メニューです。「読み込み」や「終了」などを
+行なうことができます。
+EOF
+
+$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
+ファイルの読み込みを行なうときに使います。
+EOF
+
+$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
+アプリケーションを終了するときに使います。
+EOF
+
+$helpTopics[$root.frame.entry[1]] = <<EOF
+名前を記入するエントリです。
+EOF
+
+$helpTopics[$root.frame.entry[2]] = <<EOF
+住所を記入するエントリです。
+EOF
+
+$helpTopics[$root.frame.entry[3]] = <<EOF
+住所を記入するエントリです。
+EOF
+
+$helpTopics[$root.frame.entry[4]] = <<EOF
+住所を記入するエントリです。
+EOF
+
+$helpTopics[$root.frame.entry[5]] = <<EOF
+自宅の電話番号を記入するエントリです。公開\
+したくないときは private と記入します。
+EOF
+
+$helpTopics[$root.frame.entry[6]] = <<EOF
+会社の電話番号を記入するエントリです。
+EOF
+
+$helpTopics[$root.frame.entry[7]] = <<EOF
+FAX番号を記入するエントリです。
+EOF
+
+$helpTopics["コンテキスト"] = <<EOF
+Ruby/Tkではgrabの機構がないためこのアプリケーションでは\
+コンテキストヘルプはサポートされていません。
+しかし同じような効果をbindとマウスの位置のWedgetを知る\
+ことで得ることができます。
+EOF
+
+$helpTopics["ヘルプ"] = <<EOF
+マウスをウィンドウにあわせてF1キーを押すことによって\
+そのヘルプを見ることができます。
+EOF
+
+$helpTopics["ウィンドウ"] = <<EOF
+このウィンドウはダミーです。
+EOF
+
+$helpTopics["キー操作"] = <<EOF
+Ctrl+A:		追加
+Ctrl+C:		クリアー
+Ctrl+D:		消去
+Ctrl+F:		ファイル選択
+Ctrl+Q:		終了
+Ctrl+S:		検索
+EOF
+
+$helpTopics["バージョン情報"] = <<EOF
+バージョンは 1.0.1j です。
+EOF
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/ruler.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/ruler.rb
new file mode 100644
index 0000000000..94b4c921d3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/ruler.rb
@@ -0,0 +1,200 @@
+#
+# ruler widget demo (called by 'widget')
+#
+
+# rulerMkTab --
+# This method creates a new triangular polygon in a canvas to
+# represent a tab stop.
+#
+# Arguments:
+# c -           The canvas window.
+# x, y -        Coordinates at which to create the tab stop.
+
+def rulerMkTab(c,x,y)
+  v = $demo_rulerInfo
+  TkcPolygon.new(c, x, y, x+v.size, y+v.size, x-v.size, y+v.size)
+end
+
+# toplevel widget が存在すれば削除する
+if defined?($ruler_demo) && $ruler_demo
+  $ruler_demo.destroy 
+  $ruler_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$ruler_demo = TkToplevel.new {|w|
+  title("Ruler Demonstration")
+  iconname("ruler")
+  positionWindow(w)
+}
+
+# label 生成
+TkLabel.new($ruler_demo, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left', 
+            'text'=>"このキャンバスwidgetはルーラーの模型です。ルーラーの右にあるのはタブストップの井戸で、ここから引っ張ってくることによってタブストップを作ることができます。また、すでにあるタブストップを動かすこともできます。タブストップを上方または下方にかすれて表示されるまでドラッグすると、マウスボタンを離した時にそのタブストップは消えます。"){
+  pack('side'=>'top')
+}
+
+# frame 生成
+$ruler_buttons = TkFrame.new($ruler_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $ruler_demo
+      $ruler_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'ruler'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$ruler_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# canvas 設定
+$ruler_canvas = TkCanvas.new($ruler_demo, 'width'=>'14.8c', 'height'=>'2.5c')
+$ruler_canvas.pack('side'=>'top', 'fill'=>'x')
+
+# 値設定
+unless Struct.const_defined?("RulerInfo")
+  $demo_rulerInfo = Struct.new("RulerInfo", :grid, :left, :right, :x, :y, 
+                               :top, :bottom, :size, :normalStyle, 
+                               :activeStyle, :deleteStyle).new
+end
+$demo_rulerInfo.grid = '.25c'
+$demo_rulerInfo.left = TkWinfo.fpixels($ruler_canvas, '1c')
+$demo_rulerInfo.right = TkWinfo.fpixels($ruler_canvas, '13c')
+$demo_rulerInfo.top = TkWinfo.fpixels($ruler_canvas, '1c')
+$demo_rulerInfo.bottom = TkWinfo.fpixels($ruler_canvas, '1.5c')
+$demo_rulerInfo.size = TkWinfo.fpixels($ruler_canvas, '.2c')
+$demo_rulerInfo.normalStyle = {'fill'=>'black'}
+if TkWinfo.depth($ruler_canvas) > 1
+  $demo_rulerInfo.activeStyle = {'fill'=>'red', 'stipple'=>''}
+  $demo_rulerInfo.deleteStyle = {'fill'=>'red', 
+    'stipple'=>'@'+[$demo_dir, '..', 
+                     'images', 'gray25.xbm'].join(File::Separator)}
+else
+  $demo_rulerInfo.activeStyle = {'fill'=>'black', 'stipple'=>''}
+  $demo_rulerInfo.deleteStyle = {'fill'=>'black', 
+    'stipple'=>'@'+[$demo_dir, '..', 
+                     'images', 'gray25.xbm'].join(File::Separator)}
+end
+
+TkcLine.new($ruler_canvas, 
+            '1c', '0.5c', '1c', '1c', '13c', '1c', '13c', '0.5c', 'width'=>1)
+(0..11).each{|i|
+  x = i+1
+  TkcLine.new($ruler_canvas, "#{x}c", '1c', "#{x}c", '0.6c', 'width'=>1)
+  TkcLine.new($ruler_canvas, "#{x}.25c", '1c', "#{x}.25c", '0.8c', 'width'=>1)
+  TkcLine.new($ruler_canvas, "#{x}.5c", '1c', "#{x}.5c", '0.7c', 'width'=>1)
+  TkcLine.new($ruler_canvas, "#{x}.75c", '1c', "#{x}.75c", '0.8c', 'width'=>1)
+  TkcText.new($ruler_canvas, "#{x}.15c", '0.75c', 'text'=>i, 'anchor'=>'sw')
+}
+
+$rulerTag_well = TkcTag.new($ruler_canvas)
+$ruler_canvas\
+.addtag_withtag($rulerTag_well,
+                TkcRectangle.new($ruler_canvas, 
+                                 '13.2c', '1c', '13.8c', '0.5c', 
+                                 'outline'=>'black', 
+                                 'fill'=>($ruler_canvas\
+                                          .configinfo('background'))[4]) )
+$ruler_canvas\
+.addtag_withtag($rulerTag_well,
+                rulerMkTab($ruler_canvas, 
+                           TkWinfo.pixels($ruler_canvas, '13.5c'), 
+                           TkWinfo.pixels($ruler_canvas, '.65c') ) )
+
+$rulerTag_well.bind('1', proc{|x,y| rulerNewTab($ruler_canvas,x,y)}, '%x %y')
+$ruler_canvas.itembind('tab', '1', 
+                       proc{|x,y| rulerSelectTab($ruler_canvas,x,y)}, '%x %y')
+$ruler_canvas.bind('B1-Motion', 
+                   proc{|x,y| rulerMoveTab($ruler_canvas,x,y)}, '%x %y')
+$ruler_canvas.bind('Any-ButtonRelease-1', proc{rulerReleaseTab($ruler_canvas)})
+
+# rulerNewTab --
+# Does all the work of creating a tab stop, including creating the
+# triangle object and adding tags to it to give it tab behavior.
+#
+# Arguments:
+# c -           The canvas window.
+# x, y -        The coordinates of the tab stop.
+
+def rulerNewTab(c,x,y)
+  v = $demo_rulerInfo
+  c.addtag_withtag('active', rulerMkTab(c,x,y))
+  c.addtag_withtag('tab', 'active')
+  v.x = x
+  v.y = y
+  rulerMoveTab(c,x,y)
+end
+
+# rulerSelectTab --
+# This method is invoked when mouse button 1 is pressed over
+# a tab.  It remembers information about the tab so that it can
+# be dragged interactively.
+#
+# Arguments:
+# c -           The canvas widget.
+# x, y -        The coordinates of the mouse (identifies the point by
+#               which the tab was picked up for dragging).
+
+def rulerSelectTab(c,x,y)
+  v = $demo_rulerInfo
+  v.x = c.canvasx(x, v.grid)
+  v.y = v.top+2
+  c.addtag_withtag('active', 'current')
+  c.itemconfigure('active', v.activeStyle)
+  c.raise('active')
+end
+
+# rulerMoveTab --
+# This method is invoked during mouse motion events to drag a tab.
+# It adjusts the position of the tab, and changes its appearance if
+# it is about to be dragged out of the ruler.
+#
+# Arguments:
+# c -           The canvas widget.
+# x, y -        The coordinates of the mouse.
+
+def rulerMoveTab(c,x,y)
+  v = $demo_rulerInfo
+  return if c.find_withtag('active') == []
+  cx = c.canvasx(x,v.grid)
+  cy = c.canvasy(y)
+  cx = v.left if cx < v.left
+  cx = v.right if cx > v.right
+  if (cy >= v.top && cy <= v.bottom)
+    cy = v.top+2
+    c.itemconfigure('active', v.activeStyle)
+  else
+    cy = cy-v.size-2
+    c.itemconfigure('active', v.deleteStyle)
+  end
+  c.move('active', cx-v.x, cy-v.y)
+  v.x = cx
+  v.y = cy
+end
+
+# rulerReleaseTab --
+# This method is invoked during button release events that end
+# a tab drag operation.  It deselects the tab and deletes the tab if
+# it was dragged out of the ruler.
+#
+# Arguments:
+# c -           The canvas widget.
+# x, y -        The coordinates of the mouse.
+
+def rulerReleaseTab(c)
+  v = $demo_rulerInfo
+  return if c.find_withtag('active') == []
+  if v.y != v.top+2
+    c.delete('active')
+  else
+    c.itemconfigure('active', v.normalStyle)
+    c.dtag('active')
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/sayings.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/sayings.rb
new file mode 100644
index 0000000000..ce195a0e53
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/sayings.rb
@@ -0,0 +1,100 @@
+#
+# listbox widget demo 'sayings' (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($sayings_demo) && $sayings_demo
+  $sayings_demo.destroy 
+  $sayings_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$sayings_demo = TkToplevel.new {|w|
+  title("Listbox Demonstration (well-known sayings)")
+  iconname("sayings")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($sayings_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "下のリストボックスにはいろいろな格言が入っています。リストをスクロールさせるのはスクロールバーでもできますし、リストボックスの中でマウスのボタン2(中ボタン)を押したままドラッグしてもできます。"
+}
+msg.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($sayings_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $sayings_demo
+      $sayings_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'sayings'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 生成
+sayings_lbox = nil
+TkFrame.new($sayings_demo, 'borderwidth'=>10) {|w|
+  sv = TkScrollbar.new(w)
+  sh = TkScrollbar.new(w, 'orient'=>'horizontal')
+  sayings_lbox = TkListbox.new(w) {
+    setgrid 1
+    width  20
+    height 10
+    yscrollcommand proc{|first,last| sv.set first,last}
+    xscrollcommand proc{|first,last| sh.set first,last}
+  }
+  sv.command(proc{|*args| sayings_lbox.yview(*args)})
+  sh.command(proc{|*args| sayings_lbox.xview(*args)})
+
+  if $tk_version =~ /^4\.[01]/
+    sv.pack('side'=>'right', 'fill'=>'y')
+    sh.pack('side'=>'bottom', 'fill'=>'x')
+    sayings_lbox.pack('expand'=>'yes', 'fill'=>'y')
+
+  else
+    sayings_lbox.grid('row'=>0, 'column'=>0, 
+                      'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    sv.grid('row'=>0, 'column'=>1, 
+            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    sh.grid('row'=>1, 'column'=>0, 
+            'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+    TkGrid.rowconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
+    TkGrid.columnconfigure(w, 0, 'weight'=>1, 'minsize'=>0)
+  end
+
+}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
+
+sayings_lbox.insert(0,
+"Waste not, want not",
+"Early to bed and early to rise makes a man healthy, wealthy, and wise",
+"Ask not what your country can do for you, ask what you can do for your country",
+"I shall return",
+"NOT",
+"A picture is worth a thousand words",
+"User interfaces are hard to build",
+"Thou shalt not steal",
+"A penny for your thoughts",
+"Fool me once, shame on you;  fool me twice, shame on me",
+"Every cloud has a silver lining",
+"Where there's smoke there's fire",
+"It takes one to know one",
+"Curiosity killed the cat",
+"Take this job and shove it",
+"Up a creek without a paddle",
+"I'm mad as hell and I'm not going to take it any more",
+"An apple a day keeps the doctor away",
+"Don't look a gift horse in the mouth"
+)
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/search.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/search.rb
new file mode 100644
index 0000000000..f5268f987f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/search.rb
@@ -0,0 +1,176 @@
+#
+# Text Search widget demo (called by 'widget')
+#
+
+# textLoadFile --
+# This method below loads a file into a text widget, discarding
+# the previous contents of the widget. Tags for the old widget are
+# not affected, however.
+#
+# Arguments:
+# w -           The window into which to load the file.  Must be a
+#               text widget.
+# file -        The name of the file to load.  Must be readable.
+
+def textLoadFile(w,file)
+  w.delete('1.0', 'end')
+  f = open(file, 'r')
+  while(!f.eof?)
+    w.insert('end', f.read(1000))
+  end
+  f.close
+end
+
+# textSearch --
+# Search for all instances of a given string in a text widget and
+# apply a given tag to each instance found.
+#
+# Arguments:
+# w -           The window in which to search.  Must be a text widget.
+# string -      The string to search for.  The search is done using
+#               exact matching only;  no special characters.
+# tag -         Tag to apply to each instance of a matching string.
+
+def textSearch(w, string, tag)
+  tag.remove('0.0', 'end')
+  return if string == ""
+  cur = '1.0'
+  loop {
+    cur, len = w.search_with_length(string, cur, 'end')
+    break if cur == ""
+    tag.add(cur, "#{cur} + #{len} char")
+    cur = w.index("#{cur} + #{len} char")
+  }
+end
+
+# textToggle --
+# This method is invoked repeatedly to invoke two commands at
+# periodic intervals.  It normally reschedules itself after each
+# execution but if an error occurs (e.g. because the window was
+# deleted) then it doesn't reschedule itself.
+#
+# Arguments:
+# cmd1 -        Command to execute when method is called.
+# sleep1 -      Ms to sleep after executing cmd1 before executing cmd2.
+# cmd2 -        Command to execute in the *next* invocation of this method.
+# sleep2 -      Ms to sleep after executing cmd2 before executing cmd1 again.
+
+def textToggle(cmd1,sleep1,cmd2,sleep2)
+  sleep_list = [sleep2, sleep1]
+  TkAfter.new(proc{sleep = sleep_list.shift; sleep_list.push(sleep); sleep}, 
+              -1, cmd1, cmd2).start(sleep1)
+end
+
+# toplevel widget が存在すれば削除する
+if defined?($search_demo) && $search_demo
+  $search_demo.destroy 
+  $search_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$search_demo = TkToplevel.new {|w|
+  title("Text Demonstration - Search and Highlight")
+  iconname("search")
+  positionWindow(w)
+}
+
+# frame 生成
+$search_buttons = TkFrame.new($search_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $search_demo
+      $search_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'search'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 生成
+TkFrame.new($search_demo) {|f|
+  TkLabel.new(f, 'text'=>'ファイル名:', 
+              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
+  $search_fileName = TkVariable.new
+  TkEntry.new(f, 'width'=>40, 
+              'textvariable'=>$search_fileName) {
+    pack('side'=>'left')
+    bind('Return', proc{textLoadFile($search_text, $search_fileName.value)
+                        $search_string_entry.focus})
+    focus
+  }
+  TkButton.new(f, 'text'=>'読み込み', 
+               'command'=>proc{textLoadFile($search_text, 
+                                            $search_fileName.value)})\
+  .pack('side'=>'left', 'pady'=>5, 'padx'=>10)
+}.pack('side'=>'top', 'fill'=>'x')
+
+TkFrame.new($search_demo) {|f|
+  TkLabel.new(f, 'text'=>'検索文字列:', 
+              'width'=>13, 'anchor'=>'w').pack('side'=>'left')
+  $search_searchString = TkVariable.new
+  $search_string_entry = TkEntry.new(f, 'width'=>40, 
+                                     'textvariable'=>$search_searchString) {
+    pack('side'=>'left')
+    bind('Return', proc{textSearch($search_text, $search_searchString.value, 
+                                   $search_Tag)})
+  }
+  TkButton.new(f, 'text'=>'反転', 
+               'command'=>proc{textSearch($search_text, 
+                                          $search_searchString.value, 
+                                          $search_Tag)}) {
+    pack('side'=>'left', 'pady'=>5, 'padx'=>10)
+  }
+}.pack('side'=>'top', 'fill'=>'x')
+
+$search_text = TkText.new($search_demo, 'setgrid'=>true) {|t|
+  $search_Tag = TkTextTag.new(t)
+  TkScrollbar.new($search_demo, 'command'=>proc{|*args| t.yview(*args)}) {|sc|
+    t.yscrollcommand(proc{|first,last| sc.set first,last})
+    pack('side'=>'right', 'fill'=>'y')
+  }
+  pack('expand'=>'yes', 'fill'=>'both')
+}  
+
+# Set up display styles for text highlighting.
+
+if TkWinfo.depth($search_demo) > 1
+  textToggle(proc{
+               $search_Tag.configure('background'=>'#ce5555', 
+                                     'foreground'=>'white')
+             },
+             800, 
+             proc{
+               $search_Tag.configure('background'=>'', 'foreground'=>'')
+             },
+             200 )
+else
+  textToggle(proc{
+               $search_Tag.configure('background'=>'black', 
+                                     'foreground'=>'white')
+             },
+             800, 
+             proc{
+               $search_Tag.configure('background'=>'', 'foreground'=>'')
+             },
+             200 )
+end
+$search_text.insert('1.0', "\
+このウィンドウは検索機構を実現するのにテキスト widget のタグ機能がどの \
+ように使われるのかをデモするものです。まず上のエントリにファイル名を入 \
+れ、<リターン> を押すか「ロード」ボタンを押してください。次にその下の \
+エントリに文字列を入力し、<リターン> を押すか「反転」ボタンを押してく \
+ださい。するとファイル中の、検索文字列と一致する部分に全て \"search_Tag\" \
+というタグがつけられ、タグの表示属性としてその文字列が点滅するように \
+設定されます。")
+$search_text.set_insert '0.0'
+
+$search_fileName.value = ''
+$search_searchString.value = ''
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/spin.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/spin.rb
new file mode 100644
index 0000000000..c7b8096723
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/spin.rb
@@ -0,0 +1,67 @@
+# spin.rb --
+#
+# This demonstration script creates several spinbox widgets.
+#
+# based on Tcl/Tk8.4.4 widget demos
+
+if defined?($spin_demo) && $spin_demo
+  $spin_demo.destroy 
+  $spin_demo = nil
+end
+
+$spin_demo = TkToplevel.new {|w|
+  title("Spinbox Demonstration")
+  iconname("spin")
+  positionWindow(w)
+}
+
+TkLabel.new($spin_demo, 
+            :font=>$font, :wraplength=>'5i', :justify=>:left, 
+            :text=><<EOL).pack(:side=>:top)
+下には３種類のスピンボックスが表示されています。\
+それぞれ、マウスで選択して文字を入力することができます。
+編集操作としては、Emacs 形式の多くに加えて、一般的な
+Motif 形式のキー操作がサポートされています。たとえば、
+Backspace と Control-h とは入力カーソルの左側の文字を
+削除し、Delete と Control-d とは右側の文字を削除します。
+入力枠の長さを越えるような長い文字列を入力した場合には、
+マウスのボタン２を押してドラッグすることで、入力文字列
+をスキャンすることが可能です。
+なお、最初のスピンボックスは、整数値とみなされるような
+文字列しか入力が許されないことに注意してください。また、
+３番目のスピンボックスで選択候補に現れるのはオーストラ
+リアの都市名のリストとなっています。
+もしあなたが使っている Ruby にリンクされている Tk ライ
+ブラリが spinbox ウィジェットを実装していない場合、この
+デモはうまく動かないはずです。その場合には spinbox ウィ
+ジェットが実装されているようなより新しいバージョンの Tk 
+を組み合わせて試すようにしてください。
+EOL
+
+TkFrame.new($spin_demo){|f|
+  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
+
+  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
+                 $spin_demo.destroy
+                 $spin_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
+                 showCode 'spin'
+               }).pack(:side=>:left, :expand=>true)
+}
+
+australianCities = [
+    'Canberra', 'Sydney', 'Melbourne', 'Perth', 'Adelaide', 
+    'Brisbane', 'Hobart', 'Darwin', 'Alice Springs'
+]
+
+[
+  TkSpinbox.new($spin_demo, :from=>1, :to=>10, :width=>10, :validate=>:key, 
+                :validatecommand=>[
+                  proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
+                ]), 
+  TkSpinbox.new($spin_demo, :from=>0, :to=>3, :increment=>0.5, 
+                :format=>'%05.2f', :width=>10), 
+  TkSpinbox.new($spin_demo, :values=>australianCities, :width=>10)
+].each{|sbox| sbox.pack(:side=>:top, :pady=>5, :padx=>10)}
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/square b/ruby_1_8_6/ext/tk/sample/demos-jp/square
new file mode 100644
index 0000000000..00bfde59ff
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/square
@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+
+# square --
+# This script generates a demo application containing only 
+# a "square" widget.  It's only usable if Tk has been compiled 
+# with tkSquare.c and with the -DSQUARE_DEMO compiler switch. 
+# This demo arranges the following bindings for the widget: 
+#
+# Button-1 press/drag:          moves square to mouse
+# "a":                          toggle size animation on/off
+#
+
+require 'tk'
+require 'tkafter'
+
+class TkSquare<TkWindow
+  def create_self
+    begin
+      tk_call 'square', path
+    rescue
+      STDERR.print "\nSorry. Your Tk interpreter does not contain " +
+	'a "square" demonstration widget.' + 
+	"\n ( See documents included the Tcl/Tk source archive. )\n\n"
+      exit
+    end
+  end
+  def size(amount=nil)
+    if amount
+      tk_send 'size', amount
+    else
+      number(tk_send('size'))
+    end
+  end
+  def position(x,y)
+    tk_send 'position', x, y
+  end
+end
+
+$s = TkSquare.new{
+  pack('expand'=>'yes', 'fill'=>'both')
+  bind('1', proc{|x,y| center(x,y)}, '%s %y')
+  bind('B1-Motion', proc{|x,y| center(x,y)}, '%s %y')
+  bind('a', proc{animate})
+  focus
+}
+TkRoot.new.minsize(1,1)
+
+# The procedure below centers the square on a given position.
+
+def center(x,y)
+  a = $s.size
+  $s.position(x-(a/2), y-(a/2))
+end
+
+# The procedures below provide a simple form of animation where
+# the box changes size in a pulsing pattern: larger, smaller, larger, 
+# and so on.
+
+$inc = 0
+
+def timer_proc
+  a = $s.size
+  return if $inc == 0
+  $inc = -3 if a >= 40
+  $inc =  3 if a <= 10
+  $s.size(a+$inc)
+end
+
+$timer = TkAfter.new(30, -1, proc{timer_proc})
+
+def animate
+  if $inc == 0
+    $inc = 3
+    $timer.start
+  else
+    $inc = 0
+    $timer.stop
+  end
+end
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/states.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/states.rb
new file mode 100644
index 0000000000..dfae821261
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/states.rb
@@ -0,0 +1,71 @@
+#
+# listbox widget demo 'states' (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($states_demo) && $states_demo
+  $states_demo.destroy 
+  $states_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$states_demo = TkToplevel.new {|w|
+  title("Listbox Demonstration (states)")
+  iconname("states")
+  positionWindow(w)
+}
+
+# label 生成
+msg = TkLabel.new($states_demo) {
+  font $font
+  wraplength '4i'
+  justify 'left'
+  text "下にあるのは都道府県名が入ったスクロールバー付のリストボックスです。リストをスクロールさせるのはスクロールバーでもできますし、リストボックスの中でマウスのボタン2(中ボタン)を押したままドラッグしてもできます。"
+}
+msg.pack('side'=>'top')
+
+# frame 生成
+TkFrame.new($states_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $states_demo
+      $states_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'states'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 生成
+states_lbox = nil
+TkFrame.new($states_demo, 'borderwidth'=>'.5c') {|w|
+  s = TkScrollbar.new(w)
+  states_lbox = TkListbox.new(w) {
+    setgrid 1
+    height 12
+    yscrollcommand proc{|first,last| s.set first,last}
+  }
+  s.command(proc{|*args| states_lbox.yview(*args)})
+  s.pack('side'=>'right', 'fill'=>'y')
+  states_lbox.pack('side'=>'left', 'expand'=>1, 'fill'=>'both')
+}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
+
+ins_data = [
+  '愛知','青森','秋田','石川','茨城','岩手','愛媛',
+  '大分','大阪','岡山','沖縄','香川','鹿児島','神奈川',
+  '岐阜','京都','熊本','群馬','高知','埼玉','佐賀',
+  '滋賀','静岡','島根','千葉','東京','徳島','栃木',
+  '鳥取','富山','長崎','長野','奈良','新潟','兵庫',
+  '広島','福井','福岡','福島','北海道','三重','宮城',
+  '宮崎','山形','山口','山梨','和歌山'
+]
+
+states_lbox.insert(0, *ins_data)
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/style.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/style.rb
new file mode 100644
index 0000000000..59e406bc80
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/style.rb
@@ -0,0 +1,248 @@
+#
+# text (display styles) widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($style_demo) && $style_demo
+  $style_demo.destroy 
+  $style_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$style_demo = TkToplevel.new {|w|
+  title("Text Demonstration - Display Styles")
+  iconname("style")
+  positionWindow(w)
+}
+
+# frame 生成
+TkFrame.new($style_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $style_demo
+      $style_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'style'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# text 生成
+TkText.new($style_demo){|t|
+  # 生成
+  setgrid 'true'
+  width  70
+  height 32
+  wrap 'word'
+  TkScrollbar.new($style_demo) {|s|
+    pack('side'=>'right', 'fill'=>'y')
+    command proc{|*args| t.yview(*args)}
+    t.yscrollcommand proc{|first,last| s.set first,last}
+  }
+  pack('expand'=>'yes', 'fill'=>'both')
+
+  # テキストタグ設定 (フォント関連)
+  style_tag_bold = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-O-Normal--*-120-*-*-*-*-*-*')
+  style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
+    style_tag_verybig = TkTextTag.new(t, 'font'=>'-*-Helvetica-Bold-R-Normal--*-240-*-*-*-*-*-*')
+#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
+    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*')
+###
+#  case($tk_version)
+#  when /^4.*/
+#    style_tag_big = TkTextTag.new(t, 'font'=>'-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*', 'kanjifont'=>$msg_kanji_font)
+#    style_tag_small = TkTextTag.new(t, 'font'=>'-Adobe-Helvetica-Bold-R-Normal-*-100-*', 'kanjifont'=>$kanji_font)
+#  when /^8.*/
+#    unless $style_demo_do_first
+#      $style_demo_do_first = true
+#      Tk.tk_call('font', 'create', '@bigascii', 
+#                '-copy', '-*-Courier-Bold-R-Normal--*-140-*-*-*-*-*-*')
+#      Tk.tk_call('font', 'create', '@smallascii', 
+#                '-copy', '-Adobe-Helvetica-Bold-R-Normal-*-100-*')
+#      Tk.tk_call('font', 'create', '@cBigFont', 
+#                '-compound', '@bigascii @msg_knj')
+#      Tk.tk_call('font', 'create', '@cSmallFont', 
+#                '-compound', '@smallascii @kanji')
+#    end
+#    style_tag_big = TkTextTag.new(t, 'font'=>'@cBigFont')
+#    style_tag_small = TkTextTag.new(t, 'font'=>'@cSmallFont')
+#  end
+
+  # テキストタグ設定 (色，レリーフ関連)
+  if TkWinfo.depth($root).to_i > 1
+    style_tag_color1 = TkTextTag.new(t, 'background'=>'#a0b7ce')
+    style_tag_color2 = TkTextTag.new(t, 'foreground'=>'red')
+    style_tag_raised = TkTextTag.new(t, 'relief'=>'raised', 'borderwidth'=>1)
+    style_tag_sunken = TkTextTag.new(t, 'relief'=>'sunken', 'borderwidth'=>1)
+  else
+    style_tag_color1 = TkTextTag.new(t, 'background'=>'black', 
+                                     'foreground'=>'white')
+    style_tag_color2 = TkTextTag.new(t, 'background'=>'black', 
+                                     'foreground'=>'white')
+    style_tag_raised = TkTextTag.new(t, 'background'=>'white', 
+                                     'relief'=>'raised', 'borderwidth'=>1)
+    style_tag_sunken = TkTextTag.new(t, 'background'=>'white', 
+                                     'relief'=>'sunken', 'borderwidth'=>1)
+  end
+
+  # テキストタグ設定 (その他)
+  if $tk_version =~ /^4\.[01]/
+    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
+                                        'borderwidth'=>0, 
+                                        'bgstipple'=>'gray25')
+  else
+    style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black', 
+                                        'borderwidth'=>0, 
+                                        'bgstipple'=>'gray12')
+  end
+  style_tag_fgstipple = TkTextTag.new(t, 'fgstipple'=>'gray50')
+  style_tag_underline = TkTextTag.new(t, 'underline'=>'on')
+  style_tag_overstrike = TkTextTag.new(t, 'overstrike'=>'on')
+  style_tag_right  = TkTextTag.new(t, 'justify'=>'right')
+  style_tag_center = TkTextTag.new(t, 'justify'=>'center')
+  style_tag_super = TkTextTag.new(t, 'offset'=>'4p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+  style_tag_sub = TkTextTag.new(t, 'offset'=>'-2p', 'font'=>'-Adobe-Courier-Medium-R-Normal--*-100-*-*-*-*-*-*')
+  style_tag_margins = TkTextTag.new(t, 'lmargin1'=>'12m', 'lmargin2'=>'6m',
+                                    'rmargin'=>'10m')
+  style_tag_spacing = TkTextTag.new(t, 'spacing1'=>'10p', 'spacing2'=>'2p',
+                                    'lmargin1'=>'12m', 'lmargin2'=>'6m',
+                                    'rmargin'=>'10m')
+
+  # テキスト挿入
+  insert('end', 'このようにテキスト widget は情報を様々なスタイルで表示すること
+ができます。')
+  insert('end', 'タグ', style_tag_big)
+  insert('end', 'というメカニズムでコントロールされます。
+タグとはテキスト widget 内のある文字 (の範囲)に対して適用できる
+単なる名前のことです。タグは様々な表示スタイルに設定できます。
+設定すると、そのタグのついた文字は指定したスタイルで表示される
+ようになります。使用できる表示スタイルは次の通りです。
+')
+  insert('end', '
+1. フォント', style_tag_big)
+  insert('end', '    どんな X のフォントでも使えます。')
+  insert('end', 'large', style_tag_verybig)
+  insert('end', '
+とか')
+#  insert('end', '小さい', style_tag_small)
+  insert('end', 'small', style_tag_small)
+  insert('end', 'とか。
+')
+  insert('end', '
+2. 色', style_tag_big)
+  insert('end', '  ')
+  insert('end', '背景色', style_tag_color1)
+  insert('end', 'も')
+  insert('end', '前景色', style_tag_color2)
+  insert('end', 'も')
+  insert('end', '両方', style_tag_color1, style_tag_color2)
+  insert('end', 'とも変えることができます。
+')
+  insert('end', '
+3. 網かけ', style_tag_big)
+  insert('end', '  このように描画の際に')
+  insert('end', '背景も', style_tag_bgstipple)
+  insert('end', '文字も', style_tag_fgstipple)
+  insert('end', '単なる塗りつぶし
+でなく、網かけを使うことができます。
+')
+  insert('end', '
+4. 下線', style_tag_big)
+  insert('end', '  このように')
+  insert('end', '文字に下線を引く', style_tag_underline)
+  insert('end', 'ことができます。
+')
+  insert('end', '
+5. 打ち消し線', style_tag_big)
+  insert('end', '  このように')
+  insert('end', '文字に重ねて線を引く', style_tag_overstrike)
+  insert('end', 'ことができます。
+')
+  insert('end', '
+6. 3D 効果', style_tag_big)
+  insert('end', '  背景に枠をつけて、文字を')
+  insert('end', '飛び出す', style_tag_raised)
+  insert('end', 'ようにしたり')
+  insert('end', '沈む', style_tag_sunken)
+  insert('end', '
+ようにできます。
+')
+  insert('end', '
+7. 行揃え', style_tag_big)
+  insert('end', ' このように行を
+')
+  insert('end', '左に揃えたり
+')
+  insert('end', '右に揃えたり
+', style_tag_right)
+  insert('end', '真中に揃えたりできます。
+', style_tag_center)
+  insert('end', '
+8. 肩付き文字と添字', style_tag_big)
+  insert('end', '  10')
+  insert('end', 'n', style_tag_super)
+  insert('end', ' のように肩付き文字の効果や、')
+  insert('end', '
+X')
+  insert('end', 'i', style_tag_sub)
+  insert('end', 'のように添字の効果を出すことができます。
+')
+  insert('end', '
+9. マージン', style_tag_big)
+  insert('end', 'テキストの左側に余分な空白を置くことができます:
+')
+  insert('end', 'この段落はマージンの使用例です。スクリーン', 
+         style_tag_margins)
+  insert('end', '上で折り返されて表示されている1行のテキストです。', 
+         style_tag_margins)
+  insert('end', '左側には2種類のマージンを持ちます。', style_tag_margins)
+  insert('end', '1行目に対するものと、', style_tag_margins)
+  insert('end', '2行目以降の連続したマージン', style_tag_margins)
+  insert('end', 'です。また右側にもマージンがあります。', style_tag_margins)
+  insert('end', '行の折り返し位置を決めるために使用することができます。
+', style_tag_margins)
+  insert('end', '
+10. スペーシング', style_tag_big)
+  insert('end', '3つのパラメータで行のスペーシングを')
+  insert('end', '制御す
+ることができます。Spacing1で、行の')
+  insert('end', '上にどのくらいの空間を置くか、
+spacing3')
+  insert('end', 'で行の下にどのくらいの空間を置くか、')
+  insert('end', '行が折り返されているなら
+ば、spacing2で、')
+  insert('end', 'テキスト行を生成している行の間にどのくらい')
+  insert('end', 'の空間を置
+くかを示します。
+')
+  insert('end', 'これらのインデントされた段落はどのように', 
+         style_tag_spacing)
+  insert('end', 'スペーシングがが行われるのかを示します。', 
+         style_tag_spacing)
+  insert('end', '各段落は実際はテキストwidget', style_tag_spacing)
+  insert('end', 'の1行で、widgetによって折り畳まれています。
+', style_tag_spacing)
+  insert('end', 'Spacing1はこのテキストでは10pointに', style_tag_spacing)
+  insert('end', '設定されています。', style_tag_spacing)
+  insert('end', 'これにより、段落の間に大きな間隔が', style_tag_spacing)
+  insert('end', '存在しています。', style_tag_spacing)
+  insert('end', 'Spacing2は2pointに設定されています。', style_tag_spacing)
+  insert('end', 'これで段落の中にほんの少し間隔が存在しています。', 
+         style_tag_spacing)
+  insert('end', 'Spacing3はこの例では使用されていません。
+', style_tag_spacing)
+  insert('end', '間隔がどこにあるかを見たければ、これらの段落の', 
+         style_tag_spacing)
+  insert('end', 'なかでテキストを選択してください。選択の', style_tag_spacing)
+  insert('end', '反転した部分には余分にとられた間隔が', style_tag_spacing)
+  insert('end', '含まれています。
+', style_tag_spacing)
+
+}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/tcolor b/ruby_1_8_6/ext/tk/sample/demos-jp/tcolor
new file mode 100644
index 0000000000..c7f7ec7289
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/tcolor
@@ -0,0 +1,533 @@
+#!/usr/bin/env ruby
+#
+# tcolor --
+# このスクリプトはRGB,HSB,CYM形式をサポートする
+# 簡易カラーエディタです。
+#
+# Copyright (C) 1998 Takaaki Tateishi(ttate@jaist.ac.jp)
+# last update: Thu Jun 18 06:32:35 JST 1998
+#
+
+# まずはtk.rbを読み込む。
+
+require "tk"
+
+
+# Tkによって変更される変数はTkVariableのインスタンスを使う。
+
+$colorSpace = TkVariable.new(:rgb)
+$master = nil
+$red = 65535
+$green = 0
+$blue = 0
+$color = "#ffff00000000"
+$updating = TkVariable.new(0)
+$autoUpdate = TkVariable.new(1)
+$name = TkVariable.new($color)
+$command = TkVariable.new("print(%%,\"\n\")")
+# $command = TkVariable.new("")
+$label1 = TkVariable.new("label1")
+$label2 = TkVariable.new("label2")
+$label3 = TkVariable.new("label3")
+
+
+# リソースデータベースの設定
+if (TkVarAccess.new('tcl_platform')['platform'] == 'unix')
+  TkOptionDB.add('*Entry.background', 'white')
+end
+
+
+# 各イベント用のメソッド
+
+def rgbToHsv(red,green,blue)
+
+  if ( red > green )
+    max = red
+    min = green
+  else
+    max = green
+    min = red
+  end
+
+  if ( blue > max )
+    max = blue
+  else
+    if ( blue < min )
+      min = blue
+    end
+  end
+
+  range = max - min
+
+  if ( max == 0 )
+    sat = 0.0
+  else
+    sat = (max-min)/max
+  end
+
+  if ( sat == 0 )
+    hue = 0.0
+  else
+    rc = (max-red)/range
+    gc = (max-green)/range
+    bc = (max-blue)/range
+    if ( red == max )
+      hue = 0.166667 * (bc - gc)
+    else
+      if ( green == max )
+	hue = 0.166667 * (2.0 + rc - bc)
+      else
+	hue = 0.166667 * (4.0 + gc - rc)
+      end
+    end
+    if ( hue < 0.0 )
+      hue = hue + 1.0
+    end
+  end
+
+  [hue,sat,max/65535]
+end
+
+
+def hsbToRgb(hue,sat,value)
+  v = 65535.0 * value
+  if( sat == 0 )
+    ans = [v,v,v]
+  else
+    hue = hue*6.0
+    if ( hue >= 6 )
+      hue = 0.0
+    end
+    i = hue.to_i
+    f = hue - i
+    p = 65535.0 * value * (1.0 - sat)
+    q = 65535.0 * value * (1.0 - (sat * f))
+    t = 65535.0 * value * (1.0 - (sat * (1.0 - f)))
+    case i
+    when 0
+      ans = [v,t,p]
+    when 1
+      ans = [q,v,p]
+    when 2
+      ans = [p,v,t]
+    when 3
+      ans = [p,q,v]
+    when 4
+      ans = [t,p,v]
+    when 5
+      ans = [v,p,q]
+    else
+      raise(eException,"i value #{i} is out of range")
+    end
+  end
+  return ans
+end
+
+
+def _null_binding
+  Module.new.instance_eval{binding}
+end
+private :_null_binding
+
+def doUpdate 
+  newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
+  eval(newCmd, _null_binding)
+end
+
+
+def tc_scaleChanged
+  if( $updating.to_i == 1 )
+    return 
+  end
+
+  $master = :scale if $master == nil
+
+  scale1 = $root.middle.middle.scale1
+  scale2 = $root.middle.middle.scale2
+  scale3 = $root.middle.middle.scale3
+
+  case $colorSpace.value.intern
+  when :rgb
+    $red = (scale1.get * 65.535).to_i
+    $green = (scale2.get * 65.535).to_i
+    $blue = (scale3.get * 65.535).to_i
+  when :cmy
+    $red = (65535 - scale1.get * 65.535).to_i
+    $green = (65535 - scale2.get * 65.535).to_i
+    $blue = (65535 - scale3.get * 65.535).to_i        
+  when :hsb
+    list = hsbToRgb(scale1.get / 1000.0,
+		    scale2.get / 1000.0,
+		    scale3.get / 1000.0)
+    $red = list[0]
+    $green = list[1]
+    $blue = list[2]
+  else
+    raise(Exception,"unknown colorSpace")
+  end
+  $color = format("#%04x%04x%04x",$red.to_i,$green.to_i,$blue.to_i)
+  $name.value = $color if $master == :scale
+  $root.middle.right.set_color($color)
+  if( $autoUpdate.to_i == 1 )
+    doUpdate
+  end
+  Tk.update(true)
+  $master = nil if $master == :scale
+end
+
+
+def tc_setScales
+  $updating.value = 1
+
+  scale1 = $root.middle.middle.scale1
+  scale2 = $root.middle.middle.scale2
+  scale3 = $root.middle.middle.scale3
+  
+  case $colorSpace.value.intern
+  when :rgb
+    scale1.set($red / 65.535)
+    scale2.set($green / 65.535)
+    scale3.set($blue / 65.535)
+  when :cmy
+    scale1.set((65535 - $red) / 65.535)
+    scale2.set((65535 - $green) / 65.535)
+    scale3.set((65535 - $blue) / 65.535)
+  when :hsb
+    list = rgbToHsv($red,$green,$blue)
+    scale1.set( list[0] * 1000.0 )
+    scale2.set( list[1] * 1000.0 )
+    scale3.set( list[2] * 1000.0 )
+  else
+    raise(Exception,"unknown colorSpace")
+  end
+
+  $updating.value = 0
+end
+
+
+def tc_loadNamedColor(name)
+  $name.value = name
+  $master = :name if $master == nil
+  if name[0,1] != "#" 
+    list = TkWinfo.rgb($root.middle.right.swatch,name)
+    $red = list[0]
+    $green = list[1]
+    $blue = list[2]
+  else
+    case name.length
+    when 4
+      fmt = /#(.{1})(.{1})(.{1})/
+      shift = 12
+    when 7
+      fmt = /#(.{2})(.{2})(.{2})/
+      shift = 8
+    when 10
+      fmt = /#(.{3})(.{3})(.{3})/
+      shift = 4
+    when 13
+      fmt = /#(.{4})(.{4})(.{4})/
+      shift = 0
+    else
+      raise(eException,"syntax error in color name \"#{name}\"")
+    end
+    name.scan(fmt){|strlist|
+      if strlist.length != 3
+	raise(eException,"syntax error in color name \"#{name}\"")
+      end
+      $red = strlist[0].hex
+      $green = strlist[1].hex
+      $blue = strlist[2].hex
+    }
+    $red = $red << shift
+    $green = $green << shift
+    $blue = $blue << shift
+  end
+  
+  tc_setScales
+  $color = format("#%04x%04x%04x",$red,$green,$blue)
+  $root.middle.right.set_color($color)
+  if $autoUpdate.to_i == 1
+    doUpdate
+  end
+  Tk.update(true)
+  $master = nil if $master == :name
+end
+
+
+def changeColorSpace(space)
+  case space
+  when :rgb
+    $label1.value = "Red"
+    $label2.value = "Green"
+    $label3.value = "Blue"
+  when :cmy
+    $label1.value = "Cyan"
+    $label2.value = "Magenta"
+    $label3.value = "Yellow"
+  when :hsb
+    $label1.value = "Hue"
+    $label2.value = "Saturation"
+    $label3.value = "Brightness"
+  end
+  tc_setScales
+end
+
+
+
+
+
+# tcolor用のメニュー
+
+class TkColorMenuFrame<TkFrame
+  def initialize(parent)
+    super(parent,
+	  "relief"=>"raised",
+	  "borderwidth"=>"2")
+
+    # Fileメニューボタンの生成
+    @file = TkMenubutton.new(self){|button|
+
+      # Fileメニューの作成
+      @file_menu = TkMenu.new(button){
+	add "radio",
+	  "label" => "RGB color space",
+	  "variable" => $colorSpace,
+	  "value" => :rgb,
+	  "underline" => "0",
+	  "command" => proc{changeColorSpace(:rgb)}
+	add "radio",
+	  "label" => "CMY color space",
+	  "variable" => $colorSpace,
+	  "value" => :cmy,
+	  "underline" => "0",
+	  "command" => proc{changeColorSpace(:cmy)}
+	add "radio",
+	  "label" => "HSB color space",
+	  "variable" => $colorSpace,
+	  "value" => :hsb,
+	  "underline" => "0",
+	  "command" => proc{changeColorSpace(:hsb)}
+	add "separator"
+	add "radio",
+	  "label" => "Automatic updates",
+	  "variable" => $autoUpdate,
+	  "value" => "1",
+	  "underline" => "0"
+	add "radio",
+	  "label" => "Manual updates",
+	  "variable" => $autoUpdate,
+	  "value" => "0",
+	  "underline" => "0"
+	add "separator"
+	add "command",
+	  "label" => "Exit program",
+	  "underline" => "0",
+	  "command" => proc{exit}
+      }
+      
+      # FileメニューとFileボタンを関連付ける
+      menu @file_menu
+
+      text "File"
+      underline "0"
+    }.pack("side"=>"left")
+
+    self
+  end
+end
+
+
+# 下部のフレームのためのクラス
+class TkColorBotFrame<TkFrame
+  def initialize(parent)
+    super(parent,
+	  "relief"=> "raised",
+	  "borderwidth"=> 2)
+
+    @commandLabel = TkLabel.new(self,
+				"text"=> "Command:")
+    @command = TkEntry.new(self,
+			   "relief"=> "sunken",
+			   "borderwidth"=> "2",
+			   "textvariable"=> $command,
+			   "font"=> "-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
+    @update = TkButton.new(self,
+			   "text"=> "Update",
+			   "command"=> proc{doUpdate})
+    @commandLabel.pack("side"=>"left")
+    @update.pack("side"=>"right","pady"=>".1c","padx"=>".25c")
+    @command.pack("expand"=>"yes","fill"=>"x","ipadx"=>".25c")
+
+    self
+  end
+end    
+
+
+# 中段左のフレーム
+class TkColorMiddleLeftFrame<TkFrame
+  def initialize(parent)
+    super(parent)
+
+    for i in ["/usr/local/lib/X11rgb.txt","/usr/lib/X11/rgb.txt",
+	"/X11/R5/lib/X11/rgb.txt","/X11/R4/lib/rgb/rgb.txt",
+	"/usr/openwin/lib/X11/rgb.txt"]
+      if !File.readable?(i)
+	next
+      end
+      f = File.open(i)
+      @scroll = TkScrollbar.new(self,
+				"orient"=>"vertical",
+				"relief"=>"sunken",
+				"borderwidth"=>"2")
+      @scroll.pack("side"=>"right","fill"=>"y")
+      @names = TkListbox.new(self,
+			     "width"=>"20",
+			     "height"=>"12",
+			     "yscrollcommand"=> proc{|first,last| @scroll.set first,last},
+			     "relief"=>"sunken",
+			     "borderwidth"=>"2",
+			     "exportselection"=>"false")
+      @scroll.command(proc{|*args| @names.yview(*args)})
+      @names.bind("Double-1",proc{
+		    tc_loadNamedColor(@names.get(@names.curselection))})
+      @names.pack("side"=>"left")
+      while (line = f.gets)
+	line.chop!
+	linelist = line.split(/[ \t]+/)
+	if linelist.length == 4
+	  @names.insert("end",linelist[3])
+	end
+      end
+      f.close
+      break
+    end
+
+    self
+  end
+end
+
+
+# 中段中央のフレーム
+class TkColorMiddleMiddleFrame<TkFrame
+  # @scale1,@scale2,@scale3を外部から参照のみ許可する。(変更不可)
+  attr_reader :scale1, :scale2, :scale3
+
+  def initialize(parent)
+    super(parent)
+
+    @f1 = TkFrame.new(self)
+    @f2 = TkFrame.new(self)
+    @f3 = TkFrame.new(self)
+    @f4 = TkFrame.new(self)
+
+    for f in [@f1,@f2,@f3]
+      f.pack("side"=>"top","expand"=>"yes")
+    end
+    @f4.pack("side"=>"top","expand"=>"yes","fill"=>"x")
+
+    @label1 = TkLabel.new(self,"textvariable"=>$label1)
+    @scale1 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
+			  "orient"=>"horizontal",
+			  "command"=>proc{tc_scaleChanged})
+    @scale1.pack("side"=>"top","anchor"=>"w")
+    @label1.pack("side"=>"top","anchor"=>"w")
+
+    @label2 = TkLabel.new(self,"textvariable"=>$label2)
+    @scale2 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
+			  "orient"=>"horizontal",
+			  "command"=>proc{tc_scaleChanged})
+    @scale2.pack("side"=>"top","anchor"=>"w")
+    @label2.pack("side"=>"top","anchor"=>"w")
+
+    @label3 = TkLabel.new(self,"textvariable"=>$label3)
+    @scale3 = TkScale.new(self,"from"=>"0","to"=>"1000","length"=>"6c",
+			  "orient"=>"horizontal",
+			  "command"=>proc{tc_scaleChanged})
+    @scale3.pack("side"=>"top","anchor"=>"w")
+    @label3.pack("side"=>"top","anchor"=>"w")
+
+    @nameLabel = TkLabel.new(self,"text"=>"Name:")
+    @name = TkEntry.new(self,"relief"=>"sunken","borderwidth"=>"2",
+			"textvariable"=>$name,"width"=>"10",
+			"font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
+    @nameLabel.pack("side"=>"left")
+    @name.pack("side"=>"right", "expand"=>"1", "fill"=>"x")
+    @name.bind("Return",proc{tc_loadNamedColor $name.to_s})
+
+    self
+  end
+end
+
+
+class TkColorMiddleRightFrame<TkFrame
+  attr_reader :swatch
+
+  def initialize(parent)
+    super(parent)
+    @swatch = TkFrame.new(self, "width"=>"2c", "height"=>"5c",
+			  "background"=>$color)
+    @value = TkLabel.new(self, 
+			 "text"=>$color,
+			 "width"=>"13",
+			 "font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
+    @swatch.pack("side"=>"top","expand"=>"yes","fill"=>"both")
+    @value.pack("side"=>"bottom","pady"=>".25c")
+
+    self
+  end
+
+  def set_color(color)
+    @swatch["background"] = color
+    @value["text"] = color
+  end
+end
+
+
+
+# 中段のフレーム
+class TkColorMiddleFrame<TkFrame
+  attr_reader :left, :middle, :right
+
+  def initialize(parent)
+    super(parent,
+	  "relief"=> "raised",
+	  "borderwidth"=> "2")
+
+    @left = TkColorMiddleLeftFrame.new(self)
+    @left.pack("side"=>"left","padx"=>".25c","pady"=>".25c")
+
+    @middle = TkColorMiddleMiddleFrame.new(self)
+    @middle.pack("side"=>"left","expand"=>"yes","fill"=>"y")
+
+    @right = TkColorMiddleRightFrame.new(self)
+    @right.pack("side"=>"left","padx"=>".25c","pady"=>".25c","anchor"=>"s")
+
+    self
+  end
+end
+
+
+class TkColor<TkRoot
+  attr_reader :menu, :bottom, :middle
+
+  def initialize(*args)
+    super(*args)
+    @menu = TkColorMenuFrame.new(self)
+    @menu.pack("side"=>"top", "fill"=>"x")
+
+    @bottom = TkColorBotFrame.new(self)
+    @bottom.pack("side"=>"bottom","fill"=>"x")
+
+    @middle = TkColorMiddleFrame.new(self)
+    @middle.pack("side"=>"top","fill"=>"both")
+
+    self
+  end
+end
+
+
+$root = TkColor.new
+
+# イベントを待つ為にループに入る。
+changeColorSpace :rgb
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/text.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/text.rb
new file mode 100644
index 0000000000..0057d5dbdc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/text.rb
@@ -0,0 +1,117 @@
+#
+# text (basic facilities) widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($text_demo) && $text_demo
+  $text_demo.destroy 
+  $text_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$text_demo = TkToplevel.new {|w|
+  title("Text Demonstration - Basic Facilities")
+  iconname("text")
+  positionWindow(w)
+}
+
+# version check
+if ((Tk::TK_VERSION.split('.').collect{|n| n.to_i} <=> [8,4]) < 0)
+  undo_support = false
+else
+  undo_support = true
+end
+
+# frame 生成
+TkFrame.new($text_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $text_demo
+      $text_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'text'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# text 生成
+TkText.new($text_demo){|t|
+  # 生成
+  relief 'sunken'
+  bd 2
+  setgrid 1
+  height 30
+  TkScrollbar.new($text_demo) {|s|
+    pack('side'=>'right', 'fill'=>'y')
+    command proc{|*args| t.yview(*args)}
+    t.yscrollcommand proc{|first,last| s.set first,last}
+  }
+  pack('expand'=>'yes', 'fill'=>'both')
+
+  # テキスト挿入
+  insert('0.0', <<EOT)
+このウィンドウはテキスト widget です。1行またはそれ以上のテキストを表
+示・編集することができます。以下はテキスト widget でできる操作について
+まとめたものです。
+
+1. スクロール。スクロールバーでテキストの表示部分を動かすことができます。
+
+2. スキャニング。テキストのウィンドウでマウスボタン2 (中ボタンを) を押
+して上下にドラッグしてください。そうするとテキストが高速でドラッグされ、
+内容をざっと眺めることができます。
+
+3. テキストの挿入。マウスボタン1 (左ボタン) を押し、挿入カーソルをセッ
+トしてからテキストを入力してください。入力したものが widget に入ります。
+
+4. 選択。ある範囲の文字を選択するにはマウスボタン1 を押し、ドラッグし
+てください。一度ボタンを離したら、シフトキーを押しながらボタン1 を押す
+ことで選択範囲の調整ができます。これは選択範囲の最後をマウスカーソルに
+最も近い位置にリセットし、ボタンを離す前にマウスをドラッグすることでさ
+らに選択範囲を調整できます。ダブルクリックでワードを、またトリプルクリッ
+クで行全体を選択することができます。
+
+5. 消去と置換。テキストを消去するには、消去したい文字を選択してバック
+スペースかデリートキーを入力してください。あるいは、新しいテキストを
+入力すると選択されたテキストと置換されます。
+
+6. 選択部分のコピー。選択部分をこのウィンドウの中のどこかにコピーする
+には、まずコピーしたい所を選択(ここで、あるいは別のアプリケーションで)
+し、ボタン 2 をクリックして、挿入カーソルの位置にコピーしてください。
+
+7. 編集。テキスト widget は Emacs のキーバインドに加えて標準的なの Motif
+の編集機能をサポートしています。バックスペースとコントロール-H は挿入
+カーソルの左側の文字を削除します。デリートキーとコントロール-D は挿入
+カーソルの右側の文字を削除します。Meta-バックスペースは挿入カーソルの
+右側の単語を削除し、Meta-D は挿入カーソルの左側の単語を削除します。
+コントロール-K は挿入カーソルから行末までを削除し、その位置に改行
+しかなかった場合は、改行を削除します。#{
+      if undo_support
+        undo_text = "Control-z は最後に行った変更の取り消し(undo)を行い、"
+        case $tk_platform['platform']
+        when "unix", "macintosh"
+          undo_text << "Control-Shift-z"
+        else # 'windows'
+          undo_text << "Control-y"
+        end
+        undo_text << "はundoした変更の再適用(redo)を行います。"
+      else
+        ""
+      end
+}
+
+
+8. ウィンドウのリサイズ。この widget は "setGrid" オプションをオンにし
+てありますので、ウィンドウをリサイズする時には高さと幅は常に文字高と文
+字幅の整数倍になります。また、ウィンドウを狭くした場合には長い行が自動
+的に折り返され、常に全ての内容が見えるようになっています。
+EOT
+
+  set_insert('0.0')
+}
+
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/timer b/ruby_1_8_6/ext/tk/sample/demos-jp/timer
new file mode 100644
index 0000000000..58a41d00c0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/timer
@@ -0,0 +1,136 @@
+#!/usr/bin/env ruby
+#
+# timer --
+# This script generates a counter with start,stop and reset buttons.
+#
+# Copyright (C) 1998 Takaaki Tateishi (ttate@jaist.ac.jp)
+# last update: Sat Jun 27 12:24:14 JST 1998
+#
+
+require "tk"
+require "thread"
+require "tkafter"
+
+$time = "0.00"
+$m = Mutex.new
+$loop = false
+
+def timer_stop
+  $loop = false
+  $m.lock
+end
+
+def timer_start
+  $loop = true
+  $m.unlock
+end
+
+def timer_reset
+  $time = "0.00"
+  $root.countframe.counter['text'] = $time
+end
+
+def timer_loop
+  if $loop
+    $time = $time.succ
+    $root.countframe.counter['text'] = $time
+  end
+  Tk.after(10,proc{timer_loop})
+end
+
+
+#
+# thread version
+#
+def timer_loop2
+  while true
+    $m.lock
+    $time = $time.succ
+    $root.countframe.counter['text'] = $time
+    sleep(0.01)
+    $m.unlock
+  end
+end
+
+#
+# TkAfter
+#
+def timer_loop3
+  if $loop
+    $time = $time.succ
+    $root.countframe.counter['text'] = $time
+  end
+end
+
+
+class CountFrame < TkFrame
+  attr_reader :counter
+
+  def initialize(parent=nil,keys=nil)
+    super(parent,keys)
+    @counter = TkLabel.new(self,
+			   'text'=>$time, 
+			   'relief'=>'raised')
+    @counter.pack('fill'=>'both')
+    self
+  end
+end
+
+
+class ButtonFrame < TkFrame
+  def initialize(parent=nil,keys=nil)
+    super(parent,keys)
+=begin
+    @stop = TkButton.new(self,
+			 'text'=>'Stop',
+			 'command'=>proc{timer_stop})
+    @start = TkButton.new(self,
+			  'text'=>'Start',
+			  'command'=>proc{timer_start})
+=end
+    @stop  = TkButton.new(self, :text=>'Stop',  :state=>:disabled)
+    @start = TkButton.new(self, :text=>'Start', :state=>:normal)
+
+    @stop.command proc{
+      timer_stop
+      @start.state(:normal)
+      @stop.state(:disabled)
+    }
+    @start.command proc{
+      timer_start
+      @stop.state(:normal)
+      @start.state(:disabled)
+    }
+
+    @reset = TkButton.new(self,
+			  'text'=>'Reset',
+			  'command'=>proc{timer_reset})
+    for b in [@stop,@start,@reset]
+      b.pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
+    end
+  end
+end
+
+
+class Timer < TkRoot
+  attr_reader :countframe
+
+  def initialize(*args)
+    super(*args)
+    @countframe = CountFrame.new(self)
+    @buttonframe = ButtonFrame.new(self)
+    for f in [@buttonframe,@countframe]
+      f.pack('side'=>'top', 'fill'=>'both')
+    end
+    self
+  end
+end
+
+
+$root = Timer.new
+
+#$thread = Thread.start{timer_loop2}
+#timer_loop
+TkAfter.new(10,-1,proc{timer_loop3}).start
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/twind.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/twind.rb
new file mode 100644
index 0000000000..2b228e4acd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/twind.rb
@@ -0,0 +1,285 @@
+#
+# text (embedded windows) widget demo (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($twind_demo) && $twind_demo
+  $twind_demo.destroy 
+  $twind_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$twind_demo = TkToplevel.new {|w|
+  title("Text Demonstration - Embedded Windows")
+  iconname("Embedded Windows")
+  positionWindow(w)
+}
+
+# frame 生成
+$twind_buttons = TkFrame.new($twind_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc{
+      tmppath = $twind_demo
+      $twind_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc{showCode 'twind'}
+  }.pack('side'=>'left', 'expand'=>'yes')
+}
+$twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 生成
+$twind_text = nil
+TkFrame.new($twind_demo, 'highlightthickness'=>2, 'borderwidth'=>2, 
+            'relief'=>'sunken') {|f|
+  $twind_text = TkText.new(f, 'setgrid'=>'true', 'font'=>$font, 
+                          'width'=>'70', 'height'=>35, 'wrap'=>'word', 
+                          'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
+    TkScrollbar.new(f) {|s|
+      command proc{|*args| t.yview(*args)}
+      t.yscrollcommand proc{|first,last| s.set first,last}
+    }.pack('side'=>'right', 'fill'=>'y')
+  }.pack('expand'=>'yes', 'fill'=>'both')
+}.pack('expand'=>'yes', 'fill'=>'both')
+
+# タグ生成
+$tag_center = TkTextTag.new($twind_text, 
+                            'justify' =>'center',
+                            'spacing1'=>'5m',
+                            'spacing3'=>'5m'  )
+$tag_buttons = TkTextTag.new($twind_text, 
+                             'lmargin1'=>'1c',
+                             'lmargin2'=>'1c',
+                             'rmargin' =>'1c',
+                             'spacing1'=>'3m',
+                             'spacing2'=>0,
+                             'spacing3'=>0 )
+
+# テキストの生成
+$twind_text.insert('end', 
+                  'テキストwidget上に他のwidgetを組み込むことができます。')
+$twind_text.insert('end',
+                  '組み込みウィンドウと呼ばれ、任意のwidgetが可能です。')
+$twind_text.insert('end',
+                  '例えば、ここに2つのボタンwidgetが組み込まれています。')
+$twind_text.insert('end', '最初のボタンをクリックすと水平方向のスクロールを')
+TkTextWindow.new($twind_text, 'end', 
+                 'window'=>TkButton.new($twind_text) {
+                   #text 'ON'
+                   text 'オン'
+                   command proc{textWindOn $twind_text,$twind_buttons}
+                   cursor 'top_left_arrow'
+                 })
+$twind_text.insert('end', "にします。また2つめのボタンをクリックすると\n")
+$twind_text.insert('end', '水平方向のスクロールを')
+TkTextWindow.new($twind_text, 'end', 
+                 'window'=>TkButton.new($twind_text) {
+                   #text 'OFF'
+                   text 'オフ'
+                   command proc{textWindOff $twind_text}
+                   cursor 'top_left_arrow'
+                 })
+$twind_text.insert('end', 'にします。')
+
+$twind_text.insert('end', 'もうひとつの例です。')
+TkTextWindow.new($twind_text, 'end', 
+                 'window'=>TkButton.new($twind_text) {
+                   text 'ここをクリック'
+                   command proc{textWindPlot $twind_text}
+                   cursor 'top_left_arrow'
+                 })
+$twind_text.insert('end', 'すると、x-yプロットがここに現れます。')
+$mark_plot = TkTextMark.new($twind_text, 'insert')
+$mark_plot.gravity='left'
+$twind_text.insert('end', 'マウスでデータを描画することができます。')
+TkTextWindow.new($twind_text, 'end', 
+                 'window'=>TkButton.new($twind_text) {
+                   text '消去'
+                   command proc{textWindDel $twind_text}
+                   cursor 'top_left_arrow'
+                 })
+$twind_text.insert('end', 'をクリックすると元に戻ります。
+
+')
+
+$twind_text.insert('end', '組み込みウィンドウだけをテキストwidget上に、実際の')
+$twind_text.insert('end', 'テキストはなしで組み込むことは便利です。')
+$twind_text.insert('end', 'この場合は、テキストwidgetはウィンドウマネージャの')
+$twind_text.insert('end', 'ように動作します。例えば、ここにはテキストwidgetに')
+$twind_text.insert('end', 'よってボタンがきれいに並べられています。')
+$twind_text.insert('end', 'これらのボタンで背景色を変えることができます')
+$twind_text.insert('end', '("Default"で元の色に戻すことができます)。')
+$twind_text.insert('end', '"Short"というボタンをクリックすると文字列の長さが')
+$twind_text.insert('end', '変わります。すると自動的にテキストwidgetが')
+$twind_text.insert('end', 'レイアウトを整えてくれます。')
+$twind_text.insert('end', 'もう一度同じボタンを押すと元に戻ります。
+
+')
+
+TkTextWindow.new($twind_text, 'end', 
+                 'window'=>TkButton.new($twind_text) {|b|
+                   text 'デフォルト'
+                   command proc{embDefBg $twind_text}
+                   cursor 'top_left_arrow'
+                   $tag_buttons.add('end')
+                 },
+                 'padx'=>3 )
+embToggle = TkVariable.new('Short')
+TkTextWindow.new($twind_text, 'end', 
+                 'window'=>TkCheckButton.new($twind_text) {
+                   textvariable embToggle
+                   indicatoron 0
+                   variable embToggle
+                   onvalue 'A much longer string'
+                   offvalue 'Short'
+                   cursor 'top_left_arrow'
+                   pady 5
+                   padx 2
+                 },
+                 'padx'=>3, 
+                 'pady'=>2 )
+
+[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4', 
+  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1', 
+  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1', 
+  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4' 
+].each{|twind_color|
+  TkTextWindow.new($twind_text, 'end', 
+                   'window'=>TkButton.new($twind_text) {
+                     text twind_color
+                     cursor 'top_left_arrow'
+                     command proc{$twind_text.bg twind_color}
+                   },
+                   'padx'=>3, 
+                   'pady'=>2 )
+}
+
+# メソッド定義
+def textWindOn (w,f)
+  if defined? $twind_scroll
+    begin
+      $twind_scroll.destroy
+    rescue
+    end
+    $twind_scroll = nil
+  end
+
+  base = TkWinfo.parent( TkWinfo.parent(w) )
+  $twind_scroll = TkScrollbar.new(base) {|s|
+    orient 'horizontal'
+    command proc{|*args| w.xview(*args)}
+    w.xscrollcommand proc{|first,last| s.set first,last}
+    w.wrap 'none'
+    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
+  }
+
+  return nil
+end
+
+def textWindOff (w)
+  if defined? $twind_scroll
+    begin
+      $twind_scroll.destroy
+    rescue
+    end
+    $twind_scroll = nil
+  end
+  w.xscrollcommand ''
+  w.wrap 'word'
+end
+
+def textWindPlot (t)
+  if (defined? $twind_plot) && (TkWinfo.exist?($twind_plot))
+    return
+  end
+
+  $twind_plot = TkCanvas.new(t) {
+    relief 'sunken'
+    width  450
+    height 300
+    cursor 'top_left_arrow'
+  }
+
+  font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+
+  TkcLine.new($twind_plot, 100, 250, 400, 250, 'width'=>2)
+  TkcLine.new($twind_plot, 100, 250, 100,  50, 'width'=>2)
+  TkcText.new($twind_plot, 225, 20, 
+              'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
+
+  (0..10).each {|i|
+    x = 100 + (i * 30)
+    TkcLine.new($twind_plot, x, 250, x, 245, 'width'=>2)
+    TkcText.new($twind_plot, x, 254, 
+                'text'=>10*i, 'font'=>font, 'anchor'=>'n')
+  }
+  (0..5).each {|i|
+    y = 250 - (i * 40)
+    TkcLine.new($twind_plot, 100, y, 105, y, 'width'=>2)
+    TkcText.new($twind_plot, 96, y, 
+                'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
+  }
+
+  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
+    x = 100 + (3*xx)
+    y = 250 - (4*yy)/5
+    item = TkcOval.new($twind_plot, x-6, y-6, x+6, y+6, 
+                       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
+    item.addtag 'point'
+  end
+
+  $twind_plot.itembind('point', 'Any-Enter', 
+                        proc{$twind_plot.itemconfigure 'current', 'fill', 'red'})
+  $twind_plot.itembind('point', 'Any-Leave', 
+                        proc{$twind_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
+  $twind_plot.itembind('point', '1', 
+                        proc{|x,y| embPlotDown $twind_plot,x,y}, "%x %y")
+  $twind_plot.itembind('point', 'ButtonRelease-1', 
+                        proc{$twind_plot.dtag 'selected'})
+  $twind_plot.bind('B1-Motion', 
+                    proc{|x,y| embPlotMove $twind_plot,x,y}, "%x %y")
+  while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
+    $twind_text.delete $mark_plot
+  end
+  $twind_text.insert $mark_plot,"\n"
+  TkTextWindow.new($twind_text, $mark_plot, 'window'=>$twind_plot)
+  $tag_center.add $mark_plot
+  $twind_text.insert $mark_plot,"\n"
+end
+
+$embPlot = {'lastX'=>0, 'lastY'=>0}
+
+def embPlotDown (w, x, y)
+  w.dtag 'selected'
+  w.addtag_withtag 'selected', 'current'
+  w.raise 'current'
+  $embPlot['lastX'] = x
+  $embPlot['lastY'] = y
+end
+
+def embPlotMove (w, x, y)
+  w.move 'selected', x - $embPlot['lastX'], y - $embPlot['lastY']
+  $embPlot['lastX'] = x
+  $embPlot['lastY'] = y
+end
+
+def textWindDel (w)
+  if (defined? $twind_text) && TkWinfo.exist?($twind_plot)
+    $twind_text.delete $twind_plot
+    $twind_plot = nil
+    while ($twind_text.get($mark_plot) =~ /[ \t\n]/)
+      $twind_text.delete $mark_plot
+    end
+    $twind_text.insert $mark_plot,"  "
+  end
+end
+
+def embDefBg (w)
+  w['background'] = w.configinfo('background')[3]
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/twind2.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/twind2.rb
new file mode 100644
index 0000000000..b634f07b4b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/twind2.rb
@@ -0,0 +1,381 @@
+#
+# text (embedded windows) widget demo 2 (called by 'widget')
+#
+
+# toplevel widget が存在すれば削除する
+if defined?($twind2_demo) && $twind2_demo
+  $twind2_demo.destroy 
+  $twind2_demo = nil
+end
+
+# demo 用の toplevel widget を生成
+$twind2_demo = TkToplevel.new {|w|
+  title("Text Demonstration - Embedded Windows 2")
+  iconname("Embedded Windows")
+  positionWindow(w)
+}
+
+# frame 生成
+$twind2_buttons = TkFrame.new($twind2_demo) {|frame|
+  TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2), 
+         :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
+  TkGrid('x', 
+         TkButton.new(frame, :text=>'コード参照', 
+                      :image=>$image['view'], :compound=>:left, 
+                      :command=>proc{showCode 'twind2'}), 
+         TkButton.new(frame, :text=>'閉じる', 
+                      :image=>$image['delete'], :compound=>:left, 
+                      :command=>proc{
+                        tmppath = $twind2_demo
+                        $twind2_demo = nil
+                        $showVarsWin[tmppath.path] = nil
+                        tmppath.destroy
+                      }), 
+         :padx=>4, :pady=>4)
+  frame.grid_columnconfigure(0, :weight=>1)
+}
+$twind2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+# frame 生成
+$twind2_text = nil
+TkFrame.new($twind2_demo, 'highlightthickness'=>2, 'borderwidth'=>2, 
+            'relief'=>'sunken') {|f|
+  $twind2_text = TkText.new(f, 'setgrid'=>true, 'font'=>$font,
+                            # 'width'=>'70', 'height'=>35, 'wrap'=>'word', 
+                            'width'=>'70', 'height'=>35, 'wrap'=>'char', 
+                            'highlightthickness'=>0, 'borderwidth'=>0 ){|t|
+    TkScrollbar.new(f) {|s|
+      command proc{|*args| t.yview(*args)}
+      t.yscrollcommand proc{|first,last| s.set first,last}
+    }.pack('side'=>'right', 'fill'=>'y')
+  }.pack('expand'=>'yes', 'fill'=>'both')
+}.pack('expand'=>'yes', 'fill'=>'both')
+
+# タグ生成
+$tag2_center = TkTextTag.new($twind2_text, 
+                            'justify' =>'center',
+                            'spacing1'=>'5m',
+                            'spacing3'=>'5m'  )
+$tag2_buttons = TkTextTag.new($twind2_text, 
+                             'lmargin1'=>'1c',
+                             'lmargin2'=>'1c',
+                             'rmargin' =>'1c',
+                             'spacing1'=>'3m',
+                             'spacing2'=>0,
+                             'spacing3'=>0 )
+
+# テキストの生成
+$twind2_text.insert('end', 'テキストウィジェットには色々な種類のアイテム')
+$twind2_text.insert('end', '（動的なものや静的なものの両方があります）を')
+$twind2_text.insert('end', '数多く含めることができます。そうしたアイテムは')
+$twind2_text.insert('end', '行替え、タブ、中央揃えなどの様々な方法で')
+$twind2_text.insert('end', '配置することができます。')
+$twind2_text.insert('end', '加えて、テキストウィジェットの内容物が')
+$twind2_text.insert('end', 'ウィンドウサイズに比べて大きすぎる場合でも')
+$twind2_text.insert('end', 'すべての方向にスムーズにスクロールさせて')
+$twind2_text.insert('end', '確認することが可能です。')
+$twind2_text.insert('end', "\n\n")
+$twind2_text.insert('end', 'テキストウィジェット上には他のウィジェットを')
+$twind2_text.insert('end', '含めることもできます。こうしたものは')
+$twind2_text.insert('end', '「埋め込みウィンドウ」と呼ばれ、その中に')
+$twind2_text.insert('end', 'いかなるウィジェットでも詰め込むことができます。')
+$twind2_text.insert('end', '例えば，ここには２つの')
+$twind2_text.insert('end', 'ボタンウィジェットが埋め込まれています。')
+$twind2_text.insert('end', '最初のボタンをクリックすると、')
+$twind2_text.insert('end', '水平方向のスクロールを ')
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text) {
+                   #text 'ON'
+                   text 'オン'
+                   command proc{textWindOn2 $twind2_text,$twind2_buttons}
+                   cursor 'top_left_arrow'
+                 })
+$twind2_text.insert('end', "にします。また、２つめのボタンをクリックすると\n")
+$twind2_text.insert('end', '水平方向のスクロールを')
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text) {
+                   #text 'OFF'
+                   text 'オフ'
+                   command proc{textWindOff2 $twind2_text}
+                   cursor 'top_left_arrow'
+                 })
+$twind2_text.insert('end', "にします。\n\n")
+
+$twind2_text.insert('end', '次はもうひとつの例です。')
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text) {
+                   text 'ここをクリック'
+                   command proc{textWindPlot2 $twind2_text}
+                   cursor 'top_left_arrow'
+                 })
+$twind2_text.insert('end', 'すると、x-yプロットがここに現れます。')
+$mark2_plot = TkTextMark.new($twind2_text, 'insert')
+$mark2_plot.gravity='left'
+$twind2_text.insert('end', 'マウスでドラッグすることで、')
+$twind2_text.insert('end', 'プロット上のデータ点を移動することができます。')
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text) {
+                   text '消去'
+                   command proc{textWindDel2 $twind2_text}
+                   cursor 'top_left_arrow'
+                 })
+$twind2_text.insert('end', 'をクリックすると元に戻ります。')
+$twind2_text.insert('end', "\n\n")
+
+$twind2_text.insert('end', '表示するテキストなしに埋め込みウィンドウだけを')
+$twind2_text.insert('end', 'テキストウィジェットに含めることも有用でしょう。')
+$twind2_text.insert('end', 'この場合、テキストウィジェットは')
+$twind2_text.insert('end', 'ジオメトリマネージャのように働きます。')
+$twind2_text.insert('end', '例えば、ここにはテキストウィジェットに')
+$twind2_text.insert('end', 'よってボタンがきれいに整列して配置されています。')
+$twind2_text.insert('end', 'これらのボタンをクリックすることで、')
+$twind2_text.insert('end', 'このテキストウィジェットの背景色を')
+$twind2_text.insert('end', '変えることができます("デフォルト"ボタンで')
+$twind2_text.insert('end', '元の色に戻すことができます)。')
+$twind2_text.insert('end', '"Short"というボタンをクリックすると文字列の長さが')
+$twind2_text.insert('end', '変わり、テキストウィジェットが自動的に')
+$twind2_text.insert('end', 'レイアウトを整える様子を見ることができます。')
+$twind2_text.insert('end', 'もう一度同じボタンを押すと元に戻ります。')
+$twind2_text.insert('end', "\n")
+
+btn_default = TkButton.new($twind2_text) {|b|
+  text 'デフォルト'
+  command proc{embDefBg2 $twind2_text}
+  cursor 'top_left_arrow'
+}
+TkTextWindow.new($twind2_text, 'end', 'window'=>btn_default, 'padx'=>3)
+embToggle = TkVariable.new('Short')
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkCheckButton.new($twind2_text) {
+                   textvariable embToggle
+                   indicatoron 0
+                   variable embToggle
+                   onvalue 'A much longer string'
+                   offvalue 'Short'
+                   cursor 'top_left_arrow'
+                   pady 5
+                   padx 2
+                 },
+                 'padx'=>3, 
+                 'pady'=>2 )
+
+[ 'AntiqueWhite3', 'Bisque1', 'Bisque2', 'Bisque3', 'Bisque4', 
+  'SlateBlue3', 'RoyalBlue1', 'SteelBlue2', 'DeepSkyBlue3', 'LightBlue1', 
+  'DarkSlateGray1', 'Aquamarine2', 'DarkSeaGreen2', 'SeaGreen1', 
+  'Yellow1', 'IndianRed1', 'IndianRed2', 'Tan1', 'Tan4' 
+].each{|twind_color|
+  TkTextWindow.new($twind2_text, 'end', 
+                   'window'=>TkButton.new($twind2_text) {
+                     text twind_color
+                     cursor 'top_left_arrow'
+                     command proc{$twind2_text.bg twind_color}
+                   },
+                   'padx'=>3, 
+                   'pady'=>2 )
+}
+
+$tag2_buttons.add(btn_default, 'end')
+
+$text_normal2 = {}
+$text_normal2['border'] = $twind2_text.cget('borderwidth')
+$text_normal2['highlight'] = $twind2_text.cget('highlightthickness')
+$text_normal2['pad'] = $twind2_text.cget('padx')
+
+$twind2_text.insert('end', "\nborder width や highlightthickness, ")
+$twind2_text.insert('end', "padding を通常の値から変更することも可能です。\n")
+
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text, :text=>"Big borders", 
+                                        :cursor=>'top_left_arrow', 
+                                        'command'=>proc{
+                                          textWinBigB2 $twind2_text
+                                        }))
+
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text, :text=>"Small borders", 
+                                        :cursor=>'top_left_arrow', 
+                                        'command'=>proc{
+                                          textWinSmallB2 $twind2_text
+                                        }))
+
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text, :text=>"Big highlight", 
+                                        :cursor=>'top_left_arrow', 
+                                        'command'=>proc{
+                                          textWinBigH2 $twind2_text
+                                        }))
+
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text, :text=>"Small highlight",
+                                        :cursor=>'top_left_arrow', 
+                                        'command'=>proc{
+                                          textWinSmallH2 $twind2_text
+                                        }))
+
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text, :text=>"Big pad", 
+                                        :cursor=>'top_left_arrow', 
+                                        'command'=>proc{
+                                          textWinBigP2 $twind2_text
+                                        }))
+
+TkTextWindow.new($twind2_text, 'end', 
+                 'window'=>TkButton.new($twind2_text, :text=>"Small pad", 
+                                        :cursor=>'top_left_arrow', 
+                                        'command'=>proc{
+                                          textWinSmallP2 $twind2_text
+                                        }))
+
+$twind2_text.insert('end', "\n\n更にイメージもテキストウィジェットに")
+$twind2_text.insert('end', "うまく配置できます：")
+
+TkTextImage.new($twind2_text, 'end', 
+                'image'=>TkBitmapImage.new(:file=>[
+                                             $demo_dir, '..', 
+                                             'images', 'face.xbm'
+                                           ].join(File::Separator)))
+
+# メソッド定義
+def textWinBigB2(w)
+  w.borderwidth 15
+end
+def textWinSmallB2(w)
+  w.borderwidth $text_normal2['border']
+end
+def textWinBigH2(w)
+  w.highlightthickness 15
+end
+def textWinSmallH2(w)
+  w.highlightthickness $text_normal2['highlight']
+end
+def textWinBigP2(w)
+  w.configure(:padx=>15, :pady=>15)
+end
+def textWinSmallP2(w)
+  w.configure(:padx=>$text_normal2['pad'], :pady=>$text_normal2['pad'])
+end
+
+def textWindOn2 (w,f)
+  if defined? $twind2_scroll
+    begin
+      $twind2_scroll.destroy
+    rescue
+    end
+    $twind2_scroll = nil
+  end
+
+  base = TkWinfo.parent( TkWinfo.parent(w) )
+  $twind2_scroll = TkScrollbar.new(base) {|s|
+    orient 'horizontal'
+    command proc{|*args| w.xview(*args)}
+    w.xscrollcommand proc{|first,last| s.set first,last}
+    w.wrap 'none'
+    pack('after'=>f, 'side'=>'bottom', 'fill'=>'x')
+  }
+
+  return nil
+end
+
+def textWindOff2 (w)
+  if defined? $twind2_scroll
+    begin
+      $twind2_scroll.destroy
+    rescue
+    end
+    $twind2_scroll = nil
+  end
+  w.xscrollcommand ''
+  #w.wrap 'word'
+  w.wrap 'char'
+end
+
+def textWindPlot2 (t)
+  if (defined? $twind2_plot) && (TkWinfo.exist?($twind2_plot))
+    return
+  end
+
+  $twind2_plot = TkCanvas.new(t) {
+    relief 'sunken'
+    width  450
+    height 300
+    cursor 'top_left_arrow'
+  }
+
+  #font = '-Adobe-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
+  font = 'Helvetica 18'
+
+  TkcLine.new($twind2_plot, 100, 250, 400, 250, 'width'=>2)
+  TkcLine.new($twind2_plot, 100, 250, 100,  50, 'width'=>2)
+  TkcText.new($twind2_plot, 225, 20, 
+              'text'=>"A Simple Plot", 'font'=>font, 'fill'=>'brown')
+
+  (0..10).each {|i|
+    x = 100 + (i * 30)
+    TkcLine.new($twind2_plot, x, 250, x, 245, 'width'=>2)
+    TkcText.new($twind2_plot, x, 254, 
+                'text'=>10*i, 'font'=>font, 'anchor'=>'n')
+  }
+  (0..5).each {|i|
+    y = 250 - (i * 40)
+    TkcLine.new($twind2_plot, 100, y, 105, y, 'width'=>2)
+    TkcText.new($twind2_plot, 96, y, 
+                'text'=>"#{i*50}.0", 'font'=>font, 'anchor'=>'e')
+  }
+
+  for xx, yy in [[12,56],[20,94],[33,98],[32,120],[61,180],[75,160],[98,223]]
+    x = 100 + (3*xx)
+    y = 250 - (4*yy)/5
+    item = TkcOval.new($twind2_plot, x-6, y-6, x+6, y+6, 
+                       'width'=>1, 'outline'=>'black', 'fill'=>'SkyBlue2')
+    item.addtag 'point'
+  end
+
+  $twind2_plot.itembind('point', 'Any-Enter', 
+                        proc{$twind2_plot.itemconfigure 'current', 'fill', 'red'})
+  $twind2_plot.itembind('point', 'Any-Leave', 
+                        proc{$twind2_plot.itemconfigure 'current', 'fill', 'SkyBlue2'})
+  $twind2_plot.itembind('point', '1', 
+                        proc{|x,y| embPlotDown2 $twind2_plot,x,y}, "%x %y")
+  $twind2_plot.itembind('point', 'ButtonRelease-1', 
+                        proc{$twind2_plot.dtag 'selected'})
+  $twind2_plot.bind('B1-Motion', 
+                    proc{|x,y| embPlotMove2 $twind2_plot,x,y}, "%x %y")
+  while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
+    $twind2_text.delete $mark2_plot
+  end
+  $twind2_text.insert $mark2_plot,"\n"
+  TkTextWindow.new($twind2_text, $mark2_plot, 'window'=>$twind2_plot)
+  $tag2_center.add $mark2_plot
+  $twind2_text.insert $mark2_plot,"\n"
+end
+
+$embPlot2 = {'lastX'=>0, 'lastY'=>0}
+
+def embPlotDown2 (w, x, y)
+  w.dtag 'selected'
+  w.addtag_withtag 'selected', 'current'
+  w.raise 'current'
+  $embPlot2['lastX'] = x
+  $embPlot2['lastY'] = y
+end
+
+def embPlotMove2 (w, x, y)
+  w.move 'selected', x - $embPlot2['lastX'], y - $embPlot2['lastY']
+  $embPlot2['lastX'] = x
+  $embPlot2['lastY'] = y
+end
+
+def textWindDel2 (w)
+  if (defined? $twind2_text) && TkWinfo.exist?($twind2_plot)
+    $twind2_text.delete $twind2_plot
+    $twind2_plot = nil
+    while ($twind2_text.get($mark2_plot) =~ /[ \t\n]/)
+      $twind2_text.delete $mark2_plot
+    end
+    $twind2_text.insert $mark2_plot,"  "
+  end
+end
+
+def embDefBg2 (w)
+  w['background'] = w.configinfo('background')[3]
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/unicodeout.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/unicodeout.rb
new file mode 100644
index 0000000000..090cdf3059
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/unicodeout.rb
@@ -0,0 +1,115 @@
+# unicodeout.rb --
+#
+# This demonstration script shows how you can produce output (in label
+# widgets) using many different alphabets.
+#
+# based on Tcl/Tk8.4.4 widget demos
+
+if defined?($unicodeout_demo) && $unicodeout_demo
+  $unicodeout_demo.destroy 
+  $unicodeout_demo = nil
+end
+
+$unicodeout_demo = TkToplevel.new {|w|
+  title("Unicode Label Demonstration")
+  iconname("unicodeout")
+  positionWindow(w)
+}
+
+TkLabel.new($unicodeout_demo, 
+            :font=>$font, :wraplength=>'5.4i', :justify=>:left, 
+            :text=><<EOL).pack(:side=>:top)
+これは，Tkにおける非欧米文字集合を用いる言語に対するサポートについての\
+サンプルです．ただし，下の表示においてあなたが実際にどのような表示を\
+目にするかは，あなたの環境にどのような文字集合がインストールされているかに\
+大きく依存します．また，対象となる文字集合がインストールされていない場合に\
+どのような表示がなされるかもあなたの環境次第です．\
+「コード参照」ボタンを押してソースを表示し，\
+Unicodeout_SampleFrameクラスの@@fontの定義を書き換えて\
+(ファイルの内容は変更されません)\
+「再実行」ボタンのクリックを試してみてください．
+スクリプトが可搬性を持つように，文字列は\\uXXXXという\
+Tclのエスケープ表現を用いたUNICODE文字列で書かれています．\
+文字列は，Tk::UTF8_Stringメソッドによって，\
+「UTF8形式の文字列である」という\
+エンコード情報付きの文字列オブジェクト\
+(Tclのエスケープ表現の変換済み)に変換して\
+ラベルウィジェットに渡している点に注意してください．
+EOL
+#'
+
+TkFrame.new($unicodeout_demo){|f|
+  pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
+
+  TkButton.new(f, :text=>'閉じる', :width=>15, :command=>proc{
+                 $unicodeout_demo.destroy
+                 $unicodeout_demo = nil
+               }).pack(:side=>:left, :expand=>true)
+
+  TkButton.new(f, :text=>'コード参照', :width=>15, :command=>proc{
+                 showCode 'unicodeout'
+               }).pack(:side=>:left, :expand=>true)
+}
+
+wait_msg = TkLabel.new($unicodeout_demo, 
+                       :text=>"フォント読み込みの完了まで" + 
+                              "しばらくお待ち下さい．．．", 
+                       :font=>"Helvetica 12 italic").pack
+
+class Unicodeout_SampleFrame < TkFrame
+  @@font = $font
+  # @@font = 'Helvetica 14'
+  # @@font = 'Courier 12'
+  # @@font = 'clearlyu 16'
+  # @@font = 'fixed 12'
+  # @@font = 'Times 12'
+  # @@font = 'Newspaper 12'
+  # @@font = '{New century schoolbook} 12'
+
+  def initialize()
+    super($unicodeout_demo)
+    grid_columnconfig(1, :weight=>1)
+  end
+
+  def add_sample(lang, *args)
+    sample_txt = Tk::UTF8_String(args.join(''))
+    l = TkLabel.new(self, :font=>@@font, :text=>lang+':', 
+                    :anchor=>:nw, :pady=>0)
+    #s = TkLabel.new(self, :font=>@@font, :text=>sample_txt, 
+    s = TkLabel.new(self, :font=>TkFont.new(@@font), :text=>sample_txt, 
+                    :anchor=>:nw, :width=>30, :pady=>0)
+    Tk.grid(l, s, :sticky=>:ew, :pady=>0)
+    l.grid_config(:padx, '1m')
+  end
+end
+f = Unicodeout_SampleFrame.new
+f.pack(:expand=>true, :fill=>:both, :padx=>'2m', :pady=>'1m')
+
+# Processing when some characters are missing might take a while, so make
+# sure we're displaying something in the meantime...
+
+oldCursor = $unicodeout_demo.cursor
+$unicodeout_demo.cursor('watch')
+Tk.update
+
+f.add_sample('Arabic', 
+             '\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D\uFE94', 
+             '\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D')
+f.add_sample('Trad. Chinese', '\u4E2D\u570B\u7684\u6F22\u5B57')
+f.add_sample('Simpl. Chinese', '\u6C49\u8BED')
+f.add_sample('Greek', 
+             '\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE ', 
+             '\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1')
+f.add_sample('Hebrew', 
+             '\u05DD\u05D9\u05DC\u05E9\u05D5\u05E8\u05D9 ', 
+             '\u05DC\u05D9\u05D0\u05E8\u05E9\u05D9')
+f.add_sample('Japanese', 
+             '\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, ', 
+             '\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA')
+f.add_sample('Korean', '\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00')
+f.add_sample('Russian', 
+             '\u0420\u0443\u0441\u0441\u043A\u0438\u0439 ', 
+             '\u044F\u0437\u044B\u043A')
+
+wait_msg.destroy
+$unicodeout_demo.cursor(oldCursor)
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/vscale.rb b/ruby_1_8_6/ext/tk/sample/demos-jp/vscale.rb
new file mode 100644
index 0000000000..86f6f7cdee
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/vscale.rb
@@ -0,0 +1,78 @@
+require "tkcanvas"
+
+if defined?($vscale_demo) && $vscale_demo
+  $vscale_demo.destroy
+  $vscale_demo = nil
+end
+
+$vscale_demo = TkToplevel.new {|w|
+  title("Vertical Scale Demonstration")
+  iconname("vscale")
+}
+positionWindow($vscale_demo)
+
+msg = TkLabel.new($vscale_demo) {
+  font $font
+  wraplength '3.5i'
+  justify 'left'
+#  text "下には矢印が1つと乗直なスケールが表示されています。\
+#スケール上でマウスボタン1をクリック、またはドラッグすると\
+#矢印の長さを変えることができます。"
+  text "にはバーと縦型のスケールが表示されています。スケールでマウスのボタン1 をクリックするかドラッグしてバーの高さを変えることができます。終ったら「了解」ボタンを押してください。"
+}
+msg.pack('side'=>'top', 'padx'=>'.5c')
+
+TkFrame.new($vscale_demo) {|frame|
+  TkButton.new(frame) {
+    #text '了解'
+    text '閉じる'
+    command proc {
+      tmppath = $vscale_demo
+      $vscale_demo = nil
+      tmppath.destroy
+    }
+  }.pack('side'=>'left', 'expand'=>'yes')
+
+  TkButton.new(frame) {
+    text 'コード参照'
+    command proc { showCode 'vscale' }
+  }.pack('side'=>'left', 'expand'=>'yes')
+}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
+
+TkFrame.new($vscale_demo) {|frame|
+  borderwidth 10
+  canvas = TkCanvas.new(frame) {|c|
+    width 50
+    height 50
+    bd 0
+    highlightthickness 0
+    TkcPolygon.new(c, 0, 0, 1, 1, 2, 2) {
+      fill 'SeaGreen3'
+      tags 'poly'
+    }
+    TkcLine.new(c, 0, 0, 1, 1, 2, 2, 0, 0) {
+      fill 'black'
+      tags 'line'
+    }
+  }.pack('side'=>'left',  'anchor'=>'nw', 'fill'=>'y')
+  scale = TkScale.new(frame) {
+    orient 'vertical'
+    length 284
+    from 0
+    to 250
+    command proc{|value| setHeight(canvas, value)}
+    tickinterval 50
+  }.pack('side'=>'left', 'anchor'=>'ne')
+  scale.set 75
+}.pack
+
+
+def setHeight(w, height)
+  height = height + 21
+  y2 = height - 30
+  if y2 < 21
+    y2 = 21
+  end
+  w.coords 'poly',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
+  w.coords 'line',15,20,35,20,35,y2,45,y2,25,height,5,y2,15,y2,15,20
+end
diff --git a/ruby_1_8_6/ext/tk/sample/demos-jp/widget b/ruby_1_8_6/ext/tk/sample/demos-jp/widget
new file mode 100644
index 0000000000..11495dda54
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/demos-jp/widget
@@ -0,0 +1,973 @@
+#!/usr/bin/env ruby
+
+# 漢字コード設定 ( tk.rb のロード時の encoding 推定/設定に使われる )
+$KCODE = 'euc'
+
+# tk 関係ライブラリの読み込み
+require 'tk'
+# require 'tkafter'
+
+# widget demo directory 位置の獲得
+$demo_dir = File.dirname($0)
+
+# root の生成
+$root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
+
+# tk バージョンの取得
+$tk_version = Tk::TK_VERSION
+$tk_major_ver, $tk_minor_ver = $tk_version.split('.').map{|n| n.to_i}
+$tk_patchlevel = Tk::TK_PATCHLEVEL
+
+# tcl_platform 情報へのアクセスオブジェクト
+$tk_platform = TkVarAccess.new('tcl_platform')
+
+# フォント設定
+#######
+case($tk_version)
+when /^4.*/
+  $font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
+  knjfont = '-*--16-*-jisx0208.1983-0'
+  $kanji_font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
+                           knjfont)
+  TkOption.add('*kanjiFont', knjfont, 'startupFile')
+  $msg_kanji_font=TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
+                             '-*--24-*-jisx0208.1983-0')
+
+#when '8.0'
+#  $font = TkFont.new('Helvetica -12')
+#  $kanji_font = TkFont.new('Helvetica -12', 'Mincho -12')
+#  TkOption.add('*kanjiFont', knjfont, 'startupFile')
+#  $msg_kanji_font=TkFont.new('Helvetica 16', 'Gothic 16 bold')
+
+when /^8.*/
+  $font = TkFont.new('Helvetica -12')
+  $kanji_font = TkFont.new('Helvetica -12', 'Mincho -12')
+  TkOption.add('*kanjiFont', knjfont, 'startupFile')
+  $msg_kanji_font=TkFont.new('Helvetica 16', 'Gothic 16 bold')
+
+else
+  $font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*', nil)
+  knjfont = '-*--16-*-jisx0208.1983-0'
+  $kanji_font = TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
+                           knjfont)
+  TkOption.add('*kanjiFont', knjfont, 'startupFile')
+  $msg_kanji_font=TkFont.new('-*-Helvetica-Medium-R-Normal--*-140-*-*-*-*-*-*',
+                             '-*--24-*-jisx0208.1983-0')
+end
+#######
+
+# イメージ設定
+$image = {}
+
+if $tk_major_ver >= 8
+$image['refresh'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
+    R0lGODlhEAAQAPMAAMz/zCpnKdb/1z9mPypbKBtLGy9NMPL/9Or+6+P+4j1Y
+    PwQKBP7//xMLFAYBCAEBASH5BAEAAAAALAAAAAAQABAAAwR0EAD3Gn0Vyw0e
+    ++CncU7IIAezMA/nhUqSLJizvSdCEEjy2ZIV46AwDAoDHwPYGSoEiUJAAGJ6
+    EDHBNCFINW5OqABKSFk/B9lUa94IDwIFgewFMwQDQwCZQCztTgM9Sl8SOEMG
+    KSAthiaOjBMPDhQONBiXABEAOw==
+EOD
+end
+
+if $tk_major_ver >= 8
+$image['view'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
+    R0lGODlhEAAQAPMAAMz/zP///8DAwICAgH9/fwAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAwRIcMhJB7h3hM33
+    KFjWdQQYap1QrCaGBmrRrS4nj5b53jOgbwXBKGACoYLDIuAoHCmZyYvR1rT5
+    RMAq8LqcIYGsrjPsW1XOmFUEADs=
+EOD
+end
+
+if $tk_major_ver >= 8
+$image['delete'] = TkPhotoImage.new(:height=>16, :format=>'GIF', :data=><<EOD)
+    R0lGODlhEAAOAKEAAIQAAO/n3v///////yH5BAEKAAIALAAAAAAQAA4AAAIm
+    lI9pAKHbIHNoVhYhTdjlJ2AWKG2g+CldmB6rxo2uybYhbS80eRQAOw==
+EOD
+end
+
+if $tk_major_ver >= 8
+$image['print'] = TkPhotoImage.new(:height=>19, :format=>'GIF', :data=><<EOD)
+    R0lGODlhGgATAPcAACEQOTEpQjEpUkIpc0IxY0I5c0oxjEo5SlJCY1JCe1JK
+    UlpChFpCjFpGkFpSc1paa2NKc2NKnGNja2tapWtjc29KnHNanHNjc3NjrXNr
+    jHNrnHNzc3tjpXtrtXtzhICAgIRzvYSEjIZzqox7tYyEnIyMjJSEtZSEvZSM
+    lJyMtZyMvZyUlJyUrZyUvZycnKWctaWlpa2czq2lzrWtvbWtzrW1tb21xr21
+    1sa9zs693s7OztbO3tbO597W1t7W7+fe7+fn5////+/n7+/v7+/v9////wAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAACH5BAEAAEEALAAAAAAaABMAQAj/AIMIHBhkg0GC
+    CBMGIQEiQgseQT4oeCBBAokgRYYQ0JBixg8hRIiUUEBBYYmTByBwiCBCRYwH
+    CxY8cKFw4AogRXLqLAJkQ80gCBBg3BkxZswTNGh4MGqgQQUMJRHCwMkTSE+D
+    Pn8eCKBhxIMhO3ei2OHDBw6sWSlMMMoWgwwfMDZI8GBjx44NARZwEGGi5MkS
+    PcIWKRGz5YgLbAco+KkQBQoJIRgjdGEVq+SaJajqtNrzMgsPCmoIzqmDgmWE
+    KOBuUKAAwYabYTfs4OHjY0giGyhk4MAWRI4eKyRQqPgggYUXPH4A+XBAgwoK
+    DiIsCFxjA9sFEVQQCRJCAYAFDJxiKhAxvMTonEFimrhhYinTBgWiCvxLNX3M
+    DkkpsKV5OYhjBxCMYAICAigUEAA7
+EOD
+end
+
+# メニュー設定
+TkMenubar.new($root, 
+              [[['File', 0], 
+                  ['About ... ', proc{aboutBox}, 0, '<F1>'],
+                  '---', 
+                  ['Quit', proc{exit}, 0, 'Meta-Q']
+                ]]).pack('side'=>'top', 'fill'=>'x')
+$root.bind('F1', proc{aboutBox})
+$root.bind('Meta-q', proc{exit})
+
+=begin
+TkFrame.new($root){|frame|
+  TkMenubutton.new(frame){|button|
+    m = TkMenu.new(button) {
+      add 'command', 'label'=>'Quit', 'command'=>proc{exit}, 'underline'=>0
+    }
+    menu m
+    text 'File'
+    underline 0
+  }.pack('side'=>'left')
+}.pack('side'=>'top', 'fill'=>'x')
+=end
+
+# テキストボックスの生成
+if $tk_version =~ /^4\.[01]/
+  scr = TkScrollbar.new($root, 'orient'=>'vertical')
+  txt = TkText.new($root) {
+    #wrap 'word'
+    wrap 'char'
+    width 70
+    height 30
+    font $font
+    setgrid 'yes'
+    yscrollcommand proc{|first,last| scr.set first,last}
+  }
+  scr.command(proc{|*args| txt.yview(*args)})
+  scr.pack('side'=>'right', 'fill'=>'y')
+  txt.pack('expand'=>'yes', 'fill'=>'both')
+else
+  textFrame = TkFrame.new($root)
+  scr = TkScrollbar.new($root, 'orient'=>'vertical', 
+                        'highlightthickness'=>0, 'takefocus'=>1) {
+    pack('in'=>textFrame, 'side'=>'right', 'fill'=>'y', 'padx'=>1)
+  }
+  txt = TkText.new($root) {
+    #wrap 'word'
+    wrap 'char'
+    width 70
+    height 30
+    font $font
+    setgrid 'yes'
+    highlightthickness 0
+    padx 4
+    pady 2
+    takefocus 0
+    bd 1
+    yscrollcommand proc{|first,last| scr.set first,last}
+  }
+  scr.command(proc{|*args| txt.yview(*args)})
+#  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both', 'padx'=>1)
+  txt.pack('in'=>textFrame, 'expand'=>'yes', 'fill'=>'both')
+#  textFrame.pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>2)
+  textFrame.pack('expand'=>'yes', 'fill'=>'both')
+
+  statusBar = TkFrame.new($root) {|f|
+    $statusBarLabel = \
+    TkLabel.new(f, 'text'=>"   ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
+                'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
+    .pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
+    TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w', 
+                'font'=>'-*-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*') \
+    .pack('side'=>'left', 'padx'=>2)
+  }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
+end
+
+# テキストタグ設定
+tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
+#tag_kanji_title = TkTextTag.new(txt, 'kanjifont'=>$msg_kanji_font)
+#tag_middle = TkTextTag.new(txt, 'kanjifont'=>$kanji_font)
+tag_kanji_title = TkTextTag.new(txt, 'font'=>$msg_kanji_font)
+tag_middle = TkTextTag.new(txt, 'font'=>$kanji_font)
+tag_demospace = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c')
+
+if TkWinfo.depth($root) == 1
+  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
+                           'underline'=>1)
+  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
+                              'underline'=>1)
+  tag_hot = TkTextTag.new(txt, 'background'=>'black', 'foreground'=>'white')
+else
+  tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
+                           'foreground'=>'blue', 'underline'=>1)
+  $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c', 
+                              'foreground'=>'#303080', 'underline'=>1)
+#  tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1, 
+#                         'background'=>'SeaGreen3')
+  tag_hot = TkTextTag.new(txt, 'borderwidth'=>1, 'foreground'=>'red')
+end
+
+#tag_demo.bind('Button-1', proc{invoke txt, txt.index('current')})
+tag_demo.bind('ButtonRelease-1', 
+              proc{|x,y|invoke txt, txt.index("@#{x},#{y}")}, '%x %y')
+
+lastLine = TkVariable.new("")
+newLine  = TkVariable.new("")
+tag_demo.bind('Enter', proc{|x,y|
+                lastLine.value = txt.index("@#{x},#{y} linestart")
+                tag_hot.add(lastLine.value, "#{lastLine.value} lineend")
+                showStatus txt, txt.index("@#{x},#{y}")
+              },
+              '%x %y')
+tag_demo.bind('Leave', 
+              proc{
+                tag_hot.remove('1.0','end')
+                txt.configure('cursor','xterm')
+                $statusBarLabel.configure('text'=>"")
+              })
+tag_demo.bind('Motion', proc{|x, y|
+                newLine.value = txt.index("@#{x},#{y} linestart")
+                if newLine.value != lastLine.value
+                  tag_hot.remove('1.0','end')
+                  lastLine.value = newLine.value
+                  if ( txt.tag_names("@#{x},#{y}").find{|t| 
+                        t.kind_of?(String) && t =~ /^demo-/
+                      } )
+                    tag_hot.add(lastLine.value, 
+                                "#{lastLine.value} lineend -1 chars")
+                  end
+                end
+                showStatus txt, txt.index("@#{x},#{y}")
+              },
+              '%x %y')
+
+# テキスト生成
+txt.insert('end', 'Ruby/Tk : Widget', tag_title)
+#txt.insert('end', "  デモンストレーション\n", tag_middle)
+txt.insert('end', "  デモンストレーション\n", tag_kanji_title)
+txt.insert('end', <<"EOT")
+
+このアプリケーションは、Tk Widget を用いてどのようなことができるか\
+を示すための、いくつかの小さなスクリプトに対するフロントエンドを提\
+供しています。以下に順番に挙げられているデモンストレーションを実行\
+するにはマウスでクリックしてください。デモンストレーションのウィン\
+ドウが現れると、デモンストレーションを生成した Ruby/Tk のコードを見\
+るために、"コード参照"ボタンをクリックすることができます。あなたが\
+望むなら、そのコードを修正することができます。修正したコードでデモ\
+ンストレーションを再実行するためには、コードが書かれたウィンドウに\
+ある"デモ再実行" ボタンをクリックしてください。
+
+一部のデモでは，比較的最近のバージョンの Tk でなければサポートして\
+いない機能を使って実装しています(例えば Tk8.4 以上など)．そのため，\
+そうした機能を持たない Tk ライブラリを使っている場合には，そうした\
+デモは正しく動きません．そのような機能が必要であれば，それをサポート\
+している Tk ライブラリを使うように，tcltklib をコンパイルしなおして\
+ください．
+
+
+EOT
+
+#txt.insert('end',"ラベル, ボタン, チェックボタン, ラジオボタン\n",tag_middle)
+txt.insert('end', "ラベル, ボタン, チェックボタン, ラジオボタン\n", 
+           tag_kanji_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. ラベル (テキスト, ビットマップ)\n", 
+           tag_demo, "demo-label")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. ラベルとUNICODEテキスト (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-unicodeout")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. ボタン \n", tag_demo, "demo-button")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. チェックボタン (複数を選択可能)\n", 
+           tag_demo, "demo-check")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "5. ３状態チェックボタン (機能に対応したバージョンのTkが必要)\n", 
+           tag_demo, "demo-check2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "6. ラジオボタン (任意の一つを選択可能)\n", 
+           tag_demo, "demo-radio")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "7. ラジオボタン (機能に対応したバージョンのTkが必要)\n", 
+           tag_demo, "demo-radio2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "8. ３状態ラジオボタン (機能に対応したバージョンのTkが必要)\n", 
+           tag_demo, "demo-radio3")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "9. ボタンで作られた15-パズルゲーム\n", 
+           tag_demo, "demo-puzzle")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "10. ビットマップを使用したアイコンボタン\n", 
+           tag_demo, "demo-icon")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "11. 画像を表示する二つのラベル\n", 
+           tag_demo, "demo-image1")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "12. 画像を見るための簡単なユーザインターフェース\n", 
+           tag_demo, "demo-image2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "13. 画像を見るための簡単なユーザインターフェース (機能に対応したバージョンのTkが必要)\n", 
+           tag_demo, "demo-image3")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "14. ラベル付きフレーム (機能に対応したバージョンのTkが必要)\n", 
+           tag_demo, "demo-labelframe")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+#txt.insert('end', "リストボックス\n", tag_middle)
+txt.insert('end', "リストボックス\n", tag_kanji_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. 都道府県.\n", tag_demo, "demo-states")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. 色: アプリケーションのための配色を変える\n", 
+           "#{tag_demo.id} demo-colors")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. 格言集\n", tag_demo, "demo-sayings")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+#txt.insert('end', "エントリとスピンボックス\n", tag_middle)
+txt.insert('end', "エントリ\n", tag_kanji_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. スクロールバーなし\n", tag_demo, "demo-entry1")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. スクロールバーあり\n", tag_demo, "demo-entry2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. 認証処理付きのエントリボックスとパスワードフィールド (機能に対応したバージョンのTkが必要)\n", 
+           tag_demo, "demo-entry3")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. スピンボックス (機能に対応したバージョンのTkが必要)\n", 
+           tag_demo, "demo-spin")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "5. 簡単なフォーム\n", tag_demo, "demo-form")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+#txt.insert('end', "テキスト\n", tag_middle)
+txt.insert('end', "テキスト\n", tag_kanji_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. 基本的なテキスト\n", tag_demo, "demo-text")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. 表示スタイル.\n", tag_demo, "demo-style")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. ハイパーテキスト(タグバインド).\n", 
+           tag_demo, "demo-bind")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. ウィンドウを埋め込んだテキスト\n", 
+           tag_demo, "demo-twind")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "5. ウィンドウを埋め込んだテキスト (機能に対応したバージョンのTkが必要)\n", 
+           tag_demo, "demo-twind2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "6. 検索\n", tag_demo, "demo-search")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+#txt.insert('end', "キャンバス\n", tag_middle)
+txt.insert('end', "キャンバス\n", tag_kanji_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. アイテムの型\n", tag_demo, "demo-items")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. 2 次元のプロット\n", tag_demo, "demo-plot")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. テキスト\n", tag_demo, "demo-ctext")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. 矢印の形\n", tag_demo, "demo-arrow")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "5. ルーラー\n", tag_demo, "demo-ruler")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "6. フロアプラン\n", tag_demo, "demo-floor")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "7. フロアプラン (異なるキャンバスアイテム作成方法を使用)\n", tag_demo, "demo-floor2")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "8. スクロール可能なキャンバス\n", 
+           tag_demo, "demo-cscroll")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+#txt.insert('end', "スケール\n", tag_middle)
+txt.insert('end', "スケール\n", tag_kanji_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. 垂直\n", tag_demo.id, "demo-vscale")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. 水平\n", tag_demo.id, "demo-hscale")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+txt.insert('end', "ペインドウィンドウ\n", tag_kanji_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. 水平方向 (機能に対応したバージョンのTkが必要)\n", 
+           tag_demo.id, "demo-paned1")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. 垂直方向 (機能に対応したバージョンのTkが必要)\n", 
+           tag_demo.id, "demo-paned2")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+#txt.insert('end', "メニュー\n", tag_middle)
+txt.insert('end', "メニュー\n", tag_kanji_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. メニューとカスケードを含んだウィンドウ\n", 
+           tag_demo, "demo-menu")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. メニューとカスケードを含んだウィンドウ (Tk8.x 専用)\n", 
+           tag_demo, "demo-menu8x")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3.                 〃                (機能に対応したバージョンのTkが必要)\n", 
+           tag_demo, "demo-menu84")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. メニューボタン (Tk8.x 専用)\n", 
+           tag_demo, "demo-menubu")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+#txt.insert('end', "ダイアログウィンドウ\n", tag_middle)
+txt.insert('end', "ダイアログウィンドウ\n", tag_kanji_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. メッセージボックス\n", tag_demo, "demo-msgbox")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. ファイル選択ダイアログ\n", tag_demo, "demo-filebox")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. 色選択ダイアログ\n", tag_demo, "demo-clrpick")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.insert('end', "\n")
+#txt.insert('end', "アニメーション\n", tag_middle)
+txt.insert('end', "アニメーション\n", tag_kanji_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. アニメーションラベル (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-anilabel")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. 波形のアニメーション (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-aniwave")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. 振り子のシミュレーション (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-pendulum")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "4. A celebration of Rube Goldberg (機能に対応したバージョンのTkが必要)\n", tag_demo, "demo-goldberg")
+
+txt.insert('end', "\n")
+#txt.insert('end', "その他\n", tag_middle)
+txt.insert('end', "その他\n", tag_kanji_title)
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "1. 組み込みのビットマップ\n", tag_demo, "demo-bitmap")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "2. モーダルダイアログ(ローカルグラブ)\n", 
+           tag_demo, "demo-dialog1")
+txt.insert('end', " \n ", tag_demospace)
+txt.insert('end', "3. モーダルダイアログ(グローバルグラブ)\n", 
+           tag_demo, "demo-dialog2")
+txt.insert('end', " \n ", tag_demospace)
+
+txt.state('disabled')
+scr.focus
+
+################################
+# method 定義
+################################
+def positionWindow(w)
+  w.geometry('+300+300')
+end
+
+# 親ウィジェットと，変数名と TkVariable との組(配列)の並びを渡す
+$showVarsWin = {}
+def showVars1(parent, *args)
+  if $showVarsWin[parent.path]
+    begin
+      $showVarsWin[parent.path].destroy 
+    rescue
+    end
+  end
+  top = TkToplevel.new(parent) {|w|
+    title "Variable values"
+    TkLabel.new(w) {
+      text "変数値:"
+      width 20
+      anchor 'center'
+      font '-Adobe-helvetica-medium-r-normal--*-180-*-*-*-*-*-*'
+    }.pack('side'=>'top', 'fill'=>'x')
+    len = 1
+    args.each{|vnam,vbody|
+      len = vnam.to_s.length if vnam.to_s.length > len
+    }
+    args.each{|vnam,vbody|
+      TkFrame.new(w){|f|
+        #TkLabel.new(f, 'text'=>"#{vnam}: ").pack('side'=>'left')
+        TkLabel.new(f, 'text'=>"#{vnam}: ",'width'=>len+2).pack('side'=>'left')
+        TkLabel.new(f, 'textvariable'=>vbody, 'anchor'=>'w')\
+                   .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x')
+      }.pack('side'=>'top', 'anchor'=>'w', 'fill'=>'x')
+    }
+    TkButton.new(w) {
+      text "了解"
+      command proc{w.destroy}
+    }.pack('side'=>'bottom', 'pady'=>2)
+  }
+  $showVarsWin[parent.path] = top
+end
+
+def showVars2(parent, *args)
+  if $showVarsWin[parent.path]
+    begin
+      $showVarsWin[parent.path].destroy 
+    rescue
+    end
+  end
+  $showVarsWin[parent.path] = TkToplevel.new(parent) {|w|
+    title "Variable values"
+
+    TkLabelFrame.new(w, :text=>"変数値:", 
+                     :font=>{:family=>'Helvetica', :size=>14}){|f|
+      args.each{|vnam,vbody|
+        TkGrid(TkLabel.new(f, :text=>"#{vnam}: ", :anchor=>'w'), 
+               TkLabel.new(f, :textvariable=>vbody, :anchor=>'w'), 
+               :padx=>2, :pady=>2, :sticky=>'w')
+      }
+
+      f.grid(:sticky=>'news', :padx=>4)
+      f.grid_columnconfig(1, :weight=>1)
+      f.grid_rowconfig(100, :weight=>1)
+    }
+    TkButton.new(w, :text=>"了解", :width=>8, :default=>:active, 
+                 :command=>proc{w.destroy}){|b|
+      w.bind('Return', proc{b.invoke})
+      w.bind('Escape', proc{b.invoke})
+
+      b.grid(:sticky=>'e', :padx=>4, :pady=>[6, 4])
+    }
+    w.grid_columnconfig(0, :weight=>1)
+    w.grid_rowconfig(0, :weight=>1)
+  }
+end
+
+if $tk_major_ver < 8
+  alias showVars showVars1
+elsif $tk_major_ver == 8 && $tk_minor_ver < 4
+  alias showVars showVars1
+else # ver >= 8.4
+  alias showVars showVars2
+end
+
+# 疑似トップレベルサポート
+module PseudoToplevel_Evaluable
+  def pseudo_toplevel_eval(body = Proc.new)
+    Thread.current[:TOPLEVEL] = self
+    begin
+      body.call
+    ensure
+      Thread.current[:TOPLEVEL] = nil
+    end
+  end
+
+  def pseudo_toplevel_evaluable?
+    @pseudo_toplevel_evaluable
+  end
+  def pseudo_toplevel_evaluable=(mode)
+    @pseudo_toplevel_evaluable = (mode)? true: false
+  end
+
+  def self.extended(mod)
+    mod.__send__(:extend_object, mod)
+    mod.instance_variable_set('@pseudo_toplevel_evaluable', true)
+  end
+end
+
+class Object
+  alias __method_missing__ method_missing
+  private :__method_missing__
+
+  def method_missing(id, *args)
+    begin
+      has_top = (top = Thread.current[:TOPLEVEL]) && 
+                   top.respond_to?(:pseudo_toplevel_evaluable?) && 
+                   top.pseudo_toplevel_evaluable? && 
+                   top.respond_to?(id)
+    rescue Exception => e
+      has_top = false
+    end
+
+    if has_top
+      top.__send__(id, *args)
+    else
+      __method_missing__(id, *args)
+    end
+  end
+end
+
+class Proc
+  def initialize(*args, &b)
+    super
+    @__pseudo_toplevel__ = Thread.current[:TOPLEVEL]
+  end
+
+  alias __call__ call
+  def call(*args, &b)
+    if top = @__pseudo_toplevel__
+      orig_top = Thread.current[:TOPLEVEL]
+      Thread.current[:TOPLEVEL] = top
+      begin
+        __call__(*args, &b)
+      ensure
+        Thread.current[:TOPLEVEL] = orig_top
+      end
+    else
+      __call__(*args, &b)
+    end
+  end
+end
+
+def proc(&b)
+  Proc.new(&b)
+end
+def lambda(&b)
+  Proc.new(&b)
+end
+
+def _null_binding
+  Module.new.instance_eval{extend PseudoToplevel_Evaluable}
+  # binding
+  # Module.new.instance_eval{binding}
+end
+private :_null_binding
+
+def eval_samplecode(code)
+  Thread.new{ _null_binding.pseudo_toplevel_eval{ eval(code) } }.run
+  Tk.update
+end
+
+# テキスト上での click に対する動作
+def invoke(txt, idx)
+  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
+  return unless tag
+
+  cursor = txt.cget('cursor')
+  txt.cursor('watch')
+  Tk.update
+  # eval(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, _null_binding)
+  # Tk.update
+  eval_samplecode(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join)
+  txt.cursor(cursor)
+
+  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
+end
+=begin
+def invoke (txt, idx)
+  tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
+  return unless tag
+  current_cursor = txt.cget('cursor')
+  txt.cursor('watch')
+  Tk.update
+#  eval `cat #{tag[5..-1]}.rb`
+#  eval `cat #{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb`
+  eval IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join
+  Tk.update
+#  txt.cursor('xterm')
+  txt.cursor(current_cursor)
+
+  $tag_visited.add("#{idx} linestart +1 chars", "#{idx} lineend +1 chars")
+end
+=end
+
+# 状態表示
+def showStatus (txt, index)
+  tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
+  cursor = txt.cget('cursor')
+  unless tag
+    $statusBarLabel.configure('text', " ")
+    newcursor = 'xterm'
+  else
+    demoname = tag[5..-1]
+    $statusBarLabel.configure('text', 
+                             "サンプルプログラム \"#{demoname}\" の実行 ")
+    newcursor = 'hand2'
+  end
+  txt.configure('cursor'=>newcursor) if cursor != newcursor
+end
+
+# ソースコードの表示
+def showCode1(demo)
+  file = "#{demo}.rb"
+  $code_window = nil unless defined? $code_window
+  if $code_window == nil || TkWinfo.exist?($code_window) == false
+    $code_window = TkToplevel.new(nil)
+    f = TkFrame.new($code_window)
+    TkButton.new(f) {
+      #text "了解"
+      text "閉じる"
+      command proc{
+        $code_window.destroy
+        $code_window = nil
+      }
+    }.pack('side'=>'left', 'expand'=>'yes', 'pady'=>2)
+    TkButton.new(f) {
+      text "再実行"
+      # command proc{eval($code_text.get('1.0','end'), _null_binding)}
+      command proc{eval_samplecode($code_text.get('1.0','end'))}
+    }.pack('side'=>'left', 'expand'=>'yes', 'pady'=>2)
+#    f.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x')
+    f.pack('side'=>'bottom', 'fill'=>'x')
+
+    if $tk_version =~ /^4\.[01]/
+      s = TkScrollbar.new($code_window, 'orient'=>'vertical')
+      $code_text = TkText.new($code_window) {
+        height 40
+        setgrid 'yes'
+        yscrollcommand proc{|first,last| s.set first,last}
+      }
+      s.command(proc{|*args| $code_text.yview(*args)})
+      s.pack('side'=>'right', 'fill'=>'y')
+      $code_text.pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
+    else
+      TkFrame.new($code_window) {|f|
+        pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
+
+        hs = TkScrollbar.new($code_window, 'highlightthickness'=>0, 
+                             'orient'=>'horizontal')
+        vs = TkScrollbar.new($code_window, 'highlightthickness'=>0, 
+                             'orient'=>'vertical')
+        $code_text = TkText.new($code_window) {|t|
+          height 40
+          #wrap 'word'
+          wrap 'char'
+          xscrollcommand proc{|first,last| hs.set first,last}
+          yscrollcommand proc{|first,last| vs.set first,last}
+          setgrid 'yes'
+          highlightthickness 0
+          pady 2
+          padx 3
+          hs.command(proc{|*args| $code_text.xview(*args)})
+          vs.command(proc{|*args| $code_text.yview(*args)})
+        }
+
+        $code_text.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0, 
+                        'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+        vs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1, 
+                'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+#       xs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0, 
+#               'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
+        TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+        TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
+      }
+    end
+  else
+    $code_window.deiconify
+    $code_window.raise
+  end
+  $code_window.title("Demo code: #{file}")
+  $code_window.iconname(file)
+#  fid = open(file, 'r')
+  fid = open([$demo_dir, file].join(File::Separator), 'r')
+  $code_text.delete('1.0', 'end')
+  #$code_text.insert('1.0', `cat #{file}`)
+  $code_text.insert('1.0', fid.read)
+  #$code_mark = TkTextMark.new($code_text, '1.0')
+  #$code_text.set_insert('1.0')
+  TkTextMarkInsert.new($code_text,'1.0')
+  fid.close
+end
+
+def showCode2(demo)
+  file = "#{demo}.rb"
+  $code_window = nil unless defined? $code_window
+  if $code_window == nil || TkWinfo.exist?($code_window) == false
+    $code_window = TkToplevel.new(nil)
+    tf = TkFrame.new($code_window)
+    $code_text = TkText.new(tf, :font=>'Courier 10', :height=>30, 
+                           :wrap=>'word', :bd=>1, :setgrid=>true, 
+                           :highlightthickness=>0, :pady=>2, :padx=>3)
+    xscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
+    yscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
+    TkGrid($code_text, yscr, :sticky=>'news')
+    #TkGrid(xscr)
+    tf.grid_rowconfigure(0, :weight=>1)
+    tf.grid_columnconfigure(0, :weight=>1)
+
+    bf = TkFrame.new($code_window)
+    
+    #b_dis = TkButton.new(bf, :text=>'了解', :default=>:active, 
+    b_dis = TkButton.new(bf, :text=>'閉じる', :default=>:active, 
+                         :command=>proc{
+                           $code_window.destroy
+                           $code_window = nil
+                         }, 
+                         :image=>$image['delete'], :compound=>:left)
+    b_prn = TkButton.new(bf, :text=>'印刷', 
+                         :command=>proc{printCode($code_text, file)}, 
+                         :image=>$image['print'], :compound=>:left)
+    b_run = TkButton.new(bf, :text=>'再実行', 
+                         :command=>proc{
+                           # eval($code_text.get('1.0','end'), _null_binding)
+                           eval_samplecode($code_text.get('1.0','end'))
+                         }, 
+                         :image=>$image['refresh'], :compound=>:left)
+
+    TkGrid('x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
+    bf.grid_columnconfigure(0, :weight=>1)
+
+    TkGrid(tf, :sticky=>'news')
+    TkGrid(bf, :sticky=>'ew')
+    $code_window.grid_columnconfigure(0, :weight=>1)
+    $code_window.grid_rowconfigure(0, :weight=>1)
+
+    $code_window.bind('Return', proc{|win|
+                        b_dis.invoke unless win.kind_of?(TkText)
+                      }, '%W')
+    $code_window.bindinfo('Return').each{|cmd, arg|
+      $code_window.bind_append('Escape', cmd, arg)
+    }
+  else
+    $code_window.deiconify
+    $code_window.raise
+  end
+
+  $code_window.title("Demo code: #{file}")
+  $code_window.iconname(file)
+  fid = open([$demo_dir, file].join(File::Separator), 'r')
+  $code_text.delete('1.0', 'end')
+  $code_text.insert('1.0', fid.read)
+  TkTextMarkInsert.new($code_text,'1.0')
+  fid.close
+end
+
+if $tk_major_ver < 8
+  alias showCode showCode1
+elsif $tk_major_ver == 8 && $tk_minor_ver < 4
+  alias showCode showCode1
+else # ver >= 8.4
+  alias showCode showCode2
+end
+
+
+# printCode --
+# Prints the source code currently displayed in the See Code dialog.
+# Much thanks to Arjen Markus for this.
+#
+# Arguments:
+# txt -         Name of text widget containing code to print
+# file -        Name of the original file (implicitly for title)
+
+def printCode(txt, file)
+  code = txt.get('1.0', 'end - 1c')
+  dir = '.'
+  dir = ENV['HOME'] if ENV['HOME']
+  dir = ENV['TMP'] if ENV['TMP']
+  dir = ENV['TEMP'] if ENV['TEMP']
+
+  fname = [dir, 'tkdemo-' + file].join(File::Separator)
+  open(fname, 'w'){|fid| fid.print(code)}
+  begin
+    case Tk::TCL_PLATFORM('platform')
+    when 'unix'
+      msg = `lp -c #{fname}`
+      unless $?.exitstatus == 0
+        Tk.messageBox(:title=>'Print spooling failure', 
+                      :message=>'エラーが発生しました．' + 
+                                '印刷に失敗したものと思われます : ' + msg)
+      end
+    when 'windows'
+      begin
+        printTextWin32(fname)
+      rescue => e
+        Tk.messageBox(:title=>'Print spooling failure', 
+                      :message=>'エラーが発生しました．' + 
+                                '印刷に失敗したものと思われます : ' + 
+                                e.message)
+      end      
+    when 'macintosh'
+      Tk.messageBox(:title=>'Operation not Implemented', 
+                    :message=>'印刷機能はまだ実装されていません')
+    else
+      Tk.messageBox(:title=>'Operation not Implemented', 
+                    :message=>'検出された環境 ' + 
+                              Tk::TCL_PLATFORM('platform') + 
+                              ' は未知の環境であるため，' + 
+                              '印刷機能は実装されていません: ')
+    end
+  ensure
+    File.delete(fname)
+  end
+end
+
+# printTextWin32 --
+#    Print a file under Windows
+#
+# Arguments:
+# filename -            Name of the file
+#
+def printTextWin32(fname)
+  require 'win32/registry'
+  begin
+    app = Win32::Registry::HKEY_CLASSES_ROOT['.txt']
+    pcmd = nil
+    Win32::Registry::HKEY_CLASSES_ROOT.open("#{app}\\shell\\print"){|reg|
+      pcmd = reg['command']
+    }
+  rescue
+    app = Tk.tk_call('auto_execok', 'notepad.exe')
+    pcmd = "#{app} /p %1"
+  end
+
+  pcmd.gsub!('%1', fname)
+  puts pcmd
+  cmd = Tk.tk_call('auto_execok', 'start') + ' /min ' + pcmd
+  
+  msg = `#{cmd}`
+  unless $?.exitstatus == 0
+    fail RuntimeError, msg
+  end
+end
+
+# aboutBox
+#
+#      Pops up a message box with an "about" message
+#
+def aboutBox
+  Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo', 
+                'message'=>"Ruby/Tk ウィジェットデモ Ver.1.6.0-jp\n\n" + 
+                           "based on demos of Tk8.1 -- 8.5  " + 
+                           "( Copyright:: " + 
+                           "(c) 1996-1997 Sun Microsystems, Inc. / " + 
+                           "(c) 1997-2000 Ajuba Solutions, Inc. / " + 
+                           "(c) 2001-2003 Donal K. Fellows )\n\n" +
+                           "Your Ruby & Tk Version ::\n" + 
+                           "Ruby#{RUBY_VERSION}(#{RUBY_RELEASE_DATE})[#{RUBY_PLATFORM}] / Tk#{$tk_patchlevel}#{(Tk::JAPANIZED_TK)? '-jp': ''}\n\n" + 
+                           "Ruby/Tk release date :: tcltklib #{TclTkLib::RELEASE_DATE}; tk #{Tk::RELEASE_DATE}")
+end
+
+####################################
+# 引数で指定されたデモを起動する
+no_launcher = false
+if ARGV[0] == '-n'
+  ARGV.shift
+  no_launcher = true if ARGV.size > 0
+else
+  # show the root widget to make it lower then demo windows
+  Tk.update
+end
+ARGV.each{|cmd| 
+  if cmd =~ /(.*).rb/
+    cmd = $1
+  end
+  #eval(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join, 
+  #     _null_binding)
+  eval_samplecode(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join)
+}
+if no_launcher
+  $root.withdraw  # hide root window
+  Thread.start{
+    loop do
+      count = 0
+      $root.winfo_children.each{|w|
+        count += 1 if w.kind_of?(TkToplevel)
+      }
+      $root.destroy if count == 0
+    end
+  }
+end
+
+################################
+# イベント待ちに入る
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/editable_listbox.rb b/ruby_1_8_6/ext/tk/sample/editable_listbox.rb
new file mode 100644
index 0000000000..99345da380
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/editable_listbox.rb
@@ -0,0 +1,69 @@
+#
+# Editable_TkListbox class
+#
+#   When "DoubleClick-1" on a listbox item, the entry box is opend on the
+#   item. And when hit "Return" key on the entry box after modifying the
+#   text, the entry box is closed and the item is changed. Or when hit 
+#   "Escape" key, the entry box is closed without modification.
+#
+#                              by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+class Editable_TkListbox < TkListbox
+  def _ebox_placer(coord_y)
+    idx = self.nearest(coord_y)
+    x, y, w, h = self.bbox(idx)
+    @ebox.place(:x => 0, :relwidth => 1.0, 
+                :y => y - self.selectborderwidth, 
+                :height => h + 2 * self.selectborderwidth)
+    @ebox.pos = idx
+    @ebox.value = self.listvariable.list[idx]
+    @ebox.focus
+  end
+  private :_ebox_placer
+
+
+  def create_self(keys)
+    super(keys)
+
+    unless self.listvariable
+      self.listvariable = TkVariable.new(self.get(0, :end))
+    end
+
+    @ebox = TkEntry.new(self){
+      @pos = -1
+      def self.pos; @pos; end
+      def self.pos=(idx); @pos = idx; end
+    }
+
+    @ebox.bind('Return'){
+      list = self.listvariable.list
+      list[@ebox.pos] = @ebox.value
+      self.listvariable.value = list
+      @ebox.place_forget
+      @ebox.pos = -1
+    }
+
+    @ebox.bind('Escape'){
+      @ebox.place_forget
+      @ebox.pos = -1
+    }
+
+    self.bind('Double-1', '%y'){|y| _ebox_placer(y) }
+  end
+end
+
+if $0 == __FILE__
+  scr = TkScrollbar.new.pack(:side=>:right, :fill=>:y)
+
+  lbox1 = Editable_TkListbox.new.pack(:side=>:left)
+  lbox2 = Editable_TkListbox.new.pack(:side=>:left)
+
+  scr.assign(lbox1, lbox2)
+
+  lbox1.insert(:end, *%w(a b c d e f g h i j k l m n))
+  lbox2.insert(:end,     0,1,2,3,4,5,6,7,8,9,0,1,2,3)
+
+  Tk.mainloop
+end
diff --git a/ruby_1_8_6/ext/tk/sample/encstr_usage.rb b/ruby_1_8_6/ext/tk/sample/encstr_usage.rb
new file mode 100644
index 0000000000..4285ec861c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/encstr_usage.rb
@@ -0,0 +1,29 @@
+require 'tk'
+
+TkMessage.new(:width=>400, :text=><<EOM).pack
+This sample shows how to use Tk::EncodedString class. \
+This reads 'iso2022-kr' text (from discription of \
+Korean language environment of GNU Emacs 20.7.2) \
+and inserts the text into the text widget.
+EOM
+
+t1 = TkText.new(:height=>5).pack
+t2 = TkText.new(:height=>5).pack
+t3 = TkText.new(:height=>5).pack
+
+src_str = IO.readlines('iso2022-kr.txt').join
+
+t1.insert('end', 
+          "use neither Tk::EncodedString class nor Tk.encoding= method\n\n")
+t1.insert('end', src_str)
+
+enc_str = Tk::EncodedString(src_str, 'iso2022-kr')
+t2.insert('end', 
+          "use Tk::EncodedString class (Tk.encoding => '#{Tk.encoding}')\n\n")
+t2.insert('end', enc_str)
+
+Tk.encoding = 'iso2022-kr'
+t3.insert('end', "use Tk.encoding = 'iso2022-kr'\n\n")
+t3.insert('end', src_str)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/images/earth.gif b/ruby_1_8_6/ext/tk/sample/images/earth.gif
new file mode 100644
index 0000000000..2c229eb110
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/earth.gif
diff --git a/ruby_1_8_6/ext/tk/sample/images/earthris.gif b/ruby_1_8_6/ext/tk/sample/images/earthris.gif
new file mode 100644
index 0000000000..c4ee473727
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/earthris.gif
diff --git a/ruby_1_8_6/ext/tk/sample/images/face.xbm b/ruby_1_8_6/ext/tk/sample/images/face.xbm
new file mode 100644
index 0000000000..03d829f4d1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/face.xbm
@@ -0,0 +1,173 @@
+#define face_width 108
+#define face_height 144
+#define face_x_hot 48
+#define face_y_hot 80
+static char face_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09,
+   0x20, 0x80, 0x24, 0x05, 0x00, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x88,
+   0x24, 0x20, 0x80, 0x24, 0x00, 0x00, 0x00, 0x10, 0x80, 0x04, 0x00, 0x01,
+   0x00, 0x01, 0x40, 0x0a, 0x09, 0x00, 0x92, 0x04, 0x80, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x10, 0x40, 0x12, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00, 0x84,
+   0x24, 0x40, 0x22, 0xa8, 0x02, 0x14, 0x84, 0x92, 0x40, 0x42, 0x12, 0x04,
+   0x10, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x52, 0x11, 0x00, 0x12, 0x00,
+   0x40, 0x02, 0x00, 0x20, 0x00, 0x08, 0x00, 0xaa, 0x02, 0x54, 0x85, 0x24,
+   0x00, 0x10, 0x12, 0x00, 0x00, 0x81, 0x44, 0x00, 0x90, 0x5a, 0x00, 0xea,
+   0x1b, 0x00, 0x80, 0x40, 0x40, 0x02, 0x00, 0x08, 0x00, 0x20, 0xa2, 0x05,
+   0x8a, 0xb4, 0x6e, 0x45, 0x12, 0x04, 0x08, 0x00, 0x00, 0x00, 0x10, 0x02,
+   0xa8, 0x92, 0x00, 0xda, 0x5f, 0x10, 0x00, 0x10, 0xa1, 0x04, 0x20, 0x41,
+   0x02, 0x00, 0x5a, 0x25, 0xa0, 0xff, 0xfb, 0x05, 0x41, 0x02, 0x04, 0x00,
+   0x00, 0x08, 0x40, 0x80, 0xec, 0x9b, 0xec, 0xfe, 0x7f, 0x01, 0x04, 0x20,
+   0x90, 0x02, 0x04, 0x00, 0x08, 0x20, 0xfb, 0x2e, 0xf5, 0xff, 0xff, 0x57,
+   0x00, 0x04, 0x02, 0x00, 0x00, 0x20, 0x01, 0xc1, 0x6e, 0xab, 0xfa, 0xff,
+   0xff, 0x05, 0x90, 0x20, 0x48, 0x02, 0x00, 0x04, 0x20, 0xa8, 0xdf, 0xb5,
+   0xfe, 0xff, 0xff, 0x0b, 0x01, 0x00, 0x01, 0x00, 0x80, 0x80, 0x04, 0xe0,
+   0xbb, 0xef, 0xff, 0xff, 0x7f, 0x01, 0x00, 0x04, 0x48, 0x02, 0x00, 0x20,
+   0x80, 0xf4, 0x6f, 0xfb, 0xff, 0xff, 0xff, 0x20, 0x90, 0x40, 0x02, 0x00,
+   0x00, 0x04, 0x08, 0xb8, 0xf6, 0xff, 0xff, 0xdf, 0xbe, 0x12, 0x45, 0x10,
+   0x90, 0x04, 0x90, 0x00, 0x22, 0xfa, 0xff, 0xff, 0xff, 0xbb, 0xd7, 0xe9,
+   0x3a, 0x02, 0x02, 0x00, 0x04, 0x90, 0x80, 0xfe, 0xdf, 0xf6, 0xb7, 0xef,
+   0xbe, 0x56, 0x57, 0x40, 0x48, 0x09, 0x00, 0x04, 0x00, 0xfa, 0xf5, 0xdf,
+   0xed, 0x5a, 0xd5, 0xea, 0xbd, 0x09, 0x00, 0x00, 0x40, 0x00, 0x92, 0xfe,
+   0xbf, 0x7d, 0xb7, 0x6a, 0x55, 0xbf, 0xf7, 0x02, 0x11, 0x01, 0x00, 0x91,
+   0x00, 0xff, 0xff, 0xaf, 0x55, 0x55, 0x5b, 0xeb, 0xef, 0x22, 0x04, 0x04,
+   0x04, 0x00, 0xa4, 0xff, 0xf7, 0xad, 0xaa, 0xaa, 0xaa, 0xbe, 0xfe, 0x03,
+   0x20, 0x00, 0x10, 0x44, 0x80, 0xff, 0x7f, 0x55, 0x12, 0x91, 0x2a, 0xeb,
+   0xbf, 0x0b, 0x82, 0x02, 0x00, 0x00, 0xd1, 0x7f, 0xdf, 0xa2, 0xa4, 0x54,
+   0x55, 0xfd, 0xfd, 0x47, 0x08, 0x08, 0x00, 0x21, 0xe4, 0xff, 0x37, 0x11,
+   0x09, 0xa5, 0xaa, 0xb6, 0xff, 0x0d, 0x80, 0x00, 0x00, 0x04, 0xd0, 0xff,
+   0x4f, 0x44, 0x20, 0x48, 0x55, 0xfb, 0xff, 0x27, 0x11, 0x02, 0x40, 0x40,
+   0xe2, 0xfb, 0x15, 0x11, 0x4a, 0x55, 0x4a, 0x7d, 0xf7, 0x0f, 0x00, 0x00,
+   0x04, 0x08, 0xf8, 0xdf, 0x52, 0x44, 0x01, 0x52, 0xb5, 0xfa, 0xff, 0x0f,
+   0x49, 0x02, 0x00, 0x02, 0xe9, 0xf6, 0x0a, 0x11, 0xa4, 0x88, 0x4a, 0x6d,
+   0xff, 0x5f, 0x00, 0x00, 0x10, 0x20, 0xf0, 0x2f, 0x21, 0x44, 0x10, 0x52,
+   0xb5, 0xfa, 0xff, 0x0f, 0x44, 0x04, 0x80, 0x08, 0xf8, 0xab, 0x8a, 0x00,
+   0x81, 0xa4, 0xd4, 0xd6, 0xfe, 0x2f, 0x00, 0x00, 0x04, 0x40, 0xb5, 0x2d,
+   0x21, 0x08, 0x04, 0x90, 0xaa, 0xfa, 0xff, 0x1f, 0x11, 0x01, 0x00, 0x04,
+   0xf0, 0x57, 0x0a, 0x22, 0x40, 0x4a, 0xda, 0x5e, 0xfb, 0x1f, 0x40, 0x00,
+   0x40, 0x20, 0xba, 0x95, 0x90, 0x00, 0x01, 0xa0, 0xaa, 0xea, 0xff, 0x5f,
+   0x02, 0x02, 0x00, 0x01, 0xe8, 0x57, 0x05, 0x00, 0x00, 0x12, 0xd5, 0xfe,
+   0xfd, 0x1f, 0x48, 0x00, 0x04, 0x48, 0x7a, 0x95, 0x08, 0x02, 0x10, 0x40,
+   0xaa, 0x55, 0xf7, 0x1f, 0x00, 0x09, 0x20, 0x00, 0xf8, 0x57, 0x22, 0x10,
+   0x00, 0x28, 0xa9, 0xfa, 0xff, 0x5f, 0x02, 0x00, 0x00, 0x49, 0xdd, 0x29,
+   0x01, 0x00, 0x80, 0x80, 0xaa, 0xd7, 0xff, 0x0f, 0x10, 0x00, 0x08, 0x00,
+   0xf8, 0x96, 0x08, 0x00, 0x00, 0x20, 0x54, 0xfa, 0xee, 0x3f, 0x81, 0x04,
+   0x40, 0x24, 0xfe, 0x55, 0x82, 0x00, 0x00, 0x82, 0xd2, 0xad, 0xff, 0x0f,
+   0x08, 0x00, 0x04, 0x80, 0x6c, 0x97, 0x00, 0x00, 0x02, 0x20, 0xa9, 0xf6,
+   0xdf, 0x5f, 0x00, 0x02, 0x20, 0x09, 0xfa, 0x49, 0x12, 0x00, 0x20, 0x84,
+   0x54, 0xdb, 0xfe, 0x1f, 0x91, 0x00, 0x00, 0x00, 0xf8, 0x2b, 0x00, 0x20,
+   0x00, 0x40, 0xa4, 0xf6, 0xbb, 0x1f, 0x04, 0x00, 0x44, 0x92, 0x7e, 0x95,
+   0x02, 0x00, 0x00, 0x89, 0xaa, 0xdd, 0xff, 0x1f, 0x20, 0x09, 0x10, 0x00,
+   0xf4, 0x57, 0x20, 0x01, 0x08, 0x20, 0xa9, 0x76, 0xff, 0x5f, 0x02, 0x00,
+   0x00, 0x21, 0xfc, 0x4a, 0x05, 0x00, 0x01, 0x80, 0x54, 0xdb, 0xff, 0x1e,
+   0x08, 0x02, 0x04, 0x08, 0xf9, 0x2b, 0x00, 0x00, 0x40, 0x28, 0xd2, 0xf6,
+   0xff, 0xbf, 0x80, 0x00, 0x90, 0x00, 0xbc, 0x92, 0x08, 0x10, 0x00, 0x82,
+   0x54, 0xdb, 0xff, 0x1f, 0x20, 0x00, 0x00, 0x44, 0xf9, 0x55, 0x02, 0x01,
+   0x00, 0x20, 0xaa, 0xbd, 0xfd, 0x3f, 0x08, 0x04, 0x04, 0x10, 0xf4, 0x2a,
+   0x01, 0x00, 0x22, 0x80, 0xd4, 0xf6, 0xff, 0x5f, 0x82, 0x00, 0x40, 0x02,
+   0xf8, 0x55, 0x20, 0x00, 0x00, 0x50, 0x6a, 0xdf, 0xfe, 0x3f, 0x00, 0x00,
+   0x00, 0x48, 0xe9, 0x4a, 0x05, 0x08, 0x00, 0xa5, 0xd5, 0xf5, 0xff, 0x3f,
+   0x10, 0x01, 0x10, 0x01, 0xb0, 0xab, 0x92, 0x02, 0x40, 0xf8, 0xbf, 0xde,
+   0xfe, 0x5f, 0x02, 0x04, 0x04, 0x48, 0xfa, 0xd4, 0x6f, 0x20, 0x84, 0xef,
+   0xff, 0xfb, 0xff, 0x1f, 0x20, 0x00, 0x00, 0x00, 0xe0, 0xed, 0xbf, 0x0b,
+   0xa1, 0x7e, 0xff, 0xbf, 0xfd, 0x5f, 0x04, 0x01, 0x20, 0x49, 0xd2, 0xfb,
+   0xfe, 0x55, 0xd4, 0xff, 0xff, 0xf6, 0xff, 0x07, 0x00, 0x04, 0x00, 0x00,
+   0xc0, 0xaa, 0xfb, 0x2b, 0xa2, 0xfe, 0xff, 0xdf, 0xee, 0x1f, 0x91, 0x00,
+   0x82, 0xa4, 0xa4, 0xf5, 0xff, 0x57, 0xd5, 0xff, 0xbf, 0xfd, 0xff, 0x4d,
+   0x00, 0x00, 0x20, 0x00, 0x88, 0x5b, 0xff, 0x2f, 0x69, 0xff, 0xff, 0xdb,
+   0xfe, 0x1f, 0x24, 0x02, 0x00, 0x49, 0xa2, 0xd6, 0xff, 0x5f, 0xea, 0xff,
+   0x7f, 0x7f, 0x7f, 0x0d, 0x00, 0x00, 0x10, 0x00, 0x40, 0xab, 0xf7, 0xbb,
+   0xf0, 0xdf, 0xff, 0xd5, 0xff, 0xbf, 0x82, 0x04, 0x42, 0x24, 0x91, 0xd5,
+   0xaa, 0xae, 0xd4, 0xaa, 0x52, 0x7b, 0xff, 0x15, 0x08, 0x00, 0x00, 0x01,
+   0x04, 0x55, 0xd5, 0x55, 0x70, 0x5b, 0x75, 0xdd, 0xdf, 0x1f, 0x40, 0x00,
+   0x08, 0x48, 0xa0, 0x4a, 0xa9, 0x56, 0xea, 0x56, 0xad, 0x6a, 0x7d, 0x9b,
+   0x04, 0x01, 0x00, 0x02, 0x42, 0x2a, 0xd5, 0xaa, 0xa8, 0xaa, 0xaa, 0xfa,
+   0xdf, 0x2f, 0x10, 0x04, 0x22, 0x48, 0x08, 0x45, 0x2a, 0x15, 0x68, 0x55,
+   0x55, 0xd7, 0x76, 0x1b, 0x00, 0x00, 0x00, 0x01, 0x40, 0x2a, 0x80, 0xa0,
+   0xb2, 0x09, 0x48, 0xb9, 0xdf, 0x17, 0x22, 0x01, 0x00, 0x24, 0x45, 0x8a,
+   0x24, 0x4a, 0x54, 0x51, 0x91, 0xf6, 0x6e, 0x4b, 0x00, 0x04, 0x90, 0x00,
+   0x80, 0x52, 0x00, 0x20, 0x69, 0x05, 0xa4, 0xaa, 0xff, 0x1e, 0x48, 0x00,
+   0x02, 0x92, 0x08, 0x05, 0x81, 0x94, 0xd4, 0x92, 0x40, 0xfd, 0xb6, 0x8b,
+   0x00, 0x01, 0x40, 0x00, 0x82, 0x54, 0x00, 0x48, 0x68, 0x05, 0x90, 0xa4,
+   0xef, 0x06, 0x24, 0x00, 0x08, 0x12, 0x10, 0x05, 0x00, 0x10, 0xb5, 0x01,
+   0x42, 0xfb, 0xbf, 0x43, 0x00, 0x09, 0x00, 0x40, 0x81, 0xa8, 0x08, 0x4a,
+   0xaa, 0x96, 0x90, 0xac, 0x6d, 0x15, 0x22, 0x00, 0x20, 0x09, 0x04, 0x15,
+   0x80, 0x28, 0xdc, 0x01, 0x24, 0xfb, 0xbf, 0x01, 0x80, 0x04, 0x09, 0x00,
+   0x40, 0x48, 0x02, 0x45, 0xb2, 0x2e, 0x41, 0x6d, 0xef, 0x05, 0x11, 0x00,
+   0x40, 0x52, 0x02, 0x15, 0x29, 0x2a, 0xac, 0x42, 0x54, 0xfb, 0x3b, 0x51,
+   0x84, 0x00, 0x08, 0x00, 0x20, 0x54, 0x80, 0x05, 0xb5, 0x3d, 0xa2, 0xb6,
+   0xdf, 0x00, 0x20, 0x04, 0x20, 0x49, 0x89, 0xa8, 0x6a, 0x29, 0xac, 0xd6,
+   0x54, 0xff, 0x3f, 0x84, 0x00, 0x01, 0x04, 0x10, 0x00, 0x94, 0xa8, 0x56,
+   0xda, 0x5f, 0xab, 0xd5, 0x1e, 0x10, 0x48, 0x00, 0x90, 0x82, 0x48, 0xa8,
+   0xb2, 0xac, 0xfd, 0x55, 0xd5, 0xfe, 0x9f, 0x80, 0x00, 0x0a, 0x02, 0x08,
+   0x02, 0x55, 0x5a, 0x75, 0xff, 0xaf, 0xb6, 0xf7, 0x2d, 0x12, 0x92, 0x00,
+   0x10, 0x20, 0x10, 0xa8, 0x54, 0xd5, 0xbf, 0x5d, 0xad, 0xdd, 0x0f, 0x00,
+   0x00, 0x04, 0x40, 0x09, 0x84, 0xa8, 0xaa, 0x5a, 0xed, 0xeb, 0x6a, 0xff,
+   0x9f, 0xa4, 0x24, 0x01, 0x02, 0xa0, 0x20, 0x50, 0x55, 0xd5, 0xbe, 0xae,
+   0xad, 0xfd, 0x16, 0x00, 0x10, 0x04, 0x20, 0x0a, 0x08, 0xb4, 0xaa, 0x95,
+   0xaa, 0x7b, 0xb7, 0xdb, 0x5f, 0x92, 0x04, 0x01, 0x84, 0x20, 0x21, 0x51,
+   0xd5, 0x2a, 0xa9, 0xee, 0xd5, 0xfe, 0x0d, 0x00, 0x20, 0x04, 0x10, 0x00,
+   0x08, 0x50, 0xe9, 0xd7, 0xd4, 0xfb, 0xb5, 0xff, 0x9f, 0x24, 0x09, 0x01,
+   0x42, 0x4a, 0xa2, 0x64, 0xd5, 0x55, 0x7b, 0x7f, 0xda, 0x7d, 0x4f, 0x00,
+   0x20, 0x04, 0x00, 0x80, 0x00, 0xa0, 0x2a, 0x13, 0x84, 0x6a, 0x55, 0xff,
+   0x1d, 0x48, 0x8a, 0x00, 0x94, 0x24, 0x8a, 0xc8, 0xaa, 0x42, 0x20, 0x5d,
+   0xf5, 0xff, 0x5f, 0x01, 0x00, 0x02, 0x01, 0x00, 0x20, 0xa2, 0x4a, 0x1a,
+   0x82, 0x56, 0xda, 0xbd, 0x3f, 0x92, 0x92, 0x00, 0x90, 0x92, 0x00, 0x40,
+   0x95, 0x6a, 0xf4, 0x55, 0x6d, 0xff, 0xd6, 0x00, 0x00, 0x0a, 0x04, 0x20,
+   0x14, 0x49, 0x4b, 0xaa, 0xaa, 0x56, 0xf5, 0xff, 0xbf, 0xab, 0xa4, 0x00,
+   0x20, 0x89, 0x40, 0x80, 0xaa, 0xaa, 0xaa, 0xaa, 0xde, 0xbf, 0xeb, 0x03,
+   0x00, 0x02, 0x04, 0x02, 0x0a, 0x10, 0x2b, 0x2a, 0x55, 0x5b, 0xf5, 0xff,
+   0xd7, 0x2f, 0x92, 0x00, 0x10, 0x28, 0x21, 0x01, 0x56, 0x95, 0xa0, 0x56,
+   0xdf, 0xef, 0xea, 0x87, 0x40, 0x0a, 0x42, 0x41, 0x00, 0x90, 0xaa, 0x52,
+   0xb6, 0xad, 0xfa, 0xff, 0xd5, 0x2f, 0x14, 0x00, 0x00, 0x04, 0x95, 0x04,
+   0xaa, 0xac, 0x55, 0x6b, 0xff, 0xb7, 0xea, 0x9f, 0x40, 0x02, 0x28, 0x51,
+   0x00, 0x40, 0x58, 0xd5, 0xda, 0xd6, 0x6e, 0x7f, 0xf9, 0x3f, 0x12, 0x04,
+   0x02, 0x04, 0x49, 0x25, 0x55, 0xaa, 0x77, 0xab, 0xff, 0x2b, 0xfd, 0x3f,
+   0x48, 0x01, 0x20, 0x41, 0x00, 0x00, 0x58, 0xa9, 0xda, 0xea, 0xfd, 0xaf,
+   0xfa, 0xff, 0x02, 0x04, 0x08, 0x14, 0x29, 0x49, 0x52, 0x55, 0x55, 0x55,
+   0xff, 0x8d, 0xfe, 0x3f, 0xa8, 0x00, 0x02, 0x41, 0x00, 0x02, 0xa0, 0xa2,
+   0xaa, 0xea, 0xff, 0x53, 0xfd, 0xff, 0x02, 0x04, 0x50, 0x04, 0x25, 0xa8,
+   0x54, 0x49, 0x52, 0xb5, 0xbf, 0x8a, 0xfe, 0xff, 0xa9, 0x08, 0x04, 0x50,
+   0x80, 0x02, 0xa1, 0x2a, 0x95, 0xea, 0xff, 0xa1, 0xff, 0xff, 0x03, 0x02,
+   0x90, 0x02, 0x09, 0x08, 0x44, 0x49, 0x52, 0xbd, 0x7f, 0xca, 0xff, 0xff,
+   0x2b, 0x09, 0x04, 0x48, 0x40, 0x82, 0x90, 0x56, 0xa9, 0xf6, 0xbf, 0xd0,
+   0xff, 0xff, 0x47, 0x00, 0x50, 0x02, 0x15, 0x11, 0x40, 0x95, 0xaa, 0xfd,
+   0x2f, 0xe9, 0xff, 0xff, 0x8f, 0x0a, 0x84, 0x50, 0x40, 0x84, 0x14, 0xaa,
+   0x6a, 0xff, 0x5f, 0xf2, 0xff, 0xff, 0x7f, 0x00, 0x10, 0x02, 0x09, 0x10,
+   0x40, 0x7d, 0xf7, 0xff, 0x0b, 0xfc, 0xff, 0xff, 0xaf, 0x02, 0x84, 0x50,
+   0x42, 0x85, 0x12, 0xd0, 0xdd, 0xff, 0xa7, 0xf2, 0xff, 0xff, 0xff, 0x04,
+   0x00, 0x0a, 0x08, 0x10, 0x48, 0xf8, 0xff, 0xff, 0x0a, 0xfe, 0xff, 0xff,
+   0x7f, 0x03, 0xa4, 0x80, 0xa2, 0x8a, 0x02, 0x68, 0xff, 0xff, 0x52, 0xfd,
+   0xff, 0xff, 0xff, 0x07, 0x00, 0x2a, 0x08, 0x20, 0x28, 0xdc, 0xff, 0x5f,
+   0x05, 0xff, 0xff, 0xff, 0xff, 0x0d, 0x92, 0x40, 0x22, 0x09, 0x02, 0xea,
+   0xfb, 0xaf, 0x48, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x12, 0x81, 0xa0,
+   0x48, 0x9c, 0x6e, 0x93, 0xa2, 0xff, 0xff, 0xff, 0xff, 0x07, 0xa8, 0x40,
+   0x28, 0x0a, 0x02, 0x74, 0xb5, 0x45, 0x81, 0xff, 0xff, 0xff, 0xff, 0x0f,
+   0x02, 0x0a, 0x81, 0x20, 0x08, 0xae, 0xaa, 0x90, 0xe8, 0xff, 0xff, 0xff,
+   0xff, 0x0f, 0x90, 0x40, 0x28, 0x88, 0x12, 0x58, 0x15, 0x50, 0xd0, 0xff,
+   0xff, 0xff, 0xff, 0x0f, 0x44, 0x0a, 0x41, 0x21, 0x08, 0xae, 0x04, 0x14,
+   0xf0, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x40, 0x14, 0x88, 0x04, 0xba,
+   0x02, 0x28, 0xe8, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x42, 0x15, 0x41, 0x21,
+   0x05, 0xad, 0x00, 0x05, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x40,
+   0x24, 0x8a, 0x0e, 0x36, 0x00, 0x0a, 0xf4, 0xff, 0xff, 0xff, 0xff, 0x0f,
+   0x42, 0x25, 0x90, 0xd0, 0x8b, 0xc2, 0x41, 0x05, 0xfc, 0xff, 0xff, 0xff,
+   0xff, 0x0f, 0x10, 0x08, 0x05, 0xe8, 0x8e, 0x58, 0x80, 0x02, 0xfa, 0xff,
+   0xff, 0xff, 0xff, 0x0f, 0x4a, 0x20, 0xa8, 0xba, 0x0b, 0x2b, 0x51, 0x01,
+   0xfe, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x8a, 0x02, 0xe8, 0xaf, 0x84,
+   0x90, 0x04, 0xfd, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x52, 0x21, 0x54, 0xbf,
+   0x1f, 0x15, 0xa5, 0x02, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x08,
+   0x01, 0xfa, 0xb6, 0xa4, 0x52, 0x40, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,
+   0x4a, 0xa2, 0x54, 0xef, 0x5f, 0x4b, 0xa4, 0x80, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0x0f, 0x80, 0x10, 0x82, 0xfe, 0xbf, 0x92, 0x52, 0x42, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0x0f, 0x12, 0x42, 0xa8, 0xbf, 0x1f, 0x24, 0x80, 0xa0,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x84, 0x28, 0x8a, 0xf7, 0x37, 0x80,
+   0x52, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x10, 0x82, 0xe0, 0xff,
+   0x1f, 0x00, 0x20, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x84, 0x28,
+   0xca, 0xff, 0x1f, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f,
+   0x10, 0x42, 0xf0, 0xfd, 0x1b, 0x00, 0x50, 0xf0, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0x0f, 0xa4, 0x10, 0xc5, 0xff, 0x1f, 0x00, 0x00, 0xe0, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0x0f, 0x00, 0x22, 0xf8, 0xff, 0x0e, 0x00, 0x00, 0xf0,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xaa, 0x88, 0xe2, 0xff, 0x0f, 0x10,
+   0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x25, 0xfa, 0xff,
+   0x0f, 0x01, 0x11, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xfb,
+   0xfb, 0xff, 0x7f, 0x5d, 0xd5, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f};
diff --git a/ruby_1_8_6/ext/tk/sample/images/flagdown.xbm b/ruby_1_8_6/ext/tk/sample/images/flagdown.xbm
new file mode 100644
index 0000000000..55abc51825
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/flagdown.xbm
@@ -0,0 +1,27 @@
+#define flagdown_width 48
+#define flagdown_height 48
+static char flagdown_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
+   0x00, 0x00, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe1, 0x00, 0x00,
+   0x00, 0x00, 0x70, 0x80, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x03, 0x00,
+   0x00, 0x00, 0x0c, 0x00, 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x06, 0x04,
+   0x00, 0x00, 0x03, 0x00, 0x06, 0x06, 0x00, 0x80, 0x01, 0x00, 0x06, 0x07,
+   0x00, 0xc0, 0x1f, 0x00, 0x87, 0x07, 0x00, 0xe0, 0x7f, 0x80, 0xc7, 0x07,
+   0x00, 0x70, 0xe0, 0xc0, 0xe5, 0x07, 0x00, 0x38, 0x80, 0xe1, 0x74, 0x07,
+   0x00, 0x18, 0x80, 0x71, 0x3c, 0x07, 0x00, 0x0c, 0x00, 0x3b, 0x1e, 0x03,
+   0x00, 0x0c, 0x00, 0x1f, 0x0f, 0x00, 0x00, 0x86, 0x1f, 0x8e, 0x07, 0x00,
+   0x00, 0x06, 0x06, 0xc6, 0x05, 0x00, 0x00, 0x06, 0x00, 0xc6, 0x05, 0x00,
+   0x00, 0x06, 0x00, 0xc6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x06, 0x04, 0x00,
+   0x7f, 0x06, 0x00, 0x06, 0xe4, 0xff, 0x00, 0x06, 0x00, 0x06, 0x04, 0x00,
+   0x00, 0x06, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x00, 0x06, 0x06, 0x00,
+   0x00, 0x06, 0x00, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
+   0x00, 0x06, 0x00, 0xc6, 0x00, 0x00, 0x00, 0x06, 0x00, 0x66, 0x00, 0x00,
+   0x00, 0x06, 0x00, 0x36, 0x00, 0x00, 0x00, 0x06, 0x00, 0x3e, 0x00, 0x00,
+   0x00, 0xfe, 0xff, 0x2f, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x27, 0x00, 0x00,
+   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
+   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
+   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
+   0x00, 0x00, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x20, 0x00, 0x00,
+   0xf7, 0xbf, 0x8e, 0xfc, 0xdf, 0xf8, 0x9d, 0xeb, 0x9b, 0x76, 0xd2, 0x7a,
+   0x46, 0x30, 0xe2, 0x0f, 0xe1, 0x47, 0x55, 0x84, 0x48, 0x11, 0x84, 0x19};
diff --git a/ruby_1_8_6/ext/tk/sample/images/flagup.xbm b/ruby_1_8_6/ext/tk/sample/images/flagup.xbm
new file mode 100644
index 0000000000..6eb0d846a3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/flagup.xbm
@@ -0,0 +1,27 @@
+#define flagup_width 48
+#define flagup_height 48
+static char flagup_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00,
+   0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xef, 0x6a, 0x00,
+   0x00, 0x00, 0xc0, 0x7b, 0x75, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0x6a, 0x00,
+   0x00, 0x00, 0x30, 0x60, 0x75, 0x00, 0x00, 0x00, 0x18, 0xe0, 0x7f, 0x00,
+   0x00, 0x00, 0x0c, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x06, 0xe0, 0x04, 0x00,
+   0x00, 0x00, 0x03, 0xe0, 0x04, 0x00, 0x00, 0x80, 0x01, 0xe0, 0x06, 0x00,
+   0x00, 0xc0, 0x1f, 0xe0, 0x07, 0x00, 0x00, 0xe0, 0x7f, 0xe0, 0x07, 0x00,
+   0x00, 0x70, 0xe0, 0xe0, 0x05, 0x00, 0x00, 0x38, 0x80, 0xe1, 0x04, 0x00,
+   0x00, 0x18, 0x80, 0xf1, 0x04, 0x00, 0x00, 0x0c, 0x00, 0xfb, 0x04, 0x00,
+   0x00, 0x0c, 0x00, 0xff, 0x04, 0x00, 0x00, 0x86, 0x1f, 0xee, 0x04, 0x00,
+   0x00, 0x06, 0x06, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0xe6, 0x04, 0x00,
+   0x00, 0x06, 0x00, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x66, 0x04, 0x00,
+   0x7f, 0x56, 0x52, 0x06, 0xe4, 0xff, 0x00, 0x76, 0x55, 0x06, 0x04, 0x00,
+   0x00, 0x56, 0x57, 0x06, 0x04, 0x00, 0x00, 0x56, 0x55, 0x06, 0x06, 0x00,
+   0x00, 0x56, 0xd5, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
+   0x54, 0x06, 0x00, 0xc6, 0x54, 0x55, 0xaa, 0x06, 0x00, 0x66, 0xaa, 0x2a,
+   0x54, 0x06, 0x00, 0x36, 0x55, 0x55, 0xaa, 0x06, 0x00, 0xbe, 0xaa, 0x2a,
+   0x54, 0xfe, 0xff, 0x6f, 0x55, 0x55, 0xaa, 0xfc, 0xff, 0xa7, 0xaa, 0x2a,
+   0x54, 0x01, 0x88, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
+   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
+   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
+   0x54, 0x55, 0x8d, 0x50, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa8, 0xaa, 0x2a,
+   0x54, 0x55, 0x95, 0x54, 0x55, 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a,
+   0x54, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ruby_1_8_6/ext/tk/sample/images/gray25.xbm b/ruby_1_8_6/ext/tk/sample/images/gray25.xbm
new file mode 100644
index 0000000000..b234b3cb0b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/gray25.xbm
@@ -0,0 +1,6 @@
+#define grey_width 16
+#define grey_height 16
+static char grey_bits[] = {
+   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
+   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
+   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44};
diff --git a/ruby_1_8_6/ext/tk/sample/images/grey.25 b/ruby_1_8_6/ext/tk/sample/images/grey.25
new file mode 100644
index 0000000000..b234b3cb0b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/grey.25
@@ -0,0 +1,6 @@
+#define grey_width 16
+#define grey_height 16
+static char grey_bits[] = {
+   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
+   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44,
+   0x11, 0x11, 0x44, 0x44, 0x11, 0x11, 0x44, 0x44};
diff --git a/ruby_1_8_6/ext/tk/sample/images/grey.5 b/ruby_1_8_6/ext/tk/sample/images/grey.5
new file mode 100644
index 0000000000..37688893f0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/grey.5
@@ -0,0 +1,6 @@
+#define grey_width 16
+#define grey_height 16
+static char grey_bits[] = {
+   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
+   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa,
+   0x55, 0x55, 0xaa, 0xaa, 0x55, 0x55, 0xaa, 0xaa};
diff --git a/ruby_1_8_6/ext/tk/sample/images/letters.xbm b/ruby_1_8_6/ext/tk/sample/images/letters.xbm
new file mode 100644
index 0000000000..0f12568d1a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/letters.xbm
@@ -0,0 +1,27 @@
+#define letters_width 48
+#define letters_height 48
+static char letters_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x02, 0x00, 0x00, 0x00, 0x20,
+   0x00, 0xfa, 0x00, 0x00, 0x00, 0x2e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2a,
+   0x00, 0x3a, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2e,
+   0xe0, 0xff, 0xff, 0xff, 0xff, 0x21, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21,
+   0xa0, 0x03, 0x00, 0x00, 0x70, 0x21, 0x20, 0x00, 0x00, 0x00, 0x50, 0x21,
+   0xa0, 0x1f, 0x00, 0x00, 0x50, 0x21, 0x20, 0x00, 0x00, 0x00, 0x70, 0x21,
+   0xfe, 0xff, 0xff, 0xff, 0x0f, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x21,
+   0xfa, 0x01, 0x00, 0x80, 0x0b, 0x21, 0x02, 0x00, 0x00, 0x80, 0x0a, 0x21,
+   0xba, 0x01, 0x00, 0x80, 0x0a, 0x21, 0x02, 0x00, 0x00, 0x80, 0x0b, 0x21,
+   0x3a, 0x00, 0x00, 0x00, 0x08, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x21,
+   0x02, 0xc0, 0xfb, 0x03, 0x08, 0x21, 0x02, 0x00, 0x00, 0x00, 0x08, 0x3f,
+   0x02, 0xc0, 0xbd, 0x0f, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x01,
+   0x02, 0xc0, 0x7f, 0x7b, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x01,
+   0x02, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
+   0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
+   0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00,
+   0xfe, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ruby_1_8_6/ext/tk/sample/images/noletter.xbm b/ruby_1_8_6/ext/tk/sample/images/noletter.xbm
new file mode 100644
index 0000000000..5774124efe
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/noletter.xbm
@@ -0,0 +1,27 @@
+#define noletters_width 48
+#define noletters_height 48
+static char noletters_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00,
+   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x07, 0x00,
+   0x00, 0xf0, 0x0f, 0xe0, 0x1f, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x7f, 0x00,
+   0x00, 0x3e, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x1f, 0x00, 0x00, 0xf0, 0x01,
+   0x80, 0x07, 0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0xe0, 0x07,
+   0xe0, 0x01, 0x00, 0x00, 0xf0, 0x0f, 0xe0, 0x00, 0x00, 0x00, 0x78, 0x0e,
+   0xf0, 0x00, 0x00, 0x00, 0x3c, 0x1e, 0x70, 0x00, 0x00, 0x00, 0x1e, 0x1c,
+   0x38, 0x00, 0x00, 0x00, 0x0f, 0x38, 0x38, 0x00, 0x00, 0x80, 0x07, 0x38,
+   0x3c, 0xfc, 0xff, 0xff, 0x7f, 0x78, 0x1c, 0x04, 0x00, 0xe0, 0x41, 0x70,
+   0x1c, 0x04, 0x00, 0xf0, 0x40, 0x70, 0x1c, 0x74, 0x00, 0x78, 0x4e, 0x70,
+   0x0e, 0x04, 0x00, 0x3c, 0x4a, 0xe0, 0x0e, 0x74, 0x03, 0x1e, 0x4a, 0xe0,
+   0x0e, 0x04, 0x00, 0x0f, 0x4e, 0xe0, 0x0e, 0x04, 0x80, 0x07, 0x40, 0xe0,
+   0x0e, 0x04, 0xf8, 0x0f, 0x40, 0xe0, 0x0e, 0x04, 0xe0, 0x01, 0x40, 0xe0,
+   0x0e, 0x04, 0xf8, 0x00, 0x40, 0xe0, 0x0e, 0x04, 0x78, 0x00, 0x40, 0xe0,
+   0x0e, 0x04, 0xfc, 0xf3, 0x40, 0xe0, 0x1c, 0x04, 0x1e, 0x00, 0x40, 0x70,
+   0x1c, 0x04, 0x0f, 0x00, 0x40, 0x70, 0x1c, 0x84, 0x07, 0x00, 0x40, 0x70,
+   0x3c, 0xfc, 0xff, 0xff, 0x7f, 0x78, 0x38, 0xe0, 0x01, 0x00, 0x00, 0x38,
+   0x38, 0xf0, 0x00, 0x00, 0x00, 0x38, 0x70, 0x78, 0x00, 0x00, 0x00, 0x1c,
+   0xf0, 0x3c, 0x00, 0x00, 0x00, 0x1e, 0xe0, 0x1e, 0x00, 0x00, 0x00, 0x0e,
+   0xe0, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x07, 0x00, 0x00, 0x80, 0x07,
+   0x80, 0x07, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x1f, 0x00, 0x00, 0xf0, 0x01,
+   0x00, 0x3e, 0x00, 0x00, 0xf8, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x7f, 0x00,
+   0x00, 0xf0, 0x0f, 0xe0, 0x1f, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x07, 0x00,
+   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xf0, 0x1f, 0x00, 0x00};
diff --git a/ruby_1_8_6/ext/tk/sample/images/pattern.xbm b/ruby_1_8_6/ext/tk/sample/images/pattern.xbm
new file mode 100644
index 0000000000..df31baf789
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/pattern.xbm
@@ -0,0 +1,6 @@
+#define foo_width 16
+#define foo_height 16
+static char foo_bits[] = {
+   0x60, 0x06, 0x90, 0x09, 0x90, 0x09, 0xb0, 0x0d, 0x4e, 0x72, 0x49, 0x92,
+   0x71, 0x8e, 0x8e, 0x71, 0x8e, 0x71, 0x71, 0x8e, 0x49, 0x92, 0x4e, 0x72,
+   0xb0, 0x0d, 0x90, 0x09, 0x90, 0x09, 0x60, 0x06};
diff --git a/ruby_1_8_6/ext/tk/sample/images/tcllogo.gif b/ruby_1_8_6/ext/tk/sample/images/tcllogo.gif
new file mode 100644
index 0000000000..4603d4ff41
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/tcllogo.gif
diff --git a/ruby_1_8_6/ext/tk/sample/images/teapot.ppm b/ruby_1_8_6/ext/tk/sample/images/teapot.ppm
new file mode 100644
index 0000000000..b8ab85f3a5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/images/teapot.ppm
@@ -0,0 +1,31 @@
+P6
+256 256
+255
+\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�[7 eOLjQLmSMoTMnSMlRMhPL_9 \�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�nSMtVMzYN~[N~[N\N\O�\O�]O�]O�]O�]O�\O�\O}[NyYNtVM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�G-wXN}[N�]O�^O�_O�`O�`O�`O�`O�aO�aO�aO�aO�aO�aO�aO�aO�`O�_O�^O\N\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�aMLyYN�_O�aP�bP�cP�cP�dP�dP�dP�dP�dP�dP�dP�dP�dP�eP�eP�eP�eP�eP�dP�cP�_OpUM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�wXN�_O�dP�fP�gQ�hQ�hQ�iQ�iQ�iQ�iQ�iQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�iQ�fP�`O\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJiQL�bP�hQ�kQ�mR�nR�oR�oR�oR�oR�oR�oR�oR�oR�pR�pS�qS�qS�rS�rS�rS�qS�oR�jQ�]O\KK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�fOLrUM�cP�lR�qS�tS�uT�wT�xT�xT�yT�yT�zT�zU�zU�zU�zU�zU�yT�xT�wT�tS�mR�aOhPL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�a0	cNLqUM�\O�fQ�pS�wV�zV�|V�}V�V�V��V��W��[��e��w���螽���g�qT�fQ{ZNYIK9\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�O1{G#�JkRMqUMtVN�iS�v\��d��b�zZ�vU�uT�sS�qS�nR�jQ�eP�^OrUM�Hh>!T4\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�G-V5wE"~I#�M%�U+�e7�l:�g2�b*�a(�`(�^(�])�^-�]1�S,qC$`9 R3G-\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�@)J/i>!pA"tD"wF$yH&xH&tE$wE#yG%}M+�T4S5mE*Z7!K/B*;'\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��aO�oR�{U��V��X<(F-a: e<!h>!j@#k@$h>"d<!c=$hD-fF2[<)K0@);'5$��V��V�|U_LKYIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��_O�xT��W鵯������k�|X�>�f-�^(�Z'�W&�T&�N>)F-J/b; g>#nD(jB&c<!b=%jH2_A/I0!<(8&5$�J�Y�S%8&;'?)E,<:HA=HE?IJAISFJYIKXIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\寸nR�}U��q��e�vU�e,�V&�V�C
�@|>y<u:r9o7l6
+j5
+h4
+g3
+5$D,K/b; h>"wM1tK.e="a<#cA,U8&E-<(9&.!a0	b1	c1	



	
	
	

+
++3#@)46G<:HMCIXHK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�U*�vT�~X�{Y�k+�W&�N$|>u:p8k5
+f3
+a0	_/	].	[-	�I�\*�_(�LkRMmSMmSMnSMnSMD,R3W5mA"|O0|P1j?"c<!a=%Y7"N1F,;'NCJNCJNDJODJODJODJh>!a: X/K%
+g3
+a0	Z-	\/T*Q(�H�m8kRMmSMnTMoTMpTMpUM15G15G05G04G04GpUMpTM5^9 d<!yF#�O+�N,rC#qB"pB#k?"a: Z7 6ODJPDJPEJQEJQEJREJREJREJRFJSFJSFJSFJSFJe<!X/
+^/	V+Q(L&I$r9�TlRMnSM46G47G47G46G46G46G46G46G36G36G25G25G15G04G/4F.3F
+
+�X&pUMuWMwXNxXN<:H<:H<:H<:H<;H<;H<;H<;H=;H=;H=;H=;H>;H>;H?<H@<HA=HC>HG@ILBIREJ[JKcNLjQL�pR�uT�zU�~V��W��X��c��s��e�{V�vT�pS�kR�gQ�bP�_O�^O�]O�\O�\O�\O�\O�]O�]O�]O�]O�]O�]O�]O�]O�]O�]O�]O�\O�\O~\N}[N|ZNxXN�T%H$
+�W&rVMvWNyYNzYN|ZN}[N}[N><H?<H?<H?<H?<H?<H@<H@<H@<HA=HA=HB=HC>HE?IG@IIAIKBIODJSFJWHK�hQ�lR�pR�b(�i*�n+�|7�|6�r,�q+�p-�l+�g)�b(�sS�pS�lR�iQ�gQ�eP�cP�aP�aO�`O�`O�_O�_O�_O�_O�_O�_O�_O�_O�_O�_O�^O�^O�^O�^O�]O�]O�\O~[N{ZN�T%
+
+	
+@%<-$G?@�pfdNLuWM\NdNL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�TFJvWN�aP./01�E}[N�]O�_O�`O�aP�bP�bP�cP�cP�cP�dP�dP�dP�eP�eP�eP�eP�fP�fQ�fQ�gQ�gQ�gQ�hQ�hQ�hQ�iQ�iQ�jQ�jQ�kQ�kR�lR�lR�Y&�\'�^'�^�b�c�e�i �g�c�b�a�`�^�]�X�['�Z'�Y&�mR�mR�mR�lR�lR�lR�kR�kQ�kQ�jQ�jQ�jQ�iQ�iQ�iQ�iQ�hQ�hQ�hQ�hQ�gQ�gQ�gQ�gQ�gQ�fQ�fQ�fQ�fP�eP�eP�dP�cP�aP�O
+ B\�\�\�\�\�\�\�\�\�\�%7!!C*F#P){dY�ze��p�\OgPL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ`LKvWN�aPm6
+

+$5 �`(�e)�nR�jQ�^OJAI\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�XIK^KKdNLhPLuWM�]O�bP�fQ�eP

m6
+�`O�cP�fQ�hQ�hQ�iQ�iQ�jQ�jQ�jQ�jQ�jQ�jQ�jQ�kQ�kQ�kQ�kR�kR�kR�kR�lR�lR�lR�lR�lR�lR�lR�mR�mR�mR�mR�g)�c(�c(�b(�V�c�e�i!�i!�d�b�`�`�_�_�^�Q�]'�_(�`(�f)�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�mR�mR�mR�mR�mR�mR�mR�mR�mR�nR�mR�mR�nR�mR�mR�mR�mR�kR�hQ�Ga0	�bP�mR�jQ�fQ�aP}[NrUMmSM�L$\�\�\�\�\�\�\�\� B B
#C, 8&H.Z7 �pR�jQ{ZN\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�QEJ[JK`LKdNLhQLqUM{ZN�_O�cP�gQ�hQ
+�bP�eP�hQ�iQ�jQ�jQ�kQ�kQ�kR�kR�kR�lR�lR�lR�lR�lR�lR�lR�lR�lR�lR�mR�mR�mR�mR�mR�mR�mR�mR�mR�nR�nR�j*�g)�e)�d)�d�X�g�h�e�c�b�b�b�U�`(�a(�a(�c(�i*�oR�oR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�nR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�oR�nR�mR�jQ�Q%Z-	�jQ�nR�lR�hQ�dP�_OuWMpTMnSMkRLa: \�\�\�\�\�\�\� B B&D2
@*S6#G@IPDJ�hQmSM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�VGJ]KKbMLeOLiQLlRMvWN\O�aO�eP�hQ�jQ�gQ
+!C+E'0F.4F7%8%U/lG.SFJZIK]KKZIKB=H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�REJZJK`LKdNLgPLjQLlRMnSMpTMqUMtWMxXN{ZN~[N�]O�^O�`O�aO�bP�dP�gQ�iQ�kQ�lR�nR�pS�rS�sS�tT�uT�vT�wT�xT�yT�yT�yT�yT�yT�xT�vT�rS�nR�hQ�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�|U�}U�}U�}U�}U�}U�}U�}U�~U�~U�~V�~V�V��W��X�a(�lR�rS�vT�yT�zU�|U�~V�X��[��_��d��j��m��n��l��h��d��_�{[�vW�sU�pS�nR�kR�iQ�hQ�gQ�fQ�eP�dP�bP�aO�_O�^O�\O|ZNxXNsVMpTMnTMmSMjQL�C B)D&/F-3F47G6%>"Y7 kA$YIK]KK^KKSFJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�VGJ\KKbMLeOLhPLkRLmSMnTMpTMrUMuWNyYN|ZN\N�]O�_O�`O�aP�bP�cP�eP�fP�hQ�jQ�lR�nR�oS�qT�sT�uU�vU�wV�xV�yV�yU�zU�zU�{U�{U�{U�|U�|U�|U�|U�|U�{U�{U�{U�zU�zT�yT�yT�xT�wT�vT�vT�vT�vT�wT�wT�wT�xT�yT�zT�zU�{U�{U�|U�|U�}U�V��W��Y��\��_��d��l��u脾|讒�鍖�遶�覈�网���{��s��l��d�^�yZ�uW�qU�oS�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�aP�`O�^O�]O}[NyYNuWMpTMoTMmSMkRLgPL&D#.E,3F46G;'<(D"iB(VGJ]KK`LK[JKB>H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJYIK^LKcNLfOLiQLkRMmSMoTMqUMsVMvXNzYN}[N�\O�^O�_O�`O�aP�cP�dP�eP�fQ�gQ�hQ�iQ�kR�mS�oT�rU�tW�wY�zZ�}\�]��^��^��^��^��\��Z�Y�X�~W�~W�~V�~V�~V�~V�~U�~U�~U�~U�U�U�V�V�V�V�V��V��V��W��W��X��Z��[��^��a��d��i��n��t茖z遘�鶩����������������餘�薊�燹~��v��m��f��`�z[�vX�rU�pT�oS�nS�lR�kR�kR�jQ�iQ�hQ�fQ�eP�dP�cP�bP�`O�_O�]O~[NzYNvWNpTMoTMnSMkRMhQLo7,2F36G99HC+@ ]8 nA"\JK`ML_LKSFJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ[JK`LKdNLgPLjQLlRMnSMpTMqUMtVMwXNzZN}[N�]O�^O�_O�aO�bP�cP�dP�eP�fQ�gQ�hQ�iQ�jR�lR�mS�oU�rW�vZ�{]��a��f��j��n��q��s��s��r��q��o��m��j��g��c��a��^��\��[��Y��X��W�W�W�V�V�W��W��W��X��Y��[��\��_��a��e��h��m��q��v筺z腓}螂�覃�覈�薑�絅���|��w��r��m��h��c�~^�yZ�vX�tW�sV�qU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fP�eP�cP�bP�aO�_O�^O\N{ZNwXNsVMoTMnSMlRMiQL~I#26G99G?<HA*E$	i@$ZIKaMLbML[JK;:H\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�WHJ]KKbMLeOLhPLjRLlSMnTMpTMrUMuWMxXN{ZN~\N�]O�^O�`O�aO�bP�cP�dP�eP�fQ�gQ�hQ�iQ�kR�lS�mT�oU�rW�uZ�y]�~a��f��l��s��z棔�礑�茫�覡�躁�蹼�覓�荐�磽~��y��t��o��j��f��b��_��\��Z��Y�X�W�~W�~W�~W�X��X��Y��Z��\��^��`��b��d��f��g��i��j��j��j��i��g��d��a�^�}]�|\�{[�yZ�xY�vX�tW�sV�qU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fP�eP�dP�bP�aO�_O�^O�\O|ZNxXNtVMpTMnSMmSMjQLgPL99G?<HG-E&b;!YIK`MLdOM`LKNCJ\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��lR�yT�~U��X��Y�X�{W�tU�W'�[(�hQ�lR�cP�\OhQL\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�NCJYIK^LKcNLfOLiQLkRLmSMoTMqUMrVMvWNyYN|ZN\N�]O�_O�`O�aP�bP�cP�dP�fP�gQ�hQ�iQ�jR�kR�lS�nT�pU�sW�vZ�z]�b��g��l��s��y��泙�礬�茘�豈�鏗�鏗�遽�覘�腥�癸���z��t��n��i��d��`��]��[�~Y�}X�|W�|V�{V�{V�{V�{V�{V�|W�|W�}X�}Y�~Z�~Z�~Z�}[�}[�}[�~\�~\�~]�~]�~]�~]�}]�|\�z[�yZ�wY�vX�tW�sV�rU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�aP�`O�^O�]O}[NyYNuWNpTMnTMmSMkRLhPL|H$D>IQ2P+XHK_LLfQOcNLXIK\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\制qS�yT�~V��`鍮���v��]�qS�L�G|>g3
+S)?*%.�hQ�hQ�eP�`OuWM\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�SFJ[JK`LKdNLgPLjQLlRMnSMoTMqUMsVMwXNzYN}[N�\O�^O�_O�`O�aP�bP�dP�eP�fP�gQ�hQ�iQ�jR�kR�lS�nT�pV�sX�vZ�z^�b��g��m��s��z���泙�礬�茘�蟄鰢鬠�茗�紲�爐���|��w��q��l��g��b��_�\�}Z�{X�zW�yV�yU�xU�xU�xT�xT�xU�xU�xU�yV�yV�yW�zW�{X�{Y�|Z�}[�}[�}\�~\�~]�~]�}]�|\�{\�z[�yZ�wY�vX�tW�sV�rU�pT�oS�nS�mR�lR�kR�jQ�iQ�hQ�gQ�fQ�eP�dP�cP�bP�`O�_O�]O~[NzZNvWNrUMoTMmSMlRMiQLeOLJAIJ(h>!]KKfQOgQN_LKD>I\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\��iQ�tS�yT�{U�Y��e鎰������u�|\�Z'�L�D
|>
+
+
&3#.$-% .% .& /&!,#,#@70A71XNHXNHWNHWNHZRLYQLYQLXQLWQLWPLUOLSNLQMKOLJMJJ0//.-.,,-&(+"(!'			
+%' %$#" ! !$


						



diff --git a/ruby_1_8_6/ext/tk/sample/irbtk.rb b/ruby_1_8_6/ext/tk/sample/irbtk.rb
new file mode 100644
index 0000000000..53ef10d0d1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/irbtk.rb
@@ -0,0 +1,30 @@
+#!/usr/local/bin/ruby
+#
+#   irbtk.rb - irb with Ruby/Tk
+#
+#   If you want to use 'multi-tk.rb', give option '--multi-tk'.
+#   And if you want to use 'remote-tk.rb', give option '--remote-tk'.
+#   If you want both, you don't need to give both options, because 
+#   'remote-tk.rb' includes 'multi-tk.rb'. 
+#   ( There is no trouble even if you give both options. )
+#
+require 'remote-tk' if ARGV.delete('--remote-tk')
+require 'multi-tk'  if ARGV.delete('--multi-tk')
+
+require "tk"
+module Tk
+  MAINLOOP = Thread.new{ mainloop }
+end
+
+require "irb"
+
+if __FILE__ == $0
+  IRB.start(__FILE__)
+else
+  # check -e option
+  if /^-e$/ =~ $0
+    IRB.start(__FILE__)
+  else
+    IRB.setup(__FILE__)
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/sample/irbtkw.rbw b/ruby_1_8_6/ext/tk/sample/irbtkw.rbw
new file mode 100644
index 0000000000..f6a35be6ed
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/irbtkw.rbw
@@ -0,0 +1,124 @@
+#!/usr/bin/env ruby
+#
+#  irbtkw.rb : IRB console with Ruby/Tk
+#
+#                                 by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+release = '2006/11/06'
+
+require 'tk'
+begin
+  require 'tktextio'
+rescue LoadError
+  require File.join(File.dirname(File.expand_path(__FILE__)), 'tktextio.rb')
+end
+
+require 'irb'
+
+# console setup
+top = TkToplevel.new(:title=>'IRB console')
+top.protocol(:WM_DELETE_WINDOW){ Tk.exit }
+
+console = TkTextIO.new(top, :mode=>:console, 
+                       :width=>80).pack(:side=>:left, 
+                                        :expand=>true, :fill=>:both)
+console.yscrollbar(TkScrollbar.new(top, :width=>10).pack(:before=>console, 
+                                                         :side=>:right, 
+                                                         :expand=>false, 
+                                                         :fill=>:y))
+irb_thread = nil
+ev_loop = Thread.new{
+  Tk.mainloop
+  irb_thread.kill if irb_thread
+}
+
+# window position control
+root = Tk.root
+
+r_x = root.winfo_rootx
+r_y = root.winfo_rooty
+r_w = root.winfo_width
+
+t_x = top.winfo_rootx
+t_y = top.winfo_rooty
+t_w = top.winfo_width
+
+delta = 10
+
+ratio = 0.8
+s_w = (ratio * root.winfo_screenwidth).to_i
+
+if r_x < t_x
+  r_x, t_x = t_x, r_x
+end
+if t_x + t_w + r_w + delta < s_w
+  r_x = t_x + t_w + delta
+elsif t_w + r_w + delta < s_w
+  r_x = s_w - r_w
+  t_x = r_x - t_w
+else
+  r_x = s_w - r_w
+  t_x = 0
+end
+
+root.geometry("+#{r_x}+#{r_y}")
+top.geometry("+#{t_x}+#{t_y}")
+
+root.raise
+console.focus
+
+# I/O setup
+$stdin  = console
+$stdout = console
+$stderr = console
+
+# dummy for rubyw.exe on Windows
+def STDIN.tty?
+  true
+end
+
+# IRB setup
+IRB.init_config(nil)
+IRB.conf[:USE_READLINE] = false
+IRB.init_error
+irb = IRB::Irb.new
+IRB.conf[:MAIN_CONTEXT] = irb.context
+
+class IRB::StdioInputMethod
+  def gets
+    prompt = "\n" << @prompt
+    $stdin.instance_eval{
+      flush
+      @prompt = prompt
+      _set_console_line
+      @prompt = nil
+      _see_pos
+    }
+
+    @line[@line_no += 1] = $stdin.gets
+  end
+end
+
+# IRB start
+$stdout.print("*** IRB console on Ruby/Tk (#{release})  ")
+irb_thread = Thread.new{
+  catch(:IRB_EXIT){
+    loop {
+      begin
+        irb.eval_input
+      rescue Exception
+      end
+    }
+  }
+}
+
+console.bind('Control-c'){
+  console.insert('end', "^C\n")
+  irb_thread.raise RubyLex::TerminateLineInput
+}
+
+irb_thread.join
+
+# exit
+ev_thread.kill
+Tk.exit
diff --git a/ruby_1_8_6/ext/tk/sample/iso2022-kr.txt b/ruby_1_8_6/ext/tk/sample/iso2022-kr.txt
new file mode 100644
index 0000000000..2e3fe6ea2a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/iso2022-kr.txt
@@ -0,0 +1,2 @@
+Sample text:
+$)C  Hangul (GQ1[)	>H3gGO<<?d, >H3gGO=J4O1n
diff --git a/ruby_1_8_6/ext/tk/sample/menubar1.rb b/ruby_1_8_6/ext/tk/sample/menubar1.rb
new file mode 100644
index 0000000000..9fa1201d41
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/menubar1.rb
@@ -0,0 +1,51 @@
+#
+# menubar sample 1 : use frame and menubuttons
+#
+
+require 'tk'
+
+radio_var = TkVariable.new('y')
+
+menu_spec = [
+  [['File', 0],
+    {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
+    '---',
+    ['Check_A', TkVariable.new(true), 6],
+    {:type=>'checkbutton', :label=>'Check_B', 
+                :variable=>TkVariable.new, :underline=>6},
+    '---',
+    ['Radio_X', [radio_var, 'x'], 6, '', {:foreground=>'black'}],
+    ['Radio_Y', [radio_var, 'y'], 6],
+    ['Radio_Z', [radio_var, 'z'], 6],
+    '---',
+    ['cascade', [ 
+                   ['sss', proc{p 'sss'}, 0], 
+                   ['ttt', proc{p 'ttt'}, 0], 
+                   ['uuu', proc{p 'uuu'}, 0], 
+                   ['vvv', proc{p 'vvv'}, 0], 
+                ], 
+      0, '', 
+      {:font=>'Courier 16 italic', 
+       :menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
+    '---',
+    ['Quit', proc{exit}, 0]],
+
+  [['Edit', 0],
+    ['Cut', proc{puts('Cut clicked')}, 2],
+    ['Copy', proc{puts('Copy clicked')}, 0],
+    ['Paste', proc{puts('Paste clicked')}, 0]], 
+
+  [['Help', 0, {:menu_name=>'help'}],
+    ['About This', proc{puts('Ruby/Tk menubar sample 1')}, 6]]
+]
+
+menubar = TkMenubar.new(nil, menu_spec,
+                       'tearoff'=>false,
+                       'foreground'=>'grey40',
+                       'activeforeground'=>'red',
+                       'font'=>'Helvetia 12 bold')
+menubar.pack('side'=>'top', 'fill'=>'x')
+
+TkText.new(:wrap=>'word').pack.insert('1.0', 'Please read the sample source, and check how to override default configure options of menu entries on a menu_spec. Maybe, on windows, this menubar does not work properly about keyboard shortcuts. Then, please use "menu" option of root/toplevel widget (see sample/menubar2.rb).')
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/menubar2.rb b/ruby_1_8_6/ext/tk/sample/menubar2.rb
new file mode 100644
index 0000000000..4507d8b2fe
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/menubar2.rb
@@ -0,0 +1,56 @@
+#
+# menubar sample 2 : use 'menu' option of root/toplevel widget
+#
+
+require 'tk'
+
+radio_var = TkVariable.new('y')
+
+menu_spec = [
+  [['File', 0],
+    {:label=>'Open', :command=>proc{puts('Open clicked')}, :underline=>0},
+    '---',
+    ['Check_A', TkVariable.new(true), 6],
+    {:type=>'checkbutton', :label=>'Check_B', 
+                :variable=>TkVariable.new, :underline=>6},
+    '---',
+    ['Radio_X', [radio_var, 'x'], 6, '', {:foreground=>'black'}],
+    ['Radio_Y', [radio_var, 'y'], 6],
+    ['Radio_Z', [radio_var, 'z'], 6],
+    '---',
+    ['cascade', [ 
+                   ['sss', proc{p 'sss'}, 0], 
+                   ['ttt', proc{p 'ttt'}, 0], 
+                   ['uuu', proc{p 'uuu'}, 0], 
+                   ['vvv', proc{p 'vvv'}, 0], 
+                ], 
+      0, '', 
+      {:font=>'Courier 16 italic', 
+       :menu_config=>{:font=>'Times -18 bold', :foreground=>'black'}}],
+    '---',
+    ['Quit', proc{exit}, 0]],
+
+  [['Edit', 0],
+    ['Cut', proc{puts('Cut clicked')}, 2],
+    ['Copy', proc{puts('Copy clicked')}, 0],
+    ['Paste', proc{puts('Paste clicked')}, 0]], 
+
+  [['Help', 0, {:menu_name=>'help'}],
+    ['About This', proc{puts('Ruby/Tk menubar sample 2')}, 6]]
+]
+
+mbar = Tk.root.add_menubar(menu_spec, 
+                           # followings are default configure options
+                           'tearoff'=>'false',
+                           'foreground'=>'grey40', 
+                           'activeforeground'=>'red',
+                           'font'=>'Helvetia 12 bold')
+# This (default configure options) is NOT same the following.
+#
+#  mbar = Tk.root.add_menubar(menu_spec)
+#  mbar.configure('foreground'=>'grey40', 'activeforeground'=>'red',
+#                 'font'=>'Helvetia 12 bold')
+
+TkText.new(:wrap=>'word').pack.insert('1.0', 'Please read the sample source, and check how to override default configure options of menu entries on a menu_spec.')
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/README b/ruby_1_8_6/ext/tk/sample/msgs_rb/README
new file mode 100644
index 0000000000..2e3ff2a9c4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/README
@@ -0,0 +1,3 @@
+Message catalogs in this directory depend on Tcl/Tk's message catalogs. 
+Texts of each locale are copied from Tcl/Tk8.5a1 widget demos.
+Please refer '../msgs_tk/README'. 
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/cs.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/cs.msg
new file mode 100644
index 0000000000..199f2a73bd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/cs.msg
@@ -0,0 +1,84 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    cs "Application Error", "Chyba programu"
+    cs "Blue", "Modr\341"
+    cs "Color", "Barva"
+    cs "Delete", "Smazat"
+    cs "Error", "Chyba"
+    cs "Exit", "Konec"
+    cs "Green", "Zelen\341"
+    cs "Red", "\\u010cerven\341"
+    cs "blue", "modr\341"
+    cs "green", "zelen\341"
+    cs "red", "\\u010derven\341"
+}
+
+TkMsgCatalog.new('::tk') {
+    cs "&Abort", "&P\\u0159eru\\u0161it"
+    cs "About...", "O programu..."
+    cs "All Files", "V\\u0161echny soubory"
+    cs "Application Error", "Chyba programu"
+    cs "&Blue", "&Modr\341"
+    cs "&Cancel", "&Zru\\u0161it"
+    cs "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Nemohu zm\\u011bnit atku\341ln\355 adres\341\\u0159 na \"%1\$s\".\nP\\u0159\355stup odm\355tnut."
+    cs "Choose Directory", "V\375b\\u011br adres\341\\u0159e"
+    cs "Clear", "Smazat"
+    cs "Color", "Barva"
+    cs "Console", "Konzole"
+    cs "Copy", "Kop\355rovat"
+    cs "Cut", "Vy\\u0159\355znout"
+    cs "Delete", "Smazat"
+    cs "Details >>", "Detaily >>"
+    cs "Directory \"%1\$s\" does not exist.", "Adres\341\\u0159 \"%1\$s\" neexistuje."
+    cs "&Directory:", "&Adres\341\\u0159:"
+    cs "Error: %1\$s", "Chyba: %1\$s"
+    cs "Exit", "Konec"
+    cs "File \"%1\$s\" already exists.\n\n", "Soubor \"%1\$s\" ji\\u017e existuje.\n\n"
+    cs "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Soubor \"%1\$s\" ji\\u017e existuje.\nChcete jej p\\u0159epsat?"
+    cs "File \"%1\$s\" does not exist.", "Soubor \"%1\$s\" neexistuje."
+    cs "File &name:", "&Jm\351no souboru:"
+    cs "File &names:", "&Jm\351na soubor\\u016f:"
+    cs "Files of &type:", "&Typy soubor\\u016f:"
+    cs "Fi&les:", "Sou&bory:"
+    cs "&Filter", "&Filtr"
+    cs "Fil&ter:", "Fil&tr:"
+    cs "&Green", "Ze&len\341"
+    cs "Hi"
+    cs "Hide Console", "Skr\375t konsolu"
+    cs "&Ignore", "&Ignorovat"
+    cs "Invalid file name \"%1\$s\".", "\\u0160patn\351 jm\351no souboru \"%1\$s\"."
+    cs "Log Files", "Log soubory"
+    cs "&No", "&Ne"
+    cs "&OK"
+    cs "Ok"
+    cs "Open", "Otev\\u0159\355t"
+    cs "&Open", "&Otev\\u0159\355t"
+    cs "Open Multiple Files", "Otev\\u0159\355t v\355ce soubor\\u016f"
+    cs "Paste", "Vlo\\u017eit"
+    cs "Quit", "Skon\\u010dit"
+    cs "&Red", " \\u010ce&rven\341"
+    cs "Replace existing file?", "Nahradit st\341vaj\355c\355 soubor?"
+    cs "&Retry", "Z&novu"
+    cs "&Save", "&Ulo\\u017eit"
+    cs "Save As", "Ulo\\u017eit jako"
+    cs "Save To Log", "Ulo\\u017eit do logu"
+    cs "Select Log File", "Vybrat log soubor"
+    cs "Select a file to source", "Vybrat soubor k nahr\341n\355"
+    cs "&Selection:", "&V\375b\\u011br:"
+    cs "Skip Messages", "P\\u0159esko\\u010dit zpr\341vy"
+    cs "Source...", "Nahr\341t..."
+    cs "Tcl Scripts", "Tcl skripty"
+    cs "Tcl for Windows", "Tcl pro Windows"
+    cs "Text Files", "Textov\351 soubory"
+    cs "&Yes", "&Ano"
+    cs "abort", "p\\u0159eru\\u0161it"
+    cs "blue", "modr\341"
+    cs "cancel", "zru\\u0161it"
+    cs "extension", "p\\u0159\355pona"
+    cs "extensions", "p\\u0159\355pony"
+    cs "green", "zelen\341"
+    cs "ignore", "ignorovat"
+    cs "ok"
+    cs "red", "\\u010derven\341"
+    cs "retry", "znovu"
+    cs "yes", "ano"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/de.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/de.msg
new file mode 100644
index 0000000000..283874df42
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/de.msg
@@ -0,0 +1,88 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    de "Application Error", "Applikationsfehler"
+    de "Blue", "Blau"
+    de "Color", "Farbe"
+    de "Delete", "L\\u00f6schen"
+    de "Error", "Fehler"
+    de "Exit", "Ende"
+    de "Green", "Gr\\u00fcn"
+    de "Red", "Rot"
+    de "blue", "blau"
+    de "green", "gr\\u00fcn"
+    de "red", "rot"
+}
+
+TkMsgCatalog.new('::tk') {
+    de "&Abort", "&Abbruch"
+    de "&About...", "&\\u00dcber..."
+    de "All Files", "Alle Dateien"
+    de "Application Error", "Applikationsfehler"
+    de "&Blue", "&Blau"
+    de "&Cancel", "&Abbruch"
+    de "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Kann nicht in das Verzeichnis \"%1\$s\" wechseln.\nKeine Rechte vorhanden."
+    de "Choose Directory", "W\\u00e4hle Verzeichnis"
+    de "&Clear", "&R\\u00fccksetzen"
+    de "&Clear Console", "&Konsole l\\u00f6schen"
+    de "Color", "Farbe"
+    de "Console", "Konsole"
+    de "&Copy", "&Kopieren"
+    de "Cu&t", "Aus&schneiden"
+    de "&Delete", "&L\\u00f6schen"
+    de "Details >>"
+    de "Directory \"%1\$s\" does not exist.", "Das Verzeichnis \"%1\$s\" existiert nicht."
+    de "&Directory:", "&Verzeichnis:"
+    de "&Edit", "&Bearbieten"
+    de "Error: %1\$s", "Fehler: %1\$s"
+    de "E&xit", "&Ende"
+    de "&File", "&Datei"
+    de "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Die Datei \"%1\$s\" ist bereits vorhanden.\nWollen sie diese Datei \\u00fcberschreiben ?"
+    de "File \"%1\$s\" already exists.\n\n", "Die Datei \"%1\$s\" ist bereits vorhanden.\n\n"
+    de "File \"%1\$s\" does not exist.", "Die Datei \"%1\$s\" existiert nicht."
+    de "File &name:", "Datei&name:"
+    de "File &names:", "Datei&namen:"
+    de "Files of &type:", "Dateien des &Typs:"
+    de "Fi&les:", "Dat&eien:"
+    de "&Filter"
+    de "Fil&ter:"
+    de "&Green", "&Gr\\u00fcn"
+    de "&Help", "&Hilfe"
+    de "Hi", "Hallo"
+    de "&Hide Console", "&Konsole unsichtbar machen"
+    de "&Ignore", "&Ignorieren"
+    de "Invalid file name \"%1\$s\".", "Ung\\u00fcltiger Dateiname \"%1\$s\"."
+    de "Log Files", "Protokolldatei"
+    de "&No", "&Nein"
+    de "OK"
+    de "Ok"
+    de "Open", "\\u00d6ffnen"
+    de "&Open", "\\u00d6&ffnen"
+    de "Open Multiple Files"
+    de "P&aste", "E&inf\\u00fcgen"
+    de "&Quit", "&Beenden"
+    de "&Red", "&Rot"
+    de "Replace existing file?", "Existierende Datei ersetzen?"
+    de "&Retry", "&Wiederholen"
+    de "&Save", "&Speichern"
+    de "Save As", "Speichern unter"
+    de "Save To Log", "In Protokoll speichern"
+    de "Select Log File", "Protokolldatei ausw\\u00e4hlen"
+    de "Select a file to source", "Auszuf\\u00fchrende Datei ausw\\u00e4hlen"
+    de "&Selection:", "Auswah&l:"
+    de "Skip Messages", "Weitere Nachrichten \\u00fcberspringen"
+    de "&Source...", "&Ausf\\u00fchren..."
+    de "Tcl Scripts", "Tcl-Skripte"
+    de "Tcl for Windows", "Tcl f\\u00fcr Windows"
+    de "Text Files", "Textdateien"
+    de "&Yes", "&Ja"
+    de "abort", "abbrechen"
+    de "blue", "blau"
+    de "cancel", "abbrechen"
+    de "extension", "Erweiterung"
+    de "extensions", "Erweiterungen"
+    de "green", "gr\\u00fcn"
+    de "ignore", "ignorieren"
+    de "ok"
+    de "red", "rot"
+    de "retry", "wiederholen"
+    de "yes", "ja"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/el.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/el.msg
new file mode 100644
index 0000000000..f314ae03eb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/el.msg
@@ -0,0 +1,98 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    el 'Application Error',  '\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2'
+    el 'Blue',     '\u039c\u03c0\u03bb\u03b5'
+    el 'Color',    '\u03a7\u03c1\u03ce\u03bc\u03b1'
+    el 'Delete',   '\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae'
+    el 'Error',    '\u039b\u03ac\u03b8\u03bf\u03c2'
+    el 'Exit',     '\u0388\u03be\u03bf\u03b4\u03bf\u03c2'
+    el 'Green',    '\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf'
+    el 'Red',      '\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf'
+    el 'blue',     '\u03bc\u03c0\u03bb\u03b5'
+    el 'green',    '\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf'
+    el 'red',      '\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf'
+}
+
+TkMsgCatalog.new('::tk') {
+    el '&Abort',             '\u03a4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2'
+    el 'About...',           '\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac...'
+    el 'All Files',          '\u038c\u03bb\u03b1 \u03c4\u03b1 \u0391\u03c1\u03c7\u03b5\u03af\u03b1'
+    el 'Application Error',  '\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2'
+    el '&Blue',              '\u039c\u03c0\u03bb\u03b5'
+    el '&Cancel',            '\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7'
+    el 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.', \
+          '\u0394\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03ba\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5 \u03c3\u03b5 "%1\$s".' \
+          "\n" \
+          '\u0397 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03b4\u03b5\u03bd \u03b5\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9.'
+    el 'Choose Directory',   '\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u039a\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5'
+    el 'Clear',              '\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2'
+    el 'Color',              '\u03a7\u03c1\u03ce\u03bc\u03b1'
+    el 'Console',            '\u039a\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1'
+    el 'Copy',               '\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae'
+    el 'Cut',                '\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae'
+    el 'Delete',             '\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae'
+    el 'Details >>',         '\u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03ad\u03c1\u03b5\u03b9\u03b5\u03c2 >>'
+    el 'Directory "%1\$s", does not exist.', \
+          '\u039f \u03ba\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2 \'%1\$s\' \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.'
+    el '&Directory:',        '&\u039a\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2:'
+    el 'Error: %1\$s',       '\u039b\u03ac\u03b8\u03bf\u03c2: %1\$s'
+    el 'Exit',               '\u0388\u03be\u03bf\u03b4\u03bf\u03c2'
+    el 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?', \
+          '\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf "%1\$s" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.' \
+          "\n" \
+          '\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03c0\u03b9\u03ba\u03b1\u03bb\u03c5\u03c6\u03b8\u03b5\u03af;'
+    el 'File "%1\$s" already exists.' "\n\n",  \
+          '\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf "%1\$s" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.' "\n\n"
+    el 'File "%1\$s" does not exist.', \
+          '\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf "%1\$s" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.'
+    el 'File &name:',        '\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5:'
+    el 'File &names:',       '\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd:'
+    el 'Files of &type:',    '\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u03c4\u03bf\u03c5 &\u03c4\u03cd\u03c0\u03bf\u03c5:'
+    el 'Fi&les:',            '\u0391\u03c1\u03c7\u03b5\u03af\u03b1:'
+    el '&Filter',            '\u03a6\u03af\u03bb\u03c4\u03c1\u03bf'
+    el 'Fil&ter:',           '\u03a6\u03af\u03bb\u03c4\u03c1\u03bf:'
+    el '&Green',             '\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf'
+    el 'Hi',                 '\u0393\u03b5\u03b9\u03b1'
+    el 'Hide Console',       '\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03ba\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1\u03c2'
+    el '&Ignore',            '\u0391\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7'
+    el 'Invalid file name "%1\$s".', \
+          '\u0386\u03ba\u03c5\u03c1\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 "%1\$s".'
+    el 'Log Files',          '\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2'
+    el '&No',                '\u038c\u03c7\u03b9'
+    el '&OK',                '\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9'
+    el '&Ok',                '\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9'
+    el 'Open',               '\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1'
+    el '&Open',              '\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1'
+    el 'Open Multiple Files', \
+          '\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1 \u03c0\u03bf\u03bb\u03bb\u03b1\u03c0\u03bb\u03ce\u03bd \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd'
+    el 'Paste',              '\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7'
+    el 'Quit',               '\u0388\u03be\u03bf\u03b4\u03bf\u03c2'
+    el '&Red',               '\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf'
+    el 'Replace existing file?', \
+          '\u0395\u03c0\u03b9\u03ba\u03ac\u03bb\u03c5\u03c8\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03bd\u03c4\u03bf\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5;'
+    el '&Retry',             '\u03a0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac'
+    el '&Save',              '\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7'
+    el 'Save As',            '\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03b1\u03bd'
+    el 'Save To Log',        '\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03c4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2'
+    el 'Select Log File',    '\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2'
+    el 'Select a file to source', \
+          '\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03b3\u03b9\u03b1 \u03b5\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7'
+    el '&Selection:',        '\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae:'
+    el 'Skip Messages',      '\u0391\u03c0\u03bf\u03c6\u03c5\u03b3\u03ae \u03bc\u03c5\u03bd\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd'
+    el 'Source...',          '\u0395\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7...'
+    el 'Tcl Scripts',        'Tcl Scripts'
+    el 'Tcl for Windows',    'Tcl \u03b3\u03b9\u03b1 Windows'
+    el 'Text Files',         '\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5'
+    el '&Yes',               '\u039d\u03b1\u03b9'
+    el 'abort',              '\u03c4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2'
+    el 'blue',               '\u03bc\u03c0\u03bb\u03b5'
+    el 'cancel',             '\u03b1\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7'
+    el 'extension',          '\u03b5\u03c0\u03ad\u03ba\u03c4\u03b1\u03c3\u03b7'
+    el 'extensions',         '\u03b5\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2'
+    el 'green',              '\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf'
+    el 'ignore',             '\u03b1\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7'
+    el 'ok',                 '\u03b5\u03bd\u03c4\u03ac\u03be\u03b5\u03b9'
+    el 'red',                '\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf'
+    el 'retry',              '\u03c0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac'
+    el 'yes',                '\u03bd\u03b1\u03b9'
+}
+
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/en.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/en.msg
new file mode 100644
index 0000000000..9b70239511
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/en.msg
@@ -0,0 +1,83 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    en "Application Error"
+    en "Blue"
+    en "Color"
+    en "Delete"
+    en "Error"
+    en "Green"
+    en "Red"
+    en "blue"
+    en "green"
+    en "red"
+}
+
+TkMsgCatalog.new('::tk') {
+    en "&Abort"
+    en "About..."
+    en "All Files"
+    en "Application Error"
+    en "&Blue"
+    en "&Cancel"
+    en "Cannot change to the directory \"%1\$s\".\nPermission denied."
+    en "Choose Directory"
+    en "Clear"
+    en "Color"
+    en "Console"
+    en "Copy"
+    en "Cut"
+    en "Delete"
+    en "Details >>"
+    en "Directory \"%1\$s\" does not exist."
+    en "&Directory:"
+    en "Error: %1\$s"
+    en "Exit"
+    en "File \"%1\$s\" already exists.\nDo you want to overwrite it?"
+    en "File \"%1\$s\" already exists.\n\n"
+    en "File \"%1\$s\" does not exist."
+    en "File &name:"
+    en "File &names:"
+    en "Files of &type:"
+    en "Fi&les:"
+    en "&Filter"
+    en "Fil&ter:"
+    en "&Green"
+    en "Hi"
+    en "Hide Console"
+    en "&Ignore"
+    en "Invalid file name \"%1\$s\"."
+    en "Log Files"
+    en "&No"
+    en "&OK"
+    en "Ok"
+    en "Open"
+    en "&Open"
+    en "Open Multiple Files"
+    en "Paste"
+    en "Quit"
+    en "&Red"
+    en "Replace existing file?"
+    en "&Retry"
+    en "&Save"
+    en "Save As"
+    en "Save To Log"
+    en "Select Log File"
+    en "Select a file to source"
+    en "&Selection:"
+    en "Skip Messages"
+    en "Source..."
+    en "Tcl Scripts"
+    en "Tcl for Windows"
+    en "Text Files"
+    en "&Yes"
+    en "abort"
+    en "blue"
+    en "cancel"
+    en "extension"
+    en "extensions"
+    en "green"
+    en "ignore"
+    en "ok"
+    en "red"
+    en "retry"
+    en "yes"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/en_gb.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/en_gb.msg
new file mode 100644
index 0000000000..97c58959b1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/en_gb.msg
@@ -0,0 +1,7 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    en_gb 'Color', 'Colour'
+}
+
+TkMsgCatalog.new('::tk') {
+    en_gb 'Color', 'Colour'
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/eo.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/eo.msg
new file mode 100644
index 0000000000..1630df5e83
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/eo.msg
@@ -0,0 +1,87 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    eo 'Application Error', 'Aplikoerraro'
+    eo 'Blue', 'Blua'
+    eo 'Color', 'Farbo'
+    eo 'Delete', 'Forprenu'
+    eo 'Error', 'Eraro'
+    eo 'Exit', 'Eliru'
+    eo 'Green', 'Verda'
+    eo 'Red', 'Rosa'
+    eo 'blue', 'blua'
+    eo 'green', 'verda'
+    eo 'red', 'ru\u011da'
+}
+
+TkMsgCatalog.new('::tk') {
+    eo '&Abort', '&\u0108esigo'
+    eo '&About...', 'Pri...'
+    eo 'All Files', '\u0108ioj dosieroj'
+    eo 'Application Error', 'Aplikoerraro'
+    eo '&Blue', '&Blua'
+    eo '&Cancel', '&Rezignu'
+    eo 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.', 'Neeble \u0109angi al dosierulon "%1\$s".' "\n" 'Vi ne rajtas tion.'
+    eo 'Choose Directory', 'Elektu Dosierujo'
+    eo '&Clear', '&Klaru'
+    eo '&Clear Console', '&Klaru konzolon'
+    eo 'Color', 'Farbo'
+    eo 'Console', 'Konzolo'
+    eo '&Copy', '&Kopiu'
+    eo 'Cu&t', '&Enpo\u015digu'
+    eo '&Delete', '&Forprenu'
+    eo 'Details >>', 'Detaloj >>'
+    eo 'Directory "%1\$s" does not exist.', 'La dosierujo "%1\$s" ne ekzistas.'
+    eo '&Directory:', '&Dosierujo:'
+    eo '&Edit', '&Redaktu'
+    eo 'Error: %1\$s', 'Eraro: %1\$s'
+    eo 'E&xit', '&Eliru'
+    eo '&File', '&Dosiero'
+    eo 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?', 'La dosiero "%1\$s" jam ekzistas.' "\n" '\u0108u vi volas anstata\u00fbigi la dosieron?'
+    eo 'File "%1\$s" already exists.' "\n\n", 'La dosiero "%1\$s" jam egzistas.' "\n\n"
+    eo 'File "%1\$s" does not exist.', 'La dosierp "%1\$s" ne estas.'
+    eo 'File &name:', 'Dosiero&nomo:'
+    eo 'File &names:', 'Dosiero&nomoj:'
+    eo 'Files of &type:', 'Dosieroj de &Typo:'
+    eo 'Fi&les:', 'Do&sieroj:'
+    eo '&Filter', '&Filtrilo'
+    eo 'Fil&ter:', '&Filtrilo:'
+    eo '&Green', '&Verda'
+    eo '&Help', '&Helpu'
+    eo 'Hi', 'Saluton'
+    eo '&Hide Console', '&Ka\u015du konzolon'
+    eo '&Ignore', '&Ignoru'
+    eo 'Invalid file name "%1\$s".', 'Malvalida dosieronomo "%1\$s".'
+    eo 'Log Files', 'Protokolo'
+    eo '&No', '&Ne'
+    eo 'OK'
+    eo 'Ok'
+    eo 'Open', 'Malfermu'
+    eo '&Open', '&Malfermu'
+    eo 'Open Multiple Files', 'Melfermu multan dosierojn'
+    eo 'P&aste', '&Elpo\u015digi'
+    eo '&Quit', '&Finigu'
+    eo '&Red', '&Rosa'
+    eo 'Replace existing file?', '\u0108u anstata\u00fbu ekzistantan dosieron?'
+    eo '&Retry', '&Ripetu'
+    eo '&Save', '&Savu'
+    eo 'Save As', 'Savu kiel'
+    eo 'Save To Log', 'Savu en protokolon'
+    eo 'Select Log File', 'Elektu prokolodosieron'
+    eo 'Select a file to source', 'Elektu dosieron por interpreti'
+    eo '&Selection:', '&Elekto:'
+    eo 'Skip Messages', 'transsaltu pluajn mesa\u011dojn'
+    eo '&Source...', '&Fontoprogramo...'
+    eo 'Tcl Scripts', 'Tcl-skriptoj'
+    eo 'Tcl for Windows', 'Tcl por vindoso'
+    eo 'Text Files', 'Tekstodosierojn'
+    eo '&Yes', '&Jes'
+    eo 'abort', '\u0109esigo'
+    eo 'blue', 'blua'
+    eo 'cancel', 'rezignu'
+    eo 'extension', 'ekspansio'
+    eo 'extensions', 'ekspansioj'
+    eo 'green', 'verda'
+    eo 'ignore', 'ignorieren'
+    eo 'red', 'ru\u011da'
+    eo 'retry', 'ripetu'
+    eo 'yes', 'jes'
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/es.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/es.msg
new file mode 100644
index 0000000000..460dbe848c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/es.msg
@@ -0,0 +1,84 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    es "Application Error", "Error de la aplicaci\\u00f3n"
+    es "Blue", "Azul"
+    es "Color", "Color"
+    es "Delete", "Borrar"
+    es "Error", "Error"
+    es "Exit", "Salir"
+    es "Green", "Verde"
+    es "Red", "Rojo"
+    es "blue", "azul"
+    es "green", "verde"
+    es "red", "rojo"
+}
+
+TkMsgCatalog.new('::tk') {
+    es "&Abort", "&Abortar"
+    es "About...", "Acerca de ..."
+    es "All Files", "Todos los archivos"
+    es "Application Error", "Error de la aplicaci\\u00f3n"
+    es "&Blue", "&Azul"
+    es "&Cancel", "&Cancelar"
+    es "Cannot change to the directory \"%1\$s\".\nPermission denied.", "No es posible acceder al directorio \"%1\$s\".\nPermiso denegado."
+    es "Choose Directory", "Elegir directorio"
+    es "Clear", "Borrar"
+    es "Color", "Color"
+    es "Console", "Consola"
+    es "Copy", "Copiar"
+    es "Cut", "Cortar"
+    es "Delete", "Borrar"
+    es "Details >>", "Detalles >>"
+    es "Directory \"%1\$s\" does not exist.", "El directorio \"%1\$s\" no existe."
+    es "&Directory:", "&Directorio:"
+    es "Error: %1\$s", "Error: %1\$s"
+    es "Exit", "Salir"
+    es "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "El archivo \"%1\$s\" ya existe.\nDesea sobreescribirlo?"
+    es "File \"%1\$s\" already exists.\n\n", "El archivo \"%1\$s\" ya existe.\n\n"
+    es "File \"%1\$s\" does not exist.", "El archivo \"%1\$s\" no existe."
+    es "File &name:", "&Nombre de archivo:"
+    es "File &names:", "&Nombres de archivo:"
+    es "Files of &type:", "Archivos de &tipo:"
+    es "Fi&les:", "&Archivos:"
+    es "&Filter", "&Filtro"
+    es "Fil&ter:", "Fil&tro:"
+    es "&Green", "&Verde"
+    es "Hi", "Hola"
+    es "Hide Console", "Esconder la consola"
+    es "&Ignore", "&Ignorar"
+    es "Invalid file name \"%1\$s\".", "Nombre de archivo inv\\u00e1lido \"%1\$s\"."
+    es "Log Files", "Ficheros de traza"
+    es "&No", "&No"
+    es "&OK", "&OK"
+    es "Ok", "Ok"
+    es "Open", "Abrir"
+    es "&Open", "&Abrir"
+    es "Open Multiple Files", "Abrir m\\u00faltiples archivos"
+    es "Paste", "Pegar"
+    es "Quit", "Abandonar"
+    es "&Red", "&Rojo"
+    es "Replace existing file?", "Reemplazar el archivo existente?"
+    es "&Retry", "&Reintentar"
+    es "&Save", "&Salvar"
+    es "Save As", "Salvar como"
+    es "Save To Log", "Salvar al archivo de traza"
+    es "Select Log File", "Elegir un archivo de traza"
+    es "Select a file to source", "Seleccionar un archivo a evaluar"
+    es "&Selection:", "&Selecci\\u00f3n:"
+    es "Skip Messages", "Omitir los mensajes"
+    es "Source...", "Evaluar..."
+    es "Tcl Scripts", "Scripts Tcl"
+    es "Tcl for Windows", "Tcl para Windows"
+    es "Text Files", "Archivos de texto"
+    es "&Yes", "&S\\u00ed" 
+    es "abort", "abortar"
+    es "blue", "azul"
+    es "cancel", "cancelar"
+    es "extension", "extensi\\u00f3n"
+    es "extensions", "extensiones"
+    es "green", "verde"
+    es "ignore", "ignorar"
+    es "ok", "ok"
+    es "red", "rojo"
+    es "retry", "reintentar"
+    es "yes", "s\\u00ed"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/fr.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/fr.msg
new file mode 100644
index 0000000000..ea85cf1a39
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/fr.msg
@@ -0,0 +1,84 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    fr 'Application Error', "Erreur d'application"
+    fr 'Blue', 'Bleu'
+    fr 'Color', 'Couleur'
+    fr 'Delete', 'Effacer'
+    fr 'Error', 'Erreur'
+    fr 'Exit', 'Quitter'
+    fr 'Green', 'Vert'
+    fr 'Red', 'Rouge'
+    fr 'blue', 'bleu'
+    fr 'green', 'vert'
+    fr 'red', 'rouge'
+}
+
+TkMsgCatalog.new('::tk') {
+    fr '&Abort', '&Annuler'
+    fr 'About...', '\u00c0 propos...'
+    fr 'All Files', 'Tous les fichiers'
+    fr 'Application Error', "Erreur d'application"
+    fr '&Blue', '&Bleu'
+    fr '&Cancel', '&Annuler'
+    fr 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.', 'Impossible d\'acc\u00e9der au r\u00e9pertoire "%1\$s".' "\n" 'Permission refus\u00e9e.'
+    fr 'Choose Directory', 'Choisir r\u00e9pertoire'
+    fr 'Clear', 'Effacer'
+    fr 'Color', 'Couleur'
+    fr 'Console'
+    fr 'Copy', 'Copier'
+    fr 'Cut', 'Couper'
+    fr 'Delete', 'Effacer'
+    fr 'Details >>', 'D\u00e9tails >>'
+    fr 'Directory "%1\$s" does not exist.', 'Le r\u00e9pertoire "%1\$s" n\'existe pas.'
+    fr '&Directory:', '&R\u00e9pertoire:'
+    fr 'Error: %1\$s', 'Erreur: %1\$s'
+    fr 'Exit', 'Quitter'
+    fr 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?', 'Le fichier "%1\$s" existe d\u00e9j\u00e0.' "\n" 'Voulez-vous l\'\u00e9craser?'
+    fr 'File "%1\$s" already exists.' "\n\n", 'Le fichier "%1\$s" existe d\u00e9j\u00e0.' "\n\n"
+    fr 'File "%1\$s" does not exist.', 'Le fichier "%1\$s" n\'existe pas.'
+    fr 'File &name:', '&Nom de fichier:'
+    fr 'File &names:', '&Noms de fichiers:'
+    fr 'Files of &type:', '&Type de fichiers:'
+    fr 'Fi&les:', 'Fich&iers:'
+    fr '&Filter', '&Filtre'
+    fr 'Fil&ter:', 'Fil&tre:'
+    fr '&Green', '&Vert'
+    fr 'Hi', 'Salut'
+    fr 'Hide Console', 'Cacher la Console'
+    fr '&Ignore', '&Ignorer'
+    fr 'Invalid file name "%1\$s".', 'Nom de fichier invalide "%1\$s".'
+    fr 'Log Files', 'Fichiers de trace'
+    fr '&No', '&Non'
+    fr '&OK'
+    fr 'Ok'
+    fr 'Open', 'Ouvrir'
+    fr '&Open', '&Ouvrir'
+    fr 'Open Multiple Files', 'Ouvrir plusieurs fichiers'
+    fr 'Paste', 'Coller'
+    fr 'Quit', 'Quitter'
+    fr '&Red', '&Rouge'
+    fr 'Replace existing file?', 'Remplacer le fichier existant?'
+    fr '&Retry', '&R\u00e9-essayer'
+    fr '&Save', '&Sauvegarder'
+    fr 'Save As', 'Sauvegarder sous'
+    fr 'Save To Log', 'Sauvegarde au fichier de trace'
+    fr 'Select Log File', 'Choisir un fichier de trace'
+    fr 'Select a file to source', 'Choisir un fichier \u00e0 \u00e9valuer'
+    fr '&Selection:', '&S\u00e9lection:'
+    fr 'Skip Messages', 'Omettre les messages'
+    fr 'Source...', '\u00c9valuer...'
+    fr 'Tcl Scripts', 'Scripts Tcl'
+    fr 'Tcl for Windows', 'Tcl pour Windows'
+    fr 'Text Files', 'Fichiers texte'
+    fr '&Yes', '&Oui'
+    fr 'abort', 'abandonner'
+    fr 'blue', 'bleu'
+    fr 'cancel', 'annuler'
+    fr 'extension'
+    fr 'extensions'
+    fr 'green', 'vert'
+    fr 'ignore', 'ignorer'
+    fr 'ok'
+    fr 'red', 'rouge'
+    fr 'retry', 'r\u00e9essayer'
+    fr 'yes', 'oui'
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/it.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/it.msg
new file mode 100644
index 0000000000..a180bdbd99
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/it.msg
@@ -0,0 +1,84 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    it "Application Error", "Errore dell' applicazione"
+    it "Blue", "Blu"
+    it "Color", "Colore"
+    it "Delete", "Incolla"
+    it "Error", "Errore"
+    it "Exit", "Esci"
+    it "Green", "Verde"
+    it "Red", "Rosso"
+    it "blue", "blu"
+    it "green", "verde"
+    it "red", "rosso"
+}
+
+TkMsgCatalog.new('::tk') {
+    it "&Abort", "&Interrompi"
+    it "About...", "Informazioni ..."
+    it "All Files", "Tutti i file"
+    it "Application Error", "Errore dell' applicazione"
+    it "&Blue", "&Blu"
+    it "&Cancel", "&Annulla"
+    it "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Impossibile accedere alla directory \"%1\$s\".\nPermesso negato."
+    it "Choose Directory", "Scegli directory"
+    it "Clear", "Azzera"
+    it "Color", "Colore"
+    it "Console"
+    it "Copy", "Copia"
+    it "Cut", "Taglia"
+    it "Delete", "Incolla"
+    it "Details >>", "Dettagli >>"
+    it "Directory \"%1\$s\" does not exist.", "La directory \"%1\$s\" non esiste."
+    it "&Directory:"
+    it "Error: %1\$s", "Errore: %1\$s"
+    it "Exit", "Esci"
+    it "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Il file \"%1\$s\" esiste gi\\u00e0.\nVuoi sovrascriverlo?"
+    it "File \"%1\$s\" already exists.\n\n", "Il file \"%1\$s\" esiste gi\\u00e0.\n\n"
+    it "File \"%1\$s\" does not exist.", "Il file \"%1\$s\" non esiste."
+    it "File &name:", "&Nome del file:"
+    it "File &names:", "&Nomi dei file:"
+    it "Files of &type:", "File di &tipo:"
+    it "Fi&les:", "Fi&le:"
+    it "&Filter", "&Filtro"
+    it "Fil&ter:", "Fil&tro:"
+    it "&Green", "&Verde"
+    it "Hi", "Salve"
+    it "Hide Console", "Nascondi la console"
+    it "&Ignore", "&Ignora"
+    it "Invalid file name \"%1\$s\".", "Nome di file non valido \"%1\$s\"."
+    it "Log Files", "File di log"
+    it "&No"
+    it "&OK"
+    it "Ok"
+    it "&Open", "A&pri"
+    it "Open", "Apri"
+    it "Open Multiple Files", "Apri file multipli"
+    it "Paste", "Incolla"
+    it "Quit", "Esci"
+    it "&Red", "&Rosso"
+    it "Replace existing file?", "Sostituisci il file esistente?"
+    it "&Retry", "&Riprova"
+    it "&Save", "&Salva"
+    it "Save As", "Salva come"
+    it "Save To Log", "Salva il log"
+    it "Select Log File", "Scegli un file di log"
+    it "Select a file to source", "Scegli un file da eseguire"
+    it "&Selection:", "&Selezione:"
+    it "Skip Messages", "Salta i messaggi"
+    it "Source...", "Esegui..."
+    it "Tcl Scripts", "Scripts Tcl"
+    it "Tcl for Windows", "Tcl per Windows"
+    it "Text Files", "File di testo"
+    it "&Yes", "&Si"
+    it "abort", "interrompi"
+    it "blue", "blu"
+    it "cancel", "annulla"
+    it "extension", "estensione"
+    it "extensions", "estensioni"
+    it "green", "verde"
+    it "ignore", "ignora"
+    it "ok"
+    it "red", "rosso"
+    it "retry", "riprova"
+    it "yes", "si"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/ja.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/ja.msg
new file mode 100644
index 0000000000..40587c1f1d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/ja.msg
@@ -0,0 +1,13 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    ja 'Application Error', '\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30A8\u30E9\u30FC'
+    ja 'Blue',   '\u9752'
+    ja 'Color',  '\u80CC\u666F\u8272'
+    ja 'Delete', '\u6D88\u53BB'
+    ja 'Error',  '\u30A8\u30E9\u30FC'
+    ja 'Exit',   '\u7D42\u4E86'
+    ja 'Green',  '\u7DD1'
+    ja 'Red',    '\u8D64'
+    ja 'blue',   '\u9752'
+    ja 'green',  '\u7DD1'
+    ja 'red',    '\u8D64'
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/nl.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/nl.msg
new file mode 100644
index 0000000000..24e41dae86
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/nl.msg
@@ -0,0 +1,123 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    nl "Application Error", "Toepassingsfout"
+    nl "Blue", "Blauw"
+    nl "Color", "Kleur"
+    nl "Delete", "Wissen"
+    nl "Error", "Fout"
+    nl "Exit", "Be\\u00ebindigen"
+    nl "Green", "Groen"
+    nl "Red", "Rood"
+    nl "blue", "blauw"
+    nl "green", "groen"
+    nl "red", "rood"
+}
+
+TkMsgCatalog.new('::tk') {
+    nl "\"%1\$s\" must be an absolute pathname", "\"%1\$s\" moet een absolute pad-naam zijn"
+    nl "%1\$s is not a toplevel window", "%1\$s is geen toplevel window"
+    nl ", or", ", of"
+    nl "-default, -icon, -message, -parent, -title, or -type", "-default, -icon, -message, -parent, -title, of -type"
+    nl "-initialdir, -mustexist, -parent, or -title", "-initialdir, -mustexist, -parent, of -title"
+    nl "&Abort", "&Afbreken"
+    nl "About...", "Over..."
+    nl "All Files", "Alle Bestanden"
+    nl "Application Error", "Toepassingsfout"
+    nl "&Blue", "&Blauw"
+    nl "&Cancel", "&Annuleren"
+    nl "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Kan niet naar map \"%1\$s\" gaan.\nU heeft hiervoor geen toestemming."
+    nl "Choose Directory", "Kies map"
+    nl "Clear", "Wissen"
+    nl "Clear entry, Press OK; Enter %1\$s, press OK", "Wis veld, Druk op OK; typ %1\$s in, druk op OK"
+    nl "&Clear Console", "&Wis Console"
+    nl "Color", "Kleur"
+    nl "Console"
+    nl "Copy", "Kopi\\u00ebren"
+    nl "Cut", "Knippen"
+    nl "Delete", "Wissen"
+    nl "Details"
+    nl "Details >>"
+    nl "Directory \"%1\$s\" does not exist.", "Map \"%1\$s\" bestaat niet."
+    nl "&Directory:", "&Map:"
+    nl "Edit", "Bewerken"
+    nl "Enter \"%1\$s\", press OK", "Typ \"%1\$s\", druk op OK"
+    nl "Enter \"%1\$s\", press OK, enter \"%2\$s\", press OK", "Typ \"%1\$s\", druk op OK, typ \"%2\$s\", druk op OK"
+    nl "Error: %1\$s", "Fout: %1\$s"
+    nl "Exit", "Be\\u00ebindigen"
+    nl "File", "Bestand"
+    nl "File \"%1\$s\" already exists.\n\n", "Bestand \"%1\$s\" bestaat al.\n\n"
+    nl "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Bestand \"%1\$s\" bestaat al.\nWilt u het overschrijven?"
+    nl "File \"%1\$s\" does not exist.", "Bestand \"%1\$s\" bestaat niet."
+    nl "File &name:", "Bestands&naam:"
+    nl "File &names:", "Bestands&namen:"
+    nl "Files of &type:", "Bestanden van het &type:"
+    nl "Fi&les:", "&Bestanden:"
+    nl "&Filter"
+    nl "Fil&ter:"
+    nl "&Green", "&Groen"
+    nl "Hi", "H\\u00e9"
+    nl "Hide Console", "Verberg Console"
+    nl "&Ignore", "&Negeren"
+    nl "Invalid file name \"%1\$s\".", "Ongeldige bestandsnaam \"%1\$s\"."
+    nl "Log Files", "Log Bestanden"
+    nl "&No", "&Nee"
+    nl "&OK"
+    nl "Ok"
+    nl "&Open", "&Openen"
+    nl "Open", "Openen"
+    nl "Open Multiple Files", "Open meerdere bestanden"
+    nl "Paste", "Plakken"
+    nl "Please press %1\$s", "Druk op %1\$s, A.U.B."
+    nl "Please press ok", "Druk op ok, A.U.B."
+    nl "Press Cancel", "Druk op Annuleren"
+    nl "Press Ok", "Druk op Ok"
+    nl "Quit", "Stoppen"
+    nl "&Red", "&Rood"
+    nl "Replace existing file?", "Vervang bestaand bestand?"
+    nl "&Retry", "&Herhalen"
+    nl "&Save", "Op&slaan"
+    nl "Save As", "Opslaan als"
+    nl "Save To Log", "Opslaan naar Log"
+    nl "Select Log File", "Selecteer Log bestand"
+    nl "Select a file to source", "Selecteer bronbestand"
+    nl "&Selection:", "&Selectie:"
+    nl "Skip Messages", "Berichten overslaan"
+    nl "Source...", "Bron..."
+    nl "Tcl Scripts"
+    nl "Tcl for Windows", "Tcl voor Windows"
+    nl "Text Files", "Tekstbestanden"
+    nl "&Yes", "&Ja"
+    nl "abort", "afbreken"
+    nl "abort, retry, ignore, ok, cancel, no, or yes", "afbreken, opnieuw, negeren, ok, annuleren, nee, of ja"
+    nl "abortretryignore, ok, okcancel, retrycancel, yesno, or yesnocancel", "abortretryignore, ok, okcancel, retrycancel, yesno, of yesnocancel"
+    nl "bad %1\$s value \"%2\$s\": must be %3\$s", "verkeerde %1\$s waarde \"%2\$s\": moet zijn %3\$s"
+    nl "bad file type \"%1\$s\", should be", "verkeerd bestandstype \"%1\$s\", moet zijn"
+    nl "bad option \"%1\$s\": should be %2\$s", "verkeerde optie \"%1\$s\": moet zijn %2\$s"
+    nl "bad window path name \"%1\$s\"", "verkeerde window-padnaam \"%1\$s\""
+    nl "blue", "blauw"
+    nl "can't post %1\$s:  it isn't a descendant of %2\$s (this is a new requirement in Tk versions 3.0 and later)", "kan %1\$s niet verzenden:  het is geen afstammeling van %2\$s (dit is een nieuwe eis in Tk versies 3.0 en later)"
+    nl "cancel", "annuleren"
+    nl "default button index greater than number of buttons specified for tk_dialog", "default knop index is groter dan het aantal knoppen beschikbaar voor tk_dialog"
+    nl "display name to use (current one otherwise)", "te gebruiken schermnaam (anders huidige scherm)"
+    nl "error, info, question, or warning", "error, info, question, of warning"
+    nl "extension"
+    nl "extensions"
+    nl "focus group \"%1\$s\" doesn't exist", "focusgroep \"%1\$s\" bestaat niet"
+    nl "green", "groen"
+    nl "history event %1\$s"
+    nl "ignore", "negeren"
+    nl "invalid default button \"%1\$s\"", "ongeldige default knop \"%1\$s\""
+    nl "macType"
+    nl "macTypes"
+    nl "must specify a background color", "een achtergrondkleur is verplicht"
+    nl "name of the slave interpreter", "naam van de slaaf-interpreter"
+    nl "no winfo screen . nor env(DISPLAY)", "geen winfo scherm . noch env(DISPLAY)"
+    nl "ok"
+    nl "red", "rood"
+    nl "retry", "opnieuw"
+    nl "should contain 5 or 4 elements", "moet 4 of 5 elementen bevatten"
+    nl "spec"
+    nl "tk_chooseDirectory command", "tk_chooseDirectory opdracht"
+    nl "tk_chooseDirectory command, cancel gives null", "tk_chooseDirectory opdracht, annuleren geeft lege waarde"
+    nl "tk_chooseDirectory command, initialdir", "tk_chooseDirectory opdracht, initi\\u00eble map"
+    nl "yes", "ja"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/pl.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/pl.msg
new file mode 100644
index 0000000000..0b3b4445c2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/pl.msg
@@ -0,0 +1,87 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    pl 'Application Error', 'Bl\u0105d w Programie'
+    pl 'Blue', 'Niebieski'
+    pl 'Color', 'Kolor'
+    pl 'Delete', 'Usu\u0144'
+    pl 'Error', 'B\u0142\u0105d'
+    pl 'Exit', 'Zako\u0144cz'
+    pl 'Green', 'Zielony'
+    pl 'Red', 'Czerwonz'
+    pl 'blue', 'niebieski'
+    pl 'green', 'zielony'
+    pl 'red', 'czerwony'
+}
+
+TkMsgCatalog.new('::tk') {
+    pl '&Abort', '&Anuluj'
+    pl '&About...', 'O Programie...'
+    pl 'All Files', 'Wszystkie pliki'
+    pl 'Application Error', 'Bl\u0105d w Programie'
+    pl '&Blue', '&Niebieski'
+    pl '&Cancel', '&Anuluj'
+    pl 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.', 'Katalog "%1\$s" nie mo\u017ce zosta\u0107 odczytany lub nie istnieje.'
+    pl 'Choose Directory', 'Wybierz katalog'
+    pl '&Clear', '&Wyczy\u015b\u0107'
+    pl '&Clear Console', '&Wyczy\u015b\u0107 konsol\u0119'
+    pl 'Color', 'Kolor'
+    pl 'Console', 'Konsola'
+    pl '&Copy', '&Kopiuj'
+    pl 'Cu&t', '&Wytnij'
+    pl '&Delete', '&Usu\u0144'
+    pl 'Details >>', 'Detale >>'
+    pl 'Directory "%1\$s" does not exist.', 'Katalog "%1\$s" nie istniej.'
+    pl '&Directory:', '&Katalog:'
+    pl '&Edit', '&Edytuj'
+    pl 'Error: %1\$s', 'B\u0142\u0105d: %1\$s'
+    pl 'E&xit', '&Zako\u0144cz'
+    pl '&File', '&Plik'
+    pl 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?', 'Plik "%1\$s" ju\u017c istnieje.' "\n" 'Czy chcesz go zast\u0105pi\u0107?'
+    pl 'File "%1\$s" already exists.' "\n\n", 'Plik "%1\$s" ju\u017c istnieje. ' "\n\n"
+    pl 'File "%1\$s" does not exist.', 'Plik "%1\$s" nie istnieje.'
+    pl 'File &name:', 'Nazwa &pliku:'
+    pl 'File &names:', 'Nazwy &plik\u00f3w:'
+    pl 'Files of &type:', 'Pliki &typu:'
+    pl 'Fi&les:', 'Pli&ki:'
+    pl '&Filter', '&Filter'
+    pl 'Fil&ter:', '&Filter:'
+    pl '&Green', '&Zielony'
+    pl '&Help', '&Pomoc'
+    pl 'Hi', 'Witaj'
+    pl '&Hide Console', '&Schowaj konsol\u0119'
+    pl '&Ignore', '&Ignoruj'
+    pl 'Invalid file name "%1\$s".', 'Niew\u0142a\u015bciwa nazwa pliku "%1\$s".'
+    pl 'Log Files', 'Protoko\u0142uj'
+    pl '&No', '&Nie'
+    pl 'OK'
+    pl 'Ok'
+    pl 'Open', 'Wczytaj'
+    pl '&Open', '&Wczytaj'
+    pl 'Open Multiple Files', 'Wczytuj wiele plik\u00f3w'
+    pl 'P&aste', '&Wklej'
+    pl '&Quit', '&Zako\u0144cz'
+    pl '&Red', '&Czerwonz'
+    pl 'Replace existing file?', 'Czy zost\u0105pi\u0107 instniej\u0105cy plik?'
+    pl '&Retry', '&Powt\u00f3rz'
+    pl '&Save', '&Zapisz'
+    pl 'Save As', 'Zapisz jako'
+    pl 'Save To Log', 'Wpisz do protoko\u0142u'
+    pl 'Select Log File', 'Wybierz plik proko\u0142u'
+    pl 'Select a file to source', 'Wybierz plik do wykonania'
+    pl '&Selection:', '&Wyb\u00f3r:'
+    pl 'Skip Messages', 'Omi\u0144 pozosta\u0142e komunikaty'
+    pl '&Source...', '&Kod \u017ar\u00f3d\u0142owy...'
+    pl 'Tcl Scripts', 'Tcl-skrypty'
+    pl 'Tcl for Windows', 'Tcl dla Okienek (Windows)'
+    pl 'Text Files', 'Pliki Tekstowe'
+    pl '&Yes', '&Tak'
+    pl 'abort', 'zako\u0144cz'
+    pl 'blue', 'niebieski'
+    pl 'cancel', 'anuluj'
+    pl 'extension', 'rozszerzenie'
+    pl 'extensions', 'rozszerzenia'
+    pl 'green', 'zielony'
+    pl 'ignore', 'ignoruj'
+    pl 'red', 'czerwony'
+    pl 'retry', 'potw\u00f3rz'
+    pl 'yes', 'tak'
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb/ru.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb/ru.msg
new file mode 100644
index 0000000000..f389dff0b6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb/ru.msg
@@ -0,0 +1,87 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    ru 'Application Error', '\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435'
+    ru 'Blue', ' \u0413\u043e\u043b\u0443\u0431\u043e\u0439'
+    ru 'Color', '\u0426\u0432\u0435\u0442'
+    ru 'Delete', '\u0423\u0434\u0430\u043b\u0438\u0442\u044c'
+    ru 'Error', '\u041e\u0448\u0438\u0431\u043a\u0430'
+    ru 'Exit', '\u0412\u044b\u0445\u043e\u0434'
+    ru 'Green', '\u0417\u0435\u043b\u0435\u043d\u044b\u0439'
+    ru 'Red', '\u041a\u0440\u0430\u0441\u043d\u044b\u0439'
+    ru 'blue', ' \u0433\u043e\u043b\u0443\u0431\u043e\u0439'
+    ru 'green', ' \u0437\u0435\u043b\u0435\u043d\u044b\u0439'
+    ru 'red', ' \u043a\u0440\u0430\u0441\u043d\u044b\u0439'
+}
+
+TkMsgCatalog.new('::tk') {
+    ru '&Abort', '&\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c'
+    ru 'About...', '\u041f\u0440\u043e...'
+    ru 'All Files', '\u0412\u0441\u0435 \u0444\u0430\u0439\u043b\u044b'
+    ru 'Application Error', '\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435'
+    ru '&Blue', ' &\u0413\u043e\u043b\u0443\u0431\u043e\u0439'
+    ru '&Cancel', '\u041e\u0442&\u043c\u0435\u043d\u0430'
+    ru 'Cannot change to the directory "%1\$s".' "\n" 'Permission denied.' \
+                        '\u041d\u0435 \u043c\u043e\u0433\u0443 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 "%1\$s".' "\n" '\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0440\u0430\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u0430'
+    ru 'Choose Directory', '\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433'
+    ru 'Clear', '\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c'
+    ru 'Color', '\u0426\u0432\u0435\u0442'
+    ru 'Console', '\u041a\u043e\u043d\u0441\u043e\u043b\u044c'
+    ru 'Copy', '\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c'
+    ru 'Cut', '\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c'
+    ru 'Delete', '\u0423\u0434\u0430\u043b\u0438\u0442\u044c'
+    ru 'Details >>', '\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 >>'
+    ru 'Directory "%1\$s" does not exist.', '\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 "%1\$s" \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.'
+    ru '&Directory:', '&\u041a\u0430\u0442\u0430\u043b\u043e\u0433:'
+    ru 'Error: %1\$s', '\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s' 
+    ru 'Exit', '\u0412\u044b\u0445\u043e\u0434'
+    ru 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?' \
+                            '\u0424\u0430\u0439\u043b "%1\$s" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.' "\n" '\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?'
+    ru 'File "%1\$s" already exists.' "\n\n", '\u0424\u0430\u0439\u043b "%1\$s" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.' "\n\n"
+    ru 'File "%1\$s" does not exist.', '\u0424\u0430\u0439\u043b "%1\$s" \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d.'
+    ru 'File &name:', '&\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430:'
+    ru 'File &names:', '&\u0418\u043c\u0435\u043d\u0430 \u0444\u0430\u0439\u043b\u043e\u0432:'
+    ru 'Files of &type:', '&\u0422\u0438\u043f \u0444\u0430\u0439\u043b\u043e\u0432:'
+    ru 'Fi&les:', '\u0424\u0430\u0439&\u043b\u044b:'
+    ru '&Filter', '&\u0424\u0438\u043b\u044c\u0442\u0440'
+    ru 'Fil&ter:', '\u0424\u0438\u043b\u044c&\u0442\u0440:'
+    ru '&Green', ' &\u0417\u0435\u043b\u0435\u043d\u044b\u0439'
+    ru 'Hi', '\u041f\u0440\u0438\u0432\u0435\u0442'
+    ru 'Hide Console', '\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c'
+    ru '&Ignore', '&\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c'
+    ru 'Invalid file name "%1\$s".', '\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 "%1\$s".' 
+    ru 'Log Files', '\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430'
+    ru '&No', '&\u041d\u0435\u0442'
+    ru '&OK', '&\u041e\u041a'
+    ru 'Ok', '\u0414\u0430'
+    ru 'Open', '\u041e\u0442\u043a\u0440\u044b\u0442\u044c'
+    ru '&Open', '&\u041e\u0442\u043a\u0440\u044b\u0442\u044c'
+    ru 'Open Multiple Files', '\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0444\u0430\u0439\u043b\u043e\u0432'
+    ru 'Paste', '\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c'
+    ru 'Quit', '\u0412\u044b\u0445\u043e\u0434'
+    ru '&Red', ' &\u041a\u0440\u0430\u0441\u043d\u044b\u0439'
+    ru 'Replace existing file?', '\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b?'
+    ru '&Retry', '&\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c'
+    ru '&Save', '&\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c'
+    ru 'Save As', '\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a'
+    ru 'Save To Log', '\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432 \u0436\u0443\u0440\u043d\u0430\u043b'
+    ru 'Select Log File', '\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0436\u0443\u0440\u043d\u0430\u043b'
+    ru 'Select a file to source', '\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0430\u0446\u0438\u0438'
+    ru '&Selection:', '&Selection:'
+    ru 'Skip Messages', '\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f'
+    ru 'Source...', '\u0418\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0430\u0439\u043b...'
+    ru 'Tcl Scripts', '\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430 \u043d\u0430 \u044f\u0437\u044b\u043a\u0435 TCL'
+    ru 'Tcl for Windows', 'TCL \u0434\u043b\u044f Windows'
+    ru 'Text Files', '\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0435 \u0444\u0430\u0439\u043b\u044b'
+    ru '&Yes', '&\u0414\u0430'
+    ru 'abort', '\u043e\u0442\u043c\u0435\u043d\u0430'
+    ru 'blue', ' \u0433\u043e\u043b\u0443\u0431\u043e\u0439'
+    ru 'cancel', '\u043e\u0442\u043c\u0435\u043d\u0430'
+    ru 'extension', '\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435'
+    ru 'extensions', '\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f'
+    ru 'green', ' \u0437\u0435\u043b\u0435\u043d\u044b\u0439'
+    ru 'ignore', '\u043f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c'
+    ru 'ok', '\u043e\u043a'
+    ru 'red', ' \u043a\u0440\u0430\u0441\u043d\u044b\u0439'
+    ru 'retry', '\u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c'
+    ru 'yes', '\u0434\u0430'
+}
+
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb2/README b/ruby_1_8_6/ext/tk/sample/msgs_rb2/README
new file mode 100644
index 0000000000..b8aa114e1b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb2/README
@@ -0,0 +1,5 @@
+Message catalogs in this directory are written in encodings except
+UTF-8. As if you have a trouble to edit UTF-8 text, you can write 
+message catalogs in your familier encoding.
+
+Please see '../msgs_rb/README' too.
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb2/de.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb2/de.msg
new file mode 100644
index 0000000000..0d6c82d9e5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb2/de.msg
@@ -0,0 +1,88 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    de 'Application Error', 'Applikationsfehler'
+    de 'Blue', 'Blau'
+    de 'Color', 'Farbe'
+    de 'Delete', 'L�schen', 'iso8859-1'
+    de 'Error', 'Fehler'
+    de 'Exit', 'Ende'
+    de 'Green', 'Gr�n', 'iso8859-1'
+    de 'Red', 'Rot'
+    de 'blue', 'blau'
+    de 'green', 'gr�n', 'iso8859-1'
+    de 'red', 'rot'
+}
+
+TkMsgCatalog.new('::tk') {
+    de "&Abort", "&Abbruch"
+    de "&About...", "&�ber...", 'iso8859-1'
+    de "All Files", "Alle Dateien"
+    de "Application Error", "Applikationsfehler"
+    de "&Blue", "&Blau"
+    de "&Cancel", "&Abbruch"
+    de "Cannot change to the directory \"%1\$s\".\nPermission denied.", "Kann nicht in das Verzeichnis \"%1\$s\" wechseln.\nKeine Rechte vorhanden."
+    de "Choose Directory", "W�hle Verzeichnis", 'iso8859-1'
+    de "&Clear", "&R�cksetzen", 'iso8859-1'
+    de "&Clear Console", "&Konsole l�schen", 'iso8859-1'
+    de "Color", "Farbe"
+    de "Console", "Konsole"
+    de "&Copy", "&Kopieren"
+    de "Cu&t", "Aus&schneiden"
+    de '&Delete', '&L�schen', 'iso8859-1'
+    de "Details >>"
+    de "Directory \"%1\$s\" does not exist.", "Das Verzeichnis \"%1\$s\" existiert nicht."
+    de "&Directory:", "&Verzeichnis:"
+    de "&Edit", "&Bearbieten"
+    de "Error: %1\$s", "Fehler: %1\$s"
+    de "E&xit", "&Ende"
+    de "&File", "&Datei"
+    de "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "Die Datei \"%1\$s\" ist bereits vorhanden.\nWollen sie diese Datei �berschreiben ?", 'iso8859-1'
+    de "File \"%1\$s\" already exists.\n\n", "Die Datei \"%1\$s\" ist bereits vorhanden.\n\n"
+    de "File \"%1\$s\" does not exist.", "Die Datei \"%1\$s\" existiert nicht."
+    de "File &name:", "Datei&name:"
+    de "File &names:", "Datei&namen:"
+    de "Files of &type:", "Dateien des &Typs:"
+    de "Fi&les:", "Dat&eien:"
+    de "&Filter"
+    de "Fil&ter:"
+    de '&Green', '&Gr�n', 'iso8859-1'
+    de "&Help", "&Hilfe"
+    de "Hi", "Hallo"
+    de "&Hide Console", "&Konsole unsichtbar machen"
+    de "&Ignore", "&Ignorieren"
+    de "Invalid file name \"%1\$s\".", "Ung�ltiger Dateiname \"%1\$s\".", 'iso8859-1'
+    de "Log Files", "Protokolldatei"
+    de "&No", "&Nein"
+    de "OK"
+    de "Ok"
+    de "Open", "�ffnen", 'iso8859-1'
+    de "&Open", "�&ffnen", 'iso8859-1'
+    de "Open Multiple Files"
+    de "P&aste", "E&inf�gen", 'iso8859-1'
+    de "&Quit", "&Beenden"
+    de "&Red", "&Rot"
+    de "Replace existing file?", "Existierende Datei ersetzen?"
+    de "&Retry", "&Wiederholen"
+    de "&Save", "&Speichern"
+    de "Save As", "Speichern unter"
+    de "Save To Log", "In Protokoll speichern"
+    de "Select Log File", "Protokolldatei ausw�hlen", 'iso8859-1'
+    de "Select a file to source", "Auszuf�hrende Datei ausw�hlen", 'iso8859-1'
+    de "&Selection:", "Auswah&l:"
+    de "Skip Messages", "Weitere Nachrichten �berspringen", 'iso8859-1'
+    de "&Source...", "&Ausf�hren...", 'iso8859-1'
+    de "Tcl Scripts", "Tcl-Skripte"
+    de "Tcl for Windows", "Tcl f�r Windows", 'iso8859-1'
+    de "Text Files", "Textdateien"
+    de "&Yes", "&Ja"
+    de "abort", "abbrechen"
+    de "blue", "blau"
+    de "cancel", "abbrechen"
+    de "extension", "Erweiterung"
+    de "extensions", "Erweiterungen"
+    de 'green', 'gr�n', 'iso8859-1'
+    de "ignore", "ignorieren"
+    de "ok"
+    de "red", "rot"
+    de "retry", "wiederholen"
+    de "yes", "ja"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_rb2/ja.msg b/ruby_1_8_6/ext/tk/sample/msgs_rb2/ja.msg
new file mode 100644
index 0000000000..84e89aa6ef
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_rb2/ja.msg
@@ -0,0 +1,85 @@
+TkMsgCatalog.new('::tkmsgcat_demo') {
+    ja 'Application Error', 'アプリケーションエラー', 'euc-jp'
+    ja 'Blue',   '青',     'euc-jp'
+    ja 'Color',  '色選択', 'euc-jp'
+    ja 'Delete', '消去',   'euc-jp'
+    ja 'Error',  'エラー', 'euc-jp'
+    ja 'Exit',   '終了',   'euc-jp'
+    ja 'Green',  '緑',     'euc-jp'
+    ja 'Red',    '赤',     'euc-jp'
+    ja 'blue',   '青',     'euc-jp'
+    ja 'green',  '緑',     'euc-jp'
+    ja 'red',    '赤',     'euc-jp'
+}
+
+TkMsgCatalog.new('::tk') {
+    ja "&Abort", '中止', 'euc-jp'
+    ja "About..."
+    ja "All Files", 'すべてのファイル', 'euc-jp'
+    ja "Application Error", 'アプリケーションエラー', 'euc-jp'
+    ja "&Blue", '青', 'euc-jp'
+    ja "&Cancel", '取り消し', 'euc-jp'
+    ja "Cannot change to the directory \"%1\$s\".\nPermission denied.", "ディレクトリ \"%1\$s\" に変更できません．\n許可がありません．", 'euc-jp'
+    ja "Choose Directory", 'ディレクトリを選択', 'euc-jp'
+    ja "Clear", '消去', 'euc-jp'
+    ja "Color", '色', 'euc-jp'
+    ja "Console", 'コンソール', 'euc-jp'
+    ja "Copy", 'コピー', 'euc-jp'
+    ja "Cut", '切り取り', 'euc-jp'
+    ja "Delete", '消去', 'euc-jp'
+    ja "Details >>", '詳細 >>', 'euc-jp'
+    ja "Directory \"%1\$s\" does not exist.", '"%1$s" というディレクトリは存在しません．', 'euc-jp'
+    ja "&Directory:", 'ディレクトリ', 'euc-jp'
+    ja "Error: %1\$s"
+    ja "Exit", '終了', 'euc-jp'
+    ja "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "\"%1\$s\" というファイルは既に存在しています．\n書き換えますか？", 'euc-jp'
+    ja "File \"%1\$s\" already exists.\n\n", "\"%1\$s\" というファイルは既に存在しています．\n\n", 'euc-jp'
+    ja "File \"%1\$s\" does not exist.", '"%1$s" というファイルは存在しません．', 'euc-jp'
+    ja "File &name:", 'ファイル名', 'euc-jp'
+    ja "File &names:", 'ファイル名', 'euc-jp'
+    ja "Files of &type:", 'ファイル形式', 'euc-jp'
+    ja "Fi&les:", 'ファイル', 'euc-jp'
+    ja "&Filter", 'フィルター', 'euc-jp'
+    ja "Fil&ter:", 'フィルター', 'euc-jp'
+    ja "&Green", '緑', 'euc-jp'
+    ja "Hi", 'こんにちは', 'euc-jp'
+    ja "Hide Console", 'コンソールを隠す', 'euc-jp'
+    ja "&Ignore", '無視', 'euc-jp'
+    ja "Invalid file name \"%1\$s\".", '"%1$s" は不正なファイル名です．', 'euc-jp'
+    ja "Log Files", 'ログファイル', 'euc-jp'
+    ja "&No", 'いいえ', 'euc-jp'
+    ja "&OK", '了解', 'euc-jp'
+    ja "OK", '了解', 'euc-jp'
+    ja "Ok", '了解', 'euc-jp'
+    ja "Open", '開く', 'euc-jp'
+    ja "&Open", '開く', 'euc-jp'
+    ja "Open Multiple Files", '複数のファイルを開く', 'euc-jp'
+    ja "Paste", '貼り付け', 'euc-jp'
+    ja "Quit", '終了', 'euc-jp'
+    ja "&Red", '赤', 'euc-jp'
+    ja "Replace existing file?", '既存のファイルを置き換えますか？', 'euc-jp'
+    ja "&Retry", '再実行', 'euc-jp'
+    ja "&Save", '保存', 'euc-jp'
+    ja "Save As", '名前を付けて保存', 'euc-jp'
+    ja "Save To Log", 'ログを保存', 'euc-jp'
+    ja "Select Log File", 'ログファイルを選択', 'euc-jp'
+    ja "Select a file to source", 'ソースファイルを選択', 'euc-jp'
+    ja "&Selection:", '選択', 'euc-jp'
+    ja "Skip Messages", 'メッセージをとばす', 'euc-jp'
+    ja "Source...", 'ソース...', 'euc-jp'
+    ja "Tcl Scripts", 'Tcl スクリプト', 'euc-jp'
+    ja "Tcl for Windows"
+    ja "Text Files", 'テキストファイル', 'euc-jp'
+    ja "&Yes", 'はい', 'euc-jp'
+    ja "abort", '中止', 'euc-jp'
+    ja "blue", '青', 'euc-jp'
+    ja "cancel", '取り消し', 'euc-jp'
+    ja "extension", '拡張子', 'euc-jp'
+    ja "extensions", '拡張子', 'euc-jp'
+    ja "green", '緑', 'euc-jp'
+    ja "ignore", '無視', 'euc-jp'
+    ja "ok", '了解', 'euc-jp'
+    ja "red", '赤', 'euc-jp'
+    ja "retry", '再実行', 'euc-jp'
+    ja "yes", 'はい', 'euc-jp'
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/README b/ruby_1_8_6/ext/tk/sample/msgs_tk/README
new file mode 100644
index 0000000000..c7422e3a9b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/README
@@ -0,0 +1,4 @@
+Almost all of Message-Catalog files in this directory are quoted 
+from Tcl/Tk8.5a1 source archive (only a little are modified for
+'tkmsgcat-load_tk.rb'). Please read the file 'license.terms' in
+this directry (That was included in demo directory of Tcl/Tk8.5a1).
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/cs.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/cs.msg
new file mode 100644
index 0000000000..697070985e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/cs.msg
@@ -0,0 +1,84 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset cs "Application Error" "Chyba programu"
+    ::msgcat::mcset cs "Blue" "Modr\341"
+    ::msgcat::mcset cs "Color" "Barva"
+    ::msgcat::mcset cs "Delete" "Smazat"
+    ::msgcat::mcset cs "Error" "Chyba"
+    ::msgcat::mcset cs "Exit" "Konec"
+    ::msgcat::mcset cs "Green" "Zelen\341"
+    ::msgcat::mcset cs "Red" "\u010cerven\341"
+    ::msgcat::mcset cs "blue" "modr\341"
+    ::msgcat::mcset cs "green" "zelen\341"
+    ::msgcat::mcset cs "red" "\u010derven\341"
+}
+
+namespace eval ::tk {
+    ::msgcat::mcset cs "&Abort" "&P\u0159eru\u0161it"
+    ::msgcat::mcset cs "About..." "O programu..."
+    ::msgcat::mcset cs "All Files" "V\u0161echny soubory"
+    ::msgcat::mcset cs "Application Error" "Chyba programu"
+    ::msgcat::mcset cs "&Blue" "&Modr\341"
+    ::msgcat::mcset cs "&Cancel" "&Zru\u0161it"
+    ::msgcat::mcset cs "Cannot change to the directory \"%1\$s\".\nPermission denied." "Nemohu zm\u011bnit atku\341ln\355 adres\341\u0159 na \"%1\$s\".\nP\u0159\355stup odm\355tnut."
+    ::msgcat::mcset cs "Choose Directory" "V\375b\u011br adres\341\u0159e"
+    ::msgcat::mcset cs "Clear" "Smazat"
+    ::msgcat::mcset cs "Color" "Barva"
+    ::msgcat::mcset cs "Console" "Konzole"
+    ::msgcat::mcset cs "Copy" "Kop\355rovat"
+    ::msgcat::mcset cs "Cut" "Vy\u0159\355znout"
+    ::msgcat::mcset cs "Delete" "Smazat"
+    ::msgcat::mcset cs "Details >>" "Detaily >>"
+    ::msgcat::mcset cs "Directory \"%1\$s\" does not exist." "Adres\341\u0159 \"%1\$s\" neexistuje."
+    ::msgcat::mcset cs "&Directory:" "&Adres\341\u0159:"
+    ::msgcat::mcset cs "Error: %1\$s" "Chyba: %1\$s"
+    ::msgcat::mcset cs "Exit" "Konec"
+    ::msgcat::mcset cs "File \"%1\$s\" already exists.\n\n" "Soubor \"%1\$s\" ji\u017e existuje.\n\n"
+    ::msgcat::mcset cs "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Soubor \"%1\$s\" ji\u017e existuje.\nChcete jej p\u0159epsat?"
+    ::msgcat::mcset cs "File \"%1\$s\" does not exist." "Soubor \"%1\$s\" neexistuje."
+    ::msgcat::mcset cs "File &name:" "&Jm\351no souboru:"
+    ::msgcat::mcset cs "File &names:" "&Jm\351na soubor\u016f:"
+    ::msgcat::mcset cs "Files of &type:" "&Typy soubor\u016f:"
+    ::msgcat::mcset cs "Fi&les:" "Sou&bory:"
+    ::msgcat::mcset cs "&Filter" "&Filtr"
+    ::msgcat::mcset cs "Fil&ter:" "Fil&tr:"
+    ::msgcat::mcset cs "&Green" "Ze&len\341"
+    ::msgcat::mcset cs "Hi"
+    ::msgcat::mcset cs "Hide Console" "Skr\375t konsolu"
+    ::msgcat::mcset cs "&Ignore" "&Ignorovat"
+    ::msgcat::mcset cs "Invalid file name \"%1\$s\"." "\u0160patn\351 jm\351no souboru \"%1\$s\"."
+    ::msgcat::mcset cs "Log Files" "Log soubory"
+    ::msgcat::mcset cs "&No" "&Ne"
+    ::msgcat::mcset cs "&OK"
+    ::msgcat::mcset cs "Ok"
+    ::msgcat::mcset cs "Open" "Otev\u0159\355t"
+    ::msgcat::mcset cs "&Open" "&Otev\u0159\355t"
+    ::msgcat::mcset cs "Open Multiple Files" "Otev\u0159\355t v\355ce soubor\u016f"
+    ::msgcat::mcset cs "Paste" "Vlo\u017eit"
+    ::msgcat::mcset cs "Quit" "Skon\u010dit"
+    ::msgcat::mcset cs "&Red" " \u010ce&rven\341"
+    ::msgcat::mcset cs "Replace existing file?" "Nahradit st\341vaj\355c\355 soubor?"
+    ::msgcat::mcset cs "&Retry" "Z&novu"
+    ::msgcat::mcset cs "&Save" "&Ulo\u017eit"
+    ::msgcat::mcset cs "Save As" "Ulo\u017eit jako"
+    ::msgcat::mcset cs "Save To Log" "Ulo\u017eit do logu"
+    ::msgcat::mcset cs "Select Log File" "Vybrat log soubor"
+    ::msgcat::mcset cs "Select a file to source" "Vybrat soubor k nahr\341n\355"
+    ::msgcat::mcset cs "&Selection:" "&V\375b\u011br:"
+    ::msgcat::mcset cs "Skip Messages" "P\u0159esko\u010dit zpr\341vy"
+    ::msgcat::mcset cs "Source..." "Nahr\341t..."
+    ::msgcat::mcset cs "Tcl Scripts" "Tcl skripty"
+    ::msgcat::mcset cs "Tcl for Windows" "Tcl pro Windows"
+    ::msgcat::mcset cs "Text Files" "Textov\351 soubory"
+    ::msgcat::mcset cs "&Yes" "&Ano"
+    ::msgcat::mcset cs "abort" "p\u0159eru\u0161it"
+    ::msgcat::mcset cs "blue" "modr\341"
+    ::msgcat::mcset cs "cancel" "zru\u0161it"
+    ::msgcat::mcset cs "extension" "p\u0159\355pona"
+    ::msgcat::mcset cs "extensions" "p\u0159\355pony"
+    ::msgcat::mcset cs "green" "zelen\341"
+    ::msgcat::mcset cs "ignore" "ignorovat"
+    ::msgcat::mcset cs "ok"
+    ::msgcat::mcset cs "red" "\u010derven\341"
+    ::msgcat::mcset cs "retry" "znovu"
+    ::msgcat::mcset cs "yes" "ano"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/de.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/de.msg
new file mode 100644
index 0000000000..437f2ed9e7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/de.msg
@@ -0,0 +1,88 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset de "Application Error" "Applikationsfehler"
+    ::msgcat::mcset de "Blue" "Blau"
+    ::msgcat::mcset de "Color" "Farbe"
+    ::msgcat::mcset de "Delete" "L\u00f6schen"
+    ::msgcat::mcset de "Error" "Fehler"
+    ::msgcat::mcset de "Exit" "Ende"
+    ::msgcat::mcset de "Green" "Gr\u00fcn"
+    ::msgcat::mcset de "Red" "Rot"
+    ::msgcat::mcset de "blue" "blau"
+    ::msgcat::mcset de "green" "gr\u00fcn"
+    ::msgcat::mcset de "red" "rot"
+}
+
+namespace eval ::tk {
+    ::msgcat::mcset de "&Abort" "&Abbruch"
+    ::msgcat::mcset de "&About..." "&\u00dcber..."
+    ::msgcat::mcset de "All Files" "Alle Dateien"
+    ::msgcat::mcset de "Application Error" "Applikationsfehler"
+    ::msgcat::mcset de "&Blue" "&Blau"
+    ::msgcat::mcset de "&Cancel" "&Abbruch"
+    ::msgcat::mcset de "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kann nicht in das Verzeichnis \"%1\$s\" wechseln.\nKeine Rechte vorhanden."
+    ::msgcat::mcset de "Choose Directory" "W\u00e4hle Verzeichnis"
+    ::msgcat::mcset de "&Clear" "&R\u00fccksetzen"
+    ::msgcat::mcset de "&Clear Console" "&Konsole l\u00f6schen"
+    ::msgcat::mcset de "Color" "Farbe"
+    ::msgcat::mcset de "Console" "Konsole"
+    ::msgcat::mcset de "&Copy" "&Kopieren"
+    ::msgcat::mcset de "Cu&t" "Aus&schneiden"
+    ::msgcat::mcset de "&Delete" "&L\u00f6schen"
+    ::msgcat::mcset de "Details >>"
+    ::msgcat::mcset de "Directory \"%1\$s\" does not exist." "Das Verzeichnis \"%1\$s\" existiert nicht."
+    ::msgcat::mcset de "&Directory:" "&Verzeichnis:"
+    ::msgcat::mcset de "&Edit" "&Bearbieten"
+    ::msgcat::mcset de "Error: %1\$s" "Fehler: %1\$s"
+    ::msgcat::mcset de "E&xit" "&Ende"
+    ::msgcat::mcset de "&File" "&Datei"
+    ::msgcat::mcset de "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Die Datei \"%1\$s\" ist bereits vorhanden.\nWollen sie diese Datei \u00fcberschreiben ?"
+    ::msgcat::mcset de "File \"%1\$s\" already exists.\n\n" "Die Datei \"%1\$s\" ist bereits vorhanden.\n\n"
+    ::msgcat::mcset de "File \"%1\$s\" does not exist." "Die Datei \"%1\$s\" existiert nicht."
+    ::msgcat::mcset de "File &name:" "Datei&name:"
+    ::msgcat::mcset de "File &names:" "Datei&namen:"
+    ::msgcat::mcset de "Files of &type:" "Dateien des &Typs:"
+    ::msgcat::mcset de "Fi&les:" "Dat&eien:"
+    ::msgcat::mcset de "&Filter"
+    ::msgcat::mcset de "Fil&ter:"
+    ::msgcat::mcset de "&Green" "&Gr\u00fcn"
+    ::msgcat::mcset de "&Help" "&Hilfe"
+    ::msgcat::mcset de "Hi" "Hallo"
+    ::msgcat::mcset de "&Hide Console" "&Konsole unsichtbar machen"
+    ::msgcat::mcset de "&Ignore" "&Ignorieren"
+    ::msgcat::mcset de "Invalid file name \"%1\$s\"." "Ung\u00fcltiger Dateiname \"%1\$s\"."
+    ::msgcat::mcset de "Log Files" "Protokolldatei"
+    ::msgcat::mcset de "&No" "&Nein"
+    ::msgcat::mcset de "OK"
+    ::msgcat::mcset de "Ok"
+    ::msgcat::mcset de "Open" "\u00d6ffnen"
+    ::msgcat::mcset de "&Open" "\u00d6&ffnen"
+    ::msgcat::mcset de "Open Multiple Files"
+    ::msgcat::mcset de "P&aste" "E&inf\u00fcgen"
+    ::msgcat::mcset de "&Quit" "&Beenden"
+    ::msgcat::mcset de "&Red" "&Rot"
+    ::msgcat::mcset de "Replace existing file?" "Existierende Datei ersetzen?"
+    ::msgcat::mcset de "&Retry" "&Wiederholen"
+    ::msgcat::mcset de "&Save" "&Speichern"
+    ::msgcat::mcset de "Save As" "Speichern unter"
+    ::msgcat::mcset de "Save To Log" "In Protokoll speichern"
+    ::msgcat::mcset de "Select Log File" "Protokolldatei ausw\u00e4hlen"
+    ::msgcat::mcset de "Select a file to source" "Auszuf\u00fchrende Datei ausw\u00e4hlen"
+    ::msgcat::mcset de "&Selection:" "Auswah&l:"
+    ::msgcat::mcset de "Skip Messages" "Weitere Nachrichten \u00fcberspringen"
+    ::msgcat::mcset de "&Source..." "&Ausf\u00fchren..."
+    ::msgcat::mcset de "Tcl Scripts" "Tcl-Skripte"
+    ::msgcat::mcset de "Tcl for Windows" "Tcl f\u00fcr Windows"
+    ::msgcat::mcset de "Text Files" "Textdateien"
+    ::msgcat::mcset de "&Yes" "&Ja"
+    ::msgcat::mcset de "abort" "abbrechen"
+    ::msgcat::mcset de "blue" "blau"
+    ::msgcat::mcset de "cancel" "abbrechen"
+    ::msgcat::mcset de "extension" "Erweiterung"
+    ::msgcat::mcset de "extensions" "Erweiterungen"
+    ::msgcat::mcset de "green" "gr\u00fcn"
+    ::msgcat::mcset de "ignore" "ignorieren"
+    ::msgcat::mcset de "ok"
+    ::msgcat::mcset de "red" "rot"
+    ::msgcat::mcset de "retry" "wiederholen"
+    ::msgcat::mcset de "yes" "ja"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/el.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/el.msg
new file mode 100644
index 0000000000..1e3a539647
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/el.msg
@@ -0,0 +1,103 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset el "Application Error"  "\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2"
+    ::msgcat::mcset el "Blue"     "\u039c\u03c0\u03bb\u03b5"
+    ::msgcat::mcset el "Color"    "\u03a7\u03c1\u03ce\u03bc\u03b1"
+    ::msgcat::mcset el "Delete"   "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae"
+    ::msgcat::mcset el "Error"	  "\u039b\u03ac\u03b8\u03bf\u03c2"
+    ::msgcat::mcset el "Exit"     "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
+    ::msgcat::mcset el "Green"    "\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
+    ::msgcat::mcset el "Red"      "\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
+    ::msgcat::mcset el "blue"     "\u03bc\u03c0\u03bb\u03b5"
+    ::msgcat::mcset el "green"    "\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
+    ::msgcat::mcset el "red"      "\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
+}
+
+
+# followings are same to original file included into Tk8.5a1's widget demos. 
+
+## Messages for the Greek (Hellenic - "el") language.
+## Please report any changes/suggestions to:
+##    petasis@iit.demokritos.gr
+
+namespace eval ::tk {
+    ::msgcat::mcset el "&Abort"              "\u03a4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2"
+    ::msgcat::mcset el "About..."           "\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac..."
+    ::msgcat::mcset el "All Files"          "\u038c\u03bb\u03b1 \u03c4\u03b1 \u0391\u03c1\u03c7\u03b5\u03af\u03b1"
+    ::msgcat::mcset el "Application Error"  "\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2"
+    ::msgcat::mcset el "&Blue"               "\u039c\u03c0\u03bb\u03b5"
+    ::msgcat::mcset el "&Cancel"             "\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7"
+    ::msgcat::mcset el \
+"Cannot change to the directory \"%1\$s\".\nPermission denied." \
+"\u0394\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03ba\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5 \u03c3\u03b5 \"%1\$s\".\n\u0397 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03b4\u03b5\u03bd \u03b5\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9."
+    ::msgcat::mcset el "Choose Directory"   "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u039a\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5"
+    ::msgcat::mcset el "Clear"              "\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2"
+    ::msgcat::mcset el "Color"              "\u03a7\u03c1\u03ce\u03bc\u03b1"
+    ::msgcat::mcset el "Console"            "\u039a\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1"
+    ::msgcat::mcset el "Copy"               "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae"
+    ::msgcat::mcset el "Cut"                "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae"
+    ::msgcat::mcset el "Delete"             "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae"
+    ::msgcat::mcset el "Details >>"         "\u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03ad\u03c1\u03b5\u03b9\u03b5\u03c2 >>"
+    ::msgcat::mcset el "Directory \"%1\$s\" does not exist." \
+                                        "\u039f \u03ba\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2 \"%1\$s\" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9."
+    ::msgcat::mcset el "&Directory:"         "&\u039a\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2:"
+    ::msgcat::mcset el "Error: %1\$s"       "\u039b\u03ac\u03b8\u03bf\u03c2: %1\$s"
+    ::msgcat::mcset el "Exit"               "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
+    ::msgcat::mcset el \
+               "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \
+               "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.\n\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03c0\u03b9\u03ba\u03b1\u03bb\u03c5\u03c6\u03b8\u03b5\u03af;"
+    ::msgcat::mcset el "File \"%1\$s\" already exists.\n\n" \
+                   "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.\n\n"
+    ::msgcat::mcset el "File \"%1\$s\" does not exist." \
+                   "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9."
+    ::msgcat::mcset el "File &name:"         "\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5:"
+    ::msgcat::mcset el "File &names:"        "\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd:"
+    ::msgcat::mcset el "Files of &type:"     "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u03c4\u03bf\u03c5 &\u03c4\u03cd\u03c0\u03bf\u03c5:"
+    ::msgcat::mcset el "Fi&les:"             "\u0391\u03c1\u03c7\u03b5\u03af\u03b1:"
+    ::msgcat::mcset el "&Filter"             "\u03a6\u03af\u03bb\u03c4\u03c1\u03bf"
+    ::msgcat::mcset el "Fil&ter:"            "\u03a6\u03af\u03bb\u03c4\u03c1\u03bf:"
+    ::msgcat::mcset el "&Green"              "\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
+    ::msgcat::mcset el "Hi"                 "\u0393\u03b5\u03b9\u03b1"
+    ::msgcat::mcset el "Hide Console"       "\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03ba\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1\u03c2"
+    ::msgcat::mcset el "&Ignore"             "\u0391\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7"
+    ::msgcat::mcset el "Invalid file name \"%1\$s\"." \
+                   "\u0386\u03ba\u03c5\u03c1\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \"%1\$s\"."
+    ::msgcat::mcset el "Log Files"          "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
+    ::msgcat::mcset el "&No"                 "\u038c\u03c7\u03b9"
+    ::msgcat::mcset el "&OK"                 "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
+    ::msgcat::mcset el "&Ok"                 "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
+    ::msgcat::mcset el "Open"               "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1"
+    ::msgcat::mcset el "&Open"               "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1"
+    ::msgcat::mcset el "Open Multiple Files" \
+                                        "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1 \u03c0\u03bf\u03bb\u03bb\u03b1\u03c0\u03bb\u03ce\u03bd \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd"
+    ::msgcat::mcset el "Paste"              "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7"
+    ::msgcat::mcset el "Quit"               "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
+    ::msgcat::mcset el "&Red"                "\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
+    ::msgcat::mcset el "Replace existing file?" \
+                                        "\u0395\u03c0\u03b9\u03ba\u03ac\u03bb\u03c5\u03c8\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03bd\u03c4\u03bf\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5;"
+    ::msgcat::mcset el "&Retry"              "\u03a0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac"
+    ::msgcat::mcset el "&Save"               "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7"
+    ::msgcat::mcset el "Save As"            "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03b1\u03bd"
+    ::msgcat::mcset el "Save To Log"        "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03c4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
+    ::msgcat::mcset el "Select Log File"    "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
+    ::msgcat::mcset el "Select a file to source" \
+                                        "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03b3\u03b9\u03b1 \u03b5\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7"
+    ::msgcat::mcset el "&Selection:"         "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae:"
+    ::msgcat::mcset el "Skip Messages"      "\u0391\u03c0\u03bf\u03c6\u03c5\u03b3\u03ae \u03bc\u03c5\u03bd\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd"
+    ::msgcat::mcset el "Source..."          "\u0395\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7..."
+    ::msgcat::mcset el "Tcl Scripts"        "Tcl Scripts"
+    ::msgcat::mcset el "Tcl for Windows"    "Tcl \u03b3\u03b9\u03b1 Windows"
+    ::msgcat::mcset el "Text Files"         "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5"
+    ::msgcat::mcset el "&Yes"                "\u039d\u03b1\u03b9"
+    ::msgcat::mcset el "abort"              "\u03c4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2"
+    ::msgcat::mcset el "blue"               "\u03bc\u03c0\u03bb\u03b5"
+    ::msgcat::mcset el "cancel"             "\u03b1\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7"
+    ::msgcat::mcset el "extension"          "\u03b5\u03c0\u03ad\u03ba\u03c4\u03b1\u03c3\u03b7"
+    ::msgcat::mcset el "extensions"         "\u03b5\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2"
+    ::msgcat::mcset el "green"              "\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
+    ::msgcat::mcset el "ignore"             "\u03b1\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7"
+    ::msgcat::mcset el "ok"                 "\u03b5\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
+    ::msgcat::mcset el "red"                "\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
+    ::msgcat::mcset el "retry"              "\u03c0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac"
+    ::msgcat::mcset el "yes"                "\u03bd\u03b1\u03b9"
+}
+
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/en.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/en.msg
new file mode 100644
index 0000000000..de586d195e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/en.msg
@@ -0,0 +1,83 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset en "Application Error"
+    ::msgcat::mcset en "Blue"
+    ::msgcat::mcset en "Color"
+    ::msgcat::mcset en "Delete"
+    ::msgcat::mcset en "Error"
+    ::msgcat::mcset en "Green"
+    ::msgcat::mcset en "Red"
+    ::msgcat::mcset en "blue"
+    ::msgcat::mcset en "green"
+    ::msgcat::mcset en "red"
+}
+
+namespace eval ::tk {
+    ::msgcat::mcset en "&Abort"
+    ::msgcat::mcset en "About..."
+    ::msgcat::mcset en "All Files"
+    ::msgcat::mcset en "Application Error"
+    ::msgcat::mcset en "&Blue"
+    ::msgcat::mcset en "&Cancel"
+    ::msgcat::mcset en "Cannot change to the directory \"%1\$s\".\nPermission denied."
+    ::msgcat::mcset en "Choose Directory"
+    ::msgcat::mcset en "Clear"
+    ::msgcat::mcset en "Color"
+    ::msgcat::mcset en "Console"
+    ::msgcat::mcset en "Copy"
+    ::msgcat::mcset en "Cut"
+    ::msgcat::mcset en "Delete"
+    ::msgcat::mcset en "Details >>"
+    ::msgcat::mcset en "Directory \"%1\$s\" does not exist."
+    ::msgcat::mcset en "&Directory:"
+    ::msgcat::mcset en "Error: %1\$s"
+    ::msgcat::mcset en "Exit"
+    ::msgcat::mcset en "File \"%1\$s\" already exists.\nDo you want to overwrite it?"
+    ::msgcat::mcset en "File \"%1\$s\" already exists.\n\n"
+    ::msgcat::mcset en "File \"%1\$s\" does not exist."
+    ::msgcat::mcset en "File &name:"
+    ::msgcat::mcset en "File &names:"
+    ::msgcat::mcset en "Files of &type:"
+    ::msgcat::mcset en "Fi&les:"
+    ::msgcat::mcset en "&Filter"
+    ::msgcat::mcset en "Fil&ter:"
+    ::msgcat::mcset en "&Green"
+    ::msgcat::mcset en "Hi"
+    ::msgcat::mcset en "Hide Console"
+    ::msgcat::mcset en "&Ignore"
+    ::msgcat::mcset en "Invalid file name \"%1\$s\"."
+    ::msgcat::mcset en "Log Files"
+    ::msgcat::mcset en "&No"
+    ::msgcat::mcset en "&OK"
+    ::msgcat::mcset en "Ok"
+    ::msgcat::mcset en "Open"
+    ::msgcat::mcset en "&Open"
+    ::msgcat::mcset en "Open Multiple Files"
+    ::msgcat::mcset en "Paste"
+    ::msgcat::mcset en "Quit"
+    ::msgcat::mcset en "&Red"
+    ::msgcat::mcset en "Replace existing file?"
+    ::msgcat::mcset en "&Retry"
+    ::msgcat::mcset en "&Save"
+    ::msgcat::mcset en "Save As"
+    ::msgcat::mcset en "Save To Log"
+    ::msgcat::mcset en "Select Log File"
+    ::msgcat::mcset en "Select a file to source"
+    ::msgcat::mcset en "&Selection:"
+    ::msgcat::mcset en "Skip Messages"
+    ::msgcat::mcset en "Source..."
+    ::msgcat::mcset en "Tcl Scripts"
+    ::msgcat::mcset en "Tcl for Windows"
+    ::msgcat::mcset en "Text Files"
+    ::msgcat::mcset en "&Yes"
+    ::msgcat::mcset en "abort"
+    ::msgcat::mcset en "blue"
+    ::msgcat::mcset en "cancel"
+    ::msgcat::mcset en "extension"
+    ::msgcat::mcset en "extensions"
+    ::msgcat::mcset en "green"
+    ::msgcat::mcset en "ignore"
+    ::msgcat::mcset en "ok"
+    ::msgcat::mcset en "red"
+    ::msgcat::mcset en "retry"
+    ::msgcat::mcset en "yes"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/en_gb.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/en_gb.msg
new file mode 100644
index 0000000000..1aa5b49380
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/en_gb.msg
@@ -0,0 +1,7 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset en_gb Color Colour
+}
+
+namespace eval ::tk {
+    ::msgcat::mcset en_gb Color Colour
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/eo.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/eo.msg
new file mode 100644
index 0000000000..e683cef297
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/eo.msg
@@ -0,0 +1,87 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset eo "Application Error" "Aplikoerraro"
+    ::msgcat::mcset eo "Blue" "Blua"
+    ::msgcat::mcset eo "Color" "Farbo"
+    ::msgcat::mcset eo "Delete" "Forprenu"
+    ::msgcat::mcset eo "Error" "Eraro"
+    ::msgcat::mcset eo "Exit" "Eliru"
+    ::msgcat::mcset eo "Green" "Verda"
+    ::msgcat::mcset eo "Red" "Rosa"
+    ::msgcat::mcset eo "blue" "blua"
+    ::msgcat::mcset eo "green" "verda"
+    ::msgcat::mcset eo "red" "ru\u011da"
+}
+
+namespace eval ::tk {
+    ::msgcat::mcset eo "&Abort" "&\u0108esigo"
+    ::msgcat::mcset eo "&About..." "Pri..."
+    ::msgcat::mcset eo "All Files" "\u0108ioj dosieroj"
+    ::msgcat::mcset eo "Application Error" "Aplikoerraro"
+    ::msgcat::mcset eo "&Blue" "&Blua"
+    ::msgcat::mcset eo "&Cancel" "&Rezignu"
+    ::msgcat::mcset eo "Cannot change to the directory \"%1\$s\".\nPermission denied." "Neeble \u0109angi al dosierulon \"%1\$s\".\nVi ne rajtas tion."
+    ::msgcat::mcset eo "Choose Directory" "Elektu Dosierujo"
+    ::msgcat::mcset eo "&Clear" "&Klaru"
+    ::msgcat::mcset eo "&Clear Console" "&Klaru konzolon"
+    ::msgcat::mcset eo "Color" "Farbo"
+    ::msgcat::mcset eo "Console" "Konzolo"
+    ::msgcat::mcset eo "&Copy" "&Kopiu"
+    ::msgcat::mcset eo "Cu&t" "&Enpo\u015digu"
+    ::msgcat::mcset eo "&Delete" "&Forprenu"
+    ::msgcat::mcset eo "Details >>" "Detaloj >>"
+    ::msgcat::mcset eo "Directory \"%1\$s\" does not exist." "La dosierujo \"%1\$s\" ne ekzistas."
+    ::msgcat::mcset eo "&Directory:" "&Dosierujo:"
+    ::msgcat::mcset eo "&Edit" "&Redaktu"
+    ::msgcat::mcset eo "Error: %1\$s" "Eraro: %1\$s"
+    ::msgcat::mcset eo "E&xit" "&Eliru"
+    ::msgcat::mcset eo "&File" "&Dosiero"
+    ::msgcat::mcset eo "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "La dosiero \"%1\$s\" jam ekzistas.\n\u0108u vi volas anstata\u00fbigi la dosieron?"
+    ::msgcat::mcset eo "File \"%1\$s\" already exists.\n\n" "La dosiero \"%1\$s\" jam egzistas. \n\n"
+    ::msgcat::mcset eo "File \"%1\$s\" does not exist." "La dosierp \"%1\$s\" ne estas."
+    ::msgcat::mcset eo "File &name:" "Dosiero&nomo:"
+    ::msgcat::mcset eo "File &names:" "Dosiero&nomoj:"
+    ::msgcat::mcset eo "Files of &type:" "Dosieroj de &Typo:"
+    ::msgcat::mcset eo "Fi&les:" "Do&sieroj:"
+    ::msgcat::mcset eo "&Filter" "&Filtrilo"
+    ::msgcat::mcset eo "Fil&ter:" "&Filtrilo:"
+    ::msgcat::mcset eo "&Green" "&Verda"
+    ::msgcat::mcset eo "&Help" "&Helpu"
+    ::msgcat::mcset eo "Hi" "Saluton"
+    ::msgcat::mcset eo "&Hide Console" "&Ka\u015du konzolon"
+    ::msgcat::mcset eo "&Ignore" "&Ignoru"
+    ::msgcat::mcset eo "Invalid file name \"%1\$s\"." "Malvalida dosieronomo \"%1\$s\"."
+    ::msgcat::mcset eo "Log Files" "Protokolo"
+    ::msgcat::mcset eo "&No" "&Ne"
+    ::msgcat::mcset eo "OK"
+    ::msgcat::mcset eo "Ok"
+    ::msgcat::mcset eo "Open" "Malfermu"
+    ::msgcat::mcset eo "&Open" "&Malfermu"
+    ::msgcat::mcset eo "Open Multiple Files" "Melfermu multan dosierojn"
+    ::msgcat::mcset eo "P&aste" "&Elpo\u015digi"
+    ::msgcat::mcset eo "&Quit" "&Finigu"
+    ::msgcat::mcset eo "&Red" "&Rosa"
+    ::msgcat::mcset eo "Replace existing file?" "\u0108u anstata\u00fbu ekzistantan dosieron?"
+    ::msgcat::mcset eo "&Retry" "&Ripetu"
+    ::msgcat::mcset eo "&Save" "&Savu"
+    ::msgcat::mcset eo "Save As" "Savu kiel"
+    ::msgcat::mcset eo "Save To Log" "Savu en protokolon"
+    ::msgcat::mcset eo "Select Log File" "Elektu prokolodosieron"
+    ::msgcat::mcset eo "Select a file to source" "Elektu dosieron por interpreti"
+    ::msgcat::mcset eo "&Selection:" "&Elekto:"
+    ::msgcat::mcset eo "Skip Messages" "transsaltu pluajn mesa\u011dojn"
+    ::msgcat::mcset eo "&Source..." "&Fontoprogramo..."
+    ::msgcat::mcset eo "Tcl Scripts" "Tcl-skriptoj"
+    ::msgcat::mcset eo "Tcl for Windows" "Tcl por vindoso"
+    ::msgcat::mcset eo "Text Files" "Tekstodosierojn"
+    ::msgcat::mcset eo "&Yes" "&Jes"
+    ::msgcat::mcset eo "abort" "\u0109esigo"
+    ::msgcat::mcset eo "blue" "blua"
+    ::msgcat::mcset eo "cancel" "rezignu"
+    ::msgcat::mcset eo "extension" "ekspansio"
+    ::msgcat::mcset eo "extensions" "ekspansioj"
+    ::msgcat::mcset eo "green" "verda"
+    ::msgcat::mcset eo "ignore" "ignorieren"
+    ::msgcat::mcset eo "red" "ru\u011da"
+    ::msgcat::mcset eo "retry" "ripetu"
+    ::msgcat::mcset eo "yes" "jes"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/es.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/es.msg
new file mode 100644
index 0000000000..ba981236a3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/es.msg
@@ -0,0 +1,84 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset es "Application Error" "Error de la aplicaci\u00f3n"
+    ::msgcat::mcset es "Blue" "Azul"
+    ::msgcat::mcset es "Color" "Color"
+    ::msgcat::mcset es "Delete" "Borrar"
+    ::msgcat::mcset es "Error" "Error"
+    ::msgcat::mcset es "Exit" "Salir"
+    ::msgcat::mcset es "Green" "Verde"
+    ::msgcat::mcset es "Red" "Rojo"
+    ::msgcat::mcset es "blue" "azul"
+    ::msgcat::mcset es "green" "verde"
+    ::msgcat::mcset es "red" "rojo"
+}
+
+namespace eval ::tk {
+    ::msgcat::mcset es "&Abort" "&Abortar"
+    ::msgcat::mcset es "About..." "Acerca de ..."
+    ::msgcat::mcset es "All Files" "Todos los archivos"
+    ::msgcat::mcset es "Application Error" "Error de la aplicaci\u00f3n"
+    ::msgcat::mcset es "&Blue" "&Azul"
+    ::msgcat::mcset es "&Cancel" "&Cancelar"
+    ::msgcat::mcset es "Cannot change to the directory \"%1\$s\".\nPermission denied." "No es posible acceder al directorio \"%1\$s\".\nPermiso denegado."
+    ::msgcat::mcset es "Choose Directory" "Elegir directorio"
+    ::msgcat::mcset es "Clear" "Borrar"
+    ::msgcat::mcset es "Color" "Color"
+    ::msgcat::mcset es "Console" "Consola"
+    ::msgcat::mcset es "Copy" "Copiar"
+    ::msgcat::mcset es "Cut" "Cortar"
+    ::msgcat::mcset es "Delete" "Borrar"
+    ::msgcat::mcset es "Details >>" "Detalles >>"
+    ::msgcat::mcset es "Directory \"%1\$s\" does not exist." "El directorio \"%1\$s\" no existe."
+    ::msgcat::mcset es "&Directory:" "&Directorio:"
+    ::msgcat::mcset es "Error: %1\$s" "Error: %1\$s"
+    ::msgcat::mcset es "Exit" "Salir"
+    ::msgcat::mcset es "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "El archivo \"%1\$s\" ya existe.\nDesea sobreescribirlo?"
+    ::msgcat::mcset es "File \"%1\$s\" already exists.\n\n" "El archivo \"%1\$s\" ya existe.\n\n"
+    ::msgcat::mcset es "File \"%1\$s\" does not exist." "El archivo \"%1\$s\" no existe."
+    ::msgcat::mcset es "File &name:" "&Nombre de archivo:"
+    ::msgcat::mcset es "File &names:" "&Nombres de archivo:"
+    ::msgcat::mcset es "Files of &type:" "Archivos de &tipo:"
+    ::msgcat::mcset es "Fi&les:" "&Archivos:"
+    ::msgcat::mcset es "&Filter" "&Filtro"
+    ::msgcat::mcset es "Fil&ter:" "Fil&tro:"
+    ::msgcat::mcset es "&Green" "&Verde"
+    ::msgcat::mcset es "Hi" "Hola"
+    ::msgcat::mcset es "Hide Console" "Esconder la consola"
+    ::msgcat::mcset es "&Ignore" "&Ignorar"
+    ::msgcat::mcset es "Invalid file name \"%1\$s\"." "Nombre de archivo inv\u00e1lido \"%1\$s\"."
+    ::msgcat::mcset es "Log Files" "Ficheros de traza"
+    ::msgcat::mcset es "&No" "&No"
+    ::msgcat::mcset es "&OK" "&OK"
+    ::msgcat::mcset es "Ok" "Ok"
+    ::msgcat::mcset es "Open" "Abrir"
+    ::msgcat::mcset es "&Open" "&Abrir"
+    ::msgcat::mcset es "Open Multiple Files" "Abrir m\u00faltiples archivos"
+    ::msgcat::mcset es "Paste" "Pegar"
+    ::msgcat::mcset es "Quit" "Abandonar"
+    ::msgcat::mcset es "&Red" "&Rojo"
+    ::msgcat::mcset es "Replace existing file?" "Reemplazar el archivo existente?"
+    ::msgcat::mcset es "&Retry" "&Reintentar"
+    ::msgcat::mcset es "&Save" "&Salvar"
+    ::msgcat::mcset es "Save As" "Salvar como"
+    ::msgcat::mcset es "Save To Log" "Salvar al archivo de traza"
+    ::msgcat::mcset es "Select Log File" "Elegir un archivo de traza"
+    ::msgcat::mcset es "Select a file to source" "Seleccionar un archivo a evaluar"
+    ::msgcat::mcset es "&Selection:" "&Selecci\u00f3n:"
+    ::msgcat::mcset es "Skip Messages" "Omitir los mensajes"
+    ::msgcat::mcset es "Source..." "Evaluar..."
+    ::msgcat::mcset es "Tcl Scripts" "Scripts Tcl"
+    ::msgcat::mcset es "Tcl for Windows" "Tcl para Windows"
+    ::msgcat::mcset es "Text Files" "Archivos de texto"
+    ::msgcat::mcset es "&Yes" "&S\u00ed" 
+    ::msgcat::mcset es "abort" "abortar"
+    ::msgcat::mcset es "blue" "azul"
+    ::msgcat::mcset es "cancel" "cancelar"
+    ::msgcat::mcset es "extension" "extensi\u00f3n"
+    ::msgcat::mcset es "extensions" "extensiones"
+    ::msgcat::mcset es "green" "verde"
+    ::msgcat::mcset es "ignore" "ignorar"
+    ::msgcat::mcset es "ok" "ok"
+    ::msgcat::mcset es "red" "rojo"
+    ::msgcat::mcset es "retry" "reintentar"
+    ::msgcat::mcset es "yes" "s\u00ed"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/fr.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/fr.msg
new file mode 100644
index 0000000000..ebbba48ca1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/fr.msg
@@ -0,0 +1,84 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset fr "Application Error" "Erreur d'application"
+    ::msgcat::mcset fr "Blue" "Bleu"
+    ::msgcat::mcset fr "Color" "Couleur"
+    ::msgcat::mcset fr "Delete" "Effacer"
+    ::msgcat::mcset fr "Error" "Erreur"
+    ::msgcat::mcset fr "Exit" "Quitter"
+    ::msgcat::mcset fr "Green" "Vert"
+    ::msgcat::mcset fr "Red" "Rouge"
+    ::msgcat::mcset fr "blue" "bleu"
+    ::msgcat::mcset fr "green" "vert"
+    ::msgcat::mcset fr "red" "rouge"
+}
+
+namespace eval ::tk {
+    ::msgcat::mcset fr "&Abort" "&Annuler"
+    ::msgcat::mcset fr "About..." "\u00c0 propos..."
+    ::msgcat::mcset fr "All Files" "Tous les fichiers"
+    ::msgcat::mcset fr "Application Error" "Erreur d'application"
+    ::msgcat::mcset fr "&Blue" "&Bleu"
+    ::msgcat::mcset fr "&Cancel" "&Annuler"
+    ::msgcat::mcset fr "Cannot change to the directory \"%1\$s\".\nPermission denied." "Impossible d'acc\u00e9der au r\u00e9pertoire \"%1\$s\".\nPermission refus\u00e9e."
+    ::msgcat::mcset fr "Choose Directory" "Choisir r\u00e9pertoire"
+    ::msgcat::mcset fr "Clear" "Effacer"
+    ::msgcat::mcset fr "Color" "Couleur"
+    ::msgcat::mcset fr "Console"
+    ::msgcat::mcset fr "Copy" "Copier"
+    ::msgcat::mcset fr "Cut" "Couper"
+    ::msgcat::mcset fr "Delete" "Effacer"
+    ::msgcat::mcset fr "Details >>" "D\u00e9tails >>"
+    ::msgcat::mcset fr "Directory \"%1\$s\" does not exist." "Le r\u00e9pertoire \"%1\$s\" n'existe pas."
+    ::msgcat::mcset fr "&Directory:" "&R\u00e9pertoire:"
+    ::msgcat::mcset fr "Error: %1\$s" "Erreur: %1\$s"
+    ::msgcat::mcset fr "Exit" "Quitter"
+    ::msgcat::mcset fr "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Le fichier \"%1\$s\" existe d\u00e9j\u00e0.\nVoulez-vous l'\u00e9craser?"
+    ::msgcat::mcset fr "File \"%1\$s\" already exists.\n\n" "Le fichier \"%1\$s\" existe d\u00e9j\u00e0.\n\n"
+    ::msgcat::mcset fr "File \"%1\$s\" does not exist." "Le fichier \"%1\$s\" n'existe pas."
+    ::msgcat::mcset fr "File &name:" "&Nom de fichier:"
+    ::msgcat::mcset fr "File &names:" "&Noms de fichiers:"
+    ::msgcat::mcset fr "Files of &type:" "&Type de fichiers:"
+    ::msgcat::mcset fr "Fi&les:" "Fich&iers:"
+    ::msgcat::mcset fr "&Filter" "&Filtre"
+    ::msgcat::mcset fr "Fil&ter:" "Fil&tre:"
+    ::msgcat::mcset fr "&Green" "&Vert"
+    ::msgcat::mcset fr "Hi" "Salut"
+    ::msgcat::mcset fr "Hide Console" "Cacher la Console"
+    ::msgcat::mcset fr "&Ignore" "&Ignorer"
+    ::msgcat::mcset fr "Invalid file name \"%1\$s\"." "Nom de fichier invalide \"%1\$s\"."
+    ::msgcat::mcset fr "Log Files" "Fichiers de trace"
+    ::msgcat::mcset fr "&No" "&Non"
+    ::msgcat::mcset fr "&OK"
+    ::msgcat::mcset fr "Ok"
+    ::msgcat::mcset fr "Open" "Ouvrir"
+    ::msgcat::mcset fr "&Open" "&Ouvrir"
+    ::msgcat::mcset fr "Open Multiple Files" "Ouvrir plusieurs fichiers"
+    ::msgcat::mcset fr "Paste" "Coller"
+    ::msgcat::mcset fr "Quit" "Quitter"
+    ::msgcat::mcset fr "&Red" "&Rouge"
+    ::msgcat::mcset fr "Replace existing file?" "Remplacer le fichier existant?"
+    ::msgcat::mcset fr "&Retry" "&R\u00e9-essayer"
+    ::msgcat::mcset fr "&Save" "&Sauvegarder"
+    ::msgcat::mcset fr "Save As" "Sauvegarder sous"
+    ::msgcat::mcset fr "Save To Log" "Sauvegarde au fichier de trace"
+    ::msgcat::mcset fr "Select Log File" "Choisir un fichier de trace"
+    ::msgcat::mcset fr "Select a file to source" "Choisir un fichier \u00e0 \u00e9valuer"
+    ::msgcat::mcset fr "&Selection:" "&S\u00e9lection:"
+    ::msgcat::mcset fr "Skip Messages" "Omettre les messages"
+    ::msgcat::mcset fr "Source..." "\u00c9valuer..."
+    ::msgcat::mcset fr "Tcl Scripts" "Scripts Tcl"
+    ::msgcat::mcset fr "Tcl for Windows" "Tcl pour Windows"
+    ::msgcat::mcset fr "Text Files" "Fichiers texte"
+    ::msgcat::mcset fr "&Yes" "&Oui"
+    ::msgcat::mcset fr "abort" "abandonner"
+    ::msgcat::mcset fr "blue" "bleu"
+    ::msgcat::mcset fr "cancel" "annuler"
+    ::msgcat::mcset fr "extension"
+    ::msgcat::mcset fr "extensions"
+    ::msgcat::mcset fr "green" "vert"
+    ::msgcat::mcset fr "ignore" "ignorer"
+    ::msgcat::mcset fr "ok"
+    ::msgcat::mcset fr "red" "rouge"
+    ::msgcat::mcset fr "retry" "r\u00e9essayer"
+    ::msgcat::mcset fr "yes" "oui"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/it.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/it.msg
new file mode 100644
index 0000000000..b144fcc073
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/it.msg
@@ -0,0 +1,84 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset it "Application Error" "Errore dell' applicazione"
+    ::msgcat::mcset it "Blue" "Blu"
+    ::msgcat::mcset it "Color" "Colore"
+    ::msgcat::mcset it "Delete" "Incolla"
+    ::msgcat::mcset it "Error" "Errore"
+    ::msgcat::mcset it "Exit" "Esci"
+    ::msgcat::mcset it "Green" "Verde"
+    ::msgcat::mcset it "Red" "Rosso"
+    ::msgcat::mcset it "blue" "blu"
+    ::msgcat::mcset it "green" "verde"
+    ::msgcat::mcset it "red" "rosso"
+}
+
+namespace eval ::tk {
+    ::msgcat::mcset it "&Abort" "&Interrompi"
+    ::msgcat::mcset it "About..." "Informazioni ..."
+    ::msgcat::mcset it "All Files" "Tutti i file"
+    ::msgcat::mcset it "Application Error" "Errore dell' applicazione"
+    ::msgcat::mcset it "&Blue" "&Blu"
+    ::msgcat::mcset it "&Cancel" "&Annulla"
+    ::msgcat::mcset it "Cannot change to the directory \"%1\$s\".\nPermission denied." "Impossibile accedere alla directory \"%1\$s\".\nPermesso negato."
+    ::msgcat::mcset it "Choose Directory" "Scegli directory"
+    ::msgcat::mcset it "Clear" "Azzera"
+    ::msgcat::mcset it "Color" "Colore"
+    ::msgcat::mcset it "Console"
+    ::msgcat::mcset it "Copy" "Copia"
+    ::msgcat::mcset it "Cut" "Taglia"
+    ::msgcat::mcset it "Delete" "Incolla"
+    ::msgcat::mcset it "Details >>" "Dettagli >>"
+    ::msgcat::mcset it "Directory \"%1\$s\" does not exist." "La directory \"%1\$s\" non esiste."
+    ::msgcat::mcset it "&Directory:"
+    ::msgcat::mcset it "Error: %1\$s" "Errore: %1\$s"
+    ::msgcat::mcset it "Exit" "Esci"
+    ::msgcat::mcset it "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Il file \"%1\$s\" esiste gi\u00e0.\nVuoi sovrascriverlo?"
+    ::msgcat::mcset it "File \"%1\$s\" already exists.\n\n" "Il file \"%1\$s\" esiste gi\u00e0.\n\n"
+    ::msgcat::mcset it "File \"%1\$s\" does not exist." "Il file \"%1\$s\" non esiste."
+    ::msgcat::mcset it "File &name:" "&Nome del file:"
+    ::msgcat::mcset it "File &names:" "&Nomi dei file:"
+    ::msgcat::mcset it "Files of &type:" "File di &tipo:"
+    ::msgcat::mcset it "Fi&les:" "Fi&le:"
+    ::msgcat::mcset it "&Filter" "&Filtro"
+    ::msgcat::mcset it "Fil&ter:" "Fil&tro:"
+    ::msgcat::mcset it "&Green" "&Verde"
+    ::msgcat::mcset it "Hi" "Salve"
+    ::msgcat::mcset it "Hide Console" "Nascondi la console"
+    ::msgcat::mcset it "&Ignore" "&Ignora"
+    ::msgcat::mcset it "Invalid file name \"%1\$s\"." "Nome di file non valido \"%1\$s\"."
+    ::msgcat::mcset it "Log Files" "File di log"
+    ::msgcat::mcset it "&No"
+    ::msgcat::mcset it "&OK"
+    ::msgcat::mcset it "Ok"
+    ::msgcat::mcset it "&Open" "A&pri"
+    ::msgcat::mcset it "Open" "Apri"
+    ::msgcat::mcset it "Open Multiple Files" "Apri file multipli"
+    ::msgcat::mcset it "Paste" "Incolla"
+    ::msgcat::mcset it "Quit" "Esci"
+    ::msgcat::mcset it "&Red" "&Rosso"
+    ::msgcat::mcset it "Replace existing file?" "Sostituisci il file esistente?"
+    ::msgcat::mcset it "&Retry" "&Riprova"
+    ::msgcat::mcset it "&Save" "&Salva"
+    ::msgcat::mcset it "Save As" "Salva come"
+    ::msgcat::mcset it "Save To Log" "Salva il log"
+    ::msgcat::mcset it "Select Log File" "Scegli un file di log"
+    ::msgcat::mcset it "Select a file to source" "Scegli un file da eseguire"
+    ::msgcat::mcset it "&Selection:" "&Selezione:"
+    ::msgcat::mcset it "Skip Messages" "Salta i messaggi"
+    ::msgcat::mcset it "Source..." "Esegui..."
+    ::msgcat::mcset it "Tcl Scripts" "Scripts Tcl"
+    ::msgcat::mcset it "Tcl for Windows" "Tcl per Windows"
+    ::msgcat::mcset it "Text Files" "File di testo"
+    ::msgcat::mcset it "&Yes" "&Si"
+    ::msgcat::mcset it "abort" "interrompi"
+    ::msgcat::mcset it "blue" "blu"
+    ::msgcat::mcset it "cancel" "annulla"
+    ::msgcat::mcset it "extension" "estensione"
+    ::msgcat::mcset it "extensions" "estensioni"
+    ::msgcat::mcset it "green" "verde"
+    ::msgcat::mcset it "ignore" "ignora"
+    ::msgcat::mcset it "ok"
+    ::msgcat::mcset it "red" "rosso"
+    ::msgcat::mcset it "retry" "riprova"
+    ::msgcat::mcset it "yes" "si"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/ja.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/ja.msg
new file mode 100644
index 0000000000..44a25839db
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/ja.msg
@@ -0,0 +1,13 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset ja "Application Error"  "\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30A8\u30E9\u30FC"
+    ::msgcat::mcset ja "Blue"    "\u9752"
+    ::msgcat::mcset ja "Color"   "\u80CC\u666F\u8272"
+    ::msgcat::mcset ja "Delete"  "\u6D88\u53BB"
+    ::msgcat::mcset ja "Error"   "\u30A8\u30E9\u30FC"
+    ::msgcat::mcset ja "Exit"    "\u7D42\u4E86"
+    ::msgcat::mcset ja "Green"   "\u7DD1"
+    ::msgcat::mcset ja "Red"     "\u8D64"
+    ::msgcat::mcset ja "blue"    "\u9752"
+    ::msgcat::mcset ja "green"   "\u7DD1"
+    ::msgcat::mcset ja "red"     "\u8D64"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/license.terms b/ruby_1_8_6/ext/tk/sample/msgs_tk/license.terms
new file mode 100644
index 0000000000..03ca6fcb31
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/license.terms
@@ -0,0 +1,39 @@
+This software is copyrighted by the Regents of the University of
+California, Sun Microsystems, Inc., and other parties.  The following
+terms apply to all files associated with the software unless explicitly
+disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license.
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/nl.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/nl.msg
new file mode 100644
index 0000000000..d9642e808c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/nl.msg
@@ -0,0 +1,123 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset nl "Application Error" "Toepassingsfout"
+    ::msgcat::mcset nl "Blue" "Blauw"
+    ::msgcat::mcset nl "Color" "Kleur"
+    ::msgcat::mcset nl "Delete" "Wissen"
+    ::msgcat::mcset nl "Error" "Fout"
+    ::msgcat::mcset nl "Exit" "Be\u00ebindigen"
+    ::msgcat::mcset nl "Green" "Groen"
+    ::msgcat::mcset nl "Red" "Rood"
+    ::msgcat::mcset nl "blue" "blauw"
+    ::msgcat::mcset nl "green" "groen"
+    ::msgcat::mcset nl "red" "rood"
+}
+
+namespace eval ::tk {
+    ::msgcat::mcset nl "\"%1\$s\" must be an absolute pathname" "\"%1\$s\" moet een absolute pad-naam zijn"
+    ::msgcat::mcset nl "%1\$s is not a toplevel window" "%1\$s is geen toplevel window"
+    ::msgcat::mcset nl ", or" ", of"
+    ::msgcat::mcset nl "-default, -icon, -message, -parent, -title, or -type" "-default, -icon, -message, -parent, -title, of -type"
+    ::msgcat::mcset nl "-initialdir, -mustexist, -parent, or -title" "-initialdir, -mustexist, -parent, of -title"
+    ::msgcat::mcset nl "&Abort" "&Afbreken"
+    ::msgcat::mcset nl "About..." "Over..."
+    ::msgcat::mcset nl "All Files" "Alle Bestanden"
+    ::msgcat::mcset nl "Application Error" "Toepassingsfout"
+    ::msgcat::mcset nl "&Blue" "&Blauw"
+    ::msgcat::mcset nl "&Cancel" "&Annuleren"
+    ::msgcat::mcset nl "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kan niet naar map \"%1\$s\" gaan.\nU heeft hiervoor geen toestemming."
+    ::msgcat::mcset nl "Choose Directory" "Kies map"
+    ::msgcat::mcset nl "Clear" "Wissen"
+    ::msgcat::mcset nl "Clear entry, Press OK; Enter %1\$s, press OK" "Wis veld, Druk op OK; typ %1\$s in, druk op OK"
+    ::msgcat::mcset nl "&Clear Console" "&Wis Console"
+    ::msgcat::mcset nl "Color" "Kleur"
+    ::msgcat::mcset nl "Console"
+    ::msgcat::mcset nl "Copy" "Kopi\u00ebren"
+    ::msgcat::mcset nl "Cut" "Knippen"
+    ::msgcat::mcset nl "Delete" "Wissen"
+    ::msgcat::mcset nl "Details"
+    ::msgcat::mcset nl "Details >>"
+    ::msgcat::mcset nl "Directory \"%1\$s\" does not exist." "Map \"%1\$s\" bestaat niet."
+    ::msgcat::mcset nl "&Directory:" "&Map:"
+    ::msgcat::mcset nl "Edit" "Bewerken"
+    ::msgcat::mcset nl "Enter \"%1\$s\", press OK" "Typ \"%1\$s\", druk op OK"
+    ::msgcat::mcset nl "Enter \"%1\$s\", press OK, enter \"%2\$s\", press OK" "Typ \"%1\$s\", druk op OK, typ \"%2\$s\", druk op OK"
+    ::msgcat::mcset nl "Error: %1\$s" "Fout: %1\$s"
+    ::msgcat::mcset nl "Exit" "Be\u00ebindigen"
+    ::msgcat::mcset nl "File" "Bestand"
+    ::msgcat::mcset nl "File \"%1\$s\" already exists.\n\n" "Bestand \"%1\$s\" bestaat al.\n\n"
+    ::msgcat::mcset nl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Bestand \"%1\$s\" bestaat al.\nWilt u het overschrijven?"
+    ::msgcat::mcset nl "File \"%1\$s\" does not exist." "Bestand \"%1\$s\" bestaat niet."
+    ::msgcat::mcset nl "File &name:" "Bestands&naam:"
+    ::msgcat::mcset nl "File &names:" "Bestands&namen:"
+    ::msgcat::mcset nl "Files of &type:" "Bestanden van het &type:"
+    ::msgcat::mcset nl "Fi&les:" "&Bestanden:"
+    ::msgcat::mcset nl "&Filter"
+    ::msgcat::mcset nl "Fil&ter:"
+    ::msgcat::mcset nl "&Green" "&Groen"
+    ::msgcat::mcset nl "Hi" "H\u00e9"
+    ::msgcat::mcset nl "Hide Console" "Verberg Console"
+    ::msgcat::mcset nl "&Ignore" "&Negeren"
+    ::msgcat::mcset nl "Invalid file name \"%1\$s\"." "Ongeldige bestandsnaam \"%1\$s\"."
+    ::msgcat::mcset nl "Log Files" "Log Bestanden"
+    ::msgcat::mcset nl "&No" "&Nee"
+    ::msgcat::mcset nl "&OK"
+    ::msgcat::mcset nl "Ok"
+    ::msgcat::mcset nl "&Open" "&Openen"
+    ::msgcat::mcset nl "Open" "Openen"
+    ::msgcat::mcset nl "Open Multiple Files" "Open meerdere bestanden"
+    ::msgcat::mcset nl "Paste" "Plakken"
+    ::msgcat::mcset nl "Please press %1\$s" "Druk op %1\$s, A.U.B."
+    ::msgcat::mcset nl "Please press ok" "Druk op ok, A.U.B."
+    ::msgcat::mcset nl "Press Cancel" "Druk op Annuleren"
+    ::msgcat::mcset nl "Press Ok" "Druk op Ok"
+    ::msgcat::mcset nl "Quit" "Stoppen"
+    ::msgcat::mcset nl "&Red" "&Rood"
+    ::msgcat::mcset nl "Replace existing file?" "Vervang bestaand bestand?"
+    ::msgcat::mcset nl "&Retry" "&Herhalen"
+    ::msgcat::mcset nl "&Save" "Op&slaan"
+    ::msgcat::mcset nl "Save As" "Opslaan als"
+    ::msgcat::mcset nl "Save To Log" "Opslaan naar Log"
+    ::msgcat::mcset nl "Select Log File" "Selecteer Log bestand"
+    ::msgcat::mcset nl "Select a file to source" "Selecteer bronbestand"
+    ::msgcat::mcset nl "&Selection:" "&Selectie:"
+    ::msgcat::mcset nl "Skip Messages" "Berichten overslaan"
+    ::msgcat::mcset nl "Source..." "Bron..."
+    ::msgcat::mcset nl "Tcl Scripts"
+    ::msgcat::mcset nl "Tcl for Windows" "Tcl voor Windows"
+    ::msgcat::mcset nl "Text Files" "Tekstbestanden"
+    ::msgcat::mcset nl "&Yes" "&Ja"
+    ::msgcat::mcset nl "abort" "afbreken"
+    ::msgcat::mcset nl "abort, retry, ignore, ok, cancel, no, or yes" "afbreken, opnieuw, negeren, ok, annuleren, nee, of ja"
+    ::msgcat::mcset nl "abortretryignore, ok, okcancel, retrycancel, yesno, or yesnocancel" "abortretryignore, ok, okcancel, retrycancel, yesno, of yesnocancel"
+    ::msgcat::mcset nl "bad %1\$s value \"%2\$s\": must be %3\$s" "verkeerde %1\$s waarde \"%2\$s\": moet zijn %3\$s"
+    ::msgcat::mcset nl "bad file type \"%1\$s\", should be" "verkeerd bestandstype \"%1\$s\", moet zijn"
+    ::msgcat::mcset nl "bad option \"%1\$s\": should be %2\$s" "verkeerde optie \"%1\$s\": moet zijn %2\$s"
+    ::msgcat::mcset nl "bad window path name \"%1\$s\"" "verkeerde window-padnaam \"%1\$s\""
+    ::msgcat::mcset nl "blue" "blauw"
+    ::msgcat::mcset nl "can't post %1\$s:  it isn't a descendant of %2\$s (this is a new requirement in Tk versions 3.0 and later)" "kan %1\$s niet verzenden:  het is geen afstammeling van %2\$s (dit is een nieuwe eis in Tk versies 3.0 en later)"
+    ::msgcat::mcset nl "cancel" "annuleren"
+    ::msgcat::mcset nl "default button index greater than number of buttons specified for tk_dialog" "default knop index is groter dan het aantal knoppen beschikbaar voor tk_dialog"
+    ::msgcat::mcset nl "display name to use (current one otherwise)" "te gebruiken schermnaam (anders huidige scherm)"
+    ::msgcat::mcset nl "error, info, question, or warning" "error, info, question, of warning"
+    ::msgcat::mcset nl "extension"
+    ::msgcat::mcset nl "extensions"
+    ::msgcat::mcset nl "focus group \"%1\$s\" doesn't exist" "focusgroep \"%1\$s\" bestaat niet"
+    ::msgcat::mcset nl "green" "groen"
+    ::msgcat::mcset nl "history event %1\$s"
+    ::msgcat::mcset nl "ignore" "negeren"
+    ::msgcat::mcset nl "invalid default button \"%1\$s\"" "ongeldige default knop \"%1\$s\""
+    ::msgcat::mcset nl "macType"
+    ::msgcat::mcset nl "macTypes"
+    ::msgcat::mcset nl "must specify a background color" "een achtergrondkleur is verplicht"
+    ::msgcat::mcset nl "name of the slave interpreter" "naam van de slaaf-interpreter"
+    ::msgcat::mcset nl "no winfo screen . nor env(DISPLAY)" "geen winfo scherm . noch env(DISPLAY)"
+    ::msgcat::mcset nl "ok"
+    ::msgcat::mcset nl "red" "rood"
+    ::msgcat::mcset nl "retry" "opnieuw"
+    ::msgcat::mcset nl "should contain 5 or 4 elements" "moet 4 of 5 elementen bevatten"
+    ::msgcat::mcset nl "spec"
+    ::msgcat::mcset nl "tk_chooseDirectory command" "tk_chooseDirectory opdracht"
+    ::msgcat::mcset nl "tk_chooseDirectory command, cancel gives null" "tk_chooseDirectory opdracht, annuleren geeft lege waarde"
+    ::msgcat::mcset nl "tk_chooseDirectory command, initialdir" "tk_chooseDirectory opdracht, initi\u00eble map"
+    ::msgcat::mcset nl "yes" "ja"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/pl.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/pl.msg
new file mode 100644
index 0000000000..2699e42bdf
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/pl.msg
@@ -0,0 +1,87 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset pl "Application Error" "Bl\u0105d w Programie"
+    ::msgcat::mcset pl "Blue" "Niebieski"
+    ::msgcat::mcset pl "Color" "Kolor"
+    ::msgcat::mcset pl "Delete" "Usu\u0144"
+    ::msgcat::mcset pl "Error" "B\u0142\u0105d"
+    ::msgcat::mcset pl "Exit" "Zako\u0144cz"
+    ::msgcat::mcset pl "Green" "Zielony"
+    ::msgcat::mcset pl "Red" "Czerwonz"
+    ::msgcat::mcset pl "blue" "niebieski"
+    ::msgcat::mcset pl "green" "zielony"
+    ::msgcat::mcset pl "red" "czerwony"
+}
+
+namespace eval ::tk {
+    ::msgcat::mcset pl "&Abort" "&Anuluj"
+    ::msgcat::mcset pl "&About..." "O Programie..."
+    ::msgcat::mcset pl "All Files" "Wszystkie pliki"
+    ::msgcat::mcset pl "Application Error" "Bl\u0105d w Programie"
+    ::msgcat::mcset pl "&Blue" "&Niebieski"
+    ::msgcat::mcset pl "&Cancel" "&Anuluj"
+    ::msgcat::mcset pl "Cannot change to the directory \"%1\$s\".\nPermission denied." "Katalog \"%1\$s\" nie mo\u017ce zosta\u0107 odczytany lub nie istnieje."
+    ::msgcat::mcset pl "Choose Directory" "Wybierz katalog"
+    ::msgcat::mcset pl "&Clear" "&Wyczy\u015b\u0107"
+    ::msgcat::mcset pl "&Clear Console" "&Wyczy\u015b\u0107 konsol\u0119"
+    ::msgcat::mcset pl "Color" "Kolor"
+    ::msgcat::mcset pl "Console" "Konsola"
+    ::msgcat::mcset pl "&Copy" "&Kopiuj"
+    ::msgcat::mcset pl "Cu&t" "&Wytnij"
+    ::msgcat::mcset pl "&Delete" "&Usu\u0144"
+    ::msgcat::mcset pl "Details >>" "Detale >>"
+    ::msgcat::mcset pl "Directory \"%1\$s\" does not exist." "Katalog \"%1\$s\" nie istniej."
+    ::msgcat::mcset pl "&Directory:" "&Katalog:"
+    ::msgcat::mcset pl "&Edit" "&Edytuj"
+    ::msgcat::mcset pl "Error: %1\$s" "B\u0142\u0105d: %1\$s"
+    ::msgcat::mcset pl "E&xit" "&Zako\u0144cz"
+    ::msgcat::mcset pl "&File" "&Plik"
+    ::msgcat::mcset pl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Plik \"%1\$s\" ju\u017c istnieje.\nCzy chcesz go zast\u0105pi\u0107?"
+    ::msgcat::mcset pl "File \"%1\$s\" already exists.\n\n" "Plik \"%1\$s\" ju\u017c istnieje. \n\n"
+    ::msgcat::mcset pl "File \"%1\$s\" does not exist." "Plik \"%1\$s\" nie istnieje."
+    ::msgcat::mcset pl "File &name:" "Nazwa &pliku:"
+    ::msgcat::mcset pl "File &names:" "Nazwy &plik\u00f3w:"
+    ::msgcat::mcset pl "Files of &type:" "Pliki &typu:"
+    ::msgcat::mcset pl "Fi&les:" "Pli&ki:"
+    ::msgcat::mcset pl "&Filter" "&Filter"
+    ::msgcat::mcset pl "Fil&ter:" "&Filter:"
+    ::msgcat::mcset pl "&Green" "&Zielony"
+    ::msgcat::mcset pl "&Help" "&Pomoc"
+    ::msgcat::mcset pl "Hi" "Witaj"
+    ::msgcat::mcset pl "&Hide Console" "&Schowaj konsol\u0119"
+    ::msgcat::mcset pl "&Ignore" "&Ignoruj"
+    ::msgcat::mcset pl "Invalid file name \"%1\$s\"." "Niew\u0142a\u015bciwa nazwa pliku \"%1\$s\"."
+    ::msgcat::mcset pl "Log Files" "Protoko\u0142uj"
+    ::msgcat::mcset pl "&No" "&Nie"
+    ::msgcat::mcset pl "OK"
+    ::msgcat::mcset pl "Ok"
+    ::msgcat::mcset pl "Open" "Wczytaj"
+    ::msgcat::mcset pl "&Open" "&Wczytaj"
+    ::msgcat::mcset pl "Open Multiple Files" "Wczytuj wiele plik\u00f3w"
+    ::msgcat::mcset pl "P&aste" "&Wklej"
+    ::msgcat::mcset pl "&Quit" "&Zako\u0144cz"
+    ::msgcat::mcset pl "&Red" "&Czerwonz"
+    ::msgcat::mcset pl "Replace existing file?" "Czy zost\u0105pi\u0107 instniej\u0105cy plik?"
+    ::msgcat::mcset pl "&Retry" "&Powt\u00f3rz"
+    ::msgcat::mcset pl "&Save" "&Zapisz"
+    ::msgcat::mcset pl "Save As" "Zapisz jako"
+    ::msgcat::mcset pl "Save To Log" "Wpisz do protoko\u0142u"
+    ::msgcat::mcset pl "Select Log File" "Wybierz plik proko\u0142u"
+    ::msgcat::mcset pl "Select a file to source" "Wybierz plik do wykonania"
+    ::msgcat::mcset pl "&Selection:" "&Wyb\u00f3r:"
+    ::msgcat::mcset pl "Skip Messages" "Omi\u0144 pozosta\u0142e komunikaty"
+    ::msgcat::mcset pl "&Source..." "&Kod \u017ar\u00f3d\u0142owy..."
+    ::msgcat::mcset pl "Tcl Scripts" "Tcl-skrypty"
+    ::msgcat::mcset pl "Tcl for Windows" "Tcl dla Okienek (Windows)"
+    ::msgcat::mcset pl "Text Files" "Pliki Tekstowe"
+    ::msgcat::mcset pl "&Yes" "&Tak"
+    ::msgcat::mcset pl "abort" "zako\u0144cz"
+    ::msgcat::mcset pl "blue" "niebieski"
+    ::msgcat::mcset pl "cancel" "anuluj"
+    ::msgcat::mcset pl "extension" "rozszerzenie"
+    ::msgcat::mcset pl "extensions" "rozszerzenia"
+    ::msgcat::mcset pl "green" "zielony"
+    ::msgcat::mcset pl "ignore" "ignoruj"
+    ::msgcat::mcset pl "red" "czerwony"
+    ::msgcat::mcset pl "retry" "potw\u00f3rz"
+    ::msgcat::mcset pl "yes" "tak"
+}
diff --git a/ruby_1_8_6/ext/tk/sample/msgs_tk/ru.msg b/ruby_1_8_6/ext/tk/sample/msgs_tk/ru.msg
new file mode 100644
index 0000000000..a1192b7095
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/msgs_tk/ru.msg
@@ -0,0 +1,87 @@
+namespace eval ::tkmsgcat_demo {
+    ::msgcat::mcset ru "Application Error" "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435"
+    ::msgcat::mcset ru "Blue" " \u0413\u043e\u043b\u0443\u0431\u043e\u0439"
+    ::msgcat::mcset ru "Color" "\u0426\u0432\u0435\u0442"
+    ::msgcat::mcset ru "Delete" "\u0423\u0434\u0430\u043b\u0438\u0442\u044c"
+    ::msgcat::mcset ru "Error" "\u041e\u0448\u0438\u0431\u043a\u0430"
+    ::msgcat::mcset ru "Exit" "\u0412\u044b\u0445\u043e\u0434"
+    ::msgcat::mcset ru "Green" "\u0417\u0435\u043b\u0435\u043d\u044b\u0439"
+    ::msgcat::mcset ru "Red" "\u041a\u0440\u0430\u0441\u043d\u044b\u0439"
+    ::msgcat::mcset ru "blue" " \u0433\u043e\u043b\u0443\u0431\u043e\u0439"
+    ::msgcat::mcset ru "green" " \u0437\u0435\u043b\u0435\u043d\u044b\u0439"
+    ::msgcat::mcset ru "red" " \u043a\u0440\u0430\u0441\u043d\u044b\u0439"
+}
+
+namespace eval ::tk {
+    ::msgcat::mcset ru "&Abort" "&\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c"
+    ::msgcat::mcset ru "About..." "\u041f\u0440\u043e..."
+    ::msgcat::mcset ru "All Files" "\u0412\u0441\u0435 \u0444\u0430\u0439\u043b\u044b"
+    ::msgcat::mcset ru "Application Error" "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435"
+    ::msgcat::mcset ru "&Blue" " &\u0413\u043e\u043b\u0443\u0431\u043e\u0439"
+    ::msgcat::mcset ru "&Cancel" "\u041e\u0442&\u043c\u0435\u043d\u0430"
+    ::msgcat::mcset ru "Cannot change to the directory \"%1\$s\".\nPermission denied." \
+			"\u041d\u0435 \u043c\u043e\u0433\u0443 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \"%1\$s\".\n\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0440\u0430\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u0430"
+    ::msgcat::mcset ru "Choose Directory" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433"
+    ::msgcat::mcset ru "Clear" "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c"
+    ::msgcat::mcset ru "Color" "\u0426\u0432\u0435\u0442"
+    ::msgcat::mcset ru "Console" "\u041a\u043e\u043d\u0441\u043e\u043b\u044c"
+    ::msgcat::mcset ru "Copy" "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c"
+    ::msgcat::mcset ru "Cut" "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c"
+    ::msgcat::mcset ru "Delete" "\u0423\u0434\u0430\u043b\u0438\u0442\u044c"
+    ::msgcat::mcset ru "Details >>" "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 >>"
+    ::msgcat::mcset ru "Directory \"%1\$s\" does not exist." "\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \"%1\$s\" \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442."
+    ::msgcat::mcset ru "&Directory:" "&\u041a\u0430\u0442\u0430\u043b\u043e\u0433:"
+    ::msgcat::mcset ru "Error: %1\$s" "\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s" 
+    ::msgcat::mcset ru "Exit" "\u0412\u044b\u0445\u043e\u0434"
+    ::msgcat::mcset ru "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \
+			    "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?"
+    ::msgcat::mcset ru "File \"%1\$s\" already exists.\n\n" "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\n"
+    ::msgcat::mcset ru "File \"%1\$s\" does not exist." "\u0424\u0430\u0439\u043b \"%1\$s\" \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d."
+    ::msgcat::mcset ru "File &name:" "&\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430:"
+    ::msgcat::mcset ru "File &names:" "&\u0418\u043c\u0435\u043d\u0430 \u0444\u0430\u0439\u043b\u043e\u0432:"
+    ::msgcat::mcset ru "Files of &type:" "&\u0422\u0438\u043f \u0444\u0430\u0439\u043b\u043e\u0432:"
+    ::msgcat::mcset ru "Fi&les:" "\u0424\u0430\u0439&\u043b\u044b:"
+    ::msgcat::mcset ru "&Filter" "&\u0424\u0438\u043b\u044c\u0442\u0440"
+    ::msgcat::mcset ru "Fil&ter:" "\u0424\u0438\u043b\u044c&\u0442\u0440:"
+    ::msgcat::mcset ru "&Green" " &\u0417\u0435\u043b\u0435\u043d\u044b\u0439"
+    ::msgcat::mcset ru "Hi" "\u041f\u0440\u0438\u0432\u0435\u0442"
+    ::msgcat::mcset ru "Hide Console" "\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c"
+    ::msgcat::mcset ru "&Ignore" "&\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c"
+    ::msgcat::mcset ru "Invalid file name \"%1\$s\"." "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \"%1\$s\"." 
+    ::msgcat::mcset ru "Log Files" "\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430"
+    ::msgcat::mcset ru "&No" "&\u041d\u0435\u0442"
+    ::msgcat::mcset ru "&OK" "&\u041e\u041a"
+    ::msgcat::mcset ru "Ok" "\u0414\u0430"
+    ::msgcat::mcset ru "Open" "\u041e\u0442\u043a\u0440\u044b\u0442\u044c"
+    ::msgcat::mcset ru "&Open" "&\u041e\u0442\u043a\u0440\u044b\u0442\u044c"
+    ::msgcat::mcset ru "Open Multiple Files" "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0444\u0430\u0439\u043b\u043e\u0432"
+    ::msgcat::mcset ru "Paste" "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c"
+    ::msgcat::mcset ru "Quit" "\u0412\u044b\u0445\u043e\u0434"
+    ::msgcat::mcset ru "&Red" " &\u041a\u0440\u0430\u0441\u043d\u044b\u0439"
+    ::msgcat::mcset ru "Replace existing file?" "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b?"
+    ::msgcat::mcset ru "&Retry" "&\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c"
+    ::msgcat::mcset ru "&Save" "&\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c"
+    ::msgcat::mcset ru "Save As" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a"
+    ::msgcat::mcset ru "Save To Log" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432 \u0436\u0443\u0440\u043d\u0430\u043b"
+    ::msgcat::mcset ru "Select Log File" "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0436\u0443\u0440\u043d\u0430\u043b"
+    ::msgcat::mcset ru "Select a file to source" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0430\u0446\u0438\u0438"
+    ::msgcat::mcset ru "&Selection:" "&Selection:"
+    ::msgcat::mcset ru "Skip Messages" "\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f"
+    ::msgcat::mcset ru "Source..." "\u0418\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0430\u0439\u043b..."
+    ::msgcat::mcset ru "Tcl Scripts" "\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430 \u043d\u0430 \u044f\u0437\u044b\u043a\u0435 TCL"
+    ::msgcat::mcset ru "Tcl for Windows" "TCL \u0434\u043b\u044f Windows"
+    ::msgcat::mcset ru "Text Files" "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0435 \u0444\u0430\u0439\u043b\u044b"
+    ::msgcat::mcset ru "&Yes" "&\u0414\u0430"
+    ::msgcat::mcset ru "abort" "\u043e\u0442\u043c\u0435\u043d\u0430"
+    ::msgcat::mcset ru "blue" " \u0433\u043e\u043b\u0443\u0431\u043e\u0439"
+    ::msgcat::mcset ru "cancel" "\u043e\u0442\u043c\u0435\u043d\u0430"
+    ::msgcat::mcset ru "extension" "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435"
+    ::msgcat::mcset ru "extensions" "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f"
+    ::msgcat::mcset ru "green" " \u0437\u0435\u043b\u0435\u043d\u044b\u0439"
+    ::msgcat::mcset ru "ignore" "\u043f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c"
+    ::msgcat::mcset ru "ok" "\u043e\u043a"
+    ::msgcat::mcset ru "red" " \u043a\u0440\u0430\u0441\u043d\u044b\u0439"
+    ::msgcat::mcset ru "retry" "\u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c"
+    ::msgcat::mcset ru "yes" "\u0434\u0430"
+}
+
diff --git a/ruby_1_8_6/ext/tk/sample/multi-ip_sample.rb b/ruby_1_8_6/ext/tk/sample/multi-ip_sample.rb
new file mode 100644
index 0000000000..8d6e1bc626
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/multi-ip_sample.rb
@@ -0,0 +1,102 @@
+#!/usr/bin/env ruby
+# This script is a sample of MultiTkIp class
+
+require "multi-tk"
+
+# create slave interpreters
+trusted_slave = MultiTkIp.new_slave
+safe_slave1   = MultiTkIp.new_safeTk
+safe_slave2   = MultiTkIp.new_safeTk('fill'=>:none, 'expand'=>false)
+#safe_slave2   = MultiTkIp.new_safeTk('fill'=>:none)
+#safe_slave2   = MultiTkIp.new_safeTk('expand'=>false)
+
+cmd = Proc.new{|txt|
+  #####################
+  ## from TkTimer2.rb
+
+  if TkCore::INTERP.safe?
+    # safeTk doesn't have permission to call 'wm' command
+  else
+    root = TkRoot.new(:title=>'timer sample')
+  end
+
+  label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
+                  .pack(:side=>:bottom, :fill=>:both)
+
+  tick = proc{|aobj|
+    cnt = aobj.return_value + 5
+    label.text format("%d.%02d", *(cnt.divmod(100)))
+    cnt
+  }
+
+  timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
+
+=begin
+  TkButton.new(:text=>'Start') {
+    command proc{ timer.continue unless timer.running? }
+    pack(:side=>:left, :fill=>:both, :expand=>true)
+  }
+  TkButton.new(:text=>'Restart') {
+    command proc{ timer.restart(0, proc{ label.text('0.00'); 0 }) }
+    pack('side'=>'right','fill'=>'both','expand'=>'yes')
+  }
+  TkButton.new(:text=>'Stop') {
+    command proc{ timer.stop if timer.running? }
+    pack('side'=>'right','fill'=>'both','expand'=>'yes')
+  }
+=end
+  b_start = TkButton.new(:text=>'Start', :state=>:disabled) {
+    pack(:side=>:left, :fill=>:both, :expand=>true)
+  }
+  b_stop  = TkButton.new(:text=>'Stop', :state=>:normal) {
+    pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
+  }
+
+  b_start.command {
+    timer.continue
+    b_stop.state(:normal)
+    b_start.state(:disabled)
+  }
+
+  b_stop.command {
+    timer.stop
+    b_start.state(:normal)
+    b_stop.state(:disabled)
+  }
+
+  TkButton.new(:text=>'Reset', :state=>:normal) {
+    command { timer.reset }
+    pack('side'=>'right', 'fill'=>'both', 'expand'=>'yes')
+  }
+
+  ev_quit = TkVirtualEvent.new('Control-c', 'Control-q')
+  Tk.root.bind(ev_quit, proc{Tk.exit}).focus
+}
+
+# call on the default master interpreter
+trusted_slave.eval_proc(cmd, 'trusted')  # label -> .w00012
+safe_slave1.eval_proc(cmd, 'safe1')      # label -> .w00016
+safe_slave2.eval_proc(cmd, 'safe2')      # label -> .w00020
+cmd.call('master')                       # label -> .w00024
+
+#second_master = MultiTkIp.new(&cmd)
+
+TkTimer.new(2000, -1, proc{p ['safe1', safe_slave1.deleted?]}).start
+TkTimer.new(2000, -1, proc{p ['safe2', safe_slave2.deleted?]}).start
+TkTimer.new(2000, -1, proc{p ['trusted', trusted_slave.deleted?]}).start
+
+TkTimer.new(5000, 1, 
+            proc{
+              safe_slave1.eval_proc{Tk.root.destroy}
+              safe_slave1.delete
+              print "*** The safe_slave1 is deleted by the timer.\n"
+            }).start
+
+TkTimer.new(10000, 1, 
+            proc{
+              trusted_slave.eval_proc{Tk.root.destroy}
+              trusted_slave.delete
+              print "*** The trusted_slave is deleted by the timer.\n"
+            }).start
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/multi-ip_sample2.rb b/ruby_1_8_6/ext/tk/sample/multi-ip_sample2.rb
new file mode 100644
index 0000000000..f4a45d8d9a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/multi-ip_sample2.rb
@@ -0,0 +1,29 @@
+require 'multi-tk.rb'
+
+th = Thread.new{Tk.mainloop}
+
+TkLabel.new(:text=>'this is a primary master').pack
+
+ip1 = MultiTkIp.new_slave(:safe=>1)
+ip2 = MultiTkIp.new_slave(:safe=>2)
+
+cmd = proc{|s|
+  require 'tk'
+
+  TkButton.new(:text=>'b1: p self', :command=>proc{p self}).pack(:fill=>:x)
+  sleep s
+  TkButton.new(:text=>'b2: p $SAFE', :command=>proc{p $SAFE}).pack(:fill=>:x)
+  sleep s
+  TkButton.new(:text=>'b3: p MultiTkIp.ip_name', 
+               :command=>proc{p MultiTkIp.ip_name}).pack(:fill=>:x)
+  sleep s
+  TkButton.new(:text=>'EXIT', :command=>proc{exit}).pack(:fill=>:x)
+
+  Tk.mainloop
+}
+
+Thread.new{ip1.eval_proc(cmd, 1.1)}
+Thread.new{ip2.eval_proc(cmd, 0.3)}
+cmd.call(0.7)
+
+th.join
diff --git a/ruby_1_8_6/ext/tk/sample/optobj_sample.rb b/ruby_1_8_6/ext/tk/sample/optobj_sample.rb
new file mode 100644
index 0000000000..cafacbdd17
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/optobj_sample.rb
@@ -0,0 +1,67 @@
+#!/usr/bin/env ruby
+#
+#  sample script of Tk::OptionObj
+#
+require "tk"
+
+optobj = Tk::OptionObj.new('foreground'=>'red', 'background'=>'black')
+
+f = TkFrame.new.pack(:side=>:left, :anchor=>:n, :padx=>5, :pady=>30)
+
+b1 = TkButton.new(f, :text=>'AAA').pack(:fill=>:x)
+b2 = TkButton.new(f, :text=>'BBB').pack(:fill=>:x)
+b3 = TkButton.new(f, :text=>'CCC').pack(:fill=>:x)
+
+optobj.assign( b1, 
+              [ b2, 'configure', 
+                { 'foreground'=>'background', 
+                  'background'=>'foreground' } ], 
+              [ b3, nil, 
+                { 'foreground'=>'background', 
+                  'activeforeground'=>nil, 
+                  'background'=>['foreground', 'activeforeground'] } ] )
+
+optobj.update('activeforeground'=>'yellow')
+
+TkButton.new(f){
+  configure( optobj.assign(self) + {:text=>'DDD'} )
+  pack(:fill=>:x)
+}
+
+TkButton.new(f){
+  configure( optobj.assign([self, nil, 
+                             {'foreground'=>'activeforeground', 
+                              'background'=>'foreground', 
+                              'activeforeground'=>'background'}]) \
+             + {:text=>'EEE', :relief=>:groove, :borderwidth=>5} )
+  pack(:fill=>:x)
+}
+
+optobj.notify  # To apply the convert_key ( 3rd element of widget info 
+               # (that is, {'foreground'=>'activeforeground', ,,, } ) 
+               # of the 'EEE' button 
+
+TkButton.new(f, :text=>'toggle', 
+             :command=>proc{
+               fg = optobj['foreground']
+               bg = optobj['background']
+               optobj.configure('foreground'=>bg, 'background'=>fg)
+             }).pack(:fill=>:x, :pady=>10)
+
+TkButton.new(f, :text=>'exit', 
+                :command=>proc{exit}).pack(:fill=>:x, :pady=>10)
+
+TkFrame.new{|f|
+  pack(:side=>:right, :expand=>true, :fill=>:both)
+  TkLabel.new(f, :text=>'source::').pack(:anchor=>:w)
+  TkFrame.new(f){|ff|
+    TkText.new(ff){
+      yscrollbar(TkScrollbar.new(ff){pack(:fill=>:y, :side=>:right)})
+      insert('end', File.read(__FILE__))
+      pack(:side=>:left, :expand=>true, :fill=>:both)
+    }
+    pack(:expand=>true, :fill=>:both)
+  }
+}
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/propagate.rb b/ruby_1_8_6/ext/tk/sample/propagate.rb
new file mode 100644
index 0000000000..800cef553d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/propagate.rb
@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+require 'tk'
+
+TkLabel.new(:text=>"Please click the bottom frame").pack
+
+f = TkFrame.new(:width=>400, :height=>100, :background=>'yellow', 
+                :relief=>'ridge', :borderwidth=>5).pack
+
+# TkPack.propagate(f, false) # <== important!!
+f.pack_propagate(false)      # <== important!!
+
+list = (1..3).collect{|n|
+  TkButton.new(f, :text=>"button#{'-X'*n}"){
+    command proc{
+      puts "button#{'-X'*n}"
+      self.unpack
+    }
+  }
+}
+
+list.unshift(nil)
+
+f.bind('1', proc{
+         w = list.shift
+         w.unpack if w
+         list.push(w)
+         list[0].pack(:expand=>true, :anchor=>:center) if list[0]
+       })
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/remote-ip_sample.rb b/ruby_1_8_6/ext/tk/sample/remote-ip_sample.rb
new file mode 100644
index 0000000000..3696a20852
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/remote-ip_sample.rb
@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+require 'remote-tk'
+
+puts <<EOM
+This sample controls the other Tk interpreter (Ruby/Tk, Tcl/Tk, and so on)
+which running on the other process. For this purpose, Ruby/Tk uses Tcl/Tk's 
+'send' command. Availability of the command depends on your GUI environment. 
+If this script doesn't work, please check your environment (see Tcl/Tk FAQ).
+EOM
+#'
+
+unless (wish = TkWinfo.interps.find{|ip| ip =~ /^wish/})
+  puts ''
+  puts 'Please start "wish" (Tcl/Tk shell) before running this sample script.'
+  exit 1
+end
+
+ip = RemoteTkIp.new(wish)
+ip.eval_proc{TkButton.new(:command=>proc{puts 'This procesure is on the controller-ip (Ruby/Tk)'}, :text=>'print on Ruby/Tk (controller-ip)').pack(:fill=>:x)}
+ip.eval_proc{TkButton.new(:command=>'puts {This procesure is on the remote-ip (wish)}', :text=>'print on wish (remote-ip)').pack(:fill=>:x)}
+
+# If your remote-ip is Ruby/Tk, you can control the remote Ruby by 
+# 'ruby' or 'ruby_eval' or 'ruby_cmd' on the Tk interpreter. 
+if ip.is_rubytk?
+  ip.eval_proc{TkButton.new(:command=>'ruby {p 111; p Array.new(3,"ruby")}', :text=>'ruby cmd on the remote-ip').pack(:fill=>:x)}
+end
+
+ip.eval_proc{TkButton.new(:command=>'exit', :text=>'QUIT').pack(:fill=>:x)}
+
+TkButton.new(:command=>proc{exit}, :text=>'QUIT', 
+             :padx=>10, :pady=>7).pack(:padx=>10, :pady=>7)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/remote-ip_sample2.rb b/ruby_1_8_6/ext/tk/sample/remote-ip_sample2.rb
new file mode 100644
index 0000000000..e12b2a96c9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/remote-ip_sample2.rb
@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+
+require 'remote-tk'
+
+# start sub-process
+ip_name = 'remote_ip'
+ip_list = TkWinfo.interps
+fork{
+  exec "/usr/bin/env ruby -r tk -e \"Tk.appname('#{ip_name}');Tk.mainloop\""
+}
+sleep 1 until (app = (TkWinfo.interps - ip_list)[0]) && app =~ /^#{ip_name}/
+p TkWinfo.interps
+
+# create RemoteTkIp object
+ip = RemoteTkIp.new(app)
+
+# setup remote-ip window
+btns = []
+ip.eval_proc{
+  btns << 
+    TkButton.new(:command=>proc{
+                   puts 'This procesure is on the controller-ip (Ruby-side)'
+                 }, 
+                 :text=>'print on controller-ip (Ruby-side)').pack(:fill=>:x)
+
+  btns << 
+    TkButton.new(:command=>
+                   'puts {This procesure is on the remote-ip (Tk-side)}',
+                 :text=>'print on remote-ip (Tk-side)').pack(:fill=>:x)
+
+  btns << 
+    TkButton.new(:command=>
+                   'ruby {
+                     puts "This procedure is on the remote-ip (Ruby-side)"
+                     p Array.new(3,"ruby")
+                    }', 
+                 :text=>'ruby cmd on the remote-ip').pack(:fill=>:x)
+
+  TkButton.new(:command=>'exit', :text=>'QUIT').pack(:fill=>:x)
+}
+
+# setup controller-ip window
+btns.each_with_index{|btn, idx|
+  # The scope of the eval-block of 'eval_proc' method is different from 
+  # the enternal. If you want to pass local values to the eval-block, 
+  # use arguments of eval_proc method. They are passed to block-arguments.
+  TkButton.new(:command=>proc{ip.eval_proc(btn){|b| b.flash}}, 
+               :text=>"flash button-#{idx}", 
+               :padx=>10).pack(:padx=>10, :pady=>2)
+}
+
+TkButton.new(:command=>proc{exit}, :text=>'QUIT', 
+             :padx=>10, :pady=>7).pack(:padx=>10, :pady=>7)
+
+# start eventloop
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/resource.en b/ruby_1_8_6/ext/tk/sample/resource.en
new file mode 100644
index 0000000000..39b4013971
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/resource.en
@@ -0,0 +1,13 @@
+!
+!  see Tcl/Tk's "options" manual for "Database Name" and "Database Class"
+!
+*BtnFrame.borderWidth: 5
+*BtnFrame.relief: ridge
+*BtnFrame.Button.background: wheat
+*BtnFrame.Button.foreground: red
+*hello.text: HELLO
+*quit.text: QUIT
+*BTN_CMD.show_msg: {|arg| print "($SAFE=#{$SAFE}) ";\
+                          print "Hello!! This is a sample of #{arg}.";\
+                          print "(<<< $SAFE=#{$SAFE})\n"}
+*BTN_CMD.bye_msg:  {print "($SAFE=#{$SAFE} >>>) Good-bye．(<<< $SAFE=#{$SAFE})\n"}
diff --git a/ruby_1_8_6/ext/tk/sample/resource.ja b/ruby_1_8_6/ext/tk/sample/resource.ja
new file mode 100644
index 0000000000..a61390f95d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/resource.ja
@@ -0,0 +1,13 @@
+!
+!  see Tcl/Tk's "options" manual for "Database Name" and "Database Class"
+!
+*BtnFrame.borderWidth: 5
+*BtnFrame.relief: ridge
+*BtnFrame.Button.background: wheat
+*BtnFrame.Button.foreground: red
+*hello.text: こんにちは
+*quit.text: 終了
+*BTN_CMD.show_msg: {|arg| print "($SAFE=#{$SAFE} >>>) ";\
+                          print "こんにちは！！ #{arg} のサンプルです．";\
+                          print "(<<< $SAFE=#{$SAFE})\n"}
+*BTN_CMD.bye_msg:  {print "($SAFE=#{$SAFE} >>>) さようなら．(<<< $SAFE=#{$SAFE})\n"}
diff --git a/ruby_1_8_6/ext/tk/sample/safe-tk.rb b/ruby_1_8_6/ext/tk/sample/safe-tk.rb
new file mode 100644
index 0000000000..e2289697e0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/safe-tk.rb
@@ -0,0 +1,115 @@
+#!/usr/bin/env ruby
+# This script is a sample of MultiTkIp class
+
+require "multi-tk"
+
+###############################
+
+TkLabel.new(:text=>'This is the Default Master Ipnterpreter').pack(:padx=>5, :pady=>3)
+TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack(:pady=>3)
+TkFrame.new(:borderwidth=>2, :height=>3, 
+            :relief=>:sunken).pack(:fill=>:x, :expand=>true,
+                                   :padx=>10, :pady=>7)
+
+###############################
+
+puts "---- create a safe slave IP with Ruby's safe-level == 1 ----------"
+ip = MultiTkIp.new_safe_slave(1)
+
+puts "\n---- create procs ----------"
+puts 'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}'
+x = proc{p ['proc x', "$SAFE==#{$SAFE}"]; exit}
+TkLabel.new(:text=>'x = proc{p [\'proc x\', "$SAFE==#{$SAFE}"]; exit}', 
+            :anchor=>:w).pack(:fill=>:x)
+
+puts 'y = proc{|label| p [\'proc y\', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}'
+y = proc{|label| p ['proc y', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}
+TkLabel.new(:text=>'y = proc{|label| p [\'proc y\', "$SAFE==#{$SAFE}", label]; label.text($SAFE)}', 
+            :anchor=>:w).pack(:fill=>:x)
+
+puts 'z = proc{p [\'proc z\', "$SAFE==#{$SAFE}"]; exit}'
+z = proc{p ['proc z', "$SAFE==#{$SAFE}"]; exit}
+TkLabel.new(:text=>'z = proc{p [\'proc z\', "$SAFE==#{$SAFE}"]; exit}', 
+            :anchor=>:w).pack(:fill=>:x)
+
+puts "\n---- call 1st eval_proc ----------"
+print 'lbl = '
+p lbl = ip.eval_proc{
+  TkLabel.new(:text=>"1st eval_proc : $SAFE == #{$SAFE}").pack
+
+  f = TkFrame.new.pack
+  TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
+  # TkLabel.new(f, :text=>" (<-- 'lbl' widget is here)").pack(:side=>:right)
+  l = TkLabel.new(f).pack(:side=>:right)
+
+  TkButton.new(:text=>':command=>proc{l.text($SAFE)}', 
+               :command=>proc{l.text($SAFE)}).pack(:fill=>:x, :padx=>5)
+  TkButton.new(:text=>':command=>x', :command=>x).pack(:fill=>:x, :padx=>5)
+  TkButton.new(:text=>':command=>proc{exit}', 
+               :command=>proc{exit}).pack(:fill=>:x, :padx=>5)
+  TkFrame.new(:borderwidth=>2, :height=>3, 
+              :relief=>:sunken).pack(:fill=>:x, :expand=>true,
+                                     :padx=>10, :pady=>7)
+  l # return the label widget
+}
+
+puts "\n---- change the safe slave IP's safe-level ==> 3 ----------"
+ip.safe_level = 3
+
+puts "\n---- call 2nd eval_proc ----------"
+p ip.eval_proc(proc{
+                 TkLabel.new(:text=>"2nd eval_proc : $SAFE == #{$SAFE}").pack
+                 f = TkFrame.new.pack
+                 TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
+                 l = TkLabel.new(f, :text=>$SAFE).pack(:side=>:right)
+                 TkButton.new(:text=>':command=>proc{l.text($SAFE)}', 
+                              :command=>proc{l.text($SAFE)}).pack(:fill=>:x, 
+                                                                  :padx=>5)
+                 TkButton.new(:text=>':command=>proc{y.call(l)}', 
+                              :command=>proc{y.call(l)}).pack(:fill=>:x, 
+                                                              :padx=>5)
+                 TkButton.new(:text=>':command=>proc{Thread.new(l, &y).value}',
+                              :command=>proc{
+                                Thread.new(l, &y).value
+                              }).pack(:fill=>:x, :padx=>5)
+                 TkButton.new(:text=>':command=>proc{z.call}', 
+                              :command=>proc{z.call}).pack(:fill=>:x, :padx=>5)
+                 TkFrame.new(:borderwidth=>2, :height=>3, 
+                             :relief=>:sunken).pack(:fill=>:x, :expand=>true,
+                                                    :padx=>10, :pady=>7)
+               })
+
+puts "\n---- call 1st and 2nd eval_str ----------"
+p bind = ip.eval_str('
+  TkLabel.new(:text=>"1st and 2nd eval_str : $SAFE == #{$SAFE}").pack
+  f = TkFrame.new.pack
+  TkLabel.new(f, :text=>"$SAFE == ").pack(:side=>:left)
+  l = TkLabel.new(f, :text=>$SAFE).pack(:side=>:right)
+  TkButton.new(:text=>":command=>proc{y.call(l)}", 
+               :command=>proc{y.call(l)}).pack(:fill=>:x, :padx=>5)
+  binding
+', binding)
+
+p ip.eval_str("
+  TkButton.new(:text=>':command=>proc{ l.text = $SAFE }', 
+               :command=>proc{ l.text = $SAFE }).pack(:fill=>:x, :padx=>5)
+  TkFrame.new(:borderwidth=>2, :height=>3, 
+              :relief=>:sunken).pack(:fill=>:x, :expand=>true,
+                                     :padx=>10, :pady=>7)
+", bind)
+
+puts "\n---- change the safe slave IP's safe-level ==> 4 ----------"
+ip.safe_level = 4
+
+puts "\n---- call 3rd and 4th eval_proc ----------"
+p ip.eval_proc{
+  TkLabel.new(:text=>"3rd and 4th eval_proc : $SAFE == #{$SAFE}").pack
+}
+p ip.eval_proc{
+  TkButton.new(:text=>':command=>proc{ lbl.text = $SAFE }', 
+               :command=>proc{ lbl.text = $SAFE }).pack(:fill=>:x, :padx=>5)
+}
+
+puts "\n---- start event-loop ( current $SAFE == #{$SAFE} ) ----------"
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/scrollframe.rb b/ruby_1_8_6/ext/tk/sample/scrollframe.rb
new file mode 100644
index 0000000000..b0ac6d3874
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/scrollframe.rb
@@ -0,0 +1,237 @@
+#
+#  Tk::ScrollFrame class
+#
+#    This widget class is a frame widget with scrollbars.
+#    The ScrollFrame doesn't propagate the size of embedded widgets.
+#    When it is configured, scrollregion of the container is changed.
+#
+#    Scrollbars can be toggled by Tk::ScrollFrame#vscroll & hscroll.
+#    If horizontal or virtical scrollbar is turned off, the horizontal 
+#    or virtical size of embedded widgets is propagated.
+#
+#                         Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+class Tk::ScrollFrame < TkFrame
+  include TkComposite
+
+  DEFAULT_WIDTH  = 200
+  DEFAULT_HEIGHT = 200
+
+  def initialize_composite(keys={})
+    @frame.configure(:width=>DEFAULT_WIDTH, :height=>DEFAULT_HEIGHT)
+
+    # create scrollbars
+    @h_scroll = TkScrollbar.new(@frame, 'orient'=>'horizontal')
+    @v_scroll = TkScrollbar.new(@frame, 'orient'=>'vertical')
+
+    # create a canvas widget
+    @canvas = TkCanvas.new(@frame, 
+                           :borderwidth=>0, :selectborderwidth=>0, 
+                           :highlightthickness=>0)
+
+    # allignment
+    TkGrid.rowconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
+    TkGrid.columnconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
+    @canvas.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
+    @frame.grid_propagate(false)
+
+    # assign scrollbars
+    @canvas.xscrollbar(@h_scroll)
+    @canvas.yscrollbar(@v_scroll)
+
+    # convert hash keys
+    keys = _symbolkey2str(keys)
+
+    # check options for the frame
+    framekeys = {}
+    if keys.key?('classname')
+       keys['class'] = keys.delete('classname')
+    end
+    if @classname = keys.delete('class')
+      framekeys['class'] = @classname
+    end
+    if @colormap  = keys.delete('colormap')
+      framekeys['colormap'] = @colormap
+    end
+    if @container = keys.delete('container')
+      framekeys['container'] = @container
+    end
+    if @visual    = keys.delete('visual')
+      framekeys['visual'] = @visual
+    end
+    if @classname.kind_of? TkBindTag
+      @db_class = @classname
+      @classname = @classname.id
+    elsif @classname
+      @db_class = TkDatabaseClass.new(@classname)
+    else
+      @db_class = self.class
+      @classname = @db_class::WidgetClassName
+    end
+
+    # create base frame
+    @base = TkFrame.new(@canvas, framekeys)
+
+    # embed base frame
+    @cwin = TkcWindow.new(@canvas, [0, 0], :window=>@base, :anchor=>'nw')
+    @canvas.scrollregion(@cwin.bbox)
+
+    # binding to reset scrollregion
+    @base.bind('Configure'){ _reset_scrollregion(nil, nil) }
+
+    # set default receiver of method calls
+    @path = @base.path
+
+    # scrollbars ON
+    vscroll(keys.delete('vscroll'){true})
+    hscroll(keys.delete('hscroll'){true})
+
+    # please check the differences of the following definitions
+    option_methods(
+      :scrollbarwidth
+    )
+
+    # set receiver widgets for configure methods (with alias)
+    delegate_alias('scrollbarrelief', 'relief', @h_scroll, @v_scroll)
+
+    # set receiver widgets for configure methods
+    delegate('DEFAULT', @base)
+    delegate('background', @frame, @base, @canvas, @h_scroll, @v_scroll)
+    delegate('width', @frame)
+    delegate('height', @frame)
+    delegate('activebackground', @h_scroll, @v_scroll)
+    delegate('troughcolor', @h_scroll, @v_scroll)
+    delegate('repeatdelay', @h_scroll, @v_scroll)
+    delegate('repeatinterval', @h_scroll, @v_scroll)
+    delegate('borderwidth', @frame)
+    delegate('relief', @frame)
+
+    # do configure
+    configure keys unless keys.empty?
+  end
+
+  # callback for Configure event
+  def _reset_scrollregion(h_mod=nil, v_mod=nil)
+    cx1, cy1, cx2, cy2 = @canvas.scrollregion
+    x1, y1, x2, y2 = @cwin.bbox
+    @canvas.scrollregion([x1, y1, x2, y2])
+
+    if h_mod.nil? && v_mod.nil?
+      if x2 != cx2 && TkGrid.info(@h_scroll).size == 0
+        @frame.grid_propagate(true)
+        @canvas.width  = x2
+        Tk.update_idletasks
+        @frame.grid_propagate(false)
+      end
+      if y2 != cy2 && TkGrid.info(@v_scroll).size == 0
+        @frame.grid_propagate(true)
+        @canvas.height = y2
+        Tk.update_idletasks
+        @frame.grid_propagate(false)
+      end
+    else
+      @h_scroll.ungrid if h_mod == false
+      @v_scroll.ungrid if v_mod == false
+
+      h_flag = (TkGrid.info(@h_scroll).size == 0)
+      v_flag = (TkGrid.info(@v_scroll).size == 0)
+
+      @frame.grid_propagate(true)
+
+      @canvas.width  = (h_flag)? x2: @canvas.winfo_width
+      @canvas.height = (v_flag)? y2: @canvas.winfo_height
+
+      @h_scroll.grid('row'=>1, 'column'=>0, 'sticky'=>'ew') if h_mod
+      @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns') if v_mod
+
+      Tk.update_idletasks
+
+      @frame.grid_propagate(false)
+    end
+  end
+  private :_reset_scrollregion
+
+  # forbid to change binding of @base frame
+  def bind(*args)
+    @frame.bind(*args)
+  end
+  def bind_append(*args)
+    @frame.bind_append(*args)
+  end
+  def bind_remove(*args)
+    @frame.bind_remove(*args)
+  end
+  def bindinfo(*args)
+    @frame.bindinfo(*args)
+  end
+
+  # set width of scrollbar
+  def scrollbarwidth(width = nil)
+    if width
+      @h_scroll.width(width)
+      @v_scroll.width(width)
+    else
+      @h_scroll.width
+    end
+  end
+
+  # vertical scrollbar : ON/OFF
+  def vscroll(mode)
+    Tk.update_idletasks
+    st = TkGrid.info(@v_scroll)
+    if mode && st.size == 0 then
+      @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns')
+      _reset_scrollregion(nil, true)
+    elsif !mode && st.size != 0 then
+      _reset_scrollregion(nil, false)
+    else
+      _reset_scrollregion(nil, nil)
+    end
+    self
+  end
+
+  # horizontal scrollbar : ON/OFF
+  def hscroll(mode)
+    Tk.update_idletasks
+    st = TkGrid.info(@h_scroll)
+    if mode && st.size == 0 then
+      _reset_scrollregion(true, nil)
+    elsif !mode && st.size != 0 then
+      _reset_scrollregion(false, nil)
+    else
+      _reset_scrollregion(nil, nil)
+    end
+    self
+  end
+end
+
+# test
+if __FILE__ == $0
+  f = Tk::ScrollFrame.new(:scrollbarwidth=>10, :width=>300, :height=>200)
+  f.pack(:expand=>true, :fill=>:both)
+
+  TkButton.new(f, :text=>'foo button', :command=>proc{puts 'foo'}).pack
+  TkButton.new(f, :text=>'baaar button', :command=>proc{puts 'baaar'}).pack
+  TkButton.new(f, :text=>'baz button', :command=>proc{puts 'baz'}).pack
+  TkButton.new(f, :text=>'hoge hoge button', 
+               :command=>proc{puts 'hoge hoge'}).pack(:side=>:bottom)
+
+  # f.hscroll(false)
+
+  Tk.after(3000){
+    t = TkText.new(f).pack(:expand=>true, :fill=>:both)
+    t.insert(:end, 'Here is a text widget')
+  }
+
+  Tk.after(6000){ f.vscroll(false) }
+
+  Tk.after(9000){ f.vscroll(true) }
+
+  Tk.after(12000){ f.hscroll(false) }
+
+  Tk.after(15000){ f.hscroll(true) }
+
+  Tk.mainloop
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tcltklib/batsu.gif b/ruby_1_8_6/ext/tk/sample/tcltklib/batsu.gif
new file mode 100644
index 0000000000..880cc73e09
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tcltklib/batsu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tcltklib/lines0.tcl b/ruby_1_8_6/ext/tk/sample/tcltklib/lines0.tcl
new file mode 100644
index 0000000000..8ed3c5e1c1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tcltklib/lines0.tcl
@@ -0,0 +1,42 @@
+#! /usr/local/bin/wish
+
+proc drawlines {} {
+    puts [clock format [clock seconds]]
+
+    for {set j 0} {$j < 100} {incr j} {
+	puts -nonewline "*"
+	flush stdout
+	if {$j & 1} {
+	    set c "blue"
+	} {
+	    set c "red"
+	}
+	for {set i 0} {$i < 100} {incr i} {
+#	    .a create line $i 0 0 [expr 500 - $i] -fill $c
+	}
+    }
+
+    puts [clock format [clock seconds]]
+
+    for {set j 0} {$j < 100} {incr j} {
+	puts -nonewline "*"
+	flush stdout
+	if {$j & 1} {
+	    set c "blue"
+	} {
+	    set c "red"
+	}
+	for {set i 0} {$i < 100} {incr i} {
+	    .a create line $i 0 0 [expr 500 - $i] -fill $c
+	}
+    }
+
+    puts [clock format [clock seconds]]
+#    destroy .
+}
+
+canvas .a -height 500 -width 500
+button .b -text draw -command drawlines
+pack .a .b -side left
+
+# eof
diff --git a/ruby_1_8_6/ext/tk/sample/tcltklib/lines1.rb b/ruby_1_8_6/ext/tk/sample/tcltklib/lines1.rb
new file mode 100644
index 0000000000..9f21ae6377
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tcltklib/lines1.rb
@@ -0,0 +1,50 @@
+#! /usr/local/bin/ruby
+
+require "tcltk"
+
+def drawlines()
+  print Time.now, "\n"
+
+  for j in 0 .. 99
+    print "*"
+    $stdout.flush
+    if (j & 1) != 0
+      col = "blue"
+    else
+      col = "red"
+    end
+    for i in 0 .. 99
+#      $a.e("create line", i, 0, 0, 500 - i, "-fill", col)
+    end
+  end
+
+  print Time.now, "\n"
+
+  for j in 0 .. 99
+    print "*"
+    $stdout.flush
+    if (j & 1) != 0
+      col = "blue"
+    else
+      col = "red"
+    end
+    for i in 0 .. 99
+      $a.e("create line", i, 0, 0, 500 - i, "-fill", col)
+    end
+  end
+
+  print Time.now, "\n"
+#  $ip.commands()["destroy"].e($root)
+end
+
+$ip = TclTkInterpreter.new()
+$root = $ip.rootwidget()
+$a = TclTkWidget.new($ip, $root, "canvas", "-height 500 -width 500")
+$c = TclTkCallback.new($ip, proc{drawlines()})
+$b = TclTkWidget.new($ip, $root, "button", "-text draw -command", $c)
+
+$ip.commands()["pack"].e($a, $b, "-side left")
+
+TclTk.mainloop
+
+# eof
diff --git a/ruby_1_8_6/ext/tk/sample/tcltklib/lines2.rb b/ruby_1_8_6/ext/tk/sample/tcltklib/lines2.rb
new file mode 100644
index 0000000000..e459589f50
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tcltklib/lines2.rb
@@ -0,0 +1,54 @@
+#! /usr/local/bin/ruby
+
+require "tk"
+
+def drawlines()
+  print Time.now, "\n"
+
+  for j in 0 .. 99
+    print "*"
+    $stdout.flush
+    if (j & 1) != 0
+      col = "blue"
+    else
+      col = "red"
+    end
+    for i in 0 .. 99
+#      TkcLine.new($a, i, 0, 0, 500 - i, "-fill", col)
+    end
+  end
+
+  print Time.now, "\n"
+
+  for j in 0 .. 99
+    print "*"
+    $stdout.flush
+    if (j & 1) != 0
+      col = "blue"
+    else
+      col = "red"
+    end
+    for i in 0 .. 99
+      TkcLine.new($a, i, 0, 0, 500 - i, "-fill", col)
+    end
+  end
+
+  print Time.now, "\n"
+#  Tk.root.destroy
+end
+
+$a = TkCanvas.new{
+  height(500)
+  width(500)
+}
+
+$b = TkButton.new{
+  text("draw")
+  command(proc{drawlines()})
+}
+
+TkPack.configure($a, $b, {"side"=>"left"})
+
+Tk.mainloop
+
+# eof
diff --git a/ruby_1_8_6/ext/tk/sample/tcltklib/lines3.rb b/ruby_1_8_6/ext/tk/sample/tcltklib/lines3.rb
new file mode 100644
index 0000000000..caa50f92e7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tcltklib/lines3.rb
@@ -0,0 +1,54 @@
+#! /usr/local/bin/ruby
+
+require "tk"
+
+def drawlines()
+  print Time.now, "\n"
+
+  for j in 0 .. 99
+    print "*"
+    $stdout.flush
+    if (j & 1) != 0
+      col = "blue"
+    else
+      col = "red"
+    end
+    for i in 0 .. 99
+#      $a.create(TkcLine, i, 0, 0, 500 - i, "fill"=>col)
+    end
+  end
+
+  print Time.now, "\n"
+
+  for j in 0 .. 99
+    print "*"
+    $stdout.flush
+    if (j & 1) != 0
+      col = "blue"
+    else
+      col = "red"
+    end
+    for i in 0 .. 99
+      $a.create(TkcLine, i, 0, 0, 500 - i, "fill"=>col)
+    end
+  end
+
+  print Time.now, "\n"
+#  Tk.root.destroy
+end
+
+$a = TkCanvas.new{
+  height(500)
+  width(500)
+}
+
+$b = TkButton.new{
+  text("draw")
+  command(proc{drawlines()})
+}
+
+TkPack.configure($a, $b, {"side"=>"left"})
+
+Tk.mainloop
+
+# eof
diff --git a/ruby_1_8_6/ext/tk/sample/tcltklib/lines4.rb b/ruby_1_8_6/ext/tk/sample/tcltklib/lines4.rb
new file mode 100644
index 0000000000..7a1175bce0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tcltklib/lines4.rb
@@ -0,0 +1,54 @@
+#! /usr/local/bin/ruby
+
+require "tk"
+
+def drawlines()
+  print Time.now, "\n"
+
+  for j in 0 .. 99
+    print "*"
+    $stdout.flush
+    if (j & 1) != 0
+      col = "blue"
+    else
+      col = "red"
+    end
+    for i in 0 .. 99
+#      TkCore::INTERP.__invoke($a.path, "create", "line", i.to_s, '0', '0', (500 - i).to_s, "-fill", col)
+    end
+  end
+
+  print Time.now, "\n"
+
+  for j in 0 .. 99
+    print "*"
+    $stdout.flush
+    if (j & 1) != 0
+      col = "blue"
+    else
+      col = "red"
+    end
+    for i in 0 .. 99
+      TkCore::INTERP.__invoke($a.path, "create", "line", i.to_s, '0', '0', (500 - i).to_s, "-fill", col)
+    end
+  end
+
+  print Time.now, "\n"
+#  Tk.root.destroy
+end
+
+$a = TkCanvas.new{
+  height(500)
+  width(500)
+}
+
+$b = TkButton.new{
+  text("draw")
+  command(proc{drawlines()})
+}
+
+TkPack.configure($a, $b, {"side"=>"left"})
+
+Tk.mainloop
+
+# eof
diff --git a/ruby_1_8_6/ext/tk/sample/tcltklib/maru.gif b/ruby_1_8_6/ext/tk/sample/tcltklib/maru.gif
new file mode 100644
index 0000000000..2c0202892e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tcltklib/maru.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tcltklib/safeTk.rb b/ruby_1_8_6/ext/tk/sample/tcltklib/safeTk.rb
new file mode 100644
index 0000000000..5d2c60e700
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tcltklib/safeTk.rb
@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+require 'tcltklib'
+
+master = TclTkIp.new
+slave_name = 'slave0'
+slave = master.create_slave(slave_name, true)
+master._eval("::safe::interpInit #{slave_name}")
+master._eval("::safe::loadTk #{slave_name}")
+
+master._invoke('label', '.l1', '-text', 'master')
+master._invoke('pack', '.l1', '-padx', '30', '-pady', '50')
+master._eval('label .l2 -text {root widget of master-ip}')
+master._eval('pack .l2 -padx 30 -pady 50')
+
+slave._invoke('label', '.l1', '-text', 'slave')
+slave._invoke('pack', '.l1', '-padx', '30', '-pady', '50')
+slave._eval('label .l2 -text {root widget of slave-ip}')
+slave._eval('pack .l2 -padx 30 -pady 20')
+slave._eval('label .l3 -text {( container frame widget of master-ip )}')
+slave._eval('pack .l3 -padx 30 -pady 20')
+
+TclTkLib.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tcltklib/sample0.rb b/ruby_1_8_6/ext/tk/sample/tcltklib/sample0.rb
new file mode 100644
index 0000000000..cd4c8069b4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tcltklib/sample0.rb
@@ -0,0 +1,39 @@
+#! /usr/local/bin/ruby -vd
+
+# tcltklib ライブラリのテスト
+
+require "tcltklib"
+
+def test
+  # インタプリタを生成する
+  ip1 = TclTkIp.new()
+
+  # 評価してみる
+  print ip1._return_value().inspect, "\n"
+  print ip1._eval("puts {abc}").inspect, "\n"
+
+  # ボタンを作ってみる
+  print ip1._return_value().inspect, "\n"
+  print ip1._eval("button .lab -text exit -command \"destroy .\"").inspect,
+    "\n"
+  print ip1._return_value().inspect, "\n"
+  print ip1._eval("pack .lab").inspect, "\n"
+  print ip1._return_value().inspect, "\n"
+
+  # インタプリタから ruby コマンドを評価してみる
+#  print ip1._eval(%q/ruby {print "print by ruby\n"}/).inspect, "\n"
+  print ip1._eval(%q+puts [ruby {print "print by ruby\n"; "puts by tcl/tk"}]+).inspect, "\n"
+  print ip1._return_value().inspect, "\n"
+
+  # もう一つインタプリタを生成してみる
+  ip2 = TclTkIp.new()
+  ip2._eval("button .lab -text test -command \"puts test ; destroy .\"")
+  ip2._eval("pack .lab")
+
+  TclTkLib.mainloop
+end
+
+test
+GC.start
+
+print "exit\n"
diff --git a/ruby_1_8_6/ext/tk/sample/tcltklib/sample1.rb b/ruby_1_8_6/ext/tk/sample/tcltklib/sample1.rb
new file mode 100644
index 0000000000..13df440751
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tcltklib/sample1.rb
@@ -0,0 +1,634 @@
+#! /usr/local/bin/ruby -d
+#! /usr/local/bin/ruby
+# -d オプションを付けると, デバッグ情報を表示する.
+
+# tcltk ライブラリのサンプル
+
+# まず, ライブラリを require する.
+require "tcltk"
+
+# 以下は, Test1 のインスタンスの initialize() で,
+# tcl/tk に関する処理を行う例である.
+# 必ずしもそのようにする必要は無く,
+# (もし, そうしたければ) class の外で tcl/tk に関する処理を行っても良い.
+
+class Test1
+  # 初期化(インタプリタを生成してウィジェットを生成する).
+  def initialize()
+
+    #### 使う前のおまじない
+
+    # インタプリタの生成.
+    ip = TclTkInterpreter.new()
+    # コマンドに対応するオブジェクトを c に設定しておく.
+    c = ip.commands()
+    # 使用するコマンドに対応するオブジェクトは変数に入れておく.
+    append, bind, button, destroy, incr, info, label, place, set, wm =
+      c.values_at(
+      "append", "bind", "button", "destroy", "incr", "info", "label", "place",
+      "set", "wm")
+
+    #### tcl/tk のコマンドに対応するオブジェクト(TclTkCommand)の操作
+
+    # 実行する時は, e() メソッドを使う.
+    # (以下は, tcl/tk における info command r* を実行.)
+    print info.e("command", "r*"), "\n"
+    # 引数は, まとめた文字列にしても同じ.
+    print info.e("command r*"), "\n"
+    # 変数を用いなくとも実行できるが, 見ためが悪い.
+    print c["info"].e("command", "r*"), "\n"
+    # インタプリタのメソッドとしても実行できるが, 効率が悪い.
+    print ip.info("command", "r*"), "\n"
+
+    ####
+
+    # 以下, 生成したオブジェクトは変数に代入しておかないと
+    # GC の対象になってしまう.
+
+    #### tcl/tk の変数に対応するオブジェクト(TclTkVariable)の操作
+
+    # 生成と同時に値を設定する.
+    v1 = TclTkVariable.new(ip, "20")
+    # 読み出しは get メソッドを使う.
+    print v1.get(), "\n"
+    # 設定は set メソッドを使う.
+    v1.set(40)
+    print v1.get(), "\n"
+    # set コマンドを使って読み出し, 設定は可能だが見ためが悪い.
+    # e() メソッド等の引数に直接 TclTkObject や数値を書いても良い.
+    set.e(v1, 30)
+    print set.e(v1), "\n"
+    # tcl/tk のコマンドで変数を操作できる.
+    incr.e(v1)
+    print v1.get(), "\n"
+    append.e(v1, 10)
+    print v1.get(), "\n"
+
+    #### tcl/tk のウィジェットに対応するオブジェクト(TclTkWidget)の操作
+
+    # ルートウィジェットを取り出す.
+    root = ip.rootwidget()
+    # ウィジェットの操作.
+    root.e("configure -height 300 -width 300")
+    # タイトルを付けるときは wm を使う.
+    wm.e("title", root, $0)
+    # 親ウィジェットとコマンドを指定して, ウィジェットを作る.
+    l1 = TclTkWidget.new(ip, root, label, "-text {type `x' to print}")
+    # place すると表示される.
+    place.e(l1, "-x 0 -rely 0.0 -relwidth 1 -relheight 0.1")
+    # コマンド名は文字列で指定しても良いが, 見ためが悪い.
+    # (コマンド名は独立した引数でなければならない.)
+    l2 = TclTkWidget.new(ip, root, "label")
+    # ウィジェットの操作.
+    l2.e("configure -text {type `q' to exit}")
+    place.e(l2, "-x 0 -rely 0.1 -relwidth 1 -relheight 0.1")
+
+    #### tcl/tk のコールバックに対応するオブジェクト(TclTkCallback)の操作
+
+    # コールバックを生成する.
+    c1 = TclTkCallback.new(ip, proc{sample(ip, root)})
+    # コールバックを持つウィジェットを生成する.
+    b1 = TclTkWidget.new(ip, root, button, "-text sample -command", c1)
+    place.e(b1, "-x 0 -rely 0.2 -relwidth 1 -relheight 0.1")
+    # イベントループを抜けるには destroy.e(root) する.
+    c2 = TclTkCallback.new(ip, proc{destroy.e(root)})
+    b2 = TclTkWidget.new(ip, root, button, "-text exit -command", c2)
+    place.e(b2, "-x 0 -rely 0.3 -relwidth 1 -relheight 0.1")
+
+    #### イベントのバインド
+    # script の追加 (bind tag sequence +script) は今のところできない.
+    # (イテレータ変数の設定がうまくいかない.)
+
+    # 基本的にはウィジェットに対するコールバックと同じ.
+    c3 = TclTkCallback.new(ip, proc{print("q pressed\n"); destroy.e(root)})
+    bind.e(root, "q", c3)
+    # bind コマンドで % 置換によりパラメータを受け取りたいときは,
+    # proc{} の後ろに文字列で指定すると,
+    # 置換結果をイテレータ変数を通して受け取ることができる.
+    # ただし proc{} の後ろの文字列は,
+    # bind コマンドに与えるコールバック以外で指定してはいけない.
+    c4 = TclTkCallback.new(ip, proc{|i| print("#{i} pressed\n")}, "%A")
+    bind.e(root, "x", c4)
+    # TclTkCallback を GC の対象にしたければ,
+    # dcb() (または deletecallbackkeys()) する必要がある.
+    cb = [c1, c2, c3, c4]
+    c5 = TclTkCallback.new(ip, proc{|w| TclTk.dcb(cb, root, w)}, "%W")
+    bind.e(root, "<Destroy>", c5)
+    cb.push(c5)
+
+    #### tcl/tk のイメージに対応するオブジェクト(TclTkImage)の操作
+
+    # データを指定して生成する.
+    i1 = TclTkImage.new(ip, "photo", "-file maru.gif")
+    # ラベルに張り付けてみる.
+    l3 = TclTkWidget.new(ip, root, label, "-relief raised -image", i1)
+    place.e(l3, "-x 0 -rely 0.4 -relwidth 0.2 -relheight 0.2")
+    # 空のイメージを生成して後で操作する.
+    i2 = TclTkImage.new(ip, "photo")
+    # イメージを操作する.
+    i2.e("copy", i1)
+    i2.e("configure -gamma 0.5")
+    l4 = TclTkWidget.new(ip, root, label, "-relief raised -image", i2)
+    place.e(l4, "-relx 0.2 -rely 0.4 -relwidth 0.2 -relheight 0.2")
+
+    ####
+  end
+
+  # サンプルのためのウィジェットを生成する.
+  def sample(ip, parent)
+    bind, button, destroy, grid, toplevel, wm = ip.commands().values_at(
+      "bind", "button", "destroy", "grid", "toplevel", "wm")
+
+    ## toplevel
+
+    # 新しいウインドウを開くには, toplevel を使う.
+    t1 = TclTkWidget.new(ip, parent, toplevel)
+    # タイトルを付けておく
+    wm.e("title", t1, "sample")
+
+    # ウィジェットが破壊されたとき, コールバックが GC の対象になるようにする.
+    cb = []
+    cb.push(c = TclTkCallback.new(ip, proc{|w| TclTk.dcb(cb, t1, w)}, "%W"))
+    bind.e(t1, "<Destroy>", c)
+
+    # ボタンの生成.
+    wid = []
+    # toplevel ウィジェットを破壊するには destroy する.
+    cb.push(c = TclTkCallback.new(ip, proc{destroy.e(t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text close -command", c))
+    cb.push(c = TclTkCallback.new(ip, proc{test_label(ip, t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text label -command", c))
+    cb.push(c = TclTkCallback.new(ip, proc{test_button(ip, t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text button -command", c))
+    cb.push(c = TclTkCallback.new(ip, proc{test_checkbutton(ip, t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text checkbutton -command", c))
+    cb.push(c = TclTkCallback.new(ip, proc{test_radiobutton(ip, t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text radiobutton -command", c))
+    cb.push(c = TclTkCallback.new(ip, proc{test_scale(ip, t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text scale -command", c))
+    cb.push(c = TclTkCallback.new(ip, proc{test_entry(ip, t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text entry -command", c))
+    cb.push(c = TclTkCallback.new(ip, proc{test_text(ip, t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text text -command", c))
+    cb.push(c = TclTkCallback.new(ip, proc{test_raise(ip, t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text raise/lower -command", c))
+    cb.push(c = TclTkCallback.new(ip, proc{test_modal(ip, t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text message/modal -command",
+      c))
+    cb.push(c = TclTkCallback.new(ip, proc{test_menu(ip, t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text menu -command", c))
+    cb.push(c = TclTkCallback.new(ip, proc{test_listbox(ip, t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text listbox/scrollbar",
+      "-command", c))
+    cb.push(c = TclTkCallback.new(ip, proc{test_canvas(ip, t1)}))
+    wid.push(TclTkWidget.new(ip, t1, button, "-text canvas -command", c))
+
+    # grid で表示する.
+    ro = co = 0
+    wid.each{|w|
+      grid.e(w, "-row", ro, "-column", co, "-sticky news")
+      ro += 1
+      if ro == 7
+        ro = 0
+        co += 1
+      end
+    }
+  end
+
+  # inittoplevel(ip, parent, title)
+  #   以下の処理をまとめて行う.
+  #       1. toplevel ウィジェットを作成する.
+  #       2. コールバックを登録する配列を用意し, toplevel ウィジェットの
+  #         <Destroy> イベントにコールバックを削除する手続きを登録する.
+  #       3. クローズボタンを作る.
+  #     作成した toplevel ウィジェット, クローズボタン, コールバック登録用変数
+  #     を返す.
+  #   ip: インタプリタ
+  #   parent: 親ウィジェット
+  #   title: toplevel ウィジェットのウインドウのタイトル
+  def inittoplevel(ip, parent, title)
+    bind, button, destroy, toplevel, wm = ip.commands().values_at(
+      "bind", "button", "destroy", "toplevel", "wm")
+
+    # 新しいウインドウを開くには, toplevel を使う.
+    t1 = TclTkWidget.new(ip, parent, toplevel)
+    # タイトルを付けておく
+    wm.e("title", t1, title)
+
+    # ウィジェットが破壊されたとき, コールバックが GC の対象になるようにする.
+    cb = []
+    cb.push(c = TclTkCallback.new(ip, proc{|w| TclTk.dcb(cb, t1, w)}, "%W"))
+    bind.e(t1, "<Destroy>", c)
+    # close ボタンを作っておく.
+    # toplevel ウィジェットを破壊するには destroy する.
+    cb.push(c = TclTkCallback.new(ip, proc{destroy.e(t1)}))
+    b1 = TclTkWidget.new(ip, t1, button, "-text close -command", c)
+
+    return t1, b1, cb
+  end
+
+  # label のサンプル.
+  def test_label(ip, parent)
+    button, global, label, pack = ip.commands().values_at(
+      "button", "global", "label", "pack")
+    t1, b1, cb = inittoplevel(ip, parent, "label")
+
+    ## label
+
+    # いろいろな形のラベル.
+    l1 = TclTkWidget.new(ip, t1, label, "-text {default(flat)}")
+    l2 = TclTkWidget.new(ip, t1, label, "-text raised -relief raised")
+    l3 = TclTkWidget.new(ip, t1, label, "-text sunken -relief sunken")
+    l4 = TclTkWidget.new(ip, t1, label, "-text groove -relief groove")
+    l5 = TclTkWidget.new(ip, t1, label, "-text ridge -relief ridge")
+    l6 = TclTkWidget.new(ip, t1, label, "-bitmap error")
+    l7 = TclTkWidget.new(ip, t1, label, "-bitmap questhead")
+
+    # pack しても表示される.
+    pack.e(b1, l1, l2, l3, l4, l5, l6, l7, "-pady 3")
+
+    ## -textvariable
+
+    # tcltk ライブラリの実装では, コールバックは tcl/tk の``手続き''を通して
+    # 呼ばれる. したがって, コールバックの中で(大域)変数にアクセスするときは,
+    # global する必要がある.
+    # global する前に変数に値を設定してしまうとエラーになるので,
+    # tcl/tk における表現形だけ生成して, 実際に値を設定しないように,
+    # 2 番目の引数には nil を与える.
+    v1 = TclTkVariable.new(ip, nil)
+    global.e(v1)
+    v1.set(100)
+    # -textvariable で変数を設定する.
+    l6 = TclTkWidget.new(ip, t1, label, "-textvariable", v1)
+    # コールバックの中から変数を操作する.
+    cb.push(c = TclTkCallback.new(ip, proc{
+      global.e(v1); v1.set(v1.get().to_i + 10)}))
+    b2 = TclTkWidget.new(ip, t1, button, "-text +10 -command", c)
+    cb.push(c = TclTkCallback.new(ip, proc{
+      global.e(v1); v1.set(v1.get().to_i - 10)}))
+    b3 = TclTkWidget.new(ip, t1, button, "-text -10 -command", c)
+    pack.e(l6, b2, b3)
+  end
+
+  # button のサンプル.
+  def test_button(ip, parent)
+    button, pack = ip.commands().values_at("button", "pack")
+    t1, b1, cb = inittoplevel(ip, parent, "button")
+
+    ## button
+
+    # コールバック内で参照する変数は先に宣言しておかなければならない.
+    b3 = b4 = nil
+    cb.push(c = TclTkCallback.new(ip, proc{b3.e("flash"); b4.e("flash")}))
+    b2 = TclTkWidget.new(ip, t1, button, "-text flash -command", c)
+    cb.push(c = TclTkCallback.new(ip, proc{b2.e("configure -state normal")}))
+    b3 = TclTkWidget.new(ip, t1, button, "-text normal -command", c)
+    cb.push(c = TclTkCallback.new(ip, proc{b2.e("configure -state disabled")}))
+    b4 = TclTkWidget.new(ip, t1, button, "-text disable -command", c)
+    pack.e(b1, b2, b3, b4)
+  end
+
+  # checkbutton のサンプル.
+  def test_checkbutton(ip, parent)
+    checkbutton, global, pack = ip.commands().values_at(
+      "checkbutton", "global", "pack")
+    t1, b1, cb = inittoplevel(ip, parent, "checkbutton")
+
+    ## checkbutton
+
+    v1 = TclTkVariable.new(ip, nil)
+    global.e(v1)
+    # -variable で変数を設定する.
+    ch1 = TclTkWidget.new(ip, t1, checkbutton, "-onvalue on -offvalue off",
+      "-textvariable", v1, "-variable", v1)
+    pack.e(b1, ch1)
+  end
+
+  # radiobutton のサンプル.
+  def test_radiobutton(ip, parent)
+    global, label, pack, radiobutton = ip.commands().values_at(
+      "global", "label", "pack", "radiobutton")
+    t1, b1, cb = inittoplevel(ip, parent, "radiobutton")
+
+    ## radiobutton
+
+    v1 = TclTkVariable.new(ip, nil)
+    global.e(v1)
+    # ヌルストリングは "{}" で指定する.
+    v1.set("{}")
+    l1 = TclTkWidget.new(ip, t1, label, "-textvariable", v1)
+    # -variable で同じ変数を指定すると同じグループになる.
+    ra1 = TclTkWidget.new(ip, t1, radiobutton,
+      "-text radio1 -value r1 -variable", v1)
+    ra2 = TclTkWidget.new(ip, t1, radiobutton,
+      "-text radio2 -value r2 -variable", v1)
+    cb.push(c = TclTkCallback.new(ip, proc{global.e(v1); v1.set("{}")}))
+    ra3 = TclTkWidget.new(ip, t1, radiobutton,
+      "-text clear -value r3 -variable", v1, "-command", c)
+    pack.e(b1, l1, ra1, ra2, ra3)
+  end
+
+  # scale のサンプル.
+  def test_scale(ip, parent)
+    global, pack, scale = ip.commands().values_at(
+      "global", "pack", "scale")
+    t1, b1, cb = inittoplevel(ip, parent, "scale")
+
+    ## scale
+
+    v1 = TclTkVariable.new(ip, nil)
+    global.e(v1)
+    v1.set(219)
+    # コールバック内で参照する変数は先に宣言しておかなければならない.
+    sca1 = nil
+    cb.push(c = TclTkCallback.new(ip, proc{global.e(v1); v = v1.get();
+      sca1.e("configure -background", format("#%02x%02x%02x", v, v, v))}))
+    sca1 = TclTkWidget.new(ip, t1, scale,
+      "-label scale -orient h -from 0 -to 255 -variable", v1, "-command", c)
+    pack.e(b1, sca1)
+  end
+
+  # entry のサンプル.
+  def test_entry(ip, parent)
+    button, entry, global, pack = ip.commands().values_at(
+      "button", "entry", "global", "pack")
+    t1, b1, cb = inittoplevel(ip, parent, "entry")
+
+    ## entry
+
+    v1 = TclTkVariable.new(ip, nil)
+    global.e(v1)
+    # ヌルストリングは "{}" で指定する.
+    v1.set("{}")
+    en1 = TclTkWidget.new(ip, t1, entry, "-textvariable", v1)
+    cb.push(c = TclTkCallback.new(ip, proc{
+      global.e(v1); print(v1.get(), "\n"); v1.set("{}")}))
+    b2 = TclTkWidget.new(ip, t1, button, "-text print -command", c)
+    pack.e(b1, en1, b2)
+  end
+
+  # text のサンプル.
+  def test_text(ip, parent)
+    button, pack, text = ip.commands().values_at(
+      "button", "pack", "text")
+    t1, b1, cb = inittoplevel(ip, parent, "text")
+
+    ## text
+
+    te1 = TclTkWidget.new(ip, t1, text)
+    cb.push(c = TclTkCallback.new(ip, proc{
+      # 1 行目の 0 文字目から最後までを表示し, 削除する.
+      print(te1.e("get 1.0 end")); te1.e("delete 1.0 end")}))
+    b2 = TclTkWidget.new(ip, t1, button, "-text print -command", c)
+    pack.e(b1, te1, b2)
+  end
+
+  # raise/lower のサンプル.
+  def test_raise(ip, parent)
+    button, frame, lower, pack, raise = ip.commands().values_at(
+      "button", "frame", "lower", "pack", "raise")
+    t1, b1, cb = inittoplevel(ip, parent, "raise/lower")
+
+    ## raise/lower
+
+    # button を隠すテストのために, frame を使う.
+    f1 = TclTkWidget.new(ip, t1, frame)
+    # コールバック内で参照する変数は先に宣言しておかなければならない.
+    b2 = nil
+    cb.push(c = TclTkCallback.new(ip, proc{raise.e(f1, b2)}))
+    b2 = TclTkWidget.new(ip, t1, button, "-text raise -command", c)
+    cb.push(c = TclTkCallback.new(ip, proc{lower.e(f1, b2)}))
+    b3 = TclTkWidget.new(ip, t1, button, "-text lower -command", c)
+    lower.e(f1, b3)
+
+    pack.e(b2, b3, "-in", f1)
+    pack.e(b1, f1)
+  end
+
+  # modal なウィジェットのサンプル.
+  def test_modal(ip, parent)
+    button, frame, message, pack, tk_chooseColor, tk_getOpenFile,
+      tk_messageBox = ip.commands().values_at(
+      "button", "frame", "message", "pack", "tk_chooseColor",
+      "tk_getOpenFile", "tk_messageBox")
+    # 最初に load されていないライブラリは ip.commands() に存在しないので,
+    # TclTkLibCommand を生成する必要がある.
+    tk_dialog = TclTkLibCommand.new(ip, "tk_dialog")
+    t1, b1, cb = inittoplevel(ip, parent, "message/modal")
+
+    ## message
+
+    mes = "これは message ウィジェットのテストです."
+    mes += "以下は modal なウィジェットのテストです."
+    me1 = TclTkWidget.new(ip, t1, message, "-text {#{mes}}")
+
+    ## modal
+
+    # tk_messageBox
+    cb.push(c = TclTkCallback.new(ip, proc{
+      print tk_messageBox.e("-type yesnocancel -message messageBox",
+      "-icon error -default cancel -title messageBox"), "\n"}))
+    b2 = TclTkWidget.new(ip, t1, button, "-text messageBox -command", c)
+    # tk_dialog
+    cb.push(c = TclTkCallback.new(ip, proc{
+      # ウィジェット名を生成するためにダミーの frame を生成.
+      print tk_dialog.e(TclTkWidget.new(ip, t1, frame),
+      "dialog dialog error 2 yes no cancel"), "\n"}))
+    b3 = TclTkWidget.new(ip, t1, button, "-text dialog -command", c)
+    # tk_chooseColor
+    cb.push(c = TclTkCallback.new(ip, proc{
+      print tk_chooseColor.e("-title chooseColor"), "\n"}))
+    b4 = TclTkWidget.new(ip, t1, button, "-text chooseColor -command", c)
+    # tk_getOpenFile
+    cb.push(c = TclTkCallback.new(ip, proc{
+      print tk_getOpenFile.e("-defaultextension .rb",
+      "-filetypes {{{Ruby Script} {.rb}} {{All Files} {*}}}",
+      "-title getOpenFile"), "\n"}))
+    b5 = TclTkWidget.new(ip, t1, button, "-text getOpenFile -command", c)
+
+    pack.e(b1, me1, b2, b3, b4, b5)
+  end
+
+  # menu のサンプル.
+  def test_menu(ip, parent)
+    global, menu, menubutton, pack = ip.commands().values_at(
+      "global", "menu", "menubutton", "pack")
+    tk_optionMenu = TclTkLibCommand.new(ip, "tk_optionMenu")
+    t1, b1, cb = inittoplevel(ip, parent, "menu")
+
+    ## menu
+
+    # menubutton を生成する.
+    mb1 = TclTkWidget.new(ip, t1, menubutton, "-text menu")
+    # menu を生成する.
+    me1 = TclTkWidget.new(ip, mb1, menu)
+    # mb1 から me1 が起動されるようにする.
+    mb1.e("configure -menu", me1)
+
+    # cascade で起動される menu を生成する.
+    me11 = TclTkWidget.new(ip, me1, menu)
+    # radiobutton のサンプル.
+    v1 = TclTkVariable.new(ip, nil); global.e(v1); v1.set("r1")
+    me11.e("add radiobutton -label radio1 -value r1 -variable", v1)
+    me11.e("add radiobutton -label radio2 -value r2 -variable", v1)
+    me11.e("add radiobutton -label radio3 -value r3 -variable", v1)
+    # cascade により mb11 が起動されるようにする.
+    me1.e("add cascade -label cascade -menu", me11)
+
+    # checkbutton のサンプル.
+    v2 = TclTkVariable.new(ip, nil); global.e(v2); v2.set("none")
+    me1.e("add checkbutton -label check -variable", v2)
+    # separator のサンプル.
+    me1.e("add separator")
+    # command のサンプル.
+    v3 = nil
+    cb.push(c = TclTkCallback.new(ip, proc{
+      global.e(v1, v2, v3); print "v1: ", v1.get(), ", v2: ", v2.get(),
+      ", v3: ", v3.get(), "\n"}))
+    me1.e("add command -label print -command", c)
+
+    ## tk_optionMenu
+
+    v3 = TclTkVariable.new(ip, nil); global.e(v3); v3.set("opt2")
+    om1 = TclTkWidget.new(ip, t1, tk_optionMenu, v3, "opt1 opt2 opt3 opt4")
+
+    pack.e(b1, mb1, om1, "-side left")
+  end
+
+  # listbox のサンプル.
+  def test_listbox(ip, parent)
+    clipboard, frame, grid, listbox, lower, menu, menubutton, pack, scrollbar,
+      selection = ip.commands().values_at(
+      "clipboard", "frame", "grid", "listbox", "lower", "menu", "menubutton",
+      "pack", "scrollbar", "selection")
+    t1, b1, cb = inittoplevel(ip, parent, "listbox")
+
+    ## listbox/scrollbar
+
+    f1 = TclTkWidget.new(ip, t1, frame)
+    # コールバック内で参照する変数は先に宣言しておかなければならない.
+    li1 = sc1 = sc2 = nil
+    # 実行時に, 後ろにパラメータがつくコールバックは,
+    # イテレータ変数でそのパラメータを受け取ることができる.
+    # (複数のパラメータはひとつの文字列にまとめられる.)
+    cb.push(c1 = TclTkCallback.new(ip, proc{|i| li1.e("xview", i)}))
+    cb.push(c2 = TclTkCallback.new(ip, proc{|i| li1.e("yview", i)}))
+    cb.push(c3 = TclTkCallback.new(ip, proc{|i| sc1.e("set", i)}))
+    cb.push(c4 = TclTkCallback.new(ip, proc{|i| sc2.e("set", i)}))
+    # listbox
+    li1 = TclTkWidget.new(ip, f1, listbox,
+      "-xscrollcommand", c3, "-yscrollcommand", c4,
+      "-selectmode extended -exportselection true")
+    for i in 1..20
+      li1.e("insert end {line #{i} line #{i} line #{i} line #{i} line #{i}}")
+    end
+    # scrollbar
+    sc1 = TclTkWidget.new(ip, f1, scrollbar, "-orient horizontal -command", c1)
+    sc2 = TclTkWidget.new(ip, f1, scrollbar, "-orient vertical -command", c2)
+
+    ## selection/clipboard
+
+    mb1 = TclTkWidget.new(ip, t1, menubutton, "-text edit")
+    me1 = TclTkWidget.new(ip, mb1, menu)
+    mb1.e("configure -menu", me1)
+    cb.push(c = TclTkCallback.new(ip, proc{
+      # clipboard をクリア.
+      clipboard.e("clear")
+      # selection から文字列を読み込み clipboard に追加する.
+      clipboard.e("append {#{selection.e('get')}}")}))
+    me1.e("add command -label {selection -> clipboard} -command",c)
+    cb.push(c = TclTkCallback.new(ip, proc{
+      # li1 をクリア.
+      li1.e("delete 0 end")
+      # clipboard から文字列を取り出し, 1 行ずつ
+      selection.e("get -selection CLIPBOARD").split(/\n/).each{|line|
+        # li1 に挿入する.
+        li1.e("insert end {#{line}}")}}))
+    me1.e("add command -label {clipboard -> listbox} -command",c)
+
+    grid.e(li1, "-row 0 -column 0 -sticky news")
+    grid.e(sc1, "-row 1 -column 0 -sticky ew")
+    grid.e(sc2, "-row 0 -column 1 -sticky ns")
+    grid.e("rowconfigure", f1, "0 -weight 100")
+    grid.e("columnconfigure", f1, "0 -weight 100")
+    f2 = TclTkWidget.new(ip, t1, frame)
+    lower.e(f2, b1)
+    pack.e(b1, mb1, "-in", f2, "-side left")
+    pack.e(f2, f1)
+  end
+
+  # canvas のサンプル.
+  def test_canvas(ip, parent)
+    canvas, lower, pack = ip.commands().values_at("canvas", "lower", "pack")
+    t1, b1, cb = inittoplevel(ip, parent, "canvas")
+
+    ## canvas
+
+    ca1 = TclTkWidget.new(ip, t1, canvas, "-width 400 -height 300")
+    lower.e(ca1, b1)
+    # rectangle を作る.
+    idr = ca1.e("create rectangle 10 10 20 20")
+    # oval を作る.
+    ca1.e("create oval 60 10 100 50")
+    # polygon を作る.
+    ca1.e("create polygon 110 10 110 30 140 10")
+    # line を作る.
+    ca1.e("create line 150 10 150 30 190 10")
+    # arc を作る.
+    ca1.e("create arc 200 10 250 50 -start 0 -extent 90 -style pieslice")
+    # i1 は本当は, どこかで破壊しなければならないが, 面倒なので放ってある.
+    i1 = TclTkImage.new(ip, "photo", "-file maru.gif")
+    # image を作る.
+    ca1.e("create image 100 100 -image", i1)
+    # bitmap を作る.
+    ca1.e("create bitmap 260 50 -bitmap questhead")
+    # text を作る.
+    ca1.e("create text 320 50 -text {drag rectangle}")
+    # window を作る(クローズボタン).
+    ca1.e("create window 200 200 -window", b1)
+
+    # bind により rectangle を drag できるようにする.
+    cb.push(c = TclTkCallback.new(ip, proc{|i|
+      # i に x と y を受け取るので, 取り出す.
+      x, y = i.split(/ /); x = x.to_f; y = y.to_f
+      # 座標を変更する.
+      ca1.e("coords current #{x - 5} #{y - 5} #{x + 5} #{y + 5}")},
+      # x, y 座標を空白で区切ったものをイテレータ変数へ渡すように指定.
+      "%x %y"))
+    # rectangle に bind する.
+    ca1.e("bind", idr, "<B1-Motion>", c)
+
+    pack.e(ca1)
+  end
+end
+
+# test driver
+
+if ARGV.size == 0
+  print "#{$0} n で, n 個のインタプリタを起動します.\n"
+  n = 1
+else
+  n = ARGV[0].to_i
+end
+
+print "start\n"
+ip = []
+
+# インタプリタ, ウィジェット等の生成.
+for i in 1 .. n
+  ip.push(Test1.new())
+end
+
+# 用意ができたらイベントループに入る.
+TclTk.mainloop()
+print "exit from mainloop\n"
+
+# インタプリタが GC されるかのテスト.
+ip = []
+print "GC.start\n" if $DEBUG
+GC.start() if $DEBUG
+print "end\n"
+
+exit
+
+# end
diff --git a/ruby_1_8_6/ext/tk/sample/tcltklib/sample2.rb b/ruby_1_8_6/ext/tk/sample/tcltklib/sample2.rb
new file mode 100644
index 0000000000..444bb1eef7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tcltklib/sample2.rb
@@ -0,0 +1,451 @@
+#!/usr/local/bin/ruby
+#----------------------> pretty simple othello game <-----------------------
+# othello.rb
+#
+# version 0.3
+# maeda shugo (shuto@po.aianet.ne.jp)
+#---------------------------------------------------------------------------
+
+#       Sep. 17, 1997   modified by Y. Shigehiro for tcltk library
+#          maeda shugo (shugo@po.aianet.ne.jp) 氏による
+#          (ruby/tk で書かれていた) ruby のサンプルプログラム
+#               http://www.aianet.or.jp/~shugo/ruby/othello.rb.gz
+#          を tcltk ライブラリを使うように, 機械的に変更してみました.
+#
+#          なるべくオリジナルと同じになるようにしてあります.
+
+require "observer"
+require "tcltk"
+$ip = TclTkInterpreter.new()
+$root = $ip.rootwidget()
+$button, $canvas, $checkbutton, $frame, $label, $pack, $update, $wm =
+   $ip.commands().values_at(
+   "button", "canvas", "checkbutton", "frame", "label", "pack", "update", "wm")
+
+class Othello
+   
+   EMPTY = 0
+   BLACK = 1
+   WHITE = - BLACK
+   
+   attr :in_com_turn
+   attr :game_over
+   
+   class Board
+   
+      include Observable
+      
+      DIRECTIONS = [
+         [-1, -1], [-1, 0], [-1, 1],
+         [ 0, -1],          [ 0, 1],
+         [ 1, -1], [ 1, 0], [ 1, 1]
+      ]
+      
+      attr :com_disk, TRUE
+   
+      def initialize(othello)
+         @othello = othello
+         reset
+      end
+   
+      def notify_observers(*arg)
+         if @observer_peers != nil
+            super(*arg)
+         end
+      end
+      
+      def reset
+         @data = [
+            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
+            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
+            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
+            [EMPTY, EMPTY, EMPTY, WHITE, BLACK, EMPTY, EMPTY, EMPTY],
+            [EMPTY, EMPTY, EMPTY, BLACK, WHITE, EMPTY, EMPTY, EMPTY],
+            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
+            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY],
+            [EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY]
+         ]
+         changed
+         notify_observers
+      end
+      
+      def man_disk
+         return - @com_disk
+      end
+      
+      def other_disk(disk)
+         return - disk
+      end
+      
+      def get_disk(row, col)
+         return @data[row][col]
+      end
+      
+      def reverse_to(row, col, my_disk, dir_y, dir_x)
+         y = row
+         x = col
+         begin
+            y += dir_y
+            x += dir_x
+            if y < 0 || x < 0 || y > 7 || x > 7 ||
+                  @data[y][x] == EMPTY
+               return
+            end
+         end until @data[y][x] == my_disk
+         begin
+            @data[y][x] = my_disk
+            changed
+            notify_observers(y, x)
+            y -= dir_y
+            x -= dir_x
+         end until y == row && x == col
+      end
+      
+      def put_disk(row, col, disk)
+         @data[row][col] = disk
+         changed
+         notify_observers(row, col)
+         DIRECTIONS.each do |dir|
+            reverse_to(row, col, disk, *dir)
+         end
+      end
+      
+      def count_disk(disk)
+         num = 0
+         @data.each do |rows|
+            rows.each do |d|
+               if d == disk
+                  num += 1
+               end
+            end
+         end
+         return num
+      end
+      
+      def count_point_to(row, col, my_disk, dir_y, dir_x)
+         return 0 if @data[row][col] != EMPTY
+         count = 0
+         loop do
+            row += dir_y
+            col += dir_x
+            break if row < 0 || col < 0 || row > 7 || col > 7
+            case @data[row][col]
+            when my_disk
+               return count
+            when other_disk(my_disk)
+               count += 1
+            when EMPTY
+               break
+            end
+         end
+         return 0
+      end
+      
+      def count_point(row, col, my_disk)
+         count = 0
+         DIRECTIONS.each do |dir|
+            count += count_point_to(row, col, my_disk, *dir)
+         end
+         return count
+      end
+      
+      def corner?(row, col)
+         return (row == 0 && col == 0) ||
+            (row == 0 && col == 7) ||
+            (row == 7 && col == 0) ||
+            (row == 7 && col == 7)
+      end
+      
+      def search(my_disk)
+         max = 0
+         max_row = nil
+         max_col = nil
+         for row in 0 .. 7
+            for col in 0 .. 7
+               buf = count_point(row, col, my_disk)
+               if (corner?(row, col) && buf > 0) || max < buf
+                  max = buf
+                  max_row = row
+                  max_col = col
+               end
+            end
+         end
+         return max_row, max_col
+      end
+   end #--------------------------> class Board ends here
+   
+   class BoardView < TclTkWidget
+      
+      BACK_GROUND_COLOR = "DarkGreen"
+      HILIT_BG_COLOR = "green"
+      BORDER_COLOR = "black"
+      BLACK_COLOR = "black"
+      WHITE_COLOR = "white"
+      STOP_COLOR = "red"
+      
+      attr :left
+      attr :top
+      attr :right
+      attr :bottom
+      
+      class Square
+         
+         attr :oval, TRUE
+         attr :row
+         attr :col
+         
+         def initialize(view, row, col)
+            @view = view
+            @id = @view.e("create rectangle", 
+                          *(view.tk_rect(view.left + col,
+                                         view.top + row,
+                                         view.left + col + 1,
+                                         view.top + row + 1) \
+                            << "-fill #{BACK_GROUND_COLOR}") )
+            @row = row
+            @col = col
+            @view.e("itemconfigure", @id,
+              "-width 0.5m -outline #{BORDER_COLOR}")
+            @view.e("bind", @id, "<Any-Enter>", TclTkCallback.new($ip, proc{
+               if @oval == nil
+                  view.e("itemconfigure", @id, "-fill #{HILIT_BG_COLOR}")
+               end
+            }))
+            @view.e("bind", @id, "<Any-Leave>", TclTkCallback.new($ip, proc{
+               view.e("itemconfigure", @id, "-fill #{BACK_GROUND_COLOR}")
+            }))
+            @view.e("bind", @id, "<ButtonRelease-1>", TclTkCallback.new($ip,
+               proc{
+               view.click_square(self)
+            }))
+         end
+         
+         def blink(color)
+            @view.e("itemconfigure", @id, "-fill #{color}")
+            $update.e()
+            sleep(0.1)
+            @view.e("itemconfigure", @id, "-fill #{BACK_GROUND_COLOR}")
+         end
+      end #-----------------------> class Square ends here
+   
+      def initialize(othello, board)
+         super($ip, $root, $canvas)
+         @othello = othello
+         @board = board
+         @board.add_observer(self)
+         
+         @squares = Array.new(8)
+         for i in 0 .. 7
+            @squares[i] = Array.new(8)
+         end
+         @left = 1
+         @top = 0.5
+         @right = @left + 8
+         @bottom = @top + 8
+         
+         i = self.e("create rectangle", *tk_rect(@left, @top, @right, @bottom))
+         self.e("itemconfigure", i,
+            "-width 1m -outline #{BORDER_COLOR} -fill #{BACK_GROUND_COLOR}")
+
+         for row in 0 .. 7
+            for col in 0 .. 7
+               @squares[row][col] = Square.new(self, row, col)
+            end
+         end
+         
+         update
+      end
+      
+      def tk_rect(left, top, right, bottom)
+         return left.to_s + "c", top.to_s + "c",
+            right.to_s + "c", bottom.to_s + "c"
+      end
+      
+      def clear
+         each_square do |square|
+            if square.oval != nil
+               self.e("delete", square.oval)
+               square.oval = nil
+            end
+         end
+      end
+      
+      def draw_disk(row, col, disk)
+         if disk == EMPTY
+            if @squares[row][col].oval != nil
+               self.e("delete", @squares[row][col].oval)
+               @squares[row][col].oval = nil
+            end
+            return
+         end
+            
+         $update.e()
+         sleep(0.05)
+         oval = @squares[row][col].oval
+         if oval == nil
+            oval = self.e("create oval", *tk_rect(@left + col + 0.2,
+                                           @top + row + 0.2,
+                                           @left + col + 0.8,
+                                           @top + row + 0.8))
+            @squares[row][col].oval = oval
+         end
+         case disk
+         when BLACK
+            color = BLACK_COLOR
+         when WHITE
+            color = WHITE_COLOR
+         else
+            fail format("Unknown disk type: %d", disk)
+         end
+         self.e("itemconfigure", oval, "-outline #{color} -fill #{color}")
+      end
+      
+      def update(row = nil, col = nil)
+         if row && col
+            draw_disk(row, col, @board.get_disk(row, col))
+         else
+            each_square do |square|
+               draw_disk(square.row, square.col,
+                         @board.get_disk(square.row, square.col))
+            end
+         end
+         @othello.show_point
+      end
+      
+      def each_square
+         @squares.each do |rows|
+            rows.each do |square|
+               yield(square)
+            end
+         end
+      end
+      
+      def click_square(square)
+         if @othello.in_com_turn || @othello.game_over ||
+               @board.count_point(square.row,
+                                  square.col,
+                                  @board.man_disk) == 0
+            square.blink(STOP_COLOR)
+            return
+         end
+         @board.put_disk(square.row, square.col, @board.man_disk)
+         @othello.com_turn
+      end
+      
+      private :draw_disk
+      public :update
+   end #----------------------> class BoardView ends here
+   
+   def initialize
+      @msg_label = TclTkWidget.new($ip, $root, $label)
+      $pack.e(@msg_label)
+      
+      @board = Board.new(self)
+      @board_view = BoardView.new(self, @board)
+      #### added by Y. Shigehiro
+      ## board_view の大きさを設定する.
+      x1, y1, x2, y2 = @board_view.e("bbox all").split(/ /).collect{|i| i.to_f}
+      @board_view.e("configure -width", x2 - x1)
+      @board_view.e("configure -height", y2 - y1)
+      ## scrollregion を設定する.
+      @board_view.e("configure -scrollregion {", @board_view.e("bbox all"),
+         "}")
+      #### ここまで
+      $pack.e(@board_view, "-fill both -expand true")
+      
+      panel = TclTkWidget.new($ip, $root, $frame)
+      
+      @play_black = TclTkWidget.new($ip, panel, $checkbutton,
+        "-text {com is black} -command", TclTkCallback.new($ip, proc{
+         switch_side
+      }))
+      $pack.e(@play_black, "-side left")
+            
+      quit = TclTkWidget.new($ip, panel, $button, "-text Quit -command",
+         TclTkCallback.new($ip, proc{
+         exit
+      }))
+      $pack.e(quit, "-side right -fill x")
+      
+      reset = TclTkWidget.new($ip, panel, $button, "-text Reset -command",
+         TclTkCallback.new($ip, proc{
+         reset_game
+      }))
+      $pack.e(reset, "-side right -fill x")
+      
+      $pack.e(panel, "-side bottom -fill x")
+      
+#      root = Tk.root
+      $wm.e("title", $root, "Othello")
+      $wm.e("iconname", $root, "Othello")
+      
+      @board.com_disk = WHITE
+      @game_over = FALSE
+      
+      TclTk.mainloop
+   end
+   
+   def switch_side
+      if @in_com_turn
+         @play_black.e("toggle")
+      else
+         @board.com_disk = @board.man_disk
+         com_turn unless @game_over
+      end
+   end
+   
+   def reset_game
+      if @board.com_disk == BLACK
+         @board.com_disk = WHITE
+         @play_black.e("toggle")
+      end
+      @board_view.clear
+      @board.reset
+      $wm.e("title", $root, "Othello")
+      @game_over = FALSE
+   end
+      
+   def com_turn
+      @in_com_turn = TRUE
+      $update.e()
+      sleep(0.5)
+      begin
+         com_disk = @board.count_disk(@board.com_disk)
+         man_disk = @board.count_disk(@board.man_disk)
+         if @board.count_disk(EMPTY) == 0
+            if man_disk == com_disk
+               $wm.e("title", $root, "{Othello - Draw!}")
+            elsif man_disk > com_disk
+               $wm.e("title", $root, "{Othello - You Win!}")
+            else
+               $wm.e("title", $root, "{Othello - You Loose!}")
+            end
+            @game_over = TRUE
+            break
+         elsif com_disk == 0
+            $wm.e("title", $root, "{Othello - You Win!}")
+            @game_over = TRUE
+            break
+         elsif man_disk == 0
+            $wm.e("title", $root, "{Othello - You Loose!}")
+            @game_over = TRUE
+            break
+         end
+         row, col = @board.search(@board.com_disk)
+         break if row == nil || col == nil
+         @board.put_disk(row, col, @board.com_disk)
+      end while @board.search(@board.man_disk) == [nil, nil]
+      @in_com_turn = FALSE
+   end
+
+   def show_point
+      black = @board.count_disk(BLACK)
+      white = @board.count_disk(WHITE)
+      @msg_label.e("configure -text",
+         %Q/{#{format("BLACK: %.2d    WHITE: %.2d", black, white)}}/)
+   end
+end #----------------------> class Othello ends here
+
+Othello.new
+
+#----------------------------------------------> othello.rb ends here
diff --git a/ruby_1_8_6/ext/tk/sample/tkalignbox.rb b/ruby_1_8_6/ext/tk/sample/tkalignbox.rb
new file mode 100644
index 0000000000..32915a5e69
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkalignbox.rb
@@ -0,0 +1,225 @@
+#
+#  tkalignbox.rb : align widgets with same width/height
+# 
+#                                            by Hidetoshi NAGAI
+#
+#  The box size depends on 'reqheight' and 'reqwidth' of contained widgets. 
+#  If you want to give the box size when those requested sizes are 0, 
+#  please set box.propagate = false (See the test routine at the tail of 
+#  this file).
+
+require 'tk'
+
+class TkAlignBox < TkFrame
+  def initialize(*args)
+    if self.class == TkAlignBox
+      fail RuntimeError, "TkAlignBox is an abstract class"
+    end
+    @padx = 0
+    @pady = 0
+    if args[-1].kind_of? Hash
+      keys = _symbolkey2str(args.pop)
+      @padx = keys.delete('padx') || 0
+      @pady = keys.delete('pady') || 0
+      args.push(keys)
+    end
+    super(*args)
+    @max_width = 0
+    @max_height = 0
+    @propagate = true
+    @widgets = []
+  end
+
+  def _set_framesize
+    fail RuntimeError, "TkAlignBox is an abstract class"
+  end
+  private :_set_framesize
+
+  def _place_config(widget, idx, cnt)
+    fail RuntimeError, "TkAlignBox is an abstract class"
+  end
+  private :_place_config
+
+  def align
+    widgets = []
+    @widgets.each{|w| widgets << w if w.winfo_exist?}
+    @widgets = widgets
+    cnt = @widgets.size.to_f
+    @widgets.each_with_index{|w, idx| _place_config(w, idx, cnt)}
+    @widgets = widgets
+    _set_framesize if @propagate
+    self
+  end
+
+  def add(*widgets)
+    widgets.each{|w|
+      unless w.kind_of? TkWindow
+        fail RuntimeError, "#{w.inspect} is not a widget instance."
+      end
+      @widgets.delete(w)
+      @widgets << w
+      sz = w.winfo_reqwidth
+      @max_width = sz if @max_width < sz
+      sz = w.winfo_reqheight
+      @max_height = sz if @max_height < sz
+    }
+    align
+  end
+
+  def <<(widget)
+    add(widget)
+  end
+
+  def insert(idx, widget)
+    unless widget.kind_of? TkWindow
+      fail RuntimeError, "#{widget.inspect} is not a widget instance."
+    end
+    @widgets.delete(widget)
+    @widgets[idx,0] = widget
+    sz = widget.winfo_reqwidth
+    @max_width = sz if @max_width < sz
+    sz = widget.winfo_reqheight
+    @max_height = sz if @max_height < sz
+    align
+  end
+
+  def delete(idx)
+    ret = @widgets.delete_at(idx)
+    @req_size = 0
+    @widget.each{|w|
+      sz = w.winfo_reqwidth
+      @max_width = sz if @max_width < sz
+      sz = w.winfo_reqheight
+      @max_height = sz if @max_height < sz
+    }
+    align
+    ret
+  end
+
+  def padx(size = nil)
+    if size
+      @padx = size
+      align
+    else
+      @padx
+    end
+  end
+
+  def pady(size = nil)
+    if size
+      @pady = size
+      align
+    else
+      @pady
+    end
+  end
+
+  attr_accessor :propagate
+end
+
+class TkHBox < TkAlignBox
+  def _set_framesize
+    bd = self.borderwidth
+    self.width((@max_width + 2*@padx) * @widgets.size + 2*bd)
+    self.height(@max_height + 2*@pady + 2*bd)
+  end
+  private :_set_framesize
+
+  def _place_config(widget, idx, cnt)
+    widget.place_in(self, 
+                    'relx'=>idx/cnt, 'x'=>@padx, 
+                    'rely'=>0, 'y'=>@pady, 
+                    'relwidth'=>1.0/cnt, 'width'=>-2*@padx, 
+                    'relheight'=>1.0, 'height'=>-2*@pady)
+  end
+  private :_place_config
+end
+TkHLBox = TkHBox
+
+class TkHRBox < TkHBox
+  def _place_config(widget, idx, cnt)
+    widget.place_in(self, 
+                    'relx'=>(cnt - idx - 1)/cnt, 'x'=>@padx, 
+                    'rely'=>0, 'y'=>@pady, 
+                    'relwidth'=>1.0/cnt, 'width'=>-2*@padx, 
+                    'relheight'=>1.0, 'height'=>-2*@pady)
+  end
+  private :_place_config
+end
+
+class TkVBox < TkAlignBox
+  def _set_framesize
+    bd = self.borderwidth
+    self.width(@max_width + 2*@padx + 2*bd)
+    self.height((@max_height + 2*@pady) * @widgets.size + 2*bd)
+  end
+  private :_set_framesize
+
+  def _place_config(widget, idx, cnt)
+    widget.place_in(self, 
+                    'relx'=>0, 'x'=>@padx, 
+                    'rely'=>idx/cnt, 'y'=>@pady, 
+                    'relwidth'=>1.0, 'width'=>-2*@padx, 
+                    'relheight'=>1.0/cnt, 'height'=>-2*@pady)
+  end
+  private :_place_config
+end
+TkVTBox = TkVBox
+
+class TkVBBox < TkVBox
+  def _place_config(widget, idx, cnt)
+    widget.place_in(self, 
+                    'relx'=>0, 'x'=>@padx, 
+                    'rely'=>(cnt - idx - 1)/cnt, 'y'=>@pady, 
+                    'relwidth'=>1.0, 'width'=>-2*@padx, 
+                    'relheight'=>1.0/cnt, 'height'=>-2*@pady)
+  end
+  private :_place_config
+end
+
+################################################
+# test
+################################################
+if __FILE__ == $0
+  f = TkHBox.new(:borderwidth=>3, :relief=>'ridge').pack
+  f.add(TkButton.new(f, :text=>'a'),
+        TkButton.new(f, :text=>'aa', :font=>'Helvetica 16'),
+        TkButton.new(f, :text=>'aaa'),
+        TkButton.new(f, :text=>'aaaa'))
+
+  f = TkHBox.new(:borderwidth=>3, :relief=>'ridge', 
+                 :padx=>7, :pady=>3, :background=>'yellow').pack
+  f.add(TkButton.new(f, :text=>'a'),
+        TkButton.new(f, :text=>'aa', :font=>'Helvetica 16'),
+        TkButton.new(f, :text=>'aaa'),
+        TkButton.new(f, :text=>'aaaa'))
+
+  f = TkVBox.new(:borderwidth=>5, :relief=>'groove').pack
+  f.add(TkButton.new(f, :text=>'a'),
+        TkButton.new(f, :text=>'aa', :font=>'Helvetica 30'),
+        TkButton.new(f, :text=>'aaa'),
+        TkButton.new(f, :text=>'aaaa'))
+
+  f = TkHRBox.new(:borderwidth=>3, :relief=>'raised').pack(:fill=>:x)
+  f.add(TkButton.new(f, :text=>'a'),
+        TkButton.new(f, :text=>'aa'), 
+        TkButton.new(f, :text=>'aaa'))
+
+  f = TkVBBox.new(:borderwidth=>3, :relief=>'ridge').pack(:fill=>:x)
+  f.propagate = false
+  f.height 100
+  f.add(TkFrame.new(f){|ff| 
+          TkButton.new(ff, :text=>'a').pack(:pady=>4, :padx=>6, 
+                                            :fill=>:both, :expand=>true)
+        }, 
+        TkFrame.new(f){|ff| 
+          TkButton.new(ff, :text=>'aa').pack(:pady=>4, :padx=>6, 
+                                             :fill=>:both, :expand=>true)
+        }, 
+        TkFrame.new(f){|ff| 
+          TkButton.new(ff, :text=>'aaaa').pack(:pady=>4, :padx=>6, 
+                                               :fill=>:both, :expand=>true)
+        })
+
+  Tk.mainloop
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkballoonhelp.rb b/ruby_1_8_6/ext/tk/sample/tkballoonhelp.rb
new file mode 100644
index 0000000000..c2c95f771d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkballoonhelp.rb
@@ -0,0 +1,194 @@
+#
+# tkballoonhelp.rb : simple balloon help widget
+#                       by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+# Add a balloon help to a widget. 
+# This widget has only poor featureas. If you need more useful features, 
+# please try to use the Tix extension of Tcl/Tk under Ruby/Tk.
+# 
+# The interval time to display a balloon help is defined 'interval' option
+# (default is 1000ms). 
+#
+require 'tk'
+
+class TkBalloonHelp<TkLabel
+  def _balloon_binding(interval)
+    @timer = TkAfter.new(interval, 1, proc{show})
+    def @timer.interval(val)
+      @sleep_time = val
+    end
+    @bindtag = TkBindTag.new
+    @bindtag.bind('Enter',  proc{@timer.start})
+    @bindtag.bind('Motion', proc{@timer.restart; erase})
+    @bindtag.bind('Any-ButtonPress', proc{@timer.restart; erase})
+    @bindtag.bind('Leave',  proc{@timer.stop; erase})
+    tags = @parent.bindtags
+    idx = tags.index(@parent)
+    unless idx
+      ppath = TkComm.window(@parent.path)
+      idx = tags.index(ppath) || 0
+    end
+    tags[idx,0] = @bindtag
+    @parent.bindtags(tags)
+  end
+  private :_balloon_binding
+
+  def initialize(parent=nil, keys={})
+    @parent = parent || Tk.root
+
+    @frame = TkToplevel.new(@parent)
+    @frame.withdraw
+    @frame.overrideredirect(true)
+    @frame.transient(TkWinfo.toplevel(@parent))
+    @epath = @frame.path
+
+    if keys
+      keys = _symbolkey2str(keys)
+    else
+      keys = {}
+    end
+
+    @command = keys.delete('command')
+
+    @interval = keys.delete('interval'){1000}
+    _balloon_binding(@interval)
+
+    @label = TkLabel.new(@frame, 'background'=>'bisque').pack
+    @label.configure(_symbolkey2str(keys)) unless keys.empty?
+    @path = @label
+  end
+
+  def epath
+    @epath
+  end
+
+  def interval(val)
+    if val
+      @timer.interval(val)
+    else
+      @interval
+    end
+  end
+
+  def command(cmd = Proc.new)
+    @command = cmd
+    self
+  end
+
+  def show
+    x = TkWinfo.pointerx(@parent)
+    y = TkWinfo.pointery(@parent)
+    @frame.geometry("+#{x+1}+#{y+1}")
+
+    if @command
+      case @command.arity
+      when 0
+        @command.call
+      when 2
+        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent))
+      when 3
+        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent), 
+                      self)
+      else
+        @command.call(x - TkWinfo.rootx(@parent), y - TkWinfo.rooty(@parent), 
+                      self, @parent)
+      end
+    end
+
+    @frame.deiconify
+    @frame.raise
+
+    @org_cursor = @parent['cursor']
+    @parent.cursor('crosshair') 
+  end
+
+  def erase
+    @parent.cursor(@org_cursor) 
+    @frame.withdraw
+  end
+
+  def destroy
+    @frame.destroy
+  end
+end
+
+################################################
+# test
+################################################
+if __FILE__ == $0
+  TkButton.new('text'=>'This button has a balloon help') {|b|
+    pack('fill'=>'x')
+    TkBalloonHelp.new(b, 'text'=>' Message ')
+  }
+  TkButton.new('text'=>'This button has another balloon help') {|b|
+    pack('fill'=>'x')
+    TkBalloonHelp.new(b, 'text'=>'configured message', 
+                      'interval'=>200, 'font'=>'courier', 
+                      'background'=>'gray', 'foreground'=>'red')
+  }
+
+  sb = TkScrollbox.new.pack(:fill=>:x)
+  sb.insert(:end, *%w(aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm))
+=begin
+  # CASE1 : command takes no arguemnt
+  bh = TkBalloonHelp.new(sb, :interval=>500, 
+                         :relief=>:ridge, :background=>'white', 
+                         :command=>proc{
+                           y = TkWinfo.pointery(sb) - TkWinfo.rooty(sb)
+                           bh.text "current index == #{sb.nearest(y)}"
+                         })
+=end
+=begin
+  # CASE2 : command takes 2 arguemnts
+  bh = TkBalloonHelp.new(sb, :interval=>500, 
+                         :relief=>:ridge, :background=>'white', 
+                         :command=>proc{|x, y|
+                           bh.text "current index == #{sb.nearest(y)}"
+                         })
+=end
+=begin
+  # CASE3 : command takes 3 arguemnts
+  TkBalloonHelp.new(sb, :interval=>500, 
+                    :relief=>:ridge, :background=>'white', 
+                    :command=>proc{|x, y, bhelp|
+                      bhelp.text "current index == #{sb.nearest(y)}"
+                    })
+=end
+=begin
+  # CASE4a : command is a Proc object and takes 4 arguemnts
+  cmd = proc{|x, y, bhelp, parent|
+    bhelp.text "current index == #{parent.nearest(y)}"
+  }
+
+  TkBalloonHelp.new(sb, :interval=>500, 
+                    :relief=>:ridge, :background=>'white', 
+                    :command=>cmd)
+
+  sb2 = TkScrollbox.new.pack(:fill=>:x)
+  sb2.insert(:end, *%w(AAA BBB CCC DDD EEE FFF GGG HHH III JJJ KKK LLL MMM))
+  TkBalloonHelp.new(sb2, :interval=>500, 
+                    :padx=>5, :relief=>:raised, 
+                    :background=>'gray25', :foreground=>'white',
+                    :command=>cmd)
+=end
+#=begin
+  # CASE4b : command is a Method object and takes 4 arguemnts
+  def set_msg(x, y, bhelp, parent)
+    bhelp.text "current index == #{parent.nearest(y)}"
+  end
+  cmd = self.method(:set_msg)
+
+  TkBalloonHelp.new(sb, :interval=>500, 
+                    :relief=>:ridge, :background=>'white', 
+                    :command=>cmd)
+
+  sb2 = TkScrollbox.new.pack(:fill=>:x)
+  sb2.insert(:end, *%w(AAA BBB CCC DDD EEE FFF GGG HHH III JJJ KKK LLL MMM))
+  TkBalloonHelp.new(sb2, :interval=>500, 
+                    :padx=>5, :relief=>:raised, 
+                    :background=>'gray25', :foreground=>'white',
+                    :command=>cmd)
+#=end
+
+  Tk.mainloop
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkbiff.rb b/ruby_1_8_6/ext/tk/sample/tkbiff.rb
new file mode 100644
index 0000000000..c6699629cc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkbiff.rb
@@ -0,0 +1,155 @@
+#!/usr/bin/env ruby
+
+if ARGV[0] != '-d'
+  unless $DEBUG
+    exit if fork
+  end
+else
+  ARGV.shift
+end
+
+if ARGV.length == 0
+  if ENV['MAIL']
+    $spool = ENV['MAIL']
+  else  
+    $spool = '/var/spool/mail/' + ENV['USER']
+  end
+else 
+  $spool = ARGV[0]
+end
+
+require "parsedate"
+require "base64"
+
+include ParseDate
+
+class Mail
+  def Mail.new(f)
+    if !f.kind_of?(IO)
+      f = open(f, "r")
+      me = super
+      f.close
+    else
+      me = super
+    end
+    return me
+  end
+
+  def initialize(f)
+    @header = {}
+    @body = []
+    while line = f.gets()
+      line.chop!
+      next if /^From / =~ line  # skip From-line  
+      break if /^$/ =~ line     # end of header
+      if /^(\S+):\s*(.*)/ =~ line
+        @header[attr = $1.capitalize] = $2
+      elsif attr
+        sub(/^\s*/, '')
+        @header[attr] += "\n" + $_
+      end
+    end
+
+    return unless $_
+
+    while line = f.gets()
+      break if /^From / =~ line
+      @body.push($_)
+    end
+  end
+
+  def header
+    return @header
+  end
+
+  def body
+    return @body
+  end
+
+end
+
+require "tkscrollbox"
+
+my_appname = Tk.appname('tkbiff')
+$top = TkRoot.new
+if ((TkWinfo.interps($top) - [my_appname]).find{|ip| ip =~ /^tkbiff/})
+  STDERR.print("Probably other 'tkbiff's are running. Bye.\n")
+  exit
+end
+
+$top.withdraw
+$list = TkScrollbox.new($top) {
+  relief 'raised'
+  width 80
+  height 8
+  setgrid 'yes'
+  pack
+}
+TkButton.new($top) {
+  text 'Dismiss'
+  command proc {$top.withdraw}
+  pack('fill'=>'both','expand'=>'yes')
+}
+$top.bind "Control-c", proc{exit}
+$top.bind "Control-q", proc{exit}
+$top.bind "space", proc{exit}
+
+$spool_size = 0
+$check_time = Time.now
+
+def check
+  $check_time = Time.now
+  size = File.size($spool)
+  if size and size != $spool_size
+    $spool_size = size
+    pop_up if size > 0
+  end
+  Tk.after 5000, proc{check}
+end
+
+if defined? Thread
+  Thread.start do
+    loop do
+      sleep 600
+      if Time.now - $check_time > 200
+        Tk.after 5000, proc{check}
+      end
+    end
+  end
+end
+
+def pop_up
+  outcount = 0;
+  $list.delete 0, 'end'
+  f = open($spool, "r")
+  while !f.eof?
+    mail = Mail.new(f)
+    date, from, subj =  mail.header['Date'], mail.header['From'], mail.header['Subject']
+    next if !date
+    y = m = d = 0
+    y, m, d = parsedate(date) if date
+    from = "sombody@somewhere" if ! from
+    subj = "(nil)" if ! subj
+    from = decode_b(from)
+    subj = decode_b(subj)
+    $list.insert 'end', format('%-02d/%02d/%02d [%-28.28s] %s',y,m,d,from,subj)
+    outcount += 1
+  end
+  f.close
+  if outcount == 0
+    $list.insert 'end', "You have no mail."
+  else
+    $list.see 'end'
+  end
+  $top.deiconify
+  Tk.after 2000, proc{$top.iconify}
+end
+
+$list.insert 'end', "You have no mail."
+check
+Tk.after 2000, proc{$top.iconify}
+begin
+  Tk.mainloop
+rescue
+  `echo #$! > /tmp/tkbiff`
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkbrowse.rb b/ruby_1_8_6/ext/tk/sample/tkbrowse.rb
new file mode 100644
index 0000000000..4893f57f95
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkbrowse.rb
@@ -0,0 +1,79 @@
+#!/usr/bin/env ruby
+#
+# This script generates a directory browser, which lists the working
+# directory and allows you to open files or subdirectories by
+# double-clicking.
+
+# Create a scrollbar on the right side of the main window and a listbox
+# on the left side.
+
+require "tkscrollbox"
+
+# The procedure below is invoked to open a browser on a given file;  if the
+# file is a directory then another instance of this program is invoked; if
+# the file is a regular file then the Mx editor is invoked to display
+# the file.
+
+$dirlist = {}
+
+def browsedir (dir)
+  if $dirlist.key? dir
+    $dirlist[dir]
+  else
+    top = if $dirlist.size > 0 then TkToplevel.new else nil end
+    list = TkScrollbox.new(top) {
+      relief 'raised'
+      width 20
+      height 20
+      setgrid 'yes'
+      pack
+    }
+    list.insert 'end', *`ls #{dir}`.split
+
+    # Set up bindings for the browser.
+
+    list.focus
+    list.bind "Control-q", proc{exit}
+    list.bind "Control-c", proc{exit}
+    list.bind "Control-p", proc{
+      print "selection <", TkSelection.get, ">\n"
+    }
+
+    list.bind "Double-Button-1", proc{
+      for i in TkSelection.get.split
+        print "clicked ", i, "\n"
+        browse dir, i
+      end
+    }
+    $dirlist[dir] = list
+  end
+end
+
+def browse (dir, file)
+  file="#{dir}/#{file}"
+  if File.directory? file
+    browsedir(file)
+  else
+    if File.file? file
+      if ENV['EDITOR']
+        system format("%s %s&", ENV['EDITOR'], file)
+      else
+        system "xedit #{file}&"
+      end
+    else
+      STDERR.print "\"#{file}\" isn't a directory or regular file"
+    end
+  end
+end
+
+# Fill the listbox with a list of all the files in the directory (run
+# the "ls" command to get that information).
+
+if ARGV.length>0 
+  dir = ARGV[0]
+else
+  dir="."
+end
+
+browsedir(dir)
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkcombobox.rb b/ruby_1_8_6/ext/tk/sample/tkcombobox.rb
new file mode 100644
index 0000000000..1840270951
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkcombobox.rb
@@ -0,0 +1,426 @@
+#
+#  tkcombobox.rb : TkAutoScrollbox & TkCombobox
+# 
+#                         by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+class TkAutoScrollbox < TkListbox
+  include TkComposite
+
+  @@up_bmp = TkBitmapImage.new(:data=><<EOD)
+#define up_arrow_width 9
+#define up_arrow_height 9
+static unsigned char up_arrow_bits[] = {
+   0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x38, 0x00, 0x7c, 0x00,
+   0x7c, 0x00, 0xfe, 0x00, 0x00, 0x00};
+EOD
+
+  @@down_bmp = TkBitmapImage.new(:data=><<EOD)
+#define up_arrow_width 9
+#define up_arrow_height 9
+static unsigned char down_arrow_bits[] = {
+   0x00, 0x00, 0xfe, 0x00, 0x7c, 0x00, 0x7c, 0x00, 0x38, 0x00, 0x38, 0x00,
+   0x10, 0x00, 0x10, 0x00, 0x00, 0x00};
+EOD
+
+  ############################
+  private
+  ############################
+  def initialize_composite(keys={})
+    keys = _symbolkey2str(keys)
+
+    @initwait = keys.delete('startwait'){300}
+    @interval = keys.delete('interval'){150}
+    @initwait -= @interval
+    @initwait = 0 if @initwait < 0
+
+    @lbox = TkListbox.new(@frame, :borderwidth=>0)
+    @path = @lbox.path
+    TkPack.propagate(@lbox, false)
+
+    @scr = TkScrollbar.new(@frame, :width=>10)
+
+    @lbox.yscrollcommand(proc{|*args| @scr.set(*args); _config_proc})
+    @scr.command(proc{|*args| @lbox.yview(*args); _config_proc})
+
+    @up_arrow   = TkLabel.new(@lbox, :image=>@@up_bmp, 
+                              :relief=>:raised, :borderwidth=>1)
+    @down_arrow = TkLabel.new(@lbox, :image=>@@down_bmp, 
+                              :relief=>:raised, :borderwidth=>1)
+
+    _init_binding
+
+    @lbox.pack(:side=>:left, :fill=>:both, :expand=>:true)
+
+    delegate('DEFAULT', @lbox)
+    delegate('background', @frame, @scr)
+    delegate('activebackground', @scr)
+    delegate('troughcolor', @scr)
+    delegate('repeatdelay', @scr)
+    delegate('repeatinterval', @scr)
+    delegate('relief', @frame)
+    delegate('borderwidth', @frame)
+
+    delegate_alias('arrowrelief', 'relief', @up_arrow, @down_arrow)
+    delegate_alias('arrowborderwidth', 'borderwidth', @up_arrow, @down_arrow)
+
+    scrollbar(keys.delete('scrollbar')){false}
+
+    configure keys unless keys.empty?
+  end
+
+  def _show_up_arrow
+    unless @up_arrow.winfo_mapped?
+      @up_arrow.pack(:side=>:top, :fill=>:x)
+    end
+  end
+
+  def _show_down_arrow
+    unless @down_arrow.winfo_mapped?
+      @down_arrow.pack(:side=>:bottom, :fill=>:x) 
+    end
+  end
+
+  def _set_sel(idx)
+      @lbox.activate(idx)
+      @lbox.selection_clear(0, 'end')
+      @lbox.selection_set(idx)
+  end
+
+  def _check_sel(cidx, tidx = nil, bidx = nil)
+    _set_sel(cidx)
+    unless tidx
+      tidx = @lbox.nearest(0) 
+      tidx += 1 if tidx > 0
+    end
+    unless bidx
+      bidx = @lbox.nearest(10000) 
+      bidx -= 1 if bidx < @lbox.index('end') - 1
+    end
+    if cidx > bidx
+      _set_sel(bidx)
+    end
+    if cidx < tidx
+      _set_sel(tidx)
+    end
+  end
+
+  def _up_proc
+    cidx = @lbox.curselection[0]
+    idx = @lbox.nearest(0)
+    if idx >= 0
+      @lbox.see(idx - 1)
+      _set_sel(idx)
+      @up_arrow.pack_forget if idx == 1
+      @up_timer.stop if idx == 0
+      _show_down_arrow if @lbox.bbox('end') == []
+    end
+    if cidx && cidx > 0 && (idx == 0 || cidx == @lbox.nearest(10000))
+      _set_sel(cidx - 1)
+    end
+  end
+
+  def _down_proc
+    cidx = @lbox.curselection[0]
+    eidx = @lbox.index('end') - 1
+    idx = @lbox.nearest(10000)
+    if idx <= eidx
+      @lbox.see(idx + 1)
+      _set_sel(cidx + 1) if cidx < eidx
+      @down_arrow.pack_forget if idx + 1 == eidx
+      @down_timer.stop if idx == eidx
+      _show_up_arrow if @lbox.bbox(0) == []
+    end
+    if cidx && cidx < eidx && (eidx == idx || cidx == @lbox.nearest(0))
+      _set_sel(cidx + 1)
+    end
+  end
+
+  def _key_UP_proc
+    cidx = @lbox.curselection[0]
+    _set_sel(cidx = @lbox.index('activate')) unless cidx
+    cidx -= 1
+    if cidx == 0
+      @up_arrow.pack_forget
+    elsif cidx == @lbox.nearest(0)
+      @lbox.see(cidx - 1)
+    end
+  end
+
+  def _key_DOWN_proc
+    cidx = @lbox.curselection[0]
+    _set_sel(cidx = @lbox.index('activate')) unless cidx
+    cidx += 1
+    if cidx == @lbox.index('end') - 1
+      @down_arrow.pack_forget
+    elsif cidx == @lbox.nearest(10000)
+      @lbox.see(cidx + 1)
+    end
+  end
+
+  def _config_proc
+    if @lbox.size == 0
+      @up_arrow.pack_forget
+      @down_arrow.pack_forget
+      return
+    end
+    tidx = @lbox.nearest(0)
+    bidx = @lbox.nearest(10000)
+    if tidx > 0
+      _show_up_arrow
+      tidx += 1
+    else
+      @up_arrow.pack_forget unless @up_timer.running?
+    end
+    if bidx < @lbox.index('end') - 1
+      _show_down_arrow
+      bidx -= 1
+    else
+      @down_arrow.pack_forget unless @down_timer.running?
+    end
+    cidx = @lbox.curselection[0]
+    _check_sel(cidx, tidx, bidx) if cidx
+  end
+
+  def _init_binding
+    @up_timer = TkAfter.new(@interval, -1, proc{_up_proc})
+    @down_timer = TkAfter.new(@interval, -1, proc{_down_proc})
+
+    @up_timer.set_start_proc(@initwait, proc{})
+    @down_timer.set_start_proc(@initwait, proc{})
+
+    @up_arrow.bind('Enter', proc{@up_timer.start})
+    @up_arrow.bind('Leave', proc{@up_timer.stop if @up_arrow.winfo_mapped?})
+    @down_arrow.bind('Enter', proc{@down_timer.start})
+    @down_arrow.bind('Leave', proc{@down_timer.stop if @down_arrow.winfo_mapped?})
+
+    @lbox.bind('Configure', proc{_config_proc})
+    @lbox.bind('Enter', proc{|y| _set_sel(@lbox.nearest(y))}, '%y')
+    @lbox.bind('Motion', proc{|y| 
+                 @up_timer.stop if @up_timer.running?
+                 @down_timer.stop if @down_timer.running?
+                 _check_sel(@lbox.nearest(y))
+               }, '%y')
+
+    @lbox.bind('Up', proc{_key_UP_proc})
+    @lbox.bind('Down', proc{_key_DOWN_proc})
+  end
+
+  ############################
+  public
+  ############################
+  def scrollbar(mode)
+    if mode
+      @scr.pack(:side=>:right, :fill=>:y)
+    else
+      @scr.pack_forget
+    end
+  end
+end
+
+################################################
+
+class TkCombobox < TkEntry
+  include TkComposite
+
+  @@down_btn_bmp = TkBitmapImage.new(:data=><<EOD)
+#define down_arrow_width 11
+#define down_arrow_height 11
+static unsigned char down_arrow_bits[] = {
+   0x00, 0x00, 0xfe, 0x03, 0xfc, 0x01, 0xfc, 0x01, 0xf8, 0x00, 0xf8, 0x00,
+   0x70, 0x00, 0x70, 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00};
+EOD
+
+  @@up_btn_bmp = TkBitmapImage.new(:data=><<EOD)
+#define up_arrow_width 11
+#define up_arrow_height 11
+static unsigned char up_arrow_bits[] = {
+   0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x70, 0x00, 0x70, 0x00, 0xf8, 0x00,
+   0xf8, 0x00, 0xfc, 0x01, 0xfc, 0x01, 0xfe, 0x03, 0x00, 0x00};
+EOD
+
+  def _button_proc(dir = true)
+    @btn.relief(:sunken)
+    x = @frame.winfo_rootx
+    y = @frame.winfo_rooty
+    if dir
+      @top.geometry("+#{x}+#{y + @frame.winfo_height}")
+    else
+      @btn.image(@@up_btn_bmp)
+      @top.geometry("+#{x}+#{y - @top.winfo_reqheight}")
+    end
+    @top.deiconify
+    @lst.focus
+
+    if (idx = values.index(@ent.value))
+      @lst.see(idx - 1)
+      @lst.activate(idx)
+      @lst.selection_set(idx)
+    elsif @lst.size > 0
+      @lst.see(0)
+      @lst.activate(0)
+      @lst.selection_set(0)
+    end
+    @top.grab
+
+    begin
+      @var.tkwait
+      if (idx = @var.to_i) >= 0
+        @ent.value = @lst.get(idx)
+      end
+      @top.withdraw
+      @btn.relief(:raised)
+      @btn.image(@@down_btn_bmp)
+    rescue
+    ensure
+      begin
+        @top.grab(:release)
+        @ent.focus
+      rescue
+      end
+    end
+  end
+  private :_button_proc
+
+  def _init_bindings
+    @btn.bind('1', proc{_button_proc(true)})
+    @btn.bind('3', proc{_button_proc(false)})
+
+    @lst.bind('1', proc{|y| @var.value = @lst.nearest(y)}, '%y')
+    @lst.bind('Return', proc{@var.value = @lst.curselection[0]})
+
+    cancel = TkVirtualEvent.new('2', '3', 'Escape')
+    @lst.bind(cancel, proc{@var.value = -1})
+  end
+  private :_init_bindings
+
+  def initialize_composite(keys={})
+    keys = _symbolkey2str(keys)
+
+    @btn = TkLabel.new(@frame, :relief=>:raised, :borderwidth=>3, 
+                       :image=>@@down_btn_bmp).pack(:side=>:right, 
+                                                    :ipadx=>2, :fill=>:y)
+    @ent = TkEntry.new(@frame).pack(:side=>:left)
+    @path = @ent.path
+
+    @top = TkToplevel.new(@btn, :borderwidth=>1, :relief=>:raised) {
+      withdraw
+      transient
+      overrideredirect(true)
+    }
+
+    startwait = keys.delete('startwait'){300}
+    interval = keys.delete('interval'){150}
+    @lst = TkAutoScrollbox.new(@top, 
+                               :startwait=>startwait, 
+                               :interval=>interval).pack(:fill=>:both, 
+                                                         :expand=>true)
+    @ent_list = []
+
+    @var = TkVariable.new
+
+    _init_bindings
+
+    delegate('DEFAULT', @ent)
+    delegate('height', @lst)
+    delegate('relief', @frame)
+    delegate('borderwidth', @frame)
+
+    delegate('arrowrelief', @lst)
+    delegate('arrowborderwidth', @lst)
+
+    if mode = keys.delete('scrollbar')
+      scrollbar(mode)
+    end
+
+    configure keys unless keys.empty?
+  end
+  private :initialize_composite
+
+  def scrollbar(mode)
+    @lst.scrollbar(mode)
+  end
+
+  def _reset_width
+    len = @ent.width
+    @lst.get(0, 'end').each{|l| len = l.length if l.length > len}
+    @lst.width(len + 1)
+  end
+  private :_reset_width
+
+  def add(ent)
+    ent = ent.to_s
+    unless @ent_list.index(ent)
+      @ent_list << ent
+      @lst.insert('end', ent)
+    end
+    _reset_width
+    self
+  end
+
+  def remove(ent)
+    ent = ent.to_s
+    @ent_list.delete(ent)
+    if idx = @lst.get(0, 'end').index(ent)
+      @lst.delete(idx)
+    end
+    _reset_width
+    self
+  end
+
+  def values(ary = nil)
+    if ary
+      @lst.delete(0, 'end')
+      @ent_list.clear
+      ary.each{|ent| add(ent)}
+      _reset_width
+      self
+    else
+      @lst.get(0, 'end')
+    end
+  end
+
+  def see(idx)
+    @lst.see(@lst.index(idx) - 1)
+  end
+
+  def list_index(idx)
+    @lst.index(idx)
+  end
+end
+
+
+################################################
+# test
+################################################
+if __FILE__ == $0
+  v = TkVariable.new
+  e = TkCombobox.new(:height=>7, :scrollbar=>true, :textvariable=>v, 
+                     :arrowrelief=>:flat, :arrowborderwidth=>0, 
+                     :startwait=>400, :interval=>200).pack
+  e.values(%w(aa bb cc dd ee ff gg hh ii jj kk ll mm nn oo pp qq rr ss tt uu))
+  #e.see(e.list_index('end') - 2)
+  e.value = 'cc'
+  TkFrame.new{|f|
+    fnt = TkFont.new('Helvetica 10')
+    TkLabel.new(f, :font=>fnt, :text=>'TkCombobox value :').pack(:side=>:left)
+    TkLabel.new(f, :font=>fnt, :textvariable=>v).pack(:side=>:left)
+  }.pack
+
+  TkFrame.new(:relief=>:raised, :borderwidth=>2, 
+              :height=>3).pack(:fill=>:x, :expand=>true, :padx=>5, :pady=>3)
+
+  l = TkAutoScrollbox.new(nil, :relief=>:groove, :borderwidth=>4, 
+                          :width=>20).pack(:fill=>:both, :expand=>true)
+  (0..20).each{|i| l.insert('end', "line #{i}")}
+
+  TkFrame.new(:relief=>:ridge, :borderwidth=>3){
+    TkButton.new(self, :text=>'ON', 
+                 :command=>proc{l.scrollbar(true)}).pack(:side=>:left)
+    TkButton.new(self, :text=>'OFF', 
+                 :command=>proc{l.scrollbar(false)}).pack(:side=>:right)
+    pack(:fill=>:x)
+  }
+  Tk.mainloop
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkdialog.rb b/ruby_1_8_6/ext/tk/sample/tkdialog.rb
new file mode 100644
index 0000000000..00cc12ab11
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkdialog.rb
@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+require "tk"
+
+root = TkFrame.new
+top = TkFrame.new(root) {
+  relief 'raised'
+  border 1
+}
+msg = TkMessage.new(top) {
+  text "File main.c hasn't been saved to disk since \
+it was last modified.  What should I do?" 
+  justify 'center'
+  aspect 200
+  font '-Adobe-helvetica-medium-r-normal--*-240*'
+  pack('padx'=>5, 'pady'=>5, 'expand'=>'yes')
+}
+top.pack('fill'=>'both')
+root.pack
+
+bot = TkFrame.new(root) {
+  relief 'raised'
+  border 1
+}
+
+TkFrame.new(bot) { |left|
+  relief 'sunken'
+  border 1
+  pack('side'=>'left', 'expand'=>'yes', 'padx'=>10, 'pady'=> 10)
+  TkButton.new(left) {
+    text "Save File"
+    command "quit 'save'"
+    pack('expand'=>'yes','padx'=>6,'pady'=> 6)
+    top.bind "Enter", proc{state 'active'}
+    msg.bind "Enter", proc{state 'active'}
+    bot.bind "Enter", proc{state 'active'}
+    top.bind "Leave", proc{state 'normal'}
+    msg.bind "Leave", proc{state 'normal'}
+    bot.bind "Leave", proc{state 'normal'}
+    Tk.root.bind "ButtonRelease-1", proc{quit 'save'}
+    Tk.root.bind "Return", proc{quit 'save'}
+  }
+}
+TkButton.new(bot) {
+  text "Quit Anyway"
+  command "quit 'quit'"
+  pack('side'=>'left', 'expand'=>'yes', 'padx'=>10)
+}
+TkButton.new(bot) {
+  text "Return To Editor"
+  command "quit 'return'"
+  pack('side'=>'left', 'expand'=>'yes', 'padx'=>10)
+}
+bot.pack
+root.pack('side'=>'top', 'fill'=>'both', 'expand'=>'yes')
+
+def quit(button)
+  print "You pressed the \"#{button}\" button;  bye-bye!\n"
+  exit
+end
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/Orig_LICENSE.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/Orig_LICENSE.txt
new file mode 100644
index 0000000000..71e359559a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/Orig_LICENSE.txt
@@ -0,0 +1,61 @@
+
+  #########################################################################
+  ### The following text is the original file of the Tcl/Tk extension.  ###
+  ### Icon data files ( those are 'tkIcons', 'tkIcons-sample.kde', and  ###
+  ### 'tkIcons.kde' ) are quoted from the source archive of ICONS       ###
+  ### extension. As the following document describes, those icon images ###
+  ### are not applied the license.                                      ###
+  #########################################################################
+
+
+IMPORTANT LICENSE INFORMATION
+=============================
+
+The following terms (based on the standard TCL/TK license) apply to all files
+contained in this package, <b>except</b> the icon images.
+
+The icon images can be freely distributed. If you require clarification of
+copyright/license details for the images, please contact the appropriate
+creator/maintainer.
+
+ICONS: LICENSE TERMS
+====================
+
+This software (ICONS) is Copyright 2002 by Adrian Davis (adrian@satisoft.com).
+The following terms apply to all files associated with the software except
+where noted above. 
+
+The author hereby grants permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that
+this notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file
+where they apply. 
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGE. 
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
+OR MODIFICATIONS. 
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
+are acquiring the software on behalf of the Department of Defense,
+the software shall be classified as "Commercial Computer Software"
+and the Government shall have only "Restricted Rights" as defined in
+Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing,
+the authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license.
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/tkIcons b/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/tkIcons
new file mode 100644
index 0000000000..0d5b2c8695
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/tkIcons
@@ -0,0 +1,195 @@
+actattach16:act act16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBPz+/AQCBAAAACH5BAEAAAAALAAAAAAQABAAAAI2hAOCxg2h0nJHyEshi9HpxU1GOCLdZoKpQ15nibUoprKp9lh2oucUxsBRXsJh4Hjs/QTMpr8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actbookmark16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actbookmarknew16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy6vERGRFRWVDQyNKSipAQCBMTGxKyurISChJSSlJyanHR2dIyKjPz+xISGhPz+BGxubMTCBHx+fPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVfICACwWieY1CibCCsrBkMb0zchTEcNYsIiYHiwIOdEAvigdFQGE0Ix4NBbSAgsWjk+jBIAlcUYrJASChnSXZSoUDelKfoKpFALJA61ueGI2IAZmhogGFmCGGAgXsifiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actcheck16:act act16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBMT+xATCBASCBARCBAQCBEQCBAAAACH5BAEAAAAALAAAAAAQABAAAAM2CLrc/itAF8RkdVyVye4FpzUgJwijORCGUhDDOZbLG6Nd2xjwibIQ2y80sRGIl4IBuWk6Af4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actcross16:act act16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/PwCBMQCBEQCBIQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMuCLrc/hCGFyYLQjQsquLDQ2ScEEJjZkYfyQKlJa2j7AQnMM7NfucLze1FLD78CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actexit16:act act16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBDQyNHR2dCH5BAEAAAAALAAAAAAQABAAAAI4hI+pFrHb3nEg1iWiDiINCwYDko0V9XUTda6I1TIsUMpGinyzbB6ZeGuoEr+GUDL4CXqSphPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+acthelp16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQ6XAQCBCyCvARSjAQ+ZGSm1ARCbEyWzESOxIy63ARalAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ/EEgQqhUz00GEJx2WFUY3BZw5HYh4cu6mSkEy06B72LHkiYFST0NRLIaa4I0oQyZhTKInSq2eAlaaMAuYEv0RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actitemadd16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBARCZPz+/Mzq9BTC3ITC1HSyzGSivAw+XBSStIS6zHy2zAQCDFyatAQOHFSStEyOtAQSJBSq1DR2nCxunCRmlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICCOQTmeaCAMRIC+AVu47xkTBl2Ld16XQNYBQTQBVIOkMHFQJBeMI4tAbSSu2IRDSnhAvFfI97sFRM6RwOMacbjLKckVvgvIJ5EdSU7J648VgXQ7Dmd/hyJ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actitemdelete16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBARCZPz+/Mzq9BTC3AQCDAQOHFSStAQSJAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQwEMhJq704681n+GAISoEwnGg6EAUQrEQsz4ThEkeu77kNIAagMEj0dY7IpHI58UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actlock16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJEQ+FExGHCQiDBwaDGxiLHxyNHRuPIR+TIyGZJSSfFxaRFxWJGRiLJyaXNzWpNTOnMzGnLy2hJSKTGReLKyqjPTu1NzarMS+jLSyfKyibJySXIyGVCQeDLSytPT29Ozu7OTi5NTS1KyurJSSjGxqVFxaXLS2tKSebOzuzLSufJSOXExGLGRiTExONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwGCgGhkhkQDBoEpLKQoBACAyOUID1qTVwoQGvMPxNFgVjAxp6QCQUicSCwVgkG44HJCKRRCYUCAxIFRYXhxgZGhYbHINEHR4fGCAhIiMkFSVKJicoKSoFKwMsLZtDLison6GjLA92qCueoAUvpC2xQhWqrLYDErmEMDEXlDIwMxAHukI0NS01EzY2NAmPAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actredo16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxOHBxSHBRGHKzCtNzu3MTSzBQ2FLzSxIzCjCSKFCyeHDzCLAxGHAwuFDSCNBxKLES+NHSmfBQ6FBxWJAQaDAQWFAw+HDSyLJzOnISyjMTexAQOBAwmDAw+FMzizAQODDymNKzWrAQKDAwaDEy6TFTGTFSyXDyKTAQCBAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ2QIBwSCwaj0hAICBICgcDQsEgaB4PiIRiW0AEiE3sdsFgcK2CBsCheEAcjgYjoigwJRM2pUK0XDAKGRobDRwKHUcegAsfExUdIEcVCgshImojfEUkCiUmJygHACkqHEQpqKkpogAgK5FOQywtprFDKRwptrZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actreload16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCRaJBxWJBxOHBRGBCxeLLTatCSKFCymJBQ6BAwmBNzu3AQCBAQOBCRSJKzWrGy+ZDy+NBxSHFSmTBxWHLTWtCyaHCSSFCx6PETKNBQ+FBwaHCRKJMTixLy6vExOTKyqrFxaXDQyNDw+PBQSFHx6fCwuLJyenDQ2NISChLSytJSSlFxeXAwODCQmJBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIBQGBAMBALCcCksGA4IQkJBUDIDC6gVwGhshY5HlMn9DiCRL1MyYE8iiapaSKlALBdMRiPckDkdeXt9HgxkGhWDXB4fH4ZMGnxcICEiI45kQiQkDCUmJZskmUIiJyiPQgyoQwwpH35LqqgMKiEjq5obqh8rLCMtowAkLqovuH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actrun16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/ISChKSipMTCxLS2tLy+vMzOzMTGxNTS1AAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARlEMgJQqDYyiDGrR8oWJxnCcQXDMU4GEYqFN4UEHB+FEhtv7EBIYEohkjBkwJBqggEMB+ncHhaBsDUZmbAXq67EecQ02x2CMWzkAs504gCO3qcDZjkl11FMJVIN0cqHSpuGYYSfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actstop16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/Gw6NGQuLHQ6NGQmJFweHFQaFPTm5PTa3PTW1Oy+vOS6tNSinKReVDQWFPz+/Nx6fNyCfNyGhNR+dMxybMRiXLxGRIwWFNx2dNx+fNx2bMxuZLQWFBwWFPTu7Pzy9NRqZNRuZMRSVLwmJGwWFNR2dMQiHPTKxMxmXMQyLMxmZNx6dMxiXMRSRMRaVKxybMxaVEQWFMQuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaaQIAQEBAMCAWDYcgkHhAJxYLRcDQBggckIplQKpaLdRh4YDIaSWa94Vw6woAHgv6AMKGPaMQhwQMJJRkfhHmEJhdvRCcgGSCEkCgpbnAECiorGYYfLCItlAAFCygQj5AfbYlwBQwVE5AukG6KBi8tMC0fLi0pHxyzcAAxFxwmMny/wEwOxMm/qlcdJCSJ1H5XQh3a28HY3kx+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actundo16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxSHBxOHMTSzNzu3KzCtBRGHCSKFIzCjLzSxBQ2FAxGHDzCLCyeHBQ+FHSmfAwuFBxKLDSCNMzizISyjJzOnDSyLAw+FAQSDAQeDBxWJAwmDAQOBKzWrDymNAQaDAQODAwaDDyKTFSyXFTGTEy6TAQCBAQKDAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ1QIBwSCwaj0hiQCBICpcDQsFgGAaIguhhi0gohIsrQEDYMhiNrRfgeAQC5fMCAolIDhD2hFI5WC4YRBkaBxsOE2l/RxsHHA4dHmkfRyAbIQ4iIyQlB5NFGCAACiakpSZEJyinTgAcKSesACorgU4mJ6uxR35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actunlock16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJExGHEQ+FCQiDBwaDBweDGxiLHxyNHRuPIR+RIyGZJSSfFxaRGxmLJyaXNzWpNTOnMzGnMS+jJSKTGReLKyqjPTu1NzarLSufKyibJySXIyGVGxiNFxaXLSytPT29Ozu7OTi5NTS1KyurGxqVCQeDJSSjLS2tNTW1KSmpGRiLKSebOzuzJSOXExONExGLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaVQIBwOAwYA8SkMCAYOAnKYiFAIAQGyOgVCggYuEovVxztMpdnwAGRSCgUCwOjIeQ6HpCIZDKRUNYMRBUWF4UYGRoWGxyBRR0eHxgaICEiIyR0QyUmJygpKgUrAxMsLUQlKyieoKIuEAunK52fBS8DLiywQySpnjC1Mbi6QjIzNBeSIBY1EQfDQgosLAEUNjY3Co1DfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appbook16:app app16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBDyKhDSChGSinFSWlEySjCx+fHSqrGSipESOjCR6dKTGxISytIy6vFSalBxydAQeHHyurAxubARmZCR+fBx2dDyKjPz+/MzKzLTS1IyOjAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVkICCOZGmKQXCWqTCoa0oUxnDAZIrsSaEMCxwgwGggHI3E47eA4AKRogQxcy0mFFhgEW3MCoOKBZsdUrhFxSUMyT7P3bAlhcnk4BoHvb4RBuABGHwpJn+BGX1CLAGJKzmKjpF+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appbookopen16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExCNGSenHRmVCwqJPTq1GxeTHRqXPz+/DwyJPTq3Ny+lOzexPzy5HRuVFSWlNzClPTexIR2ZOzevPz29AxqbPz6/IR+ZDyKjPTy5IyCZPz27ESOjJySfDSGhPTm1PTizJSKdDSChNzWxMS2nIR6ZKyijNzOrOzWtIx+bLSifNTGrMy6lIx+ZCRWRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQEAAQCwWBYJiYEAoGAFIw0E5QCScAIVikUgQqNargtFwdB9KSDhxiEjMiUlgHlB3E48IpdKdLCxzEAQJFxUTblwJGH9zGQgVGhUbbhxdG4wBHQQaCwaTb10emB8EBiAhInp8CSKYIw8kDRSfDiUmJ4xCIxMoKSoRJRMrJyy5uhMtLisTLCQkC8bHGBMj1daARgEjLyN03kPZc09FfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appboxes16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+xAT+BASCBATCBMT+/AT+/ASChATCxPz+xPz+BISCBMTCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgZwrwYBCFqvhs3DNYXjChRlWBRjIRqGN4UuEUczMZxsDeXykdEsDQVVSLhQxhBCkVlmXA+KVHFYhFYOoHbMGN6pTQaW8YYiQmcG+q16a0+Zipw+4e9B/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+appbox16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+xISCBMTCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANECKoR6ys2IVqokF08yMTA1gwkYX5WQK5ma4VceTYPxXnBWdtY6+0834/Bowgzm6APWRQcH4TiMhPK2WYRiZWW7XK7/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appbrowser16:app app16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxONCROfCRKfKx6LNy+bNTOpGSS1DRupAwyXBRSnPTSjPTqvOzqzMzSvHSSlKy6ZDxutAxCpBQ2XBxepLTKvPzqzPzy5OTShLS2dLSqRFR2jBRerBQ+jOTixOzetNS2XHx6XDR2tCRexBwyTDyKzOTavPzq1OzKdCx23BRKtCQ6VCQmHFSa7IyirOzSnGSGpIR+bFSO1DyK7DR+5CRixBw2VDQuHFye7IS27NzGXISuhEyS5DR25BRWxBQ+lBQyXCQqPCxSfGyu7GyerKy2ZFR+rERqfCRmxBROtBQ+fBwuTBwmNDSW9JyabLyqRIx+TExSXBQ6bAQCBBQ6ZBxapDR+zBxq3LyaLJySRHxqPGxeNBxGbCRmrHRyRERONDRKNDQ2JCQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAeygACCg4SFhgABAQIDh4MBBAUGBwgDCYcKCwwNDg8QERIThRQVFhcNGBkaGxwdoYMDHhcXHxggISIjEiSvJSYXJwsoISkpIyorLIIDLS4WLzAxMjM0NSo2N8o4OS46OzwzPSk+P0BBgkI8Q0NERUZHCEhJSktMgwk4Qy1NTk9QUVJLphCiUsWKlStYsmjZQiJgIS4KuijQ4iXAFxYCDVFJwGUFmDBhMjYSw0KMyEYoBfkJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appcalc16:app app16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChPz+/AQCBCH5BAEAAAAALAAAAAAQABAAAAI4hI9pwe0Ogpi00hHF2LzzzFlTsIHD45SSx6oCeW4wjK2tl83y7t64pIsJaxrfh2bEAJIlhRPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appclock16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAALy+vAQCBPwCBMQCBIQCBISChPz+/MTCxCH5BAAAAAAALAAAAAAQABAAAANbCLHcrSLKOZcYmDSCsR1aUABAsXDDJwJGa5SBFwgaWxbCG3CWaBwG3C8Y67FawpYiNQscg65fsVkYuoAmJs1pBR522lQB6ILJLqHRwQQOZzYdZnw+dzruDIA/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appdate16:app app16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPzerPyqXMRaBIQCBISChPz+/KSipMTCxPz+BMTCBPwCBPz+xPzCxMQCBISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVxICCOQGCeJjkGwkC8RFEEavkax2G8dB0QuRyhhzoBg8MSYsncJXKJZIDZHCoWP1ogGIwGrtnSgUFmHLyNRHhrdpjRamnO/SYkromHdnxwnwkKVxByZW8DgQsQM2JcfwZXO0MBCZSVBgMuLzJaRZ0pfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+apppencil16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/IQCBMQCBPzCxAQCBPz+/MTCxISChDQyNKSipEQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARDEMhJZRBD1H2z3lMnjKCFjUJQimOgcmcbELCXzjXq0hV785WCQYcDFQjDXeloMByKG6YTAdwIDAlqSZJSVFeKLcUfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appsheet16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAT+/Pz+/KSipPz+BAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANFCBDc7iqIKUW98WkWpx1DAIphR41ouWya+YVpoBAaCKtMoRfsyue8WGC3YxBii5+RtiEWmASFdDVs6GRTKfCa7UK6AH8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+apptool16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBISChGRmZMTCxKSipLS2tHx6fPz+/OTm5FxaXOzu7DQyNMzOzAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMhAq7wYBDECKVSGBcbRfcEYauSZXgFCrEEXgDCSeIEyzKSXZoBYVCoJVIqBGByKu0Cy8QHxmgNngWCkGgqsGWFseu6oMApoXHAWhWnKrv0UqeYDe0YO10/6fhJ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+apptools16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExKTERCRAQCBOzu7Nze3MzKzLy+vCxqZBQ2NJyanKyqrGRiZDRydKza3FRWVPT29LSytDw6PMTm5EySjCxaXGRaJFSanCRSVGxqbPTmvMSqVJTW1GSurHS6vOzq7KSipISChFRKHJSGNPz23GxKFBQ6PKyurCwqLMyufJx2RAQGBJSWlEwyDIRiLNy+lLSKVDwmDJRuNOTOrLyabGRCFDx2dKSCVOzWtHzCxOTGnNSyhAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQIBwCAgIBAOiUiggFAyHASKxDAwUC8Zg0HAglA9IZPGQABoTSqJCFTIOEIsFgHBcEhhHUpKJFCwaGxYYHB0VEx4IEh8gIQwiIyQbJRMcHokmEicfDygAkCkqJQgIGG0rLElCLS4vMCWqQwMCQg0UMTIzNDVLQjaIGDE3ODQlS785CEkxKjowvEOHybG4O6JDCdNKuDUxRAmxRDHeveUAfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appuser16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MTCxISChMT+/ATCxASChFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMg5gw00yyDGIAR1YUDggeFWFIZhnSBZrsZxdIOFEGTA2oeBAHeyuGwvzxBlYdUOLROMFzDQntJPrNoqAKUBaqnV+k57ZORruykHDj2LqIzUVKp1u0iuB/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+appusers16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxISChAT+BMRaBPyqXARCBPz+/FxaXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARLEIRJa5Ui673nsGAgeKE1Bl9AUEXbiqTlFlZaGUZoszm4BzhDAVf5BYbAXI+TAR6CS2ZGSZSEiIIqYIsSIEaJ7GRrlY7J1lKA7I8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+appwp16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBKSinJyOfPz27Pzy7AwKDExOTJyWlERCRKSelPz69LyyrKymnPz+/MS2fDQyJAQCBOTazLSiXOzivMS2jKSSVOzmxPz25NzSpPTu5KyebOzixNTGjOTWpMSydMSybCwqFGReVKyaXNzSnGxeNJSCVMS2nPz23MSuZIR+bJyShLyqnOTOtGxiXIR6XOTSvIx6RMSubIyCdKSalMS6pOTWxMzKvKSabJyKTOzezHxuPGRmZKyurMTCvPTq3AAAACH5BAEAAAAALAAAAAAQABAAAAajQIBwCAgIiEhiYEA4FgwHRDKhIBAWz4OhgGQ0FAPHA7qFEBONb0Qy0ULeQ2+aUrFcMI+3GYBOZzQbHB0eHyAhIQByDREiEwMjFRIkJQImAgJ+jScjHigkKSorLC0AKg2NFSMoki4qCy+IQgITKDAxkjIzNDWkQxQoJaskMgk2Eb1DNzgoOCoHDDY5yEIwJToAOzw9ET7TQiREAhkZ3kmy5QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+cal1day16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANOCLrMEUDIOUS9AFLLhx8LIRZjKYZmMRCkaChFLHty/AIiS3y6q+QtT49wq8VotRtQJGwRf6Zmrlj7DJLQXsupTJmeEIN4TB5nII20wp8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+cal5days16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANMCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiIdMmcec7jy53q81qP9OO5VMAj8RXTFWzOZW95HDLdEEM4LA4nIE0zgp/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+cal7days16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANPCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiwcp0fucsj873qvGMv5Jw2FIACUsW4WakGW1O046I05qmGYBhTC6TM5CGWuFPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+calappointment16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxPz+BISCBISChKSipAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARbEMhJaQhA6D1E/wDGeeRgDhOhFoTBEi+REgdrIHScSEVvAD9Xr7cDqGSGpFEnQSqTv2NxCFQOiU1VEAiTZmstHFg1vQKuw+LxxfYaV/AuOQRI2O/4ewhT6Uv8EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+calbell16:cal cal16 16:photo:16 16:R0lGODlhDwAOAIIAAPwCBISCBPz+BIQCBMTCxISChPz+/AQCBCH5BAEAAAAALAAAAAAPAA4AAAM+CLrR+zCIAWsgLVRGRBhOVQiG94WPVAbHaZHYAWqRYLbge88RsbInGuBCEhRYrZYm4xk4nYdoKzKIbiKHawIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+callist16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/KSipPzerMRaBEQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARDEMhJaQhA6D1E/wDGeeRgDhOhruyatjBRSIRxxOsMEAdC0BUZDcfSEYvDo3Bn++2Cxt7RqFxWhZiCdsvdhjCVsMQfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+calmonth16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANSCLrMEUDIOUS9AFLLhx8LIRZjKYbiRxLFIBpK0Q6z7MkwkJIe8b0KEeuWchFysuStVsjtfMbeMQitWpG25YfmNK1WU53XNIUYzug0OgNpuBX+BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+caltoday16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxKSipPyCBMRaBPyqXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARTEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyIQhFfiBIAfuFzaAioBIJBCummRYPCaDPh3vhwsOZdihNfa8Ub/AJXemFZPPNBvGwG672yFMZS7xRwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+caltodo16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBAT+BAQC/AQCjPz+/MTCxPzCxKSipPwCBMQCBIQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARaEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyMYhFXiuFwZiA6qZYbbqJX5BIw2RAPxwAAWCyWMCCsiXFGEEErKz6LQZfOqiTR1YJiGq1rFyyHmo2+/1EKbCl/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+connecting16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZbihUiz60FPnfaA0iBpBVGdHEYWxToEoSHBRHHM9AgSEQRcj+AYkYAJxIPKQFUJiOdTJQFIDU6dYzKKFhTCM+E5g4mXaDAyrlogEG+DGTecA7wsP8EcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+connectno16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBAQCBERCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARPEMhJq704axBEHoPUEdhQGMNYFuwxkKInDYjBniEnwMCQIIebSzXx/WwsFK+YMABZikWuYlrUCtZpEYv4WRPaHhb064YB41kCfJFSQBh/BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+connectyes16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/KSipDQyNMTCxMTGxISChFxaXMzGzAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZxCjgsAtDtUlCOA1gJQ4kl/IDatAoF7xxkS6GgEBr6jAobCyBX42SQBxMOx6A8MhiGASR8YDgrYsNEeJ0zaEGZY7uoH2oB6nOUwtbdLaVOeTUwo/8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+devcdmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tOzOvNTqvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/LzKvMTCxDQyNASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAa0QIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTBqUiuUCVmAeiYzmsKlwOt/AAKFIFAIIFx4WHyAhUwIDIgsZFyMkFxchJSYmiBkSBBoIJJwIGgOhiCYFJSEnFyQjFwNZewABISAfFiYnCAEmCREIrwAIFhwVGwcaBAkPGApsQsAVFA0GBQMRbxBTKM0ODQwTEq192ClDgROkBHvYKuNJUu5CKCorX1RDKCkpUn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+devcdunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tNzmvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/MTCxLy6vDQyNOTm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAapQIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTLqUigWsuDwSmMxBQ9lwvoEBQpEoBBAWHRseHyBTAgMhCxgWIiMWFiASJCSHEgQSGQgjmwglGKCHBQUSICYWIyIWAwshIVMBIB8eFSQmCAEFCREIekIIFRsUGgcZEgkPFydrvxUUDg0GBSEREGJfv9AMEySsJxDYQ4DcEhh64UpS6lTs7QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+devdiskmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKROzSrOzKpOTGnLSafLySZKxuLMSOVPTWvPzixLSehNyibOzOrGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTOpHxOJKyKXFw+HKSipISChMTCxFxaXIRiPNSWXExOTOS2hLR+PLRyLPTWtMyOTASCBARCBPz+/DTSJIyKjIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwrA3HQ7scQAqFAcEQOUi0zAkFUSFYLghMBloUCDQNGxwdHhwHekcfICEhICIfIxkLJBABJUYCICABIhAOBiYnKJaXmH4CGSkYCCqkSAEfTKenrkOwsrQll0IrS7G5uwArLLaxLbXCLsTFLyDBKy4wZEVHvCwsRn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+devdiskunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKRPTWtOzKpOTGnLSafLySZKxuLMSOVOzOrPzm1LSehNyibGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTWvHxOJKyKXFw+HPTOpKSipISChMTCxFxaXIRiPHxaNLRyLNSWXExOTPzixOS2hLR+PMyOTPz+/IyKjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaIQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwGgiD46FdDiCFwoDQAEe0TMkEQSFULIcLBloUCDIaDRscHRsNHhhHHyAhISAiHyMkJSYQASdGAiAgASIQKA0pKguXmJl+AiQGFwgrpUgBH0yoqK9DsbO1J5hbsrq8SrgstlJFHy0gwMVFR1J+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+devfloppymount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVrICCOQBCQKBkIw5mqLFG47zoQ+FwbN57TosDhgPD5dMEEIqE04kwlBWKBUEiNVYFpyqAyGEUCgqEtERiNNMLhQKzLQYJg7n7Y4aMAwbCUPvAQeWNgfzQQETAIhSMQEogwgBITQEGGEREmfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+devfloppyunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVCH5BAEAAAAALAAAAAAQABAAAARcEMgJQqCYBjFu1hxReN82EOhYGieaklJwHIjrqnGCJLqNWhUFYoFQCG1FgWXIIDIYNQKCoawQGI0swuFAbKsxgmDsfZjBkwDBsNM90Jot9A3DbBD0Dwiur9QnfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+devnetwork16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBISChPz+/Nza3ARaZESanCyKlARudARGTLy+vNzq7ARmbMTCxARufAROVMzOzKSipARyfOzq7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVmICAGZFmKQiACweCSBImq41AYB5IodLq2hwWO0ejRWDac48Gb/QKNqNRoqspmrVcAUuIJBANS8sBIFCORUgooPEh4J8B67NgdsVBp9C5XWfl9LRMTCyReX19hARNojWlWLH+AAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+devpc16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBISChHx+fPz+/AQCBAQC/AT+/AQCxAQChAT+BLy+vAR+BAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARYEIAgqK1YzsG754QUDERpmkEpkkXrtoK6EcVgHIibhnNx564Yb0TDvQq7FQ34EiqPOhnREqhWSUPsyZSQAbbg7GcMEgwUiYVivTa1R+y4XEGoWO/4AMAfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+devscanner16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MT+/ASChARCRATCxMTCxFxaXKSipDQyNAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEMgJgqWBVivEldkUdKSXhVjZfenommglDERh3Tc4E4ZRHAGgkEPr9X6H5AHBERSMRyWzkug8jQXFEhWoOo8dRYxqLXSmGjIJnVaz29Q3fAP3RwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+devscreen16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXFRSVPz+/PT29OTm5OTi5DQyNDw+PERGRExKTHx+fISChIyKjHRydFxeXDQ2NCQmJBQSFAQCBERCRMTGxHR2dGRiZExOTDw6PCQiJAwODCwuLFRWVOzu7BweHAwKDCwqLHx6fBQWFGxqbGRmZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAanQIBwSCwKAwKkMslEAgSDqDRKqBYKhkNgcDggEorkMrDQchkNhuOhgEQkk0l5S2lUGpYLJqPZTAwMHB0DCmhqAW0Rfh5zAxgOkBcCFAcfIBMECxwBBAEPFw8dChkhcBMDDAcdnQqtFKSWcQMimx4dGRkQBxGxsg6bBQEawx8jl3GnJFoFHRNXVVNRJYIFDAsL1tgiDiQXFx0HABwcXeQH5OjkRutEfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+devspeaker16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXAT+/DQyNATCxMTCxPz+/AQCBKSipASChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMgJQqCXziDG2JoUEENhZBkmHIWJVptAmqcIW/Js1MiF56TBzkckAAcHoa9nMRKeA4TyJk0knsHhTeK5khBaH2VwLYVh40TJhQ6RzeIQV32Quz8hfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editcopy16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAFxaXPwCBNze3GxubERCRPz+/Pz29Pzy5OTe3LS2tAQCBPTq3PTizLyulKyqrOzexLymhLy+vPTy9OzWvLyifMTCxHRydOzSrLyihPz6/OTKpLyabOzu7OTm5MS2nMSqjKSipDQyNJyenLSytOTi5NTS1JyanNTW1JSWlLy6vKyurAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAaUQIBwCAgYj0eAYLkcEJBIZWFaGBie0ICUOnBiowKq4YBIKIbJcGG8YDQUDoHTKGU/HhBFpHrVIiQHbQ8TFAoVBRZeSoEIgxcYhhkSAmZKghcXGht6EhwdDmcRHh4NHxgbmwkcCwIgZwqwsbAhCR0CCiIKWQAOCQkjJAolJrpQShK2wicoxVEJKSMqDiAizLuysiF+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editcut16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAIwhI9pwaHrGFRBNDdPlYB3bWHQ1YXPtYln+iCpmqCDp6El7Ylsp6ssR1uYSKuW0V8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+editdelete16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPT29GxubMzOzDQyNIyKjHRydERCROTi3IyKhPz29Ox6bPzCxPzy7PTm3NS6rIQCBMxCNPTq3PTi1PTezMyynPTm1PTaxOzWvMyulOzGrMymhPTq5OzOtNTKxNTOzNTCtNS+rMSehAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaKQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhSEQkFgrBAcr1URiPhKAsDD3QB8RhA3FM0IlLHnyUTVBMSFBUWfl0XGBMTGBcZGodmcQWKjpAbHIgIBY2LHRoempOdjooTGx8giIOPFYofISJ+DyMXI6AfFySyfiUmJSUnKBYcICIpfgELzM3OZX5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+edit16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaVMR+RPzKjNze3AQCBMR6RPzGjPyODPz+/MzOzPyKDPyKBPz29OTWzPyGDPyGBOx6BOza1OR2BKROBNSOXKRKBBwOBOzu7PTWxPzizOySZPyCDFxaXOy2lNRyRMxmJCQOBPTm1OzStPTKrMR+XIRWLFxGNCQSBDQyNIRSNDQuJERGRLyqlNzSvIx6ZKRuVEw6LLSyrLymhKSShBwaFFROTJyWjMS+vNzW1OTazNzKrHRqXOzezOTOpPTq3OzWvOTStLyedMS+rLy2pMSynMSulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAewgAAAAYSFhoQCA4IBBI2OjgUGBwiLBAmXlpcKkgsMlZcJBA0JDpIPEBGVjwkSBgOnExSfmBIVBxAMExYXswkYGRobHLq8gh2PHhoeHyAWIYKzIiMkJSYnKCnQg5YNHtQqKywtK9qMBC4vMDEBMjIz2dCMDTQ1Njc4OToz5PEEOzw3ZPToMcLHO23HfogQ0QMIkCA+hPBbhAPHECJFjMyYIUQIvEUpUqwQOXKkSEF+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editpaste16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQiFHRqNIx+LFxSBDw6PKSaRPz+/NTOjKyiZDw+POTe3AQCBIR2HPT23Ly2dIR2FMTCxLS2tCQmJKSipExGLHx+fHR2dJyenJyanJSSlERCRGRmZNTW1ERGRNze3GxubBweHMzOzJSWlIyOjHRydPz29MzKzIyKjPTq3Ly2rLy+vISGhPzy5LymhISChPTizOzWvKyurPTexOzSrDQyNHx6fCwuLGxqbOzKpMSabAQGBMS2nLyulMSidAAAACH5BAEAAAAALAAAAAAQABAAAAa7QIBQGBAMCMMkoMAsGA6IBKFZECoWDEbDgXgYIIRIRDJZMigUMKHCrlgul7KCgcloNJu8fsMpFzoZgRoeHx0fHwsgGyEACiIjIxokhAeVByUmG0snkpIbC5YHF4obBREkJCgon5YmKQsqDAUrqiwsrAcmLSkpLrISLC/CrCYOKTAxvgUywhYvGx+6xzM0vjUSNhdvn7zIMdUMNxw4IByKH8fINDk6DABZWTsbYzw9Li4+7UoAHvD+4X6CAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editshred16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbGxubMzOzPz69DQyNIyKjERCRPz29PT29OTi3IyKhPz27PTu5PTy5Pz6/Pzy7PTq3OzexLyqlPTm1PTizOzavLyqjOzWvOzaxLyifOzizOTOpAQCBOzezAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaEQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhWEQkFYYHkeqkMxKFBFpq9jgdkEGlPqwrJhCIY2N8FFRYUFxcYGX9dgRKEGhiHiYEOhBcbGBwdiQEOARcBGwEeAZllAgEUnQEfoQEgmp4hrCKtrwEYsrRlTiMBJAG8syN/IyMAxMXHSH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+edittrash16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipFxaXPz+/MTCxISChDQyNCH5BAEAAAAALAAAAAAQABAAAANQCKrRsZA5EYZ7K5BdugkdlQVCsRHdoGLMRwqw8UWvIKvGwTICQdmGgY7W+92GEJKPdNwBlMYgMlNkSp3QgOxKXAKFWE0UHHlObI3yyFH2JwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+fileclose16:file file16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCQiJBwaHAQCBDQyNDw6PFxaXFRSVERGRCwqLAwODGRiZHx6fPz+/GxqbAwKDCQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVaICCOZGmeqBgEwjCkRGEcSKK4JrEcBrMgAdeLVDg0GguGsYEbBQyGYyN6FDoPDIf0+LCKBIgetQERDgGDBGIpNY8GioAU0m6KXFw883w3+/l9f4AkfimGIn4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+filedocument16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJSWjPz+/Ozq7GxqbJyanPT29HRydMzOzDQyNIyKjERCROTi3Pz69PTy7Pzy7PTu5Ozm3LyqlJyWlJSSjJSOhOzi1LyulPz27PTq3PTm1OzezLyqjIyKhJSKfOzaxPz29OzizLyidIyGdIyCdOTOpLymhOzavOTStMTCtMS+rMS6pMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaQQIAQECgajcNkQMBkDgKEQFK4LFgLhkMBIVUKroWEYlEgMLxbBKLQUBwc52HgAQ4LBo049atWQyIPA3pEdFcQEhMUFYNVagQWFxgZGoxfYRsTHB0eH5UJCJAYICEinUoPIxIcHCQkIiIllQYEGCEhJicoKYwPmiQeKisrKLFKLCwtLi8wHyUlMYwM0tPUDH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+filefind16:file file16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBCQmJDw+PBQSFAQCBMza3NTm5MTW1HyChOT29Ozq7MTq7Kze5Kzm7Oz6/NTy9Iza5GzGzKzS1Nzy9Nz29Kzq9HTGzHTK1Lza3AwKDLzu9JTi7HTW5GTCzITO1Mzq7Hza5FTK1ESyvHzKzKzW3DQyNDyqtDw6PIzW5HzGzAT+/Dw+RKyurNTOzMTGxMS+tJSGdATCxHRydLSqpLymnLSijBweHERCRNze3Pz69PTy9Oze1OTSxOTGrMSqlLy+vPTu5OzSvMymjNTGvNS+tMy2pMyunMSefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCAAECA4OIiAIEBQYHBAKJgwIICQoLDA0IkZIECQ4PCxARCwSSAxITFA8VEBYXGBmJAQYLGhUbHB0eH7KIGRIMEBAgISIjJKaIJQQLFxERIialkieUGigpKRoIBCqJKyyLBwvJAioEyoICLS4v6QQwMQQyLuqLli8zNDU2BCf1lN3AkUPHDh49fAQAAEnGD1MCCALZEaSHkIUMBQS8wWMIkSJGhBzBmFEGgRsBUqpMiSgdAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+filenew16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz6/GxubNTKxDQyNIyKhHRydERCROTi3PT29Pz29Pzy7PTq3My2pPzu5PTi1NS+rPTq5PTezMyynPTm1Pz69OzWvMyqjPTu5PTm3OzOtOzGrMSehNTCtNS+tAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ/QAAgQCwWhUhhQMBkDgKEQFIpKFgLhgMiOl1eC4iEYrtIer+MxsFRRgYe3wLkMWC0qXE5/T6sfiMSExR8Z1YRFRMWF4RwYIcYFhkahH6AGBuRk2YCCBwSFZgdHR6UgB8gkR0hpJsSGCAZoiEiI4QKtyQlFBQeHrVmC8HCw21+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fileopen16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBOSmZPzSnPzChPzGhPyuZEwyHExOTFROTFxaVFRSTMSGTPT29Ozu7Nze3NTS1MzKzMTGxLy6vLS2tLSytDQyNOTm5OTi5Ly+vKyqrKSmpIyOjLR+RNTW1MzOzJyenGxqZBweHKSinJSWlExKTMTCxKyurGxubBQSFAwKDJyanERCRERGRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaRQIBwGCgGhkhkEWA8HpNPojFJFU6ryitTiw0IBgRBkxsYFAiGtDodDZwPCERCEV8sEk0CI9FoOB4BEBESExQVFgEEBw8PFxcYEBIZGhscCEwdCxAPGA8eHxkUGyAhIkwHEREQqxEZExUjJCVWCBAZJhEmGRUnoygpQioZGxsnxsQrHByzQiJxz3EsLSwWpkJ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fileprint16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFRKNAQCBPz+/MTCxExKLPTq5Pz29Pz6/OzezPT29PTu7PTy7NzClOzm1PTu5LSabJyanPTm3FxaXOzCjOTKrOzi1OzaxOTSvJyenGRmZLyyTKSipDQyNERCROTi5Hx+fMzKzJSSlIyOjISChLS2tAT+BDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaYQIBwKAwIBMTkMDAYEApIpVBgOCAOg4RRGlAoEAuGIdGITgWOq4LxcCQgZkEkIHksHgYJOR6ZQCgVFhYJFxgTBVMZihoCfxUYDWUbUBGKGREcjBoQEB2TAB4CAx+Vl5WMhyACHiEhH6IfIiMktCQgE0cZJQStr6O2t6EARxO6vK6iEx4dZsMCxbsmBB4nzUTEutVSSUdmfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filesave16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBFRSVMTCxKyurPz+/JSWlFRWVJyenKSipJSSlOzu7ISChISGhIyOjHR2dJyanIyKjHx6fMzOzGRiZAQGBFxeXGRmZHRydGxqbAwODOTm5ExOTERGRExKTHx+fGxubNza3Dw+PDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaAQIAQECgOj0jBgFAoBpBHpaFAbRqRh0F1a30ClAhuNZHwZhViqgFhJizSjIZXQCAoHOKHYw5xRBiAElQTFAoVQgINFBYXGBkZFxYHGRqIDBQbmRwdHgKeH2YgHpmkIR0HAhFeTqSZIhwCFIdIrBsjAgcPXlBERZ4Gu7xCRZVDfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folderhtml16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBERGRBQWFMzKzOzq7CwqLDw6NARqnAQ+XHR2dKyqrOTm5ExKTERCRHRydMTi7NTu9HS+1KSmpBweHDy67DyixHS61ITG3AxypByu7DxinBw+ZERmdIySjITC3ARypExOTDRurIR2RPTSdJyulEyGvBw+bFSyzJTK3LzKvPzivOTixNTChLSybGyCfCRSnBQqRASGtFyuzDw+PCRShPzy5OzerOTShKyaTEx6pCxerGRufBR+rOTezPTShNy6bER+1BxCfBQuRAxelFSixBw2VISq3GySrPTWlHyanIyitFSO3IymtCRujAxWhCRqlCQ6XGyWvNS2bFyGvDxuvCRSpLy+vMS+vGxqbFyO1GSi3EyO1FRaVCQuPLS2tDxyzKyWNFxaNCQyPGxubCxajERSVExKNJyenAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAECg4eIAAMEBQICBomDBwgJCgsEDA0BDg8BhwYQERKUDxOYDAyeghQVFhehGBmVlwwOqxobHB0eH6EfIAkPIYIiIyQlJhsnKBcpvrYiKissLS4vMDEyFjOvNAA1LDY3ODk6Oyc8PTIyFzQ1Jj42P0A6QTtCQ0REIEUORkdIkihZwsSekBhNnDyBciCKiSNSplDRUcWKkRhXCGDJYgiGli1cpuTocsILjytfFmRpACAGRTBhRogZgzHlAjKGWnIoY+bMgRgBDHRBo/LAIZoxuhwKatRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+folderlocked16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQSFMzKzOTm5CwuLERCRARqnAQ+XHR2dKSmpOzm5GxqbCQiJMTi7NTu9HS+1HRydOTm1Ozq7Dy67DyixHS61ITC3AxypERGRBweHByu7ASGtFyy1DSOtDRmfExOTBSazBR+rCwqLAxWhAxelByGtDSaxAwODHy+1Dw+PPT29IyqvCxujOzu7NTW1Nza3ExGJJyebKyqfMTCpFRSPOTi5DQqHOTezDw2NMTGxKyqhMTGrGxmXDQ2NMTCxMTGpHx6bHx2bBQWFIyOXDQuDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQICBomDBwgJCgsEDAKFDQGHDg8QEZQSlxMUDJ2CDhUWF6AYGZWXFBqCGxwdFh4XGK8fIAohtiIIIx25EZwBDREHgiQjJSYmGScoKSoRKQ8rggIsDC0uJS4oGygoAyjdAAcsLxQUMDEyMzQ1EzapBy8MDDc36tFwgONFjlQ6dgCEEZBHDx8+ctRIRehHAyAwZASZIGRIEBoUBwUwIGMCiwFEaBQJichIjo9FZLBsacRIAB0A/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+foldernew16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBPz+hPz+BOSmZPzSnPzChFxaXMTCBPyuZPz+xPzGhEwyHExOTPz+/MSGTFROTPT29OTm5KyurDQyNNza3Ozq5Nze3LR+RLy+vJyenMzKzNTS1Ly6vJSWlFRSTMzOzMTGxLS2tKSmpGxubBQSFAwKDKSinJyanIyOjCQiJERCRERGRBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaNQIBwSCwaj8ikcokMCIqBaEDoBAQG1meAUDAQpIcBQoy1dg2JdBqhECgQ1IWB0WgcBIOBwIHXBwwPEBEREhIBbG4IExR/DBUVFhIXV2NjDVYYDY8SFU4ZVxpVAQwbGxynGxkdTh6XVh8gGSGzGSITIxokJUImGSMTwLcnKCkprgAqDSt1zCssKxQtQ35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folderopen16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOzi1Ozq7ERCRCwqLPz+/PT29Ozu7OTm5FRSVHRydIR+fISCfMTCvAQ6XARqnJSKfIx6XPz6/MzKxJTa9Mzq9JzO5PTy7OzizJSOhIyCdOTi5Dy65FTC7HS2zMzm7OTSvNTCnIRyVNza3Dw+PASq5BSGrFyqzMyyjMzOzAR+zBRejBxqnBx+rHRmTPTy9IyqvDRylFxaXNze3DRujAQ2VLSyrDQ2NNTW1NTS1AQ6VJyenGxqbMTGxLy6vGRiZKyurKyqrKSmpDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfCgACCAAECg4eIAAMEBQYCB4mHAQgJCgsLDAEGDQGIkw4PBQkJBYwQnRESEREIoRMUE6IVChYGERcYGaoRGhsbHBQdHgu2HyAhGSK6qxsjJCUmJwARKCkpKsjKqislLNIRLS4vLykw2MkRMRAGhDIJMzTiLzDXETUQ0gAGCgU2HjM35N3AkYMdAB0EbCjcwcPCDBguevjIR0jHDwgWLACBECRIBB8GJekQMiRIjhxEIlBMFOBADR9FIhiJ5OnAEQB+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailforward16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRydHxubHxmZGxiXHRmZFxOTFxGPFxKTPwCBLymlMy+pOze3PTq3PTu5Pzy7LSmnOTaxOzm5LyqlNzOtPz69Pz27MzCtLyqrPT27IRubPzuzNTGvNTCxLSelPz25Bw+ZFxKPPzy1Pz65LyupBxKdCxWfPTm1Pz23LyinBxGbGzO5DRafBxWfBxajCymxHTS5BxSdBxKbFTK3EzG1CSGvCyKvCSSxCSavGTO5GRaVPzqzFzK5EzG3BSCtAwiPGxaVPTivPzy3NzKpBxObCRefBxqlPTmzJR2bKyahAwyRPzmvOTOpKyObNS+nPz21AQOFKyOfPzuxAQCBGRORLSadPzyzLymjMy2lOzetDwuJFRCPEw6NEQ6LEQyLEQ6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAkALAAAAAAQABAAAAfhgAABAgIDBAQFBgcIBwmOCQIKCwwNDg8OEBESjY8CDBMUFRYVFxgZDJyOGhsPChwVHR4fFSAhjwkaIiMOJBQQDRUVJSa3GicoHw4pEA8SGSorLI8tLtQu19gqLzDECTEyMzQ14zY1Njc3ODkqCTo7MjIxNCs5PD03PjctPwlAQUIihhBpQbCIihtG+CUocASFkAhIkogQ8kFJwkcFlogIkoRJEydPnkBR6GiAxiQLgiiIIkXElFQJqESoMsRKkAhXqkhhApNKFSxZggTJ4nHIEJhaDhzYwoVLFy1avHyB6ScQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mailget16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAxKdBRSfCyGvFSm1BxKfCSWzCyWzBRCXCRKfBwuRAQGDDw6PHy23Cym1CSSxByCxBxunBQSFKyurMTCxExihNza3NTW1JSSlMzKzFxaXLS2tNze3KSipCQmJGxmbNTS1KSepLy2vISGhJSWlHx+fERGRPz6/IyKjDw+POzq7JyenMzOzKSmpCwuLDQyNIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQIBwGBAIAsOkUjAgFJRQQMHgjC4PBIEVgAh4D4aEYrGAMhINxwPyiCgYSsmEUmk82grLRZJkYCgXaAEKFxYZcEISGhsZFxwFeY0WHR5CDB8dGCAXG5shGxQicBIMpSMUGxgTGSQlpQwSJicnEwwdI7gdKAwTsykpKiobr8QMKxeHDBcsGRvOzxsT0i0uL9HSHdkT2ZkoMJXF4a8AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mail16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBGxaVOTe1Oze3OTWxOTWvNzStNzKpEQ6LOTezPz+/Pzy7Pz69Pz27Pz25Pz21PzuzPzuxEQyLLyinLSmnPz67Pz23LSafKyObDwuJMzCtLSelPzy1My6nLymjNTCxLyqnPzq1LyihKyOfOzavOzetEQ6NPTq3NzOtLymnNTGxJR2bOTOpPTivNTGvLymlKSShKyahEw+NOTe3PTm1Pzu1Pzy3FRCPPz65LSadFxGPOzm3PzqzPTmzPzmvEw6NCH5BAEAAAAALAAAAAAQABAAAAaqQIBwSCwaj8ikMhloOp/QpmAgqAoIhELBUDgcEIGEYrFgNBoLx+IBiRwkgQnFoWAwKhWLhX3BZAILGhsCDXgODhwdGB5vgAofICBlDiEiIx4kJSYBJ2UoEykqHSMrLC0nLWAnFS4UCycvMAcEMR0RLTIBMwaSahw0NTYtFwclNwEdLws4eoc2DxwQOR06ASk7PBAhIRE9Pj0tLSUY1T8I5gjn6Qgy7D8SfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailreplyall16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBLymlMy6pOTa1PTq3PTu5Pz27Dw+POzi3PTm1OTWvPz25FRSVERCRLympPzuzPTu7NTGvFxaXKSmpPzu1Pz65Hx6fHxqZPzq1Pz23HR2dBw+ZHx+fISChJSWlDQmJHRydCxWfBxGbJyenExKTHRiXPzqzPzy3CQmJDRafGTO5ExOTERKTGxWVCRSfHTS5CymxBxajBxWfPTmvPzy1CyixCSaxCySxDSaxDSWxDSSvDyaxGS21PTmzPz21AwiPBRejCSavByGtCSezEzG3FzK5FzG3GzO5FTK3CQ2bPTixBxqlCRefBxSdBxSfBx2nCQ+dHxmXPzmvLSafAwmRAwyRPzyzDw6POzavNzKpAQOFPzuxBwWTBw2ZGRORLyWdMy2lOzetPTivAQCBKyObOTOpAweNBwWVEQyLEw2LEQ2LDwuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAf4gAABAgMEBQUGBwgJCguOCwEMDQ4PEBESDA4TjY8DFAwVERYXGBkRm4+QGhsMHB0eGB8bDpyOARogEBceIRgXv8COIiMkGB4lJSYnIcwoKb/DGyoXKywtKS4pHinMLzAxJDIzNDUtNjcv6B0hLzgfMh85OjstPDw99zwd7T4/LTVAgggZQqSIECNHevSAgSSJkiVMmjh5AiWKlClAiFARUeVHFSVWmLS40gNLlh5agGzh0kWDlwZfrIDREKaCAjEqrFA5MMYLmTAxlJTxYoZMozNozqRRs4ZNmy5s3LwhA0dBnDNn5MxBoAABnTp17IitowDrmQV+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailreply16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTEw+NFxKTFxGPPwCBLymnMy6pOTa1PTm1Pzy7LymlOzi3HxqZOTWvPz69Pz25My+tLympFRGRHxuZPzu1LymjNTGvNTCxBw+ZPz23PzuzPz65PTu5NzOtCxWfBxKbPzq1DRafGTO5BxGbPzy9HTS5CymxBxajHRiXPzqzCyixCSaxCySxDSaxDSSvGS21GxWVAwmRBRejCSavByGtCSezEzG3FzK5FzG3CQ2bPzuxAwiPBxqlBxKdCRefBxWfBxSdBxSfBx2nCQ+dPzy1CRqlAwyRDQmJPTmvPTixLSafOTOpAQOFPz21BwWTBw2ZPzmvNS6nPTivAQCBAweNBwWVNzKpPzyzLyihGRORLyWdMy2lOzetKyObEQyLEw6NEw2LDwuJEQ2LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfqgAABAgMEBQUGBwgJCguOCwEMDQ4PEJYRDhKNjxMPDBQVFhAXGBUSGY8LGhsQHB0VHh8gFQ6bjgEhIiMMJCUmFbS2CwMnG6IoKSorI7WpEycWFiUsLSou1yXXji8wFiopMTIzNDUz4zbZNxsbODk6Ozw9Pj8pPzEzQDdB60JDOkRFjBw5giRJDCWdlmxwIIRJExAWKDRyMgTIiydLoESRImQKlSUSF1SxUoXAlSBRsGSJoCVICIlbqlThcoBClC5eYFD4EiVIFwUyqywAE0ZMlqNjpJDpIkUBl0dlFChAYOZMmTJoyqQR5icQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mailsend16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBHxqZLyqlMy6pOze3PTq3PTu5Pz27Pzy7LyinOTaxOzi3Ozq3LymlOTOtPz69Pzy5My+tLympPzqzNTGvLSelPzy3BxGbBQ6VPzuzPz65LyupNzOtPz+/GzO5BRejPzq1Pz23LymjHTS5CyixCSavBxqlPz25LymnGTO5CymxCSaxByGtHRiXPzy1CySxCSezGxWVPzuxKyOhMy6nDSaxEzG3PTivNzKpKyOfPzu1FzK5PTmzJR2ZLyihLSWfKyObOzmzPzmvDyaxOzavLSafGRORMy2lOzetDwuJEw6NEw2LEQyLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfUgAABAgMEBQUGBwgJCguOCwwNDg8QERITFBUWjY8DFxgZGhsaHB0aD5yODB4TGB+kICEaIiOPCwEkJRcmJyYPKCIpKrWqKywTmC0SIi4vMDHEDCsyMg8zEyI0NTY3z7U4Hhs5Mx+0IyI6OyPrIzw9Gys+PxIy2EBBxAs8Qjk5Q0RFWFxAZySfgSMsilRAkiRECHQ08hHgJ0TJkCU/mECU2ISEkowUlpAQ4QTfowNPoAzJIeRJCyjm8kVRIkWIzSkXhwxJtYAKgp9VrFi5QoWKFZ5+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav1downarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PUZi0zmTtypflV0VdRJbm6fgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+nav1leftarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAP///wAAACH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxqdwoNGTmgvy9px/IEWBWRkKZ2oWrKu4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav1rightarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxCtwoNHTmpvy3rxnnwQh1mUI52o6rCu6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav1uparrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PWwhxzmetzFpxnnxfRJbmufgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+nav2downarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+pq+EPXYpxUckoO3AjbF3dJwahllXe6AFgC8d+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav2leftarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pyxf5VohmSlsxmpjTzAHeN5ak6UHpqKRi2GpwvH3Q3eT64RcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav2rightarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pq5HOAjQyVnqfhHue7oAaKH5kiW0AmnLqaHomkj02g+e6XwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav2uparrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIghI+pyxfR0HsRzNnuXVqn3mVQZWFRyIDjp65Ga5Ly4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+navback16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRSdBRObCQ2TBxObISevAQCBNzu/BRGZPz6/FzC3Pz+/HTS5ByyzJze7Mzq9ITC3AQWLAyWvBSavFyuxAwaLAwSHBRafBSOrDzW5AyixCS61ETW3CzG1AQeLAweLAxefBSStEze7CSWtCyatBSCnBRWfAwmPBRWdByixAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZiQIBwSCwah4HjUTBQFgkFg3MoKBykU0QhoUAIAuAksbpgNByPxQMSGVsVDYlkIqdUiJYLJqORbDgcHRseRR8gISIaEyMkGCVYRBEmeyAnlgaQkSgpmU4RAZ1OKqFOpFNGfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+navdown16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObCRKZBxCXAwyTKTK3Ozy/NTm9GSivAQWHNzu/FzC3IzO5CySrAQOHAyuzETS3CSWtAyOtETa5Aw2VLze7ByWtBy61BSavAxWdBRCXAwqPAQCBDR+nKTe7FS+1Eze7ByixBRmjPz+/AyexAyixAQKFBRqjAQGDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZeQIBwSCwaj0hAYCkYEJLKguGASEADigWj4bgaHpBINykwSCYRa5HCFFQsF0xGo9lwhpSOwfORYC4gISJ3RAQdIyQYJSAlImNrh4uNJkl5CoKUUBQnjlB4KJ6hokN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+navforward16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAwyTBRObAw2VDR+nCRKZOzy/KTe7Pz+/KTK3Nzu/Lze7FS+1AyexAyuzBSavAyOtBSmzOTy/BRqjNTm9IzO5ETS3ETa5By61AyixByixBRmjAQGDBxCXGSivCySrCSWtBTC3AQOHAQWHAxWdEze7AQKFBRCXAwqPAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZjQIBwSCwahYGjUjBQGgWEpHNYMBCaT4G2UDggos+EwmBYMBpf6VBgYDgeEMgjIpmoAQVKxXLBPDIXGhscRB0eHyAgDSGBGyJFASMiIiMkJYImUwAnmJqbjp4AKCmhAKSlTn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+navhome16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBDw6PBQWFCQiJAQCBFxeXMTCxJyanDwyLDQqLFRSVLSytJSSlISChCQmJERGRFRWVGxubKSmpJyenGRmZLy+vOzq7OTi5Ly6vGRiZPTy9Pz6/OTm5ExOTPT29BwaHNza3NS6tJRqRGQqBNy6pIyKjDwGBPTe1JSWlDQyNOTGrNRiBGwmBIRaLNymdLxWBHxGFNySXCwqLKyqrNR6LKxGBNTS1NTW1Jw+BEweDDQ2NAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaoQIBwCAgIiEjAgAAoGA6I5DBBUBgWjIZDqnwYGgVIoTGQQgyRiGRCgZCR1nTFcsFkHm9hBp2paDYbHAsZHW9eERkYGh4eGx4ag3gfSgMTIBshIiMkGyAlCCZTEpciJyQjGxcoKUQBEhcbIiorLB4XEltDrhcaLS4vtbcJra8bMDHAGrcyrTMXHjA0NSypEsO6EzY3IzU4OdoTzK0BCAkDMgkIOjJlAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+navup16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObAwSHBRSdISevBRWfAweLNzu/BSOrAQWLPz6/FzC3DzW5BxObHTS5ByyzAyixEze7BSStBRWdAyWvByixAQSHCQ2TAQCBBRGZJze7CS61BSavAxefMzq9ETW3CSWtAwmPPz+/CzG1ITC3FyuxBSCnAQeLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZfQIBwSCwaj8hhQJAkDggFQxMQIBwQhUSyqlgwsFpjg6BwPCARySSstC4eFAqEURlYhoMLBpPRUDYcHXt7RgUeFB8gIU0BIoiKjAcUIwiLSQUkJRsmGIwJJwmEU6OkfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+playeject16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+py+0R3IFQUtruXVqn3kkWyIARR4rqKvoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+playend16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+py8Eb3ENRggrxjRnrVIWcIoYd91FaenysMU6wTNeLXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+playpause16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+py+1vgoxzyUCxrZd18ClfmIyVyJ1lqkHuC0N+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+playstart16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pyxudwlNyguqkqRZh3h0gl43hpoElqlHt9UKw7NG27BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+playstop16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+1vgpySUWpvXXqrHmSaeJEYhKYq6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textblock16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py40Bo5SOzRvrwlgrfnkJOIkPaaaJXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textbold16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIihI+py70BowPQ1HZpwNv212Vg9IGHmIjoWa4ey5DSRNd+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+textbottom16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIVhI+py+0Po5y0hYtzrkB7zH0fN/kFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textcenter16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsnRkqtDnhu1zHfFSpjaY4PavgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textitalic16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+0BgztwUmmjBXX3jE0auHHhM5Yq4xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textleft16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsgRoqr3Vnt102fFSJjUC6nlPoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textmiddle16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIXhI+py+0PT5i01pisphjt3UmfFZYm5hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textmove16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsg2kfZvblXbwTg10WlA4rjyvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textright16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+pm+EPIZstSrqsDhhv1ylfFE5jiYwX6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textsortdec16:text text16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BPwCBAQCBAQC/FxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM5CBDM+uKp8KiMsmaAs82dtnGeCHnNp4TjNQ4jq8CbDNOroIe3ROyEx2A4vOgkOBzgFxQ6Xa0owJ8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textsortinc16:text text16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BAQC/AQCBPwCBFxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM4CAqxLm61CGBs81FMrQxgpnhKJlaXFJHUGg0w7DrDUmvtPQo8qyuEHoHW6hEVv+DQFvuhWtCFPwEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIlhI8Jwe2/AmpTynqPTXSqrnBM+I0kdmpmGmUp+K4nPMvhYx9+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+texttop16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIWhI9pwe2uYnq0yQtqxbz7D4biSIZ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+textunder16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pu+FxXoOIKpds1oBH7hlYxYxRCaIZ01lhJbHy9tTv7BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewchoose16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMzCLrcGlAs6UAYgwLdLtEcI4ygQo7VVp2oupGpG4vmaUVTemX523qlFcw0a4RqNlkx5k8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewdetailed16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMmCLrc/i1IAVkYg1Z1iRYUKCqitp1oikqBWV3ZOnhkWNagqu+qnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewicon16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrcG1AwGOQbw6qANeCEB3pCSZpO6pgowJZqLKuUGE0dnuEhf8IL1kz1shSHDX8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewmag-16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ+QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7Kmpl0CtLGLvbW2Zn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewmag16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ8QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7GLArS5Q7O1tmZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewmag+16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6cAsLECrqeys7WxpqZdtK9Ct8C0fsHAZn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewmulticolumn16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrc/ixI0WSgKoyBl+beQFACpo1AqXbKCr1wLAMWS08hGG3dSZqin4sxnBmPD38CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewtext16:view view16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIchI+py40BTQSwuovp3DXkv1ia1IHmIXLiyWJ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewtree16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBDQyNPz+/PzerAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAMuCLHcri4yGISlj4kxcANgNRBQCIbL6U1Su7bB62rXvGydG25kqpwfIGxILBr9CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actattach22:act act22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBMTCxPz+/DQyNKSipAQCBISChFxaXDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARrEMgJgqA4zzus/gLhFd5HCcZAXqsphYPUdhcYFNRcZnvdtpnDqPTbUWgAJKBYwzBlw+bRo3xmkNWoBgm0OrVLn3GC9RgCk8DhUw7c0rHPr4CDu5SYQNyEt7uSY3p/UAKFhYKDSQOLiwgFdhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actbookmark22:act act22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBCQmJCwqLMTGxAQCBBwaHMTCxLSytERGRFRWVLy+vKyqrKSmpHR2dJSSlJyanISGhGxubIyOjKyurGxqbFxeXGRmZHx+fKSipLy6vGRiZLS2tFRSVHRydJSWlHx6fCH5BAEAAAAALAAAAAAWABYAAAWWICCOZGmewamaQrq+wUC8azHINGocOI38iIRAceDNaISFYklkGHOEhoNBfUAOhuOLEJE8HoPiRKFdESiQBqViuTDIUAsEcyAeGJmyiqC5RCwJGg0YcEh9D0V3Dxt6JwQVDRYVHBUdi40mjw0PTgwQHgeYJQQJfxUXFxAOoTkFpQ0fsRSimQkWEQ0VtI62HLt7vjl7JQYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actbookmarknew22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCwqLCQiJCQmJMTGxAQCBLy+vLSytERGRFRWVKyurKyqrLS2tKSmpHR2dJSWlKSipISGhGxubIyOjGxqbIyKjFxaXGRmZHx+fPz+NGRiZPz+ZPz+HMTCBKSiHPz+jFxeXPz+XPz+tPz+zPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAamQIBwSCwaj4Gj0hgQLJ+AAaEAVQoI06pRYDhkoYgwIhEgKBTfZ2FhaBsYDS8VWnA8Go0FJIKeqyUTDw8EDHBpSwUUFQ4UFhcYDQYFfkoFFxEQDG8KEAUZlEeWGBIakw4FG1STiBoYBRwdBR4fHgUdHKBEBSCnIR8iIyIfIblFu6ceIyQjtcXGCbLKzAUKzrq+wMLEVa+xs7W31kOTk6nkWuOf6Ea5QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actexit22:act act22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBHR2dDQyNCH5BAEAAAAALAAAAAAWABYAAAJOhI+py90RnIMyRUOxhDfzJkACdoXBuEDDkQFDi5go0MrKx16kns80b7qdELCgBYaEGWwL5nG1ePFiKp9A6kuYRNuho8vxVrrZivmMRtMLACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+acthelp22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBCQuNBwiJAwiLAwaJAwSHAwSFIy+3ERynCw2PCQuPAwmPCxOZCxWdJzG3FSazBwmNAQKDAQGBDRmhBQyTDxujDR2rIy21AwWJDyGxCxmjAwmNDRihAQOFDxmhCxunBQWFAwaLCRahDR6rESGvDQ2PCRWdDRunDSGvCRSdAwWHCwuLDSOzHSmxDyKxBxCZBwqNHSu1DyOzAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAahQIBwCAgIBAPCoGAgOoeBAyKhWCwYDUf0CX1AIhLiJEGpBLiAAaRxdgYsl7Ybk8igBZoN5xmAdDxoanp8HyANISF8EBsiXBMjJBolBEQmGHFoRScbKHIKDykqK5lFAZRCnyknTaROLA8tq61OChgtKqyzQgEYEJi6UC4vI3LAASkbMBPARAEBdszR0sACEaPSMTIQM8W6KzNl3bo0NOJDdEEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actlock22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBHRudFxaXExGTERCRAwGDGxubPz+/Pz2/Ozm7Nza3NTS1KympFRSVHR2dNTO1JSSlKyqrKSipDQyNMTGxDw+PLSutKymrMTCxAQCBHRqLBQODJyanDQuFFxSJFRSJFRGJERCHExCHISChHxyLEQ6HGRaJExKHLSmbLy2fOzitPz23KSiZHxuNHxyNJSOTNTOnMTCjLSudKSaXJSKRJyOTOTetNzWpHxuPOTi5MzKzLS2tFxWXOzq7Ly6vOTe5Ix+RLSqdNzSpLyydKyqbKyiZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBAgMEBQKEjI0GBwgJCgsMDY2XjwkOAgQBDxCLl4QNCaGCBBGWooINCAqqrBKgqwATFKaDFRYVtBMXsIMNGBm0GRADjQIJxKIaGxwdHh8gISIhGyMZzIwkGholJiYfJiAfJyEZISDbg90oKCkqKwcHKyooLC0f7IIuLzD2YMSQgW8GDRri+AFoUMOGvRsxUhSsQQPHvmQSchyQtEAHhh0WJHDQcJERjwsKDvRI0BGDjwgicXhQyCOjSgUKPO6AObIkIQESfmxk6REDT4s0bfaYpDNkT4VAha5s+TLmzEYtatwIOHAiDZIKNQAJYk9IjCFEisyoocFEB4UACtBpm0t3LiF4gQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actredo22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3Pz+/JTWbHy+VHTCTMTivPT69BxGDESuJDyiHESiHEymJIzKZAQCBFS2LFzKNGzWPDRqHCxqDFSqLHy2XESCHAwaBAQOBBQqBDyWJHyqZDyKFGSiVESeJBQ6BAwSBGTGPFyWPFSSLEyOLESGJBQiDAwiBBQmDCRGFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaoQIBwSCwaj8hkMcBkKpcBwYAwEDif0YLhwEUkFItFMkAwMBoOR+PxgHwjRDggamhIJpQ8ZbKGKOQLcgEFdhUWEYgRF3sNfhELBHALAhgZFhobRBwREhQdEAIEHpIKHwsaSJwUDQgQIJINARxKESESDQ0dgCIjSpAkDAwPco+ZSJAlJicnKHIAIrNHidOIQxunT0kpCyrZSCss0d5Fj6jjRonn6uvs2QZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actreload22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBCRSFCRSHBw+DBxCFCQ6FBwyDBQWBBxGFCxyLGTChMzqzLzmvHzKjDyOTER+RERyNDSqXNzy3LzivFS+fCyCPBQmBCQiBBxKFBQqDOTy3LTitES2dDR+PCxuJOT25KTarCx+PESSTCxKHDSeVCyKRNT21ESWVDSGPBQyDAQCBBQSFDRuLDSyZDySTGzChCRiJKSmpExKTDS2ZGzGhLy+vGxqbISChDSKRMzKzGxubDQ2NIyOjCQiJCwqLBQWFCwuLKSipERCRERGRHR2dAwKDDw6PFRWVIyKjCQmJFRSVBwaHKyurAQGBExOTBweHFxeXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf9gACCg4IBAgMEBQYHhI2ECAkKCwwNDg8QBAOOhAQREhMUFQgWBxcHGBmbggkaGxwPB4yDB6SbBJIKHQaqtY0eHyAhsqrDgx4aCiKpqoQHAyMjJBMKJaSxzAAHIRsmJgonKA0LHSmDKiuOBywRLSQuLyEwwyoxMuiN6iUzNBXy5jU2bsgoJugABBz95uXQsUMGD3vpPPgTpKIGwx4+HMr4kW4YkCA2hAzxAQSIECI+imBTwVIFESNHerRUgc0cEiFHkjiiyYzeDiVLdvLcySSkkKGEWiZVweSGkIHMmvQosoQlkaZOjvhosvKJjIAxoOAsgpRZkQNLnvSoqspAIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actrun22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAwKDAwKBCQiHNze3AQCBBwWFDw6NPTy9PTy/Dw2NKyytOTi3LS2tMTKzMzOxLy+tLy+vBQODNze5NTS1JyalIyCbIx6VIRyVISGfJyelOTq7EQ+NMTGxKyurGxeRLyKPOSmROSuVOy2XOSiTLzCzNTOzDw+NCwqLHxuVOy6bPzGfOSuXNTW1LSyrMSWRNymTOSmTKSCTPTGjPzSnPzWnMyaVBQSDMTCxPz+/KyahNSeRHxeLJRyTPzmtPzarOy6fJyajNza1Ly6vLyulFRCJPzirPTOlMS2pNTSzMTCvJyenBQWFNzKtPz6vPzyvPzqtOzGlOTe1AwGBFxWTLy6tPTm1PzSpPzutPz2xPTSnOTSxOy2dPzapPzerOzm5IR+dPzu5Pzu1PzqxPzy5Pz+9GRiXGxuZKympHR2bOTm5Pz6/MzSzBwaFJSSjCQmHPz2/AwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeEAQKIjIIDBAQDjYMFBoMHCAkKgwYFhwULDAUKCg0ODxCkBQgRnoUSExMUDxUWFxgZGpAbFIuGHB0eHyAhIiMkIB8lJieIKCUpJCTGIyorLCktKIUDpC4YLzAxIjIyMzQ1NhgdpJI3ODktJTowOyM8Ejc9Pj9AQUIEclAocCMIBQhDiOwgoaKIoCI+jBxBkkSJkCWemIyq0GSHCBVHihRx8gRKFCmpKhGaQqWKFYZXsGR5kkXLFgRUXBUqkCGCFS5AjnTx0sXKlyA6CRVgAAHMAilhxIwhU6ZFkBY5kgKYUoXBAzMKzixZ4AJNGgVm1KxhM0WpmQpUMtooaOPGxAM3Nw60oYLGjNYCbzYJOgAnRzNBJ95oPYQCgpJtkwzFoULlRuRPiy9fNhAIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actstop22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAASC/CQKDBwKDCwODNyKjPzq7My+vIxiXAQCBOSOjPz6/OSelNySjNyGhMR+fLRaTGQ2LPz+/Nx+dNR2bNRybMxuZMxeXMxiZLQSFJQaHFwqJNyKhOSCfNyCfNR6dMxmXMxWVMRORLQODOR+fOSSjNR2dMQ2LJQWFMRWTLwWDNSCfMxeVLwaFKQODNR+fNx+fMxiXKQSDOSWlMRSTMxaVMQ6NMxORMQyJOTS1MxqXLwWFLRORMxKPMQaHMxKTLQWFCH5BAEAAAAALAAAAAAWABYAAAb2QIBwSCwajwGBcikIHIsDQmFKNRwQT2EgoVgsGOCG4wHBIgmRhWRCqVQsF0xGYyYGNgoGh9PpeCQfICEic3UAAWgLIxwRJBsbHSUREyYYJ3RDAQULexGejhueESgpl3WaCxsqJKKsChEUKywtmFoFDC4vCayikzCyMbWHt38NCTKiHhUfMyzBdQIFKsodob0VNDWzwppuKxMRrx6iNjcitNA4bh+iEzkwojc66JkOOxcf7G35PBE9KS1MEUGgIQOIFfk++KjRw9wJgUUIZvhRoyLDFCliQDQisUWLGCJOeNx4hKCGkyhPGnqCoKVLl1liypyZxUAQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actundo22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3PT69MTivHy+VJTWbIzKZEymJESmFESiHDyiHESqLAQCBFzKNGzWPFS2LNTmzCxqDDRqHPz+/KTGnBQqBAQOBAwaBESCHHy2XBxGDOzy7HTCTEyyJDSqFHzWTAwSBBQ6BIy+dESKJFySPFSSNAwiBCRGFBQmDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMsBkKotMwYAwEDiXgYLhwD0gCFZiQKxNKBYMRqPh+D6G16y5AYnYIxBJAyF4AwITTAUJdBESD4gPFBV6Fn6ABBcJDIYPGEQZGhQbHAIdfx4JHw2VSBodGwWfAR4LDSALfkgYAQurBiAhICKfSSMkvQElGyYnGyi9Rxkdj4nOskUYyU9FpxnURikdGtjRKivdRKfQ2Inh5+jpRwZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actunlock22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBGxqbFxaXExOTEQ+RAQCBPz+/PTy9Ozq7Nza3NTS1KSipFRSVOTi5Hx2fJSSlKyqrJyenJyWnDw6PMzKzKyurDQyNFxWXMTCxJyanHRuLHxuLGReJFxSLFROJFxWJExCHERCHBQODISChHxyLHRqNIRyNHRmLLSqbKyiZLy6fOTarPz67Pzy3OzitKymZFxSJJySTNTSnPTy3NzSpMTChLSydKyqbKSaXJySVIyGRGReLPz23NTOnMzCjHxuPLy2vKSmpOTe5LS2tLSutHxuNHRuPMS+xFxWLIR+RDw2HFRKJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SDAQIDBAUChY2EAQYHCAkKCwyOjZANDgIEAQoPjJiDAg2iggQQp5gMBwmrDBESl6MTFKuoFQSjABYRF40CGAW8BRm7hQwNxBobHB0eHx4gISIjBdiEAhYFJBslHOHSHh4hBSHlxIUmJygpKissBiwtLi8pGjDqhBoxMjMuaNSwcSMFjhw6dnjYRyrGCh4ueviw4Q5HDB0/PjAUJCBCAwMIGiiggAEIBFk/FgYLIgRkggQkhxAJkqGExkYMFnxsIGRkSQgLHhRRWUjAggQgG8AsSWRBBiP6VrYMOfKIyaBDNwLo+HHSUplOSyDRqiEHjRkretRQkcLgxayNF0wksQGQxsSKMTIq0QpgCba/gAE7IhMIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+appbook22:app app22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBDyGhCyCfFSWlESOjDyKjDSGhCx+fGSinGSenFyanEySjHSqpHSqrGympEySlBx2dISytHyyrCR6dKTGxHyurHSurHyytGSipCR6fARmZFSalEyWlBRubAxubBRydDyKhDSChLSytPz+/MzKzIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbFQIBwSCwaj8ikMhBQIpmCQdM5ZBIKhgNiugwkFAsCI7pNMhuOxkNBgBgEiAi3GkBLJpJHYgEpaClyREwVFhcSEhgOGQoMfgMaERtcARQBFRMYExZ6HB0FUYAekkIBHxqWFmlrC1haESAfG6MBGx+VFRgKYH0hInGRklO0ppYXCwwMWQiQHkwjgrWnFRdYZHIBJCTP0LaWGAcDW9jZ2nMAw9IWTOQkJSZMRsOV49nu8E+19PbmR7TY+1TovONH5V7Ag0QMBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appbookopen22:app app22 22:photo:22 22:R0lGODlhFgAWAIYAAAQCBAQ2NPwCBHSurIS2tBx2dBweHPz+/Ozm1GxiTGyqpPz6/Pz69GSqpOzaxPzy5HxuVLSmlOTazPz27PT29NzClPTexHxuXLSmjAxqbFSinPTy9KyehNy+lPTy5Pz29HxyXNzWxKSahOzexPzy7IR2ZOTWtESenPTy7KSWfIyCbKyijAQGBDyalPTu3KSSdDSOjJyOdCSGhPzu3OzizJSGdPTq1PTq3JySdMy6lAyKhOzWtOzi1OTOrJyKbMS2nJySfMS+rAwCBNzOrNTCpNzKpJSGZKyafLSifLyylIx+ZHx6ZDSChAQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAIALAAAAAAWABYAAAf/gAABAoSFhoeHAAMAiI2IAAQFjI6EAAaJkQeTjwAICYkKBQcLm5WdBwyfhgChB66bp64HCQC1lQ2irqQCAA4PowsLEBESE4wAuLIHFAAVFr+uDBcYxRm1GrmuGxwdFh4Mrh8gGCET1gDYyhsiFSMkDAsMDCUYJhvnJ9kHKCnODwwfPlBQsULCPRYAWogK9sHFiwoOPEyQh0JFPXO1YBSYwBEFghjdHkwQOYGgwQwIZRR44GHGDBogabhAsYEEihrUMAIoUMCEDRs3HODIYQHFA6MPcJA7KICFjgw7eIzo4cOfiwc/gKwIUm2SkKdDdlDt4AABDaU/iIRwwbTSUyJFOow4S3Hkx9oNDDZgXPU0h1wcSIgEGUw4ibVET5WoWMKksePHpdxmyKADAEIWly9HJtQkQJMmlAgZCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+apppencil22:app app22 22:photo:22 22:R0lGODlhFgAWAIMAAASC/IQCBPwCBPyChMQCBPzCxAQCBPz+/MzKzISChKyqrDQyNEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARYEMhJ6wxiEMtpIAWxddwXiqRlikSQeiAbuC+wirNR322gv7zcLobzDU+9XypoBBKTR1lz+RTWDgip8nUwZK1XLyIx5XoVicX2RUAo1DVKi7GOBxjxfNwQAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+apptool22:app app22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBISChFxaXNze3NTS1Ly6vKSipNTO1Ly2vNza3Pz+/MzOzOTe5DQyNOzu7MTCxGRmZMTGxPTy9Ozm7Hx6fPTu9MzGzGxmbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAW1ICCOZGmeaEoGbBsI6joMRGEcbQwESDIrtVtAF1gwDLNaAmfKiVgLBJKgwB1KxQZrBHU0FAXmavFoQLYiB6TxFXMj5AZBwnJI2I3wcNWALyYEcgoKXxRhOHs7XxEVCwsWFgoUDRYUFwwQB25ZCxiNjo6GkwUXN2NsCxEYqhUHoQ0MEglYRQQXErcHrI55FycuB2YSmoyOBTEtB2sXuhU6XAENC2a6z9AKCwq+1tAN3E2J3ySkIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+connecting22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxOTi5AQGBNze3Ly6vISChNza3FxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAAR4EMhJqwzY6omD+MNGdR8YilNZnug0qGzrqrL1lnV1fyJBVB6VQEMoGH4ADGwQkxQPBwMiKGA2J8VEAnq0tgiKg5aL/C7C2gTjKCM0zowDQ8tuNQznNL7cKzjOUQsNfER+gguIg19+Pm6ChBZFDmWNi5M5FIyYFHQRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+connectno22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBERCBAQCBPz+/MTCxOTi5Nze3OTm5Ly6vNza3ISChFxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAARiEMhJq7046827/+AVCKE0Dh9BAGdaGISAToFGFMcBU+11I4hDYseSZQiKwwKoI/QwBIYiuFDCZseGdIlYEjUNg1SpY6w2N4cUIW6cjwW1lsFwo+MqgtZuw0/ydw5vH34lBhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+connectyes22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBKyirPz+/KymrOTi5KSipMzCzNza3OTe5Ozi7MzGzPTq9OTm5ISChMS+xFxaXNze3GReZIyCjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWLICCOZGmeaBkAQpoGg7C6JizTQT7CxPwOwFWgYPChYIXkIHC4uQKGAiKRKCyNpxxUUVViVYNFLkqtLo+DAkMMLXQPXwAy2WCTF4544FGtKuwPDhB6DnxuUmyCcXIQhV1uYoMuEAcOBxEKCHg6TzGFCJUSizuejROKOAM9OY2SnUU7nD89NCcDsLUnIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+devscreen22:dev dev22 22:photo:22 22:R0lGODlhFgAWAIcAAPwCBAQCBPTy9PTu9Ozq7OTi5Nze3OTe5Nza3NzW3NTS1MzOzMzKzMzGzMTCxMTGxOzm7AwGDBQOFBQSFCQeHCwmLCwuLDQyNDw6PERCRFROVEQ+RDQ2NLy+vKSipISChGxqbExKTOzu7OTm5Pz+/GRiZMS+xLy6vBQWFLy2vCwiHFQ+NMSmfNSyhIxmTDwuLJx+bLS2tCwmHMyyhMyqfPTqpPzyvLSWbLSWfPzitIx+ZDw2PAwKDCQiJGxWRPTmrPTerMyuhPzqtPz63PTWnPz6zNy+nIRiVDQuLKyWbOTanPz21NS2jNS6lDQqJHRaTPzmrPTSnPzyxOTClPz2xNSuhPTqxPzuvOzSpAQGDOTKnMy2jOzSrPTu1NzKnOzOnBwWHJRuXLSWdPTatPzqvNzClCwmJOzSnOTOnPTuxOzKlOzerOzarOzitJR6ZNTO1IxmXPTWrNSyjPzOjPTSpLSehHRqZOzirOTCjPS+fPzGhOy6bOzKhGROPMy2lPz+1PzmtKRyRHRiNNTCdPz+zNzCjEQ2NKySdDQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAj/AAEIHEiwoMGBARIqXMhQIUIBAwYQIFCggIEDCBIoULBgAYMGDgIIDEBAwMSKBRBk3NjxAciQIwdACBBBwgQKFSxcwJBBwwYMHBx0EAmA5EwPH0CEsCChoYgOQ0cSGCHhA4kSS5syJGDiBNEAFVGUKKEBAwWFFM6SNJHi64gDFEKE4FBBggoKK1i0cPECxokYXw0gsECYggQZM2jAqGHjBo4cOtqOxLhDAg8ePXz8ABJEyBAWRIoYOfJipEoMCZEkuaFkSAslS5jUGJKkSRAnRREo0JDwCZQoTKQAmUKlihQrVa5gKZ1lI+oAK7QM2cJlSZMuU4Z4+TJEx0iNOwKAggkjZkyOFmS8kClzpcUQLRRGbjRD4MgZNEzSqKG+ZgobI2248dUbDDDwABzcxSEHEFpgEcUcdMRRhx1fFejAAx0cgcYdSxiBRx566LEHH0d8QFRRNC3Uhx985CHEH0MAEkhCBxWkgiCDFEFIEYUYUmONMhyCRxVH/PgjBYioYJAdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editcopy22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFPz+/DQyNISChDw6PMzKzMTGxERGRIyKjFxaXMTCvKSmpHR2dPz6/Pz29PTq3MS2rPz69MTCxFxWVHx6dJyWjNzSzPz27Pzy7Pzu5PTm3NTKvIR+fJyGfHxuZHxqXNTCtPTq5PTi1PTezNS+rExOTFRORMyylPTaxOzWxOzSvNze3NTOxMy2nMyulMyqjAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbYQIBwSCwahYGkUnk0BgTQ6IAQaBKfUWhBYKhaAU+CgXAQIAyChLeJzSIQhcH6GFaM0QtGY5kstqEODw8QEQELAhJTc08KBBMEFBUWDRcBE1pca20SGBkaEBscAY5maFRIAgoLHRQRHh8gIQFlZnByqA8ZGSIQIyQjJQEmYgJ5p2ACrK4gJx4gKIZZAgdeAQ4ZI9kjKSor0AwEjeAs1S0cHAslLi4vMDDRWeRIfEsxMeET4ATyVoYLC5fizXEiAR84BeMG+pEm8EsAFhAjSlR4hR6fLxiF0AkCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+editcut22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBAwCBPz+/OTi5JyanOzq7DQyNGxqbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARbEMhJq704gxBE0Bf3cZo4kRJqBQNRfBucyudgvJS6VaxLzyMa6/bLiWA9HOg4VIIkL5vzuRkcpkvRIIAorphJLzBW84WEuRZWp6uaT7J2Sh1Hit3OY/ZO7WvsEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editdelete22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAASC/FRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanPz+/Ozu7BQSFCwqLDw+POTi5PTu7MzKxIR+fCQmJPz6/Oze1NTGvPz69Pzy7Pz29LyyrPy+vPyupPTm1BQWFIQCBPwCBMS6rPzSzNTOxPTi1NS+rPTezNzOxPTizOzWxMy2pOzaxMy2nPTaxOzOtMyynOzSvMyqjPx+fOzGpMSihPTq3OzKrOTCpNzKxNTCtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf8gACCAQIDBAUGBwgJCgsLgpCRAAwNlZYODxALEY+SkAMNEqKjEw0UD5yegqCjrRMVEqidkgWhraMWF7GptLa3EgEWFRSOnhW+vxgZEBqzkBvItxwdHryRCNGjHyAhHSLOgtgSI60c2yQjJd+eJqEnKK0hJCgnJSngAO0SF+8qEvL0VrBogW+BLX4oVKgIyMIFQU8KfDV4R+8FDBcxZBREthAFiRIsOsygsVEUh4Un3pGoUcPGjZInK65QicPlxg8oX5RwqNJGjo0hdJwQ6EIkjRM6dvDYCKIHSBc1Ztjw4eOH0oIrsgIJEqSFDBo0cuTgsdSTo7No0xYTZCcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+edit22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBISGhISChHx+fHx6fHR2dGxqbGxubGRmZGRiZFxeXFxaXFRSVIxSLPyuXMzKzMzKxMTCtExOTPzqrPz+/NTS1MS+tOSaVPyWNPz6/IxeNPzavPyKBNTW1PyCBPyGBJxmNPzOpLx6PNRqBMSCRNySTPyCDPSGBMxiBKROBHRydPSylOyydMxmBJxKBAwODPS2lPTq3OyabJxGBPTy5PTGrOyOXPR+DPz69PzmzPzevNxuPORqLMReFPzy7MyCXKxiNIRKHBQWFNTOxPzixJRaPFxONHRqVPz27PTy7PzStCwqJDQyLJSGdIx6ZPz29PTu5HRmTLSKbMSGZHROPFxKPJSKfJyShKyehMyuhDQmHEQuJJyOfLSijMSynMS6pLSefDQyNHx2bKSahLyqhLymhOzi1FRGNIR+bNzKtOTOtOTKrOTKpLyedAQCBFRWVPTq5NzOvLyunLSmlNTCrOTOrNzGrLyidMS+rLyynKyijLymjLyqjAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gAAAAQECAwQFBQYHBggJCgsLDAwADQ6CAQ8QD5ydEJ+gERKWE4ICDxSpqhWqqhYNFxMYphCtqaytGRoXGxgcggSoth25u70eH8APFR0VzMzNziAXIRjIvwAFwq3EqSLUGB/iI4LathS4JCXVJh8nKCmCKrXDFCss1eIfLS4v8ssdmgWsAGNDDBnt3s3wJ+jAtlUhaNSwccNEi4WCBBl4SAHHihw6ZOzg0QNjRgAG6KXK4CNEjBU/gDQI8kLISQAIADobAoMIzCINjLw4YvNkAno4kCRRUuNHESNLmDRxUjSjAlRPfECJImUKlSpMrFzBIqWqoKtJaWSJomULAy5XXrp4+QKGYcYFoCBEWRImi5gmY7CQyVLGriAGD2jEMHMmCxc0Xb6kUbOGTRs3N988gLM4jpw5Y+iwqcOGjZ07mE8yiGABz5c8c/Ts4cOnDJkybS7fdMO7t+/fvDMaCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editpaste22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQWFDw6FHRuFGRaBFxSBAQCBAQKBCQiBIx6HPz6/NTOfKyiXDQuFOTm5Pz+/Ozu7PTq5Pz63PTyxNTOjKSeRExGLMTGxMzKzNTS1NTW1Dw2NKSmpKyqrKSipJyanNzWlLy6ZLSuVIx6FISChIyKhJSSlCQiJLS2tDw6NDQyNCQiFCQmHBQSDGRiZHRydGxubHx6dGxqbFxeXGRmZFxaXCwuLOzq7KyurHx+fDwmFEQuFCweFCQWDBQODBwaHBweHKSinJSWlOTi5JyepHR2dDw6PBQSFNze3ERGRIyKjIyOjISGhPz29Pzy7MS2rMzOzFRWVHx2dHxybDQiFPz27Pzu5PTq3PTm1NTCtJyGdHxuZHxqXPzq3PTaxNS6pFxWVFRKRNS2nPTi1PTStNSulNzOxNSynMymhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwABAgMEBYSLggaOjgcICQoLDA2Pj4MGDg8QEZ4FDxITFBUWFxcYGRobjQ8cHR4fCQ8gCyEiFSMWJCUkJieNEB4dKB4pKissK8wrLS4vMDHBAAYQHx8dFx0fJDIzNDU0M+IyHzaNNyg43Ng5Ojs7Ojw9Pj9AMkCNDiZB/h9CSOx4QLCgihItqBkYgqIDESElitAYWJCgkQcXjjRCgi1Ihw4BB5LAQOLCgyQYHihpUU3DBw5ElpAgAYNixSRJjKjQaECDCRPZPDB5IbIGSQwKLnh4wbInLA4kmJB4oaPiAwVNnER40hRK1BIAaVatUZJEFCkmpmjgCeWDCalFe4q4oFKwSRUrEa5gycLzwq8lUnPQ4PEgSpYcUZ5o2cIlS1O/JHLEDdfjQZMIVrpgweLFy5e+M6WSmBGlxYMYYBRzCaOFi5imHWBIfOEiShLTVjaP6eyFTBmN1TA5OvLDjJksWb58OVMGDRqWjAYdmU79SIvpjqJr104nEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editshred22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBFRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanOze1Pz+/Ozu7BQSFCwqLDw+POTi5MzKxPTu7LyyrIR+fCQmJPz6/Pz69Pzy7Pz29OzaxPTu5PTq3PTm3My6pPzu5PTq5NS+rPTm1PTi1PTezOzWxPz27MyynOzSvMyulOzOtOzKrMymhOzGpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbpQIAwIBgMCAXDAZFQLBbCqJTRqFobjgdkEYFKowPJZEyeUBqVR/crHDTKZYplovZKCW84+YKZZNZSBXl6EwEEBhVPXxZihGMaGRscdkIdg4QeEnVfCH2OHyAhIhuUAAiXZSEhIyQlJqWnjiEnKCWupRWoYyEgJK0SKaUKjam0JCorLMFfC6iqx8giLa/MGAsT1wsuCyULKwssC9RSzdkfCyALKuALLQsvpeXYIQso3gsiCzALMfENC+dGcMNHUAY/f+jq3ctncMYCGggFrsvHcEGNh/EyPFmg8cmrJxAVkVO0EUDJklHoBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+edittrash22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBERGRExOTDQyNISChBQSFCQiJCwuLPT29Nze3GxqbDw6PGxubHR2dJyanLSytJSWlJSSlOzq7Pz6/Nza3Ly6vFRWVBQWFIyKjMTCxHx6fIyOjLS2tOTi5PTy9OTm5Hx+fNTW1KyurKSmpJyenExKTMzKzKSipFxeXCwqLMzOzKyqrMTGxLy+vHRydBwaHNTS1DQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb8QIBwSCwaj8KAMoA8LgUDQsFwQByay4RiwWg4GA9IRGk0SCYJSsUCsVwwGQ1EsmESD5xOp+L5gDwhBRIZDhcDdkMGDgEiIxAkJQ8Ok5MmAohDAQ1xJxUlKCUlEg0pKpiZJRoLCxmtCw1eURhOcR4rbQ8cGRwLAwgGtBYTDywtGRKjvQTARgEZLhMcKC0OrQMvAirMRc7CHCTU1g2+20TO0NIn1RwDCya/wdHT1Rnt5LToKOq79trx0tR02YPX7Jm8fRxMOIhSLhOJE/LCJSTlr5kFEBQsWDiR4UGGBgsuHDg1BEYAfTE6oEBR4AIBAiS5yWBAAAGBAyaPGAgCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+fileclose22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBERGRERCRDw6PCwqLExOTFRWVHRydGxqbGRiZCQiJISChIyKjHx6fDQyNBwaHJSWlKSipBQWFJyanPz+/JSSlCQmJAwKDCwuLBweHBQSFGxubExKTISGhDQ2NFxeXFRSVDw+PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbZQIBwSCwaj8jkMSAYDAgEJbFgOBwQCUOAoJAaFgvGonHIBhyP5BcSgUAYDWxggD4WFmx3e3HQngkSRgYMEBMUFG4MCId0BGlEAQeEhocVDYcUdBYKF0QCB3gRlJgUAQEYBBkaRAMbDZMMpAYcT46rQwMJrgsdC6QcfwoPnUMOBgkIV6SHHg6bw0QEAQYfBpggBZjPGsRD0gEchxwCIR6HChnQRQ8DIU4DTR4Em+ncRw8O+fmoXPXdRg+gQLFgIYM/KRIkoDP4QMKFf0o0aBAh4qGUixgzCrETBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+filefind22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQSFJyanLS6vLzCxISChNTe3OTu9Oz6/Nzy9Nzy/NTy/OT2/Nzi5Mzu9Lzq9KTe7LTq9PT+/Pz+/Nz2/Mzu/Kzm9Jza5HzK1LTi9PTu9IzW5ITO3FxaXNT2/KTi7Iza7GzC1LzW3FRSVMzO1MTq7HTS3Fy6zFS2vKzm7Lze5MTGzHzS5FTG1Ey2xEyyvJze7JzW3ITa5FTK3EymrGS+zFxWXKymrMzi7ESirEyqvLSyrKze7MzOzMTCxKSepAz+/NzW3MzKzBwWHLzS3ERCRAzi3KyurNze3MzGzLy2vLSutCQiJAyytHRydOTe5MTGxLy6tLyqpKyelJSCdOze3NS+tLyupLSmnKSOhCwuLPzy9Pzu7Oze1OzazOTOvMyihOTi5PTm3Pzi1PTazPTWxOzOtNSunDQyNPzy7Pzu5OzKrNzSzNzGvNS6rMyynMymjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwGFhYOIiYQBAgMEAwKHiokBBQYHCAkKCwwFAZOEBQ0IDAsODxARCZ6gAAEGEhMSFBUWFxgZCJ+TjBoMEpkRERscGBGRih0BBAgeFBQOER8gISEfIruIIwEkCCUVwhcgJicoKSrZg9srCRkRGdMsLS4vMNiK2wIKMRsbMiwzXtCocSydIBs3AuCIwIFDiBMucugAoWvSiB2VNPDg0ELHwA0MkCXr4aNSggg8NoDIQOFHgBtAkgURMiDAEAFEVBCJFKCIkSMGOyDRkETJEkOFmABoUsRJQkQdnkzQACWKlBtTplBR6qopxkFRJ0ytYuWKFCxZtBBq+hRA2AlbRrh08fLlCxi1a51g+dQhDFwuYsaQKWPmDBpKXgNETaNGjJgyhNfcVdTTiWI2XpK0cePmzRk4YA5T5otGixY0qFOXbgXAQCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filenew22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBExOTERCRDw6PCwuLBwaHAwODAQCBOze1NTW1OTi5Nze3MTGxLS2tJyanPz+/Ozu7OTi3BQSFCwqLDw+PDQyNFRSVPTu7MzKxLyyrIR+fCQmJPz6/NTOxPz69Pzy7PTu5Pz29Pzu5PTq5PTm1My6pBQWFPTq3PTm3NS+rAwKDPTi1PTezOzWxMy2pPz27PTazOzSvMyynOzaxOzOtPTaxOzKrMyqjOzGpMymhPTizOTCpNzSzNTGvMymjMSihCH5BAEAAAAALAAAAAAWABYAAAboQIBwSCwaiYGAYEAgFAqGg/Q4DCASCsTiymgcHAcqQLB4mM+QiIQBppLPcMjkwQ4bB2X4maKgt4sVCHpnFhQTElNFE3mDDxcYGRp2RBuMgxwIHX9EBZZwHh8gCBmTQ52NISEiIyQlpUImng8hHyInKAgprwAqgnC0IKwrLLpGB4wctLYkwy0uuwd9Z8AnJywsLcVFx2YcL7UnJCwwLTEy0GXJoSgrCCwzNDTnxgjeH9UrKzXwNDY36LRGhEOwLx4NHDmgJbh3QoeOgv127EhojEeHDj16pEhRQoZHHzl+QJNCsqTJSXaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fileopen22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQWDCwaDDwmFPSubPzGhPzCfPy2dOSmZPzKlPzSnPzOlPzKjBQODPzChPzWnPy2bPSmXPyuZOyeXIRSLEQuFEwyHEQqFDQiFCweDKRuPFRSTPT29PTy9Ozq7OTi3Nze3NTW1MzOzMTGxMTCxLy6tLSytKyurDQyNMzKxOTm5OTi5Nza1NTS1MTCvLS2tLSyrKSmpJyenJSWlIyKjHx+fFxeXBwaHKxuPMzKzLy6vIyOjHx6fDw6NPy6dGxubLy+vISChCQmJNza3KyqrBQSFLR2RKSinJyanGxqZAwGBJSSlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeDAYqKiIeLj4wBjQCMhY+NkoiLk5qbhQIDoJyGBAUGBwgEo4MECQoLDA2pDrS1tKQPEAwHERITE77AvxKqhAQNDA8UFRYXFs8YBAQZGqGPxw0RGxwdHR4eHyAhIiMkJSYnKCgpBAYPEhcqHyssLS4kLzAxMjM0NTY3cBA4UCAHBw8gVnhgEcKFjhc7UPDj0cMHAAI/KFgY4YLFio/jRpTYsW8GDyCSCEQw2DChOHIqgsCQSEPIEEEEJFhAoUNECCJEyOk4d6KIyRtGcB7hIJKjixEjHu4oimSGEIs4d8IIUoKECnNB0ElMwkNJJgBLlJBAcQKGiR07KGAURVGViY0mhIwwSTKjr99+THjUoIg0r48hTRIrRtxkiOMhDgrZCQQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+fileprint22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBFxaXDQyNFxSTPTizOzi1FxORDw2NExKLPTi1Pzy9Pz6/FRWVPz29Pz2/PTy7PTu9OzezPzu5OzavAQCBPzy7PTm3OzazOzKrPTu5FxSRERCRGReXPTq5Pzu7ExGTMS+xKSmpOTKpPTq3JSCDNzSfHRydLyadOzCjOzOtOzSvLyyTMTCxKSipGRiZFROLPz+/KyurJyenJyWnGxmbLSabOzClOzm7LSutJSWlJSSlJyanGxqbNze3OTm5IyGjNTO1Nza3NzW3OTe5IyKjHx6fMzGzMTGxMzOzNTW1IR+hISGhKymrLy6vLSytERGRGxubKyqrLy2vLS2tDQ2NEQ+RASKBAT+BFxeXHRudAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAgOEiYqEAgQFBgcGi5MICQoLmAQDh5OEDA2YCw4ODxARApKUCaGYEAsSCRMUnQysCwoVEhYXGLOLCBCgDqK5GQUXGooCAhscBB0euBUZEAUJvQgIgx8gIR8iCSPiHuIFEREDJCXaANwhJhsnKCnWERcRKiopFCvsBywhQrRwQWGAPAz5EhpQ9wIABRgKYsiYMTEEDQocatiwkUIEP18fbkCAAcMBjhwzdOyQwYNCgBMfKJSgMItBjxs+btwgCSGGjhw/ZoRgQKGZCRMUPgABEgSIkCE3SZok8qNqkR85NtDUEcPIkaVAkCR5SrJBDCVKlmzQ6pCCiRlMTJo4YUH3K5AeMBYYWctW0BOaUH60cBJFypQmII6wyEpFQBVFMSm4UAI3hJUrOGh8oOJrklYKWIromJGDR99Ogz5j4ZGlM+pEnwmBCwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filesave22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBGxqbAQCBLy+vERCRExKTHRydIyKjMTCxFxaXGRiZFRSVFRWVPz6/Nze3Nzm5Pz+/JyanDw+PExOTHR2dMTGxBQWFLSytHx+fISChOzy9Ly6vAQGBJSWlMzKzAwODJSSlHx6fIyOjOTi5DQ2NISGhGxubCwuLOzq7ERGRFxeXNTW1CwqLPT29Dw6PGRmZKSmpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb/QIBQGBAMj8ikUDAgFAzKKCBwQCQUCcICKh0SEAhGw5EIZAmBrgCxeDQgcDJWyz0GIggJfL+XGwQJRxNgC3yGDwwUFUZDFhdthnwMGAZNQwEZFwQakXANBBQbHIIdERIBnRAOiR4ERx8gsSEMBBmGCyEGG3YGBwcgIr8UCwQHECOgG4xCtRkEJAvBJRklJgkSFBQeJ68hJiEoESkFKiEZIbkGARsLlwEGExENGhorGSkpFAYm66NDLAECpGiBYsUIFA8wLHBBQMWLVkdUCFCwaYVFBOymkVCgYEMgOykEpICBccMBAhhELFigTEqAAgIIwCiQ4eRKDyS6EAlJIAI0EpaudF4iIKDAAn9CkRT5eMROEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+foldernew22:folder folder22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBNzaTPT2FISCBCQaDPz+BExKBDwmFPSubPzChPzCfPy2dPz6BMzOTAQCBOSmZPzKlPzSnPzOlPzKjBQODPz+rPz+3PzWnPyuZPSmXNyaXPTyhISCLIRSLEQuFEwyHPy2bKRuPFRSTPT29PTy9Ozq7Pz+xJyanDQyNPzGhMzKzOTi3Nza3OTiVBQWFDwqFKxuPOTi5JSSjISChHR2dGRmZFxeXPS2dNTSzNTS1OTm5KSipLS2tLSytKyqpIyKhGRiZNze3NTW1MTGxMTCvLy6tIyKjCQmJMTCxMzOzMzKxJyenHx6fLR2RLy6vJSSlHx+fDw6NLy+vIyOjAwGBGxqZKyurCwuLBQSFJSWlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLjI2MAY6HAgOHBJYEhJCDBQaDmgcICQoLB4MGDA0OAQUBDg2cAAcPEBESE6QUuQasFRYVq5SxCRcSCggYGRjIGgYbFs8bHIMHExIJGR0eHx7cB83PFhsDDuTUEyAhIiMjJCQluwEmvsAnKAcp1x4qKyUrLLupWrByxcnFiwQIYIggEaNEiRgBZMyYQaNADRs2REA6cCODBxw5+OnQgWMHjx4+BND4MQOIg1gI0gUREkTHiplDhhApEoCGkRlHBL3I8MEHEhz+WAhJogTJySVMfthwIehAExE5jubAkYQpESc8fOx4AiXKNA8+ekhBgqSpzh5hPHcsmVLjpSAqVZBY6VGkiJMiPQKLnTvjCiEsWU4o3nGC8YksMmT8YCmC6iAXKLRc2cz5yGYtR0JjKWQgEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+mailforward22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBJR2dLyijPTixPz69Pzq3Pzy3Pzu5PTu7Ozi1LyelOzavPz+/DwqLLyafPTmvPz67Pz29Pzy7LSWlPzmzPz6/LyajPTitOTSzMyurPz25PTatPTi3KyOjPzuxAwqVDQiJHxiZPTetKySlPzqvPz27BQ6bAwmTPTexLyinNzGxDRunPzy5KySjCQ+ZNzq9KTO7JzC3Nzq/Ozu/LzW7FSm1BR6vGSWvFyq1AyGxAxytAx6vBSKxAxSjMyujLSunES+5BSi1ByGvAQCBNzCrOTaxNTOvMS6rKyelCx6rBx6tBQKDOTWvPzu1PTq1OzezAQOHAxGdBROhAQGFPzy1NzOvIRqXLyynOzarPz21Jx2XPTWrLSShAw2XKSCbPzuzAwePAQCDPzyzPzqzPTmxOzWtAwGBKyObOTSrNzGrKyGbOzatEQyNKyCZOzWrOTGpNS2lCweHCQaHCQWFBwSFBQODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBhBwgQKFSpY0HgBQwYNGzh0mDhRAAUPHziACEGBpYgRJDiUGEkSwoCQJk6opNASRQoOFETQJDkggwoOJlYApcCihQuVL2DUhBDjhIqjJmRwwDCDhswaNm5MjYHjKggOOU7o0CGTA9gdYknG2KCCBw8VJVL0uBgihAUfP+CSNGCjsI/DiBPbAMJBsEQbQYQM+UG5smUiRYw0jlvYxhEkSYyIHm1EyRLTTH40EZvAyZPOR4pAmU07ipIkUKQ0mQIhAZUqVq5gKXzkSBYtyLVEyd1ki8QFXLp4+WJFQowbYLJnD5NbzJiJCjaQnhnvpYwZM0/OPFlvQ/f3iQvQpBlvQc0aCWy4VKnCpY0Y5yQxgEYXZFjghgwZUOHGCW90YQEccUwloBwGyjAHHXUoSAMZb0xhx1QOoMHDHSfIwSEOdTjhAQ1d4MFbTQ6Q4MYacrzxhhx04JCHHhvQsMeLJPHRBxpr+LHCGnusgccfgKixQR1ATtTBlDDAEIggggxCCCGFbLGFHVFKZEdAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mailget22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQ6bCQ+ZAwePKTC5Ozu/NTi9GSWvAwSJGSu3JS+5CR+rAQOHPTy/AyKzES23AwOHCw+bOTq/BR6xES+5AwmTBw6ZMTW9Ax6tByi1BRGdAw2XAQCBDQuNDRupKzS9FSm1BR2vBym3EzC7CSGxBROhNTW1Pz+/OTm5NTO1AQGFNzW3Ozq7Ozm7IyKjJyWnMzOzNzq9Nze3OTa5Ly6vCQiJGReZISChKyqrAwqVBRWlOTi5MS6xJSWlNza3OTe5Ly2vGxmbKymrIyGjMzGzISGhKSepCQmJDw6PHR2dJSOlPTy9MTGxLy+vLS2tMzKzLSutMTCxLSytKSipJyenKyurJyanCwqLCwmLCwuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBhgIBA4SLjAABBAUGBwiNlY4FCQoLDJaNAQ0ODwsQnYwREhMUE5ylFYYRFhcYGRgaGxsDHJUdFR4SHyAhEyIjJCUcuo0cJr0nExihxgwoyYscKSnMHicOIw4lKissLdWDHC4vMCu9McYqMjMyNOUANTY3OPEoOTolDCszdrSgwaMcBxs9TMxYOCMHBx8zfPj48QNINQ5BbMBIIUShDIUoTAhR94PHPEEHbQwZckOGjBQviMxYUWQIDCMmdXE4gqRnkiFETAxR8iKFjJU2evZEdmLJkgJIbqS4wXJIUapImj5FtuSEVyRVV1IVi4RIChhEkLVAgcJHEqVwVJUmYdKkiRNkALMRecKECRG/ff8CEQJFCA5kMKJEoUHDCQ/HkB9LmWKECpUeyKoIMSLEyosen0OD7iH2xg1dV7BkqXGlBpbWNTq4Zn2khu0aAAwEAgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+mail22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBDQyNCwqLCQiJBwaHBQSFAwKDAQCBDw6PPz+/Pz69Pz27PTy7PTy5PTu5PTu3PTu1PTq1PTqzOzmzPzuvOzitPTmvOzivAQGBDw+POzevPz67Pz25Pz23Pzy1PzyzPzqvOTavERCRKSilPz21OTevIR+ZExKTOTi3JyanLS2tPz6/Pz65KyihJSKbMS6lExOTNTW1JSWlJSKZMSylNTOrNTKpFRSVPz29MTCxPTmzKymjIyCdOTWxOzexOTWrBQWFFRWVOzu7MzKxJyalOzatLSulMzKtOzmxOTarFxaXKyqnPTmtIyGdIR+bOzetOzixBweHGRiZOzm3NzWzNzSrOTetGRmZOzizOTexOzm1JSKdGxqbHRydJySdHR2dOzapHx6fKyijOTixCwuLHx+fFxeXERGRDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLAQECjwORAwSUBZYFBpkHmwgJCgsMDA0OD6UQERITFBMVFhcVGBkangq1ChsLGxwcHQ0dHR4fICEGIiMSCbS3uLq8wCQUJSYGJygpKhQJKyvLLM4Nwi0uLwUwDQsxMtmeuQveHR8UMzQ1NgU3Dgo41jk6ns0cKOzgYaOHjx9AgjTAUUvIECLZNmxoUISHkSM9KiBJQkCJA4kKEoBQoWJJAiYtmjh5AmVCsCJRpHzckKCCySlUUvBYUqUHDysSPnxIEuXKA5pPRiRwxwFLFhRaIEDYUoEChCcDuECoOWKFuwW7nHkg4WELkw8/BHRRwESpt10dU8SSHevlRxIBX6C0WBE27q8GZMkKbTADjIAwYlb4GLMYShYoPTRo6FGiSJEKPyzMIFMmzJcvXbhwkSLFjJkbQW6cOHNGhAgEAdAsmk27tm0ABgIBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mailreplyall22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBLyejPTixPz29PTu3Pzu5Pzy7Ozi1LyelPTavPz+/DwqLPz67PTetPz69ERCRLSWlPTmzPz6/OzexLyajPzqvDw+PDQ2NMyurDQiJPz23PTatJyenAQCBPTevPz25LSajOzq7HxiZPTexPz65JyanBQ6bKSmpBwuTOTi5OzaxBRCdHySvGRiZHx6fBQSFERGRNzq9IyOjHx+fGxqbPzu3BwaHFSq3Aw6XAxKfPzy3Gy63ByWzJzO7Mzi9OzavBRytAx6vCSazGRKTPzy1AQKHBRGdBRyrDy63ES+3Cym1CR6rBwWVAQSLAx+xCyCtBRmnPzuzAQWLAwePPzyzKSCbAQOJByGvOTWvPTmxBQODFQ6PPTWrPzqzOzatAwGBKyObLSWfPTivKyCZEQyNKyGZOzWrOzWtOTSrOTGpNS2lJx2XDQmJCweHCQaHCQWFBwSFBQKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpkzGjhAoYMGjZMpMghQgcNFjh4mODhA4gQGkSIHAmBwAgNJEpo8KDSxAkUGjhMSEGz5gUVIiKs2PmBRQudHiwQpUnAxYsXImB0aBqjBcuoU0fKmPGChgUNH2qIqGHjg9u3bicWIFs2rYgbNnDkyGFhb8cccQ3ouJqWQo0dPFr0WMy4h48LFj4gsKriB5AeNngEaSGks+chPnwQOXFAh4oXRYxk9nAEyY7XO2wksWHDx5ATCDIoUXEBsYclTJo4cWJhuIjhSXacSPBEiZLMQY4wgRKluvXqUpyIsDElAxUqVaxcwcGCPQuWLOixaNHCZAsXBU+oqKDSxQqULF6ifNmyn/8VMOtxwcAK36kQRhdJQIFFEmKM4eCDYGyhhYAEkqFEGSuYYcUZLaDxXRpqSNRCEu6twYaFZXTQhgRd2NCCG9918AYELTjoXgNuKAFHB2RQEUYHVbQQRwlUpPHGGFwkyQUEDsgxx4lh9BhCBy2U8UQJcrSg5JIQ0FEHG3bc0QGYK+CRhx57PEGlkhM9sAEffKTQhx9+/AEIIIGoEUgLLRRFR0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailreply22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBMSihPTixPz69PTq5Pzy1Pzu5PTq1Pzy7Pzu7Ozi1LyelPTavPz+/DwqLLSajPTetPz27LSWlPzmzPz6/PTexPz67Pz29OTSzMyurPz25LyajBRCdPzuvDQmJOzexPTevOzq5BQ6bBwuTDQiJHxiZPz23Pz65LyinPzmvBxCbHySvAQCBOTi3OTq9CweHOzaxFSq3Aw6XGy63ByWzJzO7Mzi9OzavNzq9BRytAx6vBR6tPzy3AwOHDy63Ax+xCSazCym1CR6rBwWVOzizAQSLES+3CyCtBRyrBRmnGRKTPzu1MzGtAxKfAQWLAwePPTizMy6nByGvNzWxOzWrNzOtBQKDJR2ZNS2lPTmvBQODPTatKSCbOTaxLyqlAQKHFQ6PPzyzPzqzPTu1PTivOzWtKyObPzuzOTOtLSWfPzqvAwGBKyCZPTWrPTmxNzKrEQyNOzatOTGpJx2XCQaHCQWFBwSFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYuIDBQgYNGzh08DCR4oQPIDqEmDBhJQYRIzqQIFkSAoESJCKkDGFiwgkUKTpMwECz5IASKjqsSMlSA4sWQjG4qGnzhYoQSmF0iCFjBgmWGWhQrVHCxg2sOHLo2MGjB0sLYmsWQHq1p4wdPtqemGDhB1UDQFSouKHi7oQgQmSwUMyYxcQDZQWz2EFiCJEiRoyQyLzZyGIIB47YKLwDSRAiSZSoXq1kCRHNLBK8YGKjCYskTp4ogeKkt+8oUaBImZKAAxMmVKrctqL7ihTnz7FkAT5FC4cKFbZwadIFdxcvX8KLss8iJcoUBUcq2KgAJoxyMTy4jCFTxoxEHl2GLyCDncmWM2hUIQMPY2CXhhoTfTEcA2tgVwEba7Thxhs88FdBD/ZB8MUUHMJBRhw2sAGCHBKU4UaFc1RAhxnhcdhhHUzYAUIcFdxRAh4R5KGHinu4OIVEDqTBRx81xhGHHzD8wQYQetDRI4cTAcIHGWT0EQgZa1ApCBqDcBAID1Q94IEHLtBAAyGEFGKIIWqYYQYPYNZkQEAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailsend22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAIR6fIRydHxubHRqbHRmZGxeXGxaXGRWVFxSVFxOTFRGRExCREw+PEQ6PDw2NDwuLPwCBLSijOzixPz69PTq3PTu5PTu3PTu7OTi1KyelOzavPz+/DQqLPz67LSafOzetPz27Pz29KyajPTmzPz6/NzSzLyurCwiJPz25Ozi3JyOjPzuxBRGbAwSHOzexPz23KSSlPzqvBROdISavBxSdAwaLHRiZLSinNTGxMy+vBxGZNzu9BSGrAwWJMSyrKSSjFy61ETO3BRWfPz65PTqzHTK3ByqzBSWxEzW5AQWJOTWxBRCXOTu9BSOvDzO3ByavBRKbOzaxOzizKSWlCQ2TAQCBJza7BRWdNzSxJSCbMzq9BSOtCSKrAwiPOTavPzy3LymlCySrAwmPFRKTPzy1NTGrPzu1JR+bOzatPzyzCy61ByGpOzWtJyCbPTmvPzuzIS+3FymxCSuzBR6nJyCZOTWvKSObMSujOzivAwKDOTSrNzKrJyGbDwyNOzWrMy2lIx2XBwWFBQSFBQODAwGBAQGBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYqMDxAoYMGjZwmEixg4cPGzqA6BBiAggRIzaQGEkSwgAMJCKgnNBhQogSJlKGOFHTpgYUG0TsnJBCxQoSE1i0KErAxYsOJJRuuAAjhkwZM2jUqGnDBQoUHTbciIEjx4YNOmbs4CGjB8kCZlGAALHBx4+YcTcACcJDyFSJBo6iGNIhhQkiG8BOKGLkCBK6SSQisHoWhZIbG5bMYALECI8mTZw8gTL1QJQXZ6VMiUylSpUlVpoYaXLFtm0EGmCjwJLlA2O9MrRsccKlC8kEXr7AdgEmwtkhX2SQ2BIkjBiSYzSQr/nyhUKZLIrJJOcexvlEBV7IvCBjRkmAMzHOaufhxDvJBWiQISAFxUUQQRovJNeEGmu4JxEDbKQhXxsfuFDGGW68IQMcccgxRxUkNRDhC3R8QMQIdZwXQ11JJGFbiB+QYccHaaTxhgt13OFBDGTgkUdRDrhAhx5k2JjGCB/swYcXMXwAYk190OGHHx/4wUaVepTxByAaoPEkSQ5wwMEJZAZipiCDDJIHIYV8OZEdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav1downarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBBQSFAQGBDQyNExKTHx6fGxqbFxeXGRiZFRWVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFxaXDw6PPz+/MTCxLS2tIyKjKSmpKSipJyanAwODDQ2NHRydERCRFRSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZzQIBwSCwaj8ikcslsOp/OgHRKlQoCgymRUDAcEIkwYgxWFBYERpHQcDwgEclEQmk8DhWL2kiIXDBwExMNGRoJaUkEEH8bEQ0cGgcWAksEHX8QHBKSHk1sfxMHH5ROBBsOICGkT2wiq1CIULKztLW2t0h2QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav1leftarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ5QIBwSCwaj8ikchgQLJGBgfNZDBAKBirRekBMtYGEYsHIgsWNhOO7tCrShDU18Hg/CJAIG0o4wCUQcksTFBUSCRYSEnpUFxgIGQkJGYyNGggbHBaVjR2QCxEeWkITHQ4IH3tPFwEMA2ajAKUgqlQTTbFEE7W5vUgGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav1rightarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNGReZAQCBMTCxGRiZMzGzOTm5LSytPTy9Pz+/CwqLOTi5Ly6vCwmLMzKzJyanJSSlBQWFKymrIyGjCQeJJyWnISChISGhHx2fKyurDw6PAwODHx6fHRydDw2PERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ2QIBwSCwaj8hkMRBQKgOCgRMZIBSk06XhEM0SA4iE4uoVLhCMhqLrdSAekMgYO5VM4BQ521mxIC4UFxBWdEkSERYYFxETGQGFSBKCGBEaGRuQSBwdeZaPXpsQCB6YZQMdEI6ZSgMepKusHh+wrCC0rLdlursGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav1uparrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBFxeXDw+PMTGxHRudPz+/JSSlLSytIyKjHR2dISChIyGjIyOjLSutLy6vKSepJyanISGhJSOlOzm7Ozu7MzGzKyurJyenDQyNGReZKSmpIR+hCwuLCQiJBwaHBQSFAwKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZtQIBwSCwaj8ikcslsOp9QYyAQFQYEAyr0Sihkn1fDAeHVLsOJNELxVaITC0bDUU6GH5AIQ8KYrNtFVxQVFBYWFxgRCREYdUQZGhYEDwgIGxAHCQocCgWOQhmhGR0epR8gqCFTq1Wtrq+wsUt0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav2downarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAQGBBwaHDQyNExKTHx6fGxqbFxeXGRiZFRSVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFRWVDw6PPz+/MTCxLS2tGRmZDQ2NAwODJyanKSmpKSipIyKjHRydBQSFERCRExOTFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAasQIBwSCwah4FkQKBsDpoBIqFgOCASCYRWm1AUFgRGkdBwPCARiWRCaTwOFYvYSIhcMOiJpJGZaDYcR0IEHXceEQ0fICEWIoJDhHcQHxIHgI9SEHeVG46YUh8OISOen1INCqWmUnOYTUxQAU9NUlRWWFtbCiRgrYNlZ2lriG8lYUd1khETE24gCZeCkRgeFBAQIAeNn9OTlXKrBJoYnKrcoaPmpmSpq3S+7u50QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav2leftarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAavQIBwSCwaj8gkMiBYNpeDZzEQXRIKBmPgmtUSDgipcAsWjxOKBaN7Tq+n6EbCIQ3E5+KtQk6gjwl7CX11D3sPBBARTQGFDYeJT2R8EhB0koKUfgATFBUSCRYSEoqcnqCiikMXGAgZCQkZqautr7FiFxoIGxwWqQC4ury+qh2tCxEexMbIRhMdDggfYs7Q0kcXAQwDbELY2txEziBmmx3jSRNMR+nk4e2b70ry80QGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav2rightarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTGxOzm7CwqLLy2vPTy9Pz+/Ly6vCQiJLSytLS2tLSutOTi5MzGzKSepIyKjJSOlKSmpMzKzJyanIyOjBwaHIyGjISGhJSSlISChBQSFJyenIR+hGxubDw+PHRydHR2dEQ+RHx6fERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8hkIIBcJgEBweAYnTYJUmMAa9USClniFtwlGg6IRFhoUKTXwwWj0FB3F46Hwl6UQyISfAB+EROCQgsUFRYSF3yJEIyBaxgWDBkaGRtclQwSHBIbEGEdGx4fGhcOICEDGBsWHBmqIq1CHRIWGRMMIyRTHRy6Er22tyONq8YdJRe0xkIDwr2/QwMfliMmZQADIxasZd4e4UYDIr7c59rc0eVFA+/m0EQD9PDt0flP/P3+BkEAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+nav2uparrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBGReZDQyNMTCxHx6fPz+/JyWnKyurHx2fDw6PJSSlISGhIyKjIyGjISChLy6vJyanOTm5PTy9OTi5MzKzLSytKSepMTGxMzGzLS2tLSutKymrHRydCQiJCwmLBwWHAwODLy2vHx+fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAajQIBwSCwaj8RAAMkUBgSDZdP4JBSi06TAcEAkFNLp07BgLLzY5njRcDzO3zB1C4lEGI83Wj58SiYUFRUWdg0XEXFFAwIYGRoWGxwRZQUFHZdgRAObmx4fHiChISFKpVlKWUdPaalOAlasp1sHG4myZGZ7Yltsbgu1mUhjdRF5egmxfQJ/gYOFdrZDi40iFgiSCw8jBQmYcpydn6Ego6WorUwGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+navback22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRGZAxCZGyavExmjHyatOTy9CxihISevPz+/KzO3BRylAw+XAQCBDRWbPz6/FzC3CSuzDyexJzO5Mzq9CxSdAQOFISmxNzu9HTS5BSmxAyexDSuzJTa7Mzu9Kzi7GS21CRmjAQOHHSWtLze7AyWvHzG3BRihAQKFCTO3BS+1AyixBSWvBSOtBSStAQWJBSixDzW5BTC3BSqzBS21CTC1ETW3AQSHEze7BRqlBRmjAQCDBR+pBRefBRSdCH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMqBcMpvHgGAANQYIhWdVGDAcENQtIJBQLBgNx0MQaDuQXcghIplQDhBIxXKJYiAZGhscHR4VHyAhIiNWJBklGhIbJoQnFCcTKIxFKSgbKissJi0mJi4vLiYoMEcXKDEyMzQ1Nje2NisoOEg4KDU5K6g6OwwoKAN9SCOeMmgwz884PEq9PT4NYkPLP9jZQikN3d4AKVrjKePp3gZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+navdown22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRKZDRSbBxCXJTC1Mzi7Nzq9NTm9Bx2nAQCBNzu9JzG3Hy+1HzG3IzO5BRmjPz6/LTe7Dy61AyStCTC1FzC1AyGrETS3ETC1ETa5BRulAyuzBRylAw+XMTe7Gy+3CSqzAyexBTC3DR+nIS21KTW5Nzu/KzO3FzC3Pz+/ByixEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaRQIBwSCwaj8ikcnkMBAQDgjPAFAYKhsMBkVBUAYEFo+F4QLzVQEQyoVTOX/XBcsHA0+vMRbNBMwkRDhxuHX5GTlIeHh8gISIjFAEeiVRECiQlDAUmgxQjIhwiJHdFlycoKSIUFCEjGiGkRpcqCxYijxorsUezcxYsuoZJsxLAu0qXB7DCTJfHVQrMX9PU1Uh0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+navforward22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBBxCXDR+nIS21Aw+XJTC1Nzu/KzO3Pz+/Nzq9Pz6/MTe7KTW5FzC1Nzu9CRKZMzi7IzK3Lzi7LTe7HzG3Gy+3AyuzAyexFzC3DRSbHy+1Dy61CSqzAySvAyStLze7IzO5AyGrETa5ByixBRmjCTC1ETS3BTC3Bx2nAyWvEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaYQIBwSCwaj8hkMqBsBgTN5IAAjRoDBaq1aDggtMuAWDzoJhTgY+CwYLgZDccDwkgXI5IJZVGxXDAZGnR2QxsLHB0PHRgeHyAZDyFfVUQDCyIgIyCPIB+QJCUmlEMBEiInKCQnKSkeKSQeomoqJrUmKiArKSwZsmoCwMEBGCyxo1EGHr3HUQEEvltCBtDRAAbMW0zV29xDBkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+navhome22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQiJNze3ERCROTi5MzGzLy6vDw6PKyqrKyurBQSFGRiZGxqbGRmZISChEQ+RExKTExOTHRydDQyNOTe5FROVLSurCwqLMTCxPT29Pz6/LSutFxeXLyytLSytPz+/JSWlKympPTq7KSipNzW3BwaHHx6fKx2VJRWNHQmBFweDOzq7Ly+vNTW1JxWNLSajPTe1Ny6pKxWJNTS1IyOjJRmbPTi3OzKrNSSXMSGVHQiBHx+fJSSlPzy9IxOVOzWxOSyjNSCPLxeDJyWnIRGTOTGtMxmDLRWBHwqBIxGTLRSDDQuNNSunKxKBGwyNMSafMxqHMReDKRGDPTu9LxuPLxaDJQ+DIR+hGQqNIQyBGQiBNTO1EQKBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAYSIiYQCAwQCiokEhwACBQYHBAiQhAiHlQYJCgkEC5uCkp8MDQ4NDwylmwgQlgQRERIEBBOkmxQVBgQWFwUFFxEEDLyJGAUZtQoFGhsFHLYdyoOVHsEf0SAbIAUex8mwlAUhtSIFG+3uIyTWvAIGJMEkJe76GyXbEeWUBJg4USKaBhQpVKzYoIFFiwYUBBJa8MAFCw0vYMSQMWOhBhoTKCQSUKMEiw02buDIoWOHBg0GeIhEFKAHDR8afgAJImSIioYliMws1MPkhiJGchxBkmTDCBo1hg4KQMTiBiUyhBxZ8pNFiR5MEtU0WqSJVidJNDyNKraHC5xPNKBEkTLlJ5WvUgWNvfikyhArV34+7ZEXQAAsB2iUyHLlihYtW0pwOYAFgyJDmDNr7jIIWiAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+navup22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBHSWtBRmjAQOHISmxNzu9BSmxBRihHyatPz6/Lze7CTO3BSixHTS5BTC3DzW5ByyzPz+/OTy9AyexEze7ByixGyavKzO3FzC3AyWvBS+1BR+pAQKFCRGZExmjCxihBRylCSuzBSWvBS21BSOtBRSdAw+XAxCZDyexDSyzCTC1JzO5JTa7DSuzETW3BRqlAQWJDRWbOT2/Mzq9HzG3JzS5Kzi7BSStGS21CxSdCRmjAQOFAQSHAAAACH5BAEAAAAALAAAAAAWABYAAAaeQIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbUGFAtGw0GFfheHByQi4S6/E8pDUoFYLm5kAEPJaBAVGxIcER0JHlEfICEiIxUkGyUmIgknKIhXASkonCorgSwmKQGcKE9IAi0uLxUwMTJWMzQ1NiYwBLBQHws1N7avXgs4NjkcCblMATU6KhvGyG87PAnUKV1MAj0+2zIFp1bg4eJJdkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+playeject22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAwKDJSWlFRSVBQSFKymrOzq7HRydERCRPz+/MzGzISGhJyenKSmpGxqbJyWnJSOlKSepLy2vIyOjGRiZPTu9IyGjLSutFxaXExOTHx2fGReZAQCBAQGBBwaHCQiJLSytKyurJSSlFxeXNze3LS2tIyKjFxWXHRudAwGDBQOFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbVKFQsGItBdBhpgh4PxIJvRC8cA4oiMy8bvQhJhMAYTFBVOURAWEw0QFxcMERAYCBluVxobDxkVHJocmBwEGgmEQx0dHh0CpKmkH6odVlanBR8FtAIFtiCkSB0LISEiGCIGIxAPDySuRwIOBwrOzwoHJRHJRh0jJgMj2gMnERQUCNVFHQQoCBvo6CkICATjRB0qp7b1K6qv+foyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+playend22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTCxGReZBQSFOzm7AwKDKymrJSSlFRSVCwqLLy6vPTy9OTe5Ozq7CQiJLSytOTi5BwaHPz+/HRydMzKzKSepJSOlKSipJyanIyGjIyKjKyurISGhMzGzJyWnHR2dISChIyOjLSutDw+PERCRHx6fJSWlIR+hJyenGRmZHx2fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8ikMBBQKgOCgRMZIBSkxYHWoDVWD9EigpBQLLBERsPxCA8NDUhjgTBGJJNGG02RVBQWdUV3FxgZe0IGfoAGdhoXGxwdiAYef4FGFBoeHB8dGSBRihUhIo1FBhkbIyMkJRYmAwYal4JEBh2RChIWJ1IIGxUZFqdECCgkHR6wWAYpFR2YWSobvL5vFgfDaEMDIivMRBEsD9HcQgMWvecDLB0tZ0btsfJa9vLXU/X6/P3+b0EAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+playpause22:play play22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBAwODMTCxKSmpJSWlFRSVAQGBBwaHLSutOzq7Ly6vCQeJPz+/Hx2fBQWFGxubLSytJSOlBQOFAwKDJSSlJyWnIyOjHRydNze3GRiZAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWBICCOZGmeaKqubOumQSDEgRjPMSoMRGEcol3vh0IkFAtDDWBEKlGMRKPgEIii0yrqIS1ArADu9KuLNCSOSdCMVp8ohEZFC4DL6SaBpXGh6/l4JX8XZACDhXkYCn1LAoqMUBAZEhBLDJKUSyYBGmhPAJyemiU0NDaloy+qq6ytI8whACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+playstart22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExOTAwKDAQGBJSSlHx+fBQSFMTCxKymrFRSVOzu7GxqbLSytLy6vJyanPz+/GReZBwaHHRydKSepKSipGRiZJyWnAwODLSutKSmpISChPTu9ISGhFxaXJSWlIyGjJSOlERCRIyKjDw2PIyOjLy2vOzm7Dw6PLS2tCQmJOTe5GxmbDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa7QIBwSCwaj8ik0hgQLJGBgbMoqBIKU2LAcMgOEQmFYeEFbBmNMgDhYDwWBC0k4pCoJ46IgRIXBioRCRYXamwRGBQIfgaBFhiERhkaenxmCoEbBhyQRYaIGVsdghgem4UWegcEBB8UHhsgIaZGBBgRIpUIIxQhChginEQIIBEklWslFyYnBsFfFCi4WQgpFBwqFxNGKxcsxl4IAS0NZEYCF3vlwgEfUuZV8JEuI2pPAARN9kcE9fr+SwaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+playstop22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAwKDBQSFBwaHCQmJJSSlISChJSOlJSWlGxqbGRiZNTS1PTy9Pz+/Ozm7OTi5FRSVIyKjOTe5MTCxIR+hExOTHR2dLy6vLSytLy2vHRydFxWXIyGjIyOjPz2/FRWVHx6fExKTMzOzJyanKSmpKyqrKSipAQGBLSutHx2fDw6PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcslsAgKCAWEQjQ4KgSwyYDAcugZEQqFYYJECA6PhaLcfEEUkgJZAGJB8fkKpWOhHAxcOGBQZGBoaGQgbHIBGAhUOGR0SBxISBh4Xf0iCHxQSlRIIXhsgj0UCIaCXmJgHGyKpRJ+hmB5dHQqOaCENIx0epBIkBhdzngoPGCQlJifQJBvJRygRKRcKGxcXGypys1srEREc5SLnICLiR1koLFVUWfRO9vf4+UwyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+textblock22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUWzvNzo33GfFl5jVlonlTrr1DbvFi9vjeeNUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textbold22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIxhI+py+0Powm0VnknjVkH2AEhE45LZ55Wqn6e65TsMc5eYosbksswubJIhsSiccgvAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+textcenter22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUbz3Sh7yIWfFHKjVl4nmFrr1Lpr7LwkjeeIUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textitalic22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py+0P4wqUSlQvttrkDnyaOHIdeaGRupplAIauVM3xjeeOUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textleft22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+pyw0Bo5zB2UXz3Sp7yG2fFJajVjonmIor2TJvfL0wjecIXQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textright22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUfz3SZ7yIXdF4kWqZkbCqoMO7kXLC+wVOe6YRQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text22:text text22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBBwaHAwKDBQSFLy+vLS2tJSWlBQWFKyqrFRSVCwqLDQyNNTS1GxqbFxaXJyanIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAVcICCOZGmKQSoMaZsShBsQBdAapHvgaIDUqUPJlRjSbAoT0fRDKgODRbF0PLUYjZO2F2Bst9evNix+dsvDlGKK5jraudQb7qbX6a2HEJ+ycyF+LRE8ZTI+fX5oGCEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textunder22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIvhI+py+0PowmUnhpeVVnb1DkbCI1I2JhX+Z0sOr2cTHpwK7a4rUr+hAnufsTirwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewchoose22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz69PTq5Pz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq70466Cl+AMxBVwnFIVRAmQHCIeBrC1L3tQgJ/SaEbeeC1PLBHE2ybFI9A1HzstHEIK6YCmhDTmBybQaHYJn7QC5zKeytIQe1+pKNE6P2yMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewdetailed22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAQ+EMhJq7046817+MLQUQFRGMc4lQaSAkcMx3QltMmrDrSu/sCgEPgJhIiFk89DaL1qPRnlhsgBebWhdstVESIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewicon22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz69PTq5AQCBPz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARWEMhJq7046z2DF0PlBeAVEERhiKhqHgWyUgEsX0KczFOO7JeBYciTCImc5ITIXDKHyqhU9AnRqq9UEVDTvmLbGhin2/qAliOUot5OLc81IO5+2+8WewQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewmag-22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbKQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/avno2BBf/MCClSob4iBIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewmag22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbIQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/cunr9S8gAIRFhTCLAgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewmag+22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbQQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/4zT766vRI+fvHD4CPgwcJ9qg0UB85JA0dDjEQBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewmulticolumn22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq7046813+MJQfUF4BURhHGO6noSBsEcNoDJtS4KcsJQe4ncZ1HYT47HDbDqfUAnJRJmKLIGCCjjJbmE5wBI3EyOFxKCPS1EiJW52dE6vZyIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewtext22:view view22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIkhI+py+0Po2ShBlOxzbP7n2yaJoLm+ZTcxqHuC6hXzML2HVEFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewtree22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz+/Pz69Pzu5PTq5OzaxBQOFOzKpFRWVFxWXOzexPTexCH5BAEAAAAALAAAAAAWABYAAARPEMhJq704g6A779kHCORAgNskFMYhakE8FkjyBcoWv+JwJItXaELYCTFHlCSpZKKcoB5jYHpOGgUadLKbIRw3jhEzQDyCSuI4zW673yhDBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/tkIcons-sample.kde b/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/tkIcons-sample.kde
new file mode 100644
index 0000000000..51f76a0488
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/tkIcons-sample.kde
@@ -0,0 +1,658 @@
+1downarrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PUZi0zmTtypflV0VdRJbm6fgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+1leftarrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAP///wAAACH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxqdwoNGTmgvy9px/IEWBWRkKZ2oWrKu4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+1rightarrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxCtwoNHTmpvy3rxnnwQh1mUI52o6rCu6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+1uparrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PWwhxzmetzFpxnnxfRJbmufgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+2downarrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+pq+EPXYpxUckoO3AjbF3dJwahllXe6AFgC8d+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+2leftarrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pyxf5VohmSlsxmpjTzAHeN5ak6UHpqKRi2GpwvH3Q3eT64RcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+2rightarrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pq5HOAjQyVnqfhHue7oAaKH5kiW0AmnLqaHomkj02g+e6XwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+2uparrow-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIghI+pyxfR0HsRzNnuXVqn3mVQZWFRyIDjp65Ga5Ly4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+abs-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAQABAAAAIwhI95ocn2GlySTiME1iC+DIKdNWxANl4HaqWr055cy6Bs6dahmJsyXVFFJJ7gyF8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+airbrush-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBPzCxMQCBIQCBPz+/MTCxKSipFxaXDQyNISChAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARUEMhJZxCjanBH3hY2EFJgVt0YcEW7liLxBoVxzPHL2msqUzSeT2c5HBC5jQmROKgAhCgKEVBQo6YAqVQIHBQ93ZbmBWt+nDJRgiYMvmuoThWXT/wRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+attach-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBPz+/AQCBAAAACH5BAEAAAAALAAAAAAQABAAAAI2hAOCxg2h0nJHyEshi9HpxU1GOCLdZoKpQ15nibUoprKp9lh2oucUxsBRXsJh4Hjs/QTMpr8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+back-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRSdBRObCQ2TBxObISevAQCBNzu/BRGZPz6/FzC3Pz+/HTS5ByyzJze7Mzq9ITC3AQWLAyWvBSavFyuxAwaLAwSHBRafBSOrDzW5AyixCS61ETW3CzG1AQeLAweLAxefBSStEze7CSWtCyatBSCnBRWfAwmPBRWdByixAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZiQIBwSCwah4HjUTBQFgkFg3MoKBykU0QhoUAIAuAksbpgNByPxQMSGVsVDYlkIqdUiJYLJqORbDgcHRseRR8gISIaEyMkGCVYRBEmeyAnlgaQkSgpmU4RAZ1OKqFOpFNGfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+blend-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBARCRAQCBASChATCxATCBASCBAAAACH5BAEAAAAALAAAAAAQABAAAANHCLrc/izISauYI5NduvlXMIjEQBSnUYCYxnmsSJrouhqh6J4wLo0mWuqWy5heN58seBrGdEdeMgQsNW0ggXbL7Qog4HDDnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+bookmark_add-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy6vERGRFRWVDQyNKSipAQCBMTGxKyurISChJSSlJyanHR2dIyKjPz+xISGhPz+BGxubMTCBHx+fPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVfICACwWieY1CibCCsrBkMb0zchTEcNYsIiYHiwIOdEAvigdFQGE0Ix4NBbSAgsWjk+jBIAlcUYrJASChnSXZSoUDelKfoKpFALJA61ueGI2IAZmhogGFmCGGAgXsifiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+bookmark_folder-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExKTBQWFOTi5OTm5CwqLPz+/PTy9Ozu7FRSVNza3PT29KSmpAQ6XARqnNTS1JyenGRiZJTa9Mzq9JzO5MTGxIyOjKSipFxeXMzOzDw+PDy65FTC7HS2zMzm7MzKzKSenASq5Bx+rBSGrFyqzLSytDw6NAR+zBRejBxqnLSyrERCRIyqvDRujKyurMTCvOzq7AQ2VDQ2NNze3KyqrGxqbLS2tLy6vCwuLDw6PAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAawQIAQEBAMh4GjcEAoCAQGYSCpDBwQiQJBEVhQj1YGo1DoNqZTx8PhODAWZUik0ZAkHRNKZe0IWC4RGBkBGhsOHB0eFR97bBdcICEbAA4iIyQlioxrGhEmJ5QoKSoqJCOZiw4rGixEYi0uo6WYDi8wkwAsCTFksLIuMi+tADMLNAsLEBAgLSMpMjW4RCc2MCAgFjA3MA4R0kgzGS84Ny8vDqBKSDkKETUOOurqAQagfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+bookmark-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+bookmark_toolbar-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy6vERGRFRWVDQ2NKSipAQCBKyqrMTCxKyurISGhJSSlJyanHR2dIyKjGxubIyOjISChHx+fPz+/MTGxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVpICACwWieY1CibCCsrBkMb0zchTEcNYskCsXiwIOdEAzioeFIGE2IB6RBbT5HiAhEIpk6Y9kJBMJoHK6iLIU8kZxFlXhlIp/XJ4BKUIGoWIJ9f3x5e32FeoB5goGAfokTCJEIFJKTlX4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+bottom-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObCRKZBxCXAwyTKTK3Ozy/NTm9GSivAQWHNzu/FzC3IzO5CySrAQOHAyuzETS3CSWtAyOtETa5Aw2VLze7ByWtBy61BSavAxWdBRCXAwqPAQCBDR+nKTe7FS+1Eze7ByixBRmjPz+/AyexAyixAQKFBRqjAQGDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZhQIBwSCwaj0hAYCkYEJLKguGASEADigWj4bgaHpBINykwSCYRa5HCFFQsF0xGo9lwhpSOwfORYC4gISJ3RAQdIyQYJSAlImNrh4uNJkl5CoKUUBQnjlB4KFAcoqOknkh+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+brace-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAQABAAAAI2hI9pEXq8mnsNzggsEMJwbHGimFXS4HUfpKUIq3QJ036vuakyWvbjCJLYbL2WgyW5WIw3g78AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+brackets-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAQABAAAAIzhI8JwXocllMxTlSREGY/2W2iJ1nAEAJklpCfeXAJG8sY6JGowY7jW0sBL0NiqTGBAPwFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+charset-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAInhI+pqxH8kFsvsgtm1vvEaoBZSH6j5FSaRY4me4pyq1ochuf6fvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+colorize-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAPz+BAQCBPz+/MTCxISC/AQChMTC/ERCBPyqXMRaBATCxASChPzerKSipMT+/MQCBATCBASCBARCRISChMT+xDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVnICAGgWieZyCQKGuqZPkGgwyv60gONRDvNlqt9Pv5BgRCYVj8IQ3L4qE4KFiZzRiP90MgEj+FYtGLIRiJQaMxUDjIxFoi8YBAIo3FQjIJ7iAUERNqDTI6PBGJfT0oFVpsMSgzkSh+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+colorpicker-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBARCBDQyNMT+xATCBASCBPz+/FxaXISChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ/EMhJZRCjahBIMdlmeV8gBl3xCabWGarBihwBz+eB2O0WHIFEp1f5BU1EilFI4wCZtGWy+JwWj00OynrNTvwRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+completion-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/Ly+vHx+fAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM/CLrcGjBKCYK4+NoMs+jWIBIdZ50QuWGgMASD+oGnO5beR+x7UE3AyGKV0wxnpeSxyDoGN74Hszl8QhxYhj8BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+configure-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBISChGRmZMTCxKSipLS2tHx6fPz+/OTm5FxaXOzu7DQyNMzOzAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMhAq7wYBDECKVSGBcbRfcEYauSZXgFCrEEXgDCSeIEyzKSXZoBYVCoJVIqBGByKu0Cy8QHxmgNngWCkGgqsGWFseu6oMApoXHAWhWnKrv0UqeYDe0YO10/6fhJ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+connect_creating-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZbihUiz60FPnfaA0iBpBVGdHEYWxToEoSHBRHHM9AgSEQRcj+AYkYAJxIPKQFUJiOdTJQFIDU6dYzKKFhTCM+E5g4mXaDAyrlogEG+DGTecA7wsP8EcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+connect_established-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/KSipDQyNMTCxMTGxISChFxaXMzGzAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZxCjgsAtDtUlCOA1gJQ4kl/IDatAoF7xxkS6GgEBr6jAobCyBX42SQBxMOx6A8MhiGASR8YDgrYsNEeJ0zaEGZY7uoH2oB6nOUwtbdLaVOeTUwo/8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+connect_no-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBAQCBERCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARPEMhJq704axBEHoPUEdhQGMNYFuwxkKInDYjBniEnwMCQIIebSzXx/WwsFK+YMABZikWuYlrUCtZpEYv4WRPaHhb064YB41kCfJFSQBh/BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+contents2-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBDyKhDSChGSinFSWlEySjCx+fHSqrGSipESOjCR6dKTGxISytIy6vFSalBxydAQeHHyurAxubARmZCR+fBx2dDyKjPz+/MzKzLTS1IyOjAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVkICCOZGmKQXCWqTCoa0oUxnDAZIrsSaEMCxwgwGggHI3E47eA4AKRogQxcy0mFFhgEW3MCoOKBZsdUrhFxSUMyT7P3bAlhcnk4BoHvb4RBuABGHwpJn+BGX1CLAGJKzmKjpF+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+contents-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExCNGSenHRmVCwqJPTq1GxeTHRqXPz+/DwyJPTq3Ny+lOzexPzy5HRuVFSWlNzClPTexIR2ZOzevPz29AxqbPz6/IR+ZDyKjPTy5IyCZPz27ESOjJySfDSGhPTm1PTizJSKdDSChNzWxMS2nIR6ZKyijNzOrOzWtIx+bLSifNTGrMy6lIx+ZCRWRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQEAAQCwWBYJiYEAoGAFIw0E5QCScAIVikUgQqNargtFwdB9KSDhxiEjMiUlgHlB3E48IpdKdLCxzEAQJFxUTblwJGH9zGQgVGhUbbhxdG4wBHQQaCwaTb10emB8EBiAhInp8CSKYIw8kDRSfDiUmJ4xCIxMoKSoRJRMrJyy5uhMtLisTLCQkC8bHGBMj1daARgEjLyN03kPZc09FfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+contexthelp-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQChAQCBAAAACH5BAEAAAAALAAAAAAQABAAAAIzhH+hIeiwVmtOUcjENaxqjVjhByaBSZZVl24Y1V6iEVMzkD4bqD700bshgh1fzwd0IfwFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+crop-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMT+xATCBASCBISChPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAM0CLrc/iG+FsQgYapKbp7c4IFCZ2FQOQQE6oSl9Koxabrz/eVDDXat3atAlEEMSKFmyfAnAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+decrypted-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJExGHEQ+FCQiDBwaDBweDGxiLHxyNHRuPIR+RIyGZJSSfFxaRGxmLJyaXNzWpNTOnMzGnMS+jJSKTGReLKyqjPTu1NzarLSufKyibJySXIyGVGxiNFxaXLSytPT29Ozu7OTi5NTS1KyurGxqVCQeDJSSjLS2tNTW1KSmpGRiLKSebOzuzJSOXExONExGLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaVQIBwOAwYA8SkMCAYOAnKYiFAIAQGyOgVCggYuEovVxztMpdnwAGRSCgUCwOjIeQ6HpCIZDKRUNYMRBUWF4UYGRoWGxyBRR0eHxgaICEiIyR0QyUmJygpKgUrAxMsLUQlKyieoKIuEAunK52fBS8DLiywQySpnjC1Mbi6QjIzNBeSIBY1EQfDQgosLAEUNjY3Co1DfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+down-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObCRKZBxCXAwyTKTK3Ozy/NTm9GSivAQWHNzu/FzC3IzO5CySrAQOHAyuzETS3CSWtAyOtETa5Aw2VLze7ByWtBy61BSavAxWdBRCXAwqPAQCBDR+nKTe7FS+1Eze7ByixBRmjPz+/AyexAyixAQKFBRqjAQGDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZeQIBwSCwaj0hAYCkYEJLKguGASEADigWj4bgaHpBINykwSCYRa5HCFFQsF0xGo9lwhpSOwfORYC4gISJ3RAQdIyQYJSAlImNrh4uNJkl5CoKUUBQnjlB4KJ6hokN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editclear-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAIuhI+pm+EPnwmi2msDoLgLzQWDV4HlSJof6qki+W0n7LKdCpdyrm/Rr2EIhwp/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editcopy-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAFxaXPwCBNze3GxubERCRPz+/Pz29Pzy5OTe3LS2tAQCBPTq3PTizLyulKyqrOzexLymhLy+vPTy9OzWvLyifMTCxHRydOzSrLyihPz6/OTKpLyabOzu7OTm5MS2nMSqjKSipDQyNJyenLSytOTi5NTS1JyanNTW1JSWlLy6vKyurAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAaUQIBwCAgYj0eAYLkcEJBIZWFaGBie0ICUOnBiowKq4YBIKIbJcGG8YDQUDoHTKGU/HhBFpHrVIiQHbQ8TFAoVBRZeSoEIgxcYhhkSAmZKghcXGht6EhwdDmcRHh4NHxgbmwkcCwIgZwqwsbAhCR0CCiIKWQAOCQkjJAolJrpQShK2wicoxVEJKSMqDiAizLuysiF+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editcut-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAIwhI9pwaHrGFRBNDdPlYB3bWHQ1YXPtYln+iCpmqCDp6El7Ylsp6ssR1uYSKuW0V8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+editdelete-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPT29GxubMzOzDQyNIyKjHRydERCROTi3IyKhPz29Ox6bPzCxPzy7PTm3NS6rIQCBMxCNPTq3PTi1PTezMyynPTm1PTaxOzWvMyulOzGrMymhPTq5OzOtNTKxNTOzNTCtNS+rMSehAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaKQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhSEQkFgrBAcr1URiPhKAsDD3QB8RhA3FM0IlLHnyUTVBMSFBUWfl0XGBMTGBcZGodmcQWKjpAbHIgIBY2LHRoempOdjooTGx8giIOPFYofISJ+DyMXI6AfFySyfiUmJSUnKBYcICIpfgELzM3OZX5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+edit-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaVMR+RPzKjNze3AQCBMR6RPzGjPyODPz+/MzOzPyKDPyKBPz29OTWzPyGDPyGBOx6BOza1OR2BKROBNSOXKRKBBwOBOzu7PTWxPzizOySZPyCDFxaXOy2lNRyRMxmJCQOBPTm1OzStPTKrMR+XIRWLFxGNCQSBDQyNIRSNDQuJERGRLyqlNzSvIx6ZKRuVEw6LLSyrLymhKSShBwaFFROTJyWjMS+vNzW1OTazNzKrHRqXOzezOTOpPTq3OzWvOTStLyedMS+rLy2pMSynMSulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAewgAAAAYSFhoQCA4IBBI2OjgUGBwiLBAmXlpcKkgsMlZcJBA0JDpIPEBGVjwkSBgOnExSfmBIVBxAMExYXswkYGRobHLq8gh2PHhoeHyAWIYKzIiMkJSYnKCnQg5YNHtQqKywtK9qMBC4vMDEBMjIz2dCMDTQ1Njc4OToz5PEEOzw3ZPToMcLHO23HfogQ0QMIkCA+hPBbhAPHECJFjMyYIUQIvEUpUqwQOXKkSEF+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editpaste-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQiFHRqNIx+LFxSBDw6PKSaRPz+/NTOjKyiZDw+POTe3AQCBIR2HPT23Ly2dIR2FMTCxLS2tCQmJKSipExGLHx+fHR2dJyenJyanJSSlERCRGRmZNTW1ERGRNze3GxubBweHMzOzJSWlIyOjHRydPz29MzKzIyKjPTq3Ly2rLy+vISGhPzy5LymhISChPTizOzWvKyurPTexOzSrDQyNHx6fCwuLGxqbOzKpMSabAQGBMS2nLyulMSidAAAACH5BAEAAAAALAAAAAAQABAAAAa7QIBQGBAMCMMkoMAsGA6IBKFZECoWDEbDgXgYIIRIRDJZMigUMKHCrlgul7KCgcloNJu8fsMpFzoZgRoeHx0fHwsgGyEACiIjIxokhAeVByUmG0snkpIbC5YHF4obBREkJCgon5YmKQsqDAUrqiwsrAcmLSkpLrISLC/CrCYOKTAxvgUywhYvGx+6xzM0vjUSNhdvn7zIMdUMNxw4IByKH8fINDk6DABZWTsbYzw9Li4+7UoAHvD+4X6CAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editshred-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbGxubMzOzPz69DQyNIyKjERCRPz29PT29OTi3IyKhPz27PTu5PTy5Pz6/Pzy7PTq3OzexLyqlPTm1PTizOzavLyqjOzWvOzaxLyifOzizOTOpAQCBOzezAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaEQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhWEQkFYYHkeqkMxKFBFpq9jgdkEGlPqwrJhCIY2N8FFRYUFxcYGX9dgRKEGhiHiYEOhBcbGBwdiQEOARcBGwEeAZllAgEUnQEfoQEgmp4hrCKtrwEYsrRlTiMBJAG8syN/IyMAxMXHSH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+edittrash-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipFxaXPz+/MTCxISChDQyNCH5BAEAAAAALAAAAAAQABAAAANQCKrRsZA5EYZ7K5BdugkdlQVCsRHdoGLMRwqw8UWvIKvGwTICQdmGgY7W+92GEJKPdNwBlMYgMlNkSp3QgOxKXAKFWE0UHHlObI3yyFH2JwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+encrypted-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJEQ+FExGHCQiDBwaDGxiLHxyNHRuPIR+TIyGZJSSfFxaRFxWJGRiLJyaXNzWpNTOnMzGnLy2hJSKTGReLKyqjPTu1NzarMS+jLSyfKyibJySXIyGVCQeDLSytPT29Ozu7OTi5NTS1KyurJSSjGxqVFxaXLS2tKSebOzuzLSufJSOXExGLGRiTExONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwGCgGhkhkQDBoEpLKQoBACAyOUID1qTVwoQGvMPxNFgVjAxp6QCQUicSCwVgkG44HJCKRRCYUCAxIFRYXhxgZGhYbHINEHR4fGCAhIiMkFSVKJicoKSoFKwMsLZtDLison6GjLA92qCueoAUvpC2xQhWqrLYDErmEMDEXlDIwMxAHukI0NS01EzY2NAmPAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+eraser-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAAT+BMTC/AQCBISC/AQChPzCxPz+/MQCBIQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ/EMhJZRA120GwnsEgdh8QiqKXnSi5oqNKsbFWGEYrT8Vx4JydpOf7uSrEIkIISPqWtkIS+pH2qCUptgTYavwRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+exec-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBEQ+PBwaHLy+vMzOzGxqZHx+dKyqnKymnIR+dNTW1MTCxJyOfLySVMSaVMSeVMSebJyWhOSmTOSuVNyubPS+dKSWhHR2dDw+PIyKhNymTNSaTEw+JOy+fPzSnLSyrISChDQyNDw6NMzKzLy2rMyiXGxWLAQCBHRqTPzerNy+lMzGvCwuLAwKDDQyLJyWlNy6jPTGhGxaRGxiRPz2vOTStLy2tFRSTMS+tOzGlPzmtPTixGRiXCwqJLy6tOTWxPTq1MzKxMzOxISCfHRybLS2tHR2bCQmJExORMTCvMTGxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAeogACCg4SFhoIBAYeDAogDA4oAjYQCBAEFBgcICQUBCpODAQsMDQ4PEBGWhgUMDxITFBUUFheDGAYZCA0aGxwcHR4QHwwgISILIyQlGiYnJygpKisEIywALS4vMBoxMjM0KTU2LC2ENzg5wDo6Owo8hT0+Lx8/OztAQR9C1oInQz4FMBAp8sEIhgIEMpwYdASJCwAYkihR5OLGkUUAMmTACK8Hx4+C/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+exit-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBDQyNHR2dCH5BAEAAAAALAAAAAAQABAAAAI4hI+pFrHb3nEg1iWiDiINCwYDko0V9XUTda6I1TIsUMpGinyzbB6ZeGuoEr+GUDL4CXqSphPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+fileclose-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCQiJBwaHAQCBDQyNDw6PFxaXFRSVERGRCwqLAwODGRiZHx6fPz+/GxqbAwKDCQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVaICCOZGmeqBgEwjCkRGEcSKK4JrEcBrMgAdeLVDg0GguGsYEbBQyGYyN6FDoPDIf0+LCKBIgetQERDgGDBGIpNY8GioAU0m6KXFw883w3+/l9f4AkfimGIn4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+filefind-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBCQmJDw+PBQSFAQCBMza3NTm5MTW1HyChOT29Ozq7MTq7Kze5Kzm7Oz6/NTy9Iza5GzGzKzS1Nzy9Nz29Kzq9HTGzHTK1Lza3AwKDLzu9JTi7HTW5GTCzITO1Mzq7Hza5FTK1ESyvHzKzKzW3DQyNDyqtDw6PIzW5HzGzAT+/Dw+RKyurNTOzMTGxMS+tJSGdATCxHRydLSqpLymnLSijBweHERCRNze3Pz69PTy9Oze1OTSxOTGrMSqlLy+vPTu5OzSvMymjNTGvNS+tMy2pMyunMSefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCAAECA4OIiAIEBQYHBAKJgwIICQoLDA0IkZIECQ4PCxARCwSSAxITFA8VEBYXGBmJAQYLGhUbHB0eH7KIGRIMEBAgISIjJKaIJQQLFxERIialkieUGigpKRoIBCqJKyyLBwvJAioEyoICLS4v6QQwMQQyLuqLli8zNDU2BCf1lN3AkUPHDh49fAQAAEnGD1MCCALZEaSHkIUMBQS8wWMIkSJGhBzBmFEGgRsBUqpMiSgdAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+filenew-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz6/GxubNTKxDQyNIyKhHRydERCROTi3PT29Pz29Pzy7PTq3My2pPzu5PTi1NS+rPTq5PTezMyynPTm1Pz69OzWvMyqjPTu5PTm3OzOtOzGrMSehNTCtNS+tAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ/QAAgQCwWhUhhQMBkDgKEQFIpKFgLhgMiOl1eC4iEYrtIer+MxsFRRgYe3wLkMWC0qXE5/T6sfiMSExR8Z1YRFRMWF4RwYIcYFhkahH6AGBuRk2YCCBwSFZgdHR6UgB8gkR0hpJsSGCAZoiEiI4QKtyQlFBQeHrVmC8HCw21+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fileopen-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBOSmZPzSnPzChPzGhPyuZEwyHExOTFROTFxaVFRSTMSGTPT29Ozu7Nze3NTS1MzKzMTGxLy6vLS2tLSytDQyNOTm5OTi5Ly+vKyqrKSmpIyOjLR+RNTW1MzOzJyenGxqZBweHKSinJSWlExKTMTCxKyurGxubBQSFAwKDJyanERCRERGRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaRQIBwGCgGhkhkEWA8HpNPojFJFU6ryitTiw0IBgRBkxsYFAiGtDodDZwPCERCEV8sEk0CI9FoOB4BEBESExQVFgEEBw8PFxcYEBIZGhscCEwdCxAPGA8eHxkUGyAhIkwHEREQqxEZExUjJCVWCBAZJhEmGRUnoygpQioZGxsnxsQrHByzQiJxz3EsLSwWpkJ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fileprint-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFRKNAQCBPz+/MTCxExKLPTq5Pz29Pz6/OzezPT29PTu7PTy7NzClOzm1PTu5LSabJyanPTm3FxaXOzCjOTKrOzi1OzaxOTSvJyenGRmZLyyTKSipDQyNERCROTi5Hx+fMzKzJSSlIyOjISChLS2tAT+BDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaYQIBwKAwIBMTkMDAYEApIpVBgOCAOg4RRGlAoEAuGIdGITgWOq4LxcCQgZkEkIHksHgYJOR6ZQCgVFhYJFxgTBVMZihoCfxUYDWUbUBGKGREcjBoQEB2TAB4CAx+Vl5WMhyACHiEhH6IfIiMktCQgE0cZJQStr6O2t6EARxO6vK6iEx4dZsMCxbsmBB4nzUTEutVSSUdmfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filequickprint-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBPz+/ISChERCBDQyNPz+xPz+BFxaXPwCBMTCxAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMhAq5UYBME7D9kkBMNGjqHmeWBoDhwsEIS7coVx1NhbCrmdzROk9SyU4GEJ2twECISOUNokEopsVrobKCgCrZa73IHFYy4VyZ5WNIO4vBhvse8gfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filesave-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBFRSVMTCxKyurPz+/JSWlFRWVJyenKSipJSSlOzu7ISChISGhIyOjHR2dJyanIyKjHx6fMzOzGRiZAQGBFxeXGRmZHRydGxqbAwODOTm5ExOTERGRExKTHx+fGxubNza3Dw+PDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaAQIAQECgOj0jBgFAoBpBHpaFAbRqRh0F1a30ClAhuNZHwZhViqgFhJizSjIZXQCAoHOKHYw5xRBiAElQTFAoVQgINFBYXGBkZFxYHGRqIDBQbmRwdHgKeH2YgHpmkIR0HAhFeTqSZIhwCFIdIrBsjAgcPXlBERZ4Gu7xCRZVDfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+fill-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBMT+xASCBMQCBATCBPwCBIQCBISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARSEMhJq50hXBvE0JsUEMXwhYFBmOeVDsVqgpS6luRc32RR6hLCTSCQ/VqEwwDhK5Z+Ao3wEPAViL6BR6PSZKyCa6uLAbcAZEznLDHQ1BZDiOKPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+filter-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipMTCxISChMTGxAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM3CLrcDiGGt6IQQ7pI8PjSVHUeqFVBNxRfFjXSZYqwENoUNFx4rve+wI6WEwKLQ5/CSCw2lQ9/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+find-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1ISChOTy9Mzq7Kze5Kzm7HyChOT29Oz6/Nzy9Lzu7JTW3GTCzERCRLza3NTy9Nz29Mzu9Kzq9Ize7HTGzHzK1AwKDMTq7JTi7HTW5HzGzKzS1IzW5Hza5FTK1ESyvLTa3HTK1GzG1DyqtLzu9IzK1AT+/Dw+RAQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaSQIAQEBAMhkjBUEAoGA4EJXKJSCQUC0ZDCmg0hATHAxKRTCIEYYMiMFYsF0xGs+FUOl0BJRAweCIRHyATIRhpRAEAHSILIyQgJSYhJ4dIBBEoISkmKiuVSQgRIyEsEQgELVNCLgQVCiJRLQSfli9pMAQxMrRcQ1G6tAC9AL+7al+qxALACG1Kw8oxBGt7yWBpfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+finish-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAwyTBRObAw2VDR+nAQCBCRKZOzy/KTe7Pz+/KTK3Nzu/Lze7FS+1AyexAyuzBSavAyOtBSmzOTy/BRqjNTm9IzO5ETS3ETa5By61AyixByixBRmjAQGDBxCXGSivCySrCSWtBTC3AQOHAQWHAxWdEze7AQKFBRCXAwqPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZtQIBwSCwahYGjUjBQGgWE5LCgNBwITSFVKOgKDAZEIqodChSLw4HRcIyTW4Dg0HhAIhGIZEIJxA0VFhcYGRAaGBscHXEeHyAhIQ4iiBwjAHEBJCMjJCUmiSdlRyigU0oolURxRSmrTpevsUN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+flag-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBMTCxPz+/MQCBPzCxPwCBAAAACH5BAEAAAAALAAAAAAQABAAAAM5CLrcruG9QCULokqKR44NJQykQGgXSRaEcYJLsLLu6wSFoRMvCuk1kO9ni8GMt6MForQMl89NxJ8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folder_new-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBPz+hPz+BOSmZPzSnPzChFxaXMTCBPyuZPz+xPzGhEwyHExOTPz+/MSGTFROTPT29OTm5KyurDQyNNza3Ozq5Nze3LR+RLy+vJyenMzKzNTS1Ly6vJSWlFRSTMzOzMTGxLS2tKSmpGxubBQSFAwKDKSinJyanIyOjCQiJERCRERGRBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaNQIBwSCwaj8ikcokMCIqBaEDoBAQG1meAUDAQpIcBQoy1dg2JdBqhECgQ1IWB0WgcBIOBwIHXBwwPEBEREhIBbG4IExR/DBUVFhIXV2NjDVYYDY8SFU4ZVxpVAQwbGxynGxkdTh6XVh8gGSGzGSITIxokJUImGSMTwLcnKCkprgAqDSt1zCssKxQtQ35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+forward-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAwyTBRObAw2VDR+nCRKZOzy/KTe7Pz+/KTK3Nzu/Lze7FS+1AyexAyuzBSavAyOtBSmzOTy/BRqjNTm9IzO5ETS3ETa5By61AyixByixBRmjAQGDBxCXGSivCySrCSWtBTC3AQOHAQWHAxWdEze7AQKFBRCXAwqPAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZjQIBwSCwahYGjUjBQGgWEpHNYMBCaT4G2UDggos+EwmBYMBpf6VBgYDgeEMgjIpmoAQVKxXLBPDIXGhscRB0eHyAgDSGBGyJFASMiIiMkJYImUwAnmJqbjp4AKCmhAKSlTn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+frac-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBAQGBIQChCH5BAEAAAAALAAAAAAQABAAAAInhA9hig0SAmQOxeouPrFTzHzbCAzmiZ4k2S1ryHKsoo3tptXg3fgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+frameprint-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFRKNAQCBPz+/MTCxExKLPTq5Pz29Pz6/OzezPTy7PT29NzClPTu7PTu5PTm3LSabJyanOzi1FxaXOzCjOTKrOTSvJyenGRmZLyyTKSipDQyNERCROTi5MzKzIyOjLS2tAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaPQIBwKAwIBMTkMDAYEApIpVBgOCAOg4RRGlAsEAqFIcGITqnWRcPxSEDMgkhAonA4DO3yMD6BUCoSCYIWEwVTF4gYAhAMFRUMZRlQEYgXERqKGBAQG5IAHAIDHYiUEUcDpwIcHh4doR0fH02zqAIXIASsrqi0TQBHE7e5HqG0Zr8CwSC9qFJHxbRSU7W1fkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+gear-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChMTCxDQyNFxaXKSipPz+/CH5BAEAAAAALAAAAAAQABAAAANdCLobwbAFMciLwBFSihBEFHSG8QnmpQQEBX6loI5G5QTlcMgrZSmEmsGxKqRWNV3hMrFlBtDoA1eTEaKHJdMYhR6+gxkF++UMGbiDzvDVioyHAJSHcchuGLQq4k8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+gohome-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBDw6PBQWFCQiJAQCBFxeXMTCxJyanDwyLDQqLFRSVLSytJSSlISChCQmJERGRFRWVGxubKSmpJyenGRmZLy+vOzq7OTi5Ly6vGRiZPTy9Pz6/OTm5ExOTPT29BwaHNza3NS6tJRqRGQqBNy6pIyKjDwGBPTe1JSWlDQyNOTGrNRiBGwmBIRaLNymdLxWBHxGFNySXCwqLKyqrNR6LKxGBNTS1NTW1Jw+BEweDDQ2NAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaoQIBwCAgIiEjAgAAoGA6I5DBBUBgWjIZDqnwYGgVIoTGQQgyRiGRCgZCR1nTFcsFkHm9hBp2paDYbHAsZHW9eERkYGh4eGx4ag3gfSgMTIBshIiMkGyAlCCZTEpciJyQjGxcoKUQBEhcbIiorLB4XEltDrhcaLS4vtbcJra8bMDHAGrcyrTMXHjA0NSypEsO6EzY3IzU4OdoTzK0BCAkDMgkIOjJlAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+goto-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBEQCBAAAACH5BAEAAAAALAAAAAAQABAAAAIohI8RyKciVnMwTlrlDfkm5QFgaHBWMo0lp22dZ57wO8vpGrLk2iJ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+help-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQ6XAQCBCyCvARSjAQ+ZGSm1ARCbEyWzESOxIy63ARalAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ/EEgQqhUz00GEJx2WFUY3BZw5HYh4cu6mSkEy06B72LHkiYFST0NRLIaa4I0oQyZhTKInSq2eAlaaMAuYEv0RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+history-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBEQ2LEw6POTSrOzWtNS2lAQCBOzatPTm3PTq3MyyjEw+NOzm1Pz29Pz+/Pz6/Pz27FRGPFxKRPTu3Pzy7Pz69Pz67KSGbPzy3Pzu3PTizPzu1Pzq1PTmzOzaxPTixPTmxOzWvOTOtKyWdOTGpOTStNS+nIRmVLymhNzCnOzavLyefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIBwGCgOj0jBgFAwGJDJAyJBUDihwgWj4XhAqhEJNDKhVLwUSUDyPJIrlgYlLSG0hYELhgLJTBJOd1kaGxgYHB0egkQfHBwgHyEigkUBIwMkBwcEJSZ3ARYWJCcnKCYpJJ5HAQUqFhSjJysoKItOCgehJBISI4tCtyERa79HTrx2WEiBUH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+idea-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+BPzerPz+xPyqXPz+/ISChFxaXKSipDQyNAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARMEEgZap14BjG6CJkmEMVQCF+4mQPBpthWtuYJxkJJGK6dbQRCgMBB3XCDzQamMhpDGlvuCFUyoQDLBUsJHBDUKuKQCKsUCIVZtc34IwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+int-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBIQChAQCBAwODAQGBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCKqx/iw0CNukzuJ8d1yCAAziIyliCKjck1ZuaV4igZ1r+raongE4j8YT6QiJC38CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+locationbar_erase-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAIshI+py40Bo1SywgSFiDq+oG3hZHDhVpUmagFrl7pgN3oqPNuqpe+8Awwi/AUAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+lock-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJEQ+FExGHCQiDBwaDGxiLHxyNHRuPIR+TIyGZJSSfFxaRFxWJGRiLJyaXNzWpNTOnMzGnLy2hJSKTGReLKyqjPTu1NzarMS+jLSyfKyibJySXIyGVCQeDLSytPT29Ozu7OTi5NTS1KyurJSSjGxqVFxaXLS2tKSebOzuzLSufJSOXExGLGRiTExONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwGCgGhkhkQDBoEpLKQoBACAyOUID1qTVwoQGvMPxNFgVjAxp6QCQUicSCwVgkG44HJCKRRCYUCAxIFRYXhxgZGhYbHINEHR4fGCAhIiMkFSVKJicoKSoFKwMsLZtDLison6GjLA92qCueoAUvpC2xQhWqrLYDErmEMDEXlDIwMxAHukI0NS01EzY2NAmPAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+lsub-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBIQChAAAACH5BAEAAAAALAAAAAAQABAAAAImhI+pFu2+QpxKVppsxkh3fnhh9DyGcC6IwLbqir4HK58tLcfx6xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+lsup-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBIQChAQCBAAAACH5BAEAAAAALAAAAAAQABAAAAIlhI95YawYonwp0uoukFO7rCXCSJKPcKYKuqqii7BvS892XJZ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+mail_forward-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRydHxubHxmZGxiXHRmZFxOTFxGPFxKTPwCBLymlMy+pOze3PTq3PTu5Pzy7LSmnOTaxOzm5LyqlNzOtPz69Pz27MzCtLyqrPT27IRubPzuzNTGvNTCxLSelPz25Bw+ZFxKPPzy1Pz65LyupBxKdCxWfPTm1Pz23LyinBxGbGzO5DRafBxWfBxajCymxHTS5BxSdBxKbFTK3EzG1CSGvCyKvCSSxCSavGTO5GRaVPzqzFzK5EzG3BSCtAwiPGxaVPTivPzy3NzKpBxObCRefBxqlPTmzJR2bKyahAwyRPzmvOTOpKyObNS+nPz21AQOFKyOfPzuxAQCBGRORLSadPzyzLymjMy2lOzetDwuJFRCPEw6NEQ6LEQyLEQ6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAkALAAAAAAQABAAAAfhgAABAgIDBAQFBgcIBwmOCQIKCwwNDg8OEBESjY8CDBMUFRYVFxgZDJyOGhsPChwVHR4fFSAhjwkaIiMOJBQQDRUVJSa3GicoHw4pEA8SGSorLI8tLtQu19gqLzDECTEyMzQ14zY1Njc3ODkqCTo7MjIxNCs5PD03PjctPwlAQUIihhBpQbCIihtG+CUocASFkAhIkogQ8kFJwkcFlogIkoRJEydPnkBR6GiAxiQLgiiIIkXElFQJqESoMsRKkAhXqkhhApNKFSxZggTJ4nHIEJhaDhzYwoVLFy1avHyB6ScQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mail_generic-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBGxaVOTe1Oze3OTWxOTWvNzStNzKpEQ6LOTezPz+/Pzy7Pz69Pz27Pz25Pz21PzuzPzuxEQyLLyinLSmnPz67Pz23LSafKyObDwuJMzCtLSelPzy1My6nLymjNTCxLyqnPzq1LyihKyOfOzavOzetEQ6NPTq3NzOtLymnNTGxJR2bOTOpPTivNTGvLymlKSShKyahEw+NOTe3PTm1Pzu1Pzy3FRCPPz65LSadFxGPOzm3PzqzPTmzPzmvEw6NCH5BAEAAAAALAAAAAAQABAAAAaqQIBwSCwaj8ikMhloOp/QpmAgqAoIhELBUDgcEIGEYrFgNBoLx+IBiRwkgQnFoWAwKhWLhX3BZAILGhsCDXgODhwdGB5vgAofICBlDiEiIx4kJSYBJ2UoEykqHSMrLC0nLWAnFS4UCycvMAcEMR0RLTIBMwaSahw0NTYtFwclNwEdLws4eoc2DxwQOR06ASk7PBAhIRE9Pj0tLSUY1T8I5gjn6Qgy7D8SfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mail_get-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAxKdBRSfCyGvFSm1BxKfCSWzCyWzBRCXCRKfBwuRAQGDDw6PHy23Cym1CSSxByCxBxunBQSFKyurMTCxExihNza3NTW1JSSlMzKzFxaXLS2tNze3KSipCQmJGxmbNTS1KSepLy2vISGhJSWlHx+fERGRPz6/IyKjDw+POzq7JyenMzOzKSmpCwuLDQyNIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQIBwGBAIAsOkUjAgFJRQQMHgjC4PBIEVgAh4D4aEYrGAMhINxwPyiCgYSsmEUmk82grLRZJkYCgXaAEKFxYZcEISGhsZFxwFeY0WHR5CDB8dGCAXG5shGxQicBIMpSMUGxgTGSQlpQwSJicnEwwdI7gdKAwTsykpKiobr8QMKxeHDBcsGRvOzxsT0i0uL9HSHdkT2ZkoMJXF4a8AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mail_replyall-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBLymlMy6pOTa1PTq3PTu5Pz27Dw+POzi3PTm1OTWvPz25FRSVERCRLympPzuzPTu7NTGvFxaXKSmpPzu1Pz65Hx6fHxqZPzq1Pz23HR2dBw+ZHx+fISChJSWlDQmJHRydCxWfBxGbJyenExKTHRiXPzqzPzy3CQmJDRafGTO5ExOTERKTGxWVCRSfHTS5CymxBxajBxWfPTmvPzy1CyixCSaxCySxDSaxDSWxDSSvDyaxGS21PTmzPz21AwiPBRejCSavByGtCSezEzG3FzK5FzG3GzO5FTK3CQ2bPTixBxqlCRefBxSdBxSfBx2nCQ+dHxmXPzmvLSafAwmRAwyRPzyzDw6POzavNzKpAQOFPzuxBwWTBw2ZGRORLyWdMy2lOzetPTivAQCBKyObOTOpAweNBwWVEQyLEw2LEQ2LDwuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAf4gAABAgMEBQUGBwgJCguOCwEMDQ4PEBESDA4TjY8DFAwVERYXGBkRm4+QGhsMHB0eGB8bDpyOARogEBceIRgXv8COIiMkGB4lJSYnIcwoKb/DGyoXKywtKS4pHinMLzAxJDIzNDUtNjcv6B0hLzgfMh85OjstPDw99zwd7T4/LTVAgggZQqSIECNHevSAgSSJkiVMmjh5AiWKlClAiFARUeVHFSVWmLS40gNLlh5agGzh0kWDlwZfrIDREKaCAjEqrFA5MMYLmTAxlJTxYoZMozNozqRRs4ZNmy5s3LwhA0dBnDNn5MxBoAABnTp17IitowDrmQV+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mail_reply-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTEw+NFxKTFxGPPwCBLymnMy6pOTa1PTm1Pzy7LymlOzi3HxqZOTWvPz69Pz25My+tLympFRGRHxuZPzu1LymjNTGvNTCxBw+ZPz23PzuzPz65PTu5NzOtCxWfBxKbPzq1DRafGTO5BxGbPzy9HTS5CymxBxajHRiXPzqzCyixCSaxCySxDSaxDSSvGS21GxWVAwmRBRejCSavByGtCSezEzG3FzK5FzG3CQ2bPzuxAwiPBxqlBxKdCRefBxWfBxSdBxSfBx2nCQ+dPzy1CRqlAwyRDQmJPTmvPTixLSafOTOpAQOFPz21BwWTBw2ZPzmvNS6nPTivAQCBAweNBwWVNzKpPzyzLyihGRORLyWdMy2lOzetKyObEQyLEw6NEw2LDwuJEQ2LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfqgAABAgMEBQUGBwgJCguOCwEMDQ4PEJYRDhKNjxMPDBQVFhAXGBUSGY8LGhsQHB0VHh8gFQ6bjgEhIiMMJCUmFbS2CwMnG6IoKSorI7WpEycWFiUsLSou1yXXji8wFiopMTIzNDUz4zbZNxsbODk6Ozw9Pj8pPzEzQDdB60JDOkRFjBw5giRJDCWdlmxwIIRJExAWKDRyMgTIiydLoESRImQKlSUSF1SxUoXAlSBRsGSJoCVICIlbqlThcoBClC5eYFD4EiVIFwUyqywAE0ZMlqNjpJDpIkUBl0dlFChAYOZMmTJoyqQR5icQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mail_send-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBHxqZLyqlMy6pOze3PTq3PTu5Pz27Pzy7LyinOTaxOzi3Ozq3LymlOTOtPz69Pzy5My+tLympPzqzNTGvLSelPzy3BxGbBQ6VPzuzPz65LyupNzOtPz+/GzO5BRejPzq1Pz23LymjHTS5CyixCSavBxqlPz25LymnGTO5CymxCSaxByGtHRiXPzy1CySxCSezGxWVPzuxKyOhMy6nDSaxEzG3PTivNzKpKyOfPzu1FzK5PTmzJR2ZLyihLSWfKyObOzmzPzmvDyaxOzavLSafGRORMy2lOzetDwuJEw6NEw2LEQyLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfUgAABAgMEBQUGBwgJCguOCwwNDg8QERITFBUWjY8DFxgZGhsaHB0aD5yODB4TGB+kICEaIiOPCwEkJRcmJyYPKCIpKrWqKywTmC0SIi4vMDHEDCsyMg8zEyI0NTY3z7U4Hhs5Mx+0IyI6OyPrIzw9Gys+PxIy2EBBxAs8Qjk5Q0RFWFxAZySfgSMsilRAkiRECHQ08hHgJ0TJkCU/mECU2ISEkowUlpAQ4QTfowNPoAzJIeRJCyjm8kVRIkWIzSkXhwxJtYAKgp9VrFi5QoWKFZ5+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+matrix-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBIQChCH5BAEAAAAALAAAAAAQABAAAAIrhI9pwQHt4Jru2Vsjna919lXKeEimh6UZp1lrCEvkfILyirOby3q1OEv4CwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+misc-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChMTCxDQyNFxaXKSipPz+/CH5BAEAAAAALAAAAAAQABAAAANdCLobwbAFMciLwBFSihBEFHSG8QnmpQQEBX6loI5G5QTlcMgrZSmEmsGxKqRWNV3hMrFlBtDoA1eTEaKHJdMYhR6+gxkF++UMGbiDzvDVioyHAJSHcchuGLQq4k8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+move-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhA8RyKja2HtRrmrxNfDszm3JMpXmiULg6Hyto4kYO49Tfdc04xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+news_subscribe-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/ERCBDQyNAQCBPz+/FxaXIQCBMQCBKSipMTCxATCBMT+xISChASCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARsEEgZxLxYDlJsvsJGDN0nFQRhpKR3DSJxrGMphYQgpDI9WLhdTtjjAFApXZI30m2UQwICVigcEzzolKAYIAIFBAKbQjQX3YGGISZvFtzFQr1uDxT4PH0yYE8FCg0/Jn0MAwsNOiY3IQMBEn4RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+news_unsubscribe-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/ERCBDQyNAQCBPz+/FxaXIQCBMQCBMTCxPzCxKSipAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARiEEgZxLxYDlJsvsJGDN0nFQRhpKR3DSJxrGMphYQgpDI9WLhdTtjjAFApXZI30m2UwxjsiOApB4kNLFtQKKopxeCQxR4GAJIXPCInzmhN9zvCljNq8ZvswmzhZHEfOhpofhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+next-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFwyXAQCBOze9BwCHNx21LQCvPSi5NRi7AAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ3EMhJqwUhAMG7DQOxdVwFFuI1nYZIethwIK0aFwjtwrfh15cAYUjcvWyvkm1Z4TGfkyN0avFHAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+ok-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBMT+xATCBASCBARCBAQCBEQCBAAAACH5BAEAAAAALAAAAAAQABAAAAM2CLrc/itAF8RkdVyVye4FpzUgJwijORCGUhDDOZbLG6Nd2xjwibIQ2y80sRGIl4IBuWk6Af4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+openterm-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXFRSVPz+/PT29OTm5OTi5DQyNDw+PERGRExKTHx+fISChIyKjHRydFxeXDQ2NCQmJBQSFAQCBERCRMTGxHR2dGRiZExOTDw6PCQiJAwODCwuLFRWVOzu7BweHAwKDCwqLHx6fBQWFGxqbGRmZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAanQIBwSCwKAwKkMslEAgSDqDRKqBYKhkNgcDggEorkMrDQchkNhuOhgEQkk0l5S2lUGpYLJqPZTAwMHB0DCmhqAW0Rfh5zAxgOkBcCFAcfIBMECxwBBAEPFw8dChkhcBMDDAcdnQqtFKSWcQMimx4dGRkQBxGxsg6bBQEawx8jl3GnJFoFHRNXVVNRJYIFDAsL1tgiDiQXFx0HABwcXeQH5OjkRutEfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+paintbrush-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTC/AQChPz+/MTCxKSipDQyNCH5BAEAAAAALAAAAAAQABAAAAM7CLrMIS2qN2Sj1U4xugaYZxFE1wUaURQnKpFBYQTuFRiyXDsCd8y7RYhmCQ2IkiHywmkFN84ibfrxJwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+paren-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAQABAAAAI3hI+JEQq8mnvyzSOhEWJ3CgLcOILV4IlfUx1cwirfYiEvXL83arANSer5UipM5tIzXjRCh8ZfAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+pencil-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/IQCBMQCBPzCxAQCBPz+/MTCxISChDQyNKSipEQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARDEMhJZRBD1H2z3lMnjKCFjUJQimOgcmcbELCXzjXq0hV785WCQYcDFQjDXeloMByKG6YTAdwIDAlqSZJSVFeKLcUfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+player_eject-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+py+0R3IFQUtruXVqn3kkWyIARR4rqKvoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+player_end-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+py8Eb3ENRggrxjRnrVIWcIoYd91FaenysMU6wTNeLXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+player_pause-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+py+1vgoxzyUCxrZd18ClfmIyVyJ1lqkHuC0N+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+player_start-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pyxudwlNyguqkqRZh3h0gl43hpoElqlHt9UKw7NG27BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+player_stop-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+1vgpySUWpvXXqrHmSaeJEYhKYq6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+previous-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBFwyXOzC7PTq9OTK7IQyhBwCHNRi7LQCzPSi5IQ6jLwKzORy7AAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ8EMhJKwg4W5o1EGAIbt8wEERhHJ0mIEmiLAH5IYxi1JcnvTOeTdDYcVo1gfHY+hxs0IkvSpV2qtgswB8BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+prod-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBIQChCH5BAEAAAAALAAAAAAQABAAAAIihI+py50Bo4SKHlsDwk9fn21gJzIcV37miKpuZ0nOTBt+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+queue-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBMTC/Pz+/CH5BAEAAAAALAAAAAAQABAAAAI5hI+pFrEahGgPtCinS2GMlknU0Xkflm2l6YEiw8aRGssTXLe3lZsznvuRViwholEcLZCfynGT8BcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+redo-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxOHBxSHBRGHKzCtNzu3MTSzBQ2FLzSxIzCjCSKFCyeHDzCLAxGHAwuFDSCNBxKLES+NHSmfBQ6FBxWJAQaDAQWFAw+HDSyLJzOnISyjMTexAQOBAwmDAw+FMzizAQODDymNKzWrAQKDAwaDEy6TFTGTFSyXDyKTAQCBAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ2QIBwSCwaj0hAICBICgcDQsEgaB4PiIRiW0AEiE3sdsFgcK2CBsCheEAcjgYjoigwJRM2pUK0XDAKGRobDRwKHUcegAsfExUdIEcVCgshImojfEUkCiUmJygHACkqHEQpqKkpogAgK5FOQywtprFDKRwptrZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+reload-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCRaJBxWJBxOHBRGBCxeLLTatCSKFCymJBQ6BAwmBNzu3AQCBAQOBCRSJKzWrGy+ZDy+NBxSHFSmTBxWHLTWtCyaHCSSFCx6PETKNBQ+FBwaHCRKJMTixLy6vExOTKyqrFxaXDQyNDw+PBQSFHx6fCwuLJyenDQ2NISChLSytJSSlFxeXAwODCQmJBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIBQGBAMBALCcCksGA4IQkJBUDIDC6gVwGhshY5HlMn9DiCRL1MyYE8iiapaSKlALBdMRiPckDkdeXt9HgxkGhWDXB4fH4ZMGnxcICEiI45kQiQkDCUmJZskmUIiJyiPQgyoQwwpH35LqqgMKiEjq5obqh8rLCMtowAkLqovuH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+remove-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/PwCBMQCBEQCBIQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMuCLrc/hCGFyYLQjQsquLDQ2ScEEJjZkYfyQKlJa2j7AQnMM7NfucLze1FLD78CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+revert-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAAQCBPwCBPz+/PTizCQeHDQyNBweHAQGBAwKBDQ2NPzu5PTi3ERGRCQiJHR2dPTi1CwqLPz6/Mya/Mxm/GQCzFRWVGRmZAwODFxeXExOTExKTERCRBQWFMTCxKSipMzKzCH5BAEAAAEALAAAAAAQABAAAAV9ICCOQWkGIiqsQloCKCqy7UC8MC4URSsMhsDBNWOJEK4TYJfoGU8vmmJBGI5SyyYj0XDQjMvVQwBxRCQTilowFGwrjG5kTo+0x4OdpcLvV0YXIhcGGH0ZFRobOSccfB2PHR4FiyYAGQwdAI8eEAdQKBsZmR+RBpSVVyMHfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+rotate_ccw-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBFxaXIQChEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM0CLrcHjA6JcK4ET68MrNDoIgjOYbdJ4IXagIa3IqVFAMEOqpfn067ErBxG0qGsCJyyQT4EwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+rotate_cw-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBIQChFxaXEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMzCLrcHjA6FaG4YbS6At5BR31UKI4mADGhd31rpbmCuZ6qQLA8XvqT2+QhHLKKxqSy4U8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+rotate-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBFxaXIQChEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM0CLrcHjA6JcK4ET68MrNDoIgjOYbdJ4IXagIa3IqVFAMEOqpfn067ErBxG0qGsCJyyQT4EwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+rsub-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBIQChAAAACH5BAEAAAAALAAAAAAQABAAAAInhI8Jwd26YJBUTVvT1Rlt3x2f6DjQeQiGigLCC7crK7+yC9sty/oFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+rsup-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBIQChAQCBAAAACH5BAEAAAAALAAAAAAQABAAAAImhI+pGtZ7gpwQyWofnnQ7I4SiuAjlqZgpmqgti7gxfMh1OY6LXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+run-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/ISChKSipMTCxLS2tLy+vMzOzMTGxNTS1AAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARlEMgJQqDYyiDGrR8oWJxnCcQXDMU4GEYqFN4UEHB+FEhtv7EBIYEohkjBkwJBqggEMB+ncHhaBsDUZmbAXq67EecQ02x2CMWzkAs504gCO3qcDZjkl11FMJVIN0cqHSpuGYYSfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+signature-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAFxaXPwCBAQCBDQyNPz+/KSipERCBAQChISCBMTCBPz+xMTC/AQC/MTCxPzerAAAACH5BAEAAAEALAAAAAAQABAAAARwEMhJZwgCiM17DoMkEGRpAmGhmSxhAOrakim6DgeLJApRhCPCgJRT8AhGEVFIQigAxgSQsBgwms8oIrDKDZNGxJY7GuYQULHhQj4shAmAuNAQsFc9xY4uUNgvMiQOBIMOfncjeUhICocXAx6RfwF+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+spellcheck-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPzCxPwCBMQCBIQCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLrcGuHBNZ+NIOJ9O4MTaH2e1nDoiFYZJjgwIAzwy8yEgy84RhWDQa4HCwAHxJgxSPApC83YyQnwJwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+sqrt-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBIQChAQCBAwODAQGBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMyCLrcDiHK6eIL9WmsmwWCAAyiwkGKGILihzLq8p1s9onE9a48Iy28ko/WgRCLyGTDnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+stamp-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+xMTCBISCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANCCLrR+zAIMQKMguh6GR2g1QEBCBLiGGjo+DSpS3IqXNqxNAnwzisSk3BowRltM8IAZVMqi84lLNoqUVfLrOhoVPgTACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+start-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRSdBRObCQ2TAQCBBxObISevNzu/BRGZPz6/FzC3Pz+/HTS5ByyzJze7Mzq9ITC3AQWLAyWvBSavFyuxAwaLAQSHBRWfBSOrDzW5AyixCS61ETW3CzG1AQeLAweLAxefBSStEze7CSWtCyatBSCnAwmPBRWdByixAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZrQIBwSCwah4HjUTBQEogFw/M4BQgMh2pxijAkFAhBYJwUPq8LRsPxWDwgkSHhelA0JJIJnlKRWy4YGRoSGxwcHRsecgAfICEiGhMjJBglVVMRgBkgJp0El0MRJyhaRFqipUoAFqmqrapHfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+stop-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/Gw6NGQuLHQ6NGQmJFweHFQaFPTm5PTa3PTW1Oy+vOS6tNSinKReVDQWFPz+/Nx6fNyCfNyGhNR+dMxybMRiXLxGRIwWFNx2dNx+fNx2bMxuZLQWFBwWFPTu7Pzy9NRqZNRuZMRSVLwmJGwWFNR2dMQiHPTKxMxmXMQyLMxmZNx6dMxiXMRSRMRaVKxybMxaVEQWFMQuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaaQIAQEBAMCAWDYcgkHhAJxYLRcDQBggckIplQKpaLdRh4YDIaSWa94Vw6woAHgv6AMKGPaMQhwQMJJRkfhHmEJhdvRCcgGSCEkCgpbnAECiorGYYfLCItlAAFCygQj5AfbYlwBQwVE5AukG6KBi8tMC0fLi0pHxyzcAAxFxwmMny/wEwOxMm/qlcdJCSJ1H5XQh3a28HY3kx+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+sum-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBIQChCH5BAEAAAAALAAAAAAQABAAAAIdhI+py60BowyPJriwQ3qb7oGNyJCZtZHixHpu4xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text_block-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py40Bo5SOzRvrwlgrfnkJOIkPaaaJXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text_bold-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIihI+py70BowPQ1HZpwNv212Vg9IGHmIjoWa4ey5DSRNd+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+text-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIlhI8Jwe2/AmpTynqPTXSqrnBM+I0kdmpmGmUp+K4nPMvhYx9+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+text_italic-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+0BgztwUmmjBXX3jE0auHHhM5Yq4xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text_under-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pu+FxXoOIKpds1oBH7hlYxYxRCaIZ01lhJbHy9tTv7BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+toggle_log-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBATCxMTCBPz+xPz+/ERCBASChISCBARCRAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEIQJqpXBBjFI1oGncYU4EUXxSWQZlum6DXDQpeo0tR6KqqgdLXiLBWepHgyYIxF/TKHv9XvtDDfb0So5YHuTgThYCXgH4Q6hqvEGEIm4PLGSyHX4OkZv8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+top-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBBRObAQSHBRSdISevBRWfAweLNzu/BSOrAQWLPz6/FzC3DzW5BxObHTS5ByyzAyixEze7BSStBRWdAyWvByixCQ2TBRGZJze7CS61BSavAxefMzq9ETW3CSWtAwmPPz+/CzG1ITC3FyuxBSCnAQeLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZjQIBwSCwSA8ik0kgUDJhGQsFwgA4FBUTCoLBiF4zGtmt0FBYPSEQyoZCvWQakUok0LISnkHBBYjIVGhscS0UGHRUeHyBWAAIhiYuNAggVIgmMVgYjJBolAZMKJgpIjaanRH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+transform-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTCBPz+/Pz+xFxaXAQChAAAACH5BAEAAAAALAAAAAAQABAAAANOCLrcEDAGt4K4F46wmcVCQIzE4F1DukksehVkiUlDYcdfCAyEGI+D2aP3G+UmPF/MAJpwnpuNgMmcKHKgabWSvRi+ums3a32wzmWKw58AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+undo-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxSHBxOHMTSzNzu3KzCtBRGHCSKFIzCjLzSxBQ2FAxGHDzCLCyeHBQ+FHSmfAwuFBxKLDSCNMzizISyjJzOnDSyLAw+FAQSDAQeDBxWJAwmDAQOBKzWrDymNAQaDAQODAwaDDyKTFSyXFTGTEy6TAQCBAQKDAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ1QIBwSCwaj0hiQCBICpcDQsFgGAaIguhhi0gohIsrQEDYMhiNrRfgeAQC5fMCAolIDhD2hFI5WC4YRBkaBxsOE2l/RxsHHA4dHmkfRyAbIQ4iIyQlB5NFGCAACiakpSZEJyinTgAcKSesACorgU4mJ6uxR35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+unlock-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJExGHEQ+FCQiDBwaDBweDGxiLHxyNHRuPIR+RIyGZJSSfFxaRGxmLJyaXNzWpNTOnMzGnMS+jJSKTGReLKyqjPTu1NzarLSufKyibJySXIyGVGxiNFxaXLSytPT29Ozu7OTi5NTS1KyurGxqVCQeDJSSjLS2tNTW1KSmpGRiLKSebOzuzJSOXExONExGLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaVQIBwOAwYA8SkMCAYOAnKYiFAIAQGyOgVCggYuEovVxztMpdnwAGRSCgUCwOjIeQ6HpCIZDKRUNYMRBUWF4UYGRoWGxyBRR0eHxgaICEiIyR0QyUmJygpKgUrAxMsLUQlKyieoKIuEAunK52fBS8DLiywQySpnjC1Mbi6QjIzNBeSIBY1EQfDQgosLAEUNjY3Co1DfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+up-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObAwSHBRSdISevBRWfAweLNzu/BSOrAQWLPz6/FzC3DzW5BxObHTS5ByyzAyixEze7BSStBRWdAyWvByixAQSHCQ2TAQCBBRGZJze7CS61BSavAxefMzq9ETW3CSWtAwmPPz+/CzG1ITC3FyuxBSCnAQeLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZfQIBwSCwaj8hhQJAkDggFQxMQIBwQhUSyqlgwsFpjg6BwPCARySSstC4eFAqEURlYhoMLBpPRUDYcHXt7RgUeFB8gIU0BIoiKjAcUIwiLSQUkJRsmGIwJJwmEU6OkfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+view_choose-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMzCLrcGlAs6UAYgwLdLtEcI4ygQo7VVp2oupGpG4vmaUVTemX523qlFcw0a4RqNlkx5k8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+view_detailed-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMmCLrc/i1IAVkYg1Z1iRYUKCqitp1oikqBWV3ZOnhkWNagqu+qnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+view_icon-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrcG1AwGOQbw6qANeCEB3pCSZpO6pgowJZqLKuUGE0dnuEhf8IL1kz1shSHDX8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewmag--16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ+QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7Kmpl0CtLGLvbW2Zn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewmag-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ8QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7GLArS5Q7O1tmZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewmag+-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6cAsLECrqeys7WxpqZdtK9Ct8C0fsHAZn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+view_multicolumn-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrc/ixI0WSgKoyBl+beQFACpo1AqXbKCr1wLAMWS08hGG3dSZqin4sxnBmPD38CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+view_text-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIchI+py40BTQSwuovp3DXkv1ia1IHmIXLiyWJ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+view_tree-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBDQyNPz+/PzerAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAMuCLHcri4yGISlj4kxcANgNRBQCIbL6U1Su7bB62rXvGydG25kqpwfIGxILBr9CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+window_fullscreen-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBNTW1MzOzMTGxLy6vKyurJyenHR2dOTm5Pz+/IQCBOTm1Pz+9Pz+7Pz+5OTmzOTmxOTm3Pz+3OTmvAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVuICCOZAkEaKquqzAQRWEYR32gSK7vO5oowKAQmPAtjkPFccEwLoaNhuPYDCSeT2B0+lhAfMHF1kF+PL5W7ZhrjqAk4gW53J0s3AG4nP6Y2BcUKAxLZn1+S4EBDAwQEIsUDBQRFJSJLJcoJpojfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+window_new-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIUAAFxaXGRmZFRWVGQmhFwmfFxeXOTm5MTCxLyWzLySzKyCvKSCvJxyrJRmrIxipIxWpNze3AQCBMTGxJRWtJRatIxOrIRCpHw+pHw6nHQ2lGwulOzu7Pz+/Pz+9Ozu5Pz+7NzexPz+5Pz+hPz+3NzevPz+BMTCBNzetMTCDPz+xNze1NzezPwCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACwALAAAAAAQABAAAAaVQEBAMCAUj0aCYFkwHBAJhWLBYDQcD8ghIjhIJhRKxXLBZDQaiYQLABDe8PiSu+HY7/dOh+PhQvB4eh8fIH6Adh2DHyGFAn+BiQAiISMkhnmSIQAlI5KXHIkfAiUmpCUnhoKLISgpIikmAlwqtCArkiUlIhwiuSKyEcHCESausMEsycrJEaaly9ARIizN1NPQ0dfJfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+window_nofullscreen-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBNTW1MzOzMTGxLy6vKyurJyenHR2dIQCBPz+/OTm5Pz+9OTm1Pz+7OTmzPz+5OTmxPz+3OTmvOTm3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVsICCOZAkEaKquqzAQRWEYR32gSK7vO5oowKAQmEAtfr9hgpFoGBWJpDDqcAaOUSHDEU08nkOG2AGBfK/aMYQMiRi7Ywe5674yE3I2JCqZoChLeGwSEgmFfgFNDQ8NjQ0TEROSRSyVKSaYI34hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+wizard-16:actions actions16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+xPz+BMTCBPz+/MTCxISChDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAREEMhJg6BYWhAGv5k2EKMXToSgEqc1DEIhvGAWpOvJFSXZyoXOxxY0BDahQDGg4xgOxmbgiWDqpoeqlGrVcZuSbLfpjwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+abbrowser-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBKSipMTCxISChPyqXPzerPz+xPz+/FxaXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARhEMgJQqC4Xms1tkIgDEMYXpMYEEJRCIT6Ea5R2DHFtQZBG6dNoHQrsAyH14DDWiENBsQhBtskEs4Dohe4oiqE5So2zElECEKCrCYgQmcRVnRKnFIdC0L4/az7GXiBg4N+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+access-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBGRufLzi7PT6/NTq9OTy9MTm7LTW5LTS5LTO5KzC1FyGrExSXHzG3Gy+3FSStPz+/ESGpFSmxEySvEyKrER6nERylExqjFSSrKze7EyCrDxulKzG3GSuzGSitEyWvER2nEx6pKzO5DxmhLze7DxqjExihERadLS6xERulEyOrLTC1KzK3ERWbERujFRefGR+nKTO3LS6zLS+zFRmbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAa1QEBgSCwWhYIBocA0CA6IhEKwYAQKDccDAolIJpSK5aKwFhyYDGSQoWgqm4uFYyV0PAeIIPIeayZlVw4OFV19FxoSGoFnH1tcayASIRciVgYfEWoQIxcLk4gHlxQCnJBcJBUSdAEHhQediSV5ExWBBxYQGSZelLkHJyhWsHmSISkHKpsrViwWJ1xPXCAtesIBCiUaGHm6LiYvLybXMAQCMQosBwcoMjIzMTQMAC0M9vf49wB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+acroread-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAASC/PwCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAIlhI+pELshmkOhzmTvyZrFDglRxVEiGUoUualtx7gOC36gDGt+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+agent-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipISChPz+BMTCBISCBERCBCH5BAEAAAAALAAAAAAQABAAAANLCLrcHkFBt4IY8EYKYCAT9xVBYRhbM5KFeaRVy56oSsgQ/TLrB567ym10ChiCnRIRaJx8lDdd86UkEWjHaURZwlKRHpM0xPOYGf4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+aktion-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAI5hG+hIuigAmMvLTlfnJiePQndt4SMFFioeaagaEbvySlQF6I2BLPRwYntDLlaylH8VXLDpaiJ8BcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+alevt-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/Pz+/AQCBAT+BPwCBAT+/Pz+BMTCxCH5BAEAAAAALAAAAAAQABAAAANFCLrc/i3ISadQYQhSehFecAGiYJ6oiJmaZrymSrKCJhinXLYmHo+l2skn0KGOPwyBUHPhOrqKVIWsmhqHyqhhPUG+Cn8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+applixware-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBKSipAAAACH5BAEAAAAALAAAAAAQABAAAAIyhI+pGbsBHYtHCGARbMhms1HVB0TieJhcl23liXkinAmhy7732UL9GnsZeixczChB+AsAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+ark-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/PwCBAQCBPyCBPzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANCCLoQwTBK6dy8WNQgptAbB33DQGzlx3xE65RpBwgtCw9sR7e1gO8EGYs3DMoUH5rPqFylSrzaygcjHqdQVUYL8ScAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+arts-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPz+/KSipPwCBISChAT+BARCBMTCxDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAMALAAAAAAQABAAAARTEIQ5xbgYAwJksFhhaFTVdeLpURYwAOL7cp6gpmcZHEQPGyIOLRAkiI4GTqmIDG5QwGihuRIBU8boasLzZbEd082QK7VkrvTwo2pvP5m4GxHP+CMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+background-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAAQCBJx6NJR2LIxyNJR6NKSORKyaTJyGRJyORKSWTJyKRKSWRKyOPKSKPHRKLEwiFDwSDEQeDGxGJLSeTKSSRKyaVLyaPLyaTGQqFFwyHGwyFEQWFDQKDDQKFEwmFMSiTMyiVJRuNLx+LOS2VOy2ZNSKTFQeFGRGJLyqXMymVOSiVOy6ZOymZKxyTEQODDQOFLymVKxuNMRyJOSeNMx2FLxiJLRiHFQaDDwOFDQODFw+HLSiVHxSLFQiFIQ+HKxmNJxOLJRSLIxGHDwODGw+HNSSPOSWNNRyFOyyVOSOPARihNSORKRSFLR6TPz+/MTCxKTi9JTW7GSy1Lx2THw+FNSOXJRWNISChASq3ASWxARynEQaFMx+JJRSJFRWVARafARSdHxeLFw6HPz+7Pz+5GxKJDwSFIRSNHxGNPz+3MSCPNSWTMyGNPz+9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAfXgACCg4SFggECAgMEBQYHBwgJCAoLggsMDA0ODxAREg0TCxQVghYWFxgZGhscHR4LE7GCHyAhIiMkJSatJyi+giApGCokKywtLhwvBzAwgiMxGDIzNDU2Nzg5OjsTghc8PT4/QEFC2EMeCZUARKpFRkdISUr09YIYET0qS0wqTUpOnkCJIkWQhxsbpsigUsWKkidXsGTRIkjHgy0YuMjoYkKJFy9KvoARFEZMBAg3UkIA6MTJGDKCBpQ5aebMGTQsx4xJU/FBBIxq1rAB4KTNS56Gkg7yEwgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+bell-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBEwuFLR6PLRqJHQ6DNyuhLx6LKxiHDwiDMSOXLx2NKxaHAQCBHxSLGw+FKRyLFRSHLR6NIRKFExGHNTStOzm1KyqfIRmNHx6PIyGRFxeJNzavOzq1MTGpKymfKyqhKSmdGxqNDw+FPTy7KyuhNzevISGTJSSXLy6jOzq3Ly+lJyabHRyNCQmDKSifAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ6QIBwGCgOj8iAYEAIIJ+BguGAeCYTigXDegw0DI4tl/gQj4WB8hkAgUQeEsaEC6FULBdMRjN/QjYcHR4fICEiVn8jFCAkHxiHfiUjHRYfHyZmR4kdICAeJ5lCECgVKSorJysrLC1IEBgVFSgunSAaoWwTIi28DL5HfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+blender-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBDwiDPSyNOyKLDweBFQuDFQyDPSeNEQmDIxSHFQ2DEQqDARWjARGdASO5AR6xAQiPOymNAQ2XARqtAQKHOSmNEQiDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVqICCOQBCQKBkIA5G+63C+RW3UrIsSQt8fA+CMREAQgIkaUEdSsBK6hZBUeJ4YjRLQIKoOBgVAw/GAAAqRk+EJBkgmDQrAUDGxTAMBAgCR89oFOgF5YQAWdy8EeTeILyV5jY5nBAGFkpJ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+clock-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPzerPyqXMRaBIQCBISChPz+/KSipMTCxPz+BMTCBPwCBPz+xPzCxMQCBISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVxICCOQGCeJjkGwkC8RFEEavkax2G8dB0QuRyhhzoBg8MSYsncJXKJZIDZHCoWP1ogGIwGrtnSgUFmHLyNRHhrdpjRamnO/SYkromHdnxwnwkKVxByZW8DgQsQM2JcfwZXO0MBCZSVBgMuLzJaRZ0pfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+colors-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBAQC/MQCxATCxATCBPyqXPwCBPzerAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMgZ6rwYBCFsvtXWeWA1DBU3ggRhomJQBm14dlJYFFXrbjKNwVDZ9Vw4TWWoKyCDgcNhyXQClVLpMmANIRAhLdGa+36j07GrfM4GiKTAGfsOlmYZfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+cookie-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBNzeDJR+BOzmVNSqPOSmBNSCBKRCJFwuBOSOjMRSTLRaXFQODMxiXOS6vIwiJGwKDHx6fKyqrMSOjNRWVLRaVFwCBJyanJSKhHRydPTy9PT29OyytIQSFPz+/JSSlOTGxIQyLMTGxNTW1Nze3Ozq7OTe3FxSTGxqZNza3Ozu7OTm5MzKzLy6vLS2tNTS1FRKPGxWRMSypJyOhKSOfPTu7LyupFQ6HMzOzEw+NJR2XKyOdFxGNHRSNJx6XGRCLHRCDMy+tGxONDwaBHRiVDwyLEQuHJRyVJyCZLSilIxiPIRePHxOJIRWJFwyFEwqDCwWBBQOBDweBKSCbHRKLHRKHIROHGQyBFwyDDQaBIxqTHxOLGQ2DDwiDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCgwABAoSIiAMEiY0ABQaHjoQHCJOECQoLDJeCDQ4PEJMRERITFBUWFxgZhKQaGhsKHB0WHrcfEQARGxu3HiAKIRgiIyQlJicoGym+KissLRIuIi8jJTAwJjEyGzIYKxszNDU2Nzg5MDY6OyQ8PT4jP0BBQkNERUZHOkhJSktMZDQBcsTJEyhRpOybcuSIEipVrFxBgEVKFigATkiRgkSLki1UgFzh8kRKFEQbN3aR0qULIT+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+date-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPzerPyqXMRaBIQCBISChPz+/KSipMTCxPz+BMTCBPwCBPz+xPzCxMQCBISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVxICCOQGCeJjkGwkC8RFEEavkax2G8dB0QuRyhhzoBg8MSYsncJXKJZIDZHCoWP1ogGIwGrtnSgUFmHLyNRHhrdpjRamnO/SYkromHdnxwnwkKVxByZW8DgQsQM2JcfwZXO0MBCZSVBgMuLzJaRZ0pfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+dlgedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTCxFxaXKSipPz+/AQChAAAACH5BAEAAAAALAAAAAAQABAAAANLCLHcrSLKOVccAuvMLf2Rlw0bYRKFGBGZWQioRc4kPKfB+qFFL9ODF+EmKxh6vZOreETCbLiMESkcxnIgATXK2XgFqmxI4SgvAP4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+emacs-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBDQyNKSipPz+/FxaXISChMTCxCH5BAEAAAAALAAAAAAQABAAAANJCBASoXCFoVi8VdL6HHQeB4YjSAxnYQygSLzoSTjbEs9vMF86cbyH34NX+AELQ4zO+Nopm6cBC1PBEQwG6gd3SGo7Xa1STIb4EwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+email-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBGRWVAQCBOTWvKSShDwyLOTazOTaxPTuzLSilOzi1OzezPzy7Pzu1NTKtKySfPzy5Ozm3Pzy3PTq1NTCrMS2rNzWvNzOvMy+rLSmlPz69LSejIx2bPz29ISChPz6/Oze1HR2dOTi5Pz+/EQyLJyanKSipOTm5MTCxHx+fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaGQIBwSAQEAoJi8RgYEApK49FgOCAS0CFTsVAwEA2CIysMJB6QCEQyoVQsZOMFk3loJoeNAk4MGBQOFAQcDw8IfFoLDB0cEBMICIRxAV6NEB4aHwICk4wLIBYhIiObSxwLBSQkJaOlfQUFpCYnIyMoSVGbtQK3UQCbKCYprkq8m8S+uL4AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+energy-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBBQSFASiBHS2/JzK/KzW/JzO/ASWBATCBASKBHy+/Hy6/ByuHASCBAR+BATOBARyBIzC/MS+BASeBASOBARaBFym/Pz6BASuBEyW5AR2BJS+7Gyq7PT2BARKBDyC1FSS3IR+BJyaBLy2BPz+BCxuxAQ+BDw+BOzmBARiBCxyxBxetPTyBAQCPAxOpAQ6BAQ6jAQ2fAQ2hLy6BAQubAQydAQmXAQmVAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQIBwSCwaj0hAYBkQBJDLAaFgOBCWxcAAkVAsGIyG4/EUBh4ICCIicUAgkwTZjKBULISL3oHJzAMaDhscHYEODhMeExEfSyAhGxsgICIYHiMWJCUYSyYYJw8kIigoKSomKxgmSywYfC0YGCJ8rSwuS7EYJBYYLi+xE5tkARMoMCoYEzEiJDIzMjQiSzExMxGkNTY2NTc4NTNPTOLjWElHfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+enhanced_browsing-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBOTWzIyCrFRSTMy+tCQmVOzi3ExKhAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARFEMhJq6UhyHy3GNmnAeNEFAZwpuRRBiIMkkOBjKuKTsHtgbISybTLYX6hGc+lSxk3tVtMVOkFck9MMNjB7jqkEQdMlvgjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+filetypes-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+/ISChKSipPz+/PyqXMTCxFxaXPzerPz+xAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARfEEgZqg0zV8EHF5XWEUMxkBwGBB9REIZLfBgrkEaen+l6F4cYgpA4vEC+ASIYSxQRnlrncEgoFFQP0laCHpSmnk+AEJQ8ZeRkw0mDVJT3JZQZw+trC77Ouu8pfn8AfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+fonts-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPz+/KSipMTCxPwCBFxaXMQCBCH5BAEAAAAALAAAAAAQABAAAANBCLoQ/C+I4GAMY1ZGN80UJ2jA0BFbUxhjF6BWsQroawEyWhN37vKxQo0ChPhOPaGDIhhADr5FinE4TG5PrBbiTwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+gimp-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChPz+/FxaXMTCxAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM6CLrc/izAJVWoD4MgtL2R0F2k6HFiOgjDSRBq0FLUKxYDTmKBnf6gGqz3egWFhEvSQ9kxJ9CotOFPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+go-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBERGRFRSVDw6PDQ2NDw+PPz+/ERCROTi5Pz6/AQCBKyurERGPOzq7ISGhNTS1DQyNLSytExKTLy+vKx+RGRiZPTipEQ6LOzu7PT29JSOjOzWlEw+LIyKjIx+dLy6vOy6ZEwuFHQ+DCwqLGQ6HNSWPMymfIxmPMyqjKSipCwuLMzKzHx+fBweHOTm5GxubJSSlAQGBHR2dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAadQIBwGAgIiMXhgAAoGAwH4QCRKAgVCwSB8AwwCo2n9ZpwMMSFhyEBGQoLEa5BMnkO3G/Kef2sMIdfCxYXT2oGGAIHCk0ZCBobHE8dHk8MFR+LgSAhXSIRdmNCBxScBiObCAYZI25wJE8SJSYECVVDCg8dERchJygPKSqsQgQNKwQFCw8fLC0KLi+LxH9YMDFX0ngAzzLZ2m4K3kN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+gv-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAIxhI+pwaHZ2jNMWMFmvXk1GznHF4DhWF4cJlKpynpwB73ms3Etiq00EAr+hJGJ0eAvAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+gvim-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAT+BPz+/ASCBMTCxISChAQChCH5BAEAAAAALAAAAAAQABAAAANUCBDMEqupNWoNJNgBV/mfwYCFqASgmA1h57VaO71lXLtPytZEBggZ0E7Vy2BQJEaRcDghP6iGb/IsNKBWKghZzb5EUau4g1KFz1QId+ydRRZwiD8BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+help_index-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBPwCBAQC/IQCBATCxMT+/Pz+/ISChAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEIRJJZ1ACjF3GGAYaKNFDNfXldLJqmQWcKhcW6tkl1NhFJhdRmIwHIq8m8R3LAIlykCxiZQNl8XsU3eVZg0Y2LD3CyAQlassbEaz1N32Gz5m+SMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+hwinfo-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBBQ+XBRCZAw+XAw6XBRCXCRObCxihCxqjCRijBRSfAwyVCxehDx6nER+pPz+/BxKZAwmPFyWtGyevCRSbBxWfAxGbHSqxGSatCxulBxahBRKbAQiNEyKrBRKdAw6ZAwiNESSLCyCDBxWBDRulBwyRHS6ZDSWHCyKFDQyNCxqlAQmRAwiPMzalPyCBMQCBCx+DAwuRBQqPITCdFxaXCyOFAQeNAwmRAxKdPz6/GyyVMTCxKSirAQCBGzKZAwqTAweNFyuRDyeJFzCTITOdAQiPAQaNHzCbES6NEy6PESyNDyqLDymJPz+xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfBgACCAAECAwSDiYMFBgcICQoLC4qCBQwNDg8PEJERlAYNEhOaFBUWnokBBw4SFxgOGRobCxyJBQkNHZoPpR4fICEiIiMBCSSYmgoKFgslJicoKQQKCSoZmgW+KywtLi8pMDEbFRqaAcwyMyc0NSkiNjc4ObsrKyU6Ozw97j4lNhGSfsgAEkQIDxr7YAwh0qKIDSM2jgRpgbDHPhFIMiZRsoTJkhMgobUDMKKkySYjUKockYJSypcrWypKQbOmTT+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+icons-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPz+/ISChIQChFxaXKSipPzCxPzC/MQCBISCBPyqXMT+/MTCxPwCBMQCxMT+xPz+xMTCBPzerPz+BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAV+IBCMZBkAqCgMa8uyJxoMRFHUtz3Eqk0MBhxBwJsRaqTcLhUQ3AyHAMI0EtEI0pGrpU38SANFQazYGY+LqUChYDQUxCbB8YjOFJAIpGEePOpZAhITIxJxAg8JDwQPMxISERESfXSVTRIQAZKHLyuOFI8US1RNnTApqCJUAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+iconthemes-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPz+xISCBPz+/ISChPz+BIQChFxaXMRaBPyqXIQCBPzC/MT+/MTCxMQCxPzCxMT+xMTCBPzerMQCBPwCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAWLIBCMwhgMJqCKRBEIpWAMBRGsQXG8sIAiLpwNZpAFEAcbjlc0OI9BVcAWSDgHT9MtF1AsZrmamNpNBAyjwgCxpo0U5h1jOhg0HAMbPHB4QNIDEQIRDi5xfgFzBBITIxJUBQ8UD305EhIwEi45FQ+dFVMSES+PIy2nLgUSBpcGQVomqKc3K7WwIwB+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+input_devices_settings-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MTCxHx+fISChKSipKSirATCxAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARQEMgQpL03iEEx1gOxdR5YbCJXZUbqjusUhGitZkFri0VFUodXoTfjWCi6oY8Skxl6k4FhxZRRRxMC1TBdWn0CAbcZQFAH4WnGjDPiPICYPwIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kab-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChFxaXKSipDQyNAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANICLocHiyqIMQYUE5Ses8S1V0FGInFIJTalKpsS5FxKDxB/EzV4GUBQsXR87BQnRtNtxphfJ9FAAqbRqUXVfPaMH5MDRx44U8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kappfinder-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExOTDw+PExKTPz+/ISChAQCBPz6/FRSVIyKjJSSlIyOjGRmZNTS1Ozq7Ozu7AxyzPTy9ERCRBQWFIyqxPT29AQ2vOTi5IzG7DR2zNze3Nza3BQSFISy5CRyvBQenISmvBQitMzOzAQGBAw6rDR61Hx6fMzKzAz+/IzW7ASyvCwuLMTGxMTCxBwWFDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQAAgEBAYj0ahckAoEJ5QgkE5fBYO0SeCOigkFE2DeEFgUAUNBwGBeBAcCMHirF4gnhBCBCE5PydqBBQVFhdTSgJPBk8YGRQaG4dCiQQcDh0eHyAhIiN+BHYXJCUNIggmfhUOAQgbJ6YCKGcVKSUaChwGHCYqCyuIDhkhGyIsLcccCL6TFxsNJ8fRLS7KvyNi2GIrAQwK1AsvVOJULi4AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+karm-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBPz+/ISChMTC/MTCxPzCxMQCBPwCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEIRJa5Ui66H3FETHdcTwdcIofkVbUIJbmAEoZl95aoXxUrNdpnAIDFomgRA3yxxhIdxAlaKhAgUNYshyYVGxnMZInS6VzVSQPG0bkWaJZT4B+CMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kcalc-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBATCxARCRASChAT+BMTCxFxaXEQCBPzCxPwCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARPEIBAq5U4iM17wJMwjORIfJkYFCs7nKA2rJQLp0Su66ikGcAg8OYTGA6BA/KAIIYsFudPGJQal8uAFVqxUg2JxBYbUGh7k5J6BppwKyB/BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kcharselect-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChPz+/MTCxAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANBCLrR+zCIGWCcI1cLpNCa5YHZsCmj2QTlxrZmmRFVSs4E7X13TqMTXsl36gSHuSIQQ+QYP0kncPCTokzWh3LhTwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kchart-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBPz+/ATCBAS6BPyqXPzerPz6/Pz+BPwC/MQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARcEMgJQqB4WiFulhvXfaEwiJ4mEgExFCMVcENgBEXepdVhG7dcABGr/IJCQ8ICAt4IUIuSKAW2XMOD0qC42AIHV4277YIqKHKCy5txbIoyDy2Nr80yjyVwn5OYfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kcmdevices-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPyCBPyqXPzerPz+xPz+/AAAACH5BAEAAAAALAAAAAAQABAAAANMCLrcHjA6BcW4Q8AWLL7EFSwdOIRoOAKBiZ5EPJYvBMeDba5BQfg52ik4KPgKOVYqZiwYjLzb7/c0JCnSo3VFasFEXE5kMymbzwp/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kcmdf-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+xAT+BASCBATCBMT+/AT+/ASChATCxPz+xPz+BISCBMTCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgZwrwYBCFqvhs3DNYXjChRlWBRjIRqGN4UuEUczMZxsDeXykdEsDQVVSLhQxhBCkVlmXA+KVHFYhFYOoHbMGN6pTQaW8YYiQmcG+q16a0+Zipw+4e9B/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kcmdrkonqi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPzerPz+/PyqXMTCxPz+xAAAACH5BAEAAAAALAAAAAAQABAAAANKCAoRy+6pIESkVuLaKl8b53lOaA3EyIXBUBjpWHKDYNhxNrWv/aaRiWBwKwoIDZCH2EN+TMQjyzR0yhgqiyo4vT4wl48E8g0C/AkAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kcmkicker-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBFxaXPz+/ISChMTCxPzerPyqXDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgQqr11AjG6/4FGDEVZBOapWSXbToFhoKkZUjJGEEJvyUDDYQaKATElBOJklB0OgY5SWgnmpFJm4PkMjDxLFYXFGSCyN8mocDaD0xsSO6wUS6K1FBzDD/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kcmkwm-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCRiXCRaVPz+/CRmZFRWVISGhMTCxESSjPT29DR6dDyOhDyCfPTy9CxqZOzu7Ozq7ERubOTm5ARehAxefPz6/ByaxBSOvBSGrAxynAxqlBR6nBRylAxmhARWdFxaXCH5BAEAAAAALAAAAAAQABAAAAWHICCKQTCeqCgMhJCihXEYSPuKRWIoC6PYsEZikHA4FA4CEJdoJh4QgXRwiOAeQudDIpEZIpPwhCImhyGGAmBSOVgumExG055w1ZPZhpPpUDwzExBqAAUDhxUVTQ0QEgWOOIcDiU1QjoSFFYiKDZYFmAWJlE9bkCM5iouWpiIfBa6frrKYAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kcmmemory-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChAQCBMTCxCH5BAEAAAAALAAAAAAQABAAAAI6hA+Bu+HCmgiiRuNoHZBRXQlc84TmcHzm2WVryE1YvMaZIdbVd2zw7lj4bDKGbxK8hHgX3K2JUDD8BQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kcmmidi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBFxaXKSipMTCxPz+/AAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLEL/pDJAONs1V2W1ebWJ46kKJxomi5D2QZEwRSyVMNyngf7Eg8FYHAIZMRoyCSNMSA0n85oszTxJwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kcmpartitions-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+xAT+BASCBATCBMT+/AT+/ASChATCxPz+xPz+BISCBMTCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgZwrwYBCFqvhs3DNYXjChRlWBRjIRqGN4UuEUczMZxsDeXykdEsDQVVSLhQxhBCkVlmXA+KVHFYhFYOoHbMGN6pTQaW8YYiQmcG+q16a0+Zipw+4e9B/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kcmpci-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAADQyNATCBASCBKSipFxaXAQCBMTC/ISChAQC/IQCBPyCBPz+xPwCBMTCxPz+/AAAACH5BAEAAAwALAAAAAAQABAAAARVEMhJqww4a33F+EL4jUI3EEXoEWzaFbAKzyUQeLihDqrpHQhBQkHyqY49iWCxbDKfJQbASYUCpJbslcHter+NQ3gsLo8bBYd6zWYf0u24GjWr22f+CAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kcmprocessor-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipMTCxISChFxaXDQyNAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLrc/jDGQCWgIleH88jCdgXgB4JVQJxsVgQXIQvrWdwwJc/0jcOG0Y7gqwQVQR3R+EgyJcGjZUoF+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kcmscsi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/MTCxKSipISChAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANCCLoQwZAFIV6UYgxi79Qa52WDE3bKV6YOpFpO3L5pJcckLBB8/wQEDezWAQpZqIWxFNAUkqkg6HmJOqGuArUqwfoTACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kcmsound-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQC/AQCxFxaXAQChAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLrcDiE+F4SQU4UBLH6VoHjT1okQR6mnuTYuJMWaGlkXW2u4QOipRYDws82AjJsHKez9MgrigAkF+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kcmsystem-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBGxqFAQCBPz+/PTqtOTOfMSyPNze3Ozi5KyeLMTCxMzGzKSipOTe5MTGxAAAACH5BAEAAAAALAAAAAAQABAAAARfEMhJQah4ihFunsFAEIVXCVJACIJhoBK6CerawsA8HAhbuAnYZrBDKBYMWpCy4S2QSRazyBIwrrjcoNFQzK4KR1bQcHhZjGM2BgWLMYJ2enForHPJtNj+kfHvcB8AfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kcmx-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIAAAASC/PwCBCH5BAEAAAAALAAAAAAQABAAAAIlhI+pm+HB4HkS1flszOCq7C2Qw0wdJ2Lk16BGeK5dSZX2jS9+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kcontrol-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/CRyBBxSBExOTNzipOTijOz67NT21LzutJTmlGzaXPz+/OTi5AQCBLy+JKSiJES2NES2LESyLDQyNLy+vLzWhLzWjLS2tGRiZDymJASChIQCBDyuLLzShDyiJMQ2LATCxMQKDDSaHDSWFCQ6tMT+/PzCxLzuvCyKDDSSFKyqrMTCxGzabDw+PISChASSBAT+BDzOPNTW3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAacQEBgSAwIBsikkFAwHBAJhWBBpTIaAccDAolEJIKJWEzBMiuWCyYjaLjd5exDIsE02A1NY9OIMzkcHRkebW99WFoVahkfbSANIYdCBh52IiOFb2VCByIWIh0kbSUNJpIBJ6CgKJlwDUIJKSooswIUt7crrwEsKC2+rC7CLzAuuzEoycmtbgAAAtDR0DLGztYALbm426/Wht9vzn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kcron-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAADxePARCBAQuBNTS1OTi3LSytAQeBMTC/Pz+/AQCBOTi5MTCtISCZAQiBISCfKSipFRWZGRiZERCRHRyZMTOxDxOPMTCxIyCjCQiJAQOBLS2tAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAWFIBCMpCCQpDgQLFusLVEYAXEgOJIQOXIkNF5v19MFWQrCgsFYxIC1InEYvOWmuF9QKrw2aoSkYtksOBwEaBeXeEAiiIdD8rUNJw8EBUGobIcQFggXLglgCohLGA95CQMOGVFDEQ4YGhERdAEWCZ2dDwsSEHMOEA0ABqmqGRkGDQ2pDRV+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kdevelop-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBGSKXEx6RFR+RFSORISidJzCjJS+hISydHSqZDxuNIyuhKzOpLTSrKTGlHyybGyqVDx2LHyedKzKpLzWtMzexLzavIS2fFyWTDyCLCxiHNTmzPT29PT69NTm1GSWVESKNCRmFOz27Pz69PT27MTKxJymnIS6dESGNDR6HFyCTIy2fNzm1Ozy5JyenISKhISOhMTKvESGLBxaFOzy7JSWlIySjCx2FBxGDIyOjOTu5BQ+DFSGRDR+JCx6FBxODDx2NGyaXCRyFCx2HCRqFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAexgACCg4SFhgABAgMEh4MFBQYHCAkCCocLDA0MDgcPEAQRhRITFBUWDAcXEBgZGoQIFBscHRweBgkfICGDAQcUIiMdJCUmJxgoKbsAKissLSQuLzAxFgQyKTOCKgk0NS/fNiQtBBk3OIIEEC0cMDkvJiQ6ICk3O4M8FCQcNjAcJBM9fPwgBCQICxI0XtBgQeCGEHuEFGCYwILFBAJCHh7SEGJIRiI/IDaagSNko5OF/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kdisknav-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBERCBBQWFPz+xPz+BISCBERCRPz+/OTm5HRydAQ+XHR2dKSmpNTS1Hy+1AxypNTu9ITC3ARypExOTFSyzHS61JTK3MTi7CwqLBR+rASGtDyixFyuzDw+PAxWhAxmnBRypISitCRujAxelAxmlFSixMzKzCRqlMzOzMTGxMS+vGxubLy+vLy6vKyurCwuLGRiZLSytFxaXJyenGxqbDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAafQIAQEBAYh0jkQEAoFAxJ5EGAaAoSh8BBEUBSrQtGw5EodwHfgsBgeEAWijGW2XTaDRHJJExBrwl1AhUWFxgRDwdCGWkCGhsbHB0WGB5CjB8fICGOGxaJaWwGIiMfJCUTJh50dk4ODiejHyiff2oGDikqK7osiUIGai0pJyouxi+9v2pEMDEyLTIyDckCy0gBMDM0DTU2flFDARk3AH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kdmconfig-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MTCxISChMT+/ATCxASChFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMg5gw00yyDGIAR1YUDggeFWFIZhnSBZrsZxdIOFEGTA2oeBAHeyuGwvzxBlYdUOLROMFzDQntJPrNoqAKUBaqnV+k57ZORruykHDj2LqIzUVKp1u0iuB/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kdvi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/MTCxCH5BAEAAAAALAAAAAAQABAAAAJCRI4ZwCYPo1gsiIHHxY86KXmWdiGkCA1Wp6Htc07NOsEv2oVyldLHbuBgEhORJhOxGEkkiLJybCZ3iqrD08hmF/4CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+keditbookmarks-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBASCBPz+xPyqXERCBARCBISChMTCxPz+/FxaXAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARXEMgpQ6B4WnGzDgJHWWMYdkAwEF1QFKe2oqDZztr7GpfKjrvAAeFDpQq8ISIRYBotSoTUkiC2ostqYps49BSKIVfaBbcC4MMWcTAbU+iw21NBk+gjuj8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+key_bindings-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChPz+/MTCxAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANMCAoRy2IEuYIQDsrBld0NN4XaJF5iCppWxBGtCscEAbkDfH2wh+ogiudD5AhvoZWoJEFtckBTE1dzKKfQjMtUjfQUzizjeBN7HgB/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+keyboard-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChPz+/MTCxAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANBCLrR+zCIGWCcI1cLpNCa5YHZsCmj2QTlxrZmmRFVSs4E7X13TqMTXsl36gSHuSIQQ+QYP0kncPCTokzWh3LhTwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+keyboard_layout-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBPwCBMT+/AQC/Pz+/PzCxKSipISChAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARSEEgZqr1hUjFIEQXBZVogDt/XYWxgoEVFzEUt3MGNm7SND4aarPfBFQYCQmtpiTErh+ahMK1SqVHoYcvtUptX67SWDXTPXWltva5q0WfEs+WPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+keystone-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTCxISChPz+/MT+/AAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM/CBDcHkoFQasVUIrBe8fRNDwMAWpjUThmtmxk0IYwOaPx/V6XG3hAjmsRa0Qkg6NSOVo6F0nG88g4TUNDpT8BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kfax-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBPz+/MTCxISChERCBFxaXPwCBAT+BARCRAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARVEMhJQ6C4imEzDkLIXR4ADqFAThYRoFu4ti6YbhfdFm+aEzWgAWhB5QyGAMEwWA4PlpyFCWwOkAhCgla1EqxXKbD7vSJnyuUXyV5JuOxtqZV0z+3+CAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kfind-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExOTDw+PExKTPz+/ISChAQCBPz6/FRSVIyKjJSSlIyOjGRmZNTS1Ozq7Ozu7AxyzPTy9ERCRBQWFIyqxPT29AQ2vOTi5IzG7DR2zNze3Nza3BQSFISy5CRyvBQenISmvBQitMzOzAQGBAw6rDR61Hx6fMzKzAz+/IzW7ASyvCwuLMTGxMTCxBwWFDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQAAgEBAYj0ahckAoEJ5QgkE5fBYO0SeCOigkFE2DeEFgUAUNBwGBeBAcCMHirF4gnhBCBCE5PydqBBQVFhdTSgJPBk8YGRQaG4dCiQQcDh0eHyAhIiN+BHYXJCUNIggmfhUOAQgbJ6YCKGcVKSUaChwGHCYqCyuIDhkhGyIsLcccCL6TFxsNJ8fRLS7KvyNi2GIrAQwK1AsvVOJULi4AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kfloppy-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBISChKSipFxaXPyCBAQChMQCBPz+/AQC/MTCxATCxAQCxAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMgZgggz5zAIBp9GFV8oSqRkikFanapBVgccGAiJBDWL74jd4UUxGBI/IcJQMigSimPSsMDcEFCFVkptKhCDgSBB7m4sA2y5eqqMF2YYKMBgys8nfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kfm-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBGRiZERGRPz+/MTCxAQCBMTGxPzerLy+vLy6vPyqXLS2tLSytKyurKyqrKSmpKSipJyenISChJyanJSWlJSSlIyOjIyKjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAV+IBCMZCAIQKoGw0C8MFEUqmgYrTwXL50GhtegcCgedr4AIpEYHhQKopEWSCwYw1fUeBQxGo3hiBCIUR2OxyAwG8OoD0hkICFABMiZKBKZ0GNkPiIUFBUuEoiIMisVFRZ/MWwqAheVfxICdZIpmZZ1kYIAMxcuJWWhKXl5Kn4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kfm_home-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBDw6PBQWFCQiJAQCBFxeXMTCxJyanDwyLDQqLFRSVLSytJSSlISChCQmJERGRFRWVGxubKSmpJyenGRmZLy+vOzq7OTi5Ly6vGRiZPTy9Pz6/OTm5ExOTPT29BwaHNza3NS6tJRqRGQqBNy6pIyKjDwGBPTe1JSWlDQyNOTGrNRiBGwmBIRaLNymdLxWBHxGFNySXCwqLKyqrNR6LKxGBNTS1NTW1Jw+BEweDDQ2NAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaoQIBwCAgIiEjAgAAoGA6I5DBBUBgWjIZDqnwYGgVIoTGQQgyRiGRCgZCR1nTFcsFkHm9hBp2paDYbHAsZHW9eERkYGh4eGx4ag3gfSgMTIBshIiMkGyAlCCZTEpciJyQjGxcoKUQBEhcbIiorLB4XEltDrhcaLS4vtbcJra8bMDHAGrcyrTMXHjA0NSypEsO6EzY3IzU4OdoTzK0BCAkDMgkIOjJlAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kfract-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBAQCxAAAACH5BAEAAAAALAAAAAAQABAAAAInhI+pyxudwoNACiFbuBzHt3XeEYbiBF5mN5HpyayqVrY0hdj4vvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kghostview-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/MTCxCH5BAEAAAAALAAAAAAQABAAAAJCRI4ZwCYPo1gsiIHHxY86KXmWdiGkCA1Wp6Htc07NOsEv2oVyldLHbuBgEhORJhOxGEkkiLJybCZ3iqrD08hmF/4CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+khelpcenter-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/FRWVExOTKwCBJQCBIwaHFRSVPz6/LxSVOSqrNyanIQKDHwKDHwCBPz+/OTm5Ozu7JwCBMRKTMxubLxCRNTW1IyOjDQyNEwCBGQCBJyanMRaXNyOjKQODIRydKQqLOzCxEQCBNze3Ly6vJQKDDQ2NIQCBCwCBGwCBFwCBDw6PNyipDwCBKSipEQ6PDw+PJR2dMRiZHwSFPz29BQSFIwODJwuLMTGxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAabQIBwSCwaAQHBgFA4Cg2BwwGRUCwYxobD8YBEBpLJoEGMUA4VywWTaUQOmstww+l45MKM5/DAf0AIDSFFBiIHI3IEHCSDRgEOFSUAJhQNJ0coYikAKpB4RQwrJiycWy0uRQ2AKKQAL3wwKEMCMDEdGEMvWxIKDTICIzMQKZdDKQ0dMSAxBzMPGjRGGCkoNTYaNzTRThgnJ9pFfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+khexedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTC/Pz+/MTCxFxaXPz+xPyCBKSipAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARZEEgZ6rw4CB3wrJUggt03nANIoCUQoDDcvqJAaHXqunBxywFDZWArDHy4lOEwTBEKgYJRyeQJEIEnYrQsvU63abBKIYq2m+4s5mTeTLVRSFdmyy6kvGXijwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kicker-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/FxaXMTCxDQyNAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANECLrcEDDKGYQV4+qbie9eGIJEVxTe+QmjUFgnXLLr615oF8x2v0I8DWpF2GV6slkLKSMdYT4nS0WgSkXYAWUbcXgX/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kiconedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwC/AQCBMRaBPyqXPzerPyCBPzCxPwCBPz+xMTCBPz+BISCBMT+xATCBAT+BASCBMTC/AQCxAQC/AQChAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVkICCOpBicZQoEwjAE6hgQQwvH81AU8OnfuR3QYDgcgAKhjGj8+UgzQkHHw+2mQlQpgEAkFInEYnGDhr/h8VPGYDQcjcZj/iiv4u84vQ6FQCISERETgxN2AX6AgoQThlBOkCR+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+killustrator-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAT+/Pz+/KSipPzerPyqXAAAACH5BAEAAAAALAAAAAAQABAAAANHCLrcGzBK+YK4OAcAx4AXIURj4J2fJYhWh35pOHKoG8+mFxS5HimmXU8HBH4MQyJD+FI+kM3Ug9eENALQk9VhDW4c1y/YnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCxCH5BAEAAAAALAAAAAAQABAAAAIghI+pFrHbXmpRMmoBxXB75IWcKIKk022ZunJtdlSw5BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kjots-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPzerISChPz+/MTCxMTC/AAAACH5BAEAAAAALAAAAAAQABAAAAM8CAHc7kGsR1mc9d1Md/icIgXDB1YXMZQnZBJEIbdKABPGTbSfnuc8mw8W1OlotYER2fgod5iMKRqiNvwJACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+klaptopdaemon-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/KSipAT+BISChFxaXPz+BMRaBPyCBMTCBDQyNAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARtEIBAq5w1TBGEGIM2ESTlVUNhaAFJUAcXgAXCZkFyJEoiIArWYQjj+Xi2yfBA0SU6CuAts4MCk4EdcxbznFhOCsjrWUxRhbRBBk48Z6kCZ2GeuN9xucF8FqcEBnt1OW4saSp7IoRPEjgiGBV+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+klipper-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFQyDEwuFEQuDISGhFRSVEQqFEQuFPz+/PTy7Nze3PT29Ozu7DQyNJx6VIxuRIRiLEwuDIxSFHxSHKSipLSytGRiZGRCHDwmFOzm3HxOHIRWHOTazHRCFHxOFEwyFNTKvHROHFxeXJRqLIxWFFw6DFQ2DNTCrIRaJJxuPMSynHRKHIxqRMSqjGRGHMSifJxeFKyGXHxKFLyaXKyObGxGFEwyDKyOXIxeHKSOdFQ6FIx2THRKFFw+FKx6NKRmFKxuFLyCPLyOTLyabLSefLyijFw6FJRmJIxWHHRGFFQ2FAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfFgAAAAQIDBAWIiAMGA4IABwgJCgUICwwKDQ4PEBGCEQsSEwUUFQQWDRepGJ4ZEggIDbENrxobAZ4cHa+7uxAeH4IGICEIIsbGFggjJCWCJicovLwpIcAAGCorCBbc3AoILB2rgy2u0q8OLrcAJS8wr8nJrzEy6yUz79sivDQ1jQA2buB4tU8eghw6xgnYwePcqxcdbAjq4eMHECA+ggiZMYRIESPjShyBgQPJBB48OsiokaTDOoACItgwYULJhw8BbIzzEwgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kljettool-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MTCxKSipISChFxaXATCBDQyNATCxASChAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMg5Q6CYBiFsxhvXXZklimRlDWenBQNRzKJRXCsxHPFcIDGcILYbGHqzAY41NCQSiuNgMLPAmNTElFoFWKecqe8mCRAIq6nt5imb0TC2wZByny3zdslMr3+8fgB+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+klpq-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxFxaXISChPz+/ISCBPz+BKSipAT+BAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJqwUh3xqEz8EWDKT3aVNAFAVBDqYQYitbjARhGDJt34Nc4SBAZAomoDAhKAwyTZZp5XE+O0lp9QVFeLNWUpflJXheTww2ijiLKSBPW/C+xOmzjQRU8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kmail-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPyqXPz+/PzerMTCxFxaXIQCBPyCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMgJgrWU4iAGIUFWFYMldF+okUPJeeAUDEY7FFzXqnNdkIGDgHAKzWgsDuJAFBhbtd1peTAWDFjpaZg6skonYfOZzC3HlduuMj1UZUDZ6RMblTTDokylQYsyFwB+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kmenuedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxAT+/ATCxASChPyqXPz+xMRaBISChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARLEMhAq5UY2B3yFGDIYcFgnuNErGwQCl1VzHSJBsbBUSxBIbnEC0YrxICHhFKZCiATlldn8gSlNE7YEurRQHdd19Aa3m6nmV0F448AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kmid-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBKSipISChMTCxPz+BAT+BFxaXPwCBATCxARCRAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARUEMgJgqVYWsFv3lwoeFMwEIQYkkFhouoQlIFhHvCgz9oxjoeDblc6+Q4B4ZBXCSBQx+GIZhNAOURaACsYypq0kNeSSLC2uxm5fGZqAgqFO0OjT/wRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kmidi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/Lz+/CH5BAEAAAAALAAAAAAQABAAAAIzhI+By7oBo5RH2GvDRRhre0xiVHXZVpqfEI5iKkQxalzQIIPGhI+pSAN4cjqA68VIHvwFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kmix-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXAT+/DQyNATCxMTCxPz+/AQCBKSipASChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMgJQqCXziDG2JoUEENhZBkmHIWJVptAmqcIW/Js1MiF56TBzkckAAcHoa9nMRKeA4TyJk0knsHhTeK5khBaH2VwLYVh40TJhQ6RzeIQV32Quz8hfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+knewsticker-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBMTCBPz+xPzCxISCBKSipISChCH5BAEAAAEALAAAAAAQABAAAANTCBCsysEpseQDI08KSPdYNmwUYSraUDRC64iAMbIuLGtOS423BhKFmgj2C+5EhsOoWEsOnB0FsKl0jnLUp3IG0O2sMNpRVHBAJpjyA8KOmNsMfwIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+knode-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAABwaDAQCBPwCBDw6NERCFJSWJAwGBLy+rPz+7IyOJJyeLBQWDIRqZIxydPzCxDQuHPTWzOSypBweDKyqLJyWJKySjPTOxKSCfOyCfOyKhJSSJJSSLFRWTDw+NOSqnOR+dOyWjOzGvNza1ERGFJSWLLy+ZPTGvOTOxOSSjOy6rLSypJSWjKSinAwODHR2HISCJOTWtPTe1Pz+9Ozu5IyKfNzazPy6tExCHMzKfPTy7KyupKSmnEQ2HHx+HKSiLKSiJPz65OzuzOTmrKSmLIyKJLS2TPTyxOzuvNTSlLy6fHx6RLy+RJyaNLS2NNTSnLy6lLy6dMzKpGxqXCQiDKyuNMS+PLy6VMTGPMzKrOzq1CwmDLy+PMzGTNTWxMzOxERCPKSiNCQmJERCRERCHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAIALAAAAAAQABAAAAffgAABAoQBhoOEAgOGBAUEAocBBoOLBwgBBAkKBAsMAQ0ODwOWEBEBEhMUFAQVFhejCBYYGRCGGhsKFBwdlh4fICEIIoMjBRQkJSYnKCkWCCorLIMtLgUvCjAxMjIzNCw1KoY2NxovFDjbMjk6OjuHNjw9Pj8lMggIQEFCATaDBD4JhhApgsDIESFIkigxJGDEkiJFmDQB4uQJFBxPokgRMIVKkypFrFxBgCVjlnuXtARQUGTLFS4yunipgRLBF0I3moChgsQeAg5hxDBMNCUAlyAcOCBKxJTQmKVNBfgJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+knotes-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBISChMTCxPz+xPwCBPz+/ISCBPz+BMTCBIQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARIEMhJZQg1z6vzxR0VCKE4gCE2lhcRnF1LuAInBjNRfDMn64WCQRCcHS6IRE6nyB0Sx0ACkcwloFiflKp8Pm2bbRblkYJZHX8EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+knotify-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/Pz+BPyqXMRaBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMyCLoQznAFIUKE09krZ+VS9XBaMBBbZKIBUaSYa40kTIPNhyvazje+G2gFI8l8jaLCnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+konqueror-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxONCROfCRKfKx6LNy+bNTOpGSS1DRupAwyXBRSnPTSjPTqvOzqzMzSvHSSlKy6ZDxutAxCpBQ2XBxepLTKvPzqzPzy5OTShLS2dLSqRFR2jBRerBQ+jOTixOzetNS2XHx6XDR2tCRexBwyTDyKzOTavPzq1OzKdCx23BRKtCQ6VCQmHFSa7IyirOzSnGSGpIR+bFSO1DyK7DR+5CRixBw2VDQuHFye7IS27NzGXISuhEyS5DR25BRWxBQ+lBQyXCQqPCxSfGyu7GyerKy2ZFR+rERqfCRmxBROtBQ+fBwuTBwmNDSW9JyabLyqRIx+TExSXBQ6bAQCBBQ6ZBxapDR+zBxq3LyaLJySRHxqPGxeNBxGbCRmrHRyRERONDRKNDQ2JCQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAeygACCg4SFhgABAQIDh4MBBAUGBwgDCYcKCwwNDg8QERIThRQVFhcNGBkaGxwdoYMDHhcXHxggISIjEiSvJSYXJwsoISkpIyorLIIDLS4WLzAxMjM0NSo2N8o4OS46OzwzPSk+P0BBgkI8Q0NERUZHCEhJSktMgwk4Qy1NTk9QUVJLphCiUsWKlStYsmjZQiJgIS4KuijQ4iXAFxYCDVFJwGUFmDBhMjYSw0KMyEYoBfkJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+konsole-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXFRSVPz+/PT29OTm5OTi5DQyNDw+PERGRExKTHx+fISChIyKjHRydFxeXDQ2NCQmJBQSFAQCBERCRMTGxHR2dGRiZExOTDw6PCQiJAwODCwuLFRWVOzu7BweHAwKDCwqLHx6fBQWFGxqbGRmZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAanQIBwSCwKAwKkMslEAgSDqDRKqBYKhkNgcDggEorkMrDQchkNhuOhgEQkk0l5S2lUGpYLJqPZTAwMHB0DCmhqAW0Rfh5zAxgOkBcCFAcfIBMECxwBBAEPFw8dChkhcBMDDAcdnQqtFKSWcQMimx4dGRkQBxGxsg6bBQEawx8jl3GnJFoFHRNXVVNRJYIFDAsL1tgiDiQXFx0HABwcXeQH5OjkRutEfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+korganizer-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBASCBISChFxaXPz+/Pz+vKSipLy+/MTCxPz+BPyqXLxaBAQ+BPy+vAAAACH5BAEAAAAALAAAAAAQABAAAARmEIRJqw1ikM37FsFQjMZ4lAVKBESBjCYsFiuBkkk5KG1dJL+CZjBYMES+l2x3RCBqtxHBOFD6DkHmAQj0yXgzmFdIhY2erBJBwTiczDSWq0Eg1gvYrvyHxcMdUEojYWIYHocbDX4RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+korn-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBMTCxPz+/PwCBMQCBFxaXISChKSipAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARSEMgQpL03CEExDkO4dR6ghSFBkJa2CSlRcNX0voNQ5Ebn3pvdAWHo/W6IHUJwGFCAm+SrSTm+ZgcY6XnDhlim3wwxKNYymiX17HmCSxO4/OKPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kpackage-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+xERCBMTCBISCBDQyNAAAACH5BAEAAAAALAAAAAAQABAAAANPCLoR+7AJ0SALYkxd79za12FgOTlAQBDhRxUFqrKEG8PyOqwEfMeKwGDI8zVGul0vFsAFdaxB43ecKZfUKm1lZD6ERZgBZWn0OpYvGeJPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kpager-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBFxaXISChASChATCxKSipMTCxDQyNERCBPz+/MTC/AAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARWEMhJZ7hADFI4+RpwBYBxFJ1HmMiYJUgiJPI8Bwmp7HyvyBOfMCHR+QwzhAAhMvZKSFgRIOwtJczqboFoBasGGVNUKVNGaEyTlEYL1sX2pYXOyO8XfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kpaint-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPz+BAQCBMTCxPz+/PwCBPzCxPz+xPyqXASCBMQCxAQC/AQChPyCBATCBMT+/ATCxASChIQCBKSipISChAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAV1ICCOYxCI5kmigTCYBKGW7WAH8QyYrn3LNFesYDgEjCVXIRYzGgWqgA2BICQUx9pMSkUssgsbFOWighW+7c24KDAKDccjCjVCHAEGo/GYl+wPLwwRfF8oT2mDAwuGWVJiARERAxITJkhaJhMSlJY7NDQpAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kpixmap2bitmap-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwC/AQCBMRaBPyqXPzerPyCBPzCxPwCBPz+xMTCBPz+BISCBMT+xATCBAT+BASCBMTC/AQCxAQC/AQChAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVkICCOpBicZQoEwjAE6hgQQwvH81AU8OnfuR3QYDgcgAKhjGj8+UgzQkHHw+2mQlQpgEAkFInEYnGDhr/h8VPGYDQcjcZj/iiv4u84vQ6FQCISERETgxN2AX6AgoQThlBOkCR+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kpm-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxKSipPz+/ISChAQChMTCBATCBPyqXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARbEIBAa5BYUsHF+FQ2EUTHfUOoFQVpeuAVGAbrnmg603U7FD8UxXDgGQgoYMyAIBoSyI9Sx2seoj/lRlDFTmUBDs0L0gg2CGwFs93oWJdMOwCPiybhguout2f8EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kppp-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAAT+BGSOhERadDxKbDRKZExWXKzG/KzO9KS+tER+lBQyNERaVOTu5PT6/OTy9Lza5LTatISylHSilCQ6LNzq9MTa/LzevKzKzIS6dBwuZISi9MzizLTW3Iyy1IymjHyGbCwuLDRGXHya3HSe9Jy+/MTe5Pz+nPzmhOTSbGyGXGx+XCwyLHyinISe/NzifFRKTFRqXCQmJExSVFyafFyC9MTCvAQCBMTCxExKTDw+PMTGxLy+vNTS1Ly6vMzOzNza3MzKzHRybERCPDQyNPzCxPQODHR6dAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAengACCggECAwQBg4qDBQIGBwgJCouDCwwNDg8QERITlIUUDhUWFxgBC4mKGRoGFQcbHB0eHyCLISIjJCUmJygpKiuLEywjLRYuLy8pMDGLATIzNMk1Nck2lCDJN9TcLziKOTg63DvcPD0ygjk+P9zcQDVBQekAQkMgPjzcPfLy1wAgiBQBAYIHkH5BbPwTBGKIQBBBjAQBsXCRDYJGZFSkJOhIM45+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kpresenter-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwC/AQCBMQCxPwCBAT+/MTCBASChATCxPz+BPz+/ASCBAT+BKSipAQC/AQChARCBCH5BAEAAAAALAAAAAAQABAAAARhEMhJq70YhM2D5UIYDARHBUWxEcRgHKgncWyLuPEc1MOAJLfBRsNSEBYbH8kw3BEUyABjZHzJdsiGI6AYLBQG5qykDSy+jwdLpimj1aVhe7tIr00a6Q4uP02dfRVygRZ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kruler-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBFRGDPTijPzmnKSGDOzWdPTahOTGXOzOZOTKXNzCTNy6RNS2NMyqHNSuJCH5BAEAAAAALAAAAAAQABAAAARkEMhJKwg4643FEIQHimHRfaiYmoFxvMLhwi5r3IaA37rBIomgABhEDBM/hHLJVCBYCwFjYVxQBdYFi8GQertSLqshaJgFZbK5wXI4BO63W/Bwt+HzON7BKvj/gIAcgxoWhhN+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kscd-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBKSipFxaXARCRPyqXPwCBAT+BMTCxMT+/AT+/PzCxASCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARbEIRJa5Ui672nsNYgegFhFoRhCuJAEgcsE+wYfHIc0y3JbT2QsOJCGG+/zyShMCICregEsUgEnNCe6/rsPkPTY2LxZLEOh4DEqbBmRQyGen0kjgB4ySSPp+D9EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kscreensaver-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXAQCBOzu7Ozq7OTi5Pz+7Pz+xISChHx+fMTCBARWlARepOTm5ISCBNze3ARalARanKSmpARSlHzC9ARGfLy+vKSipARKhAROhARKfJyenNTW1AROjARSjMTCxJyanNTS1JSWlMzOzNza3MzKzJSSlMTGxLy6vLSytKyqrAT+BIyOjPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAalQEBgOBQYj0fhYEAoCAyHqPRgDAyIggPikOAeFFVCYMHImqnfaiPAKH8VcLij+ghAGJFFlnuUCAJ1ExR5AnACFRUWF39/CxETXQoYGRoaFht/HAEdE2AeGRgVFBUfIH8hmx4doBihGokifyMPAiQcISEjJR+7HyZ/JScfFigpKSoSFxsiKywCAEjR0QDU1AIJFi0tFgnP1dYJ4QgJ4+Xe1tLTAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+ksirc-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAAT+BMROTPz+/KQGBFxaXAQCBDQyNGSGzDRivAw6lAQmbCRGlAw2jHSS1BxGpAwiVGyO1CRWvBRKtJSq3AxCrEx2xAxGtAw+pAw6nDRmxAQmZAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVYICCOQBCQKCoMaRsMbCvPNE3cRA0QRWEciIQigQLyfAtGqtFwPI6GFgQReex60WJEYr36UpOtQgQlUQAVieUyLoskY8Bhi3liEZJ6MaOmWCgJGjYGhCl+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+ksnapshot-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBATCBFxaXISChAT+BASCBAT+/PwCBPzCxAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARLEMhJKw3YViw6HkRgBUVnCkG4GUV5otthsO6A3KJEHm6R3AOYTtAy2QqzHCDwMpiSk8DsxIFGpc6T9YJ9GpSb7laDSYI1yzNa448AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kspreadcalc-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBATCxARCRASChAT+BMTCxFxaXEQCBPzCxPwCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARPEIBAq5U4iM17wJMwjORIfJkYFCs7nKA2rJQLp0Su66ikGcAg8OYTGA6BA/KAIIYsFudPGJQal8uAFVqxUg2JxBYbUGh7k5J6BppwKyB/BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kspread-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAT+/Pz+/KSipPz+BAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANFCBDc7iqIKUW98WkWpx1DAIphR41ouWya+YVpoBAaCKtMoRfsyue8WGC3YxBii5+RtiEWmASFdDVs6GRTKfCa7UK6AH8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+ksysctrl-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBISChHx+fPz+/AQCBAQC/AT+/AQCxAQChAT+BLy+vAR+BAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARYEIAgqK1YzsG754QUDERpmkEpkkXrtoK6EcVgHIibhnNx564Yb0TDvQq7FQ34EiqPOhnREqhWSUPsyZSQAbbg7GcMEgwUiYVivTa1R+y4XEGoWO/4AMAfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+ksysguard-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBExKTERCRERGRAQCBFxeXKSinIyOjJSWlKyurKyqrKSqxPTy9LSmxNzS1Nzm7JyitJyipMzOzLS2tOz6/OzW1Ozy9Oy6vNyCjNRydMR+lNza3LSurFReZMTG3Pz29OSmrMx6hDw6PKS2zMTCvOyytOSWnMzi5MTa3NTS1LzCvNTe5Pzm7PTK1PS6vOSapMyKjNTy9KzCzMzS1GxqbISKxOzq7Ozm5Oza3MyytLzS1Nz29OTy9LTS5GyGtOTe3MzKzOT29OTm5KS2vKSurNzy9LTW5OTi5Mza7NTm5KS61KyytOT2/HyChHSChHx6fNTy/LzKzMTCxLS+vMze5KSmpLzS3Ky61JSSlLTGzLTa5FRSVJyanKSipJSWnJyWlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfagACCggECAQEDBIOLAAEFBgcHCAgJAYqLAQoICwwNDg8QERKXjQYTFBUWFxgZGhsJHJcdHB4fHxUgrCEiIyQCjRwWthUlJiG7IycoKQQBKisfLC0uLzACJzExMjMBNBI1Njc4FTkBOjs8PT4/3UBBQjc8FkNEQTtFRUZHhyQySEkHOAyxgOCcEhkSLC1ZwSRGEx1OnBx4EgNKFCmKAkyh0uNADBpDOpyQ0YNEAEJVIFjBZg/bFRIRSAXAwiFLDyNaesiYEJMRgS1cupDg4OXLFlI+DwkQgBSAn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+ksysv-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/MTCxISChIQCBAT+BAAAACH5BAEAAAAALAAAAAAQABAAAANWCLoQzlA5IVyIK1S9L7PDsFHBIJXDFFaViYYEUQpy6orEqq12Aw+FmkjQQxEKwQCBSCz5BrGYkuc06nKU4s8gW4q0UAN3+q3CZJfJRhJ6fDwZOGbhTwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+ktalkd-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBKSipMTCxARCRFxaXASChDQyNATCxISChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARYEMgZqqXU6gCuDIJQDQTBBQX3hUFpmN2hFaxhIPCJDrRo46dPglf7BTvDXsB2OwaSCd8tZ0kWgZ3Uk+hDvHRV5bfyybACPNmkY2EVZKpM5UBPre8fD94fAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kthememgr-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBASCBATCBAQCBDQyNPz+/MTCBPz+xISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMhJaw1V6Bs0HgIWYFMnhSERkiU6ekM1FO9IGMcxIFK3jgGDzRADhAypQipI7A0OId1IaGhKntHDjWogTLCB3JbpvULD2ir5i0SPDYjy9ZgWDuQUwqBLLFq+ehZ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+ktimemon-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPz+BHSG5PxSVDRW9PwuLPQKDFze1AQi7CH5BAEAAAAALAAAAAAQABAAAANDCLrc/lCFGeKi1YktAH5c92mcR4HloA4P4RLAyjovLLdvvD5FX+gqgGFoUPh+N2IRcAQcngch0ehzQqVDas/6xBb9CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+ktip-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBGxubFxeXAQCBOzu7OTi5NTS1PT29Pz6/Ozq7Nza3PTy9Pz+/Nze3MzKzMzOzOTm5MTCxLS2tKSipNTW1Ly+vKyqrMTGxJyenISChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVwICCOQRkIY0oORFEYqCoGw4EcSaHEarAgDESu4RioBIMfA1doPIwpZGJBhTQMEWh04GoqDBLtCKkYNL5hGUAwoZQfFYs46lBQLnK1SICJUCR5egMZGBgZcyoDGAwTh3oiAxMMhogpioyOjwADnIh+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+kuser-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxISChAT+BMRaBPyqXARCBPz+/FxaXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARLEIRJa5Ui673nsGAgeKE1Bl9AUEXbiqTlFlZaGUZoszm4BzhDAVf5BYbAXI+TAR6CS2ZGSZSEiIIqYIsSIEaJ7GRrlY7J1lKA7I8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kview-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPz+BAQCBPz+/PzCxFxaXPwCBPyCBPzerPz+xASCBMTC/PyqXATCxMT+/ATCBASChIQCBAQChISChMTCxKSipARCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAV0ICCOYxCQaBkIwpmKJsu6qDkIREDMZFwUAYNwRVuxgLfDAUGEsRIJo2LRapUE0ABDsa1aAcZoo+stsnIMwcDQcDQUV9MjF4Q4GJFiQJJuGSYOFHkwezJ+ExUUEicmYDITARATAoomLiuQJhKTlTRgepYBfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kwin-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBFxaXISChASChATCxKSipMTCxDQyNERCBPz+/MTC/AAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARWEMhJZ7hADFI4+RpwBYBxFJ1HmMiYJUgiJPI8Bwmp7HyvyBOfMCHR+QwzhAAhMvZKSFgRIOwtJczqboFoBasGGVNUKVNGaEyTlEYL1sX2pYXOyO8XfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kword-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBPz+/FxaXISChPwCBEQCBIQCBMQCBMTC/ASChARCRAQC/AQChMTCxAAAACH5BAEAAAAALAAAAAAQABAAAARiEMgpQ6B4WnGzDkLIeVs4DAIBWFcpnKJVzCUcz8ZxVOKN/AWNKRQo5HQYELHwQxQSHR7HqDuwMIRisxBQLBbRFdUaYCwYjUZHywIxGI53K0jolRkJdLkhtKwaeWpJYW0AfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+kwrite-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBKSinJyOfPz27Pzy7AwKDExOTJyWlERCRKSelPz69LyyrKymnPz+/MS2fDQyJAQCBOTazLSiXOzivMS2jKSSVOzmxPz25NzSpPTu5KyebOzixNTGjOTWpMSydMSybCwqFGReVKyaXNzSnGxeNJSCVMS2nPz23MSuZIR+bJyShLyqnOTOtGxiXIR6XOTSvIx6RMSubIyCdKSalMS6pOTWxMzKvKSabJyKTOzezHxuPGRmZKyurMTCvPTq3AAAACH5BAEAAAAALAAAAAAQABAAAAajQIBwCAgIiEhiYEA4FgwHRDKhIBAWz4OhgGQ0FAPHA7qFEBONb0Qy0ULeQ2+aUrFcMI+3GYBOZzQbHB0eHyAhIQByDREiEwMjFRIkJQImAgJ+jScjHigkKSorLC0AKg2NFSMoki4qCy+IQgITKDAxkjIzNDWkQxQoJaskMgk2Eb1DNzgoOCoHDDY5yEIwJToAOzw9ET7TQiREAhkZ3kmy5QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+laptop_battery-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/KSipAT+BISChFxaXPz+BMRaBPyCBMTCBDQyNAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARtEIBAq5w1TBGEGIM2ESTlVUNhaAFJUAcXgAXCZkFyJEoiIArWYQjj+Xi2yfBA0SU6CuAts4MCk4EdcxbznFhOCsjrWUxRhbRBBk48Z6kCZ2GeuN9xucF8FqcEBnt1OW4saSp7IoRPEjgiGBV+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+laptop_pcmcia-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwC/AQCBMRaBMTCxPyqXKSipFxaXASChISChMTCBPz+BPz+/PwCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARfEMhJaw3Y2iDGyJoUEIVRfIHGEcaBHCc4jcWbGG2cAuuhKIZE4mX68EgI3M/wORgQGAHr4HICD4NCKoBIJqsv7w6DKDgNi0VuN+O+GIxFl00hlxjakIhbo4cwfnoWfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+locale-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/AQCBPz+/MTCxISChMxKTKSipFxaXERGRGxqbCQiJDQ2NJQaHMwmJDQyNFRSVOR6fGwSFNxSVKQqLFQODJwaHOyGhOySlNRCRMSuBPz65PzupPyCBJyOLMxyJOTKRLSiNIR6JExCFGxaHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaPQEBgGAAYhcWjUMAUEAMDQtIIZRauBaZhKhwIsFjBgFu9HgKHrHNI9QYQCQQarWB313D5Ik68BxgIDQwOCgcJD2wBWwENEBANEQwMEBITFEIOQhWNkhENFhcYl0l/GRobHB0MGBAeo1QdHxsaICEfpyAiQlQhICMiHyMgs8FKASMjRiK/yLrGStDRXNFGfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+looknfeel-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/ERGRExKTLy+vKSmpAQCBPTy9Pz+/IwKFLQWNPT29GwOFExOTIyKPHx2NPz2pIQSHLwWNMzGXFxaLLSytERCHCQmJNze3GxubLS2tHR2dAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAWNICCKgVCWYwoEwUAMhXEQhhocRuHCMpIgiJVBptC9DojDIrFYwRS4wgGJZAIYuwL00Ej6FjOGEXZwPByQCNjAyrnKj4NkAqYUBIIoXC5pVGYUFgIXU2Z8fgdGFhgZiRqHf1EDFgCJGAcafX9aUSIFlxoFBX8vMYmemKJSY6Ijn6oHF26tKbAEGCaUKX4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+lyx-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBAQChARCRKSipASChFxaXISChPyCBATCxPyqXMT+/Pz+xPzerPz+/AAAACH5BAEAAAAALAAAAAAQABAAAARZEMg5Q6C4BnGzHsRgeVZRGIbYaekxuAFijUGRBOqMKPxlJQsLQxjoVWyWBsMxNEp+iRuj2VvVCklHLCZjiRrawGFmNQUajQ129RwYyCMSau2pcNh1AB7jjwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mathematica-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBISChPwC/FxaXIQCBAQCxAQC/KSipAQChPyqXPyCBEQCBARCBASCBDQyNCH5BAEAAAAALAAAAAAQABAAAARlEMhJ6wxChiFFCBUhENtQGIcBUghWDsHxWck7wMpKfXz/ZYBAYeCpKRQLWwkjMCpQJQ3TE8gdUgxPUMDlflINhzfocJB6BNEDqLnKpgRLTJZjBuIUAf1TExR0EyRASWmAFocAfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mouse-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBDQyNKSipPz+/MTCxISChPzCxATCBISC/MTC/AAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARSEIRJqw0Sg32rAANBFNwlhIQhGkNGAaSaouW0iYUBEIdYgzsUIqHAuWAoQlGEE9gMJKaU8IPupqLWy3qVkioAFqkLc9nCg3G5oxFr2ecavOOPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+mozilla-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/JxqBHRKBGw6BHwuBHQuBKwmBKQmBIRWBGRGBMQeBKwaBHxSBFQ6BDwaBEwqBEQuBGQuBFQOBGwSBGxGBHQ+BOQiBPQmBLQaBKQaBCQGBIwWBLQeBDwKBHQSBGQ+BIRaBHweBIQWBNQiBKQeBJw6BPxGBNQuBLwiBPwmBKweBIQiBJQmBHwyBIxeBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZzQIBwSCwahYHA8SgYLI2EwpMoMBwQU2FCsRAYGQ3HwwGJSCYPCNnRoAgrlgsmo8hkLJpNpEjhbBYdHhYZEh9HICEiGRMjJAxPJSYmJxkoSocjKSorExYNSwMXLAwgDhYVSwUtRAMORwGfRR8uRpdGWEJ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+multimedia-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBIR+hKSipPz+/MTCxMRaBMTGxOTe5MzGzNyytPyqrPyurLz+tKzqrPTy9LSytNTS1Pz6/Nze3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAWAICCKQWmOKFAKQ9uWacAOJcEWQjDKrxHYJZxONRAQaL+c76DjyY4D4A+RC9B8xkPiQKCySsjAQZAojHMva9pk8iGrCsWC0Wg4HCvT4wApyO0FEAcRJhKGhzUEioolDw8TgYQBEYITCIQqE4IRCnQOEXyYJAFxCwt1dzAxbCcjfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAAQChPwCBAQCBPz+/MTCxKSipFxaXAAAACH5BAEAAAEALAAAAAAQABAAAANDCBoK8TAC8Vy8QUyGr9BaFwmDZonZp66sIhBwLBMFlRl4rhv1IxiDoHDYuw1yw2Dxl0wugTqnjdkUPmezJWv7QXX8CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+netscape-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAEyStPwCBNTKrHRqPAxSfLR6VNzWvAQCBEyOrFxGPMSWdKx6XPz69Ozm1PTy7NTOtOTOxKRqRGxCJPz6/MzGnMS6jDwmHEyGpPz+/Hx2bGxiPOTexFxWNLSmhMy6jLyGXNSqjHxSLLyuhMSyhLSqhDQeDJyWdJyOVNTKtPTu5KSONMS+rLyqdMy+lFxSNOTezKySPEw+FEQ6JKSOPDw6LNSylHxSNKyWPLSeXExGLDQuFIRiRCRCVEwyJAwODLyyjIx+TNzaxMy+jBwaHNzGvMS2hMS2jKSWXGw+JFw6LKR2XCQ6TDw2HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAfVgAABg4QCA4SIBAQFiAYHiIQICQoLAQwNDg0PgxARg4oSChMOBg0UAgYVBRaDFxcIGA4ZGhscHB0eHISKoxkfARsHICEiI7oBrg0kGiUfpCEBJiIngygbKQ0bG5kjKisbFSwtAi4HLx0cBwYiMDEyJh4zMjSKKBQuNTY3Mb8vODk6kLky0GEHjxUyeiigMMPHJ0UCKvw4sQFIECEqhgQUSCSChRFFWhg5MkMjkk9JlJRY4uIEixk5fOhAsuOkqyFLXF1oQYOJTiQIAigaqohCD6JD/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+noatun-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBCQ2PARehAwODASCtASi5ASq7JTK5PT29MzS1JyipISGjAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARlEMgJgrg3zDHkCEQoEhrnVYXBDUVRdmagHjT7AnExHPtg3LldzYXr4FA6juHnMXZkqaiGMpEtOdOmETpAIEy473fV9Xphq7P6DEgMFIpFWm1sJ+4JBec8SFAnd3pveH+AeHcSfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+package_applications-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAFxaXGRmZFRWVARehAxehFxeXOTm5MTGxKze7JzO3ITC1HSyzGSmvFSWtESKpCx6nBxulNze3MTCxAQCBByezByWxBSOtBSGrAx2nAxqlARijARafARWdARSdARKbARGZARCXOzu7Pz+/Pz+9Ozu5Nza3Pz+7NzexPz+5NzivGxqbGxubNze1NS+vPTCvMzKzLz6vLzevPwCBNzevAwOBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAADIALAAAAAAQABAAAAamQEBAMCAMikfjQMAsGA6IhGLBaDgeEEJEMhFIJBRKxXLBYDKajeTQBQAGG05n7vl8QABBNyTq+/8iIyRdJSJrgCMjJiYnhCIHEn+JiygpXQaGB32JKgErKiuNAoV+iQIGLBItLhOOgYkrmAYvLikwl6+Lo5gTtjFdLMHCKy8vEyITxV2tzBMFMTCWIgYlEzLX2NcwMy4vstngAS4tLyUGNODprdl+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+package_development-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/GxKFAQCBNSyhFQ2FOTGnJRuNOzWtPz23FRWVERGRJSGNMyyZHRydOzu7PTy9Ly6vOzq7Nza3JyanMTCxHQCBLxWVKQaHOTm5NyOjMxqbJQSFHwGBDw+POTi5LQiJJwWFPz+/Pz6/PT29NyWlMReXNyenLQqLIwSFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ9QIBwSCQGBMWkMDAgKIuBgsH5FBIO0+oSka0mFAsGtdpwLMbPxONBgCDJEQkEMnkn1RLKRGF3+CtCDRJ7AoUSEgAWFw+AChB8hYUYGRobHIwAHZGbHh8gayEhIqGiIw9+GBgSJBoliiGUrhcOJq0WJyAbKBUhnrocDr4ofkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+package_editors-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBLS2tHx6fOTm5Ozq7OTi5Hx+fPTy9Ozu7PT29Ly+vMTCxPz6/IRuPHROLPz+/LyOdLSCTNSmnOS6vPzmzISGhExOTJSCZPTSxPTKtPS6jPSujNyKZGxqbDQyNDw+PHRaTKRqVLRqRLxqTMxmPOR6NKyurDQqLExCRFxKLKRSFNza3KyqrKSmpDQ6PGwyBNze3NTS1LSytAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaWQIBwSCwahwFA8kgMOAVLpjMgGBCixamgECAYsELtoUAuXJtPRCCRMBu44ecBoVC0F2aC8qkIKBAICQx5X3INh3UMbQMOD05/AQ0QDQoMERITFBUVThZ1Cg0XFxgZGhobHB1KHp4NCR8gISIjJCQlJmGsCAULAicoKSoqDytIrAkGBCwMLS4vKTBNrAUJCzEBMjMuM35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+package_favourite-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBPz+xISCBMTCBPyCBMQCBIQCBPwCBPzCxAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARYEEgZwrQzVyFq6Bj1gQOxgcBYDSzhnl7Azm7tpWT7VhdHmoFXzweqmYZE4I5C5AQKhkMAYbCMfM9EIWBAIKzNLNRbTRHCBUT6ewn6TOlyJuX2sOftS8YfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+package_games-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBPz+xISCBMTCBPwCBMTCxMQCBPz+/KSipISChAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgZwrQzVyFq6Bj1gQMxgsBYDSxhqunKtu5bpSQdFDfFkS9DgHD5cTwBIdFnFLiSw2IzGGX+AocDNHQ6GhCJQCJsGRqThm/CoMBUCNc1W9HWmD2Jdsh+CfkjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+package-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+xISCBMTCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANECKoR6ys2IVqokF08yMTA1gwkYX5WQK5ma4VceTYPxXnBWdtY6+0834/Bowgzm6APWRQcH4TiMhPK2WYRiZWW7XK7/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+package_graphics-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAASC/MQmJPz+/LwuLLw2NLQiJNTKVNTOZOyydNRaXMxGRJQmJFQuXFRypFySdHS+VLTOfNzWhJQeHFwCBGyGtHyqlIzKdPTapAQCBGRCbKTSjOzqxLzG3MzmxJyanBQSFJSSlBwaHCQmJGxqbFxaXNzmxPzmzOSenExKTLSytAwKDAQGBMTS5LzerOSaTFRWVHR2dJzOhLTKdNyiNDw6PFxeXDw+PLSmvKS2zIyynLzSjNTKXNSGNIx2lIx6tISavNzSbLwmJHRWfNzWfIRurIyexOSmPJweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAejgACCg4SFAYWIgwECAQMEA4mCBYwGBwgICQoFhowLDA0ODxARCAQSkp0TgwwUFRYHFxeLARITGIUZFBobEgUBC7aRHB0eBcC3iRgfGAIgISKRGCMeIhgkJSYniBkoKSgqKywtES6bgy8iMCgYyhwxMjOb7Bg0NTYr7Dc4OTo7PPIrQoRgJ6iHjx8xgMwIEgmAkIMxhsw4lYgBkSI5LEQwcsRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+package_multimedia-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXHx+fHR2dGxubISChNTS1MzKzLS2tLSmpNSytAQCBOzu7Ozm1Nza3MTGxNS+vOy6vPy2tOTStOzq7Pz6/Nze3MTCxOzOvNTqvLT2tDw+BOTm5MzOzPy+tLz+tLz2tOTi5LSynLz6tPz+/NTW1KSipMy6THx6fMTKxKyOLNTGVPTmbLTOtBQOBBQSBKySLHReFLzKvLzavAQGBCQiDNzKVOTSXLSWLNzGVLyiPNTCTOTaZLymPMSqROzebOzeZMSuPBwaDMyyRFRKHAwKBOzibMSmPMy6RLSaNLyaNDwyFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfKgACCgwECAwQBg4qCBQUGBwgJCgsLiwAFDA0OBg8QERITlYMFFBUMFgYXEBIYGRoboxwMFRQdCAoeGR8glAABBgshFA8BCxsiI5QklY4lJQYbJiQbypQnACgpB5ALy92UKissAAQXDyktlBUuLzALMeG+MjPKNDU2LDc47yqC1Qs5dODYwYJHj3f/Yrxb4QPHiR9Aqr0I4kNFDCExdgxRQaSItyA8jJw4YvFFjBdCGtCotECFjhssVgRR8W8QkgVJlOBb8k3UID+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+package_network-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBPz+/CRKfERCRAQCBFxONKx6LDw+PDR2rAwyXMzOzOzq7AwKDHSSlKy2ZDxutAxCpExOTBRavBQ+fBQ2XOTi5OzWhFRSVBw2VGRmZDw6POzKdCQ6ZBRKrCQmHAwODIyirGSGpIR+bCRixBRKtCQ6VDQ2JBw2XIS27DRKNISuhESK5DR+5BQ+jCQqPCxSfFSa5Gyu7GyerOzetBw+XBwuTBwmNFSa7Eye7DSW9JyabLyqRBQ+dBRerDR+zDx+3Bxq3LyaLJySRHxqPGxeNBRSnCRmrHRyRERONDw+NCQuLCwqHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAeygACCg4SFhoeEAQGJigIChQEDBIIFBgEHBAgCCYMBCgQBCwyhDA0ODxCcAAqRihGXiooSExSCsYoVDBYEFwEEEBiCrBmgGgUbigMcHRgeth8gAR8hIgQECyMkJSaCAicoICkqASssvi0YLoIvMDExMg4zrjQTNTaDCTcxODk6OwQYJmCYNIhHDx8/gAQRMoRIDRcEBwkoYqTIkSMFkNiISCjBCR40UiQxwdGQEg9LSvoJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+package_settings-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBISChGRmZMTCxKSipLS2tHx6fPz+/OTm5FxaXOzu7DQyNMzOzAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMhAq7wYBDECKVSGBcbRfcEYauSZXgFCrEEXgDCSeIEyzKSXZoBYVCoJVIqBGByKu0Cy8QHxmgNngWCkGgqsGWFseu6oMApoXHAWhWnKrv0UqeYDe0YO10/6fhJ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+package_system-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBGxqFAQCBPz+/PTqtOTOfMSyPNze3Ozi5KyeLMTCxMzGzKSipOTe5MTGxAAAACH5BAEAAAAALAAAAAAQABAAAARfEMhJQah4ihFunsFAEIVXCVJACIJhoBK6CerawsA8HAhbuAnYZrBDKBYMWpCy4S2QSRazyBIwrrjcoNFQzK4KR1bQcHhZjGM2BgWLMYJ2enForHPJtNj+kfHvcB8AfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+package_toys-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBJxyLJRqJGxKFIReHKR6NJx2NMSmbEwyFKyGTMSibFw6FMSqdCQWDIxeHNS6hAQCBDQiDNS+jOzexCwiDCQiHLyeXFxGHLSWXJwuJGweFHQiFMx2bLRGNGQeFNTClOzSrLxKPLQ+LLxOPGxOHIxmLEwWDOzatNS+lKyKTIRiJJx2PIRmPJRuNKyGRIReJJxuLKyKRMSqbKSCPEw6HNzKnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAauQIAQEBAMhITCcTg0CA6IhGJwICyYwgWjEQg4HIgHBCuMBCCSM6FBHiIOk4cg0hYiKAFFxUJBtC8YGQgBFhAaBVdMAw8bHB0eHh0cGh9LAAMgAxAhHiKPIxAkH1cXEiVjJiQnKCljECoWCAgEFGUrKBYsYwARKnQIRxG0Ky0QtAAIvwcuAwQpLxDCGDAIMTKyMSczs7sQATQz2mMIMyAXu0IQNDUu6AgQ6EPwu35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+package_utilities-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExKTERCRAQCBOzu7Nze3MzKzLy+vCxqZBQ2NJyanKyqrGRiZDRydKza3FRWVPT29LSytDw6PMTm5EySjCxaXGRaJFSanCRSVGxqbPTmvMSqVJTW1GSurHS6vOzq7KSipISChFRKHJSGNPz23GxKFBQ6PKyurCwqLMyufJx2RAQGBJSWlEwyDIRiLNy+lLSKVDwmDJRuNOTOrLyabGRCFDx2dKSCVOzWtHzCxOTGnNSyhAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQIBwCAgIBAOiUiggFAyHASKxDAwUC8Zg0HAglA9IZPGQABoTSqJCFTIOEIsFgHBcEhhHUpKJFCwaGxYYHB0VEx4IEh8gIQwiIyQbJRMcHokmEicfDygAkCkqJQgIGG0rLElCLS4vMCWqQwMCQg0UMTIzNDVLQjaIGDE3ODQlS785CEkxKjowvEOHybG4O6JDCdNKuDUxRAmxRDHeveUAfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+package_wordprocessing-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBHx6fPT29FxaXPTy9AQCBHRydPT25Pz6/ERGRIR6PJyORHR2LDQyNLy+vNTW1Ozq7Ozu7LSiVKSiTIyKJJyenMTCxMTGxNTGlNTSjLyyRExGTExKTBwaHOzivMy+XBQWFExOTNzOhIyKjFxeXDQuNMSyjNzOnBQSFNTGjDQuLCQiJAwODCwqLGRmZHR2dAwKDCwmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAafQIAwQCwWhcihYMkUDJLIAKG5fEILhoOAgGAmCgXFgsEoNByOxwMCiTTAEsmEAq5ULJbLxQEuYCQZGn0JGwkcCR1gCUIeHyCJfX2JIUIHIiANCQMGIwYkCSUgi0KPHSYdJyAnKCkdHQ1IrhgdGCC1s7UqSCsdKLi0wL2xHY/FxMcssS0JIS4vIy8uIQktHUkgKygsMNwwKCAxUOLjAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+panel-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/FxaXMTCxDQyNAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANECLrcEDDKGYQV4+qbie9eGIJEVxTe+QmjUFgnXLLr615oF8x2v0I8DWpF2GV6slkLKSMdYT4nS0WgSkXYAWUbcXgX/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+panel_settings-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTCxPz+/PzerISChPyqXAAAACH5BAEAAAAALAAAAAAQABAAAANKCLobwRAG4SJw7w5BswoEkQXbRn0h5ggF14FhbIhb68SiOgnbLRsPEovjwwVLRIdhCfwMiR/VZ1A7WS4tntWyynquq+01+h1//AkAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+password-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/MTCBPz+BISCBPz+xAAAACH5BAEAAAAALAAAAAAQABAAAANECLrcGi6CIAKUKwxSb/ZasXWPMFwBQRQiZwlqAVnEGbRwKz/ndMep3QNUqKV6kpQh6HFoCIaBMDmQTpOsJsaC6XoZ/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+penguin-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/ISChPz+BMTCBISCBAAAACH5BAEAAAAALAAAAAAQABAAAANHCLrRsTC6F6UId1TYiNtMQRQNqARDOlAgJrzlhr7vqlUufbHMoMO8k+8XY4yGtc9pREIORKRTYVoYDgxUVmBqmGCLJzDYnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+pixie-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXPz+/DQyNAQCBKSipPz+xPzerPyqXPyCBERCBISCBMTCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARdEMg5Q6C4BjEGyZIlCEFHfJQonEERnB8sE6RxIMkAnGtPBzacjqBQLBiMxS+Y2xmRx+WtSTgmkwQLcwhNKqRCz3VRBOeGvh5wqpPMzO3JQFBguWAYxeiNwnRAEn4RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+plan-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxPz+/Pz+xMTCBISChASCBMRaBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEIRJKwU4iD23FwEmDeAwBGYaZiehWutEFK6JqtlM7KZhHhOJbuizIUKBHVGFOOaUPgPlGEsSDNjbKWBgcT0oX5CV2qakIg24OTGA0sxjeSWpUC2ivESf90cAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+proxy-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/KSipFxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANGCAHcziuIuFy44045WxhZpkxCB4GEKA1lpIAiVG7XB1bjPMHxqds3y++S6nGOL1ikpYlkbBSZM/oYfXBVaS8LuXCr2IY/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+pybliographic-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBMTG5OTi7Nze/NTS5LSuxOTm/MTCxGxaFIRmFJR6JLy+zOzq9IRqJJR2HLSaNKSirNTOxKySLIR6VLS2vOzu/LSqhNzOXHxqNMzK1KSGJHxmFKSabLy2pIx2JJyCJIRyNNS+VAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZhQIBwSCwaj8WAEplULpkAZ0AQgEaVA4K0alQWDAdEQrHgNguMRsHxgJiJgcEg0pA4Jk84ZVCoWC4TGG9CAQkZGnUIG3lDAQocCh0eFB+MjRsgIAsLIYNwASKCnk2WVkR+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+realplayer-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIYAAAwWVBwC7BwC9BQC3BQOvBQCtBQCrBQCvBQO1AwKPAwOVBwC/AwGnAwCXAQGNAQCJAQCHAQGLAQGTAwKjBwG7AQCNAQKRAQGDAQCBAQGJAQGPAQGFAQKVAQGBGRiZBweHFxaXDw+PExKRBQSFERGPFxeXCQqJLy+vAwCjJSanFRSVLzCxJSSjIyGhGxubNTW1KyurAQGHAwODKyqrHR2dBwO7AwSZCwqRDQyLCwuLAQKFAwSjAQCLAQCFAQCDAwSbAwGbBQKvBQCzBQC1AQSNBQKtAwOdBQKnBQCxAQabCwOLDQSNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAe/gAABAgGFAwQFBgcIgwEJCguRDA0ODxCXERITFBUWCwMNDxcYpKUYGRobFQEcFx0dGLCxrx6kFQcYHyAhIiIhIyQlJiekESgYHikqKywtLi0vIDCkMQQbLiQyMzQgLDQzJSCkMjU2NzIYOCYyOSYmH+gYOjUBOzw9PT6mGD4P/AORahj4IaECBFI9gAQhJSSSw0g2fGggsEAIw4eRhhBhEGBBgCKkjAgZSRLFESFIRibZx5KlkpYtlbyEuW+Jn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+remote-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBDQyNISChJyGPGReLAQCBMy+hERCHKSipAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARFEEgZqp0Y1KxD9twEapg1kqhwBgKFvqIIjgMRdy4wFIaNbiiCYXDIAUcH328EQsxiIBXAqWn9MtTSTZLNybizEweY8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+samba-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIUAAAQCBDQyNFRWVASC/Pz+/PTW1OyytNTW9LSy7PTGxOSenNx2dMTG9Jye5OSKjNxiZMw6PIyK5GRi3AwODMwmJLQCBCQmzPS+DPTejPTaJLR+DPT21OzqtNT21MTCxPTyxOTmnNzedMTyxPz6/ISChOTijNzaZMzOPIzijMzKJLS2BPT29Nza3PTmxKSipOzu7LyGJPTKRNSeDFxaXERCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAMALAAAAAAQABAAAAacQIBwCAgIBsjkAEAoGJgHxFC5TCgWAEajyFUCHA8IICJhTggAr4NSGVsAF8wlnSQWBYLMRUNHMjccTB0AGh5dfh8gIQAiAAJCIyRCfiUmJwEokARok0slKSqPApukAZNDRpqbkZMjSROOI5srLAGwS34tGgEuBCMvAjCBA64ALRgxuyzAMnItQmgaMRcypjMByNR9QjQ0adzeaX5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+scsi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/MTCxKSipISChAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANCCLoQwZAFIV6UYgxi79Qa52WDE3bKV6YOpFpO3L5pJcckLBB8/wQEDezWAQpZqIWxFNAUkqkg6HmJOqGuArUqwfoTACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+style-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBOzqBLS2BPz+HPz+rPz+BPz+lPz+zPz+9Pz+1Pz+nPz+hNyuhPz+pIQCBMTCBIQyBPz+/MTCxFwmfCQiJIxOrHw6nJRWtJxmvJxuvJxyvAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVvICACwWieYiCUwVCiKVEEhjHA6YEcxooHBURCsXihaAYGglEzngKBhsMmMDhH0YcBAu16SY2IKiApm81RMXTCblPelDCrXJlI6hSL5SJOSewVdRMUGHtGZICChHsmZHeAgxkaG41/bWxnjV6bUH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+terminal-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTCxISChPz+/MT+/AAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM/CBDcHkoFQasVUIrBe8fRNDwMAWpjUThmtmxk0IYwOaPx/V6XG3hAjmsRa0Qkg6NSOVo6F0nG88g4TUNDpT8BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+wabi-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/ISChPz+xAQC/AQCxPz+BFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARUEMhJgw20XsHxvIEwcKQHBESaDkShmqhKsMb7tW1RHPwOH4ZdYcBDGH+8A2JgLH2MzZHAJgmRBAgZAabNqg7cJMGb5BKSZF4Yfb5Uzmp3piqfS/wRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+window_list-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCRiXCRaVPz+/CRmZFRWVISGhMTCxESSjPT29DR6dDyOhDyCfPTy9CxqZOzu7Ozq7ERubOTm5ARehAxefPz6/ByaxBSOvBSGrAxynAxqlBR6nBRylAxmhARWdFxaXCH5BAEAAAAALAAAAAAQABAAAAWHICCKQTCeqCgMhJCihXEYSPuKRWIoC6PYsEZikHA4FA4CEJdoJh4QgXRwiOAeQudDIpEZIpPwhCImhyGGAmBSOVgumExG055w1ZPZhpPpUDwzExBqAAUDhxUVTQ0QEgWOOIcDiU1QjoSFFYiKDZYFmAWJlE9bkCM5iouWpiIfBa6frrKYAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+winprops-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPz+/ASChATCxISChFxaXKSipPz+xMTCxMTCBPwCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAoALAAAAAAQABAAAARXEMhJqwxAjM23wBMhjGQJEFKhriwrGUcsE3JsvPWBFAAiT7BaIYAA/HAxWk9CO9wAwd0SkJA9g8NiomnDoYqnHDAGroqRyVy3F2i7326LnKKo2+94hT8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+wp-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBAQCxAQChKSipPz+xPz+/ARCRFxaXEQCBMTCxPyqXDQyNPzerISChISCBASCBERCBMTC/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAV1ICCOZDkGgSgMg0AUZWAExyHc7YCQclLYtxtieAoUEApFUIBgnRYMhUHRCDYcDoUIRUhOlYLkYwcIDLvSpAsBiYx0CPQUgXNv4V0ZWEByDBgRcTMGDislTX+CMgISJk1+AQ4zWiYiCCiRDmRbmJ2eKZWhAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+xapp-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChAQCBAAAACH5BAEAAAAALAAAAAAQABAAAAIyhI9pIa0nYAtPUGlTRszJ10UA8xiNRZZmJKoA25boqW7npeHvlKRHyIn9aKYaz6XwFwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+xcalc-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChPz+/AQCBCH5BAEAAAAALAAAAAAQABAAAAI4hI9pwe0Ogpi00hHF2LzzzFlTsIHD45SSx6oCeW4wjK2tl83y7t64pIsJaxrfh2bEAJIlhRPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+xclipboard-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/MTCxPz+xPzerMRaBISChCH5BAEAAAAALAAAAAAQABAAAANICLoQwdBJIaRjgYbBR66Lo1nfowTER61aWGRd1y5GyrLm+QrxMJ81FQ4T2MV+jUPwBgpVdrdcQ6AUIj8Ha/N06Hq/UpLY5E8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+xclock-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAALy+vAQCBPwCBMQCBIQCBISChPz+/MTCxCH5BAAAAAAALAAAAAAQABAAAANbCLHcrSLKOZcYmDSCsR1aUABAsXDDJwJGa5SBFwgaWxbCG3CWaBwG3C8Y67FawpYiNQscg65fsVkYuoAmJs1pBR522lQB6ILJLqHRwQQOZzYdZnw+dzruDIA/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+xconsole-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/ISChMTCxAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLrcGjBKCYK4OGcohv/gxw2aRgyjYJXCmVpr5loke82dfaO03vI5Ha5mwxGOyOSRF2qKKpMoxEFl+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+xedit-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBMRaBPyCBMQCBMTCxPz+BPz+/KSipFxaXPzerPyqXIQCBARCRDQyNISChCH5BAEAAAAALAAAAAAQABAAAARnEMg5gw00yyDGIJi2FUHhDWEWeEXrgaphHEOBJF8KBLKyLINEIAHbyA6/hbDACDSMBt9PIBA6n4HfIElFXTeKg2LbtTSeu7BiPegIvuA1mwrfOB5r4PusCjimZmgUF4F8IhJnhiJ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+xemacs-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBDQyNKSipPz+/FxaXISChMTCxCH5BAEAAAAALAAAAAAQABAAAANJCBASoXCFoVi8VdL6HHQeB4YjSAxnYQygSLzoSTjbEs9vMF86cbyH34NX+AELQ4zO+Nopm6cBC1PBEQwG6gd3SGo7Xa1STIb4EwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+xeyes-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAI4hI+py50Bw4lyBiEggFjvi2VcqIFhdnaDSabZKrbjS3W1OHz2CkJD/vHlKD/Er2g4Ah3MptPgLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+xfig-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+BMTCBISCBARCBATCBASCBCH5BAEAAAAALAAAAAAQABAAAANQCLocwbAJ8SIMYgwHHO9Opk2V5xGEplZK0alaui0eDLOB8QTykOKGQ6mnKQWFPILDN8sdng7l69c5CjuKAHNnZb2KnUOhcG3MsmMv7aK2+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+xfmail-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPyqXMRaBPz+/AAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANACLHcAVCJSWcYLwaxSPAXBj2bswyiIlUWSr5muGhbdaZjTd1ZzvKMFaOFcbCIpiOnGGs2FM5gLkLrTalQLMCfAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+xload-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+py+3hEoxnUmBpyBjNzWXfJnkGKJ4dBlbjS7Jni9Zsjec66hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+xmag-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipMTCxPz+/IQCBPyCBMRaBCH5BAEAAAAALAAAAAAQABAAAANICKrR+6+JIRxkc4RBww1TQBBNB21io2rRRKpltaDvis4hvJmzBmuslo+zkZ0yu0rBcwJ1AgXD8gJQMaJTaqRwyGqvzO9M4U8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+xosview-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIMAAPwC/AQCBPz+/MTCxAQChPyCBAT+BPz+BAT+/PwCBAQC/AAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARFEIRJa5Ui663HFEQojqEXCAVhrCxLmGB4kCJM03aIHEdC5rfaJ6UotlavT3AEIxaNLuAyd2wlT0thYMDter0BiWU8AfgjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+xpaint-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBPzerMQCBPz+/AQCxPz+BMTCBASCBPyCBPzC/PyqXMQCxIQChKSipMRaBDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVtICCOYmCaZGoKLBuMbykMA1EURFwCgWAQwKBAxxMQDocgAjEkrYAsoS6QGEYJCgWhWVq4tgJGY+iAVbcBB5jLq/aMbzJsYXK0Arky7JFY+BcJDyckDgEPh4d1aUSFJ2l6ARApDpSUKkQpmSJ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+xv-16:apps apps16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPyqXPz+xPyCBPwCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM8CLrc/jC+oIK9Lgg7RuietWhCSWkkVZUbEBBnWxXFSVP1eLt7kPM3X86nEhJrtx/P0tuNilCVZEqtNvwJACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+3floppy_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVrICCOQBCQKBkIw5mqLFG47zoQ+FwbN57TosDhgPD5dMEEIqE04kwlBWKBUEiNVYFpyqAyGEUCgqEtERiNNMLhQKzLQYJg7n7Y4aMAwbCUPvAQeWNgfzQQETAIhSMQEogwgBITQEGGEREmfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+3floppy_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVCH5BAEAAAAALAAAAAAQABAAAARcEMgJQqCYBjFu1hxReN82EOhYGieaklJwHIjrqnGCJLqNWhUFYoFQCG1FgWXIIDIYNQKCoawQGI0swuFAbKsxgmDsfZjBkwDBsNM90Jot9A3DbBD0Dwiur9QnfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+5floppy_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBFxaXPz+/DQyNISChASCBARCBMT+xAT+BAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARMEMgJQqCYBiFu1sIwdJ+0hSKZnZw4ehPLoW88c0Q7X7JABLlbp+eT/UyzgpADqwgKxKYpeIMZQNWJ4YBhWRHcrgpgQCSkJu3hYPFHAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+5floppy_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBFxaXPz+/DQyNISChAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM+CLoQwZAFIV6UYox61cwaF32UtlkLSYFnulJEuT6qQATxW9W2enurgo6CaggKvKIn91K6mh0gMepydqwAfwIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+cdaudio_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tOzOvNTqvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/LzKvMTCxDQyNASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAa0QIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTBqUiuUCVmAeiYzmsKlwOt/AAKFIFAIIFx4WHyAhUwIDIgsZFyMkFxchJSYmiBkSBBoIJJwIGgOhiCYFJSEnFyQjFwNZewABISAfFiYnCAEmCREIrwAIFhwVGwcaBAkPGApsQsAVFA0GBQMRbxBTKM0ODQwTEq192ClDgROkBHvYKuNJUu5CKCorX1RDKCkpUn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+cdaudio_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tNzmvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/MTCxLy6vDQyNOTm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAapQIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTLqUigWsuDwSmMxBQ9lwvoEBQpEoBBAWHRseHyBTAgMhCxgWIiMWFiASJCSHEgQSGQgjmwglGKCHBQUSICYWIyIWAwshIVMBIB8eFSQmCAEFCREIekIIFRsUGgcZEgkPFydrvxUUDg0GBSEREGJfv9AMEySsJxDYQ4DcEhh64UpS6lTs7QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+cdrom_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tOzOvNTqvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/LzKvMTCxDQyNASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAa0QIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTBqUiuUCVmAeiYzmsKlwOt/AAKFIFAIIFx4WHyAhUwIDIgsZFyMkFxchJSYmiBkSBBoIJJwIGgOhiCYFJSEnFyQjFwNZewABISAfFiYnCAEmCREIrwAIFhwVGwcaBAkPGApsQsAVFA0GBQMRbxBTKM0ODQwTEq192ClDgROkBHvYKuNJUu5CKCorX1RDKCkpUn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+cdrom_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tNzmvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/MTCxLy6vDQyNOTm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAapQIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTLqUigWsuDwSmMxBQ9lwvoEBQpEoBBAWHRseHyBTAgMhCxgWIiMWFiASJCSHEgQSGQgjmwglGKCHBQUSICYWIyIWAwshIVMBIB8eFSQmCAEFCREIekIIFRsUGgcZEgkPFydrvxUUDg0GBSEREGJfv9AMEySsJxDYQ4DcEhh64UpS6lTs7QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+cdwriter_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBFxaXISChERCBMTCxKSipAQCBMTCBPzCxPz+xPzerMT+xDQyNMTC/ASCBPyqXPz+BARCBAT+BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAWIICCKgWAGYyoKA+EWhGGogOAaB6Lr8ygUCYWCkEMoEovBSHZUFI8LGYloODJkhWijMbMdiAwBQEbYxmpExFlkgN3QrliXAcvNAuVt4coYKtQ9BlwLCQQFMAlVSmwEUX8IB1UJiQAObEE6BA9VEDMOEUsDDzoHkZ4LoCkyqyIOCxI9NCOfETJ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+cdwriter_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXISChERCBMTCxKSipAQCBMTCBPzCxPz+xPzerMT+xDQyNMTC/PyqXPz+BCH5BAEAAAAALAAAAAAQABAAAAR3EEgZhA0zSzGIL4RhaIDgGQeiquMkFImiECmiJMswibdS3wsRhWa4MUSFYKMxMh1oDAFARFiGSjTEVWIAnbCeUJMBSo0C1WXhyJgptC0Dc5EgFECJoo5LCL4RB0UJeRkGMSoEDkUPLYUDDioHgY0kIpYkmJkAfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+dvd_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tOzOvNTqvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/LzKvMTCxDQyNASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAa0QIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTBqUiuUCVmAeiYzmsKlwOt/AAKFIFAIIFx4WHyAhUwIDIgsZFyMkFxchJSYmiBkSBBoIJJwIGgOhiCYFJSEnFyQjFwNZewABISAfFiYnCAEmCREIrwAIFhwVGwcaBAkPGApsQsAVFA0GBQMRbxBTKM0ODQwTEq192ClDgROkBHvYKuNJUu5CKCorX1RDKCkpUn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+dvd_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tNzmvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/MTCxLy6vDQyNOTm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAapQIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTLqUigWsuDwSmMxBQ9lwvoEBQpEoBBAWHRseHyBTAgMhCxgWIiMWFiASJCSHEgQSGQgjmwglGKCHBQUSICYWIyIWAwshIVMBIB8eFSQmCAEFCREIekIIFRsUGgcZEgkPFydrvxUUDg0GBSEREGJfv9AMEySsJxDYQ4DcEhh64UpS6lTs7QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+hdd_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKROzSrOzKpOTGnLSafLySZKxuLMSOVPTWvPzixLSehNyibOzOrGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTOpHxOJKyKXFw+HKSipISChMTCxFxaXIRiPNSWXExOTOS2hLR+PLRyLPTWtMyOTASCBARCBPz+/DTSJIyKjIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwrA3HQ7scQAqFAcEQOUi0zAkFUSFYLghMBloUCDQNGxwdHhwHekcfICEhICIfIxkLJBABJUYCICABIhAOBiYnKJaXmH4CGSkYCCqkSAEfTKenrkOwsrQll0IrS7G5uwArLLaxLbXCLsTFLyDBKy4wZEVHvCwsRn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+hdd_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKRPTWtOzKpOTGnLSafLySZKxuLMSOVOzOrPzm1LSehNyibGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTWvHxOJKyKXFw+HPTOpKSipISChMTCxFxaXIRiPHxaNLRyLNSWXExOTPzixOS2hLR+PMyOTPz+/IyKjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaIQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwGgiD46FdDiCFwoDQAEe0TMkEQSFULIcLBloUCDIaDRscHRsNHhhHHyAhISAiHyMkJSYQASdGAiAgASIQKA0pKguXmJl+AiQGFwgrpUgBH0yoqK9DsbO1J5hbsrq8SrgstlJFHy0gwMVFR1J+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+memory-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChAQCBMTCxCH5BAEAAAAALAAAAAAQABAAAAI6hA+Bu+HCmgiiRuNoHZBRXQlc84TmcHzm2WVryE1YvMaZIdbVd2zw7lj4bDKGbxK8hHgX3K2JUDD8BQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+mo_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBKSipDQyNPz+/MTC/PzC/ISChASCBARCBMT+xAT+BAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEMgJQqCYBjFu1hxBeN82iCIJDgWaYhtntC4ZCzItdhWOD7mdwHLrAAczoKViIh6Vto5lcDjglppp9UpCTALULRaASGS5E4TCnB2rFyqJO5Gw+CMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mo_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipDQyNPz+/MTC/PzC/ISChCH5BAEAAAAALAAAAAAQABAAAANHCLoQwZAFMV6UlBB759Aahw0FGEITZZQmlwoqq1UNDA/xLDhvhQ8rnKPh4f2EropjcDjAhpJl8ylaBJhTaCelvRC7XqLXnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nfs_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBExKTGRmZPz+/ExOTMTCxAQCBDw6PCwqLIyCRHxyNCQiJOzmxMSybFxSHHRmLIx+NFROHERCRFxaXASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVWICCOZGmeaEoGKiCwwUAI5zsUBnAUQ0CLNhxLFEDwDAnFzTAsBRYJRsORSwUeDUiEWYtJIhFj7+eKCUdPHmxyNj0nFABXRam0RBSLvZW/VFN1FQYGfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nfs_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBExKTGRmZPz+/ExOTMTCxAQCBDw6PCwqLIyCRHxyNCQiJOzmxMSybFxSHHRmLIx+NFROHERCRFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVLICCOZGmeaEoGKiCwwUAI5zsUBnAUQ0CLNhxLFEDwDAnFzTAsBRYJRsORSwUeDUiEWYtJIhFj7+eKCUdPHmxyNj0nOa6q2qrbW/4QACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+printer1-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBFRWVPz+/Ly+vISChMTCxFxaXPT29DQyNJSSlHR2dERCRFRSVERGRBSmnExOTExKTAT+/NTW1MzOzMzKzMTGxLy6vLS2tGRiZFxeXOTm5IyKjISGhLSytKyqrGRmZNTS1Nze3Nza3Hx6fKSmpKSipAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaUQIBwSCwaA0ikkRgQDJCE5LFgOAicUKUwUCAgBuDE9RkFcL3ggbgQUCwYyIIA8VU32ASDwoEcIAoHCQkHbA8EBBARSX0DXQEPEgQCDYpJExQVAWCHBwcNDUkKChQWBBcYARkanaABExsbHB0FGB4fIKoHAWYhpCIBIyQLJSAJGbtbULUTISa4yEVJJSbO0EtmUkR+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+printer2-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBKSipAQCBPz+xPz+/MTCBISCBISChMTCxFxaXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMggqrwYVDGGzRLXEZ0HhgMpFIXxZZzRBsHxXquAUHqCCBgB6YcoFhNAXMWISCQOv6Dt6DMmQwQntHjwXTVL6mH83Ry31qBO8CSQSmVg2GM74aAVij2UTPojACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+scanner-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MT+/ASChARCRATCxMTCxFxaXKSipDQyNAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEMgJgqWBVivEldkUdKSXhVjZfenommglDERh3Tc4E4ZRHAGgkEPr9X6H5AHBERSMRyWzkug8jQXFEhWoOo8dRYxqLXSmGjIJnVaz29Q3fAP3RwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+tablet-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBMTC/Pz+/MTCxFxaXKSipAAAACH5BAEAAAAALAAAAAAQABAAAANECLrc/iosCUEQlEYdRp6dZ4lgKBBEp1kmmpLRMBQu6qWLEdYBn+81F0wnC8oCK+LAQDgGDIaG0vOMPnRIaEUBtW6//gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+zip_mount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BAQCBFxaXMTCxPz+/ASChPwCBKSipASCBARCBMT+xAT+BAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEMgJQqCYBiFs1lwwdF8VEsR4YVuXoirYFcWbkmY31wPqma2ZwReqBEODQutwEY04oeWqMniGOEzW4HAVZAEImVSCSLDGYIX5/EMoFtNSOWHxRwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+zip_unmount-16:devices devices16 16:photo:16 16:R0lGODlhEAAQAIIAAPz+BAQCBFxaXMTCxPz+/ASChPwCBKSipCH5BAEAAAAALAAAAAAQABAAAANICLoQwZAFIVyUNIx6WybE9kBTFYIiVhXFGXJetbYDaHnlathZk2eDQunw0GwomeGoMThmKETS4PAURCMlZccHXXYct60Y4E8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+blockdevice-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+xAT+BASCBMT+/ATCBAT+/ARCRPz+xARCBPz+BATCxISCBDQyNMTCBCH5BAEAAAAALAAAAAAQABAAAARhEMgZwrwYBCFsvhs3eF8wDMJAVBVmnupazKRmGDFxzMVBBjcDQXfYHRA/QmKpKBYRSMoysVgwGEeoJ1ClLhpXhlbiqJobjcA1Sn48qug06+JwP+I1UMCNzmcqaR8lghN+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+chardevice-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBMTCxISChPz+/MQCBPwCBAAAACH5BAEAAAAALAAAAAAQABAAAANCCBDcHkoFQasVUIrBe8fRNDwMAWojMTZmtmzByp6v7LQhTOLadbkxj3AUWZAcxcUgyYwQm8wYoOCCLgoGK5Nq9ScAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+desktop-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExKTDQyNHRydFRWVKyqpGxubExOTERCRLy6vFxaXBweHFRKPFxeXAQCBIyKjCwqLMS+tKyurDw+PNze3ERGPPTu5Pz+/Pz6/Nza3MzOzKSipISChOzq7NTW1Ly+vHx2ZOzm3Ix2XJx2XIyOjKyqrJSSlPTexPTixKR2VKxyPCQiJPTy9JSWlHRmTOzSrMzKzJyCbKR+XCwuLOTi5CQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQIBwKAwIiEjkgJBsAgoGwcE5RCQUgAWj0WwcHA8FRLhAcIcKhyIiMSwcwglc2ABTDA2Eo9KQoy0PFxgYGRobDxwBDHRgF44YHQ4bHgkfHBUMHQ8gFp2dISIjEQwfBwIkJR0mICcoJycpKgweCisAEAcPGSwtLi8vsQkNtkMrBxswCQ8uMTINY0kzBCQwNB/DVAArBC0NNdlDM9BDfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+file_broken-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXDQyNAQCBMTCxPz+/KSipPz+xPzerAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEEgQahVijMmD/oRAbBw1FCgaFFrppeo5didsZTSMDoRBSi/dgfUz6Va7HPIQGB6KnpW0EEB4Oshp5ZlTFRBfFs3ZLDihtTAYwZ14nGbzoS3JfO4ffwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+file_important-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBExGTKQqLPz+/KQqNAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLoQwZAFIV6Es15Jqd2ZtzXUMIhXZqJYaZ5aK7zwp6h0zc05i+c6Eg8oCnWOR0eHQGEKnEWHdDoF+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+file_locked-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXDQyNAQCBMTCxPz+/KSipPz+xISCBERCBAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEEgQahVijMmD/oRAbBw1FCgaFFrppeo5didsZTSMDoRBSi/dgfUz6Sq7XGp1CByKQZUUWjsgrtcENYXNUodWhAahVRa65G9hmGgnnpzMZ/7xRwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder_blue-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folder_blue_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOzi1Ozq7ERCRCwqLPz+/PT29Ozu7OTm5FRSVHRydIR+fISCfMTCvAQ6XARqnJSKfIx6XPz6/MzKxJTa9Mzq9JzO5PTy7OzizJSOhIyCdOTi5Dy65FTC7HS2zMzm7OTSvNTCnIRyVNza3Dw+PASq5BSGrFyqzMyyjMzOzAR+zBRejBxqnBx+rHRmTPTy9IyqvDRylFxaXNze3DRujAQ2VLSyrDQ2NNTW1NTS1AQ6VJyenGxqbMTGxLy6vGRiZKyurKyqrKSmpDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfCgACCAAECg4eIAAMEBQYCB4mHAQgJCgsLDAEGDQGIkw4PBQkJBYwQnRESEREIoRMUE6IVChYGERcYGaoRGhsbHBQdHgu2HyAhGSK6qxsjJCUmJwARKCkpKsjKqislLNIRLS4vLykw2MkRMRAGhDIJMzTiLzDXETUQ0gAGCgU2HjM35N3AkYMdAB0EbCjcwcPCDBguevjIR0jHDwgWLACBECRIBB8GJekQMiRIjhxEIlBMFOBADR9FIhiJ5OnAEQB+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder_cyan-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHNTKzOzq7ExGTCwqLERCRBSKjBRSVGxubKymrNTS1Hx2fCQiJMzq7NTy7IzKxHR2dFTW1Ey2rITKzNzy9JTSzBySlHRydKSipDTW1ByelGzCvIzOzByOjFRSVCy2rCSalGS+tJzSzBxudCR6hCSCjITGxMTm5Pz+/JSutDyChBxydCyOlITKxPz6/PTy9Nza3ISqrGSyrOzm7MzKzDQyNMzGzNze3OTi5MTCxNTO1Ly6vLSutGRiZKyurHRudDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe2gACCAAECg4eIAAMEBQYGB4mDCAkKCwwNjYUOAYcPEBESlBMMjAUFnIIPFBUWEBcYGQoaG5gGggMcHRUeFh+fGCCVIakiICMduiQWJa4fCKkdJicoCcjJKSrPAAIrBSwtLtMv1jDaCDEyMgUzNC3SKCA12gYFMjY2KzMzN98uLdo4cujYoa9BAx4IeSywJSgAjgU8evTIgdDHj4WJHAL54cPiDyAMIzkMsSGIkCGREAU4gAOAn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder_cyan_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFNze3Ozq7ERCRCwqLPz+/PT29Ozu7OTm5FRSVHRydIR+fIyCdMzGxAxOTBSGhIx6XJSKfMzKzERGRAxOVKTq5Mzy7KTW1Ozi1OzizEzSxGTWzHzCvNTq5OTSvNTCnIRyVNTS1BzKvCSalGy6tAQ6XMyyjMzOzDw+PByqtCR6fCyGjHRmTMS+vJSytDyChCyWlGReVOTi5AxGRKyurDQ2NNza3NTW1AxKTJyenGxqbMTCxMTGxLy6vLS2tLSurKyqrCwuLFxaXKSmpDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfEgACCAAECg4eIAAMEBQYCB4mHAQgJCgsLDAEGDQGIkw4PBQkJBZcQnRESEREIDwoPExSipBUWFxgZGhIXFwkbHBQToQQGFx0eHxoguhEXHCEiIyQGABclJiYnycsSKCkjKisAESwtLi7Y2soXLzDUAaMxMuYuM9kXNDDiAAYFBTU15NGTYeMGNQA4ahAgkEMHiQoxZrTYwWMfIRw9fKio8MMHECAReByUhIPGDSBBhAyJYDFRACJFeBi5cCSSpwM4APgJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+folder-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folder_green-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHNTK1Ozq7ExGTCwqLERCRByGRBROLGxubKymrNTS1Hx2fCQiJMzm1NTy3ITGnKSipFzShFSydIzKnMzq1Nzy5JzSrByKTBweHDzOdCSaTGy+jJTOrFRSVDSuZCySVMzq3IzKpBxuRCR+TCSCVGy6hPz+/JSunDyCXCSOTCyWVCyeVPz6/PTy9IyqlCSCTGSuhPTu9Ozm7Nza3Dx+VBxyRDQyNMzGzNze3OTi5MTGxMTCxLy6vLSutGRiZLSytDQuNKyqrHRudDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe+gACCAAECg4eIAAMEBQYGB4mDCAkKCwwNjYUOAYcPEBESlA4TjAUFnIIPFBUWFxgZGpWXjYIbHB0VHhKtER+UCyC1ISIdxbkSGSMYJAiCByIlJicaxbgoEhDNAAYpBSorJScnLC0uHRLaCC8wMAUNMeAnMgkz2gY0NDUFKTYNBDE3cKzQlkPHDh42djRo0KNhjwUGBgXIscAHgQY6fPz4AQRioolBhGwUIiRIxEiEhoCYQKSIEZSHAhzIAcBPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+folder_green_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFNze3Ozq7ERCRCwqLPz+/PTy9PT29FRSVHRydIR+fISCfOzu7OTm5OTi5MzGxAxOLByCRJSKfIRyVERGRKTmvNTu3KTWvOzi1OzizIx6XIyCdFTOfGzSjITClAxGJOTSvNTCnNTW1Dw+PAxKJCTCVCyWVGy2jAQ6XMyyjMzKzByuZCR+TCyGVNTm3HRmTLy6vJSypESCXGReVLSurDQ2NNTS1MzOzKSipGRiZMTGxMTCxJyanDQyNLSytKyqrCwuLDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfCgACCAAECg4eIAAMEBQYCB4mHAQgJCowLAQYMAYiTDQ4FCgoPEBESnBMUExMIoBUWFaEKBRIXExgZGqoTChscFR0epQYTHyAhGrkUIhMcIyQWJSYAJygpKSrIyissFi0GABMuLzAv19kaMRMyM+ABojQ15ObYEzYz0wAGBQUbBPHkYNQQcQMcABwEEhLIkUMHjRQvTuzIRwgHjx45evTwMWPGiR8GJQGxcWNGkBtCTlBMFGDIgh9CJhCJ1OkADgB+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder_grey-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLHx2fKyqrNTS1PTy9CQiJNza3OTi5GxubJSSlISChLSytFxWXDQuNKSipBweHISGhFxaXIR+hLSutFROVHR2dFRSVGReZKymrLy6vFxeXNTW1Pz+/KSepERGRPz6/PTu9Ozm7DQyNMzGzMTCxMTGxGxqbNTO1Ly2vHRydKyurHRudDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAawQIAQEBAMj0jAgFAwHBDJoUGASCgWDEMxETg2HA8FFaJgFgpdYSMiUYAnlErCsmgKL5iMJqJwPzYcCB0eahAZH4gSESAhYAoGQggiBh4eFB8iehEWI5AABiQFFpMeHCIiiCWeJicMDAUOEZMcHBkSngYMKCkpJA4OBCWTk0IqKw8PvwsLLCwtLBCeRCouLC8vK80wGzEHSQEqHxMhMBMyLtLfKh4WCjM0UUgBCCoAfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder_grey_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExOTBQWFNze3Ozq7ERGRCwqLPz+/PTy9Ozu7OTi5HRydIR+fISCfPT29Pz6/PTy7MTCxCwuLJSKfIx6XMzKzDQyNOzizJSOhIyCdOTm5Dw+PJSSlKSipLy+vOzi1OTSvNTCnIRyVNTW1GRiZFxaXAQ6XMyyjNTS1GRmZFxeXHRmTFRWVKSmpKyurMzOzGxqbMTGxLS2tJyenKyqrDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAauQIAQEBAMj0jAgFAwCA7JYwCRUCwWgoCBEUBOG47CAxJhSrqT5wERplQoC8ijYDEcJASJ4HKIYDAZFRoFGxwXHR4eH3lqICEiIyQcAAcMJSaIeHonKCMpkxMqAismKyuIixMsH5MBDw8eJS0mJpcdByYSkwAcEQUEBC4lo7UHL7sXwMAkKTAeogceu0QXMRIwFjISMxITNNNDARcmLx8zNTUH4F64NDUTNlHsk35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folder_home-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBDw6PBQWFCQiJAQCBFxeXMTCxJyanDwyLDQqLFRSVLSytJSSlISChCQmJERGRFRWVGxubKSmpJyenGRmZLy+vOzq7OTi5Ly6vGRiZPTy9Pz6/OTm5ExOTPT29BwaHNza3NS6tKx6XGQqBNy6pIyKjDwGBOzOvJSWlDQyNIRaLNRiBGwmBNyidLxWBHxGFNySXCwqLKyqrNR6LKxGBNTS1NTW1Jw+BEweDDQ2NAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaoQIBwCAgIiEjAgAAoGA6I5DBBUBgWjIZDqnwYGgVIoTGQQgyRiGRCgZCR1nTFcsFkHm9hBp2paDYbHAsZHW9eERkYGh4eGx4ag3gfSgMTIBshIiMkGyAlCCZTEpciJyQjGxcoKUQBEhcbKiQrLB4XEltDrhcaKi0utbcJra8bLzDAGrcxrTIXHi8zNCypEsO6EzU2IzQ3ONoTzK0BCAkDMQkIOTFlAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folder_html-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBERGRBQWFMzKzOzq7CwqLDw6NARqnAQ+XHR2dKyqrOTm5ExKTERCRHRydMTi7NTu9HS+1KSmpBweHDy67DyixHS61ITG3AxypByu7DxinBw+ZERmdIySjITC3ARypExOTDRurIR2RPTSdJyulEyGvBw+bFSyzJTK3LzKvPzivOTixNTChLSybGyCfCRSnBQqRASGtFyuzDw+PCRShPzy5OzerOTShKyaTEx6pCxerGRufBR+rOTezPTShNy6bER+1BxCfBQuRAxelFSixBw2VISq3GySrPTWlHyanIyitFSO3IymtCRujAxWhCRqlCQ6XGyWvNS2bFyGvDxuvCRSpLy+vMS+vGxqbFyO1GSi3EyO1FRaVCQuPLS2tDxyzKyWNFxaNCQyPGxubCxajERSVExKNJyenAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAECg4eIAAMEBQICBomDBwgJCgsEDA0BDg8BhwYQERKUDxOYDAyeghQVFhehGBmVlwwOqxobHB0eH6EfIAkPIYIiIyQlJhsnKBcpvrYiKissLS4vMDEyFjOvNAA1LDY3ODk6Oyc8PTIyFzQ1Jj42P0A6QTtCQ0REIEUORkdIkihZwsSekBhNnDyBciCKiSNSplDRUcWKkRhXCGDJYgiGli1cpuTocsILjytfFmRpACAGRTBhRogZgzHlAjKGWnIoY+bMgRgBDHRBo/LAIZoxuhwKatRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+folder_image-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPz+BAQCBExKTBQWFMzKzOTm5CwuLERCRARqnAQ+XHR2dKSmpHRydCQiJMTi7NTu9HS+1Dy67DyixITC3BR2pBweHByu7ASGtFSyzHS61AxypExOTBSazBRupJQOFBSCtDxKfKTa9AxelNz61MTaxDw+PPzGpLweHJTO3ESu3DRilFymXCxKRBRypBR+rDwCBNxmVORiRKQWFCyKvJTWhDSOPCRONFSixDQaHNROPNQ2JLRubHTC5DR6rHx6fFSqRCRyLGRmXGxqbIymtCRujAxWhMySjMQ2JMyqrKTW5ERijJSenFSGXGRmZLy+vMTGxMTCvERGRMxCNOzq7NTe5LSurISKhHR2fLy6vLS2tKyurGxubCwqLOSKfOzy9Nza3KSmrIyGjGxmZKyqrIRqZIyKjFxaXJyenDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAffgACCAAECg4eIAAMEBQICBomDBwgJCguMAoUMAYcNDg8QlAyXBaWcgg0REhCfExSVpIYAFRYXEhgZE60aCQwbghUcHRQXtri6DxMHgh4fICEiIyTFtxkOJQAeJicoKSojKywtLsUZJS8wMTIpMyA0NTYKIiIaNwc4OTo7PD0+P0BBhAwhUkTFAQNGjiBJomQJExsMmjh5AkVIFANQpEyhsqSKlStXmmDJomVLFC5Gunj5QiALmDAKxGSpMsYiAC5kqjhZUOaKmUdmzoAJgkaQgQYCmogJEmRQAC5pAPgJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+folder_important-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBExGTKQqLPz+/KQqNAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM7CLoQwZAFIV6Es15Jqd2ZtzXUMIhXZqJYaZ5aK7zwp6h0zc05i+c6Eg8oCnWOR0eHQGEKnEWHdDoF+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder_locked-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQSFMzKzOTm5CwuLERCRARqnAQ+XHR2dKSmpOzm5GxqbCQiJMTi7NTu9HS+1HRydOTm1Ozq7Dy67DyixHS61ITC3AxypERGRBweHByu7ASGtFyy1DSOtDRmfExOTBSazBR+rCwqLAxWhAxelByGtDSaxAwODHy+1Dw+PPT29IyqvCxujOzu7NTW1Nza3ExGJJyebKyqfMTCpFRSPOTi5DQqHOTezDw2NMTGxKyqhMTGrGxmXDQ2NMTCxMTGpHx6bHx2bBQWFIyOXDQuDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQICBomDBwgJCgsEDAKFDQGHDg8QEZQSlxMUDJ2CDhUWF6AYGZWXFBqCGxwdFh4XGK8fIAohtiIIIx25EZwBDREHgiQjJSYmGScoKSoRKQ8rggIsDC0uJS4oGygoAyjdAAcsLxQUMDEyMzQ1EzapBy8MDDc36tFwgONFjlQ6dgCEEZBHDx8+ctRIRehHAyAwZASZIGRIEBoUBwUwIGMCiwFEaBQJichIjo9FZLBsacRIAB0A/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folder_man-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFMzKzOzq5ERCRCwqLARqnAQ+XHR2dKSmpHRydCQiJMTi7NTu9HS+1KyqrMzOzOTi5Ozu5Dy67DyixHS61ITC3ARypOzq7ERGRFRWVJyanByu7ASGtFyy1Hy+1FRSVOzu7BSazBR+rFSyzJTK3Dw+PFxaXPTy7LSyrAxWhAxelLy6vMTGxNTS1Ly6tFyuzMS+vPz69NTW1MTCvIyOjPT29OTm5HRybFSixLy+tLS2tISGhGxubIymtCRujCRqlHx6fNza1GRiZMTCxGxqZLy+vFxeXLSytKyurGxqbISChFxeZDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAffgACCAAECg4eIAAMEBQYCB4mDBggJCguMBgEGDAGHDQ4PEJQKERITFBOdgg0VFhegGBmVlxobABwdHh8WIBchsLIKIiIjCyQZJR+7JhcnoBAoKSoqKywtLi8wMbsyrwYpGhowHTMqNCqkyR8XKBwTNTY3KjgFOTopLS0ZO98wPD0+JhR490MAkCAshHyTsCLCEAlEYEgoIsCIjRlHDNzy0UFBDBtIbBzZ4KJHBB0aAQhIoqCHESQ9dAjooWQJE1uCBBRpkoSDExEcUnRYwOTJIQECNmwQwEFQgANQAPgJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+folder_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOzi1Ozq7ERCRCwqLPz+/PT29Ozu7OTm5FRSVHRydIR+fISCfMTCvAQ6XARqnJSKfIx6XPz6/MzKxJTa9Mzq9JzO5PTy7OzizJSOhIyCdOTi5Dy65FTC7HS2zMzm7OTSvNTCnIRyVNza3Dw+PASq5BSGrFyqzMyyjMzOzAR+zBRejBxqnBx+rHRmTPTy9IyqvDRylFxaXNze3DRujAQ2VLSyrDQ2NNTW1NTS1AQ6VJyenGxqbMTGxLy6vGRiZKyurKyqrKSmpDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfCgACCAAECg4eIAAMEBQYCB4mHAQgJCgsLDAEGDQGIkw4PBQkJBYwQnRESEREIoRMUE6IVChYGERcYGaoRGhsbHBQdHgu2HyAhGSK6qxsjJCUmJwARKCkpKsjKqislLNIRLS4vLykw2MkRMRAGhDIJMzTiLzDXETUQ0gAGCgU2HjM35N3AkYMdAB0EbCjcwcPCDBguevjIR0jHDwgWLACBECRIBB8GJekQMiRIjhxEIlBMFOBADR9FIhiJ5OnAEQB+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder_orange-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHNTO1Ozq7ExGTDQuNERCRJxmDFw6DGxubKymrMzOzOzu7Hx2fCwqLOzaxPTm1NSyfKSipBweHOSmRMSKRNy2jJxuFFw+DKyqrOSeJKxqFMyaXNSyhNSufFRSVMSCJKRyHLRuFMSORNy6nPTezHxaFIxmFJxqDJxyHPz+/LyqjJR2NPz6/NTS1KyehIxqNJRmDLyWXPTu9PTy9Ozm7Nza3MzKzMzK1OTi5MTCxMTGxDQ2NMzGzLy+vLy2vKyurGRiZLSytLy6vFxaXHRudDw6PDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe/gACCAAECg4eIAAMEBQYGB4mDCAkKCwwNDgYBBg8BhxAREhOUDxSMBQWeghUWFxOhGBkaCxuMBqscHRceHyCwCbMhqyIZIx0kJR4gJicSIAiCECMoKSorKyS6yhHQAAYsBS0uKSkZHSsdHc+CCC8vqDAxMtQzJDTdBjU2NwUsODg5Wsxz0e2ADhw7/sEgwKOHwwW3BAXwsYAHARg/eAAJIgRiogAHhhApEoSIkCERI4E0QmHDESSREAWAkASAn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder_orange_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOTm5ERCRCwqLPz+/PTy9PTy7OTi5FRSVHRydISCfIR+fPT29Ozu7MTCxFw+BJxqBFQ+BJSOhIRyVMTGxPzSlPzmxOTGnOzizIx6XIyCdOyeLPSuTNSubOTSvNTCnNza3Dw+POSGBLRyDMyeXAQ6XMyyjMzKzMyWBKx6FJx2FHRmTLy+xDw6PLyqjJR2LJRyDFxaXOzq7JRuLEw2BKyurDQyNNze3NTW1NTS1MzOzJyenDQ2NGxqbLy6vJyanGRiZLS2tKyqrCwuLKSmpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfEgACCAAECg4eIAAMEBAUCBomHAQcICQoECwEFDAGIkw0OBA8PEIwRnRITFBIHDRAVFhWipBcFEhgZGhMSEg8bGxUcHQQKth4fIBoburwbISIWIyQAEiUmJicnyrooKRYqBdQrEywt1yfJGxQuLzCEozEyM+XnEjQv4QAFEDUKCjE2JrRoYeMGjmkAchAYoWPEDh49YrBQ5SMfoR9AXvRQcSFCkBcUhFgcFCDHEBxBiOAoQgFhpABGaPg4IiFHJE8GbPoJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+folder_red-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExKTBwWHMzKzOzm7ERCRExGTCwqLIw6FFQiDHx2fKyqrOzu7CQiJOzOxPTe1MySfKymrOzq7Nx2TLxmTNSelJQ+FMzOzNxiNKw+HMR6ZMyWhNSajHRydFRSVLxSLJRKJKRKJKQ+HNSWhNSmnHQ6FIRGHJRCHPz6/LSajIRONPTu9Nza3KyShLR6ZPz+/DQyNOTi5NTS1MTCxGxubGxqbMzGzLy6vLSytGRiZHRudDw6PAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAanQIAQEBAMj0jAgFAwHBDJoSGhWDAIDUHgsAgcHQ9IhLqQMAsTr9BBqUTClktVgmkYhIOMprLhdOBUHh9rICEiIyN8JCVwdwAOIiYnJyiHiRtvjgYpBSorJgknIpYRmikpLAUtLp+hIy+aLKkFMC0tGJ4mK44xBDKqLTMEBDTFNY5EMTY0MzM3NDg4OR7IQwExOjnROTk6B1FC1x8SEjs84EcBCDEAfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder_red_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOTi5OTm5CwqLPz+/PTy9Ozu7Nze3Ozq7HRydISCfPT29PTy7MTGxFQiDIw6FJSKfIx6XPz6/MzKzERGRNyypPTWzOzi1OzizIyCdDw+PNRuTNyCZMSSfOzW1OTSvNTCnIRyVNTS1ERCRMxGFJxGJIRKJLyCbAQ6XMyyjLRWFHRmTLy+xLSelIxWPEQeBGReVIxOJIRSPKyurDQyNNTW1JxOLEwiDKSipGRiZMTCxLy6vJyenLS2tCwuLFxaXKSmpDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe+gACCAAECg4eIAAMEBQICBomHAQcICQoLAoUMAYiTDQ0LDg4PCgQQnBESEREHoBMUEwUVDgsWFxEYGRiqEQ8aG68cBQQdER4fIBghu6saIiMkJSYAEScoKSrJyxIrLNEd1C0p1ygo2coRLi/gAaIwMSnx5SoyM+uCHQ8LChrv8TQ1ZNiYBuCGgoMKcJSwACNHCh07wAkK0IFHj4UQevjwEeGHREk3ZtjwAcSGjQgfEwUIIuTHEJSROhkgAsBPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+folder_sound-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFMzOzOTm5ERCRCwqLARqnAQ+XHR2dKyqrMzKzHRydCQiJMTi7NTu9HS61KSmpDy67DyexExSVITC3AxypBweHByu7FRiZDRiZHy+1ARypExaXBy2xGRqZFSyzJTK3AQ+RByqtASCtASGtFyuzDw+PATC1ByGlFxeXISGhJSWlFRWVAxmlBR2pBR+rAQ2PAS2xHS2vMTCxJyenLS2tCRujAxWhAxelFSixAQaHARibARudAR2hEySnPTy9Nza3GRiZNTS1IymtCRqlARWXDyCjPz6/MTGxLy+vMS+vGxqbAQiJARaZEx+hLy6vKyurERGRBQuNCw6PISanFxaXDw6PCQ2NDRGRDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfYgACCAAECg4eIAAMEBQYCB4mDBggJCgsMBQIBBg0Bhw4PEBGUDRKMBQWegg4TFBUVEBYXlZeNghgZGhsCFRyhFh0JDRWCAx4fGg0gCiERIqEcBoIjHyQeDcMlJhQnEQ8oANQpKissLS4vMDEmJhEoMjPxNDU2Ny44OTo6FzsGPD0+fgABEUTIECIMiuAzIk3GkR5IbgRJMoSAkiVKmDSRBsDJEyg1hBQYUqNGlBtSGkwZRGUDEyILWCxYcmPBgiYrB1WxEsBTgANXbCwYggVRFi2Ifm4B4CcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folder_tar-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFMzKzOTm5ERCRCwqLARqnAQ+XHR2dKSmpHRydCQiJMTi7NTu9Hy+1ARypDy67DyixHS61ITC3Ozq7BweHJySbJyWbAxypExOTPz21KyqjPz67OzmxFSyzJTK3LSujASGtDw+PKSehPz69Pz23OzitPTqvOzerKSaZBR2pBR+rKSefMy+dKyeTIR2NAxWhAxelFSixJyadOzirLyubLyqVJySPHRmJIymtCRujCRqlPTqzOzW5OzSzNzSrLyqXLSeTJSGNMTGxMS+vLy6vGxqbJSKZOzOxNzGtNzOhKSSRIR+LGReHLy+vKyurOTWlHxyJFxSFLS2tKyqrERGRHRuRNzKfNTGdGxeJGxiNFxaXJyenDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfcgACCAAECg4eIAAMEBQYCB4mDBggJCguMAgEGDAGHDQ4PEBEJDJcFp52CDRITFKAVo6UEFgaCFxgZGRgUFa8apBsAuhwdHh+5IBQhrwYZIh3PHdAdGSMTyQ4kJR4mJycdKCkqKywtIyMUJC4cKR7EKC8wMTIzMxE0BjUmJjY2NzgwcuggsIOHjB7NfPwAEkTIkBxEdBQxUuQIEgNJgihZwgRGEyJOnhyBciTKxSRSpDBh0iRGjClUjlSJYgXJFQBYbmTREmOLDi4BDnTxsgDJl0E5uXBBFBQMAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+folder_txt-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAMR6RPwCBAQCBExKTPzGjBQWFMzOzOTm5ERCRCwqLPyGBPzKjARqnAQ+XHR2dKSmpMzKzHRydPyGDNTu9Hy+1OR2BNSOXHS+1MTi7ITC3AxypOzq7KRKBPyCDOySZPzizPTWxFSyzHS61ITG3FROTCQSBMxmJNRyROy2lOy2nASGtDyixJTK3FxGNIRWLMR+XPzStPTKrBRupBR+tFyuzDw+PDQuJIRSNAxWhAxmnBR2pBR+rPT29FxaVEw6LKRuVIx6ZISitCRujAxelAxmlFSixOzu7JyWjBwaFKSShNTW1MTGxDQ2NMTCxNze3Nza3HRqXMS+vGxubGRiZLSytCwuLERGRJyenGxqbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAfLgAABgwIDg4eIAQSCBQYHCAMJiYMKCwAMDQ4PEAcDAggRApQSlhMUmJqOBweiFQoKBBYXGBMZGpkPBhsIHBUdHh8gISIjtCOoJCUcJicoHykqK8MstBQIASUtLi8wMTIzKtE0Ihg1gwg2Ny8xKDg5OjvhItcBCDw9Pj9AQUI4Q0QMipirZ2TDERJIkihZwg+HEHpMmjg58OQIFANLomSUQi+AACZTohiAkDEKFSocJwmoMoWKSSoPpFiZdEhAgh5XHmBhQjORTZ5+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder_video-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExOTBQWFMzKzOTm5ERCRCwqLARqnAQ+XHR2dKSmpHRydCQiJMTi7NTu9Hy+1Hx6dJyenLy6vIyOjDy67DyixHS61ITC3ARypOzq7ERGRFxaPKyqrBweHByu7ASGtFSyzITG3KSOPKyurBSazBR+rJTK3HS+1Hx6ZNzObAxWhAxelAxmlBRupBR+tFyuzDw+POzibNzOZIyqvCRujLyiPJyCPJSWlNTS1ISitFSixHxiFGxeJFxWLExKNCRqlDw2BFROHHxqPMSqVISChMzOzGxqZISCbLSaRKSWTFxWPNzGZNTCZLy+vLSytGxubJSSfGRiTMyyVLymTLyiRMSqTEQ+JGxqbNS+XNzKZOTWbLy2ZFxaXDw6PIyGbOzidOzifMy6XCwmFGxmXDw6LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfigACCAAECg4eIAAMEBQYCB4mDBggJCguMAgEGDAGHDQ4PEJQREowFBZ0TFA0VFhegGBkJEZcaGxwdHh8gFiEXGKAiowIjHCQlCCYgvL4noCgGKSoGCyssLS4vyxYwrzEyM9MSNDUrK9jKIBcGNiMjNwY4Gjk65dcIOwY8PT0+PwYUAuTIQaDeCiAGgggZMoQDEQNFchghMIHiEQNIkihZwoRJkx8RCDhxMuEJFAMGokiZQoRKFStXjpQk0QHLBgDRrEzJomULlwFHukhYgMWLIANfwIAJw+WKmDFkAjQoA8BPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+folder_violet-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLHQWhEQOVHR2dKyqrNTS1PTy9Hx2fCQiJOTK7OzW9LyKzGxubLRW1JxOtLyCzMSS1HwijKSipLQ61HwinKxuvHQajFRSVJQytIQqlKRqvMSe1GQebHQihLSCxNzG5Pz+/KyStHQ6hPz6/PTu9Nza3KSGrJxmrOzm7MzOzDw6PDQyNOTi5MzGzMTCxGxqbLy6vLSytHRudGRiZLy2vDQuNFxaXDQ6NCH5BAEAAAAALAAAAAAQABAAAAaoQIAQEBAMj0jAgFAwHBDJoSGhWDAaDkPxEThCIpIJlcJgFgpdIaRiuYAxGcVD02gKBxuOpXPBvD1VH2ogISEceiIXI2ATBmohJAklGYaIJieOAAIoBSkqJCUlHJUmmQYrDiwFLS6foRwvpqkwMCstDTGtJCoyQjMELTQttw01Nsc3B0MBMxQ2DSfGNjg5OplHzDs5ODw5DMlRQgE9PhoMOjPh2BA/AH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folder_violet_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOTi5OTm5CwqLPz+/PTy7Ozu7HRydISCfPT29Ozq7Nze3MTGxEQOTGwahDwKRJSKfIx6XOzi1Pz6/MTKxNSi5OTS7Mym1OzizJSOhIyCdDw+PKxSzLRq1LSCxOTSvNTCnIRyVNTW1JwixHwqlKRutOTS5AQ6XMyyjNTS1JwerHQmfIQylHRmTLzCvKyWtHRChHwuhFxaXERCRHQ+fLSytDQ2NKSmpGxqbLy6vDwOTJyenDQyNKyqrCwuLDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQICBomHAQcICYwChQoBiJMLCwUMBw0NDg+bEBESEAcLDRMUExUMFggXAhAYGRoREBAIGxscFB0EBB4QHyAhGrq8EBsiIyQlHgAQJicnKMspuyorJCzVEi0uLy7Z2xopEDAx1QEMDDIzLjTZ2hI174I2CQ0EHMi4ge7EDQk4qgHI4aChAxYsLsg4J0GHQkI5dsSIeCFGDB49fFwcFOBHDRw8cOAAAmEkpyA1fOjoISQSJwPV/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folder_wordprocessing-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExOTBQSFMzKzOTm5ERCRDQuLARqnAQ+XHRydKSmpExKTCQiHMTi7NTu9HS+1HR2dCQiJDy67DyixHS61ITC3AxypKyqrBweHGxqbGRmZFxaXFRSVERGRPz+/ITG3JyalOze1PTm3Ozi1PTm1Hx2bJTK3IyOjPTy9CQqJFyuzDw+PNTGnDQyNPTq3Ozq7MS2hASGtKyaXCwqHBwaHFxWTKyahLSijKyehHRmXHRqNFSixHxyNAwKDERCPAQGBCwqLIymtCRujAxWhCRqlMS+vMTGxIyCVJSSfLy6vLS2tLSytGxubCwqJExGJEQ+JBQWFJyanDw6NDQ2NBQaFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfUgACCAAECg4eIAAMEBQIGB4mDBggJCguMDAEGCgGHDQ4PEJQRlwWmnYISExQVoBYXCREYjAaCGREaGxwdHh8PIJQKhgAhIiMkJSQkJhUnrrUGKCkf1B8pGyoUK60sLSouIS8vMCUhBw0xMjIVBjM0NTY3ODk5Og0NOwgXPCw9AD4BBvwwMABIgCBChhApUqtBhgw1INaIWMPIESMaGiIRsbFjkhpKlmDQYKgGx5MdDyxhgqFJLSdPoMiU+YRGFA5SRk4RRCWDix9TnFRxISiAE6J+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder_yellow-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ExGTCwqLERCRJSSDFxWDGxubKyqrNTS1Hx2fCQiJOzqzPTy1NTKfHRydOTWTMSyTNTKjNzOjJyWFHR2dKymrOTaLKyaFLyyRMS6ZFRSVLy2JKSeHNTOnNTKhHR2FISGHIyKHKyeFOzmxPz+/LS2lIyCNJSWJMzKfPz6/PTy9Nze3KyqhLS2XPTu9Ozm7Nza3MzK1LSyjIyONDQyNOTi5NTO1MTGxMTCxMzGzLy6vLSutGRiZLy2vKyurKSipAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe0gACCAAECg4eIAAMEBQYGB4mDCAkKCwwNjYUOAYcPEBESlBMMjAUFnIIPFBUWnxcYChkajAaCAxscHR4SrREWlBkfqSAYIRy5uyKfIwipISQlJhgnx7oSKM0ABikFKivQCSwn1C3ZCC4vLwUwMd/RGDLZBjPqNCk1NTY33zjZOQQ1dOBrsIMHjx49FtQSFCDHgh47GvhA+AOIwkQNgwARUnHIxUiEcnwgwmBBDpCHAjw46ScQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folder_yellow_open-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFNze3Ozq7ERCRCwqLPz+/PTy9PT29FRSVHRydIR+fISCfOzu7OTm5MTCxFRWBIyOFFRSBJSKfIRyVOzqnPTuzNzapOzi1OzizIx6XIyCdNzORNzSZMTCfOzqzOTSvNTCnNTW1NTGFKSaHLy6ZAQ6XMyyjMzKzDw+PLS+DHyGHIySJHRmTLy+xLS2lIyKPISGJGReVOTi5ISGNExKBKyqrDQyNNza3NTS1JyeJKSipGxqbMzOzLS2tJyanKyurLy6vKyutCwuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYCB4mHAQgJCowLAQYMAYiTDQ4FCgoPEBARnBITFBIIoBUWFaEKBREGFBcYGaoUChobFRwdBRAGEh4fIBkhuqsbIiMWJAYAFCUmJifJG7ooKRYqK9QsLS4T19kZGxIvMNMBojEyMy4u5xQ0EeEABgUFBDUxbJBzYeMGjmkAchBYqGPHjggxeMy40UMfoRw+IvxQoSICEBgUgiCUlIOGkCFAiOCgYDFRgCILgqxsGYnQgRwA/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+ftp-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3LSyrJyanPz+/Ozq7GxqbDxinBw+ZERmdIySjHRydMzOzPT29CwuNDRurIR2RPTSdJyulEyGvBw+bLzCxIyKhGxubERCRLzKvPzivPTmxNTChLSybGyCfCRSnBQqPLy6vLy2rCRShOTixPzy5OzerOTShLyaVEx6nCxerGRyhOTi3OzaxPTShNy6bEx6rER6zDRitBxCfPTq3LyulBw2VISq3GySrPTWlHyanIyitFSO3PTm1Ozi1LyqjDQyNCQ6XHSq3GyWvDxuvCRSpLSqpOzezAQCBCxGZCRKZExGLDQuHAwaLBQWHKymnOzexARCBJzOnGy2bDyePCxKJOzWvLymhAx6DAyGDDROLOTOpHRmVLyidLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfRgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFkZMICQoLlwwNDgQPghAREhMUCBUWBRcMGBmnEBobHB0eHyAhIg4CIxenJCUmJygpKisVLAIGLSMPJBQuJi8wMTIzNCEWJjU2Dzc4OTo7PD0yK94DPj9AQUIUQ0QwFDFFRjchRz5IbARJEkLJkiVMmDRx8uQBlCgbgDyQMmUKlYpTqlSsYsXFFSwTK2bRMmWkyCxbuICkmKVlySwvpXTh4mWilJs4c3bB8uXLqUEBHggdSvSBn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+link-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBFxaXPz+/AQCBKSipAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMgCLrc/jDKSau9OL/AuwxCKAzfOIwlcZIRKLJQMMyz5CcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+network-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBISChPz+/Nza3ARaZESanCyKlARudARGTLy+vNzq7ARmbMTCxARufAROVMzOzKSipARyfOzq7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVmICAGZFmKQiACweCSBImq41AYB5IodLq2hwWO0ejRWDac48Gb/QKNqNRoqspmrVcAUuIJBANS8sBIFCORUgooPEh4J8B67NgdsVBp9C5XWfl9LRMTCyReX19hARNojWlWLH+AAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+pipe-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBISChMTCxPz+/ARCBFxaXASChCH5BAEAAAAALAAAAAAQABAAAAM2CLoazpAFIV6UYZB6Yd5BtwRbEYqkYIqAQRir6KpnN8cdCddXivcbAy+S2qEOAuPx8MtZRP4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+shredder-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBERCBAQCBMTCBPz+xFxaXPz+/AQChISCBISC/DQyNPz+BARCRAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARcEMgZhBUzgzuIH4G2FYThnZUlCab5Ed0hC6nZ3Yh8JIKyLjCYboeZKIK6BDHTGwyViopEoWAkdwfqoKhIKLFUwXY79coUtLG4CFAcOOstWyNWyEXMO57p2/vxfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+socket-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+xMTCBFxaXKSipDQyNPz+/MTCxISChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARKEMgZpr1SjFqx1QHoTaA4AuV2EmmHEUUxsKoHB7FMGPbhI7gCgnchII6+AyJBtBhjx0KC2TsIp9QXcpm1HafNEQF8mhAOCdfEHwEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+trashcan_empty-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBKSipERCBARCRPz+/MTCxISChFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARREEgZapiYWjGIvVNQjEZ5BKUAApVgjEWJzCtAnIGgC8eZ5bre7ICosQQFVY9Y/CGVwiYmlwwsac7qVRp6WqNGKpQZ9m7DojH2t+lVMtMP3B8BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+trashcan_full-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/Pz+xATCxMTCxMTCBKSipPyqXISCBFxaXISChAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARbEIAQJJU4BzEoIdSFbcNQnIVhBJ02GAeFIGxZjUl8KoHRagfeYqgo3kaxQOEwXPAyk4Mgtgg6jxYp1foETgPEKzSgBXOx0W9VIfZu2d3R5t3WhA5BEdQSQgP8EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+www-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3LSyrJyanPz+/Ozq7GxqbDxinBw+ZERmdIySjHRydMzOzPT29CwuNDRurIR2RPTSdJyulEyGvBw+bLzCxIyKhGxubERCPLzKvPzivOTixNTChLSybGyCfCRSnBQqPLy6vOTi3Ly2rCRShPzy5OzerLyaVEx6nCxerGRyhOTezPTShNy6bEx6rER6zDRitBxCfPTu5PTq3LyqjBw2VISq3GySrPTWlHyanIyitFSO3LSqpPTm1DQyNCQ6XHSq3GyWvDxuvCRSpKyurOzizAQCBCxGZCRKZExGLDQuHAwaLBQWHKymnPTmxOzaxHx+fMTCvOzWvLymhHRmVExGPOTOpExOTERCRLyedBwaHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfWgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFkZMICQoLlwwNDgQPghAREhMUCBUWBRcMGBmnEBobHB0eHyAhIg4jJBenJRwmJxIoKSoVKwIGwg8lFCwmLS4vMDEyIRYzNDUPNjc4OTo7PDAq3T0+Pj0/QBRBQi4UL0NENiFFPkbijoRAkiSJEiVLmDR54OQJFHEPREQRIWWihYlRMkCZQuXBgyIBihSpIjLAowBWroj7gaUIlpYvXWLJUuWKlgdbHvz44XHnzgdVami5qUinR50/efoJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+zip-16:filesystems filesystems16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBIQChPzC/AQCBMQCxAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMeCBCh/i+IAesShNo4+v5gKI5kaZ7oxzCilLVvq/kJACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+cal1day-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANOCLrMEUDIOUS9AFLLhx8LIRZjKYZmMRCkaChFLHty/AIiS3y6q+QtT49wq8VotRtQJGwRf6Zmrlj7DJLQXsupTJmeEIN4TB5nII20wp8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+cal5days-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANMCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiIdMmcec7jy53q81qP9OO5VMAj8RXTFWzOZW95HDLdEEM4LA4nIE0zgp/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+cal7days-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANPCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiwcp0fucsj873qvGMv5Jw2FIACUsW4WakGW1O046I05qmGYBhTC6TM5CGWuFPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+calappointment-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxPz+BISCBISChKSipAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARbEMhJaQhA6D1E/wDGeeRgDhOhFoTBEi+REgdrIHScSEVvAD9Xr7cDqGSGpFEnQSqTv2NxCFQOiU1VEAiTZmstHFg1vQKuw+LxxfYaV/AuOQRI2O/4ewhT6Uv8EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+calbell-16:korganizer korganizer16 16:photo:16 16:R0lGODlhDwAOAIIAAPwCBISCBPz+BIQCBMTCxISChPz+/AQCBCH5BAEAAAAALAAAAAAPAA4AAAM+CLrR+zCIAWsgLVRGRBhOVQiG94WPVAbHaZHYAWqRYLbge88RsbInGuBCEhRYrZYm4xk4nYdoKzKIbiKHawIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+callist-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/KSipPzerMRaBEQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARDEMhJaQhA6D1E/wDGeeRgDhOhruyatjBRSIRxxOsMEAdC0BUZDcfSEYvDo3Bn++2Cxt7RqFxWhZiCdsvdhjCVsMQfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+calmonth-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANSCLrMEUDIOUS9AFLLhx8LIRZjKYbiRxLFIBpK0Q6z7MkwkJIe8b0KEeuWchFysuStVsjtfMbeMQitWpG25YfmNK1WU53XNIUYzug0OgNpuBX+BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+caltoday-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxKSipPyCBMRaBPyqXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARTEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyIQhFfiBIAfuFzaAioBIJBCummRYPCaDPh3vhwsOZdihNfa8Ub/AJXemFZPPNBvGwG672yFMZS7xRwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+caltodo-16:korganizer korganizer16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBAT+BAQC/AQCjPz+/MTCxPzCxKSipPwCBMQCBIQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARaEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyMYhFXiuFwZiA6qZYbbqJX5BIw2RAPxwAAWCyWMCCsiXFGEEErKz6LQZfOqiTR1YJiGq1rFyyHmo2+/1EKbCl/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+adjustcol-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBGRiZAQCBPz+/CH5BAEAAAAALAAAAAAQABAAAAI7hI8JAWL+IgvwUSSY2Lz7VTXXkS2NdJ6TwiSaB3PNQNdCbc/4cO9OjwPmhDQiTxfcHY1MpE35g0IB/gIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+adjustrow-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBGRiZAQCBPz+/CH5BAEAAAAALAAAAAAQABAAAAI5hI8JEcItooxG1oEzBoJ7oWlHd4VbNZpbx3LqUFGuajTPhI8kSLfsO0rRUCXT5wPkyHhGhsOJs/gLACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+black_sum-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIdhI+py60BY2QwhVYdytpw/WFXF1LjcW6S1LVu6xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+border_all-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAIjhI+pq+FuHjwyRInqfRkDTXkgQ5YLOH6it00pyqqcPJk26RcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+border_bottom-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAInRIynGe0PFTQz2kdxzHf72iSiRDpc2F1niaafBroYQNe2fdx6HfgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+border_fall-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAIrRIyneRYP4wPUKWmr3E5b+DVh9GkYuFALiqnsJp6nObYZB5ow2a3Jvwv6CwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+border_horizontal-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAImRIynGe0PFTQz2kdxzHf7CoTiSB7kKUpa1Vlc86rtSjvxnOSL4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+border_inside-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAIrRIygxxYPF4zzyenqxfVk2m0g9lnKiabqqoYl43YwGcqiFWv22zRnD/AXAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+border_left-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAInBHKJmxYPY3TyVCozsjMbrk3gM27KyZDlioVQS3qwO7Nl6KC6q/kFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+border_outline-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAIrhI8ZybgQYoTy2YqtwVTunVVfN3HQsaTnc5Kp2Ibw5Zm0PHJ2w7O8I5P5CwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+border_remove-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAIjRIynGe0PFTQz2kdxzHf72iSiRDpc2F1niaafBrraSMuQXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+border_right-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAInRIynaOEPH5hRRVrzbJBLn32g1TXJuWBdpYYiy47hBl+yRqH6HfoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+border_top-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAImhI8ZyRgPo3xgVnmnprbvnUEhx1XmgpLRmH7e+rowFssleuaBXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+border_up-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAItRIynwOEPH0vRuGkjnFKjpmgX2FVkuBwNhapZKZ3VyMKcGJPv5eJmAkz5RP4CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+border_vertical-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAAQCBPwCBCH5BAEAAAEALAAAAAAQABAAAAIrRIygxxYPF4zzyenqxfVk2m0g9llmsiCmVjJh65Jh59GtGMuzqqQNDQz4CwAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+cell_edit-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAIshI+pm+EPnwmi2msDoLgLzQWDV4HlSJof6qki+W0nrMKlbN9bxGvMDwwG/QUAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+cell_layout-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+/PzerMTCxPyqXHx+fAAAACH5BAEAAAAALAAAAAAQABAAAANCCLrc/i3ISacKIuutA8ACxWUeJg0DqBHhd6ZiRpQBag9F2n13FRis0q1QUAmCvFuKRTAYWhIi0bhz+SqQrHbL9ScAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+chart-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAQCxAQC/AT+/MTC/Pz+BAAAACH5BAEAAAAALAAAAAAQABAAAANMCLocHiyuIASU6lE7Xx7DdgEBQVwBKE4mqlZjeT4vl7VFkYZUjOuGkMFiuJ1yKUNAWTQGkEKDknUESpdXkkYjnWIWzOVX0SyPJwx/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+comment-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+BPz+/Hx+BAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM5CLrc/i3ISacKYuStuwhAMBATKRHkAGJeu60qagqmuHK4B6Pn3N0u147Ha8FyOVCowlRCntAo1J8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+deletecell-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPz+/PwCBMQCBISChAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANICLrc/i3ISacKIuutA8BcKAwfNwwmQYDZoJ6tWrBZoRKuXIb2XRS7UG4wC25yOIGHFvu9PJ8KcRbQOVzAheoxbRCyDOKj4E8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+delete_table-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPz+/PwCBMQCBISChAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANPCLHcDDCIOSUVAaqLeY5O+G2XRQVDdA0DNxCEwrwEu9AFORVw3ee6Cu8HFKFgA2AQQ6uNTJNXYZgCNZKFBay4IhQuMBUFW/LKZlkHoOBPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+dissociatecell-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAASC/AQCBPz+/PwCBCH5BAEAAAAALAAAAAAQABAAAAI0hI+pm+EPoQlC0GqxnfV2HUzR6HDWgA5Bqppr+qIhcMUqO5Oki+M87KN1ejCRTsJIKhP+AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+first_letter_upper-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIohI+py72RIJOHRmBt3QaGz2GVBGJfKW4aiXhX2sHxbKKneDv6zht+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fontsizedown-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAInhI+pELHqmIkQNZrwfXYvzE1fBUrWoZniOjWdp0agjLL2i7rhDvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+fontsizeup-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pEeoNIFyIzXStw3q/T4VVhJHHlDGjgZ6n1bLyCrqPyuJe4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+funct-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+py60R3IkRVHQzo9BwD1qhqGneRU4gSqlVJ8Zy0mKPhOe6XwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+insertcell-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBPz+/Pz+BATCBAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAM7CLoa/k7IKQCEdNobc+UOMCijCD5jGjAMOowrIc/Wm77ATIe2leuETcrEYpSOJ88HpNxwmqdi40Tl+BMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+inserttable-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAIuRI6JwCH/HBSBmUlxbarvO0nQJ0aa5XWodjZsiKbJGrbgaMuzW8M87jPoDgx/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+lower-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIqhI+pELHqmIkQNZrwfXYvzE0QKGniQWmNhbYSeqXn6zJOBJLTuuuh4i8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mergecell-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ATCBCH5BAEAAAAALAAAAAAQABAAAAIyhI+pm+EPoQlC0GqxnfV2HUzR6HDWgKZpCFyBCrMurMoPvZovPsgd39MBbaQI44hU+AsAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+money-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPz+BPwCBASCBATCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM+CLrcHMHJIEaUD16sqIUcQAne5pQaBglkZS6lxb6dRoIAQTzuphcFXWeW0xl/utIPGDQOSUdnA7IUhoocfwIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+oscilloscope-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBOTm5Hx+fLy+vAQCfAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANKCLrcGjDK+IS9494AgrbEJ3CeUBRWpp2daaHhhZKuq75jh8pxTRaEQbAgFAIHv1VvR/vsdrnSCmdpagYnjfXS27Q+N29nQuYA/AkAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+percent-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIkhI+py70RUHxxQmosu6BOdWkNR35PVm1etqEsaKXnwTn2DfgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+precminus-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAIthH8RiJvrmHogVoXNtFRDpjUf6JWkeUoXlpGBAMfC+cowbd+uwL54/rMFZf4CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+precplus-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAQABAAAAI2hG8Rp4y9IGgszqhyspLueYHih43hiX7Iui5XprGTQNeCPNNBje86L9vBdr2a7xY0AllHm78AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+removecell-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAAQCBASC/Pz+/PwCBCH5BAEAAAEALAAAAAAQABAAAAI5hG+hq+IvAGPwydlqxAohvnjHMChkR6YDcKaougZqCMdyGYqSG+jXKQtoNkGTUHPBDJMTH+jJ8RcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+removecomment-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/AQCBPz+BPz+/Hx+BPwCBMQCBISChCH5BAEAAAAALAAAAAAQABAAAANVCLrc/i3ISacKYuStuwhAMBATKRHkUIScUBSeahhigBbzK+HGgXmHmYHXC41MqKDwcGDFMryCz4gi3YQwkKiFY+ZAoYrUF5g1HV3G7DFuFBvSx8GfAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+resizecol-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBFxaXAQCBDQyNPz+/AAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMyCLrcG0A4CZ90saohuv+XEgxYxkDhQp2lyIBwKhB0bct2TuB6zfe7F5D26xV1x9zFnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+resizerow-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBFxaXAQCBPz+/CH5BAEAAAAALAAAAAAQABAAAAIyhI+pmxHinph0GnqH3hoIDwocd3zZ2F0lmoInWq5s/I60xw5hmF8WPnNAhJUK44hM+AsAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+series-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBGRiZAAAACH5BAEAAAAALAAAAAAQABAAAAIjhI+py+0fUGRhGrswVtr1FgiGsGlhZVWAuarr9byyB8f24hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+sort_decrease-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BPwCBAQCBAQC/FxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM5CBDM+uKp8KiMsmaAs82dtnGeCHnNp4TjNQ4jq8CbDNOroIe3ROyEx2A4vOgkOBzgFxQ6Xa0owJ8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+sort_incr-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BAQC/AQCBPwCBFxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM4CAqxLm61CGBs81FMrQxgpnhKJlaXFJHUGg0w7DrDUmvtPQo8qyuEHoHW6hEVv+DQFvuhWtCFPwEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+special_paste-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+xPz+BNTS1MzGLMRaBMzOzPz+rPyqXPz+/MzGNDQyNKSipAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARoEMgJQhBySGx7IEQwFKMWGKgRHNZRIAJSVAm6usIwCEo+BDWVJ/CKzYAplWJZItGSgSVPZBEgU9EFQyGyWoK25XJ4DTO2iob6CxVLe2ys4rw9e8HKd8ybVJ7ndgEVQz09e1YUEmQefhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+strike_out-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBGRiZAAAACH5BAEAAAAALAAAAAAQABAAAAIghI+py+0BgwOS1gXnuS/b6ClCpCUcclJMmKIGWcby5BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text_bottom-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIVhI+py+0Po5y0hYtzrkB7zH0fN/kFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+text_center-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsnRkqtDnhu1zHfFSpjaY4PavgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+text_left-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsgRoqr3Vnt102fFSJjUC6nlPoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+text_middle-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIXhI+py+0PT5i01pisphjt3UmfFZYm5hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text_multirow-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsg2kfZvblXbwTg10WlA4rjyvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+text_right-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+pm+EPIZstSrqsDhhv1ylfFE5jiYwX6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text_top-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIWhI9pwe2uYnq0yQtqxbz7D4biSIZ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+upper-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pEeoNIFyIzXStw3q/dR2hhEVcJqamuq6Z9brlNtKMeHuKXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+vertical_text-16:kspread kspread16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIihI+pFrHqQHynTRrvyxQ12YWQWJGMpC0f2E1psr4eaj5+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+applix-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFRSVFxaXFxeXNze3Ly2rJyanOTi3Pz+/Ozq7HRydFxaVISGhGxubMzOzDQuLExKTCwqLIyKjGxqbERCRCwuLJSSlOTi5BQSFPT29IyKhDQyNISChDw6PBweHMS6pPz69Pz29PTq3Ozm3MSynMTGxAwKDPTu5Ozi1LyulExOTCQiJPTm1OzezLyqlLSyrDw2NOTazOzizOzaxLyqjKSipBwaHOTStLymhLymfGRmXNzKtOTOpLyidMTCtMS+rCH5BAEAAAAALAAAAAAQABAAAAa9QIAQEBAMikfjcCkgOJ2FgCGwFAYOiCwioUAYFtUrgtFFNBzeB5OAgESyEsWEUjFYAJYJ4hLBoDMHBRobAAaGehwdHnoZCQcfEUKHCBQBAxsgISIjJIRCeSUmHAYmJSInKCmRkgYqGw4ZKxMiLC0unoUvFBQQMBQRMTIzNBVDFjUrGwO9Nh8zNzi4BhM2LyIvGhgLNzc5akM6DsEyMjsfPDw9uAALPj4/HyQ0ND31q0ICFRv6FTAb/xE2+AkCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+binary2-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRSVFxaXFxeXFRWVNze3Ly2tJyalHR2dISCfLSyrPTy9Pz+/Ozq7GxubJyanKSmpMTCxMzKzLy6vNTS1JSSlCwuLLy6tMzGxOTi3KSipKyurHx6fOTi5IyKjGxqbERGRDQyNMzOzOzu7GxmZIyKhHRydLS2tNTW1ERCROzm5MS6pIyOjDw+PPTu5PTq3LSqnOTazOzi1GRmZJSWlCQeHPTm1OzizLyqjISGhExOTGxqZDw6PNzSxOzaxGRiZExKTCQiHEQ+NLyulOzavOzWvLymhHRybLyypNTGtOTOpOzexLyidMTCtMS+rMSynLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfqgACCAAECAwQCiIiDjAIFj48GAgcBjIIICQoLDAwNDgwPA4MIBhAREgkTmw4UDBUWAxcYFAUZGggbHB0eDh8gIQkiHSMeFRoUDyQRIxkGJRYmFScTKCcHCCkgJyoNGSsWHCwKCCgIASAgLQoZLi8wISUbEyQUJAEDKQEKMS8yMBYeZmCgMcEcghog9tm4gSNEjgEPdEDYEQJEDR4aetzwgcPCjw8VfiAAwqNFECFDehApYiSEoCMQBVjQkQBJkpVKjFhgNGBGzSRLVhZRwsTloAFNmjhZ8WQIDiZQoOwcFMCCVQshrmYN4ScQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+binary-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz69HRydMzOzDQyNIyKhERCRPT29GxubPTy7Pzy7PTu5Ozm3LyulPTq3Ozi1OzezLyqjPz27OzaxLymhPz29OTStLyifPTm1OzavOTOpLyedMS+rMS6pMSynAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaJQIAQECgajcNkQMBkDgKEQFK4LFgLhgMiOq0WDgVEQrFdKAXfhJWRODTMQ6+64BAMGHAq+pB4hCF2eURoVwgREhMUgl5/EBUWimdWB4cVDxcYiwJiGQcVfBobmhwPEgkWFg8dmWcQEgcWFw99HpoVFR8XGiAhISKLI8EkJRgYGyK/SgvLzM0LfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+colorscm-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIcAAPz+BFxaXNze3Ly2rJyanPz+/Ozq7GxqbJxaLLxOFLQ+HLQ6NMSOnOzi5GxubMzOzDQyNMx6JOSSXOSedNx+ZMxaXLQ6ZKRalNzW3IyKjERCRNSWPPTKnNReNMRGVLxalJRGpHRanNTS3PTy9OTi3ISGfLySNOzCfPTatOy2dNxuFMw6DJxGrHROvEROnHyKrMSmTOzanNzShOSqRNyCFMxCHJxGnFxavDxqxCRmrCxijPTq3Ozm3LyulLyyZOTenNTGZMS6VISKbCyCzASGxAR6rBxmhKyqpOzi1JyuXLTShJzKdHS+XES2XCy6pDSy3Bym3AySxAR2pBxadKyinPTm1OzezLyqjGSWTHS6ZFy+ZCyyVCS2dDy61Dyq1CSOtBRqjExqZKyilOzaxLymhDyeTCSuVByyZCS6hDS2vDSatCx2lCxabIR+dBSKTByeZCSmhCymnCyanCR6hNTCrOTOpLyedCxmVCR+bCR2bCRmZExqbMy+pOTStKSelKyejMSynLyqlLymfLyifAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAjqAAEIBBCgoEGDAxMGEMCQ4YAABAIkFLiwgMUCBg4UiJgQQQIFCxg0sOjgwUYIAiNImEChgoULGApkcHBAA8oNHDhI6ODhA4gQIkaQGFACgokTKFKoWGGBRQsXLwQIHQABRgwZM2jUsHEDRw4dA3bw6AHBxw8ZQIIIGUKESBEjR3YgIZtEyRImTZw8gRJFyhQqVaxcgYAli5YtXJx08fIFTBgxVsaQQVnGzBk0TtKoWcOmzZExklECcPMGThw5czqLoYOijh3RAO7gyaNnTxsxfOr0cQ2boBg/f44AChRI0KDXCiEoX84cgp+AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+core-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAASC/PzuBFxaVNza3Ly2tJyanPyuBPQCBPz+/Ozq7GxqbFRSVHx6dKSmpHRybMzOzDQyNGRiZHRydHx2fExKRCwqLPTy9ISGhERCRCwuLERGTIyOjBQSFGReXJSSlFRSTDQ2NAwKDNze3OTi3Ly2rFxaXAQCBFxeXMzKxOzm3LyqlDw6NCQiJFROTLy2pDw+PGRiXMS2pOzi1CwqJBwaHAwODAQGDJSOhOzWvLymhKSajNTGrJyWhOTOpLSyrKymlKSelMS+rLyidMTCtMS6tMS6pMSynLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfVgAAAAQAChoeHgoqCAgOOjgQCBQKCBoMABwMImwgJCggFC4sGDAQNDZoIDg+gEAcABhESEwoUFQsWFw4KGBmCGhsFGwoLEBwYCRYEFxCEHRceFwofIBwhDSIjJBCCCxISDiUaGRwmJygpKr4AGAIl4issISYtLuncgi8YLxAs5SYwYshQgQ8AixksaNSwYYLDDRc4chS0USMEQxMhHOjYEbEggBUWTQhwwANiD4mLBPj4AYTHjyA9cPQQsq7bkCFEihhRkSPHkSMeBUDIAGFo0aMZ/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+deb-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/FxaXNza3Nze3Ly2rJyanPz+/Ozu7GxqbPz6/JwCBMw+PMQCBLQCBNx6fPT29GxubMzOzIyKhDQyNLwqLLRWVLxaXNyurERCRMzKxOzq5Ozq7MQ2NMRmZLwCDOTi3Ly2tMReXOS2tMTCvPTu5Ozm3LyulMSSlNTOxPTq3Ozi1OSytPTm1OzezLyqjNyqpLxaVNzSxOzaxPTy9Ozm1OzexOzavLymhOzWvOTOpOTStLyidMyShMSulLyifLyedCH5BAEAAAAALAAAAAAQABAAAAa0QIAQECgajcNkQDAYCASEQCGQFC4NWMMBkZhWFQtGw/EwQCIGyWSoaFAqFgblIkEgMGthQ5HRbAQcFAcaBGp6DQEJCx0XFx4ZGx8geQ1ECyECByIMIyQlJnkMRBwnBwYODSgpKqB6RCIcK6gEKiwtLpQKiS8WMAQxKi0yuEOICTM0LSo0NTY2N3kAbhoHBzQ0zjg50EkKHC80LCo2ODo5O9FEBCE8Pe49Pj8/6QET9vf4E35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+document2-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJSWjPz+/Ozq7GxqbJyanPT29HRydMzOzDQyNIyKjERCROTi3Pz69PTy7Pzy7PTu5Ozm3LyqlJyWlJSSjJSOhOzi1LyulPz27PTq3PTm1OzezLyqjIyKhJSKfOzaxPz29OzizLyidIyGdIyCdOTOpLymhOzavOTStMTCtMS+rMS6pMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaQQIAQECgajcNkQMBkDgKEQFK4LFgLhkMBIVUKroWEYlEgMLxbBKLQUBwc52HgAQ4LBo049atWQyIPA3pEdFcQEhMUFYNVagQWFxgZGoxfYRsTHB0eH5UJCJAYICEinUoPIxIcHCQkIiIllQYEGCEhJicoKYwPmiQeKisrKLFKLCwtLi8wHyUlMYwM0tPUDH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+document-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz69HRydMzOzDQyNIyKhERCRFQ6LJSKfNTOxJSOhPT29PTy7PTu5Ozm3LyulOzi1PTq3OzezLyqjOzavPz29Pzy7OzWvLymhOTOpOzaxOTStLyedMS+rMTCtMS6pMSynAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaLQIAQECgajcNkQMBkDgKEQFK4LFgLhgMiOq0WCAREQrFdKAVXKyNxaJgBjgck4khLBAPGm4r+ghETeHtEfVaAFBUWg15gjReKZ4YTFBgYGRpvcQoPDggRnwwMG5hnHB2UFxcbHh+LAh0YDA+zDyCtZ5UXIRsiIiAjiyQlJCYnGhofI8BKC83Ozwt+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+dvi-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAASC/FxaXNze3Ly2pJyanKyijPz+/Ozq7GxubIx+RIRyLHRyVGxqbMzOzDQyNHxyTHRqNGxiJHRiLJySVIyKhERCRGQmLMy6ZNS+TMSuPLSePIRaNGReLHRuTPT29FxOFKymdIRmLHRiHGxKLDQuDPTy7Ly2tHQqLLwyPIxqVGw6LIx2LGRSHDwyDDwyFNTOxOzm3LyqlIQuNLy+zKSGdKSSfJRSRKSSNExKJLSmnOzi1LyulIyCZIxiPJyGLExGFOTSvOzezLyqjLyyXAQCBNzGRLyeREw+DFRONNzSvOzaxGxqVKSelJSCNEQ6DFRKFKSajMS2pNzOtOTStLyidEQ+FLSunOTOpIyKdMSulLymhLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfVgACCAAGFhoaDiQECjIwDAQQBiYIBBQUGmAcIBpGTCQqgC5gMDZwOgw8KEBESEwkGFAgMFacAFhcYGRobEBwdHgIDFKcWHwYgBiEhIiMkAyUCJg4nKCgp1SorLC0uBC8wMQ4yMzQnNTM2Nx84LTkNOjunNjY88z0+Hz8kOUBBQqdDiHQoYiREhBZHkORIouSfIAghjCiI8IHEEiYDgAApUAtAEwgfnDzBASWKFCBTqHQE8ONIFRwErFxRcuWKSkU8sBTIkSWLFi1btqwM4KCo0aMO/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+font_bitmap-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAASC/FRWVFxaXNze3Ly2tJyanPz+/Ozq7GxubGxqbNTS1DQyNPS+vPw2NNQeHFw6PPTy9IyKjERCRPzi5PyGhHRWVOTi5PT29OTi3IyKhPza3LySlLQGBGQCBNza3Pz69PTy7MS6pKRubPy6vGQ2NKRSVIxmZPTq3LyqjLQqLHRydPxydHwCBNTSzPTu5Ozi1MSynKQCBOQ+PKwCBIReXJwCBExOTMzGtOzezOzWvEQeHLSytOR+fIxaTOzexLymhEwCBDweHNTOzPTm1LRORIQ6PJyOfOTOpOTe1OTSvLyedMTCtMS+rLyulLyifAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe6gACCAAEChYeGg4oCA42NBAEFAYqCAQMGmAYHCAaSlJaZmAkKnQuKAQwNDg8QBhEJCRKmgwITFA4VFgYXGAQZs5UaGxwdHgYfIAMhwAAiIyQlHCYgECcnKMwpKSoKKywtLicvMMwcHDEyMjM0L+3YgzUsNgH0HCw3ODnvgjU6OwMvBvCQ0cNHjh+zOgAJIqTaECJFOhg5gvAUEmsvksBAAeOIEmYBbixhEgJGExROlHw8taCly5cL/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+font_truetype-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRSTFxaXFxeXNze3Ly6vJyanPz+/Ozq7GxubHx6fCwuLDQyNIyKjKSmpPTy9PT29HRydMzOzCQmJAQCBKyqrFRSVLy+vGRiZNTS1GxqbERCRMzKzJyenOTm5JSWlLy2rIyKhMzK9KSm1Kyq3OTi3OTi5JyezBQSJExOTLy6/CwuXLy+5LyulMTC3LSytHx+7Ly2pLSyxLyqlNza3Gxq1OTWxMS6pLyqjPzy7OzexPTq3LyynOzWvLymhPTy7DQ2bOTOpGRmhERCfNzGpLyedMTCtMy+rAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfIgACCAAECA4WHhoOLAgSOjgUBBgGLggEEB5kHCAkHBgKCCgsKBgwNDg8HEBESngwAExQVBhYXGBmZDREaGwuDHB0CHh+4qgQgIa+CBMEiIyQiJNAlIMoAJgYDJygpKisWLAMtvoIe2S4pLzArMTIBM9YHBRUeNAQ1KwU2NzjWFAwDDEDIgS+GDh39Fl3ykGMHPh46evggJ2gAgR87HAKZYSOID2uECGQUMkRIAiJBioAUYMTIkRs8cODwUUSlQgY4GSzQuVOnn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+font_type1-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAASC/FxaXNze3Ly2rJyanExKRPz+/Ozq7GRmZPz6/HRydMzOzDQyNJRmZPSmpIQuLGwWFKxeXPTy7IyKhNxSVGxCRLy6vPQ+PPT29GQ2LPTCxOROTPz69KQ2NPSGhPTq3Ozm5LyqlGwODPxiZOzi1LyulLwKDORydBQSDOx+fNw+PNS2tOzi3PTm1OzezLyqjNQaHPRubJx+fMS6rOzizOzaxMwuLKQWFHRaXOQuLJSShNzOvOzavOzWvLymfCwiHHx6dOzexOTOpOTStLyedMTCtMS+rMS6pMSulLymhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfFgACCAAGFhoaDiQECjIwDAQQBiYIFAgaXBgcIBgQFk4uYBgkKC5wMiQ0ODxAOERITCggFp4MUFRYCFxUCGAIDE7QAFBkWCRobChIcEr60HR0IHAYeHQQYEh8gIbQbIgjGIw8WEtgkJacmJyjfKSoFKywfLS4vpzAxEAgnHSYyJjMkaNSoB0CEChs3cMjIYULHDho8evig9aPiAQFAHAap0UPIREXYPpAIEnGIECLBABQoYmTGESRIfCQhglIRg5s4czLwEwgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+gf-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAPz+BFxaXDQyNAQCBMTCxPz+/ISChKSipERCBMTC/Pz+xPzerMQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARwEEgQahVijMmD/oRAbBw1FCgaFFrppeo5UtILWxlAGNWZHocA4bAxGAnDg9GA8LQCxGTQoHwVNYYEMEHtKYrEA0tctVIOo0Fl2Ct8AQLlKMnzLFg1KIHBCGoUbiR5VSd3C28TThpubgqIEhkfkh9+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+html-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRaVNze3Ly2tJyanPz+/Ozq7GxqbDxinBw+ZERmdIySjMzOzPT29DQyNDRurIR2RPTSdJyulFSGxLzCxIyKjHRydERCRLzKvPzivPTmxNTChLSybGyCfCRSpBQqRLy6vPTy7OTi3IyKhCRShOTixPzy5OzerOTShLyaVEx6nCxerGRyhOzi1LSyrEyGvOzaxPTShNy6bEx6rDxyzDRitCRCfPTq3LyulBw2VISq3GySrPTWlHyanIyitEyO1ER6zBxCfLSqnCQ6XHSq3GyWvFyGvDxuvLSqpPTm1OzezLyqjCxajFyO1GSi3NS2bKyaTCQuPGRufOzexLSmlER2vKyWNFxaNHx6dLyunOzWvLymfERSVExKNDRCNKyilMy+pOTOpLyifFxaVLyidMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfYgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFkZMICQoLlwcMDQQOgg8QERITnhQFFRYHF6cPGBkaGxwdHh8gISIDI6ckJSYnKCkqKwksAiEtLg4kLzAhMTIzNDU2HxQ3NzgOOTo7PD0+P0A1QR8uNy1CDkMvREUyRjNHHjkfSElKlpxi0sTJjydQAiSIIkXIFBhUTn14UIWGFQhXHHzAkgWGli2nAHxIwIRLFy8bv4DREkZMSEEfYo4hQAVMGJZkXhIaIERImTJmlogRc0ZnAAdIkyp14CcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+image-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPz+BFxaXNze3Nza3Nza1LS2tJyanPz+/PTu5GRqZOTi3HRydMzOzDQyNJQOFDxKfKTW5OTy/OT23MTaxISKhGxmZERCRCwuLJQSFPzGpLweHJTO3ESu3DRilNz61FymXCxKRMTCxPTy7Ly2rIyKhDwCBORiRKQWFEy23CyKvJTWhDSOPCRONDQaHNROPNQ2JLRubHTC5DR6rHR+jFSqRCRyLGxqbOzm3LyulCwqLMySjMQ2JMyqrERijJSenFSGXGRmXMS6tPTq3Ozi1MS+vMxCNKyqrHR2dPTm1OzezOSKfNTe5KSmpIyGjLy2pOzWvLyqjIRqZIyKjHR2fExKTHx2bLyynOzexLymhERGRGRmZKSWhMS6pOTOpLyedMTCtMS6rMSulLymfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfcgACCAAGFhoaDiQECAwICBAUBBgGJggEEB5kHCAkHk5UBCpqZCwyeDYIOAA8QERITmRQLFRYXABgZGhscHR4fICEiAiMkDSUmJicoKQ8qKywLAwgKIxctLi8wMTIzNDUJNiEINzgNOTo7PBA9Pj/QQEFCQzg5F0RFEQQ+RhRHswVIkpS7oEMJgiUhCjBpcqSCkyFPoNjKEYVJCCNSpgSgUsXKlSdYUAG4kCOLlgpAgFTZwuVJFyy2Bi0gEsSJzZYuvYi09OULGC44wmAR48VLDkU5zClt0OACUz+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+info-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3Ly2rJyanDROXHSSpISetPz+/Nzm7GxqbGyGnMTS3MzW3JyuvERujLzG1HRydMzOzPT29DQyNMze5Iy2zLTS3Cx+pCRijLS+zIyKhGxubERCRFR6lGSivFyavISuxAxajBRejAxGdDxihJyyvCR6pBRqnAxelAxOfPTu5OTi3IyqvFSOtJy+1IyyzFxyhOzm3LyqlGySrAxejAQ6ZFxqfMzKxPTq3Ozi1LyulCxulAQuVISKjMzGvPTm1OzezLyqjBwmLBROdExOTKSinNTOvOzexBQeLAw2XAQmTCwyPLy2pOzaxOTWxLyedCQmJAQKFAQWJKSalOzavOzWvOTOpLymhKyqpMS+rOTStMSulLymfLyidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfVgACCAAGFhoaDiQECjIwDAQQBiYIFBgcImAkKCJGJCwwNDg8QmBESEwQUgg4VFhcYGBkaCBsRHB2qHgwfIAghIiMkAhMCAxsUJSYhJygiKc4qCysrLAPILS4oLwgwKcExEisyMxQFNBg1Nb7ONjc4OTo7yAU8IiIIDiIqPT4/QEFCVA0hooJBAg0eehQxciQIEnKCktiYqGQJEwJNnCB5AkWVoChSpkwpQmXAkypWrmDxKAhSlixaTlrZcqWjIi0/BmjhsgNLFy82BwWgQDQK0aNE/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+kmultiple-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXPz+/AQCBISChPz+xMTCxPzerKSipAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEIRJgb04iLEJwaAmjMTwgVbAjeaESmNcGMGrxmOhDqE8HAOVJ7MSFH4qhOmiOQIPNIGB4JJwnIaDaFaTUL4iYxc0MJidQVvROc4Yfz+a+g3V2sAVfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+log-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3Ly2rJyanPz+/OTm5GxqbMTCxARiTARSPARCNAQ6LAQyJGx+fGxubMzOzDQyNCxGPARyVARqTARaRLSyBCRGHFRuZIyKhERCRDRuXAx+ZPz+BIyOBFRybOTi3AyGbAx2XExaDBROLOzm3PTy7DRORDyeXBx2VEymVHyuJGRyDPTu5LyqlFyGTBxaNAxqVDR6PARKNPTq3Ozi1LyulCRuTCxeNBSCZDxmJEx6bOzWvPTm1OzezLyqjCSSdCSmhBySdBR+ZARqVEx+bNzSxOzizESCdAQCBNzOvOzexLymhOTStOTOpMS6pLyedMS+rAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfIgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFkYIICQkKCgsLDA0ODxCbEQASExQJFRYXpBgZDwcaqxscrgkdHqMfBiADGasIIRwiHSMdJB0YJSYCA6snKCkqFgorHSwdIC0lLqsvvx0wMTIWMxgCNDU2xzcdOBw5EzoKOzw9Pj/WgAQRIiTEkAlEihg5wgMgACRBkpwQIpGDRCVLeDCJACGJx48gAzRxspHQoZNPRkJZNSjAkygDntiwwYQJlJWKIujcyTOCn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+make-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxWVFxaVOTi3Nza3LS2tJyalGRmZMTCxPTy9Pz69Pz+/Ozq7GxubJyWnFRWVHx6fHRydMzKzDQyNHx2bHx+dIyKjERCRGRiZKyilLSifMTCtLy+tISGhOS2bPzerPzuvOzetJSSjFxaXOzu7PTy7MS6pGxqbKSWdPS+dMSidOTerPzqtISCfKyurOzq5LSqnMzKxPS6ZEw6HJSKbOTStHR2dMzGvPTq3OzizLyulFRSTOyyVNymXOy+dKyqpPTm1OzezLyqjJyCTOSqTOSmRLSupNzSxOzaxOzexOzWvOTOpKyinMS6rNTGrLyedMSynAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfagACCAAEChoeGg4oCAwQEjQUCBgGKggcICQoKCwwNCg4CiwQPCBAFmRESCwYTghQCEgYHDBUSChYNDRetGAQZGhscHAIFDAoDHB2tAQYeHyAhIiMIJAolBCYTAicoKSorLBItGC4DLy8wExExKjIzNB81CBI2Nzg5Oq07KDw9Ph4mdgj4IQFIECGtHrgYQqRIjQoPjBzJkQMJQgANkrngYGFAhB8UkyjR0EpQAAkUKkQQkCGHEiVLLg6y8IDJhiZOXsJ8UtLkhpsmoAgRouIJT0UPJihdynSCn0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+man-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXFRWVNze3OTi3Ly2tJyanNza1Pz+/Ozq7GxubMzOzDQyNOzq5KSmpNTS1IyKjGxqbERCRPTy7PT29LSytOTi5MTCvMTCxLy6vMS6rISChLy+vPz69HR2dLSyrLy2rNTW1IyOjOzu7OTm5HRybHx2ZNTOxLyulLS2tIyKhHRuVMS+tHx6fGRmZLyqjISGhJyenMTCtGxqZGxmVMS2pFxeZGxiTMSynLymhHx6dGRiZFxeXFRSVLyifGxmTKSSfLyidMS+rLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAEChYeGg4oBAwMEjQUCBgGKggEHCJkICQoIBgKKkgSamQoLngyWDQ4PpAgQChESqQACExQVFgkXGA8ZBBobtAENDQsGHB0dEx4fBCC0AhYhGCIjFA0kJSYnKMMPHCkqFg0DIQorLN6WCx8OLQsHIQsuKxovtIQwMR4ZHDIYZtCogU+RjQAeUmDAkELBDRw58hHSsWMDjx4XV6DwIZGYCRc/aNz4AeRFkI4sZAipgePFCx9BhkgUwKCmzZsM/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+metafont-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3Ly2rJSWlPz+/Ozq7GxqbKSajPT29GxubNTS1DQyNIyKjERCROzi5Ly+vKyqrKSipKSmpKyurISChKyinHRybISGhGRiXJyanIyOjFxeXJyenJSSjMzGxMzOzMTGxLS2tISGjExOTLyulMTCxISWpGx6jExifFxufJyepJymrFRSVLSupLyqjERKROza1OTKzNS6vGRmZLy6vPz29Hx6dMTCvHRydJSKfOTStLymhNTCxLSOjKx6fMS6pLyifLSytHx+fOzWvOTOpLyedMSulLyidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFCJKKApcFCQoLBQQMnqAFDQoHDqeDAQ8QERITBhQVFhWnF4IVsxgKGRobHB0DrxUeHyAhIiMeGCQVFCWvACYCJygWKSoTFxcD1oMJGissJiwjFC0ZLi+nMBoLMTIPFDMzDS00FvEAYlyQUMNGiBs4OuQgoWMHj2sDe/j44aNCBh1AdgS5BoCGBhNChlxAQGRHESMcYXCI5sHCkRdIkKBUxKCmzZsM/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+midi-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Nza3Ly2tJyanPz69Pz+/ISChOzm3GxqbKSipAQCBHRydMzOzDQyNIyKhERCRPT29OTi3PTu5PTy7LyqjOzi1OzezOzWvLyidOzaxOTOpMS6pMSynLymhLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaOQIAQECgajcOjUTAYEAKFgDBgOFQNiMHhkFAYosQFg2HNbg0Nx/dB3W7NW0hDEWEjxm+BWzIhINhVbnBUFH12eAeDFRQUFoBuiVoGRRQXjgGQiQQLCwELBZaHZJGMARgLGZeZCARRUKgaom8DCAEZGwscqm5YrZyfHLFKRQQdHhYWHxogD0NED9DR0g9+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+mime_empty-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz69HRydMzOzDQyNIyKhERCRPT29PTy7Pzy7PTu5Ozm3LyulPTq3Ozi1PTm1OzezLyqjOzexOzavPz29OzWvLymhOzizOTOpOTStLyedMS+rMTCtMSynLymfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIAQECgajcNkQMBkDgKEQFK4LFgLhgMiOq1eEQnFdqEUXK2MxKFBHnqvDsGA0aaaz4iHvE68WxEQERITfG+ADxQVhGV/DxEWFBcYhQIIgBEUFBkak2UbgYkZHBwdlIgUHh4aHB+lZZkVF6sgHyGFIiMiAyQYGCUhtkoLw8TFC35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+misc_doc-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRSVFxaXFxeXFRWVOTi3NzW1Nze3Ly2rJyanPz+/Ozq7GxqbMzOzDQyNHRydExKRERGRExKTERCRCQiJIyKjCwuLGxubDw+PDw6PDQ2NBweHAQCBPT29IyKhNz+3HzmfDTCNASaBBxaHCQmJPz69PTu5JTqlGTOZCSmJAR+BBxSHOzm3LyqlFTKVASCBARmBBxGHNTSzPTq3Ozi1MSynAyeDAROBCQ+JBQSFNTOxPTm1OzezLyqjCwuNAQyBCQ2JMzGtOzexAwODOzaxOzWvLymhMzCrOTOpNTKvMS+rLyifMTCtLyulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfcgACCAAECAwQCiIiDjAMFBgeRCAMJAYyCAQUKmwoLDAoJA5eZnJsMDaAOAA8BEBESExETFAsVDwwTFgAXAhgOGBkaGhscHQUIHqoDAR8gISIjJBQGJSbHugMSJygpKisU0x0mLC2qAhEuKS8wMRsbMiYzNDW6ARM26zc4ORQ6Mzs8evgAACGDChg3fgDhF6SAECE9VEXQYKGiDwtDKAQRQqSIEV25KGzIQZIDhSNFiiAxomoQAwM6kgRRgiQlkiW6BgVIwkQJghpNeixx4qQlJiAWHCh1kFSpBT+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+netscape_doc-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNTW1Nze3Ly2rJyanPz+/Ozq7GxubPz6/OTi1Ozq3GxiTMzOzCwuLMSijGROLLSqjGRiZOze1LSOdIyKjEw+NHxGJNSqjMTGxPTy7Ozm1NzWxLSSfFw+LMzKvHRuVKyeZHxybOTazOTi3Ly2tDQyNOzm3MS6jFxaRPTu5LyulOzi1KSehMTCxKSOdHxuRMzCpJSGXOTStLyqlHRqRIR2TFRKLLyedLyqdGxWLIR6XOzezJyCZJySbEQqHKyKdFRONJSKfOzaxNTCpKSWbJSSjExKNHxuNOzWvLymhIyKhOTOpHRydHx6bIR+dOTOrLyidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfVgACCAAGFhoaDiQECA40CBAEFAYmCAQMGmAYHCAmSlAEKCwyZCA2dDoIPEIsREgkTFBUICBaoABcYGRobHAodHhkDBBW2AB8fIBwMESEiIxokJSaDJxAUKAwQESkaKicrqBssLS4vBzAfMTIRMwo00zU2LTc4OToQOzU3DDwr04Ixeljw8QNIiCBCYgyJUIxIESMfjuxAwoDDkCRK/j244CNHjhBIPDxYMoPJA1sXIDRxkuOIkycXHsyAEqUYoRk7GDAh8uJFDhw4/lUy4aCo0aJE/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+news-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/AQCBERCBPz+/FxaXIQCBMQCBMTCxISChKSipDQyNAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARXEEgZwrxYikFsvtUwBN0nEWIhkh4YiIOhjiX1hqIsHlb4jr8VwoJa/XCCBG4ZZA2bRxEi0QkgeLAloUZKYGEDhLgG6H5JBEFrYg4ItmsMCaGomFyEiz8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+pdf-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAASC/FxaXNze3Nza3LyypJSSlPz+/Pz69Pzq5Ozq7GxqbJyanNyGhNx6dGxubMzOzDQyNERCRPz6/My+vLxaVJxeXKSmpNTGxIyKjNTS1OTi5OzCxLRSVMTCxKyWjOTi3Ly2tIyKhLxmZLSWlOTe3MzKzOza3MyytNyOjAQCBKyqrOzm3LyulPSajMRWXOSGhOyGhKxiXOzi1OxyXKRORIxSTNTKzMy6vLyenLRubLwqLMxiZNSurJRybOzezLyqjJxCRGxSTLy6vGQiJMw+LJR+dMzCrOzaxIyOjKyurHxydNxWPNTCrOTStLymhIR2dKyKhIxuZIR+dJyShOTOpHRmZKSKhJyCdKyilMSulNTCpLyedMS+rMS6pLyidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfQgACCAAGFhoaDiQECAwKMBAEFAYmCAQMGBwgHCQoGC5OKAgYMDZcODwYFEIkREhMUFRYXGA4OEauCGRkaGxwZHR4ZHyAhuAAdCQgiFR8aHSMkHwS4JRomIicoJykqHh0rLKstLhQcFC8wMR0FHgQy4TM0HDU2Nzg5Ojs8PQQ+P6tAggjRVaLEjiFEihg58k+QBSQdQCTpoITIkhBMmjgxVsBCxydQokiZYoTKxkRVrFy5EgJLFi1NqGwxRohLBy5dsmT54cXLTEUQggodCsFPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+pk-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/IQChFxaXDQyNAQCBPzC/MTCxMQCxPz+/ISChKSipERCBMTC/Pz+xPzerMQCBCH5BAEAAAAALAAAAAAQABAAAAR6EIAQhLVjECJlKISwjcZgcFNxhATiugKyTaP4wu0JiOyNXBqAIWFpvRQKgUHBSTgNS4UzseBxBMxoMiG1NTcJBpLBLTaaTIVM3fXuFKeQMmk7AwbSU5QocsgkFnAPD0kbFBQdO1hELQ4fK4lWLQ0IASsoEhojIwEjfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+postscript-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxWVFRWVFxaXOTi3Nze3LS2tKSajPT29Pz+/Ozq7GxqbJyanISChPz6/HRydNTS1CwqLMTCxISGhOzu7ERCRDQyNERGRLy2rIyKhExOTAQCBKyqrOTm5KSmpHR2dNza3AQGBNzSxOzm3LyulBweHBQSFKSilOzaxAwKDOzezDw6PJSSlDw+PKSelNzOvLymhAwODNzGrOTStLyqjExKRHRqZLymfMTCvMS+tMS6rLyynMS6pOTOpLyifMTCtMS+rMS2pMSynLyidLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfPgACCAAECA4aIA4OLAgSOBQQGAgcBi4KNCAmaCgsJDAKWjQkNCA4JDxCeEYwSDQ4TFKMPCxUWAA0BEQ0GDggQDxcIBBgZthobExwICB0eFRsSHcOrER8QCwYIIA8bIRwiIyS2JSYVHgsQzhsbJygEJKsl6ykeH9zrJyIq4gAp6xsrWLT45+IFChi2YqwLwcLEvxgHZMygsarBOgsCBGioUcNGxBk3bA0SgCOHjh0oeczo4WPVoAA/fgAJIoQGjSFEiIgUNCCCBZ8Wggq14CcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+readme-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3Ly2rJyanDROXHSSpISetPz+/Nzm7GxqbGyGnMTS3MzW3JyuvERujLzG1HRydMzOzPT29DQyNMze5Iy2zLTS3Cx+pCRijLS+zIyKhGxubERCRFR6lGSivFyavISuxAxajBRejAxGdDxihJyyvCR6pBRqnAxelAxOfPTu5OTi3IyqvFSOtJy+1IyyzFxyhOzm3LyqlGySrAxejAQ6ZFxqfMzKxPTq3Ozi1LyulCxulAQuVISKjMzGvPTm1OzezLyqjBwmLBROdExOTKSinNTOvOzexBQeLAw2XAQmTCwyPLy2pOzaxOTWxLyedCQmJAQKFAQWJKSalOzavOzWvOTOpLymhKyqpMS+rOTStMSulLymfLyidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfVgACCAAGFhoaDiQECjIwDAQQBiYIFBgcImAkKCJGJCwwNDg8QmBESEwQUgg4VFhcYGBkaCBsRHB2qHgwfIAghIiMkAhMCAxsUJSYhJygiKc4qCysrLAPILS4oLwgwKcExEisyMxQFNBg1Nb7ONjc4OTo7yAU8IiIIDiIqPT4/QEFCVA0hooJBAg0eehQxciQIEnKCktiYqGQJEwJNnCB5AkWVoChSpkwpQmXAkypWrmDxKAhSlixaTlrZcqWjIi0/BmjhsgNLFy82BwWgQDQK0aNE/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+recycled-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3Ly2rJyanGRmZKyqrMTGxPz+/Ozq7KSinOTi3LzatLTGpJSSlMzKzGxubMzWzPT29DQyNMS+rOTy5KzWlEymLDSSDKTClIyKjGxqbERCRGx+bNzu1Hy+ZESeHDSWDCyKDCyGFMTKxHx6fOTi5ISCfFRuVKzGnJzKjDSOFJy2lNTSzJSSjPTy7Ozm3FR6RJzChGSqRFSePHyqdMzOzLSytNTOvLyulExyREyWPESSJMS+vKyurMzKxPTq3Ozi1BxeDDSCHNTS1Ly+vHx+dIyOfPTm1OzezLyqjBw6FBxmDFSKRMzGxERONOzavBQ6DBROBHSOdCxeLDRCJKSelOzexOzWvLymfCw6LBxGHFRiTOTOpERGRKyqpMy+rLyedMTCtLy2pMSynMSulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfWgACCAAGFhoaDiQECjIwDAQQBiYIFBgcImAkFCJGJCgsMDQ4PmBAREgQTghQVFhcYGZYIGhAbHKodHh8gISIjJCUCEiYDJxMoKSogGCsjLC0GLgkvMAMTMTIzIjQ1LDYHNxo4CTA5Ezo7PDstEQ8HPT4nP0BB5jpCQxFE7kU3RkcHkCRRomoJkyYHnBQZ0OEJARxJoBAUFEWKjilUolSxMiDJFSxZVAnSEmVLFC4EBnzE0iVkIi8EvnwBs5JlGJGCAogRQ2EMmTJZsoS5qWiC0aNIJ/gJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+resource-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRSVFxaXFxeXFRWVOTi3NzW1Nze3Ly2rJyanPz+/Ozq7GxqbMzOzDQyNHRydExKRERGRExKTERCRCQiJIyKjCwuLGxubDw+PDw6PDQ2NBweHAQCBPT29IyKhNz+3HzmfDTCNASaBBxaHCQmJPz69PTu5JTqlGTOZCSmJAR+BBxSHOzm3LyqlFTKVASCBARmBBxGHNTSzPTq3Ozi1MSynAyeDAROBCQ+JBQSFNTOxPTm1OzezLyqjCwuNAQyBCQ2JMzGtOzexAwODOzaxOzWvLymhMzCrOTOpNTKvMS+rLyifMTCtLyulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfcgACCAAECAwQCiIiDjAMFBgeRCAMJAYyCAQUKmwoLDAoJA5eZnJsMDaAOAA8BEBESExETFAsVDwwTFgAXAhgOGBkaGhscHQUIHqoDAR8gISIjJBQGJSbHugMSJygpKisU0x0mLC2qAhEuKS8wMRsbMiYzNDW6ARM26zc4ORQ6Mzs8evgAACGDChg3fgDhF6SAECE9VEXQYKGiDwtDKAQRQqSIEV25KGzIQZIDhSNFiiAxomoQAwM6kgRRgiQlkiW6BgVIwkQJghpNeixx4qQlJiAWHCh1kFSpBT+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+rpm-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/FRaVNze3Ly2tJyanFRSVOTi3PT29Pz+/Ozq7GxqbFxaXHRydNzazDQyNIyKjERCRGRmZExOTLyipOSytLy6vIyCfBweHMzOzNS+vMRqZMRSTNzGxAQCBLxCPMzGvLyulCQmJPz69IxKRIwWFLSGfLyynAwODERGRMTGxGRiXLyqjHR6dIyOjBQWFLSqnNTCpNTKtLyidPTm1OzezOzavOzWvOTOpMTCtMy+rMSynLymfLyedAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAazQIAQECgajcNkQMBkDgKEQFJYMBwQ2ITiEJ0uDFjsgdHgOpIFQRj7UCggZyEksIgoJBPKwVCxnBUXEgwYBgkGGRobHAYDDgUdFx1fawceHh8gDiEdnEthIgcjJCUmDh0nKJwdCCmcKh0WJiumQh0sFR0tFyYuLycwK5u1nBYsFwMuJicTs0MdEhUpDRkxMRkwMDJxQl8zBjM0NTY3N9poKTg5JjorKzsyPNtEDvT19CH0fkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+shellscript2-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3LyypJyanPz+/Ozq7GxqbPT29HRydMzOzPz69DQyNHRaJKyONJR2LJyCJKyCHKSCHMSqZNTOvIyKjGxubERCRGxSFIxyRKR+HMyeHOTCLMSOHLyWFMzGtIyKhHx2bKSGZNyiFHxeDOTi3Ly2rMyudOTCpOTKxLyqjJR2VJxuDLSGHLSunPTu5Ozm3LyulJx6NNSyXOTCjOzWvPzi3MyqhGxSLFQ2DLSKLNSqTPTWtPzq7NS2nIxyVIx6ZOzezFxCFOy2POSyROTGlPTazPTWxLSiZLSSVMy+rOzaxKyCJMyeNOSyTNy+dLymXLyePNyqPKSWfOTStLymfKR6HMyaPMyaNJR6TMy6pFxKLHxWFKR2FIxiDOTOpLyedMTCtIyCbMSulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfQgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFkZOVlwgJCgsEDIINDg8QERITFAUVFgcXpYIYGRobHB0eHwgCAyC0giEiIg8bIyQCCCUmtCInKCkpKissLS4vMDGlMjM0NQsINjc4OQ0U26U6OzQ8CAg9Pj8uQBRBKgxCQ0QzRUY2jiDRkURJkCX5ADBp4uQJjRNQokhpMSUIlSqlcFjpQOQKESlYWmTRQuUirS1cumy04qWBlhpUvoARRihMGDFaBoxRUQXMTEUMggodysBPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+shellscript-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRWVFxaXNza3OTi3Nze3Ly2tJyanPz+/Ozq7GxubNzSxMzOzMTGxHRybDQyNLy+vHRydHx6fKSipISChIyKjGxqbERCRCwuLLy6vGRiZExKTCQiJAwKDLSytLy2rJSSlHx+fDw6PKyqrBQWFPTu5Ozm3LyulLS2tCQmJAQCBPTq3Ozi1MSynCwqLAQGBOTazOzizOzezLyqjBweHNzSvOzaxKyurHRuZNzOtLymhDw+PIyCdOzWvOTOpLyidNzKtOTStLyifMTCtMS+rLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAEChYeGg4oCAwQFjgYBBwGKggEECJkICQoIkwADCwwNDY2mDA4Lng8QDhESsLARExQVDhYXGBkWExIaGw8cHR4SCQQfFQ8eFgUgIQEiwiMSBMYfGB4atwEXDyQd0wQlJicPKAHoFyIpJCoeDgMrLC0YKBsX6i4kL+4OMDEyZijr5oLGNxUqUCioEcPGDAwjPNyI6MEDChQjcOSwsUDHgw07RIgI4KCkAgs8cvTw8eOBogAxQtXIASTISiEuBwUYMoRIixYnZggpUgTDywdIkWJIitRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+sound-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXFRWVExSVNze3Ozi1Ly2rJSWlPz+/Gx6dNTS1Ozq7GxubGxqbDRmbDQyNFRiXBy6xFRmZLy6vIyKjERCRAQ+RBy2xByqtHRydIyOjPT29PTy9OTi3ISGhAQ2PATC1ByGlPz6/MS2pAS2xHS2vMTCxJyenLS2tPTq3Ozm3LSmnAQaHARibARudAR2hEySnOTm5MzGvLyulARKTARWXDyCjOzaxAQiJEx+hNza3MzCtOzexOzavLymhBQuNCxqdLy+vKSelOzWvLymfDxOVISipAQCBNzOtOTOpFRybKSejMS6pOTStLyedMS+rAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfLgACCAAEChYeGg4oDBAUEjwYBBwGKggEICQkKCAsMCJOVAw0OA4wIDZsHD4oQERINDRMIFA0MFauCFhcYARkJGhscHRMeuB8RICEQHgcaBCIcBSOrHyTWJSYnKB4KHCkqK6ssLS4vMA0LMRoyKe0zuDQ1LTYoHBwU7Ck374M4NTkmdHDIsKMAjx4+cAn6ASSIAhRCdvDgMYSIQkJFjBzJsALJjSFJLCoSUKCIkiVMegxpksTJxQATnjwZMWMGER9OXI58wLOnzwd+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+source_c-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMTCtPT29GxubMzOzPz69DQyNHRydERCROTi3IyKhIyOjPzy7PTu5Ozm3LyqjPz29PTq3Ozi1LyqlPTm1OzizOzWvLymhGxudGRmdFxedFRWdERKdDQ+dHR2dFxidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJQC8BXxOEDOw0DkGhYMJHCq4FuYJBQUEQN5RGlWYBQVFheEVWEYFRkaG40RXw2JGX6MaIiRHGCccQKAkRodHh4fjQ+tICEiIyQkJY0mJg8FJwWzJbVKD7gnI7K+v3EOycrLDn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+source_cpp-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMTCtPT29GxubMzOzPz69DQyNHR2bERCROTi3IyKhIyOjPTy7Pz29PTq3Ozm3LyqlPTu5Ozi1LyulPzy7LyqjPTm1OzizOzWvLymhHRydHR2ZHR2XHRyTHRyRHRyPHR2dAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJQC8BXxOEDOw0DkGhYMJHCq4FuYJBQUEQN5RGlWYBUWFxiEVWEVGRYaG40RXw0ckV8djYaZFh5gnGgKnx4fICAhjSIPrSMkJCUmJ6woBQ8FJAUlJ7VKDygPD7G9vo0OycrLDn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+source_f-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMTCtPT29GxubMzOzPz69DQyNGR2ZERCROTi3IyKhIyOjPTy7PTm1LyqlPzy7PTq3LyulLyqjPTu5OzexOzWvLymhHRydHR2bFx2XFx2VFR2TEx2RHR2dFR2VAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJQC8BXxOEDOw0DkGo4MJHCq4FuYJBQUdnlEaVZgCgYVFoNVYRcYGBEZjBFfDRePEgkajIUXGxgVYJxoCp+hHBwdHowfIK4PDyEiIyStJSUFDwUmJiS2Sq8PILG+v4wOycrLDn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+source-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMS+rPT29GxubMzOzPz69DQyNMTCtHRydERCROTi3IyKhIyOjPzy7PTu5Ozm3LyqjPz29PTq3Ozi1MSynPz27PTm1OzizOzaxOzWvLymhLyifOzexLyedLymfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaJQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJSCx7WAgBwi52FAsi4oBINJnCpAqCkPChUSA3tEEmoFahUWFxiGSwphGRYaGxyQEn4NHZVfj2iLlR5qoHICGYyWHyAhIpB9Dxp+IYAjsGokaiFqJZAJDwkDHBwYJiW+Sg7LzM0OfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+source_h-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxubPT29IyKjMTCtMzOzDQyNHRydERCROTi3IyChIyOjPzy7Pz27PTu5Ozm3LyulPz29PTq3Ozi1Pz69LymhOzizLyqjPTm1OzWvIyGhIR6dIRubIRmZHxaVHxSTHxCPIRydIReXHxWVHxKRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaIQIAQECgajcNkQMBkDgKEQFK4LFgLhgMiOl0mFFbEYVEgMJQC8DXRODjOw8DjGhYMIHCq4FuIKBASDwN5RGlWYBMUFRaEVWEXFBgZjEoPXxoSkX4bjYaZGBxgHZ2AkR4cHx+cSiAJCRAhIiMkJSaNCREgBScFKCkqtkq4sLK0JsFxDMrLzAx+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+source_java-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRWVFxaXNza3OTi3Nze3Ly2tJyanPz+/Ozq7GxubFRWXHRydMzOzDQyLIyKjGxqbERCRCwuLHx6dKSinKymnLyyrNza1PTy9Ly2rIyKhDQyNGReXKyejKSWhIx+bJSCdIRuZCQiJISCfGxaPJSKdHxuVHReRHxiVHxeVGRGPKSajMS+tMSynAQCBFxeXGROLFxCLFxCNFw6LGxiXFxiZMTCtOzi1ERGRLSytJSWlERKTNzSxOzaxKymlOTi5JSSjISChBwaFNzGrLyqjKSmpDw+PMS+rOTStLyqlLyifGRmZKyqpLyidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfWgACCAAEChYeGg4oCAwQFjgYBBwGKggEECJkICQoIk5ULmJoIDA2eDoqXowgPDBAREoIRExQVFhYEBA0XGBkaGwAcHR4dHx4gIRMGDBcEFg4iIyQlJicoISkqISssBC0OLi8lMDAxMiozNDUUNjctEjg5OjklDCEcOy4OFDw9Pg4QfuQAEgTCDglCHAQYMaQHEVRFBhRhIACHAyMLIHg4guShIAg6KDwYMYHBhBVJhiBRgmrQkhxMKlBo0ULlkCYtLbGwYYNmCyJNguYk5KBoUQlGi/oJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+source_l-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMTCtPT29GxubMzOzPz69DQyNHRydERCROTi3IyKhIyOjPzy7PTu5Ozm3LyqjPz29PTq3Ozi1LyqlPTm1OzizOzWvLymhGxudGRmdFxedFRWdERKdDQ+dHR2dFxidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJQC8BXxOEDOw0DkGhYMJHCq4FuYJBQUEQN5RGlWYBQVFheEVWEYFRkaG40RXw2JGX6MaIiRHGCccQKAkRodHh4fjQ+tICEiIyQkJY0mJg8FJwWzJbVKD7gnI7K+v3EOycrLDn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+source_moc-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIQAAPz+BKSipISChERCBPz+/AQCBMTC/MTCxISC/FxaXDQyNASChARCRPzCxAQC/PzerMRaBPyCBPyqXISCBPwC/MQCxIQChATCxMT+xATCBASCBIQCBARCBPwCBMQCBMTCBCH5BAEAAAAALAAAAAAQABAAAAWOICACQRkI6DCuJOG+JysGL1wIMm0YNHEUBNwqsDMgEL5AIqEYIhZPxqtwUI0CzwRDSih4E6KGeLl1vB4FMAASkTC1icmjmxZBKBXL4YLJaAoPgWoQEBsbGX4JHHR1Ih0eChkTGoqADQ9qMwR+GhwcXlSZAAJzDQNogZeiAUBeaAcNHw2iAygocQkCuQN+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+source_o-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMTCtPT29GxubMzOzPz69DQyNGR2ZERCROTi3IyKhIyOjPTy7PTm1LyqlPzy7PTq3LyulLyqjPTu5OzexOzWvLymhHRydHR2bFx2XFx2VFR2TEx2RHR2dFR2VAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJQC8BXxOEDOw0DkGo4MJHCq4FuYJBQUdnlEaVZgCgYVFoNVYRcYGBEZjBFfDRePEgkajIUXGxgVYJxoCp+hHBwdHowfIK4PDyEiIyStJSUFDwUmJiS2Sq8PILG+v4wOycrLDn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+source_p-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxDQyNPz+/FxaXKSipPz+xPzerISChATCBARCBASCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARVEEgQqrUz3yqGCJlUESRZEFVooWZAfJpbEkU9gNMqo4KBi7vSAfWjyFxIUnEkJAwPy9EugEDFSE+nMzojVKvLREGsKCgWjMVybDaj0eH2OZ2Objb+CAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+source_pl-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMS+rPT29GxubMzOzPz69DQyNMTCtHRydERCROTi3IyKhIyOjPzy7PTu5Ozm3LyqjPz29PTq3Ozi1MSynPz27PTm1OzizOzaxOzWvLymhLyifOzexLyedLymfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaJQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJSCx7WAgBwi52FAsi4oBINJnCpAqCkPChUSA3tEEmoFahUWFxiGSwphGRYaGxyQEn4NHZVfj2iLlR5qoHICGYyWHyAhIpB9Dxp+IYAjsGokaiFqJZAJDwkDHBwYJiW+Sg7LzM0OfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+source_py-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNza1Nze3Ly2rJyanPz+/Ozq7GxqbPz6/NTSzDQyNKSujIyKhHRydERCRGR2PHyaLLzObIyqNKzCZIymRKy6jPTy7OTi3ISChFx+HISaNKyuPJyaBKTCRKS+VISiVGyKJHSGPLzWdKS+TMzefISCJHRiBGySJJSyNLTGbKzKRHSaHJSWhLyulHSKNJy6RKzCXISWRLTOZJSuVIyuJGyOHHyWLOzaxJSqTGyGJJSmXHySPJS+JHSOHIy2JHR2XLyqlERaHGSGHFRqJHSOJGR+JFxmPNTOxIySbHyORHSWJPTm1ISiHHyiJFRuHMSqjPTu5OzexFx6LMTCtMS+rJyidISqJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfKgACCAAGFhoaDiQECAwMCAgQBBQGJggEDBpkGBwgJk5WXmgYJCAqeC4kFAwysCQYNDggPqIMQERITFBUWFxgEGagaGhsVHB0eH8ggvQQLISIjJCUmJygpKissLRcuCy8wMSMqMhszMzQ1Njc43QA5Njo0Ozw9Pig/LCxAQbRCOkM2iBQxgsLGjyJH+CXKoEABkiRKWCxhQYQBLUsYLhxgwkRJEydPoFwkhCEKRylKbNSYIlIRASpVCFj5UeMKhJaDAizYybPnAj+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+source_s-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbIyKjMTCtPT29GxubMzOzPz69DQyNHRydERCROTi3IyKhIyOjPzy7PTu5Ozm3LyqjPz29PTq3Ozi1LyqlPTm1OzizOzWvLymhGxudGRmdFxedFRWdERKdDQ+dHR2dFxidAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaHQIAQECgajcNkQMBkDgKEQFK4LFgLhkMhOl0iElbFgtEgOJQC8BXxOEDOw0DkGhYMJHCq4FuYJBQUEQN5RGlWYBQVFheEVWEYFRkaG40RXw2JGX6MaIiRHGCccQKAkRodHh4fjQ+tICEiIyQkJY0mJg8FJwWzJbVKD7gnI7K+v3EOycrLDn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+source_y-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxubPT29IyKjMTCtMzOzDQyNHRydERCROTi3IyChIyOjPzy7Pz27PTu5Ozm3LyulPz29PTq3Ozi1Pz69LymhOzizLyqjPTm1OzWvIyGhIR6dIRubIRmZHxaVHxSTHxCPIRydIReXHxWVHxKRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaIQIAQECgajcNkQMBkDgKEQFK4LFgLhgMiOl0mFFbEYVEgMJQC8DXRODjOw8DjGhYMIHCq4FuIKBASDwN5RGlWYBMUFRaEVWEXFBgZjEoPXxoSkX4bjYaZGBxgHZ2AkR4cHx+cSiAJCRAhIiMkJSaNCREgBScFKCkqtkq4sLK0JsFxDMrLzAx+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+tar-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaXNze3Ly2tJyanPz+/Ozq7GxqbJySbJyadPT29Pz69GxubMzOzDQyNPz21LSujPz25OzmxNTS1IyKhERCRKyqjLy2rKSehPz67Pz23OzerKSaZMzGxPTy7PTqvOzirMy+dKyeTIR2NPTq3LyubLyqVJySPHxyJOzi1LyunPTqzOzW5OzSzNzOrJSGNGxiNLy2pPTm1OzezLyqjJSKZOTStOzOxNzGtOTSjKSSRIR+LGReHLyynOzexLymhOTWlNzOhFxSFHRuRNzKfNTGdHxuLGxeJIyCbMy6pLyifLyqlNS+pOTOpLyedHRydJySfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfLgACCAAGFhoaDiQECjIwDAQQBiYKLBZYFBgcFkZMICAkICgULDA0LBA6Cnw8QERKgExQHDBWpCBAQFrm4EAkKAhcUqRgRGRqsGxIbHB0eAgOpCRofCw8WICEiIwMkJBDRCwsgICUmIico3CkqtissLS7mJy8wMTIzNKk1Njc4OSI6Xuzg0WOGjx/6gOQIEkTHiB0ohKjwYQOhoCEliBQxcuQIDCRJbNhQkmoQRhgflzAR2cRJSUFPekDpQbMHjR9OXCpywLOnTwd+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+tex-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxDQyNPz+/FxaXAQChKSipPz+xPzerAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARgEEgQqrUz3yqGCJlUESRZEFU4lkQREJ/2skU9BEaezzmRCwccwDCc+XwIFGhI0ZEMxiURxzIQkghp0+qjJlDDHdRnQPSyGu4oEfguRTrs9fqmWAjfPHpSkWMReyIbg34RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+tgz-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBIQChFxaXMQCxNze3Ly2tJyanPzC/Pz+/OTi3GxubJySbJyWbPT29MzOzPz69DQyNPz21LSujPz67OzmxJyadNTS1IyKjGxqbERCRKyqjLymhLy2rIyKhKSehPz23Pz+9OTevOzmtKSaZMzGxPTu5PTqzMy+dKyeTIR2NPTq3LyulOzirLyubLyqVJySPHxyJOzi1OzW5OzOxNzOrJSGNHRmJOzezJSKZOTSjGReHLyunOzaxOTWlNzOhKSSRIR+LFxSFLyynOzWvHRuRNzKfNTGdGxeJGxiNIyCbMy6pNS+pNzSrAQCBHRydLSunMSynAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfYgACCAQKFhoaCiQOEBI2NBQIGAooHjAiXCAkKCJIAAZ8BCwsMCw2XCg4PBhCCohESExQVCxYXChgZrAsSvBIaGxIbDA0JHB2sHh8gHx8SISIiIyQlBBysFR8mzBIiJygpBSUqK9cPEywiLS4oLzAFKjHkAAwmMjM06y81NgUmNxuscNCYQSIHuxopdOy4wQMgABw9cvjw8SMFEBhBhPAY4hAAkRZFjKQ4cgRJEiWgAiTy2AKJSSFLmAQ4MKDJSidPFggRAmXFhgADNthMJACC0aMQAjRZ6icQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+txt-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaVPzKjMR6RNze3Ly2tJyanPyODPz+/Ozq7GxqbPyKBPyGDPzGjPT29HRydMzOzDQuJOx6BPyGBPyKDOTWzIyKjERGRDQyNKROBOR2BOzezIyKhBwOBKRKBNSOXOza1CQOBPyCDOySZPzizPTWxPTy7Pz69Pz29PTq3LyqlMxmJNRyROy2lPTu5OTi3MSulFxGNIRWLMR+XPTKrOzStPTm3IRSNOzizOzavLymhLSyrEw6LKRuVIx6ZNzSvOzexNzWxNzW1FROTBwaFKSShOzWvOTOpOTazJyWjHRqXNzKrOTStLyifMS+vMS+rMS6pLymfLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfOgACCAAGFhoaDAgOCAQSOjgUBBgGCB4qEBAiaCAkKCJMACwwNA42bCA4PEA4GERITFKQVpwgWDwoXGBkaE6MDG6cOBAUcGB0eGgsTDR8gmw4OGwURACHIIiMkJSYIJygpKSoYgtYrLC0kLdAuKS8w1IIdMTIzNDUbLjYpG+KDABcRbtRrYWMDjhw6xg0KsCMAjx4+fmwAEiShvwBCChgYQqSIkRpHdMBjZCIFkh1JlCxhcqSJQkZOnjyBAgOGjihSpLwkhAFDBJ9Ae0bwEwgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+unknown-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXIyKjNTW1Nze3LS2tJyanER2RGS+VPz+/PTu5GxqbPz69BQ6BCxeLFSqRPT29HRydMzOzDQyNERmPKSypCRWHIyKhERCRDyGPKz2nESiLBxGHCyCHGxubPz6/PTy7Ozi1Ly2rKSipOzm3LyqlKSWhCRyFOzizLymhNTKtNzOvOzaxOTStPz27OzWvOTOpLSupLyedMS+rMS6pMSulLyqjLymfLyifAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAamQIAQECgajcOkYEBoDgoBQyAJOCCuiENCsWBIh9aGw9F4HCARiXciRDQoBUnlYRlcIgsMG5CxXAgMGhscBRAEBRd7AB0eBBoIgxUfICEiikSPgyMMIAokJZcBkBybJgomIaBJAZoMpyCmqkMBFCcVCrgKKAwpoSorKqchKCwtvasIFBIhLiYvLzDHsxQNMcMKLDAwMqEz3jQ1NTY3ONyrE+jp6hN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+vcalendar-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXDQyNAQCBMTCxPz+/ISChAQChKSipAQC/Pz+xPzerPyqXMRaBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARyEEgQahVijMmD/oRAbBw1FCgaFFrpEbB6jt1g3OpFAscxwATUiIAgBRKJXiqIYJEMBQNSWSAYgptrMDo9FJqKrHArTR4WLGisSkbebE12gXFFGRBFyd3eaFSvbx1xCDBXC2E1e1EECo07ABkaBh4fGn4RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+vcard-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXDQyNAQCBMTCxPz+/ISChKSipISC/ERCBMTC/Pz+xPzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARvEEgQahVijMmD/oRAbBw1FCgaFFrppeo5drKhXqQUEIfREyweqWIoHo4GDYtkGxwQ0CjitEkUrCyfYjtdbJoFW/agmLJWWZSY3B0EbGJ4uAwcHlK2HpTg7YgHBgQjDH0THoGBCwULjDkAGR+RH34RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+video-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaTFxaXIxuHJyCLHx6ZLy6vJSSlNze3Ly2rMy2RNS+TKyqrMzKzPz+/Ozq7GxubJyanLSePKySNKSSPNTS1JSWlDQyNMSqPLSmVNzKZJyenIyKjHRydGxqbERCROTWXNS6XOzidNzOZPT29MS6rISChLSulMy2TLyeNKSOPJyCPOTi3JSSfHxiFGxaJFxWLFROLPTu5Ozm3ISCdDw2BFRKHHxqPFxWPLymTMzCvPTq3OzezKSWTMzCbNzGZExKNHx6dLyqjMy6XMSqTMSmTEQ+JHRybMSynISCbMyyVOTWbLy2ZBQWFGxqZOzifDw6LCwiDISCZJR6LIRqJBwWDExKRHRuXHxmJGxeJFxSHCQiFFRGFGRSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfhgACCAAECAoWHhoMDBAUGBwiRkQkCBwGCCgsLBQwNDp8ODxAOEQIAChITFJwVoA4QnhYXEhgZBRoFG62fHB0eHxcgIQUiIyO5uyQIJSYXJwUoKSoUKwEWniQkLCUXHy0DLi8vMDEfBw0kMjMnFwAfNDU2Nzc4OTgmOjs87ILvEj04NPj4ASRICR5C2vVrEWAIEQwSihg5giThIHdJiCgJMWIJkyZOLA4K8CHJkycimEAJEcWJQkECEHyQEqIHFAJTqFSxcjGAjhIfrlzAkkWLDS1bel5Y+mELly5YCEyQ4CcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+wordprocessing-16:mimetypes mimetypes16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFRSVFxaXFxWTNze3Ly2rJyanPz+/Ozq7GxqbHR2dHRydGRmZERGRMzOzCwqLJyWjOzi1Oze1PTm1PTm3IyKjDQyNERCPPTy7HRmXCwqJPT29DQ2NNTGnOzm3PTq3CQqJMS2hDQuLKyaXCQmHBwaHKyahLSijKyehBQaFCQiHHRqNPTu5LyulCwuLHxyNAQGBBQSFERCRBweHOzezIyCVJSSfOzavLyqjOzexOzWvLymhExGJEQ+JExCJExGLCwqHOTOpDw6POTStLyifMTCtMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfWgACCAAECAwIChYeDjAIEj48FAgYBjIIBBAeaBwgJBwYDjAoLDIkNmgsOnw+CEBESExQSEgsHFQsJDRYAFxWbmhgZGhsEBRUcHQ8cEB4fzhAWICEYxSIjJCUDJicnKBkpKissFC0uLwAwMDEyFzHpDxgfES27DyozMyX6+TMTEzQtWJWoIYGgQRsl/t3AsStFQRoGIYrIkUPHDhcANPDo0cMHxx9AUtzQEWQHKwAcSDy4IAQbh5FDghDZNShAkZsFjBzBgaQnh0YcHojgIMIFBwtBXfgJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+1downarrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBBQSFAQGBDQyNExKTHx6fGxqbFxeXGRiZFRWVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFxaXDw6PPz+/MTCxLS2tIyKjKSmpKSipJyanAwODDQ2NHRydERCRFRSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZzQIBwSCwaj8ikcslsOp/OgHRKlQoCgymRUDAcEIkwYgxWFBYERpHQcDwgEclEQmk8DhWL2kiIXDBwExMNGRoJaUkEEH8bEQ0cGgcWAksEHX8QHBKSHk1sfxMHH5ROBBsOICGkT2wiq1CIULKztLW2t0h2QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+1leftarrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ5QIBwSCwaj8ikchgQLJGBgfNZDBAKBirRekBMtYGEYsHIgsWNhOO7tCrShDU18Hg/CJAIG0o4wCUQcksTFBUSCRYSEnpUFxgIGQkJGYyNGggbHBaVjR2QCxEeWkITHQ4IH3tPFwEMA2ajAKUgqlQTTbFEE7W5vUgGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+1rightarrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNGReZAQCBMTCxGRiZMzGzOTm5LSytPTy9Pz+/CwqLOTi5Ly6vCwmLMzKzJyanJSSlBQWFKymrIyGjCQeJJyWnISChISGhHx2fKyurDw6PAwODHx6fHRydDw2PERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ2QIBwSCwaj8hkMRBQKgOCgRMZIBSk06XhEM0SA4iE4uoVLhCMhqLrdSAekMgYO5VM4BQ521mxIC4UFxBWdEkSERYYFxETGQGFSBKCGBEaGRuQSBwdeZaPXpsQCB6YZQMdEI6ZSgMepKusHh+wrCC0rLdlursGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+1uparrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBFxeXDw+PMTGxHRudPz+/JSSlLSytIyKjHR2dISChIyGjIyOjLSutLy6vKSepJyanISGhJSOlOzm7Ozu7MzGzKyurJyenDQyNGReZKSmpIR+hCwuLCQiJBwaHBQSFAwKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZtQIBwSCwaj8ikcslsOp9QYyAQFQYEAyr0Sihkn1fDAeHVLsOJNELxVaITC0bDUU6GH5AIQ8KYrNtFVxQVFBYWFxgRCREYdUQZGhYEDwgIGxAHCQocCgWOQhmhGR0epR8gqCFTq1Wtrq+wsUt0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+2downarrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAQGBBwaHDQyNExKTHx6fGxqbFxeXGRiZFRSVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFRWVDw6PPz+/MTCxLS2tGRmZDQ2NAwODJyanKSmpKSipIyKjHRydBQSFERCRExOTFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAasQIBwSCwah4FkQKBsDpoBIqFgOCASCYRWm1AUFgRGkdBwPCARiWRCaTwOFYvYSIhcMOiJpJGZaDYcR0IEHXceEQ0fICEWIoJDhHcQHxIHgI9SEHeVG46YUh8OISOen1INCqWmUnOYTUxQAU9NUlRWWFtbCiRgrYNlZ2lriG8lYUd1khETE24gCZeCkRgeFBAQIAeNn9OTlXKrBJoYnKrcoaPmpmSpq3S+7u50QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+2leftarrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAavQIBwSCwaj8gkMiBYNpeDZzEQXRIKBmPgmtUSDgipcAsWjxOKBaN7Tq+n6EbCIQ3E5+KtQk6gjwl7CX11D3sPBBARTQGFDYeJT2R8EhB0koKUfgATFBUSCRYSEoqcnqCiikMXGAgZCQkZqautr7FiFxoIGxwWqQC4ury+qh2tCxEexMbIRhMdDggfYs7Q0kcXAQwDbELY2txEziBmmx3jSRNMR+nk4e2b70ry80QGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+2rightarrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTGxOzm7CwqLLy2vPTy9Pz+/Ly6vCQiJLSytLS2tLSutOTi5MzGzKSepIyKjJSOlKSmpMzKzJyanIyOjBwaHIyGjISGhJSSlISChBQSFJyenIR+hGxubDw+PHRydHR2dEQ+RHx6fERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8hkIIBcJgEBweAYnTYJUmMAa9USClniFtwlGg6IRFhoUKTXwwWj0FB3F46Hwl6UQyISfAB+EROCQgsUFRYSF3yJEIyBaxgWDBkaGRtclQwSHBIbEGEdGx4fGhcOICEDGBsWHBmqIq1CHRIWGRMMIyRTHRy6Er22tyONq8YdJRe0xkIDwr2/QwMfliMmZQADIxasZd4e4UYDIr7c59rc0eVFA+/m0EQD9PDt0flP/P3+BkEAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+2uparrow-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBGReZDQyNMTCxHx6fPz+/JyWnKyurHx2fDw6PJSSlISGhIyKjIyGjISChLy6vJyanOTm5PTy9OTi5MzKzLSytKSepMTGxMzGzLS2tLSutKymrHRydCQiJCwmLBwWHAwODLy2vHx+fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAajQIBwSCwaj8RAAMkUBgSDZdP4JBSi06TAcEAkFNLp07BgLLzY5njRcDzO3zB1C4lEGI83Wj58SiYUFRUWdg0XEXFFAwIYGRoWGxwRZQUFHZdgRAObmx4fHiChISFKpVlKWUdPaalOAlasp1sHG4myZGZ7Yltsbgu1mUhjdRF5egmxfQJ/gYOFdrZDi40iFgiSCw8jBQmYcpydn6Ego6WorUwGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+abs-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAWABYAAAJLhI+pF+vW4HMR1InqxbJzBiLCeIxCaIkneQJk6rkl+2qlONzeNi+2YvKhEIOW4iczvJSoSDDIbCpbq2oGBXUtd59r7IPshsHdB70AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+airbrush-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAASC/AQCBPyChMwCBIQCBPz+/MzKzKyqrISChDQyNPwCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAR8EMhJKw3BahvEyNvWDV+ojQMBAhgmeukaFHSxTqh6FYZx3CyYbtf7XYRAFs8nQ56WxiBpyOEdjLkkrnA9IAKGqXbnTYAP1NDMe0Z8JYR4nPP1seEqTHpWZMupVHx2by03Q4JXbxuBfYoaaVZ3i4YKbo4WaQAKBCxjcEAGEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appearance-22:actions actions22 22:photo:22 22:R0lGODlhFwAWAIYAAPz+BAQCBBweHPTy7Ozq5ExKRPTu5NzStLy2lCQmJAQGBOTezNTKrLyylNTKpOzm3NzWvOzm1MTCpNzaxISuvBSGvLy+pKSehOTexISutKTa7IzS7GSarJTW9HTK7CyazBRypMzGpDw2LOTaxEyKpCSSxARGbERCROTizMS6nDx2jARajIR+bOzi1OTi1MzCnLy6lOSupNx6dGS2rJS6pMy+pOS2pNxGTKwaLDSmpHTOzES2tIyuhLSmjPyqrMw6RLSOhLzSrGyqbFSmXJSyhNTOtGTCvLzm5CyOjEQ+NPRqbOxOVKyKfMzizKzepFyuZJSqlBR6fCRmZJSKdDw6NLxqZLQiNIwyNLSejDSCRJzWnEyiVHySbBRiZDQyJMSijGS6ZHSCZJyafDRmPISKbJyifDw6LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAXABYAAAf/gACCg4SFhoYBAgGHjIQBAwQEBYwBlYiQAwYGi4UBBwcInIIJA6WRBAqdCwcMDA2pggEEDpUODwSiAAEQnwwHnI8RwBIGsLoLExQVFg4XiwEPD6IKGBjAExkaGxUcocfSgwHV1uITFR0eHyAhIroRERLAC/PVIxMkJSUgJvHH1RAKTixAgQzZhAkpVKwwwYKWrgnzFrRY4IIgBoMTRryQAGPjs4zzYsgYQdIgsgMzaNRw0CCBLgn2bNzAceMgSZITcujYwaNGj2sjcPjw8QNIECFDiEgoYuSIDiQOkoSTMAGHkiU4mAhp4uQJDyhRjOSQMiUXFQdVrOC4giWLFidbRri8QBKlyxQviIp8udKjRhYwYLKEedFAjJgvucI5cFBEgoMxkMm82PjFmCERix1wLCNmcg8viRGZ6aHZcQ8zoRtVWp16UCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+attach-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBMTCxPz+/DQyNKSipAQCBISChFxaXDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARrEMgJgqA4zzus/gLhFd5HCcZAXqsphYPUdhcYFNRcZnvdtpnDqPTbUWgAJKBYwzBlw+bRo3xmkNWoBgm0OrVLn3GC9RgCk8DhUw7c0rHPr4CDu5SYQNyEt7uSY3p/UAKFhYKDSQOLiwgFdhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+back-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRGZAxCZGyavExmjHyatOTy9CxihISevPz+/KzO3BRylAw+XAQCBDRWbPz6/FzC3CSuzDyexJzO5Mzq9CxSdAQOFISmxNzu9HTS5BSmxAyexDSuzJTa7Mzu9Kzi7GS21CRmjAQOHHSWtLze7AyWvHzG3BRihAQKFCTO3BS+1AyixBSWvBSOtBSStAQWJBSixDzW5BTC3BSqzBS21CTC1ETW3AQSHEze7BRqlBRmjAQCDBR+pBRefBRSdCH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMqBcMpvHgGAANQYIhWdVGDAcENQtIJBQLBgNx0MQaDuQXcghIplQDhBIxXKJYiAZGhscHR4VHyAhIiNWJBklGhIbJoQnFCcTKIxFKSgbKissJi0mJi4vLiYoMEcXKDEyMzQ1Nje2NisoOEg4KDU5K6g6OwwoKAN9SCOeMmgwz884PEq9PT4NYkPLP9jZQikN3d4AKVrjKePp3gZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+blend-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQmJAQyNAQ6PARGRARSVARmZARubARuXARmTARiPAReLARaHARKBAROBAQCBERydESChESOjESanESmpESytES+vETKzETKtETCpES+lES2fESybESqXESiRAQ+PARiZARybASGhASWlASmpAS6tASynASqhASiZASaTASSNASKHAR+BARiBARydAR+fAS2tARKTDRaXARaXASOjASKdASCZAR+TAR2PARuJARqFAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa3QIBwSCwaj8ikcslcBp6CAaFQMBwOiIRiwWg4HA9hAAKJSCaUiuVywWQ0G07H4wkDxp8CKCQakUolJicoKSorLC12eHouL34lMIKEhoiKEFMgLn0kMIGDhSyVYhADjJuAkoWHiaMEMXuOnJ6Tq5alBpp+nSeflKx3l6a6s6CiwKWZm52pvpaue8rEzaPIubLMta2Mscu9ob8BMgIfBDPJNDQ1Njc4OTotDXYP8/T19vZN+fr7SXRBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+bookmark_add-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCwqLCQiJCQmJMTGxAQCBLy+vLSytERGRFRWVKyurKyqrLS2tKSmpHR2dJSWlKSipISGhGxubIyOjGxqbIyKjFxaXGRmZHx+fPz+NGRiZPz+ZPz+HMTCBKSiHPz+jFxeXPz+XPz+tPz+zPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAamQIBwSCwaj4Gj0hgQLJ+AAaEAVQoI06pRYDhkoYgwIhEgKBTfZ2FhaBsYDS8VWnA8Go0FJIKeqyUTDw8EDHBpSwUUFQ4UFhcYDQYFfkoFFxEQDG8KEAUZlEeWGBIakw4FG1STiBoYBRwdBR4fHgUdHKBEBSCnIR8iIyIfIblFu6ceIyQjtcXGCbLKzAUKzrq+wMLEVa+xs7W31kOTk6nkWuOf6Ea5QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+bookmark-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBCQmJCwqLMTGxAQCBBwaHMTCxLSytERGRFRWVLy+vKyqrKSmpHR2dJSSlJyanISGhGxubIyOjKyurGxqbFxeXGRmZHx+fKSipLy6vGRiZLS2tFRSVHRydJSWlHx6fCH5BAEAAAAALAAAAAAWABYAAAWWICCOZGmewamaQrq+wUC8azHINGocOI38iIRAceDNaISFYklkGHOEhoNBfUAOhuOLEJE8HoPiRKFdESiQBqViuTDIUAsEcyAeGJmyiqC5RCwJGg0YcEh9D0V3Dxt6JwQVDRYVHBUdi40mjw0PTgwQHgeYJQQJfxUXFxAOoTkFpQ0fsRSimQkWEQ0VtI62HLt7vjl7JQYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+border_all-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI+hI+pyw0Bo5wR0TttUJDv0yWhRopfaYzguaKt6aasrGFYbVPxM/O7Snv9WEAfTIgMKpNGWU63emYc1GrVUAAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+border_bottom-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIyhI+pyw3xIpwyOgOv1dvl+2lhMzIlyZ1KQLUVm8Zch4ozbcq6l7L+D4QhgsTf7Xi0FwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+border_fall-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI/hI+pyw3xIpwypgBRdg/v9h2eyBnZCIKYxX2oEsJruVKjHS8vk3duKZnpHKjeRSTU0HYpTcxWgRqB1KrVYC8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+border_horizontal-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIyhI+pyw3xIpwyOgOv1dvl+2lhMzIlyZ1KwLbuyybw7KY216Einpv377FRhhUV78igFwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+border_inside-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI7hI+pyw3xIgxTRvcg1oku3njbBx4liV3dqYbsSsXyLBr0Pad1iCovsmOwgjbdz9TrGHWWSeWZikoXhgIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+border_left-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI6hI+pyw0Rnox0ygNXdG9z43Xal30gUiYhk5LoenJQRVtti5FwE+Kx4+O9RrIda6gwDmvMi+kJjTIMBQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+border_outline-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI8hI+pyw0Bo5ww0SttcKci/ymgMTZl+Yjbt3Jn26lautX0A+OizHJkjsrper7XbkZ0ATEYDZPii0qnU3sBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+border_remove-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIthI+pyw3xIpwyOgOv1dvl+2lhMzIlyZ1KQLUVm8Zch4ozbcq6F7s+fgsKb4YCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+border_right-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI7hI+pyw3xIpzyQRdVuIZj+3nHhogOiZng+I1qoqIdRVfbWy5y1u5M7MFphB1dsDULGXO15goJjUoRhgIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+border_top-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIyhI+pyw0Bo5ww0SvdCdrw7oGfNnZlczIpKorc+8RwZbZgXOc2uevOqpjJhrCb8QgwFAAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+border_up-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI/hI+pyw3xIpwyOgNRyPq+zTkcuIQKaV3T1pgHinmfm7AUedMa64Vw3bLJMr9TiZcSFUsnkw54q0Rl1KrVYSgAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+border_vertical-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI6hI+pyw3xIgxTRvcg1oku3njbBx4liV3dqYbsalFeJTp1iCovcjNsb9iZhMFcJwXUxTJLYuoJjR7sBQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+bottom-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRKZDRSbBxCXJTC1Mzi7Nzq9NTm9Bx2nAQCBNzu9JzG3Hy+1HzG3IzO5BRmjPz6/LTe7Dy61AyStCTC1FzC1AyGrETS3ETC1ETa5BRulAyuzBRylAw+XMTe7Gy+3CSqzAyexBTC3DR+nIS21KTW5Nzu/KzO3FzC3Pz+/ByixEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaXQIBwSCwaj8ikcnkMBAQDgjPAFAYKhsMBkVBUAYEFo+F4QLzVQEQyoVTOX/XBcsHA0+vMRbNBMwkRDhxuHX5GTlIeHh8gISIjFAEeiVRECiQlDAUmgxQjIhwiJHdFlycoKSIUFCEjGiGkRpcqCxYijxorsUezcxYsuoZJsxLAu0qXB7DCTJfHvArR0tPSSNTX1V/a20J2QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+brace-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAWABYAAAJRhI+pGbHYVHzQnUnrtXn7/gEYIJRHKRgYZraGuXLp28LcNL/Dqd4cYmJYRqegsKcY5DRIUhHYFDlQJGMuVn1ljdhqjhoiZrogKbMjFh/LHUMBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+brackets-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAWABYAAAJRhI+pyw0Bg3vxwImu0Zha2XkbaAjmYQrjh6qnCpwcB8evTGp1PKDrnzglZqTWDsg5DI5IUE1Yatpc0BrRFr2xfiljJlecXEPjDjG5iIRDCHsBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+centrejust-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIhhI+py+1vgpy0TogztlT7j3CiBJbZWJlqg4rry7jw/BoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+charset-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIIAAPwCBAQCBAQGBFxaXAwKDBQWFAAAAAAAACH5BAEAAAAALAAAAAAWABYAAANLCLrc/jDKuQK1zmKo3/YVJSpBSZYmKaTkAAwYoQwFELjvpisyaTM7H6AH+3lQMZQwExrOOiBh7/cJGokaXHGpQVaUo7B4TC6bw4AEACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+colorize-22:actions actions22 22:photo:22 22:R0lGODlhFwAWAIYAAPz+BAQCBBweHPTy7Ozq5ExKRPTu5NzStLy2lCQmJAQGBOTezNTKrLyylNTKpOzm3NzWvOzm1MTCpNzaxISuvBSGvLy+pKSehOTexISutKTa7IzS7GSarJTW9HTK7CyazBRypMzGpDw2LOTaxEyKpCSSxARGbERCROTizMS6nDx2jARajIR+bOzi1OTi1MzCnLy6lOSupNx6dGS2rJS6pMy+pOS2pNxGTKwaLDSmpHTOzES2tIyuhLSmjPyqrMw6RLSOhLzSrGyqbFSmXJSyhNTOtGTCvLzm5CyOjEQ+NPRqbOxOVKyKfMzizKzepFyuZJSqlBR6fCRmZJSKdDw6NLxqZLQiNIwyNLSejDSCRJzWnEyiVHySbBRiZDQyJMSijGS6ZHSCZJyafDRmPISKbJyifDw6LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAXABYAAAf/gACCg4SFhoYBAgGHjIQBAwQEBYwBlYiQAwYGi4UBBwcInIIJA6WRBAqdCwcMDA2pggEEDpUODwSiAAEQnwwHnI8RwBIGsLoLExQVFg4XiwEPD6IKGBjAExkaGxUcocfSgwHV1uITFR0eHyAhIroRERLAC/PVIxMkJSUgJvHH1RAKTixAgQzZhAkpVKwwwYKWrgnzFrRY4IIgBoMTRryQAGPjs4zzYsgYQdIgsgMzaNRw0CCBLgn2bNzAceMgSZITcujYwaNGj2sjcPjw8QNIECFDiEgoYuSIDiQOkoSTMAGHkiU4mAhp4uQJDyhRjOSQMiUXFQdVrOC4giWLFidbRri8QBKlyxQviIp8udKjRhYwYLKEedFAjJgvucI5cFBEgoMxkMm82PjFmCERix1wLCNmcg8viRGZ6aHZcQ8zoRtVWp16UCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+colorpicker-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBMT+xASaBASyBASCBARCBPz+/KyqrISChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARZEMhJ6wzBahvEyNvWEcMXcgJBFuApjavRhlgaz6J9u5dQDAUZ73VA+FhDQOAQQCQEQt6ymcjgREznlZatJpXdLZYq1ky137M3qS5zwl8lOR5IIDBx5TpviAAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+configure-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBISChFxaXNze3NTS1Ly6vKSipNTO1Ly2vNza3Pz+/MzOzOTe5DQyNOzu7MTCxGRmZMTGxPTy9Ozm7Hx6fPTu9MzGzGxmbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAW1ICCOZGmeaEoGbBsI6joMRGEcbQwESDIrtVtAF1gwDLNaAmfKiVgLBJKgwB1KxQZrBHU0FAXmavFoQLYiB6TxFXMj5AZBwnJI2I3wcNWALyYEcgoKXxRhOHs7XxEVCwsWFgoUDRYUFwwQB25ZCxiNjo6GkwUXN2NsCxEYqhUHoQ0MEglYRQQXErcHrI55FycuB2YSmoyOBTEtB2sXuhU6XAENC2a6z9AKCwq+1tAN3E2J3ySkIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+connect_creating-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxOTi5AQGBNze3Ly6vISChNza3FxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAAR4EMhJqwzY6omD+MNGdR8YilNZnug0qGzrqrL1lnV1fyJBVB6VQEMoGH4ADGwQkxQPBwMiKGA2J8VEAnq0tgiKg5aL/C7C2gTjKCM0zowDQ8tuNQznNL7cKzjOUQsNfER+gguIg19+Pm6ChBZFDmWNi5M5FIyYFHQRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+connect_established-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBKyirPz+/KymrOTi5KSipMzCzNza3OTe5Ozi7MzGzPTq9OTm5ISChMS+xFxaXNze3GReZIyCjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWLICCOZGmeaBkAQpoGg7C6JizTQT7CxPwOwFWgYPChYIXkIHC4uQKGAiKRKCyNpxxUUVViVYNFLkqtLo+DAkMMLXQPXwAy2WCTF4544FGtKuwPDhB6DnxuUmyCcXIQhV1uYoMuEAcOBxEKCHg6TzGFCJUSizuejROKOAM9OY2SnUU7nD89NCcDsLUnIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+connect_no-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBERCBAQCBPz+/MTCxOTi5Nze3OTm5Ly6vNza3ISChFxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAARiEMhJq7046827/+AVCKE0Dh9BAGdaGISAToFGFMcBU+11I4hDYseSZQiKwwKoI/QwBIYiuFDCZseGdIlYEjUNg1SpY6w2N4cUIW6cjwW1lsFwo+MqgtZuw0/ydw5vH34lBhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+contents2-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBDyGhCyCfFSWlESOjDyKjDSGhCx+fGSinGSenFyanEySjHSqpHSqrGympEySlBx2dISytHyyrCR6dKTGxHyurHSurHyytGSipCR6fARmZFSalEyWlBRubAxubBRydDyKhDSChLSytPz+/MzKzIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbFQIBwSCwaj8ikMhBQIpmCQdM5ZBIKhgNiugwkFAsCI7pNMhuOxkNBgBgEiAi3GkBLJpJHYgEpaClyREwVFhcSEhgOGQoMfgMaERtcARQBFRMYExZ6HB0FUYAekkIBHxqWFmlrC1haESAfG6MBGx+VFRgKYH0hInGRklO0ppYXCwwMWQiQHkwjgrWnFRdYZHIBJCTP0LaWGAcDW9jZ2nMAw9IWTOQkJSZMRsOV49nu8E+19PbmR7TY+1TovONH5V7Ag0QMBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+contents-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAAQCBAQ2NPwCBHSurIS2tBx2dBweHPz+/Ozm1GxiTGyqpPz6/Pz69GSqpOzaxPzy5HxuVLSmlOTazPz27PT29NzClPTexHxuXLSmjAxqbFSinPTy9KyehNy+lPTy5Pz29HxyXNzWxKSahOzexPzy7IR2ZOTWtESenPTy7KSWfIyCbKyijAQGBDyalPTu3KSSdDSOjJyOdCSGhPzu3OzizJSGdPTq1PTq3JySdMy6lAyKhOzWtOzi1OTOrJyKbMS2nJySfMS+rAwCBNzOrNTCpNzKpJSGZKyafLSifLyylIx+ZHx6ZDSChAQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAIALAAAAAAWABYAAAf/gAABAoSFhoeHAAMAiI2IAAQFjI6EAAaJkQeTjwAICYkKBQcLm5WdBwyfhgChB66bp64HCQC1lQ2irqQCAA4PowsLEBESE4wAuLIHFAAVFr+uDBcYxRm1GrmuGxwdFh4Mrh8gGCET1gDYyhsiFSMkDAsMDCUYJhvnJ9kHKCnODwwfPlBQsULCPRYAWogK9sHFiwoOPEyQh0JFPXO1YBSYwBEFghjdHkwQOYGgwQwIZRR44GHGDBogabhAsYEEihrUMAIoUMCEDRs3HODIYQHFA6MPcJA7KICFjgw7eIzo4cOfiwc/gKwIUm2SkKdDdlDt4AABDaU/iIRwwbTSUyJFOow4S3Hkx9oNDDZgXPU0h1wcSIgEGUw4ibVET5WoWMKksePHpdxmyKADAEIWly9HJtQkQJMmlAgZCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+contexthelp-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBAQChAAAACH5BAEAAAAALAAAAAAWABYAAAJQhI8Qy5F/ghBsLuOgpHHy+0hZ94HINiqWwoQrtjYpNqJ0A8Hcjbs73yPNZEHVDygTJohJWqiZe0JPM5ajtXxFMkXnklqNgsPiWzmHPatzhgIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+crop-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBMT+xASyBASCBASaBISChMTCxPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARUEMhJq704681r+EFHBcIwEKFImmfKkURhoh1cyO0rxEWZa7bezIUJ7gg04O62A22MyeeyF1XymrUSs5pZmbA61u+FLBOBhrThozq4D2cgYo6IawwRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+decrypted-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBGxqbFxaXExOTEQ+RAQCBPz+/PTy9Ozq7Nza3NTS1KSipFRSVOTi5Hx2fJSSlKyqrJyenJyWnDw6PMzKzKyurDQyNFxWXMTCxJyanHRuLHxuLGReJFxSLFROJFxWJExCHERCHBQODISChHxyLHRqNIRyNHRmLLSqbKyiZLy6fOTarPz67Pzy3OzitKymZFxSJJySTNTSnPTy3NzSpMTChLSydKyqbKSaXJySVIyGRGReLPz23NTOnMzCjHxuPLy2vKSmpOTe5LS2tLSutHxuNHRuPMS+xFxWLIR+RDw2HFRKJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SDAQIDBAUChY2EAQYHCAkKCwyOjZANDgIEAQoPjJiDAg2iggQQp5gMBwmrDBESl6MTFKuoFQSjABYRF40CGAW8BRm7hQwNxBobHB0eHx4gISIjBdiEAhYFJBslHOHSHh4hBSHlxIUmJygpKissBiwtLi8pGjDqhBoxMjMuaNSwcSMFjhw6dnjYRyrGCh4ueviw4Q5HDB0/PjAUJCBCAwMIGiiggAEIBFk/FgYLIgRkggQkhxAJkqGExkYMFnxsIGRkSQgLHhRRWUjAggQgG8AsSWRBBiP6VrYMOfKIyaBDNwLo+HHSUplOSyDRqiEHjRkretRQkcLgxayNF0wksQGQxsSKMTIq0QpgCba/gAE7whEIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+down-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRKZDRSbBxCXJTC1Mzi7Nzq9NTm9Bx2nAQCBNzu9JzG3Hy+1HzG3IzO5BRmjPz6/LTe7Dy61AyStCTC1FzC1AyGrETS3ETC1ETa5BRulAyuzBRylAw+XMTe7Gy+3CSqzAyexBTC3DR+nIS21KTW5Nzu/KzO3FzC3Pz+/ByixEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaRQIBwSCwaj8ikcnkMBAQDgjPAFAYKhsMBkVBUAYEFo+F4QLzVQEQyoVTOX/XBcsHA0+vMRbNBMwkRDhxuHX5GTlIeHh8gISIjFAEeiVRECiQlDAUmgxQjIhwiJHdFlycoKSIUFCEjGiGkRpcqCxYijxorsUezcxYsuoZJsxLAu0qXB7DCTJfHVQrMX9PU1Uh0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editclear-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAWABYAAAJBhI+py+0PYZi0WnqC2Lx7HhjaR3YhMArBUHpnuramCLLy9tY3TuP2nfPtVD3VTxY0DpNDHqo5E12mlYj1is1e7QUAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editcopy-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFPz+/DQyNISChDw6PMzKzMTGxERGRIyKjFxaXMTCvKSmpHR2dPz6/Pz29PTq3MS2rPz69MTCxFxWVHx6dJyWjNzSzPz27Pzy7Pzu5PTm3NTKvIR+fJyGfHxuZHxqXNTCtPTq5PTi1PTezNS+rExOTFRORMyylPTaxOzWxOzSvNze3NTOxMy2nMyulMyqjAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbYQIBwSCwahYGkUnk0BgTQ6IAQaBKfUWhBYKhaAU+CgXAQIAyChLeJzSIQhcH6GFaM0QtGY5kstqEODw8QEQELAhJTc08KBBMEFBUWDRcBE1pca20SGBkaEBscAY5maFRIAgoLHRQRHh8gIQFlZnByqA8ZGSIQIyQjJQEmYgJ5p2ACrK4gJx4gKIZZAgdeAQ4ZI9kjKSor0AwEjeAs1S0cHAslLi4vMDDRWeRIfEsxMeET4ATyVoYLC5fizXEiAR84BeMG+pEm8EsAFhAjSlR4hR6fLxiF0AkCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+editcut-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBAwCBPz+/OTi5JyanOzq7DQyNGxqbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARbEMhJq704gxBE0Bf3cZo4kRJqBQNRfBucyudgvJS6VaxLzyMa6/bLiWA9HOg4VIIkL5vzuRkcpkvRIIAorphJLzBW84WEuRZWp6uaT7J2Sh1Hit3OY/ZO7WvsEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editdelete-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAASC/FRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanPz+/Ozu7BQSFCwqLDw+POTi5PTu7MzKxIR+fCQmJPz6/Oze1NTGvPz69Pzy7Pz29LyyrPy+vPyupPTm1BQWFIQCBPwCBMS6rPzSzNTOxPTi1NS+rPTezNzOxPTizOzWxMy2pOzaxMy2nPTaxOzOtMyynOzSvMyqjPx+fOzGpMSihPTq3OzKrOTCpNzKxNTCtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf8gACCAQIDBAUGBwgJCgsLgpCRAAwNlZYODxALEY+SkAMNEqKjEw0UD5yegqCjrRMVEqidkgWhraMWF7GptLa3EgEWFRSOnhW+vxgZEBqzkBvItxwdHryRCNGjHyAhHSLOgtgSI60c2yQjJd+eJqEnKK0hJCgnJSngAO0SF+8qEvL0VrBogW+BLX4oVKgIyMIFQU8KfDV4R+8FDBcxZBREthAFiRIsOsygsVEUh4Un3pGoUcPGjZInK65QicPlxg8oX5RwqNJGjo0hdJwQ6EIkjRM6dvDYCKIHSBc1Ztjw4eOH0oIrsgIJEqSFDBo0cuTgsdSTo7No0xYTZCcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+edit-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBISGhISChHx+fHx6fHR2dGxqbGxubGRmZGRiZFxeXFxaXFRSVIxSLPyuXMzKzMzKxMTCtExOTPzqrPz+/NTS1MS+tOSaVPyWNPz6/IxeNPzavPyKBNTW1PyCBPyGBJxmNPzOpLx6PNRqBMSCRNySTPyCDPSGBMxiBKROBHRydPSylOyydMxmBJxKBAwODPS2lPTq3OyabJxGBPTy5PTGrOyOXPR+DPz69PzmzPzevNxuPORqLMReFPzy7MyCXKxiNIRKHBQWFNTOxPzixJRaPFxONHRqVPz27PTy7PzStCwqJDQyLJSGdIx6ZPz29PTu5HRmTLSKbMSGZHROPFxKPJSKfJyShKyehMyuhDQmHEQuJJyOfLSijMSynMS6pLSefDQyNHx2bKSahLyqhLymhOzi1FRGNIR+bNzKtOTOtOTKrOTKpLyedAQCBFRWVPTq5NzOvLyunLSmlNTCrOTOrNzGrLyidMS+rLyynKyijLymjLyqjAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gAAAAQECAwQFBQYHBggJCgsLDAwADQ6CAQ8QD5ydEJ+gERKWE4ICDxSpqhWqqhYNFxMYphCtqaytGRoXGxgcggSoth25u70eH8APFR0VzMzNziAXIRjIvwAFwq3EqSLUGB/iI4LathS4JCXVJh8nKCmCKrXDFCss1eIfLS4v8ssdmgWsAGNDDBnt3s3wJ+jAtlUhaNSwccNEi4WCBBl4SAHHihw6ZOzg0QNjRgAG6KXK4CNEjBU/gDQI8kLISQAIADobAoMIzCINjLw4YvNkAno4kCRRUuNHESNLmDRxUjSjAlRPfECJImUKlSpMrFzBIqWqoKtJaWSJomULAy5XXrp4+QKGYcYFoCBEWRImi5gmY7CQyVLGriAGD2jEMHMmCxc0Xb6kUbOGTRs3N988gLM4jpw5Y+iwqcOGjZ07mE8yiGABz5c8c/Ts4cOnDJkybS7fdMO7t+/fvDMaCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editpaste-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQWFDw6FHRuFGRaBFxSBAQCBAQKBCQiBIx6HPz6/NTOfKyiXDQuFOTm5Pz+/Ozu7PTq5Pz63PTyxNTOjKSeRExGLMTGxMzKzNTS1NTW1Dw2NKSmpKyqrKSipJyanNzWlLy6ZLSuVIx6FISChIyKhJSSlCQiJLS2tDw6NDQyNCQiFCQmHBQSDGRiZHRydGxubHx6dGxqbFxeXGRmZFxaXCwuLOzq7KyurHx+fDwmFEQuFCweFCQWDBQODBwaHBweHKSinJSWlOTi5JyepHR2dDw6PBQSFNze3ERGRIyKjIyOjISGhPz29Pzy7MS2rMzOzFRWVHx2dHxybDQiFPz27Pzu5PTq3PTm1NTCtJyGdHxuZHxqXPzq3PTaxNS6pFxWVFRKRNS2nPTi1PTStNSulNzOxNSynMymhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwABAgMEBYSLggaOjgcICQoLDA2Pj4MGDg8QEZ4FDxITFBUWFxcYGRobjQ8cHR4fCQ8gCyEiFSMWJCUkJieNEB4dKB4pKissK8wrLS4vMDHBAAYQHx8dFx0fJDIzNDU0M+IyHzaNNyg43Ng5Ojs7Ojw9Pj9AMkCNDiZB/h9CSOx4QLCgihItqBkYgqIDESElitAYWJCgkQcXjjRCgi1Ihw4BB5LAQOLCgyQYHihpUU3DBw5ElpAgAYNixSRJjKjQaECDCRPZPDB5IbIGSQwKLnh4wbInLA4kmJB4oaPiAwVNnER40hRK1BIAaVatUZJEFCkmpmjgCeWDCalFe4q4oFKwSRUrEa5gycLzwq8lUnPQ4PEgSpYcUZ5o2cIlS1O/JHLEDdfjQZMIVrpgweLFy5e+M6WSmBGlxYMYYBRzCaOFi5imHWBIfOEiShLTVjaP6eyFTBmN1TA5OvLDjJksWb58OVMGDRqWjAYdmU79SIvpjqJr104nEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editshred-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBFRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanOze1Pz+/Ozu7BQSFCwqLDw+POTi5MzKxPTu7LyyrIR+fCQmJPz6/Pz69Pzy7Pz29OzaxPTu5PTq3PTm3My6pPzu5PTq5NS+rPTm1PTi1PTezOzWxPz27MyynOzSvMyulOzOtOzKrMymhOzGpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbpQIAwIBgMCAXDAZFQLBbCqJTRqFobjgdkEYFKowPJZEyeUBqVR/crHDTKZYplovZKCW84+YKZZNZSBXl6EwEEBhVPXxZihGMaGRscdkIdg4QeEnVfCH2OHyAhIhuUAAiXZSEhIyQlJqWnjiEnKCWupRWoYyEgJK0SKaUKjam0JCorLMFfC6iqx8giLa/MGAsT1wsuCyULKwssC9RSzdkfCyALKuALLQsvpeXYIQso3gsiCzALMfENC+dGcMNHUAY/f+jq3ctncMYCGggFrsvHcEGNh/EyPFmg8cmrJxAVkVO0EUDJklHoBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+edittrash-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBERGRExOTDQyNISChBQSFCQiJCwuLPT29Nze3GxqbDw6PGxubHR2dJyanLSytJSWlJSSlOzq7Pz6/Nza3Ly6vFRWVBQWFIyKjMTCxHx6fIyOjLS2tOTi5PTy9OTm5Hx+fNTW1KyurKSmpJyenExKTMzKzKSipFxeXCwqLMzOzKyqrMTGxLy+vHRydBwaHNTS1DQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb8QIBwSCwaj8KAMoA8LgUDQsFwQByay4RiwWg4GA9IRGk0SCYJSsUCsVwwGQ1EsmESD5xOp+L5gDwhBRIZDhcDdkMGDgEiIxAkJQ8Ok5MmAohDAQ1xJxUlKCUlEg0pKpiZJRoLCxmtCw1eURhOcR4rbQ8cGRwLAwgGtBYTDywtGRKjvQTARgEZLhMcKC0OrQMvAirMRc7CHCTU1g2+20TO0NIn1RwDCya/wdHT1Rnt5LToKOq79trx0tR02YPX7Jm8fRxMOIhSLhOJE/LCJSTlr5kFEBQsWDiR4UGGBgsuHDg1BEYAfTE6oEBR4AIBAiS5yWBAAAGBAyaPGAgCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+encrypted-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBHRudFxaXExGTERCRAwGDGxubPz+/Pz2/Ozm7Nza3NTS1KympFRSVHR2dNTO1JSSlKyqrKSipDQyNMTGxDw+PLSutKymrMTCxAQCBHRqLBQODJyanDQuFFxSJFRSJFRGJERCHExCHISChHxyLEQ6HGRaJExKHLSmbLy2fOzitPz23KSiZHxuNHxyNJSOTNTOnMTCjLSudKSaXJSKRJyOTOTetNzWpHxuPOTi5MzKzLS2tFxWXOzq7Ly6vOTe5Ix+RLSqdNzSpLyydKyqbKyiZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBAgMEBQKEjI0GBwgJCgsMDY2XjwkOAgQBDxCLl4QNCaGCBBGWooINCAqqrBKgqwATFKaDFRYVtBMXsIMNGBm0GRADjQIJxKIaGxwdHh8gISIhGyMZzIwkGholJiYfJiAfJyEZISDbg90oKCkqKwcHKyooLC0f7IIuLzD2YMSQgW8GDRri+AFoUMOGvRsxUhSsQQPHvmQSchyQtEAHhh0WJHDQcJERjwsKDvRI0BGDjwgicXhQyCOjSgUKPO6AObIkIQESfmxk6REDT4s0bfaYpDNkT4VAha5s+TLmzEYtatwIOHAiDZIKNQAJYk9IjCFEisyoocFEB4UACtBpm0t3LiEsgQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+eraser-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBMTC/AQChAQCBISC/PzCxPz+/MQCBIQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARfEMhJKwhi2F0DIRnHeR+oiRRZmqikrmD7wgI6r+EI4+d2l7lNwWDYsTiFw4FI61mSymXxE3xGo8xqBXpVGrQUbveAcG7H0bKowEar12wx2SyMp+lI+7s1ie/5fX8tBhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+exec-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAwKDAwKBCQiHNze3AQCBBwWFDw6NPTy9PTy/Dw2NKyytOTi3LS2tMTKzMzOxLy+tLy+vBQODNze5NTS1JyalIyCbIx6VIRyVISGfJyelOTq7EQ+NMTGxKyurGxeRLyKPOSmROSuVOy2XOSiTLzCzNTOzDw+NCwqLHxuVOy6bPzGfOSuXNTW1LSyrMSWRNymTOSmTKSCTPTGjPzSnPzWnMyaVBQSDMTCxPz+/KyahNSeRHxeLJRyTPzmtPzarOy6fJyajNza1Ly6vLyulFRCJPzirPTOlMS2pNTSzMTCvJyenBQWFNzKtPz6vPzyvPzqtOzGlOTe1AwGBFxWTLy6tPTm1PzSpPzutPz2xPTSnOTSxOy2dPzapPzerOzm5IR+dPzu5Pzu1PzqxPzy5Pz+9GRiXGxuZKympHR2bOTm5Pz6/MzSzBwaFJSSjCQmHPz2/AwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeEAQKIjIIDBAQDjYMFBoMHCAkKgwYFhwULDAUKCg0ODxCkBQgRnoUSExMUDxUWFxgZGpAbFIuGHB0eHyAhIiMkIB8lJieIKCUpJCTGIyorLCktKIUDpC4YLzAxIjIyMzQ1NhgdpJI3ODktJTowOyM8Ejc9Pj9AQUIEclAocCMIBQhDiOwgoaKIoCI+jBxBkkSJkCWemIyq0GSHCBVHihRx8gRKFCmpKhGaQqWKFYZXsGR5kkXLFgRUXBUqkCGCFS5AjnTx0sXKlyA6CRVgAAHMAilhxIwhU6ZFkBY5kgKYUoXBAzMKzixZ4AJNGgVm1KxhM0WpmQpUMtooaOPGxAM3Nw60oYLGjNYCbzYJOgAnRzNBJ95oPYQCgpJtkwzFoULlRuRPiy9fNhAIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+exit-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBHR2dDQyNCH5BAEAAAAALAAAAAAWABYAAAJOhI+py90RnIMyRUOxhDfzJkACdoXBuEDDkQFDi5go0MrKx16kns80b7qdELCgBYaEGWwL5nG1ePFiKp9A6kuYRNuho8vxVrrZivmMRtMLACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+fileclose-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBERGRERCRDw6PCwqLExOTFRWVHRydGxqbGRiZCQiJISChIyKjHx6fDQyNBwaHJSWlKSipBQWFJyanPz+/JSSlCQmJAwKDCwuLBweHBQSFGxubExKTISGhDQ2NFxeXFRSVDw+PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbZQIBwSCwaj8jkMSAYDAgEJbFgOBwQCUOAoJAaFgvGonHIBhyP5BcSgUAYDWxggD4WFmx3e3HQngkSRgYMEBMUFG4MCId0BGlEAQeEhocVDYcUdBYKF0QCB3gRlJgUAQEYBBkaRAMbDZMMpAYcT46rQwMJrgsdC6QcfwoPnUMOBgkIV6SHHg6bw0QEAQYfBpggBZjPGsRD0gEchxwCIR6HChnQRQ8DIU4DTR4Em+ncRw8O+fmoXPXdRg+gQLFgIYM/KRIkoDP4QMKFf0o0aBAh4qGUixgzCrETBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+filefind-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQSFJyanLS6vLzCxISChNTe3OTu9Oz6/Nzy9Nzy/NTy/OT2/Nzi5Mzu9Lzq9KTe7LTq9PT+/Pz+/Nz2/Mzu/Kzm9Jza5HzK1LTi9PTu9IzW5ITO3FxaXNT2/KTi7Iza7GzC1LzW3FRSVMzO1MTq7HTS3Fy6zFS2vKzm7Lze5MTGzHzS5FTG1Ey2xEyyvJze7JzW3ITa5FTK3EymrGS+zFxWXKymrMzi7ESirEyqvLSyrKze7MzOzMTCxKSepAz+/NzW3MzKzBwWHLzS3ERCRAzi3KyurNze3MzGzLy2vLSutCQiJAyytHRydOTe5MTGxLy6tLyqpKyelJSCdOze3NS+tLyupLSmnKSOhCwuLPzy9Pzu7Oze1OzazOTOvMyihOTi5PTm3Pzi1PTazPTWxOzOtNSunDQyNPzy7Pzu5OzKrNzSzNzGvNS6rMyynMymjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwGFhYOIiYQBAgMEAwKHiokBBQYHCAkKCwwFAZOEBQ0IDAsODxARCZ6gAAEGEhMSFBUWFxgZCJ+TjBoMEpkRERscGBGRih0BBAgeFBQOER8gISEfIruIIwEkCCUVwhcgJicoKSrZg9srCRkRGdMsLS4vMNiK2wIKMRsbMiwzXtCocSydIBs3AuCIwIFDiBMucugAoWvSiB2VNPDg0ELHwA0MkCXr4aNSggg8NoDIQOFHgBtAkgURMiDAEAFEVBCJFKCIkSMGOyDRkETJEkOFmABoUsRJQkQdnkzQACWKlBtTplBR6qopxkFRJ0ytYuWKFCxZtBBq+hRA2AlbRrh08fLlCxi1a51g+dQhDFwuYsaQKWPmDBpKXgNETaNGjJgyhNfcVdTTiWI2XpK0cePmzRk4YA5T5otGixY0qFOXbgXAQCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filenew-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBExOTERCRDw6PCwuLBwaHAwODAQCBOze1NTW1OTi5Nze3MTGxLS2tJyanPz+/Ozu7OTi3BQSFCwqLDw+PDQyNFRSVPTu7MzKxLyyrIR+fCQmJPz6/NTOxPz69Pzy7PTu5Pz29Pzu5PTq5PTm1My6pBQWFPTq3PTm3NS+rAwKDPTi1PTezOzWxMy2pPz27PTazOzSvMyynOzaxOzOtPTaxOzKrMyqjOzGpMymhPTizOTCpNzSzNTGvMymjMSihCH5BAEAAAAALAAAAAAWABYAAAboQIBwSCwaiYGAYEAgFAqGg/Q4DCASCsTiymgcHAcqQLB4mM+QiIQBppLPcMjkwQ4bB2X4maKgt4sVCHpnFhQTElNFE3mDDxcYGRp2RBuMgxwIHX9EBZZwHh8gCBmTQ52NISEiIyQlpUImng8hHyInKAgprwAqgnC0IKwrLLpGB4wctLYkwy0uuwd9Z8AnJywsLcVFx2YcL7UnJCwwLTEy0GXJoSgrCCwzNDTnxgjeH9UrKzXwNDY36LRGhEOwLx4NHDmgJbh3QoeOgv127EhojEeHDj16pEhRQoZHHzl+QJNCsqTJSXaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fileopen-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQWDCwaDDwmFPSubPzGhPzCfPy2dOSmZPzKlPzSnPzOlPzKjBQODPzChPzWnPy2bPSmXPyuZOyeXIRSLEQuFEwyHEQqFDQiFCweDKRuPFRSTPT29PTy9Ozq7OTi3Nze3NTW1MzOzMTGxMTCxLy6tLSytKyurDQyNMzKxOTm5OTi5Nza1NTS1MTCvLS2tLSyrKSmpJyenJSWlIyKjHx+fFxeXBwaHKxuPMzKzLy6vIyOjHx6fDw6NPy6dGxubLy+vISChCQmJNza3KyqrBQSFLR2RKSinJyanGxqZAwGBJSSlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeDAYqKiIeLj4wBjQCMhY+NkoiLk5qbhQIDoJyGBAUGBwgEo4MECQoLDA2pDrS1tKQPEAwHERITE77AvxKqhAQNDA8UFRYXFs8YBAQZGqGPxw0RGxwdHR4eHyAhIiMkJSYnKCgpBAYPEhcqHyssLS4kLzAxMjM0NTY3cBA4UCAHBw8gVnhgEcKFjhc7UPDj0cMHAAI/KFgY4YLFio/jRpTYsW8GDyCSCEQw2DChOHIqgsCQSEPIEEEEJFhAoUNECCJEyOk4d6KIyRtGcB7hIJKjixEjHu4oimSGEIs4d8IIUoKECnNB0ElMwkNJJgBLlJBAcQKGiR07KGAURVGViY0mhIwwSTKjr99+THjUoIg0r48hTRIrRtxkiOMhDgrZCQQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+fileprint-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBFxaXDQyNFxSTPTizOzi1FxORDw2NExKLPTi1Pzy9Pz6/FRWVPz29Pz2/PTy7PTu9OzezPzu5OzavAQCBPzy7PTm3OzazOzKrPTu5FxSRERCRGReXPTq5Pzu7ExGTMS+xKSmpOTKpPTq3JSCDNzSfHRydLyadOzCjOzOtOzSvLyyTMTCxKSipGRiZFROLPz+/KyurJyenJyWnGxmbLSabOzClOzm7LSutJSWlJSSlJyanGxqbNze3OTm5IyGjNTO1Nza3NzW3OTe5IyKjHx6fMzGzMTGxMzOzNTW1IR+hISGhKymrLy6vLSytERGRGxubKyqrLy2vLS2tDQ2NEQ+RASKBAT+BFxeXHRudAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAgOEiYqEAgQFBgcGi5MICQoLmAQDh5OEDA2YCw4ODxARApKUCaGYEAsSCRMUnQysCwoVEhYXGLOLCBCgDqK5GQUXGooCAhscBB0euBUZEAUJvQgIgx8gIR8iCSPiHuIFEREDJCXaANwhJhsnKCnWERcRKiopFCvsBywhQrRwQWGAPAz5EhpQ9wIABRgKYsiYMTEEDQocatiwkUIEP18fbkCAAcMBjhwzdOyQwYNCgBMfKJSgMItBjxs+btwgCSGGjhw/ZoRgQKGZCRMUPgABEgSIkCE3SZok8qNqkR85NtDUEcPIkaVAkCR5SrJBDCVKlmzQ6pCCiRlMTJo4YUH3K5AeMBYYWctW0BOaUH60cBJFypQmII6wyEpFQBVFMSm4UAI3hJUrOGh8oOJrklYKWIromJGDR99Ogz5j4ZGlM+pEnwmBCwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filesave-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBGxqbAQCBLy+vERCRExKTHRydIyKjMTCxFxaXGRiZFRSVFRWVPz6/Nze3Nzm5Pz+/JyanDw+PExOTHR2dMTGxBQWFLSytHx+fISChOzy9Ly6vAQGBJSWlMzKzAwODJSSlHx6fIyOjOTi5DQ2NISGhGxubCwuLOzq7ERGRFxeXNTW1CwqLPT29Dw6PGRmZKSmpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb/QIBQGBAMj8ikUDAgFAzKKCBwQCQUCcICKh0SEAhGw5EIZAmBrgCxeDQgcDJWyz0GIggJfL+XGwQJRxNgC3yGDwwUFUZDFhdthnwMGAZNQwEZFwQakXANBBQbHIIdERIBnRAOiR4ERx8gsSEMBBmGCyEGG3YGBwcgIr8UCwQHECOgG4xCtRkEJAvBJRklJgkSFBQeJ68hJiEoESkFKiEZIbkGARsLlwEGExENGhorGSkpFAYm66NDLAECpGiBYsUIFA8wLHBBQMWLVkdUCFCwaYVFBOymkVCgYEMgOykEpICBccMBAhhELFigTEqAAgIIwCiQ4eRKDyS6EAlJIAI0EpaudF4iIKDAAn9CkRT5eMROEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fill-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAASC/AQCBMT+xASCBMQCBASaBPyChASyBATCBPwCBARmBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAASCEMhJq704axB2DkLnVeAwiCNHDMWZcsbaul5ZyCaKBcZwFDcgDRNbHX7AmW4SMx2MSOFQQlitEAhosrVcDQQE7NMXzVGqA6xAgCUckabQpJoIYBFsxBspUKBiHQEHaoNvBQJTgBIBdnh5B4hLihONeJBTc0uMaphMS4uRGQYfny9EEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+filter-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBAwKDMzKzMTGxNTS1MzOzAQGBLS2tLy+vKyqrLSytLy6vMTCxBQWFKyurCQmJBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAV7ICCOZGmeaHoGbKuOAjsQhVG764EgyT7YhaCBVQogFMhFImEABoUBknFxRDAazac2Kg00djystkA0sQ4BgzgYK6+Ch/bBseOmAmMD4gF5ifBCDwoRfiOABgyEhYYFCA6LUo19kH+Nj5QAaQh2kHibmJkFBJydpKCnfnYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+find-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQSFJSWlFxaXJyanKy2tLzCxDw+PHyChNTa3Nzq7Nz29NTy9Mzu9OT29Nzi5Oz6/Mzy9Kzi7Jze5Lze5Nzy9JyenIyKjHR2dMTu9Kzm7JzW3ITW3ISChGxubERGROz+/Lzq9IzW5HzK1LTm7FRSVHTS3GS+zLTS1DQ2NMzOzMTq7Lzq7ITW5FS2vMTi5ExOTKTm7EzCzEy2vEyutJTa5FTK1ESirGy+zMzi5ESerESmtITa5OTy9KTe5KyqrAz+/Azi3ASutERCRExKTFRWVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCggGFhYOIAAIDiYUEBQYFAoeJAweKhAgJCgsLDA0OCAGJg4wBCA8QDhENEhMUFaKDFhcYgwEJCxAQDBkaGxwSFaMAFh0eAx8AAQIKECAODCEaIiMjJJMAtQMlygEGEBkVva4mJycTKKMYJd0pyyoOKyssGhMtIycuGi/EMB/vlhmoQEFDjHsmZMygUUMdqWUCGgCbYMKEjRk3cEjI9jBADg3Wzs3QsYOHA2IdO1SQkI/GjRMtFhBA2RFBDwk+OASrMPMHkIe3AhBA8QLFzAAHgvyg2dEQMSEHPCwltQgooSFSmVpSxKjjh6wPtwINgHVqsVpWESEFeywZ17RkED2s40YEgFirlIq4SwvUQCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+finish-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBBxCXDR+nIS21Aw+XJTC1Nzu/KzO3Pz+/Nzq9Pz6/MTe7KTW5FzC1Nzu9CRKZMzi7IzK3Lzi7LTe7HzG3Gy+3AyuzAyexFzC3DRSbHy+1Dy61CSqzAySvAyStLze7IzO5AyGrEze7BRmjCTC1ETS3ETa5BTC3Bx2nAyWvAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAakQIBwSCwaj8hkMqBsBgTN5IAAJQqqykCBasUmDQcEV3gtBs7oATihGJeJgcOCQWc0HA8Ig/seRiQTFAsVFhcYGRp6VH1CGwscHQ8dGB4fIBkPIWKMAAMLIiAjIJcgH5gkGSWcARIiJicoJikpHikoHqqrKiW8JSogKymoqgCrV8cCARgkuFWcRwYeqVjPRgEExEPVRQbZ2l5IBuBRQ0zk5+hRBkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder_new-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBNzaTPT2FISCBCQaDPz+BExKBDwmFPSubPzChPzCfPy2dPz6BMzOTAQCBOSmZPzKlPzSnPzOlPzKjBQODPz+rPz+3PzWnPyuZPSmXNyaXPTyhISCLIRSLEQuFEwyHPy2bKRuPFRSTPT29PTy9Ozq7Pz+xJyanDQyNPzGhMzKzOTi3Nza3OTiVBQWFDwqFKxuPOTi5JSSjISChHR2dGRmZFxeXPS2dNTSzNTS1OTm5KSipLS2tLSytKyqpIyKhGRiZNze3NTW1MTGxMTCvLy6tIyKjCQmJMTCxMzOzMzKxJyenHx6fLR2RLy6vJSSlHx+fDw6NLy+vIyOjAwGBGxqZKyurCwuLBQSFJSWlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLjI2MAY6HAgOHBJYEhJCDBQaDmgcICQoLB4MGDA0OAQUBDg2cAAcPEBESE6QUuQasFRYVq5SxCRcSCggYGRjIGgYbFs8bHIMHExIJGR0eHx7cB83PFhsDDuTUEyAhIiMjJCQluwEmvsAnKAcp1x4qKyUrLLupWrByxcnFiwQIYIggEaNEiRgBZMyYQaNADRs2REA6cCODBxw5+OnQgWMHjx4+BND4MQOIg1gI0gUREkTHiplDhhApEoCGkRlHBL3I8MEHEhz+WAhJogTJySVMfthwIehAExE5jubAkYQpESc8fOx4AiXKNA8+ekhBgqSpzh5hPHcsmVLjpSAqVZBY6VGkiJMiPQKLnTvjCiEsWU4o3nGC8YksMmT8YCmC6iAXKLRc2cz5yGYtR0JjKWQgEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+forward-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBBxCXDR+nIS21Aw+XJTC1Nzu/KzO3Pz+/Nzq9Pz6/MTe7KTW5FzC1Nzu9CRKZMzi7IzK3Lzi7LTe7HzG3Gy+3AyuzAyexFzC3DRSbHy+1Dy61CSqzAySvAyStLze7IzO5AyGrETa5ByixBRmjCTC1ETS3BTC3Bx2nAyWvEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaYQIBwSCwaj8hkMqBsBgTN5IAAjRoDBaq1aDggtMuAWDzoJhTgY+CwYLgZDccDwkgXI5IJZVGxXDAZGnR2QxsLHB0PHRgeHyAZDyFfVUQDCyIgIyCPIB+QJCUmlEMBEiInKCQnKSkeKSQeomoqJrUmKiArKSwZsmoCwMEBGCyxo1EGHr3HUQEEvltCBtDRAAbMW0zV29xDBkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+frac-22:actions actions22 22:photo:22 22:R0lGODlhFwAWAIIAAPwCBAQCBAwODAwKDAQGBIQChAAAAAAAACH5BAEAAAAALAAAAAAXABYAAANICLrc/iwEJSEUQA45LcOKMHWeU5XWiUYZsZClOIjj+naqrS9F7/9A326YCYBypREOpMPBVifjkBRw7SpIG+eJIg2IWC5UikoAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+frameprint-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBFxaXDQyNFxSTPTizOzi1FxORDw2NExKLPTi1Pzy9Pz6/FRWVPz29Pz2/PTu9PTu5OzezPzu5OzavAQCBPzy7PTm3OzazOzOtPTu7ERCRGReXPzu7PTq5OzKrExGTMS+xKSmpOTKpPTq3JSCDNzSfHRydLyadOzCjOzSvLyyTMTCxKSipGxmbOzClFROLPz+/LSutJSWlJyWnOzm7JSSlJyenOTe5OTi5MzKzASKBAT+BNzW3OTm5KyurMzGzMTGxMzOzNTW1KyqrLy2vERGRGxubIyGjLSytGRiZISChAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAgOEiYqEAgQFBgcGi5MICQoLmAQDh5OEDA2YCw4LDxARApKUCaGYDwsSCRMUnQysCxUKEhYXGLOLCBCgow4VEhkFF6mMAhobBRAcChUVGR0FCR4UCAiDHyAhHyIJCRAjHOUJEREDJCXcAN4hJhonKBjXESn5Kdkq7wcrQoRg0YLCgBMuRFxIwTCFgXYvAFCA0SCGjBkYQxQMUE8EBhEUVPj6QOMBDBgLLM6oYYMFhYkvYcSkwOAGDho3TyqIUaPGyZ9AKXzIoWMHDx44bvQ4+WAi0KA1fPwAEiTIjyBCkDp9KlMiBRMzhhAhsqLsD64/fQEo8tLIERZIH8Ru5arow8skSmTMDdpJQ0y0XTsJ2gtU8GCZMBMbCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+funct-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI+hI+py+0PIwhUohpMXfl6103h1nTUNproEU6am62v1pLsPX/siO9Jiou9TD2XyHfMGUs65aVmiUqn1CrCUAAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+gear-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFCQiJERGRBwaHFxeXHx+fDw+PGRmZExOTGxubKSipDQyNHx6fIyKjJSSlJyanISGhISChLS2tIyOjHR2dAwKDAQGBJyenAQCBCwqLLy+vKyqrAwODMTGxKyurFRWVLSytLy6vMTCxMzOzGRiZNTW1CwuLMzKzFxaXJSWlOTm5Nze3Ozu7OTi5Ozq7GxqbDw6PHRydAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb/QIBwSBwGBMVkMjAgFAwHBFJpPB4SiQJCsWAQqEJB4prdNhQNx7QYIFwLD0ikQZdMHgelOPGYULQVDg4QEAVfRAEBBwUTEE0WFwcYhAuNF0QDBQULDwwZGUIaEAuVGxgBRAIFEhwHHUQMCxwTHAVrAAwFFRwKFkQZsxseDqBDGXMSHwfFQiAhIiMeJApEBwcOcahDJcLSJCYcGkQKcRAnQhkF0SgmEykHXkObox8q1iEjKN8rENqYD7MmeBCmzwSLFS1I3AqzYIPDESS+sWCxgQMLEgOSJKjozeAKFyskCDigQFwSBhJMjDDhAlyLFyVA+dIzAUUKEi0eaNhAIg8YGiEMenkwASNDDBkLqRQAEEAkup9KDkEFgC4IACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+gohome-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQiJNze3ERCROTi5MzGzLy6vDw6PKyqrKyurBQSFGRiZGxqbGRmZISChEQ+RExKTExOTHRydDQyNOTe5FROVLSurCwqLMTCxPT29Pz6/LSutFxeXLyytLSytPz+/JSWlKympPTq7KSipNzW3BwaHHx6fKx2VJRWNHQmBFweDOzq7Ly+vNTW1JxWNLSajPTe1Ny6pKxWJNTS1IyOjJRmbPTi3OzKrNSSXMSGVHQiBHx+fJSSlPzy9IxOVOzWxOSyjNSCPLxeDJyWnIRGTOTGtMxmDLRWBHwqBIxGTLRSDDQuNNSunKxKBGwyNMSafMxqHMReDKRGDPTu9LxuPLxaDJQ+DIR+hGQqNIQyBGQiBNTO1EQKBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAYSIiYQCAwQCiokEhwACBQYHBAiQhAiHlQYJCgkEC5uCkp8MDQ4NDwylmwgQlgQRERIEBBOkmxQVBgQWFwUFFxEEDLyJGAUZtQoFGhsFHLYdyoOVHsEf0SAbIAUex8mwlAUhtSIFG+3uIyTWvAIGJMEkJe76GyXbEeWUBJg4USKaBhQpVKzYoIFFiwYUBBJa8MAFCw0vYMSQMWOhBhoTKCQSUKMEiw02buDIoWOHBg0GeIhEFKAHDR8afgAJImSIioYliMws1MPkhiJGchxBkmTDCBo1hg4KQMTiBiUyhBxZ8pNFiR5MEtU0WqSJVidJNDyNKraHC5xPNKBEkTLlJ5WvUgWNvfikyhArV34+7ZEXQAAsB2iUyHLlihYtW0pwOYAFgyJDmDNr7jIIWiAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+goto-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBBQSDAwODAQCBCwiHDQuJExCNFRCNAwGBDwuJEw+NFxKPBQODEQ6LFxOPEw6NCwmHDQmJBwaFCQaFEQ2LCQeFDwyJBwWFDwyLDQqJAwKBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWSICCOJBkEQqmWA1EYR4Gsq5Aoy2EYKU0yDcPCkSP4SgShw2FoDI6jQeNxYD6MUBFCEXxAelkRgxCRhEWQiW/wXE2CataAUmiXKo+Fwg6YWxQWfCQEAxckUgoYDRSCR4gKB4ZnFVwUCgUMZ30KCRQUhJpzBRQQjUcSnmyaM32mPgQNmZpRBwmSsxAZBBqzUa4iBiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+help-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBCQuNBwiJAwiLAwaJAwSHAwSFIy+3ERynCw2PCQuPAwmPCxOZCxWdJzG3FSazBwmNAQKDAQGBDRmhBQyTDxujDR2rIy21AwWJDyGxCxmjAwmNDRihAQOFDxmhCxunBQWFAwaLCRahDR6rESGvDQ2PCRWdDRunDSGvCRSdAwWHCwuLDSOzHSmxDyKxBxCZBwqNHSu1DyOzAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAahQIBwCAgIBAPCoGAgOoeBAyKhWCwYDUf0CX1AIhLiJEGpBLiAAaRxdgYsl7Ybk8igBZoN5xmAdDxoanp8HyANISF8EBsiXBMjJBolBEQmGHFoRScbKHIKDykqK5lFAZRCnyknTaROLA8tq61OChgtKqyzQgEYEJi6UC4vI3LAASkbMBPARAEBdszR0sACEaPSMTIQM8W6KzNl3bo0NOJDdEEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+int-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIIAAPwCBIQChAQCBBwaHAQGBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAANJCLrc/iDAuYKlU0r8NHfXB24iEyrCIAjAynakQLQuDS+vrTcnI1M9HyaIykFOKwUhZ6zEWC5oU9GrRY+kkqdUiXCdWW74SzYkAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+leftjust-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIihI+py+1vgpy0Tohzs1T7z3CiBJbQWJnqg4rre7jwTBtGAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+locationbar_erase-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBPz+/AAAACH5BAEAAAAALAAAAAAWABYAAAJChI+py+0PX5i0VmbzVboHPgmCJVoJJY5haR5VGsCa+6ZqZ2Sy95E2n0OVdi2A8EacIIS+YpC3WUIpi6kygs1qsYYCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+lock-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBHRudFxaXExGTERCRAwGDGxubPz+/Pz2/Ozm7Nza3NTS1KympFRSVHR2dNTO1JSSlKyqrKSipDQyNMTGxDw+PLSutKymrMTCxAQCBHRqLBQODJyanDQuFFxSJFRSJFRGJERCHExCHISChHxyLEQ6HGRaJExKHLSmbLy2fOzitPz23KSiZHxuNHxyNJSOTNTOnMTCjLSudKSaXJSKRJyOTOTetNzWpHxuPOTi5MzKzLS2tFxWXOzq7Ly6vOTe5Ix+RLSqdNzSpLyydKyqbKyiZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBAgMEBQKEjI0GBwgJCgsMDY2XjwkOAgQBDxCLl4QNCaGCBBGWooINCAqqrBKgqwATFKaDFRYVtBMXsIMNGBm0GRADjQIJxKIaGxwdHh8gISIhGyMZzIwkGholJiYfJiAfJyEZISDbg90oKCkqKwcHKyooLC0f7IIuLzD2YMSQgW8GDRri+AFoUMOGvRsxUhSsQQPHvmQSchyQtEAHhh0WJHDQcJERjwsKDvRI0BGDjwgicXhQyCOjSgUKPO6AObIkIQESfmxk6REDT4s0bfaYpDNkT4VAha5s+TLmzEYtatwIOHAiDZIKNQAJYk9IjCFEisyoocFEB4UACtBpm0t3LiF4gQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+lsub-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBIQChAAAACH5BAEAAAAALAAAAAAWABYAAAI9hI+pe+EPHTNhgjox04srn4CI2FgkZaaZurGd+5nRfAiCYVuJzfN6jbvdfrshEZE7ApNGXa+nZDaVVIOhAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+lsup-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBIQChAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAI5hI+pF2G9YpszKgcgtgtyuX2I44UcRYkM5qmWAMcyzAn1/eKRnfe7vuD9fEGgQlgkHo2JmRPpStgLACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mail_forward-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBJR2dLyijPTixPz69Pzq3Pzy3Pzu5PTu7Ozi1LyelOzavPz+/DwqLLyafPTmvPz67Pz29Pzy7LSWlPzmzPz6/LyajPTitOTSzMyurPz25PTatPTi3KyOjPzuxAwqVDQiJHxiZPTetKySlPzqvPz27BQ6bAwmTPTexLyinNzGxDRunPzy5KySjCQ+ZNzq9KTO7JzC3Nzq/Ozu/LzW7FSm1BR6vGSWvFyq1AyGxAxytAx6vBSKxAxSjMyujLSunES+5BSi1ByGvAQCBNzCrOTaxNTOvMS6rKyelCx6rBx6tBQKDOTWvPzu1PTq1OzezAQOHAxGdBROhAQGFPzy1NzOvIRqXLyynOzarPz21Jx2XPTWrLSShAw2XKSCbPzuzAwePAQCDPzyzPzqzPTmxOzWtAwGBKyObOTSrNzGrKyGbOzatEQyNKyCZOzWrOTGpNS2lCweHCQaHCQWFBwSFBQODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBhBwgQKFSpY0HgBQwYNGzh0mDhRAAUPHziACEGBpYgRJDiUGEkSwoCQJk6opNASRQoOFETQJDkggwoOJlYApcCihQuVL2DUhBDjhIqjJmRwwDCDhswaNm5MjYHjKggOOU7o0CGTA9gdYknG2KCCBw8VJVL0uBgihAUfP+CSNGCjsI/DiBPbAMJBsEQbQYQM+UG5smUiRYw0jlvYxhEkSYyIHm1EyRLTTH40EZvAyZPOR4pAmU07ipIkUKQ0mQIhAZUqVq5gKXzkSBYtyLVEyd1ki8QFXLp4+WJFQowbYLJnD5NbzJiJCjaQnhnvpYwZM0/OPFlvQ/f3iQvQpBlvQc0aCWy4VKnCpY0Y5yQxgEYXZFjghgwZUOHGCW90YQEccUwloBwGyjAHHXUoSAMZb0xhx1QOoMHDHSfIwSEOdTjhAQ1d4MFbTQ6Q4MYacrzxhhx04JCHHhvQsMeLJPHRBxpr+LHCGnusgccfgKixQR1ATtTBlDDAEIggggxCCCGFbLGFHVFKZEdAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mail_generic-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBDQyNCwqLCQiJBwaHBQSFAwKDAQCBDw6PPz+/Pz69Pz27PTy7PTy5PTu5PTu3PTu1PTq1PTqzOzmzPzuvOzitPTmvOzivAQGBDw+POzevPz67Pz25Pz23Pzy1PzyzPzqvOTavERCRKSilPz21OTevIR+ZExKTOTi3JyanLS2tPz6/Pz65KyihJSKbMS6lExOTNTW1JSWlJSKZMSylNTOrNTKpFRSVPz29MTCxPTmzKymjIyCdOTWxOzexOTWrBQWFFRWVOzu7MzKxJyalOzatLSulMzKtOzmxOTarFxaXKyqnPTmtIyGdIR+bOzetOzixBweHGRiZOzm3NzWzNzSrOTetGRmZOzizOTexOzm1JSKdGxqbHRydJySdHR2dOzapHx6fKyijOTixCwuLHx+fFxeXERGRDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLAQECjwORAwSUBZYFBpkHmwgJCgsMDA0OD6UQERITFBMVFhcVGBkangq1ChsLGxwcHQ0dHR4fICEGIiMSCbS3uLq8wCQUJSYGJygpKhQJKyvLLM4Nwi0uLwUwDQsxMtmeuQveHR8UMzQ1NgU3Dgo41jk6ns0cKOzgYaOHjx9AgjTAUUvIECLZNmxoUISHkSM9KiBJQkCJA4kKEoBQoWJJAiYtmjh5AmVCsCJRpHzckKCCySlUUvBYUqUHDysSPnxIEuXKA5pPRiRwxwFLFhRaIEDYUoEChCcDuECoOWKFuwW7nHkg4WELkw8/BHRRwESpt10dU8SSHevlRxIBX6C0WBE27q8GZMkKbTADjIAwYlb4GLMYShYoPTRo6FGiSJEKPyzMIFMmzJcvXbhwkSLFjJkbQW6cOHNGhAgEAdAsmk27tm0ABgIBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mail_get-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQ6bCQ+ZAwePKTC5Ozu/NTi9GSWvAwSJGSu3JS+5CR+rAQOHPTy/AyKzES23AwOHCw+bOTq/BR6xES+5AwmTBw6ZMTW9Ax6tByi1BRGdAw2XAQCBDQuNDRupKzS9FSm1BR2vBym3EzC7CSGxBROhNTW1Pz+/OTm5NTO1AQGFNzW3Ozq7Ozm7IyKjJyWnMzOzNzq9Nze3OTa5Ly6vCQiJGReZISChKyqrAwqVBRWlOTi5MS6xJSWlNza3OTe5Ly2vGxmbKymrIyGjMzGzISGhKSepCQmJDw6PHR2dJSOlPTy9MTGxLy+vLS2tMzKzLSutMTCxLSytKSipJyenKyurJyanCwqLCwmLCwuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBhgIBA4SLjAABBAUGBwiNlY4FCQoLDJaNAQ0ODwsQnYwREhMUE5ylFYYRFhcYGRgaGxsDHJUdFR4SHyAhEyIjJCUcuo0cJr0nExihxgwoyYscKSnMHicOIw4lKissLdWDHC4vMCu9McYqMjMyNOUANTY3OPEoOTolDCszdrSgwaMcBxs9TMxYOCMHBx8zfPj48QNINQ5BbMBIIUShDIUoTAhR94PHPEEHbQwZckOGjBQviMxYUWQIDCMmdXE4gqRnkiFETAxR8iKFjJU2evZEdmLJkgJIbqS4wXJIUapImj5FtuSEVyRVV1IVi4RIChhEkLVAgcJHEqVwVJUmYdKkiRNkALMRecKECRG/ff8CEQJFCA5kMKJEoUHDCQ/HkB9LmWKECpUeyKoIMSLEyosen0OD7iH2xg1dV7BkqXGlBpbWNTq4Zn2khu0aAAwEAgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+mail_replyall-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBLyejPTixPz29PTu3Pzu5Pzy7Ozi1LyelPTavPz+/DwqLPz67PTetPz69ERCRLSWlPTmzPz6/OzexLyajPzqvDw+PDQ2NMyurDQiJPz23PTatJyenAQCBPTevPz25LSajOzq7HxiZPTexPz65JyanBQ6bKSmpBwuTOTi5OzaxBRCdHySvGRiZHx6fBQSFERGRNzq9IyOjHx+fGxqbPzu3BwaHFSq3Aw6XAxKfPzy3Gy63ByWzJzO7Mzi9OzavBRytAx6vCSazGRKTPzy1AQKHBRGdBRyrDy63ES+3Cym1CR6rBwWVAQSLAx+xCyCtBRmnPzuzAQWLAwePPzyzKSCbAQOJByGvOTWvPTmxBQODFQ6PPTWrPzqzOzatAwGBKyObLSWfPTivKyCZEQyNKyGZOzWrOzWtOTSrOTGpNS2lJx2XDQmJCweHCQaHCQWFBwSFBQKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpkzGjhAoYMGjZMpMghQgcNFjh4mODhA4gQGkSIHAmBwAgNJEpo8KDSxAkUGjhMSEGz5gUVIiKs2PmBRQudHiwQpUnAxYsXImB0aBqjBcuoU0fKmPGChgUNH2qIqGHjg9u3bicWIFs2rYgbNnDkyGFhb8cccQ3ouJqWQo0dPFr0WMy4h48LFj4gsKriB5AeNngEaSGks+chPnwQOXFAh4oXRYxk9nAEyY7XO2wksWHDx5ATCDIoUXEBsYclTJo4cWJhuIjhSXacSPBEiZLMQY4wgRKluvXqUpyIsDElAxUqVaxcwcGCPQuWLOixaNHCZAsXBU+oqKDSxQqULF6ifNmyn/8VMOtxwcAK36kQRhdJQIFFEmKM4eCDYGyhhYAEkqFEGSuYYcUZLaDxXRpqSNRCEu6twYaFZXTQhgRd2NCCG9918AYELTjoXgNuKAFHB2RQEUYHVbQQRwlUpPHGGFwkyQUEDsgxx4lh9BhCBy2U8UQJcrSg5JIQ0FEHG3bc0QGYK+CRhx57PEGlkhM9sAEffKTQhx9+/AEIIIGoEUgLLRRFR0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mail_reply-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBMSihPTixPz69PTq5Pzy1Pzu5PTq1Pzy7Pzu7Ozi1LyelPTavPz+/DwqLLSajPTetPz27LSWlPzmzPz6/PTexPz67Pz29OTSzMyurPz25LyajBRCdPzuvDQmJOzexPTevOzq5BQ6bBwuTDQiJHxiZPz23Pz65LyinPzmvBxCbHySvAQCBOTi3OTq9CweHOzaxFSq3Aw6XGy63ByWzJzO7Mzi9OzavNzq9BRytAx6vBR6tPzy3AwOHDy63Ax+xCSazCym1CR6rBwWVOzizAQSLES+3CyCtBRyrBRmnGRKTPzu1MzGtAxKfAQWLAwePPTizMy6nByGvNzWxOzWrNzOtBQKDJR2ZNS2lPTmvBQODPTatKSCbOTaxLyqlAQKHFQ6PPzyzPzqzPTu1PTivOzWtKyObPzuzOTOtLSWfPzqvAwGBKyCZPTWrPTmxNzKrEQyNOzatOTGpJx2XCQaHCQWFBwSFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYuIDBQgYNGzh08DCR4oQPIDqEmDBhJQYRIzqQIFkSAoESJCKkDGFiwgkUKTpMwECz5IASKjqsSMlSA4sWQjG4qGnzhYoQSmF0iCFjBgmWGWhQrVHCxg2sOHLo2MGjB0sLYmsWQHq1p4wdPtqemGDhB1UDQFSouKHi7oQgQmSwUMyYxcQDZQWz2EFiCJEiRoyQyLzZyGIIB47YKLwDSRAiSZSoXq1kCRHNLBK8YGKjCYskTp4ogeKkt+8oUaBImZKAAxMmVKrctqL7ihTnz7FkAT5FC4cKFbZwadIFdxcvX8KLss8iJcoUBUcq2KgAJoxyMTy4jCFTxoxEHl2GLyCDncmWM2hUIQMPY2CXhhoTfTEcA2tgVwEba7Thxhs88FdBD/ZB8MUUHMJBRhw2sAGCHBKU4UaFc1RAhxnhcdhhHUzYAUIcFdxRAh4R5KGHinu4OIVEDqTBRx81xhGHHzD8wQYQetDRI4cTAcIHGWT0EQgZa1ApCBqDcBAID1Q94IEHLtBAAyGEFGKIIWqYYQYPYNZkQEAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mail_send-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIcAAIR6fIRydHxubHRqbHRmZGxeXGxaXGRWVFxSVFxOTFRGRExCREw+PEQ6PDw2NDwuLPwCBLSijOzixPz69PTq3PTu5PTu3PTu7OTi1KyelOzavPz+/DQqLPz67LSafOzetPz27Pz29KyajPTmzPz6/NzSzLyurCwiJPz25Ozi3JyOjPzuxBRGbAwSHOzexPz23KSSlPzqvBROdISavBxSdAwaLHRiZLSinNTGxMy+vBxGZNzu9BSGrAwWJMSyrKSSjFy61ETO3BRWfPz65PTqzHTK3ByqzBSWxEzW5AQWJOTWxBRCXOTu9BSOvDzO3ByavBRKbOzaxOzizKSWlCQ2TAQCBJza7BRWdNzSxJSCbMzq9BSOtCSKrAwiPOTavPzy3LymlCySrAwmPFRKTPzy1NTGrPzu1JR+bOzatPzyzCy61ByGpOzWtJyCbPTmvPzuzIS+3FymxCSuzBR6nJyCZOTWvKSObMSujOzivAwKDOTSrNzKrJyGbDwyNOzWrMy2lIx2XBwWFBQSFBQODAwGBAQGBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYqMDxAoYMGjZwmEixg4cPGzqA6BBiAggRIzaQGEkSwgAMJCKgnNBhQogSJlKGOFHTpgYUG0TsnJBCxQoSE1i0KErAxYsOJJRuuAAjhkwZM2jUqGnDBQoUHTbciIEjx4YNOmbs4CGjB8kCZlGAALHBx4+YcTcACcJDyFSJBo6iGNIhhQkiG8BOKGLkCBK6SSQisHoWhZIbG5bMYALECI8mTZw8gTL1QJQXZ6VMiUylSpUlVpoYaXLFtm0EGmCjwJLlA2O9MrRsccKlC8kEXr7AdgEmwtkhX2SQ2BIkjBiSYzSQr/nyhUKZLIrJJOcexvlEBV7IvCBjRkmAMzHOaufhxDvJBWiQISAFxUUQQRovJNeEGmu4JxEDbKQhXxsfuFDGGW68IQMcccgxRxUkNRDhC3R8QMQIdZwXQ11JJGFbiB+QYccHaaTxhgt13OFBDGTgkUdRDrhAhx5k2JjGCB/swYcXMXwAYk190OGHHx/4wUaVepTxByAaoPEkSQ5wwMEJZAZipiCDDJIHIYV8OZEdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+matrix-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBIQChCH5BAEAAAAALAAAAAAWABYAAAJHhI+pyw0Bw4sTVmmw1C/3/20ex2VUtJ2Uwx7oBb9eR45ziNfgy6tW2+pZhJicjXbTiZA7X2q4AjqIsajSuDsuty5n9SddGAoAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+message_get-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBFxatHx+/Hx69GRixFRWtHR29FxaxHx6/Gxq9ExKxGRm/FRW9Dw+xFxavFxazFRS1ExO9ERC/DQy5CQmzBwaxBQSpCwqLMS+xBwatExK/DQy9CQm/BQW3AQCjJyavAQCBMzGzAwOtDQ21DQy/Cwq/BQW9AwK5JSStOTi5AwKDKyurMTGxLS2xISGpNTS1IyKjJyanMTCxAQC1MzKzNza3MzOzCQiJGxqbHx6fKyqrLy61NTO1JSSlNTW1NzW3Nze3HRydKSipISChDw6PLy+vFxaXPTy9ISGhPz+/Ly6vLSytJSWlHx+fCQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBAgIDBISLjIWHiY2RggWHBgeSkYYICQqYjQUICwwNnoMFDg8QDBESExQVFpgXGBkQERoSGxwdHh8gkiAhGCIjJCUmJx4oKb+NKissIS0iHcgeLi8pzI0gMDEyLzIiM9c0NTU2zYQ3ODk6L/A7yvDnPBjqgiA5PTYvPvU+fvh4AeQFDXwgggTBwEIIOB8sakB0iO7gIH05hvToIeQFBo4eNwoJEaIZiAtEUgbhWGQjRxk9hhhJSeQXiCM4jxBxyXMjEiI5bR5JQnRnT5dDiNCgIcNmCiBAfAShSZVmECVKltgc+MIGCxlgw4pdskKHEJtMZRTJuqStW7dCImLEYGLTrJC4PeYy0asXxpAhTZpdGHzBSWHDiBPfWCzIQCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+misc-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFCQiJERGRBwaHFxeXHx+fDw+PGRmZExOTGxubKSipDQyNHx6fIyKjJSSlJyanISGhISChLS2tIyOjHR2dAwKDAQGBJyenAQCBCwqLLy+vKyqrAwODMTGxKyurFRWVLSytLy6vMTCxMzOzGRiZNTW1CwuLMzKzFxaXJSWlOTm5Nze3Ozu7OTi5Ozq7GxqbDw6PHRydAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb/QIBwSBwGBMVkMjAgFAwHBFJpPB4SiQJCsWAQqEJB4prdNhQNx7QYIFwLD0ikQZdMHgelOPGYULQVDg4QEAVfRAEBBwUTEE0WFwcYhAuNF0QDBQULDwwZGUIaEAuVGxgBRAIFEhwHHUQMCxwTHAVrAAwFFRwKFkQZsxseDqBDGXMSHwfFQiAhIiMeJApEBwcOcahDJcLSJCYcGkQKcRAnQhkF0SgmEykHXkObox8q1iEjKN8rENqYD7MmeBCmzwSLFS1I3AqzYIPDESS+sWCxgQMLEgOSJKjozeAKFyskCDigQFwSBhJMjDDhAlyLFyVA+dIzAUUKEi0eaNhAIg8YGiEMenkwASNDDBkLqRQAEEAkup9KDkEFACUIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+move-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAI6hI8RyJ26nAQQzlbrdWrP7nHRNh5gwpxmaZxWylJdRtf2fcux2rr7n8LsQrxQzyhE9mhIplKjPE5wBQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+news_subscribe-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAASC/Dw6PAQCBHRydPT29GxqbCQiJPz+9PTy9JwCBKwqLPz6/GRiZERCRPz+/FRSVDQyNBQSFBwaHDQ2NKSipJyanHx+fMzOzNza3FTCFGRmZCwqLAwODLzqpCwuLExOTLzqrFTGFAQGBES+BETCBEzCDDSqBBQ+BLTqnBRCBFRWVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb0QIBwCAgIiMgkckAoHJVQgEFAOCCc0WThcEgoDgvGMztFJLiJ83Ws3C4ODIY1jUCIlQ0Bd+FwMLZmCXV3Qw8CCAICfW9wBQhddVgAEIcCCwuJDlxWBQx1AhFPjlyJlwISj1ZWBJQTAImIerGqVwgEiAwUR46ysAeJcKoEoYkTVLGPvrWVDBUWEwEXF1aziMGfAhhiAhAVFdKPyMux2YkAEc3fF3WcdQTAGYkQQxAF3uAIGggbCBwCHfEEeEBiIB0+BB8cgHAQogMIKPXurRMxgkQJExjZELT3jUGDEyhMpDhxIouUOB8qqAhZ0iS9CJMStTQQBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+next-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBOze9ORy7Pzy/PSi5LQCvNSG1JQ2nNx21LQCzMRGzNRy3KQCpLwKzAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq704axC671WAfR8VCOKUbudApCBHksVgHO+5agFiHwVBAuYZ+RQLBmLHatgMS8mMyREsDI7oRipEeLWsKVG8Fce26EspzeaR2vDQNE7PGCIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+openterm-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIcAAPwCBAQCBPTy9PTu9Ozq7OTi5Nze3OTe5Nza3NzW3NTS1MzOzMzKzMzGzMTCxMTGxOzm7AwGDBQOFBQSFCQeHCwmLCwuLDQyNDw6PERCRFROVEQ+RDQ2NLy+vKSipISChGxqbExKTOzu7OTm5Pz+/GRiZMS+xLy6vBQWFLy2vCwiHFQ+NMSmfNSyhIxmTDwuLJx+bLS2tCwmHMyyhMyqfPTqpPzyvLSWbLSWfPzitIx+ZDw2PAwKDCQiJGxWRPTmrPTerMyuhPzqtPz63PTWnPz6zNy+nIRiVDQuLKyWbOTanPz21NS2jNS6lDQqJHRaTPzmrPTSnPzyxOTClPz2xNSuhPTqxPzuvOzSpAQGDOTKnMy2jOzSrPTu1NzKnOzOnBwWHJRuXLSWdPTatPzqvNzClCwmJOzSnOTOnPTuxOzKlOzerOzarOzitJR6ZNTO1IxmXPTWrNSyjPzOjPTSpLSehHRqZOzirOTCjPS+fPzGhOy6bOzKhGROPMy2lPz+1PzmtKRyRHRiNNTCdPz+zNzCjEQ2NKySdDQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAj/AAEIHEiwoMGBARIqXMhQIUIBAwYQIFCggIEDCBIoULBgAYMGDgIIDEBAwMSKBRBk3NjxAciQIwdACBBBwgQKFSxcwJBBwwYMHBx0EAmA5EwPH0CEsCChoYgOQ0cSGCHhA4kSS5syJGDiBNEAFVGUKKEBAwWFFM6SNJHi64gDFEKE4FBBggoKK1i0cPECxokYXw0gsECYggQZM2jAqGHjBo4cOtqOxLhDAg8ePXz8ABJEyBAWRIoYOfJipEoMCZEkuaFkSAslS5jUGJKkSRAnRREo0JDwCZQoTKQAmUKlihQrVa5gKZ1lI+oAK7QM2cJlSZMuU4Z4+TJEx0iNOwKAggkjZkyOFmS8kClzpcUQLRRGbjRD4MgZNEzSqKG+ZgobI2248dUbDDDwABzcxSEHEFpgEcUcdMRRhx1fFejAAx0cgcYdSxiBRx566LEHH0d8QFRRNC3Uhx985CHEH0MAEkhCBxWkgiCDFEFIEYUYUmONMhyCRxVH/PgjBYioYJAdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+paintbrush-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBMTC/AQCtAQCdPz+/MzKzOzu7KyqrCwuLAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARZEMhJ6wxiDMsp1lvHfRohWuRAmOeVlUTQSukqz3U8A/nd9rtCAWTbAQoGg0q3OyANCOYPA0UgfCdMJnHFimre72sZ7pBWiTLqRUirK5hV7A0P2O3GvD5PjwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+paren-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBIQChAQCBBQSFCH5BAEAAAAALAAAAAAWABYAAAJThI+pGou9oDuS1hlqnkxu/niVQB6kYHzAiJYoUK7paLrxpr6GMJjWeqlFGirEaQhcDHQJnEQX2/1kMBv08Yu1ttNkFRr1ikHjIiYYjDjSWLIbUAAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+pencil-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAASC/IQCBPwCBPyChMQCBPzCxAQCBPz+/MzKzISChKyqrDQyNEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARYEMhJ6wxiEMtpIAWxddwXiqRlikSQeiAbuC+wirNR322gv7zcLobzDU+9XypoBBKTR1lz+RTWDgip8nUwZK1XLyIx5XoVicX2RUAo1DVKi7GOBxjxfNwQAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+percent-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIzhI+py+0P4wkU1XfDhBdo/zndF4qh1pkGKYFk2XpTqoJr9G5YfmOz3hixfBZa7IhMJg0FACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+player_eject-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAwKDJSWlFRSVBQSFKymrOzq7HRydERCRPz+/MzGzISGhJyenKSmpGxqbJyWnJSOlKSepLy2vIyOjGRiZPTu9IyGjLSutFxaXExOTHx2fGReZAQCBAQGBBwaHCQiJLSytKyurJSSlFxeXNze3LS2tIyKjFxWXHRudAwGDBQOFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbVKFQsGItBdBhpgh4PxIJvRC8cA4oiMy8bvQhJhMAYTFBVOURAWEw0QFxcMERAYCBluVxobDxkVHJocmBwEGgmEQx0dHh0CpKmkH6odVlanBR8FtAIFtiCkSB0LISEiGCIGIxAPDySuRwIOBwrOzwoHJRHJRh0jJgMj2gMnERQUCNVFHQQoCBvo6CkICATjRB0qp7b1K6qv+foyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+player_end-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTCxGReZBQSFOzm7AwKDKymrJSSlFRSVCwqLLy6vPTy9OTe5Ozq7CQiJLSytOTi5BwaHPz+/HRydMzKzKSepJSOlKSipJyanIyGjIyKjKyurISGhMzGzJyWnHR2dISChIyOjLSutDw+PERCRHx6fJSWlIR+hJyenGRmZHx2fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8ikMBBQKgOCgRMZIBSkxYHWoDVWD9EigpBQLLBERsPxCA8NDUhjgTBGJJNGG02RVBQWdUV3FxgZe0IGfoAGdhoXGxwdiAYef4FGFBoeHB8dGSBRihUhIo1FBhkbIyMkJRYmAwYal4JEBh2RChIWJ1IIGxUZFqdECCgkHR6wWAYpFR2YWSobvL5vFgfDaEMDIivMRBEsD9HcQgMWvecDLB0tZ0btsfJa9vLXU/X6/P3+b0EAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+player_pause-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBAwODMTCxKSmpJSWlFRSVAQGBBwaHLSutOzq7Ly6vCQeJPz+/Hx2fBQWFGxubLSytJSOlBQOFAwKDJSSlJyWnIyOjHRydNze3GRiZAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWBICCOZGmeaKqubOumQSDEgRjPMSoMRGEcol3vh0IkFAtDDWBEKlGMRKPgEIii0yrqIS1ArADu9KuLNCSOSdCMVp8ohEZFC4DL6SaBpXGh6/l4JX8XZACDhXkYCn1LAoqMUBAZEhBLDJKUSyYBGmhPAJyemiU0NDaloy+qq6ytI8whACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+player_start-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExOTAwKDAQGBJSSlHx+fBQSFMTCxKymrFRSVOzu7GxqbLSytLy6vJyanPz+/GReZBwaHHRydKSepKSipGRiZJyWnAwODLSutKSmpISChPTu9ISGhFxaXJSWlIyGjJSOlERCRIyKjDw2PIyOjLy2vOzm7Dw6PLS2tCQmJOTe5GxmbDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa7QIBwSCwaj8ik0hgQLJGBgbMoqBIKU2LAcMgOEQmFYeEFbBmNMgDhYDwWBC0k4pCoJ46IgRIXBioRCRYXamwRGBQIfgaBFhiERhkaenxmCoEbBhyQRYaIGVsdghgem4UWegcEBB8UHhsgIaZGBBgRIpUIIxQhChginEQIIBEklWslFyYnBsFfFCi4WQgpFBwqFxNGKxcsxl4IAS0NZEYCF3vlwgEfUuZV8JEuI2pPAARN9kcE9fr+SwaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+player_stop-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAwKDBQSFBwaHCQmJJSSlISChJSOlJSWlGxqbGRiZNTS1PTy9Pz+/Ozm7OTi5FRSVIyKjOTe5MTCxIR+hExOTHR2dLy6vLSytLy2vHRydFxWXIyGjIyOjPz2/FRWVHx6fExKTMzOzJyanKSmpKyqrKSipAQGBLSutHx2fDw6PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcslsAgKCAWEQjQ4KgSwyYDAcugZEQqFYYJECA6PhaLcfEEUkgJZAGJB8fkKpWOhHAxcOGBQZGBoaGQgbHIBGAhUOGR0SBxISBh4Xf0iCHxQSlRIIXhsgj0UCIaCXmJgHGyKpRJ+hmB5dHQqOaCENIx0epBIkBhdzngoPGCQlJifQJBvJRygRKRcKGxcXGypys1srEREc5SLnICLiR1koLFVUWfRO9vf4+UwyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+prec_minus-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBKSipPz+/CH5BAEAAAAALAAAAAAWABYAAAJAhI+py62RgnRnGguZ3BlTYIHdl13jh3goFpIleggvTK8ctw76Pswav/MtAkCd8NHj9HLFY6S4JEGdqdumtjAUAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+prec_plus-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBKSipPz+/CH5BAEAAAAALAAAAAAWABYAAAJHhI+py22hgjwSonktxBZU7GnhkyXc6JmmeDpnG2lg1YCOInT3zrvfxwsMhsSBrkYUDo8MpTEZNH6M0SV058xWi1Tsj9ZjGAoAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+previous-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBOzC7PTq9NSG1MxW3LQCzNRi7MRGzLQCvPz2/NRq3ORy7HQCdJwClAAAACH5BAEAAAAALAAAAAAWABYAAARUEMhJq70Yh813rl1HheInBYIwrEJwktxJFEbRmuOBJIXivp5LQLcj+HCnBaPBMBhdMBBjw0w8ccEA0/EzdQHaHywmnIyDyDSIrG4LQ+64OSqvx+kRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+prod-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBIQChCH5BAEAAAAALAAAAAAWABYAAAI7hI+py+1/gpy0hlVRZlP19mmSE0YjeIoXuqpkarYYbJQeDdiJrrs77gvOZDVg7Eb8JXtFSpMJiUoB9AIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+queue-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIIAAPwCBAQCBKSipMTC/Pz+/AAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAANfCLrc/jDKEGQMQlDLKM5aZQXDQIHZ9nhleaLqEhAE1bofKCozXZO3l0bmK9qCQ2LRCDQlAb3lkoTZQaVS6jOKpWmt3O5X2fU6wWXfuBM2mmINCpbKkavho56VI9s7DAkAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+redo-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3Pz+/JTWbHy+VHTCTMTivPT69BxGDESuJDyiHESiHEymJIzKZAQCBFS2LFzKNGzWPDRqHCxqDFSqLHy2XESCHAwaBAQOBBQqBDyWJHyqZDyKFGSiVESeJBQ6BAwSBGTGPFyWPFSSLEyOLESGJBQiDAwiBBQmDCRGFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaoQIBwSCwaj8hkMcBkKpcBwYAwEDif0YLhwEUkFItFMkAwMBoOR+PxgHwjRDggamhIJpQ8ZbKGKOQLcgEFdhUWEYgRF3sNfhELBHALAhgZFhobRBwREhQdEAIEHpIKHwsaSJwUDQgQIJINARxKESESDQ0dgCIjSpAkDAwPco+ZSJAlJicnKHIAIrNHidOIQxunT0kpCyrZSCss0d5Fj6jjRonn6uvs2QZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+reload-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBCRSFCRSHBw+DBxCFCQ6FBwyDBQWBBxGFCxyLGTChMzqzLzmvHzKjDyOTER+RERyNDSqXNzy3LzivFS+fCyCPBQmBCQiBBxKFBQqDOTy3LTitES2dDR+PCxuJOT25KTarCx+PESSTCxKHDSeVCyKRNT21ESWVDSGPBQyDAQCBBQSFDRuLDSyZDySTGzChCRiJKSmpExKTDS2ZGzGhLy+vGxqbISChDSKRMzKzGxubDQ2NIyOjCQiJCwqLBQWFCwuLKSipERCRERGRHR2dAwKDDw6PFRWVIyKjCQmJFRSVBwaHKyurAQGBExOTBweHFxeXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf9gACCg4IBAgMEBQYHhI2ECAkKCwwNDg8QBAOOhAQREhMUFQgWBxcHGBmbggkaGxwPB4yDB6SbBJIKHQaqtY0eHyAhsqrDgx4aCiKpqoQHAyMjJBMKJaSxzAAHIRsmJgonKA0LHSmDKiuOBywRLSQuLyEwwyoxMuiN6iUzNBXy5jU2bsgoJugABBz95uXQsUMGD3vpPPgTpKIGwx4+HMr4kW4YkCA2hAzxAQSIECI+imBTwVIFESNHerRUgc0cEiFHkjiiyYzeDiVLdvLcySSkkKGEWiZVweSGkIHMmvQosoQlkaZOjvhosvKJjIAxoOAsgpRZkQNLnvSoqspAIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+revert-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAAQCBPwCBPz+/BQSFPTy9CQiJNTW1ERCRLSytAQGBISChMzKzFRWVDQyNCwqLMTCxFxeXOTm1KSipPz69BweHHR2dJSWlMya/Mxm/GQCzOzWxGRmZPzOzMzOzMzOnExOTDw6PNze3Ozq7OTi5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAWABYAAAbrQIBwSAwYAwDjUCloOgUDQlJJFCKfzoLAMF0ih9jmASGQfq3IBECgYC8YCsah4Rgc7+Bw2fCY4pNrCg8QboIIEX5HXXoEjWZ3eAIMgxITcRRVmVdOE50TBRV6TkJsD3EWDBUOoRcXGBmwsAJqT44aoKJNtAoVDAwWFRUFGwKxxhkCQhMEyxEcGrfEuWoGBgsdDwseHhQQvt++Hx8HmUQU4OHiICAJkHcDDB8hBCIj1QYfDomQAOIiHwxCPBiYr507JeNGAOQz8IC+g0YKrAtxAMQDBBgPFDB4EACIAwIHDkQAAhNEKuUStDMQBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+rightjust-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIhhI+py+1vgpy0Toizjvbur3WiBJbhSJnqgorri7nwDBoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+rsub-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBIQChAAAACH5BAEAAAAALAAAAAAWABYAAAI+hI+pFu3f1gmSVUBrlnt19SUhMk5XaWnnqrYc+2rQfNWHIBi4feP+zssBdkJez5gAIodDYbH2+yGBymXCUAAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+rsup-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBIQChAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAI6hI+pyxBhXlOv1omggxon6VFdGG1laFmkyQLCC8fvJNB2U+M3k/P70gP+FEHiMFFEHhFJJk0GXUkNBQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+run-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBOzq5MzOzPTy9KyurNze3PTy7IyOjOTi5MTGxNza3MTCxMzKzHx+fOTm5NTSzNTS1NTW1FxaXAQGBLy+vJSWlGxqbGRmZIyKhDw6PAQGDJyenAwKDLy6vLSytBQSFLy6tKyqrHR2dLS2tJyanJSSlISGhKSmpCQiJISGjCwqLBwaHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbcQIBwSCwaj8RAAMkUBgSDZdMpBQQIharyGDAclsoDYhtIKKrDwMEgUBMWiwSj3HCg0w+DfgGJQAYSDRMUTAELBhJ8fw0KFXdJBwkLEhYXGAUNDBUZj0pXkxYaARsIDRUMHJ5pAgQHkxEYUh0JFR4fHAVZTgMFCAt+sUIgBB4hIggOI1pKCQO8CB0gAgYkJGNbRQEKEYwNCa7VIhOPaRAKCpoV1QUl5E5mDJrFJAW4JuRlCuMnKB+94yVQ2DGi7QSYABcQgACTDF+VFChULJsiZIUCiRS5sMjIsQidIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+showmenu-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBBwaHERCRIyKjBQi/ERO7HR+1Ly+1Pz+/Ozq7MTCxOzu7NTS1AAAAAAAACH5BAEAAAAALAAAAAAWABYAAARkEMhJq7046z2D/2AoDAQVFGiqqsaBmGH8jWWX3Hiu3+YdKglPMIDrDXc+Is92zAmFi5pECWIkjySj0EkUZplb3JP4nV65WCmAqhR3yeo2Emmc0zsyGc3U6Pv/gAAKHISFhoQGEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+signature-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAISGhISChHx+fHx6fHR2dHRydGxubGxqbGRmZGRiZFxeXFxaXFRWVFRSVExOTPwCBAQCBMzKzMzOzMTCtMS2dJSCTCwqLPz+/PTu1MzCtERCRMSydPTqxPz+9Pz6/MS+rNzKlKSSVOTarPz69ISCtGxurJyaxPT29MS6pOzmvNzSnHRyrPz29OTi5LyqXOzavMy6fFxanHR2rOzq5JyKTOzizPTqzKyWVGxqpPTy7LymZGRipLSy1PTu5KSSZFRKLExKTGRaNPz27PTq3LSiXPTq1GRWNDQ2NMTC3FxSNLymXGxqrPzy7IRyPDQyNCQmJGRinJSCdHxuVBQSDPTy5PTm1IR2RJyOfKSSfBweHGRenFxepNzGrKyejNS+pNTCnNzCpLyedBwaFBQWFNzOrOTOtOTOrBQSFOzStOTKpAwKBMS+tMS6rMS2nMSylMSulLymhLymfAQGBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAA8ALAAAAAAWABYAAAf/gAAAAQIDBAUGBwgJCgsMDQ4OD5MPEAEREpmYmJqaE5IPFBUWAxEXp6ipqJ+TFRgVBaaqsxcZGhUVGxwdBrK0qB4fFSAhIiMYCLIkJSa0JygVKSIhKSoJvhcrqh4sLRUuKR4vITAL2DGpMiMzNBs1FzYiKjcMER6oOKglLDkVOinwRMCAAcKBrx33eMTwkKPHPx8/RGxwEaICkIMXcOBgMaJfCgw/fMCgWCGIhoMlSOQQkmMIkSJGUoysGOTBEVlIZMTg16NHhSJJZCqhOenmqSU5cDDB0JJIzJlNak5yYoqHDBY7hmgN8aPGhhslKU16EgHJDiY9oGz9EcJFkChSaKaIfUC2I5UhMarU+GElyJUrWHzIFZslAtqWVbRs4dIFi5cvYMKImTsmQs8qVVrUePGCDJcyZkCEGUzpTAQMmGts5ozGTJo0XEbPVTNhDRsUbdy82Q0HTpwwwNXMlQOhuPHjyIWLNRAIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+spellcheck-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAASC/AQCBFxaXBQWFAwKDPzCxPwaHPwiJNQGBOxKTPQ6PNQCBGwCBPQ+POwCBPwqLMwCBHwCBBwCBFQCBLQCBPwCBBQCBCQCBPQCBOQCBDQCBFwCBJQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWGICCOZGmeaAoErMi+4xuQgQAI8yoKw2rfOZ1LRIgJh0hhDncsyXKypNMIKAKbNGpwFjxukcza7jt8xmCAgkpVMKxRhQOCnTAVFAtGqtBwLEgFDxAREigBExQVFRAibYNdJhaIigmODBdvF4gYDwoZDBpvIhKIGYOFoi4bHBGQogESqKlvBiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+sqrt-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIIAAPwCBIQChAQCBBwaHAQGBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAANPCLrc/jDCQKutkcqQJeCP5k3g6IjCIAjAynYt0brzUn7gW++i0i8CGcNiuyl0NlyysYKhXgQdUvmcNZtDTo/mmvo+ptMvjDOSzWey+mFIAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+start-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBCRGZAxCZGyavExmjHyatOTy9CxihISevPz+/KzO3BRylAw+XDRWbPz6/FzC3CSuzDyexJzO5Mzq9CxSdAQOFISmxNzu9HTS5BSmxAyexDSuzJTa7Mzu9Kzi7GS21CRmjAQOHHSWtLze7AyWvHzG3BRihCTO3BS+1AyixBSWvBSOtBSStAQWJDzW5BTC3BSqzBS21CTC1ETW3AQSHEze7BRqlBRmjAQCDBR+pBRefBRSdAQKFAAAACH5BAEAAAAALAAAAAAWABYAAAa0QIBwSCwaj8ikMqBcMpsCQTEwIDQBUWKgYHgqs8LAAZGwQqWAgGLBaDgEj0Fgjh5mxRBERDKhICAQFRYXRVEBGBAZGhscHR4VHyAhIiOFAiQZJRoSGyaNJxQnEyiVRFEoGykqKyYsJiYtLi0mKC+WFygrMDEyMzQ1wDQqKDaWADYoMzcqsjg5DSgoBISmaCOoMG4v29s2OsZCyDs8DldgQtc95WdFPg7rV0Y+XvHt9ff4SXRBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+stop-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAASC/CQKDBwKDCwODNyKjPzq7My+vIxiXAQCBOSOjPz6/OSelNySjNyGhMR+fLRaTGQ2LPz+/Nx+dNR2bNRybMxuZMxeXMxiZLQSFJQaHFwqJNyKhOSCfNyCfNR6dMxmXMxWVMRORLQODOR+fOSSjNR2dMQ2LJQWFMRWTLwWDNSCfMxeVLwaFKQODNR+fNx+fMxiXKQSDOSWlMRSTMxaVMQ6NMxORMQyJOTS1MxqXLwWFLRORMxKPMQaHMxKTLQWFCH5BAEAAAAALAAAAAAWABYAAAb2QIBwSCwajwGBcikIHIsDQmFKNRwQT2EgoVgsGOCG4wHBIgmRhWRCqVQsF0xGYyYGNgoGh9PpeCQfICEic3UAAWgLIxwRJBsbHSUREyYYJ3RDAQULexGejhueESgpl3WaCxsqJKKsChEUKywtmFoFDC4vCayikzCyMbWHt38NCTKiHhUfMyzBdQIFKsodob0VNDWzwppuKxMRrx6iNjcitNA4bh+iEzkwojc66JkOOxcf7G35PBE9KS1MEUGgIQOIFfk++KjRw9wJgUUIZvhRoyLDFCliQDQisUWLGCJOeNx4hKCGkyhPGnqCoKVLl1liypyZxUAQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+sum-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBIQChCH5BAEAAAAALAAAAAAWABYAAAIyhI+py+1/gpyUMrvm1bdhFTgfhIykYZ4pyZ2o5EZwDLSurc7ZFnqZDgLKKsQe7QihFwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text_block-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUWzvNzo33GfFl5jVlonlTrr1DbvFi9vjeeNUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text_bold-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIxhI+py+0Powm0VnknjVkH2AEhE45LZ55Wqn6e65TsMc5eYosbksswubJIhsSiccgvAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+text_center-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUbz3Sh7yIWfFHKjVl4nmFrr1Lpr7LwkjeeIUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBBwaHAwKDBQSFLy+vLS2tJSWlBQWFKyqrFRSVCwqLDQyNNTS1GxqbFxaXJyanIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAVcICCOZGmKQSoMaZsShBsQBdAapHvgaIDUqUPJlRjSbAoT0fRDKgODRbF0PLUYjZO2F2Bst9evNix+dsvDlGKK5jraudQb7qbX6a2HEJ+ycyF+LRE8ZTI+fX5oGCEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text_italic-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py+0P4wqUSlQvttrkDnyaOHIdeaGRupplAIauVM3xjeeOUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text_left-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+pyw0Bo5zB2UXz3Sp7yG2fFJajVjonmIor2TJvfL0wjecIXQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text_right-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUfz3SZ7yIXdF4kWqZkbCqoMO7kXLC+wVOe6YRQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text_under-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIvhI+py+0PowmUnhpeVVnb1DkbCI1I2JhX+Z0sOr2cTHpwK7a4rUr+hAnufsTirwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+toggle_log-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIYAAAQCBAQ2NPwCBATW1KSWfBweHATS1Pz+/Ozm1GxiTATOzPz6/Pz69ATGxKSahOzaxPzy5HxuVLSmlOTazPz27AS+vPT29NzClPTexHxuXLSmjAyKhPTy9KyehNy+lPTy5Pz29HxyXNzWxAS2tOzexPzy7IR6ZASytPTy7ASurPTu3KSSdIx+bASqrJyOdIyCbASmpJySfPzu3OzizJyKbKyijASipJSGdOTWtPTq1PTq3NS+lJySdOzWtOzi1My6lMS+rOTOrMS2nNTGrNTCpNzKpJSGZKyafLSifIx+ZHx6ZFR6bFR+dAQyNAQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAIALAAAAAAWABYAAAf/gAABAoSFhoeHAAMAiI2IigSMjoQABYkGBAeSjwAICYkKmQublJ0HDJ+GAA0OB66bpq4HCQC1lA2ZrqMCAA8QBwvBERITFIwAFa2yFgAXGL+uDBkaxRu1FQQLshwdHhgfDK4gIRoiFNYAI8quHA4XJCUMCwwMJhLm6Ce5rigEzhAMQICwYKLcuVopWgUDoWLFhQcfKNCjwOLeQQAtCFDYiAKBC28QKITk8MIgOhgxIHyQIWOGi4cfIHAogYJGjWq1bNzAkSOHjgc0dmBAgQKCUR43S1jjVeFGDx8PcNAAKePDjxg1gOCThOxFEBxBgpJQMQGpkCETEIBYSqkpkSJGOYTyOCJkgg4OIDaybXvjh5ELLpAMUYEAgQ7COPbyTWJEiY3HkCOTaruESYVamDPbQtTESedJhOgEAgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+top-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAw2VHSWtBRihAQOHISmxNzu9BSmxHyatPz6/Lze7CTO3AyixAQSHHTS5BTC3DzW5ByyzPz+/OTy9AyexEze7GyavKzO3FzC3AyWvBSqzBR+pAQKFCRGZExmjCxihBRylCSuzBSWvBS21BSStBRSdAw+XAxCZDyexDSuzCTC1BSOtJzO5JTa7ETW3BRqlAQWJDRWbOT2/Mzq9HzG3BRmjJzS5Kzi7GS21BS+1CxSdCRmjAQOFAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaoQIBwSCwaj8jkMMBsOp3Ip7SpHAoGhELVKDAcENmtNaFYMBoEh1hAPjwgEUlYyZ5QHpIKxALWIgUXFBgZCBUaG3AcBB1HAh4fICEiFRUjJCUhBCYnjEQCAignoikqhissKAKiJwFJAS0uKhovMDFiADIzNDUsLza2Yh4KNDcsEbW3Ago4NSUrBMBbAjQ5KRo60Mk7PATdKH5bAT0xDg4xPa236uvsShRBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+undo-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3PT69MTivHy+VJTWbIzKZEymJESmFESiHDyiHESqLAQCBFzKNGzWPFS2LNTmzCxqDDRqHPz+/KTGnBQqBAQOBAwaBESCHHy2XBxGDOzy7HTCTEyyJDSqFHzWTAwSBBQ6BIy+dESKJFySPFSSNAwiBCRGFBQmDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMsBkKotMwYAwEDiXgYLhwD0gCFZiQKxNKBYMRqPh+D6G16y5AYnYIxBJAyF4AwITTAUJdBESD4gPFBV6Fn6ABBcJDIYPGEQZGhQbHAIdfx4JHw2VSBodGwWfAR4LDSALfkgYAQurBiAhICKfSSMkvQElGyYnGyi9Rxkdj4nOskUYyU9FpxnURikdGtjRKivdRKfQ2Inh5+jpRwZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+up-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBHSWtBRmjAQOHISmxNzu9BSmxBRihHyatPz6/Lze7CTO3BSixHTS5BTC3DzW5ByyzPz+/OTy9AyexEze7ByixGyavKzO3FzC3AyWvBS+1BR+pAQKFCRGZExmjCxihBRylCSuzBSWvBS21BSOtBRSdAw+XAxCZDyexDSyzCTC1JzO5JTa7DSuzETW3BRqlAQWJDRWbOT2/Mzq9HzG3JzS5Kzi7BSStGS21CxSdCRmjAQOFAQSHAAAACH5BAEAAAAALAAAAAAWABYAAAaeQIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbUGFAtGw0GFfheHByQi4S6/E8pDUoFYLm5kAEPJaBAVGxIcER0JHlEfICEiIxUkGyUmIgknKIhXASkonCorgSwmKQGcKE9IAi0uLxUwMTJWMzQ1NiYwBLBQHws1N7avXgs4NjkcCblMATU6KhvGyG87PAnUKV1MAj0+2zIFp1bg4eJJdkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+view_choose-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz69PTq5Pz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq70466Cl+AMxBVwnFIVRAmQHCIeBrC1L3tQgJ/SaEbeeC1PLBHE2ybFI9A1HzstHEIK6YCmhDTmBybQaHYJn7QC5zKeytIQe1+pKNE6P2yMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+view_detailed-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAQ+EMhJq7046817+MLQUQFRGMc4lQaSAkcMx3QltMmrDrSu/sCgEPgJhIiFk89DaL1qPRnlhsgBebWhdstVESIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+view_icon-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz69PTq5AQCBPz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARWEMhJq7046z2DF0PlBeAVEERhiKhqHgWyUgEsX0KczFOO7JeBYciTCImc5ITIXDKHyqhU9AnRqq9UEVDTvmLbGhin2/qAliOUot5OLc81IO5+2+8WewQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewmag--22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbKQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/avno2BBf/MCClSob4iBIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewmag-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbIQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/cunr9S8gAIRFhTCLAgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewmag+-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbQQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/4zT766vRI+fvHD4CPgwcJ9qg0UB85JA0dDjEQBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+view_multicolumn-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq7046813+MJQfUF4BURhHGO6noSBsEcNoDJtS4KcsJQe4ncZ1HYT47HDbDqfUAnJRJmKLIGCCjjJbmE5wBI3EyOFxKCPS1EiJW52dE6vZyIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+view_sidetree-22:actions actions22 22:photo:22 22:R0lGODlhFgAVAIUAAPwCBFRWVFxWXFxaXExKTNTO1NTS1Nze3Hx6fLSutMzGzLy6vMTCxDQyNMzOzPT29Pz6/Pz+/PTu9Ozq7OTi5Pz2/Ozm7MzKzGxmbIyKjAQCBPTy9FROVFRSVPTq5OzOpMS+xPzu5OTKpExOTJSOlOzu7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABUAAAb/QIBwSCwaAQFBcqlsLgcBAnFQqBqqhwIiUVB4F4wGMeB4QMyPSCFQkEwmlMlCPKRC7pCKmjpxTyxzUwVmEBF6FxiDbxZyUnUFdxERhQUZbX4TDBlEAgUVkQ8DogEDAqYBTwEaAw54eQNusRMPs319Gp0PFZ8PAhMRGpLCwxOrFw/IFRuwwMICHAIEkhK4lxK0A7/Bkh0RHtvFAwp9D27MGugRAh4f29TithIW2c2SBOjgqwxv/AIS9cOEvQPBiBEFetsidOhAQFqEcCDgWLBAwR9AARFCuMPFAMwCEAsQpuMQQkS+EQ1SNkBAwuKwe+kiUDuSzU0JPyUm5HSj4Qi+Bp9A8QEIAgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+view_text-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIkhI+py+0Po2ShBlOxzbP7n2yaJoLm+ZTcxqHuC6hXzML2HVEFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+view_tree-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz+/Pz69Pzu5PTq5OzaxBQOFOzKpFRWVFxWXOzexPTexCH5BAEAAAAALAAAAAAWABYAAARPEMhJq704g6A779kHCORAgNskFMYhakE8FkjyBcoWv+JwJItXaELYCTFHlCSpZKKcoB5jYHpOGgUadLKbIRw3jhEzQDyCSuI4zW673yhDBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+window_fullscreen-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBNTW1NTS1MzOzMTGxLy+vLy6vLS2tKyurKyqrKSmpKSipJyenMzKzMTCxLSytFxaXPz+/Pz+9Pz+7IQCBMzOvMzOtPz+1MzOrPz+5Pz+3MzOpMzOnMzOxAAAACH5BAEAAAAALAAAAAAWABYAAAWxICCOZGmeKBqsbOu+rjAQRFEYxoEkibIwjUZMRnAUHjkEpPcLriLQqHQ6XRUk2Kw2O+lSKIUVoUKubLflikVcPnO75cvKkXZL4HG2pK31lilqc1lmfRNfgBQYGBlidl5fGhobGxqMAQNnXYaQkZOLjVgVmpsUkRoVnpZje2SkphtlGBUcbH+br5NptAF0rYe4G4plHSseaaW4irLDcxYOFtDRFhnU1B3X1zDa2indIwYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+window_nofullscreen-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBNTW1NTS1MzOzMTGxLy+vLy6vLS2tKyurKyqrKSmpKSipJyenMzKzMTCxLSytFxaXPz+/Pz+9Pz+7IQCBMzOvMzOtPz+5Pz+3MzOrPz+1Pz+zMzOpPz+xMzOxMzOnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbKQIBwSCwaj0hkYMlsOp9OwYBAKBQMhgMikVAsGI1GVEpwFB5ZBKT7DS8j8Lh8Pl8WJPiJfr/PTygUBUsEEhV4h4h+ExUUFoMVkIWJhxWLkBeDhZCGiXqbFRiYAYSanId7mxihSwOlphJ6gJ8ZGksOiqd/gKoYGRmipIh7gBSqvhkbtaOuw7sYn8mseJuxxcabGxwdmZ/EvL6f2o+Qz869yBUem9sBH4sYf7znG/Qb6h4gSx8fDh8W/wA1CBTYoSCIfFASQknCcIiBIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+wizard-22:actions actions22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBNzaTPz6BAQCBPz+BExKBMzOTPz+rPz+3ISCBPTyhISCLISChPz+xOTiVPz+/MTCxKSipKyqrExOTDw+PDQyNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAV+ICCOZAkEZqoKqoqKAzHAb1sIxhAQwWAQhRaJd0AcdgkhqaBAOBUL5WjAaD6TUqog0DAildqcg+cDtgaPACTCiM0AOhV6sG4DWOAHnf2uyfV1b1lsgVIwEgwTFHaGA2yKFYJgiJCSQo6JFJGGcJSalkKPn5wimZukAJWoIgYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/tkIcons.kde b/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/tkIcons.kde
new file mode 100644
index 0000000000..0d5b2c8695
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/tkIcons.kde
@@ -0,0 +1,195 @@
+actattach16:act act16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBPz+/AQCBAAAACH5BAEAAAAALAAAAAAQABAAAAI2hAOCxg2h0nJHyEshi9HpxU1GOCLdZoKpQ15nibUoprKp9lh2oucUxsBRXsJh4Hjs/QTMpr8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actbookmark16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actbookmarknew16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCwqLLSytLy6vERGRFRWVDQyNKSipAQCBMTGxKyurISChJSSlJyanHR2dIyKjPz+xISGhPz+BGxubMTCBHx+fPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVfICACwWieY1CibCCsrBkMb0zchTEcNYsIiYHiwIOdEAvigdFQGE0Ix4NBbSAgsWjk+jBIAlcUYrJASChnSXZSoUDelKfoKpFALJA61ueGI2IAZmhogGFmCGGAgXsifiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actcheck16:act act16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBMT+xATCBASCBARCBAQCBEQCBAAAACH5BAEAAAAALAAAAAAQABAAAAM2CLrc/itAF8RkdVyVye4FpzUgJwijORCGUhDDOZbLG6Nd2xjwibIQ2y80sRGIl4IBuWk6Af4EACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actcross16:act act16 16:photo:16 16:R0lGODlhEAAQAIIAAASC/PwCBMQCBEQCBIQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMuCLrc/hCGFyYLQjQsquLDQ2ScEEJjZkYfyQKlJa2j7AQnMM7NfucLze1FLD78CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actexit16:act act16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBDQyNHR2dCH5BAEAAAAALAAAAAAQABAAAAI4hI+pFrHb3nEg1iWiDiINCwYDko0V9XUTda6I1TIsUMpGinyzbB6ZeGuoEr+GUDL4CXqSphPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+acthelp16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQ6XAQCBCyCvARSjAQ+ZGSm1ARCbEyWzESOxIy63ARalAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQ/EEgQqhUz00GEJx2WFUY3BZw5HYh4cu6mSkEy06B72LHkiYFST0NRLIaa4I0oQyZhTKInSq2eAlaaMAuYEv0RACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actitemadd16:act act16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBARCZPz+/Mzq9BTC3ITC1HSyzGSivAw+XBSStIS6zHy2zAQCDFyatAQOHFSStEyOtAQSJBSq1DR2nCxunCRmlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICCOQTmeaCAMRIC+AVu47xkTBl2Ld16XQNYBQTQBVIOkMHFQJBeMI4tAbSSu2IRDSnhAvFfI97sFRM6RwOMacbjLKckVvgvIJ5EdSU7J648VgXQ7Dmd/hyJ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actitemdelete16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBARCZPz+/Mzq9BTC3AQCDAQOHFSStAQSJAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAQwEMhJq704681n+GAISoEwnGg6EAUQrEQsz4ThEkeu77kNIAagMEj0dY7IpHI58UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actlock16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJEQ+FExGHCQiDBwaDGxiLHxyNHRuPIR+TIyGZJSSfFxaRFxWJGRiLJyaXNzWpNTOnMzGnLy2hJSKTGReLKyqjPTu1NzarMS+jLSyfKyibJySXIyGVCQeDLSytPT29Ozu7OTi5NTS1KyurJSSjGxqVFxaXLS2tKSebOzuzLSufJSOXExGLGRiTExONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwGCgGhkhkQDBoEpLKQoBACAyOUID1qTVwoQGvMPxNFgVjAxp6QCQUicSCwVgkG44HJCKRRCYUCAxIFRYXhxgZGhYbHINEHR4fGCAhIiMkFSVKJicoKSoFKwMsLZtDLison6GjLA92qCueoAUvpC2xQhWqrLYDErmEMDEXlDIwMxAHukI0NS01EzY2NAmPAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actredo16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxOHBxSHBRGHKzCtNzu3MTSzBQ2FLzSxIzCjCSKFCyeHDzCLAxGHAwuFDSCNBxKLES+NHSmfBQ6FBxWJAQaDAQWFAw+HDSyLJzOnISyjMTexAQOBAwmDAw+FMzizAQODDymNKzWrAQKDAwaDEy6TFTGTFSyXDyKTAQCBAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ2QIBwSCwaj0hAICBICgcDQsEgaB4PiIRiW0AEiE3sdsFgcK2CBsCheEAcjgYjoigwJRM2pUK0XDAKGRobDRwKHUcegAsfExUdIEcVCgshImojfEUkCiUmJygHACkqHEQpqKkpogAgK5FOQywtprFDKRwptrZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actreload16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCRaJBxWJBxOHBRGBCxeLLTatCSKFCymJBQ6BAwmBNzu3AQCBAQOBCRSJKzWrGy+ZDy+NBxSHFSmTBxWHLTWtCyaHCSSFCx6PETKNBQ+FBwaHCRKJMTixLy6vExOTKyqrFxaXDQyNDw+PBQSFHx6fCwuLJyenDQ2NISChLSytJSSlFxeXAwODCQmJBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIBQGBAMBALCcCksGA4IQkJBUDIDC6gVwGhshY5HlMn9DiCRL1MyYE8iiapaSKlALBdMRiPckDkdeXt9HgxkGhWDXB4fH4ZMGnxcICEiI45kQiQkDCUmJZskmUIiJyiPQgyoQwwpH35LqqgMKiEjq5obqh8rLCMtowAkLqovuH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actrun16:act act16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/ISChKSipMTCxLS2tLy+vMzOzMTGxNTS1AAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARlEMgJQqDYyiDGrR8oWJxnCcQXDMU4GEYqFN4UEHB+FEhtv7EBIYEohkjBkwJBqggEMB+ncHhaBsDUZmbAXq67EecQ02x2CMWzkAs504gCO3qcDZjkl11FMJVIN0cqHSpuGYYSfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actstop16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAASC/Gw6NGQuLHQ6NGQmJFweHFQaFPTm5PTa3PTW1Oy+vOS6tNSinKReVDQWFPz+/Nx6fNyCfNyGhNR+dMxybMRiXLxGRIwWFNx2dNx+fNx2bMxuZLQWFBwWFPTu7Pzy9NRqZNRuZMRSVLwmJGwWFNR2dMQiHPTKxMxmXMQyLMxmZNx6dMxiXMRSRMRaVKxybMxaVEQWFMQuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaaQIAQEBAMCAWDYcgkHhAJxYLRcDQBggckIplQKpaLdRh4YDIaSWa94Vw6woAHgv6AMKGPaMQhwQMJJRkfhHmEJhdvRCcgGSCEkCgpbnAECiorGYYfLCItlAAFCygQj5AfbYlwBQwVE5AukG6KBi8tMC0fLi0pHxyzcAAxFxwmMny/wEwOxMm/qlcdJCSJ1H5XQh3a28HY3kx+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actundo16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBxSHBxOHMTSzNzu3KzCtBRGHCSKFIzCjLzSxBQ2FAxGHDzCLCyeHBQ+FHSmfAwuFBxKLDSCNMzizISyjJzOnDSyLAw+FAQSDAQeDBxWJAwmDAQOBKzWrDymNAQaDAQODAwaDDyKTFSyXFTGTEy6TAQCBAQKDAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ1QIBwSCwaj0hiQCBICpcDQsFgGAaIguhhi0gohIsrQEDYMhiNrRfgeAQC5fMCAolIDhD2hFI5WC4YRBkaBxsOE2l/RxsHHA4dHmkfRyAbIQ4iIyQlB5NFGCAACiakpSZEJyinTgAcKSesACorgU4mJ6uxR35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actunlock16:act act16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaVAQCBKSipDQyNMTCxISChFxaLFxSJExGHEQ+FCQiDBwaDBweDGxiLHxyNHRuPIR+RIyGZJSSfFxaRGxmLJyaXNzWpNTOnMzGnMS+jJSKTGReLKyqjPTu1NzarLSufKyibJySXIyGVGxiNFxaXLSytPT29Ozu7OTi5NTS1KyurGxqVCQeDJSSjLS2tNTW1KSmpGRiLKSebOzuzJSOXExONExGLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaVQIBwOAwYA8SkMCAYOAnKYiFAIAQGyOgVCggYuEovVxztMpdnwAGRSCgUCwOjIeQ6HpCIZDKRUNYMRBUWF4UYGRoWGxyBRR0eHxgaICEiIyR0QyUmJygpKgUrAxMsLUQlKyieoKIuEAunK52fBS8DLiywQySpnjC1Mbi6QjIzNBeSIBY1EQfDQgosLAEUNjY3Co1DfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appbook16:app app16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBDyKhDSChGSinFSWlEySjCx+fHSqrGSipESOjCR6dKTGxISytIy6vFSalBxydAQeHHyurAxubARmZCR+fBx2dDyKjPz+/MzKzLTS1IyOjAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVkICCOZGmKQXCWqTCoa0oUxnDAZIrsSaEMCxwgwGggHI3E47eA4AKRogQxcy0mFFhgEW3MCoOKBZsdUrhFxSUMyT7P3bAlhcnk4BoHvb4RBuABGHwpJn+BGX1CLAGJKzmKjpF+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appbookopen16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBExCNGSenHRmVCwqJPTq1GxeTHRqXPz+/DwyJPTq3Ny+lOzexPzy5HRuVFSWlNzClPTexIR2ZOzevPz29AxqbPz6/IR+ZDyKjPTy5IyCZPz27ESOjJySfDSGhPTm1PTizJSKdDSChNzWxMS2nIR6ZKyijNzOrOzWtIx+bLSifNTGrMy6lIx+ZCRWRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQEAAQCwWBYJiYEAoGAFIw0E5QCScAIVikUgQqNargtFwdB9KSDhxiEjMiUlgHlB3E48IpdKdLCxzEAQJFxUTblwJGH9zGQgVGhUbbhxdG4wBHQQaCwaTb10emB8EBiAhInp8CSKYIw8kDRSfDiUmJ4xCIxMoKSoRJRMrJyy5uhMtLisTLCQkC8bHGBMj1daARgEjLyN03kPZc09FfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appboxes16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMT+xAT+BASCBATCBMT+/AT+/ASChATCxPz+xPz+BISCBMTCBAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEEgZwrwYBCFqvhs3DNYXjChRlWBRjIRqGN4UuEUczMZxsDeXykdEsDQVVSLhQxhBCkVlmXA+KVHFYhFYOoHbMGN6pTQaW8YYiQmcG+q16a0+Zipw+4e9B/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+appbox16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBPz+xISCBMTCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANECKoR6ys2IVqokF08yMTA1gwkYX5WQK5ma4VceTYPxXnBWdtY6+0834/Bowgzm6APWRQcH4TiMhPK2WYRiZWW7XK7/gQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appbrowser16:app app16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxONCROfCRKfKx6LNy+bNTOpGSS1DRupAwyXBRSnPTSjPTqvOzqzMzSvHSSlKy6ZDxutAxCpBQ2XBxepLTKvPzqzPzy5OTShLS2dLSqRFR2jBRerBQ+jOTixOzetNS2XHx6XDR2tCRexBwyTDyKzOTavPzq1OzKdCx23BRKtCQ6VCQmHFSa7IyirOzSnGSGpIR+bFSO1DyK7DR+5CRixBw2VDQuHFye7IS27NzGXISuhEyS5DR25BRWxBQ+lBQyXCQqPCxSfGyu7GyerKy2ZFR+rERqfCRmxBROtBQ+fBwuTBwmNDSW9JyabLyqRIx+TExSXBQ6bAQCBBQ6ZBxapDR+zBxq3LyaLJySRHxqPGxeNBxGbCRmrHRyRERONDRKNDQ2JCQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAeygACCg4SFhgABAQIDh4MBBAUGBwgDCYcKCwwNDg8QERIThRQVFhcNGBkaGxwdoYMDHhcXHxggISIjEiSvJSYXJwsoISkpIyorLIIDLS4WLzAxMjM0NSo2N8o4OS46OzwzPSk+P0BBgkI8Q0NERUZHCEhJSktMgwk4Qy1NTk9QUVJLphCiUsWKlStYsmjZQiJgIS4KuijQ4iXAFxYCDVFJwGUFmDBhMjYSw0KMyEYoBfkJBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appcalc16:app app16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBISChPz+/AQCBCH5BAEAAAAALAAAAAAQABAAAAI4hI9pwe0Ogpi00hHF2LzzzFlTsIHD45SSx6oCeW4wjK2tl83y7t64pIsJaxrfh2bEAJIlhRPhLwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appclock16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAALy+vAQCBPwCBMQCBIQCBISChPz+/MTCxCH5BAAAAAAALAAAAAAQABAAAANbCLHcrSLKOZcYmDSCsR1aUABAsXDDJwJGa5SBFwgaWxbCG3CWaBwG3C8Y67FawpYiNQscg65fsVkYuoAmJs1pBR522lQB6ILJLqHRwQQOZzYdZnw+dzruDIA/AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appdate16:app app16 16:photo:16 16:R0lGODlhEAAQAIQAAASC/AQCBPzerPyqXMRaBIQCBISChPz+/KSipMTCxPz+BMTCBPwCBPz+xPzCxMQCBISCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVxICCOQGCeJjkGwkC8RFEEavkax2G8dB0QuRyhhzoBg8MSYsncJXKJZIDZHCoWP1ogGIwGrtnSgUFmHLyNRHhrdpjRamnO/SYkromHdnxwnwkKVxByZW8DgQsQM2JcfwZXO0MBCZSVBgMuLzJaRZ0pfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+apppencil16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAASC/IQCBMQCBPzCxAQCBPz+/MTCxISChDQyNKSipEQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARDEMhJZRBD1H2z3lMnjKCFjUJQimOgcmcbELCXzjXq0hV785WCQYcDFQjDXeloMByKG6YTAdwIDAlqSZJSVFeKLcUfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+appsheet16:app app16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBAT+/Pz+/KSipPz+BAAAAAAAACH5BAEAAAAALAAAAAAQABAAAANFCBDc7iqIKUW98WkWpx1DAIphR41ouWya+YVpoBAaCKtMoRfsyue8WGC3YxBii5+RtiEWmASFdDVs6GRTKfCa7UK6AH8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+apptool16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBISChGRmZMTCxKSipLS2tHx6fPz+/OTm5FxaXOzu7DQyNMzOzAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAReEMhAq7wYBDECKVSGBcbRfcEYauSZXgFCrEEXgDCSeIEyzKSXZoBYVCoJVIqBGByKu0Cy8QHxmgNngWCkGgqsGWFseu6oMApoXHAWhWnKrv0UqeYDe0YO10/6fhJ+EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+apptools16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBExKTERCRAQCBOzu7Nze3MzKzLy+vCxqZBQ2NJyanKyqrGRiZDRydKza3FRWVPT29LSytDw6PMTm5EySjCxaXGRaJFSanCRSVGxqbPTmvMSqVJTW1GSurHS6vOzq7KSipISChFRKHJSGNPz23GxKFBQ6PKyurCwqLMyufJx2RAQGBJSWlEwyDIRiLNy+lLSKVDwmDJRuNOTOrLyabGRCFDx2dKSCVOzWtHzCxOTGnNSyhAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAahQIBwCAgIBAOiUiggFAyHASKxDAwUC8Zg0HAglA9IZPGQABoTSqJCFTIOEIsFgHBcEhhHUpKJFCwaGxYYHB0VEx4IEh8gIQwiIyQbJRMcHokmEicfDygAkCkqJQgIGG0rLElCLS4vMCWqQwMCQg0UMTIzNDVLQjaIGDE3ODQlS785CEkxKjowvEOHybG4O6JDCdNKuDUxRAmxRDHeveUAfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appuser16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MTCxISChMT+/ATCxASChFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMg5gw00yyDGIAR1YUDggeFWFIZhnSBZrsZxdIOFEGTA2oeBAHeyuGwvzxBlYdUOLROMFzDQntJPrNoqAKUBaqnV+k57ZORruykHDj2LqIzUVKp1u0iuB/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+appusers16:app app16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxISChAT+BMRaBPyqXARCBPz+/FxaXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARLEIRJa5Ui673nsGAgeKE1Bl9AUEXbiqTlFlZaGUZoszm4BzhDAVf5BYbAXI+TAR6CS2ZGSZSEiIIqYIsSIEaJ7GRrlY7J1lKA7I8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+appwp16:app app16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBKSinJyOfPz27Pzy7AwKDExOTJyWlERCRKSelPz69LyyrKymnPz+/MS2fDQyJAQCBOTazLSiXOzivMS2jKSSVOzmxPz25NzSpPTu5KyebOzixNTGjOTWpMSydMSybCwqFGReVKyaXNzSnGxeNJSCVMS2nPz23MSuZIR+bJyShLyqnOTOtGxiXIR6XOTSvIx6RMSubIyCdKSalMS6pOTWxMzKvKSabJyKTOzezHxuPGRmZKyurMTCvPTq3AAAACH5BAEAAAAALAAAAAAQABAAAAajQIBwCAgIiEhiYEA4FgwHRDKhIBAWz4OhgGQ0FAPHA7qFEBONb0Qy0ULeQ2+aUrFcMI+3GYBOZzQbHB0eHyAhIQByDREiEwMjFRIkJQImAgJ+jScjHigkKSorLC0AKg2NFSMoki4qCy+IQgITKDAxkjIzNDWkQxQoJaskMgk2Eb1DNzgoOCoHDDY5yEIwJToAOzw9ET7TQiREAhkZ3kmy5QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+cal1day16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANOCLrMEUDIOUS9AFLLhx8LIRZjKYZmMRCkaChFLHty/AIiS3y6q+QtT49wq8VotRtQJGwRf6Zmrlj7DJLQXsupTJmeEIN4TB5nII20wp8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+cal5days16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANMCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiIdMmcec7jy53q81qP9OO5VMAj8RXTFWzOZW95HDLdEEM4LA4nIE0zgp/AgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+cal7days16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANPCLrMEUDIOUS9AFLLhx8LIRZjKYbj55GioRRwoQ5x4QIiwcp0fucsj873qvGMv5Jw2FIACUsW4WakGW1O046I05qmGYBhTC6TM5CGWuFPAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+calappointment16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxPz+BISCBISChKSipAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARbEMhJaQhA6D1E/wDGeeRgDhOhFoTBEi+REgdrIHScSEVvAD9Xr7cDqGSGpFEnQSqTv2NxCFQOiU1VEAiTZmstHFg1vQKuw+LxxfYaV/AuOQRI2O/4ewhT6Uv8EQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+calbell16:cal cal16 16:photo:16 16:R0lGODlhDwAOAIIAAPwCBISCBPz+BIQCBMTCxISChPz+/AQCBCH5BAEAAAAALAAAAAAPAA4AAAM+CLrR+zCIAWsgLVRGRBhOVQiG94WPVAbHaZHYAWqRYLbge88RsbInGuBCEhRYrZYm4xk4nYdoKzKIbiKHawIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+callist16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/KSipPzerMRaBEQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARDEMhJaQhA6D1E/wDGeeRgDhOhruyatjBRSIRxxOsMEAdC0BUZDcfSEYvDo3Bn++2Cxt7RqFxWhZiCdsvdhjCVsMQfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+calmonth16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBAQC/AQCjPz+/MTCxKSipAAAACH5BAEAAAEALAAAAAAQABAAAANSCLrMEUDIOUS9AFLLhx8LIRZjKYbiRxLFIBpK0Q6z7MkwkJIe8b0KEeuWchFysuStVsjtfMbeMQitWpG25YfmNK1WU53XNIUYzug0OgNpuBX+BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+caltoday16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBPwCBAQC/AQCjPz+/MTCxKSipPyCBMRaBPyqXAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARTEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyIQhFfiBIAfuFzaAioBIJBCummRYPCaDPh3vhwsOZdihNfa8Ub/AJXemFZPPNBvGwG672yFMZS7xRwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+caltodo16:cal cal16 16:photo:16 16:R0lGODlhEAAQAIMAAAQCBAT+BAQC/AQCjPz+/MTCxPzCxKSipPwCBMQCBIQCBAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAARaEMhJaQhA6D1E/wDGeeRgDhOhFmurpi5LyMYhFXiuFwZiA6qZYbbqJX5BIw2RAPxwAAWCyWMCCsiXFGEEErKz6LQZfOqiTR1YJiGq1rFyyHmo2+/1EKbCl/gjACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+connecting16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZbihUiz60FPnfaA0iBpBVGdHEYWxToEoSHBRHHM9AgSEQRcj+AYkYAJxIPKQFUJiOdTJQFIDU6dYzKKFhTCM+E5g4mXaDAyrlogEG+DGTecA7wsP8EcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+connectno16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBPz+BMTCBAQCBERCBPz+/MTCxMTGxISChFxaXMzGzKSipAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARPEMhJq704axBEHoPUEdhQGMNYFuwxkKInDYjBniEnwMCQIIebSzXx/WwsFK+YMABZikWuYlrUCtZpEYv4WRPaHhb064YB41kCfJFSQBh/BAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+connectyes16:connect connect16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/KSipDQyNMTCxMTGxISChFxaXMzGzAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARaEMhJZxCjgsAtDtUlCOA1gJQ4kl/IDatAoF7xxkS6GgEBr6jAobCyBX42SQBxMOx6A8MhiGASR8YDgrYsNEeJ0zaEGZY7uoH2oB6nOUwtbdLaVOeTUwo/8UcAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+devcdmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tOzOvNTqvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/LzKvMTCxDQyNASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAa0QIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTBqUiuUCVmAeiYzmsKlwOt/AAKFIFAIIFx4WHyAhUwIDIgsZFyMkFxchJSYmiBkSBBoIJJwIGgOhiCYFJSEnFyQjFwNZewABISAfFiYnCAEmCREIrwAIFhwVGwcaBAkPGApsQsAVFA0GBQMRbxBTKM0ODQwTEq192ClDgROkBHvYKuNJUu5CKCorX1RDKCkpUn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+devcdunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXISChNTS1MzKzMTGxMy+vNSytAQCBOzq7OTi5Nza3Oy6vPy2tOTStPz6/Ozu7Nze3MTKxOS2tNzmvLT2tDw+BPTy9MzOzLS2tPy+tLz+tLz2tLSynLzqvLzavLTOtNTW1KSipPz+/MTCxLy6vDQyNOTm5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAapQIBQGBAYA8Ok0DggFAwHBEIJECQUi8GT0XBMh9YHJDKQTLqUigWsuDwSmMxBQ9lwvoEBQpEoBBAWHRseHyBTAgMhCxgWIiMWFiASJCSHEgQSGQgjmwglGKCHBQUSICYWIyIWAwshIVMBIB8eFSQmCAEFCREIekIIFRsUGgcZEgkPFydrvxUUDg0GBSEREGJfv9AMEySsJxDYQ4DcEhh64UpS6lTs7QB+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+devdiskmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKROzSrOzKpOTGnLSafLySZKxuLMSOVPTWvPzixLSehNyibOzOrGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTOpHxOJKyKXFw+HKSipISChMTCxFxaXIRiPNSWXExOTOS2hLR+PLRyLPTWtMyOTASCBARCBPz+/DTSJIyKjIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaTQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwrA3HQ7scQAqFAcEQOUi0zAkFUSFYLghMBloUCDQNGxwdHhwHekcfICEhICIfIxkLJBABJUYCICABIhAOBiYnKJaXmH4CGSkYCCqkSAEfTKenrkOwsrQll0IrS7G5uwArLLaxLbXCLsTFLyDBKy4wZEVHvCwsRn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+devdiskunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBDQyNIRuVKyCXMSKRPTWtOzKpOTGnLSafLySZKxuLMSOVOzOrPzm1LSehNyibGxaVJx+XOzGnFw2FJRuPKx+TPTSrHRWPKyKZPTWvHxOJKyKXFw+HPTOpKSipISChMTCxFxaXIRiPHxaNLRyLNSWXExOTPzixOS2hLR+PMyOTPz+/IyKjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaIQIBwCAgYA8SkMCAYDARI5ZJQMBwQiWgyoFgwGgiD46FdDiCFwoDQAEe0TMkEQSFULIcLBloUCDIaDRscHRsNHhhHHyAhISAiHyMkJSYQASdGAiAgASIQKA0pKguXmJl+AiQGFwgrpUgBH0yoqK9DsbO1J5hbsrq8SrgstlJFHy0gwMVFR1J+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+devfloppymount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVASCBARCBDTSJIT+bAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVrICCOQBCQKBkIw5mqLFG47zoQ+FwbN57TosDhgPD5dMEEIqE04kwlBWKBUEiNVYFpyqAyGEUCgqEtERiNNMLhQKzLQYJg7n7Y4aMAwbCUPvAQeWNgfzQQETAIhSMQEogwgBITQEGGEREmfiEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+devfloppyunmount16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBMTCxARmZPz+/FSWlLSytKSipERCRIyOjISChOTm5HRydNza3GRiZFRSVCH5BAEAAAAALAAAAAAQABAAAARcEMgJQqCYBjFu1hxReN82EOhYGieaklJwHIjrqnGCJLqNWhUFYoFQCG1FgWXIIDIYNQKCoawQGI0swuFAbKsxgmDsfZjBkwDBsNM90Jot9A3DbBD0Dwiur9QnfhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+devnetwork16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBAQCBISChPz+/Nza3ARaZESanCyKlARudARGTLy+vNzq7ARmbMTCxARufAROVMzOzKSipARyfOzq7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVmICAGZFmKQiACweCSBImq41AYB5IodLq2hwWO0ejRWDac48Gb/QKNqNRoqspmrVcAUuIJBANS8sBIFCORUgooPEh4J8B67NgdsVBp9C5XWfl9LRMTCyReX19hARNojWlWLH+AAH4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+devpc16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBISChHx+fPz+/AQCBAQC/AT+/AQCxAQChAT+BLy+vAR+BAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARYEIAgqK1YzsG754QUDERpmkEpkkXrtoK6EcVgHIibhnNx564Yb0TDvQq7FQ34EiqPOhnREqhWSUPsyZSQAbbg7GcMEgwUiYVivTa1R+y4XEGoWO/4AMAfAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+devscanner16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBAQCBPz+/MT+/ASChARCRATCxMTCxFxaXKSipDQyNAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARTEMgJgqWBVivEldkUdKSXhVjZfenommglDERh3Tc4E4ZRHAGgkEPr9X6H5AHBERSMRyWzkug8jQXFEhWoOo8dRYxqLXSmGjIJnVaz29Q3fAP3RwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+devscreen16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXFRSVPz+/PT29OTm5OTi5DQyNDw+PERGRExKTHx+fISChIyKjHRydFxeXDQ2NCQmJBQSFAQCBERCRMTGxHR2dGRiZExOTDw6PCQiJAwODCwuLFRWVOzu7BweHAwKDCwqLHx6fBQWFGxqbGRmZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAanQIBwSCwKAwKkMslEAgSDqDRKqBYKhkNgcDggEorkMrDQchkNhuOhgEQkk0l5S2lUGpYLJqPZTAwMHB0DCmhqAW0Rfh5zAxgOkBcCFAcfIBMECxwBBAEPFw8dChkhcBMDDAcdnQqtFKSWcQMimx4dGRkQBxGxsg6bBQEawx8jl3GnJFoFHRNXVVNRJYIFDAsL1tgiDiQXFx0HABwcXeQH5OjkRutEfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+devspeaker16:dev dev16 16:photo:16 16:R0lGODlhEAAQAIMAAPwCBFxaXAT+/DQyNATCxMTCxPz+/AQCBKSipASChAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAARWEMgJQqCXziDG2JoUEENhZBkmHIWJVptAmqcIW/Js1MiF56TBzkckAAcHoa9nMRKeA4TyJk0knsHhTeK5khBaH2VwLYVh40TJhQ6RzeIQV32Quz8hfwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editcopy16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAFxaXPwCBNze3GxubERCRPz+/Pz29Pzy5OTe3LS2tAQCBPTq3PTizLyulKyqrOzexLymhLy+vPTy9OzWvLyifMTCxHRydOzSrLyihPz6/OTKpLyabOzu7OTm5MS2nMSqjKSipDQyNJyenLSytOTi5NTS1JyanNTW1JSWlLy6vKyurAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAaUQIBwCAgYj0eAYLkcEJBIZWFaGBie0ICUOnBiowKq4YBIKIbJcGG8YDQUDoHTKGU/HhBFpHrVIiQHbQ8TFAoVBRZeSoEIgxcYhhkSAmZKghcXGht6EhwdDmcRHh4NHxgbmwkcCwIgZwqwsbAhCR0CCiIKWQAOCQkjJAolJrpQShK2wicoxVEJKSMqDiAizLuysiF+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editcut16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIEAAPwCBAQCBPz+/ISChCH5BAEAAAAALAAAAAAQABAAAAIwhI9pwaHrGFRBNDdPlYB3bWHQ1YXPtYln+iCpmqCDp6El7Ylsp6ssR1uYSKuW0V8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+editdelete16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPT29GxubMzOzDQyNIyKjHRydERCROTi3IyKhPz29Ox6bPzCxPzy7PTm3NS6rIQCBMxCNPTq3PTi1PTezMyynPTm1PTaxOzWvMyulOzGrMymhPTq5OzOtNTKxNTOzNTCtNS+rMSehAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaKQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhSEQkFgrBAcr1URiPhKAsDD3QB8RhA3FM0IlLHnyUTVBMSFBUWfl0XGBMTGBcZGodmcQWKjpAbHIgIBY2LHRoempOdjooTGx8giIOPFYofISJ+DyMXI6AfFySyfiUmJSUnKBYcICIpfgELzM3OZX5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+edit16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBFxaVMR+RPzKjNze3AQCBMR6RPzGjPyODPz+/MzOzPyKDPyKBPz29OTWzPyGDPyGBOx6BOza1OR2BKROBNSOXKRKBBwOBOzu7PTWxPzizOySZPyCDFxaXOy2lNRyRMxmJCQOBPTm1OzStPTKrMR+XIRWLFxGNCQSBDQyNIRSNDQuJERGRLyqlNzSvIx6ZKRuVEw6LLSyrLymhKSShBwaFFROTJyWjMS+vNzW1OTazNzKrHRqXOzezOTOpPTq3OzWvOTStLyedMS+rLy2pMSynMSulAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAewgAAAAYSFhoQCA4IBBI2OjgUGBwiLBAmXlpcKkgsMlZcJBA0JDpIPEBGVjwkSBgOnExSfmBIVBxAMExYXswkYGRobHLq8gh2PHhoeHyAWIYKzIiMkJSYnKCnQg5YNHtQqKywtK9qMBC4vMDEBMjIz2dCMDTQ1Njc4OToz5PEEOzw3ZPToMcLHO23HfogQ0QMIkCA+hPBbhAPHECJFjMyYIUQIvEUpUqwQOXKkSEF+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editpaste16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQiFHRqNIx+LFxSBDw6PKSaRPz+/NTOjKyiZDw+POTe3AQCBIR2HPT23Ly2dIR2FMTCxLS2tCQmJKSipExGLHx+fHR2dJyenJyanJSSlERCRGRmZNTW1ERGRNze3GxubBweHMzOzJSWlIyOjHRydPz29MzKzIyKjPTq3Ly2rLy+vISGhPzy5LymhISChPTizOzWvKyurPTexOzSrDQyNHx6fCwuLGxqbOzKpMSabAQGBMS2nLyulMSidAAAACH5BAEAAAAALAAAAAAQABAAAAa7QIBQGBAMCMMkoMAsGA6IBKFZECoWDEbDgXgYIIRIRDJZMigUMKHCrlgul7KCgcloNJu8fsMpFzoZgRoeHx0fHwsgGyEACiIjIxokhAeVByUmG0snkpIbC5YHF4obBREkJCgon5YmKQsqDAUrqiwsrAcmLSkpLrISLC/CrCYOKTAxvgUywhYvGx+6xzM0vjUSNhdvn7zIMdUMNxw4IByKH8fINDk6DABZWTsbYzw9Li4+7UoAHvD+4X6CAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editshred16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbGxubMzOzPz69DQyNIyKjERCRPz29PT29OTi3IyKhPz27PTu5PTy5Pz6/Pzy7PTq3OzexLyqlPTm1PTizOzavLyqjOzWvOzaxLyifOzizOTOpAQCBOzezAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaEQAAgQCwahcihYMkcBAiBpLJApRoOBWgyIKhWEQkFYYHkeqkMxKFBFpq9jgdkEGlPqwrJhCIY2N8FFRYUFxcYGX9dgRKEGhiHiYEOhBcbGBwdiQEOARcBGwEeAZllAgEUnQEfoQEgmp4hrCKtrwEYsrRlTiMBJAG8syN/IyMAxMXHSH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+edittrash16:edit edit16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBAQCBKSipFxaXPz+/MTCxISChDQyNCH5BAEAAAAALAAAAAAQABAAAANQCKrRsZA5EYZ7K5BdugkdlQVCsRHdoGLMRwqw8UWvIKvGwTICQdmGgY7W+92GEJKPdNwBlMYgMlNkSp3QgOxKXAKFWE0UHHlObI3yyFH2JwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+fileclose16:file file16 16:photo:16 16:R0lGODlhEAAQAIQAAPwCBCQiJBwaHAQCBDQyNDw6PFxaXFRSVERGRCwqLAwODGRiZHx6fPz+/GxqbAwKDCQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVaICCOZGmeqBgEwjCkRGEcSKK4JrEcBrMgAdeLVDg0GguGsYEbBQyGYyN6FDoPDIf0+LCKBIgetQERDgGDBGIpNY8GioAU0m6KXFw883w3+/l9f4AkfimGIn4hACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+filedocument16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJSWjPz+/Ozq7GxqbJyanPT29HRydMzOzDQyNIyKjERCROTi3Pz69PTy7Pzy7PTu5Ozm3LyqlJyWlJSSjJSOhOzi1LyulPz27PTq3PTm1OzezLyqjIyKhJSKfOzaxPz29OzizLyidIyGdIyCdOTOpLymhOzavOTStMTCtMS+rMS6pMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaQQIAQECgajcNkQMBkDgKEQFK4LFgLhkMBIVUKroWEYlEgMLxbBKLQUBwc52HgAQ4LBo049atWQyIPA3pEdFcQEhMUFYNVagQWFxgZGoxfYRsTHB0eH5UJCJAYICEinUoPIxIcHCQkIiIllQYEGCEhJicoKYwPmiQeKisrKLFKLCwtLi8wHyUlMYwM0tPUDH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+filefind16:file file16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBCQmJDw+PBQSFAQCBMza3NTm5MTW1HyChOT29Ozq7MTq7Kze5Kzm7Oz6/NTy9Iza5GzGzKzS1Nzy9Nz29Kzq9HTGzHTK1Lza3AwKDLzu9JTi7HTW5GTCzITO1Mzq7Hza5FTK1ESyvHzKzKzW3DQyNDyqtDw6PIzW5HzGzAT+/Dw+RKyurNTOzMTGxMS+tJSGdATCxHRydLSqpLymnLSijBweHERCRNze3Pz69PTy9Oze1OTSxOTGrMSqlLy+vPTu5OzSvMymjNTGvNS+tMy2pMyunMSefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCAAECA4OIiAIEBQYHBAKJgwIICQoLDA0IkZIECQ4PCxARCwSSAxITFA8VEBYXGBmJAQYLGhUbHB0eH7KIGRIMEBAgISIjJKaIJQQLFxERIialkieUGigpKRoIBCqJKyyLBwvJAioEyoICLS4v6QQwMQQyLuqLli8zNDU2BCf1lN3AkUPHDh49fAQAAEnGD1MCCALZEaSHkIUMBQS8wWMIkSJGhBzBmFEGgRsBUqpMiSgdAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+filenew16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJyanPz+/Ozq7GxqbPz6/GxubNTKxDQyNIyKhHRydERCROTi3PT29Pz29Pzy7PTq3My2pPzu5PTi1NS+rPTq5PTezMyynPTm1Pz69OzWvMyqjPTu5PTm3OzOtOzGrMSehNTCtNS+tAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ/QAAgQCwWhUhhQMBkDgKEQFIpKFgLhgMiOl1eC4iEYrtIer+MxsFRRgYe3wLkMWC0qXE5/T6sfiMSExR8Z1YRFRMWF4RwYIcYFhkahH6AGBuRk2YCCBwSFZgdHR6UgB8gkR0hpJsSGCAZoiEiI4QKtyQlFBQeHrVmC8HCw21+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fileopen16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBOSmZPzSnPzChPzGhPyuZEwyHExOTFROTFxaVFRSTMSGTPT29Ozu7Nze3NTS1MzKzMTGxLy6vLS2tLSytDQyNOTm5OTi5Ly+vKyqrKSmpIyOjLR+RNTW1MzOzJyenGxqZBweHKSinJSWlExKTMTCxKyurGxubBQSFAwKDJyanERCRERGRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaRQIBwGCgGhkhkEWA8HpNPojFJFU6ryitTiw0IBgRBkxsYFAiGtDodDZwPCERCEV8sEk0CI9FoOB4BEBESExQVFgEEBw8PFxcYEBIZGhscCEwdCxAPGA8eHxkUGyAhIkwHEREQqxEZExUjJCVWCBAZJhEmGRUnoygpQioZGxsnxsQrHByzQiJxz3EsLSwWpkJ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fileprint16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBFRKNAQCBPz+/MTCxExKLPTq5Pz29Pz6/OzezPT29PTu7PTy7NzClOzm1PTu5LSabJyanPTm3FxaXOzCjOTKrOzi1OzaxOTSvJyenGRmZLyyTKSipDQyNERCROTi5Hx+fMzKzJSSlIyOjISChLS2tAT+BDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaYQIBwKAwIBMTkMDAYEApIpVBgOCAOg4RRGlAoEAuGIdGITgWOq4LxcCQgZkEkIHksHgYJOR6ZQCgVFhYJFxgTBVMZihoCfxUYDWUbUBGKGREcjBoQEB2TAB4CAx+Vl5WMhyACHiEhH6IfIiMktCQgE0cZJQStr6O2t6EARxO6vK6iEx4dZsMCxbsmBB4nzUTEutVSSUdmfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filesave16:file file16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBFRSVMTCxKyurPz+/JSWlFRWVJyenKSipJSSlOzu7ISChISGhIyOjHR2dJyanIyKjHx6fMzOzGRiZAQGBFxeXGRmZHRydGxqbAwODOTm5ExOTERGRExKTHx+fGxubNza3Dw+PDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaAQIAQECgOj0jBgFAoBpBHpaFAbRqRh0F1a30ClAhuNZHwZhViqgFhJizSjIZXQCAoHOKHYw5xRBiAElQTFAoVQgINFBYXGBkZFxYHGRqIDBQbmRwdHgKeH2YgHpmkIR0HAhFeTqSZIhwCFIdIrBsjAgcPXlBERZ4Gu7xCRZVDfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+folder16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folderhtml16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBERGRBQWFMzKzOzq7CwqLDw6NARqnAQ+XHR2dKyqrOTm5ExKTERCRHRydMTi7NTu9HS+1KSmpBweHDy67DyixHS61ITG3AxypByu7DxinBw+ZERmdIySjITC3ARypExOTDRurIR2RPTSdJyulEyGvBw+bFSyzJTK3LzKvPzivOTixNTChLSybGyCfCRSnBQqRASGtFyuzDw+PCRShPzy5OzerOTShKyaTEx6pCxerGRufBR+rOTezPTShNy6bER+1BxCfBQuRAxelFSixBw2VISq3GySrPTWlHyanIyitFSO3IymtCRujAxWhCRqlCQ6XGyWvNS2bFyGvDxuvCRSpLy+vMS+vGxqbFyO1GSi3EyO1FRaVCQuPLS2tDxyzKyWNFxaNCQyPGxubCxajERSVExKNJyenAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAECg4eIAAMEBQICBomDBwgJCgsEDA0BDg8BhwYQERKUDxOYDAyeghQVFhehGBmVlwwOqxobHB0eH6EfIAkPIYIiIyQlJhsnKBcpvrYiKissLS4vMDEyFjOvNAA1LDY3ODk6Oyc8PTIyFzQ1Jj42P0A6QTtCQ0REIEUORkdIkihZwsSekBhNnDyBciCKiSNSplDRUcWKkRhXCGDJYgiGli1cpuTocsILjytfFmRpACAGRTBhRogZgzHlAjKGWnIoY+bMgRgBDHRBo/LAIZoxuhwKatRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+folderlocked16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQSFMzKzOTm5CwuLERCRARqnAQ+XHR2dKSmpOzm5GxqbCQiJMTi7NTu9HS+1HRydOTm1Ozq7Dy67DyixHS61ITC3AxypERGRBweHByu7ASGtFyy1DSOtDRmfExOTBSazBR+rCwqLAxWhAxelByGtDSaxAwODHy+1Dw+PPT29IyqvCxujOzu7NTW1Nza3ExGJJyebKyqfMTCpFRSPOTi5DQqHOTezDw2NMTGxKyqhMTGrGxmXDQ2NMTCxMTGpHx6bHx2bBQWFIyOXDQuDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQICBomDBwgJCgsEDAKFDQGHDg8QEZQSlxMUDJ2CDhUWF6AYGZWXFBqCGxwdFh4XGK8fIAohtiIIIx25EZwBDREHgiQjJSYmGScoKSoRKQ8rggIsDC0uJS4oGygoAyjdAAcsLxQUMDEyMzQ1EzapBy8MDDc36tFwgONFjlQ6dgCEEZBHDx8+ctRIRehHAyAwZASZIGRIEBoUBwUwIGMCiwFEaBQJichIjo9FZLBsacRIAB0A/AQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+foldernew16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAQCBPz+hPz+BOSmZPzSnPzChFxaXMTCBPyuZPz+xPzGhEwyHExOTPz+/MSGTFROTPT29OTm5KyurDQyNNza3Ozq5Nze3LR+RLy+vJyenMzKzNTS1Ly6vJSWlFRSTMzOzMTGxLS2tKSmpGxubBQSFAwKDKSinJyanIyOjCQiJERCRERGRBweHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaNQIBwSCwaj8ikcokMCIqBaEDoBAQG1meAUDAQpIcBQoy1dg2JdBqhECgQ1IWB0WgcBIOBwIHXBwwPEBEREhIBbG4IExR/DBUVFhIXV2NjDVYYDY8SFU4ZVxpVAQwbGxynGxkdTh6XVh8gGSGzGSITIxokJUImGSMTwLcnKCkprgAqDSt1zCssKxQtQ35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+folderopen16:folder folder16 16:photo:16 16:R0lGODlhEAAQAIYAAPwCBAQCBExKTBQWFOzi1Ozq7ERCRCwqLPz+/PT29Ozu7OTm5FRSVHRydIR+fISCfMTCvAQ6XARqnJSKfIx6XPz6/MzKxJTa9Mzq9JzO5PTy7OzizJSOhIyCdOTi5Dy65FTC7HS2zMzm7OTSvNTCnIRyVNza3Dw+PASq5BSGrFyqzMyyjMzOzAR+zBRejBxqnBx+rHRmTPTy9IyqvDRylFxaXNze3DRujAQ2VLSyrDQ2NNTW1NTS1AQ6VJyenGxqbMTGxLy6vGRiZKyurKyqrKSmpDw6PDw6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfCgACCAAECg4eIAAMEBQYCB4mHAQgJCgsLDAEGDQGIkw4PBQkJBYwQnRESEREIoRMUE6IVChYGERcYGaoRGhsbHBQdHgu2HyAhGSK6qxsjJCUmJwARKCkpKsjKqislLNIRLS4vLykw2MkRMRAGhDIJMzTiLzDXETUQ0gAGCgU2HjM35N3AkYMdAB0EbCjcwcPCDBguevjIR0jHDwgWLACBECRIBB8GJekQMiRIjhxEIlBMFOBADR9FIhiJ5OnAEQB+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailforward16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRydHxubHxmZGxiXHRmZFxOTFxGPFxKTPwCBLymlMy+pOze3PTq3PTu5Pzy7LSmnOTaxOzm5LyqlNzOtPz69Pz27MzCtLyqrPT27IRubPzuzNTGvNTCxLSelPz25Bw+ZFxKPPzy1Pz65LyupBxKdCxWfPTm1Pz23LyinBxGbGzO5DRafBxWfBxajCymxHTS5BxSdBxKbFTK3EzG1CSGvCyKvCSSxCSavGTO5GRaVPzqzFzK5EzG3BSCtAwiPGxaVPTivPzy3NzKpBxObCRefBxqlPTmzJR2bKyahAwyRPzmvOTOpKyObNS+nPz21AQOFKyOfPzuxAQCBGRORLSadPzyzLymjMy2lOzetDwuJFRCPEw6NEQ6LEQyLEQ6NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAkALAAAAAAQABAAAAfhgAABAgIDBAQFBgcIBwmOCQIKCwwNDg8OEBESjY8CDBMUFRYVFxgZDJyOGhsPChwVHR4fFSAhjwkaIiMOJBQQDRUVJSa3GicoHw4pEA8SGSorLI8tLtQu19gqLzDECTEyMzQ14zY1Njc3ODkqCTo7MjIxNCs5PD03PjctPwlAQUIihhBpQbCIihtG+CUocASFkAhIkogQ8kFJwkcFlogIkoRJEydPnkBR6GiAxiQLgiiIIkXElFQJqESoMsRKkAhXqkhhApNKFSxZggTJ4nHIEJhaDhzYwoVLFy1avHyB6ScQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mailget16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAxKdBRSfCyGvFSm1BxKfCSWzCyWzBRCXCRKfBwuRAQGDDw6PHy23Cym1CSSxByCxBxunBQSFKyurMTCxExihNza3NTW1JSSlMzKzFxaXLS2tNze3KSipCQmJGxmbNTS1KSepLy2vISGhJSWlHx+fERGRPz6/IyKjDw+POzq7JyenMzOzKSmpCwuLDQyNIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaeQIBwGBAIAsOkUjAgFJRQQMHgjC4PBIEVgAh4D4aEYrGAMhINxwPyiCgYSsmEUmk82grLRZJkYCgXaAEKFxYZcEISGhsZFxwFeY0WHR5CDB8dGCAXG5shGxQicBIMpSMUGxgTGSQlpQwSJicnEwwdI7gdKAwTsykpKiobr8QMKxeHDBcsGRvOzxsT0i0uL9HSHdkT2ZkoMJXF4a8AfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mail16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBGxaVOTe1Oze3OTWxOTWvNzStNzKpEQ6LOTezPz+/Pzy7Pz69Pz27Pz25Pz21PzuzPzuxEQyLLyinLSmnPz67Pz23LSafKyObDwuJMzCtLSelPzy1My6nLymjNTCxLyqnPzq1LyihKyOfOzavOzetEQ6NPTq3NzOtLymnNTGxJR2bOTOpPTivNTGvLymlKSShKyahEw+NOTe3PTm1Pzu1Pzy3FRCPPz65LSadFxGPOzm3PzqzPTmzPzmvEw6NCH5BAEAAAAALAAAAAAQABAAAAaqQIBwSCwaj8ikMhloOp/QpmAgqAoIhELBUDgcEIGEYrFgNBoLx+IBiRwkgQnFoWAwKhWLhX3BZAILGhsCDXgODhwdGB5vgAofICBlDiEiIx4kJSYBJ2UoEykqHSMrLC0nLWAnFS4UCycvMAcEMR0RLTIBMwaSahw0NTYtFwclNwEdLws4eoc2DxwQOR06ASk7PBAhIRE9Pj0tLSUY1T8I5gjn6Qgy7D8SfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailreplyall16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBLymlMy6pOTa1PTq3PTu5Pz27Dw+POzi3PTm1OTWvPz25FRSVERCRLympPzuzPTu7NTGvFxaXKSmpPzu1Pz65Hx6fHxqZPzq1Pz23HR2dBw+ZHx+fISChJSWlDQmJHRydCxWfBxGbJyenExKTHRiXPzqzPzy3CQmJDRafGTO5ExOTERKTGxWVCRSfHTS5CymxBxajBxWfPTmvPzy1CyixCSaxCySxDSaxDSWxDSSvDyaxGS21PTmzPz21AwiPBRejCSavByGtCSezEzG3FzK5FzG3GzO5FTK3CQ2bPTixBxqlCRefBxSdBxSfBx2nCQ+dHxmXPzmvLSafAwmRAwyRPzyzDw6POzavNzKpAQOFPzuxBwWTBw2ZGRORLyWdMy2lOzetPTivAQCBKyObOTOpAweNBwWVEQyLEw2LEQ2LDwuJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAf4gAABAgMEBQUGBwgJCguOCwEMDQ4PEBESDA4TjY8DFAwVERYXGBkRm4+QGhsMHB0eGB8bDpyOARogEBceIRgXv8COIiMkGB4lJSYnIcwoKb/DGyoXKywtKS4pHinMLzAxJDIzNDUtNjcv6B0hLzgfMh85OjstPDw99zwd7T4/LTVAgggZQqSIECNHevSAgSSJkiVMmjh5AiWKlClAiFARUeVHFSVWmLS40gNLlh5agGzh0kWDlwZfrIDREKaCAjEqrFA5MMYLmTAxlJTxYoZMozNozqRRs4ZNmy5s3LwhA0dBnDNn5MxBoAABnTp17IitowDrmQV+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailreply16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTEw+NFxKTFxGPPwCBLymnMy6pOTa1PTm1Pzy7LymlOzi3HxqZOTWvPz69Pz25My+tLympFRGRHxuZPzu1LymjNTGvNTCxBw+ZPz23PzuzPz65PTu5NzOtCxWfBxKbPzq1DRafGTO5BxGbPzy9HTS5CymxBxajHRiXPzqzCyixCSaxCySxDSaxDSSvGS21GxWVAwmRBRejCSavByGtCSezEzG3FzK5FzG3CQ2bPzuxAwiPBxqlBxKdCRefBxWfBxSdBxSfBx2nCQ+dPzy1CRqlAwyRDQmJPTmvPTixLSafOTOpAQOFPz21BwWTBw2ZPzmvNS6nPTivAQCBAweNBwWVNzKpPzyzLyihGRORLyWdMy2lOzetKyObEQyLEw6NEw2LDwuJEQ2LAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfqgAABAgMEBQUGBwgJCguOCwEMDQ4PEJYRDhKNjxMPDBQVFhAXGBUSGY8LGhsQHB0VHh8gFQ6bjgEhIiMMJCUmFbS2CwMnG6IoKSorI7WpEycWFiUsLSou1yXXji8wFiopMTIzNDUz4zbZNxsbODk6Ozw9Pj8pPzEzQDdB60JDOkRFjBw5giRJDCWdlmxwIIRJExAWKDRyMgTIiydLoESRImQKlSUSF1SxUoXAlSBRsGSJoCVICIlbqlThcoBClC5eYFD4EiVIFwUyqywAE0ZMlqNjpJDpIkUBl0dlFChAYOZMmTJoyqQR5icQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mailsend16:mail mail16 16:photo:16 16:R0lGODlhEAAQAIYAAIx+fIRubHxubHxqbHxmZGxeXHRmZGROTFRCPFxKTFxGPPwCBHxqZLyqlMy6pOze3PTq3PTu5Pz27Pzy7LyinOTaxOzi3Ozq3LymlOTOtPz69Pzy5My+tLympPzqzNTGvLSelPzy3BxGbBQ6VPzuzPz65LyupNzOtPz+/GzO5BRejPzq1Pz23LymjHTS5CyixCSavBxqlPz25LymnGTO5CymxCSaxByGtHRiXPzy1CySxCSezGxWVPzuxKyOhMy6nDSaxEzG3PTivNzKpKyOfPzu1FzK5PTmzJR2ZLyihLSWfKyObOzmzPzmvDyaxOzavLSafGRORMy2lOzetDwuJEw6NEw2LEQyLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAsALAAAAAAQABAAAAfUgAABAgMEBQUGBwgJCguOCwwNDg8QERITFBUWjY8DFxgZGhsaHB0aD5yODB4TGB+kICEaIiOPCwEkJRcmJyYPKCIpKrWqKywTmC0SIi4vMDHEDCsyMg8zEyI0NTY3z7U4Hhs5Mx+0IyI6OyPrIzw9Gys+PxIy2EBBxAs8Qjk5Q0RFWFxAZySfgSMsilRAkiRECHQ08hHgJ0TJkCU/mECU2ISEkowUlpAQ4QTfowNPoAzJIeRJCyjm8kVRIkWIzSkXhwxJtYAKgp9VrFi5QoWKFZ5+AgEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav1downarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PUZi0zmTtypflV0VdRJbm6fgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+nav1leftarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAP///wAAACH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxqdwoNGTmgvy9px/IEWBWRkKZ2oWrKu4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav1rightarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIdhI+pyxCtwoNHTmpvy3rxnnwQh1mUI52o6rCu6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav1uparrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIYhI+py+0PWwhxzmetzFpxnnxfRJbmufgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+nav2downarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+pq+EPXYpxUckoO3AjbF3dJwahllXe6AFgC8d+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav2leftarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pyxf5VohmSlsxmpjTzAHeN5ak6UHpqKRi2GpwvH3Q3eT64RcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav2rightarrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAImhI+pq5HOAjQyVnqfhHue7oAaKH5kiW0AmnLqaHomkj02g+e6XwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav2uparrow16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIghI+pyxfR0HsRzNnuXVqn3mVQZWFRyIDjp65Ga5Ly4hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+navback16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRSdBRObCQ2TBxObISevAQCBNzu/BRGZPz6/FzC3Pz+/HTS5ByyzJze7Mzq9ITC3AQWLAyWvBSavFyuxAwaLAwSHBRafBSOrDzW5AyixCS61ETW3CzG1AQeLAweLAxefBSStEze7CSWtCyatBSCnBRWfAwmPBRWdByixAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZiQIBwSCwah4HjUTBQFgkFg3MoKBykU0QhoUAIAuAksbpgNByPxQMSGVsVDYlkIqdUiJYLJqORbDgcHRseRR8gISIaEyMkGCVYRBEmeyAnlgaQkSgpmU4RAZ1OKqFOpFNGfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+navdown16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObCRKZBxCXAwyTKTK3Ozy/NTm9GSivAQWHNzu/FzC3IzO5CySrAQOHAyuzETS3CSWtAyOtETa5Aw2VLze7ByWtBy61BSavAxWdBRCXAwqPAQCBDR+nKTe7FS+1Eze7ByixBRmjPz+/AyexAyixAQKFBRqjAQGDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZeQIBwSCwaj0hAYCkYEJLKguGASEADigWj4bgaHpBINykwSCYRa5HCFFQsF0xGo9lwhpSOwfORYC4gISJ3RAQdIyQYJSAlImNrh4uNJkl5CoKUUBQnjlB4KJ6hokN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+navforward16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBAwyTBRObAw2VDR+nCRKZOzy/KTe7Pz+/KTK3Nzu/Lze7FS+1AyexAyuzBSavAyOtBSmzOTy/BRqjNTm9IzO5ETS3ETa5By61AyixByixBRmjAQGDBxCXGSivCySrCSWtBTC3AQOHAQWHAxWdEze7AQKFBRCXAwqPAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZjQIBwSCwahYGjUjBQGgWEpHNYMBCaT4G2UDggos+EwmBYMBpf6VBgYDgeEMgjIpmoAQVKxXLBPDIXGhscRB0eHyAgDSGBGyJFASMiIiMkJYImUwAnmJqbjp4AKCmhAKSlTn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+navhome16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBDw6PBQWFCQiJAQCBFxeXMTCxJyanDwyLDQqLFRSVLSytJSSlISChCQmJERGRFRWVGxubKSmpJyenGRmZLy+vOzq7OTi5Ly6vGRiZPTy9Pz6/OTm5ExOTPT29BwaHNza3NS6tJRqRGQqBNy6pIyKjDwGBPTe1JSWlDQyNOTGrNRiBGwmBIRaLNymdLxWBHxGFNySXCwqLKyqrNR6LKxGBNTS1NTW1Jw+BEweDDQ2NAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaoQIBwCAgIiEjAgAAoGA6I5DBBUBgWjIZDqnwYGgVIoTGQQgyRiGRCgZCR1nTFcsFkHm9hBp2paDYbHAsZHW9eERkYGh4eGx4ag3gfSgMTIBshIiMkGyAlCCZTEpciJyQjGxcoKUQBEhcbIiorLB4XEltDrhcaLS4vtbcJra8bMDHAGrcyrTMXHjA0NSypEsO6EzY3IzU4OdoTzK0BCAkDMgkIOjJlAH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+navup16:nav nav16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBBRObAwSHBRSdISevBRWfAweLNzu/BSOrAQWLPz6/FzC3DzW5BxObHTS5ByyzAyixEze7BSStBRWdAyWvByixAQSHCQ2TAQCBBRGZJze7CS61BSavAxefMzq9ETW3CSWtAwmPPz+/CzG1ITC3FyuxBSCnAQeLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZfQIBwSCwaj8hhQJAkDggFQxMQIBwQhUSyqlgwsFpjg6BwPCARySSstC4eFAqEURlYhoMLBpPRUDYcHXt7RgUeFB8gIU0BIoiKjAcUIwiLSQUkJRsmGIwJJwmEU6OkfkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+playeject16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+py+0R3IFQUtruXVqn3kkWyIARR4rqKvoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+playend16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+py8Eb3ENRggrxjRnrVIWcIoYd91FaenysMU6wTNeLXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+playpause16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIfhI+py+1vgoxzyUCxrZd18ClfmIyVyJ1lqkHuC0N+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+playstart16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pyxudwlNyguqkqRZh3h0gl43hpoElqlHt9UKw7NG27BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+playstop16:play play16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+1vgpySUWpvXXqrHmSaeJEYhKYq6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textblock16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py40Bo5SOzRvrwlgrfnkJOIkPaaaJXwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textbold16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIihI+py70BowPQ1HZpwNv212Vg9IGHmIjoWa4ey5DSRNd+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+textbottom16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIVhI+py+0Po5y0hYtzrkB7zH0fN/kFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textcenter16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsnRkqtDnhu1zHfFSpjaY4PavgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textitalic16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+py+0BgztwUmmjBXX3jE0auHHhM5Yq4xcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textleft16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsgRoqr3Vnt102fFSJjUC6nlPoFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textmiddle16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIXhI+py+0PT5i01pisphjt3UmfFZYm5hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textmove16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIbhI+pm+EPIZsg2kfZvblXbwTg10WlA4rjyvgFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textright16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIahI+pm+EPIZstSrqsDhhv1ylfFE5jiYwX6hcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textsortdec16:text text16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BPwCBAQCBAQC/FxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM5CBDM+uKp8KiMsmaAs82dtnGeCHnNp4TjNQ4jq8CbDNOroIe3ROyEx2A4vOgkOBzgFxQ6Xa0owJ8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+textsortinc16:text text16 16:photo:16 16:R0lGODlhEAAQAIIAAAT+BAQC/AQCBPwCBFxaXAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAM4CAqxLm61CGBs81FMrQxgpnhKJlaXFJHUGg0w7DrDUmvtPQo8qyuEHoHW6hEVv+DQFvuhWtCFPwEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIlhI8Jwe2/AmpTynqPTXSqrnBM+I0kdmpmGmUp+K4nPMvhYx9+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+texttop16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIWhI9pwe2uYnq0yQtqxbz7D4biSIZ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+textunder16:text text16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIjhI+pu+FxXoOIKpds1oBH7hlYxYxRCaIZ01lhJbHy9tTv7BcAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewchoose16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMzCLrcGlAs6UAYgwLdLtEcI4ygQo7VVp2oupGpG4vmaUVTemX523qlFcw0a4RqNlkx5k8AACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewdetailed16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMmCLrc/i1IAVkYg1Z1iRYUKCqitp1oikqBWV3ZOnhkWNagqu+qnwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewicon16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrcG1AwGOQbw6qANeCEB3pCSZpO6pgowJZqLKuUGE0dnuEhf8IL1kz1shSHDX8CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewmag-16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ+QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7Kmpl0CtLGLvbW2Zn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewmag16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ8QIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6eUAFCusJSzr7GLArS5Q7O1tmZ+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewmag+16:view view16 16:photo:16 16:R0lGODlhEAAQAIUAAPwCBCQmJDw+PAwODAQCBMza3NTm5MTW1HyChOTy9Mzq7Kze5Kzm7OT29Oz6/Nzy9Lzu7JTW3GTCzLza3NTy9Nz29Ize7HTGzHzK1AwKDMTq7Kzq9JTi7HTW5HzGzMzu9KzS1IzW5Iza5FTK1ESyvLTa3HTK1GzGzGzG1DyqtIzK1AT+/AQGBATCxHRydMTCxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaBQIAQEBAMhkikgFAwHAiC5FCASCQUCwYiKiU0HA9IRAIhSAcTSuXBsFwwk0wyYNBANpyOxPMxIzMgCyEiHSMkGCV+SAQQJicoJCllUgBUECEeKhAIBCuUSxMKIFArBIpJBCxmLQQuL6cAsLECrqeys7WxpqZdtK9Ct8C0fsHAZn5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewmulticolumn16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAPwCBDQyNAQCBPz+/PzerAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAMwCLrc/ixI0WSgKoyBl+beQFACpo1AqXbKCr1wLAMWS08hGG3dSZqin4sxnBmPD38CACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewtext16:view view16 16:photo:16 16:R0lGODlhEAAQAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAQABAAAAIchI+py40BTQSwuovp3DXkv1ia1IHmIXLiyWJ+AQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewtree16:view view16 16:photo:16 16:R0lGODlhEAAQAIIAAAQCBPwCBDQyNPz+/PzerAAAAAAAAAAAACH5BAEAAAEALAAAAAAQABAAAAMuCLHcri4yGISlj4kxcANgNRBQCIbL6U1Su7bB62rXvGydG25kqpwfIGxILBr9CQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actattach22:act act22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBMTCxPz+/DQyNKSipAQCBISChFxaXDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARrEMgJgqA4zzus/gLhFd5HCcZAXqsphYPUdhcYFNRcZnvdtpnDqPTbUWgAJKBYwzBlw+bRo3xmkNWoBgm0OrVLn3GC9RgCk8DhUw7c0rHPr4CDu5SYQNyEt7uSY3p/UAKFhYKDSQOLiwgFdhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actbookmark22:act act22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBCQmJCwqLMTGxAQCBBwaHMTCxLSytERGRFRWVLy+vKyqrKSmpHR2dJSSlJyanISGhGxubIyOjKyurGxqbFxeXGRmZHx+fKSipLy6vGRiZLS2tFRSVHRydJSWlHx6fCH5BAEAAAAALAAAAAAWABYAAAWWICCOZGmewamaQrq+wUC8azHINGocOI38iIRAceDNaISFYklkGHOEhoNBfUAOhuOLEJE8HoPiRKFdESiQBqViuTDIUAsEcyAeGJmyiqC5RCwJGg0YcEh9D0V3Dxt6JwQVDRYVHBUdi40mjw0PTgwQHgeYJQQJfxUXFxAOoTkFpQ0fsRSimQkWEQ0VtI62HLt7vjl7JQYhACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actbookmarknew22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCwqLCQiJCQmJMTGxAQCBLy+vLSytERGRFRWVKyurKyqrLS2tKSmpHR2dJSWlKSipISGhGxubIyOjGxqbIyKjFxaXGRmZHx+fPz+NGRiZPz+ZPz+HMTCBKSiHPz+jFxeXPz+XPz+tPz+zPz+/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAamQIBwSCwaj4Gj0hgQLJ+AAaEAVQoI06pRYDhkoYgwIhEgKBTfZ2FhaBsYDS8VWnA8Go0FJIKeqyUTDw8EDHBpSwUUFQ4UFhcYDQYFfkoFFxEQDG8KEAUZlEeWGBIakw4FG1STiBoYBRwdBR4fHgUdHKBEBSCnIR8iIyIfIblFu6ceIyQjtcXGCbLKzAUKzrq+wMLEVa+xs7W31kOTk6nkWuOf6Ea5QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actexit22:act act22 22:photo:22 22:R0lGODlhFgAWAIEAAPwCBAQCBHR2dDQyNCH5BAEAAAAALAAAAAAWABYAAAJOhI+py90RnIMyRUOxhDfzJkACdoXBuEDDkQFDi5go0MrKx16kns80b7qdELCgBYaEGWwL5nG1ePFiKp9A6kuYRNuho8vxVrrZivmMRtMLACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+acthelp22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBCQuNBwiJAwiLAwaJAwSHAwSFIy+3ERynCw2PCQuPAwmPCxOZCxWdJzG3FSazBwmNAQKDAQGBDRmhBQyTDxujDR2rIy21AwWJDyGxCxmjAwmNDRihAQOFDxmhCxunBQWFAwaLCRahDR6rESGvDQ2PCRWdDRunDSGvCRSdAwWHCwuLDSOzHSmxDyKxBxCZBwqNHSu1DyOzAQSHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAahQIBwCAgIBAPCoGAgOoeBAyKhWCwYDUf0CX1AIhLiJEGpBLiAAaRxdgYsl7Ybk8igBZoN5xmAdDxoanp8HyANISF8EBsiXBMjJBolBEQmGHFoRScbKHIKDykqK5lFAZRCnyknTaROLA8tq61OChgtKqyzQgEYEJi6UC4vI3LAASkbMBPARAEBdszR0sACEaPSMTIQM8W6KzNl3bo0NOJDdEEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actlock22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBHRudFxaXExGTERCRAwGDGxubPz+/Pz2/Ozm7Nza3NTS1KympFRSVHR2dNTO1JSSlKyqrKSipDQyNMTGxDw+PLSutKymrMTCxAQCBHRqLBQODJyanDQuFFxSJFRSJFRGJERCHExCHISChHxyLEQ6HGRaJExKHLSmbLy2fOzitPz23KSiZHxuNHxyNJSOTNTOnMTCjLSudKSaXJSKRJyOTOTetNzWpHxuPOTi5MzKzLS2tFxWXOzq7Ly6vOTe5Ix+RLSqdNzSpLyydKyqbKyiZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBAgMEBQKEjI0GBwgJCgsMDY2XjwkOAgQBDxCLl4QNCaGCBBGWooINCAqqrBKgqwATFKaDFRYVtBMXsIMNGBm0GRADjQIJxKIaGxwdHh8gISIhGyMZzIwkGholJiYfJiAfJyEZISDbg90oKCkqKwcHKyooLC0f7IIuLzD2YMSQgW8GDRri+AFoUMOGvRsxUhSsQQPHvmQSchyQtEAHhh0WJHDQcJERjwsKDvRI0BGDjwgicXhQyCOjSgUKPO6AObIkIQESfmxk6REDT4s0bfaYpDNkT4VAha5s+TLmzEYtatwIOHAiDZIKNQAJYk9IjCFEisyoocFEB4UACtBpm0t3LiF4gQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+actredo22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3Pz+/JTWbHy+VHTCTMTivPT69BxGDESuJDyiHESiHEymJIzKZAQCBFS2LFzKNGzWPDRqHCxqDFSqLHy2XESCHAwaBAQOBBQqBDyWJHyqZDyKFGSiVESeJBQ6BAwSBGTGPFyWPFSSLEyOLESGJBQiDAwiBBQmDCRGFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaoQIBwSCwaj8hkMcBkKpcBwYAwEDif0YLhwEUkFItFMkAwMBoOR+PxgHwjRDggamhIJpQ8ZbKGKOQLcgEFdhUWEYgRF3sNfhELBHALAhgZFhobRBwREhQdEAIEHpIKHwsaSJwUDQgQIJINARxKESESDQ0dgCIjSpAkDAwPco+ZSJAlJicnKHIAIrNHidOIQxunT0kpCyrZSCss0d5Fj6jjRonn6uvs2QZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actreload22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBCRSFCRSHBw+DBxCFCQ6FBwyDBQWBBxGFCxyLGTChMzqzLzmvHzKjDyOTER+RERyNDSqXNzy3LzivFS+fCyCPBQmBCQiBBxKFBQqDOTy3LTitES2dDR+PCxuJOT25KTarCx+PESSTCxKHDSeVCyKRNT21ESWVDSGPBQyDAQCBBQSFDRuLDSyZDySTGzChCRiJKSmpExKTDS2ZGzGhLy+vGxqbISChDSKRMzKzGxubDQ2NIyOjCQiJCwqLBQWFCwuLKSipERCRERGRHR2dAwKDDw6PFRWVIyKjCQmJFRSVBwaHKyurAQGBExOTBweHFxeXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf9gACCg4IBAgMEBQYHhI2ECAkKCwwNDg8QBAOOhAQREhMUFQgWBxcHGBmbggkaGxwPB4yDB6SbBJIKHQaqtY0eHyAhsqrDgx4aCiKpqoQHAyMjJBMKJaSxzAAHIRsmJgonKA0LHSmDKiuOBywRLSQuLyEwwyoxMuiN6iUzNBXy5jU2bsgoJugABBz95uXQsUMGD3vpPPgTpKIGwx4+HMr4kW4YkCA2hAzxAQSIECI+imBTwVIFESNHerRUgc0cEiFHkjiiyYzeDiVLdvLcySSkkKGEWiZVweSGkIHMmvQosoQlkaZOjvhosvKJjIAxoOAsgpRZkQNLnvSoqspAIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+actrun22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAwKDAwKBCQiHNze3AQCBBwWFDw6NPTy9PTy/Dw2NKyytOTi3LS2tMTKzMzOxLy+tLy+vBQODNze5NTS1JyalIyCbIx6VIRyVISGfJyelOTq7EQ+NMTGxKyurGxeRLyKPOSmROSuVOy2XOSiTLzCzNTOzDw+NCwqLHxuVOy6bPzGfOSuXNTW1LSyrMSWRNymTOSmTKSCTPTGjPzSnPzWnMyaVBQSDMTCxPz+/KyahNSeRHxeLJRyTPzmtPzarOy6fJyajNza1Ly6vLyulFRCJPzirPTOlMS2pNTSzMTCvJyenBQWFNzKtPz6vPzyvPzqtOzGlOTe1AwGBFxWTLy6tPTm1PzSpPzutPz2xPTSnOTSxOy2dPzapPzerOzm5IR+dPzu5Pzu1PzqxPzy5Pz+9GRiXGxuZKympHR2bOTm5Pz6/MzSzBwaFJSSjCQmHPz2/AwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeEAQKIjIIDBAQDjYMFBoMHCAkKgwYFhwULDAUKCg0ODxCkBQgRnoUSExMUDxUWFxgZGpAbFIuGHB0eHyAhIiMkIB8lJieIKCUpJCTGIyorLCktKIUDpC4YLzAxIjIyMzQ1NhgdpJI3ODktJTowOyM8Ejc9Pj9AQUIEclAocCMIBQhDiOwgoaKIoCI+jBxBkkSJkCWemIyq0GSHCBVHihRx8gRKFCmpKhGaQqWKFYZXsGR5kkXLFgRUXBUqkCGCFS5AjnTx0sXKlyA6CRVgAAHMAilhxIwhU6ZFkBY5kgKYUoXBAzMKzixZ4AJNGgVm1KxhM0WpmQpUMtooaOPGxAM3Nw60oYLGjNYCbzYJOgAnRzNBJ95oPYQCgpJtkwzFoULlRuRPiy9fNhAIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actstop22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAASC/CQKDBwKDCwODNyKjPzq7My+vIxiXAQCBOSOjPz6/OSelNySjNyGhMR+fLRaTGQ2LPz+/Nx+dNR2bNRybMxuZMxeXMxiZLQSFJQaHFwqJNyKhOSCfNyCfNR6dMxmXMxWVMRORLQODOR+fOSSjNR2dMQ2LJQWFMRWTLwWDNSCfMxeVLwaFKQODNR+fNx+fMxiXKQSDOSWlMRSTMxaVMQ6NMxORMQyJOTS1MxqXLwWFLRORMxKPMQaHMxKTLQWFCH5BAEAAAAALAAAAAAWABYAAAb2QIBwSCwajwGBcikIHIsDQmFKNRwQT2EgoVgsGOCG4wHBIgmRhWRCqVQsF0xGYyYGNgoGh9PpeCQfICEic3UAAWgLIxwRJBsbHSUREyYYJ3RDAQULexGejhueESgpl3WaCxsqJKKsChEUKywtmFoFDC4vCayikzCyMbWHt38NCTKiHhUfMyzBdQIFKsodob0VNDWzwppuKxMRrx6iNjcitNA4bh+iEzkwojc66JkOOxcf7G35PBE9KS1MEUGgIQOIFfk++KjRw9wJgUUIZvhRoyLDFCliQDQisUWLGCJOeNx4hKCGkyhPGnqCoKVLl1liypyZxUAQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actundo22:act act22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBCReDJzGjMzivOTu3PT69MTivHy+VJTWbIzKZEymJESmFESiHDyiHESqLAQCBFzKNGzWPFS2LNTmzCxqDDRqHPz+/KTGnBQqBAQOBAwaBESCHHy2XBxGDOzy7HTCTEyyJDSqFHzWTAwSBBQ6BIy+dESKJFySPFSSNAwiBCRGFBQmDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMsBkKotMwYAwEDiXgYLhwD0gCFZiQKxNKBYMRqPh+D6G16y5AYnYIxBJAyF4AwITTAUJdBESD4gPFBV6Fn6ABBcJDIYPGEQZGhQbHAIdfx4JHw2VSBodGwWfAR4LDSALfkgYAQurBiAhICKfSSMkvQElGyYnGyi9Rxkdj4nOskUYyU9FpxnURikdGtjRKivdRKfQ2Inh5+jpRwZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+actunlock22:act act22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBGxqbFxaXExOTEQ+RAQCBPz+/PTy9Ozq7Nza3NTS1KSipFRSVOTi5Hx2fJSSlKyqrJyenJyWnDw6PMzKzKyurDQyNFxWXMTCxJyanHRuLHxuLGReJFxSLFROJFxWJExCHERCHBQODISChHxyLHRqNIRyNHRmLLSqbKyiZLy6fOTarPz67Pzy3OzitKymZFxSJJySTNTSnPTy3NzSpMTChLSydKyqbKSaXJySVIyGRGReLPz23NTOnMzCjHxuPLy2vKSmpOTe5LS2tLSutHxuNHRuPMS+xFxWLIR+RDw2HFRKJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SDAQIDBAUChY2EAQYHCAkKCwyOjZANDgIEAQoPjJiDAg2iggQQp5gMBwmrDBESl6MTFKuoFQSjABYRF40CGAW8BRm7hQwNxBobHB0eHx4gISIjBdiEAhYFJBslHOHSHh4hBSHlxIUmJygpKissBiwtLi8pGjDqhBoxMjMuaNSwcSMFjhw6dnjYRyrGCh4ueviw4Q5HDB0/PjAUJCBCAwMIGiiggAEIBFk/FgYLIgRkggQkhxAJkqGExkYMFnxsIGRkSQgLHhRRWUjAggQgG8AsSWRBBiP6VrYMOfKIyaBDNwLo+HHSUplOSyDRqiEHjRkretRQkcLgxayNF0wksQGQxsSKMTIq0QpgCba/gAE7IhMIACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+appbook22:app app22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBDyGhCyCfFSWlESOjDyKjDSGhCx+fGSinGSenFyanEySjHSqpHSqrGympEySlBx2dISytHyyrCR6dKTGxHyurHSurHyytGSipCR6fARmZFSalEyWlBRubAxubBRydDyKhDSChLSytPz+/MzKzIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbFQIBwSCwaj8ikMhBQIpmCQdM5ZBIKhgNiugwkFAsCI7pNMhuOxkNBgBgEiAi3GkBLJpJHYgEpaClyREwVFhcSEhgOGQoMfgMaERtcARQBFRMYExZ6HB0FUYAekkIBHxqWFmlrC1haESAfG6MBGx+VFRgKYH0hInGRklO0ppYXCwwMWQiQHkwjgrWnFRdYZHIBJCTP0LaWGAcDW9jZ2nMAw9IWTOQkJSZMRsOV49nu8E+19PbmR7TY+1TovONH5V7Ag0QMBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+appbookopen22:app app22 22:photo:22 22:R0lGODlhFgAWAIYAAAQCBAQ2NPwCBHSurIS2tBx2dBweHPz+/Ozm1GxiTGyqpPz6/Pz69GSqpOzaxPzy5HxuVLSmlOTazPz27PT29NzClPTexHxuXLSmjAxqbFSinPTy9KyehNy+lPTy5Pz29HxyXNzWxKSahOzexPzy7IR2ZOTWtESenPTy7KSWfIyCbKyijAQGBDyalPTu3KSSdDSOjJyOdCSGhPzu3OzizJSGdPTq1PTq3JySdMy6lAyKhOzWtOzi1OTOrJyKbMS2nJySfMS+rAwCBNzOrNTCpNzKpJSGZKyafLSifLyylIx+ZHx6ZDSChAQuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAIALAAAAAAWABYAAAf/gAABAoSFhoeHAAMAiI2IAAQFjI6EAAaJkQeTjwAICYkKBQcLm5WdBwyfhgChB66bp64HCQC1lQ2irqQCAA4PowsLEBESE4wAuLIHFAAVFr+uDBcYxRm1GrmuGxwdFh4Mrh8gGCET1gDYyhsiFSMkDAsMDCUYJhvnJ9kHKCnODwwfPlBQsULCPRYAWogK9sHFiwoOPEyQh0JFPXO1YBSYwBEFghjdHkwQOYGgwQwIZRR44GHGDBogabhAsYEEihrUMAIoUMCEDRs3HODIYQHFA6MPcJA7KICFjgw7eIzo4cOfiwc/gKwIUm2SkKdDdlDt4AABDaU/iIRwwbTSUyJFOow4S3Hkx9oNDDZgXPU0h1wcSIgEGUw4ibVET5WoWMKksePHpdxmyKADAEIWly9HJtQkQJMmlAgZCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+apppencil22:app app22 22:photo:22 22:R0lGODlhFgAWAIMAAASC/IQCBPwCBPyChMQCBPzCxAQCBPz+/MzKzISChKyqrDQyNEQCBAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARYEMhJ6wxiEMtpIAWxddwXiqRlikSQeiAbuC+wirNR322gv7zcLobzDU+9XypoBBKTR1lz+RTWDgip8nUwZK1XLyIx5XoVicX2RUAo1DVKi7GOBxjxfNwQAQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+apptool22:app app22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBISChFxaXNze3NTS1Ly6vKSipNTO1Ly2vNza3Pz+/MzOzOTe5DQyNOzu7MTCxGRmZMTGxPTy9Ozm7Hx6fPTu9MzGzGxmbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAW1ICCOZGmeaEoGbBsI6joMRGEcbQwESDIrtVtAF1gwDLNaAmfKiVgLBJKgwB1KxQZrBHU0FAXmavFoQLYiB6TxFXMj5AZBwnJI2I3wcNWALyYEcgoKXxRhOHs7XxEVCwsWFgoUDRYUFwwQB25ZCxiNjo6GkwUXN2NsCxEYqhUHoQ0MEglYRQQXErcHrI55FycuB2YSmoyOBTEtB2sXuhU6XAENC2a6z9AKCwq+1tAN3E2J3ySkIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+connecting22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBISCBAQCBPz+/MTCxOTi5AQGBNze3Ly6vISChNza3FxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAAR4EMhJqwzY6omD+MNGdR8YilNZnug0qGzrqrL1lnV1fyJBVB6VQEMoGH4ADGwQkxQPBwMiKGA2J8VEAnq0tgiKg5aL/C7C2gTjKCM0zowDQ8tuNQznNL7cKzjOUQsNfER+gguIg19+Pm6ChBZFDmWNi5M5FIyYFHQRACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+connectno22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBPz+BMTCBERCBAQCBPz+/MTCxOTi5Nze3OTm5Ly6vNza3ISChFxaXKSipAAAACH5BAEAAAAALAAAAAAWABYAAARiEMhJq7046827/+AVCKE0Dh9BAGdaGISAToFGFMcBU+11I4hDYseSZQiKwwKoI/QwBIYiuFDCZseGdIlYEjUNg1SpY6w2N4cUIW6cjwW1lsFwo+MqgtZuw0/ydw5vH34lBhEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+connectyes22:connect connect22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBKyirPz+/KymrOTi5KSipMzCzNza3OTe5Ozi7MzGzPTq9OTm5ISChMS+xFxaXNze3GReZIyCjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWLICCOZGmeaBkAQpoGg7C6JizTQT7CxPwOwFWgYPChYIXkIHC4uQKGAiKRKCyNpxxUUVViVYNFLkqtLo+DAkMMLXQPXwAy2WCTF4544FGtKuwPDhB6DnxuUmyCcXIQhV1uYoMuEAcOBxEKCHg6TzGFCJUSizuejROKOAM9OY2SnUU7nD89NCcDsLUnIQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+devscreen22:dev dev22 22:photo:22 22:R0lGODlhFgAWAIcAAPwCBAQCBPTy9PTu9Ozq7OTi5Nze3OTe5Nza3NzW3NTS1MzOzMzKzMzGzMTCxMTGxOzm7AwGDBQOFBQSFCQeHCwmLCwuLDQyNDw6PERCRFROVEQ+RDQ2NLy+vKSipISChGxqbExKTOzu7OTm5Pz+/GRiZMS+xLy6vBQWFLy2vCwiHFQ+NMSmfNSyhIxmTDwuLJx+bLS2tCwmHMyyhMyqfPTqpPzyvLSWbLSWfPzitIx+ZDw2PAwKDCQiJGxWRPTmrPTerMyuhPzqtPz63PTWnPz6zNy+nIRiVDQuLKyWbOTanPz21NS2jNS6lDQqJHRaTPzmrPTSnPzyxOTClPz2xNSuhPTqxPzuvOzSpAQGDOTKnMy2jOzSrPTu1NzKnOzOnBwWHJRuXLSWdPTatPzqvNzClCwmJOzSnOTOnPTuxOzKlOzerOzarOzitJR6ZNTO1IxmXPTWrNSyjPzOjPTSpLSehHRqZOzirOTCjPS+fPzGhOy6bOzKhGROPMy2lPz+1PzmtKRyRHRiNNTCdPz+zNzCjEQ2NKySdDQmJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAj/AAEIHEiwoMGBARIqXMhQIUIBAwYQIFCggIEDCBIoULBgAYMGDgIIDEBAwMSKBRBk3NjxAciQIwdACBBBwgQKFSxcwJBBwwYMHBx0EAmA5EwPH0CEsCChoYgOQ0cSGCHhA4kSS5syJGDiBNEAFVGUKKEBAwWFFM6SNJHi64gDFEKE4FBBggoKK1i0cPECxokYXw0gsECYggQZM2jAqGHjBo4cOtqOxLhDAg8ePXz8ABJEyBAWRIoYOfJipEoMCZEkuaFkSAslS5jUGJKkSRAnRREo0JDwCZQoTKQAmUKlihQrVa5gKZ1lI+oAK7QM2cJlSZMuU4Z4+TJEx0iNOwKAggkjZkyOFmS8kClzpcUQLRRGbjRD4MgZNEzSqKG+ZgobI2248dUbDDDwABzcxSEHEFpgEcUcdMRRhx1fFejAAx0cgcYdSxiBRx566LEHH0d8QFRRNC3Uhx985CHEH0MAEkhCBxWkgiCDFEFIEYUYUmONMhyCRxVH/PgjBYioYJAdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editcopy22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFPz+/DQyNISChDw6PMzKzMTGxERGRIyKjFxaXMTCvKSmpHR2dPz6/Pz29PTq3MS2rPz69MTCxFxWVHx6dJyWjNzSzPz27Pzy7Pzu5PTm3NTKvIR+fJyGfHxuZHxqXNTCtPTq5PTi1PTezNS+rExOTFRORMyylPTaxOzWxOzSvNze3NTOxMy2nMyulMyqjAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbYQIBwSCwahYGkUnk0BgTQ6IAQaBKfUWhBYKhaAU+CgXAQIAyChLeJzSIQhcH6GFaM0QtGY5kstqEODw8QEQELAhJTc08KBBMEFBUWDRcBE1pca20SGBkaEBscAY5maFRIAgoLHRQRHh8gIQFlZnByqA8ZGSIQIyQjJQEmYgJ5p2ACrK4gJx4gKIZZAgdeAQ4ZI9kjKSor0AwEjeAs1S0cHAslLi4vMDDRWeRIfEsxMeET4ATyVoYLC5fizXEiAR84BeMG+pEm8EsAFhAjSlR4hR6fLxiF0AkCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+editcut22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBAwCBPz+/OTi5JyanOzq7DQyNGxqbAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARbEMhJq704gxBE0Bf3cZo4kRJqBQNRfBucyudgvJS6VaxLzyMa6/bLiWA9HOg4VIIkL5vzuRkcpkvRIIAorphJLzBW84WEuRZWp6uaT7J2Sh1Hit3OY/ZO7WvsEQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editdelete22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAASC/FRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanPz+/Ozu7BQSFCwqLDw+POTi5PTu7MzKxIR+fCQmJPz6/Oze1NTGvPz69Pzy7Pz29LyyrPy+vPyupPTm1BQWFIQCBPwCBMS6rPzSzNTOxPTi1NS+rPTezNzOxPTizOzWxMy2pOzaxMy2nPTaxOzOtMyynOzSvMyqjPx+fOzGpMSihPTq3OzKrOTCpNzKxNTCtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf8gACCAQIDBAUGBwgJCgsLgpCRAAwNlZYODxALEY+SkAMNEqKjEw0UD5yegqCjrRMVEqidkgWhraMWF7GptLa3EgEWFRSOnhW+vxgZEBqzkBvItxwdHryRCNGjHyAhHSLOgtgSI60c2yQjJd+eJqEnKK0hJCgnJSngAO0SF+8qEvL0VrBogW+BLX4oVKgIyMIFQU8KfDV4R+8FDBcxZBREthAFiRIsOsygsVEUh4Un3pGoUcPGjZInK65QicPlxg8oX5RwqNJGjo0hdJwQ6EIkjRM6dvDYCKIHSBc1Ztjw4eOH0oIrsgIJEqSFDBo0cuTgsdSTo7No0xYTZCcQACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+edit22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBISGhISChHx+fHx6fHR2dGxqbGxubGRmZGRiZFxeXFxaXFRSVIxSLPyuXMzKzMzKxMTCtExOTPzqrPz+/NTS1MS+tOSaVPyWNPz6/IxeNPzavPyKBNTW1PyCBPyGBJxmNPzOpLx6PNRqBMSCRNySTPyCDPSGBMxiBKROBHRydPSylOyydMxmBJxKBAwODPS2lPTq3OyabJxGBPTy5PTGrOyOXPR+DPz69PzmzPzevNxuPORqLMReFPzy7MyCXKxiNIRKHBQWFNTOxPzixJRaPFxONHRqVPz27PTy7PzStCwqJDQyLJSGdIx6ZPz29PTu5HRmTLSKbMSGZHROPFxKPJSKfJyShKyehMyuhDQmHEQuJJyOfLSijMSynMS6pLSefDQyNHx2bKSahLyqhLymhOzi1FRGNIR+bNzKtOTOtOTKrOTKpLyedAQCBFRWVPTq5NzOvLyunLSmlNTCrOTOrNzGrLyidMS+rLyynKyijLymjLyqjAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gAAAAQECAwQFBQYHBggJCgsLDAwADQ6CAQ8QD5ydEJ+gERKWE4ICDxSpqhWqqhYNFxMYphCtqaytGRoXGxgcggSoth25u70eH8APFR0VzMzNziAXIRjIvwAFwq3EqSLUGB/iI4LathS4JCXVJh8nKCmCKrXDFCss1eIfLS4v8ssdmgWsAGNDDBnt3s3wJ+jAtlUhaNSwccNEi4WCBBl4SAHHihw6ZOzg0QNjRgAG6KXK4CNEjBU/gDQI8kLISQAIADobAoMIzCINjLw4YvNkAno4kCRRUuNHESNLmDRxUjSjAlRPfECJImUKlSpMrFzBIqWqoKtJaWSJomULAy5XXrp4+QKGYcYFoCBEWRImi5gmY7CQyVLGriAGD2jEMHMmCxc0Xb6kUbOGTRs3N988gLM4jpw5Y+iwqcOGjZ07mE8yiGABz5c8c/Ts4cOnDJkybS7fdMO7t+/fvDMaCAQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+editpaste22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQWFDw6FHRuFGRaBFxSBAQCBAQKBCQiBIx6HPz6/NTOfKyiXDQuFOTm5Pz+/Ozu7PTq5Pz63PTyxNTOjKSeRExGLMTGxMzKzNTS1NTW1Dw2NKSmpKyqrKSipJyanNzWlLy6ZLSuVIx6FISChIyKhJSSlCQiJLS2tDw6NDQyNCQiFCQmHBQSDGRiZHRydGxubHx6dGxqbFxeXGRmZFxaXCwuLOzq7KyurHx+fDwmFEQuFCweFCQWDBQODBwaHBweHKSinJSWlOTi5JyepHR2dDw6PBQSFNze3ERGRIyKjIyOjISGhPz29Pzy7MS2rMzOzFRWVHx2dHxybDQiFPz27Pzu5PTq3PTm1NTCtJyGdHxuZHxqXPzq3PTaxNS6pFxWVFRKRNS2nPTi1PTStNSulNzOxNSynMymhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwABAgMEBYSLggaOjgcICQoLDA2Pj4MGDg8QEZ4FDxITFBUWFxcYGRobjQ8cHR4fCQ8gCyEiFSMWJCUkJieNEB4dKB4pKissK8wrLS4vMDHBAAYQHx8dFx0fJDIzNDU0M+IyHzaNNyg43Ng5Ojs7Ojw9Pj9AMkCNDiZB/h9CSOx4QLCgihItqBkYgqIDESElitAYWJCgkQcXjjRCgi1Ihw4BB5LAQOLCgyQYHihpUU3DBw5ElpAgAYNixSRJjKjQaECDCRPZPDB5IbIGSQwKLnh4wbInLA4kmJB4oaPiAwVNnER40hRK1BIAaVatUZJEFCkmpmjgCeWDCalFe4q4oFKwSRUrEa5gycLzwq8lUnPQ4PEgSpYcUZ5o2cIlS1O/JHLEDdfjQZMIVrpgweLFy5e+M6WSmBGlxYMYYBRzCaOFi5imHWBIfOEiShLTVjaP6eyFTBmN1TA5OvLDjJksWb58OVMGDRqWjAYdmU79SIvpjqJr104nEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+editshred22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBFRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwKDAQCBExOTNze3NTW1MTGxLS2tJyanOze1Pz+/Ozu7BQSFCwqLDw+POTi5MzKxPTu7LyyrIR+fCQmJPz6/Pz69Pzy7Pz29OzaxPTu5PTq3PTm3My6pPzu5PTq5NS+rPTm1PTi1PTezOzWxPz27MyynOzSvMyulOzOtOzKrMymhOzGpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbpQIAwIBgMCAXDAZFQLBbCqJTRqFobjgdkEYFKowPJZEyeUBqVR/crHDTKZYplovZKCW84+YKZZNZSBXl6EwEEBhVPXxZihGMaGRscdkIdg4QeEnVfCH2OHyAhIhuUAAiXZSEhIyQlJqWnjiEnKCWupRWoYyEgJK0SKaUKjam0JCorLMFfC6iqx8giLa/MGAsT1wsuCyULKwssC9RSzdkfCyALKuALLQsvpeXYIQso3gsiCzALMfENC+dGcMNHUAY/f+jq3ctncMYCGggFrsvHcEGNh/EyPFmg8cmrJxAVkVO0EUDJklHoBAEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+edittrash22:edit edit22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBERGRExOTDQyNISChBQSFCQiJCwuLPT29Nze3GxqbDw6PGxubHR2dJyanLSytJSWlJSSlOzq7Pz6/Nza3Ly6vFRWVBQWFIyKjMTCxHx6fIyOjLS2tOTi5PTy9OTm5Hx+fNTW1KyurKSmpJyenExKTMzKzKSipFxeXCwqLMzOzKyqrMTGxLy+vHRydBwaHNTS1DQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb8QIBwSCwaj8KAMoA8LgUDQsFwQByay4RiwWg4GA9IRGk0SCYJSsUCsVwwGQ1EsmESD5xOp+L5gDwhBRIZDhcDdkMGDgEiIxAkJQ8Ok5MmAohDAQ1xJxUlKCUlEg0pKpiZJRoLCxmtCw1eURhOcR4rbQ8cGRwLAwgGtBYTDywtGRKjvQTARgEZLhMcKC0OrQMvAirMRc7CHCTU1g2+20TO0NIn1RwDCya/wdHT1Rnt5LToKOq79trx0tR02YPX7Jm8fRxMOIhSLhOJE/LCJSTlr5kFEBQsWDiR4UGGBgsuHDg1BEYAfTE6oEBR4AIBAiS5yWBAAAGBAyaPGAgCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+fileclose22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBERGRERCRDw6PCwqLExOTFRWVHRydGxqbGRiZCQiJISChIyKjHx6fDQyNBwaHJSWlKSipBQWFJyanPz+/JSSlCQmJAwKDCwuLBweHBQSFGxubExKTISGhDQ2NFxeXFRSVDw+PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbZQIBwSCwaj8jkMSAYDAgEJbFgOBwQCUOAoJAaFgvGonHIBhyP5BcSgUAYDWxggD4WFmx3e3HQngkSRgYMEBMUFG4MCId0BGlEAQeEhocVDYcUdBYKF0QCB3gRlJgUAQEYBBkaRAMbDZMMpAYcT46rQwMJrgsdC6QcfwoPnUMOBgkIV6SHHg6bw0QEAQYfBpggBZjPGsRD0gEchxwCIR6HChnQRQ8DIU4DTR4Em+ncRw8O+fmoXPXdRg+gQLFgIYM/KRIkoDP4QMKFf0o0aBAh4qGUixgzCrETBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+filefind22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQSFJyanLS6vLzCxISChNTe3OTu9Oz6/Nzy9Nzy/NTy/OT2/Nzi5Mzu9Lzq9KTe7LTq9PT+/Pz+/Nz2/Mzu/Kzm9Jza5HzK1LTi9PTu9IzW5ITO3FxaXNT2/KTi7Iza7GzC1LzW3FRSVMzO1MTq7HTS3Fy6zFS2vKzm7Lze5MTGzHzS5FTG1Ey2xEyyvJze7JzW3ITa5FTK3EymrGS+zFxWXKymrMzi7ESirEyqvLSyrKze7MzOzMTCxKSepAz+/NzW3MzKzBwWHLzS3ERCRAzi3KyurNze3MzGzLy2vLSutCQiJAyytHRydOTe5MTGxLy6tLyqpKyelJSCdOze3NS+tLyupLSmnKSOhCwuLPzy9Pzu7Oze1OzazOTOvMyihOTi5PTm3Pzi1PTazPTWxOzOtNSunDQyNPzy7Pzu5OzKrNzSzNzGvNS6rMyynMymjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCgwGFhYOIiYQBAgMEAwKHiokBBQYHCAkKCwwFAZOEBQ0IDAsODxARCZ6gAAEGEhMSFBUWFxgZCJ+TjBoMEpkRERscGBGRih0BBAgeFBQOER8gISEfIruIIwEkCCUVwhcgJicoKSrZg9srCRkRGdMsLS4vMNiK2wIKMRsbMiwzXtCocSydIBs3AuCIwIFDiBMucugAoWvSiB2VNPDg0ELHwA0MkCXr4aNSggg8NoDIQOFHgBtAkgURMiDAEAFEVBCJFKCIkSMGOyDRkETJEkOFmABoUsRJQkQdnkzQACWKlBtTplBR6qopxkFRJ0ytYuWKFCxZtBBq+hRA2AlbRrh08fLlCxi1a51g+dQhDFwuYsaQKWPmDBpKXgNETaNGjJgyhNfcVdTTiWI2XpK0cePmzRk4YA5T5otGixY0qFOXbgXAQCAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filenew22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBExOTERCRDw6PCwuLBwaHAwODAQCBOze1NTW1OTi5Nze3MTGxLS2tJyanPz+/Ozu7OTi3BQSFCwqLDw+PDQyNFRSVPTu7MzKxLyyrIR+fCQmJPz6/NTOxPz69Pzy7PTu5Pz29Pzu5PTq5PTm1My6pBQWFPTq3PTm3NS+rAwKDPTi1PTezOzWxMy2pPz27PTazOzSvMyynOzaxOzOtPTaxOzKrMyqjOzGpMymhPTizOTCpNzSzNTGvMymjMSihCH5BAEAAAAALAAAAAAWABYAAAboQIBwSCwaiYGAYEAgFAqGg/Q4DCASCsTiymgcHAcqQLB4mM+QiIQBppLPcMjkwQ4bB2X4maKgt4sVCHpnFhQTElNFE3mDDxcYGRp2RBuMgxwIHX9EBZZwHh8gCBmTQ52NISEiIyQlpUImng8hHyInKAgprwAqgnC0IKwrLLpGB4wctLYkwy0uuwd9Z8AnJywsLcVFx2YcL7UnJCwwLTEy0GXJoSgrCCwzNDTnxgjeH9UrKzXwNDY36LRGhEOwLx4NHDmgJbh3QoeOgv127EhojEeHDj16pEhRQoZHHzl+QJNCsqTJSXaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+fileopen22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQWDCwaDDwmFPSubPzGhPzCfPy2dOSmZPzKlPzSnPzOlPzKjBQODPzChPzWnPy2bPSmXPyuZOyeXIRSLEQuFEwyHEQqFDQiFCweDKRuPFRSTPT29PTy9Ozq7OTi3Nze3NTW1MzOzMTGxMTCxLy6tLSytKyurDQyNMzKxOTm5OTi5Nza1NTS1MTCvLS2tLSyrKSmpJyenJSWlIyKjHx+fFxeXBwaHKxuPMzKzLy6vIyOjHx6fDw6NPy6dGxubLy+vISChCQmJNza3KyqrBQSFLR2RKSinJyanGxqZAwGBJSSlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeDAYqKiIeLj4wBjQCMhY+NkoiLk5qbhQIDoJyGBAUGBwgEo4MECQoLDA2pDrS1tKQPEAwHERITE77AvxKqhAQNDA8UFRYXFs8YBAQZGqGPxw0RGxwdHR4eHyAhIiMkJSYnKCgpBAYPEhcqHyssLS4kLzAxMjM0NTY3cBA4UCAHBw8gVnhgEcKFjhc7UPDj0cMHAAI/KFgY4YLFio/jRpTYsW8GDyCSCEQw2DChOHIqgsCQSEPIEEEEJFhAoUNECCJEyOk4d6KIyRtGcB7hIJKjixEjHu4oimSGEIs4d8IIUoKECnNB0ElMwkNJJgBLlJBAcQKGiR07KGAURVGViY0mhIwwSTKjr99+THjUoIg0r48hTRIrRtxkiOMhDgrZCQQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+fileprint22:file file22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBFxaXDQyNFxSTPTizOzi1FxORDw2NExKLPTi1Pzy9Pz6/FRWVPz29Pz2/PTy7PTu9OzezPzu5OzavAQCBPzy7PTm3OzazOzKrPTu5FxSRERCRGReXPTq5Pzu7ExGTMS+xKSmpOTKpPTq3JSCDNzSfHRydLyadOzCjOzOtOzSvLyyTMTCxKSipGRiZFROLPz+/KyurJyenJyWnGxmbLSabOzClOzm7LSutJSWlJSSlJyanGxqbNze3OTm5IyGjNTO1Nza3NzW3OTe5IyKjHx6fMzGzMTGxMzOzNTW1IR+hISGhKymrLy6vLSytERGRGxubKyqrLy2vLS2tDQ2NEQ+RASKBAT+BFxeXHRudAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAgOEiYqEAgQFBgcGi5MICQoLmAQDh5OEDA2YCw4ODxARApKUCaGYEAsSCRMUnQysCwoVEhYXGLOLCBCgDqK5GQUXGooCAhscBB0euBUZEAUJvQgIgx8gIR8iCSPiHuIFEREDJCXaANwhJhsnKCnWERcRKiopFCvsBywhQrRwQWGAPAz5EhpQ9wIABRgKYsiYMTEEDQocatiwkUIEP18fbkCAAcMBjhwzdOyQwYNCgBMfKJSgMItBjxs+btwgCSGGjhw/ZoRgQKGZCRMUPgABEgSIkCE3SZok8qNqkR85NtDUEcPIkaVAkCR5SrJBDCVKlmzQ6pCCiRlMTJo4YUH3K5AeMBYYWctW0BOaUH60cBJFypQmII6wyEpFQBVFMSm4UAI3hJUrOGh8oOJrklYKWIromJGDR99Ogz5j4ZGlM+pEnwmBCwQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+filesave22:file file22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBGxqbAQCBLy+vERCRExKTHRydIyKjMTCxFxaXGRiZFRSVFRWVPz6/Nze3Nzm5Pz+/JyanDw+PExOTHR2dMTGxBQWFLSytHx+fISChOzy9Ly6vAQGBJSWlMzKzAwODJSSlHx6fIyOjOTi5DQ2NISGhGxubCwuLOzq7ERGRFxeXNTW1CwqLPT29Dw6PGRmZKSmpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAb/QIBQGBAMj8ikUDAgFAzKKCBwQCQUCcICKh0SEAhGw5EIZAmBrgCxeDQgcDJWyz0GIggJfL+XGwQJRxNgC3yGDwwUFUZDFhdthnwMGAZNQwEZFwQakXANBBQbHIIdERIBnRAOiR4ERx8gsSEMBBmGCyEGG3YGBwcgIr8UCwQHECOgG4xCtRkEJAvBJRklJgkSFBQeJ68hJiEoESkFKiEZIbkGARsLlwEGExENGhorGSkpFAYm66NDLAECpGiBYsUIFA8wLHBBQMWLVkdUCFCwaYVFBOymkVCgYEMgOykEpICBccMBAhhELFigTEqAAgIIwCiQ4eRKDyS6EAlJIAI0EpaudF4iIKDAAn9CkRT5eMROEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+foldernew22:folder folder22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBNzaTPT2FISCBCQaDPz+BExKBDwmFPSubPzChPzCfPy2dPz6BMzOTAQCBOSmZPzKlPzSnPzOlPzKjBQODPz+rPz+3PzWnPyuZPSmXNyaXPTyhISCLIRSLEQuFEwyHPy2bKRuPFRSTPT29PTy9Ozq7Pz+xJyanDQyNPzGhMzKzOTi3Nza3OTiVBQWFDwqFKxuPOTi5JSSjISChHR2dGRmZFxeXPS2dNTSzNTS1OTm5KSipLS2tLSytKyqpIyKhGRiZNze3NTW1MTGxMTCvLy6tIyKjCQmJMTCxMzOzMzKxJyenHx6fLR2RLy6vJSSlHx+fDw6NLy+vIyOjAwGBGxqZKyurCwuLBQSFJSWlCwqLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLjI2MAY6HAgOHBJYEhJCDBQaDmgcICQoLB4MGDA0OAQUBDg2cAAcPEBESE6QUuQasFRYVq5SxCRcSCggYGRjIGgYbFs8bHIMHExIJGR0eHx7cB83PFhsDDuTUEyAhIiMjJCQluwEmvsAnKAcp1x4qKyUrLLupWrByxcnFiwQIYIggEaNEiRgBZMyYQaNADRs2REA6cCODBxw5+OnQgWMHjx4+BND4MQOIg1gI0gUREkTHiplDhhApEoCGkRlHBL3I8MEHEhz+WAhJogTJySVMfthwIehAExE5jubAkYQpESc8fOx4AiXKNA8+ekhBgqSpzh5hPHcsmVLjpSAqVZBY6VGkiJMiPQKLnTvjCiEsWU4o3nGC8YksMmT8YCmC6iAXKLRc2cz5yGYtR0JjKWQgEAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+mailforward22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBJR2dLyijPTixPz69Pzq3Pzy3Pzu5PTu7Ozi1LyelOzavPz+/DwqLLyafPTmvPz67Pz29Pzy7LSWlPzmzPz6/LyajPTitOTSzMyurPz25PTatPTi3KyOjPzuxAwqVDQiJHxiZPTetKySlPzqvPz27BQ6bAwmTPTexLyinNzGxDRunPzy5KySjCQ+ZNzq9KTO7JzC3Nzq/Ozu/LzW7FSm1BR6vGSWvFyq1AyGxAxytAx6vBSKxAxSjMyujLSunES+5BSi1ByGvAQCBNzCrOTaxNTOvMS6rKyelCx6rBx6tBQKDOTWvPzu1PTq1OzezAQOHAxGdBROhAQGFPzy1NzOvIRqXLyynOzarPz21Jx2XPTWrLSShAw2XKSCbPzuzAwePAQCDPzyzPzqzPTmxOzWtAwGBKyObOTSrNzGrKyGbOzatEQyNKyCZOzWrOTGpNS2lCweHCQaHCQWFBwSFBQODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBhBwgQKFSpY0HgBQwYNGzh0mDhRAAUPHziACEGBpYgRJDiUGEkSwoCQJk6opNASRQoOFETQJDkggwoOJlYApcCihQuVL2DUhBDjhIqjJmRwwDCDhswaNm5MjYHjKggOOU7o0CGTA9gdYknG2KCCBw8VJVL0uBgihAUfP+CSNGCjsI/DiBPbAMJBsEQbQYQM+UG5smUiRYw0jlvYxhEkSYyIHm1EyRLTTH40EZvAyZPOR4pAmU07ipIkUKQ0mQIhAZUqVq5gKXzkSBYtyLVEyd1ki8QFXLp4+WJFQowbYLJnD5NbzJiJCjaQnhnvpYwZM0/OPFlvQ/f3iQvQpBlvQc0aCWy4VKnCpY0Y5yQxgEYXZFjghgwZUOHGCW90YQEccUwloBwGyjAHHXUoSAMZb0xhx1QOoMHDHSfIwSEOdTjhAQ1d4MFbTQ6Q4MYacrzxhhx04JCHHhvQsMeLJPHRBxpr+LHCGnusgccfgKixQR1ATtTBlDDAEIggggxCCCGFbLGFHVFKZEdAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mailget22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBBQ6bCQ+ZAwePKTC5Ozu/NTi9GSWvAwSJGSu3JS+5CR+rAQOHPTy/AyKzES23AwOHCw+bOTq/BR6xES+5AwmTBw6ZMTW9Ax6tByi1BRGdAw2XAQCBDQuNDRupKzS9FSm1BR2vBym3EzC7CSGxBROhNTW1Pz+/OTm5NTO1AQGFNzW3Ozq7Ozm7IyKjJyWnMzOzNzq9Nze3OTa5Ly6vCQiJGReZISChKyqrAwqVBRWlOTi5MS6xJSWlNza3OTe5Ly2vGxmbKymrIyGjMzGzISGhKSepCQmJDw6PHR2dJSOlPTy9MTGxLy+vLS2tMzKzLSutMTCxLSytKSipJyenKyurJyanCwqLCwmLCwuLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4IBhgIBA4SLjAABBAUGBwiNlY4FCQoLDJaNAQ0ODwsQnYwREhMUE5ylFYYRFhcYGRgaGxsDHJUdFR4SHyAhEyIjJCUcuo0cJr0nExihxgwoyYscKSnMHicOIw4lKissLdWDHC4vMCu9McYqMjMyNOUANTY3OPEoOTolDCszdrSgwaMcBxs9TMxYOCMHBx8zfPj48QNINQ5BbMBIIUShDIUoTAhR94PHPEEHbQwZckOGjBQviMxYUWQIDCMmdXE4gqRnkiFETAxR8iKFjJU2evZEdmLJkgJIbqS4wXJIUapImj5FtuSEVyRVV1IVi4RIChhEkLVAgcJHEqVwVJUmYdKkiRNkALMRecKECRG/ff8CEQJFCA5kMKJEoUHDCQ/HkB9LmWKECpUeyKoIMSLEyosen0OD7iH2xg1dV7BkqXGlBpbWNTq4Zn2khu0aAAwEAgAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+mail22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBDQyNCwqLCQiJBwaHBQSFAwKDAQCBDw6PPz+/Pz69Pz27PTy7PTy5PTu5PTu3PTu1PTq1PTqzOzmzPzuvOzitPTmvOzivAQGBDw+POzevPz67Pz25Pz23Pzy1PzyzPzqvOTavERCRKSilPz21OTevIR+ZExKTOTi3JyanLS2tPz6/Pz65KyihJSKbMS6lExOTNTW1JSWlJSKZMSylNTOrNTKpFRSVPz29MTCxPTmzKymjIyCdOTWxOzexOTWrBQWFFRWVOzu7MzKxJyalOzatLSulMzKtOzmxOTarFxaXKyqnPTmtIyGdIR+bOzetOzixBweHGRiZOzm3NzWzNzSrOTetGRmZOzizOTexOzm1JSKdGxqbHRydJySdHR2dOzapHx6fKyijOTixCwuLHx+fFxeXERGRDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4SFhoeIiYqLAQECjwORAwSUBZYFBpkHmwgJCgsMDA0OD6UQERITFBMVFhcVGBkangq1ChsLGxwcHQ0dHR4fICEGIiMSCbS3uLq8wCQUJSYGJygpKhQJKyvLLM4Nwi0uLwUwDQsxMtmeuQveHR8UMzQ1NgU3Dgo41jk6ns0cKOzgYaOHjx9AgjTAUUvIECLZNmxoUISHkSM9KiBJQkCJA4kKEoBQoWJJAiYtmjh5AmVCsCJRpHzckKCCySlUUvBYUqUHDysSPnxIEuXKA5pPRiRwxwFLFhRaIEDYUoEChCcDuECoOWKFuwW7nHkg4WELkw8/BHRRwESpt10dU8SSHevlRxIBX6C0WBE27q8GZMkKbTADjIAwYlb4GLMYShYoPTRo6FGiSJEKPyzMIFMmzJcvXbhwkSLFjJkbQW6cOHNGhAgEAdAsmk27tm0ABgIBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+mailreplyall22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBLyejPTixPz29PTu3Pzu5Pzy7Ozi1LyelPTavPz+/DwqLPz67PTetPz69ERCRLSWlPTmzPz6/OzexLyajPzqvDw+PDQ2NMyurDQiJPz23PTatJyenAQCBPTevPz25LSajOzq7HxiZPTexPz65JyanBQ6bKSmpBwuTOTi5OzaxBRCdHySvGRiZHx6fBQSFERGRNzq9IyOjHx+fGxqbPzu3BwaHFSq3Aw6XAxKfPzy3Gy63ByWzJzO7Mzi9OzavBRytAx6vCSazGRKTPzy1AQKHBRGdBRyrDy63ES+3Cym1CR6rBwWVAQSLAx+xCyCtBRmnPzuzAQWLAwePPzyzKSCbAQOJByGvOTWvPTmxBQODFQ6PPTWrPzqzOzatAwGBKyObLSWfPTivKyCZEQyNKyGZOzWrOzWtOTSrOTGpNS2lJx2XDQmJCweHCQaHCQWFBwSFBQKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpkzGjhAoYMGjZMpMghQgcNFjh4mODhA4gQGkSIHAmBwAgNJEpo8KDSxAkUGjhMSEGz5gUVIiKs2PmBRQudHiwQpUnAxYsXImB0aBqjBcuoU0fKmPGChgUNH2qIqGHjg9u3bicWIFs2rYgbNnDkyGFhb8cccQ3ouJqWQo0dPFr0WMy4h48LFj4gsKriB5AeNngEaSGks+chPnwQOXFAh4oXRYxk9nAEyY7XO2wksWHDx5ATCDIoUXEBsYclTJo4cWJhuIjhSXacSPBEiZLMQY4wgRKluvXqUpyIsDElAxUqVaxcwcGCPQuWLOixaNHCZAsXBU+oqKDSxQqULF6ifNmyn/8VMOtxwcAK36kQRhdJQIFFEmKM4eCDYGyhhYAEkqFEGSuYYcUZLaDxXRpqSNRCEu6twYaFZXTQhgRd2NCCG9918AYELTjoXgNuKAFHB2RQEUYHVbQQRwlUpPHGGFwkyQUEDsgxx4lh9BhCBy2U8UQJcrSg5JIQ0FEHG3bc0QGYK+CRhx57PEGlkhM9sAEffKTQhx9+/AEIIIGoEUgLLRRFR0AAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailreply22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAJR6fIxydIxubIRqbIRmZHxeXHRaXHRWVGxSVGROTFxGRFxCRFQ+PEw6PEw2NEQuLPwCBMSihPTixPz69PTq5Pzy1Pzu5PTq1Pzy7Pzu7Ozi1LyelPTavPz+/DwqLLSajPTetPz27LSWlPzmzPz6/PTexPz67Pz29OTSzMyurPz25LyajBRCdPzuvDQmJOzexPTevOzq5BQ6bBwuTDQiJHxiZPz23Pz65LyinPzmvBxCbHySvAQCBOTi3OTq9CweHOzaxFSq3Aw6XGy63ByWzJzO7Mzi9OzavNzq9BRytAx6vBR6tPzy3AwOHDy63Ax+xCSazCym1CR6rBwWVOzizAQSLES+3CyCtBRyrBRmnGRKTPzu1MzGtAxKfAQWLAwePPTizMy6nByGvNzWxOzWrNzOtBQKDJR2ZNS2lPTmvBQODPTatKSCbOTaxLyqlAQKHFQ6PPzyzPzqzPTu1PTivOzWtKyObPzuzOTOtLSWfPzqvAwGBKyCZPTWrPTmxNzKrEQyNOzatOTGpJx2XCQaHCQWFBwSFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYuIDBQgYNGzh08DCR4oQPIDqEmDBhJQYRIzqQIFkSAoESJCKkDGFiwgkUKTpMwECz5IASKjqsSMlSA4sWQjG4qGnzhYoQSmF0iCFjBgmWGWhQrVHCxg2sOHLo2MGjB0sLYmsWQHq1p4wdPtqemGDhB1UDQFSouKHi7oQgQmSwUMyYxcQDZQWz2EFiCJEiRoyQyLzZyGIIB47YKLwDSRAiSZSoXq1kCRHNLBK8YGKjCYskTp4ogeKkt+8oUaBImZKAAxMmVKrctqL7ihTnz7FkAT5FC4cKFbZwadIFdxcvX8KLss8iJcoUBUcq2KgAJoxyMTy4jCFTxoxEHl2GLyCDncmWM2hUIQMPY2CXhhoTfTEcA2tgVwEba7Thxhs88FdBD/ZB8MUUHMJBRhw2sAGCHBKU4UaFc1RAhxnhcdhhHUzYAUIcFdxRAh4R5KGHinu4OIVEDqTBRx81xhGHHzD8wQYQetDRI4cTAcIHGWT0EQgZa1ApCBqDcBAID1Q94IEHLtBAAyGEFGKIIWqYYQYPYNZkQEAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+mailsend22:mail mail22 22:photo:22 22:R0lGODlhFgAWAIcAAIR6fIRydHxubHRqbHRmZGxeXGxaXGRWVFxSVFxOTFRGRExCREw+PEQ6PDw2NDwuLPwCBLSijOzixPz69PTq3PTu5PTu3PTu7OTi1KyelOzavPz+/DQqLPz67LSafOzetPz27Pz29KyajPTmzPz6/NzSzLyurCwiJPz25Ozi3JyOjPzuxBRGbAwSHOzexPz23KSSlPzqvBROdISavBxSdAwaLHRiZLSinNTGxMy+vBxGZNzu9BSGrAwWJMSyrKSSjFy61ETO3BRWfPz65PTqzHTK3ByqzBSWxEzW5AQWJOTWxBRCXOTu9BSOvDzO3ByavBRKbOzaxOzizKSWlCQ2TAQCBJza7BRWdNzSxJSCbMzq9BSOtCSKrAwiPOTavPzy3LymlCySrAwmPFRKTPzy1NTGrPzu1JR+bOzatPzyzCy61ByGpOzWtJyCbPTmvPzuzIS+3FymxCSuzBR6nJyCZOTWvKSObMSujOzivAwKDOTSrNzKrJyGbDwyNOzWrMy2lIx2XBwWFBQSFBQODAwGBAQGBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABAALAAAAAAWABYAAAj/AAEEEDCAQAEDBxAkULCAQQMHDyBInBgggoQJFCpYqMDxAoYMGjZwmEixg4cPGzqA6BBiAggRIzaQGEkSwgAMJCKgnNBhQogSJlKGOFHTpgYUG0TsnJBCxQoSE1i0KErAxYsOJJRuuAAjhkwZM2jUqGnDBQoUHTbciIEjx4YNOmbs4CGjB8kCZlGAALHBx4+YcTcACcJDyFSJBo6iGNIhhQkiG8BOKGLkCBK6SSQisHoWhZIbG5bMYALECI8mTZw8gTL1QJQXZ6VMiUylSpUlVpoYaXLFtm0EGmCjwJLlA2O9MrRsccKlC8kEXr7AdgEmwtkhX2SQ2BIkjBiSYzSQr/nyhUKZLIrJJOcexvlEBV7IvCBjRkmAMzHOaufhxDvJBWiQISAFxUUQQRovJNeEGmu4JxEDbKQhXxsfuFDGGW68IQMcccgxRxUkNRDhC3R8QMQIdZwXQ11JJGFbiB+QYccHaaTxhgt13OFBDGTgkUdRDrhAhx5k2JjGCB/swYcXMXwAYk190OGHHx/4wUaVepTxByAaoPEkSQ5wwMEJZAZipiCDDJIHIYV8OZEdAQEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+nav1downarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBBQSFAQGBDQyNExKTHx6fGxqbFxeXGRiZFRWVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFxaXDw6PPz+/MTCxLS2tIyKjKSmpKSipJyanAwODDQ2NHRydERCRFRSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZzQIBwSCwaj8ikcslsOp/OgHRKlQoCgymRUDAcEIkwYgxWFBYERpHQcDwgEclEQmk8DhWL2kiIXDBwExMNGRoJaUkEEH8bEQ0cGgcWAksEHX8QHBKSHk1sfxMHH5ROBBsOICGkT2wiq1CIULKztLW2t0h2QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav1leftarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ5QIBwSCwaj8ikchgQLJGBgfNZDBAKBirRekBMtYGEYsHIgsWNhOO7tCrShDU18Hg/CJAIG0o4wCUQcksTFBUSCRYSEnpUFxgIGQkJGYyNGggbHBaVjR2QCxEeWkITHQ4IH3tPFwEMA2ajAKUgqlQTTbFEE7W5vUgGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav1rightarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNGReZAQCBMTCxGRiZMzGzOTm5LSytPTy9Pz+/CwqLOTi5Ly6vCwmLMzKzJyanJSSlBQWFKymrIyGjCQeJJyWnISChISGhHx2fKyurDw6PAwODHx6fHRydDw2PERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZ2QIBwSCwaj8hkMRBQKgOCgRMZIBSk06XhEM0SA4iE4uoVLhCMhqLrdSAekMgYO5VM4BQ521mxIC4UFxBWdEkSERYYFxETGQGFSBKCGBEaGRuQSBwdeZaPXpsQCB6YZQMdEI6ZSgMepKusHh+wrCC0rLdlursGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav1uparrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBFxeXDw+PMTGxHRudPz+/JSSlLSytIyKjHR2dISChIyGjIyOjLSutLy6vKSepJyanISGhJSOlOzm7Ozu7MzGzKyurJyenDQyNGReZKSmpIR+hCwuLCQiJBwaHBQSFAwKDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAZtQIBwSCwaj8ikcslsOp9QYyAQFQYEAyr0Sihkn1fDAeHVLsOJNELxVaITC0bDUU6GH5AIQ8KYrNtFVxQVFBYWFxgRCREYdUQZGhYEDwgIGxAHCQocCgWOQhmhGR0epR8gqCFTq1Wtrq+wsUt0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav2downarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAQGBBwaHDQyNExKTHx6fGxqbFxeXGRiZFRSVDw+PAwKDJSWlOzu7LSytJyenJSSlISGhISChIyOjFRWVDw6PPz+/MTCxLS2tGRmZDQ2NAwODJyanKSmpKSipIyKjHRydBQSFERCRExOTFxaXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAasQIBwSCwah4FkQKBsDpoBIqFgOCASCYRWm1AUFgRGkdBwPCARiWRCaTwOFYvYSIhcMOiJpJGZaDYcR0IEHXceEQ0fICEWIoJDhHcQHxIHgI9SEHeVG46YUh8OISOen1INCqWmUnOYTUxQAU9NUlRWWFtbCiRgrYNlZ2lriG8lYUd1khETE24gCZeCkRgeFBAQIAeNn9OTlXKrBJoYnKrcoaPmpmSpq3S+7u50QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav2leftarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExKTJSSlHx6fAQGBOzu7GxqbJyenPz+/LSytFxaXMTCxGRiZKSmpISGhFxeXISChAwKDFRWVHRydJSWlBQSFERCRIyKjDQ2NIyOjLS2tDw6PBwaHFRSVDw+PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAavQIBwSCwaj8gkMiBYNpeDZzEQXRIKBmPgmtUSDgipcAsWjxOKBaN7Tq+n6EbCIQ3E5+KtQk6gjwl7CX11D3sPBBARTQGFDYeJT2R8EhB0koKUfgATFBUSCRYSEoqcnqCiikMXGAgZCQkZqautr7FiFxoIGxwWqQC4ury+qh2tCxEexMbIRhMdDggfYs7Q0kcXAQwDbELY2txEziBmmx3jSRNMR+nk4e2b70ry80QGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+nav2rightarrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTGxOzm7CwqLLy2vPTy9Pz+/Ly6vCQiJLSytLS2tLSutOTi5MzGzKSepIyKjJSOlKSmpMzKzJyanIyOjBwaHIyGjISGhJSSlISChBQSFJyenIR+hGxubDw+PHRydHR2dEQ+RHx6fERCRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8hkIIBcJgEBweAYnTYJUmMAa9USClniFtwlGg6IRFhoUKTXwwWj0FB3F46Hwl6UQyISfAB+EROCQgsUFRYSF3yJEIyBaxgWDBkaGRtclQwSHBIbEGEdGx4fGhcOICEDGBsWHBmqIq1CHRIWGRMMIyRTHRy6Er22tyONq8YdJRe0xkIDwr2/QwMfliMmZQADIxasZd4e4UYDIr7c59rc0eVFA+/m0EQD9PDt0flP/P3+BkEAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+nav2uparrow22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBGReZDQyNMTCxHx6fPz+/JyWnKyurHx2fDw6PJSSlISGhIyKjIyGjISChLy6vJyanOTm5PTy9OTi5MzKzLSytKSepMTGxMzGzLS2tLSutKymrHRydCQiJCwmLBwWHAwODLy2vHx+fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAajQIBwSCwaj8RAAMkUBgSDZdP4JBSi06TAcEAkFNLp07BgLLzY5njRcDzO3zB1C4lEGI83Wj58SiYUFRUWdg0XEXFFAwIYGRoWGxwRZQUFHZdgRAObmx4fHiChISFKpVlKWUdPaalOAlasp1sHG4myZGZ7Yltsbgu1mUhjdRF5egmxfQJ/gYOFdrZDi40iFgiSCw8jBQmYcpydn6Ego6WorUwGQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+navback22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRGZAxCZGyavExmjHyatOTy9CxihISevPz+/KzO3BRylAw+XAQCBDRWbPz6/FzC3CSuzDyexJzO5Mzq9CxSdAQOFISmxNzu9HTS5BSmxAyexDSuzJTa7Mzu9Kzi7GS21CRmjAQOHHSWtLze7AyWvHzG3BRihAQKFCTO3BS+1AyixBSWvBSOtBSStAQWJBSixDzW5BTC3BSqzBS21CTC1ETW3AQSHEze7BRqlBRmjAQCDBR+pBRefBRSdCH5BAEAAAAALAAAAAAWABYAAAalQIBwSCwaj8ikMqBcMpvHgGAANQYIhWdVGDAcENQtIJBQLBgNx0MQaDuQXcghIplQDhBIxXKJYiAZGhscHR4VHyAhIiNWJBklGhIbJoQnFCcTKIxFKSgbKissJi0mJi4vLiYoMEcXKDEyMzQ1Nje2NisoOEg4KDU5K6g6OwwoKAN9SCOeMmgwz884PEq9PT4NYkPLP9jZQikN3d4AKVrjKePp3gZBACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+navdown22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VCRKZDRSbBxCXJTC1Mzi7Nzq9NTm9Bx2nAQCBNzu9JzG3Hy+1HzG3IzO5BRmjPz6/LTe7Dy61AyStCTC1FzC1AyGrETS3ETC1ETa5BRulAyuzBRylAw+XMTe7Gy+3CSqzAyexBTC3DR+nIS21KTW5Nzu/KzO3FzC3Pz+/ByixEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaRQIBwSCwaj8ikcnkMBAQDgjPAFAYKhsMBkVBUAYEFo+F4QLzVQEQyoVTOX/XBcsHA0+vMRbNBMwkRDhxuHX5GTlIeHh8gISIjFAEeiVRECiQlDAUmgxQjIhwiJHdFlycoKSIUFCEjGiGkRpcqCxYijxorsUezcxYsuoZJsxLAu0qXB7DCTJfHVQrMX9PU1Uh0QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+navforward22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBBxCXDR+nIS21Aw+XJTC1Nzu/KzO3Pz+/Nzq9Pz6/MTe7KTW5FzC1Nzu9CRKZMzi7IzK3Lzi7LTe7HzG3Gy+3AyuzAyexFzC3DRSbHy+1Dy61CSqzAySvAyStLze7IzO5AyGrETa5ByixBRmjCTC1ETS3BTC3Bx2nAyWvEze7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAaYQIBwSCwaj8hkMqBsBgTN5IAAjRoDBaq1aDggtMuAWDzoJhTgY+CwYLgZDccDwkgXI5IJZVGxXDAZGnR2QxsLHB0PHRgeHyAZDyFfVUQDCyIgIyCPIB+QJCUmlEMBEiInKCQnKSkeKSQeomoqJrUmKiArKSwZsmoCwMEBGCyxo1EGHr3HUQEEvltCBtDRAAbMW0zV29xDBkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+navhome22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIYAAPwCBAQCBCQiJNze3ERCROTi5MzGzLy6vDw6PKyqrKyurBQSFGRiZGxqbGRmZISChEQ+RExKTExOTHRydDQyNOTe5FROVLSurCwqLMTCxPT29Pz6/LSutFxeXLyytLSytPz+/JSWlKympPTq7KSipNzW3BwaHHx6fKx2VJRWNHQmBFweDOzq7Ly+vNTW1JxWNLSajPTe1Ny6pKxWJNTS1IyOjJRmbPTi3OzKrNSSXMSGVHQiBHx+fJSSlPzy9IxOVOzWxOSyjNSCPLxeDJyWnIRGTOTGtMxmDLRWBHwqBIxGTLRSDDQuNNSunKxKBGwyNMSafMxqHMReDKRGDPTu9LxuPLxaDJQ+DIR+hGQqNIQyBGQiBNTO1EQKBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAf/gACCg4QBAYSIiYQCAwQCiokEhwACBQYHBAiQhAiHlQYJCgkEC5uCkp8MDQ4NDwylmwgQlgQRERIEBBOkmxQVBgQWFwUFFxEEDLyJGAUZtQoFGhsFHLYdyoOVHsEf0SAbIAUex8mwlAUhtSIFG+3uIyTWvAIGJMEkJe76GyXbEeWUBJg4USKaBhQpVKzYoIFFiwYUBBJa8MAFCw0vYMSQMWOhBhoTKCQSUKMEiw02buDIoWOHBg0GeIhEFKAHDR8afgAJImSIioYliMws1MPkhiJGchxBkmTDCBo1hg4KQMTiBiUyhBxZ8pNFiR5MEtU0WqSJVidJNDyNKraHC5xPNKBEkTLlJ5WvUgWNvfikyhArV34+7ZEXQAAsB2iUyHLlihYtW0pwOYAFgyJDmDNr7jIIWiAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+navup22:nav nav22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAw2VAQCBHSWtBRmjAQOHISmxNzu9BSmxBRihHyatPz6/Lze7CTO3BSixHTS5BTC3DzW5ByyzPz+/OTy9AyexEze7ByixGyavKzO3FzC3AyWvBS+1BR+pAQKFCRGZExmjCxihBRylCSuzBSWvBS21BSOtBRSdAw+XAxCZDyexDSyzCTC1JzO5JTa7DSuzETW3BRqlAQWJDRWbOT2/Mzq9HzG3JzS5Kzi7BSStGS21CxSdCRmjAQOFAQSHAAAACH5BAEAAAAALAAAAAAWABYAAAaeQIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbUGFAtGw0GFfheHByQi4S6/E8pDUoFYLm5kAEPJaBAVGxIcER0JHlEfICEiIxUkGyUmIgknKIhXASkonCorgSwmKQGcKE9IAi0uLxUwMTJWMzQ1NiYwBLBQHws1N7avXgs4NjkcCblMATU6KhvGyG87PAnUKV1MAj0+2zIFp1bg4eJJdkEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+playeject22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAwKDJSWlFRSVBQSFKymrOzq7HRydERCRPz+/MzGzISGhJyenKSmpGxqbJyWnJSOlKSepLy2vIyOjGRiZPTu9IyGjLSutFxaXExOTHx2fGReZAQCBAQGBBwaHCQiJLSytKyurJSSlFxeXNze3LS2tIyKjFxWXHRudAwGDBQOFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcqkMCJjHwIBQgBIDhgMiUbVKFQsGItBdBhpgh4PxIJvRC8cA4oiMy8bvQhJhMAYTFBVOURAWEw0QFxcMERAYCBluVxobDxkVHJocmBwEGgmEQx0dHh0CpKmkH6odVlanBR8FtAIFtiCkSB0LISEiGCIGIxAPDySuRwIOBwrOzwoHJRHJRh0jJgMj2gMnERQUCNVFHQQoCBvo6CkICATjRB0qp7b1K6qv+foyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+playend22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNFxeXAQCBMTCxGReZBQSFOzm7AwKDKymrJSSlFRSVCwqLLy6vPTy9OTe5Ozq7CQiJLSytOTi5BwaHPz+/HRydMzKzKSepJSOlKSipJyanIyGjIyKjKyurISGhMzGzJyWnHR2dISChIyOjLSutDw+PERCRHx6fJSWlIR+hJyenGRmZHx2fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa6QIBwSCwaj8ikMBBQKgOCgRMZIBSkxYHWoDVWD9EigpBQLLBERsPxCA8NDUhjgTBGJJNGG02RVBQWdUV3FxgZe0IGfoAGdhoXGxwdiAYef4FGFBoeHB8dGSBRihUhIo1FBhkbIyMkJRYmAwYal4JEBh2RChIWJ1IIGxUZFqdECCgkHR6wWAYpFR2YWSobvL5vFgfDaEMDIivMRBEsD9HcQgMWvecDLB0tZ0btsfJa9vLXU/X6/P3+b0EAACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+playpause22:play play22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBAwODMTCxKSmpJSWlFRSVAQGBBwaHLSutOzq7Ly6vCQeJPz+/Hx2fBQWFGxubLSytJSOlBQOFAwKDJSSlJyWnIyOjHRydNze3GRiZAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAWBICCOZGmeaKqubOumQSDEgRjPMSoMRGEcol3vh0IkFAtDDWBEKlGMRKPgEIii0yrqIS1ArADu9KuLNCSOSdCMVp8ohEZFC4DL6SaBpXGh6/l4JX8XZACDhXkYCn1LAoqMUBAZEhBLDJKUSyYBGmhPAJyemiU0NDaloy+qq6ytI8whACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+playstart22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBDQyNAQCBExOTAwKDAQGBJSSlHx+fBQSFMTCxKymrFRSVOzu7GxqbLSytLy6vJyanPz+/GReZBwaHHRydKSepKSipGRiZJyWnAwODLSutKSmpISChPTu9ISGhFxaXJSWlIyGjJSOlERCRIyKjDw2PIyOjLy2vOzm7Dw6PLS2tCQmJOTe5GxmbDQ2NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa7QIBwSCwaj8ik0hgQLJGBgbMoqBIKU2LAcMgOEQmFYeEFbBmNMgDhYDwWBC0k4pCoJ46IgRIXBioRCRYXamwRGBQIfgaBFhiERhkaenxmCoEbBhyQRYaIGVsdghgem4UWegcEBB8UHhsgIaZGBBgRIpUIIxQhChginEQIIBEklWslFyYnBsFfFCi4WQgpFBwqFxNGKxcsxl4IAS0NZEYCF3vlwgEfUuZV8JEuI2pPAARN9kcE9fr+SwaCAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+playstop22:play play22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBAQCBAwKDBQSFBwaHCQmJJSSlISChJSOlJSWlGxqbGRiZNTS1PTy9Pz+/Ozm7OTi5FRSVIyKjOTe5MTCxIR+hExOTHR2dLy6vLSytLy2vHRydFxWXIyGjIyOjPz2/FRWVHx6fExKTMzOzJyanKSmpKyqrKSipAQGBLSutHx2fDw6PAwODAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAa1QIBwSCwaj8ikcslsAgKCAWEQjQ4KgSwyYDAcugZEQqFYYJECA6PhaLcfEEUkgJZAGJB8fkKpWOhHAxcOGBQZGBoaGQgbHIBGAhUOGR0SBxISBh4Xf0iCHxQSlRIIXhsgj0UCIaCXmJgHGyKpRJ+hmB5dHQqOaCENIx0epBIkBhdzngoPGCQlJifQJBvJRygRKRcKGxcXGypys1srEREc5SLnICLiR1koLFVUWfRO9vf4+UwyQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+textblock22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUWzvNzo33GfFl5jVlonlTrr1DbvFi9vjeeNUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textbold22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIxhI+py+0Powm0VnknjVkH2AEhE45LZ55Wqn6e65TsMc5eYosbksswubJIhsSiccgvAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+textcenter22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUbz3Sh7yIWfFHKjVl4nmFrr1Lpr7LwkjeeIUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textitalic22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py+0P4wqUSlQvttrkDnyaOHIdeaGRupplAIauVM3xjeeOUQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textleft22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+pyw0Bo5zB2UXz3Sp7yG2fFJajVjonmIor2TJvfL0wjecIXQAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textright22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAImhI+py30Bo5zBWUfz3SZ7yIXdF4kWqZkbCqoMO7kXLC+wVOe6YRQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+text22:text text22 22:photo:22 22:R0lGODlhFgAWAIQAAPwCBAQCBBwaHAwKDBQSFLy+vLS2tJSWlBQWFKyqrFRSVCwqLDQyNNTS1GxqbFxaXJyanIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAVcICCOZGmKQSoMaZsShBsQBdAapHvgaIDUqUPJlRjSbAoT0fRDKgODRbF0PLUYjZO2F2Bst9evNix+dsvDlGKK5jraudQb7qbX6a2HEJ+ycyF+LRE8ZTI+fX5oGCEAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+textunder22:text text22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIvhI+py+0PowmUnhpeVVnb1DkbCI1I2JhX+Z0sOr2cTHpwK7a4rUr+hAnufsTirwAAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewchoose22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz69PTq5Pz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq70466Cl+AMxBVwnFIVRAmQHCIeBrC1L3tQgJ/SaEbeeC1PLBHE2ybFI9A1HzstHEIK6YCmhDTmBybQaHYJn7QC5zKeytIQe1+pKNE6P2yMAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewdetailed22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAQ+EMhJq7046817+MLQUQFRGMc4lQaSAkcMx3QltMmrDrSu/sCgEPgJhIiFk89DaL1qPRnlhsgBebWhdstVESIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewicon22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz69PTq5AQCBPz+/OzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARWEMhJq7046z2DF0PlBeAVEERhiKhqHgWyUgEsX0KczFOO7JeBYciTCImc5ITIXDKHyqhU9AnRqq9UEVDTvmLbGhin2/qAliOUot5OLc81IO5+2+8WewQAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewmag-22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbKQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/avno2BBf/MCClSob4iBIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewmag22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbIQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/47vrq9P3s/cunr9S8gAIRFhTCLAgAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewmag+22:view view22 22:photo:22 22:R0lGODlhFgAWAIUAAPwCBBQSFJyanKy2tLzCxHyChNTa3Nzq7Nz29Nzy9Mzy9MTu9OTy9Nzi5Oz6/OT29MTi5Kzi7NTy9KTm7JzW3ITO1Lzq7IzW5HzK1LS+vMTq7Jze7ITW3GTCzGS+zLTS1MzOzLzq9Kzm7Jze5ITW5HTS3FS2vLze5EzCzEyyvEyutJTa5NTu9ITa5FTK1ESirLTm7Mzi5FS6xEy2vESerESmtFSutESmrKyqrAz+/Dw+RAzi3ASutHRydAQCBAAAACH5BAEAAAAALAAAAAAWABYAAAbQQIBQGCgWh8jksCgYEAaCozIZKBgOiIRiwSgEpstCw/HYQiKRhBcMCBgQDodkMaFU0t9pQHCIyy0TFxgYEVF6GQ4LCQkaERscHR4RH3lUIAkWCyEiIyQlHiYjEJVIAQQJJ2gjJSUoKSorlHoCLBQcHC0lLikvHjCGejEiHBgeMjM0NRwPpFQFDBHFNjceHAjAYFWoI7cnCVE4OWxtex8QH1EBOjs4zUpGUjw6Pe3j2fP19u/4zT766vRI+fvHD4CPgwcJ9qg0UB85JA0dDjEQBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
+viewmulticolumn22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBFRSVExKTDQyNPz+/Pz69PTq5AQCBOzaxOTKpAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARTEMhJq7046813+MJQfUF4BURhHGO6noSBsEcNoDJtS4KcsJQe4ncZ1HYT47HDbDqfUAnJRJmKLIGCCjjJbmE5wBI3EyOFxKCPS1EiJW52dE6vZyIAIf5oQ3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxDb3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3dy5kZXZlbGNvci5jb20AOw==
+viewtext22:view view22 22:photo:22 22:R0lGODlhFgAWAIAAAPwCBAQCBCH5BAEAAAAALAAAAAAWABYAAAIkhI+py+0Po2ShBlOxzbP7n2yaJoLm+ZTcxqHuC6hXzML2HVEFACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=
+viewtree22:view view22 22:photo:22 22:R0lGODlhFgAWAIMAAPwCBAQCBFRSVExKTDQyNPz+/Pz69Pzu5PTq5OzaxBQOFOzKpFRWVFxWXOzexPTexCH5BAEAAAAALAAAAAAWABYAAARPEMhJq704g6A779kHCORAgNskFMYhakE8FkjyBcoWv+JwJItXaELYCTFHlCSpZKKcoB5jYHpOGgUadLKbIRw3jhEzQDyCSuI4zW673yhDBAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/viewIcons.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/viewIcons.rb
new file mode 100644
index 0000000000..fc88eb5c85
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/ICONS/viewIcons.rb
@@ -0,0 +1,329 @@
+#!/usr/bin/env ruby
+#
+#   viewIcons.rb
+#
+#     --  Display icons from icon library.
+#
+#     --  Copy the clicked icon data (command string of creating 
+#         a TkPhotoImage instance) to the clipboard.
+#
+require 'tk'
+require 'tkextlib/ICONS'
+
+class ViewIcons
+  #####################################
+  private
+  #####################################
+  def _create_controls
+    @controls = base = TkFrame.new
+    columns = TkFrame.new(base)
+    line1 = TkFrame.new(base, :height=>2, :borderwidth=>1, :relief=>:sunken)
+    line2 = TkFrame.new(base, :height=>2, :borderwidth=>1, :relief=>:sunken)
+
+    lbl_library = TkLabel.new(base, :font=>@boldfont, :text=>'Library')
+    lbl_groups  = TkLabel.new(base, :font=>@boldfont, :text=>'Groups')
+    lbl_columns = TkLabel.new(base, :font=>@boldfont, :text=>'Columns')
+
+    ent_library = TkEntry.new(base, :width=>50, :textvariable=>@library)
+    ent_groups  = TkEntry.new(base, :width=>50, :textvariable=>@groups)
+
+    btn_browse = TkButton.new(base, :text=>'Browse', 
+                                    :command=>method(:select_icons))
+    btn_view   = TkButton.new(base, :text=>'View',
+                                    :command=>method(:display_icons))
+    btn_exit   = TkButton.new(base, :text=>'Exit', :command=>proc{exit})
+
+    @column_btns = {}
+    6.step(20, 2){|i|
+      @column_btns[i] = TkButton.new(columns, 
+                                     :text=>i.to_s, :width=>2, 
+                                     :command=>proc{set_columns(i)}
+                                     ).pack(:side=>:left)
+    }
+    @column_btns[@columns][:relief] = :sunken
+
+    lbl_library.grid(:row=>0, :column=>0, :padx=>4)
+    ent_library.grid(:row=>0, :column=>1)
+    btn_browse.grid(:row=>0, :column=>2, :padx=>4, :pady=>2, :sticky=>:ew)
+
+    line1.grid(:row=>1, :column=>0, :pady=>2, :columnspan=>3, :sticky=>:ew)
+
+    lbl_groups.grid(:row=>2, :column=>0, :padx=>4)
+    ent_groups.grid(:row=>2, :column=>1)
+    btn_view.grid(:row=>2, :column=>2, :padx=>4, :pady=>2, :sticky=>:ew)
+
+    line1.grid(:row=>3, :column=>0, :pady=>2, :columnspan=>3, :sticky=>:ew)
+
+    lbl_columns.grid(:row=>4, :column=>0, :padx=>4)
+    columns.grid(:row=>4, :column=>1, :padx=>2, :sticky=>:ew)
+    btn_exit.grid(:row=>4, :column=>2, :padx=>4, :pady=>2, :sticky=>:ew)
+
+    base.pack
+
+    ent_library.bind('Return', method(:display_icons), '')
+    ent_groups.bind('Return', method(:display_icons), '')
+  end
+
+  def _create_display
+    base = TkFrame.new(:borderwidth=>2, :relief=>:sunken)
+
+    @icons_window = icons = TkCanvas.new(base)
+    xscr = icons.xscrollbar(TkScrollbar.new(base))
+    yscr = icons.yscrollbar(TkScrollbar.new(base))
+
+    icons.grid(:row=>0, :column=>0, :sticky=>:news)
+    yscr.grid(:row=>0, :column=>1, :sticky=>:ns)
+    xscr.grid(:row=>1, :column=>0, :sticky=>:ew)
+    base.grid_columnconfigure(0, :weight=>1)
+    base.grid_columnconfigure(1, :weight=>0)
+    base.grid_rowconfigure(0, :weight=>1)
+    base.grid_rowconfigure(1, :weight=>0)
+    # yscr.pack(:side=>:right, :fill=>:y)
+    # xscr.pack(:side=>:bottom, :fill=>:x)
+    # icons.pack(:side=>:left, :fill=>:both, :expand=>true)
+
+    @icons_layout = TkFrame.new(icons).pack
+    TkcWindow.create(icons, 0, 0, :anchor=>:nw, :window=>@icons_layout)
+    @icons_layout.bind('Configure', method(:layout_resize), '')
+
+    base.pack(:expand=>true, :fill=>:both)
+  end
+
+  def _create_info_window
+    @info_window = TkToplevel.new(:background=>'lightyellow', :borderwidth=>1, 
+                                  :relief=>:solid){|w|
+      lbl_name = TkLabel.new(w, :text=>'Name', :background=>'lightyellow', 
+                             :font=>@boldfont, :justify=>:left)
+      lbl_grps = TkLabel.new(w, :text=>'Groups', :background=>'lightyellow', 
+                             :font=>@boldfont, :justify=>:left)
+      lbl_type = TkLabel.new(w, :text=>'Type', :background=>'lightyellow', 
+                             :font=>@boldfont, :justify=>:left)
+      lbl_size = TkLabel.new(w, :text=>'Size', :background=>'lightyellow', 
+                             :font=>@boldfont, :justify=>:left)
+
+      lbl_name.grid(:row=>0, :column=>0, :sticky=>:w)
+      lbl_grps.grid(:row=>1, :column=>0, :sticky=>:w)
+      lbl_type.grid(:row=>2, :column=>0, :sticky=>:w)
+      lbl_size.grid(:row=>3, :column=>0, :sticky=>:w)
+
+      @name = TkLabel.new(w, :background=>'lightyellow', :justify=>:left)
+      @grps = TkLabel.new(w, :background=>'lightyellow', :justify=>:left)
+      @type = TkLabel.new(w, :background=>'lightyellow', :justify=>:left)
+      @size = TkLabel.new(w, :background=>'lightyellow', :justify=>:left)
+
+      @name.grid(:row=>0, :column=>1, :sticky=>:w)
+      @grps.grid(:row=>1, :column=>1, :sticky=>:w)
+      @type.grid(:row=>2, :column=>1, :sticky=>:w)
+      @size.grid(:row=>3, :column=>1, :sticky=>:w)
+
+      def name(txt)
+        @name['text'] = txt
+      end
+      def groups(txt)
+        @grps['text'] = txt
+      end
+      def type(txt)
+        @type['text'] = txt
+      end
+      def size(txt)
+        @size['text'] = txt
+      end
+
+      overrideredirect(true)
+      withdraw
+    }
+  end
+
+  def initialize(init_path = Tk::LIBRARY)
+    init_path = Tk::LIBRARY unless init_path
+    init_path = File.expand_path(init_path)
+    if File.directory?(init_path)
+      @initial_dir  = init_path
+      @initial_file = 'tkIcons'
+    else
+      @initial_dir  = File.dirname(init_path)
+      @initial_file = File.basename(init_path)
+    end
+
+    if Tk::PLATFORM['platform'] == 'unix'
+      TkOption.add('*HighlightThickness', 0)
+    end
+
+    @columns = 14
+    @command = ""
+
+    @delay_timer = nil
+
+    dummy = TkLabel.new
+    @font = dummy.font
+    @boldfont = TkFont.new(@font, :weight=>:bold)
+    @icons = {}
+    @icon_name = {}
+    @icon_info = {}
+
+    @library = TkVariable.new(File.join(@initial_dir, @initial_file))
+    @groups  = TkVariable.new('*')
+
+    _create_controls
+
+    _create_display
+
+    _create_info_window
+
+    Tk.root.title('viewIcons')
+    layout_resize
+    Tk.root.resizable(false, true)
+
+    display_icons
+  end
+
+  def init_info(item, name)
+    @icon_name[item] = name
+
+    item.bind('Button-1', method(:clip_info),  '%W')
+    item.bind('Enter',    method(:delay_info), '%W')
+    item.bind('Leave',    method(:cancel_info), '')
+  end
+
+  def delay_info(item)
+    cancel_info
+    @delay_timer = TkTimer.new(200, 1, proc{ show_info(item) }).start
+  end
+
+  def cancel_info
+    if @delay_timer
+      @delay_timer.cancel 
+      @delay_timer = nil
+    end
+    @info_window.withdraw
+  end
+
+  def show_info(item)
+    name, groups, type, size = @icon_info[@icon_name[item]]
+    @info_window.name(name)
+    @info_window.groups(groups)
+    @info_window.type(type)
+    @info_window.size(size)
+
+    info_x = item.winfo_rootx + 10
+    info_y = item.winfo_rooty + item.winfo_height
+
+    @info_window.geometry("+#{info_x}+#{info_y}")
+    @info_window.deiconify
+
+    @info_window.raise
+
+    @delay_timer = nil
+  end
+
+  def primary_transfer(offset, max_chars)
+    @command
+  end
+
+  def lost_selection
+    @command = ""
+  end
+
+  def clip_info(item)
+    name = @icon_name[item]
+    data_width = 60
+
+    cmd = "#{name} = TkPhotoImage.new(:data=><<'EOD')\n"
+
+    icon_data = Tk::ICONS.query(name, :file=>@library.value, :items=>'d')[0][0]
+
+    icon_data.scan(/.{1,#{data_width}}/m){|s| cmd << '   ' << s << "\n"}
+
+    cmd << "EOD\n"
+
+    @command = cmd
+
+    TkClipboard.clear
+    TkClipboard.append(@command)
+
+    if Tk::PLATFORM['platform'] == 'unix'
+      TkSelection.handle(Tk.root, method(:primary_transfer), 
+                         :selection=>'PRIMARY')
+      TkSelection.set_owner(Tk.root, :selection=>'PRIMARY', 
+                            :command=>method(:lost_selection))
+    end
+
+    Tk.bell
+  end
+
+  def layout_resize
+    Tk.update
+    bbox = @icons_window.bbox('all')
+    width = @controls.winfo_width - @icons_window.yscrollbar.winfo_width - 8
+
+    @icons_window.configure(:width=>width, :scrollregion=>bbox, 
+                            :xscrollincrement=>'0.1i', 
+                            :yscrollincrement=>'0.1i')
+  end
+
+  def select_icons
+    new_lib = Tk.getOpenFile(:initialdir=>@initial_dir, 
+                             :initialfile=>'tkIcons', 
+                             :title=>'Select Icon Library', 
+                             :filetypes=>[
+                               ['Icon Libraries', ['tkIcons*']], 
+                               ['All Files', ['*']]
+                             ])
+
+    @library.value = new_lib if new_lib.length != 0
+    display_icons
+  end
+
+  def display_icons
+    column = 0
+    limit = @columns - 1
+    row = 0
+
+    unless File.exist?(@library.value)
+      Tk.messageBox(:icon=>'warning', :message=>'File does not exist', 
+                    :title=>'viewIcons')
+      return
+    end
+
+    cursor = Tk.root[:cursor]
+    Tk.root[:cursor] = 'watch'
+
+    Tk::ICONS.delete(@icons)
+
+    @icons_frame.destroy if @icons_frame
+    @icons_frame = TkFrame.new(@icons_layout).pack
+
+    @icons = Tk::ICONS.create(:file=>@library.value, :group=>@groups.value)
+
+    Tk::ICONS.query(:file=>@library.value, :group=>@groups.value).each{|inf|
+      name = inf[0]
+      @icon_info[name] = inf
+
+      lbl = TkLabel.new(@icons_frame, :image=>"::icon::#{name}")
+      lbl.grid(:column=>column, :row=>row, :padx=>3, :pady=>3)
+      # lbl.grid_columnconfigure column
+
+      init_info(lbl, name)
+
+      if column == limit
+        column = 0
+        row += 1
+      else
+        column += 1
+      end
+    }
+
+    Tk.root[:cursor] = cursor
+  end
+
+  def set_columns(columns)
+    @columns = columns
+    6.step(20, 2){|i| @column_btns[i][:relief] = :raised }
+    @column_btns[@columns][:relief] = :sunken
+    display_icons
+  end
+end
+
+ViewIcons.new(ARGV[0])
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/barchart5.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/barchart5.rb
new file mode 100644
index 0000000000..db181d10ca
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/barchart5.rb
@@ -0,0 +1,101 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/blt'
+
+load File.join(File.dirname(File.expand_path(__FILE__)), 
+               'scripts', 'stipples.rb')
+
+TkOption.add('*graph.x.Title', 'X Axis Label')
+TkOption.add('*graph.y.Title', 'Y Axis Label')
+TkOption.add('*graph.title', 'A Simple Barchart')
+TkOption.add('*graph.x.Font', 'Times 10')
+TkOption.add('*graph.Element.Relief', :raised)
+
+visual = Tk.root.winfo_screenvisual
+if visual != 'staticgray' && visual != 'grayscale'
+  TkOption.add('*graph.LineMarker.color', 'yellow')
+  TkOption.add('*graph.Element.Background', 'white')
+  TkOption.add('*graph.Legend.activeForeground', 'pink')
+  TkOption.add('*print.background', 'yellow')
+  TkOption.add('*quit.background',  'red')
+  TkOption.add('*graph.background', 'palegreen')
+  TkOption.add('*graph.plotBackground', 'lightblue')
+end
+
+htext = Tk::BLT::Htext.new(:widgetname=>'.htext', :text=><<EOD)
+    This is an example of the barchart widget.  The barchart has 
+    many components; x and y axis, legend, crosshairs, elements, etc.  
+    To create a postscript file "bar.ps", press the %%
+
+    ruby {
+    b = TkButton.new(Tk::BLT::Htext::Htext_Widget.window, 
+                     :widgetname=>'print', :text=>'Print', 
+                     :command=>proc{
+                        $graph.postsript(:output=>'bar.ps')
+                     })
+    Tk::BLT::Htext::Htext_Widget.window.append(b)
+    }
+
+%% button.  
+%%
+
+    ruby {
+    $graph = Tk::BLT::Barchart.new(:widgetname=>'.htext.graph', 
+                                   :relief=>:raised, :borderwidth=>2)
+    $graph.xaxis_configure(:rotate=>90, :stepsize=>0)
+    Tk::BLT::Htext::Htext_Widget.window.append($graph, 
+                                               :fill=>:both, :padx=>4)
+    }
+
+%%
+    Hit the %%
+
+    ruby {
+    b = TkButton.new(Tk::BLT::Htext::Htext_Widget.window, 
+                     :widgetname=>'quit', :text=>'Quit', 
+                     :command=>proc{ exit })
+    Tk::BLT::Htext::Htext_Widget.window.append(b)
+    }
+
+%% button when you've seen enough.%%
+
+    ruby {
+    l = TkLabel.new(Tk::BLT::Htext::Htext_Widget.window, :bitmap=>'BLT')
+    Tk::BLT::Htext::Htext_Widget.window.append(l, :padx=>20)
+    }
+
+%%
+EOD
+
+names = %w(One Two Three Four Five Six Seven Eight)
+if visual == 'staticgray' || visual == 'grayscale'
+  fgcolors = %w(white white white white white white white white)
+  bgcolors = %w(black black black black black black black black)
+else
+  fgcolors = %w(yellow orange red magenta purple blue cyan green)
+  bgcolors = %w(yellow4 orange4 red4 magenta4 purple4 blue4 cyan4 green4)
+end
+
+numColors = names.length
+
+Tk::TCL_PRECISION.value = 15
+
+x = Tk::BLT::Vector.new
+y = Tk::BLT::Vector.new
+x.seq(-5.0, 5.0, 0.2)
+y.expr("sin(#{x})")
+barWidth = 0.19
+
+$graph.element_create('sin', :relief=>:raised, :borderwidth=>1, 
+                      :x=>x, :y=>y, :barwidth=>barWidth)
+
+Tk::BLT::Table.add(Tk.root, htext, :fill=>:both)
+
+Tk.root.minsize(0, 0)
+
+Tk::BLT.zoom_stack($graph)
+Tk::BLT.crosshairs($graph)
+Tk::BLT.active_legend($graph)
+Tk::BLT.closest_point($graph)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/calendar.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/calendar.rb
new file mode 100644
index 0000000000..4fc6d64d9e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/calendar.rb
@@ -0,0 +1,117 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+require 'tkextlib/blt'
+
+require 'date'
+
+dir = File.join(File.dirname(File.expand_path(__FILE__)), 'images')
+file = File.join(dir, 'chalk.gif')
+active = File.join(dir, 'rain.gif')
+
+texture1 = TkPhotoImage.new(:file=>file)
+texture2 = TkPhotoImage.new(:file=>active)
+
+TkOption.add('*Tile', texture1)
+
+TkOption.add('*HighlightThickness', 0)
+TkOption.add('*calendar.weekframe*Tile', texture2)
+TkOption.add('*Calendar.Label.borderWidth', 0)
+TkOption.add('*Calendar.Label.relief', :sunken)
+TkOption.add('*Calendar.Frame.borderWidth', 2)
+TkOption.add('*Calendar.Frame.relief', :raised)
+TkOption.add('*Calendar.Label.font', 'Helvetica 11')
+TkOption.add('*Calendar.Label.foreground', 'navyblue')
+TkOption.add('*button.foreground', 'navyblue')
+TkOption.add('*background', 'grey85')
+TkOption.add('*Label.ipadX', 200)
+
+TkOption.add('*tile', texture2)
+
+class BLT_Calendar_sample
+  @@monthInfo = [
+    nil,  # dummy
+    ['January', 31], 
+    ['February', 28], 
+    ['March', 31], 
+    ['April', 30], 
+    ['May', 31], 
+    ['June', 30], 
+    ['July', 31], 
+    ['August', 31], 
+    ['Septembar', 30], 
+    ['October', 31], 
+    ['November', 30], 
+    ['December', 31]
+  ]
+
+  @@abbrDays = [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]
+
+  def initialize()
+    today = Date.today
+
+    if TkComm.bool(Tk.info(:commands, '.calendar'))
+      Tk.destroy('.calendar')
+    end
+    cal = Tk::BLT::Tile::Frame.new(:widgetname=>'.calendar', 
+                                   :classname=>'Calendar', 
+                                   :width=>'3i', :height=>'3i')
+
+    mon = Tk::BLT::Tile::Label.new(cal, :font=>'Courier 14 bold', 
+                                   :text=>"#{@@monthInfo[today.month][0]} " + 
+                                          "#{today.year}")
+    Tk::BLT::Table.add(cal, mon, [1, 0], :cspan=>7, :pady=>10)
+
+    week_f = Tk::BLT::Tile::Frame.new(cal, :widgetname=>'weekframe', 
+                                      :relief=>:sunken, :borderwidth=>1)
+    Tk::BLT::Table.add(cal, week_f, [2, 0], :columnspan=>7, :fill=>:both)
+
+    @@abbrDays.each_with_index{|dayName, idx|
+      Tk::BLT::Table.add(cal, 
+                         Tk::BLT::Tile::Label.new(cal, :text=>dayName, 
+                                                  :font=>'Helvetica 12'), 
+                         [2, idx], :pady=>2, :padx=>2)
+    }
+
+    Tk::BLT::Table.itemconfigure(cal, 'c*', 'r2', :pad=>4)
+
+    numDays = @@monthInfo[today.month][1]
+    week = 0
+    cnt = 1
+
+    wkday = today.wday - ((today.day - 1) % 7)
+    wkday += 7 if wkday < 0
+
+    while cnt <= numDays
+      Tk::BLT::Table.add(cal, 
+                         Tk::BLT::Tile::Label.new(cal, :text=>cnt){
+                           self.configure(:borderwidth=>1, 
+                                          :relief=>:sunken) if cnt == today.day
+                         }, 
+                         [week+3, wkday], :fill=>:both, :ipadx=>10, :ipady=>4)
+      cnt += 1
+      wkday += 1
+      if wkday == 7
+        week += 1
+        wkday = 0
+      end
+    end
+
+    Tk::BLT::Tile::Frame.new(cal, :borderwidth=>1, :relief=>:sunken){|f|
+      Tk::BLT::Table.add(f, 
+                         Tk::BLT::Tile::Button.new(f, :widgetname=>'button', 
+                                                   :command=>proc{exit}, 
+                                                   :borderwidth=>2, 
+                                                   :text=>'Quit'), 
+                         :padx=>4, :pady=>4)
+      Tk::BLT::Table.add(cal, f, [week+4, 5], :cspan=>2, :pady=>4)
+    }
+
+    Tk::BLT::Table.add(Tk.root, cal, :fill=>:both)
+    Tk::BLT::Table.itemconfigure(cal, 'r0', :resize=>:none)
+  end
+end
+
+BLT_Calendar_sample.new
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph6.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph6.rb
new file mode 100644
index 0000000000..f899b44115
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph6.rb
@@ -0,0 +1,2222 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+require 'tkextlib/blt'
+
+Tk::TCL_PRECISION.value = 15
+
+[
+  ['*Graph.Width', '10i'], 
+  ['*Graph.leftMargin', '.75i'], 
+  ['*Graph.Height', '6i'], 
+  ['*Graph.plotBackground', 'black'], 
+  ['*LineMarker.color', 'white'], 
+  ['*LineMarker.Dashes', 5], 
+  ['*TextMarker.foreground', 'white'], 
+  ['*TextMarker.Background', ''], 
+
+  ['*Graph.x.hide', true], 
+  ['*Graph.x.title', ''], 
+  ['*Graph.y.rotate', 90], 
+  # ['*Graph.y.stepSize', 2.0], 
+  ['*Graph.title', ''], 
+  ['*graph.Title', 'Example s27'], 
+  ['*graph.x.hide', false], 
+  ['*graph.topMargin', 0], 
+  ['*graph.bottomMargin', 0], 
+  ['*x.Title', 'Time'], 
+  ['*y.Title', 'Signals'], 
+  ['*Pixels', 1], 
+
+  ['*Reduce', 0.5], 
+  ['*bufferElements', false], 
+
+  ['*Element.color', 'green4'], 
+  ['*Element.ScaleSymbols', true], 
+  ['*Element.Color', 'grey70'], 
+  ['*Element.Symbol', :none], 
+  ['*Element.LineWidth', 1], 
+  # ['*Element.Smooth', :natural], 
+  ['*Element.Smooth', :catrom], 
+
+  ['*activeLine.LineWidth', 2], 
+  ['*activeLine.Color', 'white'], 
+  ['*activeLine.Color', 'green1'], 
+
+  # ['*Legend.Hide', true], 
+  ['*Legend.Position', :right], 
+  ['*Legend.Relief', :flat], 
+  ['*Legend.activeRelief', :sunken], 
+  ['*Legend.borderWidth', 2], 
+  #['*Legend.Font', '-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*'], 
+  ['*Legend.Font', 'Helvetica -10'], 
+  ['*Grid.hide', false], 
+  ['*Grid.dashes', [1, 5]], 
+
+  # ['*foreground', 'white'], 
+  ['*zoomOutline.outline', 'yellow'], 
+].each{|k, v| TkOption.add(k, v)}
+
+##############################
+
+class BLT_Graph_Demo
+  def initialize
+    @graph = Tk::BLT::Graph.new(:widgetname=>'graph')
+
+    @root = Tk.root
+    @root.minsize(0, 0)
+
+    _set_vectors()
+    (1..39).each{|i| @graph.element_create("V#{i}", :x=>@x, :y=>@v[i])}
+
+    @top = Tk::BLT::Tile::Toplevel.new
+=begin
+    legend = Tk::BLT::Graph.new(@top, :widgetname=>'legend', 
+                                :without_creating=>true)
+    @graph.legend_configure(:position=>legend)
+=end
+    # legend = @graph.legend_window_create(@top, :widgetname=>'legend')
+    legend = @graph.legend_window_create(@top)
+    legend.pack(:fill=>:both, :expand=>true)
+
+    Tk::BLT::Table.add(@root, @graph, [0,0], :fill=>:both)
+
+    @quit_btn = Tk::BLT::Tile::Button.new(:text=>' quit ', :background=>'red', 
+                                          :command=>proc{exit})
+    Tk::BLT::Table.add(@root, @quit_btn, [1,0], :anchor=>:e, :padx=>10)
+
+    @graph.zoom_stack
+    @graph.crosshairs
+    @graph.closest_point
+    @graph.print_key
+
+    @graph.legend_bind(:all, 'ButtonRelease-1', 
+                       proc{|w| highlightTrace(w)}, '%W')
+    @graph.legend_bind(:all, 'ButtonRelease-3', 
+                       proc{|w|
+                         w.legend_deactivate('*')
+                         active = w.element_activate
+                         w.element_deactivate(*active)
+                       }, '%W')
+  end
+
+  private
+
+  def _set_vectors
+    @x = Tk::BLT::Vector.new(:variable=>'')
+    @v = []
+    (1..39).each{|i| @v[i] = Tk::BLT::Vector.new(:variable=>'')}
+
+    @x.set(<<-'EOD')
+    0 1e-10 2e-10 3e-10 4e-10 5e-10 6e-10 7e-10 8e-10 9e-10 
+    1e-09 1.1e-09 1.2e-09 1.3e-09 1.4e-09 1.5e-09 1.6e-09 1.7e-09 
+    1.8e-09 1.9e-09 2e-09 2.1e-09 2.2e-09 2.3e-09 2.4e-09 2.5e-09 
+    2.6e-09 2.7e-09 2.8e-09 2.9e-09 3e-09 3.1e-09 3.2e-09 3.3e-09 
+    3.4e-09 3.5e-09 3.6e-09 3.7e-09 3.8e-09 3.9e-09 4e-09 4.1e-09 
+    4.2e-09 4.3e-09 4.4e-09 4.5e-09 4.6e-09 4.7e-09 4.8e-09 
+    4.9e-09 5e-09 5.1e-09 5.2e-09 5.3e-09 5.4e-09 5.5e-09 5.6e-09 
+    5.7e-09 5.8e-09 5.9e-09 6e-09 6.1e-09 6.2e-09 6.3e-09 6.4e-09 
+    6.5e-09 6.6e-09 6.7e-09 6.8e-09 6.9e-09 7e-09 7.1e-09 7.2e-09 
+    7.3e-09 7.4e-09 7.5e-09 7.6e-09 7.7e-09 7.8e-09 7.9e-09 
+    8e-09 8.1e-09 8.2e-09 8.3e-09 8.4e-09 8.5e-09 8.6e-09 8.7e-09 
+    8.8e-09 8.9e-09 9e-09 9.1e-09 9.2e-09 9.3e-09 9.4e-09 9.5e-09 
+    9.6e-09 9.7e-09 9.8e-09 9.9e-09 1e-08 1.01e-08 1.02e-08 
+    1.03e-08 1.04e-08 1.05e-08 1.06e-08 1.07e-08 1.08e-08 1.09e-08 
+    1.1e-08 1.11e-08 1.12e-08 1.13e-08 1.14e-08 1.15e-08 1.16e-08 
+    1.17e-08 1.18e-08 1.19e-08 1.2e-08 1.21e-08 1.22e-08 1.23e-08 
+    1.24e-08 1.25e-08 1.26e-08 1.27e-08 1.28e-08 1.29e-08 1.3e-08 
+    1.31e-08 1.32e-08 1.33e-08 1.34e-08 1.35e-08 1.36e-08 1.37e-08 
+    1.38e-08 1.39e-08 1.4e-08 1.41e-08 1.42e-08 1.43e-08 1.44e-08 
+    1.45e-08 1.46e-08 1.47e-08 1.48e-08 1.49e-08 1.5e-08 1.51e-08 
+    1.52e-08 1.53e-08 1.54e-08 1.55e-08 1.56e-08 1.57e-08 1.58e-08 
+    1.59e-08 1.6e-08 1.61e-08 1.62e-08 1.63e-08 1.64e-08 1.65e-08 
+    1.66e-08 1.67e-08 1.68e-08 1.69e-08 1.7e-08 1.71e-08 1.72e-08 
+    1.73e-08 1.74e-08 1.75e-08 1.76e-08 1.77e-08 1.78e-08 1.79e-08 
+    1.8e-08 1.81e-08 1.82e-08 1.83e-08 1.84e-08 1.85e-08 1.86e-08 
+    1.87e-08 1.88e-08 1.89e-08 1.9e-08 1.91e-08 1.92e-08 1.93e-08 
+    1.94e-08 1.95e-08 1.96e-08 1.97e-08 1.98e-08 1.99e-08 2e-08 
+    2.01e-08 2.02e-08 2.03e-08 2.04e-08 2.05e-08 2.06e-08 2.07e-08 
+    2.08e-08 2.09e-08 2.1e-08 2.11e-08 2.12e-08 2.13e-08 2.14e-08 
+    2.15e-08 2.16e-08 2.17e-08 2.18e-08 2.19e-08 2.2e-08 2.21e-08 
+    2.22e-08 2.23e-08 2.24e-08 2.25e-08 2.26e-08 2.27e-08 2.28e-08 
+    2.29e-08 2.3e-08 2.31e-08 2.32e-08 2.33e-08 2.34e-08 2.35e-08 
+    2.36e-08 2.37e-08 2.38e-08 2.39e-08 2.4e-08 2.41e-08 2.42e-08 
+    2.43e-08 2.44e-08 2.45e-08 2.46e-08 2.47e-08 2.48e-08 2.49e-08 
+    2.5e-08 2.51e-08 2.52e-08 2.53e-08 2.54e-08 2.55e-08 2.56e-08 
+    2.57e-08 2.58e-08 2.59e-08 2.6e-08 2.61e-08 2.62e-08 2.63e-08 
+    2.64e-08 2.65e-08 2.66e-08 2.67e-08 2.68e-08 2.69e-08 2.7e-08 
+    2.71e-08 2.72e-08 2.73e-08 2.74e-08 2.75e-08 2.76e-08 2.77e-08 
+    2.78e-08 2.79e-08 2.8e-08 2.81e-08 2.82e-08 2.83e-08 2.84e-08 
+    2.85e-08 2.86e-08 2.87e-08 2.88e-08 2.89e-08 2.9e-08 2.91e-08 
+    2.92e-08 2.93e-08 2.94e-08 2.95e-08 2.96e-08 2.97e-08 2.98e-08 
+    2.99e-08 3e-08 3.01e-08 3.02e-08 3.03e-08 3.04e-08 3.05e-08 
+    3.06e-08 3.07e-08 3.08e-08 3.09e-08 3.1e-08 3.11e-08 3.12e-08 
+    3.13e-08 3.14e-08 3.15e-08 3.16e-08 3.17e-08 3.18e-08 3.19e-08 
+    3.2e-08 3.21e-08 3.22e-08 3.23e-08 3.24e-08 3.25e-08 3.26e-08 
+    3.27e-08 3.28e-08 3.29e-08 3.3e-08 3.31e-08 3.32e-08 3.33e-08 
+    3.34e-08 3.35e-08 3.36e-08 3.37e-08 3.38e-08 3.39e-08 3.4e-08 
+    3.41e-08 3.42e-08 3.43e-08 3.44e-08 3.45e-08 3.46e-08 3.47e-08 
+    3.48e-08 3.49e-08 3.5e-08 3.51e-08 3.52e-08 3.53e-08 3.54e-08 
+    3.55e-08 3.56e-08 3.57e-08 3.58e-08 3.59e-08 3.6e-08 
+    EOD
+
+    @v[1].set(<<-'EOD')
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    EOD
+
+    @v[2].set(<<-'EOD')
+    0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 
+    5.32907e-15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 
+    5 5 5 5 5 5 5 5 5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 
+    EOD
+
+    @v[3].set(<<-'EOD')
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 8.88178e-16 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 2.13718e-14 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 
+    EOD
+
+    @v[4].set(<<-'EOD')
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    EOD
+
+    @v[5].set(<<-'EOD')
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 4 3 2 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    EOD
+
+    @v[6].set(<<-'EOD')
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 8.88178e-16 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 1 2 3 4 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 4 3 2 1 2.13718e-14 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+    0 0 0 0 
+    EOD
+
+    @v[7].set(<<-'EOD')
+    5 5.16904 4.84159 3.34542 0.317102 0.103304 0.0275721 0.0221534 
+    0.017689 0.0142639 0.0113974 0.00918238 0.00742541 0.00616602 
+    0.00481195 0.00397049 -0.0659889 -0.025671 0.165495 0.986891 
+    3.05229 4.55511 4.91611 4.98192 4.99428 4.99833 4.99095 
+    4.97295 4.95493 4.93428 4.90723 4.94799 4.98584 4.99566 
+    4.99813 4.99907 4.99947 4.99965 4.99976 4.99984 4.99989 
+    4.99992 4.99994 4.99996 4.99998 5.00002 5.00006 5.00002 
+    4.99996 4.99994 4.99999 5.00003 5.00002 5 4.99997 4.99997 
+    4.99997 4.99997 4.99997 4.99996 4.99997 4.99997 4.99998 
+    4.99998 4.99999 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99998 4.99998 4.99998 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5.16575 
+    4.69986 2.43862 0.0230224 0.035229 -0.0210607 -0.0292766 
+    -0.0172693 -0.00271479 -0.000912251 -0.000349106 -0.000116866 
+    -4.24733e-05 -1.39536e-05 -3.01179e-05 -0.0657192 -0.0204835 
+    0.183378 1.07181 3.118 4.46472 4.84158 4.94795 4.98173 4.99236 
+    4.99762 5.01939 5.0433 5.05332 5.04959 5.03955 5.02851 5.02052 
+    5.01422 5.00965 5.00631 5.00405 5.00248 5.00083 5.00012 
+    5.00209 5.00387 5.00347 4.99917 4.99213 4.98411 4.97521 
+    4.96332 4.94601 4.9304 4.94633 4.97936 4.99264 4.99685 4.99857 
+    4.99925 4.99954 4.9997 4.99973 4.9997 4.99973 4.99979 4.99983 
+    4.99986 4.99988 4.9999 4.9999 4.99992 4.99993 4.99994 4.99995 
+    4.99996 4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    5 5 5 5.00001 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 
+    5.00002 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 5 5 5.14242 4.76101 3.16003 0.299374 
+    0.0645506 -0.000498424 -2.45108e-05 -2.27986e-05 -5.24401e-05 
+    -4.9884e-05 -4.92491e-05 -2.93354e-05 -3.21402e-05 -2.11851e-05 
+    -3.37925e-05 -0.0657892 -0.020563 0.182582 1.06058 3.12484 
+    4.46552 4.84146 4.95102 4.98556 4.99472 4.99806 4.99909 
+    4.99955 4.99976 4.99994 4.99992 5.00029 4.99967 4.99849 
+    4.99736 4.99884 5.00099 5.00377 5.00215 4.99994 4.99893 
+    4.99788 4.99862 5.00055 5.00134 5.00127 5.00073 5.00039 
+    5.00018 5.00006 5.00001 4.99985 5.00026 5.00018 5.00003 
+    4.99981 4.99985 4.99987 4.99985 4.99982 4.99982 4.99982 
+    4.99983 4.99985 4.99987 4.99989 4.99991 4.99992 4.99994 
+    4.99995 4.99995 4.99994 4.99994 4.99996 4.99999 5.00002 
+    5.00008 5.00009 5.00006 5.00001 5 4.99999 4.99998 4.99997 
+    4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 4.99999 
+    4.99999 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99998 4.99998 
+    4.99998 
+    EOD
+
+    @v[8].set(<<-'EOD')
+    5 5.03758 5.04711 4.96911 4.20882 3.96295 4.01117 4.15521 
+    4.2967 4.42274 4.5295 4.6176 4.69014 4.74831 4.7966 4.83537 
+    4.80526 4.787 4.79295 4.88588 5.08978 5.15615 5.10778 5.07718 
+    5.06652 5.08225 4.9744 4.52977 3.77452 2.69426 1.15294 0.245509 
+    0.0981544 0.0567527 0.0367487 0.0252578 0.0180599 0.0133837 
+    0.0101497 0.0078616 0.00620186 0.00499056 0.0041027 0.00344223 
+    0.00295808 0.00260089 0.00229887 0.00200817 0.00176397 0.00160116 
+    0.00147381 0.00134645 0.00125029 0.00116043 0.00107371 0.00101981 
+    0.000965921 0.000912028 0.000858135 0.000804242 0.000761669 
+    0.00072672 0.000691771 0.000656823 0.000621874 0.000588722 
+    0.00057041 0.000552098 0.000533785 0.000515473 0.000497162 
+    0.00047885 0.000460537 0.000442226 0.000423914 0.000405601 
+    0.000388399 0.000378694 0.000368989 0.000359284 0.00034958 
+    0.000339875 0.00033017 0.000320465 0.00031076 0.000301055 
+    0.00029135 0.000282207 0.000276247 0.000270287 0.000264327 
+    0.000258367 0.000252407 0.000246447 0.000240487 0.000234527 
+    0.000228567 0.000222607 0.000217086 0.000213696 0.000210307 
+    0.000206918 0.000203528 0.000200139 0.00019675 0.00019336 
+    0.000189971 0.000186582 0.000183192 0.000179803 0.000176414 
+    0.000173025 0.000169635 0.000166246 0.000162857 0.000159467 
+    0.000156078 0.000152689 0.000149299 0.00014591 0.00014255 
+    0.0316021 0.163272 0.348732 0.603651 0.35745 0.135965 0.0707354 
+    0.0314595 0.0201047 0.00994945 0.00389601 0.00138839 0.00060778 
+    0.000329648 0.000492396 -0.0732035 -0.0844077 -0.0789062 
+    -0.0390837 0.0197559 0.0183094 -0.00180099 -0.0189565 -0.0424144 
+    -0.0735904 -0.0892423 0.285039 1.13702 2.10809 2.95826 3.60164 
+    4.0435 4.35771 4.57254 4.71769 4.81329 4.87534 4.91487 4.94264 
+    4.97375 5.01526 5.06517 5.10154 5.06259 4.89005 4.5787 4.12226 
+    3.46151 2.49023 1.2586 0.32725 0.116753 0.0701865 0.0455509 
+    0.0286914 0.0178176 0.0117599 0.00902715 0.00760583 0.00637745 
+    0.00543811 0.00439377 0.00352448 0.0030151 0.00285771 0.002465 
+    0.00203114 0.00173004 0.0014839 0.00125177 0.00105327 0.000894905 
+    0.000766372 0.000658894 0.000569105 0.000492114 0.000427938 
+    0.000370217 0.000314758 0.000266569 0.000233726 0.000209048 
+    0.000191957 0.000177169 0.000166604 0.000161 0.000157314 
+    0.000143828 0.000130342 0.000116857 0.000103371 8.98855e-05 
+    7.63998e-05 6.29141e-05 5.76583e-05 5.30027e-05 4.8347e-05 
+    4.36913e-05 3.90357e-05 3.438e-05 2.97243e-05 2.72507e-05 
+    2.59083e-05 2.45659e-05 2.32235e-05 2.18811e-05 2.05387e-05 
+    1.91963e-05 1.78539e-05 1.65115e-05 1.51691e-05 1.38267e-05 
+    1.24843e-05 1.11419e-05 9.79954e-06 8.51574e-06 7.69807e-06 
+    6.8804e-06 6.06273e-06 5.24506e-06 0.0287318 0.0317111 -0.0320087 
+    -0.103609 0.0369639 0.0121128 0.00961197 0.00934971 0.00820853 
+    0.00699769 0.00607002 0.00535541 0.00476552 0.00427601 0.00376357 
+    -0.073012 -0.0866964 -0.0809538 -0.038005 0.0277001 0.0188906 
+    0.00614597 0.00373629 0.00489787 0.0146573 0.0191052 0.0151708 
+    0.0124224 0.0105859 0.00879272 0.00729464 0.0070047 0.00449575 
+    -0.00626652 -0.0252417 -0.0147287 0.022538 0.0822905 0.0947372 
+    0.0657516 0.0445506 0.0316753 0.0220971 0.0158101 0.0140971 
+    0.0161498 0.0139876 0.0122447 0.0106994 0.009397 0.00822236 
+    0.00686509 0.00797431 0.00751269 0.00671173 0.00595243 0.00524633 
+    0.00459528 0.00401688 0.00350109 0.00303954 0.00260569 0.00222792 
+    0.00191033 0.00163917 0.00140949 0.00121464 0.0010471 0.000900638 
+    0.000768847 0.000645236 0.000524807 0.000460275 0.000442237 
+    0.000446775 0.000397026 0.000301585 0.000228994 0.000190894 
+    0.000166569 0.000152261 0.000137953 0.000123644 0.000109336 
+    9.50281e-05 8.56557e-05 7.78437e-05 7.00318e-05 6.22198e-05 
+    5.44079e-05 4.87539e-05 4.57761e-05 4.27982e-05 3.98203e-05 
+    3.68425e-05 3.38646e-05 3.08868e-05 2.79089e-05 2.4931e-05 
+    2.19532e-05 1.89753e-05 1.75244e-05 1.64095e-05 1.52946e-05 
+    1.41797e-05 1.30648e-05 1.19499e-05 1.0835e-05 9.72011e-06 
+    8.60521e-06 7.4903e-06 6.5117e-06 6.10334e-06 5.69497e-06 
+    5.2866e-06 4.87824e-06 4.46987e-06 4.06151e-06 3.65314e-06 
+    3.24477e-06 
+    EOD
+
+    @v[9].set(<<-'EOD')
+    1.86175 1.99708 2.07867 2.01211 2.43309 3.27194 3.63896 
+    3.90426 4.11074 4.27932 4.41496 4.52543 4.61491 4.68862 
+    4.7479 4.79666 4.72895 4.68886 4.70354 4.81353 5.01568 5.14184 
+    5.10482 5.07362 5.05143 5.03638 5.02323 5.01465 5.00853 
+    5.00383 4.99985 5.00454 5.00652 5.00546 5.00411 5.003 5.00214 
+    5.00151 5.00106 5.00073 5.0005 5.00034 5.00023 5.00015 5.0001 
+    5.00005 5 5.00001 5.00005 5.00005 5.00003 5 4.99998 4.99996 
+    4.99994 4.99995 4.99997 4.99998 5 5.00001 5.00002 5.00002 
+    5.00003 5.00003 5.00003 5.00003 5.00003 5.00003 5.00002 
+    5.00002 5.00001 5.00001 5.00001 5 5 5 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998 
+    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 5 5 5 5 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.17392 4.94828 3.78491 
+    1.52079 0.608874 0.244031 0.127087 0.0552995 0.0361032 0.0169025 
+    0.006364 0.00217624 0.000921391 0.000457305 0.000786754 
+    -0.120016 -0.148054 -0.15898 -0.0801463 0.16463 0.174017 
+    0.0799249 0.0318788 0.0129696 0.00483397 0.0025677 0.0042079 
+    0.00350003 0.00178404 -8.72902e-05 -0.00128497 -0.00142213 
+    -0.00130018 -0.00106874 -0.000789207 -0.000824335 -0.00104518 
+    -0.00136799 -0.004366 -0.0102621 -0.0109254 -0.00649259 
+    -0.00194842 0.00029793 0.00148673 0.00221085 0.00228291 
+    0.00185261 0.00139687 0.00148183 0.00562266 0.00844119 0.00754627 
+    0.00657396 0.00591212 0.00539269 0.0049282 0.00448417 0.0040572 
+    0.00363719 0.00320392 0.00279607 0.00243938 0.00211505 0.00182302 
+    0.00156254 0.0013341 0.00113834 0.000971865 0.00082776 0.000706193 
+    0.000602499 0.000515059 0.000441401 0.00037897 0.000325459 
+    0.00028083 0.000242096 0.000207274 0.000176444 0.000150372 
+    0.000126407 0.000103373 9.05522e-05 8.53555e-05 8.63685e-05 
+    9.02593e-05 8.37346e-05 7.72099e-05 7.06852e-05 6.41605e-05 
+    5.76358e-05 5.11112e-05 4.45865e-05 4.08176e-05 3.72497e-05 
+    3.36818e-05 3.01138e-05 2.65459e-05 2.2978e-05 1.94101e-05 
+    1.76154e-05 1.67399e-05 1.58645e-05 1.4989e-05 1.41136e-05 
+    1.32381e-05 1.23626e-05 1.14872e-05 1.06117e-05 9.73629e-06 
+    8.86083e-06 7.98538e-06 7.10993e-06 6.23447e-06 5.44363e-06 
+    5.32578e-06 5.20792e-06 5.09007e-06 4.97222e-06 0.0784323 
+    0.0474527 -0.0764232 -0.151146 0.0615785 0.0144489 0.00974161 
+    0.00947176 0.00849005 0.00728201 0.00630581 0.00554032 0.00487809 
+    0.00441504 0.00384139 -0.118943 -0.149894 -0.161173 -0.0825299 
+    0.171686 0.176912 0.0816085 0.0335236 0.013791 0.0056976 
+    0.00238833 0.00105348 0.000526199 0.00025969 0.000396026 
+    0.000837835 0.00170131 0.00196699 -0.000553314 -0.0061621 
+    -0.0111895 -0.0142698 -0.0124608 -0.00795847 -0.00467822 
+    -0.0043058 -0.00874449 -0.0118584 -0.00871386 -0.00377892 
+    1.95244e-05 0.00218952 0.00325486 0.00386497 0.00422837 
+    0.00446883 0.00447065 0.00486647 0.00547838 0.00565398 0.00559092 
+    0.00538752 0.00507015 0.00466305 0.00420756 0.00373465 0.00328404 
+    0.00287059 0.00250057 0.00216124 0.00184861 0.00156815 0.00134624 
+    0.00117857 0.00103412 0.0008948 0.000761012 0.000619853 
+    0.000462614 0.000319965 0.000287666 0.000356415 0.000379946 
+    0.000339183 0.00027972 0.000252982 0.000226244 0.000199507 
+    0.000172769 0.000146031 0.000130097 0.000117578 0.000105059 
+    9.25401e-05 8.00213e-05 7.11204e-05 6.67061e-05 6.22918e-05 
+    5.78775e-05 5.34632e-05 4.90489e-05 4.46346e-05 4.02203e-05 
+    3.5806e-05 3.13916e-05 2.69773e-05 2.4827e-05 2.31747e-05 
+    2.15225e-05 1.98702e-05 1.8218e-05 1.65658e-05 1.49135e-05 
+    1.32613e-05 1.1609e-05 9.95678e-06 8.50108e-06 7.86765e-06 
+    7.23422e-06 6.60079e-06 5.96736e-06 5.33393e-06 4.7005e-06 
+    4.06707e-06 3.43363e-06 
+    EOD
+
+    @v[10].set(<<-'EOD')
+    1.86175 1.99308 2.16619 2.46661 3.09359 3.76864 4.31299 
+    4.65564 4.83425 4.92153 4.96157 4.98063 4.98649 4.99039 
+    4.9945 4.9972 4.96206 4.89882 4.83865 4.83202 4.91016 5.04479 
+    5.06078 5.04827 5.03474 5.0246 5.01639 5.00996 5.00569 5.00239 
+    5.00043 5.00296 5.00437 5.00382 5.00287 5.00208 5.00148 
+    5.00104 5.00073 5.0005 5.00034 5.00023 5.00016 5.00011 5.00008 
+    5.00007 5.00007 5.00004 5 4.99998 4.99998 4.99997 4.99998 
+    4.99999 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001 
+    5.00001 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 5 5 5 5 5 5 5 5 5 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 5.10081 
+    5.10949 4.98359 5.00733 5.15145 4.37298 2.36126 0.470759 
+    0.0577238 0.0115884 0.00262611 0.000671499 0.000389038 0.000291291 
+    0.000317347 -0.0167823 -0.0158344 -0.0140559 0.0104849 0.0865874 
+    0.107813 0.0524688 0.0214369 0.00876443 0.00341595 0.00170778 
+    0.00259042 0.0022241 0.00118519 1.10217e-06 -0.000784506 
+    -0.000948169 -0.000856256 -0.000696719 -0.000485987 -0.000724787 
+    -0.000981491 -0.001454 -0.00552498 -0.0114992 -0.0105266 
+    -0.00543527 -0.000982798 0.00127356 0.00224212 0.00275439 
+    0.00281098 0.0025471 0.00230368 0.00222576 0.00485522 0.00729453 
+    0.00691796 0.0062615 0.00573987 0.0052688 0.00481185 0.00436934 
+    0.00394326 0.00352712 0.00309978 0.00270038 0.00235335 0.00203742 
+    0.00175256 0.00150067 0.00128126 0.00109323 0.000933619 
+    0.000795113 0.000678182 0.00057843 0.000494345 0.000423609 
+    0.000363821 0.000312766 0.000269856 0.000232389 0.000198382 
+    0.000168126 0.00014267 0.000119293 9.69034e-05 8.5669e-05 
+    8.26828e-05 8.64066e-05 9.26665e-05 8.5454e-05 7.82416e-05 
+    7.10291e-05 6.38167e-05 5.66043e-05 4.93918e-05 4.21794e-05 
+    3.86073e-05 3.53007e-05 3.19941e-05 2.86876e-05 2.5381e-05 
+    2.20744e-05 1.87678e-05 1.70933e-05 1.62648e-05 1.54363e-05 
+    1.46079e-05 1.37794e-05 1.2951e-05 1.21225e-05 1.12941e-05 
+    1.04656e-05 9.63716e-06 8.80871e-06 7.98026e-06 7.1518e-06 
+    6.32335e-06 5.5374e-06 5.08959e-06 4.64178e-06 4.19397e-06 
+    3.74616e-06 0.0438026 0.0242078 -0.0602019 -0.0840866 0.00148461 
+    -0.00292489 0.000442098 0.00219489 0.00281478 0.00290756 
+    0.00277945 0.00263896 0.00240099 0.00223283 0.001947 -0.0153629 
+    -0.0148815 -0.0128673 0.0126017 0.0905161 0.11051 0.0538958 
+    0.022562 0.00935726 0.00397422 0.00172534 0.000790207 0.000416322 
+    0.000191632 0.000469721 0.0009779 0.00192566 0.00200688 
+    -0.0016502 -0.00733932 -0.0128113 -0.0147608 -0.0115456 
+    -0.00668995 -0.00401368 -0.00463908 -0.0101197 -0.0118993 
+    -0.0076276 -0.00262656 0.000813059 0.00264455 0.00350796 
+    0.00399494 0.0043049 0.00451658 0.00444739 0.00503842 0.00559516 
+    0.00568213 0.00556459 0.0053176 0.00496654 0.00454337 0.00408592 
+    0.00362171 0.00317793 0.00277001 0.00240394 0.00207009 0.00176575 
+    0.00149725 0.00129045 0.00114257 0.00101135 0.000871672 
+    0.000723764 0.000580438 0.000427507 0.000296956 0.000281834 
+    0.000376628 0.000412266 0.000367547 0.000295305 0.000264513 
+    0.000233721 0.000202929 0.000172137 0.000141345 0.000124721 
+    0.000112577 0.000100433 8.82893e-05 7.61453e-05 6.75517e-05 
+    6.33609e-05 5.91701e-05 5.49792e-05 5.07884e-05 4.65976e-05 
+    4.24067e-05 3.82159e-05 3.40251e-05 2.98342e-05 2.56434e-05 
+    2.36401e-05 2.21181e-05 2.05961e-05 1.90741e-05 1.75521e-05 
+    1.60301e-05 1.45081e-05 1.29861e-05 1.14641e-05 9.94208e-06 
+    8.59252e-06 7.96439e-06 7.33626e-06 6.70813e-06 6.07999e-06 
+    5.45186e-06 4.82373e-06 4.1956e-06 3.56747e-06 
+    EOD
+
+    @v[11].set(<<-'EOD')
+    1.86175 1.73419 1.42874 1.04055 0.943004 0.268275 0.0826455 
+    0.0388346 0.0214104 0.0135431 0.00961322 0.00712846 0.00588262 
+    0.00432397 0.00377774 0.00270134 -0.00393731 -0.00542187 
+    -0.00126596 0.0113777 0.0134522 0.00477056 -0.00211067 -0.00229253 
+    -0.00173355 -0.00122404 -0.00113426 -0.000744931 -0.000520112 
+    -0.000410048 -0.000220439 0.000508104 5.15856e-05 -0.000112593 
+    -0.000118917 -9.57394e-05 -7.15727e-05 -5.11847e-05 -3.58275e-05 
+    -2.47166e-05 -1.68866e-05 -1.14082e-05 -7.66646e-06 -5.12139e-06 
+    -3.63426e-06 -3.01815e-06 -2.64862e-06 -1.4947e-06 -1.91403e-07 
+    -2.5763e-08 -7.73699e-07 -1.52164e-06 -1.07268e-06 -3.81696e-07 
+    2.6727e-07 4.75489e-07 6.83708e-07 8.91926e-07 1.10014e-06 
+    1.30836e-06 1.2482e-06 1.00726e-06 7.66311e-07 5.25364e-07 
+    2.84417e-07 6.27857e-08 7.43904e-10 -6.12979e-08 -1.2334e-07 
+    -1.85382e-07 -2.47423e-07 -3.09465e-07 -3.71507e-07 -4.33549e-07 
+    -4.95591e-07 -5.57633e-07 -6.04571e-07 -5.4944e-07 -4.9431e-07 
+    -4.3918e-07 -3.84049e-07 -3.28919e-07 -2.73789e-07 -2.18659e-07 
+    -1.63528e-07 -1.08398e-07 -5.32678e-08 1.062e-09 5.08502e-08 
+    1.00638e-07 1.50427e-07 2.00215e-07 2.50003e-07 2.99791e-07 
+    3.4958e-07 3.99368e-07 4.49156e-07 4.98944e-07 5.34512e-07 
+    5.01032e-07 4.67553e-07 4.34073e-07 4.00593e-07 3.67113e-07 
+    3.33633e-07 3.00153e-07 2.66674e-07 2.33194e-07 1.99714e-07 
+    1.66234e-07 1.32754e-07 9.92744e-08 6.57945e-08 3.23147e-08 
+    -1.16513e-09 -3.4645e-08 -6.81248e-08 -1.01605e-07 -1.35084e-07 
+    -1.68564e-07 -2.18729e-07 0.0114926 -0.0245378 -0.111828 
+    0.0964775 1.61491 3.22668 4.22041 4.54492 4.82845 4.94868 
+    4.98588 4.99609 4.9981 4.99908 4.99788 4.98395 4.99294 4.99724 
+    5.01939 5.0471 5.00902 4.98194 4.98496 4.99188 4.99623 4.99862 
+    5.00025 4.99974 4.99953 4.99946 4.99958 5.00012 4.99997 
+    4.99992 4.99988 4.99985 4.9998 4.9997 4.9988 4.99806 4.99982 
+    5.00143 5.00159 5.00098 5.00053 5.00028 5.00007 4.99977 
+    4.99992 5.00005 5.00133 5.0009 4.99993 4.99972 4.99975 4.9998 
+    4.99982 4.99983 4.99983 4.99983 4.99983 4.99984 4.99986 
+    4.99987 4.99989 4.9999 4.99991 4.99992 4.99994 4.99995 4.99995 
+    4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 4.99998 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    5 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002 
+    5.00002 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 5 5 5.01457 4.99482 4.96561 4.99326 
+    5.03452 5.00424 5.00101 5.00045 5.00004 4.99965 4.99997 
+    4.99994 4.99958 4.99999 4.99936 4.9839 4.99248 4.99717 5.01976 
+    5.04869 5.0087 4.98143 4.98488 4.99199 4.99622 4.9983 4.99928 
+    4.99971 4.99986 5.00031 5.00022 5.00035 5.0001 4.99884 4.99811 
+    4.99803 4.99887 5.00078 5.00151 5.00116 5.00007 4.99843 
+    4.99915 5.00107 5.00168 5.00141 5.00092 5.00055 5.0003 5.00016 
+    5.0001 5.00001 5.00016 5.0002 5.00009 4.99993 4.99975 4.99984 
+    4.99991 4.99991 4.99982 4.99974 4.99974 4.99985 4.99995 
+    4.99999 4.99998 5.00004 5.00013 5.00015 5.00007 4.99988 
+    4.99982 4.99985 4.99995 5.00006 5.0002 5.00025 5.0002 5.00009 
+    5.00006 5.00004 5.00002 5 4.99998 4.99997 4.99998 4.99998 
+    4.99999 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 
+    4.99998 4.99998 4.99998 
+    EOD
+
+    @v[12].set(<<-'EOD')
+    5 5.16975 4.78685 2.94241 0.126698 0.0487004 -0.00422591 
+    -0.00130689 -0.000486756 -0.000195875 -0.000108988 -6.66736e-05 
+    -7.26005e-05 -5.63608e-05 -3.81859e-05 -2.123e-05 -0.0646846 
+    -0.0184474 0.182248 1.06731 3.10988 4.46133 4.84133 4.95113 
+    4.98364 4.99455 4.99694 4.99727 4.9994 4.99975 5.0001 5.00132 
+    5.00089 5.00039 5.00019 5.00011 5.00006 5.00005 5.00004 
+    5.00001 4.99992 4.99992 5.00002 5.00013 5.00017 5.00009 
+    4.99992 4.99991 4.99994 4.99996 4.99998 4.99999 5.00001 
+    5.00004 5.00006 5.00005 5.00004 5.00003 5.00002 5.00001 
+    5 4.99999 4.99999 4.99998 4.99998 4.99997 4.99997 4.99998 
+    4.99998 4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 
+    5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 5 5.14699 4.78074 
+    3.19424 0.305663 0.0611255 -0.00179951 -0.0012032 0.000405978 
+    0.000989399 0.000445194 0.000191447 8.30476e-05 3.96236e-05 
+    1.91866e-05 1.70665e-05 -0.0655239 -0.0210234 0.1827 1.06848 
+    3.11554 4.46518 4.84212 4.94853 4.98244 4.99434 4.9997 5.00081 
+    5.00009 4.99972 4.99985 4.99974 4.9995 4.99949 4.99958 4.99973 
+    4.99948 4.99914 4.99874 4.99946 5.00309 5.0091 5.01576 5.01835 
+    5.01852 5.0176 5.01625 5.01479 5.01345 5.01264 5.011 5.01092 
+    5.01344 5.01363 5.01289 5.01184 5.01071 5.00956 5.00848 
+    5.00751 5.00663 5.00577 5.00497 5.00427 5.00365 5.0031 5.00264 
+    5.00224 5.00191 5.00163 5.00138 5.00117 5.00099 5.00083 
+    5.00071 5.00061 5.00053 5.00045 5.00037 5.00029 5.00022 
+    5.00019 5.0002 5.00023 5.00024 5.00023 5.00023 5.00022 5.0002 
+    5.00018 5.00016 5.00014 5.00011 5.00009 5.00007 5.00006 
+    5.00005 5.00005 5.00004 5.00003 5.00002 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 
+    5.00002 5.00001 5.00001 5.00001 5.14298 4.79809 3.32704 
+    0.498385 0.105773 0.0160646 0.0319912 0.0299434 0.0240102 
+    0.0185844 0.0130411 0.0106532 0.00864871 0.00744519 0.00660887 
+    -0.0612913 -0.0203719 0.174998 0.991787 3.06292 4.60005 
+    4.93058 4.98917 5.00033 4.9999 4.99909 4.9966 4.9955 4.99488 
+    4.99374 4.9943 5.00131 5.00506 4.99311 4.96288 4.93567 4.92439 
+    4.94236 4.9732 4.98864 4.99458 5.00031 5.00694 5.01525 5.01945 
+    5.01998 5.01953 5.01874 5.01766 5.0164 5.01509 5.01326 5.01423 
+    5.01455 5.01361 5.01245 5.01122 5.01002 5.00888 5.00783 
+    5.00687 5.00596 5.00514 5.00442 5.00379 5.00325 5.00279 
+    5.0024 5.00208 5.0018 5.00153 5.00126 5.00107 5.00094 5.00085 
+    5.00078 5.00072 5.00063 5.00053 5.00042 5.00038 5.00034 
+    5.0003 5.00027 5.00023 5.00021 5.00019 5.00017 5.00015 5.00013 
+    5.00012 5.00011 5.0001 5.0001 5.00009 5.00008 5.00007 5.00007 
+    5.00006 5.00005 5.00005 5.00004 5.00004 5.00003 5.00003 
+    5.00002 5.00002 5.00002 5.00001 5.00001 5 5 5 5.00001 5.00001 
+    5.00001 5.00002 5.00002 5.00002 5.00002 
+    EOD
+
+    @v[13].set(<<-'EOD')
+    9.73784e-10 0.0189926 0.0926769 0.206309 0.111533 0.0953491 
+    0.0426966 0.0214177 0.0117943 0.00741442 0.00528816 0.00398417 
+    0.0032967 0.00266499 0.00206647 0.00158788 -0.0371391 -0.0439528 
+    -0.0408653 -0.0188706 0.0150241 0.0126852 0.00209817 -0.000239206 
+    -5.31488e-05 0.000876324 -0.00451221 -0.0165223 -0.0284127 
+    -0.0427584 -0.0502453 -0.0257366 -0.00903938 -0.00376456 
+    -0.00233385 -0.00169922 -0.00130397 -0.00102542 -0.000811435 
+    -0.000648115 -0.000529266 -0.00043795 -0.00036574 -0.00030716 
+    -0.00026221 -0.000229662 -0.000205112 -0.000181038 -0.000162045 
+    -0.000148988 -0.000137633 -0.000126278 -0.000115562 -0.000104976 
+    -9.49324e-05 -9.0585e-05 -8.62375e-05 -8.18901e-05 -7.75426e-05 
+    -7.31952e-05 -6.93752e-05 -6.59106e-05 -6.24461e-05 -5.89815e-05 
+    -5.55169e-05 -5.22412e-05 -5.05263e-05 -4.88114e-05 -4.70966e-05 
+    -4.53817e-05 -4.36668e-05 -4.19519e-05 -4.0237e-05 -3.85222e-05 
+    -3.68073e-05 -3.50924e-05 -3.34782e-05 -3.25442e-05 -3.16102e-05 
+    -3.06763e-05 -2.97423e-05 -2.88083e-05 -2.78744e-05 -2.69404e-05 
+    -2.60064e-05 -2.50725e-05 -2.41385e-05 -2.32635e-05 -2.27232e-05 
+    -2.21829e-05 -2.16426e-05 -2.11023e-05 -2.0562e-05 -2.00217e-05 
+    -1.94814e-05 -1.89411e-05 -1.84007e-05 -1.78604e-05 -1.73647e-05 
+    -1.70853e-05 -1.68059e-05 -1.65265e-05 -1.62471e-05 -1.59677e-05 
+    -1.56883e-05 -1.54089e-05 -1.51295e-05 -1.48501e-05 -1.45707e-05 
+    -1.42913e-05 -1.40119e-05 -1.37325e-05 -1.34531e-05 -1.31737e-05 
+    -1.28943e-05 -1.26149e-05 -1.23355e-05 -1.20561e-05 -1.17767e-05 
+    -1.14973e-05 -1.10954e-05 0.0152675 0.0228237 -0.00460678 
+    -0.0341525 0.0232109 -0.0138039 -0.0416538 -0.0458764 -0.0201967 
+    -0.00878316 -0.00379173 -0.00164621 -0.000785131 -0.00037575 
+    -0.000352375 -0.0545586 -0.0746881 -0.0771865 -0.05386 -0.0022199 
+    0.0136703 0.00633526 0.00138826 -0.00108934 0.0038886 0.0298077 
+    0.0475776 0.0481003 0.0464167 0.047818 0.042789 0.035207 
+    0.0264423 0.0193959 0.0151614 0.00624257 -0.00913057 -0.0310696 
+    -0.0430238 0.016426 0.189762 0.49025 0.820116 1.13919 1.43549 
+    1.70658 1.95183 2.17414 2.38506 2.5657 2.73958 2.97905 3.21403 
+    3.43025 3.62645 3.8028 3.96002 4.09996 4.22443 4.33427 4.42886 
+    4.51097 4.5817 4.64326 4.6957 4.74132 4.7797 4.81298 4.84102 
+    4.86512 4.88523 4.90224 4.91649 4.92846 4.93868 4.94755 
+    4.95483 4.96114 4.96682 4.97161 4.97502 4.9776 4.97944 4.98141 
+    4.98319 4.98467 4.98585 4.9869 4.98796 4.98902 4.99008 4.99114 
+    4.9922 4.99326 4.9938 4.99429 4.99479 4.99528 4.99578 4.99628 
+    4.99677 4.99704 4.99718 4.99733 4.99747 4.99762 4.99777 
+    4.99791 4.99806 4.9982 4.99835 4.9985 4.99864 4.99879 4.99893 
+    4.99907 4.99916 4.99925 4.99934 4.99943 5.01473 4.92293 
+    4.61974 4.0316 3.7835 3.74195 3.78344 3.87272 3.97386 4.07319 
+    4.16686 4.25256 4.33126 4.40264 4.46697 4.49249 4.51807 
+    4.55803 4.64055 4.78574 4.86074 4.88334 4.8999 4.91455 4.92814 
+    4.93926 4.94761 4.95433 4.95907 4.9654 4.98317 5.0208 5.05134 
+    4.85852 4.16041 3.00077 1.68376 0.672707 0.240838 0.0794725 
+    -0.0106347 -0.00879443 0.107196 0.368163 0.701424 1.03581 
+    1.3601 1.6678 1.95731 2.22701 2.47544 2.69099 2.92327 3.16648 
+    3.3877 3.59067 3.77344 3.93584 4.08066 4.20863 4.32065 4.41791 
+    4.50211 4.57423 4.63614 4.68888 4.73377 4.7721 4.80519 4.83338 
+    4.85732 4.87815 4.89514 4.90927 4.92108 4.93122 4.94014 
+    4.94845 4.95601 4.96251 4.96576 4.969 4.97225 4.9755 4.97874 
+    4.98087 4.98265 4.98442 4.9862 4.98797 4.98924 4.9899 4.99055 
+    4.9912 4.99186 4.99251 4.99316 4.99381 4.99447 4.99512 4.99577 
+    4.99609 4.99634 4.99659 4.99683 4.99708 4.99732 4.99757 
+    4.99782 4.99806 4.99831 4.99853 4.99863 4.99873 4.99883 
+    4.99893 4.99903 4.99913 4.99923 4.99933 
+    EOD
+
+    @v[14].set(<<-'EOD')
+    1.86175 2.00147 1.85141 1.0654 0.275481 0.205547 0.0712627 
+    0.0313387 0.0151431 0.00864531 0.00593861 0.00438111 0.0037479 
+    0.00305857 0.00221221 0.0017081 -0.0896128 -0.109079 -0.121356 
+    -0.0542001 0.175821 0.177442 0.0814591 0.0333042 0.0134909 
+    0.00625777 0.00100092 -0.00552776 -0.00411139 -0.00150395 
+    -0.000564784 3.48169e-05 -0.000287014 -0.000538515 -0.000456537 
+    -0.000325677 -0.000275468 -0.000166452 -8.27481e-05 -8.28704e-05 
+    -7.47644e-05 -4.60552e-05 -2.61481e-06 2.26359e-05 2.53852e-05 
+    -1.39853e-06 -4.23456e-05 -4.0907e-05 -2.8501e-05 -1.5945e-05 
+    -9.01122e-06 -2.07747e-06 1.49328e-06 4.38398e-06 6.84248e-06 
+    4.76711e-06 2.69173e-06 6.16362e-07 -1.45901e-06 -3.53438e-06 
+    -4.14256e-06 -3.76238e-06 -3.3822e-06 -3.00202e-06 -2.62184e-06 
+    -2.24878e-06 -1.93456e-06 -1.62033e-06 -1.3061e-06 -9.91867e-07 
+    -6.77638e-07 -3.63409e-07 -4.91792e-08 2.6505e-07 5.7928e-07 
+    8.93509e-07 1.16076e-06 1.11055e-06 1.06034e-06 1.01014e-06 
+    9.59927e-07 9.09719e-07 8.59511e-07 8.09302e-07 7.59094e-07 
+    7.08886e-07 6.58678e-07 5.99251e-07 4.87523e-07 3.75795e-07 
+    2.64068e-07 1.5234e-07 4.06119e-08 -7.1116e-08 -1.82844e-07 
+    -2.94572e-07 -4.063e-07 -5.18027e-07 -6.08517e-07 -5.95879e-07 
+    -5.83241e-07 -5.70604e-07 -5.57966e-07 -5.45328e-07 -5.3269e-07 
+    -5.20053e-07 -5.07415e-07 -4.94777e-07 -4.8214e-07 -4.69502e-07 
+    -4.56864e-07 -4.44226e-07 -4.31589e-07 -4.18951e-07 -4.06313e-07 
+    -3.93676e-07 -3.81038e-07 -3.684e-07 -3.55762e-07 -3.43125e-07 
+    1.06736e-05 0.0797407 0.0437947 -0.0645098 -0.0877312 0.0653203 
+    -0.00621184 -0.0353188 -0.0491378 -0.0251957 -0.0110996 
+    -0.00481123 -0.0020941 -0.000998038 -0.000478747 -0.000445332 
+    -0.102046 -0.135753 -0.154351 -0.0827509 0.163348 0.174012 
+    0.0794822 0.0310624 0.0112213 0.00249061 0.00130764 0.00181315 
+    0.00163875 0.00101454 0.000497435 0.000195258 5.31901e-05 
+    2.4607e-05 6.62736e-05 7.90718e-05 4.0372e-05 -0.000141184 
+    -0.000280623 5.5608e-05 0.000799565 0.000920189 0.000931616 
+    0.000494527 0.000162303 -8.24884e-05 -0.000183938 -0.000203899 
+    -0.000144788 -9.87063e-05 -0.000227929 2.93932e-05 0.000208563 
+    1.88958e-06 -7.6335e-05 -0.000172472 -0.000165656 -0.000145889 
+    -0.000177311 -0.000191058 -0.000168287 -0.00015755 -0.00013142 
+    -8.10488e-05 -6.36115e-05 -7.8699e-05 -8.11282e-05 -7.98625e-05 
+    -5.98807e-05 -3.40879e-05 -1.95464e-05 -1.79247e-05 -4.45514e-05 
+    -7.47995e-05 -8.7682e-05 -7.50806e-05 -3.25561e-05 -4.34114e-05 
+    -7.69099e-05 -0.000141101 -0.00018743 -0.000148471 -5.06546e-05 
+    0.000120195 0.000177635 0.000177052 0.000146344 9.75126e-05 
+    8.31233e-05 6.8734e-05 5.43447e-05 3.99554e-05 2.55661e-05 
+    1.11768e-05 -3.21253e-06 -3.88937e-06 -3.56628e-06 -3.24318e-06 
+    -2.92008e-06 -2.59699e-06 -2.27389e-06 -1.9508e-06 -1.73227e-06 
+    -1.56796e-06 -1.40365e-06 -1.23934e-06 -1.07503e-06 -9.10722e-07 
+    -7.46412e-07 -5.82101e-07 -4.1779e-07 -2.5348e-07 -8.91694e-08 
+    7.51412e-08 2.39452e-07 4.03762e-07 5.95733e-07 1.00771e-06 
+    1.41969e-06 1.83167e-06 2.24365e-06 0.0828257 0.231038 0.465438 
+    1.54516 2.8461 3.19221 3.40395 3.6382 3.80758 3.93848 4.04882 
+    4.15428 4.247 4.32917 4.40235 4.36941 4.397 4.48862 4.64552 
+    4.86595 5.03475 5.0348 5.02627 5.01967 5.01542 5.00925 4.98613 
+    4.9519 4.91581 4.87357 4.82302 4.80403 4.82565 4.86102 4.89483 
+    4.92253 4.94428 4.96257 4.97608 4.98373 4.98823 4.99182 
+    4.99437 4.99635 4.99745 4.99802 4.99843 4.99873 4.99895 
+    4.99912 4.99925 4.99931 4.99962 4.99973 4.99972 4.99971 
+    4.9997 4.99969 4.9997 4.99971 4.99973 4.99974 4.99976 4.99978 
+    4.9998 4.99982 4.99985 4.99987 4.99989 4.9999 4.99991 4.99991 
+    4.99993 4.99994 4.99997 5.00001 5.00006 5.00008 5.00006 
+    5.00002 5 4.99999 4.99998 4.99997 4.99995 4.99995 4.99995 
+    4.99995 4.99995 4.99995 4.99995 4.99996 4.99997 4.99997 
+    4.99998 4.99999 5 5 5.00001 5.00002 5.00002 5.00002 5.00002 
+    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5 5 5 4.99999 4.99999 4.99999 
+    EOD
+
+    @v[15].set(<<-'EOD')
+    1.86175 2.00199 2.08919 1.84314 1.08254 0.214737 0.0377351 
+    0.00952455 0.00232763 0.000563614 0.000263477 0.000148642 
+    0.000285086 0.000242592 7.34699e-05 -1.53467e-05 -0.0161874 
+    -0.0157876 -0.0141194 0.0132576 0.0903272 0.109938 0.0535295 
+    0.0224216 0.00940945 0.00466825 -0.000649972 -0.00654752 
+    -0.00333248 -0.00103671 -0.000508276 -5.8896e-05 -0.00043938 
+    -0.000544704 -0.00044444 -0.000307093 -0.00024517 -0.000154538 
+    -8.78602e-05 -7.10461e-05 -6.06485e-05 -3.91039e-05 -8.45988e-06 
+    9.43442e-06 1.28351e-05 -2.16734e-06 -2.6142e-05 -2.54768e-05 
+    -1.88997e-05 -1.17906e-05 -7.3808e-06 -2.97101e-06 1.19146e-07 
+    2.94246e-06 5.38942e-06 3.88851e-06 2.38761e-06 8.86704e-07 
+    -6.14201e-07 -2.11511e-06 -2.59565e-06 -2.38885e-06 -2.18205e-06 
+    -1.97525e-06 -1.76845e-06 -1.56241e-06 -1.36258e-06 -1.16276e-06 
+    -9.62939e-07 -7.63116e-07 -5.63293e-07 -3.6347e-07 -1.63647e-07 
+    3.61756e-08 2.35999e-07 4.35822e-07 6.07653e-07 5.90323e-07 
+    5.72994e-07 5.55665e-07 5.38336e-07 5.21007e-07 5.03678e-07 
+    4.86349e-07 4.6902e-07 4.51691e-07 4.34361e-07 4.11899e-07 
+    3.60315e-07 3.08731e-07 2.57146e-07 2.05562e-07 1.53977e-07 
+    1.02393e-07 5.08082e-08 -7.76222e-10 -5.23607e-08 -1.03945e-07 
+    -1.47815e-07 -1.54225e-07 -1.60635e-07 -1.67045e-07 -1.73455e-07 
+    -1.79864e-07 -1.86274e-07 -1.92684e-07 -1.99094e-07 -2.05504e-07 
+    -2.11914e-07 -2.18324e-07 -2.24734e-07 -2.31144e-07 -2.37554e-07 
+    -2.43964e-07 -2.50373e-07 -2.56783e-07 -2.63193e-07 -2.69603e-07 
+    -2.76013e-07 -2.82423e-07 2.92534e-06 0.0446777 0.024278 
+    -0.0518987 -0.0636547 0.00983929 -0.000518204 -0.000265194 
+    0.000154772 0.000299538 3.12715e-05 -3.18225e-05 -2.48268e-05 
+    -1.16701e-05 -6.05117e-06 7.61116e-06 -0.0163668 -0.0158244 
+    -0.0141177 0.0100085 0.0857144 0.107784 0.051862 0.0204448 
+    0.00629858 0.000967736 0.00121674 0.00190276 0.00154009 
+    0.000860922 0.000410386 0.000164585 3.99493e-05 1.93797e-05 
+    5.67594e-05 0.000110126 2.49925e-05 -7.17815e-05 -0.000142299 
+    -1.63109e-05 0.000439529 0.000562489 0.000594599 0.000326164 
+    0.000126423 -4.26063e-05 -0.000122927 -0.000114152 -6.72706e-05 
+    -6.41242e-05 -0.000135588 2.61507e-05 0.000134036 6.43734e-06 
+    -4.6223e-05 -0.000112047 -0.000101388 -8.67847e-05 -0.000117664 
+    -0.000133957 -0.000116558 -0.000100873 -7.65448e-05 -4.44964e-05 
+    -3.6677e-05 -5.26632e-05 -5.45172e-05 -5.13545e-05 -3.73869e-05 
+    -1.99732e-05 -1.0907e-05 -1.10081e-05 -3.02609e-05 -5.18517e-05 
+    -6.13597e-05 -5.30706e-05 -2.39572e-05 -3.24146e-05 -5.70062e-05 
+    -0.000103448 -0.000135376 -0.0001024 -2.39007e-05 0.000110929 
+    0.000151226 0.000142044 0.000105922 5.62834e-05 4.78476e-05 
+    3.94117e-05 3.09759e-05 2.25401e-05 1.41042e-05 5.66837e-06 
+    -2.76747e-06 -3.08639e-06 -2.81341e-06 -2.54043e-06 -2.26745e-06 
+    -1.99447e-06 -1.72149e-06 -1.44851e-06 -1.26226e-06 -1.12096e-06 
+    -9.79661e-07 -8.38363e-07 -6.97065e-07 -5.55768e-07 -4.1447e-07 
+    -2.73173e-07 -1.31875e-07 9.42259e-09 1.5072e-07 2.92018e-07 
+    4.33315e-07 5.74613e-07 7.10363e-07 8.01984e-07 8.93604e-07 
+    9.85225e-07 1.07685e-06 0.04474 0.0928765 0.141327 0.0176048 
+    -0.071675 -0.0124613 0.989022 2.28104 3.40619 4.21417 4.67173 
+    4.87438 4.96044 4.98996 4.99858 4.96672 4.89502 4.79391 
+    4.76433 4.8387 4.98612 5.0161 5.01722 5.01437 5.01256 4.99827 
+    4.95807 4.9209 4.88217 4.83006 4.78461 4.80759 4.85548 4.89604 
+    4.9254 4.94617 4.96126 4.97374 4.98255 4.98792 4.99126 4.99361 
+    4.99554 4.99699 4.99792 4.99846 4.99881 4.99905 4.99924 
+    4.99938 4.99949 4.99955 4.9997 4.9998 4.99982 4.99982 4.99982 
+    4.99982 4.99982 4.99983 4.99984 4.99985 4.99986 4.99987 
+    4.99988 4.99989 4.9999 4.99992 4.99993 4.99994 4.99995 4.99995 
+    4.99996 4.99996 4.99998 4.99999 5.00001 5.00002 5.00002 
+    5.00001 5.00001 5 4.99999 4.99999 4.99998 4.99998 4.99998 
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 
+    4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    EOD
+
+    @v[16].set(<<-'EOD')
+    1.86175 1.73073 1.50572 1.89001 3.39004 4.36034 4.79012 
+    4.93798 4.98305 4.99539 4.9979 4.99904 4.99772 4.9983 4.99935 
+    4.99975 4.98837 4.99456 4.99728 5.01838 5.04568 5.00759 
+    4.98112 4.98479 4.99197 4.99641 4.99747 4.99775 5.00043 
+    5.0007 5.00035 5.00023 4.99976 5.00002 5.00007 5.0002 4.99993 
+    5.00003 5.00021 5.00006 4.99993 4.99992 5.00002 5.00013 
+    5.00017 5.00009 4.99992 4.99991 4.99993 4.99996 4.99998 
+    4.99999 5.00001 5.00003 5.00005 5.00004 5.00004 5.00003 
+    5.00002 5.00001 5 4.99999 4.99999 4.99998 4.99998 4.99997 
+    4.99997 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 
+    4.99999 4.99999 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00002 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 5 5.01498 4.99342 4.96899 5.00301 5.02627 4.9977 
+    4.99548 4.99757 5.00277 5.00245 5.0014 5.00069 5.00032 5.00014 
+    5.00009 4.9867 4.99262 4.99607 5.01805 5.04713 5.00927 4.98184 
+    4.98483 4.9914 4.99616 4.99902 4.9999 4.99987 4.99979 4.99981 
+    4.99989 4.99994 4.99998 5.0002 5.00001 5.00008 5.00008 5.0001 
+    5.00021 5.00032 5.00025 5.00019 5.00006 5.00007 4.99994 
+    4.99997 4.99999 5.00023 5.00008 4.99993 4.99998 4.99986 
+    4.99982 5.00003 4.99985 4.99996 5.00014 5 4.99984 4.99979 
+    4.99982 4.99993 5.00008 5.00011 5.00002 4.99996 4.9999 4.99994 
+    5.00001 5.00007 5.00009 4.99995 4.99978 4.99971 4.99976 
+    4.99997 4.99996 4.99989 4.99972 4.99955 4.99953 4.99959 
+    4.99976 4.9999 5.00005 5.00023 5.00039 5.00034 5.00029 5.00024 
+    5.00019 5.00014 5.00009 5.00004 5.00003 5.00002 5.00001 
+    5 5 4.99999 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 
+    5.00001 5.00002 5.00003 5.00004 5.01564 5.03395 5.04932 
+    5.11868 3.92502 1.31888 0.163888 0.0946876 0.0789578 0.0565084 
+    0.0260333 0.0156986 0.00907667 0.00613629 0.00468417 -0.00174008 
+    -0.0021422 0.000586962 0.0124937 0.0147977 0.00838454 0.00039383 
+    -0.000522021 -0.000426598 -0.000290214 -0.00173713 -0.00384132 
+    -0.00382945 -0.00429219 -0.00580193 -0.00393246 0.0017543 
+    0.00423045 0.00408931 0.0031976 0.00245457 0.00187293 0.00159068 
+    0.00105697 0.000609902 0.000358825 0.000334125 0.000212708 
+    0.000168116 8.97349e-05 5.21578e-05 3.84527e-05 2.93033e-05 
+    2.10067e-05 1.59954e-05 1.13917e-05 5.49738e-06 2.77217e-05 
+    6.51259e-06 -6.65468e-06 2.09837e-06 -6.617e-06 -4.80187e-06 
+    1.55031e-06 4.26536e-06 7.69457e-07 -1.46213e-06 -7.25202e-07 
+    3.26501e-06 6.55807e-06 7.524e-06 6.07209e-06 6.00701e-06 
+    5.41166e-06 3.86573e-06 1.10651e-06 -2.74603e-06 -2.18566e-06 
+    2.3658e-06 8.59956e-06 8.35046e-06 2.90621e-06 -8.75982e-07 
+    -1.87189e-06 -2.1528e-06 -1.94875e-06 -1.74471e-06 -1.54067e-06 
+    -1.33662e-06 -1.13258e-06 -8.40567e-07 -5.20743e-07 -2.00918e-07 
+    1.18906e-07 4.38731e-07 6.11382e-07 6.01529e-07 5.91675e-07 
+    5.81822e-07 5.71968e-07 5.62115e-07 5.52261e-07 5.42407e-07 
+    5.32554e-07 5.227e-07 5.12847e-07 4.72812e-07 4.26137e-07 
+    3.79462e-07 3.32786e-07 2.86111e-07 2.39436e-07 1.92761e-07 
+    1.46086e-07 9.94107e-08 5.27356e-08 -2.77779e-10 -7.98079e-08 
+    -1.59338e-07 -2.38868e-07 -3.18398e-07 -3.97928e-07 -4.77458e-07 
+    -5.56988e-07 -6.36519e-07 
+    EOD
+
+    @v[17].set(<<-'EOD')
+    5 5.16963 4.84136 3.33754 0.316206 0.103113 0.0273341 0.0221102 
+    0.0177008 0.0143758 0.0115203 0.00929231 0.00752716 0.00625439 
+    0.00489872 0.00403656 -0.0657317 -0.0256467 0.165394 0.985963 
+    3.05067 4.55799 4.89728 4.92464 4.8882 4.90592 4.97315 4.99241 
+    4.99694 4.99845 4.99905 4.99939 4.99959 4.99971 4.9998 4.99986 
+    4.9999 4.99993 4.99995 4.99996 4.99997 4.99998 4.99998 4.99999 
+    4.99999 4.99999 4.99999 4.99999 5 5.00001 5.00003 5.00005 
+    5.00004 5.00002 5 4.99999 4.99999 4.99998 4.99998 4.99997 
+    4.99997 4.99998 4.99998 4.99999 4.99999 5 5 5 5 5 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00002 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5 
+    5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998 
+    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 5 5 5 5 5 5 5.00025 5.1657 4.69981 2.43895 
+    0.0229743 0.0351406 -0.0211974 -0.0312063 -0.0160331 -0.0021718 
+    -0.000766597 -0.000251052 -5.49363e-05 -3.36364e-06 -2.01983e-06 
+    -9.70575e-06 -0.0657007 -0.0205247 0.183332 1.07163 3.11839 
+    4.46213 4.84163 4.95195 4.99159 5.02084 5.04029 5.04138 
+    5.0271 5.00445 4.97957 4.95702 4.95231 4.97819 4.99191 4.9963 
+    4.99822 4.99878 4.99903 4.99925 4.99942 4.9995 4.99954 4.99957 
+    4.99961 4.99966 4.9997 4.99974 4.99977 4.99981 4.99983 4.99986 
+    4.99988 4.9999 4.99991 4.99992 4.99994 4.99995 4.99995 4.99996 
+    4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00001 5.00001 5.00001 
+    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 
+    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5 5 5 4.99999 4.99998 4.99997 4.99996 5.14239 4.76219 
+    3.16574 0.299969 0.0631609 -0.00118611 -0.00026052 -5.96333e-05 
+    -1.44904e-05 -4.3859e-06 -2.99454e-06 1.10547e-06 4.84662e-06 
+    1.30971e-05 2.23082e-05 -0.0655844 -0.0204818 0.182507 1.05954 
+    3.12277 4.46735 4.83915 4.94512 4.97679 4.98654 4.9966 5.00833 
+    5.00776 5.00432 5.00199 5.00086 5.00033 5.00008 5 5.00001 
+    5 5.00005 5.00002 4.99981 4.99991 4.99998 4.99979 4.99979 
+    4.99984 4.9998 4.9998 5.00006 5.00002 5.00001 5 5 4.99992 
+    4.99998 4.99999 5.00002 5.00014 4.99999 4.99987 4.99993 
+    5.00003 5.00011 5.00005 4.99996 4.99987 4.99985 4.99994 
+    5.00009 5.0001 5 4.99993 4.99997 5.00008 5.00015 5.00021 
+    5.00021 5.00007 4.99978 4.99965 4.99973 4.9999 4.99992 4.99995 
+    4.99997 4.99999 5.00001 5.00002 5.00001 5.00001 5.00001 
+    5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 5.00001 5.00002 
+    5.00002 5.00002 
+    EOD
+
+    @v[18].set(<<-'EOD')
+    5 5.0333 5.02472 4.92559 4.18383 3.93923 3.9961 4.14293 
+    4.28591 4.41336 4.52157 4.61101 4.68472 4.7439 4.79294 4.83239 
+    4.80697 4.78808 4.79322 4.8838 5.08529 5.21863 4.88852 3.90198 
+    2.14586 0.383977 0.101103 0.0525711 0.0318287 0.020895 0.0146908 
+    0.010831 0.00830272 0.00656377 0.00532066 0.00440078 0.00369956 
+    0.00315713 0.00272614 0.00237965 0.00209659 0.00186339 0.00167014 
+    0.0015081 0.00137172 0.00125607 0.00115393 0.00106076 0.000980166 
+    0.000918015 0.000862837 0.00080766 0.000763488 0.000721541 
+    0.000680825 0.000653026 0.000625226 0.000597426 0.000569627 
+    0.000541827 0.000519087 0.000499756 0.000480424 0.000461093 
+    0.000441761 0.000423291 0.000411941 0.00040059 0.00038924 
+    0.000377889 0.000366539 0.000355188 0.000343838 0.000332487 
+    0.000321137 0.000309786 0.000299055 0.000292509 0.000285963 
+    0.000279417 0.000272871 0.000266325 0.000259779 0.000253233 
+    0.000246686 0.00024014 0.000233594 0.000227387 0.0002231 
+    0.000218813 0.000214526 0.00021024 0.000205953 0.000201666 
+    0.000197379 0.000193092 0.000188805 0.000184519 0.000180526 
+    0.000177963 0.0001754 0.000172837 0.000170274 0.000167711 
+    0.000165148 0.000162585 0.000160022 0.000157459 0.000154895 
+    0.000152332 0.000149769 0.000147206 0.000144643 0.00014208 
+    0.000139517 0.000136954 0.000134391 0.000131828 0.000129265 
+    0.000126702 0.000132838 0.0311184 0.163151 0.34986 0.604501 
+    0.357125 0.136137 0.0711304 0.0346959 0.0212674 0.00872193 
+    0.00252206 0.000455269 7.59332e-05 2.91532e-05 0.000320562 
+    -0.0720911 -0.0840491 -0.0791345 -0.0404143 0.0182035 -0.0235871 
+    -0.0426072 -0.0597501 0.00824773 0.481404 1.32496 2.11949 
+    2.57317 2.58202 2.15054 1.33786 0.45702 0.153772 0.0913584 
+    0.0604989 0.0421591 0.0271456 0.0170021 0.0115815 0.00907886 
+    0.00742466 0.00626096 0.00531127 0.00450501 0.00381927 0.00323718 
+    0.00274374 0.00232494 0.00196885 0.00166686 0.00141134 0.00119437 
+    0.0010109 0.000855534 0.000723378 0.000611408 0.000516704 
+    0.000436769 0.000369523 0.000313026 0.00026526 0.000223976 
+    0.000188972 0.000159042 0.000134148 0.000112688 9.49738e-05 
+    7.97877e-05 6.721e-05 5.65115e-05 4.77194e-05 4.03591e-05 
+    3.42848e-05 2.92627e-05 2.50435e-05 2.1412e-05 1.84532e-05 
+    1.58624e-05 1.34673e-05 1.14461e-05 1.00935e-05 9.12375e-06 
+    8.50202e-06 7.81431e-06 7.20729e-06 6.73936e-06 6.3702e-06 
+    5.90049e-06 5.43077e-06 4.96105e-06 4.49133e-06 4.02162e-06 
+    3.5519e-06 3.08218e-06 2.79099e-06 2.51281e-06 2.23463e-06 
+    1.95645e-06 1.67827e-06 1.40009e-06 1.12191e-06 1.01376e-06 
+    9.9375e-07 9.73741e-07 9.53733e-07 9.33724e-07 9.13715e-07 
+    8.93707e-07 8.73698e-07 8.5369e-07 8.33681e-07 8.13673e-07 
+    7.93664e-07 7.73655e-07 7.53647e-07 7.21781e-07 5.956e-07 
+    4.69419e-07 3.43239e-07 2.17058e-07 0.0284032 0.0374438 
+    -0.0157543 -0.0680497 0.0504768 0.0100294 0.00222261 0.000528697 
+    0.000132929 3.99489e-05 2.46066e-05 4.56327e-06 -6.54853e-06 
+    1.33783e-05 -3.68221e-05 -0.0724498 -0.0843663 -0.0792935 
+    -0.0406426 0.0200019 0.0426259 0.0220753 0.00668555 -0.000968483 
+    0.024662 0.0383437 0.0911513 0.087848 0.0602076 0.0390559 
+    0.0260573 0.0180444 0.012974 0.00985409 0.00788132 0.0064228 
+    0.005545 0.00453571 0.00364245 0.00310278 0.00270523 0.00236439 
+    0.0020945 0.00186808 0.00167493 0.00151731 0.00138594 0.00126945 
+    0.00116695 0.0010762 0.000996366 0.000928387 0.000864414 
+    0.000808258 0.000759574 0.000713865 0.000666712 0.000632716 
+    0.000601262 0.000572163 0.000543986 0.000515253 0.0004897 
+    0.000468112 0.000449313 0.000432981 0.000417911 0.000401307 
+    0.000382712 0.000366678 0.000355736 0.000349171 0.000335727 
+    0.000317091 0.000296086 0.000283543 0.000277366 0.000272233 
+    0.000267001 0.000263147 0.000256699 0.000250251 0.000243803 
+    0.000237355 0.000230907 0.000225424 0.000220247 0.000215069 
+    0.000209892 0.000204714 0.000200213 0.000196548 0.000192884 
+    0.00018922 0.000185556 0.000181892 0.000178228 0.000174564 
+    0.0001709 0.000167236 0.000163572 0.000160824 0.000158279 
+    0.000155733 0.000153187 0.000150641 0.000148095 0.000145549 
+    0.000143003 0.000140457 0.000137911 0.000135457 0.000133386 
+    0.000131315 0.000129245 0.000127174 0.000125103 0.000123032 
+    0.000120961 0.000118891 
+    EOD
+
+    @v[19].set(<<-'EOD')
+    1.86175 1.99994 2.0833 2.01627 2.42503 3.25769 3.62134 3.88827 
+    4.09688 4.26773 4.40529 4.51734 4.60827 4.68313 4.74346 
+    4.79302 4.72815 4.68959 4.70421 4.81316 5.01375 5.14493 
+    5.10305 5.0699 5.04484 5.03751 5.03348 5.02504 5.01799 5.01271 
+    5.00895 5.00628 5.0044 5.00309 5.00216 5.00151 5.00105 5.00073 
+    5.00051 5.00034 5.00023 5.00015 5.0001 5.00007 5.00003 4.99998 
+    4.99993 4.99993 4.99995 4.99999 5.00001 5.00003 5.00002 
+    5.00001 5 5 5 5 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00017 5.17398 
+    4.94779 3.78508 1.52302 0.608808 0.244311 0.126053 0.0597175 
+    0.038422 0.0158174 0.00481338 0.00107847 0.000301256 0.000114861 
+    0.00059489 -0.118904 -0.147478 -0.158986 -0.080544 0.165361 
+    0.171378 0.0776087 0.0435738 0.0428235 0.0423755 0.0347695 
+    0.0225061 0.0155539 0.0121357 0.0107997 0.0103976 0.0124406 
+    0.016814 0.0167556 0.0149852 0.01459 0.0141182 0.0131934 
+    0.0120286 0.0108692 0.0097184 0.00855881 0.00744912 0.00643877 
+    0.00554044 0.00475165 0.00406535 0.00347158 0.00295981 0.00251995 
+    0.00214318 0.00182101 0.00154613 0.00131196 0.0011119 0.000941587 
+    0.000796999 0.000674582 0.000571283 0.000484276 0.000410649 
+    0.000347005 0.000292984 0.000246715 0.000208143 0.00017489 
+    0.000147412 0.000123854 0.000104332 8.77229e-05 7.40686e-05 
+    6.2637e-05 5.32e-05 4.53946e-05 3.88343e-05 3.31864e-05 
+    2.85905e-05 2.45725e-05 2.08671e-05 1.77301e-05 1.55911e-05 
+    1.40153e-05 1.29421e-05 1.18693e-05 1.09815e-05 1.03484e-05 
+    9.87664e-06 9.14446e-06 8.41228e-06 7.68011e-06 6.94793e-06 
+    6.21575e-06 5.48357e-06 4.7514e-06 4.38454e-06 4.04432e-06 
+    3.7041e-06 3.36388e-06 3.02366e-06 2.68344e-06 2.34322e-06 
+    2.15196e-06 2.03791e-06 1.92386e-06 1.80982e-06 1.69577e-06 
+    1.58173e-06 1.46768e-06 1.35363e-06 1.23959e-06 1.12554e-06 
+    1.0115e-06 8.9745e-07 7.83404e-07 6.69358e-07 4.76113e-07 
+    -3.47071e-07 -1.17025e-06 -1.99344e-06 -2.81662e-06 0.0783754 
+    0.0500262 -0.0659563 -0.120914 0.0815957 0.0154255 0.00347177 
+    0.000840357 0.000214582 6.54655e-05 3.91709e-05 8.07396e-06 
+    -4.44265e-07 1.74384e-05 -4.52725e-05 -0.119379 -0.147984 
+    -0.159247 -0.0824604 0.169014 0.177628 0.0758742 0.010558 
+    -0.0346506 -0.0710288 -0.0838952 -0.0599521 -0.034568 -0.0181615 
+    -0.00968034 -0.00547115 -0.00333511 -0.00232468 -0.00181159 
+    -0.00143841 -0.00116601 -0.000839755 -0.000569764 -0.000578683 
+    -0.000490551 -0.000411712 -0.000437859 -0.000408185 -0.000356644 
+    -0.000311332 -0.000269006 -0.000221396 -0.000210054 -0.0001923 
+    -0.000175122 -0.000161039 -0.0001428 -0.000126123 -0.000127893 
+    -8.14516e-05 -0.000120166 -0.000154909 -0.000112733 -8.40377e-05 
+    -7.11342e-05 -8.09538e-05 -9.77789e-05 -9.82402e-05 -7.73531e-05 
+    -5.28255e-05 -3.1096e-05 -1.87967e-05 -1.96552e-05 -4.16655e-05 
+    -5.77185e-05 -5.24142e-05 -2.83153e-05 -1.90012e-05 -1.54415e-05 
+    -2.52569e-05 -6.23747e-05 -0.000130543 -0.000149394 -0.000110886 
+    -4.35517e-05 -4.17084e-05 -3.98651e-05 -3.80218e-05 -3.61785e-05 
+    -3.43352e-05 -3.36249e-05 -3.32729e-05 -3.29208e-05 -3.25687e-05 
+    -3.22166e-05 -3.17143e-05 -3.10258e-05 -3.03372e-05 -2.96486e-05 
+    -2.89601e-05 -2.82715e-05 -2.75829e-05 -2.68944e-05 -2.62058e-05 
+    -2.55173e-05 -2.48287e-05 -2.43043e-05 -2.38159e-05 -2.33276e-05 
+    -2.28393e-05 -2.2351e-05 -2.18626e-05 -2.13743e-05 -2.0886e-05 
+    -2.03977e-05 -1.99093e-05 -1.945e-05 -1.91122e-05 -1.87744e-05 
+    -1.84366e-05 -1.80987e-05 -1.77609e-05 -1.74231e-05 -1.70853e-05 
+    -1.67474e-05 
+    EOD
+
+    @v[20].set(<<-'EOD')
+    1.86175 1.99724 2.17266 2.48439 3.15933 3.85231 4.38091 
+    4.69033 4.85034 4.92851 4.96453 4.98188 4.98736 4.991 4.99482 
+    4.9973 4.96422 4.89989 4.83907 4.83151 4.90868 5.04854 5.06104 
+    5.04571 5.03219 5.03025 5.02273 5.01707 5.0123 5.0087 5.00611 
+    5.00429 5.00301 5.00211 5.00148 5.00103 5.00072 5.0005 5.00035 
+    5.00024 5.00016 5.00011 5.00007 5.00005 5.00003 5.00001 
+    4.99999 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999 
+    5 5 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002 5.00002 
+    5.00002 5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5 
+    5 5 4.99981 5.10081 5.10903 4.98404 5.00999 5.14946 4.36501 
+    2.23938 0.325144 0.00660272 -0.0102186 -0.0082401 -0.00556785 
+    -0.00374178 -0.00264763 -0.00202823 -0.0182241 -0.0169551 
+    -0.0150395 0.0103736 0.0877592 0.104382 0.0515938 0.0373818 
+    0.0411547 0.0397009 0.0308946 0.0205793 0.0154037 0.0129191 
+    0.0119327 0.011527 0.0124295 0.0161152 0.0161076 0.0145391 
+    0.0144541 0.0139287 0.0129215 0.0117239 0.0105795 0.00942983 
+    0.00827423 0.00718354 0.00619954 0.00532868 0.00456631 0.00390448 
+    0.00333254 0.00284003 0.00241714 0.00205524 0.0017458 0.00148202 
+    0.00125739 0.0010655 0.000902213 0.000763611 0.000646279 
+    0.000547291 0.000463934 0.000393401 0.000332424 0.000280655 
+    0.000236328 0.000199386 0.000167536 0.000141218 0.000118654 
+    9.99559e-05 8.40479e-05 7.09694e-05 6.00188e-05 5.09786e-05 
+    4.3502e-05 3.72191e-05 3.18114e-05 2.74071e-05 2.35539e-05 
+    1.99967e-05 1.69871e-05 1.49449e-05 1.3451e-05 1.24492e-05 
+    1.14256e-05 1.05669e-05 9.94487e-06 9.47514e-06 8.77318e-06 
+    8.07123e-06 7.36927e-06 6.66731e-06 5.96536e-06 5.2634e-06 
+    4.56144e-06 4.23044e-06 3.92649e-06 3.62254e-06 3.31858e-06 
+    3.01463e-06 2.71068e-06 2.40673e-06 2.23063e-06 2.12082e-06 
+    2.01102e-06 1.90121e-06 1.7914e-06 1.68159e-06 1.57178e-06 
+    1.46197e-06 1.35216e-06 1.24235e-06 1.13255e-06 1.02274e-06 
+    9.12929e-07 8.0312e-07 6.33171e-07 -1.51288e-08 -6.63428e-07 
+    -1.31173e-06 -1.96003e-06 0.0437517 0.0265689 -0.0515377 
+    -0.0658688 0.010727 -0.000511921 -8.36924e-05 2.13278e-05 
+    1.45207e-05 4.54862e-06 -6.14726e-06 2.0062e-06 1.02709e-06 
+    1.4152e-05 -3.08225e-05 -0.0166501 -0.0157139 -0.013957 
+    0.0107537 0.0873717 0.111302 0.0454129 -0.00530142 -0.0468336 
+    -0.0790063 -0.0826944 -0.0534753 -0.0288705 -0.0149009 -0.00801592 
+    -0.0046342 -0.00291835 -0.00213019 -0.00170055 -0.001352 
+    -0.00110593 -0.000742655 -0.000532042 -0.000544742 -0.000479206 
+    -0.000407307 -0.000403575 -0.000366209 -0.000324161 -0.000286183 
+    -0.000247579 -0.000214281 -0.000203435 -0.000186896 -0.000171033 
+    -0.00015779 -0.000145259 -0.000128069 -0.000122647 -9.89398e-05 
+    -0.000114926 -0.000132195 -0.000107872 -8.91015e-05 -7.87996e-05 
+    -8.14061e-05 -8.9098e-05 -8.83368e-05 -7.6122e-05 -6.14668e-05 
+    -4.75402e-05 -3.81855e-05 -3.69696e-05 -4.78656e-05 -5.61346e-05 
+    -5.35007e-05 -4.1459e-05 -3.35411e-05 -2.52374e-05 -2.37479e-05 
+    -4.6406e-05 -9.41884e-05 -0.000109222 -8.52676e-05 -4.25166e-05 
+    -4.10125e-05 -3.95085e-05 -3.80045e-05 -3.65004e-05 -3.49964e-05 
+    -3.41627e-05 -3.3541e-05 -3.29193e-05 -3.22976e-05 -3.16758e-05 
+    -3.10334e-05 -3.03653e-05 -2.96971e-05 -2.9029e-05 -2.83609e-05 
+    -2.76928e-05 -2.70246e-05 -2.63565e-05 -2.56884e-05 -2.50203e-05 
+    -2.43521e-05 -2.38716e-05 -2.34324e-05 -2.29932e-05 -2.25539e-05 
+    -2.21147e-05 -2.16755e-05 -2.12362e-05 -2.0797e-05 -2.03578e-05 
+    -1.99186e-05 -1.95079e-05 -1.9217e-05 -1.8926e-05 -1.8635e-05 
+    -1.8344e-05 -1.8053e-05 -1.7762e-05 -1.74711e-05 -1.71801e-05 
+    EOD
+
+    @v[21].set(<<-'EOD')
+    1.86175 1.73273 1.42016 1.02483 0.944013 0.274107 0.0823742 
+    0.0379366 0.020816 0.0132952 0.00955525 0.00717008 0.00592286 
+    0.00437379 0.00383557 0.00273694 -0.0037467 -0.0054191 -0.00131454 
+    0.0112179 0.0133918 0.00519747 -0.00260113 -0.00252847 -0.00181292 
+    0.000183398 -0.000667607 -0.000750747 -0.000594314 -0.000433904 
+    -0.000308985 -0.000217858 -0.000152926 -0.000107454 -7.54076e-05 
+    -5.2675e-05 -3.66299e-05 -2.54341e-05 -1.75095e-05 -1.18848e-05 
+    -7.97289e-06 -5.30239e-06 -3.53615e-06 -2.38504e-06 -2.40158e-06 
+    -3.84485e-06 -5.29435e-06 -2.57099e-06 1.95189e-06 3.55083e-06 
+    2.06179e-06 5.72753e-07 3.30469e-07 3.40296e-07 3.60221e-07 
+    4.86081e-07 6.1194e-07 7.37799e-07 8.63659e-07 9.89518e-07 
+    9.21274e-07 7.22275e-07 5.23276e-07 3.24277e-07 1.25278e-07 
+    -5.59467e-08 -9.03265e-08 -1.24706e-07 -1.59086e-07 -1.93466e-07 
+    -2.27846e-07 -2.62226e-07 -2.96605e-07 -3.30985e-07 -3.65365e-07 
+    -3.99745e-07 -4.24266e-07 -3.82163e-07 -3.40061e-07 -2.97959e-07 
+    -2.55857e-07 -2.13755e-07 -1.71652e-07 -1.2955e-07 -8.7448e-08 
+    -4.53457e-08 -3.24353e-09 3.76901e-08 7.19937e-08 1.06297e-07 
+    1.40601e-07 1.74904e-07 2.09208e-07 2.43512e-07 2.77815e-07 
+    3.12119e-07 3.46422e-07 3.80726e-07 4.04507e-07 3.77191e-07 
+    3.49876e-07 3.22561e-07 2.95246e-07 2.67931e-07 2.40616e-07 
+    2.13301e-07 1.85986e-07 1.58671e-07 1.31356e-07 1.04041e-07 
+    7.67256e-08 4.94105e-08 2.20955e-08 -5.21962e-09 -3.25347e-08 
+    -5.98498e-08 -8.71649e-08 -1.1448e-07 -1.41795e-07 -1.6911e-07 
+    7.87893e-06 0.0114592 -0.0245712 -0.111637 0.0961324 1.61168 
+    3.22343 4.20442 4.53535 4.83834 4.95464 4.98874 4.99746 
+    4.99883 4.99948 4.99815 4.98431 4.99298 4.99718 5.01948 
+    5.04749 5.008 4.98243 4.98985 4.99781 4.99887 4.99679 4.99616 
+    4.99743 4.99859 4.99936 4.99972 5.00058 5.00123 5.0002 4.99945 
+    4.99983 4.9998 4.99966 4.99958 4.99956 4.99956 4.99956 4.99958 
+    4.99961 4.99965 4.99969 4.99973 4.99977 4.9998 4.99983 4.99985 
+    4.99987 4.99989 4.99991 4.99992 4.99993 4.99994 4.99995 
+    4.99996 4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00001 5.00001 
+    5.00001 5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 
+    5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5 5 5 4.99999 4.99998 4.99997 4.99996 5.01454 
+    4.99566 4.96796 4.99819 5.03232 5.00034 4.99867 4.99937 
+    4.99977 4.99992 4.99997 4.99999 5.00001 5.00021 4.99974 
+    4.98462 4.99301 4.99723 5.01936 5.04807 5.00929 4.9789 4.97876 
+    4.98244 4.9863 4.99575 5.0069 5.00863 5.00624 5.00357 5.0019 
+    5.00098 5.00048 5.00025 5.00016 5.00011 5.00013 5.00009 
+    4.99982 4.99994 5.00005 4.99994 4.99988 4.99989 4.99997 
+    5.00003 5.00005 5.00002 5.00001 5.00001 5.00001 4.99993 
+    4.99999 5 5.00021 4.99997 4.99981 5 5.00009 5.0001 5.00001 
+    4.99991 4.9999 5 5.00011 5.00017 5.00018 5.00018 5.00014 
+    5.00007 4.99999 4.9999 4.9999 5.00001 5.00016 5.00014 4.99999 
+    4.99993 4.99999 5.00009 5.00007 5.00006 5.00004 5.00003 
+    5.00001 5.00001 5 4.99999 4.99998 4.99997 4.99997 4.99997 
+    4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999 
+    5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002 
+    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5 5 
+    EOD
+
+    @v[22].set(<<-'EOD')
+    7.10441e-10 0.00107105 0.000637109 -0.00236346 -0.018079 
+    -0.0120077 -0.00217059 0.00266679 0.00403383 0.00403836 
+    0.00356705 0.00303303 0.00244716 0.00198586 0.0016855 0.00136497 
+    -3.96022e-05 -0.000367409 -3.77079e-05 0.00194085 0.00506964 
+    -0.0400214 -0.0402572 0.0524434 0.286234 0.803011 1.44795 
+    2.02473 2.54768 3.02748 3.4415 3.78287 4.09667 4.35152 4.53987 
+    4.67614 4.77407 4.84319 4.89227 4.92702 4.95119 4.96764 
+    4.97846 4.98557 4.98982 4.99209 4.99371 4.99569 4.99727 
+    4.99802 4.99834 4.99867 4.99892 4.99915 4.99936 4.99939 
+    4.99943 4.99946 4.9995 4.99953 4.99957 4.9996 4.99963 4.99967 
+    4.9997 4.99973 4.99974 4.99975 4.99976 4.99977 4.99978 4.9998 
+    4.99981 4.99982 4.99983 4.99984 4.99985 4.99986 4.99986 
+    4.99986 4.99987 4.99987 4.99988 4.99988 4.99989 4.99989 
+    4.9999 4.9999 4.9999 4.9999 4.99991 4.99991 4.99991 4.99991 
+    4.99992 4.99992 4.99992 4.99992 4.99993 4.99993 4.99993 
+    4.99993 4.99993 4.99993 4.99993 4.99993 4.99994 4.99994 
+    4.99994 4.99994 4.99994 4.99994 4.99994 4.99994 4.99995 
+    4.99995 4.99995 4.99995 4.99995 4.99995 4.99995 5.00145 
+    5.00659 5.01209 5.01931 5.00279 4.99273 4.99217 4.99295 
+    4.99471 4.99594 4.99696 4.9978 4.99844 4.99891 4.99924 4.99635 
+    4.99699 4.99813 5.00068 5.00307 5.0588 4.96365 4.54012 3.6307 
+    2.35176 1.0322 0.354379 0.115986 0.0435668 0.0245112 0.020786 
+    0.0164656 0.0118409 0.00849698 0.00597078 0.0040105 0.0026076 
+    0.0016597 0.00118185 0.00121067 0.00153587 0.00174836 0.00136519 
+    -0.000189116 -0.00315555 -0.00646603 -0.00898042 -0.010203 
+    -0.0110896 -0.0123764 -0.00953841 -0.00225795 0.000818314 
+    0.00152252 0.00150269 0.00119025 0.000767068 0.000308852 
+    -3.79272e-05 -0.00019691 -0.000186642 -9.73653e-05 -8.49784e-06 
+    2.04147e-05 -9.91086e-06 -1.55959e-05 -1.80499e-05 -1.77097e-05 
+    -1.51548e-05 -1.1978e-05 -9.84916e-06 -1.29728e-05 -1.67235e-05 
+    -1.74153e-05 -1.39958e-05 -5.92272e-06 -8.08216e-06 -1.53077e-05 
+    -2.92531e-05 -3.91049e-05 -2.98935e-05 -7.32122e-06 3.18534e-05 
+    4.39134e-05 4.18753e-05 3.22759e-05 1.86766e-05 1.58432e-05 
+    1.30098e-05 1.01765e-05 7.34312e-06 4.50975e-06 1.67639e-06 
+    -1.15697e-06 -1.23877e-06 -1.11991e-06 -1.00106e-06 -8.82208e-07 
+    -7.63355e-07 -6.44502e-07 -5.2565e-07 -4.29318e-07 -3.44661e-07 
+    -2.60004e-07 -1.75347e-07 -9.06904e-08 -6.03349e-09 7.86234e-08 
+    1.6328e-07 2.47937e-07 3.32594e-07 4.17251e-07 5.01908e-07 
+    5.86565e-07 6.71222e-07 7.36123e-07 6.43886e-07 5.5165e-07 
+    4.59414e-07 3.67178e-07 0.000334759 -4.60833e-05 -0.00106139 
+    -0.00166624 0.000859563 0.00102606 0.00410037 0.00419931 
+    0.00518997 0.00459791 0.00503125 0.00523877 0.00452158 0.00339924 
+    0.00233399 0.000876915 0.000546439 0.000444299 0.000983968 
+    0.00119304 -0.0429422 -0.0403983 0.0534896 0.288013 0.807345 
+    1.44247 2.03448 2.57021 3.05049 3.47332 3.8131 4.1009 4.34677 
+    4.53512 4.67127 4.76531 4.82526 4.86593 4.89586 4.91904 
+    4.93806 4.95348 4.96597 4.97629 4.9843 4.98983 4.99335 4.9957 
+    4.99741 4.99864 4.99946 4.99994 5.00047 5.00073 5.00086 
+    5.00092 5.00094 5.00091 5.00087 5.00081 5.00074 5.00067 
+    5.00059 5.00052 5.00046 5.0004 5.00034 5.0003 5.00026 5.00022 
+    5.00019 5.00016 5.00014 5.00012 5.0001 5.00009 5.00007 5.00006 
+    5.00006 5.00005 5.00004 5.00004 5.00004 5.00003 5.00003 
+    5.00003 5.00002 5.00002 5.00002 5.00002 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5 5 5 5 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5.00001 5.00001 
+    5.00001 5.00001 5.00002 5.00002 
+    EOD
+
+    @v[23].set(<<-'EOD')
+    5 5.00284 5.01266 5.01895 4.98936 4.99575 4.99217 4.99545 
+    4.99775 4.99894 4.99946 4.99968 4.99975 4.99977 4.99986 
+    4.9999 4.99528 4.99808 5.00039 5.00392 5.00512 4.99985 4.99863 
+    4.99942 4.99992 5.00017 4.99897 4.99803 4.99784 4.99739 
+    4.99883 5.00365 5.00298 5.00133 5.00048 5.00019 5.00008 
+    5.00005 5.00004 5.00003 5.00002 5.00002 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5 5 4.99999 4.99997 4.99995 4.99996 
+    4.99998 5 5.00001 5.00001 5.00002 5.00002 5.00003 5.00003 
+    5.00002 5.00002 5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99998 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00002 
+    5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5 5 5 5 5 5 5 5.00217 5.00108 4.99547 4.99658 5.00667 
+    4.99641 4.99532 4.99938 5.00328 5.00222 5.00114 5.00052 
+    5.00024 5.00011 5.00009 4.99285 4.99591 4.99897 5.00403 
+    5.00786 5.00318 4.99942 4.9992 4.99949 5.001 5.00408 5.00319 
+    5.00063 4.99995 5.00014 4.99982 4.99832 4.99838 4.99865 
+    4.99912 4.99836 4.99735 4.99606 4.99814 5.00958 5.02973 
+    5.05293 5.06103 4.99342 4.80726 4.50744 4.07509 3.41358 
+    2.37924 1.03194 0.261552 0.142392 0.0904482 0.0555071 0.0322869 
+    0.018289 0.0113802 0.00875182 0.00757055 0.00629906 0.00523 
+    0.00403349 0.0031953 0.00280864 0.00286119 0.00250389 0.00202815 
+    0.001723 0.00147312 0.0012411 0.00104401 0.000886204 0.000758277 
+    0.000651915 0.00056348 0.000487966 0.000424048 0.000365613 
+    0.000308178 0.000258725 0.000228061 0.000207976 0.000198491 
+    0.00018518 0.000172716 0.000163197 0.000155007 0.000141734 
+    0.000128461 0.000115188 0.000101915 8.86417e-05 7.53686e-05 
+    6.20956e-05 5.69164e-05 5.23275e-05 4.77385e-05 4.31495e-05 
+    3.85605e-05 3.39716e-05 2.93826e-05 2.69449e-05 2.56224e-05 
+    2.42999e-05 2.29774e-05 2.16549e-05 2.03324e-05 1.90099e-05 
+    1.76873e-05 1.63648e-05 1.50423e-05 1.37198e-05 1.23973e-05 
+    1.10748e-05 9.75232e-06 8.48447e-06 7.65129e-06 6.81811e-06 
+    5.98494e-06 5.15176e-06 0.00056893 -0.00787906 -0.0217381 
+    -0.0370066 -0.00770505 0.00659312 0.00975477 0.00949456 
+    0.00777552 0.00655645 0.00568776 0.00508782 0.00458121 0.00410187 
+    0.00365665 0.0015121 0.00160863 0.00263181 0.00638941 0.00772607 
+    0.00225583 0.0010843 0.000882939 0.000801563 0.00075632 
+    0.000554992 0.000435131 0.0003474 0.000217667 0.000491602 
+    0.0012267 0.00250446 0.000212058 -0.0174972 -0.0527527 -0.0479071 
+    0.194908 1.45838 3.40677 4.49242 4.86894 4.97215 5.01218 
+    5.04342 5.06228 5.03069 4.87169 4.57056 4.11523 3.38264 
+    2.19691 0.715839 0.172818 0.102162 0.0627162 0.0363388 0.020289 
+    0.0119414 0.00826608 0.0066417 0.00549092 0.00492505 0.00439443 
+    0.0037156 0.00306471 0.00247451 0.00195965 0.0014822 0.0010815 
+    0.000904464 0.0010514 0.00152308 0.00120752 0.000228447 
+    -0.00102833 -0.00116644 -0.00042067 4.78758e-05 5.09599e-05 
+    -4.45756e-05 -3.22966e-06 3.81163e-05 7.94622e-05 0.000120808 
+    0.000162154 0.000161895 0.000148481 0.000135068 0.000121654 
+    0.000108241 9.81453e-05 9.2164e-05 8.61827e-05 8.02014e-05 
+    7.42201e-05 6.82388e-05 6.22576e-05 5.62763e-05 5.0295e-05 
+    4.43137e-05 3.83324e-05 3.54323e-05 3.321e-05 3.09877e-05 
+    2.87654e-05 2.65431e-05 2.43209e-05 2.20986e-05 1.98763e-05 
+    1.7654e-05 1.54317e-05 1.34612e-05 1.25441e-05 1.1627e-05 
+    1.07099e-05 9.79276e-06 8.87564e-06 7.95851e-06 7.04139e-06 
+    6.12427e-06 
+    EOD
+
+    @v[24].set(<<-'EOD')
+    5 5.01099 5.00866 4.97845 4.92369 4.9273 4.97413 4.9929 
+    4.99826 4.99958 4.99978 5.00005 4.99968 4.99959 5.00014 
+    4.99979 4.99914 4.99982 5.00023 5.00295 5.00664 4.99854 
+    4.99647 5.00438 5.01722 5.03681 5.04766 5.04799 5.04867 
+    5.04873 5.04685 5.04413 5.0367 5.02505 5.01726 5.01183 5.00806 
+    5.00549 5.00371 5.00246 5.00162 5.00105 5.00069 5.00045 
+    5.00031 5.00024 5.00019 5.00012 5.00007 5.00004 5.00001 
+    4.99998 4.99999 4.99999 5 5.00001 5.00001 5.00002 5.00002 
+    5.00003 5.00003 5.00003 5.00002 5.00002 5.00001 5.00001 
+    5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    5 5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5.00418 4.99953 4.99152 
+    4.99807 5.00497 5.00112 5.00055 5.00038 5.00018 5.00006 
+    5.00006 5.00007 5.00006 5.00004 5.00004 4.99853 4.99945 
+    4.99998 5.00304 5.00935 5.00742 4.99181 4.97421 4.93603 
+    4.8853 4.8927 4.93984 4.97458 4.99039 4.99614 4.99801 4.99851 
+    4.99869 4.99924 5.00108 5.00181 5.00119 5.00059 5.00031 
+    5.00022 5.00018 5.00011 5.00001 5.00006 4.99981 4.99977 
+    4.99982 5.00012 4.99993 5.00008 5.00043 5.00048 5.00024 
+    5.00008 4.99984 4.99993 5.00011 4.99996 4.9998 4.99977 4.9998 
+    4.99993 5.00008 5.00011 5.00002 4.99995 4.99989 4.99993 
+    5 5.00007 5.00009 4.99994 4.99977 4.9997 4.99975 4.99996 
+    4.99996 4.99988 4.9997 4.99952 4.9995 4.99956 4.99973 4.99988 
+    5.00005 5.00025 5.00042 5.00036 5.00031 5.00025 5.0002 5.00014 
+    5.00009 5.00003 5.00002 5.00001 5.00001 5 4.99999 4.99998 
+    4.99998 4.99997 4.99998 4.99998 4.99998 4.99998 4.99998 
+    4.99998 4.99998 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5.00284 
+    5.00442 5.00381 4.98997 4.99092 5.00733 5.07791 4.98237 
+    4.86434 4.76835 4.74067 4.79278 4.85094 4.90068 4.93603 
+    4.95698 4.96984 4.97856 4.98869 4.99904 5.0005 4.99524 5.00181 
+    5.01878 5.05177 5.07986 4.98917 4.56217 3.68 2.3539 1.18541 
+    0.505772 0.221044 0.115287 0.0760938 0.0589194 0.0476784 
+    0.0457213 0.0412911 0.033889 0.0259741 0.0191452 0.0139018 
+    0.0100235 0.00711788 0.00497657 0.00349368 0.00250021 0.00176179 
+    0.00121843 0.000838368 0.000582711 0.000423458 0.000294608 
+    0.000201251 0.000133748 8.6227e-05 5.44252e-05 3.30514e-05 
+    1.93926e-05 1.09814e-05 5.29857e-06 1.92247e-06 3.08708e-07 
+    -3.74311e-07 -6.11121e-07 -7.27807e-07 -4.87604e-07 -4.80493e-07 
+    -9.15925e-07 -2.03774e-06 -4.01128e-06 -2.46644e-06 2.10626e-06 
+    8.22422e-06 1.04922e-05 9.83047e-06 7.27106e-06 3.29654e-06 
+    -2.06736e-06 -2.18019e-06 -2.29303e-06 -2.40586e-06 -2.51869e-06 
+    -2.63153e-06 -2.24615e-06 -1.70325e-06 -1.16036e-06 -6.17468e-07 
+    -7.45754e-08 2.45198e-07 2.88285e-07 3.31373e-07 3.7446e-07 
+    4.17548e-07 4.60635e-07 5.03723e-07 5.4681e-07 5.89898e-07 
+    6.32985e-07 6.76073e-07 6.19054e-07 5.4001e-07 4.60967e-07 
+    3.81923e-07 3.02879e-07 2.23836e-07 1.44792e-07 6.57488e-08 
+    -1.32948e-08 -9.23383e-08 -1.6698e-07 -2.23206e-07 -2.79432e-07 
+    -3.35658e-07 -3.91884e-07 -4.48109e-07 -5.04335e-07 -5.60561e-07 
+    -6.16787e-07 
+    EOD
+
+    @v[25].set(<<-'EOD')
+    1.34824 1.35838 1.36465 1.34675 1.29167 1.23161 1.2201 1.2185 
+    1.2181 1.21798 1.21793 1.21788 1.21785 1.21782 1.21779 1.21776 
+    1.21655 1.21656 1.21669 1.21871 1.22421 1.22247 1.21858 
+    1.2228 1.23803 1.27737 1.10647 0.395248 0.0600669 0.027687 
+    0.0192374 0.015425 0.0130881 0.00977445 0.00696598 0.00491122 
+    0.00341952 0.00237078 0.00162339 0.00109178 0.000726647 
+    0.000478886 0.00031568 0.000207902 0.000143494 0.000109768 
+    8.62987e-05 5.69775e-05 3.36547e-05 2.30356e-05 1.86108e-05 
+    1.41861e-05 1.08293e-05 7.68835e-06 4.79593e-06 4.51019e-06 
+    4.22444e-06 3.9387e-06 3.65295e-06 3.36721e-06 3.04559e-06 
+    2.69981e-06 2.35403e-06 2.00825e-06 1.66247e-06 1.34508e-06 
+    1.26225e-06 1.17941e-06 1.09657e-06 1.01373e-06 9.30893e-07 
+    8.48054e-07 7.65216e-07 6.82378e-07 5.9954e-07 5.16702e-07 
+    4.37489e-07 3.82774e-07 3.2806e-07 2.73346e-07 2.18632e-07 
+    1.63917e-07 1.09203e-07 5.4489e-08 -2.2523e-10 -5.49395e-08 
+    -1.09654e-07 -1.52862e-07 -1.3079e-07 -1.08718e-07 -8.6646e-08 
+    -6.45739e-08 -4.25019e-08 -2.04298e-08 1.64229e-09 2.37144e-08 
+    4.57864e-08 6.78585e-08 8.71693e-08 9.30725e-08 9.89758e-08 
+    1.04879e-07 1.10782e-07 1.16685e-07 1.22589e-07 1.28492e-07 
+    1.34395e-07 1.40298e-07 1.46201e-07 1.52105e-07 1.58008e-07 
+    1.63911e-07 1.69814e-07 1.75718e-07 1.81621e-07 1.87524e-07 
+    1.93427e-07 1.9933e-07 2.05234e-07 2.11137e-07 2.19788e-07 
+    0.000393944 -0.000218983 -0.00105784 0.00172403 -0.00027134 
+    -0.000204147 8.79968e-06 5.93762e-05 5.83554e-05 4.13815e-05 
+    3.71369e-05 3.03372e-05 2.25336e-05 1.5986e-05 1.07284e-05 
+    -7.5239e-05 5.60593e-05 6.97571e-05 0.000667617 0.000960856 
+    0.00131749 -0.00759564 -0.0217897 -0.0450321 -0.076646 -0.128569 
+    -0.186391 -0.202175 -0.206953 -0.2082 -0.208416 -0.208669 
+    -0.208934 -0.209111 -0.209234 -0.209329 -0.209389 -0.209416 
+    -0.2094 -0.209329 -0.20926 -0.209204 -0.209208 -0.209285 
+    -0.209454 -0.209641 -0.20977 -0.209811 -0.209833 -0.209887 
+    -0.209653 -0.209127 -0.208893 -0.208811 -0.208777 -0.208758 
+    -0.208747 -0.20874 -0.208726 -0.208697 -0.208657 -0.208611 
+    -0.208565 -0.208524 -0.208488 -0.208451 -0.208412 -0.208373 
+    -0.208333 -0.208294 -0.208256 -0.208219 -0.208183 -0.208145 
+    -0.208107 -0.208066 -0.208029 -0.207993 -0.207959 -0.207923 
+    -0.207883 -0.207838 -0.207789 -0.207747 -0.20771 -0.207675 
+    -0.207642 -0.207605 -0.207568 -0.207531 -0.207494 -0.207457 
+    -0.20742 -0.207383 -0.207346 -0.207308 -0.207271 -0.207233 
+    -0.207196 -0.207158 -0.207121 -0.207084 -0.207046 -0.207009 
+    -0.206972 -0.206935 -0.206898 -0.206861 -0.206823 -0.206786 
+    -0.206749 -0.206712 -0.206675 -0.206638 -0.2066 -0.206563 
+    -0.206526 -0.206489 -0.206452 -0.206415 -0.203384 -0.20015 
+    -0.196872 -0.205024 -0.210727 -0.206779 -0.0685263 0.586138 
+    1.4665 2.22945 2.77554 3.076 3.24926 3.34515 3.40164 3.43006 
+    3.43713 3.43075 3.42886 3.4384 3.46567 3.49025 3.51287 3.53821 
+    3.57841 3.39846 2.80753 2.22947 1.7549 1.30429 0.707786 
+    0.303206 0.131352 0.0671706 0.0429955 0.032461 0.0257161 
+    0.0239521 0.0217397 0.0179705 0.0138745 0.0102813 0.00749643 
+    0.0054328 0.00386817 0.0027004 0.00189442 0.00135552 0.000954715 
+    0.000659981 0.000453435 0.000313993 0.000231347 0.000159665 
+    0.000108122 7.10528e-05 4.50233e-05 2.77892e-05 1.62765e-05 
+    8.9893e-06 4.5471e-06 1.54614e-06 -1.6542e-07 -8.68508e-07 
+    -1.04369e-06 -9.63086e-07 -8.44294e-07 -6.57339e-07 -7.35885e-07 
+    -9.80056e-07 -1.39772e-06 -2.10199e-06 -1.37474e-06 6.13269e-07 
+    3.3028e-06 4.60941e-06 4.91053e-06 4.14186e-06 2.45258e-06 
+    -8.7388e-09 -3.59647e-07 -7.10554e-07 -1.06146e-06 -1.41237e-06 
+    -1.76328e-06 -1.63073e-06 -1.34534e-06 -1.05995e-06 -7.74561e-07 
+    -4.8917e-07 -2.95733e-07 -2.16326e-07 -1.3692e-07 -5.75135e-08 
+    2.18929e-08 1.01299e-07 1.80706e-07 2.60112e-07 3.39519e-07 
+    4.18925e-07 4.98332e-07 4.83984e-07 4.4901e-07 4.14035e-07 
+    3.79061e-07 3.44087e-07 3.09112e-07 2.74138e-07 2.39163e-07 
+    2.04189e-07 1.69215e-07 1.26002e-07 4.83213e-08 -2.9359e-08 
+    -1.07039e-07 -1.8472e-07 -2.624e-07 -3.4008e-07 -4.1776e-07 
+    -4.95441e-07 
+    EOD
+
+    @v[26].set(<<-'EOD')
+    7.10441e-10 0.000309731 -0.000308186 -0.001694 -0.00360784 
+    8.40909e-05 0.00203175 0.0012896 0.000596548 0.000277191 
+    0.000161134 0.000120439 8.4915e-05 9.49929e-05 6.18812e-05 
+    1.65433e-05 1.89682e-05 3.97578e-05 4.95446e-05 0.000225325 
+    0.000214579 -0.00230134 -0.000451102 0.00997237 0.0341443 
+    0.0449314 0.0424411 0.0341996 0.0315315 0.0308892 0.0291614 
+    0.024365 0.0190282 0.0188976 0.017238 0.0138526 0.0105645 
+    0.00778548 0.00561753 0.0039871 0.00279554 0.00194075 0.0013468 
+    0.000934775 0.000664723 0.000498911 0.000377384 0.000254183 
+    0.000163421 0.000120773 9.65058e-05 7.22384e-05 5.60316e-05 
+    4.14549e-05 2.79516e-05 2.57096e-05 2.34677e-05 2.12257e-05 
+    1.89837e-05 1.67417e-05 1.46737e-05 1.27228e-05 1.07719e-05 
+    8.82099e-06 6.87009e-06 5.0896e-06 4.71705e-06 4.34451e-06 
+    3.97196e-06 3.59941e-06 3.22686e-06 2.85431e-06 2.48176e-06 
+    2.10921e-06 1.73666e-06 1.36411e-06 1.02855e-06 9.42931e-07 
+    8.57316e-07 7.71701e-07 6.86086e-07 6.00471e-07 5.14856e-07 
+    4.29241e-07 3.43626e-07 2.58011e-07 1.72396e-07 9.85409e-08 
+    9.14091e-08 8.42773e-08 7.71456e-08 7.00138e-08 6.2882e-08 
+    5.57503e-08 4.86185e-08 4.14867e-08 3.4355e-08 2.72232e-08 
+    2.05821e-08 1.63235e-08 1.2065e-08 7.80643e-09 3.54786e-09 
+    -7.10696e-10 -4.96926e-09 -9.22782e-09 -1.34864e-08 -1.77449e-08 
+    -2.20035e-08 -2.62621e-08 -3.05206e-08 -3.47792e-08 -3.90378e-08 
+    -4.32963e-08 -4.75549e-08 -5.18134e-08 -5.6072e-08 -6.03306e-08 
+    -6.45891e-08 -6.88477e-08 -8.76373e-06 0.000131607 -0.00021685 
+    -0.000433027 0.00047234 0.000211593 -0.000189601 3.2492e-05 
+    0.000575955 7.72235e-05 -0.000285172 -0.000242061 -0.000135112 
+    -3.50117e-05 -2.75868e-05 5.48974e-05 1.80604e-07 5.48911e-05 
+    3.97478e-05 0.000192909 0.000297932 0.00402253 -0.0122366 
+    -0.047853 -0.0963082 -0.108071 -0.0567275 -0.0239271 -0.0178628 
+    -0.0233027 -0.031853 -0.0400843 -0.0482725 -0.0576154 -0.0627218 
+    -0.0511236 -0.0279524 -0.0150986 -0.00931091 -0.00652876 
+    -0.00479286 -0.00344346 -0.00249578 -0.0019532 -0.00157977 
+    -0.00131848 -0.00111251 -0.000939229 -0.000797445 -0.000708384 
+    -0.000630452 -0.000539722 -0.000508862 -0.000480596 -0.000439484 
+    -0.000407217 -0.000363866 -0.000329506 -0.000318642 -0.000307362 
+    -0.000286511 -0.000266253 -0.000242943 -0.000218107 -0.000204661 
+    -0.00020241 -0.000194435 -0.000185062 -0.000173042 -0.000160549 
+    -0.000151407 -0.000145626 -0.000145976 -0.000147342 -0.000145288 
+    -0.000137979 -0.000124481 -0.000123218 -0.000127453 -0.000139006 
+    -0.000145486 -0.000129764 -9.82749e-05 -4.72596e-05 -3.08671e-05 
+    -3.28834e-05 -4.52254e-05 -6.25389e-05 -6.32516e-05 -6.39643e-05 
+    -6.4677e-05 -6.53897e-05 -6.61023e-05 -6.6815e-05 -6.75277e-05 
+    -6.61005e-05 -6.45173e-05 -6.29341e-05 -6.13509e-05 -5.97676e-05 
+    -5.81844e-05 -5.66012e-05 -5.54231e-05 -5.4455e-05 -5.3487e-05 
+    -5.25189e-05 -5.15508e-05 -5.05828e-05 -4.96147e-05 -4.86466e-05 
+    -4.76785e-05 -4.67105e-05 -4.57424e-05 -4.47743e-05 -4.38063e-05 
+    -4.28382e-05 -4.18821e-05 -4.10211e-05 -4.016e-05 -3.9299e-05 
+    -3.8438e-05 4.29885e-05 5.14113e-05 -0.000127986 -0.000611463 
+    -0.000149428 0.000882394 0.00297059 -0.00405825 -0.00591067 
+    -0.00546997 -0.00158744 0.00190677 0.00298403 0.00268595 
+    0.00196161 0.00130289 0.000783347 0.000520683 0.000565306 
+    0.00053419 -0.00224696 -0.000920818 0.0132755 0.0322504 
+    0.0442808 0.0638615 0.0701007 0.0539356 0.0247771 0.056244 
+    0.294266 0.831368 1.45424 2.02898 2.54559 2.9937 3.35333 
+    3.72609 4.06363 4.32789 4.52413 4.66504 4.7652 4.83637 4.88631 
+    4.92109 4.94464 4.96046 4.97218 4.98079 4.98679 4.99076 
+    4.99361 4.99555 4.99686 4.99783 4.99853 4.99902 4.99936 
+    4.99959 4.99973 4.99983 4.9999 4.99993 4.99996 4.99998 5 
+    5.00001 5 4.99999 4.99997 4.99994 4.99993 4.99994 4.99996 
+    4.99999 5.00004 5.00006 5.00005 5.00003 5.00002 5.00001 
+    5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    5 5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99998 
+    EOD
+
+    @v[27].set(<<-'EOD')
+    5 4.99984 4.99796 4.99478 4.9889 4.98738 4.98896 4.99087 
+    4.99262 4.99419 4.99552 4.99659 4.99743 4.99807 4.99855 
+    4.9989 4.99894 4.99908 4.99935 5.00001 5.0007 5.00132 5.00032 
+    4.99976 5.00134 5.00339 5.00315 5.00157 5.00091 5.00058 
+    5.00012 4.99944 4.99886 4.9994 4.99934 4.99899 4.99876 4.99868 
+    4.99872 4.99883 4.99898 4.99914 4.9993 4.99944 4.99956 4.99967 
+    4.99976 4.99982 4.99986 4.9999 4.99993 4.99997 4.99997 4.99998 
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 
+    4.99999 4.99999 4.99999 4.99999 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5.00009 5.00028 5.00015 4.99983 
+    5.00036 4.99996 4.99834 4.99783 5.00383 5.00734 5.00387 
+    5.00058 4.99893 4.99836 4.99832 4.99854 4.99873 4.99905 
+    4.99927 4.99952 4.99969 4.99834 4.99536 4.99163 4.99073 
+    5.0053 5.03631 5.03103 4.9008 4.62503 4.21887 3.70902 3.09967 
+    2.35791 1.41912 0.519675 0.210458 0.131362 0.0980819 0.0708209 
+    0.0471701 0.0323272 0.0253535 0.0199144 0.0152615 0.0117228 
+    0.00917696 0.00738117 0.00609292 0.00512664 0.00436184 0.0037961 
+    0.00331639 0.00289006 0.0025477 0.00226529 0.00202925 0.00182793 
+    0.00165474 0.00150531 0.00137529 0.00125983 0.00115603 0.00106455 
+    0.000982977 0.000911255 0.000846819 0.000790092 0.000738698 
+    0.000692816 0.00065107 0.000613595 0.000579642 0.000548935 
+    0.00052106 0.000495598 0.000472174 0.000450849 0.000431118 
+    0.000412667 0.000395868 0.000381319 0.000368487 0.000357327 
+    0.000344212 0.000330334 0.00031622 0.000303298 0.000295809 
+    0.00028832 0.000280831 0.000273342 0.000265853 0.000258364 
+    0.000250875 0.000245118 0.000239488 0.000233857 0.000228227 
+    0.000222596 0.000216966 0.000211336 0.000207047 0.000203455 
+    0.000199863 0.00019627 0.000192678 0.000189085 0.000185493 
+    0.0001819 0.000178308 0.000174716 0.000171123 0.000167531 
+    0.000163938 0.000160346 0.000156835 0.000153973 0.00015111 
+    0.000148248 0.000145385 0.000296579 -3.96718e-05 -0.000449085 
+    0.000323433 0.000750086 0.000268264 0.000149028 -0.000100249 
+    7.00956e-05 0.00012605 0.00022592 0.000193036 0.000120453 
+    8.07865e-05 7.65771e-05 -3.27828e-05 0.000116759 0.000169498 
+    0.000409804 0.000414965 0.00092323 -0.00590633 -0.0175477 
+    -0.032433 -0.0559842 -0.0820373 0.0688484 0.626629 1.32929 
+    2.01657 2.60925 3.12329 3.38952 3.14128 2.38463 1.23802 
+    0.316019 0.107832 0.0694707 0.051837 0.035247 0.0209999 
+    0.0116618 0.00967674 0.00789182 0.00574566 0.00386872 0.00258612 
+    0.00167126 0.00104169 0.000641093 0.000401246 0.000277928 
+    0.000171775 0.000102266 5.89376e-05 3.29258e-05 1.80463e-05 
+    1.0057e-05 6.4571e-06 5.10093e-06 4.06791e-06 3.62716e-06 
+    3.63321e-06 3.99625e-06 4.64368e-06 5.20886e-06 4.77728e-06 
+    3.23919e-06 1.14113e-06 -1.29416e-06 -4.15607e-06 -1.88532e-06 
+    5.24411e-06 1.38678e-05 1.28823e-05 3.6758e-06 -2.52285e-06 
+    -3.97133e-06 -4.03071e-06 -3.37154e-06 -2.71238e-06 -2.05321e-06 
+    -1.39404e-06 -7.34872e-07 -3.73325e-07 -1.05873e-07 1.61578e-07 
+    4.2903e-07 6.96482e-07 8.18468e-07 7.60065e-07 7.01662e-07 
+    6.43258e-07 5.84855e-07 5.26452e-07 4.68049e-07 4.09646e-07 
+    3.51243e-07 2.9284e-07 2.34437e-07 1.71213e-07 1.06928e-07 
+    4.2644e-08 -2.16403e-08 -8.59247e-08 -1.50209e-07 -2.14493e-07 
+    -2.78778e-07 -3.43062e-07 -4.07346e-07 -4.55065e-07 -4.3348e-07 
+    -4.11896e-07 -3.90311e-07 -3.68726e-07 -3.47141e-07 -3.25556e-07 
+    -3.03971e-07 -2.82386e-07 
+    EOD
+
+    @v[28].set(<<-'EOD')
+    0.368163 0.361756 0.327463 0.269513 0.149476 0.0805716 0.0501146 
+    0.03403 0.0230886 0.0160474 0.0116071 0.00870013 0.00679614 
+    0.00542384 0.00432512 0.00340653 -0.00129719 -0.00399429 
+    -0.00318719 0.00443085 0.0150156 0.0334147 0.0132288 -0.0189751 
+    -0.0508377 -0.0252174 -0.0142489 -0.00675908 -0.0038653 
+    -0.00243423 -0.00168891 -0.00120901 -0.000900426 -0.000685575 
+    -0.000557595 -0.000457268 -0.000377427 -0.000315269 -0.000266613 
+    -0.000228397 -0.000198283 -0.000174248 -0.000154886 -0.00013892 
+    -0.000125864 -0.000115189 -0.000105841 -9.66611e-05 -8.84262e-05 
+    -8.23872e-05 -7.74668e-05 -7.25463e-05 -6.79992e-05 -6.35276e-05 
+    -5.92413e-05 -5.68994e-05 -5.45574e-05 -5.22154e-05 -4.98735e-05 
+    -4.75315e-05 -4.54981e-05 -4.36726e-05 -4.18471e-05 -4.00216e-05 
+    -3.81961e-05 -3.64559e-05 -3.54209e-05 -3.43858e-05 -3.33508e-05 
+    -3.23157e-05 -3.12807e-05 -3.02456e-05 -2.92105e-05 -2.81755e-05 
+    -2.71404e-05 -2.61054e-05 -2.51232e-05 -2.44984e-05 -2.38736e-05 
+    -2.32487e-05 -2.26239e-05 -2.19991e-05 -2.13742e-05 -2.07494e-05 
+    -2.01246e-05 -1.94998e-05 -1.88749e-05 -1.82865e-05 -1.79044e-05 
+    -1.75224e-05 -1.71403e-05 -1.67582e-05 -1.63762e-05 -1.59941e-05 
+    -1.56121e-05 -1.523e-05 -1.4848e-05 -1.44659e-05 -1.41138e-05 
+    -1.39075e-05 -1.37011e-05 -1.34947e-05 -1.32883e-05 -1.30819e-05 
+    -1.28755e-05 -1.26691e-05 -1.24627e-05 -1.22563e-05 -1.205e-05 
+    -1.18436e-05 -1.16372e-05 -1.14308e-05 -1.12244e-05 -1.1018e-05 
+    -1.08116e-05 -1.06052e-05 -1.03988e-05 -1.01924e-05 -9.98605e-06 
+    -9.77966e-06 -2.85319e-05 0.00281092 0.00180106 -0.000981083 
+    0.00551926 -0.00119763 -0.0295069 -0.0367677 0.064749 0.119022 
+    0.0882007 0.0552062 0.03418 0.0223243 0.015545 0.011949 
+    0.00757134 0.00667655 0.00583243 0.00644443 0.00650959 -0.0302575 
+    -0.0437806 -0.0355466 0.0381776 0.282109 0.674178 1.07582 
+    1.45189 1.789 2.08649 2.34663 2.57245 2.81211 3.04778 3.2523 
+    3.45877 3.65593 3.83396 3.9923 4.13368 4.25864 4.36719 4.46064 
+    4.54086 4.60962 4.66835 4.71838 4.76094 4.79716 4.82796 
+    4.85413 4.87634 4.89518 4.91116 4.92476 4.93631 4.94608 
+    4.95434 4.9613 4.96715 4.97211 4.97638 4.98001 4.98312 4.98571 
+    4.98795 4.98979 4.99138 4.99269 4.99381 4.99474 4.99551 
+    4.99615 4.99668 4.99713 4.99752 4.99783 4.99811 4.99836 
+    4.99858 4.99873 4.99884 4.99892 4.999 4.99907 4.99912 4.99916 
+    4.99921 4.99926 4.99932 4.99937 4.99942 4.99948 4.99953 
+    4.99956 4.99958 4.99961 4.99963 4.99966 4.99968 4.99971 
+    4.99972 4.99973 4.99974 4.99975 4.99976 4.99977 4.99978 
+    4.99979 4.9998 4.9998 4.99981 4.99982 4.99983 4.99984 4.99985 
+    4.99986 4.99986 4.99987 4.99987 5.00498 5.00354 4.99359 
+    4.98981 5.00498 5.00099 5.00041 5.00022 5.00015 5.00012 
+    5.0001 5.00008 5.00005 5.00003 5 4.99431 4.99459 4.99591 
+    5.00087 5.01029 5.03935 4.92784 4.51643 3.78356 2.68745 
+    1.43417 0.583128 0.205094 0.0777337 0.0391566 0.02723 0.023883 
+    0.018808 0.010165 0.00254623 -0.00377463 -0.0038097 0.00144145 
+    0.00267231 0.00193045 0.00144538 0.00121758 0.00112893 0.00109424 
+    0.0010226 0.000948072 0.000882573 0.000826996 0.000776391 
+    0.000729719 0.000686499 0.000647333 0.000610108 0.000575631 
+    0.000545069 0.000515485 0.000488514 0.000465316 0.000443215 
+    0.000422454 0.00040292 0.00038488 0.000368472 0.000353628 
+    0.000339643 0.000326197 0.000313483 0.000302884 0.000294038 
+    0.000284003 0.000270941 0.000254925 0.000246511 0.000244089 
+    0.000245538 0.000242099 0.000235728 0.000227482 0.000218001 
+    0.000207257 0.000202127 0.000196997 0.000191868 0.000186738 
+    0.000181608 0.00017758 0.000173899 0.000170219 0.000166538 
+    0.000162857 0.000159576 0.00015679 0.000154005 0.000151219 
+    0.000148433 0.000145647 0.000142861 0.000140076 0.00013729 
+    0.000134504 0.000131718 0.000129603 0.000127635 0.000125668 
+    0.0001237 0.000121732 0.000119765 0.000117797 0.000115829 
+    0.000113862 0.000111894 0.000109993 0.000108372 0.000106751 
+    0.00010513 0.000103509 0.000101887 0.000100266 9.86449e-05 
+    9.70237e-05 
+    EOD
+
+    @v[29].set(<<-'EOD')
+    5 4.99899 4.99654 4.99327 4.9863 4.98954 4.99212 4.99378 
+    4.9951 4.99624 4.99715 4.99786 4.99839 4.99879 4.99909 4.99931 
+    4.99922 4.99933 4.99971 5.00064 5.00084 5.00123 4.99865 
+    4.99853 4.99983 5.00457 5.00242 5.00105 5.00062 5.00042 
+    4.99971 4.9994 4.9992 4.9996 4.99955 4.99932 4.99918 4.99915 
+    4.99919 4.99927 4.99937 4.99948 4.99957 4.99966 4.99974 
+    4.9998 4.99985 4.99989 4.99992 4.99993 4.99994 4.99994 4.99996 
+    4.99998 5 5 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001 
+    5.00001 5.00001 5 5 5 5 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99998 4.99998 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 
+    5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5 5 5 5 5 5 4.9997 4.99998 4.99954 4.99963 
+    5.00059 4.99945 4.99732 4.99957 5.00919 5.00558 5.00033 
+    4.99851 4.9983 4.99854 4.99871 4.99928 4.99914 4.99939 4.99952 
+    4.9998 4.99976 4.99744 4.99598 4.99478 4.99806 5.01911 5.04602 
+    5.05469 5.01317 4.89484 4.69655 4.42036 4.06069 3.60793 
+    3.12531 2.72975 2.45187 2.25081 2.09841 1.98509 1.90211 
+    1.84084 1.79411 1.7574 1.72763 1.70283 1.68188 1.66389 1.64823 
+    1.63438 1.62201 1.61088 1.60081 1.59163 1.58323 1.57549 
+    1.56835 1.56173 1.55558 1.54985 1.54451 1.53951 1.53479 
+    1.53035 1.52615 1.5222 1.51845 1.5149 1.51153 1.50834 1.50529 
+    1.5024 1.49964 1.497 1.49449 1.49208 1.48977 1.48755 1.48542 
+    1.48336 1.48138 1.47948 1.47765 1.4759 1.47419 1.47255 1.47096 
+    1.46949 1.46823 1.46696 1.4657 1.46444 1.46317 1.46191 1.46065 
+    1.45956 1.4585 1.45743 1.45636 1.45529 1.45422 1.45315 1.45226 
+    1.45145 1.45064 1.44983 1.44902 1.44821 1.4474 1.44659 1.44579 
+    1.44498 1.44417 1.44336 1.44255 1.44174 1.44094 1.44019 
+    1.43944 1.43868 1.43793 1.43765 1.43679 1.43515 1.43405 
+    1.43478 1.43387 1.43345 1.43184 1.43086 1.43021 1.43003 
+    1.42988 1.42944 1.42883 1.42818 1.42702 1.42642 1.42595 
+    1.42586 1.42616 1.42783 1.41733 1.38106 1.30738 1.3877 2.09819 
+    3.05285 3.58059 3.77601 3.87609 4.02557 4.24887 4.4608 4.60411 
+    4.72109 4.8255 4.90465 4.97379 5.01253 5.01532 5.01239 5.0092 
+    5.00665 5.00474 5.00333 5.00232 5.00163 5.00117 5.00082 
+    5.00057 5.00039 5.00027 5.00019 5.00013 5.00009 5.00006 
+    5.00004 5.00003 5.00002 5.00001 5.00001 5 5 5 4.99998 4.99995 
+    4.99992 4.99996 5.00005 5.00012 5.00008 4.99996 4.9999 4.99985 
+    4.99986 4.99997 5.00021 5.0003 5.00024 5.00009 5.00007 5.00005 
+    5.00003 5.00001 4.99998 4.99998 4.99998 4.99999 4.99999 
+    5 5 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00002 5.00002 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99998 
+    4.99998 4.99998 
+    EOD
+
+    @v[30].set(<<-'EOD')
+    7.10441e-10 5.70385e-05 0.000226143 0.000131916 -0.000887764 
+    -8.01837e-05 -3.49653e-05 9.40039e-05 0.000118663 0.000108025 
+    8.6059e-05 6.33268e-05 4.99295e-05 3.16843e-05 3.60692e-05 
+    2.07572e-05 -8.6375e-05 3.44583e-05 8.07397e-05 0.000196296 
+    0.000115615 -7.12768e-05 -0.000129812 -4.18679e-05 7.94364e-05 
+    0.000182034 -5.41226e-05 -0.000451819 -0.000713937 -0.00129863 
+    -0.00262186 -0.00213417 -0.00133767 0.000775698 0.000969902 
+    0.000549281 0.000280946 0.000140321 8.6919e-05 7.22446e-05 
+    6.5631e-05 6.45263e-05 6.63087e-05 7.17391e-05 7.59042e-05 
+    7.59172e-05 7.03353e-05 6.33558e-05 5.31136e-05 4.64278e-05 
+    4.40594e-05 4.16909e-05 4.05674e-05 3.96957e-05 3.87875e-05 
+    3.74977e-05 3.62079e-05 3.49181e-05 3.36283e-05 3.23385e-05 
+    3.12427e-05 3.02775e-05 2.93124e-05 2.83472e-05 2.7382e-05 
+    2.64613e-05 2.59077e-05 2.5354e-05 2.48004e-05 2.42468e-05 
+    2.36931e-05 2.31395e-05 2.25859e-05 2.20322e-05 2.14786e-05 
+    2.0925e-05 2.03916e-05 1.9995e-05 1.95984e-05 1.92019e-05 
+    1.88053e-05 1.84087e-05 1.80122e-05 1.76156e-05 1.7219e-05 
+    1.68225e-05 1.64259e-05 1.6051e-05 1.57991e-05 1.55471e-05 
+    1.52952e-05 1.50433e-05 1.47913e-05 1.45394e-05 1.42875e-05 
+    1.40356e-05 1.37836e-05 1.35317e-05 1.32978e-05 1.31513e-05 
+    1.30048e-05 1.28583e-05 1.27118e-05 1.25653e-05 1.24188e-05 
+    1.22724e-05 1.21259e-05 1.19794e-05 1.18329e-05 1.16864e-05 
+    1.15399e-05 1.13934e-05 1.12469e-05 1.11005e-05 1.0954e-05 
+    1.08075e-05 1.0661e-05 1.05145e-05 1.0368e-05 1.02215e-05 
+    1.76447e-05 7.21516e-05 -3.59786e-05 -0.000159618 0.000156236 
+    0.000135106 -0.000336402 -0.000302283 0.000699323 0.000473866 
+    -0.000156146 -0.000225625 -0.000123592 -3.78116e-05 8.47472e-06 
+    2.43387e-06 -7.44762e-05 7.80111e-05 9.43608e-05 0.000170159 
+    8.83919e-05 -0.00018802 -0.000373512 -0.000390597 0.000156875 
+    0.0032343 0.00776304 -0.000566905 -0.00760695 -0.0159226 
+    -0.0245989 -0.0331402 -0.0100902 0.067837 0.266702 0.910818 
+    1.82282 2.69714 3.43247 3.98325 4.32893 4.51529 4.67087 
+    4.79288 4.87574 4.92797 4.95902 4.97655 4.98622 4.99195 
+    4.99526 4.99735 4.9991 4.99974 4.99982 4.99974 4.99961 4.9995 
+    4.99943 4.9994 4.9994 4.99942 4.99944 4.99948 4.99952 4.99956 
+    4.99961 4.99965 4.9997 4.99974 4.99977 4.99981 4.99983 4.99986 
+    4.99988 4.9999 4.99991 4.99992 4.99993 4.99994 4.99995 4.99995 
+    4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 4.99999 
+    4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 5 
+    5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 5 5.00019 4.99888 4.99663 4.99457 4.99902 
+    5.00229 5.00323 5.00302 5.0023 5.0015 5.00085 5.00041 5.00013 
+    4.99993 4.99979 4.99948 4.99954 4.99983 5.00055 5.00109 
+    5.00009 4.9987 4.998 4.99755 4.99676 4.99618 5.01091 5.05272 
+    5.04156 4.80112 4.27692 3.42343 2.23953 0.967179 0.429813 
+    0.540757 1.32991 2.32147 3.14903 3.78143 4.22325 4.47978 
+    4.59448 4.69875 4.79798 4.87419 4.92339 4.95249 4.97174 
+    4.98408 4.99124 4.99478 4.99729 4.99868 4.9992 4.99941 4.99947 
+    4.99946 4.99943 4.9994 4.99939 4.9994 4.99942 4.99946 4.99951 
+    4.99956 4.99961 4.99967 4.99973 4.99977 4.9998 4.99981 4.99983 
+    4.99984 4.99987 4.99992 5.00001 5.00005 5.00001 4.99994 
+    4.99995 4.99995 4.99996 4.99996 4.99996 4.99997 4.99997 
+    4.99997 4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 
+    4.99999 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 
+    4.99998 4.99998 4.99998 
+    EOD
+
+    @v[31].set(<<-'EOD')
+    1.8179e-09 -5.28841e-06 -1.44913e-05 -3.62932e-05 -9.75719e-05 
+    0.000141781 3.73396e-05 -1.65603e-05 -1.5271e-05 -6.73884e-06 
+    4.40157e-06 -4.85345e-06 -1.02964e-05 2.03126e-05 -1.89457e-05 
+    -8.75564e-06 7.67422e-06 4.71103e-06 1.29798e-05 6.13469e-06 
+    -1.14363e-05 -0.0394563 -0.0477298 -0.0622012 -0.0519225 
+    0.262499 0.943611 1.67052 2.31017 2.84028 3.28467 3.61582 
+    3.85887 4.13011 4.36511 4.54063 4.67013 4.76408 4.83263 
+    4.8825 4.91837 4.94373 4.96117 4.97318 4.98093 4.98562 4.98906 
+    4.99267 4.99539 4.99666 4.99731 4.99797 4.99844 4.99887 
+    4.99927 4.99933 4.99938 4.99944 4.99949 4.99955 4.9996 4.99965 
+    4.9997 4.99975 4.9998 4.99985 4.99986 4.99987 4.99989 4.9999 
+    4.99991 4.99992 4.99993 4.99995 4.99996 4.99997 4.99998 
+    4.99998 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5.00001 
+    5.00001 5.00001 5 5 5 5 5 5 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99997 5.00002 5.00004 5.0001 5.0001 4.99987 5.00009 
+    5.00021 5.00002 5.00004 4.99988 5.00013 4.99993 5.00026 
+    4.99973 5 5.00006 5.00009 5.00004 5.00004 5.04854 4.82711 
+    4.04208 2.64155 0.838902 0.19014 0.0982549 0.0723197 0.0576863 
+    0.0427644 0.0301979 0.020146 0.0135728 0.00980358 0.00774482 
+    0.00586604 0.0036687 0.00211511 0.00121906 0.000647581 0.000828436 
+    0.00190938 0.00224254 0.00199956 0.00165488 0.00135612 0.00113715 
+    0.000984181 0.000877175 0.000789973 0.000741139 0.000689338 
+    0.000625676 0.000586082 0.000550152 0.000529573 0.000505606 
+    0.000482117 0.000460574 0.000441649 0.000424674 0.000408398 
+    0.000391914 0.000376272 0.000361487 0.000348181 0.000336045 
+    0.000324466 0.000313545 0.000303046 0.000293056 0.00028356 
+    0.000274586 0.000266155 0.000258279 0.000250938 0.000243789 
+    0.000236912 0.000230244 0.000224186 0.000219291 0.000215346 
+    0.000212468 0.000207291 0.000200862 0.00019368 0.000186767 
+    0.000183515 0.000180263 0.00017701 0.000173758 0.000170506 
+    0.000167253 0.000164001 0.000161164 0.000158357 0.00015555 
+    0.000152743 0.000149936 0.000147129 0.000144322 0.000142066 
+    0.000140096 0.000138127 0.000136157 0.000134187 0.000132218 
+    0.000130248 0.000128278 0.000126308 0.000124339 0.000122369 
+    0.000120399 0.000118429 0.00011646 0.000114527 0.000112892 
+    0.000111258 0.000109623 0.000107988 0.000103598 6.86052e-05 
+    3.337e-05 7.00783e-05 0.000218764 0.000221318 0.000118593 
+    -0.000113962 5.78552e-05 9.42068e-05 0.000237037 0.000171302 
+    0.0001033 6.16066e-05 5.52908e-05 6.30233e-05 7.01897e-05 
+    8.48573e-05 0.000106859 8.37213e-05 -0.0391541 -0.047722 
+    -0.0618454 -0.0169804 0.345725 1.03426 1.74825 2.37152 2.88737 
+    3.32173 3.66761 3.9707 4.17762 3.98832 3.30483 2.09737 0.710892 
+    0.148159 0.0707463 0.0555808 0.045618 0.0319116 0.0199589 
+    0.0133357 0.00898528 0.00586075 0.00375478 0.00245443 0.00156038 
+    0.000962344 0.000590953 0.000375107 0.000250243 0.00015882 
+    0.000100203 6.18122e-05 3.7372e-05 2.23009e-05 1.32569e-05 
+    8.29437e-06 5.72457e-06 3.96832e-06 2.98935e-06 2.59699e-06 
+    2.75024e-06 3.38689e-06 4.0453e-06 3.50095e-06 1.64988e-06 
+    -3.84371e-07 -2.03828e-06 -3.46401e-06 -1.24301e-06 4.63458e-06 
+    1.14104e-05 1.02619e-05 2.15487e-06 -2.98487e-06 -3.67221e-06 
+    -2.94279e-06 -2.58649e-06 -2.23019e-06 -1.87389e-06 -1.5176e-06 
+    -1.1613e-06 -7.92127e-07 -4.18889e-07 -4.56502e-08 3.27588e-07 
+    7.00827e-07 8.79539e-07 8.17025e-07 7.5451e-07 6.91996e-07 
+    6.29481e-07 5.66966e-07 5.04452e-07 4.41937e-07 3.79422e-07 
+    3.16908e-07 2.54393e-07 1.90078e-07 1.25366e-07 6.0654e-08 
+    -4.05776e-09 -6.87696e-08 -1.33481e-07 -1.98193e-07 -2.62905e-07 
+    -3.27617e-07 -3.92329e-07 -4.40392e-07 -4.18802e-07 -3.97213e-07 
+    -3.75624e-07 -3.54035e-07 -3.32446e-07 -3.10856e-07 -2.89267e-07 
+    -2.67678e-07 
+    EOD
+
+    @v[32].set(<<-'EOD')
+    1.10294 1.10297 1.10291 1.10277 1.10259 1.10294 1.10313 
+    1.10306 1.10299 1.10296 1.10295 1.10295 1.10294 1.10294 
+    1.10294 1.10294 1.10294 1.10294 1.10294 1.10296 1.10296 
+    1.00547 0.998599 1.5201 2.49297 3.31258 3.73162 3.84757 
+    3.92505 4.02965 4.16599 4.30294 4.41541 4.52886 4.64414 
+    4.73865 4.81065 4.86391 4.90315 4.93188 4.95258 4.96726 
+    4.97738 4.98436 4.98888 4.99162 4.99363 4.99573 4.99731 
+    4.99804 4.99843 4.99881 4.99909 4.99934 4.99957 4.9996 4.99964 
+    4.99967 4.9997 4.99973 4.99977 4.9998 4.99983 4.99986 4.99988 
+    4.99991 4.99992 4.99992 4.99993 4.99994 4.99994 4.99995 
+    4.99996 4.99996 4.99997 4.99997 4.99998 4.99998 4.99999 
+    4.99999 4.99999 4.99999 5 5 5 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 5.00028 4.99988 4.99968 
+    5.00019 4.99987 5.00021 4.99973 4.99977 4.99996 4.99997 
+    5.0002 4.99957 5.00026 4.99947 5.00074 5.00003 4.99987 4.99979 
+    5.00008 4.99997 5.08794 5.05993 4.76875 3.99197 3.10174 
+    2.5197 2.21771 2.04 1.92235 1.83874 1.77592 1.72665 1.686 
+    1.65276 1.6286 1.61299 1.60039 1.58934 1.57954 1.57083 1.56306 
+    1.55604 1.54963 1.54375 1.53832 1.53331 1.52865 1.52432 
+    1.52026 1.51645 1.51287 1.50949 1.50629 1.50327 1.50039 
+    1.49766 1.49505 1.49257 1.49019 1.48792 1.48574 1.48365 
+    1.48164 1.47971 1.47784 1.47604 1.47431 1.47264 1.47102 
+    1.46945 1.46794 1.46647 1.46505 1.46367 1.46233 1.46103 
+    1.45976 1.45853 1.45733 1.45616 1.45502 1.45392 1.45284 
+    1.45179 1.45076 1.44975 1.4488 1.44795 1.44711 1.44626 1.44541 
+    1.44457 1.44372 1.44287 1.44212 1.44138 1.44063 1.43989 
+    1.43914 1.4384 1.43766 1.43701 1.43641 1.43581 1.43522 1.43462 
+    1.43402 1.43342 1.43282 1.43223 1.43163 1.43103 1.43043 
+    1.42984 1.42924 1.42865 1.42808 1.42752 1.42695 1.42639 
+    1.42584 1.42529 1.42472 1.42412 1.42365 1.42326 1.42304 
+    1.42162 1.42082 1.42032 1.42029 1.42026 1.41995 1.41947 
+    1.41894 1.41841 1.4179 1.41742 1.41699 1.41656 1.32097 1.30963 
+    1.78765 2.64656 3.35764 3.747 3.86589 3.94217 4.04185 4.18453 
+    4.3561 4.53439 4.68621 4.74905 4.77848 4.84629 4.91261 4.97541 
+    5.01284 5.01548 5.01248 5.00924 5.00666 5.00475 5.00334 
+    5.00234 5.00164 5.00118 5.00083 5.00058 5.0004 5.00028 5.00019 
+    5.00013 5.00009 5.00007 5.00004 5.00003 5.00002 5.00001 
+    5.00001 5.00001 5 5 4.99999 4.99995 4.99992 4.99996 5.00006 
+    5.00012 5.00009 4.99997 4.9999 4.99985 4.99986 4.99997 5.00021 
+    5.00031 5.00024 5.0001 5.00007 5.00005 5.00003 5.00001 4.99998 
+    4.99998 4.99999 4.99999 4.99999 5 5 5 5 5 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00002 5.00002 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5 
+    5 4.99999 4.99999 4.99999 4.99998 4.99998 4.99998 
+    EOD
+
+    @v[33].set(<<-'EOD')
+    5 5.00012 5.00023 5.0003 4.99972 4.99988 4.99984 4.99991 
+    4.99996 4.99999 5.00008 5.00009 4.99986 5.00003 5.00007 
+    4.99995 4.9999 4.99997 5.00013 5.00014 5.00013 4.99701 4.99763 
+    4.99742 4.99998 5.02836 5.07262 4.96856 4.57267 3.85637 
+    2.79544 1.45942 0.408016 0.084885 0.0271375 0.0119294 0.00707546 
+    0.0051087 0.00373035 0.00264737 0.00186477 0.00130379 0.000915857 
+    0.000653121 0.000483893 0.000380852 0.000302362 0.000219498 
+    0.000154435 0.000121928 0.000104026 8.61242e-05 7.48526e-05 
+    6.49216e-05 5.56238e-05 5.29689e-05 5.03139e-05 4.7659e-05 
+    4.5004e-05 4.23491e-05 4.00356e-05 3.79522e-05 3.58687e-05 
+    3.37852e-05 3.17018e-05 2.97592e-05 2.89804e-05 2.82016e-05 
+    2.74228e-05 2.66441e-05 2.58653e-05 2.50865e-05 2.43077e-05 
+    2.35289e-05 2.27501e-05 2.19714e-05 2.12346e-05 2.07821e-05 
+    2.03295e-05 1.98769e-05 1.94244e-05 1.89718e-05 1.85192e-05 
+    1.80667e-05 1.76141e-05 1.71615e-05 1.6709e-05 1.62828e-05 
+    1.60061e-05 1.57294e-05 1.54527e-05 1.5176e-05 1.48993e-05 
+    1.46226e-05 1.43459e-05 1.40692e-05 1.37925e-05 1.35158e-05 
+    1.3262e-05 1.31191e-05 1.29761e-05 1.28332e-05 1.26903e-05 
+    1.25474e-05 1.24045e-05 1.22615e-05 1.21186e-05 1.19757e-05 
+    1.18328e-05 1.16898e-05 1.15469e-05 1.1404e-05 1.12611e-05 
+    1.11182e-05 1.09752e-05 1.08323e-05 1.06894e-05 1.05465e-05 
+    1.04036e-05 1.02606e-05 1.00185e-05 3.8343e-05 -3.06781e-05 
+    -0.000111758 0.000111673 0.000130815 -0.000210491 -0.000231304 
+    0.000310226 0.000265303 3.0878e-05 -4.48405e-05 -1.2852e-05 
+    -7.84469e-06 3.29986e-05 -1.23286e-05 -6.07871e-05 5.35082e-05 
+    7.69194e-05 0.000126221 6.57178e-05 0.00223349 -0.0148854 
+    -0.0476636 -0.0491447 0.220125 1.11174 2.03988 2.90209 3.61069 
+    4.13554 4.50679 4.71501 4.83916 4.91027 4.95284 4.98086 
+    4.99151 4.98651 4.97113 4.95075 4.93102 4.93683 4.95457 
+    4.97071 4.98212 4.98948 4.99386 4.99636 4.99785 4.9987 4.99927 
+    4.99989 5.00014 5.00007 4.99988 4.99982 4.99976 4.99973 
+    4.99972 4.99972 4.99973 4.99974 4.99975 4.99977 4.99979 
+    4.99981 4.99984 4.99986 4.99988 4.99989 4.99991 4.99992 
+    4.99993 4.99994 4.99995 4.99996 4.99996 4.99997 4.99997 
+    4.99998 4.99998 4.99998 4.99998 4.99999 4.99999 4.99999 
+    4.99999 5 5 5 5.00001 5.00001 5.00001 5.00002 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5 5 5 5 5 5 5 5 4.99999 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 4.99999 
+    4.99999 4.99999 4.99999 5 5.00012 4.99946 4.99839 4.99733 
+    4.99948 5.00114 5.00158 5.00147 5.00113 5.00073 5.00043 
+    5.0002 5.00006 4.99995 4.99986 4.99973 4.99976 4.9999 5.00029 
+    5.00055 4.99704 4.99734 4.9972 5.00278 5.03354 5.07184 4.94057 
+    4.51936 3.75638 2.60982 1.23803 0.315016 0.0796102 0.0252894 
+    0.0165723 0.0827785 0.491298 1.40686 2.33436 3.1251 3.7691 
+    4.22201 4.49976 4.68115 4.80513 4.88509 4.93208 4.95861 
+    4.97579 4.98655 4.99268 4.99571 4.99771 4.99881 4.99929 
+    4.99954 4.99965 4.9997 4.99971 4.99971 4.99971 4.99971 4.99972 
+    4.99974 4.99976 4.99978 4.99981 4.99984 4.99987 4.99989 
+    4.99991 4.99991 4.99992 4.99992 4.99993 4.99997 5.00003 
+    5.00006 5.00004 5.00001 5 4.99999 4.99998 4.99998 4.99997 
+    4.99997 4.99997 4.99998 4.99998 4.99998 4.99999 4.99999 
+    4.99999 4.99999 5 5 5 5 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5 5 5 5 5 5 5 4.99999 
+    4.99999 4.99999 4.99999 4.99998 4.99998 
+    EOD
+
+    @v[34].set(<<-'EOD')
+    5 5.00207 5.00813 5.01486 5.00156 5.0018 4.99861 4.99844 
+    4.99888 4.9993 4.99956 4.99971 4.99979 4.99983 4.99987 4.99989 
+    4.99671 4.9974 4.99864 5.00131 5.00377 5.0021 5.00039 4.99993 
+    5.00004 5.0009 5.00109 4.99636 4.98617 4.96778 4.92047 4.89528 
+    4.91112 4.9559 4.98286 4.99369 4.99812 4.99951 4.99994 5.00014 
+    5.00008 4.99994 4.99984 4.99989 4.99998 5.00004 5.00004 
+    5.00006 5.00005 5.00001 4.99997 4.99992 4.99993 4.99994 
+    4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 
+    4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 4.99996 
+    4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 
+    4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 
+    4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 4.99997 
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 
+    4.99998 4.99998 4.99998 4.99998 5.00131 5.00072 4.9977 4.99811 
+    5.00325 4.99647 4.98948 4.99459 5.00262 5.00276 5.00156 
+    5.00072 5.0003 5.00013 4.99995 4.99668 4.99775 4.99917 5.00173 
+    5.00386 5.00188 4.99888 4.99757 4.99951 5.01712 5.0557 5.07088 
+    5.07704 5.07758 5.06958 5.04223 5.03331 5.0279 5.03408 5.07611 
+    5.01911 4.68594 3.99152 2.92195 1.69878 0.809 0.344091 0.154663 
+    0.0788717 0.0467212 0.0336168 0.0280514 0.0254947 0.024173 
+    0.0223567 0.0220555 0.0271514 0.0295872 0.0296052 0.0283971 
+    0.0264726 0.0241813 0.0218244 0.0195349 0.017368 0.0152495 
+    0.013295 0.0115444 0.00996982 0.00857091 0.00733891 0.00627261 
+    0.0053494 0.00456316 0.00388373 0.00331073 0.00282181 0.00240991 
+    0.00206389 0.00177187 0.00152283 0.00131167 0.00112558 0.000954373 
+    0.000805726 0.00069326 0.000600991 0.000525743 0.00047355 
+    0.00044359 0.000434815 0.000436053 0.000402511 0.000368969 
+    0.000335427 0.000301886 0.000268344 0.000234802 0.00020126 
+    0.000184967 0.000169932 0.000154896 0.000139861 0.000124825 
+    0.00010979 9.47546e-05 8.67896e-05 8.24901e-05 7.81906e-05 
+    7.38911e-05 6.95915e-05 6.5292e-05 6.09925e-05 5.66929e-05 
+    5.23934e-05 4.80939e-05 4.37943e-05 3.94948e-05 3.51953e-05 
+    3.08957e-05 2.67968e-05 2.42936e-05 2.17904e-05 1.92872e-05 
+    1.6784e-05 0.00125927 -0.00794344 -0.0305499 -0.0621697 
+    -0.0463796 -0.0224608 -0.00538381 0.00546086 0.0108675 0.012883 
+    0.0131787 0.0127271 0.0119702 0.0110398 0.0100635 0.00649617 
+    0.00489388 0.00545863 0.0098351 0.0167428 0.0126563 0.00697542 
+    0.00427027 0.00330002 0.00390774 0.00408999 -0.00259143 
+    -0.0160578 -0.0451849 -0.0409651 0.1301 0.597429 1.3848 
+    2.63426 3.81272 4.51373 4.8412 4.98731 4.88165 4.37165 3.40034 
+    2.17681 1.12217 0.505129 0.219703 0.104992 0.0622333 0.0448317 
+    0.0355782 0.0311867 0.0293529 0.0274615 0.0288739 0.0307845 
+    0.0304909 0.029245 0.0273602 0.0251006 0.022697 0.0202765 
+    0.0179357 0.0157106 0.0136562 0.0117951 0.0101273 0.00865784 
+    0.00739394 0.00634364 0.00551356 0.00480538 0.00415747 0.00356084 
+    0.00297585 0.00236711 0.00181853 0.00160713 0.00169822 0.00166542 
+    0.00145504 0.00120252 0.00109259 0.000982658 0.00087273 
+    0.000762802 0.000652874 0.000584068 0.000528263 0.000472458 
+    0.000416653 0.000360848 0.000321155 0.000301442 0.000281729 
+    0.000262016 0.000242303 0.00022259 0.000202877 0.000183164 
+    0.000163451 0.000143738 0.000124025 0.000114582 0.000107399 
+    0.000100216 9.30332e-05 8.58502e-05 7.86672e-05 7.14841e-05 
+    6.43011e-05 5.7118e-05 4.9935e-05 4.35378e-05 4.04281e-05 
+    3.73184e-05 3.42088e-05 3.10991e-05 2.79894e-05 2.48798e-05 
+    2.17701e-05 1.86604e-05 
+    EOD
+
+    @v[35].set(<<-'EOD')
+    7.24585e-12 2.21843e-05 3.20014e-05 1.25076e-05 -2.44947e-05 
+    1.8425e-05 5.50546e-06 3.53025e-05 -1.07551e-05 -3.94383e-06 
+    -2.27848e-06 -9.04789e-05 7.44215e-05 -2.7662e-05 0.000200038 
+    -2.11998e-05 -2.09011e-05 2.37098e-05 2.18751e-05 -2.28422e-05 
+    -6.23659e-05 3.58241e-05 1.76386e-05 -4.28311e-05 0.000355626 
+    0.00156903 0.00100999 -0.0085304 -0.02067 -0.0389485 -0.0651568 
+    -0.128475 -0.314362 -0.406837 -0.421558 -0.421277 -0.418176 
+    -0.414481 -0.410845 -0.407348 -0.403971 -0.400716 -0.397582 
+    -0.394563 -0.391658 -0.388866 -0.386178 -0.383585 -0.381094 
+    -0.378789 -0.376569 -0.37435 -0.372256 -0.370188 -0.36815 
+    -0.366422 -0.364694 -0.362967 -0.361239 -0.359511 -0.357888 
+    -0.356334 -0.354781 -0.353227 -0.351674 -0.350152 -0.348888 
+    -0.347625 -0.346361 -0.345098 -0.343834 -0.342571 -0.341307 
+    -0.340044 -0.33878 -0.337517 -0.336279 -0.335215 -0.334152 
+    -0.333088 -0.332024 -0.330961 -0.329897 -0.328833 -0.32777 
+    -0.326706 -0.325642 -0.324601 -0.323683 -0.322766 -0.321849 
+    -0.320932 -0.320014 -0.319097 -0.31818 -0.317263 -0.316345 
+    -0.315428 -0.314545 -0.313825 -0.313106 -0.312387 -0.311667 
+    -0.310948 -0.310228 -0.309509 -0.308789 -0.30807 -0.307351 
+    -0.306631 -0.305912 -0.305192 -0.304473 -0.303754 -0.303034 
+    -0.302315 -0.301595 -0.300876 -0.300157 -0.299437 -0.298716 
+    -0.29798 -0.297329 -0.296691 -0.295837 -0.29516 -0.294725 
+    -0.294044 -0.292917 -0.292351 -0.291965 -0.291365 -0.290687 
+    -0.290027 -0.289376 -0.288772 -0.288193 -0.287505 -0.286892 
+    -0.28626 -0.285714 -0.284545 -0.289246 -0.298717 -0.298492 
+    -0.214163 0.181451 0.0749974 0.0454707 0.0292987 0.0196837 
+    0.0124119 0.00884715 0.00527181 0.00585821 0.0296361 0.169856 
+    0.361207 0.538856 0.67469 0.685933 0.392802 0.17772 0.0813085 
+    0.0424601 0.0246654 0.0175258 0.0144256 0.0129859 0.012205 
+    0.0112846 0.010933 0.0134813 0.0147254 0.0147981 0.0142156 
+    0.0132732 0.0121355 0.0109587 0.00981238 0.00872731 0.00767007 
+    0.00669346 0.00581341 0.00502167 0.00431819 0.00369842 0.00316168 
+    0.00269663 0.00230035 0.00195801 0.00166928 0.00142286 0.00121522 
+    0.00104072 0.000893384 0.000767675 0.000661268 0.000567659 
+    0.000481766 0.000407101 0.000350044 0.000302721 0.000263424 
+    0.000236813 0.00022199 0.000218182 0.000219548 0.0002027 
+    0.000185853 0.000169006 0.000152158 0.000135311 0.000118463 
+    0.000101616 9.33782e-05 8.57685e-05 7.81588e-05 7.0549e-05 
+    6.29393e-05 5.53296e-05 4.77199e-05 4.36954e-05 4.15296e-05 
+    3.93637e-05 3.71978e-05 3.50319e-05 3.28661e-05 3.07002e-05 
+    2.85343e-05 2.63685e-05 2.42026e-05 2.20367e-05 1.98709e-05 
+    1.7705e-05 1.55391e-05 1.34772e-05 1.22416e-05 1.10061e-05 
+    9.77055e-06 8.535e-06 0.000631271 -0.00362586 -0.0146235 
+    -0.0308486 -0.0237466 -0.0117522 -0.00304171 0.00251033 
+    0.00531986 0.0063897 0.00657351 0.00636494 0.00599705 0.00553442 
+    0.00505994 0.00330925 0.00246671 0.0027006 0.00473161 0.00830333 
+    0.00649147 0.00356815 0.00217448 0.00187579 0.00270447 0.00219543 
+    -0.00546118 -0.0179576 -0.0445306 -0.0649309 0.0197935 0.473629 
+    0.87268 0.269542 0.0086094 0.0844602 0.606456 1.04929 0.906014 
+    0.916205 0.919425 0.872867 0.556244 0.262457 0.11838 0.0571226 
+    0.0333451 0.0237133 0.0185096 0.0159617 0.0148663 0.0138683 
+    0.0144081 0.0153797 0.0152551 0.0146487 0.0137192 0.0125973 
+    0.0113996 0.0101903 0.00901851 0.00790495 0.00687502 0.00593994 
+    0.00510092 0.00436111 0.00372439 0.0031945 0.00277537 0.00241888 
+    0.002095 0.00179943 0.00150419 0.00119264 0.00090934 0.000802394 
+    0.000852816 0.000838368 0.000730842 0.000601028 0.000546616 
+    0.000492205 0.000437793 0.000383381 0.000328969 0.00029454 
+    0.000266428 0.000238317 0.000210205 0.000182093 0.000162091 
+    0.000152145 0.000142198 0.000132252 0.000122306 0.000112359 
+    0.000102413 9.24665e-05 8.25201e-05 7.25738e-05 6.26274e-05 
+    5.78553e-05 5.42216e-05 5.05878e-05 4.69541e-05 4.33204e-05 
+    3.96867e-05 3.60529e-05 3.24192e-05 2.87855e-05 2.51518e-05 
+    2.19153e-05 2.03406e-05 1.8766e-05 1.71913e-05 1.56167e-05 
+    1.4042e-05 1.24674e-05 1.08927e-05 9.31806e-06 
+    EOD
+
+    @v[36].set(<<-'EOD')
+    5 5.01426 5.02852 5.01923 4.77685 4.56471 4.52338 4.56813 
+    4.63122 4.693 4.74776 4.79385 4.83258 4.86358 4.88918 4.91021 
+    4.90553 4.89733 4.89554 4.91953 5.00757 5.07101 5.06318 
+    5.05241 5.05535 5.08042 5.07251 4.90973 4.56136 3.98637 
+    3.237 2.67216 2.33678 2.13529 2.00544 1.91429 1.84638 1.79461 
+    1.75338 1.71958 1.69175 1.6686 1.64918 1.63258 1.61836 1.60607 
+    1.59506 1.58483 1.57575 1.56847 1.56193 1.55538 1.54968 
+    1.54416 1.5388 1.53523 1.53165 1.52807 1.52449 1.52091 1.51771 
+    1.51477 1.51182 1.50888 1.50593 1.50309 1.50113 1.49917 
+    1.4972 1.49524 1.49328 1.49132 1.48935 1.48739 1.48543 1.48346 
+    1.48157 1.48012 1.47868 1.47724 1.47579 1.47435 1.47291 
+    1.47146 1.47002 1.46857 1.46713 1.46574 1.46462 1.4635 1.46238 
+    1.46126 1.46014 1.45902 1.4579 1.45678 1.45567 1.45455 1.45349 
+    1.45275 1.45201 1.45127 1.45053 1.44979 1.44905 1.44831 
+    1.44757 1.44683 1.44609 1.44535 1.44461 1.44387 1.44313 
+    1.44239 1.44165 1.44091 1.44017 1.43943 1.43869 1.43795 
+    1.43721 1.43874 1.43976 1.43619 1.43182 1.43726 1.43084 
+    1.42587 1.42383 1.42642 1.42728 1.42736 1.4271 1.42669 1.42621 
+    1.42569 1.41703 1.41244 1.41019 1.41199 1.41833 1.42502 
+    1.41504 1.37535 1.28381 1.44779 2.33713 3.25835 3.67554 
+    3.84975 4.01125 4.2253 4.45433 4.62215 4.74478 4.82998 4.8868 
+    4.92396 4.94768 4.96498 4.98537 5.0128 5.04467 5.06722 5.06535 
+    5.01475 4.91956 4.80647 4.7242 4.7059 4.73552 4.76379 4.81684 
+    4.87376 4.92276 4.96112 4.9884 5.0045 5.00999 5.00933 5.00619 
+    5.00384 5.00342 5.00373 5.00362 5.00309 5.00272 5.00239 
+    5.00204 5.00172 5.00146 5.00124 5.00105 5.00089 5.00076 
+    5.00065 5.00057 5.00048 5.00041 5.00034 5.00028 5.00023 
+    5.00019 5.00015 5.00015 5.00016 5.0002 5.00023 5.00021 5.00019 
+    5.00017 5.00015 5.00012 5.0001 5.00008 5.00007 5.00006 5.00005 
+    5.00004 5.00003 5.00002 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00002 5.00002 5.00002 5.00002 
+    5.00002 5.00002 5.00002 5.00002 5.00002 5.00002 5.00001 
+    5.00001 5.00001 5.00062 4.99506 4.9835 4.96726 4.9728 4.97877 
+    4.98675 4.9966 5.00406 5.00679 5.00629 5.00561 5.00487 5.00429 
+    5.00384 5.002 5.00164 5.00229 5.00484 5.00769 5.00019 5.00242 
+    5.01319 5.0335 5.07265 5.10129 5.11485 5.12551 5.13953 5.16048 
+    5.18862 5.22811 5.25656 5.25627 5.19975 4.9139 4.24745 3.43732 
+    2.8202 2.43224 2.17409 2.01333 1.93951 1.94622 1.98861 2.02217 
+    2.05383 2.08376 2.11184 2.13793 2.16191 2.18267 2.20502 
+    2.22837 2.24958 2.26901 2.28648 2.302 2.31582 2.32802 2.33869 
+    2.34795 2.35596 2.36282 2.3687 2.37371 2.37797 2.38161 2.38476 
+    2.38743 2.3897 2.39168 2.39329 2.39463 2.39575 2.39671 2.39756 
+    2.39835 2.39907 2.39968 2.39999 2.4003 2.40061 2.40091 2.40122 
+    2.40142 2.40159 2.40176 2.40193 2.4021 2.40222 2.40228 2.40234 
+    2.4024 2.40247 2.40253 2.40259 2.40265 2.40271 2.40277 2.40284 
+    2.40287 2.40289 2.40291 2.40294 2.40296 2.40298 2.40301 
+    2.40303 2.40305 2.40308 2.4031 2.40311 2.40312 2.40313 2.40314 
+    2.40315 2.40316 2.40317 2.40318 
+    EOD
+
+    @v[37].set(<<-'EOD')
+    5 5.01732 5.03181 5.05944 5.12686 5.20725 5.28103 5.31254 
+    5.32901 5.33709 5.3408 5.34257 5.34311 5.34347 5.34386 5.34411 
+    5.3406 5.33484 5.32942 5.32904 5.33644 5.34869 5.35001 5.34882 
+    5.34758 5.34672 5.34599 5.34496 5.34364 5.34165 5.33712 
+    5.33502 5.3366 5.34067 5.34306 5.34398 5.34434 5.34442 5.34443 
+    5.34443 5.34441 5.34439 5.34437 5.34437 5.34438 5.34438 
+    5.34438 5.34438 5.34438 5.34437 5.34437 5.34436 5.34436 
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 5.34437 
+    5.34437 5.34437 5.34437 5.34437 5.34437 5.35377 5.35451 
+    5.34265 5.34488 5.35861 5.28622 4.90033 4.75027 4.89731 
+    4.97098 4.99293 4.99832 4.99909 4.99956 4.99858 4.99829 
+    4.9998 5.00035 5.0038 5.00989 5.00251 4.99438 4.9953 4.99761 
+    4.99985 5.00152 5.0011 5.00046 4.99996 4.99925 4.99862 4.99919 
+    4.99961 5.00048 5.00234 4.99654 4.98235 4.95936 4.83738 
+    4.53021 4.21004 4.00593 3.91207 3.88059 3.87822 3.89117 
+    3.91278 3.94044 3.97376 4.01152 4.05052 4.10679 4.17908 
+    4.25673 4.33414 4.40875 4.47879 4.54342 4.60258 4.65595 
+    4.70291 4.74414 4.78018 4.81185 4.83915 4.86291 4.88301 
+    4.90048 4.91528 4.92802 4.9387 4.94777 4.95539 4.9618 4.96725 
+    4.97195 4.97588 4.97932 4.98247 4.98512 4.98697 4.98831 
+    4.98919 4.99015 4.99101 4.99169 4.99222 4.99282 4.99341 
+    4.994 4.9946 4.99519 4.99578 4.99638 4.99667 4.99693 4.9972 
+    4.99747 4.99773 4.998 4.99827 4.99841 4.99849 4.99856 4.99864 
+    4.99872 4.9988 4.99888 4.99896 4.99904 4.99911 4.99919 4.99927 
+    4.99935 4.99943 4.9995 4.99955 4.9996 4.99965 4.9997 5.00736 
+    4.98252 4.87516 4.66727 4.49142 4.43103 4.4301 4.4571 4.49729 
+    4.5407 4.5835 4.62363 4.66114 4.69577 4.72738 4.74632 4.75971 
+    4.77576 4.80671 4.87073 4.91665 4.93252 4.94418 4.95331 
+    4.96094 4.96727 4.97148 4.97471 4.97612 4.98276 5.00247 
+    5.04086 5.08628 5.10673 5.08887 5.0564 5.02767 5.01336 4.99685 
+    4.97422 4.90866 4.67035 4.33117 4.07888 3.94432 3.89105 
+    3.88174 3.89292 3.91442 3.94564 3.98708 4.0355 4.09134 4.16315 
+    4.24088 4.31918 4.39527 4.46693 4.53337 4.59405 4.6486 4.69693 
+    4.73938 4.77617 4.80809 4.83551 4.85895 4.87894 4.89596 
+    4.91081 4.92417 4.93651 4.94552 4.95198 4.9565 4.96096 4.96523 
+    4.96972 4.97428 4.97868 4.98064 4.9826 4.98455 4.98651 4.98847 
+    4.98967 4.99064 4.9916 4.99257 4.99353 4.99422 4.99457 4.99493 
+    4.99528 4.99563 4.99598 4.99633 4.99668 4.99703 4.99738 
+    4.99773 4.9979 4.99804 4.99817 4.9983 4.99843 4.99856 4.99869 
+    4.99883 4.99896 4.99909 4.99921 4.99926 4.99931 4.99937 
+    4.99942 4.99948 4.99953 4.99959 4.99964 
+    EOD
+
+    @v[38].set(<<-'EOD')
+    4.49849 4.53282 4.58329 4.66625 4.83345 4.97823 5.0207 5.01816 
+    5.01116 5.00595 5.00296 5.00148 5.00073 5.00062 5.00033 
+    5.0003 4.99864 4.99661 4.99652 4.99928 5.00361 5.12573 5.17251 
+    5.22612 5.33479 5.44503 5.44432 5.44379 5.44334 5.443 5.44276 
+    5.44258 5.44246 5.44238 5.44232 5.44228 5.44225 5.44223 
+    5.44221 5.4422 5.44219 5.44219 5.44218 5.44218 5.44218 5.44218 
+    5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 
+    5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 
+    5.44217 5.44217 5.44217 5.44217 5.44217 5.44217 5.44216 
+    5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 
+    5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 5.44216 
+    5.44216 5.44216 5.44216 5.44216 5.44215 5.44215 5.44215 
+    5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 
+    5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 
+    5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 5.44215 
+    5.44214 5.44214 5.44214 5.44214 5.44214 5.44214 5.44214 
+    5.44214 5.44214 5.44214 5.44214 5.44212 5.45159 5.45236 
+    5.44064 5.44307 5.45616 5.38122 4.77163 3.53297 2.74466 
+    2.34448 2.11802 1.9783 1.88656 1.82001 1.77389 1.72955 1.69632 
+    1.66971 1.6526 1.65236 1.56034 1.53764 1.97139 2.75096 3.39212 
+    3.74042 3.82345 3.85696 3.88547 3.91862 3.9585 4.00467 4.05903 
+    4.1254 4.19533 4.26791 4.34517 4.42112 4.49238 4.55807 4.6179 
+    4.6713 4.71815 4.75889 4.79418 4.82456 4.85062 4.87291 4.89196 
+    4.90823 4.92209 4.93388 4.9439 4.95242 4.95968 4.96585 4.97108 
+    4.9755 4.97923 4.98237 4.98503 4.98732 4.98927 4.99094 4.99233 
+    4.99353 4.99452 4.99538 4.99608 4.99668 4.99718 4.9976 4.99794 
+    4.99822 4.99847 4.99867 4.99884 4.99899 4.99913 4.99924 
+    4.99932 4.99938 4.99943 4.99947 4.99951 4.99953 4.99955 
+    4.99958 4.99961 4.99964 4.99967 4.99969 4.99972 4.99975 
+    4.99977 4.99978 4.99979 4.99981 4.99982 4.99983 4.99985 
+    4.99986 4.99986 4.99987 4.99987 4.99988 4.99988 4.99988 
+    4.99989 4.99989 4.9999 4.9999 4.99991 4.99991 4.99992 4.99992 
+    4.99993 4.99993 4.99993 4.99994 5.00381 5.00064 4.99246 
+    4.99823 5.00349 5.00076 5.00033 5.00015 5.00009 5.00007 
+    5.00005 5.00004 5.00003 5.00002 4.99988 4.99732 4.99728 
+    4.9978 5.00187 5.00927 5.08712 5.07654 4.92855 4.4863 3.76162 
+    3.00049 2.49834 2.20883 2.03492 1.92384 1.84676 1.79021 
+    1.74716 1.7132 1.68576 1.66309 1.64406 1.62785 1.61383 1.60162 
+    1.59081 1.58117 1.57253 1.56473 1.55765 1.55117 1.54527 
+    1.53988 1.53485 1.53012 1.5257 1.5216 1.51773 1.51411 1.51071 
+    1.50746 1.50438 1.50146 1.49868 1.49603 1.4935 1.49109 1.48878 
+    1.48657 1.48445 1.48242 1.48046 1.47858 1.47677 1.47502 
+    1.47333 1.4717 1.47012 1.46859 1.46711 1.46568 1.46428 1.46292 
+    1.4616 1.46034 1.45923 1.45812 1.45701 1.4559 1.45479 1.45378 
+    1.45279 1.45181 1.45082 1.44983 1.44893 1.44813 1.44732 
+    1.44652 1.44571 1.44491 1.4441 1.4433 1.44249 1.44169 1.44089 
+    1.44019 1.43951 1.43883 1.43815 1.43747 1.4368 1.43612 1.43544 
+    1.43476 1.43408 1.43342 1.43283 1.43223 1.43163 1.43104 
+    1.43044 1.42984 1.42924 1.42865 
+    EOD
+
+    @v[39].set(<<-'EOD')
+    5 5.01048 5.01221 4.98887 4.76261 4.54943 4.51564 4.56249 
+    4.62621 4.68843 4.74374 4.79044 4.82972 4.86127 4.88724 
+    4.90862 4.90791 4.89858 4.89589 4.91767 5.00405 5.16956 
+    5.12391 4.7557 3.87953 3.01124 2.48482 2.20424 2.03812 1.92679 
+    1.84956 1.79256 1.74907 1.71487 1.68724 1.6644 1.64513 1.6287 
+    1.61446 1.60197 1.59095 1.58117 1.57245 1.5646 1.55752 1.55109 
+    1.54516 1.53958 1.53444 1.53008 1.52606 1.52205 1.51843 
+    1.5149 1.51146 1.50893 1.50639 1.50387 1.50133 1.4988 1.49651 
+    1.49436 1.49222 1.49007 1.48793 1.48585 1.48433 1.4828 1.48128 
+    1.47975 1.47823 1.4767 1.47518 1.47365 1.47213 1.4706 1.46912 
+    1.46795 1.46678 1.46561 1.46444 1.46327 1.4621 1.46093 1.45976 
+    1.45859 1.45741 1.45628 1.45534 1.45441 1.45347 1.45254 
+    1.4516 1.45067 1.44973 1.4488 1.44786 1.44693 1.44604 1.44539 
+    1.44475 1.4441 1.44345 1.44281 1.44216 1.44151 1.44086 1.44022 
+    1.43957 1.43892 1.43828 1.43763 1.43698 1.43633 1.43569 
+    1.43504 1.43439 1.43375 1.4331 1.43245 1.4318 1.43157 1.43089 
+    1.43001 1.43042 1.42899 1.42439 1.42216 1.43447 1.44048 
+    1.43705 1.43314 1.43039 1.42861 1.42739 1.42651 1.42548 
+    1.42488 1.4243 1.42392 1.4235 1.32443 1.31149 1.78169 2.64844 
+    3.43211 3.95252 4.20231 4.3746 4.49948 4.58929 4.65742 4.71183 
+    4.77057 4.83196 4.88354 4.92894 4.96625 4.99235 5.00651 
+    5.00941 5.00813 5.00689 5.00588 5.00504 5.00431 5.00368 
+    5.00314 5.00268 5.00228 5.00194 5.00165 5.0014 5.00118 5.001 
+    5.00085 5.00072 5.00061 5.00052 5.00044 5.00037 5.00031 
+    5.00027 5.00022 5.00019 5.00016 5.00013 5.00011 5.00009 
+    5.00008 5.00007 5.00006 5.00005 5.00004 5.00003 5.00003 
+    5.00003 5.00002 5.00002 5.00002 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 5.00001 
+    5.00001 5.00001 5 5 5 5 5 4.99999 4.99999 4.99999 4.99998 
+    4.99998 4.99998 4.99998 4.99998 4.99998 4.99998 4.99999 
+    4.99999 4.99999 4.99999 4.99999 4.99999 5 5 5 5 5.00001 
+    5.00002 5.00003 5.00004 5.00022 4.99974 4.99942 4.99997 
+    5.00063 5.00002 5.00003 4.99994 4.99998 4.99999 5 5 5 5 
+    5 4.99981 4.99998 5.00004 5.00036 5.00049 5.12012 5.16315 
+    5.19712 5.21835 4.87874 4.10151 3.31555 2.74207 2.38075 
+    2.15872 2.01614 1.91886 1.84852 1.79401 1.75052 1.71508 
+    1.68672 1.66467 1.64602 1.62985 1.61576 1.60343 1.59256 
+    1.58287 1.57418 1.56632 1.55922 1.55282 1.54687 1.54132 
+    1.53618 1.53143 1.52698 1.52282 1.51895 1.51527 1.5118 1.50851 
+    1.5054 1.50244 1.49963 1.49695 1.4944 1.49196 1.48963 1.4874 
+    1.48527 1.48322 1.48124 1.47934 1.47751 1.47574 1.47403 
+    1.47239 1.4708 1.46926 1.46777 1.46632 1.46491 1.46355 1.46237 
+    1.4612 1.46002 1.45884 1.45766 1.45659 1.45555 1.45451 1.45346 
+    1.45242 1.45147 1.45062 1.44978 1.44894 1.44809 1.44725 
+    1.4464 1.44556 1.44472 1.44387 1.44303 1.4423 1.44159 1.44088 
+    1.44017 1.43947 1.43876 1.43805 1.43734 1.43664 1.43593 
+    1.43524 1.43462 1.434 1.43338 1.43276 1.43213 1.43151 1.43089 
+    1.43027 
+    EOD
+  end
+
+  def highlightTrace(graph)
+    entry = graph.legend_get(:current)
+    active_list = graph.legend_activate
+    if active_list.include?(entry)
+      graph.legend_deactivate(entry)
+      graph.element_deactivate(entry)
+    else
+      graph.legend_activate(entry)
+      graph.element_activate(entry)
+    end
+  end
+
+end
+
+BLT_Graph_Demo.new
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph7.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph7.rb
new file mode 100644
index 0000000000..27fbe53d97
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph7.rb
@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/blt'
+
+length = 250000
+graph = Tk::BLT::Graph.new(:title=>"Scatter Plot\n#{length} points")
+graph.xaxis_configure(:loose=>false, :title=>'X Axis Label')
+graph.yaxis_configure(:title=>'Y Axis Label')
+graph.legend_configure(:activerelief=>:sunken, :background=>'')
+
+Tk::BLT::Table.add(Tk.root, graph, [0,0], :fill=>:both)
+
+v_x = Tk::BLT::Vector.new(length)
+v_y = Tk::BLT::Vector.new(length)
+v_x.expr("random(#{v_x})")
+v_y.expr("random(#{v_y})")
+v_x.sort(v_y)
+
+plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square, 
+                                           :color=>'green4', :fill=>'green2', 
+                                           :linewidth=>0, :outlinewidth=>1, 
+                                           :pixels=>4, :label=>'plot', 
+                                           :xdata=>v_x, :ydata=>v_y)
+
+Tk.root.minsize(0, 0)
+
+#graph.zoom_stack
+#graph.crosshairs
+#graph.active_legend
+#graph.closest_point
+Tk::BLT.zoom_stack(graph)
+Tk::BLT.crosshairs(graph)
+Tk::BLT.active_legend(graph)
+Tk::BLT.closest_point(graph)
+
+Tk::BLT::Busy.hold(graph)
+Tk.update
+Tk::BLT::Busy.release(graph)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph7a.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph7a.rb
new file mode 100644
index 0000000000..a014f72fc7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph7a.rb
@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/blt'
+
+file = File.join(File.dirname(File.expand_path(__FILE__)), 
+                 'images', 'buckskin.gif')
+bgTexture = TkPhotoImage.new(:file=>file)
+
+TkOption.add('*Graph.Tile', bgTexture)
+TkOption.add('*Label.Tile', bgTexture)
+TkOption.add('*Frame.Tile', bgTexture)
+TkOption.add('*Htext.Tile', bgTexture)
+TkOption.add('*TileOffset', 0)
+TkOption.add('*HighlightThickness',   0)
+TkOption.add('*Element.ScaleSybols',  false)
+TkOption.add('*Element.Smooth',       :linear)
+TkOption.add('*activeLine.Color',     'yellow4')
+TkOption.add('*activeLine.Fill',      'yellow')
+TkOption.add('*activeLine.LineWidth', 0)
+TkOption.add('*Element.Pixels',       3)
+TkOption.add('*Graph.halo',           '7i')
+
+if Tk.root.winfo_screenvisual != 'staticgray'
+  TkOption.add('*print.background', 'yellow')
+  TkOption.add('*quit.background',  'red')
+end
+
+length = 250000
+graph = Tk::BLT::Graph.new(:title=>"Scatter Plot\n#{length} points")
+graph.xaxis_configure(:loose=>false, :title=>'X Axis Label')
+graph.yaxis_configure(:title=>'Y Axis Label')
+graph.legend_configure(:activerelief=>:sunken, :background=>'')
+
+Tk::BLT::Table.add(Tk.root, graph, [0,0], :fill=>:both)
+
+v_x = Tk::BLT::Vector.new(length)
+v_y = Tk::BLT::Vector.new(length)
+v_x.expr("random(#{v_x})")
+v_y.expr("random(#{v_y})")
+v_x.sort(v_y)
+
+plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square, 
+                                           :color=>'green4', :fill=>'green2', 
+                                           :linewidth=>0, :outlinewidth=>1, 
+                                           :pixels=>4, :label=>'plot', 
+                                           :xdata=>v_x, :ydata=>v_y)
+
+Tk.root.minsize(0, 0)
+
+#graph.zoom_stack
+#graph.crosshairs
+#graph.active_legend
+#graph.closest_point
+Tk::BLT.zoom_stack(graph)
+Tk::BLT.crosshairs(graph)
+Tk::BLT.active_legend(graph)
+Tk::BLT.closest_point(graph)
+
+Tk::BLT::Busy.hold(graph)
+Tk.update
+Tk::BLT::Busy.release(graph)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph7b.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph7b.rb
new file mode 100644
index 0000000000..c589f18d86
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph7b.rb
@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/blt'
+
+length = 250000
+graph = Tk::BLT::Graph.new(:title=>"Scatter Plot\n#{length} points")
+graph.xaxis_configure(:loose=>false, :title=>'X Axis Label')
+graph.yaxis_configure(:title=>'Y Axis Label')
+graph.legend_configure(:activerelief=>:sunken, :background=>'')
+
+Tk::BLT::Table.add(Tk.root, graph, [0,0], :fill=>:both)
+
+x = Array.new(length)
+y = Array.new(length)
+(0...length).each{|i|
+  x[i] = rand
+  y[i] = rand
+}
+
+plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square, 
+                                           :color=>'green4', :fill=>'green2', 
+                                           :linewidth=>0, :outlinewidth=>1, 
+                                           :pixels=>4, :label=>'plot', 
+                                           :xdata=>x, :ydata=>y)
+
+Tk.root.minsize(0, 0)
+
+#graph.zoom_stack
+#graph.crosshairs
+#graph.active_legend
+#graph.closest_point
+Tk::BLT.zoom_stack(graph)
+Tk::BLT.crosshairs(graph)
+Tk::BLT.active_legend(graph)
+Tk::BLT.closest_point(graph)
+
+Tk::BLT::Busy.hold(graph)
+Tk.update
+Tk::BLT::Busy.release(graph)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph7c.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph7c.rb
new file mode 100644
index 0000000000..495b66f4af
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/graph7c.rb
@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/blt'
+
+length = 250000
+graph = Tk::BLT::Graph.new(:title=>"Scatter Plot\n#{length} points")
+graph.xaxis_configure(:loose=>false, :title=>'X Axis Label')
+graph.yaxis_configure(:title=>'Y Axis Label')
+graph.legend_configure(:activerelief=>:sunken, :background=>'')
+
+Tk::BLT::Table.add(Tk.root, graph, [0,0], :fill=>:both)
+
+v_x = Tk::BLT::Vector.new(length)
+v_y = Tk::BLT::Vector.new(length)
+x = Array.new(length)
+y = Array.new(length)
+(0...length).each{|i|
+  x[i] = rand
+  y[i] = rand
+}
+v_x.set(x)
+v_y.set(y)
+
+plot = Tk::BLT::PlotComponent::Element.new(graph, :symbol=>:square, 
+                                           :color=>'green4', :fill=>'green2', 
+                                           :linewidth=>0, :outlinewidth=>1, 
+                                           :pixels=>4, :label=>'plot', 
+                                           :xdata=>v_x, :ydata=>v_y)
+
+Tk.root.minsize(0, 0)
+
+#graph.zoom_stack
+#graph.crosshairs
+#graph.active_legend
+#graph.closest_point
+Tk::BLT.zoom_stack(graph)
+Tk::BLT.crosshairs(graph)
+Tk::BLT.active_legend(graph)
+Tk::BLT.closest_point(graph)
+
+Tk::BLT::Busy.hold(graph)
+Tk.update
+Tk::BLT::Busy.release(graph)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/buckskin.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/buckskin.gif
new file mode 100644
index 0000000000..e2d7be9d62
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/buckskin.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/chalk.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/chalk.gif
new file mode 100644
index 0000000000..30d29a7221
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/chalk.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/qv100.t.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/qv100.t.gif
new file mode 100644
index 0000000000..1e738ee86b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/qv100.t.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/rain.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/rain.gif
new file mode 100644
index 0000000000..d7bb417939
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/rain.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/sample.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/sample.gif
new file mode 100644
index 0000000000..1d8a4010c3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/images/sample.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/pareto.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/pareto.rb
new file mode 100644
index 0000000000..94d5f3f97f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/pareto.rb
@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+require 'tkextlib/blt'
+
+# Example of a pareto chart.
+#
+# The pareto chart mixes line and bar elements in the same graph.
+# Each processing operating is represented by a bar element.  The
+# total accumulated defects is displayed with a single line element.
+b = Tk::BLT::Barchart.new(:title=>'Defects Found During Inspection', 
+                          :font=>'Helvetica 12', :plotpady=>[12, 4], 
+                          :width=>'6i', :height=>'5i')
+Tk::BLT::Table.add(Tk.root, b, :fill=>:both)
+
+data = [
+  ["Spot Weld",  82,   'yellow'], 
+  ["Lathe",      49,   'orange'], 
+  ["Gear Cut",   38,   'green'], 
+  ["Drill",      24,   'blue'], 
+  ["Grind",      17,   'red'], 
+  ["Lapping",    12,   'brown'], 
+  ["Press",       8,   'purple'], 
+  ["De-burr",     4,   'pink'], 
+  ["Packaging",   3,   'cyan'], 
+  ["Other",      12,   'magenta']
+]
+
+# Create an X-Y graph line element to trace the accumulated defects.
+b.line_create('accum', :label=>'', :symbol=>:none, :color=>'red')
+
+# Define a bitmap to be used to stipple the background of each bar.
+pattern1 = Tk::BLT::Bitmap.define([ [4, 4], [1, 2, 4, 8] ])
+
+# For each process, create a bar element to display the magnitude.
+count = 0
+sum   = 0
+ydata = [0]
+xdata = [0]
+labels = []
+
+data.each{|label, value, color|
+  count += 1
+  b.element_create(label, :xdata=>count, :ydata=>value, :foreground=>color, 
+                   :relief=>:solid, :borderwidth=>1, :stipple=>pattern1, 
+                   :background=>'lightblue')
+  labels[count] = label
+  # Get the total number of defects.
+  sum += value
+  ydata << sum
+  xdata << count
+}
+
+# Configure the coordinates of the accumulated defects, 
+# now that we know what they are.
+b.element_configure('accum', :xdata=>xdata, :ydata=>ydata)
+
+# Add text markers to label the percentage of total at each point.
+xdata.zip(ydata){|x, y|
+  percent = (y * 100.0) / sum
+  if x == 0
+    text = ' 0%'
+  else
+    text = '%.1f' % percent
+  end
+  b.marker_create(:text, :coords=>[x, y], :text=>text, :font=>'Helvetica 10', 
+                  :foreground=>'red4', :anchor=>:center, :yoffset=>-5)
+}
+
+# Display an auxillary y-axis for percentages.
+b.axis_configure('y2', :hide=>false, :min=>0.0, :max=>100.0, 
+                 :title=>'Percentage')
+
+# Title the y-axis
+b.axis_configure('y', :title=>'Defects')
+
+# Configure the x-axis to display the process names, instead of numbers.
+b.axis_configure('x', :title=>'Process', :rotate=>90, :subdivisions=>0, 
+                 :command=>proc{|w, val|
+                   val = val.round
+                   labels[val]? labels[val]: val
+                  })
+
+# No legend needed.
+b.legend_configure(:hide=>true)
+
+# Configure the grid lines.
+b.gridline_configure(:mapx=>:x, :color=>'lightblue')
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/plot1.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/plot1.rb
new file mode 100644
index 0000000000..07dff48292
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/plot1.rb
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/blt'
+
+graph = Tk::BLT::Graph.new.pack
+plot = Tk::BLT::PlotComponent::Element.new(graph, :linewidth=>0, :label=>'foo')
+plot.data([[1.0, 3.4], [1.1, 2.8], [1.2, 3.1], [1.4, 2.9]].flatten)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/plot1b.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/plot1b.rb
new file mode 100644
index 0000000000..eb41e361f9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/plot1b.rb
@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/blt'
+
+graph = Tk::BLT::Graph.new.pack
+plot = graph.element_create
+plot.configure(:linewidth=>0, :label=>'foo', 
+               :data=>[[1.0, 3.4], [1.1, 2.8], [1.2, 3.1], [1.4, 2.9]].flatten)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/readme.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/readme.txt
new file mode 100644
index 0000000000..fe12dd88a3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/readme.txt
@@ -0,0 +1,2 @@
+The scripts and image files in this directory are based on demo files
+of Tcl/Tk's BLT extention. 
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/scripts/stipples.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/scripts/stipples.rb
new file mode 100644
index 0000000000..47f3c4d063
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/scripts/stipples.rb
@@ -0,0 +1,156 @@
+$stipples = {} unless $stipples
+
+$stipples['bdiagonal1'] = Tk::BLT::Bitmap.new(<<EOD)
+#define bdiagonal1_width 8
+#define bdiagonal1_height 8
+static unsigned char bdiagonal1_bits[] = {
+   0x88, 0x44, 0x22, 0x11, 0x88, 0x44, 0x22, 0x11};
+EOD
+
+$stipples['bdiagonal2'] = Tk::BLT::Bitmap.new(<<EOD)
+#define bdiagonal2_width 8
+#define bdiagonal2_height 8
+static unsigned char bdiagonal2_bits[] = {
+   0x08, 0x04, 0x02, 0x01, 0x80, 0x40, 0x20, 0x10};
+EOD
+
+$stipples['checker2'] = Tk::BLT::Bitmap.new(<<EOD)
+#define checker2_width 8
+#define checker2_height 8
+static unsigned char checker2_bits[] = {
+   0x33, 0x33, 0xcc, 0xcc, 0x33, 0x33, 0xcc, 0xcc};
+EOD
+
+
+$stipples['checker3'] = Tk::BLT::Bitmap.new(<<EOD)
+#define checker3_width 8
+#define checker3_height 8
+static unsigned char checker3_bits[] = {
+   0x0f, 0x0f, 0x0f, 0x0f, 0xf0, 0xf0, 0xf0, 0xf0};
+EOD
+
+$stipples['cross1'] = Tk::BLT::Bitmap.new(<<EOD)
+#define cross1_width 8
+#define cross1_height 8
+static unsigned char cross_bits[] = {
+   0xff, 0xaa, 0xff, 0xaa, 0xff, 0xaa, 0xff, 0xaa};
+EOD
+
+$stipples['cross2'] = Tk::BLT::Bitmap.new(<<EOD)
+#define cross2_width 8
+#define cross2_height 8
+static unsigned char cross2_bits[] = {
+   0xff, 0x88, 0x88, 0x88, 0xff, 0x88, 0x88, 0x88};
+EOD
+
+$stipples['cross3'] = Tk::BLT::Bitmap.new(<<EOD)
+#define cross3_width 8
+#define cross3_height 8
+static unsigned char cross3_bits[] = {
+   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01};
+EOD
+
+$stipples['crossdiag'] = Tk::BLT::Bitmap.new(<<EOD)
+#define crossdiag_width 8
+#define crossdiag_height 8
+static unsigned char crossdiag2_bits[] = {
+   0x18, 0x24, 0x42, 0x81, 0x81, 0x42, 0x24, 0x18};
+EOD
+
+$stipples['dot1'] = Tk::BLT::Bitmap.new(<<EOD)
+#define dot1_width 8
+#define dot1_height 8
+static unsigned char dot1_bits[] = {
+   0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa};
+EOD
+
+$stipples['dot2'] = Tk::BLT::Bitmap.new(<<EOD)
+#define dot2_width 8
+#define dot2_height 8
+static unsigned char dot2_bits[] = {
+   0x55, 0x00, 0x55, 0x00, 0x55, 0x00, 0x55, 0x00};
+EOD
+
+$stipples['dot3'] = Tk::BLT::Bitmap.new(<<EOD)
+#define dot3_width 8
+#define dot3_height 8
+static unsigned char dot3_bits[] = {
+   0x11, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00};
+EOD
+
+$stipples['dot4'] = Tk::BLT::Bitmap.new(<<EOD)
+#define dot4_width 8
+#define dot4_height 8
+static unsigned char dot4_bits[] = {
+   0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+EOD
+
+$stipples['fdiagonal1'] = Tk::BLT::Bitmap.new(<<EOD)
+#define fdiagonal1_width 8
+#define fdiagonal1_height 8
+static unsigned char fdiagonal1_bits[] = {
+   0x11, 0x22, 0x44, 0x88, 0x11, 0x22, 0x44, 0x88};
+EOD
+
+$stipples['fdiagonal2'] = Tk::BLT::Bitmap.new(<<EOD)
+#define fdiagonal2_width 8
+#define fdiagonal2_height 8
+static unsigned char fdiagonal2_bits[] = {
+   0x10, 0x20, 0x40, 0x80, 0x01, 0x02, 0x04, 0x08};
+EOD
+
+$stipples['hline1'] = Tk::BLT::Bitmap.new(<<EOD)
+#define hline1_width 8
+#define hline1_height 8
+static unsigned char hline1_bits[] = {
+   0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00};
+EOD
+
+$stipples['hline2'] = Tk::BLT::Bitmap.new(<<EOD)
+#define hline2_width 8
+#define hline2_height 8
+static unsigned char hline2_bits[] = {
+   0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00};
+EOD
+
+$stipples['lbottom'] = Tk::BLT::Bitmap.new(<<EOD)
+#define lbottom_width 8
+#define lbottom_height 8
+static unsigned char lbottom_bits[] = {
+   0x00, 0x11, 0x11, 0x77, 0x00, 0x11, 0x11, 0x77};
+EOD
+
+$stipples['ltop'] = Tk::BLT::Bitmap.new(<<EOD)
+#define ltop_width 8
+#define ltop_height 8
+static unsigned char ltop_bits[] = {
+   0xee, 0x88, 0x88, 0x00, 0xee, 0x88, 0x88, 0x00};
+EOD
+
+$stipples['rbottom'] = Tk::BLT::Bitmap.new(<<EOD)
+#define rbottom_width 8
+#define rbottom_height 8
+static unsigned char rbottom_bits[] = {
+   0x00, 0x88, 0x88, 0xee, 0x00, 0x88, 0x88, 0xee};
+EOD
+
+$stipples['rtop'] = Tk::BLT::Bitmap.new(<<EOD)
+#define rtop_width 8
+#define rtop_height 8
+static unsigned char rtop_bits[] = {
+   0x77, 0x11, 0x11, 0x00, 0x77, 0x11, 0x11, 0x00};
+EOD
+
+$stipples['vline1'] = Tk::BLT::Bitmap.new(<<EOD)
+#define vline1_width 8
+#define vline1_height 8
+static unsigned char vline1_bits[] = {
+   0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55};
+EOD
+
+$stipples['vline2'] = Tk::BLT::Bitmap.new(<<EOD)
+#define vline2_width 8
+#define vline2_height 8
+static unsigned char vline2_bits[] = {
+   0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33};
+EOD
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/winop1.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/winop1.rb
new file mode 100644
index 0000000000..e94138cd94
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/winop1.rb
@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/blt'
+
+file = File.join(File.dirname(File.expand_path(__FILE__)), 
+                 'images', 'sample.gif')
+if File.exist?(file)
+  src = TkPhotoImage.new(:file=>file)
+else
+  fail RuntimeError, 'no image file'
+end
+
+width = src.width
+height = src.height
+
+TkOption.add('*Label.font', '*helvetica*10*')
+TkOption.add('*Label.background', 'white')
+
+l_img0 = TkLabel.new(:image=>src)
+l_hdr0 = TkLabel.new(:text=>"#{width} x #{height}")
+l_ftr0 = TkLabel.new(:text=>'100%')
+Tk.root.background('white')
+
+(2..10).each{|i|
+  iw = width/i
+  ih = height/i
+  r = '%6g'%(100.0/i)
+  dst = TkPhotoImage.new(:width=>iw, :height=>ih)
+  Tk::BLT::Winop.image_resample(src, dst, :sinc)
+  l_hdr = TkLabel.new(:text=>"#{iw} x #{ih}")
+  l_ftr = TkLabel.new(:text=>"#{r}%")
+  l_img = TkLabel.new(:image=>dst)
+  Tk::BLT::Table.add(Tk.root, 
+                     [0,i], l_hdr, 
+                     [1,i], l_img, 
+                     [2,i], l_ftr)
+  Tk.update
+}
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/blt/winop2.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/winop2.rb
new file mode 100644
index 0000000000..1f674ee893
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/blt/winop2.rb
@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/blt'
+
+file = File.join(File.dirname(File.expand_path(__FILE__)), 
+                 'images', 'qv100.t.gif')
+if File.exist?(file)
+  src = TkPhotoImage.new(:file=>file)
+else
+  fail RuntimeError, 'no image file'
+end
+
+width = src.width
+height = src.height
+
+TkOption.add('*Label.font', '*helvetica*10*')
+TkOption.add('*Label.background', 'white')
+
+[0, 90, 180, 270, 360, 45].each_with_index{|r, i|
+  dest = TkPhotoImage.new
+  Tk::BLT::Winop.image_rotate(src, dest, r)
+  l_txt = TkLabel.new(:text=>"#{r} degrees")
+  l_img = TkLabel.new(:image=>dest)
+  Tk::BLT::Table.add(Tk.root, [0,i], l_img, [1,i], l_txt)
+  Tk.update
+}
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/Orig_LICENSE.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/Orig_LICENSE.txt
new file mode 100644
index 0000000000..0c4c16fe47
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/Orig_LICENSE.txt
@@ -0,0 +1,53 @@
+
+  ######################################################################
+  ###  The following text is the original 'LICENSE.txt' of BWidget   ###
+  ###  extension.                                                    ###
+  ###  Original Tcl source files are not include in this directry,   ###
+  ###  because of all of them are rewrited to Ruby files.            ###
+  ###  However, the bitmap data files ('bwidgtet.xbm' and 'x1.xbm')  ###
+  ###  included in this directory are quoted from BWidget source     ###
+  ###  archive. So, those bitmaps are under the following license.   ###
+  ######################################################################
+
+
+BWidget ToolKit
+Copyright (c) 1998-1999 UNIFIX. 
+Copyright (c) 2001-2002 ActiveState Corp. 
+
+The following terms apply to all files associated with the software
+unless explicitly disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license. 
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/basic.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/basic.rb
new file mode 100644
index 0000000000..c1521651fd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/basic.rb
@@ -0,0 +1,198 @@
+#
+#  basic demo  ---  called from demo.rb
+#
+unless Object.const_defined?('DemoVar')
+  fail RuntimeError, "This is NOT a stand alone script. This script is called from 'demo.rb'. "
+end
+
+module DemoBasic
+  @@var   = TkVariable.new_hash
+  @@after = nil
+  @@count = 0
+
+  def self.create(nb)
+    frame = nb.insert('end', 'demoBasic', :text=>'Basic')
+    topf  = TkFrame.new(frame)
+
+    titf1 = Tk::BWidget::TitleFrame.new(topf, :text=>'Label')
+    titf2 = Tk::BWidget::TitleFrame.new(topf, :text=>'Entry')
+
+    titf3 = Tk::BWidget::TitleFrame.new(frame, :text=>'Button and ArrowButton')
+
+    _label(titf1.get_frame)
+    _entry(titf2.get_frame)
+    _button(titf3.get_frame)
+
+    Tk.pack(titf1, titf2, :side=>:left, :fill=>:both, :padx=>4, :expand=>true)
+    topf.pack(:pady=>2, :fill=>:x)
+    titf3.pack(:pady=>2, :padx=>4, :fill=>:x)
+  end
+
+  def self._label(parent)
+    lab = Tk::BWidget::Label.new(parent, :text=>'This is a Label widget', 
+                                 :helptext=>'Label widget')
+    chk = TkCheckbutton.new(parent, :text=>'Disabled', 
+                            :variable=>@@var.ref(lab, 'state'), 
+                            :onvalue=>'disabled', :offvalue=>'normal', 
+                            :command=>proc{lab[:state] = @@var[lab, 'state']})
+    lab.pack(:anchor=>:w, :pady=>4)
+    chk.pack(:anchor=>:w)
+  end
+
+  def self._entry(parent)
+    ent = Tk::BWidget::Entry.new(parent, :text=>'Press enter', 
+                                 :helptext=>'Entry widtet', 
+                                 :command=>proc{
+                                   @@var['entcmd'] = 'command called'
+                                   Tk.after(500, proc{@@var['entcmd'] = ''})
+                                 })
+
+    chk1 = TkCheckbutton.new(parent, :text=>'Disabled', 
+                             :variable=>@@var.ref(ent, 'state'), 
+                             :onvalue=>'disabled', :offvalue=>'normal', 
+                             :command=>proc{ent.state = @@var[ent, 'state']})
+
+    chk2 = TkCheckbutton.new(parent, :text=>'Non editable', 
+                             :variable=>@@var.ref(ent, 'editable'), 
+                             :onvalue=>false, :offvalue=>true, 
+                             :command=>proc{
+                               ent.editable = @@var[ent, 'editable']
+                             })
+
+    lab = TkLabel.new(parent, :textvariable=>@@var.ref('entcmd'), 
+                      :foreground=>'red')
+
+    ent.pack(:pady=>4, :anchor=>:w)
+    Tk.pack(chk1, chk2, :anchor=>:w)
+    lab.pack(:pady=>4)
+  end
+
+  def self._button(parent)
+    frame = TkFrame.new(parent)
+    but  = Tk::BWidget::Button.new(frame, :text=>'Press me!', 
+                                   :repeatdelay=>300, 
+                                   :command=>proc{_butcmd('command')}, 
+                                   :helptext=>'This is a Button widget')
+
+    sep1 = Tk::BWidget::Separator.new(frame, :orient=>:vertical)
+    arr1 = Tk::BWidget::ArrowButton.new(frame, :type=>:button, 
+                :width=>25, :height=>25, :repeatdelay=>300, 
+                :command=>proc{_butcmd('command')}, 
+                :helptext=>"This is an ArrowButton widget\nof type button")
+
+    sep2 = Tk::BWidget::Separator.new(frame, :orient=>:vertical)
+    arr2 = Tk::BWidget::ArrowButton.new(frame, :type=>:arrow, 
+                :width=>25, :height=>25, :relief=>:sunken, 
+                :ipadx=>0, :ipady=>0, :repeatdelay=>300, 
+                :command=>proc{_butcmd('command')}, 
+                :helptext=>"This is an ArrowButton widget\nof type arrow")
+
+    but.pack(:side=>:left, :padx=>4)
+    sep1.pack(:side=>:left, :padx=>4, :fill=>:y)
+    arr1.pack(:side=>:left, :padx=>4)
+    sep2.pack(:side=>:left, :padx=>4, :fill=>:y)
+    arr2.pack(:side=>:left, :padx=>4)
+    frame.pack
+
+    Tk::BWidget::Separator.new(parent, 
+                               :orient=>:horizontal).pack(:fill=>:x, :pady=>10)
+
+    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Command', 
+                                        :side=>:top, :anchor=>:w, 
+                                        :relief=>:sunken, :borderwidth=>1)
+    subf = labf1.get_frame
+    chk1 = TkCheckbutton.new(subf, :text=>'Disabled', 
+                             :variable=>@@var.ref('bstate'), 
+                             :onvalue=>'disabled', :offvalue=>'normal', 
+                             :command=>proc{_bstate(@@var['bstate'], 
+                                                     but, arr1, arr2)})
+    chk2 = TkCheckbutton.new(subf, :text=>"Use armcommand/\ndisarmcommand", 
+                             :variable=>@@var.ref('barmcmd'), 
+                             :command=>proc{_barmcmd(@@var['barmcmd'], 
+                                                     but, arr1, arr2)})
+    Tk.pack(chk1, chk2, :anchor=>:w)
+
+    label = TkLabel.new(parent, :textvariable=>@@var.ref('butcmd'), 
+                        :foreground=>'red').pack(:side=>:bottom, :pady=>4)
+
+    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Direction', 
+                                        :side=>:top, :anchor=>:w, 
+                                        :relief=>:sunken, :borderwidth=>1)
+    subf = labf2.get_frame
+    @@var['bside'] = :top
+    [:top, :left, :bottom, :right].each{|dir|
+      TkRadiobutton.new(subf, :text=>"#{dir} arrow", 
+                        :variable=>@@var.ref('bside'), :value=>dir, 
+                        :command=>proc{_bside(@@var['bside'], arr1, arr2)}
+                        ).pack(:anchor=>:w)
+    }
+
+    labf3 = Tk::BWidget::LabelFrame.new(parent, :text=>'Relief', 
+                                        :side=>:top, :anchor=>:w, 
+                                        :relief=>:sunken, :borderwidth=>1)
+    subf = labf3.get_frame
+    @@var['brelief'] = :raised
+    [ %w(raised sunken ridge groove), %w(flat solid link)].each{|lrelief|
+      f = TkFrame.new(subf)
+      lrelief.each{|relief|
+        TkRadiobutton.new(f, :text=>relief, 
+                          :variable=>@@var.ref('brelief'), :value=>relief, 
+                          :command=>proc{
+                            _brelief(@@var['brelief'], but, arr1, arr2)
+                          }).pack(:anchor=>:w)
+      }
+      f.pack(:side=>:left, :padx=>2, :anchor=>:n)
+    }
+    Tk.pack(labf1, labf2, labf3, :side=>:left, :fill=>:y, :padx=>4)
+  end
+
+  def self._bstate(state, but, arr1, arr2)
+    [but, arr1, arr2].each{|b| b[:state] = state}
+  end
+
+  def self._brelief(relief, but, arr1, arr2)
+    but[:relief] = relief
+    if relief.to_s != 'link'
+      [arr1, arr2].each{|arr| arr[:relief] = relief}
+    end
+  end
+
+  def self._bside(side, *args)
+    args.each{|arr| arr[:dir] = side}
+  end
+
+  def self._barmcmd(value, but, arr1, arr2)
+    if TkComm.bool(value)
+      but.configure(:armcommand=>proc{_butcmd('arm')}, 
+                    :disarmcommand=>proc{_butcmd('disarm')}, 
+                    :command=>'')
+      [arr1, arr2].each{|arr|
+        arr.configure(:armcommand=>proc{_butcmd('arm')}, 
+                      :disarmcommand=>proc{_butcmd('disarm')}, 
+                      :command=>'')
+      }
+    else
+      but.configure(:armcommand=>'', :disarmcommand=>'', 
+                    :command=>proc{_butcmd('command')})
+      [arr1, arr2].each{|arr|
+        arr.configure(:armcommand=>'', :disarmcommand=>'', 
+                      :command=>proc{_butcmd('command')})
+      }
+    end
+  end
+
+  def self._butcmd(reason)
+    unless @@after
+      @@after = TkTimer.new(500, 1, proc{@@var['butcmd'] = ''})
+    end
+    @@after.stop
+    if (reason == 'arm')
+      @@count += 1
+      @@var['butcmd'] = "#{reason} command called (#{@@count})"
+    else
+      @@count = 0
+      @@var['butcmd'] = "#{reason} command called"
+    end
+    @@after.start
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/bwidget.xbm b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/bwidget.xbm
new file mode 100644
index 0000000000..5451ebb9c0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/bwidget.xbm
@@ -0,0 +1,46 @@
+#define bwidget_width 76
+#define bwidget_height 64
+static char bwidget_bits[] = {
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0x00,0xb6,0x6d,0xdb,0x16,0x00,0x00,0x00,0x00,0xf0,
+ 0x00,0xdb,0xb6,0x6d,0xab,0x00,0x00,0x00,0x00,0xf0,0x00,0x55,0x55,0x55,0x75,
+ 0x01,0x00,0x00,0x00,0xf0,0x00,0x6d,0xdb,0xb6,0xad,0x02,0x00,0x00,0x00,0xf0,
+ 0x00,0xb6,0x6d,0xdb,0xb6,0x05,0x00,0x00,0x00,0xf0,0x00,0x55,0x55,0x55,0x55,
+ 0x05,0x00,0x00,0x00,0xf0,0x00,0xda,0xb6,0xad,0x6d,0x0b,0x00,0x00,0x00,0xf0,
+ 0x00,0x6b,0x03,0xc0,0xb6,0x05,0x00,0x00,0x00,0xf0,0x00,0x56,0x05,0x00,0x55,
+ 0x0d,0x00,0x00,0x00,0xf0,0x00,0xbb,0x05,0x80,0xdb,0x06,0x00,0x00,0x00,0xf0,
+ 0x00,0xca,0x06,0x00,0x6c,0x0b,0x00,0x00,0x00,0xf0,0x00,0xb6,0x02,0x00,0xaa,
+ 0x0a,0x00,0x00,0x00,0xf0,0x00,0xab,0x05,0x00,0x6c,0x0b,0x00,0x00,0x00,0xf0,
+ 0x00,0xdd,0x06,0x00,0xb6,0x05,0x00,0x00,0x00,0xf0,0x00,0xaa,0x02,0x00,0x55,
+ 0x05,0x00,0x00,0x00,0xf0,0x00,0xb7,0x05,0xc0,0xda,0x02,0x00,0x00,0x00,0xf0,
+ 0x00,0xd9,0x06,0x50,0x6b,0x01,0x00,0x00,0x00,0xf0,0x00,0x56,0xb5,0xad,0xad,
+ 0x00,0x00,0x00,0x00,0xf0,0x00,0xdb,0xd6,0x76,0x15,0x00,0x00,0x00,0x00,0xf0,
+ 0x00,0x6a,0xab,0xaa,0x2d,0x00,0x00,0x00,0x00,0xf0,0x00,0x56,0x75,0xad,0xb6,
+ 0x02,0x00,0x00,0x00,0xf0,0x00,0xbb,0xad,0xd6,0xaa,0x05,0x00,0x00,0x00,0xf0,
+ 0x00,0xca,0xb6,0x6b,0xdb,0x2a,0x00,0x00,0x00,0xf0,0x00,0x77,0xd5,0x5c,0x6d,
+ 0x2d,0x00,0x00,0x00,0xf0,0x00,0x99,0x05,0x00,0xaa,0x56,0x00,0x00,0x00,0xf0,
+ 0x00,0xee,0x06,0x00,0x6c,0xbb,0x00,0x00,0x00,0xf0,0x00,0xaa,0x02,0x00,0xb0,
+ 0x55,0x00,0x00,0x00,0xf0,0x00,0x55,0x05,0x00,0xa8,0xd6,0x00,0x00,0x00,0xf0,
+ 0x00,0xee,0x06,0x00,0xd0,0x6a,0x00,0x00,0x00,0xf0,0x00,0x55,0x03,0x00,0x68,
+ 0xb7,0xfc,0x00,0x7e,0xf0,0x00,0x6d,0x05,0x00,0xa8,0xaa,0xfc,0x80,0x7e,0xf0,
+ 0x00,0xb6,0x05,0x00,0x50,0xbb,0xfe,0x01,0x7e,0xf0,0x00,0x55,0x05,0x00,0x78,
+ 0xad,0xfe,0x81,0x1f,0xf0,0x00,0xb6,0x05,0x00,0xa4,0xb5,0xfe,0x81,0x1f,0xf0,
+ 0x00,0x5b,0x05,0x80,0xba,0x56,0xfe,0x83,0x1f,0xf0,0x00,0xaa,0x6b,0x5b,0xd5,
+ 0x5a,0xff,0x85,0x1f,0xf0,0x00,0xdb,0x5a,0xad,0x57,0x2b,0xff,0xc7,0x0f,0xf0,
+ 0x00,0x6d,0xad,0xd5,0x6a,0x0d,0xff,0xc7,0x0f,0xf0,0x00,0xaa,0xd6,0xb6,0xba,
+ 0x05,0xdf,0xc7,0x0f,0xf0,0x00,0xb7,0xb5,0x5a,0xab,0x8a,0xdf,0xcf,0x0f,0xf0,
+ 0x00,0xd9,0x5a,0xab,0x6d,0x8f,0xcf,0xef,0x07,0xf0,0x00,0x56,0xad,0x75,0xb5,
+ 0xaf,0x8f,0xef,0x07,0xf0,0x00,0xb5,0xeb,0x5a,0x00,0x9f,0xcf,0xef,0x07,0xf0,
+ 0x00,0x00,0x00,0x00,0x00,0xff,0x8f,0xff,0x07,0xf0,0x00,0x00,0x00,0x00,0x00,
+ 0xfe,0x87,0xff,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,0xff,0x03,0xff,0x03,0xf0,
+ 0x00,0x00,0x00,0x00,0x00,0xfe,0x03,0xff,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,
+ 0xfe,0x03,0xff,0x01,0xf0,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xff,0x03,0xf0,
+ 0x00,0x00,0x00,0x00,0x00,0xfe,0x01,0xfe,0x01,0xf0,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0x01,0xfe,0x01,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0};
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/demo.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/demo.rb
new file mode 100644
index 0000000000..785d2681a8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/demo.rb
@@ -0,0 +1,243 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/bwidget'
+
+module DemoVar
+  @_wfont    = nil
+  @notebook  = nil
+  @mainframe = nil
+  @status    = TkVariable.new
+  @prgtext   = TkVariable.new
+  @prgindic  = TkVariable.new
+  @font      = nil
+  @font_name = nil
+  @toolbar1  = TkVariable.new(true)
+  @toolbar2  = TkVariable.new(true)
+end
+class << DemoVar
+  attr_accessor :_wfont, :notebook, :mainframe, :font, :font_name
+  attr_reader   :status, :prgtext, :prgindic, :toolbar1, :toolbar2
+end
+
+class BWidget_Demo
+  DEMODIR = File.dirname(File.expand_path(__FILE__))
+
+  %w(manager basic select dnd tree tmpldlg).each{|f|
+    require File.join(DEMODIR, f << '.rb')
+  }
+
+  def initialize
+    TkOption.add('*TitleFrame.l.font', 'helvetica 11 bold italic')
+
+    root = TkRoot.new(:title=>'BWidget demo')
+    root.withdraw
+
+    _create
+
+    Tk::BWidget.place(root, 0, 0, :center)
+    root.deiconify
+    root.raise
+    root.focus(true)
+
+    root.geometry(root.geometry)
+  end
+
+  def _create
+    DemoVar.prgtext.value = 'Please wait while loading font...'
+    DemoVar.prgindic.value = -1
+
+    intro = _create_intro
+
+    Tk.update
+
+    Tk::BWidget::SelectFont.load_font
+
+    descmenu = [
+      '&File', 'all', 'file', 0, [
+        ['command', 'E&xit', [], 'Exit BWidget demo', [], 
+          {:command=>proc{exit}}]
+      ], 
+      '&Options', 'all', 'options', 0, [
+        ['checkbutton', 'Toolbar &1', ['all', 'option'], 
+          'Show/hide toolbar 1', [], 
+          { :variable=>DemoVar.toolbar1, 
+            :command=>proc{
+              DemoVar.mainframe.show_toolbar(0, DemoVar.toolbar1.value)
+            }
+          }
+        ], 
+        ['checkbutton', 'Toolbar &2', ['all', 'option'], 
+          'Show/hide toolbar 2', [], 
+          { :variable=>DemoVar.toolbar2, 
+            :command=>proc{
+              DemoVar.mainframe.show_toolbar(1, DemoVar.toolbar2.value)
+            }
+          }
+        ]
+      ]
+    ]
+
+    DemoVar.prgtext.value = 'Creating MainFrame...'
+    DemoVar.prgindic.value = 0
+
+    DemoVar.mainframe = Tk::BWidget::MainFrame.new(
+                                :menu=>descmenu, 
+                                :textvariable=>DemoVar.status, 
+                                :progressvar=>DemoVar.prgindic
+                        )
+
+    # toobar 1 creation
+    DemoVar.prgindic.numeric += 1
+
+    DemoVar.mainframe.add_toolbar{|tb1|
+      Tk::BWidget::ButtonBox.new(tb1, :spacing=>0, :padx=>1, :pady=>1){|bbox|
+        add(:image=>Tk::BWidget::Bitmap.new('new'), 
+            :highlightthickness=>0, :takefocus=>0, :relief=>:link, 
+            :borderwidth=>1, :padx=>1, :pady=>1, 
+            :command=>proc{puts 'select "Create a new file" icon'}, 
+            :helptext=>"Create a new file")
+
+        add(:image=>Tk::BWidget::Bitmap.new('open'), 
+            :highlightthickness=>0, :takefocus=>0, :relief=>:link, 
+            :borderwidth=>1, :padx=>1, :pady=>1, 
+            :command=>proc{puts 'select "Open an existing file" icon'}, 
+            :helptext=>"Open an existing file")
+
+        add(:image=>Tk::BWidget::Bitmap.new('save'), 
+            :highlightthickness=>0, :takefocus=>0, :relief=>:link, 
+            :borderwidth=>1, :padx=>1, :pady=>1, 
+            :command=>proc{puts 'select "Save file" icon'}, 
+            :helptext=>"Save file")
+
+        pack(:side=>:left, :anchor=>:w)
+      }
+
+      Tk::BWidget::Separator.new(tb1, :orient=>:vertical){
+        pack(:side=>:left, :fill=>:y, :padx=>4, :anchor=>:w)
+      }
+
+      DemoVar.prgindic.numeric += 1
+
+      Tk::BWidget::ButtonBox.new(tb1, :spacing=>0, :padx=>1, :pady=>1){|bbox|
+        add(:image=>Tk::BWidget::Bitmap.new('cut'), 
+            :highlightthickness=>0, :takefocus=>0, :relief=>:link, 
+            :borderwidth=>1, :padx=>1, :pady=>1, 
+            :command=>proc{puts 'select "Cut selection" icon'}, 
+            :helptext=>"Cut selection")
+
+        add(:image=>Tk::BWidget::Bitmap.new('copy'), 
+            :highlightthickness=>0, :takefocus=>0, :relief=>:link, 
+            :borderwidth=>1, :padx=>1, :pady=>1, 
+            :command=>proc{puts 'select "Copy selection" icon'}, 
+            :helptext=>"Copy selection")
+
+        add(:image=>Tk::BWidget::Bitmap.new('paste'), 
+            :highlightthickness=>0, :takefocus=>0, :relief=>:link, 
+            :borderwidth=>1, :padx=>1, :pady=>1, 
+            :command=>proc{puts 'select "Paste selection" icon'}, 
+            :helptext=>"Paste selection")
+
+        pack(:side=>:left, :anchor=>:w)
+      }
+    }
+
+    # toolbar 2 creation
+    DemoVar.prgindic.numeric += 1
+
+    tb2 = DemoVar.mainframe.add_toolbar
+    DemoVar._wfont = Tk::BWidget::SelectFont::Toolbar.new(tb2, 
+                       :command=>proc{update_font(DemoVar._wfont[:font])}
+                     )
+    DemoVar.font = DemoVar._wfont[:font]
+    DemoVar._wfont.pack(:side=>:left, :anchor=>:w)
+
+    DemoVar.mainframe.add_indicator(
+      :text=>"BWidget #{Tk::BWidget.package_version}"
+    )
+    DemoVar.mainframe.add_indicator(:textvariable=>'tk_patchLevel')
+
+    # NoteBook creation
+    DemoVar.notebook = Tk::BWidget::NoteBook.new(DemoVar.mainframe.get_frame)
+
+    DemoVar.prgtext.value = "Creating Manager..."
+    DemoVar.prgindic.numeric += 1
+    DemoManager.create(DemoVar.notebook)
+
+    DemoVar.prgtext.value = "Creating Basic..."
+    DemoVar.prgindic.numeric += 1
+    DemoBasic.create(DemoVar.notebook)
+
+    DemoVar.prgtext.value = "Creating Select..."
+    DemoVar.prgindic.numeric += 1
+    DemoSelect.create(DemoVar.notebook)
+
+    DemoVar.prgtext.value = "Creating Dialog..."
+    DemoVar.prgindic.numeric += 1
+    DemoDialog.create(DemoVar.notebook)
+
+    DemoVar.prgtext.value = "Creating Drag and Drop..."
+    DemoVar.prgindic.numeric += 1
+    DemoDnD.create(DemoVar.notebook)
+
+    DemoVar.prgtext.value = "Creating Tree..."
+    DemoVar.prgindic.numeric += 1
+    DemoTree.create(DemoVar.notebook)
+
+    DemoVar.prgtext.value = "Done"
+    DemoVar.prgindic.numeric += 1
+
+    DemoVar.notebook.compute_size
+    DemoVar.notebook.pack(:fill=>:both, :expand=>true, :padx=>4, :pady=>4)
+    DemoVar.notebook.raise(DemoVar.notebook.get_page(0))
+
+    DemoVar.mainframe.pack(:fill=>:both, :expand=>true)
+
+    Tk.update_idletasks
+
+    intro.destroy
+  end
+
+  def update_font(newfont)
+    root = Tk.root
+    root[:cursor] = 'watch'
+    if newfont != '' && DemoVar.font != newfont
+      DemoVar._wfont[:font] = newfont
+      DemoVar.notebook[:font] = newfont
+      DemoVar.font = newfont
+    end
+    root[:cursor] = ''
+  end
+
+  def _create_intro
+    top = TkToplevel.new(:relief=>:raised, :borderwidth=>2)
+    top.withdraw
+    top.overrideredirect(true)
+
+    ximg  = TkLabel.new(top, :bitmap=>"@#{File.join(DEMODIR,'x1.xbm')}", 
+                        :foreground=>'grey90', :background=>'white')
+    bwimg = TkLabel.new(ximg, :bitmap=>"@#{File.join(DEMODIR,'bwidget.xbm')}",
+                        :foreground=>'grey90', :background=>'white')
+    frame = TkFrame.new(ximg, :background=>'white')
+    TkLabel.new(frame, :text=>'Loading demo', 
+                :background=>'white', :font=>'times 8').pack
+    TkLabel.new(frame, :textvariable=>DemoVar.prgtext, 
+                :background=>'white', :font=>'times 8', :width=>35).pack
+    Tk::BWidget::ProgressBar.new(frame, :width=>50, :height=>10, 
+                                 :background=>'white', 
+                                 :variable=>DemoVar.prgindic, 
+                                 :maximum=>10).pack
+    frame.place(:x=>0, :y=>0, :anchor=>:nw)
+    bwimg.place(:relx=>1, :rely=>1, :anchor=>:se)
+    ximg.pack
+    Tk::BWidget.place(top, 0, 0, :center)
+    top.deiconify
+
+    top
+  end
+end
+
+module DemoVar
+  Demo = BWidget_Demo.new
+end
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/dnd.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/dnd.rb
new file mode 100644
index 0000000000..1c8b036530
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/dnd.rb
@@ -0,0 +1,46 @@
+#
+#  dnd demo  ---  called from demo.rb
+#
+unless Object.const_defined?('DemoVar')
+  fail RuntimeError, "This is NOT a stand alone script. This script is called from 'demo.rb'. "
+end
+
+module DemoDnD
+  def self.create(nb)
+    frame = nb.insert('end', 'demoDnD', :text=>'Drag and Drop')
+
+    titf1 = Tk::BWidget::TitleFrame.new(frame, :text=>'Drag source')
+    subf = titf1.get_frame
+
+    ent1 = Tk::BWidget::LabelEntry.new(subf, :label=>'Entry', 
+                                       :labelwidth=>14, :dragenabled=>true, 
+                                       :dragevent=>3)
+    labf1 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label (text)', 
+                                        :width=>14)
+    f = labf1.get_frame
+    lab = Tk::BWidget::Label.new(f, :text=>'Drag this text', 
+                                 :dragenabled=>true, :dragevent=>3).pack
+
+    labf2 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label (bitmap)', 
+                                        :width=>14)
+    f = labf2.get_frame
+    lab = Tk::BWidget::Label.new(f, :bitmap=>'info', 
+                                 :dragenabled=>true, :dragevent=>3).pack
+
+    Tk.pack(ent1, labf1, labf2, :side=>:top, :fill=>:x, :pady=>4)
+
+    titf2 = Tk::BWidget::TitleFrame.new(frame, :text=>'Drop targets')
+    subf = titf2.get_frame
+
+    ent1 = Tk::BWidget::LabelEntry.new(subf, :label=>'Entry', 
+                                       :labelwidth=>14, :dropenabled=>true)
+    labf1 = Tk::BWidget::LabelFrame.new(subf, :text=>'Label', :width=>14)
+    f = labf1.get_frame
+    lab = Tk::BWidget::Label.new(f, :dropenabled=>true, 
+                                 :highlightthickness=>1).pack(:fill=>:x)
+    Tk.pack(ent1, labf1, :side=>:top, :fill=>:x, :pady=>4)
+    Tk.pack(titf1, titf2, :pady=>4)
+
+    frame
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/manager.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/manager.rb
new file mode 100644
index 0000000000..776cb3065b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/manager.rb
@@ -0,0 +1,150 @@
+#
+#  manager demo  ---  called from demo.rb
+#
+unless Object.const_defined?('DemoVar')
+  fail RuntimeError, "This is NOT a stand alone script. This script is called from 'demo.rb'. "
+end
+
+module DemoManager
+  @@progress    = TkVariable.new(false)
+  @@status      = TkVariable.new('Compute in progress...')
+  @@homogeneous = TkVariable.new(false)
+  @@constw      = TkVariable.new
+  @@afterobj    = nil
+
+  def self.create(nb)
+    frame = nb.insert('end', 'demoManager', :text=>'Manager')
+
+    topf = TkFrame.new(frame)
+    titf1 = Tk::BWidget::TitleFrame.new(topf, :text=>"MainFrame")
+    titf2 = Tk::BWidget::TitleFrame.new(topf, :text=>"NoteBook")
+    titf3 = Tk::BWidget::TitleFrame.new(frame, :text=>"Paned & ScrolledWindow")
+
+    _mainframe(titf1.get_frame)
+    _notebook(titf2.get_frame)
+    _paned(titf3.get_frame)
+
+    Tk.pack(titf1, titf2, :padx=>4, :side=>:left, :fill=>:both, :expand=>true)
+    Tk.pack(topf, :fill=>:x, :pady=>2)
+    Tk.pack(titf3, :pady=>2, :padx=>4, :fill=>:both, :expand=>true)
+
+    frame
+  end
+
+  def self._mainframe(parent)
+    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Toolbar', 
+                                        :side=>:top, :anchor=>:w, 
+                                        :relief=>:sunken, :borderwidth=>2)
+    subf = labf1.get_frame
+    chk1 = TkCheckbutton.new(subf, :text=>'View toolbar 1', 
+                             :variable=>DemoVar.toolbar1, 
+                             :command=>proc{
+                               DemoVar.mainframe.show_toolbar(
+                                  0, DemoVar.toolbar1.value
+                               )
+                             })
+    chk2 = TkCheckbutton.new(subf, :text=>'View toolbar 2', 
+                             :variable=>DemoVar.toolbar2, 
+                             :command=>proc{
+                               DemoVar.mainframe.show_toolbar(
+                                  1, DemoVar.toolbar2.value
+                               )
+                             })
+
+    Tk.pack(chk1, chk2, :anchor=>:w, :fill=>:x)
+    labf1.pack(:fill=>:both)
+
+    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Status bar', 
+                                        :side=>:top, :anchor=>:w, 
+                                        :relief=>:sunken, :borderwidth=>2)
+    subf = labf2.get_frame
+    chk1 = TkCheckbutton.new(subf, :text=>"Show Progress\nindicator", 
+                             :justify=>:left, :variable=>@@progress, 
+                             :command=>proc{ _show_progress })
+    chk1.pack(:anchor=>:w, :fill=>:x)
+
+    Tk.pack(labf1, labf2, :side=>:left, :padx=>4, :fill=>:both)
+  end
+
+  def self._notebook(parent)
+    TkCheckbutton.new(parent, :text=>'Homogeneous label', 
+                      :variable=>@@homogeneous, 
+                      :command=>proc{
+                        DemoVar.notebook[:homogeneous] = @@homogeneous.value
+                      }).pack(:side=>:left, :anchor=>:n, :fill=>:x)
+  end
+
+  def self._paned(parent)
+    pw1   = Tk::BWidget::PanedWindow.new(parent, :side=>:top)
+    pane  = pw1.add(:minsize=>100)
+
+    pw2   = Tk::BWidget::PanedWindow.new(pane, :side=>:left)
+    pane1 = pw2.add(:minsize=>100)
+    pane2 = pw2.add(:minsize=>100)
+
+    pane3 = pw1.add(:minsize=>100)
+
+    [pane1, pane2].each{|pane|
+      sw = Tk::BWidget::ScrolledWindow.new(pane)
+      lb = TkListbox.new(sw, :height=>8, :width=>20, :highlightthickness=>0)
+      (1..8).each{|i| lb.insert('end', "Valur #{i}") }
+      sw.set_widget(lb)
+      sw.pack(:fill=>:both, :expand=>true)
+    }
+
+    sw = Tk::BWidget::ScrolledWindow.new(pane3, :relief=>:sunken, 
+                                         :borderwidth=>2)
+    sf = Tk::BWidget::ScrollableFrame.new(sw)
+    sw.set_widget(sf)
+    subf = sf.get_frame
+    lab = TkLabel.new(subf, :text=>'This is a ScrollableFrame')
+    chk = TkCheckbutton.new(subf, :text=>'Constrained with', 
+                            :variable=>@@constw, :command=>proc{
+                              sf['constrainedwidth'] = @@constw.value
+                            })
+    lab.pack
+    chk.pack(:anchor=>:w)
+    chk.bind('FocusIn', proc{sf.see(chk)})
+    (0..20).each{|i|
+      ent = TkEntry.new(subf, :width=>50).pack(:fill=>:x, :pady=>4)
+      ent.bind('FocusIn', proc{sf.see(ent)})
+      ent.insert('end', "Text field #{i}")
+    }
+
+    Tk.pack(sw, pw2, pw1, :fill=>:both, :expand=>true)
+  end
+
+  def self._show_progress
+    unless @@afterobj
+      @@afterobj = TkTimer.new(30, -1, proc{_update_progress})
+    end
+    if @@progress.bool
+      DemoVar.status.value = 'Compute in progress...'
+      DemoVar.prgindic.value = 0
+      DemoVar.mainframe.show_statusbar(:progression)
+      @@afterobj.start unless @@afterobj.running?
+    else
+      DemoVar.status.value = ''
+      DemoVar.mainframe.show_statusbar(:status)
+      @@afterobj.stop
+    end
+  end
+
+  def self._update_progress
+    if @@progress.bool
+      if DemoVar.prgindic.numeric < 100
+        DemoVar.prgindic.numeric += 5
+      else
+        @@progress.value = false
+        DemoVar.mainframe.show_statusbar(:status)
+        DemoVar.status.value = 'Done'
+        @@afterobj.stop
+        Tk.after(500, proc{ DemoVar.status.value = '' })
+      end
+    else
+      @@afterobj.stop
+    end
+  end
+
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/select.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/select.rb
new file mode 100644
index 0000000000..ea24b47e2e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/select.rb
@@ -0,0 +1,82 @@
+#
+#  select demo  ---  called from demo.rb
+#
+unless Object.const_defined?('DemoVar')
+  fail RuntimeError, "This is NOT a stand alone script. This script is called from 'demo.rb'. "
+end
+
+module DemoSelect
+  @@var = TkVariable.new_hash
+
+  def self.create(nb)
+    frame = nb.insert('end', 'demoSelect', :text=>'Spin & Combo')
+
+    titf1 = Tk::BWidget::TitleFrame.new(frame, :text=>'SpinBox')
+    subf = titf1.get_frame
+    spin = Tk::BWidget::SpinBox.new(subf, :range=>[1, 100, 1], 
+                                    :textvariable=>@@var.ref('spin', 'var'), 
+                                    :helptext=>'This is the SpinBox')
+    ent = Tk::BWidget::LabelEntry.new(subf, :label=>'Linked var', 
+                                      :labelwidth=>10, :labelanchor=>:w,  
+                                      :textvariable=>@@var.ref('spin', 'var'), 
+                                      :editable=>0, 
+                                      :helptext=>"This is an Entry reflecting\nthe linked var of SpinBox")
+    labf = Tk::BWidget::LabelFrame.new(subf, :text=>'Options', 
+                                       :side=>:top, :anchor=>:w, 
+                                       :relief=>:sunken, :borderwidth=>1, 
+                                       :helptext=>'Modify some options of SpinBox')
+    subf = labf.get_frame
+    chk1 = TkCheckbutton.new(subf, :text=>'Non editable', 
+                             :variable=>@@var.ref('spin', 'editable'), 
+                             :onvalue=>false, :offvalue=>true, 
+                             :command=>proc{
+                               spin.editable(@@var['spin', 'editable'])
+                             })
+    chk2 = TkCheckbutton.new(subf, :text=>'Disabled', 
+                             :variable=>@@var.ref('spin', 'state'), 
+                             :onvalue=>'disabled', :offvalue=>'normal', 
+                             :command=>proc{
+                               spin.state(@@var['spin', 'state'])
+                             })
+    Tk.pack(chk1, chk2, :side=>:left, :anchor=>:w)
+    Tk.pack(spin, ent, labf, :pady=>4, :fill=>:x)
+    titf1.pack
+
+    titf2 = Tk::BWidget::TitleFrame.new(frame, :text=>'ComboBox')
+    subf = titf2.get_frame
+    combo = Tk::BWidget::ComboBox.new(subf,
+                                      :textvariable=>@@var.ref('combo', 'var'),
+                                      :values=>[
+                                        'first value', 'second value', 
+                                        'third value', 'fourth value', 
+                                        'fifth value'
+                                      ], 
+                                      :helptext=>'This is the ComboBox')
+    ent = Tk::BWidget::LabelEntry.new(subf, :label=>'Linked var', 
+                                      :labelwidth=>10, :labelanchor=>:w, 
+                                      :textvariable=>@@var.ref('combo', 'var'),
+                                      :editable=>0, :helptext=>"This is an Entry reflecting\nthe linked var of ComboBox")
+    labf = Tk::BWidget::LabelFrame.new(subf, :text=>'Options', :side=>:top, 
+                                       :anchor=>:w, :relief=>:sunken, 
+                                       :borderwidth=>1, :helptext=>'Modify some options of ComboBox')
+    subf = labf.get_frame
+    chk1 = TkCheckbutton.new(subf, :text=>'Non editable', 
+                             :variable=>@@var.ref('combo', 'editable'), 
+                             :onvalue=>false, :offvalue=>true, 
+                             :command=>proc{
+                               combo.editable(@@var['combo', 'editable'])
+                             })
+    chk2 = TkCheckbutton.new(subf, :text=>'Disabled', 
+                             :variable=>@@var.ref('combo', 'state'), 
+                             :onvalue=>'disabled', :offvalue=>'normal', 
+                             :command=>proc{
+                               combo.state(@@var['combo', 'state'])
+                             })
+
+    Tk.pack(chk1, chk2, :side=>:left, :anchor=>:w)
+    Tk.pack(combo, ent, labf, :pady=>4, :fill=>:x)
+    Tk.pack(titf1, titf2, :pady=>4)
+
+    frame
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb
new file mode 100644
index 0000000000..3d19c8d092
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/tmpldlg.rb
@@ -0,0 +1,221 @@
+#
+#  templdlg demo  ---  called from demo.rb
+#
+unless Object.const_defined?('DemoVar')
+  fail RuntimeError, "This is NOT a stand alone script. This script is called from 'demo.rb'. "
+end
+
+module DemoDialog
+  @@tmpl      = TkVariable.new_hash
+  @@msg       = TkVariable.new_hash
+  @@msgdlg    = nil
+  @@progmsg   = TkVariable.new
+  @@progval   = TkVariable.new
+  @@progdlg   = nil
+  @@resources = TkVariable.new('en')
+
+  def self.create(nb)
+    frame = nb.insert('end', 'demoDlg', :text=>'Dialog')
+
+    titf1 = Tk::BWidget::TitleFrame.new(frame, :text=>'Resources')
+    titf2 = Tk::BWidget::TitleFrame.new(frame, :text=>'Template Dialog')
+    titf3 = Tk::BWidget::TitleFrame.new(frame, :text=>'Message Dialog')
+    titf4 = Tk::BWidget::TitleFrame.new(frame, :text=>'Other dialog')
+
+    subf = titf1.get_frame
+    cmd = proc{ TkOption.read_file(File.join(Tk::BWidget::LIBRARY, 'lang', 
+                                             @@resources.value + '.rc')) }
+    Tk.pack(TkRadiobutton.new(subf, :text=>'English', :value=>'en', 
+                              :variable=>@@resources, :command=>cmd), 
+            TkRadiobutton.new(subf, :text=>'French', :value=>'fr', 
+                              :variable=>@@resources, :command=>cmd), 
+            TkRadiobutton.new(subf, :text=>'German', :value=>'de', 
+                              :variable=>@@resources, :command=>cmd), 
+            :side=>:left)
+
+    _tmpldlg(titf2.get_frame)
+    _msgdlg(titf3.get_frame)
+    _stddlg(titf4.get_frame)
+
+    titf1.pack(:fill=>:x, :pady=>2, :padx=>2)
+    titf4.pack(:side=>:bottom, :fill=>:x, :pady=>2, :padx=>2)
+    Tk.pack(titf2, titf3, :side=>:left, :padx=>2, :fill=>:both, :expand=>true)
+  end
+
+  def self._tmpldlg(parent)
+    @@tmpl['side'] = :bottom
+    @@tmpl['anchor'] = :c
+
+    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Button side', 
+                                        :side=>:top, :anchor=>:w, 
+                                        :relief=>:sunken, :borderwidth=>1)
+    subf = labf1.get_frame
+    Tk.pack(TkRadiobutton.new(subf, :text=>'Bottom', :value=>:bottom, 
+                              :variable=>@@tmpl.ref('side'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'Left', :value=>:left, 
+                              :variable=>@@tmpl.ref('side'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'Right', :value=>:right, 
+                              :variable=>@@tmpl.ref('side'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'Top', :value=>:top, 
+                              :variable=>@@tmpl.ref('side'), :anchor=>:w), 
+            :fill=>:x, :anchor=>:w)
+
+    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Button anchor', 
+                                        :side=>:top, :anchor=>:w, 
+                                        :relief=>:sunken, :borderwidth=>1)
+    subf = labf2.get_frame
+    Tk.pack(TkRadiobutton.new(subf, :text=>'North', :value=>:n, 
+                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'West', :value=>:w, 
+                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'East', :value=>:e, 
+                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'South', :value=>:s, 
+                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'Center', :value=>:c, 
+                              :variable=>@@tmpl.ref('anchor'), :anchor=>:w), 
+            :fill=>:x, :anchor=>:w)
+
+    sep = Tk::BWidget::Separator.new(parent, :orient=>:horizontal)
+    button = TkButton.new(parent, :text=>'Show', :command=>proc{_show_tmpldlg})
+
+    button.pack(:side=>:bottom)
+    sep.pack(:side=>:bottom, :fill=>:x, :pady=>10)
+    Tk.pack(labf1, labf2, :side=>:left, :padx=>4, :anchor=>:n)
+  end
+
+  def self._msgdlg(parent)
+    @@msg['type'] = 'ok'
+    @@msg['icon'] = 'info'
+
+    labf1 = Tk::BWidget::LabelFrame.new(parent, :text=>'Type', :side=>:top, 
+                                        :anchor=>:w, :relief=>:sunken, 
+                                        :borderwidth=>1)
+    subf = labf1.get_frame
+    Tk.pack(TkRadiobutton.new(subf, :text=>'Ok', :value=>'ok', 
+                              :variable=>@@msg.ref('type'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'Ok, Cancel', :value=>'okcancel', 
+                              :variable=>@@msg.ref('type'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'Retry, Cancel', 
+                              :value=>'retrycancel', 
+                              :variable=>@@msg.ref('type'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'Yes, No', :value=>'yesno', 
+                              :variable=>@@msg.ref('type'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'Yes, No, Cancel', 
+                              :value=>'yesnocancel', 
+                              :variable=>@@msg.ref('type'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'Abort, Retry, Ignore', 
+                              :value=>'abortretryignore', 
+                              :variable=>@@msg.ref('type'), :anchor=>:w), 
+            :fill=>:x, :anchor=>:w)
+
+    Tk.pack(TkRadiobutton.new(subf, :text=>'User', :value=>'user', 
+                              :variable=>@@msg.ref('type'), :anchor=>:w), 
+            Tk::BWidget::Entry.new(subf, :textvariable=>@@msg.ref('buttons')),
+            :side=>:left)
+
+    labf2 = Tk::BWidget::LabelFrame.new(parent, :text=>'Icon', :side=>:top, 
+                                        :anchor=>:w, :relief=>:sunken, 
+                                        :borderwidth=>1)
+    subf = labf2.get_frame
+    Tk.pack(TkRadiobutton.new(subf, :text=>'Information', :value=>'info', 
+                              :variable=>@@msg.ref('icon'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'Question',    :value=>'question', 
+                              :variable=>@@msg.ref('icon'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'Warning',     :value=>'warning', 
+                              :variable=>@@msg.ref('icon'), :anchor=>:w), 
+            TkRadiobutton.new(subf, :text=>'Error',       :value=>'error', 
+                              :variable=>@@msg.ref('icon'), :anchor=>:w), 
+            :fill=>:x, :anchor=>:w)
+
+    sep = Tk::BWidget::Separator.new(parent, :orient=>:horizontal)
+    button = TkButton.new(parent, :text=>'Show', :command=>proc{_show_msgdlg})
+
+    button.pack(:side=>:bottom)
+    sep.pack(:side=>:bottom, :fill=>:x, :pady=>10)
+    Tk.pack(labf1, labf2, :side=>:left, :padx=>4, :anchor=>:n)
+  end
+
+  def self._stddlg(parent)
+    Tk.pack(TkButton.new(parent, :text=>'Select a color '){|w|
+              command(proc{DemoDialog._show_color(w)})
+            }, 
+            TkButton.new(parent, :text=>'Font selector dialog', 
+                         :command=>proc{_show_fontdlg}), 
+            TkButton.new(parent, :text=>'Progression dialog', 
+                         :command=>proc{_show_progdlg}), 
+            TkButton.new(parent, :text=>'Password dialog', 
+                         :command=>proc{_show_passdlg}), 
+            :side=>:left, :padx=>5, :anchor=>:w)
+  end
+
+  def self._show_color(w)
+    dlg = Tk::BWidget::SelectColor.new(w, :color=>w.background)
+    color = dlg.menu([:below, w])
+    unless color.empty?
+      w.background(color)
+    end
+  end
+
+  def self._show_tmpldlg
+    dlg = Tk::BWidget::Dialog.new(:relative=>Tk.root, :modal=>:local, 
+                                  :separator=>true, :title=>'Template dialog', 
+                                  :side=>@@tmpl['side'], 
+                                  :anchor=>@@tmpl['anchor'], 
+                                  :default=>0, :cancel=>1)
+    dlg.add('name'=>'ok')
+    dlg.add('name'=>'cancel')
+    TkMessage.new(dlg.get_frame, :text=>"Template\nDialog", :justify=>:center, 
+                  :anchor=>:c, :width=>80).pack(:fill=>:both, :expand=>true, 
+                                                :padx=>100, :pady=>100)
+    dlg.draw
+    dlg.destroy
+  end
+
+  def self._show_msgdlg
+    @@msgdlg.destroy if @@msgdlg
+    @@msgdlg = Tk::BWidget::MessageDlg.new(:relative=>Tk.root, 
+                                           :message=>'Message for MessageBox', 
+                                           :type=>@@msg['type'], 
+                                           :icon=>@@msg['icon'], 
+                                           :buttons=>@@msg['buttons'])
+    @@msgdlg.create
+  end
+
+  def self._show_fontdlg
+    font = Tk::BWidget::SelectFont.new(:relative=>Tk.root, 
+                                       :font=>DemoVar.font).create
+    DemoVar::Demo.update_font(font)
+  end
+
+  def self._show_progdlg
+    @@progmsg.value = "Compute in progress..."
+    @@progval.value = 0
+
+    @@progdlg = Tk::BWidget::ProgressDlg.new(:relative=>Tk.root, 
+                                             :title=>'Wait...', 
+                                             :type=>'infinite', :width=>20, 
+                                             :textvariable=>@@progmsg, 
+                                             :variable=>@@progval, 
+                                             :stop=>'Stop') {
+      command(proc{self.destroy})
+      create
+    }
+    _update_progdlg
+  end
+
+  def self._update_progdlg
+    TkTimer.new(20, -1, proc{
+                  if @@progdlg && @@progdlg.winfo_exist?
+                    @@progval.value = 2
+                  else
+                    stop
+                  end
+                }).start
+  end
+
+  def self._show_passdlg
+    Tk::BWidget::PasswdDlg.new(:relative=>Tk.root).create
+  end
+end
+
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/tree.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/tree.rb
new file mode 100644
index 0000000000..e1fcaa774f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/tree.rb
@@ -0,0 +1,289 @@
+#
+#  templdlg demo  ---  called from demo.rb
+#
+unless Object.const_defined?('DemoVar')
+  fail RuntimeError, "This is NOT a stand alone script. This script is called from 'demo.rb'. "
+end
+
+module DemoTree
+  @@count = 0
+  @@dblclick = false
+  @@top = nil
+
+  def self.create(nb)
+    frame = nb.insert('end', 'demoTree', :text=>'Tree')
+    pw = Tk::BWidget::PanedWindow.new(frame, :side=>:top)
+
+    pane = pw.add(:weight=>1)
+    title = Tk::BWidget::TitleFrame.new(pane, :text=>'Directory tree')
+    sw = Tk::BWidget::ScrolledWindow.new(title.get_frame, 
+                                         :relief=>:sunken, :borderwidth=>2)
+    tree = Tk::BWidget::Tree.new(sw, :relief=>:flat, :borderwidth=>0, 
+                                 :width=>15, :highlightthickness=>0, 
+                                 :redraw=>false, :dropenabled=>true, 
+                                 :dragenabled=>true, :dragevent=>3, 
+                                 :droptypes=>[
+                                   'TREE_NODE', [
+                                     :copy, [], 
+                                     :move, [],
+                                     :link, []
+                                   ], 
+                                   'LISTBOX_ITEM', [
+                                     :copy, [], 
+                                     :move, [],
+                                     :link, []
+                                   ]
+                                 ], 
+                                 :opencmd=>proc{|node| 
+                                   moddir(1, tree, node)
+                                 }, 
+                                 :closecmd=>proc{|node| 
+                                   moddir(0, tree, node)
+                                 })
+    sw.set_widget(tree)
+
+    sw.pack(:side=>:top, :expand=>true, :fill=>:both)
+    title.pack(:fill=>:both, :expand=>true)
+
+    pane = pw.add(:weight=>2)
+    lf = Tk::BWidget::TitleFrame.new(pane, :text=>'Content')
+    sw = Tk::BWidget::ScrolledWindow.new(lf.get_frame, 
+                                         :scrollbar=>:horizontal, 
+                                         :auto=>:none, :relief=>:sunken, 
+                                         :borderwidth=>2)
+
+    list = Tk::BWidget::ListBox.new(sw, :relief=>:flat, :borderwidth=>0, 
+                                    :highlightthickness=>0, :width=>20, 
+                                    :multicolumn=>true, :redraw=>false, 
+                                    :dragevent=>3, :dropenabled=>true, 
+                                    :dragenabled=>true, 
+                                 :droptypes=>[
+                                      'TREE_NODE', [
+                                        :copy, [], 
+                                        :move, [],
+                                        :link, []
+                                      ], 
+                                      'LISTBOX_ITEM', [
+                                        :copy, [], 
+                                        :move, [],
+                                        :link, []
+                                      ]
+                                    ])
+    sw.set_widget(list)
+
+    Tk.pack(sw, lf, :fill=>:both, :expand=>true)
+
+    pw.pack(:fill=>:both, :expand=>true)
+
+    tree.textbind('ButtonPress-1',
+                  proc{|node, ev| select('tree', 1, tree, list, node)})
+    tree.textbind('Double-ButtonPress-1', 
+                  proc{|node, ev| select('tree', 2, tree, list, node)})
+
+    list.textbind('ButtonPress-1',
+                  proc{|node, ev| select('list', 1, tree, list, node)})
+    list.textbind('Double-ButtonPress-1', 
+                  proc{|node, ev| select('list', 2, tree, list, node)})
+
+    list.imagebind('Double-ButtonPress-1', 
+                   proc{|node, ev| select('list', 2, tree, list, node)})
+
+    nb.itemconfigure('demoTree', 
+                     :createcmd=>proc{|*args| init(tree, list, *args)}, 
+                     :raisecmd=>proc{
+                       Tk.root.geometry =~ 
+                         /\d+x\d+([+-]{1,2}\d+)([+-]{1,2}\d+)/
+                       global_w = ($1 || 0).to_i
+                       global_h = ($2 || 0).to_i
+                       if @@top
+                         Tk::BWidget.place(@@top, 0, 0, :at, 
+                            global_w - Tk.root.winfo_screenwidth, global_h)
+                         @@top.deiconify
+                         Tk.root.bind('Unmap', proc{@@top.withdraw})
+                         Tk.root.bind('Map',   proc{@@top.deiconify})
+                         Tk.root.bind('Configure', proc{|w|
+                                if w == Tk.root
+                                  Tk.root.geometry =~ 
+                                    /\d+x\d+([+-]{1,2}\d+)([+-]{1,2}\d+)/
+                                  global_w = ($1 || 0).to_i
+                                  global_h = ($2 || 0).to_i
+                                  Tk::BWidget.place(@@top, 0, 0, :at, 
+                                       global_w - Tk.root.winfo_screenwidth, 
+                                       global_h)
+                                end
+                         }, '%W')
+                       end
+                     }, 
+                     :leavecmd=>proc{
+                       @@top.withdraw if @@top
+                       Tk.root.bind_remove('Unmap')
+                       Tk.root.bind_remove('Map')
+                       Tk.root.bind_remove('Configure')
+                       true
+                     })
+  end
+
+  def self.init(tree, list, *args)
+    @@count = 0
+    if Tk::PLATFORM['platform'] == 'unix'
+      rootdir = File.expand_path('~')
+    else
+      rootdir = 'c:'
+    end
+
+    tree.insert('end', 'root', 'home', 
+                :text=>rootdir, :data=>rootdir, :open=>true, 
+                :image=>Tk::BWidget::Bitmap.new('openfold'))
+    getdir(tree, 'home', rootdir)
+    select('tree', 1, tree, list, 'home')
+    tree.redraw(true)
+    list.redraw(true)
+
+    @@top = TkToplevel.new
+    @@top.withdraw
+    @@top.protocol('WM_DELETE_WINDOW'){
+      # don't kill me
+    }
+    @@top.resizable(false, false)
+    @@top.title('Drag rectangle to scroll directory tree')
+    @@top.transient(Tk.root)
+    Tk::BWidget::ScrollView.new(@@top, :window=>tree, :fill=>'white', 
+                                :width=>300, :height=>300, :relief=>:sunken, 
+                                :bd=>1).pack(:fill=>:both, :expand=>true)
+  end
+
+  def self.getdir(tree, node, path)
+    lentries = Dir.glob(File.join(path, '*')).sort
+    lfiles = []
+    lentries.each{|f|
+      basename = File.basename(f)      
+      if File.directory?(f)
+        Tk::BWidget::Tree::Node.new(tree, node, 
+                                    :index=>'end', :text=>basename, 
+                                    :image=>Tk::BWidget::Bitmap.new('folder'), 
+                                    :drawcross=>:allways, :data=>f)
+        @@count += 1
+      else
+        lfiles << basename
+      end
+    }
+    tree.itemconfigure(node, :drawcross=>:auto, :data=>lfiles)
+  end
+
+  def self.moddir(idx, tree, node)
+    if (idx != 0 && tree.itemcget(node, :drawcross).to_s == 'allways')
+      getdir(tree, node, tree.itemcget(node, :data))
+      if tree.nodes(node).empty?
+        tree.itemconfigure(node, :image=>Tk::BWidget::Bitmap.new('folder'))
+      else
+        tree.itemconfigure(node, :image=>Tk::BWidget::Bitmap.new('openfold'))
+      end
+    else
+      img = %w(folder openfold)[idx] || 'openfold'
+      tree.itemconfigure(node, :image=>Tk::BWidget::Bitmap.new(img))
+    end
+  end
+
+  def self.select(where, num, tree, list, node)
+    @@dblclick = true
+    if num == 1
+      if (where == 'tree' && 
+          tree.selection_get.find{|x|
+            TkUtil._get_eval_string(x) == TkUtil._get_eval_string(node)
+          })
+        @@dblclick = false
+        Tk.after(500, proc{edit('tree', tree, list, node)})
+        return
+      end
+      if (where == 'list' && 
+          list.selection_get.find{|x|
+            TkUtil._get_eval_string(x) == TkUtil._get_eval_string(node)
+          })
+        @@dblclick = false
+        Tk.after(500, proc{edit('list', tree, list, node)})
+        return
+      end
+      if where == 'tree'
+        select_node(tree, list, node)
+      else
+        list.selection_set(node)
+      end
+    elsif (where == 'list' && tree.exist?(node))
+      parent = tree.parent(node)
+      while TkUtil._get_eval_string(parent) != 'root'
+        tree.itemconfigure(parent, :open=>true)
+        parent = tree.parent(parent)
+      end
+      select_node(tree, list, node)
+    end
+  end
+
+  def self.select_node(tree, list, node)
+    tree.selection_set(node)
+    Tk.update
+    list.delete(*(list.items(0, 'end')))
+
+    dir = tree.itemcget(node, :data)
+    if tree.itemcget(node, :drawcross).to_s == 'allways'
+      getdir(tree, node, dir)
+      dir = tree.itemcget(node, :data)
+    end
+
+    tree.nodes(node).each{|subnode|
+      list.insert('end', subnode, 
+                  :text=>tree.itemcget(subnode, :text), 
+                  :image=>Tk::BWidget::Bitmap.new('folder'))
+    }
+
+    TkComm.simplelist(dir).each{|f|
+      Tk::BWidget::ListBox::Item.new(list, 'end', :text=>f, 
+                                     :image=>Tk::BWidget::Bitmap.new('file'))
+    }
+  end
+
+  def self.edit(where, tree, list, node)
+    return if @@dblclick
+
+    if (where == 'tree' && 
+        tree.selection_get.find{|x|
+          TkUtil._get_eval_string(x) == TkUtil._get_eval_string(node)
+        })
+      res = tree.edit(node, tree.itemcget(node, :text))
+      if res != ''
+        tree.itemconfigure(node, :text=>res)
+        if list.exist?(node)
+          list.itemconfigure(node, :text=>res)
+        end
+        tree.selection_set(node)
+      end
+      return
+    end
+
+    if (where == 'list')
+      res = list.edit(node, list.igemcget(node, :text))
+      if res != ''
+        list.itemconfigure(node, :text=>res)
+        if tree.exist?(node)
+          tree.itemconfigure(node, :text=>res)
+        else
+          cursel = tree.selection_get[0]
+          index  = list.index(node) - tree.nodes(cursel).size
+          data   = TkComm.simplelist(tree.itemcget(cursel, :data))
+          data[index] = res
+          tree.itemconfigure(cursel, :date=>data)
+        end
+        list.selection_set(node)
+      end
+    end
+  end
+
+  def self.expand(tree, but)
+    unless (cur = tree.selection_get).empty?
+      if TkComm.bool(but)
+        tree.opentree(cur)
+      else
+        tree.closetree(cur)
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/x1.xbm b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/x1.xbm
new file mode 100644
index 0000000000..6137a118f8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/bwidget/x1.xbm
@@ -0,0 +1,2258 @@
+#define x1_width 626
+#define x1_height 428
+static char x1_bits[] = {
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0x03,0x80,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xe0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,
+ 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x80,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
+ 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0xfc,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,
+ 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x3f,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xfc,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,
+ 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
+ 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xe0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
+ 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x1f,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xc0,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
+ 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x0f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfe,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xfc,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x80,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,
+ 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x03,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x07,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x01,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xfc,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x1f,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0x3f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0xfc,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf0,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
+ 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0x0f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x07,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xe0,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,
+ 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x03,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0x03,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
+ 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xfc,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x0f,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x0f,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0x00,0xf8,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0xfc,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,
+ 0x7f,0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0xfc,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfe,0xff,0xff,0x3f,0x00,0x00,0x00,0xc0,0xff,0xff,0x03,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x3f,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0xe0,0xff,0xff,
+ 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0x1f,0x00,0x00,
+ 0x00,0xf0,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0xfc,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,
+ 0xff,0x1f,0x00,0x00,0x00,0xfc,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,
+ 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xf0,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xfe,0xff,0xff,0x3f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xfe,0xff,
+ 0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0x0f,0x00,
+ 0x00,0x00,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
+ 0xff,0xff,0x07,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x01,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xc0,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0x01,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x03,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xe0,0xff,
+ 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,
+ 0xf8,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0xfc,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x03,
+ 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,
+ 0x00,0x00,0x00,0x00,0xfe,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0xfc,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,
+ 0xff,0xff,0xff,0x01,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x80,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x07,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
+ 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc0,0xff,0x07,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x07,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xf8,
+ 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,
+ 0xe0,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xfc,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
+ 0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,
+ 0x00,0x00,0x00,0x00,0xf8,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xfc,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,
+ 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0xfc,0xff,0x0f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
+ 0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0xfe,0xff,0x0f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0xfe,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
+ 0x00,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
+ 0x7f,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x07,0x00,0x00,0x00,0x80,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
+ 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0xc0,0xff,0xff,0x1f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0xe0,0xff,0xff,
+ 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
+ 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,
+ 0x00,0xf0,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
+ 0xff,0x3f,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
+ 0xff,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x3f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,
+ 0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0x1f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x80,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0xfe,0xff,
+ 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
+ 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
+ 0x00,0x00,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x1f,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
+ 0xff,0x1f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf0,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0x1f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xe0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0xe0,0xff,
+ 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,
+ 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0x07,0x00,
+ 0x00,0x00,0xe0,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x0f,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,
+ 0xff,0xff,0x03,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xe0,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xf0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xfc,
+ 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x07,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xfd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
+ 0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xf0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x80,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
+ 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x80,
+ 0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x07,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xfd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xf8,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
+ 0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,
+ 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
+ 0xf8,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x03,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfe,0xff,0xff,0x01,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x01,0x00,0x00,0x00,0xfe,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,
+ 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0x00,0x00,0x00,
+ 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,
+ 0x7f,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0xff,0x7f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0x3f,0x00,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0x1f,0x00,0x00,
+ 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
+ 0xff,0x1f,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xf0,0xff,0x0f,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,
+ 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x07,0x00,0x00,0x00,0xf8,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0x07,0x00,
+ 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xe0,0xff,0x03,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfe,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xe0,0xff,0x01,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,
+ 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x01,0x00,0x00,0x00,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x07,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x00,
+ 0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
+ 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x80,0x7f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xfe,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x80,0x7f,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
+ 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x3f,0x00,0x00,0x00,0xe0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x80,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x0f,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,
+ 0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
+ 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x80,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x07,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x80,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0e,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x1f,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0e,0x00,0x00,0x00,
+ 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x3f,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x06,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0xf0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0xfc,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,
+ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xfd,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfd,0x00,0x00,0x00,
+ 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xfd,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0xf8,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xfc,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,0x00,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,
+ 0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xfc,0x00,0x00,0x00,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xfc,
+ 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x3f,0xfc,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xfc,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xfc,0x00,0x00,0x00,
+ 0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0xfc,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0xfc,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xfc,0x00,0x00,0x00,0x00,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xfc,0x00,0x00,
+ 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x0f,0xfc,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x0f,0xfc,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0xfc,0x00,0x00,0x00,0xe0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0xfc,0x00,
+ 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x07,0xfc,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x07,0xfc,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0xfc,0x00,0x00,0x00,0xf8,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0xfc,
+ 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x03,0xfc,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0xfc,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0xfc,0x00,0x00,0x00,
+ 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0xfc,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0xfc,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xfc,0x00,0x00,0x80,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0xfc,0x00,0x00,
+ 0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
+ 0x00,0xfc,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x3f,0x00,0xfc,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0xfc,0x00,0x00,0xe0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0xfc,0x00,
+ 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x1f,0x00,0xfc,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x1f,0x00,0xfc,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0xfc,0x00,0x00,0xf8,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0xfc,
+ 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x0f,0x00,0xfc,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xfc,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xfc,0x00,0x00,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,
+ 0xfc,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x03,0x00,0xfc,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0xfc,0x00,0x80,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0xfc,0x00,0x80,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0xfc,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0x00,0xfc,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0xfc,0x00,0xe0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0xfc,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,
+ 0x00,0x00,0xfc,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x3f,0x00,0x00,0xfc,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0xfc,0x00,0xf0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0xfc,
+ 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x0f,0x00,0x00,0xfc,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xfc,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xfc,0x00,0xfc,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,
+ 0xfc,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x03,0x00,0x00,0xfc,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xfc,0x00,0xfe,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xfc,0x00,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
+ 0x00,0xfc,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x7f,0x00,0x00,0x00,0xfc,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0xfc,0x00,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0xfc,0x80,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
+ 0x00,0x00,0xfc,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x1f,0x00,0x00,0x00,0xfc,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xfc,0xc0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xfc,
+ 0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
+ 0x00,0x00,0x00,0xfc,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0xfc,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0xfc,0xe0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
+ 0xfc,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x01,0x00,0x00,0x00,0xfc,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xfc,0xf0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xfc,0xf0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,
+ 0x00,0xfc,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0x00,0xfc,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0xfc,0xf8,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
+ 0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x07,0x00,0x00,0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0xfc,
+ 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,
+ 0x00,0x00,0x00,0xfc,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0xfc,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x7f,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0xf8,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x0f,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
+ 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xe0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x01,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x03,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x07,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
+ 0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0x80,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x7f,0x00,0x00,0x00,0xc0,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,
+ 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0xc0,0x0f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x01,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0xe0,
+ 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x80,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0xf0,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x80,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xf8,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0xfc,0x3f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,
+ 0xfc,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x01,0x00,0x00,0x00,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x80,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
+ 0x7f,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x80,0xff,0x7f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0x80,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x80,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0xc0,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
+ 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0xe0,0xff,0xff,0x01,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
+ 0xff,0x7f,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xf0,0xff,0xff,
+ 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,
+ 0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
+ 0x00,0xf8,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x07,0x00,0x00,0x00,0xf8,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
+ 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0xfc,0xff,0xff,0x03,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
+ 0xff,0xff,0x3f,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0xfe,0xff,
+ 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf0,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
+ 0x00,0x00,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0xc0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x7f,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x0f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0xc0,0xff,
+ 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
+ 0x00,0x00,0xe0,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xe0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x0f,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,
+ 0x0f,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,
+ 0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0xf8,
+ 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0xe0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x01,
+ 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
+ 0xff,0x07,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xfe,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf0,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+ 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0xf0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0x03,0x00,
+ 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,
+ 0xff,0xff,0x03,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xe0,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0xf8,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,
+ 0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0x01,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,
+ 0xff,0xff,0xff,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xf8,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x3f,0x00,0x00,0x00,0xfc,
+ 0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0x3f,
+ 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf8,0xff,0xff,0x1f,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xf0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x80,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0x0f,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+ 0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0x07,0x00,0x00,
+ 0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0x07,0x00,0x00,0x00,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+ 0xff,0x01,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
+ 0x01,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xe0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfe,0x7f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xc0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xf8,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x1f,0x00,0x00,0x00,0x80,0xff,0xff,0xff,
+ 0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,
+ 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,
+ 0xff,0x1f,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x80,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0x03,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x80,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0x03,0x00,
+ 0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xc0,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0xf0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
+ 0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0x1f,0x00,
+ 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,
+ 0xff,0xff,0x07,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xfc,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xe0,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0x7f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
+ 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0x7f,0x00,
+ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xf8,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,
+ 0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xf0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xc0,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x7f,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0xe0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfe,0x1f,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
+ 0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xf0,0x01,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
+ 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xc0,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x80,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x7f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xf8,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xfc,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0x01,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
+ 0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfe,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xf0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
+ 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x07,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,
+ 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xc0,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xc0,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
+ 0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x0f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,
+ 0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,
+ 0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xf8,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x1f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x80,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
+ 0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x3f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf0,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x80,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf8,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
+ 0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,
+ 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0xf8,
+ 0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
+ 0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x01,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
+ 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
+ 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,
+ 0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
+ 0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x80,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,
+ 0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,
+ 0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x80,0x0f,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0xc0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x80,
+ 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xf8,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xfc};
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/Orig_LICENSE.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/Orig_LICENSE.txt
new file mode 100644
index 0000000000..22f787609d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/Orig_LICENSE.txt
@@ -0,0 +1,42 @@
+
+  #######################################################################
+  ###  The following text is the original 'license.terms' of iwidges  ###
+  ###  extension.                                                     ###
+  ###  Original Tcl source files are not include in this directry,    ###
+  ###  because of all of them are rewrited to Ruby files.             ###
+  ###  However, the image data files in the 'images' directory are    ###
+  ###  quoted from iwidgets source archive.                           ###
+  #######################################################################
+
+
+This software is copyrighted by DSC Technologies and private individual 
+contributors.  The copyright holder is specifically listed in the header 
+of each file.  The following terms apply to all files associated with the
+software unless explicitly disclaimed in individual files by private
+contributors.
+
+Copyright 1997 DSC Technologies Corporation
+
+Permission to use, copy, modify, distribute and license this software and 
+its documentation for any purpose, and without fee or written agreement 
+with DSC, is hereby granted, provided that the above copyright notice 
+appears in all copies and that both the copyright notice and warranty 
+disclaimer below appear in supporting documentation, and that the names of
+DSC Technologies Corporation or DSC Communications Corporation not be used 
+in advertising or publicity pertaining to the software without specific, 
+written prior permission.
+
+DSC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, AND NON-INFRINGEMENT.
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND 
+DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
+ENHANCEMENTS, OR MODIFICATIONS. IN NO EVENT SHALL DSC BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTUOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+RESTRICTED RIGHTS: Use, duplication or disclosure by the government
+is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
+of the Rights in Technical Data and Computer Software Clause as DFARS
+252.227-7013 and FAR 52.227-19.
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/box.xbm b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/box.xbm
new file mode 100644
index 0000000000..7498e15de2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/box.xbm
@@ -0,0 +1,14 @@
+#define Tool_32_box_width 32
+#define Tool_32_box_height 32
+static unsigned char Tool_32_box_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0x0f, 0x20, 0x00, 0x00, 0x08,
+  0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08,
+  0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08,
+  0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08,
+  0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08,
+  0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x08,
+  0xe0, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/clear.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/clear.gif
new file mode 100644
index 0000000000..bd45628aa7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/clear.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/close.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/close.gif
new file mode 100644
index 0000000000..f91b9e9d1e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/close.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/copy.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/copy.gif
new file mode 100644
index 0000000000..7319f1dcb0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/copy.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/cut.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/cut.gif
new file mode 100644
index 0000000000..4258b17591
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/cut.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/exit.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/exit.gif
new file mode 100644
index 0000000000..e462be033f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/exit.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/find.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/find.gif
new file mode 100644
index 0000000000..dddcb8044b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/find.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/help.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/help.gif
new file mode 100644
index 0000000000..bc8f18c00d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/help.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/line.xbm b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/line.xbm
new file mode 100644
index 0000000000..4622ae978b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/line.xbm
@@ -0,0 +1,14 @@
+#define lineOp_width 32
+#define lineOp_height 32
+static unsigned char lineOp_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00,
+   0xf0, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x00,
+   0x80, 0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
+   0x00, 0x3c, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00,
+   0x00, 0xe0, 0x01, 0x00, 0x00, 0xc0, 0x03, 0x00, 0x00, 0x80, 0x07, 0x00,
+   0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x3c, 0x00,
+   0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0xe0, 0x01,
+   0x00, 0x00, 0xc0, 0x03, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x00, 0x0f,
+   0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/mag.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/mag.gif
new file mode 100644
index 0000000000..4a5be66e76
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/mag.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/new.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/new.gif
new file mode 100644
index 0000000000..9c68ad35f5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/new.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/open.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/open.gif
new file mode 100644
index 0000000000..bed862c8c4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/open.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/oval.xbm b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/oval.xbm
new file mode 100644
index 0000000000..856bd43785
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/oval.xbm
@@ -0,0 +1,14 @@
+#define ovalOp_width 32
+#define ovalOp_height 32
+static unsigned char ovalOp_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00,
+   0x00, 0x1c, 0x70, 0x00, 0x00, 0x03, 0x80, 0x01, 0x80, 0x00, 0x00, 0x02,
+   0x40, 0x00, 0x00, 0x04, 0x20, 0x00, 0x00, 0x08, 0x10, 0x00, 0x00, 0x10,
+   0x10, 0x00, 0x00, 0x10, 0x08, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x20,
+   0x08, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x20, 0x10, 0x00, 0x00, 0x10,
+   0x10, 0x00, 0x00, 0x10, 0x20, 0x00, 0x00, 0x08, 0x40, 0x00, 0x00, 0x04,
+   0x80, 0x00, 0x00, 0x02, 0x00, 0x03, 0x80, 0x01, 0x00, 0x1c, 0x70, 0x00,
+   0x00, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/paste.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/paste.gif
new file mode 100644
index 0000000000..9974f23bf5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/paste.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/points.xbm b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/points.xbm
new file mode 100644
index 0000000000..c50aa4c5f3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/points.xbm
@@ -0,0 +1,14 @@
+#define dotPencilOp_width 32
+#define dotPencilOp_height 32
+static unsigned char dotPencilOp_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x12, 0x00,
+  0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x80, 0x04, 0x00,
+  0x00, 0x80, 0x04, 0x00, 0x00, 0x40, 0x02, 0x00, 0x00, 0x40, 0x02, 0x00,
+  0x00, 0x20, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x90, 0x00, 0x00,
+  0x00, 0x90, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00,
+  0x00, 0x24, 0x00, 0x18, 0x00, 0x24, 0x00, 0x18, 0x00, 0x12, 0x00, 0x00,
+  0x00, 0x12, 0x00, 0x30, 0x00, 0x0e, 0x00, 0x30, 0x00, 0x06, 0x00, 0x00,
+  0x00, 0x06, 0x0c, 0x30, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x30, 0xa0, 0x01,
+  0x00, 0x60, 0xb0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/poly.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/poly.gif
new file mode 100644
index 0000000000..2b595bb9b7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/poly.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/print.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/print.gif
new file mode 100644
index 0000000000..d321f17457
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/print.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/ruler.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/ruler.gif
new file mode 100644
index 0000000000..00d26febf6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/ruler.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/save.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/save.gif
new file mode 100644
index 0000000000..d1ceb1a5c4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/save.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/select.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/select.gif
new file mode 100644
index 0000000000..f885c9ca5f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/select.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/text.xbm b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/text.xbm
new file mode 100644
index 0000000000..ffb0686303
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/text.xbm
@@ -0,0 +1,14 @@
+#define font_edit_width 32
+#define font_edit_height 32
+static unsigned char font_edit_bits[] = {
+  0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x1c,
+  0x00, 0x00, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x80, 0x7b,
+  0x00, 0x00, 0x80, 0x7e, 0x00, 0x00, 0xc0, 0xfd, 0x00, 0x00, 0x60, 0xfb,
+  0x00, 0x00, 0xb0, 0xf7, 0x00, 0x00, 0xd0, 0xef, 0x00, 0x00, 0xf8, 0xdf,
+  0x00, 0x00, 0xd4, 0x7f, 0x00, 0x00, 0xaa, 0x1f, 0x00, 0x00, 0x15, 0x0f,
+  0x00, 0x80, 0x82, 0x06, 0x03, 0x40, 0x01, 0x01, 0x07, 0xa0, 0x80, 0x00,
+  0x0f, 0x10, 0x40, 0x00, 0x1f, 0x08, 0x20, 0x00, 0x3b, 0xe4, 0x1f, 0x00,
+  0x73, 0x1a, 0x00, 0x00, 0xe3, 0x07, 0x00, 0x00, 0xc3, 0x01, 0x00, 0x00,
+  0xe3, 0x03, 0x00, 0x00, 0x7b, 0x07, 0x00, 0x00, 0x1f, 0x06, 0x00, 0x00,
+  0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/buttonbox.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/buttonbox.rb
new file mode 100644
index 0000000000..2b7cd45205
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/buttonbox.rb
@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+# sample 1
+p bb1 = Tk::Iwidgets::Buttonbox.new
+p bb1.add('Yes',   :text=>'Yes',   :command=>proc{puts 'Yes'})
+p bb1.add('No',    :text=>'No',    :command=>proc{puts 'No'})
+p bb1.add('Maybe', :text=>'Maybe', :command=>proc{puts 'Maybe'})
+bb1.default('Yes')
+bb1.pack(:expand=>true, :fill=>:both, :pady=>5)
+print "\n"
+
+# sample 2
+p bb2 = Tk::Iwidgets::Buttonbox.new
+p btn1 = bb2.add(:text=>'Yes',   :command=>proc{puts 'Yes'})
+p btn2 = bb2.add(:text=>'No',    :command=>proc{puts 'No'})
+p btn3 = bb2.add(:text=>'Maybe', :command=>proc{puts 'Maybe'})
+bb2.default(btn1)
+bb2.pack(:expand=>true, :fill=>:both, :pady=>5)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb
new file mode 100644
index 0000000000..4dd929c035
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb
@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk::Iwidgets::Calendar.new(:command=>proc{|arg| puts(arg.date)}, 
+                           :weekendbackground=>'mistyrose', 
+                           :weekdaybackground=>'ghostwhite', 
+                           :outline=>'black', :startday=>'wednesday', 
+                           :days=>%w(We Th Fr Sa Su Mo Tu)).pack
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintbox.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintbox.rb
new file mode 100644
index 0000000000..c7c043000a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintbox.rb
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk::Iwidgets::Canvasprintbox.new(:orient=>:landscape, :stretch=>1) \
+  .pack(:padx=>10, :pady=>10, :fill=>:both, :expand=>true)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintdialog.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintdialog.rb
new file mode 100644
index 0000000000..ea8d63e6eb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/canvasprintdialog.rb
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk::Iwidgets::Canvasprintdialog.new.activate
+
+Tk.mainloop
+
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/checkbox.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/checkbox.rb
new file mode 100644
index 0000000000..bae0eba73a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/checkbox.rb
@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+cb = Tk::Iwidgets::Checkbox.new
+cb.add('bold',      :text=>'Bold')
+cb.add('italic',    :text=>'Italic')
+cb.add('underline', :text=>'Underline')
+cb.select('underline')
+cb.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb
new file mode 100644
index 0000000000..ec9c7a1df3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb
@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+#
+# Non-editable Dropdown Combobox
+#
+cb1 = Tk::Iwidgets::Combobox.new(:labeltext=>'Month:', 
+                                 :selectioncommand=>proc{
+                                   puts(cb1.get_curselection)
+                                 }, 
+                                 :editable=>false, :listheight=>185, 
+                                 :popupcursor=>'hand1')
+
+cb1.insert_list('end', *%w(Jan Feb Mar Apr May June Jul Aug Sept Oct Nov Dec))
+
+
+#
+# Editable Dropdown Combobox
+#
+cb2 = Tk::Iwidgets::Combobox.new(:labeltext=>'Operating System:', 
+                                 :selectioncommand=>proc{
+                                   puts(cb2.get_curselection)
+                                 })
+
+cb2.insert_list('end', *%w(Linux HP-UX SunOS Solaris Irix))
+cb2.insert_entry('end', 'L')
+
+cb1.pack(:padx=>10, :pady=>10, :fill=>:x)
+cb2.pack(:padx=>10, :pady=>10, :fill=>:x)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/dateentry.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/dateentry.rb
new file mode 100644
index 0000000000..5727879217
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/dateentry.rb
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk::Iwidgets::Dateentry.new.pack
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/datefield.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/datefield.rb
new file mode 100644
index 0000000000..12d498245d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/datefield.rb
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+df = Tk::Iwidgets::Datefield.new(:command=>proc{puts(df.get)})
+df.pack(:fill=>:x, :expand=>true, :padx=>10,  :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/dialog.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/dialog.rb
new file mode 100644
index 0000000000..3449cd4b3d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/dialog.rb
@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Thread.new{Tk.mainloop}
+
+d = Tk::Iwidgets::Dialog.new(:modality=>:application)
+
+d.buttonconfigure('OK', :command=>proc{puts 'OK'; d.deactivate true})
+d.buttonconfigure('Apply', :command=>proc{puts 'Apply'})
+d.buttonconfigure('Cancel', :command=>proc{puts 'Cancel'; d.deactivate false})
+d.buttonconfigure('Help', :command=>proc{puts 'Help'})
+
+TkListbox.new(d.child_site, :relief=>:sunken).pack(:expand=>true, :fill=>:both)
+
+if TkComm.bool(d.activate)
+  puts "Exit via OK button"
+else
+  puts "Exit via Cancel button"
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb
new file mode 100644
index 0000000000..197521e0a4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+ds = Tk::Iwidgets::Dialogshell.new(:modality=>:none)
+
+ds.add('OK', :text=>'OK', :command=>proc{puts 'OK'; ds.deactivate})
+ds.add('Cancel', :text=>'Cancel', :command=>proc{puts 'Cancel'; ds.deactivate})
+ds.default('OK')
+
+TkButton.new(:text=>'ACTIVATE', :padx=>7, :pady=>7, 
+             :command=>proc{puts ds.activate}).pack(:padx=>10, :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb
new file mode 100644
index 0000000000..85c5d03d17
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+djl = Tk::Iwidgets::Disjointlistbox.new.pack(:fill=>:both, :expand=>true, 
+                                             :padx=>10,  :pady=>10)
+djl.set_lhs(*[0,2,4,5])
+djl.set_rhs(3,6)
+
+djl.insert_lhs(1,7,8)
+djl.insert_rhs(9)
+
+p djl.get_lhs
+p djl.get_rhs
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb
new file mode 100644
index 0000000000..856d883a92
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb
@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+#########################################################
+#
+#  use Tk::UTF8_String() for a utf8 charecter
+#
+#########################################################
+require 'tk'
+require 'tkextlib/iwidgets'
+
+TkOption.add('*textBackground', 'white')
+
+ef  = Tk::Iwidgets::Entryfield.new(:command=>proc{puts "Return Pressed"})
+
+fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:', 
+                                   :fixed=>10, :width=>12)
+
+nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:', 
+                                   :validate=>:numeric, :width=>12)
+
+aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:', 
+                                   :validate=>:alphabetic, :width=>12, 
+                                   :invalid=>proc{
+                                     puts "Alphabetic contents invalid"
+                                   })
+
+pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12, 
+                                   :show=>Tk::UTF8_String("\267"),  
+                                                         ## <=== utf8 character
+                                   :command=>proc{puts "Return Pressed"})
+
+Tk::Iwidgets::Labeledwidget.alignlabels(ef, fef, nef, aef, pef)
+
+ef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+fef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+nef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+aef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+pef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
new file mode 100644
index 0000000000..4a4c2e7eb7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+#########################################################
+#
+#  set $KCODE to 'utf' for a utf8 charecter
+#
+#########################################################
+$KCODE='utf'
+
+require 'tk'
+require 'tkextlib/iwidgets'
+
+TkOption.add('*textBackground', 'white')
+
+ef  = Tk::Iwidgets::Entryfield.new(:command=>proc{puts "Return Pressed"})
+
+fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:', 
+                                   :fixed=>10, :width=>12)
+
+nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:', 
+                                   :validate=>:numeric, :width=>12)
+
+aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:', 
+                                   :validate=>:alphabetic, :width=>12, 
+                                   :invalid=>proc{
+                                     puts "Alphabetic contents invalid"
+                                   })
+
+pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12, 
+                                   :show=>"\267",  ## <=== utf8 character
+                                   :command=>proc{puts "Return Pressed"})
+
+Tk::Iwidgets::Labeledwidget.alignlabels(ef, fef, nef, aef, pef)
+
+ef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+fef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+nef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+aef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+pef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb
new file mode 100644
index 0000000000..bddd542f64
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb
@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+#########################################################
+#
+#  set Tk.encoding = 'utf-8' for a utf8 charecter
+#
+#########################################################
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk.encoding = 'utf-8'
+
+TkOption.add('*textBackground', 'white')
+
+ef  = Tk::Iwidgets::Entryfield.new(:command=>proc{puts "Return Pressed"})
+
+fef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Fixed:', 
+                                   :fixed=>10, :width=>12)
+
+nef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Numeric:', 
+                                   :validate=>:numeric, :width=>12)
+
+aef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Alphabetic:', 
+                                   :validate=>:alphabetic, :width=>12, 
+                                   :invalid=>proc{
+                                     puts "Alphabetic contents invalid"
+                                   })
+
+pef = Tk::Iwidgets::Entryfield.new(:labeltext=>'Password:', :width=>12, 
+                                   :show=>"\267",  ## <=== utf8 character
+                                   :command=>proc{puts "Return Pressed"})
+
+Tk::Iwidgets::Labeledwidget.alignlabels(ef, fef, nef, aef, pef)
+
+ef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+fef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+nef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+aef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+pef.pack(:fil=>:x,  :expand=>true, :padx=>10, :pady=>5)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb
new file mode 100644
index 0000000000..6971052b60
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb
@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk::Iwidgets::Extbutton.new(:text=>'Bitmap example', :bitmap=>'info', 
+                            :background=>'bisque',  :activeforeground=>'red', 
+                            :bitmapforeground=>'blue', :defaultring=>true, 
+                            :command=>proc{
+                              puts "Bisque is beautiful"
+                            }).pack(:expand=>true)
+
+#img = TkPhotoImage.new(:file=>File.join(File.dirname(File.expand_path(__FILE__)), '../../../images/earthris.gif'))
+img = TkPhotoImage.new(:file=>File.join(File.dirname(File.expand_path(__FILE__)), '../catalog_demo/images/clear.gif'))
+
+Tk::Iwidgets::Extbutton.new(:text=>'Image example', :relief=>:ridge, 
+                            :image=>img, :imagepos=>:e, :font=>'9x15bold', 
+                            :activebackground=>'lightyellow', 
+                            :background=>'lightgreen').pack(:expand=>true)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb
new file mode 100644
index 0000000000..4738084d9d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk::Iwidgets::Extfileselectionbox.new.pack(:padx=>10, :pady=>10, 
+                                           :fill=>:both, :expand=>true)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectiondialog.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectiondialog.rb
new file mode 100644
index 0000000000..c1a9b3defd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/extfileselectiondialog.rb
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+mainloop = Thread.new{Tk.mainloop}
+
+#
+# Non-modal example
+#
+nmfsd = Tk::Iwidgets::Extfileselectiondialog.new(:title=>'Non-Modal')
+nmfsd.buttonconfigure('OK', :command=>proc{
+                        puts "You selected #{nmfsd.get}"
+                        nmfsd.deactivate
+                      })
+nmfsd.activate
+
+#
+# Modal example
+#
+mfsd = Tk::Iwidgets::Extfileselectiondialog.new(:modality=>:application)
+mfsd.center
+if TkComm.bool(mfsd.activate)
+  puts "You selected #{mfsd.get}"
+else
+  puts "You cancelled the dialog"
+end
+
+
+mainloop.join
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/feedback.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/feedback.rb
new file mode 100644
index 0000000000..7b87a029ed
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/feedback.rb
@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk::Iwidgets::Feedback.new(:labeltext=>'Status', :steps=>20){|fb|
+  pack(:padx=>10, :pady=>10, :fill=>:both, :expand=>true)
+  TkTimer.new(500, 20, proc{fb.step}).start(2500)
+}
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb
new file mode 100644
index 0000000000..2ad3adb974
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk::Iwidgets::Fileselectionbox.new.pack(:padx=>10, :pady=>10, 
+                                        :fill=>:both, :expand=>true)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/fileselectiondialog.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/fileselectiondialog.rb
new file mode 100644
index 0000000000..ff22b2f643
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/fileselectiondialog.rb
@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+mainloop = Thread.new{Tk.mainloop}
+
+#
+# Non-modal example
+#
+nmfsd = Tk::Iwidgets::Fileselectiondialog.new(:title=>'Non-Modal')
+nmfsd.buttonconfigure('OK', :command=>proc{
+                        puts "You selected #{nmfsd.get}"
+                        nmfsd.deactivate
+                      })
+nmfsd.activate
+
+#
+# Modal example
+#
+mfsd = Tk::Iwidgets::Fileselectiondialog.new(:modality=>:application)
+mfsd.center
+if TkComm.bool(mfsd.activate)
+  puts "You selected #{mfsd.get}"
+else
+  puts "You cancelled the dialog"
+end
+
+mainloop.join
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/finddialog.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/finddialog.rb
new file mode 100644
index 0000000000..110efb9b96
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/finddialog.rb
@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+mainloop = Thread.new{Tk.mainloop}
+
+st = Tk::Iwidgets::Scrolledtext.new.pack
+st.insert('end', "Now is the time for all good men\n")
+st.insert('end', "to come to the aid of their country")
+
+fd = Tk::Iwidgets::Finddialog.new(:textwidget=>st)
+fd.center(st)
+fd.activate
+
+mainloop.join
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb
new file mode 100644
index 0000000000..ddb08d8b78
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb
@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+def get_files(file)
+  dir = (file.empty?)? ENV['HOME'] : TkComm._fromUTF8(file)
+  Dir.chdir(dir) rescue return ''
+  Dir['*'].sort.collect{|f|
+    [TkComm._toUTF8(File.join(dir, f)), TkComm._toUTF8(f)]
+  }
+end
+
+Tk::Iwidgets::Hierarchy.new(:querycommand=>proc{|arg| get_files(arg.node)}, 
+                            :visibleitems=>'30x15', 
+                            :labeltext=>ENV['HOME']).pack(:side=>:left, 
+                                                          :expand=>true, 
+                                                          :fill=>:both)
+
+# Tk::Iwidgets::Hierarchy.new(:querycommand=>[proc{|n| get_files(n)}, '%n'], 
+#                           :visibleitems=>'30x15', 
+#                           :labeltext=>ENV['HOME']).pack(:side=>:left, 
+#                                                         :expand=>true, 
+#                                                         :fill=>:both)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/hyperhelp.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/hyperhelp.rb
new file mode 100644
index 0000000000..f9c92bf6dc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/hyperhelp.rb
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+mainloop = Thread.new{Tk.mainloop}
+
+dir  = '/usr/local/ActiveTcl/demos/IWidgets/html/'
+href = [ 'hyperhelp.n', 'buttonbox.n', 'calendar.n' ]
+
+hh = Tk::Iwidgets::Hyperhelp.new(:topics=>href, :helpdir=>dir)
+hh.show_topic('hyperhelp.n')
+hh.activate
+
+mainloop.join
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/labeledframe.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/labeledframe.rb
new file mode 100644
index 0000000000..4e2e21e727
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/labeledframe.rb
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+lf = Tk::Iwidgets::Labeledframe.new(:labeltext=>'Entry Frame', :labelpos=>:n)
+lf.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>10)
+
+cs = lf.child_site
+
+Tk::Iwidgets::Entryfield.new(cs, :labeltext=>'Name:').pack(:side=>:top, :fill=>:x)
+Tk::Iwidgets::Spinint.new(cs, :labeltext=>'Number:').pack(:side=>:top, :fill=>:x)
+Tk::Iwidgets::Pushbutton.new(cs, :text=>'Details:').pack(:side=>:top, :fill=>:x)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb
new file mode 100644
index 0000000000..1d2e0a98a3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb
@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+lw = Tk::Iwidgets::Labeledwidget.new(:labeltext=>'Canvas Widget', 
+                                     :labelpos=>:s)
+lw.pack(:fill=>:both, :expand=>true, :padx=>10, :pady=>10)
+
+cw = TkCanvas.new(lw.child_site, :relief=>:raised, :width=>200, :height=>200, 
+                  :borderwidth=>3, :background=>:white)
+cw.pack(:padx=>10, :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb
new file mode 100644
index 0000000000..b87a6d27f9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb
@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+mw = Tk::Iwidgets::Mainwindow.new
+
+mw.menubar.add(:menubutton, 'file', :text=>'File', :underline=>0, 
+               :padx=>8, :pady=>2, :menu=>[
+                 [:options, {:tearoff=>false}], 
+
+                 [:command, 'new', {
+                     :label=>'New', :underline=>0, 
+                     :helpstr=>'Create a new file'
+                   }
+                 ], 
+
+                 [:command, 'open', {
+                     :label=>'Open ...', :underline=>0, 
+                     :helpstr=>'Open an existing file'
+                   }
+                 ], 
+
+                 [:command, 'save', {
+                     :label=>'Save', :underline=>0, 
+                     :helpstr=>'Save the current file'
+                   }
+                 ], 
+
+                 [:command, 'saveas', {
+                     :label=>'Save As', :underline=>5, 
+                     :helpstr=>'Save the file as a different name'
+                   }
+                 ], 
+
+                 [:command, 'print', {
+                     :label=>'Print', :underline=>0, 
+                     :helpstr=>'Print the file'
+                   }
+                 ], 
+
+                 [:separator, 'sep1'], 
+
+                 [:command, 'close', {
+                     :label=>'Close', :underline=>0, 
+                     :helpstr=>'Close the file'
+                   }
+                 ], 
+
+                 [:separator, 'sep2'], 
+
+                 [:command, 'exit', {
+                     :label=>'Exit', :underline=>1, 
+                     :helpstr=>'Exit this application'
+                   }
+                 ], 
+
+                 nil
+               ])
+
+Tk::Iwidgets::Scrolledtext.new(mw.child_site).pack(:fill=>:both, :expand=>true)
+
+mw.activate
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb
new file mode 100644
index 0000000000..891761adc1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb
@@ -0,0 +1,124 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+helpvar = TkVariable.new
+viewmode = TkVariable.new
+
+menu_spec = [
+  [:menubutton, 'file', {
+      :text=>'File', :menu=>[
+        [:options, {:tearoff=>false}], 
+
+        [:command, 'new', {
+            :label=>'New', :helpstr=>'Open new document', 
+            :command=>proc{puts 'NEW'}
+          }
+        ], 
+
+        [:command, 'close', {
+            :label=>'Close', :helpstr=>'Close current document', 
+            :command=>proc{puts 'CLOSE'}
+          }
+        ], 
+
+        [:separator, 'sep1'], 
+
+        [:command, 'exit', {
+            :label=>'Exit', :helpstr=>'Exit application', 
+            :command=>proc{exit}
+          }
+        ]
+      ]
+    }
+  ], 
+
+  [:menubutton, 'edit', {
+      :text=>'Edit', :menu=>[
+        [:options, {:tearoff=>false}], 
+
+        [:command, 'undo', {
+            :label=>'Undo', :underline=>0, 
+            :helpstr=>'Undo last command', 
+            :command=>proc{puts 'UNDO'}
+          }
+        ], 
+
+        [:separator, 'sep2'], 
+
+        [:command, 'cut', {
+            :label=>'Cut', :underline=>1, 
+            :helpstr=>'Cut selection to clipboard', 
+            :command=>proc{puts 'CUT'}
+          }
+        ], 
+
+        [:command, 'copy', {
+            :label=>'Copy', :underline=>1, 
+            :helpstr=>'Copy selection to clipboard', 
+            :command=>proc{puts 'COPY'}
+          }
+        ], 
+
+        [:command, 'paste', {
+            :label=>'Paste', :underline=>0, 
+            :helpstr=>'Paste clipboard contents', 
+            :command=>proc{puts 'PASTE'}
+          }
+        ]
+      ]
+    }
+  ], 
+
+  [:menubutton, 'options', {
+      :text=>'Options', :menu=>[
+        [:options, {:tearoff=>false, :selectcolor=>'blue'}], 
+
+        [:radiobutton, 'byName', {
+            :variable=>viewmode, :value=>'NAME', 
+            :label=>'by Name', :helpstr=>'View files by name order', 
+            :command=>proc{puts 'NAME'}
+          }
+        ], 
+
+        [:radiobutton, 'byDate', {
+            :variable=>viewmode, :value=>'DATE', 
+            :label=>'by Date', :helpstr=>'View files by date order', 
+            :command=>proc{puts 'DATE'}
+          }
+        ], 
+
+        [:cascade, 'prefs', {
+            :label=>'Preferences', :menu=>[
+              [:command, 'colors', {
+                  :label=>'Colors...', :helpstr=>'Change text colors', 
+                  :command=>proc{puts 'COLORS'}
+                }
+              ], 
+
+              [:command, 'fonts', {
+                  :label=>'Fonts...', :helpstr=>'Change text font', 
+                  :command=>proc{puts 'COLORS'}
+                }
+              ]
+            ]
+          }
+        ]
+      ]
+    }
+  ]
+]
+
+#mb = Tk::Iwidgets::Menubar.new(:helpvariable=>helpvar, 
+#                              :menubuttons=>menu_spec)
+mb = Tk::Iwidgets::Menubar.new(:helpvariable=>helpvar)
+mb.configure(:menubuttons=>menu_spec)
+
+fr = TkFrame.new(:width=>300, :height=>300)
+ef = TkEntry.new(:textvariable=>helpvar)
+
+mb.pack(:anchor=>:nw, :fill=>:x, :expand=>true)
+fr.pack(:fill=>:both, :expand=>true)
+ef.pack(:anchor=>:sw, :fill=>:x, :expand=>true)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb
new file mode 100644
index 0000000000..d6f2292650
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb
@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+helpvar = TkVariable.new
+viewmode = TkVariable.new
+
+mb = Tk::Iwidgets::Menubar.new
+mb.menubuttons = [
+  [:menubutton, 'file', {
+      :text=>'File', :menu=>[
+        [:command,   'new',   {:label=>'New'}], 
+        [:command,   'close', {:label=>'Close'}], 
+        [:separator, 'sep1'], 
+        [:command,   'quit',  {:label=>'Quit'}]
+      ]
+    }
+  ], 
+  [:menubutton, 'edit', {:text=>'Edit'}]
+]
+
+mb.add(:command, '.edit.undo', :label=>'Undo', :underline=>0)
+mb.add(:separator, '.edit.sep2')
+mb.add(:command, '.edit.cut',   :label=>'Cut',   :underline=>1)
+mb.add(:command, '.edit.copy',  :label=>'Copy',  :underline=>1)
+mb.add(:command, '.edit.paste', :label=>'Paste', :underline=>0)
+
+mb.add(:menubutton, '.options', :text=>'Options', :menu=>[
+         [:radiobutton, 'byName', {
+             :variable=>viewmode, :value=>'NAME', :label=>'by Name'}
+         ], 
+         [:radiobutton, 'byDate', {
+             :variable=>viewmode, :value=>'DATE', :label=>'by Date'}
+         ]
+       ])
+
+mb.add(:cascade, '.options.prefs', :label=>'Preferences', :menu=>[
+         [:command, 'colors', {:label=>'Colors...'}], 
+         [:command, 'fonts',  {:label=>'Fonts...'}]
+       ])
+
+mb.pack(:side=>:left, :anchor=>:nw, :fill=>:x, :expand=>true)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb
new file mode 100644
index 0000000000..3221dbc30c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb
@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+mb = Tk::Iwidgets::Messagebox.new(:hscrollmode=>:dynamic, 
+                                  :labeltext=>'Messages', :labelpos=>:n, 
+                                  :height=>120, :width=>550, 
+                                  :savedir=>'/tmp', :textbackground=>'#d9d9d9')
+mb.pack(:padx=>5, :pady=>5, :fill=>:both, :expand=>true)
+
+mb.type_add('ERROR', :background=>'red', :foreground=>'white', :bell=>true)
+mb.type_add('WARNING', :background=>'yellow', :foreground=>'black')
+mb.type_add('INFO', :background=>'white', :foreground=>'black')
+
+mb.issue('This is an error message in red with a beep', 'ERROR')
+mb.issue('This warning message in yellow', 'WARNING')
+mb.issue('This is an informational message', 'INFO')
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb
new file mode 100644
index 0000000000..2f0e3648a6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb
@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+mb = Tk::Iwidgets::Messagebox.new(:hscrollmode=>:dynamic, 
+                                  :labeltext=>'Messages', :labelpos=>:n, 
+                                  :height=>120, :width=>550, 
+                                  :savedir=>'/tmp', :textbackground=>'#d9d9d9')
+mb.pack(:padx=>5, :pady=>5, :fill=>:both, :expand=>true)
+
+error   = mb.type_add(:background=>'red', :foreground=>'white', :bell=>true)
+warning = mb.type_add(:background=>'yellow', :foreground=>'black')
+info    = mb.type_add(:background=>'white', :foreground=>'black')
+
+mb.issue('This is an error message in red with a beep', error)
+mb.issue('This warning message in yellow', warning)
+mb.issue('This is an informational message', info)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb
new file mode 100644
index 0000000000..6c6bfbca3f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb
@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+mainloop = Thread.new{Tk.mainloop}
+
+#
+# Standard question message dialog used for confirmation.
+#
+md = Tk::Iwidgets::Messagedialog.new(:title=>'Message Dialog', 
+                                     :text=>'Are you sure ? ', 
+                                     :bitmap=>'questhead', :modality=>:global)
+
+md.buttonconfigure('OK', :text=>'Yes')
+md.buttonconfigure('Cancel', :text=>'No')
+
+if TkComm.bool(md.activate)
+  md.text('Are you really sure ? ')
+  if TkComm.bool(md.activate)
+    puts 'Yes'
+  else
+    puts 'No'
+  end
+else
+  puts 'No'
+end
+
+md.destroy
+
+#
+# Copyright notice with automatic deactivation.
+#
+bmp = '@' + File.join(File.dirname(File.expand_path(__FILE__)), '../catalog_demo/images/text.xbm')
+
+cr = Tk::Iwidgets::Messagedialog.new(:title=>'Copyright', 
+                                     :bitmap=>bmp, :imagepos=>:n, 
+                                     :text=>"Copyright 200x XXX Corporation\nAll rights reserved")
+
+cr.hide('Cancel')
+
+cr.activate
+Tk.after(7000, proc{cr.deactivate; Tk.root.destroy})
+
+mainloop.join
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
new file mode 100644
index 0000000000..e33b81eb6f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+# Create the tabnotebook widget and pack it.
+nb = Tk::Iwidgets::Notebook.new(:width=>100, :height=>100)
+nb.pack(:anchor=>:nw, :fill=>:both, :expand=>true, 
+        :side=>:left, :padx=>10, :pady=>10)
+
+# Add two pages to the tabnotebook,
+# labelled "Page One" and "Page Two"
+nb.add(:label=>'Page One')
+nb.add(:label=>'Page Two')
+
+# Get the child site frames of these two pages.
+page1CS = nb.child_site(0)
+page2CS = nb.child_site('Page Two')
+
+# Create buttons on each page of the tabnotebook.
+TkButton.new(page1CS, :text=>'Button One').pack
+TkButton.new(page2CS, :text=>'Button Two').pack
+
+# Select the first page of the tabnotebook.
+nb.select(0)
+
+# Create the scrollbar and associate teh scrollbar
+# and the notebook together, then pack the scrollbar
+nb.scrollbar(TkScrollbar.new).pack(:fill=>:y, :expand=>true, :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
new file mode 100644
index 0000000000..649de4f024
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+# Create the tabnotebook widget and pack it.
+nb = Tk::Iwidgets::Notebook.new(:width=>100, :height=>100)
+nb.pack(:anchor=>:nw, :fill=>:both, :expand=>true, 
+        :side=>:top, :padx=>10, :pady=>0)
+
+# Add two pages to the tabnotebook,
+# labelled "Page One" and "Page Two"
+nb.add(:label=>'Page One')
+nb.add(:label=>'Page Two')
+
+# Get the child site frames of these two pages.
+page1CS = nb.child_site(0)
+page2CS = nb.child_site('Page Two')
+
+# Create buttons on each page of the tabnotebook.
+TkButton.new(page1CS, :text=>'Button One').pack
+TkButton.new(page2CS, :text=>'Button Two').pack
+
+# Select the first page of the tabnotebook.
+nb.select(0)
+
+# Create the scrollbar and associate teh scrollbar
+# and the notebook together, then pack the scrollbar
+nb.xscrollbar(TkScrollbar.new).pack(:fill=>:x, :expand=>true, :padx=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb
new file mode 100644
index 0000000000..1fd7a5bc05
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+om = Tk::Iwidgets::Optionmenu.new(:labelmargin=>5, :labelpos=>:w, 
+                                  :labeltext=>"Operating System :")
+
+om.insert('end', 'Unix', 'VMS', 'Linux', 'OS/2', 'Windows NT', 'DOS')
+om.sort_ascending
+om.select('Linux')
+
+om.pack(:padx=>10, :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb
new file mode 100644
index 0000000000..6e4458e508
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb
@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+pw = Tk::Iwidgets::Panedwindow.new(:width=>300, :height=>300)
+
+pw.add('top')
+pw.add('middle', :margin=>10)
+pw.add('bottom', :margin=>10, :minimum=>10)
+
+pw.pack(:fill=>:both, :expand=>true)
+
+pw.child_site_list.each{|pane|
+  TkButton.new(pane, :text=>pane.path, :relief=>:raised, 
+               :borderwidth=>2).pack(:fill=>:both, :expand=>true)
+}
+
+pw.fraction(50,30,20)
+pw.paneconfigure(0, :minimum=>20)
+pw.paneconfigure('bottom', :margin=>15)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb
new file mode 100644
index 0000000000..6779cb57db
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb
@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+pw = Tk::Iwidgets::Panedwindow.new(:width=>300, :height=>300)
+
+top = pw.add
+middle = pw.add(:margin=>10)
+bottom = pw.add(:margin=>10, :minimum=>10)
+
+pw.pack(:fill=>:both, :expand=>true)
+
+pw.child_site_list.each{|pane|
+  TkButton.new(pane, :text=>pane.path, :relief=>:raised, 
+               :borderwidth=>2).pack(:fill=>:both, :expand=>true)
+}
+
+pw.fraction(50,30,20)
+pw.paneconfigure(0, :minimum=>20)  # 0 == pw.index(top)
+pw.paneconfigure(bottom, :margin=>15)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb
new file mode 100644
index 0000000000..2c643e56f7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+mainloop = Thread.new{Tk.mainloop}
+
+TkOption.add('*textBackground', 'white')
+
+pd = Tk::Iwidgets::Promptdialog.new(:modality=>:global, :title=>'Password', 
+                                    :labeltext=>'Password:', :show=>'*')
+pd.hide('Apply')
+
+if TkComm.bool(pd.activate)
+  puts "Password entered: #{pd.get}"
+else
+  puts "Password prompt cancelled"
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb
new file mode 100644
index 0000000000..6e1c3fffe3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk::Iwidgets::Pushbutton.new(:text=>'Hello', 
+                             :command=>proc{puts 'Hello World'}, 
+                             :defaultring=>true).pack(:padx=>10, :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/radiobox.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/radiobox.rb
new file mode 100644
index 0000000000..9cd6a002b0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/radiobox.rb
@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+rb = Tk::Iwidgets::Radiobox.new(:labeltext=>'Fonts')
+rb.add('times',     :text=>'Times')
+rb.add('helvetica', :text=>'Helvetica')
+rb.add('courier',   :text=>'Courier')
+rb.add('symbol',    :text=>'Symbol')
+rb.select('courier')
+rb.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledcanvas.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledcanvas.rb
new file mode 100644
index 0000000000..92c94b96bb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledcanvas.rb
@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+sc = Tk::Iwidgets::Scrolledcanvas.new
+
+sc.create(TkcRectangle, 100, 100, 400, 400, :fill=>'red')
+TkcRectangle.new(sc, 300, 300, 600, 600, :fill=>'green')
+TkcRectangle.new(sc, [[200, 200], [500, 500]], :fill=>'blue')
+
+sc.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb
new file mode 100644
index 0000000000..5219847c9c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb
@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+sf = Tk::Iwidgets::Scrolledframe.new(:width=>150, :height=>180, 
+                                     :labeltext=>'scrolledframe')
+cs = sf.child_site
+
+TkButton.new(cs, :text=>'Hello').pack(:pady=>10)
+TkButton.new(cs, :text=>'World').pack(:pady=>10)
+TkButton.new(cs, :text=>'This is a test').pack(:pady=>10)
+TkButton.new(cs, :text=>'This is a really big button').pack(:pady=>10)
+TkButton.new(cs, :text=>'This is another really big button').pack(:pady=>10)
+TkButton.new(cs, :text=>'This is the last really big button').pack(:pady=>10)
+
+sf.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb
new file mode 100644
index 0000000000..04334b8da8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb
@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+TkOption.add('*textBackground', 'white')
+
+sh = Tk::Iwidgets::Scrolledhtml.new(:fontname=>'helvetica', 
+                                    :linkcommand=>proc{|href|
+                                      sh.import_link(href)
+                                    })
+sh.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
+
+sh.import(Tk.getOpenFile(:title=>'select HTML document'))
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb
new file mode 100644
index 0000000000..0b69751911
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb
@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+TkOption.add('*textBackground', 'white')
+
+slb = Tk::Iwidgets::Scrolledlistbox.new(:selectmode=>:single, 
+                                        :vscrollmode=>:static,
+                                        :hscrollmode=>:dynamic,
+                                        :labeltext=>'List', 
+                                        :selectioncommand=>proc{
+                                          puts(slb.get_curselection)
+                                        }, 
+                                        :dblclickcommand=>proc{
+                                          puts('Double Click')
+                                          puts(slb.get_curselection)
+                                        })
+slb.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
+
+slb.insert('end', *['Hello', 'Out There', 'World'])
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb
new file mode 100644
index 0000000000..dd1a99a829
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb
@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+st = Tk::Iwidgets::Scrolledtext.new(:hscrollmode=>:dynamic, :wrap=>:none, 
+                                    :labeltext=>'Password File')
+st.pack(:expand=>true, :fill=>:both, :padx=>10, :pady=>10)
+
+st.import('/etc/passwd')
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb
new file mode 100644
index 0000000000..a5d623ae80
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb
@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+TkOption.add('*textBackground', 'white')
+
+sb = Tk::Iwidgets::Selectionbox.new.pack(:padx=>10, :pady=>10, 
+                                         :fill=>:both, :expand=>true)
+
+sb.insert_items('end', *['Hello', 'Out There', 'World'])
+
+TkLabel.new(sb.child_site, 
+            :text=>'Child Site is Here').pack(:fill=>:x, :padx=>10, :pady=>10)
+
+sb.insert_items(2, 'Cruel Cruel')
+
+sb.selection_set(1)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb
new file mode 100644
index 0000000000..f40b419180
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb
@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+mainloop = Thread.new{Tk.mainloop}
+
+TkButton.new(:text=>'QUIT', 
+             :command=>proc{Tk.root.destroy}).pack(:padx=>10, :pady=>10)
+
+Tk::Iwidgets::Selectiondialog.new.activate
+
+mainloop.join
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb
new file mode 100644
index 0000000000..c44b5554a6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/shell.rb
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+sh = Tk::Iwidgets::Shell.new(:modality=>:application, 
+                             :padx=>20, :pady=>20, :title=>'Shell')
+
+TkButton.new(:text=>'ACTIVATE', :padx=>7, :pady=>7, 
+             :command=>proc{puts sh.activate}).pack(:padx=>10, :pady=>10)
+
+TkLabel.new(sh.child_site, :text=>'SHELL').pack
+TkButton.new(sh.child_site, :text=>'YES', 
+             :command=>proc{sh.deactivate 'press YES'}).pack(:fill=>:x)
+TkButton.new(sh.child_site, :text=>'NO', 
+             :command=>proc{sh.deactivate 'press NO'}).pack(:fill=>:x)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/spindate.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/spindate.rb
new file mode 100644
index 0000000000..17197a66b7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/spindate.rb
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk::Iwidgets::Spindate.new.pack(:padx=>10, :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb
new file mode 100644
index 0000000000..0bcdefb763
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb
@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+TkOption.add('*textBackground', 'white')
+
+Tk::Iwidgets::Spinint.new(:labeltext=>'Temperature', :labelpos=>:w, :width=>5, 
+                          :fixed=>true, :range=>[32, 212]).pack(:pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb
new file mode 100644
index 0000000000..295d38ee96
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb
@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+class Spinner_demo < TkWindow
+  Months = %w(January February March April May June July August September October November December)
+
+  def block_input(c)
+    false
+  end
+
+  def spin_month(step)
+    index = Months.index(@spinner.get) + step
+    index = 11 if index < 0
+    index = 0 if index > 11
+
+    @spinner.value = Months[index]
+  end
+
+  def initialize(parent=nil)
+    @spinner = Tk::Iwidgets::Spinner.new(parent, :labeltext=>'Month : ', 
+                                         :width=>10, :fixed=>10, 
+                                         :validate=>proc{|c| block_input}, 
+                                         :decrement=>proc{spin_month -1}, 
+                                         :increment=>proc{spin_month 1})
+    @path = @spinner
+    @spinner.insert(0, Months[0])
+  end
+end
+
+Spinner_demo.new.pack(:padx=>10, :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/spintime.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/spintime.rb
new file mode 100644
index 0000000000..2c13884b94
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/spintime.rb
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk::Iwidgets::Spintime.new.pack(:padx=>10, :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb
new file mode 100644
index 0000000000..6f1ecc4fa4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb
@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+# Create the tabnotebook widget and pack it.
+tn = Tk::Iwidgets::Tabnotebook.new(:width=>300, :height=>100)
+tn.pack(:anchor=>:nw, :fill=>:both, :expand=>true, 
+        :side=>:left, :padx=>10, :pady=>10)
+
+# Add two pages to the tabnotebook,
+# labelled "Page One" and "Page Two"
+tn.add(:label=>'Page One')
+tn.add(:label=>'Page Two')
+
+# Get the child site frames of these two pages.
+page1CS = tn.child_site(0)
+page2CS = tn.child_site('Page Two')
+
+# Create buttons on each page of the tabnotebook.
+TkButton.new(page1CS, :text=>'Button One').pack
+TkButton.new(page2CS, :text=>'Button Two').pack
+
+# Select the first page of the tabnotebook.
+tn.select(0)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb
new file mode 100644
index 0000000000..4a5eef5a8f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb
@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+# Create the tabnotebook widget and pack it.
+tn = Tk::Iwidgets::Tabnotebook.new(:width=>300, :height=>100)
+tn.pack(:anchor=>:nw, :fill=>:both, :expand=>true, 
+        :side=>:top, :padx=>10, :pady=>0)
+
+# Add two pages to the tabnotebook,
+# labelled "Page One" and "Page Two"
+tn.add(:label=>'Page One')
+tn.add(:label=>'Page Two')
+
+# Get the child site frames of these two pages.
+page1CS = tn.child_site(0)
+page2CS = tn.child_site('Page Two')
+
+# Create buttons on each page of the tabnotebook.
+TkButton.new(page1CS, :text=>'Button One').pack
+TkButton.new(page2CS, :text=>'Button Two').pack
+
+# Select the first page of the tabnotebook.
+tn.select(0)
+
+# Create the scrollbar
+# and the notebook together, then pack the scrollbar
+tn.xscrollbar(TkScrollbar.new).pack(:fill=>:x, :expand=>true, :padx=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/tabset.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/tabset.rb
new file mode 100644
index 0000000000..90be46b40b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/tabset.rb
@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+# Create a listbox with two items (one and two)
+l = TkListbox.new(:selectmode=>:single, :exportselection=>false).pack
+l.insert('end', 'one')
+l.insert('end', 'two')
+l.selection_set(0)
+
+# Define a proc that knows how to select an item
+# from a list given an index from the tabset -command callback.
+selectItem = proc{|item|
+  l.selection_clear(l.curselection)
+  l.selection_set(item)
+  l.see(item)
+}
+
+# Create a tabset, set its -command to call selectItem
+# Add two labels to the tabset (one and two).
+ts = Tk::Iwidgets::Tabset.new(:command=>selectItem)
+ts.add(:label=>1)
+ts.add(:label=>2)
+ts.select(0)
+ts.pack(:fill=>:x, :expand=>true)
+
+# Define a proc that knows how to select a tab
+# given a y pixel coordinate from the list..
+selectTab = proc{|y| ts.select(l.nearest(y)) }
+
+# bind button 1 press to the selectTab procedure.
+l.bind('ButtonPress-1', proc{|y| selectTab.call(y) }, '%y')
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/timeentry.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/timeentry.rb
new file mode 100644
index 0000000000..465939947b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/timeentry.rb
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Tk::Iwidgets::Timeentry.new.pack
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/timefield.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/timefield.rb
new file mode 100644
index 0000000000..bb5945048d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/timefield.rb
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+tf = Tk::Iwidgets::Timefield.new(:command=>proc{puts(tf.get)})
+tf.pack(:fill=>:x, :expand=>true, :padx=>10,  :pady=>10)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb
new file mode 100644
index 0000000000..355466eb1a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb
@@ -0,0 +1,152 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+##########################################
+# icon images
+editcopy22 = TkPhotoImage.new(:data=><<'EOD')
+   R0lGODlhFgAWAIUAAPwCBBQSFPz+/DQyNISChDw6PMzKzMTGxERGRIyKjFxa
+   XMTCvKSmpHR2dPz6/Pz29PTq3MS2rPz69MTCxFxWVHx6dJyWjNzSzPz27Pzy
+   7Pzu5PTm3NTKvIR+fJyGfHxuZHxqXNTCtPTq5PTi1PTezNS+rExOTFRORMyy
+   lPTaxOzWxOzSvNze3NTOxMy2nMyulMyqjAQCBAAAAAAAAAAAAAAAAAAAAAAA
+   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAbY
+   QIBwSCwahYGkUnk0BgTQ6IAQaBKfUWhBYKhaAU+CgXAQIAyChLeJzSIQhcH6
+   GFaM0QtGY5kstqEODw8QEQELAhJTc08KBBMEFBUWDRcBE1pca20SGBkaEBsc
+   AY5maFRIAgoLHRQRHh8gIQFlZnByqA8ZGSIQIyQjJQEmYgJ5p2ACrK4gJx4g
+   KIZZAgdeAQ4ZI9kjKSor0AwEjeAs1S0cHAslLi4vMDDRWeRIfEsxMeET4ATy
+   VoYLC5fizXEiAR84BeMG+pEm8EsAFhAjSlR4hR6fLxiF0AkCACH+aENyZWF0
+   ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5
+   OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2
+   ZWxjb3IuY29tADs=
+EOD
+
+editcut22 = TkPhotoImage.new(:data=><<'EOD')
+   R0lGODlhFgAWAIMAAPwCBAQCBAwCBPz+/OTi5JyanOzq7DQyNGxqbAAAAAAA
+   AAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAARbEMhJq704gxBE
+   0Bf3cZo4kRJqBQNRfBucyudgvJS6VaxLzyMa6/bLiWA9HOg4VIIkL5vzuRkc
+   pkvRIIAorphJLzBW84WEuRZWp6uaT7J2Sh1Hit3OY/ZO7WvsEQAh/mhDcmVh
+   dGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAx
+   OTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRl
+   dmVsY29yLmNvbQA7
+EOD
+
+editpaste22 = TkPhotoImage.new(:data=><<'EOD')
+   R0lGODlhFgAWAIYAAPwCBBQWFDw6FHRuFGRaBFxSBAQCBAQKBCQiBIx6HPz6
+   /NTOfKyiXDQuFOTm5Pz+/Ozu7PTq5Pz63PTyxNTOjKSeRExGLMTGxMzKzNTS
+   1NTW1Dw2NKSmpKyqrKSipJyanNzWlLy6ZLSuVIx6FISChIyKhJSSlCQiJLS2
+   tDw6NDQyNCQiFCQmHBQSDGRiZHRydGxubHx6dGxqbFxeXGRmZFxaXCwuLOzq
+   7KyurHx+fDwmFEQuFCweFCQWDBQODBwaHBweHKSinJSWlOTi5JyepHR2dDw6
+   PBQSFNze3ERGRIyKjIyOjISGhPz29Pzy7MS2rMzOzFRWVHx2dHxybDQiFPz2
+   7Pzu5PTq3PTm1NTCtJyGdHxuZHxqXPzq3PTaxNS6pFxWVFRKRNS2nPTi1PTS
+   tNSulNzOxNSynMymhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAA
+   LAAAAAAWABYAAAf/gACCgwABAgMEBYSLggaOjgcICQoLDA2Pj4MGDg8QEZ4F
+   DxITFBUWFxcYGRobjQ8cHR4fCQ8gCyEiFSMWJCUkJieNEB4dKB4pKissK8wr
+   LS4vMDHBAAYQHx8dFx0fJDIzNDU0M+IyHzaNNyg43Ng5Ojs7Ojw9Pj9AMkCN
+   DiZB/h9CSOx4QLCgihItqBkYgqIDESElitAYWJCgkQcXjjRCgi1Ihw4BB5LA
+   QOLCgyQYHihpUU3DBw5ElpAgAYNixSRJjKjQaECDCRPZPDB5IbIGSQwKLnh4
+   wbInLA4kmJB4oaPiAwVNnER40hRK1BIAaVatUZJEFCkmpmjgCeWDCalFe4q4
+   oFKwSRUrEa5gycLzwq8lUnPQ4PEgSpYcUZ5o2cIlS1O/JHLEDdfjQZMIVrpg
+   weLFy5e+M6WSmBGlxYMYYBRzCaOFi5imHWBIfOEiShLTVjaP6eyFTBmN1TA5
+   OvLDjJksWb58OVMGDRqWjAYdmU79SIvpjqJr104nEAAh/mhDcmVhdGVkIGJ5
+   IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5
+   OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29y
+   LmNvbQA7
+EOD
+
+editdelete22 = TkPhotoImage.new(:data=><<'EOD')
+   R0lGODlhFgAWAIYAAASC/FRSVExKTERCRDw6PDQyNCwuLBweHBwaHAwODAwK
+   DAQCBExOTNze3NTW1MTGxLS2tJyanPz+/Ozu7BQSFCwqLDw+POTi5PTu7MzK
+   xIR+fCQmJPz6/Oze1NTGvPz69Pzy7Pz29LyyrPy+vPyupPTm1BQWFIQCBPwC
+   BMS6rPzSzNTOxPTi1NS+rPTezNzOxPTizOzWxMy2pOzaxMy2nPTaxOzOtMyy
+   nOzSvMyqjPx+fOzGpMSihPTq3OzKrOTCpNzKxNTCtAAAAAAAAAAAAAAAAAAA
+   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAA
+   LAAAAAAWABYAAAf8gACCAQIDBAUGBwgJCgsLgpCRAAwNlZYODxALEY+SkAMN
+   EqKjEw0UD5yegqCjrRMVEqidkgWhraMWF7GptLa3EgEWFRSOnhW+vxgZEBqz
+   kBvItxwdHryRCNGjHyAhHSLOgtgSI60c2yQjJd+eJqEnKK0hJCgnJSngAO0S
+   F+8qEvL0VrBogW+BLX4oVKgIyMIFQU8KfDV4R+8FDBcxZBREthAFiRIsOsyg
+   sVEUh4Un3pGoUcPGjZInK65QicPlxg8oX5RwqNJGjo0hdJwQ6EIkjRM6dvDY
+   CKIHSBc1Ztjw4eOH0oIrsgIJEqSFDBo0cuTgsdSTo7No0xYTZCcQACH+aENy
+   ZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29y
+   IDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cu
+   ZGV2ZWxjb3IuY29tADs=
+EOD
+
+text22 = TkPhotoImage.new(:data=><<'EOD')
+   R0lGODlhFgAWAIQAAPwCBAQCBBwaHAwKDBQSFLy+vLS2tJSWlBQWFKyqrFRS
+   VCwqLDQyNNTS1GxqbFxaXJyanIyOjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+   AAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAWABYAAAVcICCOZGmK
+   QSoMaZsShBsQBdAapHvgaIDUqUPJlRjSbAoT0fRDKgODRbF0PLUYjZO2F2Bs
+   t9evNix+dsvDlGKK5jraudQb7qbX6a2HEJ+ycyF+LRE8ZTI+fX5oGCEAIf5o
+   Q3JlYXRlZCBieSBCTVBUb0dJRiBQcm8gdmVyc2lvbiAyLjUNCqkgRGV2ZWxD
+   b3IgMTk5NywxOTk4LiBBbGwgcmlnaHRzIHJlc2VydmVkLg0KaHR0cDovL3d3
+   dy5kZXZlbGNvci5jb20AOw==
+EOD
+
+##########################################
+
+bmp_dir = File.join(File.dirname(File.expand_path(__FILE__)), 
+                    '../catalog_demo/images')
+
+##########################################
+
+status_var = TkVariable.new
+radio_var  = TkVariable.new
+check_var1 = TkVariable.new
+check_var2 = TkVariable.new
+
+tb = Tk::Iwidgets::Toolbar.new(:helpvariable=>status_var)
+
+##########################################
+
+tb.add(:button, :helpstr=>'Copy It', :image=>editcopy22, 
+       :balloonstr=>'Copy', :command=>proc{puts 'Copy It'})
+
+tb.add(:button, :helpstr=>'Cut It', :image=>editcut22, 
+       :balloonstr=>'Cut', :command=>proc{puts 'Cut It'})
+
+tb.add(:button, :helpstr=>'Paste It', :image=>editpaste22, 
+       :balloonstr=>'Paste', :command=>proc{puts 'Paste It'})
+
+tb.add(:button, :helpstr=>'Delete It', :image=>editdelete22, 
+       :balloonstr=>'Delete', :command=>proc{puts 'Delete It'})
+
+#--------------------------------
+
+tb.add(:frame, :borderwidth=>1, :width=>10, :height=>10)
+
+#--------------------------------
+
+tb.add(:radiobutton, :variable=>radio_var, :value=>'Box', 
+       :bitmap=>"@#{bmp_dir}/box.xbm", 
+       :helpstr=>'Radio Button #1', :balloonstr=>'Radio', 
+       :command=>proc{puts 'Radio Button "Box"'})
+
+tb.add(:radiobutton, :variable=>radio_var, :value=>'Line', 
+       :bitmap=>"@#{bmp_dir}/line.xbm", 
+       :helpstr=>'Radio Button #2', :balloonstr=>'Radio', 
+       :command=>proc{puts 'Radio Button "Line"'})
+
+tb.add(:radiobutton, :variable=>radio_var, :value=>'Oval', 
+       :bitmap=>"@#{bmp_dir}/oval.xbm", 
+       :helpstr=>'Radio Button #3', :balloonstr=>'Radio', 
+       :command=>proc{puts 'Radio Button "Oval"'})
+
+#--------------------------------
+
+tb.add(:frame, :borderwidth=>1, :width=>10, :height=>10)
+
+#--------------------------------
+
+tb.add(:checkbutton, :variable=>check_var1, :onvalue=>'yes', :offvalue=>'no', 
+       :image=>text22, :command=>proc{puts 'Checkbutton 1'})
+
+tb.add(:checkbutton, :variable=>check_var2, :onvalue=>'yes', :offvalue=>'no', 
+       :bitmap=>"@#{bmp_dir}/points.xbm", :command=>proc{puts 'Checkbutton 2'})
+
+tb.pack(:side=>:top, :anchor=>:nw)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb
new file mode 100644
index 0000000000..808c798aec
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/iwidgets/sample/watch.rb
@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+require 'tk'
+require 'tkextlib/iwidgets'
+
+Thread.new{
+  trap('INT') {puts 'catch SIGINT'}
+  sleep 5
+  trap('INT', 'DEFAULT')
+}
+
+Tk::Iwidgets::Watch.new(:state=>:disabled, :showampm=>:no, 
+                        :width=>155, :height=>155){|w|
+  w.pack(:padx=>10, :pady=>10, :fill=>:both, :expand=>true)
+  # TkTimer.new(1000, -1, proc{w.show; Tk.update}).start
+  TkTimer.new(25, -1, proc{w.show; Tk.update}).start
+}
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/Orig_LICENSE.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/Orig_LICENSE.txt
new file mode 100644
index 0000000000..272853870c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/Orig_LICENSE.txt
@@ -0,0 +1,46 @@
+
+  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+  >>>  The following text is the original 'license.term' of tklib    <<<
+  >>>  extension.                                                    <<<
+  >>>  Original Tcl files are not include in this directry, because  <<<
+  >>>  of all of them are rewrited to Ruby files.                    <<<
+  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+This software is copyrighted by Ajuba Solutions and other parties.
+The following terms apply to all files associated with the software unless
+explicitly disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license. 
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/datefield.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/datefield.rb
new file mode 100644
index 0000000000..cfeca0c6de
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/datefield.rb
@@ -0,0 +1,29 @@
+#!/usr/bin/ruby
+
+require 'tk'
+require 'tkextlib/tcllib/datefield'
+require 'parsedate'
+
+Tk.root.title('Datefield example')
+
+
+my_date1 = TkVariable.new
+my_date2 = TkVariable.new
+my_date1.trace('w'){
+  begin
+    t = Time.local(*(ParseDate.parsedate(my_date1.value)))
+    my_date2.value = t.strftime('%A')
+  rescue
+    # ignore error
+  end
+}
+
+df = Tk::Tcllib::Datefield.new(:textvariable=>my_date1)
+Tk.grid(TkLabel.new(:text=>'Enter a date:', :anchor=>:e), df, :sticky=>:ew)
+Tk.grid(TkLabel.new(:text=>'That date ia a:', :anchor=>:e), 
+        TkLabel.new(:textvariable=>my_date2, :relief=>:sunken, :width=>12), 
+        :sticky=>:ew)
+
+df.set_focus
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb
new file mode 100644
index 0000000000..053b0de085
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/plotdemos1.rb
@@ -0,0 +1,158 @@
+#!/usr/bin/ruby
+
+require 'tk'
+require 'tkextlib/tcllib/plotchart'
+
+###############################
+
+c1 = TkCanvas.new(:background=>'white', :width=>400, :height=>200)
+c2 = TkCanvas.new(:background=>'white', :width=>400, :height=>200)
+c3 = TkCanvas.new(:background=>'white', :width=>400, :height=>200)
+Tk.pack(c1,c2,c3, :fill=>:both, :side=>:top)
+
+h = TkToplevel.new(:title=>'h')
+hc1 = TkCanvas.new(h, :background=>'white', :width=>400, :height=>200)
+hc2 = TkCanvas.new(h, :background=>'white', :width=>400, :height=>200)
+Tk.pack(hc1,hc2, :fill=>:both, :side=>:top)
+
+v = TkToplevel.new(:title=>'v')
+vc1 = TkCanvas.new(v, :background=>'white', :width=>400, :height=>200)
+vc2 = TkCanvas.new(v, :background=>'white', :width=>400, :height=>200)
+vc3 = TkCanvas.new(v, :background=>'white', :width=>400, :height=>200)
+Tk.pack(vc1,vc2,vc3, :fill=>:both, :side=>:top)
+
+###############################
+
+s = Tk::Tcllib::Plotchart::XYPlot.new(c1, [0.0, 100.0, 10.0], 
+                                          [0.0, 100.0, 20.0])
+
+
+xd =    5.0
+yd =   20.0
+xold =  0.0
+yold = 50.0
+
+s.dataconfig('series1', :color=>'red')
+
+(0..19).each{|i|
+  xnew = xold + xd
+  ynew = yold + (rand() - 0.5) * yd
+  ynew2 = yold + (rand() - 0.5) * 2.0 * yd
+  s.plot('series1', xnew, ynew)
+  s.plot('series2', xnew, ynew2)
+  xold = xnew
+  yold = ynew
+}
+
+s.xtext "X-coordinate"
+s.ytext "Y-data"
+s.title "Aha!"
+
+c1.wait_visibility
+
+s.save_plot "aha.ps"
+
+###############################
+
+s = Tk::Tcllib::Plotchart::Piechart.new(c2)
+
+s.plot([ ["Long names", 10], ["Short names", 30], 
+         ["Average", 40],    ["Ultra-short names", 5] ])
+
+#
+# Note: title should be shifted up
+#       - distinguish a separate title area
+#
+s.title "Okay - this works"
+
+###############################
+
+s = Tk::Tcllib::Plotchart::PolarPlot.new(c3, [3.0, 1.0])
+
+0.step(359, 10){|angle|
+  rad = 1.0+Math.cos(angle*Math::PI/180.0)
+  s.plot('cardioid', rad, angle)
+}
+
+s.title "Cardioid"
+
+###############################
+
+s = Tk::Tcllib::Plotchart::Barchart.new(hc1, %w(A B C D E), 
+                                        [0.0, 10.0, 2.0], 2)
+
+s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
+s.plot('series2', [0.0, 3.0, 7.0, 9.3, 2.0], 'green')
+s.title "Arbitrary data"
+
+###############################
+
+s = Tk::Tcllib::Plotchart::Barchart.new(hc2, %w(A B C D E), 
+                                        [0.0, 20.0, 5.0], :stacked)
+
+s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
+s.plot('series2', [0.0, 3.0, 7.0, 9.3, 2.0], 'green')
+s.title "Stacked diagram"
+
+###############################
+
+s = Tk::Tcllib::Plotchart::HorizontalBarchart.new(vc1, [0.0, 10.0, 2.0], 
+                                                  %w(A B C D E), 2)
+
+s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
+s.plot('series2', [0.0, 3.0, 7.0, 9.3, 2.0], 'green')
+s.title "Arbitrary data"
+
+###############################
+
+s = Tk::Tcllib::Plotchart::HorizontalBarchart.new(vc2, [0.0, 20.0, 5.0], 
+                                                  %w(A B C D E), :stacked)
+
+s.plot('series1', [1.0, 4.0, 6.0, 1.0, 7.0], 'red')
+s.plot('series2', [0.0, 3.0, 7.0, 9.3, 2.0], 'green')
+s.title "Stacked diagram"
+
+###############################
+
+s = Tk::Tcllib::Plotchart::Timechart.new(vc3, "1 january 2004", 
+                                              "31 december 2004", 4)
+
+s.period("Spring", "1 march 2004", "1 june 2004", 'green')
+s.period("Summer", "1 june 2004", "1 september 2004", 'yellow')
+s.vertline("1 jan", "1 january 2004")
+s.vertline("1 apr", "1 april 2004")
+s.vertline("1 jul", "1 july 2004")
+s.vertline("1 oct", "1 october 2004")
+s.milestone("Longest day", "21 july 2004")
+s.title "Seasons (northern hemisphere)"
+
+###############################
+
+z = TkToplevel.new(:title=>'3D')
+
+zc1 = TkCanvas.new(z, :background=>'white', :width=>400, :height=>300)
+zc2 = TkCanvas.new(z, :background=>'white', :width=>400, :height=>250)
+Tk.pack(zc1,zc2)
+
+s = Tk::Tcllib::Plotchart::Plot3D.new(zc1, 
+                                      [0, 10, 3], [-10, 10, 10], [0, 10, 2.5])
+
+s.title "3D Plot"
+s.plot_function{|x, y|
+  # cowboyhat
+  x1 = x.to_f/9.0
+  y1 = y.to_f/9.0
+  3.0 * (1.0-(x1*x1+y1*y1))*(1.0-(x1*x1+y1*y1))
+}
+
+s = Tk::Tcllib::Plotchart::Plot3D.new(zc2, 
+                                      [0, 10, 3], [-10, 10, 10], [0, 10, 2.5])
+s.title "3D Plot - data "
+s.colour("green", "black")
+s.plot_data([ [1.0, 2.0, 1.0, 0.0], 
+              [1.1, 3.0, 1.1, -0.5], 
+              [3.0, 1.0, 4.0, 5.0] ])
+
+###############################
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb
new file mode 100644
index 0000000000..33a6f29940
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/plotdemos2.rb
@@ -0,0 +1,71 @@
+#!/usr/bin/ruby
+
+require 'tk'
+require 'tkextlib/tcllib/plotchart'
+
+###############################
+
+c1 = TkCanvas.new(:background=>'white', :width=>400, :height=>200)
+c2 = TkCanvas.new(:background=>'white', :width=>400, :height=>200)
+Tk.pack(c1,c2, :fill=>:both, :side=>:top)
+
+###############################
+# Set up a strip chart
+###############################
+slipchart = Tk::Tcllib::Plotchart::Stripchart.new(c1, [0.0, 100.0, 10.0], 
+                                                      [0.0, 100.0, 20.0])
+
+TkTimer.new(500, -1, proc{|obj| # obj --> TkTimer object
+              slipchart, xold, xd, yold, yd = obj.return_value
+              xnew = xold + xd
+              ynew = yold + (rand() - 0.5) * yd
+              ynew2 = yold + (rand() - 0.5) * 2.0 * yd
+              slipchart.plot('series1', xnew, ynew)
+              slipchart.plot('series2', xnew, ynew2)
+              obj.stop if xnew >= 200
+              [slipchart, xnew, xd, ynew, yd] # return_value
+            }).start(100, proc{
+                       # init return_value
+                       [slipchart, 0.0, 15.0, 50.0, 30.0]
+                     })
+
+slipchart.title "Aha!"
+
+###############################
+# Set up an isometric plot
+###############################
+s = Tk::Tcllib::Plotchart::IsometricPlot.new(c2, [0.0, 100.0], [0.0, 200.0], 
+                                             :noaxes)
+
+s.set_zoom_pan
+
+s.plot('rectangle',        [10.0, 10.0, 50.0, 50.0], 'green')
+s.plot('filled-rectangle', [20.0, 20.0, 40.0, 40.0], 'red')
+s.plot('filled-circle',    [70.0, 70.0, 40.0], 'yellow')
+s.plot('circle',           [70.0, 70.0, 42.0])
+
+###############################
+# Check the symbols
+###############################
+h = TkToplevel.new(:title=>'h')
+c = TkCanvas.new(h, :bg=>'white', :width=>400, :height=>200).pack(:fill=>:both)
+
+s = Tk::Tcllib::Plotchart::XYPlot.new(c, [0.0, 100.0, 10.0], 
+                                         [0.0, 100.0, 20.0]) 
+s.dataconfig('series1', :colour=>'red',   :type=>:symbol)
+s.dataconfig('series2', :colour=>'green', :type=>:both)
+
+s.yconfig(:format=>"%12.2e")
+
+x = 5.0
+%w(plus cross circle up down dot upfilled downfilled).each{|sym|
+  s.dataconfig('series1', :symbol=>sym)
+  s.dataconfig('series2', :symbol=>sym)
+  s.plot('series1', x, 50.0)
+  s.plot('series2', x, 20)
+  x += 10
+}
+
+##############################
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb
new file mode 100644
index 0000000000..2b5c7642bb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/plotdemos3.rb
@@ -0,0 +1,83 @@
+#!/usr/bin/ruby
+
+require 'tk'
+require 'tkextlib/tcllib/plotchart'
+
+###############################
+# Set up a strip chart
+###############################
+
+Tk::Tcllib::Plotchart::Stripchart.new([0.0, 100.0, 10.0], 
+                                      [0.0, 100.0, 20.0], 
+                                      :background=>'white', 
+                                      :width=>400, :height=>200){|chart|
+  title "Aha!"
+  pack(:fill=>:both, :side=>:top)
+
+  series1 = Tk::Tcllib::Plotchart::PlotSeries.new(chart)
+  series2 = Tk::Tcllib::Plotchart::PlotSeries.new(chart)
+
+  xd = 15.0
+  yd = 30.0
+
+  TkTimer.new(500, -1, proc{|obj| # obj --> TkTimer object
+                xold, yold = obj.return_value
+                xnew = xold + xd
+                ynew = yold + (rand() - 0.5) * yd
+                ynew2 = yold + (rand() - 0.5) * 2.0 * yd
+
+                series1.plot(xnew, ynew)
+                series2.plot(xnew, ynew2)
+
+                obj.stop if xnew >= 200
+
+                [xnew, ynew] # return_value
+              }).start(100, proc{ [0.0, 50.0] }) # init return_value
+}
+
+###############################
+# Set up an isometric plot
+###############################
+Tk::Tcllib::Plotchart::IsometricPlot.new([0.0, 100.0], [0.0, 200.0], :noaxes, 
+                                         :background=>'white', 
+                                         :width=>400, :height=>200){|chart|
+  pack(:fill=>:both, :side=>:top)
+  set_zoom_pan
+
+  chart.plot('rectangle',        [10.0, 10.0, 50.0, 50.0], 'green')
+  chart.plot('filled-rectangle', [20.0, 20.0, 40.0, 40.0], 'red')
+  chart.plot('filled-circle',    [70.0, 70.0, 40.0], 'yellow')
+  chart.plot('circle',           [70.0, 70.0, 42.0])
+}
+
+###############################
+# Check the symbols
+###############################
+TkToplevel.new(:title=>'h'){|h|
+  Tk::Tcllib::Plotchart::XYPlot.new(h, [0.0, 100.0, 10.0], 
+                                       [0.0, 100.0, 20.0], 
+                                    :bg=>'white', 
+                                    :width=>400, :height=>200){|chart|
+    pack(:fill=>:both)
+
+    yconfig(:format=>"%12.2e")
+
+    series1 = Tk::Tcllib::Plotchart::PlotSeries.new(chart, :colour=>'red', 
+                                                    :type=>:symbol)
+    series2 = Tk::Tcllib::Plotchart::PlotSeries.new(chart, :colour=>'green', 
+                                                    :type=>:both)
+
+    x = 5.0
+    %w(plus cross circle up down dot upfilled downfilled).each{|sym|
+      series1.dataconfig(:symbol=>sym)
+      series2.dataconfig(:symbol=>sym)
+      series1.plot(x, 50.0)
+      series2.plot(x, 20)
+      x += 10
+    }
+  }
+}
+
+##############################
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/xyplot.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/xyplot.rb
new file mode 100644
index 0000000000..8f8c3eb880
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tcllib/xyplot.rb
@@ -0,0 +1,17 @@
+#!/usr/bin/ruby
+
+require 'tk'
+require 'tkextlib/tcllib/plotchart'
+
+TkCanvas.new(:background=>'white', :width=>400, :height=>200){|c|
+  pack(:fill=>:both)
+  Tk::Tcllib::Plotchart::XYPlot.new(c, [0.0, 100.0, 10.0], 
+                                       [0.0, 100.0, 20.0]){
+    [ [0.0, 32.0], [10.0, 50.0], [25.0, 60.0], [78.0, 11.0] ].each{|x, y|
+      plot('series1', x, y)
+    }
+    title("Data series")
+  }
+}
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/Orig_LICENSE.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/Orig_LICENSE.txt
new file mode 100644
index 0000000000..2326ef21fa
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/Orig_LICENSE.txt
@@ -0,0 +1,30 @@
+
+  ######################################################################
+  ###  The following text is the original 'license.terms' of tile    ###
+  ###  extension.                                                    ###
+  ######################################################################
+
+
+LICENSE ("MIT-style")
+
+This software is Copyright (C) 2003 Joe English and other parties.
+
+The following terms apply to all files associated with this software
+unless explicitly disclaimed in individual files.  
+
+The author(s) hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS for a PARTICULAR PURPOSE.  IN NO EVENT
+shall the AUTHORS of THIS SOFTWARE be LIABLE to ANY PARTY for
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, or CONSEQUENTIAL DAMAGES
+arising out of the USE of THIS SOFTWARE and its DOCUMENTATION.
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/demo.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/demo.rb
new file mode 100644
index 0000000000..b604410da4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/demo.rb
@@ -0,0 +1,972 @@
+#!/usr/bin/env ruby
+#
+# Demo for 'tile' package.
+#
+require 'tk'
+
+demodir = File.dirname($0)
+themesdir = File.join(demodir, 'themes')
+Tk::AUTO_PATH.lappend('.', demodir, themesdir)
+
+Dir.foreach(themesdir){|name|
+  next if name == '.' || name == '..'
+  dir = File.join(themesdir, name)
+  Tk::AUTO_PATH.lappend(dir) if File.directory?(dir)
+}
+
+require 'tkextlib/tile'
+
+def version?(ver)
+  TkPackage.vcompare(Tk::Tile.package_version, ver) >= 0
+end
+
+Tk.load_tclscript(File.join(demodir, 'toolbutton.tcl'))
+Tk.load_tclscript(File.join(demodir, 'repeater.tcl'))
+
+# This forces an update of the available packages list. It's required
+# for package names to find the themes in demos/themes/*.tcl
+## Tk.tk_call(TkPackage.unknown_proc, 'Tcl', TkPackage.provide('Tcl'))
+##  --> This doesn't work. 
+##      Because, unknown_proc may be "command + some arguments".
+Tk.ip_eval("#{TkPackage.unknown_proc}  Tcl #{TkPackage.provide('Tcl')}")
+
+TkRoot.new{
+  title 'Tile demo'
+  iconname 'Tile demo'
+}
+
+# The descriptive names of the builtin themes.
+$THEMELIST = [
+  ['default', 'Default'], 
+  ['classic', 'Classic'], 
+  ['alt', 'Revitalized'], 
+  ['winnative', 'Windows native'], 
+  ['xpnative', 'XP Native'], 
+  ['aqua', 'Aqua'], 
+]
+
+$V = TkVariable.new_hash(:THEME      => 'default', 
+                         :COMPOUND   => 'top', 
+                         :CONSOLE    => false, 
+                         :MENURADIO1 => 'One', 
+                         :MENUCHECK1 => true,
+                         :PBMODE     => 'determinate',
+                         :SELECTED   => true,
+                         :CHOICE     => 2)
+
+# Add in any available loadable themes.
+TkPackage.names.find_all{|n| n =~ /^tile::theme::/}.each{|pkg|
+  name = pkg.split('::')[-1]
+  unless $THEMELIST.assoc(name)
+    $THEMELIST << [name, Tk.tk_call('string', 'totitle', name)]
+  end
+}
+
+# Add theme definition written by ruby
+$RUBY_THEMELIST = []
+begin
+  load(File.join(demodir, 'themes', 'kroc.rb'), true)
+rescue
+  $RUBY_THEMELIST << ['kroc-rb', 'Kroc (by Ruby)', false]
+else
+  $RUBY_THEMELIST << ['kroc-rb', 'Kroc (by Ruby)', true]
+end
+
+def makeThemeControl(parent)
+  c = Tk::Tile::Labelframe.new(parent, :text=>'Theme')
+  $THEMELIST.each{|theme, name|
+    b = Tk::Tile::Radiobutton.new(c, :text=>name, :value=>theme, 
+                                  :variable=>$V.ref(:THEME), 
+                                  :command=>proc{setTheme(theme)})
+    b.grid(:sticky=>:ew)
+    unless (TkPackage.names.find{|n| n == "tile::theme::#{theme}"})
+      b.state(:disabled)
+    end
+  }
+  $RUBY_THEMELIST.each{|theme, name, available|
+    b = Tk::Tile::Radiobutton.new(c, :text=>name, :value=>theme, 
+                                  :variable=>$V.ref(:THEME), 
+                                  :command=>proc{setTheme(theme)})
+    b.grid(:sticky=>:ew)
+    b.state(:disabled) unless available
+  }
+  c
+end
+
+def makeThemeMenu(parent)
+  m = TkMenu.new(parent)
+  $THEMELIST.each{|theme, name|
+    m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME), 
+          :value=>theme, :command=>proc{setTheme(theme)})
+    unless (TkPackage.names.find{|n| n == "tile::theme::#{theme}"})
+      m.entryconfigure(:end, :state=>:disabled)
+    end
+  }
+  $RUBY_THEMELIST.each{|theme, name, available|
+    m.add(:radiobutton, :label=>name, :variable=>$V.ref(:THEME), 
+          :value=>theme, :command=>proc{setTheme(theme)})
+    m.entryconfigure(:end, :state=>:disabled) unless available
+  }
+  m
+end
+
+def setTheme(theme)
+  if (TkPackage.names.find{|n| n == "tile::theme::#{theme}"})
+    TkPackage.require("tile::theme::#{theme}")
+  end
+  Tk::Tile::Style.theme_use(theme)
+end
+
+#
+# Load icons...
+#
+$BUTTONS = ['open', 'new', 'save']
+$CHECKBOXES = ['bold', 'italic']
+$ICON = {}
+
+def loadIcons(file)
+  Tk.load_tclscript(file)
+  img_data = TkVarAccess.new('ImgData')
+  img_data.keys.each{|icon|
+    $ICON[icon] = TkPhotoImage.new(:data=>img_data[icon])
+  }
+end
+
+loadIcons(File.join(demodir, 'iconlib.tcl'))
+
+#
+# Utilities:
+#
+def foreachWidget(wins, cmd)
+  wins.each{|w|
+    cmd.call(w)
+    foreachWidget(w.winfo_children, cmd)
+  }
+end
+
+# sbstub
+#	Used as the :command option for a scrollbar,
+#	updates the scrollbar's position.
+#
+def sbstub(sb, cmd, num, units = 'units')
+  num = TkComm.number(num)
+  case cmd.to_s
+  when 'moveto'
+    sb.set(num, num+0.5)
+
+  when 'scroll'
+    if units.to_s == 'pages'
+      delta = 0.2
+    else
+      delta = 0.05
+    end
+    current = sb.get
+    sb.set(current[0] + delta * num, current[1] + delta * num)
+  end
+end    
+
+# ... for debugging:
+TkBindTag::ALL.bind('ButtonPress-3', proc{|w| $W = w}, '%W')
+TkBindTag::ALL.bind('Control-ButtonPress-3', proc{|w| w.set_focus}, '%W')
+
+def showHelp()
+  Tk.messageBox(:message=>'No help yet...')
+end
+
+#
+# See toolbutton.tcl.
+TkOption.add('*Toolbar.relief', :groove)
+TkOption.add('*Toolbar.borderWidth', 2)
+
+TkOption.add('*Toolbar.Button.Pad', 2)
+
+$ROOT = Tk.root
+$BASE = $ROOT
+Tk.destroy(*($ROOT.winfo_children))
+
+$TOOLBARS = []
+
+#
+# Toolbar button standard vs. tile comparison:
+#
+def makeToolbars
+  #
+  # Tile toolbar:
+  #
+  tb = Tk::Tile::Frame.new($BASE, :class=>'Toolbar')
+  $TOOLBARS << tb
+  i = 0
+  $BUTTONS.each{|icon|
+    i += 1
+    Tk::Tile::Button.new(tb, :text=>icon, :image=>$ICON[icon], 
+                         :compound=>$V[:COMPOUND], 
+                         :style=>:Toolbutton).grid(:row=>0, :column=>i, 
+                                                   :sticky=>:news)
+  }
+  $CHECKBOXES.each{|icon|
+    i += 1
+    Tk::Tile::Checkbutton.new(tb, :text=>icon, :image=>$ICON[icon], 
+                              :variable=>$V.ref(icon), 
+                              :compound=>$V[:COMPOUND], 
+                              :style=>:Toolbutton).grid(:row=>0, :column=>i, 
+                                                        :sticky=>:news)
+  }
+
+  mb = Tk::Tile::Menubutton.new(tb, :text=>'toolbar', :image=>$ICON['file'], 
+                                :compound=>$V[:COMPOUND])
+  mb.configure(:menu=>makeCompoundMenu(mb))
+  i += 1
+  mb.grid(:row=>0, :column=>i, :sticky=>:news)
+
+  i += 1
+  tb.grid_columnconfigure(i, :weight=>1)
+
+  #
+  # Standard toolbar:
+  #
+  tb = TkFrame.new($BASE, :class=>'Toolbar')
+  $TOOLBARS << tb
+  i = 0
+  $BUTTONS.each{|icon|
+    i += 1
+    TkButton.new(tb, :text=>icon, :image=>$ICON[icon], 
+                 :compound=>$V[:COMPOUND], :relief=>:flat, 
+                 :overrelief=>:raised).grid(:row=>0, :column=>i, 
+                                            :sticky=>:news)
+  }
+  $CHECKBOXES.each{|icon|
+    i += 1
+    TkCheckbutton.new(tb, :text=>icon, :image=>$ICON[icon], 
+                      :variable=>$V.ref(icon), :compound=>$V[:COMPOUND], 
+                      :indicatoron=>false, :selectcolor=>'', :relief=>:flat, 
+                      :overrelief=>:raised).grid(:row=>0, :column=>i, 
+                                                 :sticky=>:news)
+  }
+
+  mb = TkMenubutton.new(tb, :text=>'toolbar', :image=>$ICON['file'], 
+                        :compound=>$V[:COMPOUND])
+  mb.configure(:menu=>makeCompoundMenu(mb))
+  i += 1
+  mb.grid(:row=>0, :column=>i, :sticky=>:news)
+
+  i += 1
+  tb.grid_columnconfigure(i, :weight=>1)
+end
+
+#
+# Toolbar :compound control:
+#
+def makeCompoundMenu(mb)
+  menu = TkMenu.new(mb)
+  %w(text image none top bottom left right center).each{|str|
+    menu.add(:radiobutton, :label=>Tk.tk_call('string', 'totitle', str), 
+             :variable=>$V.ref(:COMPOUND), :value=>str, 
+             :command=>proc{ changeToolbars() })
+  }
+  menu
+end
+
+makeToolbars()
+
+## CONTROLS
+control = Tk::Tile::Frame.new($BASE)
+
+#
+# Overall theme control:
+#
+makeThemeControl(control).grid(:sticky=>:news, :padx=>6, :ipadx=>6)
+control.grid_rowconfigure(99, :weight=>1)
+
+def changeToolbars
+  foreachWidget($TOOLBARS, 
+                proc{|w|
+                  begin
+                    w.compound($V[:COMPOUND])
+                  rescue
+                  end
+                })
+end
+
+def scrolledWidget(parent, klass, themed, *args)
+  if themed
+    f = Tk::Tile::Frame.new(parent)
+    t = klass.new(f, *args)
+    vs = Tk::Tile::Scrollbar.new(f)
+    hs = Tk::Tile::Scrollbar.new(f)
+  else
+    f = TkFrame.new(parent)
+    t = klass.new(f, *args)
+    vs = TkScrollbar.new(f)
+    hs = TkScrollbar.new(f)
+  end
+  t.yscrollbar(vs)
+  t.xscrollbar(hs)
+
+  TkGrid.configure(t, vs, :sticky=>:news)
+  TkGrid.configure(hs, 'x', :sticky=>:news)
+  TkGrid.rowconfigure(f, 0, :weight=>1)
+  TkGrid.columnconfigure(f, 0, :weight=>1)
+
+  [f, t]
+end
+
+#
+# Notebook demonstration:
+#
+def makeNotebook
+  nb = Tk::Tile::Notebook.new($BASE, :padding=>6)
+  nb.enable_traversal
+  client = Tk::Tile::Frame.new(nb)
+  nb.add(client, :text=>'Demo', :underline=>0)
+  nb.select(client)
+
+  scales = Tk::Tile::Frame.new(nb)
+  nb.add(scales, :text=>'Scales')
+  combo = Tk::Tile::Frame.new(nb)
+  nb.add(combo, :text=>'Combobox', :underline=>7)
+  tree = Tk::Tile::Frame.new(nb)
+  nb.add(tree, :text=>'Tree')
+  others = Tk::Tile::Frame.new(nb)
+  nb.add(others, :text=>'Others', :underline=>4)
+
+  [nb, client, scales, combo, tree, others]
+end
+
+nb, client, scales, combo, tree, others = makeNotebook()
+
+#
+# Side-by side check, radio, and menu button comparison:
+#
+def fillMenu(menu)
+  %w(above below left right flush).each{|dir|
+    menu.add(:command, :label=>Tk.tk_call('string', 'totitle', dir), 
+             :command=>proc{ menu.winfo_parent.direction(dir) })
+  }
+  menu.add(:cascade, :label=>'Submenu', :menu=>(submenu = TkMenu.new(menu)))
+  submenu.add(:command, :label=>'Subcommand 1')
+  submenu.add(:command, :label=>'Subcommand 2')
+  submenu.add(:command, :label=>'Subcommand 3')
+
+  menu.add(:separator)
+  menu.add(:command, :label=>'Quit', :command=>proc{Tk.root.destroy})
+end
+
+l = Tk::Tile::Labelframe.new(client, :text=>'Themed', :padding=>6)
+r = TkLabelframe.new(client, :text=>'Standard', :padx=>6, :pady=>6)
+
+## Styled frame
+cb = Tk::Tile::Checkbutton.new(l, :text=>'Checkbutton', 
+                               :variable=>$V.ref(:SELECTED), :underline=>2)
+rb1 = Tk::Tile::Radiobutton.new(l, :text=>'One', :variable=>$V.ref(:CHOICE), 
+                                :value=>1, :underline=>0)
+rb2 = Tk::Tile::Radiobutton.new(l, :text=>'Two', :variable=>$V.ref(:CHOICE), 
+                                :value=>2)
+rb3 = Tk::Tile::Radiobutton.new(l, :text=>'Three', 
+                                :variable=>$V.ref(:CHOICE), 
+                                :value=>3, :underline=>0)
+btn = Tk::Tile::Button.new(l, :text=>'Button', :underline=>0)
+
+mb = Tk::Tile::Menubutton.new(l, :text=>'Menubutton', :underline=>2)
+m = TkMenu.new(mb)
+mb.menu(m)
+fillMenu(m)
+
+$entryText = TkVariable.new('Entry widget')
+e = Tk::Tile::Entry.new(l, :textvariable=>$entryText)
+e.selection_range(6, :end)
+
+ltext_f, ltext = scrolledWidget(l, TkText, true, 
+                                :width=>12, :height=>5, :wrap=>:none)
+# NOTE TO MAINTAINERS: 
+# The checkbuttons are -sticky ew / -expand x  on purpose:
+# it demonstrates one of the differences between TCheckbuttons
+# and standard checkbuttons.
+#
+Tk.grid(cb, :sticky=>:ew)
+Tk.grid(rb1, :sticky=>:ew)
+Tk.grid(rb2, :sticky=>:ew)
+Tk.grid(rb3, :sticky=>:ew)
+Tk.grid(btn, :sticky=>:ew, :padx=>2, :pady=>2)
+Tk.grid(mb, :sticky=>:ew, :padx=>2, :pady=>2)
+Tk.grid(e, :sticky=>:ew, :padx=>2, :pady=>2)
+Tk.grid(ltext_f, :sticky=>:news)
+
+TkGrid.columnconfigure(l, 0, :weight=>1)
+TkGrid.rowconfigure(l, 7, :weight=>1) # text widget (grid is a PITA)
+
+## Orig frame
+cb = TkCheckbutton.new(r, :text=>'Checkbutton', :variable=>$V.ref(:SELECTED))
+rb1 = TkRadiobutton.new(r, :text=>'One', 
+                        :variable=>$V.ref(:CHOICE), :value=>1)
+rb2 = TkRadiobutton.new(r, :text=>'Two', :variable=>$V.ref(:CHOICE), 
+                        :value=>2, :underline=>1)
+rb3 = TkRadiobutton.new(r, :text=>'Three', 
+                        :variable=>$V.ref(:CHOICE), :value=>3)
+btn = TkButton.new(r, :text=>'Button')
+
+mb = TkMenubutton.new(r, :text=>'Menubutton', :underline=>3, :takefocus=>true)
+m = TkMenu.new(mb)
+mb.menu(m)
+$V[:rmbIndicatoron] = mb.indicatoron
+m.add(:checkbutton, :label=>'Indicator?', #'
+      :variable=>$V.ref(:rmbIndicatoron), 
+      :command=>proc{mb.indicatoron($V[:rmbIndicatoron])})
+m.add(:separator)
+fillMenu(m)
+
+e = TkEntry.new(r, :textvariable=>$entryText)
+
+rtext_f, rtext = scrolledWidget(r, TkText, false, 
+                                :width=>12, :height=>5, :wrap=>:none)
+
+Tk.grid(cb, :sticky=>:ew)
+Tk.grid(rb1, :sticky=>:ew)
+Tk.grid(rb2, :sticky=>:ew)
+Tk.grid(rb3, :sticky=>:ew)
+Tk.grid(btn, :sticky=>:ew, :padx=>2, :pady=>2)
+Tk.grid(mb, :sticky=>:ew, :padx=>2, :pady=>2)
+Tk.grid(e, :sticky=>:ew, :padx=>2, :pady=>2)
+Tk.grid(rtext_f, :sticky=>:news)
+
+TkGrid.columnconfigure(l, 0, :weight=>1)
+TkGrid.rowconfigure(l, 7, :weight=>1) # text widget (grid is a PITA)
+
+Tk.grid(l, r, :sticky=>:news, :padx=>6, :pady=>6)
+TkGrid.rowconfigure(client, 0, :weight=>1)
+TkGrid.columnconfigure(client, [0, 1], :weight=>1)
+
+#
+# Add some text to the text boxes:
+#
+msgs = [
+"The cat crept into the crypt, crapped and crept out again", 
+"Peter Piper picked a peck of pickled peppers", 
+"How much wood would a woodchuck chuck if a woodchuck could chuck wood", 
+"He thrusts his fists against the posts and still insists he sees the ghosts",
+"Who put the bomb in the bom-b-bom-b-bom,",
+"Is this your sister's sixth zither, sir?",
+"Who put the ram in the ramalamadingdong?",
+"I am not the pheasant plucker, I'm the pheasant plucker's mate."
+]
+
+nmsgs = msgs.size
+(0...50).each{|n|
+  msg = msgs[n % nmsgs]
+  ltext.insert(:end, "#{n}: #{msg}\n")
+  rtext.insert(:end, "#{n}: #{msg}\n")
+}
+#
+# Scales and sliders pane:
+#
+l = Tk::Tile::Labelframe.new(scales, :text=>'Themed', :padding=>6)
+r = TkLabelframe.new(scales, :text=>'Standard', :padx=>6, :pady=>6)
+
+if version?('0.6')
+
+  # thremed frame
+  scale = Tk::Tile::Scale.new(l, :orient=>:horizontal, :from=>0, :to=>100,
+          :variable=>$V.ref(:SCALE))
+  vscale = Tk::Tile::Scale.new(l, :orient=>:vertical, :from=>0, :to=>100,
+          :variable=>$V.ref(:VSCALE))
+  progress = Tk::Tile::Progressbar.new(l, :orient=>:horizontal, :maximum=>100)
+  vprogress = Tk::Tile::Progressbar.new(l, :orient=>:vertical, :maximum=>100)
+
+  if true
+    def progress.inverted(w, value)
+      if w.mode == 'indeterminate'
+        w.value(value)
+      else
+        w.value(w.maximum - value)
+      end
+    end
+    scale.command {|value| progress.value(value)}
+    vscale.command {|value| progress.inverted(vprogress, value) }
+  else
+    # This would also work, but the Tk scale widgets 
+    # in the right hand pane cause some interference when 
+    # in autoincrement/indeterminate mode.
+    #
+    progress.variable $V.ref(:SCALE)
+    vprogress.variable $V.ref(:VSCALE)
+  end
+
+  scale.set(50)
+  vscale.set(50)
+
+  lmode = Tk::Tile::Label.new(l, :text=>'Progress bar mode')
+  pbmode0 = Tk::Tile::Radiobutton.new(l, :variable=>$V.ref(:PBMODE),
+          :text=>'determinate', :value=>'determinate',
+          :command=>proc{pbMode(progress, vprogress)})
+  pbmode1 = Tk::Tile::Radiobutton.new(l, :variable=>$V.ref(:PBMODE),
+          :text=>'indeterminate', :value=>'indeterminate',
+          :command=>proc{pbMode(progress, vprogress)})
+  def pbMode(progress, vprogress)
+    if vprogress.mode != $V[:PBMODE]
+      vprogress.value(vprogress.maximum - vprogress.value)
+    end
+
+    progress.mode $V[:PBMODE]
+    vprogress.mode $V[:PBMODE]
+  end
+
+  start = Tk::Tile::Button.new(l, :text=>"Start",
+          :command=>proc{pbStart(progress, vprogress)})
+  def pbStart(progress, vprogress)
+    # $V[:PBMODE] = 'indeterminate'
+    pbMode(progress, vprogress)
+    progress.start 10
+    vprogress.start
+  end
+
+  stop = Tk::Tile::Button.new(l, :text=>'Stop',
+          :command=>proc{pbStop(progress, vprogress)})
+  def pbStop(progress, vprogress)
+    progress.stop
+    vprogress.stop
+  end
+
+  Tk.grid(scale, :columnspan=>2, :sticky=>'ew')
+  Tk.grid(progress, :columnspan=>2, :sticky=>'ew')
+  Tk.grid(vscale, vprogress, :sticky=>'nws')
+
+  Tk.grid(lmode, :sticky=>'we', :columnspan=>2)
+  Tk.grid(pbmode0, :sticky=>'we', :columnspan=>2)
+  Tk.grid(pbmode1, :sticky=>'we', :columnspan=>2)
+  Tk.grid(start, :sticky=>'we', :columnspan=>2)
+  Tk.grid(stop, :sticky=>'we', :columnspan=>2)
+
+  l.grid_columnconfigure(0, :weight=>1)
+  l.grid_columnconfigure(1, :weight=>1)
+  l.grid_rowconfigure(99, :weight=>1)
+
+  # standard frame
+  TkScale.new(r, :orient=>:horizontal, :from=>0, :to=>100,
+          :variable=>$V.ref(:SCALE)).grid(:sticky=>'news')
+  TkScale.new(r, :orient=>:vertical, :from=>0, :to=>100,
+          :variable=>$V.ref(:VSCALE)).grid(:sticky=>'nws')
+
+  r.grid_columnconfigure(0, :weight=>1)
+  r.grid_columnconfigure(1, :weight=>1)
+  r.grid_rowconfigure(99, :weight=>1)
+
+else # tile 0.5 or earlier
+
+  # themed frame
+  scale = Tk::Tile::Scale.new(l, :variable=>$V.ref(:SCALE),
+          :orient=>:horizontal, :from=>0, :to=>100)
+  vscale = Tk::Tile::Scale.new(l, :variable=>$V.ref(:VSCALE),
+          :orient=>:vertical, :from=>-25, :to=>25)
+
+  progress = Tk::Tile::Progress.new(l,
+          :orient=>:horizontal, :from=>0, :to=>100)
+  vprogress = Tk::Tile::Progress.new(l,
+          :orient=>:vertical, :from=>-25, :to=>25)
+
+  if true
+    scale.command{|value| progress.set(value)}
+    vscale.command{|value| vprogress.set(value)}
+  else # this would also work. (via TkVariable#trace)
+    v1 = scale.variable
+    v2 = vscale.variable
+    v1.trace('w', proc{ progress.set(v1.value) })
+    v2.trace('w', proc{ vprogress.set(v2.value) })
+  end
+
+  Tk.grid(scale, :columnspan=>2, :sticky=>:ew)
+  Tk.grid(progress, :columnspan=>2, :sticky=>:ew)
+  Tk.grid(vscale, vprogress, :sticky=>:nws)
+  TkGrid.columnconfigure(l, 0, :weight=>1)
+  TkGrid.columnconfigure(l, 1, :weight=>1)
+
+  # standard frame
+  TkScale.new(r, :variable=>$V.ref(:SCALE),
+          :orient=>:horizontal, :from=>0, :to=>100).grid(:sticky=>'news')
+  TkScale.new(r, :variable=>$V.ref(:VSCALE),
+          :orient=>:vertical, :from=>-25, :to=>25).grid(:sticky=>'nws')
+
+  TkGrid.columnconfigure(r, 0, :weight=>1)
+  TkGrid.columnconfigure(r, 1, :weight=>1)
+end
+
+# layout frames
+Tk.grid(l, r, :sticky=>'nwes', :padx=>6, :pady=>6)
+scales.grid_columnconfigure(0, :weight=>1)
+scales.grid_columnconfigure(1, :weight=>1)
+scales.grid_rowconfigure(0, :weight=>1)
+
+#
+# Command box:
+#
+cmd = Tk::Tile::Frame.new($BASE)
+b_close = Tk::Tile::Button.new(cmd, :text=>'Close', 
+                               :underline=>0, :default=>:normal, 
+                               :command=>proc{Tk.root.destroy})
+b_help = Tk::Tile::Button.new(cmd, :text=>'Help', :underline=>0, 
+                              :default=>:normal, :command=>proc{showHelp()})
+Tk.grid('x', b_close, b_help, :pady=>[6, 4], :padx=>4)
+TkGrid.columnconfigure(cmd, 0, :weight=>1)
+
+#
+# Set up accelerators:
+#
+$ROOT.bind('KeyPress-Escape', proc{Tk.event_generate(b_close, '<Invoke>')})
+$ROOT.bind('<Help>', proc{Tk.event_generate(b_help, '<Invoke>')})
+Tk::Tile::KeyNav.enableMnemonics($ROOT)
+Tk::Tile::KeyNav.defaultButton(b_help)
+
+Tk.grid($TOOLBARS[0], '-', :sticky=>:ew)
+Tk.grid($TOOLBARS[1], '-', :sticky=>:ew)
+Tk.grid(control,      nb,  :sticky=>:news)
+Tk.grid(cmd,          '-', :sticky=>:ew)
+TkGrid.columnconfigure($ROOT, 1, :weight=>1)
+TkGrid.rowconfigure($ROOT, 2, :weight=>1)
+
+#
+# Add a menu
+#
+menu = TkMenu.new($BASE)
+$ROOT.menu(menu)
+m_file = TkMenu.new(menu, :tearoff=>0)
+menu.add(:cascade, :label=>'File', :underline=>0, :menu=>m_file)
+m_file.add(:command, :label=>'Open', :underline=>0, 
+           :compound=>:left, :image=>$ICON['open'])
+m_file.add(:command, :label=>'Save', :underline=>0, 
+           :compound=>:left, :image=>$ICON['save'])
+m_file.add(:separator)
+m_f_test = TkMenu.new(menu, :tearoff=>0)
+m_file.add(:cascade, :label=>'Test submenu', :underline=>0, :menu=>m_f_test)
+m_file.add(:checkbutton, :label=>'Text check', :underline=>5, 
+           :variable=>$V.ref(:MENUCHECK1))
+m_file.insert(:end, :separator)
+
+if Tk.windowingsystem != 'x11'
+  TkConsole.create
+  m_file.insert(:end, :checkbutton, :label=>'Console', :underline=>5, 
+                :variable=>$V.ref(:CONSOLE), :command=>proc{toggle_console()})
+  def toggle_console
+    if TkComm.bool($V[:CONSOLE])
+      TkConsole.show
+    else
+      TkConsole.hide
+    end
+  end
+end
+
+m_file.add(:command, :label=>'Exit', :underline=>1, 
+           :command=>proc{Tk.event_generate(b_close, '<Invoke>')})
+
+%w(One Two Three Four).each{|lbl|
+  m_f_test.add(:radiobutton, :label=>lbl, :variable=>$V.ref(:MENURADIO1))
+}
+
+# Add Theme menu.
+#
+menu.add(:cascade, :label=>'Theme', :underline=>3, 
+         :menu=>makeThemeMenu(menu))
+
+setTheme($V[:THEME])
+
+#
+# Combobox demo pane:
+#
+values = %w(list abc def ghi jkl mno pqr stu vwx yz)
+2.times {|i|
+  cb = Tk::Tile::Combobox.new(
+    combo, :values=>values, :textvariable=>$V.ref(:COMBO))
+  cb.pack(:side=>:top, :padx=>2, :pady=>2, :expand=>false, :fill=>:x)
+  if i == 1
+    cb.state :readonly
+    begin
+      cb.current = 3 # ignore if unsupported (tile0.4)
+    rescue
+    end
+  end
+}
+
+#
+# Treeview widget demo pane:
+#
+if version?('0.5')
+
+  treeview = nil # avoid 'undefined' error
+  scrollbar = Tk::Tile::Scrollbar.new(tree,
+      :command=>proc{|*args| treeview.yview(*args)})
+  treeview = Tk::Tile::Treeview.new(tree, :columns=>%w(Class), :padding=>4,
+      :yscrollcommand=>proc{|*args| scrollbar.set(*args)})
+
+  Tk.grid(treeview, scrollbar, :sticky=>'news')
+  tree.grid_columnconfigure(0, :weight=>1)
+  tree.grid_rowconfigure(0, :weight=>1)
+  tree.grid_propagate(0)
+
+  # Add initial tree node: 
+  # Later nodes will be added in <<TreeviewOpen>> binding.
+  treeview.insert('', 0, :id=>'.', :text=>'Main Window', :open=>false,
+      :values=>[TkWinfo.classname('.')])
+  treeview.headingconfigure('#0', :text=>'Widget')
+  treeview.headingconfigure('Class', :text=>'Class')
+  treeview.bind('<TreeviewOpen>', proc{fillTree(treeview)})
+
+  def fillTree(treeview)
+    id = treeview.focus_item
+    unless TkWinfo.exist?(id)
+      treeview.delete(id)
+    end
+    # Replace tree item children with current list of child windows.
+    treeview.delete(treeview.children(id))
+    for child in TkWinfo.children(id)
+      treeview.insert(id, :end, :id=>child, :text=>TkWinfo.appname(child),
+          :open=>false, :values=>[TkWinfo.classname(child)])
+      unless TkWinfo.children(child).empty?
+        # insert dummy child to show [+] indicator
+        treeview.insert(child, :end)
+      end
+    end
+  end
+
+else
+  Tk::Tile::Label.new(tree,
+      :text=>'Treeview is supported on tile 0.5 or later...').pack
+end
+
+#
+# Other demos:
+#
+$Timers = {:StateMonitor=>nil, :FocusMonitor=>nil}
+
+begin
+  msg = Tk::Tile::Label.new(others, :justify=>:left, :wraplength=>300)
+rescue
+  msg = TkMessage.new(others, :aspect=>200)
+end
+
+$Desc = {}
+
+showDescription = TkBindTag.new
+showDescription.bind('Enter', proc{|w| msg.text($Desc[w.path])}, '%W')
+showDescription.bind('Leave', proc{|w| msg.text('')}, '%W')
+
+[
+  [ :trackStates, "Widget states...",  
+    "Display/modify widget state bits" ], 
+
+  [ :scrollbarResizeDemo,  "Scrollbar resize behavior...", 
+    "Shows how Tile and standard scrollbars differ when they're sized too large" ], 
+
+  [ :trackFocus, "Track keyboard focus..." , 
+    "Display the name of the widget that currently has focus" ],
+
+  [ :repeatDemo, "Repeating buttons...",
+    "Demonstrates custom classes (see demos/repeater.tcl)" ]
+
+].each{|demo_cmd, label, description|
+  b = Tk::Tile::Button.new(others, :text=>label, 
+                           :command=>proc{ self.__send__(demo_cmd) })
+  $Desc[b.path] = description
+  b.bindtags <<= showDescription
+
+  b.pack(:side=>:top, :expand=>false, :fill=>:x, :padx=>6, :pady=>6)
+}
+
+msg.pack(:side=>:bottom, :expand=>true, :fill=>:both)
+
+
+#
+# Scrollbar resize demo:
+#
+$scrollbars = nil
+
+def scrollbarResizeDemo
+  if $scrollbars
+    begin
+      $scrollbars.destroy
+    rescue
+    end
+  end
+  $scrollbars = TkToplevel.new(:title=>'Scrollbars', :geometry=>'200x200')
+  f = TkFrame.new($scrollbars, :height=>200)
+  tsb = Tk::Tile::Scrollbar.new(f, :command=>proc{|*args| sbstub(tsb, *args)})
+  sb = TkScrollbar.new(f, :command=>proc{|*args| sbstub(sb, *args)})
+  Tk.grid(tsb, sb, :sticky=>:news)
+
+  sb.set(0, 0.5)  # prevent backwards-compatibility mode for old SB
+
+  f.grid_columnconfigure(0, :weight=>1)
+  f.grid_columnconfigure(1, :weight=>1)
+  f.grid_rowconfigure(0, :weight=>1)
+
+  f.pack(:expand=>true, :fill=>:both)
+end
+
+#
+# Track focus demo:
+#
+$FocusInf = TkVariable.new_hash
+$focus = nil
+
+def trackFocus
+  if $focus
+    begin
+      $focus.destroy
+    rescue
+    end
+  end
+  $focus = TkToplevel.new(:title=>'Keyboard focus')
+  i = 0
+  [
+    ["Focus widget:", :Widget], 
+    ["Class:", :WidgetClass], 
+    ["Next:", :WidgetNext], 
+    ["Grab:", :Grab], 
+    ["Status:", :GrabStatus]
+  ].each{|label, var_index|
+    Tk.grid(Tk::Tile::Label.new($focus, :text=>label, :anchor=>:e), 
+            Tk::Tile::Label.new($focus, 
+                                :textvariable=>$FocusInf.ref(var_index), 
+                                :width=>40, :anchor=>:w, :relief=>:groove), 
+            :sticky=>:ew)
+    i += 1
+  }
+  $focus.grid_columnconfigure(1, :weight=>1)
+  $focus.grid_rowconfigure(i, :weight=>1)
+
+  $focus.bind('Destroy', proc{Tk.after_cancel($Timers[:FocusMonitor])})
+  focusMonitor
+end
+
+def focusMonitor
+  $FocusInf[:Widget] = focus_win = Tk.focus
+  if focus_win
+    $FocusInf[:WidgetClass] = focus_win.winfo_classname
+    $FocusInf[:WidgetNext] = Tk.focus_next(focus_win)
+  else
+    $FocusInf[:WidgetClass] = $FocusInf[:WidgetNext] = ''
+  end
+
+  $FocusInf[:Grab] = grab_wins = Tk.current_grabs
+  unless grab_wins.empty?
+    $FocusInf[:GrabStatus] = grab_wins[0].grab_status
+  else  
+    $FocusInf[:GrabStatus] = ''
+  end
+
+  $Timers[:FocusMonitor] = Tk.after(200, proc{ focusMonitor() })
+end
+
+#
+# Widget state demo:
+#
+$Widget = TkVariable.new
+
+TkBindTag::ALL.bind('Control-Shift-ButtonPress-1', 
+                    proc{|w|
+                      $Widget.value = w
+                      updateStates()
+                      Tk.callback_break
+                    }, '%W')
+$states_list = %w(active disabled focus pressed selected 
+                  background indeterminate invalid default)
+$states_btns = {}
+$states = nil
+
+$State = TkVariable.new_hash
+
+def trackStates
+  if $states
+    begin
+      $state.destroy
+    rescue
+    end
+  end
+  $states = TkToplevel.new(:title=>'Widget states')
+
+  l_inf = Tk::Tile::Label.new($states, :text=>"Press Control-Shift-Button-1 on any widget")
+
+  l_lw = Tk::Tile::Label.new($states, :text=>'Widget:', 
+                             :anchor=>:e, :relief=>:groove)
+  l_w = Tk::Tile::Label.new($states, :textvariable=>$Widget, 
+                             :anchor=>:w, :relief=>:groove)
+
+  Tk.grid(l_inf, '-', :sticky=>:ew, :padx=>6, :pady=>6)
+  Tk.grid(l_lw, l_w, :sticky=>:ew)
+
+  $states_list.each{|st|
+    cb = Tk::Tile::Checkbutton.new($states, :text=>st, 
+                                   :variable=>$State.ref(st), 
+                                   :command=>proc{ changeState(st) })
+    $states_btns[st] = cb
+    Tk.grid('x', cb, :sticky=>:nsew)
+  }
+
+  $states.grid_columnconfigure(1, :weight=>1)
+
+  f_cmd = Tk::Tile::Frame.new($states)
+  Tk.grid('x', f_cmd, :sticky=>:nse)
+
+  b_close = Tk::Tile::Button.new(f_cmd, :text=>'Close', 
+                                 :command=>proc{ $states.destroy })
+  Tk.grid('x', b_close, :padx=>4, :pady=>[6,4])
+  f_cmd.grid_columnconfigure(0, :weight=>1)
+
+  $states.bind('KeyPress-Escape', proc{Tk.event_generate(b_close, '<Invoke>')})
+
+  $states.bind('Destroy', proc{Tk.after_cancel($Timers[:StateMonitor])})
+  stateMonitor()
+end
+
+def stateMonitor
+  updateStates() if $Widget.value != ''
+  $Timers[:StateMonitor] = Tk.after(200, proc{ stateMonitor() })
+end
+
+def updateStates
+  $states_list.each{|st|
+    begin
+      $State[st] = $Widget.window.instate(st)
+    rescue
+      $states_btns[st].state('disabled')
+    else
+      $states_btns[st].state('!disabled')
+    end
+  }
+end
+
+def changeState(st)
+  if $Widget.value != ''
+    if $State.bool_element(st)
+      $Widget.window.state(st)
+    else
+      $Widget.window.state("!#{st}")
+    end
+  end
+end
+
+#
+# Repeating buttons demo:
+#
+def repeatDemo
+  if defined?($repeatDemo) && $repeatDemo.exist?
+    $repeatDemo.deiconify; return
+  end
+  $repeatDemo = TkToplevel.new(:title=>'Repeating button')
+
+  f = Tk::Tile::Frame.new($repeatDemo)
+  b = Tk::Tile::Button.new(f, :class=>'Repeater', :text=>'Press and hold')
+  if version?('0.6')
+    p = Tk::Tile::Progressbar.new(f, :orient=>:horizontal, :maximum=>10)
+  else # progressbar is not supported
+    p = Tk::Tile::Progress.new(f, :orient=>:horizontal, :from=>0, :to=>10)
+    def p.step
+      i = self.get + 1
+      i = self.from if i > self.to
+      self.set(i)
+    end
+  end
+  b.command {p.step}
+
+  b.pack(:side=>:left, :expand=>false, :fill=>:none, :padx=>6, :pady=>6)
+  p.pack(:side=>:right, :expand=>true, :fill=>:x, :padx=>6, :pady=>6)
+  f.pack(:expand=>true, :fill=>:both)
+end
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/iconlib.tcl b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/iconlib.tcl
new file mode 100644
index 0000000000..9a93ece504
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/iconlib.tcl
@@ -0,0 +1,110 @@
+array set ImgData {
+bold {R0lGODlhEAAQAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAAQABAAAAI6hI+py60U3wj+
+RYQFJYRvEWFBCeFbRFhQQvhG8YPgX0RYUEL4FhEWlBC+RYQFJYQPFN8IPqYut/8hBQA7}
+copy {R0lGODlhEAAQAJEAANnZ2QAAAP///wAAhCH5BAEAAAAALAAAAAAQABAAAAJUhI8JFJ/gY4iI
+UEL4FyIiFIXgW0iEUDgfACBI9pzMAAGRiIghWSMDECR7JEKGtkFIRFBG+TIQKDQxtgzcDcmX
+IfgwQrFlCD4MyZch+EDzj+Bj6mYBADs=}
+cut {R0lGODlhEAAQAJEAANnZ2QAAAAAAhP///yH5BAEAAAAALAAAAAAQABAAAAJFhI+pcUHwEeIi
+E0gACIKPEAFBIXy0gMg8EhM+YmQiKSL4eAIiJMI/EQEhQGYGYiQIQAg+iAkIATIzECMBIgT/
+RBARERlSADs=}
+dragfile {R0lGODlhGAAYAKIAANnZ2TMzM////wAAAJmZmf///////////yH5BAEAAAAALAAAAAAYABgA
+AAPACBi63IqgC4GiyxwogaAbKLrMgSKBoBoousyBogEACIGiyxwoKgGAECI4uiyCExMTOACB
+osuNpDoAGCI4uiyCIkREOACBosutSDoAgSI4usyCIjQAGCi63Iw0ACEoOLrMgiI0ABgoutyM
+NAAhKDi6zIIiNAAYKLrcjDQAISg4usyCIjQAGCi63Iw0AIGiiqPLIyhCA4CBosvNSAMQKKo4
+ujyCIjQAGCi63Iw0AIGiy81IAxCBpMu9GAMAgKPL3QgJADs=}
+dragicon {R0lGODlhGAAYALMAANnZ2TMzM/////8zM8zMzGYAAAAAAJmZmQCZMwAzZgCZzGZmZv//////
+/////////yH5BAEAAAAALAAAAAAYABgAAAT/EMAgJ60SAjlBgEJOSoMIEMgZoJCT0iADBFIG
+KOSkNMwAAABhwiHnIEKIIIQQAQIZhBBwyDmKEMIEE0yABoAghIBDzlGEENDIaQAIQgg45BwF
+CinPOccAECYcUiKEEBFCiHPgMQAEIcQYYyABBUGIQCHlMQCEScZAAhKEEApCECGOARAEIQQp
+BRGIpAyCJCGOASBAISdEcqJAVBLiGABggELOAJGUKyiVhDgGABigkJMEhNAKSqkEhTgGgCCl
+FCQEGIJSSiUhjgEgQCEnJVBJmYQ4BoAAhZyTQCVnEuIYAAIUckoCk5xSiGMACFDISSs9BoBg
+rRXQMQAEKOSklR4DEUAI8MhJ6wwGAACgkZNWCkAEADs=}
+error {R0lGODlhIAAgAKIAANnZ2YQAAP8AAISEhP///////////////yH5BAEAAAAALAAAAAAgACAA
+AAP/CLoMGLqKoMvtGIqiqxEYCLrcioGiyxwIusyBgaLLLRiBoMsQKLrcjYGgu4Giy+2CAkFX
+A0WX2wXFIOgGii7trkCEohsDCACBoktEKLpKhISiGwAIECiqSKooukiqKKoxgACBooukKiIo
+SKooujGDECi6iqQqsopEV2MQAkV3kXQZRXdjEAJFl5F0FUWXY3ACRZcFSRdFlyVwJlB0WZB0
+UXRZAmcCRZeRdBVFl2NwAkV3kXQZRXdjcAJFV5FURVaR6GoMDgSKLpKqiKAgqaLoxgwOBIoq
+kiqKLpIqimrM4ECg6BIRiq4SIaHoxgyCBoou7a5AhKIbMzgAAIGiy+2CTWJmBhAAAkWX2wXF
+zCDoBooud2PMDIKuRqDocgtGzMwg6O4Eii5z4Kgi6DIMhqLoagQGjiqCLvPgYOgqji6CLrfi
+6DIj6HI7jq4i6DIkADs=}
+file {R0lGODlhCwANAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAALAA0AAAIyhI9G8Q0AguSH
+AMQdxQgxEyEFQfItICQokYgEBMm3gBCKLRIQJN8CQii2SECQfAug+FgAOw==}
+folder {R0lGODlhEAANAKIAANnZ2YSEhMbGxv//AP///wAAAP///////yH5BAEAAAAALAAAAAAQAA0A
+AANjCIqhiqDLITgyEgi6GoIjIyMYugCBpMsaWBA0giMjIzgyUYBBMjIoIyODEgVBODIygiMj
+E1gQJIMyMjIoI1GAQSMjODIyghMFQSgjI4MyMhJYEDSCIyMjODJRgKHLXAiApcucADs=}
+hourglass {R0lGODlhIAAgAKIAANnZ2YAAAAAAAP8AAP///8DAwICAgP///yH5BAEAAAAALAAAAAAgACAA
+AAPZCLrc/jDKSau9OGcUuqyCoMvNGENVhaMrCLrcjaLLgqDL7WhFVIVVZoKgy+1oRUSFVWaC
+oMvtaEVEhVVmgqDL7WhFRIVVZoKgy+1oVVaCJWaCoMvtgKxISrBMEHS5fZEVSRkKgi63NzIq
+EwRdbndkVCYIutzeyIqqDAVBl9sXWRFJYZkg6HI7ICsiKqwyEwRdbkcrIhKsMhMEXW5HKyIp
+lDITBF1uRysyEiwxEwRdbkcrIyuUEhMEXW5H0WVB0OVujKGqwtEVBF1uRtHlRdDl9odRTlrt
+xRmjBAA7}
+info {R0lGODlhIAAgAKIAANnZ2YSEhMbGxv///wAA/wAAAP///////yH5BAEAAAAALAAAAAAgACAA
+AAP/CLoMGLqKoMvtGCo4uhKBgaDLDRghOLqsghEIuryBgqPLPSiBoMsQOLojhEQkOLpTCLob
+OLqKpIujq4WgC4Gju0i6OLpbCKohOLorhEQkOLorhaAQOLrc3qgCIARHl9sbSQUEji4j6RKO
+Lk9hQODosiKp4ujyFIbi6LIiqeLo8hSG4uiyIqni6PIUhuLosiKp4ujyFIYKji4PkiqOLkth
+BASOLg+SKo4uV2AEhODoMpIqju5KYShA4Ogqku7i6E4FRgAAYOHocvugiohAUC0cXe7GiohA
+0IUSHF3uQamICATdrULB0WUVrIqIQNBlCCwVHF2pwsJQRdDlDYyoKsHRPMLQDQRdbsDQqBmc
+wlBF0OV2jJqZwggEXW5vVDMVgaDL7Y5qKgJBl9sfVUUg6HL7AxSKoMvtr1AEgi5DAgA7}
+italic {R0lGODlhEAAQAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAAQABAAAAIrhI+py+1A4hN8
+hIjINBITPlpEZBqJCR8tIjKNxISPFhGZQOITfExdbv9FCgA7}
+new {R0lGODlhEAAQAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAAQABAAAAJFhI95FN8IvgXJ
+jyD4ECQ/JAh+kPyICIIdJP+CYAfJvyDYQfIvCHaQ/AuCHST/gmAHyb8g2EHyLwh2kPwLgk3x
+MQg+pu4WADs=}
+open {R0lGODlhEAAQAKIAANnZ2QAAAP//AP///4SEAP///////////yH5BAEAAAAALAAAAAAQABAA
+AANZCLrczigUQZc1EDQgEHSZAwMgIhB0NQIDQkYwdANBNUZwZGQEJxBUQwZlZGRQAkE1RnAE
+Q5dVcCSQdDcAYySQdDcAISSQdDcAASKQdDcAAQBDlwNBl9sfApQAOw==}
+openfold {R0lGODlhEAANAKIAANnZ2YSEhP///8bGxv//AAAAAP///////yH5BAEAAAAALAAAAAAQAA0A
+AANgCIqhiqDLgaIaCLoagkNDIxi6AIFCQ0M4KKpRgCFDQzg0NIQThaHLSxgVKLochRMVMkhD
+Q4M0VBFYEDKEQ0NDOFFRgCE0NEhDQ4MVBRAoNDSEQ0NRWAAYuqyFBQBYurwJADs=}
+overstrike {R0lGODlhEAAQAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAAQABAAAAI3hI+py80Uh+Aj
+RFhQCP8iMILgWwRGEHyLwAiCbxEYQfCB4iPBhwiMIPgXYREEHyEiguBj6nI7FQA7}
+palette {R0lGODlhEAAQAKIAANnZ2QAAAP//AP////8A/4QAhP8AAAD//yH5BAEAAAAALAAAAAAQABAA
+AANtCLrcjqGBoMsRKCMTgaALMSgDAYMSCKoxgAFBITgSAIAQEhUIARCAEgAQOBAwghMQEwga
+MoIjIxAIEgCAEBEyKBAgg4GgGxAIYTGCgaALcRgQIIGgCwEYICODgaALITgyEoGguxiqCLrc
+/lChBAA7}
+passwd {R0lGODlhIAAgAMQAANnZ2QAAAICAgICAAP///7CwsMDAwMjIAPjIAOjo6Pj4AODg4HBwcMj4
+ANjY2JiYANDQ0MjIyPj4yKCgoMiYAMjImDAwAMjIMJiYmJCQkP//////////////////////
+/yH5BAEAAAAALAAAAAAgACAAAAX/ICCOIhiIIgiII1maZSCMQnCeJyAIQiAIAiAMwxCcJwkk
+EAQRCIUwGMSBDEEAAuJIlgKRJEEgGAMRBIGiDENQlqNAJAsYCEwgEEEgBAHSIEMAAuJIAgKR
+LEsgGEMgCEJgBMqhHENQlgJILMsSCMRABEFgGAESHMcRgIA4kgKxOIsTBAOhKAITKEGDHMhD
+kqIAEqAjisJAgIooBkpwNMcTgIA4jgLhOBAkEAOhKIoSKEGDIMcTkKQICgQEQQIxEIqiBEpw
+IMdxPAEIiCMJCEQUMUQ0EIqiHIfSIM3xBGUpCiABCUQyEMqhHMiBHMjxBCAgjuQoEAKxRANB
+HMqhHM1x/zxDUJajQIACsUTDQBAEIR3IcQRDAALiSIoCYQiEE03gII7HQR3BEICAOJICYRSC
+QDjRNE1CAAzVQR3WE5AkAAqEUQiFQEARBAUAAAzHQR3BEICAOI4CUQhFIBAREwXjUFUHdQRD
+QJJAABbCFAhEJBgBAADAMAwXdQRDAALiCAhEIRQCYRiCEZDjUFFHMAQkIBAFOAmTQBiFUAQg
+II7AUFXUEQwBCQjEJExBkBRCEZCjMIBD9RxDAALiGEzCFBBYIRTBOI7AQB1DMIoCMQkYGAjL
+JEwBCIgjOVDDEJCAQGACJiTTJEwBSY5BEJAiSCCwTAiCZBKmAATEkSzNQBCCYCDBJgELTNMk
+g0AMEgwTAhAQR7I0zYARgvM8TyAIznMMAQA7}
+paste {R0lGODlhEAAQAKIAANnZ2QAAAP//AISEAISEhP///wAAhP///yH5BAEAAAAALAAAAAAQABAA
+AANwCLrcjqGBoKsYqiKrCDSGBkMiJJCGAgCDKBB0gwYDIKYwdJUIAyBokIaGBmloAhBiaAgH
+TdcCEIKGBsmwVM0AIYaGcAxL1coQgoYGySoisMzMAoeGxrB01QJpaMiwMHTLAEPVsHTVEHTR
+dBlBlxswAQA7}
+print {R0lGODlhEAAQAKIAANnZ2QAAAP///4SEhP//AP///////////yH5BAEAAAAALAAAAAAQABAA
+AANZCLrcjqG7CLqBoquBoBuCoSqBoBsouhoIuiEYqrKBoIGiqwEYEIChyxAIEYGgywEYgKHL
+DAgRCLozgwABARgIukSEABEBGLq8gAEQCLobgAEAgKHLgaDLzZgAOw==}
+question {R0lGODlhIAAgAKIAANnZ2YSEhMbGxv///wAAAAAA/////////yH5BAEAAAAALAAAAAAgACAA
+AAP/CLoMGLqKoMvtGCo4uhKBgaDLDRghOLqsghEIuryBgqPLPSiBoMsQOLrcjYSgu4GjO4Kl
+Kzi6Qwi6EDi6I4UyU1VYgqM7hKAagqM7VTg6VYWFoztCCAqBo6tVWDVThVU4ukqBACE4ulqF
+VSNVWIWjq0IYEDi6K4UlU1VYOLpMgRA4uryCpTi6PIShOLq8hVU4uqyEoTi6vIUlOLqshKE4
+uryFhaPLSxgqOLrc3kgoAgJHl0ewSnB0eQhDIQRHl6uwCkeXhTAUIHB0uQqrcHSZAiMAAJBw
+dFcKS3B0lwIjAkGVcHS5GykiAkEXSHB0uQeFIiIQdJcIBUeXVZAoIgJBT5chkFRwdIUICUMV
+QZc3MIKIBEcJQzcQdLkBQ4NmcAhDFUGX2zFoZggjEHS5vRHNUASCLrc7oqEIBF1uf0QUgaDL
+7Q9QKIIut79CEQi6DAkAOw==}
+redo {R0lGODlhEAAQAJEAANnZ2QAAhP///////yH5BAEAAAAALAAAAAAQABAAAAIvhI+py+1vSByC
+jxAYQXDMwsyAggQAQBB8iwgMgg8REQgUwqbYBDsIPqYutz+MgBQAOw==}
+save {R0lGODlhEAAQAJEAANnZ2QAAAISEAP///yH5BAEAAAAALAAAAAAQABAAAAJWhI9pFB8RIIRC
++BYQFqQQvkWEBSmEbyFhQQrhW0hYkEL4FhIWpBC+hYQFSYxvIgFAoXy0AAiSGP8kAIIkxgcI
+CSBEQvEBQgIIkVB8gJAAAhgfj+BjWgEAOw==}
+underline {R0lGODlhEAAQAJEAANnZ2QAAAP///////yH5BAEAAAAALAAAAAAQABAAAAI3hI+py60UBy4I
+vkVcBMG/iIsg+BdxEQT/Ii6C4F/ERRD8i7gIgn8RF0HwkWITfExFin8EH1OXCwA7}
+undo {R0lGODlhEAAQAJEAANnZ2QAAhP///////yH5BAEAAAAALAAAAAAQABAAAAIuhI+py+2vSByC
+HxdxQCHsCIg7oAAAEUHwLTAiKIQPgRSbYMfd3VEIH1OX2x8mUgA7}
+warning {R0lGODlhIAAgAKIAANnZ2YSEAP//AMbGxgAAAISEhP///////yH5BAEAAAAALAAAAAAgACAA
+AAP/CLq8gREIutz+KESGEHS5vVGIiAxSIehy+6JAUaUqBF1uBxQoukOFhaDL7RgoukKFhaDL
+3RgoujqEVQi63IyBortUWAi63IuBostDWIWgy60YIjKERCMiSFUIutyAISKCpCoiOFSFoMsd
+KCpIqiKCQlUIusyBooqkKiIoQ1UIuryBooqkiqJKVQi6rIGii6SKojpUWAi6DIGiG0RIgaJL
+VQi6HCi6MoREg6I7VFgIuhsoukqEhKKrVFgIuhoouhuEgaKrQ1iFoAuBortDOCi6S4WFoBso
+uiyEostDWIWgGii63K6IqgAAIVB0WQaJBkV3h7AKAAJFl4WQiFB0mQoLRyBQdFkJiQhFl4ew
+CgJFl3WQaFB0WQirIFB0ud0RVVWg6HJ7o6GqAgwUXW5fNFRVhQCBpMvti0oVABCwdLndEehi
+6XI7I4AEADs=}
+}
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/readme.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/readme.txt
new file mode 100644
index 0000000000..a76b3338f7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/readme.txt
@@ -0,0 +1,2 @@
+All of *.tcl and under themes/ directory (except kroc.rb) are 
+quoted from Tcl/Tk's Tile extension. Please read Orig_LICENSE.txt. 
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/repeater.tcl b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/repeater.tcl
new file mode 100644
index 0000000000..652ba8ab17
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/repeater.tcl
@@ -0,0 +1,117 @@
+#
+# $Id$
+#
+# Demonstration of custom classes.
+#
+# The Tile button doesn't have built-in support for autorepeat.
+# Instead of adding -repeatdelay and -repeatinterval options,
+# and all the extra binding scripts required to deal with them,
+# we create a custom widget class for autorepeating buttons.
+#
+# Usage:
+#	ttk::button .b -class Repeater [... other options ...]
+#
+# TODO:
+#	Use system settings for repeat interval and initial delay.
+#
+# Notes:
+#	Repeater buttons work more like scrollbar arrows than
+#	Tk repeating buttons: they fire once immediately when
+#	first pressed, and $State(delay) specifies the initial 
+#	interval before the button starts autorepeating.
+#
+
+namespace eval tile::Repeater {
+    variable State
+    set State(timer) 	{}	;# [after] id of repeat script
+    set State(interval)	100	;# interval between repetitions
+    set State(delay)	300	;# delay after initial invocation
+}
+
+### Class bindings.
+#
+
+bind Repeater <Enter>		{ %W state active }
+bind Repeater <Leave>		{ %W state !active }
+
+bind Repeater <Key-space> 	{ tile::Repeater::Activate %W }
+bind Repeater <<Invoke>> 	{ tile::Repeater::Activate %W }
+
+bind Repeater <ButtonPress-1> 	{ tile::Repeater::Press %W }
+bind Repeater <ButtonRelease-1> { tile::Repeater::Release %W }
+bind Repeater <B1-Leave> 	{ tile::Repeater::Pause %W }
+bind Repeater <B1-Enter> 	{ tile::Repeater::Resume %W } ;# @@@ see below
+
+# @@@ Workaround for metacity-induced bug:
+bind Repeater <B1-Enter> \
+    { if {"%d" ne "NotifyUngrab"} { tile::Repeater::Resume %W } }
+
+### Binding procedures.
+#
+
+## Activate -- Keyboard activation binding. 
+#	Simulate clicking the button, and invoke the command once. 
+#
+proc tile::Repeater::Activate {w} {
+    $w instate disabled { return }
+    set oldState [$w state pressed]
+    update idletasks; after 100
+    $w state $oldState
+    after idle [list $w invoke]
+}
+
+## Press -- ButtonPress-1 binding.
+#	Invoke the command once and start autorepeating after 
+#	$State(delay) milliseconds.
+#
+proc tile::Repeater::Press {w} {
+    variable State
+    $w instate disabled { return }
+    $w state pressed
+    $w invoke
+    after cancel $State(timer)
+    set State(timer) [after $State(delay) [list tile::Repeater::Repeat $w]]
+}
+
+## Release -- ButtonRelease binding.
+#	Stop repeating.
+#
+proc tile::Repeater::Release {w} {
+    variable State
+    $w state !pressed
+    after cancel $State(timer)
+}
+
+## Pause -- B1-Leave binding
+#	Temporarily suspend autorepeat.
+#
+proc tile::Repeater::Pause {w} {
+    variable State
+    $w state !pressed
+    after cancel $State(timer)
+}
+
+## Resume -- B1-Enter binding
+#	Resume autorepeat.
+#
+proc tile::Repeater::Resume {w} {
+    variable State
+    $w instate disabled { return }
+    $w state pressed
+    $w invoke
+    after cancel $State(timer)
+    set State(timer) [after $State(interval) [list tile::Repeater::Repeat $w]]
+}
+
+## Repeat -- Timer script
+#	Invoke the command and reschedule another repetition 
+#	after $State(interval) milliseconds.
+#
+proc tile::Repeater::Repeat {w} {
+    variable State
+    $w instate disabled { return }
+    $w invoke
+    set State(timer) [after $State(interval) [list tile::Repeater::Repeat $w]]
+}
+
+#*EOF*
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl
new file mode 100644
index 0000000000..37e3d07ff7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl
@@ -0,0 +1,149 @@
+# blue.tcl - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# blue.tcl,v 1.27 2005/10/08 14:56:57 jenglish Exp
+#
+#
+
+namespace eval tile::theme::blue {
+
+    package provide tile::theme::blue 0.7
+
+    set imgdir [file join [file dirname [info script]] blue]
+    array set I [tile::LoadImages $imgdir *.gif]
+
+    array set colors {
+	-frame  	"#6699cc"
+	-lighter	"#bcd2e8"
+	-window	 	"#e6f3ff"
+	-selectbg	"#ffff33"
+	-selectfg	"#000000"
+	-disabledfg	"#666666"
+    }
+
+    style theme create blue -settings {
+
+	style default . \
+	    -borderwidth 	1 \
+	    -background 	$colors(-frame) \
+	    -fieldbackground	$colors(-window) \
+	    -troughcolor	$colors(-lighter) \
+	    -selectbackground	$colors(-selectbg) \
+	    -selectforeground	$colors(-selectfg) \
+	    ;
+	style map . -foreground [list disabled $colors(-disabledfg)]
+
+	## Buttons.
+	#
+	style default TButton -padding "10 0"
+	style layout TButton {
+	    Button.button -children {
+		Button.focus -children {
+		    Button.padding -children {
+			Button.label
+		    }
+		}
+	    }
+	}
+
+	style element create button image $I(button-n) \
+	    -map [list pressed $I(button-p)  active $I(button-h)] \
+	    -border 4 -sticky ew
+
+	style element create Checkbutton.indicator image $I(check-nu) \
+	    -width 24 -sticky w -map [list \
+		{!disabled active selected} $I(check-hc) \
+		{!disabled active} $I(check-hu) \
+		{!disabled selected} $I(check-nc) ]
+
+	style element create Radiobutton.indicator image $I(radio-nu) \
+	    -width 24 -sticky w -map [list \
+		{!disabled active selected} $I(radio-hc) \
+		{!disabled active} $I(radio-hu) \
+		selected $I(radio-nc) ]
+
+	style default TMenubutton -relief raised -padding {10 2}
+
+	## Toolbar buttons.
+	#
+	style default Toolbutton \
+	    -width 0 -relief flat -borderwidth 2 -padding 4 \
+	    -background $colors(-frame) -foreground #000000 ;
+	style map Toolbutton -background [list active $colors(-selectbg)] 
+	style map Toolbutton -foreground [list active $colors(-selectfg)] 
+	style map Toolbutton -relief {
+	    disabled 	flat
+	    selected	sunken  
+	    pressed 	sunken  
+	    active  	raised
+	}
+
+	## Entry widgets.
+	#
+	style default TEntry \
+	    -selectborderwidth 1 -padding 2 -insertwidth 2 -font TkTextFont
+	style default TCombobox \
+	    -selectborderwidth 1 -padding 2 -insertwidth 2 -font TkTextFont
+
+	## Notebooks.
+	#
+	style default TNotebook.Tab -padding {4 2 4 2}
+	style map TNotebook.Tab \
+	    -background \
+		[list selected $colors(-frame) active $colors(-lighter)] \
+	    -padding [list selected {4 4 4 2}]
+
+	## Labelframes.
+	#
+	style default TLabelframe -borderwidth 2 -relief groove
+
+	## Scrollbars.
+	#
+	style layout Vertical.TScrollbar {
+	    Scrollbar.trough -children {
+		Scrollbar.uparrow -side top
+		Scrollbar.downarrow -side bottom
+		Scrollbar.uparrow -side bottom
+		Vertical.Scrollbar.thumb -side top -expand true -sticky ns
+	    }
+	}
+
+	style layout Horizontal.TScrollbar {
+	    Scrollbar.trough -children {
+		Scrollbar.leftarrow -side left
+		Scrollbar.rightarrow -side right
+		Scrollbar.leftarrow -side right
+		Horizontal.Scrollbar.thumb -side left -expand true -sticky we
+	    }
+	}
+
+	style element create Horizontal.Scrollbar.thumb image $I(sb-thumb) \
+	    -map [list {pressed !disabled} $I(sb-thumb-p)] -border 3
+
+	style element create Vertical.Scrollbar.thumb image $I(sb-vthumb) \
+	    -map [list {pressed !disabled} $I(sb-vthumb-p)] -border 3
+
+	foreach dir {up down left right} {
+	    style element create ${dir}arrow image $I(arrow${dir}) \
+		-map [list \
+		    disabled $I(arrow${dir}) \
+		    pressed $I(arrow${dir}-p) \
+		    active $I(arrow${dir}-h)] \
+	        -border 1 -sticky {}
+	}
+
+	## Scales.
+	#
+	style element create Scale.slider \
+	    image $I(slider) -map [list {pressed !disabled} $I(slider-p)]
+
+	style element create Vertical.Scale.slider \
+	    image $I(vslider) -map [list {pressed !disabled} $I(vslider-p)]
+
+	style element create Horizontal.Progress.bar \
+	    image $I(sb-thumb) -border 2
+	style element create Vertical.Progress.bar \
+	    image $I(sb-vthumb) -border 2
+
+    }
+}
+
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-h.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-h.gif
new file mode 100644
index 0000000000..3c1be9d880
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-h.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-p.gif
new file mode 100644
index 0000000000..1cb36ec554
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown.gif
new file mode 100644
index 0000000000..e363c362ed
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-h.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-h.gif
new file mode 100644
index 0000000000..cbc3db2756
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-h.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-p.gif
new file mode 100644
index 0000000000..14d541b03e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft.gif
new file mode 100644
index 0000000000..32584a34b2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-h.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-h.gif
new file mode 100644
index 0000000000..913e9da94b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-h.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-p.gif
new file mode 100644
index 0000000000..d02208fcf7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright.gif
new file mode 100644
index 0000000000..2b0f1fd07b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-h.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-h.gif
new file mode 100644
index 0000000000..6059bae094
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-h.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-p.gif
new file mode 100644
index 0000000000..20b6a824f4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup.gif
new file mode 100644
index 0000000000..5857616228
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-h.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-h.gif
new file mode 100644
index 0000000000..0947f43b90
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-h.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.gif
new file mode 100644
index 0000000000..d9845283a5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.xcf b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.xcf
new file mode 100644
index 0000000000..e38ed19e61
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.xcf
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-p.gif
new file mode 100644
index 0000000000..e819b1b951
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/button-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hc.gif
new file mode 100644
index 0000000000..b753aead97
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hu.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hu.gif
new file mode 100644
index 0000000000..74dbb799a2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nc.gif
new file mode 100644
index 0000000000..8f3d9114a3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nu.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nu.gif
new file mode 100644
index 0000000000..6f360ffd62
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hc.gif
new file mode 100644
index 0000000000..f7c21fb0c3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hu.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hu.gif
new file mode 100644
index 0000000000..a006630388
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nc.gif
new file mode 100644
index 0000000000..0281de37d8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nu.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nu.gif
new file mode 100644
index 0000000000..58ec60c1db
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb-p.gif
new file mode 100644
index 0000000000..6cfaa416d1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb.gif
new file mode 100644
index 0000000000..d9bfc0a7be
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb-p.gif
new file mode 100644
index 0000000000..930d7fd9ff
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb.gif
new file mode 100644
index 0000000000..060be5dd41
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider-p.gif
new file mode 100644
index 0000000000..c1c089de3e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider.gif
new file mode 100644
index 0000000000..1805c2dc7c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/slider.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider-p.gif
new file mode 100644
index 0000000000..bc37b31c3d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider.gif
new file mode 100644
index 0000000000..d3745c7f62
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl
new file mode 100644
index 0000000000..19ddda7c73
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl
@@ -0,0 +1,6 @@
+# Package index for tile demo pixmap themes.
+
+if {[file isdirectory [file join $dir blue]]} {
+    package ifneeded tile::theme::blue 0.0.1 \
+        [list source [file join $dir blue.tcl]]
+}
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl
new file mode 100644
index 0000000000..79fcd7c04e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl
@@ -0,0 +1,194 @@
+# keramik.tcl - 
+#
+# A sample pixmap theme for the tile package.
+#
+#  Copyright (c) 2004 Googie
+#  Copyright (c) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# $Id$
+
+package require Tk 8.4;                 # minimum version for Tile
+package require tile 0.5;               # depends upon tile 0.5
+
+namespace eval tile {
+    namespace eval theme {
+        namespace eval keramik {
+            variable version 0.3.2
+        }
+    }
+}
+
+namespace eval tile::theme::keramik {
+
+    variable imgdir [file join [file dirname [info script]] keramik]
+    variable I
+    array set I [tile::LoadImages $imgdir *.gif]
+
+    variable colors
+    array set colors {
+        -frame      "#cccccc"
+        -lighter    "#cccccc"
+        -window     "#ffffff"
+        -selectbg   "#eeeeee"
+        -selectfg   "#000000"
+        -disabledfg "#aaaaaa"
+    }
+
+    style theme create keramik -parent alt -settings {
+
+
+        # -----------------------------------------------------------------
+        # Theme defaults
+        #
+        style default . \
+            -borderwidth 1 \
+            -background $colors(-frame) \
+            -troughcolor $colors(-lighter) \
+            -font TkDefaultFont \
+            ;
+
+        style map . -foreground [list disabled $colors(-disabledfg)]
+                
+        # -----------------------------------------------------------------
+        # Button elements
+        #  - the button has a large rounded border and needs a bit of
+        #    horizontal padding.
+        #  - the checkbutton and radiobutton have the focus drawn around 
+        #    the whole widget - hence the new layouts.
+        #
+        style layout TButton {
+            Button.background
+            Button.button -children {
+                Button.focus -children {
+                    Button.label
+                }
+            }
+        }
+        style layout Toolbutton {
+            Toolbutton.background
+            Toolbutton.button -children {
+                Toolbutton.focus -children {
+                    Toolbutton.label
+                }
+            }
+        }
+        style element create button image $I(button-n) \
+            -border {8 6 8 16} -padding {6 6} -sticky news \
+            -map [list {pressed !disabled} $I(button-p) \
+                      {active !selected}  $I(button-h) \
+                      selected $I(button-s) \
+                      disabled $I(button-d)]
+        style default TButton -padding {10 6}
+
+        style element create Toolbutton.button image $I(tbar-n) \
+            -border {2 8 2 16} -padding {2 2} -sticky news \
+            -map [list {pressed !disabled} $I(tbar-p) \
+                      {active !selected}   $I(tbar-a) \
+                      selected             $I(tbar-p)]
+
+        style element create Checkbutton.indicator image $I(check-u) \
+            -width 20 -sticky w \
+            -map [list selected $I(check-c)]
+
+        style element create Radiobutton.indicator image $I(radio-u) \
+            -width 20 -sticky w \
+            -map [list  selected $I(radio-c)]
+
+        # The layout for the menubutton is modified to have a button element
+        # drawn on top of the background. This means we can have transparent
+        # pixels in the button element. Also, the pixmap has a special
+        # region on the right for the arrow. So we draw the indicator as a
+        # sibling element to the button, and draw it after (ie on top of) the
+        # button image.
+        style layout TMenubutton {
+            Menubutton.background
+            Menubutton.button -children {
+                Menubutton.focus -children {
+                    Menubutton.padding -children {
+                        Menubutton.label -side left -expand true
+                    }
+                }
+            }
+            Menubutton.indicator -side right
+        }
+        style element create Menubutton.button image $I(mbut-n) \
+            -map [list {active !disabled} $I(mbut-a) \
+                      {pressed !disabled} $I(mbut-a) \
+                      {disabled}          $I(mbut-d)] \
+            -border {7 10 29 15} -padding {7 4 29 4} -sticky news
+        style element create Menubutton.indicator image $I(mbut-arrow-n) \
+            -width 11 -sticky w -padding {0 0 18 0}
+
+        # -----------------------------------------------------------------
+        # Scrollbars, scale and progress elements
+        #  - the scrollbar has three arrow buttons, two at the bottom and
+        #    one at the top.
+        #
+        style layout Vertical.TScrollbar {
+            Scrollbar.background 
+            Scrollbar.trough -children {
+                Scrollbar.uparrow -side top
+                Scrollbar.downarrow -side bottom
+                Scrollbar.uparrow -side bottom
+                Vertical.Scrollbar.thumb -side top -expand true -sticky ns
+            }
+        }
+        
+        style layout Horizontal.TScrollbar {
+            Scrollbar.background 
+            Scrollbar.trough -children {
+                Scrollbar.leftarrow -side left
+                Scrollbar.rightarrow -side right
+                Scrollbar.leftarrow -side right
+                Horizontal.Scrollbar.thumb -side left -expand true -sticky we
+            }
+        }
+
+        style default TScrollbar -width 16
+
+        style element create Horizontal.Scrollbar.thumb image $I(hsb-n) \
+            -border {6 4} -width 15 -height 16 -sticky news \
+            -map [list {pressed !disabled} $I(hsb-p)]
+        
+        style element create Vertical.Scrollbar.thumb image $I(vsb-n) \
+            -border {4 6} -width 16 -height 15 -sticky news \
+            -map [list {pressed !disabled} $I(vsb-p)]
+        
+        style element create Scale.slider image $I(hslider-n) \
+            -border 3
+        
+        style element create Vertical.Scale.slider image $I(vslider-n) \
+            -border 3
+        
+        style element create Horizontal.Progress.bar image $I(hsb-n) \
+            -border {6 4}
+        
+        style element create Vertical.Progress.bar image $I(vsb-n) \
+            -border {4 6}
+        
+        style element create uparrow image $I(arrowup-n) \
+            -map [list {pressed !disabled} $I(arrowup-p)]
+                  
+        style element create downarrow image $I(arrowdown-n) \
+            -map [list {pressed !disabled} $I(arrowdown-p)]
+
+        style element create rightarrow image $I(arrowright-n) \
+            -map [list {pressed !disabled} $I(arrowright-p)]
+
+        style element create leftarrow image $I(arrowleft-n) \
+            -map [list {pressed !disabled} $I(arrowleft-p)]
+        
+        # -----------------------------------------------------------------
+        # Notebook elements
+        #
+        style element create tab image $I(tab-n) \
+            -map [list selected $I(tab-p) active $I(tab-p)] \
+            -border {6 6 6 2} -height 12
+
+	## Labelframes.
+	#
+	style default TLabelframe -borderwidth 2 -relief groove
+    }
+}
+
+package provide tile::theme::keramik $::tile::theme::keramik::version
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-n.gif
new file mode 100644
index 0000000000..2d84f29c60
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-p.gif
new file mode 100644
index 0000000000..52ee752641
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-n.gif
new file mode 100644
index 0000000000..ff309c56f2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-p.gif
new file mode 100644
index 0000000000..2159f274a5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-n.gif
new file mode 100644
index 0000000000..905fa7ed1d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-p.gif
new file mode 100644
index 0000000000..0323332f30
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-n.gif
new file mode 100644
index 0000000000..20dcadb30e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-p.gif
new file mode 100644
index 0000000000..129169e4c4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-d.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-d.gif
new file mode 100644
index 0000000000..fe9bf98f81
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-d.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-h.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-h.gif
new file mode 100644
index 0000000000..210734d1ae
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-h.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-n.gif
new file mode 100644
index 0000000000..5e1eafa854
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-p.gif
new file mode 100644
index 0000000000..bfd74889f8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-s.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-s.gif
new file mode 100644
index 0000000000..1095ed7583
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-s.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-c.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-c.gif
new file mode 100644
index 0000000000..06e8795df8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-c.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-u.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-u.gif
new file mode 100644
index 0000000000..3c02fcbe81
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-u.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-n.gif
new file mode 100644
index 0000000000..1d93973c75
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-p.gif
new file mode 100644
index 0000000000..18fbae08ab
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hslider-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hslider-n.gif
new file mode 100644
index 0000000000..334e8e4a40
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hslider-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-a.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-a.gif
new file mode 100644
index 0000000000..2e2f1c2f10
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-a.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-arrow-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-arrow-n.gif
new file mode 100644
index 0000000000..48197cbfc9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-arrow-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-d.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-d.gif
new file mode 100644
index 0000000000..4a294b4984
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-d.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-n.gif
new file mode 100644
index 0000000000..65c0e4efa2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-c.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-c.gif
new file mode 100644
index 0000000000..c8257c9336
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-c.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-u.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-u.gif
new file mode 100644
index 0000000000..215a73821c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-u.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-n.gif
new file mode 100644
index 0000000000..03099a95be
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-p.gif
new file mode 100644
index 0000000000..abec6aba40
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-a.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-a.gif
new file mode 100644
index 0000000000..2c223ba2c5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-a.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-n.gif
new file mode 100644
index 0000000000..77ef8a26cf
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-p.gif
new file mode 100644
index 0000000000..3179b87ad9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-n.gif
new file mode 100644
index 0000000000..be01e4a72a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-p.gif
new file mode 100644
index 0000000000..0bb39e91ff
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vslider-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vslider-n.gif
new file mode 100644
index 0000000000..cf03d7f325
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vslider-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl
new file mode 100644
index 0000000000..4bb89aa8a5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl
@@ -0,0 +1,15 @@
+# pkgIndex.tcl for additional tile pixmap themes.
+#
+# We don't provide the package is the image subdirectory isn't present,
+# or we don't have the right version of Tcl/Tk
+#
+# To use this automatically within tile, the tile-using application should
+# use tile::availableThemes and tile::setTheme 
+#
+# $Id$
+
+if {![file isdirectory [file join $dir keramik]]} { return }
+if {![package vsatisfies [package provide Tcl] 8.4]} { return }
+
+package ifneeded tile::theme::keramik 0.3.2 \
+    [list source [file join $dir keramik.tcl]]
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc.rb
new file mode 100644
index 0000000000..f67ce7a897
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc.rb
@@ -0,0 +1,200 @@
+#
+# kroc.rb 
+#
+# based on:
+#   >> kroc.tcl - Copyright (C) 2004 David Zolli <kroc@kroc.tk>
+#
+
+imgdir = File.join(File.dirname(__FILE__), 'kroc', 'kroc')
+$images = Tk::Tile.load_images(imgdir, '*.gif')
+
+if TkPackage.vcompare(Tk::Tile.package_version, '0.5') >= 0
+  $TNotebook_Tab = Tk::Tile::TNotebook.style('Tab')
+else
+  $TNotebook_Tab = 'Tab.TNotebook'
+end
+
+def kroc_rb_settings
+  # Tk::Tile::Style.default(TkRoot, :background=>'#FCB64F', 
+  #                         :troughcolor=>'#F8C278', :borderwidth=>1)
+  #   or
+  # Tk::Tile::Style.default(Tk.root, :background=>'#FCB64F', 
+  #                         :troughcolor=>'#F8C278', :borderwidth=>1)
+  #   or
+  # Tk::Tile::Style.default('.', :background=>'#FCB64F', 
+  #                         :troughcolor=>'#F8C278', :borderwidth=>1)
+  #   or
+  # Tk::Tile::Style.default(nil, :background=>'#FCB64F', 
+  #                         :troughcolor=>'#F8C278', :borderwidth=>1)
+  #   or
+  Tk::Tile::Style.default(:background=>'#FCB64F', :troughcolor=>'#F8C278', 
+                          :borderwidth=>1)
+  # Tk::Tile::Style.default(TkRoot, :font=>Tk::Tile::Font::Default, 
+  #                         :borderwidth=>1)
+  #   or
+  # Tk::Tile::Style.default(Tk.root, :font=>Tk::Tile::Font::Default, 
+  #                         :borderwidth=>1)
+  #   or
+  # Tk::Tile::Style.default('.', :font=>Tk::Tile::Font::Default, 
+  #                         :borderwidth=>1)
+  #   or
+  # Tk::Tile::Style.default(nil, :font=>Tk::Tile::Font::Default, 
+  #                         :borderwidth=>1)
+  #   or
+  Tk::Tile::Style.default(:font=>Tk::Tile::Font::Default, :borderwidth=>1)
+
+  # Tk::Tile::Style.map(TkRoot, :background=>[:active, '#694418'])
+  #   or
+  # Tk::Tile::Style.map(Tk.root, :background=>[:active, '#694418'])
+  #   or
+  # Tk::Tile::Style.map('.', :background=>[:active, '#694418'])
+  #   or
+  # Tk::Tile::Style.map(nil, :background=>[:active, '#694418'])
+  #   or
+  Tk::Tile::Style.map(:background=>[:active, '#694418'])
+  Tk::Tile::Style.map(:foreground=>[:disabled, '#B2B2B2', :active, '#FFE7CB'])
+
+  # Tk::Tile::Style.default('TButton', :padding=>[10,4])
+  Tk::Tile::Style.default(Tk::Tile::TButton, :padding=>[10,4])
+
+  # Tk::Tile::Style.default('TNotebook.Tab', 
+  Tk::Tile::Style.default($TNotebook_Tab, 
+                          :padding=>[10, 3], :font=>Tk::Tile::Font::Default)
+  # Tk::Tile::Style.map('TNotebook.Tab', 
+  Tk::Tile::Style.map($TNotebook_Tab, 
+                      :background=>[:selected, '#FCB64F', '', '#FFE6BA'], 
+                      :foreground=>['', 'black'], 
+                      :padding=>[:selected, [10, 6, 10, 3]])
+
+  # Tk::Tile::Style.map('TScrollbar', 
+  Tk::Tile::Style.map(Tk::Tile::TScrollbar, 
+                      :background=>[:pressed, '#694418'], 
+                      :arrowcolor=>[:pressed, '#FEF7CB'], 
+                      :relief=>[:pressed, :sunken])
+
+  # Tk::Tile::Style.layout('Vertical.TScrollbar', 
+  Tk::Tile::Style.layout(Tk::Tile.style('Vertical', Tk::Tile::TScrollbar), 
+                         ['Scrollbar.trough', {:children=>[
+                             'Scrollbar.uparrow',   {:side=>:top}, 
+                             'Scrollbar.downarrow', {:side=>:bottom}, 
+                             'Scrollbar.uparrow',   {:side=>:bottom}, 
+                             'Scrollbar.thumb',  {:side=>:top, :expand=>true}
+                           ]}
+                         ])
+
+  # Tk::Tile::Style.layout('Horizontal.TScrollbar', 
+  Tk::Tile::Style.layout(Tk::Tile.style('Horizontal', Tk::Tile::TScrollbar), 
+                         ['Scrollbar.trough', {:children=>[
+                             'Scrollbar.leftarrow',   {:side=>:left}, 
+                             'Scrollbar.rightarrow', {:side=>:right}, 
+                             'Scrollbar.leftarrow',   {:side=>:right}, 
+                             'Scrollbar.thumb',  {:side=>:left, :expand=>true}
+                           ]}
+                         ])
+
+  #
+  # Elements:
+  #
+  if TkPackage.vcompare(Tk::Tile.package_version, '0.5') >= 0
+
+    Tk::Tile::Style.element_create('Button.button', 
+                                   :image, $images['button-n'],
+                                   :map=>[
+                                     :pressed, $images['button-p'], 
+                                     :active,  $images['button-h'], 
+                                   ], :border=>3, :sticky=>:ew)
+
+    Tk::Tile::Style.element_create('Checkbutton.indicator', 
+                                   :image, $images['check-nu'],
+                                   :map=>[
+                                     [:pressed, :selected],$images['check-nc'],
+                                     :pressed,             $images['check-nu'],
+                                     [:active, :selected], $images['check-hc'],
+                                     :active,              $images['check-hu'],
+                                     :selected,            $images['check-nc'],
+                                   ], :sticky=>:w)
+
+    Tk::Tile::Style.element_create('Radiobutton.indicator', 
+                                   :image, $images['radio-nu'],
+                                   :map=>[
+                                     [:pressed, :selected],$images['radio-nc'],
+                                     :pressed,             $images['radio-nu'],
+                                     [:active, :selected], $images['radio-hc'],
+                                     :active,              $images['radio-hu'],
+                                     :selected,            $images['radio-nc'],
+                                   ], :sticky=>:w)
+
+  else # tile 0.4 or earlier
+
+    Tk::Tile::Style.element_create('Button.button', :pixmap, 
+                                   :images=>[
+                                     :pressed, $images['button-p'], 
+                                     :active,  $images['button-h'], 
+                                     '',       $images['button-n']
+                                   ], :border=>3, :tiling=>:tile)
+
+    Tk::Tile::Style.element_create('Checkbutton.indicator', :pixmap, 
+                                   :images=>[
+                                     [:pressed, :selected],$images['check-nc'],
+                                     :pressed,             $images['check-nu'],
+                                     [:active, :selected], $images['check-hc'],
+                                     :active,              $images['check-hu'],
+                                     :selected,            $images['check-nc'],
+                                     '',                   $images['check-nu'],
+                                   ], :tiling=>:fixed)
+
+    Tk::Tile::Style.element_create('Radiobutton.indicator', :pixmap, 
+                                   :images=>[
+                                     [:pressed, :selected],$images['radio-nc'],
+                                     :pressed,             $images['radio-nu'],
+                                     [:active, :selected], $images['radio-hc'],
+                                     :active,              $images['radio-hu'],
+                                     :selected,            $images['radio-nc'],
+                                     '',                   $images['radio-nu'],
+                                   ], :tiling=>:fixed)
+
+  end
+
+  #
+  # Settings:
+  #
+  # Tk::Tile::Style.layout(Tk::Tile::TButton, 
+  Tk::Tile::Style.layout('TButton', [
+      'Button.button', {:children=>[
+           'Button.focus', {:children=>[
+                'Button.padding', {:children=>[
+                    'Button.label', {:expand=>true, :sticky=>''}
+                ]}
+           ]}
+      ]}
+  ])
+
+  # Tk::Tile::Style.layout(Tk::Tile::TCheckbutton, 
+  Tk::Tile::Style.layout('TCheckbutton', [
+      'Checkbutton.background', # this is not needed in tile 0.5 or later
+      'Checkbutton.border', {:children=>[
+           'Checkbutton.padding', {:children=>[
+                'Checkbutton.indicator', {:side=>:left}, 
+                'Checkbutton.focus', {:side=>:left, :children=>[
+                    'Checkbutton.label'
+                ]}
+           ]}
+      ]}
+  ])
+
+  # Tk::Tile::Style.layout(Tk::Tile::TRadiobutton, 
+  Tk::Tile::Style.layout('TRadiobutton', [
+      'Radiobutton.background', # this is not needed in tile 0.5 or later
+      'Radiobutton.border', {:children=>[
+           'Radiobutton.padding', {:children=>[
+                'Radiobutton.indicator', {:side=>:left}, 
+                'Radiobutton.focus', {:expand=>true, :sticky=>:w, :children=>[
+                    'Radiobutton.label', {:side=>:right, :expand=>true}
+                ]}
+           ]}
+      ]}
+  ])
+end
+
+Tk::Tile::Style.theme_create('kroc-rb', :parent=>'alt', 
+                             :settings=>proc{ kroc_rb_settings() })
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl
new file mode 100644
index 0000000000..73548acef2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl
@@ -0,0 +1,163 @@
+# kroc.tcl - Copyright (C) 2004 David Zolli <kroc@kroc.tk>
+#
+# A sample pixmap theme for the tile package.
+
+#package require tile::pixmap
+
+namespace eval tile {
+    namespace eval kroc {
+        variable version 0.0.1
+    }
+}
+
+namespace eval tile::kroc {
+    
+    set imgdir [file join [file dirname [info script]] kroc]
+    array set Images [tile::LoadImages $imgdir *.gif]
+    
+    if {[package vsatisfies [package provide tile] 0.5]} {
+        set TNoteBook_Tab TNotebook.Tab
+    } else {
+        set TNoteBook_Tab Tab.TNotebook
+    }
+    
+    style theme create kroc -parent alt -settings {
+        
+        style default . -background #FCB64F -troughcolor #F8C278 -borderwidth 1
+	style default . -font TkDefaultFont -borderwidth 1
+        style map . -background [list active #694418]
+        style map . -foreground [list disabled #B2B2B2 active #FFE7CB]
+        
+        style default TButton -padding "10 4"
+        
+        style default $TNoteBook_Tab -padding {10 3} -font TkDefaultFont
+        style map $TNoteBook_Tab \
+                -background [list selected #FCB64F {} #FFE6BA] \
+                -foreground [list {} black] \
+                -padding [list selected {10 6 10 3}]
+
+        style map TScrollbar \
+		-background	{ pressed #694418} \
+                -arrowcolor	{ pressed #FFE7CB } \
+                -relief		{ pressed sunken } \
+                ;
+        
+        style layout Vertical.TScrollbar {
+            Scrollbar.trough -children {
+                Scrollbar.uparrow -side top
+                Scrollbar.downarrow -side bottom
+                Scrollbar.uparrow -side bottom
+                Scrollbar.thumb -side top -expand true
+            }
+        }
+        
+        style layout Horizontal.TScrollbar {
+            Scrollbar.trough -children {
+                Scrollbar.leftarrow -side left
+                Scrollbar.rightarrow -side right
+                Scrollbar.leftarrow -side right
+                Scrollbar.thumb -side left -expand true
+            }
+        }
+        
+        #
+        # Elements:
+        #
+        if {[package vsatisfies [package provide tile] 0.5]} {
+            
+            style element create Button.button image $Images(button-n) \
+                -map [list  \
+                    pressed		$Images(button-p) \
+                    active		$Images(button-h) \
+                    ] -border 3 -sticky ew
+            
+            style element create Checkbutton.indicator image $Images(check-nu) \
+                -map [list \
+                    {pressed selected}	$Images(check-nc) \
+                    pressed		$Images(check-nu) \
+                    {active selected}	$Images(check-hc) \
+                    active		$Images(check-hu) \
+                    selected		$Images(check-nc) \
+                    ] -sticky w
+            
+            style element create Radiobutton.indicator image $Images(radio-nu) \
+                -map [list \
+                    {pressed selected}	$Images(radio-nc) \
+                    pressed		$Images(radio-nu) \
+                    {active selected}	$Images(radio-hc) \
+                    active		$Images(radio-hu) \
+                    selected		$Images(radio-nc) \
+                    ] -sticky w
+            
+        } else {
+            
+            style element create Button.button pixmap -images [list  \
+                    pressed		$Images(button-p) \
+                    active		$Images(button-h) \
+                    {}			$Images(button-n) \
+                    ] -border 3 -tiling tile
+            
+            style element create Checkbutton.indicator pixmap -images [list \
+                    {pressed selected}	$Images(check-nc) \
+                    pressed		$Images(check-nu) \
+                    {active selected}	$Images(check-hc) \
+                    active		$Images(check-hu) \
+                    selected		$Images(check-nc) \
+                    {}			$Images(check-nu) \
+                    ] -tiling fixed
+            
+            style element create Radiobutton.indicator pixmap -images [list \
+                    {pressed selected}	$Images(radio-nc) \
+                    pressed		$Images(radio-nu) \
+                    {active selected}	$Images(radio-hc) \
+                    active		$Images(radio-hu) \
+                    selected		$Images(radio-nc) \
+                    {}			$Images(radio-nu) \
+                    ] -tiling fixed
+            
+        }
+
+        #
+        # Settings: (*button.background is not needed in tile 0.5 or above)
+        #
+        style layout TButton {
+	    Button.button -children {
+		Button.focus -children {
+		    Button.padding -children {
+			Button.label -expand true -sticky {}
+		    }
+		}
+	    }
+        }
+
+        style layout TCheckbutton {
+	    Checkbutton.border -children {
+		Checkbutton.background
+		Checkbutton.padding -children {
+		    Checkbutton.indicator -side left
+		    Checkbutton.focus -side left -children {
+			Checkbutton.label
+		    }
+		}
+            }
+        }
+        
+        style layout TRadiobutton {
+            Radiobutton.border -children {
+                Radiobutton.background
+                Radiobutton.padding -children  {
+                    Radiobutton.indicator -side left
+                    Radiobutton.focus -expand true -sticky w -children {
+                        Radiobutton.label -side right -expand true
+                    }
+                }
+            }
+        }
+        
+    } }
+
+# -------------------------------------------------------------------------
+
+package provide tile::theme::kroc $::tile::kroc::version
+
+# -------------------------------------------------------------------------
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-h.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-h.gif
new file mode 100644
index 0000000000..e7a140dede
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-h.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-n.gif
new file mode 100644
index 0000000000..78b506ddeb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-p.gif
new file mode 100644
index 0000000000..a5a4e90be1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hc.gif
new file mode 100644
index 0000000000..41503c5ebd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hu.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hu.gif
new file mode 100644
index 0000000000..b3e512ca67
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nc.gif
new file mode 100644
index 0000000000..a28c288fce
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nu.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nu.gif
new file mode 100644
index 0000000000..5c23931bbc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hc.gif
new file mode 100644
index 0000000000..359fe1cc8b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hu.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hu.gif
new file mode 100644
index 0000000000..9f46b37926
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nc.gif
new file mode 100644
index 0000000000..6437f33a7a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nu.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nu.gif
new file mode 100644
index 0000000000..2d2aac8597
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl
new file mode 100644
index 0000000000..179077917c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl
@@ -0,0 +1,15 @@
+# pkgIndex.tcl for additional tile pixmap themes.
+#
+# We don't provide the package is the image subdirectory isn't present,
+# or we don't have the right version of Tcl/Tk
+#
+# To use this automatically within tile, the tile-using application should
+# use tile::availableThemes and tile::setTheme 
+#
+# $Id$
+
+if {![file isdirectory [file join $dir kroc]]} { return }
+if {![package vsatisfies [package provide Tcl] 8.4]} { return }
+
+package ifneeded tile::theme::kroc 0.0.1 \
+    [list source [file join $dir kroc.tcl]]
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl
new file mode 100644
index 0000000000..e39aff6f44
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl
@@ -0,0 +1,16 @@
+# pkgIndex.tcl for additional tile pixmap themes.
+#
+# We don't provide the package is the image subdirectory isn't present,
+# or we don't have the right version of Tcl/Tk
+#
+# To use this automatically within tile, the tile-using application should
+# use tile::availableThemes and tile::setTheme 
+#
+# $Id$
+
+if {![file isdirectory [file join $dir plastik]]} { return }
+if {![package vsatisfies [package provide Tcl] 8.4]} { return }
+
+package ifneeded tile::theme::plastik 0.3.1 \
+    [list source [file join $dir plastik.tcl]]
+
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik.tcl b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik.tcl
new file mode 100644
index 0000000000..ea6ed74162
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik.tcl
@@ -0,0 +1,125 @@
+# plastik.tcl - Copyright (C) 2004 Googie
+#
+# A sample pixmap theme for the tile package.
+#
+#  Copyright (c) 2004 Googie
+#  Copyright (c) 2005 Pat Thoyts <patthoyts@users.sourceforge.net>
+#
+# $Id$
+
+package require Tk 8.4
+package require tile 0.5
+
+namespace eval tile::theme::plastik {
+
+    variable version 0.3.1
+    package provide tile::theme::plastik $version
+
+    variable imgdir [file join [file dirname [info script]] plastik]
+    variable Images;
+    array set Images [tile::LoadImages $imgdir *.gif]
+
+    variable colors
+    array set colors {
+    	-frame 		"#cccccc"
+	-disabledfg	"#aaaaaa"
+	-selectbg	"#657a9e"
+	-selectfg	"#ffffff"
+    }
+
+style theme create plastik -parent default -settings {
+    style default . \
+    	-background $colors(-frame) \
+	-troughcolor $colors(-frame) \
+	-selectbackground $colors(-selectbg) \
+	-selectforeground $colors(-selectfg) \
+	-font TkDefaultFont \
+	-borderwidth 1 \
+	;
+
+    style map . -foreground [list disabled $colors(-disabledfg)]
+
+    #
+    # Layouts:
+    #
+    style layout Vertical.TScrollbar {
+        Scrollbar.background
+        Scrollbar.trough -children {
+            Scrollbar.uparrow -side top
+            Scrollbar.downarrow -side bottom
+            Scrollbar.uparrow -side bottom
+            Vertical.Scrollbar.thumb -side top -expand true -sticky ns
+        }
+    }
+
+    style layout Horizontal.TScrollbar {
+        Scrollbar.background
+        Scrollbar.trough -children {
+            Scrollbar.leftarrow -side left
+            Scrollbar.rightarrow -side right
+            Scrollbar.leftarrow -side right
+            Horizontal.Scrollbar.thumb -side left -expand true -sticky we
+        }
+    }
+
+    style layout TButton {
+        Button.button -children {
+	    Button.focus -children {
+		Button.padding -children {
+		    Button.label -side left -expand true
+		}
+	    }
+	}
+    }
+
+    #
+    # Elements:
+    #
+    style element create Button.button image $Images(button-n) \
+    	-border 4 -sticky ew \
+    	-map [list pressed $Images(button-p)  active $Images(button-h)]
+
+    style element create Checkbutton.indicator image $Images(check-nu) \
+	-sticky {} -map [list \
+	    {active selected}     $Images(check-hc) \
+	    {pressed selected}    $Images(check-pc) \
+	    active                $Images(check-hu) \
+	    selected              $Images(check-nc) \
+	]
+
+    style element create Radiobutton.indicator image $Images(radio-nu) \
+	-sticky {} -map [list \
+	    {active selected}     $Images(radio-hc) \
+	    {pressed selected}    $Images(radio-pc) \
+	    active                $Images(radio-hu) \
+	    selected              $Images(radio-nc) \
+	]
+
+    style element create Horizontal.Scrollbar.thumb \
+    	image $Images(hsb-n) -border 3 -sticky ew
+    style element create Vertical.Scrollbar.thumb \
+    	image $Images(vsb-n) -border 3 -sticky ns
+
+    style element create Scale.slider \
+    	image $Images(hslider-n) -sticky {}
+    style element create Vertical.Scale.slider \
+    	image $Images(vslider-n) -sticky {}
+
+    style element create Scrollbar.uparrow image $Images(arrowup-n) \
+    	-map [list pressed $Images(arrowup-p)] -sticky {}
+    style element create Scrollbar.downarrow image $Images(arrowdown-n) \
+    	-map [list pressed $Images(arrowdown-p)] -sticky {}
+    style element create Scrollbar.leftarrow image $Images(arrowleft-n) \
+    	-map [list pressed $Images(arrowleft-p)] -sticky {}
+    style element create Scrollbar.rightarrow image $Images(arrowright-n) \
+    	-map [list pressed $Images(arrowright-p)] -sticky {}
+
+    #
+    # Settings:
+    #
+    style default TButton -width -10
+    style default TNotebook.Tab -padding {6 2 6 2}
+    style default TLabelframe -borderwidth 2 -relief groove
+
+} }
+
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-n.gif
new file mode 100644
index 0000000000..d914e7a3d3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-p.gif
new file mode 100644
index 0000000000..abffaa49f6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-n.gif
new file mode 100644
index 0000000000..9939ae1d50
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-p.gif
new file mode 100644
index 0000000000..1a45ef2e4b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-n.gif
new file mode 100644
index 0000000000..f4b563fed2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-p.gif
new file mode 100644
index 0000000000..5459d5e615
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-n.gif
new file mode 100644
index 0000000000..118290cd95
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-p.gif
new file mode 100644
index 0000000000..89f9b38c73
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-h.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-h.gif
new file mode 100644
index 0000000000..548f3769df
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-h.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-n.gif
new file mode 100644
index 0000000000..49a25909f3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-p.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-p.gif
new file mode 100644
index 0000000000..e83f7ed985
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-p.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hc.gif
new file mode 100644
index 0000000000..b279fa50d8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hu.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hu.gif
new file mode 100644
index 0000000000..5b4fb4f037
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nc.gif
new file mode 100644
index 0000000000..b139e02a09
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nu.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nu.gif
new file mode 100644
index 0000000000..fbe391f9d8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-pc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-pc.gif
new file mode 100644
index 0000000000..75a3bd635c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-pc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hsb-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hsb-n.gif
new file mode 100644
index 0000000000..b8ea07ea92
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hsb-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hslider-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hslider-n.gif
new file mode 100644
index 0000000000..ce8f28404f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hslider-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hc.gif
new file mode 100644
index 0000000000..33917715b0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hu.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hu.gif
new file mode 100644
index 0000000000..88925d0e1d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nc.gif
new file mode 100644
index 0000000000..f8723d367a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nu.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nu.gif
new file mode 100644
index 0000000000..fb5140e6a1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nu.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-pc.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-pc.gif
new file mode 100644
index 0000000000..176225d9e1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-pc.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vsb-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vsb-n.gif
new file mode 100644
index 0000000000..85bac4579e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vsb-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vslider-n.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vslider-n.gif
new file mode 100644
index 0000000000..cf887f9855
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vslider-n.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tile/toolbutton.tcl b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/toolbutton.tcl
new file mode 100644
index 0000000000..4e08034e31
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tile/toolbutton.tcl
@@ -0,0 +1,152 @@
+#
+# $Id$
+#
+# Demonstration of custom widget styles.
+#
+
+#
+# ~ BACKGROUND
+#
+# Checkbuttons in toolbars have a very different appearance 
+# than regular checkbuttons: there's no indicator, they
+# "pop up" when the mouse is over them, and they appear sunken
+# when selected.
+# 
+# Tk added partial support for toolbar-style buttons in 8.4 
+# with the "-overrelief" option, and TIP #82 added further
+# support with the "-offrelief" option.  So to get a toolbar-style 
+# checkbutton, you can configure it with:
+#
+# checkbutton .cb \
+#     -indicatoron false -selectcolor {} -relief flat -overrelief raised
+#
+# Behind the scenes, Tk has a lot of rather complicated logic
+# to implement this checkbutton style; see library/button.tcl,
+# generic/tkButton.c, and the platform-specific files unix/tkUnixButton.c
+# et al. for the full details.
+#
+# The tile widget set has a better way: custom styles.
+# Since the appearance is completely controlled by the theme engine,
+# we can define a new "Toolbutton" style and just use:
+#
+# checkbutton .cb -style Toolbutton
+#
+#
+# ~ DEMONSTRATION
+#
+# The tile built-in themes (default, "alt", windows, and XP) 
+# already include Toolbutton styles.  This script will add
+# them to the "step" and "blue" themes as a demonstration.
+#
+# (Note: Pushbuttons and radiobuttons can also use the "Toolbutton" 
+# style; see demo.tcl.)
+#
+
+style theme settings "step" {
+
+#
+# First, we use [style layout] to define what elements to
+# use and how they're arranged.  Toolbuttons are pretty
+# simple, consisting of a border, some internal padding,
+# and a label.  (See also the TScrollbar layout definition 
+# in demos/blue.tcl for a more complicated layout spec.)
+#
+    style layout Toolbutton {
+        Toolbutton.background
+        Toolbutton.border -children {
+            Toolbutton.padding -children {
+                Toolbutton.label
+            }
+        }
+    }
+
+# (Actually the above isn't strictly necessary, since the same layout 
+# is defined in the default theme; we could have inherited it 
+# instead.)
+#
+# Next, specify default values for element options.
+# For many options (like -background), the defaults
+# inherited from the parent style are sufficient.
+#
+    style default Toolbutton -width 0 -padding 1 -relief flat -borderwidth 2
+
+#
+# Finally, use [style map] to specify state-specific 
+# resource values.  We want a flat relief if the widget is
+# disabled, sunken if it's selected (on) or pressed, 
+# and raised when it's active (the mouse pointer is
+# over the widget).  Each state-value pair is checked
+# in order, and the first matching state takes precedence.
+#
+    style map Toolbutton -relief {
+	disabled 	flat
+    	selected	sunken  
+	pressed 	sunken  
+	active		raised
+    }
+}
+
+#
+# Now for the "blue" theme.  (Since the purpose of this
+# theme is to show what *can* be done, not necessarily what
+# *should* be done, the following makes some questionable
+# design decisions from an aesthetic standpoint.)
+#
+if {![catch {package require tile::theme::blue}]} {
+style theme settings "blue" {
+
+    #
+    # Default values:
+    #
+    style default Toolbutton \
+    	-width 0 -relief flat -borderwidth 2 \
+	-background #6699CC -foreground #000000 ;
+
+    #
+    # Configure state-specific values for -relief, as before:
+    #
+    style map Toolbutton -relief {
+	disabled 	flat
+    	selected	sunken  
+	pressed 	sunken  
+	active		raised
+    } 
+
+    #
+    # Adjust the -padding at the same time, to enhance
+    # the raised/sunken illusion:
+    #
+    style default Toolbutton -padding 4
+    style map Toolbutton -padding {
+	disabled	{4}
+	selected	{6 6 2 2}
+	pressed		{6 6 2 2}
+	active		{2 2 6 6}
+    }
+
+    #
+    # ... and change the foreground and background colors
+    # when the mouse cursor is over the widget:
+    #
+    style map Toolbutton -background {
+	active  	#008800
+    } -foreground {
+	active  	#FFFFFF
+    }
+}
+
+}
+
+#
+# ~ A final note:  
+#
+# TIP #82 also says: "When -indicatoron is off and the button itself
+# is on, the relief continues to be hard-coded to sunken. For symmetry,
+# we might consider adding another -onrelief option to cover this
+# case. But it is difficult to imagine ever wanting to change the
+# value of -onrelief so it has been omitted from this TIP.
+# If there as strong desire to have -onrelief, it can be added later."
+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+#
+# The Tile project aims to make sure that this never needs to happen.
+#
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/Orig_COPYRIGHT.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/Orig_COPYRIGHT.txt
new file mode 100644
index 0000000000..2b3757bb23
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/Orig_COPYRIGHT.txt
@@ -0,0 +1,12 @@
+
+The following text is the original 'COPYRIGHT' file of tkHTML. 
+
+-----------------------------------------------------------------------
+Most of the source code for the Tk Html widget has been place in the
+public domain.  You can do with it whatever you want.  However, some
+files have been copied from other sources and contain copyrights.
+A copyright notice appears separately at the top of each source file.
+-----------------------------------------------------------------------
+
+In this sample, HTML documents are quoted in the 'tests' directory of
+tkHTML source tree. There were no copyright notice in the directory. 
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/README b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/README
new file mode 100644
index 0000000000..1208e270b4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/README
@@ -0,0 +1,12 @@
+
+   [ TkHtml widget example ]
+
+The directory page1 -- page4 are referd from "test" directory of 
+original TkHtml extension's source archive. 
+( see http://www.hwaci.com/sw/tkhtml/index.html )
+
+You can see the HTML documents on the 'hv.rb' or 'ss.rb' sample script.
+
+ e.g. 
+   LD_LIBRARY_PATH=/usr/local/ActiveTcl/lib:$LD_LIBRARY_PATH /usr/local/bin/ruby ./hv.rb page1/index.html
+
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/hv.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/hv.rb
new file mode 100644
index 0000000000..a4d78ea5b1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/hv.rb
@@ -0,0 +1,313 @@
+#!/usr/bin/env ruby
+#
+# This script implements the "hv" application.  Type "hv FILE" to
+# view FILE as HTML.
+#
+# This application is used for testing the HTML widget.  It can
+# also server as an example of how to use the HTML widget.
+# 
+require 'tk'
+require 'tkextlib/tkHTML'
+
+root = TkRoot.new(:title=>'HTML File Viewer', :iconname=>'HV')
+
+file = ARGV[0]
+
+#
+# These images are used in place of GIFs or of form elements
+#
+biggray = TkPhotoImage.new(:data=><<'EOD')
+    R0lGODdhPAA+APAAALi4uAAAACwAAAAAPAA+AAACQISPqcvtD6OctNqLs968+w+G4kiW5omm
+    6sq27gvH8kzX9o3n+s73/g8MCofEovGITCqXzKbzCY1Kp9Sq9YrNFgsAO///
+EOD
+
+smgray = TkPhotoImage.new(:data=><<'EOD')
+    R0lGODdhOAAYAPAAALi4uAAAACwAAAAAOAAYAAACI4SPqcvtD6OctNqLs968+w+G4kiW5omm
+    6sq27gvH8kzX9m0VADv/
+EOD
+
+nogifbig = TkPhotoImage.new(:data=><<'EOD')
+    R0lGODdhJAAkAPEAAACQkADQ0PgAAAAAACwAAAAAJAAkAAACmISPqcsQD6OcdJqKM71PeK15
+    AsSJH0iZY1CqqKSurfsGsex08XuTuU7L9HywHWZILAaVJssvgoREk5PolFo1XrHZ29IZ8oo0
+    HKEYVDYbyc/jFhz2otvdcyZdF68qeKh2DZd3AtS0QWcDSDgWKJXY+MXS9qY4+JA2+Vho+YPp
+    FzSjiTIEWslDQ1rDhPOY2sXVOgeb2kBbu1AAADv/
+EOD
+
+nogifsm = TkPhotoImage.new(:data=><<'EOD')
+    R0lGODdhEAAQAPEAAACQkADQ0PgAAAAAACwAAAAAEAAQAAACNISPacHtD4IQz80QJ60as25d
+    3idKZdR0IIOm2ta0Lhw/Lz2S1JqvK8ozbTKlEIVYceWSjwIAO///
+EOD
+
+#
+# define variables
+#
+ul_hyper = TkVariable.new(0)
+show_tbl = TkVariable.new(0)
+show_img = TkVariable.new(1)
+
+#
+# A font chooser routine.
+#
+# html[:fontcommand] = pick_font
+pick_font = proc{|size, attrs|
+  puts "FontCmd: #{size} #{attrs}"
+  [ ((attrs =~ /fixed/)? 'courier': 'charter'), 
+    (12 * (1.2**(size.to_f - 4.0))).to_i, 
+    ((attrs =~ /italic/)? 'italic': 'roman'), 
+    ((attrs =~ /bold/)? 'bold': 'normal') ].join(' ') 
+} 
+
+#
+# This routine is called for each form element
+#
+form_cmd = proc{|n, cmd, style, *args|
+  # puts "FormCmd: $n $cmd $args"
+  case cmd
+  when 'select', 'textarea', 'input'
+    TkLabel.new(:widgetname=>args[0], :image=>nogifsm)
+  end
+}
+
+#
+# This routine is called for every <IMG> markup
+#
+images   = {}
+old_imgs = {}
+big_imgs = {}
+
+hotkey   = {}
+
+move_big_image = proc{|b|
+  if big_imgs.key?(b)
+    b.copy(big_imgs[b])
+    big_imgs[b].delete
+    big_imgs.delete(b)
+    Tk.update
+  end
+}
+
+image_cmd = proc{|*args|
+  if show_img.bool
+    smgray
+  else
+    fn = args[0]
+
+    if old_imgs.key?(fn)
+      images[fn] = old_imgs[fn]
+      old_imgs.delete(fn)
+      images[fn]
+
+    else
+      begin
+        img = TkPhotoImage.new(:file=>fn)
+      rescue
+        smgray
+      else
+        if img.width * img.height > 20000
+          b = TkPhotoImage.new(:width=>img.width, :height=>img.height)
+          big_imgs[b] = img
+          img = b
+          Tk.after_idle(proc{ move_big_image.call(b) })
+        end
+
+        images[fn] = img
+        img
+      end
+    end
+  end
+}
+
+#
+# This routine is called for every <SCRIPT> markup
+#
+script_cmd = proc{|*args|
+  # puts "ScriptCmd: #{args.inspect}"
+}
+
+# This routine is called for every <APPLET> markup
+#
+applet_cmd = proc{|w, arglist| 
+  # puts "AppletCmd: w=#{w} arglist=#{arglist}"
+  TkLabel.new(w, :text=>"The Applet #{w}", :bd=>2, :relief=>raised)
+}
+
+#
+# Construct the main HTML viewer
+#
+html = Tk::HTML_Widget.new(:padx=>5, :pady=>9, 
+                           :formcommand=>form_cmd, 
+                           :imagecommand=>image_cmd, 
+                           :scriptcommand=>script_cmd, 
+                           :appletcommand=>applet_cmd, 
+                           :underlinehyperlinks=>0, 
+                           :bg=>'white', :tablerelief=>:raised)
+vscr = html.yscrollbar(TkScrollbar.new)
+hscr = html.xscrollbar(TkScrollbar.new)
+
+Tk.grid(html, vscr, :sticky=>:news)
+Tk.grid(hscr,       :sticky=>:ew)
+Tk.root.grid_columnconfigure(0, :weight=>1)
+Tk.root.grid_columnconfigure(1, :weight=>0)
+Tk.root.grid_rowconfigure(0, :weight=>1)
+Tk.root.grid_rowconfigure(1, :weight=>0)
+
+#
+# This procedure is called when the user clicks on a hyperlink.
+#
+priv = {}
+last_file = ''
+
+# Read a file
+#
+read_file = proc{|name|
+  begin
+    fp = open(name, 'r')
+    ret = fp.read(File.size(name))
+  rescue
+    ret = nil
+    fp = nil
+    Tk.messageBox(:icon=>'error', :message=>"fail to open '#{name}'", 
+                  :type=>:ok)
+  ensure
+    fp.close if fp
+  end
+  ret
+}
+
+# Clear the screen.
+#
+clear_screen = proc{
+  html.clear
+  old_imgs.clear
+  big_imgs.clear
+  hotkey.clear
+  images.each{|k, v| old_imgs[k] = v }
+  images.clear
+}
+
+# Load a file into the HTML widget
+#
+load_file = proc{|name|
+  if (doc = read_file.call(name))
+    clear_screen.call
+    last_file = name
+    html.configure(:base=>name)
+    html.parse(doc)
+    old_imgs.clear
+  end
+}
+
+href_binding = proc{|x, y|
+  # koba & dg marking text
+  html.selection_clear
+  priv['mark'] = "@#{x},#{y}"
+  lst = html.href(x, y)
+
+  unless lst.size.zero?
+    lnk, target = lst
+
+    if lnk != ""
+      if lnk =~ /^#{last_file}#(.*)$/
+        html.yview($1)
+      else
+        load_file.call(lnk)
+      end
+    end
+  end
+}
+html.clipping_window.bind('1', href_binding, '%x %y')
+
+# marking text with the mouse and copying to the clipboard just with tkhtml2.0 working
+html.clipping_window.bind('B1-Motion', proc{|w, x, y|
+                            w.selection_set(priv['mark'], "@#{x},#{y}")
+                            TkClipboard.clear
+                            # avoid tkhtml0.0 errors 
+                            # anyone can fix this for tkhtml0.0
+                            begin
+                              TkClipboard.append(TkSelection.get)
+                            rescue
+                            end
+                          }, '%W %x %y')
+
+# This procedure is called when the user selects the File/Open
+# menu option.
+#
+last_dir = Dir.pwd
+sel_load = proc{
+  filetypes = [
+    ['Html Files', ['.html', '.htm']], 
+    ['All Files', '*']
+  ]
+
+  f = Tk.getOpenFile(:initialdir=>last_dir, :filetypes=>filetypes)
+  if f != ''
+    load_file.call(f)
+    last_dir = File.dirname(f)
+  end
+}
+
+# Refresh the current file.
+#
+refresh = proc{|*args|
+  load_file.call(last_file)
+}
+
+# This binding changes the cursor when the mouse move over
+# top of a hyperlink.
+#
+Tk::HTML_Widget::ClippingWindow.bind('Motion', proc{|w, x, y|
+                                       parent = w.winfo_parent
+                                       url = parent.href(x, y)
+                                       unless url.empty?
+                                         parent[:cursor] = 'hand2'
+                                       else
+                                         parent[:cursor] = ''
+                                       end
+                                     }, '%W %x %y')
+#
+# Setup menu
+#
+menu_spec = [
+  [['File', 0], 
+    ['Open',    sel_load, 0], 
+    ['Refresh', refresh,   0], 
+    '---',
+    ['Exit', proc{exit}, 1]], 
+
+  [['View', 0], 
+    ['Underline Hyperlinks', ul_hyper], 
+    ['Show Table Structure', show_tbl], 
+    ['Show Images',          show_img]]
+]
+
+mbar = Tk.root.add_menubar(menu_spec)
+
+#
+# Setup trace
+#
+ul_hyper.trace('w', proc{ 
+                 html[:underlinehyperlinks] = ul_hyper.value
+                 refresh.call
+               })
+
+show_tbl.trace('w', proc{
+                 if show_tbl.bool
+                   html[:tablerelief] = :flat
+                 else
+                   html[:tablerelief] = :raised
+                 end
+                 refresh.call
+               })
+
+show_img.trace('w', refresh)
+
+# If an arguent was specified, read it into the HTML widget.
+#
+Tk.update
+if file && file != ""
+  load_file.call(file)
+end
+
+#####################################
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image1 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image1
new file mode 100644
index 0000000000..31e96b6797
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image1
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image10 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image10
new file mode 100644
index 0000000000..80a8f81686
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image10
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image11 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image11
new file mode 100644
index 0000000000..e8cb01d450
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image11
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image12 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image12
new file mode 100644
index 0000000000..c317bbd5cc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image12
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image13 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image13
new file mode 100644
index 0000000000..ac4b3cd594
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image13
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image14 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image14
new file mode 100644
index 0000000000..c3b02558e3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image14
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image2 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image2
new file mode 100644
index 0000000000..da26d7092e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image2
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image3 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image3
new file mode 100644
index 0000000000..d91cdfafab
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image3
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image4 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image4
new file mode 100644
index 0000000000..5fdf70c0e5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image4
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image5 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image5
new file mode 100644
index 0000000000..67cd14d78d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image5
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image6 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image6
new file mode 100644
index 0000000000..9e05aa0f36
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image6
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image7 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image7
new file mode 100644
index 0000000000..879656d45c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image7
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image8 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image8
new file mode 100644
index 0000000000..8c647c4f00
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image8
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image9 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image9
new file mode 100644
index 0000000000..3a7707589b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/image9
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/index.html b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/index.html
new file mode 100644
index 0000000000..9efac7f7af
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page1/index.html
@@ -0,0 +1,115 @@
+<HTML><HEAD><TITLE>Slashdot:News for Nerds. Stuff that Matters.</TITLE>  </HEAD>
+<BODY bgcolor="#000000" text="#000000" link="#006666" vlink="#000000">
+<center><a href="http://209.207.224.220/redir.pl?1463" target="_top"><img src="image1" alt="Click Here to enter the Sweepstakes" border="2" width="468" height="60"></a></center> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0"><TR><TD WIDTH="1"><SCRIPT LANGUAGE="JAVASCRIPT">
+<!-- now="now" ="" new="new" Date();="Date();" tail="tail" ="" now.getTime();="now.getTime();" document.write("<IMG="document.write("<IMG" SRC="http://209.207.224.245/Slashdot/pc.gif?/slashhead.inc,"+" tail="tail" +="+" "=""" WIDTH="1" HEIGHT="1><BR>");" -->
+</SCRIPT>
+<NOSCRIPT>
+<IMG SRC="image2" WIDTH="1" HEIGHT="1">
+</NOSCRIPT></TD></TR></TABLE><P>
+<TABLE bgcolor="#FFFFFF" cellpadding="0" cellspacing="0" border="0" width="99%" align="center">
+ <TR>
+  <TD valign="top" align="left" valign="top"><A href="http://slashdot.org/"><IMG src="image3" width="275" height="72" border="0" alt="Welcome to Slashdot"></A></TD>
+   <TD><A href="http://slashdot.org/search.pl?topic=linux"><IMG SRC="image4" width="60" height="70" border="0" alt="Linux"></A></TD>
+<TD><A href="http://slashdot.org/search.pl?topic=news"><IMG SRC="image5" width="34" height="44" border="0" alt="News"></A></TD>
+<TD><A href="http://slashdot.org/search.pl?topic=usa"><IMG SRC="image6" width="80" height="61" border="0" alt="United States"></A></TD>
+<TD><A href="http://slashdot.org/search.pl?topic=ed"><IMG SRC="image7" width="87" height="64" border="0" alt="Education"></A></TD>
+<TD><A href="http://slashdot.org/search.pl?topic=space"><IMG SRC="image8" width="73" height="59" border="0" alt="Space"></A></TD>
+
+</TR></TABLE>
+<TABLE width="99%" align="center" cellpadding="0" cellspacing="0" border="0" bgcolor="#FFFFFF"><TR>
+<TD valign="top" rowspan="5"><NOBR><FONT size="2"><B>
+&nbsp;<A href="/faq.shtml">faq</A> <BR>
+&nbsp;<A href="/code.shtml">code</A> <BR>
+&nbsp;<A href="/awards.shtml">awards</A> <BR>
+&nbsp;<A href="http://Andover.Net/privacy.html">privacy</A> <BR>
+&nbsp;<A href="http://slashnet.org">slashNET</A> <BR>
+&nbsp;<A href="/search.pl">older stuff</A> <BR>
+&nbsp;<A href="http://cmdrtaco.net">rob's page</A> <BR>
+&nbsp;<A href="/users.pl?op=preferences">preferences</A> <BR>
+&nbsp;<A href="http://Andover.Net">andover.net</A> <BR>
+&nbsp;<A href="/submit.pl">submit story</A> <BR>
+&nbsp;<A href="/advertising.shtml">advertising</A> <BR>
+&nbsp;<A href="/supporters.shtml">supporters</A> <BR>
+&nbsp;<A href="/pollBooth.pl">past polls</A> <BR>
+&nbsp;<A href="/topics.shtml">topics</A> <BR>
+&nbsp;<A href="/about.shtml">about</A> <BR>
+&nbsp;<A href="/jobs.shtml">jobs</A> <BR>
+&nbsp;<A href="/hof.shtml">hof</A>
+
+</B></FONT></NOBR>
+ <P><TABLE border="0" cellpadding="1" cellspacing="0" align="center" bgcolor="#CCCCCC"><TR>
+  <TD><FONT size="2" color="#000000"><B> Sections</B></FONT></TD></TR>
+ <TR><TD><TABLE border="0" cellspacing="1" cellpadding="1" bgcolor="#FFFFFF" width="100%"><TR><TD><FONT color="#000000" size="2"><NOBR>
+1/23<BR>
+<B><A href="http://slashdot.org/index.pl?section=apache">apache</A></B><BR>
+1/29 (3)<BR>
+<B><A href="http://slashdot.org/index.pl?section=askslashdot">askslashdot</A></B><BR>
+1/27<BR>
+<B><A href="http://slashdot.org/index.pl?section=awards">awards</A></B><BR>
+1/29 (2)<BR>
+<B><A href="http://slashdot.org/index.pl?section=books">books</A></B><BR>
+1/27<BR>
+<B><A href="http://slashdot.org/index.pl?section=bsd">bsd</A></B><BR>
+1/28 (2)<BR>
+<B><A href="http://slashdot.org/index.pl?section=features">features</A></B><BR>
+1/28 (2)<BR>
+<B><A href="http://slashdot.org/index.pl?section=interviews">interviews</A></B><BR>
+1/19<BR>
+<B><A href="http://slashdot.org/index.pl?section=radio">radio</A></B><BR>
+1/27 (2)<BR>
+<B><A href="http://slashdot.org/index.pl?section=science">science</A></B><BR>
+1/28 (3)<BR>
+<B><A href="http://slashdot.org/index.pl?section=yro">yro</A></B><BR> </NOBR></FONT></TD></TR></TABLE><TR>
+  <TD><A href="http://andover.net"><FONT size="2" color="#000000"><B>Andover.Net</B></FONT></A></TD></TR>
+ <TR><TD><TABLE border="0" cellspacing="1" cellpadding="1" bgcolor="#FFFFFF"><TR><TD>
+<FONT color="#000000" size="2"><NOBR><A href="http://www.andovernews.com">AndoverNews</A><BR><A href="http://www.askreggie.com">Ask Reggie</A><BR><A href="http://www.davecentral.com">DaveCentral</A><BR><A href="http://www.freecode.com">FreeCode</A><BR><A href="http://www.mediabuilder.com">MediaBuilder</A><BR> </NOBR></FONT></TD></TR></TABLE></TD></TR></TABLE></P>
+ <P></P>
+</TD><TD valign="top" align="left"><FONT color="#000000"> <TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Who Bought Linux.Net?</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=linux"><IMG src="image4" width="60" height="70" border="0" align="right" hspace="20" vspace="10" alt="Linux"></A> <B>Posted by <A href="http://CmdrTaco.net">CmdrTaco</A> on Saturday January 29, @10:52AM</B><BR> <FONT size="2"><B>from the this-game-again dept.</B></FONT><BR> So Fred VanKampen (who has to hold the record for most money made by reselling two domain names) e-mailed us to say that the Domain Name for 'Linux.Net' has been sold. He won't say to whom, but it supposedly will be announced at LinuxWorld next week. Of course we have no idea what he got for the entry, but the rumors were that he made several million when he sold <A href="http://www.linux.com">Linux.com</A> to <A href="http://www.valinux.com">VA Linux</A>. Hopefully he'll take me for a ride in his yacht. ;) <P><B>( </B><A href="http://slashdot.org/articles/00/01/29/0837235.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/29/0837235&mode=thread&threshold=0">58</A> of <A href="http://slashdot.org/article.pl?sid=00/01/29/0837235&mode=thread&threshold=-1">62</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Book Reviews: E-Mails from (Over?) The Edge</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=news"><IMG src="image5" width="34" height="44" border="0" align="right" hspace="20" vspace="10" alt="News"></A> <B>Posted by <A href="http://hemos.net">Hemos</A> on Saturday January 29, @10:43AM</B><BR> <FONT size="2"><B>from the touching-story dept.</B></FONT><BR> I'd like to thank the author of this book for sending it to me. Nick's written a book that's touching and endearing, and one that's well worth reading for everyone who's ever had social struggles to deal with. As well, his involvement with the fine folks of <a href="http://www.thevenue.org">TheVenue</a>. I'll warn you - it's not a tech text. But it's still worth reading. Click below to read more. <P><B>( </B><A href="http://slashdot.org/books/00/01/24/1146250.shtml"><B>Read More...</B></A> | <A href="http://slashdot.org/article.pl?sid=00/01/24/1146250&mode=nocomment">6197 bytes in body</A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/24/1146250&mode=thread&threshold=0">6</A> of <A href="http://slashdot.org/article.pl?sid=00/01/24/1146250&mode=thread&threshold=-1">22</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Linux Kernel 2.3.41</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=linux"><IMG src="image4" width="60" height="70" border="0" align="right" hspace="20" vspace="10" alt="Linux"></A> <B>Posted by <A href="http://CmdrTaco.net">CmdrTaco</A> on Saturday January 29, @10:21AM</B><BR> <FONT size="2"><B>from the download-compile-reboot-repeat dept.</B></FONT><BR> <A href="mailto:bwhitehead@nospam.acm.org">sdriver</A> writes <I>"For those of us who enjoy *panic*, *oops*, and suddenly seeing their video BIOS... the newest version is out! Be the first on your block to submit a new patch! ;) "</I> If you don't know where to get it, you probably should stick to your warm and cuddly 2.2.x kernel *grin*. Now outta my way, I wanna crash my laptop! <P><B>( </B><A href="http://slashdot.org/articles/00/01/29/0834223.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/29/0834223&mode=thread&threshold=0">52</A> of <A href="http://slashdot.org/article.pl?sid=00/01/29/0834223&mode=thread&threshold=-1">57</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Congress Still Figuring Out E-Mail</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=usa"><IMG src="image6" width="80" height="61" border="0" align="right" hspace="20" vspace="10" alt="United States"></A> <B>Posted by <A href="mailto:roblimo@slashdot.org">Roblimo</A> on Saturday January 29, @07:28AM</B><BR> <FONT size="2"><B>from the voice-of-the-people-can-get-awfully-loud dept.</B></FONT><BR> Jett writes <I>" <A href="http://www.vote.com/">Vote.com</A> has <A href="http://www.vote.com/magazine/editorials/editorial1843752.phtml">an interesting article</A> in their Webmag Fifth Estate about how congressmen have responded to the popularity of e-mail in their daily operations. Quote: 'Of the 440 voting and non-voting House of Representatives members, 22 have no e-mail at all. Even House Speaker Dennis Hastert is wired only halfway -- his office receives e-mail, but does not respond to it. And while all U.S. senators have e-mail, they, like their House counterparts, routinely shun non-constituent mail -- even though they chair committees whose decisions affect the entire country.'"</I> <P><B>( </B><A href="http://slashdot.org/articles/00/01/28/2311232.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/28/2311232&mode=thread&threshold=0">66</A> of <A href="http://slashdot.org/article.pl?sid=00/01/28/2311232&mode=thread&threshold=-1">66</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Ask Slashdot: Sci Fi Literature 101?</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=ed"><IMG src="image7" width="87" height="64" border="0" align="right" hspace="20" vspace="10" alt="Education"></A> <B>Posted by <A href="http://exit118.com/">Cliff</A> on Saturday January 29, @06:56AM</B><BR> <FONT size="2"><B>from the recommendations-wanted dept.</B></FONT><BR> ohlaadee asks: <I>"My niece (she's 13) wants to start reading science fiction. I do too. I gave us both Asimov's </I>_The Foundation_<I>&nbsp; for Christmas. We'll read it together. I suppose we could spend the rest of our lives just reading Asimov, but I'm wondering what books and movies you folks would come up with? What does the /. recommended Science Fiction 101 list include?"</I> <P><B>( </B><A href="http://slashdot.org/askslashdot/00/01/22/1946244.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/22/1946244&mode=thread&threshold=0">345</A> of <A href="http://slashdot.org/article.pl?sid=00/01/22/1946244&mode=thread&threshold=-1">345</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Could Distributed.Net Help the Mars Polar Lander?</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=space"><IMG src="image8" width="73" height="59" border="0" align="right" hspace="20" vspace="10" alt="Space"></A> <B>Posted by <A href="mailto:roblimo@slashdot.org">Roblimo</A> on Saturday January 29, @03:35AM</B><BR> <FONT size="2"><B>from the food-for-thought dept.</B></FONT><BR> Anonymous Coward writes <I>"This official JPL <A href="http://mpfwww.jpl.nasa.gov/msp98/news/mpl000127.html">press release</A> describes the current attempt to listen for faint signals from the Mars Lander. They get three windows a day, and it takes 18 hours to process data because the signal is so weak (if it's really there). Too bad they don't have a deal with <A href="http://www.distributed.net"> distributed.net</A>."</I> Interesting thought. Is anyone at distributed.net or JPL interested in pursuing it? <P><B>( </B><A href="http://slashdot.org/articles/00/01/28/2318246.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/28/2318246&mode=thread&threshold=0">99</A> of <A href="http://slashdot.org/article.pl?sid=00/01/28/2318246&mode=thread&threshold=-1">102</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>iCrave TV Loses Battle against U.S. Broadcasters</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=tv"><IMG src="image10" width="50" height="50" border="0" align="right" hspace="20" vspace="10" alt="Television"></A> <B>Posted by <A href="mailto:roblimo@slashdot.org">Roblimo</A> on Saturday January 29, @12:21AM</B><BR> <FONT size="2"><B>from the shut-down-just-before-the-super-bowl dept.</B></FONT><BR> <A href="mailto:doran@brandx.net">Doran</A> writes <I>"C|Net has <a href="http://news.cnet.com/news/0-1004-200-1535528.html">this story</a> about how the Canadian company <a href="http://www.icravetv.com">iCraveTV.com</a> has lost its latest battle in U.S. courts over whether it can rebroadcast TV signals over the Web. The broadcasters say it's theft, while iCraveTV sez it's just doing what's legal for other cable TV companies in Canada (ie. rebroadcasting TV). Of course, by framing the streaming video iCraveTV is doing more than just rebroadcasting, they're also adding more commercial content, which the broadcasters feel dilutes their TV commercials. "</I> <P><B>( </B><A href="http://slashdot.org/articles/00/01/29/0010203.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/29/0010203&mode=thread&threshold=0">152</A> of <A href="http://slashdot.org/article.pl?sid=00/01/29/0010203&mode=thread&threshold=-1">170</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Win2k Security holes found</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=microsoft"><IMG src="image11" width="75" height="55" border="0" align="right" hspace="20" vspace="10" alt="Microsoft"></A> <B>Posted by <A href="mailto:heunique@slashdot.org">HeUnique</A> on Friday January 28, @04:58PM</B><BR> <FONT size="2"><B>from the and-it's-not-even-out-yet dept.</B></FONT><BR> According to a story posted by <a href="http://www.zdnn.com">ZDNN</a>, <a href="http://www.zdnet.com/zdnn/stories/news/0,4586,2429334,00.html?chkpt=zdnntop">two security holes</a> have been found on Windows 2000, and that's even before the official release of Windows 2000! Administrators who rush to incorporate the patch from MS beware - according to one of the talkback posts on ZDNN, the patch creates a new problem with Windows 2000 news server service. <P><B>( </B><A href="http://slashdot.org/articles/00/01/28/1653228.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/28/1653228&mode=thread&threshold=0">510</A> of <A href="http://slashdot.org/article.pl?sid=00/01/28/1653228&mode=thread&threshold=-1">534</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Encryption Debate at Mitnick Trial</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=encryption"><IMG src="image12" width="80" height="70" border="0" align="right" hspace="20" vspace="10" alt="Encryption"></A> <B>Posted by <A href="http://hemos.net">Hemos</A> on Friday January 28, @03:33PM</B><BR> <FONT size="2"><B>from the gimmie-the-data dept.</B></FONT><BR> A number of people have written about <A HREF="http://nytimes.com/library/tech/00/01/cyber/cyberlaw/28law.html">the latest twist</a> in the Mitnick case. Kevin wants to get his data back, but the government is refusing to do so until he gives them the key. Apparently, the government is unable to crack the encryption that he's got on it - you'd think after having the data for five years, they'd be able to brute-force the darn thing. It's a NYT article - free login required. <P><B>( </B><A href="http://slashdot.org/articles/00/01/28/1320253.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/28/1320253&mode=thread&threshold=0">504</A> of <A href="http://slashdot.org/article.pl?sid=00/01/28/1320253&mode=thread&threshold=-1">521</A> </B>comments <B>)</B> <P><TABLE width="99%" cellpadding="0" cellspacing="0" border="0"><TR><TD valign="top" bgcolor="#006666"><IMG src="image9" width="13" height="16" alt="" align="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Forum: Future Ports of Games to Linux</B></FONT></TD> </TR></TABLE><A href="http://slashdot.org/search.pl?topic=games"><IMG src="image13" width="80" height="56" border="0" align="right" hspace="20" vspace="10" alt="Games"></A> <B>Posted by <A href="http://CmdrTaco.net">CmdrTaco</A> on Friday January 28, @02:26PM</B><BR> <FONT size="2"><B>from the it's-been-awhile dept.</B></FONT><BR> It's been a long time since I posted an open forum like this, but I'm curious what people think on this one. What games do you most want to see ported to Linux in the next few months? Of course, for me personally it's StarCraft and Diablo 2, but I'm curious what games have come out or are due soon that people would most like to see a port of (and note that WINE doesn't count. ;) <P><B>( </B><A href="http://slashdot.org/articles/00/01/28/1257211.shtml"><B>Read More...</B></A> | <B><A href="http://slashdot.org/article.pl?sid=00/01/28/1257211&mode=thread&threshold=0">648</A> of <A href="http://slashdot.org/article.pl?sid=00/01/28/1257211&mode=thread&threshold=-1">652</A> </B>comments <B>)</B> <P></TD><TD width="210" align="center" valign="top"><TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B><A HREF="/index.pl?section=features"><FONT COLOR="#FFFFFF">Features</FONT></A></B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><A href="/vote.pl">Voting has begun</A> for the $100k <A href="/index.pl?section=awards">Slashdot Beanie Awards</A>. Talk amongst yourselves and choose who deserves the cash. <P>The latest installment of <A href="http://www.thesync.com/geeks">Geeks in Space</A> is up at <A href="http://www.thesync.com">The Sync</A>. Listen to CmdrTaco, Hemos, and Nate talk about the latest events to happen - or not happen in the computer world. <P>Perhaps you are seeking Jon Katz's series of articles related to recent events in Colorado. These articles include <A href="/article.pl?sid=99/04/25/1438249">Voices from the Hellmouth</A>, <A href="/article.pl?sid=99/04/27/0310247">More Stories from the Hellmouth</A> or <A href="/article.pl?sid=99/04/29/0124247">The Price of Being Different</A>, <P>For something different, try reading a little essay <A href="/article.pl?sid=99/03/31/0137221">Thoughts from the Furnace</A> about the internet, and flame. <p> And for a bit of an amusing take on the Open Source world, check out <a href="/article.pl?sid=99/08/24/1327256&mode=thread">Open Source as an Ant Farm</a> <P><B>Update: 01/03 03:10</B> by <B><A href="http://cowboyneal.org">CowboyNeal</a></B>: <P align="right"><B><A href="/features/">Past Features</A></B> <!-- end="end" features="features" block="block" --></FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B><A HREF="http://slashdot.org/index.pl?section=askslashdot"><FONT COLOR="#FFFFFF">Ask Slashdot</FONT></A></B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1946244">Sci Fi Literature 101?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/192226">Linux and Satellite Internet Services</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1843258">Open Defensive Patents?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1825252">Technologies That Shaped the Last Century?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1958212">Disk Repair Tools for Linux?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1955215">Why Can't the Command-Line be More Standardized?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1928235">Packet Radio Networking with PalmOS?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1817211">Cheap Rackmount Enclosures/Systems?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1950249">Open Source Software and Tax Breaks?</A> <li><A HREF="http://slashdot.org/article.pl?sid=00/01/22/1917207">Building an Upgradable Dual Processor System</A> <P> if you have a question for Ask Slashdot, send it to <A href="mailto:askslashdot@slashdot.org">askslashdot@slashdot.org</A></FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B><A HREF="/users.pl"><FONT COLOR="#FFFFFF">Slashdot Login</FONT></A></B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><FORM action="/users.pl" METHOD="POST"> <B>Nickname:</B><BR> <INPUT type="text" name="unickname" size="20" value=""><BR> <B>Password:</B><BR> <INPUT type="hidden" name="returnto" value="index.pl"> <INPUT type="password" name="upasswd" size="20"><BR> <INPUT type="submit" name="op" value="userlogin"> </FORM> Don't have an account yet? <A href="/users.pl">Go Create One</A>. A user account will allow you to customize all these <A href="/cheesyportal.shtml">nutty little boxes</A>, tailor the stories you see, as well as remember your comment viewing preferences.</FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Slashdot Poll</B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><FORM action="http://slashdot.org/pollBooth.pl"> <INPUT type="hidden" name="qid" value="techadvance"> <B>The Tech Advance I Most Want Is:</B><BR><INPUT type="radio" name="aid" value="1">Nanotechnology<BR><INPUT type="radio" name="aid" value="2">Cold Fusion<BR><INPUT type="radio" name="aid" value="3">Powerful Fuel Cells<BR><INPUT type="radio" name="aid" value="4">Hard Wiring my Body<BR><INPUT type="radio" name="aid" value="5">Universal Strong Crypto<BR><INPUT type="radio" name="aid" value="6">Interstellar Travel<BR><INPUT type="radio" name="aid" value="7">Cybernetic Body Armor<BR><INPUT type="radio" name="aid" value="8">ColecoVision<BR><INPUT type="submit" value="Vote"> [ <A href="http://slashdot.org/pollBooth.pl?qid=techadvance&aid=-1"><B>Results</B></A> | <A href="http://slashdot.org/pollBooth.pl?"><B>Polls</B></A> ] <BR>Comments:<B>656</B> | Votes:<B>29121</B></FORM> </FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Older Stuff</B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><P><B><A href="http://slashdot.org/index.pl?section=&issue=730512&mode=thread"><FONT size="4">Friday</FONT></A> January 28</B> <LI><A href="http://slashdot.org/articles/00/01/28/1110258.shtml">Abstract Programming and GPL Enforcement</A> (235) <LI><A href="http://slashdot.org/interviews/00/01/28/1225206.shtml">Interview: FreeDOS Leader Jim Hall Answers</A> (86) <LI><A href="http://slashdot.org/articles/00/01/28/116240.shtml">Open Source's Achilles Heel</A> (466) <LI><A href="http://slashdot.org/features/00/01/26/1915230.shtml">The Virtue of Communal Instincts</A> (237) <LI><A href="http://slashdot.org/articles/00/01/28/0723223.shtml">Gartner Group Debunking Open Source Myths</A> (165) <LI><A href="http://slashdot.org/yro/00/01/28/0917229.shtml">DoubleClick Taken to Court</A> (310) <LI><A href="http://slashdot.org/articles/00/01/28/0718209.shtml">Updated Slash & Server 51</A> (81) <LI><A href="http://slashdot.org/articles/00/01/28/089230.shtml">XMMS 1.0.0 Released</A> (128) <LI><A href="http://slashdot.org/askslashdot/00/01/22/192226.shtml">Linux and Satellite Internet Services</A> (138) <LI><A href="http://slashdot.org/articles/00/01/27/1811221.shtml">UN Wants to Combat Online Racism</A> (531) <P><B><A href="http://slashdot.org/index.pl?section=&issue=730511&mode=thread"><FONT size="4">Thursday</FONT></A> January 27</B> <LI><A href="http://slashdot.org/yro/00/01/27/2330205.shtml">Crackdowns, Fools and the MPAA</A> (351) <LI><A href="http://slashdot.org/articles/00/01/27/0832215.shtml">Heroes of Might and Magic III Demo Released</A> (157) <LI><A href="http://slashdot.org/science/00/01/27/1345241.shtml">Sandia Labs Venture Into Nanotechnology</A> (117) <LI><A href="http://slashdot.org/articles/00/01/27/0931237.shtml">CA Announces Program Ports to Linux</A> (195) <LI><A href="http://slashdot.org/interviews/00/01/27/1118251.shtml">Interview: Larry Augustin Finally Answers</A> (210) <LI><A href="http://slashdot.org/awards/00/01/27/0855252.shtml">Final Call for Voting in Slashdot's Beanie Awards</A> (178) <LI><A href="http://slashdot.org/features/00/01/26/197211.shtml">Transmeta Code Morphing != Just In Time</A> (449) <LI><A href="http://slashdot.org/books/00/01/24/1150256.shtml">Intrusion Detection</A> (65) <LI><A href="http://slashdot.org/science/00/01/27/0824239.shtml">Using Enzymes to Help Fight CO2 Build-Up</A> (165) <LI><A href="http://slashdot.org/articles/00/01/27/0712217.shtml">Jon Johansen on ABC World News Tonight</A> (415) <P align="right"><BR><A href="http://slashdot.org/search.pl?section=&min=30"><B>Older Articles</B></A><BR><A href="http://slashdot.org/index.pl?section=&mode=thread&issue=730512"><B>Yesterday's Edition</B></A> </FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B><A HREF="/index.pl?section=books"><FONT COLOR="#FFFFFF">Book Reviews</FONT></A></B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><p>Jon Katz, Resident Gasbag, has a new, very appropriate book coming out soon, <a href="http://www.thinkgeek.com">Geeks</a>. Preorder now and receive the book early. <p>For probably the best fiction read around, check out Neal Stephenson's <cite><a href="/article.pl?sid=99/06/23/139229&mode=thread">Cryptonomicon</a></cite>, an engaging read about WWII, cryptography and buried treasure. And data vaults. <p>If you've been doing a lot of work in Perl, you've probably figured out you really need <cite><a href="/article.pl?sid=99/05/10/2238254&mode=thread">Perl in a Nutshell</a></cite> or <cite><a href="/article.pl?sid=99/01/29/1035246&mode=thread">The Perl Cookbook</a></cite>. If you're still learning, grab <cite><a href="/books/older/980526096229.shtml">Programming Perl</a></cite>. <p>And if you want to learn more about how to become a better coder, grab <cite><a href="/article.pl?sid=99/06/28/1417229&mode=thread">The Unified Software Development Process</a></cite> or <cite><a href="/article.pl?sid=99/04/08/1512209&mode=thread">The Practice of Programming</cite></a> Additionally, check out <cite><a href="http://slashdot.org/article.pl?sid=99/09/16/1333202&mode=thread">Refactoring: Improving the Design of Existing Code</a></cite> . <p>Developing a large application? Grab Eric Greenberg's excellent <cite><a href="/article.pl?sid=99/07/13/1943258&mode=thread">Network Application Frameworks</cite></a>. <P>Visit <A href="/index.pl?section=books">Our Book Reviews Section</A> for more. <br> <B>Update: 11/12 05:19</B> by <B><A href="mailto:hemos@slashdot.org">H</A></B>:</FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B>Quick Links</B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><B>Cool Sites:</B> <LI><A href="http://www.linux.com">Linux.com</A> (What <B>is</B> Linux?) <LI><A href="http://everything.blockstackers.com">Everything</A> (Blow your Mind) <LI><A href="http://www.geekculture.com/geekycomics/Aftery2k/aftery2kmain.html">After Y2k</A> (<I>This</I> is Post-Apocalyptic?) <LI><A href="http://www.userfriendly.org">User Friendly</A> (Laugh) <LI><A href="http://themes.org">Themes.org</A> (Make X Perty) <P><B>Support Slashdot:</B> <LI><A href="http://www.thinkgeek.com">ThinkGeek</A> (Clothe Yourself in Slashdot) <LI><A href="http://cdnow.com/from=sr-302791">CDnow</A> (Support <A href="http://www.cdnow.com/gift/malda@slashdot.org">Rob's Who Habit</A>) <LI><A href="http://adfu.slashdot.org">Slashdot Advertiser Index</A></FONT></TD> </TR> </TABLE><P> <TABLE cellpadding="1" cellspacing="0" border="0" width="200" align="center"> <TR bgcolor="#006666"> <TD valign="top"><FONT size="4" color="#FFFFFF" face="arial,helvetica"><B><A HREF="http://freshmeat.net"><FONT COLOR="#FFFFFF">Freshmeat</FONT></A></B></FONT></TD> </TR><TR><TD bgcolor="#CCCCCC"><FONT color="#000000" size="2"><P><FONT size="4" color="#006666"><B>January</B></FONT><BR> <LI><A href="http://freshmeat.net/news/2000/01/29/949208399.html">We should get this out of the door now</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949159642.html">Is Linux for Crazies?</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949156343.html">SQN Linux 1.6</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949156277.html">Limo 0.3.2</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949156237.html">Fusion GS 1.3</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949145887.html">MMR 1.5.4</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949142835.html">KUPS 0.3.4</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949142815.html">3DSE patch for XMMS 4</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949139763.html">Linux 2.3.41</A> <LI><A href="http://freshmeat.net/news/2000/01/29/949139751.html">Free Code for Linux S/390</A> <FORM METHOD="post" ACTION="http://core.freshmeat.net/search.php3"> <FONT size="3" color="#006666"><B>Search Freshmeat:</B></FONT><BR> <INPUT TYPE="hidden" NAME="link" VALUE="freshmeat.net"> <INPUT TYPE="text" NAME="query"> </FORM> <P align="right"><A href="http://freshmeat.net"><B>More Meat...</B></A></FONT></TD> </TR> </TABLE><P> </FONT></TD>
+         </TR>
+        </TABLE><TABLE cellpadding="0" cellspacing="0" border="0" width="99%" align="center" bgcolor="ffffff">
+            <TR>
+             <TD colspan="4" align="center"><IMG src="image14" alt="" width="80%" height="1" hspace="10" vspace="30"></TD>
+            </TR><TR>
+             <TD align="center"><FONT size="2" face="arial,helvetica">
+  <FORM method="GET" action="http://slashdot.org/search.pl">
+         <INPUT type="name" name="query" value="" width="20" size="20" length="20">
+        <INPUT type="submit" value="Search">
+  </FORM>
+  </FONT>
+  </TD>
+  <TD bgcolor="#ffffff" width="25">  &nbsp; </TD>
+  <TD align="center">
+    <FONT size="2" face="arial,helvetica"><I>Wasn't there something about a PASCAL programmer knowing the value of
+everything and the Wirth of nothing?
+<TD>&nbsp;</TD></I></FONT>
+    </FONT>
+  </TD></TR>
+  <TR><TD colspan="4" align="center">
+  <FONT size="1" color="#006666" face="arial,helvetica">
+
+ All trademarks and copyrights on this
+  page are owned by their respective owners.  Comments
+  are owned by the Poster.
+  The Rest � 1997-2000 <A href="http://Andover.Net">Andover.Net</A>.
+</FONT></CENTER>
+             </TD>
+            </TR>
+           </TABLE>
+        <CENTER>
+          <FONT size="2" color="#006666">
+
+         [ <A href="http://slashdot.org/"><Font color="#ffffff">home</FONT></A> |
+         <A href="http://slashdot.org/awards.shtml"><Font color="#ffffff">awards</FONT></A> |
+         <A href="http://slashdot.org/supporters.shtml"><FONT color="#ffffff">supporters</FONT></A> |
+         <A href="http://CmdrTaco.net"><FONT color="#ffffff">rob's homepage</FONT></A> |
+         <A href="http://slashdot.org/submit.pl"><FONT color="#ffffff">contribute story</FONT></A> |
+         <A href="http://slashdot.org/search.pl"><FONT color="#ffffff">older articles</FONT></A> |
+         <A href="http://Andover.Net"><FONT color="#ffffff">Andover.Net</FONT></A> |
+         <A href="http://slashdot.org/advertising.shtml"><FONT color="#ffffff">advertising</FONT></A> |
+         <A href="http://slashdot.org/pollBooth.pl"><FONT color="#ffffff">past polls</FONT></A> |
+         <A href="http://slashdot.org/about.shtml"><FONT color="#ffffff">about</FONT></A> |
+         <A href="http://slashdot.org/faq.shtml"><FONT color="#ffffff">faq</FONT></A> ]
+           </FONT>
+          </CENTER>
+</BODY>
+</HTML>
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image1 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image1
new file mode 100644
index 0000000000..2ed6ddcfe1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image1
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image10 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image10
new file mode 100644
index 0000000000..3021b68990
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image10
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image11 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image11
new file mode 100644
index 0000000000..41d1fe3666
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image11
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image12 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image12
new file mode 100644
index 0000000000..655a686541
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image12
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image13 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image13
new file mode 100644
index 0000000000..97d5950e8c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image13
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image14 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image14
new file mode 100644
index 0000000000..6d73ad833c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image14
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image15 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image15
new file mode 100644
index 0000000000..90cc3b2b16
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image15
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image16 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image16
new file mode 100644
index 0000000000..93aa853cf1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image16
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image17 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image17
new file mode 100644
index 0000000000..f46f0308cd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image17
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image18 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image18
new file mode 100644
index 0000000000..3badd5e909
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image18
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image19 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image19
new file mode 100644
index 0000000000..bd4f6d9677
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image19
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image2 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image2
new file mode 100644
index 0000000000..7566dda25d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image2
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image20 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image20
new file mode 100644
index 0000000000..358fa95f63
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image20
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image21 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image21
new file mode 100644
index 0000000000..c81aa52588
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image21
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image22 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image22
new file mode 100644
index 0000000000..6cbd63022a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image22
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image23 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image23
new file mode 100644
index 0000000000..e8173a7456
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image23
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image24 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image24
new file mode 100644
index 0000000000..bffd4b4956
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image24
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image25 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image25
new file mode 100644
index 0000000000..c656fa4f30
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image25
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image26 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image26
new file mode 100644
index 0000000000..bc93fdb259
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image26
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image27 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image27
new file mode 100644
index 0000000000..6ad0eff1e7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image27
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image28 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image28
new file mode 100644
index 0000000000..88f0d7cea6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image28
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image29 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image29
new file mode 100644
index 0000000000..e0704183b3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image29
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image3 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image3
new file mode 100644
index 0000000000..ac3fa33e6f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image3
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image30 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image30
new file mode 100644
index 0000000000..4a41950434
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image30
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image31 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image31
new file mode 100644
index 0000000000..60f13ed564
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image31
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image32 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image32
new file mode 100644
index 0000000000..04ddc4e8d7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image32
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image33 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image33
new file mode 100644
index 0000000000..c1ecfff6c4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image33
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image34 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image34
new file mode 100644
index 0000000000..3dfd5d76e2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image34
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image35 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image35
new file mode 100644
index 0000000000..aea44f3017
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image35
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image36 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image36
new file mode 100644
index 0000000000..baef0e0380
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image36
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image37 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image37
new file mode 100644
index 0000000000..6c6ba52b45
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image37
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image38 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image38
new file mode 100644
index 0000000000..e298e04b29
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image38
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image39 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image39
new file mode 100644
index 0000000000..e16e2f10d5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image39
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image4 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image4
new file mode 100644
index 0000000000..9e5e46b7e5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image4
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image5 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image5
new file mode 100644
index 0000000000..646a6d9a51
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image5
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image6 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image6
new file mode 100644
index 0000000000..7df417c710
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image6
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image7 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image7
new file mode 100644
index 0000000000..0e6ac10aff
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image7
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image8 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image8
new file mode 100644
index 0000000000..ba7fb476b9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image8
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image9 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image9
new file mode 100644
index 0000000000..b1cad73ae9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/image9
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/index.html b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/index.html
new file mode 100644
index 0000000000..7eaf2d2cc9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page2/index.html
@@ -0,0 +1,433 @@
+<html>
+<head>
+  <title>Tcl Resource Center</title>
+</head>
+
+<body bgcolor="white" text="black">
+
+    <!-- MenuTopLevel Resource Software Extensions -->
+    <table border="0" cellpadding="0" cellspacing="0">
+      <tr>
+        <td width="120" valign="TOP"><a href="/"><img src="image1" width="120" height="79" alt="Scriptics" border="0"></a></td>
+        <td valign="top" width="548">
+        
+          <!-- Table to hold tabs -->
+          <table cellpadding="0" cellspacing="0" border="0" width="548">
+            <tr>
+              <td valign="top" align="right" colspan="15" width="548"><a name="TOP"><img src="image2" width="548" height="9" alt="Tcl/Tk" border="0"></a></td>
+            </tr>
+            <tr>
+              <td valign="top" align="right" colspan="15" width="548"><img src="image3" width="482" height="34" alt="Scripting Solutions for eBusiness Integration" border="0"></td>
+            </tr>
+            <tr>
+              <td width="18" valign="TOP"><img src="image4" width="18" height="36" alt="" border="0"></td>
+              <td width="58"><a href="/products/" onMouseOver="msover(4, 'http://images.scriptics.com/images/ProductsMouseOff.gif') ; return true ;" onMouseOut="msover(4, 'http://images.scriptics.com/images/ProductsOff.gif') ; return true ;"><img src="image5" width="58" height="36" alt="Products" border="0"></a></td>
+              <td width="14" valign="TOP"><img src="image6" width="14" height="36" alt="" border="0"></td>
+              <td width="69"><a href="/customers/" onMouseOver="msover(6, 'http://images.scriptics.com/images/CustomersMouseOff.gif') ; return true ;" onMouseOut="msover(6, 'http://images.scriptics.com/images/CustomersOff.gif') ; return true ;"><img src="image7" width="69" height="36" alt="Customers" border="0"></a></td>
+              <td width="14" valign="TOP"><img src="image6" width="14" height="36" alt="" border="0"></td>
+              <td width="60"><a href="/partners/" onMouseOver="msover(8, 'http://images.scriptics.com/images/PartnersMouseOff.gif') ; return true ;" onMouseOut="msover(8, 'http://images.scriptics.com/images/PartnersOff.gif') ; return true ;"><img src="image8" width="60" height="36" alt="Partners" border="0"></a></td>
+              <td width="14" valign="TOP"><img src="image6" width="14" height="36" alt="" border="0"></td>
+              <td width="56"><a href="/services/" onMouseOver="msover(10, 'http://images.scriptics.com/images/ServicesMouseOff.gif') ; return true ;" onMouseOut="msover(10, 'http://images.scriptics.com/images/ServicesOff.gif') ; return true ;"><img src="image9" width="56" height="36" alt="Services" border="0"></a></td>
+              <td width="14" valign="TOP"><img src="image10" width="14" height="36" alt="" border="0"></td>
+              <td width="88"><a href="/resource/" onMouseOver="msover(12, 'http://images.scriptics.com/images/ResourceMouseOn.gif') ; return true ;" onMouseOut="msover(12, 'http://images.scriptics.com/images/ResourceOn.gif') ; return true ;"><img src="image11" width="88" height="36" alt="Tcl Resources" border="0"></a></td>
+              <td width="14" valign="TOP"><img src="image12" width="14" height="36" alt="" border="0"></td>
+              <td width="57"><a href="/company/" onMouseOver="msover(14, 'http://images.scriptics.com/images/CompanyMouseOff.gif') ; return true ;" onMouseOut="msover(14, 'http://images.scriptics.com/images/CompanyOff.gif') ; return true ;"><img src="image13" width="57" height="36" alt="Company" border="0"></a></td>
+              <td width="8" valign="TOP"><img src="image14" width="8" height="36" alt="" border="0"></td>
+              <td width="50" valign="TOP"><img src="image15" width="50" height="36" alt="" border="0"></td>
+              <td width="14" valign="TOP"><img src="image16" width="14" height="36" alt="" border="0"></td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table> <script language="Javascript">
+   <!--
+	function msover(num, file )
+	{
+	    old = (((navigator.appName=='Netscape') &&
+	              (parseInt(navigator.appVersion)<=3.0 )))
+	  if ( !old ) {
+		document.images[num].src=file
+	  }
+        }
+	//-->
+   </SCRIPT> 
+	
+<!-- MenuSubLevel Resource Software Extensions Tk -->
+
+<table cellpadding="0" cellspacing="0" border="0">
+
+<!-- Left Hand Column-->
+
+<tr><td valign="top" width="120"><table cellpadding="0" cellspacing="0" border="0" width="120">
+    <tr>
+      <td width="120" valign="TOP"><img src="image17" width="120" height="4" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/resource/software/"><img src="image18" width="120" height="11" alt="Software" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image19" width="120" height="4" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/resource/software/tcltk/"><img src="image20" width="120" height="11" alt="Tcl/Tk Core" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image19" width="120" height="4" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/resource/software/applications/"><img src="image21" width="120" height="11" alt="Applications" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image22" width="120" height="4" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/resource/software/extensions/"><img src="image23" width="120" height="11" alt="Extensions" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image24" width="120" height="6" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/resource/software/patches/"><img src="image25" width="120" height="11" alt="Patches" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image19" width="120" height="4" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/resource/software/java/"><img src="image26" width="120" height="11" alt="Tcl &amp; Java" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image19" width="120" height="4" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/resource/software/ports/"><img src="image27" width="120" height="11" alt="Tcl/Tk Ports" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image19" width="120" height="4" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/resource/software/tools/"><img src="image28" width="120" height="11" alt="Tools" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image29" width="120" height="6" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/resource/doc/"><img src="image30" width="120" height="11" alt="Documentation" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image31" width="120" height="5" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/resource/community/"><img src="image32" width="120" height="11" alt="Community" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image31" width="120" height="5" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/live/bydate"><img src="image33" width="120" height="11" alt="What's New" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image31" width="120" height="5" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/forms/urlnote.html"><img src="image34" width="120" height="11" alt="Add URL" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image31" width="120" height="5" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/live/keyword"><img src="image35" width="120" height="11" alt="Keyword Search" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image31" width="120" height="5" alt="" border="0"></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><a href="/live/sitemap"><img src="image36" width="120" height="11" alt="Index" border="0"></a></td>
+    </tr>
+    <tr>
+      <td width="120" valign="TOP"><img src="image37" width="120" height="6" alt="" border="0"></td>
+    </tr>
+</table><!-- End Left Column --></td><!-- Right Hand Column --><td valign="top" width="548" align="left"><table cellpadding="0" cellspacing="0" border="0" width="548">
+    <tr>
+      <td width="295" valign="TOP"><img src="image38" width="295" height="42" alt="Resource" border="0"></td>
+      <td width="187" valign="bottom" align="right"><FORM action="/live/keyword"><img src="image39" width="46" height="24" alt="" border="0"><INPUT TYPE="TEXT" SIZE="10" MAXLENGTH="35" NAME="keywords"><INPUT type="IMAGE" border="0" img="img" src="http://images.scriptics.com/images/Go.gif" value="submit" width="33" height="24"></FORM>
+    </tr>
+  </table>
+  <!-- 2 Columns for spacer -->
+  <table cellpadding="0" cellspacing="0" border="0" width="548">
+    <tr>
+      <!-- Spacer Column -->
+      <td valign="top" width="10">
+      &nbsp;
+      </td>
+
+
+      <td valign="top" width="548"><font face="Geneva, Helvetica, Arial" size="2"><h1>Tcl Resource Center</h1>
+<font size="+1"><a href="/resource/">Top</a>&gt;<a href="/resource/software/" ="">Software Central</a>&gt;<a href="/resource/software/extensions/" ="">Extensions</a>&gt;Tk Widgets</font><font size="-1"><br>Viewed by name (<a href="/resource/software/extensions/tk/?sortby=date">By date</a>)</font><br>
+<p>Tk is a toolkit for building graphical user interfaces with Tcl.
+    Your Tcl/Tk scripts run on UNIX, Windows, and Macintosh.<p>
+<font face="Geneva, Helvetica, Arial"><ul></ul></font><dl>
+<dt><b><a href="http://marge.phys.washington.edu/%7Ezager/blt80-unoff-exe.zip" ="">BLT 8.0 Unofficial zip and DLL</a></b>
+<dd>This is a compiled version of BLT 8.0 "unofficial" for
+the Windows platform. <a href="/live/annotate?url=http%3a%2f%2fmarge%2ephys%2ewashington%2eedu%2f%257Ezager%2fblt80%2dunoff%2dexe%2ezip">Edit</a>
+ <i><font size="-1">(September 24, 1999 06:31)</font></i><dt><b><a href="ftp://ftp.neosoft.com/languages/tcl/sorted/unknown/blt8.0p2-unoff.tgz" ="">BLT 8.0p2 Unofficial tar file</a><a name="bltunoff"></a></b>
+<dd>This is a contributed patch to make BLT compatible with Tcl/Tk 8.0p2.  While still "unofficial", it is widely used.
+    Make sure you get the 8.0p2 version because the 8.0 version does
+    not compile under windows.
+    There is also a <a href="ftp://ftp.neosoft.com/languages/sorted/devel/blt2.3-8.1.tar.gz">2.3-8.1 version</a> that has been patched to work with 8.1.
+    <a href="ftp://ftp.neosoft.com/languages/tcl/sorted/unknown/blt8.0p2-unoff.README">README file</a>. <a href="/live/annotate?url=ftp%3a%2f%2fftp%2eneosoft%2ecom%2flanguages%2ftcl%2fsorted%2funknown%2fblt8%2e0p2%2dunoff%2etgz">Edit</a>
+ <i><font size="-1">(August 30, 1999 06:38)</font></i><dt><b><a href="http://www.tcltk.com/blt/" ="">BLT Home Page</a></b>
+<dd>
+			Author <b>George Howlett</b>, Version <b>2.3</b>,
+			Works with <b>Tk 4.1 through Tk 8.1</b>
+<br><a href="ftp://ftp.tcltk.com/pub/blt/">Download</a>, <a href="ftp://ftp.tcltk.com/pub/blt/BLT2.3.tar.gz">BLT2.3.tar.gz</a>, <a href="ftp://ftp.tcltk.com/pub/blt/BLT2.4h.tar.gz">BLT2.4h.tar.gz</a>, <a href="ftp://ftp.tcltk.com/pub/blt/BLT2.4i.tar.gz">BLT2.4i.tar.gz</a>, <a href="ftp://ftp.tcltk.com/pub/blt/blt2.4i-for-8.0.exe">blt2.4i-for-8.0.exe</a>, <a href="ftp://ftp.tcltk.com/pub/blt/blt2.4i-for-8.1.exe">blt2.4i-for-8.1.exe</a><br>BLT is a set of widgets for Tk, including a graph widget,
+bar chart, drag&drop, a simple command tracer, and much more.
+The 2.4 release, which is still under development, works with 8.0
+or higher.
+There are also an "<a href="#bltunoff">unofficial</a>" release for 8.0p2
+and 8.1a2 that were not done by the author. <a href="/live/annotate?url=http%3a%2f%2fwww%2etcltk%2ecom%2fblt%2f">Edit</a>
+ <i><font size="-1">(October 26, 1999 09:43)</font></i><dt><b><a href="http://www.unifix-online.com/BWidget/index.html" ="">BWidget</a></b>
+<dd>A set of native Tk 8.x Widgets using Tcl8.x namespaces. 
+The ToolKit is available under Unix/X11 and Windows.
+The BWidget(s) have a professional look&feel as in other 
+well known Toolkits (Tix or Incr Widget) but the concept is 
+radically different because everything is native 
+so no platform compilation, no compiled extension
+library are needed. The code is 100 Pure Tcl/Tk. 
+More 30 components : Notebook, PageManager, Tree, PanedWindow, ButtonBox,
+ScrollView, ComboBox, SpinBox, ListBox, SelectFont, SelectColor,
+ProgressBare ... <a href="/live/annotate?url=http%3a%2f%2fwww%2eunifix%2donline%2ecom%2fBWidget%2findex%2ehtml">Edit</a>
+ <i><font size="-1">(September 06, 1999 09:58)</font></i><dt><b><a href="http://purl.oclc.org/net/nijtmans/dash.html" ="">Dash Patch for Tk</a></b>
+<dd>This patch has many enhancements to the Tk and its canvas
+widget, including dashed lines, smoothed polygons,
+and performance enhancements. <a href="/live/annotate?url=http%3a%2f%2fpurl%2eoclc%2eorg%2fnet%2fnijtmans%2fdash%2ehtml">Edit</a>
+ <i><font size="-1">(November 21, 1999 06:33)</font></i><dt><b><a href="http://www.hwaci.com/sw/et" ="">Embedded Tk (et)</a></b>
+<dd>
+			Author <b><a href="mailto:drh@acm.org" ="">Richard Hipp</a></b>, Version <b>8.0b5</b>,
+			Works with <b>Tk 4.0, 4.1, 4.2, 8.0</b>
+<br>Download: <a href="http://www.hwaci.com/sw/et/et80b5.tar.gz">et80b5.tar.gz</a><br>Embedded Tk or ``ET'' is tool for making stand-alone executables out of a mixture of C or C++ and Tcl/Tk.
+Using ET you can invoke a short Tcl/Tk script in the middle of a C routine, or you can invoke a C routine in the
+middle of a Tcl/Tk script. ET also bundles external Tcl/Tk scripts (including the standard Tcl/Tk startup scripts)
+into the executable so that the executable can be run on another binary-compatible computer that doesn't have
+Tcl/Tk installed.  <a href="/live/annotate?url=http%3a%2f%2fwww%2ehwaci%2ecom%2fsw%2fet">Edit</a>
+ <i><font size="-1">(August 19, 1999 15:35)</font></i><dt><b><a href="http://www.purl.org/net/hobbs/tcl/script/tkcon/" ="">Enhanced Tk Console (TkCon)</a></b>
+<dd>
+			Author <b><a href="mailto:jeffrey.hobbs@oen.siemens.de" ="">Jeff Hobbs</a></b>, Version <b>1.3</b>,
+			Works with <b>Tk 4.1 through Tk 8.1</b>
+<br>Download: <a href="http://www.purl.org/net/hobbs/tcl/script/tkcon/tkcon.tar.gz">tkcon.tar.gz</a><br>TkCon is a replacement for the standard console that comes with Tk (on Windows/Mac, but also works on
+
+Unix). The console itself provides many more features than the standard console.  <a href="/live/annotate?url=http%3a%2f%2fwww%2epurl%2eorg%2fnet%2fhobbs%2ftcl%2fscript%2ftkcon%2f">Edit</a>
+ <i><font size="-1">(August 23, 1999 12:06)</font></i><dt><b><a href="http://www.scriptmeridian.org/projects/tk/" ="">Frontier-Tk ScriptMeridian project</a></b>
+<dd>This project seeks to integrate the Tk toolkit
+with the Frontier scripting language. <a href="/live/annotate?url=http%3a%2f%2fwww%2escriptmeridian%2eorg%2fprojects%2ftk%2f">Edit</a>
+ <i><font size="-1">(August 19, 1999 15:36)</font></i><dt><b><a href="http://purl.oclc.org/net/nijtmans/img.html" ="">Img image format extension</a></b>
+<dd>This package enhances Tk, adding support for many other Image formats: 
+BMP, XBM, XPM, GIF (with transparency), PNG,
+JPEG, TIFF and postscript.
+This is implemented as a shared library that can be dynamically loaded into 
+Tcl/Tk.
+ <a href="/live/annotate?url=http%3a%2f%2fpurl%2eoclc%2eorg%2fnet%2fnijtmans%2fimg%2ehtml">Edit</a>
+ <i><font size="-1">(November 21, 1999 06:35)</font></i><dt><b><a href="http://purl.oclc.org/net/oakley/tcl/mclistbox/index.html" ="">mclistbox - a multi-column listbox widget</a></b>
+<dd>mclistbox is a multi-column listbox that is
+written in pure tcl and runs on all platforms
+that support tcl/tk 8.0 or higher. This widget
+requires no other extensions; it is completely
+standalone. <a href="/live/annotate?url=http%3a%2f%2fpurl%2eoclc%2eorg%2fnet%2foakley%2ftcl%2fmclistbox%2findex%2ehtml">Edit</a>
+ <i><font size="-1">(August 19, 1999 15:37)</font></i><dt><b><a href="http://home.t-online.de/home/dshepherd/tkview.htm" ="">MFC views C++ class for embedding Tk</a></b>
+<dd>The idea of embedding Tk in MFC windows always seemed very enticing but information was sparse and contradictory - on a
+ scale between "very easy" and "not yet possible". The only thing for it was to have a go and lo, it wasn't that hard after all.  
+ CTkView is a C++ class which can be used in MFC SDI or MDI applications. An instance of CTkView hosts an embedded Tk
+ toplevel widget and performs some management chores for the widget so that it can size, update and react correctly to Windows
+ events.   <a href="/live/annotate?url=http%3a%2f%2fhome%2et%2donline%2ede%2fhome%2fdshepherd%2ftkview%2ehtm">Edit</a>
+ <i><font size="-1">(August 19, 1999 15:38)</font></i><dt><b><a href="http://www.cs.umd.edu/hcil/pad++" ="">Pad++</a></b>
+<dd>
+			Author <b><a href="mailto:pad-info@cs.umd.edu" ="">Ben Bederson et al</a></b>, Version <b>0.9p1</b>,
+			Works with <b>8.0</b>
+<br>Download: <a href="http://www.cs.umd.edu/hcil/pad++/download.html">download.html</a><br>Pad++ is a Tk widget that provides a Zoomable User Interface (ZUI) that supports real-time interactive zoomable graphics in a fashion similar to the Tk Canvas widget.  Pad++ supports tens of thousands of objects which include text, images, graphics, portals, lenses, simple html (and more), including transparency and rotation. <a href="/live/annotate?url=http%3a%2f%2fwww%2ecs%2eumd%2eedu%2fhcil%2fpad%2b%2b">Edit</a>
+ <i><font size="-1">(August 19, 1999 15:39)</font></i><dt><b><a href="http://home.t-online.de/home/sesam.com/freeware.htm" ="">Progressbar</a></b>
+<dd>Progressbar is a megawidget written in pure tcl (ie: no compiling required - runs on all platforms Macintosh, Unix, Windows). 
+Its primary purpose is to show the progress of any action in percent. <a href="/live/annotate?url=http%3a%2f%2fhome%2et%2donline%2ede%2fhome%2fsesam%2ecom%2ffreeware%2ehtm">Edit</a>
+ <i><font size="-1">(January 24, 2000 09:19)</font></i><dt><b><a href="http://jfontain.free.fr/" ="">scwoop (Simple Composite Widget Object Oriented Package)</a></b>
+<dd>Scwoop is a composite widget (also known as mega widget) extension to the great Tk widget library. Scwoop is
+entirely written in Tcl using the stooop (Simple Tcl Only Object Oriented Programming) extension. <a href="/live/annotate?url=http%3a%2f%2fjfontain%2efree%2efr%2f">Edit</a>
+ <i><font size="-1">(January 09, 2000 02:10)</font></i><dt><b><a href="http://www2.clearlight.com/~oakley/tcl/supertext.html" ="">Supertext - tk text widget with unlimited undo</a></b>
+<dd>
+			Author <b><a href="mailto:oakley@channelpoint.com" ="">Bryan Oakley</a></b>, Version <b>1.0b1</b>,
+			Works with <b>Tcl 8.0</b>
+<br>Download: <a href="http://www2.clearlight.com/~oakley/tcl/supertext.tcl">supertext.tcl</a><br>Supertext is a package that provides a tk text widget with full undo and the ability to execute procedures both before and after a text
+widget command has been processed. Supertext may be used as-is, or for the brave it may be used in place of the standard text
+widget.  <a href="/live/annotate?url=http%3a%2f%2fwww2%2eclearlight%2ecom%2f%7eoakley%2ftcl%2fsupertext%2ehtml">Edit</a>
+ <i><font size="-1">(August 23, 1999 12:06)</font></i><dt><b><a href="http://www.hwaci.com/sw/tk/nbpi.html" ="">Tabbed Notebook Widget</a></b>
+<dd>
+			Author <b><a href="mailto:drh@acm.org" ="">Richard Hipp</a></b>, Version <b>1.0</b>,
+			Works with <b>Tk 4.1 or later.</b>
+<br>Download: <a href="http://www.hwaci.com/sw/tk/notebook.tcl">notebook.tcl</a><br>This implements a tabbed notebook using
+a canvas widget and embedded frames.
+This is pure Tcl
+code - not a C extension. <a href="/live/annotate?url=http%3a%2f%2fwww%2ehwaci%2ecom%2fsw%2ftk%2fnbpi%2ehtml">Edit</a>
+ <i><font size="-1">(August 23, 1999 12:08)</font></i><dt><b><a href="http://www.tcltk.com/ellson/ftp/Gdtclft2.0.README" ="">Tcl GD - graphics</a></b>
+<dd>
+			Author <b>John Ellson and Spencer Thomas</b>, Version <b>2.0</b>,
+			Works with <b>8.0 and higher</b>
+<br>Download: <a href="http://www.tcltk.com/ellson/ftp/Gdtclft2.0.tar.gz">Gdtclft2.0.tar.gz</a><br>
+	Thomas Boutell's Gd package provides a convenient way to generate
+	    PNG images with a C program. If you prefer Tcl for CGI
+		applications, you'll want the TCL GD extension. <a href="/live/annotate?url=http%3a%2f%2fwww%2etcltk%2ecom%2fellson%2fftp%2fGdtclft2%2e0%2eREADME">Edit</a>
+ <i><font size="-1">(August 19, 1999 14:52)</font></i><dt><b><a href="http://www.stratasys.com/software/metagui" ="">The Meta-GUI Tools</a></b>
+<dd>The Meta-GUI tools provide a framework for quickly building full
+GUI applications. The GUI is rendered by a run-time engine
+based on a hierarchical set of definitions you provide. At the bottom
+of the hierarchy are abstract data types such as length, angle,
+string, etc., and these are used to progressively build up frames,
+dialogs, toolbars, menus, and operations. <a href="/live/annotate?url=http%3a%2f%2fwww%2estratasys%2ecom%2fsoftware%2fmetagui">Edit</a>
+ <i><font size="-1">(August 23, 1999 12:10)</font></i><dt><b><a href="http://jfontain.free.fr/" ="">Tkpiechart Home Page</a></b>
+<dd>Tkpiechart is a Tcl-only extension that allows the programmer to create and dynamically update 2D or 3D pie
+charts in a Tcl/Tk application.  This uses the stooop package and builds
+pie charts on a Tk canvas. <a href="/live/annotate?url=http%3a%2f%2fjfontain%2efree%2efr%2f">Edit</a>
+ <i><font size="-1">(January 09, 2000 02:12)</font></i><dt><b><a href="http://www.cygnus.com/~irox/tkprint/" ="">TkPrint</a></b>
+<dd>TkPrint is an extension that allows you to print from a
+        Tk widget. <a href="/live/annotate?url=http%3a%2f%2fwww%2ecygnus%2ecom%2f%7eirox%2ftkprint%2f">Edit</a>
+ <i><font size="-1">(October 11, 1999 09:58)</font></i><dt><b><a href="http://www.purl.org/net/hobbs/tcl/capp/" ="">TkTable Home Page</a></b>
+<dd>The TkTable widget.  The <code>table</code> command creates a 
+2-dimensional grid of cells. The table can use a Tcl array variable or Tcl
+
+command for data storage and retrieval. <a href="/live/annotate?url=http%3a%2f%2fwww%2epurl%2eorg%2fnet%2fhobbs%2ftcl%2fcapp%2f">Edit</a>
+ <i><font size="-1">(November 18, 1999 09:25)</font></i><dt><b><a href="http://ftp.austintx.net/users/jatucker/TkTextmatrix/default.htm" ="">TkTextMatrix (spreadsheet)</a></b>
+<dd>
+			Author <b><a href="mailto:jatucker@austin.dsccc.com" ="">John Arthur Tucker</a></b>, Version <b>4.1</b>,
+			Works with <b>Tk 4.1</b>
+<br>Download: <a href="http://ftp.austintx.net/users/jatucker/TkTextmatrix/download.htm">download.htm</a>, <a href="http://ftp.austintx.net/users/jatucker/TkTextmatrix/textmatrix4.1.tar.gz">textmatrix4.1.tar.gz</a><br>A Tcl/Tk spreadsheet widget, TkTextmatrix, which is implemented in C++ and is
+             basically a Tk Canvas widget plus extra behavior for manipulating rows and columns of cell
+             items many times faster than with a plain Tk Canvas.  It actually inserts text nearly as fast
+             as the Tk Text widget.  If you work with or are interested in creating your own Tcl/Tk widgets
+             in C++,  you might want to take a look at the C++ widget library included with this
+             distribution. <a href="/live/annotate?url=http%3a%2f%2fftp%2eaustintx%2enet%2fusers%2fjatucker%2fTkTextmatrix%2fdefault%2ehtm">Edit</a>
+ <i><font size="-1">(August 23, 1999 12:14)</font></i><dt><b><a href="http://www.cs.umd.edu/~bederson/Togl.html" ="">ToGL - a Tk Open GL widget</a></b>
+<dd>Togl is a Tk widget for OpenGL rendering. Togl is based on OGLTK, originally written by Benjamin Bederson at the
+University of New Mexico (who has since moved to the University of Maryland). Togl adds the new features: 
+<ul>
+<li>     color-index mode support including color allocation functions 
+<li>     support for requesting stencil, accumulation, alpha buffers, etc 
+<li>     multiple OpenGL drawing widgets 
+<li>     OpenGL extension testing from Tcl 
+<li>     simple, portable font support 
+<li>     overlay plane support 
+</ul>
+Togl allows one to create and manage a special Tk/OpenGL widget with Tcl and render into it with a C program. That is,
+a typical Togl program will have Tcl code for managing the user interface and a C program for computations and
+OpenGL rendering.  <a href="/live/annotate?url=http%3a%2f%2fwww%2ecs%2eumd%2eedu%2f%7ebederson%2fTogl%2ehtml">Edit</a>
+ <i><font size="-1">(August 23, 1999 12:14)</font></i><dt><b><a href="http://www.hwaci.com/sw/tk/treepi.html" ="">Tree Widget</a></b>
+<dd>This implements a tree display in a canvas widget.
+It is similar in layout to that of the
+Windows explorer file viewer.  This is pure Tcl
+code - not a C extension. <a href="/live/annotate?url=http%3a%2f%2fwww%2ehwaci%2ecom%2fsw%2ftk%2ftreepi%2ehtml">Edit</a>
+ <i><font size="-1">(September 29, 1999 14:37)</font></i><dt><b><a href="http://www.du.edu/~mschwart/tcl-tk.htm" ="">Windows Extensions for Tcl/Tk (Michael Schwartz)</a></b>
+<dd>This site has pointers to several extensions specific to the
+Windows platform.  The extensions provide printing,
+a MAPI interface to send email, and an interface to manipulate
+.INI files, among other things. <a href="/live/annotate?url=http%3a%2f%2fwww%2edu%2eedu%2f%7emschwart%2ftcl%2dtk%2ehtm">Edit</a>
+ <i><font size="-1">(October 07, 1999 10:50)</font></i><dt><b><a href="http://www.tcltk.com/iwidgets/" ="">[incr Widgets] Home Page</a></b>
+<dd>[incr Widgets] is a set of megawidgets (combo boxes, etc.) that are
+upon the [incr Tcl] object system and the [incr Tk] megawidget
+framework.  This comes bundled with the
+<a href="http://www.tcltk.com/itcl/">[incr Tcl]</a> distributions. <a href="/live/annotate?url=http%3a%2f%2fwww%2etcltk%2ecom%2fiwidgets%2f">Edit</a>
+ <i><font size="-1">(September 05, 1999 16:08)</font></i><dt><b><a href="http://www1.clearlight.com/~oakley/tcl/combobox/index.html" ="">combobox</a></b>
+<dd>
+			Author <b><a href="mailto:oakley@channelpoint.com" ="">Bryan Oakley</a></b>, Version <b>1.03</b>,
+			Works with <b>8.x</b>
+<br>Download: <a href="http://www1.clearlight.com/~oakley/tcl/combobox/combobox.tcl">combobox.tcl</a><br>combobox is a pure-tcl implementation of a combobox widget. It is
+entirely self contained and does not require any other OO or megawidget
+extension. It supports both editable and non-editable entries, and
+provides the ability to call a procedure anytime the value of the combobox
+changes. <a href="/live/annotate?url=http%3a%2f%2fwww1%2eclearlight%2ecom%2f%7eoakley%2ftcl%2fcombobox%2findex%2ehtml">Edit</a>
+ <i><font size="-1">(August 23, 1999 12:15)</font></i><dt><b><a href="http://www.multimania.com/droche/rnotebook/index.html" ="">Rnotebook</a></b>
+<dd>
+			Author <b><a href="mailto:dan@lectra.com" ="">Daniel Roche</a></b>, Version <b>1.0</b>,
+			Works with <b>8.0 or higher</b>
+<br>Download: <a href="http://www.multimania.com/droche/rnotebook/index.html">index.html</a><br>This implements a resizeable notebook
+widget in pure tcl/tk <a href="/live/annotate?url=http%3a%2f%2fwww%2emultimania%2ecom%2fdroche%2frnotebook%2findex%2ehtml">Edit</a>
+ <i><font size="-1">(August 19, 1999 15:39)</font></i><dt><b><a href="http://www.tregar.com/samdi.html" ="">saMDI v1.0a1 Multi-Document Interface Extension</a></b>
+<dd>A multi-document interface (MDI) extension for TCL/Tk 8.0.
+This is a common interface format in Microsoft Windows that lets a parent window contain multiple child windows.
+In effect you get a window manager inside a window!
+Uses and includes the STOOOP object-oriented extension by
+Jean-Luc Fontaine.
+saMDI v1.0a1 GPL Copyright 1998 Sam Tregar. <a href="/live/annotate?url=http%3a%2f%2fwww%2etregar%2ecom%2fsamdi%2ehtml">Edit</a>
+ <i><font size="-1">(August 23, 1999 12:07)</font></i><dt><b><a href="http://tix.mne.com/htdocs/tix/index.html" ="">Tix Support Site</a></b>
+<dd>
+			Author <b><a href="mailto:tix@mne.com" ="">Ioi Lam, (adopted by Gregg Squires)</a></b>, Version <b>4.1</b>,
+			Works with <b>Tcl 7.4 through Tcl 8.0</b>
+<br><a href="ftp://ftp.tix.mne.com/pub/tix/">Download</a>, <a href="ftp://ftp.tix.mne.com/pub/tix/Tix4.1.0.006.tar.gz">Tix4.1.0.006.tar.gz</a>, <a href="ftp://ftp.tix.mne.com/pub/tix/Tix41p6.zip">Tix41p6.zip</a>, <a href="ftp://ftp.tix.mne.com/pub/tix/win41p6bin.zip">win41p6bin.zip</a><br><b>Tix has found a new home!</b>
+ <br>
+ Tix provides over 40 new Tk including the
+combo box, file selection dialogs, paned widget,
+notebook, hierarchical list, directory tree, and more.
+  <a href="/live/annotate?url=http%3a%2f%2ftix%2emne%2ecom%2fhtdocs%2ftix%2findex%2ehtml">Edit</a>
+ <i><font size="-1">(August 23, 1999 12:11)</font></i><dt><b><a href="ftp://ftp.archive.eso.org/pub/tree" ="">Tk Tree Widget (C++)</a></b>
+<dd>Tk Tree widget for Tcl8.0.3.
+
+This version contains (optional) support for \[incr Tcl\] and \[incr Tk\]
+version 3.0.
+<br>
+With the tree widget, you can display a tree in a Tk canvas. The nodes
+can be made up of any number of canvas items or even other Tk widgets.
+You create the objects that make up a node and the line that connects
+it to its parent and pass them to the tree widget. After this the tree
+widget manages the positions of the nodes and end points of the tree
+lines.  Operations are available for inserting, moving and removing
+nodes and subtrees and for querrying the position of a node in the
+tree. The tree can be displayed horizontally or vertically.
+ <a href="/live/annotate?url=ftp%3a%2f%2fftp%2earchive%2eeso%2eorg%2fpub%2ftree">Edit</a>
+ <i><font size="-1">(August 25, 1999 03:14)</font></i><dt><b><a href="http://www.purl.org/net/hobbs/tcl/script/widget/" ="">widget, simple megawidget package</a></b>
+<dd>
+			Author <b><a href="mailto:jeffrey.hobbs@oen.siemens.de" ="">Jeffrey Hobbs</a></b>, Version <b>0.9</b>,
+			Works with <b>Tcl/Tk 8.0 or higher</b>
+<br>Download: <a href="http://www.purl.org/net/hobbs/tcl/script/widget/widget-0.9.tar.gz">widget-0.9.tar.gz</a><br>This is a package of
+ megawidgets (i.e., compound widgets) that work almost exactly like Tk widgets.
+ You can also build your own new megawidgets. 
+Includes: combobox, hierarchy, console, progressbar,
+tabnotebook, validating entry, pane geometry manager, baloon help. <a href="/live/annotate?url=http%3a%2f%2fwww%2epurl%2eorg%2fnet%2fhobbs%2ftcl%2fscript%2fwidget%2f">Edit</a>
+ <i><font size="-1">(August 23, 1999 12:16)</font></i></dl>
+<hr><p><center><font size="-1" face="Geneva, Helvetica, Arial"><br><a href="#TOP"><b>Top</b></a><br><!-- key ResourceSoftwareExtensions --><a href="/">Home</a>
+ | <a href="/products/">Products</a>
+ | <a href="/customers/">Customers</a>
+ | <a href="/partners/">Partners</a>
+ | <a href="/services/">Services</a>
+ | <a href="/resource/">Tcl Resources</a>
+ | <a href="/company/">Company</a>
+<br><a href="/live/keyword">Search</a>
+ | <a href="/live/map">Site Map</a>
+ | <a href="/company/feedback.html?url=%2fresource%2fsoftware%2fextensions%2ftk%2f">Feedback</a>
+ | <a href="/company/contact.html">Contact Us</a>
+ | <a href="mailto:info@scriptics.com">info@scriptics.com</a>
+
+ <SCRIPT LANGUAGE="Javascript">
+<!--
+         browser = (((navigator.appName == "Netscape") &&(parseInt(navigator.appVersion) >= 3 )) || ((navigator.appName =="Microsoft Internet Explorer") && (parseInt(navigator.appVersion) >= 4 )))
+
+  if ( browser )
+   {
+        over = new MakeImageArray(10)
+        over[0].src = "http://images.scriptics.com/images/ProductsMouseOff.gif"
+        over[1].src = "http://images.scriptics.com/images/CustomersMouseOff.gif"
+        over[2].src = "http://images.scriptics.com/images/PartnersMouseOff.gif"
+        over[3].src = "http://images.scriptics.com/images/ServicesMouseOff.gif"
+        over[4].src = "http://images.scriptics.com/images/ResourceMouseOff.gif"
+        over[5].src = "http://images.scriptics.com/images/CompanyMouseOff.gif"
+        over[6].src = "http://images.scriptics.com/images/homeMainRollover1.gif"
+        over[7].src = "http://images.scriptics.com/images/homeMainRollover2.gif"
+        over[8].src = "http://images.scriptics.com/images/homeMainRollover3.gif"
+        over[9].src = "http://images.scriptics.com/images/homeMainRollover3.gif"
+
+  }
+  
+  function MakeImageArray(n)  {
+        this.length = n
+        for (var i = 0; i<=n; i++)="i++)" {="{" this[i]="this[i]" ="" new="new" Image()="Image()" }="}" return="return" this="this" }="}" //="//" --="--">
+  </SCRIPT><br>
+    <font size="2">
+    &copy; 1998-2000 Scriptics Corporation.  All rights reserved.
+    <a href="/legal_notice.html">Legal Notice</a> | <A href="" /privacy.html="/privacy.html"> 
+    Privacy Statement</a>
+    </td></tr></table></td></tr></table>
+</Body>
+</Html>
\ No newline at end of file
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image1 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image1
new file mode 100644
index 0000000000..814d1e8f08
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image1
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image10 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image10
new file mode 100644
index 0000000000..45001faf05
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image10
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image11 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image11
new file mode 100644
index 0000000000..7c4c170f21
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image11
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image12 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image12
new file mode 100644
index 0000000000..903e7344a6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image12
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image13 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image13
new file mode 100644
index 0000000000..226d4f68c2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image13
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image14 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image14
new file mode 100644
index 0000000000..8e8c71814c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image14
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image2 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image2
new file mode 100644
index 0000000000..2ddeb3258c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image2
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image3 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image3
new file mode 100644
index 0000000000..1651ba7e41
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image3
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image4 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image4
new file mode 100644
index 0000000000..b565c8dd0e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image4
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image5 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image5
new file mode 100644
index 0000000000..e1268b81c0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image5
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image6 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image6
new file mode 100644
index 0000000000..1a6b260b40
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image6
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image7 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image7
new file mode 100644
index 0000000000..cec7aa04d8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image7
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image8 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image8
new file mode 100644
index 0000000000..ad0d748d65
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image8
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image9 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image9
new file mode 100644
index 0000000000..46ade3018b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/image9
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/index.html b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/index.html
new file mode 100644
index 0000000000..ce92e8a22e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page3/index.html
@@ -0,0 +1,2787 @@
+<html><body bgcolor="white">
+<hr>
+<h1 align="center">Embedding Tcl in C/C++ Applications</h1>
+
+    <table width="100%">
+    <tr><td valign="top" align="left" width="46%">
+    <b>Presented At:</b>
+  <blockquote>
+     The&nbsp;Tcl2K&nbsp;Conference<br>
+     Austin, Texas<br>
+     <nobr>9:00am, February 15, 2000</nobr><br>
+  </blockquote>
+    </td>
+    <td width="5%">&nbsp;</td>
+    <td valign="top" align="left" width="46%">
+    <b>Instructor:</b>
+  <blockquote>
+     D. Richard Hipp<br>
+     drh@hwaci.com<br>
+     http://www.hwaci.com/drh/<br>
+     704.948.4565
+  </blockquote>
+    </td></tr>
+    </table><p>
+  <center><table border="2">
+  <tr><td>
+  <p align="center">
+  Copies of these notes, example source code,<br>and other
+  resources related to this tutorial<br>are available online at
+  <a href="http://www.hwaci.com/tcl2k/">
+  http://www.hwaci.com/tcl2k/</a></p>
+  <p align="center"><small>$Id$</small></p></td></tr>
+  </table>
+  </center>
+</p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Tutorial Outline</h2>
+<p><ul><li>Introduction</li>
+<li>Building It Yourself</li>
+<ul><li>"Hello, World!" using Tcl</li>
+<li>Tcl scripts as C strings</li>
+<li>Adding new Tcl commands</li>
+<li>A tour of the Tcl API</li>
+<li>Tcl initialization scripts</li>
+<li>Adding Tk</li>
+</ul><li>Tools Survey</li>
+<li>Mktclapp</li>
+<ul><li>"Hello World" using mktclapp</li>
+<li>Adding C code</li>
+<li>Other Features</li>
+<li>Invoking Tcl from C</li>
+<li>Running mktclapp directly</li>
+<li>Real-world examples</li>
+</ul><li>Summary</li>
+</ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Embedding Tcl in C/C++ Applications</h2>
+<p><ul><li>You know how to program in Tcl/Tk</li></ul><ul><li>You know how to program in C/C++</li></ul><ul><li>This tutorial is about how to do both at the same time.</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Why Mix C With Tcl/Tk?</h2>
+<p><ul><li>Use C for the things C is good at and Tcl for the things
+  Tcl is good at.</li></ul><ul><li>Generate standalone executables.
+  <ul><li>Eliminate the need to install Tcl/Tk.</li>
+  <li>Prevent problems when the wrong version of Tcl/Tk is installed.</li>
+  </ul></li></ul><ul><li>Prevent end users from changing the source code.
+  <ul><li>Keeps users from creating new bugs.</li>
+  <li>Protects proprietary code.</li>
+  </ul></li></ul><ul><li>Office politics</li></ul><ul><li>Use Tcl/Tk as a portability layer for a large C program</li></ul><ul><li>Use Tcl as a testing interface</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Why Mix C With Tcl/Tk?</h2>
+<p><blockquote><big><b>
+  "Use C for the things C is good at and use Tcl/Tk for the things
+  Tcl/Tk is good at."
+  </b></blockquote></p><p>
+
+    <table width="100%">
+    <tr><td valign="top" align="left" width="46%">
+    <b>C is good at:</b>
+  <ul>
+  <li>Speed</li>
+  <li>Complex data structures</li>
+  <li>Computation</li>
+  <li>Interacting with hardware</li>
+  <li>Byte-by-byte data analysis</li>
+  </ul>
+    </td>
+    <td width="5%">&nbsp;</td>
+    <td valign="top" align="left" width="46%">
+    <b>Tcl/Tk is good at:</b>
+  <ul>
+  <li>Building a user interface</li>
+  <li>Manipulation of strings</li>
+  <li>Portability</li>
+  <li>Opening sockets</li>
+  <li>Handling events</li>
+  </ul>
+    </td></tr>
+    </table>
+<br clear="both"><p><hr></p>
+<h2 align="center">Programming Models</h2>
+<table width="100%">
+<tr><td valign="top" width="49%">
+
+  <p><b>Mainstream Tcl Programming Model:</b></p>
+</td>
+<td width="2%">&nbsp;</td>
+<td valign="top" width="49%">
+
+  <p><b>Embedded Tcl Programming Model:&nbsp;&nbsp;</b></p>
+</td></tr>
+<tr><td valign="top" width="49%">
+
+  <ul><li>Add bits of C code to a large Tcl program</li></ul>
+</td>
+<td width="2%">&nbsp;</td>
+<td valign="top" width="49%">
+
+  <ul><li>Add bits of Tcl code to a large C program</li></ul>
+</td></tr>
+<tr><td valign="top" width="49%">
+
+  <ul><li>Main Tcl script loads extensions written in C</li></ul>
+</td>
+<td width="2%">&nbsp;</td>
+<td valign="top" width="49%">
+
+  <ul><li>Main C procedure invokes the Tcl interpreter</li></ul>
+</td></tr>
+<tr><td valign="top" width="49%">
+
+  <ul><li>Tcl/Tk is a programming language</li></ul>
+</td>
+<td width="2%">&nbsp;</td>
+<td valign="top" width="49%">
+
+  <ul><li>Tcl/Tk is a C library</li></ul>
+</td></tr>
+<tr><td valign="top" width="49%">
+
+  <center><img src="image1"><br>
+  Most of the Tcl2K conference is about</center>
+</td>
+<td width="2%">&nbsp;</td>
+<td valign="top" width="49%">
+
+  <center><img src="image1"><br>
+  This tutorial is about</center>
+</td></tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">"Hello, World!" Using The Tcl Library</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h></tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Always include &lt;tcl.h></td>
+</tr>
+<tr><td valign="center">
+<small><tt>int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Create a new Tcl interpreter</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;"puts&nbsp;{Hello,&nbsp;World!}");</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Execute a Tcl command.</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Compiling "Hello, World!"</h2>
+<p><p><b>Unix:</b></p>
+  <blockquote><tt>
+  $ gcc hello.c -ltcl -lm -ldl<br>
+  $ ./a.out<br>
+  Hello, World!</tt></blockquote>
+
+  <p><b>Windows using Cygwin:</b></p>
+  <blockquote><tt>
+  C:> gcc hello.c -ltcl80 -lm<br>
+  C:> a.exe<br>
+  Hello, World!</tt></blockquote>
+
+  <p><b>Windows using Mingw32:</b></p>
+  <blockquote><tt>
+  C:> gcc -mno-cygwin hello.c -ltcl82 -lm<br>
+  </tt></blockquote>
+<table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>Also works with VC++</b></td></tr></table></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Where Does <tt>-ltcl</tt> Come From On Unix?</h2>
+<p><p>Build it yourself using these steps:</p></p><p>
+<p><ul><li>Get tcl8.2.2.tar.gz from Scriptics</li></ul><ul><li><tt>zcat tcl8.2.2.tar.gz | tar vx </tt></li></ul><ul><li><tt>cd tcl8.2.2/unix</tt></li></ul><ul><li><tt>./configure --disable-shared</tt></li></ul><ul><li><tt>make</tt></li></ul><ul><li>Move <b>libtcl8.2.a</b> to your lib directory.</li></ul><ul><li>Copy <b>../generic/tcl.h</b> into /usr/include.</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">What Other Libraries Are Required For Unix?</h2>
+<p><ul><li>The sequence of <b>-l</b> options after <b>-ltcl</b>
+  varies from system to system</li></ul><ul><li>Observe what libraries the TCL makefile inserts when
+  it is building <b>tclsh</b></li></ul><ul><li>Examples in this talk are for RedHat Linux 6.0 for Intel</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">How To Compile Under Unix Without Installing Tcl</h2>
+<p><p>Specify the *.a file directly:</p>
+  <blockquote><pre>
+  $ gcc -I../tcl8.2.2/generic hello.c \ 
+      ../tcl8.2.2/unix/libtcl8.2.a -lm -ldl
+  $ strip a.out
+  $ ./a.out
+  Hello, World!</pre></blockquote>
+
+  <p>Or, tell the C compiler where to look for *.a files:</p>
+  <blockquote><pre>
+  $ gcc -I../tcl8.2.2/generic hello.c \ 
+      -L../tcl8.2.2/unix -ltcl -lm -ldl
+  $ strip a.out
+  $ ./a.out
+  Hello, World!</pre></blockquote>
+<table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>The <tt>-I../tcl8.2.2</tt> argument
+  tells the compiler where to
+  find <tt>&lt;tcl.h&gt;</tt>.</p></b></td></tr></table></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">What's "Cygwin"?</h2>
+<p><ul><li>An implementation of GCC/G++ and all development tools
+  for Windows95/98/NT/2000</li></ul><ul><li>Available for free download at
+  <blockquote>
+  <tt>http://sourceware.cygnus.com/cygwin/</tt>
+  </blockquote></li></ul><ul><li>Also available shrink-wrapped at your local software retailer or
+  online at
+  <blockquote>
+  <tt>http://www.cygnus.com/cygwin/index.html</tt>
+  </blockquote></li></ul><ul><li>Programs compiled using Cygwin require a special
+  DLL (<b>cygwin1.dll</b>) that provides a POSIX system API</li></ul><ul><li>Cygwin1.dll cannot be shipped with proprietary programs
+  without purchasing a license from Cygnus.</li></ul><ul><li>Mingw32 is the same compiler as Cygwin, but generates
+  binaries that do not use cygwin1.dll</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Where Does <tt>-ltcl82</tt> Come From On Windows?</h2>
+<p><p>Build it like this:</p></p><p>
+<p><ul><li>Get <b>tcl82.lib</b> and <b>tcl82.dll</b> from Scriptics.</li></ul><ul><li><tt>echo EXPORTS >tcl82.def</tt></li></ul><ul><li><tt>nm tcl82.lib | grep 'T _' | sed 's/.* T _//' >>tcl82.def</tt></li></ul><ul><li><tt>dlltool --def tcl82.def --dllname tcl82.dll --output-lib libtcl82.a</tt></li></ul><ul><li>Move <b>libtcl82.a</b> to the lib directory and <b>tcl82.dll</b>
+  to the bin directory.</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Where Does Your Code Go?</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
+&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;/*&nbsp;Your&nbsp;application&nbsp;code&nbsp;goes&nbsp;here&nbsp;*/</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Insert C code here to do whatever it is your program is
+  suppose to do</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Building A Simple TCLSH</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
+&nbsp;&nbsp;char&nbsp;*z;<br>
+&nbsp;&nbsp;char&nbsp;zLine[2000];<br>
+&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;while(&nbsp;fgets(zLine,sizeof(zLine),stdin)&nbsp;){</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Get one line of input</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zLine);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Execute the input as Tcl.</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;z&nbsp;=&nbsp;Tcl_GetStringResult(interp);<br>
+&nbsp;&nbsp;&nbsp;&nbsp;if(&nbsp;z[0]&nbsp;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;printf("厚��P�X�\n",&nbsp;z);<br>
+&nbsp;&nbsp;&nbsp;&nbsp;}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Print result if not empty</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;}<br>
+&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>What if user types more than 2000 characters?</b></td></tr></table>
+</p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Building A Simple TCLSH</h2>
+<p>Use TCL to handle input.  Allows input lines of unlimited length.</p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+&nbsp;<br>
+/*&nbsp;Tcl&nbsp;code&nbsp;to&nbsp;implement&nbsp;the<br>
+**&nbsp;input&nbsp;loop&nbsp;*/<br>
+static&nbsp;char&nbsp;zLoop[]&nbsp;=&nbsp;<br>
+&nbsp;&nbsp;"while&nbsp;{![eof&nbsp;stdin]}&nbsp;{\n"</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;"&nbsp;&nbsp;set&nbsp;line&nbsp;[gets&nbsp;stdin]\n"</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Get one line of input</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;"&nbsp;&nbsp;set&nbsp;result&nbsp;[eval&nbsp;$line]\n"</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Execute input as Tcl</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;"&nbsp;&nbsp;if&nbsp;{$result!=\"\"}&nbsp;{puts&nbsp;$result}\n"</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Print result</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;"}\n"<br>
+;<br>
+&nbsp;<br>
+<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
+&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zLoop);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Run the Tcl input loop</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>But what about commands that span multiple lines of input?</b></td></tr></table>
+</p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Better Handling Of Command-Line Input</h2>
+<p>The file "input.tcl"</p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>set&nbsp;line&nbsp;{}<br>
+while&nbsp;{![eof&nbsp;stdin]}&nbsp;{</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if&nbsp;{$line!=""}&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;-nonewline&nbsp;">&nbsp;"<br>
+&nbsp;&nbsp;}&nbsp;else&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;-nonewline&nbsp;"%&nbsp;"<br>
+&nbsp;&nbsp;}<br>
+&nbsp;&nbsp;flush&nbsp;stdout</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Prompt for user input.  The prompt is normally &quot;%&quot;
+  but changes to &quot;&gt;&quot; if the current line is a continuation.</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;append&nbsp;line&nbsp;[gets&nbsp;stdin]<br>
+&nbsp;&nbsp;if&nbsp;{[info&nbsp;complete&nbsp;$line]}&nbsp;{</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;{[catch&nbsp;{uplevel&nbsp;#0&nbsp;$line}&nbsp;result]}&nbsp;{</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">If the command is complete, execute it.</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;stderr&nbsp;"Error:&nbsp;$result"<br>
+&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;elseif&nbsp;{$result!=""}&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;$result<br>
+&nbsp;&nbsp;&nbsp;&nbsp;}<br>
+&nbsp;&nbsp;&nbsp;&nbsp;set&nbsp;line&nbsp;{}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;}&nbsp;else&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;append&nbsp;line&nbsp;\n<br>
+&nbsp;&nbsp;}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">If the command is incomplete, append a newline and get
+  another line of text.</td>
+</tr>
+<tr><td valign="center">
+<small><tt>}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Better Handling Of Command-Line Input</h2>
+<p>The file "input.c"</p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
+&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;"source&nbsp;input.tcl");</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Read and execute the input loop</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>But now the program is not standalone!</b></td></tr></table>
+</p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Converting Scripts Into C Strings</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
+&nbsp;&nbsp;"set&nbsp;line&nbsp;{}\n"<br>
+&nbsp;&nbsp;"while&nbsp;{![eof&nbsp;stdin]}&nbsp;{\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;if&nbsp;{$line!=\"\"}&nbsp;{\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;-nonewline&nbsp;\">&nbsp;\"\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;}&nbsp;else&nbsp;{\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;-nonewline&nbsp;\"%&nbsp;\"\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;}\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;flush&nbsp;stdout\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;append&nbsp;line&nbsp;[gets&nbsp;stdin]\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;if&nbsp;{[info&nbsp;complete&nbsp;$line]}&nbsp;{\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;{[catch&nbsp;{uplevel&nbsp;#0&nbsp;$line}&nbsp;result]}&nbsp;{\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;stderr&nbsp;\"Error:&nbsp;$result\"\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;elseif&nbsp;{$result!=\"\"}&nbsp;{\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;$result\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;}\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;set&nbsp;line&nbsp;{}\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;}&nbsp;else&nbsp;{\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;&nbsp;&nbsp;append&nbsp;line&nbsp;\\n\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;}\n"<br>
+&nbsp;&nbsp;"}\n"<br>
+;</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Compile Tcl Scripts Into C Programs</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt><br>
+static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
+&nbsp;&nbsp;/*&nbsp;Actual&nbsp;code&nbsp;omitted&nbsp;*/<br>
+;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Copy and paste the converted Tcl script here</td>
+</tr>
+<tr><td valign="center">
+<small><tt><br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
+&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Execute the Tcl code</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Converting Scripts To Strings<br>Using SED Or TCLSH</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>sed&nbsp;-e&nbsp;'s/\\/\\\\/g'&nbsp;\&nbsp;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Convert <b>\</b> into <b>\\</b></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;-e&nbsp;'s/"/\\"/g'&nbsp;\&nbsp;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Convert <b>"</b> into <b>\"</b></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;-e&nbsp;'s/^/&nbsp;&nbsp;"/'&nbsp;\&nbsp;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Add <b>"</b> to start of each line</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;-e&nbsp;'s/$/\\n"/'&nbsp;input.tcl</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Add <b>\n"</b> to end of each line</td>
+</tr>
+<tr><td valign="center">
+<small><tt><br>
+&nbsp;<br>
+<br>
+&nbsp;<br>
+<br>
+while&nbsp;{![eof&nbsp;stdin]}&nbsp;{<br>
+&nbsp;&nbsp;set&nbsp;line&nbsp;[gets&nbsp;stdin]</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;regsub&nbsp;-all&nbsp;{\}&nbsp;$line&nbsp;{&amp;&amp;}&nbsp;line</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Convert <b>\</b> into <b>\\</b></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;regsub&nbsp;-all&nbsp;{"}&nbsp;$line&nbsp;{\"}&nbsp;line</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Convert <b>"</b> into <b>\"</b></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;puts&nbsp;"\"$line\\n\""</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Add <b>"</b> in front and <b>\n"</b> at the end</td>
+</tr>
+<tr><td valign="center">
+<small><tt>}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Converting Scripts Into C Strings</h2>
+<p>You may want to save space by removing comments and extra whitespace
+  from scripts.</p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
+&nbsp;&nbsp;"set&nbsp;line&nbsp;{}\n"<br>
+&nbsp;&nbsp;"while&nbsp;{![eof&nbsp;stdin]}&nbsp;{\n"<br>
+&nbsp;&nbsp;"if&nbsp;{$line!=\"\"}&nbsp;{\n"<br>
+&nbsp;&nbsp;"puts&nbsp;-nonewline&nbsp;\">&nbsp;\"\n"<br>
+&nbsp;&nbsp;"}&nbsp;else&nbsp;{\n"<br>
+&nbsp;&nbsp;"puts&nbsp;-nonewline&nbsp;\"%&nbsp;\"\n"<br>
+&nbsp;&nbsp;"}\n"<br>
+&nbsp;&nbsp;"flush&nbsp;stdout\n"<br>
+&nbsp;&nbsp;"append&nbsp;line&nbsp;[gets&nbsp;stdin]\n"<br>
+&nbsp;&nbsp;"if&nbsp;{[info&nbsp;complete&nbsp;$line]}&nbsp;{\n"<br>
+&nbsp;&nbsp;"if&nbsp;{[catch&nbsp;{uplevel&nbsp;#0&nbsp;$line}&nbsp;result]}&nbsp;{\n"<br>
+&nbsp;&nbsp;"puts&nbsp;stderr&nbsp;\"Error:&nbsp;$result\"\n"<br>
+&nbsp;&nbsp;"}&nbsp;elseif&nbsp;{$result!=\"\"}&nbsp;{\n"<br>
+&nbsp;&nbsp;"puts&nbsp;$result\n"<br>
+&nbsp;&nbsp;"}\n"<br>
+&nbsp;&nbsp;"set&nbsp;line&nbsp;{}\n"<br>
+&nbsp;&nbsp;"}&nbsp;else&nbsp;{\n"<br>
+&nbsp;&nbsp;"append&nbsp;line&nbsp;\\n\n"<br>
+&nbsp;&nbsp;"}\n"<br>
+&nbsp;&nbsp;"}\n"<br>
+;</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Converting Scripts To Strings</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>sed&nbsp;-e&nbsp;'s/\\/\\\\/g'&nbsp;\&nbsp;<br>
+&nbsp;&nbsp;-e&nbsp;'s/"/\\"/g'&nbsp;\&nbsp;</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;-e&nbsp;'/^&nbsp;*#/d'&nbsp;\&nbsp;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Delete lines that begin with #</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;-e&nbsp;'/^&nbsp;*$/d'&nbsp;\&nbsp;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Delete blank lines</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;-e&nbsp;'s/^&nbsp;*/&nbsp;&nbsp;"/'&nbsp;\&nbsp;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Delete leading spaces</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;-e&nbsp;'s/$/\\n"/'&nbsp;input.tcl<br>
+&nbsp;<br>
+<br>
+&nbsp;<br>
+<br>
+&nbsp;<br>
+while&nbsp;{![eof&nbsp;stdin]}&nbsp;{<br>
+&nbsp;&nbsp;set&nbsp;line&nbsp;[gets&nbsp;stdin]</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;set&nbsp;line&nbsp;[string&nbsp;trimleft&nbsp;$line]</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Remove leading space</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if&nbsp;{$line==""}&nbsp;continue</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Delete blank lines</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if&nbsp;{[string&nbsp;index&nbsp;$line&nbsp;0]=="#"}&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;continue<br>
+&nbsp;&nbsp;}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Delete lines starting with #</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;regsub&nbsp;-all&nbsp;{\}&nbsp;$line&nbsp;{&amp;&amp;}&nbsp;line<br>
+&nbsp;&nbsp;regsub&nbsp;-all&nbsp;{"}&nbsp;$line&nbsp;{\"}&nbsp;line<br>
+&nbsp;&nbsp;puts&nbsp;"\"$line\\n\""<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Removing Comments Or Leading Space<br>Will Break Some Tcl Scripts!</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>image&nbsp;create&nbsp;bitmap&nbsp;smiley&nbsp;-data&nbsp;{</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>#define&nbsp;smile_width&nbsp;15<br>
+#define&nbsp;smile_height&nbsp;15</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">These lines begin with # but are not comment</td>
+</tr>
+<tr><td valign="center">
+<small><tt>static&nbsp;unsigned&nbsp;char&nbsp;smile_bits[]&nbsp;=&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;0xc0,&nbsp;0x01,&nbsp;0x30,&nbsp;0x06,&nbsp;0x0c,&nbsp;0x18,<br>
+&nbsp;&nbsp;&nbsp;0x04,&nbsp;0x10,&nbsp;0x22,&nbsp;0x22,&nbsp;0x52,&nbsp;0x25,<br>
+&nbsp;&nbsp;&nbsp;0x01,&nbsp;0x40,&nbsp;0x01,&nbsp;0x40,&nbsp;0x01,&nbsp;0x40,<br>
+&nbsp;&nbsp;&nbsp;0x12,&nbsp;0x24,&nbsp;0xe2,&nbsp;0x23,&nbsp;0x04,&nbsp;0x10,<br>
+&nbsp;&nbsp;&nbsp;0x0c,&nbsp;0x18,&nbsp;0x30,&nbsp;0x06,&nbsp;0xc0,&nbsp;0x01};<br>
+}<br>
+&nbsp;<br>
+<br>
+&nbsp;<br>
+text&nbsp;.t<br>
+pack&nbsp;.t<br>
+.t&nbsp;insert&nbsp;end&nbsp;[string&nbsp;trim&nbsp;{</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>She&nbsp;walks&nbsp;in&nbsp;beauty,&nbsp;like&nbsp;the&nbsp;night<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Of&nbsp;cloudless&nbsp;climes&nbsp;and&nbsp;starry&nbsp;skies;<br>
+And&nbsp;all&nbsp;that's&nbsp;best&nbsp;of&nbsp;dark&nbsp;and&nbsp;bright<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Meet&nbsp;in&nbsp;her&nbsp;aspect&nbsp;and&nbsp;her&nbsp;eyes;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Indentation is deleted on lines 2
+  and 4</td>
+</tr>
+<tr><td valign="center">
+<small><tt>}]&nbsp;<br>
+&nbsp;<br>
+</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>Problems like these are rare</b></td></tr></table>
+</p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Adding A "continue" Command</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>set&nbsp;line&nbsp;{}<br>
+while&nbsp;{![eof&nbsp;stdin]}&nbsp;{<br>
+&nbsp;&nbsp;if&nbsp;{$line!=""}&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;-nonewline&nbsp;">&nbsp;"<br>
+&nbsp;&nbsp;}&nbsp;else&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;-nonewline&nbsp;"%&nbsp;"<br>
+&nbsp;&nbsp;}<br>
+&nbsp;&nbsp;flush&nbsp;stdout<br>
+&nbsp;&nbsp;append&nbsp;line&nbsp;[gets&nbsp;stdin]<br>
+&nbsp;&nbsp;if&nbsp;{[info&nbsp;complete&nbsp;$line]}&nbsp;{</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;{[lindex&nbsp;$line&nbsp;0]=="continue"}&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;break;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Break out of the loop if the command
+  is "continue"</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;elseif&nbsp;{[catch&nbsp;{uplevel&nbsp;#0&nbsp;$line}&nbsp;result]}&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;stderr&nbsp;"Error:&nbsp;$result"<br>
+&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;elseif&nbsp;{$result!=""}&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;puts&nbsp;$result<br>
+&nbsp;&nbsp;&nbsp;&nbsp;}<br>
+&nbsp;&nbsp;&nbsp;&nbsp;set&nbsp;line&nbsp;{}<br>
+&nbsp;&nbsp;}&nbsp;else&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;append&nbsp;line&nbsp;\n<br>
+&nbsp;&nbsp;}<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Stop For Tcl Input At Various Points<br>In A C Program</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+&nbsp;<br>
+static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
+&nbsp;&nbsp;/*&nbsp;Tcl&nbsp;Input&nbsp;loop&nbsp;as&nbsp;a&nbsp;C&nbsp;string&nbsp;*/<br>
+;<br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
+&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;/*&nbsp;Application&nbsp;C&nbsp;code&nbsp;*/</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Do some computation</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Stop for some Tcl input</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;/*&nbsp;More&nbsp;application&nbsp;C&nbsp;code&nbsp;*/</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Do more computation</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Stop for more Tcl input</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;/*&nbsp;Finish&nbsp;up&nbsp;the&nbsp;application&nbsp;*/</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Finish the computation</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Using Tcl For Testing</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+&nbsp;<br>
+static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
+&nbsp;&nbsp;/*&nbsp;Tcl&nbsp;Input&nbsp;loop&nbsp;as&nbsp;a&nbsp;C&nbsp;string&nbsp;*/<br>
+;<br>
+&nbsp;<br>
+</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+#ifdef&nbsp;TESTING<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Create interpreter only if TESTING
+ is defined</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();<br>
+#endif<br>
+&nbsp;&nbsp;/*&nbsp;Application&nbsp;C&nbsp;code&nbsp;*/</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>#ifdef&nbsp;TESTING<br>
+&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
+#endif</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Accept command-line input only if TESTING
+  is defined</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;/*&nbsp;More&nbsp;application&nbsp;C&nbsp;code&nbsp;*/<br>
+#ifdef&nbsp;TESTING<br>
+&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
+#endif<br>
+&nbsp;&nbsp;/*&nbsp;Finish&nbsp;up&nbsp;the&nbsp;application&nbsp;*/<br>
+&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Creating A New Tcl Command In C</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+&nbsp;<br>
+int&nbsp;NewCmd(</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;void&nbsp;*clientData,<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp,<br>
+&nbsp;&nbsp;int&nbsp;argc,<br>
+&nbsp;&nbsp;char&nbsp;**argv</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">The Tcl command is implemented as
+  a C function with four arguments.</td>
+</tr>
+<tr><td valign="center">
+<small><tt>){<br>
+&nbsp;&nbsp;printf("Hello,&nbsp;World!\n");</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;TCL_OK;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Returns TCL_OK or TCL_ERROR</td>
+</tr>
+<tr><td valign="center">
+<small><tt>}<br>
+&nbsp;<br>
+static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
+&nbsp;&nbsp;/*&nbsp;Tcl&nbsp;code&nbsp;omitted...&nbsp;*/<br>
+;<br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
+&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_CreateCommand(interp,&nbsp;"helloworld",<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NewCmd,&nbsp;0,&nbsp;0);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Tell the interpreter which C function to call when the
+  "helloworld" Tcl command is executed</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
+&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Linkage From Tcl To C</h2>
+<p><p align="center"><img src="image4"></p></p><p><ul><li>3rd parameter of Tcl_CreateCommand() is a pointer to the C subroutine
+ that implements the command.</li></ul><ul><li>4th parameter to Tcl_CreateCommand() becomes the 1st parameter to 
+ the C routine whenever the Tcl command is executed.</li></ul><ul><li>1st parameter to Tcl_CreateCommand() must be a valid Tcl interpreter.
+ The same pointer appears as the second parameter to the C routine
+ whenever the Tcl command is executed.</li></ul></p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Linkage From Tcl To C</h2>
+<p><p align="center"><img src="image5"></p></p><p><ul><li>5th parameter of Tcl_CreateCommand() is a pointer to the C subroutine
+ that is called when the Tcl command is deleted.</li></ul><ul><li>4th parameter to Tcl_CreateCommand() becomes the 1st parameter to 
+ the C routine.</li></ul></p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">When To Use A Delete Proc</h2>
+<p>Examples of where the delete proc is used in standard Tcl/Tk:</p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>button&nbsp;.b&nbsp;-text&nbsp;Hello<br>
+pack&nbsp;.b</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>rename&nbsp;.b&nbsp;{}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Deleting the <b>.b</b> command causes the button to be destroyed</td>
+</tr>
+<tr><td valign="center">
+<small><tt><br>
+&nbsp;<br>
+</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>image&nbsp;create&nbsp;photo&nbsp;smiley&nbsp;\&nbsp;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;-file&nbsp;smiley.gif</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>rename&nbsp;smiley&nbsp;{}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Deleting the <b>smiley</b> command destroys the image and reclaims the
+  memory used to hold the image</td>
+</tr>
+</table>
+<p><ul><li>Always use a delete proc if the clientData is a pointer to
+  malloced memory or some other resource that needs freeing</li></ul><ul><li>Delete procs are never used in the Tcl core but are used
+  extensively in Tk</li></ul></p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Linkage From Tcl To C</h2>
+<p>The <tt>argc</tt> and <tt>argv</tt> parameters work just like in 
+ <tt>main()</tt></p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>helloworld&nbsp;one&nbsp;{two&nbsp;three}&nbsp;four</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><tt>argc = 4<br>
+  argv[0] = "helloworld"<br>
+  argv[1] = "one"<br>
+  argv[2] = "two three"<br>
+  argv[3] = "four"<br>
+  argv[4] = NULL</tt></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">A Short-Cut</h2>
+<p>In a program with many new Tcl commands implemented in C, it becomes
+  tedious to type the same four parameters over and over again.  So
+  we define a short-cut.</p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#define&nbsp;TCLARGS&nbsp;\&nbsp;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;void&nbsp;*clientData,&nbsp;\&nbsp;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;Tcl_Interp&nbsp;*interp,&nbsp;\&nbsp;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;argc,&nbsp;\&nbsp;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;char&nbsp;*argv</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Define TCLARGS once in a header file</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;<br>
+&nbsp;<br>
+&nbsp;</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>int&nbsp;NewCmd(TCLARGS){</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Use the TCLARGS macro to define new C functions
+  that implement Tcl commands.</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;&nbsp;/*&nbsp;implementation...&nbsp;*/<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>For brevity, we will use the TCLARGS macro during the
+  rest of this talk.</b></td></tr></table>
+</p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Returning A Value From C Back To Tcl</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>int&nbsp;NewCmd(TCLARGS){</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Note that the C function returns an "int"</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;TCL_OK;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Return value is TCL_OK or TCL_ERROR</td>
+</tr>
+<tr><td valign="center">
+<small><tt>}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p><ul><li>TCL_OK and TCL_ERROR are defined in &lt;tcl.h&gt;</li></ul><ul><li>Other valid return values TCL_RETURN, TCL_BREAK and TCL_CONTINUE
+  are rarely used</li></ul><ul><li>Common mistake: forgetting to return TCL_OK</li></ul></p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Returning A Value From C Back To Tcl</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>int&nbsp;NewCmd(TCLARGS){</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_SetResult(interp,"Hello!",TCL_STATIC);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Set the result to "Hello!"</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;TCL_OK;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p><ul><li>Result should be the text of an error message if you 
+  return TCL_ERROR.</li></ul><ul><li>3rd argument to Tcl_SetResult() can be TCL_STATIC,
+  TCL_DYNAMIC, TCL_VOLATILE, or a function pointer.</li></ul><ul><li>Also consider using Tcl_AppendResult().</li></ul><ul><li>Direct access to <tt>interp->result</tt> is deprecated.</li></ul><ul><li>See the man pages for details.</li></ul></p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">The Tcl_Obj Interface</h2>
+<p><ul><li>A new way to write Tcl commands in C code</li></ul><ul><li>First introduced in Tcl8.0</li></ul><ul><li>Can be much faster, especially for lists or numeric values.</li></ul><ul><li>Able to handle arbitrary binary data.</li></ul><ul><li>More difficult to program.</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">The Tcl_Obj Interface</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>int&nbsp;NewObjCmd(<br>
+&nbsp;&nbsp;void&nbsp;*clientData,<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp,<br>
+&nbsp;&nbsp;int&nbsp;objc,</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Obj&nbsp;*const*&nbsp;objv</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">4th parameter is an array Tcl_Objs, not an array of strings</td>
+</tr>
+<tr><td valign="center">
+<small><tt>){<br>
+&nbsp;&nbsp;/*&nbsp;Implementation...&nbsp;*/<br>
+&nbsp;&nbsp;return&nbsp;TCL_OK;<br>
+}<br>
+&nbsp;<br>
+static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
+&nbsp;&nbsp;/*&nbsp;Tcl&nbsp;code&nbsp;omitted...&nbsp;*/<br>
+;<br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
+&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_CreateObjCommand(interp,&nbsp;"newcmd",<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NewObjCmd,&nbsp;0,&nbsp;0);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Use a different function to register the command</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
+&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">The Tcl_Obj Interface</h2>
+<p><ul><li>There are countless access methods for reading information from and
+  placing information in Tcl_Objs.  Always use the access methods.</li></ul><ul><li>Details provided at Lee Bernhard's talk this afternoon.</li></ul><ul><li>Definitely use Tcl_Objs if you are writing a new Tcl extension.</li></ul><ul><li>Tcl_Objs address some of the weaknesses of Tcl relative to C/C++.
+  <ul>
+  <li> Tcl_Objs are faster </li>
+  <li> Tcl_Objs work with binary data </li>
+  </ul>
+  But C/C++ is faster still and better for working with binary data.</li></ul><ul><li>When mixing C/C++ with Tcl/Tk the benefits of Tcl_Objs are
+  less important.  Using Tcl_Objs in this context may not be
+  worth the extra trouble.</li></ul><ul><li>This talk will focus on the string interface.</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Nickel Tour Of The Tcl API</h2>
+<p><p><b>Memory allocation functions</b></p>
+<center><table width="90%"><tr>
+<td width="32%" valign="top"><small><tt>
+  Tcl_Alloc<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_Free<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_Realloc<br>
+</tt></small></td>
+</table></center><p><b>Functions useful in the implementation of new  Tcl commands</b></p>
+<center><table width="90%"><tr>
+<td width="32%" valign="top"><small><tt>
+  Tcl_AppendElement<br>
+  Tcl_AppendResult<br>
+  Tcl_GetBoolean<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_GetDouble<br>
+  Tcl_GetInt<br>
+  Tcl_GetStringResult<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_ResetResult<br>
+  Tcl_SetResult<br>
+</tt></small></td>
+</table></center><p><b>Functions for controlling the Tcl interpreter</b></p>
+<center><table width="90%"><tr>
+<td width="32%" valign="top"><small><tt>
+  Tcl_CreateCommand<br>
+  Tcl_CreateInterp<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_CreateObjCommand<br>
+  Tcl_DeleteCommand<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_DeleteInterp<br>
+  Tcl_Exit<br>
+</tt></small></td>
+</table></center></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Nickel Tour Of The Tcl API</h2>
+<p><p><b>I/O functions</b></p>
+<center><table width="90%"><tr>
+<td width="32%" valign="top"><small><tt>
+  Tcl_Close<br>
+  Tcl_Eof<br>
+  Tcl_Flush<br>
+  Tcl_GetChannel<br>
+  Tcl_GetChannelMode<br>
+  Tcl_GetChannelName<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_Gets<br>
+  Tcl_OpenCommandChannel<br>
+  Tcl_OpenFileChannel<br>
+  Tcl_OpenTcpClient<br>
+  Tcl_OpenTcpServer<br>
+  Tcl_Read<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_Seek<br>
+  Tcl_Tell<br>
+  Tcl_Ungets<br>
+  Tcl_Write<br>
+  Tcl_WriteChars<br>
+</tt></small></td>
+</table></center><p><b>Names and meanings of system error codes</b></p>
+<center><table width="90%"><tr>
+<td width="32%" valign="top"><small><tt>
+  Tcl_ErrnoId<br>
+  Tcl_ErrnoMsg<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_GetErrno<br>
+  Tcl_SetErrno<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_SignalId<br>
+  Tcl_SignalMsg<br>
+</tt></small></td>
+</table></center></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Nickel Tour Of The Tcl API</h2>
+<p><p><b>General Operating System Calls</b></p>
+<center><table width="90%"><tr>
+<td width="32%" valign="top"><small><tt>
+  Tcl_Access<br>
+  Tcl_Chdir<br>
+  Tcl_GetCwd<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_GetHostName<br>
+  Tcl_GetNameOfExecutable<br>
+  Tcl_Sleep<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_Stat<br>
+</tt></small></td>
+</table></center><p><b>String Manipulation And Comparison</b></p>
+<center><table width="90%"><tr>
+<td width="32%" valign="top"><small><tt>
+  Tcl_Concat<br>
+  Tcl_Merge<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_SplitList<br>
+  Tcl_StringCaseMatch<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_StringMatch<br>
+</tt></small></td>
+</table></center><p><b>Dynamically Resizable Strings</b></p>
+<center><table width="90%"><tr>
+<td width="49%" valign="top"><small><tt>
+  Tcl_DStringAppend<br>
+  Tcl_DStringAppendElement<br>
+  Tcl_DStringEndSublist<br>
+  Tcl_DStringInit<br>
+  Tcl_DStringLength<br>
+</tt></small></td>
+<td width="49%" valign="top"><small><tt>
+  Tcl_DStringResult<br>
+  Tcl_DStringSetLength<br>
+  Tcl_DStringStartSublist<br>
+  Tcl_DStringValue<br>
+</tt></small></td>
+</table></center></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Nickel Tour Of The Tcl API</h2>
+<p><p><b>Event Handlers</b></p>
+<center><table width="90%"><tr>
+<td width="49%" valign="top"><small><tt>
+  Tcl_CancelIdleCall<br>
+  Tcl_CreateChannelHandler<br>
+  Tcl_CreateTimerHandler<br>
+  Tcl_DeleteChannelHandler<br>
+</tt></small></td>
+<td width="49%" valign="top"><small><tt>
+  Tcl_DeleteTimerHandler<br>
+  Tcl_DoOneEvent<br>
+  Tcl_DoWhenIdle<br>
+</tt></small></td>
+</table></center><p><b>Functions For Reading And Writing Tcl Variables</b></p>
+<center><table width="90%"><tr>
+<td width="32%" valign="top"><small><tt>
+  Tcl_GetVar<br>
+  Tcl_GetVar2<br>
+  Tcl_LinkVar<br>
+  Tcl_SetVar<br>
+  Tcl_SetVar2<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_TraceVar<br>
+  Tcl_TraceVar2<br>
+  Tcl_UnlinkVar<br>
+  Tcl_UnsetVar<br>
+  Tcl_UnsetVar2<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_UntraceVar<br>
+  Tcl_UntraceVar2<br>
+  Tcl_UpdateLinkedVar<br>
+</tt></small></td>
+</table></center><p><b>Functions For Executing Tcl Code</b></p>
+<center><table width="90%"><tr>
+<td width="32%" valign="top"><small><tt>
+  Tcl_Eval<br>
+  Tcl_EvalFile<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_EvalObj<br>
+  Tcl_GlobalEval<br>
+</tt></small></td>
+<td width="32%" valign="top"><small><tt>
+  Tcl_GlobalEvalObj<br>
+  Tcl_VarEval<br>
+</tt></small></td>
+</table></center></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Nickel Tour Of The Tcl API</h2>
+<p><p><b>Functions For Dealing With Unicode</b></p>
+<center><table width="90%"><tr>
+<td width="49%" valign="top"><small><tt>
+  Tcl_NumUtfChars<br>
+  Tcl_UniCharAtIndex<br>
+  Tcl_UniCharIsAlnum<br>
+  Tcl_UniCharIsAlpha<br>
+  Tcl_UniCharIsControl<br>
+  Tcl_UniCharIsDigit<br>
+  Tcl_UniCharIsGraph<br>
+  Tcl_UniCharIsLower<br>
+  Tcl_UniCharIsPrint<br>
+  Tcl_UniCharIsPunct<br>
+  Tcl_UniCharIsSpace<br>
+  Tcl_UniCharIsUpper<br>
+  Tcl_UniCharIsWordChar<br>
+  Tcl_UniCharLen<br>
+  Tcl_UniCharNcmp<br>
+  Tcl_UniCharToLower<br>
+  Tcl_UniCharToTitle<br>
+</tt></small></td>
+<td width="49%" valign="top"><small><tt>
+  Tcl_UniCharToUpper<br>
+  Tcl_UniCharToUtf<br>
+  Tcl_UniCharToUtfDString<br>
+  Tcl_UtfAtIndex<br>
+  Tcl_UtfBackslash<br>
+  Tcl_UtfCharComplete<br>
+  Tcl_UtfFindFirst<br>
+  Tcl_UtfFindLast<br>
+  Tcl_UtfNcasecmp<br>
+  Tcl_UtfNcmp<br>
+  Tcl_UtfNext<br>
+  Tcl_UtfPrev<br>
+  Tcl_UtfToLower<br>
+  Tcl_UtfToTitle<br>
+  Tcl_UtfToUniChar<br>
+  Tcl_UtfToUniCharDString<br>
+  Tcl_UtfToUpper<br>
+</tt></small></td>
+</table></center>
+  <p><b>Functions For Dealing With Tcl_Objs</b></p>
+  <blockquote><i>Too numerous to list...</i></blockquote></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Documentation Of The Tcl API</h2>
+<p><ul><li>Tcl comes with excellent man pages</li></ul><ul><li>"Use the source, Luke"</li></ul><ul><li>See <tt>tclDecl.h</tt> for a list of API functions</li></ul><ul><li>The header comments on the implementation of API functions usually
+  gives a good description of what the function does and how it should
+  be used.</li></ul><ul><li>Most API functions are used within Tcl and Tk.  Use grep to locate
+  examples.</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Initialization Scripts</h2>
+<p><ul><li>Run the mini TCLSH implemented above and execute the <tt>parray</tt> command</li></ul><ul><li>It doesn't work!  What's wrong? </p></li></li></ul><ul><li><tt>parray</tt> is really a Tcl proc that is read in when the
+ interpreter is initialized. </p></li></li></ul><ul><li><tt>parray</tt> (and several other commands) are stored in a
+  handful of &quot;Initialization Scripts&quot; </p></li></li></ul><ul><li>All the initialization scripts are stored in the 
+ &quot;Tcl Library&quot; - a directory on the host
+ computer. </p></li></li></ul><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>Invoke the Tcl_Init() function to locate and read the
+ Tcl initialization scripts.</b></td></tr></table></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">The <tt>Tcl_Init()</tt> Function</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+&nbsp;<br>
+static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
+&nbsp;&nbsp;/*&nbsp;Tcl&nbsp;code&nbsp;omitted...&nbsp;*/<br>
+;<br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
+&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Init(interp);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Locate and read the initialization scripts</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;/*&nbsp;Call&nbsp;Tcl_CreateCommand()?&nbsp;*/<br>
+&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
+&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>But Tcl_Init() can fail. We need to check its return value...</b></td></tr></table>
+</p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">The <tt>Tcl_Init()</tt> Function</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+&nbsp;<br>
+static&nbsp;char&nbsp;zInputLoop[]&nbsp;=&nbsp;<br>
+&nbsp;&nbsp;/*&nbsp;Tcl&nbsp;code&nbsp;omitted...&nbsp;*/<br>
+;<br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
+&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if(&nbsp;Tcl_Init(interp)!=TCL_OK&nbsp;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;fprintf(stderr,"Tcl_Init()&nbsp;failed:&nbsp;厚��P�X�",<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tcl_GetStringResult(interp));<br>
+&nbsp;&nbsp;}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Print error message if Tcl_Init() fails</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;/*&nbsp;Call&nbsp;Tcl_CreateCommand()?&nbsp;*/<br>
+&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
+&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>But now the program is not standalone.</b></td></tr></table>
+</p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">How <tt>Tcl_Init()</tt> Works</h2>
+<p><ul><li>Computes the value of variable <tt>tcl_libPath</tt>.</li></ul><ul><li>Invokes the procedure named &quot;<tt>tclInit</tt>&quot;</li></ul><ul><li>A default <tt>tclInit</tt> procedure is built into Tcl.
+  You can define an alternative <tt>tclInit</tt> procedure
+  prior to calling <tt>Tcl_Init()</tt>.</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">The Default <tt>initTcl</tt> Procedure</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>set&nbsp;errors&nbsp;{}<br>
+set&nbsp;dirs&nbsp;{}<br>
+if&nbsp;{[info&nbsp;exists&nbsp;tcl_library]}&nbsp;{<br>
+&nbsp;&nbsp;lappend&nbsp;dirs&nbsp;$tcl_library<br>
+}&nbsp;else&nbsp;{<br>
+&nbsp;&nbsp;if&nbsp;{[info&nbsp;exists&nbsp;env(TCL_LIBRARY)]}&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;lappend&nbsp;dirs&nbsp;$env(TCL_LIBRARY)<br>
+&nbsp;&nbsp;}<br>
+&nbsp;&nbsp;lappend&nbsp;dirs&nbsp;$tclDefaultLibrary<br>
+&nbsp;&nbsp;unset&nbsp;tclDefaultLibrary<br>
+&nbsp;&nbsp;set&nbsp;dirs&nbsp;[concat&nbsp;$dirs&nbsp;$tcl_libPath]<br>
+}<br>
+foreach&nbsp;i&nbsp;$dirs&nbsp;{<br>
+&nbsp;&nbsp;set&nbsp;tcl_library&nbsp;$i<br>
+&nbsp;&nbsp;set&nbsp;tclfile&nbsp;[file&nbsp;join&nbsp;$i&nbsp;init.tcl]<br>
+&nbsp;&nbsp;if&nbsp;{[file&nbsp;exists&nbsp;$tclfile]}&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;{![catch&nbsp;{uplevel&nbsp;#0&nbsp;[list&nbsp;source&nbsp;$tclfile]}&nbsp;msg]}&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return<br>
+&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;{<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;append&nbsp;errors&nbsp;"$tclfile:&nbsp;$msg\n$errorInfo\n"<br>
+&nbsp;&nbsp;&nbsp;&nbsp;}<br>
+&nbsp;&nbsp;}<br>
+}<br>
+error&nbsp;"Can't&nbsp;find&nbsp;a&nbsp;usable&nbsp;init.tcl&nbsp;..."</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">The Default Initialization Sequence</h2>
+<p><ul><li>The <tt>tclInit</tt> procedure locates and sources the <tt>init.tcl</tt>
+  script.  The directory that contains <tt>init.tcl</tt> is stored in
+  the <tt>tcl_library</tt> variable.</li></ul><ul><li>The <tt>init.tcl</tt> script creates an <tt>unknown</tt> procedure.
+  The <tt>unknown</tt> procedure will run whenever Tcl encounters an
+  unknown command.</li></ul><ul><li>The <tt>unknown</tt> procedure consults the file <tt>tclIndex</tt> in the
+  <tt>tcl_library</tt> directory to see if the command is defined by one of
+  the initialization scripts.</li></ul><ul><li>The <tt>unknown</tt> procedure sources any needed initialization scripts
+  and retries the command.</li></ul><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>Commands defined in the initialization scripts are loaded
+  on demand.</b></td></tr></table></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Standalone Initialization Techniques</h2>
+<p><p><b>Manually execute all initialization scripts</b></p>
+<ul><li>Convert all initialization scripts into C strings and
+  put them in the executable.</li></ul><ul><li>Call <tt>Tcl_Eval()</tt> on each initialization script and omit the
+  call to <tt>Tcl_Init()</tt></li></ul><ul><li>Or, redefine <tt>tclInit</tt> so that it does not attempt to source
+  <tt>init.tcl</tt> then call <tt>Tcl_Eval()</tt> on each initialization
+  script after <tt>Tcl_Init()</tt> returns.</li></ul><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>This approach is not recommended</b></td></tr></table></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Standalone Initialization Techniques</h2>
+<p><p><b>Redefining the builtin <tt>source</tt> command</b></p>
+<ul><li>Convert all initialization scripts into C strings and
+  put them in the executable.</li></ul><ul><li>Create a new <tt>source</tt> command that
+  calls <tt>Tcl_Eval()</tt> on the appropriate built-in string
+  instead of reading from the disk.</li></ul><ul><li>Read from disk if the named file is not one that is built in.</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Redefining <tt>source</tt></h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>static&nbsp;char&nbsp;zInitTcl[]&nbsp;=&nbsp;"...";<br>
+static&nbsp;char&nbsp;zParrayTcl[]&nbsp;=&nbsp;"...";</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Scripts <tt>init.tcl</tt> and <tt>parray.tcl</tt></td>
+</tr>
+<tr><td valign="center">
+<small><tt><br>
+int&nbsp;NewSourceCmd(TCLARGS){</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if(&nbsp;!strcmp(argv[1],"/builtin/init.tcl")&nbsp;)<br>
+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;Tcl_Eval(interp,&nbsp;zInitTcl);<br>
+&nbsp;&nbsp;if(&nbsp;!strcmp(argv[1],"/builtin/parray.tcl")&nbsp;)<br>
+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;Tcl_Eval(interp,&nbsp;zParrayTcl);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Call <tt>Tcl_Eval()</tt> on builtin strings if the names match</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;Tcl_EvalFile(interp,&nbsp;argv[1]);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Call <tt>Tcl_EvalFile()</tt> if no match</td>
+</tr>
+<tr><td valign="center">
+<small><tt>}<br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;setenv("TCL_LIBRARY","/builtin");</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Causes <tt>tclInit</tt> to look for <tt>init.tcl</tt> in <tt>/builtin</tt></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_CreateCommand(interp,&nbsp;"source",<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;NewSourceCmd,&nbsp;0,&nbsp;0);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Redefine <tt>source</tt></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Init(interp);<br>
+&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
+&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Redefining <tt>source</tt></h2>
+<p><ul><li>This approach works for all versions of Tcl and Tk.</li></ul><ul><li>Also need to redefine the "<tt>file exists</tt>" Tcl command since it
+  too is used by <tt>tclInit</tt>.</li></ul><ul><li>To verify that the program is really standalone, remove the call
+  to <tt>Tcl_EvalFile()</tt>.</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Standalone Initialization Techniques</h2>
+<p><p><b>Use the <tt>Tcl</tt>*<tt>InsertProc()</tt> functions</b></p>
+<ul><li>Three routines that overload basic file I/O operations:
+  <ul>
+  <li> <tt>TclStatInsertProc()</tt> </li>
+  <li> <tt>TclAccessInsertProc()</tt> </li>
+  <li> <tt>TclOpenFileChannelInsertProc()</tt> </li>
+  </ul></li></ul><ul><li>Allows us to implement a virtual filesystem that overlays the
+  real filesystem.</li></ul><ul><li>The virtual filesystem contains all the initialization scripts
+  as compiled-in strings.  The initialization scripts look like
+  they are resident on disk even though they are built in.</li></ul><ul><li>These functions first appeared in Tcl8.0.3.  
+  Presumably to support TclPro Wrapper.</li></ul><ul><li>The only documentation is comments on the code. 
+  See the Tcl source file <tt>generic/tclIOUtil.c</tt></li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">The <tt>TclStatInsertProc()</tt> Function</h2>
+<p><ul><li>Sole argument is a pointer to a function whose interface is the
+  same as <tt>stat()</tt></li></ul><ul><li>Functions are stacked. Tcl tries each <tt>stat</tt> function on the
+  list, beginning with the most recently inserted, until one succeeds.</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">The <tt>TclStatInsertProc()</tt> Function</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tclInt.h></tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Rather than <tt>&lt;tcl.h&gt;</tt>!</td>
+</tr>
+<tr><td valign="center">
+<small><tt><br>
+static&nbsp;int<br>
+BltinFileStat(char&nbsp;*path,struct&nbsp;stat&nbsp;*buf){<br>
+&nbsp;&nbsp;char&nbsp;*zData;<br>
+&nbsp;&nbsp;int&nbsp;nData;</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;zData&nbsp;=&nbsp;FindBuiltinFile(path,&nbsp;0,&nbsp;&amp;nData);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Check if <tt>path</tt> is a builtin</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if(&nbsp;zData==0&nbsp;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-1;<br>
+&nbsp;&nbsp;}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Fail if <tt>path</tt> is not a builtin</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;memset(buf,&nbsp;0,&nbsp;sizeof(*buf));<br>
+&nbsp;&nbsp;buf->st_mode&nbsp;=&nbsp;0400;<br>
+&nbsp;&nbsp;buf->st_size&nbsp;=&nbsp;nData;</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;0;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Success if it is builtin</td>
+</tr>
+<tr><td valign="center">
+<small><tt>}<br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;TclStatInsertProc(BltinFileStat);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Register new <tt>stat</tt> function</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();<br>
+&nbsp;&nbsp;Tcl_Init(interp);<br>
+&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
+&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">The <tt>TclAccessInsertProc()</tt> Function</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tclInt.h></tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Rather than <tt>&lt;tcl.h&gt;</tt>!</td>
+</tr>
+<tr><td valign="center">
+<small><tt><br>
+/*&nbsp;BltinFileStat()&nbsp;not&nbsp;shown...&nbsp;*/<br>
+&nbsp;<br>
+static&nbsp;int<br>
+BltinFileAccess(char&nbsp;*path,&nbsp;int&nbsp;mode){<br>
+&nbsp;&nbsp;char&nbsp;*zData;</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if(&nbsp;mode&nbsp;&amp;&nbsp;3&nbsp;)&nbsp;return&nbsp;-1;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">All builtins are read-only</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;zData&nbsp;=&nbsp;FindBuiltinFile(path,&nbsp;0,&nbsp;&amp;nData);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Check if <tt>path</tt> is a builtin</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if(&nbsp;zData==0&nbsp;)&nbsp;return&nbsp;-1;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Fail if <tt>path</tt> is not a builtin</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;0;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Success if it is builtin</td>
+</tr>
+<tr><td valign="center">
+<small><tt>}<br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;TclStatInsertProc(BltinFileStat);<br>
+&nbsp;&nbsp;TclAccessInsertProc(BltinFileAccess);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Register new <tt>stat</tt> and <tt>access</tt> functions</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();<br>
+&nbsp;&nbsp;Tcl_Init(interp);<br>
+&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zInputLoop);<br>
+&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">The <tt>TclOpenFileChannelInsertProc()</tt> Function</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>static&nbsp;Tcl_Channel&nbsp;BuiltinFileOpen(<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp,&nbsp;&nbsp;&nbsp;/*&nbsp;The&nbsp;TCL&nbsp;interpreter&nbsp;doing&nbsp;the&nbsp;open&nbsp;*/<br>
+&nbsp;&nbsp;char&nbsp;*zFilename,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Name&nbsp;of&nbsp;the&nbsp;file&nbsp;to&nbsp;open&nbsp;*/<br>
+&nbsp;&nbsp;char&nbsp;*modeString,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Mode&nbsp;string&nbsp;for&nbsp;the&nbsp;open&nbsp;(ignored)&nbsp;*/<br>
+&nbsp;&nbsp;int&nbsp;permissions&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Permissions&nbsp;for&nbsp;a&nbsp;newly&nbsp;created&nbsp;file&nbsp;(ignored)&nbsp;*/<br>
+){<br>
+&nbsp;&nbsp;char&nbsp;*zData;<br>
+&nbsp;&nbsp;BuiltinFileStruct&nbsp;*p;<br>
+&nbsp;&nbsp;int&nbsp;nData;<br>
+&nbsp;&nbsp;char&nbsp;zName[50];<br>
+&nbsp;&nbsp;Tcl_Channel&nbsp;chan;<br>
+&nbsp;&nbsp;static&nbsp;int&nbsp;count&nbsp;=&nbsp;1;<br>
+&nbsp;<br>
+&nbsp;&nbsp;zData&nbsp;=&nbsp;FindBuiltinFile(zFilename,&nbsp;1,&nbsp;&amp;nData);<br>
+&nbsp;&nbsp;if(&nbsp;zData==0&nbsp;)&nbsp;return&nbsp;NULL;<br>
+&nbsp;&nbsp;p&nbsp;=&nbsp;(BuiltinFileStruct*)Tcl_Alloc(&nbsp;sizeof(BuiltinFileStruct)&nbsp;);<br>
+&nbsp;&nbsp;if(&nbsp;p==0&nbsp;)&nbsp;return&nbsp;NULL;<br>
+&nbsp;&nbsp;p->zData&nbsp;=&nbsp;zData;<br>
+&nbsp;&nbsp;p->nData&nbsp;=&nbsp;nData;<br>
+&nbsp;&nbsp;p->cursor&nbsp;=&nbsp;0;<br>
+&nbsp;&nbsp;sprintf(zName,"etbi_bffffc7c_8049b04",((int)BuiltinFileOpen)>>12,count++);<br>
+&nbsp;&nbsp;chan&nbsp;=&nbsp;Tcl_CreateChannel(&amp;builtinChannelType,&nbsp;zName,&nbsp;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(ClientData)p,&nbsp;TCL_READABLE);<br>
+&nbsp;&nbsp;return&nbsp;chan;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">The <tt>TclOpenFileChannelInsertProc()</tt> Function</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>static&nbsp;Tcl_ChannelType&nbsp;builtinChannelType&nbsp;=&nbsp;{<br>
+&nbsp;&nbsp;"builtin",&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Type&nbsp;name.&nbsp;*/<br>
+&nbsp;&nbsp;NULL,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Always&nbsp;non-blocking.*/<br>
+&nbsp;&nbsp;BuiltinFileClose,&nbsp;&nbsp;&nbsp;/*&nbsp;Close&nbsp;proc.&nbsp;*/<br>
+&nbsp;&nbsp;BuiltinFileInput,&nbsp;&nbsp;&nbsp;/*&nbsp;Input&nbsp;proc.&nbsp;*/<br>
+&nbsp;&nbsp;BuiltinFileOutput,&nbsp;&nbsp;/*&nbsp;Output&nbsp;proc.&nbsp;*/<br>
+&nbsp;&nbsp;BuiltinFileSeek,&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Seek&nbsp;proc.&nbsp;*/<br>
+&nbsp;&nbsp;NULL,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Set&nbsp;option&nbsp;proc.&nbsp;*/<br>
+&nbsp;&nbsp;NULL,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Get&nbsp;option&nbsp;proc.&nbsp;*/<br>
+&nbsp;&nbsp;BuiltinFileWatch,&nbsp;&nbsp;&nbsp;/*&nbsp;Watch&nbsp;for&nbsp;events&nbsp;on&nbsp;console.&nbsp;*/<br>
+&nbsp;&nbsp;BuiltinFileHandle,&nbsp;&nbsp;/*&nbsp;Get&nbsp;a&nbsp;handle&nbsp;from&nbsp;the&nbsp;device.&nbsp;*/<br>
+};</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p>
+  <p>For additional information see:</p>
+  <ul>
+  <li>The man page for <tt>Tcl_CreateChannel()</tt></li>
+  <li>Tk source code file <tt>generic/tkConsole.c</tt></li>
+  </ul>
+</p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Initializing Tk</h2>
+<p><ul><li>All the same initialization script issues as Tcl</li></ul><ul><li>Tk initialization scripts are in a different directory
+  than the Tcl initialization scripts - the "Tk Library"</li></ul><ul><li>Call <tt>Tk_Init()</tt> after <tt>Tcl_Init()</tt></li></ul><ul><li>Must have an event loop or Tk will not work!</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Implementing An Event Loop</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>button&nbsp;.b&nbsp;-text&nbsp;Hello&nbsp;-command&nbsp;exit<br>
+pack&nbsp;.b</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Create a Tk interface</td>
+</tr>
+<tr><td valign="center">
+<small><tt><br>
+</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>bind&nbsp;.&nbsp;&lt;Destroy>&nbsp;{<br>
+&nbsp;&nbsp;if&nbsp;{![winfo&nbsp;exists&nbsp;.]}&nbsp;exit<br>
+}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Close the application when the main window
+  is destroyed</td>
+</tr>
+<tr><td valign="center">
+<small><tt><br>
+</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>while&nbsp;1&nbsp;{vwait&nbsp;forever}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">The event loop</td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">"Hello, World!" Using Tk</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tk.h><br>
+&nbsp;<br>
+</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>static&nbsp;char&nbsp;zHello[]&nbsp;=&nbsp;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">The application code</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;"button&nbsp;.b&nbsp;"<br>
+&nbsp;&nbsp;&nbsp;&nbsp;"-text&nbsp;{Hello,&nbsp;World}&nbsp;"<br>
+&nbsp;&nbsp;&nbsp;&nbsp;"-command&nbsp;exit\n"<br>
+&nbsp;&nbsp;"pack&nbsp;.b\n";<br>
+&nbsp;<br>
+</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>static&nbsp;char&nbsp;zEventLoop[]&nbsp;=</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">The event loop</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;"bind&nbsp;.&nbsp;&lt;Destroy>&nbsp;{\n"<br>
+&nbsp;&nbsp;"&nbsp;&nbsp;if&nbsp;{![winfo&nbsp;exists&nbsp;.]}&nbsp;exit\n"<br>
+&nbsp;&nbsp;"}\n"<br>
+&nbsp;&nbsp;"while&nbsp;1&nbsp;{vwait&nbsp;forever}\n";<br>
+&nbsp;<br>
+<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;Tcl_Interp&nbsp;*interp;<br>
+&nbsp;&nbsp;interp&nbsp;=&nbsp;Tcl_CreateInterp();</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Init(interp);<br>
+&nbsp;&nbsp;Tk_Init(interp);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">We really should check the return values of the init functions...</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zHello);</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_Eval(interp,&nbsp;zEventLoop);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">The event loop never returns</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;/*NOTREACHED*/<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Compiling "Hello, World!" For Tk</h2>
+<p><p><b>Unix:</b></p>
+  <blockquote><pre>
+  $ gcc hello.c -ltk -L/usr/X11R6/lib \ 
+        -lX11 -ltcl -lm -ldl
+  $ ./a.out</pre></blockquote>
+
+  <p><b>Windows using Cygwin:</b></p>
+  <blockquote><pre>
+  C:> gcc hello.c -mwindows -ltk80 -ltcl80 -lm
+  C:> a.exe</pre></blockquote>
+
+  <p><b>Windows using Mingw32:</b></p>
+  <blockquote><pre>
+  C:> gcc -mno-cygwin hello.c -mwindows \ 
+           -ltk82 -ltcl82 -lm
+  C:> a.exe</pre></blockquote></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Making The Program Standalone</h2>
+<p><p>To make a Tcl application standalone you have to convert the following
+     initialization scripts to C strings and compile them into the
+     executable:</p>
+  <table><tr>
+  <td valign="top"><tt>
+    &nbsp;&nbsp;auto.tcl<br>
+    &nbsp;&nbsp;history.tcl<br>
+    &nbsp;&nbsp;init.tcl
+  </tt></td>
+  <td valign="top"><tt>
+    &nbsp;&nbsp;ldAout.tcl<br>
+    &nbsp;&nbsp;package.tcl
+  </tt></td>
+  <td valign="top"><tt>
+    &nbsp;&nbsp;parray.tcl<br>
+    &nbsp;&nbsp;safe.tcl
+  </tt></td>
+  <td valign="top"><tt>
+    &nbsp;&nbsp;tclIndex<br>
+    &nbsp;&nbsp;word.tcl
+  </tt></td>
+  </tr></table>
+
+  <p>To make a Tk application standalone requires these additional
+     initialization scripts from the Tk Library:</p>
+  <table><tr>
+  <td valign="top"><tt>
+    &nbsp;&nbsp;bgerror.tcl<br>
+    &nbsp;&nbsp;button.tcl<br>
+    &nbsp;&nbsp;clrpick.tcl<br>
+    &nbsp;&nbsp;comdlg.tcl<br>
+    &nbsp;&nbsp;console.tcl<br>
+    &nbsp;&nbsp;dialog.tcl
+  </tt></td>
+  <td valign="top"><tt>
+    &nbsp;&nbsp;entry.tcl<br>
+    &nbsp;&nbsp;focus.tcl<br>
+    &nbsp;&nbsp;listbox.tcl<br>
+    &nbsp;&nbsp;menu.tcl<br>
+    &nbsp;&nbsp;msgbox.tcl<br>
+    &nbsp;&nbsp;optMenu.tcl
+  </tt></td>
+  <td valign="top"><tt>
+    &nbsp;&nbsp;palette.tcl<br>
+    &nbsp;&nbsp;safetk.tcl<br>
+    &nbsp;&nbsp;scale.tcl<br>
+    &nbsp;&nbsp;scrlbar.tcl<br>
+    &nbsp;&nbsp;tclIndex<br>
+    &nbsp;&nbsp;tearoff.tcl
+  </tt></td>
+  <td valign="top"><tt>
+    &nbsp;&nbsp;text.tcl<br>
+    &nbsp;&nbsp;tk.tcl<br>
+    &nbsp;&nbsp;tkfbox.tcl<br>
+    &nbsp;&nbsp;xmfbox.tcl
+  </tt></td>
+  </tr></table>
+
+  <p>Total of about 13K lines and 400K bytes of text or 9K lines and
+     250K bytes if you strip comments and leading spaces</p></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">A Review Of The Features We Want</h2>
+<p><ol type="A">
+  <li value="1">
+  Combine C/C++ with Tcl/Tk into a single executable.</dd>
+  </li></ol>
+
+  <ol type="A">
+  <li value="2">
+  The executable should be standalone.  It must not depend
+  on files not normally found on the system.
+  </li></ol>
+
+  <ol type="A">
+  <li value="3">
+  It should be difficult for end users to alter the program
+  (and introduce bugs).
+  </li></ol></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Available Programming Aids</h2>
+<p><p>Several tools are available.  The chart below shows which tools
+ help achieve which objectives.</p>
+
+ <center><table border="2">
+ <tr>
+   <td></td>
+   <td colspan="3" align="center">
+      <b>Features The Tool Helps To Achieve</b></td>
+ </tr>
+ <tr>
+   <td align="center"><b>Tool Name</b></td>
+   <td align="center">Mix C and Tcl</td>
+   <td align="center">Standalone</td>
+   <td align="center">Hide Source</td>
+ </tr>
+ <tr>
+   <td>SWIG</td>
+   <td align="center"><img src="image6"></td>
+   <td>&nbsp;</td>
+   <td>&nbsp;</td>
+ </tr>
+ <tr>
+   <td>TclPro Wrapper</td>
+   <td>&nbsp;</td>
+   <td align="center"><img src="image6"></td>
+   <td align="center"><img src="image6"></td>
+ </tr>
+ <tr>
+   <td>FreeWrap</td>
+   <td>&nbsp;</td>
+   <td align="center"><img src="image6"></td>
+   <td align="center"><img src="image6"></td>
+ </tr>
+ <tr>
+   <td>Wrap</td>
+   <td>&nbsp;</td>
+   <td align="center"><img src="image6"></td>
+   <td>&nbsp;</td>
+ </tr>
+ <tr>
+   <td>mktclapp</td>
+   <td align="center"><img src="image6"></td>
+   <td align="center"><img src="image6"></td>
+   <td align="center"><img src="image6"></td>
+ </tr>
+ </table></center></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">SWIG</h2>
+<table><tr><td valign="top"><img src="image7"></td>
+<td valign="top"><p><ul><li>Creates an interface between an existing C/C++ library and a high-level
+  programming language.  Support for:
+  <ul>
+  <li> Tcl/Tk </li>
+  <li> Perl </li>
+  <li> Python </li>
+  <li> Java </li>
+  <li> Eiffel </li>
+  <li> Guile </li>
+  </ul></li></ul><ul><li>No changes required to C/C++ code.  Can be used with legacy libraries.</li></ul><ul><li>Generates an extension, not a standalone binary</li></ul><ul><li>The tutorial on SWIG was yesterday afternoon.</li></ul><ul><li>http://www.swig.org/</li></ul></p></td></tr></table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Wrapper Programs</h2>
+<table><tr><td valign="top"><img src="image8"></td>
+<td valign="top"><p><ul><li>Convert a pure Tcl/Tk program into a standalone binary</li></ul><ul><li>Several wrapper programs are available:
+  <ul>
+  <li> TclPro Wrapper - http://www.scriptics.com/ </li>
+  <li> FreeWrap - http://www.albany.net/~dlabelle/freewrap/freewrap.html </li>
+  <li> Wrap - http://members1.chello.nl/~j.nijtmans/wrap.html </li>
+  </ul></li></ul><ul><li>No C compiler required!</li></ul><ul><li>TclPro will convert Tcl script into bytecode so that it cannot be
+  easily read by the end user.  FreeWrap encrypts the scripts.</li></ul><ul><li>FreeWrap uses compression on its executable. 
+  Wrap uses compression on both the executable and on the bundled script files.</li></ul><ul><li>Usually include extensions like winico and/or BLT</li></ul></p></td></tr></table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">mktclapp</h2>
+<table><tr><td valign="top"><img src="image9"></td>
+<td valign="top"><p><ul><li>Mix C/C++ with Tcl/Tk into a standalone binary</li></ul>
+<ul><li><tt>mktclapp</tt> generates an application initialization file
+  that contains Tcl scripts as strings and makes all necessary calls 
+  to <tt>Tcl_Init</tt>, <tt>Tcl_CreateCommand</tt>, 
+  <tt>Tcl</tt>*<tt>InsertProc</tt>, etc.</li></ul><ul><li>Features to make it easier to write new Tcl command in C</li></ul><ul><li><tt>xmktclapp.tcl</tt> provides a GUI interface to <tt>mktclapp</tt></li></ul><ul><li>http://www.hwaci.com/sw/mktclapp/</li></ul></p></td></tr></table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">"Hello, World!" Using Mktclapp</h2>
+<p><ul><li>Download <tt>mktclapp.c</tt> and <tt>xmktclapp.tcl</tt> from
+  http://www.hwaci.com/sw/mktclapp/</li></ul><ul><li>Compile <tt>mktclapp</tt>:
+  <blockquote><pre>
+  cc -o mktclapp mktclapp.c
+  </pre></blockquote></li></ul><ul><li>Create "Hello, World!" as a Tcl script in file <tt>hw.tcl</tt>:
+  <blockquote><pre>
+  button .b -text {Hello, World!} -command exit
+  pack .b
+  </pre></blockquote></li></ul><ul><li>Launch xmktclapp:
+  <blockquote><pre>
+  wish xmktclapp.tcl
+  </pre></blockquote></li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">"Hello, World!" Using Mktclapp</h2>
+<table width="100%"><tr><td valign="top"><p><ul><li>Set "Command Line Input?" to "None"</li></ul><ul><li>Set "Standalone?" to "Yes"</li></ul><ul><li>Enter "<tt>hw.mta</tt>" for the Configuration File</li></ul><ul><li>Enter "<tt>hw.c</tt>" for the Output C File</li></ul></p></td>
+<td valign="top" align="right"><img src="image10"></td></tr></table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">"Hello, World!" Using Mktclapp</h2>
+<table width="100%"><tr><td valign="top"><p><ul><li>Go to the "Tcl Scripts" page</li></ul><ul><li>Press "Insert" and add <tt>hw.tcl</tt> to the list of
+  Tcl scripts</li></ul><ul><li>Change the "Startup Script" to be <tt>hw.tcl</tt>.</li></ul><ul><li>Select File/Build and File/Exit</li></ul></p></td>
+<td valign="top" align="right"><img src="image11"></td></tr></table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">"Hello, World!" Using Mktclapp</h2>
+<p><ul><li>Mktclapp generates <tt>hw.c</tt>.
+  Compile it something like this:
+  <pre>
+  cc hw.c -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl
+  </pre></li></ul><ul><li>Or, if using Cygwin:
+  <pre>
+  gcc hw.c -mwindows -ltk80 -ltcl80 -lm
+  </pre></li></ul><ul><li>Or, if using Mingw32:
+  <pre>
+  gcc -mno-cygwin hw.c -mwindows -ltk82 -ltcl82 -lm
+  </pre></li></ul><ul><li>And you're done!</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Adding C Code To Your Program</h2>
+<p>Put the new C code in a new source file named "<tt>add.c</tt>"</p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;"hw.h"</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Generated by mktclapp</td>
+</tr>
+<tr><td valign="center">
+<small><tt></tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>int&nbsp;ET_COMMAND_add(ET_TCLARGS){</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><tt>ET_TCLARGS</tt> is a macro defined in <tt>hw.h</tt></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;int&nbsp;a,&nbsp;b;<br>
+&nbsp;&nbsp;char&nbsp;zResult[30];<br>
+&nbsp;&nbsp;a&nbsp;=&nbsp;atoi(argv[1]);<br>
+&nbsp;&nbsp;b&nbsp;=&nbsp;atoi(argv[2]);<br>
+&nbsp;&nbsp;sprintf(zResult,&nbsp;"-1073742724",&nbsp;a+b);<br>
+&nbsp;&nbsp;Tcl_SetResult(interp,&nbsp;zResult,&nbsp;TCL_VOLATILE);<br>
+&nbsp;&nbsp;return&nbsp;TCL_OK;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Adding C Code To Your Program</h2>
+<table width="100%"><tr><td valign="top"><p><ul><li>Go to the "C/C++ Modules" page of xmktclapp.tcl</li></ul>
+<ul><li>Press "Insert" and add <tt>add.c</tt> to the list of
+  C/C++ modules</p></li></ul></li></ul><ul><li>Select File/Build and File/Exit</li></ul></p></td>
+<td valign="top" align="right"><img src="image12"></td></tr></table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Adding C Code To Your Program</h2>
+<p><ul><li>Compile as follows:
+  <pre>
+  cc add.c hw.c -ltk -L/usr/X11R6/lib -ltcl -lm -ldl
+  </pre></li></ul><ul><li>Or construct a Makefile that compiles <tt>add.c</tt> into <tt>add.o</tt>
+  and <tt>hw.c</tt> into <tt>hw.o</tt> and then links them.</li></ul><ul><li>Compile the same way for Windows except use the usual Windows
+  libraries and options...</li></ul><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>Don't have to worry with <tt>Tcl_CreateCommand()</tt> - Mktclapp takes
+  care of that automatically.</b></td></tr></table></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Checking Parameters In The <tt>add</tt> Command</h2>
+<p>Modify <tt>add.c</tt> to insure the <tt>add</tt> command
+  is called with exactly two integer arguments</p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;"hw.h"<br>
+&nbsp;<br>
+int&nbsp;ET_COMMAND_add(ET_TCLARGS){<br>
+&nbsp;&nbsp;int&nbsp;a,&nbsp;b;<br>
+&nbsp;&nbsp;char&nbsp;zResult[30];</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if(&nbsp;argc!=3&nbsp;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;Tcl_AppendResult(interp,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"wrong&nbsp;#&nbsp;args:&nbsp;should&nbsp;be:&nbsp;\"",<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;argv[0],&nbsp;"&nbsp;VALUE&nbsp;VALUE\"",&nbsp;0);<br>
+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
+&nbsp;&nbsp;}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Report an error if there are not exactly
+  2 arguments</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if(&nbsp;Tcl_GetInt(interp,&nbsp;argv[1],&nbsp;&amp;a)!=TCL_OK&nbsp;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
+&nbsp;&nbsp;}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Report an error if the first argument is
+  not an integer</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if(&nbsp;Tcl_GetInt(interp,&nbsp;argv[2],&nbsp;&amp;b)!=TCL_OK&nbsp;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
+&nbsp;&nbsp;}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Do the same for the second argument</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;sprintf(zResult,&nbsp;"-1073742724",&nbsp;a+b);<br>
+&nbsp;&nbsp;Tcl_SetResult(interp,&nbsp;zResult,&nbsp;TCL_VOLATILE);<br>
+&nbsp;&nbsp;return&nbsp;TCL_OK;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Using The Tcl_Obj Interface</h2>
+<p>In the file <tt>objadd.c</tt> put this code:</p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;"hw.h"</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt><br>
+int&nbsp;ET_OBJCOMMAND_add2(ET_OBJARGS){<br>
+&nbsp;&nbsp;int&nbsp;a,&nbsp;b;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Use "<tt>ET_OBJCOMMAND</tt>" instead of "<tt>ET_COMMAND</tt>" and
+  "<tt>ET_OBJARGS</tt>" instead of "<tt>ET_TCLARGS</tt>"</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if(&nbsp;objc!=3&nbsp;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;Tcl_WrongNumArgs(interp,&nbsp;1,&nbsp;objv,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"number&nbsp;number");<br>
+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
+&nbsp;&nbsp;}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">A special routine for "wrong # args" error</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if(&nbsp;Tcl_GetIntFromObj(interp,&nbsp;objv[1],&nbsp;&amp;a)&nbsp;){</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Instead of <tt>Tcl_GetInt</tt></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
+&nbsp;&nbsp;}<br>
+&nbsp;&nbsp;if(&nbsp;Tcl_GetIntFromObj(interp,&nbsp;objv[2],&nbsp;&amp;b)&nbsp;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
+&nbsp;&nbsp;}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_SetIntObj(Tcl_GetObjResult(interp),&nbsp;a+b);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Result stored as integer, not a string</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;TCL_OK;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Speed Of Tcl_Obj Versus "char*"  Interfaces</h2>
+<p><ul><li>Compile both <tt>add</tt> and <tt>add2</tt> into the same executable.</li></ul><ul><li>Compare their speeds:
+  <pre>
+   time {add 123456 654321} 10000
+  <font color="blue">26 microseconds per iteration</font>
+   time {add2 123456 654321} 10000
+  <font color="blue">4 microseconds per iteration</font>
+  </pre></li></ul><ul><li>The Tcl_Obj version is 650 faster!</li></ul><ul><li>Replace the addition with a "real" computation that takes
+  10 milliseconds.</li></ul><ul><li>Now the Tcl_Obj version is only 0.2 faster!</li></ul><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>In many real-world problems, the Tcl_Obj interface has no noticeable
+  speed advantage over the string interface.</b></td></tr></table></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">More About Built-in Tcl Scripts</h2>
+<table><tr><td valign="top"><img src="image11"></td>
+<td valign="top"><p><ul><li>Comments and leading white-space are removed from the
+  script by default.  Use the "Don't Strip Comments"
+  button to change this.</li></ul><ul><li>The file name must exactly match the name that is
+  used by the <tt>source</tt> command.</li></ul></p></td></tr></table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Locations Of Libraries</h2>
+<table><tr><td valign="top"><img src="image13"></td>
+<td valign="top"><p><ul><li>Tells mktclapp where to look for script libraries.</li></ul><ul><li>All Tcl scripts in the indicated directories are
+  compiled into the <tt>appinit.c</tt> file.</li></ul><ul><li>Comments and extra white-space are removed. 
+  There is no way to turn this off.</li></ul></p></td></tr></table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Built-in Binary Data Files</h2>
+<table><tr><td valign="top"><img src="image14"></td>
+<td valign="top"><p><ul><li>Arbitrary files become part of the virtual filesystem</li></ul><ul><li>No comment or white-space removal is attempted</li></ul><ul><li>Useful for images or other binary data</li></ul></p></td></tr></table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">New Commands In Namespaces</h2>
+<p>Two underscores (__)  are replaced by two colons (::) in
+  command names, thus giving the ability to define new commands
+  in a namespace</p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;hw.h></tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt><br>
+int&nbsp;ET_COMMAND_adder__add(ET_TCLARGS){<br>
+&nbsp;&nbsp;int&nbsp;a,&nbsp;b;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Creates the Tcl command called "<tt>adder::add</tt>"</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;char&nbsp;*zResult[30];<br>
+&nbsp;&nbsp;if(&nbsp;argc!=3&nbsp;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;Tcl_AppendResult(interp,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"wrong&nbsp;#&nbsp;args:&nbsp;should&nbsp;be:&nbsp;\"",<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;argv[0],&nbsp;"&nbsp;VALUE&nbsp;VALUE\"",&nbsp;0);<br>
+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
+&nbsp;&nbsp;}<br>
+&nbsp;&nbsp;if(&nbsp;Tcl_GetInt(interp,&nbsp;argv[1],&nbsp;&amp;a)!=TCL_OK&nbsp;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
+&nbsp;&nbsp;}<br>
+&nbsp;&nbsp;if(&nbsp;Tcl_GetInt(interp,&nbsp;argv[1],&nbsp;&amp;b)!=TCL_OK&nbsp;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
+&nbsp;&nbsp;}<br>
+&nbsp;&nbsp;sprintf(zResult,&nbsp;"-1073742724",&nbsp;a+b);<br>
+&nbsp;&nbsp;Tcl_SetResult(interp,&nbsp;zResult,&nbsp;TCL_VOLATILE);<br>
+&nbsp;&nbsp;return&nbsp;TCL_OK;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Adding Your Own <tt>main()</tt></h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;/*&nbsp;Application&nbsp;specific&nbsp;initialization&nbsp;*/</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Et_Init(argc,&nbsp;argv);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Never returns!</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;/*NOTREACHED*/<br>
+&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p><table><tr><td valign="top"><img src="image3"></td>
+<td valign="top"><b>The "Autofork" feature is disabled if you supply your own <tt>main()</tt></b></td></tr></table>
+</p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Initializing The Tcl Interpreter</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+&nbsp;<br>
+int&nbsp;counter&nbsp;=&nbsp;0;<br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
+&nbsp;&nbsp;&nbsp;Et_Init(argc,&nbsp;argv);<br>
+&nbsp;&nbsp;&nbsp;/*NOTREACHED*/<br>
+&nbsp;&nbsp;&nbsp;return&nbsp;0;<br>
+}<br>
+&nbsp;<br>
+int&nbsp;Et_AppInit(Tcl_Interp&nbsp;*interp){</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;if(&nbsp;Blt_Init(Interp)&nbsp;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;TCL_ERROR;<br>
+&nbsp;&nbsp;}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Example: Initialize an extension</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Tcl_LinkVar(interp,&nbsp;"counter",&nbsp;&amp;counter,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TCL_LINK_INT);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Or link a C variable to a Tcl variable</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return&nbsp;TCL_OK;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Return TCL_OK if successful</td>
+</tr>
+<tr><td valign="center">
+<small><tt>}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Writing Your Own Event Loop</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>void&nbsp;Et_CustomMainLoop(Tcl_Interp&nbsp;*interp){</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Replaces the default event loop</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;return;</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Ex: Return without handling any events.</td>
+</tr>
+<tr><td valign="center">
+<small><tt>}<br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Et_Init(argc,&nbsp;argv);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">This now returns after initializing Tcl</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;/*&nbsp;Application&nbsp;code&nbsp;here&nbsp;*/<br>
+&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Writing Your Own Event Loop</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;&lt;tcl.h><br>
+&nbsp;<br>
+void&nbsp;Et_CustomMainLoop(Tcl_Interp&nbsp;*interp){</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;for(;;){<br>
+&nbsp;&nbsp;&nbsp;&nbsp;Tcl_DoOneEvent(TCL_ALL_EVENTS|TCL_DONT_WAIT);<br>
+&nbsp;&nbsp;&nbsp;&nbsp;/*&nbsp;Other&nbsp;processing...&nbsp;*/<br>
+&nbsp;&nbsp;}</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Intermix processing and event handling</td>
+</tr>
+<tr><td valign="center">
+<small><tt>}<br>
+&nbsp;<br>
+int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;Et_Init(argc,&nbsp;argv);</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Never returns</td>
+</tr>
+<tr><td valign="center">
+<small><tt>&nbsp;&nbsp;/*NOTREACHED*/<br>
+&nbsp;&nbsp;return&nbsp;0;<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Mktclapp Initialization Sequence</h2>
+<p><ul><li>Initialization starts when the <tt>Et_Init()</tt> 
+  function is called either by client code or by
+  the <tt>main()</tt> that mktclapp generates</li></ul><ul><li>Create the main Tcl interpreter</li></ul><ul><li>Construct the virtual filesystem overlay by redefining
+  the <tt>source</tt> command and by using the 
+  <tt>Tcl</tt>*<tt>InsertProc()</tt> functions</li></ul><ul><li>Call <tt>Et_PreInit()</tt> if the client defines it</li></ul><ul><li>Call <tt>Tcl_Init()</tt> and <tt>Tk_Init()</tt></li></ul><ul><li>Call <tt>Tcl_CreateCommand()</tt> and <tt>Tcl_CreateObjCommand()</tt>
+  for every <tt>ET_COMMAND_</tt>* and <tt>ET_OBJCOMMAND_</tt>* function
+  in the client code</li></ul><ul><li>Call <tt>Et_AppInit()</tt> if the client defines it</li></ul><ul><li>Run the main Tcl script if there is one</li></ul><ul><li>Call <tt>Et_CustomMainLoop()</tt> if defined by client code or
+  else run the built-in event loop</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Invoking Tcl From C</h2>
+<p><ul><li>Use one of the built-in evaluation functions:
+  <center><table width="80%">
+  <tr><td valign="top" width="50%"><ul>
+     <li> Tcl_Eval() </li>
+     <li> Tcl_VarEval() </li>
+     <li> Tcl_EvalFile() </li>
+     <li> Tcl_GlobalEval() </li>
+     </ul></td>
+  <td valign="top" width="50%"><ul>
+     <li> Tcl_EvalObj() </li>
+     <li> Tcl_GlobalEvalObj() </li>
+   </ul></td></tr>
+  </table></center></li></ul><ul><li>Mktclapp provides evaluation functions with variable argument
+  lists as in <tt>printf()</tt>:
+  <ul>
+  <li> Et_EvalF() </li>
+  <li> Et_GlobalEvalF() </li>
+  </ul></li></ul><ul><li>Mktclapp provides a global variable <tt>Et_Interp</tt> which is
+  a pointer to the main interpreter</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Invoking Tcl From C</h2>
+<p>Example:  A C function that pops up an error message dialog box</p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;"appinit.h"<br>
+&nbsp;<br>
+void&nbsp;ErrMsg(char&nbsp;*zMsg){<br>
+&nbsp;&nbsp;Tcl_SetVar(Et_Interp,&nbsp;"zMsg",&nbsp;zMsg,&nbsp;TCL_GLOBAL_ONLY);<br>
+&nbsp;&nbsp;Tcl_GlobalEval(Et_Interp,&nbsp;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;"tk_messageBox&nbsp;-icon&nbsp;error&nbsp;-msg&nbsp;$zMsg&nbsp;-type&nbsp;ok");<br>
+&nbsp;&nbsp;Tcl_UnsetVar(Et_Interp,&nbsp;"zMsg",&nbsp;TCL_GLOBAL_ONLY);<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Invoking Tcl From C</h2>
+<p>The same C function implemented using <tt>Et_EvalF()</tt> instead
+  of <tt>Tcl_GlobalEval()</tt></p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;"appinit.h"<br>
+&nbsp;<br>
+void&nbsp;ErrMsg(char&nbsp;*zMsg){<br>
+&nbsp;&nbsp;Et_EvalF(Et_Interp,&nbsp;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;"tk_messageBox&nbsp;-icon&nbsp;error&nbsp;-msg&nbsp;{厚��P�X�}&nbsp;-type&nbsp;ok",<br>
+&nbsp;&nbsp;&nbsp;&nbsp;zMsg);<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p>
+  <ul><li>
+  Suppose the function is called as follows:
+  <blockquote>
+    <tt>ErrMsg("Syntax error near \"}\"");</tt>
+  </blockquote>
+  </li></ul>
+
+  <ul><li>
+  The command that gets executed is:
+  <pre>
+    tk_messageBox -icon error -msg \ 
+        {Syntax error near "}"} -type ok
+  </pre>
+  </li></ul>
+
+  <ul><li>
+  But this is an ill-formed Tcl command!
+  </li></ul>
+</p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Invoking Tcl From C</h2>
+<p>Use the "<tt></tt>" format to generate a quoted string</p><p>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#include&nbsp;"appinit.h"<br>
+&nbsp;<br>
+void&nbsp;ErrMsg(char&nbsp;*zMsg){<br>
+&nbsp;&nbsp;Et_EvalF(Et_Interp,&nbsp;<br>
+&nbsp;&nbsp;&nbsp;&nbsp;"tk_messageBox&nbsp;-icon&nbsp;error&nbsp;-msg&nbsp;\"%\"&nbsp;-type&nbsp;ok",<br>
+&nbsp;&nbsp;&nbsp;&nbsp;zMsg);<br>
+}</tt></small></td>
+<td></td><td></td><td></td><td></td>
+</tr>
+</table>
+<p><ul><li>The <tt></tt> puts a backslash before all characters that
+  are special to Tcl</li></ul><ul><li>The Tcl command becomes:
+  <pre>
+    tk_messageBox -icon error -msg \ 
+        "Syntax error near \"\}\"" -type ok
+  </pre></li></ul></p>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Other Functions Provided By Mktclapp</h2>
+<p><ul><li><tt>void Et_ResultF(Tcl_Interp*, ...);</tt></li></ul><ul><li><tt>char *Et_DStringAppendF(Tcl_DString*, ...);</tt></li></ul><ul><li><tt>int Et_AppendObjF(Tcl_Obj*, ...);</tt></li></ul><ul><li><tt>char *mprintf(const char *format, ...);<br>
+  char *vmprintf(const char *format, va_list);</tt></li></ul><ul><li><tt>void Et_NewBuiltinFile(char *filename, char *data, int amt);</tt></li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Operating Mktclapp From The Command Line</h2>
+<p><ul><li>Generate the <tt>appinit.h</tt> header file like this:
+  <blockquote>
+  <tt>mktclapp -header &gt;appinit.h</tt>
+  </blockquote></li></ul><ul><li>Generate the <tt>appinit.c</tt> file like this:
+  <blockquote>
+  <tt>mktclapp -f appinit.mta >appinit.c</tt>
+  </blockquote></li></ul><ul><li>The <tt>*.mta</tt> file is just a list of command-line options</li></ul><ul><li>Enter
+  <blockquote>
+  <tt>mktclapp -help</tt>
+  </blockquote>
+  to get a list of available options</li></ul><ul><li>Look at MTA files generated by xmktclapp.tcl for examples</li></ul></p>
+<br clear="both"><p><hr></p>
+<h2 align="center">Format Of An MTA File</h2>
+<table cellspacing="0" cellpadding="0" border="0">
+<tr><td valign="center">
+<small><tt>#&nbsp;Configuration&nbsp;file&nbsp;generated&nbsp;by&nbsp;xmktclapp<br>
+#&nbsp;Hand&nbsp;editing&nbsp;is&nbsp;not&nbsp;recommended<br>
+#</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Comments begin with one #</td>
+</tr>
+<tr><td valign="center">
+<small><tt>##&nbsp;Autofork&nbsp;No<br>
+##&nbsp;CFile:add.c&nbsp;1<br>
+##&nbsp;CFile:objadd.c&nbsp;1<br>
+##&nbsp;CmdLine&nbsp;Console<br>
+##&nbsp;ConfigFile&nbsp;hw.mta<br>
+##&nbsp;Data:check.gif&nbsp;1<br>
+##&nbsp;MainScript&nbsp;hw.tcl<br>
+##&nbsp;Mode&nbsp;Tcl/Tk<br>
+##&nbsp;NoSource&nbsp;No<br>
+##&nbsp;OutputFile&nbsp;hw.c<br>
+##&nbsp;Shroud&nbsp;No<br>
+##&nbsp;Standalone&nbsp;Yes<br>
+##&nbsp;TclFile:hw.tcl&nbsp;1<br>
+##&nbsp;TclLib&nbsp;/usr/lib/tcl8.0<br>
+##&nbsp;TkLib&nbsp;/usr/lib/tk8.0</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">Lines beginning with two #s are used
+  by xmktclapp.tcl and ignored by mktclapp</td>
+</tr>
+<tr><td valign="center">
+<small><tt>-console<br>
+-main-script&nbsp;"hw.tcl"<br>
+-tcl-library&nbsp;"/usr/lib/tcl8.0"<br>
+-tk-library&nbsp;"/usr/lib/tk8.0"<br>
+"add.c"<br>
+"objadd.c"<br>
+-i&nbsp;"check.gif"<br>
+-strip-tcl&nbsp;"hw.tcl"</tt></small></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center"><img src="image2"></td>
+<td>&nbsp;&nbsp;</td>
+<td valign="center">All other lines are read by mktclapp and
+  ignored by xmktclapp.tcl</td>
+</tr>
+</table>
+
+<br clear="both"><p><hr></p>
+<h2 align="center">Summary</h2>
+<p><ul><li>Use Tcl for the things Tcl is good at and use C/C++ for the things that
+  C/C++ is good at</li></ul><ul><li>Use wrapper programs to make pure Tcl programs standalone</li></ul><ul><li>Use mktclapp to combine Tcl/Tk with C/C++ into a standalone</li></ul></p>
+<br clear="both"><p><hr></p>
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image1 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image1
new file mode 100644
index 0000000000..da26d7092e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image1
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image2 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image2
new file mode 100644
index 0000000000..e176a96a55
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image2
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image3 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image3
new file mode 100644
index 0000000000..e829d3712c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image3
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image4 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image4
new file mode 100644
index 0000000000..f14ea13547
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image4
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image5 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image5
new file mode 100644
index 0000000000..4ef6277226
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image5
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image6 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image6
new file mode 100644
index 0000000000..1adb261b40
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image6
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image7 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image7
new file mode 100644
index 0000000000..ba0d26ec18
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image7
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image8 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image8
new file mode 100644
index 0000000000..8b81d58e27
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image8
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image9 b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image9
new file mode 100644
index 0000000000..f0a352f9d0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/image9
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/index.html b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/index.html
new file mode 100644
index 0000000000..c7bfde35a5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/page4/index.html
@@ -0,0 +1,768 @@
+<!DOCTYPE HTML="HTML" PUBLIC="PUBLIC" "-//W3C//DTD=""-//W3C//DTD" HTML="HTML" 4.0="4.0" Transitional//EN"="Transitional//EN"">
+<HTML>
+<HEAD>
+<TITLE>[fm] welcome to freshmeat.net</TITLE>
+<STYLE TYPE="text/css"><!-- A:link {text-decoration: none}A:visited{text-decoration:none}A:active{text-decoration:none}--></STYLE>
+</HEAD>
+<BODY MARGINWIDTH="0" MARGINHEIGHT="0" LEFTMARGIN="0" RIGHTMARGIN="0" TOPMARGIN="0" BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#336699" VLINK="#336699" ALINK="#336699">
+<BR><CENTER><TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0"><TR><TD WIDTH="1"><SCRIPT LANGUAGE="JAVASCRIPT">
+<!--
+now = new Date();
+tail = now.getTime();
+document.write("<IMG SRC='http://209.207.224.246/FreshMeat/Core/pc.gif?/index.php3," + tail + "' WIDTH=1 HEIGHT=1><BR>");
+//-->
+</SCRIPT>
+<NOSCRIPT>
+<IMG SRC="image1" WIDTH="1" HEIGHT="1"><BR>
+</NOSCRIPT></TD></TR></TABLE>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0"><TR><TD WIDTH="468"><SCRIPT LANGUAGE="JAVASCRIPT">
+<!--
+now = new Date();
+tail = now.getTime();
+AltText = "\"Please click here.\"";
+document.write("<A HREF='http://ads.freshmeat.net/cgi-bin/ad_click.pl?index,tsof0001en'>")
+document.write("<IMG SRC='http://ads.freshmeat.net/tsof0001en.gif?" + tail + "' WIDTH=468 HEIGHT=60 ALT=" + AltText + "></A><BR>");
+//-->
+</SCRIPT>
+<NOSCRIPT>
+<A HREF="http://ads.freshmeat.net/cgi-bin/ad_click.pl?index,tsof0001en"><IMG SRC="image2" WIDTH="468" HEIGHT="60" ALT="Please click here."></A><BR>
+</NOSCRIPT></TD></TR></TABLE>
+
+<TABLE CELLSPACING="0" CELLPADDING="2" BORDER="0" WIDTH="97%"><TR>
+<TD ALIGN="left" VALIGN="bottom"><A HREF="/"><IMG SRC="image3" BORDER="0" ALT="freshmeat.net" WIDTH="300" HEIGHT="65"></A></TD>
+<TD VALIGN="bottom" ALIGN="left" ROWSPAN="2"><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<FORM METHOD="get" ACTION="/search.php3">
+<SMALL>find: <INPUT TYPE="text" SIZE="15" NAME="query"></SMALL></FORM></FONT></TD>
+<TD ALIGN="right" VALIGN="bottom"><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<A HREF="http://www.linux.com"><FONT COLOR="#000000"><B><SMALL>linux.com partner</SMALL></B></FONT></A><BR>
+<TABLE CELLSPACING="0" CELLPADDING="1" BORDER="0" WIDTH="100%"><TR>
+<TD ALIGN="right"><SMALL><NOBR><FONT FACE="Lucida,Verdana,Helvetica,Arial"><B><A HREF="/">news</A> |<BR>
+<A HREF="/appindex/">appindex</A> |<BR>
+<A HREF="/editorials/">editorials</A> |</B></FONT></NOBR></SMALL></TD>
+<TD ALIGN="right"><SMALL><NOBR><FONT FACE="Lucida,Verdana,Helvetica,Arial"><B><A HREF="/lounge/">lounge</A> |<BR>
+<A HREF="/contrib.php3">contribute</A> |<BR>
+<A HREF="/feedback.php3">feedback</A> |</B></FONT></NOBR></SMALL></TD>
+<TD ALIGN="right"><SMALL><NOBR><FONT FACE="Lucida,Verdana,Helvetica,Arial"><B><A HREF="/about.php3">about</A> |<BR>
+<A HREF="/awards.php3">awards</A> |<BR>
+<A HREF="/faq.php3">FAQ</A> |</B></FONT></NOBR></SMALL></TD>
+</TR></TABLE></TD>
+</TR></TABLE>
+<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0">
+<TR BGCOLOR="#000000"><TD><IMG SRC="image4" WIDTH="1" HEIGHT="2" ALT=""></TD></TR></TABLE>
+<TABLE CELLSPACING="0" CELLPADDING="3" BORDER="0" WIDTH="100%" BGCOLOR="#BBDDFF">
+<TR><TD ALIGN="center" VALIGN="top">
+<BR>
+<FONT FACE="Lucida,Verdana,Helvetica,Arial">
+
+
+<SMALL><B>sort by: [ <A HREF="/news/2000/01/29/">date</A> | <A HREF="/news/list.php3?day=/2000/01/29/&orderby=name">name</A> | <A HREF="/news/list.php3?day=/2000/01/29/&orderby=urgency">urgency</A> ]</B></SMALL><BR></TD><TD>&nbsp;</TD></TR><TR><TD VALIGN="top" ALIGN="center"><FONT FACE="Lucida,Verdana,Helvetica,Arial"><TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">We should get this out of the door now</FONT></B><BR>
+<SMALL><B><A HREF="mailto:scoop@freshmeat.net">scoop</A> - January 29th 2000, 23:59 EST</B></SMALL>
+<P>Everyone else is talking about it, so we should announce it ourselves
+before you start to think it's a government hoax. <A HREF="http://server51.freshmeat.net/">Server 51</A> is our new hosting service for Open Source projects, based on Super Cool Space Alien Technology(TM). We hadn't planned to announce it quite so soon, and it's still in the alpha stage as we work day and night at integrating SCSAT with our terrestrial systems, but feel free to take a look around and see what's going on. When we're out of the testing stage and ready to make room for your project, we'll send word via your implants. Be listening.
+
+
+
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949208399.html">comments (8)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>Category: freshmeat
+</SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+ 	<A HREF="http://server51.freshmeat.net"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">Is Linux for Crazies?</FONT></B><BR>
+<SMALL><B><A HREF="mailto:jeff.covey@pobox.com">jeff covey</A> - January 29th 2000, 23:59 EST</B></SMALL>
+<P>Ray Woodcock writes: "In terms relevant to Linux, this freshmeat
+editorial glances at the tendency of mainstream viewpoints to dismiss
+other viewpoints as 'fringe,' the propensity of dissident movements to
+splinter into factions before they can effectively counter their
+primary adversaries, and the difficulty of creating stability without
+squelching curiosity."
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949208340.html">comments (2), 2065 words in body</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>Category: Editorial
+</SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+   &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">RabbIT 2.0.2</FONT></B><BR>
+<SMALL><B><A HREF="mailto:d94-rol@nada.kth.se">Ernimril</A> - January 29th 2000, 18:29 EST</B></SMALL>
+<DIV ALIGN="justify"><P>RabbIt is the mutating, caching webproxy which is used to speed up surfing over slow links like modems. It does this by removing advertising and background images and scaling down images to low quality JPEGs. RabbIT is written in Java and should be able to run on any platform. It does depend upon an image converter if imagescaleing is on. The recommended image converter is "convert" from the ImageMagick package.</DIV>
+<P><B>Changes:</B> Fixes have been made for a few bugs concerning keep alive and the HTTP response header, a bug with NT and cache directories, a bug concerning requests without a response body, a bug in GZIPHandler that caused it to not gzip already compressed (gzip or compress) streams, a bug in HTTPHeader regarding response phrases that are multiline, and a few bugs in ImageHandler and NCache. GZIPHandler has been built as an intermediate(*) to FilterHandler (this means that it is possible to gzip text/plain, etc., without filtering those streams) uuencoding has been added to the Coder, RabbIT now uses HTTP/1.1, HTMLParser now compiles cleanly with Jikes, and GeneralHeader has been created to allow for HTTPFooter (which is useful when sending chunked data).
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949188564.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: freely distributable</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/daemons/proxy.html"><FONT COLOR="#FFFFFF">Daemons/Proxy</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/902659138/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/902659138/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/1998/08/09/902659138.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">nmpg 1.1.3</FONT></B><BR>
+<SMALL><B><A HREF="mailto:narkos@linuxmail.org">Joel Lindau</A> - January 29th 2000, 18:18 EST</B></SMALL>
+<DIV ALIGN="justify"><P>nmpg is a small command-driven frontend and network-jukebox for mpg123.</DIV>
+<P><B>Changes:</B> Bugfixes, better memory managment, a new .nmpgrc parser, and new options.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949187896.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: OpenSource</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/sound.html"><FONT COLOR="#FFFFFF">Console/Sound</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/935430877/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/935430877/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/935430877/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/08/23/935430877.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">mod_dtcl 0.7.3</FONT></B><BR>
+<SMALL><B><A HREF="mailto:davidw@prosa.it">David Welton</A> - January 29th 2000, 18:11 EST</B></SMALL>
+<DIV ALIGN="justify"><P>Mod_dtcl is a free/open source implementation of server-parsed Tcl under Apache. It allows you to tightly integrate HTML with Tcl, a widely-used scripting language with many years of development invested in it. There are also many external Tcl modules that you can load into mod_dtcl, to create images, access databases, etc.</DIV>
+<P><B>Changes:</B> A major overhaul of header handling and internal buffering, and the addition of the ability to handle binary data.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949187471.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/web/development.html"><FONT COLOR="#FFFFFF">Web/Development</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/917925309/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/917925309/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/917925309/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/02/01/917925309.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">CoreLinux++ 0.4.6</FONT></B><BR>
+<SMALL><B><A HREF="mailto:frankc@users.sourceforge.net">Frank V. Castellucci</A> - January 29th 2000, 18:07 EST</B></SMALL>
+<DIV ALIGN="justify"><P>CoreLinux++ is an initiative to normalize methods and conventions for OOA/OOD/C++ development for Linux, materialized in a set of Open Source C++ class libraries (libcorelinux++ and libcoreframework++) to support common patterns and exploit the C++ standards.</DIV>
+<P><B>Changes:</B> This release adds AbstractFactory and AssociativeIterator analysis, design, implementations, test code, a CVS daily tarball, a Patch Submission facility and updated FAQ, Web Pages, and defect reporting guidelines.
+<P><B>Urgency:</B> medium
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949187233.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: LGPL</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/development/libraries.html"><FONT COLOR="#FFFFFF">Development/Libraries</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/944077775/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/944077775/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/944077775/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/12/01/944077775.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">scribe 0.2</FONT></B><BR>
+<SMALL><B><A HREF="mailto:kahlage@logoncafe.net">ChromeBob</A> - January 29th 2000, 12:12 EST</B></SMALL>
+<DIV ALIGN="justify"><P>scribe writes functions prototypes for your C code, so you don't have to. It also compares unique functions between source code files and will 'extern' when appropriate. C++ methods support is also planned.</DIV>
+<P><B>Changes:</B> A fix for an fflush() bug and better documentation.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949165962.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/development/tools.html"><FONT COLOR="#FFFFFF">Development/Tools</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/946661656/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/946661656/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/1999/12/31/946661656.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">E theme updater 0.1</FONT></B><BR>
+<SMALL><B><A HREF="mailto:hallvar@ii.uib.no">Hallvar Helleseth</A> - January 29th 2000, 12:04 EST</B></SMALL>
+<DIV ALIGN="justify"><P>E theme Updater is a bash script to automatically update all of your Enlightenment themes from e.themes.org.</DIV>
+<P><B>Changes:</B> Initial release.
+
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949165472.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/misc.html"><FONT COLOR="#FFFFFF">Console/Misc</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/949164501/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/949164501/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/2000/01/29/949164501.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">Powertweak-Linux 0.1.7</FONT></B><BR>
+<SMALL><B><A HREF="mailto:dave@denial.force9.co.uk">Dave Jones</A> - January 29th 2000, 12:03 EST</B></SMALL>
+<DIV ALIGN="justify"><P>Powertweak-Linux is a port of the Microsoft Windows tool of the same name rewritten from the ground up. Its main function is to tune your system to its optimal performance settings. Currently, it tunes PCI chipsets and can set /proc/sys entries.</DIV>
+<P><B>Changes:</B> A major GUI overhaul, the ability to generate configuration files, extended PCI information tabs, extra information support for the Matrox G200, and numerous other bugfixes & improvements.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949165416.html">comments (2)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/system.html"><FONT COLOR="#FFFFFF">Console/System</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/930836224/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/930836224/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/930836224/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/07/01/930836224.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">Pexeso Beta</FONT></B><BR>
+<SMALL><B><A HREF="mailto:pavolkrigler@pobox.sk">Pavol Krigler</A> - January 29th 2000, 11:55 EST</B></SMALL>
+<DIV ALIGN="justify"><P>pexeso is a simple graphic card game for one or two players.</DIV>
+<P><B>Changes:</B> Initial public release.
+
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164956.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: Freeware</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/games.html"><FONT COLOR="#FFFFFF">Console/Games</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/949141436/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/949141436/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/2000/01/29/949141436.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">XZX 2.9.2</FONT></B><BR>
+<SMALL><B><A HREF="mailto:Erik.Kunze@fantasy.muc.de">E. Kunze</A> - January 29th 2000, 11:54 EST</B></SMALL>
+<DIV ALIGN="justify"><P>XZX is a portable emulator of ZX Spectrum 48K/128K/+3 (8-bit home computers made by Sir Clive Sinclair) and Pentagon/Scorpion (Spectrum clones made in Russia) for machines running UNIX and the X Window system. XZX is completely written in C and emulates Spectrum 48K, 128K, +2 and +3, Pentagon and Scorpion, Interface I with up to 8 microdrives, Multiface 128 and Multiface 3, BetaDisk 128 interface by Technology Research Ltd with 4 disk drives, +D interface by Miles Gordon Technology with 2 disk drives, Kempston mouse, Kempston joystick and built-in machine code monitor.</DIV>
+<P><B>Changes:</B> Lots of feature improvement and bug fixes. Most parts of the audio support has been rewritten for different UNICES.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164896.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: Shareware</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/x11/emulators.html"><FONT COLOR="#FFFFFF">X11/Emulators</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/936956384/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/936956384/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/936956384/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/09/10/936956384.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">DistroLib 0.4</FONT></B><BR>
+<SMALL><B><A HREF="mailto:phir@gcu-squad.org">PhiR</A> - January 29th 2000, 11:54 EST</B></SMALL>
+<DIV ALIGN="justify"><P>DistroLib is an abstraction library designed to make the development of distributed application easier. Its main target is currently compute-bound tasks based on a one server, many clients model (much like distributed.net), but it is quite generic and could be used for any client/server app. It is lightweight, easy-to-use, and relies heavily on threads.</DIV>
+<P><B>Changes:</B> Important bug fixes and command history support.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164869.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/development/libraries.html"><FONT COLOR="#FFFFFF">Development/Libraries</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/942588431/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/942588431/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/942588431/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/11/14/942588431.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">ToutDoux 1.1.7</FONT></B><BR>
+<SMALL><B><A HREF="mailto:yeupou@altern.org">yeupou</A> - January 29th 2000, 11:54 EST</B></SMALL>
+<DIV ALIGN="justify"><P>ToutDoux is a project manager which lets you design a plan of action using a tree structure, with translations in French and English.</DIV>
+<P><B>Changes:</B> A new menu and XML standard for save files.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164843.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/gnome/tools.html"><FONT COLOR="#FFFFFF">GNOME/Tools</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/944433411/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/944433411/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/1999/12/05/944433411.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">goMP 1.0.3</FONT></B><BR>
+<SMALL><B><A HREF="mailto:dioxine@poulet.org">Gautier</A> - January 29th 2000, 11:52 EST</B></SMALL>
+<DIV ALIGN="justify"><P>goMP is a set of CGI scripts that allows you to remotely control, via a Web browser, a computer acting as an MP3 jukebox. This program is very useful for someone who's got a dedicated computer with a lot of MP3 files but that doesn't have any output and input devices except network and sound card. It's main advantages are built-in cataloging, fast access to music, and no special software needed on the client side.</DIV>
+<P><B>Changes:</B> Bugfixes, a password-protected config page, basic search function, easier installation thanks to an install script, and relocation of HTML docs and CGIs to a subdirectory.
+<P><B>Urgency:</B> medium
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164772.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: Artistic</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/web/tools.html"><FONT COLOR="#FFFFFF">Web/Tools</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/948492962/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/948492962/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/948492962/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/2000/01/21/948492962.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">APSEND 1.40</FONT></B><BR>
+<SMALL><B><A HREF="mailto:sventek@gmx.net">M.K.</A> - January 29th 2000, 11:50 EST</B></SMALL>
+<DIV ALIGN="justify"><P>APSEND is a TCP/IP packet sender to test firewalls and other network applications. It also includes a syn flood option, the land DoS attack, and a DoS attack against tcpdump running on a UNIX-based system. Future updates will include support for a scripting language to construct TCP packets and a few more options and protocols like UDP and ICMP. A port of APSEND from Perl to C is planned as well.</DIV>
+<P><B>Changes:</B> The stream attack, bugfixes, and rewrites for parts of the code.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164633.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/networking.html"><FONT COLOR="#FFFFFF">Console/Networking</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/941654429/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/941654429/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/941654429/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/11/03/941654429.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">ecasound 1.6.12r10</FONT></B><BR>
+<SMALL><B><A HREF="mailto:kaiv@wakkanet.fi">Kai Vehmanen</A> - January 29th 2000, 11:48 EST</B></SMALL>
+<DIV ALIGN="justify"><P>Ecasound is a software package designed for multitrack audio processing. It can be used for simple tasks like audio playback, recording and format conversions, as well as for multitrack effect processing, mixing, recording and signal recycling. Ecasound supports a wide range of audio inputs, outputs and effect algorithms. Ecasound has a chain-based design that allows effects to be easily combined both in series and in parallel. Oscillators and MIDI-CCs can be used for controlling effect parameters. Includes a versatile console mode interface, a Qt-based X-interface and various command-line utils suitable for batch processing.</DIV>
+<P><B>Changes:</B> Support for 24- and 32-bit audio formats and for ALSA 0.5, multichannel noisegate, a new 2nd order lowpass filter, some ia-mode commands, and various bugfixes and low-level improvements.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164529.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/sound.html"><FONT COLOR="#FFFFFF">Console/Sound</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/931819147/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/931819147/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/931819147/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/07/12/931819147.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">SCEZ 20000129</FONT></B><BR>
+<SMALL><B><A HREF="mailto:m032@mbsks.franken.de">endergone Zwiebeltuete</A> - January 29th 2000, 11:46 EST</B></SMALL>
+<DIV ALIGN="justify"><P>SCEZ is a library that should make the handling of smart cards (not memory cards) and card readers as simple as possible and be at the same time small and easily portable. Currently supported are Dumb Mouse, CT-API and Towitoko readers and Schlumberger Cryptoflex, Gemplus GPK4000, GSM SIM and Telesec SigG cards. A PKCS#15 implementation is in the design phase. There are ports to PalmOS and MS-Windows available.</DIV>
+<P><B>Changes:</B> More card and reader drivers, and an application to read out GSM SIM card (phone book and SMS) and write it to the card.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164394.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: BSD type</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/development/libraries.html"><FONT COLOR="#FFFFFF">Development/Libraries</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/939677525/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/939677525/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/1999/10/11/939677525.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">Comicq 0.2.0</FONT></B><BR>
+<SMALL><B><A HREF="mailto:terminal6@submail.net">Terminal6</A> - January 29th 2000, 11:45 EST</B></SMALL>
+<DIV ALIGN="justify"><P>COMICQ is a command line ICQ messaging tool that allows a user to connect to ICQ using your UIN and password, then sends a message to the destination UIN.</DIV>
+<P><B>Changes:</B> Several bugfixes, icq99a compliance, and a new option --ip that allows you to get any user's IP by their UIN.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164350.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/communication.html"><FONT COLOR="#FFFFFF">Console/Communication</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/948389309/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/948389309/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A>  	<A HREF="/appindex/2000/01/20/948389309.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">senv 0.2</FONT></B><BR>
+<SMALL><B><A HREF="mailto:kojak@ids.pl">Zbyszek Sobiecki</A> - January 29th 2000, 11:44 EST</B></SMALL>
+<DIV ALIGN="justify"><P>Senv allows you to run programs with a specified environment. It can set uid, gid, root directory, working directory, limits, and environment variables. It is useful in init scripts and as a shell for users for setting resource limits and environment variables. You can create sets of configurations and specify the one to use from command line.</DIV>
+<P><B>Changes:</B> Login shell limits and environment setting for users, permanent resource limits for specified groups of users and environment variables, and other minor bugfixes.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949164259.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: GPL</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/console/administration.html"><FONT COLOR="#FFFFFF">Console/Administration</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/944953892/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A>  <A HREF="http://apps.freshmeat.net/changelog/944953892/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/12/11/944953892.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="97%" BORDER="0" BGCOLOR="#000000"><TR><TD COLSPAN="2">
+<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#FFFFFF">
+<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B><FONT SIZE="+2">XZX 2.9.2</FONT></B><BR>
+<SMALL><B><A HREF="mailto:Erik.Kunze@fantasy.muc.de">E. Kunze</A> - January 29th 2000, 10:55 EST</B></SMALL>
+<DIV ALIGN="justify"><P>XZX is a portable emulator of ZX Spectrum 48K/128K/+3 (8-bit home computers made by Sir Clive Sinclair) and Pentagon/Scorpion (Spectrum clones made in Russia) for machines running UNIX and the X Window system. XZX is completely written in C and emulates Spectrum 48K, 128K, +2 and +3, Pentagon and Scorpion, Interface I with up to 8 microdrives, Multiface 128 and Multiface 3, BetaDisk 128 interface by Technology Research Ltd with 4 disk drives, +D interface by Miles Gordon Technology with 2 disk drives, Kempston mouse, Kempston joystick and built-in machine code monitor.</DIV>
+<P><B>Changes:</B> Lots of feature improvement and bug fixes. Most parts of the audio support has been rewritten for different UNICES.
+<P><B>Urgency:</B> low
+<P ALIGN="right"><B>[ <A HREF="/news/2000/01/29/949161354.html">comments (0)</A> ]</B>
+</FONT></TD></TR></TABLE></TD></TR><TR><TD VALIGN="middle">
+&nbsp;<FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#FFFFFF"><B><SMALL>License: Shareware</SMALL></B><BR>
+<B><SMALL>&nbsp;Category: <A HREF="/appindex/x11/emulators.html"><FONT COLOR="#FFFFFF">X11/Emulators</FONT></A></SMALL></B></FONT></FONT></TD><TD ALIGN="right">
+<A HREF="http://apps.freshmeat.net/download/936956384/"><IMG SRC="image6" WIDTH="21" HEIGHT="21" BORDER="0" ALT="download"></A> <A HREF="http://apps.freshmeat.net/homepage/936956384/"><IMG SRC="image5" WIDTH="21" HEIGHT="21" BORDER="0" ALT="homepage"></A> <A HREF="http://apps.freshmeat.net/changelog/936956384/"><IMG SRC="image8" WIDTH="21" HEIGHT="21" BORDER="0" ALT="changelog"></A> 	<A HREF="/appindex/1999/09/10/936956384.html"><IMG SRC="image7" WIDTH="21" HEIGHT="21" BORDER="0" ALT="appindex record"></A> &nbsp;
+</TD></TR></TABLE>
+<HR WIDTH="0" SIZE="0">
+
+
+<P><SMALL><CENTER><B>[ <A HREF="/news/2000/01/29/">full page for today</A> | <A HREF="/news/2000/01/28/">yesterday's edition</A> ]</SMALL></B></CENTER></FONT></TD><TD WIDTH="27%" VALIGN="top" ALIGN="center"><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000">navigator</FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="/news/2000/01/29/"><FONT COLOR="#000000">full page for today</FONT></A><BR>
+- <A HREF="/news/2000/01/28/"><FONT COLOR="#000000">yesterday's edition</FONT></A><BR>
+- <A HREF="news://news.freshmeat.net/"><FONT COLOR="#000000"><B>new:</B> fm news via NNTP</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000">eye catcher</FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<B>Free Shirts</B><BR>We give away a free freshmeat t-shirt every week for the best comment added to an application announcement or story posted on freshmeat.
+<P><B>#freshmeat</B><BR>If you want to chat about what's new on freshmeat and hang out with other fm lounge lizards and the fm staff, head over to #freshmeat on irc.freshmeat.net, part of <A HREF="http://openprojects.nu/">The Open Projects Network</A>.
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000">site notes</FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="/news/2000/01/29/949208399.html"><FONT COLOR="#000000">We should get this out of the door now (Jan 29th)</FONT></A><BR>
+- <A HREF="/news/2000/01/01/946704535.html"><FONT COLOR="#000000">freshmeat Y2K report (Jan 01st)</FONT></A><BR>
+- <A HREF="/news/1999/08/16/934862340.html"><FONT COLOR="#000000">Assorted freshmeat notes (Aug 16th)</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000">recent editorials</FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="/news/2000/01/29/949208340.html"><FONT COLOR="#000000">Is Linux for Crazies? (Jan 29th)</FONT></A><BR>
+- <A HREF="/news/2000/01/22/948603540.html"><FONT COLOR="#000000">A New Business Plan for Free Software (Jan 22nd)</FONT></A><BR>
+- <A HREF="/news/2000/01/15/947998740.html"><FONT COLOR="#000000">Is Linux Going to Reunite the UNIX Market? (Jan 15th)</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000">andover.net</FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+<BR><CENTER><A HREF="http://andover.net"><IMG SRC="image9" BORDER="0" WIDTH="150" HEIGHT="43" ALT="Mirror Logo"></A></CENTER><P>
+- <A HREF="http://www.animfactory.com/"><FONT COLOR="#000000">Animation Factory</FONT></A><BR>
+- <A HREF="http://www.davecentral.com/"><FONT COLOR="#000000">DaveCentral</FONT></A><BR>
+- <A HREF="http://www.freecode.com/"><FONT COLOR="#000000">FreeCode</FONT></A><BR>
+- <A HREF="http://www.InternetTrafficReport.com/"><FONT COLOR="#000000">Internet Traffic Report</FONT></A><BR>
+- <A HREF="http://www.ITManagersJournal.com/"><FONT COLOR="#000000">IT Manager's Journal</FONT></A><BR>
+- <A HREF="http://www.mediabuilder.com/"><FONT COLOR="#000000">MediaBuilder</FONT></A><BR>
+- <A HREF="http://slashdot.org/"><FONT COLOR="#000000">Slashdot</FONT></A><BR>
+- <A HREF="http://www.slaughterhouse.com/"><FONT COLOR="#000000">Slaughterhouse</FONT></A><BR>
+- <A HREF="http://www.techmailings.com/"><FONT COLOR="#000000">TechMailings</FONT></A><BR>
+- <A HREF="http://www.techsightings.com/"><FONT COLOR="#000000">TechSightings</FONT></A><BR>
+<BR><CENTER><B>E-Commerce</B></CENTER><P>
+- <A HREF="http://www.thinkgeek.com"><FONT COLOR="#000000">ThinkGeek (Stuff for smart masses)</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000">supported sites</FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="http://www.userfriendly.org"><FONT COLOR="#000000">Userfriendly.org</FONT></A><BR>
+- <A HREF="http://www.securityfocus.com"><FONT COLOR="#000000">SecurityFocus</FONT></A><BR>
+- <A HREF="http://copyleft.net"><FONT COLOR="#000000">copyleft</FONT></A><BR>
+- <A HREF="http://filewatcher.org"><FONT COLOR="#000000">Filewatcher</FONT></A><BR>
+- <A HREF="http://www.linux.com"><FONT COLOR="#000000">Linux.com</FONT></A><BR>
+- <A HREF="http://www.linuxtelephony.org"><FONT COLOR="#000000">LinuxTelephony</FONT></A><BR>
+- <A HREF="http://www.linuxtoday.com"><FONT COLOR="#000000">LinuxToday</FONT></A><BR>
+- <A HREF="http://openprojects.nu/services/irc.html"><FONT COLOR="#000000">Openprojects</FONT></A><BR>
+- <A HREF="http://www.32bitsonline.com"><FONT COLOR="#000000">32bitsonline</FONT></A><BR>
+- <A HREF="http://www.gnu.org"><FONT COLOR="#000000">The GNU Project</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="/news/2000/01/29/"><font color="#000000">saturday</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="/news/2000/01/29/949208399.html"><FONT COLOR="#000000">We should get this out of the door now</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949208340.html"><FONT COLOR="#000000">Is Linux for Crazies?</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949188564.html"><FONT COLOR="#000000">RabbIT 2.0.2</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949187896.html"><FONT COLOR="#000000">nmpg 1.1.3</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949187471.html"><FONT COLOR="#000000">mod_dtcl 0.7.3</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949187233.html"><FONT COLOR="#000000">CoreLinux++ 0.4.6</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949165962.html"><FONT COLOR="#000000">scribe 0.2</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949165472.html"><FONT COLOR="#000000">E theme updater 0.1</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949165416.html"><FONT COLOR="#000000">Powertweak-Linux 0.1.7</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949164956.html"><FONT COLOR="#000000">Pexeso Beta</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949164896.html"><FONT COLOR="#000000">XZX 2.9.2</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949164869.html"><FONT COLOR="#000000">DistroLib 0.4</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949164843.html"><FONT COLOR="#000000">ToutDoux 1.1.7</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949164772.html"><FONT COLOR="#000000">goMP 1.0.3</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949164633.html"><FONT COLOR="#000000">APSEND 1.40</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949164529.html"><FONT COLOR="#000000">ecasound 1.6.12r10</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949164394.html"><FONT COLOR="#000000">SCEZ 20000129</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949164350.html"><FONT COLOR="#000000">Comicq 0.2.0</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949164259.html"><FONT COLOR="#000000">senv 0.2</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949161354.html"><FONT COLOR="#000000">XZX 2.9.2</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949161036.html"><FONT COLOR="#000000">log4j 0.7.5</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949156343.html"><FONT COLOR="#000000">SQN Linux 1.6</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949156277.html"><FONT COLOR="#000000">Limo 0.3.2</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949156237.html"><FONT COLOR="#000000">Fusion GS 1.3</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949145887.html"><FONT COLOR="#000000">MMR 1.5.4</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949142835.html"><FONT COLOR="#000000">KUPS 0.3.4</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949142815.html"><FONT COLOR="#000000">3DSE patch for XMMS 4</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949139763.html"><FONT COLOR="#000000">Linux 2.3.41</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949139751.html"><FONT COLOR="#000000">Free Code for Linux S/390</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949135979.html"><FONT COLOR="#000000">CircleMUD 3.0 beta patchlevel 17</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949135938.html"><FONT COLOR="#000000">NiL Isn't Liero 000128</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949135913.html"><FONT COLOR="#000000">OpenSSH Unix Port 1.2.2</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949135889.html"><FONT COLOR="#000000">KBoxes! 1.3</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949135867.html"><FONT COLOR="#000000">phpLanParty 0.23</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949135509.html"><FONT COLOR="#000000">DGen/SDL 1.20</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949135482.html"><FONT COLOR="#000000">EdcomLib 1.0 alpha 5</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949135309.html"><FONT COLOR="#000000">Etherboot 4.4.2</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949135205.html"><FONT COLOR="#000000">BLADE 0.18.0</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949135115.html"><FONT COLOR="#000000">Sapphire 0.13.7</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949135070.html"><FONT COLOR="#000000">ippl 1.99.3</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949134977.html"><FONT COLOR="#000000">Saint 1.5patch1</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949134943.html"><FONT COLOR="#000000">Zircon 1.18.232</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949134927.html"><FONT COLOR="#000000">nmap 2.3BETA14</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949134901.html"><FONT COLOR="#000000">xterm patch #124</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949134817.html"><FONT COLOR="#000000">MyThreads-Links v0.5.2</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949134633.html"><FONT COLOR="#000000">sudo 1.6.2p1</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949134552.html"><FONT COLOR="#000000">MIT Photonic-Bands 0.10</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949134246.html"><FONT COLOR="#000000">Launcher 0.86</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949134179.html"><FONT COLOR="#000000">nano 0.8.1</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949134103.html"><FONT COLOR="#000000">Gtk-- 1.1.8</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949134049.html"><FONT COLOR="#000000">tkchooser 0.65</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949133420.html"><FONT COLOR="#000000">XShipWars 1.33a</FONT></A><BR>
+- <A HREF="/news/2000/01/29/949133280.html"><FONT COLOR="#000000">Lamerpad 0.1</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="/news/2000/01/28/"><font color="#000000">friday</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="/news/2000/01/28/949117833.html"><FONT COLOR="#000000">fsv 0.9</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949117711.html"><FONT COLOR="#000000">popsneaker 0.1.1</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949114716.html"><FONT COLOR="#000000">eyep-updater.sh 1.0</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949113240.html"><FONT COLOR="#000000">W3Mail 0.5.0</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949113214.html"><FONT COLOR="#000000">The Urgent Decision 0.9.9</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949112269.html"><FONT COLOR="#000000">LTSP 1.02</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949112198.html"><FONT COLOR="#000000">Production BASIC 0.2.12</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949112123.html"><FONT COLOR="#000000">Postfix 19991231-pl03</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949109732.html"><FONT COLOR="#000000">Mp3 Commander 0.7</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949109324.html"><FONT COLOR="#000000">iManager 1.0.1b</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949108399.html"><FONT COLOR="#000000">Eterm 0.9</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949108308.html"><FONT COLOR="#000000">dqd_dirindex 1.0</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949108087.html"><FONT COLOR="#000000">Tidings 1.0.4</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949108026.html"><FONT COLOR="#000000">localscan 2.1</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949107922.html"><FONT COLOR="#000000">WMKeyboard 0.3</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949107834.html"><FONT COLOR="#000000">fcmp 1.0.2</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949107767.html"><FONT COLOR="#000000">Akkord 0.3.1</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949107649.html"><FONT COLOR="#000000">HiM 0.1.1</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949106305.html"><FONT COLOR="#000000">cdrecord 1.8</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949103400.html"><FONT COLOR="#000000">eMixer 0.05.5</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949103187.html"><FONT COLOR="#000000">FreeVSD 1.4.0</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949103096.html"><FONT COLOR="#000000">Common C++ Libraries 0.0</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949095155.html"><FONT COLOR="#000000">Moonshine 1.0beta2</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949095112.html"><FONT COLOR="#000000">swim 0.3.5</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949095009.html"><FONT COLOR="#000000">Xmame/xmess 0.36b15.1</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949094448.html"><FONT COLOR="#000000">pcmcia-cs 3.1.9</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949091509.html"><FONT COLOR="#000000">gPS 0.5.2</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949091415.html"><FONT COLOR="#000000">Snort 1.5.1</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949090436.html"><FONT COLOR="#000000">Pygmy Linux 0.7 beta</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949090237.html"><FONT COLOR="#000000">Intro to Bash Programming HOWTO 0.3</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949084379.html"><FONT COLOR="#000000">GNU Pth 1.3b2</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949084356.html"><FONT COLOR="#000000">Laonux 0.1</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949084304.html"><FONT COLOR="#000000">x-wvdial 0.12</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949084188.html"><FONT COLOR="#000000">Intro to Bash Programming HOWTO 0.3</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949084106.html"><FONT COLOR="#000000">Catalog 1.02</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949084062.html"><FONT COLOR="#000000">harvest 1.5.20-kj-0.9</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949068306.html"><FONT COLOR="#000000">wmseti 0.3.0a</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949057272.html"><FONT COLOR="#000000">RIG 1.02</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949057019.html"><FONT COLOR="#000000">FreeAddr 0.2</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949056939.html"><FONT COLOR="#000000">GtkAda 1.2.5</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949056664.html"><FONT COLOR="#000000">dot.conf 0.6.0</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949055099.html"><FONT COLOR="#000000">dep.pl 1.28.0</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949054980.html"><FONT COLOR="#000000">Prae's Scripts 1.1</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949044301.html"><FONT COLOR="#000000">Project Clock 0.1</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949044285.html"><FONT COLOR="#000000">Xtheater 0.2.1</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949040013.html"><FONT COLOR="#000000">i-no Chart 0.1</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949039945.html"><FONT COLOR="#000000">spliff 0.8.1</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949038953.html"><FONT COLOR="#000000">Regexx 0.95</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949038316.html"><FONT COLOR="#000000">RBook 0.5.0</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949036742.html"><FONT COLOR="#000000">RIG 1.01</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949036714.html"><FONT COLOR="#000000">wchat 1.2.0</FONT></A><BR>
+- <A HREF="/news/2000/01/28/949036428.html"><FONT COLOR="#000000">PCCS MySQLDatabase Admin Tool 1.2.2</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="/news/2000/01/27/"><font color="#000000">thursday</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="/news/2000/01/27/949033332.html"><FONT COLOR="#000000">CADUBI 1.1b1</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949032987.html"><FONT COLOR="#000000">Angus' Chess Clock 0.8.1</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949032555.html"><FONT COLOR="#000000">MP3 Report Generator 1.0.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949032518.html"><FONT COLOR="#000000">4DOM 0.9.2</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949032386.html"><FONT COLOR="#000000">4XSLT 0.8.2</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949031346.html"><FONT COLOR="#000000">OpenNaken 1.10</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949025747.html"><FONT COLOR="#000000">iManager 1.0b</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949025168.html"><FONT COLOR="#000000">QuakeForge 0.1.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949023271.html"><FONT COLOR="#000000">pylice 0.7.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949023250.html"><FONT COLOR="#000000">Solfege 0.6.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949023151.html"><FONT COLOR="#000000">xinetd 2.1.8.7p1</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949022849.html"><FONT COLOR="#000000">jac 0.13</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949022803.html"><FONT COLOR="#000000">Xmms 1.0.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949022319.html"><FONT COLOR="#000000">KSrnd 0.97</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949021877.html"><FONT COLOR="#000000">getpg / UW-IMAP 0.54</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949021849.html"><FONT COLOR="#000000">getpg 0.53</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949021824.html"><FONT COLOR="#000000">setserial 2.17</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949021250.html"><FONT COLOR="#000000">Pan 0.7.3</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949021216.html"><FONT COLOR="#000000">jwhois 2.4.1</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949021126.html"><FONT COLOR="#000000">Kmp3 1.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949020964.html"><FONT COLOR="#000000">xPine 0.0.12</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949019905.html"><FONT COLOR="#000000">Avenger's News System 2.1 Alpha</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949019709.html"><FONT COLOR="#000000">RIG 1.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949019321.html"><FONT COLOR="#000000">scroller 1.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949018347.html"><FONT COLOR="#000000">Perl EyeP Client 0.1</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949017796.html"><FONT COLOR="#000000">sfront 0.54</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949017631.html"><FONT COLOR="#000000">XFrisk 1.2</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949016202.html"><FONT COLOR="#000000">Moffy 0.0.1</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949015348.html"><FONT COLOR="#000000">Solid POP3 0.14</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949014200.html"><FONT COLOR="#000000">php3guest 1.5</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949013630.html"><FONT COLOR="#000000">crUD 01.27.2000</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949013380.html"><FONT COLOR="#000000">crUD 01.27.2000</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949012979.html"><FONT COLOR="#000000">Free Pascal Compiler 0.99.14</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949012771.html"><FONT COLOR="#000000">gtk-font-hack 0.2-gtk-1.2.6</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949009233.html"><FONT COLOR="#000000">Linux 2.2.15pre5</FONT></A><BR>
+- <A HREF="/news/2000/01/27/949005620.html"><FONT COLOR="#000000">krunseti 0.2.1</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948996446.html"><FONT COLOR="#000000">CompuPic 5.0.1036</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948995905.html"><FONT COLOR="#000000">gfontview 0.3.3</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948995819.html"><FONT COLOR="#000000">authlocal 1.0.2</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948995600.html"><FONT COLOR="#000000">bigwig 1.1</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948995501.html"><FONT COLOR="#000000">CAFire 0.0.11</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948995429.html"><FONT COLOR="#000000">ANVLOGIN 2.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948994944.html"><FONT COLOR="#000000">sawmill.el 1.9</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948994810.html"><FONT COLOR="#000000">Perlsh 20000127</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948994776.html"><FONT COLOR="#000000">sitescooper 2.1.2</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948994691.html"><FONT COLOR="#000000">MHDns 1.4</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948994419.html"><FONT COLOR="#000000">JChemPaint 0.5</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948994364.html"><FONT COLOR="#000000">Filesystems HOWTO 0.7.3</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948994343.html"><FONT COLOR="#000000">KSnes9x 1.2</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948993513.html"><FONT COLOR="#000000">Mozilla M13</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948993439.html"><FONT COLOR="#000000">edna 0.3</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948993409.html"><FONT COLOR="#000000">GMasqdialer 0.99.8</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948993341.html"><FONT COLOR="#000000">spliff 0.8</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948992808.html"><FONT COLOR="#000000">MultiSeti 0.3</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948970667.html"><FONT COLOR="#000000">rude 0.50</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948970605.html"><FONT COLOR="#000000">cgi-util++ 0.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948970479.html"><FONT COLOR="#000000">Cricket 0.72</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948970458.html"><FONT COLOR="#000000">nuni 0.04</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948970379.html"><FONT COLOR="#000000">Ksetiwatch 0.3.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948970358.html"><FONT COLOR="#000000">SiteMgrYAP 0.1.2</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948970322.html"><FONT COLOR="#000000">phpLanParty 0.21</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948970285.html"><FONT COLOR="#000000">Glitter Newsreader 0.1</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948970263.html"><FONT COLOR="#000000">Fastresolve 2.4</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948970164.html"><FONT COLOR="#000000">ColdSync 1.1.2</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948970080.html"><FONT COLOR="#000000">DDD 3.2</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948970032.html"><FONT COLOR="#000000">X Northern Captain 4.2.1</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948969919.html"><FONT COLOR="#000000">abcde 1.0.2</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948969659.html"><FONT COLOR="#000000">Gnapster 1.3.2</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948969551.html"><FONT COLOR="#000000">xmix 1.0 Alpha</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948969488.html"><FONT COLOR="#000000">gtktetcolor 0.3</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948969412.html"><FONT COLOR="#000000">muttzilla 0.40</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948969395.html"><FONT COLOR="#000000">muttzilla 0.40</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948969337.html"><FONT COLOR="#000000">asp2php 0.73.6</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948969217.html"><FONT COLOR="#000000">mod_ticket 1.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948969078.html"><FONT COLOR="#000000">MegaHAL for Eggdrop .01</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948968456.html"><FONT COLOR="#000000">Jetty 2.3.5</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948968386.html"><FONT COLOR="#000000">xlpotdb 1.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948968341.html"><FONT COLOR="#000000">Koala Complete MUD Server 0.1.1a</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948968255.html"><FONT COLOR="#000000">mcountd 0.4</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948967933.html"><FONT COLOR="#000000">cdbackup 0.5.0</FONT></A><BR>
+- <A HREF="/news/2000/01/27/948967908.html"><FONT COLOR="#000000">The Java SSH/Telnet Application/Applet 2.0 RC1</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="http://slashdot.org"><font color="#000000">slashdot</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="http://slashdot.org/article.pl?sid=00/01/29/1534255"><FONT COLOR="#000000">Petition Apple for Linux QuickTime</FONT></A><BR>
+- <A HREF="http://slashdot.org/article.pl?sid=00/01/29/1223249"><FONT COLOR="#000000">GNUstep 0.6.5 freeze</FONT></A><BR>
+- <A HREF="http://slashdot.org/article.pl?sid=00/01/28/2324203"><FONT COLOR="#000000">YETI@Home</FONT></A><BR>
+- <A HREF="http://slashdot.org/article.pl?sid=00/01/29/1024215"><FONT COLOR="#000000">Documents Unsealed in Microsoft/Caldera Case</FONT></A><BR>
+- <A HREF="http://slashdot.org/article.pl?sid=00/01/29/0837235"><FONT COLOR="#000000">Who Bought Linux.Net?</FONT></A><BR>
+- <A HREF="http://slashdot.org/article.pl?sid=00/01/24/1146250"><FONT COLOR="#000000">E-Mails from (Over?) The Edge</FONT></A><BR>
+- <A HREF="http://slashdot.org/article.pl?sid=00/01/29/0834223"><FONT COLOR="#000000">Linux Kernel 2.3.41</FONT></A><BR>
+- <A HREF="http://slashdot.org/article.pl?sid=00/01/28/2311232"><FONT COLOR="#000000">Congress Still Figuring Out E-Mail</FONT></A><BR>
+- <A HREF="http://slashdot.org/article.pl?sid=00/01/22/1946244"><FONT COLOR="#000000">Sci Fi Literature 101?</FONT></A><BR>
+- <A HREF="http://slashdot.org/article.pl?sid=00/01/28/2318246"><FONT COLOR="#000000">Could Distributed.Net Help the Mars Polar Lander?</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="http://www.securityfocus.com"><font color="#000000">securityfocus</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="http://www.securityfocus.com/level2/?go=news&id=http://www.zdnet.com/zdnn/stories/news/0,4586,2429334,00.html?chkpt=zdnntop"><FONT COLOR="#000000">Win2000 security hole a 'major threat'</FONT></A><BR>
+- <A HREF="http://www.securityfocus.com/level2/?go=news&id=http://www.computerworld.com/home/print.nsf/all/000128e45a"><FONT COLOR="#000000">Visa acknowledges cracker break-ins</FONT></A><BR>
+- <A HREF="http://www.securityfocus.com/level2/?go=news&id=http://www.zdnet.com/sr/stories/column/0,4712,2429536,00.html"><FONT COLOR="#000000">What's Wrong With Microsoft  Security?</FONT></A><BR>
+- <A HREF="http://www.securityfocus.com/level2/?go=news&id=http://www.zdnet.com/pcweek/stories/news/0,4153,2429334,00.html"><FONT COLOR="#000000">Microsoft posts first Win2K security patch</FONT></A><BR>
+- <A HREF="http://www.securityfocus.com/level2/?go=tools&id=1018"><FONT COLOR="#000000">Libnids 1.12</FONT></A><BR>
+- <A HREF="http://www.securityfocus.com/level2/?go=news&id=http://www.theregister.co.uk/000127-000005.html"><FONT COLOR="#000000">New hack attack is greater threat than imagined</FONT></A><BR>
+- <A HREF="http://www.securityfocus.com/level2/?go=news&id=http://www.mercurycenter.com/svtech/news/indepth/docs/hacker012700.htm"><FONT COLOR="#000000">Student charged with hacking</FONT></A><BR>
+- <A HREF="http://www.securityfocus.com/level2/?go=library&id=63"><FONT COLOR="#000000">Building and Managing Virtual Private Networks (book)</FONT></A><BR>
+- <A HREF="http://www.securityfocus.com/level2/?go=library&id=111"><FONT COLOR="#000000">Threats, Vulnerabilities and Real-Worl Responses: The Foundations of the TruSecure Process</FONT></A><BR>
+- <A HREF="http://www.securityfocus.com/level2/?go=library&id=1701"><FONT COLOR="#000000">The Hundredth Window : Protecting Your Privacy and Security in the Age of the Internet (boo</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="http://www.bebits.com"><font color="#000000">bebits</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="http://www.bebits.com/app/706/"><FONT COLOR="#000000">Pe 3.0a3</FONT></A><BR>
+- <A HREF="http://www.bebits.com/app/757/"><FONT COLOR="#000000">Rarscript 1.5</FONT></A><BR>
+- <A HREF="http://www.bebits.com/app/736/"><FONT COLOR="#000000">CD Manager 0.66a beta</FONT></A><BR>
+- <A HREF="http://www.bebits.com/app/174/"><FONT COLOR="#000000">TraX 1.1</FONT></A><BR>
+- <A HREF="http://www.bebits.com/app/785/"><FONT COLOR="#000000">BeMath 1.2.2</FONT></A><BR>
+- <A HREF="http://www.bebits.com/app/784/"><FONT COLOR="#000000">simple blackjack 1</FONT></A><BR>
+- <A HREF="http://www.bebits.com/app/758/"><FONT COLOR="#000000">HtmlTree 0.5.3</FONT></A><BR>
+- <A HREF="http://www.bebits.com/app/783/"><FONT COLOR="#000000">Yacp 0.1</FONT></A><BR>
+- <A HREF="http://www.bebits.com/app/222/"><FONT COLOR="#000000">TicTacToe 1.5</FONT></A><BR>
+- <A HREF="http://www.bebits.com/app/706/"><FONT COLOR="#000000">Pe 3.0a2</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="http://linuxtoday.com"><font color="#000000">linuxtoday</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="http://linuxtoday.com/story.php3?sn=15878"><FONT COLOR="#000000">Linux Journal: KDE--The Next Generation</FONT></A><BR>
+- <A HREF="http://linuxtoday.com/story.php3?sn=15876"><FONT COLOR="#000000">Kernel Cousin gimp-devel #11 Is Out</FONT></A><BR>
+- <A HREF="http://linuxtoday.com/story.php3?sn=15875"><FONT COLOR="#000000">Infoworld: Corel Linux OS ideal for the desktop</FONT></A><BR>
+- <A HREF="http://linuxtoday.com/story.php3?sn=15874"><FONT COLOR="#000000">Technology Evaluation: IBM Jumps on the Linux Bandwagon with Both Feet, Sort Of</FONT></A><BR>
+- <A HREF="http://linuxtoday.com/story.php3?sn=15873"><FONT COLOR="#000000">Tobias H�vekamp: European Union acknowledges</FONT></A><BR>
+- <A HREF=""><FONT COLOR="#000000">&</FONT></A><BR>
+- <A HREF=""><FONT COLOR="#000000">#34;Open Source Software</FONT></A><BR>
+- <A HREF=""><FONT COLOR="#000000">&</FONT></A><BR>
+- <A HREF=""><FONT COLOR="#000000">#34;</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="http://www.linuxtelephony.org"><font color="#000000">linuxtelephony</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="http://www.linuxtelephony.org/article.cgi?i=208&r=0"><FONT COLOR="#000000">Traverse Technologies releases NETspider-U in US</FONT></A><BR>
+- <A HREF="http://www.linuxtelephony.org/article.cgi?i=207&r=0"><FONT COLOR="#000000">Quicknet releases new GPL'd Linux Drivers!</FONT></A><BR>
+- <A HREF="http://www.linuxtelephony.org/article.cgi?i=206&r=0"><FONT COLOR="#000000">Natural Microsystems Delivers Carrier-Class Linux</FONT></A><BR>
+- <A HREF="http://www.linuxtelephony.org/article.cgi?i=205&r=0"><FONT COLOR="#000000">Quicknet is hiring programmers of all kinds!</FONT></A><BR>
+- <A HREF="http://www.linuxtelephony.org/article.cgi?i=204&r=0"><FONT COLOR="#000000">Babylon MLPPP Software Released under GPL</FONT></A><BR>
+- <A HREF="http://www.linuxtelephony.org/article.cgi?i=202&r=0"><FONT COLOR="#000000">Linux Telephony Server Project?</FONT></A><BR>
+- <A HREF="http://www.linuxtelephony.org/article.cgi?i=203&r=0"><FONT COLOR="#000000">Vovida Networks to Hire Telephony Software Engineers</FONT></A><BR>
+- <A HREF="http://www.linuxtelephony.org/article.cgi?i=200&r=0"><FONT COLOR="#000000">SPIRO-Linux Introduces Web-Enabled Phone Administration</FONT></A><BR>
+- <A HREF="http://www.linuxtelephony.org/article.cgi?i=199&r=0"><FONT COLOR="#000000">LinuxTelephony sponsors area at LinuxFest 2000</FONT></A><BR>
+- <A HREF="http://www.linuxtelephony.org/article.cgi?i=198&r=0"><FONT COLOR="#000000">GSM-Mobile Switching Center (MSC) with Linux-PC</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<TABLE BORDER="0" CELLPADDING="1" CELLSPACING="0" BGCOLOR="#000000" WIDTH="97%"><TR><TD>
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="1" CELLPADDING="3">
+<TR><TD ALIGN="center" BGCOLOR="#EEEEEE"><B><FONT FACE="Lucida,Verdana,Helvetica,Arial"><FONT COLOR="#000000"><a href="http://www.32bitsonline.com"><font color="#000000">32bitsonline</font></a></FONT></FONT></B></TD></TR><TR><TD BGCOLOR="#FFFFFF"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+- <A HREF="http://www.32bitsonline.com/article.php3?file=issues/200001/homeworld&page=1
+"><FONT COLOR="#000000">Game: Homeworld</FONT></A><BR>
+- <A HREF="http://www.32bitsonline.com/news.php3?news=news/200001/nb200001271a&page=1
+"><FONT COLOR="#000000">DVD Lawsuit Spreads Its Own 'Trade Secrets'</FONT></A><BR>
+- <A HREF="http://www.32bitsonline.com/news.php3?news=news/200001/nb200001272&page=1
+"><FONT COLOR="#000000">Register.com Adds 'One-step' Domain Registration</FONT></A><BR>
+- <A HREF="http://www.32bitsonline.com/article.php3?file=issues/200001/webevent&page=1
+"><FONT COLOR="#000000">WebEvent: Keeping you organized</FONT></A><BR>
+- <A HREF="http://www.32bitsonline.com/news.php3?news=news/200001/nb200001273a&page=1
+"><FONT COLOR="#000000">Y2K Officers Defend $100 Bil Investment</FONT></A><BR>
+- <A HREF="http://www.32bitsonline.com/article.php3?file=issues/200001/jan2000_john_berger&page=1
+"><FONT COLOR="#000000">DON'T BE FOOLED</FONT></A><BR>
+- <A HREF="http://www.32bitsonline.com/news.php3?news=news/200001/nb200001274&page=1
+"><FONT COLOR="#000000">Microsoft Scorns Think-Tank's Breakup Idea</FONT></A><BR>
+- <A HREF="http://www.32bitsonline.com/news.php3?news=news/200001/nb200001275a&page=1
+"><FONT COLOR="#000000">Yahoo Accused Of Stalking Internet Users</FONT></A><BR>
+- <A HREF="http://www.32bitsonline.com/news.php3?news=news/200001/nb200001276a&page=1
+"><FONT COLOR="#000000">eToys.com Settles Spat With Swiss Artist Group</FONT></A><BR>
+- <A HREF="http://www.32bitsonline.com/
+"><FONT COLOR="#000000">[more articles/news]</FONT></A><BR>
+&nbsp;</FONT></SMALL></TD></TR></TABLE></TD></TR></TABLE><P>
+<BR><BR></FONT>
+</TD></TR></TABLE>
+<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0">
+<TR BGCOLOR="#000000"><TD><IMG SRC="image4" WIDTH="1" HEIGHT="2" ALT=""></TD></TR></TABLE>
+</CENTER>
+<TABLE CELLSPACING="0" CELLPADDING="2" WIDTH="100%" BORDER="0"><TR>
+<TD VALIGN="top" ALIGN="center"><FONT FACE="Lucida,Verdana,Helvetica,Arial"><SMALL>copyright � 1997-2000 <A HREF="http://andover.net">Andover.Net</A> -
+icons courtesy of <A HREF="mailto:tigert@gimp.org">tigert@gimp.org</A> -
+code revision <A HREF="http://freshmeat.net/ChangeLog">20000101</A> -
+our <A HREF="http://www.andover.net/privacy.html">privacy policy</A></SMALL></FONT></TD>
+</TR></TABLE>
+</BODY>
+</HTML>
+
+
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/ss.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/ss.rb
new file mode 100644
index 0000000000..1c13d7ac34
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkHTML/ss.rb
@@ -0,0 +1,436 @@
+#!/usr/bin/env ruby
+#
+# This script implements the "ss" application.  "ss" implements
+# a presentation slide-show based on HTML slides.
+# 
+require 'tk'
+require 'tkextlib/tkHTML'
+
+file = ARGV[0]
+
+class TkHTML_File_Viewer
+  include TkComm
+
+# These are images to use with the actual image specified in a
+# "<img>" markup can't be found.
+#
+@@biggray = TkPhotoImage.new(:data=><<'EOD')
+    R0lGODdhPAA+APAAALi4uAAAACwAAAAAPAA+AAACQISPqcvtD6OctNqLs968+w+G4kiW5omm
+    6sq27gvH8kzX9o3n+s73/g8MCofEovGITCqXzKbzCY1Kp9Sq9YrNFgsAO///
+EOD
+
+@@smgray = TkPhotoImage.new(:data=><<'EOD')
+    R0lGODdhOAAYAPAAALi4uAAAACwAAAAAOAAYAAACI4SPqcvtD6OctNqLs968+w+G4kiW5omm
+    6sq27gvH8kzX9m0VADv/
+EOD
+
+  def initialize(file = nil)
+    @root  = TkRoot.new(:title=>'HTML File Viewer', :iconname=>'HV')
+    @fswin = nil
+
+    @html = nil
+    @html_fs = nil
+
+    @hotkey = {}
+
+    @applet_arg = TkVarAccess.new_hash('AppletArg')
+
+    @images   = {}
+    @old_imgs = {}
+    @big_imgs = {}
+
+    @last_dir = Dir.pwd
+
+    @last_file = ''
+
+    @key_block = false
+
+    Tk::HTML_Widget::ClippingWindow.bind('1', 
+                                         proc{|w, ksym| key_press(w, ksym)}, 
+                                         '%W Down')
+    Tk::HTML_Widget::ClippingWindow.bind('3', 
+                                         proc{|w, ksym| key_press(w, ksym)}, 
+                                         '%W Up')
+    Tk::HTML_Widget::ClippingWindow.bind('2', 
+                                         proc{|w, ksym| key_press(w, ksym)}, 
+                                         '%W Down')
+
+    Tk::HTML_Widget::ClippingWindow.bind('KeyPress', 
+                                         proc{|w, ksym| key_press(w, ksym)}, 
+                                         '%W %K')
+
+    ############################################
+    #
+    # Build the half-size view of the page
+    #
+    menu_spec = [
+      [['File', 0], 
+        ['Open',        proc{sel_load()},   0], 
+        ['Full Screen', proc{fullscreen()}, 0], 
+        ['Refresh',     proc{refresh()},    0], 
+        '---',
+        ['Exit', proc{exit}, 1]]
+    ]
+
+    mbar = @root.add_menubar(menu_spec)
+
+    @html = Tk::HTML_Widget.new(:width=>512, :height=>384, 
+                                :padx=>5, :pady=>9, 
+                                :formcommand=>proc{|*args| form_cmd(*args)},
+                                :imagecommand=>proc{|*args|
+                                  image_cmd(1, *args)
+                                }, 
+                                :scriptcommand=>proc{|*args|
+                                  script_cmd(*args)
+                                }, 
+                                :appletcommand=>proc{|*args|
+                                  applet_cmd(*args)
+                                }, 
+                                :hyperlinkcommand=>proc{|*args| 
+                                  hyper_cmd(*args)
+                                }, 
+                                :fontcommand=>proc{|*args|
+                                  pick_font(*args)
+                                }, 
+                                :appletcommand=>proc{|*args|
+                                  run_applet('small', *args)
+                                }, 
+                                :bg=>'white', :tablerelief=>:raised)
+
+    @html.token_handler('meta', proc{|*args| meta(@html, *args)})
+
+    vscr = @html.yscrollbar(TkScrollbar.new)
+    hscr = @html.xscrollbar(TkScrollbar.new)
+
+    Tk.grid(@html, vscr, :sticky=>:news)
+    Tk.grid(hscr,       :sticky=>:ew)
+    @root.grid_columnconfigure(0, :weight=>1)
+    @root.grid_columnconfigure(1, :weight=>0)
+    @root.grid_rowconfigure(0, :weight=>1)
+    @root.grid_rowconfigure(1, :weight=>0)
+
+    ############################################
+
+    @html.clipwin.focus
+
+    # If an arguent was specified, read it into the HTML widget.
+    #
+    Tk.update
+    if file && file != ""
+      load_file(file)
+    end
+  end
+
+  #
+  # A font chooser routine.
+  #
+  # html[:fontcommand] = pick_font
+  def pick_font(size, attrs)
+    # puts "FontCmd: #{size} #{attrs}"
+    [ ((attrs =~ /fixed/)? 'courier': 'charter'), 
+      (12 * (1.2**(size.to_f - 4.0))).to_i, 
+      ((attrs =~ /italic/)? 'italic': 'roman'), 
+      ((attrs =~ /bold/)? 'bold': 'normal') ].join(' ')
+  end
+
+  # This routine is called to pick fonts for the fullscreen view.
+  #
+  def pick_font_fs(size, attrs)
+    baseFontSize = 24
+
+    # puts "FontCmd: #{size} #{attrs}"
+    [ ((attrs =~ /fixed/)? 'courier': 'charter'), 
+      (baseFontSize * (1.2**(size.to_f - 4.0))).to_i, 
+      ((attrs =~ /italic/)? 'italic': 'roman'), 
+      ((attrs =~ /bold/)? 'bold': 'normal')  ].join(' ')
+  end
+
+  #
+  #
+  def hyper_cmd(*args)
+    puts "HyperlinkCommand: #{args.inspect}"
+  end
+
+  # This routine is called to run an applet
+  #
+  def run_applet(size, w, arglist)
+    applet_arg.value = Hash[*simplelist(arglist)]
+
+    return unless @applet_arg.key?('src')
+
+    src = @html.remove(@applet_arg['src'])
+
+    @applet_arg['window'] = w
+    @applet_arg['fontsize'] = size
+
+    begin
+      Tk.load_tclscript(src)
+    rescue => e
+      puts "Applet error: #{e.message}"
+    end
+  end
+
+  #
+  #
+  def form_cmd(n, cmd, *args)
+    # p [n, cmd, *args]
+  end
+
+  #
+  #
+  def move_big_image(b)
+    return unless @big_imgs.key?(b)
+    b.copy(@big_imgs[b])
+    @big_imgs[b].delete
+    @big_imgs.delete(b)
+  end
+
+  def image_cmd(hs, *args)
+    fn = args[0]
+
+    if @old_imgs.key?(fn)
+      return (@images[fn] = @old_imgs.delete(fn))
+    end
+
+    begin
+      img = TkPhotoImage.new(:file=>fn)
+    rescue
+      return ((hs)? @@smallgray: @@biggray)
+    end
+
+    if hs
+      img2 = TkPhotoImage.new
+      img2.copy(img, :subsample=>[2,2])
+      img.delete
+      img = img2
+    end
+
+    if img.width * img.height > 20000
+      b = TkPhotoImage.new(:width=>img.width, :height=>img.height)
+      @big_imgs[b] = img
+      img = b
+      Tk.after_idle(proc{ move_big_image(b) })
+    end
+
+    @images[fn] = img
+
+    img
+  end
+
+  #
+  # This routine is called for every <SCRIPT> markup
+  #
+  def script_cmd(*args)
+    # puts "ScriptCmd: #{args.inspect}"
+  end
+
+  # This routine is called for every <APPLET> markup
+  #
+  def applet_cmd(w, arglist)
+    # puts "AppletCmd: w=#{w} arglist=#{arglist}"
+    #TkLabel.new(w, :text=>"The Applet #{w}", :bd=>2, :relief=>raised)
+  end
+
+  # This binding fires when there is a click on a hyperlink
+  #
+  def href_binding(w, x, y)
+    lst = w.href(x, y)
+    unless lst.empty?
+      process_url(lst)
+    end
+  end
+
+  #
+  #
+  def sel_load
+    filetypes = [
+      ['Html Files', ['.html', '.htm']], 
+      ['All Files', '*']
+    ]
+
+    f = Tk.getOpenFile(:initialdir=>@last_dir, :filetypes=>filetypes)
+    if f != ''
+      load_file(f)
+      @last_dir = File.dirname(f)
+    end
+  end
+
+  # Clear the screen.
+  #
+  def clear_screen
+    if @html_fs && @html_fs.exist?
+      w = @html_fs
+    else
+      w = @html
+    end
+    w.clear
+    @old_imgs.clear
+    @big_imgs.clear
+    @hotkey.clear
+    @images.each{|k, v| @old_imgs[k] = v }
+    @images.clear
+  end
+
+  # Read a file
+  #
+  def read_file(name)
+    begin
+      fp = open(name, 'r')
+      ret = fp.read(File.size(name))
+    rescue
+      ret = nil
+      fp = nil
+      Tk.messageBox(:icon=>'error', :message=>"fail to open '#{name}'", 
+                    :type=>:ok)
+    ensure
+      fp.close if fp
+    end
+    ret
+  end
+
+  # Process the given URL
+  #
+  def process_url(url)
+    case url[0]
+    when /^file:/
+      load_file(url[0][5..-1])
+    when /^exec:/
+      Tk.ip_eval(url[0][5..-1].tr('\\', ' '))
+    else
+      load_file(url[0])
+    end
+  end
+
+  # Load a file into the HTML widget
+  #
+  def load_file(name)
+    return unless (doc = read_file(name))
+    clear_screen()
+    @last_file = name
+    if @html_fs && @html_fs.exist?
+      w = @html_fs
+    else
+      w = @html
+    end
+    w.configure(:base=>name)
+    w.parse(doc)
+    w.configure(:cursor=>'top_left_arrow')
+    @old_imgs.clear
+  end
+
+  # Refresh the current file.
+  #
+  def refresh(*args)
+    load_file(@last_file) if @last_file
+  end
+
+  # This routine is called whenever a "<meta>" markup is seen.
+  #
+  def meta(w, tag, alist)
+    v = Hash[*simplelist(alist)]
+
+    if v.key?('key') && v.key?('href')
+      @hotkey[v['key']] = w.resolve(v['href'])
+    end
+
+    if v.key?('next')
+      @hotkey['Down'] =v['next']
+    end
+
+    if v.key?('prev')
+      @hotkey['Up'] =v['prev']
+    end
+
+    if v.key?('other')
+      @hotkey['o'] =v['other']
+    end
+  end
+
+  # Go from full-screen mode back to window mode.
+  #
+  def fullscreen_off
+    @fswin.destroy
+    @root.deiconify
+    Tk.update
+    @root.raise
+    @html.clipwin.focus
+    clear_screen()
+    @old_imgs.clear
+    refresh()
+  end
+
+  # Go from window mode to full-screen mode.
+  #
+  def fullscreen
+    if @fswin && @fswin.exist?
+      @fswin.deiconify
+      Tk.update
+      @fswin.raise
+      return
+    end
+
+    width  =  @root.winfo_screenwidth
+    height =  @root.winfo_screenheight
+    @fswin = TkToplevel.new(:overrideredirect=>true, 
+                            :geometry=>"#{width}x#{height}+0+0")
+
+    @html_fs = Tk::HTML_Widget.new(@fswin, :padx=>5, :pady=>9, 
+                                   :formcommand=>proc{|*args|
+                                     form_cmd(*args)
+                                   },
+                                   :imagecommand=>proc{|*args| 
+                                     image_cmd(0, *args)
+                                   }, 
+                                   :scriptcommand=>proc{|*args|
+                                     script_cmd(*args)
+                                   }, 
+                                   :appletcommand=>proc{|*args|
+                                     applet_cmd(*args)
+                                   }, 
+                                   :hyperlinkcommand=>proc{|*args| 
+                                     hyper_cmd(*args)
+                                   }, 
+                                   :appletcommand=>proc{|*args|
+                                     run_applet('big', *args)
+                                   }, 
+                                   :fontcommand=>proc{|*args|
+                                     pick_font_fs(*args)
+                                   }, 
+                                   :bg=>'white', :tablerelief=>:raised, 
+                                   :cursor=>:tcross) {
+      pack(:fill=>:both, :expand=>true)
+      token_handler('meta', proc{|*args| meta(self, *args)})
+    }
+
+    clear_screen()
+    @old_imgs.clear
+    refresh()
+    Tk.update
+    @html_fs.clipwin.focus
+  end
+
+  #
+  #
+  def key_press(w, keysym)
+    return if @key_block
+    @key_block = true
+    Tk.after(250, proc{@key_block = false})
+
+    if @hotkey.key?(keysym)
+      process_url(@hotkey[keysym])
+    end
+    case keysym
+    when 'Escape'
+      if @fswin && @fswin.exist?
+        fullscreen_off()
+      else
+        fullscreen()
+      end
+    end
+  end
+end
+############################################
+
+TkHTML_File_Viewer.new(file)
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkimg/demo.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tkimg/demo.rb
new file mode 100644
index 0000000000..a0c4d1b64f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkimg/demo.rb
@@ -0,0 +1,1478 @@
+#!/usr/bin/env ruby
+#
+#  Tk::Img demo
+#
+#    --  This script is based on demo.tcl of Tcl/Tk's 'Img' extention. 
+#        Image data in this script is those of demo.tcl.
+#        Please read 'license_terms_of_Img_extension' file.
+#
+require 'tk'
+require 'tkextlib/tkimg'
+
+#
+# Make the Image format available.
+#
+class TkImg_demo
+  def initialize
+    img_version = Tk::Img.package_version
+
+    @typeFrame = Hash.new
+    @imgPriv = Hash.new
+
+    root = TkRoot.new(:title=>'Tests for available image formats')
+
+    root.winfo_children.each{|w| w.destroy}
+    TkImage.names{|img| img.delete}
+
+    f = TkFrame.new
+    TkButton.new(f, :text=>'Dismiss', :command=>proc{exit}).pack(:side=>:left)
+    f.pack(:side=>:top, :expand=>:y, :fill=>:both)
+
+    TkMessage.new(:aspect=>900, :text=>format('This page shows the available image formats of the Img extension (Img version %s, using Tcl/Tk %s)', img_version, Tk::TK_PATCHLEVEL)).pack(:side=>:top, :expand=>:y, :fill=>:both)
+  end
+
+##############################
+
+  def update_animated_gif(w, method, num)
+    return unless @imgPriv[w]
+
+    if @imgPriv[w][:args]
+      im = TkPhotoImage.new
+      im.copy(@imgPriv[w][num])
+      num += 1
+      begin
+        im.configure(@imgPriv[w][:args].merge(:format=>[:gif, {:index=>num}]))
+        im.configure(:data=>'', :file=>'') #free storage
+        @imgPriv[w][num] = im
+      rescue
+        @imgPriv[w].delete(:args)
+        if num > 1
+          num = 0
+          im = @imgPriv[w][num]
+        else
+          # this is not an animated GIF; just stop
+          @imgPriv[w].delete(0)
+          return
+        end
+      end
+    else
+      num += 1
+      num = 0 unless @imgPriv[w][num]
+      im = @imgPriv[w][num]
+    end
+    begin
+      w.__send__(method, im)
+      Tk.update_idletasks
+      Tk.after(20, proc{update_animated_gif(w, method, num)})
+    rescue
+      @imgPriv[w].delete(:args)
+      @imgPriv[w].each{|im|
+        @im.delete
+        @imgPriv.delete(im)
+      }
+    end
+  end
+
+  def show_animated_gif(keys)
+    w = TkLabel.new
+    begin
+      im = TkPhotoImage.new(keys.merge(:format=>[:gif, {:index=>0}]))
+      im.configure(:data=>'', :file=>'', :format=>'') #free storage
+      w.image(im)
+      @imgPriv[w] ||= Hash.new
+      @imgPriv[w][0] = im
+      @imgPriv[w][:args] = keys
+      Tk.update_idletasks
+      Tk.after(20, proc{update_animated_gif(w, :image, 0)})
+    rescue => e
+      w.configure(:text=>"error displaying animated gif:\n#{e.message}", 
+                  :image=>'', :relief=>:ridge)
+    end
+    w.pack
+  end
+
+  def show_image(fmt, type, data)
+    fmt = fmt.to_s.capitalize
+    unless @typeFrame[fmt]
+      @typeFrame[fmt] = TkFrame.new.pack(:side=>:top, :expand=>true, :fill=>:x)
+      TkLabel.new(@typeFrame[fmt], :text=>"#{fmt} :  ").pack(:side=>:left)
+    end
+    begin
+      f = TkFrame.new(@typeFrame[fmt], 
+                      :borderwidth=>2, :relief=>:ridge).pack(:side=>:left)
+      im = TkPhotoImage.new(:data=>data)
+      im['data'] = ''
+      TkLabel.new(f, :image=>im).pack
+      TkLabel.new(f, :text=>type, :borderwidth=>0, :pady=>0, :padx=>2, 
+                  :font=>'Helvetica 8').pack
+    rescue => e
+      TkMessage.new(f, :text=>"error displaying #{type} image: #{e.message}", 
+                    :aspect=>250).pack
+    end
+    Tk.update
+  end
+
+end
+
+##############
+
+demo = TkImg_demo.new
+
+##############
+
+demo.show_animated_gif(:data=><<'ENDofIMG')
+R0lGODlhYgIEAIIAAQAAACQAJEkASW0AbZIAkrYAttsA2/8A/yH/C05FVFNDQVBFMi4wAwEA
+AAAh+QQABgD/ACwAAAAAYgIEAAIDuUg63CMwwiCCvQAHwLv/YCiOZGmeaKqubOu+pZXNV03d
+kuAwysLoucjNlpFtYMikcslsOp+ijbRow1EiD12jtyA4INnJZGg8HmfQtHrNbrPP6KqlEgRq
+B17vzi6ukKVmHXBuhIWGh4RTcXJ0QQ8OeVx6XzlWVTRoiJqbnJ0tGmUXdDhgd1uTP2FCo5dT
+g56wsbKaoYBzVlimPJJ7QX9EirPCw8RttTZ1ul29Er81mMXR0tMvxzXJO1wAACH5BAAGAP8A
+LAAAAABiAgQAAgPdCLrc/jDKSau9OOuNAwjgB46kEJjnKazr0A5wTBDDbBc4buz74f/AoHBI
+LBqPSCGPh7M5abQYTOBysVYprAlFCo0+YI9CzCmbz+i0es1uu9/wOFrsqYtE3S73yq9SpTBP
+BDk5PEmHiImKRQYHTISDNjWTMX9UfFuZIFwkY3RhcqGio6SlpqeoqRt2dXmuWyqZV1Z/UjM1
+ToQFS46Lvr/AQUu6BYK4gJe0V7Eprl+sXqrS09TV1tfYbKxhziqxmFOAgYKDOrs9wenqSY07
+uznklFKXmCzN3aB22fv81AAAIfkEAAYA/wAspgAAABgBBAACA+YIEQrNS61Jg1hX6C2GHiBI
+DERpFkShFkZrHHAsz3Rt06/Lrqk5jqFQ58PheI5B0s+HWrFch9dtSp26dDyULwnqeIoay+Qi
+rkAcZ4YDrVY/IOaxGGz0IkPLknN3rfr/MToGTilaJSRcR3RgikF5JyuDfYCUVFeDKj0mSkle
+Q4sYcXFvaA1rDxIScKIZYUVfiUA+PU6Tlbc4US07PJs/nYqLQ4kieZkqki24yzJXe5qziEHD
+dHNloqqpbqfcbquiGK2MH0mzkJG2zLfOhObSQsHC1OVKTLVQUurrWL1biZ9grIFLs2YbNwAh
++QQABgD/ACyHAAAAVwEEAAID/ggQy94uyCloFTgPsYf/AyGOYmGaRnoYR+u+cCzPcZqeJyl6
+xMdhm4zwUgkUJ8iFkqFgKptQCQRJMRqJwqAPtCMVCDhDwcaimc9mslhs0vXeoJ9caL1Q748n
+tMl89PFURURXQx4cH11eYChjKmiPkC5kOGCVIyCYWkN2VoB8fXtOS34RgJybGkCZbosnZJGw
+aCw3bF9tXSFxhqhXnb5JSUt6CsKlxneDqHIdqyEjOI0qZbHUMGq1bs6Yh3NDdb93U1Ki41Hi
+poSEqYZcuYphr9XykjbQrLnbHbwYEkd4xQ2GERvoZxQ6LIUOrWLlKtq8h5Ps6ci0SxknQOVE
+Ddy4HvGPQVMIC1Hk4QZavIfUZq3J8YUEPl0WL3qaIIwjMQAh+QQABgD/ACxlAAAAmwEEAAID
+/ggRCr1qSSlWDVXorYfwQxgSxECSBVGsheEaB3zMdG3feF7DbsumJ5JJJPpwjhnLZMloPp4M
+h3RKrVqv2KxW2nRGmBQlBnP0dD7EYfDne8l08DjcbfgFhaW0cX8ciy9LD05RUREOhQ2GYEoa
+ZGQbIGlDJmsqPy9ymZo0PD11Kyp3anogfX5igamGh1utrq+uhFBQYBm2j5CSIncnLHWYm8Fx
+bj52QZOSSBeNp2BfEIVeU4PUi0mOSJFoaXcpvnTC4TnExiejRdrK2IsSgrKIsPHyr4OJ7GHL
+thxmkSN4vZdauIghriCnF2yAmBOCzoiZPkkAOav3JEs0d+z0ZdPFMgvFJWAGCxL7pPBYHiJ8
+TElcNGuey5cwW97Dp6yDpBK82LgJaXAki47IGqq7xm4WPCoAACH5BAAGAP8ALEYAAADZAQQA
+AgP+GKC7yiHKGYSo1Wo9xPgfMYhEWRZoYaiGcbxwLM90Tbf4ihKFSYqgjnBDjFwuGMoD0Fgy
+n9CodEqtWq/YrHa7hTgaTSXySCZ6PMFQyJdC5Vy2uFz+VqV8pFH6czYfM0pKYF4MYE0OD4ET
+Y4BEfHt6eDt2OAdwc5iZLzhtO3iQIBYdGhgWpYoTYUxOXK2ur7CxrV5fqBR/GWZDaT9sPG4s
+l5rDNi4tdpOfQGlno6SmSEkUiISDT4mJtYpkubq7Qb0mbSuVwsTnmzltPJ96oY9+uNGKiLWy
+9/j5+l3YqrZl3UT12YPnxLg36BLCULdOmbt38bjNC3TISSEqSyRQE1M8yo8QXiMk/XJTSaFC
+hg19gIp4auI0Vhf3yZxJUx8EbP/K6EIDLqSvgy1MJlSno0cPlcsg+gEkTZBGVlMAACH5BAAG
+AP8ALCYAAAAXAgQAAgP+CAHaHQtKKGioV+itRx/gQIBESRTnWRRGexhHLM90bd9127Jrao7A
+kMfDKVommMnisYwwHM+odEqtWq/YrHbL7Xq/YIaTCVEoj5YiZ8gmiX6l1UrnguHu+DvdIEeh
+4EJsAkRqGBoXZxJmEU2NYo9mYoyJFRwZG22Bbz99LHR5oKEydDxyPiUimiCDrIeViK9ni4wP
+kGG3uLm6u7y9tmO1iRKuGZeYmUDJJn18OqLPoKQ9fyZuga2Er4fCioqRTVFlZWTcxJVFQx9u
+yioqPM7Q8TbSptRBI0KthRvF3OLitnwJHEiwoMErk5jMOmMIVqFMIdjFmeMJhh15GF/o6HRK
+qhq+VayyWYLlr5GTcVjAlTS0DyIJOBPlfMqI0WKzeoA+htCnph+3SFAOCh1KtGivk/+EnWs5
+KJDEFMzg0ZS3BydMVSL5aStJ6woAIfkEAAYA/wAsBwAAAFUCBAACA/4ICqEd8MUJRQ0i65GH
+F55HEMM4FkShFgZrHHAsz3Rt10aer6s5lqEQqKPRYI6WI+XBYDYYi+diSq1ar9isdsvter/g
+sHhMLkebUEhziUkai8ROMOQ78Vy6m37Pf+1aPXUlJEJCcG9ubGpOaWlPUowSSxYZbW1FHCBz
+g3V3eC98oaIwfi07KCkmQIQfH4eUsBdLa4tnUma4ubq7vL2+v1mPUGiKE7GVh4V0Pz53pjmj
+0X06LD2oqqxBG4dKiRS0TrdTkcURlBWwmJqaIqsmqDw6oNL0NPKeddnaHJlwl0qKGgkTB6yg
+wYMIEyq8Qm5RsXOW4PCbGIREp3jy5tXbWE4KUCBsm4aI5HYuSUBJDoZZgQTu4aVkm5ZdVCFv
+o01SB/589AFkzshXAE8KXEi0qNGjSMlEajnpJcxN+exUy3OTIzUeUXvue4WsXC0mWAAAIfkE
+AAYA/wAsAAAAAGICBAACA/4YotIuA8JBKxkk60KKN6BxiEdpnmiqrmhoeF6naVXdRI/DBAq/
+8MAAQDgsEgHIpHLJbDqf0Kh0Sq1ar9isdsvterdEIW8IJAfPv0XOEalZZjJYwcWq2++i0Fwu
+m2HcbWs5PWoMgm01F4obci90d5CRJS5yHBw0GX8UEpw6D4RnY0FGYUVfp6ipqqusra6vXKVk
+pqFBhYM5gYkYcJWOIZLBdnovMH2YbjcSOLc+hA2GyoB/cBmWe8DC2ivExpdw05vMn4W1o2Wi
+sOrr7O3u7/BVoujz5mrQhxNuF7zWHTCPtgmcNALEHmPg+NnohOvHs3yILPRjBBAYiYHaXBRD
+6CtnmiBP5mqZGhmvpMmTKFOqbBJGTEgg+D5GlFjt2pyAGIVR4lNNU7JxnhwCACH5BAAGAP8A
+LAAAAABiAgQAAgPtWLZ7/jDKSaU5rOhCuu9DKA5CKJRnGgjB6rJt3AIxDdzBbet87//AoHBI
+LBqPyKRyyWw6n9CodOrL8ay5rFa2YsG8qRNJXAoRRB8CZ6NgYCrweJxhUNjd8rz+QWevPwMg
+ImUoYWEtX1wzNFg2jVSQkZKTlJWWl5iZTo+OW4qIMYZhJKQjgWlqbHQXe61wFwt2bQ2utROw
+sX6oZqYoY4YvLp81WY47msjJysvMzc7PxjPEw2DVKWOmvKceaxurtuB8GLl1Dazhtn0bqGdn
+vb/AXsPE0dD29/j5+vvLVtHzJ7qIKpSNXSpVtNCly1AAACH5BAAGAP8ALAAAAABiAgQAAgPV
+eLq8diYWUwqxJJOx9/iDEIpCaZpBmQZs6wYAC8QwPd94ru987//AoHBILBqPyKRyyWw6n9Ao
+Elaj0l4tlYC1PZVCoHBnnLFUJpF0Y81uOyCTc0Wj4YRBJO9qu8LKqjaAUoOEhYaHiImKi4yN
+TzUxN1STflxZXiZgInccdGZyaQ9uo24PoXFmdHacJCOYKXx8lZRXM5COuLm6u7y9vr+KtJSz
+e1perpwZnRqfaGqk0GunZxd0yh54mq8qxFaRwODh4uPk5eaEVVbdxpibm3fWZXLOotEAADs=
+ENDofIMG
+
+demo.show_image('bmp', '1-bit', <<'ENDofIMG')
+Qk3OAQAAAAAAAD4AAAAoAAAAIgAAADIAAAABAAEAAAAAAJABAABtCwAAbQsAAAIAAAACAAAA
+MzPMAMwzMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAZmTKAAAAAABIRIwAAAAAAEZAigAAAAAAQECIAAAAAAAAAAgAAAAAAAAEAA
+AAAAAAABQAAAAAAAAAPAAAAAAAAAB+AAAAAAAAAC4AAAAAAAAALgAAAAAAAAAsAAAAAAAAAC
+wAAAAAAAAALgAAAAAAAABuAAAAAAAAAG4AAAAAAAAAbgAAAAAAAABuAAAAAAAAAG4AAAAAAA
+AAfgAAAAAAAAA+AAAAAAAAADcAAAAAAAAAPwAAAAAAAAA/AAAAAAAAAD+AAAAAAAAAP4AAAA
+AAAAA/gAAAAAAAAD4AAAAAAAAAHgAAAAAAAAAfAAAAAAAAAA+AAAAAAAAAB8AAAAAAAAADgA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ENDofIMG
+
+demo.show_image('bmp', '4-bit', <<'ENDofIMG')
+Qk1aBAAAAAAAAHIAAAAoAAAAIgAAADIAAAABAAQAAAAAAOgDAABtCwAAbQsAAA8AAAAPAAAA
+////AAD//wDMzP8AmZn/AGaZ/wAzM8wAmZnMAGaZzAAzZswAzMyZAJmZmQDMZjMAZjNmADMz
+ZgBmMzMABWMgAAAAAAAAAAAAAAAAAAAAAAAFVVVVVVVVVVVVVVVVVVVVUAAAAAVVVVVVVVVV
+VVVVVVVVVVVQAAAABVVVVVVVVVVVVVVVVVVVVVAAAAAFVVVVVVVVVVVVVVVVVVVVUAAAAAVV
+VVVVVVVVVVVVVVVVVVWAAAAABVVVVVVVVVVVVVVVVVVVVVAAAAAFVVBVU3VSVVNVB1UFBVVV
+UAAAAAVVUFU1VVNVVVUFVQBVVVVgAAAABVVQVVUFU1VVVQVVBVVVVTAAAAAIVVBVVVVTVXVV
+BVUFVVVVMAAAAAVVVVVVVVFVFVVVVQVVVVUgAAAABVVVVVVVVVUFVVVVVVVVVSAAAAAHVVVV
+VVVVW5tVVVVVVVVVAAAAAAZVVVVVVVW8u2VVVVVVVVUAAAAAA1VVVVVVW7W7tVVVVVVVVQAA
+AAADVVVVVVWCtbuzVVVVVVVVAAAAAANVVVVVVVW1vrJVVVVVVVUAAAAAAlVVVVVVWLW7UFVV
+VVVVVQAAAAACVVVVVVVatbtVVVVVVVVVAAAAAABVVVVVVVq3u8NVVVVVVVUAAAAAAFVVVVVV
+XrS74VVVVVVVVQAAAAAAVVVVVVWLtbuyVVVVVVVVAAAAAABVVVVVVUu1u7BVVVVVVVUAAAAA
+AFVVVVVVO7W7sFVVVVVVVQAAAAAAVVVVVVUbtbu6VVVVVVVVAAAAAABVVVVVVSu9u1VVVVVV
+VVUAAAAAAFVVVVVVJb67tVVVVVVVVQAAAAAAVVVVVVVVu6u7VVVVVVVVAAAAAABVVVVVVVW7
+u7slVVVVVVUAAAAAAFVVVVVVVbu7u1VVVVVVVQAAAAACVVVVVVVVu7u7wlRVVVVVAAAAAAJV
+VVVVVVW7u7uwV1VVVVUAAAAAA1VVVVVVVbu7u7BVhVVVVSAAAAADVVVVVYVVu7vFAFUVVVVV
+MAAAAAZVVVVVhVUbu7VVVRVXVVVgAAAAB1VVVVVVVVu7u1VVFVFVVVAAAAAFVVVVVVhVVLu7
+xVVVVVVVgAAAAAVVVVVVUVVVK7u1VVVVVVVQAAAACFVVVVhRVVVQq7VVVVVVVVAAAAAFVVVV
+VFV1VVUgBVVVVVVVUAAAAAVVVVVUVRVVVVVVVVVVVVVQAAAABVVVVViFUVVVVVVVVVVVVVAA
+AAAFVVVVVRVUFVVVVVVVVVVVUAAAAAVVVVVVVVVVVVVVVVVVVVVQAAAABVVVVVVVVVVVVVVV
+VVVVVVIAAAAFVVVVVVVVVVVVVVVVVVVVUQAAAAVVVVVVVVVVVVVVVTdVVVVWAAAAAAAhNnWF
+VVVVVVcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==}
+ENDofIMG
+
+if false
+demo.show_image('bmp', '4-bit-RLE', <<'ENDofIMG')
+Qk1sAwAAAAAAAHYAAAAoAAAAIgAAADIAAAABAAQAAgAAAPYCAAAAAAAAAAAAABAAAAAQAAAA
+////AMzM/wAA//8AmZn/AJmZzABmmcwAMzPMADNmzABmmf8AmZmZAMxmMwBmM2YAZjMzADMz
+ZgDMzJkAAAAAAAAGBkMQABwAAAACBh5mAmAAAAIGHmYCYAAAAgYeZgJgAAACBh5mAmAAAAIG
+HmYCcAAAAgYeZgJgAAAAIgZmYGZjVmFmY2YFZgYGZmZgAAAAACIGZmBmNmZjZmZmBmYAZmZm
+QAAAAAAiBmZgZmYGY2ZmZgZmBmZmZjAAAAAAIgdmYGZmZmNmVmYGZgZmZmYwAAAAAgYKZgAW
+YmYmZmZmBmZmZhAAAAACBg5mAgYOZgIQAAACBQxmAARq6g5mAgAAAAIEDGYABquqRgAMZgIA
+AAACAwpmAAhqpqqmDGYCAAAAAgMKZgAIcaaqowxmAgAAAAIDDGYABqasoQAMZgIAAAACAQpm
+AAhnpqpgDGYCAAAAAgEKZgAGaaaqAA5mAgAAAAIACmYACGmlqrMMZgIAAAACAApmAAhsqKrC
+DGYCAAAAAgAKZgAIeqaqoQxmAgAAAAIACmYACIqmqqAMZgIAAAACAApmAAg6pqqgDGYCAAAA
+AgAKZgAIKqaqqQxmAgAAAAIACmYABhqtqgAOZgIAAAACAApmAAgWrKqmDGYCAAAAAgAMZgAG
+qpqqAAxmAgAAAAIADGYACKqqqhYKZgIAAAACAAxmAAaqqqoADGYCAAAAAgEMZgAKqqqqsWgA
+CGYCAAAAAgEMZgAKqqqqoGUACGYCAAAAAgMMZgAUqqqqoGZ2ZmZmEAAAAgMIZgAYdmaqqrYA
+ZiZmZmYwAAACBAhmABh2ZiqqpmZmJmVmZkAAAAIFDGYAFGqqqmZmJmJmZmAAAAIGCGYADGdm
+aKqqtgpmAnAAAAIGCGYADGJmZhqqpgpmAmAAAAAWB2ZmZmdiZmZgmqYACmYCYAAAABYGZmZm
+aGZWZmYQBgAKZgJgAAAADgZmZmZoZiYAEmYCYAAAAA4GZmZmZ3ZiABJmAmAAAAIGCGYABiZo
+JgAQZgJgAAACBh5mAmAAAAIGHmYCYQAAAgYeZgJiAAACBhZmAAo1ZmZmZAAAAAAMAAASNFZ2
+CGYCZQwAAAAiAAAB
+ENDofIMG
+end
+
+demo.show_image('bmp', '8-bit', <<'ENDofIMG')
+Qk0CCAAAAAAAAPoAAAAoAAAAIgAAADIAAAABAAgAAAAAAAgHAABtCwAAbQsAADEAAAAxAAAA
+////AMz//wAA//8AzMz/AJnM/wAAzP8AmZn/AGaZ/wAAmf8AZmb/ADNm/wAzM/8A/8zMAMzM
+zACZmcwAZpnMAACZzABmZswAM2bMAABmzAAzM8wAADPMAAAAzAD/zJkAzMyZAMyZmQCZmZkA
+ZmaZAGYzmQAzM5kAzJlmAJlmZgBmZmYAZjNmADMzZgDMmTMAmWYzAJkzMwBmMzMAmWYAAJkz
+AAAAAN0A7u7uAN3d3QC7u7sAqqqqAIiIiAB3d3cAVVVVAAARDgYDKgAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAVFRUVFRUVFRUVFBQUFBQUFRUVFRUVFRUVFRUVFRUVFQAAAAAV
+FRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFQAAAAAVFRUVFRUVFRUVFRUVFRUVFRUV
+FRUVFRUVFRUVFRUVFAAAAAAVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFAAAAAAV
+FRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVEgAAAAAVFRUVFhUVFRYVFRUWFRUVERUV
+FhUVFRYVFhUVFRUVEQAAAAAUFRUWABEVFQYPFhUDERUWBhUVKg8VFAAUABQVFRUVEQAAAAAU
+FRUWABYVBhQWFRUGFBUWERUWABYVFgAAFRUVFRUVDgAAAAAUFRUVABUVFBEAFhUGFBUUFRUV
+ABUVFgARFRUVFRUVBgAAAAASFRUWABUVFRUVFRUGFBUPFhUWABYVFgAVFBUVFRUVBgAAAAAR
+FRUVFhUVFRUVFRUEFBUEFhUVFhUVFQAWFRUVFRUVAwAAAAARFRUVFRUVFRUVFRUVFRUrHRUV
+FRUVFRUVFRUVFRUVAwAAAAAPFRUVFRUVFRUVFRUVFCQYKBUVFRUVFRUVFRUVFRUVKgAAAAAO
+FRUVFRUVFRUVFRUUJyEeKA4VFRUVFRUVFRUVFRUVAAAAAAAGFRUVFRUVFRUVFRYeKB0kKCQU
+FRUVFRUVFRUVFRUVAAAAAAAGFRUVFRUVFRUVFRIDKBQnKCgGFRUVFRUVFRUVFRUVAAAAAAAG
+FRUVFRUVFRUVFRUVJxEnJigDFRUVFRUVFRUVFRUVAAAAAAADFRUVFRUVFRUVFRUSKBEnKAkq
+FRUVFRUVFRUVFRUVAAAAAAADFRUVFRUVFRUVFRUuJxEoKBEWFRUVFRUVFRUVFRUVAAAAAAAr
+FRUVFRUVFRUVFRYvKA8oKCEGFRUVFRUVFRUVFRUVAAAAAAAqFRUVFRUVFRUVFRQmKAcoKCYE
+FRUVFRUVFRUVFRUVAAAAAAAAFRUVFRUVFRUVFRIoJwkoKCgDFRUVFRUVFRUVFRUVAAAAAAAA
+FRUVFRUVFRUVFQcoJxEnKCgBFRUVFRUVFRUVFRUUAAAAAAAAFRUVFRUVFRUVFQYoKBQnKCgq
+FhUVFRUVFRUVFRUUAAAAAAAAFRUVFRUVFRUVFQQoKBQkKCgsFhUVFRUVFRUVFRUUAAAAAAAA
+FRUVFRUVFRUVFQMkKCIjKB0RFRUVFRUVFRUVFRUUAAAAAAAAFRUVFRUVFRUVFQMUKCYeKCgV
+FRUVFRUVFRUVFRUVAAAAAAAAFRUVFRUVFRUVFRUVKCgaKCgnFRUVFRUVFRUVFRUVAAAAAAAA
+FRUVFRUVFRUVFRUUKCgkKCgoAxYVFRUVFRUVFRUVAAAAAAArFRUVFRUVFRUVFRURKCgoKCgo
+ERQVFRUVFRUVFRUVAAAAAAADFRUVFRUVFRUVFRURKCgoKCgoIQMWCBUVFRUVFRUVAAAAAAAD
+FRUVFRUVFRUVFRURKCgoKCgoKAAWEBYVFRUVFRUVKgAAAAAGFRUVFRUVFRUVFRUUJygoKCgo
+KAAWFRMVFRUVFRUVAwAAAAAGFRUVFRUVFRUTFhUWHigoKCEUKgAWFgIVFRUVFRUVBgAAAAAO
+FRUVFRUVFRUTFRUVBCgoKCgUFRYVFgIWFRAWFRUVDgAAAAAPFRUVFRUVFRUVFRUVFR4oKCgo
+FRUVFQIVFQUVFRUVEQAAAAARFRUVFRUVFRUVExUVFQckKCgoIRUVFRYVFRUVFRUVEgAAAAAR
+FRUVFRUVFRUWAhYVFRYDJygoKB0VFRUVFRUVFRUVFAAAAAASFRUVFRUVFRMVBRUVFRUWKhko
+KBQVFRUVFRUVFRUVFQAAAAAUFRUVFRUVFQgWFRAVFRUVFgMAKxYVFRUVFRUVFRUVFQAAAAAU
+FRUVFRUVFQgWFQIWFRUVFRUWFhUVFRUVFRUVFRUVFQAAAAAUFRUVFRUVFRMTFRUFFhUVFRUV
+FRUVFRUVFRUVFRUVFQAAAAAVFRUVFRUVFRYFFhUIAhYVFRUVFRUVFRUVFRUVFRUVFQAAAAAV
+FRUVFRUVFRUVFRUVFhUVFRUVFRUVFRUVFRUVFRUVFQAAAAAVFRUVFRUVFRUVFRUVFRUVFRUV
+FRUVFRUVFRUVFRUVFQMAAAAVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFQQAAAAV
+FRUVFRUVFRUVFRUVFRUVFRUVFRUVFAYPEREUFBQVFQ4AAAAAACoDBAYODxESFBQVFRUVFRUV
+FQ8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+ENDofIMG
+
+if false
+demo.show_image('bmp', '8-bit-RLE', <<'ENDofIMG')
+Qk22CAAAAAAAADYEAAAoAAAAIgAAADIAAAABAAgAAQAAAIAEAAAAAAAAAAAAAAABAAAAAQAA
+////AO7u7gDMzP8Amcz/AJmZ/wCZmcwAZpnMAGZmzAAzZswAMzPMAAAzzAAAAMwAAMz/AACZ
+/wAA//8AAGbMAACZzADd3d0AzJmZAJkzAACZZgAAMzOZAGaZ/wCZZjMAZjNmAMyZZgCZmZkA
+ZjMzADMzZgDMmTMAu7u7AMz//wBmZv8Ad3d3AIiIiADMzJkAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG
+AAcFBAIBHAAAAAEACgoGCRAKAQAAAAEAIAoBAAAAAQAfCgEJAQAAAAEAHwoBCQEAAAABAB8K
+AQgBAAAAAQAECgAWCwoKCgsKCgoLCgoKBwoKCwoKCgsKCwUKAQcBAAAAABwACQoKCwAHCgoE
+BgsKAgcKCwQKCgEGCgkACQAJBAoBBwEAAAAAGgAJCgoLAAsKBAkLCgoECQoLBwoLAAsKCwAA
+BgoBBQEAAAAAGgAJCgoKAAoKCQcACwoECQoJCgoKAAoKCwAHBgoBBAEAAAAABgAICgoLAAcK
+AA4ECQoGCwoLAAsKCwAKCQUKAQQBAAAAAAYABwoKCgsHCgANAwkKAwsKCgsKCgoACwAGCgEC
+AQAAAAEAAQcOCgERARUOCgECAQAAAAEAAQYMCgAECRcjEw4KAQEBAAAAAQABBQsKAAYJFBgZ
+EwUNCgEAAQAAAAEAAQQKCgAICxkTFRcTFwkMCgEAAQAAAAEAAQQKCgAICAITCRQTEwQMCgEA
+AQAAAAEAAQQMCgAGFAcUGxMCDAoBAAEAAAABAAECCwoABwgTBxQTIAEADAoBAAEAAAABAAEC
+CwoAByIUBxMTBwsADAoBAAEAAAABAAERCgoACAshEwYTExgEDAoBAAEAAAABAAEBCgoACAkb
+ExYTExsDDAoBAAEAAAABAAEACgoACAgTFCATExMCDAoBAAEAAAABAAEACgoACBYTFAcUExMf
+CwoAAwkAAAAAAAEAAQAKCgAJBBMTCRQTEwELAAoKAAMJAAAAAAABAAEACgoACQMTEwkXExMe
+CwAKCgADCQAAAAAAAQABAAoKAAgCFxMcHRMVBwsKAAMJAAAAAAABAAEACgoABwIJExsZExMA
+DQoBAAEAAAABAAEADAoABhMTGhMTFAwKAQABAAAAAQABAAsKAAkJExMXExMTAgsACgoBAAEA
+AAABAAERCwoBBwYTAQcBCQoKAQABAAAAAQABAgsKAQcGEwAEGAILDQgKAQABAAAAAQABAgsK
+AQcHEwAEAAsQCwcKAQEBAAAAAQABBAsKAQkBFAYTAAQACwoPBwoBAgEAAAABAAEECAoADw8L
+CgsZExMTGAkBAAsLDgAHCgEEAQAAAAEAAQUICgAFDwoKCgMABBMADwkKCwoLDgsKEAsKCgoF
+AAAAAAEAAQYNCgEZBBMECgAEDgoKDAQKAQcBAAAAAQABBwkKAA4PCgoKFhcTExMYCgoKCwcK
+AQgBAAAAAQABBwgKAAwLDgsKCgsCFBMTExUKCgEJAQAAAAEAAQgHCgADDwoMAAQKAAYLARIT
+EwkLCgEAAAABAAEJBwoABA0LChAECgAFCwIAEQsACwoBAAAAAQABCQcKAAUNCwoOCwAFCgEL
+AQsMCgEAAAABAAEJBwoABg8PCgoMCxIKAQAAAAEACAoABwsMCwoNDgsAEQoBAAAAAQANCgEL
+EgoBAAAAAQAgCgECAAABACAKAQMAAAEAFgoACwkEBgcHCQkJCgoFAAAAAA0AAAABAgMEBQYH
+CAkJAAgKAQYMAAAAIgAAAQ==
+ENDofIMG
+end
+
+demo.show_image('bmp', '32-bit', <<'ENDofIMG')
+Qk2GFAAAAAAAADYAAAAoAAAAIgAAADIAAAABABgAAAAAAFAUAABtCwAAbQsAAAAAAAAAAAAA
+////ZmbMmZnMmZn/zMz/7u7u////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////AAD///8A
+M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wzM8wzM8wzM8wzM8wzM8wzM8wAM8wAM8wA
+M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8z///8AAP///wAzzAAz
+zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAz
+zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzP///wAA////ADPMADPMADPM
+ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM
+ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMMzPM////AAD///8AM8wAM8wAM8wAM8wA
+M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wA
+M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wzM8z///8AAP///wAzzAAzzAAzzAAzzAAzzAAz
+zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAz
+zAAzzAAzzAAzzAAzzAAzzAAzzAAzzDNmzP///wAA////ADPMADPMADPMADPMAADMADPMADPM
+ADPMAADMADPMADPMADPMAADMADPMADPMADPMZmbMADPMADPMAADMADPMADPMADPMAADMADPM
+AADMADPMADPMADPMADPMADPMZmbM////AAD///8zM8wAM8wAM8wAAMz///9mZswAM8wAM8yZ
+mf9mmcwAAMwAM8zMzP9mZswAM8wAAMyZmf8AM8wAM8zu7u5mmcwAM8wzM8z///8zM8z///8z
+M8wAM8wAM8wAM8wAM8xmZsz///8AAP///zMzzAAzzAAzzAAAzP///wAAzAAzzJmZ/zMzzAAA
+zAAzzAAzzJmZ/zMzzAAzzAAAzGZmzAAzzAAAzP///wAAzAAzzAAAzP///////wAzzAAzzAAz
+zAAzzAAzzAAzzJmZzP///wAA////MzPMADPMADPMADPM////ADPMADPMMzPMZmbM////AADM
+ADPMmZn/MzPMADPMMzPMADPMADPMADPM////ADPMADPMAADM////ZmbMADPMADPMADPMADPM
+ADPMADPMmZn/////AAD///8zZswAM8wAM8wAAMz///8AM8wAM8wAM8wAM8wAM8wAM8wAM8yZ
+mf8zM8wAM8xmmcwAAMwAM8wAAMz///8AAMwAM8wAAMz///8AM8wzM8wAM8wAM8wAM8wAM8wA
+M8yZmf////8AAP///2ZmzAAzzAAzzAAzzAAAzAAzzAAzzAAzzAAzzAAzzAAzzAAzzJnM/zMz
+zAAzzJnM/wAAzAAzzAAzzAAAzAAzzAAzzAAzzP///wAAzAAzzAAzzAAzzAAzzAAzzAAzzMzM
+/////wAA////ZmbMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM
+3d3dMzOZADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMzMz/////
+AAD///9mmcwAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wzM8yZZjPMzJmZ
+MwAAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8zu7u7///8AAP//
+/5mZzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzDMzzJlmAGYzZsyZZpkzAJmZ
+zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzP///////wAA////mZn/
+ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMAADMzJlmmTMAMzOZmWYzmTMAmWYzMzPM
+ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM////////AAD///+Zmf8AM8wA
+M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wzZszMzP+ZMwAzM8yZZgCZMwCZMwCZmf8AM8wA
+M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8z///////8AAP///5mZ/wAzzAAzzAAz
+zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzJlmAGZmzJlmAGYzM5kzAMzM/wAzzAAzzAAz
+zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzP///////wAA////zMz/ADPMADPMADPMADPM
+ADPMADPMADPMADPMADPMADPMADPMM2bMmTMAZmbMmWYAmTMAZmb/7u7uADPMADPMADPMADPM
+ADPMADPMADPMADPMADPMADPMADPMADPM////////AAD////MzP8AM8wAM8wAM8wAM8wAM8wA
+M8wAM8wAM8wAM8wAM8wAM8yIiIiZZgBmZsyZMwCZMwBmZswAAMwAM8wAM8wAM8wAM8wAM8wA
+M8wAM8wAM8wAM8wAM8wAM8wAM8z///////8AAP///93d3QAzzAAzzAAzzAAzzAAzzAAzzAAz
+zAAzzAAzzAAzzAAAzHd3d5kzAGaZzJkzAJkzAGYzZpmZ/wAzzAAzzAAzzAAzzAAzzAAzzAAz
+zAAzzAAzzAAzzAAzzAAzzP///////wAA////7u7uADPMADPMADPMADPMADPMADPMADPMADPM
+ADPMADPMMzPMZjMzmTMAZpn/mTMAmTMAZjMzmcz/ADPMADPMADPMADPMADPMADPMADPMADPM
+ADPMADPMADPMADPM////////AAD///////8AM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wA
+M8wzZsyZMwCZZgBmZv+ZMwCZMwCZMwDMzP8AM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wA
+M8wAM8wAM8z///////8AAP///////wAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzGaZ
+/5kzAJlmAGZmzJlmAJkzAJkzAMz//wAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAz
+zDMzzP///////wAA////////ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMmZn/mTMA
+mTMAMzPMmWYAmTMAmTMA7u7uAADMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMMzPM
+////////AAD///////8AM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8yZzP+ZMwCZMwAz
+M8yZZjOZMwCZMwC7u7sAAMwAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wzM8z/////
+//8AAP///////wAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzMzM/5lmM5kzADMzZsyZ
+M5kzADMzmWZmzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzDMzzP///////wAA
+////////ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMzMz/MzPMmTMAZjMzzJlmmTMA
+mTMAADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM////////AAD/////
+//8AM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8yZMwCZMwCZmZmZMwCZMwCZ
+ZgAAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8z///////8AAP///////wAz
+zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzDMzzJkzAJkzAJlmM5kzAJkzAJkzAMzM
+/wAAzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzP///////wAA////3d3dADPMADPM
+ADPMADPMADPMADPMADPMADPMADPMADPMADPMZmbMmTMAmTMAmTMAmTMAmTMAmTMAZmbMMzPM
+ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM////////AAD////MzP8AM8wAM8wAM8wA
+M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8xmZsyZMwCZMwCZMwCZMwCZMwCZMwBmM2bMzP8AAMwA
+mf8AM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8z///////8AAP///8zM/wAzzAAzzAAzzAAzzAAz
+zAAzzAAzzAAzzAAzzAAzzAAzzGZmzJkzAJkzAJkzAJkzAJkzAJkzAJkzAP///wAAzACZzAAA
+zAAzzAAzzAAzzAAzzAAzzAAzzAAzzO7u7v///wAA////mZn/ADPMADPMADPMADPMADPMADPM
+ADPMADPMADPMADPMADPMMzPMmWYAmTMAmTMAmTMAmTMAmTMAmTMA////AADMADPMAGbMADPM
+ADPMADPMADPMADPMADPMADPMzMz/////AAD///+Zmf8AM8wAM8wAM8wAM8wAM8wAM8wAM8wA
+M8wAZswAAMwAM8wAAMzMmWaZMwCZMwCZMwBmM2YzM8zu7u7///8AAMwAAMwA//8AM8wAM8wA
+M8wAM8wAM8wAM8wAM8yZmf////8AAP///5mZzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzABm
+zAAzzAAzzAAzzJnM/5kzAJkzAJkzAJkzADMzzAAzzAAAzAAzzAAAzAD//wAAzAAzzACZzAAA
+zAAzzAAzzAAzzJmZzP///wAA////ZpnMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM
+ADPMADPMADPMzJlmmTMAmTMAmTMAmTMAADPMADPMADPMADPMAP//ADPMADPMAMz/ADPMADPM
+ADPMADPMZmbM////AAD///9mZswAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAZswAM8wA
+M8wAM8xmmf+ZZjOZMwCZMwCZMwBmM2YAM8wAM8wAM8wAAMwAM8wAM8wAM8wAM8wAM8wAM8wA
+M8wzZsz///8AAP///2ZmzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAAzAD//wAAzAAzzAAz
+zAAAzMzM/5lmAJkzAJkzAJkzADMzmQAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzDMz
+zP///wAA////M2bMADPMADPMADPMADPMADPMADPMADPMAGbMADPMAMz/ADPMADPMADPMADPM
+AADM7u7uzJmZmTMAmTMAMzPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM////
+AAD///8zM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAmf8AAMwAM8wAmcwAM8wAM8wAM8wAM8wA
+AMzMzP/////d3d0AAMwAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8z///8AAP//
+/zMzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzACZ/wAAzAAzzAD//wAAzAAzzAAzzAAzzAAzzAAz
+zAAAzAAAzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzP///wAA////MzPM
+ADPMADPMADPMADPMADPMADPMADPMAGbMAGbMADPMADPMAMz/AADMADPMADPMADPMADPMADPM
+ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM////AAD///8AM8wAM8wA
+M8wAM8wAM8wAM8wAM8wAM8wAAMwAzP8AAMwAM8wAmf8A//8AAMwAM8wAM8wAM8wAM8wAM8wA
+M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8z///8AAP///wAzzAAzzAAzzAAz
+zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAAzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAz
+zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzP///wAA////ADPMADPMADPMADPMADPM
+ADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPMADPM
+ADPMADPMADPMADPMADPMADPMADPMADPMADPMzMz/AAD///8AM8wAM8wAM8wAM8wAM8wAM8wA
+M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wAM8wA
+M8wAM8wAM8wAM8wAM8wAM8wAM8wAM8yZzP8AAP///wAzzAAzzAAzzAAzzAAzzAAzzAAzzAAz
+zAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzAAzzDMzzJmZ/2aZzGZm
+zGZmzDMzzDMzzDMzzAAzzAAzzJmZzAAA////////////7u7uzMz/mcz/mZn/mZnMZpnMZmbM
+M2bMMzPMMzPMADPMADPMADPMADPMADPMADPMADPMADPMZpnM////////////////////////
+////////////////////////AAD/////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+//////////////////8AAA==
+ENDofIMG
+
+demo.show_image('gif', 'gif87a', <<'ENDofIMG')
+R0lGODdhQAAoAPcAAAAAADgoOHBgYJiIkIB4iJCAiIB4gGBIUGhggKiYmLCYoLiooHBocMCA
+eJBocLCYmMCooKiQkKCAgGBASIiAiGhYeLiQiIhoaJhwcJh4gMCYkMCgoMCoqKiQiEBAWEg4
+QMiwoMioqMComLCIiFhAWIBgaJhweHBgcLiQkIiAgDg4UIhwgHhgYJh4cMiooFBQcGBYeJiA
+iIBwgIh4iKCAiKB4eHhYYGhIWKiIiEhAWFBIYEhAaEhIaHBYcHBgeFBQeHBogHBQYHBQWGBA
+UFhQaGBYaFhYeKCIkLCQmHhYaGBIWLCYiFBAYEhAYFhQYFBIaFhYcKCIiKCQkKiIkLCIgHBQ
+aIhwcJiAeIBgcJBwcLCQiKiAeKB4gHhwgNCwqMiwqIBoeHBYaJh4eMCYmJBweGhYYNC4qEg4
+UEA4WGBQWEBAYFBQaHBoeFhQcGhgeGhYcMiwsJB4cGBIYNjIwEAwSMCgmHhocFBAWNDAuNDI
+uIBweGBYcHhoeDgwQGhgaKCIgNjQuKiAgNjIuKiIgKCAeKCQiEhIWFBIUGBQaNC4sGBQcGBY
+YMi4sGhYWFhIYFhIaFhQWHhoaLCQkDg4SHBgaJB4gJB4eLiYmLiomGhYaEhIYFhYaIh4gHho
+gGhgcIBoaGBIaHhgcNDAsFBAUGhQYLigoLioqJiIgGhQaFA4SFhIWHhweFBIWJiAgIh4eFhI
+UHBYYIhweEg4WLiYkDg4WGBQYEA4SEA4UMCwqIhocHhgaJB4iJCAgFhASEBAUEhAUIBocFhA
+UKCQmHhgeEgwSNjQwEg4SLCgmDgwUGhQWLCgoEAwUFBASLigmEAwQGhIUFg4SIhoeEgwQKiY
+kFA4UDgwSJiIiIBwcKiQmLCooLCYkDgoQP//////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+/////////////////////////////////ywAAAAAQAAoAAAI/gABCBxIsKDBggEEDBhAoICB
+AwcjSpxIMSKCBAoWIGDQoIGDBxAURJBAoKLJkwcnUKgQoYEFlxcwdOyYoYGGDRw6eEDJc+IH
+CSBCiHg5YiaJEjM7mjgBAkUKAip6Sh24YqYGmUkbYGDRwoWGlxocvIABI4aMGVN70qiRNSkL
+Gzda4BhhIoeOHTx6+PjxwwcCIGlPouiI4WUDFkFYCLlhYwiLBkU73iBShAgRAkaMHCGAIDBF
+JBpmXkiiZMiQCagzLEFRgi0GDUyaONHx5MkLKFFCSOns+eCUBlRKVIErxIYVG1ewsMiixYSW
+LVxQkIDRpDqRJF1gVPDyhQDg3gSB/mQAwyKMmBJjpoAhU6bKCjMgMGxZAuIMmjRq0KhpsmbN
+EjZtuHEEAgQ4Ad5ACLxRQhkZwBHHGHKMAcccdFxhBgpU1FGDHUzc0QESduDhxRx56DEHHnvs
+4R0ffRzYhREwYOHHH4BUEQgZYYlgoSBfjCHIBh0MAoEdAxBSiCGHIJLIHHCYwEEFQHRhx4Ew
+LLCHIm4sIggjc9RhgQhzgEAIIGSEAAIgjShhwhwN4MGEI4/sAIkjSEQiCRJYuAHEJL0RwMge
+ejzBBiV6VGKJFpcMskUcFyQygoiEbAABJn9kogkaa+RgwCZEMEEEBlNw4gMbiPQ2QyeefAKK
+GpT0cAIk/jjEgQIKggAiiAMgUAFZIkiEIkokozyigyakLFLBGzb8IcUDPXjSGxArlGJKKKcg
+sQAqdojAlQMaCDLGHIlk8EkqiFhQBxJL5BAGE0yo4gQaTBTAQAYc2NGDZ4UAYcoOhfBxwiql
+nFGGDQ3UwMIFGsyBAgs19MBKDg0IQUoroqCRgweO5OCKJjo4osEYBXjySmAE/JBCDHBMUUkT
+T6AxiktgvXTDDbDEUoEsF8ySQxl8LJEGLTugUUQtllBQyyqW8DFyWggY8UYoHPBxxh1O0PDA
+GA0g1ZEQQphQwhus2GJDEGh4cAstbjSBBhF7aEJEEzwYQUQnaQSWHQ+o4BIG/i5gPFIKHl8k
+ZYENGOSiixysqHHGLYbE4IQTt1TQhA6o8KDJGjy8YJkiJPOlCAw7OPKEB7LccYsQoUFWxwSq
+2EFJETo8ogoaThSRwy2y4KEGBaDwUIQfu1DiwyOBNc3DGrzI0cYdnNyRQx+vuCRIAyD0wokS
+aehgSw60+GIILbSoYMstpvwywxM88PAEETwQQTIMCOwBBjAdfMFIFBcEQ4IIDdTaAjAJgMQd
+UnGGJJTtdpMI3yRUAAEP4AUIT9DECRxhN2EoIAZ7IAUkAhECDgwDDLYgxgREgQk8FMNWcxAF
+BwjRhztEQRWtoIQdbHGGHOCBFmqAgRr2kIm6pWUC/p3wwRFAMYM/6IIUR0gAE+Rwh2DIwRgo
+wEMe5jAHQQhCFHFoBAAycYxXxMER27MBMtTACtkU4QyeUYACStGEO8QADA/wRAAEIoMsiOEK
+NxACCEAgiDwIAg+l+EQyAnCKDljAFLbghTHKp4Yi9IBznlEGBxLhiGUsgQOM+EQWAPABKkBC
+DBEIRC/iIApbCQICgxhCMERAiBZYwRLMmIAxFgAK7r3gCb1hAwXwYIUogKIMQSBEHprhDCVc
+4BNVnAMgABEm+hTgGYcoAzQWIAIsTOABaSBEFNIAiSfIAjwIYEQIZIGFMIAhDW/IAy6igYNE
+fEEUiWDEJcRgjBsEgRTM/pDDH5jRAUbgwhQJcIUkaAAEWvziQAjgQCnukIBW6KEWVsDDLFhA
+hQuEwAUjAMEsZnGBPwhBAtI4AAMaEYEOfAIAyjjGNOKgByLM8UADUAYnEmCJLwQBB3jAhRYG
+gTAN4CALWajDEWBxAV1MIBIMcIItjCEQSEShEqoYBTUOJBBbFACAqWjGBl5BhS+gQAs4mEYH
+COHPXmCBEBMYxjQC0IhbVEMglEgDKX5xBgpSVSAEqAAnTtGMB4CBEApAAS6yMIhmlMISlmjG
+IKxxjFnc4AgCsIMqXMEJXujhF7eABFPvKhAEsMENqliAFHpBCRvUAQKm4IAVxBCFBSijFA8Y
+2MQAjDENUrjCClaohB2KAAlWcJYgCLjGABKAjVYsIBsJuEQEmoGJbJjiuNpIQDY4UYAC8EEP
+kegEA9zwBk38tiAIMEB0swGBbGDjGM2QhDIeMItsONe9MrWGMKxhXU8Q4aDfLcgkCpCCCCRA
+G0hQQAKU4d4FGDgbyiBuBAZQAArIAAZ7yEF+IwIER8wAGxherwKOcQllTGMaSJBCBGLAi1Os
+gBJ2nbBEoFCAAUQhCtiIQASEIeMB0IAG1rAsH5ywDRWbJACdmEFDdlGAGMyAxF1gAwzuQNWA
+AAA7
+ENDofIMG
+
+demo.show_image('gif', 'gif89a', <<'ENDofIMG')
+R0lGODlhQAAoAPcAAMnJyTgoOHBgYJiIkIB4iJCAiIB4gGBIUGhggKiYmLCYoLiooHBocMCA
+eJBocLCYmMCooKiQkKCAgGBASIiAiGhYeLiQiIhoaJhwcJh4gMCYkMCgoMCoqKiQiEBAWEg4
+QMiwoMioqMComLCIiFhAWIBgaJhweHBgcLiQkIiAgDg4UIhwgHhgYJh4cMiooFBQcGBYeJiA
+iIBwgIh4iKCAiKB4eHhYYGhIWKiIiEhAWFBIYEhAaEhIaHBYcHBgeFBQeHBogHBQYHBQWGBA
+UFhQaGBYaFhYeKCIkLCQmHhYaGBIWLCYiFBAYEhAYFhQYFBIaFhYcKCIiKCQkKiIkLCIgHBQ
+aIhwcJiAeIBgcJBwcLCQiKiAeKB4gHhwgNCwqMiwqIBoeHBYaJh4eMCYmJBweGhYYNC4qEg4
+UEA4WGBQWEBAYFBQaHBoeFhQcGhgeGhYcMiwsJB4cGBIYNjIwEAwSMCgmHhocFBAWNDAuNDI
+uIBweGBYcHhoeDgwQGhgaKCIgNjQuKiAgNjIuKiIgKCAeKCQiEhIWFBIUGBQaNC4sGBQcGBY
+YMi4sGhYWFhIYFhIaFhQWHhoaLCQkDg4SHBgaJB4gJB4eLiYmLiomGhYaEhIYFhYaIh4gHho
+gGhgcIBoaGBIaHhgcNDAsFBAUGhQYLigoLioqJiIgGhQaFA4SFhIWHhweFBIWJiAgIh4eFhI
+UHBYYIhweEg4WLiYkDg4WGBQYEA4SEA4UMCwqIhocHhgaJB4iJCAgFhASEBAUEhAUIBocFhA
+UKCQmHhgeEgwSNjQwEg4SLCgmDgwUGhQWLCgoEAwUFBASLigmEAwQGhIUFg4SIhoeEgwQKiY
+kFA4UDgwSJiIiIBwcKiQmLCooLCYkDgoQP//////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+/////////////////////////////////yH5BAEAAAAALAAAAABAACgAAAj+AAEIHEiwoMGC
+AQQMGECggIEDByNKnEgxIoIEChYgYNCggYMHEBREkECgosmTBydQqBChgQWXFzB07JihgYYN
+HDp4QMlz4gcJIEKIeDliJokSMzuaOAECRQoCKnpKHbhipgaZSRtgYNHChYaXGhy8gAEjhowZ
+U3vSqJE1KQsbN1rgGGEih44dPHr4+PHDBwIgaU+i6IjhZQMWQVgIuWFjCIsGRTveIFKECBEC
+RowcIYAgMEUkGmZeSKJkyJAJqDMsQVGCLQYNTJo40fHkyQsoUUJI6ez54JQGVEpUgSvEhhUb
+V7CwyKLFhJYtXFCQgNGkOpEkXWBU8PKFAODeBIH+ZADDIoyYEmOmgCFTpsoKMyAwbFkC4gya
+NGrQqGmyZs0SNm24cQQCBDgB3kAIvFFCGRnAEccYcowBxxx0XGEGClTUUYMdTNzRARJ24OHF
+HHnoMQcee+zhHR99HNiFETBg4ccfgFQRCBlhiWChIF+MIcgGHQwCgR0DEFKIIYcgksgccJjA
+QQVAdGHHgTAssIcibiwiCCNz1GGBCHOAQAggZIQAAiCNKGHCHA3gwYQjj+wAiSNIRCIJEli4
+AcQkvRHAyB56PMEGJXpUYokWlwyyRRwXJDKCiIRsAAEmf2SiCRpr5GDAJkQwQQQGU3DiAxuI
+9DZDJ558AooalPRwAiT+OMSBAgqCACKIAyBQAVkiSIQiSiSjPKKDJqQsUsEbNvwhxQM9eNIb
+ECuUYkoopyCxACp2iMCVAxoIMsYciWTwSSqIWFAHEkvkEAYTTKjiBBpMFMBABhzY0YNnhQBh
+yg6F8HHCKqWcUYYNDdTAwgUazIECCzX0wEoODQhBSiuioJGDB47k4IomOjiiwRgFePJKYAT8
+kEIMcExRSRNPoDGKS2C9dMMNsMRSgSwXzJJDGXwskQYtO6BRRC2WUFDLKpbwMXJaCBjxRigc
+8HHGHU7Q8MAYDSDVkRBCmFDCG6zYYkMQaHhwCy1uNIEGEXtoQkQTPBhBRCdpBJYdD6jgEgb+
+LmA8UgoeXyRlgQ0Y5KKLHKyoccYthsTghBO3VNCEDqjwoMkaPLxgmSIk86UIDDs48oQHstxx
+ixChQVbHBKrYQUkROjyiChpOFJHDLbLgoQYFoPBQhB+7UOLDI4E1zcMavMjRxh2c3JFDH6+4
+JEgDIPTCiRJp6GBLDrT4YggttKhgyy2m/DLDEzzw8AQRPBBBMgwI7AEGMB18wUgUFwRDgggN
+1NoCMAmAxB1ScYYklO12kwjfJFQAAQ/gBQhP0MQJHGE3YSggBnsgBSQCEQIODAMMtiDGBESB
+CTwUw1ZzEAUHCNGHO0RBFa2ghB1scYYc4IEWaoCBGvaQibqlZQL+nfDBEUAxgz/oghRHSAAT
+5HCHYMjBGCjAQx7mMAdBCEIUcWgEADJxjFfEwRHbswEy1MAK2RThDJ5RgAJK0YQ7xAAMD/BE
+AAQigyyI4Qo3EAIIQCCIPAgCD6X4RDICcIoOWMAUtuCFMcqnhiL0gHOeUQYHEuGIZSyBA4z4
+RBYA8AEqQEIMEQhEL+IgClsJAgKDGEIwRECIFljBEsyYgDEWAAruveAJvWEDBfBghSiAogxB
+IEQemuEMJVzgE1WcAyAAESb6FOAZhygDNBYgAixM4AFpIEQU0gCJJ8gCPAhgRAhkgYUwgCEN
+b8gDLqKBg0R8QRSJYMQlxGCMGwSBFMz+kMMfmNEBRuDCFAlwhSRoAARa/OJACOBAKe6QgFbo
+oRZWwMMsWECFC4TABSMAwSxmcYE/CEEC0jgAAxoRgQ58AgDKOMY04qAHIszxQANQBicSYIkv
+BAEHeMCFFgaBMA3gIAtZqMMRYHEBXUwgEgxwgi2MIRBIRKESqhgFNQ4kEFsUAICpaMYGXkGF
+L6BACziYRgcI4c9eYIEQExjGNALQiFtUQyCUSAMpfnEGClJVIASoACdO0YwHgIEQCkABLrIw
+iGaUwhKWaMYgrHGMWdzgCAKwgypcwQle6OEXt4AEU+8qEASwwQ2qWIAUekEJG9QBAqbggBXE
+EIUFKKMUDxjYxACMMQ1SuMIKVqiEHYoACVZwliAIuMYAEoCNViwgGwm4RASagYlsmOK42khA
+NjhRgALwQQ+R6AQD3PAGTfy2IAgwQHSzAYFsYOMYzZCEMh4wi2w4170ytYYwrGFdTxDhoN8t
+yCQKkIIIJEAbSFBAApTh3gUYOBvKIG4EBlAACsgABnvIQX4jAgRHzAAbGF6vAo5xCWVMYxpI
+kEIEYsCLU6yAEnadsESgUIABRCEK2IhABIQh4wHQgAbWsCwfnLANFZskAJ2YQUN2UYAYzIDE
+XWADDO5A1YAAADs=
+ENDofIMG
+
+teapot = <<'ENDofIMG'
+",
+".. c #998074",
+"#. c #84aadc",
+"a. c #c47e55",
+"b. c #4c6ea0",
+"c. c #d48a64",
+"d. c #ecccbc",
+"e. c #8c6252",
+"f. c #b1a094",
+"g. c #714628",
+"h. c #af8a76",
+"i. c #2c5284",
+"j. c #98745f",
+"k. c #8f5124",
+"l. c #844614",
+"m. c #5074a6",
+"n. c #aeb2b9",
+"o. c #3e291c",
+"p. c #44689b",
+"q. c #4c2705",
+"r. c #1b2b43",
+"s. c #e1c8bb",
+"t. c #dd782d",
+"u. c #9c5824",
+"v. c #547aac",
+"w. c #906e5a",
+"x. c #545253",
+"y. c #e07e33",
+"z. c #bcaeac",
+"A. c #aeb6bc",
+"B. c #6f737b",
+"C. c #7e5942",
+"D. c #b55e1a",
+"E. c #7c5134",
+"F. c #8c7a70",
+"G. c #62524d",
+"H. c #bc8a6c",
+"I. c #936754",
+"J. c #6e6d75",
+"K. c #8cb0e2",
+"L. c #d4beb4",
+"M. c #2a201a",
+"N. c #c48664",
+"O. c #412105",
+"P. c #a95a19",
+"Q. c #747a7c",
+"R. c #2a2e33",
+"S. c #484c53",
+"T. c #8690a1",
+"U. c #6c524c",
+"V. c #505967",
+"W. c #040204",
+"X. c #8cb6e4",
+"Y. c #8f4912",
+"Z. c #846e5c",
+"0. c #244a7c",
+"1. c #dcc2b6",
+"2. c #33261b",
+"3. c #81736c",
+"4. c #3c3b46",
+"5. c #735f53",
+"6. c #545e69",
+"7. c #bc7c58",
+"8. c #4c2f1d",
+"9. c #a4806b",
+".# c #604c4c",
+"## c #d4916b",
+"a# c #5c80b2",
+"b# c #e3d3cd",
+"c# c #c8ad9a",
+"d# c #bf6c2e",
+"e# c #08121c",
+"f# c #9c5e34",
+"g# c #9298a1",
+"h# c #8b7f7c",
+"i# c #835f44",
+"j# c #a46e54",
+"k# c #474649",
+"l# c #a65d26",
+"m# c #be6420",
+"n# c #7c9ed2",
+"o# c #ac622c",
+"p# c #726e6c",
+"q# c #e1a684",
+"r# c #a48676",
+"s# c #54464c",
+"t# c #a0a4ac",
+"u# c #b37b5a",
+"v# c #947a70",
+"w# c #543d31",
+"x# c #743e12",
+"y# c #98bcee",
+"z# c #d49e7c",
+"A# c #64320c",
+"B# c #d4cac6",
+"C# c #2c3642",
+"D# c #6e686b",
+"E# c #5c463e",
+"F# c #7f7575",
+"G# c #bcb2b0",
+"H# c #979dac",
+"I# c #a47a61",
+"J# c #8c9094",
+"K# c #1c262c",
+"L# c #d3c3bc",
+"M# c #9cc2f4",
+"N# c #af7455",
+"O# c #fcad5f",
+"P# c #6486b8",
+"Q# c #d4742d",
+"R# c #6d4e3d",
+"S# c #242224",
+"T# c #3b444c",
+"U# c #181515",
+"V# c #6e4024",
+"W# c #749bcc",
+"X# c #afabac",
+"Y# c #7e6a64",
+"Z# c #343634",
+"0# c #e8ac8a",
+"1# c #343a44",
+"2# c #b18f7a",
+"3# c #dda07f",
+"4# c #6f380d",
+"5# c #2f5684",
+"6# c #a08d86",
+"7# c #5f6068",
+"8# c #625751",
+"9# c #16253b",
+".a c #94b6e9",
+"#a c #dfcec8",
+"aa c #3c6194",
+"ba c #ecdad3",
+"ca c #948a89",
+"da c #a4c8fa",
+"ea c #bcb6b8",
+"fa c #604432",
+"ga c #cc6d29",
+"ha c #949ea4",
+"ia c #413024",
+"ja c #a48a7a",
+"ka c #9a867d",
+"la c #1c1a1c",
+"ma c #342116",
+"na c #bc8364",
+"oa c #9c8674",
+"pa c #844e25",
+"qa c #3c4a5c",
+"ra c #582c0d",
+"sa c #c7835a",
+"ta c #613c24",
+"ua c #614b41",
+"va c #adaeb5",
+"wa c #805c4c",
+"xa c #0a0b0f",
+"ya c #c4b2ac",
+"za c #648abc",
+"Aa c #af846a",
+"Ba c #c68a69",
+"Ca c #483c39",
+"Da c #7f400d",
+"Ea c #646e74",
+"Fa c #a85515",
+"Ga c #042244",
+"Ha c #816759",
+"Ia c #95817c",
+"Ja c #9c9aa1",
+"Ka c #9c6b54",
+"La c #7e4924",
+"Ma c #0c1a2c",
+"Na c #5f595f",
+"Oa c #6f615e",
+"Pa c #474149",
+"Qa c #8c9aac",
+"Ra c #cbbeb8",
+"Sa c #806e68",
+"Ta c #82624e",
+"Ua c #949294",
+"Va c #b4652c",
+"Wa c #9c9ea4",
+"Xa c #72574c",
+"Ya c #2a303e",
+"Za c #bc9175",
+"0a c #9c7a64",
+"1a c #261a13",
+"2a c #aca6ac",
+"3a c #341a04",
+"4a c #593520",
+"5a c #d49878",
+"6a c #26282c",
+"7a c #475261",
+"8a c #3f3535",
+"9a c #63676f",
+".b c #a47255",
+"#b c #bc967c",
+"ab c #52433a",
+"bb c #80a4d6",
+"cb c #544c4c",
+"db c #bc723c",
+"eb c #645e54",
+"fb c #a4abb4",
+"gb c #c89070",
+"hb c #8c7469",
+"ib c #c7b8b3",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                            wawae.e.wa                                                          ",
+"                                                          .#j#N#7.a.db.#                                                        ",
+"                                                            8.g.x#C.o.                                                          ",
+"                                                  N#DaA#raY.Xa4aV#4aPas#q.W.W.6a                                                ",
+"                                            i#O.l.4.4.4.4.4.s#wa7.N#wawaXawawawaA#q.C.                                          ",
+"                                        3a3a4#wawawae.e.e.I.j#m#d#VaN#KaI.e.e.e.e.waDaO..#j#j#N#N#j#fa                          ",
+"                                        O.A#wae.e.I.e.I.I.Kal#m#m#D.u.KaKaKaKaI.e.I.e.Da3aXaE#C#W.o.C.                          ",
+"                                      w#e.k.I.I.Kaf#KaKaKaKal#m#m#D.l#j#Kaj#KaKaKaKaKaFai#u.    GaDaI.                          ",
+"                                      .#waKaI.KaKaj#j#j#j#j#VaD.m#FaVaj#j#j#j#j#j#j#KaKae.U.    9#o.Ka                          ",
+"                                      .#Xae.Kaj#j#N#N#N#N#N#j#N#j#N#N#N#N#N#dbdbN#N#N#I.waU.  e#M.taPa                          ",
+"                                    .#U.Xawae.Kaj#N#7.dbj#a.a.a.a.a.a.a.j#7.sa##naj#I.e.waXaU.Yama.#                            ",
+"                                    .#U.Xawae.I.Ka.bna3#0#3###sasaa.sac.##Ba7.u#N#Kaf#f#waXaU.4.s#Pa                            ",
+"      j#N#5aW.Y.u#j#R#            8a.#XaXae.e.I.KaN#naz#0#q#gb7.7.N#N#N#u#nau#N#N#Kaf#f#e.waU.LaU.                              ",
+"        4.Hahb.bI.j#KaY.          s#U.XaXawae.KaKaN#na3#0#3#gbna7.N#u#u#N#7.u#N#.bj#KaI.e.waXa.#                                ",
+"              G.2#e.KaI.E#        .#U.Xawae.P.Kaj#N#H.z#q#3#gb7.7.7.7.N#N#u#u#N#.bj#KaI.e.TaXaU.0.                              ",
+"                Ca.#e.j#Va  5#aa0.MaU.Xawak.d#I.j#I#N.5a3#5aBa7.dbN#N#dbN#N#u#I#j#KaKaI.e.waXaU.0.i.p.                          ",
+"                  abU.I.KapaaaaaxaGaU.C.wau.VaKaj#I#na5a5agbN.u#N#7.N#N#N#N#N#.bj#KaKaI.e.waXa.#R#m.m.m.p.                      ",
+"            zaW#0.0.s#waKam#0.0.e#GaU.C.k.l#I.KaKa.bnagbgbBa7.u#7.N#N#N#N#N#.bj#j#KaKaI.e.waXa.#.#b.m.m.i.i.0.                  ",
+"    5#aaW#W#n#aaaa0.U..#e.Kau.ta4aLak.k.u.o#e.KaKa.bu#H.H.nau#N#N#N#N#N#N#j#N#j#KaKaI.I.e.waXa.#fab.m.i.i.i.i.i.0.              ",
+"p.p.p.aan#W#0.0.0.0.p.uaU.KaKal#o#d#gal#o#o#e.I.Kaj#N#Aau#u#N#N#N#.bN#N#j#.bj#j#KaKaI.I.e.waXa.#E#m.m.v.m.i.i.m.n#bbn#          ",
+"p.p.n#n#n#p.0.0.0.0.0.xa.#waKaKagaQ#t.y.d#dbi#e.I.Ka.bN#I#N#N#N#N#.bN#N#j#N#j#KaKaI.f#e.waXaU.U.w#5#m.m.i.i.i.m.bbbbbbbbaa      ",
+"n#n#n#n#n#n#0.aaaap.aaaas#s#waKaj#na##O#dbl#wae.I.I.j.j#j#j#j#j#j#j#.bj#j#j#KaKaKaI.e.e.waXaE.Hai.m.m.i.i.i.i.p.p.bbb.b.p.p.aa  ",
+"p.bbn#bbp.p.p.p.p.p.aaaaaaua..#be.Kaj#j#u.XawaTae.I.KaKaKaKaj#j#j#j#j#KaKaKaKaKaI.I.i#waXawaR#uav.m.m.v.v.i.b.bbbbbbbbp.p.b.p.p.",
+"bbp.p.p.p.p.p.n#p.0.0.0.0.p.8#Oa2#ZaZaZak.XaXawae.e.e.I.KaKaKaj#KaKaKaKaI.w.I.I.I.e.waXa0aXa5.5#i.m.m.v.v.p.p.#.#.#.#.#.#.b.bb#.",
+"bbW#p.p.p.n#bbbbp.0.0.0.0.0.0.0.x.D#3.3.w.waU.wawae.e.e.e.f#I.I.I.I.I.I.I.f#e.e.wawaXae.w.ua4.5#5#i.7ai.b.b.b.p.b.#.#.#.p.b.b.#.",
+"p.bbp.bbbbp.p.p.p.0.0.6.p.p.p.0.0.0.0.9#R#wae.9.j.wawae.Tae.e.e.e.I.e.Tai#e.wawaw.Aaw.hbOa6aC#5#m.v.v.#.p.p.b.b.p.#.#.b.b.p.p.b.",
+"0.0.0.p.p.p.p.aa0.0.p.p.p.p.p.p.0.0.p.qaT#s#Z.0a..h.I#I#ZaZaI#gbI#.bH..b.bH.h.j.r#HaU.PaV.V.Na1#v.m.K.K.K.#.b.#.#.#.#.K.p.b.m.p.",
+"0.0.0.0.p.0.0.0.0.0.0.p.p.p.p.0.0.p.p.qaqaqa2.iaR#HaY#ja2#2#I#Za2#0a2#2#h.jaoaF.8#V.6aC#C#C#CaNab.bbbbK.#.b.b.b.#.K.K.#.#.#.X.#.",
+"b.b.p.p.p.0.i.0.0.0.0.p.0.0.0.i.0.0.qaqak#6aR.6a3aiawaY#OaOaOaD#Iah#D#OaF#cbPa6a6aW.V.6.1#C#7ap#b.b.b.b.b.b.b.b.b.K.K.#.b.b.b.b.",
+"bb#.#.#.#.b.b.i.0.p.p.p.0.b.b.0.0.0.qar.YaYaYaR.K#Z#E.xa1a2.S#.#x.x.S.R.laU#1#W.W.9a6.J#J#T.7av#K.K.K.K.b.b.m.m.b.m.K.b.p.m.b.b.",
+"#.#.#.#.#.#.K.#.#.#.#.#.#.b.b.b.#.p.qaqaYaR.YaR.Pa6ak#S#lalaW.W.xaW.W.W.W.U#U#ebT.hag#g#haT.7ac#K.K.K.K.K.K.b.b.#.K.K.K.K.m.b.b.",
+"#.#.#.b.b.b.b.#.#.bb#.#.#.b.K.bbK.#.T.T.J#R.YaS.S.x.ebebR.2.S#S#S#T#S#S#S.9a7aEaEafbhag#6.7aV.m.K.K.K.K.X.K.m.X.K.K..a.aX.K.b.m.",
+"b.b.p.b.p.b.p.K.K.K.b.b.b.b.#.#.#.#.T.T.J#UaJ#J#g#g#haWaWa7#9a2at#fbA.t#9a6.9aJ.EaEafbV.6.V.Nam.b.m..a.am.b.m.m.m.K.X.K..a.a.am.",
+"  p.b.p.p.b.p.K.b.b.p.b.b.b.b.K.#.K.7a7aV.9aWat#X#WahaH#ha6.t#n.n.n.n.fbfb9a9an.t#t#fbfb7aV.7#m.m.m..am.m.m.m.m.m.m..a.a.am.m.m.",
+"  b.p.b.#.#.#.#.#.b.b.b.b.b.b.K.Pax.V.7aNa7#7#t#vafbB.B.B.B.B.n.A.A.A.fbfb9aA.t#t#fbfbQaH#7#D#m.X..a.a.aX.v.v.v.v.m.m..am.v.m.m.",
+"    #.K.K.K.K.K.#.b.b.b.b.K.K.K.T.S.V.9aB.ebNaV.p#9a9aB.D#9a9aB.A.A.A.9aB.B.Eafbn.t#g#hat#X#m..ay#y#y#y#.ay#v.v.v..aX.y#.av.v.v.",
+"    #.K.K.#.K.K.K.K.K.K.K.K.K.QaT.V.7#Ea9af.f.2at#OaD#F#Q.J.9aEaB.Ea9a6.Ea9aEaV.H#H#t#2aD#J.v.m.y#y#y#y#X..ay#y#y#y#y#y#.ay#.av.",
+"      K.K.K.K.b.b.b.b.K.K.K.K.g#g#t#D#fbWag#c#X#2a2aeb7#D#Q.vaA.2at#p#9a6.V.7#7#9avaSaSaSav.m.v.v.y#.ay#X.v.v.v.v.y#y#y#y#y#y#y#",
+"      K.K.b.m.b.b.b.b.K.K.K.K.Ja7#7#6.2az.#ac#z.G#eaG#p#2a2a2at#t#t#t#7#9aD#J.SaL#RaRaF#v.v.v.v.v.v.y#m.v.v.a#a#v.v.M#M#M#y#y#  ",
+"        b.b.m.b.m.b.b.b.K.X.7#7#7#7#D#3.1.z.yac#yaibh#caB#L#eaz.z.z.z.z.F#h##ab##aL#ibibv.a#m.m.v.y#M#y#a#v.v.v.a#a#a#a#M#      ",
+"        p.b.m.b.b.m.b.b.m.b.7#9a9aSahb..m..ayayahbhbF.h#Ias.RaRaibibL.L#kab#bab#1.L.L.y#y#a#v.v.M#y#y#M#y#v.a#a#a#v.a#a#        ",
+"          b.m.b.b.X.K..aK.b.7#D#F#hbv#m.b.m.m.F.F.F.v#v#F.v#L.L.L.L#..ka6#h.s.1.L#1.y#M#y#daM#M#day#y#M#M#M#a#a#a#a#            ",
+"          p.b.X.X.X.X.X.X.X.9aD#6#..m..aX.y#m.m.F.v#v#v#....1.Ia....kakar#r#r#1.s.M#M#y#a#a#a#M#M#y#y#daM#dadada                ",
+"            .a.aX..aX..aX..aD#SaF..ay#y#.aX..am.m.........s.s.9.9.r#r#r#r#kakar#M#M#a#a#a#a#a#a#M#M#M#M#dadada                  ",
+"            K.X..a.a.a.a.aH#vab#1.y#X.X.y#y#y#y#v.v...s.d.d.d.s.r#r#h.jajajar#a#M#v.a#a#a#a#a#a#P#dadadaM#                      "};
+ENDofIMG
+
+demo.show_image('xpm', 'color', "/* XPM */
+static char * teapot[] = {
+\"64 48 204 2\",
+\"   c #145ec4#{teapot}")
+
+demo.show_image('xpm', 'transparent', "/* XPM */
+static char * teapot[] = {
+\"64 48 204 2\",
+\"   s None c None#{teapot}")
+
+demo.show_image('xbm', 'bitmap', <<'ENDofIMG')
+#define flagup_width 48
+#define flagup_height 48
+static char flagup_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00,
+   0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xef, 0x6a, 0x00,
+   0x00, 0x00, 0xc0, 0x7b, 0x75, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0x6a, 0x00,
+   0x00, 0x00, 0x30, 0x60, 0x75, 0x00, 0x00, 0x00, 0x18, 0xe0, 0x7f, 0x00,
+   0x00, 0x00, 0x0c, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x06, 0xe0, 0x04, 0x00,
+   0x00, 0x00, 0x03, 0xe0, 0x04, 0x00, 0x00, 0x80, 0x01, 0xe0, 0x06, 0x00,
+   0x00, 0xc0, 0x1f, 0xe0, 0x07, 0x00, 0x00, 0xe0, 0x7f, 0xe0, 0x07, 0x00,
+   0x00, 0x70, 0xe0, 0xe0, 0x05, 0x00, 0x00, 0x38, 0x80, 0xe1, 0x04, 0x00,
+   0x00, 0x18, 0x80, 0xf1, 0x04, 0x00, 0x00, 0x0c, 0x00, 0xfb, 0x04, 0x00,
+   0x00, 0x0c, 0x00, 0xff, 0x04, 0x00, 0x00, 0x86, 0x1f, 0xee, 0x04, 0x00,
+   0x00, 0x06, 0x06, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0xe6, 0x04, 0x00,
+   0x00, 0x06, 0x00, 0xe6, 0x04, 0x00, 0x00, 0x06, 0x00, 0x66, 0x04, 0x00,
+   0x7f, 0x56, 0x52, 0x06, 0xe4, 0xff, 0x00, 0x76, 0x55, 0x06, 0x04, 0x00,
+   0x00, 0x56, 0x57, 0x06, 0x04, 0x00, 0x00, 0x56, 0x55, 0x06, 0x06, 0x00,
+   0x00, 0x56, 0xd5, 0x06, 0x03, 0x00, 0x00, 0x06, 0x00, 0x86, 0x01, 0x00,
+   0x54, 0x06, 0x00, 0xc6, 0x54, 0x55, 0xaa, 0x06, 0x00, 0x66, 0xaa, 0x2a,
+   0x54, 0x06, 0x00, 0x36, 0x55, 0x55, 0xaa, 0x06, 0x00, 0xbe, 0xaa, 0x2a,
+   0x54, 0xfe, 0xff, 0x6f, 0x55, 0x55, 0xaa, 0xfc, 0xff, 0xa7, 0xaa, 0x2a,
+   0x54, 0x01, 0x88, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
+   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
+   0x54, 0x55, 0x8d, 0x60, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa0, 0xaa, 0x2a,
+   0x54, 0x55, 0x8d, 0x50, 0x55, 0x55, 0xaa, 0xaa, 0x8a, 0xa8, 0xaa, 0x2a,
+   0x54, 0x55, 0x95, 0x54, 0x55, 0x55, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a,
+   0x54, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+ENDofIMG
+
+demo.show_image('png', 'color', <<'ENDofIMG')
+iVBORw0KGgoAAAANSUhEUgAAAC4AAAAjCAIAAAETQp8oAAAIVklEQVR4nNVXPYgbSRb+xm7B
+K5CgC07QtaCDOvBCDeyAFAxIwQYdbKCBDeTgQBMqtOGCcTYOvXDBODjwHBzsBHcwExzMBAtW
+4GN7YQ1ScKAOBNPBLFcLHugGC7pgBf0WeuGC1vz6h7XZ4O5DIJp69dX3qr969Rp4A3erv69H
+YQn8aasDxh0Aw66JTtPU5ZIIhLsAvIZXw9rLJItfvd74vVzNepPx3Rh2DQAPwPFO3zqenaaO
+GcAdAAdRkuf50TQxyv8Q0gqh0ZWYNQDD0GRpHrbVJHFRYvtGE9H9nr7/dAwg8OkugLldmFaz
+1fDLtXKj1eytt76fv9JKKkkmaE5/yFbMD0IzDA2A3UEbQFsHH6bs7rsGvt0dnC9yu1heRTwZ
+dKPkHMDhTj9OXp0tXpelCBp0F8DXo/DLjp5ni+3uxou5fXT/c5Tl/HwxPcvO3dIDkOXFxGYA
+0tz+5/neNJooRSqVqi1DE3iXqyhJp2n+1dODooBjVpKKAm2t7gAIpCACgHUlD6IkXFfj2HaN
+YnBs3Ur2oK0BHO/030zqDgBmVpIAVPv924AI7cDvt3X16L0/usKzUcjAo4MIwKjftjb1SRAR
+g6/UVjje6T8bhXvDlZ/3Rt3Di/QOJ6fa9wEMu6arJJFwXGSOT6b2NsvEppPTNMnSZ6Owa4I0
+5Ulsn+8OAIABIh34WvuCKIotAN/Hg377293BDRZFBCDNmQABxNbN0vwwig93BrHNJnHS1TLL
+nE/U7xqfJBhp6m5rAdDTSkkaz6xWUitSvhCCRk9Pjnf6StHR1BYFGGwUSYLRgZKUZO4Gi1Ey
+shYAEQE4iJJwPSgKMLD1dEwQAI6myf2n469O4rZWSorxzD48iFAdxcsXEZ1aJfyJtbF1/bYO
+TaCV/ACD+PRrI//3MOzeOC+/yrvX4RM96Lcz50ah8Wm1EXfePwdAaIKvR/1RaKrHve0wSTMA
+RYHMrU7A26vTs2HY39Tj2AJAWdYEDqOkBPaGYbJ4XTKWS14syyRdnF33S1v7Twbdb3cHO/02
+gJP4FMVFCpKIiIFh15Agm7rM5Qykeb5a5pJlFJrT1B1ESdjWD/pmkmRK0ZNRtxpNUzfsmszl
+He0nNo2SbBzbyrWhCa4yapuWcywEqFZblmXLl2se/JpQ0h/HPypJZ855pbeh1d++m5vA37yn
+7in55+3eX17EZXmhRQkBIM/ZprkkAlAwj2d2Z9ADUDBCo9e1ZObK0NUsAno6uMpIXnhX+jSz
+WeZYK+kTJok9ffZA+qKtVV5wASYSBBARAbHNK8YVi80LBjsUbSUlyCcIwDEe7o/jxFa+cK5w
+edEzgZJUERWMauiCJXMdHez2e0+jxLq8ykJJGvXbjw8nWx2tCFGSHU+tUTItWCuSAiDW/jUt
+xxNLwMOjKCDSSkpJWVEUBZjZOpfmeWWvqc2Ysd0zVU49rR4eRVcsjpkgKmICigJ7J7GSlOYM
+4NHR1KZ5Fbm9P54kqSTR0XLromhcnSMGtCQGADqaxv22BiG68FXljgpPx/Etr1+dI1+AiHyi
+/SgGsN0zkogvRg+iBL8Gxzv9qlP4eFye8f8/mOBG87b2rrjfHMc7/cTlKKClJEJi87ZRW1+d
+XAZ8cNV9P9o6eDzojGN73RfPdwdpxvvjWeBLZrbSFQU62mfm63N/GymBTx2tQqOVpP1xEiUr
+u/fbOuxom7loZisjEVFeMDPGcWayj5XSb+vtnk7zQiv55GSyagcBAFW7l2SpL3Wlwye639OD
+rnHMB9GMIHySjlcbQQQi2NT5hIub6EJKtbG54ywviJAzJ9Z1dNA1KrZpynwysePYjmM7Co0v
+5eNBL0rS/atzTbkrtPI7WgEYdo0QSHN2jnPmwgFUZAygmNjs5mu5wg3b+oRHg24BuEoqMwP9
+ts6ZT2ZWCwJB+X7qeNDWmXM508ODVYnqmkAAu6P7+4djx4VPomeCtlbMvPVG79PVwVZXE4TR
+FCf545Mpbl3QXKL/WWtdSbtY4sJULSkWeWE+qb9IUikEL1n9rv7P6Q+b91SNsB1+/v08WXLZ
+8LyG8DbX1XfJebEsG1RrNuvlz7UFMzNMS36mpJLStOQ9JQXVXi+WX2xq55YP//GyWv12r/Dl
+5qcN8uz5AkAJnKZ506/XBVyBl/GP1bfd5sYn38/Ts9R58DqfNj/f3PhjGB6+mJIg5zhc18uC
+Pc9rCmop0fLrLxNb92oM1D14WP0AqIZYlgBwdqtBvY604CRnm7MAfCGUL2c26xrdM0oH0qVF
+1fjHNus9OuA8VUgPdwZEAFj7xMwMntnMpnnmOPBldR0QkZQkJVXI8sIE/uVX6u1dMcpvNRtl
+WTYEbbb8L3t/yF6X4/mZzYqax3WvweBwo5XY5e/qxMuyLPngu6Srm8uyXFcytouWlH+fzL1f
+vB/yZVPWWlK2pHDlUklyy7LRIM/zxFq5VoNjbjUbZVl7MbdvkcI/8eanzWWJhVvOX7lv/n02
+P89Vs9HAWp0aUlKNUfcECSzc8l7L9+u1+bn7JrZfbLSIoJpkAvnXf83P3dItueF5Rknlk1cT
+S8bPv/BPZck/lbJBql43SjouyxKVlLcU/mejkFEcRtYEghlEJASKAlIgL+CYcy62jE7ZEcgx
+XxZWE/ijsFP1G9cJCXgy7PpCAOACKedaSkEAsL1/Ffm2ElfAKGkCJyWBwcWqDhDRUbQqJI/6
+nTRxDEQzezkvydzjk2hvO7xeuAAw8Oho+paFbuItUqQkgACkqVOSSICIolliL+hHoUkd5znW
+FVl3o2Ax4+FB5BMB7yhkHyQFgGPurfs2ZRCc42tVFcPQnNr8/V2Qe1dBfS9ue2Vv2CUhiGia
+2Oczm7mPIf04/BfyDD1tMD0WfgAAAABJRU5ErkJggg==
+ENDofIMG
+
+demo.show_image('png', 'grayscale', <<'ENDofIMG')
+iVBORw0KGgoAAAANSUhEUgAAAC4AAAAjCAAAAAG5S1ejAAAEJElEQVR4nKWTXUwcZRiFH2YG
+ZpiBLsx2wW6ZpU1YC+3axWClf7ZKY5NVozHRxIYaL0xq1YuGeOFVRW40TXthk4aLxsT/xJjG
++tdiGkUl1nQV6rYokuy2IFugy8/irp3dHXYGvFiwBdQ08Vx9+d73Oznfe84LAIjQNv+ELdBy
+aVqTRBSh/8p6aGMZWpDomBwwETg7020sL0NjG0XsTTT9GmlSdreji1xZ555bvzmyVvcNAI/s
+pRX/8lfi4uHoREIEnrnEKwNjcxUibdt+39PX6gwNTEkkB0l+3VPtdgclQI8fs0zd8gvoMkZX
+MBywY3B0Ox0FKoGcTvtKhQuQa5tBuvXmkHOCx4Y1xS7o6Qg29vFi6DvMe79paRjP5sIgAL/1
+jxwKJC4ewS72+kp7WfX4UQRgFUlBjA1/2R7t25DQdpbZiQJPU5V1xVMuqW+9ykc+X37WKJLC
+AmD8gkJX0HIOS3S3f+B3h48jAVNI0Viztbub4wCdC+rUf/3J7eEBOgr6l0Dbr4TUpffBl0Jw
+cARr5qYvL2wPM1d8bv65a3kzPTKKBHU7AuFT53eAS3FaSsdyynQcRGiNxXaVff9wfa+Of/rB
+T66OpgkmRNiYkkssj6CuDusJ6s4YDTUHTjsCuEiNauQu7MNqXJ8LekGoRwAVXNGkV+1/33Wn
+mVdERYx5EWDCttbJqpQ5NqCRSgV0UbE0BBjzP/XpBDn90Te3ll3q8aXXqGIVAvSInau8rrSV
+m5iaY9DaU6TUdyKAKVUhWh/qSU6Owmv9mv9wIQ+OxynqbpZ6IQ6cAgrzURXtc/ZoDnQtGWFH
+6z/OW/t/dhkARbfR2DGer5avbnyZZWleCv/+C13AkYmP3bkxqy73X+y6v9F9NgLNW8Sf7DJs
+yzI+X8ne3DK99r0YoDNSEUHbdb95RiozLWR5TM2ABP79fyRlc8gfiKZ7wuFQ5dOR01CU8vpp
+kZMp05St+UFrga4IQN3npMg7W2/8UCm5k9uT2TcgID7/rqkF/LnDANTvkNYNvlMIZn6L73re
+YfWMEdEynm8bSkIXs3Lppki21G3fsGpr3bU1yvS21InFHO8sjTMfryzNXIxbmyPXhPrm0Bkl
+fXdGKr/DfVl2ZEEQqJhl9O91SF+fFMtWR+8KeKdsogdSxe3ynCdnR0dn3IqmuFyKkqwxFtmN
+alutu2/qx3FRsZuGXFm7a8OsL+r5ikSFx53Vb5RJomBWO30L7WaDNTN8fthTrLrmZHnGVz58
+4Z4ST81nU3/Khl6SnbWy5ZVGxu5btOmQfa7GUmRLzZhmU0oyu8B4SOwEEJ/VsFJVCq/ftCm/
+xnDZOVC+gCd/dnqB+NsH1QzgnLzFxoX2CoGELiu9kxBKpo1JAOv4ygwvhsDcNC6lTgF7h25u
+g7mivaD9QKlyOZxcUVyJvwDv65E2xA9RYAAAAABJRU5ErkJggg==
+ENDofIMG
+
+demo.show_image('png', 'transparent color', <<'ENDofIMG')
+iVBORw0KGgoAAAANSUhEUgAAAC4AAAAjCAYAAAGcIAh/AAAIl0lEQVR4nOWYIXDjyNLHf7p6
+oMU0TIIDtcxhNhT0Mi9LoD+2y7JsF+6xhG3YBSYsYWt2gg6zWcS+gSM2w9RsPiDbiS/Z/e7u
+3b33ql5Xqcoujbp7unv+/+6B70i2//HLskn3G8f8xLJaO34COJ3WqX30+BgwIiCML7oYiKps
+Xcw+362pjDyp+Z6t/19Op3UC+AfA3fk8uahsHj1RFdgZv247QgjcPnRZXRV/3txBmtqmvecZ
+wGlTp94HmknFuou0nWNeW0SEdzPLu8tVBlAWkg4hnE9smtkSFyMAE1tx0z5y1rxh6zzDALcP
+3WE975s6nTbjlj8tJmn8qPwnAvh75NdPi9TUo5Wfnr/4spgeTN+cz5MtJF2u1kDO1JbpH/CU
+4AfnuTht0sfbNrNVxWJW03aOresz2KWwDwNr1wPgg+N/v12kh3ZNVQmVN1QTk5q6HBfvpTLC
+ow/8fHnNMEBUpTLCMIwh/QmgNDmyq7k3leG67bLmTcVq67JpXaEoWxefdryY2ARjVX0vMj8B
+6M4ccEjz3yoipElZpPnOQ+A4IL9Hvi6bpMDH6zYDWM4nyTlPITkigqKHtUdJvzufp6/LJl2c
+Ph3ci+U03TyL0836EVuMB+10WqdpZRDJiTrQR+X+wWWvKl87z/rR0/Wer8smTesyea+st45v
+nxajAR1jYMsiWVuQi9BuHQBFAe/nk/Trbu2R8mqXfx8UAXJg6yIbH7hpt9ycL9LW9ay3HVNr
+6PtIIcJ8WlOIAQXv4+thAZjZisoIq43DVgZbCVWRk+fC8vKeu/M5VSXcPrhsGEBR6kowArUt
+qYzQ9fGl8roytG7coux2MRZwyaiI7O3lKhNyYASNd5er7Of7bTaxFZXJWW0cH3bJPqrRr8sm
+tY+OKi9YO8fWxWw+sampS2xl/nxNF8LfjEz/qXI6fYkdf/iE/lYKkfR+PqGPkWVTp2IPZ7xS
+ij+Spi7TL8t5Wu6YBODirKHzI/AOA/Tx6fj/MPtfT5tEzqG0bCGpObHctB0K2cVpk1wMhKCo
+KlFBBFbbEQIOnk9skb4spunXT4t0Ph+57X77CMOzEBjZgRPZ6bROkgvOR/oYUMCHcFB8pHzZ
+1Dz6yHXb0Uws7+d1Wnc9VSV8WT6xmPeR02md+hg4sQWd87Rdn622Luv6mO3DB88S6nce5jm4
+PiIiLKY1nQ8Uec6ymaTrdpuZWpKPgQLBB8VFzeqySLYyByfPrlbHnlf5eKRDUJzfdVXAoMpq
+4zhfzHb/oaktb6xBVWnq8qAYQICZLY+Vm6cKwhTCxvX0UbGVoRBYd47Hr++TKXImtiIMyoAi
+kiOMWCTA1gX2xg7KXRhQlMjApDIYhEJG2I0KH65WbDvHvo5jHIhhYFaPSLg3MCiHNU/K+8iJ
+Lfk0n3HZdrgYDmGojLCcT/h8s+btiaUSaLs+u3tw1JXBD4qtBJMDotjiN57frR0CfLhtKUWw
+lcEYoR+GEW5VcTFmPoQDSz64PlOFs1kNjGU6sxUfbtvjOo+qmZAfrArjibu431KZsTIAPt4+
+ZM6HQ37OrlbZuvMYyTmxhrfPYPkIWxSwRnaeCbcP22w+sQnhwJPAgWn2crnavnrSj7ClyMek
+FCJcteMHZ7MaszuV+3XXbffHSePufJ72be1fKoXIfycT1WXxYuP/NBH9lXJ3Pk9dDDCANQYR
+6FxgUle8/fn+aO2/zPGJLdPnxQmrrXtRyN8+LZLvlavVhrIYsdaZyDDAiS1Q1Rf6/lbHy0LS
+ia1oaktlhKtVR9u5oyGzObG4PtJu3GEIEhHCoKjCattT93+h4/OJTWcziw8DtjJ8uV+zdfEo
+kvuZqes9hbEHpwuR9G5mWUxroirX7QYhpxBD1NHhcQPj43ykEFJUXgLiPpUhKn0YEIGgSudG
+/pjWFVvn8arcrx2rrctWWzc2WMbweTGj7Xy6OgJHIcQBWxWc2AoYp5w8H2eLGJWgyhABGRgD
+Ow62qj9up168LIT0cTFlAOK+KdNxOptPLEGV+43D5uNtS1UU+KgsJpY+RoIKH66fqGJalykH
+Pi3fcXWzIupAITmzumRiK1T1iFqey9SW6e3UIuTUVth2gc/3D8f8tpeoZAKc7JsQfRopVZUY
+BuZvSjY+oAq+j1SFcLnaIiKYAu4+LVNZjNgdd7yoGoiMTA8j3blecVFpapvmE5sWE5v2v+cT
+m0yRs+l6alsQox6cftVxANl1XTw7zY8+4MKA5BAH6H3k28axcYHC5Pg4cN12PLpAZeDq4xl3
+X86Tj0pQuG87Fic1tjTjEKdgCqjLAhiQ3WaKMZGHB8bgBB3P1Q8d34sflC4oLig5UOQ5VWHY
+uJ5pbZnVFbY0RD8cRv2t65l9vM40eCo8N+eLHVoothBUFUXZuB7nA31UysIc+gERwZjxkd3/
+PgzUZcHza7dXHd+3OnU1Lp7XJeeLE3SAm3WH6weiBoTxbqK2hkrM2BnqOHecXa6yR9fjY+Rs
+9gYfFB+VtfP4fmDrw+GurXlTYQzYaozx3mGT7xr5GMeLpOKph37V8XbjUFVyGSPUdj2fb9fc
+PDwiuWCLEbqMEQyC98pkRxS1LZjWI4L8z3WbqSoi0JyU2FLoo2YPrs9cH7POBQZVqkKoqwoQ
+8nxEsxAUEcEWBVNb4eMxln8XcsZboIGb1lGXOapjJPJ8bEpNDmF3pRZ04G1t8RoRZIfNT+xY
+l0VaNif7zvmFTYH05XRKsTtbOoDXgDWGfFfoZ1fH332fgIbxVqQuI8aMJaDD065FhNv2CbM/
+zk+S7yK6y9hz6fqYfb5v08VZ84JIYLxd+Xj78F1XXpPvOm7M07n2Po6Tzq6pbjcdLurB+LKp
+R/QI8KaSo3cH55Tsw3W7a3FfUvgflR9SflRl9qbAeQUZCenqN2PDaVOnRxd+9wQQ9eWm/oy8
+quTidJokH280HzrHt42jfyWK/075P4AQnUfVTZNLAAAAAElFTkSuQmCC
+ENDofIMG
+
+demo.show_image('png', 'transparent grayscale', <<'ENDofIMG')
+iVBORw0KGgoAAAANSUhEUgAAAC4AAAAjCAQAAAE2KcD0AAAFPElEQVR4nMXWXYicZxUH8N+z
+M3HezCy76axJzJrtR8jWVVc29IMtTTG6hUqqqL1QWlrxQmirXpTihRdSY4pUSws1IIEWBesH
+CAZFapNaSISgpUurJra2i7u2IWs+dpNMnbWzndfM9Hixs5tNmrYJCv7vHvi///ec85z/OQ/L
+kODeeMZ1fq+LsTjolIqixAejx3jqj5EFknfEWFBke5zwkga62O01+9LAO38INsW9QeKmmHG1
+vzrgapkttiWqkWA0hsziSr/1CX+T25fAp+Km4PZg8F2CfCseipGga+HwxYBvxur4hWQoigtp
+T7grHk3rbXHAVKJIzQRq9sZ+a/XpixHFBZGqaQ/LNVTlBnVRVcKAPWnEeBrWMrXw7+uD7WfF
+3EVTFdvSxaaiFJfFaGAxlLfinmj7fuIzcUhFpmUZfXvUND2a+Gr0uT+x1+cxFhsc1zDvQOrE
+CC97wWH3xHDM+JMHg5YV+uNSKz2PHrfEQ2eK24OaLgVTDnnKtpj0Rx8wo+IG3VpmLFNnSNW4
+futUZb7tW9b6Xcq1rFe2QdU/ztAHvIgMe9KIXDvdl4rYl7aln6VBfcbtSEupnkTRpKk0Grkt
+9mHHUsV3nl378kV31f8SH1/qkbe91UVU4hanbI0ylhXybIzE12JrwN0OI/caOqPgDL4SK+xI
+rI5rPK2d7opZdU3zSsYXC7kxNhs2blf6g82gV6adxmKlo5oyp0yf6Zmtpu1xrc/Gi9a6O2DG
+WJyy0SsOpvE0nRiJjvq/UHJUZovDun0ynkyVOKak5kQaiH7c7IFF9V7UHVFB07NuQ26TKzSN
+RH+nJkOL9HIn3kk1/cpe8NPodaWG0zIFmYIp/Yv0WS25y5WUFc172EsqqKsbVlWQyVUW6UcN
+utWvzVow9Kf9wHW6HUz7XWrOOmUFaxbp+xXs1KNfrzm5ptl00puYSLkbJZkhO1OH3khFa1CQ
++7mqGh5LR8AD6QUVg+5Ly3qmbbW2ZF8ajaLnwXTnpnctu/lOz5RlKp5I3KiinWDP2w+k7XH7
+hVuk8v9008DSz9/VTBeG7XHMaWuVvOJDvv7fiA/GHZ5dKvODMeuX+jQdlduoucS7yMVQjUGb
+9Nndmd6jca2C57R0oyWXG/BEuoDIR2PMKe/3E1MdehWHrXIgUYmP+piGJxV1a8hRUnJUOebP
+NONg3OGfakoaXjVo2KQ5+42ncVvjEl9wIH6VFhKt6zeIsSipqWtoKMmFCfk5dVg6luM2bXWc
+1nad1z3jEkV9aq5X84bvJRiOgi/7sYaKYYOaHcssYCg2K7rchMfTslk6nwqu6EjTVHeVQ3Iz
+qnbJ9PhuVIM65v1bjrbjTtoUo3F9bIrRGI1eL9tgzuPL9ymsxGkwbVbJvBnjpqxSs9srqr7h
+kaiZt9cN+mVaeqwXCtrKCgoKOG7ewlPgnC0w57gTCrq916SPGNbvpBYm3ZnqVtim5E2rNbVM
+OuI1fTIVmV69Mpma9RYedcvEj2DAgKvcqmmvY15X1LJBr4qW1XF/+rtTblRTM2HWIbMY0WMd
+Mpmyklnz+s4Vf05TpumgH9ons1q3XiUzNmq6wjAeSU3vcY33qaWJdDS96g1Vl0lKGuoyawyp
+ndstcE+0PG29XKYkVzavoeFqdUWNjicH4maFZW+DQnxJBbm6NTJ853wmOm2dAb1aHQtnfpPg
+c/Fn7c4oZjr9KO5eMgrt9Jjz4yzxVbowo6ok87wTCbZGzZyBzgnytOOCBu859m/4sGOK6ktL
+4qZ49byboHEBU2kZ5c5YKfMX42oX/849L/4D4jD0vGNZ6YMAAAAASUVORK5CYII=
+ENDofIMG
+
+demo.show_image('jpeg', 'color', <<'ENDofIMG')
+/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRof
+Hh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwh
+MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAAR
+CAAmADkDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAA
+AgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkK
+FhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWG
+h4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl
+5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREA
+AgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYk
+NOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOE
+hYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk
+5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDzLyJSuV5FIsUm4DAzW1Ywpb3sbPhoQ4LA
+jPGea6jWdH0W6EdxYLJA78gICUb169KIq8JTutDWnSnUmqcFds4y2e5jkzGrOVGTt7Ct2aae
+ZFzGSR6cmni1t4RiFWCseRknJHf+f51MsZG4JHwP4hXmVaqctEfVYDLqsKbTla+43S7NZLkr
+dHamMEgg9R6isDVtDu7KdjFGZoOodOcD3rowWIVRkbDuUHI3DFbWnOs1n9pIIMZwwIzyBxwe
+v/16ujWs9iK+VQqfFN3W3Yo6Pp/n6LbXFx9rWeCNifLbjac9T6YxXN+a/wDzy/SvedC13S5/
+DtnZ3ckZmMQSVVTK8cYJ6HI96tfZvC3/AD42/wD35NdfM5dT5Pdtp3PBtEji1CVTtyR1U9vc
+11WpXOnRW9rYwWxB6O+/n2OOgrm40EZyg2n2rTm8M6xp+lrrk1q76bIu4hcMwB74zkD3/TFV
+KcXRcFHXudWGm6deM+axUmCQytGjrIi8Kyg81NFKrxqogVsMWk5OH78j8/YfnQ1hKlrbXU8F
+xCk43ws67d4/L3H5j1rLurqVLhhno2RXlKErn2f1qEIKV7xL77QN21VxwMdqdLdvBpbpDveS
+5cJGiHBzyMj8/wBB61i3OoySJjhR3C0+71FYYfIjncSgbSUOMj0J/mBW1OlJSuzz8fmsY0nG
+kvQ6qO4ubaLyt8fnR/Idh3AEdfyNQeVrH/QQuf8Avv8A+tWd4fu0j0dePnEjIM+vU/zqz/aq
+f8/J/wC/h/xotNSaifEO6bsVo1yy8DmvetkF3HbaW0INuYFMiYwpXA4wKKK7Y7HWtzSvNPs7
+ywezurdJLYrjyyOgx29D6EcivGviF4EtfDlnFqVpeSvFLMsPkSKCVJVjncO3y9MfjRRRUirX
+NKdWcfdi9DhbW3YRS3a7cW+GOepycDA+vWsaS3AcqScjvRRUU9zOcnLVlqx8+Elll43qoH1r
+K2L70UVaerMluf/Z
+ENDofIMG
+
+demo.show_image('jpeg', 'grayscale', <<'ENDofIMG')
+/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRof
+Hh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/wAALCAAmADkBAREA/8QAHwAA
+AQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQR
+BRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RF
+RkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ip
+qrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/9oACAEB
+AAA/APMvIlK5XkUixSbgMDNX7Z7mOTMas5UZO3sK3Zpp5kXMZJHpyan0uzWS5K3R2pjBIIPU
+eorA1bQ7uynYxRmaDqHTnA966/R9P8/Rba4uPtazwRsT5bcbTnqfTGK5vzX/AOeX6VFYwpb3
+sbPhoQ4LAjPGea6jWdH0W6EdxYLJA78gICUb169KzBa28IxCrBWPIyTkjv8Az/OpljI3BI+B
+/EKcCxCqMjYdyg5G4Yra051ms/tJBBjOGBGeQOOD1/8Ar16PoWu6XP4ds7O7kjMxiCSqqZXj
+jBPQ5HvVr7N4W/58bf8A78mvBtEji1CVTtyR1U9vc11WpXOnRW9rYwWxB6O+/n2OOgrDmCQy
+tGjrIi8Kyg81NFKrxqogVsMWk5OH78j8/YfnUT7QN21VxwMdqdLdvBpbpDveS5cJGiHBzyMj
+8/0HrWnHcXNtF5W+Pzo/kOw7gCOv5GoPK1j/AKCFz/33/wDWrIjQRnKDafatObwzrGn6WuuT
+Wrvpsi7iFwzAHvjOQPf9MVE1hKlrbXU8FxCk43ws67d4/L3H5j1rLurqVLhhno2RVa51GSRM
+cKO4Wn3eorDD5Ec7iUDaShxkehP8wK0vD92kejrx84kZBn16n+dWf7VT/n5P/fw/41WjXLLw
+Oa962QXcdtpbQg25gUyJjClcDjArSvNPs7ywezurdJLYrjyyOgx29D6EcivGviF4EtfDlnFq
+VpeSvFLMsPkSKCVJVjncO3y9MfjXC2tuwilu124t8Mc9Tk4GB9etY0luA5Uk5HerVj58JLLL
+xvVQPrWVsX3r/9k=
+ENDofIMG
+
+demo.show_image('jpeg', 'progressive color', <<'ENDofIMG')
+/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRof
+Hh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwh
+MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wgAR
+CAAmADkDASIAAhEBAxEB/8QAGgAAAgMBAQAAAAAAAAAAAAAAAAQDBQYBAv/EABkBAAIDAQAA
+AAAAAAAAAAAAAAECAAMFBP/aAAwDAQACEAMQAAABzA7aRqV/vvl1eIWLrCCt3stuTgrWtaNs
+PsV5dljqXX57XwtLMSLehdazjQjUSQBZVQK//8QAHhAAAgIDAQEBAQAAAAAAAAAAAQIAAwQR
+EiEQBRP/2gAIAQEAAQUC0ZoxegSSZUm2toZDTXuncQcvdTS05UTXyv1KL6jj84spAsNjVhT4
+QfIW1UGZRq6DyHGurq4PLMemsJjWaGO2qf6wTxg9aOn6GCuOir4VibHz/8QAHxEAAgEEAgMA
+AAAAAAAAAAAAAQIAAwQQERIxEyFB/9oACAEDAQE/AVUseIlC3YL3HtQ3ZxTPFwdzygDfyV7o
+BdLlWI9CE7x//8QAGxEAAwEBAAMAAAAAAAAAAAAAAAECESEQEjH/2gAIAQIBAT8BXxsqukWb
+o2vTMMZMvTu8EUifH//EACgQAAEDAwIDCQAAAAAAAAAAAAIAAREQITESUQMiMhMjM0FScYGR
+of/aAAgBAQAGPwKllhcys0shItUs3ksJtkxBLKyxTVsgAnaYuugfqggwqMrHvS2SwotLLxCp
+27j3boSdiacVhnuvldX7QeFHLF1oIZHZNxBN4d4h05emmaf/xAAgEAEAAwACAgIDAAAAAAAA
+AAABABEhMUFRcWGBEJHx/9oACAEBAAE/IcshZFgLXiHkBRkjX2ZMMXcupaDQ7fZRlXxwzq2m
+HKvtNw8afMR+4nAyQDPwUhn1PcOblWCA4SAgq7fyjXNBFYupQJoHCzZ/Qg6ZDC0rzWJF3bSr
+hl7gHj1CvvTIIebEpAaSnHFp1UQioh8wNbjHv6jUa7TSpzzsEon/2gAMAwEAAgADAAAAEIb7
+MuvRaP43Yv/EABoRAQADAQEBAAAAAAAAAAAAAAEAETEhUXH/2gAIAQMBAT8QGjax8NL2bzZn
+k1Ubj8VKe1w5H5Gxahs6xyN0w2f/xAAaEQEBAQEBAQEAAAAAAAAAAAABABEhMUFR/9oACAEC
+AQE/EBu05G8Fg+WvqUj1+xtC02FE8QZt6h63/8QAJBABAAICAgIBBAMAAAAAAAAAAQARITFB
+UWGRcaGx0fCB4fH/2gAIAQEAAT8QvtkSkKLl8RFvQllJTrLEKYaUR2dkTm2mejzMlLHRa9vV
+VP3kopAoS8XmEZJwK929QBQEyWtpz9/cQpiOEFAWXobKVLxEVQS8hjDv+46IjecMUumzzP8A
+cRqyTa48sXGOt/w1ogxTIDmGiosjXPJ78HuVGgwVxK9tt03ks9/Q7nZ8b0E36Z+z/EFWbeJY
+AwKAPNXYefpUHWepPryezuBl6sSs4HJFYsll1Z0v3CYYxDfe37zz/b8yzAZldCmppUMURDFp
+Y0Vx09JklKrxFSl046V/MBjlFe22ij53AGls5lpwah8z5p//2Q==
+ENDofIMG
+
+demo.show_image('jpeg', 'progressive grayscale', <<'ENDofIMG')
+/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRof
+Hh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/wgALCAAmADkBAREA/8QAGgAA
+AgMBAQAAAAAAAAAAAAAAAgQDBQYBAP/aAAgBAQAAAAHMenfNC3rRtFT67pJcFaomPWQTaBWP
+rMsW9ZxtElKr/8QAHhAAAgIDAQEBAQAAAAAAAAAAAQIAAwQREiEQBRP/2gAIAQEAAQUC0Zox
+egSSZUm2toZDTXuncQcvdTS05UTXyv1KL6jj84spAsNjVhT4QfIW1UGZRq6DyHGurq4PLMem
+sJjWaGO2qf6wTxg9aOn6GCuOir4VibHz/8QAKBAAAQMDAgMJAAAAAAAAAAAAAgABERAhMRJR
+AyIyEyMzQVJxgZGh/9oACAEBAAY/AqWWFzKzSyEi1SzeSwm2TEEsrLFNWyACdpi66B+qCDCo
+yse9LZLCi0svEKnbuPduhJ2JpxWGe6+V1ftB4UcsXWghkdk3EE3h3iHTl6aZp//EACAQAQAD
+AAICAgMAAAAAAAAAAAEAESExQVFxYYEQkfH/2gAIAQEAAT8hyyFkWAteIeQFGSNfZkwxdy6l
+oNDt9lGVfHDOraYcq+03Dxp8xH7icDJAM/BSGfU9w5uVYIDhICCrt/KNc0EVi6lAmgcLNn9C
+DpkMLSvNYkXdtKuGXuAePUK+9Mgh5sSkBpKccWnVRCKiHzA1uMe/qNRrtNKnPOwSif/aAAgB
+AQAAABCrPPK25v/EACQQAQACAgICAQQDAAAAAAAAAAEAESExQVFhkXGhsdHwgeHx/9oACAEB
+AAE/EL7ZEpCi5fERb0JZSU6yxCmGlEdnZE5tpno8zJSx0Wvb1VT95KKQKEvF5hGScCvdvUAU
+BMlrac/f3EKYjhBQFl6GylS8RFUEvIYw7/uOiI3nDFLps8z/AHEask2uPLFxjrf8NaIMUyA5
+hoqLI1zye/B7lRoMFcSvbbdN5LPf0O52fG9BN+mfs/xBVm3iWAMCgDzV2Hn6VB1nqT68ns7g
+ZerErOByRWLJZdWdL9wmGMQ33t+88/2/MswGZXQpqaVDFEQxaWNFcdPSZJSq8RUpdOOlfzAY
+5RXttoo+dwBpbOZacGofM+af/9k=
+ENDofIMG
+
+demo.show_image('tiff', 'uncompressed', <<'ENDofIMG')
+TU0AKgAAHggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAADb///bttu2tv+Sttu2ttvb2/8AJEkAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////b//+229u2
+29vb2/+2ttttttu2ttu22//b//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAJAC229skbZLb//+2tv8AJEkkbZJtkrbb///b//9tktvb//8A
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACSttu2
+29u2ttvb2/8AAAC229skbZIAACSSttu229uSttsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAAAAAAAAJCQAJCSSttsAAACS
+ttvb//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAASUkAAABJbZIAACQkAACStrYASQDb2/8AAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////29v//9v/29v///8AAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABtJACSbSS2bUnbkm22km3btm22kkn/25L//9ttJAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACSSSSSSSTbkm2SSSSSSSSSJACSSSS2
+bUm2bUm2bUn/27b//9v/////////////27b/tm3btm3//9v/27b//////////////9skAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAkAABJAAAAAACSSSRJAABtJABtJACSbSSSSSTbtm22km3btm3btm3btm22km3/
+km22bUn/25L/27b/25Lbtm3btpLbkm3/27bbtpLbtm22km3/25L/27b//7b/27b//////9v/
+/////9v/////tpL/km1tJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtAABJAABJAABJAACSJCRJ
+AABtJABtAACSSSRtJACSbSSSSSTbkm222222km22bUm2kknbtpLb25K2km22kknbtpLbtm3b
+tpLbtm22km3btpK2km3btpLb25L//9v/25L/25Lb29v//7b/27b//7b/27b/25Lb29v/27bb
+tpL//9v//////7b///////////////+2bUkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAABJAABJAABJAABJAABJJACSSSSSJABtSQCSSSSSSSSSSSSSJCSSSSS2
+bUmSSSSSJABtJABtAACSSSS2kkm2bUnbkkm2kkn/25K2kknbtm22km3bkm22km3/tm3btm3b
+tm3btpLbkm22km22kkm2kknbtm3bkpL/25L/27b//7b/27b//7b/////tm3btpL/27b/tm3b
+tpLbtm3//7b/25L//9v/////////////////////2/8AAAAAAAAAAAAAAACSSSQkAABtJABJ
+AABtJABJAABJAABJAACSSSRtSQBtJABtSSS2kkmSJCSSJCSSSSSSSSSSSSSSSSSSSSSSSSRt
+JACSSSSSSSS2bUm2km3//9u2bUm2bUm2bUm2SSS2bUm2bUm2km2SSSSSSSTbtm3btpL/25K2
+km3btkm2km3btm22km3bkm3btpL/25K2tm3bkm22km3btm22bUm2bUm2bUm2kkm2bUnbtm22
+tm3bkm3b25L//9v///////////8ADgEAAAMAAAABAEAAAAEBAAMAAAABACgAAAECAAMAAAAD
+AAAetgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEV
+AAMAAAABAAMAAAEWAAMAAAABACgAAAEXAAQAAAABAAAeAAEaAAUAAAABAAAevAEbAAUAAAAB
+AAAexAEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAAAAAAACAAIAAgSwAAAAAQAABLAAAAABAAA
+ENDofIMG
+
+demo.show_image('tiff', 'packbits compressed', <<'ENDofIMG')
+TU0AKgAABAqBAMEAgQDBAIEAwQCBAMEAgQDBAIEAwQCBAMEAgQDBAIEAwQCBAMEAgQDBAIEA
+wQCBAMEAgQDBAIEAwQCbAAvb///bttu2tv+Sttv/tv7bA/8AJEm8AKEA/v8G2///ttvbtv3b
+Df+2ttttttu2ttu22//b//+/AKMACCQAttvbJG2S2////7YR/wAkSSRtkm2Sttv//9v//22S
+/9v//8IAoQADkrbbtv/b/7b+2wD//gARttvbJG2SAAAkkrbbttvbkrbbwgCcAAAk9wD/JAUA
+JCSSttv+AAGStv/b///CAJcA/0n+AAJJbZL/AP8k/wAIkra2AEkA29v/wgCBAMEAgQDBAIEA
+wQCBAMEAgQDBAIEAwQCBAMEAgQDBAIEAwQCBAMEAgQDBAIEAwQD9///b//8B2///2/7/gQDQ
+AB5tJACSbSS2bUnbkm22km3btm22kkn/25L//9ttJAAkgQDgACOSSSSSSSTbkm2SSSSSSSSS
+JACSSSS2bUm2bUm2bUn/27b//9v3/w3btv+2bdu2bf//2//btvb/AdskigADJAAASfwAU5JJ
+JEkAAG0kAG0kAJJtJJJJJNu2bbaSbdu2bdu2bdu2bbaSbf+SbbZtSf/bkv/btv/bktu2bdu2
+ktuSbf/bttu2ktu2bbaSbf/bkv/btv//tv/btvz/ANv8/wDb/f8GtpL/km1tJLUAYm0AAEkA
+AEkAAEkAAJIkJEkAAG0kAG0AAJJJJG0kAJJtJJJJJNuSbbbbbbaSbbZtSbaSSdu2ktvbkraS
+bbaSSdu2ktu2bdu2ktu2bbaSbdu2kraSbdu2ktvbkv//2//bkv/bkv7b//8Mtv/btv//tv/b
+tv/bkv7bCP/bttu2kv//2/z/ALb1/wK2bUnXAH9JAABJAABJAABJAABJJACSSSSSJABtSQCS
+SSSSSSSSSSSSJCSSSSS2bUmSSSSSJABtJABtAACSSSS2kkm2bUnbkkm2kkn/25K2kknbtm22
+km3bkm22km3/tm3btm3btm3btpLbkm22km22kkm2kknbtm3bkpL/25L/27b//7b/2wO2//+2
+/f8Ztm3btpL/27b/tm3btpLbtm3//7b/25L//9vx/wHb//UAAZJJ/yT/AH9tJABJAABtJABJ
+AABJAABJAACSSSRtSQBtJABtSSS2kkmSJCSSJCSSSSSSSSSSSSSSSSSSSSSSSSRtJACSSSSS
+SSS2bUm2km3//9u2bUm2bUm2bUm2SSS2bUm2bUm2km2SSSSSSSTbtm3btpL/25K2km3btkm2
+km3btm22km3bkjBt27aS/9uStrZt25JttpJt27Zttm1Jtm1Jtm1JtpJJtm1J27ZttrZt25Jt
+29uS///b+P8ADgEAAAMAAAABAEAAAAEBAAMAAAABACgAAAECAAMAAAADAAAEuAEDAAMAAAAB
+gAUAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEW
+AAMAAAABACgAAAEXAAQAAAABAAAEAgEaAAUAAAABAAAEvgEbAAUAAAABAAAExgEcAAMAAAAB
+AAEAAAEoAAMAAAABAAIAAAAAAAAACAAIAAgSwAAAAAQAABLAAAAABAAA
+ENDofIMG
+
+if false
+demo.show_image('tiff', 'pixarlog compressed', <<'ENDofIMG')
+TU0AKgAAA3Z4nO2aIWzbUBCGz7HjYyVTNDAp0CgKDRorCauiSGFjRmWRxs0rlQ2FlUWKrLKQ
+sIDK1BoyjFRUjZSF7f13eYnjpZOmdeuU3Wc1se+dn17uf/ee5SuRYRiGYRiGYRiGYRiGYRiG
+YRg/YxVt3EG04IpLJkqocJ8VD6S1746ELsOP8UNMxO1J9MbDPQs2EvOKcV66uOsZoo34lwxb
+JraMfEsif+S06Lrj74/5XNi2iG6jdbCKruMRz3gdfKUbF/OFi/c0vHbzfNvqBDl1giENKHdt
+492dI/7sdIElMRV+i0l0G62igcx3ZMBhnUFc0ebV4fZzeBfDfx2ofyGr1DycOt+3/RXnALIB
+63rTqnYo9SVYBxptVS11+WDz//WZh/MQ8Z5E8/AiwjdmPnTg9qfg1sV+Hn7gabiK3gWbSDPl
+rcdsGIZhGIZhGIZhGIZhnCebXc1IKxeJ2LSGkbija+8G/zAXEd4LDqkTbFuo091T312l8iYd
+79JhK7ngGY+dNSfoklKP38eX4VOMt73NN77Gr4B3tP4NOeLbCWY84qfYt18x4ntPUCd133XG
+zv+RSOp5RD57DlRSiSo5Y59RY1HQV2fH1KRyunbDy/D/0VRjr3HVirQqMuJJxO2UvDY+R4hm
+DKUe3RXywudIHbVrdBe8lNzJJfK08y2kQr5k7RfXS0ZeZaJNIfYl+35S8dF7j1fI8dHV8fmC
+P7P23OO7+Dl8/idVvZCYz7hpz6VyNHKz/6ACxj8kqLNk5MWxIrkoktKhP0Re49uX+qtWxUtn
+1cjP2Nvhi8/h7vyg7FDUXLKe+7o6tEKs/bgrGUEiFfdTeqji6qN1evSaiLYH34X4/piVaOnx
+Qzx1Gr72f03MX9xdEdlcVh5dhZaMLBkS1XJCuZJxo1XXKOwWsOld6nPQbiC9asT70l+5+93Q
+cMFY//rSk1eBaj7IgaoxW3wGlXu710X7QetwpxnRqTxSEHlEupJZk+x3v2xnIRk1VMvk3oJp
+32tz7a2Du7svVNl0tUFdmtt+NiNWOuf1vE6+m/8aUR/5bSuTqBYu06/2UTjeLU7h8+h+r6nf
+ZfAMMKYbUaTH3+Lj+1Tf+n4E/6K2c+kKqS26Py0k7xDTmcz+tPZ04VUmyTLvX4p/wdR4Gsm4
+uV54beCT1Z5edCVNpc/TSn0HoOsh4gAOAQAAAwAAAAEAQAAAAQEAAwAAAAEAKAAAAQIAAwAA
+AAMAAAQkAQMAAwAAAAGAjQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAA
+ARUAAwAAAAEAAwAAARYAAwAAAAEAKAAAARcABAAAAAEAAANuARoABQAAAAEAAAQqARsABQAA
+AAEAAAQyARwAAwAAAAEAAQAAASgAAwAAAAEAAgAAAAAAAAAIAAgACBLAAAAABAAAEsAAAAAE
+AAA=
+ENDofIMG
+end
+
+if false
+demo.show_image('tiff', 'logluv compressed', <<'ENDofIMG')
+TU0AKgAAAAgADgEAAAMAAAABAEAAAAEBAAMAAAABACgAAAECAAMAAAADAAAAtgEDAAMAAAAB
+h3QAAAEGAAMAAAABAAIAAAERAAQAAAABAAAAAAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEW
+AAMAAAABACgAAAEXAAQAAAABAAAAAAEaAAUAAAABAAAAvAEbAAUAAAABAAAAxAEcAAMAAAAB
+AAEAAAEoAAMAAAABAAIAAAAAAAAAEAAQABASwAAAAAQAABLAAAAABAAA
+ENDofIMG
+end
+
+demo.show_image('tiff', 'jpeg compressed', <<'ENDofIMG')
+TU0AKgAABID/2P/AABEIACgAQAMAEQABEQACEQD/2gAMAwAAAQACAAA/APn+vn+vn+iiiiii
+iiiiiiiiiiiiiiiiiiiiiiiiiiitK28O63e28VxaaNqE8ExIilitXZXIODtIGDyCOPStO18O
+a5e28VxaaNqNxBLny5IrV3V8Eg4IGDyCPqDWtZ+FvEOo2kd3Y6Dql1bS/wCrmgs5HR+SOCBg
+8gj6g1m1mkEEgggjqDWUysjFWUqwOCCMEGikpKKKKKKKKKKKKKKUHBB449RRXdXHxU16+nt5
+Ll1j8li5MDOTIxdWJYOzKSMMF3KwG4jHTHo83xl8QXs8U92Y1aJWASAMAxZkO472ZSQA4G5W
+A3YwRjb6mfjj4guZ4pblYYhEr/u7VWHmMzIcszuwyAHC5Vgu7G054x/GPiGDxNqtvqEcLRz/
+AGcR3LFAvmSB3wwwTxsKcEnbjaCQorA8e+J7bxbrdvqcEDRzfZViunaNU82QM3zgAnjaUGCT
+jG0HAFcx8QfFlt4z1221aK18i4+yrFdt5ap50iu+HwCTymzgkkY25IUE87XLVydFFFFFFFFF
+FFFFFFFFFFFFFFFFFFe2vceH9WtktdR8KaRGsEu53hjW2Z8ZH3o1jP8AeG32B6/d7l/E9hqU
+ENvqHhjSkWKUNKUt47Z2IJHDRiM+oK5xx7Db0t34mjvrWK3u9F0vEcoeUxWkdvI2MjAaJUOO
+eV6d/TFlfhp4BvnlmZtYtCHG6G3uUKJk9F3Izce7ZP542IfDXgG5trm4uv7YtJlOfJhnURAs
+TiNMxuxwM43NkgZ61p2lh4Lube5muodVhmDMdlvdII0JJwqgxuxA46tkj8cT23wi+HtwIsat
+raF/veZcQx4PoN0QJ+vA4zV+x8C/Dm6it92rauJJOH33McIVs8gb4cnjvwDjOfS5p+geAZoo
+BcXuqmWRQGYXEcKo2eRhoiTgc54HB554zofgFayMfM8XeSp+ZC2nggr0/wCeo7+38jitB8H9
+OLAXfi9bVXXfG72PyuucZB8z1BH4fXEUHw70/wDdte+IzaxyLvjZrLO5ckZA3jnIx6Z79cNm
++AEUkFwNO8YQXF3EuRFLYtGh/wB5w7bRjnODS3HwYtJYpF0fxfbXlzHgvHNZvEqg9CWVnwMc
+5x0/HEt18NNPc+VpPimG7uVAaRJ7NokQHHJZWf37c44zms4fs++JyCf7Y8P/AC5zi5lOB68R
+9ODVdfgZr7KP+J54fDEkbBcysw9yBGePft3qOH4S6lLGr/2/oCgnH/HxK2PQnbGeD69B3xkZ
+w7z4N+MrW8lgjs7O5RGwJor+FUf3AdlbGeOQOlYM/wAL/E0V08McdhOik7ZV1CGNZAP4gJGV
+sfUDofSsV/Aeti9kt4jYShSdsxvookcDuPNZTjnuAfbg1n6h8MPGumiMy+HbybzM4+x7brGM
+Z3eUW29e+M846GoL34aeMrHZu8P3dxuyM2O26C4x97yi23qOuM0tz8PPFlvs2aLNeb8/8g90
+vNuMfe8ktt68ZxnnHQ1//9kAAA8BAAADAAAAAQBAAAABAQADAAAAAQAoAAABAgADAAAAAwAA
+BToBAwADAAAAAQAHAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQAD
+AAAAAQADAAABFgADAAAAAQAoAAABFwAEAAAAAQAABHcBGgAFAAAAAQAABUABGwAFAAAAAQAA
+BUgBHAADAAAAAQABAAABKAADAAAAAQACAAABWwAHAAABIQAABVAAAAAAAAgACAAIEsAAAAAE
+AAASwAAAAAQAAP/Y/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQu
+JyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQF
+BgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0Kx
+wRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlq
+c3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT
+1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/9k=
+ENDofIMG
+
+demo.show_image('tiff', 'deflate compressed', <<'ENDofIMG')
+TU0AKgAAAah4nO2Y643EMAiEXQzNUIyboRiaoRh2ADuP+7N70knZkxhZlmNH2fkMRPGO0Wq1
+Wq1Wq9Vqtb5L5m5qqi7Rm5kP4qdNfSSHc3dYDtfmMD8TQS3mn3b3TjRgm6YEgsaeYzwRg4TC
+9PcjRMLYzpmxcABW8+ifNviJ6DIktLKN/vv3/xRHwXJuPoV5HTwqKK1Wq9VqtVqtz+VxwMjv
+8ej/39fUpCGTdLLJVJmm6NlNQIQlev+AhyVMaDBfA6GYAU41nFrzqLSFSw3GjJf6ZeEpUvwu
+bxDOcFREAkpXRKph7IjRzOjAvEnOC9jzcC7rnlp13YB29ip4wvxT1Jn+qwlthMQ5QWDbwlsE
+RTis4uQX+cZl+zCPQfWWGZgsEkfHhaML3KyQN901lIjwL/6a4GvL5EEK4QErneKSKqPW0qaD
++awarnpJlkTIOnI9Aic1o1LsuEHuMdIyHTgrPyVTVKsM/YfuRzY4odxz3v2KBfaf021aDQqi
+E2q3SYs0QxN1cdSOHnW0i8uWyYoR79dFIK95nedr5HhObRRmctXuUC9uNR31AAAOAQAAAwAA
+AAEAQAAAAQEAAwAAAAEAKAAAAQIAAwAAAAMAAAJWAQMAAwAAAAGAsgAAAQYAAwAAAAEAAgAA
+AREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAwAAARYAAwAAAAEAKAAAARcABAAA
+AAEAAAGfARoABQAAAAEAAAJcARsABQAAAAEAAAJkARwAAwAAAAEAAQAAASgAAwAAAAEAAgAA
+AAAAAAAIAAgACBLAAAAABAAAEsAAAAAEAAA=
+ENDofIMG
+
+if Tk::PLATFORM['platform'] != 'windows'
+demo.show_image('other', 'postscript', <<'ENDofIMG')
+%!PS-Adobe-3
+%%Title: postscript.ps
+%%BoundingBox: 66 648 146 720
+%%Pages: 1
+%%DocumentProcSets: Adobe_distill 0.96
+%%EndComments
+%%BeginProcSet: Adobe_distill 0.96
+/PROLOGUE 30 40 add dict def
+ % 30 procedure entries + room for 40 cached font dictionaries
+ PROLOGUE begin
+ /clip { } def    % causes problems. remove if "clip" is needed
+ /bdef { bind def } bind def	/ldef { load def } bdef
+ /T { moveto show } bdef	/A { moveto ashow } bdef
+ /W { moveto widthshow } bdef	/AW { moveto awidthshow } bdef
+ /f /fill ldef			/R { { rlineto } repeat } bdef
+ /r /rlineto ldef		/L { { lineto } repeat } bdef
+ /m /moveto ldef		/l { moveto lineto stroke } bdef
+ /x { 0 rlineto } bdef		/y { 0 exch rlineto } bdef
+ /c /curveto ldef		/cp /closepath ldef
+ /s /stroke ldef		/w /setlinewidth ldef
+ /g /setgray ldef		/j /setlinejoin ldef
+ /d /setdash ldef		/F /setfont ldef
+ /C /setcmykcolor where { /setcmykcolor get }{ %ifelse
+   { %def
+     1 sub 3 { 3 index add neg dup 0 lt { pop 0 } if 3 1 roll } repeat
+     setrgbcolor
+   } bind
+ } ifelse def
+ /selectfont where { pop }{ %ifelse
+     /selectfont { exch findfont exch scalefont setfont } bdef
+ } ifelse
+ /MF { exch findfont exch makefont setfont } bdef
+ /FF /selectfont ldef
+ /DF { selectfont currentfont def } bdef
+ /BEGINPAGE { pop /pagesave save def } bdef
+ /ENDPAGE { pop pagesave restore showpage } def
+ /REMAP { %def
+   FontDirectory 2 index known { pop pop pop } { %ifelse
+     findfont dup length dict begin
+       { 1 index /FID ne {def}{pop pop} ifelse } forall
+       exch dup length 0 gt { /Encoding exch def }{ pop } ifelse
+     currentdict end definefont pop
+   } ifelse
+ } bdef
+ /RECODE { %def
+    3 -1 roll 1 index findfont /Encoding get 256 array copy exch
+    0 exch { %forall
+     dup type/nametype eq
+       { 3 {2 index} repeat put pop 1 add }{ exch pop }ifelse
+    } forall pop 3 1 roll REMAP
+ } bdef
+ end %PROLOGUE
+%%EndProcSet: Adobe_distill 0.96
+%%EndProlog
+%%BeginSetup
+PROLOGUE begin
+%%EndSetup
+%%Page: 1 1
+1 BEGINPAGE
+1 g
+2 setlinecap
+144 53 m
+390 x
+-19 y
+-390 x
+eofill
+0 g
+1.268 w
+0 setlinecap
+4 setmiterlimit
+[] 0 d
+109.698 714.182 m
+111.525 713.672 112.472 713.234 113.624 712.431 c
+-22.3128 -25.8381 r
+97.4019 682.652 103.794 672.84 100.329 664.844 c
+102.034 675.687 90.7436 683.82 84.1099 684.842 c
+25.588 29.3407 r
+f
+1.0361 w
+f
+f
+91.8805 654.468 m
+96.0255 654.285 100.155 654.188 104.481 654.188 c
+113.804 654.188 122.752 654.636 131.141 655.44 c
+134.222 655.737 136.724 658.133 137.108 661.279 c
+137.79 666.855 138.107 672.696 138.107 678.705 c
+138.107 684.714 137.79 690.555 137.108 696.131 c
+136.724 699.277 134.222 701.674 131.141 701.97 c
+127.476 702.321 123.704 702.604 119.84 702.813 c
+119.84 702.813 103.842 668.373 102.231 664.827 c
+99.8549 659.595 96.601 655.765 91.8805 654.468 c
+f
+0.7851 w
+77.8202 655.44 m
+74.7171 655.948 72.2887 657.716 71.8525 661.279 c
+71.1725 666.855 70.8549 672.696 70.8549 678.705 c
+70.8549 684.714 71.1725 690.555 71.8525 696.131 c
+72.2381 699.277 74.7417 701.674 77.8202 701.97 c
+82.1335 702.383 86.5932 702.702 91.1764 702.916 c
+8.16241 9.07727 r
+99.2863 711.98 101.266 712.345 102.996 711.921 c
+-28.4564 -32.9334 r
+80.6983 681.906 98.7446 677.354 98.7446 666.708 c
+98.7446 655.332 86.3243 654.054 77.8202 655.44 c
+f
+0.0843 w
+139.67 644.154 m
+140.194 644.154 140.619 644.576 140.619 645.098 c
+140.619 645.619 140.194 646.042 139.67 646.042 c
+139.146 646.042 138.721 645.619 138.721 645.098 c
+138.721 644.576 139.146 644.154 139.67 644.154 c
+1 ENDPAGE
+%%Trailer
+end %PROLOGUE
+%%Pages: 1
+%%EOF
+ENDofIMG
+end
+
+if false
+demo.show_image('other', 'pdf', <<'ENDofIMG')
+JVBERi0xLjIKJcfsj6IKNCAwIG9iago8PC9MZW5ndGggNSAwIFIvRmlsdGVyIC9GbGF0ZURl
+Y29kZT4+CnN0cmVhbQp4nF1TSY7cQAy7+xX1AkFbaXlG3jBAgAAzh/z/Esp2uyeDPhhUayEp
+FZMsnt/9/fg6/h6y/hzCHdS1UlyodH0dIrJJNyIWlLpE1OcLrGQOjLg6MOIm6+NoMULWiopN
+bevz6HRiaUQ0aKMHW1L7itQitGA2UvwdDuhoIaw8zSN3UOVqTnILNLAiXQVy3NNvCvQs+M57
+Zv4Gj6LivWK7UxS0dDCknBGl2jNY6MKoKmBkljwYfQUD2d8ZqjkKgINASEyEfCq208nc0Fon
+YSdZIiFy7IldQmbACe4FraKUfVYkzEAgarhgIBJyvIGi+IYrCWqm4I6UJ4mvV4PmfTW4J3TI
+tZCHQzdmDqeLY7Jgpf6IAG7KKVAsLAMBxWIEqrEvuAAc8xXp2Rtgkdhp038B7PfcCyQZ5WDV
+oXIuWGdCI387SO/GjezVgcZyuRaAP1b3gXVmopb1ZfXXkSM/z6Imx+4xpHAsseGHgD2abFzu
+2+qEzjwjl9fJN4vb6zd+ef1Ebq+fDrfZz4zH7GFhc0O32cPSJR+zXzIes0vnMPZlNk73ejWT
+gFNDYs/IOM3tkTXmGUbMsaPF9cAwq8KuyNwxFMc4gJY+d47S0Td/68nSNxkiUNpz159H8Twg
+g1LkcKyGBe6TkQYL3jhwTDwreSJ7gw9eZeBY3GZpPBU/FjY7/HX8A9+h3WJlbmRzdHJlYW0K
+ZW5kb2JqCjUgMCBvYmoKNTE2CmVuZG9iagozIDAgb2JqCjw8Ci9UeXBlIC9QYWdlCi9NZWRp
+YUJveCBbMCAwIDYxMiA3OTJdCi9QYXJlbnQgMiAwIFIKL1Jlc291cmNlcyA8PCAvUHJvY1Nl
+dCBbL1BERl0KPj4KL0NvbnRlbnRzIDQgMCBSCj4+CmVuZG9iagoyIDAgb2JqCjw8IC9UeXBl
+IC9QYWdlcyAvS2lkcyBbCjMgMCBSCl0gL0NvdW50IDEKPj4KZW5kb2JqCjEgMCBvYmoKPDwg
+L1R5cGUgL0NhdGFsb2cgL1BhZ2VzIDIgMCBSCj4+CmVuZG9iago2IDAgb2JqCjw8IC9DcmVh
+dGlvbkRhdGUgKEQ6MTk5NzEyMDUyMjU2MzcpCi9Qcm9kdWNlciAoQWxhZGRpbiBHaG9zdHNj
+cmlwdCA1LjEwKQo+PgplbmRvYmoKeHJlZgowIDcKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAw
+MDAwNzk5IDAwMDAwIG4gCjAwMDAwMDA3NDAgMDAwMDAgbiAKMDAwMDAwMDYyMCAwMDAwMCBu
+IAowMDAwMDAwMDE1IDAwMDAwIG4gCjAwMDAwMDA2MDEgMDAwMDAgbiAKMDAwMDAwMDg0OCAw
+MDAwMCBuIAp0cmFpbGVyCjw8IC9TaXplIDcgL1Jvb3QgMSAwIFIgL0luZm8gNiAwIFIKPj4K
+c3RhcnR4cmVmCjkzOQolJUVPRgo=
+ENDofIMG
+end
+
+#######################
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension b/ruby_1_8_6/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension
new file mode 100644
index 0000000000..7f515feee8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension
@@ -0,0 +1,41 @@
+This software is copyrighted by Jan Nijtmans (the maintainer)
+and a lot of other people who contributed code (most notably
+Andreas Kupries, Thomas G. Lane, Ioi K. Lam, Mario Weilguni
+and Roger E Critchlow Jr).
+The following terms apply to all files associated with the
+software unless explicitly disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license. 
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tkimg/readme.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/tkimg/readme.txt
new file mode 100644
index 0000000000..4d9774492c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tkimg/readme.txt
@@ -0,0 +1,3 @@
+The script 'demo.rb' is based on 'demo.tcl' of Tcl/Tk's 'Img' extention. 
+Image data in 'demo.rb' is those of 'demo.tcl'.
+Please read 'license_terms_of_Img_extension' file.
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/Orig_LICENSE.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/Orig_LICENSE.txt
new file mode 100644
index 0000000000..dd176a7ccf
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/Orig_LICENSE.txt
@@ -0,0 +1,52 @@
+
+  #######################################################################
+  ###  The following text is the original 'license.txt' of tktable    ###
+  ###  extension.                                                     ###
+  ###  Original Tcl source files are not include in this directry,    ###
+  ###  because of all of them are rewrited to Ruby files.             ###
+  ###  However, the image data file is quoted from iwidgets source    ###
+  ###  archive.                                                       ###
+  #######################################################################
+
+
+		   * COPYRIGHT AND LICENSE TERMS *
+
+(This file blatantly stolen from Tcl/Tk license and adapted - thus assume
+it falls under similar license terms).
+
+This software is copyrighted by Jeffrey Hobbs <jeff.hobbs@acm.org>.  The
+following terms apply to all files associated with the software unless
+explicitly disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute, and
+license this software and its documentation for any purpose, provided that
+existing copyright notices are retained in all copies and that this notice
+is included verbatim in any distributions.  No written agreement, license,
+or royalty fee is required for any of the authorized uses.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF,
+EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE IS
+PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO
+OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+RESTRICTED RIGHTS: Use, duplication or disclosure by the U.S. government
+is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
+of the Rights in Technical Data and Computer Software Clause as DFARS
+252.227-7013 and FAR 52.227-19.
+
+SPECIAL NOTES:
+
+This software also falls under the bourbon_ware clause:
+
+    Should you find this software useful in your daily work, you should
+    feel obliged to take the author out for a drink if the opportunity
+    presents itself.  The user may feel exempt from this clause if they
+    are under 21 or think the author has already partaken of too many
+    drinks.
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/basic.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/basic.rb
new file mode 100644
index 0000000000..0d2d48893a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/basic.rb
@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+##
+## basic.rb
+##
+## This demo shows the basic use of the table widget
+## 
+## ( based on 'basic.tcl' included source archive of tktable extension )
+##
+require 'tk'
+require 'tkextlib/tktable'
+
+ary  = TkVariable.new_hash
+rows = 8
+cols = 8
+
+# fill table variable
+((-(rows))..rows).each{|x|
+  ((-(cols))..cols).each{|y|
+    ary[x,y] = "r#{x},c#{y}"
+  }
+}
+
+lbl = TkLabel.new(:text=>"TkTable v1 Example")
+
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary, 
+                        :width=>6, :height=>6, 
+                        :titlerows=>1, :titlecols=>2, 
+                        :roworigin=>-1, :colorigin=>-2, 
+                        :rowstretchmode=>:last, :colstretchmode=>:last,
+                        :rowtagcommand=>proc{|row|
+                          row = Integer(row)
+                          (row>0 && row%2 == 1)? 'OddRow': ''
+                        }, 
+                        :coltagcommand=>proc{|col|
+                          col = Integer(col)
+                          (col>0 && col%2 == 1)? 'OddCol': ''
+                        }, 
+                        :selectmode=>:extended, :sparsearray=>false)
+
+sx = table.xscrollbar(TkScrollbar.new)
+sy = table.yscrollbar(TkScrollbar.new)
+
+btn = TkButton.new(:text=>'Exit', :command=>proc{exit})
+
+Tk.grid(lbl, '-', :sticky=>:ew)
+Tk.grid(table, sy, :sticky=>:news)
+Tk.grid(sx, :sticky=>:ew)
+Tk.grid(btn, :sticky=>:ew, :columnspan=>2)
+
+Tk.root.grid_columnconfig(0, :weight=>1)
+Tk.root.grid_rowconfig(1, :weight=>1)
+
+table.tag_configure('OddRow', :bg=>'orange', :fg=>'purple')
+table.tag_configure('OddCol', :bg=>'brown', :fg=>'pink')
+
+table.set_width([-2, 7], [-1, 7], [1, 5], [2, 8], [4, 14])
+
+puts "Table is #{table.path} with array #{(table['variable'])}"
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/buttons.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/buttons.rb
new file mode 100644
index 0000000000..b21e8673c2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/buttons.rb
@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+##
+## buttons.rb
+##
+## demonstrates the simulation of a button array
+##
+## ( based on 'buttons.tcl' included source archive of tktable extension )
+##
+require 'tk'
+require 'tkextlib/tktable'
+
+# create the table
+tab  = TkVariable.new_hash
+rows = 20
+cols = 20
+
+table = Tk::TkTable.new(:rows=>rows + 1, :cols=>cols + 1, 
+                        :variable=>tab, :titlerows=>1, :titlecols=>1, 
+                        :roworigin=>-1, :colorigin=>-1, 
+                        :colwidth=>4, :width=>8, :height=>8, 
+                        :cursor=>'top_left_arrow', :borderwidth=>2, 
+                        :flashmode=>false, :state=>:disabled)
+
+sx = table.xscrollbar(TkScrollbar.new)
+sy = table.yscrollbar(TkScrollbar.new)
+
+Tk.grid(table, sy, :sticky=>:news)
+Tk.grid(sx, :sticky=>:ew)
+
+Tk.root.grid_columnconfig(0, :weight=>1)
+Tk.root.grid_rowconfig(0, :weight=>1)
+
+# set up tags for the various states of the buttons
+table.tag_configure('OFF', :bg=>'red',    :relief=>:raised)
+table.tag_configure('ON',  :bg=>'green',  :relief=>:sunken)
+table.tag_configure('sel', :bg=>'gray75', :relief=>:flat)
+
+# clean up if mouse leaves the widget
+table.bind('Leave', proc{|w| w.selection_clear_all}, '%W')
+
+# highlight the cell under the mouse
+table.bind('Motion', proc{|w, x, y|
+             Tk.callback_break if w.selection_include?(TkComm._at(x,y))
+             w.selection_clear_all
+             w.selection_set(TkComm._at(x,y))
+             Tk.callback_break
+             ## "break" prevents the call to tkTableCheckBorder
+           }, '%W %x %y')
+
+# mousebutton 1 toggles the value of the cell
+# use of "selection includes" would work here
+table.bind('1', proc{|w, x, y|
+             #rc = w.curselection[0]
+             rc = w.index(TkComm._at(x,y))
+             if tab[rc] == 'ON'
+               tab[rc] = 'OFF'
+               w.tag_cell('OFF', rc)
+             else
+               tab[rc] = 'ON'
+               w.tag_cell('ON', rc)
+             end}, '%W %x %y')
+
+
+# inititialize the array, titles, and celltags
+0.step(rows){|i|
+  tab[i,-1] = i
+  0.step(cols){|j|
+    if i == 0
+      tab[-1,j] = j
+    end 
+    tab[i,j] = "OFF"
+    table.tag_cell('OFF', "#{i},#{j}")
+  }
+}
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/command.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/command.rb
new file mode 100644
index 0000000000..bf36159ccc
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/command.rb
@@ -0,0 +1,89 @@
+#!/usr/bin/env ruby
+##
+## command.rb
+##
+## This demo shows the use of the table widget's -command options
+##
+## ( based on 'command.tcl' included source archive of tktable extension )
+##
+require 'tk'
+require 'tkextlib/tktable'
+
+# create the table
+data = TkVariable.new_hash
+rows = 10
+cols = 10
+
+# fill table variable
+((-(rows))..rows).each{|x|
+  ((-(cols))..cols).each{|y|
+    data[x,y] = "#{x} x #{y}"
+  }
+}
+
+lbl = TkLabel.new(:text=>"TkTable :command Example")
+cur_var = TkVariable.new
+current = TkLabel.new(:textvariable=>cur_var, :width=>5)
+ent_var = TkVariable.new
+entry = TkEntry.new(:textvariable=>ent_var)
+
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, 
+                        :command=>[proc{|mode, cell, val|
+                          if (mode == :w)
+                            data[cell] = val
+                          else
+                            begin
+                              data[cell]  # exist
+                            rescue
+                              ''          # not exist
+                            end
+                          end
+                        }, '%i %C %s'], 
+                        :width=>6, :height=>6, 
+                        :titlerows=>1, :titlecols=>1, 
+                        :roworigin=>-1, :colorigin=>-1, 
+                        :rowstretchmode=>:last, :colstretchmode=>:last,
+                        :rowtagcommand=>proc{|row|
+                          row = Integer(row)
+                          (row>0 && row%2 == 1)? 'OddRow': ''
+                        },
+                        :coltagcommand=>proc{|col|
+                          col = Integer(col)
+                          (col>0 && col%2 == 1)? 'OddCol': ''
+                        }, 
+                        :selectmode=>:extended, :flashmode=>true, 
+                        :rowstretch=>:unset, :colstretch=>:unset,
+                        :browsecommand=>[proc{|w, s|
+                          cur_var.value = s
+                          ent_var.value = w.get(s)
+                        }, '%W %S'], 
+                        :validate=>true, 
+                        :validatecommand=>proc{|e| 
+                          ent_var.value = e.new_value; true
+                        })
+=begin
+                        :validatecommand=>[
+                          proc{|s| 
+                            ent_var.value = s; true
+                          }, '%S'])
+=end
+
+sx = table.xscrollbar(TkScrollbar.new)
+sy = table.yscrollbar(TkScrollbar.new)
+
+entry.bind('Return', proc{|w| table.curvalue = w.value}, '%W')
+
+Tk.grid(lbl, '-', '-', :sticky=>:ew)
+Tk.grid(current, entry, '-', :sticky=>:ew)
+Tk.grid(table, '-', sy, :sticky=>:news)
+Tk.grid(sx, '-', :sticky=>:ew)
+
+Tk.root.grid_columnconfig(1, :weight=>1)
+Tk.root.grid_rowconfig(2, :weight=>1)
+
+table.tag_configure('OddRow', :bg=>'orange', :fg=>'purple')
+table.tag_configure('OddCol', :bg=>'brown', :fg=>'pink')
+
+puts "Table is #{table.path}"
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/debug.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/debug.rb
new file mode 100644
index 0000000000..d5cd5e49ba
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/debug.rb
@@ -0,0 +1,101 @@
+#!/usr/bin/env ruby
+##
+## debug.rb
+##
+## This demo uses most features of the table widget
+##
+## ( based on 'debug.tcl' included source archive of tktable extension )
+##
+require 'tk'
+require 'tkextlib/tktable'
+
+# create the table
+ary  = TkVariable.new_hash
+rows = 25
+cols = 20
+
+# fill table variable
+((-(rows))..rows).each{|x|
+  ((-(cols))..cols).each{|y|
+    ary[x,y] = "r#{x},c#{y}"
+  }
+}
+
+lbl = TkLabel.new(:text=>"TkTable v2 Example")
+
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary, 
+                        :width=>6, :height=>6, 
+                        :titlerows=>1, :titlecols=>2, 
+                        :roworigin=>-5, :colorigin=>-2, 
+                        :coltagcommand=>proc{|col|
+                          col = Integer(col)
+                          (col>0 && col%2 == 1)? 'OddCol': ''
+                        }, 
+                        :selectmode=>:extended, :flashmode=>true, 
+                        :rowstretch=>:unset, :colstretch=>:unset,
+                        :selecttitles=>false, :drawmode=>:single)
+
+sx = table.xscrollbar(TkScrollbar.new)
+sy = table.yscrollbar(TkScrollbar.new)
+
+btn = TkButton.new(:text=>'Exit', :command=>proc{exit})
+
+Tk.grid(lbl, '-', :sticky=>:ew)
+Tk.grid(table, sy, :sticky=>:news)
+Tk.grid(sx, :sticky=>:ew)
+Tk.grid(btn, :sticky=>:ew, :columnspan=>2)
+
+Tk.root.grid_columnconfig(0, :weight=>1)
+Tk.root.grid_rowconfig(1, :weight=>1)
+
+table.tag_configure('OddCol', :bg=>'brown', :fg=>'pink')
+table.tag_configure('title',  :bg=>'red',   :fg=>'green', :relief=>:sunken)
+table.tag_configure('dis',    :state=>:disabled)
+
+first = table[:colorigin]
+%w(n s e w nw ne sw se c).each_with_index{|anchor, idx|
+  table.tag_configure(anchor, :anchor=>anchor)
+  table.tag_row(anchor, idx)
+  table.set([idx,first], anchor)
+}
+courier = TkFont.new(:family=>'Courier', :size=>10)
+table.tag_configure('s', :font=>courier, :justify=>:center)
+
+logo = TkPhotoImage.new(:file=>File.join(File.dirname(File.expand_path(__FILE__)), 'tcllogo.gif'))
+table.tag_configure('logo', :image=>logo, :showtext=>true)
+table.tag_cell('logo', [1,2], [2,3], [4,1])
+table.tag_cell('dis', [2,1], [1,-1], [3,0])
+table.set_width([-2,8], [-1,9], [0, 12], [4, 14])
+
+table.set([1,1], "multi-line\ntext\nmight be\ninteresting", 
+          [3,2], "more\nmulti-line\nplaying\n", 
+          [2,2], "null\0byte")
+
+# This is in the row span
+l = TkLabel.new(table, :text=>'Window s', :bg=>'yellow')
+table.window_configure([6,0], :sticky=>:s, :window=>l)
+
+# This is in the row titles
+l = TkLabel.new(table, :text=>'Window ne', :bg=>'yellow')
+table.window_configure([4,-1], :sticky=>:ne, :window=>l)
+
+# This will get swallowed by a span
+l = TkLabel.new(table, :text=>'Window ew', :bg=>'yellow')
+table.window_configure([5,3], :sticky=>:ew, :window=>l)
+
+# This is in the col titles
+l = TkLabel.new(table, :text=>'Window news', :bg=>'yellow')
+table.window_configure([-5,1], :sticky=>:news, :window=>l)
+
+l = TkLabel.new(table.winfo_parent, :text=>'Sibling l', :bg=>'orange')
+table.window_configure([5,1], :sticky=>:news, :window=>l)
+
+if table.span_list.empty?
+  table.set_spans([-1,-2], [0,3], [1,2], [0,5], [3,2], [2,2], [6,0], [4,0])
+end
+
+puts "Table is #{table.path} with array #{(table['variable'])}"
+
+# table.postscript(:file=>'out.ps', :first=>:origin, :last=>[2,2])
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/dynarows.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/dynarows.rb
new file mode 100644
index 0000000000..d083e26559
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/dynarows.rb
@@ -0,0 +1,99 @@
+#!/usr/bin/env ruby
+##
+## dynarows.rb
+##
+## This demos shows the use of the validation mechanism of the table
+## and uses the table's cache (no -command or -variable) with a cute
+## dynamic row routine.
+## 
+## ( based on 'dynarows.tcl' included source archive of tktable extension )
+##
+require 'tk'
+require 'tkextlib/tktable'
+
+def table_validate(w, idx)
+  return unless idx =~ /^(\d+),(\d+)$/
+  row = Integer($1)
+  col = Integer($2)
+  val = w.get(idx)
+
+ [w, idx]
+  nrows = w[:rows]
+  return if row == nrows - 1 && val == ''
+
+  begin
+    time = Tk.tk_call('clock', 'scan', val)
+    date = []
+    Tk.tk_call('clock', 'format', time, 
+               :format=>'%m %d %Y').split(' ').each{|item|
+      date << item.sub(/^\s*0*/,'')
+    }
+    w.set(idx, date.join('/'))
+    if row == nrows - 1
+      if w.get([row,1]) != '' && w.get([row,2]) != ''
+        w.tag_row_reset(row)
+        w.set([row,0], row)
+        nrows += 1
+        row += 1
+        w.configure(:rows=>nrows)
+        w.tag_row('unset', row)
+        w.set([row,0], '*')
+        w.see([row,1])
+        w.activate([row,1])
+      end
+    end
+  rescue
+    Tk.bell
+    w.activate(idx)
+    w.selection_clear_all
+    w.selection_set(:active)
+    w.see(:active)
+  end
+end
+
+
+lbl = TkLabel.new(:text=>"Dynamic Date Validated Rows")
+
+table = Tk::TkTable.new(:rows=>2, :cols=>3, :cache=>1, :selecttype=>:row, 
+                        :titlerows=>1, :titlecols=>1, :height=>5, 
+                        :colstretch=>:unset, :rowstretch=>:unset, 
+                        :autoclear=>true, 
+                        :browsecommand=>[
+                          proc{|w,s| table_validate(w, s)}, 
+                          '%W %s'
+                        ])
+table.set([0,1], 'Begin', [0,2], 'End', [1,0], '*')
+table.tag_configure('unset', :fg=>'#008811')
+table.tag_configure('title', :fg=>'red')
+table.tag_row('unset', 1)
+table.set_width(0,3)
+
+sx = table.xscrollbar(TkScrollbar.new)
+sy = table.yscrollbar(TkScrollbar.new)
+
+Tk.grid(lbl, '-', :sticky=>:ew)
+Tk.grid(table, sy, :sticky=>:news)
+Tk.grid(sx, :sticky=>:ew)
+
+Tk.root.grid_columnconfig(0, :weight=>1)
+Tk.root.grid_rowconfig(1, :weight=>1)
+
+rtn_proc = proc{|w|
+  r = w.row_index(:active)
+  c = w.col_index(:active)
+
+  if c == 2
+    r += 1
+    w.activate([r,1])
+  else
+    c += 1
+    w.activate([r,c])
+  end
+  w.see(:active)
+  Tk.callback_break
+}
+
+table.bind('Return', rtn_proc, '%W')
+table.bind('KP_Enter', rtn_proc, '%W')
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/maxsize.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/maxsize.rb
new file mode 100644
index 0000000000..aff68ff377
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/maxsize.rb
@@ -0,0 +1,67 @@
+#!/usr/bin/env ruby
+##
+## maxsize.rb
+##
+## This demo uses a really big table.  The big startup time is in
+## filling the table's Tcl array var.
+## 
+## ( based on 'maxsize.tcl' included source archive of tktable extension )
+##
+require 'tk'
+require 'tkextlib/tktable'
+
+ary  = TkVariable.new_hash
+rows = 40000
+cols = 10
+
+# fill table variable
+((-(rows))..rows).each{|x|
+  ((-(cols))..cols).each{|y|
+    ary[x,y] = "#{x},#{y}"
+  }
+}
+
+lbl = TkLabel.new(:text=>"TkTable v2 Example")
+
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :variable=>ary, 
+                        :width=>6, :height=>8, 
+                        :titlerows=>1, :titlecols=>1, 
+                        :coltagcommand=>proc{|col|
+                          col = Integer(col)
+                          (col>0 && col%2 == 1)? 'OddCol': ''
+                        }, 
+                        :selectmode=>:extended, 
+                        :colstretch=>:unset, :rowstretch=>:unset, 
+                        :selecttitles=>false, :drawmode=>:slow)
+
+sx = table.xscrollbar(TkScrollbar.new)
+sy = table.yscrollbar(TkScrollbar.new)
+
+btn = TkButton.new(:text=>'Exit', :command=>proc{exit})
+
+Tk.grid(lbl, '-', :sticky=>:ew)
+Tk.grid(table, sy, :sticky=>:news)
+Tk.grid(sx, :sticky=>:ew)
+Tk.grid(btn, :sticky=>:ew, :columnspan=>2)
+
+Tk.root.grid_columnconfig(0, :weight=>1)
+Tk.root.grid_rowconfig(1, :weight=>1)
+
+table.tag_configure('OddCol', :bg=>'brown', :fg=>'pink')
+table.tag_configure('title',  :bg=>'red',   :fg=>'blue', :relief=>:sunken)
+table.tag_configure('dis',    :state=>:disabled)
+
+first = table[:colorigin]
+%w(n s e w nw ne sw se c).each_with_index{|anchor, idx|
+  table.tag_configure(anchor, :anchor=>anchor)
+  table.tag_row(anchor, idx)
+  table.set([idx,first], anchor)
+}
+courier = TkFont.new(:family=>'Courier', :size=>10)
+table.tag_configure('s', :font=>courier, :justify=>:center)
+
+table.set_width([-2, 8], [-1, 9], [0, 12], [4, 14])
+
+puts "Table is #{table.path} with array #{(table['variable'])}"
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/spreadsheet.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/spreadsheet.rb
new file mode 100644
index 0000000000..9da896f5a7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/spreadsheet.rb
@@ -0,0 +1,137 @@
+#!/usr/bin/env ruby
+##
+## spreadsheet.rb
+##
+## This demos shows how you can simulate a 3D table
+## and has other basic features to begin a basic spreadsheet
+## 
+## ( based on 'spreadsheet.tcl' included source archive of tktable extension )
+##
+require 'tk'
+require 'tkextlib/tktable'
+
+rows = 10
+cols = 10
+cur_var = TkVariable.new
+table_list = Hash.new{|hash, key| hash[key] = TkVariable.new_hash}
+page = TkVariable.new('AA')
+color = Hash.new('pink')
+color['AA'] = 'orange'
+color['BB'] = 'blue'
+color['CC'] = 'green'
+
+def colorize(num)
+  num = Integer(num)
+  return 'colored' if (num > 0 && num % 2 == 1)
+end
+
+def fill_table(tbl_list, page, r=10, c=10)
+  ary = tbl_list[page]
+
+  (0...r).each{|i|
+    (0...c).each{|j|
+      if i!=0 && j!=0
+        ary[i,j] = "#{page} #{i},#{j}"
+      elsif i!=0
+        ary[i,j] = i.to_s
+      else
+        ary[i,j] = (64+j).chr
+      end
+    }
+  }
+end
+
+def changepage(tbl_list, tbl, ent, col, var, elem, op)
+  if elem != ''
+    page = var[elem]
+  else
+    page = var.value
+  end
+  if tbl[:variable] != tbl_list[page].id
+    tbl.selection_clear_all
+    tbl.variable(tbl_list[page])
+    ent.textvariable(tbl_list[page].ref('active'))
+    tbl.activate('origin')
+    tbl.tag_configure('colored', :bg=>col[page])
+    tbl.see('active')
+  end
+end
+
+lbl = TkLabel.new(:text=>"TkTable v1 Spreadsheet Example")
+
+current = TkLabel.new(:textvariable=>cur_var, :width=>5)
+entry = TkEntry.new(:textvariable=>table_list[page.value].ref('active'))
+lpage = TkLabel.new(:text=>'PAGE:', :width=>6, :anchor=>:e)
+optmenu = TkOptionMenubutton.new(page, *(%w(AA BB CC DD)))
+
+fill_table(table_list, page.value)
+fill_table(table_list, 'BB', Integer(rows/2), Integer(cols/2))
+
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :width=>5, :height=>5, 
+                        :variable=>table_list[page.value], 
+                        :titlerows=>1, :titlecols=>1, 
+                        :coltagcommand=>proc{|n| colorize(n)},
+                        :flashmode=>true, :selectmode=>:extended, 
+                        :colstretch=>:unset, :rowstretch=>:unset, 
+                        :browsecommand=>proc{|e| cur_var.value = e.new_index})
+
+page.trace(:w, proc{|var, elem, op| 
+             changepage(table_list, table, entry, color, var, elem, op)
+           })
+
+table.tag_configure('colored', :bg=>color[page.value])
+table.tag_configure('title',   :fg=>'red', :relief=>:groove)
+table.tag_configure('blue',    :bg=>'blue')
+table.tag_configure('green',   :bg=>'green')
+
+table.tag_cell('green', [6,3], [5,7], [4,9])
+table.tag_cell('blue', [8,8])
+table.tag_row('blue', 7)
+table.tag_col('blue', 6, 8)
+table.set_width([0, 3], [2, 7])
+
+sx = table.xscrollbar(TkScrollbar.new)
+sy = table.yscrollbar(TkScrollbar.new)
+
+btn = TkButton.new(:text=>'Exit', :command=>proc{exit})
+
+Tk.grid(lbl, '-', '-', '-', '-', :sticky=>:ew)
+Tk.grid(current, entry, lpage, optmenu, '-', :sticky=>:ew)
+Tk.grid(table, '-', '-', '-', sy, :sticky=>:ns)
+Tk.grid(sx, '-', '-', '-', :sticky=>:ew)
+Tk.grid(btn, '-', '-', '-', '-', :sticky=>:ew)
+
+Tk.root.grid_columnconfig(1, :weight=>1)
+Tk.root.grid_rowconfig(2, :weight=>1)
+
+table.grid_configure(:sticky=>:news)
+
+entry.bind('Return', proc{
+             r = table.row_index(:active)
+             c = table.col_index(:active)
+             rmax = table[:rows]
+             cmax = table[:cols]
+
+             c += 1
+             if c == cmax
+               c = table[:titlecols]
+               r += 1
+               if r == rmax
+                 r = table[:titlerows]
+               end
+             end
+             table.activate([r, c])
+             table.see('active')
+           })
+
+menu = TkMenu.new
+m_file = TkMenu.new(menu)
+Tk.root.menu(menu)
+menu.add(:cascade, :label=>'File', :underline=>0, :menu=>m_file)
+m_file.add(:command, :label=>'Fill Array', 
+           :command=>proc{ fill_table(table_list, page.value) })
+m_file.add(:command, :label=>'Quit', :command=>proc{exit})
+
+puts "Table is #{table.path} with array #{(table['variable'])}"
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/tcllogo.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/tcllogo.gif
new file mode 100755
index 0000000000..4603d4ff41
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/tcllogo.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/valid.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/valid.rb
new file mode 100644
index 0000000000..e5d3f11d84
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/tktable/valid.rb
@@ -0,0 +1,88 @@
+#!/usr/bin/env ruby
+##
+## valid.rb
+##
+## This demos shows the use of the validation mechanism of the table
+## and uses the table's cache (no -command or -variable)
+## 
+## ( based on 'valid.tcl' included source archive of tktable extension )
+##
+require 'tk'
+require 'tkextlib/tktable'
+
+rows = 10
+cols = 10
+
+def colorize(num)
+  num = Integer(num)
+  return 'colored' if (num > 0 && num % 2 == 1)
+end
+
+def fill_headers(w, r=10, c=10)
+  (1..(r-1)).each{|i| w.set([i,0], i.to_s)}
+
+  (1..(c-1)).each{|j|
+    if j % 3 == 1
+      w.set([0,j], 'AlphaNum')
+    elsif j % 2 == 1
+      w.set([0,j], 'Alpha')
+    elsif j != 0
+      w.set([0,j], 'Real')
+    end
+  }
+end
+
+def validate_proc(c, val)
+  if c % 3 == 1
+    # AlphaNum
+    regexp = /^[A-Za-z0-9 ]*$/
+  elsif c % 2 == 1
+    # Alpha
+    regexp = /^[A-Za-z ]*$/
+  elsif c != 0
+    # 'Real'
+    regexp = /^[-+]?[0-9]*\.?[0-9]*([0-9]\.?e[-+]?[0-9]*)?$/
+  end
+  if val =~ regexp
+    return true
+  else
+    Tk.bell
+    return false
+  end
+end
+
+lbl = TkLabel.new(:text=>"TkTable v1 Validated Table Example")
+
+table = Tk::TkTable.new(:rows=>rows, :cols=>cols, :cache=>1, 
+                        :width=>5, :height=>5, :titlerows=>1, :titlecols=>1, 
+                        :coltagcommand=>proc{|n| colorize(n)},
+                        :flashmode=>true, :selectmode=>:extended, 
+                        :colstretch=>:unset, :rowstretch=>:unset, 
+                        :validate=>true, 
+                        :validatecommand=>proc{|e|
+                          unless e.widget.tag_include?('title', e.index)
+                            validate_proc(e.column, e.new_value)
+                          end } )
+
+fill_headers(table)
+
+table.tag_configure('colored', :bg=>'lightblue')
+table.tag_configure('title',   :fg=>'red')
+table.set_width(0,3)
+
+sx = table.xscrollbar(TkScrollbar.new)
+sy = table.yscrollbar(TkScrollbar.new)
+
+btn = TkButton.new(:text=>'Exit', :command=>proc{exit})
+
+Tk.grid(lbl, '-', :sticky=>:ew)
+Tk.grid(table, sy, :sticky=>:news)
+Tk.grid(sx, :sticky=>:ew)
+Tk.grid(btn, '-', :sticky=>:ew)
+
+Tk.root.grid_columnconfig(0, :weight=>1)
+Tk.root.grid_rowconfig(1, :weight=>1)
+
+puts "Table is #{table.path}"
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/bitmaps.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/bitmaps.rb
new file mode 100644
index 0000000000..745e6a2e5b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/bitmaps.rb
@@ -0,0 +1,76 @@
+#
+# Demo: Bitmaps
+#
+def demoBitmaps(t)
+  #if $Version_1_1_OrLater
+  if @has_bgimg
+    t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+                :selectmode=>:browse, :orient=>:horizontal, :wrap=>'5 items', 
+                :showheader=>false, :backgroundimage=>@images['sky'])
+  else
+    t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+                :selectmode=>:browse, :orient=>:horizontal, :wrap=>'5 items', 
+                :showheader=>false)
+  end
+
+  if $HasColumnCreate
+    t.column_create(:itembackground=>['gray90', []])
+  else
+    t.column_configure(0, :itembackground=>['gray90', []])
+  end
+
+  t.element_create('elemTxt', :text, 
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
+  t.element_create('elemSelTxt', :rect, :showfocus=>true, 
+                   :fill=>[@SystemHighlight, ['selected', 'focus']])
+  t.element_create('elemSelBmp', :rect, :outlinewidth=>4, 
+                   :outline=>[@SystemHighlight, ['selected', 'focus']])
+  t.element_create('elemBmp', :bitmap, 
+                   :foreground=>[@SystemHighlight, ['selected', 'focus']], 
+                   :background=>'linen', 
+                   :bitmap=>['question' ['selected']])
+
+  s = t.style_create('STYLE', :orient=>:vertical)
+  t.style_elements(s, ['elemSelBmp', 'elemBmp', 'elemSelTxt', 'elemTxt'])
+  t.style_layout(s, 'elemSelBmp', :union=>'elemBmp', :ipadx=>6, :ipady=>6)
+  t.style_layout(s, 'elemBmp',    :pady=>[0, 6], :expand=>:we)
+  t.style_layout(s, 'elemSelTxt', :union=>'elemTxt', :ipadx=>2)
+  t.style_layout(s, 'elemTxt',    :expand=>:we)
+
+  # Set default item style
+  if $Version_1_1_OrLater
+    t.defaultstyle = [s]
+  end
+
+  bitmap_names = %w(error gray75 gray50 gray25 gray12 
+                    hourglass info questhead question warning)
+
+  bitmap_names.each{|name|
+    i = t.item_create
+    unless $Version_1_1_OrLater
+      t.item_style_set(i, 0, s)
+    end
+    t.item_text(i, 0, name)
+    t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name)
+    t.item_lastchild(:root, i)
+  }
+
+  bitmap_names.each{|name|
+    i = t.item_create
+    t.item_style_set(i, 0, s)
+    t.item_text(i, 0, name)
+    if true
+      t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name, 
+                               :foreground=>['brown', ''], 
+                               :background=>['', ''])
+    else
+      t.item_element_configure(i, 0, 'elemBmp', :bitmap=>name, 
+                               :foreground=>[
+                                 @SystemHighlight, ['selected', 'focus'], 
+                                 'brown', []
+                               ], 
+                               :background=>['', []])
+    end
+    t.item_lastchild(:root, i)
+  }
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/demo.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/demo.rb
new file mode 100644
index 0000000000..50ecde91f0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/demo.rb
@@ -0,0 +1,1310 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+require 'tkextlib/treectrl'
+
+$ScriptDir = File.dirname(File.expand_path(__FILE__))
+
+$HasColumnCreate = Tk::TreeCtrl::HasColumnCreateCommand
+
+$Version_1_1_OrLater = (TkPackage.vcompare(Tk::TreeCtrl.package_version, '1.1') >= 0)
+
+if Hash.instance_methods.include?('key')
+  # probably ruby 1.9.x --> use Hash#key
+  # Because Hash#index show warning "Hash#index is deprecated; use Hash#key".
+else
+  # probably ruby 1.8.x --> use Hash#index
+  class Hash
+    alias key index
+  end
+end
+
+class TkTreeCtrl_demo
+  def initialize(dir)
+    @ScriptDir = dir || '.'
+
+    @thisPlatform = Tk::PLATFORM['platform']
+    if @thisPlatform == 'unix' && Tk.windowingsystem == 'aqua'
+      @thisPlatform = 'macosx'
+    end
+
+    @RandomN = [500]
+
+    @images = Hash.new
+    @sel_images = Hash.new
+
+    @popup = Hash.new
+    @mTree = Hash.new
+    @mHeader = Hash.new
+
+    @non_clear_list = []
+
+    @demoCmd = Hash.new
+    @demoFile = Hash.new
+
+    # Get default colors
+    w = TkListbox.new
+    @SystemButtonFace    = w[:highlightbackground]
+    @SystemHighlight     = w[:selectbackground]
+    @SystemHighlightText = w[:selectforeground]
+    w.destroy
+
+    ####################
+
+    make_source_window()
+    make_menubar()
+    make_main_window()
+
+    if $Version_1_1_OrLater
+      begin
+        @tree2[:backgroundimage]
+        @has_bgimg = true
+      rescue
+        @has_bgimg = false
+      end
+    else
+      @has_bgimg = false
+    end
+
+    ####################
+
+    make_list_popup()
+    make_header_popup()
+
+    init_pics('sky')
+
+    ####################
+
+    @tree2.bind('ButtonPress-3', 
+                proc{|w, x, y, rootx, rooty|
+                  show_list_popup(w, x, y, rootx, rooty)
+                }, '%W %x %y %X %Y')
+
+    # Allow "scan" bindings
+    if @thisPlatform == 'windows'
+      @tree2.bind_remove('Control-ButtonPress-3')
+    end
+
+    ####################
+
+    init_demo_scripts_module()
+    load_demo_scripts()
+    init_demo_list()
+
+    ####################
+
+    @tree1.notify_bind(@tree1, 'Selection', 
+                       proc{|c, t|
+                         if c == 1
+                           item = t.selection_get[0]
+                           demo_set(@demoCmd[item], @demoFile[item])
+                         end
+                       }, '%c %T')
+
+    # When one item is selected in the demo list, display the styles in 
+    # that item.
+    # See DemoClear for why the tag "DontDelete" is used
+    @tree2.notify_bind('DontDelete', 'Selection', 
+                       proc{|c, t|
+                         display_styles_in_item(t.selection_get[0]) if c == 1
+                       }, '%c %T')
+  end
+
+  ##########################
+
+  def init_pics(*args)
+    args.each{|pat|
+      unless TkImage.names.find{|img| (name = @images.key(img)) && File.fnmatch(pat, name)}
+        Dir.glob(File.join(@ScriptDir, 'pics', "#{pat}.gif")).each{|file|
+          name = File.basename(file, '.gif')
+          img = TkPhotoImage.new(:file=>file)
+          @images[name] = img
+          @sel_images[name] = TkPhotoImage.new
+          @sel_images[name].copy(img)
+          Tk::TreeCtrl.image_tint(@sel_images[name], @SystemHighlight, 128)
+        }
+      end
+    }
+  end
+
+  ##########################
+
+  private
+
+  def make_menubar
+    menuspec = [
+      [['File']]
+    ]
+    if Tk::PLATFORM['platform'] != 'unix'
+      TkConsole.create
+      TkConsole.eval('.console conf -height 8')
+      menuspec[0] << ['Console', proc{
+          if TkComm.bool(TkConsole.eval('winfo ismapped .'))
+            TkConsole.hide
+          else
+            TkConsole.show
+          end
+        }]
+    end
+    menuspec[0] << ['View Source', proc{toggle_source_window()}]
+    menuspec[0] << ['Quit', proc{exit}]
+    Tk.root.add_menubar(menuspec)
+  end
+
+  def make_source_window
+    @src_top = TkToplevel.new
+    f = TkFrame.new(@src_top, :borderwidth=>0)
+    case @thisPlatform
+    when 'macintosh', 'macos'
+      font = TkFont.new(['Geneva', 9])
+    when 'unix'
+      font = TkFont.new(['Courier', -12])
+    else
+      font = TkFont.new(['Courier', 9])
+    end
+
+    @src_txt = TkText.new(f, :font=>font, :tabs=>font.measure('1234'), 
+                          :wrap=>:none)
+    xscr = @src_txt.xscrollbar(TkScrollbar.new(f))
+    yscr = @src_txt.yscrollbar(TkScrollbar.new(f))
+
+    f.pack(:expand=>true, :fill=>:both)
+    f.grid_columnconfigure(0, :weight=>1)
+    f.grid_rowconfigure(0, :weight=>1)
+    @src_txt.grid(:row=>0, :column=>0, :sticky=>:news)
+    xscr.grid(:row=>1, :column=>0, :sticky=>:we)
+    yscr.grid(:row=>0, :column=>1, :sticky=>:ns)
+
+    @src_top.protocol('WM_DELETE_WINDOW', proc{@src_top.withdraw})
+    @src_top.geometry('-0+0')
+    @src_top.withdraw
+  end
+
+  def show_source(file)
+    @src_top.title("Demo Source: #{file}")
+    @src_txt.value = IO.read(File.join(@ScriptDir, file))
+    @src_txt.set_insert('1.0')
+  end
+
+  def toggle_source_window
+    if @src_top.winfo_mapped?
+      @src_top.withdraw
+    else
+      @src_top.deiconify
+    end
+  end
+
+  def tree_plus_scrollbars_in_a_frame(parent, h, v)
+    f = TkFrame.new(parent, :borderwidth=>1, :relief=>:sunken)
+    case @thisPlatform
+    when 'macintosh'
+      font = TkFont.new(['Geneva', 9])
+    when 'macos'
+      font = TkFont.new(['Lucida Grande', 11])
+    when 'unix'
+      font = TkFont.new(['Helvetica', -12])
+    else
+      # There is a bug on my Win98 box with Tk_MeasureChars() and
+      # MS Sans Serif 8.
+      font = TkFont.new(['MS Sans', 8])
+    end
+
+    tree = Tk::TreeCtrl.new(f, :highlightthickness=>0, 
+                            :borderwidth=>0, :font=>font)
+    tree[:xscrollincrement] = 20
+    tree.debug_configure(:enable=>false, :display=>false)
+
+    if h
+      h_scr = TkScrollbar.new(f, :orient=>:horizontal, 
+                              :command=>proc{|*args| tree.xview(*args)})
+      tree.notify_bind(h_scr, 'Scroll-x', 
+                       proc{|w, l, u| w.set(l, u)}, '%W %l %u')
+      h_scr.bind('ButtonPress-1', proc{tree.set_focus})
+    end
+
+    if v
+      v_scr = TkScrollbar.new(f, :orient=>:vertical, 
+                              :command=>proc{|*args| tree.yview(*args)})
+      tree.notify_bind(v_scr, 'Scroll-y', 
+                       proc{|w, l, u| w.set(l, u)}, '%W %l %u')
+      v_scr.bind('ButtonPress-1', proc{tree.set_focus})
+    end
+
+    f.grid_columnconfigure(0, :weight=>1)
+    f.grid_rowconfigure(0, :weight=>1)
+    tree.grid(:row=>0, :column=>0, :sticky=>:news)
+    h_scr.grid(:row=>1, :column=>0, :sticky=>:we) if h
+    v_scr.grid(:row=>0, :column=>1, :sticky=>:ns) if v
+
+    [f, tree]
+  end
+
+  def make_main_window
+    Tk.root.title('Tk::TreeCtrl Demo')
+
+    case @thisPlatform
+    when 'macintosh', 'macosx'
+      Tk.root.geometry('+40+40')
+    else
+      Tk.root.geometry('+0+30')
+    end
+
+    pane1 = TkPanedWindow.new(:orient=>:vertical, :borderwidth=>0)
+    pane2 = TkPanedWindow.new(:orient=>:horizontal, :borderwidth=>0)
+
+    # Tree + scrollbar: demos
+    f1, @tree1 = tree_plus_scrollbars_in_a_frame(nil, false, true)
+    @tree1.configure(:showbuttons=>false, :showlines=>:false, 
+                    :showroot=>false, :height=>100)
+    if $HasColumnCreate
+      @tree1.column_create(:text=>'List of Demos', 
+                           :expand=>true, :button=>false)
+    else
+      @tree1.column_configure(0, :text=>'List of Demos', 
+                              :expand=>true, :button=>false)
+    end
+
+    # Tree + scrollbar: styles + elements in list
+    f4, @tree4 = tree_plus_scrollbars_in_a_frame(nil, false, true)
+    @tree4.configure(:showroot=>false, :height=>140)
+    if $HasColumnCreate
+      @tree4.column_create(:text=>'Elements and Styles', 
+                           :expand=>true, :button=>false)
+    else
+      @tree4.column_configure(0, :text=>'Elements and Styles', 
+                              :expand=>true, :button=>false)
+    end
+
+    # Tree + scrollbar: styles + elements in selected item
+    f3, @tree3 = tree_plus_scrollbars_in_a_frame(nil, false, true)
+    @tree3.configure(:showroot=>false)
+    if $HasColumnCreate
+      @tree3.column_create(:text=>'Styles in Item', 
+                           :expand=>true, :button=>false)
+    else
+      @tree3.column_configure(0, :text=>'Styles in Item', 
+                              :expand=>true, :button=>false)
+    end
+
+    pane1.add(f1, f4, f3, :height=>150)
+    pane1.pack(:expand=>true, :fill=>:both)
+
+    # Frame on right
+    f2_base = TkFrame.new
+
+    # Tree + scrollbars
+    f2, @tree2 = tree_plus_scrollbars_in_a_frame(f2_base, true, true)
+    @tree2.configure(:indent=>19)
+    @tree2.debug_configure(:enable=>false, :display=>true, 
+                           :erasecolor=>'pink', :displaydelay=>30)
+
+    # Give it a big border to debug drawing
+    @tree2.configure(:borderwidth=>6, :relief=>:ridge, :highlightthickness=>3)
+
+    f2_base.grid_columnconfigure(0, :weight=>1)
+    f2_base.grid_rowconfigure(0, :weight=>1)
+    f2.grid(:row=>0, :column=>0, :sticky=>:news, :pady=>0)
+
+    pane2.add(pane1, :width=>200)
+    pane2.add(f2_base, :width=>450)
+
+    pane2.pack(:expand=>true, :fill=>:both)
+
+    ###
+    # A treectrl widget can generate the following built-in events:
+    # <ActiveItem> called when the active item changes
+    # <Collapse-before> called before an item is closed
+    # <Collapse-after> called after an item is closed
+    # <Expand-before> called before an item is opened
+    # <Expand-after> called after an item is opened
+    # <Selection> called when items are added to or removed from the selection
+    # <Scroll-x> called when horizontal scroll position changes
+    # <Scroll-y> called when vertical scroll position changes
+    #
+    # The application programmer can define custom events to be
+    # generated by the "T notify generate" command. The following events
+    # are generated by the example bindings.
+
+    @tree2.notify_install_event('Header')
+    @tree2.notify_install_detail('Header', 'invoke')
+
+    @tree2.notify_install_event('Drag')
+    @tree2.notify_install_detail('Drag', 'begin')
+    @tree2.notify_install_detail('Drag', 'end')
+    @tree2.notify_install_detail('Drag', 'receive')
+
+    @tree2.notify_install_event('Edit')
+    @tree2.notify_install_detail('Edit', 'accept')
+  end
+
+  def make_list_popup
+    @popup[:bgimg] = TkVariable.new
+    @popup[:bgmode] = TkVariable.new
+    @popup[:debug] = Hash.new{|h, k| h[k] = TkVariable.new}
+    @popup[:doublebuffer] = TkVariable.new
+    @popup[:linestyle] = TkVariable.new
+    @popup[:orient] = TkVariable.new
+    @popup[:selectmode] = TkVariable.new
+    @popup[:show] = Hash.new{|h, k| h[k] = TkVariable.new}
+
+    menuspec = [
+      [ 'Collapse', [], nil, '', {:menu_config=>{:tearoff=>false}} ], 
+
+      [ 'Expand',   [], nil, '', {:menu_config=>{:tearoff=>false}} ]
+    ]
+
+    # if $Version_1_1_OrLater
+    if @has_bgimg
+      menuspec << \
+      [ 'Background Image', 
+        [
+          [ 'none', [@popup[:bgimg], 'none'], nil, '', 
+            {:command=>proc{@tree2.backgroundimage = ''}} ], 
+          [ 'sky',  [@popup[:bgimg], 'sky'],  nil, '', 
+            {:command=>proc{
+                @tree2.backgroundimage = @images[@popup[:bgimg].value]}} ]
+        ], 
+        nil, '', {:menu_config=>{:tearoff=>false}}
+      ]
+    end
+
+    menuspec.concat([
+      [ 'Background Mode', 
+        %w(column index row visindex).collect{|val|
+          [ val, [@popup[:bgmode], val] , nil, '', 
+            {:command=>proc{@tree2.backgroundmode = @popup[:bgmode].value}} ]
+        }, 
+        nil, '', {:menu_config=>{:tearoff=>false}}
+      ],
+
+      [ 'Debug', 
+        [
+          [ 'Data',    @popup[:debug][:data],    nil, '', 
+            {:command=>proc{
+                @tree2.debug_configure(:data=>@popup[:debug][:data].value)
+              }
+            } ], 
+          [ 'Display', @popup[:debug][:display], nil, '', 
+            {:command=>proc{
+                @tree2.debug_configure(:display=>@popup[:debug][:display].value)
+              }
+            } ], 
+          [ 'Enable',  @popup[:debug][:enable],  nil, '', 
+            {:command=>proc{
+                @tree2.debug_configure(:enable=>@popup[:debug][:enable].value)
+              }
+            } ]
+        ], 
+        nil, '', {:menu_config=>{:tearoff=>false}}
+      ],
+
+      [ 'Buffering', 
+        [
+          [ 'none',   [@popup[:doublebuffer], 'none'],   nil, '', 
+            {:command=>proc{
+                @tree2.doublebuffer = @popup[:doublebuffer].value
+              }
+            } ], 
+          [ 'item',   [@popup[:doublebuffer], 'item'],   nil, '', 
+            {:command=>proc{
+                @tree2.doublebuffer = @popup[:doublebuffer].value
+              }
+            } ], 
+          [ 'window', [@popup[:doublebuffer], 'window'], nil, '', 
+            {:command=>proc{
+                @tree2.doublebuffer = @popup[:doublebuffer].value
+              }
+            } ]
+        ],
+        nil, '', {:menu_config=>{:tearoff=>false}}
+      ],
+
+      [ 'Line style', 
+        [
+          [ 'dot',   [@popup[:linestyle], 'dot'],   nil, '', 
+            {:command=>proc{@tree2.linestyle = @popup[:linestyle].value}} ], 
+          [ 'solid', [@popup[:linestyle], 'solid'], nil, '', 
+            {:command=>proc{@tree2.linestyle = @popup[:linestyle].value}} ]
+        ], 
+        nil, '', {:menu_config=>{:tearoff=>false}}
+      ],
+
+      [ 'Orient', 
+        [
+          [ 'Horizontal', [@popup[:orient], 'horizontal'], nil, '', 
+            {:command=>proc{@tree2.orient = @popup[:orient].value}} ], 
+          [ 'Vertical',   [@popup[:orient], 'vertical'],   nil, '', 
+            {:command=>proc{@tree2.orient = @popup[:orient].value}} ]
+        ], 
+        nil, '', {:menu_config=>{:tearoff=>false}}
+      ],
+
+      [ 'Selectmode', 
+        %w(list browse extended multiple single).collect{|val|
+          [ val, [@popup[:selectmode], val] , nil, '', 
+            {:command=>proc{@tree2.selectmode = @popup[:selectmode].value}} ]
+        }, 
+        nil, '', {:menu_config=>{:tearoff=>false}}
+      ],
+
+      [ 'Show', 
+        [
+          [ 'Buttons', @popup[:show][:buttons], nil, '', 
+            {:command=>proc{
+                @tree2.showbuttons = @popup[:show][:buttons].value
+              }
+            } ], 
+          [ 'Header', @popup[:show][:header], nil, '', 
+            {:command=>proc{
+                @tree2.showheader = @popup[:show][:header].value
+              }
+            } ], 
+          [ 'Lines', @popup[:show][:lines], nil, '', 
+            {:command=>proc{
+                @tree2.showlines = @popup[:show][:lines].value
+              }
+            } ], 
+          [ 'Root', @popup[:show][:root], nil, '', 
+            {:command=>proc{
+                @tree2.showroot = @popup[:show][:root].value
+              }
+            } ], 
+          [ 'Root Button', @popup[:show][:rootbutton], nil, '', 
+            {:command=>proc{
+                @tree2.showrootbutton = @popup[:show][:rootbutton].value
+              }
+            } ]
+        ], 
+        nil, '', {:menu_config=>{:tearoff=>false}}
+      ],
+
+      [ 'Visible', [], nil, '', {:menu_config=>{:tearoff=>false}} ]
+    ])
+
+    m = TkMenu.new_menuspec(menuspec, @tree2, false)
+    @non_clear_list << m
+    @mTree[@tree2] = m
+  end
+
+  def show_list_popup(w, x, y, rootx, rooty)
+    id = w.identify(x, y)
+    unless id.empty?
+      if id[0] == 'header'
+        col = id[1]
+        @popup[:column].value = col
+        @popup[:arrow].value = w.column_cget(col, :arrow)
+        @popup[:arrowside].value = w.column_cget(col, :arrowside)
+        @popup[:arrowgravity].value = w.column_cget(col, :arrowgravity)
+        @popup[:expand].value = w.column_cget(col, :expand)
+        @popup[:squeeze].value = w.column_cget(col, :squeeze)
+        @popup[:justify].value = w.column_cget(col, :justify)
+        @mHeader[w].popup(rootx, rooty)
+        return
+      end
+    end
+
+    m = @mTree[w].entrycget('Collapse', :menu)
+    m.delete(0, :end)
+    if $Version_1_1_OrLater
+      m.add_command(:label=>'All', :command=>proc{w.item_collapse(:all)})
+    else
+      m.add_command(:label=>'All', :command=>proc{w.collapse(:all)})
+    end
+    unless id.empty?
+      if id[0] == 'item'
+        item = id[1]
+        if $Version_1_1_OrLater
+          m.add_command(:label=>"Item #{item}", 
+                        :command=>proc{w.item_collapse(item)})
+          m.add_command(:label=>"Item #{item} (recurse)", 
+                        :command=>proc{w.item_collapse_recurse(item)})
+        else
+          m.add_command(:label=>"Item #{item}", 
+                        :command=>proc{w.collapse(item)})
+          m.add_command(:label=>"Item #{item} (recurse)", 
+                        :command=>proc{w.collapse_recurse(item)})
+        end
+      end
+    end
+
+    m = @mTree[w].entrycget('Expand', :menu)
+    m.delete(0, :end)
+    if $Version_1_1_OrLater
+      m.add_command(:label=>'All', :command=>proc{w.item_expand(:all)})
+    else
+      m.add_command(:label=>'All', :command=>proc{w.expand(:all)})
+    end
+    unless id.empty?
+      if id[0] == 'item'
+        item = id[1]
+        if $Version_1_1_OrLater
+          m.add_command(:label=>"Item #{item}", 
+                        :command=>proc{w.item_expand(item)})
+          m.add_command(:label=>"Item #{item} (recurse)", 
+                        :command=>proc{w.item_expand_recurse(item)})
+        else
+          m.add_command(:label=>"Item #{item}", 
+                        :command=>proc{w.expand(item)})
+          m.add_command(:label=>"Item #{item} (recurse)", 
+                        :command=>proc{w.expand_recurse(item)})
+        end
+      end
+    end
+
+    [:data, :display, :enable].each{|k|
+      @popup[:debug][k].value = w.debug_cget(k)
+    }
+    # if $Version_1_1_OrLater
+    if @has_bgimg
+      @popup[:bgimg].value = @images.key(w[:backgroundimage])
+    end
+    @popup[:bgmode].value = w[:backgroundmode]
+    @popup[:doublebuffer].value = w[:doublebuffer]
+    @popup[:linestyle].value = w[:linestyle]
+    @popup[:orient].value = w[:orient]
+    @popup[:selectmode].value = w[:selectmode]
+    @popup[:show][:buttons].value = w[:showbuttons]
+    @popup[:show][:header].value = w[:showheader]
+    @popup[:show][:lines].value = w[:showlines]
+    @popup[:show][:root].value = w[:showroot]
+    @popup[:show][:rootbutton].value = w[:showrootbutton]
+
+    m = @mTree[w].entrycget('Visible', :menu)
+    m.delete(0, :end)
+    @popup[:visible] = []
+    (0...(w.numcolumns)).each{|i|
+      @popup[:visible][i] = TkVariable.new(w.column_cget(i, :visible))
+      txt = w.column_cget(i, :text)
+      img_name = w.column_cget(i, :image)
+      img_name = @images.key(img_name) if img_name.kind_of?(TkImage)
+      m.add_checkbutton(:variable=>@popup[:visible][i], 
+                        :label=>"Column #{i} \"#{txt}\" [#{img_name}]", 
+                        :command=>proc{w.column_configure(i, :visible=>@popup[:visible][i].value)})
+    }
+
+    @mTree[w].popup(rootx, rooty)
+  end
+
+  def make_header_popup
+    @popup[:column] = TkVariable.new unless @popup[:column]
+    @popup[:arrow] = TkVariable.new
+    @popup[:arrowside] = TkVariable.new
+    @popup[:arrowgravity] = TkVariable.new
+    @popup[:expand] = TkVariable.new
+    @popup[:squeeze] = TkVariable.new
+    @popup[:justify] = TkVariable.new
+
+    menuspec = [
+      [ 'Arrow', 
+        [
+          [ 'None', [@popup[:arrow], 'none'], nil, '', 
+            {:command=>proc{
+                @tree2.column_configure(@popup[:column].value, :arrow=>:none)
+              }
+            } ],
+          [ 'Up', [@popup[:arrow], 'up'], nil, '', 
+            {:command=>proc{
+                @tree2.column_configure(@popup[:column].value, :arrow=>:up)
+              }
+            } ],
+          [ 'Down', [@popup[:arrow], 'down'], nil, '', 
+            {:command=>proc{
+                @tree2.column_configure(@popup[:column].value, :arrow=>:down)
+              }
+            } ],
+
+          '---', 
+
+          [ 'Side Left', [@popup[:arrowside], 'left'], nil, '', 
+            {:command=>proc{
+                @tree2.column_configure(@popup[:column].value, 
+                                        :arrowside=>:left)
+              }
+            } ],
+          [ 'Side Right', [@popup[:arrowside], 'right'], nil, '', 
+            {:command=>proc{
+                @tree2.column_configure(@popup[:column].value, 
+                                        :arrowside=>:right)
+              }
+            } ],
+
+          '---', 
+
+          [ 'Gravity Left', [@popup[:arrowgravity], 'left'], nil, '', 
+            {:command=>proc{
+                @tree2.column_configure(@popup[:column].value, 
+                                        :arrowgravity=>:left)
+              }
+            } ],
+          [ 'Gravity Right', [@popup[:arrowgravity], 'right'], nil, '', 
+            {:command=>proc{
+                @tree2.column_configure(@popup[:column].value, 
+                                        :arrowgravity=>:right)
+              }
+            } ],
+        ], 
+        nil, '', {:menu_config=>{:tearoff=>false}} ], 
+
+      [ 'Expand',  @popup[:expand],  nil, '', 
+        {:command=>proc{
+            @tree2.column_configure(@popup[:column].value, 
+                                    :expand=>@popup[:expand].value)
+          }
+        } ],
+
+      [ 'Squeeze', @popup[:squeeze], nil, '', 
+        {:command=>proc{
+            @tree2.column_configure(@popup[:column].value, 
+                                    :squeeze=>@popup[:squeeze].value)
+          }
+        } ],
+
+      [ 'Justify', 
+        [
+          [ 'Left', [@popup[:justify], 'left'], nil, '', 
+            {:command=>proc{
+                @tree2.column_configure(@popup[:column].value, :justify=>:left)
+              }
+            } ],
+          [ 'Center', [@popup[:justify], 'center'], nil, '', 
+            {:command=>proc{
+                @tree2.column_configure(@popup[:column].value, 
+                                        :justify=>:center)
+              }
+            } ],
+          [ 'Right', [@popup[:justify], 'right'], nil, '', 
+            {:command=>proc{
+                @tree2.column_configure(@popup[:column].value, 
+                                        :justify=>:right)
+              }
+            } ]
+        ], 
+        nil, '', {:menu_config=>{:tearoff=>false}} ]
+    ]
+
+    m = TkMenu.new_menuspec(menuspec, @tree2, false)
+    @non_clear_list << m
+    @mHeader[@tree2] = m
+  end
+
+  ###########################
+
+  def init_demo_scripts_module
+    @demo_scripts = Module.new
+
+    master = self
+
+    has_bgimg = @has_bgimg
+
+    scriptDir = @ScriptDir
+
+    thisPlatform = @thisPlatform
+
+    randomN = @RandomN
+
+    images = @images
+    sel_images = @sel_images
+
+    systemButtonFace = @SystemButtonFace
+    systemHighlight  = @SystemHighlight
+    systemHighlightText = @SystemHighlightText
+
+    def master._pub_display_styles_in_item(item)
+      display_styles_in_item(item)
+    end
+    proc_disp_styles_in_item = proc{|item| 
+      master._pub_display_styles_in_item(item)
+    }
+
+    @demo_scripts.instance_eval{
+      @master = master
+
+      @has_bgimg = has_bgimg
+
+      @display_styles_in_item = proc_disp_styles_in_item
+
+      @Priv = TkVarAccess.new('::TreeCtrl::Priv')
+
+      @ScriptDir = scriptDir
+
+      @thisPlatform = thisPlatform
+
+      @RandomN = randomN
+
+      @images = images
+      @sel_images = sel_images
+
+      @SystemButtonFace = systemButtonFace
+      @SystemHighlight  = systemHighlight
+      @SystemHighlightText = systemHighlightText
+    }
+
+    class << @demo_scripts
+      def _get_binding
+        binding
+      end
+      private :_get_binding
+
+      def load_demo(file)
+        puts "load \"#{file}\"" if $DEBUG
+        begin
+          eval(IO.readlines(file).join, _get_binding())
+        rescue Exception => e
+          bt = e.backtrace
+
+          if bt[0] =~ /^([^:]+):(\d+):/
+            errline = $2.to_i
+          else
+            raise e
+          end
+
+          if bt[1] =~ /^([^:]+):(\d+):/
+            bt.unshift("#{file}:#{errline - $2.to_i + 1}")
+            raise e
+          else
+            raise e
+          end
+        end
+      end
+
+      def init_pics(*args)
+        @master.init_pics(*args)
+      end
+    end
+  end
+
+  def load_demo_scripts
+    # demo sources
+    [
+      'bitmaps',  
+      'explorer', 
+      'help', 
+      'imovie', 
+      'layout', 
+      'mailwasher', 
+      'outlook-folders', 
+      'outlook-newgroup', 
+      'random', 
+      'www-options'
+    ].each{|f|
+      @demo_scripts.load_demo(File.join(@ScriptDir, "#{f}.rb"))
+    }
+  end
+
+  ###########################
+
+  def init_demo_list
+    @tree1.element_create('e1', :text, 
+                          :fill=>[@SystemHighlightText, ['selected', 'focus']])
+    @tree1.element_create('e2', :rect, :showfocus=>true, 
+                          :fill=>[
+                            @SystemHighlight, ['selected', 'focus'], 
+                            'gray', ['selected', '!focus'], 
+                          ])
+    @tree1.style_create('s1')
+    @tree1.style_elements('s1', ['e2', 'e1'])
+
+    # Tk listbox has linespace + 1 height
+    @tree1.style_layout('s1', 'e2', :union=>['e1'], 
+                        :ipadx=>2, :ipady=>[0, 1], :iexpand=>:e)
+
+    if $Version_1_1_OrLater
+      @tree1.defaultstyle = 's1'
+    end
+
+    ###
+    [
+      ["Random #{@RandomN[0]} Items", :demoRandom, 'random.rb'], 
+      ["Random #{@RandomN[0]} Items, Button Images", :demoRandom2, 'random.rb'], 
+      ["Outlook Express (Folders)", :demoOutlookFolders, 'outlook-folders.rb'],
+      ["Outlook Express (Newsgroup)", :demoOutlookNewsgroup, 'outlook-newgroup.rb'], 
+      ["Explorer (Details)", :demoExplorerDetails, 'explorer.rb'], 
+      ["Explorer (List)", :demoExplorerList, 'explorer.rb'], 
+      ["Explorer (Large icons)", :demoExplorerLargeIcons, 'explorer.rb'], 
+      ["Explorer (Small icons)", :demoExplorerSmallIcons, 'explorer.rb'], 
+      ["Internet Options", :demoInternetOptions, 'www-options.rb'], 
+      ["Help Contents", :demoHelpContents, 'help.rb'], 
+      ["Layout", :demoLayout, 'layout.rb'], 
+      ["MailWasher", :demoMailWasher, 'mailwasher.rb'], 
+      ["Bitmaps", :demoBitmaps, 'bitmaps.rb'], 
+      ["iMovie", :demoIMovie, 'imovie.rb']
+    ].each{|label, cmd, file|
+      item = @tree1.item_create
+      @tree1.item_lastchild(:root, item)
+      unless $Version_1_1_OrLater
+        @tree1.item_style_set(item, 0, 's1')
+      end
+      @tree1.item_text(item, 0, label)
+      @demoCmd[item] = cmd
+      @demoFile[item] = file
+    }
+
+    @tree1.yview_moveto(0.0)
+  end
+
+  def demo_set(cmd, file)
+    demo_clear()
+    clicks = Tk::Clock.clicks
+    @demo_scripts.__send__(cmd, @tree2)
+    clicks = Tk::Clock.clicks - clicks
+    puts "set list in #{'%.2g'%(clicks/1000000.0)} seconds (#{clicks} clicks)"
+    @tree2.xview_moveto(0)
+    @tree2.yview_moveto(0)
+    Tk.update
+    display_styles_in_list()
+    show_source(file)
+  end
+
+  def display_styles_in_list
+    # Create elements and styles the first time this is called
+    if @tree4.style_names.empty?
+      @tree4.element_create('e1', :text, 
+                            :fill=>[@SystemHighlightText,['selected','focus']])
+      @tree4.element_create('e2', :text, 
+                            :fill=>[
+                              @SystemHighlightText, ['selected','focus'], 
+                              '', ['selected','!focus'], 
+                              'blue', []
+                            ])
+      @tree4.element_create('e3', :rect, :showfocus=>true, 
+                            :fill=>[
+                              @SystemHighlight, ['selected','focus'],
+                              'gray', ['selected', '!focus']
+                            ])
+
+      @tree4.style_create('s1')
+      @tree4.style_elements('s1', ['e3', 'e1'])
+      @tree4.style_layout('s1', 'e3', :union=>['e1'], :ipadx=>1, :ipady=>[0,1])
+
+      @tree4.style_create('s2')
+      @tree4.style_elements('s2', ['e3', 'e1', 'e2'])
+      @tree4.style_layout('s2', 'e1', :padx=>[0,4])
+      @tree4.style_layout('s2', 'e3', :union=>['e1', 'e2'], 
+                          :ipadx=>1, :ipady=>[0,1])
+    end
+
+    # Clear the list
+    @tree4.item_delete(:all)
+    
+    # One item for each element in the demo list
+    @tree2.element_names.sort.each{|elem|
+      if $Version_1_1_OrLater
+        item = @tree4.item_create(:button=>true)
+        @tree4.item_collapse(item)
+      else
+        item = @tree4.item_create
+        @tree4.item_hasbutton(item, true)
+        @tree4.collapse(item)
+      end
+      @tree4.item_style_set(item, 0, 's1')
+      @tree4.item_text(item, 0, 
+                       "Element #{elem} (#{@tree2.element_type(elem)})")
+
+      # One item for each configuration option for this element
+      @tree2.element_configinfo(elem).each{|name, x, y, default, current|
+        item2 = @tree4.item_create
+
+        if default == current
+          @tree4.item_style_set(item2, 0, 's1')
+          @tree4.item_complex(item2, [
+                                ['e1', {:text=>"#{name} #{current.inspect}"}]
+                              ])
+        else
+          @tree4.item_style_set(item2, 0, 's2')
+          @tree4.item_complex(item2, [
+                                ['e1', {:text=>name}], 
+                                ['e2', {:text=>current.inspect}]
+                              ])
+        end
+
+        @tree4.item_lastchild(item, item2)
+      }
+
+      @tree4.item_lastchild(:root, item)
+    }
+
+    # One item for each style in the demo list
+    @tree2.style_names.sort.each{|sty|
+      if $Version_1_1_OrLater
+        item = @tree4.item_create(:button=>true)
+        @tree4.item_collapse(item)
+      else
+        item = @tree4.item_create
+        @tree4.item_hasbutton(item, true)
+        @tree4.collapse(item)
+      end
+      @tree4.item_style_set(item, 0, 's1')
+      @tree4.item_text(item, 0, "Style #{sty}")
+
+      # One item for each element in the style
+      @tree2.style_elements(sty).each{|elem|
+        if $Version_1_1_OrLater
+          item2 = @tree4.item_create(:button=>true)
+          @tree4.item_collapse(item2)
+        else
+          item2 = @tree4.item_create
+          @tree4.item_hasbutton(item2, true)
+          @tree4.collapse(item2)
+        end
+        @tree4.item_style_set(item2, 0, 's1')
+        @tree4.item_text(item2, 0, 
+                         "Element #{elem} (#{@tree2.element_type(elem)})")
+
+        # One item for each layout option for this element in this style
+        @tree2.style_layout(sty, elem).each{|k, v|
+          item3 = @tree4.item_create
+          unless $Version_1_1_OrLater
+            @tree4.item_hasbutton(item3, false)
+          end
+          @tree4.item_style_set(item3, 0, 's1')
+          @tree4.item_text(item3, 0, "#{k} #{v.inspect}")
+          @tree4.item_lastchild(item2, item3)
+        }
+
+        @tree4.item_lastchild(item, item2)
+      }
+
+      @tree4.item_lastchild(:root, item)
+    }
+
+    @tree4.xview_moveto(0)
+    @tree4.yview_moveto(0)
+  end
+
+  def display_styles_in_item(item)
+    @tree3.column_configure(0, :text=>"Styles in item #{@tree2.index(item)}")
+
+    # Create elements and styles the first time this is called
+    if @tree3.style_names.empty?
+      @tree3.element_create('e1', :text, 
+                            :fill=>[@SystemHighlightText,['selected','focus']])
+      @tree3.element_create('e2', :text, 
+                            :fill=>[
+                              @SystemHighlightText, ['selected','focus'], 
+                              '', ['selected','!focus'], 
+                              'blue', []
+                            ])
+      @tree3.element_create('e3', :rect, :showfocus=>true, 
+                            :fill=>[
+                              @SystemHighlight, ['selected','focus'],
+                              'gray', ['selected', '!focus']
+                            ])
+
+      @tree3.style_create('s1')
+      @tree3.style_elements('s1', ['e3', 'e1'])
+      @tree3.style_layout('s1', 'e3', :union=>['e1'], :ipadx=>1, :ipady=>[0,1])
+
+      @tree3.style_create('s2')
+      @tree3.style_elements('s2', ['e3', 'e1', 'e2'])
+      @tree3.style_layout('s2', 'e1', :padx=>[0,4])
+      @tree3.style_layout('s2', 'e3', :union=>['e1', 'e2'], 
+                          :ipadx=>1, :ipady=>[0,1])
+    end
+    # Clear the list
+    @tree3.item_delete(:all)
+
+    # One item for each item-column
+    column = 0
+    @tree2.item_style_set(item).each{|sty|
+      item2 = @tree3.item_create
+      if $Version_1_1_OrLater
+        @tree3.item_collapse(item2)
+      else
+        @tree3.collapse(item2)
+      end
+      @tree3.item_style_set(item2, 0, 's1')
+      @tree3.item_element_configure(item2, 0, 'e1', 
+                                    :text=>"Column #{column}: Style #{sty}")
+
+      button = false
+
+      # One item for each element in this style
+      unless sty.to_s.empty?
+        @tree2.item_style_elements(item, column).each{|elem|
+          button = true
+          if $Version_1_1_OrLater
+            item3 = @tree3.item_create(:button=>true)
+          else
+            item3 = @tree3.item_create
+            @tree3.item_hasbutton(item3, true)
+          end
+          if $Version_1_1_OrLater
+            @tree3.item_collapse(item3)
+          else
+            @tree3.collapse(item3)
+          end
+          @tree3.item_style_set(item3, 0, 's1')
+          @tree3.item_element_configure(item3, 0, 'e1', 
+                                        :text=>"Element #{elem} (#{@tree2.element_type(elem)})")
+
+          # One item for each configuration option in this element
+          @tree2.item_element_configinfo(item, column, elem) \
+          .each{|name, x, y, default, current|
+            item4 = @tree3.item_create
+            masterDefault = @tree2.element_cget(elem, name)
+            sameAsMaster = (masterDefault == current)
+            if !sameAsMaster && current == ''
+              sameAsMaster = true
+              current = masterDefault
+            end
+
+            if sameAsMaster
+              @tree3.item_style_set(item4, 0, 's1')
+              @tree3.item_complex(item4, [
+                                    ['e1', 
+                                      {:text=>"#{name} #{current.inspect}"}]
+                                  ])
+            else
+              @tree3.item_style_set(item4, 0, 's2')
+              @tree3.item_complex(item4, [
+                                    ['e1', {:text=>name}], 
+                                    ['e2', {:text=>current.inspect}]
+                                  ])
+            end
+            @tree3.item_lastchild(item3, item4)
+          }
+          @tree3.item_lastchild(item2, item3)
+        }
+        if $Version_1_1_OrLater
+          @tree3.item_configure(item2, :button=>true) if button
+        else
+          @tree3.item_hasbutton(item2, true) if button
+        end
+      end
+      @tree3.item_lastchild(:root, item2)
+      column += 1
+    }
+
+    @tree3.xview_moveto(0)
+    @tree3.yview_moveto(0)
+  end
+
+  def demo_clear
+    # Clear the demo list
+    @tree2.item_delete(:all)
+
+    # Clear all bindings on the demo list added by the previous demo.
+    # This is why DontDelete is used for the <Selection> binding.
+    @tree2.notify_bindinfo(@tree2).each{|ev|
+      @tree2.notify_bind_remove(@tree2, ev)
+    }
+
+    # Clear all run-time states
+    @tree2.state_names.each{|st| @tree2.state_undefine(st) }
+
+    # Clear the styles-in-item list
+    @tree3.item_delete(:all)
+
+    # Delete columns in demo list
+    while (@tree2.numcolumns > 0)
+      @tree2.column_delete(0)
+    end
+
+    # Delete all styles in demo list
+    @tree2.style_delete(*(@tree2.style_names))
+
+    # Delete all elements in demo list
+    @tree2.element_delete(*(@tree2.element_names))
+
+    if $Version_1_1_OrLater
+      @tree2.item_configure(:root, :button=>false)
+      @tree2.item_expand(:root)
+    else
+      @tree2.item_hasbutton(:root, false)
+      @tree2.expand(:root)
+    end
+
+    # Restore some happy defaults to the demo list
+    # if $Version_1_1_OrLater
+    if @has_bgimg
+      @tree2.configure(:orient=>:vertical, :wrap=>'', 
+                       :xscrollincrement=>0, :yscrollincrement=>0, 
+                       :itemheight=>0, :showheader=>true, 
+                       :background=>'white', :scrollmargin=>0, 
+                       :xscrolldelay=>50, :yscrolldelay=>50, 
+                       :openbuttonimage=>'', :closedbuttonimage=>'', 
+                       :backgroundmode=>:row, :treecolumn=>0, :indent=>19, 
+                       :defaultstyle=>'', :backgroundimage=>'')
+    else
+      @tree2.configure(:orient=>:vertical, :wrap=>'', 
+                       :xscrollincrement=>0, :yscrollincrement=>0, 
+                       :itemheight=>0, :showheader=>true, 
+                       :background=>'white', :scrollmargin=>0, 
+                       :xscrolldelay=>50, :yscrolldelay=>50, 
+                       :openbuttonimage=>'', :closedbuttonimage=>'', 
+                       :backgroundmode=>:row, :treecolumn=>0, :indent=>19)
+    end
+
+    # Restore default bindings to the demo list
+    @tree2.bindtags = [ @tree2, Tk::TreeCtrl, @tree2.winfo_toplevel, :all ]
+
+    @tree2.winfo_children.each{|w| 
+      w.destroy unless @non_clear_list.include?(w)
+    }
+  end
+end
+
+TkTreeCtrl_demo.new($ScriptDir)
+
+##############################################
+
+def cursor_window(top = nil)
+  top.destroy if top.kind_of?(TkWindow) && top.winfo_exist?
+  top = TkToplevel.new(:title=>'Cursor Window')
+
+  c = TkCanvas.new(top, :background=>'white', 
+                   :width=>50*10, :highlightthickness=>0, 
+                   :borderwidth=>0).pack(:expand=>true, :fill=>:both)
+  cursors = %w(
+	X_cursor
+	arrow
+	based_arrow_down
+	based_arrow_up
+	boat
+	bogosity
+	bottom_left_corner
+	bottom_right_corner
+	bottom_side
+	bottom_tee
+	box_spiral
+	center_ptr
+	circle
+	clock
+	coffee_mug
+	cross
+	cross_reverse
+	crosshair
+	diamond_cross
+	dot
+	dotbox
+	double_arrow
+	draft_large
+	draft_small
+	draped_box
+	exchange
+	fleur
+	gobbler
+	gumby
+	hand1
+	hand2
+	heart
+	icon
+	iron_cross
+	left_ptr
+	left_side
+	left_tee
+	leftbutton
+	ll_angle
+	lr_angle
+	man
+	middlebutton
+	mouse
+	pencil
+	pirate
+	plus
+	question_arrow
+	right_ptr
+	right_side
+	right_tee
+	rightbutton
+	rtl_logo
+	sailboat
+	sb_down_arrow
+	sb_h_double_arrow
+	sb_left_arrow
+	sb_right_arrow
+	sb_up_arrow
+	sb_v_double_arrow
+	shuttle
+	sizing
+	spider
+	spraycan
+	star
+	target
+	tcross
+	top_left_arrow
+	top_left_corner
+	top_right_corner
+	top_side
+	top_tee
+	trek
+	ul_angle
+	umbrella
+	ur_angle
+	watch
+	xterm
+    )
+
+  orig_cursor = c.cursor
+  col = 0
+  row = 0
+
+  cursors.each{|cur|
+    x = col * 50
+    y = row * 40
+
+    begin
+      c.cursor = cur
+
+      r = TkcRectangle.new(c, x, y, x+50, y+40, 
+                           :fill=>'gray90', :outline=>'black', :width=>2)
+      t = TkcText.new(c, x+50/2, y+4, :text=>cur, :anchor=>:n, :width=>42)
+
+      col += 1
+      if col >= 10
+        col = 0
+        row += 1
+      end
+
+      r.bind('Enter', proc{c.cursor = cur; r.fill = 'linen'})
+      r.bind('Leave', proc{c.cursor = ''; r.fill = 'gray90'})
+
+      t.bind('Enter', proc{c.cursor = cur})
+      t.bind('Leave', proc{c.cursor = ''})
+    rescue
+      c.cursor = orig_cursor
+    end
+  }
+
+  c.cursor = orig_cursor
+  c.height = (row + 1) * 40
+end
+
+cursor_window()
+
+##############################################
+
+# A little screen magnifier for X11
+if Tk::PLATFORM['platform'] == 'unix' && Tk.windowingsystem != 'aqua'
+  def show_loupe(setting=nil)
+    loupe = (setting.kind_of?(Hash))? setting: {}
+    loupe[:zoom] = 3 unless loupe[:zoom]
+    loupe[:x] = 0 unless loupe[:x]
+    loupe[:y] = 0 unless loupe[:y]
+    loupe[:auto] = true unless loupe[:auto]
+    loupe[:delay] = 500 unless loupe[:delay]
+    loupe[:image] = 
+      TkPhotoImage.new(:width=>150, :height=>150) unless loupe[:image]
+
+    top = TkToplevel.new(:geometry=>'-0+30', 
+                         :title=>'A little screen magnifier for X11')
+    TkLabel.new(top, :image=>loupe[:image]).pack
+
+    TkTimer.new(proc{loupe[:delay]}, -1, proc{
+                  x, y = TkWinfo.pointerxy(Tk.root)
+                  if loupe[:auto] || loupe[:x] != x || loupe[:y] != y
+                    w = loupe[:image].width
+                    h = loupe[:image].height
+                    Tk::TreeCtrl.loupe(loupe[:image], x, y, w, h, loupe[:zoom])
+                    loupe[:x] = x
+                    loupe[:y] = y
+                  end
+                }).start
+  end
+
+  show_loupe()
+end
+
+##############################################
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/explorer.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/explorer.rb
new file mode 100644
index 0000000000..242777cbce
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/explorer.rb
@@ -0,0 +1,430 @@
+
+def demoExplorerAux(t, dir_proc, file_proc)
+  base_dir = File.dirname(File.dirname(@ScriptDir))
+
+  clicks = Tk::Clock.clicks
+  globDirs = Dir.glob(File.join(base_dir, '*')).find_all{|file|
+    FileTest.directory?(file)
+  }
+  clickGlobDirs = Tk::Clock.clicks - clicks
+
+  clicks = Tk::Clock.clicks
+  list = globDirs.sort
+  clickSortDirs = Tk::Clock.clicks - clicks
+
+  clicks = Tk::Clock.clicks
+  list.each{|file| dir_proc.call(file)}
+  clickAddDirs = Tk::Clock.clicks - clicks
+
+  clicks = Tk::Clock.clicks
+  globFiles = Dir.glob(File.join(base_dir, '*')).find_all{|file|
+    FileTest.file?(file)
+  }
+  clickGlobFiles = Tk::Clock.clicks - clicks
+
+  clicks = Tk::Clock.clicks
+  list = globFiles.sort
+  clickSortFiles = Tk::Clock.clicks - clicks
+
+  clicks = Tk::Clock.clicks
+  list.each{|file| file_proc.call(file)}
+  clickAddFiles = Tk::Clock.clicks - clicks
+
+  gd = '%.2g' % (clickGlobDirs / 1000000.0)
+  sd = '%.2g' % (clickSortDirs / 1000000.0)
+  ad = '%.2g' % (clickAddDirs  / 1000000.0)
+  gf = '%.2g' % (clickGlobFiles / 1000000.0)
+  sf = '%.2g' % (clickSortFiles / 1000000.0)
+  af = '%.2g' % (clickAddFiles  / 1000000.0)
+
+  puts "dirs(#{globDirs.length}) glob/sort/add #{gd}/#{sd}/#{ad}    files(#{globFiles.length}) glob/sort/add #{gf}/#{sf}/#{af}"
+
+  @Priv[:DirCnt, t] = globDirs.length
+end
+
+#
+# Demo: explorer files
+#
+def demoExplorerDetails(t)
+  height = t.font.metrics(:linespace)
+  height = 18 if height < 18
+
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+              :itemheight=>height, :selectmode=>:extended, 
+              :xscrollincrement=>20, :scrollmargin=>16, 
+              :xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
+
+  init_pics('small-*')
+
+  if $HasColumnCreate
+    t.column_create(:text=>'Name', :tag=>'name', 
+                    :width=>200, :arrow=>:up, :arrowpad=>6)
+    t.column_create(:text=>'Size', :tag=>'size', :justify=>:right, 
+                    :width=>60, :arrowside=>:left, :arrowgravity=>:right)
+    t.column_create(:text=>'Type', :tag=>'type', :width=>120)
+    t.column_create(:text=>'Modified', :tag=>'modified', :width=>130)
+  else
+    t.column_configure(0, :text=>'Name', :tag=>'name', 
+                       :width=>200, :arrow=>:up, :arrowpad=>6)
+    t.column_configure(1, :text=>'Size', :tag=>'size', :justify=>:right, 
+                       :width=>60, :arrowside=>:left, :arrowgravity=>:right)
+    t.column_configure(2, :text=>'Type', :tag=>'type', :width=>120)
+    t.column_configure(3, :text=>'Modified', :tag=>'modified', :width=>130)
+  end
+
+  t.element_create('e1', :image, 
+                   :image=>[
+                     @sel_images['small-folder'], ['selected'], 
+                     @images['small-folder'], []
+                   ])
+  t.element_create('e2', :text, :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
+  t.element_create('txtType', :text, :lines=>1)
+  t.element_create('txtSize', :text, :lines=>1, 
+                   :datatype=>:integer, :format=>'%dKB')
+  t.element_create('txtDate', :text, :lines=>1, 
+                   :datatype=>:time, :format=>'%d/%m/%y %I:%M %p')
+  t.element_create('e4', :rect, :showfocus=>true,
+                   :fill=>[
+                     @SystemHighlight, ['selected', 'focus'], 
+                     'gray', ['selected', '!focus']
+                   ])
+
+  # image + text
+  s = t.style_create('styName', :orient=>:horizontal)
+  t.style_elements(s, ['e4', 'e1', 'e2'])
+  t.style_layout(s, 'e1', :expand=>:ns)
+  t.style_layout(s, 'e2', :padx=>[2,0], :squeeze=>:x, :expand=>:ns)
+  t.style_layout(s, 'e4', :union=>['e2'], :iexpand=>:ns, :ipadx=>2)
+
+  # column 1: text
+  s = t.style_create('stySize')
+  t.style_elements(s, ['txtSize'])
+  t.style_layout(s, 'txtSize', :padx=>6, :squeeze=>:x, :expand=>:ns)
+
+  # column 2: text
+  s = t.style_create('styType')
+  t.style_elements(s, ['txtType'])
+  t.style_layout(s, 'txtType', :padx=>6, :squeeze=>:x, :expand=>:ns)
+
+  # column 3: text
+  s = t.style_create('styDate')
+  t.style_elements(s, ['txtDate'])
+  t.style_layout(s, 'txtDate', :padx=>6, :squeeze=>:x, :expand=>:ns)
+
+  @Priv[:edit, t] = ['e2']
+  @Priv[:sensitive, t] = [ ['name', 'styName', 'e1', 'e2'] ]
+  @Priv[:dragimage, t] = [ ['name', 'styName', 'e1', 'e2'] ]
+
+  t.notify_bind(t, 'Edit-accept', 
+                proc{|w, i, tt| w.item_text(i, 0, tt)}, '%T %I %t')
+
+  dir_proc = proc{|file|
+    item = t.item_create
+    t.item_style_set(item, 0, 'styName', 2, 'styType', 3, 'styDate')
+    t.item_complex(item, 
+                   [['e2', {:text=>File.basename(file)}]], 
+                   [], 
+                   [['txtType', {:text=>'Folder'}]], 
+                   [['txtDate', {:data=>File.mtime(file).tv_sec}]])
+    t.item_lastchild(:root, item)
+  }
+
+  file_proc = proc{|file|
+    item = t.item_create
+    t.item_style_set(item, 0, 'styName', 1, 'stySize', 
+                           2, 'styType', 3, 'styDate')
+
+    ext = File.extname(file)
+    case ext
+    when '.dll'
+      img = 'small-dll'
+    when '.exe'
+      img = 'small-exe'
+    when '.txt'
+      img = 'small-txt'
+    else
+      img = 'small-file'
+    end
+
+    type = ext.upcase
+    type = type[1..-1] << ' ' unless type.empty?
+    type << 'File'
+
+    t.item_complex(item, 
+                   [ 
+                     ['e1', {:image=>[@sel_images[img], ['selected'], 
+                                      @images[img], []]}],
+                     ['e2', {:text=>File.basename(file)}]
+                   ], 
+                   [ ['txtSize', {:data=>File.size(file)/1024 + 1}] ], 
+                   [ ['txtType', {:text=>type}] ], 
+                   [ ['txtDate', {:data=>File.mtime(file).tv_sec}] ]
+                   )
+    t.item_lastchild(:root, item)
+  }
+
+  demoExplorerAux(t, dir_proc, file_proc)
+
+  @SortColumn = 0
+  t.notify_bind(t, 'Header-invoke', 
+                proc{|w, c| explorerHeaderInvoke(t, w, c)}, '%T %C')
+
+  t.bindtags = [ t, 'TreeCtrlFileList', Tk::TreeCtrl, t.winfo_toplevel, :all ]
+end
+
+def explorerHeaderInvoke(t, w, c)
+  if (c == @SortColumn)
+    if t.column_cget(@SortColumn, :arrow) == 'down'
+      order = :increasing
+      arrow = :up
+    else
+      order = :decreasing
+      arrow = :down
+    end
+  else
+    if t.column_cget(@SortColumn, :arrow) == 'down'
+      order = :decreasing
+      arrow = :down
+    else
+      order = :increasing
+      arrow = :up
+    end
+    t.column_configure(@SortColumn, :arrow=>:none)
+    @SortColumn = c
+  end
+
+  t.column_configure(c, :arrow=>arrow)
+  dirCount = TkComm.number(@Priv[:DirCnt, t])
+  lastDir = dirCount - 1
+  case t.column_cget(c, :tag)
+  when 'name'
+    if dirCount > 0
+      t.item_sort(:root, order, {:last=>"root child #{lastDir}"}, 
+                  {:column=>c, :dictionary=>true})
+    end
+    if dirCount < t.numitems - 1
+      t.item_sort(:root, order, {:first=>"root child #{dirCount}"}, 
+                  {:column=>c, :dictionary=>true})
+    end
+
+  when 'size'
+    if dirCount < t.numitems - 1
+      t.item_sort(:root, order, {:first=>"root child #{dirCount}"}, 
+                  {:column=>c, :integer=>true}, 
+                  {:column=>'name', :dictionary=>true})
+    end
+
+  when 'type'
+    if dirCount < t.numitems - 1
+      t.item_sort(:root, order, {:first=>"root child #{dirCount}"}, 
+                  {:column=>c, :dictionary=>true}, 
+                  {:column=>'name', :dictionary=>true})
+    end
+
+  when 'modified'
+    if dirCount > 0
+      t.item_sort(:root, order, {:last=>"root child #{lastDir}"}, 
+                  {:column=>c, :integer=>true}, 
+                  {:column=>'name', :dictionary=>true})
+    end
+    if dirCount < t.numitems - 1
+      t.item_sort(:root, order, {:first=>"root child #{dirCount}"}, 
+                  {:column=>c, :integer=>true}, 
+                  {:column=>'name', :dictionary=>true})
+    end
+
+  end
+end
+
+def demoExplorerLargeIcons(t)
+  # Item height is 32 for icon, 4 padding, 3 lines of text
+  itemHeight = 32 + 4 + t.font.metrics(:linespace) * 3
+
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+              :selectmode=>:extended, :wrap=>:window, :orient=>:horizontal, 
+              :itemheight=>itemHeight, :showheader=>false, :scrollmargin=>16, 
+              :xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
+
+  init_pics('big-*')
+
+  if $HasColumnCreate
+    t.column_create(:width=>75)
+  else
+    t.column_configure(0, :width=>75)
+  end
+
+  t.element_create('elemImg', :image, 
+                   :image=>[
+                     @sel_images['big-folder'], ['selected'], 
+                     @images['big-folder'], []
+                   ])
+  t.element_create('elemTxt', :text, :justify=>:center, 
+                   :lines=>1, :width=>71, :wrap=>:word, 
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
+  t.element_create('elemSel', :rect, :showfocus=>true, 
+                   :fill=>[
+                     @SystemHighlight, ['selected', 'focus'], 
+                     'gray', ['selected']
+                   ])
+
+  # image + text
+  s = t.style_create('STYLE', :orient=>:vertical)
+  t.style_elements(s, ['elemSel', 'elemImg', 'elemTxt'])
+  t.style_layout(s, 'elemImg', :expand=>:we)
+  t.style_layout(s, 'elemTxt', 
+                 :pady=>[4,0], :padx=>2, :squeeze=>:x, :expand=>:we)
+  t.style_layout(s, 'elemSel', :union=>['elemTxt'])
+
+  @Priv[:edit, t] = ['elemTxt']
+  @Priv[:sensitive, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
+  @Priv[:dragimage, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
+
+  t.notify_bind(t, 'Edit-accept', 
+                proc{|w, i, tt| w.item_text(i, 0, tt)}, '%T %I %t')
+
+  dir_proc = proc{|file|
+    item = t.item_create
+    t.item_style_set(item, 0, 'STYLE')
+    t.item_text(item, 0, File.basename(file))
+    t.item_lastchild(:root, item)
+  }
+
+  file_proc = proc{|file|
+    item = t.item_create
+    t.item_style_set(item, 0, 'STYLE')
+
+    ext = File.extname(file)
+    case ext
+    when '.dll'
+      img = 'big-dll'
+    when '.exe'
+      img = 'big-exe'
+    when '.txt'
+      img = 'big-txt'
+    else
+      img = 'big-file'
+    end
+
+    type = ext.upcase
+    type = type[1..-1] << ' ' unless type.empty?
+    type << 'File'
+
+    t.item_complex(item, 
+                   [ 
+                     ['elemImg', {:image=>[@sel_images[img], ['selected'], 
+                                           @images[img], []]}],
+                     ['elemTxt', {:text=>File.basename(file)}]
+                   ])
+    t.item_lastchild(:root, item)
+  }
+
+  demoExplorerAux(t, dir_proc, file_proc)
+
+  t.activate(t.index('root firstchild'))
+
+  t.notify_bind(t, 'ActiveItem', 
+                proc{|w, a, c|
+                  w.item_element_configure(a, 0, 'elemTxt', :lines=>'')
+                  w.item_element_configure(c, 0, 'elemTxt', :lines=>3)
+                }, '%T %p %c')
+
+  t.bindtags = [ t, 'TreeCtrlFileList', Tk::TreeCtrl, t.winfo_toplevel, :all ]
+end
+
+# Tree is horizontal, wrapping occurs at right edge of window, each item
+# is as wide as the smallest needed multiple of 110 pixels
+def demoExplorerSmallIcons(t)
+  demoExplorerList(t)
+  t.configure(:orient=>:horizontal, :xscrollincrement=>0)
+  t.column_configure(0, :width=>'', :stepwidth=>110, :widthhack=>false)
+end
+
+# Tree is vertical, wrapping occurs at bottom of window, each range has the
+# same width (as wide as the longest item), xscrollincrement is by range
+def demoExplorerList(t)
+  height = t.font.metrics(:linespace) + 2
+  height = 18 if height < 18
+
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+              :itemheight=>height, :selectmode=>:extended, :wrap=>:window, 
+              :showheader=>false, :scrollmargin=>16, 
+              :xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
+
+  init_pics('small-*')
+
+  if $HasColumnCreate
+    t.column_create(:widthhack=>true)
+  else
+    t.column_configure(0, :widthhack=>true)
+  end
+
+  t.element_create('elemImg', :image, 
+                   :image=>[
+                     @sel_images['small-folder'], ['selected'], 
+                     @images['small-folder'], []
+                   ])
+  t.element_create('elemTxt', :text, :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
+  t.element_create('elemSel', :rect, :showfocus=>true, 
+                   :fill=>[
+                     @SystemHighlight, ['selected', 'focus'], 
+                     'gray', ['selected', '!focus']
+                   ])
+
+  # image + text
+  s = t.style_create('STYLE')
+  t.style_elements(s, ['elemSel', 'elemImg', 'elemTxt'])
+  t.style_layout(s, 'elemImg', :expand=>:ns)
+  t.style_layout(s, 'elemTxt', :squeeze=>:x, :expand=>:ns, :padx=>[2,0])
+  t.style_layout(s, 'elemSel', :union=>['elemTxt'], :iexpand=>:ns, :ipadx=>2)
+
+  @Priv[:edit, t] = ['elemTxt']
+  @Priv[:sensitive, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
+  @Priv[:dragimage, t] = [ [0, 'STYLE', 'elemImg', 'elemTxt'] ]
+
+  t.notify_bind(t, 'Edit-accept', 
+                proc{|w, i, tt| w.item_text(i, 0, tt)}, '%T %I %t')
+
+  dir_proc = proc{|file|
+    item = t.item_create
+    t.item_style_set(item, 0, 'STYLE')
+    t.item_text(item, 0, File.basename(file))
+    t.item_lastchild(:root, item)
+  }
+
+  file_proc = proc{|file|
+    item = t.item_create
+    t.item_style_set(item, 0, 'STYLE')
+
+    ext = File.extname(file)
+    case ext
+    when '.dll'
+      img = 'small-dll'
+    when '.exe'
+      img = 'small-exe'
+    when '.txt'
+      img = 'small-txt'
+    else
+      img = 'small-file'
+    end
+
+    type = ext.upcase
+    type = type[1..-1] << ' ' unless type.empty?
+    type << 'File'
+
+    t.item_complex(item, 
+                   [ 
+                     ['elemImg', {:image=>[@sel_images[img], ['selected'], 
+                                           @images[img], []]}],
+                     ['elemTxt', {:text=>File.basename(file)}]
+                   ])
+    t.item_lastchild(:root, item)
+  }
+
+  demoExplorerAux(t, dir_proc, file_proc)
+
+  t.activate(t.item_firstchild(:root))
+
+  t.bindtags = [ t, 'TreeCtrlFileList', Tk::TreeCtrl, t.winfo_toplevel, :all ]
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/help.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/help.rb
new file mode 100644
index 0000000000..af026fc006
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/help.rb
@@ -0,0 +1,404 @@
+#
+# Demo: Help contents
+#
+def demoHelpContents(t)
+  height = t.font.metrics(:linespace)
+  height = 18 if height < 18
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+              :itemheight=>height, :selectmode=>:browse)
+
+  init_pics('help-*')
+
+  if $Version_1_1_OrLater
+    t.column_create(:text=>'Help Contents')
+  else # TreeCtrl 1.0
+    t.column_configure(0, :text=>'Help Contents')
+  end
+
+  # Define a new item state
+  t.state_define('mouseover')
+
+  t.element_create('e1', :image, :image=>@images['help-page'])
+  t.element_create('e2', :image, :image=>[
+                     @images['help-book-open'], ['open'], 
+                     @images['help-book-closed'], [], 
+                   ])
+  t.element_create('e3', :text, 
+                   :font=>[t.font.dup.underline(true), ['mouseover']], 
+                   :fill=>[
+                     @SystemHighlightText, ['selected', 'focus'], 
+                     'blue', ['mouseover']
+                   ])
+  t.element_create('e4', :rect, :showfocus=>true, 
+                   :fill=>[@SystemHighlight, ['selected', 'focus']])
+
+  # book
+  s = t.style_create('s1')
+  t.style_elements(s, ['e4', 'e1', 'e3'])
+  t.style_layout(s, 'e1', :padx=>[0,4], :expand=>:ns)
+  t.style_layout(s, 'e3', :expand=>:ns)
+  t.style_layout(s, 'e4', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
+
+  # page
+  s = t.style_create('s2')
+  t.style_elements(s, ['e4', 'e2', 'e3'])
+  t.style_layout(s, 'e2', :padx=>[0,4], :expand=>:ns)
+  t.style_layout(s, 'e3', :expand=>:ns)
+  t.style_layout(s, 'e4', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
+
+  parentList = [:root, '', '', '', '', '', '']
+  parent = :root
+  [
+     [0, 's1', "Welcome to Help"], 
+     [0, 's2', "Introducing Windows 98"], 
+        [1, 's2', "How to Use Help"], 
+           [2, 's1', "Find a topic"], 
+           [2, 's1', "Get more out of help"],
+        [1, 's2', "Register Your Software"],
+           [2, 's1', "Registering Windows 98 online"], 
+        [1, 's2', "What's New in Windows 98"], 
+           [2, 's1', "Innovative, easy-to-use features"], 
+           [2, 's1', "Improved reliability"], 
+           [2, 's1', "A faster operating system"], 
+           [2, 's1', "True Web integration"], 
+           [2, 's1', "More entertaining and fun"], 
+        [1, 's2', "If You're New to Windows 98"], 
+           [2, 's2', "Tips for Macintosh Users"], 
+              [3, 's1', "Why does the mouse have two buttons?"]
+  ].each{|depth, style, text|
+    item = t.item_create
+    t.item_style_set(item, 0, style)
+    t.item_element_configure(item, 0, 'e3', :text=>text)
+    if $Version_1_1_OrLater
+      t.item_collapse(item)
+    else # TreeCtrl 1.0
+      t.collapse(item)
+    end
+    t.item_lastchild(parentList[depth], item)
+    depth += 1
+    parentList[depth] = item
+  }
+
+  treeCtrlHelp = TkBindTag.new
+
+  treeCtrlHelp.bind('Double-ButtonPress-1', 
+                    proc{|w, x, y|
+                      if w.identify(x, y)[0] == 'header'
+                        Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
+                      else
+                        helpButton1(w, x, y)
+                      end
+                      Tk.callback_break
+                    }, '%W %x %y')
+
+  treeCtrlHelp.bind('ButtonPress-1', 
+                    proc{|w, x, y|
+                      helpButton1(w, x, y)
+                      Tk.callback_break
+                    }, '%W %x %y')
+
+  treeCtrlHelp.bind('Button1-Motion', 
+                    proc{|w, x, y|
+                      helpMotion1(w, x, y)
+                      Tk.callback_break
+                    }, '%W %x %y')
+
+  treeCtrlHelp.bind('Button1-Leave', 
+                    proc{|w, x, y|
+                      helpLeave1(w, x, y)
+                      Tk.callback_break
+                    }, '%W %x %y')
+
+  treeCtrlHelp.bind('ButtonRelease-1', 
+                    proc{|w, x, y|
+                      helpRelease1(w, x, y)
+                      Tk.callback_break
+                    }, '%W %x %y')
+
+  treeCtrlHelp.bind('Motion', proc{|w, x, y| helpMotion(w, x, y) }, '%W %x %y')
+
+  treeCtrlHelp.bind('Leave', proc{|w, x, y| helpMotion(w, x, y) }, '%W %x %y')
+
+  treeCtrlHelp.bind('KeyPress-Return', 
+                    proc{|w, x, y|
+                      if w.selection_get.length == 1
+                        if $Version_1_1_OrLater
+                          w.item_toggle(w.selection_get[0])
+                        else # TreeCtrl 1.0
+                          w.toggle(w.selection_get[0])
+                        end
+                      end
+                      Tk.callback_break
+                    }, '%W %x %y')
+
+  @Priv[:help, :prev] = ''
+
+  t.bindtags = [ t, treeCtrlHelp, Tk::TreeCtrl, t.winfo_toplevel, :all ]
+end
+
+# This is an alternate implementation that does not define a new item state
+# to change the appearance of the item under the cursor.
+def demoHelpContents2(t)
+  height = t.font.metrics(:linespace)
+  height = 18 if height < 18
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+              :itemheight=>height, :selectmode=>:browse)
+
+  init_pics('help-*')
+
+  if $Version_1_1_OrLater
+    t.column_create(:text=>'Help Contents')
+  else # TreeCtrl 1.0
+    t.column_configure(0, :text=>'Help Contents')
+  end
+
+  t.element_create('e1', :image, :image=>@images['help-page'])
+  t.element_create('e2', :image, :image=>[
+                     @images['help-book-open'], ['open'], 
+                     @images['help-book-closed'], [], 
+                   ])
+  t.element_create('e3', :text, 
+                   :fill=>[
+                     @SystemHighlightText, ['selected', 'focus'], 
+                     'blue', []
+                   ])
+  t.element_create('e4', :rect, :showfocus=>true, 
+                   :fill=>[@SystemHighligh, ['selected', 'focus']])
+  t.element_create('e5', :text, :font=>t.font.dup.underline(true), 
+                   :fill=>[
+                     @SystemHighlightText, ['selected', 'focus'], 
+                     'blue', []
+                   ])
+
+  # book
+  s = t.style_create('s1')
+  t.style_elements(s, ['e4', 'e1', 'e3'])
+  t.style_layout(s, 'e1', :padx=>[0,4], :expand=>:ns)
+  t.style_layout(s, 'e3', :expand=>:ns)
+  t.style_layout(s, 'e4', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
+
+  # page
+  s = t.style_create('s2')
+  t.style_elements(s, ['e4', 'e2', 'e3'])
+  t.style_layout(s, 'e2', :padx=>[0,4], :expand=>:ns)
+  t.style_layout(s, 'e3', :expand=>:ns)
+  t.style_layout(s, 'e4', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
+
+  # book (focus)
+  s = t.style_create('s1.f')
+  t.style_elements(s, ['e4', 'e1', 'e5'])
+  t.style_layout(s, 'e1', :padx=>[0,4], :expand=>:ns)
+  t.style_layout(s, 'e5', :expand=>:ns)
+  t.style_layout(s, 'e4', :union=>['e5'], :iexpand=>:ns, :ipadx=>2)
+
+  # page (focus)
+  s = t.style_create('s2')
+  t.style_elements(s, ['e4', 'e2', 'e5'])
+  t.style_layout(s, 'e2', :padx=>[0,4], :expand=>:ns)
+  t.style_layout(s, 'e5', :expand=>:ns)
+  t.style_layout(s, 'e4', :union=>['e5'], :iexpand=>:ns, :ipadx=>2)
+
+  parentList = [:root, '', '', '', '', '', '']
+  parent = :root
+  [
+     [0, 's1', "Welcome to Help"], 
+     [0, 's2', "Introducing Windows 98"], 
+        [1, 's2', "How to Use Help"], 
+           [2, 's1' "Find a topic"], 
+           [2, 's1', "Get more out of help"],
+        [1, 's2', "Register Your Software"],
+           [2, 's1', "Registering Windows 98 online"], 
+        [1, 's2', "What's New in Windows 98"], 
+           [2, 's1', "Innovative, easy-to-use features"], 
+           [2, 's1', "Improved reliability"], 
+           [2, 's1', "A faster operating system"], 
+           [2, 's1', "True Web integration"], 
+           [2, 's1', "More entertaining and fun"], 
+        [1, 's2', "If You're New to Windows 98"], 
+           [2, 's2', "Tips for Macintosh Users"], 
+              [3, 's1', "Why does the mouse have two buttons?"]
+  ].each{|depth, style, text|
+    item = t.item_create
+    t.item_style_set(item, 0, style)
+    t.item_element_configure(item, 0, 'e3', :text=>text)
+    if $Version_1_1_OrLater
+      t.item_collapse(item)
+    else # TreeCtrl 1.0
+      t.collapse(item)
+    end
+    t.item_lastchild(parentList[depth], item)
+    depth += 1
+    parentList[depth] = item
+  }
+
+  treeCtrlHelp = TkBindTag.new
+
+  treeCtrlHelp.bind('Double-ButtonPress-1', 
+                    proc{|w, x, y|
+                      if w.identify(x, y)[0] == 'header'
+                        Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
+                      else
+                        helpButton1(w, x, y)
+                      end
+                      Tk.callback_break
+                    }, '%W %x %y')
+
+  treeCtrlHelp.bind('ButtonPress-1', 
+                    proc{|w, x, y|
+                      helpButton1(w, x, y)
+                      Tk.callback_break
+                    }, '%W %x %y')
+
+  treeCtrlHelp.bind('Button1-Motion', 
+                    proc{|w, x, y|
+                      helpMotion1(w, x, y)
+                      Tk.callback_break
+                    }, '%W %x %y')
+
+  treeCtrlHelp.bind('Button1-Leave', 
+                    proc{|w, x, y|
+                      helpLeave1(w, x, y)
+                      Tk.callback_break
+                    }, '%W %x %y')
+
+  treeCtrlHelp.bind('ButtonRelease-1', 
+                    proc{|w, x, y|
+                      helpRelease1(w, x, y)
+                      Tk.callback_break
+                    }, '%W %x %y')
+
+  treeCtrlHelp.bind('Motion', proc{|w, x, y| helpMotion(w, x, y) }, '%W %x %y')
+
+  treeCtrlHelp.bind('Leave', proc{|w, x, y| helpMotion(w, x, y) }, '%W %x %y')
+
+  treeCtrlHelp.bind('KeyPress-Return', 
+                    proc{|w, x, y|
+                      if w.selection_get.length == 1
+                        w.item_toggle(w.selection_get[0])
+                      end
+                      Tk.callback_break
+                    }, '%W %x %y')
+
+  @Priv[:help, :prev] = ''
+
+  t.bindtags = [ t, treeCtrlHelp, Tk::TreeCtrl, t.winfo_toplevel, :all ]
+end
+
+def helpButton1(w, x, y)
+  w.set_focus
+  id = w.identify(x, y)
+  @Priv['buttonMode'] = ''
+  if id[0] == 'header'
+    Tk::TreeCtrl::BindCallback.buttonPress1(w, x, y)
+  elsif id[0] == 'item'
+    item = id[1]
+    # didn't click an element
+    return if id.length != 6
+    if w.selection_includes(item)
+      w.toggle(item)
+      return
+    end
+    if w.selection_get.length > 0
+      item2 = w.selection_get[0]
+      if $Version_1_1_OrLater
+        w.item_collapse(item2)
+      else # TreeCtrl 1.0
+        w.collapse(item2)
+      end
+      w.item_ancestors(item2).each{|i|
+        if $Version_1_1_OrLater
+          w.item_collapse(i) if w.compare(item, '!=', i)
+        else # TreeCtrl 1.0
+          w.collapse(i) if w.compare(item, '!=', i)
+        end
+      }
+    end
+    w.activate(item)
+    if $Version_1_1_OrLater
+      w.item_ancestors(item).each{|i|
+        w.item_expand(i)
+      }
+      w.item_toggle(item)
+    else # TreeCtrl 1.0
+      w.expand(*(w.item_ancestors(item)))
+      w.toggle(item)
+    end
+    w.selection_modify(item, :all)
+  end
+end
+
+def helpMotion1(w, x, y)
+  case @Priv['buttonMode']
+  when 'resize', 'header'
+    Tk::TreeCtrl::BindCallback.motion1(w, x, y)
+  end
+end
+
+def helpLeave1(w, x, y)
+  # This is called when I do ButtonPress-1 on Unix for some reason,
+  # and buttonMode is undefined.
+  return unless @Priv.exist?('buttonMode')
+  case @Priv['buttonMode']
+  when 'header'
+    w.column_configure(@Priv['column'], :sunken=>false)
+  end
+end
+
+def helpRelease1(w, x, y)
+  case @Priv['buttonMode']
+  when 'resize', 'header'
+    Tk::TreeCtrl::BindCallback.release1(w, x, y)
+  end
+  @Priv['buttonMode'] = ''
+end
+
+def helpMotion(w, x, y)
+  id = w.identify(x, y)
+  if id.empty?
+  elsif id[0] == 'header'
+  elsif id[0] == 'item'
+    item = id[1]
+    if id.length == 6
+      if @Priv[:help, :prev] != TkComm._get_eval_string(item)
+        if @Priv[:help, :prev] != ''
+          w.item_state_set(@Priv[:help, :prev], '!mouseover')
+        end
+        w.item_state_set(item, 'mouseover')
+        @Priv[:help, :prev] = item
+      end
+      return
+    end
+  end
+  if @Priv[:help, :prev] != ''
+    w.item_state_set(@Priv[:help, :prev], '!mouseover')
+    @Priv[:help, :prev] = ''
+  end
+end
+
+# Alternate implementation doesn't rely on mouseover state
+def helpMotion2(w, x, y)
+  id = w.identify(x, y)
+  if id[0] == 'header'
+  elsif !id.empty?
+    item = id[1]
+    if id.kength == 6
+      if @Priv[:help, :prev] != TkComm._get_eval_string(item)
+        if @Priv[:help, :prev] != ''
+          style = w.item_style_set(@Priv[:help, :prev], 0)
+          style.sub!(/\.f$/, '')
+          w.item_style_map(@Priv[:help, :prev], 0, style, ['e5', 'e3'])
+        end
+        style = w.item_style_set(item, 0)
+        w.item_style_map(item, 0, style + '.f', ['e3', 'e5'])
+        @Priv[:help, :prev] = item
+      end
+      return
+    end
+  end
+  if @Priv[:help, :prev] != ''
+    style = w.item_style_set(@Priv[:help, :prev], 0)
+    style.sub!(/\.f$/, '')
+    w.item_style_map(@Priv[:help, :prev], 0, style, ['e5', 'e3'])
+    @Priv[:help, :prev] = ''
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/imovie.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/imovie.rb
new file mode 100644
index 0000000000..d61bf9a7c3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/imovie.rb
@@ -0,0 +1,130 @@
+#
+# Demo: iMovie
+#
+def demoIMovie(t)
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+              :selectmode=>:browse, :orient=>:horizontal, :wrap=>:window, 
+              :showheader=>false, :background=>'#dcdcdc')
+
+  if $HasColumnCreate
+    t.column_create
+  end
+
+  init_pics('imovie-*')
+
+  case @thisPlatform
+  when 'macintosh', 'macosx'
+    font1 = TkFont.new(['Geneva', 9])
+    font2 = TkFont.new(['Geneva', 10])
+  when 'unix'
+    font1 = TkFont.new(['Helvetica', -12])
+    font2 = TkFont.new(['Helvetica', -14])
+  else
+    font1 = TkFont.new(['Helvetica', 8])
+    font2 = TkFont.new(['Helvetica', 10])
+  end
+
+  t.element_create('elemTime', :text, :font=>font1)
+  t.element_create('elemName', :text, :font=>font2, :lines=>1, :width=>80)
+  t.element_create('elemRect', :rect, :outline=>'#827878', :outlinewidth=>1, 
+                   :fill=>['#ffdc5a', ['selected'], 'white', []])
+  t.element_create('elemImg', :image)
+  t.element_create('elemShadow', :rect, :outline=>'gray', :outlinewidth=>1, 
+                   :open=>:wn)
+
+  s = t.style_create('STYLE', :orient=>:vertical)
+  t.style_elements(s, [
+                     'elemShadow', 'elemRect', 'elemTime', 
+                     'elemImg', 'elemName'
+                   ])
+  t.style_layout(s, 'elemShadow', :detach=>true, 
+                 :padx=>[1,2], :pady=>[1,2], :iexpand=>:es)
+  t.style_layout(s, 'elemTime', :padx=>[2,0])
+  t.style_layout(s, 'elemImg', :pady=>[0,1])
+  t.style_layout(s, 'elemName', :expand=>:we, :ipady=>[0,2], :padx=>[0,3], 
+                 :squeeze=>:x)
+  t.style_layout(s, 'elemRect', :union=>['elemTime', 'elemImg', 'elemName'], 
+                 :ipadx=>6, :padx=>[0,3], :pady=>[0,3])
+
+  # Set default item style
+  if $Version_1_1_OrLater
+    t.defaultstyle([s])
+  end
+
+  (0..4).each{|i|
+    [
+      ['15:20', 'Clip 1', @images['imovie-01']], 
+      ['19:18', 'Clip 2', @images['imovie-02']], 
+      ['07:20', 'Clip 3', @images['imovie-03']], 
+      ['07:20', 'Clip 4', @images['imovie-04']], 
+      ['07:20', 'Clip 5', @images['imovie-05']], 
+      ['07:20', 'Clip 6', @images['imovie-06']], 
+      ['07:20', 'Clip 7', @images['imovie-07']]
+    ].each{|time, name, image|
+      item = t.item_create
+      unless $Version_1_1_OrLater
+        t.item_style_set(item, 0, s)
+      end
+      t.item_element_configure(item, 0, 'elemTime', :text=>time)
+      t.item_element_configure(item, 0, 'elemName', :text=>name)
+      t.item_element_configure(item, 0, 'elemImg', :image=>image)
+      t.item_lastchild(:root, item)
+    }
+  }
+
+  t.notify_bind(t, 'Edit-accept', proc{|w, i, c, e, tt|
+                  w.item_element_configure(i, c, e, :text=>tt)
+                }, '%T %I %C %E %t')
+
+  iMovie = TkBindTag.new
+  iMovie.bind('ButtonPress-1', proc{|w, x, y|
+                iMovieButton1(w, x, y)
+              }, '%W %x %y')
+
+  t.bindtags = [t, iMovie, Tk::TreeCtrl, t.winfo_toplevel, TkBindTag::ALL]
+end
+
+def iMovieButton1(w, x, y)
+  w.set_focus
+  id = w.identify(x,y)
+
+  if id.empty?
+    # Click outside any item
+
+  elsif id[0] == 'header'
+    # Click in header
+    Tk::TreeCtrl::BindCallback.buttonPress1(w, x, y)
+
+  elsif id[0] == 'item'
+    # Click in item
+    Tk::TreeCtrl::BindCallback.buttonPress1(w, x, y)
+    Tk.update
+    where, item, arg1, arg2, arg3, arg4 = id
+    case arg1
+    when 'column'
+      i = id[1]
+      if id.length == 6
+        e = id[-1]
+        if e == 'elemName'
+          exists = TkWinfo.exist?(w.path + '.entry')
+          Tk::TreeCtrl::BindCallback.entryOpen(w, i, 0, e)
+          ent = TkComm.window(w.path + '.entry')
+          unless exists
+            ent.configure(:borderwidth=>0, :justify=>:center, 
+                          :background=>'#ffdc5a')
+            x1, y1, x2, y2 = w.item_bbox(i, 0, e)
+            ent.place(:y=>y1 - 1)
+          end
+          ent.selection_clear
+          x1, y1, x2, y2 = w.item_bbox(i)
+          ent.place(:x=>x1 + 1, :width=>x2 - x1 - 5)
+          puts "@#{x - (x1 + 1)}"
+          # ent.icursor = ent.index("@#{x - (x1 + 1)}")
+          ent.icursor = ent.index(TkComm._at(x - (x1 + 1)))
+        end
+      end
+    end
+  end
+
+  Tk.callback_break
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/layout.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/layout.rb
new file mode 100644
index 0000000000..745ac86f36
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/layout.rb
@@ -0,0 +1,159 @@
+#
+# Demo: Layout
+#
+def demoLayout(t)
+  t.configure(:showroot=>false, :showrootbutton=>true, :showbuttons=>true, 
+              :showlines=>true, :itemheight=>0, :selectmode=>:browse)
+
+  if $HasColumnCreate
+    t.column_create(:text=>'Layout')
+  else
+    t.column_configure(0, :text=>'Layout')
+  end
+
+  t.element_create('e1', :rect, :width=>30, :height=>30, :fill=>'gray20')
+  t.element_create('e2', :rect, :width=>30, :height=>30, :fill=>'gray40', 
+                   :outline=>'blue', :outlinewidth=>3)
+  t.element_create('e3', :rect, :fill=>'gray60')
+  t.element_create('e4', :rect, :showfocus=>true, 
+                   :fill=>[
+                     @SystemHighlight, ['selected', 'focus'], 'gray80', []
+                   ])
+  t.element_create('e5', :rect, :fill=>'{sky blue}', :width=>20, :height=>20)
+  t.element_create('e6', :rect, :fill=>'{sea green}', :width=>30, :height=>16)
+  t.element_create('e7', :rect, :fill=>'{sky blue}', :width=>30, :height=>16)
+  t.element_create('e8', :rect, :fill=>'gray70', :height=>1)
+
+  s = t.style_create('s1')
+  t.style_elements(s, ['e4', 'e3', 'e1', 'e2', 'e5', 'e6', 'e7'])
+  t.style_layout(s, 'e1', :padx=>[28, 4], :pady=>4)
+  t.style_layout(s, 'e2', :expand=>:es, :padx=>[0, 38])
+  t.style_layout(s, 'e3', :union=>['e1', 'e2'], :ipadx=>4, :ipady=>4, :pady=>2)
+  t.style_layout(s, 'e4', :detach=>true, :iexpand=>:es)
+  t.style_layout(s, 'e5', :detach=>true, :padx=>[2,0], :pady=>2, :iexpand=>:s)
+  t.style_layout(s, 'e6', :detach=>true, :expand=>:ws, 
+                 :padx=>[0,2], :pady=>[2,0])
+  t.style_layout(s, 'e7', :detach=>true, :expand=>:wn, 
+                 :padx=>[0,2], :pady=>[0,2])
+
+  if $Version_1_1_OrLater
+    i = t.item_create(:button=>true)
+  else
+    i = t.item_create
+    t.item_hasbutton(i, true)
+  end
+  t.item_style_set(i, 0, s)
+  t.item_lastchild(:root, i)
+  parent = i
+
+  i = t.item_create()
+  unless $Version_1_1_OrLater
+    t.item_hasbutton(i, false)
+  end
+  t.item_style_set(i, 0, s)
+  t.item_lastchild(parent, i)
+
+  ### 
+
+  s = t.style_create('s2')
+  t.style_elements(s, ['e4', 'e3', 'e1'])
+  t.style_layout(s, 'e1', :padx=>8, :pady=>8, :iexpand=>:e)
+  t.style_layout(s, 'e3', :union=>['e1'], :ipadx=>[20,4], :ipady=>[4,12])
+  t.style_layout(s, 'e4', :detach=>true, :iexpand=>:es)
+
+  if $Version_1_1_OrLater
+    i = t.item_create(:button=>true)
+  else
+    i = t.item_create
+    t.item_hasbutton(i, true)
+  end
+  t.item_style_set(i, 0, s)
+  t.item_lastchild(:root, i)
+
+  i2 = t.item_create()
+  unless $Version_1_1_OrLater
+    t.item_hasbutton(i2, false)
+  end
+  t.item_style_set(i2, 0, s)
+  t.item_lastchild(i, i2)
+
+  ### 
+
+  s = t.style_create('s3')
+  t.style_elements(s, ['e4', 'e3', 'e1', 'e5', 'e6'])
+  t.style_layout(s, 'e4', :union=>['e1', 'e6'], :ipadx=>8, :ipady=>[8,0])
+  t.style_layout(s, 'e3', :union=>['e1', 'e5'], :ipadx=>4, :ipady=>4)
+  t.style_layout(s, 'e5', :ipady=>[0,20])
+
+  if $Version_1_1_OrLater
+    i = t.item_create(:button=>true)
+  else
+    i = t.item_create
+    t.item_hasbutton(i, true)
+  end
+  t.item_style_set(i, 0, s)
+  t.item_lastchild(:root, i)
+
+  i2 = t.item_create()
+  unless $Version_1_1_OrLater
+    t.item_hasbutton(i2, false)
+  end
+  t.item_style_set(i2, 0, s)
+  t.item_lastchild(i, i2)
+
+  ### 
+
+  t.element_create('eb', :border, :background=>@SystemButtonFace, 
+                   :relief=>[:sunken, ['selected'], :raised, []], 
+                   :thickness=>2, :filled=>true)
+  t.element_create('et', :text)
+
+  text = "Here is a text element surrounded by a border element.\nResize the column to watch me wrap."
+
+  s = t.style_create('e4')
+  t.style_elements(s, ['eb', 'et'])
+  t.style_layout(s, 'eb', :union=>['et'], :ipadx=>2, :ipady=>2)
+  t.style_layout(s, 'et', :squeeze=>:x)
+
+  if $Version_1_1_OrLater
+    i = t.item_create(:button=>true)
+  else
+    i = t.item_create
+    t.item_hasbutton(i, true)
+  end
+  t.item_style_set(i, 0, s)
+  t.item_text(i, 0, text)
+  t.item_lastchild(:root, i)
+  parent = i
+
+  i = t.item_create()
+  unless $Version_1_1_OrLater
+    t.item_hasbutton(i, false)
+  end
+  t.item_style_set(i, 0, s)
+  t.item_text(i, 0, text)
+  t.item_lastchild(parent, i)
+
+  ### 
+
+  styleNum = 5
+  [ 
+    [:horizontal, [:s, :ns, :n]], 
+    [:vertical,   [:e, :we, :w]]
+  ].each{|orient, expandList|
+    expandList.each{|expand|
+      s = t.style_create("s#{styleNum}", :orient=>orient)
+      t.style_elements(s, ['e4', 'e8', 'e2', 'e5', 'e6'])
+      t.style_layout(s, 'e4', :detach=>true, :iexpand=>:es)
+      t.style_layout(s, 'e8', :detach=>true, :expand=>:n, :iexpand=>:e)
+      t.style_layout(s, 'e2', :expand=>expand)
+      t.style_layout(s, 'e5', :expand=>expand)
+      t.style_layout(s, 'e6', :expand=>expand)
+      styleNum += 1
+
+      i = t.item_create()
+      t.item_style_set(i, 0, s)
+      t.item_lastchild(:root, i)
+    }
+  }
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/mailwasher.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/mailwasher.rb
new file mode 100644
index 0000000000..836e1e87de
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/mailwasher.rb
@@ -0,0 +1,269 @@
+#
+# Demo: MailWasher
+#
+def demoMailWasher(t)
+  init_pics('*checked')
+
+  height = t.font.metrics(:linespace) + 2
+  height = 18 if height < 18
+
+  t.configure(:showroot=>false, :showrootbutton=>false, :showbuttons=>false, 
+              :showlines=>false, :itemheight=>height, :selectmode=>:browse, 
+              :xscrollincrement=>1)
+
+  pad = 4
+
+  if $Version_1_1_OrLater
+    t.column_create(:text=>'Delete', :textpadx=>pad, :tag=>'delete')
+    t.column_create(:text=>'Bounce', :textpadx=>pad, :tag=>'bounce')
+    t.column_create(:text=>'Status', :width=>80, :textpadx=>pad, 
+                    :tag=>'status')
+    t.column_create(:text=>'Size', :width=>40, :textpadx=>pad, 
+                    :justify=>:right, :tag=>'size')
+    t.column_create(:text=>'From', :width=>140, :textpadx=>pad, :tag=>'from')
+    t.column_create(:text=>'Subject', :width=>240, :textpadx=>pad, 
+                    :tag=>'subject')
+    t.column_create(:text=>'Received', :textpadx=>pad, :arrow=>:up, 
+                    :arrowpad=>[4,0], :tag=>'received')
+    t.column_create(:text=>'Attachments', :textpadx=>pad, :tag=>'attachments')
+
+    t.state_define('CHECK')
+
+    t.element_create('imgCheck', :image, :image=>[
+                       @images['checked'], ['CHECK'], @images['unchecked'], []
+                     ])
+
+  else # TreeCtrl 1.0
+    t.column_configure(0, :text=>'Delete', :textpadx=>pad, :tag=>'delete')
+    t.column_configure(1, :text=>'Bounce', :textpadx=>pad, :tag=>'bounce')
+    t.column_configure(2, :text=>'Status', :width=>80, :textpadx=>pad, 
+                       :tag=>'status')
+    t.column_configure(3, :text=>'Size', :width=>40, :textpadx=>pad, 
+                       :justify=>:right, :tag=>'size')
+    t.column_configure(4, :text=>'From', :width=>140, :textpadx=>pad, 
+                       :tag=>'from')
+    t.column_configure(5, :text=>'Subject', :width=>240, :textpadx=>pad, 
+                       :tag=>'subject')
+    t.column_configure(6, :text=>'Received', :textpadx=>pad, :arrow=>:up, 
+                       :arrowpad=>[4,0], :tag=>'received')
+    t.column_configure(7, :text=>'Attachments', :textpadx=>pad, 
+                       :tag=>'attachments')
+
+    t.element_create('imgOff', :image, :image=>@images['unchecked'])
+    t.element_create('imgOn', :image, :image=>@images['checked'])
+  end
+
+  t.element_create('border', :rect, :open=>:nw, :outline=>'gray', 
+                   :outlinewidth=>1, :fill=>[@SystemHighlight, ['selected']])
+  t.element_create('txtAny', :text, :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected']])
+  t.element_create('txtNone', :text, :text=>'none', :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected']])
+  t.element_create('txtYes', :text, :text=>'yes', :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected']])
+  t.element_create('txtNormal', :text, :text=>'Normal', :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected'], '#006800', []])
+  t.element_create('txtPossSpam', :text, :text=>'Possible Spam', :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected'], '#787800', []])
+  t.element_create('txtProbSpam', :text, :text=>'Probably Spam', :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected'], '#FF9000', []])
+  t.element_create('txtBlacklist', :text, :text=>'Blacklisted', :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected'], '#FF5800', []])
+
+  if $Version_1_1_OrLater
+    s = t.style_create('styCheck')
+    t.style_elements(s, ['border', 'imgCheck'])
+    t.style_layout(s, 'border', :detach=>true, :iexpand=>:es)
+    t.style_layout(s, 'imgCheck', :expand=>:news)
+  else
+    ['Off', 'On'].each{|name|
+      s = t.style_create('sty' << name)
+      i = 'img' << name
+      t.style_elements(s, ['border', i])
+      t.style_layout(s, 'border', :detach=>true, :iexpand=>:es)
+      t.style_layout(s, i, :expand=>:news)
+    }
+  end
+
+  pad = 4
+
+  %w(Any None Yes Normal PossSpam ProbSpam Blacklist).each{|name|
+    s = t.style_create('sty' << name)
+    e = 'txt' << name
+    t.style_elements(s, ['border', e])
+    t.style_layout(s, 'border', :detach=>true, :iexpand=>:es)
+    t.style_layout(s, e, :padx=>pad, :squeeze=>:x, :expand=>:ns)
+  }
+
+  [
+    ['baldy@spammer.com',  "Your hair is thinning"], 
+    ['flat@spammer.com', "Your breasts are too small"], 
+    ['tiny@spammer.com',  "Your penis is too small"], 
+    ['dumbass@spammer.com', "You are not very smart"], 
+    ['bankrobber@spammer.com', "You need more money"], 
+    ['loser@spammer.com', "You need better friends"], 
+    ['gossip@spammer.com', "Find out what your coworkers think about you"], 
+    ['whoami@spammer.com', "Find out what you think about yourself"],
+    ['downsized@spammer.com', "You need a better job"], 
+    ['poorhouse@spammer.com', "Your mortgage is a joke"], 
+    ['spam4ever@spammer.com', "You need more spam"]
+  ].each{|frm, subj|
+    item = t.item_create
+    status = ['styNormal','styPossSpam','styProbSpam','styBlacklist'][rand(4)]
+    attachments = ['styNone','styYes'][rand(2)]
+
+    if $Version_1_1_OrLater
+      delete = [false, true][rand(2)]
+      bounce = [false, true][rand(2)]
+      t.item_style_set(item, 
+                       0, 'styCheck', 1, 'styCheck', 2, status, 3, 'styAny', 
+                       4, 'styAny', 5, 'styAny', 6, 'styAny', 7, attachments)
+      t.item_state_forcolumn(item, 'delete', 'CHECK') if delete
+      t.item_state_forcolumn(item, 'bounce', 'CHECK') if bounce
+
+    else # TreeCtrl 1.0
+      delete = ['styOn', 'styOff'][rand(2)]
+      bounce = ['styOn', 'styOff'][rand(2)]
+      t.item_style_set(item, 
+                       0, delete, 1, bounce, 2, status, 3, 'styAny', 
+                       4, 'styAny', 5, 'styAny', 6, 'styAny', 7, attachments)
+    end
+
+    bytes = 512 + rand(1024 * 12)
+    size = "#{bytes / 1024 + 1}KB"
+    seconds = Tk::Clock.seconds - rand(100000)
+    received = Tk::Clock.format(seconds, '%d/%m/%y %I:%M %p')
+    t.item_text(item, 3, size, 4, frm, 5, subj, 6, received)
+    t.item_lastchild(:root, item)
+  }
+
+  sortColumn = 6
+  t.notify_bind(t, 'Header-invoke', 
+                proc{|c, w|
+                  if c == sortColumn
+                    if w.column_cget(sortColumn, :arrow) == 'down'
+                      order = :increasing
+                      arrow = :up
+                    else
+                      order = :decreasing
+                      arrow = :down
+                    end
+                  else
+                    if w.column_cget(sortColumn, :arrow) == 'down'
+                      order = :decreasing
+                      arrow = :down
+                    else
+                      order = :increasing
+                      arrow = :up
+                    end
+                    w.column_configure(sortColumn, :arrow=>:none)
+                    sortColumn = c
+                  end
+                  w.column_configure(c, :arrow=>arrow)
+                  case w.column_cget(c, :tag)
+                  when 'bounce', 'delete'
+                    w.item_sort(:root, order, 
+                                { 
+                                  :column=>c, 
+                                  :command=>proc{|item1, item2|
+                                    compareOnOff(w, c, item1, item2)
+                                  }
+                                }, 
+                                { :column=>'subject', :dictionary=>true })
+                  when 'status'
+                    w.item_sort(:root, order, 
+                                { :column=>c, :dictionary=>true })
+                  when 'from'
+                    w.item_sort(:root, order, 
+                                { :column=>c, :dictionary=>true }, 
+                                { :column=>'subject', :dictionary=>true })
+                  when 'subject'
+                    w.item_sort(:root, order, 
+                                { :column=>c, :dictionary=>true })
+                  when 'size'
+                    w.item_sort(:root, order, 
+                                { :column=>c, :dictionary=>true }, 
+                                { :column=>'subject', :dictionary=>true })
+                  when 'received'
+                    w.item_sort(:root, order, 
+                                { :column=>c, :dictionary=>true }, 
+                                { :column=>'subject', :dictionary=>true })
+                  when 'attachments'
+                    w.item_sort(:root, order, 
+                                { :column=>c, :dictionary=>true }, 
+                                { :column=>'subject', :dictionary=>true })
+                  end
+                }, '%C %T')
+
+  mailWasher = TkBindTag.new
+
+  if $Version_1_1_OrLater
+    mailWasher.bind('ButtonPress-1', 
+                    proc{|w, x, y|
+                      id = w.identify(x, y)
+                      if id.empty?
+                      elsif id[0] == 'header'
+                      else
+                        what, item, where, arg1, arg2, arg3 = id
+                        if where == 'column'
+                          tag = w.column_cget(arg1, :tag)
+                          if tag == 'delete' || tag == 'bounce'
+                            w.item_state_forcolumn(item, arg1, '~CHECK')
+                          end
+                        end
+                      end
+                    }, '%W %x %y')
+  else # TreeCtrl 1.0
+    mailWasher.bind('ButtonPress-1', 
+                    proc{|w, x, y|
+                      id = w.identify(x, y)
+                      if id.empty?
+                      elsif id[0] == 'header'
+                      else
+                        what, item, where, arg1, arg2, arg3 = id
+                        if where == 'column'
+                          tag = w.column_cget(arg1, :tag)
+                          if tag == 'delete' || tag == 'bounce'
+                            style = w.item_style_set(item, arg1)
+                            if style == 'styOn'
+                              style = 'styOff'
+                            else
+                              style = 'styOn'
+                            end
+                            w.item_style_set(item, arg1, style)
+                            @display_styles_in_item.call(item)
+                          end
+                        end
+                      end
+                    }, '%W %x %y')
+  end
+
+  t.bindtags = [t, mailWasher, Tk::TreeCtrl, t.winfo_toplevel, TkBindTag::ALL]
+end
+
+if $Version_1_1_OrLater
+  def compareOnOff(w, c, item1, item2)
+    s1 = w.item_state_forcolumn(item1, c)
+    s2 = w.item_state_forcolumn(item2, c)
+    if (s1 == s2)
+      0
+    elsif (s1 == 'CHECK')
+      -1
+    else
+      1
+    end
+  end
+
+else # TreeCtrl 1.0
+  def compareOnOff(w, c, item1, item2)
+    s1 = w.item_style_set(item1, c)
+    s2 = w.item_style_set(item2, c)
+    if (s1 == s2)
+      0
+    elsif (s1 == 'styOff')
+      -1
+    else
+      1
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb
new file mode 100644
index 0000000000..c3af86868e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/outlook-folders.rb
@@ -0,0 +1,124 @@
+#
+# Demo: Outlook Express folder list
+#
+def demoOutlookFolders(t)
+  init_pics('outlook-*')
+
+  height = t.font.metrics(:linespace) + 2
+  height = 18 if height < 18
+
+  t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>true, 
+              :showroot=>true, :showrootbutton=>false, :showbuttons=>true)
+
+  if $HasColumnCreate
+    t.column_create(:text=>'Folders')
+  else
+    t.column_configure(0, :text=>'Folders')
+  end
+
+  t.element_create('e1', :image)
+  t.element_create('e2', :text, :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
+  t.element_create('e3', :text, :lines=>1, :font=>t.font.dup.weight(:bold), 
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
+  t.element_create('e4', :text, :fill=>'blue')
+  t.element_create('e5', :image, :image=>@images['outlook-folder'])
+  t.element_create('e6', :rect, :showfocus=>true, 
+                   :fill=>[
+                     @SystemHighlight, ['selected', 'focus'], 
+                     'gray', ['selected', '!focus']
+                   ])
+
+  # image + text
+  s = t.style_create('s1')
+  t.style_elements(s, ['e6', 'e1', 'e2'])
+  t.style_layout(s, 'e1', :expand=>:ns)
+  t.style_layout(s, 'e2', :padx=>[4,0], :expand=>:ns, :squeeze=>:x)
+  t.style_layout(s, 'e6', :union=>['e2'], :iexpand=>:ns, :ipadx=>2)
+
+  # image + text + text
+  s = t.style_create('s2')
+  t.style_elements(s, ['e6', 'e1', 'e3', 'e4'])
+  t.style_layout(s, 'e1', :expand=>:ns)
+  t.style_layout(s, 'e3', :padx=>4, :expand=>:ns, :squeeze=>:x)
+  t.style_layout(s, 'e4', :expand=>:ns)
+  t.style_layout(s, 'e6', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
+
+  # folder + text
+  s = t.style_create('s3')
+  t.style_elements(s, ['e6', 'e5', 'e2'])
+  t.style_layout(s, 'e5', :expand=>:ns)
+  t.style_layout(s, 'e2', :padx=>[4,0], :expand=>:ns, :squeeze=>:x)
+  t.style_layout(s, 'e6', :union=>['e2'], :iexpand=>:ns, :ipadx=>2)
+
+  # folder + text + text
+  s = t.style_create('s4')
+  t.style_elements(s, ['e6', 'e5', 'e3', 'e4'])
+  t.style_layout(s, 'e5', :expand=>:ns)
+  t.style_layout(s, 'e3', :padx=>4, :expand=>:ns, :squeeze=>:x)
+  t.style_layout(s, 'e4', :expand=>:ns)
+  t.style_layout(s, 'e6', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
+
+  t.item_style_set(:root, 0, 's1')
+  t.item_complex(:root, 
+                 [
+                   ['e1', {:image=>@images['outlook-main']}], 
+                   ['e2', {:text=>'Outlook Express'}]
+                 ])
+
+  parentList = [:root, '', '', '', '', '', '']
+  parent = :root
+  [
+     [0, :local, "Local Folders", true, 0], 
+        [1, :inbox, 'Inbox', false, 5], 
+        [1, :outbox, 'Outbox', false, 0], 
+        [1, :sent, "Sent Items", false, 0], 
+        [1, :deleted, "Deleted Items", false, 50], 
+        [1, :draft, 'Drafts', false, 0], 
+        [1, :folder, "Messages to Dad", false, 0], 
+        [1, :folder, "Messages to Sis", false, 0], 
+        [1, :folder, "Messages to Me", false, 0], 
+           [2, :folder, "2001", false, 0], 
+           [2, :folder, "2000", false, 0], 
+           [2, :folder, "1999", false, 0], 
+     [0, :server, "news.gmane.org", true, 0], 
+        [1, :group, "gmane.comp.lang.lua.general", false, 498]
+  ].each{|depth, img, text, button, unread|
+    if $Version_1_1_OrLater
+      item = t.item_create(:button=>button)
+    else
+      item = t.item_create
+      t.item_hasbutton(item, button)
+    end
+    if img == :folder
+      if unread != 0
+        t.item_style_set(item, 0, 's4')
+        t.item_complex(item, 
+                       [['e3', {:text=>text}], ['e4', {:text=>"(#{unread})"}]])
+      else
+        t.item_style_set(item, 0, 's3')
+        t.item_complex(item, [['e2', {:text=>text}]])
+      end
+    else
+      if unread != 0
+        t.item_style_set(item, 0, 's2')
+        t.item_complex(item, 
+                       [
+                         ['e1', {:image=>@images["outlook-#{img}"]}], 
+                         ['e3', {:text=>text}], 
+                         ['e4', {:text=>"(#{unread})"}]
+                       ])
+      else
+        t.item_style_set(item, 0, 's1')
+        t.item_complex(item, 
+                       [
+                         ['e1', {:image=>@images["outlook-#{img}"]}], 
+                         ['e2', {:text=>text}]
+                       ])
+      end
+    end
+    t.item_lastchild(parentList[depth], item)
+    depth += 1
+    parentList[depth] = item
+  }
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
new file mode 100644
index 0000000000..d7e7f7e004
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb
@@ -0,0 +1,448 @@
+#
+# Demo: Outlook Express newsgroup messages
+#
+def demoOutlookNewsgroup(t)
+  init_pics('outlook-*')
+
+  height = t.font.metrics(:linespace)
+  height = 18 if height < 18
+  t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>false, 
+              :showroot=>false, :showrootbutton=>false, :showbuttons=>true)
+
+  if $Version_1_1_OrLater
+    t.column_create(:image=>@images['outlook-clip'], :tag=>'clip')
+    t.column_create(:image=>@images['outlook-arrow'], :tag=>'arrow')
+    t.column_create(:image=>@images['outlook-watch'], :tag=>'watch')
+    t.column_create(:text=>'Subject', :width=>250, :tag=>'subject')
+    t.column_create(:text=>'From', :width=>150, :tag=>'from')
+    t.column_create(:text=>'Sent', :width=>150, :tag=>'sent')
+    t.column_create(:text=>'Size', :width=>60, :justify=>:right, :tag=>'size')
+  else # TreeCtrl 1.0
+    t.column_configure(0, :image=>@images['outlook-clip'], :tag=>'clip')
+    t.column_configure(1, :image=>@images['outlook-arrow'], :tag=>'arrow')
+    t.column_configure(2, :image=>@images['outlook-watch'], :tag=>'watch')
+    t.column_configure(3, :text=>'Subject', :width=>250, :tag=>'subject')
+    t.column_configure(4, :text=>'From', :width=>150, :tag=>'from')
+    t.column_configure(5, :text=>'Sent', :width=>150, :tag=>'sent')
+    t.column_configure(6, :text=>'Size', :width=>60, :justify=>:right, 
+                       :tag=>'size')
+  end
+
+  # Would be nice if I could specify a column -tag too
+  t.treecolumn = 3
+
+  # State for a read message
+  t.state_define('read')
+
+  # State for a message with unread descendants
+  t.state_define('unread')
+
+  t.element_create('elemImg', :image, 
+                   :image=>[
+                     @sel_images['outlook-read-2'], 
+                          ['selected', 'read', 'unread', '!open'], 
+                     @images['outlook-read-2'], ['read', 'unread', '!open'],
+                     @sel_images['outlook-read'], ['selected', 'read'], 
+                     @images['outlook-read'], ['read'], 
+                     @sel_images['outlook-unread'], ['selected'], 
+                     @images['outlook-unread'], []
+                   ])
+  t.element_create('elemTxt', :text, :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']], 
+                   :font=>[
+                     t.font.dup.weight(:bold), ['read', 'unread', '!open'], 
+                     t.font.dup.weight(:bold), ['!read']
+                   ])
+  t.element_create('sel.e', :rect, :open=>:e, :showfocus=>true, 
+                   :fill=>[
+                     @SystemHighlight, ['selected', 'focus'], 
+                     'gray',  ['selected', '!focus']
+                   ])
+  t.element_create('sel.w', :rect, :open=>:w, :showfocus=>true, 
+                   :fill=>[
+                     @SystemHighlight, ['selected', 'focus'], 
+                     'gray',  ['selected', '!focus']
+                   ])
+  t.element_create('sel.we', :rect, :open=>:we, :showfocus=>true, 
+                   :fill=>[
+                     @SystemHighlight, ['selected', 'focus'], 
+                     'gray',  ['selected', '!focus']
+                   ])
+
+  # Image + text
+  s = t.style_create('s1')
+  t.style_elements(s, ['sel.e', 'elemImg', 'elemTxt'])
+  t.style_layout(s, 'elemImg', :expand=>:ns)
+  t.style_layout(s, 'elemTxt', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
+  t.style_layout(s, 'sel.e', :union=>['elemTxt'], 
+                 :iexpand=>:nes, :ipadx=>[2,0])
+
+  # Text
+  s = t.style_create('s2.we')
+  t.style_elements(s, ['sel.we', 'elemTxt'])
+  t.style_layout(s, 'elemTxt', :padx=>6, :squeeze=>:x, :expand=>:ns)
+  t.style_layout(s, 'sel.we', :detach=>true, :iexpand=>:es)
+
+  # Text
+  s = t.style_create('s2.w')
+  t.style_elements(s, ['sel.w', 'elemTxt'])
+  t.style_layout(s, 'elemTxt', :padx=>6, :squeeze=>:x, :expand=>:ns)
+  t.style_layout(s, 'sel.w', :detach=>true, :iexpand=>:es)
+
+  # Set default item style
+  if $Version_1_1_OrLater
+    t.defaultstyle = ['', '', '', 's1', 's2.we', 's2.we', 's2.w']
+  end
+
+  msgCnt = 100
+  thread = 0
+
+  @Message = Hash.new{|k, v| k[v] = Hash.new}
+  @Message[:count][0] = 0
+
+  items = [t.index(:root)]
+
+  (1...(msgCnt)).each{|i|
+    item_i = t.item_create
+    item_j = nil
+    j = nil
+    loop {
+      j = rand(i)
+      item_j = items[j]
+      break if j == 0
+      next if t.depth(item_j) == 5
+      next if @Message[:count][@Message[:thread][item_j]] == 15
+      break
+    }
+    t.item_lastchild(item_j, item_i)
+
+    @Message[:read][item_i] = (rand(2) == 0)
+    if j == 0
+      thread += 1
+      @Message[:thread][item_i] = thread
+      @Message[:seconds][item_i] = (Tk::Clock.seconds - rand(500000))
+      @Message[:seconds2][item_i] = @Message[:seconds][item_i]
+      @Message[:count][thread] = 1
+    else
+      @Message[:thread][item_i] = @Message[:thread][item_j]
+      @Message[:seconds][item_i] = (@Message[:seconds2][item_j] + rand(10000))
+      @Message[:seconds2][item_i] = @Message[:seconds][item_i]
+      @Message[:seconds2][item_j] = @Message[:seconds][item_i]
+      @Message[:count][@Message[:thread][item_j]] += 1
+    end
+    items << item_i
+  }
+
+  (1...(msgCnt)).each{|i|
+    item_i = items[i]
+    subject = "This is thread number #{@Message[:thread][item_i]}"
+    from = 'somebody@somewhere.net'
+    sent = Tk::Clock.format(@Message[:seconds][item_i], "%d/%m/%y %I:%M %p")
+    size = "#{1 + rand(10)}KB"
+
+    # This message has been read
+    t.item_state_set(item_i, 'read') if @Message[:read][item_i]
+
+    # This message has unread descendants
+    t.item_state_set(item_i, 'unread')  if anyUnreadDescendants(t, item_i)
+
+    if t.item_numchildren(item_i) > 0
+      if $Version_1_1_OrLater
+        t.item_configure(item_i, :button=>true)
+      else # TreeCtrl 1.0
+        t.item_hasbutton(item_i, true)
+      end
+
+      # Collapse some messages
+      if $Version_1_1_OrLater
+        t.item_collapse(item_i) if rand(2) == 0
+      else # TreeCtrl 1.0
+        t.collapse(item_i) if rand(2) == 0
+      end
+    end
+
+    unless $Version_1_1_OrLater
+      t.item_style_set(item_i, 3, 's1', 4, 's2.we', 5, 's2.we', 6, 's2.w')
+    end
+    t.item_text(item_i, 3, subject, 4, from, 5, sent, 6, size)
+  }
+
+  # Do something when the selection changes
+  t.notify_bind(t, 'Selection', 
+                proc{|w|
+                  if w.selection_count == 1
+                    # One item is selected
+                    if @Message[:afterId][:id]
+                      Tk.after_cancel(@Message[:afterId][:id]) 
+                    end
+                    @Message[:afterId][:item] = w.selection_get[0]
+                    @Message[:afterId][:id] = Tk.after(500, proc{
+                                                         messageReadDelayed(w)
+                                                       })
+                  end
+                }, '%T')
+end
+
+def messageReadDelayed(t)
+  @Message[:afterId].delete(:id)
+  i = @Message[:afterId][:item]
+  return unless t.selection_includes(i)
+
+  # This message is not read
+  unless @Message[:read][i]
+    # Read the message
+    t.item_state_set(i, 'read')
+    @Message[:read][i] = true
+
+    # Check ancestors (except root)
+    t.item_ancestors(i)[0..-2].each{|i2|
+      # This ancestor has no more unread descendants
+      t.item_state_set(i2, '!unread') unless anyUnreadDescendants(t, i2)
+    }
+  end
+end
+
+# Alternate implementation which does not rely on run-time states
+def demoOutlookNewsgroup2(t)
+  init_pics('outlook-*')
+
+  height = t.font.metrics(:linespace)
+  height = 18 if height < 18
+  t.configure(:itemheight=>height, :selectmode=>:browse, :showlines=>false, 
+              :showroot=>false, :showrootbutton=>false, :showbuttons=>true)
+
+  if $Version_1_1_OrLater
+    t.column_create(:image=>@images['outlook-clip'], :tag=>'clip')
+    t.column_create(:image=>@images['outlook-arrow'], :tag=>'arrow')
+    t.column_create(:image=>@images['outlook-watch'], :tag=>'watch')
+    t.column_create(:text=>'Subject', :width=>250, :tag=>'subject')
+    t.column_create(:text=>'From', :width=>150, :tag=>'from')
+    t.column_create(:text=>'Sent', :width=>150, :tag=>'sent')
+    t.column_create(:text=>'Size', :width=>60, :justify=>:right, :tag=>'size')
+  else # TreeCtrl 1.0
+    t.column_configure(0, :image=>@images['outlook-clip'], :tag=>'clip')
+    t.column_configure(1, :image=>@images['outlook-arrow'], :tag=>'arrow')
+    t.column_configure(2, :image=>@images['outlook-watch'], :tag=>'watch')
+    t.column_configure(3, :text=>'Subject', :width=>250, :tag=>'subject')
+    t.column_configure(4, :text=>'From', :width=>150, :tag=>'from')
+    t.column_configure(5, :text=>'Sent', :width=>150, :tag=>'sent')
+    t.column_configure(6, :text=>'Size', :width=>60, :justify=>:right, 
+                       :tag=>'size')
+  end
+
+  t.treecolumn = 3
+
+  t.element_create('image.unread', :image, :image=>@images['outlook-unread'])
+  t.element_create('image.read', :image, :image=>@images['outlook-read'])
+  t.element_create('image.read2', :image, :image=>@images['outlook-read-2'])
+  t.element_create('text.read', :text, :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
+  t.element_create('text.unread', :text, :lines=>1, 
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']], 
+                   :font=>t.font.dup.weight(:bold))
+  t.element_create('sel.e', :rect, :open=>:e, :showfocus=>true, 
+                   :fill=>[
+                     @SystemHighlight, ['selected', 'focus'], 
+                     'gray',  ['selected', '!focus']
+                   ])
+  t.element_create('sel.w', :rect, :open=>:w, :showfocus=>true, 
+                   :fill=>[
+                     @SystemHighlight, ['selected', 'focus'], 
+                     'gray',  ['selected', '!focus']
+                   ])
+  t.element_create('sel.we', :rect, :open=>:we, :showfocus=>true, 
+                   :fill=>[
+                     @SystemHighlight, ['selected', 'focus'], 
+                     'gray',  ['selected', '!focus']
+                   ])
+
+  # Image + text
+  s = t.style_create('unread')
+  t.style_elements(s, ['sel.e', 'image.unread', 'text.unread'])
+  t.style_layout(s, 'image.unread', :expand=>:ns)
+  t.style_layout(s, 'text.unread', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
+  t.style_layout(s, 'sel.e', :union=>['text.unread'], 
+                 :iexpand=>:nes, :ipadx=>[2,0])
+
+  # Image + text
+  s = t.style_create('read')
+  t.style_elements(s, ['sel.e', 'image.read', 'text.read'])
+  t.style_layout(s, 'image.read', :expand=>:ns)
+  t.style_layout(s, 'text.read', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
+  t.style_layout(s, 'sel.e', :union=>['text.read'], 
+                 :iexpand=>:nes, :ipadx=>[2,0])
+
+  # Image + text
+  s = t.style_create('read2')
+  t.style_elements(s, ['sel.e', 'image.read2', 'text.unread'])
+  t.style_layout(s, 'image.read2', :expand=>:ns)
+  t.style_layout(s, 'text.unread', :padx=>[2,6], :squeeze=>:x, :expand=>:ns)
+  t.style_layout(s, 'sel.e', :union=>['text.unread'], 
+                 :iexpand=>:nes, :ipadx=>[2,0])
+
+  # Text
+  s = t.style_create('unread.we')
+  t.style_elements(s, ['sel.we', 'text.unread'])
+  t.style_layout(s, 'text.unread', :padx=>6, :squeeze=>:x, :expand=>:ns)
+  t.style_layout(s, 'sel.we', :detach=>true, :iexpand=>:es)
+
+  # Text
+  s = t.style_create('read.we')
+  t.style_elements(s, ['sel.we', 'text.read'])
+  t.style_layout(s, 'text.read', :padx=>6, :squeeze=>:x, :expand=>:ns)
+  t.style_layout(s, 'sel.we', :detach=>true, :iexpand=>:es)
+
+  # Text
+  s = t.style_create('unread.w')
+  t.style_elements(s, ['sel.w', 'text.unread'])
+  t.style_layout(s, 'text.unread', :padx=>6, :squeeze=>:x, :expand=>:ns)
+  t.style_layout(s, 'sel.w', :detach=>true, :iexpand=>:es)
+
+  # Text
+  s = t.style_create('read.w')
+  t.style_elements(s, ['sel.w', 'text.read'])
+  t.style_layout(s, 'text.read', :padx=>6, :squeeze=>:x, :expand=>:ns)
+  t.style_layout(s, 'sel.w', :detach=>true, :iexpand=>:es)
+
+  msgCnt = 100
+  thread = 0
+
+  @Message = Hash.new{|k, v| k[v] = Hash.new}
+  @Message[:count][0] = 0
+
+  (1...(msgCnt)).each{|i|
+    t.item_create
+    j = nil
+    loop {
+      j = rand(i)
+      break if j == 0
+      next if t.depth(j) == 5
+      next if @Message[:count][@Message[:thread][j]] == 15
+      break
+    }
+    t.item_lastchild(j, i)
+
+    @Message[:read][i] = (rand(2) == 0)
+    if j == 0
+      thread += 1
+      @Message[:thread][i] = thread
+      @Message[:seconds][i] = (Tk::Clock.seconds - rand(500000))
+      @Message[:seconds2][i] = @Message[:seconds][i]
+      @Message[:count][thread] = 1
+    else
+      @Message[:thread][i] = @Message[:thread][j]
+      @Message[:seconds][i] = (@Message[:seconds2][j] + rand(10000))
+      @Message[:seconds2][i] = @Message[:seconds][i]
+      @Message[:seconds2][j] = @Message[:seconds][i]
+      @Message[:count][@Message[:thread][j]] += 1
+    end
+  }
+
+  (1...(msgCnt)).each{|i|
+    subject = "This is thread number #{@Message[:thread][i]}"
+    from = 'somebody@somewhere.net'
+    sent = Tk::Clock.format(@Message[:seconds][i], "%d/%m/%y %I:%M %p")
+    size = "#{1 + rand(10)}KB"
+    if @Message[:read][i]
+      style = 'read'
+      style2 = 'read2'
+    else
+      style = 'unread'
+      style2 = 'unread2'
+    end
+    t.item_style_set(i, 3, style, 4, "#{style2}.we", 5, "#{style2}.we", 
+                     6, "#{style2}.w")
+    t.item_text(i, 3, subject, 4, from, 5, sent, 6, size)
+    if t.item_numchildren(i) > 0
+      t.item_configure(item_i, :button=>true)
+    end
+  }
+
+  # Do something when the selection changes
+  t.notify_bind(t, 'Selection', 
+                proc{|w|
+                  if w.selection_count == 1
+                    i = t.selection_get[0]
+                    unless @Message[:read][i]
+                      if t.item_isopen(i) || !anyUnreadDescendants(t, i)
+                        # unread -> read
+                        t.item_style_map(i, 'subject', 'read', 
+                                         ['text.unread', 'text.read'])
+                        t.item_style_map(i, 'from', 'read.we', 
+                                         ['text.unread', 'text.read'])
+                        t.item_style_map(i, 'sent', 'read.we', 
+                                         ['text.unread', 'text.read'])
+                        t.item_style_map(i, 'size', 'read.w', 
+                                         ['text.unread', 'text.read'])
+                      else
+                        # unread -> read2
+                        t.item_style_map(i, 'subject', 'read2', 
+                                         ['text.unread', 'text.unread'])
+                      end
+
+                      @Message[:read][i] = true
+                      @display_styles_in_item.call(i)
+                    end
+                  end
+                }, '%T')
+
+  t.notify_bind(t, 'Expand-after', 
+                proc{|w, i|
+                  if @Messge[:read][i] && anyUnreadDescendants(t, i)
+                    # read2 -> read
+                    t.item_style_map(i, 'subject', 'read', 
+                                     ['text.unread', 'text.read'])
+                    # unread -> read
+                    t.item_style_map(i, 'from', 'read.we', 
+                                     ['text.unread', 'text.read'])
+                    t.item_style_map(i, 'sent', 'read.we', 
+                                     ['text.unread', 'text.read'])
+                    t.item_style_map(i, 'size', 'read.w', 
+                                     ['text.unread', 'text.read'])
+                  end
+                }, '%T %I')
+
+  t.notify_bind(t, 'Collapse-after', 
+                proc{|w, i|
+                  if @Messge[:read][i] && anyUnreadDescendants(t, i)
+                    # read -> read2
+                    t.item_style_map(i, 'subject', 'read2', 
+                                     ['text.read', 'text.unread'])
+                    # read -> unread
+                    t.item_style_map(i, 'from', 'unread.we', 
+                                     ['text.read', 'text.unread'])
+                    t.item_style_map(i, 'sent', 'unread.we', 
+                                     ['text.read', 'text.unread'])
+                    t.item_style_map(i, 'size', 'unread.w', 
+                                     ['text.read', 'text.unread'])
+                  end
+                }, '%T %I')
+
+  (1...(msgCnt)).each{|i|
+    if rand(2) == 0
+      if t.item_numchildren(i) > 0
+        if $Version_1_1_OrLater
+          t.item_collapse(i)
+        else # TreeCtrl 1.0
+          t.collapse(i)
+        end
+      end
+    end
+  }
+end
+
+def anyUnreadDescendants(t, i)
+  itemList = []
+  item = t.item_firstchild(i)
+  itemList.push(item) if item != ''
+
+  while item = itemList.pop
+    return true unless @Message[:read][item]
+
+    item2 = t.item_nextsibling(item)
+    itemList.push(item2) if item2 != ''
+    item2 = t.item_firstchild(item)
+    itemList.push(item2) if item2 != ''
+  end
+  false
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-dll.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-dll.gif
new file mode 100644
index 0000000000..09170c0e26
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-dll.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-exe.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-exe.gif
new file mode 100644
index 0000000000..e19aac1a2d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-exe.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-file.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-file.gif
new file mode 100644
index 0000000000..6c752312a3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-file.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-folder.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-folder.gif
new file mode 100644
index 0000000000..186c9749fd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-folder.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-txt.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-txt.gif
new file mode 100644
index 0000000000..a93492586e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/big-txt.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/checked.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/checked.gif
new file mode 100644
index 0000000000..3b9b176ab3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/checked.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/file.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/file.gif
new file mode 100644
index 0000000000..a64c2a06bd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/file.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/folder-closed.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/folder-closed.gif
new file mode 100644
index 0000000000..0a064376c9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/folder-closed.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/folder-open.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/folder-open.gif
new file mode 100644
index 0000000000..3fac27ffd9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/folder-open.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/help-book-closed.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/help-book-closed.gif
new file mode 100644
index 0000000000..0a0497bfa3
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/help-book-closed.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/help-book-open.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/help-book-open.gif
new file mode 100644
index 0000000000..40656c5194
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/help-book-open.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/help-page.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/help-page.gif
new file mode 100644
index 0000000000..e1ce1d72f5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/help-page.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-01.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-01.gif
new file mode 100644
index 0000000000..5fd9215551
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-01.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-02.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-02.gif
new file mode 100644
index 0000000000..3d2d1c17c2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-02.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-03.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-03.gif
new file mode 100644
index 0000000000..9fccf12b51
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-03.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-04.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-04.gif
new file mode 100644
index 0000000000..eff851c9bb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-04.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-05.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-05.gif
new file mode 100644
index 0000000000..ad00c827f6
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-05.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-06.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-06.gif
new file mode 100644
index 0000000000..238bf162ac
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-06.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-07.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-07.gif
new file mode 100644
index 0000000000..a9287e1b1c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/imovie-07.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-check-off.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-check-off.gif
new file mode 100644
index 0000000000..e64866a394
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-check-off.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-check-on.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-check-on.gif
new file mode 100644
index 0000000000..cf652beff2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-check-on.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-print.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-print.gif
new file mode 100644
index 0000000000..7ac25b10e9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-print.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-off.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-off.gif
new file mode 100644
index 0000000000..90ef62971f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-off.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-on.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-on.gif
new file mode 100644
index 0000000000..9de742c198
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-radio-on.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-search.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-search.gif
new file mode 100644
index 0000000000..1f9a047701
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-search.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-security.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-security.gif
new file mode 100644
index 0000000000..86d3943786
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/internet-security.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/mac-collapse.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/mac-collapse.gif
new file mode 100644
index 0000000000..81302c80c1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/mac-collapse.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/mac-expand.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/mac-expand.gif
new file mode 100644
index 0000000000..0a2cd80040
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/mac-expand.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-arrow.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-arrow.gif
new file mode 100644
index 0000000000..b1c2afd426
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-arrow.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-clip.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-clip.gif
new file mode 100644
index 0000000000..8578132702
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-clip.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-deleted.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-deleted.gif
new file mode 100644
index 0000000000..7cc8369b4b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-deleted.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-draft.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-draft.gif
new file mode 100644
index 0000000000..f19585050f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-draft.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-folder.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-folder.gif
new file mode 100644
index 0000000000..b3f733563b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-folder.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-group.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-group.gif
new file mode 100644
index 0000000000..29ad9b466e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-group.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-inbox.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-inbox.gif
new file mode 100644
index 0000000000..f41d804444
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-inbox.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-local.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-local.gif
new file mode 100644
index 0000000000..0c74970d32
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-local.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-main.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-main.gif
new file mode 100644
index 0000000000..92325fa85f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-main.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-outbox.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-outbox.gif
new file mode 100644
index 0000000000..c7e80527a0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-outbox.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-read-2.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-read-2.gif
new file mode 100644
index 0000000000..2f15a3af05
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-read-2.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-read.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-read.gif
new file mode 100644
index 0000000000..a6f956207a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-read.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-sent.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-sent.gif
new file mode 100644
index 0000000000..963b56c4c9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-sent.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-server.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-server.gif
new file mode 100644
index 0000000000..c950845d62
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-server.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-unread.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-unread.gif
new file mode 100644
index 0000000000..3df4b99439
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-unread.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-watch.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-watch.gif
new file mode 100644
index 0000000000..87ec861312
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/outlook-watch.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/sky.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/sky.gif
new file mode 100644
index 0000000000..b7fbf14a0a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/sky.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-dll.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-dll.gif
new file mode 100644
index 0000000000..d8875ec23f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-dll.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-exe.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-exe.gif
new file mode 100644
index 0000000000..69d30beacd
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-exe.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-file.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-file.gif
new file mode 100644
index 0000000000..f340662879
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-file.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-folder.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-folder.gif
new file mode 100644
index 0000000000..ad1b24da84
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-folder.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-txt.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-txt.gif
new file mode 100644
index 0000000000..cdc7cbfe99
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/small-txt.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/unchecked.gif b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/unchecked.gif
new file mode 100644
index 0000000000..833e48268b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/pics/unchecked.gif
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/random.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/random.rb
new file mode 100644
index 0000000000..2c9e614aa5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/random.rb
@@ -0,0 +1,508 @@
+# 
+def random_N
+  @RandomN[0] || 500
+end
+
+#
+# Demo: random N items
+#
+def demoRandom(t)
+  init_pics('folder-*', 'small-*')
+
+  height = t.font.metrics(:linespace)
+  height = 18 if height < 18
+  t.configure(:itemheight=>height, :selectmode=>:extended, 
+              :showroot=>true, :showrootbutton=>true, :showbuttons=>true, 
+              :showlines=>true, :scrollmargin=>16, 
+              :xscrolldelay=>[500, 50], :yscrolldelay=>[500, 50])
+
+  if $Version_1_1_OrLater
+    t.column_create(:expand=>true, :text=>'Item', 
+                    :itembackground=>['#e0e8f0', []], :tag=>'item')
+    t.column_create(:text=>'Parent', :justify=>:center, 
+                    :itembackground=>['gray90', []], :tag=>'parent')
+    t.column_create(:text=>'Depth', :justify=>:center, 
+                    :itembackground=>['linen', []], :tag=>'depth')
+  else # TreeCtrl 1.0
+    t.column_configure(0, :expand=>true, :text=>'Item', 
+                       :itembackground=>['#e0e8f0', []], :tag=>'item')
+    t.column_configure(1, :text=>'Parent', :justify=>:center, 
+                       :itembackground=>['gray90', []], :tag=>'parent')
+    t.column_configure(2, :text=>'Depth', :justify=>:center, 
+                       :itembackground=>['linen', []], :tag=>'depth')
+  end
+
+  t.element_create('e1', :image, :image=>[
+                     @images['folder-open'], ['open'], 
+                     @images['folder-closed'], []
+                   ])
+  t.element_create('e2', :image, :image=>@images['small-file'])
+  t.element_create('e3', :text, 
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
+  t.element_create('e4', :text, :fill=>'blue')
+  t.element_create('e6', :text)
+  t.element_create('e5', :rect, :showfocus=>true, 
+                   :fill=>[
+                     @SystemHighlight, ['selected', 'focus'], 
+                     'gray', ['selected', '!focus']
+                   ])
+
+  s = t.style_create('s1')
+  t.style_elements(s, ['e5', 'e1', 'e3', 'e4'])
+  t.style_layout(s, 'e1', :padx=>[0,4], :expand=>:ns)
+  t.style_layout(s, 'e3', :padx=>[0,4], :expand=>:ns)
+  t.style_layout(s, 'e4', :padx=>[0,6], :expand=>:ns)
+  t.style_layout(s, 'e5', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
+
+  s = t.style_create('s2')
+  t.style_elements(s, ['e5', 'e2', 'e3'])
+  t.style_layout(s, 'e2', :padx=>[0,4], :expand=>:ns)
+  t.style_layout(s, 'e3', :padx=>[0,4], :expand=>:ns)
+  t.style_layout(s, 'e5', :union=>['e3'], :iexpand=>:ns, :ipadx=>2)
+
+  s = t.style_create('s3')
+  t.style_elements(s, ['e6'])
+  t.style_layout(s, 'e6', :padx=>6, :expand=>:ns)
+
+  @Priv[:sensitive, t] = [
+    [:item, 's1',  'e5', 'e1', 'e3'], 
+    [:item, 's2',  'e5', 'e2', 'e3']
+  ]
+  @Priv[:dragimage, t] = [
+    [:item, 's1',  'e1', 'e3'], 
+    [:item, 's2',  'e2', 'e3']
+  ]
+
+  clicks = Tk::Clock.clicks
+  items = [ t.index(:root) ]
+  (1...(random_N())).each{|i|
+    item_i = t.item_create
+    item_j = nil
+    loop {
+      j = rand(i)
+      item_j = items[j]
+      break if t.depth(item_j) < 5
+    }
+    if $Version_1_1_OrLater
+      t.item_collapse(item_i) if rand(2) == 0
+    else # TreeCtrl 1.0
+      t.collapse(item_i) if rand(2) == 0
+    end
+    if rand(2) == 0
+      t.item_lastchild(item_j, item_i)
+    else
+      t.item_firstchild(item_j, item_i)
+    end
+    items << item_i
+  }
+  puts "created #{random_N() - 1} items in #{Tk::Clock.clicks - clicks} clicks"
+
+  clicks = Tk::Clock.clicks
+  (0...(random_N())).each{|i|
+    item_i = items[i]
+    numChildren = t.item_numchildren(item_i)
+    if numChildren > 0
+      if $Version_1_1_OrLater
+        t.item_configure(item_i, :button=>true)
+      else # TreeCtrl 1.0
+        t.item_hasbutton(item_i, true)
+      end
+      t.item_style_set(item_i, 0, 's1', 1, 's3', 2, 's3')
+      t.item_complex(item_i, 
+                     [ ['e3', {:text=>"Item #{i}"}], 
+                       ['e4', {:text=>"(#{numChildren})"}] ], 
+                     [ ['e6', {:text=>"#{t.item_parent(item_i)}"}] ], 
+                     [ ['e6', {:text=>"#{t.depth(item_i)}"}] ])
+    else
+      t.item_style_set(item_i, 1, 's3', 2, 's3', 0, 's2')
+      t.item_complex(item_i, 
+                     [ ['e3', {:text=>"Item #{i}"}] ], 
+                     [ ['e6', {:text=>"#{t.item_parent(item_i)}"}] ], 
+                     [ ['e6', {:text=>"#{t.depth(item_i)}"}] ])
+    end
+  }
+  puts "configured #{random_N()} items in #{Tk::Clock.clicks - clicks} clicks"
+
+  treeCtrlRandom = TkBindTag.new
+
+  treeCtrlRandom.bind('Double-ButtonPress-1', 
+                      proc{|w, x, y|
+                        Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+
+  treeCtrlRandom.bind('Control-ButtonPress-1', 
+                      proc{|w, x, y|
+                        @Priv['selectMode'] = :toggle
+                        randomButton1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+
+  treeCtrlRandom.bind('Shift-ButtonPress-1', 
+                      proc{|w, x, y|
+                        @Priv['selectMode'] = :add
+                        randomButton1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+
+  treeCtrlRandom.bind('ButtonPress-1', 
+                      proc{|w, x, y|
+                        @Priv['selectMode'] = :set
+                        randomButton1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+
+  treeCtrlRandom.bind('Button1-Motion', 
+                      proc{|w, x, y|
+                        randomMotion1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+
+  treeCtrlRandom.bind('Button1-Leave', 
+                      proc{|w, x, y|
+                        randomLeave1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+
+  treeCtrlRandom.bind('ButtonRelease-1', 
+                      proc{|w, x, y|
+                        randomRelease1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+
+  t.bindtags = [ t, treeCtrlRandom, Tk::TreeCtrl, t.winfo_toplevel, :all ]
+end
+
+def randomButton1(t, x, y)
+  t.set_focus
+  id = t.identify(x, y)
+  puts id.inspect
+  @Priv['buttonMode'] = ''
+
+  # Click outside any item
+  if id.empty?
+    t.selection_clear
+
+  # Click in header
+  elsif id[0] == 'header'
+    Tk::TreeCtrl::BindCallback.buttonPress1(t, x, y)
+
+  # Click in item
+  else
+    where, item, arg1, arg2, arg3, arg4 = id
+    case arg1
+    when 'button'
+      if $Version_1_1_OrLater
+        t.item_toggle(item)
+      else # TreeCtrl 1.0
+        t.toggle(item)
+      end
+
+    when 'line'
+      if $Version_1_1_OrLater
+        t.item_toggle(arg2)
+      else # TreeCtrl 1.0
+        t.toggle(arg2)
+      end
+
+    when 'column'
+      ok = false
+      # Clicked an element
+      if id.length == 6
+        column = id[3]
+        e = id[5]
+        @Priv.list_element(:sensitive, t).each{|lst|
+          c, s, *eList = TkComm.simplelist(lst)
+          next if column != t.column_index(c)
+          next if t.item_style_set(item, c) != s
+          next if eList.find{|le| le == e} == nil
+          ok = true
+          break
+        }
+      end
+      unless ok
+        t.selection_clear
+        return
+      end
+
+      @Priv[:drag, :motion] = 0
+      @Priv[:drag, :x] = t.canvasx(x)
+      @Priv[:drag, :y] = t.canvasy(y)
+      @Priv[:drop] = ''
+
+      if @Priv['selectMode'] == 'add'
+          Tk::TreeCtrl::BindCallback.beginExtend(t, item)
+      elsif @Priv['selectMode'] == 'toggle'
+          Tk::TreeCtrl::BindCallback.beginToggle(t, item)
+      elsif ! t.selection_includes(item)
+          Tk::TreeCtrl::BindCallback.beginSelect(t, item)
+      end
+      t.activate(item)
+
+      if t.selection_includes(item)
+        @Priv['buttonMode'] = 'drag'
+      end
+    end
+  end
+end
+
+def randomMotion1(t, x, y)
+  case @Priv['buttonMode']
+  when 'resize', 'header'
+    Tk::TreeCtrl::BindCallback.motion1(t, x, y)
+  when 'drag'
+    randomAutoScanCheck(t, x, y)
+    randomMotion(t, x, y)
+  end
+end
+
+def randomMotion(t, x, y)
+  case @Priv['buttonMode']
+  when 'resize', 'header'
+    Tk::TreeCtrl::BindCallback.motion1(t, x, y)
+
+  when 'drag'
+    # Detect initial mouse movement
+    unless @Priv.bool_element(:drag, :motion)
+      @Priv[:selection] = t.selection_get
+      @Priv[:drop] = ''
+      t.dragimage_clear
+      # For each selected item, add 2nd and 3rd elements of
+      # column "item" to the dragimage
+      @Priv.list_element(:selection).each{|i|
+        @Priv.list_element(:dragimage,t).each{|lst|
+          c, s, *eList = TkComm.simplelist(lst)
+          if t.item_style_set(i, c) == s
+            t.dragimage_add(i, c, *eList)
+          end
+        }
+      }
+      @Priv[:drag,:motion] = true
+    end
+
+    # Find the item under the cursor
+    cursor = 'X_cursor'
+    drop = ''
+    id = t.identify(x, y)
+    ok = false
+    if !id.empty? && id[0] == 'item' && id.length == 6
+      item = id[1]
+      column = id[3]
+      e = id[5]
+      @Priv.list_element(:sensitive,t).each{|lst|
+        c, s, *eList = TkComm.simplelist(lst)
+        next if column != t.column_index(c)
+        next if t.item_style_set(item, c) != s
+        next unless eList.find{|val| val.to_s == e.to_s}
+        ok = true
+        break
+      }
+      ok = true if @Priv.list_element(:sensitive,t).find{|val| TkComm.simplelist(val).index(e)}
+    end
+
+    if ok
+      # If the item is not in the pre-drag selection
+      # (i.e. not being dragged) see if we can drop on it
+      unless @Priv.list_element(:selection).find{|val| val.to_s == item.to_s}
+        drop = item
+        # We can drop if dragged item isn't an ancestor
+        @Priv.list_element(:selection).each{|item2|
+          if t.item_isancestor(item2, item)
+            drop = ''
+            break
+          end
+        }
+        if drop != ''
+          x1, y1, x2, y2 = t.item_bbox(drop)
+          if y < y1 + 3
+            cursor = 'top_side'
+            @Priv[:drop,:pos] = 'prevsibling'
+          elsif y >= y2 - 3
+            cursor = 'bottom_side'
+            @Priv[:drop,:pos] = 'nextsibling'
+          else
+            cursor = ''
+            @Priv[:drop,:pos] = 'lastchild'
+          end
+        end
+      end
+    end
+
+    t[:cursor] = cursor if t[:cursor] != cursor
+
+    # Select the item under the cursor (if any) and deselect
+    # the previous drop-item (if any)
+    t.selection_modify(drop, @Priv[:drop])
+    @Priv[:drop] = drop
+
+    # Show the dragimage in its new position
+    x = t.canvasx(x) - @Priv.numeric_element(:drag,:x)
+    y = t.canvasx(y) - @Priv.numeric_element(:drag,:y)
+    t.dragimage_offset(x, y)
+    t.dragimage_configure(:visible=>true)
+  end
+end
+
+def randomLeave1(t, x, y)
+  # This is called when I do ButtonPress-1 on Unix for some reason,
+  # and buttonMode is undefined.
+  return unless @Priv.exist?('buttonMode')
+  case @Priv['buttonMode']
+  when 'header'
+    Tk::TreeCtrl::BindCallback.leave1(t, x, y)
+  end
+end
+
+def randomRelease1(t, x, y)
+  case @Priv['buttonMode']
+  when 'resize', 'header'
+    Tk::TreeCtrl::BindCallback.release1(t, x, y)
+  when 'drag'
+    Tk::TreeCtrl::BindCallback.autoScanCancel(t)
+    t.dragimage_configure(:visible=>false)
+    t.selection_modify('', @Priv[:drop])
+    t[:cursor] = ''
+    if @Priv[:drop] != ''
+      randomDrop(t, @Priv[:drop], @Priv.list_element(:selection), 
+                 @Priv[:drop, :pos])
+    end
+  end
+  @Priv['buttonMode'] = ''
+end
+
+def randomDrop(t, target, src, pos)
+  parentList = []
+  case pos
+  when 'lastchild'
+    parent = target
+  when 'prevsibling'
+    parent = t.item_parent(target)
+  when 'nextsibling'
+    parent = t.item_parent(target)
+  end
+  src.each{|item|
+    # Ignore any item whose ancestor is also selected
+    ignore = false
+    t.item_ancestors(item).each{|ancestor|
+      if src.find{|val| val.to_s == ancestor.to_s}
+        ignore = true
+        break
+      end
+    }
+    next if ignore
+
+    # Update the old parent of this moved item later
+    unless parentList.find{|val| val.to_s == item.to_s}
+      parentList << t.item_parent(item)
+    end
+
+    # Add to target
+    t.__send__("item_#{pos}", target, item)
+
+    # Update text: parent
+    t.item_element_configure(item, 'parent', 'e6', :text=>parent)
+
+    # Update text: depth
+    t.item_element_configure(item, 'depth', 'e6', :text=>t.depth(item))
+
+    # Recursively update text: depth
+    itemList = []
+    item = t.item_firstchild(item)
+    itemList << item if item != ''
+
+    while item = itemList.pop
+      t.item_element_configure(item, 'depth', 'e6', :text=>t.depth(item))
+
+      item2 = t.item_nextsibling(item)
+      itemList << item2 if item2 != ''
+
+      item2 = t.item_firstchild(item)
+      itemList << item2 if item2 != ''
+    end
+  }
+
+  # Update items that lost some children
+  parentList.each{|item|
+    numChildren = t.item_numchildren(item)
+    if numChildren == 0
+      if $Version_1_1_OrLater
+        t.item_configure(item, :button=>false)
+      else # TreeCtrl 1.0
+        t.item_hasbutton(item, false)
+      end
+      t.item_style_map(item, 'item', 's2', ['e3', 'e3'])
+    else
+      t.item_element_configure(item, 'item', 'e4', :text=>"(#{numChildren})")
+    end
+  }
+
+  # Update the target that gained some children
+  if t.item_style_set(parent, 0) != 's1'
+    if $Version_1_1_OrLater
+      t.item_configure(parent, :button=>true)
+    else # TreeCtrl 1.0
+      t.item_hasbutton(parent, true)
+    end
+    t.item_style_map(parent, 'item', 's1', ['e3', 'e3'])
+  end
+  numChildren = t.item_numchildren(parent)
+  t.item_element_configure(parent, 'item', 'e4', :text=>"(#{numChildren})")
+end
+
+# Same as TreeCtrl::AutoScanCheck, but calls RandomMotion and
+# RandomAutoScanCheckAux
+def randomAutoScanCheck(t, x, y)
+  x1, y1, x2, y2 = t.contentbox
+  margin = t.winfo_pixels(t.scrollmargin)
+  if x < x1 + margin || x >= x2 - margin || y < y1 + margin || y >= y2 - margin
+    if ! @Priv.exist?(:autoscan, :afterId, t)
+      if y >= y2 - margin
+        t.yview(:scroll, 1, :units)
+        delay = t.yscrolldelay
+      elsif y < y1 + margin
+        t.yview(:scroll, -1, :units)
+        delay = t.yscrolldelay
+      elsif x >= x2 - margin
+        t.xview(:scroll, 1, :units)
+        delay = t.xscrolldelay
+      elsif x < x1 + margin
+        t.xview(:scroll, -1, :units)
+        delay = t.xscrolldelay
+      end
+      if @Priv.exist?(:autoscan, :scanning, t)
+        delay = delay[1] if delay.kind_of?(Array)
+      else
+        delay = delay[0] if delay.kind_of?(Array)
+        @Priv[:autoscan, :scanning, t] = true
+      end
+      case @Priv['buttonMode']
+      when 'drag', 'marquee'
+        randomMotion(t, x, y)
+      end
+      @Priv[:autoscan, :afterId, t] = 
+        Tk.after(delay, proc{ randomAutoScanCheckAux(t) })
+    end
+    return
+  end
+  Tk::TreeCtrl::BindCallback.autoScanCancel(t)
+end
+
+def randomAutoScanCheckAux(t)
+  @Priv.unset(:autoscan, :afterId, t)
+  x = t.winfo_pointerx - t.winfo_rootx
+  y = t.winfo_pointery - t.winfo_rooty
+  randomAutoScanCheck(t, x, y)
+end
+
+#
+# Demo: random N items, button images
+#
+def demoRandom2(t)
+  demoRandom(t)
+
+  init_pics('mac-*')
+
+  t.configure(:openbuttonimage=>@images['mac-collapse'], 
+              :closedbuttonimage=>@images['mac-expand'], 
+              :showlines=>false)
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/readme.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/readme.txt
new file mode 100644
index 0000000000..9f26ac069c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/readme.txt
@@ -0,0 +1,2 @@
+The scripts and image files in this directory are based on demo files
+of Tcl/Tk's TreeCtrl extention. 
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/www-options.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/www-options.rb
new file mode 100644
index 0000000000..efa55ca06c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/treectrl/www-options.rb
@@ -0,0 +1,303 @@
+def demoInternetOptions (t)
+  @Option = TkVarAccess.new_hash('::Option')
+
+  height = t.font.metrics(:linespace) + 2
+  height = 18 if height < 18
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+              :itemheight=>height, :selectmode=>:browse)
+
+  init_pics('internet-*')
+
+  if $HasColumnCreate
+    t.column_create(:text=>'Internet Options')
+  else
+    t.column_configure(0, :text=>'Internet Options')
+  end
+
+  t.state_define('check')
+  t.state_define('radio')
+  t.state_define('on')
+
+  t.element_create('e1', :image, :image=>[
+                     @images['internet-check-on'],  ['check', 'on'], 
+                     @images['internet-check-off'], ['check'], 
+                     @images['internet-radio-on'],  ['radio', 'on'], 
+                     @images['internet-radio-off'], ['radio']
+                   ])
+  t.element_create('e2', :text, 
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
+  t.element_create('e3', :rect, :showfocus=>true, 
+                   :fill=>[@SystemHighlight, ['selected', 'focus']])
+
+  s = t.style_create('s1')
+  t.style_elements(s, ['e3', 'e1', 'e2'])
+  t.style_layout(s, 'e1', :padx=>[0,4], :expand=>:ns)
+  t.style_layout(s, 'e2', :expand=>:ns)
+  t.style_layout(s, 'e3', :union=>['e2'], :iexpand=>:ns, :ipadx=>2)
+
+  parentList = [:root, '', '', '', '', '', '']
+  parent = :root
+  [
+    [0, :print, "Printing", "", ""], 
+        [1, :off, "Print background colors and images", "o1", ""], 
+    [0, :search, "Search from Address bar", "", ""], 
+        [1, :search, "When searching", "", ""], 
+            [2, :off, "Display results, and go to the most likely sites", 
+                                                                 "o2", "r1"], 
+            [2, :off, "Do not search from the Address bar", "o3", "r1"], 
+            [2, :off, "Just display the results in the main window", 
+                                                                 "o4", "r1"],
+            [2, :on, "Just go to the most likely site", "o5", "r1"], 
+    [0, :security, "Security", "", ""], 
+        [1, :on, "Check for publisher's certificate revocation", "o5", ""], 
+        [1, :off, "Check for server certificate revocation (requires restart)",
+                                                                 "o6", ""]
+  ].each{|depth, setting, text, option, group|
+    item = t.item_create()
+    t.item_style_set(item, 0, 's1')
+    t.item_element_configure(item, 0, 'e2', :text=>text)
+    @Option[:option, item] = option
+    @Option[:group, item] = group
+    if setting == :on || setting == :off
+      @Option[:setting, item] = setting
+      if group == ''
+        t.item_state_set(item, 'check')
+        if setting == :on
+          t.item_state_set(item, 'on')
+        end
+      else
+        if setting == :on
+          @Option[:current, group] = item
+          t.item_state_set(item, 'on')
+        end
+        t.item_state_set(item, 'radio')
+      end
+    else
+      t.item_element_configure(item, 0, 'e1', 
+                               :image=>@images["internet-#{setting}"])
+    end
+    t.item_lastchild(parentList[depth], item)
+    depth += 1
+    parentList[depth] = item
+  }
+
+  treeCtrlOption = TkBindTag.new
+  treeCtrlOption.bind('Double-ButtonPress-1', proc{|w, x, y|
+                        Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
+                      }, '%W %x %y')
+  treeCtrlOption.bind('ButtonPress-1', proc{|w, x, y|
+                        optionButton1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+  treeCtrlOption.bind('Button1-Motion', proc{|w, x, y|
+                        optionMotion1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+  treeCtrlOption.bind('Button1-Leave', proc{|w, x, y|
+                        optionLeave1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+  treeCtrlOption.bind('ButtonRelease-1', proc{|w, x, y|
+                        optionRelease1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+
+  t.bindtags = [
+    t, treeCtrlOption, Tk::TreeCtrl, t.winfo_toplevel, TkBindTag::ALL
+  ]
+end
+
+def optionButton1(w, x, y)
+  w.set_focus
+  id = w.identify(x, y)
+  if id[0] == 'header'
+    Tk::TreeCtrl::BindCallback.buttonPress1(w, x, y)
+  elsif id.empty?
+    @Priv['buttonMode'] = ''
+  else
+    @Priv['buttonMode'] = ''
+    item = id[1]
+    w.selection_modify(item, :all)
+    w.activate(item)
+    return if @Option[:option, item] == ''
+    group = @Option[:group, item]
+    if group == ''
+      # a checkbutton
+      w.item_state_set(item, '~on')
+      if @Option[:setting, item] == 'on'
+        setting = :off
+      else
+        setting = :on
+      end
+      @Option[:setting, item] = setting
+    else
+      # a radiobutton
+      current = @Option[:current, group]
+      return if current == item.to_s
+      w.item_state_set(current, '!on')
+      w.item_state_set(item, 'on')
+      @Option[:setting, item] = :on
+      @Option[:current, group] = item
+    end
+  end
+end
+
+# Alternate implementation that doesn't rely on run-time styles
+def demoInternetOptions_2(t)
+  height = t.font.metrics(:linespace) + 2
+  height = 18 if height < 18
+  t.configure(:showroot=>false, :showbuttons=>false, :showlines=>false, 
+              :itemheight=>height, :selectmode=>:browse)
+
+  init_pics('internet-*')
+
+  t.column_configure(0, :text=>'Internet Options')
+
+  t.element_create('e1', :image)
+  t.element_create('e2', :text, 
+                   :fill=>[@SystemHighlightText, ['selected', 'focus']])
+  t.element_create('e3', :rect, :showfocus=>true, 
+                   :fill=>[@SystemHighlight, ['selected', 'focus']])
+
+  s = t.style_create('s1')
+  t.style_elements('s1', ['e3', 'e1', 'e2'])
+  t.style_layout(s, 'e1', :padx=>[0,4], :expand=>:ns)
+  t.style_layout(s, 'e2', :expand=>:ns)
+  t.style_layout(s, 'e3', :union=>['e2'], :iexpand=>:ns, :ipadx=>2)
+
+  parentList = [:root, '', '', '', '', '', '']
+  parent = :root
+  [
+    [0, :print, "Printing", "", ""], 
+        [1, :off, "Print background colors and images", "o1", ""], 
+    [0, :search, "Search from Address bar", "", ""], 
+        [1, :search, "When searching", "", ""], 
+            [2, :off, "Display results, and go to the most likely sites", 
+                                                                 "o2", "r1"], 
+            [2, :off, "Do not search from the Address bar", "o3", "r1"], 
+            [2, :off, "Just display the results in the main window", 
+                                                                 "o4", "r1"],
+            [2, :on, "Just go to the most likely site", "o5", "r1"], 
+    [0, :security, "Security", "", ""], 
+        [1, :on, "Check for publisher's certificate revocation", "o5", ""], 
+        [1, :off, "Check for server certificate revocation (requires restart)",
+                                                                 "o6", ""]
+  ].each{|depth, setting, text, option, group|
+    item = t.item_create()
+    t.item_style_set(item, 0, 's1')
+    t.item_element_configure(item, 0, 'e2', :text=>text)
+    @Option[:option, item] = option
+    @Option[:group, item] = group
+    if setting == :on || setting == :off
+      @Option[:setting, item] = setting
+      if group == ''
+        img = @images["internet-check-#{setting}"]
+        t.item_element_configure(item, 0, 'e1', :image=>img)
+      else
+        if setting == :on
+          @Option[:current, group] = item
+        end
+        img = @images["internet-radio-#{setting}"]
+        t.item_element_configure(item, 0, 'e1', :image=>img)
+      end
+    else
+      t.item_element_configure(item, 0, 'e1', 
+                               :image=>@images["internet-#{setting}"])
+    end
+    t.item_lastchild(parentList[depth], item)
+    depth += 1
+    parentList[depth] = item
+  }
+
+  treeCtrlOption = TkBindTag.new
+  treeCtrlOption.bind('Double-ButtonPress-1', proc{|w, x, y|
+                        Tk::TreeCtrl::BindCallback.doubleButton1(w, x, y)
+                      }, '%W %x %y')
+  treeCtrlOption.bind('ButtonPress-1', proc{|w, x, y|
+                        optionButton1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+  treeCtrlOption.bind('Button1-Motion', proc{|w, x, y|
+                        optionMotion1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+  treeCtrlOption.bind('Button1-Leave', proc{|w, x, y|
+                        optionLeave1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+  treeCtrlOption.bind('ButtonRelease-1', proc{|w, x, y|
+                        optionRelease1(w, x, y)
+                        Tk.callback_break
+                      }, '%W %x %y')
+
+  t.bindtags = [
+    t, treeCtrlOption, Tk::TreeCtrl, t.winfo_toplevel, TkBindTag::ALL
+  ]
+end
+
+def optionButton1_2(w, x, y)
+  w.set_focus
+  id = w.identify(x, y)
+  if id[0] == 'header'
+    Tk::TreeCtrl::BindCallback.buttonPress1(w, x, y)
+  elsif id.empty?
+    @Priv['buttonMode'] = ''
+  else
+    @Priv['buttonMode'] = ''
+    item = id[1]
+    w.selection_modify(item, :all)
+    w.activate(item)
+    return if @Option[:option, item] == ''
+    group = @Option[:group, item]
+    if group == ''
+      # a checkbutton
+      if @Option[:setting, item] == 'on'
+        setting = :off
+      else
+        setting = :on
+      end
+      w.item_element_configure(item, 0, 'e1', 
+                               :image=>@images["internet-check-#{setting}"])
+      @Option[:setting, item] = setting
+    else
+      # a radiobutton
+      current = @Option[:current, group]
+      return if current == item.to_s
+      w.item_element_configure(current, 0, 'e1', 
+                               :image=>@images["internet-radio-off"])
+      w.item_element_configure(item, 0, 'e1', 
+                               :image=>@images["internet-radio-on"])
+      @Option[:setting, item] = :on
+      @Option[:current, group] = item
+    end
+  end
+end
+
+def optionMotion1(w, x, y)
+  case @Priv['buttonMode']
+  when 'resize', 'header'
+    Tk::TreeCtrl::BindCallback.motion1(w, x, y)
+  end
+end
+
+def optionLeave1(w, x, y)
+  # This is called when I do ButtonPress-1 on Unix for some reason,
+  # and buttonMode is undefined.
+  begin
+    mode = @Priv['buttonMode']
+  rescue
+  else
+    case mode
+    when 'header'
+      t.column_configure(@Priv['column'], :sunken=>false)
+    end
+  end
+end
+
+def optionRelease1(w, x, y)
+  case @Priv['buttonMode']
+  when 'resize', 'header'
+    Tk::TreeCtrl::BindCallback.release1(w, x, y)
+  end
+  @Priv['buttonMode'] = ''
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/vu/Orig_LICENSE.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/Orig_LICENSE.txt
new file mode 100644
index 0000000000..f5f2f770cf
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/Orig_LICENSE.txt
@@ -0,0 +1,51 @@
+
+  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+  >>>  The following text is the original 'license.txt' of vu extension.  <<<
+  >>>  Original Tcl source files are not include in this directry,        <<<
+  >>>  because of all of them are rewrited to Ruby files.                 <<<
+  >>>  However, the bitmap data file included in this directory is the    <<<
+  >>>  same file of vu extension. So, the bitmap data file is under the   <<<
+  >>>  following license.                                                 <<<
+  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+		   * COPYRIGHT AND LICENSE TERMS *
+
+(This file blatantly stolen from Tcl/Tk license and adapted - thus assume
+it falls under similar license terms).
+
+This software is copyrighted by Jeffrey Hobbs <jeff.hobbs@acm.org> and
+others.  The following terms apply to all files associated with the
+software unless explicitly disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute, and
+license this software and its documentation for any purpose, provided that
+existing copyright notices are retained in all copies and that this notice
+is included verbatim in any distributions.  No written agreement, license,
+or royalty fee is required for any of the authorized uses.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF,
+EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE IS
+PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO
+OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+RESTRICTED RIGHTS: Use, duplication or disclosure by the U.S. government
+is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
+of the Rights in Technical Data and Computer Software Clause as DFARS
+252.227-7013 and FAR 52.227-19.
+
+SPECIAL NOTES:
+
+This software also falls under the bourbon_ware clause:
+
+    Should you find this software useful in your daily work, you should
+    feel obliged to take the author out for a drink if the opportunity
+    presents itself.  The user may feel exempt from this clause if they
+    are under 21 or think the author has already partaken of too many
+    drinks.
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/vu/README.txt b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/README.txt
new file mode 100644
index 0000000000..ce5f371fac
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/README.txt
@@ -0,0 +1,50 @@
+
+  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+  >>>  The following text is the original 'README.txt' of  <<<
+  >>>  vu extension demos.                                 <<<
+  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+##
+## DESCRIPTION OF DEMOS
+##
+
+canvItems.tcl
+	old demo of all canvas chart items, useful to find memory leaks.
+	<1> prints out the additional memory usage (charts.so + script)
+
+canvSticker.tcl
+	Heribert Dahms original "demo.tcl"
+	<p> creates DEMO.ps
+
+canvSticker2.tcl
+	compares "sticker" and "text"; press <1>, <2> or <1> ...
+	<p> creates DEMO.ps
+
+dial.tcl
+	demo of variations of the dial widget.
+
+load.tcl
+	Just a utility file, not a real demo.
+
+m128_000.xbm
+	XBM pic used by sticker and canvItems demos
+
+oscilloscope.tcl
+	the heart of a Realtime Oscilloscope,where the PC�s joystick
+	port gives 4 digtal inputs and 4 analog 8 bit values with an
+	resolution of ~1 millisecond (!!!)  running Realtime Linux.
+	<p> creates DEMO.ps
+
+pie.tcl
+	The magic 3D spinning pie chart!
+
+vu.tcl
+	demo fo Vu widgets
+
+canvLabel.tcl
+	'label' is a canvas item just like 'text', but with -angle
+	rotation of the string.  This is not built in by default, as
+	it requires the internal Tk headers.
+	press <1>, <2> or <1> ...
+	<p> creates DEMO.ps
+
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/vu/canvItems.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/canvItems.rb
new file mode 100644
index 0000000000..33acf4f7e7
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/canvItems.rb
@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+require 'tkextlib/vu/charts'
+
+#######################################
+
+xbm = File.join(File.dirname(File.expand_path(__FILE__)), 'm128_000.xbm')
+
+sval = [ 11, 22, 33, 44, 55, 66, 77, 88, 99 ]
+
+l0 = TkLabel.new(:width=>128, :height=>128, 
+                 :bitmap=>"@#{xbm}", :relief=>:groove).pack(:side=>:left)
+
+c0 = TkCanvas.new(:width=>80, :height=>80, 
+                  :insertwidth=>0, :highlightthickness=>0, 
+                  :selectborderwidth=>0, :borderwidth=>2, 
+                  :relief=>:ridge).place(:in=>l0, :relx=>0.5, :rely=>0.5, 
+                                         :anchor=>:c)
+
+st = Tk::Vu::TkcStripchart.new(c0, 3, 3, 80, 80, 
+                               :background=>"#b7c0d7", :fill=>'slategray3', 
+                               :jumpscroll=>1, :outline=>'black', 
+                               :scaleline=>'blue', :stripline=>'red', 
+                               :selected=>1, :values=>sval)
+
+TkcText.create(c0, 40, 40, 
+               :text=>Tk::TCL_PATCHLEVEL, :fill=>'cyan', :tags=>'text')
+
+
+l1 = TkLabel.new(:width=>128, :height=>128, 
+                 :bitmap=>"@#{xbm}", :relief=>:groove).pack(:side=>:left)
+
+c1 = TkCanvas.new(:width=>80, :height=>80, 
+                  :insertwidth=>0, :highlightthickness=>0, 
+                  :selectborderwidth=>0, :borderwidth=>2, 
+                  :relief=>:ridge).place(:in=>l1, :relx=>0.5, :rely=>0.5, 
+                                         :anchor=>:c)
+
+bar1 = Tk::Vu::TkcBarchart.new(c1, 3, 3, 80, 80, 
+                               :background=>"#b7c0d7", :scalevalue=>10.0, 
+                               :autocolor=>true, :selected=>1, 
+                               :outline=>'black', :barline=>'yellow', 
+                               :scalelinestyle=>0)
+
+bar2 = Tk::Vu::TkcBarchart.new(c1, 53, 3, 80, 80, 
+                               :background=>"#b7c0d7", :scalevalue=>10.0, 
+                               :autocolor=>true, :selected=>1, 
+                               :outline=>'black', :fill=>"#b7c0d7", 
+                               :barline=>'red', :scalelinestyle=>22)
+
+
+l2 = TkLabel.new(:width=>128, :height=>128, 
+                 :bitmap=>"@#{xbm}", :relief=>:groove).pack(:side=>:left)
+
+c2 = TkCanvas.new(:width=>80, :height=>80, 
+                  :insertwidth=>0, :highlightthickness=>0, 
+                  :selectborderwidth=>0, :borderwidth=>2, 
+                  :relief=>:ridge).place(:in=>l2, :relx=>0.5, :rely=>0.5, 
+                                         :anchor=>:c)
+
+begin
+  stick = Tk::Vu::TkcSticker.new(c2, 3, 3, 80, 80, 
+                                 :text=>"Tcl/Tk", :space=>0, :color=>'red', 
+                                 :outline=>'red', :font=>'Helvetica 14 bold', 
+                                 :fill=>'', :stipple=>'', :bar=>'blue', 
+                                 :orient=>:vertical, :anchor=>:s, 
+                                 :relheight=>1.0, :relwidth=>0.15, 
+                                 :relx=>0.1, :rely=>0.0)
+rescue
+  stick = nil
+  TkcText.new(c2, 40, 10, :text=>"No Sticker Item")
+end
+
+c_do = proc{
+  st[:values]   = rand() * 100
+
+  bar1[:values] = rand() * 10
+  bar2[:values] = rand() * 10
+
+  stick[:rely]  = rand() * 100 * 0.01 if stick
+}
+
+c0.bind('1', c_do)
+
+TkTimer.new(100, -1, c_do).start
+
+Tk.root.bind('q', proc{exit})
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/vu/canvSticker.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/canvSticker.rb
new file mode 100644
index 0000000000..e2cd604975
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/canvSticker.rb
@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+require 'tkextlib/vu/charts'
+
+#######################################
+
+Tk.root.geometry('+30+30')
+
+delay = 2000
+
+c = TkCanvas.new.pack
+
+begin
+  st = Tk::Vu::TkcSticker.new(c, 0, 0, 10, 10)
+rescue
+  Tk.messageBox(:type=>'ok', :title=>"No sticker Item", 
+                :message=>"This build of vu does not include the sticker item")
+  exit
+end
+#st.delete
+
+steps = []
+
+steps << proc{
+  # I used a 75dpi screen for testing, but others should make no difference!
+  puts 'You\'ll see a small upright rectangle with "He" inside.'
+  st = Tk::Vu::TkcSticker.new(c, '6m', '10m', '13m', '27m', :text=>'Hello')
+}
+
+steps << proc{
+  puts 'You\'ll see the whole "Hello" drawn rotated 90 degrees.'
+  st[:orient] = :vertical
+}
+
+steps << proc{
+  puts 'The rectangle shrinks and the text is clipped to "Hell"'
+  #st.coords('6m', '10m', '13m', '20m')
+  st.coords('6m', '10m', '13m', '17m')
+}
+
+steps << proc{
+  puts 'Now you\'ll read "ello"'
+  st[:lefttrunc] = true
+}
+
+steps << proc{
+  puts 'Enlarging the rectangle shows the complete "Hello" again'
+  st.scale(0, 0, 3, 3)
+}
+
+steps << proc{
+  puts 'This time the text is repeated: "Hello", approx. 5mm space, "Hello"'
+  st[:space] = '5m'
+}
+
+steps << proc{
+  puts 'A vertical bar appears in the lower right region and text jumps to the left.'
+  st.configure(:anchor=>:n, :relw=>0.3, :relh=>0.7, 
+               :relx=>0.6, :rely=>0.3, :bar=>'red')
+}
+
+steps << proc{
+  puts 'Paint the backgound.'
+  st[:fill] = 'yellow'
+}
+
+steps << proc{
+  puts "Let's test stippling."
+  st[:stipple] = 'gray25'
+}
+
+steps << proc{
+  puts 'Finally a large outline forces a single "Hello" and shrinks the bar.'
+  st[:width] = '6m'
+}
+
+Tk.root.bind('q', proc{exit})
+
+TkTimer.new(delay, 1, *steps).start
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/vu/canvSticker2.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/canvSticker2.rb
new file mode 100644
index 0000000000..f54e748660
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/canvSticker2.rb
@@ -0,0 +1,99 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+require 'tkextlib/vu/charts'
+
+#######################################
+
+c = TkCanvas.new.pack
+
+begin
+  st = Tk::Vu::TkcSticker.new(c, 0, 0, 10, 10)
+rescue
+  Tk.messageBox(:type=>'ok', :title=>"No sticker Item", 
+                :message=>"This build of vu does not include the sticker item")
+  exit
+end
+
+c.destroy
+
+#---
+#--- set STRING {{x0 y0 x1 y1} {...text...} {resize point: center}
+
+#sti_conf = [ [10, 10, 180, 180], "Sticker 糜��@桶悉�",  :center ]
+#txt_conf = [ [210, 210],        "Text    糜��@桶悉�",  :center ]
+sti_conf = [ [10, 10, 350, 350], 
+             Tk::UTF8_String("Sticker 糜��@桶悉�"),  :center ]
+txt_conf = [ [250, 250],
+             Tk::UTF8_String("Text    糜��@桶悉�"),  :center ]
+
+p sti_conf
+
+fnt = TkFont.new('Helvetica 24 bold')
+
+#---GUI
+c = TkCanvas.new(:width=>500, :height=>500, :bg=>'aquamarine3').pack
+
+#---CRRW Use the technique of eval the coord ...
+sti = Tk::Vu::TkcSticker.new(c, sti_conf[0]){
+  anchor    sti_conf[2]
+  bar       'black'
+  color     'red'
+  fill      ''
+  font      fnt
+  lefttrunc 0
+  outline   ''
+  relheight 0.0
+  relwidth  0.0
+  relx      0.0
+  rely      0.0
+  space     0
+  stipple   ''
+  tags      'sti'
+  text      sti_conf[1]
+  width     0
+  orient    :vertical
+  minwidth  0
+  minheight 0
+  maxwidth  32767
+  maxheight 32767
+}
+
+txt = TkcText.new(c, txt_conf[0]){
+  activefill      ''
+  activestipple   ''
+  anchor          txt_conf[2]
+  disabledfill    ''
+  disabledstipple ''
+  fill            'blue'
+  font            fnt
+  justify         :left
+  offset          '0,0'
+  state           ''
+  stipple         ''
+  tags            ['tex']
+  text            txt_conf[1]
+  width           0
+}
+
+#---BINDINGS
+c.bind('2', proc{
+         sti[:orient] = :horizontal
+         txt[:width] = 0  # horizontal
+       })
+
+c.bind('3', proc{
+         sti[:orient] = :vertical
+         txt[:width] = 1  # top down
+       })
+
+Tk.root.bind('p', proc{
+               c.postscript(:file=>'DEMO.ps')
+               puts "DEMO.ps printed"
+             })
+
+Tk.root.bind('q', proc{exit})
+
+#####################
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/vu/dial_demo.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/dial_demo.rb
new file mode 100644
index 0000000000..09bd3e9186
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/dial_demo.rb
@@ -0,0 +1,113 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+require 'tkextlib/vu/dial'
+
+#######################################
+
+v_volume = TkVariable.new
+v_speed  = TkVariable.new
+v_dir    = TkVariable.new
+v_rot    = TkVariable.new
+v_linked = TkVariable.new
+v_needle = TkVariable.new
+
+volume = Tk::Vu::Dial.new(:label=>"Volume", :from=>-0.1, :to=>0.1, 
+                          :resolution=>0.001, :minortickinterval=>0.01, 
+                          :tickinterval=>0.1, :beginangle=>-20, 
+                          :endangle=>260, :variable=>v_volume)
+
+speed = Tk::Vu::Dial.new(:label=>"Speed", :from=>2000, :to=>100, 
+                         :resolution=>10, :tickinterval=>100, 
+                         :minortickinterval=>0, :variable=>v_speed, 
+                         :showtags=>:label, :showvalue=>false)
+
+speed.set_tag_constrain(100, 'Fast', 2000, 'Slow')
+
+fwd  = Tk::Vu::Dial.new(:from=>-10.0, :to=>-20.0, :resolution=>0.1, 
+                        :tickinterval=>5.0, :minortickinterval=>1.0, 
+                        :variable=>v_dir)
+
+rev  = Tk::Vu::Dial.new(:from=>-20.0, :to=>-10.0, :resolution=>0.1, 
+                        :tickinterval=>5.0, :minortickinterval=>1.0, 
+                        :variable=>v_dir)
+
+small = Tk::Vu::Dial.new(:font=>"Helvetica -10", :from=>0, :to=>10, 
+                         :resolution=>0.05, :tickinterval=>2,
+                         :minortickinterval=>0.5, :radius=>20, 
+                         :dialcolor=>'red2', :activebackground=>'red', 
+                         :variable=>v_rot)
+
+large = Tk::Vu::Dial.new(:font=>"Helvetica -8", :from=>0, :to=>10, 
+                         :resolution=>0.05, :tickinterval=>1,
+                         :minortickinterval=>0.25, :radius=>40, 
+                         :dialcolor=>'red2', :activebackground=>'red', 
+                         :variable=>v_rot)
+
+turn = Tk::Vu::Dial.new(:needlecolor=>'red', :label=>"Linked", 
+                        :variable=>v_linked)
+
+scale = TkScale.new(:label=>"Linked", :variable=>v_linked)
+
+d1 = Tk::Vu::Dial.new(:resolution=>0.0001, :from=>-0.1, :to=>0.1, 
+                      :showvalue=>true, :minortickinterval=>0.01, 
+                      :tickinterval=>0.1, :radius=>30, :label=>"Dial", 
+                      :beginangle=>-20, :endangle=>260, :variable=>v_needle, 
+                      :relief=>:raised)
+
+d2 = Tk::Vu::Dial.new(:resolution=>0.01, :from=>-0.1, :to=>0.1, 
+                      :showvalue=>true, :minortickinterval=>0.01, 
+                      :tickinterval=>0.1, :radius=>30, :label=>"Dial 2", 
+                      :beginangle=>-20, :endangle=>260, :variable=>v_needle, 
+                      :dialrelief=>:flat, :needlecolor=>'red', 
+                      :needletype=>:triangle, :relief=>:sunken)
+
+d3 = Tk::Vu::Dial.new(:resolution=>0.001, :from=>-0.1, :to=>0.1, 
+                      :showvalue=>true, :minortickinterval=>0.01, 
+                      :tickinterval=>0.1, :radius=>30, :label=>"Dial 3", 
+                      :beginangle=>-20, :endangle=>260, :variable=>v_needle, 
+                      :dialrelief=>:flat, :needlecolor=>'blue', 
+                      :needletype=>:arc, :relief=>:ridge)
+
+f_btns = TkFrame.new
+f_sep  = TkFrame.new(:height=>2, :relief=>:sunken, :bd=>1)
+
+
+v_volume.value = -0.1
+v_speed.value = 500
+
+update = TkTimer.new(proc{v_speed.numeric}, -1, proc{
+                       if v_volume == volume[:to]
+                         v_volume.numeric = volume[:from]
+                       else
+                         v_volume.numeric += volume[:resolution]
+                       end
+                     })
+
+b_start = TkButton.new(:text=>"Start", :command=>proc{update.start})
+b_stop  = TkButton.new(:text=>"Stop",  :command=>proc{update.stop})
+b_exit  = TkButton.new(:text=>"Exit",  :command=>proc{exit})
+
+Tk.grid(b_start, :in=>f_btns, :sticky=>:ew, :padx=>4, :pady=>4)
+Tk.grid(b_stop,  :in=>f_btns, :sticky=>:ew, :padx=>4, :pady=>4)
+f_btns.grid_columnconfigure(0, :weight=>1)
+
+Tk.grid(f_btns, speed, volume, :sticky=>:news)
+Tk.grid(f_sep,  '-',   '-',    :sticky=>:news)
+Tk.grid(fwd,    rev,   d1,     :sticky=>:news)
+Tk.grid(small,  large, d2,     :sticky=>:news)
+Tk.grid(turn,   scale, d3,     :sticky=>:news)
+
+Tk.grid(b_exit, '-',   '-',    :sticky=>:ew, :padx=>4, :pady=>4)
+
+Tk.root.grid_columnconfigure(0, :weight=>1)
+Tk.root.grid_columnconfigure(1, :weight=>1)
+Tk.root.grid_columnconfigure(2, :weight=>1)
+
+Tk.root.grid_rowconfigure(0, :weight=>1)
+Tk.root.grid_rowconfigure(2, :weight=>1)
+Tk.root.grid_rowconfigure(3, :weight=>1)
+Tk.root.grid_rowconfigure(4, :weight=>1)
+
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/vu/m128_000.xbm b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/m128_000.xbm
new file mode 100644
index 0000000000..455e3c5e0f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/m128_000.xbm
@@ -0,0 +1,174 @@
+#define m128_000_width 128
+#define m128_000_height 128
+static unsigned char m128_000_bits[] = {
+  0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xf0, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03,
+  0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x03, 0xfc, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea, 0x0f, 0xfc, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5, 0x0f,
+  0xbf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3f, 0x7f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3f, 0xaf, 0xfa, 0xab, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xfa, 0xab, 0x3e,
+  0x5f, 0xf5, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0xf5, 0x57, 0x3d, 0xaf, 0x0e, 0xac, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x0e, 0xac, 0x3e, 0x5f, 0x0d, 0x5c, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x0d, 0x5c, 0x3d,
+  0xaf, 0x03, 0xb0, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0x03, 0xb0, 0x3e, 0x5f, 0x03, 0x70, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x03, 0x70, 0x3d, 0xaf, 0x03, 0xb0, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x03, 0xb0, 0x3e,
+  0x5f, 0x03, 0x70, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x03, 0x70, 0x3d, 0xaf, 0x03, 0xb0, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x03, 0xb0, 0x3e, 0x5f, 0x03, 0x70, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x03, 0x70, 0x3d,
+  0xaf, 0x0e, 0xac, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0x0e, 0xac, 0x3e, 0x5f, 0x0d, 0x5c, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x0d, 0x5c, 0x3d, 0xaf, 0xfa, 0xab, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xfa, 0xab, 0x3e,
+  0x5f, 0xf5, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0xf5, 0x57, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e,
+  0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x3d, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d,
+  0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0x3e, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3d, 0xaf, 0xfa, 0xab, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xfa, 0xab, 0x3e,
+  0x5f, 0xf5, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0xf5, 0x57, 0x3d, 0xaf, 0x0e, 0xac, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x0e, 0xac, 0x3e, 0x5f, 0x0d, 0x5c, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x0d, 0x5c, 0x3d,
+  0xaf, 0x03, 0xb0, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0x03, 0xb0, 0x3e, 0x5f, 0x03, 0x70, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x03, 0x70, 0x3d, 0xaf, 0x03, 0xb0, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x03, 0xb0, 0x3e,
+  0x5f, 0x03, 0x70, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x03, 0x70, 0x3d, 0xaf, 0x03, 0xb0, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x03, 0xb0, 0x3e, 0x5f, 0x03, 0x70, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x03, 0x70, 0x3d,
+  0xaf, 0x0e, 0xac, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0x0e, 0xac, 0x3e, 0x5f, 0x0d, 0x5c, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x0d, 0x5c, 0x3d, 0xaf, 0xfa, 0xab, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xfa, 0xab, 0x3e,
+  0x5f, 0xf5, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0xf5, 0x57, 0x3d, 0xbf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x3f, 0x7f, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3f,
+  0xfc, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+  0xaa, 0xaa, 0xea, 0x0f, 0xfc, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5, 0x0f, 0xf0, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03,
+  0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0x03, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xc0, 0xff, 0xff, 0xff,
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/vu/oscilloscope.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/oscilloscope.rb
new file mode 100644
index 0000000000..2015e46645
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/oscilloscope.rb
@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+require 'tkextlib/vu/charts'
+
+#---USAGE
+info = "...the heart of a Realtime Oscilloscope, where the PCIs
+joystick port gives 4 digtal inputs and 4 analog 8 bit
+values with an resolution of ~1 millisecond (!!!)
+running Realtime Linux.
+<p> creates DEMO.ps
+<B1-Motion> see what happens"
+puts info
+
+#---GEOMETRY
+geo_fr  = [10, 10, 210, 180]
+geo_ch0 = [10, 10, 210,  90]
+geo_ch1 = [10, 90, 210, 180]
+geo_t1  = [15, 88]
+
+#---GUI
+c = TkCanvas.new(:width=>220, :height=>190).pack(:fill=>:both, :expand=>true)
+
+#---background
+TkcRectangle.new(c, geo_fr, :width=>4, :fill=>'aquamarine3', 
+                 :tags=>['osc', 'frbg'])
+
+#---channel 0
+ch0 = Tk::Vu::TkcStripchart.new(c, geo_ch0, 
+                                :fill=>'', :jumpscroll=>false, 
+                                :outline=>'', :scaleline=>'', 
+                                :stripline=>'cyan', :tags=>['osc', 'ch0'])
+
+#---channel 1
+ch1 = Tk::Vu::TkcStripchart.new(c, geo_ch1, 
+                                :fill=>'', :jumpscroll=>0, 
+                                :outline=>'', :scaleline=>'', 
+                                :stripline=>'red', :tags=>['osc', 'ch1'])
+
+#---frame
+TkcRectangle.new(c, geo_fr, :width=>4, :tags=>['osc', 'frfg'])
+
+#---position
+txt1 = TkcText.new(c, geo_t1, :text=>"B1-Motion: X:%X\tY:%Y", 
+                   :anchor=>:nw, :tags=>['osc', 'txt1'])
+
+#---BINDINGS
+c.bind('B1-Motion', proc{|x, y, xx, yy|
+         ch0[:values] = x
+         ch1[:values] = y
+         txt1[:text] = "B1-Motion: X:#{xx}\tY:#{yy}"
+       }, '%x %y %X %Y')
+
+Tk.root.bind('v', proc{
+               puts ch0[:values].join(' ')
+               puts ch0[:values].size
+             })
+
+Tk.root.bind('p', proc{
+               c.postscript(:file=>'DEMO.ps')
+               puts "DEMO.ps printed"
+             })
+
+Tk.root.bind('q', proc{exit})
+
+#####################
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/vu/pie.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/pie.rb
new file mode 100644
index 0000000000..ed598d6233
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/pie.rb
@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+require 'tkextlib/vu/pie'
+
+pie = Tk::Vu::Pie.new(:label=>"My Revolving Budget"){
+  itemconfigure('Welfare',   :value=>3.004)
+  itemconfigure('Military',  :value=>7.006)
+  itemconfigure('Transport', :value=>1.6, :explode=>15)
+  itemconfigure('Parks',     :value=>0.9)
+  itemconfigure('Schools',   :value=>2)
+  itemconfigure('Debt',      :value=>4,   :explode=>10)
+
+  configure(:angle=>10, :origin=>90, :shadow=>10)
+}
+
+spin = TkTimer.new(60, -1, proc{|obj|
+  pie.configure(:origin=>pie[:origin] + 1)
+})
+
+f = TkFrame.new
+fast_btn = TkButton.new(f, :text=>"Spin Faster", :command=>proc{spin.start})
+slow_btn = TkButton.new(f, :text=>"Spin Slower", :command=>proc{spin.stop})
+quit_btn = TkButton.new(f, :text=>"Exit", :command=>proc{exit})
+
+Tk.grid(pie, :sticky=>:news)
+Tk.grid(f, :sticky=>:ew)
+
+Tk.pack(fast_btn, slow_btn, quit_btn, 
+        :in=>f, :side=>:left, :fill=>:both, :expand=>true, :padx=>6, :pady=>4)
+
+Tk.root.grid_columnconfigure(0, :weight=>1)
+Tk.root.grid_rowconfigure(0, :weight=>1)
+
+priv = { 
+  :x=>0, :y=>0, :pie_in=>false, :angle=>pie[:angle], :origin=>pie[:origin]
+}
+
+pie.bind('ButtonPress-1', proc{|w, x, y|
+             priv[:x] = x
+             priv[:y] = y
+             priv[:pie_in] = (w.winfo_width/1.8 > x)
+             priv[:angle]  = w[:angle]
+             priv[:origin] = w[:origin]
+         }, '%W %x %y')
+
+pie.bind('B1-Motion', proc{|w, x, y|
+           if priv[:pie_in]
+             w.configure(:angle=>priv[:angle] + (priv[:y] - y)/3, 
+                         :origin=>(priv[:origin] + 
+                                   ((w.winfo_height/2.2 > y)? -1: 1) * 
+                                   (priv[:x] - x)/3) % 360)
+           end
+         }, '%W %x %y')
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkextlib/vu/vu_demo.rb b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/vu_demo.rb
new file mode 100644
index 0000000000..d078ae16f2
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkextlib/vu/vu_demo.rb
@@ -0,0 +1,67 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+require 'tkextlib/vu'
+
+#######################################
+
+puts "Show off barchart and dial widgets"
+
+speed = TkVariable.new(0)
+
+dial = Tk::Vu::Dial.new(:resolution=>0.001, :from=>-0.1, :to=>0.1, 
+                        :showvalue=>true, :minortickinterval=>0.01, 
+                        :tickinterval=>0.1, :radius=>50, :label=>"Dial", 
+                        :beginangle=>-20, :endangle=>260, :dialcolor=>'red3', 
+                        :active=>'red2', :variable=>speed)
+
+bar = Tk::Vu::Bargraph.new(:from=>0, :to=>100, :relief=>:groove, 
+                           :border=>2, :label=>"Bar Chart")
+
+#######################################
+
+green   = 25
+blue    = 50
+purple  = 75
+current = 50
+
+def rand_bool
+  
+end
+
+update = TkTimer.new(200, -1, proc{
+                       if (rand() - 0.5 + speed.numeric * 3) > 0
+                         current += 1
+                       else
+                         current -= 1
+                       end
+                       bar.set(current)
+                       if current < green
+                         current = 100 if current <= 0
+                         bar[:barcolor] = 'green'
+                       elsif current < blue
+                         bar[:barcolor] = 'blue'
+                       elsif current < purple
+                         bar[:barcolor] = 'purple'
+                       else
+                         bar[:barcolor] = 'red'
+                         current = 0 if current >= 100
+                       end
+                     })
+
+#######################################
+
+gobar = TkButton.new(:text=>"Start", :command=>proc{update.start})
+nobar = TkButton.new(:text=>"Stop",  :command=>proc{update.stop})
+quit  = TkButton.new(:text=>"Exit",  :command=>proc{exit})
+
+Tk.grid('x', gobar, :sticky=>:ew, :padx=>4, :pady=>4)
+Tk.grid(dial, bar, :sticky=>:news)
+Tk.grid('x', nobar, :sticky=>:ew, :padx=>4, :pady=>4)
+Tk.grid(quit, '-', '-', :sticky=>:ew, :padx=>4, :pady=>4)
+Tk.root.grid_columnconfigure(2, :weight=>1)
+Tk.root.grid_rowconfigure(1, :weight=>1)
+                       
+#######################################
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkfrom.rb b/ruby_1_8_6/ext/tk/sample/tkfrom.rb
new file mode 100644
index 0000000000..2cece7337e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkfrom.rb
@@ -0,0 +1,132 @@
+#!/usr/bin/env ruby
+
+require "parsedate"
+require "base64"
+
+include ParseDate
+
+class Mail
+  def Mail.new(f)
+    if !f.kind_of?(IO)
+      f = open(f, "r")
+      me = super(f)
+      f.close
+    else
+      me = super
+    end
+    return me
+  end
+
+  def initialize(f)
+    @header = {}
+    @body = []
+    while line = f.gets()
+      $_.chop!
+      next if /^From / =~ line  # skip From-line  
+      break if /^$/ =~ line     # end of header
+      if /^(\S+):\s*(.*)/ =~ line
+        @header[attr = $1.capitalize] = $2
+      elsif attr
+        sub(/^\s*/, '')
+        @header[attr] += "\n" + $_
+      end
+    end
+
+    return unless $_
+
+    while line = f.gets()
+      break if /^From / =~ line
+      @body.push($_)
+    end
+  end
+
+  def header
+    return @header
+  end
+
+  def body
+    return @body
+  end
+
+end
+
+if ARGV.length == 0
+  if ENV['MAIL']
+    ARGV[0] = ENV['MAIL']
+  elsif ENV['USER']
+    ARGV[0] = '/var/spool/mail/' + ENV['USER']
+  elsif ENV['LOGNAME']
+    ARGV[0] = '/var/spool/mail/' + ENV['LOGNAME']
+  end
+end
+
+require "tk"
+list = scroll = nil
+TkFrame.new{|f|
+  list = TkListbox.new(f) {
+    yscroll proc{|*idx|
+        scroll.set *idx
+    }
+    relief 'raised'
+#    geometry "80x5"
+    width 80
+    height 5
+    setgrid 'yes'
+    pack('side'=>'left','fill'=>'both','expand'=>'yes')
+  }
+  scroll = TkScrollbar.new(f) {
+    command proc{|idx|
+      list.yview *idx
+    }
+    pack('side'=>'right','fill'=>'y')
+  }
+  pack
+}
+root = Tk.root
+TkButton.new(root) {
+  text 'Dismiss'
+  command proc {exit}
+  pack('fill'=>'both','expand'=>'yes')
+}
+root.bind "Control-c", proc{exit}
+root.bind "Control-q", proc{exit}
+root.bind "space", proc{exit}
+
+$outcount = 0;
+for file in ARGV
+  next unless File.exist?(file)
+  atime = File.atime(file)
+  mtime = File.mtime(file)
+  f = open(file, "r")
+  begin
+    until f.eof
+      mail = Mail.new(f)
+      date = mail.header['Date']
+      next unless date
+      from = mail.header['From']
+      subj = mail.header['Subject']
+      y = m = d = 0
+      y, m, d = parsedate(date) if date
+      from = "sombody@somewhere" unless from
+      subj = "(nil)" unless subj
+      from = decode_b(from)
+      subj = decode_b(subj)
+      list.insert 'end', format('%-02d/%02d/%02d [%-28.28s] %s',y,m,d,from,subj)
+      $outcount += 1
+    end
+  ensure
+    f.close
+    File.utime(atime, mtime, file)
+    list.see 'end'
+  end
+end
+
+limit = 10000
+if $outcount == 0
+  list.insert 'end', "You have no mail."
+  limit = 2000
+end
+Tk.after limit, proc{
+  exit
+}
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkhello.rb b/ruby_1_8_6/ext/tk/sample/tkhello.rb
new file mode 100644
index 0000000000..3b505f4983
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkhello.rb
@@ -0,0 +1,10 @@
+require "tk"
+
+TkButton.new(nil, 
+             :text => 'hello',
+             :command => proc{print "hello\n"}).pack(:fill=>'x')
+TkButton.new(nil,
+             :text => 'quit',
+             :command => proc{exit}).pack(:fill=>'x')
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkline.rb b/ruby_1_8_6/ext/tk/sample/tkline.rb
new file mode 100644
index 0000000000..3124c2fe0c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkline.rb
@@ -0,0 +1,47 @@
+
+require "tkclass"
+
+$tkline_init = FALSE
+def start_random
+  return if $tkline_init
+  $tkline_init = TRUE
+  if defined? Thread
+    Thread.start do
+      loop do
+        sleep 2
+        Line.new($c, rand(400), rand(200), rand(400), rand(200))
+      end
+    end
+  end
+end
+
+Label.new('text'=>'Please press or drag button-1').pack
+
+$c = Canvas.new
+$c.pack
+$start_x = start_y = 0
+
+def do_press(x, y)
+  $start_x = x
+  $start_y = y
+  $current_line = Line.new($c, x, y, x, y)
+  start_random
+end
+def do_motion(x, y)
+  if $current_line
+    $current_line.coords $start_x, $start_y, x, y
+  end
+end
+
+def do_release(x, y)
+  if $current_line
+    $current_line.coords $start_x, $start_y, x, y
+    $current_line.fill 'black'
+    $current_line = nil
+  end
+end
+
+$c.bind("1", proc{|e| do_press e.x, e.y})
+$c.bind("B1-Motion", proc{|x, y| do_motion x, y}, "%x %y")
+$c.bind("ButtonRelease-1", proc{|x, y| do_release x, y}, "%x %y")
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkmenubutton.rb b/ruby_1_8_6/ext/tk/sample/tkmenubutton.rb
new file mode 100644
index 0000000000..37f6128fd9
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkmenubutton.rb
@@ -0,0 +1,135 @@
+#!/usr/bin/env ruby
+#
+#  menubutton sample : based on sample menubuttons on the Tcl/Tk demo script
+#
+require 'tk'
+
+TkLabel.new(:text=>'Sample of TkMenubutton').pack(:side=>:top)
+
+TkFrame.new{|f|
+  pack(:side=>:top) 
+
+
+  TkMenubutton.new(:parent=>f, :text=>'Right', :underline=>0, 
+                   :direction=>:right, :relief=>:raised){|mb|
+    menu TkMenu.new(:parent=>mb, :tearoff=>0){
+      add(:command, :label=>'Right menu: first item', 
+                    :command=>proc{print 'You have selected the first item' + 
+                                         " from the Right menu.\n"})
+      add(:command, :label=>'Right menu: second item', 
+                    :command=>proc{print 'You have selected the second item' + 
+                                         " from the Right menu.\n"})
+    }
+    pack(:side=>:left, :padx=>25, :pady=>25)
+  }
+
+  TkMenubutton.new(:parent=>f, :text=>'Below', :underline=>0, 
+                   :direction=>:below, :relief=>:raised){|mb|
+    menu(TkMenu.new(:parent=>mb, :tearoff=>0){
+      add(:command, :label=>'Below menu: first item', 
+                    :command=>proc{print 'You have selected the first item' + 
+                                         " from the Below menu.\n"})
+      add(:command, :label=>'Below menu: second item', 
+                    :command=>proc{print 'You have selected the second item' + 
+                                         " from the Below menu.\n"})
+    })
+    pack(:side=>:left, :padx=>25, :pady=>25)
+  }
+
+  TkMenubutton.new(:parent=>f, :text=>'Above', :underline=>0, 
+                   :direction=>:above, :relief=>:raised){|mb|
+    menu TkMenu.new(:parent=>mb, :tearoff=>0){
+      add(:command, :label=>'Above menu: first item', 
+                    :command=>proc{print 'You have selected the first item' + 
+                                         " from the Above menu.\n"})
+      add(:command, :label=>'Above menu: second item', 
+                    :command=>proc{print 'You have selected the second item' + 
+                                         " from the Above menu.\n"})
+    }
+    pack(:side=>:left, :padx=>25, :pady=>25)
+  }
+
+  TkMenubutton.new(:parent=>f, :text=>'Left', :underline=>0, 
+                   :direction=>:left, :relief=>:raised){|mb|
+    menu(TkMenu.new(:parent=>mb, :tearoff=>0){
+      add(:command, :label=>'Left menu: first item', 
+                    :command=>proc{print 'You have selected the first item' + 
+                                         " from the Left menu.\n"})
+      add(:command, :label=>'Left menu: second item', 
+                    :command=>proc{print 'You have selected the second item' + 
+                                         " from the Left menu.\n"})
+    })
+    pack(:side=>:left, :padx=>25, :pady=>25)
+  }
+}
+
+############################
+TkFrame.new(:borderwidth=>2, :relief=>:sunken, 
+            :height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
+############################
+
+TkLabel.new(:text=>'Sample of TkOptionMenu').pack(:side=>:top)
+
+colors = %w(Black red4 DarkGreen NavyBlue gray75 Red Green Blue gray50 
+            Yellow Cyan Magenta White Brown DarkSeaGreen DarkViolet)
+
+TkFrame.new{|f|
+  pack(:side=>:top) 
+
+  b1 = TkOptionMenubutton . 
+    new(:parent=>f, :values=>%w(one two three)) . 
+    pack(:side=>:left, :padx=>25, :pady=>25)
+
+  b2 = TkOptionMenubutton.new(:parent=>f, :values=>colors) {|optMB|
+    colors.each{|color|
+      no_sel = TkPhotoImage.new(:height=>16, :width=>16){
+        put 'gray50', *[ 0,  0, 16,  1]
+        put 'gray50', *[ 0,  1,  1, 16]
+        put 'gray75', *[ 0, 15, 16, 16]
+        put 'gray75', *[15,  1, 16, 16]
+        put color,    *[ 1,  1, 15, 15]
+      }
+      sel = TkPhotoImage.new(:height=>16, :width=>16){
+        put 'Black',  *[ 0,  0, 16,  2]
+        put 'Black',  *[ 0,  2,  2, 16]
+        put 'Black',  *[ 2, 14, 16, 16]
+        put 'Black',  *[14,  2, 16, 14]
+        put color,    *[ 2,  2, 14, 14]
+      }
+      optMB.entryconfigure(color, :hidemargin=>1, 
+                           :image=>no_sel, :selectimage=>sel)
+    }
+    optMB.menuconfigure(:tearoff, 1)
+    %w(Black gray75 gray50 White).each{|color|
+      optMB.entryconfigure(color, :columnbreak=>true)
+    }
+    pack(:side=>:left, :padx=>25, :pady=>25)
+  }
+
+  TkButton.new(:parent=>f){
+    text 'show values'
+    command proc{p [b1.value, b2.value]}
+    pack(:side=>:left, :padx=>25, :pady=>5, :anchor=>:s)
+  }
+}
+
+############################
+TkFrame.new(:borderwidth=>2, :relief=>:sunken, 
+            :height=>5).pack(:side=>:top, :fill=>:x, :padx=>20)
+############################
+
+root = TkRoot.new(:title=>'menubutton samples')
+
+TkButton.new(root, :text=>'exit', :command=>proc{exit}){
+  pack(:side=>:top, :padx=>25, :pady=>5, :anchor=>:e)
+}
+
+# VirtualEvent <<MenuSelect>> on Tcl/Tk ==> '<MenuSelect>' on Ruby/Tk
+# ( remove the most external <, > for Ruby/Tk notation )
+TkMenu.bind('<MenuSelect>', proc{|widget|
+              p widget.entrycget('active', :label)
+            }, '%W')
+
+############################
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkmsgcat-load_rb.rb b/ruby_1_8_6/ext/tk/sample/tkmsgcat-load_rb.rb
new file mode 100644
index 0000000000..5373e0086f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkmsgcat-load_rb.rb
@@ -0,0 +1,102 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+
+demo_dir = File.dirname($0)
+msgcat_dir = [demo_dir, 'msgs_rb'].join(File::Separator)
+top_win = nil
+#msgcat = TkMsgCatalog.new('::tk')
+msgcat = TkMsgCatalog.new('::tkmsgcat_demo')
+default_locale = msgcat.locale
+#msgcat.load_rb(msgcat_dir)
+msgcat.load(msgcat_dir)
+
+col_proc = TkComm.install_bind(proc{|w, color, frame, label|
+                                 TkComm.window(frame).background(color)
+                                 Tk.update
+                                 TkComm.window(label).text(
+                                          msgcat["%1$s:: %2$s", 'Color', 
+                                                 color.capitalize])
+                                 w.flash; w.flash
+                                 Tk.callback_break;
+                              }, "%W")
+
+del_proc = TkComm.install_cmd(proc{top_win.destroy; top_win = nil})
+
+err_proc = TkComm.install_cmd(proc{fail(RuntimeError, 
+                                        msgcat['Application Error'])})
+
+show_sample = proc{|loc|
+  top_win = TkToplevel.new(:title=>loc)
+
+  msgcat.locale = loc
+  #msgcat.load_rb(msgcat_dir)
+  msgcat.load(msgcat_dir)
+
+  TkLabel.new(top_win){
+    text "preferences:: #{msgcat.preferences.join(' ')}"
+    pack(:pady=>10, :padx=>10)
+  }
+
+  lbl = TkLabel.new(top_win, :text=>msgcat["%1$s:: %2$s", 
+                                           'Color', '']).pack(:anchor=>'w')
+
+  bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10, 
+                                 :expand=>true, :fill=>:both)
+
+  TkFrame.new(bg){|f|
+    ['blue', 'green', 'red'].each{|col|
+      TkButton.new(f, :text=>msgcat[col]){
+        bind('ButtonRelease-1', col_proc, "#{col} #{bg.path} #{lbl.path}")
+      }.pack(:fill=>:x)
+    }
+  }.pack(:anchor=>'center', :pady=>15)
+
+  TkFrame.new(top_win){|f|
+    TkButton.new(f, :text=>msgcat['Delete'], 
+                 :command=>del_proc).pack(:side=>:right, :padx=>5)
+    TkButton.new(f, :text=>msgcat['Error'], 
+                 :command=>err_proc).pack(:side=>:left, :padx=>5)
+  }.pack(:side=>:bottom, :fill=>:x)
+
+  top_win
+}
+
+
+#  listbox for locale list
+TkLabel.new(:text=>"Please click a locale.").pack(:padx=>5, :pady=>3)
+
+TkFrame.new{|f|
+  TkButton.new(f, :text=>msgcat['Exit'], 
+               :command=>proc{exit}).pack(:side=>:right, :padx=>5)
+}.pack(:side=>:bottom, :fill=>:x)
+
+f = TkFrame.new.pack(:side=>:top, :fill=>:both, :expand=>true)
+lbox = TkListbox.new(f).pack(:side=>:left, :fill=>:both, :expand=>true)
+lbox.yscrollbar(TkScrollbar.new(f, :width=>12).pack(:side=>:right, :fill=>:y))
+
+lbox.bind('ButtonRelease-1'){|ev|
+  idx = lbox.index("@#{ev.x},#{ev.y}")
+  if idx == 0
+    loc = default_locale
+  else
+    loc = lbox.get(idx)
+  end
+  if top_win != nil && top_win.exist?
+    top_win.destroy
+  end
+  top_win = show_sample.call(loc)
+}
+
+lbox.insert('end', 'default')
+
+Dir.entries(msgcat_dir).sort.each{|f| 
+  if f =~ /^(.*).msg$/
+    lbox.insert('end', $1)
+  end
+}
+
+top_win = show_sample.call(default_locale)
+
+#  start eventloop
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkmsgcat-load_rb2.rb b/ruby_1_8_6/ext/tk/sample/tkmsgcat-load_rb2.rb
new file mode 100644
index 0000000000..55246545c8
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkmsgcat-load_rb2.rb
@@ -0,0 +1,102 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+
+demo_dir = File.dirname($0)
+msgcat_dir = [demo_dir, 'msgs_rb2'].join(File::Separator)
+top_win = nil
+#msgcat = TkMsgCatalog.new('::tk')
+msgcat = TkMsgCatalog.new('::tkmsgcat_demo')
+default_locale = msgcat.locale
+#msgcat.load_rb(msgcat_dir)
+msgcat.load(msgcat_dir)
+
+col_proc = TkComm.install_bind(proc{|w, color, frame, label|
+                                 TkComm.window(frame).background(color)
+                                 Tk.update
+                                 TkComm.window(label).text(
+                                          msgcat["%1$s:: %2$s", 'Color', 
+                                                 color.capitalize])
+                                 w.flash; w.flash
+                                 Tk.callback_break;
+                              }, "%W")
+
+del_proc = TkComm.install_cmd(proc{top_win.destroy; top_win = nil})
+
+err_proc = TkComm.install_cmd(proc{fail(RuntimeError, 
+                                        msgcat['Application Error'])})
+
+show_sample = proc{|loc|
+  top_win = TkToplevel.new(:title=>loc)
+
+  msgcat.locale = loc
+  #msgcat.load_rb(msgcat_dir)
+  msgcat.load(msgcat_dir)
+
+  TkLabel.new(top_win){
+    text "preferences:: #{msgcat.preferences.join(' ')}"
+    pack(:pady=>10, :padx=>10)
+  }
+
+  lbl = TkLabel.new(top_win, :text=>msgcat["%1$s:: %2$s", 
+                                           'Color', '']).pack(:anchor=>'w')
+
+  bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10, 
+                                 :expand=>true, :fill=>:both)
+
+  TkFrame.new(bg){|f|
+    ['blue', 'green', 'red'].each{|col|
+      TkButton.new(f, :text=>msgcat[col]){
+        bind('ButtonRelease-1', col_proc, "#{col} #{bg.path} #{lbl.path}")
+      }.pack(:fill=>:x)
+    }
+  }.pack(:anchor=>'center', :pady=>15)
+
+  TkFrame.new(top_win){|f|
+    TkButton.new(f, :text=>msgcat['Delete'], 
+                 :command=>del_proc).pack(:side=>:right, :padx=>5)
+    TkButton.new(f, :text=>msgcat['Error'], 
+                 :command=>err_proc).pack(:side=>:left, :padx=>5)
+  }.pack(:side=>:bottom, :fill=>:x)
+
+  top_win
+}
+
+
+#  listbox for locale list
+TkLabel.new(:text=>"Please click a locale.").pack(:padx=>5, :pady=>3)
+
+TkFrame.new{|f|
+  TkButton.new(f, :text=>msgcat['Exit'], 
+               :command=>proc{exit}).pack(:side=>:right, :padx=>5)
+}.pack(:side=>:bottom, :fill=>:x)
+
+f = TkFrame.new.pack(:side=>:top, :fill=>:both, :expand=>true)
+lbox = TkListbox.new(f).pack(:side=>:left, :fill=>:both, :expand=>true)
+lbox.yscrollbar(TkScrollbar.new(f, :width=>12).pack(:side=>:right, :fill=>:y))
+
+lbox.bind('ButtonRelease-1'){|ev|
+  idx = lbox.index("@#{ev.x},#{ev.y}")
+  if idx == 0
+    loc = default_locale
+  else
+    loc = lbox.get(idx)
+  end
+  if top_win != nil && top_win.exist?
+    top_win.destroy
+  end
+  top_win = show_sample.call(loc)
+}
+
+lbox.insert('end', 'default')
+
+Dir.entries(msgcat_dir).sort.each{|f| 
+  if f =~ /^(.*).msg$/
+    lbox.insert('end', $1)
+  end
+}
+
+top_win = show_sample.call(default_locale)
+
+#  start eventloop
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkmsgcat-load_tk.rb b/ruby_1_8_6/ext/tk/sample/tkmsgcat-load_tk.rb
new file mode 100644
index 0000000000..45d68e4e0b
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkmsgcat-load_tk.rb
@@ -0,0 +1,118 @@
+#!/usr/bin/env ruby
+
+require 'tk'
+
+demo_dir = File.dirname($0)
+msgcat_dir = [demo_dir, 'msgs_tk'].join(File::Separator)
+top_win = nil
+#msgcat = TkMsgCatalog.new('::tk')
+msgcat = TkMsgCatalog.new('::tkmsgcat_demo')
+default_locale = msgcat.locale
+msgcat.load_tk(msgcat_dir)
+
+col_proc = TkComm.install_bind(proc{|w, color, frame, label|
+                                 TkComm.window(frame).background(color)
+                                 Tk.update
+                                 TkComm.window(label).text(
+                                          msgcat.mc("%1$s:: %2$s", 'Color', 
+                                                    color.capitalize))
+                                 w.flash; w.flash
+                                 Tk.callback_break;
+                              }, "%W")
+
+del_proc = TkComm.install_cmd(proc{top_win.destroy; top_win = nil})
+
+err_proc = TkComm.install_cmd(proc{fail(RuntimeError, 
+                                        msgcat.mc('Application Error'))})
+
+show_sample = proc{|loc|
+  top_win = TkToplevel.new(:title=>loc)
+
+  msgcat.locale = loc
+  msgcat.load_tk(msgcat_dir)
+
+  TkLabel.new(top_win){
+    text "preferences:: #{msgcat.preferences.join(' ')}"
+    pack(:pady=>10, :padx=>10)
+  }
+
+  lbl = TkLabel.new(top_win, :text=>msgcat.mc("%1$s:: %2$s", 
+                                              'Color', '')).pack(:anchor=>'w')
+
+  bg = TkFrame.new(top_win).pack(:ipadx=>20, :ipady=>10, 
+                                 :expand=>true, :fill=>:both)
+
+  TkFrame.new(bg){|f|
+    ['blue', 'green', 'red'].each{|col|
+      TkButton.new(f, :text=>msgcat.mc(col)){
+        bind('ButtonRelease-1', col_proc, "#{col} #{bg.path} #{lbl.path}")
+      }.pack(:fill=>:x)
+=begin
+      TkButton.new(f, :text=>msgcat.mc(col), 
+                   :command=>proc{
+                     bg.background col
+                     lbl.text msgcat.mc("%1$s:: %2$s", 'Color', col.capitalize)
+                   }).pack(:fill=>:x)
+=end
+    }
+  }.pack(:anchor=>'center', :pady=>15)
+
+  TkFrame.new(top_win){|f|
+    TkButton.new(f, :text=>msgcat.mc('Delete'), 
+                 :command=>del_proc).pack(:side=>:right, :padx=>5)
+    TkButton.new(f, :text=>msgcat.mc('Error'), 
+                 :command=>err_proc).pack(:side=>:left, :padx=>5)
+=begin
+    TkButton.new(f, :text=>msgcat.mc('Delete'), 
+                 :command=>proc{
+                   top_win.destroy
+                   top_win = nil
+                 }).pack(:side=>:right, :padx=>5)
+    TkButton.new(f, :text=>msgcat.mc('Error'), 
+                 :command=>proc{
+                   fail RuntimeError, msgcat.mc('Application Error')
+                 }).pack(:side=>:left, :padx=>5)
+=end
+  }.pack(:side=>:bottom, :fill=>:x)
+
+  top_win
+}
+
+
+#  listbox for locale list
+TkLabel.new(:text=>"Please click a locale.").pack(:padx=>5, :pady=>3)
+
+TkFrame.new{|f|
+  TkButton.new(f, :text=>msgcat.mc('Exit'), 
+               :command=>proc{exit}).pack(:side=>:right, :padx=>5)
+}.pack(:side=>:bottom, :fill=>:x)
+
+f = TkFrame.new.pack(:side=>:top, :fill=>:both, :expand=>true)
+lbox = TkListbox.new(f).pack(:side=>:left, :fill=>:both, :expand=>true)
+lbox.yscrollbar(TkScrollbar.new(f, :width=>12).pack(:side=>:right, :fill=>:y))
+
+lbox.bind('ButtonRelease-1'){|ev|
+  idx = lbox.index("@#{ev.x},#{ev.y}")
+  if idx == 0
+    loc = default_locale
+  else
+    loc = lbox.get(idx)
+  end
+  if top_win != nil && top_win.exist?
+    top_win.destroy
+  end
+  top_win = show_sample.call(loc)
+}
+
+lbox.insert('end', 'default')
+
+Dir.entries(msgcat_dir).sort.each{|f| 
+  if f =~ /^(.*).msg$/
+    lbox.insert('end', $1)
+  end
+}
+
+top_win = show_sample.call(default_locale)
+
+#  start eventloop
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkmulticolumnlist.rb b/ruby_1_8_6/ext/tk/sample/tkmulticolumnlist.rb
new file mode 100644
index 0000000000..255eb691e5
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkmulticolumnlist.rb
@@ -0,0 +1,743 @@
+#
+# tkmulticolumnlist.rb : multiple column list widget on scrollable frame
+#                        by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+class TkMultiColumnList < TkText
+  include TkComposite
+
+  #   lbox_height : height of listboxes (pixel)
+  #   title_info  : array [ [<title_string>,<init_width>], ... ]
+  #   keys        : hash {<option>=><value>, ... }
+  def initialize_composite(lbox_height, title_info, keys={})
+    # argument check
+    if (! title_info.kind_of? Array) or (title_info.size < 2)
+      raise
+    end
+
+    # mode
+    @keep_minsize = true
+    @show_each_hscr = true
+    @show_win_hscr = true
+
+    # init arrays
+    @base_list  = []
+    @rel_list   = []
+    @title_list = []
+    @title_cmd  = []
+    @lbox_list  = []
+    @hscr_list  = []
+
+    # decide total width
+    @lbox_total = title_info.size
+    @width_total = 0
+    title_info.each{|title, width, cmd| 
+      @width_total += width.to_f
+      @title_cmd << cmd
+    }
+
+    # rel-table of label=>index
+    @name_index = {}
+
+    # size definition
+    @window_width = @width_total
+    @sash = 5
+    @scrbar_width = 15
+    @scrbar_border = 3
+    @lbox_border = 1
+    @title_border = 3
+    @h_l_thick = 0
+
+    # init status
+    @mode = :title
+    @command = nil
+
+    # virtical scrollbar
+    @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
+                                 'borderwidth'=>@scrbar_border, 
+                                 'width'=>@scrbar_width)
+
+    # horizontal scrollbar
+    @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
+                                 'borderwidth'=>@scrbar_border, 
+                                 'width'=>@scrbar_width)
+
+    # create base flames
+    @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
+                            'width'=>@window_width)
+    @f_title = TkFrame.new(@c_title, 'width'=>@width_total)
+    @w_title = TkcWindow.new(@c_title, 0, 0, 
+                             'window'=>@f_title, 'anchor'=>'nw')
+
+    @c_lbox  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
+                            'width'=>@window_width)
+    @f_lbox  = TkFrame.new(@c_lbox, 'width'=>@width_total)
+    @w_lbox  = TkcWindow.new(@c_lbox, 0, 0, 'window'=>@f_lbox, 'anchor'=>'nw')
+
+    @c_hscr  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
+                            'width'=>@window_width)
+    @f_hscr  = TkFrame.new(@c_hscr, 'width'=>@width_total)
+    @w_hscr  = TkcWindow.new(@c_hscr, 0, 0, 'window'=>@f_hscr, 'anchor'=>'nw')
+
+    # create each listbox
+    sum = 0.0
+    @rel_list << sum/@width_total
+    title_info.each_with_index{|(label, width), idx|
+      # set relation between label and index
+      if @name_index.include?(label)
+        @name_index[label] << idx
+      else
+        @name_index[label] = [idx]
+      end
+
+      # calculate relative positioning
+      sum += width
+      @rel_list << sum/@width_total
+
+      # title field
+      f = TkFrame.new(@f_title, 'width'=>width)
+      base = [f]
+
+      title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border, 
+                          'relief'=>'raised', 'highlightthickness'=>@h_l_thick)
+      title_binding(title, idx)
+      title.pack('fill'=>'x')
+
+      @title_list << title
+
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1, 
+              'relheight'=>1.0, 
+              'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
+
+      # listbox field
+      f = TkFrame.new(@f_lbox, 'width'=>width)
+      base << f
+      @lbox_list << TkText.new(f, 'highlightthickness'=>@h_l_thick, 
+                               'borderwidth'=>@lbox_border, 
+                               'takefocus'=>false, 
+                               'wrap'=>'none') {
+
+        bindtags(bindtags - [TkText])
+
+        @seltag = TkTextTag.new(self, 'background'=>'#b3b3b3', 
+                                'borderwidth'=>1, 'relief'=>'raised')
+        def self.nearest(y)
+          self.index("@1,#{y}").split('.')[0].to_i
+        end
+
+        def self.select_clear(first, last=nil)
+          first = "#{first}.0" if first.kind_of?(Integer)
+          first = self.index(first.to_s + ' linestart')
+          last = first unless last
+          last = "#{last}.0" if first.kind_of?(Integer)
+          last = self.index(last.to_s + ' + 1 lines linestart')
+          @seltag.remove(first, last)
+        end
+
+        def self.select_set(first, last=nil)
+          first = "#{first}.0" if first.kind_of?(Integer)
+          first = self.index(first.to_s + ' linestart')
+          last = first unless last
+          last = "#{last}.0" if first.kind_of?(Integer)
+          last = self.index(last.to_s + ' + 1 lines linestart')
+          @seltag.add(first, last)
+        end
+
+        def self.select_index
+          self.index(@seltag.first).split('.')[0].to_i
+        end
+
+        pack('fill'=>'both', 'expand'=>true)
+      }
+
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1, 
+              'relwidth'=>@rel_list[idx+1] - @rel_list[idx], 'relheight'=>1.0)
+
+      # scrollbar field
+      f = TkFrame.new(@f_hscr, 'width'=>width)
+      base << f
+      @hscr_list << TkXScrollbar.new(f, 'width'=>@scrbar_width, 
+                                     'borderwidth'=>@scrbar_border, 
+                                     'highlightthickness'=>@h_l_thick
+                                    ).pack('fill'=>'x', 'anchor'=>'w')
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1, 
+              'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
+
+      @lbox_list[idx].xscrollbar(@hscr_list[idx])
+
+      # add new base
+      @base_list << base
+    }
+
+    # pad
+    @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised', 
+                               'borderwidth'=>@title_border, 
+                               'highlightthickness'=>@h_l_thick)
+
+    @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken', 
+                             'borderwidth'=>1, 
+                             'highlightthickness'=>@h_l_thick)
+
+    # height check
+    title_height = 0
+    @title_list.each{|w| 
+      h = w.winfo_reqheight
+      title_height = h if title_height < h
+    }
+
+    hscr_height = 0
+    @hscr_list.each{|w| 
+      h = w.winfo_reqheight
+      hscr_height = h if hscr_height < h
+    }
+
+    @f_title.height title_height
+    @f_lbox.height lbox_height
+    @f_hscr.height hscr_height
+
+    # set control procedure for virtical scroll
+    @v_scroll.assign(*@lbox_list)
+
+    # set control procedure for horizoncal scroll
+    @h_scroll.assign(@c_title, @c_lbox, @c_hscr)
+
+    # binding for listboxes
+    @lbox_list.each_with_index{|l, idx| 
+      l.bind('Button-1', proc{|w, y| 
+               @frame.focus
+               select_line(w, w.nearest(y))
+             }, '%W %y')
+      l.bind('B1-Motion', proc{|w, y| 
+               select_line(w, w.nearest(y))
+             }, '%W %y')
+      l.bind('Double-Button-1', proc{
+               @command.call(get_select) if @command
+             })
+
+      l.bind('Control-Home', proc{|w| select_line(w, 0)}, '%W')
+      l.bind('Control-End', proc{|w| select_line(w, 'end')}, '%W')
+
+      l.bind('Button-2', proc{|x, y| 
+               @lbox_mark_x = x
+               @lbox_list.each{|lbox| lbox.scan_mark(x, y)}
+             }, '%x %y')
+      l.bind('B2-Motion', proc{|x, y| 
+               @lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
+               l.scan_dragto(x, y)
+             }, '%x %y')
+    }
+
+    bbox = @w_title.bbox
+    @c_title.height(bbox[3])
+    @c_title.scrollregion(bbox)
+
+    bbox = @w_lbox.bbox
+    @c_lbox.height(bbox[3])
+    @c_lbox.scrollregion(bbox)
+
+    if @show_each_hscr
+      bbox = @w_hscr.bbox
+      @c_hscr.height(bbox[3])
+      @c_hscr.scrollregion(bbox)
+    end
+
+    # binding
+    @frame.takefocus(true)
+    @frame.bind('Key-Up', proc{select_shift(@lbox_list[0], -1)})
+    @frame.bind('Key-Down', proc{select_shift(@lbox_list[0], 1)})
+    @frame.bind('Return', proc{@command.call(get_select) if @command})
+
+    # alignment
+    TkGrid.rowconfigure(@frame, 0, 'weight'=>0)
+    TkGrid.rowconfigure(@frame, 1, 'weight'=>1)
+    TkGrid.rowconfigure(@frame, 2, 'weight'=>0)
+    TkGrid.rowconfigure(@frame, 3, 'weight'=>0)
+    TkGrid.columnconfigure(@frame, 0, 'weight'=>1)
+    TkGrid.columnconfigure(@frame, 1, 'weight'=>0)
+    TkGrid.columnconfigure(@frame, 2, 'weight'=>0)
+    @v_scroll.grid('row'=>1, 'column'=>2, 'sticky'=>'ns')
+    @c_title.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
+    @f_title_pad.grid('row'=>0, 'column'=>2, 'sticky'=>'news')
+    @c_lbox.grid('row'=>1, 'column'=>0, 'sticky'=>'news')
+    @c_hscr.grid('row'=>2, 'column'=>0, 'sticky'=>'ew') if @show_each_hscr
+    @h_scroll.grid('row'=>3, 'column'=>0, 'sticky'=>'ew') if @show_win_hscr
+    @f_scr_pad.grid('row'=>2, 'rowspan'=>2, 'column'=>2, 'sticky'=>'news')
+
+    # binding for 'Configure' event
+    @c_lbox.bind('Configure', 
+                 proc{|height, width| reconstruct(height, width)}, 
+                 '%h %w')
+
+    # set default receiver of method calls
+    @path = @frame.path
+
+    # configure options
+    keys = {} unless keys
+    keys = _symbolkey2str(keys)
+
+    # command
+    cmd = keys.delete('command')
+    command(cmd) if cmd
+
+    # 'scrollbarwidth' option == 'width' option of scrollbars
+    width = keys.delete('scrollbarwidth')
+    scrollbarwidth(width) if width
+
+    # options for listbox titles
+    title_font = keys.delete('titlefont')
+    titlefont(title_font) if title_font
+
+    title_fg = keys.delete('titleforeground')
+    titleforeground(title_fg) if title_fg
+
+    title_bg = keys.delete('titlebackground')
+    titlebackground(title_bg) if title_bg
+
+    # set receivers for configure methods
+    delegate('DEFAULT', *@lbox_list)
+    delegate('activebackground', @v_scroll, @h_scroll, *@hscr_list)
+    delegate('troughcolor', @v_scroll, @h_scroll, *@hscr_list)
+    delegate('repeatdelay', @v_scroll, @h_scroll, *@hscr_list)
+    delegate('repeatinterval', @v_scroll, @h_scroll, *@hscr_list)
+    delegate('borderwidth', @frame)
+    delegate('width', @c_lbox, @c_title, @c_hscr)
+    delegate('relief', @frame)
+
+    # configure
+    configure(keys) if keys.size > 0
+  end
+  private :initialize_composite
+
+  # keep_minsize?
+  def keep_minsize?
+    @keep_minsize
+  end
+  def keep_minsize(bool)
+    @keep_minsize = bool
+  end
+
+  # each hscr
+  def show_each_hscr
+    @show_each_hscr = true
+    @c_hscr.grid('row'=>2, 'column'=>0, 'sticky'=>'ew')
+  end
+  def hide_each_hscr
+    @show_each_hscr = false
+    @c_hscr.ungrid
+  end
+
+  # window hscroll
+  def show_win_hscr
+    @show_win_hscr = true
+    @h_scroll.grid('row'=>3, 'column'=>0, 'sticky'=>'ew')
+  end
+  def hide_win_hscr
+    @show_each_hscr = false
+    @h_scroll.ungrid
+  end
+
+  # set command
+  def command(cmd)
+    @command = cmd
+    self
+  end
+
+  # set scrollbar width
+  def scrollbarwidth(width)
+    @scrbar_width = width
+    @v_scroll['width'] = @scrbar_width
+    @h_scroll['width'] = @scrbar_width
+    @hscr_list.each{|hscr| hscr['width'] = @scrbar_width}
+    self
+  end
+
+  # set scrollbar border
+  def scrollbarborder(width)
+    @scrbar_border = width
+    @v_scroll['border'] = @scrbar_border
+    @h_scroll['border'] = @scrbar_border
+    @hscr_list.each{|hscr| hscr['border'] = @scrbar_border}
+    self
+  end
+
+  # set listbox borders
+  def listboxborder(width)
+    @lbox_border = width
+    @lbox_list.each{|w| w['border'] = @lbox_border}
+    self
+  end
+
+  # set listbox relief
+  def listboxrelief(relief)
+    @lbox_list.each{|w| w['relief'] = relief}
+    self
+  end
+
+  # set title borders
+  def titleborder(width)
+    @title_border = width
+    @f_title_pad['border'] = @title_border
+    @title_list.each{|label| label['border'] = @title_border}
+    self
+  end
+
+  # set title font
+  def titlefont(font)
+    @title_list.each{|label| label['font'] = font}
+    title_height = 0
+    @title_list.each{|w| 
+      h = w.winfo_reqheight
+      title_height = h if title_height < h
+    }
+    @f_title.height title_height
+    bbox = @w_title.bbox
+    @c_title.height(bbox[3])
+    @c_title.scrollregion(bbox)
+    self
+  end
+
+  # set title foreground color
+  def titleforeground(fg)
+    @title_list.each{|label| label['foreground'] = fg}
+    self
+  end
+
+  # set title background color
+  def titlebackground(bg)
+    @f_title_pad['background'] = bg
+    @title_list.each{|label| label['background'] = bg}
+    self
+  end
+
+  # set title cmds
+  def titlecommand(idx, cmd=Proc.new)
+    @title_cmd[idx] = cmd
+  end
+
+  # call title cmds
+  def titleinvoke(idx)
+    @title_cmd[idx].call if @title_cmd[idx]
+  end
+
+  # get label widgets of listbox titles
+  def titlelabels(*indices)
+    @title_list[*indices]
+  end
+
+  # get listbox widgets
+  def columns(*indices)
+    @lbox_list[*indices]
+  end
+
+  def delete(*idx)
+    idx = idx.collect{|i|
+      if i.kind_of?(Integer)
+        "#{i}.0"
+      else
+        i.to_s
+      end
+    }
+    @lbox_list.collect{|lbox| lbox.delete(*idx)}
+  end
+
+  def get(idx_s, idx_e=nil)
+    unless idx_e
+      if idx_s.kind_of?(Integer)
+        idx_s = "#{idx_s}.0"
+        idx_e = "#{idx_s} lineend"
+      else
+        idx_s = idx_s.to_s
+        idx_e = "#{idx_s} lineend"
+      end
+      @lbox_list.collect{|lbox|
+        lbox.get(idx_s, idx_e)
+      }
+    else
+      if idx_s.kind_of?(Integer)
+        idx_s = "#{idx_s}.0"
+      else
+        idx_s = idx_s.to_s
+      end
+      if idx_e.kind_of?(Integer)
+        idx_e = "#{idx_e}.end"
+      else
+        idx_e = "#{idx_e} lineend"
+      end
+      list = @lbox_list.collect{|lbox| lbox.get(idx_s, idx_e).split(/\n/)}
+      result = []
+      list[0].each_with_index{|line, index|
+        result << list.collect{|lines| lines[index]}
+      }
+      result
+    end
+  end
+
+  def get_select
+    get(@lbox_list[0].select_index)
+  end
+
+  def _line_array_to_hash(line)
+    result = {}
+    @name_index.each_pair{|label, indices|
+      if indices.size == 1
+        result[label] = line[indices[0]]
+      else
+        result[label] = indices.collect{|index| line[index]}
+      end
+    }
+    result
+  end
+  private :_line_array_to_hash
+
+  def get_by_hash(*idx)
+    get_result = get(*idx)
+    if idx.size == 1
+      _line_array_to_hash(get_result)
+    else
+      get_result.collect{|line| _line_array_to_hash(line)}
+    end
+  end
+
+  def insert(idx, *lines)
+    lbox_ins = []
+    (0..@lbox_list.size).each{lbox_ins << []}
+
+    if idx.kind_of?(Integer)
+      idx = "#{idx}.0"
+    else
+      idx = idx.to_s
+    end
+
+    if @lbox_list[0].index('1.0 + 1 char') == @lbox_list[0].index('end')
+      cr = ""
+    else
+      cr = "\n"
+    end
+
+    lines.each{|line|
+      if line.kind_of? Hash
+        array = []
+        @name_index.each_pair{|label, indices|
+          if indices.size == 1
+            array[indices[0]] = line[label]
+          else
+            if line[label].kind_of? Array
+              indices.each_with_index{|index, num| 
+                array[index] = line[label][num]
+              }
+            else
+              array[indices[0]] = line[label]
+            end
+          end
+        }
+        line = array
+      end
+
+      @name_index.each_pair{|label, indices|
+        if indices.size == 1
+          lbox_ins[indices[0]] << line[indices[0]]
+        else
+          indices.each{|index| lbox_ins[index] << line[index]}
+        end
+      }
+    }   
+
+    @lbox_list.each_with_index{|lbox, index| 
+      lbox.insert(idx, cr + lbox_ins[index].join("\n")) if lbox_ins[index]
+    }
+  end
+
+  def select_clear(first, last=None)
+    @lbox_list.each{|lbox| lbox.sel_clear(first, last=None)}
+  end
+
+  def select_set(first, last=None)
+    @lbox_list.each{|lbox| lbox.sel_set(first, last=None)}
+  end
+
+  ###########################################
+  private
+
+  def reconstruct(height, width)
+    if @keep_minsize && width <= @width_total
+      @f_title.width(@width_total)
+      @f_lbox.width(@width_total)
+      @f_hscr.width(@width_total) if @show_each_hscr
+      @window_width = @width_total
+    else
+      @f_title.width(width)
+      @f_lbox.width(width)
+      @f_hscr.width(width) if @show_each_hscr
+      @window_width = width
+    end
+
+    @f_lbox.height(height)
+
+    @c_title.scrollregion(@w_title.bbox)
+    @c_lbox.scrollregion(@w_lbox.bbox)
+    @c_hscr.scrollregion(@w_hscr.bbox) if @show_each_hscr
+
+    (0..(@rel_list.size - 2)).each{|idx|
+      title, lbox, hscr = @base_list[idx]
+      title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
+      lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+                 'relheight'=>1.0)
+      hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
+    }
+  end
+
+  def resize(x)
+    idx = @sel_sash
+    return if idx == 0
+
+    # adjustment of relative positioning
+    delta = (x - @x) / @frame_width
+    if delta < @rel_list[idx-1] - @rel_list[idx] + (2*@sash/@frame_width)
+      delta = @rel_list[idx-1] - @rel_list[idx] + (2*@sash/@frame_width)
+    elsif delta > @rel_list[idx+1] - @rel_list[idx] - (2*@sash/@frame_width)
+      delta = @rel_list[idx+1] - @rel_list[idx] - (2*@sash/@frame_width)
+    end
+    @rel_list[idx] += delta
+
+    # adjustment of leftside widget of the sash
+    title, lbox, hscr = @base_list[idx - 1]
+    title.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1])
+    lbox.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1], 'relheight'=>1.0)
+    hscr.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1])
+
+    # adjustment of rightside widget of the sash
+    title, lbox, hscr = @base_list[idx]
+    title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+                'relx'=>@rel_list[idx])
+    lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+               'relx'=>@rel_list[idx], 'relheight'=>1.0)
+    hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+               'relx'=>@rel_list[idx])
+
+    # update reference position
+    @x = x
+  end
+
+  def motion_cb(w, x, idx)
+    if x <= @sash && idx > 0
+      w.cursor 'sb_h_double_arrow'
+      @mode = :sash
+      @sel_sash = idx
+    elsif x >= w.winfo_width - @sash && idx < @lbox_total - 1
+      w.cursor 'sb_h_double_arrow'
+      @mode = :sash
+      @sel_sash = idx + 1
+    else
+      w.cursor ""
+      @mode = :title
+      @sel_sash = 0
+    end
+  end
+
+  def title_binding(title, index)
+    title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)}, 
+               "%W %x #{index}")
+
+    title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)}, 
+               "%W %x #{index}")
+
+    title.bind('Leave', proc{|w| w.cursor ""}, "%W")
+
+    title.bind('Button-1', 
+               proc{|w, x| 
+                 if @mode == :sash
+                   @x = x
+                   @frame_width = TkWinfo.width(@f_title).to_f
+                 else
+                   title.relief 'sunken'
+                 end
+               }, 
+               '%W %X')
+
+    title.bind('ButtonRelease-1', 
+               proc{|w, x, idx| 
+                 i = idx.to_i
+                 if @mode == :title && @title_cmd[i].kind_of?(Proc)
+                   @title_cmd[i].call
+                 end
+                 title.relief 'raised'
+                 motion_cb(w,x,i)
+               }, 
+               "%W %x #{index}")
+
+    title.bind('B1-Motion', proc{|x| resize(x) if @mode == :sash}, "%X")
+  end
+
+  ########################
+  def select_line(w, idx)
+    @lbox_list.each{|l|
+      l.select_clear(1, 'end')
+      l.select_set(idx)
+    }
+    w.select_set(idx)
+  end
+
+  def select_shift(w, dir)
+    head = w.index('@1,1').split('.')[0].to_i
+    tail = w.index("@1,#{w.winfo_height - 1}").split('.')[0].to_i - 1
+    idx = w.select_index + dir
+    last = w.index('end - 1 char').split('.')[0].to_i
+    if idx < 1
+      idx = 1
+    elsif idx > last
+      idx = last
+    end
+    @lbox_list.each{|l|
+      l.select_clear(1, 'end')
+      l.select_set(idx)
+    }
+    if head > idx
+      @lbox_list.each{|l| l.yview('scroll', -1, 'units')}
+    elsif tail < idx
+      @lbox_list.each{|l| l.yview('scroll', 1, 'units')}
+    end
+  end
+  ########################
+end
+
+################################################
+# test
+################################################
+if __FILE__ == $0
+  l = TkMultiColumnList.new(nil, 200, 
+                            [ ['L1', 200, proc{p 'click L1'}], 
+                              ['L2', 100], 
+                              ['L3', 200] ], 
+                            'width'=>350, 
+                            #'titleforeground'=>'yellow', 
+                            'titleforeground'=>'white', 
+                            #'titlebackground'=>'navy',
+                            'titlebackground'=>'blue',
+                            'titlefont'=>'courier'
+                            ).pack('fill'=>'both', 'expand'=>true)
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6])
+  l.insert('end', [4,5,6], [4,5,6])
+  l.insert('end', ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 
+                   'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+                   'cccccccccccccccccccccccccccccccccccccccccccccccccccc'])
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6], [4,5,6])
+  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6], [4,5,6])
+  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6], [4,5,6])
+  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6], [4,5,6])
+  p l.columns(1)
+  p l.columns(1..3)
+  p l.columns(1,2)
+
+  l.command proc{|line_info| p line_info}
+
+  Tk.mainloop
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkmultilistbox.rb b/ruby_1_8_6/ext/tk/sample/tkmultilistbox.rb
new file mode 100644
index 0000000000..6f956d0edb
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkmultilistbox.rb
@@ -0,0 +1,654 @@
+#
+# tkmultilistbox.rb : multiple listbox widget
+#                       by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+class TkMultiListbox < TkListbox
+  include TkComposite
+
+  #   lbox_height : height of listboxes (pixel)
+  #   title_info  : array [ [<title_string>,<init_width>], ... ]
+  #   keys        : hash {<option>=><value>, ... }
+  def initialize_composite(lbox_height, title_info, keys={})
+    # argument check
+    if (! title_info.kind_of? Array) or (title_info.size < 2)
+      raise
+    end
+
+    # decide total width
+    @width_total = 0
+    title_info.each{|title, width| @width_total += width.to_f}
+
+    # virtical scrollbar
+    @v_scroll = TkScrollbar.new(@frame, 'orient'=>'vertical')
+
+    # init arrays
+    @base_list = []
+    @rel_list   = []
+    @title_list = []
+    @lbox_list  = []
+    @hscr_list  = []
+
+    # rel-table of label=>index
+    @name_index = {}
+
+    # create base flames
+    @f_title = TkFrame.new(@frame, 'width'=>@width_total)
+    @f_lbox  = TkFrame.new(@frame, 
+                           'width'=>@width_total, 'height'=>lbox_height)
+    @f_hscr  = TkFrame.new(@frame, 'width'=>@width_total, 
+                           'height'=>@v_scroll.cget('width') + 
+                                     2 * @v_scroll.cget('borderwidth'))
+
+    # dummy label to keep the hight of title space
+    TkLabel.new(@f_title, 'text'=>' ').pack
+
+    # create each listbox
+    sum = 0.0
+    @rel_list << sum/@width_total
+    title_info.each_with_index{|(label, width), idx|
+      # set relation between label and index
+      if @name_index.include?(label)
+        @name_index[label] << idx
+      else
+        @name_index[label] = [idx]
+      end
+
+      # calculate relative positioning
+      sum += width
+      @rel_list << sum/@width_total
+
+      # title field
+      f = TkFrame.new(@f_title, 'width'=>width)
+      base = [f]
+      @title_list << TkLabel.new(f, 'text'=>label).pack('fill'=>'x')
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-6, 
+              'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
+
+      # listbox field
+      f = TkFrame.new(@f_lbox, 'width'=>width)
+      base << f
+      @lbox_list << TkListbox.new(f).pack('fill'=>'both', 'expand'=>true)
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-4, 
+              'relwidth'=>@rel_list[idx+1] - @rel_list[idx], 'relheight'=>1.0)
+
+      # scrollbar field
+      f = TkFrame.new(@f_hscr, 'width'=>width)
+      base << f
+      @hscr_list << TkScrollbar.new(f, 'orient'=>'horizontal') . 
+                                              pack('fill'=>'x', 'anchor'=>'w')
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>-4, 
+              'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
+
+      @lbox_list[idx].xscrollcommand proc{|first, last| 
+        @hscr_list[idx].set first, last
+      }
+      @hscr_list[idx].command proc{|*args| @lbox_list[idx].xview *args}
+
+      # add new base
+      @base_list << base
+    }
+
+    # create tab
+    @tab_list = [nil]
+    (1..(@rel_list.size - 2)).each{|idx|
+      tab = TkFrame.new(@f_title, 'cursor'=>'sb_h_double_arrow', 
+                        'width'=>6, 'borderwidth'=>2, 'relief'=>'raised')
+      @tab_list << tab
+      tab.place('relx'=>@rel_list[idx], 'anchor'=>'ne', 'relheight'=>0.95)
+      tab.bind('Button-1', 
+               proc{|x| @x = x; @frame_width = TkWinfo.width(@f_title).to_f}, 
+               '%X')
+      tab.bind('B1-Motion', proc{|x, idx| resize(x, idx.to_i)}, "%X #{idx}")
+    }
+
+    # set control procedure for virtical scroll
+    @lbox_list.each{|lbox|
+      lbox.yscrollcommand proc{|first, last| 
+        @v_scroll.set first, last
+      }
+    }
+    @v_scroll.command proc{|*args| @lbox_list.each{|lbox| lbox.yview *args} }
+
+    # binding for listboxes
+    @mode = {}
+    @mode['browse']   = browse_mode_bindtag
+    @mode['single']   = single_mode_bindtag
+    @mode['extended'] = extended_mode_bindtag
+    @mode['multiple'] = multiple_mode_bindtag
+    @current_mode = 'browse'
+    @lbox_list.each{|l| 
+      l.bind('Shift-Key-Left', 
+             proc{|w| focus_shift(w, -1); Tk.callback_break}, '%W')
+      l.bind('Shift-Key-Right', 
+             proc{|w| focus_shift(w, 1); Tk.callback_break}, '%W')
+
+      l.bind('Button-2', proc{|x, y| 
+               @lbox_mark_x = x
+               @lbox_list.each{|lbox| lbox.scan_mark(x, y)}
+             }, '%x %y')
+      l.bind('B2-Motion', proc{|x, y| 
+               @lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
+               l.scan_dragto(x, y)
+             }, '%x %y')
+
+      l.bindtags(l.bindtags.unshift(@mode[@current_mode]))
+    }
+
+    # alignment
+    TkGrid.rowconfigure(@frame, 0, 'weight'=>0)
+    TkGrid.rowconfigure(@frame, 1, 'weight'=>1)
+    TkGrid.rowconfigure(@frame, 2, 'weight'=>0)
+    TkGrid.columnconfigure(@frame, 0, 'weight'=>1)
+    TkGrid.columnconfigure(@frame, 1, 'weight'=>0)
+    @v_scroll.grid('row'=>1, 'column'=>1, 'sticky'=>'ns')
+    @f_title.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
+    @f_lbox.grid('row'=>1, 'column'=>0, 'sticky'=>'news')
+    @f_hscr.grid('row'=>2, 'column'=>0, 'sticky'=>'ew')
+
+    # binding for 'Configure' event
+    @frame.bind('Configure', proc{reconstruct})
+
+    # set default receiver of method calls
+    @path = @lbox_list[0].path
+
+    # configure options
+    keys = {} unless keys
+    keys = _symbolkey2str(keys)
+
+    # 'mode' option of listboxes
+    sel_mode = keys.delete('mode')
+    mode(sel_mode) if sel_mode
+
+    # 'scrollbarwidth' option == 'width' option of scrollbars
+    width = keys.delete('scrollbarwidth')
+    scrollbarwidth(width) if width
+
+    # options for listbox titles
+    title_font = keys.delete('titlefont')
+    title_fg = keys.delete('titleforeground')
+    title_bg = keys.delete('titlebackground')
+    if title_font or title_fg or title_bg
+      titleconfig(title_font, title_fg, title_bg)
+    end
+
+    # set receivers for configure methods
+    delegate('DEFAULT', *@lbox_list)
+    delegate('activebackground', @v_scroll, *@hscr_list)
+    delegate('troughcolor', @v_scroll, *@hscr_list)
+    delegate('repeatdelay', @v_scroll, *@hscr_list)
+    delegate('repeatinterval', @v_scroll, *@hscr_list)
+    delegate('borderwidth', @frame)
+    delegate('relief', @frame)
+
+    # configure
+    configure(keys) if keys.size > 0
+  end
+  private :initialize_composite
+
+  # set 'mode' option of listboxes
+  def mode(sel_mode)
+    @lbox_list.each{|l| 
+      tags = l.bindtags
+      tags = tags - [ @mode[@current_mode] ]
+      l.bindtags(tags.unshift(@mode[sel_mode]))
+      @current_mode = sel_mode
+    }
+  end
+
+  # set scrollbar width
+  def scrollbarwidth(width)
+    @v_scroll['width'] = width
+    @hscr_list.each{|hscr| hscr['width'] = width}
+    @f_hscr['height'] = width + 2 * @v_scroll.cget('borderwidth')
+  end
+
+  # set options of titles
+  def titleconfig(font, fg, bg)
+    keys = {}
+    keys['font'] = font if font
+    keys['foreground'] = fg if fg
+    keys['background'] = bg if bg
+    @title_list.each{|label| label.configure(keys)}
+  end
+
+  # get label widgets of listbox titles
+  def titlelabels(*indices)
+    @title_list[*indices]
+  end
+
+  # get listbox widgets
+  def columns(*indices)
+    @lbox_list[*indices]
+  end
+
+  def activate(idx)
+    @lbox_list.each{|lbox| lbox.activate(idx)}
+  end
+
+  def bbox(idx)
+    @lbox_list.collect{|lbox| lbox.bbox(idx)}
+  end
+
+  def delete(*idx)
+    @lbox_list.collect{|lbox| lbox.delete(*idx)}
+  end
+
+  def get(*idx)
+    if idx.size == 1
+      @lbox_list.collect{|lbox| lbox.get(*idx)}
+    else
+      list = @lbox_list.collect{|lbox| lbox.get(*idx)}
+      result = []
+      list[0].each_with_index{|line, index|
+        result << list.collect{|lines| lines[index]}
+      }
+      result
+    end
+  end
+
+  def _line_array_to_hash(line)
+    result = {}
+    @name_index.each_pair{|label, indices|
+      if indices.size == 1
+        result[label] = line[indices[0]]
+      else
+        result[label] = indices.collect{|index| line[index]}
+      end
+    }
+    result
+  end
+  private :_line_array_to_hash
+
+  def get_by_hash(*idx)
+    get_result = get(*idx)
+    if idx.size == 1
+      _line_array_to_hash(get_result)
+    else
+      get_result.collect{|line| _line_array_to_hash(line)}
+    end
+  end
+
+  def insert(idx, *lines)
+    lbox_ins = []
+    (0..@lbox_list.size).each{lbox_ins << []}
+
+    lines.each{|line|
+      if line.kind_of? Hash
+        array = []
+        @name_index.each_pair{|label, indices|
+          if indices.size == 1
+            array[indices[0]] = line[label]
+          else
+            if line[label].kind_of? Array
+              indices.each_with_index{|index, num| 
+                array[index] = line[label][num]
+              }
+            else
+              array[indices[0]] = line[label]
+            end
+          end
+        }
+        line = array
+      end
+
+      @name_index.each_pair{|label, indices|
+        if indices.size == 1
+          lbox_ins[indices[0]] << line[indices[0]]
+        else
+          indices.each{|index| lbox_ins[index] << line[index]}
+        end
+      }
+    }   
+
+    @lbox_list.each_with_index{|lbox, index| 
+      lbox.insert(idx, *lbox_ins[index]) if lbox_ins[index]
+    }
+  end
+
+  def selection_anchor(index)
+    @lbox_list.each{|lbox| lbox.selection_anchor(index)}
+  end
+
+  def selection_clear(first, last=None)
+    @lbox_list.each{|lbox| lbox.selection_clear(first, last=None)}
+  end
+
+  def selection_set(first, last=None)
+    @lbox_list.each{|lbox| lbox.selection_set(first, last=None)}
+  end
+
+  ###########################################
+  private
+
+  def reconstruct
+    (0..(@rel_list.size - 2)).each{|idx|
+      title, lbox, hscr = @base_list[idx]
+      title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
+      lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+                 'relheight'=>1.0)
+      hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
+
+      tab = @tab_list[idx]
+      tab.place('relx'=>@rel_list[idx]) if tab
+    }
+  end
+
+  def resize(x, idx)
+    # adjustment of relative positioning
+    delta = (x - @x) / @frame_width
+    if delta < @rel_list[idx-1] - @rel_list[idx] + 0.02
+      delta = @rel_list[idx-1] - @rel_list[idx] + 0.02
+    elsif delta > @rel_list[idx+1] - @rel_list[idx] - 0.02
+      delta = @rel_list[idx+1] - @rel_list[idx] - 0.02
+    end
+    @rel_list[idx] += delta
+
+    # adjustment of leftside widget of the tab
+    title, lbox, hscr = @base_list[idx - 1]
+    title.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1])
+    lbox.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1], 'relheight'=>1.0)
+    hscr.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1])
+
+    # adjustment of the tab position
+    @tab_list[idx].place('relx'=>@rel_list[idx])
+
+    # adjustment of rightside widget of the tab
+    title, lbox, hscr = @base_list[idx]
+    title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+                'relx'=>@rel_list[idx])
+    lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+               'relx'=>@rel_list[idx], 'relheight'=>1.0)
+    hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+               'relx'=>@rel_list[idx])
+
+    # update reference position
+    @x = x
+  end
+
+  #################################
+  def browse_mode_bindtag
+    t = TkBindTag.new
+    t.bind('Button-1', 
+           proc{|w, y| w.focus; select_line(w, w.nearest(y))}, '%W %y')
+    t.bind('B1-Motion', proc{|w, y| select_line(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Shift-Button-1', 
+           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
+    t.bind('Key-Down', proc{|w| select_shift(w, 1)}, '%W')
+
+    t.bind('Control-Home', proc{|w| select_line(w, 0)}, '%W')
+    t.bind('Control-End', proc{|w| select_line(w, 'end')}, '%W')
+
+    t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
+    t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
+    t.bind('Control-slash', 
+           proc{|w| select_line(w, w.index('active').to_i)}, '%W')
+
+    t
+  end
+
+  ########################
+  def single_mode_bindtag
+    t = TkBindTag.new
+    t.bind('Button-1', 
+           proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
+    t.bind('ButtonRelease-1', 
+           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Shift-Button-1', 
+           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
+    t.bind('Key-Down', proc{|w| select_shift(w, 1)}, '%W')
+
+    t.bind('Control-Home', proc{|w| select_line(w, 0)}, '%W')
+    t.bind('Control-End', proc{|w| select_line(w, 'end')}, '%W')
+
+    t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
+    t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
+    t.bind('Control-slash', 
+           proc{|w| select_line(w, w.index('active').to_i)}, '%W')
+    t.bind('Control-backslash', 
+           proc{@lbox_list.each{|l| l.selection_clear(0, 'end')}})
+
+    t
+  end
+
+  ########################
+  def extended_mode_bindtag
+    t = TkBindTag.new
+    t.bind('Button-1', 
+           proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
+    t.bind('B1-Motion', proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
+
+    t.bind('ButtonRelease-1', 
+           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Shift-Button-1', 
+           proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
+    t.bind('Shift-B1-Motion', 
+           proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Control-Button-1', 
+           proc{|w, y| select_toggle(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Control-B1-Motion', 
+           proc{|w, y| select_drag(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
+    t.bind('Key-Down', proc{|w| active_shift(w, 1)}, '%W')
+
+    t.bind('Shift-Up', proc{|w| select_expand(w, -1)}, '%W')
+    t.bind('Shift-Down', proc{|w| select_expand(w, 1)}, '%W')
+
+    t.bind('Control-Home', proc{|w| select_line2(w, 0)}, '%W')
+    t.bind('Control-End', proc{|w| select_line2(w, 'end')}, '%W')
+
+    t.bind('Control-Shift-Home', proc{|w| select_range(w, 0)}, '%W')
+    t.bind('Control-Shift-End', proc{|w| select_range(w, 'end')}, '%W')
+
+    t.bind('space', proc{|w| select_active(w)}, '%W')
+    t.bind('Select', proc{|w| select_active(w)}, '%W')
+    t.bind('Control-slash', proc{|w| select_all}, '%W')
+    t.bind('Control-backslash', proc{|w| clear_all}, '%W')
+
+    t
+  end
+
+  ########################
+  def multiple_mode_bindtag
+    t = TkBindTag.new
+    t.bind('Button-1', 
+           proc{|w, y| w.focus; select_line3(w, w.nearest(y))}, '%W %y')
+    t.bind('ButtonRelease-1', 
+           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
+    t.bind('Key-Down', proc{|w| active_shift(w, 1)}, '%W')
+
+    t.bind('Control-Home', proc{|w| select_line2(w, 0)}, '%W')
+    t.bind('Control-End', proc{|w| select_line2(w, 'end')}, '%W')
+
+    t.bind('Control-Shift-Home', proc{|w| active_line(w, 0)}, '%W')
+    t.bind('Control-Shift-End', proc{|w| active_line(w, 'end')}, '%W')
+
+    t.bind('space', proc{|w| select_active(w)}, '%W')
+    t.bind('Select', proc{|w| select_active(w)}, '%W')
+    t.bind('Control-slash', proc{|w| select_all}, '%W')
+    t.bind('Control-backslash', proc{|w| clear_all}, '%W')
+
+    t
+  end
+
+  ########################
+  def active_line(w, idx)
+    @lbox_list.each{|l| l.activate(idx)}
+  end
+
+  def select_only(w, idx)
+    @lbox_list.each{|l|
+      l.selection_clear(0, 'end')
+      l.selection_anchor(idx)
+      l.selection_set('anchor')
+    }
+  end
+
+  def select_range(w, idx)
+    @lbox_list.each{|l|
+      l.selection_clear(0, 'end')
+      l.selection_set('anchor', idx)
+    }
+  end
+
+  def select_toggle(w, idx)
+    st = w.selection_includes(idx)
+    @lbox_list.each{|l|
+      l.selection_anchor(idx)
+      if st == 1
+        l.selection_clear(idx)
+      else
+        l.selection_set(idx)
+      end
+    }
+  end
+
+  def select_drag(w, idx)
+    st = w.selection_includes('anchor')
+    @lbox_list.each{|l|
+      if st == 1
+        l.selection_set('anchor', idx)
+      else
+        l.selection_clear('anchor', idx)
+      end
+    }
+  end
+
+  def select_line(w, idx)
+    @lbox_list.each{|l|
+      l.selection_clear(0, 'end')
+      l.activate(idx)
+      l.selection_anchor(idx)
+      l.selection_set('anchor')
+    }
+    w.selection_set('anchor')
+  end
+
+  def select_line2(w, idx)
+    @lbox_list.each{|l|
+      l.activate(idx)
+      l.selection_anchor(idx)
+      l.selection_set('anchor')
+    }
+  end
+
+  def select_line3(w, idx)
+    @lbox_list.each{|l|
+      l.selection_set(idx)
+    }
+  end
+
+  def select_active(w)
+    idx = l.activate(idx)
+    @lbox_list.each{|l|
+      l.selection_set(idx)
+    }
+  end
+
+  def select_expand(w, dir)
+    idx = w.index('active').to_i + dir
+    if idx < 0
+      idx = 0
+    elsif idx >= w.size
+      idx = w.size - 1
+    end
+    @lbox_list.each{|l|
+      l.activate(idx)
+      l.selection_set(idx)
+    }
+  end
+
+  def active_shift(w, dir)
+    idx = w.index('active').to_i + dir
+    if idx < 0
+      idx = 0
+    elsif idx >= w.size
+      idx = w.size - 1
+    end
+    @lbox_list.each{|l|
+      l.activate(idx)
+      l.selection_anchor(idx)
+    }
+  end
+
+  def select_shift(w, dir)
+    idx = w.index('anchor').to_i + dir
+    if idx < 0
+      idx = 0
+    elsif idx >= w.size
+      idx = w.size - 1
+    end
+    @lbox_list.each{|l|
+      l.selection_clear(0, 'end')
+      l.activate(idx)
+      l.selection_anchor(idx)
+      l.selection_set('anchor')
+    }
+  end
+
+  def select_all
+    @lbox_list.each{|l|
+      l.selection_set(0, 'end')
+    }
+  end
+
+  def clear_all
+    @lbox_list.each{|l|
+      l.selection_clear(0, 'end')
+    }
+  end
+
+  def focus_shift(w, dir)
+    idx = @lbox_list.index(w) + dir
+    return if idx < 0
+    return if idx >= @lbox_list.size
+    @lbox_list[idx].focus
+  end
+  ########################
+end
+
+################################################
+# test
+################################################
+if __FILE__ == $0
+  f = TkFrame.new(nil, 'width'=>300, 
+                  'height'=>200).pack('fill'=>'both', 'expand'=>'true')
+  #f = TkFrame.new.pack('fill'=>'both', 'expand'=>'true')
+  l = TkMultiListbox.new(f, 150, 
+                         [ ['L1', 100], 
+                           ['L2', 200], 
+                           ['L3', 50] ], 
+                         'titlefont'=>'courier', 
+                         'titleforeground'=>'yellow', 
+                         'titlebackground'=>'navy'
+                         ).pack('fill'=>'both', 'expand'=>true)
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6])
+  l.insert('end', [4,5,6], [4,5,6])
+  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6], [4,5,6])
+  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6], [4,5,6])
+  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6], [4,5,6])
+  p l.columns(1)
+  p l.columns(1..3)
+  p l.columns(1,2)
+  Tk.mainloop
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkmultilistframe.rb b/ruby_1_8_6/ext/tk/sample/tkmultilistframe.rb
new file mode 100644
index 0000000000..ef1a0a824d
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkmultilistframe.rb
@@ -0,0 +1,940 @@
+#
+# tkmultilistframe.rb : multiple listbox widget on scrollable frame
+#                       by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+class TkMultiListFrame < TkListbox
+  include TkComposite
+
+  #   lbox_height : height of listboxes (pixel)
+  #   title_info  : array [ [<title_string>,<init_width>], ... ]
+  #   keys        : hash {<option>=><value>, ... }
+  def initialize_composite(lbox_height, title_info, keys={})
+    # argument check
+    if (! title_info.kind_of? Array) or (title_info.size < 2)
+      raise
+    end
+
+    # mode
+    @keep_minsize = true
+    @show_each_hscr = true
+    @show_win_hscr = true
+
+    # init arrays
+    @base_list  = []
+    @rel_list   = []
+    @title_list = []
+    @title_cmd  = []
+    @lbox_list  = []
+    @hscr_list  = []
+
+    # decide total width
+    @lbox_total = title_info.size
+    @width_total = 0
+    title_info.each{|title, width, cmd| 
+      @width_total += width.to_f
+      @title_cmd << cmd
+    }
+
+    # rel-table of label=>index
+    @name_index = {}
+
+    # size definition
+    @window_width = @width_total
+    @sash = 5
+    @scrbar_width = 15
+    @scrbar_border = 3
+    @lbox_border = 1
+    @title_border = 3
+    @h_l_thick = 0
+
+    # init status
+    @mode = :title
+
+    # virtical scrollbar
+=begin
+    @v_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
+                                'borderwidth'=>@scrbar_border, 
+                                'orient'=>'vertical', 'width'=>@scrbar_width)
+=end
+    @v_scroll = TkYScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
+                                 'borderwidth'=>@scrbar_border, 
+                                 'width'=>@scrbar_width)
+
+    # horizontal scrollbar
+=begin
+    @h_scroll = TkScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
+                                'borderwidth'=>@scrbar_border, 
+                                'orient'=>'horizontal', 'width'=>@scrbar_width)
+=end
+    @h_scroll = TkXScrollbar.new(@frame, 'highlightthickness'=>@h_l_thick, 
+                                 'borderwidth'=>@scrbar_border, 
+                                 'width'=>@scrbar_width)
+
+    # create base flames
+    @c_title = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
+                            'width'=>@window_width)
+    @f_title = TkFrame.new(@c_title, 'width'=>@width_total)
+    @w_title = TkcWindow.new(@c_title, 0, 0, 
+                             'window'=>@f_title, 'anchor'=>'nw')
+
+    @c_lbox  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
+                            'width'=>@window_width)
+    @f_lbox  = TkFrame.new(@c_lbox, 'width'=>@width_total)
+    @w_lbox  = TkcWindow.new(@c_lbox, 0, 0, 'window'=>@f_lbox, 'anchor'=>'nw')
+
+    @c_hscr  = TkCanvas.new(@frame, 'highlightthickness'=>@h_l_thick, 
+                            'width'=>@window_width)
+    @f_hscr  = TkFrame.new(@c_hscr, 'width'=>@width_total)
+    @w_hscr  = TkcWindow.new(@c_hscr, 0, 0, 'window'=>@f_hscr, 'anchor'=>'nw')
+
+    # create each listbox
+    sum = 0.0
+    @rel_list << sum/@width_total
+    title_info.each_with_index{|(label, width), idx|
+      # set relation between label and index
+      if @name_index.include?(label)
+        @name_index[label] << idx
+      else
+        @name_index[label] = [idx]
+      end
+
+      # calculate relative positioning
+      sum += width
+      @rel_list << sum/@width_total
+
+      # title field
+      f = TkFrame.new(@f_title, 'width'=>width)
+      base = [f]
+
+      title = TkLabel.new(f, 'text'=>label, 'borderwidth'=>@title_border, 
+                          'relief'=>'raised', 'highlightthickness'=>@h_l_thick)
+      title_binding(title, idx)
+      title.pack('fill'=>'x')
+
+      @title_list << title
+
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1, 
+              'relheight'=>1.0, 
+              'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
+
+      # listbox field
+      f = TkFrame.new(@f_lbox, 'width'=>width)
+      base << f
+      @lbox_list << TkListbox.new(f, 'highlightthickness'=>@h_l_thick, 
+                                  'borderwidth'=>@lbox_border
+                                  ).pack('fill'=>'both', 'expand'=>true)
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1, 
+              'relwidth'=>@rel_list[idx+1] - @rel_list[idx], 'relheight'=>1.0)
+
+      # scrollbar field
+      f = TkFrame.new(@f_hscr, 'width'=>width)
+      base << f
+=begin
+      @hscr_list << TkScrollbar.new(f, 'orient'=>'horizontal', 
+                                    'width'=>@scrbar_width, 
+                                    'borderwidth'=>@scrbar_border, 
+                                    'highlightthickness'=>@h_l_thick
+                                    ).pack('fill'=>'x', 'anchor'=>'w')
+=end
+      @hscr_list << TkXScrollbar.new(f, 'width'=>@scrbar_width, 
+                                     'borderwidth'=>@scrbar_border, 
+                                     'highlightthickness'=>@h_l_thick
+                                    ).pack('fill'=>'x', 'anchor'=>'w')
+      f.place('relx'=>@rel_list[idx], 'y'=>0, 'anchor'=>'nw', 'width'=>1, 
+              'relwidth'=>@rel_list[idx+1] - @rel_list[idx])
+
+=begin
+      @lbox_list[idx].xscrollcommand proc{|first, last| 
+        @hscr_list[idx].set first, last
+      }
+      @hscr_list[idx].command proc{|*args| @lbox_list[idx].xview *args}
+=end
+      @lbox_list[idx].xscrollbar(@hscr_list[idx])
+
+      # add new base
+      @base_list << base
+    }
+
+    # pad
+    # @f_title_pad = TkFrame.new(@frame)
+    @f_title_pad = TkFrame.new(@frame, 'relief'=>'raised', 
+                               'borderwidth'=>@title_border, 
+                               'highlightthickness'=>@h_l_thick)
+
+    @f_scr_pad = TkFrame.new(@frame, 'relief'=>'sunken', 
+                             'borderwidth'=>1, 
+                             'highlightthickness'=>@h_l_thick)
+
+    # height check
+    title_height = 0
+    @title_list.each{|w| 
+      h = w.winfo_reqheight
+      title_height = h if title_height < h
+    }
+
+    hscr_height = 0
+    @hscr_list.each{|w| 
+      h = w.winfo_reqheight
+      hscr_height = h if hscr_height < h
+    }
+
+    @f_title.height title_height
+    @f_lbox.height lbox_height
+    @f_hscr.height hscr_height
+
+    # set control procedure for virtical scroll
+=begin
+    @lbox_list.each{|lbox|
+      lbox.yscrollcommand proc{|first, last| 
+        @v_scroll.set first, last
+      }
+    }
+    @v_scroll.command proc{|*args| @lbox_list.each{|lbox| lbox.yview *args} }
+=end
+    @v_scroll.assign(*@lbox_list)
+
+    # set control procedure for horizoncal scroll
+=begin
+    @c_title.xscrollcommand proc{|first, last| 
+      @h_scroll.set first, last
+    }
+    @c_lbox.xscrollcommand proc{|first, last| 
+      @h_scroll.set first, last
+    }
+    @c_hscr.xscrollcommand proc{|first, last| 
+      @h_scroll.set first, last
+    }
+    @h_scroll.command proc{|*args| 
+      @c_title.xview *args
+      @c_lbox.xview *args
+      @c_hscr.xview *args if @show_each_hscr
+    }
+=end
+    @h_scroll.assign(@c_title, @c_lbox, @c_hscr)
+
+    # binding for listboxes
+    @lbox_mode = {}
+    @lbox_mode['browse']   = browse_mode_bindtag
+    @lbox_mode['single']   = single_mode_bindtag
+    @lbox_mode['extended'] = extended_mode_bindtag
+    @lbox_mode['multiple'] = multiple_mode_bindtag
+    @current_mode = 'browse'
+    @lbox_list.each_with_index{|l, idx| 
+      l.bind('Shift-Key-Left', 
+             proc{|w| focus_shift(w, -1); Tk.callback_break}, '%W')
+      l.bind('Shift-Key-Right', 
+             proc{|w| focus_shift(w, 1); Tk.callback_break}, '%W')
+
+      l.bind('Button-2', proc{|x, y| 
+               @lbox_mark_x = x
+               @lbox_list.each{|lbox| lbox.scan_mark(x, y)}
+             }, '%x %y')
+      l.bind('B2-Motion', proc{|x, y| 
+               @lbox_list.each{|lbox| lbox.scan_dragto(@lbox_mark_x, y)}
+               l.scan_dragto(x, y)
+             }, '%x %y')
+
+      l.bindtags(l.bindtags.unshift(@lbox_mode[@current_mode]))
+    }
+
+    bbox = @w_title.bbox
+    @c_title.height(bbox[3])
+    @c_title.scrollregion(bbox)
+
+    bbox = @w_lbox.bbox
+    @c_lbox.height(bbox[3])
+    @c_lbox.scrollregion(bbox)
+
+    if @show_each_hscr
+      bbox = @w_hscr.bbox
+      @c_hscr.height(bbox[3])
+      @c_hscr.scrollregion(bbox)
+    end
+
+    # alignment
+    TkGrid.rowconfigure(@frame, 0, 'weight'=>0)
+    TkGrid.rowconfigure(@frame, 1, 'weight'=>1)
+    TkGrid.rowconfigure(@frame, 2, 'weight'=>0)
+    TkGrid.rowconfigure(@frame, 3, 'weight'=>0)
+    TkGrid.columnconfigure(@frame, 0, 'weight'=>1)
+    TkGrid.columnconfigure(@frame, 1, 'weight'=>0)
+    TkGrid.columnconfigure(@frame, 2, 'weight'=>0)
+    @v_scroll.grid('row'=>1, 'column'=>2, 'sticky'=>'ns')
+    @c_title.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
+    @f_title_pad.grid('row'=>0, 'column'=>2, 'sticky'=>'news')
+    @c_lbox.grid('row'=>1, 'column'=>0, 'sticky'=>'news')
+    @c_hscr.grid('row'=>2, 'column'=>0, 'sticky'=>'ew') if @show_each_hscr
+    @h_scroll.grid('row'=>3, 'column'=>0, 'sticky'=>'ew') if @show_win_hscr
+    @f_scr_pad.grid('row'=>2, 'rowspan'=>2, 'column'=>2, 'sticky'=>'news')
+
+    # binding for 'Configure' event
+    @c_lbox.bind('Configure', 
+                 proc{|height, width| reconstruct(height, width)}, 
+                 '%h %w')
+
+    # set default receiver of method calls
+    @path = @lbox_list[0].path
+
+    # configure options
+    keys = {} unless keys
+    keys = _symbolkey2str(keys)
+
+    # 'mode' option of listboxes
+    sel_mode = keys.delete('mode')
+    mode(sel_mode) if sel_mode
+
+    # 'scrollbarwidth' option == 'width' option of scrollbars
+    width = keys.delete('scrollbarwidth')
+    scrollbarwidth(width) if width
+
+    # options for listbox titles
+    title_font = keys.delete('titlefont')
+    titlefont(title_font) if title_font
+
+    title_fg = keys.delete('titleforeground')
+    titleforeground(title_fg) if title_fg
+
+    title_bg = keys.delete('titlebackground')
+    titlebackground(title_bg) if title_bg
+
+    # set receivers for configure methods
+    delegate('DEFAULT', *@lbox_list)
+    delegate('activebackground', @v_scroll, @h_scroll, *@hscr_list)
+    delegate('troughcolor', @v_scroll, @h_scroll, *@hscr_list)
+    delegate('repeatdelay', @v_scroll, @h_scroll, *@hscr_list)
+    delegate('repeatinterval', @v_scroll, @h_scroll, *@hscr_list)
+    delegate('borderwidth', @frame)
+    delegate('width', @c_lbox, @c_title, @c_hscr)
+    delegate('relief', @frame)
+
+    # configure
+    configure(keys) if keys.size > 0
+  end
+  private :initialize_composite
+
+  # set 'mode' option of listboxes
+  def mode(sel_mode)
+    @lbox_list.each{|l| 
+      tags = l.bindtags
+      tags = tags - [ @lbox_mode[@current_mode] ]
+      l.bindtags(tags.unshift(@lbox_mode[sel_mode]))
+      @current_mode = sel_mode
+    }
+  end
+
+  # keep_minsize?
+  def keep_minsize?
+    @keep_minsize
+  end
+  def keep_minsize(bool)
+    @keep_minsize = bool
+  end
+
+  # each hscr
+  def show_each_hscr
+    @show_each_hscr = true
+    @c_hscr.grid('row'=>2, 'column'=>0, 'sticky'=>'ew')
+  end
+  def hide_each_hscr
+    @show_each_hscr = false
+    @c_hscr.ungrid
+  end
+
+  # window hscroll
+  def show_win_hscr
+    @show_win_hscr = true
+    @h_scroll.grid('row'=>3, 'column'=>0, 'sticky'=>'ew')
+  end
+  def hide_win_hscr
+    @show_each_hscr = false
+    @h_scroll.ungrid
+  end
+
+  # set scrollbar width
+  def scrollbarwidth(width)
+    @scrbar_width = width
+    @v_scroll['width'] = @scrbar_width
+    @h_scroll['width'] = @scrbar_width
+    @hscr_list.each{|hscr| hscr['width'] = @scrbar_width}
+    self
+  end
+
+  # set scrollbar border
+  def scrollbarborder(width)
+    @scrbar_border = width
+    @v_scroll['border'] = @scrbar_border
+    @h_scroll['border'] = @scrbar_border
+    @hscr_list.each{|hscr| hscr['border'] = @scrbar_border}
+    self
+  end
+
+  # set listbox borders
+  def listboxborder(width)
+    @lbox_border = width
+    @lbox_list.each{|w| w['border'] = @lbox_border}
+    self
+  end
+
+  # set listbox relief
+  def listboxrelief(relief)
+    @lbox_list.each{|w| w['relief'] = relief}
+    self
+  end
+
+  # set title borders
+  def titleborder(width)
+    @title_border = width
+    @f_title_pad['border'] = @title_border
+    @title_list.each{|label| label['border'] = @title_border}
+    self
+  end
+
+  # set title font
+  def titlefont(font)
+    @title_list.each{|label| label['font'] = font}
+    title_height = 0
+    @title_list.each{|w| 
+      h = w.winfo_reqheight
+      title_height = h if title_height < h
+    }
+    @f_title.height title_height
+    bbox = @w_title.bbox
+    @c_title.height(bbox[3])
+    @c_title.scrollregion(bbox)
+    self
+  end
+
+  # set title foreground color
+  def titleforeground(fg)
+    @title_list.each{|label| label['foreground'] = fg}
+    self
+  end
+
+  # set title background color
+  def titlebackground(bg)
+    @f_title_pad['background'] = bg
+    @title_list.each{|label| label['background'] = bg}
+    self
+  end
+
+  # set title cmds
+  def titlecommand(idx, cmd=Proc.new)
+    @title_cmd[idx] = cmd
+  end
+
+  # call title cmds
+  def titleinvoke(idx)
+    @title_cmd[idx].call if @title_cmd[idx]
+  end
+
+  # get label widgets of listbox titles
+  def titlelabels(*indices)
+    @title_list[*indices]
+  end
+
+  # get listbox widgets
+  def columns(*indices)
+    @lbox_list[*indices]
+  end
+
+  def activate(idx)
+    @lbox_list.each{|lbox| lbox.activate(idx)}
+  end
+
+  def bbox(idx)
+    @lbox_list.collect{|lbox| lbox.bbox(idx)}
+  end
+
+  def delete(*idx)
+    @lbox_list.collect{|lbox| lbox.delete(*idx)}
+  end
+
+  def get(*idx)
+    if idx.size == 1
+      @lbox_list.collect{|lbox| lbox.get(*idx)}
+    else
+      list = @lbox_list.collect{|lbox| lbox.get(*idx)}
+      result = []
+      list[0].each_with_index{|line, index|
+        result << list.collect{|lines| lines[index]}
+      }
+      result
+    end
+  end
+
+  def _line_array_to_hash(line)
+    result = {}
+    @name_index.each_pair{|label, indices|
+      if indices.size == 1
+        result[label] = line[indices[0]]
+      else
+        result[label] = indices.collect{|index| line[index]}
+      end
+    }
+    result
+  end
+  private :_line_array_to_hash
+
+  def get_by_hash(*idx)
+    get_result = get(*idx)
+    if idx.size == 1
+      _line_array_to_hash(get_result)
+    else
+      get_result.collect{|line| _line_array_to_hash(line)}
+    end
+  end
+
+  def insert(idx, *lines)
+    lbox_ins = []
+    (0..@lbox_list.size).each{lbox_ins << []}
+
+    lines.each{|line|
+      if line.kind_of? Hash
+        array = []
+        @name_index.each_pair{|label, indices|
+          if indices.size == 1
+            array[indices[0]] = line[label]
+          else
+            if line[label].kind_of? Array
+              indices.each_with_index{|index, num| 
+                array[index] = line[label][num]
+              }
+            else
+              array[indices[0]] = line[label]
+            end
+          end
+        }
+        line = array
+      end
+
+      @name_index.each_pair{|label, indices|
+        if indices.size == 1
+          lbox_ins[indices[0]] << line[indices[0]]
+        else
+          indices.each{|index| lbox_ins[index] << line[index]}
+        end
+      }
+    }   
+
+    @lbox_list.each_with_index{|lbox, index| 
+      lbox.insert(idx, *lbox_ins[index]) if lbox_ins[index]
+    }
+  end
+
+  def selection_anchor(index)
+    @lbox_list.each{|lbox| lbox.selection_anchor(index)}
+  end
+
+  def selection_clear(first, last=None)
+    @lbox_list.each{|lbox| lbox.selection_clear(first, last=None)}
+  end
+
+  def selection_set(first, last=None)
+    @lbox_list.each{|lbox| lbox.selection_set(first, last=None)}
+  end
+
+  ###########################################
+  private
+
+  def reconstruct(height, width)
+    if @keep_minsize && width <= @width_total
+      @f_title.width(@width_total)
+      @f_lbox.width(@width_total)
+      @f_hscr.width(@width_total) if @show_each_hscr
+      @window_width = @width_total
+    else
+      @f_title.width(width)
+      @f_lbox.width(width)
+      @f_hscr.width(width) if @show_each_hscr
+      @window_width = width
+    end
+
+    @f_lbox.height(height)
+
+    @c_title.scrollregion(@w_title.bbox)
+    @c_lbox.scrollregion(@w_lbox.bbox)
+    @c_hscr.scrollregion(@w_hscr.bbox) if @show_each_hscr
+
+    (0..(@rel_list.size - 2)).each{|idx|
+      title, lbox, hscr = @base_list[idx]
+      title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
+      lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+                 'relheight'=>1.0)
+      hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx])
+    }
+  end
+
+  def resize(x)
+    idx = @sel_sash
+    return if idx == 0
+
+    # adjustment of relative positioning
+    delta = (x - @x) / @frame_width
+    if delta < @rel_list[idx-1] - @rel_list[idx] + (2*@sash/@frame_width)
+      delta = @rel_list[idx-1] - @rel_list[idx] + (2*@sash/@frame_width)
+    elsif delta > @rel_list[idx+1] - @rel_list[idx] - (2*@sash/@frame_width)
+      delta = @rel_list[idx+1] - @rel_list[idx] - (2*@sash/@frame_width)
+    end
+    @rel_list[idx] += delta
+
+    # adjustment of leftside widget of the sash
+    title, lbox, hscr = @base_list[idx - 1]
+    title.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1])
+    lbox.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1], 'relheight'=>1.0)
+    hscr.place('relwidth'=>@rel_list[idx] - @rel_list[idx-1])
+
+    # adjustment of rightside widget of the sash
+    title, lbox, hscr = @base_list[idx]
+    title.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+                'relx'=>@rel_list[idx])
+    lbox.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+               'relx'=>@rel_list[idx], 'relheight'=>1.0)
+    hscr.place('relwidth'=>@rel_list[idx+1] - @rel_list[idx], 
+               'relx'=>@rel_list[idx])
+
+    # update reference position
+    @x = x
+  end
+
+  def motion_cb(w, x, idx)
+    if x <= @sash && idx > 0
+      w.cursor 'sb_h_double_arrow'
+      @mode = :sash
+      @sel_sash = idx
+    elsif x >= w.winfo_width - @sash && idx < @lbox_total - 1
+      w.cursor 'sb_h_double_arrow'
+      @mode = :sash
+      @sel_sash = idx + 1
+    else
+      w.cursor ""
+      @mode = :title
+      @sel_sash = 0
+    end
+  end
+
+  def title_binding(title, index)
+    title.bind('Motion', proc{|w, x, idx| motion_cb(w, x, idx.to_i)}, 
+               "%W %x #{index}")
+
+    title.bind('Enter', proc{|w, x, idx| motion_cb(w, x, idx.to_i)}, 
+               "%W %x #{index}")
+
+    title.bind('Leave', proc{|w| w.cursor ""}, "%W")
+
+    title.bind('Button-1', 
+               proc{|w, x| 
+                 if @mode == :sash
+                   @x = x
+                   @frame_width = TkWinfo.width(@f_title).to_f
+                 else
+                   title.relief 'sunken'
+                 end
+               }, 
+               '%W %X')
+
+    title.bind('ButtonRelease-1', 
+               proc{|w, x, idx| 
+                 i = idx.to_i
+                 if @mode == :title && @title_cmd[i].kind_of?(Proc)
+                   @title_cmd[i].call
+                 end
+                 title.relief 'raised'
+                 motion_cb(w,x,i)
+               }, 
+               "%W %x #{index}")
+
+    title.bind('B1-Motion', proc{|x| resize(x) if @mode == :sash}, "%X")
+  end
+
+  #################################
+  def browse_mode_bindtag
+    t = TkBindTag.new
+    t.bind('Button-1', 
+           proc{|w, y| w.focus; select_line(w, w.nearest(y))}, '%W %y')
+    t.bind('B1-Motion', proc{|w, y| select_line(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Shift-Button-1', 
+           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
+    t.bind('Key-Down', proc{|w| select_shift(w, 1)}, '%W')
+
+    t.bind('Control-Home', proc{|w| select_line(w, 0)}, '%W')
+    t.bind('Control-End', proc{|w| select_line(w, 'end')}, '%W')
+
+    t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
+    t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
+    t.bind('Control-slash', 
+           proc{|w| select_line(w, w.index('active').to_i)}, '%W')
+
+    t
+  end
+
+  ########################
+  def single_mode_bindtag
+    t = TkBindTag.new
+    t.bind('Button-1', 
+           proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
+    t.bind('ButtonRelease-1', 
+           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Shift-Button-1', 
+           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Key-Up', proc{|w| select_shift(w, -1)}, '%W')
+    t.bind('Key-Down', proc{|w| select_shift(w, 1)}, '%W')
+
+    t.bind('Control-Home', proc{|w| select_line(w, 0)}, '%W')
+    t.bind('Control-End', proc{|w| select_line(w, 'end')}, '%W')
+
+    t.bind('space', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
+    t.bind('Select', proc{|w| select_line(w, w.index('active').to_i)}, '%W')
+    t.bind('Control-slash', 
+           proc{|w| select_line(w, w.index('active').to_i)}, '%W')
+    t.bind('Control-backslash', 
+           proc{@lbox_list.each{|l| l.selection_clear(0, 'end')}})
+
+    t
+  end
+
+  ########################
+  def extended_mode_bindtag
+    t = TkBindTag.new
+    t.bind('Button-1', 
+           proc{|w, y| w.focus; select_only(w, w.nearest(y))}, '%W %y')
+    t.bind('B1-Motion', proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
+
+    t.bind('ButtonRelease-1', 
+           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Shift-Button-1', 
+           proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
+    t.bind('Shift-B1-Motion', 
+           proc{|w, y| select_range(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Control-Button-1', 
+           proc{|w, y| select_toggle(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Control-B1-Motion', 
+           proc{|w, y| select_drag(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
+    t.bind('Key-Down', proc{|w| active_shift(w, 1)}, '%W')
+
+    t.bind('Shift-Up', proc{|w| select_expand(w, -1)}, '%W')
+    t.bind('Shift-Down', proc{|w| select_expand(w, 1)}, '%W')
+
+    t.bind('Control-Home', proc{|w| select_line2(w, 0)}, '%W')
+    t.bind('Control-End', proc{|w| select_line2(w, 'end')}, '%W')
+
+    t.bind('Control-Shift-Home', proc{|w| select_range(w, 0)}, '%W')
+    t.bind('Control-Shift-End', proc{|w| select_range(w, 'end')}, '%W')
+
+    t.bind('space', proc{|w| select_active(w)}, '%W')
+    t.bind('Select', proc{|w| select_active(w)}, '%W')
+    t.bind('Control-slash', proc{|w| select_all}, '%W')
+    t.bind('Control-backslash', proc{|w| clear_all}, '%W')
+
+    t
+  end
+
+  ########################
+  def multiple_mode_bindtag
+    t = TkBindTag.new
+    t.bind('Button-1', 
+           proc{|w, y| w.focus; select_line3(w, w.nearest(y))}, '%W %y')
+    t.bind('ButtonRelease-1', 
+           proc{|w, y| active_line(w, w.nearest(y))}, '%W %y')
+
+    t.bind('Key-Up', proc{|w| active_shift(w, -1)}, '%W')
+    t.bind('Key-Down', proc{|w| active_shift(w, 1)}, '%W')
+
+    t.bind('Control-Home', proc{|w| select_line2(w, 0)}, '%W')
+    t.bind('Control-End', proc{|w| select_line2(w, 'end')}, '%W')
+
+    t.bind('Control-Shift-Home', proc{|w| active_line(w, 0)}, '%W')
+    t.bind('Control-Shift-End', proc{|w| active_line(w, 'end')}, '%W')
+
+    t.bind('space', proc{|w| select_active(w)}, '%W')
+    t.bind('Select', proc{|w| select_active(w)}, '%W')
+    t.bind('Control-slash', proc{|w| select_all}, '%W')
+    t.bind('Control-backslash', proc{|w| clear_all}, '%W')
+
+    t
+  end
+
+  ########################
+  def active_line(w, idx)
+    @lbox_list.each{|l| l.activate(idx)}
+  end
+
+  def select_only(w, idx)
+    @lbox_list.each{|l|
+      l.selection_clear(0, 'end')
+      l.selection_anchor(idx)
+      l.selection_set('anchor')
+    }
+  end
+
+  def select_range(w, idx)
+    @lbox_list.each{|l|
+      l.selection_clear(0, 'end')
+      l.selection_set('anchor', idx)
+    }
+  end
+
+  def select_toggle(w, idx)
+    st = w.selection_includes(idx)
+    @lbox_list.each{|l|
+      l.selection_anchor(idx)
+      if st == 1
+        l.selection_clear(idx)
+      else
+        l.selection_set(idx)
+      end
+    }
+  end
+
+  def select_drag(w, idx)
+    st = w.selection_includes('anchor')
+    @lbox_list.each{|l|
+      if st == 1
+        l.selection_set('anchor', idx)
+      else
+        l.selection_clear('anchor', idx)
+      end
+    }
+  end
+
+  def select_line(w, idx)
+    @lbox_list.each{|l|
+      l.selection_clear(0, 'end')
+      l.activate(idx)
+      l.selection_anchor(idx)
+      l.selection_set('anchor')
+    }
+    w.selection_set('anchor')
+  end
+
+  def select_line2(w, idx)
+    @lbox_list.each{|l|
+      l.activate(idx)
+      l.selection_anchor(idx)
+      l.selection_set('anchor')
+    }
+  end
+
+  def select_line3(w, idx)
+    @lbox_list.each{|l|
+      l.selection_set(idx)
+    }
+  end
+
+  def select_active(w)
+    idx = l.activate(idx)
+    @lbox_list.each{|l|
+      l.selection_set(idx)
+    }
+  end
+
+  def select_expand(w, dir)
+    idx = w.index('active').to_i + dir
+    if idx < 0
+      idx = 0
+    elsif idx >= w.size
+      idx = w.size - 1
+    end
+    @lbox_list.each{|l|
+      l.activate(idx)
+      l.selection_set(idx)
+    }
+  end
+
+  def active_shift(w, dir)
+    idx = w.index('active').to_i + dir
+    if idx < 0
+      idx = 0
+    elsif idx >= w.size
+      idx = w.size - 1
+    end
+    @lbox_list.each{|l|
+      l.activate(idx)
+      l.selection_anchor(idx)
+    }
+  end
+
+  def select_shift(w, dir)
+    idx = w.index('anchor').to_i + dir
+    if idx < 0
+      idx = 0
+    elsif idx >= w.size
+      idx = w.size - 1
+    end
+    @lbox_list.each{|l|
+      l.selection_clear(0, 'end')
+      l.activate(idx)
+      l.selection_anchor(idx)
+      l.selection_set('anchor')
+    }
+  end
+
+  def select_all
+    @lbox_list.each{|l|
+      l.selection_set(0, 'end')
+    }
+  end
+
+  def clear_all
+    @lbox_list.each{|l|
+      l.selection_clear(0, 'end')
+    }
+  end
+
+  def focus_shift(w, dir)
+    idx = @lbox_list.index(w) + dir
+    return if idx < 0
+    return if idx >= @lbox_list.size
+    @lbox_list[idx].focus
+  end
+  ########################
+end
+
+################################################
+# test
+################################################
+if __FILE__ == $0
+  l = TkMultiListFrame.new(nil, 200, 
+                           [ ['L1', 200, proc{p 'click L1'}], 
+                             ['L2', 100], 
+                             ['L3', 200] ], 
+                           'width'=>350, 
+                           #'titleforeground'=>'yellow', 
+                           'titleforeground'=>'white', 
+                           #'titlebackground'=>'navy',
+                           'titlebackground'=>'blue',
+                           'titlefont'=>'courier'
+                           ).pack('fill'=>'both', 'expand'=>true)
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6])
+  l.insert('end', [4,5,6], [4,5,6])
+  l.insert('end', ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 
+                   'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+                   'cccccccccccccccccccccccccccccccccccccccccccccccccccc'])
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6], [4,5,6])
+  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6], [4,5,6])
+  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6], [4,5,6])
+  l.insert('end', ['aaaaaaaaaaaaaaa','bbbbbbbbbbbbbb','ccccccccccccccccc'])
+  l.insert('end', [1,2,3])
+  l.insert('end', [4,5,6], [4,5,6])
+  p l.columns(1)
+  p l.columns(1..3)
+  p l.columns(1,2)
+  Tk.mainloop
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tkoptdb-safeTk.rb b/ruby_1_8_6/ext/tk/sample/tkoptdb-safeTk.rb
new file mode 100644
index 0000000000..a06098323f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkoptdb-safeTk.rb
@@ -0,0 +1,73 @@
+#!/usr/bin/env ruby
+
+require 'multi-tk'
+
+TkMessage.new(:text => <<EOM).pack
+This is a sample of the safe-Tk slave interpreter. \
+On the slave interpreter, 'tkoptdb.rb' demo is running.
+( NOTE:: a safe-Tk interpreter can't read options \
+from a file. Options are given by the master interpreter \
+in this script. )
+The window shown this message is a root widget of \
+the default master interpreter. The other window \
+is a toplevel widget of the master interpreter, and it \
+has a container frame of the safe-Tk slave interpreter.
+'exit' on the slave interpreter exits the slave only. \
+You can also delete the slave by the button on the toplevel widget.
+EOM
+
+if ENV['LANG'] =~ /^ja/
+  # read Japanese resource
+  ent = TkOptionDB.read_entries(File.expand_path('resource.ja', 
+                                                 File.dirname(__FILE__)),
+                                'euc-jp')
+else
+  # read English resource
+  ent = TkOptionDB.read_entries(File.expand_path('resource.en', 
+                                                File.dirname(__FILE__)))
+end
+
+file = File.expand_path('tkoptdb.rb', File.dirname(__FILE__))
+
+ip = MultiTkIp.new_safeTk{
+  # When a block is given to 'new_safeTk' method, 
+  # the block is evaluated on $SAFE==4.
+  ent.each{|pat, val| Tk.tk_call('option', 'add', pat, val)}
+}
+
+print "ip.eval_proc{$SAFE} ==> ", ip.eval_proc{$SAFE}, "\n"
+
+print "\ncall 'ip.wait_on_mainloop = false'\n"
+print "If 'ip.wait_on_mainloop? == true', ", 
+  "when 'mainloop' is called on 'ip.eval_proc', ", 
+  "'ip.eval_proc' does't return while the root window exists.\n", 
+  "If you want to avoid that, set wait_on_mainloop to false. ", 
+  "Then the mainloop in the eval_proc returns soon ", 
+  "and the following steps are evaluated. \n", 
+  "If you hate the both of them, use 'ip.bg_eval_proc' or ", 
+  "wrap 'ip.eval_proc' by a thread.\n"
+
+ip.wait_on_mainloop = false
+
+ret = ip.eval_proc{
+  # When a block is given to 'eval_proc' method, 
+  # the block is evaluated on the IP's current safe level.
+  # So, the followings raises an exception. 
+  # An Exception object of the exception is returned as a 
+  # return value of this method.
+
+  load file
+}
+print "\nip.eval_proc{}, which includes insecure operiation in the given block, returns an exception object: ", ret.inspect, "\n"
+
+print "If a proc object is given, the proc is evaluated on the safe-level which is kept on the proc :: ip.eval_proc( proc{$SAFE} ) ==> ", ip.eval_proc(proc{$SAFE}), "\n"
+
+safe0_cmd = Proc.new{
+  print 'safe0_cmd safe-level == ', $SAFE, "\n"
+  # This proc object keeps current safe-level ($SAFE==0). 
+  load file
+}
+ip.eval_proc{safe0_cmd.call}
+
+# Tk.mainloop is ignored on the slave-IP
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkoptdb.rb b/ruby_1_8_6/ext/tk/sample/tkoptdb.rb
new file mode 100644
index 0000000000..47784ea238
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkoptdb.rb
@@ -0,0 +1,106 @@
+#!/usr/bin/env ruby
+#
+#  sample script of TkOptionDB
+#
+#  If 'LANG' environment variable's value is started by 'ja',  
+#  then read Japanese resource data and display Japanese button text. 
+#  In other case, read English resource data and display English text. 
+#
+require "tk"
+
+if __FILE__ == $0 || !TkCore::INTERP.safe?
+  if ENV['LANG'] =~ /^ja/
+    # read Japanese resource
+    TkOptionDB.read_with_encoding(File.expand_path('resource.ja', 
+                                                   File.dirname(__FILE__)), 
+                                  'euc-jp')
+  else
+    # read English resource
+    TkOptionDB.readfile(File.expand_path('resource.en', 
+                                         File.dirname(__FILE__)))
+  end
+end
+
+# 'show_msg' and 'bye_msg' procedures can be defined on BTN_CMD resource.
+# Those procedures are called under $SAFE==2
+cmd = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3) {
+  # If you want to check resource string (str), 
+  # please define __check_proc_string__(str) like this.
+  class << self
+    def __check_proc_string__(str)
+      print "($SAFE=#{$SAFE} >>>) check!! str.tainted?::#{str.tainted?}"
+      str.untaint
+      print "==>#{str.tainted?} (<<< $SAFE=#{$SAFE}): "
+      str
+    end
+    private :__check_proc_string__
+  end
+}
+
+# following two frame widgets use same database entry
+TkFrame.new(:class=>'BtnFrame'){|f|
+  pack(:padx=>5, :pady=>5)
+  TkButton.new(:parent=>f, :widgetname=>'hello'){ 
+    command proc{
+      print "($SAFE=#{$SAFE} >>>) : "
+      cmd.show_msg(TkOptionDB.inspect)
+      print "(<<< $SAFE=#{$SAFE})"
+    } 
+    pack(:fill=>:x, :padx=>10, :pady=>10)
+  }
+  TkButton.new(:command=>proc{
+                 print "($SAFE=#{$SAFE} >>>) : "
+                 cmd.bye_msg
+                 print "(<<< $SAFE=#{$SAFE} ) : "
+                 exit
+               }, 
+               :parent=>f, :widgetname=>'quit'){
+    pack(:fill=>:x, :padx=>10, :pady=>10)
+  }
+}
+
+class BtnFrame < TkFrame; end
+BtnFrame.new{|f|
+  pack(:padx=>5, :pady=>5)
+  TkButton.new(:parent=>f, :widgetname=>'hello'){ 
+    command proc{
+      print "($SAFE=#{$SAFE} >>>) : "
+      cmd.show_msg(TkOptionDB.inspect)
+      print "(<<< $SAFE=#{$SAFE})"
+    } 
+    pack(:fill=>:x, :padx=>10, :pady=>10)
+  }
+  TkButton.new(:command=>proc{
+                 print "($SAFE=#{$SAFE} >>>) : "
+                 cmd.bye_msg
+                 print "(<<< $SAFE=#{$SAFE})"
+                 exit
+               }, 
+               :parent=>f, :widgetname=>'quit'){
+    pack(:fill=>:x, :padx=>10, :pady=>10)
+  }
+}
+
+# if unknown class, use default option values
+TkFrame.new(:class=>'BtnFrame2'){|f|
+  pack(:padx=>5, :pady=>5)
+  TkButton.new(:parent=>f, :widgetname=>'hello'){ 
+    command proc{
+      print "($SAFE=#{$SAFE} >>>) : "
+      cmd.show_msg(TkOptionDB.inspect)
+      print "(<<< $SAFE=#{$SAFE})"
+    } 
+    pack(:fill=>:x, :padx=>10, :pady=>10)
+  }
+  TkButton.new(:command=>proc{
+                 print "($SAFE=#{$SAFE} >>>) : "
+                 cmd.bye_msg
+                 print "(<<< $SAFE=#{$SAFE})"
+                 exit
+               }, 
+               :parent=>f, :widgetname=>'quit'){
+    pack(:fill=>:x, :padx=>10, :pady=>10)
+  }
+}
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tkrttimer.rb b/ruby_1_8_6/ext/tk/sample/tkrttimer.rb
new file mode 100644
index 0000000000..531f4a8d5a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tkrttimer.rb
@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+# This script is a re-implementation of tktimer.rb with TkTimer(TkAfter) class.
+
+require "tk"
+
+root = TkRoot.new(:title=>'realtime timer sample')
+
+f1 = TkFrame.new(:borderwidth=>2, :relief=>:ridge)
+f1.pack(:side=>:bottom, :fill=>:both)
+TkLabel.new(f1, :text=>'use TkTimer (TkAfter) class').pack(:anchor=>:center)
+label1 = TkLabel.new(:parent=>f1, :relief=>:raised, 
+                     :width=>10).pack(:fill=>:both)
+
+f2 = TkFrame.new(:borderwidth=>2, :relief=>:ridge)
+f2.pack(:side=>:bottom, :fill=>:both)
+TkLabel.new(f2, :text=>'use TkRTTimer class').pack
+label2 = TkLabel.new(:parent=>f2, :relief=>:raised, 
+                     :width=>10).pack(:fill=>:both)
+
+TkLabel.new(:text=>'Interval setting of each timer is 10 ms.', 
+            :padx=>10, :pady=>5).pack
+
+# define the procedure repeated by the TkTimer object
+tick = proc{|aobj| #<== TkTimer object
+  cnt = aobj.return_value + 1  # return_value keeps a result of the last proc
+  label = aobj.current_args[0]
+  label.text format("%d.%02d", *(cnt.divmod(100)))
+  cnt #==> return value is kept by TkTimer object
+      #    (so, can be send to the next repeat-proc)
+}
+
+timer1 = TkTimer.new(10, -1, [tick, label1])    # 10 ms interval
+timer2 = TkRTTimer.new(10, -1, [tick, label2])  # 10 ms interval
+
+timer1.start(0, proc{ label1.text('0.00'); 0 })
+timer2.start(0, proc{ label2.text('0.00'); 0 })
+
+b_start = TkButton.new(:text=>'Start', :state=>:disabled) {
+  pack(:side=>:left, :fill=>:both, :expand=>true)
+}
+
+b_stop  = TkButton.new(:text=>'Stop', :state=>:normal) {
+  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
+}
+
+b_start.command {
+  timer1.continue
+  timer2.continue
+  b_stop.state(:normal)
+  b_start.state(:disabled)
+}
+
+b_stop.command {
+  timer1.stop
+  timer2.stop
+  b_start.state(:normal)
+  b_stop.state(:disabled)
+}
+
+TkButton.new(:text=>'Reset', :state=>:normal) {
+  command { timer1.reset; timer2.reset }
+  pack(:side=>:right, :fill=>:both, :expand=>:yes)
+}
+
+ev_quit = TkVirtualEvent.new('Control-c', 'Control-q')
+Tk.root.bind(ev_quit, proc{Tk.exit}).focus
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tktextframe.rb b/ruby_1_8_6/ext/tk/sample/tktextframe.rb
new file mode 100644
index 0000000000..bdab057d34
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tktextframe.rb
@@ -0,0 +1,162 @@
+#
+#  tktextframe.rb : a sample of TkComposite
+#
+#                         by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+class TkTextFrame < TkText
+  include TkComposite
+
+  def initialize_composite(keys={})
+    keys = _symbolkey2str(keys)
+
+    # create scrollbars
+    @v_scroll = TkScrollbar.new(@frame, 'orient'=>'vertical')
+    @h_scroll = TkScrollbar.new(@frame, 'orient'=>'horizontal')
+
+    # create a text widget
+    @text = TkText.new(@frame, 'wrap'=>'none')
+
+    # set default receiver of method calls
+    @path = @text.path
+
+    # assign scrollbars
+    @text.xscrollbar(@h_scroll)
+    @text.yscrollbar(@v_scroll)
+
+    # allignment
+    TkGrid.rowconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
+    TkGrid.columnconfigure(@frame, 0, 'weight'=>1, 'minsize'=>0)
+    @text.grid('row'=>0, 'column'=>0, 'sticky'=>'news')
+
+    # scrollbars ON
+    vscroll(keys.delete('vscroll'){true})
+    hscroll(keys.delete('hscroll'){true})
+
+    # set background of the text widget
+=begin
+    color = keys.delete('textbackground')
+    textbackground(color) if color
+=end
+    # please check the differences of the following definitions
+    option_methods(
+       [:scrollbarwidth, :get_scrollbarwidth], 
+       [:textbackground, nil, :textbg_info], 
+       :textborderwidth, 
+       :textrelief
+    )
+
+    # set receiver widgets for configure methods (with alias)
+    delegate_alias('scrollbarrelief', 'relief', @h_scroll, @v_scroll)
+
+    # set receiver widgets for configure methods
+    delegate('DEFAULT', @text)
+    delegate('background', @frame, @h_scroll, @v_scroll)
+    delegate('activebackground', @h_scroll, @v_scroll)
+    delegate('troughcolor', @h_scroll, @v_scroll)
+    delegate('repeatdelay', @h_scroll, @v_scroll)
+    delegate('repeatinterval', @h_scroll, @v_scroll)
+    delegate('borderwidth', @frame)
+    delegate('relief', @frame)
+
+    # do configure
+    configure keys unless keys.empty?
+  end
+  private :initialize_composite
+
+  # set background color of text widget
+  def textbackground(color = nil)
+    if color
+      @text.background(color)
+    else
+      @text.background
+    end
+  end
+
+  def textbg_info
+    info = @text.configinfo(:background)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      info[0] = 'textbackground'
+      info
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      {'textbackground' => info['background']}
+    end
+  end
+
+  # get/set borderwidth of text widget
+  def set_textborderwidth(width)
+    @text.borderwidth(width)
+  end
+  def get_textborderwidth
+    @text.borderwidth
+  end
+  def textborderwidth(width = nil)
+    if width
+      set_textborderwidth(width)
+    else
+      get_textborderwidth
+    end
+  end
+
+  # set relief of text widget
+  def textrelief(type)
+    @text.relief(type)
+  end
+
+  # get/set width of scrollbar
+  def get_scrollbarwidth
+    @v_scroll.width
+  end
+  def set_scrollbarwidth(width)
+    @v_scroll.width(width)
+    @h_scroll.width(width)
+  end
+  alias :scrollbarwidth :set_scrollbarwidth
+
+  # vertical scrollbar : ON/OFF
+  def vscroll(mode)
+    st = TkGrid.info(@v_scroll)
+    if mode && st.size == 0 then
+      @v_scroll.grid('row'=>0, 'column'=>1, 'sticky'=>'ns')
+    elsif !mode && st.size != 0 then
+      @v_scroll.ungrid
+    end
+    self
+  end
+
+  # horizontal scrollbar : ON/OFF
+  def hscroll(mode, wrap_mode="char")
+    st = TkGrid.info(@h_scroll)
+    if mode && st.size == 0 then
+      @h_scroll.grid('row'=>1, 'column'=>0, 'sticky'=>'ew')
+      wrap 'none'  # => self.wrap('none')
+    elsif !mode && st.size != 0 then
+      @h_scroll.ungrid
+      wrap wrap_mode  # => self.wrap(wrap_mode)
+    end
+    self
+  end
+end
+
+
+################################################
+# test
+################################################
+if __FILE__ == $0
+  f = TkFrame.new.pack('fill'=>'x')
+  #t = TkTextFrame.new.pack
+  t = TkTextFrame.new(:textborderwidth=>3, 
+                      :textrelief=>:ridge, 
+                      :scrollbarrelief=>:ridge).pack
+  p t.configinfo
+  TkButton.new(f, 'text'=>'vscr OFF', 
+               'command'=>proc{t.vscroll(false)}).pack('side'=>'right')
+  TkButton.new(f, 'text'=>'vscr ON', 
+               'command'=>proc{t.vscroll(true)}).pack('side'=>'right')
+  TkButton.new(f, 'text'=>'hscr ON', 
+               'command'=>proc{t.hscroll(true)}).pack('side'=>'left')
+  TkButton.new(f, 'text'=>'hscr OFF', 
+               'command'=>proc{t.hscroll(false)}).pack('side'=>'left')
+  Tk.mainloop
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tktextio.rb b/ruby_1_8_6/ext/tk/sample/tktextio.rb
new file mode 100644
index 0000000000..4573bcebdf
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tktextio.rb
@@ -0,0 +1,1050 @@
+#!/usr/bin/env ruby
+#
+#  TkTextIO class :: handling I/O stream on a TkText widget
+#                             by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#  NOTE: TkTextIO supports 'character' (not 'byte') access only. 
+#        So, for example, TkTextIO#getc returns a character, TkTextIO#pos 
+#        means the character position, TkTextIO#read(size) counts by 
+#        characters, and so on.
+#        Of course, it is available to make TkTextIO class to suuport 
+#        'byte' access. However, it may break multi-byte characters. 
+#        and then, displayed string on the text widget may be garbled.
+#        I think that it is not good on the supposed situation of using 
+#        TkTextIO. 
+#
+require 'tk'
+require 'tk/text'
+require 'tk/textmark'
+require 'thread'
+
+class TkTextIO < TkText
+  # keep safe level
+  @@create_queues = proc{ [Queue.new, Mutex.new, Queue.new, Mutex.new] }
+
+  OPT_DEFAULTS = {
+    'mode'       => nil,
+    'overwrite'  => false, 
+    'text'       => nil, 
+    'show'       => :pos, 
+    'wrap'       => 'char', 
+    'sync'       => true, 
+    'prompt'     => nil, 
+    'prompt_cmd' => nil, 
+    'hist_size'  => 1000, 
+  }
+
+  def create_self(keys)
+    opts = _get_io_params((keys.kind_of?(Hash))? keys: {})
+
+    super(keys)
+
+    @count_var = TkVariable.new
+
+    @write_buffer = ''
+    @read_buffer  = ''
+    @buf_size = 0
+    @buf_max = 1024
+
+    @write_buf_queue, @write_buf_mutex, 
+    @read_buf_queue,  @read_buf_mutex  = @@create_queues.call
+
+    @idle_flush  = TkTimer.new(:idle, 1, proc{ @flusher.run rescue nil })
+    @timer_flush = TkTimer.new(250, -1, proc{ @flusher.run rescue nil })
+
+    @flusher = Thread.new{ loop { Thread.stop; flush() } }
+
+    @receiver = Thread.new{
+      begin
+        loop {
+          str = @write_buf_queue.deq
+          @write_buf_mutex.synchronize { @write_buffer << str }
+          @idle_flush.start
+        }
+      ensure
+        @flusher.kill
+      end
+    }
+
+    @timer_flush.start
+
+    _setup_io(opts)
+  end
+  private :create_self
+
+  def destroy
+    @flusher.kill rescue nil
+
+    @idle_flush.stop rescue nil
+    @timer_flush.stop rescue nil
+
+    @receiver.kill rescue nil
+
+    super()
+  end
+
+  ####################################
+
+  def _get_io_params(keys)
+    opts = {}
+    self.class.const_get(:OPT_DEFAULTS).each{|k, v| 
+      if keys.has_key?(k)
+        opts[k] = keys.delete(k)
+      else
+        opts[k] = v
+      end
+    }
+    opts
+  end
+
+  def _setup_io(opts)
+    unless defined? @txtpos
+      @txtpos = TkTextMark.new(self, '1.0')
+    else
+      @txtpos.set('1.0')
+    end
+    @txtpos.gravity = :left
+
+    @lineno = 0
+    @line_offset = 0
+
+    @hist_max = opts['hist_size'].to_i
+    @hist_index = 0
+    @history = Array.new(@hist_max)
+    @history[0] = ''
+
+    self['wrap'] = wrap
+
+    self.show_mode = opts['show']
+
+    self.value = opts['text'] if opts['text']
+
+    @overwrite = (opts['overwrite'])? true: false
+
+    @sync = opts['sync']
+
+    @prompt = opts['prompt']
+    @prompt_cmd = opts['prompt_cmd']
+
+    @open  = {:r => true,  :w => true}  # default is 'r+'
+
+    @console_mode = false
+    @end_of_stream = false
+    @console_buffer = nil
+
+    case opts['mode']
+    when nil
+      # do nothing
+
+    when :console, 'console'
+      @console_mode = true
+      # @console_buffer = TkTextIO.new(:mode=>'r')
+      @console_buffer = self.class.new(:mode=>'r')
+      self.show_mode = :insert
+
+    when 'r', 'rb'
+      @open[:r] = true; @open[:w] = nil
+
+    when 'r+', 'rb+', 'r+b'
+      @open[:r] = true; @open[:w] = true
+
+    when 'w', 'wb'
+      @open[:r] = nil;  @open[:w] = true
+      self.value=''
+
+    when 'w+', 'wb+', 'w+b'
+      @open[:r] = true; @open[:w] = true
+      self.value=''
+
+    when 'a', 'ab'
+      @open[:r] = nil;  @open[:w] = true
+      @txtpos.set('end - 1 char')
+      @txtpos.gravity = :right
+
+    when 'a+', 'ab+', 'a+b'
+      @open[:r] = true;  @open[:w] = true
+      @txtpos.set('end - 1 char')
+      @txtpos.gravity = :right
+
+    else
+      fail ArgumentError, "unknown mode `#{opts['mode']}'"
+    end
+
+    unless defined? @ins_head
+      @ins_head = TkTextMark.new(self, 'insert')
+      @ins_head.gravity = :left
+    end
+
+    unless defined? @ins_tail
+      @ins_tail = TkTextMark.new(self, 'insert')
+      @ins_tail.gravity = :right
+    end
+
+    unless defined? @tmp_mark
+      @tmp_mark = TkTextMark.new(self, 'insert')
+      @tmp_mark.gravity = :left
+    end
+
+    if @console_mode
+      _set_console_line
+      _setup_console_bindings
+    end
+  end
+  private :_get_io_params, :_setup_io
+
+  def _set_console_line
+    @tmp_mark.set(@ins_tail)
+
+    mark_set('insert', 'end')
+
+    prompt = ''
+    prompt << @prompt_cmd.call if @prompt_cmd
+    prompt << @prompt if @prompt
+    insert(@tmp_mark, prompt)
+
+    @ins_head.set(@ins_tail)
+    @ins_tail.set('insert')
+
+    @txtpos.set(@tmp_mark)
+
+    _see_pos
+  end
+
+  def _replace_console_line(str)
+    self.delete(@ins_head, @ins_tail)
+    self.insert(@ins_head, str)
+  end
+
+  def _get_console_line
+    @tmp_mark.set(@ins_tail)
+    s = self.get(@ins_head, @tmp_mark)
+    _set_console_line
+    s
+  end
+  private :_set_console_line, :_replace_console_line, :_get_console_line
+
+  def _cb_up
+    @history[@hist_index].replace(self.get(@ins_head, @ins_tail))
+    @hist_index += 1
+    @hist_index -= 1 if @hist_index >= @hist_max || !@history[@hist_index]
+    _replace_console_line(@history[@hist_index]) if @history[@hist_index]
+    Tk.callback_break
+  end
+  def _cb_down
+    @history[@hist_index].replace(self.get(@ins_head, @ins_tail))
+    @hist_index -= 1
+    @hist_index = 0 if @hist_index < 0
+    _replace_console_line(@history[@hist_index]) if @history[@hist_index]
+    Tk.callback_break
+  end
+  def _cb_left
+    if @console_mode && compare('insert', '<=', @ins_head)
+      mark_set('insert', @ins_head)
+      Tk.callback_break
+    end
+  end
+  def _cb_backspace
+    if @console_mode && compare('insert', '<=', @ins_head)
+      Tk.callback_break
+    end
+  end
+  def _cb_ctrl_a
+    if @console_mode
+      mark_set('insert', @ins_head)
+      Tk.callback_break
+    end
+  end
+  private :_cb_up, :_cb_down, :_cb_left, :_cb_backspace, :_cb_ctrl_a
+
+  def _setup_console_bindings
+    @bindtag = TkBindTag.new
+
+    tags = self.bindtags
+    tags[tags.index(self)+1, 0] = @bindtag
+    self.bindtags = tags
+
+    @bindtag.bind('Return'){
+      insert('end - 1 char', "\n")
+      if (str = _get_console_line)
+        @read_buf_queue.push(str)
+
+        @history[0].replace(str.chomp)
+        @history.pop
+        @history.unshift('')
+        @hist_index = 0
+      end
+
+      Tk.update
+      Tk.callback_break
+    }
+    @bindtag.bind('Alt-Return'){
+      Tk.callback_continue
+    }
+
+    @bindtag.bind('FocusIn'){
+      if @console_mode
+        mark_set('insert', @ins_tail)
+        Tk.callback_break
+      end
+    }
+
+    ins_mark = TkTextMark.new(self, 'insert')
+
+    @bindtag.bind('ButtonPress'){
+      if @console_mode
+        ins_mark.set('insert')
+      end
+    }
+
+    @bindtag.bind('ButtonRelease-1'){
+      if @console_mode && compare('insert', '<=', @ins_head)
+        mark_set('insert', ins_mark)
+        Tk.callback_break
+      end
+    }
+
+    @bindtag.bind('ButtonRelease-2', '%x %y'){|x, y|
+      if @console_mode
+        # paste a text at 'insert' only
+        x1, y1, x2, y2 =  bbox(ins_mark)
+        unless x == x1 && y == y1
+          Tk.event_generate(self, 'ButtonRelease-2', :x=>x1, :y=>y1)
+          Tk.callback_break
+        end
+      end
+    }
+
+    @bindtag.bind('Up'){ _cb_up }
+    @bindtag.bind('Control-p'){ _cb_up }
+
+    @bindtag.bind('Down'){ _cb_down }
+    @bindtag.bind('Control-n'){ _cb_down }
+
+    @bindtag.bind('Left'){ _cb_left }
+    @bindtag.bind('Control-b'){ _cb_left }
+
+    @bindtag.bind('BackSpace'){ _cb_backspace }
+    @bindtag.bind('Control-h'){ _cb_backspace }
+
+    @bindtag.bind('Home'){ _cb_ctrl_a }
+    @bindtag.bind('Control-a'){ _cb_ctrl_a }
+  end
+  private :_setup_console_bindings
+
+  def _block_read(size = nil, ret = '', block_mode = true)
+    return '' if size == 0
+    return nil if ! @read_buf_queue && @read_buffer.empty?
+    ret = '' unless ret.kind_of?(String)
+    ret.replace('') unless ret.empty?
+
+    if block_mode == nil # partial
+      if @read_buffer.empty?
+        ret << @read_buffer.slice!(0..-1)
+        return ret
+      end
+    end
+
+    if size.kind_of?(Numeric)
+      loop{
+        @read_buf_mutex.synchronize {
+          buf_len = @read_buffer.length
+          if buf_len >= size
+            ret << @read_buffer.slice!(0, size)
+            return ret
+          else
+            ret << @read_buffer.slice!(0..-1)
+            size -= buf_len
+            return ret unless @read_buf_queue
+          end
+        }
+        @read_buffer << @read_buf_queue.pop
+      }
+    else # readline
+      rs = (size)? size: $/
+      rs = rs.to_s if rs.kind_of?(Regexp)
+      loop{
+        @read_buf_mutex.synchronize {
+          if (str = @read_buffer.slice!(/\A(.*)(#{rs})/m))
+            ret << str
+            return ret
+          else
+            ret << @read_buffer.slice!(0..-1)
+            return ret unless @read_buf_queue
+          end
+        }
+        @read_buffer << @read_buf_queue.pop
+      }
+    end
+  end
+
+  def _block_write
+    ###### currently, not support
+  end
+  private :_block_read, :_block_write
+
+  ####################################
+
+  def <<(obj)
+    _write(obj)
+    self
+  end
+
+  def binmode
+    self
+  end
+
+  def clone
+    fail NotImplementedError, 'cannot clone TkTextIO'
+  end
+  def dup
+    fail NotImplementedError, 'cannot duplicate TkTextIO'
+  end
+
+  def close
+    close_read
+    close_write
+    nil
+  end
+  def close_read
+    @open[:r] = false if @open[:r]
+    nil
+  end
+  def close_write
+    @open[:w] = false if @opne[:w]
+    nil
+  end
+
+  def closed?(dir=nil)
+    case dir
+    when :r, 'r'
+      !@open[:r]
+    when :w, 'w'
+      !@open[:w]
+    else
+      !@open[:r] && !@open[:w]
+    end
+  end
+
+  def _check_readable
+    fail IOError, "not opened for reading" if @open[:r].nil?
+    fail IOError, "closed stream" if !@open[:r]
+  end
+  def _check_writable
+    fail IOError, "not opened for writing" if @open[:w].nil?
+    fail IOError, "closed stream" if !@open[:w]
+  end
+  private :_check_readable, :_check_writable
+
+  def each_line(rs = $/)
+    _check_readable
+    while(s = self.gets(rs))
+      yield(s)
+    end
+    self
+  end
+  alias each each_line
+
+  def each_char
+    _check_readable
+    while(c = self.getc)
+      yield(c)
+    end
+    self
+  end
+  alias each_byte each_char
+
+  def eof?
+    compare(@txtpos, '==', 'end - 1 char')
+  end
+  alias eof eof?
+
+  def fcntl(*args)
+    fail NotImplementedError, "fcntl is not implemented on #{self.class}"
+  end
+
+  def fsync
+    0
+  end
+
+  def fileno
+    nil
+  end
+
+  def flush
+    Thread.pass
+    if @open[:w] || ! @write_buffer.empty?
+      @write_buf_mutex.synchronize {
+        _sync_write_buf(@write_buffer) 
+        @write_buffer[0..-1] = ''
+      }
+    end
+    self
+  end
+
+  def getc
+    return _block_read(1) if @console_mode
+
+    _check_readable
+    return nil if eof?
+    c = get(@txtpos)
+    @txtpos.set(@txtpos + '1 char')
+    _see_pos
+    c
+  end
+
+  def gets(rs = $/)
+    return _block_read(rs) if @console_mode
+
+    _check_readable
+    return nil if eof?
+    _readline(rs)
+  end
+
+  def ioctrl(*args)
+    fail NotImplementedError, 'iocntl is not implemented on TkTextIO'
+  end
+
+  def isatty
+    false
+  end
+  def tty?
+    false
+  end
+
+  def lineno
+    @lineno + @line_offset
+  end
+
+  def lineno=(num)
+    @line_offset = num - @lineno
+    num
+  end
+
+  def overwrite?
+    @overwrite
+  end
+
+  def overwrite=(ovwt)
+    @overwrite = (ovwt)? true: false
+  end
+
+  def pid
+    nil
+  end
+
+  def index_pos
+    index(@txtpos)
+  end
+  alias tell_index index_pos
+
+  def index_pos=(idx)
+    @txtpos.set(idx)
+    @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
+    _see_pos
+    idx
+  end
+
+  def pos
+    s = get('1.0', @txtpos)
+    number(tk_call('string', 'length', s))
+  end
+  alias tell pos
+
+  def pos=(idx)
+    seek(idx, IO::SEEK_SET)
+    idx
+  end
+
+  def pos_gravity
+    @txtpos.gravity
+  end
+
+  def pos_gravity=(side)
+    @txtpos.gravity = side
+    side
+  end
+
+  def print(arg=$_, *args)
+    _check_writable
+    args.unshift(arg)
+    args.map!{|val| (val == nil)? 'nil': val.to_s }
+    str = args.join($,)
+    str << $\ if $\
+    _write(str)
+    nil
+  end
+  def printf(*args)
+    _check_writable
+    _write(sprintf(*args))
+    nil
+  end
+
+  def putc(c)
+    _check_writable
+    c = c.chr if c.kind_of?(Fixnum)
+    _write(c)
+    c
+  end
+
+  def puts(*args)
+    _check_writable
+    if args.empty?
+      _write("\n")
+      return nil
+    end
+    args.each{|arg|
+      if arg == nil
+        _write("nil\n")
+      elsif arg.kind_of?(Array)
+        puts(*arg)
+      elsif arg.kind_of?(String)
+        _write(arg.chomp)
+        _write("\n")
+      else
+        begin
+          arg = arg.to_ary
+          puts(*arg)
+        rescue
+          puts(arg.to_s)
+        end
+      end
+    }
+    nil
+  end
+
+  def _read(len)
+    epos = @txtpos + "#{len} char"
+    s = get(@txtpos, epos)
+    @txtpos.set(epos)
+    @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
+    _see_pos
+    s
+  end
+  private :_read
+
+  def read(len=nil, buf=nil)
+    return _block_read(len, buf) if @console_mode
+
+    _check_readable
+    if len
+      return "" if len == 0
+      return nil if eof?
+      s = _read(len)
+    else
+      s = get(@txtpos, 'end - 1 char')
+      @txtpos.set('end - 1 char')
+      _see_pos
+    end
+    buf.replace(s) if buf.kind_of?(String)
+    s
+  end
+
+  def readchar
+    return _block_read(1) if @console_mode
+
+    _check_readable
+    fail EOFError if eof?
+    c = get(@txtpos)
+    @txtpos.set(@txtpos + '1 char')
+    _see_pos
+    c
+  end
+
+  def _readline(rs = $/)
+    if rs == nil
+      s = get(@txtpos, 'end - 1 char')
+      @txtpos.set('end - 1 char')
+    elsif rs == ''
+      @count_var.value  # make it global
+      idx = tksearch_with_count([:regexp], @count_var, 
+                                   "\n(\n)+", @txtpos, 'end - 1 char')
+      if idx
+        s = get(@txtpos, idx) << "\n"
+        @txtpos.set("#{idx} + #{@count_var.value} char")
+        @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
+      else
+        s = get(@txtpos, 'end - 1 char')
+        @txtpos.set('end - 1 char')
+      end
+    else
+      @count_var.value  # make it global
+      idx = tksearch_with_count(@count_var, rs, @txtpos, 'end - 1 char')
+      if idx
+        s = get(@txtpos, "#{idx} + #{@count_var.value} char")
+        @txtpos.set("#{idx} + #{@count_var.value} char")
+        @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
+      else
+        s = get(@txtpos, 'end - 1 char')
+        @txtpos.set('end - 1 char')
+      end
+    end
+
+    _see_pos
+    @lineno += 1
+    $_ = s
+  end
+  private :_readline
+
+  def readline(rs = $/)
+    return _block_readline(rs) if @console_mode
+
+    _check_readable
+    fail EOFError if eof?
+    _readline(rs)
+  end
+
+  def readlines(rs = $/)
+    if @console_mode
+      lines = []
+      while (line = _block_readline(rs))
+        lines << line
+      end
+      return lines
+    end
+
+    _check_readable
+    lines = []
+    until(eof?)
+      lines << _readline(rs)
+    end
+    $_ = nil
+    lines
+  end
+
+  def readpartial(maxlen, buf=nil)
+    #return @console_buffer.readpartial(maxlen, buf) if @console_mode
+    return _block_read(maxlen, buf, nil) if @console_mode
+
+    _check_readable
+    fail EOFError if eof?
+    s = _read(maxlen)
+    buf.replace(s) if buf.kind_of?(String)
+    s
+  end
+
+  def reopen(*args)
+    fail NotImplementedError, 'reopen is not implemented on TkTextIO'
+  end
+
+  def rewind
+    @txtpos.set('1.0')
+    _see_pos
+    @lineno = 0
+    @line_offset = 0
+    self
+  end
+
+  def seek(offset, whence=IO::SEEK_SET)
+    case whence
+    when IO::SEEK_SET
+      offset = "1.0 + #{offset} char" if offset.kind_of?(Numeric)
+      @txtpos.set(offset)
+
+    when IO::SEEK_CUR
+      offset = "#{offset} char" if offset.kind_of?(Numeric)
+      @txtpos.set(@txtpos + offset)
+
+    when IO::SEEK_END
+      offset = "#{offset} char" if offset.kind_of?(Numeric)
+      @txtpos.set("end - 1 char + #{offset}")
+
+    else
+      fail Errno::EINVAL, 'invalid whence argument'
+    end
+
+    @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
+    _see_pos
+
+    0
+  end
+  alias sysseek seek
+
+  def _see_pos
+    see(@show) if @show
+  end
+  private :_see_pos
+
+  def show_mode
+    (@show == @txtpos)? :pos : @show
+  end
+
+  def show_mode=(mode)
+    # define show mode  when file position is changed. 
+    #  mode == :pos or "pos" or true :: see current file position. 
+    #  mode == :insert or "insert"   :: see insert cursor position. 
+    #  mode == nil or false          :: do nothing
+    #  else see 'mode' position ('mode' should be text index or mark)
+    case mode
+    when :pos, 'pos', true
+      @show = @txtpos
+    when :insert, 'insert'
+      @show = :insert
+    when nil, false
+      @show = false
+    else
+      begin
+        index(mode)
+      rescue
+        fail ArgumentError, 'invalid show-position'
+      end
+      @show = mode
+    end
+
+    _see_pos
+
+    mode
+  end
+
+  def stat
+    fail NotImplementedError, 'stat is not implemented on TkTextIO'
+  end
+
+  def sync
+    @sync
+  end
+
+  def sync=(mode)
+    @sync = mode
+  end
+
+  def sysread(len, buf=nil)
+    return _block_read(len, buf) if @console_mode
+
+    _check_readable
+    fail EOFError if eof?
+    s = _read(len)
+    buf.replace(s) if buf.kind_of?(String)
+    s
+  end
+
+  def syswrite(obj)
+    _write(obj)
+  end
+
+  def to_io
+    self
+  end
+
+  def trancate(len)
+    delete("1.0 + #{len} char", :end)
+    0
+  end
+
+  def ungetc(c)
+    if @console_mode
+      @read_buf_mutex.synchronize {
+        @read_buffer[0,0] = c.chr
+      }
+      return nil
+    end
+
+    _check_readable
+    c = c.chr if c.kind_of?(Fixnum)
+    if compare(@txtpos, '>', '1.0')
+      @txtpos.set(@txtpos - '1 char')
+      delete(@txtpos)
+      insert(@txtpos, tk_call('string', 'range', c, 0, 1))
+      @txtpos.set(@txtpos - '1 char') if @txtpos.gravity == 'right'
+      _see_pos
+    else
+      fail IOError, 'cannot ungetc at head of stream'
+    end
+    nil
+  end
+
+=begin
+  def _write(obj)
+    #s = _get_eval_string(obj)
+    s = (obj.kind_of?(String))? obj: obj.to_s
+    n = number(tk_call('string', 'length', s))
+    delete(@txtpos, @txtpos + "#{n} char") if @overwrite
+    self.insert(@txtpos, s)
+    @txtpos.set(@txtpos + "#{n} char")
+    @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
+    _see_pos
+    Tk.update if @sync
+    n
+  end
+  private :_write
+=end
+#=begin
+  def _sync_write_buf(s)
+    if (n = number(tk_call('string', 'length', s))) > 0
+      delete(@txtpos, @txtpos + "#{n} char") if @overwrite
+      self.insert(@txtpos, s)
+      #Tk.update
+
+      @txtpos.set(@txtpos + "#{n} char")
+      @txtpos.set('end - 1 char') if compare(@txtpos, '>=', :end)
+
+      @ins_head.set(@txtpos) if compare(@txtpos, '>', @ins_head)
+
+      _see_pos
+    end
+    self
+  end
+  private :_sync_write_buf
+
+  def _write(obj)
+    s = (obj.kind_of?(String))? obj: obj.to_s
+    n = number(tk_call('string', 'length', s))
+    @write_buf_queue.enq(s)
+    if @sync
+      Thread.pass
+      Tk.update
+    end
+    n
+  end
+  private :_write
+#=end
+
+  def write(obj)
+    _check_writable
+    _write(obj)
+  end
+end
+
+####################
+#  TEST
+####################
+if __FILE__ == $0
+  ev_loop = Thread.new{Tk.mainloop}
+
+  f = TkFrame.new.pack
+  #tio = TkTextIO.new(f, :show=>:nil, 
+  #tio = TkTextIO.new(f, :show=>:pos, 
+  tio = TkTextIO.new(f, :show=>:insert, 
+                     :text=>">>> This is an initial text line. <<<\n\n"){
+#    yscrollbar(TkScrollbar.new(f).pack(:side=>:right, :fill=>:y))
+    pack(:side=>:left, :fill=>:both, :expand=>true)
+  }
+
+  Tk.update
+
+  $stdin  = tio
+  $stdout = tio
+  $stderr = tio
+
+  STDOUT.print("\n========= TkTextIO#gets for inital text ========\n\n")
+
+  while(s = gets)
+    STDOUT.print(s)
+  end
+
+  STDOUT.print("\n============ put strings to TkTextIO ===========\n\n")
+
+  puts "On this sample, a text widget works as if it is a I/O stream."
+  puts "Please see the code."
+  puts
+  printf("printf message: %d %X\n", 123456, 255)
+  puts
+  printf("(output by 'p' method) This TkTextIO object is ...\n")
+  p tio
+  print(" [ Current wrap mode of this object is 'char'. ]\n")
+  puts
+  warn("This is a warning message generated by 'warn' method.")
+  puts
+  puts "current show_mode is #{tio.show_mode}."
+  if tio.show_mode == :pos
+    puts "So, you can see the current file position on this text widget."
+  else
+    puts "So, you can see the position '#{tio.show_mode}' on this text widget."
+  end
+  print("Please scroll up this text widget to see the head of lines.\n")
+  print("---------------------------------------------------------\n")
+
+  STDOUT.print("\n=============== TkTextIO#readlines =============\n\n")
+
+  tio.seek(0)
+  lines = readlines
+  STDOUT.puts(lines.inspect)
+
+  STDOUT.print("\n================== TkTextIO#each ===============\n\n")
+
+  tio.rewind
+  tio.each{|line| STDOUT.printf("%2d: %s\n", tio.lineno, line.chomp)}
+
+  STDOUT.print("\n================================================\n\n")
+
+  STDOUT.print("\n========= reverse order (seek by lines) ========\n\n")
+
+  tio.seek(-1, IO::SEEK_END)
+  begin
+    begin
+      tio.seek(:linestart, IO::SEEK_CUR)
+    rescue
+      # maybe use old version of tk/textmark.rb
+      tio.seek('0 char linestart', IO::SEEK_CUR)
+    end
+    STDOUT.print(gets)
+    tio.seek('-1 char linestart -1 char', IO::SEEK_CUR)
+  end while(tio.pos > 0)
+
+  STDOUT.print("\n================================================\n\n")
+
+  tio.seek(0, IO::SEEK_END)
+
+  STDOUT.print("tio.sync ==  #{tio.sync}\n")
+#  tio.sync = false
+#  STDOUT.print("tio.sync ==  #{tio.sync}\n")
+
+  (0..10).each{|i|
+    STDOUT.print("#{i}\n")
+    s = ''
+    (0..1000).each{ s << '*' }
+    print(s)
+  }
+  print("\n")
+  print("\n=========================================================\n\n")
+
+  s = ''
+  timer = TkTimer.new(:idle, -1, proc{
+                        #STDOUT.print("idle call\n")
+                        unless s.empty?
+                          print(s)
+                          s = ''
+                        end
+                      }).start
+  (0..10).each{|i|
+    STDOUT.print("#{i}\n")
+    (0..1000).each{ s << '*' }
+  }
+#  timer.stop
+  until s.empty?
+    sleep 0.1
+  end
+  timer.stop
+
+=begin
+  tio.sync = false
+  print("\n")
+  #(0..10000).each{ putc('*') }
+  (0..10).each{|i|
+    STDOUT.print("#{i}\n")
+    (0..1000).each{ putc('*') }
+  }
+
+  (0..10).each{|i|
+    STDOUT.print("#{i}\n")
+    s = ''
+    (0..1000).each{ s << '*' }
+    print(s)
+  }
+=end
+
+  num = 0
+#  io = TkTextIO.new(:mode=>:console, :prompt=>'').pack
+#=begin
+  io = TkTextIO.new(:mode=>:console, 
+                    :prompt_cmd=>proc{
+                      s = "[#{num}]"
+                      num += 1
+                      s
+                    }, 
+                    :prompt=>'-> ').pack
+#=end
+  Thread.new{loop{sleep 2; io.puts 'hoge'}}
+  Thread.new{loop{p io.gets}}
+
+  ev_loop.join
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tktimer.rb b/ruby_1_8_6/ext/tk/sample/tktimer.rb
new file mode 100644
index 0000000000..b1adb5b506
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tktimer.rb
@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+# This script generates a counter with start and stop buttons.
+
+require "tk"
+$label = TkLabel.new {
+  text '0.00'
+  relief 'raised'
+  width 10
+  pack('side'=>'bottom', 'fill'=>'both')
+}
+
+TkButton.new {
+  text 'Start'
+  command proc {
+    if $stopped
+      $stopped = FALSE
+      tick
+    end
+  }
+  pack('side'=>'left','fill'=>'both','expand'=>'yes')
+}
+TkButton.new {
+  text 'Stop'
+  command proc{
+    exit if $stopped
+    $stopped = TRUE
+  }
+  pack('side'=>'right','fill'=>'both','expand'=>'yes')
+}
+
+$seconds=0
+$hundredths=0
+$stopped=TRUE
+
+def tick
+  if $stopped then return end
+  Tk.after 50, proc{tick}
+  $hundredths+=5
+  if $hundredths >= 100
+    $hundredths=0
+    $seconds+=1
+  end
+  $label.text format("%d.%02d", $seconds, $hundredths)
+end
+
+root = Tk.root
+root.bind "Control-c", proc{root.destroy}
+root.bind "Control-q", proc{root.destroy}
+Tk.root.focus
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tktimer2.rb b/ruby_1_8_6/ext/tk/sample/tktimer2.rb
new file mode 100644
index 0000000000..dd31bb098e
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tktimer2.rb
@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+# This script is a re-implementation of tktimer.rb with TkTimer(TkAfter) class.
+
+require "tk"
+
+# new notation :
+#   * symbols are acceptable as keys or values of the option hash
+#   * the parent widget can be given by :parent key on the option hash 
+root = TkRoot.new(:title=>'timer sample')
+label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
+               .pack(:side=>:bottom, :fill=>:both)
+
+# define the procedure repeated by the TkTimer object
+tick = proc{|aobj| #<== TkTimer object
+  cnt = aobj.return_value + 5 # return_value keeps a result of the last proc
+  label.text format("%d.%02d", *(cnt.divmod(100)))
+  cnt #==> return value is kept by TkTimer object
+      #    (so, can be send to the next repeat-proc)
+}
+
+timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
+        # ==> repeat-interval : (about) 50 ms,  
+        #     repeat : infinite (-1) times, 
+        #     repeat-procedure : tick (only one, in this case)
+        #
+        # ==> wait-before-call-init-proc : 0 ms, 
+        #     init_proc : proc{ label.text('0.00'); 0 }
+        #
+        # (0ms)-> init_proc ->(50ms)-> tick ->(50ms)-> tick ->....
+
+TkButton.new(:text=>'Start') {
+  command proc{ timer.continue unless timer.running? }
+  pack(:side=>:left, :fill=>:both, :expand=>true)
+}
+TkButton.new(:text=>'Restart') {
+  command proc{ timer.restart(0, proc{ label.text('0.00'); 0 }) }
+  pack(:side=>:left, :fill=>:both, :expand=>true)
+}
+TkButton.new(:text=>'Stop') {
+  command proc{ timer.stop if timer.running? }
+  pack('side'=>'right','fill'=>'both','expand'=>'yes')
+}
+
+ev_quit = TkVirtualEvent.new('Control-c', 'Control-q')
+Tk.root.bind(ev_quit, proc{Tk.exit}).focus
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tktimer3.rb b/ruby_1_8_6/ext/tk/sample/tktimer3.rb
new file mode 100644
index 0000000000..e3bb4c3e4a
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tktimer3.rb
@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+# This script is a re-implementation of tktimer.rb with TkTimer(TkAfter) class.
+
+require "tk"
+
+# new notation :
+#   * symbols are acceptable as keys or values of the option hash
+#   * the parent widget can be given by :parent key on the option hash 
+root = TkRoot.new(:title=>'timer sample')
+label = TkLabel.new(:parent=>root, :relief=>:raised, :width=>10) \
+               .pack(:side=>:bottom, :fill=>:both)
+
+# define the procedure repeated by the TkTimer object
+tick = proc{|aobj| #<== TkTimer object
+  cnt = aobj.return_value + 5 # return_value keeps a result of the last proc
+  label.text format("%d.%02d", *(cnt.divmod(100)))
+  cnt #==> return value is kept by TkTimer object
+      #    (so, can be send to the next repeat-proc)
+}
+
+timer = TkTimer.new(50, -1, tick).start(0, proc{ label.text('0.00'); 0 })
+        # ==> repeat-interval : (about) 50 ms,  
+        #     repeat : infinite (-1) times, 
+        #     repeat-procedure : tick (only one, in this case)
+        #
+        # ==> wait-before-call-init-proc : 0 ms, 
+        #     init_proc : proc{ label.text('0.00'); 0 }
+        #
+        # (0ms)-> init_proc ->(50ms)-> tick ->(50ms)-> tick ->....
+
+b_start = TkButton.new(:text=>'Start', :state=>:disabled) {
+  pack(:side=>:left, :fill=>:both, :expand=>true)
+}
+
+b_stop  = TkButton.new(:text=>'Stop', :state=>:normal) {
+  pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
+}
+
+b_start.command {
+  timer.continue
+  b_stop.state(:normal)
+  b_start.state(:disabled)
+}
+
+b_stop.command {
+  timer.stop
+  b_start.state(:normal)
+  b_stop.state(:disabled)
+}
+
+TkButton.new(:text=>'Reset', :state=>:normal) {
+  command { timer.reset }
+  pack(:side=>:right, :fill=>:both, :expand=>:yes)
+}
+
+ev_quit = TkVirtualEvent.new('Control-c', 'Control-q')
+Tk.root.bind(ev_quit, proc{Tk.exit}).focus
+
+Tk.mainloop
diff --git a/ruby_1_8_6/ext/tk/sample/tktree.rb b/ruby_1_8_6/ext/tk/sample/tktree.rb
new file mode 100644
index 0000000000..56b7211c88
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tktree.rb
@@ -0,0 +1,103 @@
+##########################################################################
+# TkTree widget class
+#
+#    see <http://wiki.tcl.tk/10615>
+#
+#  Note:  optional argument '-font' of the Tcl library is changed to 
+#         'itemfont' on this Ruby library, because of avoiding font 
+#         operation trouble in 'initialize' method  ( see the following 
+#         test script ). 
+#
+##########################################################################
+require 'tk'
+
+class TkTree < TkCanvas
+  TCL_SCRIPT_PATH = File.join(File.dirname(__FILE__), 'tktree.tcl')
+
+  def create_self(keys)
+    args = [@path]
+    if keys.kind_of?(Hash)
+      font = keys.delete('itemfont')
+#      font = hash_kv(font) if font.kind_of?(Hash)
+      keys['font'] = font if font
+#      args.concat(hash_kv(keys))
+      args << keys
+    end
+    begin
+      tk_call('::tktree::treecreate', *args)
+    rescue NameError, RuntimeError
+      Tk.load_tclscript(TkTree::TCL_SCRIPT_PATH)
+      tk_call('::tktree::treecreate', *args)
+    end
+  end
+
+  def newitem(itempath, keys = nil)
+    if keys.kind_of?(Hash)
+      keys = _symbolkey2str(keys)
+      font = keys.delete('itemfont')
+#      font = hash_kv(font) if font.kind_of?(Hash)
+      keys['font'] = font if font
+#      tk_call('::tktree::newitem', @path, itempath, *hash_kv(keys))
+      tk_call('::tktree::newitem', @path, itempath, keys)
+    else
+      tk_call('::tktree::newitem', @path, itempath)
+    end
+  end
+
+  def delitem(itempath)
+    tk_call('::tktree::delitem', @path, itempath)
+  end
+
+  def labelat(xpos, ypos)
+    tk_call('::tktree::delitem', @path, xpos, ypos)
+  end
+
+  def getselection
+    tk_call('::tktree::getselection', @path)
+  end
+
+  def setselection(itempath)
+    tk_call('::tktree::getselection', @path, itempath)
+  end
+end
+
+
+##########################################################################
+# test script
+##########################################################################
+if __FILE__ == $0
+  TkLabel.new(:text=><<EOL, :relief=>:ridge, :justify=>:left).pack
+
+ This is a sample to use a Tcl library script on Ruby/Tk. 
+ This sample loads tktree.tcl (see <http://wiki.tcl.tk/10615>) 
+ and calls functions of the Tcl script. 
+EOL
+
+  items = %w(/group1/item1 /group1/item2 /group1/subgroup/item1 /group2/item1 /item1)
+
+  tr1 = TkTree.new.pack(:expand=>true, :fill=>:both)
+  tr1.focus
+
+  items.each{|item|
+    tr1.newitem(item, 
+                :command=>proc{Tk.messageBox(:message=>"#{item} executed")})
+  }
+
+  f = TkFrame.new.pack(:expand=>true, :fill=>:both)
+  tr2 = TkTree.new(f, :bg=>'black', #:itemfont=>{:family=>'Times', :size=>14}, 
+                   :textcolor=>'red', :bd=>4, :relief=>:ridge, 
+                   :selectbackground=>'darkBlue', :selectforeground=>'yellow', 
+                   :selectborderwidth=>3, :linecolor=>'yellow') {
+    yscrollbar(TkScrollbar.new(f, :width=>10).pack(:side=>:right, :fill=>:y))
+    xscrollbar(TkScrollbar.new(f, :width=>10).pack(:side=>:bottom, :fill=>:x))
+    pack(:expand=>true, :fill=>:both)
+  }
+
+  items.each{|item|
+    tr2.newitem(item, :textcolor=>'green', :image=>'', 
+                :itemfont=>{:family=>'Times', :size=>10}, 
+                :command=>proc{Tk.messageBox(:message=>"#{item} executed")})
+  }
+
+  Tk.mainloop
+end
diff --git a/ruby_1_8_6/ext/tk/sample/tktree.tcl b/ruby_1_8_6/ext/tk/sample/tktree.tcl
new file mode 100644
index 0000000000..a5e47eb776
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/sample/tktree.tcl
@@ -0,0 +1,305 @@
+#
+#  This Tcl/Tk script is quoted from <http://wiki.tcl.tk/10615>.
+#
+ package require Tk
+  namespace eval ::tktree {
+
+    # Images used for open and close state of subgroups
+    set ::tktree::imgcollapse [image create photo .tktreeopenbm -data {
+      R0lGODdhCQAJAIAAAAEBAf///ywAAAAACQAJAAACEISPoRvG614D80x5ZXyogwIAOw==}]
+    set ::tktree::imgexpand [image create photo .tktreeclosebm -data {
+      R0lGODdhCQAJAIAAAAEBAf///ywAAAAACQAJAAACEYSPoRu28KCSDSJLc44s3lMAADs=}]
+    ###Default images for groups and children
+    set ::tktree::imgsubgroups [image create photo .tktreeimgfolder -data {
+                R0lGODlhEAANAKIAANnZ2Xh4eLi4uPj4APj4+AAAAP///////yH5BAEAAAAA
+                LAAAAAAQAA0AAANkCIChiqDLITgyEgi6GoIjIyMYugCBpMsaWBA0giMjIzgy
+                UYBBMjIoIyODEgVBODIygiMjE1gQJIMyMjIoI1GAQSMjODIyghMFQSgjI4My
+                MhJYEDSCIyMjODJRgKHLXAiApcsMmAA7}]
+    set ::tktree::imgchildren [image create photo .tktreeimgfile -data {
+                R0lGODlhDQAQAKIAANnZ2Xh4ePj4+Li4uAAAAP///////////yH5BAEAAAAA
+                LAAAAAANABAAAANSGLoLgACBoqsRCBAoujqCASGDojtESCEihCREIjgUKLo8
+                hCGCpCsySIGiy0MYIki6IoMUKLo8hCGCpCsySIGiy0MYKLo8hIGiy0MYOLo8
+                SLrMCQA7}]
+
+    #### Swtich all subgroups of a layer to open or close
+    proc ::tktree::switchlayer {win opn {layer /}} {
+      variable cfg
+      foreach child $cfg($win,$layer:subgroups) {
+        set cfg($win,$child:open) $opn
+        switchlayer $win $opn $child
+      }
+      buildwhenidle $win
+    }
+
+    ####  will open or close the item given
+    proc ::tktree::switchstate {win item} {
+      set ::tktree::cfg($win,$item:open) [expr ! $::tktree::cfg($win,$item:open)]
+      buildwhenidle $win
+    }
+
+    #### Select the next item up or down
+    proc ::tktree::updown {win down} {
+      variable cfg
+      set index [lsearch -exact $cfg($win,sortlist) $cfg($win,selection)]
+      if {$down} {incr index} {incr index -1}
+      if {$index < 0} {set index end} elseif {$index >= [llength $cfg($win,sortlist)]} {set index 0}
+      setselection $win [lindex $cfg($win,sortlist) $index]
+    }
+
+    #### left-right button binding commands
+    proc ::tktree::leftright {win right} {
+      variable cfg
+      set item $cfg($win,selection)
+      set index [lsearch -exact $cfg($win,sortlist) $item]
+      set parentindex [lsearch -exact $cfg($win,sortlist) [file dirname $item]]
+      if {$parentindex == -1} {set parentindex [expr $index - 1]}
+      if {$cfg($win,$item:group)} {
+        if {$right} {
+          if {$cfg($win,$item:open)} {incr index} {set cfg($win,$item:open) 1}
+        } else {
+          if {$cfg($win,$item:open)} {set cfg($win,$item:open) 0} {set index $parentindex}
+        }
+      } else {
+        if {$right} {incr index} {set index $parentindex}
+      }
+      if {$index < 0} {set index end} elseif {$index >= [llength $cfg($win,sortlist)]} {set index 0}
+      setselection $win [lindex $cfg($win,sortlist) $index]
+      buildwhenidle $win
+    }
+
+    #### will return the pathname of the item at x and y cooridinates
+    proc ::tktree::labelat {win x y} {
+      set x [$win canvasx $x]; set y [$win canvasy $y]
+      foreach m [$win find overlapping $x $y $x $y] {
+        if {[info exists ::tktree::cfg($win,tag:$m)]} {return $::tktree::cfg($win,tag:$m)}
+      }
+      return ""
+    }
+
+    #### will return the path of the current selection in the given tree widget
+    proc ::tktree::getselection {win} {
+      return $::tktree::cfg($win,selection)
+    }
+
+    #### adjust the scrollview to show the selected item as needed
+    proc ::tktree::scrolladjust {win tag} {
+      update
+      set item [$win bbox $tag]
+      set region [$win cget -scrollregion]
+      foreach {axis idx1 idx2} {yview 1 3 xview 0 2} {
+        set range [expr abs([lindex $region $idx2]) - abs([lindex $region $idx1])]
+        set itemtop [lindex $item $idx1];  set itembot [lindex $item $idx2]
+        set viewtop [expr $range * [lindex [$win $axis] 0]]
+        set viewbot [expr $range * [lindex [$win $axis] 1]]
+        if {$itembot > $viewbot} {$win $axis moveto [expr ($itembot. - $viewbot + $viewtop) / $range]}
+        if {$itemtop < $viewtop} {$win $axis moveto [expr $itemtop. / $range]}
+      }
+    }
+
+    #### will set the current selection to the given item on the given tree
+    proc ::tktree::setselection {win item} {
+      variable cfg
+      if {![llength $cfg($win,sortlist)]} {return}
+      if {$item eq ""} {set item [lindex $cfg($win,sortlist) 0]}
+      if {![info exists cfg($win,$item:tag)]} {set item [lindex $cfg($win,sortlist) 0]}
+      if {[$win gettags $cfg($win,$item:tag)] ne ""} {
+        $win select from $cfg($win,$item:tag) 0
+        $win select to $cfg($win,$item:tag) end
+        set cfg($win,selection) $item
+        scrolladjust $win $cfg($win,$item:tag)
+      } {
+        setselection $win "/[lindex $cfg($win,/:sortlist) 0]"
+      }
+    }
+
+    #### will delete the item given from the tree given
+    proc ::tktree::delitem {win item} {
+      variable cfg
+      if {$item eq "/"} {
+        array unset cfg $win,* ; catch {destroy $win}
+      } {
+        set group [file dirname $item]
+        if {$cfg($win,$item:group)} {set type subgroups} {set type children}
+        set index [lsearch -exact $cfg($win,$group:$type) $item]
+        set cfg($win,$group:$type) [lreplace $cfg($win,$group:$type) $index $index]
+        array unset cfg $win,$item*
+        buildwhenidle $win
+      }
+    }
+
+    #### create a new item in the tree and rebuild the widget
+    proc ::tktree::newitem {win item args} {
+      variable cfg
+      if {[string index $item 0] ne "/"} {set item /$item}
+      if {[string index $item end] eq "/"} {
+        set subgroup 1
+        set type subgroups
+        set item [string range $item 0 end-1]
+        set cfg($win,$item:command) [list ::tktree::switchstate $win $item]
+      } {
+        set subgroup 0
+        set type children
+        set cfg($win,$item:command) {}
+      }
+      #Build parent group if needed
+      set group [file dirname $item]
+      if {![info exists cfg($win,$group:open)]} {newitem $win "$group\/"}
+      lappend cfg($win,$group:$type) $item
+      #Configure the new item
+      set cfg($win,$item:group) $subgroup
+      set cfg($win,$item:subgroups) {}
+      set cfg($win,$item:children) {}
+      set cfg($win,$item:sortlist) {}
+      set cfg($win,$item:tags) {}
+      set cfg($win,$item:open) 0
+      set cfg($win,$item:image) {}
+      set cfg($win,$item:textcolor) $cfg($win,textcolor)
+      set cfg($win,$item:font) $cfg($win,font)
+      if {$cfg($win,images)} {set cfg($win,$item:image) [eval list \$::tktree::img$type]}
+      foreach {confitem confval} $args {
+        switch -exact -- $confitem {
+          -textcolor  {set cfg($win,$item:textcolor) $confval}
+          -command    {set cfg($win,$item:command)   $confval}
+          -image      {set cfg($win,$item:image)     $confval}
+          -font       {set cfg($win,$item:font)      $confval}
+        }
+      }
+      buildwhenidle $win
+    }
+
+    #### Draw the given layer of the tree on the canvas starting at xposition
+    proc ::tktree::buildlayer {win layer xpos} {
+      variable cfg
+      #Record y positions for vertical line later on
+      set ystart $cfg($win,y); set yend $cfg($win,y)
+      if {$layer eq "/"} {set cfg($win,sortlist) ""}
+      foreach child $cfg($win,$layer:sortlist) {
+        lappend cfg($win,sortlist) $child
+        #Check spacing required for images
+        set imgwidth 0; set imgheight 0
+        if {[string length $cfg($win,$child:image)]} {
+          set imgwidth [expr  ([image width $cfg($win,$child:image)] + 2) / 2]
+          set imgheight [expr ([image height $cfg($win,$child:image)] + 2) / 2]
+        }
+        #find X-axis points for image, horiz line, and text
+        if {$imgwidth} {
+          set centerX [expr $imgwidth + $xpos + 7]
+          set rightX  [expr $xpos + 7]
+          set textX   [expr ($imgwidth * 2) + $xpos + 10]
+        } {
+          set centerX [expr $xpos + 10]
+          set rightX  [expr $centerX + 4]
+          set textX   [expr $rightX + 1]
+        }
+        #Find the proper amount to increment the y axis
+        set fontheight [lindex [font metrics $cfg($win,$child:font)] 5]
+        set yincr [expr ($fontheight + 1) / 2]
+        if {$imgheight > $yincr} {set yincr $imgheight}
+        incr cfg($win,y) $yincr
+        #Draw the horizonal line
+        $win create line $xpos $cfg($win,y) $rightX $cfg($win,y) -fill $cfg($win,linecolor)
+        set yend $cfg($win,y)
+        #Draw the image, if it exists
+        if {$imgwidth} {
+          set it [$win create image $centerX $cfg($win,y) -image $cfg($win,$child:image)]
+          $win bind $it <1> [list ::tktree::setselection $win $child]
+        }
+        #Draw text and store tags for reference
+        set cfg($win,$child:tag) [$win create text $textX $cfg($win,y) \
+            -text [file tail $child] -font $cfg($win,$child:font) -anchor w -tags x -fill $cfg($win,$child:textcolor)]
+        set cfg($win,tag:$cfg($win,$child:tag)) $child
+        #Command binding
+        $win bind $cfg($win,$child:tag) <1> [list ::tktree::setselection $win $child]
+        $win bind $cfg($win,$child:tag) <Double-1> $cfg($win,$child:command)
+        #next step up on the y axis
+        incr cfg($win,y) $yincr
+        #If its a group, add open-close functionality
+        if {$cfg($win,$child:group)} {
+          if {$cfg($win,$child:open)} {set img collapse} {set img expand}
+          set ocimg [$win create image $xpos [expr $cfg($win,y) - $yincr] -image [eval list \$::tktree::img$img]]
+          $win bind $ocimg <1> [list ::tktree::switchstate $win $child]
+          if {$cfg($win,$child:open)} {buildlayer $win $child $centerX}
+        }
+      }
+      #Vertical line
+      $win lower [$win create line $xpos [expr $ystart - 7] $xpos $yend -fill $cfg($win,linecolor)]
+    }
+
+    #### sort the layer by subgroups then children
+    proc ::tktree::sortlayer {win {layer /}} {
+      variable cfg
+      set cfg($win,$layer:subgroups) [lsort -dictionary $cfg($win,$layer:subgroups)]
+      set cfg($win,$layer:children) [lsort -dictionary $cfg($win,$layer:children)]
+      set cfg($win,$layer:sortlist) [join [list $cfg($win,$layer:subgroups) $cfg($win,$layer:children)]]
+      foreach group $cfg($win,$layer:subgroups) {sortlayer $win $group}
+    }
+
+    #### build the tree at the given path
+    proc ::tktree::buildtree {win} {
+      variable cfg
+      $win delete all
+      sortlayer $win
+      set xpos 5
+      set cfg($win,y) 5
+      #Draw global expand/contract button, if needed
+      if {[string length $cfg($win,/:subgroups)] && $cfg($win,expandall)} {
+        set exp 0
+        foreach subgroup $cfg($win,/:subgroups) {incr exp $cfg($win,$subgroup:open)}
+        if {$exp} {set type collapse} {set type expand}
+        set ocimg [$win create image 1 1 -image [eval list \$::tktree::img$type] -anchor w]
+        $win bind $ocimg <1> [list ::tktree::switchlayer $win [expr ! $exp]]
+      }
+      #Build the layers and set initial selection
+      buildlayer $win / $xpos
+      $win config -scrollregion [$win bbox all]
+      setselection $win $cfg($win,selection)
+    }
+
+    #### internal use - set up a handle to build the tree when everything is idle
+    proc ::tktree::buildwhenidle {win} {
+      catch {after cancel $::tktree::cfg($win,buildHandle)}
+      set ::tktree::cfg($win,buildHandle) [after idle [list ::tktree::buildtree $win]]
+    }
+
+    #### will create a new tree widget at the given path
+    proc ::tktree::treecreate {win args} {
+      variable cfg
+      #Default configuration for new tree
+      set cfg($win,selection) {}
+      set cfg($win,selidx) {}
+      set cfg($win,/:subgroups) {}
+      set cfg($win,/:children) {}
+      set cfg($win,/:open) 1
+      set cfg($win,images) 1
+      set cfg($win,expandall) 1
+      set cfg($win,linecolor)  black
+      set cfg($win,textcolor)  black
+      set cfg($win,font) {-family Helvetica -size 10}
+      #Parse and setup custom configuration options
+      set canvascfg ""
+      foreach {item val} $args {
+        switch -- $item {
+          -linecolor            {set cfg($win,linecolor) $val}
+          -textcolor            {set cfg($win,textcolor) $val}
+          -font                 {set cfg($win,font) $val}
+          -images               {set cfg($win,images) $val}
+          -expandall            {set cfg($win,expandall) $val}
+          default               {lappend canvascfg $item $val}
+        }
+      }
+      #Build the canvas
+      eval {canvas $win -takefocus 1} $canvascfg
+      bind $win <Destroy> [list ::tktree::delitem $win /]
+      bind $win <1>  [list focus $win]
+      bind $win <Return> {eval $::tktree::cfg(%W,[::tktree::getselection %W]:command)}
+      bind $win <space> {eval $::tktree::cfg(%W,[::tktree::getselection %W]:command)}
+      bind $win <Up>    [list ::tktree::updown $win 0]
+      bind $win <Down>    [list ::tktree::updown $win 1]
+      bind $win <Left>    [list ::tktree::leftright $win 0]
+      bind $win <Right>    [list ::tktree::leftright $win 1]
+
+      #Build the tree when idle
+      buildwhenidle $win
+    }
+ }
+
diff --git a/ruby_1_8_6/ext/tk/stubs.c b/ruby_1_8_6/ext/tk/stubs.c
new file mode 100644
index 0000000000..23ff42a4f4
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/stubs.c
@@ -0,0 +1,516 @@
+#include "stubs.h"
+#include "ruby.h"
+#include <tcl.h>
+#include <tk.h>
+
+/*------------------------------*/
+
+#ifdef __MACOS__
+# include <tkMac.h>
+# include <Quickdraw.h>
+
+static int call_macinit = 0;
+
+static void
+_macinit()
+{
+    if (!call_macinit) {
+        tcl_macQdPtr = &qd; /* setup QuickDraw globals */
+        Tcl_MacSetEventProc(TkMacConvertEvent); /* setup event handler */
+        call_macinit = 1;
+    }
+}
+#endif
+
+/*------------------------------*/
+
+static int nativethread_checked = 0;
+
+static void
+_nativethread_consistency_check(ip)
+    Tcl_Interp *ip;
+{
+    if (nativethread_checked || ip == (Tcl_Interp *)NULL) {
+        return;
+    }
+
+    /* If the variable "tcl_platform(threaded)" exists,  
+       then the Tcl interpreter was compiled with threads enabled. */
+    if (Tcl_GetVar2(ip, "tcl_platform", "threaded", TCL_GLOBAL_ONLY) != (char*)NULL) {
+#ifdef HAVE_NATIVETHREAD
+        /* consistent */
+#else
+        rb_warn("Inconsistency. Loaded Tcl/Tk libraries are enabled nativethread-support. But `tcltklib' is not. The inconsistency causes SEGV or other troubles frequently.");
+#endif
+    } else {
+#ifdef HAVE_NATIVETHREAD
+        rb_warning("Inconsistency.`tcltklib' is enabled nativethread-support. But loaded Tcl/Tk libraries are not. (Probably, the inconsistency doesn't cause any troubles.)");
+#else
+        /* consistent */
+#endif
+    }
+
+    Tcl_ResetResult(ip);
+
+    nativethread_checked = 1;
+}
+
+/*------------------------------*/
+
+#if defined USE_TCL_STUBS && defined USE_TK_STUBS
+
+#if defined _WIN32 || defined __CYGWIN__
+# include "util.h"
+# include <windows.h>
+  typedef HINSTANCE DL_HANDLE;
+# define DL_OPEN LoadLibrary
+# define DL_SYM GetProcAddress
+# define TCL_INDEX 4
+# define TK_INDEX 3
+# define TCL_NAME "tcl89%s"
+# define TK_NAME "tk89%s"
+# undef DLEXT
+# define DLEXT ".dll"
+#elif defined HAVE_DLOPEN
+# include <dlfcn.h>
+  typedef void *DL_HANDLE;
+# define DL_OPEN(file) dlopen(file, RTLD_LAZY|RTLD_GLOBAL)
+# define DL_SYM dlsym
+# define TCL_INDEX 8
+# define TK_INDEX 7
+# define TCL_NAME "libtcl8.9%s"
+# define TK_NAME "libtk8.9%s"
+#endif
+
+static DL_HANDLE tcl_dll = (DL_HANDLE)0;
+static DL_HANDLE tk_dll  = (DL_HANDLE)0;
+
+int
+ruby_open_tcl_dll(appname)
+    char *appname;
+{
+    void (*p_Tcl_FindExecutable)(const char *);
+    int n;
+    char *ruby_tcl_dll = 0;
+    char tcl_name[20];
+
+    if (tcl_dll) return TCLTK_STUBS_OK;
+
+    ruby_tcl_dll = getenv("RUBY_TCL_DLL");
+#if defined _WIN32
+    if (ruby_tcl_dll) ruby_tcl_dll = ruby_strdup(ruby_tcl_dll);
+#endif
+    if (ruby_tcl_dll) {
+        tcl_dll = (DL_HANDLE)DL_OPEN(ruby_tcl_dll);
+    } else {
+        snprintf(tcl_name, sizeof tcl_name, TCL_NAME, DLEXT);
+        /* examine from 8.9 to 8.1 */
+        for (n = '9'; n > '0'; n--) {
+            tcl_name[TCL_INDEX] = n;
+            tcl_dll = (DL_HANDLE)DL_OPEN(tcl_name);
+            if (tcl_dll)
+                break;
+        }
+    }
+
+#if defined _WIN32
+    if (ruby_tcl_dll) ruby_xfree(ruby_tcl_dll);
+#endif
+
+    if (!tcl_dll)
+        return NO_TCL_DLL;
+
+    p_Tcl_FindExecutable = (void (*)(const char *))DL_SYM(tcl_dll, "Tcl_FindExecutable");
+    if (!p_Tcl_FindExecutable)
+        return NO_FindExecutable;
+
+    if (appname) {
+        p_Tcl_FindExecutable(appname);
+    } else {
+        p_Tcl_FindExecutable("ruby");
+    }
+
+    return TCLTK_STUBS_OK;
+}
+
+int
+ruby_open_tk_dll()
+{
+    int n;
+    char *ruby_tk_dll = 0;
+    char tk_name[20];
+
+    if (!tcl_dll) {
+        /* int ret = ruby_open_tcl_dll(RSTRING(rb_argv0)->ptr); */
+        int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+        if (ret != TCLTK_STUBS_OK) return ret;
+    }
+
+    if (tk_dll) return TCLTK_STUBS_OK;
+
+    ruby_tk_dll = getenv("RUBY_TK_DLL");
+    if (ruby_tk_dll) {
+        tk_dll = (DL_HANDLE)DL_OPEN(ruby_tk_dll);
+    } else {
+        snprintf(tk_name, sizeof tk_name, TK_NAME, DLEXT);
+        /* examine from 8.9 to 8.1 */
+        for (n = '9'; n > '0'; n--) {
+            tk_name[TK_INDEX] = n;
+            tk_dll = (DL_HANDLE)DL_OPEN(tk_name);
+            if (tk_dll)
+                break;
+        }
+    }
+
+    if (!tk_dll)
+        return NO_TK_DLL;
+
+    return TCLTK_STUBS_OK;
+}
+
+int
+ruby_open_tcltk_dll(appname)
+    char *appname;
+{
+    return( ruby_open_tcl_dll(appname) || ruby_open_tk_dll() );
+}
+
+int 
+tcl_stubs_init_p()
+{
+    return(tclStubsPtr != (TclStubs*)NULL);
+}
+
+int 
+tk_stubs_init_p()
+{
+    return(tkStubsPtr != (TkStubs*)NULL);
+}
+
+
+Tcl_Interp *
+ruby_tcl_create_ip_and_stubs_init(st)
+    int *st;
+{
+    Tcl_Interp *tcl_ip;
+
+    if (st) *st = 0;
+
+    if (tcl_stubs_init_p()) {
+        tcl_ip = Tcl_CreateInterp();
+
+        if (!tcl_ip) {
+            if (st) *st = FAIL_CreateInterp;
+            return (Tcl_Interp*)NULL;
+        }
+
+        _nativethread_consistency_check(tcl_ip);
+
+        return tcl_ip;
+
+    } else {
+        Tcl_Interp *(*p_Tcl_CreateInterp)();
+        Tcl_Interp *(*p_Tcl_DeleteInterp)();
+
+        if (!tcl_dll) {
+            /* int ret = ruby_open_tcl_dll(RSTRING(rb_argv0)->ptr); */
+            int ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+
+            if (ret != TCLTK_STUBS_OK) {
+                if (st) *st = ret;
+                return (Tcl_Interp*)NULL;
+            }
+        }
+
+        p_Tcl_CreateInterp 
+            = (Tcl_Interp *(*)())DL_SYM(tcl_dll, "Tcl_CreateInterp");
+        if (!p_Tcl_CreateInterp) {
+            if (st) *st = NO_CreateInterp;
+            return (Tcl_Interp*)NULL;
+        }
+
+        p_Tcl_DeleteInterp 
+            = (Tcl_Interp *(*)())DL_SYM(tcl_dll, "Tcl_DeleteInterp");
+        if (!p_Tcl_DeleteInterp) {
+            if (st) *st = NO_DeleteInterp;
+            return (Tcl_Interp*)NULL;
+        }
+
+        tcl_ip = (*p_Tcl_CreateInterp)();
+        if (!tcl_ip) {
+            if (st) *st = FAIL_CreateInterp;
+            return (Tcl_Interp*)NULL;
+        }
+
+        if (!Tcl_InitStubs(tcl_ip, "8.1", 0)) {
+            if (st) *st = FAIL_Tcl_InitStubs;
+            (*p_Tcl_DeleteInterp)(tcl_ip);
+            return (Tcl_Interp*)NULL;
+        }
+
+        _nativethread_consistency_check(tcl_ip);
+
+        return tcl_ip;
+    }
+}
+
+int
+ruby_tcl_stubs_init()
+{
+    int st;
+    Tcl_Interp *tcl_ip;
+
+    if (!tcl_stubs_init_p()) {
+        tcl_ip = ruby_tcl_create_ip_and_stubs_init(&st);
+
+        if (!tcl_ip) return st;
+
+        Tcl_DeleteInterp(tcl_ip);
+    }
+
+    return TCLTK_STUBS_OK;
+}
+
+int
+ruby_tk_stubs_init(tcl_ip)
+    Tcl_Interp *tcl_ip;
+{
+    Tcl_ResetResult(tcl_ip);
+
+    if (tk_stubs_init_p()) {
+        if (Tk_Init(tcl_ip) == TCL_ERROR) {
+            return FAIL_Tk_Init;
+        }
+    } else {
+        int (*p_Tk_Init)(Tcl_Interp *);
+
+        if (!tk_dll) {
+            int ret = ruby_open_tk_dll();
+            if (ret != TCLTK_STUBS_OK) return ret;
+        }
+
+        p_Tk_Init = (int (*)(Tcl_Interp *))DL_SYM(tk_dll, "Tk_Init");
+        if (!p_Tk_Init)
+            return NO_Tk_Init;
+
+        if ((*p_Tk_Init)(tcl_ip) == TCL_ERROR)
+            return FAIL_Tk_Init;
+
+        if (!Tk_InitStubs(tcl_ip, "8.1", 0))
+            return FAIL_Tk_InitStubs;
+
+#ifdef __MACOS__
+        _macinit();
+#endif
+    }
+
+    return TCLTK_STUBS_OK;
+}
+
+int
+ruby_tk_stubs_safeinit(tcl_ip)
+    Tcl_Interp *tcl_ip;
+{
+    Tcl_ResetResult(tcl_ip);
+
+    if (tk_stubs_init_p()) {
+        if (Tk_SafeInit(tcl_ip) == TCL_ERROR)
+            return FAIL_Tk_Init;
+    } else {
+        int (*p_Tk_SafeInit)(Tcl_Interp *);
+
+        if (!tk_dll) {
+            int ret = ruby_open_tk_dll();
+            if (ret != TCLTK_STUBS_OK) return ret;
+        }
+
+        p_Tk_SafeInit = (int (*)(Tcl_Interp *))DL_SYM(tk_dll, "Tk_SafeInit");
+        if (!p_Tk_SafeInit)
+            return NO_Tk_Init;
+
+        if ((*p_Tk_SafeInit)(tcl_ip) == TCL_ERROR)
+            return FAIL_Tk_Init;
+
+        if (!Tk_InitStubs(tcl_ip, "8.1", 0))
+            return FAIL_Tk_InitStubs;
+
+#ifdef __MACOS__
+        _macinit();
+#endif
+    }
+
+    return TCLTK_STUBS_OK;
+}
+
+int
+ruby_tcltk_stubs()
+{
+    int st;
+    Tcl_Interp *tcl_ip;
+
+    /* st = ruby_open_tcltk_dll(RSTRING(rb_argv0)->ptr); */
+    st = ruby_open_tcltk_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+    switch(st) {
+    case NO_FindExecutable:
+        return -7;
+    case NO_TCL_DLL:
+    case NO_TK_DLL:
+        return -1;
+    }
+
+    tcl_ip = ruby_tcl_create_ip_and_stubs_init(&st);
+    if (!tcl_ip) {
+        switch(st) {
+        case NO_CreateInterp:
+        case NO_DeleteInterp:
+            return -2;
+        case FAIL_CreateInterp:
+            return -3;
+        case FAIL_Tcl_InitStubs:
+            return -5;
+        }
+    }
+
+    st = ruby_tk_stubs_init(tcl_ip);
+    switch(st) {
+    case NO_Tk_Init:
+        Tcl_DeleteInterp(tcl_ip);
+        return -4;
+    case FAIL_Tk_Init:
+    case FAIL_Tk_InitStubs:
+        Tcl_DeleteInterp(tcl_ip);
+        return -6;
+    }
+
+    Tcl_DeleteInterp(tcl_ip);
+
+    return 0;
+}
+
+/*###################################################*/
+#else /* ! USE_TCL_STUBS || ! USE_TK_STUBS) */
+/*###################################################*/
+
+static int open_tcl_dll = 0;
+static int call_tk_stubs_init = 0;
+
+int
+ruby_open_tcl_dll(appname)
+    char *appname;
+{
+    if (appname) {
+        Tcl_FindExecutable(appname);
+    } else {
+        Tcl_FindExecutable("ruby");
+    }
+    open_tcl_dll = 1;
+
+    return TCLTK_STUBS_OK;
+}
+
+int ruby_open_tk_dll()
+{
+    if (!open_tcl_dll) {
+        /* ruby_open_tcl_dll(RSTRING(rb_argv0)->ptr); */
+        ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+    }
+
+    return TCLTK_STUBS_OK;
+}
+
+int ruby_open_tcltk_dll(appname)
+    char *appname;
+{
+    return( ruby_open_tcl_dll(appname) || ruby_open_tk_dll() );
+}
+
+int 
+tcl_stubs_init_p()
+{
+    return 1;
+}
+
+int 
+tk_stubs_init_p()
+{
+    return call_tk_stubs_init;
+}
+
+Tcl_Interp *
+ruby_tcl_create_ip_and_stubs_init(st)
+    int *st;
+{
+    Tcl_Interp *tcl_ip;
+
+    if (!open_tcl_dll) {
+        /* ruby_open_tcl_dll(RSTRING(rb_argv0)->ptr); */
+        ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+    }
+
+    if (st) *st = 0;
+    tcl_ip = Tcl_CreateInterp();
+    if (!tcl_ip) {
+        if (st) *st = FAIL_CreateInterp;
+        return (Tcl_Interp*)NULL;
+    }
+
+    _nativethread_consistency_check(tcl_ip);
+
+    return tcl_ip;
+}
+
+int 
+ruby_tcl_stubs_init()
+{
+    return TCLTK_STUBS_OK;
+}
+
+int 
+ruby_tk_stubs_init(tcl_ip)
+    Tcl_Interp *tcl_ip;
+{
+    if (Tk_Init(tcl_ip) == TCL_ERROR)
+        return FAIL_Tk_Init;
+
+    if (!call_tk_stubs_init) {
+#ifdef __MACOS__
+        _macinit();
+#endif
+        call_tk_stubs_init = 1;
+    }
+
+    return TCLTK_STUBS_OK;
+}
+
+int
+ruby_tk_stubs_safeinit(tcl_ip)
+    Tcl_Interp *tcl_ip;
+{
+#if TCL_MAJOR_VERSION >= 8
+    if (Tk_SafeInit(tcl_ip) == TCL_ERROR)
+        return FAIL_Tk_Init;
+
+    if (!call_tk_stubs_init) {
+#ifdef __MACOS__
+        _macinit();
+#endif
+        call_tk_stubs_init = 1;
+    }
+
+    return TCLTK_STUBS_OK;
+
+#else /* TCL_MAJOR_VERSION < 8 */
+
+    return FAIL_Tk_Init;
+#endif
+}
+
+int 
+ruby_tcltk_stubs()
+{
+    /* Tcl_FindExecutable(RSTRING(rb_argv0)->ptr); */
+    Tcl_FindExecutable(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+    return 0;
+}
+
+#endif
diff --git a/ruby_1_8_6/ext/tk/stubs.h b/ruby_1_8_6/ext/tk/stubs.h
new file mode 100644
index 0000000000..7c913fb393
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/stubs.h
@@ -0,0 +1,33 @@
+#include <tcl.h>
+
+extern int ruby_open_tcl_dll(char *);
+extern int ruby_open_tk_dll();
+extern int ruby_open_tcltk_dll(char *);
+extern int tcl_stubs_init_p();
+extern int tk_stubs_init_p();
+extern Tcl_Interp *ruby_tcl_create_ip_and_stubs_init(int*);
+extern int ruby_tcl_stubs_init();
+extern int ruby_tk_stubs_init(Tcl_Interp*);
+extern int ruby_tk_stubs_safeinit(Tcl_Interp*);
+extern int ruby_tcltk_stubs();
+
+/* no error */
+#define TCLTK_STUBS_OK     (0)
+
+/* return value of ruby_open_tcl_dll() */
+#define NO_TCL_DLL         (1)
+#define NO_FindExecutable  (2)
+
+/* return value of ruby_open_tk_dll() */
+#define NO_TK_DLL         (-1)
+
+/* status value of ruby_tcl_create_ip_and_stubs_init(st) */
+#define NO_CreateInterp    (3)
+#define NO_DeleteInterp    (4)
+#define FAIL_CreateInterp  (5)
+#define FAIL_Tcl_InitStubs (6)
+
+/* return value of ruby_tk_stubs_init() */
+#define NO_Tk_Init         (7)
+#define FAIL_Tk_Init       (8)
+#define FAIL_Tk_InitStubs  (9)
diff --git a/ruby_1_8_6/ext/tk/tcltklib.c b/ruby_1_8_6/ext/tk/tcltklib.c
new file mode 100644
index 0000000000..bad72b4f7f
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/tcltklib.c
@@ -0,0 +1,8155 @@
+/*
+ *      tcltklib.c
+ *              Aug. 27, 1997   Y. Shigehiro
+ *              Oct. 24, 1997   Y. Matsumoto
+ */
+
+#define TCLTKLIB_RELEASE_DATE "2006-12-01"
+
+#include "ruby.h"
+#include "rubysig.h"
+#include "version.h"
+#undef EXTERN   /* avoid conflict with tcl.h of tcl8.2 or before */
+#include <stdio.h>
+#ifdef HAVE_STDARG_PROTOTYPES
+#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
+#include <string.h>
+#include <tcl.h>
+#include <tk.h>
+
+#include "stubs.h"
+
+#ifndef TCL_ALPHA_RELEASE
+#define TCL_ALPHA_RELEASE       0
+#define TCL_BETA_RELEASE        1
+#define TCL_FINAL_RELEASE       2
+#endif
+
+#if TCL_MAJOR_VERSION >= 8
+# ifndef CONST84
+#  if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 4 /* Tcl8.0.x -- 8.4b1 */
+#   define CONST84
+#  else /* unknown (maybe TCL_VERSION >= 8.5) */
+#   ifdef CONST
+#    define CONST84 CONST
+#   else
+#    define CONST84
+#   endif
+#  endif
+# endif
+#else  /* TCL_MAJOR_VERSION < 8 */
+# ifdef CONST
+#  define CONST84 CONST
+# else
+#  define CONST
+#  define CONST84
+# endif
+#endif
+
+/* copied from eval.c */
+#define TAG_RETURN      0x1
+#define TAG_BREAK       0x2
+#define TAG_NEXT        0x3
+#define TAG_RETRY       0x4
+#define TAG_REDO        0x5
+#define TAG_RAISE       0x6
+#define TAG_THROW       0x7
+#define TAG_FATAL       0x8
+
+/* for ruby_debug */
+#define DUMP1(ARG1) if (ruby_debug) { fprintf(stderr, "tcltklib: %s\n", ARG1); fflush(stderr); }
+#define DUMP2(ARG1, ARG2) if (ruby_debug) { fprintf(stderr, "tcltklib: ");\
+fprintf(stderr, ARG1, ARG2); fprintf(stderr, "\n"); fflush(stderr); }
+#define DUMP3(ARG1, ARG2, ARG3) if (ruby_debug) { fprintf(stderr, "tcltklib: ");\
+fprintf(stderr, ARG1, ARG2, ARG3); fprintf(stderr, "\n"); fflush(stderr); }
+/*
+#define DUMP1(ARG1)
+#define DUMP2(ARG1, ARG2)
+#define DUMP3(ARG1, ARG2, ARG3)
+*/
+
+/* release date */
+const char tcltklib_release_date[] = TCLTKLIB_RELEASE_DATE;
+
+/* finalize_proc_name */
+static char *finalize_hook_name = "INTERP_FINALIZE_HOOK";
+
+static void ip_finalize _((Tcl_Interp*));
+
+static int at_exit = 0;
+
+
+/* for callback break & continue */
+static VALUE eTkCallbackReturn;
+static VALUE eTkCallbackBreak;
+static VALUE eTkCallbackContinue;
+
+static VALUE eLocalJumpError;
+
+static VALUE eTkLocalJumpError;
+static VALUE eTkCallbackRetry;
+static VALUE eTkCallbackRedo;
+static VALUE eTkCallbackThrow;
+
+static VALUE tcltkip_class;
+
+static ID ID_at_enc;
+static ID ID_at_interp;
+
+static ID ID_stop_p;
+static ID ID_alive_p;
+static ID ID_kill;
+static ID ID_join;
+static ID ID_value;
+
+static ID ID_call;
+static ID ID_backtrace;
+static ID ID_message;
+
+static ID ID_at_reason;
+static ID ID_return;
+static ID ID_break;
+static ID ID_next;
+
+static ID ID_to_s;
+static ID ID_inspect;
+
+static VALUE ip_invoke_real _((int, VALUE*, VALUE));
+static VALUE ip_invoke _((int, VALUE*, VALUE));
+
+static VALUE tk_funcall _((VALUE(), int, VALUE*, VALUE));
+
+/* safe Tcl_Eval and Tcl_GlobalEval */
+static int
+tcl_eval(interp, cmd)
+    Tcl_Interp *interp;
+    const char *cmd; /* don't have to be writable */
+{
+    char *buf = strdup(cmd);
+    int ret;
+
+    Tcl_AllowExceptions(interp);
+    ret = Tcl_Eval(interp, buf);
+    free(buf);
+    return ret;
+}
+
+#undef Tcl_Eval
+#define Tcl_Eval tcl_eval
+
+static int
+tcl_global_eval(interp, cmd)
+    Tcl_Interp *interp;
+    const char *cmd; /* don't have to be writable */
+{
+    char *buf = strdup(cmd);
+    int ret;
+
+    Tcl_AllowExceptions(interp);
+    ret = Tcl_GlobalEval(interp, buf);
+    free(buf);
+    return ret;
+}
+
+#undef Tcl_GlobalEval
+#define Tcl_GlobalEval tcl_global_eval
+
+/* Tcl_{Incr|Decr}RefCount for tcl7.x or earlier */
+#if TCL_MAJOR_VERSION < 8
+#define Tcl_IncrRefCount(obj) (1)
+#define Tcl_DecrRefCount(obj) (1)
+#endif
+
+/* Tcl_GetStringResult for tcl7.x or earlier */
+#if TCL_MAJOR_VERSION < 8
+#define Tcl_GetStringResult(interp) ((interp)->result)
+#endif
+
+/* Tcl_[GS]etVar2Ex for tcl8.0 */
+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
+static Tcl_Obj *
+Tcl_GetVar2Ex(interp, name1, name2, flags)
+    Tcl_Interp *interp;
+    CONST char *name1;
+    CONST char *name2;
+    int flags;
+{
+    Tcl_Obj *nameObj1, *nameObj2 = NULL, *retObj;
+
+    nameObj1 = Tcl_NewStringObj((char*)name1, -1);
+    Tcl_IncrRefCount(nameObj1);
+
+    if (name2) {
+        nameObj2 = Tcl_NewStringObj((char*)name2, -1);
+        Tcl_IncrRefCount(nameObj2);
+    }
+
+    retObj = Tcl_ObjGetVar2(interp, nameObj1, nameObj2, flags);
+
+    if (name2) {
+        Tcl_DecrRefCount(nameObj2);
+    }
+
+    Tcl_DecrRefCount(nameObj1);
+
+    return retObj;
+}
+
+static Tcl_Obj *
+Tcl_SetVar2Ex(interp, name1, name2, newValObj, flags)
+    Tcl_Interp *interp;
+    CONST char *name1;
+    CONST char *name2;
+    Tcl_Obj *newValObj;
+    int flags;
+{
+    Tcl_Obj *nameObj1, *nameObj2 = NULL, *retObj;
+
+    nameObj1 = Tcl_NewStringObj((char*)name1, -1);
+    Tcl_IncrRefCount(nameObj1);
+
+    if (name2) {
+        nameObj2 = Tcl_NewStringObj((char*)name2, -1);
+        Tcl_IncrRefCount(nameObj2);
+    }
+
+    retObj = Tcl_ObjSetVar2(interp, nameObj1, nameObj2, newValObj, flags);
+
+    if (name2) {
+        Tcl_DecrRefCount(nameObj2);
+    }
+
+    Tcl_DecrRefCount(nameObj1);
+
+    return retObj;
+}
+#endif
+
+/* from tkAppInit.c */
+
+#if TCL_MAJOR_VERSION < 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4)
+#  if !defined __MINGW32__ && !defined __BORLANDC__
+/*
+ * The following variable is a special hack that is needed in order for
+ * Sun shared libraries to be used for Tcl.
+ */
+
+extern int matherr();
+int *tclDummyMathPtr = (int *) matherr;
+#  endif
+#endif
+
+/*---- module TclTkLib ----*/
+
+struct invoke_queue {
+    Tcl_Event ev;
+    int argc;
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_Obj **argv;
+#else /* TCL_MAJOR_VERSION < 8 */
+    char **argv;
+#endif
+    VALUE interp;
+    int *done;
+    int safe_level;
+    VALUE result;
+    VALUE thread;
+};
+
+struct eval_queue {
+    Tcl_Event ev;
+    char *str;
+    int len;
+    VALUE interp;
+    int *done;
+    int safe_level;
+    VALUE result;
+    VALUE thread;
+};
+
+struct call_queue {
+    Tcl_Event ev;
+    VALUE (*func)();
+    int argc;
+    VALUE *argv;
+    VALUE interp;
+    int *done;
+    int safe_level;
+    VALUE result;
+    VALUE thread;
+};
+
+void 
+invoke_queue_mark(struct invoke_queue *q)
+{
+    rb_gc_mark(q->interp);
+    rb_gc_mark(q->result);
+    rb_gc_mark(q->thread);
+}
+
+void 
+eval_queue_mark(struct eval_queue *q)
+{
+    rb_gc_mark(q->interp);
+    rb_gc_mark(q->result);
+    rb_gc_mark(q->thread);
+}
+
+void 
+call_queue_mark(struct call_queue *q)
+{
+    int i;
+
+    for(i = 0; i < q->argc; i++) {
+        rb_gc_mark(q->argv[i]);
+    }
+
+    rb_gc_mark(q->interp);
+    rb_gc_mark(q->result);
+    rb_gc_mark(q->thread);
+}
+
+
+static VALUE eventloop_thread;
+static VALUE eventloop_stack;
+
+static VALUE watchdog_thread;
+
+Tcl_Interp  *current_interp;
+ 
+
+/* 
+ *  'event_loop_max' is a maximum events which the eventloop processes in one 
+ *  term of thread scheduling. 'no_event_tick' is the count-up value when 
+ *  there are no event for processing. 
+ *  'timer_tick' is a limit of one term of thread scheduling. 
+ *  If 'timer_tick' == 0, then not use the timer for thread scheduling.
+ */
+#define DEFAULT_EVENT_LOOP_MAX    800/*counts*/
+#define DEFAULT_NO_EVENT_TICK      10/*counts*/
+#define DEFAULT_NO_EVENT_WAIT      20/*milliseconds ( 1 -- 999 ) */
+#define WATCHDOG_INTERVAL          10/*milliseconds ( 1 -- 999 ) */
+#define DEFAULT_TIMER_TICK          0/*milliseconds ( 0 -- 999 ) */
+#define NO_THREAD_INTERRUPT_TIME  100/*milliseconds ( 1 -- 999 ) */
+
+static int event_loop_max = DEFAULT_EVENT_LOOP_MAX;
+static int no_event_tick  = DEFAULT_NO_EVENT_TICK;
+static int no_event_wait  = DEFAULT_NO_EVENT_WAIT;
+static int timer_tick     = DEFAULT_TIMER_TICK;
+static int req_timer_tick = DEFAULT_TIMER_TICK;
+static int run_timer_flag = 0;
+
+static int event_loop_wait_event   = 0;
+static int event_loop_abort_on_exc = 1;
+static int loop_counter = 0;
+
+static int check_rootwidget_flag = 0;
+
+
+/* call ruby interpreter */
+#if TCL_MAJOR_VERSION >= 8
+static int ip_ruby_eval _((ClientData, Tcl_Interp *, int, Tcl_Obj *CONST*));
+static int ip_ruby_cmd _((ClientData, Tcl_Interp *, int, Tcl_Obj *CONST*));
+#else /* TCL_MAJOR_VERSION < 8 */
+static int ip_ruby_eval _((ClientData, Tcl_Interp *, int, char **));
+static int ip_ruby_cmd _((ClientData, Tcl_Interp *, int, char **));
+#endif
+
+struct cmd_body_arg {
+    VALUE receiver;
+    ID    method;
+    VALUE args;
+};
+
+
+/*----------------------------*/
+/* use Tcl internal functions */
+/*----------------------------*/
+#ifndef TCL_NAMESPACE_DEBUG
+#define TCL_NAMESPACE_DEBUG 0
+#endif
+
+#if TCL_NAMESPACE_DEBUG
+
+#if TCL_MAJOR_VERSION >= 8
+EXTERN struct TclIntStubs *tclIntStubsPtr;
+#endif
+
+/*-- Tcl_GetCurrentNamespace --*/
+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 5
+/* Tcl7.x doesn't have namespace support.                            */
+/* Tcl8.5+ has definition of Tcl_GetCurrentNamespace() in tclDecls.h */
+#  ifndef Tcl_GetCurrentNamespace
+EXTERN Tcl_Namespace *  Tcl_GetCurrentNamespace _((Tcl_Interp *));
+#  endif
+#  if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+#    ifndef Tcl_GetCurrentNamespace
+#      ifndef FunctionNum_of_GetCurrentNamespace
+#define FunctionNum_of_GetCurrentNamespace 124
+#      endif
+struct DummyTclIntStubs_for_GetCurrentNamespace {
+    int magic;
+    struct TclIntStubHooks *hooks;
+    void (*func[FunctionNum_of_GetCurrentNamespace])();
+    Tcl_Namespace * (*tcl_GetCurrentNamespace) _((Tcl_Interp *));
+};
+
+#define Tcl_GetCurrentNamespace \
+   (((struct DummyTclIntStubs_for_GetCurrentNamespace *)tclIntStubsPtr)->tcl_GetCurrentNamespace)
+#    endif
+#  endif
+#endif
+
+/* namespace check */
+/* ip_null_namespace(Tcl_Interp *interp) */
+#if TCL_MAJOR_VERSION < 8
+#define ip_null_namespace(interp) (0)
+#else /* support namespace */
+#define ip_null_namespace(interp) \
+    (Tcl_GetCurrentNamespace(interp) == (Tcl_Namespace *)NULL)
+#endif
+
+/* rbtk_invalid_namespace(tcltkip *ptr) */
+#if TCL_MAJOR_VERSION < 8
+#define rbtk_invalid_namespace(ptr) (0)
+#else /* support namespace */
+#define rbtk_invalid_namespace(ptr) \
+    ((ptr)->default_ns == (Tcl_Namespace*)NULL || Tcl_GetCurrentNamespace((ptr)->ip) != (ptr)->default_ns)
+#endif
+
+/*-- Tcl_PopCallFrame & Tcl_PushCallFrame --*/
+#if TCL_MAJOR_VERSION >= 8
+#  ifndef CallFrame
+typedef struct CallFrame {
+    Tcl_Namespace *nsPtr;
+    int dummy1;
+    int dummy2;
+    char *dummy3;
+    struct CallFrame *callerPtr;
+    struct CallFrame *callerVarPtr;
+    int level;
+    char *dummy7;
+    char *dummy8;
+    int dummy9;
+    char* dummy10;
+} CallFrame;
+#  endif
+
+#  if !defined(TclGetFrame) && !defined(TclGetFrame_TCL_DECLARED)
+EXTERN int  TclGetFrame _((Tcl_Interp *, CONST char *, CallFrame **));
+#  endif
+#  if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+#    ifndef TclGetFrame
+#      ifndef FunctionNum_of_GetFrame
+#define FunctionNum_of_GetFrame 32
+#      endif
+struct DummyTclIntStubs_for_GetFrame {
+    int magic;
+    struct TclIntStubHooks *hooks;
+    void (*func[FunctionNum_of_GetFrame])();
+    int (*tclGetFrame) _((Tcl_Interp *, CONST char *, CallFrame **));
+};
+#define TclGetFrame \
+   (((struct DummyTclIntStubs_for_GetFrame *)tclIntStubsPtr)->tclGetFrame)
+#    endif
+#  endif
+
+#  if !defined(Tcl_PopCallFrame) && !defined(Tcl_PopCallFrame_TCL_DECLARED)
+EXTERN void Tcl_PopCallFrame _((Tcl_Interp *));
+EXTERN int  Tcl_PushCallFrame _((Tcl_Interp *, Tcl_CallFrame *, Tcl_Namespace *, int));
+#  endif
+#  if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+#    ifndef Tcl_PopCallFrame
+#      ifndef FunctionNum_of_PopCallFrame
+#define FunctionNum_of_PopCallFrame 128
+#      endif
+struct DummyTclIntStubs_for_PopCallFrame {
+    int magic;
+    struct TclIntStubHooks *hooks;
+    void (*func[FunctionNum_of_PopCallFrame])();
+    void (*tcl_PopCallFrame) _((Tcl_Interp *));
+    int  (*tcl_PushCallFrame) _((Tcl_Interp *, Tcl_CallFrame *, Tcl_Namespace *, int));
+};
+
+#define Tcl_PopCallFrame \
+   (((struct DummyTclIntStubs_for_PopCallFrame *)tclIntStubsPtr)->tcl_PopCallFrame)
+#define Tcl_PushCallFrame \
+   (((struct DummyTclIntStubs_for_PopCallFrame *)tclIntStubsPtr)->tcl_PushCallFrame)
+#    endif
+#  endif
+
+#else /* Tcl7.x */
+#  ifndef CallFrame
+typedef struct CallFrame {
+    Tcl_HashTable varTable;
+    int level;
+    int argc;
+    char **argv;
+    struct CallFrame *callerPtr;
+    struct CallFrame *callerVarPtr;
+} CallFrame;
+#  endif
+#  ifndef Tcl_CallFrame
+#define Tcl_CallFrame CallFrame
+#  endif
+
+#  if !defined(TclGetFrame) && !defined(TclGetFrame_TCL_DECLARED)
+EXTERN int  TclGetFrame _((Tcl_Interp *, CONST char *, CallFrame **));
+#  endif
+
+#  if !defined(Tcl_PopCallFrame) && !defined(Tcl_PopCallFrame_TCL_DECLARED)
+typedef struct DummyInterp {
+    char *dummy1;
+    char *dummy2;
+    int  dummy3;
+    Tcl_HashTable dummy4;
+    Tcl_HashTable dummy5;
+    Tcl_HashTable dummy6;
+    int numLevels;
+    int maxNestingDepth;
+    CallFrame *framePtr;
+    CallFrame *varFramePtr;
+} DummyInterp;
+
+static void
+Tcl_PopCallFrame(interp)
+    Tcl_Interp *interp;
+{
+    DummyInterp *iPtr = (DummyInterp*)interp;
+    CallFrame *frame = iPtr->varFramePtr;
+
+    /* **** DUMMY **** */
+    iPtr->framePtr = frame.callerPtr;
+    iPtr->varFramePtr = frame.callerVarPtr;
+
+    return TCL_OK;
+}
+
+/* dummy */
+#define Tcl_Namespace char
+
+static int
+Tcl_PushCallFrame(interp, framePtr, nsPtr, isProcCallFrame)
+    Tcl_Interp *interp;
+    Tcl_CallFrame *framePtr;
+    Tcl_Namespace *nsPtr;
+    int isProcCallFrame;
+{
+    DummyInterp *iPtr = (DummyInterp*)interp;
+    CallFrame *frame = (CallFrame *)framePtr;
+
+    /* **** DUMMY **** */
+    Tcl_InitHashTable(&frame.varTable, TCL_STRING_KEYS);
+    if (iPtr->varFramePtr != NULL) {
+        frame.level = iPtr->varFramePtr->level + 1;
+    } else {
+        frame.level = 1;
+    }
+    frame.callerPtr = iPtr->framePtr;
+    frame.callerVarPtr = iPtr->varFramePtr;
+    iPtr->framePtr = &frame;
+    iPtr->varFramePtr = &frame;
+
+    return TCL_OK;
+}
+#  endif
+
+#endif
+
+#endif /* TCL_NAMESPACE_DEBUG */
+
+
+/*---- class TclTkIp ----*/
+struct tcltkip {
+    Tcl_Interp *ip;              /* the interpreter */
+#if TCL_NAMESPACE_DEBUG
+    Tcl_Namespace *default_ns;   /* default namespace */
+#endif
+    int has_orig_exit;           /* has original 'exit' command ? */
+    Tcl_CmdInfo orig_exit_info;  /* command info of original 'exit' command */
+    int ref_count;               /* reference count of rbtk_preserve_ip call */
+    int allow_ruby_exit;         /* allow exiting ruby by 'exit' function */
+    int return_value;            /* return value */
+};
+
+static struct tcltkip *
+get_ip(self)
+    VALUE self;
+{
+    struct tcltkip *ptr;
+
+    Data_Get_Struct(self, struct tcltkip, ptr);
+    if (ptr == 0) {
+        /* rb_raise(rb_eTypeError, "uninitialized TclTkIp"); */
+        return((struct tcltkip *)NULL);
+    }
+    if (ptr->ip == (Tcl_Interp*)NULL) {
+        /* rb_raise(rb_eRuntimeError, "deleted IP"); */
+        return((struct tcltkip *)NULL);
+    }
+    return ptr;
+}
+
+static int
+deleted_ip(ptr)
+    struct tcltkip *ptr;
+{
+    if (!ptr || !ptr->ip || Tcl_InterpDeleted(ptr->ip)
+#if TCL_NAMESPACE_DEBUG
+          || rbtk_invalid_namespace(ptr)
+#endif
+    ) {
+        DUMP1("ip is deleted");
+        return Qtrue;
+    }
+    return Qfalse;
+}
+
+/* increment/decrement reference count of tcltkip */
+static int
+rbtk_preserve_ip(ptr)
+    struct tcltkip *ptr;
+{
+    ptr->ref_count++;
+    if (ptr->ip == (Tcl_Interp*)NULL) {
+        /* deleted IP */
+        ptr->ref_count = 0;
+    } else {
+        Tcl_Preserve((ClientData)ptr->ip);
+    }
+    return(ptr->ref_count);
+}
+
+static int
+rbtk_release_ip(ptr)
+    struct tcltkip *ptr;
+{
+    ptr->ref_count--;
+    if (ptr->ref_count < 0) {
+        ptr->ref_count = 0;
+    } else if (ptr->ip == (Tcl_Interp*)NULL) {
+        /* deleted IP */
+        ptr->ref_count = 0;
+    } else {
+        Tcl_Release((ClientData)ptr->ip);
+    }
+    return(ptr->ref_count);
+}
+
+
+static VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+create_ip_exc(VALUE interp, VALUE exc, const char *fmt, ...)
+#else
+create_ip_exc(interp, exc, fmt, va_alist)
+    VALUE interp:
+    VALUE exc;
+    const char *fmt;
+    va_dcl
+#endif
+{
+    va_list args;
+    char buf[BUFSIZ];
+    VALUE einfo;
+    struct tcltkip *ptr = get_ip(interp);
+
+    va_init_list(args,fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
+    buf[BUFSIZ - 1] = '\0';
+    va_end(args);
+    einfo = rb_exc_new2(exc, buf);
+    rb_ivar_set(einfo, ID_at_interp, interp);
+    if (ptr) {
+        Tcl_ResetResult(ptr->ip);
+    }
+
+    return einfo;
+}
+
+
+/* stub status */
+static void
+tcl_stubs_check()
+{
+    if (!tcl_stubs_init_p()) {
+        int st = ruby_tcl_stubs_init();
+        switch(st) {
+        case TCLTK_STUBS_OK:
+            break;
+        case NO_TCL_DLL:
+            rb_raise(rb_eLoadError, "tcltklib: fail to open tcl_dll");
+        case NO_FindExecutable:
+            rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_FindExecutable");
+        case NO_CreateInterp:
+            rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_CreateInterp()");
+        case NO_DeleteInterp:
+            rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_DeleteInterp()");
+        case FAIL_CreateInterp:
+            rb_raise(rb_eRuntimeError, "tcltklib: fail to create a new IP to call Tcl_InitStubs()");
+        case FAIL_Tcl_InitStubs:
+            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tcl_InitStubs()");
+        default:
+            rb_raise(rb_eRuntimeError, "tcltklib: unknown error(%d) on ruby_tcl_stubs_init()", st);
+        }
+    }
+}
+
+
+static VALUE
+tcltkip_init_tk(interp)
+    VALUE interp;
+{
+    struct tcltkip *ptr = get_ip(interp);
+
+#if TCL_MAJOR_VERSION >= 8
+    int  st;
+
+    if (Tcl_IsSafe(ptr->ip)) {
+        DUMP1("Tk_SafeInit");
+        st = ruby_tk_stubs_safeinit(ptr->ip);
+        switch(st) {
+        case TCLTK_STUBS_OK:
+            break;
+        case NO_Tk_Init:
+            return rb_exc_new2(rb_eLoadError, 
+                               "tcltklib: can't find Tk_SafeInit()");
+        case FAIL_Tk_Init:
+            return create_ip_exc(interp, rb_eRuntimeError, 
+                                 "tcltklib: fail to Tk_SafeInit(). %s", 
+                                 Tcl_GetStringResult(ptr->ip));
+        case FAIL_Tk_InitStubs:
+            return create_ip_exc(interp, rb_eRuntimeError, 
+                                 "tcltklib: fail to Tk_InitStubs(). %s", 
+                                 Tcl_GetStringResult(ptr->ip));
+        default:
+            return create_ip_exc(interp, rb_eRuntimeError, 
+                                 "tcltklib: unknown error(%d) on ruby_tk_stubs_safeinit", st);
+        }
+    } else {
+        DUMP1("Tk_Init");
+        st = ruby_tk_stubs_init(ptr->ip);
+        switch(st) {
+        case TCLTK_STUBS_OK:
+            break;
+        case NO_Tk_Init:
+            return rb_exc_new2(rb_eLoadError, 
+                               "tcltklib: can't find Tk_Init()");
+        case FAIL_Tk_Init:
+            return create_ip_exc(interp, rb_eRuntimeError, 
+                                 "tcltklib: fail to Tk_Init(). %s", 
+                                 Tcl_GetStringResult(ptr->ip));
+        case FAIL_Tk_InitStubs:
+            return create_ip_exc(interp, rb_eRuntimeError, 
+                                 "tcltklib: fail to Tk_InitStubs(). %s", 
+                                 Tcl_GetStringResult(ptr->ip));
+        default:
+            return create_ip_exc(interp, rb_eRuntimeError, 
+                                 "tcltklib: unknown error(%d) on ruby_tk_stubs_init", st);
+        }
+    }
+
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP1("Tk_Init");
+    if (ruby_tk_stubs_init(ptr->ip) != TCLTK_STUBS_OK) {
+        return rb_exc_new2(rb_eRuntimeError, ptr->ip->result);
+    }
+#endif
+
+    return Qnil;
+}
+
+
+/* treat excetiopn on Tcl side */
+static VALUE rbtk_pending_exception;
+static int rbtk_eventloop_depth = 0;
+
+
+static int
+pending_exception_check0()
+{
+    volatile VALUE exc = rbtk_pending_exception;
+
+    if (!NIL_P(exc) && rb_obj_is_kind_of(exc, rb_eException)) {
+        DUMP1("find a pending exception");
+        if (rbtk_eventloop_depth > 0) {
+            return 1; /* pending */
+        } else {
+            rbtk_pending_exception = Qnil;
+
+            if (rb_obj_is_kind_of(exc, eTkCallbackRetry)) {
+                DUMP1("pending_exception_check0: call rb_jump_tag(retry)");
+                rb_jump_tag(TAG_RETRY);
+            } else if (rb_obj_is_kind_of(exc, eTkCallbackRedo)) {
+                DUMP1("pending_exception_check0: call rb_jump_tag(redo)");
+                rb_jump_tag(TAG_REDO);
+            } else if (rb_obj_is_kind_of(exc, eTkCallbackThrow)) {
+                DUMP1("pending_exception_check0: call rb_jump_tag(throw)");
+                rb_jump_tag(TAG_THROW);
+            }
+
+            rb_exc_raise(exc);
+        }
+    } else {
+        return 0;
+    }
+}
+
+static int
+pending_exception_check1(thr_crit_bup, ptr)
+    int thr_crit_bup;
+    struct tcltkip *ptr;
+{
+    volatile VALUE exc = rbtk_pending_exception;
+
+    if (!NIL_P(exc) && rb_obj_is_kind_of(exc, rb_eException)) {
+        DUMP1("find a pending exception");
+
+        if (rbtk_eventloop_depth > 0) {
+            return 1; /* pending */
+        } else {
+            rbtk_pending_exception = Qnil;
+
+            if (ptr != (struct tcltkip *)NULL) {
+                /* Tcl_Release(ptr->ip); */
+                rbtk_release_ip(ptr);
+            }
+
+            rb_thread_critical = thr_crit_bup;
+
+            if (rb_obj_is_kind_of(exc, eTkCallbackRetry)) {
+                DUMP1("pending_exception_check1: call rb_jump_tag(retry)");
+                rb_jump_tag(TAG_RETRY);
+            } else if (rb_obj_is_kind_of(exc, eTkCallbackRedo)) {
+                DUMP1("pending_exception_check1: call rb_jump_tag(redo)");
+                rb_jump_tag(TAG_REDO);
+            } else if (rb_obj_is_kind_of(exc, eTkCallbackThrow)) {
+                DUMP1("pending_exception_check1: call rb_jump_tag(throw)");
+                rb_jump_tag(TAG_THROW);
+            }
+            rb_exc_raise(exc);
+        }
+    } else {
+        return 0;
+    }
+}
+
+
+/* call original 'exit' command */
+static void 
+call_original_exit(ptr, state)
+    struct tcltkip *ptr;
+    int state;
+{
+    int  thr_crit_bup;
+    Tcl_CmdInfo *info;
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_Obj *state_obj;
+#endif
+
+    if (!(ptr->has_orig_exit)) return;
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    Tcl_ResetResult(ptr->ip);
+
+    info = &(ptr->orig_exit_info);
+
+    /* memory allocation for arguments of this command */
+#if TCL_MAJOR_VERSION >= 8
+    state_obj = Tcl_NewIntObj(state);
+    Tcl_IncrRefCount(state_obj);
+
+    if (info->isNativeObjectProc) {
+        Tcl_Obj **argv;
+        argv = (Tcl_Obj **)ALLOC_N(Tcl_Obj *, 3);
+        argv[0] = Tcl_NewStringObj("exit", 4);
+        argv[1] = state_obj;
+        argv[2] = (Tcl_Obj *)NULL;
+
+        ptr->return_value 
+            = (*(info->objProc))(info->objClientData, ptr->ip, 2, argv);
+
+        free(argv);
+
+    } else {
+        /* string interface */
+        char **argv;
+        argv = (char **)ALLOC_N(char *, 3);
+        argv[0] = "exit";
+        /* argv[1] = Tcl_GetString(state_obj); */
+        argv[1] = Tcl_GetStringFromObj(state_obj, (int*)NULL);
+        argv[2] = (char *)NULL;
+
+        ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, 
+                                            2, (CONST84 char **)argv);
+
+        free(argv);
+    }
+
+    Tcl_DecrRefCount(state_obj);
+
+#else /* TCL_MAJOR_VERSION < 8 */
+    {
+        /* string interface */
+        char **argv;
+        argv = (char **)ALLOC_N(char *, 3);
+        argv[0] = "exit";
+        argv[1] = RSTRING(rb_fix2str(INT2NUM(state), 10))->ptr;
+        argv[2] = (char *)NULL;
+
+        ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, 
+                                            2, argv);
+
+        free(argv);
+    }
+#endif
+
+    rb_thread_critical = thr_crit_bup;
+}
+
+/* Tk_ThreadTimer */
+static Tcl_TimerToken timer_token = (Tcl_TimerToken)NULL;
+
+/* timer callback */
+static void _timer_for_tcl _((ClientData));
+static void
+_timer_for_tcl(clientData)
+    ClientData clientData;
+{
+    int thr_crit_bup;
+
+    /* struct invoke_queue *q, *tmp; */
+    /* VALUE thread; */
+
+    DUMP1("call _timer_for_tcl");
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    Tcl_DeleteTimerHandler(timer_token);
+
+    run_timer_flag = 1;
+
+    if (timer_tick > 0) {
+        timer_token = Tcl_CreateTimerHandler(timer_tick, _timer_for_tcl, 
+                                             (ClientData)0);
+    } else {
+        timer_token = (Tcl_TimerToken)NULL;
+    }
+
+    rb_thread_critical = thr_crit_bup;
+
+    /* rb_thread_schedule(); */
+    /* tick_counter += event_loop_max; */
+}
+
+static VALUE
+set_eventloop_tick(self, tick)
+    VALUE self;
+    VALUE tick;
+{
+    int ttick = NUM2INT(tick);
+    int thr_crit_bup;
+
+    rb_secure(4);
+
+    if (ttick < 0) {
+        rb_raise(rb_eArgError, 
+                 "timer-tick parameter must be 0 or positive number");
+    }
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    /* delete old timer callback */
+    Tcl_DeleteTimerHandler(timer_token);
+
+    timer_tick = req_timer_tick = ttick;
+    if (timer_tick > 0) {
+        /* start timer callback */
+        timer_token = Tcl_CreateTimerHandler(timer_tick, _timer_for_tcl, 
+                                             (ClientData)0);
+    } else {
+        timer_token = (Tcl_TimerToken)NULL;
+    }
+
+    rb_thread_critical = thr_crit_bup;
+
+    return tick;
+}
+
+static VALUE
+get_eventloop_tick(self)
+    VALUE self;
+{
+    return INT2NUM(timer_tick);
+}
+
+static VALUE
+ip_set_eventloop_tick(self, tick)
+    VALUE self;
+    VALUE tick;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        return get_eventloop_tick(self);
+    }
+
+    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
+        /* slave IP */
+        return get_eventloop_tick(self);
+    }
+    return set_eventloop_tick(self, tick);
+}
+
+static VALUE
+ip_get_eventloop_tick(self)
+    VALUE self;
+{
+    return get_eventloop_tick(self);
+}
+
+static VALUE
+set_no_event_wait(self, wait)
+    VALUE self;
+    VALUE wait;
+{
+    int t_wait = NUM2INT(wait);
+
+    rb_secure(4);
+
+    if (t_wait <= 0) {
+        rb_raise(rb_eArgError, 
+                 "no_event_wait parameter must be positive number");
+    }
+
+    no_event_wait = t_wait;
+
+    return wait;
+}
+
+static VALUE
+get_no_event_wait(self)
+    VALUE self;
+{
+    return INT2NUM(no_event_wait);
+}
+
+static VALUE
+ip_set_no_event_wait(self, wait)
+    VALUE self;
+    VALUE wait;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        return get_no_event_wait(self);
+    }
+
+    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
+        /* slave IP */
+        return get_no_event_wait(self);
+    }
+    return set_no_event_wait(self, wait);
+}
+
+static VALUE
+ip_get_no_event_wait(self)
+    VALUE self;
+{
+    return get_no_event_wait(self);
+}
+
+static VALUE
+set_eventloop_weight(self, loop_max, no_event)
+    VALUE self;
+    VALUE loop_max;
+    VALUE no_event;
+{
+    int lpmax = NUM2INT(loop_max);
+    int no_ev = NUM2INT(no_event);
+
+    rb_secure(4);
+
+    if (lpmax <= 0 || no_ev <= 0) {
+        rb_raise(rb_eArgError, "weight parameters must be positive numbers");
+    }
+
+    event_loop_max = lpmax;
+    no_event_tick  = no_ev;
+
+    return rb_ary_new3(2, loop_max, no_event);
+}
+
+static VALUE
+get_eventloop_weight(self)
+    VALUE self;
+{
+    return rb_ary_new3(2, INT2NUM(event_loop_max), INT2NUM(no_event_tick));
+}
+
+static VALUE
+ip_set_eventloop_weight(self, loop_max, no_event)
+    VALUE self;
+    VALUE loop_max;
+    VALUE no_event;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        return get_eventloop_weight(self);
+    }
+
+    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
+        /* slave IP */
+        return get_eventloop_weight(self);
+    }
+    return set_eventloop_weight(self, loop_max, no_event);
+}
+
+static VALUE
+ip_get_eventloop_weight(self)
+    VALUE self;
+{
+    return get_eventloop_weight(self);
+}
+
+static VALUE
+set_max_block_time(self, time)
+    VALUE self;
+    VALUE time;
+{
+    struct Tcl_Time tcl_time;
+    VALUE divmod;
+
+    switch(TYPE(time)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+        /* time is micro-second value */
+        divmod = rb_funcall(time, rb_intern("divmod"), 1, LONG2NUM(1000000));
+        tcl_time.sec  = NUM2LONG(RARRAY(divmod)->ptr[0]);
+        tcl_time.usec = NUM2LONG(RARRAY(divmod)->ptr[1]);
+        break;
+
+    case T_FLOAT:
+        /* time is second value */
+        divmod = rb_funcall(time, rb_intern("divmod"), 1, INT2FIX(1));
+        tcl_time.sec  = NUM2LONG(RARRAY(divmod)->ptr[0]);
+        tcl_time.usec = (long)(NUM2DBL(RARRAY(divmod)->ptr[1]) * 1000000);
+
+    default:
+        {
+	    VALUE tmp = rb_funcall(time, ID_inspect, 0, 0);
+	    rb_raise(rb_eArgError, "invalid value for time: '%s'", 
+		     StringValuePtr(tmp));
+	}
+    }
+
+    Tcl_SetMaxBlockTime(&tcl_time);
+
+    return Qnil;
+}
+
+static VALUE
+lib_evloop_thread_p(self)
+    VALUE self;
+{
+    if (NIL_P(eventloop_thread)) {
+        return Qnil;    /* no eventloop */
+    } else if (rb_thread_current() == eventloop_thread) {
+        return Qtrue;   /* is eventloop */
+    } else {
+        return Qfalse;  /* not eventloop */
+    }
+}
+
+static VALUE
+lib_evloop_abort_on_exc(self)
+    VALUE self;
+{
+    if (event_loop_abort_on_exc > 0) {
+        return Qtrue;
+    } else if (event_loop_abort_on_exc == 0) {
+        return Qfalse;
+    } else {
+        return Qnil;
+    }
+}
+
+static VALUE
+ip_evloop_abort_on_exc(self)
+    VALUE self;
+{
+    return lib_evloop_abort_on_exc(self);
+}
+
+static VALUE
+lib_evloop_abort_on_exc_set(self, val)
+    VALUE self, val;
+{
+    rb_secure(4);
+    if (RTEST(val)) {
+        event_loop_abort_on_exc =  1;
+    } else if (NIL_P(val)) {
+        event_loop_abort_on_exc = -1;
+    } else {
+        event_loop_abort_on_exc =  0;
+    }
+    return lib_evloop_abort_on_exc(self);
+}
+
+static VALUE
+ip_evloop_abort_on_exc_set(self, val)
+    VALUE self, val;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    rb_secure(4);
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        return lib_evloop_abort_on_exc(self);
+    }
+
+    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
+        /* slave IP */
+        return lib_evloop_abort_on_exc(self);
+    }
+    return lib_evloop_abort_on_exc_set(self, val);
+}
+
+static VALUE
+lib_num_of_mainwindows(self)
+    VALUE self;
+{
+    if (tk_stubs_init_p()) {
+        return INT2FIX(Tk_GetNumMainWindows());
+    } else {
+        return INT2FIX(0);
+    }
+}
+
+
+static VALUE
+call_DoOneEvent(flag_val)
+    VALUE flag_val;
+{
+    int flag;
+
+    flag = FIX2INT(flag_val);
+    if (Tcl_DoOneEvent(flag)) {
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+}
+
+static VALUE
+eventloop_sleep(dummy)
+    VALUE dummy;
+{
+    struct timeval t;
+
+    t.tv_sec = (time_t)0;
+    t.tv_usec = (time_t)(no_event_wait*1000.0);
+
+#ifdef HAVE_NATIVETHREAD
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on eventloop_sleep()");
+    }
+#endif
+
+    rb_thread_wait_for(t);
+
+#ifdef HAVE_NATIVETHREAD
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on eventloop_sleep()");
+    }
+#endif
+
+    return Qnil;
+}
+
+
+static int
+lib_eventloop_core(check_root, update_flag, check_var, interp)
+    int check_root;
+    int update_flag;
+    int *check_var;
+    Tcl_Interp *interp;
+{
+    volatile VALUE current = eventloop_thread;
+    int found_event = 1;
+    int event_flag;
+    struct timeval t;
+    int thr_crit_bup;
+    int status;
+    int depth = rbtk_eventloop_depth;
+
+
+    if (update_flag) DUMP1("update loop start!!");
+
+    t.tv_sec = (time_t)0;
+    t.tv_usec = (time_t)(no_event_wait*1000.0);
+
+    Tcl_DeleteTimerHandler(timer_token);
+    run_timer_flag = 0;
+    if (timer_tick > 0) {
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+        timer_token = Tcl_CreateTimerHandler(timer_tick, _timer_for_tcl, 
+                                             (ClientData)0);
+        rb_thread_critical = thr_crit_bup;
+    } else {
+        timer_token = (Tcl_TimerToken)NULL;
+    }
+
+    for(;;) {
+        if (rb_thread_alone()) {
+            DUMP1("no other thread");
+            event_loop_wait_event = 0;
+
+            if (update_flag) {
+                event_flag = update_flag | TCL_DONT_WAIT; /* for safety */
+            } else {
+                event_flag = TCL_ALL_EVENTS;
+            }
+
+            if (timer_tick == 0 && update_flag == 0) {
+                timer_tick = NO_THREAD_INTERRUPT_TIME;
+                timer_token = Tcl_CreateTimerHandler(timer_tick, 
+                                                     _timer_for_tcl, 
+                                                     (ClientData)0);
+            }
+
+            if (check_var != (int *)NULL) {
+                if (*check_var || !found_event) {
+                    return found_event;
+                }
+                if (interp != (Tcl_Interp*)NULL 
+                    && Tcl_InterpDeleted(interp)) {
+                    /* IP for check_var is deleted */
+                    return 0;
+                }
+            }
+
+            /* found_event = Tcl_DoOneEvent(event_flag); */
+            found_event = RTEST(rb_protect(call_DoOneEvent, 
+                                           INT2FIX(event_flag), &status)); 
+            if (status) {
+                switch (status) {
+                case TAG_RAISE:
+                    if (NIL_P(ruby_errinfo)) {
+                        rbtk_pending_exception 
+                            = rb_exc_new2(rb_eException, "unknown exception");
+                    } else {
+                        rbtk_pending_exception = ruby_errinfo;
+
+                        if (!NIL_P(rbtk_pending_exception)) {
+                            if (rbtk_eventloop_depth == 0) {
+                                VALUE exc = rbtk_pending_exception;
+                                rbtk_pending_exception = Qnil;
+                                rb_exc_raise(exc);
+                            } else {
+                                return 0;
+                            }
+                        }
+                    }
+                    break;
+
+                case TAG_FATAL:
+                    if (NIL_P(ruby_errinfo)) {
+                        rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
+                    } else {
+                        rb_exc_raise(ruby_errinfo);
+                    }
+                }
+            }
+
+            if (depth != rbtk_eventloop_depth) {
+                DUMP2("DoOneEvent(1) abnormal exit!! %d", 
+                      rbtk_eventloop_depth);
+            }
+
+            if (check_var != (int*)NULL && !NIL_P(rbtk_pending_exception)) {
+                DUMP1("exception on wait");
+                return 0;
+            }
+
+            if (pending_exception_check0()) {
+                /* pending -> upper level */
+                return 0;
+            }
+
+            if (update_flag != 0) {
+              if (found_event) {
+                DUMP1("next update loop");
+                continue;
+              } else {
+                DUMP1("update complete");
+                return 0;
+              }
+            }
+
+            DUMP1("trap check");
+            if (rb_trap_pending) {
+                run_timer_flag = 0;
+                if (rb_prohibit_interrupt || check_var != (int*)NULL) {
+                    /* pending or on wait command */
+                    return 0;
+                } else {
+                    rb_trap_exec();
+                }
+            }
+
+            DUMP1("check Root Widget");
+            if (check_root && tk_stubs_init_p() && Tk_GetNumMainWindows() == 0) {
+                run_timer_flag = 0;
+                if (rb_trap_pending) {
+                    if (rb_prohibit_interrupt || check_var != (int*)NULL) {
+                        /* pending or on wait command */
+                        return 0;
+                    } else {
+                        rb_trap_exec();
+                    }
+                }
+                return 1;
+            }
+
+            if (loop_counter++ > 30000) {
+                /* fprintf(stderr, "loop_counter > 30000\n"); */
+                loop_counter = 0;
+            }
+
+        } else {
+            int tick_counter;
+
+            DUMP1("there are other threads");
+            event_loop_wait_event = 1;
+
+            found_event = 1;
+
+            if (update_flag) {
+                event_flag = update_flag | TCL_DONT_WAIT; /* for safety */
+            } else {
+                event_flag = TCL_ALL_EVENTS | TCL_DONT_WAIT;
+            }
+
+            timer_tick = req_timer_tick;
+            tick_counter = 0;
+            while(tick_counter < event_loop_max) {
+                if (check_var != (int *)NULL) {
+                    if (*check_var || !found_event) {
+                        return found_event;
+                    }
+                    if (interp != (Tcl_Interp*)NULL 
+                        && Tcl_InterpDeleted(interp)) {
+                        /* IP for check_var is deleted */
+                        return 0;
+                    }
+                }
+
+                if (NIL_P(eventloop_thread) || current == eventloop_thread) {
+                    int st;
+                    int status;
+
+                    /* st = Tcl_DoOneEvent(event_flag); */
+                    st = RTEST(rb_protect(call_DoOneEvent, 
+                                          INT2FIX(event_flag), &status)); 
+                    if (status) {
+                        switch (status) {
+                        case TAG_RAISE:
+                            if (NIL_P(ruby_errinfo)) {
+                                rbtk_pending_exception 
+                                    = rb_exc_new2(rb_eException, 
+                                                  "unknown exception");
+                            } else {
+                                rbtk_pending_exception = ruby_errinfo;
+
+                                if (!NIL_P(rbtk_pending_exception)) {
+                                    if (rbtk_eventloop_depth == 0) {
+                                        VALUE exc = rbtk_pending_exception;
+                                        rbtk_pending_exception = Qnil;
+                                        rb_exc_raise(exc);
+                                    } else {
+                                        return 0;
+                                    }
+                                }
+                            }
+                            break;
+
+                        case TAG_FATAL:
+                            if (NIL_P(ruby_errinfo)) {
+                                rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
+                            } else {
+                                rb_exc_raise(ruby_errinfo);
+                            }
+                        }
+                    }
+
+                    if (depth != rbtk_eventloop_depth) {
+                        DUMP2("DoOneEvent(2) abnormal exit!! %d", 
+                              rbtk_eventloop_depth);
+                        return 0;
+                    }
+
+                    DUMP1("trap check");
+                    if (rb_trap_pending) {
+                        run_timer_flag = 0;
+                        if (rb_prohibit_interrupt || check_var != (int*)NULL) {
+                            /* pending or on wait command */
+                            return 0;
+                        } else {
+                            rb_trap_exec();
+                        }
+                    }
+
+                    if (check_var != (int*)NULL 
+                        && !NIL_P(rbtk_pending_exception)) {
+                        DUMP1("exception on wait");
+                        return 0;
+                    }
+
+                    if (pending_exception_check0()) {
+                        /* pending -> upper level */
+                        return 0;
+                    }
+
+                    if (st) {
+                        tick_counter++;
+                    } else {
+                        if (update_flag != 0) {
+                            DUMP1("update complete");
+                            return 0;
+                        }
+
+                        tick_counter += no_event_tick;
+
+                        /* rb_thread_wait_for(t); */
+                        rb_protect(eventloop_sleep, Qnil, &status);
+
+                        if (status) {
+                            switch (status) {
+                            case TAG_RAISE:
+                                if (NIL_P(ruby_errinfo)) {
+                                    rbtk_pending_exception 
+                                        = rb_exc_new2(rb_eException, 
+                                                      "unknown exception");
+                                } else {
+                                    rbtk_pending_exception = ruby_errinfo;
+
+                                    if (!NIL_P(rbtk_pending_exception)) {
+                                        if (rbtk_eventloop_depth == 0) {
+                                            VALUE exc = rbtk_pending_exception;
+                                            rbtk_pending_exception = Qnil;
+                                            rb_exc_raise(exc);
+                                        } else {
+                                            return 0;
+                                        }
+                                    }
+                                }
+                                break;
+
+                            case TAG_FATAL:
+                                if (NIL_P(ruby_errinfo)) {
+                                    rb_exc_raise(rb_exc_new2(rb_eFatal, 
+                                                             "FATAL"));
+                                } else {
+                                    rb_exc_raise(ruby_errinfo);
+                                }
+                            }
+                        }
+                    }
+
+                } else {
+                    DUMP2("sleep eventloop %lx", current);
+                    DUMP2("eventloop thread is %lx", eventloop_thread);
+                    rb_thread_stop();
+                }
+
+                if (!NIL_P(watchdog_thread) && eventloop_thread != current) {
+                    return 1;
+                }
+
+                DUMP1("trap check");
+                if (rb_trap_pending) {
+                    run_timer_flag = 0;
+                    if (rb_prohibit_interrupt || check_var != (int*)NULL) {
+                        /* pending or on wait command */
+                        return 0;
+                    } else {
+                        rb_trap_exec();
+                    }
+                }
+
+                DUMP1("check Root Widget");
+                if (check_root && tk_stubs_init_p() && Tk_GetNumMainWindows() == 0) {
+                    run_timer_flag = 0;
+                    if (rb_trap_pending) {
+                        if (rb_prohibit_interrupt || check_var != (int*)NULL) {
+                            /* pending or on wait command */
+                            return 0;
+                        } else {
+                            rb_trap_exec();
+                        }
+                    }
+                    return 1;
+                }
+
+                if (loop_counter++ > 30000) {
+                    /* fprintf(stderr, "loop_counter > 30000\n"); */
+                    loop_counter = 0;
+                }
+
+                if (run_timer_flag) {
+                    /*
+                    DUMP1("timer interrupt");
+                    run_timer_flag = 0;
+                    */
+                    break; /* switch to other thread */
+                }
+            }
+        }
+
+        DUMP1("trap check & thread scheduling");
+        if (update_flag == 0) CHECK_INTS;
+
+    }
+    return 1;
+}
+
+
+struct evloop_params {
+    int check_root;
+    int update_flag;
+    int *check_var;
+    Tcl_Interp *interp;
+    int thr_crit_bup;
+};
+
+VALUE
+lib_eventloop_main_core(args)
+    VALUE args;
+{
+    struct evloop_params *params = (struct evloop_params *)args;
+
+    check_rootwidget_flag = params->check_root;
+
+    if (lib_eventloop_core(params->check_root, 
+                           params->update_flag, 
+                           params->check_var, 
+                           params->interp)) {
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+}
+
+VALUE
+lib_eventloop_main(args)
+    VALUE args;
+{
+    return lib_eventloop_main_core(args);
+
+#if 0
+    volatile VALUE ret;
+    int status = 0;
+
+    ret = rb_protect(lib_eventloop_main_core, args, &status);
+
+    switch (status) {
+    case TAG_RAISE:
+        if (NIL_P(ruby_errinfo)) {
+            rbtk_pending_exception 
+                = rb_exc_new2(rb_eException, "unknown exception");
+        } else {
+            rbtk_pending_exception = ruby_errinfo;
+        }
+        return Qnil;
+
+    case TAG_FATAL:
+        if (NIL_P(ruby_errinfo)) {
+            rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
+        } else {
+            rbtk_pending_exception = ruby_errinfo;
+        }
+        return Qnil;
+    }
+
+    return ret;
+#endif
+}
+
+VALUE
+lib_eventloop_ensure(args)
+    VALUE args;
+{
+    struct evloop_params *ptr = (struct evloop_params *)args;
+    volatile VALUE current_evloop = rb_thread_current();
+
+    DUMP2("eventloop_ensure: current-thread : %lx", current_evloop);
+    DUMP2("eventloop_ensure: eventloop-thread : %lx", eventloop_thread);
+    if (eventloop_thread != current_evloop) {
+        DUMP2("finish eventloop %lx (NOT current eventloop)", current_evloop);
+
+	rb_thread_critical = ptr->thr_crit_bup;
+
+        free(ptr);
+
+        return Qnil;
+    }
+
+    while((eventloop_thread = rb_ary_pop(eventloop_stack))) {
+        DUMP2("eventloop-ensure: new eventloop-thread -> %lx", 
+              eventloop_thread);
+
+        if (eventloop_thread == current_evloop) {
+            rbtk_eventloop_depth--;
+            DUMP2("eventloop %lx : back from recursive call", current_evloop);
+            break;
+        }
+
+        if (NIL_P(eventloop_thread)) {
+          Tcl_DeleteTimerHandler(timer_token);
+          timer_token = (Tcl_TimerToken)NULL;
+
+          break; 
+        }
+
+        if (RTEST(rb_funcall(eventloop_thread, ID_alive_p, 0, 0))) {
+            DUMP2("eventloop-enshure: wake up parent %lx", eventloop_thread);
+            rb_thread_wakeup(eventloop_thread);
+
+            break;
+        }
+    }
+
+    rb_thread_critical = ptr->thr_crit_bup;
+
+    free(ptr);
+
+    DUMP2("finish current eventloop %lx", current_evloop);
+    return Qnil;
+}
+
+static VALUE
+lib_eventloop_launcher(check_root, update_flag, check_var, interp)
+    int check_root;
+    int update_flag;
+    int *check_var;
+    Tcl_Interp *interp;
+{
+    volatile VALUE parent_evloop = eventloop_thread;
+    struct evloop_params *args = ALLOC(struct evloop_params);
+
+    tcl_stubs_check();
+
+    eventloop_thread = rb_thread_current();
+
+    if (parent_evloop == eventloop_thread) {
+        DUMP2("eventloop: recursive call on %lx", parent_evloop);
+        rbtk_eventloop_depth++;
+    }
+
+    if (!NIL_P(parent_evloop) && parent_evloop != eventloop_thread) {
+        DUMP2("wait for stop of parent_evloop %lx", parent_evloop);
+        while(!RTEST(rb_funcall(parent_evloop, ID_stop_p, 0))) {
+            DUMP2("parent_evloop %lx doesn't stop", parent_evloop);
+            rb_thread_run(parent_evloop);
+        }
+        DUMP1("succeed to stop parent");
+    }
+
+    rb_ary_push(eventloop_stack, parent_evloop);
+
+    DUMP3("tcltklib: eventloop-thread : %lx -> %lx\n", 
+                parent_evloop, eventloop_thread);
+
+    args->check_root   = check_root;
+    args->update_flag  = update_flag;
+    args->check_var    = check_var;
+    args->interp       = interp;
+    args->thr_crit_bup = rb_thread_critical;
+
+    rb_thread_critical = Qfalse;
+
+#if 0
+    return rb_ensure(lib_eventloop_main, (VALUE)args, 
+                     lib_eventloop_ensure, (VALUE)args);
+#endif
+    return rb_ensure(lib_eventloop_main_core, (VALUE)args, 
+                     lib_eventloop_ensure, (VALUE)args);
+}
+
+/* execute Tk_MainLoop */
+static VALUE
+lib_mainloop(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE check_rootwidget;
+
+    if (rb_scan_args(argc, argv, "01", &check_rootwidget) == 0) {
+        check_rootwidget = Qtrue;
+    } else if (RTEST(check_rootwidget)) {
+        check_rootwidget = Qtrue;
+    } else {
+        check_rootwidget = Qfalse;
+    }
+
+    return lib_eventloop_launcher(RTEST(check_rootwidget), 0, 
+                                  (int*)NULL, (Tcl_Interp*)NULL);
+}
+
+static VALUE
+ip_mainloop(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        return Qnil;
+    }
+
+    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
+        /* slave IP */
+        return Qnil;
+    }
+    return lib_mainloop(argc, argv, self);
+}
+
+
+static VALUE
+watchdog_evloop_launcher(check_rootwidget)
+    VALUE check_rootwidget;
+{
+    return lib_eventloop_launcher(RTEST(check_rootwidget), 0, 
+                                  (int*)NULL, (Tcl_Interp*)NULL);
+}
+
+#define EVLOOP_WAKEUP_CHANCE 3
+
+static VALUE
+lib_watchdog_core(check_rootwidget)
+    VALUE check_rootwidget;
+{
+    VALUE evloop;
+    int   prev_val = -1;
+    int   chance = 0;
+    int   check = RTEST(check_rootwidget);
+    struct timeval t0, t1;
+
+    t0.tv_sec  = (time_t)0;
+    t0.tv_usec = (time_t)((NO_THREAD_INTERRUPT_TIME)*1000.0);
+    t1.tv_sec  = (time_t)0;
+    t1.tv_usec = (time_t)((WATCHDOG_INTERVAL)*1000.0);
+
+    /* check other watchdog thread */
+    if (!NIL_P(watchdog_thread)) {
+        if (RTEST(rb_funcall(watchdog_thread, ID_stop_p, 0))) {
+            rb_funcall(watchdog_thread, ID_kill, 0);
+        } else {
+            return Qnil;
+        }
+    }
+    watchdog_thread = rb_thread_current();
+
+    /* watchdog start */
+    do {
+        if (NIL_P(eventloop_thread)
+            || (loop_counter == prev_val && chance >= EVLOOP_WAKEUP_CHANCE)) {
+            /* start new eventloop thread */
+            DUMP2("eventloop thread %lx is sleeping or dead", 
+                  eventloop_thread);
+            evloop = rb_thread_create(watchdog_evloop_launcher, 
+                                      (void*)&check_rootwidget);
+            DUMP2("create new eventloop thread %lx", evloop);
+            loop_counter = -1;
+            chance = 0;
+            rb_thread_run(evloop);
+        } else {
+            prev_val = loop_counter;
+            if (RTEST(rb_funcall(eventloop_thread, ID_stop_p, 0))) {
+                ++chance;
+            } else {
+                chance = 0;
+            }
+            if (event_loop_wait_event) {
+                rb_thread_wait_for(t0);
+            } else {
+                rb_thread_wait_for(t1);
+            }
+            /* rb_thread_schedule(); */
+        }
+    } while(!check || !tk_stubs_init_p() || Tk_GetNumMainWindows() != 0);
+
+    return Qnil;
+}
+
+VALUE
+lib_watchdog_ensure(arg)
+    VALUE arg;
+{
+    eventloop_thread = Qnil; /* stop eventloops */
+    return Qnil;
+}
+
+static VALUE
+lib_mainloop_watchdog(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE check_rootwidget;
+
+    if (rb_scan_args(argc, argv, "01", &check_rootwidget) == 0) {
+        check_rootwidget = Qtrue;
+    } else if (RTEST(check_rootwidget)) {
+        check_rootwidget = Qtrue;
+    } else {
+        check_rootwidget = Qfalse;
+    }
+
+    return rb_ensure(lib_watchdog_core, check_rootwidget, 
+                     lib_watchdog_ensure, Qnil);
+}
+
+static VALUE
+ip_mainloop_watchdog(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        return Qnil;
+    }
+
+    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
+        /* slave IP */
+        return Qnil;
+    }
+    return lib_mainloop_watchdog(argc, argv, self);
+}
+
+
+/* thread-safe(?) interaction between Ruby and Tk */
+struct thread_call_proc_arg {
+    VALUE proc;
+    int *done;
+};
+
+void 
+_thread_call_proc_arg_mark(struct thread_call_proc_arg *q)
+{
+    rb_gc_mark(q->proc);
+}
+
+static VALUE
+_thread_call_proc_core(arg)
+    VALUE arg;
+{
+    struct thread_call_proc_arg *q = (struct thread_call_proc_arg*)arg;
+    return rb_funcall(q->proc, ID_call, 0);
+}
+
+static VALUE
+_thread_call_proc_ensure(arg)
+    VALUE arg;
+{
+    struct thread_call_proc_arg *q = (struct thread_call_proc_arg*)arg;
+    *(q->done) = 1;
+    return Qnil;
+}
+
+static VALUE
+_thread_call_proc(arg)
+    VALUE arg;
+{
+    struct thread_call_proc_arg *q = (struct thread_call_proc_arg*)arg;
+
+    return rb_ensure(_thread_call_proc_core, (VALUE)q, 
+                     _thread_call_proc_ensure, (VALUE)q);
+}
+
+static VALUE
+_thread_call_proc_value(th)
+    VALUE th;
+{
+    return rb_funcall(th, ID_value, 0);
+}
+
+static VALUE
+lib_thread_callback(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct thread_call_proc_arg *q;
+    VALUE proc, th, ret;
+    int status, foundEvent;
+
+    if (rb_scan_args(argc, argv, "01", &proc) == 0) {
+        proc = rb_block_proc();
+    }
+
+    q = (struct thread_call_proc_arg *)ALLOC(struct thread_call_proc_arg);
+    q->proc = proc;
+    q->done = (int*)ALLOC(int);
+    *(q->done) = 0;
+
+    /* create call-proc thread */
+    th = rb_thread_create(_thread_call_proc, (void*)q);
+
+    rb_thread_schedule();
+
+    /* start sub-eventloop */
+    foundEvent = RTEST(lib_eventloop_launcher(/* not check root-widget */0, 0, 
+                                              q->done, (Tcl_Interp*)NULL));
+
+    if (RTEST(rb_funcall(th, ID_alive_p, 0))) {
+        rb_funcall(th, ID_kill, 0);
+        ret = Qnil;
+    } else {
+        ret = rb_protect(_thread_call_proc_value, th, &status);
+    }
+
+    free(q->done);
+    free(q);
+
+    if (NIL_P(rbtk_pending_exception)) {
+        /* return ruby_errinfo; */
+        if (status) {
+            rb_exc_raise(ruby_errinfo);
+        }
+    } else {
+        VALUE exc = rbtk_pending_exception;
+        rbtk_pending_exception = Qnil;
+        /* return exc; */
+        rb_exc_raise(exc);
+    }
+
+    return ret;
+}
+
+
+/* do_one_event */
+static VALUE
+lib_do_one_event_core(argc, argv, self, is_ip)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+    int   is_ip;
+{
+    volatile VALUE vflags;
+    int flags;
+    int found_event;
+
+    if (!NIL_P(eventloop_thread)) {
+        rb_raise(rb_eRuntimeError, "eventloop is already running");
+    }
+
+    tcl_stubs_check();
+
+    if (rb_scan_args(argc, argv, "01", &vflags) == 0) {
+        flags = TCL_ALL_EVENTS | TCL_DONT_WAIT;
+    } else {
+        Check_Type(vflags, T_FIXNUM);
+        flags = FIX2INT(vflags);
+    }
+
+    if (rb_safe_level() >= 4 || (rb_safe_level() >=1 && OBJ_TAINTED(vflags))) {
+      flags |= TCL_DONT_WAIT;
+    }
+
+    if (is_ip) {
+        /* check IP */
+        struct tcltkip *ptr = get_ip(self);
+
+        /* ip is deleted? */
+        if (deleted_ip(ptr)) {
+            return Qfalse;
+        }
+
+        if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
+            /* slave IP */
+            flags |= TCL_DONT_WAIT;
+        }
+    }
+
+    /* found_event = Tcl_DoOneEvent(TCL_ALL_EVENTS | TCL_DONT_WAIT); */
+    found_event = Tcl_DoOneEvent(flags);
+
+    if (pending_exception_check0()) {
+        return Qfalse;
+    }
+
+    if (found_event) {
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+}
+
+static VALUE
+lib_do_one_event(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    return lib_do_one_event_core(argc, argv, self, 0);
+}
+
+static VALUE
+ip_do_one_event(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    return lib_do_one_event_core(argc, argv, self, 0);
+}
+
+
+static void
+ip_set_exc_message(interp, exc)
+    Tcl_Interp *interp;
+    VALUE exc;
+{
+    char *buf;
+    Tcl_DString dstr;
+    volatile VALUE msg;
+    int thr_crit_bup;
+
+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0)
+    volatile VALUE enc;
+    Tcl_Encoding encoding;
+#endif
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    msg = rb_funcall(exc, ID_message, 0, 0);
+    StringValue(msg);
+
+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0)
+    enc = rb_attr_get(exc, ID_at_enc);
+    if (NIL_P(enc)) {
+        enc = rb_attr_get(msg, ID_at_enc);
+    }
+    if (NIL_P(enc)) {
+        encoding = (Tcl_Encoding)NULL;
+    } else if (TYPE(enc) == T_STRING) {
+        encoding = Tcl_GetEncoding(interp, RSTRING(enc)->ptr);
+    } else {
+        enc = rb_funcall(enc, ID_to_s, 0, 0);
+        encoding = Tcl_GetEncoding(interp, RSTRING(enc)->ptr);
+    }
+
+    /* to avoid a garbled error message dialog */
+    buf = ALLOC_N(char, (RSTRING(msg)->len)+1);
+    memcpy(buf, RSTRING(msg)->ptr, RSTRING(msg)->len);
+    buf[RSTRING(msg)->len] = 0;
+
+    Tcl_DStringInit(&dstr);
+    Tcl_DStringFree(&dstr);
+    Tcl_ExternalToUtfDString(encoding, buf, RSTRING(msg)->len, &dstr);
+
+    Tcl_AppendResult(interp, Tcl_DStringValue(&dstr), (char*)NULL);
+    DUMP2("error message:%s", Tcl_DStringValue(&dstr));
+    Tcl_DStringFree(&dstr);
+    free(buf);
+
+#else /* TCL_VERSION <= 8.0 */
+    Tcl_AppendResult(interp, RSTRING(msg)->ptr, (char*)NULL);
+#endif
+
+    rb_thread_critical = thr_crit_bup;
+}
+
+static VALUE
+TkStringValue(obj)
+    VALUE obj;
+{
+    switch(TYPE(obj)) {
+    case T_STRING:
+        return obj;
+
+    case T_NIL:
+        return rb_str_new2("");
+
+    case T_TRUE:
+        return rb_str_new2("1");
+
+    case T_FALSE:
+        return rb_str_new2("0");
+
+    case T_ARRAY:
+        return rb_funcall(obj, ID_join, 1, rb_str_new2(" "));
+
+    default:
+        if (rb_respond_to(obj, ID_to_s)) {
+            return rb_funcall(obj, ID_to_s, 0, 0);
+        }
+    }
+
+    return rb_funcall(obj, ID_inspect, 0, 0);
+}
+
+static int
+tcl_protect_core(interp, proc, data) /* should not raise exception */
+    Tcl_Interp *interp;
+    VALUE (*proc)();
+    VALUE data;
+{
+    volatile VALUE ret, exc = Qnil;
+    int status = 0;
+    int thr_crit_bup = rb_thread_critical;
+
+    rb_thread_critical = Qfalse;
+    ret = rb_protect(proc, data, &status);
+    rb_thread_critical = Qtrue;
+    if (status) {
+        char *buf;
+        VALUE old_gc, type, str;
+
+        old_gc = rb_gc_disable();
+
+        switch(status) {
+        case TAG_RETURN:
+            type = eTkCallbackReturn;
+            goto error;
+        case TAG_BREAK:
+            type = eTkCallbackBreak;
+            goto error;
+        case TAG_NEXT:
+            type = eTkCallbackContinue;
+            goto error;
+        error:
+            str = rb_str_new2("LocalJumpError: ");
+            rb_str_append(str, rb_obj_as_string(ruby_errinfo));
+            exc = rb_exc_new3(type, str);
+            break;
+
+        case TAG_RETRY:
+            if (NIL_P(ruby_errinfo)) {
+                DUMP1("rb_protect: retry");
+                exc = rb_exc_new2(eTkCallbackRetry, "retry jump error");
+            } else {
+                exc = ruby_errinfo;
+            }
+            break;
+
+        case TAG_REDO:
+            if (NIL_P(ruby_errinfo)) {
+                DUMP1("rb_protect: redo");
+                exc = rb_exc_new2(eTkCallbackRedo,  "redo jump error");
+            } else {
+                exc = ruby_errinfo;
+            }
+            break;
+
+        case TAG_RAISE:
+            if (NIL_P(ruby_errinfo)) {
+                exc = rb_exc_new2(rb_eException, "unknown exception");
+            } else {
+                exc = ruby_errinfo;
+            }
+            break;
+
+        case TAG_FATAL:
+            if (NIL_P(ruby_errinfo)) {
+                exc = rb_exc_new2(rb_eFatal, "FATAL");
+            } else {
+                exc = ruby_errinfo;
+            }
+            break;
+
+        case TAG_THROW:
+            if (NIL_P(ruby_errinfo)) {
+                DUMP1("rb_protect: throw");
+                exc = rb_exc_new2(eTkCallbackThrow,  "throw jump error");
+            } else {
+                exc = ruby_errinfo;
+            }
+            break;
+
+        default:
+            buf = ALLOC_N(char, 256);
+            sprintf(buf, "unknown loncaljmp status %d", status);
+            exc = rb_exc_new2(rb_eException, buf);
+            free(buf);
+            break;
+        }
+
+        if (old_gc == Qfalse) rb_gc_enable();
+
+        ret = Qnil;
+    }
+
+    rb_thread_critical = thr_crit_bup;
+
+    Tcl_ResetResult(interp);
+
+    /* status check */
+    if (!NIL_P(exc)) {
+        volatile VALUE eclass = rb_obj_class(exc);
+        volatile VALUE backtrace;
+
+        DUMP1("(failed)");
+
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        DUMP1("set backtrace");
+        if (!NIL_P(backtrace = rb_funcall(exc, ID_backtrace, 0, 0))) {
+            backtrace = rb_ary_join(backtrace, rb_str_new2("\n"));
+            Tcl_AddErrorInfo(interp, StringValuePtr(backtrace));
+        }
+
+        rb_thread_critical = thr_crit_bup;
+
+        ip_set_exc_message(interp, exc);
+
+        if (eclass == eTkCallbackReturn)
+            return TCL_RETURN;
+
+        if (eclass == eTkCallbackBreak)
+            return TCL_BREAK;
+
+        if (eclass == eTkCallbackContinue)
+            return TCL_CONTINUE;
+
+        if (eclass == rb_eSystemExit || eclass == rb_eInterrupt) {
+            rbtk_pending_exception = exc;
+            return TCL_RETURN;
+        }
+
+        if (rb_obj_is_kind_of(exc, eTkLocalJumpError)) {
+            rbtk_pending_exception = exc;
+            return TCL_ERROR;
+        }
+
+        if (rb_obj_is_kind_of(exc, eLocalJumpError)) {
+            VALUE reason = rb_ivar_get(exc, ID_at_reason);
+
+            if (TYPE(reason) == T_SYMBOL) {
+                if (SYM2ID(reason) == ID_return)
+                    return TCL_RETURN;
+
+                if (SYM2ID(reason) == ID_break)
+                    return TCL_BREAK;
+
+                if (SYM2ID(reason) == ID_next)
+                    return TCL_CONTINUE;
+            }
+        }
+
+        return TCL_ERROR;
+    }
+
+    /* result must be string or nil */
+    if (!NIL_P(ret)) {
+        /* copy result to the tcl interpreter */
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        ret = TkStringValue(ret);
+        DUMP1("Tcl_AppendResult");
+        Tcl_AppendResult(interp, RSTRING(ret)->ptr, (char *)NULL);
+
+        rb_thread_critical = thr_crit_bup;
+    }
+
+    DUMP2("(result) %s", NIL_P(ret) ? "nil" : RSTRING(ret)->ptr);
+
+    return TCL_OK;
+}
+
+static int
+tcl_protect(interp, proc, data)
+    Tcl_Interp *interp;
+    VALUE (*proc)();
+    VALUE data;
+{
+    int old_trapflag = rb_trap_immediate;
+    int code;
+
+#ifdef HAVE_NATIVETHREAD
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on tcl_protect()");
+    }
+#endif
+
+    rb_trap_immediate = 0;
+    code = tcl_protect_core(interp, proc, data);
+    rb_trap_immediate = old_trapflag;
+
+    return code;
+}
+
+static int
+#if TCL_MAJOR_VERSION >= 8
+ip_ruby_eval(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int argc;
+    Tcl_Obj *CONST argv[];
+#else /* TCL_MAJOR_VERSION < 8 */
+ip_ruby_eval(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int argc;
+    char *argv[];
+#endif
+{
+    char *arg;
+    int thr_crit_bup;
+    int code;
+
+    if (interp == (Tcl_Interp*)NULL) {
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+                                             "IP is deleted");
+        return TCL_ERROR;
+    }
+
+    /* ruby command has 1 arg. */
+    if (argc != 2) {
+#if 0
+        rb_raise(rb_eArgError, 
+                 "wrong number of arguments (%d for 1)", argc - 1);
+#else
+        char buf[sizeof(int)*8 + 1];
+        Tcl_ResetResult(interp);
+        sprintf(buf, "%d", argc-1);
+        Tcl_AppendResult(interp, "wrong number of arguments (", 
+                         buf, " for 1)", (char *)NULL);
+        rbtk_pending_exception = rb_exc_new2(rb_eArgError, 
+                                             Tcl_GetStringResult(interp));
+        return TCL_ERROR;
+#endif
+    }
+
+    /* get C string from Tcl object */
+#if TCL_MAJOR_VERSION >= 8
+    {
+      char *str;
+      int  len;
+
+      thr_crit_bup = rb_thread_critical;
+      rb_thread_critical = Qtrue;
+
+      str = Tcl_GetStringFromObj(argv[1], &len);
+      arg = ALLOC_N(char, len + 1);
+      memcpy(arg, str, len);
+      arg[len] = 0;
+
+      rb_thread_critical = thr_crit_bup;
+
+    }
+#else /* TCL_MAJOR_VERSION < 8 */
+    arg = argv[1];
+#endif
+
+    /* evaluate the argument string by ruby */
+    DUMP2("rb_eval_string(%s)", arg);
+
+    code = tcl_protect(interp, rb_eval_string, (VALUE)arg);
+
+#if TCL_MAJOR_VERSION >= 8
+    free(arg);
+#endif
+
+    return code;
+}
+
+
+/* Tcl command `ruby_cmd' */
+static VALUE
+ip_ruby_cmd_core(arg)
+    struct cmd_body_arg *arg;
+{
+    volatile VALUE ret;
+    int thr_crit_bup;
+
+    DUMP1("call ip_ruby_cmd_core");
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qfalse;
+    ret = rb_apply(arg->receiver, arg->method, arg->args);
+    rb_thread_critical = thr_crit_bup;
+    DUMP1("finish ip_ruby_cmd_core");
+
+    return ret;
+}
+
+/* ruby_cmd receiver method arg ... */
+static int
+#if TCL_MAJOR_VERSION >= 8
+ip_ruby_cmd(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int argc;
+    Tcl_Obj *CONST argv[];
+#else /* TCL_MAJOR_VERSION < 8 */
+ip_ruby_cmd(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int argc;
+    char *argv[];
+#endif
+{
+    volatile VALUE receiver;
+    volatile ID method;
+    volatile VALUE args;
+    char *str;
+    int i;
+    int  len;
+    struct cmd_body_arg *arg;
+    int thr_crit_bup;
+    VALUE old_gc;
+    int code;
+
+    if (interp == (Tcl_Interp*)NULL) {
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+                                             "IP is deleted");
+        return TCL_ERROR;
+    }
+
+    if (argc < 3) {
+#if 0
+        rb_raise(rb_eArgError, "too few arguments");
+#else
+        Tcl_ResetResult(interp);
+        Tcl_AppendResult(interp, "too few arguments", (char *)NULL);
+        rbtk_pending_exception = rb_exc_new2(rb_eArgError, 
+                                             Tcl_GetStringResult(interp));
+        return TCL_ERROR;
+#endif
+    }
+
+    /* allocate */
+    arg = ALLOC(struct cmd_body_arg);
+
+    /* get arguments from Tcl objects */
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+    old_gc = rb_gc_disable();
+
+    /* get receiver */
+#if TCL_MAJOR_VERSION >= 8
+    str = Tcl_GetStringFromObj(argv[1], &len);
+#else /* TCL_MAJOR_VERSION < 8 */
+    str = argv[1];
+#endif
+    DUMP2("receiver:%s",str);
+    if (str[0] == ':' || ('A' <= str[0] && str[0] <= 'Z')) {
+        /* class | module | constant */
+        receiver = rb_const_get(rb_cObject, rb_intern(str));
+    } else if (str[0] == '$') {
+        /* global variable */
+        receiver = rb_gv_get(str);
+    } else {
+        /* global variable omitted '$' */
+        char *buf;
+
+        len = strlen(str);
+        buf = ALLOC_N(char, len + 2);
+        buf[0] = '$';
+        memcpy(buf + 1, str, len);
+        buf[len + 1] = 0;
+        receiver = rb_gv_get(buf);
+        free(buf);
+    }
+    if (NIL_P(receiver)) {
+#if 0
+        rb_raise(rb_eArgError, 
+                 "unknown class/module/global-variable '%s'", str);
+#else
+        Tcl_ResetResult(interp);
+        Tcl_AppendResult(interp, "unknown class/module/global-variable '", 
+                         str, "'", (char *)NULL);
+        rbtk_pending_exception = rb_exc_new2(rb_eArgError, 
+                                             Tcl_GetStringResult(interp));
+        return TCL_ERROR;
+#endif
+    }
+
+    /* get metrhod */
+#if TCL_MAJOR_VERSION >= 8
+    str = Tcl_GetStringFromObj(argv[2], &len);
+#else /* TCL_MAJOR_VERSION < 8 */
+    str = argv[2];
+#endif
+    method = rb_intern(str);
+
+    /* get args */
+    args = rb_ary_new2(argc - 2);
+    RARRAY(args)->len = 0;
+    for(i = 3; i < argc; i++) {
+#if TCL_MAJOR_VERSION >= 8
+        str = Tcl_GetStringFromObj(argv[i], &len);
+        DUMP2("arg:%s",str);
+        RARRAY(args)->ptr[RARRAY(args)->len++] = rb_tainted_str_new(str, len);
+#else /* TCL_MAJOR_VERSION < 8 */
+        DUMP2("arg:%s",argv[i]);
+        RARRAY(args)->ptr[RARRAY(args)->len++] = rb_tainted_str_new2(argv[i]);
+#endif
+    }
+
+    if (old_gc == Qfalse) rb_gc_enable();
+    rb_thread_critical = thr_crit_bup;
+
+    arg->receiver = receiver;
+    arg->method = method;
+    arg->args = args;
+
+    /* evaluate the argument string by ruby */
+    code = tcl_protect(interp, ip_ruby_cmd_core, (VALUE)arg);
+
+    free(arg);
+
+    return code;
+}
+
+
+/*****************************/
+/* relpace of 'exit' command */
+/*****************************/
+static int
+#if TCL_MAJOR_VERSION >= 8
+ip_InterpExitObjCmd(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int argc;
+    Tcl_Obj *CONST argv[];
+#else /* TCL_MAJOR_VERSION < 8 */
+ip_InterpExitCommand(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int argc;
+    char *argv[];
+#endif
+{
+    DUMP1("start ip_InterpExitCommand");
+    if (interp != (Tcl_Interp*)NULL 
+        && !Tcl_InterpDeleted(interp)
+#if TCL_NAMESPACE_DEBUG
+        && !ip_null_namespace(interp)
+#endif
+        ) {
+        Tcl_ResetResult(interp);
+        /* Tcl_Preserve(interp); */
+        /* Tcl_Eval(interp, "interp eval {} {destroy .}; interp delete {}"); */
+        ip_finalize(interp);
+        Tcl_DeleteInterp(interp);
+        Tcl_Release(interp);
+    }
+    return TCL_OK;
+}
+
+static int
+#if TCL_MAJOR_VERSION >= 8
+ip_RubyExitObjCmd(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int argc;
+    Tcl_Obj *CONST argv[];
+#else /* TCL_MAJOR_VERSION < 8 */
+ip_RubyExitCommand(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int argc;
+    char *argv[];
+#endif
+{
+    int state;
+    char *cmd, *param;
+#if TCL_MAJOR_VERSION < 8
+    char *endptr;
+    cmd = argv[0];
+#endif
+
+    DUMP1("start ip_RubyExitCommand");
+
+#if TCL_MAJOR_VERSION >= 8
+    /* cmd = Tcl_GetString(argv[0]); */
+    cmd = Tcl_GetStringFromObj(argv[0], (int*)NULL);
+#endif
+
+    if (argc < 1 || argc > 2) {
+        /* arguemnt error */
+        Tcl_AppendResult(interp, 
+                         "wrong number of arguments: should be \"", 
+                         cmd, " ?returnCode?\"", (char *)NULL);
+        return TCL_ERROR;
+    }
+
+    if (interp == (Tcl_Interp*)NULL) return TCL_OK;
+
+    Tcl_ResetResult(interp);
+
+    if (rb_safe_level() >= 4 || Tcl_IsSafe(interp)) {
+        ip_finalize(interp);
+        Tcl_DeleteInterp(interp);
+        Tcl_Release(interp);
+        return TCL_OK;
+    }
+
+    switch(argc) {
+    case 1:
+        /* rb_exit(0); */ /* not return if succeed */
+        Tcl_AppendResult(interp, 
+                         "fail to call \"", cmd, "\"", (char *)NULL);
+
+        rbtk_pending_exception = rb_exc_new2(rb_eSystemExit, 
+                                             Tcl_GetStringResult(interp));
+        rb_iv_set(rbtk_pending_exception, "status", INT2FIX(0));
+
+        return TCL_RETURN;
+
+    case 2:
+#if TCL_MAJOR_VERSION >= 8
+        if (Tcl_GetIntFromObj(interp, argv[1], &state) == TCL_ERROR) {
+            return TCL_ERROR;
+        }
+        /* param = Tcl_GetString(argv[1]); */
+        param = Tcl_GetStringFromObj(argv[1], (int*)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+        state = (int)strtol(argv[1], &endptr, 0);
+        if (*endptr) {
+            Tcl_AppendResult(interp, 
+                             "expected integer but got \"", 
+                             argv[1], "\"", (char *)NULL);
+            return TCL_ERROR;
+        }
+        param = argv[1];
+#endif
+        /* rb_exit(state); */ /* not return if succeed */
+
+        Tcl_AppendResult(interp, "fail to call \"", cmd, " ", 
+                         param, "\"", (char *)NULL);
+
+        rbtk_pending_exception = rb_exc_new2(rb_eSystemExit, 
+                                             Tcl_GetStringResult(interp));
+        rb_iv_set(rbtk_pending_exception, "status", INT2FIX(state));
+
+        return TCL_RETURN;
+
+    default:
+        /* arguemnt error */
+        Tcl_AppendResult(interp, 
+                         "wrong number of arguments: should be \"", 
+                         cmd, " ?returnCode?\"", (char *)NULL);
+        return TCL_ERROR;
+    }
+}
+
+
+/**************************/
+/*  based on tclEvent.c   */
+/**************************/
+
+/*********************/
+/* replace of update */
+/*********************/
+#if TCL_MAJOR_VERSION >= 8
+static int ip_rbUpdateObjCmd _((ClientData, Tcl_Interp *, int,
+                               Tcl_Obj *CONST []));
+static int
+ip_rbUpdateObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int objc;
+    Tcl_Obj *CONST objv[];
+#else /* TCL_MAJOR_VERSION < 8 */
+static int ip_rbUpdateCommand _((ClientData, Tcl_Interp *, int, char *[]));
+static int
+ip_rbUpdateCommand(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int objc;
+    char *objv[];
+#endif
+{
+    int  optionIndex;
+    int  ret;
+    int  flags = 0;
+    static CONST char *updateOptions[] = {"idletasks", (char *) NULL};
+    enum updateOptions {REGEXP_IDLETASKS};
+
+    DUMP1("Ruby's 'update' is called");
+    if (interp == (Tcl_Interp*)NULL) {
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+                                             "IP is deleted");
+        return TCL_ERROR;
+    }
+#ifdef HAVE_NATIVETHREAD
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on ip_ruby_eval()");
+    }
+#endif
+
+    if (objc == 1) {
+        flags = TCL_DONT_WAIT;
+
+    } else if (objc == 2) {
+#if TCL_MAJOR_VERSION >= 8
+        if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)updateOptions,
+                "option", 0, &optionIndex) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        switch ((enum updateOptions) optionIndex) {
+            case REGEXP_IDLETASKS: {
+                flags = TCL_IDLE_EVENTS;
+                break;
+            }
+            default: {
+                rb_bug("ip_rbUpdateObjCmd: bad option index to UpdateOptions");
+            }
+        }
+#else
+        if (strncmp(objv[1], "idletasks", strlen(objv[1])) != 0) {
+            Tcl_AppendResult(interp, "bad option \"", objv[1],
+                    "\": must be idletasks", (char *) NULL);
+            return TCL_ERROR;
+        }
+        flags = TCL_IDLE_EVENTS;
+#endif
+    } else {
+#ifdef Tcl_WrongNumArgs
+        Tcl_WrongNumArgs(interp, 1, objv, "[ idletasks ]");
+#else
+# if TCL_MAJOR_VERSION >= 8
+        int  dummy;
+        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
+                         Tcl_GetStringFromObj(objv[0], &dummy), 
+                         " [ idletasks ]\"", 
+                         (char *) NULL);
+# else /* TCL_MAJOR_VERSION < 8 */
+        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
+                         objv[0], " [ idletasks ]\"", (char *) NULL);
+# endif
+#endif
+        return TCL_ERROR;
+    }
+
+    Tcl_Preserve(interp);
+
+    /* call eventloop */
+    /* ret = lib_eventloop_core(0, flags, (int *)NULL);*/ /* ignore result */
+    ret = RTEST(lib_eventloop_launcher(0, flags, (int *)NULL, interp)); /* ignore result */
+
+    /* exception check */
+    if (!NIL_P(rbtk_pending_exception)) {
+        Tcl_Release(interp);
+
+        /*
+        if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)) {
+        */
+        if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)
+            || rb_obj_is_kind_of(rbtk_pending_exception, rb_eInterrupt)) {
+            return TCL_RETURN;
+        } else{
+            return TCL_ERROR;
+        }
+    }
+
+    /* trap check */
+    if (rb_trap_pending) {
+        Tcl_Release(interp);
+
+        return TCL_RETURN;
+    }
+
+    /*
+     * Must clear the interpreter's result because event handlers could
+     * have executed commands.
+     */
+
+    DUMP2("last result '%s'", Tcl_GetStringResult(interp));
+    Tcl_ResetResult(interp);
+    Tcl_Release(interp);
+
+    DUMP1("finish Ruby's 'update'");
+    return TCL_OK;
+}
+
+
+/**********************/
+/* update with thread */
+/**********************/
+struct th_update_param {
+    VALUE thread;
+    int   done;
+};
+
+static void rb_threadUpdateProc _((ClientData));
+static void 
+rb_threadUpdateProc(clientData)
+    ClientData clientData;      /* Pointer to integer to set to 1. */
+{
+    struct th_update_param *param = (struct th_update_param *) clientData;
+
+    DUMP1("threadUpdateProc is called");
+    param->done = 1;
+    rb_thread_wakeup(param->thread);
+
+    return;
+}
+
+#if TCL_MAJOR_VERSION >= 8
+static int ip_rb_threadUpdateObjCmd _((ClientData, Tcl_Interp *, int,
+                                       Tcl_Obj *CONST []));
+static int
+ip_rb_threadUpdateObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int objc;
+    Tcl_Obj *CONST objv[];
+#else /* TCL_MAJOR_VERSION < 8 */
+static int ip_rb_threadUpdateCommand _((ClientData, Tcl_Interp *, int,
+                                       char *[]));
+static int
+ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int objc;
+    char *objv[];
+#endif
+{
+    int  optionIndex;
+    int  flags = 0;
+    struct th_update_param *param;
+    static CONST char *updateOptions[] = {"idletasks", (char *) NULL};
+    enum updateOptions {REGEXP_IDLETASKS};
+    volatile VALUE current_thread = rb_thread_current();
+
+    DUMP1("Ruby's 'thread_update' is called");
+    if (interp == (Tcl_Interp*)NULL) {
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+                                             "IP is deleted");
+        return TCL_ERROR;
+    }
+#ifdef HAVE_NATIVETHREAD
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on ip_ruby_eval()");
+    }
+#endif
+
+    if (rb_thread_alone() 
+        || NIL_P(eventloop_thread) || eventloop_thread == current_thread) {
+#if TCL_MAJOR_VERSION >= 8
+        DUMP1("call ip_rbUpdateObjCmd");
+        return ip_rbUpdateObjCmd(clientData, interp, objc, objv);
+#else /* TCL_MAJOR_VERSION < 8 */
+        DUMP1("call ip_rbUpdateCommand");
+        return ip_rbUpdateCommand(clientData, interp, objc, objv);
+#endif
+    }
+
+    DUMP1("start Ruby's 'thread_update' body");
+
+    if (objc == 1) {
+        flags = TCL_DONT_WAIT;
+
+    } else if (objc == 2) {
+#if TCL_MAJOR_VERSION >= 8
+        if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)updateOptions,
+                "option", 0, &optionIndex) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        switch ((enum updateOptions) optionIndex) {
+            case REGEXP_IDLETASKS: {
+                flags = TCL_IDLE_EVENTS;
+                break;
+            }
+            default: {
+                rb_bug("ip_rb_threadUpdateObjCmd: bad option index to UpdateOptions");
+            }
+        }
+#else
+        if (strncmp(objv[1], "idletasks", strlen(objv[1])) != 0) {
+            Tcl_AppendResult(interp, "bad option \"", objv[1],
+                    "\": must be idletasks", (char *) NULL);
+            return TCL_ERROR;
+        }
+        flags = TCL_IDLE_EVENTS;
+#endif
+    } else {
+#ifdef Tcl_WrongNumArgs
+        Tcl_WrongNumArgs(interp, 1, objv, "[ idletasks ]");
+#else
+# if TCL_MAJOR_VERSION >= 8
+        int  dummy;
+        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
+                         Tcl_GetStringFromObj(objv[0], &dummy), 
+                         " [ idletasks ]\"", 
+                         (char *) NULL);
+# else /* TCL_MAJOR_VERSION < 8 */
+        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
+                         objv[0], " [ idletasks ]\"", (char *) NULL);
+# endif
+#endif
+        return TCL_ERROR;
+    }
+
+    DUMP1("pass argument check");
+
+    param = (struct th_update_param *)Tcl_Alloc(sizeof(struct th_update_param));
+    Tcl_Preserve(param);
+    param->thread = current_thread;
+    param->done = 0;
+
+    DUMP1("set idle proc");
+    Tcl_DoWhenIdle(rb_threadUpdateProc, (ClientData) param);
+
+    while(!param->done) {
+        DUMP1("wait for complete idle proc");
+        rb_thread_stop();
+    }
+
+    Tcl_Release(param);
+    Tcl_Free((char *)param);
+
+    DUMP1("finish Ruby's 'thread_update'");
+    return TCL_OK;
+}
+
+
+/***************************/
+/* replace of vwait/tkwait */
+/***************************/
+#if TCL_MAJOR_VERSION >= 8
+static int ip_rbVwaitObjCmd _((ClientData, Tcl_Interp *, int,
+                               Tcl_Obj *CONST []));
+static int ip_rb_threadVwaitObjCmd _((ClientData, Tcl_Interp *, int,
+                                      Tcl_Obj *CONST []));
+static int ip_rbTkWaitObjCmd _((ClientData, Tcl_Interp *, int,
+                                Tcl_Obj *CONST []));
+static int ip_rb_threadTkWaitObjCmd _((ClientData, Tcl_Interp *, int,
+                                       Tcl_Obj *CONST []));
+#else
+static int ip_rbVwaitCommand _((ClientData, Tcl_Interp *, int, char *[]));
+static int ip_rb_threadVwaitCommand _((ClientData, Tcl_Interp *, int,
+                                       char *[]));
+static int ip_rbTkWaitCommand _((ClientData, Tcl_Interp *, int, char *[]));
+static int ip_rb_threadTkWaitCommand _((ClientData, Tcl_Interp *, int,
+                                        char *[]));
+#endif
+
+#if TCL_MAJOR_VERSION >= 8
+static char *VwaitVarProc _((ClientData, Tcl_Interp *, 
+                             CONST84 char *,CONST84 char *, int));
+static char *
+VwaitVarProc(clientData, interp, name1, name2, flags)
+    ClientData clientData;      /* Pointer to integer to set to 1. */
+    Tcl_Interp *interp;         /* Interpreter containing variable. */
+    CONST84 char *name1;        /* Name of variable. */
+    CONST84 char *name2;        /* Second part of variable name. */
+    int flags;                  /* Information about what happened. */
+#else /* TCL_MAJOR_VERSION < 8 */
+static char *VwaitVarProc _((ClientData, Tcl_Interp *, char *, char *, int));
+static char *
+VwaitVarProc(clientData, interp, name1, name2, flags)
+    ClientData clientData;      /* Pointer to integer to set to 1. */
+    Tcl_Interp *interp;         /* Interpreter containing variable. */
+    char *name1;                /* Name of variable. */
+    char *name2;                /* Second part of variable name. */
+    int flags;                  /* Information about what happened. */
+#endif
+{
+    int *donePtr = (int *) clientData;
+
+    *donePtr = 1;
+    return (char *) NULL;
+}
+
+#if TCL_MAJOR_VERSION >= 8
+static int
+ip_rbVwaitObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int objc;
+    Tcl_Obj *CONST objv[];
+#else /* TCL_MAJOR_VERSION < 8 */
+static int
+ip_rbVwaitCommand(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int objc;
+    char *objv[];
+#endif
+{
+    int  ret, done, foundEvent;
+    char *nameString;
+    int  dummy;
+    int thr_crit_bup;
+
+    DUMP1("Ruby's 'vwait' is called");
+    if (interp == (Tcl_Interp*)NULL) {
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+                                             "IP is deleted");
+        return TCL_ERROR;
+    }
+
+#if 0
+    if (!rb_thread_alone() 
+	&& eventloop_thread != Qnil
+	&& eventloop_thread != rb_thread_current()) {
+#if TCL_MAJOR_VERSION >= 8
+        DUMP1("call ip_rb_threadVwaitObjCmd");
+        return ip_rb_threadVwaitObjCmd(clientData, interp, objc, objv);
+#else /* TCL_MAJOR_VERSION < 8 */
+        DUMP1("call ip_rb_threadVwaitCommand");
+        return ip_rb_threadVwaitCommand(clientData, interp, objc, objv);
+#endif
+    }
+#endif
+
+    Tcl_Preserve(interp);
+#ifdef HAVE_NATIVETHREAD
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on ip_ruby_eval()");
+    }
+#endif
+
+    if (objc != 2) {
+#ifdef Tcl_WrongNumArgs
+        Tcl_WrongNumArgs(interp, 1, objv, "name");
+#else
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+#if TCL_MAJOR_VERSION >= 8
+        /* nameString = Tcl_GetString(objv[0]); */
+        nameString = Tcl_GetStringFromObj(objv[0], &dummy);
+#else /* TCL_MAJOR_VERSION < 8 */
+        nameString = objv[0];
+#endif
+        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
+                         nameString, " name\"", (char *) NULL);
+
+        rb_thread_critical = thr_crit_bup;
+#endif
+
+        Tcl_Release(interp);
+        return TCL_ERROR;
+    }
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_IncrRefCount(objv[1]);
+    /* nameString = Tcl_GetString(objv[1]); */
+    nameString = Tcl_GetStringFromObj(objv[1], &dummy);
+#else /* TCL_MAJOR_VERSION < 8 */
+    nameString = objv[1];
+#endif
+
+    /* 
+    if (Tcl_TraceVar(interp, nameString,
+                     TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+                     VwaitVarProc, (ClientData) &done) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    */
+    ret = Tcl_TraceVar(interp, nameString,
+                       TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+                       VwaitVarProc, (ClientData) &done);
+
+    rb_thread_critical = thr_crit_bup;
+
+    if (ret != TCL_OK) {
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(objv[1]);
+#endif
+        Tcl_Release(interp);
+        return TCL_ERROR;
+    }
+
+    done = 0;
+
+    foundEvent = RTEST(lib_eventloop_launcher(/* not check root-widget */0, 
+                                              0, &done, interp));
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    Tcl_UntraceVar(interp, nameString,
+                   TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+                   VwaitVarProc, (ClientData) &done);
+
+    rb_thread_critical = thr_crit_bup;
+
+    /* exception check */
+    if (!NIL_P(rbtk_pending_exception)) {
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(objv[1]);
+#endif
+        Tcl_Release(interp);
+
+/*
+        if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)) {
+*/
+        if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)
+            || rb_obj_is_kind_of(rbtk_pending_exception, rb_eInterrupt)) {
+            return TCL_RETURN;
+        } else{
+            return TCL_ERROR;
+        }
+    }
+
+    /* trap check */
+    if (rb_trap_pending) {
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(objv[1]);
+#endif
+        Tcl_Release(interp);
+
+        return TCL_RETURN;
+    }
+
+    /*
+     * Clear out the interpreter's result, since it may have been set
+     * by event handlers.
+     */
+
+    Tcl_ResetResult(interp);
+    if (!foundEvent) {
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        Tcl_AppendResult(interp, "can't wait for variable \"", nameString,
+                         "\":  would wait forever", (char *) NULL);
+
+        rb_thread_critical = thr_crit_bup;
+
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(objv[1]);
+#endif
+        Tcl_Release(interp);
+        return TCL_ERROR;
+    }
+
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_DecrRefCount(objv[1]);
+#endif
+    Tcl_Release(interp);
+    return TCL_OK;
+}
+
+
+/**************************/
+/*  based on tkCmd.c      */
+/**************************/
+#if TCL_MAJOR_VERSION >= 8
+static char *WaitVariableProc _((ClientData, Tcl_Interp *, 
+                                 CONST84 char *,CONST84 char *, int));
+static char *
+WaitVariableProc(clientData, interp, name1, name2, flags)
+    ClientData clientData;      /* Pointer to integer to set to 1. */
+    Tcl_Interp *interp;         /* Interpreter containing variable. */
+    CONST84 char *name1;        /* Name of variable. */
+    CONST84 char *name2;        /* Second part of variable name. */
+    int flags;                  /* Information about what happened. */
+#else /* TCL_MAJOR_VERSION < 8 */
+static char *WaitVariableProc _((ClientData, Tcl_Interp *, 
+                                 char *, char *, int));
+static char *
+WaitVariableProc(clientData, interp, name1, name2, flags)
+    ClientData clientData;      /* Pointer to integer to set to 1. */
+    Tcl_Interp *interp;         /* Interpreter containing variable. */
+    char *name1;                /* Name of variable. */
+    char *name2;                /* Second part of variable name. */
+    int flags;                  /* Information about what happened. */
+#endif
+{
+    int *donePtr = (int *) clientData;
+
+    *donePtr = 1;
+    return (char *) NULL;
+}
+
+static void WaitVisibilityProc _((ClientData, XEvent *));
+static void
+WaitVisibilityProc(clientData, eventPtr)
+    ClientData clientData;      /* Pointer to integer to set to 1. */
+    XEvent *eventPtr;           /* Information about event (not used). */
+{
+    int *donePtr = (int *) clientData;
+
+    if (eventPtr->type == VisibilityNotify) {
+        *donePtr = 1;
+    }
+    if (eventPtr->type == DestroyNotify) {
+        *donePtr = 2;
+    }
+}
+
+static void WaitWindowProc _((ClientData, XEvent *));
+static void
+WaitWindowProc(clientData, eventPtr)
+    ClientData clientData;      /* Pointer to integer to set to 1. */
+    XEvent *eventPtr;           /* Information about event. */
+{
+    int *donePtr = (int *) clientData;
+
+    if (eventPtr->type == DestroyNotify) {
+        *donePtr = 1;
+    }
+}
+
+#if TCL_MAJOR_VERSION >= 8
+static int
+ip_rbTkWaitObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int objc;
+    Tcl_Obj *CONST objv[];
+#else /* TCL_MAJOR_VERSION < 8 */
+static int
+ip_rbTkWaitCommand(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int objc;
+    char *objv[];
+#endif
+{
+    Tk_Window tkwin = (Tk_Window) clientData;
+    Tk_Window window;
+    int done, index;
+    static CONST char *optionStrings[] = { "variable", "visibility", "window",
+                                           (char *) NULL };
+    enum options { TKWAIT_VARIABLE, TKWAIT_VISIBILITY, TKWAIT_WINDOW };
+    char *nameString;
+    int ret, dummy;
+    int thr_crit_bup;
+
+    DUMP1("Ruby's 'tkwait' is called");
+    if (interp == (Tcl_Interp*)NULL) {
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+                                             "IP is deleted");
+        return TCL_ERROR;
+    }
+
+#if 0
+    if (!rb_thread_alone() 
+	&& eventloop_thread != Qnil
+	&& eventloop_thread != rb_thread_current()) {
+#if TCL_MAJOR_VERSION >= 8
+        DUMP1("call ip_rb_threadTkWaitObjCmd");
+        return ip_rb_threadTkWaitObjCmd(clientData, interp, objc, objv);
+#else /* TCL_MAJOR_VERSION < 8 */
+        DUMP1("call ip_rb_threadTkWaitCommand");
+        return ip_rb_threadTkWwaitCommand(clientData, interp, objc, objv);
+#endif
+    }
+#endif
+
+    Tcl_Preserve(interp);
+
+    if (objc != 3) {
+#ifdef Tcl_WrongNumArgs
+        Tcl_WrongNumArgs(interp, 1, objv, "variable|visibility|window name");
+#else
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
+                         Tcl_GetStringFromObj(objv[0], &dummy), 
+                         " variable|visibility|window name\"", 
+                         (char *) NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
+                         objv[0], " variable|visibility|window name\"", 
+                         (char *) NULL);
+#endif
+
+        rb_thread_critical = thr_crit_bup;
+#endif
+
+        Tcl_Release(interp);
+        return TCL_ERROR;
+    }
+
+#if TCL_MAJOR_VERSION >= 8
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    /*
+    if (Tcl_GetIndexFromObj(interp, objv[1], 
+                            (CONST84 char **)optionStrings, 
+                            "option", 0, &index) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    */
+    ret = Tcl_GetIndexFromObj(interp, objv[1], 
+                              (CONST84 char **)optionStrings, 
+                              "option", 0, &index);
+
+    rb_thread_critical = thr_crit_bup;
+
+    if (ret != TCL_OK) {
+        Tcl_Release(interp);
+        return TCL_ERROR;
+    }
+#else /* TCL_MAJOR_VERSION < 8 */
+    {
+        int c = objv[1][0];
+        size_t length = strlen(objv[1]);
+
+        if ((c == 'v') && (strncmp(objv[1], "variable", length) == 0)
+            && (length >= 2)) {
+            index = TKWAIT_VARIABLE;
+        } else if ((c == 'v') && (strncmp(objv[1], "visibility", length) == 0)
+                   && (length >= 2)) {
+            index = TKWAIT_VISIBILITY;
+        } else if ((c == 'w') && (strncmp(objv[1], "window", length) == 0)) {
+            index = TKWAIT_WINDOW;
+        } else {
+            Tcl_AppendResult(interp, "bad option \"", objv[1],
+                             "\": must be variable, visibility, or window", 
+                             (char *) NULL);
+            Tcl_Release(interp);
+            return TCL_ERROR;
+        }
+    }
+#endif
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_IncrRefCount(objv[2]);
+    /* nameString = Tcl_GetString(objv[2]); */
+    nameString = Tcl_GetStringFromObj(objv[2], &dummy);
+#else /* TCL_MAJOR_VERSION < 8 */
+    nameString = objv[2];
+#endif
+
+    rb_thread_critical = thr_crit_bup;
+
+    switch ((enum options) index) {
+    case TKWAIT_VARIABLE:
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+        /*
+        if (Tcl_TraceVar(interp, nameString,
+                         TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+                         WaitVariableProc, (ClientData) &done) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        */
+        ret = Tcl_TraceVar(interp, nameString,
+                           TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+                           WaitVariableProc, (ClientData) &done);
+
+        rb_thread_critical = thr_crit_bup;
+
+        if (ret != TCL_OK) {
+#if TCL_MAJOR_VERSION >= 8
+            Tcl_DecrRefCount(objv[2]);
+#endif
+            Tcl_Release(interp);
+            return TCL_ERROR;
+        }
+
+        done = 0;
+        /* lib_eventloop_core(check_rootwidget_flag, 0, &done); */
+        lib_eventloop_launcher(check_rootwidget_flag, 0, &done, interp);
+
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        Tcl_UntraceVar(interp, nameString,
+                       TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+                       WaitVariableProc, (ClientData) &done);
+
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(objv[2]);
+#endif
+
+        rb_thread_critical = thr_crit_bup;
+
+        /* exception check */
+        if (!NIL_P(rbtk_pending_exception)) {
+            Tcl_Release(interp);
+
+            /*
+            if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)) {
+            */
+            if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)
+                || rb_obj_is_kind_of(rbtk_pending_exception, rb_eInterrupt)) {
+                return TCL_RETURN;
+            } else{
+                return TCL_ERROR;
+            }
+        }
+
+        /* trap check */
+        if (rb_trap_pending) {
+            Tcl_Release(interp);
+
+            return TCL_RETURN;
+        }
+
+        break;
+
+    case TKWAIT_VISIBILITY:
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
+            window = NULL;
+        } else {
+            window = Tk_NameToWindow(interp, nameString, tkwin);
+        }
+
+        if (window == NULL) {
+            Tcl_AppendResult(interp, "tkwait: ", 
+                             "no main-window (not Tk application?)", 
+                             (char*)NULL);
+            rb_thread_critical = thr_crit_bup;
+#if TCL_MAJOR_VERSION >= 8
+            Tcl_DecrRefCount(objv[2]);
+#endif
+            Tcl_Release(interp);
+            return TCL_ERROR;
+        }
+
+        Tk_CreateEventHandler(window,
+                              VisibilityChangeMask|StructureNotifyMask,
+                              WaitVisibilityProc, (ClientData) &done);
+
+        rb_thread_critical = thr_crit_bup;
+
+        done = 0;
+        /* lib_eventloop_core(check_rootwidget_flag, 0, &done); */
+        lib_eventloop_launcher(check_rootwidget_flag, 0, &done, interp);
+
+        /* exception check */
+        if (!NIL_P(rbtk_pending_exception)) {
+#if TCL_MAJOR_VERSION >= 8
+            Tcl_DecrRefCount(objv[2]);
+#endif
+            Tcl_Release(interp);
+
+            /*
+            if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)) {
+            */
+            if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)
+                || rb_obj_is_kind_of(rbtk_pending_exception, rb_eInterrupt)) {
+                return TCL_RETURN;
+            } else{
+                return TCL_ERROR;
+            }
+        }
+
+        /* trap check */
+        if (rb_trap_pending) {
+#if TCL_MAJOR_VERSION >= 8
+            Tcl_DecrRefCount(objv[2]);
+#endif
+            Tcl_Release(interp);
+
+            return TCL_RETURN;
+        }
+
+        if (done != 1) {
+            /*
+             * Note that we do not delete the event handler because it
+             * was deleted automatically when the window was destroyed.
+             */
+            thr_crit_bup = rb_thread_critical;
+            rb_thread_critical = Qtrue;
+
+            Tcl_ResetResult(interp);
+            Tcl_AppendResult(interp, "window \"", nameString,
+                             "\" was deleted before its visibility changed",
+                             (char *) NULL);
+
+            rb_thread_critical = thr_crit_bup;
+
+#if TCL_MAJOR_VERSION >= 8
+            Tcl_DecrRefCount(objv[2]);
+#endif
+            Tcl_Release(interp);
+            return TCL_ERROR;
+        }
+
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(objv[2]);
+#endif
+
+        Tk_DeleteEventHandler(window,
+                              VisibilityChangeMask|StructureNotifyMask,
+                              WaitVisibilityProc, (ClientData) &done);
+
+        rb_thread_critical = thr_crit_bup;
+
+        break;
+
+    case TKWAIT_WINDOW:
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+            
+        if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
+            window = NULL;
+        } else {
+            window = Tk_NameToWindow(interp, nameString, tkwin);
+        }
+
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(objv[2]);
+#endif
+
+        if (window == NULL) {
+            Tcl_AppendResult(interp, "tkwait: ", 
+                             "no main-window (not Tk application?)", 
+                             (char*)NULL);
+            rb_thread_critical = thr_crit_bup;
+            Tcl_Release(interp);
+            return TCL_ERROR;
+        }
+
+        Tk_CreateEventHandler(window, StructureNotifyMask,
+                              WaitWindowProc, (ClientData) &done);
+
+        rb_thread_critical = thr_crit_bup;
+
+        done = 0;
+        /* lib_eventloop_core(check_rootwidget_flag, 0, &done); */
+        lib_eventloop_launcher(check_rootwidget_flag, 0, &done, interp);
+
+        /* exception check */
+        if (!NIL_P(rbtk_pending_exception)) {
+            Tcl_Release(interp);
+
+            /*
+            if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)) {
+            */
+            if (rb_obj_is_kind_of(rbtk_pending_exception, rb_eSystemExit)
+                || rb_obj_is_kind_of(rbtk_pending_exception, rb_eInterrupt)) {
+                return TCL_RETURN;
+            } else{
+                return TCL_ERROR;
+            }
+        }
+
+        /* trap check */
+        if (rb_trap_pending) {
+            Tcl_Release(interp);
+
+            return TCL_RETURN;
+        }
+
+        /*
+         * Note:  there's no need to delete the event handler.  It was
+         * deleted automatically when the window was destroyed.
+         */
+        break;
+    }
+
+    /*
+     * Clear out the interpreter's result, since it may have been set
+     * by event handlers.
+     */
+
+    Tcl_ResetResult(interp);
+    Tcl_Release(interp);
+    return TCL_OK;
+}
+
+/****************************/
+/* vwait/tkwait with thread */
+/****************************/
+struct th_vwait_param {
+    VALUE thread;
+    int   done;
+};
+
+#if TCL_MAJOR_VERSION >= 8
+static char *rb_threadVwaitProc _((ClientData, Tcl_Interp *, 
+                                   CONST84 char *,CONST84 char *, int));
+static char *
+rb_threadVwaitProc(clientData, interp, name1, name2, flags)
+    ClientData clientData;      /* Pointer to integer to set to 1. */
+    Tcl_Interp *interp;         /* Interpreter containing variable. */
+    CONST84 char *name1;        /* Name of variable. */
+    CONST84 char *name2;        /* Second part of variable name. */
+    int flags;                  /* Information about what happened. */
+#else /* TCL_MAJOR_VERSION < 8 */
+static char *rb_threadVwaitProc _((ClientData, Tcl_Interp *, 
+                                   char *, char *, int));
+static char *
+rb_threadVwaitProc(clientData, interp, name1, name2, flags)
+    ClientData clientData;      /* Pointer to integer to set to 1. */
+    Tcl_Interp *interp;         /* Interpreter containing variable. */
+    char *name1;                /* Name of variable. */
+    char *name2;                /* Second part of variable name. */
+    int flags;                  /* Information about what happened. */
+#endif
+{
+    struct th_vwait_param *param = (struct th_vwait_param *) clientData;
+
+    if (flags & (TCL_INTERP_DESTROYED | TCL_TRACE_DESTROYED)) {
+        param->done = -1;
+    } else {
+        param->done = 1;
+    }
+    rb_thread_wakeup(param->thread);
+
+    return (char *)NULL;
+}
+
+#define TKWAIT_MODE_VISIBILITY 1
+#define TKWAIT_MODE_DESTROY    2
+
+static void rb_threadWaitVisibilityProc _((ClientData, XEvent *));
+static void
+rb_threadWaitVisibilityProc(clientData, eventPtr)
+    ClientData clientData;      /* Pointer to integer to set to 1. */
+    XEvent *eventPtr;           /* Information about event (not used). */
+{
+    struct th_vwait_param *param = (struct th_vwait_param *) clientData;
+
+    if (eventPtr->type == VisibilityNotify) {
+        param->done = TKWAIT_MODE_VISIBILITY;
+    }
+    if (eventPtr->type == DestroyNotify) {
+        param->done = TKWAIT_MODE_DESTROY;
+    }
+    rb_thread_wakeup(param->thread);
+}
+
+static void rb_threadWaitWindowProc _((ClientData, XEvent *));
+static void
+rb_threadWaitWindowProc(clientData, eventPtr)
+    ClientData clientData;      /* Pointer to integer to set to 1. */
+    XEvent *eventPtr;           /* Information about event. */
+{
+    struct th_vwait_param *param = (struct th_vwait_param *) clientData;
+
+    if (eventPtr->type == DestroyNotify) {
+        param->done = TKWAIT_MODE_DESTROY;
+    }
+    rb_thread_wakeup(param->thread);
+}
+
+#if TCL_MAJOR_VERSION >= 8
+static int
+ip_rb_threadVwaitObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int objc;
+    Tcl_Obj *CONST objv[];
+#else /* TCL_MAJOR_VERSION < 8 */
+static int
+ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int objc;
+    char *objv[];
+#endif
+{
+    struct th_vwait_param *param;
+    char *nameString;
+    int ret, dummy;
+    int thr_crit_bup;
+    volatile VALUE current_thread = rb_thread_current();
+
+    DUMP1("Ruby's 'thread_vwait' is called");
+    if (interp == (Tcl_Interp*)NULL) {
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+                                             "IP is deleted");
+        return TCL_ERROR;
+    }
+
+    if (rb_thread_alone() || eventloop_thread == current_thread) {
+#if TCL_MAJOR_VERSION >= 8
+        DUMP1("call ip_rbVwaitObjCmd");
+        return ip_rbVwaitObjCmd(clientData, interp, objc, objv);
+#else /* TCL_MAJOR_VERSION < 8 */
+        DUMP1("call ip_rbVwaitCommand");
+        return ip_rbVwaitCommand(clientData, interp, objc, objv);
+#endif
+    }
+
+    Tcl_Preserve(interp);
+
+    if (objc != 2) {
+#ifdef Tcl_WrongNumArgs
+        Tcl_WrongNumArgs(interp, 1, objv, "name");
+#else
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+#if TCL_MAJOR_VERSION >= 8
+        /* nameString = Tcl_GetString(objv[0]); */
+        nameString = Tcl_GetStringFromObj(objv[0], &dummy);
+#else /* TCL_MAJOR_VERSION < 8 */
+        nameString = objv[0];
+#endif
+        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
+                         nameString, " name\"", (char *) NULL);
+
+        rb_thread_critical = thr_crit_bup;
+#endif
+
+        Tcl_Release(interp);
+        return TCL_ERROR;
+    }
+
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_IncrRefCount(objv[1]);
+    /* nameString = Tcl_GetString(objv[1]); */
+    nameString = Tcl_GetStringFromObj(objv[1], &dummy);
+#else /* TCL_MAJOR_VERSION < 8 */
+    nameString = objv[1];
+#endif
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param));
+    Tcl_Preserve(param);
+    param->thread = current_thread;
+    param->done = 0;
+
+    /*
+    if (Tcl_TraceVar(interp, nameString,
+                     TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+                     rb_threadVwaitProc, (ClientData) param) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    */
+    ret = Tcl_TraceVar(interp, nameString,
+                       TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+                       rb_threadVwaitProc, (ClientData) param);
+
+    rb_thread_critical = thr_crit_bup;
+
+    if (ret != TCL_OK) {
+        Tcl_Release(param);
+        Tcl_Free((char *)param);
+
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(objv[1]);
+#endif
+        Tcl_Release(interp);
+        return TCL_ERROR;
+    }
+
+    /* if (!param->done) { */
+    while(!param->done) {
+        rb_thread_stop();
+    }
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    if (param->done > 0) {
+        Tcl_UntraceVar(interp, nameString,
+                       TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+                       rb_threadVwaitProc, (ClientData) param);
+    }
+
+    Tcl_Release(param);
+    Tcl_Free((char *)param);
+
+    rb_thread_critical = thr_crit_bup;
+
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_DecrRefCount(objv[1]);
+#endif
+    Tcl_Release(interp);
+    return TCL_OK;
+}
+
+#if TCL_MAJOR_VERSION >= 8
+static int
+ip_rb_threadTkWaitObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int objc;
+    Tcl_Obj *CONST objv[];
+#else /* TCL_MAJOR_VERSION < 8 */
+static int
+ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int objc;
+    char *objv[];
+#endif
+{
+    struct th_vwait_param *param;
+    Tk_Window tkwin = (Tk_Window) clientData;
+    Tk_Window window;
+    int index;
+    static CONST char *optionStrings[] = { "variable", "visibility", "window",
+                                           (char *) NULL };
+    enum options { TKWAIT_VARIABLE, TKWAIT_VISIBILITY, TKWAIT_WINDOW };
+    char *nameString;
+    int ret, dummy;
+    int thr_crit_bup;
+    volatile VALUE current_thread = rb_thread_current();
+
+    DUMP1("Ruby's 'thread_tkwait' is called");
+    if (interp == (Tcl_Interp*)NULL) {
+        rbtk_pending_exception = rb_exc_new2(rb_eRuntimeError, 
+                                             "IP is deleted");
+        return TCL_ERROR;
+    }
+
+    if (rb_thread_alone() || eventloop_thread == current_thread) {
+#if TCL_MAJOR_VERSION >= 8
+        DUMP1("call ip_rbTkWaitObjCmd");
+        return ip_rbTkWaitObjCmd(clientData, interp, objc, objv);
+#else /* TCL_MAJOR_VERSION < 8 */
+        DUMP1("call rb_VwaitCommand");
+        return ip_rbTkWaitCommand(clientData, interp, objc, objv);
+#endif
+    }
+
+    Tcl_Preserve(interp);
+    Tcl_Preserve(tkwin);
+
+    if (objc != 3) {
+#ifdef Tcl_WrongNumArgs
+        Tcl_WrongNumArgs(interp, 1, objv, "variable|visibility|window name");
+#else
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
+                         Tcl_GetStringFromObj(objv[0], &dummy), 
+                         " variable|visibility|window name\"", 
+                         (char *) NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+        Tcl_AppendResult(interp, "wrong number of arguments: should be \"",
+                         objv[0], " variable|visibility|window name\"", 
+                         (char *) NULL);
+#endif
+
+        rb_thread_critical = thr_crit_bup;
+#endif
+
+        Tcl_Release(tkwin);
+        Tcl_Release(interp);
+        return TCL_ERROR;
+    }
+
+#if TCL_MAJOR_VERSION >= 8
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+    /*
+    if (Tcl_GetIndexFromObj(interp, objv[1], 
+                            (CONST84 char **)optionStrings, 
+                            "option", 0, &index) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    */
+    ret = Tcl_GetIndexFromObj(interp, objv[1], 
+                              (CONST84 char **)optionStrings, 
+                              "option", 0, &index);
+
+    rb_thread_critical = thr_crit_bup;
+
+    if (ret != TCL_OK) {
+        Tcl_Release(tkwin);
+        Tcl_Release(interp);
+        return TCL_ERROR;
+    }
+#else /* TCL_MAJOR_VERSION < 8 */
+    {
+        int c = objv[1][0];
+        size_t length = strlen(objv[1]);
+
+        if ((c == 'v') && (strncmp(objv[1], "variable", length) == 0)
+            && (length >= 2)) {
+            index = TKWAIT_VARIABLE;
+        } else if ((c == 'v') && (strncmp(objv[1], "visibility", length) == 0)
+                   && (length >= 2)) {
+            index = TKWAIT_VISIBILITY;
+        } else if ((c == 'w') && (strncmp(objv[1], "window", length) == 0)) {
+            index = TKWAIT_WINDOW;
+        } else {
+            Tcl_AppendResult(interp, "bad option \"", objv[1],
+                             "\": must be variable, visibility, or window", 
+                             (char *) NULL);
+            Tcl_Release(tkwin);
+            Tcl_Release(interp);
+            return TCL_ERROR;
+        }
+    }
+#endif
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_IncrRefCount(objv[2]);
+    /* nameString = Tcl_GetString(objv[2]); */
+    nameString = Tcl_GetStringFromObj(objv[2], &dummy);
+#else /* TCL_MAJOR_VERSION < 8 */
+    nameString = objv[2];
+#endif
+
+    param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param));
+    Tcl_Preserve(param);
+    param->thread = current_thread;
+    param->done = 0;
+
+    rb_thread_critical = thr_crit_bup;
+
+    switch ((enum options) index) {
+    case TKWAIT_VARIABLE:
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+        /* 
+        if (Tcl_TraceVar(interp, nameString,
+                         TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+                         rb_threadVwaitProc, (ClientData) param) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        */
+        ret = Tcl_TraceVar(interp, nameString,
+                         TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+                         rb_threadVwaitProc, (ClientData) param);
+
+        rb_thread_critical = thr_crit_bup;
+
+        if (ret != TCL_OK) {
+            Tcl_Release(param);
+            Tcl_Free((char *)param);
+
+#if TCL_MAJOR_VERSION >= 8
+            Tcl_DecrRefCount(objv[2]);
+#endif
+
+            Tcl_Release(tkwin);
+            Tcl_Release(interp);
+            return TCL_ERROR;
+        }
+
+        /* if (!param->done) { */
+        while(!param->done) {
+            rb_thread_stop();
+        }
+
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        if (param->done > 0) {
+            Tcl_UntraceVar(interp, nameString,
+                           TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+                           rb_threadVwaitProc, (ClientData) param);
+        }
+
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(objv[2]);
+#endif
+
+        rb_thread_critical = thr_crit_bup;
+
+        break;
+
+    case TKWAIT_VISIBILITY:
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
+            window = NULL;
+        } else {
+            window = Tk_NameToWindow(interp, nameString, tkwin);
+        }
+
+        if (window == NULL) {
+            Tcl_AppendResult(interp, "thread_tkwait: ", 
+                             "no main-window (not Tk application?)", 
+                             (char*)NULL);
+
+            rb_thread_critical = thr_crit_bup;
+
+            Tcl_Release(param);
+            Tcl_Free((char *)param);
+
+#if TCL_MAJOR_VERSION >= 8
+            Tcl_DecrRefCount(objv[2]);
+#endif
+            Tcl_Release(tkwin);
+            Tcl_Release(interp);
+            return TCL_ERROR;
+        }
+        Tcl_Preserve(window);
+
+        Tk_CreateEventHandler(window,
+                              VisibilityChangeMask|StructureNotifyMask,
+                              rb_threadWaitVisibilityProc, (ClientData) param);
+
+        rb_thread_critical = thr_crit_bup;
+
+        /* if (!param->done) { */
+        /*
+        while(!param->done) {
+            rb_thread_stop();
+        }
+        */
+        while(param->done != TKWAIT_MODE_VISIBILITY) {
+            if (param->done == TKWAIT_MODE_DESTROY) break;
+            rb_thread_stop();
+        }
+
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        /* when a window is destroyed, no need to call Tk_DeleteEventHandler */
+        if (param->done != TKWAIT_MODE_DESTROY) {
+            Tk_DeleteEventHandler(window,
+                                  VisibilityChangeMask|StructureNotifyMask,
+                                  rb_threadWaitVisibilityProc, 
+                                  (ClientData) param);
+        }
+
+        if (param->done != 1) {
+            Tcl_ResetResult(interp);
+            Tcl_AppendResult(interp, "window \"", nameString,
+                             "\" was deleted before its visibility changed",
+                             (char *) NULL);
+
+            rb_thread_critical = thr_crit_bup;
+
+            Tcl_Release(window);
+
+            Tcl_Release(param);
+            Tcl_Free((char *)param);
+
+#if TCL_MAJOR_VERSION >= 8
+            Tcl_DecrRefCount(objv[2]);
+#endif
+
+            Tcl_Release(tkwin);
+            Tcl_Release(interp);
+            return TCL_ERROR;
+        }
+
+        Tcl_Release(window);
+
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(objv[2]);
+#endif
+
+        rb_thread_critical = thr_crit_bup;
+
+        break;
+
+    case TKWAIT_WINDOW:
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        if (!tk_stubs_init_p() || Tk_MainWindow(interp) == (Tk_Window)NULL) {
+            window = NULL;
+        } else {
+            window = Tk_NameToWindow(interp, nameString, tkwin);
+        }
+
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(objv[2]);
+#endif
+
+        if (window == NULL) {
+            Tcl_AppendResult(interp, "thread_tkwait: ", 
+                             "no main-window (not Tk application?)", 
+                             (char*)NULL);
+
+            rb_thread_critical = thr_crit_bup;
+
+            Tcl_Release(param);
+            Tcl_Free((char *)param);
+
+            Tcl_Release(tkwin);
+            Tcl_Release(interp);
+            return TCL_ERROR;
+        }
+
+        Tcl_Preserve(window);
+
+        Tk_CreateEventHandler(window, StructureNotifyMask,
+                              rb_threadWaitWindowProc, (ClientData) param);
+
+        rb_thread_critical = thr_crit_bup;
+
+        /* if (!param->done) { */
+        /* 
+        while(!param->done) {
+            rb_thread_stop();
+        }
+        */
+        while(param->done != TKWAIT_MODE_DESTROY) {
+            rb_thread_stop();
+        }
+
+        Tcl_Release(window);
+
+        /* when a window is destroyed, no need to call Tk_DeleteEventHandler
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        Tk_DeleteEventHandler(window, StructureNotifyMask,
+                              rb_threadWaitWindowProc, (ClientData) param);
+
+        rb_thread_critical = thr_crit_bup;
+        */
+
+        break;
+    } /* end of 'switch' statement */
+
+    Tcl_Release(param);
+    Tcl_Free((char *)param);
+
+    /*
+     * Clear out the interpreter's result, since it may have been set
+     * by event handlers.
+     */
+
+    Tcl_ResetResult(interp);
+
+    Tcl_Release(tkwin);
+    Tcl_Release(interp);
+    return TCL_OK;
+}
+
+static VALUE
+ip_thread_vwait(self, var)
+    VALUE self;
+    VALUE var;
+{
+    VALUE argv[2];
+    volatile VALUE cmd_str = rb_str_new2("thread_vwait");
+
+    argv[0] = cmd_str;
+    argv[1] = var;
+
+    return ip_invoke_real(2, argv, self);
+}
+
+static VALUE
+ip_thread_tkwait(self, mode, target)
+    VALUE self;
+    VALUE mode;
+    VALUE target;
+{
+    VALUE argv[3];
+    volatile VALUE cmd_str = rb_str_new2("thread_tkwait");
+
+    argv[0] = cmd_str;
+    argv[1] = mode;
+    argv[2] = target;
+
+    return ip_invoke_real(3, argv, self);
+}
+
+
+/* delete slave interpreters */
+#if TCL_MAJOR_VERSION >= 8
+static void
+delete_slaves(ip)
+    Tcl_Interp *ip;
+{
+    int  thr_crit_bup;
+    Tcl_Interp *slave;
+    Tcl_Obj *slave_list, *elem;
+    char *slave_name;
+    int i, len;
+
+    DUMP1("delete slaves");
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    if (!Tcl_InterpDeleted(ip) && Tcl_Eval(ip, "interp slaves") == TCL_OK) {
+        slave_list = Tcl_GetObjResult(ip);
+        Tcl_IncrRefCount(slave_list);
+
+        if (Tcl_ListObjLength((Tcl_Interp*)NULL, slave_list, &len) == TCL_OK) {
+            for(i = 0; i < len; i++) {
+                Tcl_ListObjIndex((Tcl_Interp*)NULL, slave_list, i, &elem);
+
+                if (elem == (Tcl_Obj*)NULL) continue;
+
+                Tcl_IncrRefCount(elem);
+
+                /* get slave */
+                /* slave_name = Tcl_GetString(elem); */
+                slave_name = Tcl_GetStringFromObj(elem, (int*)NULL);
+                DUMP2("delete slave:'%s'", slave_name);
+
+                Tcl_DecrRefCount(elem);
+
+                slave = Tcl_GetSlave(ip, slave_name);
+                if (slave == (Tcl_Interp*)NULL) continue;
+
+                /* call ip_finalize */
+                ip_finalize(slave);
+
+                Tcl_DeleteInterp(slave);
+                /* Tcl_Release(slave); */
+            }
+        }
+
+        Tcl_DecrRefCount(slave_list);
+    }
+
+    rb_thread_critical = thr_crit_bup;
+}
+#else /* TCL_MAJOR_VERSION < 8 */
+static void
+delete_slaves(ip)
+    Tcl_Interp *ip;
+{
+    int  thr_crit_bup;
+    Tcl_Interp *slave;
+    int argc;
+    char **argv;
+    char *slave_list;
+    char *slave_name;
+    int i, len;
+
+    DUMP1("delete slaves");
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    if (!Tcl_InterpDeleted(ip) && Tcl_Eval(ip, "interp slaves") == TCL_OK) {
+        slave_list = ip->result;
+        if (Tcl_SplitList((Tcl_Interp*)NULL, 
+                          slave_list, &argc, &argv) == TCL_OK) {
+            for(i = 0; i < argc; i++) {
+                slave_name = argv[i];
+
+                DUMP2("delete slave:'%s'", slave_name);
+
+                slave = Tcl_GetSlave(ip, slave_name);
+                if (slave == (Tcl_Interp*)NULL) continue;
+
+                /* call ip_finalize */
+                ip_finalize(slave);
+
+                Tcl_DeleteInterp(slave);
+            }
+        }
+    }
+
+    rb_thread_critical = thr_crit_bup;
+}
+#endif
+
+
+/* finalize operation */
+static VALUE
+lib_mark_at_exit(self)
+    VALUE self;
+{
+    at_exit = 1;
+    return Qnil;
+}
+
+static int
+#if TCL_MAJOR_VERSION >= 8
+ip_null_proc(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int argc;
+    Tcl_Obj *CONST argv[];
+#else /* TCL_MAJOR_VERSION < 8 */
+ip_null_proc(clientData, interp, argc, argv)
+    ClientData clientData;
+    Tcl_Interp *interp;
+    int argc;
+    char *argv[];
+#endif
+{
+    Tcl_ResetResult(interp);
+    return TCL_OK;
+}
+
+static void
+ip_finalize(ip)
+    Tcl_Interp *ip;
+{
+    Tcl_CmdInfo info;
+    int  thr_crit_bup;
+
+    VALUE rb_debug_bup, rb_verbose_bup;
+          /* When ruby is exiting, printing debug messages in some callback 
+             operations from Tcl-IP sometimes cause SEGV. I don't know the 
+             reason. But I got SEGV when calling "rb_io_write(rb_stdout, ...)".
+             So, in some part of this function, debug mode and verbose mode 
+             are disabled. If you know the reason, please fix it.
+                           --  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)  */
+
+    DUMP1("start ip_finalize");
+
+    if (ip == (Tcl_Interp*)NULL) {
+        DUMP1("ip is NULL");
+        return;
+    }
+
+    if (Tcl_InterpDeleted(ip)) {
+        DUMP2("ip(%p) is already deleted", ip);
+        return;
+    }
+
+#if TCL_NAMESPACE_DEBUG
+    if (ip_null_namespace(ip)) {
+        DUMP2("ip(%p) has null namespace", ip);
+        return;
+    }
+#endif
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    rb_debug_bup   = ruby_debug;
+    rb_verbose_bup = ruby_verbose;
+
+    Tcl_Preserve(ip);
+
+    /* delete slaves */
+    delete_slaves(ip);
+
+    /* shut off some connections from Tcl-proc to Ruby */
+    if (at_exit) {
+	/* NOTE: Only when at exit. 
+	   Because, ruby removes objects, which depends on the deleted 
+	   interpreter, on some callback operations. 
+	   It is important for GC. */
+#if TCL_MAJOR_VERSION >= 8
+	Tcl_CreateObjCommand(ip, "ruby", ip_null_proc, 
+			     (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+	Tcl_CreateObjCommand(ip, "ruby_eval", ip_null_proc, 
+			     (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+	Tcl_CreateObjCommand(ip, "ruby_cmd", ip_null_proc, 
+			     (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+	Tcl_CreateCommand(ip, "ruby", ip_null_proc, 
+			  (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+	Tcl_CreateCommand(ip, "ruby_eval", ip_null_proc, 
+			  (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+	Tcl_CreateCommand(ip, "ruby_cmd", ip_null_proc, 
+			  (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+#endif
+    }
+
+    /* delete root widget */
+#if 0
+    DUMP1("check `destroy'");
+    if (Tcl_GetCommandInfo(ip, "destroy", &info)) {
+        DUMP1("call `destroy'");
+        Tcl_GlobalEval(ip, "destroy .");
+    }
+#endif
+#if 1
+    DUMP1("destroy root widget");
+    if (tk_stubs_init_p() && Tk_MainWindow(ip) != (Tk_Window)NULL) {
+        DUMP1("call Tk_DestroyWindow");
+        ruby_debug   = Qfalse;
+        ruby_verbose = Qnil;
+        Tk_DestroyWindow(Tk_MainWindow(ip));
+        ruby_debug   = rb_debug_bup;
+        ruby_verbose = rb_verbose_bup;
+    }
+#endif
+
+    /* call finalize-hook-proc */
+    DUMP1("check `finalize-hook-proc'");
+    if ( Tcl_GetCommandInfo(ip, finalize_hook_name, &info)) {
+        DUMP2("call finalize hook proc '%s'", finalize_hook_name);
+        ruby_debug   = Qfalse;
+        ruby_verbose = Qnil;
+        Tcl_GlobalEval(ip, finalize_hook_name);
+        ruby_debug   = rb_debug_bup;
+        ruby_verbose = rb_verbose_bup;
+    }
+
+    DUMP1("check `foreach' & `after'");
+    if ( Tcl_GetCommandInfo(ip, "foreach", &info)
+         && Tcl_GetCommandInfo(ip, "after", &info) ) {
+        DUMP1("cancel after callbacks");
+        ruby_debug   = Qfalse;
+        ruby_verbose = Qnil;
+        Tcl_GlobalEval(ip, "foreach id [after info] {after cancel $id}");
+        ruby_debug   = rb_debug_bup;
+        ruby_verbose = rb_verbose_bup;
+    }
+
+    Tcl_Release(ip);
+
+    DUMP1("finish ip_finalize");
+    ruby_debug   = rb_debug_bup;
+    ruby_verbose = rb_verbose_bup;
+    rb_thread_critical = thr_crit_bup;
+}
+
+
+/* destroy interpreter */
+static void
+ip_free(ptr)
+    struct tcltkip *ptr;
+{
+    int  thr_crit_bup;
+
+    DUMP2("free Tcl Interp %lx", (unsigned long)ptr->ip);
+    if (ptr) {
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        if ( ptr->ip != (Tcl_Interp*)NULL 
+             && !Tcl_InterpDeleted(ptr->ip)
+             && Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL 
+             && !Tcl_InterpDeleted(Tcl_GetMaster(ptr->ip)) ) {
+            DUMP2("parent IP(%lx) is not deleted", 
+                  (unsigned long)Tcl_GetMaster(ptr->ip));
+            DUMP2("slave IP(%lx) should not be deleted", 
+                  (unsigned long)ptr->ip);
+            free(ptr);
+            rb_thread_critical = thr_crit_bup;
+            return;
+        }
+
+        if (ptr->ip == (Tcl_Interp*)NULL) {
+            DUMP1("ip_free is called for deleted IP");
+            free(ptr);
+            rb_thread_critical = thr_crit_bup;
+            return;
+        }
+
+        ip_finalize(ptr->ip);
+        Tcl_DeleteInterp(ptr->ip); 
+        Tcl_Release(ptr->ip); 
+
+        ptr->ip = (Tcl_Interp*)NULL;
+        free(ptr);
+
+        rb_thread_critical = thr_crit_bup;
+    }
+
+    DUMP1("complete freeing Tcl Interp");
+}
+
+
+/* create and initialize interpreter */
+static VALUE ip_alloc _((VALUE));
+static VALUE
+ip_alloc(self)
+    VALUE self;
+{
+    return Data_Wrap_Struct(self, 0, ip_free, 0);
+}
+
+static void
+ip_replace_wait_commands(interp, mainWin)
+    Tcl_Interp *interp;
+    Tk_Window mainWin;
+{
+    /* replace 'vwait' command */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"vwait\")");
+    Tcl_CreateObjCommand(interp, "vwait", ip_rbVwaitObjCmd, 
+                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP1("Tcl_CreateCommand(\"vwait\")");
+    Tcl_CreateCommand(interp, "vwait", ip_rbVwaitCommand, 
+                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* replace 'tkwait' command */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"tkwait\")");
+    Tcl_CreateObjCommand(interp, "tkwait", ip_rbTkWaitObjCmd, 
+                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP1("Tcl_CreateCommand(\"tkwait\")");
+    Tcl_CreateCommand(interp, "tkwait", ip_rbTkWaitCommand, 
+                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* add 'thread_vwait' command */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"thread_vwait\")");
+    Tcl_CreateObjCommand(interp, "thread_vwait", ip_rb_threadVwaitObjCmd, 
+                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP1("Tcl_CreateCommand(\"thread_vwait\")");
+    Tcl_CreateCommand(interp, "thread_vwait", ip_rb_threadVwaitCommand, 
+                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* add 'thread_tkwait' command */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"thread_tkwait\")");
+    Tcl_CreateObjCommand(interp, "thread_tkwait", ip_rb_threadTkWaitObjCmd, 
+                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP1("Tcl_CreateCommand(\"thread_tkwait\")");
+    Tcl_CreateCommand(interp, "thread_tkwait", ip_rb_threadTkWaitCommand, 
+                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* replace 'update' command */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"update\")");
+    Tcl_CreateObjCommand(interp, "update", ip_rbUpdateObjCmd, 
+                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP1("Tcl_CreateCommand(\"update\")");
+    Tcl_CreateCommand(interp, "update", ip_rbUpdateCommand, 
+                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* add 'thread_update' command */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"thread_update\")");
+    Tcl_CreateObjCommand(interp, "thread_update", ip_rb_threadUpdateObjCmd, 
+                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP1("Tcl_CreateCommand(\"thread_update\")");
+    Tcl_CreateCommand(interp, "thread_update", ip_rb_threadUpdateCommand, 
+                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#endif
+}
+
+
+
+#if TCL_MAJOR_VERSION >= 8
+static int ip_rbNamespaceObjCmd _((ClientData, Tcl_Interp *, int,
+                                   Tcl_Obj *CONST []));
+static int
+ip_rbNamespaceObjCmd(clientData, interp, objc, objv)
+    ClientData clientData;
+    Tcl_Interp *interp; 
+    int objc;
+    Tcl_Obj *CONST objv[];
+{
+    Tcl_CmdInfo info;
+    int ret;
+
+    if (!Tcl_GetCommandInfo(interp, "__orig_namespace_command__", &(info))) {
+        Tcl_ResetResult(interp);
+        Tcl_AppendResult(interp, 
+                         "invalid command name \"namespace\"", (char*)NULL);
+        return TCL_ERROR;
+    }
+
+    rbtk_eventloop_depth++;
+    DUMP2("namespace wrapper enter depth == %d", rbtk_eventloop_depth);
+
+    if (info.isNativeObjectProc) {
+        ret = (*(info.objProc))(info.objClientData, interp, objc, objv);
+    } else {
+        /* string interface */
+        int i;
+        char **argv;
+
+        argv = (char **)Tcl_Alloc(sizeof(char *) * (objc + 1));
+
+        for(i = 0; i < objc; i++) {
+            /* argv[i] = Tcl_GetString(objv[i]); */
+            argv[i] = Tcl_GetStringFromObj(objv[i], (int*)NULL);
+        }
+        argv[objc] = (char *)NULL;
+
+        ret = (*(info.proc))(info.clientData, interp, 
+                              objc, (CONST84 char **)argv);
+
+        Tcl_Free((char*)argv);
+    }
+
+    DUMP2("namespace wrapper exit depth == %d", rbtk_eventloop_depth);
+    rbtk_eventloop_depth--;
+
+    return ret;
+}
+#endif
+
+static void
+ip_wrap_namespace_command(interp)
+    Tcl_Interp *interp; 
+{
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_CmdInfo orig_info;
+
+    if (!Tcl_GetCommandInfo(interp, "namespace", &(orig_info))) {
+        return;
+    }
+
+    if (orig_info.isNativeObjectProc) {
+        Tcl_CreateObjCommand(interp, "__orig_namespace_command__", 
+                             orig_info.objProc, orig_info.objClientData, 
+                             orig_info.deleteProc);
+    } else {
+        Tcl_CreateCommand(interp, "__orig_namespace_command__", 
+                          orig_info.proc, orig_info.clientData, 
+                          orig_info.deleteProc);
+    }
+
+    Tcl_CreateObjCommand(interp, "namespace", ip_rbNamespaceObjCmd, 
+                         (ClientData) 0, (Tcl_CmdDeleteProc *)NULL);
+#endif
+}
+
+
+/* call when interpreter is deleted */
+static void
+ip_CallWhenDeleted(clientData, ip)
+    ClientData clientData;
+    Tcl_Interp *ip;
+{
+    int  thr_crit_bup;
+    /* Tk_Window main_win = (Tk_Window) clientData; */
+
+    DUMP1("start ip_CallWhenDeleted");
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    ip_finalize(ip);
+
+    DUMP1("finish ip_CallWhenDeleted");
+    rb_thread_critical = thr_crit_bup;
+}
+
+/* initialize interpreter */
+static VALUE
+ip_init(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct tcltkip *ptr;        /* tcltkip data struct */
+    VALUE argv0, opts;
+    int cnt;
+    int st;
+    int with_tk = 1;
+    Tk_Window mainWin = (Tk_Window)NULL;
+
+    /* security check */
+    if (ruby_safe_level >= 4) {
+        rb_raise(rb_eSecurityError, 
+                 "Cannot create a TclTkIp object at level %d", 
+                 ruby_safe_level);
+    }
+
+    /* create object */
+    Data_Get_Struct(self, struct tcltkip, ptr);
+    ptr = ALLOC(struct tcltkip);
+    DATA_PTR(self) = ptr;
+    ptr->ref_count = 0;
+    ptr->allow_ruby_exit = 1;
+    ptr->return_value = 0;
+
+    /* from Tk_Main() */
+    DUMP1("Tcl_CreateInterp");
+    ptr->ip = ruby_tcl_create_ip_and_stubs_init(&st);
+    if (ptr->ip == NULL) {
+        switch(st) {
+        case TCLTK_STUBS_OK:
+            break;
+        case NO_TCL_DLL:
+            rb_raise(rb_eLoadError, "tcltklib: fail to open tcl_dll");
+        case NO_FindExecutable:
+            rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_FindExecutable");
+        case NO_CreateInterp:
+            rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_CreateInterp()");
+        case NO_DeleteInterp:
+            rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_DeleteInterp()");
+        case FAIL_CreateInterp:
+            rb_raise(rb_eRuntimeError, "tcltklib: fail to create a new IP");
+        case FAIL_Tcl_InitStubs:
+            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tcl_InitStubs()");
+        default:
+            rb_raise(rb_eRuntimeError, "tcltklib: unknown error(%d) on ruby_tcl_create_ip_and_stubs_init", st);
+        }
+    }
+
+#if TCL_MAJOR_VERSION >= 8
+#if TCL_NAMESPACE_DEBUG
+    DUMP1("get current namespace");
+    if ((ptr->default_ns = Tcl_GetCurrentNamespace(ptr->ip)) 
+        == (Tcl_Namespace*)NULL) {
+      rb_raise(rb_eRuntimeError, "a new Tk interpreter has a NULL namespace");
+    }
+#endif
+#endif
+
+    rbtk_preserve_ip(ptr);
+    DUMP2("IP ref_count = %d", ptr->ref_count);
+    current_interp = ptr->ip;
+
+    ptr->has_orig_exit 
+        = Tcl_GetCommandInfo(ptr->ip, "exit", &(ptr->orig_exit_info));
+
+    /* from Tcl_AppInit() */
+    DUMP1("Tcl_Init");
+    if (Tcl_Init(ptr->ip) == TCL_ERROR) {
+        rb_raise(rb_eRuntimeError, "%s", Tcl_GetStringResult(ptr->ip));
+    }
+
+    /* set variables */
+    cnt = rb_scan_args(argc, argv, "02", &argv0, &opts);
+    switch(cnt) {
+    case 2:
+        /* options */
+        if (NIL_P(opts) || opts == Qfalse) {
+            /* without Tk */
+            with_tk = 0;
+        } else {
+            /* Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), 0); */
+            Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), TCL_GLOBAL_ONLY);
+        }
+    case 1:
+        /* argv0 */
+        if (!NIL_P(argv0)) {
+            if (strncmp(StringValuePtr(argv0), "-e", 3) == 0
+                || strncmp(StringValuePtr(argv0), "-", 2) == 0) {
+                Tcl_SetVar(ptr->ip, "argv0", "ruby", TCL_GLOBAL_ONLY);
+            } else {
+                /* Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 0); */
+                Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 
+                           TCL_GLOBAL_ONLY);
+            }
+        }
+    case 0:
+        /* no args */
+        ;
+    }
+
+    /* from Tcl_AppInit() */
+    if (with_tk) {
+        DUMP1("Tk_Init");
+        st = ruby_tk_stubs_init(ptr->ip);
+        switch(st) {
+        case TCLTK_STUBS_OK:
+            break;
+        case NO_Tk_Init:
+            rb_raise(rb_eLoadError, "tcltklib: can't find Tk_Init()");
+        case FAIL_Tk_Init:
+            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tk_Init(). %s", 
+                     Tcl_GetStringResult(ptr->ip));
+        case FAIL_Tk_InitStubs:
+            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tk_InitStubs(). %s", 
+                     Tcl_GetStringResult(ptr->ip));
+        default:
+            rb_raise(rb_eRuntimeError, "tcltklib: unknown error(%d) on ruby_tk_stubs_init", st);
+        }
+
+        DUMP1("Tcl_StaticPackage(\"Tk\")");
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_StaticPackage(ptr->ip, "Tk", Tk_Init, Tk_SafeInit);
+#else /* TCL_MAJOR_VERSION < 8 */
+        Tcl_StaticPackage(ptr->ip, "Tk", Tk_Init,
+                          (Tcl_PackageInitProc *) NULL);
+#endif
+
+        /* get main window */
+        mainWin = Tk_MainWindow(ptr->ip);
+        Tk_Preserve((ClientData)mainWin);
+    }
+
+    /* add ruby command to the interpreter */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"ruby\")");
+    Tcl_CreateObjCommand(ptr->ip, "ruby", ip_ruby_eval, (ClientData)NULL,
+                         (Tcl_CmdDeleteProc *)NULL);
+    DUMP1("Tcl_CreateObjCommand(\"ruby_eval\")");
+    Tcl_CreateObjCommand(ptr->ip, "ruby_eval", ip_ruby_eval, (ClientData)NULL,
+                         (Tcl_CmdDeleteProc *)NULL);
+    DUMP1("Tcl_CreateObjCommand(\"ruby_cmd\")");
+    Tcl_CreateObjCommand(ptr->ip, "ruby_cmd", ip_ruby_cmd, (ClientData)NULL,
+                         (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP1("Tcl_CreateCommand(\"ruby\")");
+    Tcl_CreateCommand(ptr->ip, "ruby", ip_ruby_eval, (ClientData)NULL,
+                      (Tcl_CmdDeleteProc *)NULL);
+    DUMP1("Tcl_CreateCommand(\"ruby_eval\")");
+    Tcl_CreateCommand(ptr->ip, "ruby_eval", ip_ruby_eval, (ClientData)NULL,
+                      (Tcl_CmdDeleteProc *)NULL);
+    DUMP1("Tcl_CreateCommand(\"ruby_cmd\")");
+    Tcl_CreateCommand(ptr->ip, "ruby_cmd", ip_ruby_cmd, (ClientData)NULL,
+                      (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* add 'interp_exit', 'ruby_exit' and replace 'exit' command */
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"interp_exit\")");
+    Tcl_CreateObjCommand(ptr->ip, "interp_exit", ip_InterpExitObjCmd, 
+                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+    DUMP1("Tcl_CreateObjCommand(\"ruby_exit\")");
+    Tcl_CreateObjCommand(ptr->ip, "ruby_exit", ip_RubyExitObjCmd, 
+                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+    DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"ruby_exit\"");
+    Tcl_CreateObjCommand(ptr->ip, "exit", ip_RubyExitObjCmd, 
+                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP1("Tcl_CreateCommand(\"interp_exit\")");
+    Tcl_CreateCommand(ptr->ip, "interp_exit", ip_InterpExitCommand, 
+                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+    DUMP1("Tcl_CreateCommand(\"ruby_exit\")");
+    Tcl_CreateCommand(ptr->ip, "ruby_exit", ip_RubyExitCommand, 
+                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+    DUMP1("Tcl_CreateCommand(\"exit\") --> \"ruby_exit\"");
+    Tcl_CreateCommand(ptr->ip, "exit", ip_RubyExitCommand, 
+                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* replace vwait and tkwait */
+    ip_replace_wait_commands(ptr->ip, mainWin);
+
+    /* wrap namespace command */
+    ip_wrap_namespace_command(ptr->ip);
+
+    /* set finalizer */
+    Tcl_CallWhenDeleted(ptr->ip, ip_CallWhenDeleted, (ClientData)mainWin);
+
+    if (mainWin != (Tk_Window)NULL) {
+        Tk_Release((ClientData)mainWin);
+    }
+
+    return self;
+}
+
+static VALUE
+ip_create_slave_core(interp, argc, argv)
+    VALUE interp;
+    int   argc;
+    VALUE *argv;
+{
+    struct tcltkip *master = get_ip(interp);
+    struct tcltkip *slave = ALLOC(struct tcltkip);
+    VALUE safemode;
+    VALUE name;
+    int safe;
+    int thr_crit_bup;
+    Tk_Window mainWin;
+
+    /* ip is deleted? */
+    if (deleted_ip(master)) {
+        return rb_exc_new2(rb_eRuntimeError, 
+                           "deleted master cannot create a new slave");
+    }
+
+    name     = argv[0];
+    safemode = argv[1];
+
+    if (Tcl_IsSafe(master->ip) == 1) {
+        safe = 1;
+    } else if (safemode == Qfalse || NIL_P(safemode)) {
+        safe = 0;
+        /* rb_secure(4); */ /* already checked */
+    } else {
+        safe = 1;
+    }
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+#if 0
+    /* init Tk */
+    if (RTEST(with_tk)) {
+        volatile VALUE exc;
+        if (!tk_stubs_init_p()) {
+            exc = tcltkip_init_tk(interp);
+            if (!NIL_P(exc)) {
+                rb_thread_critical = thr_crit_bup;
+                return exc;
+            }
+        }
+    }
+#endif
+
+    /* create slave-ip */
+    slave->ref_count = 0;
+    slave->allow_ruby_exit = 0;
+    slave->return_value = 0;
+
+    slave->ip = Tcl_CreateSlave(master->ip, StringValuePtr(name), safe);
+    if (slave->ip == NULL) {
+        rb_thread_critical = thr_crit_bup;
+        return rb_exc_new2(rb_eRuntimeError, 
+                           "fail to create the new slave interpreter");
+    }
+#if TCL_MAJOR_VERSION >= 8
+#if TCL_NAMESPACE_DEBUG
+    slave->default_ns = Tcl_GetCurrentNamespace(slave->ip);
+#endif
+#endif
+    rbtk_preserve_ip(slave);
+
+    slave->has_orig_exit 
+        = Tcl_GetCommandInfo(slave->ip, "exit", &(slave->orig_exit_info));
+
+    /* replace 'exit' command --> 'interp_exit' command */
+    mainWin = (tk_stubs_init_p())? Tk_MainWindow(slave->ip): (Tk_Window)NULL;
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"interp_exit\"");
+    Tcl_CreateObjCommand(slave->ip, "exit", ip_InterpExitObjCmd, 
+                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP1("Tcl_CreateCommand(\"exit\") --> \"interp_exit\"");
+    Tcl_CreateCommand(slave->ip, "exit", ip_InterpExitCommand, 
+                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    /* replace vwait and tkwait */
+    ip_replace_wait_commands(slave->ip, mainWin);
+
+    /* wrap namespace command */
+    ip_wrap_namespace_command(slave->ip);
+
+    /* set finalizer */
+    Tcl_CallWhenDeleted(slave->ip, ip_CallWhenDeleted, (ClientData)mainWin);
+
+    rb_thread_critical = thr_crit_bup;
+
+    return Data_Wrap_Struct(CLASS_OF(interp), 0, ip_free, slave);
+}
+
+static VALUE
+ip_create_slave(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct tcltkip *master = get_ip(self);
+    VALUE safemode;
+    VALUE name;
+    VALUE callargv[2];
+
+    /* ip is deleted? */
+    if (deleted_ip(master)) {
+        rb_raise(rb_eRuntimeError, 
+                 "deleted master cannot create a new slave interpreter");
+    }
+
+    /* argument check */
+    if (rb_scan_args(argc, argv, "11", &name, &safemode) == 1) {
+        safemode = Qfalse;
+    }
+    if (Tcl_IsSafe(master->ip) != 1
+        && (safemode == Qfalse || NIL_P(safemode))) {
+        rb_secure(4);
+    }
+
+    StringValue(name);
+    callargv[0] = name;
+    callargv[1] = safemode;
+
+    return tk_funcall(ip_create_slave_core, 2, callargv, self);
+}
+
+
+/* self is slave of master? */
+static VALUE
+ip_is_slave_of_p(self, master)
+    VALUE self, master;
+{
+    if (!rb_obj_is_kind_of(master, tcltkip_class)) {
+        rb_raise(rb_eArgError, "expected TclTkIp object");
+    }
+
+    if (Tcl_GetMaster(get_ip(self)->ip) == get_ip(master)->ip) {
+      return Qtrue;
+    } else {
+      return Qfalse;
+    }
+}
+
+
+/* create console (if supported) */
+#if defined(MAC_TCL) || defined(__WIN32__)
+#if TCL_MAJOR_VERSION < 8 \
+    || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0) \
+    || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 \
+        && (TCL_RELEASE_LEVEL == TCL_ALPHA_RELEASE \
+           || (TCL_RELEASE_LEVEL == TCL_BETA_RELEASE \
+               && TCL_RELEASE_SERIAL < 2) ) )
+EXTERN void TkConsoleCreate _((void));
+#endif
+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 \
+    && ( (TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE \
+          && TCL_RELEASE_SERIAL == 0) \
+       || (TCL_RELEASE_LEVEL == TCL_BETA_RELEASE \
+           && TCL_RELEASE_SERIAL >= 2) )
+EXTERN void TkConsoleCreate_ _((void));
+#endif
+#endif
+static VALUE
+ip_create_console_core(interp, argc, argv)
+    VALUE interp;
+    int   argc;   /* dummy */
+    VALUE *argv;  /* dummy */
+{
+    struct tcltkip *ptr = get_ip(interp);
+
+    if (!tk_stubs_init_p()) {
+        tcltkip_init_tk(interp);
+    }
+
+    if (Tcl_GetVar(ptr->ip,"tcl_interactive",TCL_GLOBAL_ONLY) == (char*)NULL) {
+        Tcl_SetVar(ptr->ip, "tcl_interactive", "0", TCL_GLOBAL_ONLY);
+    }
+
+#if TCL_MAJOR_VERSION > 8 \
+    || (TCL_MAJOR_VERSION == 8 \
+        && (TCL_MINOR_VERSION > 1 \
+            || (TCL_MINOR_VERSION == 1 \
+                 && TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE \
+                 && TCL_RELEASE_SERIAL >= 1) ) )
+    Tk_InitConsoleChannels(ptr->ip);
+
+    if (Tk_CreateConsoleWindow(ptr->ip) != TCL_OK) {
+        rb_raise(rb_eRuntimeError, "fail to create console-window");
+    }
+#else
+#if defined(MAC_TCL) || defined(__WIN32__)
+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 1 \
+    && ( (TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE && TCL_RELEASE_SERIAL == 0) \
+        || (TCL_RELEASE_LEVEL == TCL_BETA_RELEASE && TCL_RELEASE_SERIAL >= 2) )
+    TkConsoleCreate_();
+#else
+    TkConsoleCreate();
+#endif
+
+    if (TkConsoleInit(ptr->ip) != TCL_OK) {
+        rb_raise(rb_eRuntimeError, "fail to create console-window");
+    }
+#else
+    rb_notimplement();
+#endif
+#endif
+
+    return interp;
+}
+
+static VALUE
+ip_create_console(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+    
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        rb_raise(rb_eRuntimeError, "interpreter is deleted");
+    }
+
+    return tk_funcall(ip_create_console_core, 0, (VALUE*)NULL, self);
+}
+
+/* make ip "safe" */
+static VALUE
+ip_make_safe_core(interp, argc, argv)
+    VALUE interp;
+    int   argc;   /* dummy */
+    VALUE *argv;  /* dummy */
+{
+    struct tcltkip *ptr = get_ip(interp);
+    Tk_Window mainWin;
+    
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        return rb_exc_new2(rb_eRuntimeError, "interpreter is deleted");
+    }
+
+    if (Tcl_MakeSafe(ptr->ip) == TCL_ERROR) {
+        /* return rb_exc_new2(rb_eRuntimeError, 
+                              Tcl_GetStringResult(ptr->ip)); */
+        return create_ip_exc(interp, rb_eRuntimeError, 
+                             Tcl_GetStringResult(ptr->ip));
+    }
+
+    ptr->allow_ruby_exit = 0;
+
+    /* replace 'exit' command --> 'interp_exit' command */
+    mainWin = (tk_stubs_init_p())? Tk_MainWindow(ptr->ip): (Tk_Window)NULL;
+#if TCL_MAJOR_VERSION >= 8
+    DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"interp_exit\"");
+    Tcl_CreateObjCommand(ptr->ip, "exit", ip_InterpExitObjCmd, 
+                         (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP1("Tcl_CreateCommand(\"exit\") --> \"interp_exit\"");
+    Tcl_CreateCommand(ptr->ip, "exit", ip_InterpExitCommand, 
+                      (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#endif
+
+    return interp;
+}
+
+static VALUE
+ip_make_safe(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+    
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        rb_raise(rb_eRuntimeError, "interpreter is deleted");
+    }
+
+    return tk_funcall(ip_make_safe_core, 0, (VALUE*)NULL, self);
+}
+
+/* is safe? */
+static VALUE
+ip_is_safe_p(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+    
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        rb_raise(rb_eRuntimeError, "interpreter is deleted");
+    }
+
+    if (Tcl_IsSafe(ptr->ip)) {
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+}
+
+/* allow_ruby_exit? */
+static VALUE
+ip_allow_ruby_exit_p(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+    
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        rb_raise(rb_eRuntimeError, "interpreter is deleted");
+    }
+
+    if (ptr->allow_ruby_exit) {
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+}
+
+/* allow_ruby_exit = mode */
+static VALUE
+ip_allow_ruby_exit_set(self, val)
+    VALUE self, val;
+{
+    struct tcltkip *ptr = get_ip(self);
+    Tk_Window mainWin;
+
+    rb_secure(4);
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        rb_raise(rb_eRuntimeError, "interpreter is deleted");
+    }
+
+    if (Tcl_IsSafe(ptr->ip)) {
+        rb_raise(rb_eSecurityError, 
+                 "insecure operation on a safe interpreter");
+    }
+
+    mainWin = (tk_stubs_init_p())? Tk_MainWindow(ptr->ip): (Tk_Window)NULL;
+
+    if (RTEST(val)) {
+        ptr->allow_ruby_exit = 1;
+#if TCL_MAJOR_VERSION >= 8
+        DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"ruby_exit\"");
+        Tcl_CreateObjCommand(ptr->ip, "exit", ip_RubyExitObjCmd, 
+                             (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+        DUMP1("Tcl_CreateCommand(\"exit\") --> \"ruby_exit\"");
+        Tcl_CreateCommand(ptr->ip, "exit", ip_RubyExitCommand, 
+                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#endif
+        return Qtrue;
+
+    } else {
+        ptr->allow_ruby_exit = 0;
+#if TCL_MAJOR_VERSION >= 8
+        DUMP1("Tcl_CreateObjCommand(\"exit\") --> \"interp_exit\"");
+        Tcl_CreateObjCommand(ptr->ip, "exit", ip_InterpExitObjCmd, 
+                             (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#else /* TCL_MAJOR_VERSION < 8 */
+        DUMP1("Tcl_CreateCommand(\"exit\") --> \"interp_exit\"");
+        Tcl_CreateCommand(ptr->ip, "exit", ip_InterpExitCommand, 
+                          (ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
+#endif
+        return Qfalse;
+    }
+}
+
+/* delete interpreter */
+static VALUE
+ip_delete(self)
+    VALUE self;
+{
+    int  thr_crit_bup;
+    struct tcltkip *ptr = get_ip(self);
+
+    if (ptr == (struct tcltkip *)NULL || ptr->ip == (Tcl_Interp*)NULL) {
+        DUMP1("delete deleted IP");
+        return Qnil;
+    }
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    DUMP1("call ip_finalize");
+    ip_finalize(ptr->ip);
+
+    DUMP1("delete interp");
+    Tcl_DeleteInterp(ptr->ip);
+    Tcl_Release(ptr->ip);
+
+    rb_thread_critical = thr_crit_bup;
+
+    return Qnil;
+}
+
+
+/* is deleted? */
+static VALUE
+ip_has_invalid_namespace_p(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    if (ptr == (struct tcltkip *)NULL || ptr->ip == (Tcl_Interp *)NULL) {
+        /* deleted IP */
+        return Qtrue;
+    }
+
+#if TCL_NAMESPACE_DEBUG
+    if (rbtk_invalid_namespace(ptr)) {
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+#else
+    return Qfalse;
+#endif
+}
+
+static VALUE
+ip_is_deleted_p(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    if (deleted_ip(ptr)) {
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+}
+
+static VALUE
+ip_has_mainwindow_p(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    if (deleted_ip(ptr) || !tk_stubs_init_p()) {
+        return Qnil;
+    } else if (Tk_MainWindow(ptr->ip) == (Tk_Window)NULL) {
+        return Qfalse;
+    } else {
+        return Qtrue;
+    }
+}
+
+/*** ruby string <=> tcl object ***/
+#if TCL_MAJOR_VERSION >= 8
+static VALUE
+get_str_from_obj(obj)
+    Tcl_Obj *obj;
+{
+    int len, binary = 0;
+    const char *s;
+    volatile VALUE str;
+
+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
+    s = Tcl_GetStringFromObj(obj, &len);
+#else /* TCL_VERSION >= 8.1 */
+    if (Tcl_GetCharLength(obj) != Tcl_UniCharLen(Tcl_GetUnicode(obj))) {
+        /* possibly binary string */
+        s = Tcl_GetByteArrayFromObj(obj, &len);
+        binary = 1;
+    } else {
+        /* possibly text string */
+        s = Tcl_GetStringFromObj(obj, &len);
+    }
+#endif
+    str = s ? rb_str_new(s, len) : rb_str_new2("");
+    if (binary) rb_ivar_set(str, ID_at_enc, rb_str_new2("binary"));
+    return str;
+}
+
+static Tcl_Obj *
+get_obj_from_str(str)
+    VALUE str;
+{
+    const char *s = StringValuePtr(str);
+
+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
+    return Tcl_NewStringObj((char*)s, RSTRING(str)->len);
+#else /* TCL_VERSION >= 8.1 */
+    VALUE enc = rb_attr_get(str, ID_at_enc);
+
+    if (!NIL_P(enc)) {
+        StringValue(enc);
+        if (strcmp(RSTRING(enc)->ptr, "binary") == 0) {
+            /* binary string */
+            return Tcl_NewByteArrayObj(s, RSTRING(str)->len);
+        } else {
+            /* text string */
+            return Tcl_NewStringObj(s, RSTRING(str)->len);
+        }
+    } else if (strlen(s) != RSTRING(str)->len) {
+        /* probably binary string */
+        return Tcl_NewByteArrayObj(s, RSTRING(str)->len);
+    } else {
+        /* probably text string */
+        return Tcl_NewStringObj(s, RSTRING(str)->len);
+    }
+#endif
+}
+#endif /* ruby string <=> tcl object */
+
+static VALUE
+ip_get_result_string_obj(interp)
+    Tcl_Interp *interp;
+{
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_Obj *retObj;
+    volatile VALUE strval;
+
+    retObj = Tcl_GetObjResult(interp);
+    Tcl_IncrRefCount(retObj);
+    strval = get_str_from_obj(retObj);
+    OBJ_TAINT(strval);
+    Tcl_DecrRefCount(retObj);
+    return strval;
+#else
+    return rb_tainted_str_new2(interp->result);
+#endif
+}
+
+/* call Tcl/Tk functions on the eventloop thread */
+static VALUE
+callq_safelevel_handler(arg, callq)
+    VALUE arg;
+    VALUE callq;
+{
+    struct call_queue *q;
+
+    Data_Get_Struct(callq, struct call_queue, q);
+    DUMP2("(safe-level handler) $SAFE = %d", q->safe_level);
+    rb_set_safe_level(q->safe_level);
+    return((q->func)(q->interp, q->argc, q->argv));
+}
+
+static int call_queue_handler _((Tcl_Event *, int));
+static int
+call_queue_handler(evPtr, flags)
+    Tcl_Event *evPtr;
+    int flags;
+{
+    struct call_queue *q = (struct call_queue *)evPtr;
+    volatile VALUE ret;
+    volatile VALUE q_dat;
+    struct tcltkip *ptr;
+
+    DUMP2("do_call_queue_handler : evPtr = %p", evPtr);
+    DUMP2("queue_handler thread : %lx", rb_thread_current());
+    DUMP2("added by thread : %lx", q->thread);
+
+    if (*(q->done)) {
+        DUMP1("processed by another event-loop");
+        return 0;
+    } else {
+        DUMP1("process it on current event-loop");
+    }
+
+    /* process it */
+    *(q->done) = 1;
+
+    /* deleted ipterp ? */
+    ptr = get_ip(q->interp);
+    if (deleted_ip(ptr)) {
+        /* deleted IP --> ignore */
+        return 1;
+    }
+
+    /* check safe-level */
+    if (rb_safe_level() != q->safe_level) {
+        /* q_dat = Data_Wrap_Struct(rb_cData,0,0,q); */
+        q_dat = Data_Wrap_Struct(rb_cData,call_queue_mark,0,q);
+        ret = rb_funcall(rb_proc_new(callq_safelevel_handler, q_dat), 
+                         ID_call, 0);
+        rb_gc_force_recycle(q_dat);
+    } else {
+        DUMP2("call function (for caller thread:%lx)", q->thread);
+        DUMP2("call function (current thread:%lx)", rb_thread_current());
+        ret = (q->func)(q->interp, q->argc, q->argv);
+    }
+
+    /* set result */
+    RARRAY(q->result)->ptr[0] = ret;
+
+    /* complete */
+    *(q->done) = -1;
+
+    /* back to caller */
+    if (RTEST(rb_funcall(q->thread, ID_alive_p, 0, 0))) {
+      DUMP2("back to caller (caller thread:%lx)", q->thread);
+      DUMP2("               (current thread:%lx)", rb_thread_current());
+      rb_thread_run(q->thread);
+      DUMP1("finish back to caller");
+    } else {
+      DUMP2("caller is dead (caller thread:%lx)", q->thread);
+      DUMP2("               (current thread:%lx)", rb_thread_current());
+    }
+
+    /* end of handler : remove it */
+    return 1;
+}
+
+static VALUE
+tk_funcall(func, argc, argv, obj)
+    VALUE (*func)();
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    struct call_queue *callq;
+    int  *alloc_done;
+    int  thr_crit_bup;
+    volatile VALUE current = rb_thread_current();
+    volatile VALUE ip_obj = obj;
+    volatile VALUE result;
+    volatile VALUE ret;
+
+
+    if (!NIL_P(ip_obj) && deleted_ip(get_ip(ip_obj))) {
+        return Qnil;
+    }
+
+    if (NIL_P(eventloop_thread) || current == eventloop_thread) {
+        if (NIL_P(eventloop_thread)) {
+            DUMP2("tk_funcall from thread:%lx but no eventloop", current);
+        } else {
+            DUMP2("tk_funcall from current eventloop %lx", current);
+        }
+        result = (func)(ip_obj, argc, argv);
+        if (rb_obj_is_kind_of(result, rb_eException)) {
+            rb_exc_raise(result);
+        }
+        return result;
+    }
+
+    DUMP2("tk_funcall from thread %lx (NOT current eventloop)", current);
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    /* allocate memory (argv cross over thread : must be in heap) */
+    if (argv) {
+        VALUE *temp = ALLOC_N(VALUE, argc);
+        MEMCPY(temp, argv, VALUE, argc);
+        argv = temp;
+    }
+
+    /* allocate memory (keep result) */
+    alloc_done = (int*)ALLOC(int);
+    *alloc_done = 0;
+
+    /* allocate memory (freed by Tcl_ServiceEvent) */
+    callq = (struct call_queue *)Tcl_Alloc(sizeof(struct call_queue));
+    Tcl_Preserve(callq);
+
+    /* allocate result obj */
+    result = rb_ary_new2(1);
+    RARRAY(result)->ptr[0] = Qnil;
+    RARRAY(result)->len = 1;
+
+    /* construct event data */
+    callq->done = alloc_done;
+    callq->func = func;
+    callq->argc = argc;
+    callq->argv = argv;
+    callq->interp = ip_obj;
+    callq->result = result;
+    callq->thread = current;
+    callq->safe_level = rb_safe_level();
+    callq->ev.proc = call_queue_handler;
+
+    /* add the handler to Tcl event queue */
+    DUMP1("add handler");
+    Tcl_QueueEvent(&(callq->ev), TCL_QUEUE_HEAD);
+
+    rb_thread_critical = thr_crit_bup;
+
+    /* wait for the handler to be processed */
+    DUMP2("wait for handler (current thread:%lx)", current);
+    while(*alloc_done >= 0) {
+        rb_thread_stop();
+    }
+    DUMP2("back from handler (current thread:%lx)", current);
+
+    /* get result & free allocated memory */
+    ret = RARRAY(result)->ptr[0];
+    free(alloc_done);
+    if (argv) free(argv);
+
+    Tcl_Release(callq);
+
+    /* exception? */
+    if (rb_obj_is_kind_of(ret, rb_eException)) {
+        DUMP1("raise exception");
+        rb_exc_raise(ret);
+    }
+
+    DUMP1("exit tk_funcall");
+    return ret;
+}
+
+
+/* eval string in tcl by Tcl_Eval() */
+#if TCL_MAJOR_VERSION >= 8
+struct call_eval_info {
+    struct tcltkip *ptr;
+    Tcl_Obj *cmd;
+};
+
+static VALUE
+call_tcl_eval(arg)
+    VALUE arg;
+{
+    struct call_eval_info *inf = (struct call_eval_info *)arg;
+
+    Tcl_AllowExceptions(inf->ptr->ip);
+    inf->ptr->return_value = Tcl_EvalObj(inf->ptr->ip, inf->cmd);
+
+    return Qnil;
+}
+#endif
+
+static VALUE
+ip_eval_real(self, cmd_str, cmd_len)
+    VALUE self;
+    char *cmd_str;
+    int  cmd_len;
+{
+    volatile VALUE ret;
+    struct tcltkip *ptr = get_ip(self);
+    int thr_crit_bup;
+
+#if TCL_MAJOR_VERSION >= 8
+    /* call Tcl_EvalObj() */
+    {
+      Tcl_Obj *cmd;
+
+      thr_crit_bup = rb_thread_critical;
+      rb_thread_critical = Qtrue;
+
+      cmd = Tcl_NewStringObj(cmd_str, cmd_len);
+      Tcl_IncrRefCount(cmd);
+
+      /* ip is deleted? */
+      if (deleted_ip(ptr)) {
+          Tcl_DecrRefCount(cmd);
+          rb_thread_critical = thr_crit_bup;
+          ptr->return_value = TCL_OK;
+          return rb_tainted_str_new2("");
+      } else {
+          int status;
+          struct call_eval_info inf;
+
+          /* Tcl_Preserve(ptr->ip); */
+          rbtk_preserve_ip(ptr);
+
+#if 0
+          ptr->return_value = Tcl_EvalObj(ptr->ip, cmd);
+          /* ptr->return_value = Tcl_GlobalEvalObj(ptr->ip, cmd); */
+#else
+          inf.ptr = ptr;
+          inf.cmd = cmd;
+          ret = rb_protect(call_tcl_eval, (VALUE)&inf, &status);
+          switch(status) {
+          case TAG_RAISE:
+              if (NIL_P(ruby_errinfo)) {
+                  rbtk_pending_exception = rb_exc_new2(rb_eException, 
+                                                       "unknown exception");
+              } else {
+                  rbtk_pending_exception = ruby_errinfo;
+              }
+              break;
+
+          case TAG_FATAL:
+              if (NIL_P(ruby_errinfo)) {
+                  rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
+              } else {
+                  rbtk_pending_exception = ruby_errinfo;
+              }
+          }
+#endif
+      }
+
+      Tcl_DecrRefCount(cmd);
+
+    }
+
+    if (pending_exception_check1(thr_crit_bup, ptr)) {
+        rbtk_release_ip(ptr);
+        return rbtk_pending_exception;
+    }
+
+    if (ptr->return_value == TCL_ERROR) {
+        if (event_loop_abort_on_exc > 0 && !Tcl_InterpDeleted(ptr->ip)) {
+            volatile VALUE exc;
+            exc = create_ip_exc(self, rb_eRuntimeError, 
+                                "%s", Tcl_GetStringResult(ptr->ip));
+            rbtk_release_ip(ptr);
+            rb_thread_critical = thr_crit_bup;
+            return exc;
+        } else {
+            if (event_loop_abort_on_exc < 0) {
+                rb_warning("%s (ignore)", Tcl_GetStringResult(ptr->ip));
+            } else {
+                rb_warn("%s (ignore)", Tcl_GetStringResult(ptr->ip));
+            }
+            Tcl_ResetResult(ptr->ip);
+            rbtk_release_ip(ptr);
+            rb_thread_critical = thr_crit_bup;
+            return rb_tainted_str_new2("");
+        }
+    }
+
+    /* pass back the result (as string) */
+    ret =  ip_get_result_string_obj(ptr->ip);
+    rbtk_release_ip(ptr);
+    rb_thread_critical = thr_crit_bup;
+    return ret;
+
+#else /* TCL_MAJOR_VERSION < 8 */
+    DUMP2("Tcl_Eval(%s)", cmd_str);
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        ptr->return_value = TCL_OK;
+        return rb_tainted_str_new2("");
+    } else {
+        /* Tcl_Preserve(ptr->ip); */
+        rbtk_preserve_ip(ptr);
+        ptr->return_value = Tcl_Eval(ptr->ip, cmd_str);
+        /* ptr->return_value = Tcl_GlobalEval(ptr->ip, cmd_str); */
+    }
+
+    if (pending_exception_check1(thr_crit_bup, ptr)) {
+        rbtk_release_ip(ptr);
+        return rbtk_pending_exception;
+    }
+
+    if (ptr->return_value == TCL_ERROR) {
+        volatile VALUE exc;
+
+        exc = create_ip_exc(self, rb_eRuntimeError, "%s", ptr->ip->result);
+
+        rbtk_release_ip(ptr);
+        return exc;
+    }
+    DUMP2("(TCL_Eval result) %d", ptr->return_value);
+
+    /* pass back the result (as string) */
+    ret =  ip_get_result_string_obj(ptr->ip);
+    rbtk_release_ip(ptr);
+    return ret;
+#endif
+}
+
+static VALUE
+evq_safelevel_handler(arg, evq)
+    VALUE arg;
+    VALUE evq;
+{
+    struct eval_queue *q;
+
+    Data_Get_Struct(evq, struct eval_queue, q);
+    DUMP2("(safe-level handler) $SAFE = %d", q->safe_level);
+    rb_set_safe_level(q->safe_level);
+    return ip_eval_real(q->interp, q->str, q->len);
+}
+
+int eval_queue_handler _((Tcl_Event *, int));
+int
+eval_queue_handler(evPtr, flags)
+    Tcl_Event *evPtr;
+    int flags;
+{
+    struct eval_queue *q = (struct eval_queue *)evPtr;
+    volatile VALUE ret;
+    volatile VALUE q_dat;
+
+    if (*(q->done)) {
+        DUMP1("processed by another event-loop");
+        return 0;
+    } else {
+        DUMP1("process it on current event-loop");
+    }
+
+    /* process it */
+    *(q->done) = 1;
+
+    /* check safe-level */
+    if (rb_safe_level() != q->safe_level) {
+#ifdef HAVE_NATIVETHREAD
+        if (!is_ruby_native_thread()) {
+            rb_bug("cross-thread violation on eval_queue_handler()");
+        }
+#endif
+        /* q_dat = Data_Wrap_Struct(rb_cData,0,0,q); */
+        q_dat = Data_Wrap_Struct(rb_cData,eval_queue_mark,0,q);
+        ret = rb_funcall(rb_proc_new(evq_safelevel_handler, q_dat), 
+                         ID_call, 0);
+        rb_gc_force_recycle(q_dat);
+    } else {
+        ret = ip_eval_real(q->interp, q->str, q->len);
+    }
+
+    /* set result */
+    RARRAY(q->result)->ptr[0] = ret;
+
+    /* complete */
+    *(q->done) = -1;
+
+    /* back to caller */
+    if (RTEST(rb_funcall(q->thread, ID_alive_p, 0, 0))) {
+      DUMP2("back to caller (caller thread:%lx)", q->thread);
+      DUMP2("               (current thread:%lx)", rb_thread_current());
+      rb_thread_run(q->thread);
+      DUMP1("finish back to caller");
+    } else {
+      DUMP2("caller is dead (caller thread:%lx)", q->thread);
+      DUMP2("               (current thread:%lx)", rb_thread_current());
+    }
+
+    /* end of handler : remove it */
+    return 1;
+}
+
+static VALUE
+ip_eval(self, str)
+    VALUE self;
+    VALUE str;
+{
+    struct eval_queue *evq;
+    char *eval_str;
+    int  *alloc_done;
+    int  thr_crit_bup;
+    volatile VALUE current = rb_thread_current();
+    volatile VALUE ip_obj = self;
+    volatile VALUE result;
+    volatile VALUE ret;
+    Tcl_QueuePosition position;
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+    StringValue(str);
+    rb_thread_critical = thr_crit_bup;
+
+    if (NIL_P(eventloop_thread) || current == eventloop_thread) {
+        if (NIL_P(eventloop_thread)) {
+            DUMP2("eval from thread:%lx but no eventloop", current);
+        } else {
+            DUMP2("eval from current eventloop %lx", current);
+        }
+        result = ip_eval_real(self, RSTRING(str)->ptr, RSTRING(str)->len);
+        if (rb_obj_is_kind_of(result, rb_eException)) {
+            rb_exc_raise(result);
+        }
+        return result;
+    }
+
+    DUMP2("eval from thread %lx (NOT current eventloop)", current);
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    /* allocate memory (protected from Tcl_ServiceEvent) */
+    alloc_done = (int*)ALLOC(int);
+    *alloc_done = 0;
+
+    eval_str = ALLOC_N(char, RSTRING(str)->len + 1);
+    memcpy(eval_str, RSTRING(str)->ptr, RSTRING(str)->len);
+    eval_str[RSTRING(str)->len] = 0;
+
+    /* allocate memory (freed by Tcl_ServiceEvent) */
+    evq = (struct eval_queue *)Tcl_Alloc(sizeof(struct eval_queue));
+    Tcl_Preserve(evq);
+
+    /* allocate result obj */
+    result = rb_ary_new2(1);
+    RARRAY(result)->ptr[0] = Qnil;
+    RARRAY(result)->len = 1;
+
+    /* construct event data */
+    evq->done = alloc_done;
+    evq->str = eval_str;
+    evq->len = RSTRING(str)->len;
+    evq->interp = ip_obj;
+    evq->result = result;
+    evq->thread = current;
+    evq->safe_level = rb_safe_level();
+    evq->ev.proc = eval_queue_handler;
+
+    position = TCL_QUEUE_TAIL;
+
+    /* add the handler to Tcl event queue */
+    DUMP1("add handler");
+    Tcl_QueueEvent(&(evq->ev), position);
+
+    rb_thread_critical = thr_crit_bup;
+
+    /* wait for the handler to be processed */
+    DUMP2("wait for handler (current thread:%lx)", current);
+    while(*alloc_done >= 0) {
+        rb_thread_stop();
+    }
+    DUMP2("back from handler (current thread:%lx)", current);
+
+    /* get result & free allocated memory */
+    ret = RARRAY(result)->ptr[0];
+
+    free(alloc_done);
+    free(eval_str);
+    Tcl_Release(evq);
+
+    if (rb_obj_is_kind_of(ret, rb_eException)) {
+        rb_exc_raise(ret);
+    }
+
+    return ret;
+}
+
+
+/* restart Tk */
+static VALUE
+lib_restart_core(interp, argc, argv)
+    VALUE interp;
+    int   argc;   /* dummy */
+    VALUE *argv;  /* dummy */
+{
+    volatile VALUE exc;
+    struct tcltkip *ptr = get_ip(interp);
+    int  thr_crit_bup;
+
+    /* rb_secure(4); */ /* already checked */
+
+    /* tcl_stubs_check(); */ /* already checked */
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        return rb_exc_new2(rb_eRuntimeError, "interpreter is deleted");
+    }
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    /* Tcl_Preserve(ptr->ip); */
+    rbtk_preserve_ip(ptr);
+
+    /* destroy the root wdiget */
+    ptr->return_value = Tcl_Eval(ptr->ip, "destroy .");
+    /* ignore ERROR */
+    DUMP2("(TCL_Eval result) %d", ptr->return_value);
+    Tcl_ResetResult(ptr->ip);
+
+#if TCL_MAJOR_VERSION >= 8
+    /* delete namespace ( tested on tk8.4.5 ) */
+    ptr->return_value = Tcl_Eval(ptr->ip, "namespace delete ::tk::msgcat");
+    /* ignore ERROR */
+    DUMP2("(TCL_Eval result) %d", ptr->return_value);
+    Tcl_ResetResult(ptr->ip);
+#endif
+
+    /* delete trace proc ( tested on tk8.4.5 ) */
+    ptr->return_value = Tcl_Eval(ptr->ip, "trace vdelete ::tk_strictMotif w ::tk::EventMotifBindings");
+    /* ignore ERROR */
+    DUMP2("(TCL_Eval result) %d", ptr->return_value);
+    Tcl_ResetResult(ptr->ip);
+
+    /* execute Tk_Init or Tk_SafeInit */
+    exc = tcltkip_init_tk(interp);
+    if (!NIL_P(exc)) {
+        rb_thread_critical = thr_crit_bup;
+        rbtk_release_ip(ptr);
+        return exc;
+    }
+
+    /* Tcl_Release(ptr->ip); */
+    rbtk_release_ip(ptr);
+
+    rb_thread_critical = thr_crit_bup;
+
+    /* return Qnil; */
+    return interp;
+}
+
+static VALUE
+lib_restart(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    rb_secure(4);
+
+    tcl_stubs_check();
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        rb_raise(rb_eRuntimeError, "interpreter is deleted");
+    }
+
+    return tk_funcall(lib_restart_core, 0, (VALUE*)NULL, self);
+}
+
+
+static VALUE
+ip_restart(self)
+    VALUE self;
+{
+    struct tcltkip *ptr = get_ip(self);
+
+    rb_secure(4);
+
+    tcl_stubs_check();
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        rb_raise(rb_eRuntimeError, "interpreter is deleted");
+    }
+
+    if (Tcl_GetMaster(ptr->ip) != (Tcl_Interp*)NULL) {
+        /* slave IP */
+        return Qnil;
+    }
+    return lib_restart(self);
+}
+
+static VALUE
+lib_toUTF8_core(ip_obj, src, encodename)
+    VALUE ip_obj;
+    VALUE src;
+    VALUE encodename;
+{
+    volatile VALUE str = src;
+
+#ifdef TCL_UTF_MAX
+    Tcl_Interp *interp;
+    Tcl_Encoding encoding;
+    Tcl_DString dstr;
+    int taint_flag = OBJ_TAINTED(str);
+    struct tcltkip *ptr;
+    char *buf;
+    int thr_crit_bup;
+#endif
+
+    tcl_stubs_check();
+
+    if (NIL_P(src)) {
+      return rb_str_new2("");
+    }
+
+#ifdef TCL_UTF_MAX
+    if (NIL_P(ip_obj)) {
+        interp = (Tcl_Interp *)NULL;
+    } else {
+        ptr = get_ip(ip_obj);
+
+        /* ip is deleted? */
+        if (deleted_ip(ptr)) {
+            interp = (Tcl_Interp *)NULL;
+        } else {
+            interp = ptr->ip;
+        }
+    }
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    if (NIL_P(encodename)) {
+        if (TYPE(str) == T_STRING) {
+            volatile VALUE enc;
+            enc = rb_attr_get(str, ID_at_enc);
+            if (NIL_P(enc)) {
+                if (NIL_P(ip_obj)) {
+                    encoding = (Tcl_Encoding)NULL;
+                } else {
+                    enc = rb_attr_get(ip_obj, ID_at_enc);
+                    if (NIL_P(enc)) {
+                        encoding = (Tcl_Encoding)NULL;
+                    } else {
+                        StringValue(enc);
+                        encoding = Tcl_GetEncoding(interp, RSTRING(enc)->ptr);
+                        if (encoding == (Tcl_Encoding)NULL) {
+                            rb_warning("Tk-interp has unknown encoding information (@encoding:'%s')", RSTRING(enc)->ptr);
+                        }
+                    }
+                }
+            } else {
+                StringValue(enc);
+                if (strcmp(RSTRING(enc)->ptr, "binary") == 0) {
+                    rb_thread_critical = thr_crit_bup;
+                    return str;
+                }
+                encoding = Tcl_GetEncoding(interp, RSTRING(enc)->ptr);
+                if (encoding == (Tcl_Encoding)NULL) {
+                    rb_warning("string has unknown encoding information (@encoding:'%s')", RSTRING(enc)->ptr);
+                }
+            }
+        } else {
+            encoding = (Tcl_Encoding)NULL;
+        }
+    } else {
+        StringValue(encodename);
+        encoding = Tcl_GetEncoding(interp, RSTRING(encodename)->ptr);
+        if (encoding == (Tcl_Encoding)NULL) {
+            /*
+            rb_warning("unknown encoding name '%s'", 
+                       RSTRING(encodename)->ptr);
+            */
+            rb_raise(rb_eArgError, "unknown encoding name '%s'", 
+                     RSTRING(encodename)->ptr);
+        }
+    }
+
+    StringValue(str);
+    if (!RSTRING(str)->len) {
+        rb_thread_critical = thr_crit_bup;
+        return str;
+    }
+    buf = ALLOC_N(char,(RSTRING(str)->len)+1);
+    memcpy(buf, RSTRING(str)->ptr, RSTRING(str)->len);
+    buf[RSTRING(str)->len] = 0;
+
+    Tcl_DStringInit(&dstr);
+    Tcl_DStringFree(&dstr);
+    /* Tcl_ExternalToUtfDString(encoding,buf,strlen(buf),&dstr); */
+    Tcl_ExternalToUtfDString(encoding, buf, RSTRING(str)->len, &dstr);
+
+    /* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
+    /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
+    str = rb_str_new(Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
+    rb_ivar_set(str, ID_at_enc, rb_tainted_str_new2("utf-8"));
+    if (taint_flag) OBJ_TAINT(str);
+
+    if (encoding != (Tcl_Encoding)NULL) {
+        Tcl_FreeEncoding(encoding);
+    }
+    Tcl_DStringFree(&dstr);
+
+    free(buf);
+
+    rb_thread_critical = thr_crit_bup;
+#endif
+
+    return str;
+}
+
+static VALUE
+lib_toUTF8(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE str, encodename;
+
+    if (rb_scan_args(argc, argv, "11", &str, &encodename) == 1) {
+        encodename = Qnil;
+    }
+    return lib_toUTF8_core(Qnil, str, encodename);
+}
+
+static VALUE
+ip_toUTF8(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE str, encodename;
+
+    if (rb_scan_args(argc, argv, "11", &str, &encodename) == 1) {
+        encodename = Qnil;
+    }
+    return lib_toUTF8_core(self, str, encodename);
+}
+
+static VALUE
+lib_fromUTF8_core(ip_obj, src, encodename)
+    VALUE ip_obj;
+    VALUE src;
+    VALUE encodename;
+{
+    volatile VALUE str = src;
+
+#ifdef TCL_UTF_MAX
+    Tcl_Interp *interp;
+    Tcl_Encoding encoding;
+    Tcl_DString dstr;
+    int taint_flag = OBJ_TAINTED(str);
+    char *buf;
+    int thr_crit_bup;
+#endif
+
+    tcl_stubs_check();
+
+    if (NIL_P(src)) {
+      return rb_str_new2("");
+    }
+
+#ifdef TCL_UTF_MAX
+    if (NIL_P(ip_obj)) {
+        interp = (Tcl_Interp *)NULL;
+    } else if (get_ip(ip_obj) == (struct tcltkip *)NULL) {
+        interp = (Tcl_Interp *)NULL;
+    } else {
+        interp = get_ip(ip_obj)->ip;
+    }
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    if (NIL_P(encodename)) {
+        volatile VALUE enc;
+
+        if (TYPE(str) == T_STRING) {
+            enc = rb_attr_get(str, ID_at_enc);
+            if (!NIL_P(enc)) {
+                StringValue(enc);
+                if (strcmp(RSTRING(enc)->ptr, "binary") == 0) {
+                    rb_thread_critical = thr_crit_bup;
+                    return str;
+                }
+            }
+        }
+
+        if (NIL_P(ip_obj)) {
+            encoding = (Tcl_Encoding)NULL;
+        } else {
+            enc = rb_attr_get(ip_obj, ID_at_enc);
+            if (NIL_P(enc)) {
+                encoding = (Tcl_Encoding)NULL;
+            } else {
+                StringValue(enc);
+                encoding = Tcl_GetEncoding(interp, RSTRING(enc)->ptr);
+                if (encoding == (Tcl_Encoding)NULL) {
+                    rb_warning("Tk-interp has unknown encoding information (@encoding:'%s')", RSTRING(enc)->ptr);
+                } else {
+                  encodename = rb_obj_dup(enc);
+                }
+            }
+        }
+
+    } else {
+        StringValue(encodename);
+
+        if (strcmp(RSTRING(encodename)->ptr, "binary") == 0) {
+            char *s;
+            int  len;
+
+            StringValue(str);
+            s = Tcl_GetByteArrayFromObj(Tcl_NewStringObj(RSTRING(str)->ptr, 
+                                                         RSTRING(str)->len), 
+                                        &len);
+            str = rb_tainted_str_new(s, len);
+            rb_ivar_set(str, ID_at_enc, rb_tainted_str_new2("binary"));
+
+            rb_thread_critical = thr_crit_bup;
+            return str;
+        }
+
+        encoding = Tcl_GetEncoding(interp, RSTRING(encodename)->ptr);
+        if (encoding == (Tcl_Encoding)NULL) {
+            /* 
+            rb_warning("unknown encoding name '%s'", 
+                       RSTRING(encodename)->ptr);
+            encodename = Qnil;
+            */
+            rb_raise(rb_eArgError, "unknown encoding name '%s'", 
+                     RSTRING(encodename)->ptr);
+        }
+    }
+
+    StringValue(str);
+
+    if (RSTRING(str)->len == 0) {
+        rb_thread_critical = thr_crit_bup;
+        return rb_tainted_str_new2("");
+    }
+
+    buf = ALLOC_N(char,strlen(RSTRING(str)->ptr)+1);
+    memcpy(buf, RSTRING(str)->ptr, RSTRING(str)->len);
+    buf[RSTRING(str)->len] = 0;
+
+    Tcl_DStringInit(&dstr);
+    Tcl_DStringFree(&dstr);
+    /* Tcl_UtfToExternalDString(encoding,buf,strlen(buf),&dstr); */
+    Tcl_UtfToExternalDString(encoding,buf,RSTRING(str)->len,&dstr);
+
+    /* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
+    /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
+    str = rb_str_new(Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
+    rb_ivar_set(str, ID_at_enc, encodename);
+
+    if (taint_flag) OBJ_TAINT(str);
+
+    if (encoding != (Tcl_Encoding)NULL) {
+        Tcl_FreeEncoding(encoding);
+    }
+    Tcl_DStringFree(&dstr);
+
+    free(buf);
+
+    rb_thread_critical = thr_crit_bup;
+#endif
+
+    return str;
+}
+
+static VALUE
+lib_fromUTF8(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE str, encodename;
+
+    if (rb_scan_args(argc, argv, "11", &str, &encodename) == 1) {
+        encodename = Qnil;
+    }
+    return lib_fromUTF8_core(Qnil, str, encodename);
+}
+
+static VALUE
+ip_fromUTF8(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE str, encodename;
+
+    if (rb_scan_args(argc, argv, "11", &str, &encodename) == 1) {
+        encodename = Qnil;
+    }
+    return lib_fromUTF8_core(self, str, encodename);
+}
+
+static VALUE
+lib_UTF_backslash_core(self, str, all_bs)
+    VALUE self;
+    VALUE str;
+    int all_bs;
+{
+#ifdef TCL_UTF_MAX
+    char *src_buf, *dst_buf, *ptr;
+    int read_len = 0, dst_len = 0;
+    int taint_flag = OBJ_TAINTED(str);
+    int thr_crit_bup;
+
+    tcl_stubs_check();
+
+    StringValue(str);
+    if (!RSTRING(str)->len) {
+        return str;
+    }
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    src_buf = ALLOC_N(char,(RSTRING(str)->len)+1);
+    memcpy(src_buf, RSTRING(str)->ptr, RSTRING(str)->len);
+    src_buf[RSTRING(str)->len] = 0;
+
+    dst_buf = ALLOC_N(char,(RSTRING(str)->len)+1);
+
+    ptr = src_buf;
+    while(RSTRING(str)->len > ptr - src_buf) {
+        if (*ptr == '\\' && (all_bs || *(ptr + 1) == 'u')) {
+            dst_len += Tcl_UtfBackslash(ptr, &read_len, (dst_buf + dst_len));
+            ptr += read_len;
+        } else {
+            *(dst_buf + (dst_len++)) = *(ptr++);
+        }
+    }
+
+    str = rb_str_new(dst_buf, dst_len);
+    if (taint_flag) OBJ_TAINT(str);
+
+    free(src_buf);
+    free(dst_buf);
+
+    rb_thread_critical = thr_crit_bup;
+#endif
+
+    return str;
+}
+
+static VALUE
+lib_UTF_backslash(self, str)
+    VALUE self;
+    VALUE str;
+{
+    return lib_UTF_backslash_core(self, str, 0);
+}
+
+static VALUE
+lib_Tcl_backslash(self, str)
+    VALUE self;
+    VALUE str;
+{
+    return lib_UTF_backslash_core(self, str, 1);
+}
+
+static VALUE
+lib_get_system_encoding(self)
+    VALUE self;
+{
+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0)
+    tcl_stubs_check();
+    return rb_str_new2(Tcl_GetEncodingName((Tcl_Encoding)NULL));
+#else
+    return Qnil;
+#endif
+}
+
+static VALUE
+lib_set_system_encoding(self, enc_name)
+    VALUE self;
+    VALUE enc_name;
+{
+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 0)
+    tcl_stubs_check();
+
+    if (NIL_P(enc_name)) {
+        Tcl_SetSystemEncoding((Tcl_Interp *)NULL, (CONST char *)NULL);
+        return lib_get_system_encoding(self);
+    }
+
+    enc_name = rb_funcall(enc_name, ID_to_s, 0, 0);
+    if (Tcl_SetSystemEncoding((Tcl_Interp *)NULL, 
+                              StringValuePtr(enc_name)) != TCL_OK) {
+        rb_raise(rb_eArgError, "unknown encoding name '%s'", 
+                 RSTRING(enc_name)->ptr);
+    }
+
+    return enc_name;
+#else
+    return Qnil;
+#endif
+}
+
+
+/* invoke Tcl proc */
+struct invoke_info {
+    struct tcltkip *ptr;
+    Tcl_CmdInfo cmdinfo;
+#if TCL_MAJOR_VERSION >= 8
+    int objc;
+    Tcl_Obj **objv;
+#else
+    int argc;
+    char **argv;
+#endif
+};
+
+static VALUE
+invoke_tcl_proc(arg)
+    VALUE arg;
+{
+    struct invoke_info *inf = (struct invoke_info *)arg;
+    int i, len;
+#if TCL_MAJOR_VERSION >= 8
+    int argc = inf->objc;
+    char **argv = (char **)NULL;
+#endif
+
+    /* memory allocation for arguments of this command */
+#if TCL_MAJOR_VERSION >= 8
+    if (!inf->cmdinfo.isNativeObjectProc) {
+        /* string interface */
+        argv = (char **)ALLOC_N(char *, argc+1);
+        for (i = 0; i < argc; ++i) {
+            argv[i] = Tcl_GetStringFromObj(inf->objv[i], &len);
+        }
+        argv[argc] = (char *)NULL;
+    }
+#endif
+
+    Tcl_ResetResult(inf->ptr->ip);
+
+    /* Invoke the C procedure */
+#if TCL_MAJOR_VERSION >= 8
+    if (inf->cmdinfo.isNativeObjectProc) {
+        inf->ptr->return_value 
+            = (*(inf->cmdinfo.objProc))(inf->cmdinfo.objClientData, 
+                                        inf->ptr->ip, inf->objc, inf->objv);
+    }
+    else
+#endif
+    {
+#if TCL_MAJOR_VERSION >= 8
+        inf->ptr->return_value 
+            = (*(inf->cmdinfo.proc))(inf->cmdinfo.clientData, inf->ptr->ip, 
+                                     argc, (CONST84 char **)argv);
+
+        free(argv);
+
+#else /* TCL_MAJOR_VERSION < 8 */
+        inf->ptr->return_value 
+            = (*(inf->cmdinfo.proc))(inf->cmdinfo.clientData, inf->ptr->ip, 
+                                     inf->argc, inf->argv);
+#endif
+    }
+
+    return Qnil;
+}
+
+
+#if TCL_MAJOR_VERSION >= 8
+static VALUE
+ip_invoke_core(interp, objc, objv)
+    VALUE interp;
+    int objc;
+    Tcl_Obj **objv;
+#else
+static VALUE
+ip_invoke_core(interp, argc, argv)
+    VALUE interp;
+    int argc;
+    char **argv;
+#endif
+{
+    struct tcltkip *ptr;
+    Tcl_CmdInfo info;
+    char *cmd;
+    int  len;
+    int  thr_crit_bup;
+    int unknown_flag = 0;
+
+#if 1 /* wrap tcl-proc call */
+    struct invoke_info inf;
+    int status;
+    VALUE ret;
+#else
+#if TCL_MAJOR_VERSION >= 8
+    int argc = objc;
+    char **argv = (char **)NULL;
+    /* Tcl_Obj *resultPtr; */
+#endif
+#endif
+
+    /* get the command name string */
+#if TCL_MAJOR_VERSION >= 8
+    cmd = Tcl_GetStringFromObj(objv[0], &len);
+#else /* TCL_MAJOR_VERSION < 8 */
+    cmd = argv[0];
+#endif
+
+    /* get the data struct */
+    ptr = get_ip(interp);
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        return rb_tainted_str_new2("");
+    }
+
+    /* Tcl_Preserve(ptr->ip); */
+    rbtk_preserve_ip(ptr);
+
+    /* map from the command name to a C procedure */
+    DUMP2("call Tcl_GetCommandInfo, %s", cmd);
+    if (!Tcl_GetCommandInfo(ptr->ip, cmd, &info)) {
+        DUMP1("error Tcl_GetCommandInfo");
+        DUMP1("try auto_load (call 'unknown' command)");
+        if (!Tcl_GetCommandInfo(ptr->ip, 
+#if TCL_MAJOR_VERSION >= 8
+                                "::unknown", 
+#else
+                                "unknown", 
+#endif
+                                &info)) {
+            DUMP1("fail to get 'unknown' command");
+            /* if (event_loop_abort_on_exc || cmd[0] != '.') { */
+            if (event_loop_abort_on_exc > 0) {
+                /* Tcl_Release(ptr->ip); */
+                rbtk_release_ip(ptr);
+                /*rb_ip_raise(obj,rb_eNameError,"invalid command name `%s'",cmd);*/
+                return create_ip_exc(interp, rb_eNameError, 
+                                     "invalid command name `%s'", cmd);
+            } else {
+                if (event_loop_abort_on_exc < 0) {
+                    rb_warning("invalid command name `%s' (ignore)", cmd);
+                } else {
+                    rb_warn("invalid command name `%s' (ignore)", cmd);
+                }
+                Tcl_ResetResult(ptr->ip);
+                /* Tcl_Release(ptr->ip); */
+                rbtk_release_ip(ptr);
+                return rb_tainted_str_new2("");
+            }
+        } else {
+#if TCL_MAJOR_VERSION >= 8
+            Tcl_Obj **unknown_objv;
+#else
+            char **unknown_argv;
+#endif
+            DUMP1("find 'unknown' command -> set arguemnts");
+            unknown_flag = 1;
+
+#if TCL_MAJOR_VERSION >= 8
+            unknown_objv = (Tcl_Obj **)ALLOC_N(Tcl_Obj *, objc+2);
+            unknown_objv[0] = Tcl_NewStringObj("::unknown", 9);
+            Tcl_IncrRefCount(unknown_objv[0]);
+            memcpy(unknown_objv + 1, objv, sizeof(Tcl_Obj *)*objc);
+            unknown_objv[++objc] = (Tcl_Obj*)NULL;
+            objv = unknown_objv;
+#else
+            unknown_argv = (char **)ALLOC_N(char *, argc+2);
+            unknown_argv[0] = strdup("unknown");
+            memcpy(unknown_argv + 1, argv, sizeof(char *)*argc);
+            unknown_argv[++argc] = (char *)NULL;
+            argv = unknown_argv;
+#endif
+        }
+    }
+    DUMP1("end Tcl_GetCommandInfo");
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+
+#if 1 /* wrap tcl-proc call */
+    /* setup params */
+    inf.ptr = ptr;
+    inf.cmdinfo = info;
+#if TCL_MAJOR_VERSION >= 8
+    inf.objc = objc;
+    inf.objv = objv;
+#else
+    inf.argc = argc;
+    inf.argv = argv;
+#endif
+
+    /* invoke tcl-proc */
+    ret = rb_protect(invoke_tcl_proc, (VALUE)&inf, &status);
+    switch(status) {
+    case TAG_RAISE:
+        if (NIL_P(ruby_errinfo)) {
+            rbtk_pending_exception = rb_exc_new2(rb_eException, 
+                                                 "unknown exception");
+        } else {
+            rbtk_pending_exception = ruby_errinfo;
+        }
+        break;
+        
+    case TAG_FATAL:
+        if (NIL_P(ruby_errinfo)) {
+            rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
+        } else {
+            rbtk_pending_exception = ruby_errinfo;
+        }
+    }
+
+#else /* !wrap tcl-proc call */
+
+    /* memory allocation for arguments of this command */
+#if TCL_MAJOR_VERSION >= 8
+    if (!info.isNativeObjectProc) {
+        int i;
+
+        /* string interface */
+        argv = (char **)ALLOC_N(char *, argc+1);
+        for (i = 0; i < argc; ++i) {
+            argv[i] = Tcl_GetStringFromObj(objv[i], &len);
+        }
+        argv[argc] = (char *)NULL;
+    }
+#endif
+
+    Tcl_ResetResult(ptr->ip);
+
+    /* Invoke the C procedure */
+#if TCL_MAJOR_VERSION >= 8
+    if (info.isNativeObjectProc) {
+        ptr->return_value = (*info.objProc)(info.objClientData, ptr->ip, 
+                                            objc, objv);
+#if 0
+        /* get the string value from the result object */
+        resultPtr = Tcl_GetObjResult(ptr->ip);
+        Tcl_SetResult(ptr->ip, Tcl_GetStringFromObj(resultPtr, &len),
+                      TCL_VOLATILE);
+#endif
+    }
+    else
+#endif
+    {
+#if TCL_MAJOR_VERSION >= 8
+        ptr->return_value = (*info.proc)(info.clientData, ptr->ip, 
+                                         argc, (CONST84 char **)argv);
+
+        free(argv);
+
+#else /* TCL_MAJOR_VERSION < 8 */
+        ptr->return_value = (*info.proc)(info.clientData, ptr->ip, 
+                                         argc, argv);
+#endif
+    }
+#endif /* ! wrap tcl-proc call */
+
+    /* free allocated memory for calling 'unknown' command */
+    if (unknown_flag) {
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(objv[0]);
+        free(objv);
+#else
+        free(argv[0]);
+        free(argv);
+#endif
+    }
+
+    /* exception on mainloop */
+    if (pending_exception_check1(thr_crit_bup, ptr)) {
+        return rbtk_pending_exception;
+    }
+
+    rb_thread_critical = thr_crit_bup;
+
+    if (ptr->return_value == TCL_ERROR) {
+        if (event_loop_abort_on_exc > 0 && !Tcl_InterpDeleted(ptr->ip)) {
+
+            return create_ip_exc(interp, rb_eRuntimeError, 
+                                 "%s", Tcl_GetStringResult(ptr->ip));
+        } else {
+            if (event_loop_abort_on_exc < 0) {
+                rb_warning("%s (ignore)", Tcl_GetStringResult(ptr->ip));
+            } else {
+                rb_warn("%s (ignore)", Tcl_GetStringResult(ptr->ip));
+            }
+            Tcl_ResetResult(ptr->ip);
+            return rb_tainted_str_new2("");
+        }
+    }
+
+    /* pass back the result (as string) */
+    return ip_get_result_string_obj(ptr->ip);
+}
+
+
+#if TCL_MAJOR_VERSION >= 8
+static Tcl_Obj **
+#else /* TCL_MAJOR_VERSION < 8 */
+static char **
+#endif
+alloc_invoke_arguments(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    int i;
+    int thr_crit_bup;
+
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_Obj **av;
+#else /* TCL_MAJOR_VERSION < 8 */
+    char **av;
+#endif
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    /* memory allocation */
+#if TCL_MAJOR_VERSION >= 8
+    av = ALLOC_N(Tcl_Obj *, argc+1);
+    for (i = 0; i < argc; ++i) {
+        av[i] = get_obj_from_str(argv[i]);
+        Tcl_IncrRefCount(av[i]);
+    }
+    av[argc] = NULL;
+
+#else /* TCL_MAJOR_VERSION < 8 */
+    /* string interface */
+    av = ALLOC_N(char *, argc+1);
+    for (i = 0; i < argc; ++i) {
+        av[i] = strdup(StringValuePtr(argv[i]));
+    }
+    av[argc] = NULL;
+#endif
+
+    rb_thread_critical = thr_crit_bup;
+
+    return av;
+}
+
+static void
+free_invoke_arguments(argc, av)
+    int argc;
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_Obj **av;
+#else /* TCL_MAJOR_VERSION < 8 */
+    char **av;
+#endif
+{
+    int i;
+
+    for (i = 0; i < argc; ++i) {
+#if TCL_MAJOR_VERSION >= 8
+        Tcl_DecrRefCount(av[i]);
+#else /* TCL_MAJOR_VERSION < 8 */
+        free(av[i]);
+#endif
+    }
+    free(av);
+}
+
+static VALUE
+ip_invoke_real(argc, argv, interp)
+    int argc;
+    VALUE *argv;
+    VALUE interp;
+{
+    VALUE v;
+    struct tcltkip *ptr;        /* tcltkip data struct */
+
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_Obj **av = (Tcl_Obj **)NULL;
+#else /* TCL_MAJOR_VERSION < 8 */
+    char **av = (char **)NULL;
+#endif
+
+    DUMP2("invoke_real called by thread:%lx", rb_thread_current());
+
+    /* get the data struct */
+    ptr = get_ip(interp);
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        return rb_tainted_str_new2("");
+    }
+
+    /* allocate memory for arguments */
+    av = alloc_invoke_arguments(argc, argv);
+
+    /* Invoke the C procedure */
+    Tcl_ResetResult(ptr->ip);
+    v = ip_invoke_core(interp, argc, av);
+
+    /* free allocated memory */
+    free_invoke_arguments(argc, av);
+
+    return v;
+}
+
+VALUE
+ivq_safelevel_handler(arg, ivq)
+    VALUE arg;
+    VALUE ivq;
+{
+    struct invoke_queue *q;
+
+    Data_Get_Struct(ivq, struct invoke_queue, q);
+    DUMP2("(safe-level handler) $SAFE = %d", q->safe_level);
+    rb_set_safe_level(q->safe_level);
+    return ip_invoke_core(q->interp, q->argc, q->argv);
+}
+
+int invoke_queue_handler _((Tcl_Event *, int));
+int
+invoke_queue_handler(evPtr, flags)
+    Tcl_Event *evPtr;
+    int flags;
+{
+    struct invoke_queue *q = (struct invoke_queue *)evPtr;
+    volatile VALUE ret;
+    volatile VALUE q_dat;
+
+    DUMP2("do_invoke_queue_handler : evPtr = %p", evPtr);
+    DUMP2("invoke queue_thread : %lx", rb_thread_current());
+    DUMP2("added by thread : %lx", q->thread);
+
+    if (*(q->done)) {
+        DUMP1("processed by another event-loop");
+        return 0;
+    } else {
+        DUMP1("process it on current event-loop");
+    }
+
+    /* process it */
+    *(q->done) = 1;
+
+    /* check safe-level */
+    if (rb_safe_level() != q->safe_level) {
+        /* q_dat = Data_Wrap_Struct(rb_cData,0,0,q); */
+        q_dat = Data_Wrap_Struct(rb_cData,invoke_queue_mark,0,q);
+        ret = rb_funcall(rb_proc_new(ivq_safelevel_handler, q_dat), 
+                         ID_call, 0);
+        rb_gc_force_recycle(q_dat);
+    } else {
+        DUMP2("call invoke_real (for caller thread:%lx)", q->thread);
+        DUMP2("call invoke_real (current thread:%lx)", rb_thread_current());
+        ret = ip_invoke_core(q->interp, q->argc, q->argv);
+    }
+
+    /* set result */
+    RARRAY(q->result)->ptr[0] = ret;
+
+    /* complete */
+    *(q->done) = -1;
+
+    /* back to caller */
+    if (RTEST(rb_funcall(q->thread, ID_alive_p, 0, 0))) {
+      DUMP2("back to caller (caller thread:%lx)", q->thread);
+      DUMP2("               (current thread:%lx)", rb_thread_current());
+      rb_thread_run(q->thread);
+      DUMP1("finish back to caller");
+    } else {
+      DUMP2("caller is dead (caller thread:%lx)", q->thread);
+      DUMP2("               (current thread:%lx)", rb_thread_current());
+    }
+
+    /* end of handler : remove it */
+    return 1;
+}
+
+static VALUE
+ip_invoke_with_position(argc, argv, obj, position)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+    Tcl_QueuePosition position;
+{
+    struct invoke_queue *ivq;
+    int  *alloc_done;
+    int  thr_crit_bup;
+    volatile VALUE current = rb_thread_current();
+    volatile VALUE ip_obj = obj;
+    volatile VALUE result;
+    volatile VALUE ret;
+
+#if TCL_MAJOR_VERSION >= 8
+    Tcl_Obj **av = (Tcl_Obj **)NULL;
+#else /* TCL_MAJOR_VERSION < 8 */
+    char **av = (char **)NULL;
+#endif
+
+    if (argc < 1) {
+        rb_raise(rb_eArgError, "command name missing");
+    }
+    if (NIL_P(eventloop_thread) || current == eventloop_thread) {
+        if (NIL_P(eventloop_thread)) {
+            DUMP2("invoke from thread:%lx but no eventloop", current);
+        } else {
+            DUMP2("invoke from current eventloop %lx", current);
+        }
+        result = ip_invoke_real(argc, argv, ip_obj);
+        if (rb_obj_is_kind_of(result, rb_eException)) {
+            rb_exc_raise(result);
+        }
+        return result;
+    }
+
+    DUMP2("invoke from thread %lx (NOT current eventloop)", current);
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    /* allocate memory (for arguments) */
+    av = alloc_invoke_arguments(argc, argv);
+
+    /* allocate memory (keep result) */
+    alloc_done = (int*)ALLOC(int);
+    *alloc_done = 0;
+
+    /* allocate memory (freed by Tcl_ServiceEvent) */
+    ivq = (struct invoke_queue *)Tcl_Alloc(sizeof(struct invoke_queue));
+    Tcl_Preserve(ivq);
+
+    /* allocate result obj */
+    result = rb_ary_new2(1);
+    RARRAY(result)->ptr[0] = Qnil;
+    RARRAY(result)->len = 1;
+
+    /* construct event data */
+    ivq->done = alloc_done;
+    ivq->argc = argc;
+    ivq->argv = av;
+    ivq->interp = ip_obj;
+    ivq->result = result;
+    ivq->thread = current;
+    ivq->safe_level = rb_safe_level();
+    ivq->ev.proc = invoke_queue_handler;
+
+    /* add the handler to Tcl event queue */
+    DUMP1("add handler");
+    Tcl_QueueEvent(&(ivq->ev), position);
+
+    rb_thread_critical = thr_crit_bup;
+
+    /* wait for the handler to be processed */
+    DUMP2("wait for handler (current thread:%lx)", current);
+    while(*alloc_done >= 0) {
+        rb_thread_stop();
+    }
+    DUMP2("back from handler (current thread:%lx)", current);
+
+    /* get result & free allocated memory */
+    ret = RARRAY(result)->ptr[0];
+    free(alloc_done);
+
+    Tcl_Release(ivq);
+
+    /* free allocated memory */
+    free_invoke_arguments(argc, av);
+
+    /* exception? */
+    if (rb_obj_is_kind_of(ret, rb_eException)) {
+        DUMP1("raise exception");
+        rb_exc_raise(ret);
+    }
+
+    DUMP1("exit ip_invoke");
+    return ret;
+}
+
+
+/* get return code from Tcl_Eval() */
+static VALUE
+ip_retval(self)
+    VALUE self;
+{
+    struct tcltkip *ptr;        /* tcltkip data struct */
+
+    /* get the data strcut */
+    ptr = get_ip(self);
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        return rb_tainted_str_new2("");
+    }
+
+    return (INT2FIX(ptr->return_value));
+}
+
+static VALUE
+ip_invoke(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_TAIL);
+}
+
+static VALUE
+ip_invoke_immediate(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    /* POTENTIALY INSECURE : can create infinite loop */
+    rb_secure(4);
+    return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_HEAD);
+}
+
+
+/* access Tcl variables */
+static VALUE
+ip_get_variable2_core(interp, argc, argv)
+    VALUE interp;
+    int   argc;
+    VALUE *argv;
+{
+    struct tcltkip *ptr = get_ip(interp);
+    int thr_crit_bup;
+    volatile VALUE varname, index, flag;
+
+    varname = argv[0];
+    index   = argv[1];
+    flag    = argv[2];
+
+    /* 
+    StringValue(varname);
+    if (!NIL_P(index)) StringValue(index);
+    */
+
+#if TCL_MAJOR_VERSION >= 8
+    {
+        Tcl_Obj *ret;
+        volatile VALUE strval;
+
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        /* ip is deleted? */
+        if (deleted_ip(ptr)) {
+            rb_thread_critical = thr_crit_bup;
+            return rb_tainted_str_new2("");
+        } else {
+            /* Tcl_Preserve(ptr->ip); */
+            rbtk_preserve_ip(ptr);
+            ret = Tcl_GetVar2Ex(ptr->ip, RSTRING(varname)->ptr,
+                                NIL_P(index) ? NULL : RSTRING(index)->ptr,
+                                FIX2INT(flag));
+        }
+
+        if (ret == (Tcl_Obj*)NULL) {
+            volatile VALUE exc;
+            /* exc = rb_exc_new2(rb_eRuntimeError, 
+                                 Tcl_GetStringResult(ptr->ip)); */
+            exc = create_ip_exc(interp, rb_eRuntimeError, 
+                                Tcl_GetStringResult(ptr->ip));
+            /* Tcl_Release(ptr->ip); */
+            rbtk_release_ip(ptr);
+            rb_thread_critical = thr_crit_bup;
+            return exc;
+        }
+
+        Tcl_IncrRefCount(ret);
+        strval = get_str_from_obj(ret);
+        OBJ_TAINT(strval);
+        Tcl_DecrRefCount(ret);
+
+        /* Tcl_Release(ptr->ip); */
+        rbtk_release_ip(ptr);
+        rb_thread_critical = thr_crit_bup;
+        return(strval);
+    }
+#else /* TCL_MAJOR_VERSION < 8 */
+    {
+        char *ret;
+        volatile VALUE strval;
+
+        /* ip is deleted? */
+        if (deleted_ip(ptr)) {
+            return rb_tainted_str_new2("");
+        } else {
+            /* Tcl_Preserve(ptr->ip); */
+            rbtk_preserve_ip(ptr);
+            ret = Tcl_GetVar2(ptr->ip, RSTRING(varname)->ptr, 
+                              NIL_P(index) ? NULL : RSTRING(index)->ptr,
+                              FIX2INT(flag));
+        }
+
+        if (ret == (char*)NULL) {
+            volatile VALUE exc;
+            exc = rb_exc_new2(rb_eRuntimeError, Tcl_GetStringResult(ptr->ip));
+            /* Tcl_Release(ptr->ip); */
+            rbtk_release_ip(ptr);
+            rb_thread_critical = thr_crit_bup;
+            return exc;
+        }
+
+        strval = rb_tainted_str_new2(ret);
+        /* Tcl_Release(ptr->ip); */
+        rbtk_release_ip(ptr);
+        rb_thread_critical = thr_crit_bup;
+
+        return(strval);
+    }
+#endif
+}
+
+static VALUE
+ip_get_variable2(self, varname, index, flag)
+    VALUE self;
+    VALUE varname;
+    VALUE index;
+    VALUE flag;
+{
+    VALUE argv[3];
+    VALUE retval;
+
+    StringValue(varname);
+    if (!NIL_P(index)) StringValue(index);
+
+    argv[0] = varname;
+    argv[1] = index;
+    argv[2] = flag;
+
+    retval = tk_funcall(ip_get_variable2_core, 3, argv, self);
+
+    if (NIL_P(retval)) {
+        return rb_tainted_str_new2("");
+    } else {
+        return retval;
+    }
+}
+
+static VALUE
+ip_get_variable(self, varname, flag)
+    VALUE self;
+    VALUE varname;
+    VALUE flag;
+{
+    return ip_get_variable2(self, varname, Qnil, flag);
+}
+
+static VALUE
+ip_set_variable2_core(interp, argc, argv)
+    VALUE interp;
+    int   argc;
+    VALUE *argv;
+{
+    struct tcltkip *ptr = get_ip(interp);
+    int thr_crit_bup;
+    volatile VALUE varname, index, value, flag;
+
+    varname = argv[0];
+    index   = argv[1];
+    value   = argv[2];
+    flag    = argv[3];
+
+    /*
+    StringValue(varname);
+    if (!NIL_P(index)) StringValue(index);
+    StringValue(value);
+    */
+
+#if TCL_MAJOR_VERSION >= 8
+    {
+        Tcl_Obj *valobj, *ret;
+        volatile VALUE strval;
+
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        valobj = get_obj_from_str(value);
+        Tcl_IncrRefCount(valobj);
+
+        /* ip is deleted? */
+        if (deleted_ip(ptr)) {
+            Tcl_DecrRefCount(valobj);
+            rb_thread_critical = thr_crit_bup;
+            return rb_tainted_str_new2("");
+        } else {
+            /* Tcl_Preserve(ptr->ip); */
+            rbtk_preserve_ip(ptr);
+            ret = Tcl_SetVar2Ex(ptr->ip, RSTRING(varname)->ptr,
+                                NIL_P(index) ? NULL : RSTRING(index)->ptr,
+                                valobj, FIX2INT(flag));
+        }
+
+        Tcl_DecrRefCount(valobj);
+
+        if (ret == (Tcl_Obj*)NULL) {
+            volatile VALUE exc;
+            /* exc = rb_exc_new2(rb_eRuntimeError, 
+                                 Tcl_GetStringResult(ptr->ip)); */
+            exc = create_ip_exc(interp, rb_eRuntimeError, 
+                                Tcl_GetStringResult(ptr->ip));
+            /* Tcl_Release(ptr->ip); */
+            rbtk_release_ip(ptr);
+            rb_thread_critical = thr_crit_bup;
+            return exc;
+        }
+
+        Tcl_IncrRefCount(ret);
+        strval = get_str_from_obj(ret);
+        OBJ_TAINT(strval);
+        Tcl_DecrRefCount(ret);
+
+        /* Tcl_Release(ptr->ip); */
+        rbtk_release_ip(ptr);
+        rb_thread_critical = thr_crit_bup;
+
+        return(strval);
+    }
+#else /* TCL_MAJOR_VERSION < 8 */
+    {
+        CONST char *ret;
+        volatile VALUE strval;
+
+        /* ip is deleted? */
+        if (deleted_ip(ptr)) {
+            return rb_tainted_str_new2("");
+        } else {
+            /* Tcl_Preserve(ptr->ip); */
+            rbtk_preserve_ip(ptr);
+            ret = Tcl_SetVar2(ptr->ip, RSTRING(varname)->ptr, 
+                              NIL_P(index) ? NULL : RSTRING(index)->ptr, 
+                              RSTRING(value)->ptr, FIX2INT(flag));
+        }
+
+        if (ret == (char*)NULL) {
+            return rb_exc_new2(rb_eRuntimeError, ptr->ip->result);
+        }
+
+        strval = rb_tainted_str_new2(ret);
+
+        /* Tcl_Release(ptr->ip); */
+        rbtk_release_ip(ptr);
+        rb_thread_critical = thr_crit_bup;
+
+        return(strval);
+    }
+#endif
+}
+
+static VALUE
+ip_set_variable2(self, varname, index, value, flag)
+    VALUE self;
+    VALUE varname;
+    VALUE index;
+    VALUE value;
+    VALUE flag;
+{
+    VALUE argv[4];
+    VALUE retval;
+
+    StringValue(varname);
+    if (!NIL_P(index)) StringValue(index);
+    StringValue(value);
+
+    argv[0] = varname;
+    argv[1] = index;
+    argv[2] = value;
+    argv[3] = flag;
+
+    retval = tk_funcall(ip_set_variable2_core, 4, argv, self);
+
+    if (NIL_P(retval)) {
+        return rb_tainted_str_new2("");
+    } else {
+        return retval;
+    }
+}
+
+static VALUE
+ip_set_variable(self, varname, value, flag)
+    VALUE self;
+    VALUE varname;
+    VALUE value;
+    VALUE flag;
+{
+    return ip_set_variable2(self, varname, Qnil, value, flag);
+}
+
+static VALUE
+ip_unset_variable2_core(interp, argc, argv)
+    VALUE interp;
+    int   argc;
+    VALUE *argv;
+{
+    struct tcltkip *ptr = get_ip(interp);
+    volatile VALUE varname, index, flag;
+
+    varname = argv[0];
+    index   = argv[1];
+    flag    = argv[2];
+
+    /* 
+    StringValue(varname);
+    if (!NIL_P(index)) StringValue(index);
+    */
+
+    /* ip is deleted? */
+    if (deleted_ip(ptr)) {
+        return Qtrue;
+    }
+
+    ptr->return_value = Tcl_UnsetVar2(ptr->ip, RSTRING(varname)->ptr, 
+                                      NIL_P(index) ? NULL : RSTRING(index)->ptr,
+                                      FIX2INT(flag));
+
+    if (ptr->return_value == TCL_ERROR) {
+        if (FIX2INT(flag) & TCL_LEAVE_ERR_MSG) {
+            /* return rb_exc_new2(rb_eRuntimeError, 
+                                  Tcl_GetStringResult(ptr->ip)); */
+            return create_ip_exc(interp, rb_eRuntimeError, 
+                                 Tcl_GetStringResult(ptr->ip));
+        }
+        return Qfalse;
+    }
+    return Qtrue;
+}
+
+static VALUE
+ip_unset_variable2(self, varname, index, flag)
+    VALUE self;
+    VALUE varname;
+    VALUE index;
+    VALUE flag;
+{
+    VALUE argv[3];
+    VALUE retval;
+
+    StringValue(varname);
+    if (!NIL_P(index)) StringValue(index);
+
+    argv[0] = varname;
+    argv[1] = index;
+    argv[2] = flag;
+
+    retval = tk_funcall(ip_unset_variable2_core, 3, argv, self);
+
+    if (NIL_P(retval)) {
+        return rb_tainted_str_new2("");
+    } else {
+        return retval;
+    }
+}
+
+static VALUE
+ip_unset_variable(self, varname, flag)
+    VALUE self;
+    VALUE varname;
+    VALUE flag;
+{
+    return ip_unset_variable2(self, varname, Qnil, flag);
+}
+
+static VALUE
+ip_get_global_var(self, varname)
+    VALUE self;
+    VALUE varname;
+{
+    return ip_get_variable(self, varname, 
+                           INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
+}
+
+static VALUE
+ip_get_global_var2(self, varname, index)
+    VALUE self;
+    VALUE varname;
+    VALUE index;
+{
+    return ip_get_variable2(self, varname, index, 
+                            INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
+}
+
+static VALUE
+ip_set_global_var(self, varname, value)
+    VALUE self;
+    VALUE varname;
+    VALUE value;
+{
+    return ip_set_variable(self, varname, value, 
+                           INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
+}
+
+static VALUE
+ip_set_global_var2(self, varname, index, value)
+    VALUE self;
+    VALUE varname;
+    VALUE index;
+    VALUE value;
+{
+    return ip_set_variable2(self, varname, index, value, 
+                            INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
+}
+
+static VALUE
+ip_unset_global_var(self, varname)
+    VALUE self;
+    VALUE varname;
+{
+    return ip_unset_variable(self, varname, 
+                             INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
+}
+
+static VALUE
+ip_unset_global_var2(self, varname, index)
+    VALUE self;
+    VALUE varname;
+    VALUE index;
+{
+    return ip_unset_variable2(self, varname, index, 
+                              INT2FIX(TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
+}
+
+
+/* treat Tcl_List */
+static VALUE
+lib_split_tklist_core(ip_obj, list_str)
+    VALUE ip_obj;
+    VALUE list_str;
+{
+    Tcl_Interp *interp;
+    volatile VALUE ary, elem;
+    int idx;
+    int taint_flag = OBJ_TAINTED(list_str);
+    int result;
+    VALUE old_gc;
+
+    tcl_stubs_check();
+
+    if (NIL_P(ip_obj)) {
+        interp = (Tcl_Interp *)NULL;
+    } else if (get_ip(ip_obj) == (struct tcltkip *)NULL) {
+        interp = (Tcl_Interp *)NULL;
+    } else {
+        interp = get_ip(ip_obj)->ip;
+    }
+
+    StringValue(list_str);
+
+    {
+#if TCL_MAJOR_VERSION >= 8
+        /* object style interface */
+        Tcl_Obj *listobj;
+        int     objc;
+        Tcl_Obj **objv;
+        int thr_crit_bup;
+
+        listobj = get_obj_from_str(list_str);
+
+        Tcl_IncrRefCount(listobj);
+
+        result = Tcl_ListObjGetElements(interp, listobj, &objc, &objv);
+
+        if (result == TCL_ERROR) {
+            Tcl_DecrRefCount(listobj);
+            if (interp == (Tcl_Interp*)NULL) {
+                rb_raise(rb_eRuntimeError, "can't get elements from list");
+            } else {
+                rb_raise(rb_eRuntimeError, "%s", Tcl_GetStringResult(interp));
+            }
+        }
+
+        for(idx = 0; idx < objc; idx++) {
+            Tcl_IncrRefCount(objv[idx]);
+        }
+
+        thr_crit_bup = rb_thread_critical;
+        rb_thread_critical = Qtrue;
+
+        ary = rb_ary_new2(objc);
+        if (taint_flag) OBJ_TAINT(ary);
+
+        old_gc = rb_gc_disable();
+
+        for(idx = 0; idx < objc; idx++) {
+            elem = get_str_from_obj(objv[idx]);
+            if (taint_flag) OBJ_TAINT(elem);
+            RARRAY(ary)->ptr[idx] = elem;
+        }
+
+        RARRAY(ary)->len = objc;
+
+        if (old_gc == Qfalse) rb_gc_enable();
+
+        rb_thread_critical = thr_crit_bup;
+
+        for(idx = 0; idx < objc; idx++) {
+            Tcl_DecrRefCount(objv[idx]);
+        }
+
+        Tcl_DecrRefCount(listobj);
+
+#else /* TCL_MAJOR_VERSION < 8 */
+        /* string style interface */
+        int  argc;
+        char **argv;
+
+        if (Tcl_SplitList(interp, RSTRING(list_str)->ptr, 
+                          &argc, &argv) == TCL_ERROR) {
+            if (interp == (Tcl_Interp*)NULL) {
+                rb_raise(rb_eRuntimeError, "can't get elements from list");
+            } else {
+                rb_raise(rb_eRuntimeError, "%s", interp->result);
+            }
+        }
+
+        ary = rb_ary_new2(argc);
+        if (taint_flag) OBJ_TAINT(ary);
+
+        old_gc = rb_gc_disable();
+
+        for(idx = 0; idx < argc; idx++) {
+            if (taint_flag) {
+                elem = rb_tainted_str_new2(argv[idx]);
+            } else {
+                elem = rb_str_new2(argv[idx]);
+            }
+            /* rb_ivar_set(elem, ID_at_enc, rb_str_new2("binary")); */
+            RARRAY(ary)->ptr[idx] = elem;
+        }
+        RARRAY(ary)->len = argc;
+
+        if (old_gc == Qfalse) rb_gc_enable();
+#endif
+    }
+
+    return ary;
+}
+
+static VALUE
+lib_split_tklist(self, list_str)
+    VALUE self;
+    VALUE list_str;
+{
+    return lib_split_tklist_core(Qnil, list_str);
+}
+
+
+static VALUE
+ip_split_tklist(self, list_str)
+    VALUE self;
+    VALUE list_str;
+{
+    return lib_split_tklist_core(self, list_str);
+}
+
+static VALUE
+lib_merge_tklist(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    int  num, len;
+    int  *flagPtr;
+    char *dst, *result;
+    volatile VALUE str;
+    int taint_flag = 0;
+    int thr_crit_bup;
+    VALUE old_gc;
+
+    if (argc == 0) return rb_str_new2("");
+
+    tcl_stubs_check();
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+    old_gc = rb_gc_disable();
+
+    /* based on Tcl/Tk's Tcl_Merge() */
+    flagPtr = ALLOC_N(int, argc);
+
+    /* pass 1 */
+    len = 1;
+    for(num = 0; num < argc; num++) {
+        if (OBJ_TAINTED(argv[num])) taint_flag = 1;
+        dst = StringValuePtr(argv[num]);
+#if TCL_MAJOR_VERSION >= 8
+        len += Tcl_ScanCountedElement(dst, RSTRING(argv[num])->len, 
+                                      &flagPtr[num]) + 1;
+#else /* TCL_MAJOR_VERSION < 8 */
+        len += Tcl_ScanElement(dst, &flagPtr[num]) + 1;
+#endif
+    }
+
+    /* pass 2 */
+    result = (char *)Tcl_Alloc(len);
+    dst = result;
+    for(num = 0; num < argc; num++) {
+#if TCL_MAJOR_VERSION >= 8
+        len = Tcl_ConvertCountedElement(RSTRING(argv[num])->ptr, 
+                                        RSTRING(argv[num])->len, 
+                                        dst, flagPtr[num]);
+#else /* TCL_MAJOR_VERSION < 8 */
+        len = Tcl_ConvertElement(RSTRING(argv[num])->ptr, dst, flagPtr[num]);
+#endif
+        dst += len;
+        *dst = ' ';
+        dst++;
+    }
+    if (dst == result) {
+        *dst = 0;
+    } else {
+        dst[-1] = 0;
+    }
+
+    free(flagPtr);
+
+    /* create object */
+    str = rb_str_new(result, dst - result - 1);
+    if (taint_flag) OBJ_TAINT(str);
+    Tcl_Free(result);
+
+    if (old_gc == Qfalse) rb_gc_enable();
+    rb_thread_critical = thr_crit_bup;
+
+    return str;
+}
+
+static VALUE
+lib_conv_listelement(self, src)
+    VALUE self;
+    VALUE src;
+{
+    int   len, scan_flag;
+    volatile VALUE dst;
+    int   taint_flag = OBJ_TAINTED(src);
+    int thr_crit_bup;
+
+    tcl_stubs_check();
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    StringValue(src);
+
+#if TCL_MAJOR_VERSION >= 8
+    len = Tcl_ScanCountedElement(RSTRING(src)->ptr, RSTRING(src)->len, 
+                                 &scan_flag);
+    dst = rb_str_new(0, len + 1);
+    len = Tcl_ConvertCountedElement(RSTRING(src)->ptr, RSTRING(src)->len, 
+                                    RSTRING(dst)->ptr, scan_flag);
+#else /* TCL_MAJOR_VERSION < 8 */
+    len = Tcl_ScanElement(RSTRING(src)->ptr, &scan_flag);
+    dst = rb_str_new(0, len + 1);
+    len = Tcl_ConvertElement(RSTRING(src)->ptr, RSTRING(dst)->ptr, scan_flag);
+#endif
+
+    RSTRING(dst)->len = len;
+    RSTRING(dst)->ptr[len] = '\0';
+    if (taint_flag) OBJ_TAINT(dst);
+
+    rb_thread_critical = thr_crit_bup;
+
+    return dst;
+}
+
+
+static VALUE
+tcltklib_compile_info()
+{
+    volatile VALUE ret;
+    int size;
+    char form[] 
+      = "tcltklib %s :: Ruby%s (%s) %s pthread :: Tcl%s(%s)/Tk%s(%s) %s";
+    char *info;
+
+    size = strlen(form)
+        + strlen(TCLTKLIB_RELEASE_DATE)
+        + strlen(RUBY_VERSION)
+        + strlen(RUBY_RELEASE_DATE)
+        + strlen("without") 
+        + strlen(TCL_PATCH_LEVEL)
+        + strlen("without stub")
+        + strlen(TK_PATCH_LEVEL)
+        + strlen("without stub") 
+        + strlen("unknown tcl_threads");
+
+    info = ALLOC_N(char, size);
+
+    sprintf(info, form,
+            TCLTKLIB_RELEASE_DATE, 
+            RUBY_VERSION, RUBY_RELEASE_DATE, 
+#ifdef HAVE_NATIVETHREAD
+            "with",
+#else
+            "without",
+#endif
+            TCL_PATCH_LEVEL, 
+#ifdef USE_TCL_STUBS
+            "with stub",
+#else
+            "without stub",
+#endif
+            TK_PATCH_LEVEL, 
+#ifdef USE_TK_STUBS
+            "with stub",
+#else
+            "without stub",
+#endif
+#ifdef WITH_TCL_ENABLE_THREAD
+# if WITH_TCL_ENABLE_THREAD
+            "with tcl_threads"
+# else
+            "without tcl_threads"
+# endif
+#else
+            "unknown tcl_threads"
+#endif
+        );
+
+    ret = rb_obj_freeze(rb_str_new2(info));
+
+    free(info);
+
+    return ret;
+}
+
+/*###############################################*/
+
+/*
+ *   The following is based on tkMenu.[ch] 
+ *   of Tcl/Tk (>=8.0) source code.
+ */
+#if TCL_MAJOR_VERSION >= 8
+
+#define MASTER_MENU             0
+#define TEAROFF_MENU            1
+#define MENUBAR                 2
+
+struct dummy_TkMenuEntry {
+    int type;
+    struct dummy_TkMenu *menuPtr;
+    /* , and etc.   */
+};
+
+struct dummy_TkMenu {
+    Tk_Window tkwin;
+    Display *display;
+    Tcl_Interp *interp;
+    Tcl_Command widgetCmd;
+    struct dummy_TkMenuEntry **entries;
+    int numEntries;
+    int active;
+    int menuType;     /* MASTER_MENU, TEAROFF_MENU, or MENUBAR */
+    Tcl_Obj *menuTypePtr;
+    /* , and etc.   */
+};
+
+struct dummy_TkMenuRef {
+    struct dummy_TkMenu *menuPtr;
+    char *dummy1;
+    char *dummy2;
+    char *dummy3;
+};
+
+EXTERN struct dummy_TkMenuRef *TkFindMenuReferences(Tcl_Interp*, char*);
+
+#endif
+
+static VALUE
+ip_make_menu_embeddable(interp, menu_path)
+    VALUE interp;
+    VALUE menu_path;
+{
+#if TCL_MAJOR_VERSION >= 8
+    struct tcltkip *ptr = get_ip(interp);
+    struct dummy_TkMenuRef *menuRefPtr;
+
+    StringValue(menu_path);
+
+    menuRefPtr = TkFindMenuReferences(ptr->ip, RSTRING(menu_path)->ptr);
+    if (menuRefPtr == (struct dummy_TkMenuRef *) NULL) {
+        rb_raise(rb_eArgError, "not a menu widget, or invalid widget path");
+    }
+
+    if (menuRefPtr->menuPtr == (struct dummy_TkMenu *) NULL) {
+        rb_raise(rb_eRuntimeError, 
+		 "invalid menu widget (maybe already destroyed)");
+    }
+
+    if ((menuRefPtr->menuPtr)->menuType != MENUBAR) {
+        rb_raise(rb_eRuntimeError, 
+		 "target menu widget must be a MENUBAR type");
+    }
+
+    (menuRefPtr->menuPtr)->menuType = TEAROFF_MENU;
+#if 0  /* cause SEGV */
+    {
+       /* char *s = "tearoff"; */
+       char *s = "normal";
+       /* Tcl_SetStringObj((menuRefPtr->menuPtr)->menuTypePtr, s, strlen(s));*/
+       (menuRefPtr->menuPtr)->menuTypePtr = Tcl_NewStringObj(s, strlen(s));
+       /* (menuRefPtr->menuPtr)->menuType = TEAROFF_MENU; */
+       (menuRefPtr->menuPtr)->menuType = MASTER_MENU;
+    }
+#endif
+
+    TkEventuallyRecomputeMenu(menuRefPtr->menuPtr);
+    TkEventuallyRedrawMenu(menuRefPtr->menuPtr, 
+			   (struct dummy_TkMenuEntry *)NULL);
+
+#else /* TCL_MAJOR_VERSION <= 7 */
+    rb_notimplement();
+#endif
+
+    return interp;
+}
+
+/*###############################################*/
+
+/*---- initialization ----*/
+void
+Init_tcltklib()
+{
+    int  ret;
+
+    VALUE lib = rb_define_module("TclTkLib");
+    VALUE ip = rb_define_class("TclTkIp", rb_cObject);
+
+    VALUE ev_flag = rb_define_module_under(lib, "EventFlag");
+    VALUE var_flag = rb_define_module_under(lib, "VarAccessFlag");
+
+    /* --------------------------------------------------------------- */
+
+    tcltkip_class = ip;
+
+    /* --------------------------------------------------------------- */
+
+    rb_global_variable(&eTkCallbackReturn);
+    rb_global_variable(&eTkCallbackBreak);
+    rb_global_variable(&eTkCallbackContinue);
+
+    rb_global_variable(&eventloop_thread);
+    rb_global_variable(&eventloop_stack);
+    rb_global_variable(&watchdog_thread);
+
+    rb_global_variable(&rbtk_pending_exception);
+
+   /* --------------------------------------------------------------- */
+
+    rb_define_const(lib, "COMPILE_INFO", tcltklib_compile_info());
+
+    rb_define_const(lib, "RELEASE_DATE", 
+                    rb_obj_freeze(rb_str_new2(tcltklib_release_date)));
+
+    rb_define_const(lib, "FINALIZE_PROC_NAME", 
+                    rb_str_new2(finalize_hook_name));
+
+   /* --------------------------------------------------------------- */
+
+    rb_define_const(ev_flag, "NONE",      INT2FIX(0));
+    rb_define_const(ev_flag, "WINDOW",    INT2FIX(TCL_WINDOW_EVENTS));
+    rb_define_const(ev_flag, "FILE",      INT2FIX(TCL_FILE_EVENTS));
+    rb_define_const(ev_flag, "TIMER",     INT2FIX(TCL_TIMER_EVENTS));
+    rb_define_const(ev_flag, "IDLE",      INT2FIX(TCL_IDLE_EVENTS));
+    rb_define_const(ev_flag, "ALL",       INT2FIX(TCL_ALL_EVENTS));
+    rb_define_const(ev_flag, "DONT_WAIT", INT2FIX(TCL_DONT_WAIT));
+
+    /* --------------------------------------------------------------- */
+
+    rb_define_const(var_flag, "NONE",           INT2FIX(0));
+    rb_define_const(var_flag, "GLOBAL_ONLY",    INT2FIX(TCL_GLOBAL_ONLY));
+#ifdef TCL_NAMESPACE_ONLY
+    rb_define_const(var_flag, "NAMESPACE_ONLY", INT2FIX(TCL_NAMESPACE_ONLY));
+#else /* probably Tcl7.6 */
+    rb_define_const(var_flag, "NAMESPACE_ONLY", INT2FIX(0));
+#endif
+    rb_define_const(var_flag, "LEAVE_ERR_MSG",  INT2FIX(TCL_LEAVE_ERR_MSG));
+    rb_define_const(var_flag, "APPEND_VALUE",   INT2FIX(TCL_APPEND_VALUE));
+    rb_define_const(var_flag, "LIST_ELEMENT",   INT2FIX(TCL_LIST_ELEMENT));
+#ifdef TCL_PARSE_PART1
+    rb_define_const(var_flag, "PARSE_VARNAME",  INT2FIX(TCL_PARSE_PART1));
+#else /* probably Tcl7.6 */
+    rb_define_const(var_flag, "PARSE_VARNAME",  INT2FIX(0));
+#endif
+
+    /* --------------------------------------------------------------- */
+
+    eTkCallbackReturn = rb_define_class("TkCallbackReturn", rb_eStandardError);
+    eTkCallbackBreak = rb_define_class("TkCallbackBreak", rb_eStandardError);
+    eTkCallbackContinue = rb_define_class("TkCallbackContinue",
+                                          rb_eStandardError);
+
+    /* --------------------------------------------------------------- */
+
+    eLocalJumpError = rb_const_get(rb_cObject, rb_intern("LocalJumpError"));
+
+    eTkLocalJumpError = rb_define_class("TkLocalJumpError", eLocalJumpError);
+
+    eTkCallbackRetry  = rb_define_class("TkCallbackRetry", eTkLocalJumpError);
+    eTkCallbackRedo   = rb_define_class("TkCallbackRedo",  eTkLocalJumpError);
+    eTkCallbackThrow  = rb_define_class("TkCallbackThrow", eTkLocalJumpError);
+
+    /* --------------------------------------------------------------- */
+
+    ID_at_enc = rb_intern("@encoding");
+    ID_at_interp = rb_intern("@interp");
+
+    ID_stop_p = rb_intern("stop?");
+    ID_alive_p = rb_intern("alive?");
+    ID_kill = rb_intern("kill");
+    ID_join = rb_intern("join");
+    ID_value = rb_intern("value");
+
+    ID_call = rb_intern("call");
+    ID_backtrace = rb_intern("backtrace");
+    ID_message = rb_intern("message");
+
+    ID_at_reason = rb_intern("@reason");
+    ID_return = rb_intern("return");
+    ID_break = rb_intern("break");
+    ID_next = rb_intern("next");
+
+    ID_to_s = rb_intern("to_s");
+    ID_inspect = rb_intern("inspect");
+
+    /* --------------------------------------------------------------- */
+
+    rb_define_module_function(lib, "_mark_at_exit", lib_mark_at_exit, 0);
+
+    rb_define_module_function(lib, "mainloop", lib_mainloop, -1);
+    rb_define_module_function(lib, "mainloop_thread?", 
+                              lib_evloop_thread_p, 0);
+    rb_define_module_function(lib, "mainloop_watchdog", 
+                              lib_mainloop_watchdog, -1);
+    rb_define_module_function(lib, "do_thread_callback", 
+                              lib_thread_callback, -1);
+    rb_define_module_function(lib, "do_one_event", lib_do_one_event, -1);
+    rb_define_module_function(lib, "mainloop_abort_on_exception", 
+                             lib_evloop_abort_on_exc, 0);
+    rb_define_module_function(lib, "mainloop_abort_on_exception=",  
+                             lib_evloop_abort_on_exc_set, 1);
+    rb_define_module_function(lib, "set_eventloop_tick",set_eventloop_tick,1);
+    rb_define_module_function(lib, "get_eventloop_tick",get_eventloop_tick,0);
+    rb_define_module_function(lib, "set_no_event_wait", set_no_event_wait, 1);
+    rb_define_module_function(lib, "get_no_event_wait", get_no_event_wait, 0);
+    rb_define_module_function(lib, "set_eventloop_weight", 
+                              set_eventloop_weight, 2);
+    rb_define_module_function(lib, "set_max_block_time", set_max_block_time,1);
+    rb_define_module_function(lib, "get_eventloop_weight", 
+                              get_eventloop_weight, 0);
+    rb_define_module_function(lib, "num_of_mainwindows", 
+                              lib_num_of_mainwindows, 0);
+
+    /* --------------------------------------------------------------- */
+
+    rb_define_module_function(lib, "_split_tklist", lib_split_tklist, 1);
+    rb_define_module_function(lib, "_merge_tklist", lib_merge_tklist, -1);
+    rb_define_module_function(lib, "_conv_listelement", 
+                              lib_conv_listelement, 1);
+    rb_define_module_function(lib, "_toUTF8", lib_toUTF8, -1);
+    rb_define_module_function(lib, "_fromUTF8", lib_fromUTF8, -1);
+    rb_define_module_function(lib, "_subst_UTF_backslash", 
+                              lib_UTF_backslash, 1);
+    rb_define_module_function(lib, "_subst_Tcl_backslash", 
+                              lib_Tcl_backslash, 1);
+
+    rb_define_module_function(lib, "encoding_system", 
+                              lib_get_system_encoding, 0);
+    rb_define_module_function(lib, "encoding_system=", 
+                              lib_set_system_encoding, 1);
+    rb_define_module_function(lib, "encoding", 
+                              lib_get_system_encoding, 0);
+    rb_define_module_function(lib, "encoding=", 
+                              lib_set_system_encoding, 1);
+
+    /* --------------------------------------------------------------- */
+
+    rb_define_alloc_func(ip, ip_alloc);
+    rb_define_method(ip, "initialize", ip_init, -1);
+    rb_define_method(ip, "create_slave", ip_create_slave, -1);
+    rb_define_method(ip, "slave_of?", ip_is_slave_of_p, 1);
+    rb_define_method(ip, "make_safe", ip_make_safe, 0);
+    rb_define_method(ip, "safe?", ip_is_safe_p, 0);
+    rb_define_method(ip, "allow_ruby_exit?", ip_allow_ruby_exit_p, 0);
+    rb_define_method(ip, "allow_ruby_exit=", ip_allow_ruby_exit_set, 1);
+    rb_define_method(ip, "delete", ip_delete, 0);
+    rb_define_method(ip, "deleted?", ip_is_deleted_p, 0);
+    rb_define_method(ip, "has_mainwindow?", ip_has_mainwindow_p, 0);
+    rb_define_method(ip, "invalid_namespace?", ip_has_invalid_namespace_p, 0);
+    rb_define_method(ip, "_eval", ip_eval, 1);
+    rb_define_method(ip, "_toUTF8", ip_toUTF8, -1);
+    rb_define_method(ip, "_fromUTF8", ip_fromUTF8, -1);
+    rb_define_method(ip, "_thread_vwait", ip_thread_vwait, 1);
+    rb_define_method(ip, "_thread_tkwait", ip_thread_tkwait, 2);
+    rb_define_method(ip, "_invoke", ip_invoke, -1);
+    rb_define_method(ip, "_immediate_invoke", ip_invoke_immediate, -1);
+    rb_define_method(ip, "_return_value", ip_retval, 0);
+
+    rb_define_method(ip, "_create_console", ip_create_console, 0);
+
+    /* --------------------------------------------------------------- */
+
+    rb_define_method(ip, "_get_variable", ip_get_variable, 2);
+    rb_define_method(ip, "_get_variable2", ip_get_variable2, 3);
+    rb_define_method(ip, "_set_variable", ip_set_variable, 3);
+    rb_define_method(ip, "_set_variable2", ip_set_variable2, 4);
+    rb_define_method(ip, "_unset_variable", ip_unset_variable, 2);
+    rb_define_method(ip, "_unset_variable2", ip_unset_variable2, 3);
+    rb_define_method(ip, "_get_global_var", ip_get_global_var, 1);
+    rb_define_method(ip, "_get_global_var2", ip_get_global_var2, 2);
+    rb_define_method(ip, "_set_global_var", ip_set_global_var, 2);
+    rb_define_method(ip, "_set_global_var2", ip_set_global_var2, 3);
+    rb_define_method(ip, "_unset_global_var", ip_unset_global_var, 1);
+    rb_define_method(ip, "_unset_global_var2", ip_unset_global_var2, 2);
+
+    /* --------------------------------------------------------------- */
+
+    rb_define_method(ip, "_make_menu_embeddable", ip_make_menu_embeddable, 1);
+
+    /* --------------------------------------------------------------- */
+
+    rb_define_method(ip, "_split_tklist", ip_split_tklist, 1);
+    rb_define_method(ip, "_merge_tklist", lib_merge_tklist, -1);
+    rb_define_method(ip, "_conv_listelement", lib_conv_listelement, 1);
+
+    /* --------------------------------------------------------------- */
+
+    rb_define_method(ip, "mainloop", ip_mainloop, -1);
+    rb_define_method(ip, "mainloop_watchdog", ip_mainloop_watchdog, -1);
+    rb_define_method(ip, "do_one_event", ip_do_one_event, -1);
+    rb_define_method(ip, "mainloop_abort_on_exception", 
+                    ip_evloop_abort_on_exc, 0);
+    rb_define_method(ip, "mainloop_abort_on_exception=", 
+                    ip_evloop_abort_on_exc_set, 1);
+    rb_define_method(ip, "set_eventloop_tick", ip_set_eventloop_tick, 1);
+    rb_define_method(ip, "get_eventloop_tick", ip_get_eventloop_tick, 0);
+    rb_define_method(ip, "set_no_event_wait", ip_set_no_event_wait, 1);
+    rb_define_method(ip, "get_no_event_wait", ip_get_no_event_wait, 0);
+    rb_define_method(ip, "set_eventloop_weight", ip_set_eventloop_weight, 2);
+    rb_define_method(ip, "get_eventloop_weight", ip_get_eventloop_weight, 0);
+    rb_define_method(ip, "set_max_block_time", set_max_block_time, 1);
+    rb_define_method(ip, "restart", ip_restart, 0);
+
+    /* --------------------------------------------------------------- */
+
+    eventloop_thread = Qnil;
+
+#ifndef DEFAULT_EVENTLOOP_DEPTH
+#define DEFAULT_EVENTLOOP_DEPTH 7
+#endif 
+    eventloop_stack = rb_ary_new2(DEFAULT_EVENTLOOP_DEPTH);
+    OBJ_TAINT(eventloop_stack);
+
+    watchdog_thread  = Qnil;
+
+    rbtk_pending_exception = Qnil;
+
+    /* --------------------------------------------------------------- */
+
+    /* if ruby->nativethread-supprt and tcltklib->doen't, 
+       the following will cause link-error. */
+    is_ruby_native_thread();
+
+    /* --------------------------------------------------------------- */
+
+    rb_eval_string("at_exit{ TclTkLib._mark_at_exit }");
+
+    /* --------------------------------------------------------------- */
+
+    ret = ruby_open_tcl_dll(rb_argv0 ? RSTRING(rb_argv0)->ptr : 0);
+    switch(ret) {
+    case TCLTK_STUBS_OK:
+        break;
+    case NO_TCL_DLL:
+        rb_raise(rb_eLoadError, "tcltklib: fail to open tcl_dll");
+    case NO_FindExecutable:
+        rb_raise(rb_eLoadError, "tcltklib: can't find Tcl_FindExecutable");
+    default:
+        rb_raise(rb_eLoadError, "tcltklib: unknown error(%d) on ruby_open_tcl_dll", ret);
+    }
+
+    /* --------------------------------------------------------------- */
+}
+
+/* eof */
diff --git a/ruby_1_8_6/ext/tk/tkutil/.cvsignore b/ruby_1_8_6/ext/tk/tkutil/.cvsignore
new file mode 100644
index 0000000000..90c83ed9b1
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/tkutil/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+*.log
+*.def
diff --git a/ruby_1_8_6/ext/tk/tkutil/depend b/ruby_1_8_6/ext/tk/tkutil/depend
new file mode 100644
index 0000000000..fd63e230f0
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/tkutil/depend
@@ -0,0 +1 @@
+tkutil.o: tkutil.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ruby_1_8_6/ext/tk/tkutil/extconf.rb b/ruby_1_8_6/ext/tk/tkutil/extconf.rb
new file mode 100644
index 0000000000..dd00d5d535
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/tkutil/extconf.rb
@@ -0,0 +1,11 @@
+begin
+  has_tk = compiled?('tk')
+rescue NoMethodError
+  # Probably, called manually (NOT from 'extmk.rb'). Force to make Makefile.
+  has_tk = true
+end
+
+if has_tk
+  require 'mkmf'
+  create_makefile('tkutil')
+end
diff --git a/ruby_1_8_6/ext/tk/tkutil/tkutil.c b/ruby_1_8_6/ext/tk/tkutil/tkutil.c
new file mode 100644
index 0000000000..f4271a724c
--- /dev/null
+++ b/ruby_1_8_6/ext/tk/tkutil/tkutil.c
@@ -0,0 +1,1639 @@
+/************************************************
+
+  tkutil.c -
+
+  $Author$
+  $Date$
+  created at: Fri Nov  3 00:47:54 JST 1995
+
+************************************************/
+
+#define TKUTIL_RELEASE_DATE "2006-04-06"
+
+#include "ruby.h"
+#include "rubysig.h"
+#include "version.h"
+#include "st.h"
+
+static VALUE cMethod;
+
+static VALUE cTclTkLib;
+
+static VALUE cTkObject;
+static VALUE cTkCallbackEntry;
+
+static VALUE TK_None;
+
+static VALUE cCB_SUBST;
+static VALUE cSUBST_INFO;
+
+static ID ID_split_tklist;
+static ID ID_toUTF8;
+static ID ID_fromUTF8;
+static ID ID_path;
+static ID ID_at_path;
+static ID ID_at_enc;
+static ID ID_to_eval;
+static ID ID_to_s;
+static ID ID_source;
+static ID ID_downcase;
+static ID ID_install_cmd;
+static ID ID_merge_tklist;
+static ID ID_encoding;
+static ID ID_encoding_system;
+static ID ID_call;
+
+static ID ID_SUBST_INFO;
+
+static VALUE CALLBACK_TABLE;
+static unsigned long CALLBACK_ID_NUM = 0;
+
+/*************************************/
+
+static VALUE
+tk_s_new(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE obj = rb_class_new_instance(argc, argv, klass);
+
+    if (rb_block_given_p()) {
+#if RUBY_VERSION_MAJOR == 1 && RUBY_VERSION_MINOR <= 8 /* ruby 1.8.x */
+      rb_obj_instance_eval(0, 0, obj);
+#else
+      rb_obj_instance_exec(1, &obj, obj);
+#endif
+    }
+    return obj;
+}
+
+/*************************************/
+
+static VALUE
+tkNone_to_s(self)
+    VALUE self;
+{
+    return rb_str_new2("None");
+}
+
+/*************************************/
+
+static VALUE
+tk_eval_cmd(argc, argv, self)
+    int argc;
+    VALUE argv[];
+    VALUE self;
+{
+    volatile VALUE cmd, rest;
+
+    rb_scan_args(argc, argv, "1*", &cmd, &rest);
+    return rb_eval_cmd(cmd, rest, 0);
+}
+
+static VALUE
+tk_do_callback(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+#if 0
+    volatile VALUE id;
+    volatile VALUE rest;
+
+    rb_scan_args(argc, argv, "1*", &id, &rest);
+    return rb_apply(rb_hash_aref(CALLBACK_TABLE, id), ID_call, rest);
+#endif
+    return rb_funcall2(rb_hash_aref(CALLBACK_TABLE, argv[0]), 
+                       ID_call, argc - 1, argv + 1);
+}
+
+static char *cmd_id_head = "ruby_cmd TkUtil callback ";
+static char *cmd_id_prefix = "cmd";
+
+static VALUE
+tk_install_cmd_core(cmd)
+    VALUE cmd;
+{
+    volatile VALUE id_num;
+
+    id_num = ULONG2NUM(CALLBACK_ID_NUM++);
+    id_num = rb_funcall(id_num, ID_to_s, 0, 0);
+    id_num = rb_str_append(rb_str_new2(cmd_id_prefix), id_num);
+    rb_hash_aset(CALLBACK_TABLE, id_num, cmd);
+    return rb_str_append(rb_str_new2(cmd_id_head), id_num);
+}
+
+static VALUE
+tk_install_cmd(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    volatile VALUE cmd;
+
+#if 0
+    if (rb_scan_args(argc, argv, "01", &cmd) == 0) {
+        cmd = rb_block_proc();
+    }
+    return tk_install_cmd_core(cmd);
+#endif
+    if (argc == 0) {
+        cmd = rb_block_proc();
+    } else {
+        cmd = argv[0];
+    }
+    return tk_install_cmd_core(cmd);
+}
+
+static VALUE
+tk_uninstall_cmd(self, cmd_id)
+    VALUE self;
+    VALUE cmd_id;
+{
+    int head_len = strlen(cmd_id_head);
+    int prefix_len = strlen(cmd_id_prefix);
+
+    StringValue(cmd_id);
+    if (strncmp(cmd_id_head, RSTRING(cmd_id)->ptr, head_len) != 0) {
+        return Qnil;
+    }
+    if (strncmp(cmd_id_prefix, 
+                RSTRING(cmd_id)->ptr + head_len, prefix_len) != 0) {
+        return Qnil;
+    }
+
+    return rb_hash_delete(CALLBACK_TABLE, 
+                          rb_str_new2(RSTRING(cmd_id)->ptr + head_len));
+}
+
+static VALUE
+tk_toUTF8(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    return rb_funcall2(cTclTkLib, ID_toUTF8, argc, argv);
+}
+
+static VALUE
+tk_fromUTF8(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    return rb_funcall2(cTclTkLib, ID_fromUTF8, argc, argv);
+}
+
+static VALUE
+fromDefaultEnc_toUTF8(str, self)
+    VALUE str;
+    VALUE self;
+{
+    VALUE argv[1];
+
+    argv[0] = str;
+    return tk_toUTF8(1, argv, self);
+}
+
+static VALUE
+fromUTF8_toDefaultEnc(str, self)
+    VALUE str;
+    VALUE self;
+{
+    VALUE argv[1];
+
+    argv[0] = str;
+    return tk_fromUTF8(1, argv, self);
+}
+
+static int
+to_strkey(key, value, hash)
+    VALUE key;
+    VALUE value;
+    VALUE hash;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    rb_hash_aset(hash, rb_funcall(key, ID_to_s, 0, 0), value);
+    return ST_CHECK;
+}
+
+static VALUE
+tk_symbolkey2str(self, keys)
+    VALUE self;
+    VALUE keys;
+{
+    volatile VALUE new_keys = rb_hash_new();
+
+    if NIL_P(keys) return new_keys;
+    keys = rb_convert_type(keys, T_HASH, "Hash", "to_hash");
+    st_foreach(RHASH(keys)->tbl, to_strkey, new_keys);
+    return new_keys;
+}
+
+static VALUE get_eval_string_core _((VALUE, VALUE, VALUE));
+static VALUE ary2list _((VALUE, VALUE, VALUE));
+static VALUE ary2list2 _((VALUE, VALUE, VALUE));
+static VALUE hash2list _((VALUE, VALUE));
+static VALUE hash2list_enc _((VALUE, VALUE));
+static VALUE hash2kv _((VALUE, VALUE, VALUE));
+static VALUE hash2kv_enc _((VALUE, VALUE, VALUE));
+
+static VALUE
+ary2list(ary, enc_flag, self)
+    VALUE ary;
+    VALUE enc_flag;
+    VALUE self;
+{
+    int idx, idx2, size, size2, req_chk_flag;
+    volatile VALUE val, val2, str_val;
+    volatile VALUE dst;
+    volatile VALUE sys_enc, dst_enc, str_enc;
+
+    sys_enc = rb_funcall(cTclTkLib, ID_encoding, 0, 0);
+    if (NIL_P(sys_enc)) {
+      sys_enc = rb_funcall(cTclTkLib, ID_encoding_system, 0, 0);
+      sys_enc = rb_funcall(sys_enc, ID_to_s, 0, 0);
+    }
+
+    if NIL_P(enc_flag) {
+        dst_enc = sys_enc;
+        req_chk_flag = 1;
+    } else if (TYPE(enc_flag) == T_TRUE || TYPE(enc_flag) == T_FALSE) {
+        dst_enc = enc_flag;
+        req_chk_flag = 0;
+    } else {
+        dst_enc = rb_funcall(enc_flag, ID_to_s, 0, 0);
+        req_chk_flag = 0;
+    }
+
+    /* size = RARRAY(ary)->len; */
+    size = 0;
+    for(idx = 0; idx < RARRAY(ary)->len; idx++) {
+        if (TYPE(RARRAY(ary)->ptr[idx]) == T_HASH) {
+            size += 2 * RHASH(RARRAY(ary)->ptr[idx])->tbl->num_entries;
+        } else {
+            size++;
+        }
+    }
+
+    dst = rb_ary_new2(size);
+    RARRAY(dst)->len = 0;
+    for(idx = 0; idx < RARRAY(ary)->len; idx++) {
+        val = RARRAY(ary)->ptr[idx];
+        str_val = Qnil;
+        switch(TYPE(val)) {
+        case T_ARRAY:
+            str_val = ary2list(val, enc_flag, self);
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] = str_val;
+
+            if (req_chk_flag) {
+                str_enc = rb_ivar_get(str_val, ID_at_enc);
+                if (!NIL_P(str_enc)) {
+                    str_enc = rb_funcall(str_enc, ID_to_s, 0, 0);
+                } else {
+                    str_enc = sys_enc;
+                }
+                if (!rb_str_cmp(str_enc, dst_enc)) {
+                    dst_enc = Qtrue;
+                    req_chk_flag = 0;
+                }
+            }
+
+            break;
+
+        case T_HASH:
+            /* RARRAY(dst)->ptr[RARRAY(dst)->len++] = hash2list(val, self); */
+            if (RTEST(enc_flag)) {
+                val = hash2kv_enc(val, Qnil, self);
+            } else {
+                val = hash2kv(val, Qnil, self);
+            }
+            size2 = RARRAY(val)->len;
+            for(idx2 = 0; idx2 < size2; idx2++) {
+                val2 = RARRAY(val)->ptr[idx2];
+                switch(TYPE(val2)) {
+                case T_ARRAY:
+                    str_val = ary2list(val2, enc_flag, self);
+                    RARRAY(dst)->ptr[RARRAY(dst)->len++] = str_val;
+                    break;
+
+                case T_HASH:
+                    if (RTEST(enc_flag)) {
+                        str_val = hash2list_enc(val2, self);
+                    } else {
+                        str_val = hash2list(val2, self);
+                    }
+                    RARRAY(dst)->ptr[RARRAY(dst)->len++] = str_val;
+                    break;
+
+                default:
+                    if (val2 != TK_None) {
+                        str_val = get_eval_string_core(val2, enc_flag, self);
+                        RARRAY(dst)->ptr[RARRAY(dst)->len++] = str_val;
+                    }
+                }
+
+                if (req_chk_flag) {
+                    str_enc = rb_ivar_get(str_val, ID_at_enc);
+                    if (!NIL_P(str_enc)) {
+                        str_enc = rb_funcall(str_enc, ID_to_s, 0, 0);
+                    } else {
+                        str_enc = sys_enc;
+                    }
+                    if (!rb_str_cmp(str_enc, dst_enc)) {
+                        dst_enc = Qtrue;
+                        req_chk_flag = 0;
+                    }
+                }
+            }
+            break;
+
+        default:
+            if (val != TK_None) {
+                str_val = get_eval_string_core(val, enc_flag, self);
+                RARRAY(dst)->ptr[RARRAY(dst)->len++] = str_val;
+
+                if (req_chk_flag) {
+                    str_enc = rb_ivar_get(str_val, ID_at_enc);
+                    if (!NIL_P(str_enc)) {
+                        str_enc = rb_funcall(str_enc, ID_to_s, 0, 0);
+                    } else {
+                        str_enc = sys_enc;
+                    }
+                    if (!rb_str_cmp(str_enc, dst_enc)) {
+                        dst_enc = Qtrue;
+                        req_chk_flag = 0;
+                    }
+                }
+            }
+        }
+    }
+
+    if (RTEST(dst_enc) && !NIL_P(sys_enc)) {
+        for(idx = 0; idx < RARRAY(dst)->len; idx++) {
+            str_val = RARRAY(dst)->ptr[idx];
+            if (rb_obj_respond_to(self, ID_toUTF8, Qtrue)) {
+                str_val = rb_funcall(self, ID_toUTF8, 1, str_val);
+            } else {
+                str_val = rb_funcall(cTclTkLib, ID_toUTF8, 1, str_val);
+            }
+            RARRAY(dst)->ptr[idx] = str_val;
+        }
+        val = rb_apply(cTclTkLib, ID_merge_tklist, dst);
+        if (TYPE(dst_enc) == T_STRING) {
+            val = rb_funcall(cTclTkLib, ID_fromUTF8, 2, val, dst_enc);
+            rb_ivar_set(val, ID_at_enc, dst_enc);
+        } else {
+            rb_ivar_set(val, ID_at_enc, rb_str_new2("utf-8"));
+        }
+        return val;
+    } else {
+        return rb_apply(cTclTkLib, ID_merge_tklist, dst);
+    }
+}
+
+static VALUE
+ary2list2(ary, enc_flag, self)
+    VALUE ary;
+    VALUE enc_flag;
+    VALUE self;
+{
+    int idx, size, req_chk_flag;
+    volatile VALUE val, str_val;
+    volatile VALUE dst;
+    volatile VALUE sys_enc, dst_enc, str_enc;
+
+    sys_enc = rb_funcall(cTclTkLib, ID_encoding, 0, 0);
+    if NIL_P(sys_enc) {
+      sys_enc = rb_funcall(cTclTkLib, ID_encoding_system, 0, 0);
+      sys_enc = rb_funcall(sys_enc, ID_to_s, 0, 0);
+    }
+
+    if NIL_P(enc_flag) {
+        dst_enc = sys_enc;
+        req_chk_flag = 1;
+    } else if (TYPE(enc_flag) == T_TRUE || TYPE(enc_flag) == T_FALSE) {
+        dst_enc = enc_flag;
+        req_chk_flag = 0;
+    } else {
+        dst_enc = rb_funcall(enc_flag, ID_to_s, 0, 0);
+        req_chk_flag = 0;
+    }
+
+    size = RARRAY(ary)->len;
+    dst = rb_ary_new2(size);
+    RARRAY(dst)->len = 0;
+    for(idx = 0; idx < RARRAY(ary)->len; idx++) {
+        val = RARRAY(ary)->ptr[idx];
+        str_val = Qnil;
+        switch(TYPE(val)) {
+        case T_ARRAY:
+            str_val = ary2list(val, enc_flag, self);
+            break;
+
+        case T_HASH:
+            if (RTEST(enc_flag)) {
+                str_val = hash2list(val, self);
+            } else {
+                str_val = hash2list_enc(val, self);
+            }
+            break;
+
+        default:
+            if (val != TK_None) {
+                str_val = get_eval_string_core(val, enc_flag, self);
+            }
+        }
+
+        if (!NIL_P(str_val)) {
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] = str_val;
+
+            if (req_chk_flag) {
+                str_enc = rb_ivar_get(str_val, ID_at_enc);
+                if (!NIL_P(str_enc)) {
+                    str_enc = rb_funcall(str_enc, ID_to_s, 0, 0);
+                } else {
+                    str_enc = sys_enc;
+                }
+                if (!rb_str_cmp(str_enc, dst_enc)) {
+                    dst_enc = Qtrue;
+                    req_chk_flag = 0;
+                }
+            }
+        }
+    }
+
+    if (RTEST(dst_enc) && !NIL_P(sys_enc)) {
+        for(idx = 0; idx < RARRAY(dst)->len; idx++) {
+            str_val = RARRAY(dst)->ptr[idx];
+            if (rb_obj_respond_to(self, ID_toUTF8, Qtrue)) {
+                str_val = rb_funcall(self, ID_toUTF8, 1, str_val);
+            } else {
+                str_val = rb_funcall(cTclTkLib, ID_toUTF8, 1, str_val);
+            }
+            RARRAY(dst)->ptr[idx] = str_val;
+        }
+        val = rb_apply(cTclTkLib, ID_merge_tklist, dst);
+        if (TYPE(dst_enc) == T_STRING) {
+            val = rb_funcall(cTclTkLib, ID_fromUTF8, 2, val, dst_enc);
+            rb_ivar_set(val, ID_at_enc, dst_enc);
+        } else {
+            rb_ivar_set(val, ID_at_enc, rb_str_new2("utf-8"));
+        }
+        return val;
+    } else {
+        return rb_apply(cTclTkLib, ID_merge_tklist, dst);
+    }
+}
+
+static VALUE
+key2keyname(key)
+    VALUE key;
+{
+    return rb_str_append(rb_str_new2("-"), rb_funcall(key, ID_to_s, 0, 0));
+}
+
+static VALUE
+assoc2kv(assoc, ary, self)
+    VALUE assoc;
+    VALUE ary;
+    VALUE self;
+{
+    int i, j, len;
+    volatile VALUE pair;
+    volatile VALUE val;
+    volatile VALUE dst = rb_ary_new2(2 * RARRAY(assoc)->len);
+
+    len = RARRAY(assoc)->len;
+
+    for(i = 0; i < len; i++) {
+        pair = RARRAY(assoc)->ptr[i];
+        if (TYPE(pair) != T_ARRAY) {
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] = key2keyname(pair);
+            continue;
+        }
+        switch(RARRAY(assoc)->len) {
+        case 2:
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] = RARRAY(pair)->ptr[2];
+
+        case 1:
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
+                = key2keyname(RARRAY(pair)->ptr[0]);
+
+        case 0:
+            continue;
+
+        default:
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
+                = key2keyname(RARRAY(pair)->ptr[0]);
+
+            val = rb_ary_new2(RARRAY(pair)->len - 1);
+            RARRAY(val)->len = 0;
+            for(j = 1; j < RARRAY(pair)->len; j++) {
+                RARRAY(val)->ptr[RARRAY(val)->len++] = RARRAY(pair)->ptr[j];
+            }
+
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] = val;
+        }
+    }
+
+    if (NIL_P(ary)) {
+        return dst;
+    } else {
+        return rb_ary_plus(ary, dst);
+    }
+}
+
+static VALUE
+assoc2kv_enc(assoc, ary, self)
+    VALUE assoc;
+    VALUE ary;
+    VALUE self;
+{
+    int i, j, len;
+    volatile VALUE pair;
+    volatile VALUE val;
+    volatile VALUE dst = rb_ary_new2(2 * RARRAY(assoc)->len);
+
+    len = RARRAY(assoc)->len;
+
+    for(i = 0; i < len; i++) {
+        pair = RARRAY(assoc)->ptr[i];
+        if (TYPE(pair) != T_ARRAY) {
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] = key2keyname(pair);
+            continue;
+        }
+        switch(RARRAY(assoc)->len) {
+        case 2:
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
+                = get_eval_string_core(RARRAY(pair)->ptr[2], Qtrue, self);
+
+        case 1:
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
+                = key2keyname(RARRAY(pair)->ptr[0]);
+
+        case 0:
+            continue;
+
+        default:
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
+                = key2keyname(RARRAY(pair)->ptr[0]);
+
+            val = rb_ary_new2(RARRAY(pair)->len - 1);
+            RARRAY(val)->len = 0;
+            for(j = 1; j < RARRAY(pair)->len; j++) {
+                RARRAY(val)->ptr[RARRAY(val)->len++] = RARRAY(pair)->ptr[j];
+            }
+
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
+                = get_eval_string_core(val, Qtrue, self);
+        }
+    }
+
+    if (NIL_P(ary)) {
+        return dst;
+    } else {
+        return rb_ary_plus(ary, dst);
+    }
+}
+
+static int
+push_kv(key, val, args)
+    VALUE key;
+    VALUE val;
+    VALUE args;
+{
+    volatile VALUE ary;
+
+    ary = RARRAY(args)->ptr[0];
+
+    if (key == Qundef) return ST_CONTINUE;
+#if 0
+    rb_ary_push(ary, key2keyname(key));
+    if (val != TK_None) rb_ary_push(ary, val);
+#endif
+    RARRAY(ary)->ptr[RARRAY(ary)->len++] = key2keyname(key);
+
+    if (val == TK_None) return ST_CHECK;
+
+    RARRAY(ary)->ptr[RARRAY(ary)->len++]
+        = get_eval_string_core(val, Qnil, RARRAY(args)->ptr[1]);
+
+    return ST_CHECK;
+}
+
+static VALUE
+hash2kv(hash, ary, self)
+    VALUE hash;
+    VALUE ary;
+    VALUE self;
+{
+    volatile VALUE args = rb_ary_new2(2);
+    volatile VALUE dst = rb_ary_new2(2 * RHASH(hash)->tbl->num_entries);
+
+    RARRAY(dst)->len = 0;
+
+    RARRAY(args)->ptr[0] = dst;
+    RARRAY(args)->ptr[1] = self;
+    RARRAY(args)->len = 2;
+    st_foreach(RHASH(hash)->tbl, push_kv, args);
+
+    if (NIL_P(ary)) {
+        return dst;
+    } else {
+        return rb_ary_concat(ary, dst);
+    }
+}
+
+static int
+push_kv_enc(key, val, args)
+    VALUE key;
+    VALUE val;
+    VALUE args;
+{
+    volatile VALUE ary;
+
+    ary = RARRAY(args)->ptr[0];
+
+    if (key == Qundef) return ST_CONTINUE;
+#if 0
+    rb_ary_push(ary, key2keyname(key));
+    if (val != TK_None) {
+        rb_ary_push(ary, get_eval_string_core(val, Qtrue, 
+                                              RARRAY(args)->ptr[1]));
+    }
+#endif
+    RARRAY(ary)->ptr[RARRAY(ary)->len++] = key2keyname(key);
+
+    if (val == TK_None) return ST_CHECK;
+
+    RARRAY(ary)->ptr[RARRAY(ary)->len++] 
+        = get_eval_string_core(val, Qtrue, RARRAY(args)->ptr[1]);
+
+    return ST_CHECK;
+}
+
+static VALUE
+hash2kv_enc(hash, ary, self)
+    VALUE hash;
+    VALUE ary;
+    VALUE self;
+{
+    volatile VALUE args = rb_ary_new2(2);
+    volatile VALUE dst = rb_ary_new2(2 * RHASH(hash)->tbl->num_entries);
+
+    RARRAY(dst)->len = 0;
+
+    RARRAY(args)->ptr[0] = dst;
+    RARRAY(args)->ptr[1] = self;
+    RARRAY(args)->len = 2;
+    st_foreach(RHASH(hash)->tbl, push_kv_enc, args);
+
+    if (NIL_P(ary)) {
+        return dst;
+    } else {
+        return rb_ary_concat(ary, dst);
+    }
+}
+
+static VALUE
+hash2list(hash, self)
+    VALUE hash;
+    VALUE self;
+{
+    return ary2list2(hash2kv(hash, Qnil, self), Qfalse, self);
+}
+
+
+static VALUE
+hash2list_enc(hash, self)
+    VALUE hash;
+    VALUE self;
+{
+    return ary2list2(hash2kv_enc(hash, Qnil, self), Qfalse, self);
+}
+
+static VALUE
+tk_hash_kv(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    volatile VALUE hash, enc_flag, ary;
+
+    ary = Qnil;
+    enc_flag = Qnil;
+    switch(argc) {
+    case 3:
+        ary = argv[2];
+    case 2:
+        enc_flag = argv[1];
+    case 1:
+        hash = argv[0];
+        break;
+    case 0:
+        rb_raise(rb_eArgError, "too few arguments");
+    default: /* >= 3 */
+        rb_raise(rb_eArgError, "too many arguments");
+    }
+
+    switch(TYPE(hash)) {
+    case T_ARRAY:
+        if (RTEST(enc_flag)) {
+            return assoc2kv_enc(hash, ary, self);
+        } else {
+            return assoc2kv(hash, ary, self);
+        }
+
+    case T_HASH:
+        if (RTEST(enc_flag)) {
+            return hash2kv_enc(hash, ary, self);
+        } else {
+            return hash2kv(hash, ary, self);
+        }
+
+    case T_NIL:
+        if (NIL_P(ary)) {
+            return rb_ary_new();
+        } else {
+            return ary;
+        }
+
+    default:
+        if (hash == TK_None) {
+            if (NIL_P(ary)) {
+                return rb_ary_new();
+            } else {
+                return ary;
+            }
+        }
+        rb_raise(rb_eArgError, "Hash is expected for 1st argument");
+    }
+}
+
+static VALUE
+get_eval_string_core(obj, enc_flag, self)
+    VALUE obj;
+    VALUE enc_flag;
+    VALUE self;
+{
+    switch(TYPE(obj)) {
+    case T_FLOAT:
+    case T_FIXNUM:
+    case T_BIGNUM:
+        return rb_funcall(obj, ID_to_s, 0, 0);
+
+    case T_STRING:
+        if (RTEST(enc_flag)) {
+            if (rb_obj_respond_to(self, ID_toUTF8, Qtrue)) {
+                return rb_funcall(self, ID_toUTF8, 1, obj);
+            } else {
+                return fromDefaultEnc_toUTF8(obj, self);
+            }
+        } else {
+            return obj;
+        }
+
+    case T_SYMBOL:
+        if (RTEST(enc_flag)) {
+            if (rb_obj_respond_to(self, ID_toUTF8, Qtrue)) {
+                return rb_funcall(self, ID_toUTF8, 1, 
+                                  rb_str_new2(rb_id2name(SYM2ID(obj))));
+            } else {
+                return fromDefaultEnc_toUTF8(rb_str_new2(rb_id2name(SYM2ID(obj))), self);
+            }
+        } else {
+            return rb_str_new2(rb_id2name(SYM2ID(obj)));
+        }
+
+    case T_HASH:
+        if (RTEST(enc_flag)) {
+            return hash2list_enc(obj, self);
+        } else {
+            return hash2list(obj, self);
+        }
+
+    case T_ARRAY:
+        return ary2list(obj, enc_flag, self);
+
+    case T_FALSE:
+        return rb_str_new2("0");
+
+    case T_TRUE:
+        return rb_str_new2("1");
+
+    case T_NIL:
+        return rb_str_new2("");
+
+    case T_REGEXP:
+        return rb_funcall(obj, ID_source, 0, 0);
+
+    default:
+        if (rb_obj_is_kind_of(obj, cTkObject)) {
+            /* return rb_str_new3(rb_funcall(obj, ID_path, 0, 0)); */
+            return get_eval_string_core(rb_funcall(obj, ID_path, 0, 0), 
+                                        enc_flag, self);
+        }
+
+        if (rb_obj_is_kind_of(obj, rb_cProc)
+            || rb_obj_is_kind_of(obj, cMethod)
+            || rb_obj_is_kind_of(obj, cTkCallbackEntry)) {
+            if (rb_obj_respond_to(self, ID_install_cmd, Qtrue)) {
+                return rb_funcall(self, ID_install_cmd, 1, obj);
+            } else {
+                return tk_install_cmd_core(obj);
+            }
+        }
+
+        if (obj == TK_None)  return Qnil;
+
+        if (rb_obj_respond_to(obj, ID_to_eval, Qtrue)) {
+            /* return rb_funcall(obj, ID_to_eval, 0, 0); */
+            return get_eval_string_core(rb_funcall(obj, ID_to_eval, 0, 0), 
+                                        enc_flag, self);
+        } else if (rb_obj_respond_to(obj, ID_path, Qtrue)) {
+            /* return rb_funcall(obj, ID_path, 0, 0); */
+            return get_eval_string_core(rb_funcall(obj, ID_path, 0, 0), 
+                                        enc_flag, self);
+        } else if (rb_obj_respond_to(obj, ID_to_s, Qtrue)) {
+            return rb_funcall(obj, ID_to_s, 0, 0);
+        }
+    }
+
+    rb_warning("fail to convert '%s' to string for Tk", 
+               RSTRING(rb_funcall(obj, rb_intern("inspect"), 0, 0))->ptr);
+
+    return obj;
+}
+
+static VALUE
+tk_get_eval_string(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    volatile VALUE obj, enc_flag;
+
+    if (rb_scan_args(argc, argv, "11", &obj, &enc_flag) == 1) {
+        enc_flag = Qnil;
+    }
+
+    return get_eval_string_core(obj, enc_flag, self);
+}
+
+static VALUE
+tk_get_eval_enc_str(self, obj)
+    VALUE self;
+    VALUE obj;
+{
+    if (obj == TK_None) {
+        return obj;
+    } else {
+        return get_eval_string_core(obj, Qtrue, self);
+    }
+}
+
+static VALUE
+tk_conv_args(argc, argv, self)
+    int   argc;
+    VALUE *argv; /* [0]:base_array, [1]:enc_mode, [2]..[n]:args */
+    VALUE self;
+{
+    int idx, size;
+    volatile VALUE dst;
+    int thr_crit_bup;
+    VALUE old_gc;
+
+    if (argc < 2) {
+      rb_raise(rb_eArgError, "too few arguments");
+    }
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+    old_gc = rb_gc_disable();
+
+    for(size = 0, idx = 2; idx < argc; idx++) {
+        if (TYPE(argv[idx]) == T_HASH) {
+            size += 2 * RHASH(argv[idx])->tbl->num_entries;
+        } else {
+            size++;
+        }
+    }
+    /* dst = rb_ary_new2(argc - 2); */
+    dst = rb_ary_new2(size);
+    RARRAY(dst)->len = 0;
+    for(idx = 2; idx < argc; idx++) {
+        if (TYPE(argv[idx]) == T_HASH) {
+            if (RTEST(argv[1])) {
+                hash2kv_enc(argv[idx], dst, self);
+            } else {
+                hash2kv(argv[idx], dst, self);
+            }
+        } else if (argv[idx] != TK_None) {
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
+                = get_eval_string_core(argv[idx], argv[1], self);
+        }
+    }
+
+    if (old_gc == Qfalse) rb_gc_enable();
+    rb_thread_critical = thr_crit_bup;
+
+    return rb_ary_plus(argv[0], dst);
+}
+
+
+/*************************************/
+
+static VALUE
+tcl2rb_bool(self, value)
+    VALUE self;
+    VALUE value;
+{
+    if (TYPE(value) == T_FIXNUM) {
+        if (NUM2INT(value) == 0) {
+            return Qfalse;
+        } else {
+            return Qtrue;
+        }
+    }
+
+    if (TYPE(value) == T_TRUE || TYPE(value) == T_FALSE) {
+        return value;
+    }
+
+    rb_check_type(value, T_STRING);
+
+    value = rb_funcall(value, ID_downcase, 0);
+
+    if (RSTRING(value)->ptr == (char*)NULL) return Qnil;
+
+    if (RSTRING(value)->ptr[0] == '\0'
+        || strcmp(RSTRING(value)->ptr, "0") == 0
+        || strcmp(RSTRING(value)->ptr, "no") == 0
+        || strcmp(RSTRING(value)->ptr, "off") == 0
+        || strcmp(RSTRING(value)->ptr, "false") == 0) {
+        return Qfalse;
+    } else {
+        return Qtrue;
+    }
+}
+
+static VALUE
+tkstr_to_dec(value)
+    VALUE value;
+{
+    return rb_cstr_to_inum(RSTRING(value)->ptr, 10, 1);
+}
+
+static VALUE
+tkstr_to_int(value)
+    VALUE value;
+{
+    return rb_cstr_to_inum(RSTRING(value)->ptr, 0, 1);
+}
+
+static VALUE
+tkstr_to_float(value)
+    VALUE value;
+{
+    return rb_float_new(rb_cstr_to_dbl(RSTRING(value)->ptr, 1));
+}
+
+static VALUE
+tkstr_invalid_numstr(value)
+    VALUE value;
+{
+    rb_raise(rb_eArgError, 
+             "invalid value for Number: '%s'", RSTRING(value)->ptr);
+    return Qnil; /*dummy*/
+}
+
+static VALUE
+tkstr_rescue_float(value)
+    VALUE value;
+{
+    return rb_rescue2(tkstr_to_float, value, 
+                      tkstr_invalid_numstr, value, 
+                      rb_eArgError, 0);
+}
+
+static VALUE
+tkstr_to_number(value)
+    VALUE value;
+{
+    rb_check_type(value, T_STRING);
+
+    if (RSTRING(value)->ptr == (char*)NULL) return INT2FIX(0);
+
+    return rb_rescue2(tkstr_to_int, value, 
+                      tkstr_rescue_float, value, 
+                      rb_eArgError, 0);
+}
+
+static VALUE
+tcl2rb_number(self, value)
+    VALUE self;
+    VALUE value;
+{
+    return tkstr_to_number(value);
+}
+
+static VALUE
+tkstr_to_str(value)
+    VALUE value;
+{
+    char * ptr;
+    int len;
+
+    ptr = RSTRING(value)->ptr;
+    len = RSTRING(value)->len;
+
+    if (len > 1 && *ptr == '{' && *(ptr + len - 1) == '}') {
+        return rb_str_new(ptr + 1, len - 2);
+    }
+    return value;
+}
+
+static VALUE
+tcl2rb_string(self, value)
+    VALUE self;
+    VALUE value;
+{
+    rb_check_type(value, T_STRING);
+
+    if (RSTRING(value)->ptr == (char*)NULL) return rb_tainted_str_new2("");
+
+    return tkstr_to_str(value);
+}
+
+static VALUE
+tcl2rb_num_or_str(self, value)
+    VALUE self;
+    VALUE value;
+{
+    rb_check_type(value, T_STRING);
+
+    if (RSTRING(value)->ptr == (char*)NULL) return rb_tainted_str_new2("");
+
+    return rb_rescue2(tkstr_to_number, value, 
+                      tkstr_to_str, value, 
+                      rb_eArgError, 0);
+}
+
+
+/*************************************/
+
+struct cbsubst_info {
+    int   size;
+    char  *key;
+    char  *type;
+    ID    *ivar;
+    VALUE proc;
+    VALUE aliases;
+};
+
+static void
+subst_mark(ptr)
+    struct cbsubst_info *ptr;
+{
+    rb_gc_mark(ptr->proc);
+    rb_gc_mark(ptr->aliases);
+}
+
+static void
+subst_free(ptr)
+    struct cbsubst_info *ptr;
+{
+    if (ptr) {
+        if (ptr->key != (char*)NULL) free(ptr->key);
+        if (ptr->type != (char*)NULL) free(ptr->type);
+        if (ptr->ivar != (ID*)NULL) free(ptr->ivar);
+        free(ptr);
+    }
+}
+
+static void
+cbsubst_init()
+{
+    struct cbsubst_info *inf;
+    ID *ivar;
+    volatile VALUE proc, aliases;
+
+    inf = ALLOC(struct cbsubst_info);
+
+    inf->size = 0;
+
+    inf->key = ALLOC_N(char, 1);
+    inf->key[0] = '\0';
+
+    inf->type = ALLOC_N(char, 1);
+    inf->type[0] = '\0';
+
+    ivar = ALLOC_N(ID, 1);
+    inf->ivar = ivar;
+
+    proc = rb_hash_new();
+    inf->proc = proc;
+
+    aliases = rb_hash_new();
+    inf->aliases = aliases;
+
+    rb_const_set(cCB_SUBST, ID_SUBST_INFO, 
+                 Data_Wrap_Struct(cSUBST_INFO, subst_mark, subst_free, inf));
+}
+
+static VALUE
+cbsubst_initialize(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct cbsubst_info *inf;
+    int idx;
+
+    Data_Get_Struct(rb_const_get(rb_obj_class(self), ID_SUBST_INFO), 
+                    struct cbsubst_info, inf);
+
+    for(idx = 0; idx < argc; idx++) {
+        rb_ivar_set(self, inf->ivar[idx], argv[idx]);
+    }
+
+    return self;
+}
+
+
+static VALUE
+cbsubst_ret_val(self, val)
+    VALUE self;
+    VALUE val;
+{
+    return val;
+}
+
+static int
+each_attr_def(key, value, klass)
+    VALUE key, value, klass;
+{
+    ID key_id, value_id;
+
+    if (key == Qundef) return ST_CONTINUE;
+
+    switch(TYPE(key)) {
+    case T_STRING:
+        key_id = rb_intern(RSTRING(key)->ptr);
+        break;
+    case T_SYMBOL:
+        key_id = SYM2ID(key);
+        break;
+    default:
+        rb_raise(rb_eArgError, 
+                 "includes invalid key(s). expected a String or a Symbol");
+    }
+
+    switch(TYPE(value)) {
+    case T_STRING:
+        value_id = rb_intern(RSTRING(value)->ptr);
+        break;
+    case T_SYMBOL:
+        value_id = SYM2ID(value);
+        break;
+    default:
+        rb_raise(rb_eArgError, 
+                 "includes invalid value(s). expected a String or a Symbol");
+    }
+
+    rb_alias(klass, key_id, value_id);
+
+    return ST_CONTINUE;
+}
+
+static VALUE
+cbsubst_def_attr_aliases(self, tbl)
+    VALUE self;
+    VALUE tbl;
+{
+    struct cbsubst_info *inf;
+
+    if (TYPE(tbl) != T_HASH) {
+        rb_raise(rb_eArgError, "expected a Hash");
+    }
+
+    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
+                    struct cbsubst_info, inf);
+
+    rb_hash_foreach(tbl, each_attr_def, self);
+
+    return rb_funcall(inf->aliases, rb_intern("update"), 1, tbl);
+}
+
+static VALUE
+cbsubst_get_subst_arg(argc, argv, self)
+    int   argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct cbsubst_info *inf;
+    char *str, *buf, *ptr;
+    int i, j, len;
+    ID id;
+    volatile VALUE arg_sym, ret;
+
+    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
+                    struct cbsubst_info, inf);
+
+    buf = ALLOC_N(char, 3*argc + 1);
+    ptr = buf;
+    len = strlen(inf->key);
+
+    for(i = 0; i < argc; i++) {
+        switch(TYPE(argv[i])) {
+        case T_STRING:
+            str = RSTRING(argv[i])->ptr;
+            arg_sym = ID2SYM(rb_intern(str));
+            break;
+        case T_SYMBOL:
+            arg_sym = argv[i];
+            str = rb_id2name(SYM2ID(arg_sym));
+            break;
+        default:
+            rb_raise(rb_eArgError, "arg #%d is not a String or a Symbol", i);
+        }
+
+        if (!NIL_P(ret = rb_hash_aref(inf->aliases, arg_sym))) {
+            str = rb_id2name(SYM2ID(ret));
+        }
+
+        id = rb_intern(RSTRING(rb_str_cat2(rb_str_new2("@"), str))->ptr);
+
+        for(j = 0; j < len; j++) {
+            if (inf->ivar[j] == id) break;
+        }
+
+        if (j >= len) {
+            rb_raise(rb_eArgError, "cannot find attribute :%s", str);
+        }
+
+        *(ptr++) = '%';
+        *(ptr++) = *(inf->key + j);
+        *(ptr++) = ' ';
+    }
+
+    *ptr = '\0';
+
+    ret = rb_str_new2(buf);
+
+    free(buf);
+
+    return ret;
+}
+
+static VALUE
+cbsubst_get_subst_key(self, str)
+    VALUE self;
+    VALUE str;
+{
+    volatile VALUE list;
+    volatile VALUE ret;
+    int i, len;
+    char *buf, *ptr;
+
+    list = rb_funcall(cTclTkLib, ID_split_tklist, 1, str);
+
+    len = RARRAY(list)->len;
+    buf = ALLOC_N(char, len + 1);
+
+    for(i = 0; i < len; i++) {
+        ptr = RSTRING(RARRAY(list)->ptr[i])->ptr;
+        if (*ptr == '%' && *(ptr + 2) == '\0') {
+            *(buf + i) = *(ptr + 1);
+        } else {
+            *(buf + i) = ' ';
+        }
+    }
+    *(buf + len) = '\0';
+
+    ret = rb_str_new2(buf);
+    free(buf);
+    return ret;
+}
+
+static VALUE
+cbsubst_get_all_subst_keys(self)
+    VALUE self;
+{
+    struct cbsubst_info *inf;
+    char *buf, *ptr;
+    int i, len;
+    volatile VALUE ret;
+
+    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
+                    struct cbsubst_info, inf);
+
+    len = strlen(inf->key);
+    buf = ALLOC_N(char, 3*len + 1);
+    ptr = buf;
+    for(i = 0; i < len; i++) {
+        *(ptr++) = '%';
+        *(ptr++) = *(inf->key + i);
+        *(ptr++) = ' ';
+    }
+    *(buf + 3*len) = '\0';
+
+    ret = rb_ary_new3(2, rb_str_new2(inf->key), rb_str_new2(buf));
+
+    free(buf);
+
+    return ret;
+}
+
+static VALUE
+cbsubst_table_setup(self, key_inf, proc_inf)
+    VALUE self;
+    VALUE key_inf;
+    VALUE proc_inf;
+{
+    struct cbsubst_info *subst_inf;
+    int idx;
+    int len = RARRAY(key_inf)->len;
+    int real_len = 0;
+    char *key = ALLOC_N(char, len + 1);
+    char *type = ALLOC_N(char, len + 1);
+    ID *ivar = ALLOC_N(ID, len + 1);
+    volatile VALUE proc = rb_hash_new();
+    volatile VALUE aliases = rb_hash_new();
+    volatile VALUE inf;
+
+    /* init */
+    subst_inf = ALLOC(struct cbsubst_info);
+    /* subst_inf->size = len; */
+    subst_inf->key  = key;
+    subst_inf->type = type;
+    subst_inf->ivar = ivar;
+    subst_inf->proc = proc;
+    subst_inf->aliases = aliases;
+
+    /*
+     * keys : array of [subst, type, ivar]
+     *         subst ==> char code 
+     *         type  ==> char code 
+     *         ivar  ==> symbol
+     */
+    for(idx = 0; idx < len; idx++) {
+        inf = RARRAY(key_inf)->ptr[idx];
+        if (TYPE(inf) != T_ARRAY) continue;
+        *(key  + real_len) = (char)NUM2INT(RARRAY(inf)->ptr[0]);
+        *(type + real_len) = (char)NUM2INT(RARRAY(inf)->ptr[1]);
+
+        *(ivar + real_len) 
+            = rb_intern(
+                RSTRING(
+                  rb_str_cat2(rb_str_new2("@"), 
+                              rb_id2name(SYM2ID(RARRAY(inf)->ptr[2])))
+                )->ptr
+              );
+
+        rb_attr(self, SYM2ID(RARRAY(inf)->ptr[2]), 1, 0, Qtrue);
+        real_len++;
+    }
+    *(key + real_len) = '\0';
+    *(type + real_len) = '\0';
+    subst_inf->size = real_len;
+
+    /*
+     * procs : array of [type, proc]
+     *         type  ==> char code 
+     *         proc  ==> proc/method/obj (must respond to 'call')
+     */
+    len = RARRAY(proc_inf)->len;
+    for(idx = 0; idx < len; idx++) {
+        inf = RARRAY(proc_inf)->ptr[idx];
+        if (TYPE(inf) != T_ARRAY) continue;
+        rb_hash_aset(proc, RARRAY(inf)->ptr[0], RARRAY(inf)->ptr[1]);
+    }
+
+    rb_const_set(self, ID_SUBST_INFO, 
+                 Data_Wrap_Struct(cSUBST_INFO, subst_mark, 
+                                  subst_free, subst_inf));
+
+    return self;
+}
+
+static VALUE
+cbsubst_get_extra_args_tbl(self)
+    VALUE self;
+{
+  return rb_ary_new();
+}
+
+static VALUE
+cbsubst_scan_args(self, arg_key, val_ary)
+    VALUE self;
+    VALUE arg_key;
+    VALUE val_ary;
+{
+    struct cbsubst_info *inf;
+    int idx;
+    int len = RARRAY(val_ary)->len;
+    char c;
+    char *ptr;
+    volatile VALUE dst = rb_ary_new2(len);
+    volatile VALUE proc;
+    int thr_crit_bup;
+    VALUE old_gc;
+
+    thr_crit_bup = rb_thread_critical;
+    rb_thread_critical = Qtrue;
+
+    old_gc = rb_gc_disable();
+
+    Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
+                    struct cbsubst_info, inf);
+
+    RARRAY(dst)->len = 0;
+    for(idx = 0; idx < len; idx++) {
+        if (idx >= RSTRING(arg_key)->len) {
+            proc = Qnil;
+        } else if (*(RSTRING(arg_key)->ptr + idx) == ' ') {
+            proc = Qnil;
+        } else {
+          ptr = strchr(inf->key, *(RSTRING(arg_key)->ptr + idx));
+          if (ptr == (char*)NULL) {
+            proc = Qnil;
+          } else {
+            c = *(inf->type + (ptr - inf->key));
+            proc = rb_hash_aref(inf->proc, INT2FIX(c));
+          }
+        }
+
+        if (NIL_P(proc)) {
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] = RARRAY(val_ary)->ptr[idx];
+        } else {
+            RARRAY(dst)->ptr[RARRAY(dst)->len++] 
+                = rb_funcall(proc, ID_call, 1, RARRAY(val_ary)->ptr[idx]);
+        }
+    }
+
+    if (old_gc == Qfalse) rb_gc_enable();
+    rb_thread_critical = thr_crit_bup;
+
+    return dst;
+}
+
+static VALUE
+cbsubst_inspect(self)
+    VALUE self;
+{
+    return rb_str_new2("CallbackSubst");
+}
+
+static VALUE
+substinfo_inspect(self)
+    VALUE self;
+{
+    return rb_str_new2("SubstInfo");
+}
+
+/*************************************/
+
+static VALUE
+tk_cbe_inspect(self)
+    VALUE self;
+{
+    return rb_str_new2("TkCallbackEntry");
+}
+
+/*************************************/
+
+static VALUE
+tkobj_path(self)
+    VALUE self;
+{
+    return rb_ivar_get(self, ID_at_path);
+}
+
+/*************************************/
+/* release date */
+const char tkutil_release_date[] = TKUTIL_RELEASE_DATE;
+
+void
+Init_tkutil()
+{
+    VALUE cTK = rb_define_class("TkKernel", rb_cObject);
+    VALUE mTK = rb_define_module("TkUtil");
+
+    /* --------------------- */
+
+    rb_define_const(mTK, "RELEASE_DATE", 
+                    rb_obj_freeze(rb_str_new2(tkutil_release_date)));
+
+    /* --------------------- */
+    rb_global_variable(&cMethod);
+    cMethod = rb_const_get(rb_cObject, rb_intern("Method"));
+
+    ID_path = rb_intern("path");
+    ID_at_path = rb_intern("@path");
+    ID_at_enc = rb_intern("@encoding");
+    ID_to_eval = rb_intern("to_eval");
+    ID_to_s = rb_intern("to_s");
+    ID_source = rb_intern("source");
+    ID_downcase = rb_intern("downcase");
+    ID_install_cmd = rb_intern("install_cmd");
+    ID_merge_tklist = rb_intern("_merge_tklist");
+    ID_encoding = rb_intern("encoding");
+    ID_encoding_system = rb_intern("encoding_system");
+    ID_call = rb_intern("call");
+
+    /* --------------------- */
+    cCB_SUBST = rb_define_class_under(mTK, "CallbackSubst", rb_cObject);
+    rb_define_singleton_method(cCB_SUBST, "inspect", cbsubst_inspect, 0);
+
+    cSUBST_INFO = rb_define_class_under(cCB_SUBST, "Info", rb_cObject);
+    rb_define_singleton_method(cSUBST_INFO, "inspect", substinfo_inspect, 0);
+
+    ID_SUBST_INFO = rb_intern("SUBST_INFO");
+    rb_define_singleton_method(cCB_SUBST, "ret_val", cbsubst_ret_val, 1);
+    rb_define_singleton_method(cCB_SUBST, "scan_args", cbsubst_scan_args, 2);
+    rb_define_singleton_method(cCB_SUBST, "subst_arg", 
+                               cbsubst_get_subst_arg, -1);
+    rb_define_singleton_method(cCB_SUBST, "_get_subst_key", 
+                               cbsubst_get_subst_key,  1);
+    rb_define_singleton_method(cCB_SUBST, "_get_all_subst_keys", 
+                               cbsubst_get_all_subst_keys,  0);
+    rb_define_singleton_method(cCB_SUBST, "_setup_subst_table", 
+                               cbsubst_table_setup, 2);
+    rb_define_singleton_method(cCB_SUBST, "_get_extra_args_tbl", 
+                               cbsubst_get_extra_args_tbl,  0);
+    rb_define_singleton_method(cCB_SUBST, "_define_attribute_aliases", 
+                               cbsubst_def_attr_aliases,  1);
+
+    rb_define_method(cCB_SUBST, "initialize", cbsubst_initialize, -1);
+
+    cbsubst_init();
+
+    /* --------------------- */
+    rb_global_variable(&cTkCallbackEntry);
+    cTkCallbackEntry = rb_define_class("TkCallbackEntry", cTK);
+    rb_define_singleton_method(cTkCallbackEntry, "inspect", tk_cbe_inspect, 0);
+
+    /* --------------------- */
+    rb_global_variable(&cTkObject);
+    cTkObject = rb_define_class("TkObject", cTK);
+    rb_define_method(cTkObject, "path", tkobj_path, 0);
+
+    /* --------------------- */
+    rb_require("tcltklib");
+    rb_global_variable(&cTclTkLib);
+    cTclTkLib = rb_const_get(rb_cObject, rb_intern("TclTkLib"));
+    ID_split_tklist = rb_intern("_split_tklist");
+    ID_toUTF8 = rb_intern("_toUTF8");
+    ID_fromUTF8 = rb_intern("_fromUTF8");
+
+    /* --------------------- */
+    rb_define_singleton_method(cTK, "new", tk_s_new, -1);
+
+    /* --------------------- */
+    rb_global_variable(&TK_None);
+    TK_None = rb_obj_alloc(rb_cObject);
+    rb_define_const(mTK, "None", TK_None);
+    rb_define_singleton_method(TK_None, "to_s", tkNone_to_s, 0);
+    rb_define_singleton_method(TK_None, "inspect", tkNone_to_s, 0);
+    OBJ_FREEZE(TK_None);
+
+    /* --------------------- */
+    rb_global_variable(&CALLBACK_TABLE);
+    CALLBACK_TABLE = rb_hash_new();
+
+    /* --------------------- */
+    rb_define_singleton_method(mTK, "eval_cmd", tk_eval_cmd, -1);
+    rb_define_singleton_method(mTK, "callback", tk_do_callback, -1);
+    rb_define_singleton_method(mTK, "install_cmd", tk_install_cmd, -1);
+    rb_define_singleton_method(mTK, "uninstall_cmd", tk_uninstall_cmd, 1);
+    rb_define_singleton_method(mTK, "_symbolkey2str", tk_symbolkey2str, 1);
+    rb_define_singleton_method(mTK, "hash_kv", tk_hash_kv, -1);
+    rb_define_singleton_method(mTK, "_get_eval_string", 
+                               tk_get_eval_string, -1);
+    rb_define_singleton_method(mTK, "_get_eval_enc_str", 
+                               tk_get_eval_enc_str, 1);
+    rb_define_singleton_method(mTK, "_conv_args", tk_conv_args, -1);
+
+    rb_define_singleton_method(mTK, "bool", tcl2rb_bool, 1);
+    rb_define_singleton_method(mTK, "number", tcl2rb_number, 1);
+    rb_define_singleton_method(mTK, "string", tcl2rb_string, 1);
+    rb_define_singleton_method(mTK, "num_or_str", tcl2rb_num_or_str, 1);
+
+    rb_define_method(mTK, "_toUTF8", tk_toUTF8, -1);
+    rb_define_method(mTK, "_fromUTF8", tk_fromUTF8, -1);
+    rb_define_method(mTK, "_symbolkey2str", tk_symbolkey2str, 1);
+    rb_define_method(mTK, "hash_kv", tk_hash_kv, -1);
+    rb_define_method(mTK, "_get_eval_string", tk_get_eval_string, -1);
+    rb_define_method(mTK, "_get_eval_enc_str", tk_get_eval_enc_str, 1);
+    rb_define_method(mTK, "_conv_args", tk_conv_args, -1);
+
+    rb_define_method(mTK, "bool", tcl2rb_bool, 1);
+    rb_define_method(mTK, "number", tcl2rb_number, 1);
+    rb_define_method(mTK, "string", tcl2rb_string, 1);
+    rb_define_method(mTK, "num_or_str", tcl2rb_num_or_str, 1);
+
+    /* --------------------- */
+}
diff --git a/ruby_1_8_6/ext/win32ole/.cvsignore b/ruby_1_8_6/ext/win32ole/.cvsignore
new file mode 100644
index 0000000000..4f6430def0
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.log
+.document
diff --git a/ruby_1_8_6/ext/win32ole/depend b/ruby_1_8_6/ext/win32ole/depend
new file mode 100644
index 0000000000..4bf5ab5b94
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/depend
@@ -0,0 +1 @@
+win32ole.o : win32ole.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h 
diff --git a/ruby_1_8_6/ext/win32ole/doc/win32ole.rd b/ruby_1_8_6/ext/win32ole/doc/win32ole.rd
new file mode 100644
index 0000000000..c563ce5d5b
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/doc/win32ole.rd
@@ -0,0 +1,294 @@
+=begin
+= Win32OLE extension module
+
+== WIN32OLE 
+=== Constants
+: VERSION
+    The version number of WIN32OLE.
+
+: ARGV
+    The argument of the method invoked recently.
+    This constant is used to get value of argument 
+    when the argument is passed by reference.
+
+=== Class Method
+: connect(oleserver)
+   returns running OLE automation object or WIN32OLE object from moniker.
+
+: const_load(ole [,obj])
+   defines the constants of OLE automation
+   server as 'obj' class constants. If 'obj' omitted, the default
+   is WIN32OLE.
+
+: new(oleserver)
+   returns OLE Automation object.
+
+: ole_free(obj)
+   invokes Release method of Dispatch interface of WIN32OLE object.
+   This method should not be used because this method exists for debugging WIN32OLE.
+
+: ole_reference_count(obj)
+   returns reference counter of Dispatch interface.
+   This method should not be used because this method exists for debugging WIN32OLE.
+
+: ole_show_help(info [,helpcontext])
+   displays helpfile.
+   The first argument specifies WIN32OLE_TYPE object or WIN32OLE_METHOD object 
+   or helpfile.
+
+=== Method
+: self[property]
+   gets property of OLE object.
+
+: self[property]=
+   sets property of OLE object.
+
+: _invoke(dispid, args, types)
+   runs the early binding method.
+   The dispid specifies Dispatch ID, args specifies the array of arguments,
+   types specifies array of the type of arguments.
+
+: each {...}
+   Iterates over each item of OLE collection which has IEnumVARIANT
+   interface.
+
+: invoke(method, args,...)
+   runs OLE method.
+
+: ole_func_methods
+   returns array of WIN32OLE_METHOD object which corresponds with function.
+
+: ole_get_methods
+   returns array of WIN32OLE_METHOD object which corresponds with get properties.
+
+: ole_method(method)
+   returns WIN32OLE_METHOD object which coreesponds with method 
+   which specified by argument.
+
+: ole_method_help(method)
+   alias of ole_method.
+
+: ole_methods
+   returns WIN32OLE_METHOD object which coreesponds with method.
+
+: ole_obj_help
+   returns WIN32OLE_TYPE object.
+
+: ole_put_methods
+   returns array of WIN32OLE_METHOD object which corresponds with put properties.
+
+: setproperty(property, key, val)
+   set property of OLE object. 
+   This method is used when the property has argument.
+
+   For example, in VB
+     obj.item("key") = val
+   in Win32OLE
+     obj.setproperty("item", "key", val)
+
+
+== WIN32OLE_EVENT class
+
+=== Class Method
+
+: new(ole, interface)
+   The new class method creates OLE event sink object to connect ole.
+   The ole must be WIN32OLE object, and interface is the interface
+   name of event.
+
+: message_loop
+    The message_loop class method translates and dispatches Windows 
+    message.
+
+=== Method
+: on_event([event]){...}
+    defines the callback of event.
+    If event omitted, defines the callback of all events.
+
+: on_event_with_outargs([event]) {...}
+    defines the callback of event.
+    If you want modify argument in callback, 
+
+== WIN32OLE_METHOD
+
+=== Class Methods
+: new(win32ole_type, method)    
+   creates WIN32OLE_METHOD object.
+
+=== Methods
+: dispid
+   returns Dispatch ID.
+
+: event?
+   returns true if the method is event.
+
+: event_interface
+   returns interface name of event if the method is event.
+
+: helpcontext
+   returns help context.
+
+: helpfile
+   returns help file.
+
+: invkind
+   returns invkind.
+
+: invoke_kind
+   returns invoke kind string.
+
+: name
+   returns name of method.
+
+: offset_vtbl
+   returns the offset of Vtbl.
+
+: params
+   returns array of WIN32OLE_PARAM object.
+
+: return_type
+   returns string of return value type of method.
+
+: return_vtype
+   returns number of return value type of method.
+
+: return_type_detail
+   returns detail information of return value type of method.
+
+: size_params
+   returns the size of arguments.
+
+: size_opt_params
+   returns the size of optional arguments.
+
+: visible?
+   returns true if the method is public.
+
+== WIN32OLE_PARAM
+: default
+   returns default value.
+
+: input?
+   returns true if argument is input.
+
+: optional?
+   returns true if argument is optional.
+
+: output?
+   returns true if argument is output.
+
+: name
+   returns name.
+
+: ole_type
+   returns type of argument.
+
+: ole_type_detail
+   returns detail information of type of argument.
+
+: retval?
+   returns true if argument is return value.
+
+== WIN32OLE_TYPE
+=== Class Methods
+: new(typelibrary, class)
+    returns WIN32OLE_TYPE object.
+
+: ole_classes(typelibrary)
+    returns array of WIN32OLE_TYPE objects defined by Type Library.
+
+: progids
+    returns array of ProgID.
+
+: typelibs
+    returns array of type libraries.
+
+=== Methods
+: guid
+   returns GUID.
+
+: helpfile
+   returns helpfile.
+
+: helpcontext
+   returns helpcontext.
+
+: helpstring
+   returns help string.
+
+: major_version
+   returns major version.
+
+: minor_version
+   returns minor version.
+
+: name
+   returns name.
+
+: ole_methods
+   returns array of WIN32OLE_METHOD objects.
+
+: ole_type
+   returns type of class.
+
+: progid
+   returns ProgID if it exists. If not found, then returns nil.
+
+: src_type
+   returns source class when the OLE class is 'Alias'.
+
+: typekind
+   returns number which represents type.
+
+: variables
+   returns array of variables defined in OLE class.
+
+: visible?
+   returns true if the OLE class is public.
+
+== WIN32OLE_VARIABLE
+=== Methods
+: name
+   returns the name.
+
+: ole_type
+   returns type
+
+: ole_type_detail
+   returns detail information of type.
+
+: value
+   returns value.
+
+: variable_kind
+   returns variable kind string.
+
+: varkind
+   returns the number which represents variable kind.
+
+== WIN32OLE::VARIANT
+=== Constants
+  *VT_I4
+  *VT_R4
+  *VT_R8
+  *VT_CY
+  *VT_DATE
+  *VT_BSTR
+  *VT_USERDEFINED
+  *VT_PTR
+  *VT_DISPATCH
+  *VT_ERROR
+  *VT_BOOL
+  *VT_VARIANT
+  *VT_UNKNOWN
+  *VT_I1
+  *VT_UI1
+  *VT_UI2
+  *VT_UI4
+  *VT_INT
+  *VT_UINT
+  *VT_ARRAY
+  *VT_BYREF
+
+=end
+
diff --git a/ruby_1_8_6/ext/win32ole/extconf.rb b/ruby_1_8_6/ext/win32ole/extconf.rb
new file mode 100644
index 0000000000..cee922554a
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/extconf.rb
@@ -0,0 +1,41 @@
+#----------------------------------
+# extconf.rb
+# $Revision$
+# $Date$
+#----------------------------------
+require 'mkmf'
+
+dir_config("win32")
+
+SRCFILES=<<SRC
+win32ole.c
+SRC
+
+def create_docfile(src)
+  open(File.expand_path($srcdir) + "/.document", "w") {|ofs|
+    ofs.print src
+  }
+end
+
+def create_win32ole_makefile
+  if have_library("ole32") and
+     have_library("oleaut32") and
+     have_library("uuid") and 
+     have_library("user32") and
+     have_library("kernel32") and
+     have_library("advapi32") and
+     have_header("windows.h")
+    create_makefile("win32ole")
+    create_docfile(SRCFILES)
+  else
+    create_docfile("")
+  end
+end
+
+case RUBY_PLATFORM
+when /mswin32/
+  $CFLAGS += ' /W3'
+when /cygwin/, /mingw/
+  $defs << '-DNONAMELESSUNION'
+end
+create_win32ole_makefile
diff --git a/ruby_1_8_6/ext/win32ole/lib/win32ole/property.rb b/ruby_1_8_6/ext/win32ole/lib/win32ole/property.rb
new file mode 100644
index 0000000000..a68bad9af8
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/lib/win32ole/property.rb
@@ -0,0 +1,16 @@
+# OLEProperty
+# helper class of Property with arguments.
+class OLEProperty
+  def initialize(obj, dispid, gettypes, settypes)
+    @obj = obj
+    @dispid = dispid
+    @gettypes = gettypes
+    @settypes = settypes
+  end
+  def [](*args)
+    @obj._getproperty(@dispid, args, @gettypes)
+  end
+  def []=(*args)
+    @obj._setproperty(@dispid, args, @settypes)
+  end
+end
diff --git a/ruby_1_8_6/ext/win32ole/sample/excel1.rb b/ruby_1_8_6/ext/win32ole/sample/excel1.rb
new file mode 100644
index 0000000000..e366a52839
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/sample/excel1.rb
@@ -0,0 +1,22 @@
+require 'win32ole'
+
+#application = WIN32OLE.new('Excel.Application.5')
+application = WIN32OLE.new('Excel.Application')
+
+application.visible = TRUE
+workbook = application.Workbooks.Add();
+worksheet = workbook.Worksheets(1);
+worksheet.Range("A1:D1").value = ["North","South","East","West"];
+worksheet.Range("A2:B2").value = [5.2, 10];
+worksheet.Range("C2").value = 8;
+worksheet.Range("D2").value = 20;
+
+range = worksheet.Range("A1:D2");
+range.Select
+chart = workbook.Charts.Add;
+
+workbook.saved = TRUE;
+
+application.ActiveWorkbook.Close(0);
+application.Quit();
+
diff --git a/ruby_1_8_6/ext/win32ole/sample/excel2.rb b/ruby_1_8_6/ext/win32ole/sample/excel2.rb
new file mode 100644
index 0000000000..46f459b36b
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/sample/excel2.rb
@@ -0,0 +1,30 @@
+require 'win32ole'
+
+#   -4100 is the value for the Excel constant xl3DColumn.
+ChartTypeVal = -4100;
+
+#   Creates OLE object to Excel
+#excel = WIN32OLE.new("excel.application.5")
+excel = WIN32OLE.new("excel.application")
+
+# Create and rotate the chart
+
+excel['Visible'] = TRUE;
+excel.Workbooks.Add();
+excel.Range("a1")['Value'] = 3;
+excel.Range("a2")['Value'] = 2;
+excel.Range("a3")['Value'] = 1;
+excel.Range("a1:a3").Select();
+excelchart = excel.Charts.Add();
+excelchart['Type'] = ChartTypeVal;
+
+i = 30
+i.step(180, 10) do |rot|
+#    excelchart['Rotation'] = rot;
+    excelchart.rotation=rot;
+end
+# Done, bye
+
+excel.ActiveWorkbook.Close(0);
+excel.Quit();
+
diff --git a/ruby_1_8_6/ext/win32ole/sample/excel3.rb b/ruby_1_8_6/ext/win32ole/sample/excel3.rb
new file mode 100644
index 0000000000..0f96717063
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/sample/excel3.rb
@@ -0,0 +1,13 @@
+require 'win32ole'
+
+#application = WIN32OLE.new('Excel.Application.5')
+application = WIN32OLE.new('Excel.Application')
+
+application.visible = TRUE
+workbook = application.Workbooks.Add();
+sheet = workbook.Worksheets(1);
+sheetS = workbook.Worksheets
+puts "The number of sheets is #{sheetS.count}"
+puts "Now add 2 sheets after of `#{sheet.name}`"
+sheetS.add({'count'=>2, 'after'=>sheet})
+puts "The number of sheets is #{sheetS.count}"
diff --git a/ruby_1_8_6/ext/win32ole/sample/ie.rb b/ruby_1_8_6/ext/win32ole/sample/ie.rb
new file mode 100644
index 0000000000..11dc861e0b
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/sample/ie.rb
@@ -0,0 +1,11 @@
+require 'win32ole'
+url = 'http://www.ruby-lang.org/'
+ie = WIN32OLE.new('InternetExplorer.Application')
+ie.visible = TRUE
+ie.gohome
+print "Now navigate Ruby home page... Please enter."
+gets
+ie.navigate(url)
+print "Now quit Internet Explorer... Please enter."
+gets
+ie.Quit()
diff --git a/ruby_1_8_6/ext/win32ole/sample/ieconst.rb b/ruby_1_8_6/ext/win32ole/sample/ieconst.rb
new file mode 100644
index 0000000000..234272c7ed
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/sample/ieconst.rb
@@ -0,0 +1,32 @@
+require 'win32ole'
+
+ie = WIN32OLE.new('InternetExplorer.Application')
+=begin
+WIN32OLE.const_load(ie)
+WIN32OLE.constants.sort.each do |c|
+  puts "#{c} = #{WIN32OLE.const_get(c)}"
+end
+=end
+
+module IE_CONST
+end
+
+WIN32OLE.const_load(ie, IE_CONST)
+IE_CONST.constants.sort.each do |c|
+  puts "#{c} = #{IE_CONST.const_get(c)}"
+end
+
+#------------------------------------------------------------
+# Remark!!! CONSTANTS has not tested enoughly!!!
+# CONSTANTS is alpha release.
+# If there are constants which first letter is not [a-zA-Z],
+# like a '_Foo', then maybe you can access the value by 
+# using CONSTANTS['_Foo']
+#------------------------------------------------------------
+IE_CONST::CONSTANTS.each do |k, v|
+  puts "#{k} = #{v}"
+end
+
+puts WIN32OLE::VERSION
+ie.quit
+
diff --git a/ruby_1_8_6/ext/win32ole/sample/ienavi.rb b/ruby_1_8_6/ext/win32ole/sample/ienavi.rb
new file mode 100644
index 0000000000..c7fa3f5ec2
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/sample/ienavi.rb
@@ -0,0 +1,40 @@
+require 'win32ole'
+
+$urls = []
+
+def navigate(url)
+  $urls << url
+end
+
+def stop_msg_loop
+  puts "Now Stop IE..."
+  $LOOP = FALSE;
+end
+
+def default_handler(event, *args)
+  case event
+  when "BeforeNavigate"
+    puts "Now Navigate #{args[0]}..."
+  end
+end
+
+ie = WIN32OLE.new('InternetExplorer.Application')
+ie.visible = TRUE
+ie.gohome
+
+ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
+
+ev.on_event {|*args| default_handler(*args)}
+ev.on_event("NavigateComplete") {|url| navigate(url)}
+ev.on_event("Quit") {|*args| stop_msg_loop} 
+
+$LOOP = TRUE
+while ($LOOP)
+  WIN32OLE_EVENT.message_loop
+end
+
+puts "You Navigated the URLs ..."
+$urls.each_with_index do |url, i|
+  puts "(#{i+1}) #{url}"
+end
+
diff --git a/ruby_1_8_6/ext/win32ole/sample/oledirs.rb b/ruby_1_8_6/ext/win32ole/sample/oledirs.rb
new file mode 100644
index 0000000000..1c77e76f14
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/sample/oledirs.rb
@@ -0,0 +1,23 @@
+#
+# You need WSH(Windows Scripting Host) to run this script.
+#
+
+require "win32ole"
+
+def listup(items)
+#  items.each do |i|
+  for i in items
+    puts i.name 
+  end
+end
+
+fs = WIN32OLE.new("Scripting.FileSystemObject")
+
+folder = fs.GetFolder(".")
+
+puts "--- folder of #{folder.path} ---"
+listup(folder.SubFolders)
+
+puts "--- files of #{folder.path} ---"
+listup(folder.Files)
+
diff --git a/ruby_1_8_6/ext/win32ole/sample/olegen.rb b/ruby_1_8_6/ext/win32ole/sample/olegen.rb
new file mode 100644
index 0000000000..48d86893fe
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/sample/olegen.rb
@@ -0,0 +1,348 @@
+#-----------------------------
+# olegen.rb
+# $Date$
+# $Revision$
+#-----------------------------
+
+require 'win32ole'
+
+class WIN32COMGen
+  def initialize(typelib)
+    @typelib = typelib
+    @reciever = ""
+  end
+  attr_reader :typelib
+
+  def ole_classes(typelib)
+    begin
+      @ole = WIN32OLE.new(typelib)
+      [@ole.ole_obj_help]
+    rescue
+      WIN32OLE_TYPE.ole_classes(typelib)
+    end
+  end
+
+  def generate_args(method)
+    args = []
+    if method.size_opt_params >= 0
+      size_required_params = method.size_params - method.size_opt_params
+    else
+      size_required_params = method.size_params - 1
+    end
+    size_required_params.times do |i|
+      if method.params[i] && method.params[i].optional?
+        args.push "arg#{i}=nil"
+      else
+        args.push "arg#{i}"
+      end
+    end
+    if method.size_opt_params >= 0
+      method.size_opt_params.times do |i|
+        args.push "arg#{i + size_required_params}=nil"
+      end
+    else
+      args.push "*arg"
+    end
+    args.join(", ")
+  end
+
+  def generate_argtype(typedetails)
+    ts = ''
+    typedetails.each do |t|
+      case t
+      when 'CARRAY', 'VOID', 'UINT', 'RESULT', 'DECIMAL', 'I8', 'UI8' 
+#	  raise "Sorry type\"" + t + "\" not supported"
+      ts << "\"??? NOT SUPPORTED TYPE:`#{t}'\""
+      when 'USERDEFINED', 'Unknown Type 9'
+        ts << 'VT_DISPATCH'
+        break;
+      when 'SAFEARRAY'
+        ts << 'VT_ARRAY|'
+      when 'PTR'
+        ts << 'VT_BYREF|'
+      when 'INT'
+        ts << 'VT_I4'
+      else
+        if String === t
+          ts << 'VT_' + t
+        end
+      end
+    end
+    if ts.empty?
+      ts = 'VT_VARIANT'
+    elsif ts[-1] == ?|
+	ts += 'VT_VARIANT'
+    end
+    ts
+  end
+
+  def generate_argtypes(method, proptypes)
+    types = method.params.collect{|param|
+      generate_argtype(param.ole_type_detail)
+    }.join(", ")
+    if proptypes
+      types += ", " if types.size > 0 
+      types += generate_argtype(proptypes)
+    end
+    types
+  end
+
+  def generate_method_body(method, disptype, types=nil)
+    "    ret = #{@reciever}#{disptype}(#{method.dispid}, [" +
+    generate_args(method).gsub("=nil", "") +
+    "], [" +
+    generate_argtypes(method, types) +
+    "])\n" +
+    "    @lastargs = WIN32OLE::ARGV\n" +
+    "    ret"
+  end
+
+  def generate_method_help(method, type = nil)
+    str = "  # "  
+    if type 
+      str += type
+    else
+      str += method.return_type
+    end
+    str += " #{method.name}"
+    if method.event?
+      str += " EVENT"
+      str += " in #{method.event_interface}"
+    end
+    if method.helpstring && method.helpstring != ""
+      str += "\n  # "
+      str += method.helpstring
+    end
+    args_help = generate_method_args_help(method)
+    if args_help
+      str += "\n"
+      str += args_help
+    end
+    str
+  end
+
+  def generate_method_args_help(method)
+    args = []
+    method.params.each_with_index {|param, i|
+      h = "  #   #{param.ole_type} arg#{i} --- #{param.name}" 
+      inout = []
+      inout.push "IN" if param.input?
+      inout.push "OUT" if param.output?
+      h += " [#{inout.join('/')}]"
+      h += " ( = #{param.default})" if param.default
+      args.push h
+    }
+    if args.size > 0
+      args.join("\n")
+    else
+      nil
+    end
+  end
+
+  def generate_method(method, disptype, io = STDOUT, types = nil)
+    io.puts "\n"
+    io.puts  generate_method_help(method)
+    if method.invoke_kind == 'PROPERTYPUT'
+      io.print "  def #{method.name}=("
+    else
+      io.print "  def #{method.name}("
+    end
+    io.print generate_args(method)
+    io.puts ")"
+    io.puts generate_method_body(method, disptype, types)
+    io.puts "  end"
+  end
+
+  def generate_propputref_methods(klass, io = STDOUT)
+    klass.ole_methods.select {|method|
+      method.invoke_kind == 'PROPERTYPUTREF' && method.visible?
+    }.each do |method|
+      generate_method(method, io)
+    end
+  end
+
+  def generate_properties_with_args(klass, io = STDOUT)
+    klass.ole_methods.select {|method|
+      method.invoke_kind == 'PROPERTYGET' &&
+      method.visible? &&
+      method.size_params > 0
+    }.each do |method|
+      types = method.return_type_detail 
+      io.puts "\n"
+      io.puts  generate_method_help(method, types[0])
+      io.puts  "  def #{method.name}"
+      if klass.ole_type == "Class"
+        io.print "    OLEProperty.new(@dispatch, #{method.dispid}, [" 
+      else
+        io.print "    OLEProperty.new(self, #{method.dispid}, [" 
+      end
+      io.print generate_argtypes(method, nil)
+      io.print "], ["
+      io.print generate_argtypes(method, types)
+      io.puts "])"
+      io.puts  "  end"
+    end
+  end
+
+  def generate_propput_methods(klass, io = STDOUT)
+    klass.ole_methods.select {|method|
+      method.invoke_kind == 'PROPERTYPUT' && method.visible? &&
+      method.size_params == 1
+    }.each do |method|
+      ms = klass.ole_methods.select {|m|
+        m.invoke_kind == 'PROPERTYGET' &&
+        m.dispid == method.dispid
+      }
+      types = []
+      if ms.size == 1
+        types = ms[0].return_type_detail
+      end
+      generate_method(method, '_setproperty', io, types)
+    end
+  end
+
+  def generate_propget_methods(klass, io = STDOUT)
+    klass.ole_methods.select {|method|
+      method.invoke_kind == 'PROPERTYGET' && method.visible? &&
+      method.size_params == 0
+    }.each do |method|
+      generate_method(method, '_getproperty', io)
+    end
+  end
+
+  def generate_func_methods(klass, io = STDOUT)
+    klass.ole_methods.select {|method|
+      method.invoke_kind == "FUNC" && method.visible?
+    }.each do |method|
+      generate_method(method, '_invoke', io)
+    end
+  end
+
+  def generate_methods(klass, io = STDOUT)
+    generate_propget_methods(klass, io)
+    generate_propput_methods(klass, io)
+    generate_properties_with_args(klass, io)
+    generate_func_methods(klass, io)
+#   generate_propputref_methods(klass, io)
+  end
+
+  def generate_constants(klass, io = STDOUT)
+    klass.variables.select {|v|
+      v.visible? && v.variable_kind == 'CONSTANT'
+    }.each do |v|
+      io.print "  "
+      io.print v.name.sub(/^./){|c| c.upcase}
+      io.print " = "
+      io.puts  v.value
+    end
+  end
+
+  def class_name(klass)
+    klass_name = klass.name
+    if klass.ole_type == "Class" &&
+       klass.guid &&
+       klass.progid
+       klass_name = klass.progid.gsub(/\./, '_')
+    end
+    if /^[A-Z]/ !~ klass_name || Module.constants.include?(klass_name)
+      klass_name = 'OLE' + klass_name
+    end
+    klass_name
+  end
+
+  def define_initialize(klass)
+    <<STR
+
+  def initialize(obj = nil)
+    @clsid = "#{klass.guid}"
+    @progid = "#{klass.progid}"
+    if obj.nil?
+      @dispatch = WIN32OLE.new @progid
+    else
+      @dispatch = obj
+    end
+  end
+STR
+  end
+
+  def define_include
+    "  include WIN32OLE::VARIANT"
+  end
+
+  def define_instance_variables
+    "  attr_reader :lastargs"
+  end
+
+  def define_method_missing
+    <<STR
+
+  def method_missing(cmd, *arg)
+    @dispatch.method_missing(cmd, *arg)
+  end
+STR
+  end
+
+  def define_class(klass, io = STDOUT)
+    io.puts "class #{class_name(klass)} # #{klass.name}"
+    io.puts define_include
+    io.puts define_instance_variables
+    io.puts "  attr_reader :dispatch"
+    io.puts "  attr_reader :clsid"
+    io.puts "  attr_reader :progid"
+    io.puts define_initialize(klass)
+    io.puts define_method_missing
+  end
+
+  def define_module(klass, io = STDOUT)
+    io.puts "module #{class_name(klass)}"
+    io.puts define_include
+    io.puts define_instance_variables
+  end
+
+  def generate_class(klass, io = STDOUT)
+    io.puts "\n# #{klass.helpstring}"
+    if klass.ole_type == "Class" &&
+       klass.guid &&
+       klass.progid
+      @reciever = "@dispatch."
+      define_class(klass, io)
+    else
+      @reciever = ""
+      define_module(klass, io)
+    end
+    generate_constants(klass, io)
+    generate_methods(klass, io)
+    io.puts "end"
+  end
+
+  def generate(io = STDOUT)
+    io.puts "require 'win32ole'"
+    io.puts "require 'win32ole/property'"
+
+    ole_classes(typelib).select{|klass|
+      klass.visible? &&
+      (klass.ole_type == "Class" || 
+       klass.ole_type == "Interface" || 
+       klass.ole_type == "Dispatch" ||
+       klass.ole_type == "Enum")
+    }.each do |klass|
+      generate_class(klass, io)
+    end
+    begin
+      @ole.quit if @ole
+    rescue 
+    end
+  end
+end
+
+require 'win32ole'
+if __FILE__ == $0
+  if ARGV.size == 0
+    $stderr.puts "usage: #{$0} Type Library [...]"
+    exit 1
+  end
+  ARGV.each do |typelib|
+    comgen = WIN32COMGen.new(typelib)
+    comgen.generate
+  end
+end
diff --git a/ruby_1_8_6/ext/win32ole/sample/xml.rb b/ruby_1_8_6/ext/win32ole/sample/xml.rb
new file mode 100644
index 0000000000..b95d6d5275
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/sample/xml.rb
@@ -0,0 +1,7306 @@
+# 
+# This file created by olegen.rb as following.
+#    ruby olegen.rb 'Microsoft XML, version 2.0' > xml.rb
+# 
+require 'win32ole'
+require 'win32ole/property'
+
+# 
+module IXMLDOMImplementation
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BOOL hasFeature
+  #   BSTR arg0 --- feature [IN]
+  #   BSTR arg1 --- version [IN]
+  def hasFeature(arg0, arg1)
+    ret = _invoke(145, [arg0, arg1], [VT_BSTR, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# Core DOM node interface
+module IXMLDOMNode
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# Constants that define a node's type
+module OLEtagDOMNodeType
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+  NODE_INVALID = 0
+  NODE_ELEMENT = 1
+  NODE_ATTRIBUTE = 2
+  NODE_TEXT = 3
+  NODE_CDATA_SECTION = 4
+  NODE_ENTITY_REFERENCE = 5
+  NODE_ENTITY = 6
+  NODE_PROCESSING_INSTRUCTION = 7
+  NODE_COMMENT = 8
+  NODE_DOCUMENT = 9
+  NODE_DOCUMENT_TYPE = 10
+  NODE_DOCUMENT_FRAGMENT = 11
+  NODE_NOTATION = 12
+end
+
+# 
+module IXMLDOMNodeList
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # I4 length
+  # number of nodes in the collection
+  def length()
+    ret = _getproperty(74, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # PTR item
+  # collection of nodes
+  #   I4 arg0 --- index [IN]
+  def item
+    OLEProperty.new(self, 0, [VT_I4], [VT_I4, VT_BYREF|VT_DISPATCH])
+  end
+
+  # IXMLDOMNode nextNode
+  # get next node from iterator
+  def nextNode()
+    ret = _invoke(76, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID reset
+  # reset the position of iterator
+  def reset()
+    ret = _invoke(77, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMNamedNodeMap
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # I4 length
+  # number of nodes in the collection
+  def length()
+    ret = _getproperty(74, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # PTR item
+  # collection of nodes
+  #   I4 arg0 --- index [IN]
+  def item
+    OLEProperty.new(self, 0, [VT_I4], [VT_I4, VT_BYREF|VT_DISPATCH])
+  end
+
+  # IXMLDOMNode getNamedItem
+  # lookup item by name
+  #   BSTR arg0 --- name [IN]
+  def getNamedItem(arg0)
+    ret = _invoke(83, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode setNamedItem
+  # set item by name
+  #   IXMLDOMNode arg0 --- newItem [IN]
+  def setNamedItem(arg0)
+    ret = _invoke(84, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeNamedItem
+  # remove item by name
+  #   BSTR arg0 --- name [IN]
+  def removeNamedItem(arg0)
+    ret = _invoke(85, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode getQualifiedItem
+  # lookup the item by name and namespace
+  #   BSTR arg0 --- baseName [IN]
+  #   BSTR arg1 --- namespaceURI [IN]
+  def getQualifiedItem(arg0, arg1)
+    ret = _invoke(87, [arg0, arg1], [VT_BSTR, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeQualifiedItem
+  # remove the item by name and namespace
+  #   BSTR arg0 --- baseName [IN]
+  #   BSTR arg1 --- namespaceURI [IN]
+  def removeQualifiedItem(arg0, arg1)
+    ret = _invoke(88, [arg0, arg1], [VT_BSTR, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextNode
+  # get next node from iterator
+  def nextNode()
+    ret = _invoke(89, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID reset
+  # reset the position of iterator
+  def reset()
+    ret = _invoke(90, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMDocument
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocumentType doctype
+  # node corresponding to the DOCTYPE
+  def doctype()
+    ret = _getproperty(38, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMImplementation implementation
+  # info on this DOM implementation
+  def implementation()
+    ret = _getproperty(39, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMElement documentElement
+  # the root of the tree
+  def documentElement()
+    ret = _getproperty(40, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 readyState
+  # get the state of the XML document
+  def readyState()
+    ret = _getproperty(-525, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMParseError parseError
+  # get the last parser error
+  def parseError()
+    ret = _getproperty(59, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR url
+  # get the URL for the loaded XML document
+  def url()
+    ret = _getproperty(60, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL async
+  # flag for asynchronous download
+  def async()
+    ret = _getproperty(61, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL validateOnParse
+  # indicates whether the parser performs validation
+  def validateOnParse()
+    ret = _getproperty(65, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL resolveExternals
+  # indicates whether the parser resolves references to external DTD/Entities/Schema
+  def resolveExternals()
+    ret = _getproperty(66, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL preserveWhiteSpace
+  # indicates whether the parser preserves whitespace
+  def preserveWhiteSpace()
+    ret = _getproperty(67, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID async
+  # flag for asynchronous download
+  def async=(arg0)
+    ret = _setproperty(61, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID validateOnParse
+  # indicates whether the parser performs validation
+  def validateOnParse=(arg0)
+    ret = _setproperty(65, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID resolveExternals
+  # indicates whether the parser resolves references to external DTD/Entities/Schema
+  def resolveExternals=(arg0)
+    ret = _setproperty(66, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID preserveWhiteSpace
+  # indicates whether the parser preserves whitespace
+  def preserveWhiteSpace=(arg0)
+    ret = _setproperty(67, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID onreadystatechange
+  # register a readystatechange event handler
+  def onreadystatechange=(arg0)
+    ret = _setproperty(68, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID ondataavailable
+  # register an ondataavailable event handler
+  def ondataavailable=(arg0)
+    ret = _setproperty(69, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID ontransformnode
+  # register an ontransformnode event handler
+  def ontransformnode=(arg0)
+    ret = _setproperty(70, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMElement createElement
+  # create an Element node
+  #   BSTR arg0 --- tagName [IN]
+  def createElement(arg0)
+    ret = _invoke(41, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocumentFragment createDocumentFragment
+  # create a DocumentFragment node
+  def createDocumentFragment()
+    ret = _invoke(42, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMText createTextNode
+  # create a text node
+  #   BSTR arg0 --- data [IN]
+  def createTextNode(arg0)
+    ret = _invoke(43, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMComment createComment
+  # create a comment node
+  #   BSTR arg0 --- data [IN]
+  def createComment(arg0)
+    ret = _invoke(44, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMCDATASection createCDATASection
+  # create a CDATA section node
+  #   BSTR arg0 --- data [IN]
+  def createCDATASection(arg0)
+    ret = _invoke(45, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMProcessingInstruction createProcessingInstruction
+  # create a processing instruction node
+  #   BSTR arg0 --- target [IN]
+  #   BSTR arg1 --- data [IN]
+  def createProcessingInstruction(arg0, arg1)
+    ret = _invoke(46, [arg0, arg1], [VT_BSTR, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMAttribute createAttribute
+  # create an attribute node
+  #   BSTR arg0 --- name [IN]
+  def createAttribute(arg0)
+    ret = _invoke(47, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMEntityReference createEntityReference
+  # create an entity reference node
+  #   BSTR arg0 --- name [IN]
+  def createEntityReference(arg0)
+    ret = _invoke(49, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList getElementsByTagName
+  # build a list of elements by name
+  #   BSTR arg0 --- tagName [IN]
+  def getElementsByTagName(arg0)
+    ret = _invoke(50, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode createNode
+  # create a node of the specified node type and name
+  #   VARIANT arg0 --- type [IN]
+  #   BSTR arg1 --- name [IN]
+  #   BSTR arg2 --- namespaceURI [IN]
+  def createNode(arg0, arg1, arg2)
+    ret = _invoke(54, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nodeFromID
+  # retrieve node from it's ID
+  #   BSTR arg0 --- idString [IN]
+  def nodeFromID(arg0)
+    ret = _invoke(56, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL load
+  # load document from the specified XML source
+  #   VARIANT arg0 --- xmlSource [IN]
+  def load(arg0)
+    ret = _invoke(58, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID abort
+  # abort an asynchronous download
+  def abort()
+    ret = _invoke(62, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL loadXML
+  # load the document from a string
+  #   BSTR arg0 --- bstrXML [IN]
+  def loadXML(arg0)
+    ret = _invoke(63, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID save
+  # save the document to a specified desination
+  #   VARIANT arg0 --- desination [IN]
+  def save(arg0)
+    ret = _invoke(64, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMDocumentType
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR name
+  # name of the document type (root of the tree)
+  def name()
+    ret = _getproperty(131, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap entities
+  # a list of entities in the document
+  def entities()
+    ret = _getproperty(132, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap notations
+  # a list of notations in the document
+  def notations()
+    ret = _getproperty(133, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMElement
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR tagName
+  # get the tagName of the element
+  def tagName()
+    ret = _getproperty(97, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT getAttribute
+  # look up the string value of an attribute by name
+  #   BSTR arg0 --- name [IN]
+  def getAttribute(arg0)
+    ret = _invoke(99, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID setAttribute
+  # set the string value of an attribute by name
+  #   BSTR arg0 --- name [IN]
+  #   VARIANT arg1 --- value [IN]
+  def setAttribute(arg0, arg1)
+    ret = _invoke(100, [arg0, arg1], [VT_BSTR, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID removeAttribute
+  # remove an attribute by name
+  #   BSTR arg0 --- name [IN]
+  def removeAttribute(arg0)
+    ret = _invoke(101, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMAttribute getAttributeNode
+  # look up the attribute node by name
+  #   BSTR arg0 --- name [IN]
+  def getAttributeNode(arg0)
+    ret = _invoke(102, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMAttribute setAttributeNode
+  # set the specified attribute on the element
+  #   IXMLDOMAttribute arg0 --- DOMAttribute [IN]
+  def setAttributeNode(arg0)
+    ret = _invoke(103, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMAttribute removeAttributeNode
+  # remove the specified attribute
+  #   IXMLDOMAttribute arg0 --- DOMAttribute [IN]
+  def removeAttributeNode(arg0)
+    ret = _invoke(104, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList getElementsByTagName
+  # build a list of elements by name
+  #   BSTR arg0 --- tagName [IN]
+  def getElementsByTagName(arg0)
+    ret = _invoke(105, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID normalize
+  # collapse all adjacent text nodes in sub-tree
+  def normalize()
+    ret = _invoke(106, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMAttribute
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR name
+  # get name of the attribute
+  def name()
+    ret = _getproperty(118, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT value
+  # string value of the attribute
+  def value()
+    ret = _getproperty(120, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID value
+  # string value of the attribute
+  def value=(arg0)
+    ret = _setproperty(120, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMDocumentFragment
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMText
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR data
+  # value of the node
+  def data()
+    ret = _getproperty(109, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 length
+  # number of characters in value
+  def length()
+    ret = _getproperty(110, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID data
+  # value of the node
+  def data=(arg0)
+    ret = _setproperty(109, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR substringData
+  # retrieve substring of value
+  #   I4 arg0 --- offset [IN]
+  #   I4 arg1 --- count [IN]
+  def substringData(arg0, arg1)
+    ret = _invoke(111, [arg0, arg1], [VT_I4, VT_I4])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID appendData
+  # append string to value
+  #   BSTR arg0 --- data [IN]
+  def appendData(arg0)
+    ret = _invoke(112, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID insertData
+  # insert string into value
+  #   I4 arg0 --- offset [IN]
+  #   BSTR arg1 --- data [IN]
+  def insertData(arg0, arg1)
+    ret = _invoke(113, [arg0, arg1], [VT_I4, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID deleteData
+  # delete string within the value
+  #   I4 arg0 --- offset [IN]
+  #   I4 arg1 --- count [IN]
+  def deleteData(arg0, arg1)
+    ret = _invoke(114, [arg0, arg1], [VT_I4, VT_I4])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID replaceData
+  # replace string within the value
+  #   I4 arg0 --- offset [IN]
+  #   I4 arg1 --- count [IN]
+  #   BSTR arg2 --- data [IN]
+  def replaceData(arg0, arg1, arg2)
+    ret = _invoke(115, [arg0, arg1, arg2], [VT_I4, VT_I4, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMText splitText
+  # split the text node into two text nodes at the position specified
+  #   I4 arg0 --- offset [IN]
+  def splitText(arg0)
+    ret = _invoke(123, [arg0], [VT_I4])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMCharacterData
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR data
+  # value of the node
+  def data()
+    ret = _getproperty(109, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 length
+  # number of characters in value
+  def length()
+    ret = _getproperty(110, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID data
+  # value of the node
+  def data=(arg0)
+    ret = _setproperty(109, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR substringData
+  # retrieve substring of value
+  #   I4 arg0 --- offset [IN]
+  #   I4 arg1 --- count [IN]
+  def substringData(arg0, arg1)
+    ret = _invoke(111, [arg0, arg1], [VT_I4, VT_I4])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID appendData
+  # append string to value
+  #   BSTR arg0 --- data [IN]
+  def appendData(arg0)
+    ret = _invoke(112, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID insertData
+  # insert string into value
+  #   I4 arg0 --- offset [IN]
+  #   BSTR arg1 --- data [IN]
+  def insertData(arg0, arg1)
+    ret = _invoke(113, [arg0, arg1], [VT_I4, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID deleteData
+  # delete string within the value
+  #   I4 arg0 --- offset [IN]
+  #   I4 arg1 --- count [IN]
+  def deleteData(arg0, arg1)
+    ret = _invoke(114, [arg0, arg1], [VT_I4, VT_I4])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID replaceData
+  # replace string within the value
+  #   I4 arg0 --- offset [IN]
+  #   I4 arg1 --- count [IN]
+  #   BSTR arg2 --- data [IN]
+  def replaceData(arg0, arg1, arg2)
+    ret = _invoke(115, [arg0, arg1, arg2], [VT_I4, VT_I4, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMComment
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR data
+  # value of the node
+  def data()
+    ret = _getproperty(109, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 length
+  # number of characters in value
+  def length()
+    ret = _getproperty(110, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID data
+  # value of the node
+  def data=(arg0)
+    ret = _setproperty(109, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR substringData
+  # retrieve substring of value
+  #   I4 arg0 --- offset [IN]
+  #   I4 arg1 --- count [IN]
+  def substringData(arg0, arg1)
+    ret = _invoke(111, [arg0, arg1], [VT_I4, VT_I4])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID appendData
+  # append string to value
+  #   BSTR arg0 --- data [IN]
+  def appendData(arg0)
+    ret = _invoke(112, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID insertData
+  # insert string into value
+  #   I4 arg0 --- offset [IN]
+  #   BSTR arg1 --- data [IN]
+  def insertData(arg0, arg1)
+    ret = _invoke(113, [arg0, arg1], [VT_I4, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID deleteData
+  # delete string within the value
+  #   I4 arg0 --- offset [IN]
+  #   I4 arg1 --- count [IN]
+  def deleteData(arg0, arg1)
+    ret = _invoke(114, [arg0, arg1], [VT_I4, VT_I4])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID replaceData
+  # replace string within the value
+  #   I4 arg0 --- offset [IN]
+  #   I4 arg1 --- count [IN]
+  #   BSTR arg2 --- data [IN]
+  def replaceData(arg0, arg1, arg2)
+    ret = _invoke(115, [arg0, arg1, arg2], [VT_I4, VT_I4, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMCDATASection
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR data
+  # value of the node
+  def data()
+    ret = _getproperty(109, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 length
+  # number of characters in value
+  def length()
+    ret = _getproperty(110, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID data
+  # value of the node
+  def data=(arg0)
+    ret = _setproperty(109, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR substringData
+  # retrieve substring of value
+  #   I4 arg0 --- offset [IN]
+  #   I4 arg1 --- count [IN]
+  def substringData(arg0, arg1)
+    ret = _invoke(111, [arg0, arg1], [VT_I4, VT_I4])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID appendData
+  # append string to value
+  #   BSTR arg0 --- data [IN]
+  def appendData(arg0)
+    ret = _invoke(112, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID insertData
+  # insert string into value
+  #   I4 arg0 --- offset [IN]
+  #   BSTR arg1 --- data [IN]
+  def insertData(arg0, arg1)
+    ret = _invoke(113, [arg0, arg1], [VT_I4, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID deleteData
+  # delete string within the value
+  #   I4 arg0 --- offset [IN]
+  #   I4 arg1 --- count [IN]
+  def deleteData(arg0, arg1)
+    ret = _invoke(114, [arg0, arg1], [VT_I4, VT_I4])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID replaceData
+  # replace string within the value
+  #   I4 arg0 --- offset [IN]
+  #   I4 arg1 --- count [IN]
+  #   BSTR arg2 --- data [IN]
+  def replaceData(arg0, arg1, arg2)
+    ret = _invoke(115, [arg0, arg1, arg2], [VT_I4, VT_I4, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMText splitText
+  # split the text node into two text nodes at the position specified
+  #   I4 arg0 --- offset [IN]
+  def splitText(arg0)
+    ret = _invoke(123, [arg0], [VT_I4])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMProcessingInstruction
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR target
+  # the target
+  def target()
+    ret = _getproperty(127, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR data
+  # the data
+  def data()
+    ret = _getproperty(128, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID data
+  # the data
+  def data=(arg0)
+    ret = _setproperty(128, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMEntityReference
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# structure for reporting parser errors
+module IXMLDOMParseError
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # I4 errorCode
+  # the error code
+  def errorCode()
+    ret = _getproperty(0, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR url
+  # the URL of the XML document containing the error
+  def url()
+    ret = _getproperty(179, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR reason
+  # the cause of the error
+  def reason()
+    ret = _getproperty(180, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR srcText
+  # the data where the error occurred
+  def srcText()
+    ret = _getproperty(181, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 line
+  # the line number in the XML document where the error occurred
+  def line()
+    ret = _getproperty(182, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 linepos
+  # the character position in the line containing the error
+  def linepos()
+    ret = _getproperty(183, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 filepos
+  # the absolute file position in the XML document containing the error
+  def filepos()
+    ret = _getproperty(184, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMNotation
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT publicId
+  # the public ID
+  def publicId()
+    ret = _getproperty(136, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT systemId
+  # the system ID
+  def systemId()
+    ret = _getproperty(137, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# 
+module IXMLDOMEntity
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT publicId
+  # the public ID
+  def publicId()
+    ret = _getproperty(140, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT systemId
+  # the system ID
+  def systemId()
+    ret = _getproperty(141, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR notationName
+  # the name of the notation
+  def notationName()
+    ret = _getproperty(142, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# XTL runtime object
+module IXTLRuntime
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = _getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = _getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = _getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = _getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = _getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = _getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = _getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = _getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = _getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = _getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = _getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = _getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = _getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = _getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = _getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = _getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = _setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = _setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = _setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = _setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = _invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = _invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = _invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = _invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = _invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = _invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = _invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = _invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = _invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = _invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 uniqueID
+  #   IXMLDOMNode arg0 --- pNode [IN]
+  def uniqueID(arg0)
+    ret = _invoke(187, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 depth
+  #   IXMLDOMNode arg0 --- pNode [IN]
+  def depth(arg0)
+    ret = _invoke(188, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 childNumber
+  #   IXMLDOMNode arg0 --- pNode [IN]
+  def childNumber(arg0)
+    ret = _invoke(189, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 ancestorChildNumber
+  #   BSTR arg0 --- bstrNodeName [IN]
+  #   IXMLDOMNode arg1 --- pNode [IN]
+  def ancestorChildNumber(arg0, arg1)
+    ret = _invoke(190, [arg0, arg1], [VT_BSTR, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 absoluteChildNumber
+  #   IXMLDOMNode arg0 --- pNode [IN]
+  def absoluteChildNumber(arg0)
+    ret = _invoke(191, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR formatIndex
+  #   I4 arg0 --- lIndex [IN]
+  #   BSTR arg1 --- bstrFormat [IN]
+  def formatIndex(arg0, arg1)
+    ret = _invoke(192, [arg0, arg1], [VT_I4, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR formatNumber
+  #   R8 arg0 --- dblNumber [IN]
+  #   BSTR arg1 --- bstrFormat [IN]
+  def formatNumber(arg0, arg1)
+    ret = _invoke(193, [arg0, arg1], [VT_R8, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR formatDate
+  #   VARIANT arg0 --- varDate [IN]
+  #   BSTR arg1 --- bstrFormat [IN]
+  #   VARIANT arg2 --- varDestLocale [IN]
+  def formatDate(arg0, arg1, arg2=nil)
+    ret = _invoke(194, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR formatTime
+  #   VARIANT arg0 --- varTime [IN]
+  #   BSTR arg1 --- bstrFormat [IN]
+  #   VARIANT arg2 --- varDestLocale [IN]
+  def formatTime(arg0, arg1, arg2=nil)
+    ret = _invoke(195, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# W3C-DOM XML Document
+class Microsoft_XMLDOM_1_0 # DOMDocument
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+  attr_reader :dispatch
+  attr_reader :clsid
+  attr_reader :progid
+
+  def initialize(obj = nil)
+    @clsid = "{2933BF90-7B36-11D2-B20E-00C04F983E60}"
+    @progid = "Microsoft.XMLDOM.1.0"
+    if obj.nil?
+      @dispatch = WIN32OLE.new(@progid)
+    else
+      @dispatch = obj
+    end
+  end
+
+  def method_missing(cmd, *arg)
+    @dispatch.method_missing(cmd, *arg)
+  end
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = @dispatch._getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = @dispatch._getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = @dispatch._getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = @dispatch._getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = @dispatch._getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = @dispatch._getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = @dispatch._getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = @dispatch._getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = @dispatch._getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = @dispatch._getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = @dispatch._getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = @dispatch._getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = @dispatch._getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = @dispatch._getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = @dispatch._getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = @dispatch._getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = @dispatch._getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = @dispatch._getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = @dispatch._getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = @dispatch._getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = @dispatch._getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = @dispatch._getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocumentType doctype
+  # node corresponding to the DOCTYPE
+  def doctype()
+    ret = @dispatch._getproperty(38, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMImplementation implementation
+  # info on this DOM implementation
+  def implementation()
+    ret = @dispatch._getproperty(39, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMElement documentElement
+  # the root of the tree
+  def documentElement()
+    ret = @dispatch._getproperty(40, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 readyState
+  # get the state of the XML document
+  def readyState()
+    ret = @dispatch._getproperty(-525, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMParseError parseError
+  # get the last parser error
+  def parseError()
+    ret = @dispatch._getproperty(59, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR url
+  # get the URL for the loaded XML document
+  def url()
+    ret = @dispatch._getproperty(60, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL async
+  # flag for asynchronous download
+  def async()
+    ret = @dispatch._getproperty(61, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL validateOnParse
+  # indicates whether the parser performs validation
+  def validateOnParse()
+    ret = @dispatch._getproperty(65, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL resolveExternals
+  # indicates whether the parser resolves references to external DTD/Entities/Schema
+  def resolveExternals()
+    ret = @dispatch._getproperty(66, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL preserveWhiteSpace
+  # indicates whether the parser preserves whitespace
+  def preserveWhiteSpace()
+    ret = @dispatch._getproperty(67, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = @dispatch._setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = @dispatch._setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = @dispatch._setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = @dispatch._setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID async
+  # flag for asynchronous download
+  def async=(arg0)
+    ret = @dispatch._setproperty(61, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID validateOnParse
+  # indicates whether the parser performs validation
+  def validateOnParse=(arg0)
+    ret = @dispatch._setproperty(65, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID resolveExternals
+  # indicates whether the parser resolves references to external DTD/Entities/Schema
+  def resolveExternals=(arg0)
+    ret = @dispatch._setproperty(66, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID preserveWhiteSpace
+  # indicates whether the parser preserves whitespace
+  def preserveWhiteSpace=(arg0)
+    ret = @dispatch._setproperty(67, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID onreadystatechange
+  # register a readystatechange event handler
+  def onreadystatechange=(arg0)
+    ret = @dispatch._setproperty(68, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID ondataavailable
+  # register an ondataavailable event handler
+  def ondataavailable=(arg0)
+    ret = @dispatch._setproperty(69, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID ontransformnode
+  # register an ontransformnode event handler
+  def ontransformnode=(arg0)
+    ret = @dispatch._setproperty(70, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = @dispatch._invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = @dispatch._invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = @dispatch._invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = @dispatch._invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = @dispatch._invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = @dispatch._invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = @dispatch._invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = @dispatch._invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = @dispatch._invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = @dispatch._invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMElement createElement
+  # create an Element node
+  #   BSTR arg0 --- tagName [IN]
+  def createElement(arg0)
+    ret = @dispatch._invoke(41, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocumentFragment createDocumentFragment
+  # create a DocumentFragment node
+  def createDocumentFragment()
+    ret = @dispatch._invoke(42, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMText createTextNode
+  # create a text node
+  #   BSTR arg0 --- data [IN]
+  def createTextNode(arg0)
+    ret = @dispatch._invoke(43, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMComment createComment
+  # create a comment node
+  #   BSTR arg0 --- data [IN]
+  def createComment(arg0)
+    ret = @dispatch._invoke(44, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMCDATASection createCDATASection
+  # create a CDATA section node
+  #   BSTR arg0 --- data [IN]
+  def createCDATASection(arg0)
+    ret = @dispatch._invoke(45, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMProcessingInstruction createProcessingInstruction
+  # create a processing instruction node
+  #   BSTR arg0 --- target [IN]
+  #   BSTR arg1 --- data [IN]
+  def createProcessingInstruction(arg0, arg1)
+    ret = @dispatch._invoke(46, [arg0, arg1], [VT_BSTR, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMAttribute createAttribute
+  # create an attribute node
+  #   BSTR arg0 --- name [IN]
+  def createAttribute(arg0)
+    ret = @dispatch._invoke(47, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMEntityReference createEntityReference
+  # create an entity reference node
+  #   BSTR arg0 --- name [IN]
+  def createEntityReference(arg0)
+    ret = @dispatch._invoke(49, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList getElementsByTagName
+  # build a list of elements by name
+  #   BSTR arg0 --- tagName [IN]
+  def getElementsByTagName(arg0)
+    ret = @dispatch._invoke(50, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode createNode
+  # create a node of the specified node type and name
+  #   VARIANT arg0 --- type [IN]
+  #   BSTR arg1 --- name [IN]
+  #   BSTR arg2 --- namespaceURI [IN]
+  def createNode(arg0, arg1, arg2)
+    ret = @dispatch._invoke(54, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nodeFromID
+  # retrieve node from it's ID
+  #   BSTR arg0 --- idString [IN]
+  def nodeFromID(arg0)
+    ret = @dispatch._invoke(56, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL load
+  # load document from the specified XML source
+  #   VARIANT arg0 --- xmlSource [IN]
+  def load(arg0)
+    ret = @dispatch._invoke(58, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID abort
+  # abort an asynchronous download
+  def abort()
+    ret = @dispatch._invoke(62, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL loadXML
+  # load the document from a string
+  #   BSTR arg0 --- bstrXML [IN]
+  def loadXML(arg0)
+    ret = @dispatch._invoke(63, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID save
+  # save the document to a specified desination
+  #   VARIANT arg0 --- desination [IN]
+  def save(arg0)
+    ret = @dispatch._invoke(64, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # HRESULT ondataavailable EVENT in XMLDOMDocumentEvents
+  def ondataavailable()
+    ret = @dispatch._invoke(198, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # HRESULT onreadystatechange EVENT in XMLDOMDocumentEvents
+  def onreadystatechange()
+    ret = @dispatch._invoke(-609, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# W3C-DOM XML Document (Apartment)
+class Microsoft_FreeThreadedXMLDOM_1_0 # DOMFreeThreadedDocument
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+  attr_reader :dispatch
+  attr_reader :clsid
+  attr_reader :progid
+
+  def initialize(obj = nil)
+    @clsid = "{2933BF91-7B36-11D2-B20E-00C04F983E60}"
+    @progid = "Microsoft.FreeThreadedXMLDOM.1.0"
+    if obj.nil?
+      @dispatch = WIN32OLE.new(@progid)
+    else
+      @dispatch = obj
+    end
+  end
+
+  def method_missing(cmd, *arg)
+    @dispatch.method_missing(cmd, *arg)
+  end
+
+  # BSTR nodeName
+  # name of the node
+  def nodeName()
+    ret = @dispatch._getproperty(2, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeValue
+  # value stored in the node
+  def nodeValue()
+    ret = @dispatch._getproperty(3, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DOMNodeType nodeType
+  # the node's type
+  def nodeType()
+    ret = @dispatch._getproperty(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode parentNode
+  # parent of the node
+  def parentNode()
+    ret = @dispatch._getproperty(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList childNodes
+  # the collection of the node's children
+  def childNodes()
+    ret = @dispatch._getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode firstChild
+  # first child of the node
+  def firstChild()
+    ret = @dispatch._getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode lastChild
+  # first child of the node
+  def lastChild()
+    ret = @dispatch._getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode previousSibling
+  # left sibling of the node
+  def previousSibling()
+    ret = @dispatch._getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nextSibling
+  # right sibling of the node
+  def nextSibling()
+    ret = @dispatch._getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNamedNodeMap attributes
+  # the collection of the node's attributes
+  def attributes()
+    ret = @dispatch._getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocument ownerDocument
+  # document that contains the node
+  def ownerDocument()
+    ret = @dispatch._getproperty(18, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR nodeTypeString
+  # the type of node in string form
+  def nodeTypeString()
+    ret = @dispatch._getproperty(21, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR text
+  # text content of the node and subtree
+  def text()
+    ret = @dispatch._getproperty(24, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL specified
+  # indicates whether node is a default value
+  def specified()
+    ret = @dispatch._getproperty(22, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode definition
+  # pointer to the definition of the node in the DTD or schema
+  def definition()
+    ret = @dispatch._getproperty(23, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue()
+    ret = @dispatch._getproperty(25, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT dataType
+  # the data type of the node
+  def dataType()
+    ret = @dispatch._getproperty(26, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR xml
+  # return the XML source for the node and each of its descendants
+  def xml()
+    ret = @dispatch._getproperty(27, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL parsed
+  # has sub-tree been completely parsed
+  def parsed()
+    ret = @dispatch._getproperty(31, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR namespaceURI
+  # the URI for the namespace applying to the node
+  def namespaceURI()
+    ret = @dispatch._getproperty(32, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR prefix
+  # the prefix for the namespace applying to the node
+  def prefix()
+    ret = @dispatch._getproperty(33, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR baseName
+  # the base name of the node (nodename with the prefix stripped off)
+  def baseName()
+    ret = @dispatch._getproperty(34, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocumentType doctype
+  # node corresponding to the DOCTYPE
+  def doctype()
+    ret = @dispatch._getproperty(38, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMImplementation implementation
+  # info on this DOM implementation
+  def implementation()
+    ret = @dispatch._getproperty(39, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMElement documentElement
+  # the root of the tree
+  def documentElement()
+    ret = @dispatch._getproperty(40, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 readyState
+  # get the state of the XML document
+  def readyState()
+    ret = @dispatch._getproperty(-525, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMParseError parseError
+  # get the last parser error
+  def parseError()
+    ret = @dispatch._getproperty(59, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR url
+  # get the URL for the loaded XML document
+  def url()
+    ret = @dispatch._getproperty(60, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL async
+  # flag for asynchronous download
+  def async()
+    ret = @dispatch._getproperty(61, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL validateOnParse
+  # indicates whether the parser performs validation
+  def validateOnParse()
+    ret = @dispatch._getproperty(65, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL resolveExternals
+  # indicates whether the parser resolves references to external DTD/Entities/Schema
+  def resolveExternals()
+    ret = @dispatch._getproperty(66, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL preserveWhiteSpace
+  # indicates whether the parser preserves whitespace
+  def preserveWhiteSpace()
+    ret = @dispatch._getproperty(67, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeValue
+  # value stored in the node
+  def nodeValue=(arg0)
+    ret = @dispatch._setproperty(3, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID text
+  # text content of the node and subtree
+  def text=(arg0)
+    ret = @dispatch._setproperty(24, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID nodeTypedValue
+  # get the strongly typed value of the node
+  def nodeTypedValue=(arg0)
+    ret = @dispatch._setproperty(25, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID dataType
+  # the data type of the node
+  def dataType=(arg0)
+    ret = @dispatch._setproperty(26, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID async
+  # flag for asynchronous download
+  def async=(arg0)
+    ret = @dispatch._setproperty(61, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID validateOnParse
+  # indicates whether the parser performs validation
+  def validateOnParse=(arg0)
+    ret = @dispatch._setproperty(65, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID resolveExternals
+  # indicates whether the parser resolves references to external DTD/Entities/Schema
+  def resolveExternals=(arg0)
+    ret = @dispatch._setproperty(66, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID preserveWhiteSpace
+  # indicates whether the parser preserves whitespace
+  def preserveWhiteSpace=(arg0)
+    ret = @dispatch._setproperty(67, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID onreadystatechange
+  # register a readystatechange event handler
+  def onreadystatechange=(arg0)
+    ret = @dispatch._setproperty(68, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID ondataavailable
+  # register an ondataavailable event handler
+  def ondataavailable=(arg0)
+    ret = @dispatch._setproperty(69, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID ontransformnode
+  # register an ontransformnode event handler
+  def ontransformnode=(arg0)
+    ret = @dispatch._setproperty(70, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode insertBefore
+  # insert a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   VARIANT arg1 --- refChild [IN]
+  def insertBefore(arg0, arg1)
+    ret = @dispatch._invoke(13, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode replaceChild
+  # replace a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  #   IXMLDOMNode arg1 --- oldChild [IN]
+  def replaceChild(arg0, arg1)
+    ret = @dispatch._invoke(14, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode removeChild
+  # remove a child node
+  #   IXMLDOMNode arg0 --- childNode [IN]
+  def removeChild(arg0)
+    ret = @dispatch._invoke(15, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode appendChild
+  # append a child node
+  #   IXMLDOMNode arg0 --- newChild [IN]
+  def appendChild(arg0)
+    ret = @dispatch._invoke(16, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL hasChildNodes
+  def hasChildNodes()
+    ret = @dispatch._invoke(17, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode cloneNode
+  #   BOOL arg0 --- deep [IN]
+  def cloneNode(arg0)
+    ret = @dispatch._invoke(19, [arg0], [VT_BOOL])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR transformNode
+  # apply the stylesheet to the subtree
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  def transformNode(arg0)
+    ret = @dispatch._invoke(28, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList selectNodes
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectNodes(arg0)
+    ret = @dispatch._invoke(29, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode selectSingleNode
+  # execute query on the subtree
+  #   BSTR arg0 --- queryString [IN]
+  def selectSingleNode(arg0)
+    ret = @dispatch._invoke(30, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID transformNodeToObject
+  # apply the stylesheet to the subtree, returning the result through a document or a stream
+  #   IXMLDOMNode arg0 --- stylesheet [IN]
+  #   VARIANT arg1 --- outputObject [IN]
+  def transformNodeToObject(arg0, arg1)
+    ret = @dispatch._invoke(35, [arg0, arg1], [VT_BYREF|VT_DISPATCH, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMElement createElement
+  # create an Element node
+  #   BSTR arg0 --- tagName [IN]
+  def createElement(arg0)
+    ret = @dispatch._invoke(41, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMDocumentFragment createDocumentFragment
+  # create a DocumentFragment node
+  def createDocumentFragment()
+    ret = @dispatch._invoke(42, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMText createTextNode
+  # create a text node
+  #   BSTR arg0 --- data [IN]
+  def createTextNode(arg0)
+    ret = @dispatch._invoke(43, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMComment createComment
+  # create a comment node
+  #   BSTR arg0 --- data [IN]
+  def createComment(arg0)
+    ret = @dispatch._invoke(44, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMCDATASection createCDATASection
+  # create a CDATA section node
+  #   BSTR arg0 --- data [IN]
+  def createCDATASection(arg0)
+    ret = @dispatch._invoke(45, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMProcessingInstruction createProcessingInstruction
+  # create a processing instruction node
+  #   BSTR arg0 --- target [IN]
+  #   BSTR arg1 --- data [IN]
+  def createProcessingInstruction(arg0, arg1)
+    ret = @dispatch._invoke(46, [arg0, arg1], [VT_BSTR, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMAttribute createAttribute
+  # create an attribute node
+  #   BSTR arg0 --- name [IN]
+  def createAttribute(arg0)
+    ret = @dispatch._invoke(47, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMEntityReference createEntityReference
+  # create an entity reference node
+  #   BSTR arg0 --- name [IN]
+  def createEntityReference(arg0)
+    ret = @dispatch._invoke(49, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNodeList getElementsByTagName
+  # build a list of elements by name
+  #   BSTR arg0 --- tagName [IN]
+  def getElementsByTagName(arg0)
+    ret = @dispatch._invoke(50, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode createNode
+  # create a node of the specified node type and name
+  #   VARIANT arg0 --- type [IN]
+  #   BSTR arg1 --- name [IN]
+  #   BSTR arg2 --- namespaceURI [IN]
+  def createNode(arg0, arg1, arg2)
+    ret = @dispatch._invoke(54, [arg0, arg1, arg2], [VT_VARIANT, VT_BSTR, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # IXMLDOMNode nodeFromID
+  # retrieve node from it's ID
+  #   BSTR arg0 --- idString [IN]
+  def nodeFromID(arg0)
+    ret = @dispatch._invoke(56, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL load
+  # load document from the specified XML source
+  #   VARIANT arg0 --- xmlSource [IN]
+  def load(arg0)
+    ret = @dispatch._invoke(58, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID abort
+  # abort an asynchronous download
+  def abort()
+    ret = @dispatch._invoke(62, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BOOL loadXML
+  # load the document from a string
+  #   BSTR arg0 --- bstrXML [IN]
+  def loadXML(arg0)
+    ret = @dispatch._invoke(63, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID save
+  # save the document to a specified desination
+  #   VARIANT arg0 --- desination [IN]
+  def save(arg0)
+    ret = @dispatch._invoke(64, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # HRESULT ondataavailable EVENT in XMLDOMDocumentEvents
+  def ondataavailable()
+    ret = @dispatch._invoke(198, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # HRESULT onreadystatechange EVENT in XMLDOMDocumentEvents
+  def onreadystatechange()
+    ret = @dispatch._invoke(-609, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# IXMLHttpRequest Interface
+module IXMLHttpRequest
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+
+  # I4 status
+  # Get HTTP status code
+  def status()
+    ret = _getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR statusText
+  # Get HTTP status text
+  def statusText()
+    ret = _getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DISPATCH responseXML
+  # Get response body
+  def responseXML()
+    ret = _getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR responseText
+  # Get response body
+  def responseText()
+    ret = _getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT responseBody
+  # Get response body
+  def responseBody()
+    ret = _getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT responseStream
+  # Get response body
+  def responseStream()
+    ret = _getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 readyState
+  # Get ready state
+  def readyState()
+    ret = _getproperty(13, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID onreadystatechange
+  # Register a complete event handler
+  def onreadystatechange=(arg0)
+    ret = _setproperty(14, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID open
+  # Open HTTP connection
+  #   BSTR arg0 --- bstrMethod [IN]
+  #   BSTR arg1 --- bstrUrl [IN]
+  #   VARIANT arg2 --- varAsync [IN]
+  #   VARIANT arg3 --- bstrUser [IN]
+  #   VARIANT arg4 --- bstrPassword [IN]
+  def open(arg0, arg1, arg2=nil, arg3=nil, arg4=nil)
+    ret = _invoke(1, [arg0, arg1, arg2, arg3, arg4], [VT_BSTR, VT_BSTR, VT_VARIANT, VT_VARIANT, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID setRequestHeader
+  # Add HTTP request header
+  #   BSTR arg0 --- bstrHeader [IN]
+  #   BSTR arg1 --- bstrValue [IN]
+  def setRequestHeader(arg0, arg1)
+    ret = _invoke(2, [arg0, arg1], [VT_BSTR, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR getResponseHeader
+  # Get HTTP response header
+  #   BSTR arg0 --- bstrHeader [IN]
+  def getResponseHeader(arg0)
+    ret = _invoke(3, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR getAllResponseHeaders
+  # Get all HTTP response headers
+  def getAllResponseHeaders()
+    ret = _invoke(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID send
+  # Send HTTP request
+  #   VARIANT arg0 --- varBody [IN]
+  def send(arg0=nil)
+    ret = _invoke(5, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID abort
+  # Abort HTTP request
+  def abort()
+    ret = _invoke(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# XML HTTP Request class.
+class Microsoft_XMLHTTP_1 # XMLHTTPRequest
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+  attr_reader :dispatch
+  attr_reader :clsid
+  attr_reader :progid
+
+  def initialize(obj = nil)
+    @clsid = "{ED8C108E-4349-11D2-91A4-00C04F7969E8}"
+    @progid = "Microsoft.XMLHTTP.1"
+    if obj.nil?
+      @dispatch = WIN32OLE.new(@progid)
+    else
+      @dispatch = obj
+    end
+  end
+
+  def method_missing(cmd, *arg)
+    @dispatch.method_missing(cmd, *arg)
+  end
+
+  # I4 status
+  # Get HTTP status code
+  def status()
+    ret = @dispatch._getproperty(7, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR statusText
+  # Get HTTP status text
+  def statusText()
+    ret = @dispatch._getproperty(8, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # DISPATCH responseXML
+  # Get response body
+  def responseXML()
+    ret = @dispatch._getproperty(9, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR responseText
+  # Get response body
+  def responseText()
+    ret = @dispatch._getproperty(10, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT responseBody
+  # Get response body
+  def responseBody()
+    ret = @dispatch._getproperty(11, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VARIANT responseStream
+  # Get response body
+  def responseStream()
+    ret = @dispatch._getproperty(12, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 readyState
+  # Get ready state
+  def readyState()
+    ret = @dispatch._getproperty(13, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID onreadystatechange
+  # Register a complete event handler
+  def onreadystatechange=(arg0)
+    ret = @dispatch._setproperty(14, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID open
+  # Open HTTP connection
+  #   BSTR arg0 --- bstrMethod [IN]
+  #   BSTR arg1 --- bstrUrl [IN]
+  #   VARIANT arg2 --- varAsync [IN]
+  #   VARIANT arg3 --- bstrUser [IN]
+  #   VARIANT arg4 --- bstrPassword [IN]
+  def open(arg0, arg1, arg2=nil, arg3=nil, arg4=nil)
+    ret = @dispatch._invoke(1, [arg0, arg1, arg2, arg3, arg4], [VT_BSTR, VT_BSTR, VT_VARIANT, VT_VARIANT, VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID setRequestHeader
+  # Add HTTP request header
+  #   BSTR arg0 --- bstrHeader [IN]
+  #   BSTR arg1 --- bstrValue [IN]
+  def setRequestHeader(arg0, arg1)
+    ret = @dispatch._invoke(2, [arg0, arg1], [VT_BSTR, VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR getResponseHeader
+  # Get HTTP response header
+  #   BSTR arg0 --- bstrHeader [IN]
+  def getResponseHeader(arg0)
+    ret = @dispatch._invoke(3, [arg0], [VT_BSTR])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # BSTR getAllResponseHeaders
+  # Get all HTTP response headers
+  def getAllResponseHeaders()
+    ret = @dispatch._invoke(4, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID send
+  # Send HTTP request
+  #   VARIANT arg0 --- varBody [IN]
+  def send(arg0=nil)
+    ret = @dispatch._invoke(5, [arg0], [VT_VARIANT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID abort
+  # Abort HTTP request
+  def abort()
+    ret = @dispatch._invoke(6, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# XML Data Source Object
+class Microsoft_XMLDSO_1_0 # XMLDSOControl
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+  attr_reader :dispatch
+  attr_reader :clsid
+  attr_reader :progid
+
+  def initialize(obj = nil)
+    @clsid = "{550DDA30-0541-11D2-9CA9-0060B0EC3D39}"
+    @progid = "Microsoft.XMLDSO.1.0"
+    if obj.nil?
+      @dispatch = WIN32OLE.new(@progid)
+    else
+      @dispatch = obj
+    end
+  end
+
+  def method_missing(cmd, *arg)
+    @dispatch.method_missing(cmd, *arg)
+  end
+
+  # IXMLDOMDocument XMLDocument
+  def XMLDocument()
+    ret = @dispatch._getproperty(65537, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 JavaDSOCompatible
+  def JavaDSOCompatible()
+    ret = @dispatch._getproperty(65538, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # I4 readyState
+  def readyState()
+    ret = @dispatch._getproperty(-525, [], [])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID XMLDocument
+  def XMLDocument=(arg0)
+    ret = @dispatch._setproperty(65537, [arg0], [VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # VOID JavaDSOCompatible
+  def JavaDSOCompatible=(arg0)
+    ret = @dispatch._setproperty(65538, [arg0], [VT_I4])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
+
+# Constants that define types for IXMLElement.
+module OLEtagXMLEMEM_TYPE
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+  XMLELEMTYPE_ELEMENT = 0
+  XMLELEMTYPE_TEXT = 1
+  XMLELEMTYPE_COMMENT = 2
+  XMLELEMTYPE_DOCUMENT = 3
+  XMLELEMTYPE_DTD = 4
+  XMLELEMTYPE_PI = 5
+  XMLELEMTYPE_OTHER = 6
+end
+
+# XMLDocument extends IXML Document.  It is obsolete.  You should use DOMDocument.  This object should not be confused with the XMLDocument property on the XML data island.
+class Msxml # XMLDocument
+  include WIN32OLE::VARIANT
+  attr_reader :lastargs
+  attr_reader :dispatch
+  attr_reader :clsid
+  attr_reader :progid
+
+  def initialize(obj = nil)
+    @clsid = "{CFC399AF-D876-11D0-9C10-00C04FC99C8E}"
+    @progid = "Msxml"
+    if obj.nil?
+      @dispatch = WIN32OLE.new(@progid)
+    else
+      @dispatch = obj
+    end
+  end
+
+  def method_missing(cmd, *arg)
+    @dispatch.method_missing(cmd, *arg)
+  end
+
+  # HRESULT url
+  # set URL to load an XML document from the URL.
+  #   BSTR arg0 --- p [IN]
+  def url=(arg0)
+    ret = @dispatch._setproperty(65641, [arg0], [VT_BSTR, VT_HRESULT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # HRESULT charset
+  # get encoding.
+  #   BSTR arg0 --- p [IN]
+  def charset=(arg0)
+    ret = @dispatch._setproperty(65645, [arg0], [VT_BSTR, VT_HRESULT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # HRESULT async
+  # get asynchronous loading flag.
+  #   BOOL arg0 --- pf [IN]
+  def async=(arg0)
+    ret = @dispatch._setproperty(65649, [arg0], [VT_BOOL, VT_HRESULT])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+
+  # HRESULT root
+  # get root IXMLElement of the XML document.
+  #   IXMLElement2,IXMLElement2 arg0 --- p [OUT]
+  def root
+    OLEProperty.new(@dispatch, 65637, [VT_BYREF|VT_BYREF|VT_DISPATCH], [VT_BYREF|VT_BYREF|VT_DISPATCH, VT_HRESULT])
+  end
+
+  # HRESULT url
+  # set URL to load an XML document from the URL.
+  #   BSTR arg0 --- p [OUT]
+  def url
+    OLEProperty.new(@dispatch, 65641, [VT_BYREF|VT_BSTR], [VT_BYREF|VT_BSTR, VT_HRESULT])
+  end
+
+  # HRESULT readyState
+  # get ready state.
+  #   I4 arg0 --- pl [OUT]
+  def readyState
+    OLEProperty.new(@dispatch, 65643, [VT_BYREF|VT_I4], [VT_BYREF|VT_I4, VT_HRESULT])
+  end
+
+  # HRESULT charset
+  # get encoding.
+  #   BSTR arg0 --- p [OUT]
+  def charset
+    OLEProperty.new(@dispatch, 65645, [VT_BYREF|VT_BSTR], [VT_BYREF|VT_BSTR, VT_HRESULT])
+  end
+
+  # HRESULT version
+  # get XML version number.
+  #   BSTR arg0 --- p [OUT]
+  def version
+    OLEProperty.new(@dispatch, 65646, [VT_BYREF|VT_BSTR], [VT_BYREF|VT_BSTR, VT_HRESULT])
+  end
+
+  # HRESULT doctype
+  # get document type.
+  #   BSTR arg0 --- p [OUT]
+  def doctype
+    OLEProperty.new(@dispatch, 65647, [VT_BYREF|VT_BSTR], [VT_BYREF|VT_BSTR, VT_HRESULT])
+  end
+
+  # HRESULT async
+  # get asynchronous loading flag.
+  #   BOOL arg0 --- pf [OUT]
+  def async
+    OLEProperty.new(@dispatch, 65649, [VT_BYREF|VT_BOOL], [VT_BYREF|VT_BOOL, VT_HRESULT])
+  end
+
+  # HRESULT createElement
+  # create different types of IXMLElements.
+  #   VARIANT arg0 --- vType [IN]
+  #   VARIANT arg1 --- var1 [IN]
+  #   IXMLElement2,IXMLElement2 arg2 --- ppElem [OUT]
+  def createElement(arg0, arg1=nil, arg2=nil)
+    ret = @dispatch._invoke(65644, [arg0, arg1, arg2], [VT_VARIANT, VT_VARIANT, VT_BYREF|VT_BYREF|VT_DISPATCH])
+    @lastargs = WIN32OLE::ARGV
+    ret
+  end
+end
diff --git a/ruby_1_8_6/ext/win32ole/tests/oleserver.rb b/ruby_1_8_6/ext/win32ole/tests/oleserver.rb
new file mode 100644
index 0000000000..bf721373e5
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/oleserver.rb
@@ -0,0 +1,10 @@
+require 'win32ole'
+def oletypelib_name(pat)
+  WIN32OLE_TYPE.typelibs.each do |lib|
+    return lib if pat =~ lib
+  end
+end
+module OLESERVER
+  MS_EXCEL_TYPELIB = oletypelib_name(/^Microsoft Excel .* Object Library$/)
+  MS_XML_TYPELIB = oletypelib_name(/^Microsoft XML/)
+end
diff --git a/ruby_1_8_6/ext/win32ole/tests/testNIL2VTEMPTY.rb b/ruby_1_8_6/ext/win32ole/tests/testNIL2VTEMPTY.rb
new file mode 100644
index 0000000000..555d35fbf3
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/testNIL2VTEMPTY.rb
@@ -0,0 +1,28 @@
+# This is test script to check that WIN32OLE should convert nil to VT_EMPTY in second try.
+# [ruby-talk:137054]
+
+require 'win32ole'
+require 'test/unit'
+
+class TestNIL2VT_EMPTY < Test::Unit::TestCase
+  def setup
+    fs = WIN32OLE.new('Scripting.FileSystemObject')
+    @path = fs.GetFolder(".").path
+  end
+  def test_openSchema
+    con = nil
+    begin
+      con = WIN32OLE.new('ADODB.Connection')
+      con.connectionString = "Provider=MSDASQL;Extended Properties="
+      con.connectionString +="\"DRIVER={Microsoft Text Driver (*.txt; *.csv)};DBQ=#{@path}\""
+      con.open
+    rescue
+      con = nil
+    end
+    if con
+      rs = con.openSchema(4, [nil,nil,"DUMMY", "TABLE"])
+      assert(rs)
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/ext/win32ole/tests/testOLEEVENT.rb b/ruby_1_8_6/ext/win32ole/tests/testOLEEVENT.rb
new file mode 100644
index 0000000000..0901158642
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/testOLEEVENT.rb
@@ -0,0 +1,91 @@
+require 'rubyunit'
+require 'win32ole'
+
+class TestWIN32OLE_EVENT < RUNIT::TestCase
+  def setup
+    @excel = WIN32OLE.new("Excel.Application")
+    @excel.visible = true
+    @event = ""
+    @event2 = ""
+  end
+  def test_on_event
+    book = @excel.workbooks.Add
+    value = ""
+    begin
+      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
+      ev.on_event('SheetChange'){|arg1, arg2| 
+        begin
+          value = arg1.value
+        rescue
+          value = $!.message
+        end
+      }
+      book.Worksheets(1).Range("A1").value = "OK"
+    ensure
+      book.saved = true
+    end
+    assert_equal("OK", value)
+  end
+
+  def handler1
+    @event += "handler1"
+  end
+  def handler2
+    @event += "handler2"
+  end
+
+  def handler3
+    @event += "handler3"
+  end
+
+  def test_on_event2
+    book = @excel.workbooks.Add
+    begin
+      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
+      ev.on_event('SheetChange'){|arg1, arg2| 
+        handler1
+      }
+      ev.on_event('SheetChange'){|arg1, arg2| 
+        handler2
+      }
+      book.Worksheets(1).Range("A1").value = "OK"
+    ensure
+      book.saved = true
+    end
+    assert_equal("handler2", @event)
+  end
+
+  def test_on_event3
+    book = @excel.workbooks.Add
+    begin
+      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
+      ev.on_event{ handler1 }
+      ev.on_event{ handler2 }
+      book.Worksheets(1).Range("A1").value = "OK"
+    ensure
+      book.saved = true
+    end
+    assert_equal("handler2", @event)
+  end
+
+  def test_on_event4
+    book = @excel.workbooks.Add
+    begin
+      ev = WIN32OLE_EVENT.new(book, 'WorkbookEvents')
+      ev.on_event{ handler1 }
+      ev.on_event{ handler2 }
+      ev.on_event('SheetChange'){|arg1, arg2| handler3 }
+      book.Worksheets(1).Range("A1").value = "OK"
+    ensure
+      book.saved = true
+    end
+    assert_equal("handler3", @event)
+  end
+
+  def teardown
+    @excel.quit
+    @excel = nil
+    GC.start
+  end
+end
+
diff --git a/ruby_1_8_6/ext/win32ole/tests/testOLEMETHOD.rb b/ruby_1_8_6/ext/win32ole/tests/testOLEMETHOD.rb
new file mode 100644
index 0000000000..390c9999f8
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/testOLEMETHOD.rb
@@ -0,0 +1,92 @@
+# You need RubyUnit and MS Excel and MSI to run this test script 
+
+require 'rubyunit'
+
+require 'win32ole'
+require 'oleserver'
+
+class TestOLEMETHOD < RUNIT::TestCase
+  include OLESERVER
+  def setup
+    @excel_app = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
+  end
+  def test_s_new
+    m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
+    assert_instance_of(WIN32OLE_METHOD, m)
+    m =  WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
+    assert_instance_of(WIN32OLE_METHOD, m)
+    m =  WIN32OLE_METHOD.new(@excel_app, 'workbookopen')
+    assert_instance_of(WIN32OLE_METHOD, m)
+  end
+  def test_name
+    m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
+    assert_equal('Quit', m.name)
+  end
+  def test_to_s
+    m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
+    assert_equal('Quit', "#{m}")
+  end
+  def test_return_type
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert_equal('Range', m.return_type)
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
+    assert_equal('BSTR', m.return_type)
+  end
+  def test_return_vtype
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert_equal(WIN32OLE::VARIANT::VT_PTR, m.return_vtype)
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
+    assert_equal(WIN32OLE::VARIANT::VT_BSTR, m.return_vtype)
+  end
+  def test_return_type_detail
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert_equal(['PTR', 'USERDEFINED', 'Range'], m.return_type_detail)
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
+    assert_equal(['BSTR'], m.return_type_detail)
+  end
+
+  def test_invoke_kind
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert_equal('PROPERTYGET', m.invoke_kind)
+  end
+  def test_visible
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert(m.visible?)
+    m = WIN32OLE_METHOD.new(@excel_app, 'AddRef')
+    assert(!m.visible?)
+  end
+  def test_event
+    m =  WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
+    assert(m.event?)
+    m =  WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert(!m.event?)
+  end
+  def test_event_interface
+    m = WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
+    assert_equal('AppEvents', m.event_interface)
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert_nil(m.event_interface)
+  end
+  def test_helpstring
+    domdoc = WIN32OLE_TYPE.new(MS_XML_TYPELIB, 'DOMDocument')
+    m =  WIN32OLE_METHOD.new(domdoc, 'abort')
+    assert_equal('abort an asynchronous download', m.helpstring)
+  end
+  def test_helpfile
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert_match(/VBAXL.*\.(HLP|CHM)$/i, m.helpfile)
+  end
+  def test_helpcontext
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert(m.helpcontext > 0)
+  end
+  def test_offset_vtbl
+    m = WIN32OLE_METHOD.new(@excel_app, 'QueryInterface')
+    assert_equal(0, m.offset_vtbl)
+  end
+  def test_dispid
+    tobj = WIN32OLE_TYPE.new('Microsoft Shell Controls And Automation', 'FolderItem2')
+    method = WIN32OLE_METHOD.new(tobj, 'InvokeVerb')
+    assert_equal(1610743824, method.dispid)
+  end
+end
diff --git a/ruby_1_8_6/ext/win32ole/tests/testOLEPARAM.rb b/ruby_1_8_6/ext/win32ole/tests/testOLEPARAM.rb
new file mode 100644
index 0000000000..4014fadbfc
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/testOLEPARAM.rb
@@ -0,0 +1,65 @@
+# You need RubyUnit and MS Excel and MSI to run this test script 
+
+require 'rubyunit'
+
+require 'win32ole'
+require 'oleserver'
+
+class TestOLEPARAM < RUNIT::TestCase
+  include OLESERVER
+  def test_name
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    sh = classes.find {|c| c.name == 'Worksheet'}
+    saveas = sh.ole_methods.find {|m| m.name == 'SaveAs'}
+    param_names = saveas.params.collect{|p| p.name}
+    assert(param_names.size > 0)
+    assert(param_names.include?('Filename'))
+  end
+  def test_to_s
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    sh = classes.find {|c| c.name == 'Worksheet'}
+    saveas = sh.ole_methods.find {|m| m.name == 'SaveAs'}
+    param_names = saveas.params.collect{|p| "#{p}"}
+    assert(param_names.include?('Filename'))
+  end
+  def test_ole_type
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert_equal('BSTR', f.params[0].ole_type)
+    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert_equal('XlSaveAsAccessMode', f.params[6].ole_type)
+  end
+  def test_ole_type_detail
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert_equal(['BSTR'], f.params[0].ole_type_detail)
+    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert_equal(['USERDEFINED', 'XlSaveAsAccessMode'], f.params[6].ole_type_detail)
+  end
+  def test_input
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert(f.params[0].input?)
+  end
+  
+  def test_output
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert(!f.params[0].output?)
+  end
+  def test_optional
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert(!f.params[0].optional?)
+    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert(f.params[0].optional?)
+  end
+end
diff --git a/ruby_1_8_6/ext/win32ole/tests/testOLETYPE.rb b/ruby_1_8_6/ext/win32ole/tests/testOLETYPE.rb
new file mode 100644
index 0000000000..d4eb1146e1
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/testOLETYPE.rb
@@ -0,0 +1,96 @@
+# You need RubyUnit and MS Excel and MSI to run this test script 
+
+require 'rubyunit'
+
+require 'win32ole'
+require 'oleserver'
+
+class TestOLETYPE < RUNIT::TestCase
+  include OLESERVER
+  def test_s_new
+    type = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
+    assert_instance_of(WIN32OLE_TYPE, type)
+  end
+  def test_s_ole_classes
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    assert(classes.size > 0)
+  end
+  def test_s_typelibs
+    libs = WIN32OLE_TYPE.typelibs
+    assert(libs.include?(MS_EXCEL_TYPELIB))
+    assert(libs.include?(MS_XML_TYPELIB))
+  end
+  def test_s_progids
+    progids = WIN32OLE_TYPE.progids
+    assert(progids.include?('Excel.Application'))
+  end
+  def test_name
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    class_names = classes.collect{|c|
+      c.name
+    }
+    assert(class_names.include?('Application'))
+  end
+
+  def test_class_to_s
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    class_names = classes.collect{|c|
+      "#{c}"
+    }
+    assert(class_names.include?('Application'))
+  end
+
+  def test_ole_type
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    app = classes.find {|c| c.name == 'Application'}
+    assert_equal('Class', app.ole_type)
+    app = classes.find {|c| c.name == '_Application'}
+    assert_equal('Dispatch', app.ole_type)
+  end
+  def test_typekind
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    app = classes.find {|c| c.name == 'Application'}
+    assert_equal(5, app.typekind)
+  end
+  def test_visible
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    app = classes.find {|c| c.name == 'Application'}
+    assert(app.visible?)
+    app = classes.find {|c| c.name == 'IAppEvents'}
+    assert(!app.visible?)
+  end
+  def test_src_type
+    classes = WIN32OLE_TYPE.ole_classes(MS_XML_TYPELIB)
+    domnode = classes.find {|c| c.name == 'DOMNodeType'}
+    assert_equal('tagDOMNodeType', domnode.src_type)
+  end
+  def test_helpstring
+    classes = WIN32OLE_TYPE.ole_classes(MS_XML_TYPELIB)
+    domdoc = classes.find {|c| c.name == 'DOMDocument'}
+    assert_equal('W3C-DOM XML Document', domdoc.helpstring)
+  end
+  def test_variables
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    xlchart = classes.find {|c| c.name == 'XlChartType'}
+    assert(xlchart.variables.size > 0)
+  end
+  def test_ole_methods
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    worksheet = classes.find {|c| c.name == 'Worksheet'}
+    assert(worksheet.ole_methods.size > 0)
+  end
+  def test_helpfile
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    worksheet = classes.find {|c| c.name == 'Worksheet'}
+    assert_match(/VBAXL.*\.(CHM|HLP)$/, worksheet.helpfile)
+  end
+  def test_helpcontext
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    worksheet = classes.find {|c| c.name == 'Worksheet'}
+    assert_equal(131088, worksheet.helpcontext)
+  end
+  def test_to_s
+    type = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
+    assert_equal("Application", "#{type}");
+  end
+end
diff --git a/ruby_1_8_6/ext/win32ole/tests/testOLEVARIABLE.rb b/ruby_1_8_6/ext/win32ole/tests/testOLEVARIABLE.rb
new file mode 100644
index 0000000000..b4bb0b57d9
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/testOLEVARIABLE.rb
@@ -0,0 +1,49 @@
+# You need RubyUnit and MS Excel and MSI to run this test script 
+
+require 'rubyunit'
+
+require 'win32ole'
+require 'oleserver'
+
+class TestOLEVARIABLE < RUNIT::TestCase
+  include OLESERVER
+  def test_name
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    chart = classes.find {|c| c.name == 'XlChartType'}
+    var_names = chart.variables.collect {|m| m.name}
+    assert(var_names.size > 0)
+    assert(var_names.include?('xl3DColumn'))
+  end
+  def test_to_s
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    chart = classes.find {|c| c.name == 'XlChartType'}
+    var_names = chart.variables.collect {|m| "#{m}"}
+    assert(var_names.size > 0)
+    assert(var_names.include?('xl3DColumn'))
+  end
+  def test_ole_type
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    chart = classes.find {|c| c.name == 'XlChartType'}
+    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
+    assert_equal('INT', var.ole_type)
+  end
+  def test_ole_type_detail
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    chart = classes.find {|c| c.name == 'XlChartType'}
+    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
+    assert_equal(['INT'], var.ole_type_detail)
+  end
+
+  def test_value
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    chart = classes.find {|c| c.name == 'XlChartType'}
+    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
+    assert_equal(-4100, var.value)
+  end
+  def test_visible
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    chart = classes.find {|c| c.name == 'XlChartType'}
+    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
+    assert(var.visible?)
+  end
+end
diff --git a/ruby_1_8_6/ext/win32ole/tests/testVARIANT.rb b/ruby_1_8_6/ext/win32ole/tests/testVARIANT.rb
new file mode 100644
index 0000000000..f274778f27
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/testVARIANT.rb
@@ -0,0 +1,32 @@
+# You need RubyUnit and MS Excel and MSI to run this test script 
+
+require 'rubyunit'
+
+require 'win32ole'
+
+class TestWin32OLE_VARIANT < RUNIT::TestCase
+  include WIN32OLE::VARIANT
+  def test_variant
+    assert_equal(2, VT_I2)
+    assert_equal(3, VT_I4)
+    assert_equal(4, VT_R4)
+    assert_equal(5, VT_R8)
+    assert_equal(6, VT_CY)
+    assert_equal(7, VT_DATE)
+    assert_equal(8, VT_BSTR)
+    assert_equal(9, VT_DISPATCH)
+    assert_equal(10, VT_ERROR)
+    assert_equal(11, VT_BOOL)
+    assert_equal(12, VT_VARIANT)
+    assert_equal(13, VT_UNKNOWN)
+    assert_equal(16, VT_I1)
+    assert_equal(17, VT_UI1)
+    assert_equal(18, VT_UI2)
+    assert_equal(19, VT_UI4)
+    assert_equal(22, VT_INT)
+    assert_equal(23, VT_UINT)
+    assert_equal(0x2000, VT_ARRAY)
+    assert_equal(0x4000, VT_BYREF)
+  end
+end
+
diff --git a/ruby_1_8_6/ext/win32ole/tests/testWIN32OLE.rb b/ruby_1_8_6/ext/win32ole/tests/testWIN32OLE.rb
new file mode 100644
index 0000000000..5c01507377
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/testWIN32OLE.rb
@@ -0,0 +1,372 @@
+# You need RubyUnit and MS Excel and MSI to run this test script 
+
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+
+require 'win32ole'
+require 'oleserver'
+
+module EXCEL_CONST
+end
+
+module CONST1
+end
+
+module CONST2
+end
+
+module CONST3
+end
+
+class TestWin32OLE < RUNIT::TestCase
+  include OLESERVER
+  def setup
+    @excel = WIN32OLE.new("Excel.Application")
+    @excel.visible = true
+  end
+  def test_s_new
+    assert_instance_of(WIN32OLE, @excel)
+  end
+  def test_s_new_DCOM
+    rexcel = WIN32OLE.new("Excel.Application", "localhost")
+    assert_instance_of(WIN32OLE, rexcel)
+    rexcel.visible = true
+    rexcel.quit
+  end
+  def test_s_new_from_clsid
+    excel = WIN32OLE.new("{00024500-0000-0000-C000-000000000046}")
+    assert_instance_of(WIN32OLE, excel)
+    excel.quit
+    exc = assert_exception(WIN32OLERuntimeError) {
+      WIN32OLE.new("{000}")
+    }
+    assert_match(/unknown OLE server: `\{000\}'/, exc.message)
+  end
+  def test_s_connect
+    excel2 = WIN32OLE.connect('Excel.Application')
+    assert_instance_of(WIN32OLE, excel2)
+  end
+
+  def test_s_const_load
+    assert(!defined?(EXCEL_CONST::XlTop))
+    WIN32OLE.const_load(@excel, EXCEL_CONST)
+    assert_equal(-4160, EXCEL_CONST::XlTop)
+
+    assert(!defined?(CONST1::XlTop))
+    WIN32OLE.const_load(MS_EXCEL_TYPELIB, CONST1)
+    assert_equal(-4160, CONST1::XlTop)
+  end
+
+  def test_s_codepage
+    assert_equal(WIN32OLE::CP_ACP, WIN32OLE.codepage)
+  end
+
+  def test_s_codepage_set
+    WIN32OLE.codepage = WIN32OLE::CP_UTF8
+    assert_equal(WIN32OLE::CP_UTF8, WIN32OLE.codepage)
+    WIN32OLE.codepage = WIN32OLE::CP_ACP
+  end
+
+  def test_const_CP_ACP
+    assert_equal(0, WIN32OLE::CP_ACP)
+  end
+
+  def test_const_CP_OEMCP
+    assert_equal(1, WIN32OLE::CP_OEMCP)
+  end
+
+  def test_const_CP_MACCP
+    assert_equal(2, WIN32OLE::CP_MACCP)
+  end
+
+  def test_const_CP_THREAD_ACP
+    assert_equal(3, WIN32OLE::CP_THREAD_ACP)
+  end
+
+  def test_const_CP_SYMBOL
+    assert_equal(42, WIN32OLE::CP_SYMBOL)
+  end
+
+  def test_const_CP_UTF7
+    assert_equal(65000, WIN32OLE::CP_UTF7)
+  end
+
+  def test_const_CP_UTF8
+    assert_equal(65001, WIN32OLE::CP_UTF8)
+  end
+
+  def test_s_codepage_changed
+    book = @excel.workbooks.add
+    sheet = book.worksheets(1)
+    begin
+      WIN32OLE.codepage = WIN32OLE::CP_UTF8
+      sheet.range("A1").value = [0x3042].pack("U*")
+      val = sheet.range("A1").value
+      assert_equal("\343\201\202", val)
+      WIN32OLE.codepage = WIN32OLE::CP_ACP
+      val = sheet.range("A1").value
+      assert_equal("\202\240", val)
+    ensure
+      book.saved = true
+    end
+  end
+
+  def test_get_win32ole_object
+    workbooks = @excel.Workbooks;
+    assert_instance_of(WIN32OLE, workbooks)
+  end
+  def test_each
+    workbooks = @excel.Workbooks
+    assert_no_exception {
+      i = 0;
+      workbooks.each do |workbook|
+        print i += 1
+      end
+    }
+    workbooks.add
+    workbooks.add
+    i = 0
+    workbooks.each do |workbook|
+      i+=1
+    end
+    assert_equal(2, i)
+    workbooks.each do |workbook|
+      workbook.saved = true
+    end
+  end
+  def test_setproperty_bracket
+    book = @excel.workbooks.add
+    sheet = book.worksheets(1)
+    begin
+      sheet.range("A1")['Value'] = 10
+      assert_equal(10, sheet.range("A1").value)
+      sheet['Cells', 1, 2] = 10
+      assert_equal(10, sheet.range("B1").value)
+      assert_equal(10, sheet['Cells', 1, 2].value)
+    ensure
+      book.saved = true
+    end
+  end
+  def test_convert_bignum
+    book = @excel.workbooks.add
+    sheet = book.worksheets(1)
+    begin
+      sheet.range("A1").value = 999999999
+      sheet.range("A2").value = 9999999999
+      sheet.range("A3").value = "=A1*10 + 9"
+      assert_equal(9999999999, sheet.range("A2").value)
+      assert_equal(9999999999, sheet.range("A3").value)
+     
+    ensure
+      book.saved = true
+    end
+  end
+
+  def test_ole_invoke_with_named_arg
+    book = @excel.workbooks.add
+    sheets = book.worksheets
+    sheet = book.worksheets(1)
+    num = sheets.count
+    begin
+      sheets.add({'count' => 2, 'after'=>sheet})
+      assert_equal(2, sheets.count - num);
+    ensure
+      book.saved = true
+    end
+  end
+
+  def test_ole_invoke_with_named_arg_last
+    book = @excel.workbooks.add
+    sheets = book.worksheets
+    sheet = book.worksheets(1)
+    num = sheets.count
+    begin
+      sheets.add(sheet, {'count' => 2})
+      assert_equal(2, sheets.count - num);
+    ensure
+      book.saved = true
+    end
+  end
+
+  def test_setproperty
+    @excel.setproperty('Visible', false)
+    assert_equal(false, @excel.Visible)
+    @excel.setproperty('Visible', true)
+    assert_equal(true, @excel.Visible)
+    book = @excel.workbooks.add
+    sheet = book.worksheets(1)
+    begin
+      sheet.setproperty('Cells', 1, 2, 10)
+      assert_equal(10, sheet.range("B1").value)
+    ensure
+      book.saved = true
+    end
+  end
+  def test_no_exist_property
+    isok = false
+    begin
+      @excel.unknown_prop = 1
+    rescue WIN32OLERuntimeError
+      isok = true
+    end
+    assert(isok)
+
+    isok = false
+    begin
+      @excel['unknown_prop'] = 2
+    rescue WIN32OLERuntimeError
+      isok = true
+    end
+    assert(isok)
+  end
+
+  def test_setproperty_with_equal
+    book = @excel.workbooks.add
+    sheet = book.worksheets(1)
+    begin
+      sheet.range("B1").value = 10
+      assert_equal(10, sheet.range("B1").value)
+      sheet.range("C1:D1").value = [11, 12]
+      assert_equal(11, sheet.range("C1").value)
+      assert_equal(12, sheet.range("D1").value)
+    ensure
+      book.saved = true
+    end
+  end
+  def test_invoke
+    workbooks = @excel.invoke( 'workbooks' )
+    assert_instance_of(WIN32OLE, workbooks)
+    book = workbooks.invoke( 'add' )
+    assert_instance_of(WIN32OLE, book)
+  end
+  def test_ole_methods
+    methods = @excel.ole_methods
+    method_names = methods.collect{|m| m.name}
+    assert(method_names.include?("Quit"))
+  end
+  def test_ole_func_methods
+    methods = @excel.ole_func_methods
+    assert(methods.size > 0)
+    method_names = methods.collect{|m| m.name}
+    assert(method_names.include?("Quit"))
+  end
+  def test_ole_put_methods
+    methods = @excel.ole_put_methods
+    assert(methods.size > 0)
+    method_names = methods.collect{|m| m.name}
+    assert(method_names.include?("Visible"))
+  end
+  def test_ole_get_methods
+    methods = @excel.ole_get_methods
+    assert(methods.size > 0)
+    method_names = methods.collect{|m| m.name}
+    assert(method_names.include?("Visible"))
+  end
+  def test_ole_method_help
+    quit_info = @excel.ole_method_help("Quit")
+    assert_equal(0, quit_info.size_params)
+    assert_equal(0, quit_info.size_opt_params)
+
+    workbooks = @excel.Workbooks
+    add_info = workbooks.ole_method_help("Add")
+    assert_equal(1, add_info.size_params)
+    assert_equal(1, add_info.size_opt_params)
+    assert(add_info.params[0].input?)
+    assert(add_info.params[0].optional?)
+    assert_equal('VARIANT', add_info.params[0].ole_type)
+  end
+  def teardown
+    @excel.quit
+    @excel = nil
+    GC.start
+  end
+end
+
+class TestWin32OLE_WITH_MSI < RUNIT::TestCase
+  def setup
+    installer = WIN32OLE.new("WindowsInstaller.Installer")
+    @record = installer.CreateRecord(2)
+  end
+
+  # Sorry, this test fails. 
+  # Win32OLE does not support this style to set property.
+  # Use Win32OLE#setproperty or Win32OLE#[]= .
+  # def test_invoke
+  #   @record.invoke("StringData", 1, 'cccc')
+  #   assert_equal('cccc', @record.StringData(1))
+  # end
+
+  def test_setproperty
+    @record.setproperty( "StringData", 1, 'dddd')
+    assert_equal('dddd', @record.StringData(1))
+  end
+  def test_bracket_equal_with_arg
+    @record[ "StringData", 1 ] =  'ffff'
+    assert_equal('ffff', @record.StringData(1))
+  end
+
+  def test__invoke
+    shell=WIN32OLE.new('Shell.Application')
+    assert_equal(shell.NameSpace(0).title, shell._invoke(0x60020002, [0], [WIN32OLE::VARIANT::VT_VARIANT]).title)
+  end
+end
+
+# ---------------------
+#
+# a subclass of Win32OLE
+# override new() and connect()
+class MyExcel<WIN32OLE
+    def MyExcel.new 
+        super "Excel.Application"
+    end
+    def MyExcel.connect
+        super "Excel.Application"
+    end
+end
+
+class TestMyExcel < TestWin32OLE
+#
+# because we overrided new() and connect()
+# we need to change the test.
+# also, because the class will be different
+# 
+  def setup
+    @excel = MyExcel.new
+    @excel.visible = true
+  end
+  def test_s_new
+    assert_instance_of(MyExcel, @excel)
+  end
+  def test_s_connect
+    excel2 = MyExcel.connect
+    assert_instance_of(MyExcel, excel2)
+  end
+#
+# const_load didn't like to be called twice,
+# and I don't know how to undefine something in Ruby yet 
+# so, hide the test.
+#
+  private :test_s_const_load
+end
+
+if $0 == __FILE__
+  puts "Now Test Win32OLE version #{WIN32OLE::VERSION}"
+  if ARGV.size == 0
+	suite = RUNIT::TestSuite.new
+	suite.add_test(TestWin32OLE.suite)
+	suite.add_test(TestMyExcel.suite)
+    begin
+      installer = WIN32OLE.new("WindowsInstaller.Installer")
+      suite.add_test(TestWin32OLE_WITH_MSI.suite)
+    rescue
+      puts "Skip some test with MSI"
+    end
+  else
+    suite = RUNIT::TestSuite.new
+    ARGV.each do |testmethod|
+      suite.add_test(TestWin32OLE.new(testmethod))
+    end
+  end
+  RUNIT::CUI::TestRunner.quiet_mode = true
+  RUNIT::CUI::TestRunner.run(suite)
+end
diff --git a/ruby_1_8_6/ext/win32ole/tests/test_ole_methods.rb b/ruby_1_8_6/ext/win32ole/tests/test_ole_methods.rb
new file mode 100644
index 0000000000..ca1c03b010
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/test_ole_methods.rb
@@ -0,0 +1,36 @@
+#
+# This is test for [ruby-talk:196897]
+#
+begin
+  require 'win32ole'
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(WIN32OLE)
+  class TestWIN32OLE_FOR_PROPERTYPUTREF < Test::Unit::TestCase
+    
+    def setup
+      @obj = WIN32OLE.new('Scripting.Dictionary')
+    end
+
+    def test_ole_methods
+      x = @obj.ole_methods.select {|m|
+        m.invoke_kind == 'PROPERTYPUTREF'
+      }
+      assert(x.size > 0)
+      assert_equal(1, x.size)
+      assert_equal('Item', x[0].name)
+    end
+
+    def test_ole_put_methods
+      x = @obj.ole_put_methods.select {|m|
+        m.invoke_kind == 'PROPERTYPUTREF'
+      }
+      assert(x.size > 0)
+      assert_equal(1, x.size)
+      assert_equal('Item', x[0].name)
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/ext/win32ole/tests/test_propertyputref.rb b/ruby_1_8_6/ext/win32ole/tests/test_propertyputref.rb
new file mode 100644
index 0000000000..befc35ca9c
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/test_propertyputref.rb
@@ -0,0 +1,19 @@
+require 'test/unit'
+require 'win32ole'
+
+class TestWIN32OLE_PROPERTYPUTREF < Test::Unit::TestCase
+  def setup
+    begin
+      @sapi = WIN32OLE.new('SAPI.SpVoice')
+    rescue WIN32OLERuntimeError
+      @sapi = nil
+    end
+  end
+  def test_sapi
+    if @sapi
+      new_id = @sapi.getvoices.item(2).Id
+      @sapi.voice = @sapi.getvoices.item(2)
+      assert_equal(new_id, @sapi.voice.Id)
+    end
+  end
+end
diff --git a/ruby_1_8_6/ext/win32ole/tests/test_word.rb b/ruby_1_8_6/ext/win32ole/tests/test_word.rb
new file mode 100644
index 0000000000..53a6c521ba
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/test_word.rb
@@ -0,0 +1,37 @@
+#
+# This is test for [ruby-Bugs#3237]
+#
+begin
+  require 'win32ole'
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(WIN32OLE)
+  class TestWIN32OLE_WITH_WORD < Test::Unit::TestCase
+    
+    def setup
+      begin
+        @obj = WIN32OLE.new('Word.Application')
+      rescue WIN32OLERuntimeError
+        @obj = nil
+      end
+    end
+
+    def test_ole_methods
+      if @obj
+        @obj.visible = true
+        @obj.wordbasic.disableAutoMacros(true)
+        assert(true)
+      end
+    end
+
+    def teardown
+      if @obj
+        @obj.quit
+        @obj = nil
+      end
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/ext/win32ole/tests/testall.rb b/ruby_1_8_6/ext/win32ole/tests/testall.rb
new file mode 100644
index 0000000000..d45541f571
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/tests/testall.rb
@@ -0,0 +1,15 @@
+require 'rubyunit'
+require 'win32ole'
+puts "Now Test Win32OLE version #{WIN32OLE::VERSION}"
+# RUNIT::CUI::TestRunner.quiet_mode = true
+require "testWIN32OLE"
+require "testOLETYPE"
+require "testOLEPARAM"
+require "testOLEMETHOD"
+require "testOLEVARIABLE"
+require "testVARIANT"
+require "testNIL2VTEMPTY"
+require "test_ole_methods.rb"
+require "test_propertyputref.rb"
+require "test_word.rb"
+# require "testOLEEVENT"
diff --git a/ruby_1_8_6/ext/win32ole/win32ole.c b/ruby_1_8_6/ext/win32ole/win32ole.c
new file mode 100644
index 0000000000..dace9df806
--- /dev/null
+++ b/ruby_1_8_6/ext/win32ole/win32ole.c
@@ -0,0 +1,6271 @@
+/*
+ *  (c) 1995 Microsoft Corporation. All rights reserved.
+ *  Developed by ActiveWare Internet Corp., http://www.ActiveWare.com
+ *
+ *  Other modifications Copyright (c) 1997, 1998 by Gurusamy Sarathy
+ *  <gsar@umich.edu> and Jan Dubois <jan.dubois@ibm.net>
+ *
+ *  You may distribute under the terms of either the GNU General Public
+ *  License or the Artistic License, as specified in the README file
+ *  of the Perl distribution.
+ *
+ */
+
+/*
+  $Date$
+  modified for win32ole (ruby) by Masaki.Suketa <masaki.suketa@nifty.ne.jp>
+ */
+
+#include "ruby.h"
+#include "st.h"
+#include <windows.h>
+#include <ocidl.h>
+#include <olectl.h>
+#include <ole2.h>
+#ifdef HAVE_STDARG_PROTOTYPES
+#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
+
+
+#define DOUT fprintf(stderr,"[%d]\n",__LINE__)
+#define DOUTS(x) fprintf(stderr,"[%d]:" #x "=%s\n",__LINE__,x)
+#define DOUTMSG(x) fprintf(stderr, "[%d]:" #x "\n",__LINE__)
+#define DOUTI(x) fprintf(stderr, "[%ld]:" #x "=%d\n",__LINE__,x)
+#define DOUTD(x) fprintf(stderr, "[%d]:" #x "=%f\n",__LINE__,x)
+
+#if defined NONAMELESSUNION && __GNUC__
+#define V_UNION1(X, Y) ((X)->u.Y)
+#else
+#define V_UNION1(X, Y) ((X)->Y)
+#endif
+
+#if defined NONAMELESSUNION && __GNUC__
+#undef V_UNION
+#define V_UNION(X,Y) ((X)->n1.n2.n3.Y)
+
+#undef V_VT
+#define V_VT(X) ((X)->n1.n2.vt)
+
+#undef V_BOOL
+#define V_BOOL(X) V_UNION(X,boolVal)
+#endif
+
+#define OLE_RELEASE(X) (X) ? ((X)->lpVtbl->Release(X)) : 0
+
+#define OLE_ADDREF(X) (X) ? ((X)->lpVtbl->AddRef(X)) : 0
+
+#define OLE_GET_TYPEATTR(X, Y) ((X)->lpVtbl->GetTypeAttr((X), (Y)))
+#define OLE_RELEASE_TYPEATTR(X, Y) ((X)->lpVtbl->ReleaseTypeAttr((X), (Y)))
+
+#define OLE_FREE(x) {\
+    if(gOLEInitialized == Qtrue) {\
+        if(x) {\
+            OLE_RELEASE(x);\
+            (x) = 0;\
+        }\
+    }\
+}
+
+#define OLEData_Get_Struct(obj, pole) {\
+    Data_Get_Struct(obj, struct oledata, pole);\
+    if(!pole->pDispatch) {\
+        rb_raise(rb_eRuntimeError, "failed to get Dispatch Interface");\
+    }\
+}
+
+#define WC2VSTR(x) ole_wc2vstr((x), TRUE)
+
+#define WIN32OLE_VERSION "0.7.1"
+
+typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
+    (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
+
+typedef HWND (WINAPI FNHTMLHELP)(HWND hwndCaller, LPCSTR pszFile,
+                                 UINT uCommand, DWORD dwData);
+typedef struct {
+    struct IEventSinkVtbl * lpVtbl;
+} IEventSink, *PEVENTSINK;
+
+typedef struct IEventSinkVtbl IEventSinkVtbl;
+
+struct IEventSinkVtbl {
+    STDMETHOD(QueryInterface)(
+        PEVENTSINK,
+        REFIID,
+        LPVOID *);
+    STDMETHOD_(ULONG, AddRef)(PEVENTSINK);
+    STDMETHOD_(ULONG, Release)(PEVENTSINK);
+
+    STDMETHOD(GetTypeInfoCount)(
+        PEVENTSINK,
+        UINT *);
+    STDMETHOD(GetTypeInfo)(
+        PEVENTSINK,
+        UINT,
+        LCID,
+        ITypeInfo **);
+    STDMETHOD(GetIDsOfNames)(
+        PEVENTSINK,
+        REFIID,
+        OLECHAR **,
+        UINT,
+        LCID,
+        DISPID *);
+    STDMETHOD(Invoke)(
+        PEVENTSINK,
+        DISPID,
+        REFIID,
+        LCID,
+        WORD,
+        DISPPARAMS *,
+        VARIANT *,
+        EXCEPINFO *,
+        UINT *);
+};
+
+typedef struct tagIEVENTSINKOBJ {
+    IEventSinkVtbl *lpVtbl;
+    DWORD m_cRef;
+    IID m_iid;
+    int m_event_id;
+    DWORD m_dwCookie;
+    IConnectionPoint *pConnectionPoint;
+    ITypeInfo *pTypeInfo;
+    int *ptr_freed;
+}IEVENTSINKOBJ, *PIEVENTSINKOBJ;
+
+VALUE cWIN32OLE;
+VALUE cWIN32OLE_TYPE;
+VALUE cWIN32OLE_VARIABLE;
+VALUE cWIN32OLE_METHOD;
+VALUE cWIN32OLE_PARAM;
+VALUE cWIN32OLE_EVENT;
+VALUE eWIN32OLE_RUNTIME_ERROR;
+VALUE mWIN32OLE_VARIANT;
+
+static VALUE ary_ole_event;
+static ID id_events;
+static BOOL gOLEInitialized = Qfalse;
+static HINSTANCE ghhctrl = NULL;
+static HINSTANCE gole32 = NULL;
+static FNCOCREATEINSTANCEEX *gCoCreateInstanceEx = NULL;
+static VALUE com_hash;
+static IDispatchVtbl com_vtbl;
+static UINT  cWIN32OLE_cp = CP_ACP;
+static VARTYPE g_nil_to = VT_ERROR;
+
+struct oledata {
+    IDispatch *pDispatch;
+};
+
+struct oletypedata {
+    ITypeInfo *pTypeInfo;
+};
+
+struct olemethoddata {
+    ITypeInfo *pOwnerTypeInfo;
+    ITypeInfo *pTypeInfo;
+    UINT index;
+};
+
+struct olevariabledata {
+    ITypeInfo *pTypeInfo;
+    UINT index;
+};
+
+struct oleparamdata {
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+    UINT index;
+};
+
+struct oleeventdata {
+    IEVENTSINKOBJ *pEvent;
+    int freed;
+};
+
+struct oleparam {
+    DISPPARAMS dp;
+    OLECHAR** pNamedArgs;
+};
+
+static VALUE folemethod_s_allocate _((VALUE));
+static VALUE olemethod_set_member _((VALUE, ITypeInfo *, ITypeInfo *, int, VALUE));
+static VALUE foletype_s_allocate _((VALUE));
+static VALUE oletype_set_member  _((VALUE, ITypeInfo *, VALUE));
+static VALUE olemethod_from_typeinfo _((VALUE, ITypeInfo *, VALUE));
+static HRESULT ole_docinfo_from_type _((ITypeInfo *, BSTR *, BSTR *, DWORD *, BSTR *));
+static char *ole_wc2mb(LPWSTR);
+static VALUE ole_variant2val(VARIANT*);
+static void ole_val2variant(VALUE, VARIANT*);
+  
+typedef struct _Win32OLEIDispatch
+{
+    IDispatch dispatch;
+    ULONG refcount;
+    VALUE obj;
+} Win32OLEIDispatch;
+
+static HRESULT ( STDMETHODCALLTYPE QueryInterface )( 
+    IDispatch __RPC_FAR * This,
+    /* [in] */ REFIID riid,
+    /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject)
+{
+    if (MEMCMP(riid, &IID_IUnknown, GUID, 1) == 0
+        || MEMCMP(riid, &IID_IDispatch, GUID, 1) == 0)
+    {
+        Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
+        p->refcount++;
+        *ppvObject = This;
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+}
+        
+static ULONG ( STDMETHODCALLTYPE AddRef )( 
+    IDispatch __RPC_FAR * This)
+{
+    Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
+    return ++(p->refcount);
+}
+        
+static ULONG ( STDMETHODCALLTYPE Release )( 
+    IDispatch __RPC_FAR * This)
+{
+    Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
+    ULONG u = --(p->refcount);
+    if (u == 0) {
+        st_data_t key = p->obj;
+        st_delete(DATA_PTR(com_hash), &key, 0);
+        free(p);
+    }
+    return u;
+}
+        
+static HRESULT ( STDMETHODCALLTYPE GetTypeInfoCount )( 
+    IDispatch __RPC_FAR * This,
+    /* [out] */ UINT __RPC_FAR *pctinfo)
+{
+    return E_NOTIMPL;
+}
+        
+static HRESULT ( STDMETHODCALLTYPE GetTypeInfo )( 
+    IDispatch __RPC_FAR * This,
+    /* [in] */ UINT iTInfo,
+    /* [in] */ LCID lcid,
+    /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo)
+{
+    return E_NOTIMPL;
+}
+
+        
+static HRESULT ( STDMETHODCALLTYPE GetIDsOfNames )( 
+    IDispatch __RPC_FAR * This,
+    /* [in] */ REFIID riid,
+    /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
+    /* [in] */ UINT cNames,
+    /* [in] */ LCID lcid,
+    /* [size_is][out] */ DISPID __RPC_FAR *rgDispId)
+{
+    Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
+    char* psz = ole_wc2mb(*rgszNames); // support only one method
+    *rgDispId = rb_intern(psz);
+    free(psz);
+    return S_OK;
+}
+        
+static /* [local] */ HRESULT ( STDMETHODCALLTYPE Invoke )( 
+    IDispatch __RPC_FAR * This,
+    /* [in] */ DISPID dispIdMember,
+    /* [in] */ REFIID riid,
+    /* [in] */ LCID lcid,
+    /* [in] */ WORD wFlags,
+    /* [out][in] */ DISPPARAMS __RPC_FAR *pDispParams,
+    /* [out] */ VARIANT __RPC_FAR *pVarResult,
+    /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo,
+    /* [out] */ UINT __RPC_FAR *puArgErr)
+{
+    VALUE v;
+    int i;
+    int args = pDispParams->cArgs;
+    Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
+    VALUE* parg = ALLOCA_N(VALUE, args);
+    for (i = 0; i < args; i++) {
+        *(parg + i) = ole_variant2val(&pDispParams->rgvarg[args - i - 1]);
+    }
+    if (dispIdMember == DISPID_VALUE) {
+        if (wFlags == DISPATCH_METHOD) {
+            dispIdMember = rb_intern("call");
+        } else if (wFlags & DISPATCH_PROPERTYGET) {
+            dispIdMember = rb_intern("value");
+        }
+    }
+    v = rb_funcall2(p->obj, dispIdMember, args, parg);
+    ole_val2variant(v, pVarResult);
+    return S_OK;
+}
+
+static IDispatch*
+val2dispatch(val)
+    VALUE val;
+{
+    struct st_table *tbl = DATA_PTR(com_hash);
+    Win32OLEIDispatch* pdisp;
+    st_data_t data;
+
+    if (st_lookup(tbl, val, &data)) {
+        pdisp = (Win32OLEIDispatch *)(data & ~FIXNUM_FLAG);
+        pdisp->refcount++;
+    }
+    else {
+        pdisp = ALLOC(Win32OLEIDispatch);
+        pdisp->dispatch.lpVtbl = &com_vtbl;
+        pdisp->refcount = 1;
+        pdisp->obj = val;
+        st_insert(tbl, val, (VALUE)pdisp | FIXNUM_FLAG);
+    }
+    return &pdisp->dispatch;
+}
+
+static void
+time2d(hh, mm, ss, pv)
+    int hh, mm, ss;
+    double *pv;
+{
+    *pv =  (hh * 60.0 * 60.0 + mm * 60.0 + ss) / 86400.0;
+}
+
+static void
+d2time(v, hh, mm, ss)
+    double v;
+    int *hh, *mm, *ss;
+{
+    double d_hh, d_mm, d_ss;
+    int    i_hh, i_mm, i_ss;
+
+    double d = v * 86400.0;
+
+    d_hh = d / 3600.0;
+    i_hh = (int)d_hh;
+
+    d = d - i_hh * 3600.0;
+
+    d_mm = d / 60.0;
+    i_mm = (int)d_mm;
+
+    d = d - i_mm * 60.0;
+
+    d_ss = d * 10.0 + 5;
+    
+    i_ss = (int)d_ss / 10;
+
+    if(i_ss == 60) {
+        i_mm += 1;
+        i_ss = 0;
+    }
+
+    if (i_mm == 60) {
+        i_hh += 1;
+        i_mm = 0;
+    }
+    if (i_hh == 24) {
+        i_hh = 0;
+    }
+    
+    *hh = i_hh;
+    *mm = i_mm;
+    *ss = i_ss;
+}
+
+static void
+civil2jd(y, m, d, jd)
+    int y, m, d;
+    long *jd;
+{
+    long a, b;
+    if (m <= 2) {
+        y -= 1;
+        m += 12;
+    }
+    a = (long)(y / 100.0);
+    b = 2 - a + (long)(a / 4.0);
+    *jd = (long)(365.25 * (double)(y + 4716))
+         + (long)(30.6001 * (m + 1))
+         + d + b - 1524;
+}
+
+static void
+jd2civil(day, yy, mm, dd)
+    long day;
+    int *yy, *mm, *dd;
+{
+    long x, a, b, c, d, e;
+    x = (long)(((double)day - 1867216.25) / 36524.25);
+    a = day + 1 + x - (long)(x / 4.0);
+    b = a + 1524;
+    c = (long)(((double)b -122.1) /365.25);
+    d = (long)(365.25 * c);
+    e = (long)((double)(b - d) / 30.6001);
+    *dd = b - d - (long)(30.6001 * e);
+    if (e <= 13) {
+        *mm = e - 1;
+        *yy = c - 4716;
+    }
+    else {
+        *mm = e - 13;
+        *yy = c - 4715;
+    }
+}
+
+static void
+double2time(v, y, m, d, hh, mm, ss)
+    double v;
+    int *y, *m, *d, *hh, *mm, *ss;
+{
+    long day;
+    double t;
+
+    day = (long)v;
+    t = v - day;
+    jd2civil(2415019 + day, y, m, d);
+
+    d2time(t, hh, mm, ss);
+}
+
+static double
+time_object2date(tmobj)
+    VALUE tmobj;
+{
+    long y, m, d, hh, mm, ss;
+    long day;
+    double t;
+    y = FIX2INT(rb_funcall(tmobj, rb_intern("year"), 0));
+    m = FIX2INT(rb_funcall(tmobj, rb_intern("month"), 0));
+    d = FIX2INT(rb_funcall(tmobj, rb_intern("mday"), 0));
+    hh = FIX2INT(rb_funcall(tmobj, rb_intern("hour"), 0));
+    mm = FIX2INT(rb_funcall(tmobj, rb_intern("min"), 0));
+    ss = FIX2INT(rb_funcall(tmobj, rb_intern("sec"), 0));
+    civil2jd(y, m, d, &day);
+    time2d(hh, mm, ss, &t);
+    return t + day - 2415019;
+}
+
+static VALUE
+date2time_str(date)
+    double date;
+{
+    int y, m, d, hh, mm, ss;
+    char szTime[20];
+    double2time(date, &y, &m, &d, &hh, &mm, &ss);
+    sprintf(szTime,
+            "%4.4d/%02.2d/%02.2d %02.2d:%02.2d:%02.2d",
+            y, m, d, hh, mm, ss);
+    return rb_str_new2(szTime);
+}
+
+static void ole_val2variant();
+
+static char *
+ole_wc2mb(pw)
+    LPWSTR pw;
+{
+    int size;
+    LPSTR pm;
+    size = WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, NULL, 0, NULL, NULL);
+    if (size) {
+        pm = ALLOC_N(char, size);    
+        WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, pm, size, NULL, NULL);
+    }
+    else {
+        pm = ALLOC_N(char, 1);
+        *pm = '\0';
+    }
+    return pm;
+} 
+
+static VALUE
+ole_hresult2msg(hr)
+    HRESULT hr;
+{
+    VALUE msg = Qnil;
+    char *p_msg = NULL;
+    char *term = NULL;
+    DWORD dwCount;
+
+    char strhr[100];
+    sprintf(strhr, "    HRESULT error code:0x%08lx\n      ", hr);
+    msg = rb_str_new2(strhr);
+
+    dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                            FORMAT_MESSAGE_FROM_SYSTEM |
+                            FORMAT_MESSAGE_IGNORE_INSERTS,
+                            NULL, hr, LOCALE_SYSTEM_DEFAULT,
+                            (LPTSTR)&p_msg, 0, NULL);
+    if (dwCount > 0) {
+	term = p_msg + strlen(p_msg);
+	while (p_msg < term) {
+	    term--;
+	    if (*term == '\r' || *term == '\n')
+	        *term = '\0';
+	    else break;
+	}
+        if (p_msg[0] != '\0') {
+            rb_str_cat2(msg, p_msg);
+        }
+    }
+    LocalFree(p_msg);
+    return msg;
+}
+
+static VALUE
+ole_excepinfo2msg(pExInfo)
+    EXCEPINFO *pExInfo;
+{
+    char error_code[40];
+    char *pSource = NULL;
+    char *pDescription = NULL;
+    VALUE error_msg;
+    if(pExInfo->pfnDeferredFillIn != NULL) {
+        (*pExInfo->pfnDeferredFillIn)(pExInfo);
+    }
+    if (pExInfo->bstrSource != NULL) {
+        pSource = ole_wc2mb(pExInfo->bstrSource);
+    }
+    if (pExInfo->bstrDescription != NULL) {
+        pDescription = ole_wc2mb(pExInfo->bstrDescription);
+    }
+    if(pExInfo->wCode == 0) {
+        sprintf(error_code, "\n    OLE error code:%lX in ", pExInfo->scode);
+    }
+    else{
+        sprintf(error_code, "\n    OLE error code:%u in ", pExInfo->wCode);
+    }
+    error_msg = rb_str_new2(error_code);
+    if(pSource != NULL) {
+        rb_str_cat(error_msg, pSource, strlen(pSource));
+    }
+    else {
+        rb_str_cat(error_msg, "<Unknown>", 9);
+    }
+    rb_str_cat2(error_msg, "\n      ");
+    if(pDescription != NULL) {
+        rb_str_cat2(error_msg, pDescription);
+    }
+    else {
+        rb_str_cat2(error_msg, "<No Description>");
+    }
+    if(pSource) free(pSource);
+    if(pDescription) free(pDescription);
+    SysFreeString(pExInfo->bstrDescription);
+    SysFreeString(pExInfo->bstrSource);
+    SysFreeString(pExInfo->bstrHelpFile);
+    return error_msg;
+}
+
+static void
+#ifdef HAVE_STDARG_PROTOTYPES
+ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...)
+#else
+ole_raise(hr, exc, fmt, va_alist)
+    HRESULT hr;
+    VALUE exc;
+    const char *fmt;
+    va_dcl
+#endif
+{
+    va_list args;
+    char buf[BUFSIZ];
+    VALUE err_msg;
+    va_init_list(args, fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
+    va_end(args);
+
+    err_msg = ole_hresult2msg(hr);
+    if(err_msg != Qnil) {
+        rb_raise(ecs, "%s\n%s", buf, StringValuePtr(err_msg));
+    }
+    else {
+        rb_raise(ecs, "%s", buf);
+    }
+}
+
+void
+ole_uninitialize()
+{
+    OleUninitialize();
+    gOLEInitialized = Qfalse;
+}
+
+static void
+ole_initialize() 
+{
+    HRESULT hr;
+    
+    if(gOLEInitialized == Qfalse) {
+        hr = OleInitialize(NULL);
+        if(FAILED(hr)) {
+            ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
+        }
+        gOLEInitialized = Qtrue;
+        /*
+         * In some situation, OleUninitialize does not work fine. ;-<
+         */
+        /*
+        atexit((void (*)(void))ole_uninitialize);
+        */
+    }
+}
+
+static void
+ole_msg_loop() {
+    MSG msg;
+    while(PeekMessage(&msg,NULL,0,0,PM_REMOVE)) {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+    }
+}
+
+static void
+ole_free(pole)
+    struct oledata *pole;
+{
+    OLE_FREE(pole->pDispatch);
+    free(pole);
+}
+
+static void
+oletype_free(poletype)
+    struct oletypedata *poletype;
+{
+    OLE_FREE(poletype->pTypeInfo);
+    free(poletype);
+}
+
+static void
+olemethod_free(polemethod)
+    struct olemethoddata *polemethod;
+{
+    OLE_FREE(polemethod->pTypeInfo);
+    OLE_FREE(polemethod->pOwnerTypeInfo);
+    free(polemethod);
+}
+
+static void
+olevariable_free(polevar)
+    struct olevariabledata *polevar;
+{
+    OLE_FREE(polevar->pTypeInfo);
+    free(polevar);
+}
+
+static void
+oleparam_free(pole)
+    struct oleparamdata *pole;
+{
+    OLE_FREE(pole->pTypeInfo);
+    free(pole);
+}
+
+static LPWSTR
+ole_mb2wc(pm, len)
+    char *pm;
+    int  len;
+{
+    int size;
+    LPWSTR pw;
+    size = MultiByteToWideChar(cWIN32OLE_cp, 0, pm, len, NULL, 0);
+    pw = SysAllocStringLen(NULL, size - 1);
+    MultiByteToWideChar(cWIN32OLE_cp, 0, pm, len, pw, size);
+    return pw;
+}
+
+static VALUE
+ole_wc2vstr(pw, isfree)
+    LPWSTR pw;
+    BOOL isfree;
+{
+    char *p = ole_wc2mb(pw);
+    VALUE vstr = rb_str_new2(p);
+    if(isfree)
+        SysFreeString(pw);
+    free(p);
+    return vstr;
+}
+
+static VALUE
+ole_ary_m_entry(val, pid)
+    VALUE val;
+    long *pid;
+{
+    VALUE obj = Qnil;
+    int i = 0;
+    obj = val;
+    while(TYPE(obj) == T_ARRAY) {
+        obj = rb_ary_entry(obj, pid[i]);
+        i++;
+    }
+    return obj;
+}
+
+static void
+ole_set_safe_array(n, psa, pid, pub, val, dim)
+    long n;
+    SAFEARRAY *psa;
+    long *pid;
+    long *pub;
+    VALUE val;
+    long dim;
+{
+    VALUE val1;
+    VARIANT var;
+    VariantInit(&var);
+    if(n < 0) return;
+    if(n == dim) {
+        val1 = ole_ary_m_entry(val, pid);
+        ole_val2variant(val1, &var);
+        SafeArrayPutElement(psa, pid, &var);
+    }
+    pid[n] += 1;
+    if (pid[n] < pub[n]) {
+        ole_set_safe_array(dim, psa, pid, pub, val, dim);
+    }
+    else {
+        pid[n] = 0;
+        ole_set_safe_array(n-1, psa, pid, pub, val, dim);
+    }
+}
+
+static void
+ole_val2variant(val, var)
+    VALUE val;
+    VARIANT *var;
+{
+    struct oledata *pole;
+    if(rb_obj_is_kind_of(val, cWIN32OLE)) {
+        Data_Get_Struct(val, struct oledata, pole);
+        OLE_ADDREF(pole->pDispatch);
+        V_VT(var) = VT_DISPATCH;
+        V_DISPATCH(var) = pole->pDispatch;
+        return;
+    }
+    if (rb_obj_is_kind_of(val, rb_cTime)) {
+        V_VT(var) = VT_DATE;
+        V_DATE(var) = time_object2date(val);
+        return;
+    }
+    switch (TYPE(val)) {
+    case T_ARRAY:
+    {
+        VALUE val1;
+        long dim = 0;
+        int  i = 0;
+
+        HRESULT hr;
+        SAFEARRAYBOUND *psab;
+        SAFEARRAY *psa;
+        long      *pub, *pid;
+
+        val1 = val;
+        while(TYPE(val1) == T_ARRAY) {
+            val1 = rb_ary_entry(val1, 0);
+            dim += 1;
+        }
+        psab = ALLOC_N(SAFEARRAYBOUND, dim);
+        pub  = ALLOC_N(long, dim);
+        pid  = ALLOC_N(long, dim);
+
+        if(!psab || !pub || !pid) {
+            if(pub) free(pub);
+            if(psab) free(psab);
+            if(pid) free(pid);
+            rb_raise(rb_eRuntimeError, "memory allocation error");
+        }
+        val1 = val;
+        i = 0;
+        while(TYPE(val1) == T_ARRAY) {
+            psab[i].cElements = RARRAY(val1)->len;
+            psab[i].lLbound = 0;
+            pub[i] = psab[i].cElements;
+            pid[i] = 0;
+            i ++;
+            val1 = rb_ary_entry(val1, 0);
+        }
+        /* Create and fill VARIANT array */
+        psa = SafeArrayCreate(VT_VARIANT, dim, psab);
+        if (psa == NULL)
+            hr = E_OUTOFMEMORY;
+        else
+            hr = SafeArrayLock(psa);
+        if (SUCCEEDED(hr)) {
+            ole_set_safe_array(dim-1, psa, pid, pub, val, dim-1);
+            hr = SafeArrayUnlock(psa);
+        }
+        if(pub) free(pub);
+        if(psab) free(psab);
+        if(pid) free(pid);
+
+        if (SUCCEEDED(hr)) {
+            V_VT(var) = VT_VARIANT | VT_ARRAY;
+            V_ARRAY(var) = psa;
+        }
+        else if (psa != NULL)
+            SafeArrayDestroy(psa);
+        break;
+    }
+    case T_STRING:
+        V_VT(var) = VT_BSTR;
+        V_BSTR(var) = ole_mb2wc(StringValuePtr(val), -1);
+        break;
+    case T_FIXNUM:
+        V_VT(var) = VT_I4;
+        V_I4(var) = NUM2INT(val);
+        break;
+    case T_BIGNUM:
+        V_VT(var) = VT_R8;
+        V_R8(var) = rb_big2dbl(val);
+        break;
+    case T_FLOAT:
+        V_VT(var) = VT_R8;
+        V_R8(var) = NUM2DBL(val);
+        break;
+    case T_TRUE:
+        V_VT(var) = VT_BOOL;
+        V_BOOL(var) = VARIANT_TRUE;
+        break;
+    case T_FALSE:
+        V_VT(var) = VT_BOOL;
+        V_BOOL(var) = VARIANT_FALSE;
+        break;
+    case T_NIL:
+        if (g_nil_to == VT_ERROR) {
+            V_VT(var) = VT_ERROR;
+            V_ERROR(var) = DISP_E_PARAMNOTFOUND;
+        }else {
+            V_VT(var) = VT_EMPTY;
+        }
+        break;
+    default:
+        V_VT(var) = VT_DISPATCH;
+        V_DISPATCH(var) = val2dispatch(val);
+        break;
+    }
+}
+
+static void
+ole_val2variant2(val, var)
+    VALUE val;
+    VARIANT *var;
+{
+    g_nil_to = VT_EMPTY;
+    ole_val2variant(val, var);
+    g_nil_to = VT_ERROR;
+}
+
+static VALUE
+ole_set_member(self, dispatch)
+    VALUE self;
+    IDispatch * dispatch;
+{
+    struct oledata *pole;
+    Data_Get_Struct(self, struct oledata, pole);
+    if (pole->pDispatch) {
+        OLE_RELEASE(pole->pDispatch);
+        pole->pDispatch = NULL;
+    }
+    pole->pDispatch = dispatch;
+    return self;
+}
+
+static VALUE fole_s_allocate _((VALUE));
+static VALUE
+fole_s_allocate(klass)
+    VALUE klass;
+{
+    struct oledata *pole;
+    VALUE obj;
+    ole_initialize();
+    obj = Data_Make_Struct(klass,struct oledata,0,ole_free,pole);
+    pole->pDispatch = NULL;
+    return obj;
+}
+
+static VALUE
+create_win32ole_object(klass, pDispatch, argc, argv)
+    VALUE klass;
+    IDispatch *pDispatch;
+    int argc;
+    VALUE *argv;
+{
+    VALUE obj = fole_s_allocate(klass);
+    ole_set_member(obj, pDispatch);
+    return obj;
+}
+
+static VALUE
+ole_variant2val(pvar)
+    VARIANT *pvar;
+{
+    VALUE obj = Qnil;
+    HRESULT hr;
+    while ( V_VT(pvar) == (VT_BYREF | VT_VARIANT) )
+        pvar = V_VARIANTREF(pvar);
+
+    if(V_ISARRAY(pvar)) {
+        SAFEARRAY *psa = V_ISBYREF(pvar) ? *V_ARRAYREF(pvar) : V_ARRAY(pvar);
+        long i;
+        long *pID, *pLB, *pUB;
+        VARIANT variant;
+        VALUE val;
+        VALUE val2;
+        int dim = 0;
+
+        if (!psa) {
+            return obj;
+        }
+        dim = SafeArrayGetDim(psa);
+
+        VariantInit(&variant);
+        V_VT(&variant) = (V_VT(pvar) & ~VT_ARRAY) | VT_BYREF;
+
+        pID = ALLOC_N(long, dim);
+        pLB = ALLOC_N(long, dim);
+        pUB = ALLOC_N(long, dim);
+
+        if(!pID || !pLB || !pUB) {
+            if(pID) free(pID);
+            if(pLB) free(pLB);
+            if(pUB) free(pUB);
+            rb_raise(rb_eRuntimeError, "memory allocation error");
+        }
+
+        obj = Qnil;
+
+        for(i = 0; i < dim; ++i) {
+            SafeArrayGetLBound(psa, i+1, &pLB[i]);
+            SafeArrayGetLBound(psa, i+1, &pID[i]);
+            SafeArrayGetUBound(psa, i+1, &pUB[i]);
+        }
+
+        hr = SafeArrayLock(psa);
+        if (SUCCEEDED(hr)) {
+            val2 = rb_ary_new();
+            while (i >= 0) {
+                hr = SafeArrayPtrOfIndex(psa, pID, &V_BYREF(&variant));
+                if (FAILED(hr))
+                    break;
+
+                val = ole_variant2val(&variant);
+                rb_ary_push(val2, val);
+                for (i = dim-1 ; i >= 0 ; --i) {
+                    if (++pID[i] <= pUB[i])
+                        break;
+
+                    pID[i] = pLB[i];
+                    if (i > 0) {
+                        if (obj == Qnil)
+                            obj = rb_ary_new();
+                        rb_ary_push(obj, val2);
+                        val2 = rb_ary_new();
+                    }
+                }
+            }
+            SafeArrayUnlock(psa);
+        }
+        if(pID) free(pID);
+        if(pLB) free(pLB);
+        if(pUB) free(pUB);
+        return (obj == Qnil) ? val2 : obj;
+    }
+    switch(V_VT(pvar) & ~VT_BYREF){
+    case VT_EMPTY:
+        break;
+    case VT_NULL:
+        break;
+    case VT_UI1:
+        if(V_ISBYREF(pvar)) 
+            obj = INT2NUM((long)*V_UI1REF(pvar));
+        else 
+            obj = INT2NUM((long)V_UI1(pvar));
+        break;
+
+    case VT_I2:
+        if(V_ISBYREF(pvar))
+            obj = INT2NUM((long)*V_I2REF(pvar));
+        else 
+            obj = INT2NUM((long)V_I2(pvar));
+        break;
+
+    case VT_I4:
+        if(V_ISBYREF(pvar))
+            obj = INT2NUM((long)*V_I4REF(pvar));
+        else 
+            obj = INT2NUM((long)V_I4(pvar));
+        break;
+
+    case VT_R4:
+        if(V_ISBYREF(pvar))
+            obj = rb_float_new(*V_R4REF(pvar));
+        else
+            obj = rb_float_new(V_R4(pvar));
+        break;
+
+    case VT_R8:
+        if(V_ISBYREF(pvar))
+            obj = rb_float_new(*V_R8REF(pvar));
+        else
+            obj = rb_float_new(V_R8(pvar));
+        break;
+
+    case VT_BSTR:
+    {
+        char *p;
+        if(V_ISBYREF(pvar))
+            p = ole_wc2mb(*V_BSTRREF(pvar));
+        else
+            p = ole_wc2mb(V_BSTR(pvar));
+        obj = rb_str_new2(p);
+        if(p) free(p);
+        break;
+    }
+
+    case VT_ERROR:
+        if(V_ISBYREF(pvar))
+            obj = INT2NUM(*V_ERRORREF(pvar));
+        else
+            obj = INT2NUM(V_ERROR(pvar));
+        break;
+
+    case VT_BOOL:
+        if (V_ISBYREF(pvar))
+            obj = (*V_BOOLREF(pvar) ? Qtrue : Qfalse);
+        else
+            obj = (V_BOOL(pvar) ? Qtrue : Qfalse);
+        break;
+
+    case VT_DISPATCH:
+    {
+        IDispatch *pDispatch;
+
+        if (V_ISBYREF(pvar))
+            pDispatch = *V_DISPATCHREF(pvar);
+        else
+            pDispatch = V_DISPATCH(pvar);
+
+        if (pDispatch != NULL ) {
+            OLE_ADDREF(pDispatch);
+            obj = create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
+        }
+        break;
+    }
+
+    case VT_UNKNOWN:
+    {
+
+        /* get IDispatch interface from IUnknown interface */
+        IUnknown *punk;
+        IDispatch *pDispatch;
+        HRESULT hr;
+
+        if (V_ISBYREF(pvar))
+            punk = *V_UNKNOWNREF(pvar);
+        else
+            punk = V_UNKNOWN(pvar);
+
+        if(punk != NULL) {
+           hr = punk->lpVtbl->QueryInterface(punk, &IID_IDispatch,
+                                             (void **)&pDispatch);
+           if(SUCCEEDED(hr)) {
+               obj = create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
+           }
+        }
+        break;
+    }
+
+    case VT_DATE:
+    {
+        DATE date;
+        if(V_ISBYREF(pvar))
+            date = *V_DATEREF(pvar);
+        else
+            date = V_DATE(pvar);
+
+        obj =  date2time_str(date);
+        break;
+    }
+    case VT_CY:
+    default:
+        {
+        HRESULT hr;
+        VARIANT variant;
+        VariantInit(&variant);
+        hr = VariantChangeTypeEx(&variant, pvar, 
+                                  LOCALE_SYSTEM_DEFAULT, 0, VT_BSTR);
+        if (SUCCEEDED(hr) && V_VT(&variant) == VT_BSTR) {
+            char *p = ole_wc2mb(V_BSTR(&variant));
+            obj = rb_str_new2(p);
+            if(p) free(p);
+        }
+        VariantClear(&variant);
+        break;
+        }
+    }
+    return obj;
+}
+
+
+static LONG reg_open_key(hkey, name, phkey)
+    HKEY hkey;
+    const char *name;
+    HKEY *phkey;
+{
+    return RegOpenKeyEx(hkey, name, 0, KEY_READ, phkey);
+}
+
+static LONG reg_open_vkey(hkey, key, phkey)
+    HKEY hkey;
+    VALUE key;
+    HKEY *phkey;
+{
+    return reg_open_key(hkey, StringValuePtr(key), phkey);
+}
+
+static VALUE
+reg_enum_key(hkey, i)
+    HKEY hkey;
+    DWORD i;
+{
+    char buf[BUFSIZ];
+    DWORD size_buf = sizeof(buf);
+    FILETIME ft;
+    LONG err = RegEnumKeyEx(hkey, i, buf, &size_buf,
+                            NULL, NULL, NULL, &ft);
+    if(err == ERROR_SUCCESS) {
+        return rb_str_new2(buf);
+    }
+    return Qnil;
+}
+
+static VALUE
+reg_get_val(hkey, subkey)
+    HKEY hkey;
+    const char *subkey;
+{
+    char buf[BUFSIZ];
+    LONG size_buf = sizeof(buf);
+    LONG err = RegQueryValue(hkey, subkey, buf, &size_buf);
+    if (err == ERROR_SUCCESS) {
+        return rb_str_new2(buf);
+    }
+    return Qnil;
+}
+
+static VALUE
+typelib_file_from_clsid(ole)
+    VALUE ole;
+{
+    OLECHAR *pbuf;
+    CLSID clsid;
+    HRESULT hr;
+    HKEY hroot, hclsid;
+    LONG err;
+    VALUE typelib;
+    VALUE vclsid;
+    char *pclsid = NULL;
+
+    pbuf  = ole_mb2wc(StringValuePtr(ole), -1);
+    hr = CLSIDFromProgID(pbuf, &clsid);
+    SysFreeString(pbuf);
+    if (FAILED(hr)) {
+        return Qnil;
+    }
+    StringFromCLSID(&clsid, &pbuf);
+    vclsid = WC2VSTR(pbuf);
+    err = reg_open_key(HKEY_CLASSES_ROOT, "CLSID", &hroot);
+    if (err != ERROR_SUCCESS) {
+        return Qnil;
+    }
+    err = reg_open_key(hroot, StringValuePtr(vclsid), &hclsid);
+    if (err != ERROR_SUCCESS) {
+        RegCloseKey(hroot);
+        return Qnil;
+    }
+    typelib = reg_get_val(hclsid, "InprocServer32");
+    RegCloseKey(hroot);
+    RegCloseKey(hclsid);
+    return typelib;
+}
+
+static VALUE
+typelib_file_from_typelib(ole)
+    VALUE ole;
+{
+    HKEY htypelib, hclsid, hversion, hlang;
+    double fver;
+    DWORD i, j, k;
+    LONG err;
+    BOOL found = FALSE;
+    VALUE typelib;
+    VALUE file = Qnil;
+    VALUE clsid;
+    VALUE ver;
+    VALUE lang;
+
+    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
+    if(err != ERROR_SUCCESS) {
+        return Qnil;
+    }
+    for(i = 0; !found; i++) {
+        clsid = reg_enum_key(htypelib, i);
+        if (clsid == Qnil)
+            break;
+        err = reg_open_vkey(htypelib, clsid, &hclsid);
+        if (err != ERROR_SUCCESS)
+            continue;
+        fver = 0;
+        for(j = 0; !found; j++) {
+            ver = reg_enum_key(hclsid, j);
+            if (ver == Qnil)
+                break;
+            err = reg_open_vkey(hclsid, ver, &hversion);
+            if (err != ERROR_SUCCESS || fver > atof(StringValuePtr(ver)))
+                continue;
+            fver = atof(StringValuePtr(ver));
+            typelib = reg_get_val(hversion, NULL);
+            if (typelib == Qnil)
+                continue;
+            if (rb_str_cmp(typelib, ole) == 0) {
+                for(k = 0; !found; k++) {
+                    lang = reg_enum_key(hversion, k);
+                    if (lang == Qnil)
+                        break;
+                    err = reg_open_vkey(hversion, lang, &hlang);
+                    if (err == ERROR_SUCCESS) {
+                        if ((file = reg_get_val(hlang, "win32")) != Qnil) 
+                            found = TRUE;
+                        RegCloseKey(hlang);
+                    }
+                }
+            }
+            RegCloseKey(hversion);
+        }
+        RegCloseKey(hclsid);
+    }
+    RegCloseKey(htypelib);
+    return  file;
+}
+
+static VALUE
+typelib_file(ole)
+    VALUE ole;
+{
+    VALUE file = typelib_file_from_clsid(ole);
+    if (file != Qnil) {
+        return file;
+    }
+    return typelib_file_from_typelib(ole);
+}
+
+static void
+ole_const_load(pTypeLib, klass, self)
+    ITypeLib *pTypeLib;
+    VALUE klass;
+    VALUE self;
+{
+    unsigned int count;
+    unsigned int index;
+    int iVar;
+    ITypeInfo *pTypeInfo;
+    TYPEATTR  *pTypeAttr;
+    VARDESC   *pVarDesc;
+    HRESULT hr;
+    unsigned int len;
+    BSTR bstr;
+    char *pName = NULL;
+    VALUE val;
+    VALUE constant;
+    ID id;
+    constant = rb_hash_new();
+    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
+    for (index = 0; index < count; index++) {
+        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, index, &pTypeInfo);
+        if (FAILED(hr))
+            continue;
+        hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+        if(FAILED(hr)) {
+            OLE_RELEASE(pTypeInfo);
+            continue;
+        }
+        for(iVar = 0; iVar < pTypeAttr->cVars; iVar++) {
+            hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, iVar, &pVarDesc);
+            if(FAILED(hr))
+                continue;
+            if(pVarDesc->varkind == VAR_CONST &&
+               !(pVarDesc->wVarFlags & (VARFLAG_FHIDDEN |
+                                        VARFLAG_FRESTRICTED |
+                                        VARFLAG_FNONBROWSABLE))) {
+                hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pVarDesc->memid, &bstr,
+                                                 1, &len);
+                if(FAILED(hr) || len == 0 || !bstr)
+                    continue;
+                pName = ole_wc2mb(bstr);
+                val = ole_variant2val(V_UNION1(pVarDesc, lpvarValue));
+                *pName = toupper(*pName);
+                id = rb_intern(pName);
+                if (rb_is_const_id(id)) {
+                    rb_define_const(klass, pName, val);
+                }
+                else {
+                    rb_hash_aset(constant, rb_str_new2(pName), val);
+                }
+                SysFreeString(bstr);
+                if(pName) {
+                    free(pName);
+                    pName = NULL;
+                }
+            }
+            pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
+        }
+        pTypeInfo->lpVtbl->ReleaseTypeAttr(pTypeInfo, pTypeAttr);
+        OLE_RELEASE(pTypeInfo);
+    }
+    rb_define_const(klass, "CONSTANTS", constant);
+}
+
+static HRESULT
+clsid_from_remote(host, com, pclsid)
+    VALUE host;
+    VALUE com;
+    CLSID *pclsid;
+{
+    HKEY hlm;
+    HKEY hpid;
+    VALUE subkey;
+    LONG err;
+    char clsid[100];
+    OLECHAR *pbuf;
+    DWORD len;
+    DWORD dwtype;
+    HRESULT hr = S_OK;
+    err = RegConnectRegistry(StringValuePtr(host), HKEY_LOCAL_MACHINE, &hlm);
+    if (err != ERROR_SUCCESS)
+        return HRESULT_FROM_WIN32(err);
+    subkey = rb_str_new2("SOFTWARE\\Classes\\");
+    rb_str_concat(subkey, com);
+    rb_str_cat2(subkey, "\\CLSID");
+    err = RegOpenKeyEx(hlm, StringValuePtr(subkey), 0, KEY_READ, &hpid);
+    if (err != ERROR_SUCCESS)
+        hr = HRESULT_FROM_WIN32(err);
+    else {
+        len = sizeof(clsid);
+        err = RegQueryValueEx(hpid, "", NULL, &dwtype, clsid, &len);
+        if (err == ERROR_SUCCESS && dwtype == REG_SZ) {
+            pbuf  = ole_mb2wc(clsid, -1);
+            hr = CLSIDFromString(pbuf, pclsid);
+            SysFreeString(pbuf);
+        }
+        else {
+            hr = HRESULT_FROM_WIN32(err);
+        }
+        RegCloseKey(hpid);
+    }
+    RegCloseKey(hlm);
+    return hr;
+}
+
+static VALUE
+ole_create_dcom(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE ole, host, others;
+    HRESULT hr;
+    CLSID   clsid;
+    OLECHAR *pbuf;
+
+    COSERVERINFO serverinfo;
+    MULTI_QI multi_qi;
+    DWORD clsctx = CLSCTX_REMOTE_SERVER;
+
+    if (!gole32)
+        gole32 = LoadLibrary("OLE32");
+    if (!gole32)
+        rb_raise(rb_eRuntimeError, "failed to load OLE32");
+    if (!gCoCreateInstanceEx)
+        gCoCreateInstanceEx = (FNCOCREATEINSTANCEEX*)
+            GetProcAddress(gole32, "CoCreateInstanceEx");
+    if (!gCoCreateInstanceEx)
+        rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment");
+    rb_scan_args(argc, argv, "2*", &ole, &host, &others);
+
+    pbuf  = ole_mb2wc(StringValuePtr(ole), -1);
+    hr = CLSIDFromProgID(pbuf, &clsid);
+    if (FAILED(hr))
+        hr = clsid_from_remote(host, ole, &clsid);
+    if (FAILED(hr))
+        hr = CLSIDFromString(pbuf, &clsid);
+    SysFreeString(pbuf);
+    if (FAILED(hr))
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+                  "unknown OLE server: `%s'",
+                  StringValuePtr(ole));
+    memset(&serverinfo, 0, sizeof(COSERVERINFO));    
+    serverinfo.pwszName = ole_mb2wc(StringValuePtr(host), -1);
+    memset(&multi_qi, 0, sizeof(MULTI_QI));
+    multi_qi.pIID = &IID_IDispatch;
+    hr = gCoCreateInstanceEx(&clsid, NULL, clsctx, &serverinfo, 1, &multi_qi);
+    SysFreeString(serverinfo.pwszName);
+    if (FAILED(hr))
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+                  "failed to create DCOM server `%s' in `%s'",
+                  StringValuePtr(ole),
+                  StringValuePtr(host));
+
+    ole_set_member(self, (IDispatch*)multi_qi.pItf);
+    return self;
+}
+
+static VALUE
+ole_bind_obj(moniker, argc, argv, self)
+    VALUE moniker;
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    IBindCtx *pBindCtx;
+    IMoniker *pMoniker;
+    IDispatch *pDispatch;
+    HRESULT hr;
+    OLECHAR *pbuf;
+    ULONG eaten = 0;
+    
+    ole_initialize();
+
+    hr = CreateBindCtx(0, &pBindCtx);
+    if(FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+                  "failed to create bind context");
+    }
+
+    pbuf  = ole_mb2wc(StringValuePtr(moniker), -1);
+    hr = MkParseDisplayName(pBindCtx, pbuf, &eaten, &pMoniker);
+    SysFreeString(pbuf);
+    if(FAILED(hr)) {
+        OLE_RELEASE(pBindCtx);
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
+                  "failed to parse display name of moniker `%s'",
+                  StringValuePtr(moniker));
+    }
+    hr = pMoniker->lpVtbl->BindToObject(pMoniker, pBindCtx, NULL, 
+                                        &IID_IDispatch,
+                                        (void**)&pDispatch);
+    OLE_RELEASE(pMoniker);
+    OLE_RELEASE(pBindCtx);
+
+    if(FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
+                  "failed to bind moniker `%s'",
+                  StringValuePtr(moniker));
+    }
+    return create_win32ole_object(self, pDispatch, argc, argv);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE.connect( ole ) --> aWIN32OLE
+ * 
+ *  Returns running OLE Automation object or WIN32OLE object from moniker.
+ *  1st argument should be OLE program id or class id or moniker.
+ *     
+ *     WIN32OLE.connect('Excel.Application') # => WIN32OLE object which represents running Excel.
+ */
+static VALUE
+fole_s_connect(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE svr_name;
+    VALUE others;
+    HRESULT hr;
+    CLSID   clsid;
+    OLECHAR *pBuf;
+    IDispatch *pDispatch;
+    IUnknown *pUnknown;
+
+    rb_secure(4);
+    /* initialize to use OLE */
+    ole_initialize();
+
+    rb_scan_args(argc, argv, "1*", &svr_name, &others);
+    if (ruby_safe_level > 0 && OBJ_TAINTED(svr_name)) {
+        rb_raise(rb_eSecurityError, "Insecure Object Connection - %s",
+                 StringValuePtr(svr_name));
+    }
+
+    /* get CLSID from OLE server name */
+    pBuf  = ole_mb2wc(StringValuePtr(svr_name), -1);
+    hr = CLSIDFromProgID(pBuf, &clsid);
+    if(FAILED(hr)) {
+        hr = CLSIDFromString(pBuf, &clsid);
+    }
+    SysFreeString(pBuf);
+    if(FAILED(hr)) {
+        return ole_bind_obj(svr_name, argc, argv, self);
+    }
+
+    hr = GetActiveObject(&clsid, 0, &pUnknown);
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+                  "OLE server `%s' not running", StringValuePtr(svr_name));
+    }
+    hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch,
+                                             (void **)&pDispatch);
+    if(FAILED(hr)) {
+        OLE_RELEASE(pUnknown);
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+                  "failed to create WIN32OLE server `%s'", 
+                  StringValuePtr(svr_name));
+    }
+
+    OLE_RELEASE(pUnknown);
+
+    return create_win32ole_object(self, pDispatch, argc, argv);
+}
+
+/* 
+ *  call-seq:
+ *     WIN32OLE.const_load( ole, mod = WIN32OLE)
+ * 
+ *  Defines the constants of OLE Automation server as mod's constants.
+ *  The first argument is WIN32OLE object or type library name.
+ *  If 2nd argument is omitted, the default is WIN32OLE.
+ *  The first letter of Ruby's constant variable name is upper case,
+ *  so constant variable name of WIN32OLE object is capitalized.
+ *  For example, the 'xlTop' constant of Excel is changed to 'XlTop' 
+ *  in WIN32OLE.
+ *  If the first letter of constant variabl is not [A-Z], then
+ *  the constant is defined as CONSTANTS hash element.
+ *
+ *     module EXCEL_CONST
+ *     end
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     WIN32OLE.const_load(excel, EXCEL_CONST)
+ *     puts EXCEL_CONST::XlTop # => -4160
+ *     puts EXCEL_CONST::CONSTANTS['_xlDialogChartSourceData'] # => 541
+ *     
+ *     WIN32OLE.const_load(excel)
+ *     puts WIN32OLE::XlTop # => -4160
+ *
+ *     module MSO
+ *     end
+ *     WIN32OLE.const_load('Microsoft Office 9.0 Object Library', MSO)
+ *     puts MSO::MsoLineSingle # => 1
+ */
+static VALUE
+fole_s_const_load(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE ole;
+    VALUE klass;
+    struct oledata *pole;
+    ITypeInfo *pTypeInfo;
+    ITypeLib *pTypeLib;
+    unsigned int index;
+    HRESULT hr;
+    OLECHAR *pBuf;
+    VALUE file;
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
+    
+    rb_secure(4);
+    rb_scan_args(argc, argv, "11", &ole, &klass);
+    if (TYPE(klass) != T_CLASS &&
+        TYPE(klass) != T_MODULE &&
+        TYPE(klass) != T_NIL) {
+        rb_raise(rb_eTypeError, "2nd parameter must be Class or Module");
+    }
+    if (rb_obj_is_kind_of(ole, cWIN32OLE)) {
+        OLEData_Get_Struct(ole, pole);
+        hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
+                                                  0, lcid, &pTypeInfo);
+        if(FAILED(hr)) {
+            ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
+        }
+        hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
+        if(FAILED(hr)) {
+            OLE_RELEASE(pTypeInfo);
+            ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
+        }
+        OLE_RELEASE(pTypeInfo);
+        if(TYPE(klass) != T_NIL) {
+            ole_const_load(pTypeLib, klass, self);
+        }
+        else {
+            ole_const_load(pTypeLib, cWIN32OLE, self);
+        }
+        OLE_RELEASE(pTypeLib);
+    }
+    else if(TYPE(ole) == T_STRING) {
+        file = typelib_file(ole);
+        if (file == Qnil) {
+            file = ole;
+        }
+        pBuf = ole_mb2wc(StringValuePtr(file), -1);
+        hr = LoadTypeLibEx(pBuf, REGKIND_NONE, &pTypeLib);
+        SysFreeString(pBuf);
+        if (FAILED(hr))
+            ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
+        if(TYPE(klass) != T_NIL) {
+            ole_const_load(pTypeLib, klass, self);
+        }
+        else {
+            ole_const_load(pTypeLib, cWIN32OLE, self);
+        }
+        OLE_RELEASE(pTypeLib);
+    }
+    else {
+        rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE instance");
+    }
+    return Qnil;
+}
+
+static VALUE
+ole_classes_from_typelib(pTypeLib, classes)
+    ITypeLib *pTypeLib;
+    VALUE classes;
+{
+    
+    long count;
+    int i;
+    HRESULT hr;
+    BSTR bstr;
+    ITypeInfo *pTypeInfo;
+    VALUE type;
+  
+    rb_secure(4);
+    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
+    for (i = 0; i < count; i++) {
+        hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
+                                                &bstr, NULL, NULL, NULL);
+        if (FAILED(hr)) 
+            continue;
+
+        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo);
+        if (FAILED(hr))
+            continue;
+
+        type = foletype_s_allocate(cWIN32OLE_TYPE);
+        oletype_set_member(type, pTypeInfo, WC2VSTR(bstr));
+
+        rb_ary_push(classes, type);
+        OLE_RELEASE(pTypeInfo);
+    }
+    return classes;
+}
+
+static ULONG
+reference_count(pole)
+    struct oledata * pole;
+{
+    ULONG n = 0;
+    if(pole->pDispatch) {
+        OLE_ADDREF(pole->pDispatch);
+        n = OLE_RELEASE(pole->pDispatch);
+    }
+    return n;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE.ole_reference_count(aWIN32OLE) --> number
+ * 
+ *  Returns reference counter of Dispatch interface of WIN32OLE object. 
+ *  You should not use this method because this method
+ *  exists only for debugging WIN32OLE.
+ */
+static VALUE
+fole_s_reference_count(self, obj)
+    VALUE self;
+    VALUE obj;
+{
+    struct oledata * pole;
+    OLEData_Get_Struct(obj, pole);
+    return INT2NUM(reference_count(pole));
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE.ole_free(aWIN32OLE) --> number
+ * 
+ *  Invokes Release method of Dispatch interface of WIN32OLE object. 
+ *  You should not use this method because this method
+ *  exists only for debugging WIN32OLE.
+ *  The return value is reference counter of OLE object.
+ */
+static VALUE
+fole_s_free(self, obj)
+    VALUE self;
+    VALUE obj;
+{
+    ULONG n = 0;
+    struct oledata * pole;
+    OLEData_Get_Struct(obj, pole);
+    if(pole->pDispatch) {
+        if (reference_count(pole) > 0) {
+            n = OLE_RELEASE(pole->pDispatch);
+        }
+    }
+    return INT2NUM(n);
+}
+
+static HWND
+ole_show_help(helpfile, helpcontext)
+    VALUE helpfile;
+    VALUE helpcontext;
+{
+    FNHTMLHELP *pfnHtmlHelp;
+    HWND hwnd = 0;
+
+    if(!ghhctrl)
+        ghhctrl = LoadLibrary("HHCTRL.OCX");
+    if (!ghhctrl)
+        return hwnd;
+    pfnHtmlHelp = (FNHTMLHELP*)GetProcAddress(ghhctrl, "HtmlHelpA");
+    if (!pfnHtmlHelp)
+        return hwnd;
+    hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile), 
+                    0x0f, NUM2INT(helpcontext));
+    if (hwnd == 0)
+        hwnd = pfnHtmlHelp(GetDesktopWindow(), StringValuePtr(helpfile), 
+                 0,  NUM2INT(helpcontext));
+    return hwnd;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE.ole_show_help(obj [,helpcontext])
+ * 
+ *  Displays helpfile. The 1st argument specifies WIN32OLE_TYPE
+ *  object or WIN32OLE_METHOD object or helpfile.
+ *
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     typeobj = excel.ole_type
+ *     WIN32OLE.ole_show_help(typeobj)
+ */
+static VALUE
+fole_s_show_help(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE target;
+    VALUE helpcontext;
+    VALUE helpfile;
+    VALUE name;
+    HWND  hwnd;
+    rb_scan_args(argc, argv, "11", &target, &helpcontext);
+    if (rb_obj_is_kind_of(target, cWIN32OLE_TYPE) ||
+        rb_obj_is_kind_of(target, cWIN32OLE_METHOD)) {
+        helpfile = rb_funcall(target, rb_intern("helpfile"), 0);
+        if(strlen(StringValuePtr(helpfile)) == 0) {
+            name = rb_ivar_get(target, rb_intern("name"));
+            rb_raise(rb_eRuntimeError, "no helpfile of `%s'",
+                     StringValuePtr(name));
+        }
+        helpcontext = rb_funcall(target, rb_intern("helpcontext"), 0);
+    } else {
+        helpfile = target;
+    }
+    if (TYPE(helpfile) != T_STRING) {
+        rb_raise(rb_eTypeError, "1st parameter must be (String|WIN32OLE_TYPE|WIN32OLE_METHOD)");
+    }
+    hwnd = ole_show_help(helpfile, helpcontext);
+    if(hwnd == 0) {
+        rb_raise(rb_eRuntimeError, "failed to open help file `%s'",
+                 StringValuePtr(helpfile));
+    }
+    return Qnil;
+}
+
+/* 
+ *  call-seq:
+ *     WIN32OLE.codepage
+ * 
+ *  Returns current codepage.
+ *     WIN32OLE.codepage # => WIN32OLE::CP_ACP
+ */
+static VALUE
+fole_s_get_code_page(self)
+    VALUE self;
+{
+    return INT2FIX(cWIN32OLE_cp);
+}
+
+/* 
+ *  call-seq:
+ *     WIN32OLE.codepage = CP
+ * 
+ *  Sets current codepage.
+ *     WIN32OLE.codepage = WIN32OLE::CP_UTF8
+ */
+static VALUE
+fole_s_set_code_page(self, vcp)
+    VALUE self;
+    VALUE vcp;
+{
+    UINT cp = FIX2INT(vcp);
+
+    switch(cp) {
+    case CP_ACP:
+    case CP_OEMCP:
+    case CP_MACCP:
+    case CP_THREAD_ACP:
+    case CP_SYMBOL:
+    case CP_UTF7:
+    case CP_UTF8:
+        cWIN32OLE_cp = cp;
+        break;
+    default:
+        rb_raise(eWIN32OLE_RUNTIME_ERROR, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8");
+        break;
+    }
+
+    /*
+     * Should this method return old codepage?
+     */
+    return Qnil;
+}
+
+/*
+ * Document-class: WIN32OLE
+ *
+ *   <code>WIN32OLE</code> objects represent OLE Automation object in Ruby.
+ */
+
+/*
+ *  call-seq:
+ *     WIN32OLE.new(server, [host]) -> WIN32OLE object
+ * 
+ *  Returns a new WIN32OLE object(OLE Automation object).
+ *  The first argument server specifies OLE Automation server.
+ *  The first argument should be CLSID or PROGID.
+ *  If second argument host specified, then returns OLE Automation 
+ *  object on host. 
+ *
+ *      WIN32OLE.new('Excel.Application') # => Excel OLE Automation WIN32OLE object.
+ *      WIN32OLE.new('{00024500-0000-0000-C000-000000000046}') # => Excel OLE Automation WIN32OLE object.
+ */
+static VALUE
+fole_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE svr_name;
+    VALUE host;
+    VALUE others;
+    HRESULT hr;
+    CLSID   clsid;
+    OLECHAR *pBuf;
+    IDispatch *pDispatch;
+
+    rb_secure(4);
+    rb_call_super(0, 0);
+    rb_scan_args(argc, argv, "11*", &svr_name, &host, &others);
+
+    if (ruby_safe_level > 0 && OBJ_TAINTED(svr_name)) {
+        rb_raise(rb_eSecurityError, "Insecure Object Creation - %s",
+                 StringValuePtr(svr_name));
+    }
+    if (!NIL_P(host)) {
+        if (ruby_safe_level > 0 && OBJ_TAINTED(host)) {
+            rb_raise(rb_eSecurityError, "Insecure Object Creation - %s",
+                     StringValuePtr(svr_name));
+        }
+        return ole_create_dcom(argc, argv, self);
+    }
+
+    /* get CLSID from OLE server name */
+    pBuf  = ole_mb2wc(StringValuePtr(svr_name), -1);
+    hr = CLSIDFromProgID(pBuf, &clsid);
+    if(FAILED(hr)) {
+        hr = CLSIDFromString(pBuf, &clsid);
+    }
+    SysFreeString(pBuf);
+    if(FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+                  "unknown OLE server: `%s'",
+                  StringValuePtr(svr_name));
+    }
+
+    /* get IDispatch interface */
+    hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
+                          &IID_IDispatch, (void**)&pDispatch);
+    if(FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
+                  "failed to create WIN32OLE object from `%s'",
+                  StringValuePtr(svr_name));
+    }
+    
+    ole_set_member(self, pDispatch);
+    return self;
+}
+
+static VALUE
+hash2named_arg(pair, pOp)
+    VALUE pair;
+    struct oleparam* pOp;
+{
+    unsigned int index, i;
+    VALUE key, value;
+    index = pOp->dp.cNamedArgs;
+
+    /*-------------------------------------
+      the data-type of key must be String
+    ---------------------------------------*/
+    key = rb_ary_entry(pair, 0);
+    if(TYPE(key) != T_STRING) {
+        /* clear name of dispatch parameters */
+        for(i = 1; i < index + 1; i++) {
+            SysFreeString(pOp->pNamedArgs[i]);
+        }
+        /* clear dispatch parameters */
+        for(i = 0; i < index; i++ ) {
+            VariantClear(&(pOp->dp.rgvarg[i]));
+        }
+        /* raise an exception */
+        Check_Type(key, T_STRING);
+    }
+
+    /* pNamedArgs[0] is <method name>, so "index + 1" */
+    pOp->pNamedArgs[index + 1] = ole_mb2wc(StringValuePtr(key), -1);
+
+    value = rb_ary_entry(pair, 1);
+    VariantInit(&(pOp->dp.rgvarg[index]));
+    ole_val2variant(value, &(pOp->dp.rgvarg[index]));
+
+    pOp->dp.cNamedArgs += 1;
+    return Qnil;
+}
+
+static VALUE
+set_argv(realargs, beg, end)
+    VARIANTARG* realargs;
+    unsigned int beg, end;
+{
+    VALUE argv = rb_const_get(cWIN32OLE, rb_intern("ARGV"));
+
+    Check_Type(argv, T_ARRAY);
+    rb_ary_clear(argv);
+    while (end-- > beg) {
+        rb_ary_push(argv, ole_variant2val(&realargs[end]));
+        VariantClear(&realargs[end]);
+    }
+    return argv;
+}
+
+static VALUE
+ole_invoke(argc, argv, self, wFlags)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+    USHORT wFlags;
+{
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
+    struct oledata *pole;
+    HRESULT hr;
+    VALUE cmd;
+    VALUE paramS;
+    VALUE param;
+    VALUE obj;
+    VALUE v;
+
+    BSTR wcmdname;
+
+    DISPID DispID;
+    DISPID* pDispID;
+    EXCEPINFO excepinfo;
+    VARIANT result;
+    VARIANTARG* realargs = NULL;
+    unsigned int argErr = 0;
+    unsigned int i;
+    unsigned int cNamedArgs;
+    int n;
+    struct oleparam op;
+    memset(&excepinfo, 0, sizeof(EXCEPINFO));
+
+    VariantInit(&result);
+
+    op.dp.rgvarg = NULL;
+    op.dp.rgdispidNamedArgs = NULL;
+    op.dp.cNamedArgs = 0;
+    op.dp.cArgs = 0;
+
+    rb_scan_args(argc, argv, "1*", &cmd, &paramS);
+    OLEData_Get_Struct(self, pole);
+    if(!pole->pDispatch) {
+        rb_raise(rb_eRuntimeError, "failed to get dispatch interface");
+    }
+    wcmdname = ole_mb2wc(StringValuePtr(cmd), -1);
+    hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
+                                                 &wcmdname, 1, lcid, &DispID);
+    SysFreeString(wcmdname);
+    if(FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+                  "unknown property or method `%s'",
+                  StringValuePtr(cmd));
+    }
+
+    /* pick up last argument of method */
+    param = rb_ary_entry(paramS, argc-2);
+
+    op.dp.cNamedArgs = 0;
+
+    /* if last arg is hash object */
+    if(TYPE(param) == T_HASH) {
+        /*------------------------------------------ 
+          hash object ==> named dispatch parameters 
+        --------------------------------------------*/
+        cNamedArgs = NUM2INT(rb_funcall(param, rb_intern("length"), 0));
+        op.dp.cArgs = cNamedArgs + argc - 2;
+        op.pNamedArgs = ALLOCA_N(OLECHAR*, cNamedArgs + 1);
+        op.dp.rgvarg = ALLOCA_N(VARIANTARG, op.dp.cArgs);
+        rb_iterate(rb_each, param, hash2named_arg, (VALUE)&op);
+
+        pDispID = ALLOCA_N(DISPID, cNamedArgs + 1);
+        op.pNamedArgs[0] = ole_mb2wc(StringValuePtr(cmd), -1);
+        hr = pole->pDispatch->lpVtbl->GetIDsOfNames(pole->pDispatch,
+                                                    &IID_NULL,
+                                                    op.pNamedArgs,
+                                                    op.dp.cNamedArgs + 1,
+                                                    lcid, pDispID);
+        for(i = 0; i < op.dp.cNamedArgs + 1; i++) {
+            SysFreeString(op.pNamedArgs[i]);
+            op.pNamedArgs[i] = NULL;
+        }
+        if(FAILED(hr)) {
+            /* clear dispatch parameters */
+            for(i = 0; i < op.dp.cArgs; i++ ) {
+                VariantClear(&op.dp.rgvarg[i]);
+            }
+            ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+                      "failed to get named argument info: `%s'",
+                      StringValuePtr(cmd));
+        }
+        op.dp.rgdispidNamedArgs = &(pDispID[1]);
+    }
+    else {
+        cNamedArgs = 0;
+        op.dp.cArgs = argc - 1;
+        op.pNamedArgs = ALLOCA_N(OLECHAR*, cNamedArgs + 1);
+        if (op.dp.cArgs > 0) {
+            op.dp.rgvarg  = ALLOCA_N(VARIANTARG, op.dp.cArgs);
+        }
+    }
+    /*--------------------------------------
+      non hash args ==> dispatch parameters 
+     ----------------------------------------*/
+    if(op.dp.cArgs > cNamedArgs) {
+        realargs = ALLOCA_N(VARIANTARG, op.dp.cArgs-cNamedArgs+1);
+        for(i = cNamedArgs; i < op.dp.cArgs; i++) {
+            n = op.dp.cArgs - i + cNamedArgs - 1;
+            VariantInit(&realargs[n]);
+            VariantInit(&op.dp.rgvarg[n]);
+            param = rb_ary_entry(paramS, i-cNamedArgs);
+            
+             ole_val2variant(param, &realargs[n]);
+            V_VT(&op.dp.rgvarg[n]) = VT_VARIANT | VT_BYREF;
+             V_VARIANTREF(&op.dp.rgvarg[n]) = &realargs[n];
+
+        }
+    }
+    /* apparent you need to call propput, you need this */
+    if (wFlags & DISPATCH_PROPERTYPUT) {
+        if (op.dp.cArgs == 0)
+            return ResultFromScode(E_INVALIDARG);
+
+        op.dp.cNamedArgs = 1;
+        op.dp.rgdispidNamedArgs = ALLOCA_N( DISPID, 1 );
+        op.dp.rgdispidNamedArgs[0] = DISPID_PROPERTYPUT;
+    }
+    
+    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
+                                         &IID_NULL, lcid, wFlags, &op.dp, 
+                                         &result, &excepinfo, &argErr);
+    if (FAILED(hr)) {
+        /* retry to call args by value */
+        if(op.dp.cArgs > cNamedArgs) {
+            for(i = cNamedArgs; i < op.dp.cArgs; i++) {
+                n = op.dp.cArgs - i + cNamedArgs - 1;
+                param = rb_ary_entry(paramS, i-cNamedArgs);
+                ole_val2variant(param, &op.dp.rgvarg[n]);
+            }
+            memset(&excepinfo, 0, sizeof(EXCEPINFO));
+            VariantInit(&result);
+            hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
+                                                 &IID_NULL, lcid, wFlags,
+                                                 &op.dp, &result,
+                                                 &excepinfo, &argErr);
+
+            /* mega kludge. if a method in WORD is called and we ask
+             * for a result when one is not returned then
+             * hResult == DISP_E_EXCEPTION. this only happens on
+             * functions whose DISPID > 0x8000 */
+            if ((hr == DISP_E_EXCEPTION || hr == DISP_E_MEMBERNOTFOUND) && DispID > 0x8000) {
+                memset(&excepinfo, 0, sizeof(EXCEPINFO));
+                hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
+                        &IID_NULL, lcid, wFlags,
+                        &op.dp, NULL,
+                        &excepinfo, &argErr);
+            }
+            for(i = cNamedArgs; i < op.dp.cArgs; i++) {
+                n = op.dp.cArgs - i + cNamedArgs - 1;
+                VariantClear(&op.dp.rgvarg[n]);
+            }
+        }
+        if (FAILED(hr)) {
+            /* retry after converting nil to VT_EMPTY */
+            if (op.dp.cArgs > cNamedArgs) {
+                for(i = cNamedArgs; i < op.dp.cArgs; i++) {
+                    n = op.dp.cArgs - i + cNamedArgs - 1;
+                    param = rb_ary_entry(paramS, i-cNamedArgs);
+                    ole_val2variant2(param, &op.dp.rgvarg[n]);
+                }
+                memset(&excepinfo, 0, sizeof(EXCEPINFO));
+                VariantInit(&result);
+                hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
+                        &IID_NULL, lcid, wFlags,
+                        &op.dp, &result,
+                        &excepinfo, &argErr);
+                for(i = cNamedArgs; i < op.dp.cArgs; i++) {
+                    n = op.dp.cArgs - i + cNamedArgs - 1;
+                    VariantClear(&op.dp.rgvarg[n]);
+                }
+            }
+        }
+
+    }
+    /* clear dispatch parameter */
+    if(op.dp.cArgs > cNamedArgs) {
+        set_argv(realargs, cNamedArgs, op.dp.cArgs);
+    }
+    else {
+        for(i = 0; i < op.dp.cArgs; i++) {
+            VariantClear(&op.dp.rgvarg[i]);
+        }
+    }
+
+    if (FAILED(hr)) {
+        v = ole_excepinfo2msg(&excepinfo);
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "%s%s",
+                  StringValuePtr(cmd), StringValuePtr(v));
+    }
+    obj = ole_variant2val(&result);
+    VariantClear(&result);
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE#invoke(method, [arg1,...])  => return value of method.
+ *
+ *  Runs OLE method. 
+ *  The first argument specifies the method name of OLE Automation object.
+ *  The others specify argument of the <i>method</i>.
+ *  If you can not execute <i>method</i> directly, then use this method instead.
+ *
+ *    excel = WIN32OLE.new('Excel.Application')
+ *    excel.invoke('Quit')  # => same as excel.Quit
+ *
+ */
+static VALUE
+fole_invoke(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET);
+}
+
+static VALUE
+ole_invoke2(self, dispid, args, types, dispkind)
+    VALUE self;
+    VALUE dispid;
+    VALUE args;
+    VALUE types;
+    USHORT dispkind;
+{
+    HRESULT hr;
+    struct oledata *pole;
+    unsigned int argErr = 0;
+    EXCEPINFO excepinfo;
+    VARIANT result;
+    DISPPARAMS dispParams;
+    VARIANTARG* realargs = NULL;
+    int i, j;
+    VALUE obj = Qnil;
+    VALUE tp, param;
+    VALUE v;
+    VARTYPE vt;
+
+    Check_Type(args, T_ARRAY);
+    Check_Type(types, T_ARRAY);
+    
+    memset(&excepinfo, 0, sizeof(EXCEPINFO));
+    memset(&dispParams, 0, sizeof(DISPPARAMS));
+    VariantInit(&result);
+    OLEData_Get_Struct(self, pole);
+
+    dispParams.cArgs = RARRAY(args)->len;
+    dispParams.rgvarg = ALLOCA_N(VARIANTARG, dispParams.cArgs);
+    realargs = ALLOCA_N(VARIANTARG, dispParams.cArgs);
+    for (i = 0, j = dispParams.cArgs - 1; i < (int)dispParams.cArgs; i++, j--)
+    {
+        VariantInit(&realargs[i]);
+        VariantInit(&dispParams.rgvarg[i]);
+        tp = rb_ary_entry(types, j);
+        vt = (VARTYPE)FIX2INT(tp);
+        V_VT(&dispParams.rgvarg[i]) = vt;
+        param = rb_ary_entry(args, j);
+        if (param == Qnil)
+        {
+
+            V_VT(&dispParams.rgvarg[i]) = V_VT(&realargs[i]) = VT_ERROR;
+            V_ERROR(&dispParams.rgvarg[i]) = V_ERROR(&realargs[i]) = DISP_E_PARAMNOTFOUND;
+        }
+        else
+        {
+            if (vt & VT_ARRAY)
+            {
+                int ent;
+                LPBYTE pb;
+                short* ps;
+                LPLONG pl;
+                VARIANT* pv;
+                CY *py;
+                VARTYPE v;
+                SAFEARRAYBOUND rgsabound[1];
+                Check_Type(param, T_ARRAY);
+                rgsabound[0].lLbound = 0;
+                rgsabound[0].cElements = RARRAY(param)->len;
+                v = vt & ~(VT_ARRAY | VT_BYREF);
+                V_ARRAY(&realargs[i]) = SafeArrayCreate(v, 1, rgsabound);
+                V_VT(&realargs[i]) = VT_ARRAY | v;
+                SafeArrayLock(V_ARRAY(&realargs[i]));
+                pb = V_ARRAY(&realargs[i])->pvData;
+                ps = V_ARRAY(&realargs[i])->pvData;
+                pl = V_ARRAY(&realargs[i])->pvData;
+                py = V_ARRAY(&realargs[i])->pvData;
+                pv = V_ARRAY(&realargs[i])->pvData;
+                for (ent = 0; ent < (int)rgsabound[0].cElements; ent++)
+                {
+                    VARIANT velem;
+                    VALUE elem = rb_ary_entry(param, ent);
+                    ole_val2variant(elem, &velem);
+                    if (v != VT_VARIANT)
+                    {
+                        VariantChangeTypeEx(&velem, &velem,
+                            LOCALE_SYSTEM_DEFAULT, 0, v);
+                    }
+                    switch (v)
+                    {
+                    /* 128 bits */
+                    case VT_VARIANT:
+                        *pv++ = velem;
+                        break;
+                    /* 64 bits */
+                    case VT_R8:
+                    case VT_CY:
+                    case VT_DATE:
+                        *py++ = V_CY(&velem);
+                        break;
+                    /* 16 bits */
+                    case VT_BOOL:
+                    case VT_I2:
+                    case VT_UI2:
+                        *ps++ = V_I2(&velem);
+                        break;
+                    /* 8 bites */
+                    case VT_UI1:
+                    case VT_I1:
+                        *pb++ = V_UI1(&velem);
+                        break;
+                    /* 32 bits */
+                    default:
+                        *pl++ = V_I4(&velem);
+                        break;
+                    }
+                }
+                SafeArrayUnlock(V_ARRAY(&realargs[i]));
+            }
+            else
+            {
+                ole_val2variant(param, &realargs[i]);
+                if ((vt & (~VT_BYREF)) != VT_VARIANT)
+                {
+                    hr = VariantChangeTypeEx(&realargs[i], &realargs[i],
+                                             LOCALE_SYSTEM_DEFAULT, 0,
+                                             (VARTYPE)(vt & (~VT_BYREF)));
+                    if (hr != S_OK)
+                    {
+                        rb_raise(rb_eTypeError, "not valid value");
+                    }
+                }
+            }
+            if ((vt & VT_BYREF) || vt == VT_VARIANT)
+            {
+                if (vt == VT_VARIANT)
+                    V_VT(&dispParams.rgvarg[i]) = VT_VARIANT | VT_BYREF;
+                switch (vt & (~VT_BYREF))
+                {
+                /* 128 bits */
+                case VT_VARIANT:
+                    V_VARIANTREF(&dispParams.rgvarg[i]) = &realargs[i];
+                    break;
+                /* 64 bits */
+                case VT_R8:
+                case VT_CY:
+                case VT_DATE:
+                    V_CYREF(&dispParams.rgvarg[i]) = &V_CY(&realargs[i]);
+                    break;
+                /* 16 bits */
+                case VT_BOOL:
+                case VT_I2:
+                case VT_UI2:
+                    V_I2REF(&dispParams.rgvarg[i]) = &V_I2(&realargs[i]);
+                    break;
+                /* 8 bites */
+                case VT_UI1:
+                case VT_I1:
+                    V_UI1REF(&dispParams.rgvarg[i]) = &V_UI1(&realargs[i]);
+                    break;
+                /* 32 bits */
+                default:
+                    V_I4REF(&dispParams.rgvarg[i]) = &V_I4(&realargs[i]);
+                    break;
+                }
+            }
+            else
+            {
+                /* copy 64 bits of data */
+                V_CY(&dispParams.rgvarg[i]) = V_CY(&realargs[i]);
+            }
+        }
+    }
+
+    if (dispkind & DISPATCH_PROPERTYPUT) {
+        dispParams.cNamedArgs = 1;
+        dispParams.rgdispidNamedArgs = ALLOCA_N( DISPID, 1 );
+        dispParams.rgdispidNamedArgs[0] = DISPID_PROPERTYPUT;
+    }
+
+    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, NUM2INT(dispid),
+                                         &IID_NULL, LOCALE_SYSTEM_DEFAULT,
+                                         dispkind,
+                                         &dispParams, &result,
+                                         &excepinfo, &argErr);
+
+    if (FAILED(hr)) {
+        v = ole_excepinfo2msg(&excepinfo);
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "_invoke %s",
+                  StringValuePtr(v));
+    }
+
+    /* clear dispatch parameter */
+    if(dispParams.cArgs > 0) {
+        set_argv(realargs, 0, dispParams.cArgs);
+    }
+
+    obj = ole_variant2val(&result);
+    VariantClear(&result);
+    return obj;
+}
+
+/*
+ *   call-seq:
+ *      WIN32OLE#_invoke(dispid, args, types)
+ * 
+ *   Runs the early binding method.
+ *   The 1st argument specifies dispatch ID, 
+ *   the 2nd argument specifies the array of arguments,
+ *   the 3rd argument specifies the array of the type of arguments.
+ *
+ *      excel = WIN32OLE.new('Excel.Application')
+ *      excel._invoke(302, [], []) #  same effect as excel.Quit
+ */
+static VALUE
+fole_invoke2(self, dispid, args, types)
+    VALUE self;
+    VALUE dispid;
+    VALUE args;
+    VALUE types;
+{
+    return ole_invoke2(self, dispid, args, types, DISPATCH_METHOD);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE#_getproperty(dispid, args, types)
+ * 
+ *  Runs the early binding method to get property.
+ *  The 1st argument specifies dispatch ID, 
+ *  the 2nd argument specifies the array of arguments,
+ *  the 3rd argument specifies the array of the type of arguments.
+ *
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     puts excel._getproperty(558, [], []) # same effect as puts excel.visible
+ */
+static VALUE
+fole_getproperty2(self, dispid, args, types)
+    VALUE self;
+    VALUE dispid;
+    VALUE args;
+    VALUE types;
+{
+    return ole_invoke2(self, dispid, args, types, DISPATCH_PROPERTYGET);
+}
+
+/*
+ *   call-seq:
+ *      WIN32OLE#_setproperty(dispid, args, types)
+ * 
+ *   Runs the early binding method to set property.
+ *   The 1st argument specifies dispatch ID, 
+ *   the 2nd argument specifies the array of arguments,
+ *   the 3rd argument specifies the array of the type of arguments.
+ *
+ *      excel = WIN32OLE.new('Excel.Application')
+ *      excel._setproperty(558, [true], [WIN32OLE::VARIANT::VT_BOOL]) # same effect as excel.visible = true
+ */
+static VALUE
+fole_setproperty2(self, dispid, args, types)
+    VALUE self;
+    VALUE dispid;
+    VALUE args;
+    VALUE types;
+{
+    return ole_invoke2(self, dispid, args, types, DISPATCH_PROPERTYPUT);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE['property']=val 
+ *     WIN32OLE.setproperty('property', [arg1, arg2,...] val)
+ * 
+ *  Sets property of OLE object.
+ *  When you want to set property with argument, you can use this method.
+ *
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     excel['Visible'] = true
+ *     book = excel.workbooks.add
+ *     sheet = book.worksheets(1)
+ *     sheet.setproperty('Cells', 1, 2, 10) # => The B1 cell value is 10.
+ */
+static VALUE
+fole_setproperty(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE['property'] 
+ * 
+ *  Returns property of OLE object.
+ *
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     puts excel['Visible'] # => false
+ */
+static VALUE
+fole_getproperty(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET);
+}
+
+static VALUE
+ole_propertyput(self, property, value)
+    VALUE self, property, value;
+{
+    struct oledata *pole;
+    unsigned argErr;
+    unsigned int index;
+    HRESULT hr;
+    EXCEPINFO excepinfo;
+    DISPID dispID = DISPID_VALUE;
+    DISPID dispIDParam = DISPID_PROPERTYPUT;
+    USHORT wFlags = DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF;
+    DISPPARAMS dispParams;
+    VARIANTARG propertyValue[2];
+    OLECHAR* pBuf[1];
+    VALUE v;
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
+    dispParams.rgdispidNamedArgs = &dispIDParam;
+    dispParams.rgvarg = propertyValue;
+    dispParams.cNamedArgs = 1;
+    dispParams.cArgs = 1;
+
+    VariantInit(&propertyValue[0]);
+    VariantInit(&propertyValue[1]);
+    memset(&excepinfo, 0, sizeof(excepinfo));
+
+    OLEData_Get_Struct(self, pole);
+
+    /* get ID from property name */
+    pBuf[0]  = ole_mb2wc(StringValuePtr(property), -1);
+    hr = pole->pDispatch->lpVtbl->GetIDsOfNames(pole->pDispatch, &IID_NULL,
+                                                pBuf, 1, lcid, &dispID);
+    SysFreeString(pBuf[0]);
+    pBuf[0] = NULL;
+
+    if(FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+                  "unknown property or method: `%s'",
+                  StringValuePtr(property));
+    }
+    /* set property value */
+    ole_val2variant(value, &propertyValue[0]);
+    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, dispID, &IID_NULL, 
+                                         lcid, wFlags, &dispParams,
+                                         NULL, &excepinfo, &argErr);
+
+    for(index = 0; index < dispParams.cArgs; ++index) {
+        VariantClear(&propertyValue[index]);
+    }
+    if (FAILED(hr)) {
+        v = ole_excepinfo2msg(&excepinfo);
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, StringValuePtr(v));
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE#ole_free
+ *
+ *  invokes Release method of Dispatch interface of WIN32OLE object.
+ *  Usually, you do not need to call this method because Release method
+ *  called automatically when WIN32OLE object garbaged.
+ *
+ */
+static VALUE
+fole_free(self)
+    VALUE self;
+{
+    struct oledata *pole;
+    rb_secure(4);
+    OLEData_Get_Struct(self, pole);
+    OLE_FREE(pole->pDispatch);
+    pole->pDispatch = NULL;
+    return Qnil;
+}
+
+static VALUE
+ole_each_sub(pEnumV)
+    VALUE pEnumV;
+{
+    VARIANT variant;
+    VALUE obj = Qnil;
+    IEnumVARIANT *pEnum = (IEnumVARIANT *)pEnumV;
+    VariantInit(&variant);
+    while(pEnum->lpVtbl->Next(pEnum, 1, &variant, NULL) == S_OK) {
+        obj = ole_variant2val(&variant);
+        VariantClear(&variant);
+        VariantInit(&variant);
+        rb_yield(obj);
+    }
+    return Qnil;
+}
+
+static VALUE
+ole_ienum_free(pEnumV)
+    VALUE pEnumV;
+{
+    IEnumVARIANT *pEnum = (IEnumVARIANT *)pEnumV;
+    OLE_RELEASE(pEnum);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE#each {|i|...}
+ * 
+ *  Iterates over each item of OLE collection which has IEnumVARIANT interface.
+ *
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     book = excel.workbooks.add
+ *     sheets = book.worksheets(1)
+ *     cells = sheets.cells("A1:A5")
+ *     cells.each do |cell|
+ *       cell.value = 10
+ *     end
+ */
+static VALUE
+fole_each(self)
+    VALUE self;
+{
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
+
+    struct oledata *pole;
+
+    unsigned int argErr;
+    EXCEPINFO excepinfo;
+    DISPPARAMS dispParams;
+    VARIANT result;
+    HRESULT hr;
+    IEnumVARIANT *pEnum = NULL;
+
+    VariantInit(&result);
+    dispParams.rgvarg = NULL;
+    dispParams.rgdispidNamedArgs = NULL;
+    dispParams.cNamedArgs = 0;
+    dispParams.cArgs = 0;
+    memset(&excepinfo, 0, sizeof(excepinfo));
+    
+    OLEData_Get_Struct(self, pole);
+    hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DISPID_NEWENUM,
+                                         &IID_NULL, lcid,
+                                         DISPATCH_METHOD | DISPATCH_PROPERTYGET,
+                                         &dispParams, &result,
+                                         &excepinfo, &argErr);
+
+    if (FAILED(hr)) {
+        VariantClear(&result);
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to get IEnum Interface");
+    }
+
+    if (V_VT(&result) == VT_UNKNOWN)
+        hr = V_UNKNOWN(&result)->lpVtbl->QueryInterface(V_UNKNOWN(&result),
+                                                        &IID_IEnumVARIANT,
+                                                        (void**)&pEnum);
+    else if (V_VT(&result) == VT_DISPATCH)
+        hr = V_DISPATCH(&result)->lpVtbl->QueryInterface(V_DISPATCH(&result),
+                                                         &IID_IEnumVARIANT,
+                                                         (void**)&pEnum);
+    if (FAILED(hr) || !pEnum) {
+        VariantClear(&result);
+        ole_raise(hr, rb_eRuntimeError, "failed to get IEnum Interface");
+    }
+
+    VariantClear(&result);
+    rb_ensure(ole_each_sub, (VALUE)pEnum, ole_ienum_free, (VALUE)pEnum);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE#method_missing(id [,arg1, arg2, ...])
+ * 
+ *  Calls WIN32OLE#invoke method.
+ */
+static VALUE
+fole_missing(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    ID id;
+    char* mname;
+    int n;
+    id = rb_to_id(argv[0]);
+    mname = rb_id2name(id);
+    if(!mname) {
+        rb_raise(rb_eRuntimeError, "fail: unknown method or property");
+    }
+    n = strlen(mname);
+    if(mname[n-1] == '=') {
+        argv[0] = rb_str_new(mname, n-1);
+
+        return ole_propertyput(self, argv[0], argv[1]);
+    }
+    else {
+        argv[0] = rb_str_new2(mname);
+        return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET);
+    }
+}
+
+static VALUE
+ole_method_sub(self, pOwnerTypeInfo, pTypeInfo, name)
+    VALUE self;
+    ITypeInfo *pOwnerTypeInfo;
+    ITypeInfo *pTypeInfo;
+    VALUE name;
+{
+    HRESULT hr;
+    TYPEATTR *pTypeAttr;
+    BSTR bstr;
+    FUNCDESC *pFuncDesc;
+    WORD i;
+    VALUE fname;
+    VALUE method = Qnil;
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+    }
+    for(i = 0; i < pTypeAttr->cFuncs && method == Qnil; i++) {
+        hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
+        if (FAILED(hr))
+             continue;
+
+        hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo, pFuncDesc->memid,
+                                                 &bstr, NULL, NULL, NULL);
+        if (FAILED(hr)) {
+            pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+            continue;
+        }
+        fname = WC2VSTR(bstr);
+        if (strcasecmp(StringValuePtr(name), StringValuePtr(fname)) == 0) {
+            olemethod_set_member(self, pTypeInfo, pOwnerTypeInfo, i, fname);
+            method = self;
+        }
+        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+        pFuncDesc=NULL;
+    }
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return method;
+}
+
+static VALUE
+olemethod_from_typeinfo(self, pTypeInfo, name)
+    VALUE self;
+    ITypeInfo *pTypeInfo;
+    VALUE name;
+{
+    HRESULT hr;
+    TYPEATTR *pTypeAttr;
+    WORD i;
+    HREFTYPE href;
+    ITypeInfo *pRefTypeInfo;
+    VALUE method = Qnil;
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+    }
+    method = ole_method_sub(self, 0, pTypeInfo, name);
+    if (method != Qnil) {
+       return method;
+    }
+    for(i=0; i < pTypeAttr->cImplTypes && method == Qnil; i++){
+       hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo, i, &href);
+       if(FAILED(hr))
+           continue;
+       hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, href, &pRefTypeInfo);
+       if (FAILED(hr))
+           continue;
+       method = ole_method_sub(self, pTypeInfo, pRefTypeInfo, name);
+       OLE_RELEASE(pRefTypeInfo);
+    }
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return method;
+}
+
+static VALUE
+ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
+    ITypeInfo *pOwnerTypeInfo;
+    ITypeInfo *pTypeInfo;
+    VALUE     methods;
+    int       mask;
+{
+    HRESULT hr;
+    TYPEATTR *pTypeAttr;
+    BSTR bstr;
+    char *pstr;
+    FUNCDESC *pFuncDesc;
+    VALUE method;
+    WORD i;
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+    }
+    for(i = 0; i < pTypeAttr->cFuncs; i++) {
+        pstr = NULL;
+        hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
+        if (FAILED(hr))
+             continue;
+                 
+        hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo, pFuncDesc->memid,
+                                                 &bstr, NULL, NULL, NULL);
+        if (FAILED(hr)) {
+            pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+            continue;
+        }
+        if(pFuncDesc->invkind & mask) {
+            method = folemethod_s_allocate(cWIN32OLE_METHOD);
+            olemethod_set_member(method, pTypeInfo, pOwnerTypeInfo, 
+                                 i, WC2VSTR(bstr));
+            rb_ary_push(methods, method);
+        }
+        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+        pFuncDesc=NULL;
+    }
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+
+    return methods;
+}
+
+static VALUE
+ole_methods_from_typeinfo(pTypeInfo, mask)
+    ITypeInfo *pTypeInfo;
+    int mask;
+{
+    HRESULT hr;
+    TYPEATTR *pTypeAttr;
+    WORD i;
+    HREFTYPE href;
+    ITypeInfo *pRefTypeInfo;
+    VALUE methods = rb_ary_new();
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+    }
+
+    ole_methods_sub(0, pTypeInfo, methods, mask);
+    for(i=0; i < pTypeAttr->cImplTypes; i++){
+       hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo, i, &href);
+       if(FAILED(hr))
+           continue;
+       hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, href, &pRefTypeInfo);
+       if (FAILED(hr))
+           continue;
+       ole_methods_sub(pTypeInfo, pRefTypeInfo, methods, mask);
+       OLE_RELEASE(pRefTypeInfo);
+    }
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return methods;
+}
+
+static HRESULT
+typeinfo_from_ole(pole, ppti)
+    struct oledata *pole;
+    ITypeInfo **ppti;
+{
+    ITypeInfo *pTypeInfo;
+    ITypeLib *pTypeLib;
+    BSTR bstr;
+    VALUE type;
+    UINT i;
+    UINT count;
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
+    HRESULT hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
+                                                      0, lcid, &pTypeInfo);
+    if(FAILED(hr)) {
+        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
+    }
+    hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo,
+                                             -1,
+                                             &bstr,
+                                             NULL, NULL, NULL);
+    type = WC2VSTR(bstr);
+    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &i);
+    OLE_RELEASE(pTypeInfo);
+    if (FAILED(hr)) {
+        ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
+    }
+    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
+    for (i = 0; i < count; i++) {
+        hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
+                                                &bstr, NULL, NULL, NULL);
+        if (SUCCEEDED(hr) && rb_str_cmp(WC2VSTR(bstr), type) == 0) {
+            hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo);
+            if (SUCCEEDED(hr)) {
+                *ppti = pTypeInfo;
+                break;
+            }
+        }
+    }
+    OLE_RELEASE(pTypeLib);
+    return hr;
+}
+
+static VALUE
+ole_methods(self,mask)
+    VALUE self;
+    int mask;
+{
+    ITypeInfo *pTypeInfo;
+    HRESULT hr;
+    VALUE methods;
+    struct oledata *pole;
+
+    OLEData_Get_Struct(self, pole);
+    methods = rb_ary_new();
+
+    hr = typeinfo_from_ole(pole, &pTypeInfo);
+    if(FAILED(hr))
+        return methods;
+    rb_ary_concat(methods, ole_methods_from_typeinfo(pTypeInfo, mask));
+    OLE_RELEASE(pTypeInfo);
+    return methods;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE#ole_methods
+ * 
+ *  Returns the array of WIN32OLE_METHOD object. 
+ *  The element is OLE method of WIN32OLE object.
+ *
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     methods = excel.ole_methods
+ *     
+ */
+static VALUE
+fole_methods( self )
+    VALUE self;
+{
+    return ole_methods( self, INVOKE_FUNC | INVOKE_PROPERTYGET | INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE#ole_get_methods
+ * 
+ *  Returns the array of WIN32OLE_METHOD object .
+ *  The element of the array is property (gettable) of WIN32OLE object.
+ *
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     properties = excel.ole_get_methods
+ */
+static VALUE
+fole_get_methods( self )
+    VALUE self;
+{
+    return ole_methods( self, INVOKE_PROPERTYGET);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE#ole_put_methods
+ * 
+ *  Returns the array of WIN32OLE_METHOD object .
+ *  The element of the array is property (settable) of WIN32OLE object.
+ *
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     properties = excel.ole_put_methods
+ */
+static VALUE
+fole_put_methods( self )
+    VALUE self;
+{
+    return ole_methods( self, INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE#ole_func_methods
+ * 
+ *  Returns the array of WIN32OLE_METHOD object .
+ *  The element of the array is functional method of WIN32OLE object.
+ *
+ *     excel = WIN32OLE.new('Excel.Application')
+ *     properties = excel.ole_func_methods
+ *
+ */
+static VALUE
+fole_func_methods( self )
+    VALUE self;
+{
+    return ole_methods( self, INVOKE_FUNC);
+}
+
+/*
+ *   call-seq:
+ *      WIN32OLE#ole_obj_help
+ * 
+ *   Returns WIN32OLE_TYPE object.
+ *
+ *      excel = WIN32OLE.new('Excel.Application')
+ *      tobj = excel.ole_obj_help
+ */
+static VALUE
+fole_obj_help( self )
+    VALUE self;
+{
+    unsigned int index;
+    ITypeInfo *pTypeInfo;
+    ITypeLib *pTypeLib;
+    HRESULT hr;
+    struct oledata *pole;
+    BSTR bstr;
+    LCID  lcid = LOCALE_SYSTEM_DEFAULT;
+    VALUE type = Qnil;
+
+    OLEData_Get_Struct(self, pole);
+
+    hr = pole->pDispatch->lpVtbl->GetTypeInfo( pole->pDispatch, 0, lcid, &pTypeInfo );
+    if(FAILED(hr)) {
+        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
+    }
+    hr = pTypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index );
+    if(FAILED(hr)) {
+        OLE_RELEASE(pTypeInfo);
+        ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
+    }
+    hr = pTypeLib->lpVtbl->GetDocumentation( pTypeLib, index,
+                                             &bstr, NULL, NULL, NULL);
+    if (SUCCEEDED(hr)) {
+        type = foletype_s_allocate(cWIN32OLE_TYPE);
+        oletype_set_member(type, pTypeInfo, WC2VSTR(bstr));
+    }
+    OLE_RELEASE(pTypeLib);
+    OLE_RELEASE(pTypeInfo);
+
+    return type;
+}
+
+static HRESULT
+ole_docinfo_from_type(pTypeInfo, name, helpstr, helpcontext, helpfile)
+    ITypeInfo *pTypeInfo;
+    BSTR *name;
+    BSTR *helpstr; 
+    DWORD *helpcontext;
+    BSTR *helpfile;
+{
+    HRESULT hr;
+    ITypeLib *pTypeLib;
+    UINT i;
+
+    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &i);
+    if (FAILED(hr)) {
+        return hr;
+    }
+    
+    hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
+                                            name, helpstr, 
+                                            helpcontext, helpfile);
+    if (FAILED(hr)) {
+        OLE_RELEASE(pTypeLib);
+        return hr;
+    }
+    OLE_RELEASE(pTypeLib);
+    return hr;
+}
+
+static VALUE
+ole_usertype2val(pTypeInfo, pTypeDesc, typedetails)
+    ITypeInfo *pTypeInfo;
+    TYPEDESC *pTypeDesc;
+    VALUE typedetails;
+{
+    HRESULT hr;
+    BSTR bstr;
+    ITypeInfo *pRefTypeInfo;
+    VALUE type = Qnil;
+
+    hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, 
+                                           V_UNION1(pTypeDesc, hreftype),
+                                           &pRefTypeInfo);
+    if(FAILED(hr))
+        return Qnil;
+    hr = ole_docinfo_from_type(pRefTypeInfo, &bstr, NULL, NULL, NULL);
+    if(FAILED(hr)) {
+        OLE_RELEASE(pRefTypeInfo);
+        return Qnil;
+    }
+    OLE_RELEASE(pRefTypeInfo);
+    type = WC2VSTR(bstr);
+    if(typedetails != Qnil)
+        rb_ary_push(typedetails, type);
+    return type;
+}
+
+static VALUE ole_typedesc2val();
+static VALUE
+ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails) 
+    ITypeInfo *pTypeInfo;
+    TYPEDESC *pTypeDesc;
+    VALUE typedetails;
+{    
+    TYPEDESC *p = pTypeDesc;
+    VALUE type = rb_str_new2("");
+    while(p->vt == VT_PTR || p->vt == VT_SAFEARRAY) {
+        p = V_UNION1(p, lptdesc);
+        if(strlen(StringValuePtr(type)) == 0) {
+           type = ole_typedesc2val(pTypeInfo, p, typedetails);
+        } else {
+           rb_str_cat(type, ",", 1);
+           rb_str_concat(type, ole_typedesc2val(pTypeInfo, p, typedetails));
+        }
+    }
+    return type;
+}
+
+static VALUE
+ole_typedesc2val(pTypeInfo, pTypeDesc, typedetails)
+    ITypeInfo *pTypeInfo;
+    TYPEDESC *pTypeDesc;
+    VALUE typedetails;
+{
+    VALUE str;
+    switch(pTypeDesc->vt) {
+    case VT_I2:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("I2"));
+        return rb_str_new2("I2");
+    case VT_I4:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("I4"));
+        return rb_str_new2("I4");
+    case VT_R4:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("R4"));
+        return rb_str_new2("R4");
+    case VT_R8:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("R8"));
+        return rb_str_new2("R8");
+    case VT_CY:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("CY"));
+        return rb_str_new2("CY");
+    case VT_DATE:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("DATE"));
+        return rb_str_new2("DATE");
+    case VT_BSTR:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("BSTR"));
+        return rb_str_new2("BSTR");
+    case VT_BOOL:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("BOOL"));
+        return rb_str_new2("BOOL");
+    case VT_VARIANT:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("VARIANT"));
+        return rb_str_new2("VARIANT");
+    case VT_DECIMAL:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("DECIMAL"));
+        return rb_str_new2("DECIMAL");
+    case VT_I1:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("I1"));
+        return rb_str_new2("I1");
+    case VT_UI1:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("UI1"));
+        return rb_str_new2("UI1");
+    case VT_UI2:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("UI2"));
+        return rb_str_new2("UI2");
+    case VT_UI4:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("UI4"));
+        return rb_str_new2("UI4");
+    case VT_I8:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("I8"));
+        return rb_str_new2("I8");
+    case VT_UI8:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("UI8"));
+        return rb_str_new2("UI8");
+    case VT_INT:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("INT"));
+        return rb_str_new2("INT");
+    case VT_UINT:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("UINT"));
+        return rb_str_new2("UINT");
+    case VT_VOID:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("VOID"));
+        return rb_str_new2("VOID");
+    case VT_HRESULT:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("HRESULT"));
+        return rb_str_new2("HRESULT");
+    case VT_PTR:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("PTR"));
+        return ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails);
+    case VT_SAFEARRAY:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("SAFEARRAY"));
+        return ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails);
+    case VT_CARRAY:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("CARRAY"));
+        return rb_str_new2("CARRAY");
+    case VT_USERDEFINED:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("USERDEFINED"));
+        str = ole_usertype2val(pTypeInfo, pTypeDesc, typedetails);
+        if (str != Qnil) {
+            return str;
+        }
+        return rb_str_new2("USERDEFINED");
+    case VT_UNKNOWN:
+        return rb_str_new2("UNKNOWN");
+    case VT_DISPATCH:
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("DISPATCH"));
+        return rb_str_new2("DISPATCH");
+    default:
+        str = rb_str_new2("Unknown Type ");
+        rb_str_concat(str, rb_fix2str(INT2FIX(pTypeDesc->vt), 10));
+        return str;
+    }
+}
+
+/*
+ *   call-seq:
+ *      WIN32OLE#ole_method_help(method)
+ * 
+ *   Returns WIN32OLE_METHOD object corresponding with method 
+ *   specified by 1st argument.
+ *
+ *      excel = WIN32OLE.new('Excel.Application')
+ *      method = excel.ole_method_help('Quit')
+ *
+ */
+static VALUE
+fole_method_help( self, cmdname )
+    VALUE self;
+    VALUE cmdname;
+{
+    ITypeInfo *pTypeInfo;
+    HRESULT hr;
+    struct oledata *pole;
+    VALUE method, obj;
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
+
+    Check_SafeStr(cmdname);
+    OLEData_Get_Struct(self, pole);
+    hr = typeinfo_from_ole(pole, &pTypeInfo);
+    if(FAILED(hr))
+        ole_raise(hr, rb_eRuntimeError, "failed to get ITypeInfo");
+    method = folemethod_s_allocate(cWIN32OLE_METHOD);
+    obj = olemethod_from_typeinfo(method, pTypeInfo, cmdname);
+    OLE_RELEASE(pTypeInfo);
+    if (obj == Qnil)
+        rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s",
+                 StringValuePtr(cmdname));
+    return obj;
+}
+
+/*
+ *   call-seq:
+ *      WIN32OLE_TYPE.ole_classes(typelib)
+ * 
+ *   Returns array of WIN32OLE_TYPE objects defined by the <i>typelib</i> type library.
+ */
+static VALUE
+foletype_s_ole_classes(self, typelib)
+    VALUE self;
+    VALUE typelib;
+{
+    VALUE file, classes;
+    OLECHAR * pbuf;
+    ITypeLib *pTypeLib;
+    HRESULT hr;
+
+    rb_secure(4);
+    classes = rb_ary_new();
+    if(TYPE(typelib) == T_STRING) {
+        file = typelib_file(typelib);
+        if (file == Qnil) {
+            file = typelib;
+        }
+        pbuf = ole_mb2wc(StringValuePtr(file), -1);
+        hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
+        if (FAILED(hr))
+          ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
+        SysFreeString(pbuf);
+        ole_classes_from_typelib(pTypeLib, classes);
+        OLE_RELEASE(pTypeLib);
+    } else {
+        rb_raise(rb_eTypeError, "1st argument should be TypeLib string");
+    }
+    return classes;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE.typelibs
+ * 
+ *  Returns array of type libraries.
+ *
+ */
+static VALUE
+foletype_s_typelibs(self)
+    VALUE self;
+{
+    HKEY htypelib, hclsid;
+    double fversion;
+    DWORD i, j;
+    LONG err;
+    VALUE clsid;
+    VALUE ver;
+    VALUE v = Qnil;
+    VALUE typelibs = rb_ary_new();
+
+    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
+    if(err != ERROR_SUCCESS) {
+        return typelibs;
+    }
+    for(i = 0; ; i++) {
+        clsid = reg_enum_key(htypelib, i);
+        if (clsid == Qnil)
+            break;
+        err = reg_open_vkey(htypelib, clsid, &hclsid);
+        if (err != ERROR_SUCCESS)
+            continue;
+        fversion = 0;
+        for(j = 0; ; j++) {
+            ver = reg_enum_key(hclsid, j);
+            if (ver == Qnil)
+                break;
+            if (fversion > atof(StringValuePtr(ver)))
+                continue;
+            fversion = atof(StringValuePtr(ver));
+            if ( (v = reg_get_val(hclsid, StringValuePtr(ver))) != Qnil ) {
+                rb_ary_push(typelibs, v);
+            }
+        }
+        RegCloseKey(hclsid);
+    }
+    RegCloseKey(htypelib);
+    return typelibs;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE.progids
+ * 
+ *  Returns array of ProgID.
+ */
+static VALUE
+foletype_s_progids(self)
+    VALUE self;
+{
+    HKEY hclsids, hclsid;
+    DWORD i;
+    LONG err;
+    VALUE clsid;
+    VALUE v = rb_str_new2("");
+    VALUE progids = rb_ary_new();
+
+    err = reg_open_key(HKEY_CLASSES_ROOT, "CLSID", &hclsids);
+    if(err != ERROR_SUCCESS) {
+        return progids;
+    }
+    for(i = 0; ; i++) {
+        clsid = reg_enum_key(hclsids, i);
+        if (clsid == Qnil)
+            break;
+        err = reg_open_vkey(hclsids, clsid, &hclsid);
+        if (err != ERROR_SUCCESS)
+            continue;
+        if ((v = reg_get_val(hclsid, "ProgID")) != Qnil) 
+            rb_ary_push(progids, v);
+        if ((v = reg_get_val(hclsid, "VersionIndependentProgID")) != Qnil)
+            rb_ary_push(progids, v);
+        RegCloseKey(hclsid);
+    }
+    RegCloseKey(hclsids);
+    return progids;
+}
+
+static VALUE
+foletype_s_allocate(klass)
+    VALUE klass;
+{
+    struct oletypedata *poletype;
+    VALUE obj;
+    ole_initialize();
+    obj = Data_Make_Struct(klass,struct oletypedata,0,oletype_free,poletype);
+    poletype->pTypeInfo = NULL;
+    return obj;
+}
+
+static VALUE
+oletype_set_member(self, pTypeInfo, name)
+    VALUE self;
+    ITypeInfo *pTypeInfo;
+    VALUE name;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    rb_ivar_set(self, rb_intern("name"), name);
+    ptype->pTypeInfo = pTypeInfo;
+    if(pTypeInfo) OLE_ADDREF(pTypeInfo);
+    return self;
+}
+
+static VALUE
+oleclass_from_typelib(self, pTypeLib, oleclass)
+    VALUE self;
+    ITypeLib *pTypeLib;
+    VALUE oleclass;
+{
+    
+    long count;
+    int i;
+    HRESULT hr;
+    BSTR bstr;
+    VALUE typelib;
+    ITypeInfo *pTypeInfo;
+
+    VALUE found = Qfalse;
+  
+    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
+    for (i = 0; i < count && found == Qfalse; i++) {
+        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo);
+        if (FAILED(hr))
+            continue;
+        hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, i,
+                                                &bstr, NULL, NULL, NULL);
+        if (FAILED(hr)) 
+            continue;
+        typelib = WC2VSTR(bstr);
+        if (rb_str_cmp(oleclass, typelib) == 0) {
+            oletype_set_member(self, pTypeInfo, typelib);
+            found = Qtrue;
+        }
+        OLE_RELEASE(pTypeInfo);
+    }
+    return found;
+}
+
+/*
+ * Document-class: WIN32OLE_TYPE
+ *
+ *   <code>WIN32OLE_TYPE</code> objects represent OLE type libarary information.
+ */
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE.new(typelib, ole_class) -> WIN32OLE_TYPE object
+ *
+ *  Returns a new WIN32OLE_TYPE object.
+ *  The first argument <i>typelib</i> specifies OLE type library name.
+ *  The second argument specifies OLE class name.
+ *
+ *      WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application') 
+ *          # => WIN32OLE_TYPE object of Application class of Excel. 
+ */
+static VALUE
+foletype_initialize(self, typelib, oleclass)
+    VALUE self;
+    VALUE typelib;
+    VALUE oleclass;
+{
+    VALUE file;
+    OLECHAR * pbuf;
+    ITypeLib *pTypeLib;
+    HRESULT hr;
+
+    Check_SafeStr(oleclass);
+    Check_SafeStr(typelib);
+    file = typelib_file(typelib);
+    if (file == Qnil) {
+        file = typelib;
+    }
+    pbuf = ole_mb2wc(StringValuePtr(file), -1);
+    hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
+    if (FAILED(hr))
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
+    SysFreeString(pbuf);
+    if (oleclass_from_typelib(self, pTypeLib, oleclass) == Qfalse) {
+        OLE_RELEASE(pTypeLib);
+        rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found `%s` in `%s`",
+                 StringValuePtr(oleclass), StringValuePtr(typelib));
+    }
+    OLE_RELEASE(pTypeLib);
+    return self;
+}
+
+/*
+ * call-seq:
+ *    WIN32OLE_TYPE#name #=> OLE type name
+ *
+ * Returns OLE type name.
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application') 
+ *    puts tobj.name  # => Application
+ */
+static VALUE
+foletype_name(self)
+    VALUE self;
+{
+    return rb_ivar_get(self, rb_intern("name"));
+}
+
+static VALUE
+ole_ole_type(pTypeInfo)
+    ITypeInfo *pTypeInfo;
+{
+    HRESULT hr;
+    TYPEATTR *pTypeAttr;
+    VALUE type = Qnil;
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if(FAILED(hr)){
+        return type;
+    }
+    switch(pTypeAttr->typekind) {
+    case TKIND_ENUM:
+        type = rb_str_new2("Enum");
+        break;
+    case TKIND_RECORD:
+        type = rb_str_new2("Record");
+        break;
+    case TKIND_MODULE:
+        type = rb_str_new2("Module");
+        break;
+    case TKIND_INTERFACE:
+        type = rb_str_new2("Interface");
+        break;
+    case TKIND_DISPATCH:
+        type = rb_str_new2("Dispatch");
+        break;
+    case TKIND_COCLASS:
+        type = rb_str_new2("Class");
+        break;
+    case TKIND_ALIAS:
+        type = rb_str_new2("Alias");
+        break;
+    case TKIND_UNION:
+        type = rb_str_new2("Union");
+        break;
+    case TKIND_MAX:
+        type = rb_str_new2("Max");
+        break;
+    default:
+        type = Qnil;
+        break;
+    }
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return type;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#ole_type #=> OLE type string.
+ * 
+ *  returns type of OLE class.
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application') 
+ *    puts tobj.ole_type  # => Class
+ */
+static VALUE
+foletype_ole_type(self)
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_ole_type(ptype->pTypeInfo);
+}
+
+static VALUE
+ole_type_guid(pTypeInfo) 
+    ITypeInfo *pTypeInfo;
+{
+    HRESULT hr;
+    TYPEATTR *pTypeAttr;
+    int len;
+    OLECHAR bstr[80];
+    VALUE guid = Qnil;
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr)) 
+        return guid;
+    len = StringFromGUID2(&pTypeAttr->guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
+    if (len > 3) {
+        guid = ole_wc2vstr(bstr, FALSE);
+    }
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return guid;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#guid  #=> GUID
+ * 
+ *  Returns GUID.
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application') 
+ *    puts tobj.guid  # => {00024500-0000-0000-C000-000000000046}
+ */
+static VALUE
+foletype_guid(self)
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_guid(ptype->pTypeInfo);
+}
+
+static VALUE
+ole_type_progid(pTypeInfo)
+    ITypeInfo *pTypeInfo;
+{
+    HRESULT hr;
+    TYPEATTR *pTypeAttr;
+    OLECHAR *pbuf;
+    VALUE progid = Qnil;
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr)) 
+        return progid;
+    hr = ProgIDFromCLSID(&pTypeAttr->guid, &pbuf);
+    if (SUCCEEDED(hr)) 
+        progid = WC2VSTR(pbuf);
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return progid;
+}
+
+/*
+ * call-seq:
+ *    WIN32OLE_TYPE#progid  #=> ProgID
+ * 
+ * Returns ProgID if it exists. If not found, then returns nil.
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
+ *    puts tobj.progid  # =>   Excel.Application.9
+ */
+static VALUE
+foletype_progid(self)
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_progid(ptype->pTypeInfo);
+}
+
+
+static VALUE
+ole_type_visible(pTypeInfo) 
+    ITypeInfo *pTypeInfo;
+{
+    HRESULT hr;
+    TYPEATTR *pTypeAttr;
+    VALUE visible;
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr)) 
+        return Qtrue;
+    if (pTypeAttr->wTypeFlags & (TYPEFLAG_FHIDDEN | TYPEFLAG_FRESTRICTED)) {
+        visible = Qfalse;
+    } else {
+        visible = Qtrue;
+    }
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return visible;
+}
+
+/*
+ *  call-seq:
+ *    WIN32OLE_TYPE#visible  #=> true or false
+ * 
+ *  Returns true if the OLE class is public.
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Application')
+ *    puts tobj.visible  # => true
+ */
+static VALUE
+foletype_visible(self)
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_visible(ptype->pTypeInfo);
+}
+
+static VALUE
+ole_type_major_version(pTypeInfo)
+    ITypeInfo *pTypeInfo;
+{
+    VALUE ver;
+    TYPEATTR *pTypeAttr;
+    HRESULT hr;
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr))
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+    ver = INT2FIX(pTypeAttr->wMajorVerNum);
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return ver;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#major_version
+ * 
+ *  Returns major version.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Word 10.0 Object Library', 'Documents')
+ *     puts tobj.major_version # => 8
+ */
+static VALUE
+foletype_major_version(self)
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_major_version(ptype->pTypeInfo);
+}
+
+static VALUE
+ole_type_minor_version(pTypeInfo)
+    ITypeInfo *pTypeInfo;
+{
+    VALUE ver;
+    TYPEATTR *pTypeAttr;
+    HRESULT hr;
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr))
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+    ver = INT2FIX(pTypeAttr->wMinorVerNum);
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return ver;
+}
+
+/*
+ *  call-seq:
+ *    WIN32OLE_TYPE#minor_version #=> OLE minor version
+ * 
+ *  Returns minor version.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Word 10.0 Object Library', 'Documents')
+ *     puts tobj.minor_version # => 2
+ */
+static VALUE
+foletype_minor_version(self)
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_minor_version(ptype->pTypeInfo);
+}
+
+static VALUE
+ole_type_typekind(pTypeInfo)
+    ITypeInfo *pTypeInfo;
+{
+    VALUE typekind;
+    TYPEATTR *pTypeAttr;
+    HRESULT hr;
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr))
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+    typekind = INT2FIX(pTypeAttr->typekind);
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return typekind;
+}
+
+/*
+ *  call-seq:
+ *    WIN32OLE_TYPE#typekind #=> number of type.
+ * 
+ *  Returns number which represents type.
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Word 10.0 Object Library', 'Documents')
+ *    puts tobj.typekind # => 4
+ *
+ */
+static VALUE 
+foletype_typekind(self)
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_typekind(ptype->pTypeInfo);
+}
+
+static VALUE
+ole_type_helpstring(pTypeInfo)
+    ITypeInfo *pTypeInfo;
+{
+    HRESULT hr;
+    BSTR bhelpstr;
+    hr = ole_docinfo_from_type(pTypeInfo, NULL, &bhelpstr, NULL, NULL);
+    if(FAILED(hr)) {
+        return Qnil;
+    }
+    return WC2VSTR(bhelpstr);
+}
+
+/*
+ *  call-seq:
+ *    WIN32OLE_TYPE#helpstring #=> help string.
+ * 
+ *  Returns help string.
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', 'IWebBrowser')
+ *    puts tobj.helpstring # => Web Browser interface
+ */
+static VALUE 
+foletype_helpstring(self)
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_helpstring(ptype->pTypeInfo);
+}
+
+static VALUE
+ole_type_src_type(pTypeInfo)
+    ITypeInfo *pTypeInfo;
+{
+    HRESULT hr;
+    TYPEATTR *pTypeAttr;
+    VALUE alias = Qnil;
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr))
+        return alias;
+    if(pTypeAttr->typekind != TKIND_ALIAS) {
+        OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+        return alias;
+    }
+    alias = ole_typedesc2val(pTypeInfo, &(pTypeAttr->tdescAlias), Qnil);
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return alias;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#src_type #=> OLE source class
+ * 
+ *  Returns source class when the OLE class is 'Alias'.
+ *     tobj =  WIN32OLE_TYPE.new('Microsoft Office 9.0 Object Library', 'MsoRGBType')
+ *     puts tobj.src_type # => I4
+ *
+ */
+static VALUE
+foletype_src_type(self)
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_src_type(ptype->pTypeInfo);
+}
+
+static VALUE
+ole_type_helpfile(pTypeInfo)
+    ITypeInfo *pTypeInfo;
+{
+    HRESULT hr;
+    BSTR bhelpfile;
+    hr = ole_docinfo_from_type(pTypeInfo, NULL, NULL, NULL, &bhelpfile);
+    if(FAILED(hr)) {
+        return Qnil;
+    }
+    return WC2VSTR(bhelpfile);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#helpfile
+ * 
+ *  Returns helpfile path. If helpfile is not found, then returns nil.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
+ *     puts tobj.helpfile # => C:\...\VBAXL9.CHM
+ *
+ */
+static VALUE
+foletype_helpfile(self)
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_helpfile(ptype->pTypeInfo);
+}
+
+static VALUE
+ole_type_helpcontext(pTypeInfo)
+    ITypeInfo *pTypeInfo;
+{
+    HRESULT hr;
+    DWORD helpcontext;
+    hr = ole_docinfo_from_type(pTypeInfo, NULL, NULL, 
+                               &helpcontext, NULL);
+    if(FAILED(hr))
+        return Qnil;
+    return INT2FIX(helpcontext);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#helpcontext
+ * 
+ *  Returns helpcontext. If helpcontext is not found, then returns nil.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
+ *     puts tobj.helpfile # => 131185
+ */
+static VALUE
+foletype_helpcontext(self)
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_type_helpcontext(ptype->pTypeInfo);
+}
+
+static VALUE
+ole_variables(pTypeInfo)
+    ITypeInfo *pTypeInfo;
+{
+    HRESULT hr;
+    TYPEATTR *pTypeAttr;
+    WORD i;
+    UINT len;
+    BSTR bstr;
+    char *pstr;
+    VARDESC *pVarDesc;
+    struct olevariabledata *pvar;
+    VALUE var;
+    VALUE variables = rb_ary_new();
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
+    }
+    
+    for(i = 0; i < pTypeAttr->cVars; i++) {
+        hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, i, &pVarDesc);
+        if(FAILED(hr))
+            continue;
+        len = 0;
+        pstr = NULL;
+        hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pVarDesc->memid, &bstr,
+                                         1, &len);
+        if(FAILED(hr) || len == 0 || !bstr)
+            continue;
+
+        var = Data_Make_Struct(cWIN32OLE_VARIABLE, struct olevariabledata,
+                               0,olevariable_free,pvar);
+        pvar->pTypeInfo = pTypeInfo;
+        OLE_ADDREF(pTypeInfo);
+        pvar->index = i;
+        rb_ivar_set(var, rb_intern("name"), WC2VSTR(bstr));
+        rb_ary_push(variables, var);
+
+        pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
+        pVarDesc = NULL;
+    }
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return variables;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#variables
+ * 
+ *  Returns array of WIN32OLE_VARIABLE objects which represent variables 
+ *  defined in OLE class.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
+ *     vars = tobj.variables
+ *     vars.each do |v|
+ *       puts "#{v.name} = #{v.value}"
+ *     end
+ *     
+ *     The result of above sample script is follows:
+ *       xlChart = -4109
+ *       xlDialogSheet = -4116
+ *       xlExcel4IntlMacroSheet = 4
+ *       xlExcel4MacroSheet = 3
+ *       xlWorksheet = -4167
+ *
+ */
+static VALUE
+foletype_variables(self)
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_variables(ptype->pTypeInfo);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_TYPE#ole_methods # the array of WIN32OLE_METHOD objects.
+ * 
+ *  Returns array of WIN32OLE_METHOD objects which represent OLE method defined in 
+ *  OLE type library.
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
+ *    methods = tobj.ole_methods.collect{|m|
+ *      m.name
+ *    }                                       
+ *    # => ['Activate', 'Copy', 'Delete',....]
+ */
+static VALUE
+foletype_methods(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    struct oletypedata *ptype;
+    Data_Get_Struct(self, struct oletypedata, ptype);
+    return ole_methods_from_typeinfo(ptype->pTypeInfo, INVOKE_FUNC | INVOKE_PROPERTYGET | INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
+}
+
+/*
+ * Document-class: WIN32OLE_VARIABLE
+ *
+ *   <code>WIN32OLE_VARIABLE</code> objects represent OLE variable information.
+ */
+
+/*
+ *  call-seq:
+ *     WIN32OLE_VARIABLE#name
+ * 
+ *  Returns the name of variable.
+ *
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
+ *     variables = tobj.variables
+ *     variables.each do |variable|
+ *       puts "#{variable.name}"
+ *     end
+ *
+ *     The result of above script is following:
+ *       xlChart
+ *       xlDialogSheet
+ *       xlExcel4IntlMacroSheet
+ *       xlExcel4MacroSheet
+ *       xlWorksheet
+ *
+ */
+static VALUE
+folevariable_name(self)
+    VALUE self;
+{
+    return rb_ivar_get(self, rb_intern("name"));
+}
+
+static VALUE
+ole_variable_ole_type(pTypeInfo, var_index)
+    ITypeInfo *pTypeInfo;
+    UINT var_index;
+{
+    VARDESC *pVarDesc;
+    HRESULT hr;
+    VALUE type;
+    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
+    if (FAILED(hr))
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
+    type = ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), Qnil);
+    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
+    return type;
+}
+
+/*
+ *   call-seq:
+ *      WIN32OLE_VARIABLE#ole_type
+ * 
+ *   Returns OLE type string.
+ *
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
+ *     variables = tobj.variables
+ *     variables.each do |variable|
+ *       puts "#{variable.ole_type} #{variable.name}"
+ *     end
+ *
+ *     The result of above script is following:
+ *       INT xlChart
+ *       INT xlDialogSheet
+ *       INT xlExcel4IntlMacroSheet
+ *       INT xlExcel4MacroSheet
+ *       INT xlWorksheet
+ *
+ */
+static VALUE
+folevariable_ole_type(self)
+    VALUE self;
+{
+    struct olevariabledata *pvar;
+    Data_Get_Struct(self, struct olevariabledata, pvar);
+    return ole_variable_ole_type(pvar->pTypeInfo, pvar->index);
+}
+
+static VALUE
+ole_variable_ole_type_detail(pTypeInfo, var_index)
+    ITypeInfo *pTypeInfo;
+    UINT var_index;
+{
+    VARDESC *pVarDesc;
+    HRESULT hr;
+    VALUE type = rb_ary_new();
+    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
+    if (FAILED(hr))
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
+    ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), type);
+    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
+    return type;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_VARIABLE#ole_type_detail
+ * 
+ *  Returns detail information of type. The information is array of type.
+ *
+ *     tobj = WIN32OLE_TYPE.new('DirectX 7 for Visual Basic Type Library', 'D3DCLIPSTATUS')
+ *     variable = tobj.variables.find {|variable| variable.name == 'lFlags'}
+ *     tdetail  = variable.ole_type_detail
+ *     p tdetail # => ["USERDEFINED", "CONST_D3DCLIPSTATUSFLAGS"]
+ *
+ */
+static VALUE
+folevariable_ole_type_detail(self)
+    VALUE self;
+{
+    struct olevariabledata *pvar;
+    Data_Get_Struct(self, struct olevariabledata, pvar);
+    return ole_variable_ole_type_detail(pvar->pTypeInfo, pvar->index);
+}
+
+static VALUE
+ole_variable_value(pTypeInfo, var_index)
+    ITypeInfo *pTypeInfo;
+    UINT var_index;
+{
+    VARDESC *pVarDesc;
+    HRESULT hr;
+    VALUE val = Qnil;
+    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
+    if (FAILED(hr))
+        return Qnil;
+    if(pVarDesc->varkind == VAR_CONST)
+        val = ole_variant2val(V_UNION1(pVarDesc, lpvarValue));
+    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
+    return val;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_VARIABLE#value
+ * 
+ *  Returns value if value is exists. If the value does not exist, 
+ *  this method returns nil.
+ *
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
+ *     variables = tobj.variables
+ *     variables.each do |variable|
+ *       puts "#{variable.name} = #{variable.value}"
+ *     end
+ *
+ *     The result of above script is following:
+ *       xlChart = -4109
+ *       xlDialogSheet = -4116
+ *       xlExcel4IntlMacroSheet = 4
+ *       xlExcel4MacroSheet = 3
+ *       xlWorksheet = -4167
+ *
+ */    
+static VALUE
+folevariable_value(self)
+    VALUE self;
+{
+    struct olevariabledata *pvar;
+    Data_Get_Struct(self, struct olevariabledata, pvar);
+    return ole_variable_value(pvar->pTypeInfo, pvar->index);
+}
+
+static VALUE
+ole_variable_visible(pTypeInfo, var_index)
+    ITypeInfo *pTypeInfo;
+    UINT var_index;
+{
+    VARDESC *pVarDesc;
+    HRESULT hr;
+    VALUE visible = Qfalse;
+    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
+    if (FAILED(hr))
+        return visible;
+    if (!(pVarDesc->wVarFlags & (VARFLAG_FHIDDEN |
+                                 VARFLAG_FRESTRICTED |
+                                 VARFLAG_FNONBROWSABLE))) {
+        visible = Qtrue;
+    }
+    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
+    return visible;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_VARIABLE#visible?
+ * 
+ *  Returns true if the variable is public.
+ *
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
+ *     variables = tobj.variables
+ *     variables.each do |variable|
+ *       puts "#{variable.name} #{variable.visible?}"
+ *     end
+ *
+ *     The result of above script is following:
+ *       xlChart true
+ *       xlDialogSheet true
+ *       xlExcel4IntlMacroSheet true
+ *       xlExcel4MacroSheet true
+ *       xlWorksheet true
+ *       
+ */
+static VALUE
+folevariable_visible(self)
+    VALUE self;
+{
+    struct olevariabledata *pvar;
+    Data_Get_Struct(self, struct olevariabledata, pvar);
+    return ole_variable_visible(pvar->pTypeInfo, pvar->index);
+}
+
+static VALUE
+ole_variable_kind(pTypeInfo, var_index)
+    ITypeInfo *pTypeInfo;
+    UINT var_index;
+{
+    VARDESC *pVarDesc;
+    HRESULT hr;
+    VALUE kind = rb_str_new2("UNKNOWN");
+    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
+    if (FAILED(hr))
+        return kind;
+    switch(pVarDesc->varkind) {
+    case VAR_PERINSTANCE:
+        kind = rb_str_new2("PERINSTANCE");
+        break;
+    case VAR_STATIC:
+        kind = rb_str_new2("STATIC");
+        break;
+    case VAR_CONST:
+        kind = rb_str_new2("CONSTANT");
+        break;
+    case VAR_DISPATCH:
+        kind = rb_str_new2("DISPATCH");
+        break;
+    default:
+        break;
+    }
+    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
+    return kind;
+}
+
+/*
+ * call-seq:
+ *   WIN32OLE_VARIABLE#variable_kind
+ * 
+ * Returns variable kind string.
+ *
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
+ *    variables = tobj.variables
+ *    variables.each do |variable|
+ *      puts "#{variable.name} #{variable.variable_kind}"
+ *    end
+ *
+ *    The result of above script is following:
+ *      xlChart CONSTANT
+ *      xlDialogSheet CONSTANT
+ *      xlExcel4IntlMacroSheet CONSTANT
+ *      xlExcel4MacroSheet CONSTANT
+ *      xlWorksheet CONSTANT
+ */
+static VALUE
+folevariable_variable_kind(self)
+    VALUE self;
+{
+    struct olevariabledata *pvar;
+    Data_Get_Struct(self, struct olevariabledata, pvar);
+    return ole_variable_kind(pvar->pTypeInfo, pvar->index);
+}
+
+static VALUE
+ole_variable_varkind(pTypeInfo, var_index)
+    ITypeInfo *pTypeInfo;
+    UINT var_index;
+{
+    VARDESC *pVarDesc;
+    HRESULT hr;
+    VALUE kind = Qnil;
+    hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
+    if (FAILED(hr))
+        return kind;
+    pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
+    kind = INT2FIX(pVarDesc->varkind);    
+    return kind;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_VARIABLE#varkind
+ * 
+ *  Returns the number which represents variable kind.
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
+ *    variables = tobj.variables
+ *    variables.each do |variable|
+ *      puts "#{variable.name} #{variable.varkind}"
+ *    end
+ *
+ *    The result of above script is following:
+ *       xlChart 2
+ *       xlDialogSheet 2
+ *       xlExcel4IntlMacroSheet 2
+ *       xlExcel4MacroSheet 2
+ *       xlWorksheet 2
+ */
+static VALUE
+folevariable_varkind(self)
+    VALUE self;
+{
+    struct olevariabledata *pvar;
+    Data_Get_Struct(self, struct olevariabledata, pvar);
+    return ole_variable_varkind(pvar->pTypeInfo, pvar->index);
+}
+
+/*
+ * Document-class: WIN32OLE_METHOD
+ *
+ *   <code>WIN32OLE_METHOD</code> objects represent OLE method information.
+ */
+
+static VALUE
+olemethod_set_member(self, pTypeInfo, pOwnerTypeInfo, index, name)
+    VALUE self;
+    ITypeInfo *pTypeInfo;
+    ITypeInfo *pOwnerTypeInfo;
+    int index;
+    VALUE name;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    pmethod->pTypeInfo = pTypeInfo;
+    OLE_ADDREF(pTypeInfo);
+    pmethod->pOwnerTypeInfo = pOwnerTypeInfo;
+    if(pOwnerTypeInfo) OLE_ADDREF(pOwnerTypeInfo);
+    pmethod->index = index;
+    rb_ivar_set(self, rb_intern("name"), name);
+    return self;
+}
+
+static VALUE
+folemethod_s_allocate(klass)
+    VALUE klass;
+{
+    struct olemethoddata *pmethod;
+    VALUE obj;
+    obj = Data_Make_Struct(klass, 
+                           struct olemethoddata,
+                           0, olemethod_free, pmethod);
+    pmethod->pTypeInfo = NULL;
+    pmethod->pOwnerTypeInfo = NULL;
+    pmethod->index = 0;
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD.new(ole_type,  method) -> WIN32OLE_METHOD object
+ * 
+ *  Returns a new WIN32OLE_METHOD object which represents the information
+ *  about OLE method.
+ *  The first argument <i>ole_type</i> specifies WIN32OLE_TYPE object.
+ *  The second argument <i>method</i> specifies OLE method name defined OLE class
+ *  which represents WIN32OLE_TYPE object.
+ *
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
+ *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
+ */
+static VALUE
+folemethod_initialize(self, oletype, method)
+    VALUE self;
+    VALUE oletype;
+    VALUE method;
+{
+    struct oletypedata *ptype;
+    VALUE obj = Qnil;
+    if (rb_obj_is_kind_of(oletype, cWIN32OLE_TYPE)) {
+        Check_SafeStr(method);
+        Data_Get_Struct(oletype, struct oletypedata, ptype);
+        obj = olemethod_from_typeinfo(self, ptype->pTypeInfo, method);
+        if (obj == Qnil) {
+            rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s",
+                     StringValuePtr(method));
+        }
+    }
+    else {
+        rb_raise(rb_eTypeError, "1st argument should be WIN32OLE_TYPE object");
+    }
+    return obj;
+}
+
+/*
+ *  call-seq
+ *     WIN32OLE_METHOD#name
+ *
+ *  Returns the name of the method.
+ *
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
+ *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
+ *     puts method.name # => SaveAs
+ *     
+ */
+static VALUE
+folemethod_name(self)
+    VALUE self;
+{
+    return rb_ivar_get(self, rb_intern("name"));
+}
+
+static VALUE
+ole_method_return_type(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    VALUE type;
+
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr)) 
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
+    
+    type = ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), Qnil);
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return type;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#return_type
+ * 
+ *  Returns string of return value type of method.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
+ *     method = WIN32OLE_METHOD.new(tobj, 'Add')
+ *     puts method.return_type # => Workbook
+ *
+ */
+static VALUE
+folemethod_return_type(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_return_type(pmethod->pTypeInfo, pmethod->index);
+}
+
+static VALUE
+ole_method_return_vtype(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    VALUE vt;
+
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr)) 
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
+    
+    vt = INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return vt;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#return_vtype
+ * 
+ *  Returns number of return value type of method.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
+ *     method = WIN32OLE_METHOD.new(tobj, 'Add')
+ *     puts method.return_vtype # => 26
+ *
+ */
+static VALUE
+folemethod_return_vtype(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_return_vtype(pmethod->pTypeInfo, pmethod->index);
+}
+
+static VALUE
+ole_method_return_type_detail(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    VALUE type = rb_ary_new();
+
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr)) 
+        return type;
+    
+    ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), type);
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return type;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#return_type_detail
+ * 
+ *  Returns detail information of return value type of method.
+ *  The information is array.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
+ *     method = WIN32OLE_METHOD.new(tobj, 'Add')
+ *     p method.return_type_detail # => ["PTR", "USERDEFINED", "Workbook"]
+ */
+static VALUE
+folemethod_return_type_detail(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_return_type_detail(pmethod->pTypeInfo, pmethod->index);
+}
+
+static VALUE
+ole_method_invkind(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    VALUE invkind;
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if(FAILED(hr)) 
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
+    invkind = INT2FIX(pFuncDesc->invkind);
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return invkind;
+}
+
+static VALUE
+ole_method_invoke_kind(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    WORD method_index;
+{
+    VALUE type = rb_str_new2("UNKNOWN");
+    VALUE invkind = ole_method_invkind(pTypeInfo, method_index);
+    if((FIX2INT(invkind) & INVOKE_PROPERTYGET) &&
+       (FIX2INT(invkind) & INVOKE_PROPERTYPUT) ) {
+        type = rb_str_new2("PROPERTY");
+    } else if(FIX2INT(invkind) & INVOKE_PROPERTYGET) {
+        type =  rb_str_new2("PROPERTYGET");
+    } else if(FIX2INT(invkind) & INVOKE_PROPERTYPUT) {
+        type = rb_str_new2("PROPERTYPUT");
+    } else if(FIX2INT(invkind) & INVOKE_PROPERTYPUTREF) {
+        type = rb_str_new2("PROPERTYPUTREF");
+    } else if(FIX2INT(invkind) & INVOKE_FUNC) {
+        type = rb_str_new2("FUNC");
+    }
+    return type;
+}
+
+/*
+ *   call-seq:
+ *      WIN32OLE_MTHOD#invkind
+ * 
+ *   Returns the method invoke kind. 
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
+ *     method = WIN32OLE_METHOD.new(tobj, 'Add')
+ *     puts method.invkind # => 1
+ *
+ */
+static VALUE
+folemethod_invkind(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_invkind(pmethod->pTypeInfo, pmethod->index);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#invoke_kind
+ * 
+ *  Returns the method kind string. The string is "UNKNOWN" or "PROPERTY" 
+ *  or "PROPERTY" or "PROPERTYGET" or "PROPERTYPUT" or "PROPERTYPPUTREF" 
+ *  or "FUNC".
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
+ *     method = WIN32OLE_METHOD.new(tobj, 'Add')
+ *     puts method.invoke_kind # => "FUNC"
+ */
+static VALUE
+folemethod_invoke_kind(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_invoke_kind(pmethod->pTypeInfo, pmethod->index);
+}
+
+static VALUE
+ole_method_visible(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    VALUE visible;
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if(FAILED(hr))
+        return Qfalse;
+    if (pFuncDesc->wFuncFlags & (FUNCFLAG_FRESTRICTED |
+                                 FUNCFLAG_FHIDDEN |
+                                 FUNCFLAG_FNONBROWSABLE)) {
+        visible = Qfalse;
+    } else {
+        visible = Qtrue;
+    }
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return visible;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#visible?
+ * 
+ *  Returns true if the method is public.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
+ *     method = WIN32OLE_METHOD.new(tobj, 'Add')
+ *     puts method.visible? # => true
+ */
+static VALUE
+folemethod_visible(self) 
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_visible(pmethod->pTypeInfo, pmethod->index);
+}
+
+static VALUE
+ole_method_event(pTypeInfo, method_index, method_name)
+    ITypeInfo *pTypeInfo;
+    WORD method_index;
+    VALUE method_name;
+{
+    TYPEATTR *pTypeAttr;
+    HRESULT hr;
+    WORD i;
+    int flags;
+    HREFTYPE href;
+    ITypeInfo *pRefTypeInfo;
+    FUNCDESC *pFuncDesc;
+    BSTR bstr;
+    VALUE name;
+    VALUE event = Qfalse;
+    
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr)) 
+        return event;
+    if(pTypeAttr->typekind != TKIND_COCLASS) {
+        pTypeInfo->lpVtbl->ReleaseTypeAttr(pTypeInfo, pTypeAttr);
+        return event;
+    }
+    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
+        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &flags);
+        if (FAILED(hr))
+            continue;
+
+        if (flags & IMPLTYPEFLAG_FSOURCE) {
+            hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
+                                                         i, &href);
+            if (FAILED(hr))
+                continue;
+            hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
+                                                   href, &pRefTypeInfo);
+            if (FAILED(hr))
+                continue;
+            hr = pRefTypeInfo->lpVtbl->GetFuncDesc(pRefTypeInfo, method_index, 
+                                                   &pFuncDesc);
+            if (FAILED(hr)) {
+                OLE_RELEASE(pRefTypeInfo);
+                continue;
+            }
+
+            hr = pRefTypeInfo->lpVtbl->GetDocumentation(pRefTypeInfo, 
+                                                        pFuncDesc->memid,
+                                                        &bstr, NULL, NULL, NULL);
+            if (FAILED(hr)) {
+                pRefTypeInfo->lpVtbl->ReleaseFuncDesc(pRefTypeInfo, pFuncDesc);
+                OLE_RELEASE(pRefTypeInfo);
+                continue;
+            }
+
+            name = WC2VSTR(bstr);
+            pRefTypeInfo->lpVtbl->ReleaseFuncDesc(pRefTypeInfo, pFuncDesc);
+            OLE_RELEASE(pRefTypeInfo);
+            if (rb_str_cmp(method_name, name) == 0) {
+                event = Qtrue;
+                break;
+            }
+        }
+    }
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    return event;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#event?
+ * 
+ *  Returns true if the method is event.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
+ *     method = WIN32OLE_METHOD.new(tobj, 'SheetActivate')
+ *     puts method.event? # => true
+ *
+ */
+static VALUE
+folemethod_event(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    if (!pmethod->pOwnerTypeInfo)
+        return Qfalse;
+    return ole_method_event(pmethod->pOwnerTypeInfo, 
+                            pmethod->index,
+                            rb_ivar_get(self, rb_intern("name")));
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#event_interface
+ *
+ *  Returns event interface name if the method is event.
+ *    tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
+ *    method = WIN32OLE_METHOD.new(tobj, 'SheetActivate')
+ *    puts method.event_interface # =>  WorkbookEvents
+ */
+static VALUE
+folemethod_event_interface(self)
+    VALUE self;
+{
+    BSTR name;
+    struct olemethoddata *pmethod;
+    HRESULT hr;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    if(folemethod_event(self) == Qtrue) {
+        hr = ole_docinfo_from_type(pmethod->pTypeInfo, &name, NULL, NULL, NULL);
+        if(SUCCEEDED(hr))
+            return WC2VSTR(name);
+    }
+    return Qnil;
+}
+
+static VALUE
+ole_method_docinfo_from_type(pTypeInfo, method_index, name, helpstr,
+                             helpcontext, helpfile)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+    BSTR *name;
+    BSTR *helpstr;
+    DWORD *helpcontext;
+    BSTR *helpfile;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr))
+        return hr;
+    hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo, pFuncDesc->memid,
+                                             name, helpstr,
+                                             helpcontext, helpfile);
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return hr;
+}
+
+static VALUE
+ole_method_helpstring(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    HRESULT hr;
+    BSTR bhelpstring;
+    hr = ole_method_docinfo_from_type(pTypeInfo, method_index, NULL, &bhelpstring,
+                                      NULL, NULL); 
+    if (FAILED(hr))
+        return Qnil;
+    return WC2VSTR(bhelpstring);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#helpstring
+ *
+ *  Returns help string of OLE method. If the help string is not found, 
+ *  then the method returns nil.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', 'IWebBrowser')
+ *     method = WIN32OLE_METHOD.new(tobj, 'Navigate')
+ *     puts method.helpstring # => Navigates to a URL or file.
+ *
+ */
+static VALUE
+folemethod_helpstring(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_helpstring(pmethod->pTypeInfo, pmethod->index);
+}
+
+static VALUE
+ole_method_helpfile(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    HRESULT hr;
+    BSTR bhelpfile;
+    hr = ole_method_docinfo_from_type(pTypeInfo, method_index, NULL, NULL,
+                                      NULL, &bhelpfile); 
+    if (FAILED(hr))
+        return Qnil;
+    return WC2VSTR(bhelpfile);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#helpfile
+ * 
+ *  Returns help file. If help file is not found, then 
+ *  the method returns nil.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
+ *     method = WIN32OLE_METHOD.new(tobj, 'Add')
+ *     puts method.helpfile # => C:\...\VBAXL9.CHM
+ */
+static VALUE
+folemethod_helpfile(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+
+    return ole_method_helpfile(pmethod->pTypeInfo, pmethod->index);
+}
+
+static VALUE
+ole_method_helpcontext(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    HRESULT hr;
+    DWORD helpcontext = 0;
+    hr = ole_method_docinfo_from_type(pTypeInfo, method_index, NULL, NULL,
+                                      &helpcontext, NULL); 
+    if (FAILED(hr))
+        return Qnil;
+    return INT2FIX(helpcontext);
+}
+
+/* 
+ *  call-seq:
+ *     WIN32OLE_METHOD#helpcontext
+ * 
+ *  Returns help context.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
+ *     method = WIN32OLE_METHOD.new(tobj, 'Add')
+ *     puts method.helpcontext # => 65717
+ */
+static VALUE
+folemethod_helpcontext(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_helpcontext(pmethod->pTypeInfo, pmethod->index);
+}
+
+static VALUE
+ole_method_dispid(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    VALUE dispid = Qnil;
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr))
+        return dispid;
+    dispid = INT2NUM(pFuncDesc->memid); 
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return dispid;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#dispid
+ * 
+ *  Returns dispatch ID.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
+ *     method = WIN32OLE_METHOD.new(tobj, 'Add')
+ *     puts method.dispid # => 181
+ */
+static VALUE
+folemethod_dispid(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_dispid(pmethod->pTypeInfo, pmethod->index);
+}
+
+static VALUE
+ole_method_offset_vtbl(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    VALUE offset_vtbl = Qnil;
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr))
+        return offset_vtbl;
+    offset_vtbl = INT2FIX(pFuncDesc->oVft); 
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return offset_vtbl;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#offset_vtbl
+ * 
+ *  Returns the offset ov VTBL.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbooks')
+ *     method = WIN32OLE_METHOD.new(tobj, 'Add')
+ *     puts method.offset_vtbl # => 40
+ */
+static VALUE
+folemethod_offset_vtbl(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_offset_vtbl(pmethod->pTypeInfo, pmethod->index);
+}
+
+static VALUE
+ole_method_size_params(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    VALUE size_params = Qnil;
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr))
+        return size_params;
+    size_params = INT2FIX(pFuncDesc->cParams);
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return size_params;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#size_params
+ * 
+ *  Returns the size of arguments of the method.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
+ *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
+ *     puts method.size_params # => 11
+ *  
+ */
+static VALUE
+folemethod_size_params(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_size_params(pmethod->pTypeInfo, pmethod->index);
+}
+
+static VALUE
+ole_method_size_opt_params(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    VALUE size_opt_params = Qnil;
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr))
+        return size_opt_params;
+    size_opt_params = INT2FIX(pFuncDesc->cParamsOpt);
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return size_opt_params;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#size_opt_params
+ * 
+ *  Returns the size of optional parameters.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
+ *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
+ *     puts method.size_opt_params # => 4
+ */
+static VALUE
+folemethod_size_opt_params(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_size_opt_params(pmethod->pTypeInfo, pmethod->index);
+}
+
+static VALUE
+ole_method_params(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    BSTR *bstrs;
+    UINT len, i;
+    struct oleparamdata *pparam;
+    VALUE param;
+    VALUE params = rb_ary_new();
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr)) 
+        return params;
+
+    len = 0;
+    bstrs = ALLOCA_N(BSTR, pFuncDesc->cParams + 1);
+    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pFuncDesc->memid, 
+                                     bstrs, pFuncDesc->cParams + 1,
+                                     &len);
+    if (FAILED(hr)) {
+        pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+        return params;
+    }
+    SysFreeString(bstrs[0]);
+    if (pFuncDesc->cParams > 0) {
+        for(i = 1; i < len; i++) {
+            param = Data_Make_Struct(cWIN32OLE_PARAM, struct oleparamdata, 0,
+                                     oleparam_free, pparam);
+            pparam->pTypeInfo = pTypeInfo;
+            OLE_ADDREF(pTypeInfo);
+            pparam->method_index = method_index;
+            pparam->index = i - 1;
+            rb_ivar_set(param, rb_intern("name"), WC2VSTR(bstrs[i]));
+            rb_ary_push(params, param);
+         }
+     }
+     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+     return params;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_METHOD#params
+ * 
+ *  returns array of WIN32OLE_PARAM object corresponding with method parameters.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
+ *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
+ *     p method.params # => [Filename, FileFormat, Password, WriteResPassword, 
+ *                           ReadOnlyRecommended, CreateBackup, AccessMode, 
+ *                           ConflictResolution, AddToMru, TextCodepage, 
+ *                           TextVisualLayout]
+ */
+static VALUE
+folemethod_params(self)
+    VALUE self;
+{
+    struct olemethoddata *pmethod;
+    Data_Get_Struct(self, struct olemethoddata, pmethod);
+    return ole_method_params(pmethod->pTypeInfo, pmethod->index);
+}
+
+/*
+ * Document-class: WIN32OLE_PARAM
+ *
+ *   <code>WIN32OLE_PARAM</code> objects represent param information of 
+ *   the OLE method.
+ */
+
+/*
+ *  call-seq:
+ *     WIN32OLE_PARAM#name
+ * 
+ *  Returns name.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
+ *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
+ *     param1 = method.params[0]
+ *     puts param1.name # => Filename
+ */
+static VALUE
+foleparam_name(self)
+    VALUE self;
+{
+    return rb_ivar_get(self, rb_intern("name"));
+}
+
+static VALUE
+ole_param_ole_type(pTypeInfo, method_index, index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+    UINT index;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    VALUE type = rb_str_new2("UNKNOWN");
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr))
+        return type;
+    type = ole_typedesc2val(pTypeInfo, 
+                            &(pFuncDesc->lprgelemdescParam[index].tdesc), Qnil);
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return type;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_PARAM#ole_type
+ *
+ *  Returns OLE type of WIN32OLE_PARAM object(parameter of OLE method).
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
+ *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
+ *     param1 = method.params[0]
+ *     puts param1.ole_type # => VARIANT
+ */
+static VALUE 
+foleparam_ole_type(self)
+    VALUE self;
+{
+    struct oleparamdata *pparam;
+    Data_Get_Struct(self, struct oleparamdata, pparam);
+    return ole_param_ole_type(pparam->pTypeInfo, pparam->method_index, 
+                              pparam->index);
+}
+
+static VALUE
+ole_param_ole_type_detail(pTypeInfo, method_index, index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+    UINT index;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    VALUE typedetail = rb_ary_new();
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr))
+        return typedetail;
+    ole_typedesc2val(pTypeInfo, 
+                     &(pFuncDesc->lprgelemdescParam[index].tdesc), typedetail);
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return typedetail;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_PARAM#ole_type_detail
+ *
+ *  Returns detail information of type of argument.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'IWorksheetFunction')
+ *     method = WIN32OLE_METHOD.new(tobj, 'SumIf')
+ *     param1 = method.params[0]
+ *     p param1.ole_type_detail # => ["PTR", "USERDEFINED", "Range"]
+ */
+static VALUE 
+foleparam_ole_type_detail(self)
+    VALUE self;
+{
+    struct oleparamdata *pparam;
+    Data_Get_Struct(self, struct oleparamdata, pparam);
+    return ole_param_ole_type_detail(pparam->pTypeInfo, pparam->method_index, 
+                                     pparam->index);
+}
+
+static VALUE
+ole_param_flag_mask(pTypeInfo, method_index, index, mask)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+    UINT index;
+    USHORT mask;
+{
+    FUNCDESC *pFuncDesc;
+    HRESULT hr;
+    VALUE ret = Qfalse;
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if(FAILED(hr)) 
+        return ret;
+    if (V_UNION1((&(pFuncDesc->lprgelemdescParam[index])), paramdesc).wParamFlags &mask) 
+        ret = Qtrue;
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return ret;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_PARAM#input?
+ * 
+ *  Returns true if the parameter is input.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
+ *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
+ *     param1 = method.params[0]
+ *     puts param1.input? # => true
+ */
+static VALUE foleparam_input(self)
+    VALUE self;
+{
+    struct oleparamdata *pparam;
+    Data_Get_Struct(self, struct oleparamdata, pparam);
+    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, 
+                               pparam->index, PARAMFLAG_FIN);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE#output?
+ * 
+ *  Returns true if argument is output.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', 'DWebBrowserEvents')
+ *     method = WIN32OLE_METHOD.new(tobj, 'NewWindow')
+ *     method.params.each do |param|
+ *       puts "#{param.name} #{param.output?}"
+ *     end
+ *
+ *     The result of above script is following:
+ *       URL false
+ *       Flags false
+ *       TargetFrameName false
+ *       PostData false
+ *       Headers false
+ *       Processed true
+ */
+static VALUE foleparam_output(self)
+    VALUE self;
+{
+    struct oleparamdata *pparam;
+    Data_Get_Struct(self, struct oleparamdata, pparam);
+    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, 
+                               pparam->index, PARAMFLAG_FOUT);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_PARAM#optional?
+ * 
+ *  Returns true if argument is optional.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
+ *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
+ *     param1 = method.params[0]
+ *     puts "#{param1.name} #{param1.optional?}" # => Filename true
+ */
+static VALUE foleparam_optional(self)
+    VALUE self;
+{
+    struct oleparamdata *pparam;
+    Data_Get_Struct(self, struct oleparamdata, pparam);
+    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, 
+                               pparam->index, PARAMFLAG_FOPT);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_PARAM#retval?
+ *
+ *  Returns true if argument is return value.
+ *     tobj = WIN32OLE_TYPE.new('DirectX 7 for Visual Basic Type Library', 
+ *                              'DirectPlayLobbyConnection')
+ *     method = WIN32OLE_METHOD.new(tobj, 'GetPlayerShortName')
+ *     param = method.params[0]
+ *     puts "#{param.name} #{param.retval?}"  # => name true
+ */
+static VALUE foleparam_retval(self)
+    VALUE self;
+{
+    struct oleparamdata *pparam;
+    Data_Get_Struct(self, struct oleparamdata, pparam);
+    return ole_param_flag_mask(pparam->pTypeInfo, pparam->method_index, 
+                               pparam->index, PARAMFLAG_FRETVAL);
+}
+
+static VALUE
+ole_param_default(pTypeInfo, method_index, index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+    UINT index;
+{
+    FUNCDESC *pFuncDesc;
+    ELEMDESC *pElemDesc;
+    PARAMDESCEX * pParamDescEx;
+    HRESULT hr;
+    USHORT wParamFlags;
+    USHORT mask = PARAMFLAG_FOPT|PARAMFLAG_FHASDEFAULT;
+    VALUE defval = Qnil;
+    hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
+    if (FAILED(hr))
+        return defval;
+    pElemDesc = &pFuncDesc->lprgelemdescParam[index]; 
+    wParamFlags = V_UNION1(pElemDesc, paramdesc).wParamFlags;
+    if ((wParamFlags & mask) == mask) {
+         pParamDescEx = V_UNION1(pElemDesc, paramdesc).pparamdescex;
+         defval = ole_variant2val(&pParamDescEx->varDefaultValue);
+    }
+    pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+    return defval;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_PARAM#default
+ * 
+ *  Returns default value. If the default value does not exist, 
+ *  this method returns nil.
+ *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Workbook')
+ *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
+ *     method.params.each do |param|
+ *       if param.default
+ *         puts "#{param.name} (= #{param.default})"
+ *       else
+ *         puts "#{param}"
+ *       end
+ *     end
+ *
+ *     The above script result is following:
+ *         Filename
+ *         FileFormat
+ *         Password
+ *         WriteResPassword
+ *         ReadOnlyRecommended
+ *         CreateBackup
+ *         AccessMode (= 1)
+ *         ConflictResolution
+ *         AddToMru
+ *         TextCodepage
+ *         TextVisualLayout
+ */
+static VALUE foleparam_default(self)
+    VALUE self;
+{
+    struct oleparamdata *pparam;
+    Data_Get_Struct(self, struct oleparamdata, pparam);
+    return ole_param_default(pparam->pTypeInfo, pparam->method_index,
+                             pparam->index);
+}
+
+
+/*
+ * Document-class: WIN32OLE_EVENT
+ *
+ *   <code>WIN32OLE_EVENT</code> objects controls OLE event.
+ */
+
+static IEventSinkVtbl vtEventSink;
+static BOOL g_IsEventSinkVtblInitialized = FALSE;
+
+void EVENTSINK_Destructor(PIEVENTSINKOBJ);
+
+STDMETHODIMP
+EVENTSINK_QueryInterface(
+    PEVENTSINK pEV,
+    REFIID     iid,
+    LPVOID*    ppv
+    ) {
+    if (IsEqualIID(iid, &IID_IUnknown) ||
+        IsEqualIID(iid, &IID_IDispatch) ||
+        IsEqualIID(iid, &((PIEVENTSINKOBJ)pEV)->m_iid)) {
+        *ppv = pEV;
+    }
+    else {
+        *ppv = NULL;
+        return E_NOINTERFACE;
+    }
+    ((LPUNKNOWN)*ppv)->lpVtbl->AddRef((LPUNKNOWN)*ppv);
+    return NOERROR;
+}
+
+STDMETHODIMP_(ULONG)
+EVENTSINK_AddRef(
+    PEVENTSINK pEV
+    ){
+    PIEVENTSINKOBJ pEVObj = (PIEVENTSINKOBJ)pEV;
+    return ++pEVObj->m_cRef;
+}
+
+STDMETHODIMP_(ULONG) EVENTSINK_Release(
+    PEVENTSINK pEV
+    ) {
+    PIEVENTSINKOBJ pEVObj = (PIEVENTSINKOBJ)pEV;
+    --pEVObj->m_cRef;
+    if(pEVObj->m_cRef != 0)
+        return pEVObj->m_cRef;
+    EVENTSINK_Destructor(pEVObj);
+    return 0;
+}
+
+STDMETHODIMP EVENTSINK_GetTypeInfoCount(
+    PEVENTSINK pEV,
+    UINT *pct
+    ) {
+    *pct = 0;
+    return NOERROR;
+}
+
+STDMETHODIMP EVENTSINK_GetTypeInfo(
+    PEVENTSINK pEV,
+    UINT info,
+    LCID lcid,
+    ITypeInfo **pInfo
+    ) {
+    *pInfo = NULL;
+    return DISP_E_BADINDEX;
+}
+
+STDMETHODIMP EVENTSINK_GetIDsOfNames(
+    PEVENTSINK pEV,
+    REFIID riid,
+    OLECHAR **szNames,
+    UINT cNames,
+    LCID lcid,
+    DISPID *pDispID
+    ) {
+    return DISP_E_UNKNOWNNAME;
+}
+
+static long
+ole_search_event_at(ary, ev)
+    VALUE ary;
+    VALUE ev;
+{
+    VALUE event;
+    VALUE def_event;
+    VALUE event_name;
+    long i, len; 
+    long ret = -1;
+    def_event = Qnil;
+    len = RARRAY(ary)->len;
+    for(i = 0; i < len; i++) {
+        event = rb_ary_entry(ary, i);
+        event_name = rb_ary_entry(event, 1);
+        if(NIL_P(event_name) && NIL_P(ev)) {
+            ret = i;
+            break;
+        }
+        else if (TYPE(ev) == T_STRING &&
+                 TYPE(event_name) == T_STRING &&
+                 rb_str_cmp(ev, event_name) == 0) {
+            ret = i;
+            break;
+        }
+    }
+    return ret;
+}
+
+static VALUE
+ole_search_event(ary, ev, is_default)
+    VALUE ary;
+    VALUE ev;
+    BOOL  *is_default;
+{
+    VALUE event;
+    VALUE def_event;
+    VALUE event_name;
+    long i, len;
+    *is_default = FALSE;
+    def_event = Qnil;
+    len = RARRAY(ary)->len;
+    for(i = 0; i < len; i++) {
+        event = rb_ary_entry(ary, i);
+        event_name = rb_ary_entry(event, 1);
+        if(NIL_P(event_name)) {
+            *is_default = TRUE;
+            def_event = event;
+        }
+        else if (rb_str_cmp(ev, event_name) == 0) {
+            *is_default = FALSE;
+            return event;
+        }
+    }
+    return def_event;
+}
+
+static void
+val2ptr_variant(val, var)
+    VALUE val;
+    VARIANT *var;
+{
+    switch (TYPE(val)) {
+    case T_STRING:
+        if (V_VT(var) == (VT_BSTR | VT_BYREF)) {
+            *V_BSTRREF(var) = ole_mb2wc(StringValuePtr(val), -1);
+        }
+        break;
+    case T_FIXNUM:
+        switch(V_VT(var)) {
+        case (VT_UI1 | VT_BYREF) :
+            *V_UI1REF(var) = NUM2CHR(val);
+            break;
+        case (VT_I2 | VT_BYREF) :
+            *V_I2REF(var) = (short)NUM2INT(val);
+            break;
+        case (VT_I4 | VT_BYREF) :
+            *V_I4REF(var) = NUM2INT(val);
+            break;
+        case (VT_R4 | VT_BYREF) :
+            *V_R4REF(var) = (float)NUM2INT(val);
+            break;
+        case (VT_R8 | VT_BYREF) :
+            *V_R8REF(var) = NUM2INT(val);
+            break;
+        default:
+            break;
+        }
+        break;
+    case T_FLOAT:
+        switch(V_VT(var)) {
+        case (VT_I2 | VT_BYREF) :
+            *V_I2REF(var) = (short)NUM2INT(val);
+            break;
+        case (VT_I4 | VT_BYREF) :
+            *V_I4REF(var) = NUM2INT(val);
+            break;
+        case (VT_R4 | VT_BYREF) :
+            *V_R4REF(var) = (float)NUM2DBL(val);
+            break;
+        case (VT_R8 | VT_BYREF) :
+            *V_R8REF(var) = NUM2DBL(val);
+            break;
+        default:
+            break;
+        }
+        break;
+    case T_BIGNUM:
+        if (V_VT(var) == (VT_R8 | VT_BYREF)) {
+            *V_R8REF(var) = rb_big2dbl(val);
+        }
+        break;
+    case T_TRUE:
+        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
+            *V_BOOLREF(var) = VARIANT_TRUE;
+        }
+        break;
+    case T_FALSE:
+        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
+            *V_BOOLREF(var) = VARIANT_FALSE;
+        }
+        break;
+    default:
+        break;
+    }
+}
+
+static void
+ary2ptr_dispparams(ary, pdispparams)
+    VALUE ary;
+    DISPPARAMS *pdispparams;
+{
+    int i;
+    VALUE v;
+    VARIANT *pvar;
+    for(i = 0; i < RARRAY(ary)->len && (unsigned int) i < pdispparams->cArgs; i++) {
+        v = rb_ary_entry(ary, i);
+        pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
+        val2ptr_variant(v, pvar);
+    }
+}
+
+STDMETHODIMP EVENTSINK_Invoke(
+    PEVENTSINK pEventSink,
+    DISPID dispid,
+    REFIID riid,
+    LCID lcid,
+    WORD wFlags,
+    DISPPARAMS *pdispparams,
+    VARIANT *pvarResult,
+    EXCEPINFO *pexcepinfo,
+    UINT *puArgErr
+    ) {
+
+    HRESULT hr;
+    BSTR bstr;
+    unsigned int count;
+    unsigned int i;
+    ITypeInfo *pTypeInfo;
+    VARIANT *pvar;
+    VALUE ary, obj, event, handler, args, argv, ev, result;
+    BOOL is_default_handler = FALSE;
+
+    PIEVENTSINKOBJ pEV = (PIEVENTSINKOBJ)pEventSink;
+    pTypeInfo = pEV->pTypeInfo;
+
+    obj = rb_ary_entry(ary_ole_event, pEV->m_event_id);
+    if (!rb_obj_is_kind_of(obj, cWIN32OLE_EVENT)) {
+        return NOERROR;
+    }
+
+    ary = rb_ivar_get(obj, id_events);
+    if (NIL_P(ary) || TYPE(ary) != T_ARRAY) {
+        return NOERROR;
+    }
+    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, dispid,
+                                     &bstr, 1, &count);
+    if (FAILED(hr)) {
+        return NOERROR;
+    }
+    ev = WC2VSTR(bstr);
+    event = ole_search_event(ary, ev, &is_default_handler);
+    if (NIL_P(event)) {
+        return NOERROR;
+    }
+    args = rb_ary_new();
+    if (is_default_handler) {
+        rb_ary_push(args, ev);
+    }
+
+    /* make argument of event handler */
+    for (i = 0; i < pdispparams->cArgs; ++i) {
+        pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
+        rb_ary_push(args, ole_variant2val(pvar));
+    }
+    handler = rb_ary_entry(event, 0);
+
+    if (rb_ary_entry(event, 3) == Qtrue) {
+        argv = rb_ary_new();
+        rb_ary_push(args, argv);
+        result = rb_apply(handler, rb_intern("call"), args);
+        ary2ptr_dispparams(argv, pdispparams);
+    }
+    else {
+        result = rb_apply(handler, rb_intern("call"), args);
+    }
+
+    if (pvarResult) {
+        ole_val2variant(result, pvarResult);
+    }
+    
+    return NOERROR;
+}
+
+PIEVENTSINKOBJ
+EVENTSINK_Constructor() {
+    PIEVENTSINKOBJ pEv;
+    if (!g_IsEventSinkVtblInitialized) {
+        vtEventSink.QueryInterface=EVENTSINK_QueryInterface;
+        vtEventSink.AddRef = EVENTSINK_AddRef;
+        vtEventSink.Release = EVENTSINK_Release;
+        vtEventSink.Invoke = EVENTSINK_Invoke;
+        vtEventSink.GetIDsOfNames = EVENTSINK_GetIDsOfNames;
+        vtEventSink.GetTypeInfoCount = EVENTSINK_GetTypeInfoCount;
+        vtEventSink.GetTypeInfo = EVENTSINK_GetTypeInfo;
+
+        g_IsEventSinkVtblInitialized = TRUE;
+    }
+    pEv = ALLOC_N(IEVENTSINKOBJ, 1);
+    if(pEv == NULL) return NULL;
+    pEv->lpVtbl = &vtEventSink;
+    pEv->m_cRef = 0;
+    pEv->m_event_id = 0;
+    pEv->m_dwCookie = 0;
+    pEv->pConnectionPoint = NULL;
+    pEv->pTypeInfo = NULL;
+    pEv->ptr_freed = NULL;
+    return pEv;
+}
+
+void EVENTSINK_Destructor(
+    PIEVENTSINKOBJ pEVObj
+    ) {
+    if(pEVObj != NULL) {
+        *(pEVObj->ptr_freed) = 1;
+        free(pEVObj);
+    }
+}
+
+static HRESULT
+find_iid(ole, pitf, piid, ppTypeInfo)
+    VALUE ole;
+    char *pitf;
+    IID *piid;
+    ITypeInfo **ppTypeInfo;
+{
+    HRESULT hr;
+    IDispatch *pDispatch;
+    ITypeInfo *pTypeInfo;
+    ITypeLib *pTypeLib;
+    TYPEATTR *pTypeAttr;
+    HREFTYPE RefType;
+    ITypeInfo *pImplTypeInfo;
+    TYPEATTR *pImplTypeAttr;
+
+    struct oledata *pole;
+    unsigned int index;
+    unsigned int count;
+    int type;
+    BSTR bstr;
+    char *pstr;
+
+    BOOL is_found = FALSE;
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
+
+    OLEData_Get_Struct(ole, pole);
+
+    pDispatch = pole->pDispatch;
+
+    hr = pDispatch->lpVtbl->GetTypeInfo(pDispatch, 0, lcid, &pTypeInfo);
+    if (FAILED(hr))
+        return hr;
+
+    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo,
+                                                 &pTypeLib,
+                                                 &index);
+    OLE_RELEASE(pTypeInfo);
+    if (FAILED(hr))
+        return hr;
+
+    if (!pitf) {
+        hr = pTypeLib->lpVtbl->GetTypeInfoOfGuid(pTypeLib,
+                                                 piid,
+                                                 ppTypeInfo);
+        OLE_RELEASE(pTypeLib);
+        return hr;
+    }
+    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
+    for (index = 0; index < count; index++) {
+        hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib,
+                                           index,
+                                           &pTypeInfo);
+        if (FAILED(hr))
+            break;
+        hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+
+        if(FAILED(hr)) {
+            OLE_RELEASE(pTypeInfo);
+            break;
+        }
+        if(pTypeAttr->typekind == TKIND_COCLASS) {
+            for (type = 0; type < pTypeAttr->cImplTypes; type++) {
+                hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
+                                                             type,
+                                                             &RefType);
+                if (FAILED(hr))
+                    break;
+                hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
+                                                       RefType,
+                                                       &pImplTypeInfo);
+                if (FAILED(hr))
+                    break;
+
+                hr = pImplTypeInfo->lpVtbl->GetDocumentation(pImplTypeInfo,
+                                                             -1,
+                                                             &bstr,
+                                                             NULL, NULL, NULL);
+                if (FAILED(hr)) {
+                    OLE_RELEASE(pImplTypeInfo);
+                    break;
+                }
+                pstr = ole_wc2mb(bstr);
+                if (strcmp(pitf, pstr) == 0) {
+                    hr = pImplTypeInfo->lpVtbl->GetTypeAttr(pImplTypeInfo,
+                                                            &pImplTypeAttr);
+                    if (SUCCEEDED(hr)) {
+                        is_found = TRUE;
+                        *piid = pImplTypeAttr->guid;
+                        if (ppTypeInfo) {
+                            *ppTypeInfo = pImplTypeInfo;
+                            (*ppTypeInfo)->lpVtbl->AddRef((*ppTypeInfo));
+                        }
+                        pImplTypeInfo->lpVtbl->ReleaseTypeAttr(pImplTypeInfo,
+                                                               pImplTypeAttr);
+                    }
+                }
+                free(pstr);
+                OLE_RELEASE(pImplTypeInfo);
+                if (is_found || FAILED(hr))
+                    break;
+            }
+        }
+
+        OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+        OLE_RELEASE(pTypeInfo);
+        if (is_found || FAILED(hr))
+            break;
+    }
+    OLE_RELEASE(pTypeLib);
+    if(!is_found)
+        return E_NOINTERFACE;
+    return hr;
+}
+
+static HRESULT
+find_default_source(ole, piid, ppTypeInfo)
+    VALUE ole;
+    IID *piid;
+    ITypeInfo **ppTypeInfo;
+{
+    HRESULT hr;
+    IProvideClassInfo2 *pProvideClassInfo2;
+    IProvideClassInfo *pProvideClassInfo;
+
+    IDispatch *pDispatch;
+    ITypeInfo *pTypeInfo;
+    TYPEATTR *pTypeAttr;
+    int i;
+    int iFlags;
+    HREFTYPE hRefType;
+
+    struct oledata *pole;
+
+    OLEData_Get_Struct(ole, pole);
+    pDispatch = pole->pDispatch;
+    hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
+                                           &IID_IProvideClassInfo2,
+                                           (void**)&pProvideClassInfo2);
+    if (SUCCEEDED(hr)) {
+        hr = pProvideClassInfo2->lpVtbl->GetGUID(pProvideClassInfo2,
+                                                 GUIDKIND_DEFAULT_SOURCE_DISP_IID,
+                                                 piid);
+        OLE_RELEASE(pProvideClassInfo2);
+        return find_iid(ole, NULL, piid, ppTypeInfo);
+    }
+    hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
+                                           &IID_IProvideClassInfo,
+                                           (void**)&pProvideClassInfo);
+    if (FAILED(hr))
+        return hr;
+
+    hr = pProvideClassInfo->lpVtbl->GetClassInfo(pProvideClassInfo,
+                                                 &pTypeInfo);
+    OLE_RELEASE(pProvideClassInfo);
+    if (FAILED(hr))
+        return hr;
+
+    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
+    if (FAILED(hr)) {
+        OLE_RELEASE(pTypeInfo);
+        return hr;
+    }
+    /* Enumerate all implemented types of the COCLASS */
+    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
+        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &iFlags);
+        if (FAILED(hr))
+            continue;
+
+        /*
+           looking for the [default] [source]
+           we just hope that it is a dispinterface :-)
+        */
+        if ((iFlags & IMPLTYPEFLAG_FDEFAULT) &&
+            (iFlags & IMPLTYPEFLAG_FSOURCE)) {
+
+            hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
+                                                         i, &hRefType);
+            if (FAILED(hr))
+                continue;
+            hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
+                                                   hRefType, ppTypeInfo);
+            if (SUCCEEDED(hr))
+                break;
+        }
+    }
+
+    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
+    OLE_RELEASE(pTypeInfo);
+
+    /* Now that would be a bad surprise, if we didn't find it, wouldn't it? */
+    if (!*ppTypeInfo) {
+        if (SUCCEEDED(hr))
+            hr = E_UNEXPECTED;
+        return hr;
+    }
+
+    /* Determine IID of default source interface */
+    hr = (*ppTypeInfo)->lpVtbl->GetTypeAttr(*ppTypeInfo, &pTypeAttr);
+    if (SUCCEEDED(hr)) {
+        *piid = pTypeAttr->guid;
+        (*ppTypeInfo)->lpVtbl->ReleaseTypeAttr(*ppTypeInfo, pTypeAttr);
+    }
+    else
+        OLE_RELEASE(*ppTypeInfo);
+
+    return hr;
+
+}
+
+static void
+ole_event_free(poleev)
+    struct oleeventdata *poleev;
+{
+    ITypeInfo *pti = NULL;
+    IConnectionPoint *pcp = NULL;
+
+    if (poleev->freed == 1) {
+        /* 
+         * this return create memory leak.
+         * but poleev->pEvent->pConnectionPoint shoul'd not be freed
+         * until poleev-> freed == 0.
+         */
+        return;
+    }
+    if(poleev->pEvent) {
+        pti = poleev->pEvent->pTypeInfo;
+        if(pti) OLE_RELEASE(pti);
+        pcp = poleev->pEvent->pConnectionPoint;
+        if(pcp) {
+            pcp->lpVtbl->Unadvise(pcp, poleev->pEvent->m_dwCookie);
+            OLE_RELEASE(pcp);
+        }
+        free(poleev);
+    }
+}
+
+static VALUE fev_s_allocate _((VALUE));
+static VALUE
+fev_s_allocate(klass)
+    VALUE klass;
+{
+    VALUE obj;
+    struct oleeventdata *poleev;
+    obj = Data_Make_Struct(klass,struct oleeventdata,0,ole_event_free,poleev);
+    poleev->pEvent = NULL;
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_EVENT.new(ole, event) #=> WIN32OLE_EVENT object.
+ *
+ *  Returns OLE event object.
+ *  The first argument specifies WIN32OLE object.
+ *  The second argument specifies OLE event name.
+ *     ie = WIN32OLE.new('InternetExplorer.Application')
+ *     ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
+ */     
+static VALUE
+fev_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE ole, itf;
+    struct oledata *pole;
+    char *pitf;
+    HRESULT hr;
+    IID iid;
+    ITypeInfo *pTypeInfo;
+    IDispatch *pDispatch;
+    IConnectionPointContainer *pContainer;
+    IConnectionPoint *pConnectionPoint;
+    IEVENTSINKOBJ *pIEV;
+    DWORD dwCookie = 0;
+    struct oleeventdata *poleev;
+
+    rb_secure(4);
+    rb_scan_args(argc, argv, "11", &ole, &itf);
+
+    if (!rb_obj_is_kind_of(ole, cWIN32OLE)) {
+        rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE object");
+    }
+
+    if(TYPE(itf) != T_NIL) {
+        if (ruby_safe_level > 0 && OBJ_TAINTED(itf)) {
+            rb_raise(rb_eSecurityError, "Insecure Event Creation - %s",
+                     StringValuePtr(itf));
+        }
+        Check_SafeStr(itf);
+        pitf = StringValuePtr(itf);
+        hr = find_iid(ole, pitf, &iid, &pTypeInfo);
+    }
+    else {
+        hr = find_default_source(ole, &iid, &pTypeInfo);
+    }
+    if (FAILED(hr)) {
+        ole_raise(hr, rb_eRuntimeError, "interface not found");
+    }
+
+    OLEData_Get_Struct(ole, pole);
+    pDispatch = pole->pDispatch;
+    hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
+                                           &IID_IConnectionPointContainer,
+                                           (void**)&pContainer);
+    if (FAILED(hr)) {
+        OLE_RELEASE(pTypeInfo);
+        ole_raise(hr, rb_eRuntimeError,
+                  "failed to query IConnectionPointContainer");
+    }
+
+    hr = pContainer->lpVtbl->FindConnectionPoint(pContainer,
+                                                 &iid,
+                                                 &pConnectionPoint);
+    OLE_RELEASE(pContainer);
+    if (FAILED(hr)) {
+        OLE_RELEASE(pTypeInfo);
+        ole_raise(hr, rb_eRuntimeError, "failed to query IConnectionPoint");
+    }
+    pIEV = EVENTSINK_Constructor();
+    pIEV->m_iid = iid;
+    hr = pConnectionPoint->lpVtbl->Advise(pConnectionPoint,
+                                          (IUnknown*)pIEV,
+                                          &dwCookie);
+    if (FAILED(hr)) {
+        ole_raise(hr, rb_eRuntimeError, "Advise Error");
+    }
+
+    Data_Get_Struct(self, struct oleeventdata, poleev);
+    poleev->pEvent = pIEV;
+    poleev->pEvent->m_event_id
+        = NUM2INT(rb_funcall(ary_ole_event, rb_intern("length"), 0));
+    poleev->pEvent->pConnectionPoint = pConnectionPoint;
+    poleev->pEvent->pTypeInfo = pTypeInfo;
+    poleev->pEvent->m_dwCookie = dwCookie;
+    poleev->freed = 0;
+    poleev->pEvent->ptr_freed = &(poleev->freed);
+    rb_ary_push(ary_ole_event, self);
+    return self;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_EVENT.message_loop
+ * 
+ *  Translates and dispatches Windows message.
+ */
+static VALUE
+fev_s_msg_loop(klass)
+    VALUE klass;
+{
+    ole_msg_loop();
+    return Qnil;
+}
+
+
+static void
+add_event_call_back(obj, event, data)
+    VALUE obj;
+    VALUE event;
+    VALUE data;
+{
+    long at;
+    VALUE events = rb_ivar_get(obj, id_events);
+    if (NIL_P(events) || TYPE(events) != T_ARRAY) {
+        events = rb_ary_new();
+        rb_ivar_set(obj, id_events, events);
+    }
+    at = ole_search_event_at(events, event);
+    if (at > -1) {
+        rb_ary_delete_at(events, at);
+    }
+    rb_ary_push(events, data);
+}
+
+static VALUE
+ev_on_event(argc, argv, self, is_ary_arg)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+    VALUE is_ary_arg;
+{
+    VALUE event, args, data;
+    rb_scan_args(argc, argv, "01*", &event, &args);
+    if(!NIL_P(event)) {
+        Check_SafeStr(event);
+    }
+    data = rb_ary_new3(4, rb_block_proc(), event, args, is_ary_arg);
+    add_event_call_back(self, event, data);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_EVENT#on_event([event]){...}
+ * 
+ *  Defines the callback event.
+ *  If argument is omitted, this method defines the callback of all events.
+ *    ie = WIN32OLE.new('InternetExplorer.Application')
+ *    ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
+ *    ev.on_event("NavigateComplete") {|url| puts url}
+ */
+static VALUE
+fev_on_event(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    return ev_on_event(argc, argv, self, Qfalse);
+}
+
+/*
+ *  call-seq:
+ *     WIN32OLE_EVENT#on_event_with_outargs([event]){...}
+ * 
+ *  Defines the callback of event.
+ *  If you want modify argument in callback, 
+ *  you should use this method instead of WIN32OLE_EVENT#on_event.
+ */
+static VALUE
+fev_on_event_with_outargs(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    return ev_on_event(argc, argv, self, Qtrue);
+}
+
+
+void
+Init_win32ole()
+{
+    rb_global_variable(&ary_ole_event);
+    ary_ole_event = rb_ary_new();
+    id_events = rb_intern("events");
+
+    rb_global_variable(&com_hash);
+    com_vtbl.QueryInterface = QueryInterface;
+    com_vtbl.AddRef = AddRef;
+    com_vtbl.Release = Release;
+    com_vtbl.GetTypeInfoCount = GetTypeInfoCount;
+    com_vtbl.GetTypeInfo = GetTypeInfo;
+    com_vtbl.GetIDsOfNames = GetIDsOfNames;
+    com_vtbl.Invoke = Invoke;
+    com_hash = Data_Wrap_Struct(rb_cData, rb_mark_hash, st_free_table, st_init_numtable());
+
+    cWIN32OLE = rb_define_class("WIN32OLE", rb_cObject);
+
+    rb_define_alloc_func(cWIN32OLE, fole_s_allocate);
+
+    rb_define_method(cWIN32OLE, "initialize", fole_initialize, -1);
+
+    rb_define_singleton_method(cWIN32OLE, "connect", fole_s_connect, -1);
+    rb_define_singleton_method(cWIN32OLE, "const_load", fole_s_const_load, -1);
+
+    rb_define_singleton_method(cWIN32OLE, "ole_free", fole_s_free, 1);
+    rb_define_singleton_method(cWIN32OLE, "ole_reference_count", fole_s_reference_count, 1);
+    rb_define_singleton_method(cWIN32OLE, "ole_show_help", fole_s_show_help, -1);
+    rb_define_singleton_method(cWIN32OLE, "codepage", fole_s_get_code_page, 0);
+    rb_define_singleton_method(cWIN32OLE, "codepage=", fole_s_set_code_page, 1);
+
+
+    rb_define_method(cWIN32OLE, "invoke", fole_invoke, -1);
+    rb_define_method(cWIN32OLE, "[]", fole_getproperty, -1);
+    rb_define_method(cWIN32OLE, "_invoke", fole_invoke2, 3);
+    rb_define_method(cWIN32OLE, "_getproperty", fole_getproperty2, 3);
+    rb_define_method(cWIN32OLE, "_setproperty", fole_setproperty2, 3);
+
+    /* support propput method that takes an argument */
+    rb_define_method(cWIN32OLE, "[]=", fole_setproperty, -1); 
+
+    rb_define_method(cWIN32OLE, "ole_free", fole_free, 0);
+
+    rb_define_method(cWIN32OLE, "each", fole_each, 0);
+    rb_define_method(cWIN32OLE, "method_missing", fole_missing, -1);
+
+    /* support setproperty method much like Perl ;-) */
+    rb_define_method(cWIN32OLE, "setproperty", fole_setproperty, -1);
+
+    rb_define_method(cWIN32OLE, "ole_methods", fole_methods, 0);
+    rb_define_method(cWIN32OLE, "ole_get_methods", fole_get_methods, 0);
+    rb_define_method(cWIN32OLE, "ole_put_methods", fole_put_methods, 0);
+    rb_define_method(cWIN32OLE, "ole_func_methods", fole_func_methods, 0);
+
+    rb_define_method(cWIN32OLE, "ole_method", fole_method_help, 1);
+    rb_define_alias(cWIN32OLE, "ole_method_help", "ole_method");
+    rb_define_method(cWIN32OLE, "ole_obj_help", fole_obj_help, 0);
+
+    rb_define_const(cWIN32OLE, "VERSION", rb_str_new2(WIN32OLE_VERSION));
+    rb_define_const(cWIN32OLE, "ARGV", rb_ary_new());
+    rb_define_const(cWIN32OLE, "CP_ACP"       ,INT2FIX(CP_ACP));
+    rb_define_const(cWIN32OLE, "CP_OEMCP"     ,INT2FIX(CP_OEMCP));
+    rb_define_const(cWIN32OLE, "CP_MACCP"     ,INT2FIX(CP_MACCP));
+    rb_define_const(cWIN32OLE, "CP_THREAD_ACP",INT2FIX(CP_THREAD_ACP));
+    rb_define_const(cWIN32OLE, "CP_SYMBOL"    ,INT2FIX(CP_SYMBOL));
+    rb_define_const(cWIN32OLE, "CP_UTF7"      ,INT2FIX(CP_UTF7));
+    rb_define_const(cWIN32OLE, "CP_UTF8"      ,INT2FIX(CP_UTF8));
+
+    mWIN32OLE_VARIANT = rb_define_module_under(cWIN32OLE, "VARIANT");
+    rb_define_const(mWIN32OLE_VARIANT, "VT_I2", INT2FIX(VT_I2));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_I4", INT2FIX(VT_I4));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_R4", INT2FIX(VT_R4));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_R8", INT2FIX(VT_R8));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_CY", INT2FIX(VT_CY));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_DATE", INT2FIX(VT_DATE));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_BSTR", INT2FIX(VT_BSTR));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_USERDEFINED", INT2FIX(VT_USERDEFINED));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_PTR", INT2FIX(VT_PTR));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_DISPATCH", INT2FIX(VT_DISPATCH));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_ERROR", INT2FIX(VT_ERROR));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_BOOL", INT2FIX(VT_BOOL));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_VARIANT", INT2FIX(VT_VARIANT));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UNKNOWN", INT2FIX(VT_UNKNOWN));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_I1", INT2FIX(VT_I1));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UI1", INT2FIX(VT_UI1));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UI2", INT2FIX(VT_UI2));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UI4", INT2FIX(VT_UI4));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_INT", INT2FIX(VT_INT));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_UINT", INT2FIX(VT_UINT));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_ARRAY", INT2FIX(VT_ARRAY));
+    rb_define_const(mWIN32OLE_VARIANT, "VT_BYREF", INT2FIX(VT_BYREF));
+    
+    cWIN32OLE_TYPE = rb_define_class("WIN32OLE_TYPE", rb_cObject);
+    rb_define_singleton_method(cWIN32OLE_TYPE, "ole_classes", foletype_s_ole_classes, 1);
+    rb_define_singleton_method(cWIN32OLE_TYPE, "typelibs", foletype_s_typelibs, 0);
+    rb_define_singleton_method(cWIN32OLE_TYPE, "progids", foletype_s_progids, 0);
+    rb_define_alloc_func(cWIN32OLE_TYPE, foletype_s_allocate);
+    rb_define_method(cWIN32OLE_TYPE, "initialize", foletype_initialize, 2);
+    rb_define_method(cWIN32OLE_TYPE, "name", foletype_name, 0);
+    rb_define_method(cWIN32OLE_TYPE, "ole_type", foletype_ole_type, 0);
+    rb_define_method(cWIN32OLE_TYPE, "guid", foletype_guid, 0);
+    rb_define_method(cWIN32OLE_TYPE, "progid", foletype_progid, 0);
+    rb_define_method(cWIN32OLE_TYPE, "visible?", foletype_visible, 0);
+    rb_define_alias(cWIN32OLE_TYPE, "to_s", "name");
+
+    rb_define_method(cWIN32OLE_TYPE, "major_version", foletype_major_version, 0);
+    rb_define_method(cWIN32OLE_TYPE, "minor_version", foletype_minor_version, 0);
+    rb_define_method(cWIN32OLE_TYPE, "typekind", foletype_typekind, 0);
+    rb_define_method(cWIN32OLE_TYPE, "helpstring", foletype_helpstring, 0);
+    rb_define_method(cWIN32OLE_TYPE, "src_type", foletype_src_type, 0);
+    rb_define_method(cWIN32OLE_TYPE, "helpfile", foletype_helpfile, 0);
+    rb_define_method(cWIN32OLE_TYPE, "helpcontext", foletype_helpcontext, 0);
+    rb_define_method(cWIN32OLE_TYPE, "variables", foletype_variables, 0);
+    rb_define_method(cWIN32OLE_TYPE, "ole_methods", foletype_methods, -1);
+
+    cWIN32OLE_VARIABLE = rb_define_class("WIN32OLE_VARIABLE", rb_cObject);
+    rb_define_method(cWIN32OLE_VARIABLE, "name", folevariable_name, 0);
+    rb_define_method(cWIN32OLE_VARIABLE, "ole_type", folevariable_ole_type, 0);
+    rb_define_method(cWIN32OLE_VARIABLE, "ole_type_detail", folevariable_ole_type_detail, 0);
+    rb_define_method(cWIN32OLE_VARIABLE, "value", folevariable_value, 0);
+    rb_define_method(cWIN32OLE_VARIABLE, "visible?", folevariable_visible, 0);
+    rb_define_method(cWIN32OLE_VARIABLE, "variable_kind", folevariable_variable_kind, 0);
+    rb_define_method(cWIN32OLE_VARIABLE, "varkind", folevariable_varkind, 0);
+    rb_define_alias(cWIN32OLE_VARIABLE, "to_s", "name");
+
+    cWIN32OLE_METHOD = rb_define_class("WIN32OLE_METHOD", rb_cObject);
+    rb_define_alloc_func(cWIN32OLE_METHOD, folemethod_s_allocate);
+    rb_define_method(cWIN32OLE_METHOD, "initialize", folemethod_initialize, 2);
+
+    rb_define_method(cWIN32OLE_METHOD, "name", folemethod_name, 0);
+    rb_define_method(cWIN32OLE_METHOD, "return_type", folemethod_return_type, 0);
+    rb_define_method(cWIN32OLE_METHOD, "return_vtype", folemethod_return_vtype, 0);
+    rb_define_method(cWIN32OLE_METHOD, "return_type_detail", folemethod_return_type_detail, 0);
+    rb_define_method(cWIN32OLE_METHOD, "invoke_kind", folemethod_invoke_kind, 0);
+    rb_define_method(cWIN32OLE_METHOD, "invkind", folemethod_invkind, 0);
+    rb_define_method(cWIN32OLE_METHOD, "visible?", folemethod_visible, 0);
+    rb_define_method(cWIN32OLE_METHOD, "event?", folemethod_event, 0);
+    rb_define_method(cWIN32OLE_METHOD, "event_interface", folemethod_event_interface, 0);
+    rb_define_method(cWIN32OLE_METHOD, "helpstring", folemethod_helpstring, 0);
+    rb_define_method(cWIN32OLE_METHOD, "helpfile", folemethod_helpfile, 0);
+    rb_define_method(cWIN32OLE_METHOD, "helpcontext", folemethod_helpcontext, 0);
+    rb_define_method(cWIN32OLE_METHOD, "dispid", folemethod_dispid, 0);
+    rb_define_method(cWIN32OLE_METHOD, "offset_vtbl", folemethod_offset_vtbl, 0);
+    rb_define_method(cWIN32OLE_METHOD, "size_params", folemethod_size_params, 0);
+    rb_define_method(cWIN32OLE_METHOD, "size_opt_params", folemethod_size_opt_params, 0);
+    rb_define_method(cWIN32OLE_METHOD, "params", folemethod_params, 0);
+    rb_define_alias(cWIN32OLE_METHOD, "to_s", "name");
+
+    cWIN32OLE_PARAM = rb_define_class("WIN32OLE_PARAM", rb_cObject);
+    rb_define_method(cWIN32OLE_PARAM, "name", foleparam_name, 0);
+    rb_define_method(cWIN32OLE_PARAM, "ole_type", foleparam_ole_type, 0);
+    rb_define_method(cWIN32OLE_PARAM, "ole_type_detail", foleparam_ole_type_detail, 0);
+    rb_define_method(cWIN32OLE_PARAM, "input?", foleparam_input, 0);
+    rb_define_method(cWIN32OLE_PARAM, "output?", foleparam_output, 0);
+    rb_define_method(cWIN32OLE_PARAM, "optional?", foleparam_optional, 0);
+    rb_define_method(cWIN32OLE_PARAM, "retval?", foleparam_retval, 0);
+    rb_define_method(cWIN32OLE_PARAM, "default", foleparam_default, 0);
+    rb_define_alias(cWIN32OLE_PARAM, "to_s", "name");
+ 
+    cWIN32OLE_EVENT = rb_define_class("WIN32OLE_EVENT", rb_cObject);
+
+    rb_define_alloc_func(cWIN32OLE_EVENT, fev_s_allocate);
+    rb_define_method(cWIN32OLE_EVENT, "initialize", fev_initialize, -1);
+    rb_define_singleton_method(cWIN32OLE_EVENT, "message_loop", fev_s_msg_loop, 0);
+
+    rb_define_method(cWIN32OLE_EVENT, "on_event", fev_on_event, -1);
+    rb_define_method(cWIN32OLE_EVENT, "on_event_with_outargs", fev_on_event_with_outargs, -1);
+    eWIN32OLE_RUNTIME_ERROR = rb_define_class("WIN32OLERuntimeError", rb_eRuntimeError);
+}
diff --git a/ruby_1_8_6/ext/zlib/.cvsignore b/ruby_1_8_6/ext/zlib/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ruby_1_8_6/ext/zlib/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ruby_1_8_6/ext/zlib/doc/zlib.rd b/ruby_1_8_6/ext/zlib/doc/zlib.rd
new file mode 100644
index 0000000000..6a36dc7fed
--- /dev/null
+++ b/ruby_1_8_6/ext/zlib/doc/zlib.rd
@@ -0,0 +1,911 @@
+=begin
+#
+# zlib.rd.src
+#
+#   Copyright (C) UENO Katsuhiro 2000-2003
+#
+# $Id$
+#
+
+= Ruby/zlib version 0.6.0
+
+Ruby/zlib is an extension library to use zlib from Ruby.
+Ruby/zlib also provides the features for accessing gzipped files.
+
+You can modify or redistribute Ruby/zlib in the same manner of
+Ruby interpreter. The latest version of Ruby/zlib would be found
+at ((<URL:http://www.blue.sky.or.jp/>)).
+
+Any comments and suggestions are always welcome. Please send
+them to ruby-list ML, ruby-ext ML, ruby-talk ML, or the author's
+mail address ((<URL:mailto:katsu@blue.sky.or.jp>)).
+
+This document is experimental and broken English version.
+If you find some mistakes or strange expressions (including
+kidding or unnatural ones) in this document, please let me know
+for my study.
+
+* ((<Zlib>))
+
+  * ((<Zlib::Error>))
+  * ((<Zlib::ZStream>))
+  * ((<Zlib::Deflate>))
+  * ((<Zlib::Inflate>))
+  * ((<Zlib::GzipFile>))
+  * ((<Zlib::GzipFile::Error>))
+  * ((<Zlib::GzipWriter>))
+  * ((<Zlib::GzipReader>))
+
+* ((<Changes from 0.5 to 0.6>))
+* ((<Changes from 0.4 to 0.5>))
+
+== Zlib
+
+Zlib is the module which provides the other features in zlib C
+library. See zlib.h for detail of each module function.
+
+=== Module Functions:
+
+--- Zlib.zlib_version
+
+    Returns the string which represents the version of zlib
+    library.
+
+--- Zlib.adler32([string[, adler]])
+
+    Calculates Alder-32 checksum for ((|string|)),
+    and returns updated value of ((|alder|)).
+    If ((|string|)) is omitted, it returns the Adler-32 initial
+    value. If ((|alder|)) is omitted, it assumes that the initial
+    value is given to ((|alder|)).
+
+--- Zlib.crc32([string[, crc]])
+
+    Calculates CRC checksum for ((|string|)), and returns
+    updated value of ((|crc|)). If ((|string|)) is omitted,
+    it returns the CRC initial value. ((|crc|)) is omitted,
+    it assumes that the initial value is given to ((|crc|)).
+
+--- Zlib.crc_table
+
+    Returns the table for calculating CRC checksum as an array.
+
+=== Constants:
+
+--- Zlib::VERSION
+
+    The Ruby/zlib version string.
+
+--- Zlib::ZLIB_VERSION
+
+    The string which represents the version of zlib.h.
+
+--- Zlib::BINARY
+--- Zlib::ASCII
+--- Zlib::UNKNOWN
+
+    The integers representing data types which
+    ((<Zlib::ZStream#data_type>)) method returns.
+
+--- Zlib::NO_COMPRESSION
+--- Zlib::BEST_SPEED
+--- Zlib::BEST_COMPRESSION
+--- Zlib::DEFAULT_COMPRESSION
+
+    The integers representing compression levels which are
+    an argument for ((<Zlib::Deflate.new>)),
+    ((<Zlib::Deflate#deflate>)), and so on.
+
+--- Zlib::FILTERED
+--- Zlib::HUFFMAN_ONLY
+--- Zlib::DEFAULT_STRATEGY
+
+    The integers representing compression methods which are
+    an argument for ((<Zlib::Deflate.new>)) and
+    ((<Zlib::Deflate#params>)).
+
+--- Zlib::DEF_MEM_LEVEL
+--- Zlib::MAX_MEM_LEVEL
+
+    The integers representing memory levels which are an
+    argument for ((<Zlib::Deflate.new>)),
+    ((<Zlib::Deflate#params>)), and so on.
+
+--- Zlib::MAX_WBITS
+
+    The default value of ((|windowBits|)) which is an argument for
+    ((<Zlib::Deflate.new>)) and ((<Zlib::Inflate.new>)).
+
+--- Zlib::NO_FLUSH
+--- Zlib::SYNC_FLUSH
+--- Zlib::FULL_FLUSH
+--- Zlib::FINISH
+
+    The integers to control the output of the deflate stream,
+    which are an argument for ((<Zlib::Deflate#deflate>)) and so on.
+
+--- Zlib::OS_CODE
+--- Zlib::OS_MSDOS
+--- Zlib::OS_AMIGA
+--- Zlib::OS_VMS
+--- Zlib::OS_UNIX
+--- Zlib::OS_VMCMS
+--- Zlib::OS_ATARI
+--- Zlib::OS_OS2
+--- Zlib::OS_MACOS
+--- Zlib::OS_ZSYSTEM
+--- Zlib::OS_CPM
+--- Zlib::OS_TOPS20
+--- Zlib::OS_WIN32
+--- Zlib::OS_QDOS
+--- Zlib::OS_RISCOS
+--- Zlib::OS_UNKNOWN
+
+    The return values of ((<Zlib::GzipFile#os_code>)) method.
+
+
+== Zlib::Error
+
+The superclass for all exceptions raised by Ruby/zlib.
+
+The following exceptions are defined as subclasses of Zlib::Error.
+These exceptions are raised when zlib library functions return
+with an error status.
+
+  * Zlib::StreamEnd
+  * Zlib::NeedDict
+  * Zlib::DataError
+  * Zlib::StreamError
+  * Zlib::MemError
+  * Zlib::BufError
+  * Zlib::VersionError
+
+=== SuperClass:
+
+* StandardError
+
+
+== Zlib::ZStream
+
+The abstract class for the stream which handles the compressed
+data. The operations are defined in the subclasses,
+((<Zlib::Deflate>)) for compression, and ((<Zlib::Inflate>))
+for decompression.
+
+An instance of Zlib::ZStream has one stream (struct zstream) and
+two variable-length buffers which associated to the input
+(next_in) of the stream and the output (next_out) of the stream.
+In this document, "input buffer" means the buffer for input, and
+"output buffer" means the buffer for output.
+
+Data inputed into an instance of Zlib::ZStream are temporally
+stored into the end of input buffer, and then data in input buffer
+are processed from the beginning of the buffer until no more
+output from the stream is produced (i.e. until avail_out > 0
+after processing). During processing, output buffer is allocated
+and expanded automatically to hold all output data.
+
+Some particular instance methods consume the data in output buffer
+and return them as a String.
+
+Here is an ascii art for describing above:
+
+     +================ an instance of Zlib::ZStream ================+
+     ||                                                            ||
+     ||     +--------+          +-------+          +--------+      ||
+     ||  +--| output |<---------|zstream|<---------| input  |<--+  ||
+     ||  |  | buffer |  next_out+-------+next_in   | buffer |   |  ||
+     ||  |  +--------+                             +--------+   |  ||
+     ||  |                                                      |  ||
+     +===|======================================================|===+
+         |                                                      |
+         v                                                      |
+     "output data"                                         "input data"
+
+If an error is occurred during processing input buffer,
+an exception which is a subclass of ((<Zlib::Error>)) is raised.
+At that time, both input and output buffer keeps their conditions
+at the time when the error is occurred.
+
+=== SuperClass:
+
+* Object
+
+=== Class Methods:
+
+--- Zlib::ZStream.new
+
+    See ((<Zlib::Deflate.new>)) and ((<Zlib::Inflate.new>)).
+
+=== Methods:
+
+--- Zlib::ZStream#avail_in
+
+    Returns bytes of data in input buffer.
+    Normally, returns 0.
+
+--- Zlib::ZStream#avail_out
+
+    Returns bytes of free spaces in output buffer.
+    Because the free spaces are allocated automatically,
+    this method returns 0 normally.
+
+--- Zlib::ZStream#avail_out = size
+
+    Allocates free spaces of ((|size|)) bytes in output buffer.
+    If there are more than ((|size|)) bytes spaces in the buffer,
+    the buffer is truncated.
+    Because the free spaces are allocated automatically,
+    you usually need not to use this method.
+
+--- Zlib::ZStream#flush_next_in
+
+    Flushes input buffer and returns all data in that buffer.
+
+--- Zlib::ZStream#flush_next_out
+
+    Flushes output buffer and returns all data in that buffer.
+
+--- Zlib::ZStream#total_in
+
+    Returns the total bytes of the input data to the stream.
+
+--- Zlib::ZStream#total_out
+
+    Returns the total bytes of the output data from the stream.
+
+--- Zlib::ZStream#data_type
+
+    Guesses the type of the data which have been inputed into
+    the stream. The returned value is either ((<Zlib::BINARY>)),
+    ((<Zlib::ASCII>)), or ((<Zlib::UNKNOWN>)).
+
+--- Zlib::ZStream#adler
+
+    Returns the alder-32 checksum.
+
+--- Zlib::ZStream#reset
+
+    Resets and initializes the stream. All data in both
+    input and output buffer are discarded.
+
+--- Zlib::ZStream#finish
+
+    Finishes the stream and flushes output buffer.
+    See ((<Zlib::Deflate#finish>)) and ((<Zlib::Inflate#finish>))
+    for detail of the behavior.
+
+--- Zlib::ZStream#finished?
+--- Zlib::ZStream#stream_end?
+
+    Returns true if the stream is finished.
+
+--- Zlib::ZStream#close
+--- Zlib::ZStream#end
+
+    Closes the stream. All operations on the closed stream
+    will raise an exception.
+
+--- Zlib::ZStream#closed?
+--- Zlib::ZStream#ended?
+
+    Returns true if the stream closed.
+
+
+== Zlib::Deflate
+
+The class for compressing string data.
+
+=== SuperClass:
+
+* ((<Zlib::ZStream>))
+
+=== Class Methods:
+
+--- Zlib::Deflate.deflate(string[, level])
+
+    Compresses ((|string|)). The avail values of ((|level|)) are
+    ((<Zlib::NO_COMPRESSION>)), ((<Zlib::BEST_SPEED>)),
+    ((<Zlib::BEST_COMPRESSION>)), ((<Zlib::DEFAULT_COMPRESSION>)),
+    and the integer from 0 to 9.
+
+    This method is almost equivalent to the following code:
+
+      def deflate(string, level)
+        z = Zlib::Deflate.new(level)
+        dst = z.deflate(string, Zlib::FINISH)
+        z.close
+        dst
+      end
+
+--- Zlib::Deflate.new([level[, windowBits[, memlevel[, strategy]]]])
+
+    Creates a new deflate stream for compression.
+    See zlib.h for details of each argument.
+    If an argument is nil, the default value of that
+    argument is used.
+
+=== Methods:
+
+--- Zlib::Deflate#clone
+
+    Duplicates the deflate stream.
+
+--- Zlib::Deflate#deflate(string[, flush])
+
+    Inputs ((|string|)) into the deflate stream and returns
+    the output from the stream. Calling this method,
+    both input and output buffer of the stream are flushed.
+    If ((|string|)) is nil, this method finishes the stream,
+    just like ((<Zlib::ZStream#finish>)).
+    The value of ((|flush|)) should be either ((<Zlib::NO_FLUSH>)),
+    ((<Zlib::SYNC_FLUSH>)), ((<Zlib::FULL_FLUSH>)), or
+    ((<Zlib::FINISH>)).
+    See zlib.h for details.
+
+--- Zlib::Deflate#<< string
+
+    Inputs ((|string|)) into the deflate stream just like
+    ((<Zlib::Deflate#deflate>)), but returns Zlib::Deflate object
+    itself. The output from the stream is preserved in output
+    buffer.
+
+--- Zlib::Deflate#flush([flush])
+
+    This method is equivalent to (({deflate('', ((|flush|)))})).
+    If ((|flush|)) is omitted, ((<Zlib::SYNC_FLUSH>)) is used
+    as ((|flush|)). This method is just provided for
+    readability of your Ruby script.
+
+--- Zlib::Deflate#finish
+
+    Finishes the stream. This method is equivalent to
+    (({deflate('', Zlib::FINISH)})).
+
+--- Zlib::Deflate#params(level, strategy)
+
+    Changes the parameters of the deflate stream.
+    See zlib.h for details. The output from the stream
+    by changing the params is preserved in output buffer.
+
+--- Zlib::Deflate#set_dictionary(string)
+
+    Sets the preset dictionary and returns ((|string|)).
+    This method is available just only after
+    ((<Zlib::Deflate.new>)) or ((<Zlib::ZStream#reset>)) method
+    was called. See zlib.h for details.
+
+
+== Zlib::Inflate
+
+The class for decompressing compressed data.
+Unlike ((<Zlib::Deflate>)), an instance of this class is not able
+to duplicate (clone, dup) itself.
+
+=== SuperClass:
+
+* ((<Zlib::ZStream>))
+
+=== Class Methods:
+
+--- Zlib::Inflate.inflate(string)
+
+    Decompresses ((|string|)). Raises a ((<Zlib::NeedDict>))
+    exception if a preset dictionary is needed for decompression.
+
+    This method is almost equivalent to the following code:
+
+      def inflate(string)
+        zstream = Zlib::Inflate.new
+        buf = zstream.inflate(string)
+        zstream.finish
+        zstream.close
+        buf
+      end
+
+--- Zlib::Inflate.new([windowBits])
+
+    Creates a new inflate stream for decompression.
+    See zlib.h for details of the argument.
+    If ((|windowBits|)) is nil, the default value is used.
+
+=== Methods:
+
+--- Zlib::Inflate#inflate(string)
+
+    Inputs ((|string|)) into the inflate stream and returns
+    the output from the stream. Calling this method,
+    both input and output buffer of the stream are flushed.
+    If ((|string|)) is nil, this method finishes the stream,
+    just like ((<Zlib::ZStream#finish>)).
+
+    Raises a ((<Zlib::NeedDict>)) exception if a preset
+    dictionary is needed to decompress. Set the dictionary
+    by ((<Zlib::Inflate#set_dictionary>)) and then call
+    this method again with an empty string.
+
+--- Zlib::Inflate#<< string
+
+    Inputs ((|string|)) into the inflate stream just like
+    ((<Zlib::Inflate#inflate>)), but returns Zlib::Inflate object
+    itself. The output from the stream is preserved in output
+    buffer.
+
+--- Zlib::Inflate#finish
+
+    Finishes the inflate stream and returns the garbage
+    following the compressed data. Raises an exception
+    if the stream is not finished
+    (i.e. ((<Zlib::ZStream#finished?>)) doesn't returns true).
+
+    The inflate stream finishes itself as soon as it meets
+    the end code of the compressed data, you need not to call
+    this method explicitly. However, this method is useful
+    for checking whether the data is correctly ended or not.
+
+--- Zlib::Inflate#set_dictionary(string)
+
+    Sets the preset dictionary and returns ((|string|))
+    This method is available just only after a ((<Zlib::NeedDict>))
+    exception was raised. See zlib.h for details.
+
+--- Zlib::Inflate#sync(string)
+
+    Inputs ((|string|)) into the end of input buffer and
+    skips data until a full flush point can be found.
+    If the point is found in the buffer, this method flushes
+    the buffer and returns false. Otherwise it returns true
+    and the following data of full flush point is preserved
+    in the buffer.
+
+--- Zlib::Inflate#sync_point?
+
+    What is this?
+
+
+== Zlib::GzipFile
+
+The abstract class for handling a gzip formatted compressed file.
+The operations are defined in the subclasses,
+((<Zlib::GzipReader>)) for reading, and ((<Zlib::GzipWriter>))
+for writing.
+
+GzipReader should be used with associating an instance of IO class
+(or an object which has the same methods as IO has).
+
+=== SuperClass:
+
+* Object
+
+=== Class Methods:
+
+--- Zlib::GzipFile.new(args...)
+
+    See ((<Zlib::GzipReader.new>)) and ((<Zlib::GzipWriter.new>)).
+
+--- Zlib::GzipFile.wrap(args...) {|gz| ... }
+
+    See ((<Zlib::GzipReader.wrap>)) and ((<Zlib::GzipWriter.wrap>)).
+
+--- Zlib::GzipFile.open(args...) {|gz| ... }
+
+    See ((<Zlib::GzipReader.open>)) and ((<Zlib::GzipWriter.open>)).
+
+=== Methods:
+
+--- Zlib::GzipFile#closed?
+--- Zlib::GzipFile#to_io
+
+    Same as IO.
+
+--- Zlib::GzipFile#close
+
+    Closes the GzipFile object. This method calls close method
+    of the associated IO object. Returns the associated IO object.
+
+--- Zlib::GzipFile#finish
+
+    Closes the GzipFile object. Unlike ((<Zlib::GzipFile#close>)),
+    this method ((*never*)) calls close method of the associated IO
+    object. Returns the associated IO object.
+
+--- Zlib::GzipFile#crc
+
+    Returns CRC value of the uncompressed data.
+
+--- Zlib::GzipFile#level
+
+    Returns compression level.
+
+--- Zlib::GzipFile#mtime
+
+    Returns last modification time recorded in the gzip
+    file header.
+
+--- Zlib::GzipFile#os_code
+
+    Returns OS code number recorded in the gzip file header.
+
+--- Zlib::GzipFile#orig_name
+
+    Returns original filename recorded in the gzip file header,
+    or nil if original filename is not present.
+
+--- Zlib::GzipFile#comment
+
+    Returns comments recorded in the gzip file header, or
+    nil if the comments is not present.
+
+--- Zlib::GzipFile#sync
+--- Zlib::GzipFile#sync= flag
+
+    Same as IO. If ((|flag|)) is true, the associated IO object
+    must respond to flush method. While `sync' mode is true,
+    the compression ratio decreases sharply.
+
+
+== Zlib::GzipFile::Error
+
+The superclass for all exceptions raised during processing a gzip
+file.
+
+The following exceptions are defined as subclasses of
+Zlib::GzipFile::Error.
+
+: Zlib::GzipFile::NoFooter
+
+    Raised when gzip file footer has not found.
+
+: Zlib::GzipFile::CRCError
+
+    Raised when the CRC checksum recorded in gzip file footer
+    is not equivalent to CRC checksum of the actually
+    uncompressed data.
+
+: Zlib::GzipFile::LengthError
+
+    Raised when the data length recorded in gzip file footer
+    is not equivalent to length of the actually uncompressed data.
+
+=== SuperClass:
+
+* ((<Zlib::Error>))
+
+
+== Zlib::GzipReader
+
+The class for reading a gzipped file. GzipReader should be used
+with associating an instance of IO class (or an object which has
+the same methods as IO has).
+
+    Zlib::GzipReader.open('hoge.gz') {|gz|
+      print gz.read
+    }
+
+    f = File.open('hoge.gz')
+    gz = Zlib::GzipReader.new(f)
+    print gz.read
+    gz.close
+
+=== SuperClass:
+
+* ((<Zlib::GzipFile>))
+
+=== Included Modules:
+
+* Enumerable
+
+=== Class Methods:
+
+--- Zlib::GzipReader.new(io)
+
+    Creates a GzipReader object associated with ((|io|)).
+    The GzipReader object reads gzipped data from ((|io|)),
+    and parses/decompresses them. At least, ((|io|)) must have
+    read method that behaves same as read method in IO class.
+
+    If the gzip file header is incorrect, raises an
+    ((<Zlib::GzipFile::Error>)) exception.
+
+--- Zlib::GzipReader.wrap(io) {|gz| ... }
+
+    Creates a GzipReader object associated with ((|io|)), and
+    executes the block with the newly created GzipReader object,
+    just like File::open. The GzipReader object will be closed
+    automatically after executing the block. If you want to keep
+    the associated IO object opening, you may call
+    ((<Zlib::GzipFile#finish>)) method in the block.
+
+--- Zlib::GzipReader.open(filename)
+--- Zlib::GzipReader.open(filename) {|gz| ... }
+
+    Opens a file specified by ((|filename|)) as a gzipped file,
+    and returns a GzipReader object associated with that file.
+    Further details of this method are same as
+    ((<Zlib::GzipReader.new>)) and ((<ZLib::GzipReader.wrap>)).
+
+=== メソッド:
+
+--- Zlib::GzipReader#eof
+--- Zlib::GzipReader#eof?
+
+    Returns true if the object reaches the end of compressed data.
+    Note that eof? does ((*not*)) return true when reaches the
+    end of ((*file*)).
+
+--- Zlib::GzipReader#pos
+--- Zlib::GzipReader#tell
+
+    Returns the total bytes of data decompressed until now.
+    Not that it does ((*not*)) the position of file pointer.
+
+--- Zlib::GzipReader#each([rs])
+--- Zlib::GzipReader#each_line([rs])
+--- Zlib::GzipReader#each_byte([rs])
+--- Zlib::GzipReader#gets([rs])
+--- Zlib::GzipReader#getc
+--- Zlib::GzipReader#lineno
+--- Zlib::GzipReader#lineno=
+--- Zlib::GzipReader#read([length])
+--- Zlib::GzipReader#readchar
+--- Zlib::GzipReader#readline([rs])
+--- Zlib::GzipReader#readlines([rs])
+--- Zlib::GzipReader#ungetc(char)
+
+    Same as IO, but raises ((<Zlib::Error>)) or
+    ((<Zlib::GzipFile::Error>)) exception if an error was found
+    in the gzip file.
+
+    Be careful of the footer of gzip file. A gzip file has
+    the checksum of pre-compressed data in its footer.
+    GzipReader checks all uncompressed data against that checksum
+    at the following cases, and if failed, raises
+    ((<Zlib::GzipFile::NoFooter>)), ((<Zlib::GzipFile::CRCError>)),
+    or ((<Zlib::GzipFile::LengthError>)) exception.
+
+    * When an reading request is received beyond the end of file
+      (the end of compressed data).
+      That is, when ((<Zlib::GzipReader#read>)),
+      ((<Zlib::GzipReader#gets>)), or some other methods for reading
+      returns nil.
+
+    * When ((<Zlib::GzipFile#close>)) method is called after
+      the object reaches the end of file.
+
+    * When ((<Zlib::GzipReader#unused>)) method is called after
+      the object reaches the end of file.
+
+--- Zlib::GzipReader#rewind
+
+    Resets the position of the file pointer to the point
+    created the GzipReader object.
+    The associated IO object need to respond to seek method.
+
+--- Zlib::GzipReader#unused
+
+    Returns the rest of the data which had read for parsing gzip
+    format, or nil if the whole gzip file is not parsed yet.
+
+
+== Zlib::GzipWriter
+
+The class for writing a gzipped file. GzipWriter should be used
+with associate with an instance of IO class (or an object which
+has the same methods as IO has).
+
+    Zlib::GzipWriter.open('hoge.gz') {|gz|
+      gz.write 'jugemu jugemu gokou no surikire...'
+    }
+
+    f = File.open('hoge.gz', 'w')
+    gz = Zlib::GzipWriter.new(f)
+    gz.write 'jugemu jugemu gokou no surikire...'
+    gz.close
+
+NOTE: Due to the limitation in finalizer of Ruby, you must close
+explicitly GzipWriter object by ((<Zlib::GzipWriter#close>)) etc.
+Otherwise, GzipWriter should be not able to write gzip footer and
+generate broken gzip file.
+
+=== SuperClass:
+
+* ((<Zlib::GzipFile>))
+
+=== Class Methods:
+
+--- Zlib::GzipWriter.new(io[, level[, strategy]])
+
+    Creates a GzipWriter object associated with ((|io|)).
+    ((|level|)) and ((|strategy|)) should be same as the
+    arguments of ((<Zlib::Deflate.new>)). The GzipWriter object
+    writes gzipped data to ((|io|)). At least, ((|io|)) must
+    respond to write method that behaves same as write method
+    in IO class.
+
+--- Zlib::GzipWriter.wrap(io[, level[, strategy]]) {|gz| ... }
+
+    Creates a GzipWriter object associated with ((|io|)), and
+    executes the block with the newly created GzipWriter object,
+    just like File::open. The GzipWriter object will be closed
+    automatically after executing the block. If you want to keep
+    the associated IO object opening, you may call
+    ((<Zlib::GzipFile#finish>)) method in the block.
+
+--- Zlib::GzipWriter.open(filename[, level[, strategy]])
+--- Zlib::GzipWriter.open(filename[, level[, strategy]]) {|gz| ... }
+
+    Opens a file specified by ((|filename|)) for writing
+    gzip compressed data, and returns a GzipWriter object
+    associated with that file. Further details of this method
+    are same as ((<Zlib::GzipWriter.new>)) and
+    ((<Zlib::GzipWriter#wrap>)).
+
+
+=== Methods:
+
+--- Zlib::GzipWriter#close
+--- Zlib::GzipWriter#finish
+
+    Closes the GzipFile object. This method calls close method
+    of the associated IO object. Returns the associated IO object.
+    See ((<Zlib::GzipFile#close>)) and ((<Zlib::GzipFile#finish>))
+    for the difference between close and finish.
+
+    ((*NOTE: Due to the limitation in finalizer of Ruby, you must
+    close GzipWriter object explicitly. Otherwise, GzipWriter
+    should be not able to write gzip footer and generate broken
+    gzip file.*))
+
+--- Zlib::GzipWriter#pos
+--- Zlib::GzipWriter#tell
+
+    Returns the total bytes of data compressed until now.
+    Note that it does ((*not*)) the position of file pointer.
+
+--- Zlib::GzipWriter#<< str
+--- Zlib::GzipWriter#putc(ch)
+--- Zlib::GzipWriter#puts(obj...)
+--- Zlib::GzipWriter#print(arg...)
+--- Zlib::GzipWriter#printf(format, arg...)
+--- Zlib::GzipWriter#write(str)
+
+    Same as IO.
+
+--- Zlib::GzipWriter#flush([flush])
+
+    Flushes all the internal buffers of the GzipWriter object.
+    The meaning of ((|flush|)) is same as one of the argument of
+    ((<Zlib::Deflate#deflate>)).
+    ((<Zlib::SYNC_FLUSH>)) is used if ((|flush|)) is omitted.
+    It is no use giving ((|flush|)) ((<Zlib::NO_FLUSH>)).
+
+--- Zlib::GzipWriter#mtime= time
+
+    Sets last modification time to be stored in the gzip file
+    header. ((<Zlib::GzipFile::Error>)) exception will be raised
+    if this method is called after writing method (like
+    ((<Zlib::GzipWriter#write>))) was called.
+
+--- Zlib::GzipWriter#orig_name= filename
+
+    Sets original filename to be stored in the gzip file header.
+    ((<Zlib::GzipFile::Error>)) exception will be raised
+    if this method is called after writing method (like
+    ((<Zlib::GzipWriter#write>))) was called.
+
+--- Zlib::GzipWriter#comment= string
+
+    Sets comments to be stored in the gzip file header.
+    ((<Zlib::GzipFile::Error>)) exception will be raised
+    if this method is called after writing method (like
+    ((<Zlib::GzipWriter#write>))) was called.
+
+
+== Changes from 0.5 to 0.6
+
+* New methods:
+
+  * ((<Zlib::GzipFile.wrap>))
+  * ((<Zlib::GzipFile#finish>))
+
+* New constants:
+
+  * ((<Zlib::ZLIB_VERSION>))
+  * ((<Zlib::OS_VMCMS>))
+  * ((<Zlib::OS_ZSYSTEM>))
+  * ((<Zlib::OS_CPM>))
+  * ((<Zlib::OS_QDOS>))
+  * ((<Zlib::OS_RISCOS>))
+  * ((<Zlib::OS_UNKNOWN>))
+
+* Changed methods:
+
+  * ((<Zlib::GzipFile.new>)) now takes no block. Use
+    ((<Zlib::GzipFile.wrap>)) instead.
+
+  * ((<Zlib::GzipFile#close>)) now takes no argument. Use
+    ((<Zlib::GzipFile#finish>)) instead.
+
+* Renamed methods:
+
+  * Zlib.version is renamed to ((<Zlib.zlib_version>)).
+
+* Changed constants:
+
+  * ((<Zlib::VERSION>)) indicates the version of Ruby/zlib.
+    The zlib.h version is now in ((<Zlib::ZLIB_VERSION>)).
+
+* Backward compatibility:
+
+  * For backward compatibility for 0.5, the obsoleted methods and
+    arguments are still available.
+
+  * Obsoleted classes, methods, and constants for backward
+    compatibility for 0.4 or earlier are removed.
+
+== Changes from 0.4 to 0.5
+
+Almost all the code are rewritten.
+I hope all changes are enumerated below :-)
+
+* The names of almost classes and some methods are changed.
+  All classes and constants are now defined under module
+  ((<Zlib>)). The obsoleted names are also available for backward
+  compatibility.
+
+  * Classes
+
+    * Deflate -> ((<Zlib::Deflate>))
+    * Inflate -> ((<Zlib::Inflate>))
+    * Zlib::Gzip -> ((<Zlib::GzipFile>))
+    * GzipReader -> ((<Zlib::GzipReader>))
+    * GzipWriter -> ((<Zlib::GzipWriter>))
+    * Zlib::Gzip::Error -> ((<Zlib::GzipFile::Error>))
+    * Zlib::GzipReader::NoFooter -> ((<Zlib::GzipFile::NoFooter>))
+    * Zlib::GzipReader::CRCError -> ((<Zlib::GzipFile::CRCError>))
+    * Zlib::GzipReader::LengthError -> ((<Zlib::GzipFile::LengthError>))
+
+  * Constants
+
+    * Zlib::ZStream::BINARY -> ((<Zlib::BINARY>))
+    * Zlib::ZStream::ASCII -> ((<Zlib::ASCII>))
+    * Zlib::ZStream::UNKNOWN -> ((<Zlib::UNKNOWN>))
+    * Zlib::Deflate::NO_COMPRESSION -> ((<Zlib::NO_COMPRESSION>))
+    * Zlib::Deflate::BEST_SPEED -> ((<Zlib::BEST_SPEED>))
+    * Zlib::Deflate::BEST_COMPRESSION -> ((<Zlib::BEST_COMPRESSION>))
+    * Zlib::Deflate::DEFAULT_COMPRESSION -> ((<Zlib::DEFAULT_COMPRESSION>))
+    * Zlib::Deflate::FILTERED -> ((<Zlib::FILTERED>))
+    * Zlib::Deflate::HUFFMAN_ONLY -> ((<Zlib::HUFFMAN_ONLY>))
+    * Zlib::Deflate::DEFAULT_STRATEGY -> ((<Zlib::DEFAULT_STRATEGY>))
+    * Zlib::Deflate::MAX_WBITS -> ((<Zlib::MAX_WBITS>))
+    * Zlib::Deflate::DEF_MEM_LEVEL -> ((<Zlib::DEF_MEM_LEVEL>))
+    * Zlib::Deflate::MAX_MEM_LEVEL -> ((<Zlib::MAX_MEM_LEVEL>))
+    * Zlib::Deflate::NO_FLUSH -> ((<Zlib::NO_FLUSH>))
+    * Zlib::Deflate::SYNC_FLUSH -> ((<Zlib::SYNC_FLUSH>))
+    * Zlib::Deflate::FULL_FLUSH -> ((<Zlib::FULL_FLUSH>))
+    * Zlib::Inflate::MAX_WBITS -> ((<Zlib::MAX_WBITS>))
+    * Zlib::GzipReader::OS_* -> ((<Zlib::OS_*|Zlib::OS_CODE>))
+
+  * Methods
+
+    * Zlib::ZStream#flush_out -> ((<Zlib::ZStream#flush_next_out>))
+
+* Made buffer for input (next_in).
+
+* ((<Zlib::GzipReader#unused>)) returns nil after closing.
+
+* Now you are up to call ((<Zlib::GzipWriter#close>)) explicitly
+to avoid segv in finalizer.
+((<[ruby-dev:11915]|URL:http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-dev/11915>))
+
+* divided initialize from new.
+
+* remove sanity checks for arguments for deflateInit2 and
+  inflateInit2.
+
+* adapted the behavior of ((<Zlib::GzipWriter#puts>)) to Ruby-1.7.
+
+* Made all functions static.
+
+
+=end
diff --git a/ruby_1_8_6/ext/zlib/extconf.rb b/ruby_1_8_6/ext/zlib/extconf.rb
new file mode 100644
index 0000000000..b4e76af3c6
--- /dev/null
+++ b/ruby_1_8_6/ext/zlib/extconf.rb
@@ -0,0 +1,61 @@
+#
+# extconf.rb
+#
+# $Id$
+#
+
+require 'mkmf'
+require 'rbconfig'
+
+dir_config 'zlib'
+
+
+if %w'z libz zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
+    have_header('zlib.h') then
+
+  defines = []
+
+  message 'checking for kind of operating system... '
+  os_code = with_config('os-code') ||
+    case RUBY_PLATFORM.split('-',2)[1]
+    when 'amigaos' then
+      os_code = 'AMIGA'
+    when /\Aos2[\-_]emx\z/ then
+      os_code = 'OS2'
+    when 'mswin32', 'mingw32', 'bccwin32' then
+      # NOTE: cygwin should be regarded as Unix.
+      os_code = 'WIN32'
+    else
+      os_code = 'UNIX'
+    end
+  os_code = 'OS_' + os_code.upcase
+
+  OS_NAMES = {
+    'OS_MSDOS'   => 'MS-DOS',
+    'OS_AMIGA'   => 'Amiga',
+    'OS_VMS'     => 'VMS',
+    'OS_UNIX'    => 'Unix',
+    'OS_ATARI'   => 'Atari',
+    'OS_OS2'     => 'OS/2',
+    'OS_MACOS'   => 'MacOS',
+    'OS_TOPS20'  => 'TOPS20',
+    'OS_WIN32'   => 'Win32',
+    'OS_VMCMS'   => 'VM/CMS',
+    'OS_ZSYSTEM' => 'Z-System',
+    'OS_CPM'     => 'CP/M',
+    'OS_QDOS'    => 'QDOS',
+    'OS_RISCOS'  => 'RISCOS',
+    'OS_UNKNOWN' => 'Unknown',
+  }
+  unless OS_NAMES.key? os_code then
+    puts "invalid OS_CODE `#{os_code}'"
+    exit
+  end
+  message "#{OS_NAMES[os_code]}\n"
+  defines << "OS_CODE=#{os_code}"
+
+  $defs.concat(defines.collect{|d|' -D'+d})
+
+  create_makefile('zlib')
+
+end
diff --git a/ruby_1_8_6/ext/zlib/zlib.c b/ruby_1_8_6/ext/zlib/zlib.c
new file mode 100644
index 0000000000..8caadaeddc
--- /dev/null
+++ b/ruby_1_8_6/ext/zlib/zlib.c
@@ -0,0 +1,3547 @@
+/*
+ * zlib.c - An interface for zlib.
+ *
+ *   Copyright (C) UENO Katsuhiro 2000-2003
+ *
+ * $Id$
+ */
+
+#include <ruby.h>
+#include <zlib.h>
+#include <time.h>
+
+#define RUBY_ZLIB_VERSION  "0.6.0"
+
+
+#define OBJ_IS_FREED(val)  (RBASIC(val)->flags == 0)
+
+#ifndef GZIP_SUPPORT
+#define GZIP_SUPPORT  1
+#endif
+
+/* from zutil.h */
+#ifndef DEF_MEM_LEVEL
+#if MAX_MEM_LEVEL >= 8
+#define DEF_MEM_LEVEL  8
+#else
+#define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+#endif
+
+
+/*--------- Prototypes --------*/
+
+static NORETURN(void raise_zlib_error _((int, const char *)));
+static VALUE rb_zlib_version _((VALUE));
+static VALUE do_checksum _((int, VALUE*, uLong (*) _((uLong, const Bytef*, uInt))));
+static VALUE rb_zlib_adler32 _((int, VALUE*, VALUE));
+static VALUE rb_zlib_crc32 _((int, VALUE*, VALUE));
+static VALUE rb_zlib_crc_table _((VALUE));
+static voidpf zlib_mem_alloc _((voidpf, uInt, uInt));
+static void zlib_mem_free _((voidpf, voidpf));
+static void finalizer_warn _((const char*));
+
+struct zstream;
+struct zstream_funcs;
+static void zstream_init _((struct zstream*, const struct zstream_funcs *));
+static void zstream_expand_buffer _((struct zstream*));
+static void zstream_expand_buffer_into _((struct zstream*, int));
+static void zstream_append_buffer _((struct zstream*, const char*, int));
+static VALUE zstream_detach_buffer _((struct zstream*));
+static VALUE zstream_shift_buffer _((struct zstream*, int));
+static void zstream_buffer_ungetc _((struct zstream*, int));
+static void zstream_append_input _((struct zstream*, const char*, unsigned int));
+static void zstream_discard_input _((struct zstream*, unsigned int));
+static void zstream_reset_input _((struct zstream*));
+static void zstream_passthrough_input _((struct zstream*));
+static VALUE zstream_detach_input _((struct zstream*));
+static void zstream_reset _((struct zstream*));
+static VALUE zstream_end _((struct zstream*));
+static void zstream_run _((struct zstream*, Bytef*, uInt, int));
+static VALUE zstream_sync _((struct zstream*, Bytef*, uInt));
+static void zstream_mark _((struct zstream*));
+static void zstream_free _((struct zstream*));
+static VALUE zstream_new _((VALUE, const struct zstream_funcs*));
+static struct zstream *get_zstream _((VALUE));
+static void zstream_finalize _((struct zstream*));
+
+static VALUE rb_zstream_end _((VALUE));
+static VALUE rb_zstream_reset _((VALUE));
+static VALUE rb_zstream_finish _((VALUE));
+static VALUE rb_zstream_flush_next_in _((VALUE));
+static VALUE rb_zstream_flush_next_out _((VALUE));
+static VALUE rb_zstream_avail_out _((VALUE));
+static VALUE rb_zstream_set_avail_out _((VALUE, VALUE));
+static VALUE rb_zstream_avail_in _((VALUE));
+static VALUE rb_zstream_total_in _((VALUE));
+static VALUE rb_zstream_total_out _((VALUE));
+static VALUE rb_zstream_data_type _((VALUE));
+static VALUE rb_zstream_adler _((VALUE));
+static VALUE rb_zstream_finished_p _((VALUE));
+static VALUE rb_zstream_closed_p _((VALUE));
+
+static VALUE rb_deflate_s_allocate _((VALUE));
+static VALUE rb_deflate_initialize _((int, VALUE*, VALUE));
+static VALUE rb_deflate_init_copy _((VALUE, VALUE));
+static VALUE deflate_run _((VALUE));
+static VALUE rb_deflate_s_deflate _((int, VALUE*, VALUE));
+static void do_deflate _((struct zstream*, VALUE, int));
+static VALUE rb_deflate_deflate _((int, VALUE*, VALUE));
+static VALUE rb_deflate_addstr _((VALUE, VALUE));
+static VALUE rb_deflate_flush _((int, VALUE*, VALUE));
+static VALUE rb_deflate_params _((VALUE, VALUE, VALUE));
+static VALUE rb_deflate_set_dictionary _((VALUE, VALUE));
+
+static VALUE inflate_run _((VALUE));
+static VALUE rb_inflate_s_allocate _((VALUE));
+static VALUE rb_inflate_initialize _((int, VALUE*, VALUE));
+static VALUE rb_inflate_s_inflate _((VALUE, VALUE));
+static void do_inflate _((struct zstream*, VALUE));
+static VALUE rb_inflate_inflate _((VALUE, VALUE));
+static VALUE rb_inflate_addstr _((VALUE, VALUE));
+static VALUE rb_inflate_sync _((VALUE, VALUE));
+static VALUE rb_inflate_sync_point_p _((VALUE));
+static VALUE rb_inflate_set_dictionary _((VALUE, VALUE));
+
+#if GZIP_SUPPORT
+struct gzfile;
+static void gzfile_mark _((struct gzfile*));
+static void gzfile_free _((struct gzfile*));
+static VALUE gzfile_new _((VALUE, const struct zstream_funcs*, void (*) _((struct gzfile*))));
+static void gzfile_reset _((struct gzfile*));
+static void gzfile_close _((struct gzfile*, int));
+static void gzfile_write_raw _((struct gzfile*));
+static VALUE gzfile_read_raw _((struct gzfile*));
+static int gzfile_read_raw_ensure _((struct gzfile*, int));
+static char *gzfile_read_raw_until_zero _((struct gzfile*, long));
+static unsigned int gzfile_get16 _((const unsigned char*));
+static unsigned long gzfile_get32 _((const unsigned char*));
+static void gzfile_set32 _((unsigned long n, unsigned char*));
+static void gzfile_make_header _((struct gzfile*));
+static void gzfile_make_footer _((struct gzfile*));
+static void gzfile_read_header _((struct gzfile*));
+static void gzfile_check_footer _((struct gzfile*));
+static void gzfile_write _((struct gzfile*, Bytef*, uInt));
+static long gzfile_read_more _((struct gzfile*));
+static void gzfile_calc_crc _((struct gzfile*, VALUE));
+static VALUE gzfile_read _((struct gzfile*, int));
+static VALUE gzfile_read_all _((struct gzfile*));
+static void gzfile_ungetc _((struct gzfile*, int));
+static VALUE gzfile_writer_end_run _((VALUE));
+static void gzfile_writer_end _((struct gzfile*));
+static VALUE gzfile_reader_end_run _((VALUE));
+static void gzfile_reader_end _((struct gzfile*));
+static void gzfile_reader_rewind _((struct gzfile*));
+static VALUE gzfile_reader_get_unused _((struct gzfile*));
+static struct gzfile *get_gzfile _((VALUE));
+static VALUE gzfile_ensure_close _((VALUE));
+static VALUE rb_gzfile_s_wrap _((int, VALUE*, VALUE));
+static VALUE gzfile_s_open _((int, VALUE*, VALUE, const char*));
+
+static VALUE rb_gzfile_to_io _((VALUE));
+static VALUE rb_gzfile_crc _((VALUE));
+static VALUE rb_gzfile_mtime _((VALUE));
+static VALUE rb_gzfile_level _((VALUE));
+static VALUE rb_gzfile_os_code _((VALUE));
+static VALUE rb_gzfile_orig_name _((VALUE));
+static VALUE rb_gzfile_comment _((VALUE));
+static VALUE rb_gzfile_lineno _((VALUE));
+static VALUE rb_gzfile_set_lineno _((VALUE, VALUE));
+static VALUE rb_gzfile_set_mtime _((VALUE, VALUE));
+static VALUE rb_gzfile_set_orig_name _((VALUE, VALUE));
+static VALUE rb_gzfile_set_comment _((VALUE, VALUE));
+static VALUE rb_gzfile_close _((VALUE));
+static VALUE rb_gzfile_finish _((VALUE));
+static VALUE rb_gzfile_closed_p _((VALUE));
+static VALUE rb_gzfile_eof_p _((VALUE));
+static VALUE rb_gzfile_sync _((VALUE));
+static VALUE rb_gzfile_set_sync _((VALUE, VALUE));
+static VALUE rb_gzfile_total_in _((VALUE));
+static VALUE rb_gzfile_total_out _((VALUE));
+
+static VALUE rb_gzwriter_s_allocate _((VALUE));
+static VALUE rb_gzwriter_s_open _((int, VALUE*, VALUE));
+static VALUE rb_gzwriter_initialize _((int, VALUE*, VALUE));
+static VALUE rb_gzwriter_flush _((int, VALUE*, VALUE));
+static VALUE rb_gzwriter_write _((VALUE, VALUE));
+static VALUE rb_gzwriter_putc _((VALUE, VALUE));
+
+static VALUE rb_gzreader_s_allocate _((VALUE));
+static VALUE rb_gzreader_s_open _((int, VALUE*, VALUE));
+static VALUE rb_gzreader_initialize _((VALUE, VALUE));
+static VALUE rb_gzreader_rewind _((VALUE));
+static VALUE rb_gzreader_unused _((VALUE));
+static VALUE rb_gzreader_read _((int, VALUE*, VALUE));
+static VALUE rb_gzreader_getc _((VALUE));
+static VALUE rb_gzreader_readchar _((VALUE));
+static VALUE rb_gzreader_each_byte _((VALUE));
+static VALUE rb_gzreader_ungetc _((VALUE, VALUE));
+static void gzreader_skip_linebreaks _((struct gzfile*));
+static VALUE gzreader_gets _((int, VALUE*, VALUE));
+static VALUE rb_gzreader_gets _((int, VALUE*, VALUE));
+static VALUE rb_gzreader_readline _((int, VALUE*, VALUE));
+static VALUE rb_gzreader_each _((int, VALUE*, VALUE));
+static VALUE rb_gzreader_readlines _((int, VALUE*, VALUE));
+#endif /* GZIP_SUPPORT */
+
+
+void Init_zlib _((void));
+
+
+
+/*--------- Exceptions --------*/
+
+static VALUE cZError, cStreamEnd, cNeedDict;
+static VALUE cStreamError, cDataError, cMemError, cBufError, cVersionError;
+
+static void
+raise_zlib_error(err, msg)
+    int err;
+    const char *msg;
+{
+    VALUE exc;
+
+    if (!msg) {
+	msg = zError(err);
+    }
+
+    switch(err) {
+      case Z_STREAM_END:
+	exc = rb_exc_new2(cStreamEnd, msg);
+	break;
+      case Z_NEED_DICT:
+	exc = rb_exc_new2(cNeedDict, msg);
+	break;
+      case Z_STREAM_ERROR:
+	exc = rb_exc_new2(cStreamError, msg);
+	break;
+      case Z_DATA_ERROR:
+	exc = rb_exc_new2(cDataError, msg);
+	break;
+      case Z_BUF_ERROR:
+	exc = rb_exc_new2(cBufError, msg);
+	break;
+      case Z_VERSION_ERROR:
+	exc = rb_exc_new2(cVersionError, msg);
+	break;
+      case Z_MEM_ERROR:
+	exc = rb_exc_new2(cMemError, msg);
+	break;
+      case Z_ERRNO:
+	rb_sys_fail(msg);
+	/* no return */
+      default:
+      {
+	  char buf[BUFSIZ];
+	  snprintf(buf, BUFSIZ, "unknown zlib error %d: %s", err, msg);
+	  exc = rb_exc_new2(cZError, buf);
+      }
+    }
+
+    rb_exc_raise(exc);
+}
+
+
+/*--- Warning (in finalizer) ---*/
+
+static void
+finalizer_warn(msg)
+    const char *msg;
+{
+    fprintf(stderr, "zlib(finalizer): %s\n", msg);
+}
+
+
+/*-------- module Zlib --------*/
+
+/*
+ * Returns the string which represents the version of zlib library.
+ */
+static VALUE
+rb_zlib_version(klass)
+    VALUE klass;
+{
+    VALUE str;
+
+    str = rb_str_new2(zlibVersion());
+    OBJ_TAINT(str);  /* for safe */
+    return str;
+}
+
+static VALUE
+do_checksum(argc, argv, func)
+    int argc;
+    VALUE *argv;
+    uLong (*func) _((uLong, const Bytef *, uInt));
+{
+    VALUE str, vsum;
+    unsigned long sum;
+
+    rb_scan_args(argc, argv, "02", &str, &vsum);
+
+    if (!NIL_P(vsum)) {
+	sum = NUM2ULONG(vsum);
+    }
+    else if (NIL_P(str)) {
+	sum = 0;
+    }
+    else {
+	sum = func(0, Z_NULL, 0);
+    }
+
+    if (NIL_P(str)) {
+	sum = func(sum, Z_NULL, 0);
+    }
+    else {
+	StringValue(str);
+	sum = func(sum, RSTRING(str)->ptr, RSTRING(str)->len);
+    }
+    return rb_uint2inum(sum);
+}
+
+/*
+ * call-seq: Zlib.adler32(string, adler)
+ *
+ * Calculates Alder-32 checksum for +string+, and returns updated value of
+ * +adler+. If +string+ is omitted, it returns the Adler-32 initial value. If
+ * +adler+ is omitted, it assumes that the initial value is given to +adler+.
+ *
+ * FIXME: expression.
+ */
+static VALUE
+rb_zlib_adler32(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    return do_checksum(argc, argv, adler32);
+}
+
+/*
+ * call-seq: Zlib.crc32(string, adler)
+ *
+ * Calculates CRC checksum for +string+, and returns updated value of +crc+. If
+ * +string+ is omitted, it returns the CRC initial value. If +crc+ is omitted, it
+ * assumes that the initial value is given to +crc+.
+ *
+ * FIXME: expression.
+ */
+static VALUE
+rb_zlib_crc32(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    return do_checksum(argc, argv, crc32);
+}
+
+/*
+ * Returns the table for calculating CRC checksum as an array.
+ */
+static VALUE
+rb_zlib_crc_table(obj)
+    VALUE obj;
+{
+    const unsigned long *crctbl;
+    VALUE dst;
+    int i;
+
+    crctbl = get_crc_table();
+    dst = rb_ary_new2(256);
+
+    for (i = 0; i < 256; i++) {
+	rb_ary_push(dst, rb_uint2inum(crctbl[i]));
+    }
+    return dst;
+}
+
+
+
+/*-------- zstream - internal APIs --------*/
+
+struct zstream {
+    unsigned long flags;
+    VALUE buf;
+    long buf_filled;
+    VALUE input;
+    z_stream stream;
+    const struct zstream_funcs {
+	int (*reset) _((z_streamp));
+	int (*end) _((z_streamp));
+	int (*run) _((z_streamp, int));
+    } *func;
+};
+
+#define ZSTREAM_FLAG_READY      0x1
+#define ZSTREAM_FLAG_IN_STREAM  0x2
+#define ZSTREAM_FLAG_FINISHED   0x4
+#define ZSTREAM_FLAG_CLOSING    0x8
+#define ZSTREAM_FLAG_UNUSED     0x10
+
+#define ZSTREAM_READY(z)       ((z)->flags |= ZSTREAM_FLAG_READY)
+#define ZSTREAM_IS_READY(z)    ((z)->flags & ZSTREAM_FLAG_READY)
+#define ZSTREAM_IS_FINISHED(z) ((z)->flags & ZSTREAM_FLAG_FINISHED)
+#define ZSTREAM_IS_CLOSING(z)  ((z)->flags & ZSTREAM_FLAG_CLOSING)
+
+/* I think that more better value should be found,
+   but I gave up finding it. B) */
+#define ZSTREAM_INITIAL_BUFSIZE       1024
+#define ZSTREAM_AVAIL_OUT_STEP_MAX   16384
+#define ZSTREAM_AVAIL_OUT_STEP_MIN    2048
+
+static const struct zstream_funcs deflate_funcs = {
+    deflateReset, deflateEnd, deflate,
+};
+
+static const struct zstream_funcs inflate_funcs = {
+    inflateReset, inflateEnd, inflate,
+};
+
+
+static voidpf
+zlib_mem_alloc(opaque, items, size)
+    voidpf opaque;
+    uInt items, size;
+{
+    return xmalloc(items * size);
+}
+
+static void
+zlib_mem_free(opaque, address)
+    voidpf opaque, address;
+{
+    free(address);
+}
+
+static void
+zstream_init(z, func)
+    struct zstream *z;
+    const struct zstream_funcs *func;
+{
+    z->flags = 0;
+    z->buf = Qnil;
+    z->buf_filled = 0;
+    z->input = Qnil;
+    z->stream.zalloc = zlib_mem_alloc;
+    z->stream.zfree = zlib_mem_free;
+    z->stream.opaque = Z_NULL;
+    z->stream.msg = Z_NULL;
+    z->stream.next_in = Z_NULL;
+    z->stream.avail_in = 0;
+    z->stream.next_out = Z_NULL;
+    z->stream.avail_out = 0;
+    z->func = func;
+}
+
+#define zstream_init_deflate(z)   zstream_init((z), &deflate_funcs)
+#define zstream_init_inflate(z)   zstream_init((z), &inflate_funcs)
+
+static void
+zstream_expand_buffer(z)
+    struct zstream *z;
+{
+    long inc;
+
+    if (NIL_P(z->buf)) {
+	    /* I uses rb_str_new here not rb_str_buf_new because
+	       rb_str_buf_new makes a zero-length string. */
+	z->buf = rb_str_new(0, ZSTREAM_INITIAL_BUFSIZE);
+	z->buf_filled = 0;
+	z->stream.next_out = RSTRING(z->buf)->ptr;
+	z->stream.avail_out = ZSTREAM_INITIAL_BUFSIZE;
+	RBASIC(z->buf)->klass = 0;
+	return;
+    }
+
+    if (RSTRING(z->buf)->len - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
+	/* to keep other threads from freezing */
+	z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
+    }
+    else {
+	inc = z->buf_filled / 2;
+	if (inc < ZSTREAM_AVAIL_OUT_STEP_MIN) {
+	    inc = ZSTREAM_AVAIL_OUT_STEP_MIN;
+	}
+	rb_str_resize(z->buf, z->buf_filled + inc);
+	z->stream.avail_out = (inc < ZSTREAM_AVAIL_OUT_STEP_MAX) ?
+	    inc : ZSTREAM_AVAIL_OUT_STEP_MAX;
+    }
+    z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
+}
+
+static void
+zstream_expand_buffer_into(z, size)
+    struct zstream *z;
+    int size;
+{
+    if (NIL_P(z->buf)) {
+	/* I uses rb_str_new here not rb_str_buf_new because
+	   rb_str_buf_new makes a zero-length string. */
+	z->buf = rb_str_new(0, size);
+	z->buf_filled = 0;
+	z->stream.next_out = RSTRING(z->buf)->ptr;
+	z->stream.avail_out = size;
+	RBASIC(z->buf)->klass = 0;
+    }
+    else if (z->stream.avail_out != size) {
+	rb_str_resize(z->buf, z->buf_filled + size);
+	z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
+	z->stream.avail_out = size;
+    }
+}
+
+static void
+zstream_append_buffer(z, src, len)
+    struct zstream *z;
+    const char *src;
+    int len;
+{
+    if (NIL_P(z->buf)) {
+	z->buf = rb_str_buf_new(len);
+	rb_str_buf_cat(z->buf, src, len);
+	z->buf_filled = len;
+	z->stream.next_out = RSTRING(z->buf)->ptr;
+	z->stream.avail_out = 0;
+	RBASIC(z->buf)->klass = 0;
+	return;
+    }
+
+    if (RSTRING(z->buf)->len < z->buf_filled + len) {
+	rb_str_resize(z->buf, z->buf_filled + len);
+	z->stream.avail_out = 0;
+    }
+    else {
+	if (z->stream.avail_out >= len) {
+	    z->stream.avail_out -= len;
+	}
+	else {
+	    z->stream.avail_out = 0;
+	}
+    }
+    memcpy(RSTRING(z->buf)->ptr + z->buf_filled, src, len);
+    z->buf_filled += len;
+    z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
+}
+
+#define zstream_append_buffer2(z,v) \
+    zstream_append_buffer((z),RSTRING(v)->ptr,RSTRING(v)->len)
+
+static VALUE
+zstream_detach_buffer(z)
+    struct zstream *z;
+{
+    VALUE dst;
+
+    if (NIL_P(z->buf)) {
+	dst = rb_str_new(0, 0);
+    }
+    else {
+	dst = z->buf;
+	rb_str_resize(dst, z->buf_filled);
+	RBASIC(dst)->klass = rb_cString;
+    }
+
+    z->buf = Qnil;
+    z->buf_filled = 0;
+    z->stream.next_out = 0;
+    z->stream.avail_out = 0;
+    return dst;
+}
+
+static VALUE
+zstream_shift_buffer(z, len)
+    struct zstream *z;
+    int len;
+{
+    VALUE dst;
+
+    if (z->buf_filled <= len) {
+	return zstream_detach_buffer(z);
+    }
+
+    dst = rb_str_substr(z->buf, 0, len);
+    RBASIC(dst)->klass = rb_cString;
+    z->buf_filled -= len;
+    memmove(RSTRING(z->buf)->ptr, RSTRING(z->buf)->ptr + len,
+	    z->buf_filled);
+    z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
+    z->stream.avail_out = RSTRING(z->buf)->len - z->buf_filled;
+    if (z->stream.avail_out > ZSTREAM_AVAIL_OUT_STEP_MAX) {
+	z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
+    }
+
+    return dst;
+}
+
+static void
+zstream_buffer_ungetc(z, c)
+    struct zstream *z;
+    int c;
+{
+    if (NIL_P(z->buf) || RSTRING(z->buf)->len - z->buf_filled == 0) {
+	zstream_expand_buffer(z);
+    }
+
+    memmove(RSTRING(z->buf)->ptr + 1, RSTRING(z->buf)->ptr, z->buf_filled);
+    RSTRING(z->buf)->ptr[0] = (char)c;
+    z->buf_filled++;
+    if (z->stream.avail_out > 0) {
+	z->stream.next_out++;
+	z->stream.avail_out--;
+    }
+}
+
+static void
+zstream_append_input(z, src, len)
+    struct zstream *z;
+    const char *src;
+    unsigned int len;
+{
+    if (len <= 0) return;
+
+    if (NIL_P(z->input)) {
+	z->input = rb_str_buf_new(len);
+	rb_str_buf_cat(z->input, src, len);
+	RBASIC(z->input)->klass = 0;
+    }
+    else {
+	rb_str_buf_cat(z->input, src, len);
+    }
+}
+
+#define zstream_append_input2(z,v)\
+    zstream_append_input((z), RSTRING(v)->ptr, RSTRING(v)->len)
+
+static void
+zstream_discard_input(z, len)
+    struct zstream *z;
+    unsigned int len;
+{
+    if (NIL_P(z->input) || RSTRING(z->input)->len <= len) {
+	z->input = Qnil;
+    }
+    else {
+	memmove(RSTRING(z->input)->ptr, RSTRING(z->input)->ptr + len,
+		RSTRING(z->input)->len - len);
+	rb_str_resize(z->input, RSTRING(z->input)->len - len);
+    }
+}
+
+static void
+zstream_reset_input(z)
+    struct zstream *z;
+{
+    z->input = Qnil;
+}
+
+static void
+zstream_passthrough_input(z)
+    struct zstream *z;
+{
+    if (!NIL_P(z->input)) {
+	zstream_append_buffer2(z, z->input);
+	z->input = Qnil;
+    }
+}
+
+static VALUE
+zstream_detach_input(z)
+    struct zstream *z;
+{
+    VALUE dst;
+
+    if (NIL_P(z->input)) {
+	dst = rb_str_new(0, 0);
+    }
+    else {
+	dst = z->input;
+	RBASIC(dst)->klass = rb_cString;
+    }
+    z->input = Qnil;
+    return dst;
+}
+
+static void
+zstream_reset(z)
+    struct zstream *z;
+{
+    int err;
+
+    err = z->func->reset(&z->stream);
+    if (err != Z_OK) {
+	raise_zlib_error(err, z->stream.msg);
+    }
+    z->flags = ZSTREAM_FLAG_READY;
+    z->buf = Qnil;
+    z->buf_filled = 0;
+    z->stream.next_out = 0;
+    z->stream.avail_out = 0;
+    zstream_reset_input(z);
+}
+
+static VALUE
+zstream_end(z)
+    struct zstream *z;
+{
+    int err;
+
+    if (!ZSTREAM_IS_READY(z)) {
+	rb_warning("attempt to close uninitialized zstream; ignored.");
+	return Qnil;
+    }
+    if (z->flags & ZSTREAM_FLAG_IN_STREAM) {
+	rb_warning("attempt to close unfinished zstream; reset forced.");
+	zstream_reset(z);
+    }
+
+    zstream_reset_input(z);
+    err = z->func->end(&z->stream);
+    if (err != Z_OK) {
+	raise_zlib_error(err, z->stream.msg);
+    }
+    z->flags = 0;
+    return Qnil;
+}
+
+static void
+zstream_run(z, src, len, flush)
+    struct zstream *z;
+    Bytef *src;
+    uInt len;
+    int flush;
+{
+    uInt n;
+    int err;
+    volatile VALUE guard;
+
+    if (NIL_P(z->input) && len == 0) {
+	z->stream.next_in = "";
+	z->stream.avail_in = 0;
+    }
+    else {
+	zstream_append_input(z, src, len);
+	z->stream.next_in = RSTRING(z->input)->ptr;
+	z->stream.avail_in = RSTRING(z->input)->len;
+	/* keep reference to `z->input' so as not to be garbage collected
+	   after zstream_reset_input() and prevent `z->stream.next_in'
+	   from dangling. */
+	guard = z->input;
+    }
+
+    if (z->stream.avail_out == 0) {
+	zstream_expand_buffer(z);
+    }
+
+    for (;;) {
+	n = z->stream.avail_out;
+	err = z->func->run(&z->stream, flush);
+	z->buf_filled += n - z->stream.avail_out;
+	rb_thread_schedule();
+
+	if (err == Z_STREAM_END) {
+	    z->flags &= ~ZSTREAM_FLAG_IN_STREAM;
+	    z->flags |= ZSTREAM_FLAG_FINISHED;
+	    break;
+	}
+	if (err != Z_OK) {
+	    if (flush != Z_FINISH && err == Z_BUF_ERROR
+		&& z->stream.avail_out > 0) {
+		z->flags |= ZSTREAM_FLAG_IN_STREAM;
+		break;
+	    }
+	    zstream_reset_input(z);
+	    if (z->stream.avail_in > 0) {
+		zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
+	    }
+	    raise_zlib_error(err, z->stream.msg);
+	}
+	if (z->stream.avail_out > 0) {
+	    z->flags |= ZSTREAM_FLAG_IN_STREAM;
+	    break;
+	}
+	zstream_expand_buffer(z);
+    }
+
+    zstream_reset_input(z);
+    if (z->stream.avail_in > 0) {
+	zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
+        guard = Qnil; /* prevent tail call to make guard effective */
+    }
+}
+
+static VALUE
+zstream_sync(z, src, len)
+    struct zstream *z;
+    Bytef *src;
+    uInt len;
+{
+    VALUE rest;
+    int err;
+
+    if (!NIL_P(z->input)) {
+	z->stream.next_in = RSTRING(z->input)->ptr;
+	z->stream.avail_in = RSTRING(z->input)->len;
+	err = inflateSync(&z->stream);
+	if (err == Z_OK) {
+	    zstream_discard_input(z,
+				  RSTRING(z->input)->len - z->stream.avail_in);
+	    zstream_append_input(z, src, len);
+	    return Qtrue;
+	}
+	zstream_reset_input(z);
+	if (err != Z_DATA_ERROR) {
+	    rest = rb_str_new(z->stream.next_in, z->stream.avail_in);
+	    raise_zlib_error(err, z->stream.msg);
+	}
+    }
+
+    if (len <= 0) return Qfalse;
+
+    z->stream.next_in = src;
+    z->stream.avail_in = len;
+    err = inflateSync(&z->stream);
+    if (err == Z_OK) {
+	zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
+	return Qtrue;
+    }
+    if (err != Z_DATA_ERROR) {
+	rest = rb_str_new(z->stream.next_in, z->stream.avail_in);
+	raise_zlib_error(err, z->stream.msg);
+    }
+    return Qfalse;
+}
+
+static void
+zstream_mark(z)
+    struct zstream *z;
+{
+    rb_gc_mark(z->buf);
+    rb_gc_mark(z->input);
+}
+
+static void
+zstream_finalize(z)
+    struct zstream *z;
+{
+    int err = z->func->end(&z->stream);
+    if (err == Z_STREAM_ERROR)
+	finalizer_warn("the stream state was inconsistent.");
+    if (err == Z_DATA_ERROR)
+	finalizer_warn("the stream was freed prematurely.");
+}
+
+static void
+zstream_free(z)
+    struct zstream *z;
+{
+    if (ZSTREAM_IS_READY(z)) {
+	zstream_finalize(z);
+    }
+    free(z);
+}
+
+static VALUE
+zstream_new(klass, funcs)
+    VALUE klass;
+    const struct zstream_funcs *funcs;
+{
+    VALUE obj;
+    struct zstream *z;
+
+    obj = Data_Make_Struct(klass, struct zstream,
+			   zstream_mark, zstream_free, z);
+    zstream_init(z, funcs);
+    return obj;
+}
+
+#define zstream_deflate_new(klass)  zstream_new((klass), &deflate_funcs)
+#define zstream_inflate_new(klass)  zstream_new((klass), &inflate_funcs)
+
+static struct zstream *
+get_zstream(obj)
+    VALUE obj;
+{
+    struct zstream *z;
+
+    Data_Get_Struct(obj, struct zstream, z);
+    if (!ZSTREAM_IS_READY(z)) {
+	rb_raise(cZError, "stream is not ready");
+    }
+    return z;
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+/*
+ * Document-class: Zlib::ZStream
+ *
+ * Zlib::ZStream is the abstract class for the stream which handles the
+ * compressed data. The operations are defined in the subclasses:
+ * Zlib::Deflate for compression, and Zlib::Inflate for decompression.
+ *
+ * An instance of Zlib::ZStream has one stream (struct zstream in the source)
+ * and two variable-length buffers which associated to the input (next_in) of
+ * the stream and the output (next_out) of the stream. In this document,
+ * "input buffer" means the buffer for input, and "output buffer" means the
+ * buffer for output.
+ *
+ * Data input into an instance of Zlib::ZStream are temporally stored into
+ * the end of input buffer, and then data in input buffer are processed from
+ * the beginning of the buffer until no more output from the stream is
+ * produced (i.e. until avail_out > 0 after processing).  During processing,
+ * output buffer is allocated and expanded automatically to hold all output
+ * data.
+ *
+ * Some particular instance methods consume the data in output buffer and
+ * return them as a String.
+ *
+ * Here is an ascii art for describing above:
+ *
+ *    +================ an instance of Zlib::ZStream ================+
+ *    ||                                                            ||
+ *    ||     +--------+          +-------+          +--------+      ||
+ *    ||  +--| output |<---------|zstream|<---------| input  |<--+  ||
+ *    ||  |  | buffer |  next_out+-------+next_in   | buffer |   |  ||
+ *    ||  |  +--------+                             +--------+   |  ||
+ *    ||  |                                                      |  ||
+ *    +===|======================================================|===+
+ *        |                                                      |
+ *        v                                                      |
+ *    "output data"                                         "input data"
+ *
+ * If an error occurs during processing input buffer, an exception which is a
+ * subclass of Zlib::Error is raised.  At that time, both input and output
+ * buffer keep their conditions at the time when the error occurs.
+ *
+ * == Method Catalogue
+ *
+ * Many of the methods in this class are fairly low-level and unlikely to be
+ * of interest to users.  In fact, users are unlikely to use this class
+ * directly; rather they will be interested in Zlib::Inflate and
+ * Zlib::Deflate.
+ *
+ * The higher level methods are listed below.
+ *
+ * - #total_in
+ * - #total_out
+ * - #data_type
+ * - #adler
+ * - #reset
+ * - #finish
+ * - #finished?
+ * - #close
+ * - #closed?
+ */
+
+/*
+ * Closes the stream. All operations on the closed stream will raise an
+ * exception.
+ */
+static VALUE
+rb_zstream_end(obj)
+    VALUE obj;
+{
+    zstream_end(get_zstream(obj));
+    return Qnil;
+}
+
+/*
+ * Resets and initializes the stream. All data in both input and output buffer
+ * are discarded.
+ */
+static VALUE
+rb_zstream_reset(obj)
+    VALUE obj;
+{
+    zstream_reset(get_zstream(obj));
+    return Qnil;
+}
+
+/*
+ * Finishes the stream and flushes output buffer. See Zlib::Deflate#finish and
+ * Zlib::Inflate#finish for details of this behavior.
+ */
+static VALUE
+rb_zstream_finish(obj)
+    VALUE obj;
+{
+    struct zstream *z = get_zstream(obj);
+    VALUE dst;
+
+    zstream_run(z, "", 0, Z_FINISH);
+    dst = zstream_detach_buffer(z);
+
+    OBJ_INFECT(dst, obj);
+    return dst;
+}
+
+/*
+ * Flushes input buffer and returns all data in that buffer.
+ */
+static VALUE
+rb_zstream_flush_next_in(obj)
+    VALUE obj;
+{
+    struct zstream *z;
+    VALUE dst;
+
+    Data_Get_Struct(obj, struct zstream, z);
+    dst = zstream_detach_input(z);
+    OBJ_INFECT(dst, obj);
+    return dst;
+}
+
+/*
+ * Flushes output buffer and returns all data in that buffer.
+ */
+static VALUE
+rb_zstream_flush_next_out(obj)
+    VALUE obj;
+{
+    struct zstream *z;
+    VALUE dst;
+
+    Data_Get_Struct(obj, struct zstream, z);
+    dst = zstream_detach_buffer(z);
+    OBJ_INFECT(dst, obj);
+    return dst;
+}
+
+/*
+ * Returns number of bytes of free spaces in output buffer.  Because the free
+ * space is allocated automatically, this method returns 0 normally.
+ */
+static VALUE
+rb_zstream_avail_out(obj)
+    VALUE obj;
+{
+    struct zstream *z;
+    Data_Get_Struct(obj, struct zstream, z);
+    return rb_uint2inum(z->stream.avail_out);
+}
+
+/*
+ * Allocates +size+ bytes of free space in the output buffer. If there are more
+ * than +size+ bytes already in the buffer, the buffer is truncated. Because 
+ * free space is allocated automatically, you usually don't need to use this
+ * method.
+ */
+static VALUE
+rb_zstream_set_avail_out(obj, size)
+    VALUE obj, size;
+{
+    struct zstream *z = get_zstream(obj);
+
+    Check_Type(size, T_FIXNUM);
+    zstream_expand_buffer_into(z, FIX2INT(size));
+    return size;
+}
+
+/*
+ * Returns bytes of data in the input buffer. Normally, returns 0.
+ */
+static VALUE
+rb_zstream_avail_in(obj)
+    VALUE obj;
+{
+    struct zstream *z;
+    Data_Get_Struct(obj, struct zstream, z);
+    return INT2FIX(NIL_P(z->input) ? 0 : (int)(RSTRING(z->input)->len));
+}
+
+/*
+ * Returns the total bytes of the input data to the stream.  FIXME
+ */
+static VALUE
+rb_zstream_total_in(obj)
+    VALUE obj;
+{
+    return rb_uint2inum(get_zstream(obj)->stream.total_in);
+}
+
+/*
+ * Returns the total bytes of the output data from the stream.  FIXME
+ */
+static VALUE
+rb_zstream_total_out(obj)
+    VALUE obj;
+{
+    return rb_uint2inum(get_zstream(obj)->stream.total_out);
+}
+
+/*
+ * Guesses the type of the data which have been inputed into the stream. The
+ * returned value is either <tt>Zlib::BINARY</tt>, <tt>Zlib::ASCII</tt>, or
+ * <tt>Zlib::UNKNOWN</tt>.
+ */
+static VALUE
+rb_zstream_data_type(obj)
+    VALUE obj;
+{
+    return INT2FIX(get_zstream(obj)->stream.data_type);
+}
+
+/*
+ * Returns the adler-32 checksum.
+ */
+static VALUE
+rb_zstream_adler(obj)
+    VALUE obj;
+{
+	return rb_uint2inum(get_zstream(obj)->stream.adler);
+}
+
+/*
+ * Returns true if the stream is finished.
+ */
+static VALUE
+rb_zstream_finished_p(obj)
+    VALUE obj;
+{
+    return ZSTREAM_IS_FINISHED(get_zstream(obj)) ? Qtrue : Qfalse;
+}
+
+/*
+ * Returns true if the stream is closed.
+ */
+static VALUE
+rb_zstream_closed_p(obj)
+    VALUE obj;
+{
+    struct zstream *z;
+    Data_Get_Struct(obj, struct zstream, z);
+    return ZSTREAM_IS_READY(z) ? Qfalse : Qtrue;
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+/*
+ * Document-class: Zlib::Deflate
+ *
+ * Zlib::Deflate is the class for compressing data.  See Zlib::Stream for more
+ * information.
+ */
+
+#define FIXNUMARG(val, ifnil) \
+    (NIL_P((val)) ? (ifnil) \
+    : ((void)Check_Type((val), T_FIXNUM), FIX2INT((val))))
+
+#define ARG_LEVEL(val)     FIXNUMARG((val), Z_DEFAULT_COMPRESSION)
+#define ARG_WBITS(val)     FIXNUMARG((val), MAX_WBITS)
+#define ARG_MEMLEVEL(val)  FIXNUMARG((val), DEF_MEM_LEVEL)
+#define ARG_STRATEGY(val)  FIXNUMARG((val), Z_DEFAULT_STRATEGY)
+#define ARG_FLUSH(val)     FIXNUMARG((val), Z_NO_FLUSH)
+
+
+static VALUE
+rb_deflate_s_allocate(klass)
+    VALUE klass;
+{
+    return zstream_deflate_new(klass);
+}
+
+/*
+ * call-seq: Zlib::Deflate.new(level=nil, windowBits=nil, memlevel=nil, strategy=nil)
+ *
+ * Creates a new deflate stream for compression. See zlib.h for details of
+ * each argument. If an argument is nil, the default value of that argument is
+ * used.
+ *
+ * TODO: document better!
+ */
+static VALUE
+rb_deflate_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    struct zstream *z;
+    VALUE level, wbits, memlevel, strategy;
+    int err;
+
+    rb_scan_args(argc, argv, "04", &level, &wbits, &memlevel, &strategy);
+    Data_Get_Struct(obj, struct zstream, z);
+
+    err = deflateInit2(&z->stream, ARG_LEVEL(level), Z_DEFLATED,
+		       ARG_WBITS(wbits), ARG_MEMLEVEL(memlevel),
+		       ARG_STRATEGY(strategy));
+    if (err != Z_OK) {
+	raise_zlib_error(err, z->stream.msg);
+    }
+    ZSTREAM_READY(z);
+
+    return obj;
+}
+
+/*
+ * Duplicates the deflate stream.
+ */
+static VALUE
+rb_deflate_init_copy(self, orig)
+    VALUE self, orig;
+{
+    struct zstream *z1 = get_zstream(self);
+    struct zstream *z2 = get_zstream(orig);
+    int err;
+
+    err = deflateCopy(&z1->stream, &z2->stream);
+    if (err != Z_OK) {
+	raise_zlib_error(err, 0);
+    }
+    z1->flags = z2->flags;
+
+    return self;
+}
+
+static VALUE
+deflate_run(args)
+    VALUE args;
+{
+    struct zstream *z = (struct zstream *)((VALUE *)args)[0];
+    VALUE src = ((VALUE *)args)[1];
+
+    zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_FINISH);
+    return zstream_detach_buffer(z);
+}
+
+/*
+ * call-seq: Zlib::Deflate.deflate(string[, level])
+ *
+ * Compresses the given +string+. Valid values of level are
+ * <tt>Zlib::NO_COMPRESSION</tt>, <tt>Zlib::BEST_SPEED</tt>,
+ * <tt>Zlib::BEST_COMPRESSION</tt>, <tt>Zlib::DEFAULT_COMPRESSION</tt>, and an
+ * integer from 0 to 9.
+ *
+ * This method is almost equivalent to the following code:
+ *
+ *   def deflate(string, level)
+ *     z = Zlib::Deflate.new(level)
+ *     dst = z.deflate(string, Zlib::FINISH)
+ *     z.close
+ *     dst
+ *   end
+ *
+ * TODO: what's default value of +level+?
+ *
+ */
+static VALUE
+rb_deflate_s_deflate(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    struct zstream z;
+    VALUE src, level, dst, args[2];
+    int err, lev;
+
+    rb_scan_args(argc, argv, "11", &src, &level);
+
+    lev = ARG_LEVEL(level);
+    StringValue(src);
+    zstream_init_deflate(&z);
+    err = deflateInit(&z.stream, lev);
+    if (err != Z_OK) {
+	raise_zlib_error(err, z.stream.msg);
+    }
+    ZSTREAM_READY(&z);
+
+    args[0] = (VALUE)&z;
+    args[1] = src;
+    dst = rb_ensure(deflate_run, (VALUE)args, zstream_end, (VALUE)&z);
+
+    OBJ_INFECT(dst, src);
+    return dst;
+}
+
+static void
+do_deflate(z, src, flush)
+    struct zstream *z;
+    VALUE src;
+    int flush;
+{
+    if (NIL_P(src)) {
+	zstream_run(z, "", 0, Z_FINISH);
+	return;
+    }
+    StringValue(src);
+    if (flush != Z_NO_FLUSH || RSTRING(src)->len > 0) { /* prevent BUF_ERROR */
+	zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, flush);
+    }
+}
+
+/*
+ * call-seq: deflate(string[, flush])
+ *
+ * Inputs +string+ into the deflate stream and returns the output from the
+ * stream.  On calling this method, both the input and the output buffers of
+ * the stream are flushed. If +string+ is nil, this method finishes the
+ * stream, just like Zlib::ZStream#finish.
+ *
+ * The value of +flush+ should be either <tt>Zlib::NO_FLUSH</tt>,
+ * <tt>Zlib::SYNC_FLUSH</tt>, <tt>Zlib::FULL_FLUSH</tt>, or
+ * <tt>Zlib::FINISH</tt>. See zlib.h for details.
+ *
+ * TODO: document better!
+ */
+static VALUE
+rb_deflate_deflate(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    struct zstream *z = get_zstream(obj);
+    VALUE src, flush, dst;
+
+    rb_scan_args(argc, argv, "11", &src, &flush);
+    OBJ_INFECT(obj, src);
+    do_deflate(z, src, ARG_FLUSH(flush));
+    dst = zstream_detach_buffer(z);
+
+    OBJ_INFECT(dst, obj);
+    return dst;
+}
+
+/*
+ * call-seq: << string
+ *
+ * Inputs +string+ into the deflate stream just like Zlib::Deflate#deflate, but
+ * returns the Zlib::Deflate object itself.  The output from the stream is
+ * preserved in output buffer.
+ */
+static VALUE
+rb_deflate_addstr(obj, src)
+    VALUE obj, src;
+{
+    OBJ_INFECT(obj, src);
+    do_deflate(get_zstream(obj), src, Z_NO_FLUSH);
+    return obj;
+}
+
+/*
+ * call-seq: flush(flush)
+ *
+ * This method is equivalent to <tt>deflate('', flush)</tt>.  If flush is omitted,
+ * <tt>Zlib::SYNC_FLUSH</tt> is used as flush.  This method is just provided
+ * to improve the readability of your Ruby program.
+ *
+ * TODO: document better!
+ */
+static VALUE
+rb_deflate_flush(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    struct zstream *z = get_zstream(obj);
+    VALUE v_flush, dst;
+    int flush;
+
+    rb_scan_args(argc, argv, "01", &v_flush);
+    flush = FIXNUMARG(v_flush, Z_SYNC_FLUSH);
+    if (flush != Z_NO_FLUSH) {  /* prevent Z_BUF_ERROR */
+	zstream_run(z, "", 0, flush);
+    }
+    dst = zstream_detach_buffer(z);
+
+    OBJ_INFECT(dst, obj);
+    return dst;
+}
+
+/*
+ * call-seq: params(level, strategy)
+ * 
+ * Changes the parameters of the deflate stream. See zlib.h for details. The
+ * output from the stream by changing the params is preserved in output
+ * buffer.
+ *
+ * TODO: document better!
+ */
+static VALUE
+rb_deflate_params(obj, v_level, v_strategy)
+    VALUE obj, v_level, v_strategy;
+{
+    struct zstream *z = get_zstream(obj);
+    int level, strategy;
+    int err;
+
+    level = ARG_LEVEL(v_level);
+    strategy = ARG_STRATEGY(v_strategy);
+
+    err = deflateParams(&z->stream, level, strategy);
+    while (err == Z_BUF_ERROR) {
+	rb_warning("deflateParams() returned Z_BUF_ERROR");
+	zstream_expand_buffer(z);
+	err = deflateParams(&z->stream, level, strategy);
+    }
+    if (err != Z_OK) {
+	raise_zlib_error(err, z->stream.msg);
+    }
+
+    return Qnil;
+}
+
+/*
+ * call-seq: set_dictionary(string)
+ *
+ * Sets the preset dictionary and returns +string+. This method is available
+ * just only after Zlib::Deflate.new or Zlib::ZStream#reset method was called.
+ * See zlib.h for details.
+ *
+ * TODO: document better!
+ */
+static VALUE
+rb_deflate_set_dictionary(obj, dic)
+    VALUE obj, dic;
+{
+    struct zstream *z = get_zstream(obj);
+    VALUE src = dic;
+    int err;
+
+    OBJ_INFECT(obj, dic);
+    StringValue(src);
+    err = deflateSetDictionary(&z->stream,
+			       RSTRING(src)->ptr, RSTRING(src)->len);
+    if (err != Z_OK) {
+	raise_zlib_error(err, z->stream.msg);
+    }
+
+    return dic;
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+/*
+ * Document-class: Zlib::Inflate
+ *
+ * Zlib:Inflate is the class for decompressing compressed data.  Unlike
+ * Zlib::Deflate, an instance of this class is not able to duplicate (clone,
+ * dup) itself.
+ */
+
+
+
+static VALUE
+rb_inflate_s_allocate(klass)
+    VALUE klass;
+{
+    return zstream_inflate_new(klass);
+}
+
+/*
+ * call-seq: Zlib::Inflate.new(window_bits)
+ *
+ * Creates a new inflate stream for decompression. See zlib.h for details
+ * of the argument.  If +window_bits+ is +nil+, the default value is used.
+ *
+ * TODO: document better!
+ */
+static VALUE
+rb_inflate_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    struct zstream *z;
+    VALUE wbits;
+    int err;
+
+    rb_scan_args(argc, argv, "01", &wbits);
+    Data_Get_Struct(obj, struct zstream, z);
+
+    err = inflateInit2(&z->stream, ARG_WBITS(wbits));
+    if (err != Z_OK) {
+	raise_zlib_error(err, z->stream.msg);
+    }
+    ZSTREAM_READY(z);
+
+    return obj;
+}
+
+static VALUE
+inflate_run(args)
+    VALUE args;
+{
+    struct zstream *z = (struct zstream *)((VALUE *)args)[0];
+    VALUE src = ((VALUE *)args)[1];
+
+    zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_SYNC_FLUSH);
+    zstream_run(z, "", 0, Z_FINISH);  /* for checking errors */
+    return zstream_detach_buffer(z);
+}
+
+/*
+ * call-seq: Zlib::Inflate.inflate(string)
+ *
+ * Decompresses +string+. Raises a Zlib::NeedDict exception if a preset
+ * dictionary is needed for decompression.
+ *
+ * This method is almost equivalent to the following code:
+ *
+ *   def inflate(string)
+ *     zstream = Zlib::Inflate.new
+ *     buf = zstream.inflate(string)
+ *     zstream.finish
+ *     zstream.close
+ *     buf
+ *   end
+ *
+ */
+static VALUE
+rb_inflate_s_inflate(obj, src)
+    VALUE obj, src;
+{
+    struct zstream z;
+    VALUE dst, args[2];
+    int err;
+
+    StringValue(src);
+    zstream_init_inflate(&z);
+    err = inflateInit(&z.stream);
+    if (err != Z_OK) {
+	raise_zlib_error(err, z.stream.msg);
+    }
+    ZSTREAM_READY(&z);
+
+    args[0] = (VALUE)&z;
+    args[1] = src;
+    dst = rb_ensure(inflate_run, (VALUE)args, zstream_end, (VALUE)&z);
+
+    OBJ_INFECT(dst, src);
+    return dst;
+}
+
+static void
+do_inflate(z, src)
+    struct zstream *z;
+    VALUE src;
+{
+    if (NIL_P(src)) {
+	zstream_run(z, "", 0, Z_FINISH);
+	return;
+    }
+    StringValue(src);
+    if (RSTRING(src)->len > 0) { /* prevent Z_BUF_ERROR */
+	zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_SYNC_FLUSH);
+    }
+}
+
+/*
+ * call-seq: inflate(string)
+ *
+ * Inputs +string+ into the inflate stream and returns the output from the
+ * stream.  Calling this method, both the input and the output buffer of the
+ * stream are flushed.  If string is +nil+, this method finishes the stream,
+ * just like Zlib::ZStream#finish.
+ *
+ * Raises a Zlib::NeedDict exception if a preset dictionary is needed to
+ * decompress.  Set the dictionary by Zlib::Inflate#set_dictionary and then
+ * call this method again with an empty string.  (<i>???</i>)
+ *
+ * TODO: document better!
+ */
+static VALUE
+rb_inflate_inflate(obj, src)
+    VALUE obj, src;
+{
+    struct zstream *z = get_zstream(obj);
+    VALUE dst;
+
+    OBJ_INFECT(obj, src);
+
+    if (ZSTREAM_IS_FINISHED(z)) {
+	if (NIL_P(src)) {
+	    dst = zstream_detach_buffer(z);
+	}
+	else {
+	    StringValue(src);
+	    zstream_append_buffer2(z, src);
+	    dst = rb_str_new(0, 0);
+	}
+    }
+    else {
+	do_inflate(z, src);
+	dst = zstream_detach_buffer(z);
+	if (ZSTREAM_IS_FINISHED(z)) {
+	    zstream_passthrough_input(z);
+	}
+    }
+
+    OBJ_INFECT(dst, obj);
+    return dst;
+}
+
+/*
+ * call-seq: << string
+ *
+ * Inputs +string+ into the inflate stream just like Zlib::Inflate#inflate, but
+ * returns the Zlib::Inflate object itself.  The output from the stream is
+ * preserved in output buffer.
+ */
+static VALUE
+rb_inflate_addstr(obj, src)
+    VALUE obj, src;
+{
+    struct zstream *z = get_zstream(obj);
+
+    OBJ_INFECT(obj, src);
+
+    if (ZSTREAM_IS_FINISHED(z)) {
+	if (!NIL_P(src)) {
+	    StringValue(src);
+	    zstream_append_buffer2(z, src);
+	}
+    }
+    else {
+	do_inflate(z, src);
+	if (ZSTREAM_IS_FINISHED(z)) {
+	    zstream_passthrough_input(z);
+	}
+    }
+
+    return obj;
+}
+
+/*
+ * call-seq: sync(string)
+ *
+ * Inputs +string+ into the end of input buffer and skips data until a full
+ * flush point can be found.  If the point is found in the buffer, this method
+ * flushes the buffer and returns false.  Otherwise it returns +true+ and the
+ * following data of full flush point is preserved in the buffer.
+ */
+static VALUE
+rb_inflate_sync(obj, src)
+    VALUE obj, src;
+{
+    struct zstream *z = get_zstream(obj);
+
+    OBJ_INFECT(obj, src);
+    StringValue(src);
+    return zstream_sync(z, RSTRING(src)->ptr, RSTRING(src)->len);
+}
+
+/*
+ * Quoted verbatim from original documentation:
+ *
+ *   What is this?
+ *
+ * <tt>:)</tt>
+ */
+static VALUE
+rb_inflate_sync_point_p(obj)
+    VALUE obj;
+{
+    struct zstream *z = get_zstream(obj);
+    int err;
+
+    err = inflateSyncPoint(&z->stream);
+    if (err == 1) {
+	return Qtrue;
+    }
+    if (err != Z_OK) {
+	raise_zlib_error(err, z->stream.msg);
+    }
+    return Qfalse;
+}
+
+/*
+ * Sets the preset dictionary and returns +string+.  This method is available just
+ * only after a Zlib::NeedDict exception was raised.  See zlib.h for details.
+ *
+ * TODO: document better!
+ */
+static VALUE
+rb_inflate_set_dictionary(obj, dic)
+    VALUE obj, dic;
+{
+    struct zstream *z = get_zstream(obj);
+    VALUE src = dic;
+    int err;
+
+    OBJ_INFECT(obj, dic);
+    StringValue(src);
+    err = inflateSetDictionary(&z->stream,
+			       RSTRING(src)->ptr, RSTRING(src)->len);
+    if (err != Z_OK) {
+	raise_zlib_error(err, z->stream.msg);
+    }
+
+    return dic;
+}
+
+
+
+#if GZIP_SUPPORT
+
+/* NOTE: Features for gzip files of Ruby/zlib are written from scratch
+ *       and using undocumented feature of zlib, negative wbits.
+ *       I don't think gzFile APIs of zlib are good for Ruby.
+ */
+
+/*------- .gz file header --------*/
+
+#define GZ_MAGIC1             0x1f
+#define GZ_MAGIC2             0x8b
+#define GZ_METHOD_DEFLATE     8
+#define GZ_FLAG_MULTIPART     0x2
+#define GZ_FLAG_EXTRA         0x4
+#define GZ_FLAG_ORIG_NAME     0x8
+#define GZ_FLAG_COMMENT       0x10
+#define GZ_FLAG_ENCRYPT       0x20
+#define GZ_FLAG_UNKNOWN_MASK  0xc0
+
+#define GZ_EXTRAFLAG_FAST     0x4
+#define GZ_EXTRAFLAG_SLOW     0x2
+
+/* from zutil.h */
+#define OS_MSDOS    0x00
+#define OS_AMIGA    0x01
+#define OS_VMS      0x02
+#define OS_UNIX     0x03
+#define OS_ATARI    0x05
+#define OS_OS2      0x06
+#define OS_MACOS    0x07
+#define OS_TOPS20   0x0a
+#define OS_WIN32    0x0b
+
+#define OS_VMCMS    0x04
+#define OS_ZSYSTEM  0x08
+#define OS_CPM      0x09
+#define OS_QDOS     0x0c
+#define OS_RISCOS   0x0d
+#define OS_UNKNOWN  0xff
+
+#ifndef OS_CODE
+#define OS_CODE  OS_UNIX
+#endif
+
+static ID id_write, id_read, id_flush, id_seek, id_close;
+static VALUE cGzError, cNoFooter, cCRCError, cLengthError;
+
+
+
+/*-------- gzfile internal APIs --------*/
+
+struct gzfile {
+    struct zstream z;
+    VALUE io;
+    int level;
+    time_t mtime;       /* for header */
+    int os_code;        /* for header */
+    VALUE orig_name;    /* for header; must be a String */
+    VALUE comment;      /* for header; must be a String */
+    unsigned long crc;
+    int lineno;
+    int ungetc;
+    void (*end)(struct gzfile *);
+};
+
+#define GZFILE_FLAG_SYNC             ZSTREAM_FLAG_UNUSED
+#define GZFILE_FLAG_HEADER_FINISHED  (ZSTREAM_FLAG_UNUSED << 1)
+#define GZFILE_FLAG_FOOTER_FINISHED  (ZSTREAM_FLAG_UNUSED << 2)
+
+#define GZFILE_IS_FINISHED(gz) \
+    (ZSTREAM_IS_FINISHED(&gz->z) && (gz)->z.buf_filled == 0)
+
+#define GZFILE_READ_SIZE  2048
+
+
+static void
+gzfile_mark(gz)
+    struct gzfile *gz;
+{
+    rb_gc_mark(gz->io);
+    rb_gc_mark(gz->orig_name);
+    rb_gc_mark(gz->comment);
+    zstream_mark(&gz->z);
+}
+
+static void
+gzfile_free(gz)
+    struct gzfile *gz;
+{
+    struct zstream *z = &gz->z;
+
+    if (ZSTREAM_IS_READY(z)) {
+	if (z->func == &deflate_funcs) {
+	    finalizer_warn("Zlib::GzipWriter object must be closed explicitly.");
+	}
+	zstream_finalize(z);
+    }
+    free(gz);
+}
+
+static VALUE
+gzfile_new(klass, funcs, endfunc)
+    VALUE klass;
+    const struct zstream_funcs *funcs;
+    void (*endfunc) _((struct gzfile *));
+{
+    VALUE obj;
+    struct gzfile *gz;
+
+    obj = Data_Make_Struct(klass, struct gzfile, gzfile_mark, gzfile_free, gz);
+    zstream_init(&gz->z, funcs);
+    gz->io = Qnil;
+    gz->level = 0;
+    gz->mtime = 0;
+    gz->os_code = OS_CODE;
+    gz->orig_name = Qnil;
+    gz->comment = Qnil;
+    gz->crc = crc32(0, Z_NULL, 0);
+    gz->lineno = 0;
+    gz->ungetc = 0;
+    gz->end = endfunc;
+
+    return obj;
+}
+
+#define gzfile_writer_new(gz) gzfile_new((gz),&deflate_funcs,gzfile_writer_end)
+#define gzfile_reader_new(gz) gzfile_new((gz),&inflate_funcs,gzfile_reader_end)
+
+static void
+gzfile_reset(gz)
+    struct gzfile *gz;
+{
+    zstream_reset(&gz->z);
+    gz->crc = crc32(0, Z_NULL, 0);
+    gz->lineno = 0;
+    gz->ungetc = 0;
+}
+
+static void
+gzfile_close(gz, closeflag)
+    struct gzfile *gz;
+    int closeflag;
+{
+    VALUE io = gz->io;
+
+    gz->end(gz);
+    gz->io = Qnil;
+    gz->orig_name = Qnil;
+    gz->comment = Qnil;
+    if (closeflag && rb_respond_to(io, id_close)) {
+	rb_funcall(io, id_close, 0);
+    }
+}
+
+static void
+gzfile_write_raw(gz)
+    struct gzfile *gz;
+{
+    VALUE str;
+
+    if (gz->z.buf_filled > 0) {
+	str = zstream_detach_buffer(&gz->z);
+	OBJ_TAINT(str);  /* for safe */
+	rb_funcall(gz->io, id_write, 1, str);
+	if ((gz->z.flags & GZFILE_FLAG_SYNC)
+	    && rb_respond_to(gz->io, id_flush))
+	    rb_funcall(gz->io, id_flush, 0);
+    }
+}
+
+static VALUE
+gzfile_read_raw(gz)
+    struct gzfile *gz;
+{
+    VALUE str;
+
+    str = rb_funcall(gz->io, id_read, 1, INT2FIX(GZFILE_READ_SIZE));
+    if (!NIL_P(str)) {
+	Check_Type(str, T_STRING);
+    }
+    return str;
+}
+
+static int
+gzfile_read_raw_ensure(gz, size)
+    struct gzfile *gz;
+    int size;
+{
+    VALUE str;
+
+    while (NIL_P(gz->z.input) || RSTRING(gz->z.input)->len < size) {
+	str = gzfile_read_raw(gz);
+	if (NIL_P(str)) return Qfalse;
+	zstream_append_input2(&gz->z, str);
+    }
+    return Qtrue;
+}
+
+static char *
+gzfile_read_raw_until_zero(gz, offset)
+    struct gzfile *gz;
+    long offset;
+{
+    VALUE str;
+    char *p;
+
+    for (;;) {
+	p = memchr(RSTRING(gz->z.input)->ptr + offset, '\0',
+		   RSTRING(gz->z.input)->len - offset);
+	if (p) break;
+	str = gzfile_read_raw(gz);
+	if (NIL_P(str)) {
+	    rb_raise(cGzError, "unexpected end of file");
+	}
+	offset = RSTRING(gz->z.input)->len;
+	zstream_append_input2(&gz->z, str);
+    }
+    return p;
+}
+
+static unsigned int
+gzfile_get16(src)
+    const unsigned char *src;
+{
+    unsigned int n;
+    n  = *(src++) & 0xff;
+    n |= (*(src++) & 0xff) << 8;
+    return n;
+}
+
+static unsigned long
+gzfile_get32(src)
+    const unsigned char *src;
+{
+    unsigned long n;
+    n  = *(src++) & 0xff;
+    n |= (*(src++) & 0xff) << 8;
+    n |= (*(src++) & 0xff) << 16;
+    n |= (*(src++) & 0xffU) << 24;
+    return n;
+}
+
+static void
+gzfile_set32(n, dst)
+    unsigned long n;
+    unsigned char *dst;
+{
+    *(dst++) = n & 0xff;
+    *(dst++) = (n >> 8) & 0xff;
+    *(dst++) = (n >> 16) & 0xff;
+    *dst     = (n >> 24) & 0xff;
+}
+
+static void
+gzfile_make_header(gz)
+    struct gzfile *gz;
+{
+    unsigned char buf[10];  /* the size of gzip header */
+    unsigned char flags = 0, extraflags = 0;
+
+    if (!NIL_P(gz->orig_name)) {
+	flags |= GZ_FLAG_ORIG_NAME;
+    }
+    if (!NIL_P(gz->comment)) {
+	flags |= GZ_FLAG_COMMENT;
+    }
+    if (gz->mtime == 0) {
+	gz->mtime = time(0);
+    }
+
+    if (gz->level == Z_BEST_SPEED) {
+	extraflags |= GZ_EXTRAFLAG_FAST;
+    }
+    else if (gz->level == Z_BEST_COMPRESSION) {
+	extraflags |= GZ_EXTRAFLAG_SLOW;
+    }
+
+    buf[0] = GZ_MAGIC1;
+    buf[1] = GZ_MAGIC2;
+    buf[2] = GZ_METHOD_DEFLATE;
+    buf[3] = flags;
+    gzfile_set32(gz->mtime, &buf[4]);
+    buf[8] = extraflags;
+    buf[9] = gz->os_code;
+    zstream_append_buffer(&gz->z, buf, sizeof(buf));
+
+    if (!NIL_P(gz->orig_name)) {
+	zstream_append_buffer2(&gz->z, gz->orig_name);
+	zstream_append_buffer(&gz->z, "\0", 1);
+    }
+    if (!NIL_P(gz->comment)) {
+	zstream_append_buffer2(&gz->z, gz->comment);
+	zstream_append_buffer(&gz->z, "\0", 1);
+    }
+
+    gz->z.flags |= GZFILE_FLAG_HEADER_FINISHED;
+}
+
+static void
+gzfile_make_footer(gz)
+    struct gzfile *gz;
+{
+    unsigned char buf[8];  /* 8 is the size of gzip footer */
+
+    gzfile_set32(gz->crc, buf);
+    gzfile_set32(gz->z.stream.total_in, &buf[4]);
+    zstream_append_buffer(&gz->z, buf, sizeof(buf));
+    gz->z.flags |= GZFILE_FLAG_FOOTER_FINISHED;
+}
+
+static void
+gzfile_read_header(gz)
+    struct gzfile *gz;
+{
+    const unsigned char *head;
+    long len;
+    char flags, *p;
+
+    if (!gzfile_read_raw_ensure(gz, 10)) {  /* 10 is the size of gzip header */
+	rb_raise(cGzError, "not in gzip format");
+    }
+
+    head = RSTRING(gz->z.input)->ptr;
+
+    if (head[0] != GZ_MAGIC1 || head[1] != GZ_MAGIC2) {
+	rb_raise(cGzError, "not in gzip format");
+    }
+    if (head[2] != GZ_METHOD_DEFLATE) {
+	rb_raise(cGzError, "unsupported compression method %d", head[2]);
+    }
+
+    flags = head[3];
+    if (flags & GZ_FLAG_MULTIPART) {
+	rb_raise(cGzError, "multi-part gzip file is not supported");
+    }
+    else if (flags & GZ_FLAG_ENCRYPT) {
+	rb_raise(cGzError, "encrypted gzip file is not supported");
+    }
+    else if (flags & GZ_FLAG_UNKNOWN_MASK) {
+	rb_raise(cGzError, "unknown flags 0x%02x", flags);
+    }
+
+    if (head[8] & GZ_EXTRAFLAG_FAST) {
+	gz->level = Z_BEST_SPEED;
+    }
+    else if (head[8] & GZ_EXTRAFLAG_SLOW) {
+	gz->level = Z_BEST_COMPRESSION;
+    }
+    else {
+	gz->level = Z_DEFAULT_COMPRESSION;
+    }
+
+    gz->mtime = gzfile_get32(&head[4]);
+    gz->os_code = head[9];
+    zstream_discard_input(&gz->z, 10);
+
+    if (flags & GZ_FLAG_EXTRA) {
+	if (!gzfile_read_raw_ensure(gz, 2)) {
+	    rb_raise(cGzError, "unexpected end of file");
+	}
+	len = gzfile_get16(RSTRING(gz->z.input)->ptr);
+	if (!gzfile_read_raw_ensure(gz, 2 + len)) {
+	    rb_raise(cGzError, "unexpected end of file");
+	}
+	zstream_discard_input(&gz->z, 2 + len);
+    }
+    if (flags & GZ_FLAG_ORIG_NAME) {
+	p = gzfile_read_raw_until_zero(gz, 0);
+	len = p - RSTRING(gz->z.input)->ptr;
+	gz->orig_name = rb_str_new(RSTRING(gz->z.input)->ptr, len);
+	OBJ_TAINT(gz->orig_name);  /* for safe */
+	zstream_discard_input(&gz->z, len + 1);
+    }
+    if (flags & GZ_FLAG_COMMENT) {
+	p = gzfile_read_raw_until_zero(gz, 0);
+	len = p - RSTRING(gz->z.input)->ptr;
+	gz->comment = rb_str_new(RSTRING(gz->z.input)->ptr, len);
+	OBJ_TAINT(gz->comment);  /* for safe */
+	zstream_discard_input(&gz->z, len + 1);
+    }
+
+    if (gz->z.input != Qnil && RSTRING(gz->z.input)->len > 0) {
+	zstream_run(&gz->z, 0, 0, Z_SYNC_FLUSH);
+    }
+}
+
+static void
+gzfile_check_footer(gz)
+    struct gzfile *gz;
+{
+    unsigned long crc, length;
+
+    gz->z.flags |= GZFILE_FLAG_FOOTER_FINISHED;
+
+    if (!gzfile_read_raw_ensure(gz, 8)) { /* 8 is the size of gzip footer */
+	rb_raise(cNoFooter, "footer is not found");
+    }
+
+    crc = gzfile_get32(RSTRING(gz->z.input)->ptr);
+    length = gzfile_get32(RSTRING(gz->z.input)->ptr + 4);
+
+    gz->z.stream.total_in += 8;  /* to rewind correctly */
+    zstream_discard_input(&gz->z, 8);
+
+    if (gz->crc != crc) {
+	rb_raise(cCRCError, "invalid compressed data -- crc error");
+    }
+    if (gz->z.stream.total_out != length) {
+	rb_raise(cLengthError, "invalid compressed data -- length error");
+    }
+}
+
+static void
+gzfile_write(gz, str, len)
+    struct gzfile *gz;
+    Bytef *str;
+    uInt len;
+{
+    if (!(gz->z.flags & GZFILE_FLAG_HEADER_FINISHED)) {
+	gzfile_make_header(gz);
+    }
+
+    if (len > 0 || (gz->z.flags & GZFILE_FLAG_SYNC)) {
+	gz->crc = crc32(gz->crc, str, len);
+	zstream_run(&gz->z, str, len, (gz->z.flags & GZFILE_FLAG_SYNC)
+		    ? Z_SYNC_FLUSH : Z_NO_FLUSH);
+    }
+    gzfile_write_raw(gz);
+}
+
+static long
+gzfile_read_more(gz)
+    struct gzfile *gz;
+{
+    volatile VALUE str;
+
+    while (!ZSTREAM_IS_FINISHED(&gz->z)) {
+	str = gzfile_read_raw(gz);
+	if (NIL_P(str)) {
+	    if (!ZSTREAM_IS_FINISHED(&gz->z)) {
+		rb_raise(cGzError, "unexpected end of file");
+	    }
+	    break;
+	}
+	if (RSTRING(str)->len > 0) { /* prevent Z_BUF_ERROR */
+	    zstream_run(&gz->z, RSTRING(str)->ptr, RSTRING(str)->len,
+			Z_SYNC_FLUSH);
+	}
+	if (gz->z.buf_filled > 0) break;
+    }
+    return gz->z.buf_filled;
+}
+
+static void
+gzfile_calc_crc(gz, str)
+    struct gzfile *gz;
+    VALUE str;
+{
+    if (RSTRING(str)->len <= gz->ungetc) {
+	gz->ungetc -= RSTRING(str)->len;
+    }
+    else {
+	gz->crc = crc32(gz->crc, RSTRING(str)->ptr + gz->ungetc,
+			RSTRING(str)->len - gz->ungetc);
+	gz->ungetc = 0;
+    }
+}
+
+static VALUE
+gzfile_read(gz, len)
+    struct gzfile *gz;
+    int len;
+{
+    VALUE dst;
+
+    if (len < 0)
+        rb_raise(rb_eArgError, "negative length %d given", len);
+    if (len == 0)
+	return rb_str_new(0, 0);
+    while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled < len) {
+	gzfile_read_more(gz);
+    }
+    if (GZFILE_IS_FINISHED(gz)) {
+	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
+	    gzfile_check_footer(gz);
+	}
+	return Qnil;
+    }
+
+    dst = zstream_shift_buffer(&gz->z, len);
+    gzfile_calc_crc(gz, dst);
+
+    OBJ_TAINT(dst);  /* for safe */
+    return dst;
+}
+
+static VALUE
+gzfile_read_all(gz)
+    struct gzfile *gz;
+{
+    VALUE dst;
+
+    while (!ZSTREAM_IS_FINISHED(&gz->z)) {
+	gzfile_read_more(gz);
+    }
+    if (GZFILE_IS_FINISHED(gz)) {
+	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
+	    gzfile_check_footer(gz);
+	}
+	return rb_str_new(0, 0);
+    }
+
+    dst = zstream_detach_buffer(&gz->z);
+    gzfile_calc_crc(gz, dst);
+
+    OBJ_TAINT(dst);  /* for safe */
+    return dst;
+}
+
+static void
+gzfile_ungetc(gz, c)
+    struct gzfile *gz;
+    int c;
+{
+    zstream_buffer_ungetc(&gz->z, c);
+    gz->ungetc++;
+}
+
+static VALUE
+gzfile_writer_end_run(arg)
+    VALUE arg;
+{
+    struct gzfile *gz = (struct gzfile *)arg;
+
+    if (!(gz->z.flags & GZFILE_FLAG_HEADER_FINISHED)) {
+	gzfile_make_header(gz);
+    }
+
+    zstream_run(&gz->z, "", 0, Z_FINISH);
+    gzfile_make_footer(gz);
+    gzfile_write_raw(gz);
+
+    return Qnil;
+}
+
+static void
+gzfile_writer_end(gz)
+    struct gzfile *gz;
+{
+    if (ZSTREAM_IS_CLOSING(&gz->z)) return;
+    gz->z.flags |= ZSTREAM_FLAG_CLOSING;
+
+    rb_ensure(gzfile_writer_end_run, (VALUE)gz, zstream_end, (VALUE)&gz->z);
+}
+
+static VALUE
+gzfile_reader_end_run(arg)
+    VALUE arg;
+{
+    struct gzfile *gz = (struct gzfile *)arg;
+
+    if (GZFILE_IS_FINISHED(gz)
+	&& !(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
+	gzfile_check_footer(gz);
+    }
+
+    return Qnil;
+}
+
+static void
+gzfile_reader_end(gz)
+    struct gzfile *gz;
+{
+    if (ZSTREAM_IS_CLOSING(&gz->z)) return;
+    gz->z.flags |= ZSTREAM_FLAG_CLOSING;
+
+    rb_ensure(gzfile_reader_end_run, (VALUE)gz, zstream_end, (VALUE)&gz->z);
+}
+
+static void
+gzfile_reader_rewind(gz)
+    struct gzfile *gz;
+{
+    long n;
+
+    n = gz->z.stream.total_in;
+    if (!NIL_P(gz->z.input)) {
+	n += RSTRING(gz->z.input)->len;
+    }
+
+    rb_funcall(gz->io, id_seek, 2, rb_int2inum(-n), INT2FIX(1));
+    gzfile_reset(gz);
+}
+
+static VALUE
+gzfile_reader_get_unused(gz)
+    struct gzfile *gz;
+{
+    VALUE str;
+
+    if (!ZSTREAM_IS_READY(&gz->z)) return Qnil;
+    if (!GZFILE_IS_FINISHED(gz)) return Qnil;
+    if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
+	gzfile_check_footer(gz);
+    }
+    if (NIL_P(gz->z.input)) return Qnil;
+
+    str = rb_str_dup(gz->z.input);
+    OBJ_TAINT(str);  /* for safe */
+    return str;
+}
+
+static struct gzfile *
+get_gzfile(obj)
+    VALUE obj;
+{
+    struct gzfile *gz;
+
+    Data_Get_Struct(obj, struct gzfile, gz);
+    if (!ZSTREAM_IS_READY(&gz->z)) {
+	rb_raise(cGzError, "closed gzip stream");
+    }
+    return gz;
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+/*
+ * Document-class: Zlib::GzipFile
+ *
+ * Zlib::GzipFile is an abstract class for handling a gzip formatted
+ * compressed file. The operations are defined in the subclasses,
+ * Zlib::GzipReader for reading, and Zlib::GzipWriter for writing.
+ *
+ * GzipReader should be used by associating an IO, or IO-like, object.
+ */
+
+
+static VALUE
+gzfile_ensure_close(obj)
+    VALUE obj;
+{
+    struct gzfile *gz;
+
+    Data_Get_Struct(obj, struct gzfile, gz);
+    if (ZSTREAM_IS_READY(&gz->z)) {
+	gzfile_close(gz, 1);
+    }
+    return Qnil;
+}
+
+/*
+ * See Zlib::GzipReader#wrap and Zlib::GzipWriter#wrap.
+ */
+static VALUE
+rb_gzfile_s_wrap(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE obj = rb_class_new_instance(argc, argv, klass);
+
+    if (rb_block_given_p()) {
+	return rb_ensure(rb_yield, obj, gzfile_ensure_close, obj);
+    }
+    else {
+	return obj;
+    }
+}
+
+/*
+ * See Zlib::GzipReader#open and Zlib::GzipWriter#open.
+ */
+static VALUE
+gzfile_s_open(argc, argv, klass, mode)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+    const char *mode;
+{
+    VALUE io, filename;
+
+    if (argc < 1) {
+	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
+    }
+    filename = argv[0];
+    SafeStringValue(filename);
+    io = rb_file_open(RSTRING(filename)->ptr, mode);
+
+    argv[0] = io;
+    return rb_gzfile_s_wrap(argc, argv, klass);
+}
+
+/*
+ * Same as IO.
+ */
+static VALUE
+rb_gzfile_to_io(obj)
+    VALUE obj;
+{
+    return get_gzfile(obj)->io;
+}
+
+/*
+ * Returns CRC value of the uncompressed data.
+ */
+static VALUE
+rb_gzfile_crc(obj)
+    VALUE obj;
+{
+    return rb_uint2inum(get_gzfile(obj)->crc);
+}
+
+/*
+ * Returns last modification time recorded in the gzip file header.
+ */
+static VALUE
+rb_gzfile_mtime(obj)
+    VALUE obj;
+{
+    return rb_time_new(get_gzfile(obj)->mtime, (time_t)0);
+}
+
+/*
+ * Returns compression level.
+ */
+static VALUE
+rb_gzfile_level(obj)
+    VALUE obj;
+{
+    return INT2FIX(get_gzfile(obj)->level);
+}
+
+/*
+ * Returns OS code number recorded in the gzip file header.
+ */
+static VALUE
+rb_gzfile_os_code(obj)
+    VALUE obj;
+{
+    return INT2FIX(get_gzfile(obj)->os_code);
+}
+
+/*
+ * Returns original filename recorded in the gzip file header, or +nil+ if
+ * original filename is not present.
+ */
+static VALUE
+rb_gzfile_orig_name(obj)
+    VALUE obj;
+{
+    VALUE str = get_gzfile(obj)->orig_name;
+    if (!NIL_P(str)) {
+	str = rb_str_dup(str);
+    }
+    OBJ_TAINT(str);  /* for safe */
+    return str;
+}
+
+/*
+ * Returns comments recorded in the gzip file header, or nil if the comments
+ * is not present.
+ */
+static VALUE
+rb_gzfile_comment(obj)
+    VALUE obj;
+{
+    VALUE str = get_gzfile(obj)->comment;
+    if (!NIL_P(str)) {
+	str = rb_str_dup(str);
+    }
+    OBJ_TAINT(str);  /* for safe */
+    return str;
+}
+
+/*
+ * ???
+ */
+static VALUE
+rb_gzfile_lineno(obj)
+    VALUE obj;
+{
+    return INT2NUM(get_gzfile(obj)->lineno);
+}
+
+/*
+ * ???
+ */
+static VALUE
+rb_gzfile_set_lineno(obj, lineno)
+    VALUE obj, lineno;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    gz->lineno = NUM2INT(lineno);
+    return lineno;
+}
+
+/*
+ * ???
+ */
+static VALUE
+rb_gzfile_set_mtime(obj, mtime)
+    VALUE obj, mtime;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    VALUE val;
+
+    if (gz->z.flags & GZFILE_FLAG_HEADER_FINISHED) {
+	rb_raise(cGzError, "header is already written");
+    }
+
+    if (FIXNUM_P(time)) {
+	gz->mtime = FIX2INT(mtime);
+    }
+    else {
+	val = rb_Integer(mtime);
+	gz->mtime = FIXNUM_P(val) ? FIX2INT(val) : rb_big2ulong(val);
+    }
+    return mtime;
+}
+
+/*
+ * ???
+ */
+static VALUE
+rb_gzfile_set_orig_name(obj, str)
+    VALUE obj, str;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    VALUE s;
+    char *p;
+
+    if (gz->z.flags & GZFILE_FLAG_HEADER_FINISHED) {
+	rb_raise(cGzError, "header is already written");
+    }
+    s = rb_str_dup(rb_str_to_str(str));
+    p = memchr(RSTRING(s)->ptr, '\0', RSTRING(s)->len);
+    if (p) {
+	rb_str_resize(s, p - RSTRING(s)->ptr);
+    }
+    gz->orig_name = s;
+    return str;
+}
+
+/*
+ * ???
+ */
+static VALUE
+rb_gzfile_set_comment(obj, str)
+    VALUE obj, str;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    VALUE s;
+    char *p;
+
+    if (gz->z.flags & GZFILE_FLAG_HEADER_FINISHED) {
+	rb_raise(cGzError, "header is already written");
+    }
+    s = rb_str_dup(rb_str_to_str(str));
+    p = memchr(RSTRING(s)->ptr, '\0', RSTRING(s)->len);
+    if (p) {
+	rb_str_resize(s, p - RSTRING(s)->ptr);
+    }
+    gz->comment = s;
+    return str;
+}
+
+/*
+ * Closes the GzipFile object. This method calls close method of the
+ * associated IO object. Returns the associated IO object.
+ */
+static VALUE
+rb_gzfile_close(obj)
+    VALUE obj;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    VALUE io;
+
+    io = gz->io;
+    gzfile_close(gz, 1);
+    return io;
+}
+
+/*
+ * Closes the GzipFile object. Unlike Zlib::GzipFile#close, this method never
+ * calls the close method of the associated IO object. Returns the associated IO
+ * object.
+ */
+static VALUE
+rb_gzfile_finish(obj)
+    VALUE obj;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    VALUE io;
+
+    io = gz->io;
+    gzfile_close(gz, 0);
+    return io;
+}
+
+/*
+ * Same as IO.
+ */
+static VALUE
+rb_gzfile_closed_p(obj)
+    VALUE obj;
+{
+    struct gzfile *gz;
+    Data_Get_Struct(obj, struct gzfile, gz);
+    return NIL_P(gz->io) ? Qtrue : Qfalse;
+}
+
+/*
+ * ???
+ */
+static VALUE
+rb_gzfile_eof_p(obj)
+    VALUE obj;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    return GZFILE_IS_FINISHED(gz) ? Qtrue : Qfalse;
+}
+
+/*
+ * Same as IO.
+ */
+static VALUE
+rb_gzfile_sync(obj)
+    VALUE obj;
+{
+    return (get_gzfile(obj)->z.flags & GZFILE_FLAG_SYNC) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq: sync = flag
+ *
+ * Same as IO.  If flag is +true+, the associated IO object must respond to the
+ * +flush+ method.  While +sync+ mode is +true+, the compression ratio
+ * decreases sharply.
+ */
+static VALUE
+rb_gzfile_set_sync(obj, mode)
+    VALUE obj, mode;
+{
+    struct gzfile *gz = get_gzfile(obj);
+
+    if (RTEST(mode)) {
+	gz->z.flags |= GZFILE_FLAG_SYNC;
+    }
+    else {
+	gz->z.flags &= ~GZFILE_FLAG_SYNC;
+    }
+    return mode;
+}
+
+/*
+ * ???
+ */
+static VALUE
+rb_gzfile_total_in(obj)
+    VALUE obj;
+{
+    return rb_uint2inum(get_gzfile(obj)->z.stream.total_in);
+}
+
+/*
+ * ???
+ */
+static VALUE
+rb_gzfile_total_out(obj)
+    VALUE obj;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    return rb_uint2inum(gz->z.stream.total_out - gz->z.buf_filled);
+}
+
+
+/* ------------------------------------------------------------------------- */
+
+/*
+ * Document-class: Zlib::GzipWriter
+ *
+ * Zlib::GzipWriter is a class for writing gzipped files.  GzipWriter should
+ * be used with an instance of IO, or IO-like, object. 
+ *
+ * For example:
+ *
+ *   Zlib::GzipWriter.open('hoge.gz') do |gz|
+ *     gz.write 'jugemu jugemu gokou no surikire...'
+ *   end
+ *
+ *   File.open('hoge.gz', 'w') do |f|
+ *     gz = Zlib::GzipWriter.new(f)
+ *     gz.write 'jugemu jugemu gokou no surikire...'
+ *     gz.close
+ *   end
+ *
+ *   # TODO: test these.  Are they equivalent?  Can GzipWriter.new take a
+ *   # block?
+ *
+ * NOTE: Due to the limitation of Ruby's finalizer, you must explicitly close
+ * GzipWriter objects by Zlib::GzipWriter#close etc.  Otherwise, GzipWriter
+ * will be not able to write the gzip footer and will generate a broken gzip
+ * file.
+ */
+
+static VALUE
+rb_gzwriter_s_allocate(klass)
+    VALUE klass;
+{
+    return gzfile_writer_new(klass);
+}
+
+/*
+ * call-seq: Zlib::GzipWriter.open(filename, level=nil, strategy=nil) { |gz| ... }
+ *
+ * Opens a file specified by +filename+ for writing gzip compressed data, and
+ * returns a GzipWriter object associated with that file.  Further details of
+ * this method are found in Zlib::GzipWriter.new and Zlib::GzipWriter#wrap.
+ */
+static VALUE
+rb_gzwriter_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    return gzfile_s_open(argc, argv, klass, "wb");
+}
+
+/*
+ * call-seq: Zlib::GzipWriter.new(io, level, strategy)
+ *
+ * Creates a GzipWriter object associated with +io+. +level+ and +strategy+
+ * should be the same as the arguments of Zlib::Deflate.new.  The GzipWriter
+ * object writes gzipped data to +io+.  At least, +io+ must respond to the
+ * +write+ method that behaves same as write method in IO class.
+ */
+static VALUE
+rb_gzwriter_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    struct gzfile *gz;
+    VALUE io, level, strategy;
+    int err;
+
+    rb_scan_args(argc, argv, "12", &io, &level, &strategy);
+    Data_Get_Struct(obj, struct gzfile, gz);
+
+    /* this is undocumented feature of zlib */
+    gz->level = ARG_LEVEL(level);
+    err = deflateInit2(&gz->z.stream, gz->level, Z_DEFLATED,
+		       -MAX_WBITS, DEF_MEM_LEVEL, ARG_STRATEGY(strategy));
+    if (err != Z_OK) {
+	raise_zlib_error(err, gz->z.stream.msg);
+    }
+    gz->io = io;
+    ZSTREAM_READY(&gz->z);
+
+    return obj;
+}
+
+/*
+ * call-seq: flush(flush=nil)
+ *
+ * Flushes all the internal buffers of the GzipWriter object.  The meaning of
+ * +flush+ is same as in Zlib::Deflate#deflate.  <tt>Zlib::SYNC_FLUSH</tt> is used if
+ * +flush+ is omitted.  It is no use giving flush <tt>Zlib::NO_FLUSH</tt>.
+ */
+static VALUE
+rb_gzwriter_flush(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    VALUE v_flush;
+    int flush;
+
+    rb_scan_args(argc, argv, "01", &v_flush);
+
+    flush = FIXNUMARG(v_flush, Z_SYNC_FLUSH);
+    if (flush != Z_NO_FLUSH) {  /* prevent Z_BUF_ERROR */
+	zstream_run(&gz->z, "", 0, flush);
+    }
+
+    gzfile_write_raw(gz);
+    if (rb_respond_to(gz->io, id_flush)) {
+	rb_funcall(gz->io, id_flush, 0);
+    }
+    return obj;
+}
+
+/*
+ * Same as IO.
+ */
+static VALUE
+rb_gzwriter_write(obj, str)
+    VALUE obj, str;
+{
+    struct gzfile *gz = get_gzfile(obj);
+
+    if (TYPE(str) != T_STRING) {
+	str = rb_obj_as_string(str);
+    }
+    gzfile_write(gz, RSTRING(str)->ptr, RSTRING(str)->len);
+    return INT2FIX(RSTRING(str)->len);
+}
+
+/*
+ * Same as IO.
+ */
+static VALUE
+rb_gzwriter_putc(obj, ch)
+    VALUE obj, ch;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    char c = NUM2CHR(ch);
+
+    gzfile_write(gz, &c, 1);
+    return ch;
+}
+
+
+
+/*
+ * Document-method: <<
+ * Same as IO.
+ */
+#define rb_gzwriter_addstr  rb_io_addstr
+/*
+ * Document-method: printf
+ * Same as IO.
+ */
+#define rb_gzwriter_printf  rb_io_printf
+/*
+ * Document-method: print
+ * Same as IO.
+ */
+#define rb_gzwriter_print  rb_io_print
+/*
+ * Document-method: puts
+ * Same as IO.
+ */
+#define rb_gzwriter_puts  rb_io_puts
+
+
+/* ------------------------------------------------------------------------- */
+
+/*
+ * Document-class: Zlib::GzipReader
+ *
+ * Zlib::GzipReader is the class for reading a gzipped file.  GzipReader should
+ * be used an IO, or -IO-lie, object.
+ *
+ *   Zlib::GzipReader.open('hoge.gz') {|gz|
+ *     print gz.read
+ *   }
+ *
+ *   File.open('hoge.gz') do |f|
+ *     gz = Zlib::GzipReader.new(f)
+ *     print gz.read
+ *     gz.close
+ *   end
+ *
+ *   # TODO: test these.  Are they equivalent?  Can GzipReader.new take a
+ *   # block?
+ *
+ * == Method Catalogue
+ *
+ * The following methods in Zlib::GzipReader are just like their counterparts
+ * in IO, but they raise Zlib::Error or Zlib::GzipFile::Error exception if an
+ * error was found in the gzip file.
+ * - #each
+ * - #each_line
+ * - #each_byte
+ * - #gets
+ * - #getc
+ * - #lineno
+ * - #lineno=
+ * - #read
+ * - #readchar
+ * - #readline
+ * - #readlines
+ * - #ungetc
+ *
+ * Be careful of the footer of the gzip file. A gzip file has the checksum of
+ * pre-compressed data in its footer. GzipReader checks all uncompressed data
+ * against that checksum at the following cases, and if it fails, raises
+ * <tt>Zlib::GzipFile::NoFooter</tt>, <tt>Zlib::GzipFile::CRCError</tt>, or
+ * <tt>Zlib::GzipFile::LengthError</tt> exception.
+ *
+ * - When an reading request is received beyond the end of file (the end of
+ *   compressed data). That is, when Zlib::GzipReader#read,
+ *   Zlib::GzipReader#gets, or some other methods for reading returns nil.
+ * - When Zlib::GzipFile#close method is called after the object reaches the
+ *   end of file.
+ * - When Zlib::GzipReader#unused method is called after the object reaches
+ *   the end of file.
+ *
+ * The rest of the methods are adequately described in their own
+ * documentation.
+ */
+
+static VALUE
+rb_gzreader_s_allocate(klass)
+    VALUE klass;
+{
+    return gzfile_reader_new(klass);
+}
+
+/*
+ * call-seq: Zlib::GzipReader.open(filename) {|gz| ... }
+ *
+ * Opens a file specified by +filename+ as a gzipped file, and returns a
+ * GzipReader object associated with that file.  Further details of this method
+ * are in Zlib::GzipReader.new and ZLib::GzipReader.wrap.
+ */
+static VALUE
+rb_gzreader_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    return gzfile_s_open(argc, argv, klass, "rb");
+}
+
+/*
+ * call-seq: Zlib::GzipReader.new(io)
+ *
+ * Creates a GzipReader object associated with +io+. The GzipReader object reads
+ * gzipped data from +io+, and parses/decompresses them.  At least, +io+ must have
+ * a +read+ method that behaves same as the +read+ method in IO class.
+ *
+ * If the gzip file header is incorrect, raises an Zlib::GzipFile::Error
+ * exception.
+ */
+static VALUE
+rb_gzreader_initialize(obj, io)
+    VALUE obj, io;
+{
+    struct gzfile *gz;
+    int err;
+
+    Data_Get_Struct(obj, struct gzfile, gz);
+
+    /* this is undocumented feature of zlib */
+    err = inflateInit2(&gz->z.stream, -MAX_WBITS);
+    if (err != Z_OK) {
+	raise_zlib_error(err, gz->z.stream.msg);
+    }
+    gz->io = io;
+    ZSTREAM_READY(&gz->z);
+    gzfile_read_header(gz);
+
+    return obj;
+}
+
+/*
+ * Resets the position of the file pointer to the point created the GzipReader
+ * object.  The associated IO object needs to respond to the +seek+ method.
+ */
+static VALUE
+rb_gzreader_rewind(obj)
+    VALUE obj;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    gzfile_reader_rewind(gz);
+    return INT2FIX(0);
+}
+
+/*
+ * Returns the rest of the data which had read for parsing gzip format, or
+ * +nil+ if the whole gzip file is not parsed yet.
+ */
+static VALUE
+rb_gzreader_unused(obj)
+    VALUE obj;
+{
+    struct gzfile *gz;
+    Data_Get_Struct(obj, struct gzfile, gz);
+    return gzfile_reader_get_unused(gz);
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_read(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    VALUE vlen;
+    int len;
+
+    rb_scan_args(argc, argv, "01", &vlen);
+    if (NIL_P(vlen)) {
+	return gzfile_read_all(gz);
+    }
+
+    len = NUM2INT(vlen);
+    if (len < 0) {
+	rb_raise(rb_eArgError, "negative length %d given", len);
+    }
+    return gzfile_read(gz, len);
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_getc(obj)
+    VALUE obj;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    VALUE dst;
+
+    dst = gzfile_read(gz, 1);
+    if (!NIL_P(dst)) {
+	dst = INT2FIX((unsigned int)(RSTRING(dst)->ptr[0]) & 0xff);
+    }
+    return dst;
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_readchar(obj)
+    VALUE obj;
+{
+    VALUE dst;
+    dst = rb_gzreader_getc(obj);
+    if (NIL_P(dst)) {
+	rb_raise(rb_eEOFError, "end of file reached");
+    }
+    return dst;
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_each_byte(obj)
+    VALUE obj;
+{
+    VALUE c;
+    while (!NIL_P(c = rb_gzreader_getc(obj))) {
+	rb_yield(c);
+    }
+    return Qnil;
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_ungetc(obj, ch)
+    VALUE obj, ch;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    gzfile_ungetc(gz, NUM2CHR(ch));
+    return Qnil;
+}
+
+static void
+gzreader_skip_linebreaks(gz)
+    struct gzfile *gz;
+{
+    VALUE str;
+    char *p;
+    int n;
+
+    while (gz->z.buf_filled == 0) {
+	if (GZFILE_IS_FINISHED(gz)) return;
+	gzfile_read_more(gz);
+    }
+    n = 0;
+    p = RSTRING(gz->z.buf)->ptr;
+
+    while (n++, *(p++) == '\n') {
+	if (n >= gz->z.buf_filled) {
+	    str = zstream_detach_buffer(&gz->z);
+	    gzfile_calc_crc(gz, str);
+	    while (gz->z.buf_filled == 0) {
+		if (GZFILE_IS_FINISHED(gz)) return;
+		gzfile_read_more(gz);
+	    }
+	    n = 0;
+	    p = RSTRING(gz->z.buf)->ptr;
+	}
+    }
+
+    str = zstream_shift_buffer(&gz->z, n - 1);
+    gzfile_calc_crc(gz, str);
+}
+
+static void
+rscheck(rsptr, rslen, rs)
+    char *rsptr;
+    long rslen;
+    VALUE rs;
+{
+    if (RSTRING(rs)->ptr != rsptr && RSTRING(rs)->len != rslen)
+	rb_raise(rb_eRuntimeError, "rs modified");
+}
+
+static VALUE
+gzreader_gets(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    struct gzfile *gz = get_gzfile(obj);
+    volatile VALUE rs;
+    VALUE dst;
+    char *rsptr, *p, *res;
+    long rslen, n;
+    int rspara;
+
+    if (argc == 0) {
+	rs = rb_rs;
+    }
+    else {
+	rb_scan_args(argc, argv, "1", &rs);
+	if (!NIL_P(rs)) {
+	    Check_Type(rs, T_STRING);
+	}
+    }
+
+    if (NIL_P(rs)) {
+	dst = gzfile_read_all(gz);
+	if (RSTRING(dst)->len != 0) gz->lineno++;
+	return dst;
+    }
+
+    if (RSTRING(rs)->len == 0) {
+	rsptr = "\n\n";
+	rslen = 2;
+	rspara = 1;
+    } else {
+	rsptr = RSTRING(rs)->ptr;
+	rslen = RSTRING(rs)->len;
+	rspara = 0;
+    }
+
+    if (rspara) {
+	gzreader_skip_linebreaks(gz);
+    }
+
+    while (gz->z.buf_filled < rslen) {
+	if (ZSTREAM_IS_FINISHED(&gz->z)) {
+	    if (gz->z.buf_filled > 0) gz->lineno++;
+	    return gzfile_read(gz, rslen);
+	}
+	gzfile_read_more(gz);
+    }
+
+    p = RSTRING(gz->z.buf)->ptr;
+    n = rslen;
+    for (;;) {
+	if (n > gz->z.buf_filled) {
+	    if (ZSTREAM_IS_FINISHED(&gz->z)) break;
+	    gzfile_read_more(gz);
+	    p = RSTRING(gz->z.buf)->ptr + n - rslen;
+	}
+	if (!rspara) rscheck(rsptr, rslen, rs);
+	res = memchr(p, rsptr[0], (gz->z.buf_filled - n + 1));
+	if (!res) {
+	    n = gz->z.buf_filled + 1;
+	} else {
+	    n += (long)(res - p);
+	    p = res;
+	    if (rslen == 1 || memcmp(p, rsptr, rslen) == 0) break;
+	    p++, n++;
+	}
+    }
+
+    gz->lineno++;
+    dst = gzfile_read(gz, n);
+    if (rspara) {
+	gzreader_skip_linebreaks(gz);
+    }
+
+    return dst;
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_gets(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE dst;
+    dst = gzreader_gets(argc, argv, obj);
+    if (!NIL_P(dst)) {
+	rb_lastline_set(dst);
+    }
+    return dst;
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_readline(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE dst;
+    dst = rb_gzreader_gets(argc, argv, obj);
+    if (NIL_P(dst)) {
+	rb_raise(rb_eEOFError, "end of file reached");
+    }
+    return dst;
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_each(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE str;
+    while (!NIL_P(str = gzreader_gets(argc, argv, obj))) {
+	rb_yield(str);
+    }
+    return obj;
+}
+
+/*
+ * See Zlib::GzipReader documentation for a description.
+ */
+static VALUE
+rb_gzreader_readlines(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE str, dst;
+    dst = rb_ary_new();
+    while (!NIL_P(str = gzreader_gets(argc, argv, obj))) {
+	rb_ary_push(dst, str);
+    }
+    return dst;
+}
+
+#endif /* GZIP_SUPPORT */
+
+
+
+/*
+ * The Zlib module contains several classes for compressing and decompressing
+ * streams, and for working with "gzip" files.
+ *
+ * == Classes
+ *
+ * Following are the classes that are most likely to be of interest to the
+ * user:
+ * Zlib::Inflate
+ * Zlib::Deflate
+ * Zlib::GzipReader
+ * Zlib::GzipWriter
+ *
+ * There are two important base classes for the classes above: Zlib::ZStream
+ * and Zlib::GzipFile.  Everything else is an error class.
+ *
+ * == Constants
+ *
+ * Here's a list.
+ *
+ *   Zlib::VERSION
+ *       The Ruby/zlib version string.
+ *
+ *   Zlib::ZLIB_VERSION
+ *       The string which represents the version of zlib.h.
+ *
+ *   Zlib::BINARY
+ *   Zlib::ASCII
+ *   Zlib::UNKNOWN
+ *       The integers representing data types which Zlib::ZStream#data_type
+ *       method returns.
+ *
+ *   Zlib::NO_COMPRESSION
+ *   Zlib::BEST_SPEED
+ *   Zlib::BEST_COMPRESSION
+ *   Zlib::DEFAULT_COMPRESSION
+ *       The integers representing compression levels which are an argument
+ *       for Zlib::Deflate.new, Zlib::Deflate#deflate, and so on.
+ *
+ *   Zlib::FILTERED
+ *   Zlib::HUFFMAN_ONLY
+ *   Zlib::DEFAULT_STRATEGY
+ *       The integers representing compression methods which are an argument
+ *       for Zlib::Deflate.new and Zlib::Deflate#params.
+ *
+ *   Zlib::DEF_MEM_LEVEL
+ *   Zlib::MAX_MEM_LEVEL
+ *       The integers representing memory levels which are an argument for
+ *       Zlib::Deflate.new, Zlib::Deflate#params, and so on.
+ *
+ *   Zlib::MAX_WBITS
+ *       The default value of windowBits which is an argument for
+ *       Zlib::Deflate.new and Zlib::Inflate.new.
+ *
+ *   Zlib::NO_FLUSH
+ *   Zlib::SYNC_FLUSH
+ *   Zlib::FULL_FLUSH
+ *   Zlib::FINISH
+ *       The integers to control the output of the deflate stream, which are
+ *       an argument for Zlib::Deflate#deflate and so on.
+ *
+ *   Zlib::OS_CODE
+ *   Zlib::OS_MSDOS
+ *   Zlib::OS_AMIGA
+ *   Zlib::OS_VMS
+ *   Zlib::OS_UNIX
+ *   Zlib::OS_VMCMS
+ *   Zlib::OS_ATARI
+ *   Zlib::OS_OS2
+ *   Zlib::OS_MACOS
+ *   Zlib::OS_ZSYSTEM
+ *   Zlib::OS_CPM
+ *   Zlib::OS_TOPS20
+ *   Zlib::OS_WIN32
+ *   Zlib::OS_QDOS
+ *   Zlib::OS_RISCOS
+ *   Zlib::OS_UNKNOWN
+ *       The return values of Zlib::GzipFile#os_code method.
+ */
+void Init_zlib()
+{
+    VALUE mZlib, cZStream, cDeflate, cInflate;
+#if GZIP_SUPPORT
+    VALUE cGzipFile, cGzipWriter, cGzipReader;
+#endif
+
+    mZlib = rb_define_module("Zlib");
+
+    cZError = rb_define_class_under(mZlib, "Error", rb_eStandardError);
+    cStreamEnd    = rb_define_class_under(mZlib, "StreamEnd", cZError);
+    cNeedDict     = rb_define_class_under(mZlib, "NeedDict", cZError);
+    cDataError    = rb_define_class_under(mZlib, "DataError", cZError);
+    cStreamError  = rb_define_class_under(mZlib, "StreamError", cZError);
+    cMemError     = rb_define_class_under(mZlib, "MemError", cZError);
+    cBufError     = rb_define_class_under(mZlib, "BufError", cZError);
+    cVersionError = rb_define_class_under(mZlib, "VersionError", cZError);
+
+    rb_define_module_function(mZlib, "zlib_version", rb_zlib_version, 0);
+    rb_define_module_function(mZlib, "adler32", rb_zlib_adler32, -1);
+    rb_define_module_function(mZlib, "crc32", rb_zlib_crc32, -1);
+    rb_define_module_function(mZlib, "crc_table", rb_zlib_crc_table, 0);
+
+    rb_define_const(mZlib, "VERSION", rb_str_new2(RUBY_ZLIB_VERSION));
+    rb_define_const(mZlib, "ZLIB_VERSION", rb_str_new2(ZLIB_VERSION));
+
+    cZStream = rb_define_class_under(mZlib, "ZStream", rb_cObject);
+    rb_undef_alloc_func(cZStream);
+    rb_define_method(cZStream, "avail_out", rb_zstream_avail_out, 0);
+    rb_define_method(cZStream, "avail_out=", rb_zstream_set_avail_out, 1);
+    rb_define_method(cZStream, "avail_in", rb_zstream_avail_in, 0);
+    rb_define_method(cZStream, "total_in", rb_zstream_total_in, 0);
+    rb_define_method(cZStream, "total_out", rb_zstream_total_out, 0);
+    rb_define_method(cZStream, "data_type", rb_zstream_data_type, 0);
+    rb_define_method(cZStream, "adler", rb_zstream_adler, 0);
+    rb_define_method(cZStream, "finished?", rb_zstream_finished_p, 0);
+    rb_define_method(cZStream, "stream_end?", rb_zstream_finished_p, 0);
+    rb_define_method(cZStream, "closed?", rb_zstream_closed_p, 0);
+    rb_define_method(cZStream, "ended?", rb_zstream_closed_p, 0);
+    rb_define_method(cZStream, "close", rb_zstream_end, 0);
+    rb_define_method(cZStream, "end", rb_zstream_end, 0);
+    rb_define_method(cZStream, "reset", rb_zstream_reset, 0);
+    rb_define_method(cZStream, "finish", rb_zstream_finish, 0);
+    rb_define_method(cZStream, "flush_next_in", rb_zstream_flush_next_in, 0);
+    rb_define_method(cZStream, "flush_next_out", rb_zstream_flush_next_out, 0);
+
+    rb_define_const(mZlib, "BINARY", INT2FIX(Z_BINARY));
+    rb_define_const(mZlib, "ASCII", INT2FIX(Z_ASCII));
+    rb_define_const(mZlib, "UNKNOWN", INT2FIX(Z_UNKNOWN));
+
+    cDeflate = rb_define_class_under(mZlib, "Deflate", cZStream);
+    rb_define_singleton_method(cDeflate, "deflate", rb_deflate_s_deflate, -1);
+    rb_define_alloc_func(cDeflate, rb_deflate_s_allocate);
+    rb_define_method(cDeflate, "initialize", rb_deflate_initialize, -1);
+    rb_define_method(cDeflate, "initialize_copy", rb_deflate_init_copy, 0);
+    rb_define_method(cDeflate, "deflate", rb_deflate_deflate, -1);
+    rb_define_method(cDeflate, "<<", rb_deflate_addstr, 1);
+    rb_define_method(cDeflate, "flush", rb_deflate_flush, -1);
+    rb_define_method(cDeflate, "params", rb_deflate_params, 2);
+    rb_define_method(cDeflate, "set_dictionary", rb_deflate_set_dictionary, 1);
+
+    cInflate = rb_define_class_under(mZlib, "Inflate", cZStream);
+    rb_define_singleton_method(cInflate, "inflate", rb_inflate_s_inflate, 1);
+    rb_define_alloc_func(cInflate, rb_inflate_s_allocate);
+    rb_define_method(cInflate, "initialize", rb_inflate_initialize, -1);
+    rb_define_method(cInflate, "inflate", rb_inflate_inflate, 1);
+    rb_define_method(cInflate, "<<", rb_inflate_addstr, 1);
+    rb_define_method(cInflate, "sync", rb_inflate_sync, 1);
+    rb_define_method(cInflate, "sync_point?", rb_inflate_sync_point_p, 0);
+    rb_define_method(cInflate, "set_dictionary", rb_inflate_set_dictionary, 1);
+
+    rb_define_const(mZlib, "NO_COMPRESSION", INT2FIX(Z_NO_COMPRESSION));
+    rb_define_const(mZlib, "BEST_SPEED", INT2FIX(Z_BEST_SPEED));
+    rb_define_const(mZlib, "BEST_COMPRESSION", INT2FIX(Z_BEST_COMPRESSION));
+    rb_define_const(mZlib, "DEFAULT_COMPRESSION",
+		    INT2FIX(Z_DEFAULT_COMPRESSION));
+
+    rb_define_const(mZlib, "FILTERED", INT2FIX(Z_FILTERED));
+    rb_define_const(mZlib, "HUFFMAN_ONLY", INT2FIX(Z_HUFFMAN_ONLY));
+    rb_define_const(mZlib, "DEFAULT_STRATEGY", INT2FIX(Z_DEFAULT_STRATEGY));
+
+    rb_define_const(mZlib, "MAX_WBITS", INT2FIX(MAX_WBITS));
+    rb_define_const(mZlib, "DEF_MEM_LEVEL", INT2FIX(DEF_MEM_LEVEL));
+    rb_define_const(mZlib, "MAX_MEM_LEVEL", INT2FIX(MAX_MEM_LEVEL));
+
+    rb_define_const(mZlib, "NO_FLUSH", INT2FIX(Z_NO_FLUSH));
+    rb_define_const(mZlib, "SYNC_FLUSH", INT2FIX(Z_SYNC_FLUSH));
+    rb_define_const(mZlib, "FULL_FLUSH", INT2FIX(Z_FULL_FLUSH));
+    rb_define_const(mZlib, "FINISH", INT2FIX(Z_FINISH));
+
+#if GZIP_SUPPORT
+    id_write = rb_intern("write");
+    id_read = rb_intern("read");
+    id_flush = rb_intern("flush");
+    id_seek = rb_intern("seek");
+    id_close = rb_intern("close");
+
+    cGzipFile = rb_define_class_under(mZlib, "GzipFile", rb_cObject);
+    cGzError = rb_define_class_under(cGzipFile, "Error", cZError);
+
+    cNoFooter = rb_define_class_under(cGzipFile, "NoFooter", cGzError);
+    cCRCError = rb_define_class_under(cGzipFile, "CRCError", cGzError);
+    cLengthError = rb_define_class_under(cGzipFile,"LengthError",cGzError);
+
+    cGzipWriter = rb_define_class_under(mZlib, "GzipWriter", cGzipFile);
+    cGzipReader = rb_define_class_under(mZlib, "GzipReader", cGzipFile);
+    rb_include_module(cGzipReader, rb_mEnumerable);
+
+    rb_define_singleton_method(cGzipFile, "wrap", rb_gzfile_s_wrap, -1);
+    rb_undef_alloc_func(cGzipFile);
+    rb_define_method(cGzipFile, "to_io", rb_gzfile_to_io, 0);
+    rb_define_method(cGzipFile, "crc", rb_gzfile_crc, 0);
+    rb_define_method(cGzipFile, "mtime", rb_gzfile_mtime, 0);
+    rb_define_method(cGzipFile, "level", rb_gzfile_level, 0);
+    rb_define_method(cGzipFile, "os_code", rb_gzfile_os_code, 0);
+    rb_define_method(cGzipFile, "orig_name", rb_gzfile_orig_name, 0);
+    rb_define_method(cGzipFile, "comment", rb_gzfile_comment, 0);
+    rb_define_method(cGzipReader, "lineno", rb_gzfile_lineno, 0);
+    rb_define_method(cGzipReader, "lineno=", rb_gzfile_set_lineno, 1);
+    rb_define_method(cGzipWriter, "mtime=", rb_gzfile_set_mtime, 1);
+    rb_define_method(cGzipWriter, "orig_name=", rb_gzfile_set_orig_name,1);
+    rb_define_method(cGzipWriter, "comment=", rb_gzfile_set_comment, 1);
+    rb_define_method(cGzipFile, "close", rb_gzfile_close, 0);
+    rb_define_method(cGzipFile, "finish", rb_gzfile_finish, 0);
+    rb_define_method(cGzipFile, "closed?", rb_gzfile_closed_p, 0);
+    rb_define_method(cGzipReader, "eof", rb_gzfile_eof_p, 0);
+    rb_define_method(cGzipReader, "eof?", rb_gzfile_eof_p, 0);
+    rb_define_method(cGzipFile, "sync", rb_gzfile_sync, 0);
+    rb_define_method(cGzipFile, "sync=", rb_gzfile_set_sync, 1);
+    rb_define_method(cGzipReader, "pos", rb_gzfile_total_out, 0);
+    rb_define_method(cGzipWriter, "pos", rb_gzfile_total_in, 0);
+    rb_define_method(cGzipReader, "tell", rb_gzfile_total_out, 0);
+    rb_define_method(cGzipWriter, "tell", rb_gzfile_total_in, 0);
+
+    rb_define_singleton_method(cGzipWriter, "open", rb_gzwriter_s_open,-1);
+    rb_define_alloc_func(cGzipWriter, rb_gzwriter_s_allocate);
+    rb_define_method(cGzipWriter, "initialize", rb_gzwriter_initialize,-1);
+    rb_define_method(cGzipWriter, "flush", rb_gzwriter_flush, -1);
+    rb_define_method(cGzipWriter, "write", rb_gzwriter_write, 1);
+    rb_define_method(cGzipWriter, "putc", rb_gzwriter_putc, 1);
+    rb_define_method(cGzipWriter, "<<", rb_gzwriter_addstr, 1);
+    rb_define_method(cGzipWriter, "printf", rb_gzwriter_printf, -1);
+    rb_define_method(cGzipWriter, "print", rb_gzwriter_print, -1);
+    rb_define_method(cGzipWriter, "puts", rb_gzwriter_puts, -1);
+
+    rb_define_singleton_method(cGzipReader, "open", rb_gzreader_s_open,-1);
+    rb_define_alloc_func(cGzipReader, rb_gzreader_s_allocate);
+    rb_define_method(cGzipReader, "initialize", rb_gzreader_initialize, 1);
+    rb_define_method(cGzipReader, "rewind", rb_gzreader_rewind, 0);
+    rb_define_method(cGzipReader, "unused", rb_gzreader_unused, 0);
+    rb_define_method(cGzipReader, "read", rb_gzreader_read, -1);
+    rb_define_method(cGzipReader, "getc", rb_gzreader_getc, 0);
+    rb_define_method(cGzipReader, "readchar", rb_gzreader_readchar, 0);
+    rb_define_method(cGzipReader, "each_byte", rb_gzreader_each_byte, 0);
+    rb_define_method(cGzipReader, "ungetc", rb_gzreader_ungetc, 1);
+    rb_define_method(cGzipReader, "gets", rb_gzreader_gets, -1);
+    rb_define_method(cGzipReader, "readline", rb_gzreader_readline, -1);
+    rb_define_method(cGzipReader, "each", rb_gzreader_each, -1);
+    rb_define_method(cGzipReader, "each_line", rb_gzreader_each, -1);
+    rb_define_method(cGzipReader, "readlines", rb_gzreader_readlines, -1);
+
+    rb_define_const(mZlib, "OS_CODE", INT2FIX(OS_CODE));
+    rb_define_const(mZlib, "OS_MSDOS", INT2FIX(OS_MSDOS));
+    rb_define_const(mZlib, "OS_AMIGA", INT2FIX(OS_AMIGA));
+    rb_define_const(mZlib, "OS_VMS", INT2FIX(OS_VMS));
+    rb_define_const(mZlib, "OS_UNIX", INT2FIX(OS_UNIX));
+    rb_define_const(mZlib, "OS_ATARI", INT2FIX(OS_ATARI));
+    rb_define_const(mZlib, "OS_OS2", INT2FIX(OS_OS2));
+    rb_define_const(mZlib, "OS_MACOS", INT2FIX(OS_MACOS));
+    rb_define_const(mZlib, "OS_TOPS20", INT2FIX(OS_TOPS20));
+    rb_define_const(mZlib, "OS_WIN32", INT2FIX(OS_WIN32));
+
+    rb_define_const(mZlib, "OS_VMCMS", INT2FIX(OS_VMCMS));
+    rb_define_const(mZlib, "OS_ZSYSTEM", INT2FIX(OS_ZSYSTEM));
+    rb_define_const(mZlib, "OS_CPM", INT2FIX(OS_CPM));
+    rb_define_const(mZlib, "OS_QDOS", INT2FIX(OS_QDOS));
+    rb_define_const(mZlib, "OS_RISCOS", INT2FIX(OS_RISCOS));
+    rb_define_const(mZlib, "OS_UNKNOWN", INT2FIX(OS_UNKNOWN));
+
+#endif /* GZIP_SUPPORT */
+}
+
+/* Document error classes. */
+
+/*
+ * Document-class: Zlib::Error
+ *
+ * The superclass for all exceptions raised by Ruby/zlib.
+ *
+ * The following exceptions are defined as subclasses of Zlib::Error. These
+ * exceptions are raised when zlib library functions return with an error
+ * status.
+ *
+ * - Zlib::StreamEnd
+ * - Zlib::NeedDict
+ * - Zlib::DataError
+ * - Zlib::StreamError
+ * - Zlib::MemError
+ * - Zlib::BufError
+ * - Zlib::VersionError
+ *
+ */
+
+/*
+ * Document-class: Zlib::GzipFile::Error
+ *
+ * Base class of errors that occur when processing GZIP files.
+ */
+
+/*
+ * Document-class: Zlib::GzipFile::NoFooter
+ *
+ * Raised when gzip file footer is not found. 
+ */
+
+/*
+ * Document-class: Zlib::GzipFile::CRCError
+ *
+ * Raised when the CRC checksum recorded in gzip file footer is not equivalent
+ * to the CRC checksum of the actual uncompressed data. 
+ */
+
+/*
+ * Document-class: Zlib::GzipFile::LengthError
+ *
+ * Raised when the data length recorded in the gzip file footer is not equivalent
+ * to the length of the actual uncompressed data. 
+ */
+
+
diff --git a/ruby_1_8_6/file.c b/ruby_1_8_6/file.c
new file mode 100644
index 0000000000..cff6b3226e
--- /dev/null
+++ b/ruby_1_8_6/file.c
@@ -0,0 +1,4556 @@
+/**********************************************************************
+
+  file.c -
+
+  $Author$
+  $Date$
+  created at: Mon Nov 15 12:24:34 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#ifdef _WIN32
+#include "missing/file.h"
+#endif
+
+#include "ruby.h"
+#include "rubyio.h"
+#include "rubysig.h"
+#include "util.h"
+#include "dln.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_FILE_H
+# include <sys/file.h>
+#else
+int flock _((int, int));
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 1024
+#endif
+
+#include <time.h>
+
+VALUE rb_time_new _((time_t, time_t));
+
+#ifdef HAVE_UTIME_H
+#include <utime.h>
+#elif defined HAVE_SYS_UTIME_H
+#include <sys/utime.h>
+#endif
+
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
+
+#ifndef HAVE_STRING_H
+char *strrchr _((const char*,const char));
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifdef HAVE_SYS_MKDEV_H
+#include <sys/mkdev.h>
+#endif
+
+#if !defined HAVE_LSTAT && !defined lstat
+#define lstat stat
+#endif
+#if !HAVE_FSEEKO && !defined(fseeko)
+# define fseeko  fseek
+#endif
+
+#ifdef __BEOS__ /* should not change ID if -1 */
+static int
+be_chown(const char *path, uid_t owner, gid_t group)
+{
+    if (owner == -1 || group == -1) {
+	struct stat st;
+	if (stat(path, &st) < 0) return -1;
+	if (owner == -1) owner = st.st_uid;
+	if (group == -1) group = st.st_gid;
+    }
+    return chown(path, owner, group);
+}
+#define chown be_chown
+static int
+be_fchown(int fd, uid_t owner, gid_t group)
+{
+    if (owner == -1 || group == -1) {
+	struct stat st;
+	if (fstat(fd, &st) < 0) return -1;
+	if (owner == -1) owner = st.st_uid;
+	if (group == -1) group = st.st_gid;
+    }
+    return fchown(fd, owner, group);
+}
+#define fchown be_fchown
+#endif /* __BEOS__ */
+
+VALUE rb_cFile;
+VALUE rb_mFileTest;
+VALUE rb_cStat;
+
+static long apply2files _((void (*)(const char *, void *), VALUE, void *));
+static long
+apply2files(func, vargs, arg)
+    void (*func)_((const char *, void *));
+    VALUE vargs;
+    void *arg;
+{
+    long i;
+    VALUE path;
+    struct RArray *args = RARRAY(vargs);
+
+    for (i=0; i<args->len; i++) {
+	path = args->ptr[i];
+	SafeStringValue(path);
+	(*func)(StringValueCStr(path), arg);
+    }
+
+    return args->len;
+}
+
+/*
+ *  call-seq:
+ *     file.path -> filename
+ *  
+ *  Returns the pathname used to create <i>file</i> as a string. Does
+ *  not normalize the name.
+ *     
+ *     File.new("testfile").path               #=> "testfile"
+ *     File.new("/tmp/../tmp/xxx", "w").path   #=> "/tmp/../tmp/xxx"
+ *     
+ */
+
+static VALUE
+rb_file_path(obj)
+    VALUE obj;
+{
+    OpenFile *fptr;
+
+    fptr = RFILE(rb_io_taint_check(obj))->fptr;
+    rb_io_check_initialized(fptr);
+    if (!fptr->path) return Qnil;
+    return rb_tainted_str_new2(fptr->path);
+}
+
+static VALUE
+stat_new_0(klass, st)
+    VALUE klass;
+    struct stat *st;
+{
+    struct stat *nst = 0;
+
+    if (st) {
+	nst = ALLOC(struct stat);
+	*nst = *st;
+    }
+    return Data_Wrap_Struct(klass, NULL, free, nst);
+}
+
+static VALUE
+stat_new(st)
+    struct stat *st;
+{
+    return stat_new_0(rb_cStat, st);
+}
+
+static struct stat*
+get_stat(self)
+    VALUE self;
+{
+    struct stat* st;
+    Data_Get_Struct(self, struct stat, st);
+    if (!st) rb_raise(rb_eTypeError, "uninitialized File::Stat");
+    return st;
+}
+
+/*
+ *  call-seq:
+ *     stat <=> other_stat    => -1, 0, 1
+ *  
+ *  Compares <code>File::Stat</code> objects by comparing their
+ *  respective modification times.
+ *     
+ *     f1 = File.new("f1", "w")
+ *     sleep 1
+ *     f2 = File.new("f2", "w")
+ *     f1.stat <=> f2.stat   #=> -1
+ */
+
+static VALUE
+rb_stat_cmp(self, other)
+    VALUE self, other;
+{
+    if (rb_obj_is_kind_of(other, rb_obj_class(self))) {
+	time_t t1 = get_stat(self)->st_mtime;
+	time_t t2 = get_stat(other)->st_mtime;
+	if (t1 == t2)
+	    return INT2FIX(0);
+	else if (t1 < t2)
+	    return INT2FIX(-1);
+	else
+	    return INT2FIX(1);
+    }
+    return Qnil;
+}
+
+static VALUE rb_stat_dev _((VALUE));
+static VALUE rb_stat_ino _((VALUE));
+static VALUE rb_stat_mode _((VALUE));
+static VALUE rb_stat_nlink _((VALUE));
+static VALUE rb_stat_uid _((VALUE));
+static VALUE rb_stat_gid _((VALUE));
+static VALUE rb_stat_rdev _((VALUE));
+static VALUE rb_stat_size _((VALUE));
+static VALUE rb_stat_blksize _((VALUE));
+static VALUE rb_stat_blocks _((VALUE));
+static VALUE rb_stat_atime _((VALUE));
+static VALUE rb_stat_mtime _((VALUE));
+static VALUE rb_stat_ctime _((VALUE));
+
+/*
+ *  call-seq:
+ *     stat.dev    => fixnum
+ *  
+ *  Returns an integer representing the device on which <i>stat</i>
+ *  resides.
+ *     
+ *     File.stat("testfile").dev   #=> 774
+ */
+
+static VALUE
+rb_stat_dev(self)
+    VALUE self;
+{
+    return INT2NUM(get_stat(self)->st_dev);
+}
+
+/*
+ *  call-seq:
+ *     stat.dev_major   => fixnum
+ *  
+ *  Returns the major part of <code>File_Stat#dev</code> or
+ *  <code>nil</code>.
+ *     
+ *     File.stat("/dev/fd1").dev_major   #=> 2
+ *     File.stat("/dev/tty").dev_major   #=> 5
+ */
+
+static VALUE
+rb_stat_dev_major(self)
+    VALUE self;
+{
+#if defined(major)
+    long dev = get_stat(self)->st_dev;
+    return ULONG2NUM(major(dev));
+#else
+    return Qnil;
+#endif
+}
+
+/*
+ *  call-seq:
+ *     stat.dev_minor   => fixnum
+ *  
+ *  Returns the minor part of <code>File_Stat#dev</code> or
+ *  <code>nil</code>.
+ *     
+ *     File.stat("/dev/fd1").dev_minor   #=> 1
+ *     File.stat("/dev/tty").dev_minor   #=> 0
+ */
+
+static VALUE
+rb_stat_dev_minor(self)
+    VALUE self;
+{
+#if defined(minor)
+    long dev = get_stat(self)->st_dev;
+    return ULONG2NUM(minor(dev));
+#else
+    return Qnil;
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     stat.ino   => fixnum
+ *  
+ *  Returns the inode number for <i>stat</i>.
+ *     
+ *     File.stat("testfile").ino   #=> 1083669
+ *     
+ */
+
+static VALUE
+rb_stat_ino(self)
+    VALUE self;
+{
+#ifdef HUGE_ST_INO
+    return ULL2NUM(get_stat(self)->st_ino);
+#else
+    return ULONG2NUM(get_stat(self)->st_ino);
+#endif
+}
+
+/*
+ *  call-seq:
+ *     stat.mode   => fixnum
+ *  
+ *  Returns an integer representing the permission bits of
+ *  <i>stat</i>. The meaning of the bits is platform dependent; on
+ *  Unix systems, see <code>stat(2)</code>.
+ *     
+ *     File.chmod(0644, "testfile")   #=> 1
+ *     s = File.stat("testfile")
+ *     sprintf("%o", s.mode)          #=> "100644"
+ */
+
+static VALUE
+rb_stat_mode(self)
+    VALUE self;
+{
+#ifdef __BORLANDC__
+    return UINT2NUM((unsigned short)(get_stat(self)->st_mode));
+#else
+    return UINT2NUM(get_stat(self)->st_mode);
+#endif
+}
+
+/*
+ *  call-seq:
+ *     stat.nlink   => fixnum
+ *  
+ *  Returns the number of hard links to <i>stat</i>.
+ *     
+ *     File.stat("testfile").nlink             #=> 1
+ *     File.link("testfile", "testfile.bak")   #=> 0
+ *     File.stat("testfile").nlink             #=> 2
+ *     
+ */
+
+static VALUE
+rb_stat_nlink(self)
+    VALUE self;
+{
+    return UINT2NUM(get_stat(self)->st_nlink);
+}
+
+
+/*
+ *  call-seq:
+ *     stat.uid    => fixnum
+ *  
+ *  Returns the numeric user id of the owner of <i>stat</i>.
+ *     
+ *     File.stat("testfile").uid   #=> 501
+ *     
+ */
+
+static VALUE
+rb_stat_uid(self)
+    VALUE self;
+{
+    return UINT2NUM(get_stat(self)->st_uid);
+}
+
+/*
+ *  call-seq:
+ *     stat.gid   => fixnum
+ *  
+ *  Returns the numeric group id of the owner of <i>stat</i>.
+ *     
+ *     File.stat("testfile").gid   #=> 500
+ *     
+ */
+
+static VALUE
+rb_stat_gid(self)
+    VALUE self;
+{
+    return UINT2NUM(get_stat(self)->st_gid);
+}
+
+
+/*
+ *  call-seq:
+ *     stat.rdev   =>  fixnum or nil
+ *  
+ *  Returns an integer representing the device type on which
+ *  <i>stat</i> resides. Returns <code>nil</code> if the operating
+ *  system doesn't support this feature.
+ *     
+ *     File.stat("/dev/fd1").rdev   #=> 513
+ *     File.stat("/dev/tty").rdev   #=> 1280
+ */
+
+static VALUE
+rb_stat_rdev(self)
+    VALUE self;
+{
+#ifdef HAVE_ST_RDEV
+    return ULONG2NUM(get_stat(self)->st_rdev);
+#else
+    return Qnil;
+#endif
+}
+
+/*
+ *  call-seq:
+ *     stat.rdev_major   => fixnum
+ *  
+ *  Returns the major part of <code>File_Stat#rdev</code> or
+ *  <code>nil</code>.
+ *     
+ *     File.stat("/dev/fd1").rdev_major   #=> 2
+ *     File.stat("/dev/tty").rdev_major   #=> 5
+ */
+
+static VALUE
+rb_stat_rdev_major(self)
+    VALUE self;
+{
+#if defined(HAVE_ST_RDEV) && defined(major)
+    long rdev = get_stat(self)->st_rdev;
+    return ULONG2NUM(major(rdev));
+#else
+    return Qnil;
+#endif
+}
+
+/*
+ *  call-seq:
+ *     stat.rdev_minor   => fixnum
+ *  
+ *  Returns the minor part of <code>File_Stat#rdev</code> or
+ *  <code>nil</code>.
+ *     
+ *     File.stat("/dev/fd1").rdev_minor   #=> 1
+ *     File.stat("/dev/tty").rdev_minor   #=> 0
+ */
+
+static VALUE
+rb_stat_rdev_minor(self)
+    VALUE self;
+{
+#if defined(HAVE_ST_RDEV) && defined(minor)
+    long rdev = get_stat(self)->st_rdev;
+    return ULONG2NUM(minor(rdev));
+#else
+    return Qnil;
+#endif
+}
+
+/*
+ *  call-seq:
+ *     stat.size    => fixnum
+ *  
+ *  Returns the size of <i>stat</i> in bytes.
+ *     
+ *     File.stat("testfile").size   #=> 66
+ */
+
+static VALUE
+rb_stat_size(self)
+    VALUE self;
+{
+    return OFFT2NUM(get_stat(self)->st_size);
+}
+
+/*
+ *  call-seq:
+ *     stat.blksize   => integer or nil
+ *  
+ *  Returns the native file system's block size. Will return <code>nil</code>
+ *  on platforms that don't support this information.
+ *     
+ *     File.stat("testfile").blksize   #=> 4096
+ *     
+ */
+
+static VALUE
+rb_stat_blksize(self)
+    VALUE self;
+{
+#ifdef HAVE_ST_BLKSIZE
+    return ULONG2NUM(get_stat(self)->st_blksize);
+#else
+    return Qnil;
+#endif
+}
+
+/*
+ *  call-seq:
+ *     stat.blocks    => integer or nil
+ *  
+ *  Returns the number of native file system blocks allocated for this
+ *  file, or <code>nil</code> if the operating system doesn't 
+ *  support this feature.
+ *     
+ *     File.stat("testfile").blocks   #=> 2
+ */
+
+static VALUE
+rb_stat_blocks(self)
+    VALUE self;
+{
+#ifdef HAVE_ST_BLOCKS
+    return ULONG2NUM(get_stat(self)->st_blocks);
+#else
+    return Qnil;
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     stat.atime   => time
+ *  
+ *  Returns the last access time for this file as an object of class
+ *  <code>Time</code>.
+ *     
+ *     File.stat("testfile").atime   #=> Wed Dec 31 18:00:00 CST 1969
+ *     
+ */
+
+static VALUE
+rb_stat_atime(self)
+    VALUE self;
+{
+    return rb_time_new(get_stat(self)->st_atime, 0);
+}
+
+/*
+ *  call-seq:
+ *     stat.mtime -> aTime
+ *  
+ *  Returns the modification time of <i>stat</i>.
+ *     
+ *     File.stat("testfile").mtime   #=> Wed Apr 09 08:53:14 CDT 2003
+ *     
+ */
+
+static VALUE
+rb_stat_mtime(self)
+    VALUE self;
+{
+    return rb_time_new(get_stat(self)->st_mtime, 0);
+}
+
+/*
+ *  call-seq:
+ *     stat.ctime -> aTime
+ *  
+ *  Returns the change time for <i>stat</i> (that is, the time
+ *  directory information about the file was changed, not the file
+ *  itself).
+ *     
+ *     File.stat("testfile").ctime   #=> Wed Apr 09 08:53:14 CDT 2003
+ *     
+ */
+
+static VALUE
+rb_stat_ctime(self)
+    VALUE self;
+{
+    return rb_time_new(get_stat(self)->st_ctime, 0);
+}
+
+/*
+ * call-seq:
+ *   stat.inspect  =>  string
+ *
+ * Produce a nicely formatted description of <i>stat</i>.
+ *
+ *   File.stat("/etc/passwd").inspect
+ *      #=> "#<File::Stat dev=0xe000005, ino=1078078, mode=0100644, 
+ *           nlink=1, uid=0, gid=0, rdev=0x0, size=1374, blksize=4096, 
+ *           blocks=8, atime=Wed Dec 10 10:16:12 CST 2003, 
+ *           mtime=Fri Sep 12 15:41:41 CDT 2003, 
+ *           ctime=Mon Oct 27 11:20:27 CST 2003>"
+ */
+
+static VALUE
+rb_stat_inspect(self)
+    VALUE self;
+{
+    VALUE str;
+    int i;
+    static const struct {
+	const char *name;
+	VALUE (*func)_((VALUE));
+    } member[] = {
+	{"dev",	    rb_stat_dev},
+	{"ino",	    rb_stat_ino},
+	{"mode",    rb_stat_mode},
+	{"nlink",   rb_stat_nlink},
+	{"uid",	    rb_stat_uid},
+	{"gid",	    rb_stat_gid},
+	{"rdev",    rb_stat_rdev},
+	{"size",    rb_stat_size},
+	{"blksize", rb_stat_blksize},
+	{"blocks",  rb_stat_blocks},
+	{"atime",   rb_stat_atime},
+	{"mtime",   rb_stat_mtime},
+	{"ctime",   rb_stat_ctime},
+    };
+
+    str = rb_str_buf_new2("#<");
+    rb_str_buf_cat2(str, rb_obj_classname(self));
+    rb_str_buf_cat2(str, " ");
+
+    for (i = 0; i < sizeof(member)/sizeof(member[0]); i++) {
+	VALUE v;
+
+	if (i > 0) {
+	    rb_str_buf_cat2(str, ", ");
+	}
+	rb_str_buf_cat2(str, member[i].name);
+	rb_str_buf_cat2(str, "=");
+	v = (*member[i].func)(self);
+	if (i == 2) {		/* mode */
+	    char buf[32];
+
+	    sprintf(buf, "0%lo", NUM2ULONG(v));
+	    rb_str_buf_cat2(str, buf);
+	}
+	else if (i == 0 || i == 6) { /* dev/rdev */
+	    char buf[32];
+
+	    sprintf(buf, "0x%lx", NUM2ULONG(v));
+	    rb_str_buf_cat2(str, buf);
+	}
+	else {
+	    rb_str_append(str, rb_inspect(v));
+	}
+    }
+    rb_str_buf_cat2(str, ">");
+    OBJ_INFECT(str, self);
+
+    return str;
+}
+
+static int
+rb_stat(file, st)
+    VALUE file;
+    struct stat *st;
+{
+    VALUE tmp;
+
+    tmp = rb_check_convert_type(file, T_FILE, "IO", "to_io");
+    if (!NIL_P(tmp)) {
+	OpenFile *fptr;
+
+	rb_secure(2);
+	GetOpenFile(tmp, fptr);
+	return fstat(fileno(fptr->f), st);
+    }
+    SafeStringValue(file);
+    return stat(StringValueCStr(file), st);
+}
+
+#ifdef _WIN32
+static HANDLE
+w32_io_info(file, st)
+    VALUE *file;
+    BY_HANDLE_FILE_INFORMATION *st;
+{
+    VALUE tmp;
+    HANDLE f, ret = 0;
+
+    tmp = rb_check_convert_type(*file, T_FILE, "IO", "to_io");
+    if (!NIL_P(tmp)) {
+	OpenFile *fptr;
+
+	GetOpenFile(tmp, fptr);
+	f = (HANDLE)rb_w32_get_osfhandle(fileno(fptr->f));
+	if (f == (HANDLE)-1) return INVALID_HANDLE_VALUE;
+    }
+    else {
+	SafeStringValue(*file);
+	f = CreateFile(StringValueCStr(*file), 0,
+	               FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
+	               rb_w32_iswin95() ? 0 : FILE_FLAG_BACKUP_SEMANTICS, NULL);
+	if (f == INVALID_HANDLE_VALUE) return f;
+	ret = f;
+    }
+    if (GetFileType(f) == FILE_TYPE_DISK) {
+	ZeroMemory(st, sizeof(*st));
+	if (GetFileInformationByHandle(f, st)) return ret;
+    }
+    if (ret) CloseHandle(ret);
+    return INVALID_HANDLE_VALUE;
+}
+#endif
+
+/*
+ *  call-seq:
+ *     File.stat(file_name)   =>  stat
+ *  
+ *  Returns a <code>File::Stat</code> object for the named file (see
+ *  <code>File::Stat</code>).
+ *     
+ *     File.stat("testfile").mtime   #=> Tue Apr 08 12:58:04 CDT 2003
+ *     
+ */
+
+static VALUE
+rb_file_s_stat(klass, fname)
+    VALUE klass, fname;
+{
+    struct stat st;
+
+    SafeStringValue(fname);
+    if (rb_stat(fname, &st) < 0) {
+	rb_sys_fail(StringValueCStr(fname));
+    }
+    return stat_new(&st);
+}
+
+/*
+ *  call-seq:
+ *     ios.stat    => stat
+ *  
+ *  Returns status information for <em>ios</em> as an object of type
+ *  <code>File::Stat</code>.
+ *     
+ *     f = File.new("testfile")
+ *     s = f.stat
+ *     "%o" % s.mode   #=> "100644"
+ *     s.blksize       #=> 4096
+ *     s.atime         #=> Wed Apr 09 08:53:54 CDT 2003
+ *     
+ */
+
+static VALUE
+rb_io_stat(obj)
+    VALUE obj;
+{
+    OpenFile *fptr;
+    struct stat st;
+
+    GetOpenFile(obj, fptr);
+    if (fstat(fileno(fptr->f), &st) == -1) {
+	rb_sys_fail(fptr->path);
+    }
+    return stat_new(&st);
+}
+
+/*
+ *  call-seq:
+ *     File.lstat(file_name)   => stat
+ *  
+ *  Same as <code>File::stat</code>, but does not follow the last symbolic
+ *  link. Instead, reports on the link itself.
+ *     
+ *     File.symlink("testfile", "link2test")   #=> 0
+ *     File.stat("testfile").size              #=> 66
+ *     File.lstat("link2test").size            #=> 8
+ *     File.stat("link2test").size             #=> 66
+ *     
+ */
+
+static VALUE
+rb_file_s_lstat(klass, fname)
+    VALUE klass, fname;
+{
+#ifdef HAVE_LSTAT
+    struct stat st;
+
+    SafeStringValue(fname);
+    if (lstat(StringValueCStr(fname), &st) == -1) {
+	rb_sys_fail(RSTRING(fname)->ptr);
+    }
+    return stat_new(&st);
+#else
+    return rb_file_s_stat(klass, fname);
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     file.lstat   =>  stat
+ *  
+ *  Same as <code>IO#stat</code>, but does not follow the last symbolic
+ *  link. Instead, reports on the link itself.
+ *     
+ *     File.symlink("testfile", "link2test")   #=> 0
+ *     File.stat("testfile").size              #=> 66
+ *     f = File.new("link2test")
+ *     f.lstat.size                            #=> 8
+ *     f.stat.size                             #=> 66
+ */
+
+static VALUE
+rb_file_lstat(obj)
+    VALUE obj;
+{
+#ifdef HAVE_LSTAT
+    OpenFile *fptr;
+    struct stat st;
+
+    rb_secure(2);
+    GetOpenFile(obj, fptr);
+    if (!fptr->path) return Qnil;
+    if (lstat(fptr->path, &st) == -1) {
+	rb_sys_fail(fptr->path);
+    }
+    return stat_new(&st);
+#else
+    return rb_io_stat(obj);
+#endif
+}
+
+static int
+group_member(gid)
+    GETGROUPS_T gid;
+{
+#ifndef _WIN32
+    if (getgid() == gid || getegid() == gid)
+	return Qtrue;
+
+# ifdef HAVE_GETGROUPS
+#  ifndef NGROUPS
+#   ifdef NGROUPS_MAX
+#    define NGROUPS NGROUPS_MAX
+#   else
+#    define NGROUPS 32
+#   endif
+#  endif
+    {
+	GETGROUPS_T gary[NGROUPS];
+	int anum;
+
+	anum = getgroups(NGROUPS, gary);
+	while (--anum >= 0)
+	    if (gary[anum] == gid)
+		return Qtrue;
+    }
+# endif
+#endif
+    return Qfalse;
+}
+
+#ifndef S_IXUGO
+#  define S_IXUGO		(S_IXUSR | S_IXGRP | S_IXOTH)
+#endif
+
+#if defined(S_IXGRP) && !defined(_WIN32) && !defined(__CYGWIN__)
+#define USE_GETEUID 1
+#endif
+
+#ifndef HAVE_EACCESS
+int
+eaccess(path, mode)
+     const char *path;
+     int mode;
+{
+#ifdef USE_GETEUID
+    struct stat st;
+    int euid;
+
+    if (stat(path, &st) < 0) return -1;
+
+    euid = geteuid();
+
+    if (euid == 0) {
+	/* Root can read or write any file. */
+	if (!(mode & X_OK))
+	    return 0;
+
+	/* Root can execute any file that has any one of the execute
+	   bits set. */
+	if (st.st_mode & S_IXUGO)
+	    return 0;
+
+	return -1;
+    }
+
+    if (st.st_uid == euid)        /* owner */
+	mode <<= 6;
+    else if (group_member(st.st_gid))
+	mode <<= 3;
+
+    if ((st.st_mode & mode) == mode) return 0;
+
+    return -1;
+#else
+# if _MSC_VER >= 1400
+    mode &= 6;
+# endif
+    return access(path, mode);
+#endif
+}
+#endif
+
+
+/*
+ * Document-class: FileTest
+ *
+ *  <code>FileTest</code> implements file test operations similar to
+ *  those used in <code>File::Stat</code>. It exists as a standalone
+ *  module, and its methods are also insinuated into the <code>File</code>
+ *  class. (Note that this is not done by inclusion: the interpreter cheats).
+ *     
+ */
+
+
+/*
+ * call-seq:
+ *   File.directory?(file_name)   =>  true or false
+ *
+ * Returns <code>true</code> if the named file is a directory,
+ * <code>false</code> otherwise.
+ *
+ *    File.directory?(".")
+ */
+
+static VALUE
+test_d(obj, fname)
+    VALUE obj, fname;
+{
+#ifndef S_ISDIR
+#   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
+#endif
+
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qfalse;
+    if (S_ISDIR(st.st_mode)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *   File.pipe?(file_name)   =>  true or false
+ *
+ * Returns <code>true</code> if the named file is a pipe.
+ */
+
+static VALUE
+test_p(obj, fname)
+    VALUE obj, fname;
+{
+#ifdef S_IFIFO
+#  ifndef S_ISFIFO
+#    define S_ISFIFO(m) ((m & S_IFMT) == S_IFIFO)
+#  endif
+
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qfalse;
+    if (S_ISFIFO(st.st_mode)) return Qtrue;
+
+#endif
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *   File.symlink?(file_name)   =>  true or false
+ *
+ * Returns <code>true</code> if the named file is a symbolic link.
+ */
+
+static VALUE
+test_l(obj, fname)
+    VALUE obj, fname;
+{
+#ifndef S_ISLNK
+#  ifdef _S_ISLNK
+#    define S_ISLNK(m) _S_ISLNK(m)
+#  elif defined __BORLANDC__
+#    ifdef _S_IFLNK
+#      define S_ISLNK(m) (((unsigned short)(m) & S_IFMT) == _S_IFLNK)
+#    else
+#      ifdef S_IFLNK
+#        define S_ISLNK(m) (((unsigned short)(m) & S_IFMT) == S_IFLNK)
+#      endif
+#    endif
+#  else
+#    ifdef _S_IFLNK
+#      define S_ISLNK(m) ((m & S_IFMT) == _S_IFLNK)
+#    else
+#      ifdef S_IFLNK
+#	 define S_ISLNK(m) ((m & S_IFMT) == S_IFLNK)
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef S_ISLNK
+    struct stat st;
+
+    SafeStringValue(fname);
+    if (lstat(StringValueCStr(fname), &st) < 0) return Qfalse;
+    if (S_ISLNK(st.st_mode)) return Qtrue;
+#endif
+
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *   File.socket?(file_name)   =>  true or false
+ *
+ * Returns <code>true</code> if the named file is a socket.
+ */
+
+static VALUE
+test_S(obj, fname)
+    VALUE obj, fname;
+{
+#ifndef S_ISSOCK
+#  ifdef _S_ISSOCK
+#    define S_ISSOCK(m) _S_ISSOCK(m)
+#  elif defined __BORLANDC__
+#    ifdef _S_IFSOCK
+#      define S_ISSOCK(m) (((unsigned short)(m) & S_IFMT) == _S_IFSOCK)
+#    else
+#      ifdef S_IFSOCK
+#        define S_ISSOCK(m) (((unsigned short)(m) & S_IFMT) == S_IFSOCK)
+#      endif
+#    endif
+#  else
+#    ifdef _S_IFSOCK
+#      define S_ISSOCK(m) ((m & S_IFMT) == _S_IFSOCK)
+#    else
+#      ifdef S_IFSOCK
+#	 define S_ISSOCK(m) ((m & S_IFMT) == S_IFSOCK)
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef S_ISSOCK
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qfalse;
+    if (S_ISSOCK(st.st_mode)) return Qtrue;
+
+#endif
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *   File.blockdev?(file_name)   =>  true or false
+ *
+ * Returns <code>true</code> if the named file is a block device.
+ */
+
+static VALUE
+test_b(obj, fname)
+    VALUE obj, fname;
+{
+#ifndef S_ISBLK
+#   ifdef S_IFBLK
+#	define S_ISBLK(m) ((m & S_IFMT) == S_IFBLK)
+#   else
+#	define S_ISBLK(m) (0)  /* anytime false */
+#   endif
+#endif
+
+#ifdef S_ISBLK
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qfalse;
+    if (S_ISBLK(st.st_mode)) return Qtrue;
+
+#endif
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *   File.chardev?(file_name)   =>  true or false
+ *
+ * Returns <code>true</code> if the named file is a character device.
+ */
+static VALUE
+test_c(obj, fname)
+    VALUE obj, fname;
+{
+#ifndef S_ISCHR
+#   define S_ISCHR(m) ((m & S_IFMT) == S_IFCHR)
+#endif
+
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qfalse;
+    if (S_ISCHR(st.st_mode)) return Qtrue;
+
+    return Qfalse;
+}
+
+
+/*
+ * call-seq:
+ *    File.exist?(file_name)    =>  true or false
+ *    File.exists?(file_name)   =>  true or false    (obsolete)
+ *
+ * Return <code>true</code> if the named file exists.
+ */
+
+static VALUE
+test_e(obj, fname)
+    VALUE obj, fname;
+{
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qfalse;
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *    File.readable?(file_name)   => true or false
+ *
+ * Returns <code>true</code> if the named file is readable by the effective
+ * user id of this process.
+ */
+
+static VALUE
+test_r(obj, fname)
+    VALUE obj, fname;
+{
+    SafeStringValue(fname);
+    if (eaccess(StringValueCStr(fname), R_OK) < 0) return Qfalse;
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *    File.readable_real?(file_name)   => true or false
+ *
+ * Returns <code>true</code> if the named file is readable by the real
+ * user id of this process.
+ */
+
+static VALUE
+test_R(obj, fname)
+    VALUE obj, fname;
+{
+    SafeStringValue(fname);
+    if (access(StringValueCStr(fname), R_OK) < 0) return Qfalse;
+    return Qtrue;
+}
+
+
+/*
+ * call-seq:
+ *    File.writable?(file_name)   => true or false
+ *
+ * Returns <code>true</code> if the named file is writable by the effective
+ * user id of this process.
+ */
+
+static VALUE
+test_w(obj, fname)
+    VALUE obj, fname;
+{
+    SafeStringValue(fname);
+    if (eaccess(StringValueCStr(fname), W_OK) < 0) return Qfalse;
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *    File.writable_real?(file_name)   => true or false
+ *
+ * Returns <code>true</code> if the named file is writable by the real
+ * user id of this process.
+ */
+
+static VALUE
+test_W(obj, fname)
+    VALUE obj, fname;
+{
+    SafeStringValue(fname);
+    if (access(StringValueCStr(fname), W_OK) < 0) return Qfalse;
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *    File.executable?(file_name)   => true or false
+ *
+ * Returns <code>true</code> if the named file is executable by the effective
+ * user id of this process.
+ */
+
+static VALUE
+test_x(obj, fname)
+    VALUE obj, fname;
+{
+    SafeStringValue(fname);
+    if (eaccess(StringValueCStr(fname), X_OK) < 0) return Qfalse;
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *    File.executable_real?(file_name)   => true or false
+ *
+ * Returns <code>true</code> if the named file is executable by the real
+ * user id of this process.
+ */
+
+static VALUE
+test_X(obj, fname)
+    VALUE obj, fname;
+{
+    SafeStringValue(fname);
+    if (access(StringValueCStr(fname), X_OK) < 0) return Qfalse;
+    return Qtrue;
+}
+
+#ifndef S_ISREG
+#   define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
+#endif
+
+/*
+ * call-seq:
+ *    File.file?(file_name)   => true or false
+ *
+ * Returns <code>true</code> if the named file exists and is a
+ * regular file.
+ */
+
+static VALUE
+test_f(obj, fname)
+    VALUE obj, fname;
+{
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qfalse;
+    if (S_ISREG(st.st_mode)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *    File.zero?(file_name)   => true or false
+ *
+ * Returns <code>true</code> if the named file exists and has
+ * a zero size.
+ */
+
+static VALUE
+test_z(obj, fname)
+    VALUE obj, fname;
+{
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qfalse;
+    if (st.st_size == 0) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *    File.size?(file_name)   => Integer or nil
+ *
+ * Returns +nil+ if +file_name+ doesn't exist or has zero size, the size of the
+ * file otherwise.
+ */
+
+static VALUE
+test_s(obj, fname)
+    VALUE obj, fname;
+{
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qnil;
+    if (st.st_size == 0) return Qnil;
+    return OFFT2NUM(st.st_size);
+}
+
+/*
+ * call-seq:
+ *    File.owned?(file_name)   => true or false
+ *
+ * Returns <code>true</code> if the named file exists and the
+ * effective used id of the calling process is the owner of
+ * the file.
+ */
+
+static VALUE
+test_owned(obj, fname)
+    VALUE obj, fname;
+{
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qfalse;
+    if (st.st_uid == geteuid()) return Qtrue;
+    return Qfalse;
+}
+
+static VALUE
+test_rowned(obj, fname)
+    VALUE obj, fname;
+{
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qfalse;
+    if (st.st_uid == getuid()) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *    File.grpowned?(file_name)   => true or false
+ *
+ * Returns <code>true</code> if the named file exists and the
+ * effective group id of the calling process is the owner of
+ * the file. Returns <code>false</code> on Windows.
+ */
+
+static VALUE
+test_grpowned(obj, fname)
+    VALUE obj, fname;
+{
+#ifndef _WIN32
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0) return Qfalse;
+    if (group_member(st.st_gid)) return Qtrue;
+#endif
+    return Qfalse;
+}
+
+#if defined(S_ISUID) || defined(S_ISGID) || defined(S_ISVTX)
+static VALUE
+check3rdbyte(fname, mode)
+    VALUE fname;
+    int mode;
+{
+    struct stat st;
+
+    SafeStringValue(fname);
+    if (stat(StringValueCStr(fname), &st) < 0) return Qfalse;
+    if (st.st_mode & mode) return Qtrue;
+    return Qfalse;
+}
+#endif
+
+/*
+ * call-seq:
+ *   File.setuid?(file_name)   =>  true or false
+ *
+ * Returns <code>true</code> if the named file has the setuid bit set.
+ */
+
+static VALUE
+test_suid(obj, fname)
+    VALUE obj, fname;
+{
+#ifdef S_ISUID
+    return check3rdbyte(fname, S_ISUID);
+#else
+    return Qfalse;
+#endif
+}
+
+/*
+ * call-seq:
+ *   File.setgid?(file_name)   =>  true or false
+ *
+ * Returns <code>true</code> if the named file has the setgid bit set.
+ */
+
+static VALUE
+test_sgid(obj, fname)
+    VALUE obj, fname;
+{
+#ifdef S_ISGID
+    return check3rdbyte(fname, S_ISGID);
+#else
+    return Qfalse;
+#endif
+}
+
+/*
+ * call-seq:
+ *   File.sticky?(file_name)   =>  true or false
+ *
+ * Returns <code>true</code> if the named file has the sticky bit set.
+ */
+
+static VALUE
+test_sticky(obj, fname)
+    VALUE obj, fname;
+{
+#ifdef S_ISVTX
+    return check3rdbyte(fname, S_ISVTX);
+#else
+    return Qnil;
+#endif
+}
+
+/*
+ * call-seq:
+ *   File.identical?(file_1, file_2)   =>  true or false
+ *
+ * Returns <code>true</code> if the named files are identical.
+ *
+ *     open("a", "w") {}
+ *     p File.identical?("a", "a")      #=> true
+ *     p File.identical?("a", "./a")    #=> true
+ *     File.link("a", "b")
+ *     p File.identical?("a", "b")      #=> true
+ *     File.symlink("a", "c")
+ *     p File.identical?("a", "c")      #=> true
+ *     open("d", "w") {}
+ *     p File.identical?("a", "d")      #=> false
+ */
+
+static VALUE
+test_identical(obj, fname1, fname2)
+    VALUE obj, fname1, fname2;
+{
+#ifndef DOSISH
+    struct stat st1, st2;
+
+    if (rb_stat(fname1, &st1) < 0) return Qfalse;
+    if (rb_stat(fname2, &st2) < 0) return Qfalse;
+    if (st1.st_dev != st2.st_dev) return Qfalse;
+    if (st1.st_ino != st2.st_ino) return Qfalse;
+#else
+#ifdef _WIN32
+    BY_HANDLE_FILE_INFORMATION st1, st2;
+    HANDLE f1 = 0, f2 = 0;
+#endif
+
+    rb_secure(2);
+#ifdef _WIN32
+    f1 = w32_io_info(&fname1, &st1);
+    if (f1 == INVALID_HANDLE_VALUE) return Qfalse;
+    f2 = w32_io_info(&fname2, &st2);
+    if (f1) CloseHandle(f1);
+    if (f2 == INVALID_HANDLE_VALUE) return Qfalse;
+    if (f2) CloseHandle(f2);
+
+    if (st1.dwVolumeSerialNumber == st2.dwVolumeSerialNumber &&
+	st1.nFileIndexHigh == st2.nFileIndexHigh &&
+	st1.nFileIndexLow == st2.nFileIndexLow)
+	return Qtrue;
+    if (!f1 || !f2) return Qfalse;
+    if (rb_w32_iswin95()) return Qfalse;
+#else
+    SafeStringValue(fname1);
+    fname1 = rb_str_new4(fname1);
+    SafeStringValue(fname2);
+    if (access(RSTRING(fname1)->ptr, 0)) return Qfalse;
+    if (access(RSTRING(fname2)->ptr, 0)) return Qfalse;
+#endif
+    fname1 = rb_file_expand_path(fname1, Qnil);
+    fname2 = rb_file_expand_path(fname2, Qnil);
+    if (RSTRING(fname1)->len != RSTRING(fname2)->len) return Qfalse;
+    if (rb_memcicmp(RSTRING(fname1)->ptr, RSTRING(fname2)->ptr, RSTRING(fname1)->len))
+	return Qfalse;
+#endif
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *    File.size(file_name)   => integer
+ *
+ * Returns the size of <code>file_name</code>.
+ */
+
+static VALUE
+rb_file_s_size(klass, fname)
+    VALUE klass, fname;
+{
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0)
+	rb_sys_fail(StringValueCStr(fname));
+    return OFFT2NUM(st.st_size);
+}
+
+static VALUE
+rb_file_ftype(st)
+    struct stat *st;
+{
+    char *t;
+
+    if (S_ISREG(st->st_mode)) {
+	t = "file";
+    }
+    else if (S_ISDIR(st->st_mode)) {
+	t = "directory";
+    }
+    else if (S_ISCHR(st->st_mode)) {
+	t = "characterSpecial";
+    }
+#ifdef S_ISBLK
+    else if (S_ISBLK(st->st_mode)) {
+	t = "blockSpecial";
+    }
+#endif
+#ifdef S_ISFIFO
+    else if (S_ISFIFO(st->st_mode)) {
+	t = "fifo";
+    }
+#endif
+#ifdef S_ISLNK
+    else if (S_ISLNK(st->st_mode)) {
+	t = "link";
+    }
+#endif
+#ifdef S_ISSOCK
+    else if (S_ISSOCK(st->st_mode)) {
+	t = "socket";
+    }
+#endif
+    else {
+	t = "unknown";
+    }
+
+    return rb_str_new2(t);
+}
+
+/*
+ *  call-seq:
+ *     File.ftype(file_name)   => string
+ *  
+ *  Identifies the type of the named file; the return string is one of
+ *  ``<code>file</code>'', ``<code>directory</code>'',
+ *  ``<code>characterSpecial</code>'', ``<code>blockSpecial</code>'',
+ *  ``<code>fifo</code>'', ``<code>link</code>'',
+ *  ``<code>socket</code>'', or ``<code>unknown</code>''.
+ *     
+ *     File.ftype("testfile")            #=> "file"
+ *     File.ftype("/dev/tty")            #=> "characterSpecial"
+ *     File.ftype("/tmp/.X11-unix/X0")   #=> "socket"
+ */
+
+static VALUE
+rb_file_s_ftype(klass, fname)
+    VALUE klass, fname;
+{
+    struct stat st;
+
+    SafeStringValue(fname);
+    if (lstat(StringValueCStr(fname), &st) == -1) {
+	rb_sys_fail(RSTRING(fname)->ptr);
+    }
+
+    return rb_file_ftype(&st);
+}
+
+/*
+ *  call-seq:
+ *     File.atime(file_name)  =>  time
+ *  
+ *  Returns the last access time for the named file as a Time object).
+ *     
+ *     File.atime("testfile")   #=> Wed Apr 09 08:51:48 CDT 2003
+ *     
+ */
+
+static VALUE
+rb_file_s_atime(klass, fname)
+    VALUE klass, fname;
+{
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0)
+	rb_sys_fail(StringValueCStr(fname));
+    return rb_time_new(st.st_atime, 0);
+}
+
+/*
+ *  call-seq:
+ *     file.atime    => time
+ *  
+ *  Returns the last access time (a <code>Time</code> object)
+ *   for <i>file</i>, or epoch if <i>file</i> has not been accessed.
+ *     
+ *     File.new("testfile").atime   #=> Wed Dec 31 18:00:00 CST 1969
+ *     
+ */
+
+static VALUE
+rb_file_atime(obj)
+    VALUE obj;
+{
+    OpenFile *fptr;
+    struct stat st;
+
+    GetOpenFile(obj, fptr);
+    if (fstat(fileno(fptr->f), &st) == -1) {
+	rb_sys_fail(fptr->path);
+    }
+    return rb_time_new(st.st_atime, 0);
+}
+
+/*
+ *  call-seq:
+ *     File.mtime(file_name)  =>  time
+ *  
+ *  Returns the modification time for the named file as a Time object.
+ *     
+ *     File.mtime("testfile")   #=> Tue Apr 08 12:58:04 CDT 2003
+ *     
+ */
+
+static VALUE
+rb_file_s_mtime(klass, fname)
+    VALUE klass, fname;
+{
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0)
+	rb_sys_fail(RSTRING(fname)->ptr);
+    return rb_time_new(st.st_mtime, 0);
+}
+
+/*
+ *  call-seq:
+ *     file.mtime -> time
+ *  
+ *  Returns the modification time for <i>file</i>.
+ *     
+ *     File.new("testfile").mtime   #=> Wed Apr 09 08:53:14 CDT 2003
+ *     
+ */
+
+static VALUE
+rb_file_mtime(obj)
+    VALUE obj;
+{
+    OpenFile *fptr;
+    struct stat st;
+
+    GetOpenFile(obj, fptr);
+    if (fstat(fileno(fptr->f), &st) == -1) {
+	rb_sys_fail(fptr->path);
+    }
+    return rb_time_new(st.st_mtime, 0);
+}
+
+/*
+ *  call-seq:
+ *     File.ctime(file_name)  => time
+ *  
+ *  Returns the change time for the named file (the time at which
+ *  directory information about the file was changed, not the file
+ *  itself).
+ *     
+ *     File.ctime("testfile")   #=> Wed Apr 09 08:53:13 CDT 2003
+ *     
+ */
+
+static VALUE
+rb_file_s_ctime(klass, fname)
+    VALUE klass, fname;
+{
+    struct stat st;
+
+    if (rb_stat(fname, &st) < 0)
+	rb_sys_fail(RSTRING(fname)->ptr);
+    return rb_time_new(st.st_ctime, 0);
+}
+
+/*
+ *  call-seq:
+ *     file.ctime -> time
+ *  
+ *  Returns the change time for <i>file</i> (that is, the time directory
+ *  information about the file was changed, not the file itself).
+ *     
+ *     File.new("testfile").ctime   #=> Wed Apr 09 08:53:14 CDT 2003
+ *     
+ */
+
+static VALUE
+rb_file_ctime(obj)
+    VALUE obj;
+{
+    OpenFile *fptr;
+    struct stat st;
+
+    GetOpenFile(obj, fptr);
+    if (fstat(fileno(fptr->f), &st) == -1) {
+	rb_sys_fail(fptr->path);
+    }
+    return rb_time_new(st.st_ctime, 0);
+}
+
+static void chmod_internal _((const char *, void *));
+static void
+chmod_internal(path, mode)
+    const char *path;
+    void *mode;
+{
+    if (chmod(path, *(int *)mode) < 0)
+	rb_sys_fail(path);
+}
+
+/*
+ *  call-seq:
+ *     File.chmod(mode_int, file_name, ... ) -> integer
+ *  
+ *  Changes permission bits on the named file(s) to the bit pattern
+ *  represented by <i>mode_int</i>. Actual effects are operating system
+ *  dependent (see the beginning of this section). On Unix systems, see
+ *  <code>chmod(2)</code> for details. Returns the number of files
+ *  processed.
+ *     
+ *     File.chmod(0644, "testfile", "out")   #=> 2
+ */
+
+static VALUE
+rb_file_s_chmod(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE vmode;
+    VALUE rest;
+    int mode;
+    long n;
+
+    rb_secure(2);
+    rb_scan_args(argc, argv, "1*", &vmode, &rest);
+    mode = NUM2INT(vmode);
+
+    n = apply2files(chmod_internal, rest, &mode);
+    return LONG2FIX(n);
+}
+
+/*
+ *  call-seq:
+ *     file.chmod(mode_int)   => 0
+ *  
+ *  Changes permission bits on <i>file</i> to the bit pattern
+ *  represented by <i>mode_int</i>. Actual effects are platform
+ *  dependent; on Unix systems, see <code>chmod(2)</code> for details.
+ *  Follows symbolic links. Also see <code>File#lchmod</code>.
+ *     
+ *     f = File.new("out", "w");
+ *     f.chmod(0644)   #=> 0
+ */
+
+static VALUE
+rb_file_chmod(obj, vmode)
+    VALUE obj, vmode;
+{
+    OpenFile *fptr;
+    int mode;
+
+    rb_secure(2);
+    mode = NUM2INT(vmode);
+
+    GetOpenFile(obj, fptr);
+#ifdef HAVE_FCHMOD
+    if (fchmod(fileno(fptr->f), mode) == -1)
+	rb_sys_fail(fptr->path);
+#else
+    if (!fptr->path) return Qnil;
+    if (chmod(fptr->path, mode) == -1)
+	rb_sys_fail(fptr->path);
+#endif
+
+    return INT2FIX(0);
+}
+
+#if defined(HAVE_LCHMOD)
+static void lchmod_internal _((const char *, void *));
+static void
+lchmod_internal(path, mode)
+    const char *path;
+    void *mode;
+{
+    if (lchmod(path, (int)mode) < 0)
+	rb_sys_fail(path);
+}
+
+/*
+ *  call-seq:
+ *     File.lchmod(mode_int, file_name, ...)  => integer
+ *  
+ *  Equivalent to <code>File::chmod</code>, but does not follow symbolic
+ *  links (so it will change the permissions associated with the link,
+ *  not the file referenced by the link). Often not available.
+ *     
+ */
+
+static VALUE
+rb_file_s_lchmod(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE vmode;
+    VALUE rest;
+    long mode, n;
+
+    rb_secure(2);
+    rb_scan_args(argc, argv, "1*", &vmode, &rest);
+    mode = NUM2INT(vmode);
+
+    n = apply2files(lchmod_internal, rest, (void *)(long)mode);
+    return LONG2FIX(n);
+}
+#else
+static VALUE
+rb_file_s_lchmod(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    rb_notimplement();
+    return Qnil;		/* not reached */
+}
+#endif
+
+struct chown_args {
+    int owner, group;
+};
+
+static void chown_internal _((const char *, void *));
+static void
+chown_internal(path, argp)
+    const char *path;
+    void *argp;
+{
+    struct chown_args *args = (struct chown_args *)argp;
+    if (chown(path, args->owner, args->group) < 0)
+	rb_sys_fail(path);
+}
+
+/*
+ *  call-seq:
+ *     File.chown(owner_int, group_int, file_name,... ) -> integer
+ *  
+ *  Changes the owner and group of the named file(s) to the given
+ *  numeric owner and group id's. Only a process with superuser
+ *  privileges may change the owner of a file. The current owner of a
+ *  file may change the file's group to any group to which the owner
+ *  belongs. A <code>nil</code> or -1 owner or group id is ignored.
+ *  Returns the number of files processed.
+ *     
+ *     File.chown(nil, 100, "testfile")
+ *     
+ */
+
+static VALUE
+rb_file_s_chown(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE o, g, rest;
+    struct chown_args arg;
+    long n;
+
+    rb_secure(2);
+    rb_scan_args(argc, argv, "2*", &o, &g, &rest);
+    if (NIL_P(o)) {
+	arg.owner = -1;
+    }
+    else {
+	arg.owner = NUM2INT(o);
+    }
+    if (NIL_P(g)) {
+	arg.group = -1;
+    }
+    else {
+	arg.group = NUM2INT(g);
+    }
+
+    n = apply2files(chown_internal, rest, &arg);
+    return LONG2FIX(n);
+}
+
+/*
+ *  call-seq:
+ *     file.chown(owner_int, group_int )   => 0
+ *  
+ *  Changes the owner and group of <i>file</i> to the given numeric
+ *  owner and group id's. Only a process with superuser privileges may
+ *  change the owner of a file. The current owner of a file may change
+ *  the file's group to any group to which the owner belongs. A
+ *  <code>nil</code> or -1 owner or group id is ignored. Follows
+ *  symbolic links. See also <code>File#lchown</code>.
+ *     
+ *     File.new("testfile").chown(502, 1000)
+ *     
+ */
+
+static VALUE
+rb_file_chown(obj, owner, group)
+    VALUE obj, owner, group;
+{
+    OpenFile *fptr;
+    int o, g;
+
+    rb_secure(2);
+    o = NIL_P(owner) ? -1 : NUM2INT(owner);
+    g = NIL_P(group) ? -1 : NUM2INT(group);
+    GetOpenFile(obj, fptr);
+#if defined(DJGPP) || defined(__CYGWIN32__) || defined(_WIN32) || defined(__EMX__)
+    if (!fptr->path) return Qnil;
+    if (chown(fptr->path, o, g) == -1)
+	rb_sys_fail(fptr->path);
+#else
+    if (fchown(fileno(fptr->f), o, g) == -1)
+	rb_sys_fail(fptr->path);
+#endif
+
+    return INT2FIX(0);
+}
+
+#if defined(HAVE_LCHOWN) && !defined(__CHECKER__)
+static void lchown_internal _((const char *, void *));
+static void
+lchown_internal(path, argp)
+    const char *path;
+    void *argp;
+{
+    struct chown_args *args = (struct chown_args *)argp;
+    if (lchown(path, args->owner, args->group) < 0)
+	rb_sys_fail(path);
+}
+
+
+/*
+ *  call-seq:
+ *     file.lchown(owner_int, group_int, file_name,..) => integer
+ *  
+ *  Equivalent to <code>File::chown</code>, but does not follow symbolic
+ *  links (so it will change the owner associated with the link, not the
+ *  file referenced by the link). Often not available. Returns number
+ *  of files in the argument list.
+ *     
+ */
+
+static VALUE
+rb_file_s_lchown(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE o, g, rest;
+    struct chown_args arg;
+    long n;
+
+    rb_secure(2);
+    rb_scan_args(argc, argv, "2*", &o, &g, &rest);
+    if (NIL_P(o)) {
+	arg.owner = -1;
+    }
+    else {
+	arg.owner = NUM2INT(o);
+    }
+    if (NIL_P(g)) {
+	arg.group = -1;
+    }
+    else {
+	arg.group = NUM2INT(g);
+    }
+
+    n = apply2files(lchown_internal, rest, &arg);
+    return LONG2FIX(n);
+}
+#else
+static VALUE
+rb_file_s_lchown(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    rb_notimplement();
+}
+#endif
+
+struct timeval rb_time_timeval();
+
+static void utime_internal _((const char *, void *));
+
+#if defined(HAVE_UTIMES) && !defined(__CHECKER__)
+
+static void
+utime_internal(path, arg)
+    const char *path;
+    void *arg;
+{
+    struct timeval *tvp = arg;
+    if (utimes(path, tvp) < 0)
+	rb_sys_fail(path);
+}
+
+/*
+ * call-seq:
+ *  File.utime(atime, mtime, file_name,...)   =>  integer
+ *
+ * Sets the access and modification times of each
+ * named file to the first two arguments. Returns
+ * the number of file names in the argument list.
+ */
+
+static VALUE
+rb_file_s_utime(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE atime, mtime, rest;
+    struct timeval tvs[2], *tvp = NULL;
+    long n;
+
+    rb_scan_args(argc, argv, "2*", &atime, &mtime, &rest);
+
+    if (!NIL_P(atime) || !NIL_P(mtime)) {
+	tvp = tvs;
+	tvp[0] = rb_time_timeval(atime);
+	tvp[1] = rb_time_timeval(mtime);
+    }
+
+    n = apply2files(utime_internal, rest, tvp);
+    return LONG2FIX(n);
+}
+
+#else
+
+#if !defined HAVE_UTIME_H && !defined HAVE_SYS_UTIME_H
+struct utimbuf {
+    long actime;
+    long modtime;
+};
+#endif
+
+static void
+utime_internal(path, arg)
+    const char *path;
+    void *arg;
+{
+    struct utimbuf *utp = arg;
+    if (utime(path, utp) < 0)
+	rb_sys_fail(path);
+}
+
+static VALUE
+rb_file_s_utime(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE atime, mtime, rest;
+    long n;
+    struct timeval tv;
+    struct utimbuf utbuf, *utp = NULL;
+
+    rb_scan_args(argc, argv, "2*", &atime, &mtime, &rest);
+
+    if (!NIL_P(atime) || !NIL_P(mtime)) {
+	utp = &utbuf;
+	tv = rb_time_timeval(atime);
+	utp->actime = tv.tv_sec;
+	tv = rb_time_timeval(mtime);
+	utp->modtime = tv.tv_sec;
+    }
+
+    n = apply2files(utime_internal, rest, utp);
+    return LONG2FIX(n);
+}
+
+#endif
+
+NORETURN(static void sys_fail2 _((VALUE,VALUE)));
+static void
+sys_fail2(s1, s2)
+    VALUE s1, s2;
+{
+    char *buf;
+    int len;
+
+    len = RSTRING(s1)->len + RSTRING(s2)->len + 5;
+    buf = ALLOCA_N(char, len);
+    snprintf(buf, len, "%s or %s", RSTRING(s1)->ptr, RSTRING(s2)->ptr);
+    rb_sys_fail(buf);
+}
+
+/*
+ *  call-seq:
+ *     File.link(old_name, new_name)    => 0
+ *  
+ *  Creates a new name for an existing file using a hard link. Will not
+ *  overwrite <i>new_name</i> if it already exists (raising a subclass
+ *  of <code>SystemCallError</code>). Not available on all platforms.
+ *     
+ *     File.link("testfile", ".testfile")   #=> 0
+ *     IO.readlines(".testfile")[0]         #=> "This is line one\n"
+ */
+
+static VALUE
+rb_file_s_link(klass, from, to)
+    VALUE klass, from, to;
+{
+#ifdef HAVE_LINK
+    SafeStringValue(from);
+    SafeStringValue(to);
+
+    if (link(StringValueCStr(from), StringValueCStr(to)) < 0) {
+	sys_fail2(from, to);
+    }
+    return INT2FIX(0);
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
+#endif
+}
+
+/*
+ *  call-seq:
+ *     File.symlink(old_name, new_name)   => 0
+ *  
+ *  Creates a symbolic link called <i>new_name</i> for the existing file
+ *  <i>old_name</i>. Raises a <code>NotImplemented</code> exception on
+ *  platforms that do not support symbolic links.
+ *     
+ *     File.symlink("testfile", "link2test")   #=> 0
+ *     
+ */
+
+static VALUE
+rb_file_s_symlink(klass, from, to)
+    VALUE klass, from, to;
+{
+#ifdef HAVE_SYMLINK
+    SafeStringValue(from);
+    SafeStringValue(to);
+
+    if (symlink(StringValueCStr(from), StringValueCStr(to)) < 0) {
+	sys_fail2(from, to);
+    }
+    return INT2FIX(0);
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
+#endif
+}
+
+/*
+ *  call-seq:
+ *     File.readlink(link_name) -> file_name
+ *  
+ *  Returns the name of the file referenced by the given link.
+ *  Not available on all platforms.
+ *     
+ *     File.symlink("testfile", "link2test")   #=> 0
+ *     File.readlink("link2test")              #=> "testfile"
+ */
+
+static VALUE
+rb_file_s_readlink(klass, path)
+    VALUE klass, path;
+{
+#ifdef HAVE_READLINK
+    char *buf;
+    int size = 100;
+    int rv;
+    VALUE v;
+
+    SafeStringValue(path);
+    buf = xmalloc(size);
+    while ((rv = readlink(RSTRING(path)->ptr, buf, size)) == size
+#ifdef _AIX
+	    || (rv < 0 && errno == ERANGE) /* quirky behavior of GPFS */
+#endif
+	) {
+	size *= 2;
+	buf = xrealloc(buf, size);
+    }
+    if (rv < 0) {
+	free(buf);
+	rb_sys_fail(RSTRING(path)->ptr);
+    }
+    v = rb_tainted_str_new(buf, rv);
+    free(buf);
+
+    return v;
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
+#endif
+}
+
+static void unlink_internal _((const char *, void *));
+static void
+unlink_internal(path, arg)
+    const char *path;
+    void *arg;
+{
+    if (unlink(path) < 0)
+	rb_sys_fail(path);
+}
+
+/*
+ *  call-seq:
+ *     File.delete(file_name, ...)  => integer
+ *     File.unlink(file_name, ...)  => integer
+ *  
+ *  Deletes the named files, returning the number of names
+ *  passed as arguments. Raises an exception on any error.
+ *  See also <code>Dir::rmdir</code>.
+ */
+
+static VALUE
+rb_file_s_unlink(klass, args)
+    VALUE klass, args;
+{
+    long n;
+
+    rb_secure(2);
+    n = apply2files(unlink_internal, args, 0);
+    return LONG2FIX(n);
+}
+
+/*
+ *  call-seq:
+ *     File.rename(old_name, new_name)   => 0
+ *  
+ *  Renames the given file to the new name. Raises a
+ *  <code>SystemCallError</code> if the file cannot be renamed.
+ *     
+ *     File.rename("afile", "afile.bak")   #=> 0
+ */
+
+static VALUE
+rb_file_s_rename(klass, from, to)
+    VALUE klass, from, to;
+{
+    const char *src, *dst;
+    SafeStringValue(from);
+    SafeStringValue(to);
+
+    src = StringValueCStr(from);
+    dst = StringValueCStr(to);
+#if defined __CYGWIN__
+    errno = 0;
+#endif
+    if (rename(src, dst) < 0) {
+#if defined DOSISH && !defined _WIN32
+	switch (errno) {
+	  case EEXIST:
+#if defined (__EMX__)
+	  case EACCES:
+#endif
+	    if (chmod(dst, 0666) == 0 &&
+		unlink(dst) == 0 &&
+		rename(src, dst) == 0)
+		return INT2FIX(0);
+	}
+#endif
+	sys_fail2(from, to);
+    }
+
+    return INT2FIX(0);
+}
+
+/*
+ *  call-seq:
+ *     File.umask()          => integer
+ *     File.umask(integer)   => integer
+ *  
+ *  Returns the current umask value for this process. If the optional
+ *  argument is given, set the umask to that value and return the
+ *  previous value. Umask values are <em>subtracted</em> from the
+ *  default permissions, so a umask of <code>0222</code> would make a
+ *  file read-only for everyone.
+ *     
+ *     File.umask(0006)   #=> 18
+ *     File.umask         #=> 6
+ */
+
+static VALUE
+rb_file_s_umask(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    int omask = 0;
+
+    rb_secure(2);
+    if (argc == 0) {
+	omask = umask(0);
+	umask(omask);
+    }
+    else if (argc == 1) {
+	omask = umask(NUM2INT(argv[0]));
+    }
+    else {
+	rb_raise(rb_eArgError, "wrong number of arguments");
+    }
+    return INT2FIX(omask);
+}
+
+#if defined DOSISH
+#define DOSISH_UNC
+#define isdirsep(x) ((x) == '/' || (x) == '\\')
+#else
+#define isdirsep(x) ((x) == '/')
+#endif
+#ifndef CharNext		/* defined as CharNext[AW] on Windows. */
+# if defined(DJGPP)
+#   define CharNext(p) ((p) + mblen(p, MB_CUR_MAX))
+# else
+#   define CharNext(p) ((p) + 1)
+# endif
+#endif
+
+#ifdef __CYGWIN__
+#undef DOSISH
+#define DOSISH_UNC
+#define DOSISH_DRIVE_LETTER
+#endif
+
+#ifdef DOSISH_DRIVE_LETTER
+static inline int
+has_drive_letter(buf)
+    const char *buf;
+{
+    if (ISALPHA(buf[0]) && buf[1] == ':') {
+	return 1;
+    }
+    else {
+	return 0;
+    }
+}
+
+static char*
+getcwdofdrv(drv)
+    int drv;
+{
+    char drive[4];
+    char *drvcwd, *oldcwd;
+
+    drive[0] = drv;
+    drive[1] = ':';
+    drive[2] = '\0';
+
+    /* the only way that I know to get the current directory
+       of a particular drive is to change chdir() to that drive,
+       so save the old cwd before chdir()
+    */
+    oldcwd = my_getcwd();
+    if (chdir(drive) == 0) {
+	drvcwd = my_getcwd();
+	chdir(oldcwd);
+	free(oldcwd);
+    }
+    else {
+	/* perhaps the drive is not exist. we return only drive letter */
+	drvcwd = strdup(drive);
+    }
+    return drvcwd;
+}
+#endif
+
+static inline char *
+skiproot(path)
+    const char *path;
+{
+#ifdef DOSISH_DRIVE_LETTER
+    if (has_drive_letter(path)) path += 2;
+#endif
+    while (isdirsep(*path)) path++;
+    return (char *)path;
+}
+
+#define nextdirsep rb_path_next
+char *
+rb_path_next(s)
+    const char *s;
+{
+    while (*s && !isdirsep(*s)) {
+	s = CharNext(s);
+    }
+    return (char *)s;
+}
+
+#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER) 
+#define skipprefix rb_path_skip_prefix
+#else
+#define skipprefix(path) (path)
+#endif
+char *
+rb_path_skip_prefix(path)
+    const char *path;
+{
+#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER) 
+#ifdef DOSISH_UNC
+    if (isdirsep(path[0]) && isdirsep(path[1])) {
+	path += 2;
+	while (isdirsep(*path)) path++;
+	if (*(path = nextdirsep(path)) && path[1] && !isdirsep(path[1]))
+	    path = nextdirsep(path + 1);
+	return (char *)path;
+    }
+#endif
+#ifdef DOSISH_DRIVE_LETTER
+    if (has_drive_letter(path))
+	return (char *)(path + 2);
+#endif
+#endif
+    return (char *)path;
+}
+
+#define strrdirsep rb_path_last_separator
+char *
+rb_path_last_separator(path)
+    const char *path;
+{
+    char *last = NULL;
+    while (*path) {
+	if (isdirsep(*path)) {
+	    const char *tmp = path++;
+	    while (isdirsep(*path)) path++;
+	    if (!*path) break;
+	    last = (char *)tmp;
+	}
+	else {
+	    path = CharNext(path);
+	}
+    }
+    return last;
+}
+
+static char *
+chompdirsep(path)
+    const char *path;
+{
+    while (*path) {
+	if (isdirsep(*path)) {
+	    const char *last = path++;
+	    while (isdirsep(*path)) path++;
+	    if (!*path) return (char *)last;
+	}
+	else {
+	    path = CharNext(path);
+	}
+    }
+    return (char *)path;
+}
+
+char *
+rb_path_end(path)
+    const char *path;
+{
+    if (isdirsep(*path)) path++;
+    return chompdirsep(path);
+}
+
+#define BUFCHECK(cond) do {\
+    long bdiff = p - buf;\
+    while (cond) {\
+	buflen *= 2;\
+    }\
+    rb_str_resize(result, buflen);\
+    buf = RSTRING(result)->ptr;\
+    p = buf + bdiff;\
+    pend = buf + buflen;\
+} while (0)
+
+#define BUFINIT() (\
+    p = buf = RSTRING(result)->ptr,\
+    buflen = RSTRING(result)->len,\
+    pend = p + buflen)
+
+#if !defined(TOLOWER)
+#define TOLOWER(c) (ISUPPER(c) ? tolower(c) : (c))
+#endif
+
+static int is_absolute_path _((const char*));
+
+static VALUE
+file_expand_path(fname, dname, result)
+    VALUE fname, dname, result;
+{
+    char *s, *buf, *b, *p, *pend, *root;
+    long buflen, dirlen;
+    int tainted;
+
+    s = StringValuePtr(fname);
+    BUFINIT();
+    tainted = OBJ_TAINTED(fname);
+
+    if (s[0] == '~') {
+	if (isdirsep(s[1]) || s[1] == '\0') {
+	    char *dir = getenv("HOME");
+
+	    if (!dir) {
+		rb_raise(rb_eArgError, "couldn't find HOME environment -- expanding `%s'", s);
+	    }
+	    dirlen = strlen(dir);
+	    BUFCHECK(dirlen > buflen);
+	    strcpy(buf, dir);
+#if defined DOSISH || defined __CYGWIN__
+	    for (p = buf; *p; p = CharNext(p)) {
+		if (*p == '\\') {
+		    *p = '/';
+		}
+	    }
+#else
+	    p = buf + strlen(dir);
+#endif
+	    s++;
+	    tainted = 1;
+	}
+	else {
+#ifdef HAVE_PWD_H
+	    struct passwd *pwPtr;
+	    s++;
+#endif
+	    s = nextdirsep(b = s);
+	    BUFCHECK(bdiff + (s-b) >= buflen);
+	    memcpy(p, b, s-b);
+	    p += s-b;
+	    *p = '\0';
+#ifdef HAVE_PWD_H
+	    pwPtr = getpwnam(buf);
+	    if (!pwPtr) {
+		endpwent();
+		rb_raise(rb_eArgError, "user %s doesn't exist", buf);
+	    }
+	    dirlen = strlen(pwPtr->pw_dir);
+	    BUFCHECK(dirlen > buflen);
+	    strcpy(buf, pwPtr->pw_dir);
+	    p = buf + strlen(pwPtr->pw_dir);
+	    endpwent();
+#endif
+	}
+    }
+#ifdef DOSISH_DRIVE_LETTER
+    /* skip drive letter */
+    else if (has_drive_letter(s)) {
+	if (isdirsep(s[2])) {
+	    /* specified drive letter, and full path */
+	    /* skip drive letter */
+	    BUFCHECK(bdiff + 2 >= buflen);
+	    memcpy(p, s, 2);
+	    p += 2;
+	    s += 2;
+	}
+	else {
+	    /* specified drive, but not full path */
+	    int same = 0;
+	    if (!NIL_P(dname)) {
+		file_expand_path(dname, Qnil, result);
+		BUFINIT();
+		if (has_drive_letter(p) && TOLOWER(p[0]) == TOLOWER(s[0])) {
+		    /* ok, same drive */
+		    same = 1;
+		}
+	    }
+	    if (!same) {
+		char *dir = getcwdofdrv(*s);
+
+		tainted = 1;
+		dirlen = strlen(dir);
+		BUFCHECK(dirlen > buflen);
+		strcpy(buf, dir);
+		free(dir);
+	    }
+	    p = chompdirsep(skiproot(buf));
+	    s += 2;
+	}
+    }
+#endif
+    else if (!is_absolute_path(s)) {
+	if (!NIL_P(dname)) {
+	    file_expand_path(dname, Qnil, result);
+	    BUFINIT();
+	}
+	else {
+	    char *dir = my_getcwd();
+
+	    tainted = 1;
+	    dirlen = strlen(dir);
+	    BUFCHECK(dirlen > buflen);
+	    strcpy(buf, dir);
+	    free(dir);
+	}
+#if defined DOSISH || defined __CYGWIN__
+	if (isdirsep(*s)) {
+	    /* specified full path, but not drive letter nor UNC */
+	    /* we need to get the drive letter or UNC share name */
+	    p = skipprefix(buf);
+	}
+	else
+#endif
+	    p = chompdirsep(skiproot(buf));
+    }
+    else {
+	b = s;
+	do s++; while (isdirsep(*s));
+	p = buf + (s - b);
+	BUFCHECK(bdiff >= buflen);
+	memset(buf, '/', p - buf);
+    }
+    if (p > buf && p[-1] == '/')
+	--p;
+    else
+	*p = '/';
+
+    p[1] = 0;
+    root = skipprefix(buf);
+
+    b = s;
+    while (*s) {
+	switch (*s) {
+	  case '.':
+	    if (b == s++) {	/* beginning of path element */
+		switch (*s) {
+		  case '\0':
+		    b = s;
+		    break;
+		  case '.':
+		    if (*(s+1) == '\0' || isdirsep(*(s+1))) {
+			/* We must go back to the parent */
+			*p = '\0';
+			if (!(b = strrdirsep(root))) {
+			    *p = '/';
+			}
+			else {
+			    p = b;
+			}
+			b = ++s;
+		    }
+		    break;
+		  case '/':
+#if defined DOSISH || defined __CYGWIN__
+		  case '\\':
+#endif
+		    b = ++s;
+		    break;
+		  default:
+		    /* ordinary path element, beginning don't move */
+		    break;
+		}
+	    }
+	    break;
+	  case '/':
+#if defined DOSISH || defined __CYGWIN__
+	  case '\\':
+#endif
+	    if (s > b) {
+		long rootdiff = root - buf;
+		BUFCHECK(bdiff + (s-b+1) >= buflen);
+		root = buf + rootdiff;
+		memcpy(++p, b, s-b);
+		p += s-b;
+		*p = '/';
+	    }
+	    b = ++s;
+	    break;
+	  default:
+	    s = CharNext(s);
+	    break;
+	}
+    }
+
+    if (s > b) {
+	BUFCHECK(bdiff + (s-b) >= buflen);
+	memcpy(++p, b, s-b);
+	p += s-b;
+    }
+    if (p == skiproot(buf) - 1) p++;
+
+    if (tainted) OBJ_TAINT(result);
+    RSTRING(result)->len = p - buf;
+    *p = '\0';
+    return result;
+}
+
+VALUE
+rb_file_expand_path(fname, dname)
+    VALUE fname, dname;
+{
+    return file_expand_path(fname, dname, rb_str_new(0, MAXPATHLEN + 2));
+}
+
+/*
+ *  call-seq:
+ *     File.expand_path(file_name [, dir_string] ) -> abs_file_name
+ *  
+ *  Converts a pathname to an absolute pathname. Relative paths are
+ *  referenced from the current working directory of the process unless
+ *  <i>dir_string</i> is given, in which case it will be used as the
+ *  starting point. The given pathname may start with a
+ *  ``<code>~</code>'', which expands to the process owner's home
+ *  directory (the environment variable <code>HOME</code> must be set
+ *  correctly). ``<code>~</code><i>user</i>'' expands to the named
+ *  user's home directory.
+ *     
+ *     File.expand_path("~oracle/bin")           #=> "/home/oracle/bin"
+ *     File.expand_path("../../bin", "/tmp/x")   #=> "/bin"
+ */
+
+VALUE
+rb_file_s_expand_path(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE fname, dname;
+
+    if (argc == 1) {
+	return rb_file_expand_path(argv[0], Qnil);
+    }
+    rb_scan_args(argc, argv, "11", &fname, &dname);
+
+    return rb_file_expand_path(fname, dname);
+}
+
+static int
+rmext(p, e)
+    const char *p, *e;
+{
+    int l1, l2;
+
+    if (!e) return 0;
+
+    l1 = chompdirsep(p) - p;
+    l2 = strlen(e);
+    if (l2 == 2 && e[1] == '*') {
+	e = strrchr(p, *e);
+	if (!e) return 0;
+	return e - p;
+    }
+    if (l1 < l2) return l1;
+
+    if (strncmp(p+l1-l2, e, l2) == 0) {
+	return l1-l2;
+    }
+    return 0;
+}
+
+/*
+ *  call-seq:
+ *     File.basename(file_name [, suffix] ) -> base_name
+ *  
+ *  Returns the last component of the filename given in <i>file_name</i>,
+ *  which must be formed using forward slashes (``<code>/</code>'')
+ *  regardless of the separator used on the local file system. If
+ *  <i>suffix</i> is given and present at the end of <i>file_name</i>,
+ *  it is removed.
+ *     
+ *     File.basename("/home/gumby/work/ruby.rb")          #=> "ruby.rb"
+ *     File.basename("/home/gumby/work/ruby.rb", ".rb")   #=> "ruby"
+ */
+
+static VALUE
+rb_file_s_basename(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE fname, fext, basename;
+    char *name, *p;
+#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
+    char *root;
+#endif
+    int f;
+
+    if (rb_scan_args(argc, argv, "11", &fname, &fext) == 2) {
+	StringValue(fext);
+    }
+    StringValue(fname);
+    if (RSTRING(fname)->len == 0 || !*(name = RSTRING(fname)->ptr))
+	return fname;
+    name = skipprefix(name);
+#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
+    root = name;
+#endif
+    while (isdirsep(*name))
+	name++;
+    if (!*name) {
+	p = name - 1;
+	f = 1;
+#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
+	if (name != root) {
+	    /* has slashes */
+	}
+#ifdef DOSISH_DRIVE_LETTER
+	else if (*p == ':') {
+	    p++;
+	    f = 0;
+	}
+#endif
+#ifdef DOSISH_UNC
+	else {
+	    p = "/";
+	}
+#endif
+#endif
+    }
+    else if (!(p = strrdirsep(name))) {
+	if (NIL_P(fext) || !(f = rmext(name, StringValueCStr(fext)))) {
+	    f = chompdirsep(name) - name;
+	    if (f == RSTRING(fname)->len) return fname;
+	}
+	p = name;
+    }
+    else {
+	while (isdirsep(*p)) p++; /* skip last / */
+	if (NIL_P(fext) || !(f = rmext(p, StringValueCStr(fext)))) {
+	    f = chompdirsep(p) - p;
+	}
+    }
+    basename = rb_str_new(p, f);
+    OBJ_INFECT(basename, fname);
+    return basename;
+}
+
+/*
+ *  call-seq:
+ *     File.dirname(file_name ) -> dir_name
+ *  
+ *  Returns all components of the filename given in <i>file_name</i>
+ *  except the last one. The filename must be formed using forward
+ *  slashes (``<code>/</code>'') regardless of the separator used on the
+ *  local file system.
+ *     
+ *     File.dirname("/home/gumby/work/ruby.rb")   #=> "/home/gumby/work"
+ */
+
+static VALUE
+rb_file_s_dirname(klass, fname)
+    VALUE klass, fname;
+{
+    const char *name, *root, *p;
+    VALUE dirname;
+
+    name = StringValueCStr(fname);
+    root = skiproot(name);
+#ifdef DOSISH_UNC
+    if (root > name + 1 && isdirsep(*name))
+	root = skipprefix(name = root - 2);
+#else
+    if (root > name + 1)
+	name = root - 1;
+#endif
+    p = strrdirsep(root);
+    if (!p) {
+	p = root;
+    }
+    if (p == name)
+	return rb_str_new2(".");
+#ifdef DOSISH_DRIVE_LETTER
+    if (has_drive_letter(name) && isdirsep(*(name + 2))) {
+	const char *top = skiproot(name + 2);
+	dirname = rb_str_new(name, 3);
+	rb_str_cat(dirname, top, p - top);
+    }
+    else
+#endif
+    dirname = rb_str_new(name, p - name);
+#ifdef DOSISH_DRIVE_LETTER
+    if (has_drive_letter(name) && root == name + 2 && p - name == 2)
+	rb_str_cat(dirname, ".", 1);
+#endif
+    OBJ_INFECT(dirname, fname);
+    return dirname;
+}
+
+/*
+ *  call-seq:
+ *     File.extname(path) -> string
+ *  
+ *  Returns the extension (the portion of file name in <i>path</i>
+ *  after the period).
+ *     
+ *     File.extname("test.rb")         #=> ".rb"
+ *     File.extname("a/b/d/test.rb")   #=> ".rb"
+ *     File.extname("test")            #=> ""
+ *     File.extname(".profile")        #=> ""
+ *     
+ */
+
+static VALUE
+rb_file_s_extname(klass, fname)
+    VALUE klass, fname;
+{
+    char *name, *p, *e;
+    VALUE extname;
+
+    name = StringValueCStr(fname);
+    p = strrdirsep(name);	/* get the last path component */
+    if (!p)
+ 	p = name;
+    else
+ 	p++;
+ 
+     e = strrchr(p, '.');	/* get the last dot of the last component */
+     if (!e || e == p || !e[1])	/* no dot, or the only dot is first or end? */
+	 return rb_str_new2("");
+     extname = rb_str_new(e, chompdirsep(e) - e);	/* keep the dot, too! */
+     OBJ_INFECT(extname, fname);
+     return extname;
+}
+
+/*
+ *  call-seq:
+ *     File.split(file_name)   => array
+ *  
+ *  Splits the given string into a directory and a file component and
+ *  returns them in a two-element array. See also
+ *  <code>File::dirname</code> and <code>File::basename</code>.
+ *     
+ *     File.split("/home/gumby/.profile")   #=> ["/home/gumby", ".profile"]
+ */
+
+static VALUE
+rb_file_s_split(klass, path)
+    VALUE klass, path;
+{
+    StringValue(path);		/* get rid of converting twice */
+    return rb_assoc_new(rb_file_s_dirname(Qnil, path), rb_file_s_basename(1,&path));
+}
+
+static VALUE separator;
+
+static VALUE rb_file_join _((VALUE ary, VALUE sep));
+
+static VALUE
+file_inspect_join(ary, arg)
+    VALUE ary;
+    VALUE *arg;
+{
+    return rb_file_join(arg[0], arg[1]);
+}
+
+static VALUE
+rb_file_join(ary, sep)
+    VALUE ary, sep;
+{
+    long len, i;
+    int taint = 0;
+    VALUE result, tmp;
+    char *name, *tail;
+
+    if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
+    if (OBJ_TAINTED(ary)) taint = 1;
+    if (OBJ_TAINTED(sep)) taint = 1;
+
+    len = 1;
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	if (TYPE(RARRAY(ary)->ptr[i]) == T_STRING) {
+	    len += RSTRING(RARRAY(ary)->ptr[i])->len;
+	}
+	else {
+	    len += 10;
+	}
+    }
+    if (!NIL_P(sep) && TYPE(sep) == T_STRING) {
+	len += RSTRING(sep)->len * RARRAY(ary)->len - 1;
+    }
+    result = rb_str_buf_new(len);
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	tmp = RARRAY(ary)->ptr[i];
+	switch (TYPE(tmp)) {
+	  case T_STRING:
+	    break;
+	  case T_ARRAY:
+	    if (rb_inspecting_p(tmp)) {
+		tmp = rb_str_new2("[...]");
+	    }
+	    else {
+		VALUE args[2];
+
+		args[0] = tmp;
+		args[1] = sep;
+		tmp = rb_protect_inspect(file_inspect_join, ary, (VALUE)args);
+	    }
+	    break;
+	  default:
+	    StringValueCStr(tmp);
+	}
+	name = StringValueCStr(result);
+	if (i > 0 && !NIL_P(sep)) {
+	    tail = chompdirsep(name);
+	    if (RSTRING(tmp)->ptr && isdirsep(RSTRING(tmp)->ptr[0])) {
+		RSTRING(result)->len = tail - name;
+	    }
+	    else if (!*tail) {
+		rb_str_buf_append(result, sep);
+	    }
+	}
+	rb_str_buf_append(result, tmp);
+	if (OBJ_TAINTED(tmp)) taint = 1;
+    }
+
+    if (taint) OBJ_TAINT(result);
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     File.join(string, ...) -> path
+ *  
+ *  Returns a new string formed by joining the strings using
+ *  <code>File::SEPARATOR</code>.
+ *     
+ *     File.join("usr", "mail", "gumby")   #=> "usr/mail/gumby"
+ *     
+ */
+
+static VALUE
+rb_file_s_join(klass, args)
+    VALUE klass, args;
+{
+    return rb_file_join(args, separator);
+}
+
+/*
+ *  call-seq:
+ *     File.truncate(file_name, integer)  => 0
+ *  
+ *  Truncates the file <i>file_name</i> to be at most <i>integer</i>
+ *  bytes long. Not available on all platforms.
+ *     
+ *     f = File.new("out", "w")
+ *     f.write("1234567890")     #=> 10
+ *     f.close                   #=> nil
+ *     File.truncate("out", 5)   #=> 0
+ *     File.size("out")          #=> 5
+ *     
+ */
+
+static VALUE
+rb_file_s_truncate(klass, path, len)
+    VALUE klass, path, len;
+{
+    off_t pos;
+
+    rb_secure(2);
+    pos = NUM2OFFT(len);
+    SafeStringValue(path);
+
+#ifdef HAVE_TRUNCATE
+    if (truncate(StringValueCStr(path), pos) < 0)
+	rb_sys_fail(RSTRING(path)->ptr);
+#else
+# ifdef HAVE_CHSIZE
+    {
+	int tmpfd;
+
+#  ifdef _WIN32
+	if ((tmpfd = open(StringValueCStr(path), O_RDWR)) < 0) {
+	    rb_sys_fail(RSTRING(path)->ptr);
+	}
+#  else
+	if ((tmpfd = open(StringValueCStr(path), 0)) < 0) {
+	    rb_sys_fail(RSTRING(path)->ptr);
+	}
+#  endif
+	if (chsize(tmpfd, pos) < 0) {
+	    close(tmpfd);
+	    rb_sys_fail(RSTRING(path)->ptr);
+	}
+	close(tmpfd);
+    }
+# else
+    rb_notimplement();
+# endif
+#endif
+    return INT2FIX(0);
+}
+
+/*
+ *  call-seq:
+ *     file.truncate(integer)    => 0
+ *  
+ *  Truncates <i>file</i> to at most <i>integer</i> bytes. The file
+ *  must be opened for writing. Not available on all platforms.
+ *     
+ *     f = File.new("out", "w")
+ *     f.syswrite("1234567890")   #=> 10
+ *     f.truncate(5)              #=> 0
+ *     f.close()                  #=> nil
+ *     File.size("out")           #=> 5
+ */
+
+static VALUE
+rb_file_truncate(obj, len)
+    VALUE obj, len;
+{
+    OpenFile *fptr;
+    FILE *f;
+    off_t pos;
+
+    rb_secure(2);
+    pos = NUM2OFFT(len);
+    GetOpenFile(obj, fptr);
+    if (!(fptr->mode & FMODE_WRITABLE)) {
+	rb_raise(rb_eIOError, "not opened for writing");
+    }
+    f = GetWriteFile(fptr);
+    fflush(f);
+    fseeko(f, (off_t)0, SEEK_CUR);
+#ifdef HAVE_TRUNCATE
+    if (ftruncate(fileno(f), pos) < 0)
+	rb_sys_fail(fptr->path);
+#else
+# ifdef HAVE_CHSIZE
+    if (chsize(fileno(f), pos) < 0)
+	rb_sys_fail(fptr->path);
+# else
+    rb_notimplement();
+# endif
+#endif
+    return INT2FIX(0);
+}
+
+# ifndef LOCK_SH
+#  define LOCK_SH 1
+# endif
+# ifndef LOCK_EX
+#  define LOCK_EX 2
+# endif
+# ifndef LOCK_NB
+#  define LOCK_NB 4
+# endif
+# ifndef LOCK_UN
+#  define LOCK_UN 8
+# endif
+
+#ifdef __CYGWIN__
+#include <winerror.h>
+extern unsigned long __attribute__((stdcall)) GetLastError(void);
+
+static int
+cygwin_flock(int fd, int op)
+{
+    int old_errno = errno;
+    int ret = flock(fd, op);
+    if (GetLastError() == ERROR_NOT_LOCKED) {
+	ret = 0;
+	errno = old_errno;
+    }
+    return ret;
+}
+# define flock(fd, op) cygwin_flock(fd, op)
+#endif
+
+static int
+rb_thread_flock(fd, op, fptr)
+    int fd, op;
+    OpenFile *fptr;
+{
+    if (rb_thread_alone() || (op & LOCK_NB)) {
+	int ret;
+	TRAP_BEG;
+	ret = flock(fd, op);
+	TRAP_END;
+	return ret;
+    }
+    op |= LOCK_NB;
+    while (flock(fd, op) < 0) {
+	switch (errno) {
+	  case EAGAIN:
+	  case EACCES:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+	  case EWOULDBLOCK:
+#endif
+	    rb_thread_polling();	/* busy wait */
+	    rb_io_check_closed(fptr);
+	    continue;
+	  default:
+	    return -1;
+	}
+    }
+    return 0;
+}
+#ifdef __CYGWIN__
+# undef flock
+#endif
+#define flock(fd, op) rb_thread_flock(fd, op, fptr)
+
+/*
+ *  call-seq:
+ *     file.flock (locking_constant ) =>  0 or false
+ *  
+ *  Locks or unlocks a file according to <i>locking_constant</i> (a
+ *  logical <em>or</em> of the values in the table below).
+ *  Returns <code>false</code> if <code>File::LOCK_NB</code> is
+ *  specified and the operation would otherwise have blocked. Not
+ *  available on all platforms.
+ *     
+ *  Locking constants (in class File):
+ *
+ *     LOCK_EX   | Exclusive lock. Only one process may hold an
+ *               | exclusive lock for a given file at a time.
+ *     ----------+------------------------------------------------
+ *     LOCK_NB   | Don't block when locking. May be combined
+ *               | with other lock options using logical or.
+ *     ----------+------------------------------------------------
+ *     LOCK_SH   | Shared lock. Multiple processes may each hold a
+ *               | shared lock for a given file at the same time.
+ *     ----------+------------------------------------------------
+ *     LOCK_UN   | Unlock.
+ *
+ *  Example:
+ *
+ *     File.new("testfile").flock(File::LOCK_UN)   #=> 0
+ *     
+ */
+
+static VALUE
+rb_file_flock(obj, operation)
+    VALUE obj;
+    VALUE operation;
+{
+#ifndef __CHECKER__
+    OpenFile *fptr;
+    int op;
+
+    rb_secure(2);
+    op = NUM2INT(operation);
+    GetOpenFile(obj, fptr);
+
+    if (fptr->mode & FMODE_WRITABLE) {
+	fflush(GetWriteFile(fptr));
+    }
+  retry:
+    if (flock(fileno(fptr->f), op) < 0) {
+	switch (errno) {
+	  case EAGAIN:
+	  case EACCES:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+	  case EWOULDBLOCK:
+#endif
+	      return Qfalse;
+	  case EINTR:
+#if defined(ERESTART)
+	  case ERESTART:
+#endif
+	    goto retry;
+	}
+	rb_sys_fail(fptr->path);
+    }
+#endif
+    return INT2FIX(0);
+}
+#undef flock
+
+static void
+test_check(n, argc, argv)
+    int n, argc;
+    VALUE *argv;
+{
+    int i;
+
+    n+=1;
+    if (n != argc) rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, n);
+    for (i=1; i<n; i++) {
+	switch (TYPE(argv[i])) {
+	  case T_STRING:
+	  default:
+	    SafeStringValue(argv[i]);
+	    break;
+	  case T_FILE:
+	    break;
+	}
+    }
+}
+
+#define CHECK(n) test_check((n), argc, argv)
+
+/*
+ *  call-seq:
+ *     test(int_cmd, file1 [, file2] ) => obj
+ *  
+ *  Uses the integer <i>aCmd</i> to perform various tests on
+ *  <i>file1</i> (first table below) or on <i>file1</i> and
+ *  <i>file2</i> (second table).
+ *     
+ *  File tests on a single file:
+ *
+ *    Test   Returns   Meaning
+ *     ?A  | Time    | Last access time for file1
+ *     ?b  | boolean | True if file1 is a block device
+ *     ?c  | boolean | True if file1 is a character device
+ *     ?C  | Time    | Last change time for file1
+ *     ?d  | boolean | True if file1 exists and is a directory
+ *     ?e  | boolean | True if file1 exists
+ *     ?f  | boolean | True if file1 exists and is a regular file
+ *     ?g  | boolean | True if file1 has the \CF{setgid} bit
+ *         |         | set (false under NT)
+ *     ?G  | boolean | True if file1 exists and has a group
+ *         |         | ownership equal to the caller's group
+ *     ?k  | boolean | True if file1 exists and has the sticky bit set
+ *     ?l  | boolean | True if file1 exists and is a symbolic link
+ *     ?M  | Time    | Last modification time for file1
+ *     ?o  | boolean | True if file1 exists and is owned by 
+ *         |         | the caller's effective uid
+ *     ?O  | boolean | True if file1 exists and is owned by
+ *         |         | the caller's real uid
+ *     ?p  | boolean | True if file1 exists and is a fifo
+ *     ?r  | boolean | True if file1 is readable by the effective
+ *         |         | uid/gid of the caller
+ *     ?R  | boolean | True if file is readable by the real
+ *         |         | uid/gid of the caller
+ *     ?s  | int/nil | If file1 has nonzero size, return the size,
+ *         |         | otherwise return nil
+ *     ?S  | boolean | True if file1 exists and is a socket
+ *     ?u  | boolean | True if file1 has the setuid bit set
+ *     ?w  | boolean | True if file1 exists and is writable by
+ *         |         | the effective uid/gid
+ *     ?W  | boolean | True if file1 exists and is writable by
+ *         |         | the real uid/gid
+ *     ?x  | boolean | True if file1 exists and is executable by
+ *         |         | the effective uid/gid
+ *     ?X  | boolean | True if file1 exists and is executable by
+ *         |         | the real uid/gid
+ *     ?z  | boolean | True if file1 exists and has a zero length
+ *
+ * Tests that take two files:
+ *
+ *     ?-  | boolean | True if file1 and file2 are identical
+ *     ?=  | boolean | True if the modification times of file1
+ *         |         | and file2 are equal
+ *     ?<  | boolean | True if the modification time of file1
+ *         |         | is prior to that of file2
+ *     ?>  | boolean | True if the modification time of file1
+ *         |         | is after that of file2
+ */
+
+static VALUE
+rb_f_test(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    int cmd;
+
+    if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments");
+#if 0 /* 1.7 behavior? */
+    if (argc == 1) {
+	return RTEST(argv[0]) ? Qtrue : Qfalse;
+    }
+#endif
+    cmd = NUM2CHR(argv[0]);
+    if (cmd == 0) return Qfalse;
+    if (strchr("bcdefgGkloOprRsSuwWxXz", cmd)) {
+	CHECK(1);
+	switch (cmd) {
+	  case 'b':
+	    return test_b(0, argv[1]);
+
+	  case 'c':
+	    return test_c(0, argv[1]);
+
+	  case 'd':
+	    return test_d(0, argv[1]);
+
+	  case 'a':
+	  case 'e':
+	    return test_e(0, argv[1]);
+
+	  case 'f':
+	    return test_f(0, argv[1]);
+
+	  case 'g':
+	    return test_sgid(0, argv[1]);
+
+	  case 'G':
+	    return test_grpowned(0, argv[1]);
+
+	  case 'k':
+	    return test_sticky(0, argv[1]);
+
+	  case 'l':
+	    return test_l(0, argv[1]);
+
+	  case 'o':
+	    return test_owned(0, argv[1]);
+
+	  case 'O':
+	    return test_rowned(0, argv[1]);
+
+	  case 'p':
+	    return test_p(0, argv[1]);
+
+	  case 'r':
+	    return test_r(0, argv[1]);
+
+	  case 'R':
+	    return test_R(0, argv[1]);
+
+	  case 's':
+	    return test_s(0, argv[1]);
+
+	  case 'S':
+	    return test_S(0, argv[1]);
+
+	  case 'u':
+	    return test_suid(0, argv[1]);
+
+	  case 'w':
+	    return test_w(0, argv[1]);
+
+	  case 'W':
+	    return test_W(0, argv[1]);
+
+	  case 'x':
+	    return test_x(0, argv[1]);
+
+	  case 'X':
+	    return test_X(0, argv[1]);
+
+	  case 'z':
+	    return test_z(0, argv[1]);
+	}
+    }
+
+    if (strchr("MAC", cmd)) {
+	struct stat st;
+
+	CHECK(1);
+	if (rb_stat(argv[1], &st) == -1) {
+	    rb_sys_fail(RSTRING(argv[1])->ptr);
+	}
+
+	switch (cmd) {
+	  case 'A':
+	    return rb_time_new(st.st_atime, 0);
+	  case 'M':
+	    return rb_time_new(st.st_mtime, 0);
+	  case 'C':
+	    return rb_time_new(st.st_ctime, 0);
+	}
+    }
+
+    if (cmd == '-') {
+	CHECK(2);
+	return test_identical(0, argv[1], argv[2]);
+    }
+
+    if (strchr("=<>", cmd)) {
+	struct stat st1, st2;
+
+	CHECK(2);
+	if (rb_stat(argv[1], &st1) < 0) return Qfalse;
+	if (rb_stat(argv[2], &st2) < 0) return Qfalse;
+
+	switch (cmd) {
+	  case '=':
+	    if (st1.st_mtime == st2.st_mtime) return Qtrue;
+	    return Qfalse;
+
+	  case '>':
+	    if (st1.st_mtime > st2.st_mtime) return Qtrue;
+	    return Qfalse;
+
+	  case '<':
+	    if (st1.st_mtime < st2.st_mtime) return Qtrue;
+	    return Qfalse;
+	}
+    }
+    /* unknown command */
+    rb_raise(rb_eArgError, "unknown command ?%c", cmd);
+    return Qnil;		/* not reached */
+}
+
+
+
+/*
+ *  Document-class: File::Stat
+ *
+ *  Objects of class <code>File::Stat</code> encapsulate common status
+ *  information for <code>File</code> objects. The information is
+ *  recorded at the moment the <code>File::Stat</code> object is
+ *  created; changes made to the file after that point will not be
+ *  reflected. <code>File::Stat</code> objects are returned by
+ *  <code>IO#stat</code>, <code>File::stat</code>,
+ *  <code>File#lstat</code>, and <code>File::lstat</code>. Many of these
+ *  methods return platform-specific values, and not all values are
+ *  meaningful on all systems. See also <code>Kernel#test</code>.
+ */
+
+static VALUE rb_stat_s_alloc _((VALUE));
+static VALUE
+rb_stat_s_alloc(klass)
+    VALUE klass;
+{
+    return stat_new_0(klass, 0);
+}
+
+/*
+ * call-seq:
+ *
+ *   File::Stat.new(file_name)  => stat
+ *
+ * Create a File::Stat object for the given file name (raising an
+ * exception if the file doesn't exist).
+ */
+
+static VALUE
+rb_stat_init(obj, fname)
+    VALUE obj, fname;
+{
+    struct stat st, *nst;
+
+    SafeStringValue(fname);
+
+    if (stat(StringValueCStr(fname), &st) == -1) {
+	rb_sys_fail(RSTRING(fname)->ptr);
+    }
+    if (DATA_PTR(obj)) {
+	free(DATA_PTR(obj));
+	DATA_PTR(obj) = NULL;
+    }
+    nst = ALLOC(struct stat);
+    *nst = st;
+    DATA_PTR(obj) = nst;
+
+    return Qnil;
+}
+
+/* :nodoc: */
+static VALUE
+rb_stat_init_copy(copy, orig)
+    VALUE copy, orig;
+{
+    struct stat *nst;
+
+    if (copy == orig) return orig;
+    rb_check_frozen(copy);
+    /* need better argument type check */
+    if (!rb_obj_is_instance_of(orig, rb_obj_class(copy))) {
+	rb_raise(rb_eTypeError, "wrong argument class");
+    }
+    if (DATA_PTR(copy)) {
+	free(DATA_PTR(copy));
+	DATA_PTR(copy) = 0;
+    }
+    if (DATA_PTR(orig)) {
+	nst = ALLOC(struct stat);
+	*nst = *(struct stat*)DATA_PTR(orig);
+	DATA_PTR(copy) = nst;
+    }
+
+    return copy;
+}
+
+/*
+ *  call-seq:
+ *     stat.ftype   => string
+ *  
+ *  Identifies the type of <i>stat</i>. The return string is one of:
+ *  ``<code>file</code>'', ``<code>directory</code>'',
+ *  ``<code>characterSpecial</code>'', ``<code>blockSpecial</code>'',
+ *  ``<code>fifo</code>'', ``<code>link</code>'',
+ *  ``<code>socket</code>'', or ``<code>unknown</code>''.
+ *     
+ *     File.stat("/dev/tty").ftype   #=> "characterSpecial"
+ *     
+ */
+
+static VALUE
+rb_stat_ftype(obj)
+    VALUE obj;
+{
+    return rb_file_ftype(get_stat(obj));
+}
+
+/*
+ *  call-seq:
+ *     stat.directory?   => true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> is a directory,
+ *  <code>false</code> otherwise.
+ *     
+ *     File.stat("testfile").directory?   #=> false
+ *     File.stat(".").directory?          #=> true
+ */
+
+static VALUE
+rb_stat_d(obj)
+    VALUE obj;
+{
+    if (S_ISDIR(get_stat(obj)->st_mode)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     stat.pipe?    => true or false
+ *  
+ *  Returns <code>true</code> if the operating system supports pipes and
+ *  <i>stat</i> is a pipe; <code>false</code> otherwise.
+ */
+
+static VALUE
+rb_stat_p(obj)
+    VALUE obj;
+{
+#ifdef S_IFIFO
+    if (S_ISFIFO(get_stat(obj)->st_mode)) return Qtrue;
+
+#endif
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     stat.symlink?    => true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> is a symbolic link,
+ *  <code>false</code> if it isn't or if the operating system doesn't
+ *  support this feature. As <code>File::stat</code> automatically
+ *  follows symbolic links, <code>symlink?</code> will always be
+ *  <code>false</code> for an object returned by
+ *  <code>File::stat</code>.
+ *     
+ *     File.symlink("testfile", "alink")   #=> 0
+ *     File.stat("alink").symlink?         #=> false
+ *     File.lstat("alink").symlink?        #=> true
+ *     
+ */
+
+static VALUE
+rb_stat_l(obj)
+    VALUE obj;
+{
+#ifdef S_ISLNK
+    if (S_ISLNK(get_stat(obj)->st_mode)) return Qtrue;
+#endif
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     stat.socket?    => true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> is a socket,
+ *  <code>false</code> if it isn't or if the operating system doesn't
+ *  support this feature.
+ *     
+ *     File.stat("testfile").socket?   #=> false
+ *     
+ */
+
+static VALUE
+rb_stat_S(obj)
+    VALUE obj;
+{
+#ifdef S_ISSOCK
+    if (S_ISSOCK(get_stat(obj)->st_mode)) return Qtrue;
+
+#endif
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     stat.blockdev?   => true or false
+ *  
+ *  Returns <code>true</code> if the file is a block device,
+ *  <code>false</code> if it isn't or if the operating system doesn't
+ *  support this feature.
+ *     
+ *     File.stat("testfile").blockdev?    #=> false
+ *     File.stat("/dev/hda1").blockdev?   #=> true
+ *     
+ */
+
+static VALUE
+rb_stat_b(obj)
+    VALUE obj;
+{
+#ifdef S_ISBLK
+    if (S_ISBLK(get_stat(obj)->st_mode)) return Qtrue;
+
+#endif
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     stat.chardev?    => true or false
+ *  
+ *  Returns <code>true</code> if the file is a character device,
+ *  <code>false</code> if it isn't or if the operating system doesn't
+ *  support this feature.
+ *     
+ *     File.stat("/dev/tty").chardev?   #=> true
+ *     
+ */
+
+static VALUE
+rb_stat_c(obj)
+    VALUE obj;
+{
+    if (S_ISCHR(get_stat(obj)->st_mode)) return Qtrue;
+
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     stat.owned?    => true or false
+ *  
+ *  Returns <code>true</code> if the effective user id of the process is
+ *  the same as the owner of <i>stat</i>.
+ *     
+ *     File.stat("testfile").owned?      #=> true
+ *     File.stat("/etc/passwd").owned?   #=> false
+ *     
+ */
+
+static VALUE
+rb_stat_owned(obj)
+    VALUE obj;
+{
+    if (get_stat(obj)->st_uid == geteuid()) return Qtrue;
+    return Qfalse;
+}
+
+static VALUE
+rb_stat_rowned(obj)
+    VALUE obj;
+{
+    if (get_stat(obj)->st_uid == getuid()) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     stat.grpowned?   => true or false
+ *  
+ *  Returns true if the effective group id of the process is the same as
+ *  the group id of <i>stat</i>. On Windows NT, returns <code>false</code>.
+ *     
+ *     File.stat("testfile").grpowned?      #=> true
+ *     File.stat("/etc/passwd").grpowned?   #=> false
+ *     
+ */
+
+static VALUE
+rb_stat_grpowned(obj)
+    VALUE obj;
+{
+#ifndef _WIN32
+    if (group_member(get_stat(obj)->st_gid)) return Qtrue;
+#endif
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     stat.readable?    => true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> is readable by the
+ *  effective user id of this process.
+ *     
+ *     File.stat("testfile").readable?   #=> true
+ *     
+ */
+
+static VALUE
+rb_stat_r(obj)
+    VALUE obj;
+{
+    struct stat *st = get_stat(obj);
+
+#ifdef USE_GETEUID
+    if (geteuid() == 0) return Qtrue;
+#endif
+#ifdef S_IRUSR
+    if (rb_stat_owned(obj))
+	return st->st_mode & S_IRUSR ? Qtrue : Qfalse;
+#endif
+#ifdef S_IRGRP
+    if (rb_stat_grpowned(obj))
+	return st->st_mode & S_IRGRP ? Qtrue : Qfalse;
+#endif
+#ifdef S_IROTH
+    if (!(st->st_mode & S_IROTH)) return Qfalse;
+#endif
+    return Qtrue;
+}
+
+
+
+/*
+ *  call-seq:
+ *     stat.readable_real? -> true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> is readable by the real
+ *  user id of this process.
+ *     
+ *     File.stat("testfile").readable_real?   #=> true
+ *     
+ */
+
+static VALUE
+rb_stat_R(obj)
+    VALUE obj;
+{
+    struct stat *st = get_stat(obj);
+
+#ifdef USE_GETEUID
+    if (getuid() == 0) return Qtrue;
+#endif
+#ifdef S_IRUSR
+    if (rb_stat_rowned(obj))
+	return st->st_mode & S_IRUSR ? Qtrue : Qfalse;
+#endif
+#ifdef S_IRGRP
+    if (group_member(get_stat(obj)->st_gid))
+	return st->st_mode & S_IRGRP ? Qtrue : Qfalse;
+#endif
+#ifdef S_IROTH
+    if (!(st->st_mode & S_IROTH)) return Qfalse;
+#endif
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     stat.writable? -> true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> is writable by the
+ *  effective user id of this process.
+ *     
+ *     File.stat("testfile").writable?   #=> true
+ *     
+ */
+
+static VALUE
+rb_stat_w(obj)
+    VALUE obj;
+{
+    struct stat *st = get_stat(obj);
+
+#ifdef USE_GETEUID
+    if (geteuid() == 0) return Qtrue;
+#endif
+#ifdef S_IWUSR
+    if (rb_stat_owned(obj))
+	return st->st_mode & S_IWUSR ? Qtrue : Qfalse;
+#endif
+#ifdef S_IWGRP
+    if (rb_stat_grpowned(obj))
+	return st->st_mode & S_IWGRP ? Qtrue : Qfalse;
+#endif
+#ifdef S_IWOTH
+    if (!(st->st_mode & S_IWOTH)) return Qfalse;
+#endif
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     stat.writable_real? -> true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> is writable by the real
+ *  user id of this process.
+ *     
+ *     File.stat("testfile").writable_real?   #=> true
+ *     
+ */
+
+static VALUE
+rb_stat_W(obj)
+    VALUE obj;
+{
+    struct stat *st = get_stat(obj);
+
+#ifdef USE_GETEUID
+    if (getuid() == 0) return Qtrue;
+#endif
+#ifdef S_IWUSR
+    if (rb_stat_rowned(obj))
+	return st->st_mode & S_IWUSR ? Qtrue : Qfalse;
+#endif
+#ifdef S_IWGRP
+    if (group_member(get_stat(obj)->st_gid))
+	return st->st_mode & S_IWGRP ? Qtrue : Qfalse;
+#endif
+#ifdef S_IWOTH
+    if (!(st->st_mode & S_IWOTH)) return Qfalse;
+#endif
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     stat.executable?    => true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> is executable or if the
+ *  operating system doesn't distinguish executable files from
+ *  nonexecutable files. The tests are made using the effective owner of
+ *  the process.
+ *     
+ *     File.stat("testfile").executable?   #=> false
+ *     
+ */
+
+static VALUE
+rb_stat_x(obj)
+    VALUE obj;
+{
+    struct stat *st = get_stat(obj);
+
+#ifdef USE_GETEUID
+    if (geteuid() == 0) {
+	return st->st_mode & S_IXUGO ? Qtrue : Qfalse;
+    }
+#endif
+#ifdef S_IXUSR
+    if (rb_stat_owned(obj))
+	return st->st_mode & S_IXUSR ? Qtrue : Qfalse;
+#endif
+#ifdef S_IXGRP
+    if (rb_stat_grpowned(obj))
+	return st->st_mode & S_IXGRP ? Qtrue : Qfalse;
+#endif
+#ifdef S_IXOTH
+    if (!(st->st_mode & S_IXOTH)) return Qfalse;
+#endif
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     stat.executable_real?    => true or false
+ *  
+ *  Same as <code>executable?</code>, but tests using the real owner of
+ *  the process.
+ */
+
+
+static VALUE
+rb_stat_X(obj)
+    VALUE obj;
+{
+    struct stat *st = get_stat(obj);
+
+#ifdef USE_GETEUID
+    if (getuid() == 0) {
+	return st->st_mode & S_IXUGO ? Qtrue : Qfalse;
+    }
+#endif
+#ifdef S_IXUSR
+    if (rb_stat_rowned(obj))
+	return st->st_mode & S_IXUSR ? Qtrue : Qfalse;
+#endif
+#ifdef S_IXGRP
+    if (group_member(get_stat(obj)->st_gid))
+	return st->st_mode & S_IXGRP ? Qtrue : Qfalse;
+#endif
+#ifdef S_IXOTH
+    if (!(st->st_mode & S_IXOTH)) return Qfalse;
+#endif
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     stat.file?    => true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> is a regular file (not
+ *  a device file, pipe, socket, etc.).
+ *     
+ *     File.stat("testfile").file?   #=> true
+ *     
+ */
+
+static VALUE
+rb_stat_f(obj)
+    VALUE obj;
+{
+    if (S_ISREG(get_stat(obj)->st_mode)) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     stat.zero?    => true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> is a zero-length file;
+ *  <code>false</code> otherwise.
+ *     
+ *     File.stat("testfile").zero?   #=> false
+ *     
+ */
+
+static VALUE
+rb_stat_z(obj)
+    VALUE obj;
+{
+    if (get_stat(obj)->st_size == 0) return Qtrue;
+    return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     state.size    => integer
+ *  
+ *  Returns the size of <i>stat</i> in bytes.
+ *     
+ *     File.stat("testfile").size   #=> 66
+ *     
+ */
+
+static VALUE
+rb_stat_s(obj)
+    VALUE obj;
+{
+    off_t size = get_stat(obj)->st_size;
+
+    if (size == 0) return Qnil;
+    return OFFT2NUM(size);
+}
+
+/*
+ *  call-seq:
+ *     stat.setuid?    => true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> has the set-user-id
+ *  permission bit set, <code>false</code> if it doesn't or if the
+ *  operating system doesn't support this feature.
+ *     
+ *     File.stat("/bin/su").setuid?   #=> true
+ */
+
+static VALUE
+rb_stat_suid(obj)
+    VALUE obj;
+{
+#ifdef S_ISUID
+    if (get_stat(obj)->st_mode & S_ISUID) return Qtrue;
+#endif
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     stat.setgid?   => true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> has the set-group-id
+ *  permission bit set, <code>false</code> if it doesn't or if the
+ *  operating system doesn't support this feature.
+ *     
+ *     File.stat("/usr/sbin/lpc").setgid?   #=> true
+ *     
+ */
+
+static VALUE
+rb_stat_sgid(obj)
+    VALUE obj;
+{
+#ifdef S_ISGID
+    if (get_stat(obj)->st_mode & S_ISGID) return Qtrue;
+#endif
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     stat.sticky?    => true or false
+ *  
+ *  Returns <code>true</code> if <i>stat</i> has its sticky bit set,
+ *  <code>false</code> if it doesn't or if the operating system doesn't
+ *  support this feature.
+ *     
+ *     File.stat("testfile").sticky?   #=> false
+ *     
+ */
+
+static VALUE
+rb_stat_sticky(obj)
+    VALUE obj;
+{
+#ifdef S_ISVTX
+    if (get_stat(obj)->st_mode & S_ISVTX) return Qtrue;
+#endif
+    return Qfalse;
+}
+
+VALUE rb_mFConst;
+
+void
+rb_file_const(name, value)
+    const char *name;
+    VALUE value;
+{
+    rb_define_const(rb_mFConst, name, value);
+}
+
+static int
+is_absolute_path(path)
+    const char *path;
+{
+#ifdef DOSISH_DRIVE_LETTER
+    if (has_drive_letter(path) && isdirsep(path[2])) return 1;
+#endif
+#ifdef DOSISH_UNC
+    if (isdirsep(path[0]) && isdirsep(path[1])) return 1;
+#endif
+#ifndef DOSISH
+    if (path[0] == '/') return 1;
+#endif
+    return 0;
+}
+
+#ifndef ENABLE_PATH_CHECK
+# if defined DOSISH || defined __CYGWIN__
+#   define ENABLE_PATH_CHECK 0
+# else
+#   define ENABLE_PATH_CHECK 1
+# endif
+#endif
+
+#if ENABLE_PATH_CHECK
+static int
+path_check_0(fpath, execpath)
+     VALUE fpath;
+     int execpath;
+{
+    struct stat st;
+    char *p0 = StringValueCStr(fpath);
+    char *p = 0, *s;
+
+    if (!is_absolute_path(p0)) {
+	char *buf = my_getcwd();
+	VALUE newpath;
+
+	newpath = rb_str_new2(buf);
+	free(buf);
+
+	rb_str_cat2(newpath, "/");
+	rb_str_cat2(newpath, p0);
+	p0 = RSTRING(fpath = newpath)->ptr;
+    }
+    for (;;) {
+#ifndef S_IWOTH
+# define S_IWOTH 002
+#endif
+	if (stat(p0, &st) == 0 && S_ISDIR(st.st_mode) && (st.st_mode & S_IWOTH)
+#ifdef S_ISVTX
+	    && !(p && execpath && (st.st_mode & S_ISVTX))
+#endif
+	    ) {
+	    rb_warn("Insecure world writable dir %s in %sPATH, mode 0%o",
+		    p0, (execpath ? "" : "LOAD_"), st.st_mode);
+	    if (p) *p = '/';
+	    return 0;
+	}
+	s = strrdirsep(p0);
+	if (p) *p = '/';
+	if (!s || s == p0) return 1;
+	p = s;
+	*p = '\0';
+    }
+}
+#endif
+
+static int
+fpath_check(path)
+    char *path;
+{
+#if ENABLE_PATH_CHECK
+    return path_check_0(rb_str_new2(path), Qfalse);
+#else
+    return 1;
+#endif
+}
+
+int
+rb_path_check(path)
+    char *path;
+{
+#if ENABLE_PATH_CHECK
+    char *p0, *p, *pend;
+    const char sep = PATH_SEP_CHAR;
+
+    if (!path) return 1;
+
+    pend = path + strlen(path);
+    p0 = path;
+    p = strchr(path, sep);
+    if (!p) p = pend;
+
+    for (;;) {
+	if (!path_check_0(rb_str_new(p0, p - p0), Qtrue)) {
+	    return 0;		/* not safe */
+	}
+	p0 = p + 1;
+	if (p0 > pend) break;
+	p = strchr(p0, sep);
+	if (!p) p = pend;
+    }
+#endif
+    return 1;
+}
+
+#if defined(__MACOS__) || defined(riscos)
+static int
+is_macos_native_path(path)
+    const char *path;
+{
+    if (strchr(path, ':')) return 1;
+    return 0;
+}
+#endif
+
+static int
+file_load_ok(file)
+    char *file;
+{
+    FILE *f;
+
+    if (!file) return 0;
+    f = fopen(file, "r");
+    if (f == NULL) return 0;
+    fclose(f);
+    return 1;
+}
+
+extern VALUE rb_load_path;
+
+int
+rb_find_file_ext(filep, ext)
+    VALUE *filep;
+    const char * const *ext;
+{
+    char *path, *found;
+    char *f = RSTRING(*filep)->ptr;
+    VALUE fname;
+    long i, j;
+
+    if (f[0] == '~') {
+	fname = rb_file_expand_path(*filep, Qnil);
+	if (rb_safe_level() >= 2 && OBJ_TAINTED(fname)) {
+	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
+	}
+	OBJ_FREEZE(fname);
+	f = StringValueCStr(fname);
+	*filep = fname;
+    }
+
+    if (is_absolute_path(f)) {
+	for (i=0; ext[i]; i++) {
+	    fname = rb_str_dup(*filep);
+	    rb_str_cat2(fname, ext[i]);
+	    OBJ_FREEZE(fname);
+	    if (file_load_ok(StringValueCStr(fname))) {
+		*filep = fname;
+		return i+1;
+	    }
+	}
+	return 0;
+    }
+
+    if (!rb_load_path) return 0;
+
+    Check_Type(rb_load_path, T_ARRAY);
+    for (i=0;i<RARRAY(rb_load_path)->len;i++) {
+	VALUE str = RARRAY(rb_load_path)->ptr[i];
+
+	SafeStringValue(str);
+	if (RSTRING(str)->len == 0) continue;
+	path = RSTRING(str)->ptr;
+	for (j=0; ext[j]; j++) {
+	    fname = rb_str_dup(*filep);
+	    rb_str_cat2(fname, ext[j]);
+	    OBJ_FREEZE(fname);
+	    found = dln_find_file(StringValueCStr(fname), path);
+	    if (found && file_load_ok(found)) {
+		*filep = fname;
+		return j+1;
+	    }
+	}
+    }
+    return 0;
+}
+
+VALUE
+rb_find_file(path)
+    VALUE path;
+{
+    VALUE tmp;
+    char *f = StringValueCStr(path);
+    char *lpath;
+
+    if (f[0] == '~') {
+	path = rb_file_expand_path(path, Qnil);
+	if (rb_safe_level() >= 1 && OBJ_TAINTED(path)) {
+	    rb_raise(rb_eSecurityError, "loading from unsafe path %s", f);
+	}
+	OBJ_FREEZE(path);
+	f = StringValueCStr(path);
+    }
+
+#if defined(__MACOS__) || defined(riscos)
+    if (is_macos_native_path(f)) {
+	if (rb_safe_level() >= 1 && !fpath_check(f)) {
+	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
+	}
+	if (file_load_ok(f)) return path;
+    }
+#endif
+
+    if (is_absolute_path(f)) {
+	if (rb_safe_level() >= 1 && !fpath_check(f)) {
+	    rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
+	}
+	if (file_load_ok(f)) return path;
+    }
+
+    if (rb_safe_level() >= 4) {
+	rb_raise(rb_eSecurityError, "loading from non-absolute path %s", f);
+    }
+
+    if (rb_load_path) {
+	long i;
+
+	Check_Type(rb_load_path, T_ARRAY);
+	tmp = rb_ary_new();
+	for (i=0;i<RARRAY(rb_load_path)->len;i++) {
+	    VALUE str = RARRAY(rb_load_path)->ptr[i];
+	    SafeStringValue(str);
+	    if (RSTRING(str)->len > 0) {
+		rb_ary_push(tmp, str);
+	    }
+	}
+	tmp = rb_ary_join(tmp, rb_str_new2(PATH_SEP));
+	if (RSTRING(tmp)->len == 0) {
+	    lpath = 0;
+	}
+	else {
+	    lpath = RSTRING(tmp)->ptr;
+	}
+    }
+    else {
+	lpath = 0;
+    }
+
+    if (!lpath) {
+	return 0;		/* no path, no load */
+    }
+    if (!(f = dln_find_file(f, lpath))) {
+	return 0;
+    }
+    if (rb_safe_level() >= 1 && !fpath_check(f)) {
+	rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
+    }
+    if (file_load_ok(f)) {
+	tmp = rb_str_new2(f);
+	OBJ_FREEZE(tmp);
+	return tmp;
+    }
+    return 0;
+}
+
+static void
+define_filetest_function(name, func, argc)
+    const char *name;
+    VALUE (*func)();
+    int argc;
+{
+    rb_define_module_function(rb_mFileTest, name, func, argc);
+    rb_define_singleton_method(rb_cFile, name, func, argc);
+}
+
+
+/*
+ *  A <code>File</code> is an abstraction of any file object accessible
+ *  by the program and is closely associated with class <code>IO</code>
+ *  <code>File</code> includes the methods of module
+ *  <code>FileTest</code> as class methods, allowing you to write (for
+ *  example) <code>File.exist?("foo")</code>.
+ *     
+ *  In the description of File methods,
+ *  <em>permission bits</em> are a platform-specific
+ *  set of bits that indicate permissions of a file. On Unix-based
+ *  systems, permissions are viewed as a set of three octets, for the
+ *  owner, the group, and the rest of the world. For each of these
+ *  entities, permissions may be set to read, write, or execute the
+ *  file:
+ *     
+ *  The permission bits <code>0644</code> (in octal) would thus be
+ *  interpreted as read/write for owner, and read-only for group and
+ *  other. Higher-order bits may also be used to indicate the type of
+ *  file (plain, directory, pipe, socket, and so on) and various other
+ *  special features. If the permissions are for a directory, the
+ *  meaning of the execute bit changes; when set the directory can be
+ *  searched.
+ *     
+ *  On non-Posix operating systems, there may be only the ability to
+ *  make a file read-only or read-write. In this case, the remaining
+ *  permission bits will be synthesized to resemble typical values. For
+ *  instance, on Windows NT the default permission bits are
+ *  <code>0644</code>, which means read/write for owner, read-only for
+ *  all others. The only change that can be made is to make the file
+ *  read-only, which is reported as <code>0444</code>.
+ */
+
+void
+Init_File()
+{
+    rb_mFileTest = rb_define_module("FileTest");
+    rb_cFile = rb_define_class("File", rb_cIO);
+
+    define_filetest_function("directory?", test_d, 1);
+    define_filetest_function("exist?", test_e, 1);
+    define_filetest_function("exists?", test_e, 1); /* temporary */
+    define_filetest_function("readable?", test_r, 1);
+    define_filetest_function("readable_real?", test_R, 1);
+    define_filetest_function("writable?", test_w, 1);
+    define_filetest_function("writable_real?", test_W, 1);
+    define_filetest_function("executable?", test_x, 1);
+    define_filetest_function("executable_real?", test_X, 1);
+    define_filetest_function("file?", test_f, 1);
+    define_filetest_function("zero?", test_z, 1);
+    define_filetest_function("size?", test_s, 1);
+    define_filetest_function("size", rb_file_s_size, 1);
+    define_filetest_function("owned?", test_owned, 1);
+    define_filetest_function("grpowned?", test_grpowned, 1);
+
+    define_filetest_function("pipe?", test_p, 1);
+    define_filetest_function("symlink?", test_l, 1);
+    define_filetest_function("socket?", test_S, 1);
+
+    define_filetest_function("blockdev?", test_b, 1);
+    define_filetest_function("chardev?", test_c, 1);
+
+    define_filetest_function("setuid?", test_suid, 1);
+    define_filetest_function("setgid?", test_sgid, 1);
+    define_filetest_function("sticky?", test_sticky, 1);
+
+    define_filetest_function("identical?", test_identical, 2);
+
+    rb_define_singleton_method(rb_cFile, "stat",  rb_file_s_stat, 1);
+    rb_define_singleton_method(rb_cFile, "lstat", rb_file_s_lstat, 1);
+    rb_define_singleton_method(rb_cFile, "ftype", rb_file_s_ftype, 1);
+
+    rb_define_singleton_method(rb_cFile, "atime", rb_file_s_atime, 1);
+    rb_define_singleton_method(rb_cFile, "mtime", rb_file_s_mtime, 1);
+    rb_define_singleton_method(rb_cFile, "ctime", rb_file_s_ctime, 1);
+
+    rb_define_singleton_method(rb_cFile, "utime", rb_file_s_utime, -1);
+    rb_define_singleton_method(rb_cFile, "chmod", rb_file_s_chmod, -1);
+    rb_define_singleton_method(rb_cFile, "chown", rb_file_s_chown, -1);
+    rb_define_singleton_method(rb_cFile, "lchmod", rb_file_s_lchmod, -1);
+    rb_define_singleton_method(rb_cFile, "lchown", rb_file_s_lchown, -1);
+
+    rb_define_singleton_method(rb_cFile, "link", rb_file_s_link, 2);
+    rb_define_singleton_method(rb_cFile, "symlink", rb_file_s_symlink, 2);
+    rb_define_singleton_method(rb_cFile, "readlink", rb_file_s_readlink, 1);
+
+    rb_define_singleton_method(rb_cFile, "unlink", rb_file_s_unlink, -2);
+    rb_define_singleton_method(rb_cFile, "delete", rb_file_s_unlink, -2);
+    rb_define_singleton_method(rb_cFile, "rename", rb_file_s_rename, 2);
+    rb_define_singleton_method(rb_cFile, "umask", rb_file_s_umask, -1);
+    rb_define_singleton_method(rb_cFile, "truncate", rb_file_s_truncate, 2);
+    rb_define_singleton_method(rb_cFile, "expand_path", rb_file_s_expand_path, -1);
+    rb_define_singleton_method(rb_cFile, "basename", rb_file_s_basename, -1);
+    rb_define_singleton_method(rb_cFile, "dirname", rb_file_s_dirname, 1);
+    rb_define_singleton_method(rb_cFile, "extname", rb_file_s_extname, 1);
+
+    separator = rb_obj_freeze(rb_str_new2("/"));
+    rb_define_const(rb_cFile, "Separator", separator);
+    rb_define_const(rb_cFile, "SEPARATOR", separator);
+    rb_define_singleton_method(rb_cFile, "split",  rb_file_s_split, 1);
+    rb_define_singleton_method(rb_cFile, "join",   rb_file_s_join, -2);
+
+#ifdef DOSISH
+    rb_define_const(rb_cFile, "ALT_SEPARATOR", rb_obj_freeze(rb_str_new2("\\")));
+#else
+    rb_define_const(rb_cFile, "ALT_SEPARATOR", Qnil);
+#endif
+    rb_define_const(rb_cFile, "PATH_SEPARATOR", rb_obj_freeze(rb_str_new2(PATH_SEP)));
+
+    rb_define_method(rb_cIO, "stat",  rb_io_stat, 0); /* this is IO's method */
+    rb_define_method(rb_cFile, "lstat",  rb_file_lstat, 0);
+
+    rb_define_method(rb_cFile, "atime", rb_file_atime, 0);
+    rb_define_method(rb_cFile, "mtime", rb_file_mtime, 0);
+    rb_define_method(rb_cFile, "ctime", rb_file_ctime, 0);
+
+    rb_define_method(rb_cFile, "chmod", rb_file_chmod, 1);
+    rb_define_method(rb_cFile, "chown", rb_file_chown, 2);
+    rb_define_method(rb_cFile, "truncate", rb_file_truncate, 1);
+
+    rb_define_method(rb_cFile, "flock", rb_file_flock, 1);
+
+    rb_mFConst = rb_define_module_under(rb_cFile, "Constants");
+    rb_include_module(rb_cIO, rb_mFConst);
+    rb_file_const("LOCK_SH", INT2FIX(LOCK_SH));
+    rb_file_const("LOCK_EX", INT2FIX(LOCK_EX));
+    rb_file_const("LOCK_UN", INT2FIX(LOCK_UN));
+    rb_file_const("LOCK_NB", INT2FIX(LOCK_NB));
+
+    rb_define_method(rb_cFile, "path",  rb_file_path, 0);
+    rb_define_global_function("test", rb_f_test, -1);
+
+    rb_cStat = rb_define_class_under(rb_cFile, "Stat", rb_cObject);
+    rb_define_alloc_func(rb_cStat,  rb_stat_s_alloc);
+    rb_define_method(rb_cStat, "initialize", rb_stat_init, 1);
+    rb_define_method(rb_cStat, "initialize_copy", rb_stat_init_copy, 1);
+
+    rb_include_module(rb_cStat, rb_mComparable);
+
+    rb_define_method(rb_cStat, "<=>", rb_stat_cmp, 1);
+
+    rb_define_method(rb_cStat, "dev", rb_stat_dev, 0);
+    rb_define_method(rb_cStat, "dev_major", rb_stat_dev_major, 0);
+    rb_define_method(rb_cStat, "dev_minor", rb_stat_dev_minor, 0);
+    rb_define_method(rb_cStat, "ino", rb_stat_ino, 0);
+    rb_define_method(rb_cStat, "mode", rb_stat_mode, 0);
+    rb_define_method(rb_cStat, "nlink", rb_stat_nlink, 0);
+    rb_define_method(rb_cStat, "uid", rb_stat_uid, 0);
+    rb_define_method(rb_cStat, "gid", rb_stat_gid, 0);
+    rb_define_method(rb_cStat, "rdev", rb_stat_rdev, 0);
+    rb_define_method(rb_cStat, "rdev_major", rb_stat_rdev_major, 0);
+    rb_define_method(rb_cStat, "rdev_minor", rb_stat_rdev_minor, 0);
+    rb_define_method(rb_cStat, "size", rb_stat_size, 0);
+    rb_define_method(rb_cStat, "blksize", rb_stat_blksize, 0);
+    rb_define_method(rb_cStat, "blocks", rb_stat_blocks, 0);
+    rb_define_method(rb_cStat, "atime", rb_stat_atime, 0);
+    rb_define_method(rb_cStat, "mtime", rb_stat_mtime, 0);
+    rb_define_method(rb_cStat, "ctime", rb_stat_ctime, 0);
+
+    rb_define_method(rb_cStat, "inspect", rb_stat_inspect, 0);
+
+    rb_define_method(rb_cStat, "ftype", rb_stat_ftype, 0);
+
+    rb_define_method(rb_cStat, "directory?",  rb_stat_d, 0);
+    rb_define_method(rb_cStat, "readable?",  rb_stat_r, 0);
+    rb_define_method(rb_cStat, "readable_real?",  rb_stat_R, 0);
+    rb_define_method(rb_cStat, "writable?",  rb_stat_w, 0);
+    rb_define_method(rb_cStat, "writable_real?",  rb_stat_W, 0);
+    rb_define_method(rb_cStat, "executable?",  rb_stat_x, 0);
+    rb_define_method(rb_cStat, "executable_real?",  rb_stat_X, 0);
+    rb_define_method(rb_cStat, "file?",  rb_stat_f, 0);
+    rb_define_method(rb_cStat, "zero?",  rb_stat_z, 0);
+    rb_define_method(rb_cStat, "size?",  rb_stat_s, 0);
+    rb_define_method(rb_cStat, "owned?",  rb_stat_owned, 0);
+    rb_define_method(rb_cStat, "grpowned?",  rb_stat_grpowned, 0);
+
+    rb_define_method(rb_cStat, "pipe?",  rb_stat_p, 0);
+    rb_define_method(rb_cStat, "symlink?",  rb_stat_l, 0);
+    rb_define_method(rb_cStat, "socket?",  rb_stat_S, 0);
+
+    rb_define_method(rb_cStat, "blockdev?",  rb_stat_b, 0);
+    rb_define_method(rb_cStat, "chardev?",  rb_stat_c, 0);
+
+    rb_define_method(rb_cStat, "setuid?",  rb_stat_suid, 0);
+    rb_define_method(rb_cStat, "setgid?",  rb_stat_sgid, 0);
+    rb_define_method(rb_cStat, "sticky?",  rb_stat_sticky, 0);
+}
diff --git a/ruby_1_8_6/gc.c b/ruby_1_8_6/gc.c
new file mode 100644
index 0000000000..9ac3bfbf6f
--- /dev/null
+++ b/ruby_1_8_6/gc.c
@@ -0,0 +1,2093 @@
+/**********************************************************************
+
+  gc.c -
+
+  $Author$
+  $Date$
+  created at: Tue Oct  5 09:44:46 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "rubysig.h"
+#include "st.h"
+#include "node.h"
+#include "env.h"
+#include "re.h"
+#include <stdio.h>
+#include <setjmp.h>
+#include <sys/types.h>
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
+#if defined _WIN32 || defined __CYGWIN__
+#include <windows.h>
+#endif
+
+void re_free_registers _((struct re_registers*));
+void rb_io_fptr_finalize _((struct OpenFile*));
+
+#if !defined(setjmp) && defined(HAVE__SETJMP)
+#define setjmp(env) _setjmp(env)
+#endif
+
+/* Make alloca work the best possible way.  */
+#ifdef __GNUC__
+# ifndef atarist
+#  ifndef alloca
+#   define alloca __builtin_alloca
+#  endif
+# endif /* atarist */
+#else
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifndef _AIX
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+void *alloca ();
+#   endif
+#  endif /* AIX */
+# endif /* HAVE_ALLOCA_H */
+#endif /* __GNUC__ */
+
+#ifndef GC_MALLOC_LIMIT
+#if defined(MSDOS) || defined(__human68k__)
+#define GC_MALLOC_LIMIT 200000
+#else
+#define GC_MALLOC_LIMIT 8000000
+#endif
+#endif
+
+static unsigned long malloc_increase = 0;
+static unsigned long malloc_limit = GC_MALLOC_LIMIT;
+static void run_final();
+static VALUE nomem_error;
+static void garbage_collect();
+
+void
+rb_memerror()
+{
+    static int recurse = 0;
+
+    if (!nomem_error || (recurse > 0 && rb_safe_level() < 4)) {
+	fprintf(stderr, "[FATAL] failed to allocate memory\n");
+	exit(1);
+    }
+    recurse++;
+    rb_exc_raise(nomem_error);
+}
+
+void *
+ruby_xmalloc(size)
+    long size;
+{
+    void *mem;
+
+    if (size < 0) {
+	rb_raise(rb_eNoMemError, "negative allocation size (or too big)");
+    }
+    if (size == 0) size = 1;
+    malloc_increase += size;
+
+    if (malloc_increase > malloc_limit) {
+	garbage_collect();
+    }
+    RUBY_CRITICAL(mem = malloc(size));
+    if (!mem) {
+	garbage_collect();
+	RUBY_CRITICAL(mem = malloc(size));
+	if (!mem) {
+	    rb_memerror();
+	}
+    }
+
+    return mem;
+}
+
+void *
+ruby_xcalloc(n, size)
+    long n, size;
+{
+    void *mem;
+
+    mem = xmalloc(n * size);
+    memset(mem, 0, n * size);
+
+    return mem;
+}
+
+void *
+ruby_xrealloc(ptr, size)
+    void *ptr;
+    long size;
+{
+    void *mem;
+
+    if (size < 0) {
+	rb_raise(rb_eArgError, "negative re-allocation size");
+    }
+    if (!ptr) return xmalloc(size);
+    if (size == 0) size = 1;
+    malloc_increase += size;
+    RUBY_CRITICAL(mem = realloc(ptr, size));
+    if (!mem) {
+	garbage_collect();
+	RUBY_CRITICAL(mem = realloc(ptr, size));
+	if (!mem) {
+	    rb_memerror();
+        }
+    }
+
+    return mem;
+}
+
+void
+ruby_xfree(x)
+    void *x;
+{
+    if (x)
+	RUBY_CRITICAL(free(x));
+}
+
+extern int ruby_in_compile;
+static int dont_gc;
+static int during_gc;
+static int need_call_final = 0;
+static st_table *finalizer_table = 0;
+
+
+/*
+ *  call-seq:
+ *     GC.enable    => true or false
+ *
+ *  Enables garbage collection, returning <code>true</code> if garbage
+ *  collection was previously disabled.
+ *
+ *     GC.disable   #=> false
+ *     GC.enable    #=> true
+ *     GC.enable    #=> false
+ *
+ */
+
+VALUE
+rb_gc_enable()
+{
+    int old = dont_gc;
+
+    dont_gc = Qfalse;
+    return old;
+}
+
+/*
+ *  call-seq:
+ *     GC.disable    => true or false
+ *
+ *  Disables garbage collection, returning <code>true</code> if garbage
+ *  collection was already disabled.
+ *
+ *     GC.disable   #=> false
+ *     GC.disable   #=> true
+ *
+ */
+
+VALUE
+rb_gc_disable()
+{
+    int old = dont_gc;
+
+    dont_gc = Qtrue;
+    return old;
+}
+
+VALUE rb_mGC;
+
+static struct gc_list {
+    VALUE *varptr;
+    struct gc_list *next;
+} *global_List = 0;
+
+void
+rb_gc_register_address(addr)
+    VALUE *addr;
+{
+    struct gc_list *tmp;
+
+    tmp = ALLOC(struct gc_list);
+    tmp->next = global_List;
+    tmp->varptr = addr;
+    global_List = tmp;
+}
+
+void
+rb_gc_unregister_address(addr)
+    VALUE *addr;
+{
+    struct gc_list *tmp = global_List;
+
+    if (tmp->varptr == addr) {
+	global_List = tmp->next;
+	RUBY_CRITICAL(free(tmp));
+	return;
+    }
+    while (tmp->next) {
+	if (tmp->next->varptr == addr) {
+	    struct gc_list *t = tmp->next;
+
+	    tmp->next = tmp->next->next;
+	    RUBY_CRITICAL(free(t));
+	    break;
+	}
+	tmp = tmp->next;
+    }
+}
+
+#undef GC_DEBUG
+
+void
+rb_global_variable(var)
+    VALUE *var;
+{
+    rb_gc_register_address(var);
+}
+
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
+#pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */
+#endif
+
+typedef struct RVALUE {
+    union {
+	struct {
+	    unsigned long flags;	/* always 0 for freed obj */
+	    struct RVALUE *next;
+	} free;
+	struct RBasic  basic;
+	struct RObject object;
+	struct RClass  klass;
+	struct RFloat  flonum;
+	struct RString string;
+	struct RArray  array;
+	struct RRegexp regexp;
+	struct RHash   hash;
+	struct RData   data;
+	struct RStruct rstruct;
+	struct RBignum bignum;
+	struct RFile   file;
+	struct RNode   node;
+	struct RMatch  match;
+	struct RVarmap varmap;
+	struct SCOPE   scope;
+    } as;
+#ifdef GC_DEBUG
+    char *file;
+    int   line;
+#endif
+} RVALUE;
+
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
+#pragma pack(pop)
+#endif
+
+static RVALUE *freelist = 0;
+static RVALUE *deferred_final_list = 0;
+
+#define HEAPS_INCREMENT 10
+static struct heaps_slot {
+    void *membase;
+    RVALUE *slot;
+    int limit;
+} *heaps;
+static int heaps_length = 0;
+static int heaps_used   = 0;
+
+#define HEAP_MIN_SLOTS 10000
+static int heap_slots = HEAP_MIN_SLOTS;
+
+#define FREE_MIN  4096
+
+static RVALUE *himem, *lomem;
+
+static void
+add_heap()
+{
+    RVALUE *p, *pend;
+
+    if (heaps_used == heaps_length) {
+	/* Realloc heaps */
+	struct heaps_slot *p;
+	int length;
+
+	heaps_length += HEAPS_INCREMENT;
+	length = heaps_length*sizeof(struct heaps_slot);
+	RUBY_CRITICAL(
+	    if (heaps_used > 0) {
+		p = (struct heaps_slot *)realloc(heaps, length);
+		if (p) heaps = p;
+	    }
+	    else {
+		p = heaps = (struct heaps_slot *)malloc(length);
+	    });
+	if (p == 0) rb_memerror();
+    }
+
+    for (;;) {
+	RUBY_CRITICAL(p = (RVALUE*)malloc(sizeof(RVALUE)*(heap_slots+1)));
+	if (p == 0) {
+	    if (heap_slots == HEAP_MIN_SLOTS) {
+		rb_memerror();
+	    }
+	    heap_slots = HEAP_MIN_SLOTS;
+	    continue;
+	}
+        heaps[heaps_used].membase = p;
+        if ((VALUE)p % sizeof(RVALUE) == 0)
+            heap_slots += 1;
+        else
+            p = (RVALUE*)((VALUE)p + sizeof(RVALUE) - ((VALUE)p % sizeof(RVALUE)));
+        heaps[heaps_used].slot = p;
+        heaps[heaps_used].limit = heap_slots;
+	break;
+    }
+    pend = p + heap_slots;
+    if (lomem == 0 || lomem > p) lomem = p;
+    if (himem < pend) himem = pend;
+    heaps_used++;
+    heap_slots *= 1.8;
+    if (heap_slots <= 0) heap_slots = HEAP_MIN_SLOTS;
+
+    while (p < pend) {
+	p->as.free.flags = 0;
+	p->as.free.next = freelist;
+	freelist = p;
+	p++;
+    }
+}
+#define RANY(o) ((RVALUE*)(o))
+
+VALUE
+rb_newobj()
+{
+    VALUE obj;
+
+    if (!freelist) garbage_collect();
+
+    obj = (VALUE)freelist;
+    freelist = freelist->as.free.next;
+    MEMZERO((void*)obj, RVALUE, 1);
+#ifdef GC_DEBUG
+    RANY(obj)->file = ruby_sourcefile;
+    RANY(obj)->line = ruby_sourceline;
+#endif
+    return obj;
+}
+
+VALUE
+rb_data_object_alloc(klass, datap, dmark, dfree)
+    VALUE klass;
+    void *datap;
+    RUBY_DATA_FUNC dmark;
+    RUBY_DATA_FUNC dfree;
+{
+    NEWOBJ(data, struct RData);
+    if (klass) Check_Type(klass, T_CLASS);
+    OBJSETUP(data, klass, T_DATA);
+    data->data = datap;
+    data->dfree = dfree;
+    data->dmark = dmark;
+
+    return (VALUE)data;
+}
+
+extern st_table *rb_class_tbl;
+VALUE *rb_gc_stack_start = 0;
+#ifdef __ia64
+VALUE *rb_gc_register_stack_start = 0;
+#endif
+
+#ifdef DJGPP
+/* set stack size (http://www.delorie.com/djgpp/v2faq/faq15_9.html) */
+unsigned int _stklen = 0x180000; /* 1.5 kB */
+#endif
+
+#if defined(DJGPP) || defined(_WIN32_WCE)
+static unsigned int STACK_LEVEL_MAX = 65535;
+#elif defined(__human68k__)
+unsigned int _stacksize = 262144;
+# define STACK_LEVEL_MAX (_stacksize - 4096)
+# undef HAVE_GETRLIMIT
+#elif defined(HAVE_GETRLIMIT) || defined(_WIN32)
+static unsigned int STACK_LEVEL_MAX = 655300;
+#else
+# define STACK_LEVEL_MAX 655300
+#endif
+
+#ifdef C_ALLOCA
+# define SET_STACK_END VALUE stack_end; alloca(0);
+# define STACK_END (&stack_end)
+#else
+# if defined(__GNUC__) && defined(USE_BUILTIN_FRAME_ADDRESS) && !defined(__ia64)
+#  if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
+__attribute__ ((noinline))
+#  endif
+static VALUE *
+stack_end_address(void)
+{
+    return (VALUE *)__builtin_frame_address(0);
+}
+#  define  SET_STACK_END    VALUE *stack_end = stack_end_address()
+# else
+#  define  SET_STACK_END    VALUE *stack_end = alloca(1)
+# endif
+# define STACK_END (stack_end)
+#endif
+#if defined(sparc) || defined(__sparc__)
+# define STACK_LENGTH  (rb_gc_stack_start - STACK_END + 0x80)
+#elif STACK_GROW_DIRECTION < 0
+# define STACK_LENGTH  (rb_gc_stack_start - STACK_END)
+#elif STACK_GROW_DIRECTION > 0
+# define STACK_LENGTH  (STACK_END - rb_gc_stack_start + 1)
+#else
+# define STACK_LENGTH  ((STACK_END < rb_gc_stack_start) ? rb_gc_stack_start - STACK_END\
+                                           : STACK_END - rb_gc_stack_start + 1)
+#endif
+#if STACK_GROW_DIRECTION > 0
+# define STACK_UPPER(x, a, b) a
+#elif STACK_GROW_DIRECTION < 0
+# define STACK_UPPER(x, a, b) b
+#else
+static int grow_direction;
+static int
+stack_grow_direction(addr)
+    VALUE *addr;
+{
+    SET_STACK_END;
+
+    if (STACK_END > addr) return grow_direction = 1;
+    return grow_direction = -1;
+}
+# define stack_growup_p(x) ((grow_direction ? grow_direction : stack_grow_direction(x)) > 0)
+# define STACK_UPPER(x, a, b) (stack_growup_p(x) ? a : b)
+#endif
+
+#define GC_WATER_MARK 512
+
+#define CHECK_STACK(ret) do {\
+    SET_STACK_END;\
+    (ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK);\
+} while (0)
+
+int
+ruby_stack_length(p)
+    VALUE **p;
+{
+    SET_STACK_END;
+    if (p) *p = STACK_UPPER(STACK_END, rb_gc_stack_start, STACK_END);
+    return STACK_LENGTH;
+}
+
+int
+ruby_stack_check()
+{
+    int ret;
+
+    CHECK_STACK(ret);
+    return ret;
+}
+
+#define MARK_STACK_MAX 1024
+static VALUE mark_stack[MARK_STACK_MAX];
+static VALUE *mark_stack_ptr;
+static int mark_stack_overflow;
+
+static void
+init_mark_stack()
+{
+    mark_stack_overflow = 0;
+    mark_stack_ptr = mark_stack;
+}
+
+#define MARK_STACK_EMPTY (mark_stack_ptr == mark_stack)
+            
+static st_table *source_filenames;
+
+char *
+rb_source_filename(f)
+    const char *f;
+{
+    char *name;
+
+    if (!st_lookup(source_filenames, (st_data_t)f, (st_data_t *)&name)) {
+	long len = strlen(f) + 1;
+	char *ptr = name = ALLOC_N(char, len + 1);
+	*ptr++ = 0;
+	MEMCPY(ptr, f, char, len);
+	st_add_direct(source_filenames, (st_data_t)ptr, (st_data_t)name);
+	return ptr;
+    }
+    return name + 1;
+}
+
+static void
+mark_source_filename(f)
+    char *f;
+{
+    if (f) {
+	f[-1] = 1;
+    }
+}
+
+static int
+sweep_source_filename(key, value)
+    char *key, *value;
+{
+    if (*value) {
+	*value = 0;
+	return ST_CONTINUE;
+    }
+    else {
+	free(value);
+	return ST_DELETE;
+    }
+}
+
+static void gc_mark _((VALUE ptr, int lev));
+static void gc_mark_children _((VALUE ptr, int lev));
+
+static void
+gc_mark_all()
+{
+    RVALUE *p, *pend;
+    int i;
+
+    init_mark_stack();
+    for (i = 0; i < heaps_used; i++) {
+	p = heaps[i].slot; pend = p + heaps[i].limit;
+	while (p < pend) {
+	    if ((p->as.basic.flags & FL_MARK) &&
+		(p->as.basic.flags != FL_MARK)) {
+		gc_mark_children((VALUE)p, 0);
+	    }
+	    p++;
+	}
+    }
+}
+
+static void
+gc_mark_rest()
+{
+    VALUE tmp_arry[MARK_STACK_MAX];
+    VALUE *p;
+
+    p = (mark_stack_ptr - mark_stack) + tmp_arry;
+    MEMCPY(tmp_arry, mark_stack, VALUE, MARK_STACK_MAX);
+
+    init_mark_stack();
+    while(p != tmp_arry){
+	p--;
+	gc_mark_children(*p, 0);
+    }
+}
+
+static inline int
+is_pointer_to_heap(ptr)
+    void *ptr;
+{
+    register RVALUE *p = RANY(ptr);
+    register RVALUE *heap_org;
+    register long i;
+
+    if (p < lomem || p > himem) return Qfalse;
+    if ((VALUE)p % sizeof(RVALUE) != 0) return Qfalse;
+
+    /* check if p looks like a pointer */
+    for (i=0; i < heaps_used; i++) {
+	heap_org = heaps[i].slot;
+	if (heap_org <= p && p < heap_org + heaps[i].limit)
+	    return Qtrue;
+    }
+    return Qfalse;
+}
+
+static void
+mark_locations_array(x, n)
+    register VALUE *x;
+    register long n;
+{
+    VALUE v;
+    while (n--) {
+        v = *x;
+	if (is_pointer_to_heap((void *)v)) {
+	    gc_mark(v, 0);
+	}
+	x++;
+    }
+}
+
+void
+rb_gc_mark_locations(start, end)
+    VALUE *start, *end;
+{
+    long n;
+
+    n = end - start;
+    mark_locations_array(start,n);
+}
+
+static int
+mark_entry(key, value, lev)
+    ID key;
+    VALUE value;
+    int lev;
+{
+    gc_mark(value, lev);
+    return ST_CONTINUE;
+}
+
+static void
+mark_tbl(tbl, lev)
+    st_table *tbl;
+    int lev;
+{
+    if (!tbl) return;
+    st_foreach(tbl, mark_entry, lev);
+}
+
+void
+rb_mark_tbl(tbl)
+    st_table *tbl;
+{
+    mark_tbl(tbl, 0);
+}
+
+static int
+mark_keyvalue(key, value, lev)
+    VALUE key;
+    VALUE value;
+    int lev;
+{
+    gc_mark(key, lev);
+    gc_mark(value, lev);
+    return ST_CONTINUE;
+}
+
+static void
+mark_hash(tbl, lev)
+    st_table *tbl;
+    int lev;
+{
+    if (!tbl) return;
+    st_foreach(tbl, mark_keyvalue, lev);
+}
+
+void
+rb_mark_hash(tbl)
+    st_table *tbl;
+{
+    mark_hash(tbl, 0);
+}
+
+void
+rb_gc_mark_maybe(obj)
+    VALUE obj;
+{
+    if (is_pointer_to_heap((void *)obj)) {
+	gc_mark(obj, 0);
+    }
+}
+
+#define GC_LEVEL_MAX 250
+
+static void
+gc_mark(ptr, lev)
+    VALUE ptr;
+    int lev;
+{
+    register RVALUE *obj;
+
+    obj = RANY(ptr);
+    if (rb_special_const_p(ptr)) return; /* special const not marked */
+    if (obj->as.basic.flags == 0) return;       /* free cell */
+    if (obj->as.basic.flags & FL_MARK) return;  /* already marked */
+    obj->as.basic.flags |= FL_MARK;
+
+    if (lev > GC_LEVEL_MAX || (lev == 0 && ruby_stack_check())) {
+	if (!mark_stack_overflow) {
+	    if (mark_stack_ptr - mark_stack < MARK_STACK_MAX) {
+		*mark_stack_ptr = ptr;
+		mark_stack_ptr++;		
+	    }
+	    else {
+		mark_stack_overflow = 1;
+	    }
+	}
+	return;
+    }
+    gc_mark_children(ptr, lev+1);
+}
+
+void
+rb_gc_mark(ptr)
+    VALUE ptr;
+{
+    gc_mark(ptr, 0);
+}
+
+static void
+gc_mark_children(ptr, lev)
+    VALUE ptr;
+    int lev;
+{
+    register RVALUE *obj = RANY(ptr);
+
+    goto marking;		/* skip */
+
+  again:
+    obj = RANY(ptr);
+    if (rb_special_const_p(ptr)) return; /* special const not marked */
+    if (obj->as.basic.flags == 0) return;       /* free cell */
+    if (obj->as.basic.flags & FL_MARK) return;  /* already marked */
+    obj->as.basic.flags |= FL_MARK;
+
+  marking:
+    if (FL_TEST(obj, FL_EXIVAR)) {
+	rb_mark_generic_ivar(ptr);
+    }
+
+    switch (obj->as.basic.flags & T_MASK) {
+      case T_NIL:
+      case T_FIXNUM:
+	rb_bug("rb_gc_mark() called for broken object");
+	break;
+
+      case T_NODE:
+	mark_source_filename(obj->as.node.nd_file);
+	switch (nd_type(obj)) {
+	  case NODE_IF:		/* 1,2,3 */
+	  case NODE_FOR:
+	  case NODE_ITER:
+	  case NODE_CREF:
+	  case NODE_WHEN:
+	  case NODE_MASGN:
+	  case NODE_RESCUE:
+	  case NODE_RESBODY:
+	  case NODE_CLASS:
+	    gc_mark((VALUE)obj->as.node.u2.node, lev);
+	    /* fall through */
+	  case NODE_BLOCK:	/* 1,3 */
+	  case NODE_ARRAY:
+	  case NODE_DSTR:
+	  case NODE_DXSTR:
+	  case NODE_DREGX:
+	  case NODE_DREGX_ONCE:
+	  case NODE_FBODY:
+	  case NODE_ENSURE:
+	  case NODE_CALL:
+	  case NODE_DEFS:
+	  case NODE_OP_ASGN1:
+	    gc_mark((VALUE)obj->as.node.u1.node, lev);
+	    /* fall through */
+	  case NODE_SUPER:	/* 3 */
+	  case NODE_FCALL:
+	  case NODE_DEFN:
+	  case NODE_NEWLINE:
+	    ptr = (VALUE)obj->as.node.u3.node;
+	    goto again;
+
+	  case NODE_WHILE:	/* 1,2 */
+	  case NODE_UNTIL:
+	  case NODE_AND:
+	  case NODE_OR:
+	  case NODE_CASE:
+	  case NODE_SCLASS:
+	  case NODE_DOT2:
+	  case NODE_DOT3:
+	  case NODE_FLIP2:
+	  case NODE_FLIP3:
+	  case NODE_MATCH2:
+	  case NODE_MATCH3:
+	  case NODE_OP_ASGN_OR:
+	  case NODE_OP_ASGN_AND:
+	  case NODE_MODULE:
+	  case NODE_ALIAS:
+	  case NODE_VALIAS:
+	  case NODE_ARGS:
+	    gc_mark((VALUE)obj->as.node.u1.node, lev);
+	    /* fall through */
+	  case NODE_METHOD:	/* 2 */
+	  case NODE_NOT:
+	  case NODE_GASGN:
+	  case NODE_LASGN:
+	  case NODE_DASGN:
+	  case NODE_DASGN_CURR:
+	  case NODE_IASGN:
+	  case NODE_CVDECL:
+	  case NODE_CVASGN:
+	  case NODE_COLON3:
+	  case NODE_OPT_N:
+	  case NODE_EVSTR:
+	  case NODE_UNDEF:
+	    ptr = (VALUE)obj->as.node.u2.node;
+	    goto again;
+
+	  case NODE_HASH:	/* 1 */
+	  case NODE_LIT:
+	  case NODE_STR:
+	  case NODE_XSTR:
+	  case NODE_DEFINED:
+	  case NODE_MATCH:
+	  case NODE_RETURN:
+	  case NODE_BREAK:
+	  case NODE_NEXT:
+	  case NODE_YIELD:
+	  case NODE_COLON2:
+	  case NODE_SPLAT:
+	  case NODE_TO_ARY:
+	  case NODE_SVALUE:
+	    ptr = (VALUE)obj->as.node.u1.node;
+	    goto again;
+
+	  case NODE_SCOPE:	/* 2,3 */
+	  case NODE_BLOCK_PASS:
+	  case NODE_CDECL:
+	    gc_mark((VALUE)obj->as.node.u3.node, lev);
+	    ptr = (VALUE)obj->as.node.u2.node;
+	    goto again;
+
+	  case NODE_ZARRAY:	/* - */
+	  case NODE_ZSUPER:
+	  case NODE_CFUNC:
+	  case NODE_VCALL:
+	  case NODE_GVAR:
+	  case NODE_LVAR:
+	  case NODE_DVAR:
+	  case NODE_IVAR:
+	  case NODE_CVAR:
+	  case NODE_NTH_REF:
+	  case NODE_BACK_REF:
+	  case NODE_REDO:
+	  case NODE_RETRY:
+	  case NODE_SELF:
+	  case NODE_NIL:
+	  case NODE_TRUE:
+	  case NODE_FALSE:
+	  case NODE_ATTRSET:
+	  case NODE_BLOCK_ARG:
+	  case NODE_POSTEXE:
+	    break;
+	  case NODE_ALLOCA:
+	    mark_locations_array((VALUE*)obj->as.node.u1.value,
+				 obj->as.node.u3.cnt);
+	    ptr = (VALUE)obj->as.node.u2.node;
+	    goto again;
+
+	  default:		/* unlisted NODE */
+	    if (is_pointer_to_heap(obj->as.node.u1.node)) {
+		gc_mark((VALUE)obj->as.node.u1.node, lev);
+	    }
+	    if (is_pointer_to_heap(obj->as.node.u2.node)) {
+		gc_mark((VALUE)obj->as.node.u2.node, lev);
+	    }
+	    if (is_pointer_to_heap(obj->as.node.u3.node)) {
+		gc_mark((VALUE)obj->as.node.u3.node, lev);
+	    }
+	}
+	return;			/* no need to mark class. */
+    }
+
+    gc_mark(obj->as.basic.klass, lev);
+    switch (obj->as.basic.flags & T_MASK) {
+      case T_ICLASS:
+      case T_CLASS:
+      case T_MODULE:
+	mark_tbl(obj->as.klass.m_tbl, lev);
+	mark_tbl(obj->as.klass.iv_tbl, lev);
+	ptr = obj->as.klass.super;
+	goto again;
+
+      case T_ARRAY:
+	if (FL_TEST(obj, ELTS_SHARED)) {
+	    ptr = obj->as.array.aux.shared;
+	    goto again;
+	}
+	else {
+	    long i, len = obj->as.array.len;
+	    VALUE *ptr = obj->as.array.ptr;
+
+	    for (i=0; i < len; i++) {
+		gc_mark(*ptr++, lev);
+	    }
+	}
+	break;
+
+      case T_HASH:
+	mark_hash(obj->as.hash.tbl, lev);
+	ptr = obj->as.hash.ifnone;
+	goto again;
+
+      case T_STRING:
+#define STR_ASSOC FL_USER3   /* copied from string.c */
+	if (FL_TEST(obj, ELTS_SHARED|STR_ASSOC)) {
+	    ptr = obj->as.string.aux.shared;
+	    goto again;
+	}
+	break;
+
+      case T_DATA:
+	if (obj->as.data.dmark) (*obj->as.data.dmark)(DATA_PTR(obj));
+	break;
+
+      case T_OBJECT:
+	mark_tbl(obj->as.object.iv_tbl, lev);
+	break;
+
+      case T_FILE:
+      case T_REGEXP:
+      case T_FLOAT:
+      case T_BIGNUM:
+      case T_BLKTAG:
+	break;
+
+      case T_MATCH:
+	if (obj->as.match.str) {
+	    ptr = obj->as.match.str;
+	    goto again;
+	}
+	break;
+
+      case T_VARMAP:
+	gc_mark(obj->as.varmap.val, lev);
+	ptr = (VALUE)obj->as.varmap.next;
+	goto again;
+
+      case T_SCOPE:
+	if (obj->as.scope.local_vars && (obj->as.scope.flags & SCOPE_MALLOC)) {
+	    int n = obj->as.scope.local_tbl[0]+1;
+	    VALUE *vars = &obj->as.scope.local_vars[-1];
+
+	    while (n--) {
+		gc_mark(*vars++, lev);
+	    }
+	}
+	break;
+
+      case T_STRUCT:
+	{
+	    long len = obj->as.rstruct.len;
+	    VALUE *ptr = obj->as.rstruct.ptr;
+
+	    while (len--) {
+		gc_mark(*ptr++, lev);
+	    }
+	}
+	break;
+
+      default:
+	rb_bug("rb_gc_mark(): unknown data type 0x%lx(0x%lx) %s",
+	       obj->as.basic.flags & T_MASK, obj,
+	       is_pointer_to_heap(obj) ? "corrupted object" : "non object");
+    }
+}
+
+static void obj_free _((VALUE));
+
+static void
+finalize_list(p)
+    RVALUE *p;
+{
+    while (p) {
+	RVALUE *tmp = p->as.free.next;
+	run_final((VALUE)p);
+	if (!FL_TEST(p, FL_SINGLETON)) { /* not freeing page */
+	    p->as.free.flags = 0;
+	    p->as.free.next = freelist;
+	    freelist = p;
+	}
+	p = tmp;
+    }
+}
+
+static void
+free_unused_heaps()
+{
+    int i, j;
+
+    for (i = j = 1; j < heaps_used; i++) {
+	if (heaps[i].limit == 0) {
+	    free(heaps[i].membase);
+	    heaps_used--;
+	}
+	else {
+	    if (i != j) {
+		heaps[j] = heaps[i];
+	    }
+	    j++;
+	}
+    }
+}
+
+void rb_gc_abort_threads(void);
+
+static void
+gc_sweep()
+{
+    RVALUE *p, *pend, *final_list;
+    int freed = 0;
+    int i;
+    unsigned long live = 0;
+    unsigned long free_min = 0;
+
+    for (i = 0; i < heaps_used; i++) {
+        free_min += heaps[i].limit;
+    }
+    free_min = free_min * 0.2;
+    if (free_min < FREE_MIN)
+        free_min = FREE_MIN;
+
+    if (ruby_in_compile && ruby_parser_stack_on_heap()) {
+	/* should not reclaim nodes during compilation
+           if yacc's semantic stack is not allocated on machine stack */
+	for (i = 0; i < heaps_used; i++) {
+	    p = heaps[i].slot; pend = p + heaps[i].limit;
+	    while (p < pend) {
+		if (!(p->as.basic.flags&FL_MARK) && BUILTIN_TYPE(p) == T_NODE)
+		    gc_mark((VALUE)p, 0);
+		p++;
+	    }
+	}
+    }
+
+    mark_source_filename(ruby_sourcefile);
+    if (source_filenames) {
+        st_foreach(source_filenames, sweep_source_filename, 0);
+    }
+
+    freelist = 0;
+    final_list = deferred_final_list;
+    deferred_final_list = 0;
+    for (i = 0; i < heaps_used; i++) {
+	int n = 0;
+	RVALUE *free = freelist;
+	RVALUE *final = final_list;
+
+	p = heaps[i].slot; pend = p + heaps[i].limit;
+	while (p < pend) {
+	    if (!(p->as.basic.flags & FL_MARK)) {
+		if (p->as.basic.flags) {
+		    obj_free((VALUE)p);
+		}
+		if (need_call_final && FL_TEST(p, FL_FINALIZE)) {
+		    p->as.free.flags = FL_MARK; /* remain marked */
+		    p->as.free.next = final_list;
+		    final_list = p;
+		}
+		else {
+		    p->as.free.flags = 0;
+		    p->as.free.next = freelist;
+		    freelist = p;
+		}
+		n++;
+	    }
+	    else if (RBASIC(p)->flags == FL_MARK) {
+		/* objects to be finalized */
+		/* do nothing remain marked */
+	    }
+	    else {
+		RBASIC(p)->flags &= ~FL_MARK;
+		live++;
+	    }
+	    p++;
+	}
+	if (n == heaps[i].limit && freed > free_min) {
+	    RVALUE *pp;
+
+	    heaps[i].limit = 0;
+	    for (pp = final_list; pp != final; pp = pp->as.free.next) {
+		pp->as.free.flags |= FL_SINGLETON; /* freeing page mark */
+	    }
+	    freelist = free;	/* cancel this page from freelist */
+	}
+	else {
+	    freed += n;
+	}
+    }
+    if (malloc_increase > malloc_limit) {
+	malloc_limit += (malloc_increase - malloc_limit) * (double)live / (live + freed);
+	if (malloc_limit < GC_MALLOC_LIMIT) malloc_limit = GC_MALLOC_LIMIT;
+    }
+    malloc_increase = 0;
+    if (freed < free_min) {
+	add_heap();
+    }
+    during_gc = 0;
+
+    /* clear finalization list */
+    if (final_list) {
+	deferred_final_list = final_list;
+	return;
+    }
+    free_unused_heaps();
+}
+
+void
+rb_gc_force_recycle(p)
+    VALUE p;
+{
+    RANY(p)->as.free.flags = 0;
+    RANY(p)->as.free.next = freelist;
+    freelist = RANY(p);
+}
+
+static void
+obj_free(obj)
+    VALUE obj;
+{
+    switch (RANY(obj)->as.basic.flags & T_MASK) {
+      case T_NIL:
+      case T_FIXNUM:
+      case T_TRUE:
+      case T_FALSE:
+	rb_bug("obj_free() called for broken object");
+	break;
+    }
+
+    if (FL_TEST(obj, FL_EXIVAR)) {
+	rb_free_generic_ivar((VALUE)obj);
+    }
+
+    switch (RANY(obj)->as.basic.flags & T_MASK) {
+      case T_OBJECT:
+	if (RANY(obj)->as.object.iv_tbl) {
+	    st_free_table(RANY(obj)->as.object.iv_tbl);
+	}
+	break;
+      case T_MODULE:
+      case T_CLASS:
+	rb_clear_cache_by_class((VALUE)obj);
+	st_free_table(RANY(obj)->as.klass.m_tbl);
+	if (RANY(obj)->as.object.iv_tbl) {
+	    st_free_table(RANY(obj)->as.object.iv_tbl);
+	}
+	break;
+      case T_STRING:
+	if (RANY(obj)->as.string.ptr && !FL_TEST(obj, ELTS_SHARED)) {
+	    RUBY_CRITICAL(free(RANY(obj)->as.string.ptr));
+	}
+	break;
+      case T_ARRAY:
+	if (RANY(obj)->as.array.ptr && !FL_TEST(obj, ELTS_SHARED)) {
+	    RUBY_CRITICAL(free(RANY(obj)->as.array.ptr));
+	}
+	break;
+      case T_HASH:
+	if (RANY(obj)->as.hash.tbl) {
+	    st_free_table(RANY(obj)->as.hash.tbl);
+	}
+	break;
+      case T_REGEXP:
+	if (RANY(obj)->as.regexp.ptr) {
+	    re_free_pattern(RANY(obj)->as.regexp.ptr);
+	}
+	if (RANY(obj)->as.regexp.str) {
+	    RUBY_CRITICAL(free(RANY(obj)->as.regexp.str));
+	}
+	break;
+      case T_DATA:
+	if (DATA_PTR(obj)) {
+	    if ((long)RANY(obj)->as.data.dfree == -1) {
+		RUBY_CRITICAL(free(DATA_PTR(obj)));
+	    }
+	    else if (RANY(obj)->as.data.dfree) {
+		(*RANY(obj)->as.data.dfree)(DATA_PTR(obj));
+	    }
+	}
+	break;
+      case T_MATCH:
+	if (RANY(obj)->as.match.regs) {
+	    re_free_registers(RANY(obj)->as.match.regs);
+	    RUBY_CRITICAL(free(RANY(obj)->as.match.regs));
+	}
+	break;
+      case T_FILE:
+	if (RANY(obj)->as.file.fptr) {
+	    rb_io_fptr_finalize(RANY(obj)->as.file.fptr);
+	    RUBY_CRITICAL(free(RANY(obj)->as.file.fptr));
+	}
+	break;
+      case T_ICLASS:
+	/* iClass shares table with the module */
+	break;
+
+      case T_FLOAT:
+      case T_VARMAP:
+      case T_BLKTAG:
+	break;
+
+      case T_BIGNUM:
+	if (RANY(obj)->as.bignum.digits) {
+	    RUBY_CRITICAL(free(RANY(obj)->as.bignum.digits));
+	}
+	break;
+      case T_NODE:
+	switch (nd_type(obj)) {
+	  case NODE_SCOPE:
+	    if (RANY(obj)->as.node.u1.tbl) {
+		RUBY_CRITICAL(free(RANY(obj)->as.node.u1.tbl));
+	    }
+	    break;
+	  case NODE_ALLOCA:
+	    RUBY_CRITICAL(free(RANY(obj)->as.node.u1.node));
+	    break;
+	}
+	return;			/* no need to free iv_tbl */
+
+      case T_SCOPE:
+	if (RANY(obj)->as.scope.local_vars &&
+            RANY(obj)->as.scope.flags != SCOPE_ALLOCA) {
+	    VALUE *vars = RANY(obj)->as.scope.local_vars-1;
+           if (!(RANY(obj)->as.scope.flags & SCOPE_CLONE) && vars[0] == 0)
+		RUBY_CRITICAL(free(RANY(obj)->as.scope.local_tbl));
+	    if (RANY(obj)->as.scope.flags & SCOPE_MALLOC)
+		RUBY_CRITICAL(free(vars));
+	}
+	break;
+
+      case T_STRUCT:
+	if (RANY(obj)->as.rstruct.ptr) {
+	    RUBY_CRITICAL(free(RANY(obj)->as.rstruct.ptr));
+	}
+	break;
+
+      default:
+	rb_bug("gc_sweep(): unknown data type 0x%lx(0x%lx)",
+	       RANY(obj)->as.basic.flags & T_MASK, obj);
+    }
+}
+
+void
+rb_gc_mark_frame(frame)
+    struct FRAME *frame;
+{
+    gc_mark((VALUE)frame->node, 0);
+}
+
+#ifdef __GNUC__
+#if defined(__human68k__) || defined(DJGPP)
+#if defined(__human68k__)
+typedef unsigned long rb_jmp_buf[8];
+__asm__ (".even\n\
+_rb_setjmp:\n\
+	move.l	4(sp),a0\n\
+	movem.l	d3-d7/a3-a5,(a0)\n\
+	moveq.l	#0,d0\n\
+	rts");
+#ifdef setjmp
+#undef setjmp
+#endif
+#else
+#if defined(DJGPP)
+typedef unsigned long rb_jmp_buf[6];
+__asm__ (".align 4\n\
+_rb_setjmp:\n\
+	pushl	%ebp\n\
+	movl	%esp,%ebp\n\
+	movl	8(%ebp),%ebp\n\
+	movl	%eax,(%ebp)\n\
+	movl	%ebx,4(%ebp)\n\
+	movl	%ecx,8(%ebp)\n\
+	movl	%edx,12(%ebp)\n\
+	movl	%esi,16(%ebp)\n\
+	movl	%edi,20(%ebp)\n\
+	popl	%ebp\n\
+	xorl	%eax,%eax\n\
+	ret");
+#endif
+#endif
+int rb_setjmp (rb_jmp_buf);
+#define jmp_buf rb_jmp_buf
+#define setjmp rb_setjmp
+#endif /* __human68k__ or DJGPP */
+#endif /* __GNUC__ */
+
+static void
+garbage_collect()
+{
+    struct gc_list *list;
+    struct FRAME * volatile frame; /* gcc 2.7.2.3 -O2 bug??  */
+    jmp_buf save_regs_gc_mark;
+    SET_STACK_END;
+
+#ifdef HAVE_NATIVETHREAD
+    if (!is_ruby_native_thread()) {
+	rb_bug("cross-thread violation on rb_gc()");
+    }
+#endif
+    if (dont_gc || during_gc) {
+	if (!freelist) {
+	    add_heap();
+	}
+	return;
+    }
+    if (during_gc) return;
+    during_gc++;
+
+    init_mark_stack();
+
+    gc_mark((VALUE)ruby_current_node, 0);
+
+    /* mark frame stack */
+    for (frame = ruby_frame; frame; frame = frame->prev) {
+	rb_gc_mark_frame(frame);
+	if (frame->tmp) {
+	    struct FRAME *tmp = frame->tmp;
+	    while (tmp) {
+		rb_gc_mark_frame(tmp);
+		tmp = tmp->prev;
+	    }
+	}
+    }
+    gc_mark((VALUE)ruby_scope, 0);
+    gc_mark((VALUE)ruby_dyna_vars, 0);
+    if (finalizer_table) {
+	mark_tbl(finalizer_table, 0);
+    }
+
+    FLUSH_REGISTER_WINDOWS;
+    /* This assumes that all registers are saved into the jmp_buf (and stack) */
+    setjmp(save_regs_gc_mark);
+    mark_locations_array((VALUE*)save_regs_gc_mark, sizeof(save_regs_gc_mark) / sizeof(VALUE *));
+#if STACK_GROW_DIRECTION < 0
+    rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start);
+#elif STACK_GROW_DIRECTION > 0
+    rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1);
+#else
+    if ((VALUE*)STACK_END < rb_gc_stack_start)
+	rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start);
+    else
+	rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1);
+#endif
+#ifdef __ia64
+    /* mark backing store (flushed register window on the stack) */
+    /* the basic idea from guile GC code                         */
+    rb_gc_mark_locations(rb_gc_register_stack_start, (VALUE*)rb_ia64_bsp());
+#endif
+#if defined(__human68k__) || defined(__mc68000__)
+    rb_gc_mark_locations((VALUE*)((char*)STACK_END + 2),
+			 (VALUE*)((char*)rb_gc_stack_start + 2));
+#endif
+    rb_gc_mark_threads();
+
+    /* mark protected global variables */
+    for (list = global_List; list; list = list->next) {
+	rb_gc_mark_maybe(*list->varptr);
+    }
+    rb_mark_end_proc();
+    rb_gc_mark_global_tbl();
+
+    rb_mark_tbl(rb_class_tbl);
+    rb_gc_mark_trap_list();
+
+    /* mark generic instance variables for special constants */
+    rb_mark_generic_ivar_tbl();
+
+    rb_gc_mark_parser();
+
+    /* gc_mark objects whose marking are not completed*/
+    do {
+	while (!MARK_STACK_EMPTY) {
+	    if (mark_stack_overflow){
+		gc_mark_all();
+	    }
+	    else {
+		gc_mark_rest();
+	    }
+	}
+	rb_gc_abort_threads();
+    } while (!MARK_STACK_EMPTY);
+
+    gc_sweep();
+}
+
+void
+rb_gc()
+{
+    garbage_collect();
+    rb_gc_finalize_deferred();
+}
+
+/*
+ *  call-seq:
+ *     GC.start                     => nil
+ *     gc.garbage_collect           => nil
+ *     ObjectSpace.garbage_collect  => nil
+ *
+ *  Initiates garbage collection, unless manually disabled.
+ *
+ */
+
+VALUE
+rb_gc_start()
+{
+    rb_gc();
+    return Qnil;
+}
+
+void
+ruby_set_stack_size(size)
+    size_t size;
+{
+#ifndef STACK_LEVEL_MAX
+    STACK_LEVEL_MAX = size / sizeof(VALUE);
+#endif
+}
+
+void
+Init_stack(addr)
+    VALUE *addr;
+{
+#ifdef __ia64
+    if (rb_gc_register_stack_start == 0) {
+# if defined(__FreeBSD__)
+        /*
+         * FreeBSD/ia64 currently does not have a way for a process to get the
+         * base address for the RSE backing store, so hardcode it.
+         */
+        rb_gc_register_stack_start = (4ULL<<61);
+# elif defined(HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE)
+#  pragma weak __libc_ia64_register_backing_store_base
+        extern unsigned long __libc_ia64_register_backing_store_base;
+        rb_gc_register_stack_start = (VALUE*)__libc_ia64_register_backing_store_base;
+# endif
+    }
+    {
+        VALUE *bsp = (VALUE*)rb_ia64_bsp();
+        if (rb_gc_register_stack_start == 0 ||
+            bsp < rb_gc_register_stack_start) {
+            rb_gc_register_stack_start = bsp;
+        }
+    }
+#endif
+#if defined(_WIN32) || defined(__CYGWIN__)
+    MEMORY_BASIC_INFORMATION m;
+    memset(&m, 0, sizeof(m));
+    VirtualQuery(&m, &m, sizeof(m));
+    rb_gc_stack_start =
+	STACK_UPPER((VALUE *)&m, (VALUE *)m.BaseAddress,
+		    (VALUE *)((char *)m.BaseAddress + m.RegionSize) - 1);
+#elif defined(STACK_END_ADDRESS)
+    {
+        extern void *STACK_END_ADDRESS;
+        rb_gc_stack_start = STACK_END_ADDRESS;
+    }
+#else
+    if (!addr) addr = (VALUE *)&addr;
+    STACK_UPPER(&addr, addr, ++addr);
+    if (rb_gc_stack_start) {
+	if (STACK_UPPER(&addr,
+			rb_gc_stack_start > addr,
+			rb_gc_stack_start < addr))
+	    rb_gc_stack_start = addr;
+	return;
+    }
+    rb_gc_stack_start = addr;
+#endif
+#ifdef HAVE_GETRLIMIT
+    {
+	struct rlimit rlim;
+
+	if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
+	    unsigned int space = rlim.rlim_cur/5;
+
+	    if (space > 1024*1024) space = 1024*1024;
+	    STACK_LEVEL_MAX = (rlim.rlim_cur - space) / sizeof(VALUE);
+	}
+    }
+#endif
+}
+
+void ruby_init_stack(VALUE *addr
+#ifdef __ia64
+    , void *bsp
+#endif
+    )
+{
+    if (!rb_gc_stack_start ||
+        STACK_UPPER(&addr,
+                    rb_gc_stack_start > addr,
+                    rb_gc_stack_start < addr)) {
+        rb_gc_stack_start = addr;
+    }
+#ifdef __ia64
+    if (!rb_gc_register_stack_start ||
+        (VALUE*)bsp < rb_gc_register_stack_start) {
+        rb_gc_register_stack_start = (VALUE*)bsp;
+    }
+#endif
+#ifdef HAVE_GETRLIMIT
+    {
+        struct rlimit rlim;
+
+        if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
+            unsigned int space = rlim.rlim_cur/5;
+
+            if (space > 1024*1024) space = 1024*1024;
+            STACK_LEVEL_MAX = (rlim.rlim_cur - space) / sizeof(VALUE);
+        }
+    }
+#elif defined _WIN32
+    {
+	MEMORY_BASIC_INFORMATION mi;
+	DWORD size;
+	DWORD space;
+
+	if (VirtualQuery(&mi, &mi, sizeof(mi))) {
+	    size = (char *)mi.BaseAddress - (char *)mi.AllocationBase;
+	    space = size / 5;
+	    if (space > 1024*1024) space = 1024*1024;
+	    STACK_LEVEL_MAX = (size - space) / sizeof(VALUE);
+	}
+    }
+#endif
+}
+
+/*
+ * Document-class: ObjectSpace
+ *
+ *  The <code>ObjectSpace</code> module contains a number of routines
+ *  that interact with the garbage collection facility and allow you to
+ *  traverse all living objects with an iterator.
+ *
+ *  <code>ObjectSpace</code> also provides support for object
+ *  finalizers, procs that will be called when a specific object is
+ *  about to be destroyed by garbage collection.
+ *
+ *     include ObjectSpace
+ *
+ *
+ *     a = "A"
+ *     b = "B"
+ *     c = "C"
+ *
+ *
+ *     define_finalizer(a, proc {|id| puts "Finalizer one on #{id}" })
+ *     define_finalizer(a, proc {|id| puts "Finalizer two on #{id}" })
+ *     define_finalizer(b, proc {|id| puts "Finalizer three on #{id}" })
+ *
+ *  <em>produces:</em>
+ *
+ *     Finalizer three on 537763470
+ *     Finalizer one on 537763480
+ *     Finalizer two on 537763480
+ *
+ */
+
+void
+Init_heap()
+{
+    if (!rb_gc_stack_start) {
+	Init_stack(0);
+    }
+    add_heap();
+}
+
+static VALUE
+os_live_obj()
+{
+    int i;
+    int n = 0;
+
+    for (i = 0; i < heaps_used; i++) {
+	RVALUE *p, *pend;
+
+	p = heaps[i].slot; pend = p + heaps[i].limit;
+	for (;p < pend; p++) {
+	    if (p->as.basic.flags) {
+		switch (TYPE(p)) {
+		  case T_ICLASS:
+		  case T_VARMAP:
+		  case T_SCOPE:
+		  case T_NODE:
+		    continue;
+		  case T_CLASS:
+		    if (FL_TEST(p, FL_SINGLETON)) continue;
+		  default:
+		    if (!p->as.basic.klass) continue;
+		    rb_yield((VALUE)p);
+		    n++;
+		}
+	    }
+	}
+    }
+
+    return INT2FIX(n);
+}
+
+static VALUE
+os_obj_of(of)
+    VALUE of;
+{
+    int i;
+    int n = 0;
+
+    for (i = 0; i < heaps_used; i++) {
+	RVALUE *p, *pend;
+
+	p = heaps[i].slot; pend = p + heaps[i].limit;
+	for (;p < pend; p++) {
+	    if (p->as.basic.flags) {
+		switch (TYPE(p)) {
+		  case T_ICLASS:
+		  case T_VARMAP:
+		  case T_SCOPE:
+		  case T_NODE:
+		    continue;
+		  case T_CLASS:
+		    if (FL_TEST(p, FL_SINGLETON)) continue;
+		  default:
+		    if (!p->as.basic.klass) continue;
+		    if (rb_obj_is_kind_of((VALUE)p, of)) {
+			rb_yield((VALUE)p);
+			n++;
+		    }
+		}
+	    }
+	}
+    }
+
+    return INT2FIX(n);
+}
+
+/*
+ *  call-seq:
+ *     ObjectSpace.each_object([module]) {|obj| ... } => fixnum
+ *
+ *  Calls the block once for each living, nonimmediate object in this
+ *  Ruby process. If <i>module</i> is specified, calls the block
+ *  for only those classes or modules that match (or are a subclass of)
+ *  <i>module</i>. Returns the number of objects found. Immediate
+ *  objects (<code>Fixnum</code>s, <code>Symbol</code>s
+ *  <code>true</code>, <code>false</code>, and <code>nil</code>) are
+ *  never returned. In the example below, <code>each_object</code>
+ *  returns both the numbers we defined and several constants defined in
+ *  the <code>Math</code> module.
+ *
+ *     a = 102.7
+ *     b = 95       # Won't be returned
+ *     c = 12345678987654321
+ *     count = ObjectSpace.each_object(Numeric) {|x| p x }
+ *     puts "Total count: #{count}"
+ *
+ *  <em>produces:</em>
+ *
+ *     12345678987654321
+ *     102.7
+ *     2.71828182845905
+ *     3.14159265358979
+ *     2.22044604925031e-16
+ *     1.7976931348623157e+308
+ *     2.2250738585072e-308
+ *     Total count: 7
+ *
+ */
+
+static VALUE
+os_each_obj(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE of;
+
+    rb_secure(4);
+    if (rb_scan_args(argc, argv, "01", &of) == 0) {
+	return os_live_obj();
+    }
+    else {
+	return os_obj_of(of);
+    }
+}
+
+static VALUE finalizers;
+
+/* deprecated
+ */
+
+static VALUE
+add_final(os, block)
+    VALUE os, block;
+{
+    rb_warn("ObjectSpace::add_finalizer is deprecated; use define_finalizer");
+    if (!rb_respond_to(block, rb_intern("call"))) {
+	rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
+		 rb_obj_classname(block));
+    }
+    rb_ary_push(finalizers, block);
+    return block;
+}
+
+/*
+ * deprecated
+ */
+static VALUE
+rm_final(os, block)
+    VALUE os, block;
+{
+    rb_warn("ObjectSpace::remove_finalizer is deprecated; use undefine_finalizer");
+    rb_ary_delete(finalizers, block);
+    return block;
+}
+
+/*
+ * deprecated
+ */
+static VALUE
+finals()
+{
+    rb_warn("ObjectSpace::finalizers is deprecated");
+    return finalizers;
+}
+
+/*
+ * deprecated
+ */
+
+static VALUE
+call_final(os, obj)
+    VALUE os, obj;
+{
+    rb_warn("ObjectSpace::call_finalizer is deprecated; use define_finalizer");
+    need_call_final = 1;
+    FL_SET(obj, FL_FINALIZE);
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     ObjectSpace.undefine_finalizer(obj)
+ *
+ *  Removes all finalizers for <i>obj</i>.
+ *
+ */
+
+static VALUE
+undefine_final(os, obj)
+    VALUE os, obj;
+{
+    if (finalizer_table) {
+	st_delete(finalizer_table, (st_data_t*)&obj, 0);
+    }
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     ObjectSpace.define_finalizer(obj, aProc=proc())
+ *
+ *  Adds <i>aProc</i> as a finalizer, to be called after <i>obj</i>
+ *  was destroyed.
+ *
+ */
+
+static VALUE
+define_final(argc, argv, os)
+    int argc;
+    VALUE *argv;
+    VALUE os;
+{
+    VALUE obj, block, table;
+
+    rb_scan_args(argc, argv, "11", &obj, &block);
+    if (argc == 1) {
+	block = rb_block_proc();
+    }
+    else if (!rb_respond_to(block, rb_intern("call"))) {
+	rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
+		 rb_obj_classname(block));
+    }
+    need_call_final = 1;
+    FL_SET(obj, FL_FINALIZE);
+
+    block = rb_ary_new3(2, INT2FIX(ruby_safe_level), block);
+
+    if (!finalizer_table) {
+	finalizer_table = st_init_numtable();
+    }
+    if (st_lookup(finalizer_table, obj, &table)) {
+	rb_ary_push(table, block);
+    }
+    else {
+	st_add_direct(finalizer_table, obj, rb_ary_new3(1, block));
+    }
+    return block;
+}
+
+void
+rb_gc_copy_finalizer(dest, obj)
+    VALUE dest, obj;
+{
+    VALUE table;
+
+    if (!finalizer_table) return;
+    if (!FL_TEST(obj, FL_FINALIZE)) return;
+    if (st_lookup(finalizer_table, obj, &table)) {
+	st_insert(finalizer_table, dest, table);
+    }
+    RBASIC(dest)->flags |= FL_FINALIZE;
+}
+
+static VALUE
+run_single_final(args)
+    VALUE *args;
+{
+    rb_eval_cmd(args[0], args[1], (int)args[2]);
+    return Qnil;
+}
+
+static void
+run_final(obj)
+    VALUE obj;
+{
+    long i;
+    int status, critical_save = rb_thread_critical;
+    VALUE args[3], table, objid;
+
+    objid = rb_obj_id(obj);	/* make obj into id */
+    rb_thread_critical = Qtrue;
+    args[1] = 0;
+    args[2] = (VALUE)ruby_safe_level;
+    for (i=0; i<RARRAY(finalizers)->len; i++) {
+	args[0] = RARRAY(finalizers)->ptr[i];
+	if (!args[1]) args[1] = rb_ary_new3(1, objid);
+	rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
+    }
+    if (finalizer_table && st_delete(finalizer_table, (st_data_t*)&obj, &table)) {
+	for (i=0; i<RARRAY(table)->len; i++) {
+	    VALUE final = RARRAY(table)->ptr[i];
+	    args[0] = RARRAY(final)->ptr[1];
+	    if (!args[1]) args[1] = rb_ary_new3(1, objid);
+	    args[2] = FIX2INT(RARRAY(final)->ptr[0]);
+	    rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
+	}
+    }
+    rb_thread_critical = critical_save;
+}
+
+void
+rb_gc_finalize_deferred()
+{
+    RVALUE *p = deferred_final_list;
+
+    deferred_final_list = 0;
+    if (p) {
+	finalize_list(p);
+	free_unused_heaps();
+    }
+}
+
+void
+rb_gc_call_finalizer_at_exit()
+{
+    RVALUE *p, *pend;
+    int i;
+
+    /* run finalizers */
+    if (need_call_final) {
+	p = deferred_final_list;
+	deferred_final_list = 0;
+	finalize_list(p);
+	for (i = 0; i < heaps_used; i++) {
+	    p = heaps[i].slot; pend = p + heaps[i].limit;
+	    while (p < pend) {
+		if (FL_TEST(p, FL_FINALIZE)) {
+		    FL_UNSET(p, FL_FINALIZE);
+		    p->as.basic.klass = 0;
+		    run_final((VALUE)p);
+		}
+		p++;
+	    }
+	}
+    }
+    /* run data object's finalizers */
+    for (i = 0; i < heaps_used; i++) {
+	p = heaps[i].slot; pend = p + heaps[i].limit;
+	while (p < pend) {
+	    if (BUILTIN_TYPE(p) == T_DATA &&
+		DATA_PTR(p) && RANY(p)->as.data.dfree) {
+		p->as.free.flags = 0;
+		if ((long)RANY(p)->as.data.dfree == -1) {
+		    RUBY_CRITICAL(free(DATA_PTR(p)));
+		}
+		else if (RANY(p)->as.data.dfree) {
+		    (*RANY(p)->as.data.dfree)(DATA_PTR(p));
+		}
+	    }
+	    else if (BUILTIN_TYPE(p) == T_FILE) {
+		p->as.free.flags = 0;
+		rb_io_fptr_finalize(RANY(p)->as.file.fptr);
+	    }
+	    p++;
+	}
+    }
+}
+
+/*
+ *  call-seq:
+ *     ObjectSpace._id2ref(object_id) -> an_object
+ *
+ *  Converts an object id to a reference to the object. May not be
+ *  called on an object id passed as a parameter to a finalizer.
+ *
+ *     s = "I am a string"                    #=> "I am a string"
+ *     r = ObjectSpace._id2ref(s.object_id)   #=> "I am a string"
+ *     r == s                                 #=> true
+ *
+ */
+
+static VALUE
+id2ref(obj, objid)
+    VALUE obj, objid;
+{
+    unsigned long ptr, p0;
+
+    rb_secure(4);
+    p0 = ptr = NUM2ULONG(objid);
+    if (ptr == Qtrue) return Qtrue;
+    if (ptr == Qfalse) return Qfalse;
+    if (ptr == Qnil) return Qnil;
+    if (FIXNUM_P(ptr)) return (VALUE)ptr;
+    ptr = objid ^ FIXNUM_FLAG;	/* unset FIXNUM_FLAG */
+
+    if ((ptr % sizeof(RVALUE)) == (4 << 2)) {
+        ID symid = ptr / sizeof(RVALUE);
+        if (rb_id2name(symid) == 0)
+            rb_raise(rb_eRangeError, "%p is not symbol id value", p0);
+        return ID2SYM(symid);
+    }
+
+    if (!is_pointer_to_heap((void *)ptr)|| BUILTIN_TYPE(ptr) >= T_BLKTAG) {
+	rb_raise(rb_eRangeError, "0x%lx is not id value", p0);
+    }
+    if (BUILTIN_TYPE(ptr) == 0 || RBASIC(ptr)->klass == 0) {
+	rb_raise(rb_eRangeError, "0x%lx is recycled object", p0);
+    }
+    return (VALUE)ptr;
+}
+
+/*
+ *  Document-method: __id__
+ *  Document-method: object_id
+ *
+ *  call-seq:
+ *     obj.__id__       => fixnum
+ *     obj.object_id    => fixnum
+ *  
+ *  Returns an integer identifier for <i>obj</i>. The same number will
+ *  be returned on all calls to <code>id</code> for a given object, and
+ *  no two active objects will share an id.
+ *  <code>Object#object_id</code> is a different concept from the
+ *  <code>:name</code> notation, which returns the symbol id of
+ *  <code>name</code>. Replaces the deprecated <code>Object#id</code>.
+ */
+
+/*
+ *  call-seq:
+ *     obj.hash    => fixnum
+ *  
+ *  Generates a <code>Fixnum</code> hash value for this object. This
+ *  function must have the property that <code>a.eql?(b)</code> implies
+ *  <code>a.hash == b.hash</code>. The hash value is used by class
+ *  <code>Hash</code>. Any hash value that exceeds the capacity of a
+ *  <code>Fixnum</code> will be truncated before being used.
+ */
+
+VALUE
+rb_obj_id(VALUE obj)
+{
+    /*
+     *                32-bit VALUE space
+     *          MSB ------------------------ LSB
+     *  false   00000000000000000000000000000000
+     *  true    00000000000000000000000000000010
+     *  nil     00000000000000000000000000000100
+     *  undef   00000000000000000000000000000110
+     *  symbol  ssssssssssssssssssssssss00001110
+     *  object  oooooooooooooooooooooooooooooo00        = 0 (mod sizeof(RVALUE))
+     *  fixnum  fffffffffffffffffffffffffffffff1
+     *
+     *                    object_id space
+     *                                       LSB
+     *  false   00000000000000000000000000000000
+     *  true    00000000000000000000000000000010
+     *  nil     00000000000000000000000000000100
+     *  undef   00000000000000000000000000000110
+     *  symbol   000SSSSSSSSSSSSSSSSSSSSSSSSSSS0        S...S % A = 4 (S...S = s...s * A + 4)
+     *  object   oooooooooooooooooooooooooooooo0        o...o % A = 0
+     *  fixnum  fffffffffffffffffffffffffffffff1        bignum if required
+     *
+     *  where A = sizeof(RVALUE)/4
+     *
+     *  sizeof(RVALUE) is
+     *  20 if 32-bit, double is 4-byte aligned
+     *  24 if 32-bit, double is 8-byte aligned
+     *  40 if 64-bit
+     */
+    if (TYPE(obj) == T_SYMBOL) {
+        return (SYM2ID(obj) * sizeof(RVALUE) + (4 << 2)) | FIXNUM_FLAG;
+    }
+    if (SPECIAL_CONST_P(obj)) {
+        return LONG2NUM((long)obj);
+    }
+    return (VALUE)((long)obj|FIXNUM_FLAG);
+}
+
+/*
+ *  The <code>GC</code> module provides an interface to Ruby's mark and
+ *  sweep garbage collection mechanism. Some of the underlying methods
+ *  are also available via the <code>ObjectSpace</code> module.
+ */
+
+void
+Init_GC()
+{
+    VALUE rb_mObSpace;
+
+    rb_mGC = rb_define_module("GC");
+    rb_define_singleton_method(rb_mGC, "start", rb_gc_start, 0);
+    rb_define_singleton_method(rb_mGC, "enable", rb_gc_enable, 0);
+    rb_define_singleton_method(rb_mGC, "disable", rb_gc_disable, 0);
+    rb_define_method(rb_mGC, "garbage_collect", rb_gc_start, 0);
+
+    rb_mObSpace = rb_define_module("ObjectSpace");
+    rb_define_module_function(rb_mObSpace, "each_object", os_each_obj, -1);
+    rb_define_module_function(rb_mObSpace, "garbage_collect", rb_gc_start, 0);
+    rb_define_module_function(rb_mObSpace, "add_finalizer", add_final, 1);
+    rb_define_module_function(rb_mObSpace, "remove_finalizer", rm_final, 1);
+    rb_define_module_function(rb_mObSpace, "finalizers", finals, 0);
+    rb_define_module_function(rb_mObSpace, "call_finalizer", call_final, 1);
+
+    rb_define_module_function(rb_mObSpace, "define_finalizer", define_final, -1);
+    rb_define_module_function(rb_mObSpace, "undefine_finalizer", undefine_final, 1);
+
+    rb_define_module_function(rb_mObSpace, "_id2ref", id2ref, 1);
+
+    rb_gc_register_address(&rb_mObSpace);
+    rb_global_variable(&finalizers);
+    rb_gc_unregister_address(&rb_mObSpace);
+    finalizers = rb_ary_new();
+
+    source_filenames = st_init_strtable();
+
+    rb_global_variable(&nomem_error);
+    nomem_error = rb_exc_new2(rb_eNoMemError, "failed to allocate memory");
+
+    rb_define_method(rb_mKernel, "hash", rb_obj_id, 0);
+    rb_define_method(rb_mKernel, "__id__", rb_obj_id, 0);
+    rb_define_method(rb_mKernel, "object_id", rb_obj_id, 0);
+}
diff --git a/ruby_1_8_6/hash.c b/ruby_1_8_6/hash.c
new file mode 100644
index 0000000000..557e3c8b5a
--- /dev/null
+++ b/ruby_1_8_6/hash.c
@@ -0,0 +1,2599 @@
+/**********************************************************************
+
+  hash.c -
+
+  $Author$
+  $Date$
+  created at: Mon Nov 22 18:51:18 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "st.h"
+#include "util.h"
+#include "rubysig.h"
+
+#ifdef __APPLE__
+#include <crt_externs.h>
+#endif
+
+#define HASH_DELETED  FL_USER1
+#define HASH_PROC_DEFAULT FL_USER2
+
+static void
+rb_hash_modify(hash)
+    VALUE hash;
+{
+    if (!RHASH(hash)->tbl) rb_raise(rb_eTypeError, "uninitialized Hash");
+    if (OBJ_FROZEN(hash)) rb_error_frozen("hash");
+    if (!OBJ_TAINTED(hash) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify hash");
+}
+
+VALUE
+rb_hash_freeze(hash)
+    VALUE hash;
+{
+    return rb_obj_freeze(hash);
+}
+
+VALUE rb_cHash;
+
+static VALUE envtbl;
+static ID id_hash, id_call, id_default;
+
+static VALUE
+eql(args)
+    VALUE *args;
+{
+    return (VALUE)rb_eql(args[0], args[1]);
+}
+
+static int
+rb_any_cmp(a, b)
+    VALUE a, b;
+{
+    VALUE args[2];
+
+    if (a == b) return 0;
+    if (FIXNUM_P(a) && FIXNUM_P(b)) {
+	return a != b;
+    }
+    if (TYPE(a) == T_STRING && RBASIC(a)->klass == rb_cString &&
+	TYPE(b) == T_STRING && RBASIC(b)->klass == rb_cString) {
+	return rb_str_cmp(a, b);
+    }
+    if (a == Qundef || b == Qundef) return -1;
+    if (SYMBOL_P(a) && SYMBOL_P(b)) {
+	return a != b;
+    }
+
+    args[0] = a;
+    args[1] = b;
+    return !rb_with_disable_interrupt(eql, (VALUE)args);
+}
+
+VALUE
+rb_hash(obj)
+    VALUE obj;
+{
+    return rb_funcall(obj, id_hash, 0);
+}
+
+static int
+rb_any_hash(a)
+    VALUE a;
+{
+    VALUE hval;
+
+    switch (TYPE(a)) {
+      case T_FIXNUM:
+      case T_SYMBOL:
+	return (int)a;
+	break;
+
+      case T_STRING:
+	return rb_str_hash(a);
+	break;
+
+      default:
+	hval = rb_funcall(a, id_hash, 0);
+	if (!FIXNUM_P(hval)) {
+	    hval = rb_funcall(hval, '%', 1, INT2FIX(536870923));
+	}
+	return (int)FIX2LONG(hval);
+    }
+}
+
+static struct st_hash_type objhash = {
+    rb_any_cmp,
+    rb_any_hash,
+};
+
+struct foreach_safe_arg {
+    st_table *tbl;
+    int (*func)();
+    st_data_t arg;
+};
+
+static int
+foreach_safe_i(key, value, arg)
+    st_data_t key, value;
+    struct foreach_safe_arg *arg;
+{
+    int status;
+
+    if (key == Qundef) return ST_CONTINUE;
+    status = (*arg->func)(key, value, arg->arg);
+    if (status == ST_CONTINUE) {
+	return ST_CHECK;
+    }
+    return status;
+}
+
+void
+st_foreach_safe(table, func, a)
+    st_table *table;
+    int (*func)();
+    st_data_t a;
+{
+    struct foreach_safe_arg arg;
+
+    arg.tbl = table;
+    arg.func = func;
+    arg.arg = a;
+    if (st_foreach(table, foreach_safe_i, (st_data_t)&arg)) {
+	rb_raise(rb_eRuntimeError, "hash modified during iteration");
+    }
+}
+
+struct hash_foreach_arg {
+    VALUE hash;
+    int (*func)();
+    VALUE arg;
+};
+
+static int
+hash_foreach_iter(key, value, arg)
+    VALUE key, value;
+    struct hash_foreach_arg *arg;
+{
+    int status;
+    st_table *tbl;
+
+    tbl = RHASH(arg->hash)->tbl;    
+    if (key == Qundef) return ST_CONTINUE;
+    status = (*arg->func)(key, value, arg->arg);
+    if (RHASH(arg->hash)->tbl != tbl) {
+	rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
+    }
+    switch (status) {
+      case ST_DELETE:
+ 	st_delete_safe(tbl, (st_data_t*)&key, 0, Qundef);
+	FL_SET(arg->hash, HASH_DELETED);
+      case ST_CONTINUE:
+ 	break;
+      case ST_STOP:
+ 	return ST_STOP;
+    }
+    return ST_CHECK;
+}
+
+static VALUE
+hash_foreach_ensure(hash)
+    VALUE hash;
+{
+    RHASH(hash)->iter_lev--;
+
+    if (RHASH(hash)->iter_lev == 0) {
+	if (FL_TEST(hash, HASH_DELETED)) {
+	    st_cleanup_safe(RHASH(hash)->tbl, Qundef);
+	    FL_UNSET(hash, HASH_DELETED);
+	}
+    }
+    return 0;
+}
+
+static VALUE
+hash_foreach_call(arg)
+    struct hash_foreach_arg *arg;
+{
+    if (st_foreach(RHASH(arg->hash)->tbl, hash_foreach_iter, (st_data_t)arg)) {
+ 	rb_raise(rb_eRuntimeError, "hash modified during iteration");
+    }
+    return Qnil;
+}
+
+void
+rb_hash_foreach(hash, func, farg)
+    VALUE hash;
+    int (*func)();
+    VALUE farg;
+{
+    struct hash_foreach_arg arg;
+
+    RHASH(hash)->iter_lev++;
+    arg.hash = hash;
+    arg.func = func;
+    arg.arg  = farg;
+    rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash);
+}
+
+static VALUE hash_alloc0 _((VALUE));
+static VALUE hash_alloc _((VALUE));
+static VALUE
+hash_alloc0(klass)
+    VALUE klass;
+{
+    NEWOBJ(hash, struct RHash);
+    OBJSETUP(hash, klass, T_HASH);
+
+    hash->ifnone = Qnil;
+
+    return (VALUE)hash;
+}
+
+static VALUE
+hash_alloc(klass)
+    VALUE klass;
+{
+    VALUE hash = hash_alloc0(klass);
+
+    RHASH(hash)->tbl = st_init_table(&objhash);
+
+    return hash;
+}
+
+VALUE
+rb_hash_new()
+{
+    return hash_alloc(rb_cHash);
+}
+
+/*
+ *  call-seq:
+ *     Hash.new                          => hash
+ *     Hash.new(obj)                     => aHash
+ *     Hash.new {|hash, key| block }     => aHash
+ *  
+ *  Returns a new, empty hash. If this hash is subsequently accessed by
+ *  a key that doesn't correspond to a hash entry, the value returned
+ *  depends on the style of <code>new</code> used to create the hash. In
+ *  the first form, the access returns <code>nil</code>. If
+ *  <i>obj</i> is specified, this single object will be used for
+ *  all <em>default values</em>. If a block is specified, it will be
+ *  called with the hash object and the key, and should return the
+ *  default value. It is the block's responsibility to store the value
+ *  in the hash if required.
+ *     
+ *     h = Hash.new("Go Fish")
+ *     h["a"] = 100
+ *     h["b"] = 200
+ *     h["a"]           #=> 100
+ *     h["c"]           #=> "Go Fish"
+ *     # The following alters the single default object
+ *     h["c"].upcase!   #=> "GO FISH"
+ *     h["d"]           #=> "GO FISH"
+ *     h.keys           #=> ["a", "b"]
+ *     
+ *     # While this creates a new default object each time
+ *     h = Hash.new { |hash, key| hash[key] = "Go Fish: #{key}" }
+ *     h["c"]           #=> "Go Fish: c"
+ *     h["c"].upcase!   #=> "GO FISH: C"
+ *     h["d"]           #=> "Go Fish: d"
+ *     h.keys           #=> ["c", "d"]
+ *     
+ */
+
+static VALUE
+rb_hash_initialize(argc, argv, hash)
+    int argc;
+    VALUE *argv;
+    VALUE hash;
+{
+    VALUE ifnone;
+
+    rb_hash_modify(hash);
+    if (rb_block_given_p()) {
+	if (argc > 0) {
+	    rb_raise(rb_eArgError, "wrong number of arguments");
+	}
+	RHASH(hash)->ifnone = rb_block_proc();
+	FL_SET(hash, HASH_PROC_DEFAULT);
+    }
+    else {
+	rb_scan_args(argc, argv, "01", &ifnone);
+	RHASH(hash)->ifnone = ifnone;
+    }
+
+    return hash;
+}
+
+/*
+ *  call-seq:
+ *     Hash[ [key =>|, value]* ]   => hash
+ *  
+ *  Creates a new hash populated with the given objects. Equivalent to
+ *  the literal <code>{ <i>key</i>, <i>value</i>, ... }</code>. Keys and
+ *  values occur in pairs, so there must be an even number of arguments.
+ *     
+ *     Hash["a", 100, "b", 200]       #=> {"a"=>100, "b"=>200}
+ *     Hash["a" => 100, "b" => 200]   #=> {"a"=>100, "b"=>200}
+ *     { "a" => 100, "b" => 200 }     #=> {"a"=>100, "b"=>200}
+ */
+
+static VALUE
+rb_hash_s_create(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE hash;
+    int i;
+
+    if (argc == 1 && TYPE(argv[0]) == T_HASH) {
+	hash = hash_alloc0(klass);
+	RHASH(hash)->tbl = st_copy(RHASH(argv[0])->tbl);
+
+	return hash;
+    }
+
+    if (argc % 2 != 0) {
+	rb_raise(rb_eArgError, "odd number of arguments for Hash");
+    }
+
+    hash = hash_alloc(klass);
+    for (i=0; i<argc; i+=2) {
+        rb_hash_aset(hash, argv[i], argv[i + 1]);
+    }
+
+    return hash;
+}
+
+static VALUE
+to_hash(hash)
+    VALUE hash;
+{
+    return rb_convert_type(hash, T_HASH, "Hash", "to_hash");
+}
+
+static int
+rb_hash_rehash_i(key, value, tbl)
+    VALUE key, value;
+    st_table *tbl;
+{
+    if (key != Qundef) st_insert(tbl, key, value);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.rehash -> hsh
+ *  
+ *  Rebuilds the hash based on the current hash values for each key. If
+ *  values of key objects have changed since they were inserted, this
+ *  method will reindex <i>hsh</i>. If <code>Hash#rehash</code> is
+ *  called while an iterator is traversing the hash, an
+ *  <code>IndexError</code> will be raised in the iterator.
+ *     
+ *     a = [ "a", "b" ]
+ *     c = [ "c", "d" ]
+ *     h = { a => 100, c => 300 }
+ *     h[a]       #=> 100
+ *     a[0] = "z"
+ *     h[a]       #=> nil
+ *     h.rehash   #=> {["z", "b"]=>100, ["c", "d"]=>300}
+ *     h[a]       #=> 100
+ */
+
+static VALUE
+rb_hash_rehash(hash)
+    VALUE hash;
+{
+    st_table *tbl;
+
+    rb_hash_modify(hash);
+    tbl = st_init_table_with_size(&objhash, RHASH(hash)->tbl->num_entries);
+    rb_hash_foreach(hash, rb_hash_rehash_i, (st_data_t)tbl);
+    st_free_table(RHASH(hash)->tbl);
+    RHASH(hash)->tbl = tbl;
+
+    return hash;
+}
+
+/*
+ *  call-seq:
+ *     hsh[key]    =>  value
+ *  
+ *  Element Reference---Retrieves the <i>value</i> object corresponding
+ *  to the <i>key</i> object. If not found, returns the a default value (see
+ *  <code>Hash::new</code> for details).
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h["a"]   #=> 100
+ *     h["c"]   #=> nil
+ *     
+ */
+
+VALUE
+rb_hash_aref(hash, key)
+    VALUE hash, key;
+{
+    VALUE val;
+
+    if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
+	return rb_funcall(hash, id_default, 1, key);
+    }
+    return val;
+}
+
+/*
+ *  call-seq:
+ *     hsh.fetch(key [, default] )       => obj
+ *     hsh.fetch(key) {| key | block }   => obj
+ *  
+ *  Returns a value from the hash for the given key. If the key can't be
+ *  found, there are several options: With no other arguments, it will
+ *  raise an <code>IndexError</code> exception; if <i>default</i> is
+ *  given, then that will be returned; if the optional code block is
+ *  specified, then that will be run and its result returned.
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.fetch("a")                            #=> 100
+ *     h.fetch("z", "go fish")                 #=> "go fish"
+ *     h.fetch("z") { |el| "go fish, #{el}"}   #=> "go fish, z"
+ *     
+ *  The following example shows that an exception is raised if the key
+ *  is not found and a default value is not supplied.
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.fetch("z")
+ *     
+ *  <em>produces:</em>
+ *     
+ *     prog.rb:2:in `fetch': key not found (IndexError)
+ *      from prog.rb:2
+ *     
+ */
+
+static VALUE
+rb_hash_fetch(argc, argv, hash)
+    int argc;
+    VALUE *argv;
+    VALUE hash;
+{
+    VALUE key, if_none;
+    VALUE val;
+    long block_given;
+
+    rb_scan_args(argc, argv, "11", &key, &if_none);
+
+    block_given = rb_block_given_p();
+    if (block_given && argc == 2) {
+	rb_warn("block supersedes default value argument");
+    }
+    if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
+	if (block_given) return rb_yield(key);
+	if (argc == 1) {
+	    rb_raise(rb_eIndexError, "key not found");
+	}
+	return if_none;
+    }
+    return val;
+}
+
+/*
+ *  call-seq:
+ *     hsh.default(key=nil)   => obj
+ *  
+ *  Returns the default value, the value that would be returned by
+ *  <i>hsh</i>[<i>key</i>] if <i>key</i> did not exist in <i>hsh</i>.
+ *  See also <code>Hash::new</code> and <code>Hash#default=</code>.
+ *     
+ *     h = Hash.new                            #=> {}
+ *     h.default                               #=> nil
+ *     h.default(2)                            #=> nil
+ *     
+ *     h = Hash.new("cat")                     #=> {}
+ *     h.default                               #=> "cat"
+ *     h.default(2)                            #=> "cat"
+ *     
+ *     h = Hash.new {|h,k| h[k] = k.to_i*10}   #=> {}
+ *     h.default                               #=> 0
+ *     h.default(2)                            #=> 20
+ */
+
+static VALUE
+rb_hash_default(argc, argv, hash)
+    int argc;
+    VALUE *argv;
+    VALUE hash;
+{
+    VALUE key;
+
+    rb_scan_args(argc, argv, "01", &key);
+    if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
+	if (argc == 0) return Qnil;
+	return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, key);
+    }
+    return RHASH(hash)->ifnone;
+}
+
+/*
+ *  call-seq:
+ *     hsh.default = obj     => hsh
+ *  
+ *  Sets the default value, the value returned for a key that does not
+ *  exist in the hash. It is not possible to set the a default to a
+ *  <code>Proc</code> that will be executed on each key lookup.
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.default = "Go fish"
+ *     h["a"]     #=> 100
+ *     h["z"]     #=> "Go fish"
+ *     # This doesn't do what you might hope...
+ *     h.default = proc do |hash, key|
+ *       hash[key] = key + key
+ *     end
+ *     h[2]       #=> #<Proc:0x401b3948@-:6>
+ *     h["cat"]   #=> #<Proc:0x401b3948@-:6>
+ */
+
+static VALUE
+rb_hash_set_default(hash, ifnone)
+    VALUE hash, ifnone;
+{
+    rb_hash_modify(hash);
+    RHASH(hash)->ifnone = ifnone;
+    FL_UNSET(hash, HASH_PROC_DEFAULT);
+    return ifnone;
+}
+
+/*
+ *  call-seq:
+ *     hsh.default_proc -> anObject
+ *  
+ *  If <code>Hash::new</code> was invoked with a block, return that
+ *  block, otherwise return <code>nil</code>.
+ *     
+ *     h = Hash.new {|h,k| h[k] = k*k }   #=> {}
+ *     p = h.default_proc                 #=> #<Proc:0x401b3d08@-:1>
+ *     a = []                             #=> []
+ *     p.call(a, 2)
+ *     a                                  #=> [nil, nil, 4]
+ */
+
+
+static VALUE
+rb_hash_default_proc(hash)
+    VALUE hash;
+{
+    if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
+	return RHASH(hash)->ifnone;
+    }
+    return Qnil;
+}
+
+static int
+index_i(key, value, args)
+    VALUE key, value;
+    VALUE *args;
+{
+    if (rb_equal(value, args[0])) {
+	args[1] = key;
+	return ST_STOP;
+    }
+    return ST_CONTINUE;
+}
+
+static VALUE
+rb_hash_delete_key(hash, key)
+    VALUE hash, key;
+{
+    st_data_t ktmp = (st_data_t)key, val;
+
+    if (RHASH(hash)->iter_lev > 0) {
+	if (st_delete_safe(RHASH(hash)->tbl, &ktmp, &val, Qundef)) {
+	    FL_SET(hash, HASH_DELETED);
+	    return (VALUE)val;
+	}
+    }
+    else if (st_delete(RHASH(hash)->tbl, &ktmp, &val))
+	return (VALUE)val;
+    return Qundef;
+}
+
+/*
+ *  call-seq:
+ *     hsh.index(value)    => key
+ *  
+ *  Returns the key for a given value. If not found, returns <code>nil</code>.
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.index(200)   #=> "b"
+ *     h.index(999)   #=> nil
+ *     
+ */
+
+static VALUE
+rb_hash_index(hash, value)
+    VALUE hash, value;
+{
+    VALUE args[2];
+
+    args[0] = value;
+    args[1] = Qnil;
+
+    rb_hash_foreach(hash, index_i, (st_data_t)args);
+
+    return args[1];
+}
+
+/*
+ *  call-seq:
+ *     hsh.indexes(key, ...)    => array
+ *     hsh.indices(key, ...)    => array
+ *  
+ *  Deprecated in favor of <code>Hash#select</code>.
+ *     
+ */
+
+static VALUE
+rb_hash_indexes(argc, argv, hash)
+    int argc;
+    VALUE *argv;
+    VALUE hash;
+{
+    VALUE indexes;
+    int i;
+
+    rb_warn("Hash#%s is deprecated; use Hash#values_at",
+	    rb_id2name(rb_frame_last_func()));
+    indexes = rb_ary_new2(argc);
+    for (i=0; i<argc; i++) {
+	RARRAY(indexes)->ptr[i] = rb_hash_aref(hash, argv[i]);
+	RARRAY(indexes)->len++;
+    }
+    return indexes;
+}
+
+/*
+ *  call-seq:
+ *     hsh.delete(key)                   => value
+ *     hsh.delete(key) {| key | block }  => value
+ *  
+ *  Deletes and returns a key-value pair from <i>hsh</i> whose key is
+ *  equal to <i>key</i>. If the key is not found, returns the
+ *  <em>default value</em>. If the optional code block is given and the
+ *  key is not found, pass in the key and return the result of
+ *  <i>block</i>.
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.delete("a")                              #=> 100
+ *     h.delete("z")                              #=> nil
+ *     h.delete("z") { |el| "#{el} not found" }   #=> "z not found"
+ *     
+ */
+
+VALUE
+rb_hash_delete(hash, key)
+    VALUE hash, key;
+{
+    VALUE val;
+
+    rb_hash_modify(hash);
+    val = rb_hash_delete_key(hash, key);
+    if (val != Qundef) return val;
+    if (rb_block_given_p()) {
+	return rb_yield(key);
+    }
+    return Qnil;
+}
+
+struct shift_var {
+    VALUE key;
+    VALUE val;
+};
+
+static int
+shift_i(key, value, var)
+    VALUE key, value;
+    struct shift_var *var;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    if (var->key != Qundef) return ST_STOP;
+    var->key = key;
+    var->val = value;
+    return ST_DELETE;
+}
+
+static int
+shift_i_safe(key, value, var)
+    VALUE key, value;
+    struct shift_var *var;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    var->key = key;
+    var->val = value;
+    return ST_STOP;
+}
+
+/*
+ *  call-seq:
+ *     hsh.shift -> anArray or obj
+ *  
+ *  Removes a key-value pair from <i>hsh</i> and returns it as the
+ *  two-item array <code>[</code> <i>key, value</i> <code>]</code>, or
+ *  the hash's default value if the hash is empty.
+ *     
+ *     h = { 1 => "a", 2 => "b", 3 => "c" }
+ *     h.shift   #=> [1, "a"]
+ *     h         #=> {2=>"b", 3=>"c"}
+ */
+
+static VALUE
+rb_hash_shift(hash)
+    VALUE hash;
+{
+    struct shift_var var;
+
+    rb_hash_modify(hash);
+    var.key = Qundef;
+    if (RHASH(hash)->iter_lev > 0) {
+	rb_hash_foreach(hash, shift_i_safe, (st_data_t)&var);
+	if (var.key != Qundef) {
+	    st_data_t key = var.key;
+	    if (st_delete_safe(RHASH(hash)->tbl, &key, 0, Qundef)) {
+		FL_SET(hash, HASH_DELETED);
+	    }
+	}
+    }
+    else {
+	rb_hash_foreach(hash, shift_i, (st_data_t)&var);
+    }
+
+    if (var.key != Qundef) {
+	return rb_assoc_new(var.key, var.val);
+    }
+    else if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
+	return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, Qnil);
+    }
+    else {
+	return RHASH(hash)->ifnone;
+    }
+}
+
+static int
+delete_if_i(key, value, hash)
+    VALUE key, value, hash;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    if (RTEST(rb_yield_values(2, key, value))) {
+	rb_hash_delete_key(hash, key);
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.delete_if {| key, value | block }  -> hsh
+ *  
+ *  Deletes every key-value pair from <i>hsh</i> for which <i>block</i>
+ *  evaluates to <code>true</code>.
+ *     
+ *     h = { "a" => 100, "b" => 200, "c" => 300 }
+ *     h.delete_if {|key, value| key >= "b" }   #=> {"a"=>100}
+ *     
+ */
+
+VALUE
+rb_hash_delete_if(hash)
+    VALUE hash;
+{
+    rb_hash_modify(hash);
+    rb_hash_foreach(hash, delete_if_i, hash);
+    return hash;
+}
+
+/*
+ *  call-seq:
+ *     hsh.reject! {| key, value | block }  -> hsh or nil
+ *  
+ *  Equivalent to <code>Hash#delete_if</code>, but returns
+ *  <code>nil</code> if no changes were made.
+ */
+
+VALUE
+rb_hash_reject_bang(hash)
+    VALUE hash;
+{
+    int n = RHASH(hash)->tbl->num_entries;
+    rb_hash_delete_if(hash);
+    if (n == RHASH(hash)->tbl->num_entries) return Qnil;
+    return hash;
+}
+
+/*
+ *  call-seq:
+ *     hsh.reject {| key, value | block }  -> a_hash
+ *  
+ *  Same as <code>Hash#delete_if</code>, but works on (and returns) a
+ *  copy of the <i>hsh</i>. Equivalent to
+ *  <code><i>hsh</i>.dup.delete_if</code>.
+ *     
+ */
+
+static VALUE
+rb_hash_reject(hash)
+    VALUE hash;
+{
+    return rb_hash_delete_if(rb_obj_dup(hash));
+}
+
+static int
+select_i(key, value, result)
+    VALUE key, value, result;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    if (RTEST(rb_yield_values(2, key, value)))
+	rb_ary_push(result, rb_assoc_new(key, value));
+    return ST_CONTINUE;
+}
+
+/*
+ * call-seq:
+ *   hsh.values_at(key, ...)   => array
+ *
+ * Return an array containing the values associated with the given keys.
+ * Also see <code>Hash.select</code>.
+ *
+ *   h = { "cat" => "feline", "dog" => "canine", "cow" => "bovine" }
+ *   h.values_at("cow", "cat")  #=> ["bovine", "feline"]
+*/
+
+VALUE
+rb_hash_values_at(argc, argv, hash)
+    int argc;
+    VALUE *argv;
+    VALUE hash;
+{
+    VALUE result = rb_ary_new();
+    long i;
+
+    for (i=0; i<argc; i++) {
+	rb_ary_push(result, rb_hash_aref(hash, argv[i]));
+    }
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     hsh.select {|key, value| block}   => array
+ *  
+ *  Returns a new array consisting of <code>[key,value]</code>
+ *  pairs for which the block returns true.
+ *  Also see <code>Hash.values_at</code>.
+ *     
+ *     h = { "a" => 100, "b" => 200, "c" => 300 }
+ *     h.select {|k,v| k > "a"}  #=> [["b", 200], ["c", 300]]
+ *     h.select {|k,v| v < 200}  #=> [["a", 100]]
+ */
+
+VALUE
+rb_hash_select(argc, argv, hash)
+    int argc;
+    VALUE *argv;
+    VALUE hash;
+{
+    VALUE result;
+
+    if (argc > 0) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+    }
+    result = rb_ary_new();
+    rb_hash_foreach(hash, select_i, result);
+    return result;
+}
+
+static int
+clear_i(key, value, dummy)
+    VALUE key, value, dummy;
+{
+    return ST_DELETE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.clear -> hsh
+ *  
+ *  Removes all key-value pairs from <i>hsh</i>.
+ *     
+ *     h = { "a" => 100, "b" => 200 }   #=> {"a"=>100, "b"=>200}
+ *     h.clear                          #=> {}
+ *     
+ */
+
+static VALUE
+rb_hash_clear(hash)
+    VALUE hash;
+{
+    rb_hash_modify(hash);
+    if (RHASH(hash)->tbl->num_entries > 0) {
+	rb_hash_foreach(hash, clear_i, 0);
+    }
+
+    return hash;
+}
+
+/*
+ *  call-seq:
+ *     hsh[key] = value        => value
+ *     hsh.store(key, value)   => value
+ *  
+ *  Element Assignment---Associates the value given by
+ *  <i>value</i> with the key given by <i>key</i>.
+ *  <i>key</i> should not have its value changed while it is in
+ *  use as a key (a <code>String</code> passed as a key will be
+ *  duplicated and frozen).
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h["a"] = 9
+ *     h["c"] = 4
+ *     h   #=> {"a"=>9, "b"=>200, "c"=>4}
+ *     
+ */
+
+VALUE
+rb_hash_aset(hash, key, val)
+    VALUE hash, key, val;
+{
+    rb_hash_modify(hash);
+    if (TYPE(key) != T_STRING || st_lookup(RHASH(hash)->tbl, key, 0)) {
+	st_insert(RHASH(hash)->tbl, key, val);
+    }
+    else {
+	st_add_direct(RHASH(hash)->tbl, rb_str_new4(key), val);
+    }
+    return val;
+}
+
+static int
+replace_i(key, val, hash)
+    VALUE key, val, hash;
+{
+    if (key != Qundef) {
+	rb_hash_aset(hash, key, val);
+    }
+
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.replace(other_hash) -> hsh
+ *  
+ *  Replaces the contents of <i>hsh</i> with the contents of
+ *  <i>other_hash</i>.
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.replace({ "c" => 300, "d" => 400 })   #=> {"c"=>300, "d"=>400}
+ *     
+ */
+
+static VALUE
+rb_hash_replace(hash, hash2)
+    VALUE hash, hash2;
+{
+    hash2 = to_hash(hash2);
+    if (hash == hash2) return hash;
+    rb_hash_clear(hash);
+    rb_hash_foreach(hash2, replace_i, hash);
+    RHASH(hash)->ifnone = RHASH(hash2)->ifnone;
+    if (FL_TEST(hash2, HASH_PROC_DEFAULT)) {
+	FL_SET(hash, HASH_PROC_DEFAULT);
+    }
+    else {
+	FL_UNSET(hash, HASH_PROC_DEFAULT);
+    }
+
+    return hash;
+}
+
+/*
+ *  call-seq:
+ *     hsh.length    =>  fixnum
+ *     hsh.size      =>  fixnum
+ *  
+ *  Returns the number of key-value pairs in the hash.
+ *     
+ *     h = { "d" => 100, "a" => 200, "v" => 300, "e" => 400 }
+ *     h.length        #=> 4
+ *     h.delete("a")   #=> 200
+ *     h.length        #=> 3
+ */
+
+static VALUE
+rb_hash_size(hash)
+    VALUE hash;
+{
+    return INT2FIX(RHASH(hash)->tbl->num_entries);
+}
+
+
+/*
+ *  call-seq:
+ *     hsh.empty?    => true or false
+ *  
+ *  Returns <code>true</code> if <i>hsh</i> contains no key-value pairs.
+ *     
+ *     {}.empty?   #=> true
+ *     
+ */
+
+static VALUE
+rb_hash_empty_p(hash)
+    VALUE hash;
+{
+    if (RHASH(hash)->tbl->num_entries == 0)
+	return Qtrue;
+    return Qfalse;
+}
+
+static int
+each_value_i(key, value)
+    VALUE key, value;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    rb_yield(value);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.each_value {| value | block } -> hsh
+ *  
+ *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the
+ *  value as a parameter.
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.each_value {|value| puts value }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     100
+ *     200
+ */
+
+static VALUE
+rb_hash_each_value(hash)
+    VALUE hash;
+{
+    rb_hash_foreach(hash, each_value_i, 0);
+    return hash;
+}
+
+static int
+each_key_i(key, value)
+    VALUE key, value;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    rb_yield(key);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.each_key {| key | block } -> hsh
+ *  
+ *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
+ *  as a parameter.
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.each_key {|key| puts key }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     a
+ *     b
+ */
+static VALUE
+rb_hash_each_key(hash)
+    VALUE hash;
+{
+    rb_hash_foreach(hash, each_key_i, 0);
+    return hash;
+}
+
+static int
+each_pair_i(key, value)
+    VALUE key, value;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    rb_yield_values(2, key, value);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.each_pair {| key_value_array | block } -> hsh
+ *  
+ *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
+ *  and value as parameters.
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.each_pair {|key, value| puts "#{key} is #{value}" }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     a is 100
+ *     b is 200
+ *     
+ */
+
+static VALUE
+rb_hash_each_pair(hash)
+    VALUE hash;
+{
+    rb_hash_foreach(hash, each_pair_i, 0);
+    return hash;
+}
+
+static int
+each_i(key, value)
+    VALUE key, value;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    rb_yield(rb_assoc_new(key, value));
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.each {| key, value | block } -> hsh
+ *  
+ *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
+ *  and value to the block as a two-element array. Because of the assignment
+ *  semantics of block parameters, these elements will be split out if the
+ *  block has two formal parameters. Also see <code>Hash.each_pair</code>, which
+ *  will be marginally more efficient for blocks with two parameters.
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.each {|key, value| puts "#{key} is #{value}" }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     a is 100
+ *     b is 200
+ *     
+ */
+
+static VALUE
+rb_hash_each(hash)
+    VALUE hash;
+{
+    rb_hash_foreach(hash, each_i, 0);
+    return hash;
+}
+
+static int
+to_a_i(key, value, ary)
+    VALUE key, value, ary;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    rb_ary_push(ary, rb_assoc_new(key, value));
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.to_a -> array
+ *  
+ *  Converts <i>hsh</i> to a nested array of <code>[</code> <i>key,
+ *  value</i> <code>]</code> arrays.
+ *     
+ *     h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300  }
+ *     h.to_a   #=> [["a", 100], ["c", 300], ["d", 400]]
+ */
+
+static VALUE
+rb_hash_to_a(hash)
+    VALUE hash;
+{
+    VALUE ary;
+
+    ary = rb_ary_new();
+    rb_hash_foreach(hash, to_a_i, ary);
+    if (OBJ_TAINTED(hash)) OBJ_TAINT(ary);
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     hsh.sort                    => array 
+ *     hsh.sort {| a, b | block }  => array 
+ * 
+ *  Converts <i>hsh</i> to a nested array of <code>[</code> <i>key,
+ *  value</i> <code>]</code> arrays and sorts it, using
+ *  <code>Array#sort</code>.
+ *     
+ *     h = { "a" => 20, "b" => 30, "c" => 10  }
+ *     h.sort                       #=> [["a", 20], ["b", 30], ["c", 10]]
+ *     h.sort {|a,b| a[1]<=>b[1]}   #=> [["c", 10], ["a", 20], ["b", 30]]
+ *     
+ */
+
+static VALUE
+rb_hash_sort(hash)
+    VALUE hash;
+{
+    VALUE entries = rb_hash_to_a(hash);
+    rb_ary_sort_bang(entries);
+    return entries;
+}
+
+static int
+inspect_i(key, value, str)
+    VALUE key, value, str;
+{
+    VALUE str2;
+
+    if (key == Qundef) return ST_CONTINUE;
+    if (RSTRING(str)->len > 1) {
+	rb_str_cat2(str, ", ");
+    }
+    str2 = rb_inspect(key);
+    rb_str_buf_append(str, str2);
+    OBJ_INFECT(str, str2);
+    rb_str_buf_cat2(str, "=>");
+    str2 = rb_inspect(value);
+    rb_str_buf_append(str, str2);
+    OBJ_INFECT(str, str2);
+
+    return ST_CONTINUE;
+}
+
+static VALUE
+inspect_hash(hash)
+    VALUE hash;
+{
+    VALUE str;
+
+    str = rb_str_buf_new2("{");
+    rb_hash_foreach(hash, inspect_i, str);
+    rb_str_buf_cat2(str, "}");
+    OBJ_INFECT(str, hash);
+
+    return str;
+}
+
+/*
+ * call-seq:
+ *   hsh.inspect  => string
+ *
+ * Return the contents of this hash as a string.
+ */
+
+static VALUE
+rb_hash_inspect(hash)
+    VALUE hash;
+{
+    if (RHASH(hash)->tbl == 0 || RHASH(hash)->tbl->num_entries == 0)
+	return rb_str_new2("{}");
+    if (rb_inspecting_p(hash)) return rb_str_new2("{...}");
+    return rb_protect_inspect(inspect_hash, hash, 0);
+}
+
+static VALUE
+to_s_hash(hash)
+    VALUE hash;
+{
+    return rb_ary_to_s(rb_hash_to_a(hash));
+}
+
+/*
+ *  call-seq:
+ *     hsh.to_s   => string
+ *  
+ *  Converts <i>hsh</i> to a string by converting the hash to an array
+ *  of <code>[</code> <i>key, value</i> <code>]</code> pairs and then
+ *  converting that array to a string using <code>Array#join</code> with
+ *  the default separator.
+ *     
+ *     h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300  }
+ *     h.to_s   #=> "a100c300d400"
+ */
+
+static VALUE
+rb_hash_to_s(hash)
+    VALUE hash;
+{
+    if (rb_inspecting_p(hash)) return rb_str_new2("{...}");
+    return rb_protect_inspect(to_s_hash, hash, 0);
+}
+
+/*
+ * call-seq:
+ *    hsh.to_hash   => hsh
+ *
+ * Returns <i>self</i>.
+ */
+
+static VALUE
+rb_hash_to_hash(hash)
+    VALUE hash;
+{
+    return hash;
+}
+
+static int
+keys_i(key, value, ary)
+    VALUE key, value, ary;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    rb_ary_push(ary, key);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.keys    => array
+ *  
+ *  Returns a new array populated with the keys from this hash. See also
+ *  <code>Hash#values</code>.
+ *     
+ *     h = { "a" => 100, "b" => 200, "c" => 300, "d" => 400 }
+ *     h.keys   #=> ["a", "b", "c", "d"]
+ *     
+ */
+
+static VALUE
+rb_hash_keys(hash)
+    VALUE hash;
+{
+    VALUE ary;
+
+    ary = rb_ary_new();
+    rb_hash_foreach(hash, keys_i, ary);
+
+    return ary;
+}
+
+static int
+values_i(key, value, ary)
+    VALUE key, value, ary;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    rb_ary_push(ary, value);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.values    => array
+ *  
+ *  Returns a new array populated with the values from <i>hsh</i>. See
+ *  also <code>Hash#keys</code>.
+ *     
+ *     h = { "a" => 100, "b" => 200, "c" => 300 }
+ *     h.values   #=> [100, 200, 300]
+ *     
+ */
+
+static VALUE
+rb_hash_values(hash)
+    VALUE hash;
+{
+    VALUE ary;
+
+    ary = rb_ary_new();
+    rb_hash_foreach(hash, values_i, ary);
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     hsh.has_key?(key)    => true or false
+ *     hsh.include?(key)    => true or false
+ *     hsh.key?(key)        => true or false
+ *     hsh.member?(key)     => true or false
+ *  
+ *  Returns <code>true</code> if the given key is present in <i>hsh</i>.
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.has_key?("a")   #=> true
+ *     h.has_key?("z")   #=> false
+ *     
+ */
+
+static VALUE
+rb_hash_has_key(hash, key)
+    VALUE hash;
+    VALUE key;
+{
+    if (st_lookup(RHASH(hash)->tbl, key, 0)) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+static int
+rb_hash_search_value(key, value, data)
+    VALUE key, value, *data;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    if (rb_equal(value, data[1])) {
+	data[0] = Qtrue;
+	return ST_STOP;
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.has_value?(value)    => true or false
+ *     hsh.value?(value)        => true or false
+ *  
+ *  Returns <code>true</code> if the given value is present for some key
+ *  in <i>hsh</i>.
+ *     
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.has_value?(100)   #=> true
+ *     h.has_value?(999)   #=> false
+ */
+
+static VALUE
+rb_hash_has_value(hash, val)
+    VALUE hash;
+    VALUE val;
+{
+    VALUE data[2];
+
+    data[0] = Qfalse;
+    data[1] = val;
+    rb_hash_foreach(hash, rb_hash_search_value, (st_data_t)data);
+    return data[0];
+}
+
+struct equal_data {
+    int result;
+    st_table *tbl;
+};
+
+static int
+equal_i(key, val1, data)
+    VALUE key, val1;
+    struct equal_data *data;
+{
+    VALUE val2;
+
+    if (key == Qundef) return ST_CONTINUE;
+    if (!st_lookup(data->tbl, key, &val2)) {
+	data->result = Qfalse;
+	return ST_STOP;
+    }
+    if (!rb_equal(val1, val2)) {
+	data->result = Qfalse;
+	return ST_STOP;
+    }
+    return ST_CONTINUE;
+}
+
+static VALUE
+hash_equal(hash1, hash2, eql)
+    VALUE hash1, hash2;
+    int eql;			/* compare default value if true */
+{
+    struct equal_data data;
+
+    if (hash1 == hash2) return Qtrue;
+    if (TYPE(hash2) != T_HASH) {
+	if (!rb_respond_to(hash2, rb_intern("to_hash"))) {
+	    return Qfalse;
+	}
+	return rb_equal(hash2, hash1);
+    }
+    if (RHASH(hash1)->tbl->num_entries != RHASH(hash2)->tbl->num_entries)
+	return Qfalse;
+    if (eql) {
+	if (!(rb_equal(RHASH(hash1)->ifnone, RHASH(hash2)->ifnone) &&
+	      FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
+	    return Qfalse;
+    }
+
+    data.tbl = RHASH(hash2)->tbl;
+    data.result = Qtrue;
+    rb_hash_foreach(hash1, equal_i, (st_data_t)&data);
+
+    return data.result;
+}
+
+/*
+ *  call-seq:
+ *     hsh == other_hash    => true or false
+ *  
+ *  Equality---Two hashes are equal if they each contain the same number
+ *  of keys and if each key-value pair is equal to (according to
+ *  <code>Object#==</code>) the corresponding elements in the other
+ *  hash.
+ *     
+ *     h1 = { "a" => 1, "c" => 2 }
+ *     h2 = { 7 => 35, "c" => 2, "a" => 1 }
+ *     h3 = { "a" => 1, "c" => 2, 7 => 35 }
+ *     h4 = { "a" => 1, "d" => 2, "f" => 35 }
+ *     h1 == h2   #=> false
+ *     h2 == h3   #=> true
+ *     h3 == h4   #=> false
+ *     
+ */
+
+static VALUE
+rb_hash_equal(hash1, hash2)
+    VALUE hash1, hash2;
+{
+    return hash_equal(hash1, hash2, Qfalse);
+}
+
+static int
+rb_hash_invert_i(key, value, hash)
+    VALUE key, value;
+    VALUE hash;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    rb_hash_aset(hash, value, key);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.invert -> aHash
+ *  
+ *  Returns a new hash created by using <i>hsh</i>'s values as keys, and
+ *  the keys as values.
+ *     
+ *     h = { "n" => 100, "m" => 100, "y" => 300, "d" => 200, "a" => 0 }
+ *     h.invert   #=> {0=>"a", 100=>"n", 200=>"d", 300=>"y"}
+ *     
+ */
+
+static VALUE
+rb_hash_invert(hash)
+    VALUE hash;
+{
+    VALUE h = rb_hash_new();
+
+    rb_hash_foreach(hash, rb_hash_invert_i, h);
+    return h;
+}
+
+static int
+rb_hash_update_i(key, value, hash)
+    VALUE key, value;
+    VALUE hash;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    rb_hash_aset(hash, key, value);
+    return ST_CONTINUE;
+}
+
+static int
+rb_hash_update_block_i(key, value, hash)
+    VALUE key, value;
+    VALUE hash;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    if (rb_hash_has_key(hash, key)) {
+	value = rb_yield_values(3, key, rb_hash_aref(hash, key), value);
+    }
+    rb_hash_aset(hash, key, value);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.merge!(other_hash)                                 => hsh
+ *     hsh.update(other_hash)                                 => hsh
+ *     hsh.merge!(other_hash){|key, oldval, newval| block}    => hsh
+ *     hsh.update(other_hash){|key, oldval, newval| block}    => hsh
+ *  
+ *  Adds the contents of <i>other_hash</i> to <i>hsh</i>, overwriting
+ *  entries with duplicate keys with those from <i>other_hash</i>.
+ *     
+ *     h1 = { "a" => 100, "b" => 200 }
+ *     h2 = { "b" => 254, "c" => 300 }
+ *     h1.merge!(h2)   #=> {"a"=>100, "b"=>254, "c"=>300}
+ */
+
+static VALUE
+rb_hash_update(hash1, hash2)
+    VALUE hash1, hash2;
+{
+    hash2 = to_hash(hash2);
+    if (rb_block_given_p()) {
+	rb_hash_foreach(hash2, rb_hash_update_block_i, hash1);
+    }
+    else {
+	rb_hash_foreach(hash2, rb_hash_update_i, hash1);
+    }
+    return hash1;
+}
+
+/*
+ *  call-seq:
+ *     hsh.merge(other_hash)                              -> a_hash
+ *     hsh.merge(other_hash){|key, oldval, newval| block} -> a_hash
+ *  
+ *  Returns a new hash containing the contents of <i>other_hash</i> and
+ *  the contents of <i>hsh</i>, overwriting entries in <i>hsh</i> with
+ *  duplicate keys with those from <i>other_hash</i>.
+ *     
+ *     h1 = { "a" => 100, "b" => 200 }
+ *     h2 = { "b" => 254, "c" => 300 }
+ *     h1.merge(h2)   #=> {"a"=>100, "b"=>254, "c"=>300}
+ *     h1             #=> {"a"=>100, "b"=>200}
+ *     
+ */
+
+static VALUE
+rb_hash_merge(hash1, hash2)
+    VALUE hash1, hash2;
+{
+    return rb_hash_update(rb_obj_dup(hash1), hash2);
+}
+
+static int path_tainted = -1;
+
+static char **origenviron;
+#ifdef _WIN32
+#define GET_ENVIRON(e) (e = rb_w32_get_environ())
+#define FREE_ENVIRON(e) rb_w32_free_environ(e)
+static char **my_environ;
+#undef environ
+#define environ my_environ
+#elif defined(__APPLE__)
+#undef environ
+#define environ (*_NSGetEnviron())
+#define GET_ENVIRON(e) (e)
+#define FREE_ENVIRON(e)
+#else
+extern char **environ;
+#define GET_ENVIRON(e) (e)
+#define FREE_ENVIRON(e)
+#endif
+
+static VALUE
+env_str_new(ptr, len)
+    const char *ptr;
+    long len;
+{
+    VALUE str = rb_tainted_str_new(ptr, len);
+
+    rb_obj_freeze(str);
+    return str;
+}
+
+static VALUE
+env_str_new2(ptr)
+    const char *ptr;
+{
+    if (!ptr) return Qnil;
+    return env_str_new(ptr, strlen(ptr));
+}
+
+static VALUE
+env_delete(obj, name)
+    VALUE obj, name;
+{
+    char *nam, *val;
+
+    rb_secure(4);
+    SafeStringValue(name);
+    nam = RSTRING(name)->ptr;
+    if (strlen(nam) != RSTRING(name)->len) {
+	rb_raise(rb_eArgError, "bad environment variable name");
+    }
+    val = getenv(nam);
+    if (val) {
+	VALUE value = env_str_new2(val);
+
+	ruby_setenv(nam, 0);
+#ifdef ENV_IGNORECASE
+	if (strcasecmp(nam, PATH_ENV) == 0)
+#else
+	if (strcmp(nam, PATH_ENV) == 0)
+#endif
+	{
+	    path_tainted = 0;
+	}
+	return value;
+    }
+    return Qnil;
+}
+
+static VALUE
+env_delete_m(obj, name)
+    VALUE obj, name;
+{
+    VALUE val;
+
+    val = env_delete(obj, name);
+    if (NIL_P(val) && rb_block_given_p()) rb_yield(name);
+    return val;
+}
+
+static VALUE
+rb_f_getenv(obj, name)
+    VALUE obj, name;
+{
+    char *nam, *env;
+
+    StringValue(name);
+    nam = RSTRING(name)->ptr;
+    if (strlen(nam) != RSTRING(name)->len) {
+	rb_raise(rb_eArgError, "bad environment variable name");
+    }
+    env = getenv(nam);
+    if (env) {
+#ifdef ENV_IGNORECASE
+	if (strcasecmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
+#else
+	if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
+#endif
+	{
+	    VALUE str = rb_str_new2(env);
+
+	    rb_obj_freeze(str);
+	    return str;
+	}
+	return env_str_new2(env);
+    }
+    return Qnil;
+}
+
+static VALUE
+env_fetch(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE key, if_none;
+    long block_given;
+    char *nam, *env;
+
+    rb_scan_args(argc, argv, "11", &key, &if_none);
+    block_given = rb_block_given_p();
+    if (block_given && argc == 2) {
+	rb_warn("block supersedes default value argument");
+    }
+    StringValue(key);
+    nam = RSTRING(key)->ptr;
+    if (strlen(nam) != RSTRING(key)->len) {
+	rb_raise(rb_eArgError, "bad environment variable name");
+    }
+    env = getenv(nam);
+    if (!env) {
+	if (block_given) return rb_yield(key);
+	if (argc == 1) {
+	    rb_raise(rb_eIndexError, "key not found");
+	}
+	return if_none;
+    }
+#ifdef ENV_IGNORECASE
+    if (strcasecmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
+#else
+    if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
+#endif
+	return rb_str_new2(env);
+    return env_str_new2(env);
+}
+
+static void
+path_tainted_p(path)
+    char *path;
+{
+    path_tainted = rb_path_check(path)?0:1;
+}
+
+int
+rb_env_path_tainted()
+{
+    if (path_tainted < 0) {
+	path_tainted_p(getenv(PATH_ENV));
+    }
+    return path_tainted;
+}
+
+static int
+envix(nam)
+    const char *nam;
+{
+    register int i, len = strlen(nam);
+    char **env;
+
+    env = GET_ENVIRON(environ);
+    for (i = 0; env[i]; i++) {
+	if (
+#ifdef ENV_IGNORECASE
+	    strncasecmp(env[i],nam,len) == 0
+#else
+	    memcmp(env[i],nam,len) == 0
+#endif
+	    && env[i][len] == '=')
+	    break;			/* memcmp must come first to avoid */
+    }					/* potential SEGV's */
+    FREE_ENVIRON(environ);
+    return i;
+}
+
+void
+ruby_setenv(name, value)
+    const char *name;
+    const char *value;
+{
+#if defined(_WIN32)
+    /* The sane way to deal with the environment.
+     * Has these advantages over putenv() & co.:
+     *  * enables us to store a truly empty value in the
+     *    environment (like in UNIX).
+     *  * we don't have to deal with RTL globals, bugs and leaks.
+     *  * Much faster.
+     * Why you may want to enable USE_WIN32_RTL_ENV:
+     *  * environ[] and RTL functions will not reflect changes,
+     *    which might be an issue if extensions want to access
+     *    the env. via RTL.  This cuts both ways, since RTL will
+     *    not see changes made by extensions that call the Win32
+     *    functions directly, either.
+     * GSAR 97-06-07
+     *
+     * REMARK: USE_WIN32_RTL_ENV is already obsoleted since we don't use
+     *         RTL's environ global variable directly yet.
+     */
+    SetEnvironmentVariable(name,value);
+#elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
+#undef setenv
+#undef unsetenv
+    if (value)
+	setenv(name,value,1);
+    else
+	unsetenv(name);
+#else  /* WIN32 */
+    size_t len;
+    int i=envix(name);		        /* where does it go? */
+
+    if (environ == origenviron) {	/* need we copy environment? */
+	int j;
+	int max;
+	char **tmpenv;
+
+	for (max = i; environ[max]; max++) ;
+	tmpenv = ALLOC_N(char*, max+2);
+	for (j=0; j<max; j++)		/* copy environment */
+	    tmpenv[j] = strdup(environ[j]);
+	tmpenv[max] = 0;
+	environ = tmpenv;		/* tell exec where it is now */
+    }
+    if (environ[i]) {
+	char **envp = origenviron;
+	while (*envp && *envp != environ[i]) envp++;
+	if (!*envp)
+	    free(environ[i]);
+	if (!value) {
+	    while (environ[i]) {
+		environ[i] = environ[i+1];
+		i++;
+	    }
+	    return;
+	}
+    }
+    else {			/* does not exist yet */
+	if (!value) return;
+	REALLOC_N(environ, char*, i+2);	/* just expand it a bit */
+	environ[i+1] = 0;	/* make sure it's null terminated */
+    }
+    len = strlen(name) + strlen(value) + 2;
+    environ[i] = ALLOC_N(char, len);
+#ifndef MSDOS
+    snprintf(environ[i],len,"%s=%s",name,value); /* all that work just for this */
+#else
+    /* MS-DOS requires environment variable names to be in uppercase */
+    /* [Tom Dinger, 27 August 1990: Well, it doesn't _require_ it, but
+     * some utilities and applications may break because they only look
+     * for upper case strings. (Fixed strupr() bug here.)]
+     */
+    strcpy(environ[i],name); strupr(environ[i]);
+    sprintf(environ[i] + strlen(name),"=%s", value);
+#endif /* MSDOS */
+
+#endif /* WIN32 */
+}
+
+void
+ruby_unsetenv(name)
+    const char *name;
+{
+    ruby_setenv(name, 0);
+}
+
+static VALUE
+env_aset(obj, nm, val)
+    VALUE obj, nm, val;
+{
+    char *name, *value;
+
+    if (rb_safe_level() >= 4) {
+	rb_raise(rb_eSecurityError, "can't change environment variable");
+    }
+
+    if (NIL_P(val)) {
+	env_delete(obj, nm);
+	return Qnil;
+    }
+
+    StringValue(nm);
+    StringValue(val);
+    name = RSTRING(nm)->ptr;
+    value = RSTRING(val)->ptr;
+    if (strlen(name) != RSTRING(nm)->len)
+	rb_raise(rb_eArgError, "bad environment variable name");
+    if (strlen(value) != RSTRING(val)->len)
+	rb_raise(rb_eArgError, "bad environment variable value");
+
+    ruby_setenv(name, value);
+#ifdef ENV_IGNORECASE
+    if (strcasecmp(name, PATH_ENV) == 0) {
+#else
+    if (strcmp(name, PATH_ENV) == 0) {
+#endif
+	if (OBJ_TAINTED(val)) {
+	    /* already tainted, no check */
+	    path_tainted = 1;
+	    return val;
+	}
+	else {
+	    path_tainted_p(value);
+	}
+    }
+    return val;
+}
+
+static VALUE
+env_keys()
+{
+    char **env;
+    VALUE ary = rb_ary_new();
+
+    env = GET_ENVIRON(environ);
+    while (*env) {
+	char *s = strchr(*env, '=');
+	if (s) {
+	    rb_ary_push(ary, env_str_new(*env, s-*env));
+	}
+	env++;
+    }
+    FREE_ENVIRON(environ);
+    return ary;
+}
+
+static VALUE
+env_each_key(ehash)
+    VALUE ehash;
+{
+    VALUE keys = env_keys();
+    long i;
+
+    for (i=0; i<RARRAY(keys)->len; i++) {
+	rb_yield(RARRAY(keys)->ptr[i]);
+    }
+    return ehash;
+}
+
+static VALUE
+env_values()
+{
+    char **env;
+    VALUE ary = rb_ary_new();
+
+    env = GET_ENVIRON(environ);
+    while (*env) {
+	char *s = strchr(*env, '=');
+	if (s) {
+	    rb_ary_push(ary, env_str_new2(s+1));
+	}
+	env++;
+    }
+    FREE_ENVIRON(environ);
+    return ary;
+}
+
+static VALUE
+env_each_value(ehash)
+    VALUE ehash;
+{
+    VALUE values = env_values();
+    long i;
+
+    for (i=0; i<RARRAY(values)->len; i++) {
+	rb_yield(RARRAY(values)->ptr[i]);
+    }
+    return ehash;
+}
+
+static VALUE
+env_each_i(ehash, values)
+    VALUE ehash;
+    int values;
+{
+    char **env;
+    VALUE ary = rb_ary_new();
+    long i;
+
+    env = GET_ENVIRON(environ);
+    while (*env) {
+	char *s = strchr(*env, '=');
+	if (s) {
+	    rb_ary_push(ary, env_str_new(*env, s-*env));
+	    rb_ary_push(ary, env_str_new2(s+1));
+	}
+	env++;
+    }
+    FREE_ENVIRON(environ);
+
+    for (i=0; i<RARRAY(ary)->len; i+=2) {
+	if (values) {
+	    rb_yield_values(2, RARRAY(ary)->ptr[i], RARRAY(ary)->ptr[i+1]);
+	}
+	else {
+	    rb_yield(rb_assoc_new(RARRAY(ary)->ptr[i], RARRAY(ary)->ptr[i+1]));
+	}
+    }
+    return ehash;
+}
+
+static VALUE
+env_each(ehash)
+    VALUE ehash;
+{
+    return env_each_i(ehash, Qfalse);
+}
+
+static VALUE
+env_each_pair(ehash)
+    VALUE ehash;
+{
+    return env_each_i(ehash, Qtrue);
+}
+
+static VALUE
+env_reject_bang()
+{
+    volatile VALUE keys;
+    long i;
+    int del = 0;
+
+    rb_secure(4);
+    keys = env_keys();
+
+    for (i=0; i<RARRAY(keys)->len; i++) {
+	VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
+	if (!NIL_P(val)) {
+	    if (RTEST(rb_yield_values(2, RARRAY(keys)->ptr[i], val))) {
+		FL_UNSET(RARRAY(keys)->ptr[i], FL_TAINT);
+		env_delete(Qnil, RARRAY(keys)->ptr[i]);
+		del++;
+	    }
+	}
+    }
+    if (del == 0) return Qnil;
+    return envtbl;
+}
+
+static VALUE
+env_delete_if()
+{
+    env_reject_bang();
+    return envtbl;
+}
+
+static VALUE
+env_values_at(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE result = rb_ary_new();
+    long i;
+
+    for (i=0; i<argc; i++) {
+	rb_ary_push(result, rb_f_getenv(Qnil, argv[i]));
+    }
+    return result;
+}
+
+static VALUE
+env_select(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE result;
+    char **env;
+
+    if (argc > 0) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+    }
+    result = rb_ary_new();
+    env = GET_ENVIRON(environ);
+    while (*env) {
+	char *s = strchr(*env, '=');
+	if (s) {
+	    VALUE k = env_str_new(*env, s-*env);
+	    VALUE v = env_str_new2(s+1);
+	    if (RTEST(rb_yield_values(2, k, v))) {
+		rb_ary_push(result, rb_assoc_new(k, v));
+	    }
+	}
+	env++;
+    }
+    FREE_ENVIRON(environ);
+
+    return result;
+}
+
+static VALUE
+env_clear()
+{
+    volatile VALUE keys;
+    long i;
+    
+    rb_secure(4);
+    keys = env_keys();
+
+    for (i=0; i<RARRAY(keys)->len; i++) {
+	VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
+	if (!NIL_P(val)) {
+	    env_delete(Qnil, RARRAY(keys)->ptr[i]);
+	}
+    }
+    return envtbl;
+}
+
+static VALUE
+env_to_s()
+{
+    return rb_str_new2("ENV");
+}
+
+static VALUE
+env_inspect()
+{
+    char **env;
+    VALUE str = rb_str_buf_new2("{");
+    VALUE i;
+
+    env = GET_ENVIRON(environ);
+    while (*env) {
+	char *s = strchr(*env, '=');
+
+	if (env != environ) {
+	    rb_str_buf_cat2(str, ", ");
+	}
+	if (s) {
+	    rb_str_buf_cat2(str, "\"");
+	    rb_str_buf_cat(str, *env, s-*env);
+	    rb_str_buf_cat2(str, "\"=>");
+	    i = rb_inspect(rb_str_new2(s+1));
+	    rb_str_buf_append(str, i);
+	}
+	env++;
+    }
+    FREE_ENVIRON(environ);
+    rb_str_buf_cat2(str, "}");
+    OBJ_TAINT(str);
+
+    return str;
+}
+
+static VALUE
+env_to_a()
+{
+    char **env;
+    VALUE ary = rb_ary_new();
+
+    env = GET_ENVIRON(environ);
+    while (*env) {
+	char *s = strchr(*env, '=');
+	if (s) {
+	    rb_ary_push(ary, rb_assoc_new(env_str_new(*env, s-*env),
+					  env_str_new2(s+1)));
+	}
+	env++;
+    }
+    FREE_ENVIRON(environ);
+    return ary;
+}
+
+static VALUE
+env_none()
+{
+    return Qnil;
+}
+
+static VALUE
+env_size()
+{
+    int i;
+    char **env;
+
+    env = GET_ENVIRON(environ);
+    for(i=0; env[i]; i++)
+	;
+    FREE_ENVIRON(environ);
+    return INT2FIX(i);
+}
+
+static VALUE
+env_empty_p()
+{
+    char **env;
+
+    env = GET_ENVIRON(environ);
+    if (env[0] == 0) {
+	FREE_ENVIRON(environ);
+	return Qtrue;
+    }
+    FREE_ENVIRON(environ);
+    return Qfalse;
+}
+
+static VALUE
+env_has_key(env, key)
+    VALUE env, key;
+{
+    char *s;
+
+    s = StringValuePtr(key);
+    if (strlen(s) != RSTRING(key)->len)
+	rb_raise(rb_eArgError, "bad environment variable name");
+    if (getenv(s)) return Qtrue;
+    return Qfalse;
+}
+
+static VALUE
+env_has_value(dmy, value)
+    VALUE dmy, value;
+{
+    char **env;
+
+    if (TYPE(value) != T_STRING) return Qfalse;
+    env = GET_ENVIRON(environ);
+    while (*env) {
+	char *s = strchr(*env, '=');
+	if (s++) {
+	    long len = strlen(s);
+	    if (RSTRING(value)->len == len && strncmp(s, RSTRING(value)->ptr, len) == 0) {
+		FREE_ENVIRON(environ);
+		return Qtrue;
+	    }
+	}
+	env++;
+    }
+    FREE_ENVIRON(environ);
+    return Qfalse;
+}
+
+static VALUE
+env_index(dmy, value)
+    VALUE dmy, value;
+{
+    char **env;
+    VALUE str;
+
+    StringValue(value);
+    env = GET_ENVIRON(environ);
+    while (*env) {
+	char *s = strchr(*env, '=');
+	if (s++) {
+	    long len = strlen(s);
+	    if (RSTRING(value)->len == len && strncmp(s, RSTRING(value)->ptr, len) == 0) {
+		str = env_str_new(*env, s-*env-1);
+		FREE_ENVIRON(environ);
+		return str;
+	    }
+	}
+	env++;
+    }
+    FREE_ENVIRON(environ);
+    return Qnil;
+}
+
+static VALUE
+env_indexes(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    int i;
+    VALUE indexes = rb_ary_new2(argc);
+
+    rb_warn("ENV.%s is deprecated; use ENV.values_at",
+	    rb_id2name(rb_frame_last_func()));
+    for (i=0;i<argc;i++) {
+	VALUE tmp = rb_check_string_type(argv[i]);
+	if (NIL_P(tmp)) {
+	    RARRAY(indexes)->ptr[i] = Qnil;
+	}
+	else {
+	    RARRAY(indexes)->ptr[i] = env_str_new2(getenv(RSTRING(tmp)->ptr));
+	}
+	RARRAY(indexes)->len = i+1;
+    }
+
+    return indexes;
+}
+
+static VALUE
+env_to_hash()
+{
+    char **env;
+    VALUE hash = rb_hash_new();
+
+    env = GET_ENVIRON(environ);
+    while (*env) {
+	char *s = strchr(*env, '=');
+	if (s) {
+	    rb_hash_aset(hash, env_str_new(*env, s-*env),
+			       env_str_new2(s+1));
+	}
+	env++;
+    }
+    FREE_ENVIRON(environ);
+    return hash;
+}
+
+static VALUE
+env_reject()
+{
+    return rb_hash_delete_if(env_to_hash());
+}
+
+static VALUE
+env_shift()
+{
+    char **env;
+
+    env = GET_ENVIRON(environ);
+    if (*env) {
+	char *s = strchr(*env, '=');
+	if (s) {
+	    VALUE key = env_str_new(*env, s-*env);
+	    VALUE val = env_str_new2(getenv(RSTRING(key)->ptr));
+	    env_delete(Qnil, key);
+	    return rb_assoc_new(key, val);
+	}
+    }
+    FREE_ENVIRON(environ);
+    return Qnil;
+}
+
+static VALUE
+env_invert()
+{
+    return rb_hash_invert(env_to_hash());
+}
+
+static int
+env_replace_i(key, val, keys)
+    VALUE key, val, keys;
+{
+    if (key != Qundef) {
+	env_aset(Qnil, key, val);
+	if (rb_ary_includes(keys, key)) {
+	    rb_ary_delete(keys, key);
+	}
+    }
+    return ST_CONTINUE;
+}
+
+static VALUE
+env_replace(env, hash)
+    VALUE env, hash;
+{
+    volatile VALUE keys = env_keys();
+    long i;
+
+    if (env == hash) return env;
+    hash = to_hash(hash);
+    rb_hash_foreach(hash, env_replace_i, keys);
+
+    for (i=0; i<RARRAY(keys)->len; i++) {
+	env_delete(env, RARRAY(keys)->ptr[i]);
+    }
+    return env;
+}
+
+static int
+env_update_i(key, val)
+    VALUE key, val;
+{
+    if (key != Qundef) {
+	if (rb_block_given_p()) {
+	    val = rb_yield_values(3, key, rb_f_getenv(Qnil, key), val);
+	}
+	env_aset(Qnil, key, val);
+    }
+    return ST_CONTINUE;
+}
+
+static VALUE
+env_update(env, hash)
+    VALUE env, hash;
+{
+    if (env == hash) return env;
+    hash = to_hash(hash);
+    rb_hash_foreach(hash, env_update_i, 0);
+    return env;
+}
+
+/*
+ *  A <code>Hash</code> is a collection of key-value pairs. It is
+ *  similar to an <code>Array</code>, except that indexing is done via
+ *  arbitrary keys of any object type, not an integer index. The order
+ *  in which you traverse a hash by either key or value may seem
+ *  arbitrary, and will generally not be in the insertion order.
+ *     
+ *  Hashes have a <em>default value</em> that is returned when accessing
+ *  keys that do not exist in the hash. By default, that value is
+ *  <code>nil</code>.
+ *  
+ *  <code>Hash</code> uses <code>key.eql?</code> to test keys for equality.
+ *  If you need to use instances of your own classes as keys in a <code>Hash</code>,
+ *  it is recommended that you define both the <code>eql?</code> and <code>hash</code>
+ *  methods. The <code>hash</code> method must have the property that 
+ *  <code>a.eql?(b)</code> implies <code>a.hash == b.hash</code>.
+ *
+ *    class MyClass
+ *      attr_reader :str
+ *      def initialize(str)
+ *        @str = str
+ *      end
+ *      def eql?(o)
+ *        o.is_a?(MyClass) && str == o.str
+ *      end
+ *      def hash
+ *        @str.hash
+ *      end
+ *    end
+ *    
+ *    a = MyClass.new("some string")
+ *    b = MyClass.new("some string")
+ *    a.eql? b  #=> true
+ *    
+ *    h = {}
+ *    
+ *    h[a] = 1
+ *    h[a]      #=> 1
+ *    h[b]      #=> 1
+ *    
+ *    h[b] = 2
+ *    h[a]      #=> 2
+ *    h[b]      #=> 2
+ */
+
+void
+Init_Hash()
+{
+    id_hash = rb_intern("hash");
+    id_call = rb_intern("call");
+    id_default = rb_intern("default");
+
+    rb_cHash = rb_define_class("Hash", rb_cObject);
+
+    rb_include_module(rb_cHash, rb_mEnumerable);
+
+    rb_define_alloc_func(rb_cHash, hash_alloc);
+    rb_define_singleton_method(rb_cHash, "[]", rb_hash_s_create, -1);
+    rb_define_method(rb_cHash,"initialize", rb_hash_initialize, -1);
+    rb_define_method(rb_cHash,"initialize_copy", rb_hash_replace, 1);
+    rb_define_method(rb_cHash,"rehash", rb_hash_rehash, 0);
+
+    rb_define_method(rb_cHash,"to_hash", rb_hash_to_hash, 0);
+    rb_define_method(rb_cHash,"to_a", rb_hash_to_a, 0);
+    rb_define_method(rb_cHash,"to_s", rb_hash_to_s, 0);
+    rb_define_method(rb_cHash,"inspect", rb_hash_inspect, 0);
+
+    rb_define_method(rb_cHash,"==", rb_hash_equal, 1);
+    rb_define_method(rb_cHash,"[]", rb_hash_aref, 1);
+    rb_define_method(rb_cHash,"fetch", rb_hash_fetch, -1);
+    rb_define_method(rb_cHash,"[]=", rb_hash_aset, 2);
+    rb_define_method(rb_cHash,"store", rb_hash_aset, 2);
+    rb_define_method(rb_cHash,"default", rb_hash_default, -1);
+    rb_define_method(rb_cHash,"default=", rb_hash_set_default, 1);
+    rb_define_method(rb_cHash,"default_proc", rb_hash_default_proc, 0);
+    rb_define_method(rb_cHash,"index", rb_hash_index, 1);
+    rb_define_method(rb_cHash,"indexes", rb_hash_indexes, -1);
+    rb_define_method(rb_cHash,"indices", rb_hash_indexes, -1);
+    rb_define_method(rb_cHash,"size", rb_hash_size, 0);
+    rb_define_method(rb_cHash,"length", rb_hash_size, 0);
+    rb_define_method(rb_cHash,"empty?", rb_hash_empty_p, 0);
+
+    rb_define_method(rb_cHash,"each", rb_hash_each, 0);
+    rb_define_method(rb_cHash,"each_value", rb_hash_each_value, 0);
+    rb_define_method(rb_cHash,"each_key", rb_hash_each_key, 0);
+    rb_define_method(rb_cHash,"each_pair", rb_hash_each_pair, 0);
+    rb_define_method(rb_cHash,"sort", rb_hash_sort, 0);
+
+    rb_define_method(rb_cHash,"keys", rb_hash_keys, 0);
+    rb_define_method(rb_cHash,"values", rb_hash_values, 0);
+    rb_define_method(rb_cHash,"values_at", rb_hash_values_at, -1);
+
+    rb_define_method(rb_cHash,"shift", rb_hash_shift, 0);
+    rb_define_method(rb_cHash,"delete", rb_hash_delete, 1);
+    rb_define_method(rb_cHash,"delete_if", rb_hash_delete_if, 0);
+    rb_define_method(rb_cHash,"select", rb_hash_select, -1);
+    rb_define_method(rb_cHash,"reject", rb_hash_reject, 0);
+    rb_define_method(rb_cHash,"reject!", rb_hash_reject_bang, 0);
+    rb_define_method(rb_cHash,"clear", rb_hash_clear, 0);
+    rb_define_method(rb_cHash,"invert", rb_hash_invert, 0);
+    rb_define_method(rb_cHash,"update", rb_hash_update, 1);
+    rb_define_method(rb_cHash,"replace", rb_hash_replace, 1);
+    rb_define_method(rb_cHash,"merge!", rb_hash_update, 1);
+    rb_define_method(rb_cHash,"merge", rb_hash_merge, 1);
+
+    rb_define_method(rb_cHash,"include?", rb_hash_has_key, 1);
+    rb_define_method(rb_cHash,"member?", rb_hash_has_key, 1);
+    rb_define_method(rb_cHash,"has_key?", rb_hash_has_key, 1);
+    rb_define_method(rb_cHash,"has_value?", rb_hash_has_value, 1);
+    rb_define_method(rb_cHash,"key?", rb_hash_has_key, 1);
+    rb_define_method(rb_cHash,"value?", rb_hash_has_value, 1);
+
+#ifndef __MACOS__ /* environment variables nothing on MacOS. */
+    origenviron = environ;
+    envtbl = rb_obj_alloc(rb_cObject);
+    rb_extend_object(envtbl, rb_mEnumerable);
+
+    rb_define_singleton_method(envtbl,"[]", rb_f_getenv, 1);
+    rb_define_singleton_method(envtbl,"fetch", env_fetch, -1);
+    rb_define_singleton_method(envtbl,"[]=", env_aset, 2);
+    rb_define_singleton_method(envtbl,"store", env_aset, 2);
+    rb_define_singleton_method(envtbl,"each", env_each, 0);
+    rb_define_singleton_method(envtbl,"each_pair", env_each_pair, 0);
+    rb_define_singleton_method(envtbl,"each_key", env_each_key, 0);
+    rb_define_singleton_method(envtbl,"each_value", env_each_value, 0);
+    rb_define_singleton_method(envtbl,"delete", env_delete_m, 1);
+    rb_define_singleton_method(envtbl,"delete_if", env_delete_if, 0);
+    rb_define_singleton_method(envtbl,"clear", env_clear, 0);
+    rb_define_singleton_method(envtbl,"reject", env_reject, 0);
+    rb_define_singleton_method(envtbl,"reject!", env_reject_bang, 0);
+    rb_define_singleton_method(envtbl,"select", env_select, -1);
+    rb_define_singleton_method(envtbl,"shift", env_shift, 0);
+    rb_define_singleton_method(envtbl,"invert", env_invert, 0);
+    rb_define_singleton_method(envtbl,"replace", env_replace, 1);
+    rb_define_singleton_method(envtbl,"update", env_update, 1);
+    rb_define_singleton_method(envtbl,"inspect", env_inspect, 0);
+    rb_define_singleton_method(envtbl,"rehash", env_none, 0);
+    rb_define_singleton_method(envtbl,"to_a", env_to_a, 0);
+    rb_define_singleton_method(envtbl,"to_s", env_to_s, 0);
+    rb_define_singleton_method(envtbl,"index", env_index, 1);
+    rb_define_singleton_method(envtbl,"indexes", env_indexes, -1);
+    rb_define_singleton_method(envtbl,"indices", env_indexes, -1);
+    rb_define_singleton_method(envtbl,"size", env_size, 0);
+    rb_define_singleton_method(envtbl,"length", env_size, 0);
+    rb_define_singleton_method(envtbl,"empty?", env_empty_p, 0);
+    rb_define_singleton_method(envtbl,"keys", env_keys, 0);
+    rb_define_singleton_method(envtbl,"values", env_values, 0);
+    rb_define_singleton_method(envtbl,"values_at", env_values_at, -1);
+    rb_define_singleton_method(envtbl,"include?", env_has_key, 1);
+    rb_define_singleton_method(envtbl,"member?", env_has_key, 1);
+    rb_define_singleton_method(envtbl,"has_key?", env_has_key, 1);
+    rb_define_singleton_method(envtbl,"has_value?", env_has_value, 1);
+    rb_define_singleton_method(envtbl,"key?", env_has_key, 1);
+    rb_define_singleton_method(envtbl,"value?", env_has_value, 1);
+    rb_define_singleton_method(envtbl,"to_hash", env_to_hash, 0);
+
+    rb_define_global_const("ENV", envtbl);
+#else /* __MACOS__ */
+	envtbl = rb_hash_s_new(0, NULL, rb_cHash);
+    rb_define_global_const("ENV", envtbl);
+#endif  /* ifndef __MACOS__  environment variables nothing on MacOS. */
+}
diff --git a/ruby_1_8_6/ia64.s b/ruby_1_8_6/ia64.s
new file mode 100644
index 0000000000..ba5241daf2
--- /dev/null
+++ b/ruby_1_8_6/ia64.s
@@ -0,0 +1,33 @@
+// rb_ia64_flushrs and rb_ia64_bsp is written in IA64 assembly language
+// because Intel Compiler for IA64 doesn't support inline assembly.
+//
+// This file is based on following C program compiled by gcc.
+//
+//   void rb_ia64_flushrs(void) { __builtin_ia64_flushrs(); }
+//   void *rb_ia64_bsp(void) { return __builtin_ia64_bsp(); }
+// 
+	.file	"ia64.c"
+	.text
+	.align 16
+	.global rb_ia64_flushrs#
+	.proc rb_ia64_flushrs#
+rb_ia64_flushrs:
+	.prologue
+	.body
+	flushrs
+	;;
+	nop.i 0
+	br.ret.sptk.many b0
+	.endp rb_ia64_flushrs#
+	.align 16
+	.global rb_ia64_bsp#
+	.proc rb_ia64_bsp#
+rb_ia64_bsp:
+	.prologue
+	.body
+	nop.m 0
+	;;
+	mov r8 = ar.bsp
+	br.ret.sptk.many b0
+	.endp rb_ia64_bsp#
+	.ident	"GCC: (GNU) 3.3.5 (Debian 1:3.3.5-13)"
diff --git a/ruby_1_8_6/inits.c b/ruby_1_8_6/inits.c
new file mode 100644
index 0000000000..052573a443
--- /dev/null
+++ b/ruby_1_8_6/inits.c
@@ -0,0 +1,84 @@
+/**********************************************************************
+
+  inits.c -
+
+  $Author$
+  $Date$
+  created at: Tue Dec 28 16:01:58 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+
+void Init_Array _((void));
+void Init_Bignum _((void));
+void Init_Binding _((void));
+void Init_Comparable _((void));
+void Init_Dir _((void));
+void Init_Enumerable _((void));
+void Init_Exception _((void));
+void Init_syserr _((void));
+void Init_eval _((void));
+void Init_load _((void));
+void Init_Proc _((void));
+void Init_Thread _((void));
+void Init_File _((void));
+void Init_GC _((void));
+void Init_Hash _((void));
+void Init_IO _((void));
+void Init_Math _((void));
+void Init_marshal _((void));
+void Init_Numeric _((void));
+void Init_Object _((void));
+void Init_pack _((void));
+void Init_Precision _((void));
+void Init_sym _((void));
+void Init_process _((void));
+void Init_Random _((void));
+void Init_Range _((void));
+void Init_Regexp _((void));
+void Init_signal _((void));
+void Init_String _((void));
+void Init_Struct _((void));
+void Init_Time _((void));
+void Init_var_tables _((void));
+void Init_version _((void));
+
+void
+rb_call_inits()
+{
+    Init_sym();
+    Init_var_tables();
+    Init_Object();
+    Init_Comparable();
+    Init_Enumerable();
+    Init_Precision();
+    Init_eval();
+    Init_String();
+    Init_Exception();
+    Init_Thread();
+    Init_Numeric();
+    Init_Bignum();
+    Init_syserr();
+    Init_Array();
+    Init_Hash();
+    Init_Struct();
+    Init_Regexp();
+    Init_pack();
+    Init_Range();
+    Init_IO();
+    Init_Dir();
+    Init_Time();
+    Init_Random();
+    Init_signal();
+    Init_process();
+    Init_load();
+    Init_Proc();
+    Init_Binding();
+    Init_Math();
+    Init_GC();
+    Init_marshal();
+    Init_version();
+}
diff --git a/ruby_1_8_6/install-sh b/ruby_1_8_6/install-sh
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/ruby_1_8_6/install-sh
diff --git a/ruby_1_8_6/instruby.rb b/ruby_1_8_6/instruby.rb
new file mode 100755
index 0000000000..a5606e8452
--- /dev/null
+++ b/ruby_1_8_6/instruby.rb
@@ -0,0 +1,355 @@
+#!./miniruby
+
+load "./rbconfig.rb"
+include RbConfig
+
+srcdir = File.dirname(__FILE__)
+$:.unshift File.expand_path("lib", srcdir)
+require 'fileutils'
+require 'shellwords'
+require 'optparse'
+require 'optparse/shellwords'
+require 'tempfile'
+
+STDOUT.sync = true
+File.umask(0)
+
+def parse_args()
+  $mantype = 'doc'
+  $destdir = nil
+  $extout = nil
+  $make = 'make'
+  $mflags = []
+  $install = []
+  $installed_list = nil
+  $dryrun = false
+  $rdocdir = nil
+  opt = OptionParser.new
+  opt.on('-n') {$dryrun = true}
+  opt.on('--dest-dir=DIR') {|dir| $destdir = dir}
+  opt.on('--extout=DIR') {|dir| $extout = (dir unless dir.empty?)}
+  opt.on('--make=COMMAND') {|make| $make = make}
+  opt.on('--mantype=MAN') {|man| $mantype = man}
+  opt.on('--make-flags=FLAGS', '--mflags', Shellwords) do |v|
+    if arg = v.first
+      arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
+    end
+    $mflags.concat(v)
+  end
+  opt.on('-i', '--install=TYPE',
+         [:local, :bin, :lib, :man, :ext, :"ext-arch", :"ext-comm", :rdoc]) do |ins|
+    $install << ins
+  end
+  opt.on('--installed-list [FILENAME]') {|name| $installed_list = name}
+  opt.on('--rdoc-output [DIR]') {|dir| $rdocdir = dir}
+
+  opt.parse! rescue abort [$!.message, opt].join("\n")
+
+  $make, *rest = Shellwords.shellwords($make)
+  $mflags.unshift(*rest) unless rest.empty?
+
+  def $mflags.set?(flag)
+    grep(/\A-(?!-).*#{'%c' % flag}/i) { return true }
+    false
+  end
+  def $mflags.defined?(var)
+    grep(/\A#{var}=(.*)/) {return $1}
+    false
+  end
+
+  if $mflags.set?(?n)
+    $dryrun = true
+  else
+    $mflags << '-n' if $dryrun
+  end
+
+  $destdir ||= $mflags.defined?("DESTDIR")
+  if $extout ||= $mflags.defined?("EXTOUT")
+    Config.expand($extout)
+  end
+
+  $continue = $mflags.set?(?k)
+
+  if $installed_list ||= $mflags.defined?('INSTALLED_LIST')
+    Config.expand($installed_list, Config::CONFIG)
+    $installed_list = open($installed_list, "ab")
+    $installed_list.sync = true
+  end
+
+  $rdocdir ||= $mflags.defined?('RDOCOUT')
+end
+
+parse_args()
+
+include FileUtils
+include FileUtils::NoWrite if $dryrun
+@fileutils_output = STDOUT
+@fileutils_label = ''
+
+$install_procs = Hash.new {[]}
+def install?(*types, &block)
+  $install_procs[:all] <<= block
+  types.each do |type|
+    $install_procs[type] <<= block
+  end
+end
+
+def install(src, dest, options = {})
+  options[:preserve] = true
+  super(src, with_destdir(dest), options)
+  if $installed_list
+    dest = File.join(dest, File.basename(src)) if $made_dirs[dest]
+    $installed_list.puts dest
+  end
+end
+
+def ln_sf(src, dest)
+  super(src, with_destdir(dest))
+  $installed_list.puts dest if $installed_list
+end
+
+$made_dirs = {}
+def makedirs(dirs)
+  dirs = fu_list(dirs)
+  dirs.collect! do |dir|
+    realdir = with_destdir(dir)
+    realdir unless $made_dirs.fetch(dir) do
+      $made_dirs[dir] = true
+      $installed_list.puts(File.join(dir, "")) if $installed_list
+      File.directory?(realdir)
+    end
+  end.compact!
+  super(dirs, :mode => 0755) unless dirs.empty?
+end
+
+def install_recursive(src, dest, options = {})
+  noinst = options.delete(:no_install)
+  subpath = src.size..-1
+  Dir.glob("#{src}/**/*", File::FNM_DOTMATCH) do |src|
+    next if /\A\.{1,2}\z/ =~ (base = File.basename(src))
+    next if noinst and File.fnmatch?(noinst, File.basename(src))
+    d = dest + src[subpath]
+    if File.directory?(src)
+      makedirs(d)
+    else
+      install src, d
+    end
+  end
+end
+
+def open_for_install(path, mode, &block)
+  unless $dryrun
+    open(with_destdir(path), mode, &block)
+  end
+  $installed_list.puts path if /^w/ =~ mode and $installed_list
+end
+
+def with_destdir(dir)
+  return dir if !$destdir or $destdir.empty?
+  dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';'
+  $destdir + dir
+end
+
+exeext = CONFIG["EXEEXT"]
+
+ruby_install_name = CONFIG["ruby_install_name"]
+rubyw_install_name = CONFIG["rubyw_install_name"]
+
+version = CONFIG["ruby_version"]
+bindir = CONFIG["bindir"]
+libdir = CONFIG["libdir"]
+rubylibdir = CONFIG["rubylibdir"]
+archlibdir = CONFIG["archdir"]
+sitelibdir = CONFIG["sitelibdir"]
+sitearchlibdir = CONFIG["sitearchdir"]
+mandir = File.join(CONFIG["mandir"], "man")
+configure_args = Shellwords.shellwords(CONFIG["configure_args"])
+enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
+dll = CONFIG["LIBRUBY_SO"]
+lib = CONFIG["LIBRUBY"]
+arc = CONFIG["LIBRUBY_A"]
+
+install?(:local, :arch, :bin) do
+  puts "installing binary commands"
+
+  makedirs [bindir, libdir, archlibdir]
+
+  install ruby_install_name+exeext, bindir, :mode => 0755
+  if rubyw_install_name and !rubyw_install_name.empty?
+    install rubyw_install_name+exeext, bindir, :mode => 0755
+  end
+  if enable_shared and dll != lib
+    install dll, bindir, :mode => 0755
+  end
+  install lib, libdir, :mode => 0755 unless lib == arc
+  install arc, libdir, :mode => 0644
+  install "config.h", archlibdir, :mode => 0644
+  install "rbconfig.rb", archlibdir, :mode => 0644
+  if CONFIG["ARCHFILE"]
+    for file in CONFIG["ARCHFILE"].split
+      install file, archlibdir, :mode => 0644
+    end
+  end
+
+  if dll == lib and dll != arc
+    for link in CONFIG["LIBRUBY_ALIASES"].split
+      ln_sf(dll, File.join(libdir, link))
+    end
+  end
+end
+
+if $extout
+  extout = "#$extout"
+  install?(:ext, :arch, :'ext-arch') do
+    puts "installing extension objects"
+    makedirs [archlibdir, sitearchlibdir]
+    if noinst = CONFIG["no_install_files"] and noinst.empty?
+      noinst = nil
+    end
+    install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst)
+  end
+  install?(:ext, :comm, :'ext-comm') do
+    puts "installing extension scripts"
+    makedirs [rubylibdir, sitelibdir]
+    install_recursive("#{extout}/common", rubylibdir)
+  end
+end
+
+install?(:rdoc) do
+  if $rdocdir
+    puts "installing rdoc"
+
+    ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR)/system')
+    Config.expand(ridatadir)
+    makedirs [ridatadir]
+    install_recursive($rdocdir, ridatadir)
+  end
+end
+
+install?(:local, :comm, :bin) do
+  puts "installing command scripts"
+
+  Dir.chdir srcdir
+  makedirs [bindir, rubylibdir]
+
+  ruby_shebang = File.join(bindir, ruby_install_name)
+  if File::ALT_SEPARATOR
+    ruby_bin_dosish = ruby_shebang.tr(File::SEPARATOR, File::ALT_SEPARATOR)
+  end
+  for src in Dir["bin/*"]
+    next unless File.file?(src)
+    next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src
+
+    name = ruby_install_name.sub(/ruby/, File.basename(src))
+    dest = File.join(bindir, name)
+
+    install src, dest, :mode => 0755
+
+    next if $dryrun
+
+    shebang = ''
+    body = ''
+    open_for_install(dest, "r+") { |f|
+      shebang = f.gets
+      body = f.read
+
+      if shebang.sub!(/^\#!.*?ruby\b/) {"#!" + ruby_shebang}
+        f.rewind
+        f.print shebang, body
+        f.truncate(f.pos)
+      end
+    }
+
+    if ruby_bin_dosish
+      batfile = File.join(bindir, name + ".bat")
+      open_for_install(batfile, "wb") {|b|
+        b.print((<<EOH+shebang+body+<<EOF).gsub(/\r?\n/, "\r\n"))
+@echo off
+@if not "%~d0" == "~d0" goto WinNT
+#{ruby_bin_dosish} -x "#{batfile}" %1 %2 %3 %4 %5 %6 %7 %8 %9
+@goto endofruby
+:WinNT
+"%~dp0#{ruby_install_name}" -x "%~f0" %*
+@goto endofruby
+EOH
+__END__
+:endofruby
+EOF
+      }
+    end
+  end
+end
+
+install?(:local, :comm, :lib) do
+  puts "installing library scripts"
+
+  Dir.chdir srcdir
+  makedirs [rubylibdir]
+
+  for f in Dir["lib/**/*{.rb,help-message}"]
+    dir = File.dirname(f).sub!(/\Alib/, rubylibdir) || rubylibdir
+    makedirs dir
+    install f, dir, :mode => 0644
+  end
+end
+
+install?(:local, :arch, :lib) do
+  puts "installing headers"
+
+  Dir.chdir(srcdir)
+  makedirs [archlibdir]
+  for f in Dir["*.h"]
+    install f, archlibdir, :mode => 0644
+  end
+
+  if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
+    win32libdir = File.join(archlibdir, "win32")
+    makedirs win32libdir
+    install "win32/win32.h", win32libdir, :mode => 0644
+  end
+end
+
+install?(:local, :comm, :man) do
+  puts "installing manpages"
+
+  Dir.chdir(srcdir)
+  for mdoc in Dir["*.[1-9]"]
+    next unless File.file?(mdoc) and open(mdoc){|fh| fh.read(1) == '.'}
+
+    destdir = mandir + mdoc[/(\d+)$/]
+    destfile = File.join(destdir, mdoc.sub(/ruby/, ruby_install_name))
+
+    makedirs destdir
+
+    if $mantype == "doc"
+      install mdoc, destfile, :mode => 0644
+    else
+      require 'mdoc2man.rb'
+
+      w = Tempfile.open(mdoc)
+
+      open(mdoc) { |r|
+        Mdoc2Man.mdoc2man(r, w)
+      }
+
+      w.close
+
+      install w.path, destfile, :mode => 0644
+    end
+  end
+end
+
+$install.concat ARGV.collect {|n| n.intern}
+$install << :local << :ext if $install.empty?
+$install.each do |inst|
+  $install_procs[inst].each do |block|
+    dir = Dir.pwd
+    begin
+      block.call
+    ensure
+      Dir.chdir(dir)
+    end
+  end
+end
+
+# vi:set sw=2:
diff --git a/ruby_1_8_6/intern.h b/ruby_1_8_6/intern.h
new file mode 100644
index 0000000000..47da14bb7a
--- /dev/null
+++ b/ruby_1_8_6/intern.h
@@ -0,0 +1,508 @@
+/**********************************************************************
+
+  intern.h -
+
+  $Author$
+  $Date$
+  created at: Thu Jun 10 14:22:17 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+/* 
+ * Functions and variables that are used by more than one source file of
+ * the kernel.
+ */
+
+#define ID_ALLOCATOR 1
+
+/* array.c */
+void rb_mem_clear _((register VALUE*, register long));
+VALUE rb_assoc_new _((VALUE, VALUE));
+VALUE rb_check_array_type _((VALUE));
+VALUE rb_ary_new _((void));
+VALUE rb_ary_new2 _((long));
+VALUE rb_ary_new3 __((long,...));
+VALUE rb_ary_new4 _((long, const VALUE *));
+VALUE rb_ary_freeze _((VALUE));
+VALUE rb_ary_aref _((int, VALUE*, VALUE));
+void rb_ary_store _((VALUE, long, VALUE));
+VALUE rb_ary_dup _((VALUE));
+VALUE rb_ary_to_ary _((VALUE));
+VALUE rb_ary_to_s _((VALUE));
+VALUE rb_ary_push _((VALUE, VALUE));
+VALUE rb_ary_pop _((VALUE));
+VALUE rb_ary_shift _((VALUE));
+VALUE rb_ary_unshift _((VALUE, VALUE));
+VALUE rb_ary_entry _((VALUE, long));
+VALUE rb_ary_each _((VALUE));
+VALUE rb_ary_join _((VALUE, VALUE));
+VALUE rb_ary_print_on _((VALUE, VALUE));
+VALUE rb_ary_reverse _((VALUE));
+VALUE rb_ary_sort _((VALUE));
+VALUE rb_ary_sort_bang _((VALUE));
+VALUE rb_ary_delete _((VALUE, VALUE));
+VALUE rb_ary_delete_at _((VALUE, long));
+VALUE rb_ary_clear _((VALUE));
+VALUE rb_ary_plus _((VALUE, VALUE));
+VALUE rb_ary_concat _((VALUE, VALUE));
+VALUE rb_ary_assoc _((VALUE, VALUE));
+VALUE rb_ary_rassoc _((VALUE, VALUE));
+VALUE rb_ary_includes _((VALUE, VALUE));
+VALUE rb_ary_cmp _((VALUE, VALUE));
+VALUE rb_protect_inspect _((VALUE(*)(ANYARGS),VALUE,VALUE));
+VALUE rb_inspecting_p _((VALUE));
+VALUE rb_check_array_value _((VALUE));
+VALUE rb_values_at _((VALUE, long, int, VALUE*, VALUE(*) _((VALUE,long))));
+/* bignum.c */
+VALUE rb_big_clone _((VALUE));
+void rb_big_2comp _((VALUE));
+VALUE rb_big_norm _((VALUE));
+VALUE rb_uint2big _((unsigned long));
+VALUE rb_int2big _((long));
+VALUE rb_uint2inum _((unsigned long));
+VALUE rb_int2inum _((long));
+VALUE rb_cstr_to_inum _((const char*, int, int));
+VALUE rb_str_to_inum _((VALUE, int, int));
+VALUE rb_cstr2inum _((const char*, int));
+VALUE rb_str2inum _((VALUE, int));
+VALUE rb_big2str _((VALUE, int));
+VALUE rb_big2str0 _((VALUE, int, int));
+long rb_big2long _((VALUE));
+#define rb_big2int(x) rb_big2long(x)
+unsigned long rb_big2ulong _((VALUE));
+#define rb_big2uint(x) rb_big2ulong(x)
+#if HAVE_LONG_LONG
+VALUE rb_ll2inum _((LONG_LONG));
+VALUE rb_ull2inum _((unsigned LONG_LONG));
+LONG_LONG rb_big2ll _((VALUE));
+unsigned LONG_LONG rb_big2ull _((VALUE));
+#endif  /* HAVE_LONG_LONG */
+void rb_quad_pack _((char*,VALUE));
+VALUE rb_quad_unpack _((const char*,int));
+VALUE rb_dbl2big _((double));
+double rb_big2dbl _((VALUE));
+VALUE rb_big_plus _((VALUE, VALUE));
+VALUE rb_big_minus _((VALUE, VALUE));
+VALUE rb_big_mul _((VALUE, VALUE));
+VALUE rb_big_divmod _((VALUE, VALUE));
+VALUE rb_big_pow _((VALUE, VALUE));
+VALUE rb_big_and _((VALUE, VALUE));
+VALUE rb_big_or _((VALUE, VALUE));
+VALUE rb_big_xor _((VALUE, VALUE));
+VALUE rb_big_lshift _((VALUE, VALUE));
+VALUE rb_big_rand _((VALUE, double*));
+/* class.c */
+VALUE rb_class_boot _((VALUE));
+VALUE rb_class_new _((VALUE));
+VALUE rb_mod_init_copy _((VALUE, VALUE));
+VALUE rb_class_init_copy _((VALUE, VALUE));
+VALUE rb_singleton_class_clone _((VALUE));
+void rb_singleton_class_attached _((VALUE,VALUE));
+VALUE rb_make_metaclass _((VALUE, VALUE));
+void rb_check_inheritable _((VALUE));
+VALUE rb_class_inherited _((VALUE, VALUE));
+VALUE rb_define_class_id _((ID, VALUE));
+VALUE rb_module_new _((void));
+VALUE rb_define_module_id _((ID));
+VALUE rb_mod_included_modules _((VALUE));
+VALUE rb_mod_include_p _((VALUE, VALUE));
+VALUE rb_mod_ancestors _((VALUE));
+VALUE rb_class_instance_methods _((int, VALUE*, VALUE));
+VALUE rb_class_public_instance_methods _((int, VALUE*, VALUE));
+VALUE rb_class_protected_instance_methods _((int, VALUE*, VALUE));
+VALUE rb_big_rshift(VALUE, VALUE);
+VALUE rb_class_private_instance_methods _((int, VALUE*, VALUE));
+VALUE rb_obj_singleton_methods _((int, VALUE*, VALUE));
+void rb_define_method_id _((VALUE, ID, VALUE (*)(ANYARGS), int));
+void rb_frozen_class_p _((VALUE));
+void rb_undef _((VALUE, ID));
+void rb_define_protected_method _((VALUE, const char*, VALUE (*)(ANYARGS), int));
+void rb_define_private_method _((VALUE, const char*, VALUE (*)(ANYARGS), int));
+void rb_define_singleton_method _((VALUE, const char*, VALUE(*)(ANYARGS), int));
+VALUE rb_singleton_class _((VALUE));
+/* compar.c */
+int rb_cmpint _((VALUE, VALUE, VALUE));
+NORETURN(void rb_cmperr _((VALUE, VALUE)));
+/* enum.c */
+/* error.c */
+RUBY_EXTERN int ruby_nerrs;
+VALUE rb_exc_new _((VALUE, const char*, long));
+VALUE rb_exc_new2 _((VALUE, const char*));
+VALUE rb_exc_new3 _((VALUE, VALUE));
+NORETURN(void rb_loaderror __((const char*, ...)));
+NORETURN(void rb_name_error __((ID, const char*, ...)));
+NORETURN(void rb_invalid_str _((const char*, const char*)));
+void rb_compile_error __((const char*, ...));
+void rb_compile_error_append __((const char*, ...));
+NORETURN(void rb_load_fail _((const char*)));
+NORETURN(void rb_error_frozen _((const char*)));
+void rb_check_frozen _((VALUE));
+/* eval.c */
+RUBY_EXTERN struct RNode *ruby_current_node;
+void ruby_set_current_source _((void));
+NORETURN(void rb_exc_raise _((VALUE)));
+NORETURN(void rb_exc_fatal _((VALUE)));
+VALUE rb_f_exit _((int,VALUE*));
+VALUE rb_f_abort _((int,VALUE*));
+void rb_remove_method _((VALUE, const char*));
+#define rb_disable_super(klass, name) ((void)0)
+#define rb_enable_super(klass, name) ((void)0)
+#define HAVE_RB_DEFINE_ALLOC_FUNC 1
+void rb_define_alloc_func _((VALUE, VALUE (*)(VALUE)));
+void rb_undef_alloc_func _((VALUE));
+void rb_clear_cache _((void));
+void rb_clear_cache_by_class _((VALUE));
+void rb_alias _((VALUE, ID, ID));
+void rb_attr _((VALUE,ID,int,int,int));
+int rb_method_boundp _((VALUE, ID, int));
+VALUE rb_dvar_defined _((ID));
+VALUE rb_dvar_curr _((ID));
+VALUE rb_dvar_ref _((ID));
+void rb_dvar_asgn _((ID, VALUE));
+void rb_dvar_push _((ID, VALUE));
+VALUE *rb_svar _((int));
+VALUE rb_eval_cmd _((VALUE, VALUE, int));
+int rb_obj_respond_to _((VALUE, ID, int));
+int rb_respond_to _((VALUE, ID));
+void rb_interrupt _((void));
+VALUE rb_apply _((VALUE, ID, VALUE));
+void rb_backtrace _((void));
+ID rb_frame_last_func _((void));
+VALUE rb_obj_instance_eval _((int, VALUE*, VALUE));
+VALUE rb_mod_module_eval _((int, VALUE*, VALUE));
+void rb_load _((VALUE, int));
+void rb_load_protect _((VALUE, int, int*));
+NORETURN(void rb_jump_tag _((int)));
+int rb_provided _((const char*));
+void rb_provide _((const char*));
+VALUE rb_f_require _((VALUE, VALUE));
+VALUE rb_require_safe _((VALUE, int));
+void rb_obj_call_init _((VALUE, int, VALUE*));
+VALUE rb_class_new_instance _((int, VALUE*, VALUE));
+VALUE rb_block_proc _((void));
+VALUE rb_f_lambda _((void));
+VALUE rb_proc_new _((VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE));
+VALUE rb_protect _((VALUE (*)(VALUE), VALUE, int*));
+void rb_set_end_proc _((void (*)(VALUE), VALUE));
+void rb_mark_end_proc _((void));
+void rb_exec_end_proc _((void));
+void ruby_finalize _((void));
+NORETURN(void ruby_stop _((int)));
+int ruby_cleanup _((int));
+int ruby_exec _((void));
+void rb_gc_mark_threads _((void));
+void rb_thread_start_timer _((void));
+void rb_thread_stop_timer _((void));
+void rb_thread_schedule _((void));
+void rb_thread_wait_fd _((int));
+int rb_thread_fd_writable _((int));
+void rb_thread_fd_close _((int));
+int rb_thread_alone _((void));
+void rb_thread_polling _((void));
+void rb_thread_sleep _((int));
+void rb_thread_sleep_forever _((void));
+VALUE rb_thread_stop _((void));
+VALUE rb_thread_wakeup _((VALUE));
+VALUE rb_thread_wakeup_alive _((VALUE));
+VALUE rb_thread_run _((VALUE));
+VALUE rb_thread_kill _((VALUE));
+VALUE rb_thread_alive_p _((VALUE));
+VALUE rb_thread_create _((VALUE (*)(ANYARGS), void*));
+void rb_thread_interrupt _((void));
+void rb_thread_trap_eval _((VALUE, int, int));
+void rb_thread_signal_raise _((int));
+void rb_thread_signal_exit _((void));
+int rb_thread_select _((int, fd_set *, fd_set *, fd_set *, struct timeval *));
+void rb_thread_wait_for _((struct timeval));
+VALUE rb_thread_current _((void));
+VALUE rb_thread_main _((void));
+VALUE rb_thread_local_aref _((VALUE, ID));
+VALUE rb_thread_local_aset _((VALUE, ID, VALUE));
+void rb_thread_atfork _((void));
+VALUE rb_funcall_rescue __((VALUE, ID, int, ...));
+/* file.c */
+VALUE rb_file_s_expand_path _((int, VALUE *));
+VALUE rb_file_expand_path _((VALUE, VALUE));
+void rb_file_const _((const char*, VALUE));
+int rb_find_file_ext _((VALUE*, const char* const*));
+VALUE rb_find_file _((VALUE));
+char *rb_path_next _((const char *));
+char *rb_path_skip_prefix _((const char *));
+char *rb_path_last_separator _((const char *));
+char *rb_path_end _((const char *));
+VALUE rb_file_directory_p _((VALUE,VALUE));
+/* gc.c */
+NORETURN(void rb_memerror __((void)));
+int ruby_stack_check _((void));
+int ruby_stack_length _((VALUE**));
+char *rb_source_filename _((const char*));
+void rb_gc_mark_locations _((VALUE*, VALUE*));
+void rb_mark_tbl _((struct st_table*));
+void rb_mark_hash _((struct st_table*));
+void rb_gc_mark_maybe _((VALUE));
+void rb_gc_mark _((VALUE));
+void rb_gc_force_recycle _((VALUE));
+void rb_gc _((void));
+void rb_gc_copy_finalizer _((VALUE,VALUE));
+void rb_gc_finalize_deferred _((void));
+void rb_gc_call_finalizer_at_exit _((void));
+VALUE rb_gc_enable _((void));
+VALUE rb_gc_disable _((void));
+VALUE rb_gc_start _((void));
+/* hash.c */
+void st_foreach_safe _((struct st_table *, int (*)(ANYARGS), unsigned long));
+void rb_hash_foreach _((VALUE, int (*)(ANYARGS), VALUE));
+VALUE rb_hash _((VALUE));
+VALUE rb_hash_new _((void));
+VALUE rb_hash_freeze _((VALUE));
+VALUE rb_hash_aref _((VALUE, VALUE));
+VALUE rb_hash_aset _((VALUE, VALUE, VALUE));
+VALUE rb_hash_delete_if _((VALUE));
+VALUE rb_hash_delete _((VALUE,VALUE));
+int rb_path_check _((char*));
+int rb_env_path_tainted _((void));
+/* io.c */
+#define rb_defout rb_stdout
+RUBY_EXTERN VALUE rb_fs;
+RUBY_EXTERN VALUE rb_output_fs;
+RUBY_EXTERN VALUE rb_rs;
+RUBY_EXTERN VALUE rb_default_rs;
+RUBY_EXTERN VALUE rb_output_rs;
+VALUE rb_io_write _((VALUE, VALUE));
+VALUE rb_io_gets _((VALUE));
+VALUE rb_io_getc _((VALUE));
+VALUE rb_io_ungetc _((VALUE, VALUE));
+VALUE rb_io_close _((VALUE));
+VALUE rb_io_eof _((VALUE));
+VALUE rb_io_binmode _((VALUE));
+VALUE rb_io_addstr _((VALUE, VALUE));
+VALUE rb_io_printf _((int, VALUE*, VALUE));
+VALUE rb_io_print _((int, VALUE*, VALUE));
+VALUE rb_io_puts _((int, VALUE*, VALUE));
+VALUE rb_file_open _((const char*, const char*));
+VALUE rb_gets _((void));
+void rb_write_error _((const char*));
+void rb_write_error2 _((const char*, long));
+/* marshal.c */
+VALUE rb_marshal_dump _((VALUE, VALUE));
+VALUE rb_marshal_load _((VALUE));
+/* numeric.c */
+void rb_num_zerodiv _((void));
+VALUE rb_num_coerce_bin _((VALUE, VALUE));
+VALUE rb_num_coerce_cmp _((VALUE, VALUE));
+VALUE rb_num_coerce_relop _((VALUE, VALUE));
+VALUE rb_float_new _((double));
+VALUE rb_num2fix _((VALUE));
+VALUE rb_fix2str _((VALUE, int));
+VALUE rb_dbl_cmp _((double, double));
+/* object.c */
+int rb_eql _((VALUE, VALUE));
+VALUE rb_any_to_s _((VALUE));
+VALUE rb_inspect _((VALUE));
+VALUE rb_obj_is_instance_of _((VALUE, VALUE));
+VALUE rb_obj_is_kind_of _((VALUE, VALUE));
+VALUE rb_obj_alloc _((VALUE));
+VALUE rb_obj_clone _((VALUE));
+VALUE rb_obj_dup _((VALUE));
+VALUE rb_obj_init_copy _((VALUE,VALUE));
+VALUE rb_obj_taint _((VALUE));
+VALUE rb_obj_tainted _((VALUE));
+VALUE rb_obj_untaint _((VALUE));
+VALUE rb_obj_freeze _((VALUE));
+VALUE rb_obj_id _((VALUE));
+VALUE rb_obj_class _((VALUE));
+VALUE rb_class_real _((VALUE));
+VALUE rb_class_inherited_p _((VALUE, VALUE));
+VALUE rb_convert_type _((VALUE,int,const char*,const char*));
+VALUE rb_check_convert_type _((VALUE,int,const char*,const char*));
+VALUE rb_to_int _((VALUE));
+VALUE rb_Integer _((VALUE));
+VALUE rb_Float _((VALUE));
+VALUE rb_String _((VALUE));
+VALUE rb_Array _((VALUE));
+double rb_cstr_to_dbl _((const char*, int));
+double rb_str_to_dbl _((VALUE, int));
+/* parse.y */
+RUBY_EXTERN int   ruby_sourceline;
+RUBY_EXTERN char *ruby_sourcefile;
+int ruby_yyparse _((void));
+ID rb_id_attrset _((ID));
+void rb_parser_append_print _((void));
+void rb_parser_while_loop _((int, int));
+int ruby_parser_stack_on_heap _((void));
+void rb_gc_mark_parser _((void));
+int rb_is_const_id _((ID));
+int rb_is_instance_id _((ID));
+int rb_is_class_id _((ID));
+int rb_is_local_id _((ID));
+int rb_is_junk_id _((ID));
+int rb_symname_p _((const char*));
+int rb_sym_interned_p _((VALUE));
+VALUE rb_backref_get _((void));
+void rb_backref_set _((VALUE));
+VALUE rb_lastline_get _((void));
+void rb_lastline_set _((VALUE));
+VALUE rb_sym_all_symbols _((void));
+/* process.c */
+int rb_proc_exec _((const char*));
+VALUE rb_f_exec _((int,VALUE*));
+int rb_waitpid _((int,int*,int));
+void rb_syswait _((int));
+VALUE rb_proc_times _((VALUE));
+VALUE rb_detach_process _((int));
+/* range.c */
+VALUE rb_range_new _((VALUE, VALUE, int));
+VALUE rb_range_beg_len _((VALUE, long*, long*, long, int));
+VALUE rb_length_by_each _((VALUE));
+/* re.c */
+int rb_memcmp _((const void*,const void*,long));
+int rb_memcicmp _((const void*,const void*,long));
+long rb_memsearch _((const void*,long,const void*,long));
+VALUE rb_reg_nth_defined _((int, VALUE));
+VALUE rb_reg_nth_match _((int, VALUE));
+VALUE rb_reg_last_match _((VALUE));
+VALUE rb_reg_match_pre _((VALUE));
+VALUE rb_reg_match_post _((VALUE));
+VALUE rb_reg_match_last _((VALUE));
+VALUE rb_reg_new _((const char*, long, int));
+VALUE rb_reg_match _((VALUE, VALUE));
+VALUE rb_reg_match2 _((VALUE));
+int rb_reg_options _((VALUE));
+void rb_set_kcode _((const char*));
+const char* rb_get_kcode _((void));
+void rb_kcode_set_option _((VALUE));
+void rb_kcode_reset_option _((void));
+/* ruby.c */
+RUBY_EXTERN VALUE rb_argv;
+RUBY_EXTERN VALUE rb_argv0;
+void rb_load_file _((const char*));
+void ruby_script _((const char*));
+void ruby_prog_init _((void));
+void ruby_set_argv _((int, char**));
+void ruby_process_options _((int, char**));
+void ruby_load_script _((void));
+void ruby_init_loadpath _((void));
+void ruby_incpush _((const char*));
+/* signal.c */
+VALUE rb_f_kill _((int, VALUE*));
+void rb_gc_mark_trap_list _((void));
+#ifdef POSIX_SIGNAL
+#define posix_signal ruby_posix_signal
+void posix_signal _((int, RETSIGTYPE (*)(int)));
+#endif
+void rb_trap_exit _((void));
+void rb_trap_exec _((void));
+const char *ruby_signal_name _((int));
+void ruby_default_signal _((int));
+/* sprintf.c */
+VALUE rb_f_sprintf _((int, VALUE*));
+/* string.c */
+VALUE rb_str_new _((const char*, long));
+VALUE rb_str_new2 _((const char*));
+VALUE rb_str_new3 _((VALUE));
+VALUE rb_str_new4 _((VALUE));
+VALUE rb_str_new5 _((VALUE, const char*, long));
+VALUE rb_tainted_str_new _((const char*, long));
+VALUE rb_tainted_str_new2 _((const char*));
+VALUE rb_str_buf_new _((long));
+VALUE rb_str_buf_new2 _((const char*));
+VALUE rb_str_buf_append _((VALUE, VALUE));
+VALUE rb_str_buf_cat _((VALUE, const char*, long));
+VALUE rb_str_buf_cat2 _((VALUE, const char*));
+VALUE rb_obj_as_string _((VALUE));
+VALUE rb_check_string_type _((VALUE));
+VALUE rb_str_dup _((VALUE));
+VALUE rb_str_locktmp _((VALUE));
+VALUE rb_str_unlocktmp _((VALUE));
+VALUE rb_str_dup_frozen _((VALUE));
+VALUE rb_str_plus _((VALUE, VALUE));
+VALUE rb_str_times _((VALUE, VALUE));
+VALUE rb_str_substr _((VALUE, long, long));
+void rb_str_modify _((VALUE));
+VALUE rb_str_freeze _((VALUE));
+VALUE rb_str_resize _((VALUE, long));
+VALUE rb_str_cat _((VALUE, const char*, long));
+VALUE rb_str_cat2 _((VALUE, const char*));
+VALUE rb_str_append _((VALUE, VALUE));
+VALUE rb_str_concat _((VALUE, VALUE));
+int rb_str_hash _((VALUE));
+int rb_str_cmp _((VALUE, VALUE));
+VALUE rb_str_upto _((VALUE, VALUE, int));
+void rb_str_update _((VALUE, long, long, VALUE));
+VALUE rb_str_inspect _((VALUE));
+VALUE rb_str_dump _((VALUE));
+VALUE rb_str_split _((VALUE, const char*));
+void rb_str_associate _((VALUE, VALUE));
+VALUE rb_str_associated _((VALUE));
+void rb_str_setter _((VALUE, ID, VALUE*));
+VALUE rb_str_intern _((VALUE));
+/* struct.c */
+VALUE rb_struct_new __((VALUE, ...));
+VALUE rb_struct_define __((const char*, ...));
+VALUE rb_struct_alloc _((VALUE, VALUE));
+VALUE rb_struct_aref _((VALUE, VALUE));
+VALUE rb_struct_aset _((VALUE, VALUE, VALUE));
+VALUE rb_struct_getmember _((VALUE, ID));
+VALUE rb_struct_iv_get _((VALUE, char*));
+VALUE rb_struct_s_members _((VALUE));
+VALUE rb_struct_members _((VALUE));
+/* time.c */
+VALUE rb_time_new _((time_t, time_t));
+/* variable.c */
+VALUE rb_mod_name _((VALUE));
+VALUE rb_class_path _((VALUE));
+void rb_set_class_path _((VALUE, VALUE, const char*));
+VALUE rb_path2class _((const char*));
+void rb_name_class _((VALUE, ID));
+VALUE rb_class_name _((VALUE));
+void rb_autoload _((VALUE, ID, const char*));
+VALUE rb_autoload_load _((VALUE, ID));
+VALUE rb_autoload_p _((VALUE, ID));
+void rb_gc_mark_global_tbl _((void));
+VALUE rb_f_trace_var _((int, VALUE*));
+VALUE rb_f_untrace_var _((int, VALUE*));
+VALUE rb_f_global_variables _((void));
+void rb_alias_variable _((ID, ID));
+struct st_table* rb_generic_ivar_table _((VALUE));
+void rb_copy_generic_ivar _((VALUE,VALUE));
+void rb_mark_generic_ivar _((VALUE));
+void rb_mark_generic_ivar_tbl _((void));
+void rb_free_generic_ivar _((VALUE));
+VALUE rb_ivar_get _((VALUE, ID));
+VALUE rb_ivar_set _((VALUE, ID, VALUE));
+VALUE rb_ivar_defined _((VALUE, ID));
+VALUE rb_iv_set _((VALUE, const char*, VALUE));
+VALUE rb_iv_get _((VALUE, const char*));
+VALUE rb_attr_get _((VALUE, ID));
+VALUE rb_obj_instance_variables _((VALUE));
+VALUE rb_obj_remove_instance_variable _((VALUE, VALUE));
+void *rb_mod_const_at _((VALUE, void*));
+void *rb_mod_const_of _((VALUE, void*));
+VALUE rb_const_list _((void*));
+VALUE rb_mod_constants _((VALUE));
+VALUE rb_mod_remove_const _((VALUE, VALUE));
+int rb_const_defined _((VALUE, ID));
+int rb_const_defined_at _((VALUE, ID));
+int rb_const_defined_from _((VALUE, ID));
+VALUE rb_const_get _((VALUE, ID));
+VALUE rb_const_get_at _((VALUE, ID));
+VALUE rb_const_get_from _((VALUE, ID));
+void rb_const_set _((VALUE, ID, VALUE));
+VALUE rb_mod_constants _((VALUE));
+VALUE rb_mod_const_missing _((VALUE,VALUE));
+VALUE rb_cvar_defined _((VALUE, ID));
+#define RB_CVAR_SET_4ARGS 1
+void rb_cvar_set _((VALUE, ID, VALUE, int));
+VALUE rb_cvar_get _((VALUE, ID));
+void rb_cv_set _((VALUE, const char*, VALUE));
+VALUE rb_cv_get _((VALUE, const char*));
+void rb_define_class_variable _((VALUE, const char*, VALUE));
+VALUE rb_mod_class_variables _((VALUE));
+VALUE rb_mod_remove_cvar _((VALUE, VALUE));
+/* version.c */
+void ruby_show_version _((void));
+void ruby_show_copyright _((void));
diff --git a/ruby_1_8_6/io.c b/ruby_1_8_6/io.c
new file mode 100644
index 0000000000..8f8dfcdf2e
--- /dev/null
+++ b/ruby_1_8_6/io.c
@@ -0,0 +1,5941 @@
+/**********************************************************************
+
+  io.c -
+
+  $Author$
+  $Date$
+  created at: Fri Oct 15 18:08:59 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#if defined(__VMS)
+#define _XOPEN_SOURCE
+#define _POSIX_C_SOURCE 2
+#endif
+
+#include "ruby.h"
+#include "rubyio.h"
+#include "rubysig.h"
+#include "env.h"
+#include <ctype.h>
+#include <errno.h>
+
+#if defined(MSDOS) || defined(__BOW__) || defined(__CYGWIN__) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__) || defined(__BEOS__)
+# define NO_SAFE_RENAME
+#endif
+
+#if defined(MSDOS) || defined(__CYGWIN__) || defined(_WIN32)
+# define NO_LONG_FNAME
+#endif
+
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(sun) || defined(_nec_ews)
+# define USE_SETVBUF
+#endif
+
+#ifdef __QNXNTO__
+#include "unix.h"
+#endif
+
+#include <sys/types.h>
+#if defined(HAVE_SYS_IOCTL_H) && !defined(DJGPP) && !defined(_WIN32) && !defined(__human68k__)
+#include <sys/ioctl.h>
+#endif
+#if defined(HAVE_FCNTL_H) || defined(_WIN32)
+#include <fcntl.h>
+#elif defined(HAVE_SYS_FCNTL_H)
+#include <sys/fcntl.h>
+#endif
+
+#if !HAVE_OFF_T && !defined(off_t)
+# define off_t  long
+#endif
+#if !HAVE_FSEEKO && !defined(fseeko)
+# define fseeko  fseek
+#endif
+#if !HAVE_FTELLO && !defined(ftello)
+# define ftello  ftell
+#endif
+
+#include <sys/stat.h>
+
+/* EMX has sys/param.h, but.. */
+#if defined(HAVE_SYS_PARAM_H) && !(defined(__EMX__) || defined(__HIUX_MPP__))
+# include <sys/param.h>
+#endif
+
+#if !defined NOFILE
+# define NOFILE 64
+#endif
+
+#ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYSCALL_H
+#include <syscall.h>
+#elif defined HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
+#endif
+
+#include <unistd.h>
+#endif
+
+extern void Init_File _((void));
+
+#ifdef __BEOS__
+# ifndef NOFILE
+#  define NOFILE (OPEN_MAX)
+# endif
+#include <net/socket.h>
+#endif
+
+#include "util.h"
+
+#ifndef O_ACCMODE
+#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
+#endif
+
+#if SIZEOF_OFF_T > SIZEOF_LONG && !defined(HAVE_LONG_LONG)
+# error off_t is bigger than long, but you have no long long...
+#endif
+
+#ifndef PIPE_BUF
+# ifdef _POSIX_PIPE_BUF
+#  define PIPE_BUF _POSIX_PIPE_BUF
+# else
+#  define PIPE_BUF 512 /* is this ok? */
+# endif
+#endif
+
+VALUE rb_cIO;
+VALUE rb_eEOFError;
+VALUE rb_eIOError;
+
+VALUE rb_stdin, rb_stdout, rb_stderr;
+VALUE rb_deferr;		/* rescue VIM plugin */
+static VALUE orig_stdout, orig_stderr;
+
+VALUE rb_output_fs;
+VALUE rb_rs;
+VALUE rb_output_rs;
+VALUE rb_default_rs;
+
+static VALUE argf;
+
+static ID id_write, id_read, id_getc;
+
+extern char *ruby_inplace_mode;
+
+struct timeval rb_time_interval _((VALUE));
+
+static VALUE filename, current_file;
+static int gets_lineno;
+static int init_p = 0, next_p = 0;
+static VALUE lineno = INT2FIX(0);
+
+#ifdef _STDIO_USES_IOSTREAM  /* GNU libc */
+#  ifdef _IO_fpos_t
+#    define READ_DATA_PENDING(fp) ((fp)->_IO_read_ptr != (fp)->_IO_read_end)
+#    define READ_DATA_PENDING_COUNT(fp) ((fp)->_IO_read_end - (fp)->_IO_read_ptr)
+#    define READ_DATA_PENDING_PTR(fp) ((fp)->_IO_read_ptr)
+#  else
+#    define READ_DATA_PENDING(fp) ((fp)->_gptr < (fp)->_egptr)
+#    define READ_DATA_PENDING_COUNT(fp) ((fp)->_egptr - (fp)->_gptr)
+#    define READ_DATA_PENDING_PTR(fp) ((fp)->_gptr)
+#  endif
+#elif defined(_LP64) && (defined(__sun__) || defined(__sun))
+typedef struct _FILE64 {
+  unsigned char        *_ptr;  /* next character from/to here in buffer */
+  unsigned char        *_base; /* the buffer */
+  unsigned char        *_end;  /* the end of the buffer */
+  ssize_t      _cnt;   /* number of available characters in buffer */
+  int          _file;  /* UNIX System file descriptor */
+  unsigned int _flag;  /* the state of the stream */
+  char         __fill[80];     /* filler to bring size to 128 bytes */
+} FILE64;
+#  define READ_DATA_PENDING(fp) (((FILE64*)(fp))->_cnt > 0)
+#  define READ_DATA_PENDING_COUNT(fp) (((FILE64*)(fp))->_cnt)
+#  define READ_DATA_PENDING_PTR(fp) ((char *)((FILE64*)(fp))->_ptr)
+#elif defined(FILE_COUNT)
+#  define READ_DATA_PENDING(fp) ((fp)->FILE_COUNT > 0)
+#  define READ_DATA_PENDING_COUNT(fp) ((fp)->FILE_COUNT)
+#elif defined(FILE_READEND)
+#  define READ_DATA_PENDING(fp) ((fp)->FILE_READPTR < (fp)->FILE_READEND)
+#  define READ_DATA_PENDING_COUNT(fp) ((fp)->FILE_READEND - (fp)->FILE_READPTR)
+#elif defined(__BEOS__)
+#  define READ_DATA_PENDING(fp) (fp->_state._eof == 0)
+#elif defined(__VMS)
+#  define READ_DATA_PENDING_COUNT(fp) ((unsigned int)(*(fp))->_cnt)
+#  define READ_DATA_PENDING(fp)       (((unsigned int)(*(fp))->_cnt) > 0)
+#  define READ_DATA_BUFFERED(fp) 0
+#elif defined(__DragonFly__)
+/* FILE is an incomplete struct type since DragonFly BSD 1.4.0 */
+#  define READ_DATA_PENDING(fp) (((struct __FILE_public *)(fp))->_r > 0)
+#  define READ_DATA_PENDING_COUNT(fp) (((struct __FILE_public *)(fp))->_r)
+#else
+/* requires systems own version of the ReadDataPending() */
+extern int ReadDataPending();
+#  define READ_DATA_PENDING(fp) (!feof(fp))
+#  define READ_DATA_BUFFERED(fp) 0
+#endif
+#ifndef READ_DATA_BUFFERED
+#  define READ_DATA_BUFFERED(fp) READ_DATA_PENDING(fp)
+#endif
+
+#ifndef READ_DATA_PENDING_PTR
+# ifdef FILE_READPTR
+#  define READ_DATA_PENDING_PTR(fp) ((char *)(fp)->FILE_READPTR)
+# endif
+#endif
+
+#if defined __DJGPP__
+# undef READ_DATA_PENDING_COUNT
+# undef READ_DATA_PENDING_PTR
+#endif
+
+#define READ_CHECK(fp) do {\
+    if (!READ_DATA_PENDING(fp)) {\
+	rb_thread_wait_fd(fileno(fp));\
+        rb_io_check_closed(fptr);\
+     }\
+} while(0)
+
+void
+rb_eof_error()
+{
+    rb_raise(rb_eEOFError, "end of file reached");
+}
+
+VALUE
+rb_io_taint_check(io)
+    VALUE io;
+{
+    if (!OBJ_TAINTED(io) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
+    rb_check_frozen(io);
+    return io;
+}
+
+void
+rb_io_check_initialized(fptr)
+    OpenFile *fptr;
+{
+    if (!fptr) {
+	rb_raise(rb_eIOError, "uninitialized stream");
+    }
+}
+
+void
+rb_io_check_closed(fptr)
+    OpenFile *fptr;
+{
+    rb_io_check_initialized(fptr);
+    if (!fptr->f && !fptr->f2) {
+	rb_raise(rb_eIOError, "closed stream");
+    }
+}
+
+static void io_fflush _((FILE *, OpenFile *));
+
+static OpenFile *
+flush_before_seek(fptr)
+    OpenFile *fptr;
+{
+    if (fptr->mode & FMODE_WBUF) {
+	io_fflush(GetWriteFile(fptr), fptr);
+    }
+    return fptr;
+}
+
+#define io_seek(fptr, ofs, whence) fseeko(flush_before_seek(fptr)->f, ofs, whence)
+#define io_tell(fptr) ftello(flush_before_seek(fptr)->f)
+
+#ifndef SEEK_CUR
+# define SEEK_SET 0
+# define SEEK_CUR 1
+# define SEEK_END 2
+#endif
+
+#define FMODE_SYNCWRITE (FMODE_SYNC|FMODE_WRITABLE)
+
+void
+rb_io_check_readable(fptr)
+    OpenFile *fptr;
+{
+    rb_io_check_closed(fptr);
+    if (!(fptr->mode & FMODE_READABLE)) {
+	rb_raise(rb_eIOError, "not opened for reading");
+    }
+#ifdef NEED_IO_SEEK_BETWEEN_RW
+    if (((fptr->mode & FMODE_WBUF) ||
+	 (fptr->mode & (FMODE_SYNCWRITE|FMODE_RBUF)) == FMODE_SYNCWRITE) &&
+	!feof(fptr->f) &&
+	!fptr->f2) {
+	io_seek(fptr, 0, SEEK_CUR);
+    }
+#endif
+    fptr->mode |= FMODE_RBUF;
+}
+
+void
+rb_io_check_writable(fptr)
+    OpenFile *fptr;
+{
+    rb_io_check_closed(fptr);
+    if (!(fptr->mode & FMODE_WRITABLE)) {
+	rb_raise(rb_eIOError, "not opened for writing");
+    }
+    if ((fptr->mode & FMODE_RBUF) && !feof(fptr->f) && !fptr->f2) {
+	io_seek(fptr, 0, SEEK_CUR);
+    }
+    if (!fptr->f2) {
+	fptr->mode &= ~FMODE_RBUF;
+    }
+}
+
+int
+rb_read_pending(fp)
+    FILE *fp;
+{
+    return READ_DATA_PENDING(fp);
+}
+
+void
+rb_read_check(fp)
+    FILE *fp;
+{
+    if (!READ_DATA_PENDING(fp)) {
+	rb_thread_wait_fd(fileno(fp));
+    }
+}
+
+static int
+ruby_dup(orig)
+    int orig;
+{
+    int fd;
+
+    fd = dup(orig);
+    if (fd < 0) {
+	if (errno == EMFILE || errno == ENFILE || errno == ENOMEM) {
+	    rb_gc();
+	    fd = dup(orig);
+	}
+	if (fd < 0) {
+	    rb_sys_fail(0);
+	}
+    }
+    return fd;
+}
+
+static VALUE io_alloc _((VALUE));
+static VALUE
+io_alloc(klass)
+    VALUE klass;
+{
+    NEWOBJ(io, struct RFile);
+    OBJSETUP(io, klass, T_FILE);
+
+    io->fptr = 0;
+
+    return (VALUE)io;
+}
+
+static void
+io_fflush(f, fptr)
+    FILE *f;
+    OpenFile *fptr;
+{
+    int n;
+
+    if (!rb_thread_fd_writable(fileno(f))) {
+        rb_io_check_closed(fptr);
+    }
+    for (;;) {
+	TRAP_BEG;
+	n = fflush(f);
+	TRAP_END;
+	if (n != EOF) break;
+	if (!rb_io_wait_writable(fileno(f)))
+	    rb_sys_fail(fptr->path);
+    }
+    fptr->mode &= ~FMODE_WBUF;
+}
+
+int
+rb_io_wait_readable(f)
+    int f;
+{
+    fd_set rfds;
+
+    switch (errno) {
+      case EINTR:
+#if defined(ERESTART)
+      case ERESTART:
+#endif
+	rb_thread_wait_fd(f);
+	return Qtrue;
+
+      case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+      case EWOULDBLOCK:
+#endif
+	FD_ZERO(&rfds);
+	FD_SET(f, &rfds);
+	rb_thread_select(f + 1, &rfds, NULL, NULL, NULL);
+	return Qtrue;
+
+      default:
+	return Qfalse;
+    }
+}
+
+int
+rb_io_wait_writable(f)
+    int f;
+{
+    fd_set wfds;
+
+    switch (errno) {
+      case EINTR:
+#if defined(ERESTART)
+      case ERESTART:
+#endif
+	rb_thread_fd_writable(f);
+	return Qtrue;
+
+      case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+      case EWOULDBLOCK:
+#endif
+	FD_ZERO(&wfds);
+	FD_SET(f, &wfds);
+	rb_thread_select(f + 1, NULL, &wfds, NULL, NULL);
+	return Qtrue;
+
+      default:
+	return Qfalse;
+    }
+}
+
+#ifndef S_ISREG
+#   define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
+#endif
+
+static int
+wsplit_p(OpenFile *fptr)
+{
+    FILE *f = GetWriteFile(fptr);
+    int r;
+    if (!(fptr->mode & FMODE_WSPLIT_INITIALIZED)) {
+        struct stat buf;
+        if (fstat(fileno(f), &buf) == 0 &&
+            !S_ISREG(buf.st_mode)
+#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
+            && (r = fcntl(fileno(f), F_GETFL)) != -1 &&
+            !(r & O_NONBLOCK)
+#endif
+            ) {
+            fptr->mode |= FMODE_WSPLIT;
+        }
+        fptr->mode |= FMODE_WSPLIT_INITIALIZED;
+    }
+    return fptr->mode & FMODE_WSPLIT;
+}
+
+/* writing functions */
+static long
+io_fwrite(str, fptr)
+    VALUE str;
+    OpenFile *fptr;
+{
+    long len, n, r, l, offset = 0;
+    FILE *f = GetWriteFile(fptr);
+
+    len = RSTRING(str)->len;
+    if ((n = len) <= 0) return n;
+    if (fptr->mode & FMODE_SYNC) {
+	io_fflush(f, fptr);
+	if (!rb_thread_fd_writable(fileno(f))) {
+	    rb_io_check_closed(fptr);
+	}
+      retry:
+        l = n;
+        if (PIPE_BUF < l &&
+            !rb_thread_critical &&
+            !rb_thread_alone() &&
+            wsplit_p(fptr)) {
+            l = PIPE_BUF;
+        }
+        TRAP_BEG;
+	r = write(fileno(f), RSTRING(str)->ptr+offset, l);
+        TRAP_END;
+        if (r == n) return len;
+        if (0 <= r) {
+            offset += r;
+            n -= r;
+            errno = EAGAIN;
+        }
+        if (rb_io_wait_writable(fileno(f))) {
+            rb_io_check_closed(fptr);
+	    if (offset < RSTRING(str)->len)
+		goto retry;
+        }
+        return -1L;
+    }
+#if defined(__human68k__) || defined(__vms)
+    do {
+	if (fputc(RSTRING(str)->ptr[offset++], f) == EOF) {
+	    if (ferror(f)) return -1L;
+	    break;
+	}
+    } while (--n > 0);
+#else
+    while (errno = 0, offset += (r = fwrite(RSTRING(str)->ptr+offset, 1, n, f)), (n -= r) > 0) {
+	if (ferror(f)
+#if defined __BORLANDC__
+	    || errno
+#endif
+	) {
+#ifdef __hpux
+	    if (!errno) errno = EAGAIN;
+#elif defined(_WIN32) && !defined(__BORLANDC__)
+	    /* workaround for MSVCRT's bug */
+	    if (!errno) {
+		if (GetLastError() == ERROR_NO_DATA)
+		    errno = EPIPE;
+		else
+		    errno = EBADF;
+	    }
+#endif
+	    if (rb_io_wait_writable(fileno(f))) {
+		rb_io_check_closed(fptr);
+		clearerr(f);
+		if (offset < RSTRING(str)->len)
+		    continue;
+	    }
+	    return -1L;
+	}
+    }
+#endif
+    return len - n;
+}
+
+long
+rb_io_fwrite(ptr, len, f)
+    const char *ptr;
+    long len;
+    FILE *f;
+{
+    OpenFile of;
+
+    of.f = f;
+    of.f2 = NULL;
+    of.mode = FMODE_WRITABLE;
+    of.path = NULL;
+    return io_fwrite(rb_str_new(ptr, len), &of);
+}
+
+/*
+ *  call-seq:
+ *     ios.write(string)    => integer
+ *  
+ *  Writes the given string to <em>ios</em>. The stream must be opened
+ *  for writing. If the argument is not a string, it will be converted
+ *  to a string using <code>to_s</code>. Returns the number of bytes
+ *  written.
+ *     
+ *     count = $stdout.write( "This is a test\n" )
+ *     puts "That was #{count} bytes of data"
+ *     
+ *  <em>produces:</em>
+ *     
+ *     This is a test
+ *     That was 15 bytes of data
+ */
+
+static VALUE
+io_write(io, str)
+    VALUE io, str;
+{
+    OpenFile *fptr;
+    long n;
+
+    rb_secure(4);
+    if (TYPE(str) != T_STRING)
+	str = rb_obj_as_string(str);
+
+    if (TYPE(io) != T_FILE) {
+	/* port is not IO, call write method for it. */
+	return rb_funcall(io, id_write, 1, str);
+    }
+    if (RSTRING(str)->len == 0) return INT2FIX(0);
+
+    GetOpenFile(io, fptr);
+    rb_io_check_writable(fptr);
+
+    n = io_fwrite(str, fptr);
+    if (n == -1L) rb_sys_fail(fptr->path);
+    if (!(fptr->mode & FMODE_SYNC)) {
+	fptr->mode |= FMODE_WBUF;
+    }
+
+    return LONG2FIX(n);
+}
+
+VALUE
+rb_io_write(io, str)
+    VALUE io, str;
+{
+    return rb_funcall(io, id_write, 1, str);
+}
+
+/*
+ *  call-seq:
+ *     ios << obj     => ios
+ *  
+ *  String Output---Writes <i>obj</i> to <em>ios</em>.
+ *  <i>obj</i> will be converted to a string using
+ *  <code>to_s</code>.
+ *     
+ *     $stdout << "Hello " << "world!\n"
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Hello world!
+ */
+
+VALUE
+rb_io_addstr(io, str)
+    VALUE io, str;
+{
+    rb_io_write(io, str);
+    return io;
+}
+
+/*
+ *  call-seq:
+ *     ios.flush    => ios
+ *  
+ *  Flushes any buffered data within <em>ios</em> to the underlying
+ *  operating system (note that this is Ruby internal buffering only;
+ *  the OS may buffer the data as well).
+ *     
+ *     $stdout.print "no newline"
+ *     $stdout.flush
+ *     
+ *  <em>produces:</em>
+ *     
+ *     no newline
+ */
+
+static VALUE
+rb_io_flush(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+    FILE *f;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_writable(fptr);
+    f = GetWriteFile(fptr);
+
+    io_fflush(f, fptr);
+
+    return io;
+}
+
+/*
+ *  call-seq:
+ *     ios.pos     => integer
+ *     ios.tell    => integer
+ *  
+ *  Returns the current offset (in bytes) of <em>ios</em>.
+ *     
+ *     f = File.new("testfile")
+ *     f.pos    #=> 0
+ *     f.gets   #=> "This is line one\n"
+ *     f.pos    #=> 17
+ */
+
+static VALUE
+rb_io_tell(io)
+     VALUE io;
+{
+    OpenFile *fptr;
+    off_t pos;
+
+    GetOpenFile(io, fptr);
+    pos = io_tell(fptr);
+    if (pos < 0) rb_sys_fail(fptr->path);
+    return OFFT2NUM(pos);
+}
+
+static VALUE
+rb_io_seek(io, offset, whence)
+    VALUE io, offset;
+    int whence;
+{
+    OpenFile *fptr;
+    off_t pos;
+
+    pos = NUM2OFFT(offset);
+    GetOpenFile(io, fptr);
+    pos = io_seek(fptr, pos, whence);
+    if (pos < 0) rb_sys_fail(fptr->path);
+    clearerr(fptr->f);
+
+    return INT2FIX(0);
+}
+
+/*
+ *  call-seq:
+ *     ios.seek(amount, whence=SEEK_SET) -> 0
+ *  
+ *  Seeks to a given offset <i>anInteger</i> in the stream according to
+ *  the value of <i>whence</i>:
+ *
+ *    IO::SEEK_CUR  | Seeks to _amount_ plus current position
+ *    --------------+----------------------------------------------------
+ *    IO::SEEK_END  | Seeks to _amount_ plus end of stream (you probably 
+ *                  | want a negative value for _amount_)
+ *    --------------+----------------------------------------------------
+ *    IO::SEEK_SET  | Seeks to the absolute location given by _amount_
+ *
+ *  Example:
+ *     
+ *     f = File.new("testfile")
+ *     f.seek(-13, IO::SEEK_END)   #=> 0
+ *     f.readline                  #=> "And so on...\n"
+ */
+
+static VALUE
+rb_io_seek_m(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    VALUE offset, ptrname;
+    int whence = SEEK_SET;
+
+    if (rb_scan_args(argc, argv, "11", &offset, &ptrname) == 2) {
+	whence = NUM2INT(ptrname);
+    }
+
+    return rb_io_seek(io, offset, whence);
+}
+
+/*
+ *  call-seq:
+ *     ios.pos = integer    => integer
+ *  
+ *  Seeks to the given position (in bytes) in <em>ios</em>.
+ *     
+ *     f = File.new("testfile")
+ *     f.pos = 17
+ *     f.gets   #=> "This is line two\n"
+ */
+
+static VALUE
+rb_io_set_pos(io, offset)
+     VALUE io, offset;
+{
+    OpenFile *fptr;
+    off_t pos;
+
+    pos = NUM2OFFT(offset);
+    GetOpenFile(io, fptr);
+    pos = io_seek(fptr, pos, SEEK_SET);
+    if (pos != 0) rb_sys_fail(fptr->path);
+    clearerr(fptr->f);
+
+    return OFFT2NUM(pos);
+}
+
+/*
+ *  call-seq:
+ *     ios.rewind    => 0
+ *  
+ *  Positions <em>ios</em> to the beginning of input, resetting
+ *  <code>lineno</code> to zero.
+ *     
+ *     f = File.new("testfile")
+ *     f.readline   #=> "This is line one\n"
+ *     f.rewind     #=> 0
+ *     f.lineno     #=> 0
+ *     f.readline   #=> "This is line one\n"
+ */
+
+static VALUE
+rb_io_rewind(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+
+    GetOpenFile(io, fptr);
+    if (io_seek(fptr, 0L, 0) != 0) rb_sys_fail(fptr->path);
+    clearerr(fptr->f);
+    if (io == current_file) {
+	gets_lineno -= fptr->lineno;
+    }
+    fptr->lineno = 0;
+
+    return INT2FIX(0);
+}
+
+/*
+ *  call-seq:
+ *     ios.eof     => true or false
+ *     ios.eof?    => true or false
+ *
+ *  Returns true if <em>ios</em> is at end of file that means
+ *  there are no more data to read.
+ *  The stream must be opened for reading or an <code>IOError</code> will be
+ *  raised.
+ *
+ *     f = File.new("testfile")
+ *     dummy = f.readlines
+ *     f.eof   #=> true
+ *
+ *  If <em>ios</em> is a stream such as pipe or socket, <code>IO#eof?</code>
+ *  blocks until the other end sends some data or closes it.
+ *
+ *     r, w = IO.pipe
+ *     Thread.new { sleep 1; w.close }
+ *     r.eof?  #=> true after 1 second blocking
+ *
+ *     r, w = IO.pipe
+ *     Thread.new { sleep 1; w.puts "a" }
+ *     r.eof?  #=> false after 1 second blocking
+ *
+ *     r, w = IO.pipe
+ *     r.eof?  # blocks forever
+ *
+ *  Note that <code>IO#eof?</code> reads data to a input buffer.
+ *  So <code>IO#sysread</code> doesn't work with <code>IO#eof?</code>.
+ */
+
+VALUE
+rb_io_eof(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+    int ch;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+
+    if (feof(fptr->f)) return Qtrue;
+    if (READ_DATA_PENDING(fptr->f)) return Qfalse;
+    READ_CHECK(fptr->f);
+    clearerr(fptr->f);
+    TRAP_BEG;
+    ch = getc(fptr->f);
+    TRAP_END;
+
+    if (ch != EOF) {
+	ungetc(ch, fptr->f);
+	return Qfalse;
+    }
+    rb_io_check_closed(fptr);
+    clearerr(fptr->f);
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     ios.sync    => true or false
+ *  
+ *  Returns the current ``sync mode'' of <em>ios</em>. When sync mode is
+ *  true, all output is immediately flushed to the underlying operating
+ *  system and is not buffered by Ruby internally. See also
+ *  <code>IO#fsync</code>.
+ *     
+ *     f = File.new("testfile")
+ *     f.sync   #=> false
+ */
+
+static VALUE
+rb_io_sync(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+
+    GetOpenFile(io, fptr);
+    return (fptr->mode & FMODE_SYNC) ? Qtrue : Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     ios.sync = boolean   => boolean
+ *  
+ *  Sets the ``sync mode'' to <code>true</code> or <code>false</code>.
+ *  When sync mode is true, all output is immediately flushed to the
+ *  underlying operating system and is not buffered internally. Returns
+ *  the new state. See also <code>IO#fsync</code>.
+ *     
+ *     f = File.new("testfile")
+ *     f.sync = true
+ *     
+ *  <em>(produces no output)</em>
+ */
+
+static VALUE
+rb_io_set_sync(io, mode)
+    VALUE io, mode;
+{
+    OpenFile *fptr;
+
+    GetOpenFile(io, fptr);
+    if (RTEST(mode)) {
+	fptr->mode |= FMODE_SYNC;
+    }
+    else {
+	fptr->mode &= ~FMODE_SYNC;
+    }
+    return mode;
+}
+
+/*
+ *  call-seq:
+ *     ios.fsync   => 0 or nil
+ *  
+ *  Immediately writes all buffered data in <em>ios</em> to disk.
+ *  Returns <code>nil</code> if the underlying operating system does not
+ *  support <em>fsync(2)</em>. Note that <code>fsync</code> differs from
+ *  using <code>IO#sync=</code>. The latter ensures that data is flushed
+ *  from Ruby's buffers, but doesn't not guarantee that the underlying
+ *  operating system actually writes it to disk.
+ */
+
+static VALUE
+rb_io_fsync(io)
+    VALUE io;
+{
+#ifdef HAVE_FSYNC
+    OpenFile *fptr;
+    FILE *f;
+
+    GetOpenFile(io, fptr);
+    f = GetWriteFile(fptr);
+
+    io_fflush(f, fptr);
+    if (fsync(fileno(f)) < 0)
+	rb_sys_fail(fptr->path);
+    return INT2FIX(0);
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
+#endif
+}
+
+/*
+ *  call-seq:
+ *     ios.fileno    => fixnum
+ *     ios.to_i      => fixnum
+ *  
+ *  Returns an integer representing the numeric file descriptor for
+ *  <em>ios</em>.
+ *     
+ *     $stdin.fileno    #=> 0
+ *     $stdout.fileno   #=> 1
+ */
+
+static VALUE
+rb_io_fileno(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+    int fd;
+
+    GetOpenFile(io, fptr);
+    fd = fileno(fptr->f);
+    return INT2FIX(fd);
+}
+
+/*
+ *  call-seq:
+ *     ios.pid    => fixnum
+ *  
+ *  Returns the process ID of a child process associated with
+ *  <em>ios</em>. This will be set by <code>IO::popen</code>.
+ *     
+ *     pipe = IO.popen("-")
+ *     if pipe
+ *       $stderr.puts "In parent, child pid is #{pipe.pid}"
+ *     else
+ *       $stderr.puts "In child, pid is #{$$}"
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     In child, pid is 26209
+ *     In parent, child pid is 26209
+ */
+
+static VALUE
+rb_io_pid(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+
+    GetOpenFile(io, fptr);
+    if (!fptr->pid)
+	return Qnil;
+    return INT2FIX(fptr->pid);
+}
+
+/*
+ * call-seq:
+ *   ios.inspect   => string
+ *
+ * Return a string describing this IO object.
+ */
+
+static VALUE
+rb_io_inspect(obj)
+    VALUE obj;
+{
+    OpenFile *fptr;
+    char *buf, *cname, *st = "";
+    long len;
+
+    fptr = RFILE(rb_io_taint_check(obj))->fptr;
+    if (!fptr || !fptr->path) return rb_any_to_s(obj);
+    cname = rb_obj_classname(obj);
+    len = strlen(cname) + strlen(fptr->path) + 5;
+    if (!(fptr->f || fptr->f2)) {
+	st = " (closed)";
+	len += 9;
+    }
+    buf = ALLOCA_N(char, len);
+    snprintf(buf, len, "#<%s:%s%s>", cname, fptr->path, st);
+    return rb_str_new2(buf);
+}
+
+/*
+ *  call-seq:
+ *     ios.to_io -> ios
+ *  
+ *  Returns <em>ios</em>.
+ */
+
+static VALUE
+rb_io_to_io(io)
+    VALUE io;
+{
+    return io;
+}
+
+/* reading functions */
+static long
+read_buffered_data(ptr, len, f)
+    char *ptr;
+    long len;
+    FILE *f;
+{
+    long n;
+
+#ifdef READ_DATA_PENDING_COUNT
+    n = READ_DATA_PENDING_COUNT(f);
+    if (n <= 0) return 0;
+    if (n > len) n = len;
+    return fread(ptr, 1, n, f);
+#else
+    int c;
+
+    for (n = 0; n < len && READ_DATA_PENDING(f) && (c = getc(f)) != EOF; ++n) {
+	*ptr++ = c;
+    }
+    return n;
+#endif
+}
+
+static long
+io_fread(ptr, len, fptr)
+    char *ptr;
+    long len;
+    OpenFile *fptr;
+{
+    long n = len;
+    int c;
+    int saved_errno;
+
+    while (n > 0) {
+        c = read_buffered_data(ptr, n, fptr->f);
+        if (c < 0) goto eof;
+        if (c > 0) {
+            ptr += c;
+            if ((n -= c) <= 0) break;
+        }
+        rb_thread_wait_fd(fileno(fptr->f));
+        rb_io_check_closed(fptr);
+	clearerr(fptr->f);
+	TRAP_BEG;
+	c = getc(fptr->f);
+	TRAP_END;
+	if (c == EOF) {
+	  eof:
+	    if (ferror(fptr->f)) {
+		switch (errno) {
+		  case EINTR:
+#if defined(ERESTART)
+		  case ERESTART:
+#endif
+		    clearerr(fptr->f);
+		    continue;
+		  case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+		  case EWOULDBLOCK:
+#endif
+		    if (len > n) {
+			clearerr(fptr->f);
+		    }
+                    saved_errno = errno;
+                    rb_warning("nonblocking IO#read is obsolete; use IO#readpartial or IO#sysread");
+                    errno = saved_errno;
+		}
+		if (len == n) return 0;
+	    }
+	    break;
+	}
+	*ptr++ = c;
+	n--;
+    }
+    return len - n;
+}
+
+long
+rb_io_fread(ptr, len, f)
+    char *ptr;
+    long len;
+    FILE *f;
+{
+    OpenFile of;
+
+    of.f = f;
+    of.f2 = NULL;
+    return io_fread(ptr, len, &of);
+}
+
+#define SMALLBUF 100
+
+static long
+remain_size(fptr)
+    OpenFile *fptr;
+{
+    struct stat st;
+    off_t siz = BUFSIZ;
+    off_t pos;
+
+    if (feof(fptr->f)) return 0;
+    if (fstat(fileno(fptr->f), &st) == 0  && S_ISREG(st.st_mode)
+#ifdef __BEOS__
+	&& (st.st_dev > 3)
+#endif
+	)
+    {
+	pos = io_tell(fptr);
+	if (st.st_size >= pos && pos >= 0) {
+	    siz = st.st_size - pos + 1;
+	    if (siz > LONG_MAX) {
+		rb_raise(rb_eIOError, "file too big for single read");
+	    }
+	}
+    }
+    return (long)siz;
+}
+
+static VALUE
+read_all(fptr, siz, str)
+    OpenFile *fptr;
+    long siz;
+    VALUE str;
+{
+    long bytes = 0;
+    long n;
+
+    if (siz == 0) siz = BUFSIZ;
+    if (NIL_P(str)) {
+	str = rb_str_new(0, siz);
+    }
+    else {
+	rb_str_resize(str, siz);
+    }
+    for (;;) {
+	rb_str_locktmp(str);
+	READ_CHECK(fptr->f);
+	n = io_fread(RSTRING(str)->ptr+bytes, siz-bytes, fptr);
+	rb_str_unlocktmp(str);
+	if (n == 0 && bytes == 0) {
+	    if (!fptr->f) break;
+	    if (feof(fptr->f)) break;
+	    if (!ferror(fptr->f)) break;
+	    rb_sys_fail(fptr->path);
+	}
+	bytes += n;
+	if (bytes < siz) break;
+	siz += BUFSIZ;
+	rb_str_resize(str, siz);
+    }
+    if (bytes != siz) rb_str_resize(str, bytes);
+    OBJ_TAINT(str);
+
+    return str;
+}
+
+void rb_io_set_nonblock(OpenFile *fptr)
+{
+    int flags;
+#ifdef F_GETFL
+    flags = fcntl(fileno(fptr->f), F_GETFL);
+    if (flags == -1) {
+        rb_sys_fail(fptr->path);
+    }
+#else
+    flags = 0;
+#endif
+    if ((flags & O_NONBLOCK) == 0) {
+        flags |= O_NONBLOCK;
+        if (fcntl(fileno(fptr->f), F_SETFL, flags) == -1) {
+            rb_sys_fail(fptr->path);
+        }
+    }
+    if (fptr->f2) {
+#ifdef F_GETFL
+        flags = fcntl(fileno(fptr->f2), F_GETFL);
+        if (flags == -1) {
+            rb_sys_fail(fptr->path);
+        }
+#else
+        flags = 0;
+#endif
+        if ((flags & O_NONBLOCK) == 0) {
+            flags |= O_NONBLOCK;
+            if (fcntl(fileno(fptr->f2), F_SETFL, flags) == -1) {
+                rb_sys_fail(fptr->path);
+            }
+        }
+    }
+}
+
+static VALUE
+io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
+{
+    OpenFile *fptr;
+    VALUE length, str;
+    long n, len;
+
+    rb_scan_args(argc, argv, "11", &length, &str);
+
+    if ((len = NUM2LONG(length)) < 0) {
+        rb_raise(rb_eArgError, "negative length %ld given", len);
+    }
+
+    if (NIL_P(str)) {
+        str = rb_str_new(0, len);
+    }
+    else {
+        StringValue(str);
+        rb_str_modify(str);
+        rb_str_resize(str, len);
+    }
+    OBJ_TAINT(str);
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+
+    if (len == 0)
+        return str;
+
+    if (!nonblock) {
+        READ_CHECK(fptr->f);
+    }
+    if (RSTRING(str)->len != len) {
+      modified:
+        rb_raise(rb_eRuntimeError, "buffer string modified");
+    }
+    n = read_buffered_data(RSTRING(str)->ptr, len, fptr->f);
+    if (n <= 0) {
+      again:
+        if (RSTRING(str)->len != len) goto modified;
+        if (nonblock) {
+            rb_io_set_nonblock(fptr);
+            n = read(fileno(fptr->f), RSTRING(str)->ptr, len);
+        }
+        else {
+            TRAP_BEG;
+            n = read(fileno(fptr->f), RSTRING(str)->ptr, len);
+            TRAP_END;
+        }
+        if (n < 0) {
+            if (!nonblock && rb_io_wait_readable(fileno(fptr->f)))
+                goto again;
+            rb_sys_fail(fptr->path);
+        }
+    }
+    rb_str_resize(str, n);
+
+    if (n == 0)
+        return Qnil;
+    else
+        return str;
+}
+
+/*
+ *  call-seq:
+ *     ios.readpartial(maxlen)              => string
+ *     ios.readpartial(maxlen, outbuf)      => outbuf
+ *
+ *  Reads at most <i>maxlen</i> bytes from the I/O stream.
+ *  It blocks only if <em>ios</em> has no data immediately available.
+ *  It doesn't block if some data available.
+ *  If the optional <i>outbuf</i> argument is present,
+ *  it must reference a String, which will receive the data.
+ *  It raises <code>EOFError</code> on end of file.
+ *
+ *  readpartial is designed for streams such as pipe, socket, tty, etc.
+ *  It blocks only when no data immediately available.
+ *  This means that it blocks only when following all conditions hold.
+ *  * the buffer in the IO object is empty.
+ *  * the content of the stream is empty.
+ *  * the stream is not reached to EOF.
+ *
+ *  When readpartial blocks, it waits data or EOF on the stream.
+ *  If some data is reached, readpartial returns with the data.
+ *  If EOF is reached, readpartial raises EOFError.
+ *
+ *  When readpartial doesn't blocks, it returns or raises immediately.
+ *  If the buffer is not empty, it returns the data in the buffer.
+ *  Otherwise if the stream has some content,
+ *  it returns the data in the stream. 
+ *  Otherwise if the stream is reached to EOF, it raises EOFError.
+ *
+ *     r, w = IO.pipe           #               buffer          pipe content
+ *     w << "abc"               #               ""              "abc".
+ *     r.readpartial(4096)      #=> "abc"       ""              ""
+ *     r.readpartial(4096)      # blocks because buffer and pipe is empty.
+ *
+ *     r, w = IO.pipe           #               buffer          pipe content
+ *     w << "abc"               #               ""              "abc"
+ *     w.close                  #               ""              "abc" EOF
+ *     r.readpartial(4096)      #=> "abc"       ""              EOF
+ *     r.readpartial(4096)      # raises EOFError
+ *
+ *     r, w = IO.pipe           #               buffer          pipe content
+ *     w << "abc\ndef\n"        #               ""              "abc\ndef\n"
+ *     r.gets                   #=> "abc\n"     "def\n"         ""
+ *     w << "ghi\n"             #               "def\n"         "ghi\n"
+ *     r.readpartial(4096)      #=> "def\n"     ""              "ghi\n"
+ *     r.readpartial(4096)      #=> "ghi\n"     ""              ""
+ *
+ *  Note that readpartial behaves similar to sysread.
+ *  The differences are:
+ *  * If the buffer is not empty, read from the buffer instead of "sysread for buffered IO (IOError)".
+ *  * It doesn't cause Errno::EAGAIN and Errno::EINTR.  When readpartial meets EAGAIN and EINTR by read system call, readpartial retry the system call.
+ *
+ *  The later means that readpartial is nonblocking-flag insensitive.
+ *  It blocks on the situation IO#sysread causes Errno::EAGAIN as if the fd is blocking mode.
+ *
+ */
+
+static VALUE
+io_readpartial(int argc, VALUE *argv, VALUE io)
+{
+    VALUE ret;
+
+    ret = io_getpartial(argc, argv, io, 0);
+    if (NIL_P(ret))
+        rb_eof_error();
+    else
+        return ret;
+}
+
+/*
+ *  call-seq:
+ *     ios.read_nonblock(maxlen)              => string
+ *     ios.read_nonblock(maxlen, outbuf)      => outbuf
+ *
+ *  Reads at most <i>maxlen</i> bytes from <em>ios</em> using
+ *  read(2) system call after O_NONBLOCK is set for
+ *  the underlying file descriptor.
+ *
+ *  If the optional <i>outbuf</i> argument is present,
+ *  it must reference a String, which will receive the data.
+ *
+ *  read_nonblock just calls read(2).
+ *  It causes all errors read(2) causes: EAGAIN, EINTR, etc.
+ *  The caller should care such errors.
+ *
+ *  read_nonblock causes EOFError on EOF.
+ *
+ *  If the read buffer is not empty,
+ *  read_nonblock reads from the buffer like readpartial.
+ *  In this case, read(2) is not called.
+ *
+ */
+
+static VALUE
+io_read_nonblock(int argc, VALUE *argv, VALUE io)
+{
+    VALUE ret;
+
+    ret = io_getpartial(argc, argv, io, 1);
+    if (NIL_P(ret))
+        rb_eof_error();
+    else
+        return ret;
+}
+
+/*
+ *  call-seq:
+ *     ios.write_nonblock(string)   => integer
+ *
+ *  Writes the given string to <em>ios</em> using
+ *  write(2) system call after O_NONBLOCK is set for
+ *  the underlying file descriptor.
+ *
+ *  write_nonblock just calls write(2).
+ *  It causes all errors write(2) causes: EAGAIN, EINTR, etc.
+ *  The result may also be smaller than string.length (partial write).
+ *  The caller should care such errors and partial write.
+ *
+ */
+
+static VALUE
+rb_io_write_nonblock(VALUE io, VALUE str)
+{
+    OpenFile *fptr;
+    FILE *f;
+    long n;
+
+    rb_secure(4);
+    if (TYPE(str) != T_STRING)
+	str = rb_obj_as_string(str);
+
+    GetOpenFile(io, fptr);
+    rb_io_check_writable(fptr);
+
+    f = GetWriteFile(fptr);
+
+    rb_io_set_nonblock(fptr);
+    n = write(fileno(f), RSTRING(str)->ptr, RSTRING(str)->len);
+
+    if (n == -1) rb_sys_fail(fptr->path);
+
+    return LONG2FIX(n);
+}
+
+/*
+ *  call-seq:
+ *     ios.read([length [, buffer]])    => string, buffer, or nil
+ *
+ *  Reads at most <i>length</i> bytes from the I/O stream, or to the
+ *  end of file if <i>length</i> is omitted or is <code>nil</code>.
+ *  <i>length</i> must be a non-negative integer or nil.
+ *  If the optional <i>buffer</i> argument is present, it must reference
+ *  a String, which will receive the data.
+ *
+ *  At end of file, it returns <code>nil</code> or <code>""</code>
+ *  depend on <i>length</i>.
+ *  <code><i>ios</i>.read()</code> and
+ *  <code><i>ios</i>.read(nil)</code> returns <code>""</code>.
+ *  <code><i>ios</i>.read(<i>positive-integer</i>)</code> returns nil.
+ *
+ *     f = File.new("testfile")
+ *     f.read(16)   #=> "This is line one"
+ */
+
+static VALUE
+io_read(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    OpenFile *fptr;
+    long n, len;
+    VALUE length, str;
+
+    rb_scan_args(argc, argv, "02", &length, &str);
+
+    if (NIL_P(length)) {
+	if (!NIL_P(str)) StringValue(str);
+	GetOpenFile(io, fptr);
+	rb_io_check_readable(fptr);	
+	return read_all(fptr, remain_size(fptr), str);
+    }
+    len = NUM2LONG(length);
+    if (len < 0) {
+	rb_raise(rb_eArgError, "negative length %ld given", len);
+    }
+
+    if (NIL_P(str)) {
+	str = rb_tainted_str_new(0, len);
+    }
+    else {
+	StringValue(str);
+	rb_str_modify(str);
+	rb_str_resize(str,len);
+    }
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+    if (feof(fptr->f)) return Qnil;
+    if (len == 0) return str;
+
+    rb_str_locktmp(str);
+    READ_CHECK(fptr->f);
+    if (RSTRING(str)->len != len) {
+	rb_raise(rb_eRuntimeError, "buffer string modified");
+    }
+    n = io_fread(RSTRING(str)->ptr, len, fptr);
+    rb_str_unlocktmp(str);
+    if (n == 0) {
+	if (!fptr->f) return Qnil;
+	if (feof(fptr->f)) {
+	    rb_str_resize(str, 0);
+	    return Qnil;
+	}
+	if (len > 0) rb_sys_fail(fptr->path);
+    }
+    rb_str_resize(str, n);
+    RSTRING(str)->len = n;
+    RSTRING(str)->ptr[n] = '\0';
+    OBJ_TAINT(str);
+
+    return str;
+}
+
+static int
+appendline(fptr, delim, strp)
+    OpenFile *fptr;
+    int delim;
+    VALUE *strp;
+{
+    FILE *f = fptr->f;
+    VALUE str = *strp;
+    int c = EOF;
+#ifndef READ_DATA_PENDING_PTR
+    char buf[8192];
+    char *bp = buf, *bpe = buf + sizeof buf - 3;
+    int update = Qfalse;
+#endif
+
+    do {
+#ifdef READ_DATA_PENDING_PTR
+	long pending = READ_DATA_PENDING_COUNT(f);
+	if (pending > 0) {
+	    const char *p = READ_DATA_PENDING_PTR(f);
+	    const char *e = memchr(p, delim, pending);
+	    long last = 0, len = (c != EOF);
+	    if (e) pending = e - p + 1;
+	    len += pending;
+	    if (!NIL_P(str)) {
+		last = RSTRING(str)->len;
+		rb_str_resize(str, last + len);
+	    }
+	    else {
+		*strp = str = rb_str_buf_new(len);
+		RSTRING(str)->len = len;
+		RSTRING(str)->ptr[len] = '\0';
+	    }
+	    if (c != EOF) {
+		RSTRING(str)->ptr[last++] = c;
+	    }
+	    fread(RSTRING(str)->ptr + last, 1, pending, f); /* must not fail */
+	    if (e) return delim;
+	}
+	else if (c != EOF) {
+	    if (!NIL_P(str)) {
+		char ch = c;
+		rb_str_buf_cat(str, &ch, 1);
+	    }
+	    else {
+		*strp = str = rb_str_buf_new(1);
+		RSTRING(str)->ptr[RSTRING(str)->len++] = c;
+	    }
+	}
+	rb_thread_wait_fd(fileno(f));
+	rb_io_check_closed(fptr);
+#else
+	READ_CHECK(f);
+#endif
+	clearerr(f);
+	TRAP_BEG;
+	c = getc(f);
+	TRAP_END;
+	if (c == EOF) {
+	    if (ferror(f)) {
+		clearerr(f);
+		if (!rb_io_wait_readable(fileno(f)))
+		    rb_sys_fail(fptr->path);
+		continue;
+	    }
+#ifdef READ_DATA_PENDING_PTR
+	    return c;
+#endif
+	}
+#ifndef READ_DATA_PENDING_PTR
+	if (c == EOF || (*bp++ = c) == delim || bp == bpe) {
+	    int cnt = bp - buf;
+
+	    if (cnt > 0) {
+		if (!NIL_P(str))
+		    rb_str_cat(str, buf, cnt);
+		else
+		    *strp = str = rb_str_new(buf, cnt);
+	    }
+	    if (c == EOF) {
+		if (update)
+		    return (int)RSTRING(str)->ptr[RSTRING(str)->len-1];
+		return c;
+	    }
+	    bp = buf;
+	}
+	update = Qtrue;
+#endif
+    } while (c != delim);
+
+#ifdef READ_DATA_PENDING_PTR
+    {
+	char ch = c;
+	if (!NIL_P(str)) {
+	    rb_str_cat(str, &ch, 1);
+	}
+	else {
+	    *strp = str = rb_str_new(&ch, 1);
+	}
+    }
+#endif
+
+    return c;
+}
+
+static inline int
+swallow(fptr, term)
+    OpenFile *fptr;
+    int term;
+{
+    FILE *f = fptr->f;
+    int c;
+
+    do {
+#ifdef READ_DATA_PENDING_PTR
+	long cnt;
+	while ((cnt = READ_DATA_PENDING_COUNT(f)) > 0) {
+	    char buf[1024];
+	    const char *p = READ_DATA_PENDING_PTR(f);
+	    int i;
+	    if (cnt > sizeof buf) cnt = sizeof buf;
+	    if (*p != term) return Qtrue;
+	    i = cnt;
+	    while (--i && *++p == term);
+	    if (!fread(buf, 1, cnt - i, f)) /* must not fail */
+		rb_sys_fail(fptr->path);
+	}
+	rb_thread_wait_fd(fileno(f));
+	rb_io_check_closed(fptr);
+#else
+	READ_CHECK(f);
+#endif
+	clearerr(f);
+	TRAP_BEG;
+	c = getc(f);
+	TRAP_END;
+	if (c != term) {
+	    ungetc(c, f);
+	    return Qtrue;
+	}
+    } while (c != EOF);
+    return Qfalse;
+}
+
+static VALUE
+rb_io_getline_fast(fptr, delim)
+    OpenFile *fptr;
+    unsigned char delim;
+{
+    VALUE str = Qnil;
+    int c;
+
+    while ((c = appendline(fptr, delim, &str)) != EOF && c != delim);
+
+    if (!NIL_P(str)) {
+	fptr->lineno++;
+	lineno = INT2FIX(fptr->lineno);
+	OBJ_TAINT(str);
+    }
+
+    return str;
+}
+
+static int
+rscheck(rsptr, rslen, rs)
+    char *rsptr;
+    long rslen;
+    VALUE rs;
+{
+    if (RSTRING(rs)->ptr != rsptr && RSTRING(rs)->len != rslen)
+	rb_raise(rb_eRuntimeError, "rs modified");
+    return 1;
+}
+
+static VALUE rb_io_getline(VALUE rs, VALUE io);
+
+static VALUE
+rb_io_getline(rs, io)
+    VALUE rs, io;
+{
+    VALUE str = Qnil;
+    OpenFile *fptr;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+    if (NIL_P(rs)) {
+	str = read_all(fptr, 0, Qnil);
+	if (RSTRING(str)->len == 0) return Qnil;
+    }
+    else if (rs == rb_default_rs) {
+	return rb_io_getline_fast(fptr, '\n');
+    }
+    else {
+	int c, newline;
+	char *rsptr;
+	long rslen;
+	int rspara = 0;
+
+	rslen = RSTRING(rs)->len;
+	if (rslen == 0) {
+	    rsptr = "\n\n";
+	    rslen = 2;
+	    rspara = 1;
+	    swallow(fptr, '\n');
+	}
+	else if (rslen == 1) {
+	    return rb_io_getline_fast(fptr, (unsigned char)RSTRING(rs)->ptr[0]);
+	}
+	else {
+	    rsptr = RSTRING(rs)->ptr;
+	}
+	newline = rsptr[rslen - 1];
+
+	while ((c = appendline(fptr, newline, &str)) != EOF &&
+	       (c != newline || RSTRING(str)->len < rslen ||
+		(rspara || rscheck(rsptr,rslen,rs), 0) ||
+		memcmp(RSTRING(str)->ptr+RSTRING(str)->len-rslen,rsptr,rslen)));
+
+	if (rspara) {
+	    if (c != EOF) {
+		swallow(fptr, '\n');
+	    }
+	}
+    }
+
+    if (!NIL_P(str)) {
+	fptr->lineno++;
+	lineno = INT2FIX(fptr->lineno);
+	OBJ_TAINT(str);
+    }
+
+    return str;
+}
+
+VALUE
+rb_io_gets(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+    return rb_io_getline_fast(fptr, '\n');
+}
+
+/*
+ *  call-seq:
+ *     ios.gets(sep_string=$/)   => string or nil
+ *  
+ *  Reads the next ``line'' from the I/O stream; lines are separated by
+ *  <i>sep_string</i>. A separator of <code>nil</code> reads the entire
+ *  contents, and a zero-length separator reads the input a paragraph at
+ *  a time (two successive newlines in the input separate paragraphs).
+ *  The stream must be opened for reading or an <code>IOError</code>
+ *  will be raised. The line read in will be returned and also assigned
+ *  to <code>$_</code>. Returns <code>nil</code> if called at end of
+ *  file.
+ *     
+ *     File.new("testfile").gets   #=> "This is line one\n"
+ *     $_                          #=> "This is line one\n"
+ */
+
+static VALUE
+rb_io_gets_m(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    VALUE rs, str;
+
+    if (argc == 0) {
+	rs = rb_rs;
+    }
+    else {
+	rb_scan_args(argc, argv, "1", &rs);
+	if (!NIL_P(rs)) StringValue(rs);
+    }
+    str = rb_io_getline(rs, io);
+    rb_lastline_set(str);
+
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     ios.lineno    => integer
+ *  
+ *  Returns the current line number in <em>ios</em>. The stream must be
+ *  opened for reading. <code>lineno</code> counts the number of times
+ *  <code>gets</code> is called, rather than the number of newlines
+ *  encountered. The two values will differ if <code>gets</code> is
+ *  called with a separator other than newline. See also the
+ *  <code>$.</code> variable.
+ *     
+ *     f = File.new("testfile")
+ *     f.lineno   #=> 0
+ *     f.gets     #=> "This is line one\n"
+ *     f.lineno   #=> 1
+ *     f.gets     #=> "This is line two\n"
+ *     f.lineno   #=> 2
+ */
+
+static VALUE
+rb_io_lineno(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+    return INT2NUM(fptr->lineno);
+}
+
+/*
+ *  call-seq:
+ *     ios.lineno = integer    => integer
+ *  
+ *  Manually sets the current line number to the given value.
+ *  <code>$.</code> is updated only on the next read.
+ *     
+ *     f = File.new("testfile")
+ *     f.gets                     #=> "This is line one\n"
+ *     $.                         #=> 1
+ *     f.lineno = 1000
+ *     f.lineno                   #=> 1000
+ *     $. # lineno of last read   #=> 1
+ *     f.gets                     #=> "This is line two\n"
+ *     $. # lineno of last read   #=> 1001
+ */
+
+static VALUE
+rb_io_set_lineno(io, lineno)
+    VALUE io, lineno;
+{
+    OpenFile *fptr;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+    fptr->lineno = NUM2INT(lineno);
+    return lineno;
+}
+
+static void
+lineno_setter(val, id, var)
+    VALUE val;
+    ID id;
+    VALUE *var;
+{
+    gets_lineno = NUM2INT(val);
+    *var = INT2FIX(gets_lineno);
+}
+
+static VALUE
+argf_set_lineno(argf, val)
+    VALUE argf, val;
+{
+    gets_lineno = NUM2INT(val);
+    lineno = INT2FIX(gets_lineno);
+    return Qnil;
+}
+
+static VALUE
+argf_lineno()
+{
+    return lineno;
+}
+
+/*
+ *  call-seq:
+ *     ios.readline(sep_string=$/)   => string
+ *  
+ *  Reads a line as with <code>IO#gets</code>, but raises an
+ *  <code>EOFError</code> on end of file.
+ */
+
+static VALUE
+rb_io_readline(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    VALUE line = rb_io_gets_m(argc, argv, io);
+
+    if (NIL_P(line)) {
+	rb_eof_error();
+    }
+    return line;
+}
+
+/*
+ *  call-seq:
+ *     ios.readlines(sep_string=$/)  =>   array
+ *  
+ *  Reads all of the lines in <em>ios</em>, and returns them in
+ *  <i>anArray</i>. Lines are separated by the optional
+ *  <i>sep_string</i>. If <i>sep_string</i> is <code>nil</code>, the
+ *  rest of the stream is returned as a single record.
+ *  The stream must be opened for reading or an
+ *  <code>IOError</code> will be raised.
+ *     
+ *     f = File.new("testfile")
+ *     f.readlines[0]   #=> "This is line one\n"
+ */
+
+static VALUE
+rb_io_readlines(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    VALUE line, ary;
+    VALUE rs;
+
+    if (argc == 0) {
+	rs = rb_rs;
+    }
+    else {
+	rb_scan_args(argc, argv, "1", &rs);
+	if (!NIL_P(rs)) StringValue(rs);
+    }
+    ary = rb_ary_new();
+    while (!NIL_P(line = rb_io_getline(rs, io))) {
+	rb_ary_push(ary, line);
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     ios.each(sep_string=$/)      {|line| block }  => ios
+ *     ios.each_line(sep_string=$/) {|line| block }  => ios
+ *  
+ *  Executes the block for every line in <em>ios</em>, where lines are
+ *  separated by <i>sep_string</i>. <em>ios</em> must be opened for
+ *  reading or an <code>IOError</code> will be raised.
+ *     
+ *     f = File.new("testfile")
+ *     f.each {|line| puts "#{f.lineno}: #{line}" }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     1: This is line one
+ *     2: This is line two
+ *     3: This is line three
+ *     4: And so on...
+ */
+
+static VALUE
+rb_io_each_line(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    VALUE str;
+    VALUE rs;
+
+    if (argc == 0) {
+	rs = rb_rs;
+    }
+    else {
+	rb_scan_args(argc, argv, "1", &rs);
+	if (!NIL_P(rs)) StringValue(rs);
+    }
+    while (!NIL_P(str = rb_io_getline(rs, io))) {
+	rb_yield(str);
+    }
+    return io;
+}
+
+/*
+ *  call-seq:
+ *     ios.each_byte {|byte| block }  => nil
+ *  
+ *  Calls the given block once for each byte (0..255) in <em>ios</em>,
+ *  passing the byte as an argument. The stream must be opened for
+ *  reading or an <code>IOError</code> will be raised.
+ *     
+ *     f = File.new("testfile")
+ *     checksum = 0
+ *     f.each_byte {|x| checksum ^= x }   #=> #<File:testfile>
+ *     checksum                           #=> 12
+ */
+
+static VALUE
+rb_io_each_byte(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+    FILE *f;
+    int c;
+
+    GetOpenFile(io, fptr);
+
+    for (;;) {
+	rb_io_check_readable(fptr);
+	f = fptr->f;
+	READ_CHECK(f);
+	clearerr(f);
+	TRAP_BEG;
+	c = getc(f);
+	TRAP_END;
+	if (c == EOF) {
+	    if (ferror(f)) {
+		clearerr(f);
+		if (!rb_io_wait_readable(fileno(f)))
+		    rb_sys_fail(fptr->path);
+		continue;
+	    }
+	    break;
+	}
+	rb_yield(INT2FIX(c & 0xff));
+    }
+    if (ferror(f)) rb_sys_fail(fptr->path);
+    return io;
+}
+
+/*
+ *  call-seq:
+ *     ios.getc   => fixnum or nil
+ *  
+ *  Gets the next 8-bit byte (0..255) from <em>ios</em>. Returns
+ *  <code>nil</code> if called at end of file.
+ *     
+ *     f = File.new("testfile")
+ *     f.getc   #=> 84
+ *     f.getc   #=> 104
+ */
+
+VALUE
+rb_io_getc(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+    FILE *f;
+    int c;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+    f = fptr->f;
+
+  retry:
+    READ_CHECK(f);
+    clearerr(f);
+    TRAP_BEG;
+    c = getc(f);
+    TRAP_END;
+
+    if (c == EOF) {
+	if (ferror(f)) {
+	    clearerr(f);
+	    if (!rb_io_wait_readable(fileno(f)))
+		rb_sys_fail(fptr->path);
+	    goto retry;
+	}
+	return Qnil;
+    }
+    return INT2FIX(c & 0xff);
+}
+
+int
+rb_getc(f)
+    FILE *f;
+{
+    int c;
+
+    if (!READ_DATA_PENDING(f)) {
+	rb_thread_wait_fd(fileno(f));
+    }
+    clearerr(f);
+    TRAP_BEG;
+    c = getc(f);
+    TRAP_END;
+
+    return c;
+}
+
+/*
+ *  call-seq:
+ *     ios.readchar   => fixnum
+ *  
+ *  Reads a character as with <code>IO#getc</code>, but raises an
+ *  <code>EOFError</code> on end of file.
+ */
+
+static VALUE
+rb_io_readchar(io)
+    VALUE io;
+{
+    VALUE c = rb_io_getc(io);
+
+    if (NIL_P(c)) {
+	rb_eof_error();
+    }
+    return c;
+}
+
+/*
+ *  call-seq:
+ *     ios.ungetc(integer)   => nil
+ *  
+ *  Pushes back one character (passed as a parameter) onto <em>ios</em>,
+ *  such that a subsequent buffered read will return it. Only one character
+ *  may be pushed back before a subsequent read operation (that is,
+ *  you will be able to read only the last of several characters that have been pushed
+ *  back). Has no effect with unbuffered reads (such as <code>IO#sysread</code>).
+ *     
+ *     f = File.new("testfile")   #=> #<File:testfile>
+ *     c = f.getc                 #=> 84
+ *     f.ungetc(c)                #=> nil
+ *     f.getc                     #=> 84
+ */
+
+VALUE
+rb_io_ungetc(io, c)
+    VALUE io, c;
+{
+    OpenFile *fptr;
+    int cc = NUM2INT(c);
+
+    GetOpenFile(io, fptr);
+    if (!(fptr->mode & FMODE_RBUF))
+	rb_raise(rb_eIOError, "unread stream");
+    rb_io_check_readable(fptr);
+
+    if (ungetc(cc, fptr->f) == EOF && cc != EOF) {
+	rb_raise(rb_eIOError, "ungetc failed");
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     ios.isatty   => true or false
+ *     ios.tty?     => true or false
+ *  
+ *  Returns <code>true</code> if <em>ios</em> is associated with a
+ *  terminal device (tty), <code>false</code> otherwise.
+ *     
+ *     File.new("testfile").isatty   #=> false
+ *     File.new("/dev/tty").isatty   #=> true
+ */
+
+static VALUE
+rb_io_isatty(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+
+    GetOpenFile(io, fptr);
+    if (isatty(fileno(fptr->f)) == 0)
+	return Qfalse;
+    return Qtrue;
+}
+
+static void
+fptr_finalize(fptr, noraise)
+    OpenFile *fptr;
+    int noraise;
+{
+    int n1 = 0, n2 = 0, f1, f2 = -1;
+
+    if (fptr->f2) {
+	f2 = fileno(fptr->f2);
+	while (n2 = 0, fflush(fptr->f2) < 0) {
+	    n2 = errno;
+	    if (!rb_io_wait_writable(f2)) {
+		break;
+	    }
+	    if (!fptr->f2) break;
+	}
+	if (fclose(fptr->f2) < 0 && n2 == 0) {
+	    n2 = errno;
+	}
+	fptr->f2 = 0;
+    }
+    if (fptr->f) {
+	f1 = fileno(fptr->f);
+	if ((f2 == -1) && (fptr->mode & FMODE_WBUF)) {
+	    while (n1 = 0, fflush(fptr->f) < 0) {
+		n1 = errno;
+		if (!rb_io_wait_writable(f1)) break;
+		if (!fptr->f) break;
+	    }
+	}
+	if (fclose(fptr->f) < 0 && n1 == 0) {
+	    n1 = errno;
+	}
+	fptr->f = 0;
+	if (n1 == EBADF && f1 == f2) {
+	    n1 = 0;
+	}
+    }
+    if (!noraise && (n1 || n2)) {
+	errno = (n1 ? n1 : n2);
+	rb_sys_fail(fptr->path);
+    }
+}
+
+static void
+rb_io_fptr_cleanup(fptr, noraise)
+    OpenFile *fptr;
+    int noraise;
+{
+    if (fptr->finalize) {
+	(*fptr->finalize)(fptr, noraise);
+    }
+    else {
+	fptr_finalize(fptr, noraise);
+    }
+}
+
+void
+rb_io_fptr_finalize(fptr)
+    OpenFile *fptr;
+{
+    if (!fptr) return;
+    if (fptr->path) {
+	free(fptr->path);
+    }
+    if (!fptr->f && !fptr->f2) return;
+    if (fileno(fptr->f) < 3) return;
+
+    rb_io_fptr_cleanup(fptr, Qtrue);
+}
+
+VALUE
+rb_io_close(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+    int fd, fd2;
+
+    fptr = RFILE(io)->fptr;
+    if (!fptr) return Qnil;
+    if (fptr->f2) {
+	fd2 = fileno(fptr->f2);
+    }
+    else {
+	if (!fptr->f) return Qnil;
+	fd2 = -1;
+    }
+
+    fd = fileno(fptr->f);
+    rb_io_fptr_cleanup(fptr, Qfalse);
+    rb_thread_fd_close(fd);
+    if (fd2 >= 0) rb_thread_fd_close(fd2);
+
+    if (fptr->pid) {
+	rb_syswait(fptr->pid);
+	fptr->pid = 0;
+    }
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     ios.close   => nil
+ *  
+ *  Closes <em>ios</em> and flushes any pending writes to the operating
+ *  system. The stream is unavailable for any further data operations;
+ *  an <code>IOError</code> is raised if such an attempt is made. I/O
+ *  streams are automatically closed when they are claimed by the
+ *  garbage collector.
+ *
+ *  If <em>ios</em> is opened by <code>IO.popen</code>,
+ *  <code>close</code> sets <code>$?</code>.
+ */
+
+static VALUE
+rb_io_close_m(io)
+    VALUE io;
+{
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't close");
+    }
+    rb_io_check_closed(RFILE(io)->fptr);
+    rb_io_close(io);
+    return Qnil;
+}
+
+static VALUE
+io_call_close(io)
+    VALUE io;
+{
+    return rb_funcall(io, rb_intern("close"), 0, 0);
+}
+
+static VALUE
+io_close(io)
+    VALUE io;
+{
+    return rb_rescue(io_call_close, io, 0, 0);
+}
+
+/*
+ *  call-seq:
+ *     ios.closed?    => true or false
+ *  
+ *  Returns <code>true</code> if <em>ios</em> is completely closed (for
+ *  duplex streams, both reader and writer), <code>false</code>
+ *  otherwise.
+ *     
+ *     f = File.new("testfile")
+ *     f.close         #=> nil
+ *     f.closed?       #=> true
+ *     f = IO.popen("/bin/sh","r+")
+ *     f.close_write   #=> nil
+ *     f.closed?       #=> false
+ *     f.close_read    #=> nil
+ *     f.closed?       #=> true
+ */
+
+static VALUE
+rb_io_closed(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+
+    fptr = RFILE(io)->fptr;
+    rb_io_check_initialized(fptr);
+    return (fptr->f || fptr->f2)?Qfalse:Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     ios.close_read    => nil
+ *  
+ *  Closes the read end of a duplex I/O stream (i.e., one that contains
+ *  both a read and a write stream, such as a pipe). Will raise an
+ *  <code>IOError</code> if the stream is not duplexed.
+ *     
+ *     f = IO.popen("/bin/sh","r+")
+ *     f.close_read
+ *     f.readlines
+ *     
+ *  <em>produces:</em>
+ *     
+ *     prog.rb:3:in `readlines': not opened for reading (IOError)
+ *     	from prog.rb:3
+ */
+
+static VALUE
+rb_io_close_read(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+    int n;
+
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't close");
+    }
+    GetOpenFile(io, fptr);
+    if (fptr->f2 == 0 && (fptr->mode & FMODE_WRITABLE)) {
+	rb_raise(rb_eIOError, "closing non-duplex IO for reading");
+    }
+    if (fptr->f2 == 0) {
+	return rb_io_close(io);
+    }
+    n = fclose(fptr->f);
+    fptr->mode &= ~FMODE_READABLE;
+    fptr->f = fptr->f2;
+    fptr->f2 = 0;
+    if (n != 0) rb_sys_fail(fptr->path);
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     ios.close_write   => nil
+ *  
+ *  Closes the write end of a duplex I/O stream (i.e., one that contains
+ *  both a read and a write stream, such as a pipe). Will raise an
+ *  <code>IOError</code> if the stream is not duplexed.
+ *     
+ *     f = IO.popen("/bin/sh","r+")
+ *     f.close_write
+ *     f.print "nowhere"
+ *     
+ *  <em>produces:</em>
+ *     
+ *     prog.rb:3:in `write': not opened for writing (IOError)
+ *     	from prog.rb:3:in `print'
+ *     	from prog.rb:3
+ */
+
+static VALUE
+rb_io_close_write(io)
+    VALUE io;
+{
+    OpenFile *fptr;
+    int n;
+
+    if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't close");
+    }
+    GetOpenFile(io, fptr);
+    if (fptr->f2 == 0 && (fptr->mode & FMODE_READABLE)) {
+	rb_raise(rb_eIOError, "closing non-duplex IO for writing");
+    }
+    if (fptr->f2 == 0) {
+	return rb_io_close(io);
+    }
+    n = fclose(fptr->f2);
+    fptr->f2 = 0;
+    fptr->mode &= ~FMODE_WRITABLE;
+    if (n != 0) rb_sys_fail(fptr->path);
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     ios.sysseek(offset, whence=SEEK_SET)   => integer
+ *  
+ *  Seeks to a given <i>offset</i> in the stream according to the value
+ *  of <i>whence</i> (see <code>IO#seek</code> for values of
+ *  <i>whence</i>). Returns the new offset into the file.
+ *     
+ *     f = File.new("testfile")
+ *     f.sysseek(-13, IO::SEEK_END)   #=> 53
+ *     f.sysread(10)                  #=> "And so on."
+ */
+
+static VALUE
+rb_io_sysseek(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    VALUE offset, ptrname;
+    int whence = SEEK_SET;
+    OpenFile *fptr;
+    off_t pos;
+
+    if (rb_scan_args(argc, argv, "11", &offset, &ptrname) == 2) {
+	whence = NUM2INT(ptrname);
+    }
+    pos = NUM2OFFT(offset);
+    GetOpenFile(io, fptr);
+    if ((fptr->mode & FMODE_READABLE) && READ_DATA_BUFFERED(fptr->f)) {
+	rb_raise(rb_eIOError, "sysseek for buffered IO");
+    }
+    if ((fptr->mode & FMODE_WRITABLE) && (fptr->mode & FMODE_WBUF)) {
+	rb_warn("sysseek for buffered IO");
+    }
+    pos = lseek(fileno(fptr->f), pos, whence);
+    if (pos == -1) rb_sys_fail(fptr->path);
+    clearerr(fptr->f);
+
+    return OFFT2NUM(pos);
+}
+
+/*
+ *  call-seq:
+ *     ios.syswrite(string)   => integer
+ *  
+ *  Writes the given string to <em>ios</em> using a low-level write.
+ *  Returns the number of bytes written. Do not mix with other methods
+ *  that write to <em>ios</em> or you may get unpredictable results.
+ *  Raises <code>SystemCallError</code> on error.
+ *     
+ *     f = File.new("out", "w")
+ *     f.syswrite("ABCDEF")   #=> 6
+ */
+
+static VALUE
+rb_io_syswrite(io, str)
+    VALUE io, str;
+{
+    OpenFile *fptr;
+    FILE *f;
+    long n;
+
+    rb_secure(4);
+    if (TYPE(str) != T_STRING)
+	str = rb_obj_as_string(str);
+
+    GetOpenFile(io, fptr);
+    rb_io_check_writable(fptr);
+    f = GetWriteFile(fptr);
+
+    if (fptr->mode & FMODE_WBUF) {
+	rb_warn("syswrite for buffered IO");
+    }
+    if (!rb_thread_fd_writable(fileno(f))) {
+        rb_io_check_closed(fptr);
+    }
+    TRAP_BEG;
+    n = write(fileno(f), RSTRING(str)->ptr, RSTRING(str)->len);
+    TRAP_END;
+
+    if (n == -1) rb_sys_fail(fptr->path);
+
+    return LONG2FIX(n);
+}
+
+/*
+ *  call-seq:
+ *     ios.sysread(integer )    => string
+ *  
+ *  Reads <i>integer</i> bytes from <em>ios</em> using a low-level
+ *  read and returns them as a string. Do not mix with other methods
+ *  that read from <em>ios</em> or you may get unpredictable results.
+ *  Raises <code>SystemCallError</code> on error and
+ *  <code>EOFError</code> at end of file.
+ *     
+ *     f = File.new("testfile")
+ *     f.sysread(16)   #=> "This is line one"
+ */
+
+static VALUE
+rb_io_sysread(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    VALUE len, str;
+    OpenFile *fptr;
+    long n, ilen;
+
+    rb_scan_args(argc, argv, "11", &len, &str);
+    ilen = NUM2LONG(len);
+
+    if (NIL_P(str)) {
+	str = rb_str_new(0, ilen);
+    }
+    else {
+	StringValue(str);
+	rb_str_modify(str);
+	rb_str_resize(str, ilen);
+    }
+    if (ilen == 0) return str;
+
+    GetOpenFile(io, fptr);
+    rb_io_check_readable(fptr);
+
+    if (READ_DATA_BUFFERED(fptr->f)) {
+	rb_raise(rb_eIOError, "sysread for buffered IO");
+    }
+    rb_str_locktmp(str);
+
+    n = fileno(fptr->f);
+    rb_thread_wait_fd(fileno(fptr->f));
+    rb_io_check_closed(fptr);
+    if (RSTRING(str)->len != ilen) {
+	rb_raise(rb_eRuntimeError, "buffer string modified");
+    }
+    TRAP_BEG;
+    n = read(fileno(fptr->f), RSTRING(str)->ptr, ilen);
+    TRAP_END;
+
+    rb_str_unlocktmp(str);
+    if (n == -1) {
+	rb_sys_fail(fptr->path);
+    }
+    rb_str_resize(str, n);
+    if (n == 0 && ilen > 0) {
+	rb_eof_error();
+    }
+    RSTRING(str)->len = n;
+    RSTRING(str)->ptr[n] = '\0';
+    OBJ_TAINT(str);
+
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     ios.binmode    => ios
+ *  
+ *  Puts <em>ios</em> into binary mode. This is useful only in
+ *  MS-DOS/Windows environments. Once a stream is in binary mode, it
+ *  cannot be reset to nonbinary mode.
+ */
+
+VALUE
+rb_io_binmode(io)
+    VALUE io;
+{
+#if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__EMX__)
+    OpenFile *fptr;
+
+    GetOpenFile(io, fptr);
+#ifdef __human68k__
+    if (fptr->f)
+	fmode(fptr->f, _IOBIN);
+    if (fptr->f2)
+	fmode(fptr->f2, _IOBIN);
+#else
+    if (fptr->f && setmode(fileno(fptr->f), O_BINARY) == -1)
+	rb_sys_fail(fptr->path);
+    if (fptr->f2 && setmode(fileno(fptr->f2), O_BINARY) == -1)
+	rb_sys_fail(fptr->path);
+#endif
+
+    fptr->mode |= FMODE_BINMODE;
+#endif
+    return io;
+}
+
+char*
+rb_io_flags_mode(flags)
+    int flags;
+{
+#ifdef O_BINARY
+# define MODE_BINMODE(a,b) ((flags & FMODE_BINMODE) ? (b) : (a))
+#else
+# define MODE_BINMODE(a,b) (a)
+#endif
+    if (flags & FMODE_APPEND) {
+	if ((flags & FMODE_READWRITE) == FMODE_READWRITE) {
+	    return MODE_BINMODE("a+", "ab+");
+	}
+	return MODE_BINMODE("a", "ab");
+    }
+    switch (flags & FMODE_READWRITE) {
+      case FMODE_READABLE:
+	return MODE_BINMODE("r", "rb");
+      case FMODE_WRITABLE:
+	return MODE_BINMODE("w", "wb");
+      case FMODE_READWRITE:
+	if (flags & FMODE_CREATE) {
+	    return MODE_BINMODE("w+", "wb+");
+	}
+	return MODE_BINMODE("r+", "rb+");
+    }
+    rb_raise(rb_eArgError, "illegal access modenum %o", flags);
+    return NULL;		/* not reached */
+}
+
+int
+rb_io_mode_flags(mode)
+    const char *mode;
+{
+    int flags = 0;
+    const char *m = mode;
+
+    switch (*m++) {
+      case 'r':
+	flags |= FMODE_READABLE;
+	break;
+      case 'w':
+	flags |= FMODE_WRITABLE | FMODE_CREATE;
+	break;
+      case 'a':
+	flags |= FMODE_WRITABLE | FMODE_APPEND | FMODE_CREATE;
+	break;
+      default:
+      error:
+	rb_raise(rb_eArgError, "illegal access mode %s", mode);
+    }
+
+    while (*m) {
+        switch (*m++) {
+        case 'b':
+            flags |= FMODE_BINMODE;
+            break;
+        case '+':
+            flags |= FMODE_READWRITE;
+            break;
+        default:
+            goto error;
+        }
+    }
+
+    return flags;
+}
+
+int
+rb_io_modenum_flags(mode)
+    int mode;
+{
+    int flags = 0;
+
+    switch (mode & (O_RDONLY|O_WRONLY|O_RDWR)) {
+      case O_RDONLY:
+	flags = FMODE_READABLE;
+	break;
+      case O_WRONLY:
+	flags = FMODE_WRITABLE;
+	break;
+      case O_RDWR:
+	flags = FMODE_READWRITE;
+	break;
+    }
+
+    if (mode & O_APPEND) {
+	flags |= FMODE_APPEND;
+    }
+    if (mode & O_CREAT) {
+	flags |= FMODE_CREATE;
+    }
+#ifdef O_BINARY
+    if (mode & O_BINARY) {
+	flags |= FMODE_BINMODE;
+    }
+#endif
+
+    return flags;
+}
+
+static int
+rb_io_mode_modenum(mode)
+    const char *mode;
+{
+    int flags = 0;
+    const char *m = mode;
+
+    switch (*m++) {
+      case 'r':
+	flags |= O_RDONLY;
+	break;
+      case 'w':
+	flags |= O_WRONLY | O_CREAT | O_TRUNC;
+	break;
+      case 'a':
+	flags |= O_WRONLY | O_CREAT | O_APPEND;
+	break;
+      default:
+      error:
+	rb_raise(rb_eArgError, "illegal access mode %s", mode);
+    }
+
+    while (*m) {
+        switch (*m++) {
+        case 'b':
+#ifdef O_BINARY
+            flags |= O_BINARY;
+#endif
+            break;
+        case '+':
+            flags = (flags & ~O_ACCMODE) | O_RDWR;
+            break;
+        default:
+            goto error;
+        }
+    }
+
+    return flags;
+}
+
+#define MODENUM_MAX 4
+
+static char*
+rb_io_modenum_mode(flags)
+    int flags;
+{
+#ifdef O_BINARY
+# define MODE_BINARY(a,b) ((flags & O_BINARY) ? (b) : (a))
+#else
+# define MODE_BINARY(a,b) (a)
+#endif
+    if (flags & O_APPEND) {
+	if ((flags & O_RDWR) == O_RDWR) {
+	    return MODE_BINARY("a+", "ab+");
+	}
+	return MODE_BINARY("a", "ab");
+    }
+    switch (flags & (O_RDONLY|O_WRONLY|O_RDWR)) {
+      case O_RDONLY:
+	return MODE_BINARY("r", "rb");
+      case O_WRONLY:
+	return MODE_BINARY("w", "wb");
+      case O_RDWR:
+	return MODE_BINARY("r+", "rb+");
+    }
+    rb_raise(rb_eArgError, "illegal access modenum %o", flags);
+    return NULL;		/* not reached */
+}
+
+static int
+rb_sysopen(fname, flags, mode)
+    char *fname;
+    int flags;
+    unsigned int mode;
+{
+    int fd;
+
+    fd = open(fname, flags, mode);
+    if (fd < 0) {
+	if (errno == EMFILE || errno == ENFILE) {
+	    rb_gc();
+	    fd = open(fname, flags, mode);
+	}
+	if (fd < 0) {
+	    rb_sys_fail(fname);
+	}
+    }
+    return fd;
+}
+
+FILE *
+rb_fopen(fname, mode)
+    const char *fname;
+    const char *mode;
+{
+    FILE *file;
+
+    file = fopen(fname, mode);
+    if (!file) {
+	if (errno == EMFILE || errno == ENFILE) {
+	    rb_gc();
+	    file = fopen(fname, mode);
+	}
+	if (!file) {
+	    rb_sys_fail(fname);
+	}
+    }
+#ifdef USE_SETVBUF
+    if (setvbuf(file, NULL, _IOFBF, 0) != 0)
+	rb_warn("setvbuf() can't be honoured for %s", fname);
+#endif
+#ifdef __human68k__
+    fmode(file, _IOTEXT);
+#endif
+    return file;
+}
+
+FILE *
+rb_fdopen(fd, mode)
+    int fd;
+    const char *mode;
+{
+    FILE *file;
+
+#if defined(sun)
+    errno = 0;
+#endif
+    file = fdopen(fd, mode);
+    if (!file) {
+#if defined(sun)
+	if (errno == 0 || errno == EMFILE || errno == ENFILE) {
+#else
+	if (errno == EMFILE || errno == ENFILE) {
+#endif
+	    rb_gc();
+#if defined(sun)
+	    errno = 0;
+#endif
+	    file = fdopen(fd, mode);
+	}
+	if (!file) {
+#ifdef _WIN32
+	    if (errno == 0) errno = EINVAL;
+#endif
+#if defined(sun)
+	    if (errno == 0) errno = EMFILE;
+#endif
+	    rb_sys_fail(0);
+	}
+    }
+
+#ifdef USE_SETVBUF
+    if (setvbuf(file, NULL, _IOFBF, 0) != 0)
+	rb_warn("setvbuf() can't be honoured (fd=%d)", fd);
+#endif
+    return file;
+}
+
+static VALUE
+rb_file_open_internal(io, fname, mode)
+    VALUE io;
+    const char *fname, *mode;
+{
+    OpenFile *fptr;
+
+    MakeOpenFile(io, fptr);
+
+    fptr->mode = rb_io_mode_flags(mode);
+    fptr->path = strdup(fname);
+    fptr->f = rb_fopen(fptr->path, rb_io_flags_mode(fptr->mode));
+
+    return io;
+}
+
+VALUE
+rb_file_open(fname, mode)
+    const char *fname, *mode;
+{
+    return rb_file_open_internal(io_alloc(rb_cFile), fname, mode);
+}
+
+static VALUE
+rb_file_sysopen_internal(io, fname, flags, mode)
+    VALUE io;
+    char *fname;
+    int flags, mode;
+{
+    OpenFile *fptr;
+    int fd;
+    char *m;
+
+    MakeOpenFile(io, fptr);
+
+    fptr->path = strdup(fname);
+    m = rb_io_modenum_mode(flags);
+    fptr->mode = rb_io_modenum_flags(flags);
+    fd = rb_sysopen(fptr->path, flags, mode);
+    fptr->f = rb_fdopen(fd, m);
+
+    return io;
+}
+
+VALUE
+rb_file_sysopen(fname, flags, mode)
+    const char *fname;
+    int flags, mode;
+{
+    return rb_file_sysopen_internal(io_alloc(rb_cFile), fname, flags, mode);
+}
+
+#if defined (_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__VMS)
+static struct pipe_list {
+    OpenFile *fptr;
+    struct pipe_list *next;
+} *pipe_list;
+
+static void
+pipe_add_fptr(fptr)
+    OpenFile *fptr;
+{
+    struct pipe_list *list;
+
+    list = ALLOC(struct pipe_list);
+    list->fptr = fptr;
+    list->next = pipe_list;
+    pipe_list = list;
+}
+
+static void
+pipe_del_fptr(fptr)
+    OpenFile *fptr;
+{
+    struct pipe_list *list = pipe_list;
+    struct pipe_list *tmp;
+
+    if (list->fptr == fptr) {
+	pipe_list = list->next;
+	free(list);
+	return;
+    }
+
+    while (list->next) {
+	if (list->next->fptr == fptr) {
+	    tmp = list->next;
+	    list->next = list->next->next;
+	    free(tmp);
+	    return;
+	}
+	list = list->next;
+    }
+}
+
+static void
+pipe_atexit _((void))
+{
+    struct pipe_list *list = pipe_list;
+    struct pipe_list *tmp;
+
+    while (list) {
+	tmp = list->next;
+	rb_io_fptr_finalize(list->fptr);
+	list = tmp;
+    }
+}
+
+static void pipe_finalize _((OpenFile *fptr,int));
+
+static void
+pipe_finalize(fptr, noraise)
+    OpenFile *fptr;
+    int noraise;
+{
+#if !defined (__CYGWIN__) && !defined(_WIN32)
+    extern VALUE rb_last_status;
+    int status;
+    if (fptr->f) {
+	status = pclose(fptr->f);
+    }
+    if (fptr->f2) {
+	status = pclose(fptr->f2);
+    }
+    fptr->f = fptr->f2 = 0;
+#if defined DJGPP
+    status <<= 8;
+#endif
+    rb_last_status = INT2FIX(status);
+#else
+    fptr_finalize(fptr, noraise);
+#endif
+    pipe_del_fptr(fptr);
+}
+#endif
+
+void
+rb_io_synchronized(fptr)
+    OpenFile *fptr;
+{
+    fptr->mode |= FMODE_SYNC;
+}
+
+void
+rb_io_unbuffered(fptr)
+    OpenFile *fptr;
+{
+    rb_io_synchronized(fptr);
+}
+
+static VALUE pipe_open(VALUE pstr, char *pname, char *mode);
+
+static VALUE
+pipe_open(pstr, pname, mode)
+    VALUE pstr;
+    char *pname, *mode;
+{
+    int modef = rb_io_mode_flags(mode);
+    OpenFile *fptr;
+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
+    FILE *f;
+#else
+    int pid;
+#ifdef _WIN32
+    FILE *fpr, *fpw;
+#else
+    int pr[2], pw[2];
+#endif
+#endif
+    volatile int doexec;
+
+    if (!pname) pname = StringValueCStr(pstr);
+    doexec = (strcmp("-", pname) != 0);
+
+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS) || defined(_WIN32)
+    if (!doexec) {
+	rb_raise(rb_eNotImpError,
+		 "fork() function is unimplemented on this machine");
+    }
+#endif
+
+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
+    f = popen(pname, mode);
+    
+    if (!f) rb_sys_fail(pname);
+    else {
+	VALUE port = io_alloc(rb_cIO);
+
+	MakeOpenFile(port, fptr);
+	fptr->finalize = pipe_finalize;
+	fptr->mode = modef;
+
+	pipe_add_fptr(fptr);
+	if (modef & FMODE_READABLE) fptr->f  = f;
+	if (modef & FMODE_WRITABLE) {
+	    if (fptr->f) fptr->f2 = f;
+	    else fptr->f = f;
+	    rb_io_synchronized(fptr);
+	}
+	return (VALUE)port;
+    }
+#else
+#ifdef _WIN32
+retry:
+    pid = pipe_exec(pname, rb_io_mode_modenum(mode), &fpr, &fpw);
+    if (pid == -1) {		/* exec failed */
+	if (errno == EAGAIN) {
+	    rb_thread_sleep(1);
+	    goto retry;
+	}
+	rb_sys_fail(pname);
+    }
+    else {
+        VALUE port = io_alloc(rb_cIO);
+
+	MakeOpenFile(port, fptr);
+	fptr->mode = modef;
+	fptr->mode |= FMODE_SYNC;
+	fptr->pid = pid;
+
+	if (modef & FMODE_READABLE) {
+	    fptr->f = fpr;
+	}
+	if (modef & FMODE_WRITABLE) {
+	    if (fptr->f) fptr->f2 = fpw;
+	    else fptr->f = fpw;
+	}
+	fptr->finalize = pipe_finalize;
+	pipe_add_fptr(fptr);
+	return (VALUE)port;
+    }
+#else
+    if (((modef & FMODE_READABLE) && pipe(pr) == -1) ||
+	((modef & FMODE_WRITABLE) && pipe(pw) == -1))
+	rb_sys_fail(pname);
+
+    if (!doexec) {
+	fflush(stdin);		/* is it really needed? */
+	fflush(stdout);
+	fflush(stderr);
+    }
+
+  retry:
+    switch ((pid = fork())) {
+      case 0:			/* child */
+	if (modef & FMODE_READABLE) {
+	    close(pr[0]);
+	    if (pr[1] != 1) {
+		dup2(pr[1], 1);
+		close(pr[1]);
+	    }
+	}
+	if (modef & FMODE_WRITABLE) {
+	    close(pw[1]);
+	    if (pw[0] != 0) {
+		dup2(pw[0], 0);
+		close(pw[0]);
+	    }
+	}
+
+	if (doexec) {
+	    int fd;
+
+	    for (fd = 3; fd < NOFILE; fd++)
+		close(fd);
+	    rb_proc_exec(pname);
+	    fprintf(stderr, "%s:%d: command not found: %s\n",
+		    ruby_sourcefile, ruby_sourceline, pname);
+	    _exit(127);
+	}
+	rb_io_synchronized(RFILE(orig_stdout)->fptr);
+	rb_io_synchronized(RFILE(orig_stderr)->fptr);
+	return Qnil;
+
+      case -1:			/* fork failed */
+	if (errno == EAGAIN) {
+	    rb_thread_sleep(1);
+	    goto retry;
+	}
+	else {
+	    int e = errno;
+	    if ((modef & FMODE_READABLE)) {
+		close(pr[0]);
+		close(pr[1]);
+	    }
+	    if ((modef & FMODE_WRITABLE)) {
+		close(pw[0]);
+		close(pw[1]);
+	    }
+	    errno = e;
+	    rb_sys_fail(pname);
+	}
+	break;
+
+      default:			/* parent */
+	if (pid < 0) rb_sys_fail(pname);
+	else {
+	    VALUE port = io_alloc(rb_cIO);
+
+	    MakeOpenFile(port, fptr);
+	    fptr->mode = modef;
+	    fptr->mode |= FMODE_SYNC;
+	    fptr->pid = pid;
+
+	    if (modef & FMODE_READABLE) {
+		close(pr[1]);
+		fptr->f  = rb_fdopen(pr[0], "r");
+	    }
+	    if (modef & FMODE_WRITABLE) {
+		FILE *f = rb_fdopen(pw[1], "w");
+
+		close(pw[0]);
+		if (fptr->f) fptr->f2 = f;
+		else fptr->f = f;
+	    }
+#if defined (__CYGWIN__)
+	    fptr->finalize = pipe_finalize;
+	    pipe_add_fptr(fptr);
+#endif
+	    return port;
+	}
+    }
+#endif
+#endif
+}
+
+/*
+ *  call-seq:
+ *     IO.popen(cmd_string, mode="r" )               => io
+ *     IO.popen(cmd_string, mode="r" ) {|io| block } => obj
+ *  
+ *  Runs the specified command string as a subprocess; the subprocess's
+ *  standard input and output will be connected to the returned
+ *  <code>IO</code> object. If <i>cmd_string</i> starts with a
+ *  ``<code>-</code>'', then a new instance of Ruby is started as the
+ *  subprocess. The default mode for the new file object is ``r'', but
+ *  <i>mode</i> may be set to any of the modes listed in the description
+ *  for class IO.
+ *     
+ *  If a block is given, Ruby will run the command as a child connected
+ *  to Ruby with a pipe. Ruby's end of the pipe will be passed as a
+ *  parameter to the block.
+ *  At the end of block, Ruby close the pipe and sets <code>$?</code>.
+ *  In this case <code>IO::popen</code> returns
+ *  the value of the block.
+ *     
+ *  If a block is given with a <i>cmd_string</i> of ``<code>-</code>'',
+ *  the block will be run in two separate processes: once in the parent,
+ *  and once in a child. The parent process will be passed the pipe
+ *  object as a parameter to the block, the child version of the block
+ *  will be passed <code>nil</code>, and the child's standard in and
+ *  standard out will be connected to the parent through the pipe. Not
+ *  available on all platforms.
+ *     
+ *     f = IO.popen("uname")
+ *     p f.readlines
+ *     puts "Parent is #{Process.pid}"
+ *     IO.popen ("date") { |f| puts f.gets }
+ *     IO.popen("-") {|f| $stderr.puts "#{Process.pid} is here, f is #{f}"}
+ *     p $?
+ *     
+ *  <em>produces:</em>
+ *     
+ *     ["Linux\n"]
+ *     Parent is 26166
+ *     Wed Apr  9 08:53:52 CDT 2003
+ *     26169 is here, f is
+ *     26166 is here, f is #<IO:0x401b3d44>
+ *     #<Process::Status: pid=26166,exited(0)>
+ */
+
+static VALUE
+rb_io_s_popen(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    char *mode;
+    VALUE pname, pmode, port;
+
+    if (rb_scan_args(argc, argv, "11", &pname, &pmode) == 1) {
+	mode = "r";
+    }
+    else if (FIXNUM_P(pmode)) {
+	mode = rb_io_modenum_mode(FIX2INT(pmode));
+    }
+    else {
+	mode = rb_io_flags_mode(rb_io_mode_flags(StringValuePtr(pmode)));
+    }
+    SafeStringValue(pname);
+    port = pipe_open(pname, 0, mode);
+    if (NIL_P(port)) {
+	/* child */
+	if (rb_block_given_p()) {
+	    rb_yield(Qnil);
+	    fflush(stdout);
+	    fflush(stderr);
+	    _exit(0);
+	}
+	return Qnil;
+    }
+    RBASIC(port)->klass = klass;
+    if (rb_block_given_p()) {
+	return rb_ensure(rb_yield, port, io_close, port);
+    }
+    return port;
+}
+
+static VALUE
+rb_open_file(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    VALUE fname, vmode, perm;
+    char *mode;
+    int flags, fmode;
+
+    rb_scan_args(argc, argv, "12", &fname, &vmode, &perm);
+    SafeStringValue(fname);
+
+    if (FIXNUM_P(vmode) || !NIL_P(perm)) {
+	if (FIXNUM_P(vmode)) {
+	    flags = FIX2INT(vmode);
+	}
+	else {
+	    SafeStringValue(vmode);
+	    flags = rb_io_mode_modenum(RSTRING(vmode)->ptr);
+	}
+	fmode = NIL_P(perm) ? 0666 :  NUM2INT(perm);
+
+	rb_file_sysopen_internal(io, RSTRING(fname)->ptr, flags, fmode);
+    }
+    else {
+	mode = NIL_P(vmode) ? "r" : StringValuePtr(vmode);
+	rb_file_open_internal(io, RSTRING(fname)->ptr, mode);
+    }
+    return io;
+}
+
+/*
+ *  call-seq:
+ *     IO.open(fd, mode_string="r" )               => io
+ *     IO.open(fd, mode_string="r" ) {|io| block } => obj
+ *  
+ *  With no associated block, <code>open</code> is a synonym for
+ *  <code>IO::new</code>. If the optional code block is given, it will
+ *  be passed <i>io</i> as an argument, and the IO object will
+ *  automatically be closed when the block terminates. In this instance,
+ *  <code>IO::open</code> returns the value of the block.
+ *     
+ */
+
+static VALUE
+rb_io_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE io = rb_class_new_instance(argc, argv, klass);
+
+    if (rb_block_given_p()) {
+	return rb_ensure(rb_yield, io, io_close, io);
+    }
+
+    return io;
+}
+
+/*
+ *  call-seq:
+ *     IO.sysopen(path, [mode, [perm]])  => fixnum
+ *  
+ *  Opens the given path, returning the underlying file descriptor as a
+ *  <code>Fixnum</code>.
+ *     
+ *     IO.sysopen("testfile")   #=> 3
+ *     
+ */
+
+static VALUE
+rb_io_s_sysopen(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE fname, vmode, perm;
+    int flags, fmode, fd;
+    char *path;
+
+    rb_scan_args(argc, argv, "12", &fname, &vmode, &perm);
+    SafeStringValue(fname);
+
+    if (NIL_P(vmode)) flags = O_RDONLY;
+    else if (FIXNUM_P(vmode)) flags = FIX2INT(vmode);
+    else {
+	SafeStringValue(vmode);
+	flags = rb_io_mode_modenum(RSTRING(vmode)->ptr);
+    }
+    if (NIL_P(perm)) fmode = 0666;
+    else             fmode = NUM2INT(perm);
+
+    path = ALLOCA_N(char, strlen(RSTRING(fname)->ptr)+1);
+    strcpy(path, RSTRING(fname)->ptr);
+    fd = rb_sysopen(path, flags, fmode);
+    return INT2NUM(fd);
+}
+
+/*
+ *  call-seq:
+ *     open(path [, mode [, perm]] )                => io or nil
+ *     open(path [, mode [, perm]] ) {|io| block }  => obj
+ *  
+ *  Creates an <code>IO</code> object connected to the given stream,
+ *  file, or subprocess.
+ *     
+ *  If <i>path</i> does not start with a pipe character
+ *  (``<code>|</code>''), treat it as the name of a file to open using
+ *  the specified mode (defaulting to ``<code>r</code>''). (See the table
+ *  of valid modes on page 331.) If a file is being created, its initial
+ *  permissions may be set using the integer third parameter.
+ *     
+ *  If a block is specified, it will be invoked with the
+ *  <code>File</code> object as a parameter, and the file will be
+ *  automatically closed when the block terminates. The call
+ *  returns the value of the block.
+ *     
+ *  If <i>path</i> starts with a pipe character, a subprocess is
+ *  created, connected to the caller by a pair of pipes. The returned
+ *  <code>IO</code> object may be used to write to the standard input
+ *  and read from the standard output of this subprocess. If the command
+ *  following the ``<code>|</code>'' is a single minus sign, Ruby forks,
+ *  and this subprocess is connected to the parent. In the subprocess,
+ *  the <code>open</code> call returns <code>nil</code>. If the command
+ *  is not ``<code>-</code>'', the subprocess runs the command. If a
+ *  block is associated with an <code>open("|-")</code> call, that block
+ *  will be run twice---once in the parent and once in the child. The
+ *  block parameter will be an <code>IO</code> object in the parent and
+ *  <code>nil</code> in the child. The parent's <code>IO</code> object
+ *  will be connected to the child's <code>$stdin</code> and
+ *  <code>$stdout</code>. The subprocess will be terminated at the end
+ *  of the block.
+ *     
+ *     open("testfile") do |f|
+ *       print f.gets
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     This is line one
+ *     
+ *  Open a subprocess and read its output:
+ *     
+ *     cmd = open("|date")
+ *     print cmd.gets
+ *     cmd.close
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Wed Apr  9 08:56:31 CDT 2003
+ *     
+ *  Open a subprocess running the same Ruby program:
+ *     
+ *     f = open("|-", "w+")
+ *     if f == nil
+ *       puts "in Child"
+ *       exit
+ *     else
+ *       puts "Got: #{f.gets}"
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Got: in Child
+ *     
+ *  Open a subprocess using a block to receive the I/O object:
+ *     
+ *     open("|-") do |f|
+ *       if f == nil
+ *         puts "in Child"
+ *       else
+ *         puts "Got: #{f.gets}"
+ *       end
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Got: in Child
+ */
+
+static VALUE
+rb_f_open(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    if (argc >= 1) {
+	char *str = StringValuePtr(argv[0]);
+
+	if (str[0] == '|') {
+	    VALUE tmp = rb_str_new(str+1, RSTRING(argv[0])->len-1);
+	    OBJ_INFECT(tmp, argv[0]);
+	    argv[0] = tmp;
+	    return rb_io_s_popen(argc, argv, rb_cIO);
+	}
+    }
+    return rb_io_s_open(argc, argv, rb_cFile);
+}
+
+static VALUE
+rb_io_open(fname, mode)
+    char *fname, *mode;
+{
+    if (fname[0] == '|') {
+	return pipe_open(0, fname+1, mode);
+    }
+    else {
+	return rb_file_open(fname, mode);
+    }
+}
+
+static VALUE
+rb_io_get_io(io)
+    VALUE io;
+{
+    return rb_convert_type(io, T_FILE, "IO", "to_io");
+}
+
+static VALUE
+rb_io_check_io(io)
+    VALUE io;
+{
+    return rb_check_convert_type(io, T_FILE, "IO", "to_io");
+}
+
+static char*
+rb_io_mode_string(fptr)
+    OpenFile *fptr;
+{
+    switch (fptr->mode & FMODE_READWRITE) {
+      case FMODE_READABLE:
+      default:
+	return "r";
+      case FMODE_WRITABLE:
+	return "w";
+      case FMODE_READWRITE:
+	return "r+";
+    }
+}
+
+static VALUE
+io_reopen(io, nfile)
+    VALUE io, nfile;
+{
+    OpenFile *fptr, *orig;
+    char *mode;
+    int fd, fd2;
+    off_t pos = 0;
+
+    nfile = rb_io_get_io(nfile);
+    if (rb_safe_level() >= 4 && (!OBJ_TAINTED(io) || !OBJ_TAINTED(nfile))) {
+	rb_raise(rb_eSecurityError, "Insecure: can't reopen");
+    }
+    GetOpenFile(io, fptr);
+    GetOpenFile(nfile, orig);
+
+    if (fptr == orig) return io;
+    if (orig->mode & FMODE_READABLE) {
+	pos = io_tell(orig);
+    }
+    if (orig->f2) {
+	io_fflush(orig->f2, orig);
+    }
+    else if (orig->mode & FMODE_WRITABLE) {
+	io_fflush(orig->f, orig);
+    }
+    if (fptr->mode & FMODE_WRITABLE) {
+	io_fflush(GetWriteFile(fptr), fptr);
+    }
+
+    /* copy OpenFile structure */
+    fptr->mode = orig->mode;
+    fptr->pid = orig->pid;
+    fptr->lineno = orig->lineno;
+    if (fptr->path) free(fptr->path);
+    if (orig->path) fptr->path = strdup(orig->path);
+    else fptr->path = 0;
+    fptr->finalize = orig->finalize;
+
+    mode = rb_io_mode_string(fptr);
+    fd = fileno(fptr->f);
+    fd2 = fileno(orig->f);
+    if (fd != fd2) {
+	if (fptr->f == stdin || fptr->f == stdout || fptr->f == stderr) {
+	    clearerr(fptr->f);
+	    /* need to keep stdio objects */
+	    if (dup2(fd2, fd) < 0)
+		rb_sys_fail(orig->path);
+	}
+	else {
+	    FILE *f2 = fptr->f2;
+	    int m = fptr->mode;
+	    fclose(fptr->f);
+	    fptr->f = f2;
+	    fptr->f2 = NULL;
+	    fptr->mode &= (m & FMODE_READABLE) ? ~FMODE_READABLE : ~FMODE_WRITABLE;
+	    if (dup2(fd2, fd) < 0)
+		rb_sys_fail(orig->path);
+	    if (f2) {
+		fptr->f = rb_fdopen(fd, "r");
+		fptr->f2 = f2;
+	    }
+	    else {
+		fptr->f = rb_fdopen(fd, mode);
+	    }
+	    fptr->mode = m;
+	}
+	rb_thread_fd_close(fd);
+	if ((orig->mode & FMODE_READABLE) && pos >= 0) {
+	    io_seek(fptr, pos, SEEK_SET);
+	    io_seek(orig, pos, SEEK_SET);
+	}
+    }
+
+    if (fptr->f2 && fd != fileno(fptr->f2)) {
+	fd = fileno(fptr->f2);
+	if (!orig->f2) {
+	    fclose(fptr->f2);
+	    rb_thread_fd_close(fd);
+	    fptr->f2 = 0;
+	}
+	else if (fd != (fd2 = fileno(orig->f2))) {
+	    fclose(fptr->f2);
+	    rb_thread_fd_close(fd);
+	    if (dup2(fd2, fd) < 0)
+		rb_sys_fail(orig->path);
+	    fptr->f2 = rb_fdopen(fd, "w");
+	}
+    }
+
+    if (fptr->mode & FMODE_BINMODE) {
+	rb_io_binmode(io);
+    }
+
+    RBASIC(io)->klass = RBASIC(nfile)->klass;
+    return io;
+}
+
+/*
+ *  call-seq:
+ *     ios.reopen(other_IO)         => ios 
+ *     ios.reopen(path, mode_str)   => ios
+ *  
+ *  Reassociates <em>ios</em> with the I/O stream given in
+ *  <i>other_IO</i> or to a new stream opened on <i>path</i>. This may
+ *  dynamically change the actual class of this stream.
+ *     
+ *     f1 = File.new("testfile")
+ *     f2 = File.new("testfile")
+ *     f2.readlines[0]   #=> "This is line one\n"
+ *     f2.reopen(f1)     #=> #<File:testfile>
+ *     f2.readlines[0]   #=> "This is line one\n"
+ */
+
+static VALUE
+rb_io_reopen(argc, argv, file)
+    int argc;
+    VALUE *argv;
+    VALUE file;
+{
+    VALUE fname, nmode;
+    char *mode;
+    OpenFile *fptr;
+
+    rb_secure(4);
+    if (rb_scan_args(argc, argv, "11", &fname, &nmode) == 1) {
+	VALUE tmp = rb_io_check_io(fname);
+	if (!NIL_P(tmp)) {
+	    return io_reopen(file, tmp);
+	}
+    }
+
+    SafeStringValue(fname);
+    rb_io_taint_check(file);
+    fptr = RFILE(file)->fptr;
+    if (!fptr) {
+	fptr = RFILE(file)->fptr = ALLOC(OpenFile);
+	MEMZERO(fptr, OpenFile, 1);
+    }
+
+    if (!NIL_P(nmode)) {
+	fptr->mode = rb_io_mode_flags(StringValuePtr(nmode));
+    }
+
+    if (fptr->path) {
+	free(fptr->path);
+	fptr->path = 0;
+    }
+
+    fptr->path = strdup(RSTRING(fname)->ptr);
+    mode = rb_io_flags_mode(fptr->mode);
+    if (!fptr->f) {
+	fptr->f = rb_fopen(fptr->path, mode);
+	if (fptr->f2) {
+	    fclose(fptr->f2);
+	    fptr->f2 = 0;
+	}
+	return file;
+    }
+
+    if (freopen(RSTRING(fname)->ptr, mode, fptr->f) == 0) {
+	rb_sys_fail(fptr->path);
+    }
+#ifdef USE_SETVBUF
+    if (setvbuf(fptr->f, NULL, _IOFBF, 0) != 0)
+	rb_warn("setvbuf() can't be honoured for %s", RSTRING(fname)->ptr);
+#endif
+
+    if (fptr->f2) {
+	if (freopen(RSTRING(fname)->ptr, "w", fptr->f2) == 0) {
+	    rb_sys_fail(fptr->path);
+	}
+    }
+
+    return file;
+}
+
+/* :nodoc: */
+static VALUE
+rb_io_init_copy(dest, io)
+    VALUE dest, io;
+{
+    OpenFile *fptr, *orig;
+    int fd;
+    char *mode;
+
+    io = rb_io_get_io(io);
+    if (dest == io) return dest;
+    GetOpenFile(io, orig);
+    MakeOpenFile(dest, fptr);
+
+    if (orig->f2) {
+	io_fflush(orig->f2, orig);
+	fseeko(orig->f, 0L, SEEK_CUR);
+    }
+    else if (orig->mode & FMODE_WRITABLE) {
+	io_fflush(orig->f, orig);
+    }
+    else {
+	fseeko(orig->f, 0L, SEEK_CUR);
+    }
+
+    /* copy OpenFile structure */
+    fptr->mode = orig->mode;
+    fptr->pid = orig->pid;
+    fptr->lineno = orig->lineno;
+    if (orig->path) fptr->path = strdup(orig->path);
+    fptr->finalize = orig->finalize;
+
+    switch (fptr->mode & FMODE_READWRITE) {
+      case FMODE_READABLE:
+      default:
+	mode = "r"; break;
+      case FMODE_WRITABLE:
+	mode = "w"; break;
+      case FMODE_READWRITE:
+	if (orig->f2) mode = "r";
+	else          mode = "r+";
+	break;
+    }
+    fd = ruby_dup(fileno(orig->f));
+    fptr->f = rb_fdopen(fd, mode);
+    fseeko(fptr->f, ftello(orig->f), SEEK_SET);
+    if (orig->f2) {
+	if (fileno(orig->f) != fileno(orig->f2)) {
+	    fd = ruby_dup(fileno(orig->f2));
+	}
+	fptr->f2 = rb_fdopen(fd, "w");
+	fseeko(fptr->f2, ftello(orig->f2), SEEK_SET);
+    }
+    if (fptr->mode & FMODE_BINMODE) {
+	rb_io_binmode(dest);
+    }
+
+    return dest;
+}
+
+/*
+ *  call-seq:
+ *     ios.printf(format_string [, obj, ...] )   => nil
+ *  
+ *  Formats and writes to <em>ios</em>, converting parameters under
+ *  control of the format string. See <code>Kernel#sprintf</code>
+ *  for details.
+ */
+
+VALUE
+rb_io_printf(argc, argv, out)
+    int argc;
+    VALUE argv[];
+    VALUE out;
+{
+    rb_io_write(out, rb_f_sprintf(argc, argv));
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     printf(io, string [, obj ... ] )    => nil
+ *     printf(string [, obj ... ] )        => nil
+ *  
+ *  Equivalent to:
+ *     io.write(sprintf(string, obj, ...)
+ *  or
+ *     $stdout.write(sprintf(string, obj, ...)
+ */
+
+static VALUE
+rb_f_printf(argc, argv)
+    int argc;
+    VALUE argv[];
+{
+    VALUE out;
+
+    if (argc == 0) return Qnil;
+    if (TYPE(argv[0]) == T_STRING) {
+	out = rb_stdout;
+    }
+    else {
+	out = argv[0];
+	argv++;
+	argc--;
+    }
+    rb_io_write(out, rb_f_sprintf(argc, argv));
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     ios.print()             => nil
+ *     ios.print(obj, ...)     => nil
+ *  
+ *  Writes the given object(s) to <em>ios</em>. The stream must be
+ *  opened for writing. If the output record separator (<code>$\\</code>)
+ *  is not <code>nil</code>, it will be appended to the output. If no
+ *  arguments are given, prints <code>$_</code>. Objects that aren't
+ *  strings will be converted by calling their <code>to_s</code> method.
+ *  With no argument, prints the contents of the variable <code>$_</code>.
+ *  Returns <code>nil</code>.
+ *     
+ *     $stdout.print("This is ", 100, " percent.\n")
+ *     
+ *  <em>produces:</em>
+ *     
+ *     This is 100 percent.
+ */
+
+VALUE
+rb_io_print(argc, argv, out)
+    int argc;
+    VALUE *argv;
+    VALUE out;
+{
+    int i;
+    VALUE line;
+
+    /* if no argument given, print `$_' */
+    if (argc == 0) {
+	argc = 1;
+	line = rb_lastline_get();
+	argv = &line;
+    }
+    for (i=0; i<argc; i++) {
+	if (!NIL_P(rb_output_fs) && i>0) {
+	    rb_io_write(out, rb_output_fs);
+	}
+	switch (TYPE(argv[i])) {
+	  case T_NIL:
+	    rb_io_write(out, rb_str_new2("nil"));
+	    break;
+	  default:
+	    rb_io_write(out, argv[i]);
+	    break;
+	}
+    }
+    if (!NIL_P(rb_output_rs)) {
+	rb_io_write(out, rb_output_rs);
+    }
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     print(obj, ...)    => nil
+ *  
+ *  Prints each object in turn to <code>$stdout</code>. If the output
+ *  field separator (<code>$,</code>) is not +nil+, its
+ *  contents will appear between each field. If the output record
+ *  separator (<code>$\\</code>) is not +nil+, it will be
+ *  appended to the output. If no arguments are given, prints
+ *  <code>$_</code>. Objects that aren't strings will be converted by
+ *  calling their <code>to_s</code> method.
+ *     
+ *     print "cat", [1,2,3], 99, "\n"
+ *     $, = ", "
+ *     $\ = "\n"
+ *     print "cat", [1,2,3], 99
+ *     
+ *  <em>produces:</em>
+ *     
+ *     cat12399
+ *     cat, 1, 2, 3, 99
+ */
+
+static VALUE
+rb_f_print(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    rb_io_print(argc, argv, rb_stdout);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     ios.putc(obj)    => obj
+ *  
+ *  If <i>obj</i> is <code>Numeric</code>, write the character whose
+ *  code is <i>obj</i>, otherwise write the first character of the
+ *  string representation of  <i>obj</i> to <em>ios</em>.
+ *     
+ *     $stdout.putc "A"
+ *     $stdout.putc 65
+ *     
+ *  <em>produces:</em>
+ *     
+ *     AA
+ */
+
+static VALUE
+rb_io_putc(io, ch)
+    VALUE io, ch;
+{
+    char c = NUM2CHR(ch);
+
+    rb_io_write(io, rb_str_new(&c, 1));
+    return ch;
+}
+
+/*
+ *  call-seq:
+ *     putc(int)   => int
+ *  
+ *  Equivalent to:
+ *
+ *    $stdout.putc(int)
+ */
+
+static VALUE
+rb_f_putc(recv, ch)
+    VALUE recv, ch;
+{
+    return rb_io_putc(rb_stdout, ch);
+}
+
+static VALUE
+io_puts_ary(ary, out)
+    VALUE ary, out;
+{
+    VALUE tmp;
+    long i;
+
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	tmp = RARRAY(ary)->ptr[i];
+	if (rb_inspecting_p(tmp)) {
+	    tmp = rb_str_new2("[...]");
+	}
+	rb_io_puts(1, &tmp, out);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     ios.puts(obj, ...)    => nil
+ *  
+ *  Writes the given objects to <em>ios</em> as with
+ *  <code>IO#print</code>. Writes a record separator (typically a
+ *  newline) after any that do not already end with a newline sequence.
+ *  If called with an array argument, writes each element on a new line.
+ *  If called without arguments, outputs a single record separator.
+ *     
+ *     $stdout.puts("this", "is", "a", "test")
+ *     
+ *  <em>produces:</em>
+ *     
+ *     this
+ *     is
+ *     a
+ *     test
+ */
+
+VALUE
+rb_io_puts(argc, argv, out)
+    int argc;
+    VALUE *argv;
+    VALUE out;
+{
+    int i;
+    VALUE line;
+
+    /* if no argument given, print newline. */
+    if (argc == 0) {
+	rb_io_write(out, rb_default_rs);
+	return Qnil;
+    }
+    for (i=0; i<argc; i++) {
+	if (NIL_P(argv[i])) {
+	    line = rb_str_new2("nil");
+	}
+	else {
+	    line = rb_check_array_type(argv[i]);
+	    if (!NIL_P(line)) {
+		rb_protect_inspect(io_puts_ary, line, out);
+		continue;
+	    }
+	    line = rb_obj_as_string(argv[i]);
+	}
+	rb_io_write(out, line);
+	if (RSTRING(line)->len == 0 ||
+            RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {
+	    rb_io_write(out, rb_default_rs);
+	}
+    }
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     puts(obj, ...)    => nil
+ *  
+ *  Equivalent to 
+ *
+ *      $stdout.puts(obj, ...)
+ */
+
+static VALUE
+rb_f_puts(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    rb_io_puts(argc, argv, rb_stdout);
+    return Qnil;
+}
+
+void
+rb_p(obj)			/* for debug print within C code */
+    VALUE obj;
+{
+    rb_io_write(rb_stdout, rb_obj_as_string(rb_inspect(obj)));
+    rb_io_write(rb_stdout, rb_default_rs);
+}
+
+/*
+ *  call-seq:
+ *     p(obj, ...)    => nil
+ *  
+ *  For each object, directly writes
+ *  _obj_.+inspect+ followed by the current output
+ *  record separator to the program's standard output.
+ *     
+ *     S = Struct.new(:name, :state)
+ *     s = S['dave', 'TX']
+ *     p s
+ *     
+ *  <em>produces:</em>
+ *     
+ *     #<S name="dave", state="TX">
+ */
+
+static VALUE
+rb_f_p(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    int i;
+
+    for (i=0; i<argc; i++) {
+	rb_p(argv[i]);
+    }
+    if (TYPE(rb_stdout) == T_FILE) {
+	rb_io_flush(rb_stdout);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     obj.display(port=$>)    => nil
+ *  
+ *  Prints <i>obj</i> on the given port (default <code>$></code>).
+ *  Equivalent to:
+ *     
+ *     def display(port=$>)
+ *       port.write self
+ *     end
+ *     
+ *  For example:
+ *     
+ *     1.display
+ *     "cat".display
+ *     [ 4, 5, 6 ].display
+ *     puts
+ *     
+ *  <em>produces:</em>
+ *     
+ *     1cat456
+ */
+
+static VALUE
+rb_obj_display(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE out;
+
+    if (rb_scan_args(argc, argv, "01", &out) == 0) {
+	out = rb_stdout;
+    }
+
+    rb_io_write(out, self);
+
+    return Qnil;
+}
+
+void
+rb_write_error2(mesg, len)
+    const char *mesg;
+    long len;
+{
+    rb_io_write(rb_stderr, rb_str_new(mesg, len));
+}
+
+void
+rb_write_error(mesg)
+    const char *mesg;
+{
+    rb_write_error2(mesg, strlen(mesg));
+}
+
+static void
+must_respond_to(mid, val, id)
+    ID mid;
+    VALUE val;
+    ID id;
+{
+    if (!rb_respond_to(val, mid)) {
+	rb_raise(rb_eTypeError, "%s must have %s method, %s given",
+		 rb_id2name(id), rb_id2name(mid),
+		 rb_obj_classname(val));
+    }
+}
+
+static void
+stdout_setter(val, id, variable)
+    VALUE val;
+    ID id;
+    VALUE *variable;
+{
+    must_respond_to(id_write, val, id);
+    *variable = val;
+}
+
+static void
+defout_setter(val, id, variable)
+    VALUE val;
+    ID id;
+    VALUE *variable;
+{
+    stdout_setter(val, id, variable);
+    rb_warn("$defout is obsolete; use $stdout instead");
+}
+
+static void
+deferr_setter(val, id, variable)
+    VALUE val;
+    ID id;
+    VALUE *variable;
+{
+    stdout_setter(val, id, variable);
+    rb_warn("$deferr is obsolete; use $stderr instead");
+}
+
+static VALUE
+prep_stdio(f, mode, klass)
+    FILE *f;
+    int mode;
+    VALUE klass;
+{
+    OpenFile *fp;
+    VALUE io = io_alloc(klass);
+
+    MakeOpenFile(io, fp);
+#ifdef __CYGWIN__
+    if (!isatty(fileno(f))) {
+	mode |= O_BINARY;
+	setmode(fileno(f), O_BINARY);
+    }
+#endif
+    fp->f = f;
+    fp->mode = mode;
+
+    return io;
+}
+
+static void
+prep_path(io, path)
+    VALUE io;
+    char *path;
+{
+    OpenFile *fptr;
+
+    GetOpenFile(io, fptr);
+    if (fptr->path) rb_bug("illegal prep_path() call");
+    fptr->path = strdup(path);
+}
+
+/*
+ *  call-seq:
+ *     IO.new(fd, mode)   => io
+ *  
+ *  Returns a new <code>IO</code> object (a stream) for the given
+ *  integer file descriptor and mode string. See also
+ *  <code>IO#fileno</code> and <code>IO::for_fd</code>.
+ *     
+ *     a = IO.new(2,"w")      # '2' is standard error
+ *     $stderr.puts "Hello"
+ *     a.puts "World"
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Hello
+ *     World
+ */
+
+static VALUE
+rb_io_initialize(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    VALUE fnum, mode;
+    OpenFile *fp;
+    int fd, flags;
+
+    rb_secure(4);
+    rb_scan_args(argc, argv, "11", &fnum, &mode);
+    fd = NUM2INT(fnum);
+    if (argc == 2) {
+	if (FIXNUM_P(mode)) {
+	    flags = FIX2LONG(mode);
+	}
+	else {
+	    SafeStringValue(mode);
+	    flags = rb_io_mode_modenum(RSTRING(mode)->ptr);
+	}
+    }
+    else {
+#if defined(HAVE_FCNTL) && defined(F_GETFL)
+	flags = fcntl(fd, F_GETFL);
+	if (flags == -1) rb_sys_fail(0);
+#else
+	flags = O_RDONLY;
+#endif
+    }
+    MakeOpenFile(io, fp);
+    fp->mode = rb_io_modenum_flags(flags);
+    fp->f = rb_fdopen(fd, rb_io_modenum_mode(flags));
+
+    return io;
+}
+
+/*
+ *  call-seq:
+ *     File.new(filename, mode="r")            => file
+ *     File.new(filename [, mode [, perm]])    => file
+ *  
+
+ *  Opens the file named by _filename_ according to
+ *  _mode_ (default is ``r'') and returns a new
+ *  <code>File</code> object. See the description of class +IO+ for
+ *  a description of _mode_. The file mode may optionally be
+ *  specified as a +Fixnum+ by _or_-ing together the
+ *  flags (O_RDONLY etc, again described under +IO+). Optional
+ *  permission bits may be given in _perm_. These mode and permission
+ *  bits are platform dependent; on Unix systems, see
+ *  <code>open(2)</code> for details.
+ *
+ *     f = File.new("testfile", "r")
+ *     f = File.new("newfile",  "w+")
+ *     f = File.new("newfile", File::CREAT|File::TRUNC|File::RDWR, 0644)
+ */
+
+static VALUE
+rb_file_initialize(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    if (RFILE(io)->fptr) {
+	rb_raise(rb_eRuntimeError, "reinitializing File");
+    }
+    if (0 < argc && argc < 3) {
+	VALUE fd = rb_check_convert_type(argv[0], T_FIXNUM, "Fixnum", "to_int");
+
+	if (!NIL_P(fd)) {
+	    argv[0] = fd;
+	    return rb_io_initialize(argc, argv, io);
+	}
+    }
+    rb_open_file(argc, argv, io);
+
+    return io;
+}
+
+/*
+ *  call-seq:
+ *     IO.new(fd, mode_string)   => io
+ *  
+ *  Returns a new <code>IO</code> object (a stream) for the given
+ *  integer file descriptor and mode string. See also
+ *  <code>IO#fileno</code> and <code>IO::for_fd</code>.
+ *     
+ *     a = IO.new(2,"w")      # '2' is standard error
+ *     $stderr.puts "Hello"
+ *     a.puts "World"
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Hello
+ *     World
+ */
+
+static VALUE
+rb_io_s_new(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    if (rb_block_given_p()) {
+	char *cname = rb_class2name(klass);
+
+	rb_warn("%s::new() does not take block; use %s::open() instead",
+		cname, cname);
+    }
+    return rb_class_new_instance(argc, argv, klass);
+}
+
+/*
+ *  call-seq:
+ *     IO.for_fd(fd, mode)    => io
+ *  
+ *  Synonym for <code>IO::new</code>.
+ *     
+ */
+
+static VALUE
+rb_io_s_for_fd(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE io = rb_obj_alloc(klass);
+    rb_io_initialize(argc, argv, io);
+    return io;
+}
+
+static int binmode = 0;
+
+static VALUE
+argf_forward(int argc, VALUE *argv)
+{
+    return rb_funcall3(current_file, ruby_frame->last_func, argc, argv);
+}
+
+#define ARGF_FORWARD(argc, argv) do {\
+  if (TYPE(current_file) != T_FILE)\
+     return argf_forward(argc, argv);\
+} while (0)
+#define NEXT_ARGF_FORWARD(argc, argv) do {\
+     if (!next_argv()) return Qnil;\
+     ARGF_FORWARD(argc, argv);\
+} while (0)
+
+static void
+argf_close(file)
+    VALUE file;
+{
+    if (TYPE(file) == T_FILE)
+	rb_io_close(file);
+    else
+	rb_funcall3(file, rb_intern("close"), 0, 0);
+}
+
+static int
+next_argv()
+{
+    extern VALUE rb_argv;
+    char *fn;
+    OpenFile *fptr;
+    int stdout_binmode = 0;
+
+    if (TYPE(rb_stdout) == T_FILE) {
+        GetOpenFile(rb_stdout, fptr);
+        if (fptr->mode & FMODE_BINMODE)
+            stdout_binmode = 1;
+    }
+
+    if (init_p == 0) {
+	if (RARRAY(rb_argv)->len > 0) {
+	    next_p = 1;
+	}
+	else {
+	    next_p = -1;
+	}
+	init_p = 1;
+	gets_lineno = 0;
+    }
+
+    if (next_p == 1) {
+	next_p = 0;
+      retry:
+	if (RARRAY(rb_argv)->len > 0) {
+	    filename = rb_ary_shift(rb_argv);
+	    fn = StringValuePtr(filename);
+	    if (strlen(fn) == 1 && fn[0] == '-') {
+		current_file = rb_stdin;
+		if (ruby_inplace_mode) {
+		    rb_warn("Can't do inplace edit for stdio; skipping");
+		    goto retry;
+		}
+	    }
+	    else {
+		FILE *fr = rb_fopen(fn, "r");
+
+		if (ruby_inplace_mode) {
+		    struct stat st, st2;
+		    VALUE str;
+		    FILE *fw;
+
+		    if (TYPE(rb_stdout) == T_FILE && rb_stdout != orig_stdout) {
+			rb_io_close(rb_stdout);
+		    }
+		    fstat(fileno(fr), &st);
+		    if (*ruby_inplace_mode) {
+			str = rb_str_new2(fn);
+#ifdef NO_LONG_FNAME
+                        ruby_add_suffix(str, ruby_inplace_mode);
+#else
+			rb_str_cat2(str, ruby_inplace_mode);
+#endif
+#ifdef NO_SAFE_RENAME
+			(void)fclose(fr);
+			(void)unlink(RSTRING(str)->ptr);
+			(void)rename(fn, RSTRING(str)->ptr);
+			fr = rb_fopen(RSTRING(str)->ptr, "r");
+#else
+			if (rename(fn, RSTRING(str)->ptr) < 0) {
+			    rb_warn("Can't rename %s to %s: %s, skipping file",
+				    fn, RSTRING(str)->ptr, strerror(errno));
+			    fclose(fr);
+			    goto retry;
+			}
+#endif
+		    }
+		    else {
+#ifdef NO_SAFE_RENAME
+			rb_fatal("Can't do inplace edit without backup");
+#else
+			if (unlink(fn) < 0) {
+			    rb_warn("Can't remove %s: %s, skipping file",
+				    fn, strerror(errno));
+			    fclose(fr);
+			    goto retry;
+			}
+#endif
+		    }
+		    fw = rb_fopen(fn, "w");
+#ifndef NO_SAFE_RENAME
+		    fstat(fileno(fw), &st2);
+#ifdef HAVE_FCHMOD
+		    fchmod(fileno(fw), st.st_mode);
+#else
+		    chmod(fn, st.st_mode);
+#endif
+		    if (st.st_uid!=st2.st_uid || st.st_gid!=st2.st_gid) {
+			fchown(fileno(fw), st.st_uid, st.st_gid);
+		    }
+#endif
+		    rb_stdout = prep_stdio(fw, FMODE_WRITABLE, rb_cFile);
+		    prep_path(rb_stdout, fn);
+		    if (stdout_binmode) rb_io_binmode(rb_stdout);
+		}
+		current_file = prep_stdio(fr, FMODE_READABLE, rb_cFile);
+		prep_path(current_file, fn);
+	    }
+	    if (binmode) rb_io_binmode(current_file);
+	}
+	else {
+	    next_p = 1;
+	    return Qfalse;
+	}
+    }
+    else if (next_p == -1) {
+	current_file = rb_stdin;
+	filename = rb_str_new2("-");
+	if (ruby_inplace_mode) {
+	    rb_warn("Can't do inplace edit for stdio");
+	    rb_stdout = orig_stdout;
+	}
+    }
+    return Qtrue;
+}
+
+static VALUE
+argf_getline(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE line;
+
+  retry:
+    if (!next_argv()) return Qnil;
+    if (argc == 0 && rb_rs == rb_default_rs) {
+	line = rb_io_gets(current_file);
+    }
+    else {
+	VALUE rs;
+
+	if (argc == 0) {
+	    rs = rb_rs;
+	}
+	else {
+	    rb_scan_args(argc, argv, "1", &rs);
+	    if (!NIL_P(rs)) StringValue(rs);
+	}
+	line = rb_io_getline(rs, current_file);
+    }
+    if (NIL_P(line) && next_p != -1) {
+	argf_close(current_file);
+	next_p = 1;
+	goto retry;
+    }
+    if (!NIL_P(line)) {
+	gets_lineno++;
+	lineno = INT2FIX(gets_lineno);
+    }
+    return line;
+}
+
+/*
+ *  call-seq:
+ *     gets(separator=$/)    => string or nil
+ *  
+ *  Returns (and assigns to <code>$_</code>) the next line from the list
+ *  of files in +ARGV+ (or <code>$*</code>), or from standard
+ *  input if no files are present on the command line. Returns
+ *  +nil+ at end of file. The optional argument specifies the
+ *  record separator. The separator is included with the contents of
+ *  each record. A separator of +nil+ reads the entire
+ *  contents, and a zero-length separator reads the input one paragraph
+ *  at a time, where paragraphs are divided by two consecutive newlines.
+ *  If multiple filenames are present in +ARGV+,
+ *  +gets(nil)+ will read the contents one file at a time.
+ *     
+ *     ARGV << "testfile"
+ *     print while gets
+ *     
+ *  <em>produces:</em>
+ *     
+ *     This is line one
+ *     This is line two
+ *     This is line three
+ *     And so on...
+ *     
+ *  The style of programming using <code>$_</code> as an implicit
+ *  parameter is gradually losing favor in the Ruby community.
+ */
+
+static VALUE
+rb_f_gets(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE line;
+
+    if (!next_argv()) return Qnil;
+    if (TYPE(current_file) != T_FILE) {
+	line = rb_funcall3(current_file, rb_intern("gets"), argc, argv);
+    }
+    else {
+	line = argf_getline(argc, argv);
+    }
+    rb_lastline_set(line);
+    return line;
+}
+
+VALUE
+rb_gets()
+{
+    VALUE line;
+
+    if (rb_rs != rb_default_rs) {
+	return rb_f_gets(0, 0);
+    }
+
+  retry:
+    if (!next_argv()) return Qnil;
+    line = rb_io_gets(current_file);
+    if (NIL_P(line) && next_p != -1) {
+	argf_close(current_file);
+	next_p = 1;
+	goto retry;
+    }
+    rb_lastline_set(line);
+    if (!NIL_P(line)) {
+	gets_lineno++;
+	lineno = INT2FIX(gets_lineno);
+    }
+
+    return line;
+}
+
+/*
+ *  call-seq:
+ *     readline(separator=$/)   => string
+ *  
+ *  Equivalent to <code>Kernel::gets</code>, except
+ *  +readline+ raises +EOFError+ at end of file.
+ */
+
+static VALUE
+rb_f_readline(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE line;
+
+    if (!next_argv()) rb_eof_error();
+    ARGF_FORWARD(argc, argv);
+    line = rb_f_gets(argc, argv);
+    if (NIL_P(line)) {
+	rb_eof_error();
+    }
+
+    return line;
+}
+
+/*
+ * obsolete
+ */
+
+static VALUE
+rb_f_getc()
+{
+    rb_warn("getc is obsolete; use STDIN.getc instead");
+    if (TYPE(rb_stdin) != T_FILE) {
+	return rb_funcall3(rb_stdin, rb_intern("getc"), 0, 0);
+    }
+    return rb_io_getc(rb_stdin);
+}
+
+/*
+ *  call-seq:
+ *     readlines(separator=$/)    => array
+ *  
+ *  Returns an array containing the lines returned by calling
+ *  <code>Kernel.gets(<i>separator</i>)</code> until the end of file.
+ */
+
+static VALUE
+rb_f_readlines(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE line, ary;
+
+    NEXT_ARGF_FORWARD(argc, argv);
+    ary = rb_ary_new();
+    while (!NIL_P(line = argf_getline(argc, argv))) {
+	rb_ary_push(ary, line);
+    }
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     `cmd`    => string
+ *  
+ *  Returns the standard output of running _cmd_ in a subshell.
+ *  The built-in syntax <code>%x{...}</code> uses
+ *  this method. Sets <code>$?</code> to the process status.
+ *     
+ *     `date`                   #=> "Wed Apr  9 08:56:30 CDT 2003\n"
+ *     `ls testdir`.split[1]    #=> "main.rb"
+ *     `echo oops && exit 99`   #=> "oops\n"
+ *     $?.exitstatus            #=> 99
+ */
+
+static VALUE
+rb_f_backquote(obj, str)
+    VALUE obj, str;
+{
+    volatile VALUE port;
+    VALUE result;
+    OpenFile *fptr;
+
+    SafeStringValue(str);
+    port = pipe_open(str, 0, "r");
+    if (NIL_P(port)) return rb_str_new(0,0);
+
+    GetOpenFile(port, fptr);
+    result = read_all(fptr, remain_size(fptr), Qnil);
+    rb_io_close(port);
+
+    return result;
+}
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+/*
+ *  call-seq:
+ *     IO.select(read_array 
+ *               [, write_array 
+ *               [, error_array 
+ *               [, timeout]]] ) =>  array  or  nil
+ *  
+ *  See <code>Kernel#select</code>.
+ */
+
+static VALUE
+rb_f_select(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE read, write, except, timeout, res, list;
+    fd_set rset, wset, eset, pset;
+    fd_set *rp, *wp, *ep;
+    struct timeval *tp, timerec;
+    OpenFile *fptr;
+    long i;
+    int max = 0, n;
+    int interrupt_flag = 0;
+    int pending = 0;
+
+    rb_scan_args(argc, argv, "13", &read, &write, &except, &timeout);
+    if (NIL_P(timeout)) {
+	tp = 0;
+    }
+    else {
+	timerec = rb_time_interval(timeout);
+	tp = &timerec;
+    }
+
+    FD_ZERO(&pset);
+    if (!NIL_P(read)) {
+	Check_Type(read, T_ARRAY);
+	rp = &rset;
+	FD_ZERO(rp);
+	for (i=0; i<RARRAY(read)->len; i++) {
+	    GetOpenFile(rb_io_get_io(RARRAY(read)->ptr[i]), fptr);
+	    FD_SET(fileno(fptr->f), rp);
+	    if (READ_DATA_PENDING(fptr->f)) { /* check for buffered data */
+		pending++;
+		FD_SET(fileno(fptr->f), &pset);
+	    }
+	    if (max < fileno(fptr->f)) max = fileno(fptr->f);
+	}
+	if (pending) {		/* no blocking if there's buffered data */
+	    timerec.tv_sec = timerec.tv_usec = 0;
+	    tp = &timerec;
+	}
+    }
+    else
+	rp = 0;
+
+    if (!NIL_P(write)) {
+	Check_Type(write, T_ARRAY);
+	wp = &wset;
+	FD_ZERO(wp);
+	for (i=0; i<RARRAY(write)->len; i++) {
+	    GetOpenFile(rb_io_get_io(RARRAY(write)->ptr[i]), fptr);
+	    FD_SET(fileno(fptr->f), wp);
+	    if (max < fileno(fptr->f)) max = fileno(fptr->f);
+	    if (fptr->f2) {
+		FD_SET(fileno(fptr->f2), wp);
+		if (max < fileno(fptr->f2)) max = fileno(fptr->f2);
+	    }
+	}
+    }
+    else
+	wp = 0;
+
+    if (!NIL_P(except)) {
+	Check_Type(except, T_ARRAY);
+	ep = &eset;
+	FD_ZERO(ep);
+	for (i=0; i<RARRAY(except)->len; i++) {
+	    GetOpenFile(rb_io_get_io(RARRAY(except)->ptr[i]), fptr);
+	    FD_SET(fileno(fptr->f), ep);
+	    if (max < fileno(fptr->f)) max = fileno(fptr->f);
+	    if (fptr->f2) {
+		FD_SET(fileno(fptr->f2), ep);
+		if (max < fileno(fptr->f2)) max = fileno(fptr->f2);
+	    }
+	}
+    }
+    else {
+	ep = 0;
+    }
+
+    max++;
+
+    n = rb_thread_select(max, rp, wp, ep, tp);
+    if (n < 0) {
+	rb_sys_fail(0);
+    }
+    if (!pending && n == 0) return Qnil; /* returns nil on timeout */
+
+    res = rb_ary_new2(3);
+    rb_ary_push(res, rp?rb_ary_new():rb_ary_new2(0));
+    rb_ary_push(res, wp?rb_ary_new():rb_ary_new2(0));
+    rb_ary_push(res, ep?rb_ary_new():rb_ary_new2(0));
+
+    if (interrupt_flag == 0) {
+	if (rp) {
+	    list = RARRAY(res)->ptr[0];
+	    for (i=0; i< RARRAY(read)->len; i++) {
+		GetOpenFile(rb_io_get_io(RARRAY(read)->ptr[i]), fptr);
+		if (FD_ISSET(fileno(fptr->f), rp)
+		    || FD_ISSET(fileno(fptr->f), &pset)) {
+		    rb_ary_push(list, rb_ary_entry(read, i));
+		}
+	    }
+	}
+
+	if (wp) {
+	    list = RARRAY(res)->ptr[1];
+	    for (i=0; i< RARRAY(write)->len; i++) {
+		GetOpenFile(rb_io_get_io(RARRAY(write)->ptr[i]), fptr);
+		if (FD_ISSET(fileno(fptr->f), wp)) {
+		    rb_ary_push(list, rb_ary_entry(write, i));
+		}
+		else if (fptr->f2 && FD_ISSET(fileno(fptr->f2), wp)) {
+		    rb_ary_push(list, rb_ary_entry(write, i));
+		}
+	    }
+	}
+
+	if (ep) {
+	    list = RARRAY(res)->ptr[2];
+	    for (i=0; i< RARRAY(except)->len; i++) {
+		GetOpenFile(rb_io_get_io(RARRAY(except)->ptr[i]), fptr);
+		if (FD_ISSET(fileno(fptr->f), ep)) {
+		    rb_ary_push(list, rb_ary_entry(except, i));
+		}
+		else if (fptr->f2 && FD_ISSET(fileno(fptr->f2), ep)) {
+		    rb_ary_push(list, rb_ary_entry(except, i));
+		}
+	    }
+	}
+    }
+
+    return res;			/* returns an empty array on interrupt */
+}
+
+#if !defined(MSDOS) && !defined(__human68k__)
+static int
+io_cntl(fd, cmd, narg, io_p)
+    int fd, cmd, io_p;
+    long narg;
+{
+    int retval;
+
+#ifdef HAVE_FCNTL
+    TRAP_BEG;
+# if defined(__CYGWIN__)
+    retval = io_p?ioctl(fd, cmd, (void*)narg):fcntl(fd, cmd, narg);
+# else
+    retval = io_p?ioctl(fd, cmd, narg):fcntl(fd, cmd, narg);
+# endif
+    TRAP_END;
+#else
+    if (!io_p) {
+	rb_notimplement();
+    }
+    TRAP_BEG;
+    retval = ioctl(fd, cmd, narg);
+    TRAP_END;
+#endif
+    return retval;
+}
+#endif
+
+static VALUE
+rb_io_ctl(io, req, arg, io_p)
+    VALUE io, req, arg;
+    int io_p;
+{
+#if !defined(MSDOS) && !defined(__human68k__)
+    int cmd = NUM2ULONG(req);
+    OpenFile *fptr;
+    long len = 0;
+    long narg = 0;
+    int retval;
+
+    rb_secure(2);
+
+    if (NIL_P(arg) || arg == Qfalse) {
+	narg = 0;
+    }
+    else if (FIXNUM_P(arg)) {
+	narg = FIX2LONG(arg);
+    }
+    else if (arg == Qtrue) {
+	narg = 1;
+    }
+    else {
+	VALUE tmp = rb_check_string_type(arg);
+
+	if (NIL_P(tmp)) {
+	    narg = NUM2LONG(arg);
+	}
+	else {
+	    arg = tmp;
+#ifdef IOCPARM_MASK
+#ifndef IOCPARM_LEN
+#define IOCPARM_LEN(x)  (((x) >> 16) & IOCPARM_MASK)
+#endif
+#endif
+#ifdef IOCPARM_LEN
+	    len = IOCPARM_LEN(cmd);	/* on BSDish systems we're safe */
+#else
+	    len = 256;		/* otherwise guess at what's safe */
+#endif
+	    rb_str_modify(arg);
+
+	    if (len <= RSTRING(arg)->len) {
+		len = RSTRING(arg)->len;
+	    }
+	    if (RSTRING(arg)->len < len) {
+		rb_str_resize(arg, len+1);
+	    }
+	    RSTRING(arg)->ptr[len] = 17;	/* a little sanity check here */
+	    narg = (long)RSTRING(arg)->ptr;
+	}
+    }
+    GetOpenFile(io, fptr);
+    retval = io_cntl(fileno(fptr->f), cmd, narg, io_p);
+    if (retval < 0) rb_sys_fail(fptr->path);
+    if (TYPE(arg) == T_STRING && RSTRING(arg)->ptr[len] != 17) {
+	rb_raise(rb_eArgError, "return value overflowed string");
+    }
+
+    if (fptr->f2 && fileno(fptr->f) != fileno(fptr->f2)) {
+	/* call on f2 too; ignore result */
+	io_cntl(fileno(fptr->f2), cmd, narg, io_p);
+    }
+
+    if (!io_p && cmd == F_SETFL) {
+      if (narg & O_NONBLOCK) {
+        fptr->mode |= FMODE_WSPLIT_INITIALIZED;
+        fptr->mode &= ~FMODE_WSPLIT;
+      }
+      else {
+        fptr->mode &= ~(FMODE_WSPLIT_INITIALIZED|FMODE_WSPLIT);
+      }
+    }
+
+    return INT2NUM(retval);
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
+#endif
+}
+
+/*
+ *  call-seq:
+ *     ios.ioctl(integer_cmd, arg)    => integer
+ *  
+ *  Provides a mechanism for issuing low-level commands to control or
+ *  query I/O devices. Arguments and results are platform dependent. If
+ *  <i>arg</i> is a number, its value is passed directly. If it is a
+ *  string, it is interpreted as a binary sequence of bytes. On Unix
+ *  platforms, see <code>ioctl(2)</code> for details. Not implemented on
+ *  all platforms.
+ */
+
+static VALUE
+rb_io_ioctl(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    VALUE req, arg;
+
+    rb_scan_args(argc, argv, "11", &req, &arg);
+    return rb_io_ctl(io, req, arg, 1);
+}
+
+/*
+ *  call-seq:
+ *     ios.fcntl(integer_cmd, arg)    => integer
+ *  
+ *  Provides a mechanism for issuing low-level commands to control or
+ *  query file-oriented I/O streams. Arguments and results are platform
+ *  dependent. If <i>arg</i> is a number, its value is passed
+ *  directly. If it is a string, it is interpreted as a binary sequence
+ *  of bytes (<code>Array#pack</code> might be a useful way to build this
+ *  string). On Unix platforms, see <code>fcntl(2)</code> for details.
+ *  Not implemented on all platforms.
+ */
+
+static VALUE
+rb_io_fcntl(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+#ifdef HAVE_FCNTL
+    VALUE req, arg;
+
+    rb_scan_args(argc, argv, "11", &req, &arg);
+    return rb_io_ctl(io, req, arg, 0);
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
+#endif
+}
+
+/*
+ *  call-seq:
+ *     syscall(fixnum [, args...])   => integer
+ *  
+ *  Calls the operating system function identified by _fixnum_,
+ *  passing in the arguments, which must be either +String+
+ *  objects, or +Integer+ objects that ultimately fit within
+ *  a native +long+. Up to nine parameters may be passed (14
+ *  on the Atari-ST). The function identified by _fixnum_ is system
+ *  dependent. On some Unix systems, the numbers may be obtained from a
+ *  header file called <code>syscall.h</code>.
+ *     
+ *     syscall 4, 1, "hello\n", 6   # '4' is write(2) on our box
+ *     
+ *  <em>produces:</em>
+ *     
+ *     hello
+ */
+
+static VALUE
+rb_f_syscall(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+#if defined(HAVE_SYSCALL) && !defined(__CHECKER__)
+#ifdef atarist
+    unsigned long arg[14]; /* yes, we really need that many ! */
+#else
+    unsigned long arg[8];
+#endif
+    int retval = -1;
+    int i = 1;
+    int items = argc - 1;
+
+    /* This probably won't work on machines where sizeof(long) != sizeof(int)
+     * or where sizeof(long) != sizeof(char*).  But such machines will
+     * not likely have syscall implemented either, so who cares?
+     */
+
+    rb_secure(2);
+    if (argc == 0)
+	rb_raise(rb_eArgError, "too few arguments for syscall");
+    if (argc > sizeof(arg) / sizeof(arg[0]))
+	rb_raise(rb_eArgError, "too many arguments for syscall");
+    arg[0] = NUM2LONG(argv[0]); argv++;
+    while (items--) {
+	VALUE v = rb_check_string_type(*argv);
+
+	if (!NIL_P(v)) {
+	    StringValue(v);
+	    rb_str_modify(v);
+	    arg[i] = (unsigned long)RSTRING(v)->ptr;
+	}
+	else {
+	    arg[i] = (unsigned long)NUM2LONG(*argv);
+	}
+	argv++;
+	i++;
+    }
+    TRAP_BEG;
+    switch (argc) {
+      case 1:
+	retval = syscall(arg[0]);
+	break;
+      case 2:
+	retval = syscall(arg[0],arg[1]);
+	break;
+      case 3:
+	retval = syscall(arg[0],arg[1],arg[2]);
+	break;
+      case 4:
+	retval = syscall(arg[0],arg[1],arg[2],arg[3]);
+	break;
+      case 5:
+	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4]);
+	break;
+      case 6:
+	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5]);
+	break;
+      case 7:
+	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6]);
+	break;
+      case 8:
+	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7]);
+	break;
+#ifdef atarist
+      case 9:
+	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7], arg[8]);
+	break;
+      case 10:
+	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7], arg[8], arg[9]);
+	break;
+      case 11:
+	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7], arg[8], arg[9], arg[10]);
+	break;
+      case 12:
+	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7], arg[8], arg[9], arg[10], arg[11]);
+	break;
+      case 13:
+	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7], arg[8], arg[9], arg[10], arg[11], arg[12]);
+	break;
+      case 14:
+	retval = syscall(arg[0],arg[1],arg[2],arg[3],arg[4],arg[5],arg[6],
+	  arg[7], arg[8], arg[9], arg[10], arg[11], arg[12], arg[13]);
+	break;
+#endif /* atarist */
+    }
+    TRAP_END;
+    if (retval < 0) rb_sys_fail(0);
+    return INT2NUM(retval);
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
+#endif
+}
+
+static VALUE io_new_instance _((VALUE));
+static VALUE
+io_new_instance(args)
+    VALUE args;
+{
+    return rb_class_new_instance(2, (VALUE*)args+1, *(VALUE*)args);
+}
+
+/*
+ *  call-seq:
+ *     IO.pipe -> array
+ *  
+ *  Creates a pair of pipe endpoints (connected to each other) and
+ *  returns them as a two-element array of <code>IO</code> objects:
+ *  <code>[</code> <i>read_file</i>, <i>write_file</i> <code>]</code>. Not
+ *  available on all platforms.
+ *     
+ *  In the example below, the two processes close the ends of the pipe
+ *  that they are not using. This is not just a cosmetic nicety. The
+ *  read end of a pipe will not generate an end of file condition if
+ *  there are any writers with the pipe still open. In the case of the
+ *  parent process, the <code>rd.read</code> will never return if it
+ *  does not first issue a <code>wr.close</code>.
+ *     
+ *     rd, wr = IO.pipe
+ *     
+ *     if fork
+ *       wr.close
+ *       puts "Parent got: <#{rd.read}>"
+ *       rd.close
+ *       Process.wait
+ *     else
+ *       rd.close
+ *       puts "Sending message to parent"
+ *       wr.write "Hi Dad"
+ *       wr.close
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Sending message to parent
+ *     Parent got: <Hi Dad>
+ */
+
+static VALUE
+rb_io_s_pipe(klass)
+    VALUE klass;
+{
+#ifndef __human68k__
+    int pipes[2], state;
+    VALUE r, w, args[3];
+
+#ifdef _WIN32
+    if (_pipe(pipes, 1024, O_BINARY) == -1)
+#else
+    if (pipe(pipes) == -1)
+#endif
+	rb_sys_fail(0);
+
+    args[0] = klass;
+    args[1] = INT2NUM(pipes[0]);
+    args[2] = INT2FIX(O_RDONLY);
+    r = rb_protect(io_new_instance, (VALUE)args, &state);
+    if (state) {
+	close(pipes[0]);
+	close(pipes[1]);
+	rb_jump_tag(state);
+    }
+    args[1] = INT2NUM(pipes[1]);
+    args[2] = INT2FIX(O_WRONLY);
+    w = rb_protect(io_new_instance, (VALUE)args, &state);
+    if (state) {
+	close(pipes[1]);
+	if (!NIL_P(r)) rb_io_close(r);
+	rb_jump_tag(state);
+    }
+    rb_io_synchronized(RFILE(w)->fptr);
+
+    return rb_assoc_new(r, w);
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
+#endif
+}
+
+struct foreach_arg {
+    int argc;
+    VALUE sep;
+    VALUE io;
+};
+
+static VALUE
+io_s_foreach(arg)
+    struct foreach_arg *arg;
+{
+    VALUE str;
+
+    while (!NIL_P(str = rb_io_getline(arg->sep, arg->io))) {
+	rb_yield(str);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     IO.foreach(name, sep_string=$/) {|line| block }   => nil
+ *  
+ *  Executes the block for every line in the named I/O port, where lines
+ *  are separated by <em>sep_string</em>.
+ *     
+ *     IO.foreach("testfile") {|x| print "GOT ", x }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     GOT This is line one
+ *     GOT This is line two
+ *     GOT This is line three
+ *     GOT And so on...
+ */     
+
+static VALUE
+rb_io_s_foreach(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE fname;
+    struct foreach_arg arg;
+
+    rb_scan_args(argc, argv, "11", &fname, &arg.sep);
+    SafeStringValue(fname);
+
+    if (argc == 1) {
+	arg.sep = rb_default_rs;
+    }
+    else if (!NIL_P(arg.sep)) {
+	StringValue(arg.sep);
+    }
+    arg.io = rb_io_open(RSTRING(fname)->ptr, "r");
+    if (NIL_P(arg.io)) return Qnil;
+
+    return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, arg.io);
+}
+
+static VALUE
+io_s_readlines(arg)
+    struct foreach_arg *arg;
+{
+    return rb_io_readlines(arg->argc, &arg->sep, arg->io);
+}
+
+/*
+ *  call-seq:
+ *     IO.readlines(name, sep_string=$/)   => array
+ *  
+ *  Reads the entire file specified by <i>name</i> as individual
+ *  lines, and returns those lines in an array. Lines are separated by
+ *  <i>sep_string</i>.
+ *     
+ *     a = IO.readlines("testfile")
+ *     a[0]   #=> "This is line one\n"
+ *     
+ */
+
+static VALUE
+rb_io_s_readlines(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    VALUE fname;
+    struct foreach_arg arg;
+
+    rb_scan_args(argc, argv, "11", &fname, &arg.sep);
+    SafeStringValue(fname);
+
+    arg.argc = argc - 1;
+    arg.io = rb_io_open(RSTRING(fname)->ptr, "r");
+    if (NIL_P(arg.io)) return Qnil;
+    return rb_ensure(io_s_readlines, (VALUE)&arg, rb_io_close, arg.io);
+}
+
+static VALUE
+io_s_read(arg)
+    struct foreach_arg *arg;
+{
+    return io_read(arg->argc, &arg->sep, arg->io);
+}
+
+/*
+ *  call-seq:
+ *     IO.read(name, [length [, offset]] )   => string
+ *  
+ *  Opens the file, optionally seeks to the given offset, then returns
+ *  <i>length</i> bytes (defaulting to the rest of the file).
+ *  <code>read</code> ensures the file is closed before returning.
+ *     
+ *     IO.read("testfile")           #=> "This is line one\nThis is line two\nThis is line three\nAnd so on...\n"
+ *     IO.read("testfile", 20)       #=> "This is line one\nThi"
+ *     IO.read("testfile", 20, 10)   #=> "ne one\nThis is line "
+ */
+
+static VALUE
+rb_io_s_read(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
+{
+    VALUE fname, offset;
+    struct foreach_arg arg;
+
+    rb_scan_args(argc, argv, "12", &fname, &arg.sep, &offset);
+    SafeStringValue(fname);
+
+    arg.argc = argc ? 1 : 0;
+    arg.io = rb_io_open(RSTRING(fname)->ptr, "r");
+    if (NIL_P(arg.io)) return Qnil;
+    if (!NIL_P(offset)) {
+	rb_io_seek(arg.io, offset, SEEK_SET);
+    }
+    return rb_ensure(io_s_read, (VALUE)&arg, rb_io_close, arg.io);
+}
+
+static VALUE
+argf_tell()
+{
+    if (!next_argv()) {
+	rb_raise(rb_eArgError, "no stream to tell");
+    }
+    ARGF_FORWARD(0, 0);
+    return rb_io_tell(current_file);
+}
+
+static VALUE
+argf_seek_m(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    if (!next_argv()) {
+	rb_raise(rb_eArgError, "no stream to seek");
+    }
+    ARGF_FORWARD(argc, argv);
+    return rb_io_seek_m(argc, argv, current_file);
+}
+
+static VALUE
+argf_set_pos(self, offset)
+     VALUE self, offset;
+{
+    if (!next_argv()) {
+	rb_raise(rb_eArgError, "no stream to set position");
+    }
+    ARGF_FORWARD(1, &offset);
+    return rb_io_set_pos(current_file, offset);
+}
+
+static VALUE
+argf_rewind()
+{
+    if (!next_argv()) {
+	rb_raise(rb_eArgError, "no stream to rewind");
+    }
+    ARGF_FORWARD(0, 0);
+    return rb_io_rewind(current_file);
+}
+
+static VALUE
+argf_fileno()
+{
+    if (!next_argv()) {
+	rb_raise(rb_eArgError, "no stream");
+    }
+    ARGF_FORWARD(0, 0);
+    return rb_io_fileno(current_file);
+}
+
+static VALUE
+argf_to_io()
+{
+    next_argv();
+    ARGF_FORWARD(0, 0);
+    return current_file;
+}
+
+static VALUE
+argf_eof()
+{
+    if (current_file) {
+	if (init_p == 0) return Qtrue;
+	ARGF_FORWARD(0, 0);
+	if (rb_io_eof(current_file)) {
+	    return Qtrue;
+	}
+    }
+    return Qfalse;
+}
+
+static VALUE
+argf_read(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE tmp, str, length;
+    long len = 0;
+
+    rb_scan_args(argc, argv, "02", &length, &str);
+    if (!NIL_P(length)) {
+	len = NUM2LONG(argv[0]);
+    }
+    if (!NIL_P(str)) {
+	StringValue(str);
+	rb_str_resize(str,0);
+	argv[1] = Qnil;
+    }
+
+  retry:
+    if (!next_argv()) {
+	return str;
+    }
+    if (TYPE(current_file) != T_FILE) {
+	tmp = argf_forward(argc, argv);
+    }
+    else {
+	tmp = io_read(argc, argv, current_file);
+    }
+    if (NIL_P(str)) str = tmp;
+    else if (!NIL_P(tmp)) rb_str_append(str, tmp);
+    if (NIL_P(tmp) || NIL_P(length)) {
+	if (next_p != -1) {
+	    argf_close(current_file);
+	    next_p = 1;
+	    goto retry;
+	}
+    }
+    else if (argc >= 1) {
+	if (RSTRING(str)->len < len) {
+	    len -= RSTRING(str)->len;
+	    argv[0] = INT2NUM(len);
+	    goto retry;
+	}
+    }
+    return str;
+}
+
+static VALUE
+argf_getc()
+{
+    VALUE byte;
+
+  retry:
+    if (!next_argv()) return Qnil;
+    if (TYPE(current_file) != T_FILE) {
+	byte = rb_funcall3(current_file, rb_intern("getc"), 0, 0);
+    }
+    else {
+	byte = rb_io_getc(current_file);
+    }
+    if (NIL_P(byte) && next_p != -1) {
+	argf_close(current_file);
+	next_p = 1;
+	goto retry;
+    }
+
+    return byte;
+}
+
+static VALUE
+argf_readchar()
+{
+    VALUE c;
+
+    NEXT_ARGF_FORWARD(0, 0);
+    c = argf_getc();
+    if (NIL_P(c)) {
+	rb_eof_error();
+    }
+    return c;
+}
+
+static VALUE
+argf_each_line(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE str;
+
+    if (!next_argv()) return Qnil;
+    if (TYPE(current_file) != T_FILE) {
+	for (;;) {
+	    if (!next_argv()) return argf;
+	    rb_iterate(rb_each, current_file, rb_yield, 0);
+	    next_p = 1;
+	}
+    }
+    while (!NIL_P(str = argf_getline(argc, argv))) {
+	rb_yield(str);
+    }
+    return argf;
+}
+
+static VALUE
+argf_each_byte()
+{
+    VALUE byte;
+
+    while (!NIL_P(byte = argf_getc())) {
+	rb_yield(byte);
+    }
+    return argf;
+}
+
+static VALUE
+argf_filename()
+{
+    next_argv();
+    return filename;
+}
+
+static VALUE
+argf_file()
+{
+    next_argv();
+    return current_file;
+}
+
+static VALUE
+argf_binmode()
+{
+    binmode = 1;
+    next_argv();
+    ARGF_FORWARD(0, 0);
+    rb_io_binmode(current_file);
+    return argf;
+}
+
+static VALUE
+argf_skip()
+{
+    if (next_p != -1) {
+	argf_close(current_file);
+	next_p = 1;
+    }
+    return argf;
+}
+
+static VALUE
+argf_close_m()
+{
+    next_argv();
+    argf_close(current_file);
+    if (next_p != -1) {
+	next_p = 1;
+    }
+    gets_lineno = 0;
+    return argf;
+}
+
+static VALUE
+argf_closed()
+{
+    next_argv();
+    ARGF_FORWARD(0, 0);
+    return rb_io_closed(current_file);
+}
+
+static VALUE
+argf_to_s()
+{
+    return rb_str_new2("ARGF");
+}
+
+static VALUE
+opt_i_get()
+{
+    if (!ruby_inplace_mode) return Qnil;
+    return rb_str_new2(ruby_inplace_mode);
+}
+
+static void
+opt_i_set(val)
+    VALUE val;
+{
+    if (!RTEST(val)) {
+	if (ruby_inplace_mode) free(ruby_inplace_mode);
+	ruby_inplace_mode = 0;
+	return;
+    }
+    StringValue(val);
+    if (ruby_inplace_mode) free(ruby_inplace_mode);
+    ruby_inplace_mode = 0;
+    ruby_inplace_mode = strdup(RSTRING(val)->ptr);
+}
+
+/*
+ *  Class <code>IO</code> is the basis for all input and output in Ruby.
+ *  An I/O stream may be <em>duplexed</em> (that is, bidirectional), and
+ *  so may use more than one native operating system stream.
+ *     
+ *  Many of the examples in this section use class <code>File</code>,
+ *  the only standard subclass of <code>IO</code>. The two classes are
+ *  closely associated.
+ *     
+ *  As used in this section, <em>portname</em> may take any of the
+ *  following forms.
+ *     
+ *  * A plain string represents a filename suitable for the underlying
+ *    operating system.
+ *     
+ *  * A string starting with ``<code>|</code>'' indicates a subprocess.
+ *    The remainder of the string following the ``<code>|</code>'' is
+ *    invoked as a process with appropriate input/output channels
+ *    connected to it.
+ *     
+ *  * A string equal to ``<code>|-</code>'' will create another Ruby
+ *    instance as a subprocess.
+ *     
+ *  Ruby will convert pathnames between different operating system
+ *  conventions if possible. For instance, on a Windows system the
+ *  filename ``<code>/gumby/ruby/test.rb</code>'' will be opened as
+ *  ``<code>\gumby\ruby\test.rb</code>''. When specifying a
+ *  Windows-style filename in a Ruby string, remember to escape the
+ *  backslashes:
+ *     
+ *     "c:\\gumby\\ruby\\test.rb"
+ *     
+ *  Our examples here will use the Unix-style forward slashes;
+ *  <code>File::SEPARATOR</code> can be used to get the
+ *  platform-specific separator character.
+ *     
+ *  I/O ports may be opened in any one of several different modes, which
+ *  are shown in this section as <em>mode</em>. The mode may
+ *  either be a Fixnum or a String. If numeric, it should be
+ *  one of the operating system specific constants (O_RDONLY,
+ *  O_WRONLY, O_RDWR, O_APPEND and so on). See man open(2) for
+ *  more information.
+ *
+ *  If the mode is given as a String, it must be one of the
+ *  values listed in the following table.
+ *
+ *    Mode |  Meaning
+ *    -----+--------------------------------------------------------
+ *    "r"  |  Read-only, starts at beginning of file  (default mode).
+ *    -----+--------------------------------------------------------
+ *    "r+" |  Read-write, starts at beginning of file.
+ *    -----+--------------------------------------------------------
+ *    "w"  |  Write-only, truncates existing file 
+ *         |  to zero length or creates a new file for writing.
+ *    -----+--------------------------------------------------------
+ *    "w+" |  Read-write, truncates existing file to zero length
+ *         |  or creates a new file for reading and writing.
+ *    -----+--------------------------------------------------------
+ *    "a"  |  Write-only, starts at end of file if file exists,
+ *         |  otherwise creates a new file for writing.
+ *    -----+--------------------------------------------------------
+ *    "a+" |  Read-write, starts at end of file if file exists,
+ *         |  otherwise creates a new file for reading and 
+ *         |  writing.
+ *    -----+--------------------------------------------------------
+ *     "b" |  (DOS/Windows only) Binary file mode (may appear with 
+ *         |  any of the key letters listed above).
+ *
+ *
+ *  The global constant ARGF (also accessible as $<) provides an
+ *  IO-like stream which allows access to all files mentioned on the
+ *  command line (or STDIN if no files are mentioned). ARGF provides
+ *  the methods <code>#path</code> and <code>#filename</code> to access
+ *  the name of the file currently being read.
+ */
+
+void
+Init_IO()
+{
+#ifdef __CYGWIN__ 
+#include <sys/cygwin.h>
+    static struct __cygwin_perfile pf[] =
+    {
+	{"", O_RDONLY | O_BINARY},
+	{"", O_WRONLY | O_BINARY},
+	{"", O_RDWR | O_BINARY},
+	{"", O_APPEND | O_BINARY},
+	{NULL, 0}
+    };
+    cygwin_internal(CW_PERFILE, pf);
+#endif
+
+    rb_eIOError = rb_define_class("IOError", rb_eStandardError);
+    rb_eEOFError = rb_define_class("EOFError", rb_eIOError);
+
+    id_write = rb_intern("write");
+    id_read = rb_intern("read");
+    id_getc = rb_intern("getc");
+
+    rb_define_global_function("syscall", rb_f_syscall, -1);
+
+    rb_define_global_function("open", rb_f_open, -1);
+    rb_define_global_function("printf", rb_f_printf, -1);
+    rb_define_global_function("print", rb_f_print, -1);
+    rb_define_global_function("putc", rb_f_putc, 1);
+    rb_define_global_function("puts", rb_f_puts, -1);
+    rb_define_global_function("gets", rb_f_gets, -1);
+    rb_define_global_function("readline", rb_f_readline, -1);
+    rb_define_global_function("getc", rb_f_getc, 0);
+    rb_define_global_function("select", rb_f_select, -1);
+
+    rb_define_global_function("readlines", rb_f_readlines, -1);
+
+    rb_define_global_function("`", rb_f_backquote, 1);
+
+    rb_define_global_function("p", rb_f_p, -1);
+    rb_define_method(rb_mKernel, "display", rb_obj_display, -1);
+
+    rb_cIO = rb_define_class("IO", rb_cObject);
+    rb_include_module(rb_cIO, rb_mEnumerable);
+
+    rb_define_alloc_func(rb_cIO, io_alloc);
+    rb_define_singleton_method(rb_cIO, "new", rb_io_s_new, -1);
+    rb_define_singleton_method(rb_cIO, "open",  rb_io_s_open, -1);
+    rb_define_singleton_method(rb_cIO, "sysopen",  rb_io_s_sysopen, -1);
+    rb_define_singleton_method(rb_cIO, "for_fd", rb_io_s_for_fd, -1);
+    rb_define_singleton_method(rb_cIO, "popen", rb_io_s_popen, -1);
+    rb_define_singleton_method(rb_cIO, "foreach", rb_io_s_foreach, -1);
+    rb_define_singleton_method(rb_cIO, "readlines", rb_io_s_readlines, -1);
+    rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
+    rb_define_singleton_method(rb_cIO, "select", rb_f_select, -1);
+    rb_define_singleton_method(rb_cIO, "pipe", rb_io_s_pipe, 0);
+
+    rb_define_method(rb_cIO, "initialize", rb_io_initialize, -1);
+
+    rb_output_fs = Qnil;
+    rb_define_hooked_variable("$,", &rb_output_fs, 0, rb_str_setter);
+
+    rb_global_variable(&rb_default_rs);
+    rb_rs = rb_default_rs = rb_str_new2("\n");
+    rb_output_rs = Qnil;
+    OBJ_FREEZE(rb_default_rs);	/* avoid modifying RS_default */
+    rb_define_hooked_variable("$/", &rb_rs, 0, rb_str_setter);
+    rb_define_hooked_variable("$-0", &rb_rs, 0, rb_str_setter);
+    rb_define_hooked_variable("$\\", &rb_output_rs, 0, rb_str_setter);
+
+    rb_define_hooked_variable("$.", &lineno, 0, lineno_setter);
+    rb_define_virtual_variable("$_", rb_lastline_get, rb_lastline_set);
+
+    rb_define_method(rb_cIO, "initialize_copy", rb_io_init_copy, 1);
+    rb_define_method(rb_cIO, "reopen", rb_io_reopen, -1);
+
+    rb_define_method(rb_cIO, "print", rb_io_print, -1);
+    rb_define_method(rb_cIO, "putc", rb_io_putc, 1);
+    rb_define_method(rb_cIO, "puts", rb_io_puts, -1);
+    rb_define_method(rb_cIO, "printf", rb_io_printf, -1);
+
+    rb_define_method(rb_cIO, "each",  rb_io_each_line, -1);
+    rb_define_method(rb_cIO, "each_line",  rb_io_each_line, -1);
+    rb_define_method(rb_cIO, "each_byte",  rb_io_each_byte, 0);
+
+    rb_define_method(rb_cIO, "syswrite", rb_io_syswrite, 1);
+    rb_define_method(rb_cIO, "sysread",  rb_io_sysread, -1);
+
+    rb_define_method(rb_cIO, "fileno", rb_io_fileno, 0);
+    rb_define_alias(rb_cIO, "to_i", "fileno");
+    rb_define_method(rb_cIO, "to_io", rb_io_to_io, 0);
+
+    rb_define_method(rb_cIO, "fsync",   rb_io_fsync, 0);
+    rb_define_method(rb_cIO, "sync",   rb_io_sync, 0);
+    rb_define_method(rb_cIO, "sync=",  rb_io_set_sync, 1);
+
+    rb_define_method(rb_cIO, "lineno",   rb_io_lineno, 0);
+    rb_define_method(rb_cIO, "lineno=",  rb_io_set_lineno, 1);
+
+    rb_define_method(rb_cIO, "readlines",  rb_io_readlines, -1);
+
+    rb_define_method(rb_cIO, "read_nonblock",  io_read_nonblock, -1);
+    rb_define_method(rb_cIO, "write_nonblock", rb_io_write_nonblock, 1);
+    rb_define_method(rb_cIO, "readpartial",  io_readpartial, -1);
+    rb_define_method(rb_cIO, "read",  io_read, -1);
+    rb_define_method(rb_cIO, "write", io_write, 1);
+    rb_define_method(rb_cIO, "gets",  rb_io_gets_m, -1);
+    rb_define_method(rb_cIO, "readline",  rb_io_readline, -1);
+    rb_define_method(rb_cIO, "getc",  rb_io_getc, 0);
+    rb_define_method(rb_cIO, "readchar",  rb_io_readchar, 0);
+    rb_define_method(rb_cIO, "ungetc",rb_io_ungetc, 1);
+    rb_define_method(rb_cIO, "<<",    rb_io_addstr, 1);
+    rb_define_method(rb_cIO, "flush", rb_io_flush, 0);
+    rb_define_method(rb_cIO, "tell", rb_io_tell, 0);
+    rb_define_method(rb_cIO, "seek", rb_io_seek_m, -1);
+    rb_define_const(rb_cIO, "SEEK_SET", INT2FIX(SEEK_SET));
+    rb_define_const(rb_cIO, "SEEK_CUR", INT2FIX(SEEK_CUR));
+    rb_define_const(rb_cIO, "SEEK_END", INT2FIX(SEEK_END));
+    rb_define_method(rb_cIO, "rewind", rb_io_rewind, 0);
+    rb_define_method(rb_cIO, "pos", rb_io_tell, 0);
+    rb_define_method(rb_cIO, "pos=", rb_io_set_pos, 1);
+    rb_define_method(rb_cIO, "eof", rb_io_eof, 0);
+    rb_define_method(rb_cIO, "eof?", rb_io_eof, 0);
+
+    rb_define_method(rb_cIO, "close", rb_io_close_m, 0);
+    rb_define_method(rb_cIO, "closed?", rb_io_closed, 0);
+    rb_define_method(rb_cIO, "close_read", rb_io_close_read, 0);
+    rb_define_method(rb_cIO, "close_write", rb_io_close_write, 0);
+
+    rb_define_method(rb_cIO, "isatty", rb_io_isatty, 0);
+    rb_define_method(rb_cIO, "tty?", rb_io_isatty, 0);
+    rb_define_method(rb_cIO, "binmode",  rb_io_binmode, 0);
+    rb_define_method(rb_cIO, "sysseek", rb_io_sysseek, -1);
+
+    rb_define_method(rb_cIO, "ioctl", rb_io_ioctl, -1);
+    rb_define_method(rb_cIO, "fcntl", rb_io_fcntl, -1);
+    rb_define_method(rb_cIO, "pid", rb_io_pid, 0);
+    rb_define_method(rb_cIO, "inspect",  rb_io_inspect, 0);
+
+    rb_define_variable("$stdin", &rb_stdin);
+    rb_stdin = prep_stdio(stdin, FMODE_READABLE, rb_cIO);
+    rb_define_hooked_variable("$stdout", &rb_stdout, 0, stdout_setter);
+    rb_stdout = prep_stdio(stdout, FMODE_WRITABLE, rb_cIO);
+    rb_define_hooked_variable("$stderr", &rb_stderr, 0, stdout_setter);
+    rb_stderr = prep_stdio(stderr, FMODE_WRITABLE, rb_cIO);
+    rb_define_hooked_variable("$>", &rb_stdout, 0, stdout_setter);
+    orig_stdout = rb_stdout;
+    rb_deferr = orig_stderr = rb_stderr;
+
+    /* variables to be removed in 1.8.1 */
+    rb_define_hooked_variable("$defout", &rb_stdout, 0, defout_setter);
+    rb_define_hooked_variable("$deferr", &rb_stderr, 0, deferr_setter);
+
+    /* constants to hold original stdin/stdout/stderr */
+    rb_define_global_const("STDIN", rb_stdin);
+    rb_define_global_const("STDOUT", rb_stdout);
+    rb_define_global_const("STDERR", rb_stderr);
+
+    rb_define_readonly_variable("$<", &argf);
+    argf = rb_obj_alloc(rb_cObject);
+    rb_extend_object(argf, rb_mEnumerable);
+    rb_define_global_const("ARGF", argf);
+
+    rb_define_singleton_method(argf, "to_s", argf_to_s, 0);
+
+    rb_define_singleton_method(argf, "fileno", argf_fileno, 0);
+    rb_define_singleton_method(argf, "to_i", argf_fileno, 0);
+    rb_define_singleton_method(argf, "to_io", argf_to_io, 0);
+    rb_define_singleton_method(argf, "each",  argf_each_line, -1);
+    rb_define_singleton_method(argf, "each_line",  argf_each_line, -1);
+    rb_define_singleton_method(argf, "each_byte",  argf_each_byte, 0);
+
+    rb_define_singleton_method(argf, "read",  argf_read, -1);
+    rb_define_singleton_method(argf, "readlines", rb_f_readlines, -1);
+    rb_define_singleton_method(argf, "to_a", rb_f_readlines, -1);
+    rb_define_singleton_method(argf, "gets", rb_f_gets, -1);
+    rb_define_singleton_method(argf, "readline", rb_f_readline, -1);
+    rb_define_singleton_method(argf, "getc", argf_getc, 0);
+    rb_define_singleton_method(argf, "readchar", argf_readchar, 0);
+    rb_define_singleton_method(argf, "tell", argf_tell, 0);
+    rb_define_singleton_method(argf, "seek", argf_seek_m, -1);
+    rb_define_singleton_method(argf, "rewind", argf_rewind, 0);
+    rb_define_singleton_method(argf, "pos", argf_tell, 0);
+    rb_define_singleton_method(argf, "pos=", argf_set_pos, 1);
+    rb_define_singleton_method(argf, "eof", argf_eof, 0);
+    rb_define_singleton_method(argf, "eof?", argf_eof, 0);
+    rb_define_singleton_method(argf, "binmode", argf_binmode, 0);
+
+    rb_define_singleton_method(argf, "filename", argf_filename, 0);
+    rb_define_singleton_method(argf, "path", argf_filename, 0);
+    rb_define_singleton_method(argf, "file", argf_file, 0);
+    rb_define_singleton_method(argf, "skip", argf_skip, 0);
+    rb_define_singleton_method(argf, "close", argf_close_m, 0);
+    rb_define_singleton_method(argf, "closed?", argf_closed, 0);
+
+    rb_define_singleton_method(argf, "lineno",   argf_lineno, 0);
+    rb_define_singleton_method(argf, "lineno=",  argf_set_lineno, 1);
+
+    rb_global_variable(&current_file);
+    rb_define_readonly_variable("$FILENAME", &filename);
+    filename = rb_str_new2("-");
+
+    rb_define_virtual_variable("$-i", opt_i_get, opt_i_set);
+
+#if defined (_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__)
+    atexit(pipe_atexit);
+#endif
+
+    Init_File();
+
+    rb_define_method(rb_cFile, "initialize",  rb_file_initialize, -1);
+
+    rb_file_const("RDONLY", INT2FIX(O_RDONLY));
+    rb_file_const("WRONLY", INT2FIX(O_WRONLY));
+    rb_file_const("RDWR", INT2FIX(O_RDWR));
+    rb_file_const("APPEND", INT2FIX(O_APPEND));
+    rb_file_const("CREAT", INT2FIX(O_CREAT));
+    rb_file_const("EXCL", INT2FIX(O_EXCL));
+#if defined(O_NDELAY) || defined(O_NONBLOCK)
+#   ifdef O_NONBLOCK
+    rb_file_const("NONBLOCK", INT2FIX(O_NONBLOCK));
+#   else
+    rb_file_const("NONBLOCK", INT2FIX(O_NDELAY));
+#   endif
+#endif
+    rb_file_const("TRUNC", INT2FIX(O_TRUNC));
+#ifdef O_NOCTTY
+    rb_file_const("NOCTTY", INT2FIX(O_NOCTTY));
+#endif
+#ifdef O_BINARY
+    rb_file_const("BINARY", INT2FIX(O_BINARY));
+#endif
+#ifdef O_SYNC
+    rb_file_const("SYNC", INT2FIX(O_SYNC));
+#endif
+}
diff --git a/ruby_1_8_6/keywords b/ruby_1_8_6/keywords
new file mode 100644
index 0000000000..04be992857
--- /dev/null
+++ b/ruby_1_8_6/keywords
@@ -0,0 +1,42 @@
+struct kwtable {char *name; int id[2]; enum lex_state state;};
+%%
+__LINE__, {k__LINE__, k__LINE__}, EXPR_END
+__FILE__, {k__FILE__, k__FILE__}, EXPR_END
+BEGIN, {klBEGIN, klBEGIN}, EXPR_END
+END, {klEND, klEND}, EXPR_END
+alias, {kALIAS, kALIAS}, EXPR_FNAME
+and, {kAND, kAND}, EXPR_BEG
+begin, {kBEGIN, kBEGIN}, EXPR_BEG
+break, {kBREAK, kBREAK}, EXPR_MID
+case, {kCASE, kCASE}, EXPR_BEG
+class, {kCLASS, kCLASS}, EXPR_CLASS
+def, {kDEF, kDEF}, EXPR_FNAME
+defined?, {kDEFINED, kDEFINED}, EXPR_ARG
+do, {kDO, kDO}, EXPR_BEG
+else, {kELSE, kELSE}, EXPR_BEG
+elsif, {kELSIF, kELSIF}, EXPR_BEG
+end, {kEND, kEND}, EXPR_END
+ensure, {kENSURE, kENSURE}, EXPR_BEG
+false, {kFALSE, kFALSE}, EXPR_END
+for, {kFOR, kFOR}, EXPR_BEG
+if, {kIF, kIF_MOD}, EXPR_BEG
+in, {kIN, kIN}, EXPR_BEG
+module, {kMODULE, kMODULE}, EXPR_BEG
+next, {kNEXT, kNEXT}, EXPR_MID
+nil, {kNIL, kNIL}, EXPR_END
+not, {kNOT, kNOT}, EXPR_BEG
+or, {kOR, kOR}, EXPR_BEG
+redo, {kREDO, kREDO}, EXPR_END
+rescue, {kRESCUE, kRESCUE_MOD}, EXPR_MID
+retry, {kRETRY, kRETRY}, EXPR_END
+return, {kRETURN, kRETURN}, EXPR_MID
+self, {kSELF, kSELF}, EXPR_END
+super, {kSUPER, kSUPER}, EXPR_ARG
+then, {kTHEN, kTHEN}, EXPR_BEG
+true, {kTRUE, kTRUE}, EXPR_END
+undef, {kUNDEF, kUNDEF}, EXPR_FNAME
+unless, {kUNLESS, kUNLESS_MOD}, EXPR_BEG
+until, {kUNTIL, kUNTIL_MOD}, EXPR_BEG
+when, {kWHEN, kWHEN}, EXPR_BEG
+while, {kWHILE, kWHILE_MOD}, EXPR_BEG
+yield, {kYIELD, kYIELD}, EXPR_ARG
diff --git a/ruby_1_8_6/lex.c b/ruby_1_8_6/lex.c
new file mode 100644
index 0000000000..79d9448dae
--- /dev/null
+++ b/ruby_1_8_6/lex.c
@@ -0,0 +1,136 @@
+/* C code produced by gperf version 2.7.2 */
+/* Command-line: gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' ./keywords  */
+struct kwtable {char *name; int id[2]; enum lex_state state;};
+
+#define TOTAL_KEYWORDS 40
+#define MIN_WORD_LENGTH 2
+#define MAX_WORD_LENGTH 8
+#define MIN_HASH_VALUE 6
+#define MAX_HASH_VALUE 55
+/* maximum key range = 50, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static unsigned char asso_values[] =
+    {
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 11, 56, 56, 36, 56,  1, 37,
+      31,  1, 56, 56, 56, 56, 29, 56,  1, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56,  1, 56, 32,  1,  2,
+       1,  1,  4, 23, 56, 17, 56, 20,  9,  2,
+       9, 26, 14, 56,  5,  1,  1, 16, 56, 21,
+      20,  9, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56
+    };
+  register int hval = len;
+
+  switch (hval)
+    {
+      default:
+      case 3:
+        hval += asso_values[(unsigned char)str[2]];
+      case 2:
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval + asso_values[(unsigned char)str[len - 1]];
+}
+
+#ifdef __GNUC__
+__inline
+#endif
+struct kwtable *
+rb_reserved_word (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static struct kwtable wordlist[] =
+    {
+      {""}, {""}, {""}, {""}, {""}, {""},
+      {"end", {kEND, kEND}, EXPR_END},
+      {"else", {kELSE, kELSE}, EXPR_BEG},
+      {"case", {kCASE, kCASE}, EXPR_BEG},
+      {"ensure", {kENSURE, kENSURE}, EXPR_BEG},
+      {"module", {kMODULE, kMODULE}, EXPR_BEG},
+      {"elsif", {kELSIF, kELSIF}, EXPR_BEG},
+      {"def", {kDEF, kDEF}, EXPR_FNAME},
+      {"rescue", {kRESCUE, kRESCUE_MOD}, EXPR_MID},
+      {"not", {kNOT, kNOT}, EXPR_BEG},
+      {"then", {kTHEN, kTHEN}, EXPR_BEG},
+      {"yield", {kYIELD, kYIELD}, EXPR_ARG},
+      {"for", {kFOR, kFOR}, EXPR_BEG},
+      {"self", {kSELF, kSELF}, EXPR_END},
+      {"false", {kFALSE, kFALSE}, EXPR_END},
+      {"retry", {kRETRY, kRETRY}, EXPR_END},
+      {"return", {kRETURN, kRETURN}, EXPR_MID},
+      {"true", {kTRUE, kTRUE}, EXPR_END},
+      {"if", {kIF, kIF_MOD}, EXPR_BEG},
+      {"defined?", {kDEFINED, kDEFINED}, EXPR_ARG},
+      {"super", {kSUPER, kSUPER}, EXPR_ARG},
+      {"undef", {kUNDEF, kUNDEF}, EXPR_FNAME},
+      {"break", {kBREAK, kBREAK}, EXPR_MID},
+      {"in", {kIN, kIN}, EXPR_BEG},
+      {"do", {kDO, kDO}, EXPR_BEG},
+      {"nil", {kNIL, kNIL}, EXPR_END},
+      {"until", {kUNTIL, kUNTIL_MOD}, EXPR_BEG},
+      {"unless", {kUNLESS, kUNLESS_MOD}, EXPR_BEG},
+      {"or", {kOR, kOR}, EXPR_BEG},
+      {"next", {kNEXT, kNEXT}, EXPR_MID},
+      {"when", {kWHEN, kWHEN}, EXPR_BEG},
+      {"redo", {kREDO, kREDO}, EXPR_END},
+      {"and", {kAND, kAND}, EXPR_BEG},
+      {"begin", {kBEGIN, kBEGIN}, EXPR_BEG},
+      {"__LINE__", {k__LINE__, k__LINE__}, EXPR_END},
+      {"class", {kCLASS, kCLASS}, EXPR_CLASS},
+      {"__FILE__", {k__FILE__, k__FILE__}, EXPR_END},
+      {"END", {klEND, klEND}, EXPR_END},
+      {"BEGIN", {klBEGIN, klBEGIN}, EXPR_END},
+      {"while", {kWHILE, kWHILE_MOD}, EXPR_BEG},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""},
+      {"alias", {kALIAS, kALIAS}, EXPR_FNAME}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register const char *s = wordlist[key].name;
+
+          if (*str == *s && !strcmp (str + 1, s + 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}
diff --git a/ruby_1_8_6/lib/.document b/ruby_1_8_6/lib/.document
new file mode 100644
index 0000000000..2159be8360
--- /dev/null
+++ b/ruby_1_8_6/lib/.document
@@ -0,0 +1,106 @@
+# We only run RDoc on the top-level files in here: we skip
+# all the helper stuff in sub-directories
+
+# Eventually, we hope to see...
+# *.rb
+
+# But for now
+
+English.rb
+Env.rb
+README
+abbrev.rb
+base64.rb
+benchmark.rb
+cgi
+cgi.rb
+cgi-lib.rb
+complex.rb
+csv.rb
+date
+date.rb
+date2.rb
+debug.rb
+delegate.rb
+drb
+drb.rb
+e2mmap.rb
+erb.rb
+eregex.rb
+fileutils.rb
+finalize.rb
+find.rb
+forwardable.rb
+ftools.rb
+generator.rb
+getoptlong.rb
+getopts.rb
+gserver.rb
+importenv.rb
+ipaddr.rb
+irb
+irb.rb
+jcode.rb
+logger.rb
+mailread.rb
+mathn.rb
+matrix.rb
+mkmf.rb
+monitor.rb
+mutex_m.rb
+net
+observer.rb
+open-uri.rb
+open3.rb
+optparse
+optparse.rb
+ostruct.rb
+parsearg.rb
+parsedate.rb
+pathname.rb
+ping.rb
+pp.rb
+prettyprint.rb
+profile.rb
+profiler.rb
+pstore.rb
+racc
+rational.rb
+rdoc
+readbytes.rb
+resolv-replace.rb
+resolv.rb
+rexml
+rinda
+rss
+rss.rb
+rubyunit.rb
+runit
+scanf.rb
+set.rb
+shell
+shell.rb
+shellwords.rb
+singleton.rb
+soap
+sync.rb
+tempfile.rb
+test
+thread.rb
+thwait.rb
+time.rb
+timeout.rb
+tmpdir.rb
+tracer.rb
+tsort.rb
+un.rb
+uri
+uri.rb
+weakref.rb
+webrick
+webrick.rb
+wsdl
+xmlrpc
+xsd
+yaml
+yaml.rb
diff --git a/ruby_1_8_6/lib/English.rb b/ruby_1_8_6/lib/English.rb
new file mode 100644
index 0000000000..1a0e11de74
--- /dev/null
+++ b/ruby_1_8_6/lib/English.rb
@@ -0,0 +1,155 @@
+#  Include the English library file in a Ruby script, and you can
+#  reference the global variables such as \VAR{\$\_} using less
+#  cryptic names, listed in the following table.% \vref{tab:english}.
+#
+#  Without 'English':
+#
+#      $\ = ' -- '
+#      "waterbuffalo" =~ /buff/
+#      print $", $', $$, "\n"
+#
+#  With English:
+#
+#      require "English"
+#      
+#      $OUTPUT_FIELD_SEPARATOR = ' -- '
+#      "waterbuffalo" =~ /buff/
+#      print $LOADED_FEATURES, $POSTMATCH, $PID, "\n"
+
+
+# The exception object passed to +raise+.
+alias $ERROR_INFO              $!
+
+# The stack backtrace generated by the last
+# exception. <tt>See Kernel.caller</tt> for details. Thread local.
+alias $ERROR_POSITION          $@
+
+# The default separator pattern used by <tt>String.split</tt>.  May be
+# set from the command line using the <tt>-F</tt> flag.
+alias $FS                      $;
+
+# The default separator pattern used by <tt>String.split</tt>.  May be
+# set from the command line using the <tt>-F</tt> flag.
+alias $FIELD_SEPARATOR         $;
+
+# The separator string output between the parameters to methods such
+# as <tt>Kernel.print</tt> and <tt>Array.join</tt>. Defaults to +nil+,
+# which adds no text.
+alias $OFS                     $,
+
+# The separator string output between the parameters to methods such
+# as <tt>Kernel.print</tt> and <tt>Array.join</tt>. Defaults to +nil+,
+# which adds no text.
+alias $OUTPUT_FIELD_SEPARATOR  $,
+
+# The input record separator (newline by default). This is the value
+# that routines such as <tt>Kernel.gets</tt> use to determine record
+# boundaries. If set to +nil+, +gets+ will read the entire file.
+alias $RS                      $/
+
+# The input record separator (newline by default). This is the value
+# that routines such as <tt>Kernel.gets</tt> use to determine record
+# boundaries. If set to +nil+, +gets+ will read the entire file.
+alias $INPUT_RECORD_SEPARATOR  $/
+
+# The string appended to the output of every call to methods such as
+# <tt>Kernel.print</tt> and <tt>IO.write</tt>. The default value is
+# +nil+.
+alias $ORS                     $\
+
+# The string appended to the output of every call to methods such as
+# <tt>Kernel.print</tt> and <tt>IO.write</tt>. The default value is
+# +nil+.
+alias $OUTPUT_RECORD_SEPARATOR $\
+
+# The number of the last line read from the current input file.
+alias $INPUT_LINE_NUMBER       $.
+
+# The number of the last line read from the current input file.
+alias $NR                      $.
+
+# The last line read by <tt>Kernel.gets</tt> or
+# <tt>Kernel.readline</tt>. Many string-related functions in the
+# +Kernel+ module operate on <tt>$_</tt> by default. The variable is
+# local to the current scope. Thread local.
+alias $LAST_READ_LINE          $_
+
+# The destination of output for <tt>Kernel.print</tt>
+# and <tt>Kernel.printf</tt>. The default value is
+# <tt>$stdout</tt>.
+alias $DEFAULT_OUTPUT          $>
+
+# An object that provides access to the concatenation
+# of the contents of all the files
+# given as command-line arguments, or <tt>$stdin</tt>
+# (in the case where there are no
+# arguments). <tt>$<</tt> supports methods similar to a 
+# +File+ object:
+# +inmode+, +close+,
+# <tt>closed?</tt>, +each+,
+# <tt>each_byte</tt>, <tt>each_line</tt>,
+# +eof+, <tt>eof?</tt>, +file+,
+# +filename+, +fileno+,
+# +getc+, +gets+, +lineno+,
+# <tt>lineno=</tt>, +path+, 
+# +pos+, <tt>pos=</tt>,
+# +read+, +readchar+,
+# +readline+, +readlines+,
+# +rewind+, +seek+, +skip+,
+# +tell+, <tt>to_a</tt>, <tt>to_i</tt>,
+# <tt>to_io</tt>, <tt>to_s</tt>, along with the
+# methods in +Enumerable+. The method +file+
+# returns a +File+ object for the file currently
+# being read. This may change as <tt>$<</tt> reads
+# through the files on the command line. Read only.
+alias $DEFAULT_INPUT           $<
+
+# The process number of the program being executed. Read only.
+alias $PID                     $$
+
+# The process number of the program being executed. Read only.
+alias $PROCESS_ID              $$
+
+# The exit status of the last child process to terminate. Read
+# only. Thread local.
+alias $CHILD_STATUS            $?
+
+# A +MatchData+ object that encapsulates the results of a successful
+# pattern match. The variables <tt>$&</tt>, <tt>$`</tt>, <tt>$'</tt>,
+# and <tt>$1</tt> to <tt>$9</tt> are all derived from
+# <tt>$~</tt>. Assigning to <tt>$~</tt> changes the values of these
+# derived variables.  This variable is local to the current
+# scope. Thread local.
+alias $LAST_MATCH_INFO         $~
+
+# If set to any value apart from +nil+ or +false+, all pattern matches
+# will be case insensitive, string comparisons will ignore case, and
+# string hash values will be case insensitive. Deprecated
+alias $IGNORECASE              $=
+
+# An array of strings containing the command-line
+# options from the invocation of the program. Options
+# used by the Ruby interpreter will have been
+# removed. Read only. Also known simply as +ARGV+.
+alias $ARGV                    $*
+
+# The string matched by the last successful pattern
+# match. This variable is local to the current
+# scope. Read only. Thread local.
+alias $MATCH                   $&
+
+# The string preceding the match in the last
+# successful pattern match. This variable is local to 
+# the current scope. Read only. Thread local.
+alias $PREMATCH                $`
+
+# The string following the match in the last
+# successful pattern match. This variable is local to 
+# the current scope. Read only. Thread local.
+alias $POSTMATCH               $'
+
+# The contents of the highest-numbered group matched in the last
+# successful pattern match. Thus, in <tt>"cat" =~ /(c|a)(t|z)/</tt>,
+# <tt>$+</tt> will be set to "t".  This variable is local to the
+# current scope. Read only. Thread local.
+alias $LAST_PAREN_MATCH        $+
diff --git a/ruby_1_8_6/lib/Env.rb b/ruby_1_8_6/lib/Env.rb
new file mode 100644
index 0000000000..452a28659e
--- /dev/null
+++ b/ruby_1_8_6/lib/Env.rb
@@ -0,0 +1,18 @@
+# Env.rb -- imports environment variables as global variables, Perlish ;(
+# Usage:
+#
+#  require 'Env'
+#  p $USER
+#  $USER = "matz"
+#  p ENV["USER"]
+
+require 'importenv'
+
+if __FILE__ == $0
+  p $TERM
+  $TERM = nil
+  p $TERM
+  p ENV["TERM"]
+  $TERM = "foo"
+  p ENV["TERM"]
+end
diff --git a/ruby_1_8_6/lib/README b/ruby_1_8_6/lib/README
new file mode 100644
index 0000000000..d60c5cb1e9
--- /dev/null
+++ b/ruby_1_8_6/lib/README
@@ -0,0 +1,96 @@
+English.rb	lets Perl'ish global variables have English names
+Env.rb		loads importenv.rb
+README		this file
+base64.rb	encodes/decodes base64 (obsolete)
+benchmark.rb	a benchmark utility
+cgi-lib.rb	simple CGI support library (old style)
+cgi.rb		CGI support library
+cgi/session.rb	CGI session class
+complex.rb	complex number support
+csv.rb		CSV parser/generator
+date.rb		date object
+date/format.rb	date parsing and formatting
+date2.rb	date object (obsolete; use date)
+debug.rb	ruby debugger
+delegate.rb	delegates messages to other object
+drb.rb		distributed Ruby
+e2mmap.rb	exception utilities
+erb.rb		tiny eRuby library
+eregex.rb	extended regular expression (just a proof of concept)
+fileutils.rb	file utilities
+finalize.rb	adds finalizer to the object
+find.rb		traverses directory tree
+forwardable.rb	explicit delegation library
+ftools.rb	file tools
+getoptlong.rb	GNU getoptlong compatible
+getopts.rb	parses command line options (use getoptlong)
+gserver.rb	general TCP server
+importenv.rb	imports environment variables as global variables
+ipaddr.rb	defines the IPAddr class
+irb.rb		interactive ruby
+jcode.rb	Japanese text handling (replace String methods)
+logger.rb	simple logging utility
+mailread.rb	reads mail headers
+mathn.rb	extended math operation
+matrix.rb	matrix calculation library
+mkmf.rb		Makefile maker
+monitor.rb	exclusive region monitor for thread
+mutex_m.rb	mutex mixin
+net/ftp.rb	ftp access
+net/http.rb	HTTP access
+net/imap.rb	IMAP4 access
+net/pop.rb	POP3 access
+net/protocol.rb	abstract class for net library (DO NOT USE)
+net/smtp.rb	SMTP access
+net/telnet.rb	telnet library
+observer.rb	observer desing pattern library (provides Observable)
+open-uri.rb	easy-to-use network interface using URI and Net
+open3.rb	opens subprocess connection stdin/stdout/stderr
+optparse.rb	command line option analysis
+ostruct.rb	python style object
+parsearg.rb	argument parser using getopts
+parsedate.rb	parses date string
+pathname.rb	Object-Oriented Pathname Class
+ping.rb		checks whether host is up, using TCP echo.
+pp.rb		pretty print objects
+prettyprint.rb	pretty printing algorithm
+profile.rb	runs ruby profiler
+profiler.rb	ruby profiler module
+pstore.rb	persistent object strage using marshal
+racc/parser.rb	racc (Ruby yACC) runtime
+rational.rb	rational number support
+rdoc            source-code documentation tool
+readbytes.rb	define IO#readbytes
+resolv-replace.rb	replace Socket DNS by resolve.rb
+resolv.rb	DNS resolver in Ruby
+rexml		an XML parser for Ruby, in Ruby
+rubyunit.rb	original Ruby Unit testing framework
+scanf.rb	scanf for Ruby
+set.rb		defines the Set class
+shell.rb	runs commands and does pipeline operations like shell
+shellwords.rb	split into words like shell
+singleton.rb	singleton design pattern library
+soap		SOAP 1.1 implementation
+sync.rb		2 phase lock
+tempfile.rb	temporary file with automatic removal
+test/unit	Ruby Unit Testing Framework
+thread.rb	thread support
+thwait.rb	thread syncronization class
+time.rb		RFC2822, RFC2616, ISO8601 style time formatting/parsing
+timeout.rb	provides timeout
+tmpdir.rb	retrieve temporary directory path
+tracer.rb	execution tracer
+tsort.rb	topological sorting
+un.rb		Utilities to replace common UNIX commands in Makefiles etc
+uri.rb		URI support
+uri/ftp.rb	ftp scheme support
+uri/http.rb	http scheme support
+uri/https.rb	https scheme support
+uri/ldap.rb	ldap scheme support
+uri/mailto.rb	mailto scheme support
+weakref.rb	weak reference class
+webrick.rb	WEB server toolkit
+wsdl		WSDL 1.1 implementation
+xmlrpc		XML-RPC implementation
+xsd		XML Schema Datatypes implementation
+yaml.rb		YAML implementation
diff --git a/ruby_1_8_6/lib/abbrev.rb b/ruby_1_8_6/lib/abbrev.rb
new file mode 100644
index 0000000000..6530679681
--- /dev/null
+++ b/ruby_1_8_6/lib/abbrev.rb
@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby
+=begin
+#
+# Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
+#
+# All rights reserved.  You can redistribute and/or modify it under
+# the same terms as Ruby.
+#
+# $Idaemons: /home/cvs/rb/abbrev.rb,v 1.2 2001/05/30 09:37:45 knu Exp $
+# $RoughId: abbrev.rb,v 1.4 2003/10/14 19:45:42 knu Exp $
+# $Id$
+=end
+
+# Calculate the set of unique abbreviations for a given set of strings.
+#
+#   require 'abbrev'
+#   require 'pp'
+#
+#   pp Abbrev::abbrev(['ruby', 'rules']).sort
+#
+# <i>Generates:</i>
+#
+#   [["rub", "ruby"],
+#    ["ruby", "ruby"],
+#    ["rul", "rules"],
+#    ["rule", "rules"],
+#    ["rules", "rules"]]
+#
+# Also adds an +abbrev+ method to class +Array+.
+
+module Abbrev
+
+  # Given a set of strings, calculate the set of unambiguous
+  # abbreviations for those strings, and return a hash where the keys
+  # are all the possible abbreviations and the values are the full
+  # strings. Thus, given input of "car" and "cone", the keys pointing
+  # to "car" would be "ca" and "car", while those pointing to "cone"
+  # would be "co", "con", and "cone".
+  #
+  # The optional +pattern+ parameter is a pattern or a string. Only
+  # those input strings matching the pattern, or begging the string,
+  # are considered for inclusion in the output hash
+
+  def abbrev(words, pattern = nil)
+    table = {}
+    seen = Hash.new(0)
+
+    if pattern.is_a?(String)
+      pattern = /^#{Regexp.quote(pattern)}/	# regard as a prefix
+    end
+
+    words.each do |word|
+      next if (abbrev = word).empty?
+      while (len = abbrev.rindex(/[\w\W]\z/)) > 0
+	abbrev = word[0,len]
+
+	next if pattern && pattern !~ abbrev
+
+	case seen[abbrev] += 1
+	when 1
+	  table[abbrev] = word
+	when 2
+	  table.delete(abbrev)
+	else
+	  break
+	end
+      end
+    end
+
+    words.each do |word|
+      next if pattern && pattern !~ word
+
+      table[word] = word
+    end
+
+    table
+  end
+
+  module_function :abbrev
+end
+
+class Array
+  # Calculates the set of unambiguous abbreviations for the strings in
+  # +self+. If passed a pattern or a string, only the strings matching
+  # the pattern or starting with the string are considered.
+  #
+  #   %w{ car cone }.abbrev   #=> { "ca" => "car", "car" => "car",
+  #                                 "co" => "cone", "con" => cone",
+  #                                 "cone" => "cone" }
+  def abbrev(pattern = nil)
+    Abbrev::abbrev(self, pattern)
+  end
+end
+
+if $0 == __FILE__
+  while line = gets
+    hash = line.split.abbrev
+
+    hash.sort.each do |k, v|
+      puts "#{k} => #{v}"
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/base64.rb b/ruby_1_8_6/lib/base64.rb
new file mode 100644
index 0000000000..8628d611b2
--- /dev/null
+++ b/ruby_1_8_6/lib/base64.rb
@@ -0,0 +1,133 @@
+#
+# = base64.rb: methods for base64-encoding and -decoding stings
+#
+# Author:: Yukihiro Matsumoto 
+# Documentation:: Dave Thomas and Gavin Sinclair
+#
+# Until Ruby 1.8.1, these methods were defined at the top-level.  Now
+# they are in the Base64 module but included in the top-level, where
+# their usage is deprecated.
+#
+# See Base64 for documentation.
+#
+
+require "kconv"
+
+
+# The Base64 module provides for the encoding (#encode64) and decoding
+# (#decode64) of binary data using a Base64 representation.
+# 
+# The following particular features are also provided:
+# - encode into lines of a given length (#b64encode)
+# - decode the special format specified in RFC2047 for the
+#   representation of email headers (decode_b)
+#
+# == Example
+#
+# A simple encoding and decoding. 
+# 
+#     require "base64"
+#
+#     enc   = Base64.encode64('Send reinforcements')
+#                         # -> "U2VuZCByZWluZm9yY2VtZW50cw==\n" 
+#     plain = Base64.decode64(enc)
+#                         # -> "Send reinforcements"
+#
+# The purpose of using base64 to encode data is that it translates any
+# binary data into purely printable characters.  It is specified in
+# RFC 2045 (http://www.faqs.org/rfcs/rfc2045.html).
+
+module Base64
+  module_function
+
+  # Returns the Base64-decoded version of +str+.
+  #
+  #   require 'base64'
+  #   str = 'VGhpcyBpcyBsaW5lIG9uZQpUaGlzIG' +
+  #         'lzIGxpbmUgdHdvClRoaXMgaXMgbGlu' +
+  #         'ZSB0aHJlZQpBbmQgc28gb24uLi4K'
+  #   puts Base64.decode64(str)
+  #
+  # <i>Generates:</i>
+  #
+  #    This is line one
+  #    This is line two
+  #    This is line three
+  #    And so on...
+
+  def decode64(str)
+    str.unpack("m")[0]
+  end
+
+
+  # Decodes text formatted using a subset of RFC2047 (the one used for
+  # mime-encoding mail headers).
+  #
+  # Only supports an encoding type of 'b' (base 64), and only supports
+  # the character sets ISO-2022-JP and SHIFT_JIS (so the only two
+  # encoded word sequences recognized are <tt>=?ISO-2022-JP?B?...=</tt> and
+  # <tt>=?SHIFT_JIS?B?...=</tt>).  Recognition of these sequences is case
+  # insensitive.
+
+  def decode_b(str)
+    str.gsub!(/=\?ISO-2022-JP\?B\?([!->@-~]+)\?=/i) {
+      decode64($1)
+    }
+    str = Kconv::toeuc(str)
+    str.gsub!(/=\?SHIFT_JIS\?B\?([!->@-~]+)\?=/i) {
+      decode64($1)
+    }
+    str = Kconv::toeuc(str)
+    str.gsub!(/\n/, ' ') 
+    str.gsub!(/\0/, '')
+    str
+  end
+
+  # Returns the Base64-encoded version of +str+.
+  #
+  #    require 'base64'
+  #    Base64.b64encode("Now is the time for all good coders\nto learn Ruby")
+  #
+  # <i>Generates:</i>
+  #
+  #    Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g
+  #    UnVieQ==
+
+  def encode64(bin)
+    [bin].pack("m")
+  end
+
+  # _Prints_ the Base64 encoded version of +bin+ (a +String+) in lines of
+  # +len+ (default 60) characters.
+  #
+  #    require 'base64'
+  #    data = "Now is the time for all good coders\nto learn Ruby" 
+  #    Base64.b64encode(data)
+  #
+  # <i>Generates:</i>
+  #
+  #    Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g
+  #    UnVieQ==
+
+  def b64encode(bin, len = 60)
+    encode64(bin).scan(/.{1,#{len}}/) do
+      print $&, "\n"
+    end
+  end 
+
+
+  module Deprecated # :nodoc:
+    include Base64
+
+    for m in Base64.private_instance_methods(false)
+      module_eval %{
+        def #{m}(*args)
+          warn("\#{caller(1)[0]}: #{m} is deprecated; use Base64.#{m} instead")
+          super
+        end
+      }
+    end
+  end
+end
+
+include Base64::Deprecated
diff --git a/ruby_1_8_6/lib/benchmark.rb b/ruby_1_8_6/lib/benchmark.rb
new file mode 100644
index 0000000000..36e593518f
--- /dev/null
+++ b/ruby_1_8_6/lib/benchmark.rb
@@ -0,0 +1,569 @@
+=begin
+#
+# benchmark.rb - a performance benchmarking library 
+# 
+# $Id$
+# 
+# Created by Gotoken (gotoken@notwork.org). 
+#
+# Documentation by Gotoken (original RD), Lyle Johnson (RDoc conversion), and
+# Gavin Sinclair (editing). 
+#
+=end
+
+# == Overview
+#
+# The Benchmark module provides methods for benchmarking Ruby code, giving
+# detailed reports on the time taken for each task.
+#
+
+# The Benchmark module provides methods to measure and report the time
+# used to execute Ruby code.
+#
+# * Measure the time to construct the string given by the expression
+#   <tt>"a"*1_000_000</tt>:
+#
+#       require 'benchmark'
+#
+#       puts Benchmark.measure { "a"*1_000_000 }
+# 
+#   On my machine (FreeBSD 3.2 on P5, 100MHz) this generates:
+# 
+#       1.166667   0.050000   1.216667 (  0.571355)
+# 
+#   This report shows the user CPU time, system CPU time, the sum of
+#   the user and system CPU times, and the elapsed real time. The unit
+#   of time is seconds.
+# 
+# * Do some experiments sequentially using the #bm method:
+#
+#       require 'benchmark'
+#
+#       n = 50000
+#       Benchmark.bm do |x|
+#         x.report { for i in 1..n; a = "1"; end }
+#         x.report { n.times do   ; a = "1"; end }
+#         x.report { 1.upto(n) do ; a = "1"; end }
+#       end
+# 
+#   The result:
+#
+#              user     system      total        real
+#          1.033333   0.016667   1.016667 (  0.492106)
+#          1.483333   0.000000   1.483333 (  0.694605)
+#          1.516667   0.000000   1.516667 (  0.711077)
+#
+# * Continuing the previous example, put a label in each report:
+#
+#       require 'benchmark'
+#
+#       n = 50000
+#       Benchmark.bm(7) do |x|
+#         x.report("for:")   { for i in 1..n; a = "1"; end }
+#         x.report("times:") { n.times do   ; a = "1"; end }
+#         x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
+#       end
+# 
+# The result:
+# 
+#                     user     system      total        real
+#        for:     1.050000   0.000000   1.050000 (  0.503462)
+#        times:   1.533333   0.016667   1.550000 (  0.735473)
+#        upto:    1.500000   0.016667   1.516667 (  0.711239)
+# 
+#
+# * The times for some benchmarks depend on the order in which items
+#   are run.  These differences are due to the cost of memory
+#   allocation and garbage collection. To avoid these discrepancies,
+#   the #bmbm method is provided.  For example, to compare ways to
+#   sort an array of floats:
+#
+#       require 'benchmark'
+#       
+#       array = (1..1000000).map { rand }
+#       
+#       Benchmark.bmbm do |x|
+#         x.report("sort!") { array.dup.sort! }
+#         x.report("sort")  { array.dup.sort  }
+#       end
+# 
+#   The result:
+# 
+#        Rehearsal -----------------------------------------
+#        sort!  11.928000   0.010000  11.938000 ( 12.756000)
+#        sort   13.048000   0.020000  13.068000 ( 13.857000)
+#        ------------------------------- total: 25.006000sec
+#        
+#                    user     system      total        real
+#        sort!  12.959000   0.010000  12.969000 ( 13.793000)
+#        sort   12.007000   0.000000  12.007000 ( 12.791000)
+#
+#
+# * Report statistics of sequential experiments with unique labels,
+#   using the #benchmark method:
+#
+#       require 'benchmark'
+#
+#       n = 50000
+#       Benchmark.benchmark(" "*7 + CAPTION, 7, FMTSTR, ">total:", ">avg:") do |x|
+#         tf = x.report("for:")   { for i in 1..n; a = "1"; end }
+#         tt = x.report("times:") { n.times do   ; a = "1"; end }
+#         tu = x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
+#         [tf+tt+tu, (tf+tt+tu)/3]
+#       end
+# 
+#   The result:
+# 
+#                     user     system      total        real
+#        for:     1.016667   0.016667   1.033333 (  0.485749)
+#        times:   1.450000   0.016667   1.466667 (  0.681367)
+#        upto:    1.533333   0.000000   1.533333 (  0.722166)
+#        >total:  4.000000   0.033333   4.033333 (  1.889282)
+#        >avg:    1.333333   0.011111   1.344444 (  0.629761)
+
+module Benchmark
+
+  BENCHMARK_VERSION = "2002-04-25" #:nodoc"
+
+  def Benchmark::times() # :nodoc:
+      Process::times()
+  end
+
+
+  # Invokes the block with a <tt>Benchmark::Report</tt> object, which
+  # may be used to collect and report on the results of individual
+  # benchmark tests. Reserves <i>label_width</i> leading spaces for
+  # labels on each line. Prints _caption_ at the top of the
+  # report, and uses _fmt_ to format each line.
+  # If the block returns an array of
+  # <tt>Benchmark::Tms</tt> objects, these will be used to format
+  # additional lines of output. If _label_ parameters are
+  # given, these are used to label these extra lines.
+  #
+  # _Note_: Other methods provide a simpler interface to this one, and are
+  # suitable for nearly all benchmarking requirements.  See the examples in
+  # Benchmark, and the #bm and #bmbm methods.
+  #
+  # Example: 
+  #
+  #     require 'benchmark'
+  #     include Benchmark          # we need the CAPTION and FMTSTR constants 
+  #
+  #     n = 50000
+  #     Benchmark.benchmark(" "*7 + CAPTION, 7, FMTSTR, ">total:", ">avg:") do |x|
+  #       tf = x.report("for:")   { for i in 1..n; a = "1"; end }
+  #       tt = x.report("times:") { n.times do   ; a = "1"; end }
+  #       tu = x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
+  #       [tf+tt+tu, (tf+tt+tu)/3]
+  #     end
+  # 
+  # <i>Generates:</i>
+  # 
+  #                     user     system      total        real
+  #        for:     1.016667   0.016667   1.033333 (  0.485749)
+  #        times:   1.450000   0.016667   1.466667 (  0.681367)
+  #        upto:    1.533333   0.000000   1.533333 (  0.722166)
+  #        >total:  4.000000   0.033333   4.033333 (  1.889282)
+  #        >avg:    1.333333   0.011111   1.344444 (  0.629761)
+  # 
+
+  def benchmark(caption = "", label_width = nil, fmtstr = nil, *labels) # :yield: report
+    sync = STDOUT.sync
+    STDOUT.sync = true
+    label_width ||= 0
+    fmtstr ||= FMTSTR
+    raise ArgumentError, "no block" unless iterator?
+    print caption
+    results = yield(Report.new(label_width, fmtstr))
+    Array === results and results.grep(Tms).each {|t|
+      print((labels.shift || t.label || "").ljust(label_width), 
+            t.format(fmtstr))
+    }
+    STDOUT.sync = sync
+  end
+
+
+  # A simple interface to the #benchmark method, #bm is generates sequential reports
+  # with labels.  The parameters have the same meaning as for #benchmark.
+  # 
+  #     require 'benchmark'
+  #
+  #     n = 50000
+  #     Benchmark.bm(7) do |x|
+  #       x.report("for:")   { for i in 1..n; a = "1"; end }
+  #       x.report("times:") { n.times do   ; a = "1"; end }
+  #       x.report("upto:")  { 1.upto(n) do ; a = "1"; end }
+  #     end
+  # 
+  # <i>Generates:</i>
+  # 
+  #                     user     system      total        real
+  #        for:     1.050000   0.000000   1.050000 (  0.503462)
+  #        times:   1.533333   0.016667   1.550000 (  0.735473)
+  #        upto:    1.500000   0.016667   1.516667 (  0.711239)
+  #
+
+  def bm(label_width = 0, *labels, &blk) # :yield: report
+    benchmark(" "*label_width + CAPTION, label_width, FMTSTR, *labels, &blk)
+  end
+
+
+  # Sometimes benchmark results are skewed because code executed
+  # earlier encounters different garbage collection overheads than
+  # that run later. #bmbm attempts to minimize this effect by running
+  # the tests twice, the first time as a rehearsal in order to get the
+  # runtime environment stable, the second time for
+  # real. <tt>GC.start</tt> is executed before the start of each of
+  # the real timings; the cost of this is not included in the
+  # timings. In reality, though, there's only so much that #bmbm can
+  # do, and the results are not guaranteed to be isolated from garbage
+  # collection and other effects.
+  #
+  # Because #bmbm takes two passes through the tests, it can
+  # calculate the required label width.
+  #
+  #       require 'benchmark'
+  #       
+  #       array = (1..1000000).map { rand }
+  #       
+  #       Benchmark.bmbm do |x|
+  #         x.report("sort!") { array.dup.sort! }
+  #         x.report("sort")  { array.dup.sort  }
+  #       end
+  # 
+  # <i>Generates:</i>
+  # 
+  #        Rehearsal -----------------------------------------
+  #        sort!  11.928000   0.010000  11.938000 ( 12.756000)
+  #        sort   13.048000   0.020000  13.068000 ( 13.857000)
+  #        ------------------------------- total: 25.006000sec
+  #        
+  #                    user     system      total        real
+  #        sort!  12.959000   0.010000  12.969000 ( 13.793000)
+  #        sort   12.007000   0.000000  12.007000 ( 12.791000)
+  #
+  # #bmbm yields a Benchmark::Job object and returns an array of
+  # Benchmark::Tms objects.
+  #
+  def bmbm(width = 0, &blk) # :yield: job
+    job = Job.new(width)
+    yield(job)
+    width = job.width
+    sync = STDOUT.sync
+    STDOUT.sync = true
+
+    # rehearsal
+    print "Rehearsal "
+    puts '-'*(width+CAPTION.length - "Rehearsal ".length)
+    list = []
+    job.list.each{|label,item|
+      print(label.ljust(width))
+      res = Benchmark::measure(&item)
+      print res.format()
+      list.push res
+    }
+    sum = Tms.new; list.each{|i| sum += i}
+    ets = sum.format("total: %tsec")
+    printf("%s %s\n\n",
+           "-"*(width+CAPTION.length-ets.length-1), ets)
+    
+    # take
+    print ' '*width, CAPTION
+    list = []
+    ary = []
+    job.list.each{|label,item|
+      GC::start
+      print label.ljust(width)
+      res = Benchmark::measure(&item)
+      print res.format()
+      ary.push res
+      list.push [label, res]
+    }
+
+    STDOUT.sync = sync
+    ary
+  end
+
+  # 
+  # Returns the time used to execute the given block as a
+  # Benchmark::Tms object.
+  #
+  def measure(label = "") # :yield:
+    t0, r0 = Benchmark.times, Time.now
+    yield
+    t1, r1 = Benchmark.times, Time.now
+    Benchmark::Tms.new(t1.utime  - t0.utime, 
+                       t1.stime  - t0.stime, 
+                       t1.cutime - t0.cutime, 
+                       t1.cstime - t0.cstime, 
+                       r1.to_f - r0.to_f,
+                       label)
+  end
+
+  #
+  # Returns the elapsed real time used to execute the given block.
+  #
+  def realtime(&blk) # :yield:
+    Benchmark::measure(&blk).real
+  end
+
+
+
+  #
+  # A Job is a sequence of labelled blocks to be processed by the
+  # Benchmark.bmbm method.  It is of little direct interest to the user.
+  #
+  class Job # :nodoc:
+    #
+    # Returns an initialized Job instance.
+    # Usually, one doesn't call this method directly, as new
+    # Job objects are created by the #bmbm method.
+    # _width_ is a initial value for the label offset used in formatting;
+    # the #bmbm method passes its _width_ argument to this constructor. 
+    # 
+    def initialize(width)
+      @width = width
+      @list = []
+    end
+
+    #
+    # Registers the given label and block pair in the job list.
+    #
+    def item(label = "", &blk) # :yield:
+      raise ArgmentError, "no block" unless block_given?
+      label.concat ' '
+      w = label.length
+      @width = w if @width < w
+      @list.push [label, blk]
+      self
+    end
+
+    alias report item
+    
+    # An array of 2-element arrays, consisting of label and block pairs.
+    attr_reader :list
+    
+    # Length of the widest label in the #list, plus one.  
+    attr_reader :width
+  end
+
+  module_function :benchmark, :measure, :realtime, :bm, :bmbm
+
+
+
+  #
+  # This class is used by the Benchmark.benchmark and Benchmark.bm methods.
+  # It is of little direct interest to the user.
+  #
+  class Report # :nodoc:
+    #
+    # Returns an initialized Report instance.
+    # Usually, one doesn't call this method directly, as new
+    # Report objects are created by the #benchmark and #bm methods. 
+    # _width_ and _fmtstr_ are the label offset and 
+    # format string used by Tms#format. 
+    # 
+    def initialize(width = 0, fmtstr = nil)
+      @width, @fmtstr = width, fmtstr
+    end
+
+    #
+    # Prints the _label_ and measured time for the block,
+    # formatted by _fmt_. See Tms#format for the
+    # formatting rules.
+    #
+    def item(label = "", *fmt, &blk) # :yield:
+      print label.ljust(@width)
+      res = Benchmark::measure(&blk)
+      print res.format(@fmtstr, *fmt)
+      res
+    end
+
+    alias report item
+  end
+
+
+
+  #
+  # A data object, representing the times associated with a benchmark
+  # measurement.
+  #
+  class Tms
+    CAPTION = "      user     system      total        real\n"
+    FMTSTR = "%10.6u %10.6y %10.6t %10.6r\n"
+
+    # User CPU time
+    attr_reader :utime
+    
+    # System CPU time
+    attr_reader :stime
+   
+    # User CPU time of children
+    attr_reader :cutime
+    
+    # System CPU time of children
+    attr_reader :cstime
+    
+    # Elapsed real time
+    attr_reader :real
+    
+    # Total time, that is _utime_ + _stime_ + _cutime_ + _cstime_ 
+    attr_reader :total
+    
+    # Label
+    attr_reader :label
+
+    #
+    # Returns an initialized Tms object which has
+    # _u_ as the user CPU time, _s_ as the system CPU time, 
+    # _cu_ as the children's user CPU time, _cs_ as the children's
+    # system CPU time, _real_ as the elapsed real time and _l_
+    # as the label. 
+    # 
+    def initialize(u = 0.0, s = 0.0, cu = 0.0, cs = 0.0, real = 0.0, l = nil)
+      @utime, @stime, @cutime, @cstime, @real, @label = u, s, cu, cs, real, l
+      @total = @utime + @stime + @cutime + @cstime
+    end
+
+    # 
+    # Returns a new Tms object whose times are the sum of the times for this
+    # Tms object, plus the time required to execute the code block (_blk_).
+    # 
+    def add(&blk) # :yield:
+      self + Benchmark::measure(&blk) 
+    end
+
+    # 
+    # An in-place version of #add.
+    # 
+    def add!
+      t = Benchmark::measure(&blk) 
+      @utime  = utime + t.utime
+      @stime  = stime + t.stime
+      @cutime = cutime + t.cutime
+      @cstime = cstime + t.cstime
+      @real   = real + t.real
+      self
+    end
+
+    # 
+    # Returns a new Tms object obtained by memberwise summation
+    # of the individual times for this Tms object with those of the other
+    # Tms object.
+    # This method and #/() are useful for taking statistics. 
+    # 
+    def +(other); memberwise(:+, other) end
+    
+    #
+    # Returns a new Tms object obtained by memberwise subtraction
+    # of the individual times for the other Tms object from those of this
+    # Tms object.
+    #
+    def -(other); memberwise(:-, other) end
+    
+    #
+    # Returns a new Tms object obtained by memberwise multiplication
+    # of the individual times for this Tms object by _x_.
+    #
+    def *(x); memberwise(:*, x) end
+
+    # 
+    # Returns a new Tms object obtained by memberwise division
+    # of the individual times for this Tms object by _x_.
+    # This method and #+() are useful for taking statistics. 
+    # 
+    def /(x); memberwise(:/, x) end
+
+    #
+    # Returns the contents of this Tms object as
+    # a formatted string, according to a format string
+    # like that passed to Kernel.format. In addition, #format
+    # accepts the following extensions:
+    #
+    # <tt>%u</tt>::     Replaced by the user CPU time, as reported by Tms#utime.
+    # <tt>%y</tt>::     Replaced by the system CPU time, as reported by #stime (Mnemonic: y of "s*y*stem")
+    # <tt>%U</tt>::     Replaced by the children's user CPU time, as reported by Tms#cutime 
+    # <tt>%Y</tt>::     Replaced by the children's system CPU time, as reported by Tms#cstime
+    # <tt>%t</tt>::     Replaced by the total CPU time, as reported by Tms#total
+    # <tt>%r</tt>::     Replaced by the elapsed real time, as reported by Tms#real
+    # <tt>%n</tt>::     Replaced by the label string, as reported by Tms#label (Mnemonic: n of "*n*ame")
+    # 
+    # If _fmtstr_ is not given, FMTSTR is used as default value, detailing the
+    # user, system and real elapsed time.
+    # 
+    def format(arg0 = nil, *args)
+      fmtstr = (arg0 || FMTSTR).dup
+      fmtstr.gsub!(/(%[-+\.\d]*)n/){"#{$1}s" % label}
+      fmtstr.gsub!(/(%[-+\.\d]*)u/){"#{$1}f" % utime}
+      fmtstr.gsub!(/(%[-+\.\d]*)y/){"#{$1}f" % stime}
+      fmtstr.gsub!(/(%[-+\.\d]*)U/){"#{$1}f" % cutime}
+      fmtstr.gsub!(/(%[-+\.\d]*)Y/){"#{$1}f" % cstime}
+      fmtstr.gsub!(/(%[-+\.\d]*)t/){"#{$1}f" % total}
+      fmtstr.gsub!(/(%[-+\.\d]*)r/){"(#{$1}f)" % real}
+      arg0 ? Kernel::format(fmtstr, *args) : fmtstr
+    end
+
+    # 
+    # Same as #format.
+    # 
+    def to_s
+      format
+    end
+
+    # 
+    # Returns a new 6-element array, consisting of the
+    # label, user CPU time, system CPU time, children's
+    # user CPU time, children's system CPU time and elapsed
+    # real time.
+    # 
+    def to_a
+      [@label, @utime, @stime, @cutime, @cstime, @real]
+    end
+
+    protected
+    def memberwise(op, x)
+      case x
+      when Benchmark::Tms
+        Benchmark::Tms.new(utime.__send__(op, x.utime),
+                           stime.__send__(op, x.stime),
+                           cutime.__send__(op, x.cutime),
+                           cstime.__send__(op, x.cstime),
+                           real.__send__(op, x.real)
+                           )
+      else
+        Benchmark::Tms.new(utime.__send__(op, x),
+                           stime.__send__(op, x),
+                           cutime.__send__(op, x),
+                           cstime.__send__(op, x),
+                           real.__send__(op, x)
+                           )
+      end
+    end
+  end
+
+  # The default caption string (heading above the output times).
+  CAPTION = Benchmark::Tms::CAPTION
+
+  # The default format string used to display times.  See also Benchmark::Tms#format. 
+  FMTSTR = Benchmark::Tms::FMTSTR
+end
+
+if __FILE__ == $0
+  include Benchmark
+
+  n = ARGV[0].to_i.nonzero? || 50000
+  puts %Q([#{n} times iterations of `a = "1"'])
+  benchmark("       " + CAPTION, 7, FMTSTR) do |x|
+    x.report("for:")   {for i in 1..n; a = "1"; end} # Benchmark::measure
+    x.report("times:") {n.times do   ; a = "1"; end}
+    x.report("upto:")  {1.upto(n) do ; a = "1"; end}
+  end
+
+  benchmark do
+    [
+      measure{for i in 1..n; a = "1"; end},  # Benchmark::measure
+      measure{n.times do   ; a = "1"; end},
+      measure{1.upto(n) do ; a = "1"; end}
+    ]
+  end
+end
diff --git a/ruby_1_8_6/lib/cgi-lib.rb b/ruby_1_8_6/lib/cgi-lib.rb
new file mode 100644
index 0000000000..d6b60d66cc
--- /dev/null
+++ b/ruby_1_8_6/lib/cgi-lib.rb
@@ -0,0 +1,272 @@
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: cgi-lib is deprecated after Ruby 1.8.1; use cgi instead"
+
+=begin
+
+= simple CGI support library
+
+= example
+
+== get form values
+
+	require "cgi-lib.rb"
+	query = CGI.new
+	query['field']   # <== value of 'field'
+	query.keys       # <== array of fields
+
+and query has Hash class methods
+
+
+== get cookie values
+
+	require "cgi-lib.rb"
+	query = CGI.new
+	query.cookie['name']  # <== cookie value of 'name'
+	query.cookie.keys     # <== all cookie names
+
+and query.cookie has Hash class methods
+
+
+== print HTTP header and HTML string to $>
+
+	require "cgi-lib.rb"
+	CGI::print{
+	  CGI::tag("HTML"){
+	    CGI::tag("HEAD"){ CGI::tag("TITLE"){"TITLE"} } +
+	    CGI::tag("BODY"){
+	      CGI::tag("FORM", {"ACTION"=>"test.rb", "METHOD"=>"POST"}){
+	        CGI::tag("INPUT", {"TYPE"=>"submit", "VALUE"=>"submit"})
+	      } +
+	      CGI::tag("HR")
+	    }
+	  }
+	}
+
+
+== make raw cookie string
+
+	require "cgi-lib.rb"
+	cookie1 = CGI::cookie({'name'    => 'name',
+	                       'value'   => 'value',
+	                       'path'    => 'path',   # optional
+	                       'domain'  => 'domain', # optional
+	                       'expires' => Time.now, # optional
+	                       'secure'  => true      # optional
+	                      })
+
+	CGI::print("Content-Type: text/html", cookie1, cookie2){ "string" }
+
+
+== print HTTP header and string to $>
+
+	require "cgi-lib.rb"
+	CGI::print{ "string" }
+	  # == CGI::print("Content-Type: text/html"){ "string" }
+	CGI::print("Content-Type: text/html", cookie1, cookie2){ "string" }
+
+
+=== NPH (no-parse-header) mode
+
+	require "cgi-lib.rb"
+	CGI::print("nph"){ "string" }
+	  # == CGI::print("nph", "Content-Type: text/html"){ "string" }
+	CGI::print("nph", "Content-Type: text/html", cookie1, cookie2){ "string" }
+
+
+== make HTML tag string
+
+	require "cgi-lib.rb"
+	CGI::tag("element", {"attribute_name"=>"attribute_value"}){"content"}
+
+
+== make HTTP header string
+
+	require "cgi-lib.rb"
+	CGI::header # == CGI::header("Content-Type: text/html")
+	CGI::header("Content-Type: text/html", cookie1, cookie2)
+
+
+=== NPH (no-parse-header) mode
+
+	CGI::header("nph") # == CGI::header("nph", "Content-Type: text/html")
+	CGI::header("nph", "Content-Type: text/html", cookie1, cookie2)
+
+
+== escape url encode
+
+	require "cgi-lib.rb"
+	url_encoded_string = CGI::escape("string")
+
+
+== unescape url encoded
+
+	require "cgi-lib.rb"
+	string = CGI::unescape("url encoded string")
+
+
+== escape HTML &"<>
+
+	require "cgi-lib.rb"
+	CGI::escapeHTML("string")
+
+
+=end
+
+require "delegate"
+
+class CGI < SimpleDelegator
+
+  CR  = "\015"
+  LF  = "\012"
+  EOL = CR + LF
+
+  RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
+  RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
+
+  # make rfc1123 date string
+  def CGI::rfc1123_date(time)
+    t = time.clone.gmtime
+    return format("%s, %.2d %s %d %.2d:%.2d:%.2d GMT",
+                RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
+                t.hour, t.min, t.sec)
+  end
+
+  # escape url encode
+  def CGI::escape(str)
+    str.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
+  end
+
+  # unescape url encoded
+  def CGI::unescape(str)
+    str.gsub(/\+/, ' ').gsub(/%([0-9a-fA-F]{2})/){ [$1.hex].pack("c") }
+  end
+
+  # escape HTML
+  def CGI::escapeHTML(str)
+    str.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
+  end
+
+  # offline mode. read name=value pairs on standard input.
+  def read_from_cmdline
+    require "shellwords.rb"
+    words = Shellwords.shellwords(
+              if not ARGV.empty?
+                ARGV.join(' ')
+              else
+                STDERR.print "(offline mode: enter name=value pairs on standard input)\n" if STDIN.tty?
+                readlines.join(' ').gsub(/\n/, '')
+              end.gsub(/\\=/, '%3D').gsub(/\\&/, '%26'))
+
+    if words.find{|x| x =~ /=/} then words.join('&') else words.join('+') end
+  end
+
+  def initialize(input = $stdin)
+
+    @inputs = {}
+    @cookie = {}
+
+    case ENV['REQUEST_METHOD']
+    when "GET"
+      ENV['QUERY_STRING'] or ""
+    when "POST"
+      input.read(Integer(ENV['CONTENT_LENGTH'])) or ""
+    else
+      read_from_cmdline
+    end.split(/[&;]/).each do |x|
+      key, val = x.split(/=/,2).collect{|x|CGI::unescape(x)}
+      if @inputs.include?(key)
+        @inputs[key] += "\0" + (val or "")
+      else
+        @inputs[key] = (val or "")
+      end
+    end
+
+    super(@inputs)
+
+    if ENV.has_key?('HTTP_COOKIE') or ENV.has_key?('COOKIE')
+      (ENV['HTTP_COOKIE'] or ENV['COOKIE']).split(/; /).each do |x|
+        key, val = x.split(/=/,2)
+        key = CGI::unescape(key)
+        val = val.split(/&/).collect{|x|CGI::unescape(x)}.join("\0")
+        if @cookie.include?(key)
+          @cookie[key] += "\0" + val
+        else
+          @cookie[key] = val
+        end
+      end
+    end
+  end
+
+  attr("inputs")
+  attr("cookie")
+
+  # make HTML tag string
+  def CGI::tag(element, attributes = {})
+    "<" + escapeHTML(element) + attributes.collect{|name, value|
+      " " + escapeHTML(name) + '="' + escapeHTML(value) + '"'
+    }.to_s + ">" +
+    (iterator? ? yield.to_s + "</" + escapeHTML(element) + ">" : "")
+  end
+
+  # make raw cookie string
+  def CGI::cookie(options)
+    "Set-Cookie: " + options['name'] + '=' + escape(options['value']) +
+    (options['domain']  ? '; domain='  + options['domain'] : '') +
+    (options['path']    ? '; path='    + options['path']   : '') +
+    (options['expires'] ? '; expires=' + rfc1123_date(options['expires']) : '') +
+    (options['secure']  ? '; secure' : '')
+  end
+
+  # make HTTP header string
+  def CGI::header(*options)
+    if defined?(MOD_RUBY)
+      options.each{|option|
+        option.sub(/(.*?): (.*)/){
+          Apache::request.headers_out[$1] = $2
+        }
+      }
+      Apache::request.send_http_header
+      ''
+    else
+      if options.delete("nph") or (ENV['SERVER_SOFTWARE'] =~ /IIS/)
+        [(ENV['SERVER_PROTOCOL'] or "HTTP/1.0") + " 200 OK",
+         "Date: " + rfc1123_date(Time.now),
+         "Server: " + (ENV['SERVER_SOFTWARE'] or ""),
+         "Connection: close"] +
+        (options.empty? ? ["Content-Type: text/html"] : options)
+      else
+        options.empty? ? ["Content-Type: text/html"] : options
+      end.join(EOL) + EOL + EOL
+    end
+  end
+
+  # print HTTP header and string to $>
+  def CGI::print(*options)
+    $>.print CGI::header(*options) + yield.to_s
+  end
+
+  # print message to $>
+  def CGI::message(message, title = "", header = ["Content-Type: text/html"])
+    if message.kind_of?(Hash)
+      title   = message['title']
+      header  = message['header']
+      message = message['body']
+    end
+    CGI::print(*header){
+      CGI::tag("HTML"){
+        CGI::tag("HEAD"){ CGI.tag("TITLE"){ title } } +
+        CGI::tag("BODY"){ message }
+      }
+    }
+    true
+  end
+
+  # print error message to $> and exit
+  def CGI::error
+    CGI::message({'title'=>'ERROR', 'body'=>
+      CGI::tag("PRE"){
+        "ERROR: " + CGI::tag("STRONG"){ escapeHTML($!.to_s) } + "\n" + escapeHTML($@.join("\n"))
+      }
+    })
+    exit
+  end
+end
diff --git a/ruby_1_8_6/lib/cgi.rb b/ruby_1_8_6/lib/cgi.rb
new file mode 100644
index 0000000000..a442d44930
--- /dev/null
+++ b/ruby_1_8_6/lib/cgi.rb
@@ -0,0 +1,2303 @@
+# 
+# cgi.rb - cgi support library
+# 
+# Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+# 
+# Copyright (C) 2000  Information-technology Promotion Agency, Japan
+#
+# Author: Wakou Aoyama <wakou@ruby-lang.org>
+#
+# Documentation: Wakou Aoyama (RDoc'd and embellished by William Webber) 
+# 
+# == Overview
+#
+# The Common Gateway Interface (CGI) is a simple protocol
+# for passing an HTTP request from a web server to a
+# standalone program, and returning the output to the web
+# browser.  Basically, a CGI program is called with the
+# parameters of the request passed in either in the
+# environment (GET) or via $stdin (POST), and everything
+# it prints to $stdout is returned to the client.
+# 
+# This file holds the +CGI+ class.  This class provides
+# functionality for retrieving HTTP request parameters,
+# managing cookies, and generating HTML output.  See the
+# class documentation for more details and examples of use.
+#
+# The file cgi/session.rb provides session management
+# functionality; see that file for more details.
+#
+# See http://www.w3.org/CGI/ for more information on the CGI
+# protocol.
+
+raise "Please, use ruby 1.5.4 or later." if RUBY_VERSION < "1.5.4"
+
+require 'English'
+
+# CGI class.  See documentation for the file cgi.rb for an overview
+# of the CGI protocol.
+#
+# == Introduction
+#
+# CGI is a large class, providing several categories of methods, many of which
+# are mixed in from other modules.  Some of the documentation is in this class,
+# some in the modules CGI::QueryExtension and CGI::HtmlExtension.  See
+# CGI::Cookie for specific information on handling cookies, and cgi/session.rb
+# (CGI::Session) for information on sessions.
+#
+# For queries, CGI provides methods to get at environmental variables,
+# parameters, cookies, and multipart request data.  For responses, CGI provides
+# methods for writing output and generating HTML.
+#
+# Read on for more details.  Examples are provided at the bottom.
+#
+# == Queries
+#
+# The CGI class dynamically mixes in parameter and cookie-parsing
+# functionality,  environmental variable access, and support for
+# parsing multipart requests (including uploaded files) from the
+# CGI::QueryExtension module.
+#
+# === Environmental Variables
+#
+# The standard CGI environmental variables are available as read-only
+# attributes of a CGI object.  The following is a list of these variables:
+#
+#
+#   AUTH_TYPE               HTTP_HOST          REMOTE_IDENT
+#   CONTENT_LENGTH          HTTP_NEGOTIATE     REMOTE_USER
+#   CONTENT_TYPE            HTTP_PRAGMA        REQUEST_METHOD
+#   GATEWAY_INTERFACE       HTTP_REFERER       SCRIPT_NAME
+#   HTTP_ACCEPT             HTTP_USER_AGENT    SERVER_NAME
+#   HTTP_ACCEPT_CHARSET     PATH_INFO          SERVER_PORT
+#   HTTP_ACCEPT_ENCODING    PATH_TRANSLATED    SERVER_PROTOCOL
+#   HTTP_ACCEPT_LANGUAGE    QUERY_STRING       SERVER_SOFTWARE
+#   HTTP_CACHE_CONTROL      REMOTE_ADDR
+#   HTTP_FROM               REMOTE_HOST
+#
+#
+# For each of these variables, there is a corresponding attribute with the
+# same name, except all lower case and without a preceding HTTP_.  
+# +content_length+ and +server_port+ are integers; the rest are strings.
+#
+# === Parameters
+#
+# The method #params() returns a hash of all parameters in the request as
+# name/value-list pairs, where the value-list is an Array of one or more
+# values.  The CGI object itself also behaves as a hash of parameter names 
+# to values, but only returns a single value (as a String) for each 
+# parameter name.
+#
+# For instance, suppose the request contains the parameter 
+# "favourite_colours" with the multiple values "blue" and "green".  The
+# following behaviour would occur:
+#
+#   cgi.params["favourite_colours"]  # => ["blue", "green"]
+#   cgi["favourite_colours"]         # => "blue"
+#
+# If a parameter does not exist, the former method will return an empty
+# array, the latter an empty string.  The simplest way to test for existence
+# of a parameter is by the #has_key? method.
+#
+# === Cookies
+#
+# HTTP Cookies are automatically parsed from the request.  They are available
+# from the #cookies() accessor, which returns a hash from cookie name to
+# CGI::Cookie object.
+#
+# === Multipart requests
+#
+# If a request's method is POST and its content type is multipart/form-data, 
+# then it may contain uploaded files.  These are stored by the QueryExtension
+# module in the parameters of the request.  The parameter name is the name
+# attribute of the file input field, as usual.  However, the value is not
+# a string, but an IO object, either an IOString for small files, or a
+# Tempfile for larger ones.  This object also has the additional singleton
+# methods:
+#
+# #local_path():: the path of the uploaded file on the local filesystem
+# #original_filename():: the name of the file on the client computer
+# #content_type():: the content type of the file
+#
+# == Responses
+#
+# The CGI class provides methods for sending header and content output to
+# the HTTP client, and mixes in methods for programmatic HTML generation
+# from CGI::HtmlExtension and CGI::TagMaker modules.  The precise version of HTML
+# to use for HTML generation is specified at object creation time.
+#
+# === Writing output
+#
+# The simplest way to send output to the HTTP client is using the #out() method.
+# This takes the HTTP headers as a hash parameter, and the body content
+# via a block.  The headers can be generated as a string using the #header()
+# method.  The output stream can be written directly to using the #print()
+# method.
+#
+# === Generating HTML
+#
+# Each HTML element has a corresponding method for generating that
+# element as a String.  The name of this method is the same as that
+# of the element, all lowercase.  The attributes of the element are 
+# passed in as a hash, and the body as a no-argument block that evaluates
+# to a String.  The HTML generation module knows which elements are
+# always empty, and silently drops any passed-in body.  It also knows
+# which elements require matching closing tags and which don't.  However,
+# it does not know what attributes are legal for which elements.
+#
+# There are also some additional HTML generation methods mixed in from
+# the CGI::HtmlExtension module.  These include individual methods for the
+# different types of form inputs, and methods for elements that commonly
+# take particular attributes where the attributes can be directly specified
+# as arguments, rather than via a hash.
+#
+# == Examples of use
+# 
+# === Get form values
+# 
+#   require "cgi"
+#   cgi = CGI.new
+#   value = cgi['field_name']   # <== value string for 'field_name'
+#     # if not 'field_name' included, then return "".
+#   fields = cgi.keys            # <== array of field names
+# 
+#   # returns true if form has 'field_name'
+#   cgi.has_key?('field_name')
+#   cgi.has_key?('field_name')
+#   cgi.include?('field_name')
+# 
+# CAUTION! cgi['field_name'] returned an Array with the old 
+# cgi.rb(included in ruby 1.6)
+# 
+# === Get form values as hash
+# 
+#   require "cgi"
+#   cgi = CGI.new
+#   params = cgi.params
+# 
+# cgi.params is a hash.
+# 
+#   cgi.params['new_field_name'] = ["value"]  # add new param
+#   cgi.params['field_name'] = ["new_value"]  # change value
+#   cgi.params.delete('field_name')           # delete param
+#   cgi.params.clear                          # delete all params
+# 
+# 
+# === Save form values to file
+# 
+#   require "pstore"
+#   db = PStore.new("query.db")
+#   db.transaction do
+#     db["params"] = cgi.params
+#   end
+# 
+# 
+# === Restore form values from file
+# 
+#   require "pstore"
+#   db = PStore.new("query.db")
+#   db.transaction do
+#     cgi.params = db["params"]
+#   end
+# 
+# 
+# === Get multipart form values
+# 
+#   require "cgi"
+#   cgi = CGI.new
+#   value = cgi['field_name']   # <== value string for 'field_name'
+#   value.read                  # <== body of value
+#   value.local_path            # <== path to local file of value
+#   value.original_filename     # <== original filename of value
+#   value.content_type          # <== content_type of value
+# 
+# and value has StringIO or Tempfile class methods.
+# 
+# === Get cookie values
+# 
+#   require "cgi"
+#   cgi = CGI.new
+#   values = cgi.cookies['name']  # <== array of 'name'
+#     # if not 'name' included, then return [].
+#   names = cgi.cookies.keys      # <== array of cookie names
+# 
+# and cgi.cookies is a hash.
+# 
+# === Get cookie objects
+# 
+#   require "cgi"
+#   cgi = CGI.new
+#   for name, cookie in cgi.cookies
+#     cookie.expires = Time.now + 30
+#   end
+#   cgi.out("cookie" => cgi.cookies) {"string"}
+# 
+#   cgi.cookies # { "name1" => cookie1, "name2" => cookie2, ... }
+# 
+#   require "cgi"
+#   cgi = CGI.new
+#   cgi.cookies['name'].expires = Time.now + 30
+#   cgi.out("cookie" => cgi.cookies['name']) {"string"}
+# 
+# === Print http header and html string to $DEFAULT_OUTPUT ($>)
+# 
+#   require "cgi"
+#   cgi = CGI.new("html3")  # add HTML generation methods
+#   cgi.out() do
+#     cgi.html() do
+#       cgi.head{ cgi.title{"TITLE"} } +
+#       cgi.body() do
+#         cgi.form() do
+#           cgi.textarea("get_text") +
+#           cgi.br +
+#           cgi.submit
+#         end +
+#         cgi.pre() do
+#           CGI::escapeHTML(
+#             "params: " + cgi.params.inspect + "\n" +
+#             "cookies: " + cgi.cookies.inspect + "\n" +
+#             ENV.collect() do |key, value|
+#               key + " --> " + value + "\n"
+#             end.join("")
+#           )
+#         end
+#       end
+#     end
+#   end
+# 
+#   # add HTML generation methods
+#   CGI.new("html3")    # html3.2
+#   CGI.new("html4")    # html4.01 (Strict)
+#   CGI.new("html4Tr")  # html4.01 Transitional
+#   CGI.new("html4Fr")  # html4.01 Frameset
+#
+class CGI
+
+  # :stopdoc:
+
+  # String for carriage return
+  CR  = "\015"
+
+  # String for linefeed
+  LF  = "\012"
+
+  # Standard internet newline sequence
+  EOL = CR + LF
+
+  REVISION = '$Id$' #:nodoc:
+
+  NEEDS_BINMODE = true if /WIN/ni.match(RUBY_PLATFORM) 
+
+  # Path separators in different environments.
+  PATH_SEPARATOR = {'UNIX'=>'/', 'WINDOWS'=>'\\', 'MACINTOSH'=>':'}
+
+  # HTTP status codes.
+  HTTP_STATUS = {
+    "OK"                  => "200 OK",
+    "PARTIAL_CONTENT"     => "206 Partial Content",
+    "MULTIPLE_CHOICES"    => "300 Multiple Choices",
+    "MOVED"               => "301 Moved Permanently",
+    "REDIRECT"            => "302 Found",
+    "NOT_MODIFIED"        => "304 Not Modified",
+    "BAD_REQUEST"         => "400 Bad Request",
+    "AUTH_REQUIRED"       => "401 Authorization Required",
+    "FORBIDDEN"           => "403 Forbidden",
+    "NOT_FOUND"           => "404 Not Found",
+    "METHOD_NOT_ALLOWED"  => "405 Method Not Allowed",
+    "NOT_ACCEPTABLE"      => "406 Not Acceptable",
+    "LENGTH_REQUIRED"     => "411 Length Required",
+    "PRECONDITION_FAILED" => "412 Rrecondition Failed",
+    "SERVER_ERROR"        => "500 Internal Server Error",
+    "NOT_IMPLEMENTED"     => "501 Method Not Implemented",
+    "BAD_GATEWAY"         => "502 Bad Gateway",
+    "VARIANT_ALSO_VARIES" => "506 Variant Also Negotiates"
+  }
+
+  # Abbreviated day-of-week names specified by RFC 822
+  RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
+
+  # Abbreviated month names specified by RFC 822
+  RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
+
+  # :startdoc:
+
+  def env_table 
+    ENV
+  end
+
+  def stdinput
+    $stdin
+  end
+
+  def stdoutput
+    $DEFAULT_OUTPUT
+  end
+
+  private :env_table, :stdinput, :stdoutput
+
+  # URL-encode a string.
+  #   url_encoded_string = CGI::escape("'Stop!' said Fred")
+  #      # => "%27Stop%21%27+said+Fred"
+  def CGI::escape(string)
+    string.gsub(/([^ a-zA-Z0-9_.-]+)/n) do
+      '%' + $1.unpack('H2' * $1.size).join('%').upcase
+    end.tr(' ', '+')
+  end
+
+
+  # URL-decode a string.
+  #   string = CGI::unescape("%27Stop%21%27+said+Fred")
+  #      # => "'Stop!' said Fred"
+  def CGI::unescape(string)
+    string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n) do
+      [$1.delete('%')].pack('H*')
+    end
+  end
+
+
+  # Escape special characters in HTML, namely &\"<>
+  #   CGI::escapeHTML('Usage: foo "bar" <baz>')
+  #      # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
+  def CGI::escapeHTML(string)
+    string.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
+  end
+
+
+  # Unescape a string that has been HTML-escaped
+  #   CGI::unescapeHTML("Usage: foo &quot;bar&quot; &lt;baz&gt;")
+  #      # => "Usage: foo \"bar\" <baz>"
+  def CGI::unescapeHTML(string)
+    string.gsub(/&(amp|quot|gt|lt|\#[0-9]+|\#x[0-9A-Fa-f]+);/n) do
+      match = $1.dup
+      case match
+      when 'amp'                 then '&'
+      when 'quot'                then '"'
+      when 'gt'                  then '>'
+      when 'lt'                  then '<'
+      when /\A#0*(\d+)\z/n       then
+        if Integer($1) < 256
+          Integer($1).chr
+        else
+          if Integer($1) < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
+            [Integer($1)].pack("U")
+          else
+            "&##{$1};"
+          end
+        end
+      when /\A#x([0-9a-f]+)\z/ni then
+        if $1.hex < 256
+          $1.hex.chr
+        else
+          if $1.hex < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
+            [$1.hex].pack("U")
+          else
+            "&#x#{$1};"
+          end
+        end
+      else
+        "&#{match};"
+      end
+    end
+  end
+
+
+  # Escape only the tags of certain HTML elements in +string+.
+  #
+  # Takes an element or elements or array of elements.  Each element
+  # is specified by the name of the element, without angle brackets.
+  # This matches both the start and the end tag of that element.
+  # The attribute list of the open tag will also be escaped (for
+  # instance, the double-quotes surrounding attribute values).
+  #
+  #   print CGI::escapeElement('<BR><A HREF="url"></A>', "A", "IMG")
+  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
+  #
+  #   print CGI::escapeElement('<BR><A HREF="url"></A>', ["A", "IMG"])
+  #     # "<BR>&lt;A HREF=&quot;url&quot;&gt;&lt;/A&gt"
+  def CGI::escapeElement(string, *elements)
+    elements = elements[0] if elements[0].kind_of?(Array)
+    unless elements.empty?
+      string.gsub(/<\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?>/ni) do
+        CGI::escapeHTML($&)
+      end
+    else
+      string
+    end
+  end
+
+
+  # Undo escaping such as that done by CGI::escapeElement()
+  #
+  #   print CGI::unescapeElement(
+  #           CGI::escapeHTML('<BR><A HREF="url"></A>'), "A", "IMG")
+  #     # "&lt;BR&gt;<A HREF="url"></A>"
+  # 
+  #   print CGI::unescapeElement(
+  #           CGI::escapeHTML('<BR><A HREF="url"></A>'), ["A", "IMG"])
+  #     # "&lt;BR&gt;<A HREF="url"></A>"
+  def CGI::unescapeElement(string, *elements)
+    elements = elements[0] if elements[0].kind_of?(Array)
+    unless elements.empty?
+      string.gsub(/&lt;\/?(?:#{elements.join("|")})(?!\w)(?:.|\n)*?&gt;/ni) do
+        CGI::unescapeHTML($&)
+      end
+    else
+      string
+    end
+  end
+
+
+  # Format a +Time+ object as a String using the format specified by RFC 1123.
+  #
+  #   CGI::rfc1123_date(Time.now)
+  #     # Sat, 01 Jan 2000 00:00:00 GMT
+  def CGI::rfc1123_date(time)
+    t = time.clone.gmtime
+    return format("%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT",
+                RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
+                t.hour, t.min, t.sec)
+  end
+
+
+  # Create an HTTP header block as a string.
+  #
+  # Includes the empty line that ends the header block.
+  #
+  # +options+ can be a string specifying the Content-Type (defaults
+  # to text/html), or a hash of header key/value pairs.  The following
+  # header keys are recognized:
+  #
+  # type:: the Content-Type header.  Defaults to "text/html"
+  # charset:: the charset of the body, appended to the Content-Type header.
+  # nph:: a boolean value.  If true, prepend protocol string and status code, and
+  #       date; and sets default values for "server" and "connection" if not
+  #       explicitly set.
+  # status:: the HTTP status code, returned as the Status header.  See the
+  #          list of available status codes below.
+  # server:: the server software, returned as the Server header.
+  # connection:: the connection type, returned as the Connection header (for 
+  #              instance, "close".
+  # length:: the length of the content that will be sent, returned as the
+  #          Content-Length header.
+  # language:: the language of the content, returned as the Content-Language
+  #            header.
+  # expires:: the time on which the current content expires, as a +Time+
+  #           object, returned as the Expires header.
+  # cookie:: a cookie or cookies, returned as one or more Set-Cookie headers.
+  #          The value can be the literal string of the cookie; a CGI::Cookie
+  #          object; an Array of literal cookie strings or Cookie objects; or a 
+  #          hash all of whose values are literal cookie strings or Cookie objects.
+  #          These cookies are in addition to the cookies held in the
+  #          @output_cookies field.
+  #
+  # Other header lines can also be set; they are appended as key: value.
+  # 
+  #   header
+  #     # Content-Type: text/html
+  # 
+  #   header("text/plain")
+  #     # Content-Type: text/plain
+  # 
+  #   header("nph"        => true,
+  #          "status"     => "OK",  # == "200 OK"
+  #            # "status"     => "200 GOOD",
+  #          "server"     => ENV['SERVER_SOFTWARE'],
+  #          "connection" => "close",
+  #          "type"       => "text/html",
+  #          "charset"    => "iso-2022-jp",
+  #            # Content-Type: text/html; charset=iso-2022-jp
+  #          "length"     => 103,
+  #          "language"   => "ja",
+  #          "expires"    => Time.now + 30,
+  #          "cookie"     => [cookie1, cookie2],
+  #          "my_header1" => "my_value"
+  #          "my_header2" => "my_value")
+  # 
+  # The status codes are:
+  # 
+  #   "OK"                  --> "200 OK"
+  #   "PARTIAL_CONTENT"     --> "206 Partial Content"
+  #   "MULTIPLE_CHOICES"    --> "300 Multiple Choices"
+  #   "MOVED"               --> "301 Moved Permanently"
+  #   "REDIRECT"            --> "302 Found"
+  #   "NOT_MODIFIED"        --> "304 Not Modified"
+  #   "BAD_REQUEST"         --> "400 Bad Request"
+  #   "AUTH_REQUIRED"       --> "401 Authorization Required"
+  #   "FORBIDDEN"           --> "403 Forbidden"
+  #   "NOT_FOUND"           --> "404 Not Found"
+  #   "METHOD_NOT_ALLOWED"  --> "405 Method Not Allowed"
+  #   "NOT_ACCEPTABLE"      --> "406 Not Acceptable"
+  #   "LENGTH_REQUIRED"     --> "411 Length Required"
+  #   "PRECONDITION_FAILED" --> "412 Precondition Failed"
+  #   "SERVER_ERROR"        --> "500 Internal Server Error"
+  #   "NOT_IMPLEMENTED"     --> "501 Method Not Implemented"
+  #   "BAD_GATEWAY"         --> "502 Bad Gateway"
+  #   "VARIANT_ALSO_VARIES" --> "506 Variant Also Negotiates"
+  # 
+  # This method does not perform charset conversion. 
+  #
+  def header(options = "text/html")
+
+    buf = ""
+
+    case options
+    when String
+      options = { "type" => options }
+    when Hash
+      options = options.dup
+    end
+
+    unless options.has_key?("type")
+      options["type"] = "text/html"
+    end
+
+    if options.has_key?("charset")
+      options["type"] += "; charset=" + options.delete("charset")
+    end
+
+    options.delete("nph") if defined?(MOD_RUBY)
+    if options.delete("nph") or
+        (/IIS\/(\d+)/n.match(env_table['SERVER_SOFTWARE']) and $1.to_i < 5)
+      buf += (env_table["SERVER_PROTOCOL"] or "HTTP/1.0")  + " " +
+             (HTTP_STATUS[options["status"]] or options["status"] or "200 OK") +
+             EOL +
+             "Date: " + CGI::rfc1123_date(Time.now) + EOL
+
+      unless options.has_key?("server")
+        options["server"] = (env_table['SERVER_SOFTWARE'] or "")
+      end
+
+      unless options.has_key?("connection")
+        options["connection"] = "close"
+      end
+
+      options.delete("status")
+    end
+
+    if options.has_key?("status")
+      buf += "Status: " +
+             (HTTP_STATUS[options["status"]] or options["status"]) + EOL
+      options.delete("status")
+    end
+
+    if options.has_key?("server")
+      buf += "Server: " + options.delete("server") + EOL
+    end
+
+    if options.has_key?("connection")
+      buf += "Connection: " + options.delete("connection") + EOL
+    end
+
+    buf += "Content-Type: " + options.delete("type") + EOL
+
+    if options.has_key?("length")
+      buf += "Content-Length: " + options.delete("length").to_s + EOL
+    end
+
+    if options.has_key?("language")
+      buf += "Content-Language: " + options.delete("language") + EOL
+    end
+
+    if options.has_key?("expires")
+      buf += "Expires: " + CGI::rfc1123_date( options.delete("expires") ) + EOL
+    end
+
+    if options.has_key?("cookie")
+      if options["cookie"].kind_of?(String) or
+           options["cookie"].kind_of?(Cookie)
+        buf += "Set-Cookie: " + options.delete("cookie").to_s + EOL
+      elsif options["cookie"].kind_of?(Array)
+        options.delete("cookie").each{|cookie|
+          buf += "Set-Cookie: " + cookie.to_s + EOL
+        }
+      elsif options["cookie"].kind_of?(Hash)
+        options.delete("cookie").each_value{|cookie|
+          buf += "Set-Cookie: " + cookie.to_s + EOL
+        }
+      end
+    end
+    if @output_cookies
+      for cookie in @output_cookies
+        buf += "Set-Cookie: " + cookie.to_s + EOL
+      end
+    end
+
+    options.each{|key, value|
+      buf += key + ": " + value.to_s + EOL
+    }
+
+    if defined?(MOD_RUBY)
+      table = Apache::request.headers_out
+      buf.scan(/([^:]+): (.+)#{EOL}/n){ |name, value|
+        warn sprintf("name:%s value:%s\n", name, value) if $DEBUG
+        case name
+        when 'Set-Cookie'
+          table.add(name, value)
+        when /^status$/ni
+          Apache::request.status_line = value
+          Apache::request.status = value.to_i
+        when /^content-type$/ni
+          Apache::request.content_type = value
+        when /^content-encoding$/ni
+          Apache::request.content_encoding = value
+        when /^location$/ni
+	  if Apache::request.status == 200
+	    Apache::request.status = 302
+	  end
+          Apache::request.headers_out[name] = value
+        else
+          Apache::request.headers_out[name] = value
+        end
+      }
+      Apache::request.send_http_header
+      ''
+    else
+      buf + EOL
+    end
+
+  end # header()
+
+
+  # Print an HTTP header and body to $DEFAULT_OUTPUT ($>)
+  #
+  # The header is provided by +options+, as for #header().
+  # The body of the document is that returned by the passed-
+  # in block.  This block takes no arguments.  It is required.
+  #
+  #   cgi = CGI.new
+  #   cgi.out{ "string" }
+  #     # Content-Type: text/html
+  #     # Content-Length: 6
+  #     #
+  #     # string
+  # 
+  #   cgi.out("text/plain") { "string" }
+  #     # Content-Type: text/plain
+  #     # Content-Length: 6
+  #     #
+  #     # string
+  # 
+  #   cgi.out("nph"        => true,
+  #           "status"     => "OK",  # == "200 OK"
+  #           "server"     => ENV['SERVER_SOFTWARE'],
+  #           "connection" => "close",
+  #           "type"       => "text/html",
+  #           "charset"    => "iso-2022-jp",
+  #             # Content-Type: text/html; charset=iso-2022-jp
+  #           "language"   => "ja",
+  #           "expires"    => Time.now + (3600 * 24 * 30),
+  #           "cookie"     => [cookie1, cookie2],
+  #           "my_header1" => "my_value",
+  #           "my_header2" => "my_value") { "string" }
+  # 
+  # Content-Length is automatically calculated from the size of
+  # the String returned by the content block.
+  #
+  # If ENV['REQUEST_METHOD'] == "HEAD", then only the header
+  # is outputted (the content block is still required, but it
+  # is ignored).
+  # 
+  # If the charset is "iso-2022-jp" or "euc-jp" or "shift_jis" then
+  # the content is converted to this charset, and the language is set 
+  # to "ja".
+  def out(options = "text/html") # :yield:
+
+    options = { "type" => options } if options.kind_of?(String)
+    content = yield
+
+    if options.has_key?("charset")
+      require "nkf"
+      case options["charset"]
+      when /iso-2022-jp/ni
+        content = NKF::nkf('-m0 -x -j', content)
+        options["language"] = "ja" unless options.has_key?("language")
+      when /euc-jp/ni
+        content = NKF::nkf('-m0 -x -e', content)
+        options["language"] = "ja" unless options.has_key?("language")
+      when /shift_jis/ni
+        content = NKF::nkf('-m0 -x -s', content)
+        options["language"] = "ja" unless options.has_key?("language")
+      end
+    end
+
+    options["length"] = content.length.to_s
+    output = stdoutput
+    output.binmode if defined? output.binmode
+    output.print header(options)
+    output.print content unless "HEAD" == env_table['REQUEST_METHOD']
+  end
+
+
+  # Print an argument or list of arguments to the default output stream
+  #
+  #   cgi = CGI.new
+  #   cgi.print    # default:  cgi.print == $DEFAULT_OUTPUT.print
+  def print(*options)
+    stdoutput.print(*options)
+  end
+
+  require "delegate"
+
+  # Class representing an HTTP cookie.
+  #
+  # In addition to its specific fields and methods, a Cookie instance
+  # is a delegator to the array of its values.
+  #
+  # See RFC 2965.
+  #
+  # == Examples of use
+  #   cookie1 = CGI::Cookie::new("name", "value1", "value2", ...)
+  #   cookie1 = CGI::Cookie::new("name" => "name", "value" => "value")
+  #   cookie1 = CGI::Cookie::new('name'    => 'name',
+  #                              'value'   => ['value1', 'value2', ...],
+  #                              'path'    => 'path',   # optional
+  #                              'domain'  => 'domain', # optional
+  #                              'expires' => Time.now, # optional
+  #                              'secure'  => true      # optional
+  #                             )
+  # 
+  #   cgi.out("cookie" => [cookie1, cookie2]) { "string" }
+  # 
+  #   name    = cookie1.name
+  #   values  = cookie1.value
+  #   path    = cookie1.path
+  #   domain  = cookie1.domain
+  #   expires = cookie1.expires
+  #   secure  = cookie1.secure
+  # 
+  #   cookie1.name    = 'name'
+  #   cookie1.value   = ['value1', 'value2', ...]
+  #   cookie1.path    = 'path'
+  #   cookie1.domain  = 'domain'
+  #   cookie1.expires = Time.now + 30
+  #   cookie1.secure  = true
+  class Cookie < DelegateClass(Array)
+
+    # Create a new CGI::Cookie object.
+    #
+    # The contents of the cookie can be specified as a +name+ and one
+    # or more +value+ arguments.  Alternatively, the contents can
+    # be specified as a single hash argument.  The possible keywords of
+    # this hash are as follows:
+    #
+    # name:: the name of the cookie.  Required.
+    # value:: the cookie's value or list of values.
+    # path:: the path for which this cookie applies.  Defaults to the
+    #        base directory of the CGI script.
+    # domain:: the domain for which this cookie applies.
+    # expires:: the time at which this cookie expires, as a +Time+ object.
+    # secure:: whether this cookie is a secure cookie or not (default to
+    #          false).  Secure cookies are only transmitted to HTTPS 
+    #          servers.
+    #
+    # These keywords correspond to attributes of the cookie object.
+    def initialize(name = "", *value)
+      options = if name.kind_of?(String)
+                  { "name" => name, "value" => value }
+                else
+                  name
+                end
+      unless options.has_key?("name")
+        raise ArgumentError, "`name' required"
+      end
+
+      @name = options["name"]
+      @value = Array(options["value"])
+      # simple support for IE
+      if options["path"]
+        @path = options["path"]
+      else
+        %r|^(.*/)|.match(ENV["SCRIPT_NAME"])
+        @path = ($1 or "")
+      end
+      @domain = options["domain"]
+      @expires = options["expires"]
+      @secure = options["secure"] == true ? true : false
+
+      super(@value)
+    end
+
+    attr_accessor("name", "value", "path", "domain", "expires")
+    attr_reader("secure")
+
+    # Set whether the Cookie is a secure cookie or not.
+    #
+    # +val+ must be a boolean.
+    def secure=(val)
+      @secure = val if val == true or val == false
+      @secure
+    end
+
+    # Convert the Cookie to its string representation.
+    def to_s
+      buf = ""
+      buf += @name + '='
+
+      if @value.kind_of?(String)
+        buf += CGI::escape(@value)
+      else
+        buf += @value.collect{|v| CGI::escape(v) }.join("&")
+      end
+
+      if @domain
+        buf += '; domain=' + @domain
+      end
+
+      if @path
+        buf += '; path=' + @path
+      end
+
+      if @expires
+        buf += '; expires=' + CGI::rfc1123_date(@expires)
+      end
+
+      if @secure == true
+        buf += '; secure'
+      end
+
+      buf
+    end
+
+  end # class Cookie
+
+
+  # Parse a raw cookie string into a hash of cookie-name=>Cookie
+  # pairs.
+  #
+  #   cookies = CGI::Cookie::parse("raw_cookie_string")
+  #     # { "name1" => cookie1, "name2" => cookie2, ... }
+  #
+  def Cookie::parse(raw_cookie)
+    cookies = Hash.new([])
+    return cookies unless raw_cookie
+
+    raw_cookie.split(/[;,]\s?/).each do |pairs|
+      name, values = pairs.split('=',2)
+      next unless name and values
+      name = CGI::unescape(name)
+      values ||= ""
+      values = values.split('&').collect{|v| CGI::unescape(v) }
+      if cookies.has_key?(name)
+        values = cookies[name].value + values
+      end
+      cookies[name] = Cookie::new({ "name" => name, "value" => values })
+    end
+
+    cookies
+  end
+
+  # Parse an HTTP query string into a hash of key=>value pairs.
+  #
+  #   params = CGI::parse("query_string")
+  #     # {"name1" => ["value1", "value2", ...],
+  #     #  "name2" => ["value1", "value2", ...], ... }
+  #
+  def CGI::parse(query)
+    params = Hash.new([].freeze)
+
+    query.split(/[&;]/n).each do |pairs|
+      key, value = pairs.split('=',2).collect{|v| CGI::unescape(v) }
+      if params.has_key?(key)
+        params[key].push(value)
+      else
+        params[key] = [value]
+      end
+    end
+
+    params
+  end
+
+  # Mixin module. It provides the follow functionality groups:
+  #
+  # 1. Access to CGI environment variables as methods.  See 
+  #    documentation to the CGI class for a list of these variables.
+  #
+  # 2. Access to cookies, including the cookies attribute.
+  #
+  # 3. Access to parameters, including the params attribute, and overloading
+  #    [] to perform parameter value lookup by key.
+  #
+  # 4. The initialize_query method, for initialising the above
+  #    mechanisms, handling multipart forms, and allowing the
+  #    class to be used in "offline" mode.
+  #
+  module QueryExtension
+
+    %w[ CONTENT_LENGTH SERVER_PORT ].each do |env|
+      define_method(env.sub(/^HTTP_/n, '').downcase) do
+        (val = env_table[env]) && Integer(val)
+      end
+    end
+
+    %w[ AUTH_TYPE CONTENT_TYPE GATEWAY_INTERFACE PATH_INFO
+        PATH_TRANSLATED QUERY_STRING REMOTE_ADDR REMOTE_HOST
+        REMOTE_IDENT REMOTE_USER REQUEST_METHOD SCRIPT_NAME
+        SERVER_NAME SERVER_PROTOCOL SERVER_SOFTWARE
+
+        HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
+        HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
+        HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT ].each do |env|
+      define_method(env.sub(/^HTTP_/n, '').downcase) do
+        env_table[env]
+      end
+    end
+
+    # Get the raw cookies as a string.
+    def raw_cookie
+      env_table["HTTP_COOKIE"]
+    end
+
+    # Get the raw RFC2965 cookies as a string.
+    def raw_cookie2
+      env_table["HTTP_COOKIE2"]
+    end
+
+    # Get the cookies as a hash of cookie-name=>Cookie pairs.
+    attr_accessor("cookies")
+
+    # Get the parameters as a hash of name=>values pairs, where
+    # values is an Array.
+    attr("params")
+
+    # Set all the parameters.
+    def params=(hash)
+      @params.clear
+      @params.update(hash)
+    end
+
+    def read_multipart(boundary, content_length)
+      params = Hash.new([])
+      boundary = "--" + boundary
+      quoted_boundary = Regexp.quote(boundary, "n")
+      buf = ""
+      bufsize = 10 * 1024
+      boundary_end=""
+
+      # start multipart/form-data
+      stdinput.binmode if defined? stdinput.binmode
+      boundary_size = boundary.size + EOL.size
+      content_length -= boundary_size
+      status = stdinput.read(boundary_size)
+      if nil == status
+        raise EOFError, "no content body"
+      elsif boundary + EOL != status
+        raise EOFError, "bad content body"
+      end
+
+      loop do
+        head = nil
+        if 10240 < content_length
+          require "tempfile"
+          body = Tempfile.new("CGI")
+        else
+          begin
+            require "stringio"
+            body = StringIO.new
+          rescue LoadError
+            require "tempfile"
+            body = Tempfile.new("CGI")
+          end
+        end
+        body.binmode if defined? body.binmode
+
+        until head and /#{quoted_boundary}(?:#{EOL}|--)/n.match(buf)
+
+          if (not head) and /#{EOL}#{EOL}/n.match(buf)
+            buf = buf.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do
+              head = $1.dup
+              ""
+            end
+            next
+          end
+
+          if head and ( (EOL + boundary + EOL).size < buf.size )
+            body.print buf[0 ... (buf.size - (EOL + boundary + EOL).size)]
+            buf[0 ... (buf.size - (EOL + boundary + EOL).size)] = ""
+          end
+
+          c = if bufsize < content_length
+                stdinput.read(bufsize)
+              else
+                stdinput.read(content_length)
+              end
+          if c.nil? || c.empty?
+            raise EOFError, "bad content body"
+          end
+          buf.concat(c)
+          content_length -= c.size
+        end
+
+        buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{quoted_boundary}([\r\n]{1,2}|--)/n) do
+          body.print $1
+          if "--" == $2
+            content_length = -1
+          end
+         boundary_end = $2.dup
+          ""
+        end
+
+        body.rewind
+
+        /Content-Disposition:.* filename=(?:"((?:\\.|[^\"])*)"|([^;]*))/ni.match(head)
+	filename = ($1 or $2 or "")
+	if /Mac/ni.match(env_table['HTTP_USER_AGENT']) and
+	    /Mozilla/ni.match(env_table['HTTP_USER_AGENT']) and
+	    (not /MSIE/ni.match(env_table['HTTP_USER_AGENT']))
+	  filename = CGI::unescape(filename)
+	end
+        
+        /Content-Type: (.*)/ni.match(head)
+        content_type = ($1 or "")
+
+        (class << body; self; end).class_eval do
+          alias local_path path
+          define_method(:original_filename) {filename.dup.taint}
+          define_method(:content_type) {content_type.dup.taint}
+        end
+
+        /Content-Disposition:.* name="?([^\";]*)"?/ni.match(head)
+        name = $1.dup
+
+        if params.has_key?(name)
+          params[name].push(body)
+        else
+          params[name] = [body]
+        end
+        break if buf.size == 0
+        break if content_length == -1
+      end
+      raise EOFError, "bad boundary end of body part" unless boundary_end=~/--/
+
+      params
+    end # read_multipart
+    private :read_multipart
+
+    # offline mode. read name=value pairs on standard input.
+    def read_from_cmdline
+      require "shellwords"
+
+      string = unless ARGV.empty?
+        ARGV.join(' ')
+      else
+        if STDIN.tty?
+          STDERR.print(
+            %|(offline mode: enter name=value pairs on standard input)\n|
+          )
+        end
+        readlines.join(' ').gsub(/\n/n, '')
+      end.gsub(/\\=/n, '%3D').gsub(/\\&/n, '%26')
+
+      words = Shellwords.shellwords(string)
+
+      if words.find{|x| /=/n.match(x) }
+        words.join('&')
+      else
+        words.join('+')
+      end
+    end
+    private :read_from_cmdline
+
+    # Initialize the data from the query.
+    #
+    # Handles multipart forms (in particular, forms that involve file uploads).
+    # Reads query parameters in the @params field, and cookies into @cookies.
+    def initialize_query()
+      if ("POST" == env_table['REQUEST_METHOD']) and
+         %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n.match(env_table['CONTENT_TYPE'])
+        boundary = $1.dup
+        @multipart = true
+        @params = read_multipart(boundary, Integer(env_table['CONTENT_LENGTH']))
+      else
+        @multipart = false
+        @params = CGI::parse(
+                    case env_table['REQUEST_METHOD']
+                    when "GET", "HEAD"
+                      if defined?(MOD_RUBY)
+                        Apache::request.args or ""
+                      else
+                        env_table['QUERY_STRING'] or ""
+                      end
+                    when "POST"
+                      stdinput.binmode if defined? stdinput.binmode
+                      stdinput.read(Integer(env_table['CONTENT_LENGTH'])) or ''
+                    else
+                      read_from_cmdline
+                    end
+                  )
+      end
+
+      @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] or env_table['COOKIE']))
+    end
+    private :initialize_query
+
+    def multipart?
+      @multipart
+    end
+
+    module Value    # :nodoc:
+      def set_params(params)
+        @params = params
+      end
+      def [](idx, *args)
+        if args.size == 0
+          warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']"
+          @params[idx]
+        else
+          super[idx,*args]
+        end
+      end
+      def first
+        warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']"
+        self
+      end
+      alias last first
+      def to_a
+        @params || [self]
+      end
+      alias to_ary to_a   	# to be rhs of multiple assignment
+    end
+
+    # Get the value for the parameter with a given key.
+    #
+    # If the parameter has multiple values, only the first will be 
+    # retrieved; use #params() to get the array of values.
+    def [](key)
+      params = @params[key]
+      return '' unless params
+      value = params[0]
+      if @multipart
+        if value
+          return value
+        elsif defined? StringIO
+          StringIO.new("")
+        else
+          Tempfile.new("CGI")
+        end
+      else
+        str = if value then value.dup else "" end
+        str.extend(Value)
+        str.set_params(params)
+        str
+      end
+    end
+
+    # Return all parameter keys as an array.
+    def keys(*args)
+      @params.keys(*args)
+    end
+
+    # Returns true if a given parameter key exists in the query.
+    def has_key?(*args)
+      @params.has_key?(*args)
+    end
+    alias key? has_key?
+    alias include? has_key?
+
+  end # QueryExtension
+
+
+  # Prettify (indent) an HTML string.
+  #
+  # +string+ is the HTML string to indent.  +shift+ is the indentation
+  # unit to use; it defaults to two spaces.
+  #
+  #   print CGI::pretty("<HTML><BODY></BODY></HTML>")
+  #     # <HTML>
+  #     #   <BODY>
+  #     #   </BODY>
+  #     # </HTML>
+  # 
+  #   print CGI::pretty("<HTML><BODY></BODY></HTML>", "\t")
+  #     # <HTML>
+  #     #         <BODY>
+  #     #         </BODY>
+  #     # </HTML>
+  #
+  def CGI::pretty(string, shift = "  ")
+    lines = string.gsub(/(?!\A)<(?:.|\n)*?>/n, "\n\\0").gsub(/<(?:.|\n)*?>(?!\n)/n, "\\0\n")
+    end_pos = 0
+    while end_pos = lines.index(/^<\/(\w+)/n, end_pos)
+      element = $1.dup
+      start_pos = lines.rindex(/^\s*<#{element}/ni, end_pos)
+      lines[start_pos ... end_pos] = "__" + lines[start_pos ... end_pos].gsub(/\n(?!\z)/n, "\n" + shift) + "__"
+    end
+    lines.gsub(/^((?:#{Regexp::quote(shift)})*)__(?=<\/?\w)/n, '\1')
+  end
+
+
+  # Base module for HTML-generation mixins.
+  #
+  # Provides methods for code generation for tags following
+  # the various DTD element types.
+  module TagMaker # :nodoc:
+
+    # Generate code for an element with required start and end tags.
+    #
+    #   - -
+    def nn_element_def(element)
+      nOE_element_def(element, <<-END)
+          if block_given?
+            yield.to_s
+          else
+            ""
+          end +
+          "</#{element.upcase}>"
+      END
+    end
+
+    # Generate code for an empty element.
+    #
+    #   - O EMPTY
+    def nOE_element_def(element, append = nil)
+      s = <<-END
+          "<#{element.upcase}" + attributes.collect{|name, value|
+            next unless value
+            " " + CGI::escapeHTML(name) +
+            if true == value
+              ""
+            else
+              '="' + CGI::escapeHTML(value) + '"'
+            end
+          }.to_s + ">"
+      END
+      s.sub!(/\Z/, " +") << append if append
+      s
+    end
+
+    # Generate code for an element for which the end (and possibly the
+    # start) tag is optional.
+    #
+    #   O O or - O
+    def nO_element_def(element)
+      nOE_element_def(element, <<-END)
+          if block_given?
+            yield.to_s + "</#{element.upcase}>"
+          else
+            ""
+          end
+      END
+    end
+
+  end # TagMaker
+
+
+  #
+  # Mixin module providing HTML generation methods.
+  #
+  # For example,
+  #   cgi.a("http://www.example.com") { "Example" }
+  #     # => "<A HREF=\"http://www.example.com\">Example</A>"
+  #
+  # Modules Http3, Http4, etc., contain more basic HTML-generation methods
+  # (:title, :center, etc.).
+  #
+  # See class CGI for a detailed example. 
+  #
+  module HtmlExtension
+
+
+    # Generate an Anchor element as a string.
+    #
+    # +href+ can either be a string, giving the URL
+    # for the HREF attribute, or it can be a hash of
+    # the element's attributes.
+    #
+    # The body of the element is the string returned by the no-argument
+    # block passed in.
+    #
+    #   a("http://www.example.com") { "Example" }
+    #     # => "<A HREF=\"http://www.example.com\">Example</A>"
+    #
+    #   a("HREF" => "http://www.example.com", "TARGET" => "_top") { "Example" }
+    #     # => "<A HREF=\"http://www.example.com\" TARGET=\"_top\">Example</A>"
+    #
+    def a(href = "") # :yield:
+      attributes = if href.kind_of?(String)
+                     { "HREF" => href }
+                   else
+                     href
+                   end
+      if block_given?
+        super(attributes){ yield }
+      else
+        super(attributes)
+      end
+    end
+
+    # Generate a Document Base URI element as a String. 
+    #
+    # +href+ can either by a string, giving the base URL for the HREF
+    # attribute, or it can be a has of the element's attributes.
+    #
+    # The passed-in no-argument block is ignored.
+    #
+    #   base("http://www.example.com/cgi")
+    #     # => "<BASE HREF=\"http://www.example.com/cgi\">"
+    def base(href = "") # :yield:
+      attributes = if href.kind_of?(String)
+                     { "HREF" => href }
+                   else
+                     href
+                   end
+      if block_given?
+        super(attributes){ yield }
+      else
+        super(attributes)
+      end
+    end
+
+    # Generate a BlockQuote element as a string.
+    #
+    # +cite+ can either be a string, give the URI for the source of
+    # the quoted text, or a hash, giving all attributes of the element,
+    # or it can be omitted, in which case the element has no attributes.
+    #
+    # The body is provided by the passed-in no-argument block
+    #
+    #   blockquote("http://www.example.com/quotes/foo.html") { "Foo!" }
+    #     #=> "<BLOCKQUOTE CITE=\"http://www.example.com/quotes/foo.html\">Foo!</BLOCKQUOTE>
+    def blockquote(cite = nil)  # :yield:
+      attributes = if cite.kind_of?(String)
+                     { "CITE" => cite }
+                   else
+                     cite or ""
+                   end
+      if block_given?
+        super(attributes){ yield }
+      else
+        super(attributes)
+      end
+    end
+
+
+    # Generate a Table Caption element as a string.
+    #
+    # +align+ can be a string, giving the alignment of the caption
+    # (one of top, bottom, left, or right).  It can be a hash of
+    # all the attributes of the element.  Or it can be omitted.
+    #
+    # The body of the element is provided by the passed-in no-argument block.
+    #
+    #   caption("left") { "Capital Cities" }
+    #     # => <CAPTION ALIGN=\"left\">Capital Cities</CAPTION>
+    def caption(align = nil) # :yield:
+      attributes = if align.kind_of?(String)
+                     { "ALIGN" => align }
+                   else
+                     align or ""
+                   end
+      if block_given?
+        super(attributes){ yield }
+      else
+        super(attributes)
+      end
+    end
+
+
+    # Generate a Checkbox Input element as a string.
+    #
+    # The attributes of the element can be specified as three arguments,
+    # +name+, +value+, and +checked+.  +checked+ is a boolean value;
+    # if true, the CHECKED attribute will be included in the element.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   checkbox("name")
+    #     # = checkbox("NAME" => "name")
+    # 
+    #   checkbox("name", "value")
+    #     # = checkbox("NAME" => "name", "VALUE" => "value")
+    # 
+    #   checkbox("name", "value", true)
+    #     # = checkbox("NAME" => "name", "VALUE" => "value", "CHECKED" => true)
+    def checkbox(name = "", value = nil, checked = nil)
+      attributes = if name.kind_of?(String)
+                     { "TYPE" => "checkbox", "NAME" => name,
+                       "VALUE" => value, "CHECKED" => checked }
+                   else
+                     name["TYPE"] = "checkbox"
+                     name
+                   end
+      input(attributes)
+    end
+
+    # Generate a sequence of checkbox elements, as a String.
+    #
+    # The checkboxes will all have the same +name+ attribute.
+    # Each checkbox is followed by a label.
+    # There will be one checkbox for each value.  Each value
+    # can be specified as a String, which will be used both
+    # as the value of the VALUE attribute and as the label
+    # for that checkbox.  A single-element array has the
+    # same effect.
+    #
+    # Each value can also be specified as a three-element array.
+    # The first element is the VALUE attribute; the second is the
+    # label; and the third is a boolean specifying whether this
+    # checkbox is CHECKED.
+    #
+    # Each value can also be specified as a two-element
+    # array, by omitting either the value element (defaults
+    # to the same as the label), or the boolean checked element
+    # (defaults to false).
+    #
+    #   checkbox_group("name", "foo", "bar", "baz")
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="bar">bar
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
+    # 
+    #   checkbox_group("name", ["foo"], ["bar", true], "baz")
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="foo">foo
+    #     # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="bar">bar
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="baz">baz
+    # 
+    #   checkbox_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="1">Foo
+    #     # <INPUT TYPE="checkbox" CHECKED NAME="name" VALUE="2">Bar
+    #     # <INPUT TYPE="checkbox" NAME="name" VALUE="Baz">Baz
+    # 
+    #   checkbox_group("NAME" => "name",
+    #                    "VALUES" => ["foo", "bar", "baz"])
+    # 
+    #   checkbox_group("NAME" => "name",
+    #                    "VALUES" => [["foo"], ["bar", true], "baz"])
+    # 
+    #   checkbox_group("NAME" => "name",
+    #                    "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
+    def checkbox_group(name = "", *values)
+      if name.kind_of?(Hash)
+        values = name["VALUES"]
+        name = name["NAME"]
+      end
+      values.collect{|value|
+        if value.kind_of?(String)
+          checkbox(name, value) + value
+        else
+          if value[value.size - 1] == true
+            checkbox(name, value[0], true) +
+            value[value.size - 2]
+          else
+            checkbox(name, value[0]) +
+            value[value.size - 1]
+          end
+        end
+      }.to_s
+    end
+
+
+    # Generate an File Upload Input element as a string.
+    #
+    # The attributes of the element can be specified as three arguments,
+    # +name+, +size+, and +maxlength+.  +maxlength+ is the maximum length
+    # of the file's _name_, not of the file's _contents_.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    # See #multipart_form() for forms that include file uploads.
+    #
+    #   file_field("name")
+    #     # <INPUT TYPE="file" NAME="name" SIZE="20">
+    # 
+    #   file_field("name", 40)
+    #     # <INPUT TYPE="file" NAME="name" SIZE="40">
+    # 
+    #   file_field("name", 40, 100)
+    #     # <INPUT TYPE="file" NAME="name" SIZE="40" MAXLENGTH="100">
+    # 
+    #   file_field("NAME" => "name", "SIZE" => 40)
+    #     # <INPUT TYPE="file" NAME="name" SIZE="40">
+    def file_field(name = "", size = 20, maxlength = nil)
+      attributes = if name.kind_of?(String)
+                     { "TYPE" => "file", "NAME" => name,
+                       "SIZE" => size.to_s }
+                   else
+                     name["TYPE"] = "file"
+                     name
+                   end
+      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
+      input(attributes)
+    end
+
+
+    # Generate a Form element as a string.
+    #
+    # +method+ should be either "get" or "post", and defaults to the latter.
+    # +action+ defaults to the current CGI script name.  +enctype+
+    # defaults to "application/x-www-form-urlencoded".  
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    # See also #multipart_form() for forms that include file uploads.
+    #
+    #   form{ "string" }
+    #     # <FORM METHOD="post" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
+    # 
+    #   form("get") { "string" }
+    #     # <FORM METHOD="get" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
+    # 
+    #   form("get", "url") { "string" }
+    #     # <FORM METHOD="get" ACTION="url" ENCTYPE="application/x-www-form-urlencoded">string</FORM>
+    # 
+    #   form("METHOD" => "post", "ENCTYPE" => "enctype") { "string" }
+    #     # <FORM METHOD="post" ENCTYPE="enctype">string</FORM>
+    def form(method = "post", action = script_name, enctype = "application/x-www-form-urlencoded")
+      attributes = if method.kind_of?(String)
+                     { "METHOD" => method, "ACTION" => action,
+                       "ENCTYPE" => enctype } 
+                   else
+                     unless method.has_key?("METHOD")
+                       method["METHOD"] = "post"
+                     end
+                     unless method.has_key?("ENCTYPE")
+                       method["ENCTYPE"] = enctype
+                     end
+                     method
+                   end
+      if block_given?
+        body = yield
+      else
+        body = ""
+      end
+      if @output_hidden
+        body += @output_hidden.collect{|k,v|
+          "<INPUT TYPE=\"HIDDEN\" NAME=\"#{k}\" VALUE=\"#{v}\">"
+        }.to_s
+      end
+      super(attributes){body}
+    end
+
+    # Generate a Hidden Input element as a string.
+    #
+    # The attributes of the element can be specified as two arguments,
+    # +name+ and +value+.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   hidden("name")
+    #     # <INPUT TYPE="hidden" NAME="name">
+    # 
+    #   hidden("name", "value")
+    #     # <INPUT TYPE="hidden" NAME="name" VALUE="value">
+    # 
+    #   hidden("NAME" => "name", "VALUE" => "reset", "ID" => "foo")
+    #     # <INPUT TYPE="hidden" NAME="name" VALUE="value" ID="foo">
+    def hidden(name = "", value = nil)
+      attributes = if name.kind_of?(String)
+                     { "TYPE" => "hidden", "NAME" => name, "VALUE" => value }
+                   else
+                     name["TYPE"] = "hidden"
+                     name
+                   end
+      input(attributes)
+    end
+
+    # Generate a top-level HTML element as a string.
+    #
+    # The attributes of the element are specified as a hash.  The
+    # pseudo-attribute "PRETTY" can be used to specify that the generated
+    # HTML string should be indented.  "PRETTY" can also be specified as
+    # a string as the sole argument to this method.  The pseudo-attribute
+    # "DOCTYPE", if given, is used as the leading DOCTYPE SGML tag; it
+    # should include the entire text of this tag, including angle brackets.
+    #
+    # The body of the html element is supplied as a block.
+    # 
+    #   html{ "string" }
+    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML>string</HTML>
+    # 
+    #   html("LANG" => "ja") { "string" }
+    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><HTML LANG="ja">string</HTML>
+    # 
+    #   html("DOCTYPE" => false) { "string" }
+    #     # <HTML>string</HTML>
+    # 
+    #   html("DOCTYPE" => '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">') { "string" }
+    #     # <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><HTML>string</HTML>
+    # 
+    #   html("PRETTY" => "  ") { "<BODY></BODY>" }
+    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+    #     # <HTML>
+    #     #   <BODY>
+    #     #   </BODY>
+    #     # </HTML>
+    # 
+    #   html("PRETTY" => "\t") { "<BODY></BODY>" }
+    #     # <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+    #     # <HTML>
+    #     #         <BODY>
+    #     #         </BODY>
+    #     # </HTML>
+    # 
+    #   html("PRETTY") { "<BODY></BODY>" }
+    #     # = html("PRETTY" => "  ") { "<BODY></BODY>" }
+    # 
+    #   html(if $VERBOSE then "PRETTY" end) { "HTML string" }
+    #
+    def html(attributes = {}) # :yield:
+      if nil == attributes
+        attributes = {}
+      elsif "PRETTY" == attributes
+        attributes = { "PRETTY" => true }
+      end
+      pretty = attributes.delete("PRETTY")
+      pretty = "  " if true == pretty
+      buf = ""
+
+      if attributes.has_key?("DOCTYPE")
+        if attributes["DOCTYPE"]
+          buf += attributes.delete("DOCTYPE")
+        else
+          attributes.delete("DOCTYPE")
+        end
+      else
+        buf += doctype
+      end
+
+      if block_given?
+        buf += super(attributes){ yield }
+      else
+        buf += super(attributes)
+      end
+
+      if pretty
+        CGI::pretty(buf, pretty)
+      else
+        buf
+      end
+
+    end
+
+    # Generate an Image Button Input element as a string.
+    #
+    # +src+ is the URL of the image to use for the button.  +name+ 
+    # is the input name.  +alt+ is the alternative text for the image.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    # 
+    #   image_button("url")
+    #     # <INPUT TYPE="image" SRC="url">
+    # 
+    #   image_button("url", "name", "string")
+    #     # <INPUT TYPE="image" SRC="url" NAME="name" ALT="string">
+    # 
+    #   image_button("SRC" => "url", "ATL" => "strng")
+    #     # <INPUT TYPE="image" SRC="url" ALT="string">
+    def image_button(src = "", name = nil, alt = nil)
+      attributes = if src.kind_of?(String)
+                     { "TYPE" => "image", "SRC" => src, "NAME" => name,
+                       "ALT" => alt }
+                   else
+                     src["TYPE"] = "image"
+                     src["SRC"] ||= ""
+                     src
+                   end
+      input(attributes)
+    end
+
+
+    # Generate an Image element as a string.
+    #
+    # +src+ is the URL of the image.  +alt+ is the alternative text for
+    # the image.  +width+ is the width of the image, and +height+ is
+    # its height.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   img("src", "alt", 100, 50)
+    #     # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
+    # 
+    #   img("SRC" => "src", "ALT" => "alt", "WIDTH" => 100, "HEIGHT" => 50)
+    #     # <IMG SRC="src" ALT="alt" WIDTH="100" HEIGHT="50">
+    def img(src = "", alt = "", width = nil, height = nil)
+      attributes = if src.kind_of?(String)
+                     { "SRC" => src, "ALT" => alt }
+                   else
+                     src
+                   end
+      attributes["WIDTH"] = width.to_s if width
+      attributes["HEIGHT"] = height.to_s if height
+      super(attributes)
+    end
+
+
+    # Generate a Form element with multipart encoding as a String.
+    #
+    # Multipart encoding is used for forms that include file uploads.
+    #
+    # +action+ is the action to perform.  +enctype+ is the encoding
+    # type, which defaults to "multipart/form-data".
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   multipart_form{ "string" }
+    #     # <FORM METHOD="post" ENCTYPE="multipart/form-data">string</FORM>
+    # 
+    #   multipart_form("url") { "string" }
+    #     # <FORM METHOD="post" ACTION="url" ENCTYPE="multipart/form-data">string</FORM>
+    def multipart_form(action = nil, enctype = "multipart/form-data")
+      attributes = if action == nil
+                     { "METHOD" => "post", "ENCTYPE" => enctype } 
+                   elsif action.kind_of?(String)
+                     { "METHOD" => "post", "ACTION" => action,
+                       "ENCTYPE" => enctype } 
+                   else
+                     unless action.has_key?("METHOD")
+                       action["METHOD"] = "post"
+                     end
+                     unless action.has_key?("ENCTYPE")
+                       action["ENCTYPE"] = enctype
+                     end
+                     action
+                   end
+      if block_given?
+        form(attributes){ yield }
+      else
+        form(attributes)
+      end
+    end
+
+
+    # Generate a Password Input element as a string.
+    #
+    # +name+ is the name of the input field.  +value+ is its default
+    # value.  +size+ is the size of the input field display.  +maxlength+
+    # is the maximum length of the inputted password.
+    #
+    # Alternatively, attributes can be specified as a hash.
+    #
+    #   password_field("name")
+    #     # <INPUT TYPE="password" NAME="name" SIZE="40">
+    # 
+    #   password_field("name", "value")
+    #     # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="40">
+    # 
+    #   password_field("password", "value", 80, 200)
+    #     # <INPUT TYPE="password" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
+    # 
+    #   password_field("NAME" => "name", "VALUE" => "value")
+    #     # <INPUT TYPE="password" NAME="name" VALUE="value">
+    def password_field(name = "", value = nil, size = 40, maxlength = nil)
+      attributes = if name.kind_of?(String)
+                     { "TYPE" => "password", "NAME" => name,
+                       "VALUE" => value, "SIZE" => size.to_s }
+                   else
+                     name["TYPE"] = "password"
+                     name
+                   end
+      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
+      input(attributes)
+    end
+
+    # Generate a Select element as a string.
+    #
+    # +name+ is the name of the element.  The +values+ are the options that
+    # can be selected from the Select menu.  Each value can be a String or
+    # a one, two, or three-element Array.  If a String or a one-element
+    # Array, this is both the value of that option and the text displayed for
+    # it.  If a three-element Array, the elements are the option value, displayed
+    # text, and a boolean value specifying whether this option starts as selected.
+    # The two-element version omits either the option value (defaults to the same
+    # as the display text) or the boolean selected specifier (defaults to false).
+    #
+    # The attributes and options can also be specified as a hash.  In this
+    # case, options are specified as an array of values as described above,
+    # with the hash key of "VALUES".
+    #
+    #   popup_menu("name", "foo", "bar", "baz")
+    #     # <SELECT NAME="name">
+    #     #   <OPTION VALUE="foo">foo</OPTION>
+    #     #   <OPTION VALUE="bar">bar</OPTION>
+    #     #   <OPTION VALUE="baz">baz</OPTION>
+    #     # </SELECT>
+    # 
+    #   popup_menu("name", ["foo"], ["bar", true], "baz")
+    #     # <SELECT NAME="name">
+    #     #   <OPTION VALUE="foo">foo</OPTION>
+    #     #   <OPTION VALUE="bar" SELECTED>bar</OPTION>
+    #     #   <OPTION VALUE="baz">baz</OPTION>
+    #     # </SELECT>
+    # 
+    #   popup_menu("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
+    #     # <SELECT NAME="name">
+    #     #   <OPTION VALUE="1">Foo</OPTION>
+    #     #   <OPTION SELECTED VALUE="2">Bar</OPTION>
+    #     #   <OPTION VALUE="Baz">Baz</OPTION>
+    #     # </SELECT>
+    # 
+    #   popup_menu("NAME" => "name", "SIZE" => 2, "MULTIPLE" => true,
+    #               "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
+    #     # <SELECT NAME="name" MULTIPLE SIZE="2">
+    #     #   <OPTION VALUE="1">Foo</OPTION>
+    #     #   <OPTION SELECTED VALUE="2">Bar</OPTION>
+    #     #   <OPTION VALUE="Baz">Baz</OPTION>
+    #     # </SELECT>
+    def popup_menu(name = "", *values)
+
+      if name.kind_of?(Hash)
+        values   = name["VALUES"]
+        size     = name["SIZE"].to_s if name["SIZE"]
+        multiple = name["MULTIPLE"]
+        name     = name["NAME"]
+      else
+        size = nil
+        multiple = nil
+      end
+
+      select({ "NAME" => name, "SIZE" => size,
+               "MULTIPLE" => multiple }){
+        values.collect{|value|
+          if value.kind_of?(String)
+            option({ "VALUE" => value }){ value }
+          else
+            if value[value.size - 1] == true
+              option({ "VALUE" => value[0], "SELECTED" => true }){
+                value[value.size - 2]
+              }
+            else
+              option({ "VALUE" => value[0] }){
+                value[value.size - 1]
+              }
+            end
+          end
+        }.to_s
+      }
+
+    end
+
+    # Generates a radio-button Input element.
+    #
+    # +name+ is the name of the input field.  +value+ is the value of
+    # the field if checked.  +checked+ specifies whether the field
+    # starts off checked.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   radio_button("name", "value")
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="value">
+    # 
+    #   radio_button("name", "value", true)
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="value" CHECKED>
+    # 
+    #   radio_button("NAME" => "name", "VALUE" => "value", "ID" => "foo")
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="value" ID="foo">
+    def radio_button(name = "", value = nil, checked = nil)
+      attributes = if name.kind_of?(String)
+                     { "TYPE" => "radio", "NAME" => name,
+                       "VALUE" => value, "CHECKED" => checked }
+                   else
+                     name["TYPE"] = "radio"
+                     name
+                   end
+      input(attributes)
+    end
+
+    # Generate a sequence of radio button Input elements, as a String.
+    #
+    # This works the same as #checkbox_group().  However, it is not valid
+    # to have more than one radiobutton in a group checked.
+    # 
+    #   radio_group("name", "foo", "bar", "baz")
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="bar">bar
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
+    # 
+    #   radio_group("name", ["foo"], ["bar", true], "baz")
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="foo">foo
+    #     # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="bar">bar
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="baz">baz
+    # 
+    #   radio_group("name", ["1", "Foo"], ["2", "Bar", true], "Baz")
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="1">Foo
+    #     # <INPUT TYPE="radio" CHECKED NAME="name" VALUE="2">Bar
+    #     # <INPUT TYPE="radio" NAME="name" VALUE="Baz">Baz
+    # 
+    #   radio_group("NAME" => "name",
+    #                 "VALUES" => ["foo", "bar", "baz"])
+    # 
+    #   radio_group("NAME" => "name",
+    #                 "VALUES" => [["foo"], ["bar", true], "baz"])
+    # 
+    #   radio_group("NAME" => "name",
+    #                 "VALUES" => [["1", "Foo"], ["2", "Bar", true], "Baz"])
+    def radio_group(name = "", *values)
+      if name.kind_of?(Hash)
+        values = name["VALUES"]
+        name = name["NAME"]
+      end
+      values.collect{|value|
+        if value.kind_of?(String)
+          radio_button(name, value) + value
+        else
+          if value[value.size - 1] == true
+            radio_button(name, value[0], true) +
+            value[value.size - 2]
+          else
+            radio_button(name, value[0]) +
+            value[value.size - 1]
+          end
+        end
+      }.to_s
+    end
+
+    # Generate a reset button Input element, as a String.
+    #
+    # This resets the values on a form to their initial values.  +value+
+    # is the text displayed on the button. +name+ is the name of this button.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   reset
+    #     # <INPUT TYPE="reset">
+    # 
+    #   reset("reset")
+    #     # <INPUT TYPE="reset" VALUE="reset">
+    # 
+    #   reset("VALUE" => "reset", "ID" => "foo")
+    #     # <INPUT TYPE="reset" VALUE="reset" ID="foo">
+    def reset(value = nil, name = nil)
+      attributes = if (not value) or value.kind_of?(String)
+                     { "TYPE" => "reset", "VALUE" => value, "NAME" => name }
+                   else
+                     value["TYPE"] = "reset"
+                     value
+                   end
+      input(attributes)
+    end
+
+    alias scrolling_list popup_menu
+
+    # Generate a submit button Input element, as a String.
+    #
+    # +value+ is the text to display on the button.  +name+ is the name
+    # of the input.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   submit
+    #     # <INPUT TYPE="submit">
+    # 
+    #   submit("ok")
+    #     # <INPUT TYPE="submit" VALUE="ok">
+    # 
+    #   submit("ok", "button1")
+    #     # <INPUT TYPE="submit" VALUE="ok" NAME="button1">
+    # 
+    #   submit("VALUE" => "ok", "NAME" => "button1", "ID" => "foo")
+    #     # <INPUT TYPE="submit" VALUE="ok" NAME="button1" ID="foo">
+    def submit(value = nil, name = nil)
+      attributes = if (not value) or value.kind_of?(String)
+                     { "TYPE" => "submit", "VALUE" => value, "NAME" => name }
+                   else
+                     value["TYPE"] = "submit"
+                     value
+                   end
+      input(attributes)
+    end
+
+    # Generate a text field Input element, as a String.
+    #
+    # +name+ is the name of the input field.  +value+ is its initial
+    # value.  +size+ is the size of the input area.  +maxlength+
+    # is the maximum length of input accepted.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    #   text_field("name")
+    #     # <INPUT TYPE="text" NAME="name" SIZE="40">
+    # 
+    #   text_field("name", "value")
+    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="40">
+    # 
+    #   text_field("name", "value", 80)
+    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80">
+    # 
+    #   text_field("name", "value", 80, 200)
+    #     # <INPUT TYPE="text" NAME="name" VALUE="value" SIZE="80" MAXLENGTH="200">
+    # 
+    #   text_field("NAME" => "name", "VALUE" => "value")
+    #     # <INPUT TYPE="text" NAME="name" VALUE="value">
+    def text_field(name = "", value = nil, size = 40, maxlength = nil)
+      attributes = if name.kind_of?(String)
+                     { "TYPE" => "text", "NAME" => name, "VALUE" => value,
+                       "SIZE" => size.to_s }
+                   else
+                     name["TYPE"] = "text"
+                     name
+                   end
+      attributes["MAXLENGTH"] = maxlength.to_s if maxlength
+      input(attributes)
+    end
+
+    # Generate a TextArea element, as a String.
+    #
+    # +name+ is the name of the textarea.  +cols+ is the number of
+    # columns and +rows+ is the number of rows in the display.
+    #
+    # Alternatively, the attributes can be specified as a hash.
+    #
+    # The body is provided by the passed-in no-argument block
+    #
+    #   textarea("name")
+    #      # = textarea("NAME" => "name", "COLS" => 70, "ROWS" => 10)
+    #
+    #   textarea("name", 40, 5)
+    #      # = textarea("NAME" => "name", "COLS" => 40, "ROWS" => 5)
+    def textarea(name = "", cols = 70, rows = 10)  # :yield:
+      attributes = if name.kind_of?(String)
+                     { "NAME" => name, "COLS" => cols.to_s,
+                       "ROWS" => rows.to_s }
+                   else
+                     name
+                   end
+      if block_given?
+        super(attributes){ yield }
+      else
+        super(attributes)
+      end
+    end
+
+  end # HtmlExtension
+
+
+  # Mixin module for HTML version 3 generation methods.
+  module Html3 # :nodoc:
+
+    # The DOCTYPE declaration for this version of HTML
+    def doctype
+      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">|
+    end
+
+    # Initialise the HTML generation methods for this version.
+    def element_init
+      extend TagMaker
+      methods = ""
+      # - -
+      for element in %w[ A TT I B U STRIKE BIG SMALL SUB SUP EM STRONG
+          DFN CODE SAMP KBD VAR CITE FONT ADDRESS DIV center MAP
+          APPLET PRE XMP LISTING DL OL UL DIR MENU SELECT table TITLE
+          STYLE SCRIPT H1 H2 H3 H4 H5 H6 TEXTAREA FORM BLOCKQUOTE
+          CAPTION ]
+        methods += <<-BEGIN + nn_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # - O EMPTY
+      for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
+          ISINDEX META ]
+        methods += <<-BEGIN + nOE_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # O O or - O
+      for element in %w[ HTML HEAD BODY P PLAINTEXT DT DD LI OPTION tr
+          th td ]
+        methods += <<-BEGIN + nO_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+      eval(methods)
+    end
+
+  end # Html3
+
+
+  # Mixin module for HTML version 4 generation methods.
+  module Html4 # :nodoc:
+
+    # The DOCTYPE declaration for this version of HTML
+    def doctype
+      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">|
+    end
+
+    # Initialise the HTML generation methods for this version.
+    def element_init
+      extend TagMaker
+      methods = ""
+      # - -
+      for element in %w[ TT I B BIG SMALL EM STRONG DFN CODE SAMP KBD
+        VAR CITE ABBR ACRONYM SUB SUP SPAN BDO ADDRESS DIV MAP OBJECT
+        H1 H2 H3 H4 H5 H6 PRE Q INS DEL DL OL UL LABEL SELECT OPTGROUP
+        FIELDSET LEGEND BUTTON TABLE TITLE STYLE SCRIPT NOSCRIPT
+        TEXTAREA FORM A BLOCKQUOTE CAPTION ]
+        methods += <<-BEGIN + nn_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # - O EMPTY
+      for element in %w[ IMG BASE BR AREA LINK PARAM HR INPUT COL META ]
+        methods += <<-BEGIN + nOE_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # O O or - O
+      for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
+          COLGROUP TR TH TD HEAD]
+        methods += <<-BEGIN + nO_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+      eval(methods)
+    end
+
+  end # Html4
+
+
+  # Mixin module for HTML version 4 transitional generation methods.
+  module Html4Tr # :nodoc:
+
+    # The DOCTYPE declaration for this version of HTML
+    def doctype
+      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">|
+    end
+
+    # Initialise the HTML generation methods for this version.
+    def element_init
+      extend TagMaker
+      methods = ""
+      # - -
+      for element in %w[ TT I B U S STRIKE BIG SMALL EM STRONG DFN
+          CODE SAMP KBD VAR CITE ABBR ACRONYM FONT SUB SUP SPAN BDO
+          ADDRESS DIV CENTER MAP OBJECT APPLET H1 H2 H3 H4 H5 H6 PRE Q
+          INS DEL DL OL UL DIR MENU LABEL SELECT OPTGROUP FIELDSET
+          LEGEND BUTTON TABLE IFRAME NOFRAMES TITLE STYLE SCRIPT
+          NOSCRIPT TEXTAREA FORM A BLOCKQUOTE CAPTION ]
+        methods += <<-BEGIN + nn_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # - O EMPTY
+      for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
+          COL ISINDEX META ]
+        methods += <<-BEGIN + nOE_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # O O or - O
+      for element in %w[ HTML BODY P DT DD LI OPTION THEAD TFOOT TBODY
+          COLGROUP TR TH TD HEAD ]
+        methods += <<-BEGIN + nO_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+      eval(methods)
+    end
+
+  end # Html4Tr
+
+
+  # Mixin module for generating HTML version 4 with framesets.
+  module Html4Fr # :nodoc:
+
+    # The DOCTYPE declaration for this version of HTML
+    def doctype
+      %|<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">|
+    end
+
+    # Initialise the HTML generation methods for this version.
+    def element_init
+      methods = ""
+      # - -
+      for element in %w[ FRAMESET ]
+        methods += <<-BEGIN + nn_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+
+      # - O EMPTY
+      for element in %w[ FRAME ]
+        methods += <<-BEGIN + nOE_element_def(element) + <<-END
+          def #{element.downcase}(attributes = {})
+        BEGIN
+          end
+        END
+      end
+      eval(methods)
+    end
+
+  end # Html4Fr
+
+
+  # Creates a new CGI instance.
+  #
+  # +type+ specifies which version of HTML to load the HTML generation
+  # methods for.  The following versions of HTML are supported:
+  #
+  # html3:: HTML 3.x
+  # html4:: HTML 4.0
+  # html4Tr:: HTML 4.0 Transitional
+  # html4Fr:: HTML 4.0 with Framesets
+  #
+  # If not specified, no HTML generation methods will be loaded.
+  #
+  # If the CGI object is not created in a standard CGI call environment
+  # (that is, it can't locate REQUEST_METHOD in its environment), then
+  # it will run in "offline" mode.  In this mode, it reads its parameters
+  # from the command line or (failing that) from standard input.  Otherwise,
+  # cookies and other parameters are parsed automatically from the standard
+  # CGI locations, which varies according to the REQUEST_METHOD.
+  def initialize(type = "query")
+    if defined?(MOD_RUBY) && !ENV.key?("GATEWAY_INTERFACE")
+      Apache.request.setup_cgi_env
+    end
+
+    extend QueryExtension
+    @multipart = false
+    if defined?(CGI_PARAMS)
+      warn "do not use CGI_PARAMS and CGI_COOKIES"
+      @params = CGI_PARAMS.dup
+      @cookies = CGI_COOKIES.dup
+    else
+      initialize_query()  # set @params, @cookies
+    end
+    @output_cookies = nil
+    @output_hidden = nil
+
+    case type
+    when "html3"
+      extend Html3
+      element_init()
+      extend HtmlExtension
+    when "html4"
+      extend Html4
+      element_init()
+      extend HtmlExtension
+    when "html4Tr"
+      extend Html4Tr
+      element_init()
+      extend HtmlExtension
+    when "html4Fr"
+      extend Html4Tr
+      element_init()
+      extend Html4Fr
+      element_init()
+      extend HtmlExtension
+    end
+  end
+
+end   # class CGI
diff --git a/ruby_1_8_6/lib/cgi/.document b/ruby_1_8_6/lib/cgi/.document
new file mode 100644
index 0000000000..107f2f317c
--- /dev/null
+++ b/ruby_1_8_6/lib/cgi/.document
@@ -0,0 +1,2 @@
+session.rb
+
diff --git a/ruby_1_8_6/lib/cgi/session.rb b/ruby_1_8_6/lib/cgi/session.rb
new file mode 100644
index 0000000000..82eb7534d8
--- /dev/null
+++ b/ruby_1_8_6/lib/cgi/session.rb
@@ -0,0 +1,484 @@
+#
+# cgi/session.rb - session support for cgi scripts
+#
+# Copyright (C) 2001  Yukihiro "Matz" Matsumoto
+# Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+# Copyright (C) 2000  Information-technology Promotion Agency, Japan
+#
+# Author: Yukihiro "Matz" Matsumoto
+#
+# Documentation: William Webber (william@williamwebber.com)
+#
+# == Overview
+#
+# This file provides the +CGI::Session+ class, which provides session
+# support for CGI scripts.  A session is a sequence of HTTP requests
+# and responses linked together and associated with a single client.  
+# Information associated with the session is stored
+# on the server between requests.  A session id is passed between client
+# and server with every request and response, transparently
+# to the user.  This adds state information to the otherwise stateless
+# HTTP request/response protocol.
+#
+# See the documentation to the +CGI::Session+ class for more details
+# and examples of usage.  See cgi.rb for the +CGI+ class itself.
+
+require 'cgi'
+require 'tmpdir'
+
+class CGI
+
+  # Class representing an HTTP session.  See documentation for the file 
+  # cgi/session.rb for an introduction to HTTP sessions.
+  #
+  # == Lifecycle
+  #
+  # A CGI::Session instance is created from a CGI object.  By default,
+  # this CGI::Session instance will start a new session if none currently
+  # exists, or continue the current session for this client if one does
+  # exist.  The +new_session+ option can be used to either always or
+  # never create a new session.  See #new() for more details.
+  #
+  # #delete() deletes a session from session storage.  It
+  # does not however remove the session id from the client.  If the client
+  # makes another request with the same id, the effect will be to start
+  # a new session with the old session's id.
+  #
+  # == Setting and retrieving session data.
+  #
+  # The Session class associates data with a session as key-value pairs.
+  # This data can be set and retrieved by indexing the Session instance 
+  # using '[]', much the same as hashes (although other hash methods
+  # are not supported).
+  #
+  # When session processing has been completed for a request, the
+  # session should be closed using the close() method.  This will
+  # store the session's state to persistent storage.  If you want
+  # to store the session's state to persistent storage without
+  # finishing session processing for this request, call the update()
+  # method.
+  #
+  # == Storing session state
+  #
+  # The caller can specify what form of storage to use for the session's 
+  # data with the +database_manager+ option to CGI::Session::new.  The
+  # following storage classes are provided as part of the standard library:
+  #
+  # CGI::Session::FileStore:: stores data as plain text in a flat file.  Only 
+  #                           works with String data.  This is the default 
+  #                           storage type.
+  # CGI::Session::MemoryStore:: stores data in an in-memory hash.  The data 
+  #                             only persists for as long as the current ruby 
+  #                             interpreter instance does.
+  # CGI::Session::PStore:: stores data in Marshalled format.  Provided by
+  #                        cgi/session/pstore.rb.  Supports data of any type, 
+  #                        and provides file-locking and transaction support.
+  #
+  # Custom storage types can also be created by defining a class with 
+  # the following methods:
+  #
+  #    new(session, options)
+  #    restore  # returns hash of session data.
+  #    update
+  #    close
+  #    delete
+  #
+  # Changing storage type mid-session does not work.  Note in particular
+  # that by default the FileStore and PStore session data files have the
+  # same name.  If your application switches from one to the other without
+  # making sure that filenames will be different
+  # and clients still have old sessions lying around in cookies, then
+  # things will break nastily!
+  #
+  # == Maintaining the session id.
+  #
+  # Most session state is maintained on the server.  However, a session
+  # id must be passed backwards and forwards between client and server
+  # to maintain a reference to this session state.
+  #
+  # The simplest way to do this is via cookies.  The CGI::Session class
+  # provides transparent support for session id communication via cookies
+  # if the client has cookies enabled.
+  # 
+  # If the client has cookies disabled, the session id must be included
+  # as a parameter of all requests sent by the client to the server.  The
+  # CGI::Session class in conjunction with the CGI class will transparently
+  # add the session id as a hidden input field to all forms generated
+  # using the CGI#form() HTML generation method.  No built-in support is
+  # provided for other mechanisms, such as URL re-writing.  The caller is
+  # responsible for extracting the session id from the session_id 
+  # attribute and manually encoding it in URLs and adding it as a hidden
+  # input to HTML forms created by other mechanisms.  Also, session expiry
+  # is not automatically handled.
+  #
+  # == Examples of use
+  #
+  # === Setting the user's name
+  #
+  #   require 'cgi'
+  #   require 'cgi/session'
+  #   require 'cgi/session/pstore'     # provides CGI::Session::PStore
+  #
+  #   cgi = CGI.new("html4")
+  #
+  #   session = CGI::Session.new(cgi,
+  #       'database_manager' => CGI::Session::PStore,  # use PStore
+  #       'session_key' => '_rb_sess_id',              # custom session key
+  #       'session_expires' => Time.now + 30 * 60,     # 30 minute timeout 
+  #       'prefix' => 'pstore_sid_')                   # PStore option
+  #   if cgi.has_key?('user_name') and cgi['user_name'] != ''
+  #       # coerce to String: cgi[] returns the 
+  #       # string-like CGI::QueryExtension::Value
+  #       session['user_name'] = cgi['user_name'].to_s
+  #   elsif !session['user_name']
+  #       session['user_name'] = "guest"
+  #   end
+  #   session.close
+  #
+  # === Creating a new session safely
+  #
+  #   require 'cgi'
+  #   require 'cgi/session'
+  #
+  #   cgi = CGI.new("html4")
+  #
+  #   # We make sure to delete an old session if one exists,
+  #   # not just to free resources, but to prevent the session 
+  #   # from being maliciously hijacked later on.
+  #   begin
+  #       session = CGI::Session.new(cgi, 'new_session' => false)      
+  #       session.delete                 
+  #   rescue ArgumentError  # if no old session
+  #   end
+  #   session = CGI::Session.new(cgi, 'new_session' => true)
+  #   session.close
+  #
+  class Session
+
+    class NoSession < RuntimeError #:nodoc:
+    end
+
+    # The id of this session.
+    attr_reader :session_id, :new_session
+
+    def Session::callback(dbman)  #:nodoc:
+      Proc.new{
+	dbman[0].close unless dbman.empty?
+      }
+    end
+
+    # Create a new session id.
+    #
+    # The session id is an MD5 hash based upon the time,
+    # a random number, and a constant string.  This routine
+    # is used internally for automatically generated
+    # session ids. 
+    def create_new_id
+      require 'digest/md5'
+      md5 = Digest::MD5::new
+      now = Time::now
+      md5.update(now.to_s)
+      md5.update(String(now.usec))
+      md5.update(String(rand(0)))
+      md5.update(String($$))
+      md5.update('foobar')
+      @new_session = true
+      md5.hexdigest
+    end
+    private :create_new_id
+
+    # Create a new CGI::Session object for +request+.
+    #
+    # +request+ is an instance of the +CGI+ class (see cgi.rb).
+    # +option+ is a hash of options for initialising this
+    # CGI::Session instance.  The following options are
+    # recognised:
+    #
+    # session_key:: the parameter name used for the session id.
+    #               Defaults to '_session_id'.
+    # session_id:: the session id to use.  If not provided, then
+    #              it is retrieved from the +session_key+ parameter
+    #              of the request, or automatically generated for
+    #              a new session.
+    # new_session:: if true, force creation of a new session.  If not set, 
+    #               a new session is only created if none currently
+    #               exists.  If false, a new session is never created,
+    #               and if none currently exists and the +session_id+
+    #               option is not set, an ArgumentError is raised.
+    # database_manager:: the name of the class providing storage facilities
+    #                    for session state persistence.  Built-in support
+    #                    is provided for +FileStore+ (the default),
+    #                    +MemoryStore+, and +PStore+ (from
+    #                    cgi/session/pstore.rb).  See the documentation for
+    #                    these classes for more details.
+    #
+    # The following options are also recognised, but only apply if the
+    # session id is stored in a cookie.
+    #
+    # session_expires:: the time the current session expires, as a 
+    #                   +Time+ object.  If not set, the session will terminate
+    #                   when the user's browser is closed.
+    # session_domain:: the hostname domain for which this session is valid.
+    #                  If not set, defaults to the hostname of the server.
+    # session_secure:: if +true+, this session will only work over HTTPS.
+    # session_path:: the path for which this session applies.  Defaults
+    #                to the directory of the CGI script.
+    #
+    # +option+ is also passed on to the session storage class initialiser; see
+    # the documentation for each session storage class for the options
+    # they support.
+    #                  
+    # The retrieved or created session is automatically added to +request+
+    # as a cookie, and also to its +output_hidden+ table, which is used
+    # to add hidden input elements to forms.  
+    #
+    # *WARNING* the +output_hidden+
+    # fields are surrounded by a <fieldset> tag in HTML 4 generation, which
+    # is _not_ invisible on many browsers; you may wish to disable the
+    # use of fieldsets with code similar to the following
+    # (see http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/37805)
+    #
+    #   cgi = CGI.new("html4")
+    #   class << cgi
+    #       undef_method :fieldset
+    #   end
+    #
+    def initialize(request, option={})
+      @new_session = false
+      session_key = option['session_key'] || '_session_id'
+      session_id = option['session_id']
+      unless session_id
+	if option['new_session']
+	  session_id = create_new_id
+	end
+      end
+      unless session_id
+	if request.key?(session_key)
+	  session_id = request[session_key]
+	  session_id = session_id.read if session_id.respond_to?(:read)
+	end
+	unless session_id
+	  session_id, = request.cookies[session_key]
+	end
+	unless session_id
+	  unless option.fetch('new_session', true)
+	    raise ArgumentError, "session_key `%s' should be supplied"%session_key
+	  end
+	  session_id = create_new_id
+	end
+      end
+      @session_id = session_id
+      dbman = option['database_manager'] || FileStore
+      begin
+        @dbman = dbman::new(self, option)
+      rescue NoSession
+        unless option.fetch('new_session', true)
+          raise ArgumentError, "invalid session_id `%s'"%session_id
+        end
+        session_id = @session_id = create_new_id
+        retry
+      end
+      request.instance_eval do
+	@output_hidden = {session_key => session_id} unless option['no_hidden']
+	@output_cookies =  [
+          Cookie::new("name" => session_key,
+		      "value" => session_id,
+		      "expires" => option['session_expires'],
+		      "domain" => option['session_domain'],
+		      "secure" => option['session_secure'],
+		      "path" => if option['session_path'] then
+				  option['session_path']
+		                elsif ENV["SCRIPT_NAME"] then
+				  File::dirname(ENV["SCRIPT_NAME"])
+				else
+				  ""
+				end)
+        ] unless option['no_cookies']
+      end
+      @dbprot = [@dbman]
+      ObjectSpace::define_finalizer(self, Session::callback(@dbprot))
+    end
+
+    # Retrieve the session data for key +key+.
+    def [](key)
+      @data ||= @dbman.restore
+      @data[key]
+    end
+
+    # Set the session date for key +key+.
+    def []=(key, val)
+      @write_lock ||= true
+      @data ||= @dbman.restore
+      @data[key] = val
+    end
+
+    # Store session data on the server.  For some session storage types,
+    # this is a no-op.
+    def update  
+      @dbman.update
+    end
+
+    # Store session data on the server and close the session storage.  
+    # For some session storage types, this is a no-op.
+    def close
+      @dbman.close
+      @dbprot.clear
+    end
+
+    # Delete the session from storage.  Also closes the storage.
+    #
+    # Note that the session's data is _not_ automatically deleted
+    # upon the session expiring.
+    def delete
+      @dbman.delete
+      @dbprot.clear
+    end
+
+    # File-based session storage class.
+    #
+    # Implements session storage as a flat file of 'key=value' values.
+    # This storage type only works directly with String values; the
+    # user is responsible for converting other types to Strings when
+    # storing and from Strings when retrieving.
+    class FileStore
+      # Create a new FileStore instance.
+      #
+      # This constructor is used internally by CGI::Session.  The
+      # user does not generally need to call it directly.
+      #
+      # +session+ is the session for which this instance is being
+      # created.  The session id must only contain alphanumeric
+      # characters; automatically generated session ids observe
+      # this requirement.
+      # 
+      # +option+ is a hash of options for the initialiser.  The
+      # following options are recognised:
+      #
+      # tmpdir:: the directory to use for storing the FileStore
+      #          file.  Defaults to Dir::tmpdir (generally "/tmp"
+      #          on Unix systems).
+      # prefix:: the prefix to add to the session id when generating
+      #          the filename for this session's FileStore file.
+      #          Defaults to the empty string.
+      # suffix:: the prefix to add to the session id when generating
+      #          the filename for this session's FileStore file.
+      #          Defaults to the empty string.
+      #
+      # This session's FileStore file will be created if it does
+      # not exist, or opened if it does.
+      def initialize(session, option={})
+	dir = option['tmpdir'] || Dir::tmpdir
+	prefix = option['prefix'] || ''
+	suffix = option['suffix'] || ''
+	id = session.session_id
+        require 'digest/md5'
+        md5 = Digest::MD5.hexdigest(id)[0,16]
+	@path = dir+"/"+prefix+md5+suffix
+	if File::exist? @path
+	  @hash = nil
+	else
+          unless session.new_session
+            raise CGI::Session::NoSession, "uninitialized session"
+          end
+	  @hash = {}
+	end
+      end
+
+      # Restore session state from the session's FileStore file.
+      #
+      # Returns the session state as a hash.
+      def restore
+	unless @hash
+	  @hash = {}
+          begin
+	    f = File.open(@path, 'r')
+	    f.flock File::LOCK_SH
+	    for line in f
+	      line.chomp!
+	      k, v = line.split('=',2)
+	      @hash[CGI::unescape(k)] = CGI::unescape(v)
+	    end
+          ensure
+	    f.close unless f.nil?
+          end
+	end
+	@hash
+      end
+
+      # Save session state to the session's FileStore file.
+      def update
+	return unless @hash
+        begin
+	  f = File.open(@path, File::CREAT|File::TRUNC|File::RDWR, 0600)
+	  f.flock File::LOCK_EX
+   	  for k,v in @hash
+	    f.printf "%s=%s\n", CGI::escape(k), CGI::escape(String(v))
+	  end
+        ensure
+          f.close unless f.nil?
+        end
+      end
+
+      # Update and close the session's FileStore file.
+      def close
+	update
+      end
+
+      # Close and delete the session's FileStore file.
+      def delete
+        File::unlink @path
+      rescue Errno::ENOENT
+      end
+    end
+
+    # In-memory session storage class.
+    #
+    # Implements session storage as a global in-memory hash.  Session
+    # data will only persist for as long as the ruby interpreter 
+    # instance does.
+    class MemoryStore
+      GLOBAL_HASH_TABLE = {} #:nodoc:
+
+      # Create a new MemoryStore instance.
+      #
+      # +session+ is the session this instance is associated with.
+      # +option+ is a list of initialisation options.  None are
+      # currently recognised.
+      def initialize(session, option=nil)
+	@session_id = session.session_id
+        unless GLOBAL_HASH_TABLE.key?(@session_id)
+          unless session.new_session
+            raise CGI::Session::NoSession, "uninitialized session"
+          end
+          GLOBAL_HASH_TABLE[@session_id] = {}
+        end
+      end
+
+      # Restore session state.
+      #
+      # Returns session data as a hash.
+      def restore
+	GLOBAL_HASH_TABLE[@session_id]
+      end
+
+      # Update session state.
+      #
+      # A no-op.
+      def update
+	# don't need to update; hash is shared
+      end
+
+      # Close session storage.
+      #
+      # A no-op.
+      def close
+	# don't need to close
+      end
+
+      # Delete the session state.
+      def delete
+	GLOBAL_HASH_TABLE.delete(@session_id)
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/cgi/session/pstore.rb b/ruby_1_8_6/lib/cgi/session/pstore.rb
new file mode 100644
index 0000000000..bd93d0a6ff
--- /dev/null
+++ b/ruby_1_8_6/lib/cgi/session/pstore.rb
@@ -0,0 +1,111 @@
+#
+# cgi/session/pstore.rb - persistent storage of marshalled session data
+#
+# Documentation: William Webber (william@williamwebber.com)
+# 
+# == Overview
+#
+# This file provides the CGI::Session::PStore class, which builds
+# persistent of session data on top of the pstore library.  See
+# cgi/session.rb for more details on session storage managers.
+
+require 'cgi/session'
+require 'pstore'
+
+class CGI
+  class Session
+    # PStore-based session storage class.
+    #
+    # This builds upon the top-level PStore class provided by the
+    # library file pstore.rb.  Session data is marshalled and stored
+    # in a file.  File locking and transaction services are provided.
+    class PStore
+      # Create a new CGI::Session::PStore instance
+      #
+      # This constructor is used internally by CGI::Session.  The
+      # user does not generally need to call it directly.
+      #
+      # +session+ is the session for which this instance is being
+      # created.  The session id must only contain alphanumeric
+      # characters; automatically generated session ids observe
+      # this requirement.
+      # 
+      # +option+ is a hash of options for the initialiser.  The
+      # following options are recognised:
+      #
+      # tmpdir:: the directory to use for storing the PStore
+      #          file.  Defaults to Dir::tmpdir (generally "/tmp"
+      #          on Unix systems).
+      # prefix:: the prefix to add to the session id when generating
+      #          the filename for this session's PStore file.
+      #          Defaults to the empty string.
+      #
+      # This session's PStore file will be created if it does
+      # not exist, or opened if it does.
+      def initialize(session, option={})
+	dir = option['tmpdir'] || Dir::tmpdir
+	prefix = option['prefix'] || ''
+	id = session.session_id
+        require 'digest/md5'
+        md5 = Digest::MD5.hexdigest(id)[0,16]
+	path = dir+"/"+prefix+md5
+	path.untaint
+	if File::exist?(path)
+	  @hash = nil
+	else
+          unless session.new_session
+            raise CGI::Session::NoSession, "uninitialized session"
+          end
+	  @hash = {}
+	end
+	@p = ::PStore.new(path)
+	@p.transaction do |p|
+	  File.chmod(0600, p.path)
+	end
+      end
+
+      # Restore session state from the session's PStore file.
+      #
+      # Returns the session state as a hash.
+      def restore
+	unless @hash
+	  @p.transaction do
+           @hash = @p['hash'] || {}
+	  end
+	end
+	@hash
+      end
+
+      # Save session state to the session's PStore file.
+      def update 
+	@p.transaction do
+	    @p['hash'] = @hash
+	end
+      end
+
+      # Update and close the session's PStore file.
+      def close
+	update
+      end
+
+      # Close and delete the session's PStore file.
+      def delete
+	path = @p.path
+	File::unlink path
+      end
+
+    end
+  end
+end
+
+if $0 == __FILE__
+  # :enddoc:
+  STDIN.reopen("/dev/null")
+  cgi = CGI.new
+  session = CGI::Session.new(cgi, 'database_manager' => CGI::Session::PStore)
+  session['key'] = {'k' => 'v'}
+  puts session['key'].class
+  fail unless Hash === session['key']
+  puts session['key'].inspect
+  fail unless session['key'].inspect == '{"k"=>"v"}'
+end
diff --git a/ruby_1_8_6/lib/complex.rb b/ruby_1_8_6/lib/complex.rb
new file mode 100644
index 0000000000..9300f391e8
--- /dev/null
+++ b/ruby_1_8_6/lib/complex.rb
@@ -0,0 +1,631 @@
+#
+#   complex.rb - 
+#   	$Release Version: 0.5 $
+#   	$Revision: 1.3 $
+#   	$Date: 1998/07/08 10:05:28 $
+#   	by Keiju ISHITSUKA(SHL Japan Inc.)
+#
+# ----
+#
+# complex.rb implements the Complex class for complex numbers.  Additionally,
+# some methods in other Numeric classes are redefined or added to allow greater
+# interoperability with Complex numbers.
+#
+# Complex numbers can be created in the following manner:
+# - <tt>Complex(a, b)</tt>
+# - <tt>Complex.polar(radius, theta)</tt>
+#   
+# Additionally, note the following:
+# - <tt>Complex::I</tt> (the mathematical constant <i>i</i>)
+# - <tt>Numeric#im</tt> (e.g. <tt>5.im -> 0+5i</tt>)
+#
+# The following +Math+ module methods are redefined to handle Complex arguments.
+# They will work as normal with non-Complex arguments.
+#    sqrt exp cos sin tan log log10
+#    cosh sinh tanh acos asin atan atan2 acosh asinh atanh
+#
+
+
+#
+# Numeric is a built-in class on which Fixnum, Bignum, etc., are based.  Here
+# some methods are added so that all number types can be treated to some extent
+# as Complex numbers.
+#
+class Numeric
+  #
+  # Returns a Complex number <tt>(0,<i>self</i>)</tt>.
+  #
+  def im
+    Complex(0, self)
+  end
+  
+  #
+  # The real part of a complex number, i.e. <i>self</i>.
+  #
+  def real
+    self
+  end
+  
+  #
+  # The imaginary part of a complex number, i.e. 0.
+  #
+  def image
+    0
+  end
+  alias imag image
+  
+  #
+  # See Complex#arg.
+  #
+  def arg
+    if self >= 0
+      return 0
+    else
+      return Math::PI
+    end
+  end
+  alias angle arg
+  
+  #
+  # See Complex#polar.
+  #
+  def polar
+    return abs, arg
+  end
+  
+  #
+  # See Complex#conjugate (short answer: returns <i>self</i>).
+  #
+  def conjugate
+    self
+  end
+  alias conj conjugate
+end
+
+
+#
+# Creates a Complex number.  +a+ and +b+ should be Numeric.  The result will be
+# <tt>a+bi</tt>.
+#
+def Complex(a, b = 0)
+  if b == 0 and (a.kind_of?(Complex) or defined? Complex::Unify)
+    a
+  else
+    Complex.new( a.real-b.imag, a.imag+b.real )
+  end
+end
+
+#
+# The complex number class.  See complex.rb for an overview.
+#
+class Complex < Numeric
+  @RCS_ID='-$Id: complex.rb,v 1.3 1998/07/08 10:05:28 keiju Exp keiju $-'
+
+  undef step
+
+  def Complex.generic?(other) # :nodoc:
+    other.kind_of?(Integer) or
+    other.kind_of?(Float) or
+    (defined?(Rational) and other.kind_of?(Rational))
+  end
+
+  #
+  # Creates a +Complex+ number in terms of +r+ (radius) and +theta+ (angle).
+  #
+  def Complex.polar(r, theta)
+    Complex(r*Math.cos(theta), r*Math.sin(theta))
+  end
+
+  #
+  # Creates a +Complex+ number <tt>a</tt>+<tt>b</tt><i>i</i>.
+  #
+  def Complex.new!(a, b=0)
+    new(a,b)
+  end
+
+  def initialize(a, b)
+    raise TypeError, "non numeric 1st arg `#{a.inspect}'" if !a.kind_of? Numeric
+    raise TypeError, "`#{a.inspect}' for 1st arg" if a.kind_of? Complex
+    raise TypeError, "non numeric 2nd arg `#{b.inspect}'" if !b.kind_of? Numeric
+    raise TypeError, "`#{b.inspect}' for 2nd arg" if b.kind_of? Complex
+    @real = a
+    @image = b
+  end
+
+  #
+  # Addition with real or complex number.
+  #
+  def + (other)
+    if other.kind_of?(Complex)
+      re = @real + other.real
+      im = @image + other.image
+      Complex(re, im)
+    elsif Complex.generic?(other)
+      Complex(@real + other, @image)
+    else
+      x , y = other.coerce(self)
+      x + y
+    end
+  end
+  
+  #
+  # Subtraction with real or complex number.
+  #
+  def - (other)
+    if other.kind_of?(Complex)
+      re = @real - other.real
+      im = @image - other.image
+      Complex(re, im)
+    elsif Complex.generic?(other)
+      Complex(@real - other, @image)
+    else
+      x , y = other.coerce(self)
+      x - y
+    end
+  end
+  
+  #
+  # Multiplication with real or complex number.
+  #
+  def * (other)
+    if other.kind_of?(Complex)
+      re = @real*other.real - @image*other.image
+      im = @real*other.image + @image*other.real
+      Complex(re, im)
+    elsif Complex.generic?(other)
+      Complex(@real * other, @image * other)
+    else
+      x , y = other.coerce(self)
+      x * y
+    end
+  end
+  
+  #
+  # Division by real or complex number.
+  #
+  def / (other)
+    if other.kind_of?(Complex)
+      self*other.conjugate/other.abs2
+    elsif Complex.generic?(other)
+      Complex(@real/other, @image/other)
+    else
+      x, y = other.coerce(self)
+      x/y
+    end
+  end
+  
+  #
+  # Raise this complex number to the given (real or complex) power.
+  #
+  def ** (other)
+    if other == 0
+      return Complex(1)
+    end
+    if other.kind_of?(Complex)
+      r, theta = polar
+      ore = other.real
+      oim = other.image
+      nr = Math.exp!(ore*Math.log!(r) - oim * theta)
+      ntheta = theta*ore + oim*Math.log!(r)
+      Complex.polar(nr, ntheta)
+    elsif other.kind_of?(Integer)
+      if other > 0
+	x = self
+	z = x
+	n = other - 1
+	while n != 0
+	  while (div, mod = n.divmod(2)
+		 mod == 0)
+	    x = Complex(x.real*x.real - x.image*x.image, 2*x.real*x.image)
+	    n = div
+	  end
+	  z *= x
+	  n -= 1
+	end
+	z
+      else
+	if defined? Rational
+	  (Rational(1) / self) ** -other
+	else
+	  self ** Float(other)
+	end
+      end
+    elsif Complex.generic?(other)
+      r, theta = polar
+      Complex.polar(r**other, theta*other)
+    else
+      x, y = other.coerce(self)
+      x**y
+    end
+  end
+  
+  #
+  # Remainder after division by a real or complex number.
+  #
+  def % (other)
+    if other.kind_of?(Complex)
+      Complex(@real % other.real, @image % other.image)
+    elsif Complex.generic?(other)
+      Complex(@real % other, @image % other)
+    else
+      x , y = other.coerce(self)
+      x % y
+    end
+  end
+  
+#--
+#    def divmod(other)
+#      if other.kind_of?(Complex)
+#        rdiv, rmod = @real.divmod(other.real)
+#        idiv, imod = @image.divmod(other.image)
+#        return Complex(rdiv, idiv), Complex(rmod, rmod)
+#      elsif Complex.generic?(other)
+#        Complex(@real.divmod(other), @image.divmod(other))
+#      else
+#        x , y = other.coerce(self)
+#        x.divmod(y)
+#      end
+#    end
+#++
+  
+  #
+  # Absolute value (aka modulus): distance from the zero point on the complex
+  # plane.
+  #
+  def abs
+    Math.hypot(@real, @image)
+  end
+  
+  #
+  # Square of the absolute value.
+  #
+  def abs2
+    @real*@real + @image*@image
+  end
+  
+  #
+  # Argument (angle from (1,0) on the complex plane).
+  #
+  def arg
+    Math.atan2!(@image, @real)
+  end
+  alias angle arg
+  
+  #
+  # Returns the absolute value _and_ the argument.
+  #
+  def polar
+    return abs, arg
+  end
+  
+  #
+  # Complex conjugate (<tt>z + z.conjugate = 2 * z.real</tt>).
+  #
+  def conjugate
+    Complex(@real, -@image)
+  end
+  alias conj conjugate
+  
+  #
+  # Compares the absolute values of the two numbers.
+  #
+  def <=> (other)
+    self.abs <=> other.abs
+  end
+  
+  #
+  # Test for numerical equality (<tt>a == a + 0<i>i</i></tt>).
+  #
+  def == (other)
+    if other.kind_of?(Complex)
+      @real == other.real and @image == other.image
+    elsif Complex.generic?(other)
+      @real == other and @image == 0
+    else
+      other == self
+    end
+  end
+
+  #
+  # Attempts to coerce +other+ to a Complex number.
+  #
+  def coerce(other)
+    if Complex.generic?(other)
+      return Complex.new!(other), self
+    else
+      super
+    end
+  end
+
+  #
+  # FIXME
+  #
+  def denominator
+    @real.denominator.lcm(@image.denominator)
+  end
+  
+  #
+  # FIXME
+  #
+  def numerator
+    cd = denominator
+    Complex(@real.numerator*(cd/@real.denominator),
+	    @image.numerator*(cd/@image.denominator))
+  end
+  
+  #
+  # Standard string representation of the complex number.
+  #
+  def to_s
+    if @real != 0
+      if defined?(Rational) and @image.kind_of?(Rational) and @image.denominator != 1
+	if @image >= 0
+	  @real.to_s+"+("+@image.to_s+")i"
+	else
+	  @real.to_s+"-("+(-@image).to_s+")i"
+	end
+      else
+	if @image >= 0
+	  @real.to_s+"+"+@image.to_s+"i"
+	else
+	  @real.to_s+"-"+(-@image).to_s+"i"
+	end
+      end
+    else
+      if defined?(Rational) and @image.kind_of?(Rational) and @image.denominator != 1
+	"("+@image.to_s+")i"
+      else
+	@image.to_s+"i"
+      end
+    end
+  end
+  
+  #
+  # Returns a hash code for the complex number.
+  #
+  def hash
+    @real.hash ^ @image.hash
+  end
+  
+  #
+  # Returns "<tt>Complex(<i>real</i>, <i>image</i>)</tt>".
+  #
+  def inspect
+    sprintf("Complex(%s, %s)", @real.inspect, @image.inspect)
+  end
+
+  
+  #
+  # +I+ is the imaginary number.  It exists at point (0,1) on the complex plane.
+  #
+  I = Complex(0,1)
+  
+  # The real part of a complex number.
+  attr :real
+
+  # The imaginary part of a complex number.
+  attr :image
+  alias imag image
+  
+end
+
+
+
+
+module Math
+  alias sqrt! sqrt
+  alias exp! exp
+  alias log! log
+  alias log10! log10
+  alias cos! cos
+  alias sin! sin
+  alias tan! tan
+  alias cosh! cosh
+  alias sinh! sinh
+  alias tanh! tanh
+  alias acos! acos
+  alias asin! asin
+  alias atan! atan
+  alias atan2! atan2
+  alias acosh! acosh
+  alias asinh! asinh
+  alias atanh! atanh  
+
+  # Redefined to handle a Complex argument.
+  def sqrt(z)
+    if Complex.generic?(z)
+      if z >= 0
+	sqrt!(z)
+      else
+	Complex(0,sqrt!(-z))
+      end
+    else
+      if z.image < 0
+	sqrt(z.conjugate).conjugate
+      else
+	r = z.abs
+	x = z.real
+	Complex( sqrt!((r+x)/2), sqrt!((r-x)/2) )
+      end
+    end
+  end
+  
+  # Redefined to handle a Complex argument.
+  def exp(z)
+    if Complex.generic?(z)
+      exp!(z)
+    else
+      Complex(exp!(z.real) * cos!(z.image), exp!(z.real) * sin!(z.image))
+    end
+  end
+  
+  # Redefined to handle a Complex argument.
+  def cos(z)
+    if Complex.generic?(z)
+      cos!(z)
+    else
+      Complex(cos!(z.real)*cosh!(z.image),
+	      -sin!(z.real)*sinh!(z.image))
+    end
+  end
+    
+  # Redefined to handle a Complex argument.
+  def sin(z)
+    if Complex.generic?(z)
+      sin!(z)
+    else
+      Complex(sin!(z.real)*cosh!(z.image),
+	      cos!(z.real)*sinh!(z.image))
+    end
+  end
+  
+  # Redefined to handle a Complex argument.
+  def tan(z)
+    if Complex.generic?(z)
+      tan!(z)
+    else
+      sin(z)/cos(z)
+    end
+  end
+
+  def sinh(z)
+    if Complex.generic?(z)
+      sinh!(z)
+    else
+      Complex( sinh!(z.real)*cos!(z.image), cosh!(z.real)*sin!(z.image) )
+    end
+  end
+
+  def cosh(z)
+    if Complex.generic?(z)
+      cosh!(z)
+    else
+      Complex( cosh!(z.real)*cos!(z.image), sinh!(z.real)*sin!(z.image) )
+    end
+  end
+
+  def tanh(z)
+    if Complex.generic?(z)
+      tanh!(z)
+    else
+      sinh(z)/cosh(z)
+    end
+  end
+  
+  # Redefined to handle a Complex argument.
+  def log(z)
+    if Complex.generic?(z) and z >= 0
+      log!(z)
+    else
+      r, theta = z.polar
+      Complex(log!(r.abs), theta)
+    end
+  end
+  
+  # Redefined to handle a Complex argument.
+  def log10(z)
+    if Complex.generic?(z)
+      log10!(z)
+    else
+      log(z)/log!(10)
+    end
+  end
+
+  def acos(z)
+    if Complex.generic?(z) and z >= -1 and z <= 1
+      acos!(z)
+    else
+      -1.0.im * log( z + 1.0.im * sqrt(1.0-z*z) )
+    end
+  end
+
+  def asin(z)
+    if Complex.generic?(z) and z >= -1 and z <= 1
+      asin!(z)
+    else
+      -1.0.im * log( 1.0.im * z + sqrt(1.0-z*z) )
+    end
+  end
+
+  def atan(z)
+    if Complex.generic?(z)
+      atan!(z)
+    else
+      1.0.im * log( (1.0.im+z) / (1.0.im-z) ) / 2.0
+    end
+  end
+
+  def atan2(y,x)
+    if Complex.generic?(y) and Complex.generic?(x)
+      atan2!(y,x)
+    else
+      -1.0.im * log( (x+1.0.im*y) / sqrt(x*x+y*y) )
+    end
+  end
+
+  def acosh(z)
+    if Complex.generic?(z) and z >= 1
+      acosh!(z)
+    else
+      log( z + sqrt(z*z-1.0) )
+    end
+  end
+
+  def asinh(z)
+    if Complex.generic?(z)
+      asinh!(z)
+    else
+      log( z + sqrt(1.0+z*z) )
+    end
+  end
+
+  def atanh(z)
+    if Complex.generic?(z) and z >= -1 and z <= 1
+      atanh!(z)
+    else
+      log( (1.0+z) / (1.0-z) ) / 2.0
+    end
+  end
+
+  module_function :sqrt!
+  module_function :sqrt
+  module_function :exp!
+  module_function :exp
+  module_function :log!
+  module_function :log
+  module_function :log10!
+  module_function :log10
+  module_function :cosh!
+  module_function :cosh
+  module_function :cos!
+  module_function :cos
+  module_function :sinh!
+  module_function :sinh
+  module_function :sin!
+  module_function :sin
+  module_function :tan!
+  module_function :tan
+  module_function :tanh!
+  module_function :tanh
+  module_function :acos!
+  module_function :acos
+  module_function :asin!
+  module_function :asin
+  module_function :atan!
+  module_function :atan
+  module_function :atan2!
+  module_function :atan2
+  module_function :acosh!
+  module_function :acosh
+  module_function :asinh!
+  module_function :asinh
+  module_function :atanh!
+  module_function :atanh
+  
+end
+
+# Documentation comments:
+#  - source: original (researched from pickaxe)
+#  - a couple of fixme's
+#  - RDoc output for Bignum etc. is a bit short, with nothing but an
+#    (undocumented) alias.  No big deal.
diff --git a/ruby_1_8_6/lib/csv.rb b/ruby_1_8_6/lib/csv.rb
new file mode 100644
index 0000000000..f6c12fa285
--- /dev/null
+++ b/ruby_1_8_6/lib/csv.rb
@@ -0,0 +1,992 @@
+# CSV -- module for generating/parsing CSV data.
+# Copyright (C) 2000-2004  NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>.
+  
+# $Id$
+  
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+  
+  
+class CSV
+  class IllegalFormatError < RuntimeError; end
+
+  # deprecated
+  class Cell < String
+    def initialize(data = "", is_null = false)
+      super(is_null ? "" : data)
+    end
+
+    def data
+      to_s
+    end
+  end
+
+  # deprecated
+  class Row < Array
+  end
+
+  # Open a CSV formatted file for reading or writing.
+  #
+  # For reading.
+  #
+  # EXAMPLE 1
+  #   CSV.open('csvfile.csv', 'r') do |row|
+  #     p row
+  #   end
+  #
+  # EXAMPLE 2
+  #   reader = CSV.open('csvfile.csv', 'r')
+  #   row1 = reader.shift
+  #   row2 = reader.shift
+  #   if row2.empty?
+  #     p 'row2 not find.'
+  #   end
+  #   reader.close
+  #
+  # ARGS
+  #   filename: filename to parse.
+  #   col_sep: Column separator.  ?, by default.  If you want to separate
+  #     fields with semicolon, give ?; here.
+  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
+  #     want to separate records with \r, give ?\r here.
+  #
+  # RETURNS
+  #   reader instance.  To get parse result, see CSV::Reader#each.
+  #
+  #
+  # For writing.
+  #
+  # EXAMPLE 1
+  #   CSV.open('csvfile.csv', 'w') do |writer|
+  #     writer << ['r1c1', 'r1c2']
+  #     writer << ['r2c1', 'r2c2']
+  #     writer << [nil, nil]
+  #   end
+  #
+  # EXAMPLE 2
+  #   writer = CSV.open('csvfile.csv', 'w')
+  #   writer << ['r1c1', 'r1c2'] << ['r2c1', 'r2c2'] << [nil, nil]
+  #   writer.close
+  #
+  # ARGS
+  #   filename: filename to generate.
+  #   col_sep: Column separator.  ?, by default.  If you want to separate
+  #     fields with semicolon, give ?; here.
+  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
+  #     want to separate records with \r, give ?\r here.
+  #
+  # RETURNS
+  #   writer instance.  See CSV::Writer#<< and CSV::Writer#add_row to know how
+  #   to generate CSV string.
+  #
+  def CSV.open(path, mode, fs = nil, rs = nil, &block)
+    if mode == 'r' or mode == 'rb'
+      open_reader(path, mode, fs, rs, &block)
+    elsif mode == 'w' or mode == 'wb'
+      open_writer(path, mode, fs, rs, &block)
+    else
+      raise ArgumentError.new("'mode' must be 'r', 'rb', 'w', or 'wb'")
+    end
+  end
+
+  def CSV.foreach(path, rs = nil, &block)
+    open_reader(path, 'r', ',', rs, &block)
+  end
+
+  def CSV.read(path, length = nil, offset = nil)
+    CSV.parse(IO.read(path, length, offset))
+  end
+  
+  def CSV.readlines(path, rs = nil)
+    reader = open_reader(path, 'r', ',', rs)
+    begin
+      reader.collect { |row| row }
+    ensure
+      reader.close
+    end
+  end
+
+  def CSV.generate(path, fs = nil, rs = nil, &block)
+    open_writer(path, 'w', fs, rs, &block)
+  end
+
+  # Parse lines from given string or stream.  Return rows as an Array of Arrays.
+  def CSV.parse(str_or_readable, fs = nil, rs = nil, &block)
+    if File.exist?(str_or_readable)
+      STDERR.puts("CSV.parse(filename) is deprecated." +
+        "  Use CSV.open(filename, 'r') instead.")
+      return open_reader(str_or_readable, 'r', fs, rs, &block)
+    end
+    if block
+      CSV::Reader.parse(str_or_readable, fs, rs) do |row|
+        yield(row)
+      end
+      nil
+    else
+      CSV::Reader.create(str_or_readable, fs, rs).collect { |row| row }
+    end
+  end
+
+  # Parse a line from given string.  Bear in mind it parses ONE LINE.  Rest of
+  # the string is ignored for example "a,b\r\nc,d" => ['a', 'b'] and the
+  # second line 'c,d' is ignored.
+  #
+  # If you don't know whether a target string to parse is exactly 1 line or
+  # not, use CSV.parse_row instead of this method.
+  def CSV.parse_line(src, fs = nil, rs = nil)
+    fs ||= ','
+    if fs.is_a?(Fixnum)
+      fs = fs.chr
+    end
+    if !rs.nil? and rs.is_a?(Fixnum)
+      rs = rs.chr
+    end
+    idx = 0
+    res_type = :DT_COLSEP
+    row = []
+    begin
+      while res_type == :DT_COLSEP
+        res_type, idx, cell = parse_body(src, idx, fs, rs)
+        row << cell
+      end
+    rescue IllegalFormatError
+      return []
+    end
+    row
+  end
+
+  # Create a line from cells.  each cell is stringified by to_s.
+  def CSV.generate_line(row, fs = nil, rs = nil)
+    if row.size == 0
+      return ''
+    end
+    fs ||= ','
+    if fs.is_a?(Fixnum)
+      fs = fs.chr
+    end
+    if !rs.nil? and rs.is_a?(Fixnum)
+      rs = rs.chr
+    end
+    res_type = :DT_COLSEP
+    result_str = ''
+    idx = 0
+    while true
+      generate_body(row[idx], result_str, fs, rs)
+      idx += 1
+      if (idx == row.size)
+        break
+      end
+      generate_separator(:DT_COLSEP, result_str, fs, rs)
+    end
+    result_str
+  end
+  
+  # Parse a line from string.  Consider using CSV.parse_line instead.
+  # To parse lines in CSV string, see EXAMPLE below.
+  #
+  # EXAMPLE
+  #   src = "a,b\r\nc,d\r\ne,f"
+  #   idx = 0
+  #   begin
+  #     parsed = []
+  #     parsed_cells, idx = CSV.parse_row(src, idx, parsed)
+  #     puts "Parsed #{ parsed_cells } cells."
+  #     p parsed
+  #   end while parsed_cells > 0
+  #
+  # ARGS
+  #   src: a CSV data to be parsed.  Must respond '[](idx)'.
+  #     src[](idx) must return a char. (Not a string such as 'a', but 97).
+  #     src[](idx_out_of_bounds) must return nil.  A String satisfies this
+  #     requirement.
+  #   idx: index of parsing location of 'src'.  0 origin.
+  #   out_dev: buffer for parsed cells.  Must respond '<<(aString)'.
+  #   col_sep: Column separator.  ?, by default.  If you want to separate
+  #     fields with semicolon, give ?; here.
+  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
+  #     want to separate records with \r, give ?\r here.
+  #
+  # RETURNS
+  #   parsed_cells: num of parsed cells.
+  #   idx: index of next parsing location of 'src'.
+  #
+  def CSV.parse_row(src, idx, out_dev, fs = nil, rs = nil)
+    fs ||= ','
+    if fs.is_a?(Fixnum)
+      fs = fs.chr
+    end
+    if !rs.nil? and rs.is_a?(Fixnum)
+      rs = rs.chr
+    end
+    idx_backup = idx
+    parsed_cells = 0
+    res_type = :DT_COLSEP
+    begin
+      while res_type != :DT_ROWSEP
+        res_type, idx, cell = parse_body(src, idx, fs, rs)
+        if res_type == :DT_EOS
+          if idx == idx_backup #((parsed_cells == 0) and cell.nil?)
+            return 0, 0
+          end
+          res_type = :DT_ROWSEP
+        end
+        parsed_cells += 1
+        out_dev << cell
+      end
+    rescue IllegalFormatError
+      return 0, 0
+    end
+    return parsed_cells, idx
+  end
+  
+  # Convert a line from cells data to string.  Consider using CSV.generate_line
+  # instead.  To generate multi-row CSV string, see EXAMPLE below.
+  #
+  # EXAMPLE
+  #   row1 = ['a', 'b']
+  #   row2 = ['c', 'd']
+  #   row3 = ['e', 'f']
+  #   src = [row1, row2, row3]
+  #   buf = ''
+  #   src.each do |row|
+  #     parsed_cells = CSV.generate_row(row, 2, buf)
+  #     puts "Created #{ parsed_cells } cells."
+  #   end
+  #   p buf
+  #
+  # ARGS
+  #   src: an Array of String to be converted to CSV string.  Must respond to
+  #     'size' and '[](idx)'.  src[idx] must return String.
+  #   cells: num of cells in a line.
+  #   out_dev: buffer for generated CSV string.  Must respond to '<<(string)'.
+  #   col_sep: Column separator.  ?, by default.  If you want to separate
+  #     fields with semicolon, give ?; here.
+  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
+  #     want to separate records with \r, give ?\r here.
+  #
+  # RETURNS
+  #   parsed_cells: num of converted cells.
+  #
+  def CSV.generate_row(src, cells, out_dev, fs = nil, rs = nil)
+    fs ||= ','
+    if fs.is_a?(Fixnum)
+      fs = fs.chr
+    end
+    if !rs.nil? and rs.is_a?(Fixnum)
+      rs = rs.chr
+    end
+    src_size = src.size
+    if (src_size == 0)
+      if cells == 0
+        generate_separator(:DT_ROWSEP, out_dev, fs, rs)
+      end
+      return 0
+    end
+    res_type = :DT_COLSEP
+    parsed_cells = 0
+    generate_body(src[parsed_cells], out_dev, fs, rs)
+    parsed_cells += 1
+    while ((parsed_cells < cells) and (parsed_cells != src_size))
+      generate_separator(:DT_COLSEP, out_dev, fs, rs)
+      generate_body(src[parsed_cells], out_dev, fs, rs)
+      parsed_cells += 1
+    end
+    if (parsed_cells == cells)
+      generate_separator(:DT_ROWSEP, out_dev, fs, rs)
+    else
+      generate_separator(:DT_COLSEP, out_dev, fs, rs)
+    end
+    parsed_cells
+  end
+  
+  # Private class methods.
+  class << self
+  private
+
+    def open_reader(path, mode, fs, rs, &block)
+      file = File.open(path, mode)
+      if block
+        begin
+          CSV::Reader.parse(file, fs, rs) do |row|
+            yield(row)
+          end
+        ensure
+          file.close
+        end
+        nil
+      else
+        reader = CSV::Reader.create(file, fs, rs)
+        reader.close_on_terminate
+        reader
+      end
+    end
+
+    def open_writer(path, mode, fs, rs, &block)
+      file = File.open(path, mode)
+      if block
+        begin
+          CSV::Writer.generate(file, fs, rs) do |writer|
+            yield(writer)
+          end
+        ensure
+          file.close
+        end
+        nil
+      else
+        writer = CSV::Writer.create(file, fs, rs) 
+        writer.close_on_terminate
+        writer
+      end
+    end
+
+    def parse_body(src, idx, fs, rs)
+      fs_str = fs
+      fs_size = fs_str.size
+      rs_str = rs || "\n"
+      rs_size = rs_str.size
+      fs_idx = rs_idx = 0
+      cell = Cell.new
+      state = :ST_START
+      quoted = cr = false
+      c = nil
+      last_idx = idx
+      while c = src[idx]
+        unless quoted
+          fschar = (c == fs_str[fs_idx])
+          rschar = (c == rs_str[rs_idx])
+          # simple 1 char backtrack
+          if !fschar and c == fs_str[0]
+            fs_idx = 0
+            fschar = true
+            if state == :ST_START
+              state = :ST_DATA
+            elsif state == :ST_QUOTE
+              raise IllegalFormatError
+            end
+          end
+          if !rschar and c == rs_str[0]
+            rs_idx = 0
+            rschar = true
+            if state == :ST_START
+              state = :ST_DATA
+            elsif state == :ST_QUOTE
+              raise IllegalFormatError
+            end
+          end
+        end
+        if c == ?"
+          fs_idx = rs_idx = 0
+          if cr
+            raise IllegalFormatError
+          end
+          cell << src[last_idx, (idx - last_idx)]
+          last_idx = idx
+          if state == :ST_DATA
+            if quoted
+              last_idx += 1
+              quoted = false
+              state = :ST_QUOTE
+            else
+              raise IllegalFormatError
+            end
+          elsif state == :ST_QUOTE
+            cell << c.chr
+            last_idx += 1
+            quoted = true
+            state = :ST_DATA
+          else  # :ST_START
+            quoted = true
+            last_idx += 1
+            state = :ST_DATA
+          end
+        elsif fschar or rschar
+          if fschar
+            fs_idx += 1
+          end
+          if rschar
+            rs_idx += 1
+          end
+          sep = nil
+          if fs_idx == fs_size
+            if state == :ST_START and rs_idx > 0 and fs_idx < rs_idx
+              state = :ST_DATA
+            end
+            cell << src[last_idx, (idx - last_idx - (fs_size - 1))]
+            last_idx = idx
+            fs_idx = rs_idx = 0
+            if cr
+              raise IllegalFormatError
+            end
+            sep = :DT_COLSEP
+          elsif rs_idx == rs_size
+            if state == :ST_START and fs_idx > 0 and rs_idx < fs_idx
+              state = :ST_DATA
+            end
+            if !(rs.nil? and cr)
+              cell << src[last_idx, (idx - last_idx - (rs_size - 1))]
+              last_idx = idx
+            end
+            fs_idx = rs_idx = 0
+            sep = :DT_ROWSEP
+          end
+          if sep
+            if state == :ST_DATA
+              return sep, idx + 1, cell;
+            elsif state == :ST_QUOTE
+              return sep, idx + 1, cell;
+            else  # :ST_START
+              return sep, idx + 1, nil
+            end
+          end
+        elsif rs.nil? and c == ?\r
+          # special \r treatment for backward compatibility
+          fs_idx = rs_idx = 0
+          if cr
+            raise IllegalFormatError
+          end
+          cell << src[last_idx, (idx - last_idx)]
+          last_idx = idx
+          if quoted
+            state = :ST_DATA
+          else
+            cr = true
+          end
+        else
+          fs_idx = rs_idx = 0
+          if state == :ST_DATA or state == :ST_START
+            if cr
+              raise IllegalFormatError
+            end
+            state = :ST_DATA
+          else  # :ST_QUOTE
+            raise IllegalFormatError
+          end
+        end
+        idx += 1
+      end
+      if state == :ST_START
+        if fs_idx > 0 or rs_idx > 0
+          state = :ST_DATA
+        else
+          return :DT_EOS, idx, nil
+        end
+      elsif quoted
+        raise IllegalFormatError
+      elsif cr
+        raise IllegalFormatError
+      end
+      cell << src[last_idx, (idx - last_idx)]
+      last_idx = idx
+      return :DT_EOS, idx, cell
+    end
+  
+    def generate_body(cell, out_dev, fs, rs)
+      if cell.nil?
+        # empty
+      else
+        cell = cell.to_s
+        row_data = cell.dup
+        if (row_data.gsub!('"', '""') or
+            row_data.index(fs) or
+            (rs and row_data.index(rs)) or
+            (/[\r\n]/ =~ row_data) or
+            (cell.empty?))
+          out_dev << '"' << row_data << '"'
+        else
+          out_dev << row_data
+        end
+      end
+    end
+    
+    def generate_separator(type, out_dev, fs, rs)
+      case type
+      when :DT_COLSEP
+        out_dev << fs
+      when :DT_ROWSEP
+        out_dev << (rs || "\n")
+      end
+    end
+  end
+
+
+  # CSV formatted string/stream reader.
+  #
+  # EXAMPLE
+  #   read CSV lines untill the first column is 'stop'.
+  #
+  #   CSV::Reader.parse(File.open('bigdata', 'rb')) do |row|
+  #     p row
+  #     break if !row[0].is_null && row[0].data == 'stop'
+  #   end
+  #
+  class Reader
+    include Enumerable
+
+    # Parse CSV data and get lines.  Given block is called for each parsed row.
+    # Block value is always nil.  Rows are not cached for performance reason.
+    def Reader.parse(str_or_readable, fs = ',', rs = nil, &block)
+      reader = Reader.create(str_or_readable, fs, rs)
+      if block
+        reader.each do |row|
+          yield(row)
+        end
+        reader.close
+        nil
+      else
+        reader
+      end
+    end
+
+    # Returns reader instance.
+    def Reader.create(str_or_readable, fs = ',', rs = nil)
+      case str_or_readable
+      when IO
+        IOReader.new(str_or_readable, fs, rs)
+      when String
+        StringReader.new(str_or_readable, fs, rs)
+      else
+        IOReader.new(str_or_readable, fs, rs)
+      end
+    end
+
+    def each
+      while true
+        row = []
+        parsed_cells = get_row(row)
+        if parsed_cells == 0
+          break
+        end
+        yield(row)
+      end
+      nil
+    end
+
+    def shift
+      row = []
+      parsed_cells = get_row(row)
+      row
+    end
+
+    def close
+      terminate
+    end
+
+  private
+
+    def initialize(dev)
+      raise RuntimeError.new('Do not instanciate this class directly.')
+    end
+
+    def get_row(row)
+      raise NotImplementedError.new('Method get_row must be defined in a derived class.')
+    end
+
+    def terminate
+      # Define if needed.
+    end
+  end
+  
+
+  class StringReader < Reader
+    def initialize(string, fs = ',', rs = nil)
+      @fs = fs
+      @rs = rs
+      @dev = string
+      @idx = 0
+      if @dev[0, 3] == "\xef\xbb\xbf"
+        @idx += 3
+      end
+    end
+
+  private
+
+    def get_row(row)
+      parsed_cells, next_idx = CSV.parse_row(@dev, @idx, row, @fs, @rs)
+      if parsed_cells == 0 and next_idx == 0 and @idx != @dev.size
+        raise IllegalFormatError.new
+      end
+      @idx = next_idx
+      parsed_cells
+    end
+  end
+
+
+  class IOReader < Reader
+    def initialize(io, fs = ',', rs = nil)
+      @io = io
+      @fs = fs
+      @rs = rs
+      @dev = CSV::IOBuf.new(@io)
+      @idx = 0
+      if @dev[0] == 0xef and @dev[1] == 0xbb and @dev[2] == 0xbf
+        @idx += 3
+      end
+      @close_on_terminate = false
+    end
+
+    # Tell this reader to close the IO when terminated (Triggered by invoking
+    # CSV::IOReader#close).
+    def close_on_terminate
+      @close_on_terminate = true
+    end
+
+  private
+
+    def get_row(row)
+      parsed_cells, next_idx = CSV.parse_row(@dev, @idx, row, @fs, @rs)
+      if parsed_cells == 0 and next_idx == 0 and !@dev.is_eos?
+        raise IllegalFormatError.new
+      end
+      dropped = @dev.drop(next_idx)
+      @idx = next_idx - dropped
+      parsed_cells
+    end
+
+    def terminate
+      if @close_on_terminate
+        @io.close
+      end
+
+      if @dev
+        @dev.close
+      end
+    end
+  end
+
+
+  # CSV formatted string/stream writer.
+  #
+  # EXAMPLE
+  #   Write rows to 'csvout' file.
+  #
+  #   outfile = File.open('csvout', 'wb')
+  #   CSV::Writer.generate(outfile) do |csv|
+  #     csv << ['c1', nil, '', '"', "\r\n", 'c2']
+  #     ...
+  #   end
+  #
+  #   outfile.close
+  #
+  class Writer
+    # Given block is called with the writer instance.  str_or_writable must
+    # handle '<<(string)'.
+    def Writer.generate(str_or_writable, fs = ',', rs = nil, &block)
+      writer = Writer.create(str_or_writable, fs, rs)
+      if block
+        yield(writer)
+        writer.close
+        nil
+      else
+        writer
+      end
+    end
+
+    # str_or_writable must handle '<<(string)'.
+    def Writer.create(str_or_writable, fs = ',', rs = nil)
+      BasicWriter.new(str_or_writable, fs, rs)
+    end
+
+    # dump CSV stream to the device.  argument must be an Array of String.
+    def <<(row)
+      CSV.generate_row(row, row.size, @dev, @fs, @rs)
+      self
+    end
+    alias add_row <<
+
+    def close
+      terminate
+    end
+
+  private
+
+    def initialize(dev)
+      raise RuntimeError.new('Do not instanciate this class directly.')
+    end
+
+    def terminate
+      # Define if needed.
+    end
+  end
+
+
+  class BasicWriter < Writer
+    def initialize(str_or_writable, fs = ',', rs = nil)
+      @fs = fs
+      @rs = rs
+      @dev = str_or_writable
+      @close_on_terminate = false
+    end
+
+    # Tell this writer to close the IO when terminated (Triggered by invoking
+    # CSV::BasicWriter#close).
+    def close_on_terminate
+      @close_on_terminate = true
+    end
+
+  private
+
+    def terminate
+      if @close_on_terminate
+        @dev.close
+      end
+    end
+  end
+
+private
+
+  # Buffered stream.
+  #
+  # EXAMPLE 1 -- an IO.
+  #   class MyBuf < StreamBuf
+  #     # Do initialize myself before a super class.  Super class might call my
+  #     # method 'read'. (Could be awful for C++ user. :-)
+  #     def initialize(s)
+  #       @s = s
+  #       super()
+  #     end
+  #
+  #     # define my own 'read' method.
+  #     # CAUTION: Returning nil means EnfOfStream.
+  #     def read(size)
+  #       @s.read(size)
+  #     end
+  #
+  #     # release buffers. in Ruby which has GC, you do not have to call this...
+  #     def terminate
+  #       @s = nil
+  #       super()
+  #     end
+  #   end
+  #
+  #   buf = MyBuf.new(STDIN)
+  #   my_str = ''
+  #   p buf[0, 0]               # => '' (null string)
+  #   p buf[0]                  # => 97 (char code of 'a')
+  #   p buf[0, 1]               # => 'a'
+  #   my_str = buf[0, 5]
+  #   p my_str                  # => 'abcde' (5 chars)
+  #   p buf[0, 6]               # => "abcde\n" (6 chars)
+  #   p buf[0, 7]               # => "abcde\n" (6 chars)
+  #   p buf.drop(3)             # => 3 (dropped chars)
+  #   p buf.get(0, 2)           # => 'de' (2 chars)
+  #   p buf.is_eos?             # => false (is not EOS here)
+  #   p buf.drop(5)             # => 3 (dropped chars)
+  #   p buf.is_eos?             # => true (is EOS here)
+  #   p buf[0]                  # => nil (is EOS here)
+  #
+  # EXAMPLE 2 -- String.
+  #   This is a conceptual example.  No pros with this.
+  #
+  #   class StrBuf < StreamBuf
+  #     def initialize(s)
+  #       @str = s
+  #       @idx = 0
+  #       super()
+  #     end
+  #
+  #     def read(size)
+  #       str = @str[@idx, size]
+  #       @idx += str.size
+  #       str
+  #     end
+  #   end
+  #
+  class StreamBuf
+    # get a char or a partial string from the stream.
+    # idx: index of a string to specify a start point of a string to get.
+    # unlike String instance, idx < 0 returns nil.
+    # n: size of a string to get.
+    # returns char at idx if n == nil.
+    # returns a partial string, from idx to (idx + n) if n != nil.  at EOF,
+    # the string size could not equal to arg n.
+    def [](idx, n = nil) 
+      if idx < 0
+        return nil
+      end
+      if (idx_is_eos?(idx))
+        if n and (@offset + idx == buf_size(@cur_buf))
+          # Like a String, 'abc'[4, 1] returns nil and
+          # 'abc'[3, 1] returns '' not nil.
+          return ''
+        else
+          return nil
+        end
+      end
+      my_buf = @cur_buf
+      my_offset = @offset
+      next_idx = idx
+      while (my_offset + next_idx >= buf_size(my_buf))
+        if (my_buf == @buf_tail_idx)
+          unless add_buf
+            break
+          end
+        end
+        next_idx = my_offset + next_idx - buf_size(my_buf)
+        my_buf += 1
+        my_offset = 0
+      end
+      loc = my_offset + next_idx
+      if !n
+        return @buf_list[my_buf][loc]           # Fixnum of char code.
+      elsif (loc + n - 1 < buf_size(my_buf))
+        return @buf_list[my_buf][loc, n]        # String.
+      else # should do loop insted of (tail) recursive call...
+        res = @buf_list[my_buf][loc, BufSize]
+        size_added = buf_size(my_buf) - loc
+        if size_added > 0
+          idx += size_added
+          n -= size_added
+          ret = self[idx, n]
+          if ret
+            res << ret
+          end
+        end
+        return res
+      end
+    end
+    alias get []
+  
+    # drop a string from the stream.
+    # returns dropped size.  at EOF, dropped size might not equals to arg n.
+    # Once you drop the head of the stream, access to the dropped part via []
+    # or get returns nil.
+    def drop(n)
+      if is_eos?
+        return 0
+      end
+      size_dropped = 0
+      while (n > 0)
+        if !@is_eos or (@cur_buf != @buf_tail_idx)
+          if (@offset + n < buf_size(@cur_buf))
+            size_dropped += n
+            @offset += n
+            n = 0
+          else
+            size = buf_size(@cur_buf) - @offset
+            size_dropped += size
+            n -= size
+            @offset = 0
+            unless rel_buf
+              unless add_buf
+                break
+              end
+              @cur_buf = @buf_tail_idx
+            end
+          end
+        end
+      end
+      size_dropped
+    end
+  
+    def is_eos?
+      return idx_is_eos?(0)
+    end
+  
+    # WARN: Do not instantiate this class directly.  Define your own class
+    # which derives this class and define 'read' instance method.
+    def initialize
+      @buf_list = []
+      @cur_buf = @buf_tail_idx = -1
+      @offset = 0
+      @is_eos = false
+      add_buf
+      @cur_buf = @buf_tail_idx
+    end
+  
+  protected
+
+    def terminate
+      while (rel_buf); end
+    end
+  
+    # protected method 'read' must be defined in derived classes.
+    # CAUTION: Returning a string which size is not equal to 'size' means
+    # EnfOfStream.  When it is not at EOS, you must block the callee, try to
+    # read and return the sized string.
+    def read(size) # raise EOFError
+      raise NotImplementedError.new('Method read must be defined in a derived class.')
+    end
+  
+  private
+  
+    def buf_size(idx)
+      @buf_list[idx].size
+    end
+
+    def add_buf
+      if @is_eos
+        return false
+      end
+      begin
+        str_read = read(BufSize)
+      rescue EOFError
+        str_read = nil
+      rescue
+        terminate
+        raise
+      end
+      if str_read.nil?
+        @is_eos = true
+        @buf_list.push('')
+        @buf_tail_idx += 1
+        false
+      else
+        @buf_list.push(str_read)
+        @buf_tail_idx += 1
+        true
+      end
+    end
+  
+    def rel_buf
+      if (@cur_buf < 0)
+        return false
+      end
+      @buf_list[@cur_buf] = nil
+      if (@cur_buf == @buf_tail_idx)
+        @cur_buf = -1
+        return false
+      else
+        @cur_buf += 1
+        return true
+      end
+    end
+  
+    def idx_is_eos?(idx)
+      (@is_eos and ((@cur_buf < 0) or (@cur_buf == @buf_tail_idx)))
+    end
+  
+    BufSize = 1024 * 8
+  end
+
+  # Buffered IO.
+  #
+  # EXAMPLE
+  #   # File 'bigdata' could be a giga-byte size one!
+  #   buf = CSV::IOBuf.new(File.open('bigdata', 'rb'))
+  #   CSV::Reader.new(buf).each do |row|
+  #     p row
+  #     break if row[0].data == 'admin'
+  #   end
+  #
+  class IOBuf < StreamBuf
+    def initialize(s)
+      @s = s
+      super()
+    end
+  
+    def close
+      terminate
+    end
+
+  private
+
+    def read(size)
+      @s.read(size)
+    end
+ 
+    def terminate
+      super()
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/date.rb b/ruby_1_8_6/lib/date.rb
new file mode 100644
index 0000000000..6da4d6aa8e
--- /dev/null
+++ b/ruby_1_8_6/lib/date.rb
@@ -0,0 +1,1708 @@
+#
+# date.rb - date and time library
+#
+# Author: Tadayoshi Funaba 1998-2006
+#
+# Documentation: William Webber <william@williamwebber.com>
+#
+#--
+# $Id: date.rb,v 2.30 2006-12-30 21:43:41+09 tadf Exp $
+#++
+#
+# == Overview
+#
+# This file provides two classes for working with
+# dates and times.
+#
+# The first class, Date, represents dates.
+# It works with years, months, weeks, and days.
+# See the Date class documentation for more details.
+#
+# The second, DateTime, extends Date to include hours,
+# minutes, seconds, and fractions of a second.  It
+# provides basic support for time zones.  See the
+# DateTime class documentation for more details.
+#
+# === Ways of calculating the date.
+#
+# In common usage, the date is reckoned in years since or
+# before the Common Era (CE/BCE, also known as AD/BC), then
+# as a month and day-of-the-month within the current year.
+# This is known as the *Civil* *Date*, and abbreviated
+# as +civil+ in the Date class.
+#
+# Instead of year, month-of-the-year,  and day-of-the-month,
+# the date can also be reckoned in terms of year and
+# day-of-the-year.  This is known as the *Ordinal* *Date*,
+# and is abbreviated as +ordinal+ in the Date class.  (Note
+# that referring to this as the Julian date is incorrect.)
+#
+# The date can also be reckoned in terms of year, week-of-the-year,
+# and day-of-the-week.  This is known as the *Commercial*
+# *Date*, and is abbreviated as +commercial+ in the
+# Date class.  The commercial week runs Monday (day-of-the-week
+# 1) to Sunday (day-of-the-week 7), in contrast to the civil
+# week which runs Sunday (day-of-the-week 0) to Saturday
+# (day-of-the-week 6).  The first week of the commercial year
+# starts on the Monday on or before January 1, and the commercial
+# year itself starts on this Monday, not January 1.
+#
+# For scientific purposes, it is convenient to refer to a date
+# simply as a day count, counting from an arbitrary initial
+# day.  The date first chosen for this was January 1, 4713 BCE.
+# A count of days from this date is the *Julian* *Day* *Number*
+# or *Julian* *Date*, which is abbreviated as +jd+ in the
+# Date class.  This is in local time, and counts from midnight
+# on the initial day.  The stricter usage is in UTC, and counts
+# from midday on the initial day.  This is referred to in the
+# Date class as the *Astronomical* *Julian* *Day* *Number*, and
+# abbreviated as +ajd+.  In the Date class, the Astronomical
+# Julian Day Number includes fractional days.
+#
+# Another absolute day count is the *Modified* *Julian* *Day*
+# *Number*, which takes November 17, 1858 as its initial day.
+# This is abbreviated as +mjd+ in the Date class.  There
+# is also an *Astronomical* *Modified* *Julian* *Day* *Number*,
+# which is in UTC and includes fractional days.  This is
+# abbreviated as +amjd+ in the Date class.  Like the Modified
+# Julian Day Number (and unlike the Astronomical Julian
+# Day Number), it counts from midnight.
+#
+# Alternative calendars such as the Chinese Lunar Calendar,
+# the Islamic Calendar, or the French Revolutionary Calendar
+# are not supported by the Date class; nor are calendars that
+# are based on an Era different from the Common Era, such as
+# the Japanese Imperial Calendar or the Republic of China
+# Calendar.
+#
+# === Calendar Reform
+#
+# The standard civil year is 365 days long.  However, the
+# solar year is fractionally longer than this.  To account
+# for this, a *leap* *year* is occasionally inserted.  This
+# is a year with 366 days, the extra day falling on February 29.
+# In the early days of the civil calendar, every fourth
+# year without exception was a leap year.  This way of
+# reckoning leap years is the *Julian* *Calendar*.
+#
+# However, the solar year is marginally shorter than 365 1/4
+# days, and so the *Julian* *Calendar* gradually ran slow
+# over the centuries.  To correct this, every 100th year
+# (but not every 400th year) was excluded as a leap year.
+# This way of reckoning leap years, which we use today, is
+# the *Gregorian* *Calendar*.
+#
+# The Gregorian Calendar was introduced at different times
+# in different regions.  The day on which it was introduced
+# for a particular region is the *Day* *of* *Calendar*
+# *Reform* for that region.  This is abbreviated as +sg+
+# (for Start of Gregorian calendar) in the Date class.
+#
+# Two such days are of particular
+# significance.  The first is October 15, 1582, which was
+# the Day of Calendar Reform for Italy and most Catholic
+# countries.  The second is September 14, 1752, which was
+# the Day of Calendar Reform for England and its colonies
+# (including what is now the United States).  These two
+# dates are available as the constants Date::ITALY and
+# Date::ENGLAND, respectively.  (By comparison, Germany and
+# Holland, less Catholic than Italy but less stubborn than
+# England, changed over in 1698; Sweden in 1753; Russia not
+# till 1918, after the Revolution; and Greece in 1923.  Many
+# Orthodox churches still use the Julian Calendar.  A complete
+# list of Days of Calendar Reform can be found at
+# http://www.polysyllabic.com/GregConv.html.)
+#
+# Switching from the Julian to the Gregorian calendar
+# involved skipping a number of days to make up for the
+# accumulated lag, and the later the switch was (or is)
+# done, the more days need to be skipped.  So in 1582 in Italy,
+# 4th October was followed by 15th October, skipping 10 days; in 1752
+# in England, 2nd September was followed by 14th September, skipping
+# 11 days; and if I decided to switch from Julian to Gregorian
+# Calendar this midnight, I would go from 27th July 2003 (Julian)
+# today to 10th August 2003 (Gregorian) tomorrow, skipping
+# 13 days.  The Date class is aware of this gap, and a supposed
+# date that would fall in the middle of it is regarded as invalid.
+#
+# The Day of Calendar Reform is relevant to all date representations
+# involving years.  It is not relevant to the Julian Day Numbers,
+# except for converting between them and year-based representations.
+#
+# In the Date and DateTime classes, the Day of Calendar Reform or
+# +sg+ can be specified a number of ways.  First, it can be as
+# the Julian Day Number of the Day of Calendar Reform.  Second,
+# it can be using the constants Date::ITALY or Date::ENGLAND; these
+# are in fact the Julian Day Numbers of the Day of Calendar Reform
+# of the respective regions.  Third, it can be as the constant
+# Date::JULIAN, which means to always use the Julian Calendar.
+# Finally, it can be as the constant Date::GREGORIAN, which means
+# to always use the Gregorian Calendar.
+#
+# Note: in the Julian Calendar, New Years Day was March 25.  The
+# Date class does not follow this convention.
+#
+# === Time Zones
+#
+# DateTime objects support a simple representation
+# of time zones.  Time zones are represented as an offset
+# from UTC, as a fraction of a day.  This offset is the
+# how much local time is later (or earlier) than UTC.
+# UTC offset 0 is centred on England (also known as GMT).
+# As you travel east, the offset increases until you
+# reach the dateline in the middle of the Pacific Ocean;
+# as you travel west, the offset decreases.  This offset
+# is abbreviated as +of+ in the Date class.
+#
+# This simple representation of time zones does not take
+# into account the common practice of Daylight Savings
+# Time or Summer Time.
+#
+# Most DateTime methods return the date and the
+# time in local time.  The two exceptions are
+# #ajd() and #amjd(), which return the date and time
+# in UTC time, including fractional days.
+#
+# The Date class does not support time zone offsets, in that
+# there is no way to create a Date object with a time zone.
+# However, methods of the Date class when used by a
+# DateTime instance will use the time zone offset of this
+# instance.
+#
+# == Examples of use
+#
+# === Print out the date of every Sunday between two dates.
+#
+#     def print_sundays(d1, d2)
+#         d1 +=1 while (d1.wday != 0)
+#         d1.step(d2, 7) do |date|
+#             puts "#{Date::MONTHNAMES[date.mon]} #{date.day}"
+#         end
+#     end
+#
+#     print_sundays(Date::civil(2003, 4, 8), Date::civil(2003, 5, 23))
+#
+# === Calculate how many seconds to go till midnight on New Year's Day.
+#
+#     def secs_to_new_year(now = DateTime::now())
+#         new_year = DateTime.new(now.year + 1, 1, 1)
+#         dif = new_year - now
+#         hours, mins, secs, ignore_fractions = Date::day_fraction_to_time(dif)
+#         return hours * 60 * 60 + mins * 60 + secs
+#     end
+#
+#     puts secs_to_new_year()
+
+require 'rational'
+require 'date/format'
+
+# Class representing a date.
+#
+# See the documentation to the file date.rb for an overview.
+#
+# Internally, the date is represented as an Astronomical
+# Julian Day Number, +ajd+.  The Day of Calendar Reform, +sg+, is
+# also stored, for conversions to other date formats.  (There
+# is also an +of+ field for a time zone offset, but this
+# is only for the use of the DateTime subclass.)
+#
+# A new Date object is created using one of the object creation
+# class methods named after the corresponding date format, and the
+# arguments appropriate to that date format; for instance,
+# Date::civil() (aliased to Date::new()) with year, month,
+# and day-of-month, or Date::ordinal() with year and day-of-year.
+# All of these object creation class methods also take the
+# Day of Calendar Reform as an optional argument.
+#
+# Date objects are immutable once created.
+#
+# Once a Date has been created, date values
+# can be retrieved for the different date formats supported
+# using instance methods.  For instance, #mon() gives the
+# Civil month, #cwday() gives the Commercial day of the week,
+# and #yday() gives the Ordinal day of the year.  Date values
+# can be retrieved in any format, regardless of what format
+# was used to create the Date instance.
+#
+# The Date class includes the Comparable module, allowing
+# date objects to be compared and sorted, ranges of dates
+# to be created, and so forth.
+class Date
+
+  include Comparable
+
+  # Full month names, in English.  Months count from 1 to 12; a
+  # month's numerical representation indexed into this array
+  # gives the name of that month (hence the first element is nil).
+  MONTHNAMES = [nil] + %w(January February March April May June July
+			  August September October November December)
+
+  # Full names of days of the week, in English.  Days of the week
+  # count from 0 to 6 (except in the commercial week); a day's numerical
+  # representation indexed into this array gives the name of that day.
+  DAYNAMES = %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday)
+
+  # Abbreviated month names, in English.
+  ABBR_MONTHNAMES = [nil] + %w(Jan Feb Mar Apr May Jun
+			       Jul Aug Sep Oct Nov Dec)
+
+  # Abbreviated day names, in English.
+  ABBR_DAYNAMES = %w(Sun Mon Tue Wed Thu Fri Sat)
+
+  [MONTHNAMES, DAYNAMES, ABBR_MONTHNAMES, ABBR_DAYNAMES].each do |xs|
+    xs.each{|x| x.freeze}.freeze
+  end
+
+  class Infinity < Numeric # :nodoc:
+
+    include Comparable
+
+    def initialize(d=1) @d = d <=> 0 end
+
+    def d() @d end
+
+    protected :d
+
+    def zero? () false end
+    def finite? () false end
+    def infinite? () d.nonzero? end
+    def nan? () d.zero? end
+
+    def abs() self.class.new end
+
+    def -@ () self.class.new(-d) end
+    def +@ () self.class.new(+d) end
+
+    def <=> (other)
+      case other
+      when Infinity; d <=> other.d
+      when Numeric; d
+      else
+	begin
+	  l, r = other.coerce(self)
+	  return l <=> r
+	rescue NoMethodError
+	end
+      end
+      nil
+    end
+
+    def coerce(other)
+      case other
+      when Numeric; return -d, d
+      else
+	super
+      end
+    end
+
+  end
+
+  # The Julian Day Number of the Day of Calendar Reform for Italy
+  # and the Catholic countries.
+  ITALY     = 2299161 # 1582-10-15
+
+  # The Julian Day Number of the Day of Calendar Reform for England
+  # and her Colonies.
+  ENGLAND   = 2361222 # 1752-09-14
+
+  # A constant used to indicate that a Date should always use the
+  # Julian calendar.
+  JULIAN    =  Infinity.new
+
+  # A constant used to indicate that a Date should always use the
+  # Gregorian calendar.
+  GREGORIAN = -Infinity.new
+
+  UNIXEPOCH = 2440588 # 1970-01-01 :nodoc:
+
+  # Does a given Julian Day Number fall inside the old-style (Julian)
+  # calendar?
+  #
+  # +jd+ is the Julian Day Number in question. +sg+ may be Date::GREGORIAN,
+  # in which case the answer is false; it may be Date::JULIAN, in which case
+  # the answer is true; or it may a number representing the Day of
+  # Calendar Reform. Date::ENGLAND and Date::ITALY are two possible such
+  # days.
+
+  def self.julian? (jd, sg)
+    case sg
+    when Numeric
+      jd < sg
+    else
+      if $VERBOSE
+	warn("#{caller.shift.sub(/:in .*/, '')}: " \
+"warning: do not use non-numerical object as julian day number anymore")
+      end
+      not sg
+    end
+  end
+
+  # Does a given Julian Day Number fall inside the new-style (Gregorian)
+  # calendar?
+  #
+  # The reverse of self.os?  See the documentation for that method for
+  # more details.
+  def self.gregorian? (jd, sg) !julian?(jd, sg) end
+
+  def self.fix_style(jd, sg) # :nodoc:
+    if julian?(jd, sg)
+    then JULIAN
+    else GREGORIAN end
+  end
+
+  private_class_method :fix_style
+
+  # Convert an Ordinal Date to a Julian Day Number.
+  #
+  # +y+ and +d+ are the year and day-of-year to convert.
+  # +sg+ specifies the Day of Calendar Reform.
+  #
+  # Returns the corresponding Julian Day Number.
+  def self.ordinal_to_jd(y, d, sg=GREGORIAN)
+    civil_to_jd(y, 1, d, sg)
+  end
+
+  # Convert a Julian Day Number to an Ordinal Date.
+  #
+  # +jd+ is the Julian Day Number to convert.
+  # +sg+ specifies the Day of Calendar Reform.
+  #
+  # Returns the corresponding Ordinal Date as
+  # [year, day_of_year]
+  def self.jd_to_ordinal(jd, sg=GREGORIAN)
+    y = jd_to_civil(jd, sg)[0]
+    doy = jd - civil_to_jd(y - 1, 12, 31, fix_style(jd, sg))
+    return y, doy
+  end
+
+  # Convert a Civil Date to a Julian Day Number.
+  # +y+, +m+, and +d+ are the year, month, and day of the
+  # month.  +sg+ specifies the Day of Calendar Reform.
+  #
+  # Returns the corresponding Julian Day Number.
+  def self.civil_to_jd(y, m, d, sg=GREGORIAN)
+    if m <= 2
+      y -= 1
+      m += 12
+    end
+    a = (y / 100.0).floor
+    b = 2 - a + (a / 4.0).floor
+    jd = (365.25 * (y + 4716)).floor +
+      (30.6001 * (m + 1)).floor +
+      d + b - 1524
+    if julian?(jd, sg)
+      jd -= b
+    end
+    jd
+  end
+
+  # Convert a Julian Day Number to a Civil Date.  +jd+ is
+  # the Julian Day Number. +sg+ specifies the Day of
+  # Calendar Reform.
+  #
+  # Returns the corresponding [year, month, day_of_month]
+  # as a three-element array.
+  def self.jd_to_civil(jd, sg=GREGORIAN)
+    if julian?(jd, sg)
+      a = jd
+    else
+      x = ((jd - 1867216.25) / 36524.25).floor
+      a = jd + 1 + x - (x / 4.0).floor
+    end
+    b = a + 1524
+    c = ((b - 122.1) / 365.25).floor
+    d = (365.25 * c).floor
+    e = ((b - d) / 30.6001).floor
+    dom = b - d - (30.6001 * e).floor
+    if e <= 13
+      m = e - 1
+      y = c - 4716
+    else
+      m = e - 13
+      y = c - 4715
+    end
+    return y, m, dom
+  end
+
+  # Convert a Commercial Date to a Julian Day Number.
+  #
+  # +y+, +w+, and +d+ are the (commercial) year, week of the year,
+  # and day of the week of the Commercial Date to convert.
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.commercial_to_jd(y, w, d, ns=GREGORIAN)
+    jd = civil_to_jd(y, 1, 4, ns)
+    (jd - (((jd - 1) + 1) % 7)) +
+      7 * (w - 1) +
+      (d - 1)
+  end
+
+  # Convert a Julian Day Number to a Commercial Date
+  #
+  # +jd+ is the Julian Day Number to convert.
+  # +sg+ specifies the Day of Calendar Reform.
+  #
+  # Returns the corresponding Commercial Date as
+  # [commercial_year, week_of_year, day_of_week]
+  def self.jd_to_commercial(jd, sg=GREGORIAN)
+    ns = fix_style(jd, sg)
+    a = jd_to_civil(jd - 3, ns)[0]
+    y = if jd >= commercial_to_jd(a + 1, 1, 1, ns) then a + 1 else a end
+    w = 1 + ((jd - commercial_to_jd(y, 1, 1, ns)) / 7).floor
+    d = (jd + 1) % 7
+    d = 7 if d == 0
+    return y, w, d
+  end
+
+  def self.weeknum_to_jd(y, w, d, f=0, ns=GREGORIAN) # :nodoc:
+    a = civil_to_jd(y, 1, 1, ns) + 6
+    (a - ((a - f) + 1) % 7 - 7) + 7 * w + d
+  end
+
+  def self.jd_to_weeknum(jd, f=0, sg=GREGORIAN) # :nodoc:
+    ns = fix_style(jd, sg)
+    y, m, d = jd_to_civil(jd, ns)
+    a = civil_to_jd(y, 1, 1, ns) + 6
+    w, d = (jd - (a - ((a - f) + 1) % 7) + 7).divmod(7)
+    return y, w, d
+  end
+
+  private_class_method :weeknum_to_jd, :jd_to_weeknum
+
+  # Convert an Astronomical Julian Day Number to a (civil) Julian
+  # Day Number.
+  #
+  # +ajd+ is the Astronomical Julian Day Number to convert.
+  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+  #
+  # Returns the (civil) Julian Day Number as [day_number,
+  # fraction] where +fraction+ is always 1/2.
+  def self.ajd_to_jd(ajd, of=0) (ajd + of + 1.to_r/2).divmod(1) end
+
+  # Convert a (civil) Julian Day Number to an Astronomical Julian
+  # Day Number.
+  #
+  # +jd+ is the Julian Day Number to convert, and +fr+ is a
+  # fractional day.
+  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+  #
+  # Returns the Astronomical Julian Day Number as a single
+  # numeric value.
+  def self.jd_to_ajd(jd, fr, of=0) jd + fr - of - 1.to_r/2 end
+
+  # Convert a fractional day +fr+ to [hours, minutes, seconds,
+  # fraction_of_a_second]
+  def self.day_fraction_to_time(fr)
+    h,   fr = fr.divmod(1.to_r/24)
+    min, fr = fr.divmod(1.to_r/1440)
+    s,   fr = fr.divmod(1.to_r/86400)
+    return h, min, s, fr
+  end
+
+  # Convert an +h+ hour, +min+ minutes, +s+ seconds period
+  # to a fractional day.
+  def self.time_to_day_fraction(h, min, s)
+    h.to_r/24 + min.to_r/1440 + s.to_r/86400
+  end
+
+  # Convert an Astronomical Modified Julian Day Number to an
+  # Astronomical Julian Day Number.
+  def self.amjd_to_ajd(amjd) amjd + 4800001.to_r/2 end
+
+  # Convert an Astronomical Julian Day Number to an
+  # Astronomical Modified Julian Day Number.
+  def self.ajd_to_amjd(ajd) ajd - 4800001.to_r/2 end
+
+  # Convert a Modified Julian Day Number to a Julian
+  # Day Number.
+  def self.mjd_to_jd(mjd) mjd + 2400001 end
+
+  # Convert a Julian Day Number to a Modified Julian Day
+  # Number.
+  def self.jd_to_mjd(jd) jd - 2400001 end
+
+  # Convert a count of the number of days since the adoption
+  # of the Gregorian Calendar (in Italy) to a Julian Day Number.
+  def self.ld_to_jd(ld) ld + 2299160 end
+
+  # Convert a Julian Day Number to the number of days since
+  # the adoption of the Gregorian Calendar (in Italy).
+  def self.jd_to_ld(jd) jd - 2299160 end
+
+  # Convert a Julian Day Number to the day of the week.
+  #
+  # Sunday is day-of-week 0; Saturday is day-of-week 6.
+  def self.jd_to_wday(jd) (jd + 1) % 7 end
+
+  # Is a year a leap year in the Julian calendar?
+  #
+  # All years divisible by 4 are leap years in the Julian calendar.
+  def self.julian_leap? (y) y % 4 == 0 end
+
+  # Is a year a leap year in the Gregorian calendar?
+  #
+  # All years divisible by 4 are leap years in the Gregorian calendar,
+  # except for years divisible by 100 and not by 400.
+  def self.gregorian_leap? (y) y % 4 == 0 && y % 100 != 0 || y % 400 == 0 end
+
+  class << self; alias_method :leap?, :gregorian_leap? end
+  class << self; alias_method :new!, :new end
+
+  # Is +jd+ a valid Julian Day Number?
+  #
+  # If it is, returns it.  In fact, any value is treated as a valid
+  # Julian Day Number.
+  def self.valid_jd? (jd, sg=ITALY) jd end
+
+  # Do the year +y+ and day-of-year +d+ make a valid Ordinal Date?
+  # Returns the corresponding Julian Day Number if they do, or
+  # nil if they don't.
+  #
+  # +d+ can be a negative number, in which case it counts backwards
+  # from the end of the year (-1 being the last day of the year).
+  # No year wraparound is performed, however, so valid values of
+  # +d+ are -365 .. -1, 1 .. 365 on a non-leap-year,
+  # -366 .. -1, 1 .. 366 on a leap year.
+  # A date falling in the period skipped in the Day of Calendar Reform
+  # adjustment is not valid.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.valid_ordinal? (y, d, sg=ITALY)
+    if d < 0
+      ny, = (y + 1).divmod(1)
+      jd = ordinal_to_jd(ny, d + 1, sg)
+      ns = fix_style(jd, sg)
+      return unless [y] == jd_to_ordinal(jd, sg)[0..0]
+      return unless [ny, 1] == jd_to_ordinal(jd - d, ns)
+    else
+      jd = ordinal_to_jd(y, d, sg)
+      return unless [y, d] == jd_to_ordinal(jd, sg)
+    end
+    jd
+  end
+
+  # Do year +y+, month +m+, and day-of-month +d+ make a
+  # valid Civil Date?  Returns the corresponding Julian
+  # Day Number if they do, nil if they don't.
+  #
+  # +m+ and +d+ can be negative, in which case they count
+  # backwards from the end of the year and the end of the
+  # month respectively.  No wraparound is performed, however,
+  # and invalid values cause an ArgumentError to be raised.
+  # A date falling in the period skipped in the Day of Calendar
+  # Reform adjustment is not valid.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.valid_civil? (y, m, d, sg=ITALY)
+    if m < 0
+      m += 13
+    end
+    if d < 0
+      ny, nm = (y * 12 + m).divmod(12)
+      nm,    = (nm + 1).divmod(1)
+      jd = civil_to_jd(ny, nm, d + 1, sg)
+      ns = fix_style(jd, sg)
+      return unless [y, m] == jd_to_civil(jd, sg)[0..1]
+      return unless [ny, nm, 1] == jd_to_civil(jd - d, ns)
+    else
+      jd = civil_to_jd(y, m, d, sg)
+      return unless [y, m, d] == jd_to_civil(jd, sg)
+    end
+    jd
+  end
+
+  class << self; alias_method :valid_date?, :valid_civil? end
+
+  # Do year +y+, week-of-year +w+, and day-of-week +d+ make a
+  # valid Commercial Date?  Returns the corresponding Julian
+  # Day Number if they do, nil if they don't.
+  #
+  # Monday is day-of-week 1; Sunday is day-of-week 7.
+  #
+  # +w+ and +d+ can be negative, in which case they count
+  # backwards from the end of the year and the end of the
+  # week respectively.  No wraparound is performed, however,
+  # and invalid values cause an ArgumentError to be raised.
+  # A date falling in the period skipped in the Day of Calendar
+  # Reform adjustment is not valid.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.valid_commercial? (y, w, d, sg=ITALY)
+    if d < 0
+      d += 8
+    end
+    if w < 0
+      ny, nw, nd =
+	jd_to_commercial(commercial_to_jd(y + 1, 1, 1) + w * 7)
+      return unless ny == y
+      w = nw
+    end
+    jd = commercial_to_jd(y, w, d)
+    return unless gregorian?(jd, sg)
+    return unless [y, w, d] == jd_to_commercial(jd)
+    jd
+  end
+
+  def self.valid_weeknum? (y, w, d, f, sg=ITALY) # :nodoc:
+    if d < 0
+      d += 7
+    end
+    if w < 0
+      ny, nw, nd, nf =
+	jd_to_weeknum(weeknum_to_jd(y + 1, 1, f, f) + w * 7, f)
+      return unless ny == y
+      w = nw
+    end
+    jd = weeknum_to_jd(y, w, d, f)
+    return unless gregorian?(jd, sg)
+    return unless [y, w, d] == jd_to_weeknum(jd, f)
+    jd
+  end
+
+  private_class_method :valid_weeknum?
+
+  # Do hour +h+, minute +min+, and second +s+ constitute a valid time?
+  #
+  # If they do, returns their value as a fraction of a day.  If not,
+  # returns nil.
+  #
+  # The 24-hour clock is used.  Negative values of +h+, +min+, and
+  # +sec+ are treating as counting backwards from the end of the
+  # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
+  # wraparound is performed.
+  def self.valid_time? (h, min, s)
+    h   += 24 if h   < 0
+    min += 60 if min < 0
+    s   += 60 if s   < 0
+    return unless ((0..23) === h &&
+		   (0..59) === min &&
+		   (0..59) === s) ||
+		  (24 == h &&
+		    0 == min &&
+		    0 == s)
+    time_to_day_fraction(h, min, s)
+  end
+
+  # Create a new Date object from a Julian Day Number.
+  #
+  # +jd+ is the Julian Day Number; if not specified, it defaults to
+  # 0.
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.jd(jd=0, sg=ITALY)
+    jd = valid_jd?(jd, sg)
+    new!(jd_to_ajd(jd, 0, 0), 0, sg)
+  end
+
+  # Create a new Date object from an Ordinal Date, specified
+  # by year +y+ and day-of-year +d+. +d+ can be negative,
+  # in which it counts backwards from the end of the year.
+  # No year wraparound is performed, however.  An invalid
+  # value for +d+ results in an ArgumentError being raised.
+  #
+  # +y+ defaults to -4712, and +d+ to 1; this is Julian Day
+  # Number day 0.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.ordinal(y=-4712, d=1, sg=ITALY)
+    unless jd = valid_ordinal?(y, d, sg)
+      raise ArgumentError, 'invalid date'
+    end
+    new!(jd_to_ajd(jd, 0, 0), 0, sg)
+  end
+
+  # Create a new Date object for the Civil Date specified by
+  # year +y+, month +m+, and day-of-month +d+.
+  #
+  # +m+ and +d+ can be negative, in which case they count
+  # backwards from the end of the year and the end of the
+  # month respectively.  No wraparound is performed, however,
+  # and invalid values cause an ArgumentError to be raised.
+  # can be negative
+  #
+  # +y+ defaults to -4712, +m+ to 1, and +d+ to 1; this is
+  # Julian Day Number day 0.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.civil(y=-4712, m=1, d=1, sg=ITALY)
+    unless jd = valid_civil?(y, m, d, sg)
+      raise ArgumentError, 'invalid date'
+    end
+    new!(jd_to_ajd(jd, 0, 0), 0, sg)
+  end
+
+  class << self; alias_method :new, :civil end
+
+  # Create a new Date object for the Commercial Date specified by
+  # year +y+, week-of-year +w+, and day-of-week +d+.
+  #
+  # Monday is day-of-week 1; Sunday is day-of-week 7.
+  #
+  # +w+ and +d+ can be negative, in which case they count
+  # backwards from the end of the year and the end of the
+  # week respectively.  No wraparound is performed, however,
+  # and invalid values cause an ArgumentError to be raised.
+  #
+  # +y+ defaults to 1582, +w+ to 41, and +d+ to 5, the Day of
+  # Calendar Reform for Italy and the Catholic countries.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.commercial(y=1582, w=41, d=5, sg=ITALY)
+    unless jd = valid_commercial?(y, w, d, sg)
+      raise ArgumentError, 'invalid date'
+    end
+    new!(jd_to_ajd(jd, 0, 0), 0, sg)
+  end
+
+  def self.weeknum(y=1582, w=41, d=5, f=0, sg=ITALY) # :nodoc:
+    unless jd = valid_weeknum?(y, w, d, f, sg)
+      raise ArgumentError, 'invalid date'
+    end
+    new!(jd_to_ajd(jd, 0, 0), 0, sg)
+  end
+
+  private_class_method :weeknum
+
+  def self.rewrite_frags(elem) # :nodoc:
+    elem ||= {}
+    if seconds = elem[:seconds]
+      d,   fr = seconds.divmod(86400)
+      h,   fr = fr.divmod(3600)
+      min, fr = fr.divmod(60)
+      s,   fr = fr.divmod(1)
+      elem[:jd] = UNIXEPOCH + d
+      elem[:hour] = h
+      elem[:min] = min
+      elem[:sec] = s
+      elem[:sec_fraction] = fr
+      elem.delete(:seconds)
+      elem.delete(:offset)
+    end
+    elem
+  end
+
+  private_class_method :rewrite_frags
+
+  def self.complete_frags(elem) # :nodoc:
+    i = 0
+    g = [[:time, [:hour, :min, :sec]],
+	 [nil, [:jd]],
+	 [:ordinal, [:year, :yday, :hour, :min, :sec]],
+	 [:civil, [:year, :mon, :mday, :hour, :min, :sec]],
+	 [:commercial, [:cwyear, :cweek, :cwday, :hour, :min, :sec]],
+	 [:wday, [:wday, :hour, :min, :sec]],
+	 [:wnum0, [:year, :wnum0, :wday, :hour, :min, :sec]],
+	 [:wnum1, [:year, :wnum1, :wday, :hour, :min, :sec]],
+	 [nil, [:cwyear, :cweek, :wday, :hour, :min, :sec]],
+	 [nil, [:year, :wnum0, :cwday, :hour, :min, :sec]],
+	 [nil, [:year, :wnum1, :cwday, :hour, :min, :sec]]].
+      collect{|k, a| e = elem.values_at(*a).compact; [k, a, e]}.
+      select{|k, a, e| e.size > 0}.
+      sort_by{|k, a, e| [e.size, i -= 1]}.last
+
+    d = nil
+
+    if g && g[0] && (g[1].size - g[2].size) != 0
+      d ||= Date.today
+
+      case g[0]
+      when :ordinal
+	elem[:year] ||= d.year
+	elem[:yday] ||= 1
+      when :civil
+	g[1].each do |e|
+	  break if elem[e]
+	  elem[e] = d.__send__(e)
+	end
+	elem[:mon]  ||= 1
+	elem[:mday] ||= 1
+      when :commercial
+	g[1].each do |e|
+	  break if elem[e]
+	  elem[e] = d.__send__(e)
+	end
+	elem[:cweek] ||= 1
+	elem[:cwday] ||= 1
+      when :wday
+	elem[:jd] ||= (d - d.wday + elem[:wday]).jd
+      when :wnum0
+	g[1].each do |e|
+	  break if elem[e]
+	  elem[e] = d.__send__(e)
+	end
+	elem[:wnum0] ||= 0
+	elem[:wday]  ||= 0
+      when :wnum1
+	g[1].each do |e|
+	  break if elem[e]
+	  elem[e] = d.__send__(e)
+	end
+	elem[:wnum1] ||= 0
+	elem[:wday]  ||= 0
+      end
+    end
+
+    if g && g[0] == :time
+      if self <= DateTime
+	d ||= Date.today
+	elem[:jd] ||= d.jd
+      end
+    end
+
+    elem[:hour] ||= 0
+    elem[:min]  ||= 0
+    elem[:sec]  ||= 0
+    elem[:sec] = [elem[:sec], 59].min
+
+    elem
+  end
+
+  private_class_method :complete_frags
+
+  def self.valid_date_frags?(elem, sg) # :nodoc:
+    catch :jd do
+      a = elem.values_at(:jd)
+      if a.all?
+	if jd = valid_jd?(*(a << sg))
+	  throw :jd, jd
+	end
+      end
+
+      a = elem.values_at(:year, :yday)
+      if a.all?
+	if jd = valid_ordinal?(*(a << sg))
+	  throw :jd, jd
+	end
+      end
+
+      a = elem.values_at(:year, :mon, :mday)
+      if a.all?
+	if jd = valid_civil?(*(a << sg))
+	  throw :jd, jd
+	end
+      end
+
+      a = elem.values_at(:cwyear, :cweek, :cwday)
+      if a[2].nil? && elem[:wday]
+	a[2] = elem[:wday].nonzero? || 7
+      end
+      if a.all?
+	if jd = valid_commercial?(*(a << sg))
+	  throw :jd, jd
+	end
+      end
+
+      a = elem.values_at(:year, :wnum0, :wday)
+      if a[2].nil? && elem[:cwday]
+	a[2] = elem[:cwday] % 7
+      end
+      if a.all?
+	if jd = valid_weeknum?(*(a << 0 << sg))
+	  throw :jd, jd
+	end
+      end
+
+      a = elem.values_at(:year, :wnum1, :wday)
+      if a[2]
+	a[2] = (a[2] - 1) % 7
+      end
+      if a[2].nil? && elem[:cwday]
+	a[2] = (elem[:cwday] - 1) % 7
+      end
+      if a.all?
+	if jd = valid_weeknum?(*(a << 1 << sg))
+	  throw :jd, jd
+	end
+      end
+    end
+  end
+
+  private_class_method :valid_date_frags?
+
+  def self.valid_time_frags? (elem) # :nodoc:
+    h, min, s = elem.values_at(:hour, :min, :sec)
+    valid_time?(h, min, s)
+  end
+
+  private_class_method :valid_time_frags?
+
+  def self.new_by_frags(elem, sg) # :nodoc:
+    elem = rewrite_frags(elem)
+    elem = complete_frags(elem)
+    unless jd = valid_date_frags?(elem, sg)
+      raise ArgumentError, 'invalid date'
+    end
+    new!(jd_to_ajd(jd, 0, 0), 0, sg)
+  end
+
+  private_class_method :new_by_frags
+
+  # Create a new Date object by parsing from a String
+  # according to a specified format.
+  #
+  # +str+ is a String holding a date representation.
+  # +fmt+ is the format that the date is in.  See
+  # date/format.rb for details on supported formats.
+  #
+  # The default +str+ is '-4712-01-01', and the default
+  # +fmt+ is '%F', which means Year-Month-Day_of_Month.
+  # This gives Julian Day Number day 0.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  #
+  # An ArgumentError will be raised if +str+ cannot be
+  # parsed.
+  def self.strptime(str='-4712-01-01', fmt='%F', sg=ITALY)
+    elem = _strptime(str, fmt)
+    new_by_frags(elem, sg)
+  end
+
+  # Create a new Date object by parsing from a String,
+  # without specifying the format.
+  #
+  # +str+ is a String holding a date representation.
+  # +comp+ specifies whether to interpret 2-digit years
+  # as 19XX (>= 69) or 20XX (< 69); the default is not to.
+  # The method will attempt to parse a date from the String
+  # using various heuristics; see #_parse in date/format.rb
+  # for more details.  If parsing fails, an ArgumentError
+  # will be raised.
+  #
+  # The default +str+ is '-4712-01-01'; this is Julian
+  # Day Number day 0.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.parse(str='-4712-01-01', comp=false, sg=ITALY)
+    elem = _parse(str, comp)
+    new_by_frags(elem, sg)
+  end
+
+  class << self
+
+    def once(*ids) # :nodoc:
+      for id in ids
+	module_eval <<-"end;"
+	  alias_method :__#{id.to_i}__, :#{id.to_s}
+	  private :__#{id.to_i}__
+	  def #{id.to_s}(*args, &block)
+	    (@__#{id.to_i}__ ||= [__#{id.to_i}__(*args, &block)])[0]
+	  end
+	end;
+      end
+    end
+
+    private :once
+
+  end
+
+  # *NOTE* this is the documentation for the method new!().  If
+  # you are reading this as the documentation for new(), that is
+  # because rdoc doesn't fully support the aliasing of the
+  # initialize() method.
+  # new() is in
+  # fact an alias for #civil(): read the documentation for that
+  # method instead.
+  #
+  # Create a new Date object.
+  #
+  # +ajd+ is the Astronomical Julian Day Number.
+  # +of+ is the offset from UTC as a fraction of a day.
+  # Both default to 0.
+  #
+  # +sg+ specifies the Day of Calendar Reform to use for this
+  # Date object.
+  #
+  # Using one of the factory methods such as Date::civil is
+  # generally easier and safer.
+  def initialize(ajd=0, of=0, sg=ITALY) @ajd, @of, @sg = ajd, of, sg end
+
+  # Get the date as an Astronomical Julian Day Number.
+  def ajd() @ajd end
+
+  # Get the date as an Astronomical Modified Julian Day Number.
+  def amjd() self.class.ajd_to_amjd(@ajd) end
+
+  once :amjd
+
+  # Get the date as a Julian Day Number.
+  def jd() self.class.ajd_to_jd(@ajd, @of)[0] end
+
+  # Get any fractional day part of the date.
+  def day_fraction() self.class.ajd_to_jd(@ajd, @of)[1] end
+
+  # Get the date as a Modified Julian Day Number.
+  def mjd() self.class.jd_to_mjd(jd) end
+
+  # Get the date as the number of days since the Day of Calendar
+  # Reform (in Italy and the Catholic countries).
+  def ld() self.class.jd_to_ld(jd) end
+
+  once :jd, :day_fraction, :mjd, :ld
+
+  # Get the date as a Civil Date, [year, month, day_of_month]
+  def civil() self.class.jd_to_civil(jd, @sg) end # :nodoc:
+
+  # Get the date as an Ordinal Date, [year, day_of_year]
+  def ordinal() self.class.jd_to_ordinal(jd, @sg) end # :nodoc:
+
+  # Get the date as a Commercial Date, [year, week_of_year, day_of_week]
+  def commercial() self.class.jd_to_commercial(jd, @sg) end # :nodoc:
+
+  def weeknum0() self.class.__send__(:jd_to_weeknum, jd, 0, @sg) end # :nodoc:
+  def weeknum1() self.class.__send__(:jd_to_weeknum, jd, 1, @sg) end # :nodoc:
+
+  once :civil, :ordinal, :commercial, :weeknum0, :weeknum1
+  private :civil, :ordinal, :commercial, :weeknum0, :weeknum1
+
+  # Get the year of this date.
+  def year() civil[0] end
+
+  # Get the day-of-the-year of this date.
+  #
+  # January 1 is day-of-the-year 1
+  def yday() ordinal[1] end
+
+  # Get the month of this date.
+  #
+  # January is month 1.
+  def mon() civil[1] end
+
+  # Get the day-of-the-month of this date.
+  def mday() civil[2] end
+
+  alias_method :month, :mon
+  alias_method :day, :mday
+
+  def wnum0() weeknum0[1] end # :nodoc:
+  def wnum1() weeknum1[1] end # :nodoc:
+
+  private :wnum0, :wnum1
+
+  # Get the time of this date as [hours, minutes, seconds,
+  # fraction_of_a_second]
+  def time() self.class.day_fraction_to_time(day_fraction) end # :nodoc:
+
+  once :time
+  private :time
+
+  # Get the hour of this date.
+  def hour() time[0] end
+
+  # Get the minute of this date.
+  def min() time[1] end
+
+  # Get the second of this date.
+  def sec() time[2] end
+
+  # Get the fraction-of-a-second of this date.  The unit is in days.
+  # I do NOT recommend you to use this method.
+  def sec_fraction() time[3] end
+
+  private :hour, :min, :sec, :sec_fraction
+
+  def zone() strftime('%:z') end
+
+  private :zone
+
+  # Get the commercial year of this date.  See *Commercial* *Date*
+  # in the introduction for how this differs from the normal year.
+  def cwyear() commercial[0] end
+
+  # Get the commercial week of the year of this date.
+  def cweek() commercial[1] end
+
+  # Get the commercial day of the week of this date.  Monday is
+  # commercial day-of-week 1; Sunday is commercial day-of-week 7.
+  def cwday() commercial[2] end
+
+  # Get the week day of this date.  Sunday is day-of-week 0;
+  # Saturday is day-of-week 6.
+  def wday() self.class.jd_to_wday(jd) end
+
+  once :wday
+
+=begin
+  MONTHNAMES.each_with_index do |n, i|
+    if n
+      define_method(n.downcase + '?'){mon == i}
+    end
+  end
+
+  DAYNAMES.each_with_index do |n, i|
+    define_method(n.downcase + '?'){wday == i}
+  end
+=end
+
+  # Is the current date old-style (Julian Calendar)?
+  def julian? () self.class.julian?(jd, @sg) end
+
+  # Is the current date new-style (Gregorian Calendar)?
+  def gregorian? () self.class.gregorian?(jd, @sg) end
+
+  once :julian?, :gregorian?
+
+  def fix_style # :nodoc:
+    if julian?
+    then self.class::JULIAN
+    else self.class::GREGORIAN end
+  end
+
+  private :fix_style
+
+  # Is this a leap year?
+  def leap?
+    self.class.jd_to_civil(self.class.civil_to_jd(year, 3, 1, fix_style) - 1,
+		     fix_style)[-1] == 29
+  end
+
+  once :leap?
+
+  # When is the Day of Calendar Reform for this Date object?
+  def start() @sg end
+
+  # Create a copy of this Date object using a new Day of Calendar Reform.
+  def new_start(sg=self.class::ITALY) self.class.new!(@ajd, @of, sg) end
+
+  # Create a copy of this Date object that uses the Italian/Catholic
+  # Day of Calendar Reform.
+  def italy() new_start(self.class::ITALY) end
+
+  # Create a copy of this Date object that uses the English/Colonial
+  # Day of Calendar Reform.
+  def england() new_start(self.class::ENGLAND) end
+
+  # Create a copy of this Date object that always uses the Julian
+  # Calendar.
+  def julian() new_start(self.class::JULIAN) end
+
+  # Create a copy of this Date object that always uses the Gregorian
+  # Calendar.
+  def gregorian() new_start(self.class::GREGORIAN) end
+
+  def offset() @of end
+
+  def new_offset(of=0)
+    if String === of
+      of = (self.class.zone_to_diff(of) || 0).to_r/86400
+    end
+    self.class.new!(@ajd, of, @sg)
+  end
+
+  private :offset, :new_offset
+
+  # Return a new Date object that is +n+ days later than the
+  # current one.
+  #
+  # +n+ may be a negative value, in which case the new Date
+  # is earlier than the current one; however, #-() might be
+  # more intuitive.
+  #
+  # If +n+ is not a Numeric, a TypeError will be thrown.  In
+  # particular, two Dates cannot be added to each other.
+  def + (n)
+    case n
+    when Numeric; return self.class.new!(@ajd + n, @of, @sg)
+    end
+    raise TypeError, 'expected numeric'
+  end
+
+  # If +x+ is a Numeric value, create a new Date object that is
+  # +x+ days earlier than the current one.
+  #
+  # If +x+ is a Date, return the number of days between the
+  # two dates; or, more precisely, how many days later the current
+  # date is than +x+.
+  #
+  # If +x+ is neither Numeric nor a Date, a TypeError is raised.
+  def - (x)
+    case x
+    when Numeric; return self.class.new!(@ajd - x, @of, @sg)
+    when Date;    return @ajd - x.ajd
+    end
+    raise TypeError, 'expected numeric or date'
+  end
+
+  # Compare this date with another date.
+  #
+  # +other+ can also be a Numeric value, in which case it is
+  # interpreted as an Astronomical Julian Day Number.
+  #
+  # Comparison is by Astronomical Julian Day Number, including
+  # fractional days.  This means that both the time and the
+  # timezone offset are taken into account when comparing
+  # two DateTime instances.  When comparing a DateTime instance
+  # with a Date instance, the time of the latter will be
+  # considered as falling on midnight UTC.
+  def <=> (other)
+    case other
+    when Numeric; return @ajd <=> other
+    when Date;    return @ajd <=> other.ajd
+    end
+    nil
+  end
+
+  # The relationship operator for Date.
+  #
+  # Compares dates by Julian Day Number.  When comparing
+  # two DateTime instances, or a DateTime with a Date,
+  # the instances will be regarded as equivalent if they
+  # fall on the same date in local time.
+  def === (other)
+    case other
+    when Numeric; return jd == other
+    when Date;    return jd == other.jd
+    end
+    false
+  end
+
+  def next_day(n=1) self + n end
+# def prev_day(n=1) self - n end
+
+  private :next_day
+
+  # Return a new Date one day after this one.
+  def next() next_day end
+
+  alias_method :succ, :next
+
+  # Return a new Date object that is +n+ months later than
+  # the current one.
+  #
+  # If the day-of-the-month of the current Date is greater
+  # than the last day of the target month, the day-of-the-month
+  # of the returned Date will be the last day of the target month.
+  def >> (n)
+    y, m = (year * 12 + (mon - 1) + n).divmod(12)
+    m,   = (m + 1)                    .divmod(1)
+    d = mday
+    d -= 1 until jd2 = self.class.valid_civil?(y, m, d, fix_style)
+    self + (jd2 - jd)
+  end
+
+  # Return a new Date object that is +n+ months earlier than
+  # the current one.
+  #
+  # If the day-of-the-month of the current Date is greater
+  # than the last day of the target month, the day-of-the-month
+  # of the returned Date will be the last day of the target month.
+  def << (n) self >> -n end
+
+=begin
+  def next_month(n=1) self >> n end
+  def prev_month(n=1) self << n end
+
+  def next_year(n=1) self >> n * 12 end
+  def prev_year(n=1) self << n * 12 end
+=end
+
+#  require 'enumerator'
+
+  # Step the current date forward +step+ days at a
+  # time (or backward, if +step+ is negative) until
+  # we reach +limit+ (inclusive), yielding the resultant
+  # date at each step.
+  def step(limit, step=1) # :yield: date
+=begin
+    unless block_given?
+      return to_enum(:step, limit, step)
+    end
+=end
+    da = self
+    op = %w(- <= >=)[step <=> 0]
+    while da.__send__(op, limit)
+      yield da
+      da += step
+    end
+    self
+  end
+
+  # Step forward one day at a time until we reach +max+
+  # (inclusive), yielding each date as we go.
+  def upto(max, &block) # :yield: date
+    step(max, +1, &block)
+  end
+
+  # Step backward one day at a time until we reach +min+
+  # (inclusive), yielding each date as we go.
+  def downto(min, &block) # :yield: date
+    step(min, -1, &block)
+  end
+
+  # Is this Date equal to +other+?
+  #
+  # +other+ must both be a Date object, and represent the same date.
+  def eql? (other) Date === other && self == other end
+
+  # Calculate a hash value for this date.
+  def hash() @ajd.hash end
+
+  # Return internal object state as a programmer-readable string.
+  def inspect() format('#<%s: %s,%s,%s>', self.class, @ajd, @of, @sg) end
+
+  # Return the date as a human-readable string.
+  #
+  # The format used is YYYY-MM-DD.
+  def to_s() strftime end
+
+  # Dump to Marshal format.
+  def _dump(limit) Marshal.dump([@ajd, @of, @sg], -1) end
+
+# def self._load(str) new!(*Marshal.load(str)) end
+
+  # Load from Marshall format.
+  def self._load(str)
+    a = Marshal.load(str)
+    if a.size == 2
+      ajd,     sg = a
+           of = 0
+      ajd -= 1.to_r/2
+    else
+      ajd, of, sg = a
+    end
+    new!(ajd, of, sg)
+  end
+
+end
+
+# Class representing a date and time.
+#
+# See the documentation to the file date.rb for an overview.
+#
+# DateTime objects are immutable once created.
+#
+# == Other methods.
+#
+# The following methods are defined in Date, but declared private
+# there.  They are made public in DateTime.  They are documented
+# here.
+#
+# === hour()
+#
+# Get the hour-of-the-day of the time.  This is given
+# using the 24-hour clock, counting from midnight.  The first
+# hour after midnight is hour 0; the last hour of the day is
+# hour 23.
+#
+# === min()
+#
+# Get the minute-of-the-hour of the time.
+#
+# === sec()
+#
+# Get the second-of-the-minute of the time.
+#
+# === sec_fraction()
+#
+# Get the fraction of a second of the time.  This is returned as
+# a +Rational+.  The unit is in days.
+# I do NOT recommend you to use this method.
+#
+# === zone()
+#
+# Get the time zone as a String.  This is representation of the
+# time offset such as "+1000", not the true time-zone name.
+#
+# === offset()
+#
+# Get the time zone offset as a fraction of a day.  This is returned
+# as a +Rational+.
+#
+# === new_offset(of=0)
+#
+# Create a new DateTime object, identical to the current one, except
+# with a new time zone offset of +of+.  +of+ is the new offset from
+# UTC as a fraction of a day.
+#
+class DateTime < Date
+
+  # Create a new DateTime object corresponding to the specified
+  # Julian Day Number +jd+ and hour +h+, minute +min+, second +s+.
+  #
+  # The 24-hour clock is used.  Negative values of +h+, +min+, and
+  # +sec+ are treating as counting backwards from the end of the
+  # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
+  # wraparound is performed.  If an invalid time portion is specified,
+  # an ArgumentError is raised.
+  #
+  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+  # +sg+ specifies the Day of Calendar Reform.
+  #
+  # All day/time values default to 0.
+  def self.jd(jd=0, h=0, min=0, s=0, of=0, sg=ITALY)
+    unless (jd = valid_jd?(jd, sg)) &&
+	   (fr = valid_time?(h, min, s))
+      raise ArgumentError, 'invalid date'
+    end
+    if String === of
+      of = (zone_to_diff(of) || 0).to_r/86400
+    end
+    new!(jd_to_ajd(jd, fr, of), of, sg)
+  end
+
+  # Create a new DateTime object corresponding to the specified
+  # Ordinal Date and hour +h+, minute +min+, second +s+.
+  #
+  # The 24-hour clock is used.  Negative values of +h+, +min+, and
+  # +sec+ are treating as counting backwards from the end of the
+  # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
+  # wraparound is performed.  If an invalid time portion is specified,
+  # an ArgumentError is raised.
+  #
+  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+  # +sg+ specifies the Day of Calendar Reform.
+  #
+  # +y+ defaults to -4712, and +d+ to 1; this is Julian Day Number
+  # day 0.  The time values default to 0.
+  def self.ordinal(y=-4712, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
+    unless (jd = valid_ordinal?(y, d, sg)) &&
+	   (fr = valid_time?(h, min, s))
+      raise ArgumentError, 'invalid date'
+    end
+    if String === of
+      of = (zone_to_diff(of) || 0).to_r/86400
+    end
+    new!(jd_to_ajd(jd, fr, of), of, sg)
+  end
+
+  # Create a new DateTime object corresponding to the specified
+  # Civil Date and hour +h+, minute +min+, second +s+.
+  #
+  # The 24-hour clock is used.  Negative values of +h+, +min+, and
+  # +sec+ are treating as counting backwards from the end of the
+  # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
+  # wraparound is performed.  If an invalid time portion is specified,
+  # an ArgumentError is raised.
+  #
+  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+  # +sg+ specifies the Day of Calendar Reform.
+  #
+  # +y+ defaults to -4712, +m+ to 1, and +d+ to 1; this is Julian Day
+  # Number day 0.  The time values default to 0.
+  def self.civil(y=-4712, m=1, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
+    unless (jd = valid_civil?(y, m, d, sg)) &&
+	   (fr = valid_time?(h, min, s))
+      raise ArgumentError, 'invalid date'
+    end
+    if String === of
+      of = (zone_to_diff(of) || 0).to_r/86400
+    end
+    new!(jd_to_ajd(jd, fr, of), of, sg)
+  end
+
+  class << self; alias_method :new, :civil end
+
+  # Create a new DateTime object corresponding to the specified
+  # Commercial Date and hour +h+, minute +min+, second +s+.
+  #
+  # The 24-hour clock is used.  Negative values of +h+, +min+, and
+  # +sec+ are treating as counting backwards from the end of the
+  # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
+  # wraparound is performed.  If an invalid time portion is specified,
+  # an ArgumentError is raised.
+  #
+  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+  # +sg+ specifies the Day of Calendar Reform.
+  #
+  # +y+ defaults to 1582, +w+ to 41, and +d+ to 5; this is the Day of
+  # Calendar Reform for Italy and the Catholic countries.
+  # The time values default to 0.
+  def self.commercial(y=1582, w=41, d=5, h=0, min=0, s=0, of=0, sg=ITALY)
+    unless (jd = valid_commercial?(y, w, d, sg)) &&
+	   (fr = valid_time?(h, min, s))
+      raise ArgumentError, 'invalid date'
+    end
+    if String === of
+      of = (zone_to_diff(of) || 0).to_r/86400
+    end
+    new!(jd_to_ajd(jd, fr, of), of, sg)
+  end
+
+  def self.weeknum(y=1582, w=41, d=5, f=0, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc:
+    unless (jd = valid_weeknum?(y, w, d, f, sg)) &&
+	   (fr = valid_time?(h, min, s))
+      raise ArgumentError, 'invalid date'
+    end
+    if String === of
+      of = (zone_to_diff(of) || 0).to_r/86400
+    end
+    new!(jd_to_ajd(jd, fr, of), of, sg)
+  end
+
+  private_class_method :weeknum
+
+  def self.new_by_frags(elem, sg) # :nodoc:
+    elem = rewrite_frags(elem)
+    elem = complete_frags(elem)
+    unless (jd = valid_date_frags?(elem, sg)) &&
+	   (fr = valid_time_frags?(elem))
+      raise ArgumentError, 'invalid date'
+    end
+    sf = (elem[:sec_fraction] || 0)
+    fr += sf/86400
+    of = (elem[:offset] || 0)
+    of = of.to_r/86400
+    new!(jd_to_ajd(jd, fr, of), of, sg)
+  end
+
+  private_class_method :new_by_frags
+
+  # Create a new DateTime object by parsing from a String
+  # according to a specified format.
+  #
+  # +str+ is a String holding a date-time representation.
+  # +fmt+ is the format that the date-time is in.  See
+  # date/format.rb for details on supported formats.
+  #
+  # The default +str+ is '-4712-01-01T00:00:00+00:00', and the default
+  # +fmt+ is '%FT%T%z'.  This gives midnight on Julian Day Number day 0.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  #
+  # An ArgumentError will be raised if +str+ cannot be
+  # parsed.
+  def self.strptime(str='-4712-01-01T00:00:00+00:00', fmt='%FT%T%z', sg=ITALY)
+    elem = _strptime(str, fmt)
+    new_by_frags(elem, sg)
+  end
+
+  # Create a new DateTime object by parsing from a String,
+  # without specifying the format.
+  #
+  # +str+ is a String holding a date-time representation.
+  # +comp+ specifies whether to interpret 2-digit years
+  # as 19XX (>= 69) or 20XX (< 69); the default is not to.
+  # The method will attempt to parse a date-time from the String
+  # using various heuristics; see #_parse in date/format.rb
+  # for more details.  If parsing fails, an ArgumentError
+  # will be raised.
+  #
+  # The default +str+ is '-4712-01-01T00:00:00+00:00'; this is Julian
+  # Day Number day 0.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.parse(str='-4712-01-01T00:00:00+00:00', comp=false, sg=ITALY)
+    elem = _parse(str, comp)
+    new_by_frags(elem, sg)
+  end
+
+  public :hour, :min, :sec, :sec_fraction, :zone, :offset, :new_offset
+
+end
+
+class Time
+
+#  def to_time() getlocal end
+
+  def to_date
+    jd = Date.civil_to_jd(year, mon, mday, Date::ITALY)
+    Date.new!(Date.jd_to_ajd(jd, 0, 0), 0, Date::ITALY)
+  end
+
+  def to_datetime
+    jd = DateTime.civil_to_jd(year, mon, mday, DateTime::ITALY)
+    fr = DateTime.time_to_day_fraction(hour, min, [sec, 59].min) +
+	 usec.to_r/86400000000
+    of = utc_offset.to_r/86400
+    DateTime.new!(DateTime.jd_to_ajd(jd, fr, of), of, DateTime::ITALY)
+  end
+
+  private :to_date, :to_datetime
+
+end
+
+class Date
+
+=begin
+  def to_time() Time.local(year, mon, mday) end
+  def to_date() self end
+  def to_datetime() DateTime.new!(self.class.jd_to_ajd(jd, 0, 0), @of, @sg) end
+=end
+
+  # Create a new Date object representing today.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.today(sg=ITALY) Time.now.__send__(:to_date)    .new_start(sg) end
+
+  # Create a new DateTime object representing the current time.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.now  (sg=ITALY) Time.now.__send__(:to_datetime).new_start(sg) end
+
+  private_class_method :now
+
+end
+
+class DateTime < Date
+
+=begin
+  def to_time
+    d = new_offset(0)
+    d.instance_eval do
+      Time.utc(year, mon, mday, hour, min, sec,
+	       (sec_fraction * 86400000000).to_i)
+    end.
+	getlocal
+  end
+
+  def to_date() Date.new!(self.class.jd_to_ajd(jd, 0, 0), 0, @sg) end
+  def to_datetime() self end
+=end
+
+  private_class_method :today
+  public_class_method  :now
+
+end
+
+class Date
+
+  [ %w(os?	julian?),
+    %w(ns?	gregorian?),
+    %w(exist1?	valid_jd?),
+    %w(exist2?	valid_ordinal?),
+    %w(exist3?	valid_date?),
+    %w(exist?	valid_date?),
+    %w(existw?	valid_commercial?),
+    %w(new0	new!),
+    %w(new1	jd),
+    %w(new2	ordinal),
+    %w(new3	new),
+    %w(neww	commercial)
+  ].each do |old, new|
+    module_eval <<-"end;"
+      def self.#{old}(*args, &block)
+	if $VERBOSE
+	  warn("\#{caller.shift.sub(/:in .*/, '')}: " \
+	       "warning: \#{self}::#{old} is deprecated; " \
+	       "use \#{self}::#{new}")
+	end
+	#{new}(*args, &block)
+      end
+    end;
+  end
+
+  [ %w(os?	julian?),
+    %w(ns?	gregorian?),
+    %w(sg	start),
+    %w(newsg	new_start),
+    %w(of	offset),
+    %w(newof	new_offset)
+  ].each do |old, new|
+    module_eval <<-"end;"
+      def #{old}(*args, &block)
+	if $VERBOSE
+	  warn("\#{caller.shift.sub(/:in .*/, '')}: " \
+	       "warning: \#{self.class}\##{old} is deprecated; " \
+	       "use \#{self.class}\##{new}")
+	end
+	#{new}(*args, &block)
+      end
+    end;
+  end
+
+  private :of, :newof
+
+end
+
+class DateTime < Date
+
+  public :of, :newof
+
+end
diff --git a/ruby_1_8_6/lib/date/format.rb b/ruby_1_8_6/lib/date/format.rb
new file mode 100644
index 0000000000..8bd14c7fd0
--- /dev/null
+++ b/ruby_1_8_6/lib/date/format.rb
@@ -0,0 +1,1088 @@
+# format.rb: Written by Tadayoshi Funaba 1999-2007
+# $Id: format.rb,v 2.30 2007-01-07 09:16:24+09 tadf Exp $
+
+require 'rational'
+
+class Date
+
+  module Format # :nodoc:
+
+    MONTHS = {
+      'january'  => 1, 'february' => 2, 'march'    => 3, 'april'    => 4,
+      'may'      => 5, 'june'     => 6, 'july'     => 7, 'august'   => 8,
+      'september'=> 9, 'october'  =>10, 'november' =>11, 'december' =>12
+    }
+
+    DAYS = {
+      'sunday'   => 0, 'monday'   => 1, 'tuesday'  => 2, 'wednesday'=> 3,
+      'thursday' => 4, 'friday'   => 5, 'saturday' => 6
+    }
+
+    ABBR_MONTHS = {
+      'jan'      => 1, 'feb'      => 2, 'mar'      => 3, 'apr'      => 4,
+      'may'      => 5, 'jun'      => 6, 'jul'      => 7, 'aug'      => 8,
+      'sep'      => 9, 'oct'      =>10, 'nov'      =>11, 'dec'      =>12
+    }
+
+    ABBR_DAYS = {
+      'sun'      => 0, 'mon'      => 1, 'tue'      => 2, 'wed'      => 3,
+      'thu'      => 4, 'fri'      => 5, 'sat'      => 6
+    }
+
+    ZONES = {
+      'ut'  =>  0*3600, 'gmt' =>  0*3600, 'est' => -5*3600, 'edt' => -4*3600,
+      'cst' => -6*3600, 'cdt' => -5*3600, 'mst' => -7*3600, 'mdt' => -6*3600,
+      'pst' => -8*3600, 'pdt' => -7*3600,
+      'a'   =>  1*3600, 'b'   =>  2*3600, 'c'   =>  3*3600, 'd'   =>  4*3600,
+      'e'   =>  5*3600, 'f'   =>  6*3600, 'g'   =>  7*3600, 'h'   =>  8*3600,
+      'i'   =>  9*3600, 'k'   => 10*3600, 'l'   => 11*3600, 'm'   => 12*3600,
+      'n'   => -1*3600, 'o'   => -2*3600, 'p'   => -3*3600, 'q'   => -4*3600,
+      'r'   => -5*3600, 's'   => -6*3600, 't'   => -7*3600, 'u'   => -8*3600,
+      'v'   => -9*3600, 'w'   =>-10*3600, 'x'   =>-11*3600, 'y'   =>-12*3600,
+      'z'   =>  0*3600,
+      'utc' =>  0*3600, 'wet' =>  0*3600, 'bst' =>  1*3600, 'wat' => -1*3600,
+      'at'  => -2*3600, 'ast' => -4*3600, 'adt' => -3*3600, 'yst' => -9*3600,
+      'ydt' => -8*3600, 'hst' =>-10*3600, 'hdt' => -9*3600, 'cat' =>-10*3600,
+      'ahst'=>-10*3600, 'nt'  =>-11*3600, 'idlw'=>-12*3600, 'cet' =>  1*3600,
+      'met' =>  1*3600, 'mewt'=>  1*3600, 'mest'=>  2*3600, 'mesz'=>  2*3600,
+      'swt' =>  1*3600, 'sst' =>  2*3600, 'fwt' =>  1*3600, 'fst' =>  2*3600,
+      'eet' =>  2*3600, 'bt'  =>  3*3600, 'zp4' =>  4*3600, 'zp5' =>  5*3600,
+      'zp6' =>  6*3600, 'wast'=>  7*3600, 'wadt'=>  8*3600, 'cct' =>  8*3600,
+      'jst' =>  9*3600, 'east'=> 10*3600, 'eadt'=> 11*3600, 'gst' => 10*3600,
+      'nzt' => 12*3600, 'nzst'=> 12*3600, 'nzdt'=> 13*3600, 'idle'=> 12*3600,
+
+      'afghanistan'           =>   16200, 'alaskan'               =>  -32400,
+      'arab'                  =>   10800, 'arabian'               =>   14400,
+      'arabic'                =>   10800, 'atlantic'              =>  -14400,
+      'aus central'           =>   34200, 'aus eastern'           =>   36000,
+      'azores'                =>   -3600, 'canada central'        =>  -21600,
+      'cape verde'            =>   -3600, 'caucasus'              =>   14400,
+      'cen. australia'        =>   34200, 'central america'       =>  -21600,
+      'central asia'          =>   21600, 'central europe'        =>    3600,
+      'central european'      =>    3600, 'central pacific'       =>   39600,
+      'central'               =>  -21600, 'china'                 =>   28800,
+      'dateline'              =>  -43200, 'e. africa'             =>   10800,
+      'e. australia'          =>   36000, 'e. europe'             =>    7200,
+      'e. south america'      =>  -10800, 'eastern'               =>  -18000,
+      'egypt'                 =>    7200, 'ekaterinburg'          =>   18000,
+      'fiji'                  =>   43200, 'fle'                   =>    7200,
+      'greenland'             =>  -10800, 'greenwich'             =>       0,
+      'gtb'                   =>    7200, 'hawaiian'              =>  -36000,
+      'india'                 =>   19800, 'iran'                  =>   12600,
+      'jerusalem'             =>    7200, 'korea'                 =>   32400,
+      'mexico'                =>  -21600, 'mid-atlantic'          =>   -7200,
+      'mountain'              =>  -25200, 'myanmar'               =>   23400,
+      'n. central asia'       =>   21600, 'nepal'                 =>   20700,
+      'new zealand'           =>   43200, 'newfoundland'          =>  -12600,
+      'north asia east'       =>   28800, 'north asia'            =>   25200,
+      'pacific sa'            =>  -14400, 'pacific'               =>  -28800,
+      'romance'               =>    3600, 'russian'               =>   10800,
+      'sa eastern'            =>  -10800, 'sa pacific'            =>  -18000,
+      'sa western'            =>  -14400, 'samoa'                 =>  -39600,
+      'se asia'               =>   25200, 'malay peninsula'       =>   28800,
+      'south africa'          =>    7200, 'sri lanka'             =>   21600,
+      'taipei'                =>   28800, 'tasmania'              =>   36000,
+      'tokyo'                 =>   32400, 'tonga'                 =>   46800,
+      'us eastern'            =>  -18000, 'us mountain'           =>  -25200,
+      'vladivostok'           =>   36000, 'w. australia'          =>   28800,
+      'w. central africa'     =>    3600, 'w. europe'             =>    3600,
+      'west asia'             =>   18000, 'west pacific'          =>   36000,
+      'yakutsk'               =>   32400
+    }
+
+    [MONTHS, DAYS, ABBR_MONTHS, ABBR_DAYS, ZONES].each do |x|
+      x.freeze
+    end
+
+    class Bag # :nodoc:
+
+      def initialize
+	@elem = {}
+      end
+
+      def method_missing(t, *args, &block)
+	t = t.to_s
+	set = t.chomp!('=')
+	t = t.intern
+	if set
+	  @elem[t] = args[0]
+	else
+	  @elem[t]
+	end
+      end
+
+      def to_hash
+	@elem.reject{|k, v| /\A_/ =~ k.to_s || v.nil?}
+      end
+
+    end
+
+  end
+
+  def emit(e, f) # :nodoc:
+    case e
+    when Numeric
+      sign = %w(+ + -)[e <=> 0]
+      e = e.abs
+    end
+
+    s = e.to_s
+
+    if f[:s] && f[:p] == '0'
+      f[:w] -= 1
+    end
+
+    if f[:s] && f[:p] == "\s"
+      s[0,0] = sign
+    end
+
+    if f[:p] != '-'
+      s = s.rjust(f[:w], f[:p])
+    end
+
+    if f[:s] && f[:p] != "\s"
+      s[0,0] = sign
+    end
+
+    s = s.upcase if f[:u]
+    s = s.downcase if f[:d]
+    s
+  end
+
+  def emit_w(e, w, f) # :nodoc:
+    f[:w] = [f[:w], w].compact.max
+    emit(e, f)
+  end
+
+  def emit_n(e, w, f) # :nodoc:
+    f[:p] ||= '0'
+    emit_w(e, w, f)
+  end
+
+  def emit_sn(e, w, f) # :nodoc:
+    if e < 0
+      w += 1
+      f[:s] = true
+    end
+    emit_n(e, w, f)
+  end
+
+  def emit_z(e, w, f) # :nodoc:
+    w += 1
+    f[:s] = true
+    emit_n(e, w, f)
+  end
+
+  def emit_a(e, w, f) # :nodoc:
+    f[:p] ||= "\s"
+    emit_w(e, w, f)
+  end
+
+  def emit_ad(e, w, f) # :nodoc:
+    if f[:x]
+      f[:u] = true
+      f[:d] = false
+    end
+    emit_a(e, w, f)
+  end
+
+  def emit_au(e, w, f) # :nodoc:
+    if f[:x]
+      f[:u] = false
+      f[:d] = true
+    end
+    emit_a(e, w, f)
+  end
+
+  private :emit, :emit_w, :emit_n, :emit_sn, :emit_z,
+	  :emit_a, :emit_ad, :emit_au
+
+  def strftime(fmt='%F')
+    fmt.gsub(/%([-_0^#]+)?(\d+)?[EO]?(:{1,3}z|.)/m) do |m|
+      f = {}
+      s, w, c = $1, $2, $3
+      if s
+	s.scan(/./) do |k|
+	  case k
+	  when '-'; f[:p] = '-'
+	  when '_'; f[:p] = "\s"
+	  when '0'; f[:p] = '0'
+	  when '^'; f[:u] = true
+	  when '#'; f[:x] = true
+	  end
+	end
+      end
+      if w
+	f[:w] = w.to_i
+      end
+      case c
+      when 'A'; emit_ad(DAYNAMES[wday], 0, f)
+      when 'a'; emit_ad(ABBR_DAYNAMES[wday], 0, f)
+      when 'B'; emit_ad(MONTHNAMES[mon], 0, f)
+      when 'b'; emit_ad(ABBR_MONTHNAMES[mon], 0, f)
+      when 'C'; emit_sn((year / 100).floor, 2, f)
+      when 'c'; emit_a(strftime('%a %b %e %H:%M:%S %Y'), 0, f)
+      when 'D'; emit_a(strftime('%m/%d/%y'), 0, f)
+      when 'd'; emit_n(mday, 2, f)
+      when 'e'; emit_a(mday, 2, f)
+      when 'F'
+	if m == '%F'
+	  format('%.4d-%02d-%02d', year, mon, mday) # 4p
+	else
+	  emit_a(strftime('%Y-%m-%d'), 0, f)
+	end
+      when 'G'; emit_sn(cwyear, 4, f)
+      when 'g'; emit_n(cwyear % 100, 2, f)
+      when 'H'; emit_n(hour, 2, f)
+      when 'h'; emit_ad(strftime('%b'), 0, f)
+      when 'I'; emit_n((hour % 12).nonzero? || 12, 2, f)
+      when 'j'; emit_n(yday, 3, f)
+      when 'k'; emit_a(hour, 2, f)
+      when 'L'
+	emit_n((sec_fraction / (1.to_r/86400/(10**3))).round, 3, f)
+      when 'l'; emit_a((hour % 12).nonzero? || 12, 2, f)
+      when 'M'; emit_n(min, 2, f)
+      when 'm'; emit_n(mon, 2, f)
+      when 'N'
+	emit_n((sec_fraction / (1.to_r/86400/(10**9))).round, 9, f)
+      when 'n'; "\n"
+      when 'P'; emit_ad(strftime('%p').downcase, 0, f)
+      when 'p'; emit_au(if hour < 12 then 'AM' else 'PM' end, 0, f)
+      when 'Q'
+	d = ajd - self.class.jd_to_ajd(self.class::UNIXEPOCH, 0)
+	s = (d * 86400*10**3).to_i
+	emit_sn(s, 1, f)
+      when 'R'; emit_a(strftime('%H:%M'), 0, f)
+      when 'r'; emit_a(strftime('%I:%M:%S %p'), 0, f)
+      when 'S'; emit_n(sec, 2, f)
+      when 's'
+	d = ajd - self.class.jd_to_ajd(self.class::UNIXEPOCH, 0)
+	s = (d * 86400).to_i
+	emit_sn(s, 1, f)
+      when 'T'
+	if m == '%T'
+	  format('%02d:%02d:%02d', hour, min, sec) # 4p
+	else
+	  emit_a(strftime('%H:%M:%S'), 0, f)
+	end
+      when 't'; "\t"
+      when 'U', 'W'
+	emit_n(if c == 'U' then wnum0 else wnum1 end, 2, f)
+      when 'u'; emit_n(cwday, 1, f)
+      when 'V'; emit_n(cweek, 2, f)
+      when 'v'; emit_a(strftime('%e-%b-%Y'), 0, f)
+      when 'w'; emit_n(wday, 1, f)
+      when 'X'; emit_a(strftime('%H:%M:%S'), 0, f)
+      when 'x'; emit_a(strftime('%m/%d/%y'), 0, f)
+      when 'Y'; emit_sn(year, 4, f)
+      when 'y'; emit_n(year % 100, 2, f)
+      when 'Z'; emit_au(strftime('%:z'), 0, f)
+      when /\A(:{0,3})z/
+	t = $1.size
+	sign = if offset < 0 then -1 else +1 end
+	fr = offset.abs
+	hh, fr = fr.divmod(1.to_r/24)
+	mm, fr = fr.divmod(1.to_r/1440)
+	ss, fr = fr.divmod(1.to_r/86400)
+	if t == 3
+	  if    ss.nonzero? then t =  2
+	  elsif mm.nonzero? then t =  1
+	  else                   t = -1
+	  end
+	end
+	case t
+	when -1
+	  tail = []
+	  sep = ''
+	when 0
+	  f[:w] -= 2 if f[:w]
+	  tail = ['%02d' % mm]
+	  sep = ''
+	when 1
+	  f[:w] -= 3 if f[:w]
+	  tail = ['%02d' % mm]
+	  sep = ':'
+	when 2
+	  f[:w] -= 6 if f[:w]
+	  tail = ['%02d' % mm, '%02d' % ss]
+	  sep = ':'
+	end
+	([emit_z(sign * hh, 2, f)] + tail).join(sep)
+      when '%'; emit_a('%', 0, f)
+      when '+'; emit_a(strftime('%a %b %e %H:%M:%S %Z %Y'), 0, f)
+      when '1'
+	if $VERBOSE
+	  warn("warning: strftime: %1 is deprecated; forget this")
+	end
+	emit_n(jd, 1, f)
+      when '2'
+	if $VERBOSE
+	  warn("warning: strftime: %2 is deprecated; use '%Y-%j'")
+	end
+	emit_a(strftime('%Y-%j'), 0, f)
+      when '3'
+	if $VERBOSE
+	  warn("warning: strftime: %3 is deprecated; use '%F'")
+	end
+	emit_a(strftime('%F'), 0, f)
+      else
+	c
+      end
+    end
+  end
+
+# alias_method :format, :strftime
+
+  def asctime() strftime('%c') end
+
+  alias_method :ctime, :asctime
+
+=begin
+  def iso8601() strftime('%F') end
+
+  def rfc3339() iso8601 end
+
+  def rfc2822() strftime('%a, %-d %b %Y %T %z') end
+
+  alias_method :rfc822, :rfc2822
+
+  def jisx0301
+    if jd < 2405160
+      iso8601
+    else
+      case jd
+      when 2405160...2419614
+	g = 'M%02d' % (year - 1867)
+      when 2419614...2424875
+	g = 'T%02d' % (year - 1911)
+      when 2424875...2447535
+	g = 'S%02d' % (year - 1925)
+      else
+	g = 'H%02d' % (year - 1988)
+      end
+      g + strftime('.%m.%d')
+    end
+  end
+
+  def beat(n=0)
+    i, f = (new_offset(1.to_r/24).day_fraction * 1000).divmod(1)
+    ('@%03d' % i) +
+      if n < 1
+	''
+      else
+	'.%0*d' % [n, (f / (1.to_r/(10**n))).round]
+      end
+  end
+=end
+
+  def self.num_pattern? (s) # :nodoc:
+    /\A%[EO]?[CDdeFGgHIjkLlMmNQRrSsTUuVvWwXxYy\d]/ =~ s || /\A\d/ =~ s
+  end
+
+  private_class_method :num_pattern?
+
+  def self._strptime_i(str, fmt, e) # :nodoc:
+    fmt.scan(/%[EO]?(:{1,3}z|.)|(.)/m) do |s, c|
+      if s
+	case s
+	when 'A', 'a'
+	  return unless str.sub!(/\A(#{Format::DAYS.keys.join('|')})/io, '') ||
+			str.sub!(/\A(#{Format::ABBR_DAYS.keys.join('|')})/io, '')
+	  val = Format::DAYS[$1.downcase] || Format::ABBR_DAYS[$1.downcase]
+	  return unless val
+	  e.wday = val
+	when 'B', 'b', 'h'
+	  return unless str.sub!(/\A(#{Format::MONTHS.keys.join('|')})/io, '') ||
+			str.sub!(/\A(#{Format::ABBR_MONTHS.keys.join('|')})/io, '')
+	  val = Format::MONTHS[$1.downcase] || Format::ABBR_MONTHS[$1.downcase]
+	  return unless val
+	  e.mon = val
+	when 'C'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,2})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+	  val = $1.to_i
+	  e._cent = val
+	when 'c'
+	  return unless _strptime_i(str, '%a %b %e %H:%M:%S %Y', e)
+	when 'D'
+	  return unless _strptime_i(str, '%m/%d/%y', e)
+	when 'd', 'e'
+	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (1..31) === val
+	  e.mday = val
+	when 'F'
+	  return unless _strptime_i(str, '%Y-%m-%d', e)
+	when 'G'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,4})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+	  val = $1.to_i
+	  e.cwyear = val
+	when 'g'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..99) === val
+	  e.cwyear = val
+	  e._cent ||= if val >= 69 then 19 else 20 end
+	when 'H', 'k'
+	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..24) === val
+	  e.hour = val
+	when 'I', 'l'
+	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (1..12) === val
+	  e.hour = val
+	when 'j'
+	  return unless str.sub!(/\A(\d{1,3})/, '')
+	  val = $1.to_i
+	  return unless (1..366) === val
+	  e.yday = val
+	when 'L'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,3})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+#	  val = $1.to_i.to_r / (10**3)
+	  val = $1.to_i.to_r / (10**$1.size)
+	  e.sec_fraction = val
+	when 'M'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..59) === val
+	  e.min = val
+	when 'm'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (1..12) === val
+	  e.mon = val
+	when 'N'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,9})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+#	  val = $1.to_i.to_r / (10**9)
+	  val = $1.to_i.to_r / (10**$1.size)
+	  e.sec_fraction = val
+	when 'n', 't'
+	  return unless _strptime_i(str, "\s", e)
+	when 'P', 'p'
+	  return unless str.sub!(/\A([ap])(?:m\b|\.m\.)/i, '')
+	  e._merid = if $1.downcase == 'a' then 0 else 12 end
+	when 'Q'
+	  return unless str.sub!(/\A(-?\d{1,})/, '')
+	  val = $1.to_i.to_r / 10**3
+	  e.seconds = val
+	when 'R'
+	  return unless _strptime_i(str, '%H:%M', e)
+	when 'r'
+	  return unless _strptime_i(str, '%I:%M:%S %p', e)
+	when 'S'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..60) === val
+	  e.sec = val
+	when 's'
+	  return unless str.sub!(/\A(-?\d{1,})/, '')
+	  val = $1.to_i
+	  e.seconds = val
+	when 'T'
+	  return unless _strptime_i(str, '%H:%M:%S', e)
+	when 'U', 'W'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..53) === val
+	  e.__send__(if s == 'U' then :wnum0= else :wnum1= end, val)
+	when 'u'
+	  return unless str.sub!(/\A(\d{1})/, '')
+	  val = $1.to_i
+	  return unless (1..7) === val
+	  e.cwday = val
+	when 'V'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (1..53) === val
+	  e.cweek = val
+	when 'v'
+	  return unless _strptime_i(str, '%e-%b-%Y', e)
+	when 'w'
+	  return unless str.sub!(/\A(\d{1})/, '')
+	  val = $1.to_i
+	  return unless (0..6) === val
+	  e.wday = val
+	when 'X'
+	  return unless _strptime_i(str, '%H:%M:%S', e)
+	when 'x'
+	  return unless _strptime_i(str, '%m/%d/%y', e)
+	when 'Y'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,4})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+	  val = $1.to_i
+	  e.year = val
+	when 'y'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..99) === val
+	  e.year = val
+	  e._cent ||= if val >= 69 then 19 else 20 end
+	when 'Z', /\A:{0,3}z/
+	  return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
+				    |[a-z.\s]+(?:standard|daylight)\s+time\b
+				    |[a-z]+(?:\s+dst)?\b
+				    )/ix, '')
+	  val = $1
+	  e.zone = val
+	  offset = zone_to_diff(val)
+	  e.offset = offset
+	when '%'
+	  return unless str.sub!(/\A%/, '')
+	when '+'
+	  return unless _strptime_i(str, '%a %b %e %H:%M:%S %Z %Y', e)
+	when '1'
+	  if $VERBOSE
+	    warn("warning: strptime: %1 is deprecated; forget this")
+	  end
+	  return unless str.sub!(/\A(\d+)/, '')
+	  val = $1.to_i
+	  e.jd = val
+	when '2'
+	  if $VERBOSE
+	    warn("warning: strptime: %2 is deprecated; use '%Y-%j'")
+	  end
+	  return unless _strptime_i(str, '%Y-%j', e)
+	when '3'
+	  if $VERBOSE
+	    warn("warning: strptime: %3 is deprecated; use '%F'")
+	  end
+	  return unless _strptime_i(str, '%F', e)
+	else
+	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(s)), '')
+	end
+      else
+	case c
+	when /\A[\s\v]/
+	  str.sub!(/\A[\s\v]+/, '')
+	else
+	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(c)), '')
+	end
+      end
+    end
+  end
+
+  private_class_method :_strptime_i
+
+  def self._strptime(str, fmt='%F')
+    e = Format::Bag.new
+    return unless _strptime_i(str.dup, fmt, e)
+
+    if e._cent
+      if e.cwyear
+	e.cwyear += e._cent * 100
+      end
+      if e.year
+	e.  year += e._cent * 100
+      end
+    end
+
+    if e._merid
+      if e.hour
+	e.hour %= 12
+	e.hour += e._merid
+      end
+    end
+
+    e.to_hash
+  end
+
+  def self.s3e(e, y, m, d, bc=false)
+    unless String === m
+      m = m.to_s
+    end
+
+    if y == nil
+      if d && d.size > 2
+	y = d
+	d = nil
+      end
+      if d && d[0,1] == "'"
+	y = d
+	d = nil
+      end
+    end
+
+    if y
+      y.scan(/(\d+)(.+)?/)
+      if $2
+	y, d = d, $1
+      end
+    end
+
+    if m
+      if m[0,1] == "'" || m.size > 2
+	y, m, d = m, d, y # us -> be
+      end
+    end
+
+    if d
+      if d[0,1] == "'" || d.size > 2
+	y, d = d, y
+      end
+    end
+
+    if y
+      y =~ /([-+])?(\d+)/
+      if $1 || $2.size > 2
+	c = false
+      end
+      iy = $&.to_i
+      if bc
+	iy = -iy + 1
+      end
+      e.year = iy
+    end
+
+    if m
+      m =~ /\d+/
+      e.mon = $&.to_i
+    end
+
+    if d
+      d =~ /\d+/
+      e.mday = $&.to_i
+    end
+
+    if c != nil
+      e._comp = c
+    end
+
+  end
+
+  private_class_method :s3e
+
+  def self._parse_day(str, e) # :nodoc:
+    if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/ino, ' ')
+      e.wday = Format::ABBR_DAYS[$1.downcase]
+      true
+=begin
+    elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/in, ' ')
+      e.wday = %w(su mo tu we th fr sa).index($1.downcase)
+      true
+=end
+    end
+  end
+
+  def self._parse_time(str, e) # :nodoc:
+    if str.sub!(
+		/(
+		   (?:
+		     \d+\s*:\s*\d+
+		     (?:
+		       \s*:\s*\d+(?:[,.]\d*)?
+		     )?
+		   |
+		     \d+\s*h(?:\s*\d+m?(?:\s*\d+s?)?)?
+		   )
+		   (?:
+		     \s*
+		     [ap](?:m\b|\.m\.)
+		   )?
+		 |
+		   \d+\s*[ap](?:m\b|\.m\.)
+		 )
+		 (?:
+		   \s*
+		   (
+		     (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
+		   |
+		     [a-z.\s]+(?:standard|daylight)\stime\b
+		   |
+		     [a-z]+(?:\sdst)?\b
+		   )
+		 )?
+		/inx,
+		' ')
+
+      t = $1
+      e.zone = $2 if $2
+
+      t =~ /\A(\d+)h?
+	      (?:\s*:?\s*(\d+)m?
+		(?:
+		  \s*:?\s*(\d+)(?:[,.](\d+))?s?
+		)?
+	      )?
+	    (?:\s*([ap])(?:m\b|\.m\.))?/inx
+
+      e.hour = $1.to_i
+      e.min = $2.to_i if $2
+      e.sec = $3.to_i if $3
+      e.sec_fraction = $4.to_i.to_r / (10**$4.size) if $4
+
+      if $5
+	e.hour %= 12
+	if $5.downcase == 'p'
+	  e.hour += 12
+	end
+      end
+      true
+    end
+  end
+
+  def self._parse_beat(str, e) # :nodoc:
+    if str.sub!(/@\s*(\d+)(?:[,.](\d*))?/, ' ')
+      beat = $1.to_i.to_r
+      beat += $2.to_i.to_r / (10**$2.size) if $2
+      secs = beat.to_r / 1000
+      h, min, s, fr = self.day_fraction_to_time(secs)
+      e.hour = h
+      e.min = min
+      e.sec = s
+      e.sec_fraction = fr * 86400
+      e.zone = '+01:00'
+      true
+    end
+  end
+
+  def self._parse_eu(str, e) # :nodoc:
+    if str.sub!(
+		/'?(\d+)[^-\d\s]*
+		 \s*
+		 (#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
+		 (?:
+		   \s*
+		   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
+		   \s*
+		   ('?-?\d+(?:(?:st|nd|rd|th)\b)?)
+		 )?
+		/inox,
+		' ') # '
+      s3e(e, $4, Format::ABBR_MONTHS[$2.downcase], $1,
+	  $3 && $3[0,1].downcase == 'b')
+      true
+    end
+  end
+
+  def self._parse_us(str, e) # :nodoc:
+    if str.sub!(
+		/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
+		 \s*
+		 ('?\d+)[^-\d\s']*
+		 (?:
+		   \s*
+		   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
+		   \s*
+		   ('?-?\d+)
+		 )?
+		/inox,
+		' ') # '
+      s3e(e, $4, Format::ABBR_MONTHS[$1.downcase], $2,
+	  $3 && $3[0,1].downcase == 'b')
+      true
+    end
+  end
+
+  def self._parse_iso(str, e) # :nodoc:
+    if str.sub!(/('?[-+]?\d+)-(\d+)-('?-?\d+)/n, ' ')
+      s3e(e, $1, $2, $3)
+      true
+    end
+  end
+
+  def self._parse_iso2(str, e) # :nodoc:
+    if str.sub!(/\b(\d{2}|\d{4})?-?w(\d{2})(?:-?(\d+))?/in, ' ')
+      e.cwyear = $1.to_i if $1
+      e.cweek = $2.to_i
+      e.cwday = $3.to_i if $3
+      true
+    elsif str.sub!(/--(\d{2})-(\d{2})\b/n, ' ')
+      e.mon = $1.to_i
+      e.mday = $2.to_i
+      true
+    elsif str.sub!(/\b(\d{2}|\d{4})-(\d{2,3})\b/n, ' ')
+      e.year = $1.to_i
+      if $2.size < 3
+	e.mon = $2.to_i
+      else
+	e.yday = $2.to_i
+      end
+      true
+    end
+  end
+
+  def self._parse_jis(str, e) # :nodoc:
+    if str.sub!(/\b([MTSH])(\d+)\.(\d+)\.(\d+)/in, ' ')
+      era = { 'm'=>1867,
+	      't'=>1911,
+	      's'=>1925,
+	      'h'=>1988
+	  }[$1.downcase]
+      e.year = $2.to_i + era
+      e.mon = $3.to_i
+      e.mday = $4.to_i
+      true
+    end
+  end
+
+  def self._parse_vms(str, e) # :nodoc:
+    if str.sub!(/('?-?\d+)-(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
+		-('?-?\d+)/inox, ' ')
+      s3e(e, $3, Format::ABBR_MONTHS[$2.downcase], $1)
+      true
+    elsif str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
+		-('?-?\d+)(?:-('?-?\d+))?/inox, ' ')
+      s3e(e, $3, Format::ABBR_MONTHS[$1.downcase], $2)
+      true
+    end
+  end
+
+  def self._parse_sla_ja(str, e) # :nodoc:
+    if str.sub!(%r|('?-?\d+)[/.]\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
+      s3e(e, $1, $2, $3)
+      true
+    end
+  end
+
+  def self._parse_sla_eu(str, e) # :nodoc:
+    if str.sub!(%r|('?-?\d+)[/.]\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
+      s3e(e, $3, $2, $1)
+      true
+    end
+  end
+
+  def self._parse_sla_us(str, e) # :nodoc:
+    if str.sub!(%r|('?-?\d+)[/.]\s*('?\d+)(?:[^\d]\s*('?-?\d+))?|n, ' ') # '
+      s3e(e, $3, $1, $2)
+      true
+    end
+  end
+
+  def self._parse_year(str, e) # :nodoc:
+    if str.sub!(/'(\d+)\b/in, ' ')
+      e.year = $1.to_i
+      true
+    end
+  end
+
+  def self._parse_mon(str, e) # :nodoc:
+    if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/ino, ' ')
+      e.mon = Format::ABBR_MONTHS[$1.downcase]
+      true
+    end
+  end
+
+  def self._parse_mday(str, e) # :nodoc:
+    if str.sub!(/(\d+)(st|nd|rd|th)\b/in, ' ')
+      e.mday = $1.to_i
+      true
+    end
+  end
+
+  def self._parse_ddd(str, e) # :nodoc:
+    if str.sub!(
+		/([-+]?)(\d{2,14})
+		  (?:
+		    \s*
+		    T?
+		    \s*
+		    (\d{2,6})(?:[,.](\d*))?
+		  )?
+		  (?:
+		    \s*
+		    (
+		      Z
+		    |
+		      [-+]\d{1,4}
+		    )
+		    \b
+		  )?
+		/inx,
+		' ')
+      case $2.size
+      when 2
+	e.mday = $2[ 0, 2].to_i
+      when 4
+	e.mon  = $2[ 0, 2].to_i
+	e.mday = $2[ 2, 2].to_i
+      when 6
+	e.year = ($1 + $2[ 0, 2]).to_i
+	e.mon  = $2[ 2, 2].to_i
+	e.mday = $2[ 4, 2].to_i
+      when 8, 10, 12, 14
+	e.year = ($1 + $2[ 0, 4]).to_i
+	e.mon  = $2[ 4, 2].to_i
+	e.mday = $2[ 6, 2].to_i
+	e.hour = $2[ 8, 2].to_i if $2.size >= 10
+	e.min  = $2[10, 2].to_i if $2.size >= 12
+	e.sec  = $2[12, 2].to_i if $2.size >= 14
+	e._comp = false
+      when 3
+	e.yday = $2[ 0, 3].to_i
+      when 5
+	e.year = ($1 + $2[ 0, 2]).to_i
+	e.yday = $2[ 2, 3].to_i
+      when 7
+	e.year = ($1 + $2[ 0, 4]).to_i
+	e.yday = $2[ 4, 3].to_i
+      end
+      if $3
+	case $3.size
+	when 2, 4, 6
+	  e.hour = $3[ 0, 2].to_i
+	  e.min  = $3[ 2, 2].to_i if $3.size >= 4
+	  e.sec  = $3[ 4, 2].to_i if $3.size >= 6
+	end
+      end
+      if $4
+	e.sec_fraction = $4.to_i.to_r / (10**$4.size)
+      end
+      if $5
+	e.zone = $5
+      end
+      true
+    end
+  end
+
+  private_class_method :_parse_day, :_parse_time, :_parse_beat,
+	:_parse_eu, :_parse_us, :_parse_iso, :_parse_iso2,
+	:_parse_jis, :_parse_vms,
+	:_parse_sla_ja, :_parse_sla_eu, :_parse_sla_us,
+	:_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
+
+  def self._parse(str, comp=false)
+    str = str.dup
+
+    e = Format::Bag.new
+
+    e._comp = comp
+
+    str.gsub!(/[^-+',.\/:0-9@a-z\x80-\xff]+/in, ' ')
+
+    _parse_time(str, e) # || _parse_beat(str, e)
+    _parse_day(str, e)
+
+    _parse_eu(str, e)     ||
+    _parse_us(str, e)     ||
+    _parse_iso(str, e)    ||
+    _parse_jis(str, e)    ||
+    _parse_vms(str, e)    ||
+    _parse_sla_us(str, e) ||
+    _parse_iso2(str, e)   ||
+    _parse_year(str, e)   ||
+    _parse_mon(str, e)    ||
+    _parse_mday(str, e)   ||
+    _parse_ddd(str, e)
+
+    if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/in, ' ')
+      if e.year
+	e.year = -e.year + 1
+      end
+    end
+
+    if str.sub!(/\A\s*(\d{1,2})\s*\z/n, ' ')
+      if e.hour && !e.mday
+	v = $1.to_i
+	if (1..31) === v
+	  e.mday = v
+	end
+      end
+      if e.mday && !e.hour
+	v = $1.to_i
+	if (0..24) === v
+	  e.hour = v
+	end
+      end
+    end
+
+    if e._comp and e.year
+      if e.year >= 0 and e.year <= 99
+	if e.year >= 69
+	  e.year += 1900
+	else
+	  e.year += 2000
+	end
+      end
+    end
+
+    e.offset ||= zone_to_diff(e.zone) if e.zone
+
+    e.to_hash
+  end
+
+  def self.zone_to_diff(zone) # :nodoc:
+    zone = zone.downcase
+    if zone.sub!(/\s+(standard|daylight)\s+time\z/, '')
+      dst = $1 == 'daylight'
+    else
+      dst = zone.sub!(/\s+dst\z/, '')
+    end
+    if Format::ZONES.include?(zone)
+      offset = Format::ZONES[zone]
+      offset += 3600 if dst
+    elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '')
+      sign = $1
+      if zone.include?(':')
+	hour, min, sec, = zone.split(':')
+      elsif zone.include?(',') || zone.include?('.')
+	hour, fr, = zone.split(/[,.]/)
+	min = fr.to_i.to_r / (10**fr.size) * 60
+      else
+	case zone.size
+	when 3
+	  hour = zone[0,1]
+	  min = zone[1,2]
+	else
+	  hour = zone[0,2]
+	  min = zone[2,2]
+	  sec = zone[4,2]
+	end
+      end
+      offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
+      offset *= -1 if sign == '-'
+    end
+    offset
+  end
+
+end
+
+class DateTime < Date
+
+  def strftime(fmt='%FT%T%:z')
+    super(fmt)
+  end
+
+  def self._strptime(str, fmt='%FT%T%z')
+    super(str, fmt)
+  end
+
+=begin
+  def iso8601_timediv(n) # :nodoc:
+    strftime('T%T' +
+	     if n < 1
+	       ''
+	     else
+	       '.%0*d' % [n, (sec_fraction / (1.to_r/86400/(10**n))).round]
+	     end +
+	     '%:z')
+  end
+
+  private :iso8601_timediv
+
+  def iso8601(n=0)
+    super() + iso8601_timediv(n)
+  end
+
+  def rfc3339(n=0) iso8601(n) end
+
+  def jisx0301(n=0)
+    super() + iso8601_timediv(n)
+  end
+=end
+
+end
diff --git a/ruby_1_8_6/lib/date2.rb b/ruby_1_8_6/lib/date2.rb
new file mode 100644
index 0000000000..f7da78f650
--- /dev/null
+++ b/ruby_1_8_6/lib/date2.rb
@@ -0,0 +1,5 @@
+# date2 was overridden by date.
+# To be precise, date was overridden by date2,
+# and date2 was renamed to date.
+
+require 'date'
diff --git a/ruby_1_8_6/lib/debug.rb b/ruby_1_8_6/lib/debug.rb
new file mode 100644
index 0000000000..9ae119f8fb
--- /dev/null
+++ b/ruby_1_8_6/lib/debug.rb
@@ -0,0 +1,947 @@
+# Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+# Copyright (C) 2000  Information-technology Promotion Agency, Japan
+# Copyright (C) 2000-2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+if $SAFE > 0
+  STDERR.print "-r debug.rb is not available in safe mode\n"
+  exit 1
+end
+
+require 'tracer'
+require 'pp'
+
+class Tracer
+  def Tracer.trace_func(*vars)
+    Single.trace_func(*vars)
+  end
+end
+
+SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
+
+class DEBUGGER__
+class Mutex
+  def initialize
+    @locker = nil
+    @waiting = []
+    @locked = false;
+  end
+
+  def locked?
+    @locked
+  end
+
+  def lock
+    return if Thread.critical
+    return if @locker == Thread.current
+    while (Thread.critical = true; @locked)
+      @waiting.push Thread.current
+      Thread.stop
+    end
+    @locked = true
+    @locker = Thread.current
+    Thread.critical = false
+    self
+  end
+
+  def unlock
+    return if Thread.critical
+    return unless @locked
+    unless @locker == Thread.current
+      raise RuntimeError, "unlocked by other"
+    end
+    Thread.critical = true
+    t = @waiting.shift
+    @locked = false
+    @locker = nil
+    Thread.critical = false
+    t.run if t
+    self
+  end
+end
+MUTEX = Mutex.new
+
+class Context
+  DEBUG_LAST_CMD = []
+
+  begin
+    require 'readline'
+    def readline(prompt, hist)
+      Readline::readline(prompt, hist)
+    end
+  rescue LoadError
+    def readline(prompt, hist)
+      STDOUT.print prompt
+      STDOUT.flush
+      line = STDIN.gets
+      exit unless line
+      line.chomp!
+      line
+    end
+    USE_READLINE = false
+  end
+
+  def initialize
+    if Thread.current == Thread.main
+      @stop_next = 1
+    else
+      @stop_next = 0
+    end
+    @last_file = nil
+    @file = nil
+    @line = nil
+    @no_step = nil
+    @frames = []
+    @finish_pos = 0
+    @trace = false
+    @catch = "StandardError"
+    @suspend_next = false
+  end
+
+  def stop_next(n=1)
+    @stop_next = n
+  end
+
+  def set_suspend
+    @suspend_next = true
+  end
+
+  def clear_suspend
+    @suspend_next = false
+  end
+
+  def suspend_all
+    DEBUGGER__.suspend
+  end
+
+  def resume_all
+    DEBUGGER__.resume
+  end
+
+  def check_suspend
+    return if Thread.critical
+    while (Thread.critical = true; @suspend_next)
+      DEBUGGER__.waiting.push Thread.current
+      @suspend_next = false
+      Thread.stop
+    end
+    Thread.critical = false
+  end
+
+  def trace?
+    @trace
+  end
+
+  def set_trace(arg)
+    @trace = arg
+  end
+
+  def stdout
+    DEBUGGER__.stdout
+  end
+
+  def break_points
+    DEBUGGER__.break_points
+  end
+
+  def display
+    DEBUGGER__.display
+  end
+
+  def context(th)
+    DEBUGGER__.context(th)
+  end
+
+  def set_trace_all(arg)
+    DEBUGGER__.set_trace(arg)
+  end
+
+  def set_last_thread(th)
+    DEBUGGER__.set_last_thread(th)
+  end
+
+  def debug_eval(str, binding)
+    begin
+      val = eval(str, binding)
+    rescue StandardError, ScriptError => e
+      at = eval("caller(1)", binding)
+      stdout.printf "%s:%s\n", at.shift, e.to_s.sub(/\(eval\):1:(in `.*?':)?/, '')
+      for i in at
+	stdout.printf "\tfrom %s\n", i
+      end
+      throw :debug_error
+    end
+  end
+
+  def debug_silent_eval(str, binding)
+    begin
+      eval(str, binding)
+    rescue StandardError, ScriptError
+      nil
+    end
+  end
+
+  def var_list(ary, binding)
+    ary.sort!
+    for v in ary
+      stdout.printf "  %s => %s\n", v, eval(v, binding).inspect
+    end
+  end
+
+  def debug_variable_info(input, binding)
+    case input
+    when /^\s*g(?:lobal)?\s*$/
+      var_list(global_variables, binding)
+
+    when /^\s*l(?:ocal)?\s*$/
+      var_list(eval("local_variables", binding), binding)
+
+    when /^\s*i(?:nstance)?\s+/
+      obj = debug_eval($', binding)
+      var_list(obj.instance_variables, obj.instance_eval{binding()})
+
+    when /^\s*c(?:onst(?:ant)?)?\s+/
+      obj = debug_eval($', binding)
+      unless obj.kind_of? Module
+	stdout.print "Should be Class/Module: ", $', "\n"
+      else
+	var_list(obj.constants, obj.module_eval{binding()})
+      end
+    end
+  end
+
+  def debug_method_info(input, binding)
+    case input
+    when /^i(:?nstance)?\s+/
+      obj = debug_eval($', binding)
+
+      len = 0
+      for v in obj.methods.sort
+	len += v.size + 1
+	if len > 70
+	  len = v.size + 1
+	  stdout.print "\n"
+	end
+	stdout.print v, " "
+      end
+      stdout.print "\n"
+
+    else
+      obj = debug_eval(input, binding)
+      unless obj.kind_of? Module
+	stdout.print "Should be Class/Module: ", input, "\n"
+      else
+	len = 0
+	for v in obj.instance_methods(false).sort
+	  len += v.size + 1
+	  if len > 70
+	    len = v.size + 1
+	    stdout.print "\n"
+	  end
+	  stdout.print v, " "
+	end
+	stdout.print "\n"
+      end
+    end
+  end
+
+  def thnum
+    num = DEBUGGER__.instance_eval{@thread_list[Thread.current]}
+    unless num
+      DEBUGGER__.make_thread_list
+      num = DEBUGGER__.instance_eval{@thread_list[Thread.current]}
+    end
+    num
+  end
+
+  def debug_command(file, line, id, binding)
+    MUTEX.lock
+    unless defined?($debugger_restart) and $debugger_restart
+      callcc{|c| $debugger_restart = c} 
+    end
+    set_last_thread(Thread.current)
+    frame_pos = 0
+    binding_file = file
+    binding_line = line
+    previous_line = nil
+    if ENV['EMACS']
+      stdout.printf "\032\032%s:%d:\n", binding_file, binding_line
+    else
+      stdout.printf "%s:%d:%s", binding_file, binding_line,
+	line_at(binding_file, binding_line)
+    end
+    @frames[0] = [binding, file, line, id]
+    display_expressions(binding)
+    prompt = true
+    while prompt and input = readline("(rdb:%d) "%thnum(), true)
+      catch(:debug_error) do
+	if input == ""
+          next unless DEBUG_LAST_CMD[0]
+	  input = DEBUG_LAST_CMD[0]
+	  stdout.print input, "\n"
+	else
+	  DEBUG_LAST_CMD[0] = input
+	end
+
+	case input
+	when /^\s*tr(?:ace)?(?:\s+(on|off))?(?:\s+(all))?$/
+          if defined?( $2 )
+            if $1 == 'on'
+              set_trace_all true
+            else
+              set_trace_all false
+            end
+          elsif defined?( $1 )
+            if $1 == 'on'
+              set_trace true
+            else
+              set_trace false
+            end
+          end
+          if trace?
+            stdout.print "Trace on.\n"
+          else
+            stdout.print "Trace off.\n"
+          end
+
+	when /^\s*b(?:reak)?\s+(?:(.+):)?([^.:]+)$/
+	  pos = $2
+          if $1
+            klass = debug_silent_eval($1, binding)
+            file = $1
+          end
+	  if pos =~ /^\d+$/
+	    pname = pos
+	    pos = pos.to_i
+	  else
+	    pname = pos = pos.intern.id2name
+	  end
+	  break_points.push [true, 0, klass || file, pos]
+	  stdout.printf "Set breakpoint %d at %s:%s\n", break_points.size, klass || file, pname
+
+	when /^\s*b(?:reak)?\s+(.+)[#.]([^.:]+)$/
+	  pos = $2.intern.id2name
+	  klass = debug_eval($1, binding)
+	  break_points.push [true, 0, klass, pos]
+	  stdout.printf "Set breakpoint %d at %s.%s\n", break_points.size, klass, pos
+
+	when /^\s*wat(?:ch)?\s+(.+)$/
+	  exp = $1
+	  break_points.push [true, 1, exp]
+	  stdout.printf "Set watchpoint %d:%s\n", break_points.size, exp
+
+	when /^\s*b(?:reak)?$/
+	  if break_points.find{|b| b[1] == 0}
+	    n = 1
+	    stdout.print "Breakpoints:\n"
+	    for b in break_points
+	      if b[0] and b[1] == 0
+		stdout.printf "  %d %s:%s\n", n, b[2], b[3] 
+	      end
+	      n += 1
+	    end
+	  end
+	  if break_points.find{|b| b[1] == 1}
+	    n = 1
+	    stdout.print "\n"
+	    stdout.print "Watchpoints:\n"
+	    for b in break_points
+	      if b[0] and b[1] == 1
+		stdout.printf "  %d %s\n", n, b[2]
+	      end
+	      n += 1
+	    end
+	  end
+	  if break_points.size == 0
+	    stdout.print "No breakpoints\n"
+	  else
+	    stdout.print "\n"
+	  end
+
+	when /^\s*del(?:ete)?(?:\s+(\d+))?$/
+	  pos = $1
+	  unless pos
+	    input = readline("Clear all breakpoints? (y/n) ", false)
+	    if input == "y"
+	      for b in break_points
+		b[0] = false
+	      end
+	    end
+	  else
+	    pos = pos.to_i
+	    if break_points[pos-1]
+	      break_points[pos-1][0] = false
+	    else
+	      stdout.printf "Breakpoint %d is not defined\n", pos
+	    end
+	  end
+
+	when /^\s*disp(?:lay)?\s+(.+)$/
+	  exp = $1
+	  display.push [true, exp]
+	  stdout.printf "%d: ", display.size
+	  display_expression(exp, binding)
+
+	when /^\s*disp(?:lay)?$/
+	  display_expressions(binding)
+
+	when /^\s*undisp(?:lay)?(?:\s+(\d+))?$/
+	  pos = $1
+	  unless pos
+	    input = readline("Clear all expressions? (y/n) ", false)
+	    if input == "y"
+	      for d in display
+		d[0] = false
+	      end
+	    end
+	  else
+	    pos = pos.to_i
+	    if display[pos-1]
+	      display[pos-1][0] = false
+	    else
+	      stdout.printf "Display expression %d is not defined\n", pos
+	    end
+	  end
+
+	when /^\s*c(?:ont)?$/
+	  prompt = false
+
+	when /^\s*s(?:tep)?(?:\s+(\d+))?$/
+	  if $1
+	    lev = $1.to_i
+	  else
+	    lev = 1
+	  end
+	  @stop_next = lev
+	  prompt = false
+
+	when /^\s*n(?:ext)?(?:\s+(\d+))?$/
+	  if $1
+	    lev = $1.to_i
+	  else
+	    lev = 1
+	  end
+	  @stop_next = lev
+	  @no_step = @frames.size - frame_pos
+	  prompt = false
+
+	when /^\s*w(?:here)?$/, /^\s*f(?:rame)?$/
+	  display_frames(frame_pos)
+
+	when /^\s*l(?:ist)?(?:\s+(.+))?$/
+	  if not $1
+	    b = previous_line ? previous_line + 10 : binding_line - 5
+	    e = b + 9
+	  elsif $1 == '-'
+	    b = previous_line ? previous_line - 10 : binding_line - 5
+	    e = b + 9
+	  else
+	    b, e = $1.split(/[-,]/)
+	    if e
+	      b = b.to_i
+	      e = e.to_i
+	    else
+	      b = b.to_i - 5
+	      e = b + 9
+	    end
+	  end
+	  previous_line = b
+	  display_list(b, e, binding_file, binding_line)
+
+	when /^\s*up(?:\s+(\d+))?$/
+	  previous_line = nil
+	  if $1
+	    lev = $1.to_i
+	  else
+	    lev = 1
+	  end
+	  frame_pos += lev
+	  if frame_pos >= @frames.size
+	    frame_pos = @frames.size - 1
+	    stdout.print "At toplevel\n"
+	  end
+	  binding, binding_file, binding_line = @frames[frame_pos]
+	  stdout.print format_frame(frame_pos)
+
+	when /^\s*down(?:\s+(\d+))?$/
+	  previous_line = nil
+	  if $1
+	    lev = $1.to_i
+	  else
+	    lev = 1
+	  end
+	  frame_pos -= lev
+	  if frame_pos < 0
+	    frame_pos = 0
+	    stdout.print "At stack bottom\n"
+	  end
+	  binding, binding_file, binding_line = @frames[frame_pos]
+	  stdout.print format_frame(frame_pos)
+
+	when /^\s*fin(?:ish)?$/
+	  if frame_pos == @frames.size
+	    stdout.print "\"finish\" not meaningful in the outermost frame.\n"
+	  else
+	    @finish_pos = @frames.size - frame_pos
+	    frame_pos = 0
+	    prompt = false
+	  end
+
+	when /^\s*cat(?:ch)?(?:\s+(.+))?$/
+	  if $1
+	    excn = $1
+	    if excn == 'off'
+	      @catch = nil
+	      stdout.print "Clear catchpoint.\n"
+	    else
+	      @catch = excn
+	      stdout.printf "Set catchpoint %s.\n", @catch
+	    end
+	  else
+	    if @catch
+	      stdout.printf "Catchpoint %s.\n", @catch
+	    else
+	      stdout.print "No catchpoint.\n"
+	    end
+	  end
+
+	when /^\s*q(?:uit)?$/
+	  input = readline("Really quit? (y/n) ", false)
+	  if input == "y"
+	    exit!	# exit -> exit!: No graceful way to stop threads...
+	  end
+
+	when /^\s*v(?:ar)?\s+/
+	  debug_variable_info($', binding)
+
+	when /^\s*m(?:ethod)?\s+/
+	  debug_method_info($', binding)
+
+	when /^\s*th(?:read)?\s+/
+	  if DEBUGGER__.debug_thread_info($', binding) == :cont
+	    prompt = false
+	  end
+
+	when /^\s*pp\s+/
+	  PP.pp(debug_eval($', binding), stdout)
+
+	when /^\s*p\s+/
+	  stdout.printf "%s\n", debug_eval($', binding).inspect
+
+	when /^\s*r(?:estart)?$/
+          $debugger_restart.call
+
+	when /^\s*h(?:elp)?$/
+	  debug_print_help()
+
+	else
+	  v = debug_eval(input, binding)
+	  stdout.printf "%s\n", v.inspect
+	end
+      end
+    end
+    MUTEX.unlock
+    resume_all
+  end
+
+  def debug_print_help
+    stdout.print <<EOHELP
+Debugger help v.-0.002b
+Commands
+  b[reak] [file:|class:]<line|method>
+  b[reak] [class.]<line|method>
+                             set breakpoint to some position
+  wat[ch] <expression>       set watchpoint to some expression
+  cat[ch] (<exception>|off)  set catchpoint to an exception
+  b[reak]                    list breakpoints
+  cat[ch]                    show catchpoint
+  del[ete][ nnn]             delete some or all breakpoints
+  disp[lay] <expression>     add expression into display expression list
+  undisp[lay][ nnn]          delete one particular or all display expressions
+  c[ont]                     run until program ends or hit breakpoint
+  s[tep][ nnn]               step (into methods) one line or till line nnn
+  n[ext][ nnn]               go over one line or till line nnn
+  w[here]                    display frames
+  f[rame]                    alias for where
+  l[ist][ (-|nn-mm)]         list program, - lists backwards
+                             nn-mm lists given lines
+  up[ nn]                    move to higher frame
+  down[ nn]                  move to lower frame
+  fin[ish]                   return to outer frame
+  tr[ace] (on|off)           set trace mode of current thread
+  tr[ace] (on|off) all       set trace mode of all threads
+  q[uit]                     exit from debugger
+  v[ar] g[lobal]             show global variables
+  v[ar] l[ocal]              show local variables
+  v[ar] i[nstance] <object>  show instance variables of object
+  v[ar] c[onst] <object>     show constants of object
+  m[ethod] i[nstance] <obj>  show methods of object
+  m[ethod] <class|module>    show instance methods of class or module
+  th[read] l[ist]            list all threads
+  th[read] c[ur[rent]]       show current thread
+  th[read] [sw[itch]] <nnn>  switch thread context to nnn
+  th[read] stop <nnn>        stop thread nnn
+  th[read] resume <nnn>      resume thread nnn
+  p expression               evaluate expression and print its value
+  h[elp]                     print this help
+  <everything else>          evaluate
+EOHELP
+  end
+
+  def display_expressions(binding)
+    n = 1
+    for d in display
+      if d[0]
+	stdout.printf "%d: ", n
+	display_expression(d[1], binding)
+      end
+      n += 1
+    end
+  end
+
+  def display_expression(exp, binding)
+    stdout.printf "%s = %s\n", exp, debug_silent_eval(exp, binding).to_s
+  end
+
+  def frame_set_pos(file, line)
+    if @frames[0]
+      @frames[0][1] = file
+      @frames[0][2] = line
+    end
+  end
+
+  def display_frames(pos)
+    0.upto(@frames.size - 1) do |n|
+      if n == pos
+	stdout.print "--> "
+      else
+	stdout.print "    "
+      end
+      stdout.print format_frame(n)
+    end
+  end
+
+  def format_frame(pos)
+    bind, file, line, id = @frames[pos]
+    sprintf "#%d %s:%s%s\n", pos + 1, file, line,
+      (id ? ":in `#{id.id2name}'" : "")
+  end
+
+  def display_list(b, e, file, line)
+    stdout.printf "[%d, %d] in %s\n", b, e, file
+    if lines = SCRIPT_LINES__[file] and lines != true
+      n = 0
+      b.upto(e) do |n|
+	if n > 0 && lines[n-1]
+	  if n == line
+	    stdout.printf "=> %d  %s\n", n, lines[n-1].chomp
+	  else
+	    stdout.printf "   %d  %s\n", n, lines[n-1].chomp
+	  end
+	end
+      end
+    else
+      stdout.printf "No sourcefile available for %s\n", file
+    end
+  end
+
+  def line_at(file, line)
+    lines = SCRIPT_LINES__[file]
+    if lines
+      return "\n" if lines == true
+      line = lines[line-1]
+      return "\n" unless line
+      return line
+    end
+    return "\n"
+  end
+
+  def debug_funcname(id)
+    if id.nil?
+      "toplevel"
+    else
+      id.id2name
+    end
+  end
+
+  def check_break_points(file, klass, pos, binding, id)
+    return false if break_points.empty?
+    n = 1
+    for b in break_points
+      if b[0]		# valid
+	if b[1] == 0	# breakpoint
+	  if (b[2] == file and b[3] == pos) or
+	      (klass and b[2] == klass and b[3] == pos)
+	    stdout.printf "Breakpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
+	    return true
+	  end
+	elsif b[1] == 1	# watchpoint
+	  if debug_silent_eval(b[2], binding)
+	    stdout.printf "Watchpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
+	    return true
+	  end
+	end
+      end
+      n += 1
+    end
+    return false
+  end
+
+  def excn_handle(file, line, id, binding)
+    if $!.class <= SystemExit
+      set_trace_func nil
+      exit
+    end
+
+    if @catch and ($!.class.ancestors.find { |e| e.to_s == @catch })
+      stdout.printf "%s:%d: `%s' (%s)\n", file, line, $!, $!.class
+      fs = @frames.size
+      tb = caller(0)[-fs..-1]
+      if tb
+	for i in tb
+	  stdout.printf "\tfrom %s\n", i
+	end
+      end
+      suspend_all
+      debug_command(file, line, id, binding)
+    end
+  end
+
+  def trace_func(event, file, line, id, binding, klass)
+    Tracer.trace_func(event, file, line, id, binding, klass) if trace?
+    context(Thread.current).check_suspend
+    @file = file
+    @line = line
+    case event
+    when 'line'
+      frame_set_pos(file, line)
+      if !@no_step or @frames.size == @no_step
+	@stop_next -= 1
+	@stop_next = -1 if @stop_next < 0
+      elsif @frames.size < @no_step
+	@stop_next = 0		# break here before leaving...
+      else
+	# nothing to do. skipped.
+      end
+      if @stop_next == 0 or check_break_points(file, nil, line, binding, id)
+	@no_step = nil
+	suspend_all
+	debug_command(file, line, id, binding)
+      end
+
+    when 'call'
+      @frames.unshift [binding, file, line, id]
+      if check_break_points(file, klass, id.id2name, binding, id)
+	suspend_all
+	debug_command(file, line, id, binding)
+      end
+
+    when 'c-call'
+      frame_set_pos(file, line)
+
+    when 'class'
+      @frames.unshift [binding, file, line, id]
+
+    when 'return', 'end'
+      if @frames.size == @finish_pos
+	@stop_next = 1
+	@finish_pos = 0
+      end
+      @frames.shift
+
+    when 'end'
+      @frames.shift
+
+    when 'raise' 
+      excn_handle(file, line, id, binding)
+
+    end
+    @last_file = file
+  end
+end
+
+trap("INT") { DEBUGGER__.interrupt }
+@last_thread = Thread::main
+@max_thread = 1
+@thread_list = {Thread::main => 1}
+@break_points = []
+@display = []
+@waiting = []
+@stdout = STDOUT
+
+class << DEBUGGER__
+  def stdout
+    @stdout
+  end
+
+  def stdout=(s)
+    @stdout = s
+  end
+
+  def display
+    @display
+  end
+
+  def break_points
+    @break_points
+  end
+
+  def waiting
+    @waiting
+  end
+
+  def set_trace( arg )
+    saved_crit = Thread.critical
+    Thread.critical = true
+    make_thread_list
+    for th, in @thread_list
+      context(th).set_trace arg
+    end
+    Thread.critical = saved_crit
+    arg
+  end
+
+  def set_last_thread(th)
+    @last_thread = th
+  end
+
+  def suspend
+    saved_crit = Thread.critical
+    Thread.critical = true
+    make_thread_list
+    for th, in @thread_list
+      next if th == Thread.current
+      context(th).set_suspend
+    end
+    Thread.critical = saved_crit
+    # Schedule other threads to suspend as soon as possible.
+    Thread.pass unless Thread.critical
+  end
+
+  def resume
+    saved_crit = Thread.critical
+    Thread.critical = true
+    make_thread_list
+    for th, in @thread_list
+      next if th == Thread.current
+      context(th).clear_suspend
+    end
+    waiting.each do |th|
+      th.run
+    end
+    waiting.clear
+    Thread.critical = saved_crit
+    # Schedule other threads to restart as soon as possible.
+    Thread.pass
+  end
+
+  def context(thread=Thread.current)
+    c = thread[:__debugger_data__]
+    unless c
+      thread[:__debugger_data__] = c = Context.new
+    end
+    c
+  end
+
+  def interrupt
+    context(@last_thread).stop_next
+  end
+
+  def get_thread(num)
+    th = @thread_list.index(num)
+    unless th
+      @stdout.print "No thread ##{num}\n"
+      throw :debug_error
+    end
+    th
+  end
+
+  def thread_list(num)
+    th = get_thread(num)
+    if th == Thread.current
+      @stdout.print "+"
+    else
+      @stdout.print " "
+    end
+    @stdout.printf "%d ", num
+    @stdout.print th.inspect, "\t"
+    file = context(th).instance_eval{@file}
+    if file
+      @stdout.print file,":",context(th).instance_eval{@line}
+    end
+    @stdout.print "\n"
+  end
+
+  def thread_list_all
+    for th in @thread_list.values.sort
+      thread_list(th)
+    end
+  end
+
+  def make_thread_list
+    hash = {}
+    for th in Thread::list
+      if @thread_list.key? th
+	hash[th] = @thread_list[th]
+      else
+	@max_thread += 1
+	hash[th] = @max_thread
+      end
+    end
+    @thread_list = hash
+  end
+
+  def debug_thread_info(input, binding)
+    case input
+    when /^l(?:ist)?/
+      make_thread_list
+      thread_list_all
+
+    when /^c(?:ur(?:rent)?)?$/
+      make_thread_list
+      thread_list(@thread_list[Thread.current])
+
+    when /^(?:sw(?:itch)?\s+)?(\d+)/
+      make_thread_list
+      th = get_thread($1.to_i)
+      if th == Thread.current
+	@stdout.print "It's the current thread.\n"
+      else
+	thread_list(@thread_list[th])
+	context(th).stop_next
+	th.run
+	return :cont
+      end
+
+    when /^stop\s+(\d+)/
+      make_thread_list
+      th = get_thread($1.to_i)
+      if th == Thread.current
+	@stdout.print "It's the current thread.\n"
+      elsif th.stop?
+	@stdout.print "Already stopped.\n"
+      else
+	thread_list(@thread_list[th])
+	context(th).suspend 
+      end
+
+    when /^resume\s+(\d+)/
+      make_thread_list
+      th = get_thread($1.to_i)
+      if th == Thread.current
+	@stdout.print "It's the current thread.\n"
+      elsif !th.stop?
+	@stdout.print "Already running."
+      else
+	thread_list(@thread_list[th])
+	th.run
+      end
+    end
+  end
+end
+
+stdout.printf "Debug.rb\n"
+stdout.printf "Emacs support available.\n\n"
+set_trace_func proc { |event, file, line, id, binding, klass, *rest|
+  DEBUGGER__.context.trace_func event, file, line, id, binding, klass
+}
+end
diff --git a/ruby_1_8_6/lib/delegate.rb b/ruby_1_8_6/lib/delegate.rb
new file mode 100644
index 0000000000..d810ccad42
--- /dev/null
+++ b/ruby_1_8_6/lib/delegate.rb
@@ -0,0 +1,335 @@
+# = delegate -- Support for the Delegation Pattern
+#
+# Documentation by James Edward Gray II and Gavin Sinclair
+#
+# == Introduction
+#
+# This library provides three different ways to delegate method calls to an
+# object.  The easiest to use is SimpleDelegator.  Pass an object to the
+# constructor and all methods supported by the object will be delegated.  This
+# object can be changed later.
+#
+# Going a step further, the top level DelegateClass method allows you to easily
+# setup delegation through class inheritance.  This is considerably more
+# flexible and thus probably the most common use for this library.
+#
+# Finally, if you need full control over the delegation scheme, you can inherit
+# from the abstract class Delegator and customize as needed.  (If you find
+# yourself needing this control, have a look at _forwardable_, also in the
+# standard library.  It may suit your needs better.)
+#
+# == Notes
+#
+# Be advised, RDoc will not detect delegated methods.
+#
+# <b>delegate.rb provides full-class delegation via the
+# DelegateClass() method.  For single-method delegation via
+# def_delegator(), see forwardable.rb.</b>
+#
+# == Examples
+#
+# === SimpleDelegator
+#
+# Here's a simple example that takes advantage of the fact that
+# SimpleDelegator's delegation object can be changed at any time.
+#
+#   class Stats
+#     def initialize
+#       @source = SimpleDelegator.new([])
+#     end
+#     
+#     def stats( records )
+#       @source.__setobj__(records)
+#       	
+#       "Elements:  #{@source.size}\n" +
+#       " Non-Nil:  #{@source.compact.size}\n" +
+#       "  Unique:  #{@source.uniq.size}\n"
+#     end
+#   end
+#   
+#   s = Stats.new
+#   puts s.stats(%w{James Edward Gray II})
+#   puts
+#   puts s.stats([1, 2, 3, nil, 4, 5, 1, 2])
+#
+# <i>Prints:</i>
+#
+#   Elements:  4
+#    Non-Nil:  4
+#     Unique:  4
+# 
+#   Elements:  8
+#    Non-Nil:  7
+#     Unique:  6
+#
+# === DelegateClass()
+#
+# Here's a sample of use from <i>tempfile.rb</i>.
+#
+# A _Tempfile_ object is really just a _File_ object with a few special rules
+# about storage location and/or when the File should be deleted.  That makes for
+# an almost textbook perfect example of how to use delegation.
+#
+#   class Tempfile < DelegateClass(File)
+#     # constant and class member data initialization...
+#   
+#     def initialize(basename, tmpdir=Dir::tmpdir)
+#       # build up file path/name in var tmpname...
+#     
+#       @tmpfile = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL, 0600)
+#     
+#       # ...
+#     
+#       super(@tmpfile)
+#     
+#       # below this point, all methods of File are supported...
+#     end
+#   
+#     # ...
+#   end
+#
+# === Delegator
+#
+# SimpleDelegator's implementation serves as a nice example here.
+#
+#    class SimpleDelegator < Delegator
+#      def initialize(obj)
+#        super             # pass obj to Delegator constructor, required
+#        @_sd_obj = obj    # store obj for future use
+#      end
+# 
+#      def __getobj__
+#        @_sd_obj          # return object we are delegating to, required
+#      end
+# 
+#      def __setobj__(obj)
+#        @_sd_obj = obj    # change delegation object, a feature we're providing
+#      end
+# 
+#      # ...
+#    end
+
+#
+# Delegator is an abstract class used to build delegator pattern objects from
+# subclasses.  Subclasses should redefine \_\_getobj\_\_.  For a concrete
+# implementation, see SimpleDelegator.
+#
+class Delegator
+
+  #
+  # Pass in the _obj_ to delegate method calls to.  All methods supported by
+  # _obj_ will be delegated to.
+  #
+  def initialize(obj)
+    preserved = ::Kernel.public_instance_methods(false)
+    preserved -= ["to_s","to_a","inspect","==","=~","==="]
+    for t in self.class.ancestors
+      preserved |= t.public_instance_methods(false)
+      preserved |= t.private_instance_methods(false)
+      preserved |= t.protected_instance_methods(false)
+      break if t == Delegator
+    end
+    preserved << "singleton_method_added"
+    for method in obj.methods
+      next if preserved.include? method
+      begin
+	eval <<-EOS
+	  def self.#{method}(*args, &block)
+	    begin
+	      __getobj__.__send__(:#{method}, *args, &block)
+	    rescue Exception
+	      $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
+	      $@.delete_if{|s| /^\\(eval\\):/ =~ s}
+	      Kernel::raise
+	    end
+	  end
+	EOS
+      rescue SyntaxError
+        raise NameError, "invalid identifier %s" % method, caller(4)
+      end
+    end
+  end
+  alias initialize_methods initialize
+
+  # Handles the magic of delegation through \_\_getobj\_\_.
+  def method_missing(m, *args)
+    target = self.__getobj__
+    unless target.respond_to?(m)
+      super(m, *args)
+    end
+    target.__send__(m, *args)
+  end
+
+  # 
+  # Checks for a method provided by this the delegate object by fowarding the 
+  # call through \_\_getobj\_\_.
+  # 
+  def respond_to?(m)
+    return true if super
+    return self.__getobj__.respond_to?(m)
+  end
+
+  #
+  # This method must be overridden by subclasses and should return the object
+  # method calls are being delegated to.
+  #
+  def __getobj__
+    raise NotImplementedError, "need to define `__getobj__'"
+  end
+
+  # Serialization support for the object returned by \_\_getobj\_\_.
+  def marshal_dump
+    __getobj__
+  end
+  # Reinitializes delegation from a serialized object.
+  def marshal_load(obj)
+    initialize_methods(obj)
+    __setobj__(obj)
+  end
+end
+
+#
+# A concrete implementation of Delegator, this class provides the means to
+# delegate all supported method calls to the object passed into the constructor
+# and even to change the object being delegated to at a later time with
+# \_\_setobj\_\_ .
+#
+class SimpleDelegator<Delegator
+
+  # Pass in the _obj_ you would like to delegate method calls to.
+  def initialize(obj)
+    super
+    @_sd_obj = obj
+  end
+
+  # Returns the current object method calls are being delegated to.
+  def __getobj__
+    @_sd_obj
+  end
+
+  #
+  # Changes the delegate object to _obj_.
+  #
+  # It's important to note that this does *not* cause SimpleDelegator's methods
+  # to change.  Because of this, you probably only want to change delegation
+  # to objects of the same type as the original delegate.
+  #
+  # Here's an example of changing the delegation object.
+  #
+  #   names = SimpleDelegator.new(%w{James Edward Gray II})
+  #   puts names[1]    # => Edward
+  #   names.__setobj__(%w{Gavin Sinclair})
+  #   puts names[1]    # => Sinclair
+  #
+  def __setobj__(obj)
+    raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
+    @_sd_obj = obj
+  end
+
+  # Clone support for the object returned by \_\_getobj\_\_.
+  def clone
+    super
+    __setobj__(__getobj__.clone)
+  end
+  # Duplication support for the object returned by \_\_getobj\_\_.
+  def dup(obj)
+    super
+    __setobj__(__getobj__.dup)
+  end
+end
+
+# :stopdoc:
+# backward compatibility ^_^;;;
+Delegater = Delegator
+SimpleDelegater = SimpleDelegator
+# :startdoc:
+
+#
+# The primary interface to this library.  Use to setup delegation when defining
+# your class.
+#
+#   class MyClass < DelegateClass( ClassToDelegateTo )    # Step 1
+#     def initiaize
+#       super(obj_of_ClassToDelegateTo)                   # Step 2
+#     end
+#   end
+#
+def DelegateClass(superclass)
+  klass = Class.new
+  methods = superclass.public_instance_methods(true)
+  methods -= ::Kernel.public_instance_methods(false)
+  methods |= ["to_s","to_a","inspect","==","=~","==="]
+  klass.module_eval {
+    def initialize(obj)  # :nodoc:
+      @_dc_obj = obj
+    end
+    def method_missing(m, *args)  # :nodoc:
+      unless @_dc_obj.respond_to?(m)
+        super(m, *args)
+      end
+      @_dc_obj.__send__(m, *args)
+    end
+    def respond_to?(m)  # :nodoc:
+      return true if super
+      return @_dc_obj.respond_to?(m)
+    end
+    def __getobj__  # :nodoc:
+      @_dc_obj
+    end
+    def __setobj__(obj)  # :nodoc:
+      raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
+      @_dc_obj = obj
+    end
+    def clone  # :nodoc:
+      super
+      __setobj__(__getobj__.clone)
+    end
+    def dup  # :nodoc:
+      super
+      __setobj__(__getobj__.dup)
+    end
+  }
+  for method in methods
+    begin
+      klass.module_eval <<-EOS
+        def #{method}(*args, &block)
+	  begin
+	    @_dc_obj.__send__(:#{method}, *args, &block)
+	  rescue
+	    $@[0,2] = nil
+	    raise
+	  end
+	end
+      EOS
+    rescue SyntaxError
+      raise NameError, "invalid identifier %s" % method, caller(3)
+    end
+  end
+  return klass
+end
+
+# :enddoc:
+
+if __FILE__ == $0
+  class ExtArray<DelegateClass(Array)
+    def initialize()
+      super([])
+    end
+  end
+
+  ary = ExtArray.new
+  p ary.class
+  ary.push 25
+  p ary
+
+  foo = Object.new
+  def foo.test
+    25
+  end
+  def foo.error
+    raise 'this is OK'
+  end
+  foo2 = SimpleDelegator.new(foo)
+  p foo.test == foo2.test	# => true
+  foo2.error			# raise error!
+end
diff --git a/ruby_1_8_6/lib/drb.rb b/ruby_1_8_6/lib/drb.rb
new file mode 100644
index 0000000000..93cc811e14
--- /dev/null
+++ b/ruby_1_8_6/lib/drb.rb
@@ -0,0 +1,2 @@
+require 'drb/drb'
+
diff --git a/ruby_1_8_6/lib/drb/acl.rb b/ruby_1_8_6/lib/drb/acl.rb
new file mode 100644
index 0000000000..861c8a514d
--- /dev/null
+++ b/ruby_1_8_6/lib/drb/acl.rb
@@ -0,0 +1,146 @@
+# acl-2.0 - simple Access Control List
+#
+# Copyright (c) 2000,2002,2003 Masatoshi SEKI
+#
+# acl.rb is copyrighted free software by Masatoshi SEKI.
+# You can redistribute it and/or modify it under the same terms as Ruby.
+
+require 'ipaddr'
+
+class ACL
+  VERSION=["2.0.0"]
+  class ACLEntry
+    def initialize(str)
+      if str == '*' or str == 'all'
+	@pat = [:all]
+      elsif str.include?('*')
+        @pat = [:name, dot_pat(str)]
+      else
+	begin
+	  @pat = [:ip, IPAddr.new(str)]
+	rescue ArgumentError
+	  @pat = [:name, dot_pat(str)]
+	end
+      end
+    end
+
+    private
+    def dot_pat_str(str)
+      list = str.split('.').collect { |s|
+	(s == '*') ? '.+' : s
+      }
+      list.join("\\.")
+    end
+
+    private
+    def dot_pat(str)
+      exp = "^" + dot_pat_str(str) + "$"
+      Regexp.new(exp)
+    end
+
+    public
+    def match(addr)
+      case @pat[0]
+      when :all
+	true
+      when :ip
+	begin
+	  ipaddr = IPAddr.new(addr[3])
+	  ipaddr = ipaddr.ipv4_mapped if @pat[1].ipv6? && ipaddr.ipv4?
+	rescue ArgumentError
+	  return false
+	end
+	(@pat[1].include?(ipaddr)) ? true : false
+      when :name
+	(@pat[1] =~ addr[2]) ? true : false
+      else
+	false
+      end
+    end
+  end
+
+  class ACLList
+    def initialize
+      @list = []
+    end
+
+    public
+    def match(addr)
+      @list.each do |e|
+	return true if e.match(addr)
+      end
+      false
+    end
+
+    public
+    def add(str)
+      @list.push(ACLEntry.new(str))
+    end
+  end
+
+  DENY_ALLOW = 0
+  ALLOW_DENY = 1
+
+  def initialize(list=nil, order = DENY_ALLOW)
+    @order = order
+    @deny = ACLList.new
+    @allow = ACLList.new
+    install_list(list) if list
+  end
+
+  public
+  def allow_socket?(soc)
+    allow_addr?(soc.peeraddr)
+  end
+
+  public
+  def allow_addr?(addr)
+    case @order
+    when DENY_ALLOW
+      return true if @allow.match(addr)
+      return false if @deny.match(addr)
+      return true
+    when ALLOW_DENY
+      return false if @deny.match(addr)
+      return true if @allow.match(addr)
+      return false
+    else
+      false
+    end
+  end
+
+  public
+  def install_list(list)
+    i = 0
+    while i < list.size
+      permission, domain = list.slice(i,2)
+      case permission.downcase
+      when 'allow'
+	@allow.add(domain)
+      when 'deny'
+	@deny.add(domain)
+      else
+	raise "Invalid ACL entry #{list.to_s}"
+      end
+      i += 2
+    end
+  end
+end
+
+if __FILE__ == $0
+  # example
+  list = %w(deny all
+	    allow 192.168.1.1
+            allow ::ffff:192.168.1.2
+            allow 192.168.1.3
+            )
+
+  addr = ["AF_INET", 10, "lc630", "192.168.1.3"]
+
+  acl = ACL.new
+  p acl.allow_addr?(addr)
+
+  acl = ACL.new(list, ACL::DENY_ALLOW)
+  p acl.allow_addr?(addr)
+end
+
diff --git a/ruby_1_8_6/lib/drb/drb.rb b/ruby_1_8_6/lib/drb/drb.rb
new file mode 100644
index 0000000000..25fbb3f788
--- /dev/null
+++ b/ruby_1_8_6/lib/drb/drb.rb
@@ -0,0 +1,1763 @@
+#
+# = drb/drb.rb
+#
+# Distributed Ruby: _dRuby_ version 2.0.4
+#
+# Copyright (c) 1999-2003 Masatoshi SEKI.  You can redistribute it and/or
+# modify it under the same terms as Ruby.
+#
+# Author:: Masatoshi SEKI
+#
+# Documentation:: William Webber (william@williamwebber.com)
+#
+# == Overview
+#
+# dRuby is a distributed object system for Ruby.  It allows an object in one
+# Ruby process to invoke methods on an object in another Ruby process on the
+# same or a different machine.
+#
+# The Ruby standard library contains the core classes of the dRuby package.
+# However, the full package also includes access control lists and the
+# Rinda tuple-space distributed task management system, as well as a 
+# large number of samples.  The full dRuby package can be downloaded from
+# the dRuby home page (see *References*).
+#
+# For an introduction and examples of usage see the documentation to the
+# DRb module.
+#
+# == References
+#
+# [http://www2a.biglobe.ne.jp/~seki/ruby/druby.html]
+#    The dRuby home page, in Japanese.  Contains the full dRuby package
+#    and links to other Japanese-language sources.
+#
+# [http://www2a.biglobe.ne.jp/~seki/ruby/druby.en.html]
+#    The English version of the dRuby home page.
+#
+# [http://www.chadfowler.com/ruby/drb.html]
+#    A quick tutorial introduction to using dRuby by Chad Fowler.
+#
+# [http://www.linux-mag.com/2002-09/ruby_05.html]
+#   A tutorial introduction to dRuby in Linux Magazine by Dave Thomas.
+#   Includes a discussion of Rinda.
+#
+# [http://www.eng.cse.dmu.ac.uk/~hgs/ruby/dRuby/]
+#   Links to English-language Ruby material collected by Hugh Sasse.
+#
+# [http://www.rubycentral.com/book/ospace.html]
+#   The chapter from *Programming* *Ruby* by Dave Thomas and Andy Hunt
+#   which discusses dRuby.
+#
+# [http://www.clio.ne.jp/home/web-i31s/Flotuard/Ruby/PRC2K_seki/dRuby.en.html]
+#   Translation of presentation on Ruby by Masatoshi Seki.
+
+require 'socket'
+require 'thread'
+require 'fcntl'
+require 'drb/eq'
+
+#
+# == Overview
+#
+# dRuby is a distributed object system for Ruby.  It is written in
+# pure Ruby and uses its own protocol.  No add-in services are needed
+# beyond those provided by the Ruby runtime, such as TCP sockets.  It
+# does not rely on or interoperate with other distributed object
+# systems such as CORBA, RMI, or .NET.
+#
+# dRuby allows methods to be called in one Ruby process upon a Ruby
+# object located in another Ruby process, even on another machine.
+# References to objects can be passed between processes.  Method
+# arguments and return values are dumped and loaded in marshalled
+# format.  All of this is done transparently to both the caller of the
+# remote method and the object that it is called upon.
+#
+# An object in a remote process is locally represented by a
+# DRb::DRbObject instance.  This acts as a sort of proxy for the
+# remote object.  Methods called upon this DRbObject instance are
+# forwarded to its remote object.  This is arranged dynamically at run
+# time.  There are no statically declared interfaces for remote
+# objects, such as CORBA's IDL.
+#
+# dRuby calls made into a process are handled by a DRb::DRbServer
+# instance within that process.  This reconstitutes the method call,
+# invokes it upon the specified local object, and returns the value to
+# the remote caller.  Any object can receive calls over dRuby.  There
+# is no need to implement a special interface, or mixin special
+# functionality.  Nor, in the general case, does an object need to
+# explicitly register itself with a DRbServer in order to receive
+# dRuby calls.
+#
+# One process wishing to make dRuby calls upon another process must
+# somehow obtain an initial reference to an object in the remote
+# process by some means other than as the return value of a remote
+# method call, as there is initially no remote object reference it can
+# invoke a method upon.  This is done by attaching to the server by
+# URI.  Each DRbServer binds itself to a URI such as
+# 'druby://example.com:8787'.  A DRbServer can have an object attached
+# to it that acts as the server's *front* *object*.  A DRbObject can
+# be explicitly created from the server's URI.  This DRbObject's
+# remote object will be the server's front object.  This front object
+# can then return references to other Ruby objects in the DRbServer's
+# process.
+#
+# Method calls made over dRuby behave largely the same as normal Ruby
+# method calls made within a process.  Method calls with blocks are
+# supported, as are raising exceptions.  In addition to a method's
+# standard errors, a dRuby call may also raise one of the
+# dRuby-specific errors, all of which are subclasses of DRb::DRbError.
+#
+# Any type of object can be passed as an argument to a dRuby call or
+# returned as its return value.  By default, such objects are dumped
+# or marshalled at the local end, then loaded or unmarshalled at the
+# remote end.  The remote end therefore receives a copy of the local
+# object, not a distributed reference to it; methods invoked upon this
+# copy are executed entirely in the remote process, not passed on to
+# the local original.  This has semantics similar to pass-by-value.
+#
+# However, if an object cannot be marshalled, a dRuby reference to it
+# is passed or returned instead.  This will turn up at the remote end
+# as a DRbObject instance.  All methods invoked upon this remote proxy
+# are forwarded to the local object, as described in the discussion of
+# DRbObjects.  This has semantics similar to the normal Ruby
+# pass-by-reference.
+# 
+# The easiest way to signal that we want an otherwise marshallable
+# object to be passed or returned as a DRbObject reference, rather
+# than marshalled and sent as a copy, is to include the
+# DRb::DRbUndumped mixin module.
+#
+# dRuby supports calling remote methods with blocks.  As blocks (or
+# rather the Proc objects that represent them) are not marshallable,
+# the block executes in the local, not the remote, context.  Each
+# value yielded to the block is passed from the remote object to the
+# local block, then the value returned by each block invocation is
+# passed back to the remote execution context to be collected, before
+# the collected values are finally returned to the local context as
+# the return value of the method invocation.
+# 
+# == Examples of usage
+#
+# For more dRuby samples, see the +samples+ directory in the full
+# dRuby distribution.
+#
+# === dRuby in client/server mode
+#
+# This illustrates setting up a simple client-server drb
+# system.  Run the server and client code in different terminals,
+# starting the server code first.
+#
+# ==== Server code
+#    
+#   require 'drb/drb'
+#     
+#   # The URI for the server to connect to
+#   URI="druby://localhost:8787" 
+#     
+#   class TimeServer
+#     
+#     def get_current_time
+#       return Time.now
+#     end
+#     
+#   end
+#     
+#   # The object that handles requests on the server
+#   FRONT_OBJECT=TimeServer.new
+#
+#   $SAFE = 1   # disable eval() and friends
+#   
+#   DRb.start_service(URI, FRONT_OBJECT)
+#   # Wait for the drb server thread to finish before exiting.
+#   DRb.thread.join
+#
+# ==== Client code
+#     
+#   require 'drb/drb'
+#   
+#   # The URI to connect to
+#   SERVER_URI="druby://localhost:8787"
+#
+#   # Start a local DRbServer to handle callbacks.
+#   #
+#   # Not necessary for this small example, but will be required
+#   # as soon as we pass a non-marshallable object as an argument
+#   # to a dRuby call.
+#   DRb.start_service
+#   
+#   timeserver = DRbObject.new_with_uri(SERVER_URI)
+#   puts timeserver.get_current_time 
+#
+# === Remote objects under dRuby
+#
+# This example illustrates returning a reference to an object
+# from a dRuby call.  The Logger instances live in the server
+# process.  References to them are returned to the client process,
+# where methods can be invoked upon them.  These methods are 
+# executed in the server process.
+#
+# ==== Server code
+#   
+#   require 'drb/drb'
+#   
+#   URI="druby://localhost:8787"
+#   
+#   class Logger
+#
+#       # Make dRuby send Logger instances as dRuby references,
+#       # not copies.
+#       include DRb::DRbUndumped
+#   
+#       def initialize(n, fname)
+#           @name = n
+#           @filename = fname
+#       end
+#   
+#       def log(message)
+#           File.open(@filename, "a") do |f|
+#               f.puts("#{Time.now}: #{@name}: #{message}")
+#           end
+#       end
+#   
+#   end
+#   
+#   # We have a central object for creating and retrieving loggers.
+#   # This retains a local reference to all loggers created.  This
+#   # is so an existing logger can be looked up by name, but also
+#   # to prevent loggers from being garbage collected.  A dRuby
+#   # reference to an object is not sufficient to prevent it being
+#   # garbage collected!
+#   class LoggerFactory
+#   
+#       def initialize(bdir)
+#           @basedir = bdir
+#           @loggers = {}
+#       end
+#   
+#       def get_logger(name)
+#           if !@loggers.has_key? name
+#               # make the filename safe, then declare it to be so
+#               fname = name.gsub(/[.\/]/, "_").untaint
+#               @loggers[name] = Logger.new(name, @basedir + "/" + fname)
+#           end
+#           return @loggers[name]
+#       end
+#   
+#   end
+#   
+#   FRONT_OBJECT=LoggerFactory.new("/tmp/dlog")
+#
+#   $SAFE = 1   # disable eval() and friends
+#   
+#   DRb.start_service(URI, FRONT_OBJECT)
+#   DRb.thread.join
+#
+# ==== Client code
+#
+#   require 'drb/drb'
+#   
+#   SERVER_URI="druby://localhost:8787"
+#
+#   DRb.start_service
+#   
+#   log_service=DRbObject.new_with_uri(SERVER_URI)
+#   
+#   ["loga", "logb", "logc"].each do |logname|
+#   
+#       logger=log_service.get_logger(logname)
+#   
+#       logger.log("Hello, world!")
+#       logger.log("Goodbye, world!")
+#       logger.log("=== EOT ===")
+#   
+#   end
+#
+# == Security
+#
+# As with all network services, security needs to be considered when
+# using dRuby.  By allowing external access to a Ruby object, you are
+# not only allowing outside clients to call the methods you have
+# defined for that object, but by default to execute arbitrary Ruby
+# code on your server.  Consider the following:
+#
+#    # !!! UNSAFE CODE !!!
+#    ro = DRbObject::new_with_uri("druby://your.server.com:8989")
+#    class << ro
+#      undef :instance_eval  # force call to be passed to remote object
+#    end
+#    ro.instance_eval("`rm -rf *`")
+#
+# The dangers posed by instance_eval and friends are such that a
+# DRbServer should generally be run with $SAFE set to at least 
+# level 1.  This will disable eval() and related calls on strings 
+# passed across the wire.  The sample usage code given above follows 
+# this practice.
+#
+# A DRbServer can be configured with an access control list to
+# selectively allow or deny access from specified IP addresses.  The
+# main druby distribution provides the ACL class for this purpose.  In
+# general, this mechanism should only be used alongside, rather than
+# as a replacement for, a good firewall.
+#
+# == dRuby internals
+#
+# dRuby is implemented using three main components: a remote method
+# call marshaller/unmarshaller; a transport protocol; and an
+# ID-to-object mapper.  The latter two can be directly, and the first
+# indirectly, replaced, in order to provide different behaviour and
+# capabilities.
+#
+# Marshalling and unmarshalling of remote method calls is performed by
+# a DRb::DRbMessage instance.  This uses the Marshal module to dump
+# the method call before sending it over the transport layer, then
+# reconstitute it at the other end.  There is normally no need to
+# replace this component, and no direct way is provided to do so.
+# However, it is possible to implement an alternative marshalling
+# scheme as part of an implementation of the transport layer.
+#
+# The transport layer is responsible for opening client and server
+# network connections and forwarding dRuby request across them.
+# Normally, it uses DRb::DRbMessage internally to manage marshalling
+# and unmarshalling.  The transport layer is managed by
+# DRb::DRbProtocol.  Multiple protocols can be installed in
+# DRbProtocol at the one time; selection between them is determined by
+# the scheme of a dRuby URI.  The default transport protocol is
+# selected by the scheme 'druby:', and implemented by
+# DRb::DRbTCPSocket.  This uses plain TCP/IP sockets for
+# communication.  An alternative protocol, using UNIX domain sockets,
+# is implemented by DRb::DRbUNIXSocket in the file drb/unix.rb, and
+# selected by the scheme 'drbunix:'.  A sample implementation over
+# HTTP can be found in the samples accompanying the main dRuby
+# distribution.
+#
+# The ID-to-object mapping component maps dRuby object ids to the
+# objects they refer to, and vice versa.  The implementation to use
+# can be specified as part of a DRb::DRbServer's configuration.  The
+# default implementation is provided by DRb::DRbIdConv.  It uses an
+# object's ObjectSpace id as its dRuby id.  This means that the dRuby
+# reference to that object only remains meaningful for the lifetime of
+# the object's process and the lifetime of the object within that
+# process.  A modified implementation is provided by DRb::TimerIdConv
+# in the file drb/timeridconv.rb.  This implementation retains a local
+# reference to all objects exported over dRuby for a configurable
+# period of time (defaulting to ten minutes), to prevent them being
+# garbage-collected within this time.  Another sample implementation
+# is provided in sample/name.rb in the main dRuby distribution.  This
+# allows objects to specify their own id or "name".  A dRuby reference
+# can be made persistent across processes by having each process
+# register an object using the same dRuby name.
+#
+module DRb
+
+  # Superclass of all errors raised in the DRb module.
+  class DRbError < RuntimeError; end
+
+  # Error raised when an error occurs on the underlying communication
+  # protocol.
+  class DRbConnError < DRbError; end
+
+  # Class responsible for converting between an object and its id.
+  #
+  # This, the default implementation, uses an object's local ObjectSpace
+  # __id__ as its id.  This means that an object's identification over
+  # drb remains valid only while that object instance remains alive 
+  # within the server runtime.
+  #
+  # For alternative mechanisms, see DRb::TimerIdConv in rdb/timeridconv.rb
+  # and DRbNameIdConv in sample/name.rb in the full drb distribution.
+  class DRbIdConv
+
+    # Convert an object reference id to an object.
+    #
+    # This implementation looks up the reference id in the local object
+    # space and returns the object it refers to.
+    def to_obj(ref)
+      ObjectSpace._id2ref(ref)
+    end
+    
+    # Convert an object into a reference id.
+    #
+    # This implementation returns the object's __id__ in the local
+    # object space.
+    def to_id(obj)
+      obj.nil? ? nil : obj.__id__
+    end
+  end
+
+  # Mixin module making an object undumpable or unmarshallable.
+  #
+  # If an object which includes this module is returned by method
+  # called over drb, then the object remains in the server space
+  # and a reference to the object is returned, rather than the
+  # object being marshalled and moved into the client space.
+  module DRbUndumped 
+    def _dump(dummy)  # :nodoc:
+      raise TypeError, 'can\'t dump'
+    end
+  end
+
+  # Error raised by the DRb module when an attempt is made to refer to
+  # the context's current drb server but the context does not have one.
+  # See #current_server.
+  class DRbServerNotFound < DRbError; end
+
+  # Error raised by the DRbProtocol module when it cannot find any
+  # protocol implementation support the scheme specified in a URI.
+  class DRbBadURI < DRbError; end
+
+  # Error raised by a dRuby protocol when it doesn't support the
+  # scheme specified in a URI.  See DRb::DRbProtocol.
+  class DRbBadScheme < DRbError; end
+
+  # An exception wrapping a DRb::DRbUnknown object
+  class DRbUnknownError < DRbError
+
+    # Create a new DRbUnknownError for the DRb::DRbUnknown object +unknown+
+    def initialize(unknown)
+      @unknown = unknown
+      super(unknown.name)
+    end
+
+    # Get the wrapped DRb::DRbUnknown object.
+    attr_reader :unknown
+
+    def self._load(s)  # :nodoc:
+      Marshal::load(s)
+    end
+    
+    def _dump(lv) # :nodoc:
+      Marshal::dump(@unknown)
+    end
+  end
+
+  # An exception wrapping an error object
+  class DRbRemoteError < DRbError
+    def initialize(error)
+      @reason = error.class.to_s
+      super("#{error.message} (#{error.class})")
+      set_backtrace(error.backtrace)
+    end
+
+    # the class of the error, as a string.
+    attr_reader :reason
+  end
+
+  # Class wrapping a marshalled object whose type is unknown locally.
+  #
+  # If an object is returned by a method invoked over drb, but the
+  # class of the object is unknown in the client namespace, or
+  # the object is a constant unknown in the client namespace, then
+  # the still-marshalled object is returned wrapped in a DRbUnknown instance.
+  #
+  # If this object is passed as an argument to a method invoked over
+  # drb, then the wrapped object is passed instead.
+  #
+  # The class or constant name of the object can be read from the
+  # +name+ attribute.  The marshalled object is held in the +buf+
+  # attribute.
+  class DRbUnknown
+    
+    # Create a new DRbUnknown object.
+    #
+    # +buf+ is a string containing a marshalled object that could not
+    # be unmarshalled.  +err+ is the error message that was raised 
+    # when the unmarshalling failed.  It is used to determine the
+    # name of the unmarshalled object.
+    def initialize(err, buf)
+      case err.to_s
+      when /uninitialized constant (\S+)/
+	@name = $1
+      when /undefined class\/module (\S+)/
+	@name = $1
+      else
+	@name = nil
+      end
+      @buf = buf
+    end
+
+    # The name of the unknown thing.
+    #
+    # Class name for unknown objects; variable name for unknown
+    # constants.
+    attr_reader :name
+
+    # Buffer contained the marshalled, unknown object.
+    attr_reader :buf
+
+    def self._load(s) # :nodoc:
+      begin
+	Marshal::load(s)
+      rescue NameError, ArgumentError
+	DRbUnknown.new($!, s)
+      end
+    end
+
+    def _dump(lv) # :nodoc:
+      @buf
+    end
+
+    # Attempt to load the wrapped marshalled object again.
+    #
+    # If the class of the object is now known locally, the object
+    # will be unmarshalled and returned.  Otherwise, a new 
+    # but identical DRbUnknown object will be returned.
+    def reload
+      self.class._load(@buf)
+    end
+
+    # Create a DRbUnknownError exception containing this object.
+    def exception
+      DRbUnknownError.new(self)
+    end
+  end
+
+  class DRbArray
+    def initialize(ary)
+      @ary = ary.collect { |obj| 
+	if obj.kind_of? DRbUndumped
+	  DRbObject.new(obj)
+	else
+	  begin
+	    Marshal.dump(obj)
+	    obj
+	  rescue
+	    DRbObject.new(obj)
+	  end
+	end
+      }
+    end
+
+    def self._load(s)
+      Marshal::load(s)
+    end
+
+    def _dump(lv)
+      Marshal.dump(@ary)
+    end
+  end
+
+  # Handler for sending and receiving drb messages.
+  #
+  # This takes care of the low-level marshalling and unmarshalling
+  # of drb requests and responses sent over the wire between server
+  # and client.  This relieves the implementor of a new drb
+  # protocol layer with having to deal with these details.
+  #
+  # The user does not have to directly deal with this object in
+  # normal use.
+  class DRbMessage
+    def initialize(config) # :nodoc:
+      @load_limit = config[:load_limit]
+      @argc_limit = config[:argc_limit]
+    end
+
+    def dump(obj, error=false)  # :nodoc:
+      obj = make_proxy(obj, error) if obj.kind_of? DRbUndumped
+      begin
+	str = Marshal::dump(obj)
+      rescue
+	str = Marshal::dump(make_proxy(obj, error))
+      end
+      [str.size].pack('N') + str
+    end
+
+    def load(soc)  # :nodoc:
+      begin
+        sz = soc.read(4)	# sizeof (N)
+      rescue
+        raise(DRbConnError, $!.message, $!.backtrace)
+      end
+      raise(DRbConnError, 'connection closed') if sz.nil?
+      raise(DRbConnError, 'premature header') if sz.size < 4
+      sz = sz.unpack('N')[0]
+      raise(DRbConnError, "too large packet #{sz}") if @load_limit < sz
+      begin
+        str = soc.read(sz)
+      rescue
+        raise(DRbConnError, $!.message, $!.backtrace)
+      end
+      raise(DRbConnError, 'connection closed') if str.nil?
+      raise(DRbConnError, 'premature marshal format(can\'t read)') if str.size < sz
+      Thread.exclusive do
+        begin
+          save = Thread.current[:drb_untaint]
+          Thread.current[:drb_untaint] = []
+          Marshal::load(str)
+        rescue NameError, ArgumentError
+          DRbUnknown.new($!, str)
+        ensure
+          Thread.current[:drb_untaint].each do |x|
+            x.untaint
+          end
+          Thread.current[:drb_untaint] = save
+        end
+      end
+    end
+
+    def send_request(stream, ref, msg_id, arg, b) # :nodoc:
+      ary = []
+      ary.push(dump(ref.__drbref))
+      ary.push(dump(msg_id.id2name))
+      ary.push(dump(arg.length))
+      arg.each do |e|
+	ary.push(dump(e))
+      end
+      ary.push(dump(b))
+      stream.write(ary.join(''))
+    rescue
+      raise(DRbConnError, $!.message, $!.backtrace)
+    end
+    
+    def recv_request(stream) # :nodoc:
+      ref = load(stream)
+      ro = DRb.to_obj(ref)
+      msg = load(stream)
+      argc = load(stream)
+      raise ArgumentError, 'too many arguments' if @argc_limit < argc
+      argv = Array.new(argc, nil)
+      argc.times do |n|
+	argv[n] = load(stream)
+      end
+      block = load(stream)
+      return ro, msg, argv, block
+    end
+
+    def send_reply(stream, succ, result)  # :nodoc:
+      stream.write(dump(succ) + dump(result, !succ))
+    rescue
+      raise(DRbConnError, $!.message, $!.backtrace)
+    end
+
+    def recv_reply(stream)  # :nodoc:
+      succ = load(stream)
+      result = load(stream)
+      [succ, result]
+    end
+
+    private
+    def make_proxy(obj, error=false)
+      if error
+        DRbRemoteError.new(obj)
+      else
+        DRbObject.new(obj)
+      end
+    end
+  end
+
+  # Module managing the underlying network protocol(s) used by drb.
+  #
+  # By default, drb uses the DRbTCPSocket protocol.  Other protocols
+  # can be defined.  A protocol must define the following class methods:
+  #
+  #   [open(uri, config)] Open a client connection to the server at +uri+,
+  #                       using configuration +config+.  Return a protocol
+  #                       instance for this connection.
+  #   [open_server(uri, config)] Open a server listening at +uri+,
+  #                              using configuration +config+.  Return a
+  #                              protocol instance for this listener.
+  #   [uri_option(uri, config)] Take a URI, possibly containing an option
+  #                             component (e.g. a trailing '?param=val'), 
+  #                             and return a [uri, option] tuple.
+  #
+  # All of these methods should raise a DRbBadScheme error if the URI 
+  # does not identify the protocol they support (e.g. "druby:" for
+  # the standard Ruby protocol).  This is how the DRbProtocol module,
+  # given a URI, determines which protocol implementation serves that
+  # protocol.
+  #
+  # The protocol instance returned by #open_server must have the
+  # following methods:
+  #
+  # [accept] Accept a new connection to the server.  Returns a protocol
+  #          instance capable of communicating with the client.
+  # [close] Close the server connection.
+  # [uri] Get the URI for this server.
+  #
+  # The protocol instance returned by #open must have the following methods:
+  #
+  # [send_request (ref, msg_id, arg, b)] 
+  #      Send a request to +ref+ with the given message id and arguments.
+  #      This is most easily implemented by calling DRbMessage.send_request,
+  #      providing a stream that sits on top of the current protocol.
+  # [recv_reply]
+  #      Receive a reply from the server and return it as a [success-boolean,
+  #      reply-value] pair.  This is most easily implemented by calling
+  #      DRb.recv_reply, providing a stream that sits on top of the 
+  #      current protocol.
+  # [alive?]
+  #      Is this connection still alive?
+  # [close]
+  #      Close this connection.
+  #
+  # The protocol instance returned by #open_server().accept() must have
+  # the following methods:
+  #
+  # [recv_request]
+  #     Receive a request from the client and return a [object, message,
+  #     args, block] tuple.  This is most easily implemented by calling
+  #     DRbMessage.recv_request, providing a stream that sits on top of
+  #     the current protocol.
+  # [send_reply(succ, result)]
+  #     Send a reply to the client.  This is most easily implemented
+  #     by calling DRbMessage.send_reply, providing a stream that sits
+  #     on top of the current protocol.
+  # [close]
+  #     Close this connection.
+  #
+  # A new protocol is registered with the DRbProtocol module using
+  # the add_protocol method.
+  #
+  # For examples of other protocols, see DRbUNIXSocket in drb/unix.rb,
+  # and HTTP0 in sample/http0.rb and sample/http0serv.rb in the full
+  # drb distribution.
+  module DRbProtocol
+
+    # Add a new protocol to the DRbProtocol module.
+    def add_protocol(prot)
+      @protocol.push(prot)
+    end
+    module_function :add_protocol
+
+    # Open a client connection to +uri+ with the configuration +config+.
+    #
+    # The DRbProtocol module asks each registered protocol in turn to
+    # try to open the URI.  Each protocol signals that it does not handle that
+    # URI by raising a DRbBadScheme error.  If no protocol recognises the
+    # URI, then a DRbBadURI error is raised.  If a protocol accepts the
+    # URI, but an error occurs in opening it, a DRbConnError is raised.
+    def open(uri, config, first=true) 
+      @protocol.each do |prot|
+	begin
+	  return prot.open(uri, config)
+	rescue DRbBadScheme
+	rescue DRbConnError
+	  raise($!)
+	rescue
+	  raise(DRbConnError, "#{uri} - #{$!.inspect}")
+	end
+      end
+      if first && (config[:auto_load] != false)
+	auto_load(uri, config)
+	return open(uri, config, false)
+      end
+      raise DRbBadURI, 'can\'t parse uri:' + uri
+    end
+    module_function :open
+
+    # Open a server listening for connections at +uri+ with 
+    # configuration +config+.
+    #
+    # The DRbProtocol module asks each registered protocol in turn to
+    # try to open a server at the URI.  Each protocol signals that it does 
+    # not handle that URI by raising a DRbBadScheme error.  If no protocol 
+    # recognises the URI, then a DRbBadURI error is raised.  If a protocol 
+    # accepts the URI, but an error occurs in opening it, the underlying 
+    # error is passed on to the caller.
+    def open_server(uri, config, first=true)
+      @protocol.each do |prot|
+	begin
+	  return prot.open_server(uri, config)
+	rescue DRbBadScheme
+	end
+      end
+      if first && (config[:auto_load] != false)
+	auto_load(uri, config)
+	return open_server(uri, config, false)
+      end
+      raise DRbBadURI, 'can\'t parse uri:' + uri
+    end
+    module_function :open_server
+
+    # Parse +uri+ into a [uri, option] pair.
+    #
+    # The DRbProtocol module asks each registered protocol in turn to
+    # try to parse the URI.  Each protocol signals that it does not handle that
+    # URI by raising a DRbBadScheme error.  If no protocol recognises the
+    # URI, then a DRbBadURI error is raised.  
+    def uri_option(uri, config, first=true)
+      @protocol.each do |prot|
+	begin
+	  uri, opt = prot.uri_option(uri, config)
+	  # opt = nil if opt == ''
+	  return uri, opt
+	rescue DRbBadScheme
+	end
+      end
+      if first && (config[:auto_load] != false)
+	auto_load(uri, config)
+        return uri_option(uri, config, false)
+      end
+      raise DRbBadURI, 'can\'t parse uri:' + uri
+    end
+    module_function :uri_option
+
+    def auto_load(uri, config)  # :nodoc:
+      if uri =~ /^drb([a-z0-9]+):/
+	require("drb/#{$1}") rescue nil
+      end
+    end
+    module_function :auto_load
+  end
+
+  # The default drb protocol.
+  #
+  # Communicates over a TCP socket.
+  class DRbTCPSocket
+    private
+    def self.parse_uri(uri)
+      if uri =~ /^druby:\/\/(.*?):(\d+)(\?(.*))?$/
+	host = $1
+	port = $2.to_i
+	option = $4
+	[host, port, option]
+      else
+	raise(DRbBadScheme, uri) unless uri =~ /^druby:/
+	raise(DRbBadURI, 'can\'t parse uri:' + uri)
+      end
+    end
+
+    public
+
+    # Open a client connection to +uri+ using configuration +config+.
+    def self.open(uri, config)
+      host, port, option = parse_uri(uri)
+      host.untaint
+      port.untaint
+      soc = TCPSocket.open(host, port)
+      self.new(uri, soc, config)
+    end
+
+    def self.getservername
+      host = Socket::gethostname
+      begin
+        Socket::gethostbyname(host)[0]
+      rescue
+        'localhost'
+      end
+    end
+
+    def self.open_server_inaddr_any(host, port)
+      infos = Socket::getaddrinfo(host, nil, 
+                                  Socket::AF_UNSPEC,
+                                  Socket::SOCK_STREAM, 
+                                  0,
+                                  Socket::AI_PASSIVE)
+      family = infos.collect { |af, *_| af }.uniq
+      case family
+      when ['AF_INET']
+        return TCPServer.open('0.0.0.0', port)
+      when ['AF_INET6']
+        return TCPServer.open('::', port)
+      else
+        return TCPServer.open(port)
+      end
+    end
+
+    # Open a server listening for connections at +uri+ using 
+    # configuration +config+.
+    def self.open_server(uri, config)
+      uri = 'druby://:0' unless uri
+      host, port, opt = parse_uri(uri)
+      if host.size == 0
+        host = getservername
+        soc = open_server_inaddr_any(host, port)
+      else
+	soc = TCPServer.open(host, port)
+      end
+      port = soc.addr[1] if port == 0
+      uri = "druby://#{host}:#{port}"
+      self.new(uri, soc, config)
+    end
+
+    # Parse +uri+ into a [uri, option] pair.
+    def self.uri_option(uri, config)
+      host, port, option = parse_uri(uri)
+      return "druby://#{host}:#{port}", option
+    end
+
+    # Create a new DRbTCPSocket instance.
+    #
+    # +uri+ is the URI we are connected to.
+    # +soc+ is the tcp socket we are bound to.  +config+ is our
+    # configuration.
+    def initialize(uri, soc, config={})
+      @uri = uri
+      @socket = soc
+      @config = config
+      @acl = config[:tcp_acl]
+      @msg = DRbMessage.new(config)
+      set_sockopt(@socket)
+    end
+
+    # Get the URI that we are connected to.
+    attr_reader :uri
+
+    # Get the address of our TCP peer (the other end of the socket
+    # we are bound to.
+    def peeraddr
+      @socket.peeraddr
+    end
+    
+    # Get the socket.
+    def stream; @socket; end
+
+    # On the client side, send a request to the server.
+    def send_request(ref, msg_id, arg, b)
+      @msg.send_request(stream, ref, msg_id, arg, b)
+    end
+    
+    # On the server side, receive a request from the client.
+    def recv_request
+      @msg.recv_request(stream)
+    end
+
+    # On the server side, send a reply to the client.
+    def send_reply(succ, result)
+      @msg.send_reply(stream, succ, result)
+    end
+
+    # On the client side, receive a reply from the server.
+    def recv_reply
+      @msg.recv_reply(stream)
+    end
+
+    public
+
+    # Close the connection.
+    #
+    # If this is an instance returned by #open_server, then this stops
+    # listening for new connections altogether.  If this is an instance
+    # returned by #open or by #accept, then it closes this particular
+    # client-server session.
+    def close
+      if @socket
+	@socket.close
+	@socket = nil
+      end
+    end
+    
+    # On the server side, for an instance returned by #open_server, 
+    # accept a client connection and return a new instance to handle
+    # the server's side of this client-server session.
+    def accept
+      while true
+	s = @socket.accept
+	break if (@acl ? @acl.allow_socket?(s) : true) 
+	s.close
+      end
+      self.class.new(nil, s, @config)
+    end
+
+    # Check to see if this connection is alive.
+    def alive?
+      return false unless @socket
+      if IO.select([@socket], nil, nil, 0)
+	close
+	return false
+      end
+      true
+    end
+
+    def set_sockopt(soc) # :nodoc:
+      soc.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+      soc.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
+    end
+  end
+
+  module DRbProtocol
+    @protocol = [DRbTCPSocket] # default
+  end
+
+  class DRbURIOption  # :nodoc:  I don't understand the purpose of this class...
+    def initialize(option)
+      @option = option.to_s
+    end
+    attr :option
+    def to_s; @option; end
+    
+    def ==(other)
+      return false unless DRbURIOption === other
+      @option == other.option
+    end
+    
+    def hash
+      @option.hash
+    end
+    
+    alias eql? ==
+  end
+
+  # Object wrapping a reference to a remote drb object.
+  #
+  # Method calls on this object are relayed to the remote
+  # object that this object is a stub for.
+  class DRbObject
+
+    # Unmarshall a marshalled DRbObject.
+    #
+    # If the referenced object is located within the local server, then
+    # the object itself is returned.  Otherwise, a new DRbObject is
+    # created to act as a stub for the remote referenced object.
+    def self._load(s)
+      uri, ref = Marshal.load(s)
+      
+      if DRb.here?(uri)
+	obj = DRb.to_obj(ref)
+        if ((! obj.tainted?) && Thread.current[:drb_untaint])
+          Thread.current[:drb_untaint].push(obj)
+        end
+        return obj
+      end
+
+      self.new_with(uri, ref)
+    end
+
+    def self.new_with(uri, ref)
+      it = self.allocate
+      it.instance_variable_set('@uri', uri)
+      it.instance_variable_set('@ref', ref)
+      it
+    end
+
+    # Create a new DRbObject from a URI alone.
+    def self.new_with_uri(uri)
+      self.new(nil, uri)
+    end
+
+    # Marshall this object.
+    #
+    # The URI and ref of the object are marshalled.
+    def _dump(lv)
+      Marshal.dump([@uri, @ref])
+    end
+
+    # Create a new remote object stub.
+    #
+    # +obj+ is the (local) object we want to create a stub for.  Normally
+    # this is +nil+.  +uri+ is the URI of the remote object that this
+    # will be a stub for.
+    def initialize(obj, uri=nil)
+      @uri = nil
+      @ref = nil
+      if obj.nil?
+	return if uri.nil?
+	@uri, option = DRbProtocol.uri_option(uri, DRb.config)
+	@ref = DRbURIOption.new(option) unless option.nil?
+      else
+	@uri = uri ? uri : (DRb.uri rescue nil)
+	@ref = obj ? DRb.to_id(obj) : nil
+      end
+    end
+
+    # Get the URI of the remote object.
+    def __drburi 
+      @uri
+    end
+
+    # Get the reference of the object, if local.
+    def __drbref
+      @ref
+    end
+
+    undef :to_s
+    undef :to_a if respond_to?(:to_a)
+
+    def respond_to?(msg_id, priv=false)
+      case msg_id
+      when :_dump
+        true
+      when :marshal_dump
+        false
+      else
+        method_missing(:respond_to?, msg_id, priv)
+      end
+    end
+
+    # Routes method calls to the referenced object.
+    def method_missing(msg_id, *a, &b)
+      if DRb.here?(@uri)
+	obj = DRb.to_obj(@ref)
+	DRb.current_server.check_insecure_method(obj, msg_id)
+	return obj.__send__(msg_id, *a, &b) 
+      end
+
+      succ, result = self.class.with_friend(@uri) do
+        DRbConn.open(@uri) do |conn|
+          conn.send_message(self, msg_id, a, b)
+        end
+      end
+
+      if succ
+        return result
+      elsif DRbUnknown === result
+        raise result
+      else
+        bt = self.class.prepare_backtrace(@uri, result)
+	result.set_backtrace(bt + caller)
+        raise result
+      end
+    end
+
+    def self.with_friend(uri)
+      friend = DRb.fetch_server(uri)
+      return yield() unless friend
+      
+      save = Thread.current['DRb']
+      Thread.current['DRb'] = { 'server' => friend }
+      return yield
+    ensure
+      Thread.current['DRb'] = save if friend
+    end
+
+    def self.prepare_backtrace(uri, result)
+      prefix = "(#{uri}) "
+      bt = []
+      result.backtrace.each do |x|
+        break if /`__send__'$/ =~ x 
+        if /^\(druby:\/\// =~ x
+          bt.push(x)
+        else
+          bt.push(prefix + x)
+        end
+      end
+      bt
+    end
+
+    def pretty_print(q)   # :nodoc:
+      q.pp_object(self)
+    end
+
+    def pretty_print_cycle(q)   # :nodoc:
+      q.object_address_group(self) {
+        q.breakable
+        q.text '...'
+      }
+    end
+  end
+
+  # Class handling the connection between a DRbObject and the
+  # server the real object lives on.
+  #
+  # This class maintains a pool of connections, to reduce the
+  # overhead of starting and closing down connections for each
+  # method call.
+  #
+  # This class is used internally by DRbObject.  The user does
+  # not normally need to deal with it directly.
+  class DRbConn
+    POOL_SIZE = 16  # :nodoc:
+    @mutex = Mutex.new
+    @pool = []
+
+    def self.open(remote_uri)  # :nodoc:
+      begin
+	conn = nil
+
+	@mutex.synchronize do
+	  #FIXME
+	  new_pool = []
+	  @pool.each do |c|
+	    if conn.nil? and c.uri == remote_uri
+	      conn = c if c.alive?
+	    else
+	      new_pool.push c
+	    end
+	  end
+	  @pool = new_pool
+	end
+
+	conn = self.new(remote_uri) unless conn
+	succ, result = yield(conn)
+	return succ, result
+
+      ensure
+	if conn
+	  if succ
+	    @mutex.synchronize do
+	      @pool.unshift(conn)
+	      @pool.pop.close while @pool.size > POOL_SIZE
+	    end
+	  else
+	    conn.close
+	  end
+	end
+      end
+    end
+
+    def initialize(remote_uri)  # :nodoc:
+      @uri = remote_uri
+      @protocol = DRbProtocol.open(remote_uri, DRb.config)
+    end
+    attr_reader :uri  # :nodoc:
+
+    def send_message(ref, msg_id, arg, block)  # :nodoc:
+      @protocol.send_request(ref, msg_id, arg, block)
+      @protocol.recv_reply
+    end
+
+    def close  # :nodoc:
+      @protocol.close
+      @protocol = nil
+    end
+
+    def alive?  # :nodoc:
+      @protocol.alive?
+    end
+  end
+
+  # Class representing a drb server instance.
+  #
+  # A DRbServer must be running in the local process before any incoming
+  # dRuby calls can be accepted, or any local objects can be passed as
+  # dRuby references to remote processes, even if those local objects are
+  # never actually called remotely. You do not need to start a DRbServer
+  # in the local process if you are only making outgoing dRuby calls
+  # passing marshalled parameters.
+  #
+  # Unless multiple servers are being used, the local DRbServer is normally
+  # started by calling DRb.start_service.
+  class DRbServer
+    @@acl = nil
+    @@idconv = DRbIdConv.new
+    @@secondary_server = nil
+    @@argc_limit = 256
+    @@load_limit = 256 * 102400
+    @@verbose = false
+    @@safe_level = 0
+
+    # Set the default value for the :argc_limit option.
+    #
+    # See #new().  The initial default value is 256.
+    def self.default_argc_limit(argc)
+      @@argc_limit = argc
+    end
+
+    # Set the default value for the :load_limit option.
+    #
+    # See #new().  The initial default value is 25 MB.
+    def self.default_load_limit(sz)
+      @@load_limit = sz
+    end
+
+    # Set the default value for the :acl option.
+    #
+    # See #new().  The initial default value is nil.
+    def self.default_acl(acl)
+      @@acl = acl
+    end
+
+    # Set the default value for the :id_conv option.
+    #
+    # See #new().  The initial default value is a DRbIdConv instance.
+    def self.default_id_conv(idconv)
+      @@idconv = idconv
+    end
+
+    def self.default_safe_level(level)
+      @@safe_level = level
+    end
+
+    # Set the default value of the :verbose option.
+    #
+    # See #new().  The initial default value is false.
+    def self.verbose=(on)
+      @@verbose = on
+    end
+    
+    # Get the default value of the :verbose option.
+    def self.verbose
+      @@verbose
+    end
+
+    def self.make_config(hash={})  # :nodoc:
+      default_config = { 
+	:idconv => @@idconv,
+	:verbose => @@verbose,
+	:tcp_acl => @@acl,
+	:load_limit => @@load_limit,
+	:argc_limit => @@argc_limit,
+        :safe_level => @@safe_level
+      }
+      default_config.update(hash)
+    end
+
+    # Create a new DRbServer instance.
+    #
+    # +uri+ is the URI to bind to.  This is normally of the form
+    # 'druby://<hostname>:<port>' where <hostname> is a hostname of
+    # the local machine.  If nil, then the system's default hostname
+    # will be bound to, on a port selected by the system; these value
+    # can be retrieved from the +uri+ attribute.  'druby:' specifies
+    # the default dRuby transport protocol: another protocol, such
+    # as 'drbunix:', can be specified instead.
+    #
+    # +front+ is the front object for the server, that is, the object
+    # to which remote method calls on the server will be passed.  If
+    # nil, then the server will not accept remote method calls.
+    #
+    # If +config_or_acl+ is a hash, it is the configuration to
+    # use for this server.  The following options are recognised:
+    #
+    # :idconv :: an id-to-object conversion object.  This defaults
+    #            to an instance of the class DRb::DRbIdConv.
+    # :verbose :: if true, all unsuccessful remote calls on objects
+    #             in the server will be logged to $stdout. false
+    #             by default.
+    # :tcp_acl :: the access control list for this server.  See
+    #             the ACL class from the main dRuby distribution.
+    # :load_limit :: the maximum message size in bytes accepted by
+    #                the server.  Defaults to 25 MB (26214400).
+    # :argc_limit :: the maximum number of arguments to a remote
+    #                method accepted by the server.  Defaults to
+    #                256.
+    #
+    # The default values of these options can be modified on
+    # a class-wide basis by the class methods #default_argc_limit,
+    # #default_load_limit, #default_acl, #default_id_conv,
+    # and #verbose=
+    #
+    # If +config_or_acl+ is not a hash, but is not nil, it is
+    # assumed to be the access control list for this server.
+    # See the :tcp_acl option for more details.
+    #
+    # If no other server is currently set as the primary server,
+    # this will become the primary server.
+    #
+    # The server will immediately start running in its own thread.
+    def initialize(uri=nil, front=nil, config_or_acl=nil)
+      if Hash === config_or_acl
+	config = config_or_acl.dup
+      else
+	acl = config_or_acl || @@acl
+	config = {
+	  :tcp_acl => acl
+	}
+      end
+
+      @config = self.class.make_config(config)
+
+      @protocol = DRbProtocol.open_server(uri, @config)
+      @uri = @protocol.uri
+
+      @front = front
+      @idconv = @config[:idconv]
+      @safe_level = @config[:safe_level]
+
+      @grp = ThreadGroup.new
+      @thread = run
+
+      DRb.regist_server(self)
+    end
+
+    # The URI of this DRbServer.
+    attr_reader :uri
+
+    # The main thread of this DRbServer.
+    #
+    # This is the thread that listens for and accepts connections
+    # from clients, not that handles each client's request-response
+    # session.
+    attr_reader :thread
+
+    # The front object of the DRbServer.
+    # 
+    # This object receives remote method calls made on the server's
+    # URI alone, with an object id.
+    attr_reader :front
+
+    # The configuration of this DRbServer
+    attr_reader :config
+
+    attr_reader :safe_level
+
+    # Set whether to operate in verbose mode.
+    #
+    # In verbose mode, failed calls are logged to stdout.
+    def verbose=(v); @config[:verbose]=v; end
+
+    # Get whether the server is in verbose mode.
+    #
+    # In verbose mode, failed calls are logged to stdout.
+    def verbose; @config[:verbose]; end
+
+    # Is this server alive?
+    def alive?
+      @thread.alive?
+    end
+
+    # Stop this server.
+    def stop_service
+      DRb.remove_server(self)
+      if  Thread.current['DRb'] && Thread.current['DRb']['server'] == self
+        Thread.current['DRb']['stop_service'] = true
+      else
+        @thread.kill
+      end
+    end
+
+    # Convert a dRuby reference to the local object it refers to.
+    def to_obj(ref)
+      return front if ref.nil?
+      return front[ref.to_s] if DRbURIOption === ref
+      @idconv.to_obj(ref)
+    end
+
+    # Convert a local object to a dRuby reference.
+    def to_id(obj)
+      return nil if obj.__id__ == front.__id__
+      @idconv.to_id(obj)
+    end
+
+    private
+    def kill_sub_thread
+      Thread.new do
+	grp = ThreadGroup.new
+	grp.add(Thread.current)
+	list = @grp.list
+	while list.size > 0
+	  list.each do |th|
+	    th.kill if th.alive?
+	  end
+	  list = @grp.list
+	end
+      end
+    end
+
+    def run
+      Thread.start do
+	begin
+	  while true
+	    main_loop
+	  end
+	ensure
+	  @protocol.close if @protocol
+	  kill_sub_thread
+	end
+      end
+    end
+
+    # List of insecure methods.
+    #
+    # These methods are not callable via dRuby.
+    INSECURE_METHOD = [
+      :__send__
+    ]
+
+    # Has a method been included in the list of insecure methods?
+    def insecure_method?(msg_id)
+      INSECURE_METHOD.include?(msg_id)
+    end
+
+    # Coerce an object to a string, providing our own representation if
+    # to_s is not defined for the object.
+    def any_to_s(obj)
+      obj.to_s + ":#{obj.class}"
+    rescue
+      sprintf("#<%s:0x%lx>", obj.class, obj.__id__)      
+    end
+
+    # Check that a method is callable via dRuby.
+    #
+    # +obj+ is the object we want to invoke the method on. +msg_id+ is the
+    # method name, as a Symbol.
+    #
+    # If the method is an insecure method (see #insecure_method?) a 
+    # SecurityError is thrown.  If the method is private or undefined,
+    # a NameError is thrown.
+    def check_insecure_method(obj, msg_id)
+      return true if Proc === obj && msg_id == :__drb_yield
+      raise(ArgumentError, "#{any_to_s(msg_id)} is not a symbol") unless Symbol == msg_id.class
+      raise(SecurityError, "insecure method `#{msg_id}'") if insecure_method?(msg_id)
+      
+      if obj.private_methods.include?(msg_id.to_s)
+	desc = any_to_s(obj)
+        raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
+      elsif obj.protected_methods.include?(msg_id.to_s)
+	desc = any_to_s(obj)
+        raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
+      else
+        true
+      end
+    end
+    public :check_insecure_method
+    
+    class InvokeMethod  # :nodoc:
+      def initialize(drb_server, client)
+	@drb_server = drb_server
+        @safe_level = drb_server.safe_level
+	@client = client
+      end
+
+      def perform
+	@result = nil
+	@succ = false
+	setup_message
+
+        if $SAFE < @safe_level
+          info = Thread.current['DRb']
+          if @block
+            @result = Thread.new {
+              Thread.current['DRb'] = info
+              $SAFE = @safe_level
+              perform_with_block
+            }.value
+          else
+            @result = Thread.new { 
+              Thread.current['DRb'] = info
+              $SAFE = @safe_level
+              perform_without_block
+            }.value
+          end
+        else
+          if @block
+            @result = perform_with_block
+          else
+            @result = perform_without_block
+          end
+        end
+	@succ = true
+	if @msg_id == :to_ary && @result.class == Array
+	  @result = DRbArray.new(@result) 
+	end
+	return @succ, @result
+      rescue StandardError, ScriptError, Interrupt
+	@result = $!
+	return @succ, @result
+      end
+
+      private
+      def init_with_client
+	obj, msg, argv, block = @client.recv_request
+        @obj = obj
+        @msg_id = msg.intern
+        @argv = argv
+        @block = block
+      end
+      
+      def check_insecure_method
+        @drb_server.check_insecure_method(@obj, @msg_id)
+      end
+
+      def setup_message
+	init_with_client
+	check_insecure_method
+      end
+      
+      def perform_without_block
+	if Proc === @obj && @msg_id == :__drb_yield
+          if @argv.size == 1
+	    ary = @argv
+	  else
+	    ary = [@argv]
+	  end
+	  ary.collect(&@obj)[0]
+	else
+	  @obj.__send__(@msg_id, *@argv)
+	end
+      end
+
+    end
+
+    if RUBY_VERSION >= '1.8'
+      require 'drb/invokemethod'
+      class InvokeMethod
+        include InvokeMethod18Mixin
+      end
+    else
+      require 'drb/invokemethod16'
+      class InvokeMethod
+        include InvokeMethod16Mixin
+      end
+    end
+
+    # The main loop performed by a DRbServer's internal thread.
+    #
+    # Accepts a connection from a client, and starts up its own
+    # thread to handle it.  This thread loops, receiving requests
+    # from the client, invoking them on a local object, and
+    # returning responses, until the client closes the connection
+    # or a local method call fails.
+    def main_loop
+      Thread.start(@protocol.accept) do |client|
+	@grp.add Thread.current
+	Thread.current['DRb'] = { 'client' => client ,
+	                          'server' => self }
+	loop do
+	  begin
+	    succ = false
+	    invoke_method = InvokeMethod.new(self, client)
+	    succ, result = invoke_method.perform
+	    if !succ && verbose
+	      p result
+	      result.backtrace.each do |x|
+		puts x
+	      end
+	    end
+	    client.send_reply(succ, result) rescue nil
+	  ensure
+            client.close unless succ
+            if Thread.current['DRb']['stop_service']
+              Thread.new { stop_service }
+            end
+            break unless succ
+	  end
+	end
+      end
+    end
+  end
+
+  @primary_server = nil
+
+  # Start a dRuby server locally.
+  #
+  # The new dRuby server will become the primary server, even
+  # if another server is currently the primary server.
+  #
+  # +uri+ is the URI for the server to bind to.  If nil,
+  # the server will bind to random port on the default local host
+  # name and use the default dRuby protocol.
+  #
+  # +front+ is the server's front object.  This may be nil.
+  #
+  # +config+ is the configuration for the new server.  This may
+  # be nil.
+  #
+  # See DRbServer::new.
+  def start_service(uri=nil, front=nil, config=nil)
+    @primary_server = DRbServer.new(uri, front, config)
+  end
+  module_function :start_service
+
+  # The primary local dRuby server.
+  #
+  # This is the server created by the #start_service call.  
+  attr_accessor :primary_server
+  module_function :primary_server=, :primary_server
+
+  # Get the 'current' server.
+  #
+  # In the context of execution taking place within the main
+  # thread of a dRuby server (typically, as a result of a remote
+  # call on the server or one of its objects), the current
+  # server is that server.  Otherwise, the current server is
+  # the primary server.
+  #
+  # If the above rule fails to find a server, a DRbServerNotFound
+  # error is raised.
+  def current_server
+    drb = Thread.current['DRb'] 
+    server = (drb && drb['server']) ? drb['server'] : @primary_server 
+    raise DRbServerNotFound unless server
+    return server
+  end
+  module_function :current_server
+
+  # Stop the local dRuby server.
+  #
+  # This operates on the primary server.  If there is no primary
+  # server currently running, it is a noop.
+  def stop_service
+    @primary_server.stop_service if @primary_server
+    @primary_server = nil
+  end
+  module_function :stop_service
+
+  # Get the URI defining the local dRuby space.
+  #
+  # This is the URI of the current server.  See #current_server.
+  def uri
+    current_server.uri
+  end
+  module_function :uri
+
+  # Is +uri+ the URI for the current local server?
+  def here?(uri)
+    (current_server.uri rescue nil) == uri
+  end
+  module_function :here?
+
+  # Get the configuration of the current server.
+  #
+  # If there is no current server, this returns the default configuration.
+  # See #current_server and DRbServer::make_config.
+  def config
+    current_server.config
+  rescue
+    DRbServer.make_config
+  end
+  module_function :config
+  
+  # Get the front object of the current server.
+  #
+  # This raises a DRbServerNotFound error if there is no current server.
+  # See #current_server.
+  def front
+    current_server.front
+  end
+  module_function :front
+
+  # Convert a reference into an object using the current server.
+  #
+  # This raises a DRbServerNotFound error if there is no current server.
+  # See #current_server.
+  def to_obj(ref)
+    current_server.to_obj(ref)
+  end
+
+  # Get a reference id for an object using the current server.
+  #
+  # This raises a DRbServerNotFound error if there is no current server.
+  # See #current_server.
+  def to_id(obj)
+    current_server.to_id(obj)
+  end
+  module_function :to_id
+  module_function :to_obj
+
+  # Get the thread of the primary server.
+  #
+  # This returns nil if there is no primary server.  See #primary_server.
+  def thread
+    @primary_server ? @primary_server.thread : nil
+  end
+  module_function :thread
+
+  # Set the default id conv object.
+  #
+  # See DRbServer#default_id_conv.
+  def install_id_conv(idconv)
+    DRbServer.default_id_conv(idconv)
+  end
+  module_function :install_id_conv
+
+  # Set the default acl.
+  #
+  # See DRb::DRbServer.default_acl.
+  def install_acl(acl)
+    DRbServer.default_acl(acl)
+  end
+  module_function :install_acl
+
+  @server = {}
+  def regist_server(server)
+    @server[server.uri] = server
+    Thread.exclusive do
+      @primary_server = server unless @primary_server
+    end
+  end
+  module_function :regist_server
+
+  def remove_server(server)
+    @server.delete(server.uri)
+  end
+  module_function :remove_server
+  
+  def fetch_server(uri)
+    @server[uri]
+  end
+  module_function :fetch_server
+end
+
+DRbObject = DRb::DRbObject
+DRbUndumped = DRb::DRbUndumped
+DRbIdConv = DRb::DRbIdConv
diff --git a/ruby_1_8_6/lib/drb/eq.rb b/ruby_1_8_6/lib/drb/eq.rb
new file mode 100644
index 0000000000..e24512d6a7
--- /dev/null
+++ b/ruby_1_8_6/lib/drb/eq.rb
@@ -0,0 +1,16 @@
+require 'drb/drb'
+
+module DRb
+  class DRbObject
+    def ==(other)
+      return false unless DRbObject === other
+     (@ref == other.__drbref) && (@uri == other.__drburi)
+    end
+
+    def hash
+      [@uri, @ref].hash
+    end
+
+    alias eql? ==
+  end
+end
diff --git a/ruby_1_8_6/lib/drb/extserv.rb b/ruby_1_8_6/lib/drb/extserv.rb
new file mode 100644
index 0000000000..7da8130c2b
--- /dev/null
+++ b/ruby_1_8_6/lib/drb/extserv.rb
@@ -0,0 +1,64 @@
+=begin
+ external service
+ 	Copyright (c) 2000,2002 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+
+module DRb
+  class ExtServ
+    include DRbUndumped
+
+    def initialize(there, name, server=nil)
+      @server = server || DRb::primary_server
+      @name = name
+      ro = DRbObject.new(nil, there)
+      @invoker = ro.regist(name, DRbObject.new(self, @server.uri))
+    end
+    attr_reader :server
+
+    def front
+      DRbObject.new(nil, @server.uri)
+    end
+
+    def stop_service
+      @invoker.unregist(@name)
+      server = @server
+      @server = nil
+      server.stop_service
+      true
+    end
+
+    def alive?
+      @server ? @server.alive? : false
+    end
+  end
+end
+
+if __FILE__ == $0
+  class Foo
+    include DRbUndumped
+
+    def initialize(str)
+      @str = str
+    end
+
+    def hello(it)
+      "#{it}: #{self}"
+    end
+
+    def to_s
+      @str
+    end
+  end
+
+  cmd = ARGV.shift
+  case cmd
+  when 'itest1', 'itest2'
+    front = Foo.new(cmd)
+    manager = DRb::DRbServer.new(nil, front)
+    es = DRb::ExtServ.new(ARGV.shift, ARGV.shift, manager)
+    es.server.thread.join
+  end
+end
+
diff --git a/ruby_1_8_6/lib/drb/extservm.rb b/ruby_1_8_6/lib/drb/extservm.rb
new file mode 100644
index 0000000000..7066f84c65
--- /dev/null
+++ b/ruby_1_8_6/lib/drb/extservm.rb
@@ -0,0 +1,96 @@
+=begin
+ external service manager
+ 	Copyright (c) 2000 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+require 'thread'
+
+module DRb
+  class ExtServManager
+    include DRbUndumped
+
+    @@command = {}
+
+    def self.command
+      @@command
+    end
+
+    def self.command=(cmd)
+      @@command = cmd
+    end
+      
+    def initialize
+      @servers = {}
+      @waiting = []
+      @queue = Queue.new
+      @thread = invoke_thread
+      @uri = nil
+    end
+    attr_accessor :uri
+
+    def service(name)
+      while true
+	server = nil
+	Thread.exclusive do
+	  server = @servers[name] if @servers[name]
+	end
+	return server if server && server.alive?
+	invoke_service(name)
+      end
+    end
+
+    def regist(name, ro)
+      ary = nil
+      Thread.exclusive do
+	@servers[name] = ro
+	ary = @waiting
+	@waiting = []
+      end
+      ary.each do |th|
+	begin
+	  th.run
+	rescue ThreadError
+	end
+      end
+      self
+    end
+    
+    def unregist(name)
+      Thread.exclusive do
+	@servers.delete(name)
+      end
+    end
+
+    private
+    def invoke_thread
+      Thread.new do
+	while true
+	  name = @queue.pop
+	  invoke_service_command(name, @@command[name])
+	end
+      end
+    end
+
+    def invoke_service(name)
+      Thread.critical = true
+      @waiting.push Thread.current
+      @queue.push name
+      Thread.stop
+    end
+
+    def invoke_service_command(name, command)
+      raise "invalid command. name: #{name}" unless command
+      Thread.exclusive do
+	return if @servers.include?(name)
+	@servers[name] = false
+      end
+      uri = @uri || DRb.uri
+      if RUBY_PLATFORM =~ /mswin32/ && /NT/ =~ ENV["OS"]
+        system(%Q'cmd /c start "ruby" /b #{command} #{uri} #{name}')
+      else
+	system("#{command} #{uri} #{name} &")
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/drb/gw.rb b/ruby_1_8_6/lib/drb/gw.rb
new file mode 100644
index 0000000000..b7a5f5383f
--- /dev/null
+++ b/ruby_1_8_6/lib/drb/gw.rb
@@ -0,0 +1,122 @@
+require 'drb/drb'
+require 'monitor'
+
+module DRb
+  class GWIdConv < DRbIdConv
+    def to_obj(ref)
+      if Array === ref && ref[0] == :DRbObject
+        return DRbObject.new_with(ref[1], ref[2])
+      end
+      super(ref)
+    end
+  end
+
+  class GW
+    include MonitorMixin
+    def initialize
+      super()
+      @hash = {}
+    end
+
+    def [](key)
+      synchronize do
+        @hash[key]
+      end
+    end
+
+    def []=(key, v)
+      synchronize do
+        @hash[key] = v
+      end
+    end
+  end
+
+  class DRbObject
+    def self._load(s)
+      uri, ref = Marshal.load(s)
+      if DRb.uri == uri
+        return ref ? DRb.to_obj(ref) : DRb.front
+      end
+
+      self.new_with(DRb.uri, [:DRbObject, uri, ref])
+    end
+
+    def _dump(lv)
+      if DRb.uri == @uri
+        if Array === @ref && @ref[0] == :DRbObject
+          Marshal.dump([@ref[1], @ref[2]])
+        else
+          Marshal.dump([@uri, @ref]) # ??
+        end
+      else
+        Marshal.dump([DRb.uri, [:DRbObject, @uri, @ref]])
+      end
+    end
+  end
+end
+
+=begin
+DRb.install_id_conv(DRb::GWIdConv.new)
+
+front = DRb::GW.new
+
+s1 = DRb::DRbServer.new('drbunix:/tmp/gw_b_a', front)
+s2 = DRb::DRbServer.new('drbunix:/tmp/gw_b_c', front)
+
+s1.thread.join
+s2.thread.join
+=end
+
+=begin
+# foo.rb
+
+require 'drb/drb'
+
+class Foo
+  include DRbUndumped
+  def initialize(name, peer=nil)
+    @name = name
+    @peer = peer
+  end
+
+  def ping(obj)
+    puts "#{@name}: ping: #{obj.inspect}"
+    @peer.ping(self) if @peer
+  end
+end
+=end
+
+=begin
+# gw_a.rb
+require 'drb/unix'
+require 'foo'
+
+obj = Foo.new('a')
+DRb.start_service("drbunix:/tmp/gw_a", obj)
+
+robj = DRbObject.new_with_uri('drbunix:/tmp/gw_b_a')
+robj[:a] = obj
+
+DRb.thread.join
+=end
+
+=begin
+# gw_c.rb
+require 'drb/unix'
+require 'foo'
+
+foo = Foo.new('c', nil)
+
+DRb.start_service("drbunix:/tmp/gw_c", nil)
+
+robj = DRbObject.new_with_uri("drbunix:/tmp/gw_b_c")
+
+puts "c->b"
+a = robj[:a]
+sleep 2
+
+a.ping(foo)
+
+DRb.thread.join
+=end
+
diff --git a/ruby_1_8_6/lib/drb/invokemethod.rb b/ruby_1_8_6/lib/drb/invokemethod.rb
new file mode 100644
index 0000000000..412b2ab9b5
--- /dev/null
+++ b/ruby_1_8_6/lib/drb/invokemethod.rb
@@ -0,0 +1,36 @@
+# for ruby-1.8.0
+
+module DRb
+  class DRbServer
+    module InvokeMethod18Mixin
+      def block_yield(x)
+	if x.size == 1 && x[0].class == Array
+	  x[0] = DRbArray.new(x[0])
+	end
+        block_value = @block.call(*x)
+      end
+      
+      def perform_with_block
+        @obj.__send__(@msg_id, *@argv) do |*x|
+          jump_error = nil
+          begin
+            block_value = block_yield(x)
+          rescue LocalJumpError
+            jump_error = $!
+          end
+          if jump_error
+            case jump_error.reason
+            when :retry
+              retry
+            when :break
+              break(jump_error.exit_value)
+            else
+              raise jump_error
+            end
+          end
+          block_value
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/drb/observer.rb b/ruby_1_8_6/lib/drb/observer.rb
new file mode 100644
index 0000000000..e7f1668c52
--- /dev/null
+++ b/ruby_1_8_6/lib/drb/observer.rb
@@ -0,0 +1,22 @@
+require 'observer'
+
+module DRb
+  module DRbObservable
+    include Observable
+
+    def notify_observers(*arg)
+      if defined? @observer_state and @observer_state
+	if defined? @observer_peers
+	  for i in @observer_peers.dup
+	    begin
+	      i.update(*arg)
+	    rescue
+	      delete_observer(i)
+	    end
+	  end
+	end
+	@observer_state = false
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/drb/ssl.rb b/ruby_1_8_6/lib/drb/ssl.rb
new file mode 100644
index 0000000000..58d6b7d1e0
--- /dev/null
+++ b/ruby_1_8_6/lib/drb/ssl.rb
@@ -0,0 +1,190 @@
+require 'socket'
+require 'openssl'
+require 'drb/drb'
+require 'singleton'
+
+module DRb
+
+  class DRbSSLSocket < DRbTCPSocket
+
+    class SSLConfig
+
+      DEFAULT = {
+	:SSLCertificate       => nil,
+	:SSLPrivateKey        => nil,
+	:SSLClientCA          => nil,
+	:SSLCACertificatePath => nil,
+	:SSLCACertificateFile => nil,
+	:SSLVerifyMode        => ::OpenSSL::SSL::VERIFY_NONE, 
+	:SSLVerifyDepth       => nil,
+	:SSLVerifyCallback    => nil,   # custom verification
+        :SSLCertificateStore  => nil,
+	# Must specify if you use auto generated certificate.
+	:SSLCertName          => nil,   # e.g. [["CN","fqdn.example.com"]]
+	:SSLCertComment       => "Generated by Ruby/OpenSSL"
+      }
+
+      def initialize(config)
+	@config  = config
+        @cert    = config[:SSLCertificate]
+        @pkey    = config[:SSLPrivateKey]
+        @ssl_ctx = nil
+      end
+
+      def [](key); 
+	@config[key] || DEFAULT[key]
+      end
+
+      def connect(tcp)
+	ssl = ::OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
+	ssl.sync = true
+	ssl.connect
+	ssl
+      end
+      
+      def accept(tcp)
+	ssl = OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
+	ssl.sync = true
+	ssl.accept
+	ssl
+      end
+      
+      def setup_certificate
+        if @cert && @pkey
+          return
+        end
+
+	rsa = OpenSSL::PKey::RSA.new(512){|p, n|
+	  next unless self[:verbose]
+	  case p
+	  when 0; $stderr.putc "."  # BN_generate_prime
+	  when 1; $stderr.putc "+"  # BN_generate_prime
+	  when 2; $stderr.putc "*"  # searching good prime,
+	                            # n = #of try,
+                          	    # but also data from BN_generate_prime
+	  when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
+                         	    # but also data from BN_generate_prime
+	  else;   $stderr.putc "*"  # BN_generate_prime
+	  end
+	}
+
+	cert = OpenSSL::X509::Certificate.new
+	cert.version = 3
+	cert.serial = 0
+	name = OpenSSL::X509::Name.new(self[:SSLCertName])
+	cert.subject = name
+	cert.issuer = name
+	cert.not_before = Time.now
+	cert.not_after = Time.now + (365*24*60*60)
+	cert.public_key = rsa.public_key
+	
+	ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
+	cert.extensions = [
+	  ef.create_extension("basicConstraints","CA:FALSE"),
+	  ef.create_extension("subjectKeyIdentifier", "hash") ]
+	ef.issuer_certificate = cert
+	cert.add_extension(ef.create_extension("authorityKeyIdentifier",
+					       "keyid:always,issuer:always"))
+	if comment = self[:SSLCertComment]
+	  cert.add_extension(ef.create_extension("nsComment", comment))
+	end
+	cert.sign(rsa, OpenSSL::Digest::SHA1.new)
+	
+	@cert = cert
+        @pkey = rsa
+      end
+
+      def setup_ssl_context
+        ctx = ::OpenSSL::SSL::SSLContext.new
+        ctx.cert            = @cert
+        ctx.key             = @pkey
+	ctx.client_ca       = self[:SSLClientCA]
+	ctx.ca_path         = self[:SSLCACertificatePath]
+	ctx.ca_file         = self[:SSLCACertificateFile]
+	ctx.verify_mode     = self[:SSLVerifyMode]
+	ctx.verify_depth    = self[:SSLVerifyDepth]
+	ctx.verify_callback = self[:SSLVerifyCallback]
+        ctx.cert_store      = self[:SSLCertificateStore]
+        @ssl_ctx = ctx
+      end
+    end
+
+    def self.parse_uri(uri)
+      if uri =~ /^drbssl:\/\/(.*?):(\d+)(\?(.*))?$/
+	host = $1
+	port = $2.to_i
+	option = $4
+	[host, port, option]
+      else
+	raise(DRbBadScheme, uri) unless uri =~ /^drbssl:/
+	raise(DRbBadURI, 'can\'t parse uri:' + uri)
+      end
+    end
+
+    def self.open(uri, config)
+      host, port, option = parse_uri(uri)
+      host.untaint
+      port.untaint
+      soc = TCPSocket.open(host, port)
+      ssl_conf = SSLConfig::new(config)
+      ssl_conf.setup_ssl_context
+      ssl = ssl_conf.connect(soc)
+      self.new(uri, ssl, ssl_conf, true)
+    end
+
+    def self.open_server(uri, config)
+      uri = 'drbssl://:0' unless uri
+      host, port, opt = parse_uri(uri)
+      if host.size == 0
+        host = getservername
+        soc = open_server_inaddr_any(host, port)
+      else
+	soc = TCPServer.open(host, port)
+      end
+      port = soc.addr[1] if port == 0
+      @uri = "drbssl://#{host}:#{port}"
+      
+      ssl_conf = SSLConfig.new(config)
+      ssl_conf.setup_certificate
+      ssl_conf.setup_ssl_context
+      self.new(@uri, soc, ssl_conf, false)
+    end
+
+    def self.uri_option(uri, config)
+      host, port, option = parse_uri(uri)
+      return "drbssl://#{host}:#{port}", option
+    end
+
+    def initialize(uri, soc, config, is_established)
+      @ssl = is_established ? soc : nil
+      super(uri, soc.to_io, config)
+    end
+    
+    def stream; @ssl; end
+
+    def close
+      if @ssl
+	@ssl.close
+	@ssl = nil
+      end
+      super
+    end
+      
+    def accept
+      begin
+      while true
+	soc = @socket.accept
+	break if (@acl ? @acl.allow_socket?(soc) : true) 
+	soc.close
+      end
+      ssl = @config.accept(soc)
+      self.class.new(uri, ssl, @config, true)
+      rescue OpenSSL::SSL::SSLError
+	warn("#{__FILE__}:#{__LINE__}: warning: #{$!.message} (#{$!.class})") if @config[:verbose]
+	retry
+      end
+    end
+  end
+  
+  DRbProtocol.add_protocol(DRbSSLSocket)
+end
diff --git a/ruby_1_8_6/lib/drb/timeridconv.rb b/ruby_1_8_6/lib/drb/timeridconv.rb
new file mode 100644
index 0000000000..bb2c48d528
--- /dev/null
+++ b/ruby_1_8_6/lib/drb/timeridconv.rb
@@ -0,0 +1,91 @@
+require 'drb/drb'
+require 'monitor'
+
+module DRb
+  class TimerIdConv < DRbIdConv
+    class TimerHolder2
+      include MonitorMixin
+
+      class InvalidIndexError < RuntimeError; end
+
+      def initialize(timeout=600)
+	super()
+	@sentinel = Object.new
+	@gc = {}
+	@curr = {}
+	@renew = {}
+	@timeout = timeout
+	@keeper = keeper
+      end
+
+      def add(obj)
+	synchronize do 
+	  key = obj.__id__
+	  @curr[key] = obj
+	  return key
+	end
+      end
+
+      def fetch(key, dv=@sentinel)
+	synchronize do 
+	  obj = peek(key)
+	  if obj == @sentinel
+	    return dv unless dv == @sentinel
+	    raise InvalidIndexError
+	  end
+	  @renew[key] = obj # KeepIt
+	  return obj
+	end
+      end
+
+      def include?(key)
+	synchronize do 
+	  obj = peek(key)
+	  return false if obj == @sentinel
+	  true
+	end
+      end
+
+      def peek(key)
+	synchronize do 
+	  return @curr.fetch(key, @renew.fetch(key, @gc.fetch(key, @sentinel)))
+	end
+      end
+
+      private
+      def alternate
+	synchronize do
+	  @gc = @curr       # GCed
+	  @curr = @renew
+	  @renew = {}
+	end
+      end
+
+      def keeper
+	Thread.new do
+	  loop do
+	    size = alternate
+	    sleep(@timeout)
+	  end
+	end
+      end
+    end
+
+    def initialize(timeout=600)
+      @holder = TimerHolder2.new(timeout)
+    end
+
+    def to_obj(ref)
+      return super if ref.nil?
+      @holder.fetch(ref)
+    rescue TimerHolder2::InvalidIndexError
+      raise "invalid reference"
+    end
+
+    def to_id(obj)
+      return @holder.add(obj)
+    end
+  end
+end
+
+# DRb.install_id_conv(TimerIdConv.new)
diff --git a/ruby_1_8_6/lib/drb/unix.rb b/ruby_1_8_6/lib/drb/unix.rb
new file mode 100644
index 0000000000..57feed8301
--- /dev/null
+++ b/ruby_1_8_6/lib/drb/unix.rb
@@ -0,0 +1,108 @@
+require 'socket'
+require 'drb/drb'
+require 'tmpdir'
+
+raise(LoadError, "UNIXServer is required") unless defined?(UNIXServer)
+
+module DRb
+
+  class DRbUNIXSocket < DRbTCPSocket
+    def self.parse_uri(uri)
+      if /^drbunix:(.*?)(\?(.*))?$/ =~ uri 
+	filename = $1
+	option = $3
+	[filename, option]
+      else
+	raise(DRbBadScheme, uri) unless uri =~ /^drbunix:/
+	raise(DRbBadURI, 'can\'t parse uri:' + uri)
+      end
+    end
+
+    def self.open(uri, config)
+      filename, option = parse_uri(uri)
+      filename.untaint
+      soc = UNIXSocket.open(filename)
+      self.new(uri, soc, config)
+    end
+
+    def self.open_server(uri, config)
+      filename, option = parse_uri(uri)
+      if filename.size == 0
+	soc = temp_server
+        filename = soc.path
+	uri = 'drbunix:' + soc.path
+      else
+	soc = UNIXServer.open(filename)
+      end
+      owner = config[:UNIXFileOwner]
+      group = config[:UNIXFileGroup]
+      if owner || group
+        require 'etc'
+        owner = Etc.getpwnam( owner ).uid  if owner
+        group = Etc.getgrnam( group ).gid  if group
+        File.chown owner, group, filename
+      end
+      mode = config[:UNIXFileMode]
+      File.chmod(mode, filename) if mode
+
+      self.new(uri, soc, config, true)
+    end
+
+    def self.uri_option(uri, config)
+      filename, option = parse_uri(uri)
+      return "drbunix:#{filename}", option
+    end
+
+    def initialize(uri, soc, config={}, server_mode = false)
+      super(uri, soc, config)
+      set_sockopt(@socket)
+      @server_mode = server_mode
+      @acl = nil
+    end
+    
+    # import from tempfile.rb
+    Max_try = 10
+    private
+    def self.temp_server
+      tmpdir = Dir::tmpdir
+      n = 0
+      while true
+	begin
+	  tmpname = sprintf('%s/druby%d.%d', tmpdir, $$, n)
+	  lock = tmpname + '.lock'
+	  unless File.exist?(tmpname) or File.exist?(lock)
+	    Dir.mkdir(lock)
+	    break
+	  end
+	rescue
+	  raise "cannot generate tempfile `%s'" % tmpname if n >= Max_try
+	  #sleep(1)
+	end
+	n += 1
+      end
+      soc = UNIXServer.new(tmpname)
+      Dir.rmdir(lock)
+      soc
+    end
+
+    public
+    def close
+      return unless @socket
+      path = @socket.path if @server_mode
+      @socket.close
+      File.unlink(path) if @server_mode
+      @socket = nil
+    end
+
+    def accept
+      s = @socket.accept
+      self.class.new(nil, s, @config)
+    end
+
+    def set_sockopt(soc)
+      soc.fcntl(Fcntl::F_SETFL, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
+    end
+  end
+
+  DRbProtocol.add_protocol(DRbUNIXSocket)
+end
diff --git a/ruby_1_8_6/lib/e2mmap.rb b/ruby_1_8_6/lib/e2mmap.rb
new file mode 100644
index 0000000000..3e2604af5d
--- /dev/null
+++ b/ruby_1_8_6/lib/e2mmap.rb
@@ -0,0 +1,195 @@
+#
+#   e2mmap.rb - for ruby 1.1
+#   	$Release Version: 2.0$
+#   	$Revision: 1.10 $
+#   	$Date: 1999/02/17 12:33:17 $
+#   	by Keiju ISHITSUKA
+#
+# --
+#   Usage:
+#
+# U1)
+#   class Foo
+#     extend Exception2MessageMapper
+#     def_e2message ExistingExceptionClass, "message..."
+#     def_exception :NewExceptionClass, "message..."[, superclass]
+#     ...
+#   end
+#
+# U2)
+#   module Error
+#     extend Exception2MessageMapper
+#     def_e2meggage ExistingExceptionClass, "message..."
+#     def_exception :NewExceptionClass, "message..."[, superclass]
+#     ...
+#   end
+#   class Foo
+#     include Error
+#     ...
+#   end
+#
+#   foo = Foo.new
+#   foo.Fail ....
+#
+# U3)
+#   module Error
+#     extend Exception2MessageMapper
+#     def_e2message ExistingExceptionClass, "message..."
+#     def_exception :NewExceptionClass, "message..."[, superclass]
+#     ...
+#   end
+#   class Foo
+#     extend Exception2MessageMapper
+#     include Error
+#     ...
+#   end
+#
+#   Foo.Fail NewExceptionClass, arg...
+#   Foo.Fail ExistingExceptionClass, arg...
+#
+#
+fail "Use Ruby 1.1" if VERSION < "1.1"
+
+module Exception2MessageMapper
+  @RCS_ID='-$Id: e2mmap.rb,v 1.10 1999/02/17 12:33:17 keiju Exp keiju $-'
+
+  E2MM = Exception2MessageMapper
+
+  def E2MM.extend_object(cl)
+    super
+    cl.bind(self) unless cl == E2MM
+  end
+  
+  # backward compatibility
+  def E2MM.extend_to(b)
+    c = eval("self", b)
+    c.extend(self)
+  end
+
+  def bind(cl)
+    self.module_eval %[
+      def Raise(err = nil, *rest)
+	Exception2MessageMapper.Raise(self.class, err, *rest)
+      end
+      alias Fail Raise
+
+      def self.included(mod)
+	mod.extend Exception2MessageMapper
+      end
+    ]
+  end
+
+  # Fail(err, *rest)
+  #	err:	exception
+  #	rest:	message arguments
+  #
+  def Raise(err = nil, *rest)
+    E2MM.Raise(self, err, *rest)
+  end
+  alias Fail Raise
+
+  # backward compatibility
+  alias fail! fail
+  def fail(err = nil, *rest)
+    begin 
+      E2MM.Fail(self, err, *rest)
+    rescue E2MM::ErrNotRegisteredException
+      super
+    end
+  end
+  class << self
+    public :fail
+  end
+
+  
+  # def_e2message(c, m)
+  #	    c:  exception
+  #	    m:  message_form
+  #	define exception c with message m.
+  #
+  def def_e2message(c, m)
+    E2MM.def_e2message(self, c, m)
+  end
+  
+  # def_exception(n, m, s)
+  #	    n:  exception_name
+  #	    m:  message_form
+  #	    s:	superclass(default: StandardError)
+  #	define exception named ``c'' with message m.
+  #
+  def def_exception(n, m, s = StandardError)
+    E2MM.def_exception(self, n, m, s)
+  end
+
+  #
+  # Private definitions.
+  #
+  # {[class, exp] => message, ...}
+  @MessageMap = {}
+
+  # E2MM.def_exception(k, e, m)
+  #	    k:  class to define exception under.
+  #	    e:  exception
+  #	    m:  message_form
+  #	define exception c with message m.
+  #
+  def E2MM.def_e2message(k, c, m)
+    E2MM.instance_eval{@MessageMap[[k, c]] = m}
+    c
+  end
+  
+  # E2MM.def_exception(k, n, m, s)
+  #	    k:  class to define exception under.
+  #	    n:  exception_name
+  #	    m:  message_form
+  #	    s:	superclass(default: StandardError)
+  #	define exception named ``c'' with message m.
+  #
+  def E2MM.def_exception(k, n, m, s = StandardError)
+    n = n.id2name if n.kind_of?(Fixnum)
+    e = Class.new(s)
+    E2MM.instance_eval{@MessageMap[[k, e]] = m}
+    k.const_set(n, e)
+  end
+
+  # Fail(klass, err, *rest)
+  #	klass:  class to define exception under.
+  #	err:	exception
+  #	rest:	message arguments
+  #
+  def E2MM.Raise(klass = E2MM, err = nil, *rest)
+    if form = e2mm_message(klass, err)
+      $! = err.new(sprintf(form, *rest))
+      $@ = caller(1) if $@.nil?
+      #p $@
+      #p __FILE__
+      $@.shift if $@[0] =~ /^#{Regexp.quote(__FILE__)}:/
+      raise
+    else
+      E2MM.Fail E2MM, ErrNotRegisteredException, err.inspect
+    end
+  end
+  class <<E2MM
+    alias Fail Raise
+  end
+
+  def E2MM.e2mm_message(klass, exp)
+    for c in klass.ancestors
+      if mes = @MessageMap[[c,exp]]
+	#p mes
+	m = klass.instance_eval('"' + mes + '"')
+	return m
+      end
+    end
+    nil
+  end
+  class <<self
+    alias message e2mm_message
+  end
+
+  E2MM.def_exception(E2MM, 
+		     :ErrNotRegisteredException, 
+		     "not registerd exception(%s)")
+end
+
+
diff --git a/ruby_1_8_6/lib/erb.rb b/ruby_1_8_6/lib/erb.rb
new file mode 100644
index 0000000000..b714aa1ea6
--- /dev/null
+++ b/ruby_1_8_6/lib/erb.rb
@@ -0,0 +1,826 @@
+# = ERB -- Ruby Templating
+#
+# Author:: Masatoshi SEKI
+# Documentation:: James Edward Gray II and Gavin Sinclair
+#
+# See ERB for primary documentation and ERB::Util for a couple of utility
+# routines.
+#
+# Copyright (c) 1999-2000,2002,2003 Masatoshi SEKI
+#
+# You can redistribute it and/or modify it under the same terms as Ruby.
+
+#
+# = ERB -- Ruby Templating
+#
+# == Introduction
+#
+# ERB provides an easy to use but powerful templating system for Ruby.  Using
+# ERB, actual Ruby code can be added to any plain text document for the
+# purposes of generating document information details and/or flow control.
+#
+# A very simple example is this:
+# 
+#   require 'erb'
+#
+#   x = 42
+#   template = ERB.new <<-EOF
+#     The value of x is: <%= x %>
+#   EOF
+#   puts template.result(binding)
+#
+# <em>Prints:</em> The value of x is: 42
+#
+# More complex examples are given below.
+#
+#
+# == Recognized Tags
+#
+# ERB recognizes certain tags in the provided template and converts them based
+# on the rules below:
+#
+#   <% Ruby code -- inline with output %>
+#   <%= Ruby expression -- replace with result %>
+#   <%# comment -- ignored -- useful in testing %>
+#   % a line of Ruby code -- treated as <% line %> (optional -- see ERB.new)
+#   %% replaced with % if first thing on a line and % processing is used
+#   <%% or %%> -- replace with <% or %> respectively
+#
+# All other text is passed through ERB filtering unchanged.
+#
+#
+# == Options
+#
+# There are several settings you can change when you use ERB:
+# * the nature of the tags that are recognized;
+# * the value of <tt>$SAFE</tt> under which the template is run;
+# * the binding used to resolve local variables in the template.
+#
+# See the ERB.new and ERB#result methods for more detail.
+#
+#
+# == Examples
+#
+# === Plain Text
+#
+# ERB is useful for any generic templating situation.  Note that in this example, we use the
+# convenient "% at start of line" tag, and we quote the template literally with
+# <tt>%q{...}</tt> to avoid trouble with the backslash.
+#
+#   require "erb"
+#   
+#   # Create template.
+#   template = %q{
+#     From:  James Edward Gray II <james@grayproductions.net>
+#     To:  <%= to %>
+#     Subject:  Addressing Needs
+#   
+#     <%= to[/\w+/] %>:
+#   
+#     Just wanted to send a quick note assuring that your needs are being
+#     addressed.
+#   
+#     I want you to know that my team will keep working on the issues,
+#     especially:
+#   
+#     <%# ignore numerous minor requests -- focus on priorities %>
+#     % priorities.each do |priority|
+#       * <%= priority %>
+#     % end
+#   
+#     Thanks for your patience.
+#   
+#     James Edward Gray II
+#   }.gsub(/^  /, '')
+#   
+#   message = ERB.new(template, 0, "%<>")
+#   
+#   # Set up template data.
+#   to = "Community Spokesman <spokesman@ruby_community.org>"
+#   priorities = [ "Run Ruby Quiz",
+#                  "Document Modules",
+#                  "Answer Questions on Ruby Talk" ]
+#   
+#   # Produce result.
+#   email = message.result
+#   puts email
+#
+# <i>Generates:</i>
+#
+#   From:  James Edward Gray II <james@grayproductions.net>
+#   To:  Community Spokesman <spokesman@ruby_community.org>
+#   Subject:  Addressing Needs
+#   
+#   Community:
+#   
+#   Just wanted to send a quick note assuring that your needs are being addressed.
+#   
+#   I want you to know that my team will keep working on the issues, especially:
+#   
+#       * Run Ruby Quiz
+#       * Document Modules
+#       * Answer Questions on Ruby Talk
+#   
+#   Thanks for your patience.
+#   
+#   James Edward Gray II
+#
+# === Ruby in HTML
+#
+# ERB is often used in <tt>.rhtml</tt> files (HTML with embedded Ruby).  Notice the need in
+# this example to provide a special binding when the template is run, so that the instance
+# variables in the Product object can be resolved.
+#
+#   require "erb"
+#   
+#   # Build template data class.
+#   class Product
+#     def initialize( code, name, desc, cost )
+#       @code = code
+#       @name = name
+#       @desc = desc
+#       @cost = cost
+#        	
+#       @features = [ ]
+#     end
+#   
+#     def add_feature( feature )
+#       @features << feature
+#     end
+#   
+#     # Support templating of member data.
+#     def get_binding
+#       binding
+#     end
+#   
+#     # ...
+#   end
+#   
+#   # Create template.
+#   template = %{
+#     <html>
+#       <head><title>Ruby Toys -- <%= @name %></title></head>
+#       <body>
+#   
+#         <h1><%= @name %> (<%= @code %>)</h1>
+#         <p><%= @desc %></p>
+#   
+#         <ul>
+#           <% @features.each do |f| %>
+#             <li><b><%= f %></b></li>
+#           <% end %>
+#         </ul>
+#   
+#         <p>
+#           <% if @cost < 10 %>
+#             <b>Only <%= @cost %>!!!</b>
+#           <% else %>
+#              Call for a price, today!
+#           <% end %>
+#         </p>
+#    
+#       </body>
+#     </html>
+#   }.gsub(/^  /, '')
+#   
+#   rhtml = ERB.new(template)
+#   
+#   # Set up template data.
+#   toy = Product.new( "TZ-1002",
+#                      "Rubysapien",
+#                      "Geek's Best Friend!  Responds to Ruby commands...",
+#                      999.95 )
+#   toy.add_feature("Listens for verbal commands in the Ruby language!")
+#   toy.add_feature("Ignores Perl, Java, and all C variants.")
+#   toy.add_feature("Karate-Chop Action!!!")
+#   toy.add_feature("Matz signature on left leg.")
+#   toy.add_feature("Gem studded eyes... Rubies, of course!")
+#   
+#   # Produce result.
+#   rhtml.run(toy.get_binding)
+#
+# <i>Generates (some blank lines removed):</i>
+#
+#    <html>
+#      <head><title>Ruby Toys -- Rubysapien</title></head>
+#      <body>
+#    
+#        <h1>Rubysapien (TZ-1002)</h1>
+#        <p>Geek's Best Friend!  Responds to Ruby commands...</p>
+#    
+#        <ul>
+#            <li><b>Listens for verbal commands in the Ruby language!</b></li>
+#            <li><b>Ignores Perl, Java, and all C variants.</b></li>
+#            <li><b>Karate-Chop Action!!!</b></li>
+#            <li><b>Matz signature on left leg.</b></li>
+#            <li><b>Gem studded eyes... Rubies, of course!</b></li>
+#        </ul>
+#    
+#        <p>
+#             Call for a price, today!
+#        </p>
+#    
+#      </body>
+#    </html>
+#
+# 
+# == Notes
+#
+# There are a variety of templating solutions available in various Ruby projects:
+# * ERB's big brother, eRuby, works the same but is written in C for speed;
+# * Amrita (smart at producing HTML/XML);
+# * cs/Template (written in C for speed);
+# * RDoc, distributed with Ruby, uses its own template engine, which can be reused elsewhere;
+# * and others; search the RAA.
+#
+# Rails, the web application framework, uses ERB to create views.
+#
+class ERB
+  Revision = '$Date$' 	#'
+
+  # Returns revision information for the erb.rb module.
+  def self.version
+    "erb.rb [2.0.4 #{ERB::Revision.split[1]}]"
+  end
+end
+
+#--
+# ERB::Compiler
+class ERB
+  class Compiler # :nodoc:
+    class PercentLine # :nodoc:
+      def initialize(str)
+        @value = str
+      end
+      attr_reader :value
+      alias :to_s :value
+    end
+
+    class Scanner # :nodoc:
+      SplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
+
+      @scanner_map = {}
+      def self.regist_scanner(klass, trim_mode, percent)
+	@scanner_map[[trim_mode, percent]] = klass
+      end
+
+      def self.default_scanner=(klass)
+	@default_scanner = klass
+      end
+
+      def self.make_scanner(src, trim_mode, percent)
+	klass = @scanner_map.fetch([trim_mode, percent], @default_scanner)
+	klass.new(src, trim_mode, percent)
+      end
+
+      def initialize(src, trim_mode, percent)
+	@src = src
+	@stag = nil
+      end
+      attr_accessor :stag
+
+      def scan; end
+    end
+
+    class TrimScanner < Scanner # :nodoc:
+      TrimSplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>\n)|(%>)|(\n)/
+
+      def initialize(src, trim_mode, percent)
+	super
+	@trim_mode = trim_mode
+	@percent = percent
+	if @trim_mode == '>'
+	  @scan_line = self.method(:trim_line1)
+	elsif @trim_mode == '<>'
+	  @scan_line = self.method(:trim_line2)
+	elsif @trim_mode == '-'
+	  @scan_line = self.method(:explicit_trim_line)
+	else
+	  @scan_line = self.method(:scan_line)
+	end
+      end
+      attr_accessor :stag
+      
+      def scan(&block)
+	@stag = nil
+	if @percent
+	  @src.each do |line|
+	    percent_line(line, &block)
+	  end
+	else
+	  @src.each do |line|
+	    @scan_line.call(line, &block)
+	  end
+	end
+	nil
+      end
+
+      def percent_line(line, &block)
+	if @stag || line[0] != ?%
+	  return @scan_line.call(line, &block)
+	end
+
+	line[0] = ''
+	if line[0] == ?%
+	  @scan_line.call(line, &block)
+	else
+          yield(PercentLine.new(line.chomp))
+	end
+      end
+
+      def scan_line(line)
+	line.split(SplitRegexp).each do |token|
+	  next if token.empty?
+	  yield(token)
+	end
+      end
+
+      def trim_line1(line)
+	line.split(TrimSplitRegexp).each do |token|
+	  next if token.empty?
+	  if token == "%>\n"
+	    yield('%>')
+	    yield(:cr)
+	    break
+	  end
+	  yield(token)
+	end
+      end
+
+      def trim_line2(line)
+	head = nil
+	line.split(TrimSplitRegexp).each do |token|
+	  next if token.empty?
+	  head = token unless head
+	  if token == "%>\n"
+	    yield('%>')
+	    if  is_erb_stag?(head)
+	      yield(:cr)
+	    else
+	      yield("\n")
+	    end
+	    break
+	  end
+	  yield(token)
+	end
+      end
+
+      ExplicitTrimRegexp = /(^[ \t]*<%-)|(-%>\n?\z)|(<%-)|(-%>)|(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
+      def explicit_trim_line(line)
+	line.split(ExplicitTrimRegexp).each do |token|
+	  next if token.empty?
+	  if @stag.nil? && /[ \t]*<%-/ =~ token
+	    yield('<%')
+	  elsif @stag && /-%>\n/ =~ token
+	    yield('%>')
+	    yield(:cr)
+	  elsif @stag && token == '-%>'
+	    yield('%>')
+	  else
+	    yield(token)
+	  end
+	end
+      end
+
+      ERB_STAG = %w(<%= <%# <%)
+      def is_erb_stag?(s)
+	ERB_STAG.member?(s)
+      end
+    end
+
+    Scanner.default_scanner = TrimScanner
+
+    class SimpleScanner < Scanner # :nodoc:
+      def scan
+	@src.each do |line|
+	  line.split(SplitRegexp).each do |token|
+	    next if token.empty?
+	    yield(token)
+	  end
+	end
+      end
+    end
+    
+    Scanner.regist_scanner(SimpleScanner, nil, false)
+
+    begin
+      require 'strscan'
+      class SimpleScanner2 < Scanner # :nodoc:
+        def scan
+          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
+          etag_reg = /(.*?)(%%>|%>|\n|\z)/
+          scanner = StringScanner.new(@src)
+          while ! scanner.eos?
+            scanner.scan(@stag ? etag_reg : stag_reg)
+            text = scanner[1]
+            elem = scanner[2]
+            yield(text) unless text.empty?
+            yield(elem) unless elem.empty?
+          end
+        end
+      end
+      Scanner.regist_scanner(SimpleScanner2, nil, false)
+
+      class PercentScanner < Scanner # :nodoc:
+	def scan
+	  new_line = true
+          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
+          etag_reg = /(.*?)(%%>|%>|\n|\z)/
+          scanner = StringScanner.new(@src)
+          while ! scanner.eos?
+	    if new_line && @stag.nil?
+	      if scanner.scan(/%%/)
+		yield('%')
+		new_line = false
+		next
+	      elsif scanner.scan(/%/)
+		yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
+		next
+	      end
+	    end
+	    scanner.scan(@stag ? etag_reg : stag_reg)
+            text = scanner[1]
+            elem = scanner[2]
+            yield(text) unless text.empty?
+            yield(elem) unless elem.empty?
+	    new_line = (elem == "\n")
+          end
+        end
+      end
+      Scanner.regist_scanner(PercentScanner, nil, true)
+
+      class ExplicitScanner < Scanner # :nodoc:
+	def scan
+	  new_line = true
+          stag_reg = /(.*?)(<%%|<%=|<%#|<%-|<%|\n|\z)/
+          etag_reg = /(.*?)(%%>|-%>|%>|\n|\z)/
+          scanner = StringScanner.new(@src)
+          while ! scanner.eos?
+	    if new_line && @stag.nil? && scanner.scan(/[ \t]*<%-/)
+	      yield('<%')
+	      new_line = false
+	      next
+	    end
+	    scanner.scan(@stag ? etag_reg : stag_reg)
+            text = scanner[1]
+            elem = scanner[2]
+	    new_line = (elem == "\n")
+            yield(text) unless text.empty?
+	    if elem == '-%>'
+	      yield('%>')
+	      if scanner.scan(/(\n|\z)/)
+		yield(:cr)
+		new_line = true
+	      end
+	    elsif elem == '<%-'
+	      yield('<%')
+	    else
+	      yield(elem) unless elem.empty?
+	    end
+          end
+        end
+      end
+      Scanner.regist_scanner(ExplicitScanner, '-', false)
+
+    rescue LoadError
+    end
+
+    class Buffer # :nodoc:
+      def initialize(compiler)
+	@compiler = compiler
+	@line = []
+	@script = ""
+	@compiler.pre_cmd.each do |x|
+	  push(x)
+	end
+      end
+      attr_reader :script
+
+      def push(cmd)
+	@line << cmd
+      end
+      
+      def cr
+	@script << (@line.join('; '))
+	@line = []
+	@script << "\n"
+      end
+      
+      def close
+	return unless @line
+	@compiler.post_cmd.each do |x|
+	  push(x)
+	end
+	@script << (@line.join('; '))
+	@line = nil
+      end
+    end
+
+    def compile(s)
+      out = Buffer.new(self)
+
+      content = ''
+      scanner = make_scanner(s)
+      scanner.scan do |token|
+	if scanner.stag.nil?
+	  case token
+          when PercentLine
+	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
+	    content = ''
+            out.push(token.to_s)
+            out.cr
+	  when :cr
+	    out.cr
+	  when '<%', '<%=', '<%#'
+	    scanner.stag = token
+	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
+	    content = ''
+	  when "\n"
+	    content << "\n"
+	    out.push("#{@put_cmd} #{content.dump}")
+	    out.cr
+	    content = ''
+	  when '<%%'
+	    content << '<%'
+	  else
+	    content << token
+	  end
+	else
+	  case token
+	  when '%>'
+	    case scanner.stag
+	    when '<%'
+	      if content[-1] == ?\n
+		content.chop!
+		out.push(content)
+		out.cr
+	      else
+		out.push(content)
+	      end
+	    when '<%='
+	      out.push("#{@insert_cmd}((#{content}).to_s)")
+	    when '<%#'
+	      # out.push("# #{content.dump}")
+	    end
+	    scanner.stag = nil
+	    content = ''
+	  when '%%>'
+	    content << '%>'
+	  else
+	    content << token
+	  end
+	end
+      end
+      out.push("#{@put_cmd} #{content.dump}") if content.size > 0
+      out.close
+      out.script
+    end
+
+    def prepare_trim_mode(mode)
+      case mode
+      when 1
+	return [false, '>']
+      when 2
+	return [false, '<>']
+      when 0
+	return [false, nil]
+      when String
+	perc = mode.include?('%')
+	if mode.include?('-')
+	  return [perc, '-']
+	elsif mode.include?('<>')
+	  return [perc, '<>']
+	elsif mode.include?('>')
+	  return [perc, '>']
+	else
+	  [perc, nil]
+	end
+      else
+	return [false, nil]
+      end
+    end
+
+    def make_scanner(src)
+      Scanner.make_scanner(src, @trim_mode, @percent)
+    end
+
+    def initialize(trim_mode)
+      @percent, @trim_mode = prepare_trim_mode(trim_mode)
+      @put_cmd = 'print'
+      @insert_cmd = @put_cmd
+      @pre_cmd = []
+      @post_cmd = []
+    end
+    attr_reader :percent, :trim_mode
+    attr_accessor :put_cmd, :insert_cmd, :pre_cmd, :post_cmd
+  end
+end
+
+#--
+# ERB
+class ERB
+  #
+  # Constructs a new ERB object with the template specified in _str_.
+  # 
+  # An ERB object works by building a chunk of Ruby code that will output
+  # the completed template when run. If _safe_level_ is set to a non-nil value,
+  # ERB code will be run in a separate thread with <b>$SAFE</b> set to the
+  # provided level.
+  # 
+  # If _trim_mode_ is passed a String containing one or more of the following
+  # modifiers, ERB will adjust its code generation as listed:
+  # 
+  # 	%  enables Ruby code processing for lines beginning with %
+  # 	<> omit newline for lines starting with <% and ending in %>
+  # 	>  omit newline for lines ending in %>
+  # 
+  # _eoutvar_ can be used to set the name of the variable ERB will build up
+  # its output in.  This is useful when you need to run multiple ERB
+  # templates through the same binding and/or when you want to control where
+  # output ends up.  Pass the name of the variable to be used inside a String.
+  #
+  # === Example
+  #
+  #  require "erb"
+  #  
+  #  # build data class
+  #  class Listings
+  #    PRODUCT = { :name => "Chicken Fried Steak",
+  #                :desc => "A well messages pattie, breaded and fried.",
+  #                :cost => 9.95 }
+  #  
+  #    attr_reader :product, :price
+  #    
+  #    def initialize( product = "", price = "" )
+  #      @product = product
+  #      @price = price
+  #    end
+  #    
+  #    def build
+  #      b = binding
+  #      # create and run templates, filling member data variebles
+  #      ERB.new(<<-'END_PRODUCT'.gsub(/^\s+/, ""), 0, "", "@product").result b
+  #        <%= PRODUCT[:name] %>
+  #        <%= PRODUCT[:desc] %>
+  #      END_PRODUCT
+  #      ERB.new(<<-'END_PRICE'.gsub(/^\s+/, ""), 0, "", "@price").result b
+  #        <%= PRODUCT[:name] %> -- <%= PRODUCT[:cost] %>
+  #        <%= PRODUCT[:desc] %>
+  #      END_PRICE
+  #    end
+  #  end
+  #  
+  #  # setup template data
+  #  listings = Listings.new
+  #  listings.build
+  #  
+  #  puts listings.product + "\n" + listings.price
+  #
+  # _Generates_
+  #
+  #  Chicken Fried Steak
+  #  A well messages pattie, breaded and fried.
+  #  
+  #  Chicken Fried Steak -- 9.95
+  #  A well messages pattie, breaded and fried.
+  #  
+  def initialize(str, safe_level=nil, trim_mode=nil, eoutvar='_erbout')
+    @safe_level = safe_level
+    compiler = ERB::Compiler.new(trim_mode)
+    set_eoutvar(compiler, eoutvar)
+    @src = compiler.compile(str)
+    @filename = nil
+  end
+
+  # The Ruby code generated by ERB
+  attr_reader :src
+
+  # The optional _filename_ argument passed to Kernel#eval when the ERB code
+  # is run
+  attr_accessor :filename
+
+  #
+  # Can be used to set _eoutvar_ as described in ERB#new.  It's probably easier
+  # to just use the constructor though, since calling this method requires the
+  # setup of an ERB _compiler_ object.
+  #
+  def set_eoutvar(compiler, eoutvar = '_erbout')
+    compiler.put_cmd = "#{eoutvar}.concat"
+    compiler.insert_cmd = "#{eoutvar}.concat"
+
+    cmd = []
+    cmd.push "#{eoutvar} = ''"
+    
+    compiler.pre_cmd = cmd
+
+    cmd = []
+    cmd.push(eoutvar)
+
+    compiler.post_cmd = cmd
+  end
+
+  # Generate results and print them. (see ERB#result)
+  def run(b=TOPLEVEL_BINDING)
+    print self.result(b)
+  end
+
+  #
+  # Executes the generated ERB code to produce a completed template, returning
+  # the results of that code.  (See ERB#new for details on how this process can
+  # be affected by _safe_level_.)
+  # 
+  # _b_ accepts a Binding or Proc object which is used to set the context of
+  # code evaluation.
+  #
+  def result(b=TOPLEVEL_BINDING)
+    if @safe_level
+      th = Thread.start { 
+	$SAFE = @safe_level
+	eval(@src, b, (@filename || '(erb)'), 1)
+      }
+      return th.value
+    else
+      return eval(@src, b, (@filename || '(erb)'), 1)
+    end
+  end
+
+  def def_method(mod, methodname, fname='(ERB)')  # :nodoc:
+    mod.module_eval("def #{methodname}\n" + self.src + "\nend\n", fname, 0)
+  end
+
+  def def_module(methodname='erb')  # :nodoc:
+    mod = Module.new
+    def_method(mod, methodname)
+    mod
+  end
+
+  def def_class(superklass=Object, methodname='result')  # :nodoc:
+    cls = Class.new(superklass)
+    def_method(cls, methodname)
+    cls
+  end
+end
+
+#--
+# ERB::Util
+class ERB
+  # A utility module for conversion routines, often handy in HTML generation.
+  module Util
+    public
+    #
+    # A utility method for escaping HTML tag characters in _s_.
+    # 
+    # 	require "erb"
+    # 	include ERB::Util
+    # 	
+    # 	puts html_escape("is a > 0 & a < 10?")
+    # 
+    # _Generates_
+    # 
+    # 	is a &gt; 0 &amp; a &lt; 10?
+    #
+    def html_escape(s)
+      s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
+    end
+    alias h html_escape
+    module_function :h
+    module_function :html_escape
+    
+    #
+    # A utility method for encoding the String _s_ as a URL.
+    # 
+    # 	require "erb"
+    # 	include ERB::Util
+    # 	
+    # 	puts url_encode("Programming Ruby:  The Pragmatic Programmer's Guide")
+    # 
+    # _Generates_
+    # 
+    # 	Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide
+    #
+    def url_encode(s)
+      s.to_s.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
+    end
+    alias u url_encode
+    module_function :u
+    module_function :url_encode
+  end
+end
+
+#--
+# ERB::DefMethod
+class ERB
+  module DefMethod  # :nodoc:
+    public
+    def def_erb_method(methodname, erb)
+      if erb.kind_of? String
+	fname = erb
+	File.open(fname) {|f| erb = ERB.new(f.read) }
+	erb.def_method(self, methodname, fname)
+      else
+	erb.def_method(self, methodname)
+      end
+    end
+    module_function :def_erb_method
+  end
+end
diff --git a/ruby_1_8_6/lib/eregex.rb b/ruby_1_8_6/lib/eregex.rb
new file mode 100644
index 0000000000..cc7a7f6f46
--- /dev/null
+++ b/ruby_1_8_6/lib/eregex.rb
@@ -0,0 +1,37 @@
+# this is just a proof of concept toy.
+
+class RegOr
+  def initialize(re1, re2)
+    @re1 = re1
+    @re2 = re2
+  end
+
+  def =~ (str)
+    @re1 =~ str or @re2 =~ str
+  end
+end
+
+class RegAnd
+  def initialize(re1, re2)
+    @re1 = re1
+    @re2 = re2
+  end
+
+  def =~ (str)
+    @re1 =~ str and @re2 =~ str
+  end
+end
+
+class Regexp
+  def |(other)
+    RegOr.new(self, other)
+  end
+  def &(other)
+    RegAnd.new(self, other)
+  end
+end
+
+if __FILE__ == $0
+  p "abc" =~ /b/|/c/
+  p "abc" =~ /b/&/c/
+end
diff --git a/ruby_1_8_6/lib/fileutils.rb b/ruby_1_8_6/lib/fileutils.rb
new file mode 100644
index 0000000000..3fdb6cbfe6
--- /dev/null
+++ b/ruby_1_8_6/lib/fileutils.rb
@@ -0,0 +1,1591 @@
+# 
+# = fileutils.rb
+# 
+# Copyright (c) 2000-2006 Minero Aoki
+# 
+# This program is free software.
+# You can distribute/modify this program under the same terms of ruby.
+# 
+# == module FileUtils
+# 
+# Namespace for several file utility methods for copying, moving, removing, etc.
+# 
+# === Module Functions
+# 
+#   cd(dir, options)
+#   cd(dir, options) {|dir| .... }
+#   pwd()
+#   mkdir(dir, options)
+#   mkdir(list, options)
+#   mkdir_p(dir, options)
+#   mkdir_p(list, options)
+#   rmdir(dir, options)
+#   rmdir(list, options)
+#   ln(old, new, options)
+#   ln(list, destdir, options)
+#   ln_s(old, new, options)
+#   ln_s(list, destdir, options)
+#   ln_sf(src, dest, options)
+#   cp(src, dest, options)
+#   cp(list, dir, options)
+#   cp_r(src, dest, options)
+#   cp_r(list, dir, options)
+#   mv(src, dest, options)
+#   mv(list, dir, options)
+#   rm(list, options)
+#   rm_r(list, options)
+#   rm_rf(list, options)
+#   install(src, dest, mode = <src's>, options)
+#   chmod(mode, list, options)
+#   chmod_R(mode, list, options)
+#   chown(user, group, list, options)
+#   chown_R(user, group, list, options)
+#   touch(list, options)
+#
+# The <tt>options</tt> parameter is a hash of options, taken from the list
+# <tt>:force</tt>, <tt>:noop</tt>, <tt>:preserve</tt>, and <tt>:verbose</tt>.
+# <tt>:noop</tt> means that no changes are made.  The other two are obvious.
+# Each method documents the options that it honours.
+#
+# All methods that have the concept of a "source" file or directory can take
+# either one file or a list of files in that argument.  See the method
+# documentation for examples.
+#
+# There are some `low level' methods, which do not accept any option:
+#
+#   copy_entry(src, dest, preserve = false, dereference = false)
+#   copy_file(src, dest, preserve = false, dereference = true)
+#   copy_stream(srcstream, deststream)
+#   remove_entry(path, force = false)
+#   remove_entry_secure(path, force = false)
+#   remove_file(path, force = false)
+#   compare_file(path_a, path_b)
+#   compare_stream(stream_a, stream_b)
+#   uptodate?(file, cmp_list)
+#
+# == module FileUtils::Verbose
+# 
+# This module has all methods of FileUtils module, but it outputs messages
+# before acting.  This equates to passing the <tt>:verbose</tt> flag to methods
+# in FileUtils.
+# 
+# == module FileUtils::NoWrite
+# 
+# This module has all methods of FileUtils module, but never changes
+# files/directories.  This equates to passing the <tt>:noop</tt> flag to methods
+# in FileUtils.
+# 
+# == module FileUtils::DryRun
+# 
+# This module has all methods of FileUtils module, but never changes
+# files/directories.  This equates to passing the <tt>:noop</tt> and
+# <tt>:verbose</tt> flags to methods in FileUtils.
+# 
+
+module FileUtils
+
+  def self.private_module_function(name)   #:nodoc:
+    module_function name
+    private_class_method name
+  end
+
+  # This hash table holds command options.
+  OPT_TABLE = {}   #:nodoc: internal use only
+
+  #
+  # Options: (none)
+  #
+  # Returns the name of the current directory.
+  #
+  def pwd
+    Dir.pwd
+  end
+  module_function :pwd
+
+  alias getwd pwd
+  module_function :getwd
+
+  #
+  # Options: verbose
+  # 
+  # Changes the current directory to the directory +dir+.
+  # 
+  # If this method is called with block, resumes to the old
+  # working directory after the block execution finished.
+  # 
+  #   FileUtils.cd('/', :verbose => true)   # chdir and report it
+  # 
+  def cd(dir, options = {}, &block) # :yield: dir
+    fu_check_options options, OPT_TABLE['cd']
+    fu_output_message "cd #{dir}" if options[:verbose]
+    Dir.chdir(dir, &block)
+    fu_output_message 'cd -' if options[:verbose] and block
+  end
+  module_function :cd
+
+  alias chdir cd
+  module_function :chdir
+
+  OPT_TABLE['cd']    =
+  OPT_TABLE['chdir'] = [:verbose]
+
+  #
+  # Options: (none)
+  # 
+  # Returns true if +newer+ is newer than all +old_list+.
+  # Non-existent files are older than any file.
+  # 
+  #   FileUtils.uptodate?('hello.o', %w(hello.c hello.h)) or \
+  #       system 'make hello.o'
+  # 
+  def uptodate?(new, old_list, options = nil)
+    raise ArgumentError, 'uptodate? does not accept any option' if options
+
+    return false unless File.exist?(new)
+    new_time = File.mtime(new)
+    old_list.each do |old|
+      if File.exist?(old)
+        return false unless new_time > File.mtime(old)
+      end
+    end
+    true
+  end
+  module_function :uptodate?
+
+  #
+  # Options: mode noop verbose
+  # 
+  # Creates one or more directories.
+  # 
+  #   FileUtils.mkdir 'test'
+  #   FileUtils.mkdir %w( tmp data )
+  #   FileUtils.mkdir 'notexist', :noop => true  # Does not really create.
+  #   FileUtils.mkdir 'tmp', :mode => 0700
+  # 
+  def mkdir(list, options = {})
+    fu_check_options options, OPT_TABLE['mkdir']
+    list = fu_list(list)
+    fu_output_message "mkdir #{options[:mode] ? ('-m %03o ' % options[:mode]) : ''}#{list.join ' '}" if options[:verbose]
+    return if options[:noop]
+
+    list.each do |dir|
+      fu_mkdir dir, options[:mode]
+    end
+  end
+  module_function :mkdir
+
+  OPT_TABLE['mkdir'] = [:mode, :noop, :verbose]
+
+  #
+  # Options: mode noop verbose
+  # 
+  # Creates a directory and all its parent directories.
+  # For example,
+  # 
+  #   FileUtils.mkdir_p '/usr/local/lib/ruby'
+  # 
+  # causes to make following directories, if it does not exist.
+  #     * /usr
+  #     * /usr/local
+  #     * /usr/local/lib
+  #     * /usr/local/lib/ruby
+  #
+  # You can pass several directories at a time in a list.
+  # 
+  def mkdir_p(list, options = {})
+    fu_check_options options, OPT_TABLE['mkdir_p']
+    list = fu_list(list)
+    fu_output_message "mkdir -p #{options[:mode] ? ('-m %03o ' % options[:mode]) : ''}#{list.join ' '}" if options[:verbose]
+    return *list if options[:noop]
+
+    list.map {|path| path.sub(%r</\z>, '') }.each do |path|
+      # optimize for the most common case
+      begin
+        fu_mkdir path, options[:mode]
+        next
+      rescue SystemCallError
+        next if File.directory?(path)
+      end
+
+      stack = []
+      until path == stack.last   # dirname("/")=="/", dirname("C:/")=="C:/"
+        stack.push path
+        path = File.dirname(path)
+      end
+      stack.reverse_each do |path|
+        begin
+          fu_mkdir path, options[:mode]
+        rescue SystemCallError => err
+          raise unless File.directory?(path)
+        end
+      end
+    end
+
+    return *list
+  end
+  module_function :mkdir_p
+
+  alias mkpath    mkdir_p
+  alias makedirs  mkdir_p
+  module_function :mkpath
+  module_function :makedirs
+
+  OPT_TABLE['mkdir_p']  =
+  OPT_TABLE['mkpath']   =
+  OPT_TABLE['makedirs'] = [:mode, :noop, :verbose]
+
+  def fu_mkdir(path, mode)   #:nodoc:
+    path = path.sub(%r</\z>, '')
+    if mode
+      Dir.mkdir path, mode
+      File.chmod mode, path
+    else
+      Dir.mkdir path
+    end
+  end
+  private_module_function :fu_mkdir
+
+  #
+  # Options: noop, verbose
+  # 
+  # Removes one or more directories.
+  # 
+  #   FileUtils.rmdir 'somedir'
+  #   FileUtils.rmdir %w(somedir anydir otherdir)
+  #   # Does not really remove directory; outputs message.
+  #   FileUtils.rmdir 'somedir', :verbose => true, :noop => true
+  # 
+  def rmdir(list, options = {})
+    fu_check_options options, OPT_TABLE['rmdir']
+    list = fu_list(list)
+    fu_output_message "rmdir #{list.join ' '}" if options[:verbose]
+    return if options[:noop]
+    list.each do |dir|
+      Dir.rmdir dir.sub(%r</\z>, '')
+    end
+  end
+  module_function :rmdir
+
+  OPT_TABLE['rmdir'] = [:noop, :verbose]
+
+  #
+  # Options: force noop verbose
+  #
+  # <b><tt>ln(old, new, options = {})</tt></b>
+  #
+  # Creates a hard link +new+ which points to +old+.
+  # If +new+ already exists and it is a directory, creates a link +new/old+.
+  # If +new+ already exists and it is not a directory, raises Errno::EEXIST.
+  # But if :force option is set, overwrite +new+.
+  # 
+  #   FileUtils.ln 'gcc', 'cc', :verbose => true
+  #   FileUtils.ln '/usr/bin/emacs21', '/usr/bin/emacs'
+  # 
+  # <b><tt>ln(list, destdir, options = {})</tt></b>
+  # 
+  # Creates several hard links in a directory, with each one pointing to the
+  # item in +list+.  If +destdir+ is not a directory, raises Errno::ENOTDIR.
+  # 
+  #   include FileUtils
+  #   cd '/sbin'
+  #   FileUtils.ln %w(cp mv mkdir), '/bin'   # Now /sbin/cp and /bin/cp are linked.
+  # 
+  def ln(src, dest, options = {})
+    fu_check_options options, OPT_TABLE['ln']
+    fu_output_message "ln#{options[:force] ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
+    return if options[:noop]
+    fu_each_src_dest0(src, dest) do |s,d|
+      remove_file d, true if options[:force]
+      File.link s, d
+    end
+  end
+  module_function :ln
+
+  alias link ln
+  module_function :link
+
+  OPT_TABLE['ln']   =
+  OPT_TABLE['link'] = [:force, :noop, :verbose]
+
+  #
+  # Options: force noop verbose
+  #
+  # <b><tt>ln_s(old, new, options = {})</tt></b>
+  # 
+  # Creates a symbolic link +new+ which points to +old+.  If +new+ already
+  # exists and it is a directory, creates a symbolic link +new/old+.  If +new+
+  # already exists and it is not a directory, raises Errno::EEXIST.  But if
+  # :force option is set, overwrite +new+.
+  # 
+  #   FileUtils.ln_s '/usr/bin/ruby', '/usr/local/bin/ruby'
+  #   FileUtils.ln_s 'verylongsourcefilename.c', 'c', :force => true
+  # 
+  # <b><tt>ln_s(list, destdir, options = {})</tt></b>
+  # 
+  # Creates several symbolic links in a directory, with each one pointing to the
+  # item in +list+.  If +destdir+ is not a directory, raises Errno::ENOTDIR.
+  #
+  # If +destdir+ is not a directory, raises Errno::ENOTDIR.
+  # 
+  #   FileUtils.ln_s Dir.glob('bin/*.rb'), '/home/aamine/bin'
+  # 
+  def ln_s(src, dest, options = {})
+    fu_check_options options, OPT_TABLE['ln_s']
+    fu_output_message "ln -s#{options[:force] ? 'f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
+    return if options[:noop]
+    fu_each_src_dest0(src, dest) do |s,d|
+      remove_file d, true if options[:force]
+      File.symlink s, d
+    end
+  end
+  module_function :ln_s
+
+  alias symlink ln_s
+  module_function :symlink
+
+  OPT_TABLE['ln_s']    =
+  OPT_TABLE['symlink'] = [:force, :noop, :verbose]
+
+  #
+  # Options: noop verbose
+  # 
+  # Same as
+  #   #ln_s(src, dest, :force)
+  # 
+  def ln_sf(src, dest, options = {})
+    fu_check_options options, OPT_TABLE['ln_sf']
+    options = options.dup
+    options[:force] = true
+    ln_s src, dest, options
+  end
+  module_function :ln_sf
+
+  OPT_TABLE['ln_sf'] = [:noop, :verbose]
+
+  #
+  # Options: preserve noop verbose
+  #
+  # Copies a file content +src+ to +dest+.  If +dest+ is a directory,
+  # copies +src+ to +dest/src+.
+  #
+  # If +src+ is a list of files, then +dest+ must be a directory.
+  #
+  #   FileUtils.cp 'eval.c', 'eval.c.org'
+  #   FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6'
+  #   FileUtils.cp %w(cgi.rb complex.rb date.rb), '/usr/lib/ruby/1.6', :verbose => true
+  #   FileUtils.cp 'symlink', 'dest'   # copy content, "dest" is not a symlink
+  # 
+  def cp(src, dest, options = {})
+    fu_check_options options, OPT_TABLE['cp']
+    fu_output_message "cp#{options[:preserve] ? ' -p' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
+    return if options[:noop]
+    fu_each_src_dest(src, dest) do |s, d|
+      copy_file s, d, options[:preserve]
+    end
+  end
+  module_function :cp
+
+  alias copy cp
+  module_function :copy
+
+  OPT_TABLE['cp']   =
+  OPT_TABLE['copy'] = [:preserve, :noop, :verbose]
+
+  #
+  # Options: preserve noop verbose dereference_root remove_destination
+  # 
+  # Copies +src+ to +dest+. If +src+ is a directory, this method copies
+  # all its contents recursively. If +dest+ is a directory, copies
+  # +src+ to +dest/src+.
+  #
+  # +src+ can be a list of files.
+  # 
+  #   # Installing ruby library "mylib" under the site_ruby
+  #   FileUtils.rm_r site_ruby + '/mylib', :force
+  #   FileUtils.cp_r 'lib/', site_ruby + '/mylib'
+  # 
+  #   # Examples of copying several files to target directory.
+  #   FileUtils.cp_r %w(mail.rb field.rb debug/), site_ruby + '/tmail'
+  #   FileUtils.cp_r Dir.glob('*.rb'), '/home/aamine/lib/ruby', :noop => true, :verbose => true
+  #
+  #   # If you want to copy all contents of a directory instead of the
+  #   # directory itself, c.f. src/x -> dest/x, src/y -> dest/y,
+  #   # use following code.
+  #   FileUtils.cp_r 'src/.', 'dest'     # cp_r('src', 'dest') makes src/dest,
+  #                                      # but this doesn't.
+  # 
+  def cp_r(src, dest, options = {})
+    fu_check_options options, OPT_TABLE['cp_r']
+    fu_output_message "cp -r#{options[:preserve] ? 'p' : ''}#{options[:remove_destination] ? ' --remove-destination' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
+    return if options[:noop]
+    options[:dereference_root] = true unless options.key?(:dereference_root)
+    fu_each_src_dest(src, dest) do |s, d|
+      copy_entry s, d, options[:preserve], options[:dereference_root], options[:remove_destination]
+    end
+  end
+  module_function :cp_r
+
+  OPT_TABLE['cp_r'] = [:preserve, :noop, :verbose,
+                       :dereference_root, :remove_destination]
+
+  #
+  # Copies a file system entry +src+ to +dest+.
+  # If +src+ is a directory, this method copies its contents recursively.
+  # This method preserves file types, c.f. symlink, directory...
+  # (FIFO, device files and etc. are not supported yet)
+  #
+  # Both of +src+ and +dest+ must be a path name.
+  # +src+ must exist, +dest+ must not exist.
+  #
+  # If +preserve+ is true, this method preserves owner, group, permissions
+  # and modified time.
+  #
+  # If +dereference_root+ is true, this method dereference tree root.
+  #
+  # If +remove_destination+ is true, this method removes each destination file before copy.
+  #
+  def copy_entry(src, dest, preserve = false, dereference_root = false, remove_destination = false)
+    Entry_.new(src, nil, dereference_root).traverse do |ent|
+      destent = Entry_.new(dest, ent.rel, false)
+      File.unlink destent.path if remove_destination && File.file?(destent.path)
+      ent.copy destent.path
+      ent.copy_metadata destent.path if preserve
+    end
+  end
+  module_function :copy_entry
+
+  #
+  # Copies file contents of +src+ to +dest+.
+  # Both of +src+ and +dest+ must be a path name.
+  #
+  def copy_file(src, dest, preserve = false, dereference = true)
+    ent = Entry_.new(src, nil, dereference)
+    ent.copy_file dest
+    ent.copy_metadata dest if preserve
+  end
+  module_function :copy_file
+
+  #
+  # Copies stream +src+ to +dest+.
+  # +src+ must respond to #read(n) and
+  # +dest+ must respond to #write(str).
+  #
+  def copy_stream(src, dest)
+    fu_copy_stream0 src, dest, fu_stream_blksize(src, dest)
+  end
+  module_function :copy_stream
+
+  #
+  # Options: force noop verbose
+  # 
+  # Moves file(s) +src+ to +dest+.  If +file+ and +dest+ exist on the different
+  # disk partition, the file is copied instead.
+  # 
+  #   FileUtils.mv 'badname.rb', 'goodname.rb'
+  #   FileUtils.mv 'stuff.rb', '/notexist/lib/ruby', :force => true  # no error
+  # 
+  #   FileUtils.mv %w(junk.txt dust.txt), '/home/aamine/.trash/'
+  #   FileUtils.mv Dir.glob('test*.rb'), 'test', :noop => true, :verbose => true
+  # 
+  def mv(src, dest, options = {})
+    fu_check_options options, OPT_TABLE['mv']
+    fu_output_message "mv#{options[:force] ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
+    return if options[:noop]
+    fu_each_src_dest(src, dest) do |s, d|
+      destent = Entry_.new(d, nil, true)
+      begin
+        if destent.exist?
+          if destent.directory?
+            raise Errno::EEXIST, dest
+          else
+            destent.remove_file if rename_cannot_overwrite_file?
+          end
+        end
+        begin
+          File.rename s, d
+        rescue Errno::EXDEV
+          copy_entry s, d, true
+          if options[:secure]
+            remove_entry_secure s, options[:force]
+          else
+            remove_entry s, options[:force]
+          end
+        end
+      rescue SystemCallError
+        raise unless options[:force]
+      end
+    end
+  end
+  module_function :mv
+
+  alias move mv
+  module_function :move
+
+  OPT_TABLE['mv']   =
+  OPT_TABLE['move'] = [:force, :noop, :verbose, :secure]
+
+  def rename_cannot_overwrite_file?   #:nodoc:
+    /djgpp|cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+  end
+  private_module_function :rename_cannot_overwrite_file?
+
+  #
+  # Options: force noop verbose
+  # 
+  # Remove file(s) specified in +list+.  This method cannot remove directories.
+  # All StandardErrors are ignored when the :force option is set.
+  # 
+  #   FileUtils.rm %w( junk.txt dust.txt )
+  #   FileUtils.rm Dir.glob('*.so')
+  #   FileUtils.rm 'NotExistFile', :force => true   # never raises exception
+  # 
+  def rm(list, options = {})
+    fu_check_options options, OPT_TABLE['rm']
+    list = fu_list(list)
+    fu_output_message "rm#{options[:force] ? ' -f' : ''} #{list.join ' '}" if options[:verbose]
+    return if options[:noop]
+
+    list.each do |path|
+      remove_file path, options[:force]
+    end
+  end
+  module_function :rm
+
+  alias remove rm
+  module_function :remove
+
+  OPT_TABLE['rm']     =
+  OPT_TABLE['remove'] = [:force, :noop, :verbose]
+
+  #
+  # Options: noop verbose
+  # 
+  # Equivalent to
+  #
+  #   #rm(list, :force => true)
+  #
+  def rm_f(list, options = {})
+    fu_check_options options, OPT_TABLE['rm_f']
+    options = options.dup
+    options[:force] = true
+    rm list, options
+  end
+  module_function :rm_f
+
+  alias safe_unlink rm_f
+  module_function :safe_unlink
+
+  OPT_TABLE['rm_f']        =
+  OPT_TABLE['safe_unlink'] = [:noop, :verbose]
+
+  #
+  # Options: force noop verbose secure
+  # 
+  # remove files +list+[0] +list+[1]... If +list+[n] is a directory,
+  # removes its all contents recursively. This method ignores
+  # StandardError when :force option is set.
+  # 
+  #   FileUtils.rm_r Dir.glob('/tmp/*')
+  #   FileUtils.rm_r '/', :force => true          #  :-)
+  #
+  # WARNING: This method causes local vulnerability
+  # if one of parent directories or removing directory tree are world
+  # writable (including /tmp, whose permission is 1777), and the current
+  # process has strong privilege such as Unix super user (root), and the
+  # system has symbolic link.  For secure removing, read the documentation
+  # of #remove_entry_secure carefully, and set :secure option to true.
+  # Default is :secure=>false.
+  #
+  # NOTE: This method calls #remove_entry_secure if :secure option is set.
+  # See also #remove_entry_secure.
+  # 
+  def rm_r(list, options = {})
+    fu_check_options options, OPT_TABLE['rm_r']
+    # options[:secure] = true unless options.key?(:secure)
+    list = fu_list(list)
+    fu_output_message "rm -r#{options[:force] ? 'f' : ''} #{list.join ' '}" if options[:verbose]
+    return if options[:noop]
+    list.each do |path|
+      if options[:secure]
+        remove_entry_secure path, options[:force]
+      else
+        remove_entry path, options[:force]
+      end
+    end
+  end
+  module_function :rm_r
+
+  OPT_TABLE['rm_r'] = [:force, :noop, :verbose, :secure]
+
+  #
+  # Options: noop verbose secure
+  # 
+  # Equivalent to
+  #
+  #   #rm_r(list, :force => true)
+  #
+  # WARNING: This method causes local vulnerability.
+  # Read the documentation of #rm_r first.
+  # 
+  def rm_rf(list, options = {})
+    fu_check_options options, OPT_TABLE['rm_rf']
+    options = options.dup
+    options[:force] = true
+    rm_r list, options
+  end
+  module_function :rm_rf
+
+  alias rmtree rm_rf
+  module_function :rmtree
+
+  OPT_TABLE['rm_rf']  =
+  OPT_TABLE['rmtree'] = [:noop, :verbose, :secure]
+
+  #
+  # This method removes a file system entry +path+.  +path+ shall be a
+  # regular file, a directory, or something.  If +path+ is a directory,
+  # remove it recursively.  This method is required to avoid TOCTTOU
+  # (time-of-check-to-time-of-use) local security vulnerability of #rm_r.
+  # #rm_r causes security hole when:
+  #
+  #   * Parent directory is world writable (including /tmp).
+  #   * Removing directory tree includes world writable directory.
+  #   * The system has symbolic link.
+  #
+  # To avoid this security hole, this method applies special preprocess.
+  # If +path+ is a directory, this method chown(2) and chmod(2) all
+  # removing directories.  This requires the current process is the
+  # owner of the removing whole directory tree, or is the super user (root).
+  #
+  # WARNING: You must ensure that *ALL* parent directories are not
+  # world writable.  Otherwise this method does not work.
+  # Only exception is temporary directory like /tmp and /var/tmp,
+  # whose permission is 1777.
+  #
+  # WARNING: Only the owner of the removing directory tree, or Unix super
+  # user (root) should invoke this method.  Otherwise this method does not
+  # work.
+  #
+  # For details of this security vulnerability, see Perl's case:
+  #
+  #   http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-0448
+  #   http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0452
+  #
+  # For fileutils.rb, this vulnerability is reported in [ruby-dev:26100].
+  #
+  def remove_entry_secure(path, force = false)
+    unless fu_have_symlink?
+      remove_entry path, force
+      return
+    end
+    fullpath = File.expand_path(path)
+    st = File.lstat(fullpath)
+    unless st.directory?
+      File.unlink fullpath
+      return
+    end
+    # is a directory.
+    parent_st = File.stat(File.dirname(fullpath))
+    unless fu_world_writable?(parent_st)
+      remove_entry path, force
+      return
+    end
+    unless parent_st.sticky?
+      raise ArgumentError, "parent directory is world writable, FileUtils#remove_entry_secure does not work; abort: #{path.inspect} (parent directory mode #{'%o' % parent_st.mode})"
+    end
+    # freeze tree root
+    euid = Process.euid
+    File.open(fullpath + '/.') {|f|
+      unless fu_stat_identical_entry?(st, f.stat)
+        # symlink (TOC-to-TOU attack?)
+        File.unlink fullpath
+        return
+      end
+      f.chown euid, -1
+      f.chmod 0700
+    }
+    # ---- tree root is frozen ----
+    root = Entry_.new(path)
+    root.preorder_traverse do |ent|
+      if ent.directory?
+        ent.chown euid, -1
+        ent.chmod 0700
+      end
+    end
+    root.postorder_traverse do |ent|
+      begin
+        ent.remove
+      rescue
+        raise unless force
+      end
+    end
+  rescue
+    raise unless force
+  end
+  module_function :remove_entry_secure
+
+  def fu_world_writable?(st)
+    (st.mode & 0002) != 0
+  end
+  private_module_function :fu_world_writable?
+
+  def fu_have_symlink?   #:nodoc
+    File.symlink nil, nil
+  rescue NotImplementedError
+    return false
+  rescue
+    return true
+  end
+  private_module_function :fu_have_symlink?
+
+  def fu_stat_identical_entry?(a, b)   #:nodoc:
+    a.dev == b.dev and a.ino == b.ino
+  end
+  private_module_function :fu_stat_identical_entry?
+
+  #
+  # This method removes a file system entry +path+.
+  # +path+ might be a regular file, a directory, or something.
+  # If +path+ is a directory, remove it recursively.
+  #
+  # See also #remove_entry_secure.
+  #
+  def remove_entry(path, force = false)
+    Entry_.new(path).postorder_traverse do |ent|
+      begin
+        ent.remove
+      rescue
+        raise unless force
+      end
+    end
+  rescue
+    raise unless force
+  end
+  module_function :remove_entry
+
+  #
+  # Removes a file +path+.
+  # This method ignores StandardError if +force+ is true.
+  #
+  def remove_file(path, force = false)
+    Entry_.new(path).remove_file
+  rescue
+    raise unless force
+  end
+  module_function :remove_file
+
+  #
+  # Removes a directory +dir+ and its contents recursively.
+  # This method ignores StandardError if +force+ is true.
+  #
+  def remove_dir(path, force = false)
+    remove_entry path, force   # FIXME?? check if it is a directory
+  end
+  module_function :remove_dir
+
+  #
+  # Returns true if the contents of a file A and a file B are identical.
+  # 
+  #   FileUtils.compare_file('somefile', 'somefile')  #=> true
+  #   FileUtils.compare_file('/bin/cp', '/bin/mv')    #=> maybe false
+  #
+  def compare_file(a, b)
+    return false unless File.size(a) == File.size(b)
+    File.open(a, 'rb') {|fa|
+      File.open(b, 'rb') {|fb|
+        return compare_stream(fa, fb)
+      }
+    }
+  end
+  module_function :compare_file
+
+  alias identical? compare_file
+  alias cmp compare_file
+  module_function :identical?
+  module_function :cmp
+
+  #
+  # Returns true if the contents of a stream +a+ and +b+ are identical.
+  #
+  def compare_stream(a, b)
+    bsize = fu_stream_blksize(a, b)
+    sa = sb = nil
+    while sa == sb
+      sa = a.read(bsize)
+      sb = b.read(bsize)
+      unless sa and sb
+        if sa.nil? and sb.nil?
+          return true
+        end
+      end
+    end
+    false
+  end
+  module_function :compare_stream
+
+  #
+  # Options: mode preserve noop verbose
+  # 
+  # If +src+ is not same as +dest+, copies it and changes the permission
+  # mode to +mode+.  If +dest+ is a directory, destination is +dest+/+src+.
+  # This method removes destination before copy.
+  # 
+  #   FileUtils.install 'ruby', '/usr/local/bin/ruby', :mode => 0755, :verbose => true
+  #   FileUtils.install 'lib.rb', '/usr/local/lib/ruby/site_ruby', :verbose => true
+  # 
+  def install(src, dest, options = {})
+    fu_check_options options, OPT_TABLE['install']
+    fu_output_message "install -c#{options[:preserve] && ' -p'}#{options[:mode] ? (' -m 0%o' % options[:mode]) : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
+    return if options[:noop]
+    fu_each_src_dest(src, dest) do |s, d|
+      unless File.exist?(d) and compare_file(s, d)
+        remove_file d, true
+        st = File.stat(s) if options[:preserve]
+        copy_file s, d
+        File.utime st.atime, st.mtime, d if options[:preserve]
+        File.chmod options[:mode], d if options[:mode]
+      end
+    end
+  end
+  module_function :install
+
+  OPT_TABLE['install'] = [:mode, :preserve, :noop, :verbose]
+
+  #
+  # Options: noop verbose
+  # 
+  # Changes permission bits on the named files (in +list+) to the bit pattern
+  # represented by +mode+.
+  # 
+  #   FileUtils.chmod 0755, 'somecommand'
+  #   FileUtils.chmod 0644, %w(my.rb your.rb his.rb her.rb)
+  #   FileUtils.chmod 0755, '/usr/bin/ruby', :verbose => true
+  # 
+  def chmod(mode, list, options = {})
+    fu_check_options options, OPT_TABLE['chmod']
+    list = fu_list(list)
+    fu_output_message sprintf('chmod %o %s', mode, list.join(' ')) if options[:verbose]
+    return if options[:noop]
+    list.each do |path|
+      Entry_.new(path).chmod mode
+    end
+  end
+  module_function :chmod
+
+  OPT_TABLE['chmod'] = [:noop, :verbose]
+
+  #
+  # Options: noop verbose force
+  # 
+  # Changes permission bits on the named files (in +list+)
+  # to the bit pattern represented by +mode+.
+  # 
+  #   FileUtils.chmod_R 0700, "/tmp/app.#{$$}"
+  # 
+  def chmod_R(mode, list, options = {})
+    fu_check_options options, OPT_TABLE['chmod_R']
+    list = fu_list(list)
+    fu_output_message sprintf('chmod -R%s %o %s',
+                              (options[:force] ? 'f' : ''),
+                              mode, list.join(' ')) if options[:verbose]
+    return if options[:noop]
+    list.each do |root|
+      Entry_.new(root).traverse do |ent|
+        begin
+          ent.chmod mode
+        rescue
+          raise unless options[:force]
+        end
+      end
+    end
+  end
+  module_function :chmod_R
+
+  OPT_TABLE['chmod_R'] = [:noop, :verbose, :force]
+
+  #
+  # Options: noop verbose
+  # 
+  # Changes owner and group on the named files (in +list+)
+  # to the user +user+ and the group +group+.  +user+ and +group+
+  # may be an ID (Integer/String) or a name (String).
+  # If +user+ or +group+ is nil, this method does not change
+  # the attribute.
+  # 
+  #   FileUtils.chown 'root', 'staff', '/usr/local/bin/ruby'
+  #   FileUtils.chown nil, 'bin', Dir.glob('/usr/bin/*'), :verbose => true
+  # 
+  def chown(user, group, list, options = {})
+    fu_check_options options, OPT_TABLE['chown']
+    list = fu_list(list)
+    fu_output_message sprintf('chown %s%s',
+                              [user,group].compact.join(':') + ' ',
+                              list.join(' ')) if options[:verbose]
+    return if options[:noop]
+    uid = fu_get_uid(user)
+    gid = fu_get_gid(group)
+    list.each do |path|
+      Entry_.new(path).chown uid, gid
+    end
+  end
+  module_function :chown
+
+  OPT_TABLE['chown'] = [:noop, :verbose]
+
+  #
+  # Options: noop verbose force
+  # 
+  # Changes owner and group on the named files (in +list+)
+  # to the user +user+ and the group +group+ recursively.
+  # +user+ and +group+ may be an ID (Integer/String) or
+  # a name (String).  If +user+ or +group+ is nil, this
+  # method does not change the attribute.
+  # 
+  #   FileUtils.chown_R 'www', 'www', '/var/www/htdocs'
+  #   FileUtils.chown_R 'cvs', 'cvs', '/var/cvs', :verbose => true
+  # 
+  def chown_R(user, group, list, options = {})
+    fu_check_options options, OPT_TABLE['chown_R']
+    list = fu_list(list)
+    fu_output_message sprintf('chown -R%s %s%s',
+                              (options[:force] ? 'f' : ''),
+                              [user,group].compact.join(':') + ' ',
+                              list.join(' ')) if options[:verbose]
+    return if options[:noop]
+    uid = fu_get_uid(user)
+    gid = fu_get_gid(group)
+    return unless uid or gid
+    list.each do |root|
+      Entry_.new(root).traverse do |ent|
+        begin
+          ent.chown uid, gid
+        rescue
+          raise unless options[:force]
+        end
+      end
+    end
+  end
+  module_function :chown_R
+
+  OPT_TABLE['chown_R'] = [:noop, :verbose, :force]
+
+  begin
+    require 'etc'
+
+    def fu_get_uid(user)   #:nodoc:
+      return nil unless user
+      user = user.to_s
+      if /\A\d+\z/ =~ user
+      then user.to_i
+      else Etc.getpwnam(user).uid
+      end
+    end
+    private_module_function :fu_get_uid
+
+    def fu_get_gid(group)   #:nodoc:
+      return nil unless group
+      if /\A\d+\z/ =~ group
+      then group.to_i
+      else Etc.getgrnam(group).gid
+      end
+    end
+    private_module_function :fu_get_gid
+
+  rescue LoadError
+    # need Win32 support???
+
+    def fu_get_uid(user)   #:nodoc:
+      user    # FIXME
+    end
+    private_module_function :fu_get_uid
+
+    def fu_get_gid(group)   #:nodoc:
+      group   # FIXME
+    end
+    private_module_function :fu_get_gid
+  end
+
+  #
+  # Options: noop verbose
+  # 
+  # Updates modification time (mtime) and access time (atime) of file(s) in
+  # +list+.  Files are created if they don't exist.
+  # 
+  #   FileUtils.touch 'timestamp'
+  #   FileUtils.touch Dir.glob('*.c');  system 'make'
+  # 
+  def touch(list, options = {})
+    fu_check_options options, OPT_TABLE['touch']
+    list = fu_list(list)
+    created = nocreate = options[:nocreate]
+    t = options[:mtime]
+    if options[:verbose]
+      fu_output_message "touch #{nocreate ? ' -c' : ''}#{t ? t.strftime(' -t %Y%m%d%H%M.%S') : ''}#{list.join ' '}"
+    end
+    return if options[:noop]
+    list.each do |path|
+      created = nocreate
+      begin
+        File.utime(t, t, path)
+      rescue Errno::ENOENT
+        raise if created
+        File.open(path, 'a') {
+          ;
+        }
+        created = true
+        retry if t
+      end
+    end
+  end
+  module_function :touch
+
+  OPT_TABLE['touch'] = [:noop, :verbose, :mtime, :nocreate]
+
+  private
+
+  module StreamUtils_
+    private
+
+    def fu_windows?
+      /mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+    end
+
+    def fu_copy_stream0(src, dest, blksize)   #:nodoc:
+      # FIXME: readpartial?
+      while s = src.read(blksize)
+        dest.write s
+      end
+    end
+
+    def fu_stream_blksize(*streams)
+      streams.each do |s|
+        next unless s.respond_to?(:stat)
+        size = fu_blksize(s.stat)
+        return size if size
+      end
+      fu_default_blksize()
+    end
+
+    def fu_blksize(st)
+      s = st.blksize
+      return nil unless s
+      return nil if s == 0
+      s
+    end
+
+    def fu_default_blksize
+      1024
+    end
+  end
+
+  include StreamUtils_
+  extend StreamUtils_
+
+  class Entry_   #:nodoc: internal use only
+    include StreamUtils_
+
+    def initialize(a, b = nil, deref = false)
+      @prefix = @rel = @path = nil
+      if b
+        @prefix = a
+        @rel = b
+      else
+        @path = a
+      end
+      @deref = deref
+      @stat = nil
+      @lstat = nil
+    end
+
+    def inspect
+      "\#<#{self.class} #{path()}>"
+    end
+
+    def path
+      if @path
+        @path.to_str
+      else
+        join(@prefix, @rel)
+      end
+    end
+
+    def prefix
+      @prefix || @path
+    end
+
+    def rel
+      @rel
+    end
+
+    def dereference?
+      @deref
+    end
+
+    def exist?
+      lstat! ? true : false
+    end
+
+    def file?
+      s = lstat!
+      s and s.file?
+    end
+
+    def directory?
+      s = lstat!
+      s and s.directory?
+    end
+
+    def symlink?
+      s = lstat!
+      s and s.symlink?
+    end
+
+    def chardev?
+      s = lstat!
+      s and s.chardev?
+    end
+
+    def blockdev?
+      s = lstat!
+      s and s.blockdev?
+    end
+
+    def socket?
+      s = lstat!
+      s and s.socket?
+    end
+
+    def pipe?
+      s = lstat!
+      s and s.pipe?
+    end
+
+    S_IF_DOOR = 0xD000
+
+    def door?
+      s = lstat!
+      s and (s.mode & 0xF000 == S_IF_DOOR)
+    end
+
+    def entries
+      Dir.entries(path())\
+          .reject {|n| n == '.' or n == '..' }\
+          .map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) }
+    end
+
+    def stat
+      return @stat if @stat
+      if lstat() and lstat().symlink?
+        @stat = File.stat(path())
+      else
+        @stat = lstat()
+      end
+      @stat
+    end
+
+    def stat!
+      return @stat if @stat
+      if lstat! and lstat!.symlink?
+        @stat = File.stat(path())
+      else
+        @stat = lstat!
+      end
+      @stat
+    rescue SystemCallError
+      nil
+    end
+
+    def lstat
+      if dereference?
+        @lstat ||= File.stat(path())
+      else
+        @lstat ||= File.lstat(path())
+      end
+    end
+
+    def lstat!
+      lstat()
+    rescue SystemCallError
+      nil
+    end
+
+    def chmod(mode)
+      if symlink?
+        File.lchmod mode, path() if have_lchmod?
+      else
+        File.chmod mode, path()
+      end
+    end
+
+    def chown(uid, gid)
+      if symlink?
+        File.lchown uid, gid, path() if have_lchown?
+      else
+        File.chown uid, gid, path()
+      end
+    end
+
+    def copy(dest)
+      case
+      when file?
+        copy_file dest
+      when directory?
+        begin
+          Dir.mkdir dest
+        rescue
+          raise unless File.directory?(dest)
+        end
+      when symlink?
+        File.symlink File.readlink(path()), dest
+      when chardev?
+        raise "cannot handle device file" unless File.respond_to?(:mknod)
+        mknod dest, ?c, 0666, lstat().rdev
+      when blockdev?
+        raise "cannot handle device file" unless File.respond_to?(:mknod)
+        mknod dest, ?b, 0666, lstat().rdev
+      when socket?
+        raise "cannot handle socket" unless File.respond_to?(:mknod)
+        mknod dest, nil, lstat().mode, 0
+      when pipe?
+        raise "cannot handle FIFO" unless File.respond_to?(:mkfifo)
+        mkfifo dest, 0666
+      when door?
+        raise "cannot handle door: #{path()}"
+      else
+        raise "unknown file type: #{path()}"
+      end
+    end
+
+    def copy_file(dest)
+      st = stat()
+      File.open(path(),  'rb') {|r|
+        File.open(dest, 'wb', st.mode) {|w|
+          fu_copy_stream0 r, w, (fu_blksize(st) || fu_default_blksize())
+        }
+      }
+    end
+
+    def copy_metadata(path)
+      st = lstat()
+      File.utime st.atime, st.mtime, path
+      begin
+        File.chown st.uid, st.gid, path
+      rescue Errno::EPERM
+        # clear setuid/setgid
+        File.chmod st.mode & 01777, path
+      else
+        File.chmod st.mode, path
+      end
+    end
+
+    def remove
+      if directory?
+        remove_dir1
+      else
+        remove_file
+      end
+    end
+
+    def remove_dir1
+      platform_support {
+        Dir.rmdir path().sub(%r</\z>, '')
+      }
+    end
+
+    def remove_file
+      platform_support {
+        File.unlink path
+      }
+    end
+
+    def platform_support
+      return yield unless fu_windows?
+      first_time_p = true
+      begin
+        yield
+      rescue Errno::ENOENT
+        raise
+      rescue => err
+        if first_time_p
+          first_time_p = false
+          begin
+            File.chmod 0700, path()   # Windows does not have symlink
+            retry
+          rescue SystemCallError
+          end
+        end
+        raise err
+      end
+    end
+
+    def preorder_traverse
+      stack = [self]
+      while ent = stack.pop
+        yield ent
+        stack.concat ent.entries.reverse if ent.directory?
+      end
+    end
+
+    alias traverse preorder_traverse
+
+    def postorder_traverse
+      if directory?
+        entries().each do |ent|
+          ent.postorder_traverse do |e|
+            yield e
+          end
+        end
+      end
+      yield self
+    end
+
+    private
+
+    $fileutils_rb_have_lchmod = nil
+
+    def have_lchmod?
+      # This is not MT-safe, but it does not matter.
+      if $fileutils_rb_have_lchmod == nil
+        $fileutils_rb_have_lchmod = check_have_lchmod?
+      end
+      $fileutils_rb_have_lchmod
+    end
+
+    def check_have_lchmod?
+      return false unless File.respond_to?(:lchmod)
+      File.lchmod 0
+      return true
+    rescue NotImplementedError
+      return false
+    end
+
+    $fileutils_rb_have_lchown = nil
+
+    def have_lchown?
+      # This is not MT-safe, but it does not matter.
+      if $fileutils_rb_have_lchown == nil
+        $fileutils_rb_have_lchown = check_have_lchown?
+      end
+      $fileutils_rb_have_lchown
+    end
+
+    def check_have_lchown?
+      return false unless File.respond_to?(:lchown)
+      File.lchown nil, nil
+      return true
+    rescue NotImplementedError
+      return false
+    end
+
+    def join(dir, base)
+      return dir.to_str if not base or base == '.'
+      return base.to_str if not dir or dir == '.'
+      File.join(dir, base)
+    end
+  end   # class Entry_
+
+  def fu_list(arg)   #:nodoc:
+    [arg].flatten.map {|path| path.to_str }
+  end
+  private_module_function :fu_list
+
+  def fu_each_src_dest(src, dest)   #:nodoc:
+    fu_each_src_dest0(src, dest) do |s, d|
+      raise ArgumentError, "same file: #{s} and #{d}" if fu_same?(s, d)
+      yield s, d
+    end
+  end
+  private_module_function :fu_each_src_dest
+
+  def fu_each_src_dest0(src, dest)   #:nodoc:
+    if src.is_a?(Array)
+      src.each do |s|
+        s = s.to_str
+        yield s, File.join(dest, File.basename(s))
+      end
+    else
+      src = src.to_str
+      if File.directory?(dest)
+        yield src, File.join(dest, File.basename(src))
+      else
+        yield src, dest.to_str
+      end
+    end
+  end
+  private_module_function :fu_each_src_dest0
+
+  def fu_same?(a, b)   #:nodoc:
+    if fu_have_st_ino?
+      st1 = File.stat(a)
+      st2 = File.stat(b)
+      st1.dev == st2.dev and st1.ino == st2.ino
+    else
+      File.expand_path(a) == File.expand_path(b)
+    end
+  rescue Errno::ENOENT
+    return false
+  end
+  private_module_function :fu_same?
+
+  def fu_have_st_ino?   #:nodoc:
+    not fu_windows?
+  end
+  private_module_function :fu_have_st_ino?
+
+  def fu_check_options(options, optdecl)   #:nodoc:
+    h = options.dup
+    optdecl.each do |opt|
+      h.delete opt
+    end
+    raise ArgumentError, "no such option: #{h.keys.join(' ')}" unless h.empty?
+  end
+  private_module_function :fu_check_options
+
+  def fu_update_option(args, new)   #:nodoc:
+    if args.last.is_a?(Hash)
+      args[-1] = args.last.dup.update(new)
+    else
+      args.push new
+    end
+    args
+  end
+  private_module_function :fu_update_option
+
+  @fileutils_output = $stderr
+  @fileutils_label  = ''
+
+  def fu_output_message(msg)   #:nodoc:
+    @fileutils_output ||= $stderr
+    @fileutils_label  ||= ''
+    @fileutils_output.puts @fileutils_label + msg
+  end
+  private_module_function :fu_output_message
+
+  #
+  # Returns an Array of method names which have any options.
+  #
+  #   p FileUtils.commands  #=> ["chmod", "cp", "cp_r", "install", ...]
+  #
+  def FileUtils.commands
+    OPT_TABLE.keys
+  end
+
+  #
+  # Returns an Array of option names.
+  #
+  #   p FileUtils.options  #=> ["noop", "force", "verbose", "preserve", "mode"]
+  #
+  def FileUtils.options
+    OPT_TABLE.values.flatten.uniq.map {|sym| sym.to_s }
+  end
+
+  #
+  # Returns true if the method +mid+ have an option +opt+.
+  #
+  #   p FileUtils.have_option?(:cp, :noop)     #=> true
+  #   p FileUtils.have_option?(:rm, :force)    #=> true
+  #   p FileUtils.have_option?(:rm, :perserve) #=> false
+  #
+  def FileUtils.have_option?(mid, opt)
+    li = OPT_TABLE[mid.to_s] or raise ArgumentError, "no such method: #{mid}"
+    li.include?(opt)
+  end
+
+  #
+  # Returns an Array of option names of the method +mid+.
+  #
+  #   p FileUtils.options(:rm)  #=> ["noop", "verbose", "force"]
+  #
+  def FileUtils.options_of(mid)
+    OPT_TABLE[mid.to_s].map {|sym| sym.to_s }
+  end
+
+  #
+  # Returns an Array of method names which have the option +opt+.
+  #
+  #   p FileUtils.collect_method(:preserve) #=> ["cp", "cp_r", "copy", "install"]
+  #
+  def FileUtils.collect_method(opt)
+    OPT_TABLE.keys.select {|m| OPT_TABLE[m].include?(opt) }
+  end
+
+  METHODS = singleton_methods() - %w( private_module_function
+      commands options have_option? options_of collect_method )
+
+  # 
+  # This module has all methods of FileUtils module, but it outputs messages
+  # before acting.  This equates to passing the <tt>:verbose</tt> flag to
+  # methods in FileUtils.
+  # 
+  module Verbose
+    include FileUtils
+    @fileutils_output  = $stderr
+    @fileutils_label   = ''
+    ::FileUtils.collect_method(:verbose).each do |name|
+      module_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def #{name}(*args)
+          super(*fu_update_option(args, :verbose => true))
+        end
+        private :#{name}
+      EOS
+    end
+    extend self
+    class << self
+      ::FileUtils::METHODS.each do |m|
+        public m
+      end
+    end
+  end
+
+  # 
+  # This module has all methods of FileUtils module, but never changes
+  # files/directories.  This equates to passing the <tt>:noop</tt> flag
+  # to methods in FileUtils.
+  # 
+  module NoWrite
+    include FileUtils
+    @fileutils_output  = $stderr
+    @fileutils_label   = ''
+    ::FileUtils.collect_method(:noop).each do |name|
+      module_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def #{name}(*args)
+          super(*fu_update_option(args, :noop => true))
+        end
+        private :#{name}
+      EOS
+    end
+    extend self
+    class << self
+      ::FileUtils::METHODS.each do |m|
+        public m
+      end
+    end
+  end
+
+  # 
+  # This module has all methods of FileUtils module, but never changes
+  # files/directories, with printing message before acting.
+  # This equates to passing the <tt>:noop</tt> and <tt>:verbose</tt> flag
+  # to methods in FileUtils.
+  # 
+  module DryRun
+    include FileUtils
+    @fileutils_output  = $stderr
+    @fileutils_label   = ''
+    ::FileUtils.collect_method(:noop).each do |name|
+      module_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def #{name}(*args)
+          super(*fu_update_option(args, :noop => true, :verbose => true))
+        end
+        private :#{name}
+      EOS
+    end
+    extend self
+    class << self
+      ::FileUtils::METHODS.each do |m|
+        public m
+      end
+    end
+  end
+
+end
diff --git a/ruby_1_8_6/lib/finalize.rb b/ruby_1_8_6/lib/finalize.rb
new file mode 100644
index 0000000000..9b6b302cac
--- /dev/null
+++ b/ruby_1_8_6/lib/finalize.rb
@@ -0,0 +1,193 @@
+#--
+#   finalizer.rb - 
+#   	$Release Version: 0.3$
+#   	$Revision: 1.4 $
+#   	$Date: 1998/02/27 05:34:33 $
+#   	by Keiju ISHITSUKA
+#++
+#
+# Usage:
+#
+# add dependency R_method(obj, dependant)
+#   add(obj, dependant, method = :finalize, *opt)
+#   add_dependency(obj, dependant, method = :finalize, *opt)
+#
+# delete dependency R_method(obj, dependant)
+#   delete(obj_or_id, dependant, method = :finalize)
+#   delete_dependency(obj_or_id, dependant, method = :finalize)
+#
+# delete dependency R_*(obj, dependant)
+#   delete_all_dependency(obj_or_id, dependant)
+#
+# delete dependency R_method(*, dependant)
+#   delete_by_dependant(dependant, method = :finalize)
+#
+# delete dependency R_*(*, dependant)
+#   delete_all_by_dependant(dependant)
+#
+# delete all dependency R_*(*, *)
+#   delete_all
+#
+# finalize the dependant connected by dependency R_method(obj, dependtant).
+#   finalize(obj_or_id, dependant, method = :finalize)
+#   finalize_dependency(obj_or_id, dependant, method = :finalize)
+#
+# finalize all dependants connected by dependency R_*(obj, dependtant).
+#   finalize_all_dependency(obj_or_id, dependant)
+#
+# finalize the dependant connected by dependency R_method(*, dependtant).
+#   finalize_by_dependant(dependant, method = :finalize)
+#
+# finalize all dependants connected by dependency R_*(*, dependant).
+#   finalize_all_by_dependant(dependant)
+#
+# finalize all dependency registered to the Finalizer.
+#   finalize_all
+#
+# stop invoking Finalizer on GC.
+#   safe{..}
+#
+
+module Finalizer
+  RCS_ID='-$Id: finalize.rb,v 1.4 1998/02/27 05:34:33 keiju Exp keiju $-'
+
+  class <<self
+    # @dependency: {id => [[dependant, method, *opt], ...], ...}
+
+    # add dependency R_method(obj, dependant)
+    def add_dependency(obj, dependant, method = :finalize, *opt)
+      ObjectSpace.call_finalizer(obj)
+      method = method.intern unless method.kind_of?(Integer)
+      assoc = [dependant, method].concat(opt)
+      if dep = @dependency[obj.object_id]
+	dep.push assoc
+      else
+	@dependency[obj.object_id] = [assoc]
+      end
+    end
+    alias add add_dependency
+
+    # delete dependency R_method(obj, dependant)
+    def delete_dependency(id, dependant, method = :finalize)
+      id = id.object_id unless id.kind_of?(Integer)
+      method = method.intern unless method.kind_of?(Integer)
+      for assoc in @dependency[id]
+	assoc.delete_if do
+	  |d, m, *o|
+	  d == dependant && m == method
+	end
+	@dependency.delete(id) if assoc.empty?
+      end
+    end
+    alias delete delete_dependency
+
+    # delete dependency R_*(obj, dependant)
+    def delete_all_dependency(id, dependant)
+      id = id.object_id unless id.kind_of?(Integer)
+      method = method.intern unless method.kind_of?(Integer)
+      for assoc in @dependency[id]
+	assoc.delete_if do
+	  |d, m, *o|
+	  d == dependant
+	end
+	@dependency.delete(id) if assoc.empty?
+      end
+    end
+
+    # delete dependency R_method(*, dependant)
+    def delete_by_dependant(dependant, method = :finalize)
+      method = method.intern unless method.kind_of?(Integer)
+      for id in @dependency.keys
+	delete(id, dependant, method)
+      end
+    end
+
+    # delete dependency R_*(*, dependant)
+    def delete_all_by_dependant(dependant)
+      for id in @dependency.keys
+	delete_all_dependency(id, dependant)
+      end
+    end
+
+    # finalize the depandant connected by dependency R_method(obj, dependtant)
+    def finalize_dependency(id, dependant, method = :finalize)
+      id = id.object_id unless id.kind_of?(Integer)
+      method = method.intern unless method.kind_of?(Integer)
+      for assocs in @dependency[id]
+	assocs.delete_if do
+	  |d, m, *o|
+	  d.send(m, id, *o) if ret = d == dependant && m == method
+	  ret
+	end
+	@dependency.delete(id) if assoc.empty?
+      end
+    end
+    alias finalize finalize_dependency
+
+    # finalize all dependants connected by dependency R_*(obj, dependtant)
+    def finalize_all_dependency(id, dependant)
+      id = id.object_id unless id.kind_of?(Integer)
+      method = method.intern unless method.kind_of?(Integer)
+      for assoc in @dependency[id]
+	assoc.delete_if do
+	  |d, m, *o|
+	  d.send(m, id, *o) if ret = d == dependant
+	end
+	@dependency.delete(id) if assoc.empty?
+      end
+    end
+
+    # finalize the dependant connected by dependency R_method(*, dependtant)
+    def finalize_by_dependant(dependant, method = :finalize)
+      method = method.intern unless method.kind_of?(Integer)
+      for id in @dependency.keys
+	finalize(id, dependant, method)
+      end
+    end
+
+    # finalize all dependants connected by dependency R_*(*, dependtant)
+    def finalize_all_by_dependant(dependant)
+      for id in @dependency.keys
+	finalize_all_dependency(id, dependant)
+      end
+    end
+
+    # finalize all dependants registered to the Finalizer.
+    def finalize_all
+      for id, assocs in @dependency
+	for dependant, method, *opt in assocs
+	  dependant.send(method, id, *opt)
+	end
+	assocs.clear
+      end
+    end
+
+    # method to call finalize_* safely.
+    def safe
+      old_status = Thread.critical
+      Thread.critical = true
+      ObjectSpace.remove_finalizer(@proc)
+      begin
+	yield
+      ensure
+	ObjectSpace.add_finalizer(@proc)
+	Thread.critical = old_status
+      end
+    end
+
+    private
+
+    # registering function to ObjectSpace#add_finalizer
+    def final_of(id)
+      if assocs = @dependency.delete(id)
+	for dependant, method, *opt in assocs
+	  dependant.send(method, id, *opt)
+	end
+      end
+    end
+
+  end
+  @dependency = Hash.new
+  @proc = proc{|id| final_of(id)}
+  ObjectSpace.add_finalizer(@proc)
+end
diff --git a/ruby_1_8_6/lib/find.rb b/ruby_1_8_6/lib/find.rb
new file mode 100644
index 0000000000..0d22dd62d6
--- /dev/null
+++ b/ruby_1_8_6/lib/find.rb
@@ -0,0 +1,79 @@
+#
+# find.rb: the Find module for processing all files under a given directory.
+#
+
+#
+# The +Find+ module supports the top-down traversal of a set of file paths.
+#
+# For example, to total the size of all files under your home directory,
+# ignoring anything in a "dot" directory (e.g. $HOME/.ssh):
+#
+#   require 'find'
+#
+#   total_size = 0
+#
+#   Find.find(ENV["HOME"]) do |path|
+#     if FileTest.directory?(path)
+#       if File.basename(path)[0] == ?.
+#         Find.prune       # Don't look any further into this directory.
+#       else
+#         next
+#       end
+#     else
+#       total_size += FileTest.size(path)
+#     end
+#   end
+#
+module Find
+
+  #
+  # Calls the associated block with the name of every file and directory listed
+  # as arguments, then recursively on their subdirectories, and so on.
+  #
+  # See the +Find+ module documentation for an example.
+  #
+  def find(*paths) # :yield: path
+    paths.collect!{|d| d.dup}
+    while file = paths.shift
+      catch(:prune) do
+	yield file.dup.taint
+        next unless File.exist? file
+	begin
+	  if File.lstat(file).directory? then
+	    d = Dir.open(file)
+	    begin
+	      for f in d
+		next if f == "." or f == ".."
+		if File::ALT_SEPARATOR and file =~ /^(?:[\/\\]|[A-Za-z]:[\/\\]?)$/ then
+		  f = file + f
+		elsif file == "/" then
+		  f = "/" + f
+		else
+		  f = File.join(file, f)
+		end
+		paths.unshift f.untaint
+	      end
+	    ensure
+	      d.close
+	    end
+	  end
+        rescue Errno::ENOENT, Errno::EACCES
+	end
+      end
+    end
+  end
+
+  #
+  # Skips the current file or directory, restarting the loop with the next
+  # entry. If the current file is a directory, that directory will not be
+  # recursively entered. Meaningful only within the block associated with
+  # Find::find.
+  #
+  # See the +Find+ module documentation for an example.
+  #
+  def prune
+    throw :prune
+  end
+
+  module_function :find, :prune
+end
diff --git a/ruby_1_8_6/lib/forwardable.rb b/ruby_1_8_6/lib/forwardable.rb
new file mode 100644
index 0000000000..b6344cd4f6
--- /dev/null
+++ b/ruby_1_8_6/lib/forwardable.rb
@@ -0,0 +1,218 @@
+# = forwardable - Support for the Delegation Pattern
+#
+#    $Release Version: 1.1$
+#    $Revision$
+#    $Date$
+#    by Keiju ISHITSUKA(keiju@ishitsuka.com)
+#
+#    Documentation by James Edward Gray II and Gavin Sinclair
+#
+# == Introduction
+#
+# This library allows you delegate method calls to an object, on a method by
+# method basis.  You can use Forwardable to setup this delegation at the class
+# level, or SingleForwardable to handle it at the object level.
+#
+# == Notes
+#
+# Be advised, RDoc will not detect delegated methods.
+#
+# <b>forwardable.rb provides single-method delegation via the
+# def_delegator() and def_delegators() methods.  For full-class
+# delegation via DelegateClass(), see delegate.rb.</b>
+#
+# == Examples
+#
+# === Forwardable
+#
+# Forwardable makes building a new class based on existing work, with a proper
+# interface, almost trivial.  We want to rely on what has come before obviously,
+# but with delegation we can take just the methods we need and even rename them
+# as appropriate.  In many cases this is preferable to inheritance, which gives
+# us the entire old interface, even if much of it isn't needed.
+#
+#   class Queue
+#     extend Forwardable
+#     
+#     def initialize
+#       @q = [ ]    # prepare delegate object
+#     end
+#     
+#     # setup prefered interface, enq() and deq()...
+#     def_delegator :@q, :push, :enq
+#     def_delegator :@q, :shift, :deq
+#     
+#     # support some general Array methods that fit Queues well
+#     def_delegators :@q, :clear, :first, :push, :shift, :size
+#   end
+# 
+#   q = Queue.new
+#   q.enq 1, 2, 3, 4, 5
+#   q.push 6
+# 
+#   q.shift    # => 1
+#   while q.size > 0
+#     puts q.deq
+#   end
+# 
+#   q.enq "Ruby", "Perl", "Python"
+#   puts q.first
+#   q.clear
+#   puts q.first
+#
+# <i>Prints:</i>
+#
+#   2
+#   3
+#   4
+#   5
+#   6
+#   Ruby
+#   nil
+#
+# === SingleForwardable
+#
+#    printer = String.new
+#    printer.extend SingleForwardable        # prepare object for delegation
+#    printer.def_delegator "STDOUT", "puts"  # add delegation for STDOUT.puts()
+#    printer.puts "Howdy!"
+#
+# <i>Prints:</i>
+#
+#    Howdy!
+
+#
+# The Forwardable module provides delegation of specified
+# methods to a designated object, using the methods #def_delegator
+# and #def_delegators.
+#
+# For example, say you have a class RecordCollection which
+# contains an array <tt>@records</tt>.  You could provide the lookup method
+# #record_number(), which simply calls #[] on the <tt>@records</tt>
+# array, like this:
+#
+#   class RecordCollection
+#     extend Forwardable
+#     def_delegator :@records, :[], :record_number
+#   end
+#
+# Further, if you wish to provide the methods #size, #<<, and #map,
+# all of which delegate to @records, this is how you can do it:
+#
+#   class RecordCollection
+#     # extend Forwardable, but we did that above
+#     def_delegators :@records, :size, :<<, :map
+#   end
+#
+# Also see the example at forwardable.rb.
+#
+module Forwardable
+
+  @debug = nil
+  class<<self
+    # force Forwardable to show up in stack backtraces of delegated methods
+    attr_accessor :debug
+  end
+
+  #
+  # Shortcut for defining multiple delegator methods, but with no
+  # provision for using a different name.  The following two code
+  # samples have the same effect:
+  #
+  #   def_delegators :@records, :size, :<<, :map
+  #
+  #   def_delegator :@records, :size
+  #   def_delegator :@records, :<<
+  #   def_delegator :@records, :map
+  #
+  # See the examples at Forwardable and forwardable.rb.
+  #
+  def def_instance_delegators(accessor, *methods)
+    for method in methods
+      def_instance_delegator(accessor, method)
+    end
+  end
+
+  #
+  # Defines a method _method_ which delegates to _obj_ (i.e. it calls
+  # the method of the same name in _obj_).  If _new_name_ is
+  # provided, it is used as the name for the delegate method.
+  #
+  # See the examples at Forwardable and forwardable.rb.
+  #
+  def def_instance_delegator(accessor, method, ali = method)
+    accessor = accessor.id2name if accessor.kind_of?(Integer)
+    method = method.id2name if method.kind_of?(Integer)
+    ali = ali.id2name if ali.kind_of?(Integer)
+
+    module_eval(<<-EOS, "(__FORWARDABLE__)", 1)
+      def #{ali}(*args, &block)
+	begin
+	  #{accessor}.__send__(:#{method}, *args, &block)
+	rescue Exception
+	  $@.delete_if{|s| /^\\(__FORWARDABLE__\\):/ =~ s} unless Forwardable::debug
+	  Kernel::raise
+	end
+      end
+    EOS
+  end
+
+  alias def_delegators def_instance_delegators
+  alias def_delegator def_instance_delegator
+end
+
+#
+# The SingleForwardable module provides delegation of specified
+# methods to a designated object, using the methods #def_delegator
+# and #def_delegators.  This module is similar to Forwardable, but it works on
+# objects themselves, instead of their defining classes.
+#
+# Also see the example at forwardable.rb.
+#
+module SingleForwardable
+  #
+  # Shortcut for defining multiple delegator methods, but with no
+  # provision for using a different name.  The following two code
+  # samples have the same effect:
+  #
+  #   single_forwardable.def_delegators :@records, :size, :<<, :map
+  #
+  #   single_forwardable.def_delegator :@records, :size
+  #   single_forwardable.def_delegator :@records, :<<
+  #   single_forwardable.def_delegator :@records, :map
+  #
+  # See the example at forwardable.rb.
+  #
+  def def_singleton_delegators(accessor, *methods)
+    for method in methods
+      def_singleton_delegator(accessor, method)
+    end
+  end
+
+  #
+  # Defines a method _method_ which delegates to _obj_ (i.e. it calls
+  # the method of the same name in _obj_).  If _new_name_ is
+  # provided, it is used as the name for the delegate method.
+  #
+  # See the example at forwardable.rb.
+  #
+  def def_singleton_delegator(accessor, method, ali = method)
+    accessor = accessor.id2name if accessor.kind_of?(Integer)
+    method = method.id2name if method.kind_of?(Integer)
+    ali = ali.id2name if ali.kind_of?(Integer)
+
+    instance_eval(<<-EOS, "(__FORWARDABLE__)", 1)
+       def #{ali}(*args, &block)
+	 begin
+	   #{accessor}.__send__(:#{method}, *args,&block)
+	 rescue Exception
+	   $@.delete_if{|s| /^\\(__FORWARDABLE__\\):/ =~ s} unless Forwardable::debug
+	   Kernel::raise
+	 end
+       end
+    EOS
+  end
+
+  alias def_delegators def_singleton_delegators
+  alias def_delegator def_singleton_delegator
+end
diff --git a/ruby_1_8_6/lib/ftools.rb b/ruby_1_8_6/lib/ftools.rb
new file mode 100644
index 0000000000..5f082331fb
--- /dev/null
+++ b/ruby_1_8_6/lib/ftools.rb
@@ -0,0 +1,261 @@
+# 
+# = ftools.rb: Extra tools for the File class
+#
+# Author:: WATANABE, Hirofumi
+# Documentation:: Zachary Landau
+#
+# This library can be distributed under the terms of the Ruby license.
+# You can freely distribute/modify this library.
+#
+# It is included in the Ruby standard library.
+#
+# == Description
+#
+# ftools adds several (class, not instance) methods to the File class, for
+# copying, moving, deleting, installing, and comparing files, as well as
+# creating a directory path.  See the File class for details.
+#
+# FileUtils contains all or nearly all the same functionality and more, and
+# is a recommended option over ftools 
+#
+# When you
+#
+#   require 'ftools'
+#
+# then the File class aquires some utility methods for copying, moving, and
+# deleting files, and more.
+#
+# See the method descriptions below, and consider using FileUtils as it is
+# more comprehensive.
+#
+class File
+end
+
+class << File
+
+  BUFSIZE = 8 * 1024
+
+  #
+  # If +to+ is a valid directory, +from+ will be appended to +to+, adding
+  # and escaping backslashes as necessary. Otherwise, +to+ will be returned.
+  # Useful for appending +from+ to +to+ only if the filename was not specified
+  # in +to+. 
+  #
+  def catname(from, to)
+    if directory? to
+      join to.sub(%r([/\\]$), ''), basename(from)
+    else
+      to
+    end
+  end
+
+  #
+  # Copies a file +from+ to +to+. If +to+ is a directory, copies +from+
+  # to <tt>to/from</tt>.
+  #
+  def syscopy(from, to)
+    to = catname(from, to)
+
+    fmode = stat(from).mode
+    tpath = to
+    not_exist = !exist?(tpath)
+
+    from = open(from, "rb")
+    to = open(to, "wb")
+
+    begin
+      while true
+	to.syswrite from.sysread(BUFSIZE)
+      end
+    rescue EOFError
+      ret = true
+    rescue
+      ret = false
+    ensure
+      to.close
+      from.close
+    end
+    chmod(fmode, tpath) if not_exist
+    ret
+  end
+
+  #
+  # Copies a file +from+ to +to+ using #syscopy. If +to+ is a directory,
+  # copies +from+ to <tt>to/from</tt>. If +verbose+ is true, <tt>from -> to</tt>
+  # is printed.
+  #
+  def copy(from, to, verbose = false)
+    $stderr.print from, " -> ", catname(from, to), "\n" if verbose
+    syscopy from, to
+  end
+
+  alias cp copy
+
+  #
+  # Moves a file +from+ to +to+ using #syscopy. If +to+ is a directory,
+  # copies from +from+ to <tt>to/from</tt>. If +verbose+ is true, <tt>from ->
+  # to</tt> is printed.
+  #
+  def move(from, to, verbose = false)
+    to = catname(from, to)
+    $stderr.print from, " -> ", to, "\n" if verbose
+
+    if RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/ and file? to
+      unlink to
+    end
+    fstat = stat(from)
+    begin
+      rename from, to
+    rescue
+      begin
+        symlink readlink(from), to and unlink from
+      rescue
+	from_stat = stat(from)
+	syscopy from, to and unlink from
+	utime(from_stat.atime, from_stat.mtime, to)
+	begin
+	  chown(fstat.uid, fstat.gid, to)
+	rescue
+	end
+      end
+    end
+  end
+
+  alias mv move
+
+  #
+  # Returns +true+ if and only if the contents of files +from+ and +to+ are
+  # identical. If +verbose+ is +true+, <tt>from <=> to</tt> is printed.
+  #
+  def compare(from, to, verbose = false)
+    $stderr.print from, " <=> ", to, "\n" if verbose
+
+    return false if stat(from).size != stat(to).size
+
+    from = open(from, "rb")
+    to = open(to, "rb")
+
+    ret = false
+    fr = tr = ''
+
+    begin
+      while fr == tr
+	fr = from.read(BUFSIZE)
+	if fr
+	  tr = to.read(fr.size)
+	else
+	  ret = to.read(BUFSIZE)
+	  ret = !ret || ret.length == 0
+	  break
+	end
+      end
+    rescue
+      ret = false
+    ensure
+      to.close
+      from.close
+    end
+    ret
+  end
+
+  alias cmp compare
+
+  #
+  # Removes a list of files. Each parameter should be the name of the file to
+  # delete. If the last parameter isn't a String, verbose mode will be enabled.
+  # Returns the number of files deleted.
+  #
+  def safe_unlink(*files)
+    verbose = if files[-1].is_a? String then false else files.pop end
+    files.each do |file|
+      begin
+        unlink file
+        $stderr.print "removing ", file, "\n" if verbose
+      rescue Errno::EACCES # for Windows
+        continue if symlink? file
+        begin
+          mode = stat(file).mode
+          o_chmod mode | 0200, file
+          unlink file
+          $stderr.print "removing ", file, "\n" if verbose
+        rescue
+          o_chmod mode, file rescue nil
+        end
+      rescue
+      end
+    end
+  end
+
+  alias rm_f safe_unlink
+
+  #
+  # Creates a directory and all its parent directories.
+  # For example,
+  #
+  #	File.makedirs '/usr/lib/ruby'
+  #
+  # causes the following directories to be made, if they do not exist.
+  #	* /usr
+  #	* /usr/lib
+  #	* /usr/lib/ruby
+  #
+  # You can pass several directories, each as a parameter. If the last
+  # parameter isn't a String, verbose mode will be enabled.
+  #
+  def makedirs(*dirs)
+    verbose = if dirs[-1].is_a? String then false else dirs.pop end
+    mode = 0755
+    for dir in dirs
+      parent = dirname(dir)
+      next if parent == dir or directory? dir
+      makedirs parent unless directory? parent
+      $stderr.print "mkdir ", dir, "\n" if verbose
+      if basename(dir) != ""
+        begin
+          Dir.mkdir dir, mode
+        rescue SystemCallError
+          raise unless directory? dir
+        end
+      end
+    end
+  end
+
+  alias mkpath makedirs
+
+  alias o_chmod chmod
+
+  vsave, $VERBOSE = $VERBOSE, false
+
+  #
+  # Changes permission bits on +files+ to the bit pattern represented
+  # by +mode+. If the last parameter isn't a String, verbose mode will
+  # be enabled.
+  #
+  #   File.chmod 0755, 'somecommand'
+  #   File.chmod 0644, 'my.rb', 'your.rb', true
+  #
+  def chmod(mode, *files)
+    verbose = if files[-1].is_a? String then false else files.pop end
+    $stderr.printf "chmod %04o %s\n", mode, files.join(" ") if verbose
+    o_chmod mode, *files
+  end
+  $VERBOSE = vsave
+
+  #
+  # If +src+ is not the same as +dest+, copies it and changes the permission
+  # mode to +mode+. If +dest+ is a directory, destination is <tt>dest/src</tt>.
+  # If +mode+ is not set, default is used. If +verbose+ is set to true, the
+  # name of each file copied will be printed.
+  #
+  def install(from, to, mode = nil, verbose = false)
+    to = catname(from, to)
+    unless exist? to and cmp from, to
+      safe_unlink to if exist? to
+      cp from, to, verbose
+      chmod mode, to, verbose if mode
+    end
+  end
+
+end
+
+# vi:set sw=2:
diff --git a/ruby_1_8_6/lib/generator.rb b/ruby_1_8_6/lib/generator.rb
new file mode 100644
index 0000000000..a010559b60
--- /dev/null
+++ b/ruby_1_8_6/lib/generator.rb
@@ -0,0 +1,380 @@
+#!/usr/bin/env ruby
+#--
+# $Idaemons: /home/cvs/rb/generator.rb,v 1.8 2001/10/03 08:54:32 knu Exp $
+# $RoughId: generator.rb,v 1.10 2003/10/14 19:36:58 knu Exp $
+# $Id$
+#++
+#
+# = generator.rb: convert an internal iterator to an external one
+#
+# Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
+#
+# All rights reserved.  You can redistribute and/or modify it under
+# the same terms as Ruby.
+#
+# == Overview
+#
+# This library provides the Generator class, which converts an
+# internal iterator (i.e. an Enumerable object) to an external
+# iterator.  In that form, you can roll many iterators independently.
+#
+# The SyncEnumerator class, which is implemented using Generator,
+# makes it easy to roll many Enumerable objects synchronously.
+#
+# See the respective classes for examples of usage.
+
+
+#
+# Generator converts an internal iterator (i.e. an Enumerable object)
+# to an external iterator.
+#
+# Note that it is not very fast since it is implemented using
+# continuations, which are currently slow.
+#
+# == Example
+#
+#   require 'generator'
+#
+#   # Generator from an Enumerable object
+#   g = Generator.new(['A', 'B', 'C', 'Z'])
+#
+#   while g.next?
+#     puts g.next
+#   end
+#
+#   # Generator from a block
+#   g = Generator.new { |g|
+#     for i in 'A'..'C'
+#       g.yield i
+#     end
+#
+#     g.yield 'Z'
+#   }
+#
+#   # The same result as above
+#   while g.next?
+#     puts g.next
+#   end
+#   
+class Generator
+  include Enumerable
+
+  # Creates a new generator either from an Enumerable object or from a
+  # block.
+  #
+  # In the former, block is ignored even if given.
+  #
+  # In the latter, the given block is called with the generator
+  # itself, and expected to call the +yield+ method for each element.
+  def initialize(enum = nil, &block)
+    if enum
+      @block = proc { |g|
+	enum.each { |x| g.yield x }
+      }
+    else
+      @block = block
+    end
+
+    @index = 0
+    @queue = []
+    @cont_next = @cont_yield = @cont_endp = nil
+
+    if @cont_next = callcc { |c| c }
+      @block.call(self)
+
+      @cont_endp.call(nil) if @cont_endp
+    end
+
+    self
+  end
+
+  # Yields an element to the generator.
+  def yield(value)
+    if @cont_yield = callcc { |c| c }
+      @queue << value
+      @cont_next.call(nil)
+    end
+
+    self
+  end
+
+  # Returns true if the generator has reached the end.
+  def end?()
+    if @cont_endp = callcc { |c| c }
+      @cont_yield.nil? && @queue.empty?
+    else
+      @queue.empty?
+    end
+  end
+
+  # Returns true if the generator has not reached the end yet.
+  def next?()
+    !end?
+  end
+
+  # Returns the current index (position) counting from zero.
+  def index()
+    @index
+  end
+
+  # Returns the current index (position) counting from zero.
+  def pos()
+    @index
+  end
+
+  # Returns the element at the current position and moves forward.
+  def next()
+    if end?
+      raise EOFError, "no more elements available"
+    end
+
+    if @cont_next = callcc { |c| c }
+      @cont_yield.call(nil) if @cont_yield
+    end
+
+    @index += 1
+
+    @queue.shift
+  end
+
+  # Returns the element at the current position.
+  def current()
+    if @queue.empty?
+      raise EOFError, "no more elements available"
+    end
+
+    @queue.first
+  end
+
+  # Rewinds the generator.
+  def rewind()
+    initialize(nil, &@block) if @index.nonzero?
+
+    self
+  end
+
+  # Rewinds the generator and enumerates the elements.
+  def each
+    rewind
+
+    until end?
+      yield self.next
+    end
+
+    self
+  end
+end
+
+#
+# SyncEnumerator creates an Enumerable object from multiple Enumerable
+# objects and enumerates them synchronously.
+#
+# == Example
+#
+#   require 'generator'
+#
+#   s = SyncEnumerator.new([1,2,3], ['a', 'b', 'c'])
+#
+#   # Yields [1, 'a'], [2, 'b'], and [3,'c']
+#   s.each { |row| puts row.join(', ') }
+#
+class SyncEnumerator
+  include Enumerable
+
+  # Creates a new SyncEnumerator which enumerates rows of given
+  # Enumerable objects.
+  def initialize(*enums)
+    @gens = enums.map { |e| Generator.new(e) }
+  end
+
+  # Returns the number of enumerated Enumerable objects, i.e. the size
+  # of each row.
+  def size
+    @gens.size
+  end
+
+  # Returns the number of enumerated Enumerable objects, i.e. the size
+  # of each row.
+  def length
+    @gens.length
+  end
+
+  # Returns true if the given nth Enumerable object has reached the
+  # end.  If no argument is given, returns true if any of the
+  # Enumerable objects has reached the end.
+  def end?(i = nil)
+    if i.nil?
+      @gens.detect { |g| g.end? } ? true : false
+    else
+      @gens[i].end?
+    end
+  end
+
+  # Enumerates rows of the Enumerable objects.
+  def each
+    @gens.each { |g| g.rewind }
+
+    loop do
+      count = 0
+
+      ret = @gens.map { |g|
+	if g.end?
+	  count += 1
+	  nil
+	else
+	  g.next
+	end
+      }
+
+      if count == @gens.size
+	break
+      end
+
+      yield ret
+    end
+
+    self
+  end
+end
+
+if $0 == __FILE__
+  eval DATA.read, nil, $0, __LINE__+4
+end
+
+__END__
+
+require 'test/unit'
+
+class TC_Generator < Test::Unit::TestCase
+  def test_block1
+    g = Generator.new { |g|
+      # no yield's
+    }
+
+    assert_equal(0, g.pos)
+    assert_raises(EOFError) { g.current }
+  end
+
+  def test_block2
+    g = Generator.new { |g|
+      for i in 'A'..'C'
+        g.yield i
+      end
+
+      g.yield 'Z'
+    }
+
+    assert_equal(0, g.pos)
+    assert_equal('A', g.current)
+
+    assert_equal(true, g.next?)
+    assert_equal(0, g.pos)
+    assert_equal('A', g.current)
+    assert_equal(0, g.pos)
+    assert_equal('A', g.next)
+
+    assert_equal(1, g.pos)
+    assert_equal(true, g.next?)
+    assert_equal(1, g.pos)
+    assert_equal('B', g.current)
+    assert_equal(1, g.pos)
+    assert_equal('B', g.next)
+
+    assert_equal(g, g.rewind)
+
+    assert_equal(0, g.pos)
+    assert_equal('A', g.current)
+
+    assert_equal(true, g.next?)
+    assert_equal(0, g.pos)
+    assert_equal('A', g.current)
+    assert_equal(0, g.pos)
+    assert_equal('A', g.next)
+
+    assert_equal(1, g.pos)
+    assert_equal(true, g.next?)
+    assert_equal(1, g.pos)
+    assert_equal('B', g.current)
+    assert_equal(1, g.pos)
+    assert_equal('B', g.next)
+
+    assert_equal(2, g.pos)
+    assert_equal(true, g.next?)
+    assert_equal(2, g.pos)
+    assert_equal('C', g.current)
+    assert_equal(2, g.pos)
+    assert_equal('C', g.next)
+
+    assert_equal(3, g.pos)
+    assert_equal(true, g.next?)
+    assert_equal(3, g.pos)
+    assert_equal('Z', g.current)
+    assert_equal(3, g.pos)
+    assert_equal('Z', g.next)
+
+    assert_equal(4, g.pos)
+    assert_equal(false, g.next?)
+    assert_raises(EOFError) { g.next }
+  end
+
+  def test_each
+    a = [5, 6, 7, 8, 9]
+
+    g = Generator.new(a)
+
+    i = 0
+
+    g.each { |x|
+      assert_equal(a[i], x)
+
+      i += 1
+
+      break if i == 3
+    }
+
+    assert_equal(3, i)
+
+    i = 0
+
+    g.each { |x|
+      assert_equal(a[i], x)
+
+      i += 1
+    }
+
+    assert_equal(5, i)
+  end
+end
+
+class TC_SyncEnumerator < Test::Unit::TestCase
+  def test_each
+    r = ['a'..'f', 1..10, 10..20]
+    ra = r.map { |x| x.to_a }
+
+    a = (0...(ra.map {|x| x.size}.max)).map { |i| ra.map { |x| x[i] } }
+
+    s = SyncEnumerator.new(*r)
+
+    i = 0
+
+    s.each { |x|
+      assert_equal(a[i], x)
+
+      i += 1
+
+      break if i == 3
+    }
+
+    assert_equal(3, i)
+
+    i = 0
+
+    s.each { |x|
+      assert_equal(a[i], x)
+
+      i += 1
+    }
+
+    assert_equal(a.size, i)
+  end
+end
diff --git a/ruby_1_8_6/lib/getoptlong.rb b/ruby_1_8_6/lib/getoptlong.rb
new file mode 100644
index 0000000000..4d004419b1
--- /dev/null
+++ b/ruby_1_8_6/lib/getoptlong.rb
@@ -0,0 +1,621 @@
+#
+# GetoptLong for Ruby
+#
+# Copyright (C) 1998, 1999, 2000  Motoyuki Kasahara.
+#
+# You may redistribute and/or modify this library under the same license
+# terms as Ruby.
+#
+# See GetoptLong for documentation.
+#
+# Additional documents and the latest version of `getoptlong.rb' can be
+# found at http://www.sra.co.jp/people/m-kasahr/ruby/getoptlong/
+
+# The GetoptLong class allows you to parse command line options similarly to
+# the GNU getopt_long() C library call. Note, however, that GetoptLong is a 
+# pure Ruby implementation.
+#
+# GetoptLong allows for POSIX-style options like <tt>--file</tt> as well 
+# as single letter options like <tt>-f</tt>
+#
+# The empty option <tt>--</tt> (two minus symbols) is used to end option
+# processing. This can be particularly important if options have optional
+# arguments.
+#
+# Here is a simple example of usage:
+#
+#     # == Synopsis
+#     #
+#     # hello: greets user, demonstrates command line parsing
+#     #
+#     # == Usage
+#     #
+#     # hello [OPTION] ... DIR
+#     #
+#     # -h, --help:
+#     #    show help
+#     #
+#     # --repeat x, -n x:
+#     #    repeat x times
+#     #
+#     # --name [name]:
+#     #    greet user by name, if name not supplied default is John
+#     #
+#     # DIR: The directory in which to issue the greeting.
+#     
+#     require 'getoptlong'
+#     require 'rdoc/usage'
+#     
+#     opts = GetoptLong.new(
+#       [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
+#       [ '--repeat', '-n', GetoptLong::REQUIRED_ARGUMENT ],
+#       [ '--name', GetoptLong::OPTIONAL_ARGUMENT ]
+#     )
+#     
+#     dir = nil
+#     name = nil
+#     repetitions = 1
+#     opts.each do |opt, arg|
+#       case opt
+#         when '--help'
+#           RDoc::usage
+#         when '--repeat'
+#           repetitions = arg.to_i
+#         when '--name'
+#           if arg == ''
+#             name = 'John'
+#           else
+#             name = arg
+#           end
+#       end
+#     end
+#     
+#     if ARGV.length != 1
+#       puts "Missing dir argument (try --help)"
+#       exit 0
+#     end
+#     
+#     dir = ARGV.shift
+#     
+#     Dir.chdir(dir)
+#     for i in (1..repetitions)
+#       print "Hello"
+#       if name
+#         print ", #{name}"
+#       end
+#       puts
+#     end
+#
+# Example command line:
+#
+#     hello -n 6 --name -- /tmp
+#
+class GetoptLong
+  #
+  # Orderings.
+  #
+  ORDERINGS = [REQUIRE_ORDER = 0, PERMUTE = 1, RETURN_IN_ORDER = 2]
+
+  #
+  # Argument flags.
+  #
+  ARGUMENT_FLAGS = [NO_ARGUMENT = 0, REQUIRED_ARGUMENT = 1,
+    OPTIONAL_ARGUMENT = 2]
+
+  #
+  # Status codes.
+  #
+  STATUS_YET, STATUS_STARTED, STATUS_TERMINATED = 0, 1, 2
+
+  #
+  # Error types.
+  #
+  class Error  < StandardError; end
+  class AmbigousOption   < Error; end
+  class NeedlessArgument < Error; end
+  class MissingArgument  < Error; end
+  class InvalidOption    < Error; end
+
+  #
+  # Set up option processing.
+  #
+  # The options to support are passed to new() as an array of arrays.
+  # Each sub-array contains any number of String option names which carry 
+  # the same meaning, and one of the following flags:
+  #
+  # GetoptLong::NO_ARGUMENT :: Option does not take an argument.
+  #
+  # GetoptLong::REQUIRED_ARGUMENT :: Option always takes an argument.
+  #
+  # GetoptLong::OPTIONAL_ARGUMENT :: Option may or may not take an argument.
+  #
+  # The first option name is considered to be the preferred (canonical) name.
+  # Other than that, the elements of each sub-array can be in any order.
+  #
+  def initialize(*arguments)
+    #
+    # Current ordering.
+    #
+    if ENV.include?('POSIXLY_CORRECT')
+      @ordering = REQUIRE_ORDER
+    else
+      @ordering = PERMUTE
+    end
+
+    #
+    # Hash table of option names.
+    # Keys of the table are option names, and their values are canonical
+    # names of the options.
+    #
+    @canonical_names = Hash.new
+
+    #
+    # Hash table of argument flags.
+    # Keys of the table are option names, and their values are argument
+    # flags of the options.
+    #
+    @argument_flags = Hash.new
+
+    #
+    # Whether error messages are output to $deferr.
+    #
+    @quiet = FALSE
+
+    #
+    # Status code.
+    #
+    @status = STATUS_YET
+
+    #
+    # Error code.
+    #
+    @error = nil
+
+    #
+    # Error message.
+    #
+    @error_message = nil
+
+    #
+    # Rest of catenated short options.
+    #
+    @rest_singles = ''
+
+    #
+    # List of non-option-arguments.
+    # Append them to ARGV when option processing is terminated.
+    #
+    @non_option_arguments = Array.new
+
+    if 0 < arguments.length
+      set_options(*arguments)
+    end
+  end
+
+  #
+  # Set the handling of the ordering of options and arguments.
+  # A RuntimeError is raised if option processing has already started.
+  #
+  # The supplied value must be a member of GetoptLong::ORDERINGS. It alters
+  # the processing of options as follows:
+  #
+  # <b>REQUIRE_ORDER</b> :
+  # 
+  # Options are required to occur before non-options.
+  #
+  # Processing of options ends as soon as a word is encountered that has not
+  # been preceded by an appropriate option flag.
+  #
+  # For example, if -a and -b are options which do not take arguments,
+  # parsing command line arguments of '-a one -b two' would result in 
+  # 'one', '-b', 'two' being left in ARGV, and only ('-a', '') being 
+  # processed as an option/arg pair.
+  #
+  # This is the default ordering, if the environment variable
+  # POSIXLY_CORRECT is set. (This is for compatibility with GNU getopt_long.)
+  #
+  # <b>PERMUTE</b> :
+  #  
+  # Options can occur anywhere in the command line parsed. This is the 
+  # default behavior.
+  #
+  # Every sequence of words which can be interpreted as an option (with or
+  # without argument) is treated as an option; non-option words are skipped.
+  #
+  # For example, if -a does not require an argument and -b optionally takes
+  # an argument, parsing '-a one -b two three' would result in ('-a','') and
+  # ('-b', 'two') being processed as option/arg pairs, and 'one','three'
+  # being left in ARGV.
+  #
+  # If the ordering is set to PERMUTE but the environment variable
+  # POSIXLY_CORRECT is set, REQUIRE_ORDER is used instead. This is for
+  # compatibility with GNU getopt_long.
+  #
+  # <b>RETURN_IN_ORDER</b> :
+  #
+  # All words on the command line are processed as options. Words not 
+  # preceded by a short or long option flag are passed as arguments
+  # with an option of '' (empty string).
+  #
+  # For example, if -a requires an argument but -b does not, a command line
+  # of '-a one -b two three' would result in option/arg pairs of ('-a', 'one')
+  # ('-b', ''), ('', 'two'), ('', 'three') being processed.
+  #
+  def ordering=(ordering)
+    #
+    # The method is failed if option processing has already started.
+    #
+    if @status != STATUS_YET
+      set_error(ArgumentError, "argument error")
+      raise RuntimeError,
+	"invoke ordering=, but option processing has already started"
+    end
+
+    #
+    # Check ordering.
+    #
+    if !ORDERINGS.include?(ordering)
+      raise ArgumentError, "invalid ordering `#{ordering}'"
+    end
+    if ordering == PERMUTE && ENV.include?('POSIXLY_CORRECT')
+      @ordering = REQUIRE_ORDER
+    else
+      @ordering = ordering
+    end
+  end
+
+  #
+  # Return ordering.
+  #
+  attr_reader :ordering
+
+  #
+  # Set options. Takes the same argument as GetoptLong.new.
+  #
+  # Raises a RuntimeError if option processing has already started.
+  #
+  def set_options(*arguments)
+    #
+    # The method is failed if option processing has already started.
+    #
+    if @status != STATUS_YET
+      raise RuntimeError, 
+	"invoke set_options, but option processing has already started"
+    end
+
+    #
+    # Clear tables of option names and argument flags.
+    #
+    @canonical_names.clear
+    @argument_flags.clear
+
+    arguments.each do |arg|
+      #
+      # Each argument must be an Array.
+      #
+      if !arg.is_a?(Array)
+	raise ArgumentError, "the option list contains non-Array argument"
+      end
+
+      #
+      # Find an argument flag and it set to `argument_flag'.
+      #
+      argument_flag = nil
+      arg.each do |i|
+	if ARGUMENT_FLAGS.include?(i)
+	  if argument_flag != nil
+	    raise ArgumentError, "too many argument-flags"
+	  end
+	  argument_flag = i
+	end
+      end
+      raise ArgumentError, "no argument-flag" if argument_flag == nil
+
+      canonical_name = nil
+      arg.each do |i|
+	#
+	# Check an option name.
+	#
+	next if i == argument_flag
+	begin
+	  if !i.is_a?(String) || i !~ /^-([^-]|-.+)$/
+	    raise ArgumentError, "an invalid option `#{i}'"
+	  end
+	  if (@canonical_names.include?(i))
+	    raise ArgumentError, "option redefined `#{i}'"
+	  end
+	rescue
+	  @canonical_names.clear
+	  @argument_flags.clear
+	  raise
+	end
+
+	#
+	# Register the option (`i') to the `@canonical_names' and 
+	# `@canonical_names' Hashes.
+	#
+	if canonical_name == nil
+	  canonical_name = i
+	end
+	@canonical_names[i] = canonical_name
+	@argument_flags[i] = argument_flag
+      end
+      raise ArgumentError, "no option name" if canonical_name == nil
+    end
+    return self
+  end
+
+  #
+  # Set/Unset `quiet' mode.
+  #
+  attr_writer :quiet
+
+  #
+  # Return the flag of `quiet' mode.
+  #
+  attr_reader :quiet
+
+  #
+  # `quiet?' is an alias of `quiet'.
+  #
+  alias quiet? quiet
+
+  #
+  # Explicitly terminate option processing.
+  #
+  def terminate
+    return nil if @status == STATUS_TERMINATED
+    raise RuntimeError, "an error has occured" if @error != nil
+
+    @status = STATUS_TERMINATED
+    @non_option_arguments.reverse_each do |argument|
+      ARGV.unshift(argument)
+    end
+
+    @canonical_names = nil
+    @argument_flags = nil
+    @rest_singles = nil
+    @non_option_arguments = nil
+
+    return self
+  end
+
+  #
+  # Returns true if option processing has terminated, false otherwise.
+  #
+  def terminated?
+    return @status == STATUS_TERMINATED
+  end
+
+  #
+  # Set an error (protected).
+  #
+  def set_error(type, message)
+    $deferr.print("#{$0}: #{message}\n") if !@quiet
+
+    @error = type
+    @error_message = message
+    @canonical_names = nil
+    @argument_flags = nil
+    @rest_singles = nil
+    @non_option_arguments = nil
+
+    raise type, message
+  end
+  protected :set_error
+
+  #
+  # Examine whether an option processing is failed.
+  #
+  attr_reader :error
+
+  #
+  # `error?' is an alias of `error'.
+  #
+  alias error? error
+
+  # Return the appropriate error message in POSIX-defined format.
+  # If no error has occurred, returns nil.
+  #
+  def error_message
+    return @error_message
+  end
+
+  #
+  # Get next option name and its argument, as an Array of two elements.
+  #
+  # The option name is always converted to the first (preferred)
+  # name given in the original options to GetoptLong.new.
+  #
+  # Example: ['--option', 'value']
+  #
+  # Returns nil if the processing is complete (as determined by
+  # STATUS_TERMINATED).
+  #
+  def get
+    option_name, option_argument = nil, ''
+
+    #
+    # Check status.
+    #
+    return nil if @error != nil
+    case @status
+    when STATUS_YET
+      @status = STATUS_STARTED
+    when STATUS_TERMINATED
+      return nil
+    end
+
+    #
+    # Get next option argument.
+    #
+    if 0 < @rest_singles.length
+      argument = '-' + @rest_singles
+    elsif (ARGV.length == 0)
+      terminate
+      return nil
+    elsif @ordering == PERMUTE
+      while 0 < ARGV.length && ARGV[0] !~ /^-./
+	@non_option_arguments.push(ARGV.shift)
+      end
+      if ARGV.length == 0
+	terminate
+	return nil
+      end
+      argument = ARGV.shift
+    elsif @ordering == REQUIRE_ORDER 
+      if (ARGV[0] !~ /^-./)
+	terminate
+	return nil
+      end
+      argument = ARGV.shift
+    else
+      argument = ARGV.shift
+    end
+
+    #
+    # Check the special argument `--'.
+    # `--' indicates the end of the option list.
+    #
+    if argument == '--' && @rest_singles.length == 0
+      terminate
+      return nil
+    end
+
+    #
+    # Check for long and short options.
+    #
+    if argument =~ /^(--[^=]+)/ && @rest_singles.length == 0
+      #
+      # This is a long style option, which start with `--'.
+      #
+      pattern = $1
+      if @canonical_names.include?(pattern)
+	option_name = pattern
+      else
+	#
+	# The option `option_name' is not registered in `@canonical_names'.
+	# It may be an abbreviated.
+	#
+	match_count = 0
+	@canonical_names.each_key do |key|
+	  if key.index(pattern) == 0
+	    option_name = key
+	    match_count += 1
+	  end
+	end
+	if 2 <= match_count
+	  set_error(AmbigousOption, "option `#{argument}' is ambiguous")
+	elsif match_count == 0
+	  set_error(InvalidOption, "unrecognized option `#{argument}'")
+	end
+      end
+
+      #
+      # Check an argument to the option.
+      #
+      if @argument_flags[option_name] == REQUIRED_ARGUMENT
+	if argument =~ /=(.*)$/
+	  option_argument = $1
+	elsif 0 < ARGV.length
+	  option_argument = ARGV.shift
+	else
+	  set_error(MissingArgument,
+	            "option `#{argument}' requires an argument")
+	end
+      elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
+	if argument =~ /=(.*)$/
+	  option_argument = $1
+	elsif 0 < ARGV.length && ARGV[0] !~ /^-./
+	  option_argument = ARGV.shift
+	else
+	  option_argument = ''
+	end
+      elsif argument =~ /=(.*)$/
+	set_error(NeedlessArgument,
+		  "option `#{option_name}' doesn't allow an argument")
+      end
+
+    elsif argument =~ /^(-(.))(.*)/
+      #
+      # This is a short style option, which start with `-' (not `--').
+      # Short options may be catenated (e.g. `-l -g' is equivalent to
+      # `-lg').
+      #
+      option_name, ch, @rest_singles = $1, $2, $3
+
+      if @canonical_names.include?(option_name)
+	#
+	# The option `option_name' is found in `@canonical_names'.
+	# Check its argument.
+	#
+	if @argument_flags[option_name] == REQUIRED_ARGUMENT
+	  if 0 < @rest_singles.length
+	    option_argument = @rest_singles
+	    @rest_singles = ''
+	  elsif 0 < ARGV.length
+	    option_argument = ARGV.shift
+	  else
+	    # 1003.2 specifies the format of this message.
+	    set_error(MissingArgument, "option requires an argument -- #{ch}")
+	  end
+	elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
+	  if 0 < @rest_singles.length
+	    option_argument = @rest_singles
+	    @rest_singles = ''
+	  elsif 0 < ARGV.length && ARGV[0] !~ /^-./
+	    option_argument = ARGV.shift
+	  else
+	    option_argument = ''
+	  end
+	end
+      else
+	#
+	# This is an invalid option.
+	# 1003.2 specifies the format of this message.
+	#
+	if ENV.include?('POSIXLY_CORRECT')
+	  set_error(InvalidOption, "illegal option -- #{ch}")
+	else
+	  set_error(InvalidOption, "invalid option -- #{ch}")
+	end
+      end
+    else
+      #
+      # This is a non-option argument.
+      # Only RETURN_IN_ORDER falled into here.
+      #
+      return '', argument
+    end
+
+    return @canonical_names[option_name], option_argument
+  end
+
+  #
+  # `get_option' is an alias of `get'.
+  #
+  alias get_option get
+
+  # Iterator version of `get'.
+  #
+  # The block is called repeatedly with two arguments:
+  # The first is the option name.
+  # The second is the argument which followed it (if any). 
+  # Example: ('--opt', 'value')
+  #
+  # The option name is always converted to the first (preferred)
+  # name given in the original options to GetoptLong.new.
+  #
+  def each
+    loop do
+      option_name, option_argument = get_option
+      break if option_name == nil
+      yield option_name, option_argument
+    end
+  end
+
+  #
+  # `each_option' is an alias of `each'.
+  #
+  alias each_option each
+end
diff --git a/ruby_1_8_6/lib/getopts.rb b/ruby_1_8_6/lib/getopts.rb
new file mode 100644
index 0000000000..7124269351
--- /dev/null
+++ b/ruby_1_8_6/lib/getopts.rb
@@ -0,0 +1,127 @@
+#
+#               getopts.rb - 
+#                       $Release Version: $
+#                       $Revision$
+#                       $Date$
+#                       by Yasuo OHBA(SHL Japan Inc. Technology Dept.)
+#
+# --
+# this is obsolete; use getoptlong
+#
+# 2000-03-21
+# modified by Minero Aoki <aamine@dp.u-netsurf.ne.jp>
+#
+# 2002-03-05
+# rewritten by Akinori MUSHA <knu@ruby-lang.org>
+#
+
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: getopts is deprecated after Ruby 1.8.1; use optparse instead" if caller[0] and $VERBOSE
+
+$RCS_ID=%q$Header$
+
+# getopts is obsolete. Use GetoptLong.
+
+def getopts(single_options, *options)
+  boolopts = {}
+  valopts = {}
+
+  #
+  # set defaults
+  #
+  single_options.scan(/.:?/) do |opt|
+    if opt.size == 1
+      boolopts[opt] = false
+    else
+      valopts[opt[0, 1]] = nil
+    end
+  end if single_options
+
+  options.each do |arg|
+    opt, val = arg.split(':', 2)
+
+    if val
+      valopts[opt] = val.empty? ? nil : val
+    else
+      boolopts[opt] = false
+    end
+  end
+
+  #
+  # scan
+  #
+  c = 0
+  argv = ARGV
+
+  while arg = argv.shift
+    case arg
+    when /\A--(.*)/
+      if $1.empty?			# xinit -- -bpp 24
+	break
+      end
+
+      opt, val = $1.split('=', 2)
+
+      if opt.size == 1
+	argv.unshift arg
+	return nil
+      elsif valopts.key? opt		# imclean --src +trash
+	valopts[opt] = val || argv.shift or return nil
+      elsif boolopts.key? opt		# ruby --verbose
+	boolopts[opt] = true
+      else
+	argv.unshift arg
+	return nil
+      end
+
+      c += 1
+    when /\A-(.+)/
+      opts = $1
+
+      until opts.empty?
+	opt = opts.slice!(0, 1)
+
+	if valopts.key? opt
+	  val = opts
+
+	  if val.empty?			# ruby -e 'p $:'
+	    valopts[opt] = argv.shift or return nil
+	  else				# cc -ohello ...
+	    valopts[opt] = val
+	  end
+
+	  c += 1
+	  break
+	elsif boolopts.key? opt
+	  boolopts[opt] = true		# ruby -h
+	  c += 1
+	else
+	  argv.unshift arg
+	  return nil
+	end
+      end
+    else
+      argv.unshift arg
+      break
+    end
+  end
+
+  #
+  # set
+  #
+  $OPT = {}
+
+  boolopts.each do |opt, val|
+    $OPT[opt] = val
+
+    sopt = opt.gsub(/[^A-Za-z0-9_]/, '_')
+    eval "$OPT_#{sopt} = val"
+  end
+  valopts.each do |opt, val|
+    $OPT[opt] = val
+
+    sopt = opt.gsub(/[^A-Za-z0-9_]/, '_')
+    eval "$OPT_#{sopt} = val"
+  end
+
+  c
+end
diff --git a/ruby_1_8_6/lib/gserver.rb b/ruby_1_8_6/lib/gserver.rb
new file mode 100644
index 0000000000..eb5f31b7b3
--- /dev/null
+++ b/ruby_1_8_6/lib/gserver.rb
@@ -0,0 +1,253 @@
+#
+# Copyright (C) 2001 John W. Small All Rights Reserved
+#
+# Author::        John W. Small
+# Documentation:: Gavin Sinclair
+# Licence::       Freeware.
+#
+# See the class GServer for documentation.
+#
+
+require "socket"
+require "thread"
+
+#
+# GServer implements a generic server, featuring thread pool management,
+# simple logging, and multi-server management.  See HttpServer in 
+# <tt>xmlrpc/httpserver.rb</tt> in the Ruby standard library for an example of
+# GServer in action.
+#
+# Any kind of application-level server can be implemented using this class.
+# It accepts multiple simultaneous connections from clients, up to an optional
+# maximum number.  Several _services_ (i.e. one service per TCP port) can be
+# run simultaneously, and stopped at any time through the class method
+# <tt>GServer.stop(port)</tt>.  All the threading issues are handled, saving
+# you the effort.  All events are optionally logged, but you can provide your
+# own event handlers if you wish.
+#
+# === Example
+#
+# Using GServer is simple.  Below we implement a simple time server, run it,
+# query it, and shut it down.  Try this code in +irb+:
+#
+#   require 'gserver'
+#
+#   #
+#   # A server that returns the time in seconds since 1970.
+#   # 
+#   class TimeServer < GServer
+#     def initialize(port=10001, *args)
+#       super(port, *args)
+#     end
+#     def serve(io)
+#       io.puts(Time.now.to_i)
+#     end
+#   end
+#
+#   # Run the server with logging enabled (it's a separate thread).
+#   server = TimeServer.new
+#   server.audit = true                  # Turn logging on.
+#   server.start 
+#
+#   # *** Now point your browser to http://localhost:10001 to see it working ***
+#
+#   # See if it's still running. 
+#   GServer.in_service?(10001)           # -> true
+#   server.stopped?                      # -> false
+#
+#   # Shut the server down gracefully.
+#   server.shutdown
+#   
+#   # Alternatively, stop it immediately.
+#   GServer.stop(10001)
+#   # or, of course, "server.stop".
+#
+# All the business of accepting connections and exception handling is taken
+# care of.  All we have to do is implement the method that actually serves the
+# client.
+#
+# === Advanced
+#
+# As the example above shows, the way to use GServer is to subclass it to
+# create a specific server, overriding the +serve+ method.  You can override
+# other methods as well if you wish, perhaps to collect statistics, or emit
+# more detailed logging.
+#
+#   connecting
+#   disconnecting
+#   starting
+#   stopping
+#
+# The above methods are only called if auditing is enabled.
+#
+# You can also override +log+ and +error+ if, for example, you wish to use a
+# more sophisticated logging system.
+#
+class GServer
+
+  DEFAULT_HOST = "127.0.0.1"
+
+  def serve(io)
+  end
+
+  @@services = {}   # Hash of opened ports, i.e. services
+  @@servicesMutex = Mutex.new
+
+  def GServer.stop(port, host = DEFAULT_HOST)
+    @@servicesMutex.synchronize {
+      @@services[host][port].stop
+    }
+  end
+
+  def GServer.in_service?(port, host = DEFAULT_HOST)
+    @@services.has_key?(host) and
+      @@services[host].has_key?(port)
+  end
+
+  def stop
+    @connectionsMutex.synchronize  {
+      if @tcpServerThread
+        @tcpServerThread.raise "stop"
+      end
+    }
+  end
+
+  def stopped?
+    @tcpServerThread == nil
+  end
+
+  def shutdown
+    @shutdown = true
+  end
+
+  def connections
+    @connections.size
+  end
+
+  def join
+    @tcpServerThread.join if @tcpServerThread
+  end
+
+  attr_reader :port, :host, :maxConnections
+  attr_accessor :stdlog, :audit, :debug
+
+  def connecting(client)
+    addr = client.peeraddr
+    log("#{self.class.to_s} #{@host}:#{@port} client:#{addr[1]} " +
+        "#{addr[2]}<#{addr[3]}> connect")
+    true
+  end
+
+  def disconnecting(clientPort)
+    log("#{self.class.to_s} #{@host}:#{@port} " +
+      "client:#{clientPort} disconnect")
+  end
+
+  protected :connecting, :disconnecting
+
+  def starting()
+    log("#{self.class.to_s} #{@host}:#{@port} start")
+  end
+
+  def stopping()
+    log("#{self.class.to_s} #{@host}:#{@port} stop")
+  end
+
+  protected :starting, :stopping
+
+  def error(detail)
+    log(detail.backtrace.join("\n"))
+  end
+
+  def log(msg)
+    if @stdlog
+      @stdlog.puts("[#{Time.new.ctime}] %s" % msg)
+      @stdlog.flush
+    end
+  end
+
+  protected :error, :log
+
+  def initialize(port, host = DEFAULT_HOST, maxConnections = 4,
+    stdlog = $stderr, audit = false, debug = false)
+    @tcpServerThread = nil
+    @port = port
+    @host = host
+    @maxConnections = maxConnections
+    @connections = []
+    @connectionsMutex = Mutex.new
+    @connectionsCV = ConditionVariable.new
+    @stdlog = stdlog
+    @audit = audit
+    @debug = debug
+  end
+
+  def start(maxConnections = -1)
+    raise "running" if !stopped?
+    @shutdown = false
+    @maxConnections = maxConnections if maxConnections > 0
+    @@servicesMutex.synchronize  {
+      if GServer.in_service?(@port,@host)
+        raise "Port already in use: #{host}:#{@port}!"
+      end
+      @tcpServer = TCPServer.new(@host,@port)
+      @port = @tcpServer.addr[1]
+      @@services[@host] = {} unless @@services.has_key?(@host)
+      @@services[@host][@port] = self;
+    }
+    @tcpServerThread = Thread.new {
+      begin
+        starting if @audit
+        while !@shutdown
+          @connectionsMutex.synchronize  {
+             while @connections.size >= @maxConnections
+               @connectionsCV.wait(@connectionsMutex)
+             end
+          }
+          client = @tcpServer.accept
+          @connections << Thread.new(client)  { |myClient|
+            begin
+              myPort = myClient.peeraddr[1]
+              serve(myClient) if !@audit or connecting(myClient)
+            rescue => detail
+              error(detail) if @debug
+            ensure
+              begin
+                myClient.close
+              rescue
+              end
+              @connectionsMutex.synchronize {
+                @connections.delete(Thread.current)
+                @connectionsCV.signal
+              }
+              disconnecting(myPort) if @audit
+            end
+          }
+        end
+      rescue => detail
+        error(detail) if @debug
+      ensure
+        begin
+          @tcpServer.close
+        rescue
+        end
+        if @shutdown
+          @connectionsMutex.synchronize  {
+             while @connections.size > 0
+               @connectionsCV.wait(@connectionsMutex)
+             end
+          }
+        else
+          @connections.each { |c| c.raise "stop" }
+        end
+        @tcpServerThread = nil
+        @@servicesMutex.synchronize  {
+          @@services[@host].delete(@port)
+        }
+        stopping if @audit
+      end
+    }
+    self
+  end
+
+end
diff --git a/ruby_1_8_6/lib/importenv.rb b/ruby_1_8_6/lib/importenv.rb
new file mode 100644
index 0000000000..8e1ba33b1d
--- /dev/null
+++ b/ruby_1_8_6/lib/importenv.rb
@@ -0,0 +1,33 @@
+# importenv.rb -- imports environment variables as global variables, Perlish ;(
+#
+# Usage:
+#
+#  require 'importenv'
+#  p $USER
+#  $USER = "matz"
+#  p ENV["USER"]
+
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: importenv is deprecated after Ruby 1.8.1 (no replacement)"
+
+for k,v in ENV
+  next unless /^[a-zA-Z][_a-zA-Z0-9]*/ =~ k
+  eval <<EOS
+  $#{k} = v
+  trace_var "$#{k}", proc{|v|
+    ENV[%q!#{k}!] = v
+    $#{k} = v
+    if v == nil
+      untrace_var "$#{k}"
+    end
+  }
+EOS
+end
+
+if __FILE__ == $0
+  p $TERM
+  $TERM = nil
+  p $TERM
+  p ENV["TERM"]
+  $TERM = "foo"
+  p ENV["TERM"]
+end
diff --git a/ruby_1_8_6/lib/ipaddr.rb b/ruby_1_8_6/lib/ipaddr.rb
new file mode 100644
index 0000000000..17e47f016f
--- /dev/null
+++ b/ruby_1_8_6/lib/ipaddr.rb
@@ -0,0 +1,766 @@
+#
+# ipaddr.rb - A class to manipulate an IP address
+#
+# Copyright (c) 2002 Hajimu UMEMOTO <ume@mahoroba.org>.
+# All rights reserved.
+#
+# You can redistribute and/or modify it under the same terms as Ruby.
+#
+# $Id$
+#
+# TODO:
+#   - scope_id support
+require 'socket'
+
+unless Socket.const_defined? "AF_INET6"
+  class Socket
+    AF_INET6 = Object.new
+  end
+
+  class << IPSocket
+    def valid_v4?(addr)
+      if /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/ =~ addr
+        return $~.captures.all? {|i| i.to_i < 256}
+      end
+      return false
+    end
+
+    def valid_v6?(addr)
+      # IPv6 (normal)
+      return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*\Z/ =~ addr
+      return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/ =~ addr
+      return true if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/ =~ addr
+      # IPv6 (IPv4 compat)
+      return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:/ =~ addr && valid_v4?($')
+      return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_v4?($')
+      return true if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_v4?($')
+
+      false
+    end
+
+    def valid?(addr)
+      valid_v4?(addr) || valid_v6?(addr)
+    end
+
+    alias getaddress_orig getaddress
+    def getaddress(s)
+      if valid?(s)
+        s
+      elsif /\A[-A-Za-z\d.]+\Z/ =~ s
+        getaddress_orig(s)
+      else
+        raise ArgumentError, "invalid address"
+      end
+    end
+  end
+end
+
+# IPAddr provides a set of methods to manipulate an IP address.  Both IPv4 and
+# IPv6 are supported.
+#
+# == Example
+#
+#   require 'ipaddr'
+#   
+#   ipaddr1 = IPAddr.new "3ffe:505:2::1"
+#   
+#   p ipaddr1			#=> #<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0001/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff>
+#   
+#   p ipaddr1.to_s		#=> "3ffe:505:2::1"
+#   
+#   ipaddr2 = ipaddr1.mask(48)	#=> #<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0000/ffff:ffff:ffff:0000:0000:0000:0000:0000>
+#   
+#   p ipaddr2.to_s		#=> "3ffe:505:2::"
+#   
+#   ipaddr3 = IPAddr.new "192.168.2.0/24"
+#   
+#   p ipaddr3			#=> #<IPAddr: IPv4:192.168.2.0/255.255.255.0>
+
+class IPAddr
+
+  IN4MASK = 0xffffffff
+  IN6MASK = 0xffffffffffffffffffffffffffffffff
+  IN6FORMAT = (["%.4x"] * 8).join(':')
+
+  # Returns the address family of this IP address.
+  attr :family
+
+  # Creates a new ipaddr containing the given network byte ordered
+  # string form of an IP address.
+  def IPAddr::new_ntoh(addr)
+    return IPAddr.new(IPAddr::ntop(addr))
+  end
+
+  # Convert a network byte ordered string form of an IP address into
+  # human readable form.
+  def IPAddr::ntop(addr)
+    case addr.size
+    when 4
+      s = addr.unpack('C4').join('.')
+    when 16
+      s = IN6FORMAT % addr.unpack('n8')
+    else
+      raise ArgumentError, "unsupported address family"
+    end
+    return s
+  end
+
+  # Returns a new ipaddr built by bitwise AND.
+  def &(other)
+    return self.clone.set(@addr & other.to_i)
+  end
+
+  # Returns a new ipaddr built by bitwise OR.
+  def |(other)
+    return self.clone.set(@addr | other.to_i)
+  end
+
+  # Returns a new ipaddr built by bitwise right-shift.
+  def >>(num)
+    return self.clone.set(@addr >> num)
+  end
+
+  # Returns a new ipaddr built by bitwise left shift.
+  def <<(num)
+    return self.clone.set(addr_mask(@addr << num))
+  end
+
+  # Returns a new ipaddr built by bitwise negation.
+  def ~
+    return self.clone.set(addr_mask(~@addr))
+  end
+
+  # Returns true if two ipaddr are equal.
+  def ==(other)
+    if other.kind_of?(IPAddr) && @family != other.family
+      return false
+    end
+    return (@addr == other.to_i)
+  end
+
+  # Returns a new ipaddr built by masking IP address with the given
+  # prefixlen/netmask. (e.g. 8, 64, "255.255.255.0", etc.)
+  def mask(prefixlen)
+    return self.clone.mask!(prefixlen)
+  end
+
+  # Returns true if the given ipaddr is in the range.
+  #
+  # e.g.:
+  #   require 'ipaddr'
+  #   net1 = IPAddr.new("192.168.2.0/24")
+  #   p net1.include?(IPAddr.new("192.168.2.0"))	#=> true
+  #   p net1.include?(IPAddr.new("192.168.2.255"))	#=> true
+  #   p net1.include?(IPAddr.new("192.168.3.0"))	#=> false
+  def include?(other)
+    if ipv4_mapped?
+      if (@mask_addr >> 32) != 0xffffffffffffffffffffffff
+	return false
+      end
+      mask_addr = (@mask_addr & IN4MASK)
+      addr = (@addr & IN4MASK)
+      family = Socket::AF_INET
+    else
+      mask_addr = @mask_addr
+      addr = @addr
+      family = @family
+    end
+    if other.kind_of?(IPAddr)
+      if other.ipv4_mapped?
+	other_addr = (other.to_i & IN4MASK)
+	other_family = Socket::AF_INET
+      else
+	other_addr = other.to_i
+	other_family = other.family
+      end
+    else # Not IPAddr - assume integer in same family as us
+      other_addr   = other.to_i
+      other_family = family
+    end
+
+    if family != other_family
+      return false
+    end
+    return ((addr & mask_addr) == (other_addr & mask_addr))
+  end
+  alias === include?
+
+  # Returns the integer representation of the ipaddr.
+  def to_i
+    return @addr
+  end
+
+  # Returns a string containing the IP address representation.
+  def to_s
+    str = to_string
+    return str if ipv4?
+
+    str.gsub!(/\b0{1,3}([\da-f]+)\b/i, '\1')
+    loop do
+      break if str.sub!(/\A0:0:0:0:0:0:0:0\Z/, '::')
+      break if str.sub!(/\b0:0:0:0:0:0:0\b/, ':')
+      break if str.sub!(/\b0:0:0:0:0:0\b/, ':')
+      break if str.sub!(/\b0:0:0:0:0\b/, ':')
+      break if str.sub!(/\b0:0:0:0\b/, ':')
+      break if str.sub!(/\b0:0:0\b/, ':')
+      break if str.sub!(/\b0:0\b/, ':')
+      break
+    end
+    str.sub!(/:{3,}/, '::')
+
+    if /\A::(ffff:)?([\da-f]{1,4}):([\da-f]{1,4})\Z/i =~ str
+      str = sprintf('::%s%d.%d.%d.%d', $1, $2.hex / 256, $2.hex % 256, $3.hex / 256, $3.hex % 256)
+    end
+
+    str
+  end
+
+  # Returns a string containing the IP address representation in
+  # canonical form.
+  def to_string
+    return _to_string(@addr)
+  end
+
+  # Returns a network byte ordered string form of the IP address.
+  def hton
+    case @family
+    when Socket::AF_INET
+      return [@addr].pack('N')
+    when Socket::AF_INET6
+      return (0..7).map { |i|
+	(@addr >> (112 - 16 * i)) & 0xffff
+      }.pack('n8')
+    else
+      raise "unsupported address family"
+    end
+  end
+
+  # Returns true if the ipaddr is an IPv4 address.
+  def ipv4?
+    return @family == Socket::AF_INET
+  end
+
+  # Returns true if the ipaddr is an IPv6 address.
+  def ipv6?
+    return @family == Socket::AF_INET6
+  end
+
+  # Returns true if the ipaddr is an IPv4-mapped IPv6 address.
+  def ipv4_mapped?
+    return ipv6? && (@addr >> 32) == 0xffff
+  end
+
+  # Returns true if the ipaddr is an IPv4-compatible IPv6 address.
+  def ipv4_compat?
+    if !ipv6? || (@addr >> 32) != 0
+      return false
+    end
+    a = (@addr & IN4MASK)
+    return a != 0 && a != 1
+  end
+
+  # Returns a new ipaddr built by converting the native IPv4 address
+  # into an IPv4-mapped IPv6 address.
+  def ipv4_mapped
+    if !ipv4?
+      raise ArgumentError, "not an IPv4 address"
+    end
+    return self.clone.set(@addr | 0xffff00000000, Socket::AF_INET6)
+  end
+
+  # Returns a new ipaddr built by converting the native IPv4 address
+  # into an IPv4-compatible IPv6 address.
+  def ipv4_compat
+    if !ipv4?
+      raise ArgumentError, "not an IPv4 address"
+    end
+    return self.clone.set(@addr, Socket::AF_INET6)
+  end
+
+  # Returns a new ipaddr built by converting the IPv6 address into a
+  # native IPv4 address.  If the IP address is not an IPv4-mapped or
+  # IPv4-compatible IPv6 address, returns self.
+  def native
+    if !ipv4_mapped? && !ipv4_compat?
+      return self
+    end
+    return self.clone.set(@addr & IN4MASK, Socket::AF_INET)
+  end
+
+  # Returns a string for DNS reverse lookup.  It returns a string in
+  # RFC3172 form for an IPv6 address.
+  def reverse
+    case @family
+    when Socket::AF_INET
+      return _reverse + ".in-addr.arpa"
+    when Socket::AF_INET6
+      return ip6_arpa
+    else
+      raise "unsupported address family"
+    end
+  end
+
+  # Returns a string for DNS reverse lookup compatible with RFC3172.
+  def ip6_arpa
+    if !ipv6?
+      raise ArgumentError, "not an IPv6 address"
+    end
+    return _reverse + ".ip6.arpa"
+  end
+
+  # Returns a string for DNS reverse lookup compatible with RFC1886.
+  def ip6_int
+    if !ipv6?
+      raise ArgumentError, "not an IPv6 address"
+    end
+    return _reverse + ".ip6.int"
+  end
+
+  # Returns a string containing a human-readable representation of the
+  # ipaddr. ("#<IPAddr: family:address/mask>")
+  def inspect
+    case @family
+    when Socket::AF_INET
+      af = "IPv4"
+    when Socket::AF_INET6
+      af = "IPv6"
+    else
+      raise "unsupported address family"
+    end
+    return sprintf("#<%s: %s:%s/%s>", self.class.name,
+		   af, _to_string(@addr), _to_string(@mask_addr))
+  end
+
+  protected
+
+  def set(addr, *family)
+    case family[0] ? family[0] : @family
+    when Socket::AF_INET
+      if addr < 0 || addr > IN4MASK
+	raise ArgumentError, "invalid address"
+      end
+    when Socket::AF_INET6
+      if addr < 0 || addr > IN6MASK
+	raise ArgumentError, "invalid address"
+      end
+    else
+      raise ArgumentError, "unsupported address family"
+    end
+    @addr = addr
+    if family[0]
+      @family = family[0]
+    end
+    return self
+  end
+
+  def mask!(mask)
+    if mask.kind_of?(String)
+      if mask =~ /^\d+$/
+	prefixlen = mask.to_i
+      else
+	m = IPAddr.new(mask)
+	if m.family != @family
+	  raise ArgumentError, "address family is not same"
+	end
+	@mask_addr = m.to_i
+	@addr &= @mask_addr
+	return self
+      end
+    else
+      prefixlen = mask
+    end
+    case @family
+    when Socket::AF_INET
+      if prefixlen < 0 || prefixlen > 32
+	raise ArgumentError, "invalid length"
+      end
+      masklen = 32 - prefixlen
+      @mask_addr = ((IN4MASK >> masklen) << masklen)
+    when Socket::AF_INET6
+      if prefixlen < 0 || prefixlen > 128
+	raise ArgumentError, "invalid length"
+      end
+      masklen = 128 - prefixlen
+      @mask_addr = ((IN6MASK >> masklen) << masklen)
+    else
+      raise "unsupported address family"
+    end
+    @addr = ((@addr >> masklen) << masklen)
+    return self
+  end
+
+  private
+
+  # Creates a new ipaddr containing the given human readable form of
+  # an IP address.  It also accepts `address/prefixlen' and
+  # `address/mask'.  When prefixlen or mask is specified, it returns a
+  # masked ipaddr.  IPv6 address may beenclosed with `[' and `]'.
+  #
+  # Although an address family is determined automatically from a
+  # specified address, you can specify an address family explicitly by
+  # the optional second argument.
+  def initialize(addr = '::', family = Socket::AF_UNSPEC)
+    if !addr.kind_of?(String)
+      if family != Socket::AF_INET6 && family != Socket::AF_INET
+	raise ArgumentError, "unsupported address family"
+      end
+      set(addr, family)
+      @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
+      return
+    end
+    prefix, prefixlen = addr.split('/')
+    if prefix =~ /^\[(.*)\]$/i
+      prefix = $1
+      family = Socket::AF_INET6
+    end
+    # It seems AI_NUMERICHOST doesn't do the job.
+    #Socket.getaddrinfo(left, nil, Socket::AF_INET6, Socket::SOCK_STREAM, nil,
+    #		       Socket::AI_NUMERICHOST)
+    begin
+      IPSocket.getaddress(prefix)		# test if address is vaild
+    rescue
+      raise ArgumentError, "invalid address"
+    end
+    @addr = @family = nil
+    if family == Socket::AF_UNSPEC || family == Socket::AF_INET
+      @addr = in_addr(prefix)
+      if @addr
+	@family = Socket::AF_INET
+      end
+    end
+    if !@addr && (family == Socket::AF_UNSPEC || family == Socket::AF_INET6)
+      @addr = in6_addr(prefix)
+      @family = Socket::AF_INET6
+    end
+    if family != Socket::AF_UNSPEC && @family != family
+      raise ArgumentError, "address family unmatch"
+    end
+    if prefixlen
+      mask!(prefixlen)
+    else
+      @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
+    end
+  end
+
+  def in_addr(addr)
+    if addr =~ /^\d+\.\d+\.\d+\.\d+$/
+      n = 0
+      addr.split('.').each { |i|
+	n <<= 8
+	n += i.to_i
+      }
+      return n
+    end
+    return nil
+  end
+
+  def in6_addr(left)
+    case left
+    when /^::ffff:(\d+\.\d+\.\d+\.\d+)$/i
+      return in_addr($1) + 0xffff00000000
+    when /^::(\d+\.\d+\.\d+\.\d+)$/i
+      return in_addr($1)
+    when /[^0-9a-f:]/i
+      raise ArgumentError, "invalid address"
+    when /^(.*)::(.*)$/
+      left, right = $1, $2
+    else
+      right = ''
+    end
+    l = left.split(':')
+    r = right.split(':')
+    rest = 8 - l.size - r.size
+    if rest < 0
+      return nil
+    end
+    a = [l, Array.new(rest, '0'), r].flatten!
+    n = 0
+    a.each { |i|
+      n <<= 16
+      n += i.hex
+    }
+    return n
+  end
+
+  def addr_mask(addr)
+    case @family
+    when Socket::AF_INET
+      addr &= IN4MASK
+    when Socket::AF_INET6
+      addr &= IN6MASK
+    else
+      raise "unsupported address family"
+    end
+    return addr
+  end
+
+  def _reverse
+    case @family
+    when Socket::AF_INET
+      return (0..3).map { |i|
+	(@addr >> (8 * i)) & 0xff
+      }.join('.')
+    when Socket::AF_INET6
+      return ("%.32x" % @addr).reverse!.gsub!(/.(?!$)/, '\&.')
+    else
+      raise "unsupported address family"
+    end
+  end
+
+  def _to_string(addr)
+    case @family
+    when Socket::AF_INET
+      return (0..3).map { |i|
+	(addr >> (24 - 8 * i)) & 0xff
+      }.join('.')
+    when Socket::AF_INET6
+      return (("%.32x" % addr).gsub!(/.{4}(?!$)/, '\&:'))
+    else
+      raise "unsupported address family"
+    end
+  end
+
+end
+
+if $0 == __FILE__
+  eval DATA.read, nil, $0, __LINE__+4
+end
+
+__END__
+
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'
+
+class TC_IPAddr < Test::Unit::TestCase
+  def test_s_new
+    assert_nothing_raised {
+      IPAddr.new("3FFE:505:ffff::/48")
+      IPAddr.new("0:0:0:1::")
+      IPAddr.new("2001:200:300::/48")
+    }
+
+    a = IPAddr.new
+    assert_equal("::", a.to_s)
+    assert_equal("0000:0000:0000:0000:0000:0000:0000:0000", a.to_string)
+    assert_equal(Socket::AF_INET6, a.family)
+
+    a = IPAddr.new("0123:4567:89ab:cdef:0ABC:DEF0:1234:5678")
+    assert_equal("123:4567:89ab:cdef:abc:def0:1234:5678", a.to_s)
+    assert_equal("0123:4567:89ab:cdef:0abc:def0:1234:5678", a.to_string)
+    assert_equal(Socket::AF_INET6, a.family)
+
+    a = IPAddr.new("3ffe:505:2::/48")
+    assert_equal("3ffe:505:2::", a.to_s)
+    assert_equal("3ffe:0505:0002:0000:0000:0000:0000:0000", a.to_string)
+    assert_equal(Socket::AF_INET6, a.family)
+    assert_equal(false, a.ipv4?)
+    assert_equal(true, a.ipv6?)
+    assert_equal("#<IPAddr: IPv6:3ffe:0505:0002:0000:0000:0000:0000:0000/ffff:ffff:ffff:0000:0000:0000:0000:0000>", a.inspect)
+
+    a = IPAddr.new("3ffe:505:2::/ffff:ffff:ffff::")
+    assert_equal("3ffe:505:2::", a.to_s)
+    assert_equal("3ffe:0505:0002:0000:0000:0000:0000:0000", a.to_string)
+    assert_equal(Socket::AF_INET6, a.family)
+
+    a = IPAddr.new("0.0.0.0")
+    assert_equal("0.0.0.0", a.to_s)
+    assert_equal("0.0.0.0", a.to_string)
+    assert_equal(Socket::AF_INET, a.family)
+
+    a = IPAddr.new("192.168.1.2")
+    assert_equal("192.168.1.2", a.to_s)
+    assert_equal("192.168.1.2", a.to_string)
+    assert_equal(Socket::AF_INET, a.family)
+    assert_equal(true, a.ipv4?)
+    assert_equal(false, a.ipv6?)
+
+    a = IPAddr.new("192.168.1.2/24")
+    assert_equal("192.168.1.0", a.to_s)
+    assert_equal("192.168.1.0", a.to_string)
+    assert_equal(Socket::AF_INET, a.family)
+    assert_equal("#<IPAddr: IPv4:192.168.1.0/255.255.255.0>", a.inspect)
+
+    a = IPAddr.new("192.168.1.2/255.255.255.0")
+    assert_equal("192.168.1.0", a.to_s)
+    assert_equal("192.168.1.0", a.to_string)
+    assert_equal(Socket::AF_INET, a.family)
+
+    assert_equal("0:0:0:1::", IPAddr.new("0:0:0:1::").to_s)
+    assert_equal("2001:200:300::", IPAddr.new("2001:200:300::/48").to_s)
+
+    assert_equal("2001:200:300::", IPAddr.new("[2001:200:300::]/48").to_s)
+
+    [
+      ["fe80::1%fxp0"],
+      ["::1/255.255.255.0"],
+      ["::1:192.168.1.2/120"],
+      [IPAddr.new("::1").to_i],
+      ["::ffff:192.168.1.2/120", Socket::AF_INET],
+      ["[192.168.1.2]/120"],
+    ].each { |args|
+      assert_raises(ArgumentError) {
+	IPAddr.new(*args)
+      }
+    }
+  end
+
+  def test_s_new_ntoh
+    addr = ''
+    IPAddr.new("1234:5678:9abc:def0:1234:5678:9abc:def0").hton.each_byte { |c|
+      addr += sprintf("%02x", c)
+    }
+    assert_equal("123456789abcdef0123456789abcdef0", addr)
+    addr = ''
+    IPAddr.new("123.45.67.89").hton.each_byte { |c|
+      addr += sprintf("%02x", c)
+    }
+    assert_equal(sprintf("%02x%02x%02x%02x", 123, 45, 67, 89), addr)
+    a = IPAddr.new("3ffe:505:2::")
+    assert_equal("3ffe:505:2::", IPAddr.new_ntoh(a.hton).to_s)
+    a = IPAddr.new("192.168.2.1")
+    assert_equal("192.168.2.1", IPAddr.new_ntoh(a.hton).to_s)
+  end
+
+  def test_ipv4_compat
+    a = IPAddr.new("::192.168.1.2")
+    assert_equal("::192.168.1.2", a.to_s)
+    assert_equal("0000:0000:0000:0000:0000:0000:c0a8:0102", a.to_string)
+    assert_equal(Socket::AF_INET6, a.family)
+    assert_equal(true, a.ipv4_compat?)
+    b = a.native
+    assert_equal("192.168.1.2", b.to_s)
+    assert_equal(Socket::AF_INET, b.family)
+    assert_equal(false, b.ipv4_compat?)
+
+    a = IPAddr.new("192.168.1.2")
+    b = a.ipv4_compat
+    assert_equal("::192.168.1.2", b.to_s)
+    assert_equal(Socket::AF_INET6, b.family)
+  end
+
+  def test_ipv4_mapped
+    a = IPAddr.new("::ffff:192.168.1.2")
+    assert_equal("::ffff:192.168.1.2", a.to_s)
+    assert_equal("0000:0000:0000:0000:0000:ffff:c0a8:0102", a.to_string)
+    assert_equal(Socket::AF_INET6, a.family)
+    assert_equal(true, a.ipv4_mapped?)
+    b = a.native
+    assert_equal("192.168.1.2", b.to_s)
+    assert_equal(Socket::AF_INET, b.family)
+    assert_equal(false, b.ipv4_mapped?)
+
+    a = IPAddr.new("192.168.1.2")
+    b = a.ipv4_mapped
+    assert_equal("::ffff:192.168.1.2", b.to_s)
+    assert_equal(Socket::AF_INET6, b.family)
+  end
+
+  def test_reverse
+    assert_equal("f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.arpa", IPAddr.new("3ffe:505:2::f").reverse)
+    assert_equal("1.2.168.192.in-addr.arpa", IPAddr.new("192.168.2.1").reverse)
+  end
+
+  def test_ip6_arpa
+    assert_equal("f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.arpa", IPAddr.new("3ffe:505:2::f").ip6_arpa)
+    assert_raises(ArgumentError) {
+      IPAddr.new("192.168.2.1").ip6_arpa
+    }
+  end
+
+  def test_ip6_int
+    assert_equal("f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.int", IPAddr.new("3ffe:505:2::f").ip6_int)
+    assert_raises(ArgumentError) {
+      IPAddr.new("192.168.2.1").ip6_int
+    }
+  end
+
+  def test_to_s
+    assert_equal("3ffe:0505:0002:0000:0000:0000:0000:0001", IPAddr.new("3ffe:505:2::1").to_string)
+    assert_equal("3ffe:505:2::1", IPAddr.new("3ffe:505:2::1").to_s)
+  end
+end
+
+class TC_Operator < Test::Unit::TestCase
+
+  IN6MASK32  = "ffff:ffff::"
+  IN6MASK128 = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"
+
+  def setup
+    @in6_addr_any = IPAddr.new()
+    @a = IPAddr.new("3ffe:505:2::/48")
+    @b = IPAddr.new("0:0:0:1::")
+    @c = IPAddr.new(IN6MASK32)
+  end
+  alias set_up setup
+
+  def test_or
+    assert_equal("3ffe:505:2:1::", (@a | @b).to_s)
+    a = @a
+    a |= @b
+    assert_equal("3ffe:505:2:1::", a.to_s)
+    assert_equal("3ffe:505:2::", @a.to_s)
+    assert_equal("3ffe:505:2:1::",
+		 (@a | 0x00000000000000010000000000000000).to_s)
+  end
+
+  def test_and
+    assert_equal("3ffe:505::", (@a & @c).to_s)
+    a = @a
+    a &= @c
+    assert_equal("3ffe:505::", a.to_s)
+    assert_equal("3ffe:505:2::", @a.to_s)
+    assert_equal("3ffe:505::", (@a & 0xffffffff000000000000000000000000).to_s)
+  end
+
+  def test_shift_right
+    assert_equal("0:3ffe:505:2::", (@a >> 16).to_s)
+    a = @a
+    a >>= 16
+    assert_equal("0:3ffe:505:2::", a.to_s)
+    assert_equal("3ffe:505:2::", @a.to_s)
+  end
+
+  def test_shift_left
+    assert_equal("505:2::", (@a << 16).to_s)
+    a = @a
+    a <<= 16
+    assert_equal("505:2::", a.to_s)
+    assert_equal("3ffe:505:2::", @a.to_s)
+  end
+
+  def test_carrot
+    a = ~@in6_addr_any
+    assert_equal(IN6MASK128, a.to_s)
+    assert_equal("::", @in6_addr_any.to_s)
+  end
+
+  def test_equal
+    assert_equal(true, @a == IPAddr.new("3ffe:505:2::"))
+    assert_equal(false, @a == IPAddr.new("3ffe:505:3::"))
+    assert_equal(true, @a != IPAddr.new("3ffe:505:3::"))
+    assert_equal(false, @a != IPAddr.new("3ffe:505:2::"))
+  end
+
+  def test_mask
+    a = @a.mask(32)
+    assert_equal("3ffe:505::", a.to_s)
+    assert_equal("3ffe:505:2::", @a.to_s)
+  end
+
+  def test_include?
+    assert_equal(true, @a.include?(IPAddr.new("3ffe:505:2::")))
+    assert_equal(true, @a.include?(IPAddr.new("3ffe:505:2::1")))
+    assert_equal(false, @a.include?(IPAddr.new("3ffe:505:3::")))
+    net1 = IPAddr.new("192.168.2.0/24")
+    assert_equal(true, net1.include?(IPAddr.new("192.168.2.0")))
+    assert_equal(true, net1.include?(IPAddr.new("192.168.2.255")))
+    assert_equal(false, net1.include?(IPAddr.new("192.168.3.0")))
+    # test with integer parameter
+    int = (192 << 24) + (168 << 16) + (2 << 8) + 13
+
+    assert_equal(true, net1.include?(int))
+    assert_equal(false, net1.include?(int+255))
+
+  end
+
+end
diff --git a/ruby_1_8_6/lib/irb.rb b/ruby_1_8_6/lib/irb.rb
new file mode 100644
index 0000000000..1fb4397e68
--- /dev/null
+++ b/ruby_1_8_6/lib/irb.rb
@@ -0,0 +1,342 @@
+#
+#   irb.rb - irb main module
+#   	$Release Version: 0.9.5 $
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#
+#
+require "e2mmap"
+
+require "irb/init"
+require "irb/context"
+require "irb/extend-command"
+#require "irb/workspace"
+
+require "irb/ruby-lex"
+require "irb/input-method"
+require "irb/locale"
+
+STDOUT.sync = true
+
+module IRB
+  @RCS_ID='-$Id$-'
+
+  class Abort < Exception;end
+
+  #
+  @CONF = {}
+
+  def IRB.conf
+    @CONF
+  end
+
+  # IRB version method
+  def IRB.version
+    if v = @CONF[:VERSION] then return v end
+
+    require "irb/version"
+    rv = @RELEASE_VERSION.sub(/\.0/, "")
+    @CONF[:VERSION] = format("irb %s(%s)", rv, @LAST_UPDATE_DATE)
+  end
+
+  def IRB.CurrentContext
+    IRB.conf[:MAIN_CONTEXT]
+  end
+
+  # initialize IRB and start TOP_LEVEL irb
+  def IRB.start(ap_path = nil)
+    $0 = File::basename(ap_path, ".rb") if ap_path
+
+    IRB.setup(ap_path)
+
+    if @CONF[:SCRIPT]
+      irb = Irb.new(nil, @CONF[:SCRIPT])
+    else
+      irb = Irb.new
+    end
+
+    @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
+    @CONF[:MAIN_CONTEXT] = irb.context
+
+    trap("SIGINT") do
+      irb.signal_handle
+    end
+    
+    catch(:IRB_EXIT) do
+      irb.eval_input
+    end
+#    print "\n"
+  end
+
+  def IRB.irb_exit(irb, ret)
+    throw :IRB_EXIT, ret
+  end
+
+  def IRB.irb_abort(irb, exception = Abort)
+    if defined? Thread
+      irb.context.thread.raise exception, "abort then interrupt!!"
+    else
+      raise exception, "abort then interrupt!!"
+    end
+  end
+
+  #
+  # irb interpriter main routine 
+  #
+  class Irb
+    def initialize(workspace = nil, input_method = nil, output_method = nil)
+      @context = Context.new(self, workspace, input_method, output_method)
+      @context.main.extend ExtendCommandBundle
+      @signal_status = :IN_IRB
+
+      @scanner = RubyLex.new
+      @scanner.exception_on_syntax_error = false
+    end
+    attr_reader :context
+    attr_accessor :scanner
+
+    def eval_input
+      @scanner.set_prompt do
+	|ltype, indent, continue, line_no|
+	if ltype
+	  f = @context.prompt_s
+	elsif continue
+	  f = @context.prompt_c
+	elsif indent > 0
+	  f = @context.prompt_n
+	else @context.prompt_i
+	  f = @context.prompt_i
+	end
+	f = "" unless f
+	if @context.prompting?
+	  @context.io.prompt = p = prompt(f, ltype, indent, line_no)
+	else
+	  @context.io.prompt = p = ""
+	end
+	if @context.auto_indent_mode
+	  unless ltype
+            ind = prompt(@context.prompt_i, ltype, indent, line_no)[/.*\z/].size +
+	      indent * 2 - p.size
+	    ind += 2 if continue
+	    @context.io.prompt = p + " " * ind if ind > 0
+	  end
+	end
+      end
+       
+      @scanner.set_input(@context.io) do
+	signal_status(:IN_INPUT) do
+	  if l = @context.io.gets
+	    print l if @context.verbose?
+	  else
+	    if @context.ignore_eof? and @context.io.readable_atfer_eof?
+	      l = "\n"
+	      if @context.verbose?
+		printf "Use \"exit\" to leave %s\n", @context.ap_name
+	      end
+	    end
+	  end
+	  l
+	end
+      end
+
+      @scanner.each_top_level_statement do |line, line_no|
+	signal_status(:IN_EVAL) do
+	  begin
+            line.untaint
+	    @context.evaluate(line, line_no)
+	    output_value if @context.echo?
+	  rescue StandardError, ScriptError, Abort
+	    $! = RuntimeError.new("unknown exception raised") unless $!
+	    print $!.class, ": ", $!, "\n"
+	    if  $@[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && $!.class.to_s !~ /^IRB/
+	      irb_bug = true 
+	    else
+	      irb_bug = false
+	    end
+	    
+	    messages = []
+	    lasts = []
+	    levels = 0
+	    for m in $@
+	      m = @context.workspace.filter_backtrace(m) unless irb_bug
+	      if m
+		if messages.size < @context.back_trace_limit
+		  messages.push "\tfrom "+m
+		else
+		  lasts.push "\tfrom "+m
+		  if lasts.size > @context.back_trace_limit
+		    lasts.shift 
+		    levels += 1
+		  end
+		end
+	      end
+	    end
+	    print messages.join("\n"), "\n"
+	    unless lasts.empty?
+	      printf "... %d levels...\n", levels if levels > 0
+	      print lasts.join("\n")
+	    end
+	    print "Maybe IRB bug!!\n" if irb_bug
+	  end
+          if $SAFE > 2
+            warn "Error: irb does not work for $SAFE level higher than 2"
+            exit 1
+          end
+	end
+      end
+    end
+
+    def suspend_name(path = nil, name = nil)
+      @context.irb_path, back_path = path, @context.irb_path if path
+      @context.irb_name, back_name = name, @context.irb_name if name
+      begin
+	yield back_path, back_name
+      ensure
+	@context.irb_path = back_path if path
+	@context.irb_name = back_name if name
+      end
+    end
+
+    def suspend_workspace(workspace)
+      @context.workspace, back_workspace = workspace, @context.workspace
+      begin
+	yield back_workspace
+      ensure
+	@context.workspace = back_workspace
+      end
+    end
+
+    def suspend_input_method(input_method)
+      back_io = @context.io
+      @context.instance_eval{@io = input_method}
+      begin
+	yield back_io
+      ensure
+	@context.instance_eval{@io = back_io}
+      end
+    end
+
+    def suspend_context(context)
+      @context, back_context = context, @context
+      begin
+	yield back_context
+      ensure
+	@context = back_context
+      end
+    end
+
+    def signal_handle
+      unless @context.ignore_sigint?
+	print "\nabort!!\n" if @context.verbose?
+	exit
+      end
+
+      case @signal_status
+      when :IN_INPUT
+	print "^C\n"
+	raise RubyLex::TerminateLineInput
+      when :IN_EVAL
+	IRB.irb_abort(self)
+      when :IN_LOAD
+	IRB.irb_abort(self, LoadAbort)
+      when :IN_IRB
+	# ignore
+      else
+	# ignore other cases as well
+      end
+    end
+
+    def signal_status(status)
+      return yield if @signal_status == :IN_LOAD
+
+      signal_status_back = @signal_status
+      @signal_status = status
+      begin
+	yield
+      ensure
+	@signal_status = signal_status_back
+      end
+    end
+
+    def prompt(prompt, ltype, indent, line_no)
+      p = prompt.dup
+      p.gsub!(/%([0-9]+)?([a-zA-Z])/) do
+	case $2
+	when "N"
+	  @context.irb_name
+	when "m"
+	  @context.main.to_s
+	when "M"
+	  @context.main.inspect
+	when "l"
+	  ltype
+	when "i"
+	  if $1 
+	    format("%" + $1 + "d", indent)
+	  else
+	    indent.to_s
+	  end
+	when "n"
+	  if $1 
+	    format("%" + $1 + "d", line_no)
+	  else
+	    line_no.to_s
+	  end
+	when "%"
+	  "%"
+	end
+      end
+      p
+    end
+
+    def output_value
+      if @context.inspect?
+        printf @context.return_format, @context.last_value.inspect
+      else
+        printf @context.return_format, @context.last_value
+      end
+    end
+
+    def inspect
+      ary = []
+      for iv in instance_variables
+	case iv
+	when "@signal_status"
+	  ary.push format("%s=:%s", iv, @signal_status.id2name)
+	when "@context"
+	  ary.push format("%s=%s", iv, eval(iv).__to_s__)
+	else
+	  ary.push format("%s=%s", iv, eval(iv))
+	end
+      end
+      format("#<%s: %s>", self.class, ary.join(", "))
+    end
+  end
+
+  # Singleton method
+  def @CONF.inspect
+    IRB.version unless self[:VERSION]
+
+    array = []
+    for k, v in sort{|a1, a2| a1[0].id2name <=> a2[0].id2name}
+      case k
+      when :MAIN_CONTEXT, :__TMP__EHV__
+	array.push format("CONF[:%s]=...myself...", k.id2name)
+      when :PROMPT
+	s = v.collect{
+	  |kk, vv|
+	  ss = vv.collect{|kkk, vvv| ":#{kkk.id2name}=>#{vvv.inspect}"}
+	  format(":%s=>{%s}", kk.id2name, ss.join(", "))
+	}
+	array.push format("CONF[:%s]={%s}", k.id2name, s.join(", "))
+      else
+	array.push format("CONF[:%s]=%s", k.id2name, v.inspect)
+      end
+    end
+    array.join("\n")
+  end
+end
diff --git a/ruby_1_8_6/lib/irb/cmd/chws.rb b/ruby_1_8_6/lib/irb/cmd/chws.rb
new file mode 100644
index 0000000000..88585b778b
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/cmd/chws.rb
@@ -0,0 +1,33 @@
+#
+#   change-ws.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+require "irb/cmd/nop.rb"
+require "irb/ext/change-ws.rb"
+
+module IRB
+  module ExtendCommand
+
+    class CurrentWorkingWorkspace<Nop
+      def execute(*obj)
+	irb_context.main
+      end
+    end
+
+    class ChangeWorkspace<Nop
+      def execute(*obj)
+	irb_context.change_workspace(*obj)
+	irb_context.main
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/lib/irb/cmd/fork.rb b/ruby_1_8_6/lib/irb/cmd/fork.rb
new file mode 100644
index 0000000000..2866b1373b
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/cmd/fork.rb
@@ -0,0 +1,39 @@
+#
+#   fork.rb - 
+#   	$Release Version: 0.9.5 $
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+@RCS_ID='-$Id$-'
+
+
+module IRB
+  module ExtendCommand
+    class Fork<Nop
+      def execute(&block)
+	pid = send ExtendCommand.irb_original_method_name("fork")
+	unless pid 
+	  class<<self
+	    alias_method :exit, ExtendCommand.irb_original_method_name('exit')
+	  end
+	  if iterator?
+	    begin
+	      yield
+	    ensure
+	      exit
+	    end
+	  end
+	end
+	pid
+      end
+    end
+  end
+end
+
+
diff --git a/ruby_1_8_6/lib/irb/cmd/help.rb b/ruby_1_8_6/lib/irb/cmd/help.rb
new file mode 100644
index 0000000000..3e8d1388e0
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/cmd/help.rb
@@ -0,0 +1,34 @@
+#
+#   help.rb - helper using ri
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#
+# --
+#
+#   
+#
+
+require 'rdoc/ri/ri_driver'
+
+module IRB
+  module ExtendCommand
+    module Help
+      begin
+        @ri = RiDriver.new
+      rescue SystemExit
+      else
+        def self.execute(context, *names)
+          names.each do |name|
+            begin
+              @ri.get_info_for(name.to_s)
+            rescue RiError
+              puts $!.message
+            end
+          end
+          nil
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/irb/cmd/load.rb b/ruby_1_8_6/lib/irb/cmd/load.rb
new file mode 100644
index 0000000000..cbc5d91d03
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/cmd/load.rb
@@ -0,0 +1,67 @@
+#
+#   load.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+require "irb/cmd/nop.rb"
+require "irb/ext/loader"
+
+module IRB
+  module ExtendCommand
+    class Load<Nop
+      include IrbLoader
+
+      def execute(file_name, priv = nil)
+#	return ruby_load(file_name) unless IRB.conf[:USE_LOADER]
+	return irb_load(file_name, priv)
+      end
+    end
+
+    class Require<Nop
+      include IrbLoader
+      
+      def execute(file_name)
+#	return ruby_require(file_name) unless IRB.conf[:USE_LOADER]
+
+	rex = Regexp.new("#{Regexp.quote(file_name)}(\.o|\.rb)?")
+	return false if $".find{|f| f =~ rex}
+
+	case file_name
+	when /\.rb$/
+	  begin
+	    if irb_load(file_name)
+	      $".push file_name
+	      return true
+	    end
+	  rescue LoadError
+	  end
+	when /\.(so|o|sl)$/
+	  return ruby_require(file_name)
+	end
+	
+	begin
+	  irb_load(f = file_name + ".rb")
+	  $".push f
+	  return true
+	rescue LoadError
+	  return ruby_require(file_name)
+	end
+      end
+    end
+
+    class Source<Nop
+      include IrbLoader
+      def execute(file_name)
+	source_file(file_name)
+      end
+    end
+  end
+
+end
diff --git a/ruby_1_8_6/lib/irb/cmd/nop.rb b/ruby_1_8_6/lib/irb/cmd/nop.rb
new file mode 100644
index 0000000000..aa553c959e
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/cmd/nop.rb
@@ -0,0 +1,39 @@
+#
+#   nop.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+module IRB
+  module ExtendCommand
+    class Nop
+      
+      @RCS_ID='-$Id$-'
+
+      def self.execute(conf, *opts)
+	command = new(conf)
+	command.execute(*opts)
+      end
+
+      def initialize(conf)
+	@irb_context = conf
+      end
+
+      attr_reader :irb_context
+
+      def irb
+	@irb_context.irb
+      end
+
+      def execute(*opts)
+	#nop
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/lib/irb/cmd/pushws.rb b/ruby_1_8_6/lib/irb/cmd/pushws.rb
new file mode 100644
index 0000000000..eddaeae631
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/cmd/pushws.rb
@@ -0,0 +1,39 @@
+#
+#   change-ws.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+require "irb/cmd/nop.rb"
+require "irb/ext/workspaces.rb"
+
+module IRB
+  module ExtendCommand
+    class Workspaces<Nop
+      def execute(*obj)
+	irb_context.workspaces.collect{|ws| ws.main}
+      end
+    end
+
+    class PushWorkspace<Workspaces
+      def execute(*obj)
+	irb_context.push_workspace(*obj)
+	super
+      end
+    end
+
+    class PopWorkspace<Workspaces
+      def execute(*obj)
+	irb_context.pop_workspace(*obj)
+	super
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/lib/irb/cmd/subirb.rb b/ruby_1_8_6/lib/irb/cmd/subirb.rb
new file mode 100644
index 0000000000..79d654b172
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/cmd/subirb.rb
@@ -0,0 +1,43 @@
+#!/usr/local/bin/ruby
+#
+#   multi.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+require "irb/cmd/nop.rb"
+require "irb/ext/multi-irb"
+
+module IRB
+  module ExtendCommand
+    class IrbCommand<Nop
+      def execute(*obj)
+	IRB.irb(nil, *obj)
+      end
+    end
+
+    class Jobs<Nop
+      def execute
+	IRB.JobManager
+      end
+    end
+
+    class Foreground<Nop
+      def execute(key)
+	IRB.JobManager.switch(key)
+      end
+    end
+
+    class Kill<Nop
+      def execute(*keys)
+	IRB.JobManager.kill(*keys)
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/irb/completion.rb b/ruby_1_8_6/lib/irb/completion.rb
new file mode 100644
index 0000000000..000658e2a3
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/completion.rb
@@ -0,0 +1,205 @@
+#
+#   irb/completor.rb - 
+#   	$Release Version: 0.9$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
+#       From Original Idea of shugo@ruby-lang.org
+#
+
+require "readline"
+
+module IRB
+  module InputCompletor
+
+    @RCS_ID='-$Id$-'
+
+    ReservedWords = [
+      "BEGIN", "END",
+      "alias", "and", 
+      "begin", "break", 
+      "case", "class",
+      "def", "defined", "do",
+      "else", "elsif", "end", "ensure",
+      "false", "for", 
+      "if", "in", 
+      "module", 
+      "next", "nil", "not",
+      "or", 
+      "redo", "rescue", "retry", "return",
+      "self", "super",
+      "then", "true",
+      "undef", "unless", "until",
+      "when", "while",
+      "yield",
+    ]
+      
+    CompletionProc = proc { |input|
+      bind = IRB.conf[:MAIN_CONTEXT].workspace.binding
+      
+#      puts "input: #{input}"
+
+      case input
+      when /^(\/[^\/]*\/)\.([^.]*)$/
+	# Regexp
+	receiver = $1
+	message = Regexp.quote($2)
+
+	candidates = Regexp.instance_methods(true)
+	select_message(receiver, message, candidates)
+
+      when /^([^\]]*\])\.([^.]*)$/
+	# Array
+	receiver = $1
+	message = Regexp.quote($2)
+
+	candidates = Array.instance_methods(true)
+	select_message(receiver, message, candidates)
+
+      when /^([^\}]*\})\.([^.]*)$/
+	# Proc or Hash
+	receiver = $1
+	message = Regexp.quote($2)
+
+	candidates = Proc.instance_methods(true) | Hash.instance_methods(true)
+	select_message(receiver, message, candidates)
+	
+      when /^(:[^:.]*)$/
+ 	# Symbol
+	if Symbol.respond_to?(:all_symbols)
+	  sym = $1
+	  candidates = Symbol.all_symbols.collect{|s| ":" + s.id2name}
+	  candidates.grep(/^#{sym}/)
+	else
+	  []
+	end
+
+      when /^::([A-Z][^:\.\(]*)$/
+	# Absolute Constant or class methods
+	receiver = $1
+	candidates = Object.constants
+	candidates.grep(/^#{receiver}/).collect{|e| "::" + e}
+
+      when /^(((::)?[A-Z][^:.\(]*)+)::?([^:.]*)$/
+	# Constant or class methods
+	receiver = $1
+	message = Regexp.quote($4)
+	begin
+	  candidates = eval("#{receiver}.constants | #{receiver}.methods", bind)
+	rescue Exception
+	  candidates = []
+	end
+	candidates.grep(/^#{message}/).collect{|e| receiver + "::" + e}
+
+      when /^(:[^:.]+)\.([^.]*)$/
+	# Symbol
+	receiver = $1
+	message = Regexp.quote($2)
+
+	candidates = Symbol.instance_methods(true)
+	select_message(receiver, message, candidates)
+
+      when /^(-?(0[dbo])?[0-9_]+(\.[0-9_]+)?([eE]-?[0-9]+)?)\.([^.]*)$/
+	# Numeric
+	receiver = $1
+	message = Regexp.quote($5)
+
+	begin
+	  candidates = eval(receiver, bind).methods
+	rescue Exception
+	  candidates = []
+	end
+	select_message(receiver, message, candidates)
+
+      when /^(-?0x[0-9a-fA-F_]+)\.([^.]*)$/
+	# Numeric(0xFFFF)
+	receiver = $1
+	message = Regexp.quote($2)
+
+	begin
+	  candidates = eval(receiver, bind).methods
+	rescue Exception
+	  candidates = []
+	end
+	select_message(receiver, message, candidates)
+
+      when /^(\$[^.]*)$/
+	candidates = global_variables.grep(Regexp.new(Regexp.quote($1)))
+
+#      when /^(\$?(\.?[^.]+)+)\.([^.]*)$/
+      when /^((\.?[^.]+)+)\.([^.]*)$/
+	# variable
+	receiver = $1
+	message = Regexp.quote($3)
+
+	gv = eval("global_variables", bind)
+	lv = eval("local_variables", bind)
+	cv = eval("self.class.constants", bind)
+	
+	if (gv | lv | cv).include?(receiver)
+	  # foo.func and foo is local var.
+	  candidates = eval("#{receiver}.methods", bind)
+	elsif /^[A-Z]/ =~ receiver and /\./ !~ receiver
+	  # Foo::Bar.func
+	  begin
+	    candidates = eval("#{receiver}.methods", bind)
+	  rescue Exception
+	    candidates = []
+	  end
+	else
+	  # func1.func2
+	  candidates = []
+	  ObjectSpace.each_object(Module){|m|
+	    begin
+	      name = m.name
+	    rescue Exception
+	      name = ""
+	    end
+	    next if name != "IRB::Context" and 
+	      /^(IRB|SLex|RubyLex|RubyToken)/ =~ name
+	    candidates.concat m.instance_methods(false)
+	  }
+	  candidates.sort!
+	  candidates.uniq!
+	end
+	select_message(receiver, message, candidates)
+
+      when /^\.([^.]*)$/
+	# unknown(maybe String)
+
+	receiver = ""
+	message = Regexp.quote($1)
+
+	candidates = String.instance_methods(true)
+	select_message(receiver, message, candidates)
+
+      else
+	candidates = eval("methods | private_methods | local_variables | self.class.constants", bind)
+			  
+	(candidates|ReservedWords).grep(/^#{Regexp.quote(input)}/)
+      end
+    }
+
+    Operators = ["%", "&", "*", "**", "+",  "-",  "/",
+      "<", "<<", "<=", "<=>", "==", "===", "=~", ">", ">=", ">>",
+      "[]", "[]=", "^",]
+
+    def self.select_message(receiver, message, candidates)
+      candidates.grep(/^#{message}/).collect do |e|
+	case e
+	when /^[a-zA-Z_]/
+	  receiver + "." + e
+	when /^[0-9]/
+	when *Operators
+	  #receiver + " " + e
+	end
+      end
+    end
+  end
+end
+
+if Readline.respond_to?("basic_word_break_characters=")
+  Readline.basic_word_break_characters= " \t\n\"\\'`><=;|&{("
+end
+Readline.completion_append_character = nil
+Readline.completion_proc = IRB::InputCompletor::CompletionProc
diff --git a/ruby_1_8_6/lib/irb/context.rb b/ruby_1_8_6/lib/irb/context.rb
new file mode 100644
index 0000000000..d01bd4aefa
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/context.rb
@@ -0,0 +1,255 @@
+#
+#   irb/context.rb - irb context
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+require "irb/workspace"
+
+module IRB
+  class Context
+    #
+    # Arguments:
+    #   input_method: nil -- stdin or readline
+    #		      String -- File
+    #		      other -- using this as InputMethod
+    #
+    def initialize(irb, workspace = nil, input_method = nil, output_method = nil)
+      @irb = irb
+      if workspace
+	@workspace = workspace
+      else
+	@workspace = WorkSpace.new
+      end
+      @thread = Thread.current if defined? Thread
+#      @irb_level = 0
+
+      # copy of default configuration
+      @ap_name = IRB.conf[:AP_NAME]
+      @rc = IRB.conf[:RC]
+      @load_modules = IRB.conf[:LOAD_MODULES]
+
+      @use_readline = IRB.conf[:USE_READLINE]
+      @inspect_mode = IRB.conf[:INSPECT_MODE]
+
+      self.math_mode = IRB.conf[:MATH_MODE] if IRB.conf[:MATH_MODE]
+      self.use_tracer = IRB.conf[:USE_TRACER] if IRB.conf[:USE_TRACER]
+      self.use_loader = IRB.conf[:USE_LOADER] if IRB.conf[:USE_LOADER]
+      self.eval_history = IRB.conf[:EVAL_HISTORY] if IRB.conf[:EVAL_HISTORY]
+
+      @ignore_sigint = IRB.conf[:IGNORE_SIGINT]
+      @ignore_eof = IRB.conf[:IGNORE_EOF]
+
+      @back_trace_limit = IRB.conf[:BACK_TRACE_LIMIT]
+      
+      self.prompt_mode = IRB.conf[:PROMPT_MODE]
+
+      if IRB.conf[:SINGLE_IRB] or !defined?(JobManager)
+	@irb_name = IRB.conf[:IRB_NAME]
+      else
+	@irb_name = "irb#"+IRB.JobManager.n_jobs.to_s
+      end
+      @irb_path = "(" + @irb_name + ")"
+
+      case input_method
+      when nil
+	case use_readline?
+	when nil
+	  if (defined?(ReadlineInputMethod) && STDIN.tty? &&
+	      IRB.conf[:PROMPT_MODE] != :INF_RUBY)
+	    @io = ReadlineInputMethod.new
+	  else
+	    @io = StdioInputMethod.new
+	  end
+	when false
+	  @io = StdioInputMethod.new
+	when true
+	  if defined?(ReadlineInputMethod)
+	    @io = ReadlineInputMethod.new
+	  else
+	    @io = StdioInputMethod.new
+	  end
+	end
+
+      when String
+	@io = FileInputMethod.new(input_method)
+	@irb_name = File.basename(input_method)
+	@irb_path = input_method
+      else
+	@io = input_method
+      end
+      self.save_history = IRB.conf[:SAVE_HISTORY] if IRB.conf[:SAVE_HISTORY]
+
+      if output_method
+	@output_method = output_method
+      else
+	@output_method = StdioOutputMethod.new
+      end
+
+      @verbose = IRB.conf[:VERBOSE] 
+      @echo = IRB.conf[:ECHO]
+      if @echo.nil?
+	@echo = true
+      end
+      @debug_level = IRB.conf[:DEBUG_LEVEL]
+    end
+
+    def main
+      @workspace.main
+    end
+
+    attr_reader :workspace_home
+    attr_accessor :workspace
+    attr_reader :thread
+    attr_accessor :io
+    
+    attr_accessor :irb
+    attr_accessor :ap_name
+    attr_accessor :rc
+    attr_accessor :load_modules
+    attr_accessor :irb_name
+    attr_accessor :irb_path
+
+    attr_reader :use_readline
+    attr_reader :inspect_mode
+
+    attr_reader :prompt_mode
+    attr_accessor :prompt_i
+    attr_accessor :prompt_s
+    attr_accessor :prompt_c
+    attr_accessor :prompt_n
+    attr_accessor :auto_indent_mode
+    attr_accessor :return_format
+
+    attr_accessor :ignore_sigint
+    attr_accessor :ignore_eof
+    attr_accessor :echo
+    attr_accessor :verbose
+    attr_reader :debug_level
+
+    attr_accessor :back_trace_limit
+
+    alias use_readline? use_readline
+    alias rc? rc
+    alias ignore_sigint? ignore_sigint
+    alias ignore_eof? ignore_eof
+    alias echo? echo
+
+    def verbose?
+      if @verbose.nil?
+	if defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod) 
+	  false
+	elsif !STDIN.tty? or @io.kind_of?(FileInputMethod)
+	  true
+	else
+	  false
+	end
+      end
+    end
+
+    def prompting?
+      verbose? || (STDIN.tty? && @io.kind_of?(StdioInputMethod) ||
+		(defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)))
+    end
+
+    attr_reader :last_value
+
+    def set_last_value(value)
+      @last_value = value
+      @workspace.evaluate self, "_ = IRB.CurrentContext.last_value"
+    end
+
+    attr_reader :irb_name
+
+    def prompt_mode=(mode)
+      @prompt_mode = mode
+      pconf = IRB.conf[:PROMPT][mode]
+      @prompt_i = pconf[:PROMPT_I]
+      @prompt_s = pconf[:PROMPT_S]
+      @prompt_c = pconf[:PROMPT_C]
+      @prompt_n = pconf[:PROMPT_N]
+      @return_format = pconf[:RETURN]
+      if ai = pconf.include?(:AUTO_INDENT)
+	@auto_indent_mode = ai
+      else
+	@auto_indent_mode = IRB.conf[:AUTO_INDENT]
+      end
+    end
+    
+    def inspect?
+      @inspect_mode.nil? or @inspect_mode
+    end
+
+    def file_input?
+      @io.class == FileInputMethod
+    end
+
+    def inspect_mode=(opt)
+      if opt
+	@inspect_mode = opt
+      else
+	@inspect_mode = !@inspect_mode
+      end
+      print "Switch to#{unless @inspect_mode; ' non';end} inspect mode.\n" if verbose?
+      @inspect_mode
+    end
+
+    def use_readline=(opt)
+      @use_readline = opt
+      print "use readline module\n" if @use_readline
+    end
+
+    def debug_level=(value)
+      @debug_level = value
+      RubyLex.debug_level = value
+      SLex.debug_level = value
+    end
+
+    def debug?
+      @debug_level > 0
+    end
+
+    def evaluate(line, line_no)
+      @line_no = line_no
+      set_last_value(@workspace.evaluate(self, line, irb_path, line_no))
+#      @workspace.evaluate("_ = IRB.conf[:MAIN_CONTEXT]._")
+#      @_ = @workspace.evaluate(line, irb_path, line_no)
+    end
+
+    alias __exit__ exit
+    def exit(ret = 0)
+      IRB.irb_exit(@irb, ret)
+    end
+
+    NOPRINTING_IVARS = ["@last_value"]
+    NO_INSPECTING_IVARS = ["@irb", "@io"]
+    IDNAME_IVARS = ["@prompt_mode"]
+
+    alias __inspect__ inspect
+    def inspect
+      array = []
+      for ivar in instance_variables.sort{|e1, e2| e1 <=> e2}
+	name = ivar.sub(/^@(.*)$/){$1}
+	val = instance_eval(ivar)
+	case ivar
+	when *NOPRINTING_IVARS
+	  array.push format("conf.%s=%s", name, "...")
+	when *NO_INSPECTING_IVARS
+	  array.push format("conf.%s=%s", name, val.to_s)
+	when *IDNAME_IVARS
+	  array.push format("conf.%s=:%s", name, val.id2name)
+	else
+	  array.push format("conf.%s=%s", name, val.inspect)
+	end
+      end
+      array.join("\n")
+    end
+    alias __to_s__ to_s
+    alias to_s inspect
+  end
+end
diff --git a/ruby_1_8_6/lib/irb/ext/change-ws.rb b/ruby_1_8_6/lib/irb/ext/change-ws.rb
new file mode 100644
index 0000000000..fff8f58fe5
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/ext/change-ws.rb
@@ -0,0 +1,62 @@
+#
+#   irb/ext/cb.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+module IRB
+  class Context
+
+    def home_workspace
+      if defined? @home_workspace
+	@home_workspace
+      else
+	@home_workspace = @workspace
+      end
+    end
+
+    def change_workspace(*_main)
+      if _main.empty?
+	@workspace = home_workspace 
+	return main
+      end
+      
+      @workspace = WorkSpace.new(_main[0])
+      
+      if !(class<<main;ancestors;end).include?(ExtendCommandBundle)
+	main.extend ExtendCommandBundle
+      end
+    end
+
+#     def change_binding(*_main)
+#       back = @workspace
+#       @workspace = WorkSpace.new(*_main)
+#       unless _main.empty?
+# 	begin
+# 	  main.extend ExtendCommandBundle
+# 	rescue
+# 	  print "can't change binding to: ", main.inspect, "\n"
+# 	  @workspace = back
+# 	  return nil
+# 	end
+#       end
+#       @irb_level += 1
+#       begin
+# 	catch(:SU_EXIT) do
+# 	  @irb.eval_input
+# 	end
+#       ensure
+# 	@irb_level -= 1
+#  	@workspace = back
+#       end
+#     end
+#     alias change_workspace change_binding
+   end
+end
+
diff --git a/ruby_1_8_6/lib/irb/ext/history.rb b/ruby_1_8_6/lib/irb/ext/history.rb
new file mode 100644
index 0000000000..40f8692e8b
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/ext/history.rb
@@ -0,0 +1,110 @@
+#
+#   history.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+module IRB
+
+  class Context
+
+    NOPRINTING_IVARS.push "@eval_history_values"
+
+    alias _set_last_value set_last_value
+
+    def set_last_value(value)
+      _set_last_value(value)
+
+#      @workspace.evaluate self, "_ = IRB.CurrentContext.last_value"
+      if @eval_history #and !@eval_history_values.equal?(llv)
+ 	@eval_history_values.push @line_no, @last_value
+ 	@workspace.evaluate self, "__ = IRB.CurrentContext.instance_eval{@eval_history_values}"
+      end
+
+      @last_value
+    end
+
+    attr_reader :eval_history
+    def eval_history=(no)
+      if no
+	if defined?(@eval_history) && @eval_history
+	  @eval_history_values.size(no)
+	else
+	  @eval_history_values = History.new(no)
+	  IRB.conf[:__TMP__EHV__] = @eval_history_values
+	  @workspace.evaluate(self, "__ = IRB.conf[:__TMP__EHV__]")
+	  IRB.conf.delete(:__TMP_EHV__)
+	end
+      else
+	@eval_history_values = nil
+      end
+      @eval_history = no
+    end
+  end
+
+  class History
+    @RCS_ID='-$Id$-'
+
+    def initialize(size = 16)
+      @size = size
+      @contents = []
+    end
+
+    def size(size)
+      if size != 0 && size < @size 
+	@contents = @contents[@size - size .. @size]
+      end
+      @size = size
+    end
+
+    def [](idx)
+      begin
+	if idx >= 0
+	  @contents.find{|no, val| no == idx}[1]
+	else
+	  @contents[idx][1]
+	end
+      rescue NameError
+	nil
+      end
+    end
+
+    def push(no, val)
+      @contents.push [no, val]
+      @contents.shift if @size != 0 && @contents.size > @size
+    end
+    
+    alias real_inspect inspect
+
+    def inspect
+      if @contents.empty?
+	return real_inspect
+      end
+
+      unless (last = @contents.pop)[1].equal?(self)
+	@contents.push last
+	last = nil
+      end
+      str = @contents.collect{|no, val|
+	if val.equal?(self)
+	  "#{no} ...self-history..."
+	else
+	  "#{no} #{val.inspect}"
+	end
+      }.join("\n")
+      if str == ""
+	str = "Empty."
+      end
+      @contents.push last if last
+      str
+    end
+  end
+end
+
+
diff --git a/ruby_1_8_6/lib/irb/ext/loader.rb b/ruby_1_8_6/lib/irb/ext/loader.rb
new file mode 100644
index 0000000000..837e2553ac
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/ext/loader.rb
@@ -0,0 +1,120 @@
+#
+#   loader.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+
+module IRB
+  class LoadAbort < Exception;end
+
+  module IrbLoader
+    @RCS_ID='-$Id$-'
+
+    alias ruby_load load
+    alias ruby_require require
+
+    def irb_load(fn, priv = nil)
+      path = search_file_from_ruby_path(fn)
+      raise LoadError, "No such file to load -- #{fn}" unless path
+
+      load_file(path, priv)
+    end
+
+    def search_file_from_ruby_path(fn)
+      if /^#{Regexp.quote(File::Separator)}/ =~ fn
+	return fn if File.exist?(fn)
+	return nil
+      end
+
+      for path in $:
+	if File.exist?(f = File.join(path, fn))
+	  return f
+	end
+      end
+      return nil
+    end
+
+    def source_file(path)
+      irb.suspend_name(path, File.basename(path)) do
+	irb.suspend_input_method(FileInputMethod.new(path)) do
+	  |back_io|
+	  irb.signal_status(:IN_LOAD) do 
+	    if back_io.kind_of?(FileInputMethod)
+	      irb.eval_input
+	    else
+	      begin
+		irb.eval_input
+	      rescue LoadAbort
+		print "load abort!!\n"
+	      end
+	    end
+	  end
+	end
+      end
+    end
+
+    def load_file(path, priv = nil)
+      irb.suspend_name(path, File.basename(path)) do
+	
+	if priv
+	  ws = WorkSpace.new(Module.new)
+	else
+	  ws = WorkSpace.new
+	end
+	irb.suspend_workspace(ws) do
+	  irb.suspend_input_method(FileInputMethod.new(path)) do
+	    |back_io|
+	    irb.signal_status(:IN_LOAD) do 
+#	      p irb.conf
+	      if back_io.kind_of?(FileInputMethod)
+		irb.eval_input
+	      else
+		begin
+		  irb.eval_input
+		rescue LoadAbort
+		  print "load abort!!\n"
+		end
+	      end
+	    end
+	  end
+	end
+      end
+    end
+
+    def old
+      back_io = @io
+      back_path = @irb_path
+      back_name = @irb_name
+      back_scanner = @irb.scanner
+      begin
+ 	@io = FileInputMethod.new(path)
+ 	@irb_name = File.basename(path)
+	@irb_path = path
+	@irb.signal_status(:IN_LOAD) do
+	  if back_io.kind_of?(FileInputMethod)
+	    @irb.eval_input
+	  else
+	    begin
+	      @irb.eval_input
+	    rescue LoadAbort
+	      print "load abort!!\n"
+	    end
+	  end
+	end
+      ensure
+ 	@io = back_io
+ 	@irb_name = back_name
+ 	@irb_path = back_path
+	@irb.scanner = back_scanner
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/lib/irb/ext/math-mode.rb b/ruby_1_8_6/lib/irb/ext/math-mode.rb
new file mode 100644
index 0000000000..bd443b96ed
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/ext/math-mode.rb
@@ -0,0 +1,37 @@
+#
+#   math-mode.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+require "mathn"
+
+module IRB
+  class Context
+    attr_reader :math_mode
+    alias math? math_mode
+
+    def math_mode=(opt)
+      if @math_mode == true && opt == false
+	IRB.fail CantReturnToNormalMode
+	return
+      end
+
+      @math_mode = opt
+      if math_mode
+	main.extend Math
+	print "start math mode\n" if verbose?
+      end
+    end
+
+    def inspect?
+      @inspect_mode.nil? && !@math_mode or @inspect_mode
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/lib/irb/ext/multi-irb.rb b/ruby_1_8_6/lib/irb/ext/multi-irb.rb
new file mode 100644
index 0000000000..4589b1d554
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/ext/multi-irb.rb
@@ -0,0 +1,241 @@
+#
+#   irb/multi-irb.rb - multiple irb module
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+IRB.fail CantShiftToMultiIrbMode unless defined?(Thread)
+require "thread"
+
+module IRB
+  # job management class
+  class JobManager
+    @RCS_ID='-$Id$-'
+
+    def initialize
+      # @jobs = [[thread, irb],...]
+      @jobs = []
+      @current_job = nil
+    end
+
+    attr_accessor :current_job
+
+    def n_jobs
+      @jobs.size
+    end
+
+    def thread(key)
+      th, irb = search(key)
+      th
+    end
+
+    def irb(key)
+      th, irb = search(key)
+      irb
+    end
+
+    def main_thread
+      @jobs[0][0]
+    end
+
+    def main_irb
+      @jobs[0][1]
+    end
+
+    def insert(irb)
+      @jobs.push [Thread.current, irb]
+    end
+
+    def switch(key)
+      th, irb = search(key)
+      IRB.fail IrbAlreadyDead unless th.alive?
+      IRB.fail IrbSwitchedToCurrentThread if th == Thread.current
+      @current_job = irb
+      th.run
+      Thread.stop
+      @current_job = irb(Thread.current)
+    end
+
+    def kill(*keys)
+      for key in keys
+	th, irb = search(key)
+	IRB.fail IrbAlreadyDead unless th.alive?
+	th.exit
+      end
+    end    
+
+    def search(key)
+      case key
+      when Integer
+	@jobs[key]
+      when Irb
+	@jobs.find{|k, v| v.equal?(key)}
+      when Thread
+	@jobs.assoc(key)
+      else
+	assoc = @jobs.find{|k, v| v.context.main.equal?(key)}
+	IRB.fail NoSuchJob, key if assoc.nil?
+	assoc
+      end
+    end
+
+    def delete(key)
+      case key
+      when Integer
+	IRB.fail NoSuchJob, key unless @jobs[key]
+	@jobs[key] = nil
+      else
+	catch(:EXISTS) do
+	  @jobs.each_index do
+	    |i|
+	    if @jobs[i] and (@jobs[i][0] == key ||
+			     @jobs[i][1] == key ||
+			     @jobs[i][1].context.main.equal?(key))
+	      @jobs[i] = nil
+	      throw :EXISTS
+	    end
+	  end
+	  IRB.fail NoSuchJob, key
+	end
+      end
+      until assoc = @jobs.pop; end unless @jobs.empty?
+      @jobs.push assoc
+    end
+
+    def inspect
+      ary = []
+      @jobs.each_index do
+	|i|
+	th, irb = @jobs[i]
+	next if th.nil?
+
+	if th.alive?
+	  if th.stop?
+	    t_status = "stop"
+	  else
+	    t_status = "running"
+	  end
+	else
+	  t_status = "exited"
+	end
+	ary.push format("#%d->%s on %s (%s: %s)",
+			i, 
+			irb.context.irb_name, 
+			irb.context.main,
+			th,
+			t_status)
+      end
+      ary.join("\n")
+    end
+  end
+
+  @JobManager = JobManager.new
+
+  def IRB.JobManager
+    @JobManager
+  end
+
+  def IRB.CurrentContext
+    IRB.JobManager.irb(Thread.current).context
+  end
+
+  # invoke multi-irb 
+  def IRB.irb(file = nil, *main)
+    workspace = WorkSpace.new(*main)
+    parent_thread = Thread.current
+    Thread.start do
+      begin
+	irb = Irb.new(workspace, file)
+      rescue 
+	print "Subirb can't start with context(self): ", workspace.main.inspect, "\n"
+	print "return to main irb\n"
+	Thread.pass
+	Thread.main.wakeup
+	Thread.exit
+      end
+      @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
+      @JobManager.insert(irb)
+      @JobManager.current_job = irb
+      begin
+	system_exit = false
+	catch(:IRB_EXIT) do
+	  irb.eval_input
+	end
+      rescue SystemExit
+	system_exit = true
+	raise
+	#fail
+      ensure
+	unless system_exit
+	  @JobManager.delete(irb)
+	  if parent_thread.alive?
+	    @JobManager.current_job = @JobManager.irb(parent_thread)
+	    parent_thread.run
+	  else
+	    @JobManager.current_job = @JobManager.main_irb
+	    @JobManager.main_thread.run
+	  end
+	end
+      end
+    end
+    Thread.stop
+    @JobManager.current_job = @JobManager.irb(Thread.current)
+  end
+
+#   class Context
+#     def set_last_value(value)
+#       @last_value = value
+#       @workspace.evaluate "_ = IRB.JobManager.irb(Thread.current).context.last_value"
+#       if @eval_history #and !@__.equal?(@last_value)
+# 	@eval_history_values.push @line_no, @last_value
+# 	@workspace.evaluate "__ = IRB.JobManager.irb(Thread.current).context.instance_eval{@eval_history_values}"
+#       end
+#       @last_value
+#     end
+#   end
+
+#  module ExtendCommand
+#     def irb_context
+#       IRB.JobManager.irb(Thread.current).context
+#     end
+# #    alias conf irb_context
+#   end
+
+  @CONF[:SINGLE_IRB_MODE] = false
+  @JobManager.insert(@CONF[:MAIN_CONTEXT].irb)
+  @JobManager.current_job = @CONF[:MAIN_CONTEXT].irb
+
+  class Irb
+    def signal_handle
+      unless @context.ignore_sigint?
+	print "\nabort!!\n" if @context.verbose?
+	exit
+      end
+
+      case @signal_status
+      when :IN_INPUT
+	print "^C\n"
+	IRB.JobManager.thread(self).raise RubyLex::TerminateLineInput
+      when :IN_EVAL
+	IRB.irb_abort(self)
+      when :IN_LOAD
+	IRB.irb_abort(self, LoadAbort)
+      when :IN_IRB
+	# ignore
+      else
+	# ignore other cases as well
+      end
+    end
+  end
+
+  trap("SIGINT") do
+    @JobManager.current_job.signal_handle
+    Thread.stop
+  end
+
+end
diff --git a/ruby_1_8_6/lib/irb/ext/save-history.rb b/ruby_1_8_6/lib/irb/ext/save-history.rb
new file mode 100644
index 0000000000..5260bfcdd8
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/ext/save-history.rb
@@ -0,0 +1,85 @@
+#!/usr/local/bin/ruby
+#
+#   save-history.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKAkeiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+require "readline"
+
+module IRB
+  module HistorySavingAbility
+    @RCS_ID='-$Id$-'
+  end
+
+  class Context
+    def init_save_history
+      unless (class<<@io;self;end).include?(HistorySavingAbility)
+	@io.extend(HistorySavingAbility)
+      end
+    end
+
+    def save_history
+      IRB.conf[:SAVE_HISTORY]
+    end
+
+    def save_history=(val)
+      IRB.conf[:SAVE_HISTORY] = val
+      if val
+	main_context = IRB.conf[:MAIN_CONTEXT]
+	main_context = self unless main_context
+	main_context.init_save_history
+      end
+    end
+
+    def history_file
+      IRB.conf[:HISTORY_FILE]
+    end
+
+    def history_file=(hist)
+      IRB.conf[:HISTORY_FILE] = hist
+    end
+  end
+
+  module HistorySavingAbility
+    include Readline
+
+    def HistorySavingAbility.create_finalizer
+      proc do
+	if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+	  if hf = IRB.conf[:HISTORY_FILE]
+	    file = File.expand_path(hf)
+	  end
+	  file = IRB.rc_file("_history") unless file
+	  open(file, 'w' ) do |f|
+	    hist = HISTORY.to_a
+	    f.puts(hist[-num..-1] || hist)
+	  end
+	end
+      end
+    end
+
+    def HistorySavingAbility.extended(obj)
+      ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
+      obj.load_history
+      obj
+    end
+
+    def load_history
+      hist = IRB.conf[:HISTORY_FILE]
+      hist = IRB.rc_file("_history") unless hist
+      if File.exist?(hist)
+	open(hist) do |f|
+	  f.each {|l| HISTORY << l.chomp}
+	end
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/lib/irb/ext/tracer.rb b/ruby_1_8_6/lib/irb/ext/tracer.rb
new file mode 100644
index 0000000000..805f630a4d
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/ext/tracer.rb
@@ -0,0 +1,61 @@
+#
+#   irb/lib/tracer.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+require "tracer"
+
+module IRB
+
+  # initialize tracing function
+  def IRB.initialize_tracer
+    Tracer.verbose = false
+    Tracer.add_filter {
+      |event, file, line, id, binding, *rests|
+      /^#{Regexp.quote(@CONF[:IRB_LIB_PATH])}/ !~ file and
+	File::basename(file) != "irb.rb"
+    }
+  end
+
+  class Context
+    attr_reader :use_tracer
+    alias use_tracer? use_tracer
+
+    def use_tracer=(opt)
+      if opt
+	Tracer.set_get_line_procs(@irb_path) {
+	  |line_no, *rests|
+	  @io.line(line_no)
+	}
+      elsif !opt && @use_tracer
+	Tracer.off
+      end
+      @use_tracer=opt
+    end
+  end
+
+  class WorkSpace
+    alias __evaluate__ evaluate
+    def evaluate(context, statements, file = nil, line = nil)
+      if context.use_tracer? && file != nil && line != nil
+	Tracer.on 
+	begin
+	  __evaluate__(context, statements, file, line)
+	ensure
+	  Tracer.off
+	end
+      else
+	__evaluate__(context, statements, file || __FILE__, line || __LINE__)
+      end
+    end
+  end
+
+  IRB.initialize_tracer
+end
+	
diff --git a/ruby_1_8_6/lib/irb/ext/use-loader.rb b/ruby_1_8_6/lib/irb/ext/use-loader.rb
new file mode 100644
index 0000000000..1b4d480fcd
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/ext/use-loader.rb
@@ -0,0 +1,65 @@
+#
+#   use-loader.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+require "irb/cmd/load"
+require "irb/ext/loader"
+
+class Object
+  alias __original__load__IRB_use_loader__ load
+  alias __original__require__IRB_use_loader__ require
+end
+
+module IRB
+  module ExtendCommandBundle
+    def irb_load(*opts, &b)
+      ExtendCommand::Load.execute(irb_context, *opts, &b)
+    end
+    def irb_require(*opts, &b)
+      ExtendCommand::Require.execute(irb_context, *opts, &b)
+    end
+  end
+
+  class Context
+
+    IRB.conf[:USE_LOADER] = false
+    
+    def use_loader
+      IRB.conf[:USE_LOADER]
+    end
+
+    alias use_loader? use_loader
+
+    def use_loader=(opt)
+
+      if IRB.conf[:USE_LOADER] != opt
+	IRB.conf[:USE_LOADER] = opt
+	if opt
+	  if !$".include?("irb/cmd/load")
+	  end
+	  (class<<@workspace.main;self;end).instance_eval {
+	    alias_method :load, :irb_load
+	    alias_method :require, :irb_require
+	  }
+	else
+	  (class<<@workspace.main;self;end).instance_eval {
+	    alias_method :load, :__original__load__IRB_use_loader__
+	    alias_method :require, :__original__require__IRB_use_loader__
+	  }
+	end
+      end
+      print "Switch to load/require#{unless use_loader; ' non';end} trace mode.\n" if verbose?
+      opt
+    end
+  end
+end
+
+
diff --git a/ruby_1_8_6/lib/irb/ext/workspaces.rb b/ruby_1_8_6/lib/irb/ext/workspaces.rb
new file mode 100644
index 0000000000..79098570dc
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/ext/workspaces.rb
@@ -0,0 +1,56 @@
+#
+#   push-ws.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+module IRB
+  class Context
+
+    def irb_level
+      workspace_stack.size
+    end
+
+    def workspaces
+      if defined? @workspaces
+	@workspaces
+      else
+	@workspaces = []
+      end
+    end
+
+    def push_workspace(*_main)
+      if _main.empty?
+	if workspaces.empty?
+	  print "No other workspace\n"
+	  return nil
+	end
+	ws = workspaces.pop
+	workspaces.push @workspace
+	@workspace = ws
+	return workspaces
+      end
+
+      workspaces.push @workspace
+      @workspace = WorkSpace.new(@workspace.binding, _main[0])
+      if !(class<<main;ancestors;end).include?(ExtendCommandBundle)
+	main.extend ExtendCommandBundle
+      end
+    end
+
+    def pop_workspace
+      if workspaces.empty?
+	print "workspace stack empty\n"
+	return
+      end
+      @workspace = workspaces.pop
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/lib/irb/extend-command.rb b/ruby_1_8_6/lib/irb/extend-command.rb
new file mode 100644
index 0000000000..8994f2f8d2
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/extend-command.rb
@@ -0,0 +1,264 @@
+#
+#   irb/extend-command.rb - irb extend command 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+module IRB
+  #
+  # IRB extended command
+  #
+  module ExtendCommandBundle
+    EXCB = ExtendCommandBundle
+
+    NO_OVERRIDE = 0
+    OVERRIDE_PRIVATE_ONLY = 0x01
+    OVERRIDE_ALL = 0x02
+
+    def irb_exit(ret = 0)
+      irb_context.exit(ret)
+    end
+
+    def irb_context
+      IRB.CurrentContext
+    end
+
+    @ALIASES = [
+      [:context, :irb_context, NO_OVERRIDE],
+      [:conf, :irb_context, NO_OVERRIDE],
+      [:irb_quit, :irb_exit, OVERRIDE_PRIVATE_ONLY],
+      [:exit, :irb_exit, OVERRIDE_PRIVATE_ONLY],
+      [:quit, :irb_exit, OVERRIDE_PRIVATE_ONLY],
+    ]
+
+    @EXTEND_COMMANDS = [
+      [:irb_current_working_workspace, :CurrentWorkingWorkspace, "irb/cmd/chws",
+	[:irb_print_working_workspace, OVERRIDE_ALL],
+	[:irb_cwws, OVERRIDE_ALL],
+	[:irb_pwws, OVERRIDE_ALL],
+#	[:irb_cww, OVERRIDE_ALL],
+#	[:irb_pww, OVERRIDE_ALL],
+	[:cwws, NO_OVERRIDE],
+	[:pwws, NO_OVERRIDE],
+#	[:cww, NO_OVERRIDE],
+#	[:pww, NO_OVERRIDE],
+	[:irb_current_working_binding, OVERRIDE_ALL],
+	[:irb_print_working_binding, OVERRIDE_ALL],
+	[:irb_cwb, OVERRIDE_ALL],
+	[:irb_pwb, OVERRIDE_ALL],
+#	[:cwb, NO_OVERRIDE],
+#	[:pwb, NO_OVERRIDE]
+      ],
+      [:irb_change_workspace, :ChangeWorkspace, "irb/cmd/chws",
+	[:irb_chws, OVERRIDE_ALL],
+#	[:irb_chw, OVERRIDE_ALL],
+	[:irb_cws, OVERRIDE_ALL],
+#	[:irb_cw, OVERRIDE_ALL],
+	[:chws, NO_OVERRIDE],
+#	[:chw, NO_OVERRIDE],
+	[:cws, NO_OVERRIDE],
+#	[:cw, NO_OVERRIDE],
+	[:irb_change_binding, OVERRIDE_ALL],
+	[:irb_cb, OVERRIDE_ALL],
+	[:cb, NO_OVERRIDE]],
+
+      [:irb_workspaces, :Workspaces, "irb/cmd/pushws",
+	[:workspaces, NO_OVERRIDE],
+	[:irb_bindings, OVERRIDE_ALL],
+	[:bindings, NO_OVERRIDE]],
+      [:irb_push_workspace, :PushWorkspace, "irb/cmd/pushws",
+	[:irb_pushws, OVERRIDE_ALL],
+#	[:irb_pushw, OVERRIDE_ALL],
+	[:pushws, NO_OVERRIDE],
+#	[:pushw, NO_OVERRIDE],
+	[:irb_push_binding, OVERRIDE_ALL],
+	[:irb_pushb, OVERRIDE_ALL],
+	[:pushb, NO_OVERRIDE]],
+      [:irb_pop_workspace, :PopWorkspace, "irb/cmd/pushws",
+	[:irb_popws, OVERRIDE_ALL],
+#	[:irb_popw, OVERRIDE_ALL],
+	[:popws, NO_OVERRIDE],
+#	[:popw, NO_OVERRIDE],
+	[:irb_pop_binding, OVERRIDE_ALL],
+	[:irb_popb, OVERRIDE_ALL],
+	[:popb, NO_OVERRIDE]],
+
+      [:irb_load, :Load, "irb/cmd/load"],
+      [:irb_require, :Require, "irb/cmd/load"],
+      [:irb_source, :Source, "irb/cmd/load", 
+	[:source, NO_OVERRIDE]],
+
+      [:irb, :IrbCommand, "irb/cmd/subirb"],
+      [:irb_jobs, :Jobs, "irb/cmd/subirb", 
+	[:jobs, NO_OVERRIDE]],
+      [:irb_fg, :Foreground, "irb/cmd/subirb", 
+	[:fg, NO_OVERRIDE]],
+      [:irb_kill, :Kill, "irb/cmd/subirb", 
+	[:kill, OVERRIDE_PRIVATE_ONLY]],
+
+      [:irb_help, :Help, "irb/cmd/help",
+        [:help, NO_OVERRIDE]],
+
+    ]
+
+    def self.install_extend_commands
+      for args in @EXTEND_COMMANDS
+	def_extend_command(*args)
+      end
+    end
+
+    # aliases = [commans_alias, flag], ...
+    def self.def_extend_command(cmd_name, cmd_class, load_file = nil, *aliases)
+      case cmd_class
+      when Symbol
+	cmd_class = cmd_class.id2name
+      when String
+      when Class
+	cmd_class = cmd_class.name
+      end
+
+      if load_file
+	eval %[
+	  def #{cmd_name}(*opts, &b)
+	    require "#{load_file}"
+	    eval %[
+	      def #{cmd_name}(*opts, &b)
+		ExtendCommand::#{cmd_class}.execute(irb_context, *opts, &b)
+	      end
+	    ]
+	    send :#{cmd_name}, *opts, &b
+	  end
+	]
+      else
+	eval %[
+	  def #{cmd_name}(*opts, &b)
+	    ExtendCommand::#{cmd_class}.execute(irb_context, *opts, &b)
+	  end
+	]
+      end
+
+      for ali, flag in aliases
+	@ALIASES.push [ali, cmd_name, flag]
+      end
+    end
+
+    # override = {NO_OVERRIDE, OVERRIDE_PRIVATE_ONLY, OVERRIDE_ALL}
+    def install_alias_method(to, from, override = NO_OVERRIDE)
+      to = to.id2name unless to.kind_of?(String)
+      from = from.id2name unless from.kind_of?(String)
+
+      if override == OVERRIDE_ALL or
+	  (override == OVERRIDE_PRIVATE_ONLY) && !respond_to?(to) or
+	  (override == NO_OVERRIDE) &&  !respond_to?(to, true)
+	target = self
+	(class<<self;self;end).instance_eval{
+	  if target.respond_to?(to, true) && 
+	      !target.respond_to?(EXCB.irb_original_method_name(to), true)
+	    alias_method(EXCB.irb_original_method_name(to), to) 
+	  end
+	  alias_method to, from
+	}
+      else
+	print "irb: warn: can't alias #{to} from #{from}.\n"
+      end
+    end
+
+    def self.irb_original_method_name(method_name)
+      "irb_" + method_name + "_org"
+    end
+
+    def self.extend_object(obj)
+      unless (class<<obj;ancestors;end).include?(EXCB)
+	super
+	for ali, com, flg in @ALIASES
+	  obj.install_alias_method(ali, com, flg)
+	end
+      end
+    end
+
+    install_extend_commands
+  end
+
+  # extension support for Context
+  module ContextExtender
+    CE = ContextExtender
+
+    @EXTEND_COMMANDS = [
+      [:eval_history=, "irb/ext/history.rb"],
+      [:use_tracer=, "irb/ext/tracer.rb"],
+      [:math_mode=, "irb/ext/math-mode.rb"],
+      [:use_loader=, "irb/ext/use-loader.rb"],
+      [:save_history=, "irb/ext/save-history.rb"],
+    ]
+
+    def self.install_extend_commands
+      for args in @EXTEND_COMMANDS
+	def_extend_command(*args)
+      end
+    end
+
+    def self.def_extend_command(cmd_name, load_file, *aliases)
+      Context.module_eval %[
+        def #{cmd_name}(*opts, &b)
+	  Context.module_eval {remove_method(:#{cmd_name})}
+	  require "#{load_file}"
+	  send :#{cmd_name}, *opts, &b
+	end
+	for ali in aliases
+	  alias_method ali, cmd_name
+	end
+      ]
+    end
+
+    CE.install_extend_commands
+  end
+
+  module MethodExtender
+    def def_pre_proc(base_method, extend_method)
+      base_method = base_method.to_s
+      extend_method = extend_method.to_s
+
+      alias_name = new_alias_name(base_method)
+      module_eval %[
+        alias_method alias_name, base_method
+        def #{base_method}(*opts)
+	  send :#{extend_method}, *opts
+	  send :#{alias_name}, *opts
+	end
+      ]
+    end
+
+    def def_post_proc(base_method, extend_method)
+      base_method = base_method.to_s
+      extend_method = extend_method.to_s
+
+      alias_name = new_alias_name(base_method)
+      module_eval %[
+        alias_method alias_name, base_method
+        def #{base_method}(*opts)
+	  send :#{alias_name}, *opts
+	  send :#{extend_method}, *opts
+	end
+      ]
+    end
+
+    # return #{prefix}#{name}#{postfix}<num>
+    def new_alias_name(name, prefix = "__alias_of__", postfix = "__")
+      base_name = "#{prefix}#{name}#{postfix}"
+      all_methods = instance_methods(true) + private_instance_methods(true)
+      same_methods = all_methods.grep(/^#{Regexp.quote(base_name)}[0-9]*$/)
+      return base_name if same_methods.empty?
+      no = same_methods.size
+      while !same_methods.include?(alias_name = base_name + no)
+	no += 1
+      end
+      alias_name
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/lib/irb/frame.rb b/ruby_1_8_6/lib/irb/frame.rb
new file mode 100644
index 0000000000..f0b0a9abf3
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/frame.rb
@@ -0,0 +1,67 @@
+#
+#   frame.rb - 
+#   	$Release Version: 0.9$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
+#
+# --
+#
+#   
+#
+
+require "e2mmap"
+
+module IRB
+  class Frame
+    extend Exception2MessageMapper
+    def_exception :FrameOverflow, "frame overflow"
+    def_exception :FrameUnderflow, "frame underflow"
+
+    INIT_STACK_TIMES = 3
+    CALL_STACK_OFFSET = 3
+
+    def initialize
+      @frames = [TOPLEVEL_BINDING] * INIT_STACK_TIMES
+    end
+
+    def trace_func(event, file, line, id, binding)
+      case event
+      when 'call', 'class'
+	@frames.push binding
+      when 'return', 'end'
+	@frames.pop
+      end
+    end
+
+    def top(n = 0)
+      bind = @frames[-(n + CALL_STACK_OFFSET)]
+      Fail FrameUnderflow unless bind
+      bind
+    end
+
+    def bottom(n = 0)
+      bind = @frames[n]
+      Fail FrameOverflow unless bind
+      bind
+    end
+
+    # singleton functions
+    def Frame.bottom(n = 0)
+      @backtrace.bottom(n)
+    end
+
+    def Frame.top(n = 0)
+      @backtrace.top(n)
+    end
+
+    def Frame.sender
+      eval "self", @backtrace.top
+    end
+
+    @backtrace = Frame.new
+    set_trace_func proc{|event, file, line, id, binding, klass|
+      @backtrace.trace_func(event, file, line, id, binding)
+    }
+  end
+end
diff --git a/ruby_1_8_6/lib/irb/help.rb b/ruby_1_8_6/lib/irb/help.rb
new file mode 100644
index 0000000000..f091999bd1
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/help.rb
@@ -0,0 +1,33 @@
+#
+#   irb/help.rb - print usase module
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
+#
+# --
+#
+#   
+#
+
+module IRB
+  def IRB.print_usage
+    lc = IRB.conf[:LC_MESSAGES]
+    path = lc.find("irb/help-message")
+    space_line = false
+    File.foreach(path) do
+      |l|
+      if /^\s*$/ =~ l
+	lc.puts l unless space_line
+	space_line = true
+	next
+      end
+      space_line = false
+      
+      l.sub!(/#.*$/, "")
+      next if /^\s*$/ =~ l
+      lc.puts l
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/lib/irb/init.rb b/ruby_1_8_6/lib/irb/init.rb
new file mode 100644
index 0000000000..db22ca639b
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/init.rb
@@ -0,0 +1,259 @@
+#
+#   irb/init.rb - irb initialize module
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+module IRB
+
+  # initialize config
+  def IRB.setup(ap_path)
+    IRB.init_config(ap_path)
+    IRB.init_error
+    IRB.parse_opts
+    IRB.run_config
+    IRB.load_modules
+
+    unless @CONF[:PROMPT][@CONF[:PROMPT_MODE]]
+      IRB.fail(UndefinedPromptMode, @CONF[:PROMPT_MODE]) 
+    end
+  end
+
+  # @CONF default setting
+  def IRB.init_config(ap_path)
+    # class instance variables
+    @TRACER_INITIALIZED = false
+
+    # default configurations
+    unless ap_path and @CONF[:AP_NAME]
+      ap_path = File.join(File.dirname(File.dirname(__FILE__)), "irb.rb")
+    end
+    @CONF[:AP_NAME] = File::basename(ap_path, ".rb")
+
+    @CONF[:IRB_NAME] = "irb"
+    @CONF[:IRB_LIB_PATH] = File.dirname(__FILE__)
+
+    @CONF[:RC] = true
+    @CONF[:LOAD_MODULES] = []
+    @CONF[:IRB_RC] = nil
+
+    @CONF[:MATH_MODE] = false
+    @CONF[:USE_READLINE] = false unless defined?(ReadlineInputMethod)
+    @CONF[:INSPECT_MODE] = nil
+    @CONF[:USE_TRACER] = false
+    @CONF[:USE_LOADER] = false
+    @CONF[:IGNORE_SIGINT] = true
+    @CONF[:IGNORE_EOF] = false
+    @CONF[:ECHO] = nil
+    @CONF[:VERBOSE] = nil
+
+    @CONF[:EVAL_HISTORY] = nil
+    @CONF[:SAVE_HISTORY] = nil
+
+    @CONF[:BACK_TRACE_LIMIT] = 16
+
+    @CONF[:PROMPT] = {
+      :NULL => {
+	:PROMPT_I => nil,
+	:PROMPT_N => nil,
+	:PROMPT_S => nil,
+	:PROMPT_C => nil,
+	:RETURN => "%s\n"
+      },
+      :DEFAULT => {
+	:PROMPT_I => "%N(%m):%03n:%i> ",
+	:PROMPT_N => "%N(%m):%03n:%i> ",
+	:PROMPT_S => "%N(%m):%03n:%i%l ",
+	:PROMPT_C => "%N(%m):%03n:%i* ",
+	:RETURN => "=> %s\n"
+      },
+      :CLASSIC => {
+	:PROMPT_I => "%N(%m):%03n:%i> ",
+	:PROMPT_N => "%N(%m):%03n:%i> ",
+	:PROMPT_S => "%N(%m):%03n:%i%l ",
+	:PROMPT_C => "%N(%m):%03n:%i* ",
+	:RETURN => "%s\n"
+      },
+      :SIMPLE => {
+	:PROMPT_I => ">> ",
+	:PROMPT_N => ">> ",
+	:PROMPT_S => nil,
+	:PROMPT_C => "?> ",
+	:RETURN => "=> %s\n"
+      },
+      :INF_RUBY => {
+	:PROMPT_I => "%N(%m):%03n:%i> ",
+#	:PROMPT_N => "%N(%m):%03n:%i> ",
+	:PROMPT_N => nil,
+	:PROMPT_S => nil,
+	:PROMPT_C => nil,
+	:RETURN => "%s\n",
+	:AUTO_INDENT => true
+      },
+      :XMP => {
+	:PROMPT_I => nil,
+	:PROMPT_N => nil,
+	:PROMPT_S => nil,
+	:PROMPT_C => nil,
+	:RETURN => "    ==>%s\n"
+      }
+    }
+
+    @CONF[:PROMPT_MODE] = (STDIN.tty? ? :DEFAULT : :NULL)
+    @CONF[:AUTO_INDENT] = false
+
+    @CONF[:CONTEXT_MODE] = 3 # use binding in function on TOPLEVEL_BINDING
+    @CONF[:SINGLE_IRB] = false
+
+#    @CONF[:LC_MESSAGES] = "en"
+    @CONF[:LC_MESSAGES] = Locale.new
+    
+    @CONF[:DEBUG_LEVEL] = 1
+  end
+
+  def IRB.init_error
+    @CONF[:LC_MESSAGES].load("irb/error.rb")
+  end
+
+  FEATURE_IOPT_CHANGE_VERSION = "1.9.0"
+
+  # option analyzing
+  def IRB.parse_opts
+    load_path = []
+    while opt = ARGV.shift
+      case opt
+      when "-f"
+	@CONF[:RC] = false
+      when "-m"
+	@CONF[:MATH_MODE] = true
+      when "-d"
+	$DEBUG = true
+      when /^-r(.+)?/
+	opt = $1 || ARGV.shift
+	@CONF[:LOAD_MODULES].push opt if opt
+      when /^-I(.+)?/
+        opt = $1 || ARGV.shift
+	load_path.concat(opt.split(File::PATH_SEPARATOR)) if opt
+      when /^-K(.)/
+	$KCODE = $1
+      when "--inspect"
+	@CONF[:INSPECT_MODE] = true
+      when "--noinspect"
+	@CONF[:INSPECT_MODE] = false
+      when "--readline"
+	@CONF[:USE_READLINE] = true
+      when "--noreadline"
+	@CONF[:USE_READLINE] = false
+      when "--echo"
+	@CONF[:ECHO] = true
+      when "--noecho"
+	@CONF[:ECHO] = false
+      when "--verbose"
+	@CONF[:VERBOSE] = true
+      when "--noverbose"
+	@CONF[:VERBOSE] = false
+      when "--prompt-mode", "--prompt"
+	prompt_mode = ARGV.shift.upcase.tr("-", "_").intern
+	@CONF[:PROMPT_MODE] = prompt_mode
+      when "--noprompt"
+	@CONF[:PROMPT_MODE] = :NULL
+      when "--inf-ruby-mode"
+	@CONF[:PROMPT_MODE] = :INF_RUBY
+      when "--sample-book-mode", "--simple-prompt"
+	@CONF[:PROMPT_MODE] = :SIMPLE
+      when "--tracer"
+	@CONF[:USE_TRACER] = true
+      when "--back-trace-limit"
+	@CONF[:BACK_TRACE_LIMIT] = ARGV.shift.to_i
+      when "--context-mode"
+	@CONF[:CONTEXT_MODE] = ARGV.shift.to_i
+      when "--single-irb"
+	@CONF[:SINGLE_IRB] = true
+      when "--irb_debug"
+	@CONF[:DEBUG_LEVEL] = ARGV.shift.to_i
+      when "-v", "--version"
+	print IRB.version, "\n"
+	exit 0
+      when "-h", "--help"
+	require "irb/help"
+	IRB.print_usage
+	exit 0
+      when /^-/
+	IRB.fail UnrecognizedSwitch, opt
+      else
+	@CONF[:SCRIPT] = opt
+	$0 = opt
+	break
+      end
+    end
+    if RUBY_VERSION >= FEATURE_IOPT_CHANGE_VERSION
+      load_path.collect! do |path|
+	/\A\.\// =~ path ? path : File.expand_path(path)
+      end
+    end
+    $LOAD_PATH.unshift(*load_path)
+  end
+
+  # running config
+  def IRB.run_config
+    if @CONF[:RC]
+      begin
+	load rc_file
+      rescue LoadError, Errno::ENOENT
+      rescue
+	print "load error: #{rc_file}\n"
+	print $!.class, ": ", $!, "\n"
+	for err in $@[0, $@.size - 2]
+	  print "\t", err, "\n"
+	end
+      end
+    end
+  end
+
+  IRBRC_EXT = "rc"
+  def IRB.rc_file(ext = IRBRC_EXT)
+    if !@CONF[:RC_NAME_GENERATOR]
+      rc_file_generators do |rcgen|
+	@CONF[:RC_NAME_GENERATOR] ||= rcgen
+	if File.exist?(rcgen.call(IRBRC_EXT))
+	  @CONF[:RC_NAME_GENERATOR] = rcgen
+	  break
+	end
+      end
+    end
+    @CONF[:RC_NAME_GENERATOR].call ext
+  end
+
+  # enumerate possible rc-file base name generators
+  def IRB.rc_file_generators
+    if irbrc = ENV["IRBRC"]
+      yield proc{|rc|  rc == "rc" ? irbrc : irbrc+rc}
+    end
+    if home = ENV["HOME"]
+      yield proc{|rc| home+"/.irb#{rc}"} 
+    end
+    home = Dir.pwd
+    yield proc{|rc| home+"/.irb#{rc}"}
+    yield proc{|rc| home+"/irb#{rc.sub(/\A_?/, '.')}"}
+    yield proc{|rc| home+"/_irb#{rc}"}
+    yield proc{|rc| home+"/$irb#{rc}"}
+  end
+
+  # loading modules
+  def IRB.load_modules
+    for m in @CONF[:LOAD_MODULES]
+      begin
+	require m
+      rescue
+	print $@[0], ":", $!.class, ": ", $!, "\n"
+      end
+    end
+  end
+
+end
diff --git a/ruby_1_8_6/lib/irb/input-method.rb b/ruby_1_8_6/lib/irb/input-method.rb
new file mode 100644
index 0000000000..bfb90fa59a
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/input-method.rb
@@ -0,0 +1,120 @@
+#
+#   irb/input-method.rb - input methods used irb
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+module IRB
+  # 
+  # InputMethod
+  #	StdioInputMethod
+  #	FileInputMethod
+  #	(ReadlineInputMethod)
+  #
+  STDIN_FILE_NAME = "(line)"
+  class InputMethod
+    @RCS_ID='-$Id$-'
+
+    def initialize(file = STDIN_FILE_NAME)
+      @file_name = file
+    end
+    attr_reader :file_name
+
+    attr_accessor :prompt
+    
+    def gets
+      IRB.fail NotImplementedError, "gets"
+    end
+    public :gets
+
+    def readable_atfer_eof?
+      false
+    end
+  end
+  
+  class StdioInputMethod < InputMethod
+    def initialize
+      super
+      @line_no = 0
+      @line = []
+    end
+
+    def gets
+      print @prompt
+      @line[@line_no += 1] = $stdin.gets
+    end
+
+    def eof?
+      $stdin.eof?
+    end
+
+    def readable_atfer_eof?
+      true
+    end
+
+    def line(line_no)
+      @line[line_no]
+    end
+  end
+  
+  class FileInputMethod < InputMethod
+    def initialize(file)
+      super
+      @io = open(file)
+    end
+    attr_reader :file_name
+
+    def eof?
+      @io.eof?
+    end
+
+    def gets
+      print @prompt
+      l = @io.gets
+#      print @prompt, l
+      l
+    end
+  end
+
+  begin
+    require "readline"
+    class ReadlineInputMethod < InputMethod
+      include Readline 
+      def initialize
+	super
+
+	@line_no = 0
+	@line = []
+	@eof = false
+      end
+
+      def gets
+	if l = readline(@prompt, false)
+          HISTORY.push(l) if !l.empty?
+	  @line[@line_no += 1] = l + "\n"
+	else
+	  @eof = true
+	  l
+	end
+      end
+
+      def eof?
+	@eof
+      end
+
+      def readable_atfer_eof?
+	true
+      end
+
+      def line(line_no)
+	@line[line_no]
+      end
+    end
+  rescue LoadError
+  end
+end
diff --git a/ruby_1_8_6/lib/irb/lc/error.rb b/ruby_1_8_6/lib/irb/lc/error.rb
new file mode 100644
index 0000000000..247596b7fe
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/lc/error.rb
@@ -0,0 +1,30 @@
+#
+#   irb/lc/error.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+require "e2mmap"
+
+module IRB
+
+  # exceptions
+  extend Exception2MessageMapper
+  def_exception :UnrecognizedSwitch, "Unrecognized switch: %s"
+  def_exception :NotImplementedError, "Need to define `%s'"
+  def_exception :CantReturnToNormalMode, "Can't return to normal mode."
+  def_exception :IllegalParameter, "Illegal parameter(%s)."
+  def_exception :IrbAlreadyDead, "Irb is already dead."
+  def_exception :IrbSwitchedToCurrentThread, "Switched to current thread."
+  def_exception :NoSuchJob, "No such job(%s)."
+  def_exception :CantShiftToMultiIrbMode, "Can't shift to multi irb mode."
+  def_exception :CantChangeBinding, "Can't change binding to (%s)."
+  def_exception :UndefinedPromptMode, "Undefined prompt mode(%s)."
+
+end
+
diff --git a/ruby_1_8_6/lib/irb/lc/help-message b/ruby_1_8_6/lib/irb/lc/help-message
new file mode 100644
index 0000000000..32087d113c
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/lc/help-message
@@ -0,0 +1,35 @@
+#
+#   irb/lc/help-message.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+Usage:  irb.rb [options] [programfile] [arguments]
+  -f		    Suppress read of ~/.irbrc 
+  -m		    Bc mode (load mathn, fraction or matrix are available)
+  -d                Set $DEBUG to true (same as `ruby -d')
+  -r load-module    Same as `ruby -r'
+  -I path           Specify $LOAD_PATH directory
+  --inspect	    Use `inspect' for output (default except for bc mode)
+  --noinspect	    Don't use inspect for output
+  --readline	    Use Readline extension module
+  --noreadline	    Don't use Readline extension module
+  --prompt prompt-mode
+  --prompt-mode prompt-mode
+		    Switch prompt mode. Pre-defined prompt modes are
+		    `default', `simple', `xmp' and `inf-ruby'
+  --inf-ruby-mode   Use prompt appropriate for inf-ruby-mode on emacs. 
+		    Suppresses --readline. 
+  --simple-prompt   Simple prompt mode
+  --noprompt	    No prompt mode
+  --tracer	    Display trace for each execution of commands.
+  --back-trace-limit n
+		    Display backtrace top n and tail n. The default
+		    value is 16. 
+  --irb_debug n	    Set internal debug level to n (not for popular use)
+  -v, --version	    Print the version of irb
diff --git a/ruby_1_8_6/lib/irb/lc/ja/error.rb b/ruby_1_8_6/lib/irb/lc/ja/error.rb
new file mode 100644
index 0000000000..4c2fb3b839
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/lc/ja/error.rb
@@ -0,0 +1,27 @@
+#
+#   irb/lc/ja/error.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+require "e2mmap"
+
+module IRB
+  # exceptions
+  extend Exception2MessageMapper
+  def_exception :UnrecognizedSwitch, '$B%9%$%C%A(B(%s)$B$,J,$j$^$;$s(B'
+  def_exception :NotImplementedError, '`%s\'$B$NDj5A$,I,MW$G$9(B'
+  def_exception :CantReturnToNormalMode, 'Normal$B%b!<%I$KLa$l$^$;$s(B.'
+  def_exception :IllegalParameter, '$B%Q%i%a!<%?(B(%s)$B$,4V0c$C$F$$$^$9(B.'
+  def_exception :IrbAlreadyDead, 'Irb$B$O4{$K;`$s$G$$$^$9(B.'
+  def_exception :IrbSwitchedToCurrentThread, '$B%+%l%s%H%9%l%C%I$K@Z$jBX$o$j$^$7$?(B.'
+  def_exception :NoSuchJob, '$B$=$N$h$&$J%8%g%V(B(%s)$B$O$"$j$^$;$s(B.'
+  def_exception :CantShiftToMultiIrbMode, 'multi-irb mode$B$K0\$l$^$;$s(B.'
+  def_exception :CantChangeBinding, '$B%P%$%s%G%#%s%0(B(%s)$B$KJQ99$G$-$^$;$s(B.'
+  def_exception :UndefinedPromptMode, '$B%W%m%s%W%H%b!<%I(B(%s)$B$ODj5A$5$l$F$$$^$;$s(B.'
+end
diff --git a/ruby_1_8_6/lib/irb/lc/ja/help-message b/ruby_1_8_6/lib/irb/lc/ja/help-message
new file mode 100644
index 0000000000..debbfe9355
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/lc/ja/help-message
@@ -0,0 +1,36 @@
+#
+#   irb/lc/ja/help-message.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+Usage:  irb.rb [options] [programfile] [arguments]
+  -f		    ~/.irbrc $B$rFI$_9~$^$J$$(B.
+  -m		    bc$B%b!<%I(B($BJ,?t(B, $B9TNs$N7W;;$,$G$-$k(B)
+  -d                $DEBUG $B$r(Btrue$B$K$9$k(B(ruby -d $B$HF1$8(B)
+  -r load-module    ruby -r $B$HF1$8(B.
+  -I path           $LOAD_PATH $B$K(B path $B$rDI2C$9$k(B.
+  --inspect	    $B7k2L=PNO$K(Binspect$B$rMQ$$$k(B(bc$B%b!<%I0J30$O%G%U%)%k%H(B). 
+  --noinspect	    $B7k2L=PNO$K(Binspect$B$rMQ$$$J$$(B.
+  --readline	    readline$B%i%$%V%i%j$rMxMQ$9$k(B.
+  --noreadline	    readline$B%i%$%V%i%j$rMxMQ$7$J$$(B. 
+  --prompt prompt-mode/--prompt-mode prompt-mode
+		    $B%W%m%s%W%H%b!<%I$r@ZBX$($^$9(B. $B8=:_Dj5A$5$l$F$$$k%W(B
+		    $B%m%s%W%H%b!<%I$O(B, default, simple, xmp, inf-ruby$B$,(B
+		    $BMQ0U$5$l$F$$$^$9(B. 
+  --inf-ruby-mode   emacs$B$N(Binf-ruby-mode$BMQ$N%W%m%s%W%HI=<($r9T$J$&(B. $BFC(B
+		    $B$K;XDj$,$J$$8B$j(B, readline$B%i%$%V%i%j$O;H$o$J$/$J$k(B.
+  --simple-prompt   $BHs>o$K%7%s%W%k$J%W%m%s%W%H$rMQ$$$k%b!<%I$G$9(B.
+  --noprompt	    $B%W%m%s%W%HI=<($r9T$J$o$J$$(B.
+  --tracer	    $B%3%^%s%I<B9T;~$K%H%l!<%9$r9T$J$&(B.
+  --back-trace-limit n
+		    $B%P%C%/%H%l!<%9I=<($r%P%C%/%H%l!<%9$NF,$+$i(B n, $B8e$m(B
+		    $B$+$i(Bn$B$@$19T$J$&(B. $B%G%U%)%k%H$O(B16 
+  --irb_debug n	    irb$B$N%G%P%C%0%G%P%C%0%l%Y%k$r(Bn$B$K@_Dj$9$k(B($BMxMQ$7$J(B
+		    $B$$J}$,L5Fq$G$7$g$&(B).
+  -v, --version	    irb$B$N%P!<%8%g%s$rI=<($9$k(B
diff --git a/ruby_1_8_6/lib/irb/locale.rb b/ruby_1_8_6/lib/irb/locale.rb
new file mode 100644
index 0000000000..5ed9f54507
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/locale.rb
@@ -0,0 +1,184 @@
+#
+#   irb/locale.rb - internationalization module
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+autoload :Kconv, "kconv"
+
+module IRB
+  class Locale
+    @RCS_ID='-$Id$-'
+
+    JPDefaultLocale = "ja"
+    LOCALE_DIR = "/lc/"
+
+    def initialize(locale = nil)
+      @lang = locale || ENV["IRB_LANG"] || ENV["LC_MESSAGES"] || ENV["LC_ALL"] || ENV["LANG"] || "C" 
+    end
+
+    attr_reader :lang
+
+    def lc2kconv(lang)
+      case lang
+      when "ja_JP.ujis", "ja_JP.euc", "ja_JP.eucJP"
+        Kconv::EUC
+      when "ja_JP.sjis", "ja_JP.SJIS"
+        Kconv::SJIS
+      when /ja_JP.utf-?8/i
+	Kconv::UTF8
+      end
+    end
+    private :lc2kconv
+
+    def String(mes)
+      mes = super(mes)
+      case @lang
+      when /^ja/
+	mes = Kconv::kconv(mes, lc2kconv(@lang))
+      else
+	mes
+      end
+      mes
+    end
+
+    def format(*opts)
+      String(super(*opts))
+    end
+
+    def gets(*rs)
+      String(super(*rs))
+    end
+
+    def readline(*rs)
+      String(super(*rs))
+    end
+
+    def print(*opts)
+      ary = opts.collect{|opt| String(opt)}
+      super(*ary)
+    end
+
+    def printf(*opts)
+      s = format(*opts)
+      print s
+    end
+
+    def puts(*opts)
+      ary = opts.collect{|opt| String(opt)}
+      super(*ary)
+    end
+
+    def require(file, priv = nil)
+      rex = Regexp.new("lc/#{Regexp.quote(file)}\.(so|o|sl|rb)?")
+      return false if $".find{|f| f =~ rex}
+
+      case file
+      when /\.rb$/
+	begin
+	  load(file, priv)
+	  $".push file
+	  return true
+	rescue LoadError
+	end
+      when /\.(so|o|sl)$/
+	return super
+      end
+
+      begin
+	load(f = file + ".rb")
+	$".push f  #"
+	return true
+      rescue LoadError
+	return ruby_require(file)
+      end
+    end
+
+    alias toplevel_load load
+    
+    def load(file, priv=nil)
+      dir = File.dirname(file)
+      dir = "" if dir == "."
+      base = File.basename(file)
+
+      if /^ja(_JP)?$/ =~ @lang
+ 	back, @lang = @lang, "C"
+      end
+      begin
+	if dir[0] == ?/ #/
+	  lc_path = search_file(dir, base)
+	  return real_load(lc_path, priv) if lc_path
+	end
+	
+	for path in $:
+	  lc_path = search_file(path + "/" + dir, base)
+	  return real_load(lc_path, priv) if lc_path
+	end
+      ensure
+	@lang = back if back
+      end
+      raise LoadError, "No such file to load -- #{file}"
+    end 
+
+    def real_load(path, priv)
+      src = self.String(File.read(path))
+      if priv
+	eval("self", TOPLEVEL_BINDING).extend(Module.new {eval(src, nil, path)})
+      else
+	eval(src, TOPLEVEL_BINDING, path)
+      end
+    end
+    private :real_load
+
+    def find(file , paths = $:)
+      dir = File.dirname(file)
+      dir = "" if dir == "."
+      base = File.basename(file)
+      if dir[0] == ?/ #/
+	  return lc_path = search_file(dir, base)
+      else
+	for path in $:
+	  if lc_path = search_file(path + "/" + dir, base)
+	    return lc_path
+	  end
+	end
+      end
+      nil
+    end
+
+    def search_file(path, file)
+      if File.exist?(p1 = path + lc_path(file, "C"))
+	if File.exist?(p2 = path + lc_path(file))
+	  return p2
+	else
+	end
+	return p1
+      else
+      end
+      nil
+    end
+    private :search_file
+
+    def lc_path(file = "", lc = @lang)
+      case lc
+      when "C"
+	LOCALE_DIR + file
+      when /^ja/
+	LOCALE_DIR + "ja/" + file
+      else
+	LOCALE_DIR + @lang + "/" + file
+      end
+    end
+    private :lc_path
+  end
+end
+
+
+
+
diff --git a/ruby_1_8_6/lib/irb/notifier.rb b/ruby_1_8_6/lib/irb/notifier.rb
new file mode 100644
index 0000000000..c8e66fa859
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/notifier.rb
@@ -0,0 +1,145 @@
+#
+#   notifier.rb - optput methods used by irb 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+require "e2mmap"
+require "irb/output-method"
+
+module IRB
+  module Notifier
+    extend Exception2MessageMapper
+    def_exception :ErrUndefinedNotifier, 
+      "undefined notifier level: %d is specified"
+    def_exception :ErrUnrecognizedLevel, 
+      "unrecognized notifier level: %s is specified"
+
+    def def_notifier(prefix = "", output_method = StdioOutputMethod.new)
+      CompositeNotifier.new(prefix, output_method)
+    end
+    module_function :def_notifier
+  
+    class AbstructNotifier
+      def initialize(prefix, base_notifier)
+	@prefix = prefix
+	@base_notifier = base_notifier
+      end
+
+      attr_reader :prefix
+
+      def notify?
+	true
+      end
+
+      def print(*opts)
+	@base_notifier.print prefix, *opts if notify?
+      end
+
+      def printn(*opts)
+	@base_notifier.printn prefix, *opts if notify?
+      end
+
+      def printf(format, *opts)
+	@base_notifier.printf(prefix + format, *opts) if notify?
+      end
+
+      def puts(*objs)
+	if notify?
+	  @base_notifier.puts(*objs.collect{|obj| prefix + obj.to_s})
+	end
+      end
+
+      def pp(*objs)
+	if notify?
+	  @base_notifier.ppx @prefix, *objs
+	end
+      end
+
+      def ppx(prefix, *objs)
+	if notify?
+	  @base_notifier.ppx @prefix+prefix, *objs
+	end
+      end
+
+      def exec_if
+	yield(@base_notifier) if notify?
+      end
+    end
+
+    class CompositeNotifier<AbstructNotifier
+      def initialize(prefix, base_notifier)
+	super
+
+	@notifiers = [D_NOMSG]
+	@level_notifier = D_NOMSG
+      end
+
+      attr_reader :notifiers
+
+      def def_notifier(level, prefix = "")
+	notifier = LeveledNotifier.new(self, level, prefix)
+	@notifiers[level] = notifier
+	notifier
+      end
+
+      attr_reader :level_notifier
+      alias level level_notifier
+
+      def level_notifier=(value)
+	case value
+	when AbstructNotifier
+	  @level_notifier = value
+	when Integer
+	  l = @notifiers[value]
+	  Notifier.Raise ErrUndefinedNotifer, value unless l
+	  @level_notifier = l
+	else
+	  Notifier.Raise ErrUnrecognizedLevel, value unless l
+	end
+      end
+
+      alias level= level_notifier=
+    end
+
+    class LeveledNotifier<AbstructNotifier
+      include Comparable
+
+      def initialize(base, level, prefix)
+	super(prefix, base)
+	
+	@level = level
+      end
+
+      attr_reader :level
+
+      def <=>(other)
+	@level <=> other.level
+      end
+      
+      def notify?
+	@base_notifier.level >= self
+      end
+    end
+
+    class NoMsgNotifier<LeveledNotifier
+      def initialize
+	@base_notifier = nil
+	@level = 0
+	@prefix = ""
+      end
+
+      def notify?
+	false
+      end
+    end
+
+    D_NOMSG = NoMsgNotifier.new
+  end
+end
diff --git a/ruby_1_8_6/lib/irb/output-method.rb b/ruby_1_8_6/lib/irb/output-method.rb
new file mode 100644
index 0000000000..b9a3a8851e
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/output-method.rb
@@ -0,0 +1,85 @@
+#
+#   output-method.rb - optput methods used by irb 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+require "e2mmap"
+
+module IRB
+  # OutputMethod
+  #   StdioOutputMethod
+
+  class OutputMethod
+    @RCS_ID='-$Id$-'
+
+    def print(*opts)
+      IRB.fail NotImplementError, "print"
+    end
+
+    def printn(*opts)
+      print opts.join(" "), "\n"
+    end
+
+    # extend printf
+    def printf(format, *opts)
+      if /(%*)%I/ =~ format
+	format, opts = parse_printf_format(format, opts)
+      end
+      print sprintf(format, *opts)
+    end
+
+    # %
+    # <フラグ>  [#0- +]
+    # <最小フィールド幅> (\*|\*[1-9][0-9]*\$|[1-9][0-9]*)
+    # <精度>.(\*|\*[1-9][0-9]*\$|[1-9][0-9]*|)?
+    # #<長さ修正文字>(hh|h|l|ll|L|q|j|z|t)
+    # <変換修正文字>[diouxXeEfgGcsb%] 
+    def parse_printf_format(format, opts)
+      return format, opts if $1.size % 2 == 1
+    end
+
+    def foo(format)
+      pos = 0
+      inspects = []
+      format.scan(/%[#0\-+ ]?(\*(?=[^0-9])|\*[1-9][0-9]*\$|[1-9][0-9]*(?=[^0-9]))?(\.(\*(?=[^0-9])|\*[1-9][0-9]*\$|[1-9][0-9]*(?=[^0-9])))?(([1-9][0-9]*\$)*)([diouxXeEfgGcsb%])/) {|f, p, pp, pos, new_pos, c|
+	puts [f, p, pp, pos, new_pos, c].join("!")
+	pos = new_pos if new_pos
+	if c == "I"
+	  inspects.push pos.to_i 
+	  (f||"")+(p||"")+(pp||"")+(pos||"")+"s"
+	else
+	  $&
+	end
+      }
+    end
+
+    def puts(*objs)
+      for obj in objs
+	print(*obj)
+	print "\n"
+      end
+    end
+
+    def pp(*objs)
+      puts(*objs.collect{|obj| obj.inspect})
+    end
+
+    def ppx(prefix, *objs)
+      puts(*objs.collect{|obj| prefix+obj.inspect})
+    end
+
+  end
+
+  class StdioOutputMethod<OutputMethod
+    def print(*opts)
+      STDOUT.print(*opts)
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/irb/ruby-lex.rb b/ruby_1_8_6/lib/irb/ruby-lex.rb
new file mode 100644
index 0000000000..ab584d5253
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/ruby-lex.rb
@@ -0,0 +1,1149 @@
+#
+#   irb/ruby-lex.rb - ruby lexcal analizer
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+require "e2mmap"
+require "irb/slex"
+require "irb/ruby-token"
+
+class RubyLex
+  @RCS_ID='-$Id$-'
+
+  extend Exception2MessageMapper
+  def_exception(:AlreadyDefinedToken, "Already defined token(%s)")
+  def_exception(:TkReading2TokenNoKey, "key nothing(key='%s')")
+  def_exception(:TkSymbol2TokenNoKey, "key nothing(key='%s')")
+  def_exception(:TkReading2TokenDuplicateError, 
+		"key duplicate(token_n='%s', key='%s')")
+  def_exception(:SyntaxError, "%s")
+
+  def_exception(:TerminateLineInput, "Terminate Line Input")
+  
+  include RubyToken
+
+  class << self
+    attr_accessor :debug_level
+    def debug?
+      @debug_level > 0
+    end
+  end
+  @debug_level = 0
+
+  def initialize
+    lex_init
+    set_input(STDIN)
+
+    @seek = 0
+    @exp_line_no = @line_no = 1
+    @base_char_no = 0
+    @char_no = 0
+    @rests = []
+    @readed = []
+    @here_readed = []
+
+    @indent = 0
+    @indent_stack = []
+    @lex_state = EXPR_BEG
+    @space_seen = false
+    @here_header = false
+    
+    @continue = false
+    @line = ""
+
+    @skip_space = false
+    @readed_auto_clean_up = false
+    @exception_on_syntax_error = true
+
+    @prompt = nil
+  end
+
+  attr_accessor :skip_space
+  attr_accessor :readed_auto_clean_up
+  attr_accessor :exception_on_syntax_error
+
+  attr_reader :seek
+  attr_reader :char_no
+  attr_reader :line_no
+  attr_reader :indent
+
+  # io functions
+  def set_input(io, p = nil, &block)
+    @io = io
+    if p.respond_to?(:call)
+      @input = p
+    elsif block_given?
+      @input = block
+    else
+      @input = Proc.new{@io.gets}
+    end
+  end
+
+  def get_readed
+    if idx = @readed.reverse.index("\n")
+      @base_char_no = idx
+    else
+      @base_char_no += @readed.size
+    end
+    
+    readed = @readed.join("")
+    @readed = []
+    readed
+  end
+
+  def getc
+    while @rests.empty?
+#      return nil unless buf_input
+      @rests.push nil unless buf_input
+    end
+    c = @rests.shift
+    if @here_header
+      @here_readed.push c
+    else
+      @readed.push c
+    end
+    @seek += 1
+    if c == "\n"
+      @line_no += 1 
+      @char_no = 0
+    else
+      @char_no += 1
+    end
+    c
+  end
+
+  def gets
+    l = ""
+    while c = getc
+      l.concat(c)
+      break if c == "\n"
+    end
+    return nil if l == "" and c.nil?
+    l
+  end
+
+  def eof?
+    @io.eof?
+  end
+
+  def getc_of_rests
+    if @rests.empty?
+      nil
+    else
+      getc
+    end
+  end
+
+  def ungetc(c = nil)
+    if @here_readed.empty?
+      c2 = @readed.pop
+    else
+      c2 = @here_readed.pop
+    end
+    c = c2 unless c
+    @rests.unshift c #c = 
+      @seek -= 1
+    if c == "\n"
+      @line_no -= 1 
+      if idx = @readed.reverse.index("\n")
+	@char_no = @readed.size - idx
+      else
+	@char_no = @base_char_no + @readed.size
+      end
+    else
+      @char_no -= 1
+    end
+  end
+
+  def peek_equal?(str)
+    chrs = str.split(//)
+    until @rests.size >= chrs.size
+      return false unless buf_input
+    end
+    @rests[0, chrs.size] == chrs
+  end
+
+  def peek_match?(regexp)
+    while @rests.empty?
+      return false unless buf_input
+    end
+    regexp =~ @rests.join("")
+  end
+
+  def peek(i = 0)
+    while @rests.size <= i
+      return nil unless buf_input
+    end
+    @rests[i]
+  end
+
+  def buf_input
+    prompt
+    line = @input.call
+    return nil unless line
+    @rests.concat line.split(//)
+    true
+  end
+  private :buf_input
+
+  def set_prompt(p = nil, &block)
+    p = block if block_given?
+    if p.respond_to?(:call)
+      @prompt = p
+    else
+      @prompt = Proc.new{print p}
+    end
+  end
+
+  def prompt
+    if @prompt
+      @prompt.call(@ltype, @indent, @continue, @line_no)
+    end
+  end
+
+  def initialize_input
+    @ltype = nil
+    @quoted = nil
+    @indent = 0
+    @indent_stack = []
+    @lex_state = EXPR_BEG
+    @space_seen = false
+    @here_header = false
+    
+    @continue = false
+    prompt
+
+    @line = ""
+    @exp_line_no = @line_no
+  end
+  
+  def each_top_level_statement
+    initialize_input
+    catch(:TERM_INPUT) do
+      loop do
+	begin
+	  @continue = false
+	  prompt
+	  unless l = lex
+	    throw :TERM_INPUT if @line == ''
+	  else
+	    #p l
+	    @line.concat l
+	    if @ltype or @continue or @indent > 0
+	      next
+	    end
+	  end
+	  if @line != "\n"
+	    yield @line, @exp_line_no
+	  end
+	  break unless l
+	  @line = ''
+	  @exp_line_no = @line_no
+
+	  @indent = 0
+	  @indent_stack = []
+	  prompt
+	rescue TerminateLineInput
+	  initialize_input
+	  prompt
+	  get_readed
+	end
+      end
+    end
+  end
+
+  def lex
+    until (((tk = token).kind_of?(TkNL) || tk.kind_of?(TkEND_OF_SCRIPT)) &&
+	     !@continue or
+	     tk.nil?)
+      #p tk
+      #p @lex_state
+      #p self
+    end
+    line = get_readed
+    #      print self.inspect
+    if line == "" and tk.kind_of?(TkEND_OF_SCRIPT) || tk.nil?
+      nil
+    else
+      line
+    end
+  end
+
+  def token
+    #      require "tracer"
+    #      Tracer.on
+    @prev_seek = @seek
+    @prev_line_no = @line_no
+    @prev_char_no = @char_no
+    begin
+      begin
+	tk = @OP.match(self)
+	@space_seen = tk.kind_of?(TkSPACE)
+      rescue SyntaxError
+	raise if @exception_on_syntax_error
+	tk = TkError.new(@seek, @line_no, @char_no)
+      end
+    end while @skip_space and tk.kind_of?(TkSPACE)
+    if @readed_auto_clean_up
+      get_readed
+    end
+    #      Tracer.off
+    tk
+  end
+  
+  ENINDENT_CLAUSE = [
+    "case", "class", "def", "do", "for", "if",
+    "module", "unless", "until", "while", "begin" #, "when"
+  ]
+  DEINDENT_CLAUSE = ["end" #, "when"
+  ]
+
+  PERCENT_LTYPE = {
+    "q" => "\'",
+    "Q" => "\"",
+    "x" => "\`",
+    "r" => "/",
+    "w" => "]",
+    "W" => "]",
+    "s" => ":"
+  }
+  
+  PERCENT_PAREN = {
+    "{" => "}",
+    "[" => "]",
+    "<" => ">",
+    "(" => ")"
+  }
+
+  Ltype2Token = {
+    "\'" => TkSTRING,
+    "\"" => TkSTRING,
+    "\`" => TkXSTRING,
+    "/" => TkREGEXP,
+    "]" => TkDSTRING,
+    ":" => TkSYMBOL
+  }
+  DLtype2Token = {
+    "\"" => TkDSTRING,
+    "\`" => TkDXSTRING,
+    "/" => TkDREGEXP,
+  }
+
+  def lex_init()
+    @OP = IRB::SLex.new
+    @OP.def_rules("\0", "\004", "\032") do |op, io|
+      Token(TkEND_OF_SCRIPT)
+    end
+
+    @OP.def_rules(" ", "\t", "\f", "\r", "\13") do |op, io|
+      @space_seen = true
+      while getc =~ /[ \t\f\r\13]/; end
+      ungetc
+      Token(TkSPACE)
+    end
+
+    @OP.def_rule("#") do |op, io|
+      identify_comment
+    end
+
+    @OP.def_rule("=begin",
+		 proc{|op, io| @prev_char_no == 0 && peek(0) =~ /\s/}) do 
+      |op, io|
+      @ltype = "="
+      until getc == "\n"; end
+      until peek_equal?("=end") && peek(4) =~ /\s/
+	until getc == "\n"; end
+      end
+      gets
+      @ltype = nil
+      Token(TkRD_COMMENT)
+    end
+
+    @OP.def_rule("\n") do |op, io|
+      print "\\n\n" if RubyLex.debug?
+      case @lex_state
+      when EXPR_BEG, EXPR_FNAME, EXPR_DOT
+	@continue = true
+      else
+	@continue = false
+	@lex_state = EXPR_BEG
+	until (@indent_stack.empty? || 
+	       [TkLPAREN, TkLBRACK, TkLBRACE, 
+		 TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
+	  @indent_stack.pop
+	end
+      end
+      @here_header = false
+      @here_readed = []
+      Token(TkNL)
+    end
+
+    @OP.def_rules("*", "**",	
+		  "=", "==", "===", 
+		  "=~", "<=>",	
+		  "<", "<=",
+		  ">", ">=", ">>") do
+      |op, io|
+      case @lex_state
+      when EXPR_FNAME, EXPR_DOT
+	@lex_state = EXPR_ARG
+      else
+	@lex_state = EXPR_BEG
+      end
+      Token(op)
+    end
+
+    @OP.def_rules("!", "!=", "!~") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token(op)
+    end
+
+    @OP.def_rules("<<") do
+      |op, io|
+      tk = nil
+      if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
+	  (@lex_state != EXPR_ARG || @space_seen)
+	c = peek(0)
+	if /\S/ =~ c && (/["'`]/ =~ c || /[\w_]/ =~ c || c == "-")
+	  tk = identify_here_document
+	end
+      end
+      unless tk
+	tk = Token(op)
+	case @lex_state
+	when EXPR_FNAME, EXPR_DOT
+	  @lex_state = EXPR_ARG
+	else
+	  @lex_state = EXPR_BEG
+	end
+      end
+      tk
+    end
+
+    @OP.def_rules("'", '"') do
+      |op, io|
+      identify_string(op)
+    end
+
+    @OP.def_rules("`") do
+      |op, io|
+      if @lex_state == EXPR_FNAME
+	@lex_state = EXPR_END
+	Token(op)
+      else
+	identify_string(op)
+      end
+    end
+
+    @OP.def_rules('?') do
+      |op, io|
+      if @lex_state == EXPR_END
+	@lex_state = EXPR_BEG
+	Token(TkQUESTION)
+      else
+	ch = getc
+	if @lex_state == EXPR_ARG && ch =~ /\s/
+	  ungetc
+	  @lex_state = EXPR_BEG;
+	  Token(TkQUESTION)
+	else
+	  if (ch == '\\') 
+	    read_escape
+	  end
+	  @lex_state = EXPR_END
+	  Token(TkINTEGER)
+	end
+      end
+    end
+
+    @OP.def_rules("&", "&&", "|", "||") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token(op)
+    end
+    
+    @OP.def_rules("+=", "-=", "*=", "**=", 
+		  "&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      op =~ /^(.*)=$/
+      Token(TkOPASGN, $1)
+    end
+
+    @OP.def_rule("+@", proc{|op, io| @lex_state == EXPR_FNAME}) do
+      |op, io|
+      @lex_state = EXPR_ARG
+      Token(op)
+    end
+
+    @OP.def_rule("-@", proc{|op, io| @lex_state == EXPR_FNAME}) do
+      |op, io|
+      @lex_state = EXPR_ARG
+      Token(op)
+    end
+
+    @OP.def_rules("+", "-") do
+      |op, io|
+      catch(:RET) do
+	if @lex_state == EXPR_ARG
+	  if @space_seen and peek(0) =~ /[0-9]/
+	    throw :RET, identify_number
+	  else
+	    @lex_state = EXPR_BEG
+	  end
+	elsif @lex_state != EXPR_END and peek(0) =~ /[0-9]/
+	  throw :RET, identify_number
+	else
+	  @lex_state = EXPR_BEG
+	end
+	Token(op)
+      end
+    end
+
+    @OP.def_rule(".") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      if peek(0) =~ /[0-9]/
+	ungetc
+	identify_number
+      else
+	# for "obj.if" etc.
+	@lex_state = EXPR_DOT
+	Token(TkDOT)
+      end
+    end
+
+    @OP.def_rules("..", "...") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token(op)
+    end
+
+    lex_int2
+  end
+  
+  def lex_int2
+    @OP.def_rules("]", "}", ")") do
+      |op, io|
+      @lex_state = EXPR_END
+      @indent -= 1
+      @indent_stack.pop
+      Token(op)
+    end
+
+    @OP.def_rule(":") do
+      |op, io|
+      if @lex_state == EXPR_END || peek(0) =~ /\s/
+	@lex_state = EXPR_BEG
+	Token(TkCOLON)
+      else
+	@lex_state = EXPR_FNAME;
+	Token(TkSYMBEG)
+      end
+    end
+
+    @OP.def_rule("::") do
+       |op, io|
+#      p @lex_state.id2name, @space_seen
+      if @lex_state == EXPR_BEG or @lex_state == EXPR_ARG && @space_seen
+	@lex_state = EXPR_BEG
+	Token(TkCOLON3)
+      else
+	@lex_state = EXPR_DOT
+	Token(TkCOLON2)
+      end
+    end
+
+    @OP.def_rule("/") do
+      |op, io|
+      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+	identify_string(op)
+      elsif peek(0) == '='
+	getc
+	@lex_state = EXPR_BEG
+	Token(TkOPASGN, "/") #/)
+      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
+	identify_string(op)
+      else 
+	@lex_state = EXPR_BEG
+	Token("/") #/)
+      end
+    end
+
+    @OP.def_rules("^") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token("^")
+    end
+
+    #       @OP.def_rules("^=") do
+    # 	@lex_state = EXPR_BEG
+    # 	Token(OP_ASGN, :^)
+    #       end
+    
+    @OP.def_rules(",") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token(op)
+    end
+
+    @OP.def_rules(";") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      until (@indent_stack.empty? || 
+	     [TkLPAREN, TkLBRACK, TkLBRACE, 
+	       TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
+	@indent_stack.pop
+      end
+      Token(op)
+    end
+
+    @OP.def_rule("~") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token("~")
+    end
+
+    @OP.def_rule("~@", proc{|op, io| @lex_state == EXPR_FNAME}) do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token("~")
+    end
+    
+    @OP.def_rule("(") do
+      |op, io|
+      @indent += 1
+      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+	@lex_state = EXPR_BEG
+	tk_c = TkfLPAREN
+      else
+	@lex_state = EXPR_BEG
+	tk_c = TkLPAREN
+      end
+      @indent_stack.push tk_c
+      tk = Token(tk_c)
+    end
+
+    @OP.def_rule("[]", proc{|op, io| @lex_state == EXPR_FNAME}) do
+      |op, io|
+      @lex_state = EXPR_ARG
+      Token("[]")
+    end
+
+    @OP.def_rule("[]=", proc{|op, io| @lex_state == EXPR_FNAME}) do
+      |op, io|
+      @lex_state = EXPR_ARG
+      Token("[]=")
+    end
+
+    @OP.def_rule("[") do
+      |op, io|
+      @indent += 1
+      if @lex_state == EXPR_FNAME
+	tk_c = TkfLBRACK
+      else
+	if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+	  tk_c = TkLBRACK
+	elsif @lex_state == EXPR_ARG && @space_seen
+	  tk_c = TkLBRACK
+	else
+	  tk_c = TkfLBRACK
+	end
+	@lex_state = EXPR_BEG
+      end
+      @indent_stack.push tk_c
+      Token(tk_c)
+    end
+
+    @OP.def_rule("{") do
+      |op, io|
+      @indent += 1
+      if @lex_state != EXPR_END && @lex_state != EXPR_ARG
+	tk_c = TkLBRACE
+      else
+	tk_c = TkfLBRACE
+      end
+      @lex_state = EXPR_BEG
+      @indent_stack.push tk_c
+      Token(tk_c)
+    end
+
+    @OP.def_rule('\\') do
+      |op, io|
+      if getc == "\n"
+	@space_seen = true
+	@continue = true
+	Token(TkSPACE)
+      else
+	ungetc
+	Token("\\")
+      end
+    end
+
+    @OP.def_rule('%') do
+      |op, io|
+      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+	identify_quotation
+      elsif peek(0) == '='
+	getc
+	Token(TkOPASGN, :%)
+      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
+	identify_quotation
+      else
+	@lex_state = EXPR_BEG
+	Token("%") #))
+      end
+    end
+
+    @OP.def_rule('$') do
+      |op, io|
+      identify_gvar
+    end
+
+    @OP.def_rule('@') do
+      |op, io|
+      if peek(0) =~ /[\w_@]/
+	ungetc
+	identify_identifier
+      else
+	Token("@")
+      end
+    end
+
+    #       @OP.def_rule("def", proc{|op, io| /\s/ =~ io.peek(0)}) do 
+    # 	|op, io|
+    # 	@indent += 1
+    # 	@lex_state = EXPR_FNAME
+    # #	@lex_state = EXPR_END
+    # #	until @rests[0] == "\n" or @rests[0] == ";"
+    # #	  rests.shift
+    # #	end
+    #       end
+
+    @OP.def_rule("") do
+      |op, io|
+      printf "MATCH: start %s: %s\n", op, io.inspect if RubyLex.debug?
+      if peek(0) =~ /[0-9]/
+	t = identify_number
+      elsif peek(0) =~ /[\w_]/
+	t = identify_identifier
+      end
+      printf "MATCH: end %s: %s\n", op, io.inspect if RubyLex.debug?
+      t
+    end
+    
+    p @OP if RubyLex.debug?
+  end
+  
+  def identify_gvar
+    @lex_state = EXPR_END
+    
+    case ch = getc
+    when /[~_*$?!@\/\\;,=:<>".]/   #"
+      Token(TkGVAR, "$" + ch)
+    when "-"
+      Token(TkGVAR, "$-" + getc)
+    when "&", "`", "'", "+"
+      Token(TkBACK_REF, "$"+ch)
+    when /[1-9]/
+      while getc =~ /[0-9]/; end
+      ungetc
+      Token(TkNTH_REF)
+    when /\w/
+      ungetc
+      ungetc
+      identify_identifier
+    else 
+      ungetc
+      Token("$")
+    end
+  end
+  
+  def identify_identifier
+    token = ""
+    if peek(0) =~ /[$@]/
+      token.concat(c = getc)
+      if c == "@" and peek(0) == "@"
+	token.concat getc
+      end
+    end
+
+    while (ch = getc) =~ /\w|_/
+      print ":", ch, ":" if RubyLex.debug?
+      token.concat ch
+    end
+    ungetc
+    
+    if (ch == "!" || ch == "?") && token[0,1] =~ /\w/ && peek(0) != "="
+      token.concat getc
+    end
+
+    # almost fix token
+
+    case token
+    when /^\$/
+      return Token(TkGVAR, token)
+    when /^\@\@/
+      @lex_state = EXPR_END
+      # p Token(TkCVAR, token)
+      return Token(TkCVAR, token)
+    when /^\@/
+      @lex_state = EXPR_END
+      return Token(TkIVAR, token)
+    end
+    
+    if @lex_state != EXPR_DOT
+      print token, "\n" if RubyLex.debug?
+
+      token_c, *trans = TkReading2Token[token]
+      if token_c
+	# reserved word?
+
+	if (@lex_state != EXPR_BEG &&
+	    @lex_state != EXPR_FNAME &&
+	    trans[1])
+	  # modifiers
+	  token_c = TkSymbol2Token[trans[1]]
+	  @lex_state = trans[0]
+	else
+	  if @lex_state != EXPR_FNAME
+	    if ENINDENT_CLAUSE.include?(token)
+	      # check for ``class = val'' etc.
+	      valid = true
+	      case token
+	      when "class"
+		valid = false unless peek_match?(/^\s*(<<|\w|::)/)
+	      when "def"
+		valid = false if peek_match?(/^\s*(([+-\/*&\|^]|<<|>>|\|\||\&\&)=|\&\&|\|\|)/)
+	      when "do"
+		valid = false if peek_match?(/^\s*([+-\/*]?=|\*|<|>|\&)/)
+	      when *ENINDENT_CLAUSE
+		valid = false if peek_match?(/^\s*([+-\/*]?=|\*|<|>|\&|\|)/)
+	      else
+		# no nothing
+	      end
+	      if valid
+		if token == "do"
+		  if ![TkFOR, TkWHILE, TkUNTIL].include?(@indent_stack.last)
+		    @indent += 1
+		    @indent_stack.push token_c
+		  end
+		else
+		  @indent += 1
+		  @indent_stack.push token_c
+		end
+#		p @indent_stack
+	      end
+
+	    elsif DEINDENT_CLAUSE.include?(token)
+	      @indent -= 1
+	      @indent_stack.pop
+	    end
+	    @lex_state = trans[0]
+	  else
+	    @lex_state = EXPR_END
+	  end
+	end
+	return Token(token_c, token)
+      end
+    end
+
+    if @lex_state == EXPR_FNAME
+      @lex_state = EXPR_END
+      if peek(0) == '='
+	token.concat getc
+      end
+    elsif @lex_state == EXPR_BEG || @lex_state == EXPR_DOT
+      @lex_state = EXPR_ARG
+    else
+      @lex_state = EXPR_END
+    end
+
+    if token[0, 1] =~ /[A-Z]/
+      return Token(TkCONSTANT, token)
+    elsif token[token.size - 1, 1] =~ /[!?]/
+      return Token(TkFID, token)
+    else
+      return Token(TkIDENTIFIER, token)
+    end
+  end
+
+  def identify_here_document
+    ch = getc
+#    if lt = PERCENT_LTYPE[ch]
+    if ch == "-"
+      ch = getc
+      indent = true
+    end
+    if /['"`]/ =~ ch
+      lt = ch
+      quoted = ""
+      while (c = getc) && c != lt
+	quoted.concat c
+      end
+    else
+      lt = '"'
+      quoted = ch.dup
+      while (c = getc) && c =~ /\w/
+	quoted.concat c
+      end
+      ungetc
+    end
+
+    ltback, @ltype = @ltype, lt
+    reserve = []
+    while ch = getc
+      reserve.push ch
+      if ch == "\\"
+	reserve.push ch = getc
+      elsif ch == "\n"
+	break
+      end
+    end
+
+    @here_header = false
+    while l = gets
+      l = l.sub(/(:?\r)?\n\z/, '')
+      if (indent ? l.strip : l) == quoted
+ 	break
+      end
+    end
+
+    @here_header = true
+    @here_readed.concat reserve
+    while ch = reserve.pop
+      ungetc ch
+    end
+
+    @ltype = ltback
+    @lex_state = EXPR_END
+    Token(Ltype2Token[lt])
+  end
+  
+  def identify_quotation
+    ch = getc
+    if lt = PERCENT_LTYPE[ch]
+      ch = getc
+    elsif ch =~ /\W/
+      lt = "\""
+    else
+      RubyLex.fail SyntaxError, "unknown type of %string"
+    end
+#     if ch !~ /\W/
+#       ungetc
+#       next
+#     end
+    #@ltype = lt
+    @quoted = ch unless @quoted = PERCENT_PAREN[ch]
+    identify_string(lt, @quoted)
+  end
+
+  def identify_number
+    @lex_state = EXPR_END
+
+    if peek(0) == "0" && peek(1) !~ /[.eE]/
+      getc
+      case peek(0)
+      when /[xX]/
+	ch = getc
+	match = /[0-9a-fA-F_]/
+      when /[bB]/
+	ch = getc
+	match = /[01_]/
+      when /[oO]/
+	ch = getc
+	match = /[0-7_]/
+      when /[dD]/
+	ch = getc
+	match = /[0-9_]/
+      when /[0-7]/
+	match = /[0-7_]/
+      when /[89]/
+	RubyLex.fail SyntaxError, "Illegal octal digit"
+      else 
+	return Token(TkINTEGER)
+      end
+      
+      len0 = true
+      non_digit = false
+      while ch = getc
+	if match =~ ch
+	  if ch == "_"
+	    if non_digit
+	      RubyLex.fail SyntaxError, "trailing `#{ch}' in number"
+	    else
+	      non_digit = ch
+	    end
+	  else
+	    non_digit = false
+	    len0 = false
+	  end
+	else
+	  ungetc
+	  if len0
+	    RubyLex.fail SyntaxError, "numeric literal without digits"
+	  end
+	  if non_digit
+	    RubyLex.fail SyntaxError, "trailing `#{non_digit}' in number"
+	  end
+	  break
+	end
+      end
+      return Token(TkINTEGER)
+    end
+    
+    type = TkINTEGER
+    allow_point = true
+    allow_e = true
+    non_digit = false
+    while ch = getc
+      case ch
+      when /[0-9]/
+	non_digit = false
+      when "_"
+	non_digit = ch
+      when allow_point && "."
+	if non_digit
+	  RubyLex.fail SyntaxError, "trailing `#{non_digit}' in number"
+	end
+	type = TkFLOAT
+	if peek(0) !~ /[0-9]/
+	  type = TkINTEGER
+	  ungetc
+	  break
+	end
+	allow_point = false
+      when allow_e && "e", allow_e && "E"
+	if non_digit
+	  RubyLex.fail SyntaxError, "trailing `#{non_digit}' in number"
+	end
+	type = TkFLOAT
+	if peek(0) =~ /[+-]/
+	  getc
+	end
+	allow_e = false
+	allow_point = false
+	non_digit = ch
+      else
+	if non_digit
+	  RubyLex.fail SyntaxError, "trailing `#{non_digit}' in number"
+	end
+	ungetc
+	break
+      end
+    end
+    Token(type)
+  end
+  
+  def identify_string(ltype, quoted = ltype)
+    @ltype = ltype
+    @quoted = quoted
+    subtype = nil
+    begin
+      nest = 0
+      while ch = getc
+	if @quoted == ch and nest == 0
+	  break
+	elsif @ltype != "'" && @ltype != "]" && @ltype != ":" and ch == "#"
+	  subtype = true
+	elsif ch == '\\' #'
+	  read_escape
+	end
+	if PERCENT_PAREN.values.include?(@quoted) 
+	  if PERCENT_PAREN[ch] == @quoted
+	    nest += 1
+	  elsif ch == @quoted
+	    nest -= 1
+	  end
+	end
+      end
+      if @ltype == "/"
+	if peek(0) =~ /i|m|x|o|e|s|u|n/
+	  getc
+	end
+      end
+      if subtype
+	Token(DLtype2Token[ltype])
+      else
+	Token(Ltype2Token[ltype])
+      end
+    ensure
+      @ltype = nil
+      @quoted = nil
+      @lex_state = EXPR_END
+    end
+  end
+  
+  def identify_comment
+    @ltype = "#"
+
+    while ch = getc
+#      if ch == "\\" #"
+#	read_escape
+#      end
+      if ch == "\n"
+	@ltype = nil
+	ungetc
+	break
+      end
+    end
+    return Token(TkCOMMENT)
+  end
+  
+  def read_escape
+    case ch = getc
+    when "\n", "\r", "\f"
+    when "\\", "n", "t", "r", "f", "v", "a", "e", "b", "s" #"
+    when /[0-7]/
+      ungetc ch
+      3.times do
+	case ch = getc
+	when /[0-7]/
+	when nil
+	  break
+	else
+	  ungetc
+	  break
+	end
+      end
+      
+    when "x"
+      2.times do
+	case ch = getc
+	when /[0-9a-fA-F]/
+	when nil
+	  break
+	else
+	  ungetc
+	  break
+	end
+      end
+
+    when "M"
+      if (ch = getc) != '-'
+	ungetc
+      else
+	if (ch = getc) == "\\" #"
+	  read_escape
+	end
+      end
+
+    when "C", "c" #, "^"
+      if ch == "C" and (ch = getc) != "-"
+	ungetc
+      elsif (ch = getc) == "\\" #"
+	read_escape
+      end
+    else
+      # other characters 
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/irb/ruby-token.rb b/ruby_1_8_6/lib/irb/ruby-token.rb
new file mode 100644
index 0000000000..525d4df14c
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/ruby-token.rb
@@ -0,0 +1,273 @@
+#
+#   irb/ruby-token.rb - ruby tokens 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+module RubyToken
+  EXPR_BEG = :EXPR_BEG
+  EXPR_MID = :EXPR_MID
+  EXPR_END = :EXPR_END
+  EXPR_ARG = :EXPR_ARG
+  EXPR_FNAME = :EXPR_FNAME
+  EXPR_DOT = :EXPR_DOT
+  EXPR_CLASS = :EXPR_CLASS
+
+  # for ruby 1.4X
+  if !defined?(Symbol)
+    Symbol = Integer
+  end
+  
+  class Token
+    def initialize(seek, line_no, char_no)
+      @seek = seek
+      @line_no = line_no
+      @char_no = char_no
+    end
+    attr :seek
+    attr :line_no
+    attr :char_no
+  end
+
+  class TkNode < Token
+    def initialize(seek, line_no, char_no)
+      super
+    end
+    attr :node
+  end
+
+  class TkId < Token
+    def initialize(seek, line_no, char_no, name)
+      super(seek, line_no, char_no)
+      @name = name
+    end
+    attr :name
+  end
+
+  class TkVal < Token
+    def initialize(seek, line_no, char_no, value = nil)
+      super(seek, line_no, char_no)
+      @value = value
+    end
+    attr :value
+  end
+
+  class TkOp < Token
+    attr :name, true
+  end
+
+  class TkOPASGN < TkOp
+    def initialize(seek, line_no, char_no, op)
+      super(seek, line_no, char_no)
+      op = TkReading2Token[op][0] unless op.kind_of?(Symbol)
+      @op = op
+    end
+    attr :op
+  end
+
+  class TkUnknownChar < Token
+    def initialize(seek, line_no, char_no, id)
+      super(seek, line_no, char_no)
+      @name = name
+    end
+    attr :name
+  end
+
+  class TkError < Token
+  end
+
+  def Token(token, value = nil)
+    case token
+    when String
+      if (tk = TkReading2Token[token]).nil?
+	IRB.fail TkReading2TokenNoKey, token
+      end
+      tk = Token(tk[0], value) 
+      if tk.kind_of?(TkOp)
+	tk.name = token
+      end
+      return tk
+    when Symbol
+      if (tk = TkSymbol2Token[token]).nil?
+	IRB.fail TkSymbol2TokenNoKey, token
+      end
+      return Token(tk[0], value) 
+    else 
+      if (token.ancestors & [TkId, TkVal, TkOPASGN, TkUnknownChar]).empty?
+	token.new(@prev_seek, @prev_line_no, @prev_char_no)
+      else
+	token.new(@prev_seek, @prev_line_no, @prev_char_no, value)
+      end
+    end
+  end
+
+  TokenDefinitions = [
+    [:TkCLASS,      TkId,  "class",  EXPR_CLASS],
+    [:TkMODULE,     TkId,  "module", EXPR_BEG],
+    [:TkDEF,	    TkId,  "def",    EXPR_FNAME],
+    [:TkUNDEF,      TkId,  "undef",  EXPR_FNAME],
+    [:TkBEGIN,      TkId,  "begin",  EXPR_BEG],
+    [:TkRESCUE,     TkId,  "rescue", EXPR_MID],
+    [:TkENSURE,     TkId,  "ensure", EXPR_BEG],
+    [:TkEND,	    TkId,  "end",    EXPR_END],
+    [:TkIF,         TkId,  "if",     EXPR_BEG, :TkIF_MOD],
+    [:TkUNLESS,     TkId,  "unless", EXPR_BEG, :TkUNLESS_MOD],
+    [:TkTHEN,	    TkId,  "then",   EXPR_BEG],
+    [:TkELSIF,      TkId,  "elsif",  EXPR_BEG],
+    [:TkELSE,	    TkId,  "else",   EXPR_BEG],
+    [:TkCASE,	    TkId,  "case",   EXPR_BEG],
+    [:TkWHEN,	    TkId,  "when",   EXPR_BEG],
+    [:TkWHILE,      TkId,  "while",  EXPR_BEG, :TkWHILE_MOD],
+    [:TkUNTIL,      TkId,  "until",  EXPR_BEG, :TkUNTIL_MOD],
+    [:TkFOR,	    TkId,  "for",    EXPR_BEG],
+    [:TkBREAK,      TkId,  "break",  EXPR_END],
+    [:TkNEXT,	    TkId,  "next",   EXPR_END],
+    [:TkREDO,	    TkId,  "redo",   EXPR_END],
+    [:TkRETRY,      TkId,  "retry",  EXPR_END],
+    [:TkIN,	    TkId,  "in",     EXPR_BEG],
+    [:TkDO,	    TkId,  "do",     EXPR_BEG],
+    [:TkRETURN,     TkId,  "return", EXPR_MID],
+    [:TkYIELD,      TkId,  "yield",  EXPR_END],
+    [:TkSUPER,      TkId,  "super",  EXPR_END],
+    [:TkSELF,	    TkId,  "self",   EXPR_END],
+    [:TkNIL, 	    TkId,  "nil",    EXPR_END],
+    [:TkTRUE,	    TkId,  "true",   EXPR_END],
+    [:TkFALSE,      TkId,  "false",  EXPR_END],
+    [:TkAND,	    TkId,  "and",    EXPR_BEG],
+    [:TkOR, 	    TkId,  "or",     EXPR_BEG],
+    [:TkNOT,	    TkId,  "not",    EXPR_BEG],
+    [:TkIF_MOD,     TkId],
+    [:TkUNLESS_MOD, TkId],
+    [:TkWHILE_MOD,  TkId],
+    [:TkUNTIL_MOD,  TkId],
+    [:TkALIAS,      TkId,  "alias",    EXPR_FNAME],
+    [:TkDEFINED,    TkId,  "defined?", EXPR_END],
+    [:TklBEGIN,     TkId,  "BEGIN",    EXPR_END],
+    [:TklEND,	    TkId,  "END",      EXPR_END],
+    [:Tk__LINE__,   TkId,  "__LINE__", EXPR_END],
+    [:Tk__FILE__,   TkId,  "__FILE__", EXPR_END],
+
+    [:TkIDENTIFIER, TkId],
+    [:TkFID,	    TkId],
+    [:TkGVAR,	    TkId],
+    [:TkCVAR,	    TkId],
+    [:TkIVAR,	    TkId],
+    [:TkCONSTANT,   TkId],
+
+    [:TkINTEGER,    TkVal],
+    [:TkFLOAT,      TkVal],
+    [:TkSTRING,     TkVal],
+    [:TkXSTRING,    TkVal],
+    [:TkREGEXP,     TkVal],
+    [:TkSYMBOL,     TkVal],
+
+    [:TkDSTRING,    TkNode],
+    [:TkDXSTRING,   TkNode],
+    [:TkDREGEXP,    TkNode],
+    [:TkNTH_REF,    TkNode],
+    [:TkBACK_REF,   TkNode],
+
+    [:TkUPLUS,      TkOp,   "+@"],
+    [:TkUMINUS,     TkOp,   "-@"],
+    [:TkPOW,	    TkOp,   "**"],
+    [:TkCMP,	    TkOp,   "<=>"],
+    [:TkEQ,	    TkOp,   "=="],
+    [:TkEQQ,	    TkOp,   "==="],
+    [:TkNEQ,	    TkOp,   "!="],
+    [:TkGEQ,	    TkOp,   ">="],
+    [:TkLEQ,	    TkOp,   "<="],
+    [:TkANDOP,      TkOp,   "&&"],
+    [:TkOROP,	    TkOp,   "||"],
+    [:TkMATCH,      TkOp,   "=~"],
+    [:TkNMATCH,     TkOp,   "!~"],
+    [:TkDOT2,	    TkOp,   ".."],
+    [:TkDOT3,	    TkOp,   "..."],
+    [:TkAREF,	    TkOp,   "[]"],
+    [:TkASET,	    TkOp,   "[]="],
+    [:TkLSHFT,      TkOp,   "<<"],
+    [:TkRSHFT,      TkOp,   ">>"],
+    [:TkCOLON2,     TkOp],
+    [:TkCOLON3,     TkOp],
+#   [:OPASGN,	    TkOp],               # +=, -=  etc. #
+    [:TkASSOC,      TkOp,   "=>"],
+    [:TkQUESTION,   TkOp,   "?"],	 #?
+    [:TkCOLON,      TkOp,   ":"],        #:
+    
+    [:TkfLPAREN],         # func( #
+    [:TkfLBRACK],         # func[ #
+    [:TkfLBRACE],         # func{ #
+    [:TkSTAR],            # *arg
+    [:TkAMPER],           # &arg #
+    [:TkSYMBEG],          # :SYMBOL
+
+    [:TkGT,	    TkOp,   ">"],
+    [:TkLT,	    TkOp,   "<"],
+    [:TkPLUS,	    TkOp,   "+"],
+    [:TkMINUS,      TkOp,   "-"],
+    [:TkMULT,	    TkOp,   "*"],
+    [:TkDIV,	    TkOp,   "/"],
+    [:TkMOD,	    TkOp,   "%"],
+    [:TkBITOR,      TkOp,   "|"],
+    [:TkBITXOR,     TkOp,   "^"],
+    [:TkBITAND,     TkOp,   "&"],
+    [:TkBITNOT,     TkOp,   "~"],
+    [:TkNOTOP,      TkOp,   "!"],
+
+    [:TkBACKQUOTE,  TkOp,   "`"],
+
+    [:TkASSIGN,     Token,  "="],
+    [:TkDOT,	    Token,  "."],
+    [:TkLPAREN,     Token,  "("],  #(exp)
+    [:TkLBRACK,     Token,  "["],  #[arry]
+    [:TkLBRACE,     Token,  "{"],  #{hash}
+    [:TkRPAREN,     Token,  ")"],
+    [:TkRBRACK,     Token,  "]"],
+    [:TkRBRACE,     Token,  "}"],
+    [:TkCOMMA,      Token,  ","],
+    [:TkSEMICOLON,  Token,  ";"],
+
+    [:TkCOMMENT],
+    [:TkRD_COMMENT],
+    [:TkSPACE],
+    [:TkNL],
+    [:TkEND_OF_SCRIPT],
+
+    [:TkBACKSLASH,  TkUnknownChar,  "\\"],
+    [:TkAT,	    TkUnknownChar,  "@"],
+    [:TkDOLLAR,     TkUnknownChar,  "$"],
+  ]
+
+  # {reading => token_class}
+  # {reading => [token_class, *opt]}
+  TkReading2Token = {}
+  TkSymbol2Token = {}
+
+  def RubyToken.def_token(token_n, super_token = Token, reading = nil, *opts)
+    token_n = token_n.id2name if token_n.kind_of?(Symbol)
+    if RubyToken.const_defined?(token_n)
+      IRB.fail AlreadyDefinedToken, token_n
+    end
+    token_c = eval("class #{token_n} < #{super_token}; end; #{token_n}")
+    
+    if reading
+      if TkReading2Token[reading]
+	IRB.fail TkReading2TokenDuplicateError, token_n, reading
+      end
+      if opts.empty?
+	TkReading2Token[reading] = [token_c]
+      else
+	TkReading2Token[reading] = [token_c].concat(opts)
+      end
+    end
+    TkSymbol2Token[token_n.intern] = token_c
+  end
+
+  for defs in TokenDefinitions
+    def_token(*defs)
+  end
+end
diff --git a/ruby_1_8_6/lib/irb/slex.rb b/ruby_1_8_6/lib/irb/slex.rb
new file mode 100644
index 0000000000..a6ea6fb473
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/slex.rb
@@ -0,0 +1,285 @@
+#
+#   irb/slex.rb - symple lex analizer
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+require "e2mmap"
+require "irb/notifier"
+
+module IRB
+  class SLex
+    @RCS_ID='-$Id$-'
+
+    extend Exception2MessageMapper
+    def_exception :ErrNodeNothing, "node nothing"
+    def_exception :ErrNodeAlreadyExists, "node already exists"
+
+    DOUT = Notifier::def_notifier("SLex::")
+    D_WARN = DOUT::def_notifier(1, "Warn: ")
+    D_DEBUG = DOUT::def_notifier(2, "Debug: ")
+    D_DETAIL = DOUT::def_notifier(4, "Detail: ")
+    
+    DOUT.level = Notifier::D_NOMSG
+
+    def initialize
+      @head = Node.new("")
+    end
+    
+    def def_rule(token, preproc = nil, postproc = nil, &block)
+      D_DETAIL.pp token
+
+      postproc = block if block_given?
+      node = create(token, preproc, postproc)
+    end
+    
+    def def_rules(*tokens, &block)
+      if block_given?
+	p = block
+      end
+      for token in tokens
+	def_rule(token, nil, p)
+      end
+    end
+    
+    def preproc(token, proc)
+      node = search(token)
+      node.preproc=proc
+    end
+    
+    #$BMW%A%'%C%/(B? 
+    def postproc(token)
+      node = search(token, proc)
+      node.postproc=proc
+    end
+    
+    def search(token)
+      @head.search(token.split(//))
+    end
+
+    def create(token, preproc = nil, postproc = nil)
+      @head.create_subnode(token.split(//), preproc, postproc)
+    end
+    
+    def match(token)
+      case token
+      when Array
+      when String
+	return match(token.split(//))
+      else
+	return @head.match_io(token)
+      end
+      ret = @head.match(token)
+      D_DETAIL.exec_if{D_DEATIL.printf "match end: %s:%s\n", ret, token.inspect}
+      ret
+    end
+    
+    def inspect
+      format("<SLex: @head = %s>", @head.inspect)
+    end
+
+    #----------------------------------------------------------------------
+    #
+    #   class Node - 
+    #
+    #----------------------------------------------------------------------
+    class Node
+      # if postproc is nil, this node is an abstract node.
+      # if postproc is non-nil, this node is a real node.
+      def initialize(preproc = nil, postproc = nil)
+	@Tree = {}
+	@preproc = preproc
+	@postproc = postproc
+      end
+
+      attr_accessor :preproc
+      attr_accessor :postproc
+      
+      def search(chrs, opt = nil)
+	return self if chrs.empty?
+	ch = chrs.shift
+	if node = @Tree[ch]
+	  node.search(chrs, opt)
+	else
+	  if opt
+	    chrs.unshift ch
+	    self.create_subnode(chrs)
+	  else
+	    SLex.fail ErrNodeNothing
+	  end
+	end
+      end
+      
+      def create_subnode(chrs, preproc = nil, postproc = nil)
+	if chrs.empty?
+	  if @postproc
+	    D_DETAIL.pp node
+	    SLex.fail ErrNodeAlreadyExists
+	  else
+	    D_DEBUG.puts "change abstract node to real node."
+	    @preproc = preproc
+	    @postproc = postproc
+	  end
+	  return self
+	end
+	
+	ch = chrs.shift
+	if node = @Tree[ch]
+	  if chrs.empty?
+	    if node.postproc
+	      DebugLogger.pp node
+	      DebugLogger.pp self
+	      DebugLogger.pp ch
+	      DebugLogger.pp chrs
+	      SLex.fail ErrNodeAlreadyExists
+	    else
+	      D_WARN.puts "change abstract node to real node"
+	      node.preproc = preproc
+	      node.postproc = postproc
+	    end
+	  else
+	    node.create_subnode(chrs, preproc, postproc)
+	  end
+	else
+	  if chrs.empty?
+	    node = Node.new(preproc, postproc)
+	  else
+	    node = Node.new
+	    node.create_subnode(chrs, preproc, postproc)
+	  end
+	  @Tree[ch] = node
+	end
+	node
+      end
+
+      #
+      # chrs: String
+      #       character array
+      #       io must have getc()/ungetc(); and ungetc() must be
+      #       able to be called arbitrary number of times. 
+      #
+      def match(chrs, op = "")
+	D_DETAIL.print "match>: ", chrs, "op:", op, "\n"
+	if chrs.empty?
+	  if @preproc.nil? || @preproc.call(op, chrs)
+	    DOUT.printf(D_DETAIL, "op1: %s\n", op)
+	    @postproc.call(op, chrs)
+	  else
+	    nil
+	  end
+	else
+	  ch = chrs.shift
+	  if node = @Tree[ch]
+	    if ret = node.match(chrs, op+ch)
+	      return ret
+	    else
+	      chrs.unshift ch
+	      if @postproc and @preproc.nil? || @preproc.call(op, chrs)
+		DOUT.printf(D_DETAIL, "op2: %s\n", op.inspect)
+		ret = @postproc.call(op, chrs)
+		return ret
+	      else
+		return nil
+	      end
+	    end
+	  else
+	    chrs.unshift ch
+	    if @postproc and @preproc.nil? || @preproc.call(op, chrs)
+	      DOUT.printf(D_DETAIL, "op3: %s\n", op)
+	      @postproc.call(op, chrs)
+	      return ""
+	    else
+	      return nil
+	    end
+	  end
+	end
+      end
+
+      def match_io(io, op = "")
+	if op == ""
+	  ch = io.getc
+	  if ch == nil
+	    return nil
+	  end
+	else
+	  ch = io.getc_of_rests
+	end
+	if ch.nil?
+	  if @preproc.nil? || @preproc.call(op, io)
+	    D_DETAIL.printf("op1: %s\n", op)
+	    @postproc.call(op, io)
+	  else
+	    nil
+	  end
+	else
+	  if node = @Tree[ch]
+	    if ret = node.match_io(io, op+ch)
+	      ret
+	    else
+	      io.ungetc ch
+	      if @postproc and @preproc.nil? || @preproc.call(op, io)
+		DOUT.exec_if{D_DETAIL.printf "op2: %s\n", op.inspect}
+		@postproc.call(op, io)
+	      else
+		nil
+	      end
+	    end
+	  else
+	    io.ungetc ch
+	    if @postproc and @preproc.nil? || @preproc.call(op, io)
+	      D_DETAIL.printf("op3: %s\n", op)
+	      @postproc.call(op, io)
+	    else
+	      nil
+	    end
+	  end
+	end
+      end
+    end
+  end
+end
+
+SLex=IRB::SLex
+
+if $0 == __FILE__
+  #    Tracer.on
+  case $1
+  when "1"
+    tr = SLex.new
+    print "0: ", tr.inspect, "\n"
+    tr.def_rule("=") {print "=\n"}
+    print "1: ", tr.inspect, "\n"
+    tr.def_rule("==") {print "==\n"}
+    print "2: ", tr.inspect, "\n"
+    
+    print "case 1:\n"
+    print tr.match("="), "\n"
+    print "case 2:\n"
+    print tr.match("=="), "\n"
+    print "case 3:\n"
+    print tr.match("=>"), "\n"
+    
+  when "2"
+    tr = SLex.new
+    print "0: ", tr.inspect, "\n"
+    tr.def_rule("=") {print "=\n"}
+    print "1: ", tr.inspect, "\n"
+    tr.def_rule("==", proc{false}) {print "==\n"}
+    print "2: ", tr.inspect, "\n"
+    
+    print "case 1:\n"
+    print tr.match("="), "\n"
+    print "case 2:\n"
+    print tr.match("=="), "\n"
+    print "case 3:\n"
+    print tr.match("=>"), "\n"
+  end
+  exit
+end
+
diff --git a/ruby_1_8_6/lib/irb/version.rb b/ruby_1_8_6/lib/irb/version.rb
new file mode 100644
index 0000000000..28b079740a
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/version.rb
@@ -0,0 +1,16 @@
+#
+#   irb/version.rb - irb version definition file
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
+#
+# --
+#
+#   
+#
+
+module IRB
+  @RELEASE_VERSION = "0.9.5"
+  @LAST_UPDATE_DATE = "05/04/13"
+end
diff --git a/ruby_1_8_6/lib/irb/workspace.rb b/ruby_1_8_6/lib/irb/workspace.rb
new file mode 100644
index 0000000000..7d1794cd7b
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/workspace.rb
@@ -0,0 +1,107 @@
+#
+#   irb/workspace-binding.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+module IRB
+  class WorkSpace
+    # create new workspace. set self to main if specified, otherwise
+    # inherit main from TOPLEVEL_BINDING.
+    def initialize(*main)
+      if main[0].kind_of?(Binding)
+	@binding = main.shift
+      elsif IRB.conf[:SINGLE_IRB]
+	@binding = TOPLEVEL_BINDING
+      else
+	case IRB.conf[:CONTEXT_MODE]
+	when 0	# binding in proc on TOPLEVEL_BINDING
+	  @binding = eval("proc{binding}.call",
+		      TOPLEVEL_BINDING, 
+		      __FILE__,
+		      __LINE__)
+	when 1	# binding in loaded file
+	  require "tempfile"
+	  f = Tempfile.open("irb-binding")
+	  f.print <<EOF
+	  $binding = binding
+EOF
+	  f.close
+	  load f.path
+	  @binding = $binding
+
+	when 2	# binding in loaded file(thread use)
+	  unless defined? BINDING_QUEUE
+	    require "thread"
+	    
+	    IRB.const_set("BINDING_QUEUE", SizedQueue.new(1))
+	    Thread.abort_on_exception = true
+	    Thread.start do
+	      eval "require \"irb/ws-for-case-2\"", TOPLEVEL_BINDING, __FILE__, __LINE__
+	    end
+	    Thread.pass
+	  end
+	  @binding = BINDING_QUEUE.pop
+
+	when 3	# binging in function on TOPLEVEL_BINDING(default)
+	  @binding = eval("def irb_binding; binding; end; irb_binding",
+		      TOPLEVEL_BINDING, 
+		      __FILE__,
+		      __LINE__ - 3)
+	end
+      end
+      if main.empty?
+	@main = eval("self", @binding)
+      else
+	@main = main[0]
+	IRB.conf[:__MAIN__] = @main
+	case @main
+	when Module
+	  @binding = eval("IRB.conf[:__MAIN__].module_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
+	else
+	  begin 
+	    @binding = eval("IRB.conf[:__MAIN__].instance_eval('binding', __FILE__, __LINE__)", @binding, __FILE__, __LINE__)
+	  rescue TypeError
+	    IRB.fail CantChangeBinding, @main.inspect
+	  end
+	end
+      end
+      eval("_=nil", @binding)
+    end
+
+    attr_reader :binding
+    attr_reader :main
+
+    def evaluate(context, statements, file = __FILE__, line = __LINE__)
+      eval(statements, @binding, file, line)
+    end
+  
+    # error message manipulator
+    def filter_backtrace(bt)
+      case IRB.conf[:CONTEXT_MODE]
+      when 0
+	return nil if bt =~ /\(irb_local_binding\)/
+      when 1
+	if(bt =~ %r!/tmp/irb-binding! or
+	   bt =~ %r!irb/.*\.rb! or
+	   bt =~ /irb\.rb/)
+	  return nil
+	end
+      when 2
+	return nil if bt =~ /irb\/.*\.rb/
+      when 3
+	return nil if bt =~ /irb\/.*\.rb/
+	bt.sub!(/:\s*in `irb_binding'/){""} 
+      end
+      bt
+    end
+
+    def IRB.delete_caller
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/irb/ws-for-case-2.rb b/ruby_1_8_6/lib/irb/ws-for-case-2.rb
new file mode 100644
index 0000000000..afd49d23e1
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/ws-for-case-2.rb
@@ -0,0 +1,15 @@
+#
+#   irb/ws-for-case-2.rb - 
+#   	$Release Version: 0.9.5$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#   
+#
+
+while true
+  IRB::BINDING_QUEUE.push b = binding
+end
diff --git a/ruby_1_8_6/lib/irb/xmp.rb b/ruby_1_8_6/lib/irb/xmp.rb
new file mode 100644
index 0000000000..4bcc2ca22f
--- /dev/null
+++ b/ruby_1_8_6/lib/irb/xmp.rb
@@ -0,0 +1,86 @@
+#
+#   xmp.rb - irb version of gotoken xmp
+#   	$Release Version: 0.9$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(Nippon Rational Inc.)
+#
+# --
+#
+#   
+#
+
+require "irb"
+require "irb/frame"
+
+class XMP
+  @RCS_ID='-$Id$-'
+
+  def initialize(bind = nil)
+    IRB.init_config(nil)
+    #IRB.parse_opts
+    #IRB.load_modules
+
+    IRB.conf[:PROMPT_MODE] = :XMP
+
+    bind = IRB::Frame.top(1) unless bind
+    ws = IRB::WorkSpace.new(bind)
+    @io = StringInputMethod.new
+    @irb = IRB::Irb.new(ws, @io)
+    @irb.context.ignore_sigint = false
+
+#    IRB.conf[:IRB_RC].call(@irb.context) if IRB.conf[:IRB_RC]
+    IRB.conf[:MAIN_CONTEXT] = @irb.context
+  end
+
+  def puts(exps)
+    @io.puts exps
+
+    if @irb.context.ignore_sigint
+      begin
+	trap_proc_b = trap("SIGINT"){@irb.signal_handle}
+	catch(:IRB_EXIT) do
+	  @irb.eval_input
+	end
+      ensure
+	trap("SIGINT", trap_proc_b)
+      end
+    else
+      catch(:IRB_EXIT) do
+	@irb.eval_input
+      end
+    end
+  end
+
+  class StringInputMethod < IRB::InputMethod
+    def initialize
+      super
+      @exps = []
+    end
+
+    def eof?
+      @exps.empty?
+    end
+
+    def gets
+      while l = @exps.shift
+	next if /^\s+$/ =~ l
+	l.concat "\n"
+	print @prompt, l
+	break
+      end
+      l
+    end
+
+    def puts(exps)
+      @exps.concat exps.split(/\n/)
+    end
+  end
+end
+
+def xmp(exps, bind = nil)
+  bind = IRB::Frame.top(1) unless bind
+  xmp = XMP.new(bind)
+  xmp.puts exps
+  xmp
+end
diff --git a/ruby_1_8_6/lib/jcode.rb b/ruby_1_8_6/lib/jcode.rb
new file mode 100644
index 0000000000..78422f296f
--- /dev/null
+++ b/ruby_1_8_6/lib/jcode.rb
@@ -0,0 +1,220 @@
+# jcode.rb - ruby code to handle japanese (EUC/SJIS) string
+
+if $VERBOSE && $KCODE == "NONE"
+  warn "Warning: $KCODE is NONE."
+end
+
+$vsave, $VERBOSE = $VERBOSE, false
+class String
+  warn "feel free for some warnings:\n" if $VERBOSE
+
+  def _regex_quote(str)
+    str.gsub(/(\\[\[\]\-\\])|\\(.)|([\[\]\\])/) do
+      $1 || $2 || '\\' + $3
+    end
+  end
+  private :_regex_quote
+
+  PATTERN_SJIS = '[\x81-\x9f\xe0-\xef][\x40-\x7e\x80-\xfc]'
+  PATTERN_EUC = '[\xa1-\xfe][\xa1-\xfe]'
+  PATTERN_UTF8 = '[\xc0-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf][\x80-\xbf]'
+
+  RE_SJIS = Regexp.new(PATTERN_SJIS, 0, 'n')
+  RE_EUC = Regexp.new(PATTERN_EUC, 0, 'n')
+  RE_UTF8 = Regexp.new(PATTERN_UTF8, 0, 'n')
+
+  SUCC = {}
+  SUCC['s'] = Hash.new(1)
+  for i in 0 .. 0x3f
+    SUCC['s'][i.chr] = 0x40 - i
+  end
+  SUCC['s']["\x7e"] = 0x80 - 0x7e
+  SUCC['s']["\xfd"] = 0x100 - 0xfd
+  SUCC['s']["\xfe"] = 0x100 - 0xfe
+  SUCC['s']["\xff"] = 0x100 - 0xff
+  SUCC['e'] = Hash.new(1)
+  for i in 0 .. 0xa0
+    SUCC['e'][i.chr] = 0xa1 - i
+  end
+  SUCC['e']["\xfe"] = 2
+  SUCC['u'] = Hash.new(1)
+  for i in 0 .. 0x7f
+    SUCC['u'][i.chr] = 0x80 - i
+  end
+  SUCC['u']["\xbf"] = 0x100 - 0xbf
+
+  def mbchar?
+    case $KCODE[0]
+    when ?s, ?S
+      self =~ RE_SJIS
+    when ?e, ?E
+      self =~ RE_EUC
+    when ?u, ?U
+      self =~ RE_UTF8
+    else
+      nil
+    end
+  end
+
+  def end_regexp
+    case $KCODE[0]
+    when ?s, ?S
+      /#{PATTERN_SJIS}$/on
+    when ?e, ?E
+      /#{PATTERN_EUC}$/on
+    when ?u, ?U
+      /#{PATTERN_UTF8}$/on
+    else
+      /.$/on
+    end
+  end
+
+  alias original_succ! succ!
+  private :original_succ!
+
+  alias original_succ succ
+  private :original_succ
+
+  def succ!
+    reg = end_regexp
+    if  $KCODE != 'NONE' && self =~ reg
+      succ_table = SUCC[$KCODE[0,1].downcase]
+      begin
+	self[-1] += succ_table[self[-1]]
+	self[-2] += 1 if self[-1] == 0
+      end while self !~ reg
+      self
+    else
+      original_succ!
+    end
+  end
+
+  def succ
+    str = self.dup
+    str.succ! or str
+  end
+
+  private
+
+  def _expand_ch str
+    a = []
+    str.scan(/(?:\\(.)|([^\\]))-(?:\\(.)|([^\\]))|(?:\\(.)|(.))/m) do
+      from = $1 || $2
+      to = $3 || $4
+      one = $5 || $6
+      if one
+	a.push one
+      elsif from.length != to.length
+	next
+      elsif from.length == 1
+	from[0].upto(to[0]) { |c| a.push c.chr }
+      else
+	from.upto(to) { |c| a.push c }
+      end
+    end
+    a
+  end
+
+  def expand_ch_hash from, to
+    h = {}
+    afrom = _expand_ch(from)
+    ato = _expand_ch(to)
+    afrom.each_with_index do |x,i| h[x] = ato[i] || ato[-1] end
+    h
+  end
+
+  HashCache = {}
+  TrPatternCache = {}
+  DeletePatternCache = {}
+  SqueezePatternCache = {}
+
+  public
+
+  def tr!(from, to)
+    return nil if from == ""
+    return self.delete!(from) if to == ""
+
+    pattern = TrPatternCache[from] ||= /[#{_regex_quote(from)}]/
+    if from[0] == ?^
+      last = /.$/.match(to)[0]
+      self.gsub!(pattern, last)
+    else
+      h = HashCache[from + "1-0" + to] ||= expand_ch_hash(from, to)
+      self.gsub!(pattern) do |c| h[c] end
+    end
+  end
+
+  def tr(from, to)
+    (str = self.dup).tr!(from, to) or str
+  end
+
+  def delete!(del)
+    return nil if del == ""
+    self.gsub!(DeletePatternCache[del] ||= /[#{_regex_quote(del)}]+/, '')
+  end
+
+  def delete(del)
+    (str = self.dup).delete!(del) or str
+  end
+
+  def squeeze!(del=nil)
+    return nil if del == ""
+    pattern =
+      if del
+	SqueezePatternCache[del] ||= /([#{_regex_quote(del)}])\1+/
+      else
+	/(.|\n)\1+/
+      end
+    self.gsub!(pattern, '\1')
+  end
+
+  def squeeze(del=nil)
+    (str = self.dup).squeeze!(del) or str
+  end
+
+  def tr_s!(from, to)
+    return self.delete!(from) if to.length == 0
+
+    pattern = SqueezePatternCache[from] ||= /([#{_regex_quote(from)}])\1*/
+    if from[0] == ?^
+      last = /.$/.match(to)[0]
+      self.gsub!(pattern, last)
+    else
+      h = HashCache[from + "1-0" + to] ||= expand_ch_hash(from, to)
+      self.gsub!(pattern) do h[$1] end
+    end
+  end
+
+  def tr_s(from, to)
+    (str = self.dup).tr_s!(from,to) or str
+  end
+
+  def chop!
+    self.gsub!(/(?:.|\r?\n)\z/, '')
+  end
+
+  def chop
+    (str = self.dup).chop! or str
+  end
+
+  def jlength
+    self.gsub(/[^\Wa-zA-Z_\d]/, ' ').length
+  end
+  alias jsize jlength
+
+  def jcount(str)
+    self.delete("^#{str}").jlength
+  end
+
+  def each_char
+    if block_given?
+      scan(/./m) do |x|
+        yield x
+      end
+    else
+      scan(/./m)
+    end
+  end
+
+end
+$VERBOSE = $vsave
diff --git a/ruby_1_8_6/lib/logger.rb b/ruby_1_8_6/lib/logger.rb
new file mode 100644
index 0000000000..60e72424ad
--- /dev/null
+++ b/ruby_1_8_6/lib/logger.rb
@@ -0,0 +1,703 @@
+# logger.rb - saimple logging utility
+# Copyright (C) 2000-2003, 2005  NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>.
+
+require 'monitor'
+
+# Simple logging utility.
+#
+# Author:: NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
+# Documentation:: NAKAMURA, Hiroshi and Gavin Sinclair
+# License::
+#   You can redistribute it and/or modify it under the same terms of Ruby's
+#   license; either the dual license version in 2003, or any later version.
+# Revision:: $Id$
+#
+# == Description
+#
+# The Logger class provides a simple but sophisticated logging utility that
+# anyone can use because it's included in the Ruby 1.8.x standard library.
+#
+# The HOWTOs below give a code-based overview of Logger's usage, but the basic
+# concept is as follows.  You create a Logger object (output to a file or
+# elsewhere), and use it to log messages.  The messages will have varying
+# levels (+info+, +error+, etc), reflecting their varying importance.  The
+# levels, and their meanings, are:
+#
+# +FATAL+:: an unhandleable error that results in a program crash
+# +ERROR+:: a handleable error condition
+# +WARN+::  a warning
+# +INFO+::  generic (useful) information about system operation
+# +DEBUG+:: low-level information for developers
+#
+# So each message has a level, and the Logger itself has a level, which acts
+# as a filter, so you can control the amount of information emitted from the
+# logger without having to remove actual messages.
+#
+# For instance, in a production system, you may have your logger(s) set to
+# +INFO+ (or +WARN+ if you don't want the log files growing large with
+# repetitive information).  When you are developing it, though, you probably
+# want to know about the program's internal state, and would set them to
+# +DEBUG+.
+#
+# === Example
+#
+# A simple example demonstrates the above explanation:
+#
+#   log = Logger.new(STDOUT)
+#   log.level = Logger::WARN
+#
+#   log.debug("Created logger")
+#   log.info("Program started")
+#   log.warn("Nothing to do!")
+#
+#   begin
+#     File.each_line(path) do |line|
+#       unless line =~ /^(\w+) = (.*)$/
+#         log.error("Line in wrong format: #{line}")
+#       end
+#     end
+#   rescue => err
+#     log.fatal("Caught exception; exiting")
+#     log.fatal(err)
+#   end
+#
+# Because the Logger's level is set to +WARN+, only the warning, error, and
+# fatal messages are recorded.  The debug and info messages are silently
+# discarded.
+#
+# === Features
+#
+# There are several interesting features that Logger provides, like
+# auto-rolling of log files, setting the format of log messages, and
+# specifying a program name in conjunction with the message.  The next section
+# shows you how to achieve these things.
+#
+#
+# == HOWTOs
+#
+# === How to create a logger
+#
+# The options below give you various choices, in more or less increasing
+# complexity.
+#
+# 1. Create a logger which logs messages to STDERR/STDOUT.
+#
+#      logger = Logger.new(STDERR)
+#      logger = Logger.new(STDOUT)
+#
+# 2. Create a logger for the file which has the specified name.
+#
+#      logger = Logger.new('logfile.log')
+#
+# 3. Create a logger for the specified file.
+#
+#      file = File.open('foo.log', File::WRONLY | File::APPEND)
+#      # To create new (and to remove old) logfile, add File::CREAT like;
+#      #   file = open('foo.log', File::WRONLY | File::APPEND | File::CREAT)
+#      logger = Logger.new(file)
+#
+# 4. Create a logger which ages logfile once it reaches a certain size.  Leave
+#    10 "old log files" and each file is about 1,024,000 bytes.
+#
+#      logger = Logger.new('foo.log', 10, 1024000)
+#
+# 5. Create a logger which ages logfile daily/weekly/monthly.
+#
+#      logger = Logger.new('foo.log', 'daily')
+#      logger = Logger.new('foo.log', 'weekly')
+#      logger = Logger.new('foo.log', 'monthly')
+#
+# === How to log a message
+#
+# Notice the different methods (+fatal+, +error+, +info+) being used to log
+# messages of various levels.  Other methods in this family are +warn+ and
+# +debug+.  +add+ is used below to log a message of an arbitrary (perhaps
+# dynamic) level.
+#
+# 1. Message in block.
+#
+#      logger.fatal { "Argument 'foo' not given." }
+#
+# 2. Message as a string.
+#
+#      logger.error "Argument #{ @foo } mismatch."
+#
+# 3. With progname.
+#
+#      logger.info('initialize') { "Initializing..." }
+#
+# 4. With severity.
+#
+#      logger.add(Logger::FATAL) { 'Fatal error!' }
+#
+# === How to close a logger
+#
+#      logger.close
+#
+# === Setting severity threshold
+#
+# 1. Original interface.
+#
+#      logger.sev_threshold = Logger::WARN
+#
+# 2. Log4r (somewhat) compatible interface.
+#
+#      logger.level = Logger::INFO
+#      
+#      DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
+#
+#
+# == Format
+#
+# Log messages are rendered in the output stream in a certain format.  The
+# default format and a sample are shown below:
+#
+# Log format:
+#   SeverityID, [Date Time mSec #pid] SeverityLabel -- ProgName: message
+#
+# Log sample:
+#   I, [Wed Mar 03 02:34:24 JST 1999 895701 #19074]  INFO -- Main: info.
+#
+# You may change the date and time format in this manner:
+#
+#   logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+#         # e.g. "2004-01-03 00:54:26"
+#
+# There is currently no supported way to change the overall format, but you may
+# have some luck hacking the Format constant.
+#
+
+
+class Logger
+  VERSION = "1.2.6"
+  /: (\S+),v (\S+)/ =~ %q$Id$
+  ProgName = "#{$1}/#{$2}"
+
+  class Error < RuntimeError; end
+  class ShiftingError < Error; end
+
+  # Logging severity.
+  module Severity
+    DEBUG = 0
+    INFO = 1
+    WARN = 2
+    ERROR = 3
+    FATAL = 4
+    UNKNOWN = 5
+  end
+  include Severity
+
+  # Logging severity threshold (e.g. <tt>Logger::INFO</tt>).
+  attr_accessor :level
+
+  # Logging program name.
+  attr_accessor :progname
+
+  # Logging date-time format (string passed to +strftime+).
+  def datetime_format=(datetime_format)
+    @default_formatter.datetime_format = datetime_format
+  end
+
+  def datetime_format
+    @default_formatter.datetime_format
+  end
+
+  # Logging formatter.  formatter#call is invoked with 4 arguments; severity,
+  # time, progname and msg for each log.  Bear in mind that time is a Time and
+  # msg is an Object that user passed and it could not be a String.  It is
+  # expected to return a logdev#write-able Object.  Default formatter is used
+  # when no formatter is set.
+  attr_accessor :formatter
+
+  alias sev_threshold level
+  alias sev_threshold= level=
+
+  # Returns +true+ iff the current severity level allows for the printing of
+  # +DEBUG+ messages.
+  def debug?; @level <= DEBUG; end
+
+  # Returns +true+ iff the current severity level allows for the printing of
+  # +INFO+ messages.
+  def info?; @level <= INFO; end
+
+  # Returns +true+ iff the current severity level allows for the printing of
+  # +WARN+ messages.
+  def warn?; @level <= WARN; end
+
+  # Returns +true+ iff the current severity level allows for the printing of
+  # +ERROR+ messages.
+  def error?; @level <= ERROR; end
+
+  # Returns +true+ iff the current severity level allows for the printing of
+  # +FATAL+ messages.
+  def fatal?; @level <= FATAL; end
+
+  #
+  # === Synopsis
+  #
+  #   Logger.new(name, shift_age = 7, shift_size = 1048576)
+  #   Logger.new(name, shift_age = 'weekly')
+  #
+  # === Args
+  #
+  # +logdev+::
+  #   The log device.  This is a filename (String) or IO object (typically
+  #   +STDOUT+, +STDERR+, or an open file).
+  # +shift_age+::
+  #   Number of old log files to keep, *or* frequency of rotation (+daily+,
+  #   +weekly+ or +monthly+).
+  # +shift_size+::
+  #   Maximum logfile size (only applies when +shift_age+ is a number).
+  #
+  # === Description
+  #
+  # Create an instance.
+  #
+  def initialize(logdev, shift_age = 0, shift_size = 1048576)
+    @progname = nil
+    @level = DEBUG
+    @default_formatter = Formatter.new
+    @formatter = nil
+    @logdev = nil
+    if logdev
+      @logdev = LogDevice.new(logdev, :shift_age => shift_age,
+        :shift_size => shift_size)
+    end
+  end
+
+  #
+  # === Synopsis
+  #
+  #   Logger#add(severity, message = nil, progname = nil) { ... }
+  #
+  # === Args
+  #
+  # +severity+::
+  #   Severity.  Constants are defined in Logger namespace: +DEBUG+, +INFO+,
+  #   +WARN+, +ERROR+, +FATAL+, or +UNKNOWN+.
+  # +message+::
+  #   The log message.  A String or Exception.
+  # +progname+::
+  #   Program name string.  Can be omitted.  Treated as a message if no +message+ and
+  #   +block+ are given.
+  # +block+::
+  #   Can be omitted.  Called to get a message string if +message+ is nil.
+  #
+  # === Return
+  #
+  # +true+ if successful, +false+ otherwise.
+  #
+  # When the given severity is not high enough (for this particular logger), log
+  # no message, and return +true+.
+  #
+  # === Description
+  #
+  # Log a message if the given severity is high enough.  This is the generic
+  # logging method.  Users will be more inclined to use #debug, #info, #warn,
+  # #error, and #fatal.
+  #
+  # <b>Message format</b>: +message+ can be any object, but it has to be
+  # converted to a String in order to log it.  Generally, +inspect+ is used
+  # if the given object is not a String.
+  # A special case is an +Exception+ object, which will be printed in detail,
+  # including message, class, and backtrace.  See #msg2str for the
+  # implementation if required.
+  #
+  # === Bugs
+  #
+  # * Logfile is not locked.
+  # * Append open does not need to lock file.
+  # * But on the OS which supports multi I/O, records possibly be mixed.
+  #
+  def add(severity, message = nil, progname = nil, &block)
+    severity ||= UNKNOWN
+    if @logdev.nil? or severity < @level
+      return true
+    end
+    progname ||= @progname
+    if message.nil?
+      if block_given?
+	message = yield
+      else
+	message = progname
+	progname = @progname
+      end
+    end
+    @logdev.write(
+      format_message(format_severity(severity), Time.now, progname, message))
+    true
+  end
+  alias log add
+
+  #
+  # Dump given message to the log device without any formatting.  If no log
+  # device exists, return +nil+.
+  #
+  def <<(msg)
+    unless @logdev.nil?
+      @logdev.write(msg)
+    end
+  end
+
+  #
+  # Log a +DEBUG+ message.
+  #
+  # See #info for more information.
+  #
+  def debug(progname = nil, &block)
+    add(DEBUG, nil, progname, &block)
+  end
+
+  #
+  # Log an +INFO+ message.
+  #
+  # The message can come either from the +progname+ argument or the +block+.  If
+  # both are provided, then the +block+ is used as the message, and +progname+
+  # is used as the program name.
+  #
+  # === Examples
+  #
+  #   logger.info("MainApp") { "Received connection from #{ip}" }
+  #   # ...
+  #   logger.info "Waiting for input from user"
+  #   # ...
+  #   logger.info { "User typed #{input}" }
+  #
+  # You'll probably stick to the second form above, unless you want to provide a
+  # program name (which you can do with <tt>Logger#progname=</tt> as well).
+  #
+  # === Return
+  #
+  # See #add.
+  #
+  def info(progname = nil, &block)
+    add(INFO, nil, progname, &block)
+  end
+
+  #
+  # Log a +WARN+ message.
+  #
+  # See #info for more information.
+  #
+  def warn(progname = nil, &block)
+    add(WARN, nil, progname, &block)
+  end
+
+  #
+  # Log an +ERROR+ message.
+  #
+  # See #info for more information.
+  #
+  def error(progname = nil, &block)
+    add(ERROR, nil, progname, &block)
+  end
+
+  #
+  # Log a +FATAL+ message.
+  #
+  # See #info for more information.
+  #
+  def fatal(progname = nil, &block)
+    add(FATAL, nil, progname, &block)
+  end
+
+  #
+  # Log an +UNKNOWN+ message.  This will be printed no matter what the logger
+  # level.
+  #
+  # See #info for more information.
+  #
+  def unknown(progname = nil, &block)
+    add(UNKNOWN, nil, progname, &block)
+  end
+
+  #
+  # Close the logging device.
+  #
+  def close
+    @logdev.close if @logdev
+  end
+
+private
+
+  # Severity label for logging. (max 5 char)
+  SEV_LABEL = %w(DEBUG INFO WARN ERROR FATAL ANY)
+
+  def format_severity(severity)
+    SEV_LABEL[severity] || 'ANY'
+  end
+
+  def format_message(severity, datetime, progname, msg)
+    (@formatter || @default_formatter).call(severity, datetime, progname, msg)
+  end
+
+
+  class Formatter
+    Format = "%s, [%s#%d] %5s -- %s: %s\n"
+
+    attr_accessor :datetime_format
+
+    def initialize
+      @datetime_format = nil
+    end
+
+    def call(severity, time, progname, msg)
+      Format % [severity[0..0], format_datetime(time), $$, severity, progname,
+        msg2str(msg)]
+    end
+
+  private
+
+    def format_datetime(time)
+      if @datetime_format.nil?
+        time.strftime("%Y-%m-%dT%H:%M:%S.") << "%06d " % time.usec
+      else
+        time.strftime(@datetime_format)
+      end
+    end
+
+    def msg2str(msg)
+      case msg
+      when ::String
+        msg
+      when ::Exception
+        "#{ msg.message } (#{ msg.class })\n" <<
+          (msg.backtrace || []).join("\n")
+      else
+        msg.inspect
+      end
+    end
+  end
+
+
+  class LogDevice
+    attr_reader :dev
+    attr_reader :filename
+
+    class LogDeviceMutex
+      include MonitorMixin
+    end
+
+    def initialize(log = nil, opt = {})
+      @dev = @filename = @shift_age = @shift_size = nil
+      @mutex = LogDeviceMutex.new
+      if log.respond_to?(:write) and log.respond_to?(:close)
+	@dev = log
+      else
+	@dev = open_logfile(log)
+	@dev.sync = true
+	@filename = log
+	@shift_age = opt[:shift_age] || 7
+	@shift_size = opt[:shift_size] || 1048576
+      end
+    end
+
+    def write(message)
+      @mutex.synchronize do
+        if @shift_age and @dev.respond_to?(:stat)
+          begin
+            check_shift_log
+          rescue
+            raise Logger::ShiftingError.new("Shifting failed. #{$!}")
+          end
+        end
+        @dev.write(message)
+      end
+    end
+
+    def close
+      @mutex.synchronize do
+        @dev.close
+      end
+    end
+
+  private
+
+    def open_logfile(filename)
+      if (FileTest.exist?(filename))
+     	open(filename, (File::WRONLY | File::APPEND))
+      else
+       	create_logfile(filename)
+      end
+    end
+
+    def create_logfile(filename)
+      logdev = open(filename, (File::WRONLY | File::APPEND | File::CREAT))
+      logdev.sync = true
+      add_log_header(logdev)
+      logdev
+    end
+
+    def add_log_header(file)
+      file.write(
+     	"# Logfile created on %s by %s\n" % [Time.now.to_s, Logger::ProgName]
+    )
+    end
+
+    SiD = 24 * 60 * 60
+
+    def check_shift_log
+      if @shift_age.is_a?(Integer)
+        # Note: always returns false if '0'.
+        if @filename && (@shift_age > 0) && (@dev.stat.size > @shift_size)
+          shift_log_age
+        end
+      else
+        now = Time.now
+        if @dev.stat.mtime <= previous_period_end(now)
+          shift_log_period(now)
+        end
+      end
+    end
+
+    def shift_log_age
+      (@shift_age-3).downto(0) do |i|
+        if FileTest.exist?("#{@filename}.#{i}")
+          File.rename("#{@filename}.#{i}", "#{@filename}.#{i+1}")
+        end
+      end
+      @dev.close
+      File.rename("#{@filename}", "#{@filename}.0")
+      @dev = create_logfile(@filename)
+      return true
+    end
+
+    def shift_log_period(now)
+      postfix = previous_period_end(now).strftime("%Y%m%d")	# YYYYMMDD
+      age_file = "#{@filename}.#{postfix}"
+      if FileTest.exist?(age_file)
+        raise RuntimeError.new("'#{ age_file }' already exists.")
+      end
+      @dev.close
+      File.rename("#{@filename}", age_file)
+      @dev = create_logfile(@filename)
+      return true
+    end
+
+    def previous_period_end(now)
+      case @shift_age
+      when /^daily$/
+        eod(now - 1 * SiD)
+      when /^weekly$/
+        eod(now - ((now.wday + 1) * SiD))
+      when /^monthly$/
+        eod(now - now.mday * SiD)
+      else
+        now
+      end
+    end
+
+    def eod(t)
+      Time.mktime(t.year, t.month, t.mday, 23, 59, 59)
+    end
+  end
+
+
+  #
+  # == Description
+  #
+  # Application -- Add logging support to your application.
+  #
+  # == Usage
+  #
+  # 1. Define your application class as a sub-class of this class.
+  # 2. Override 'run' method in your class to do many things.
+  # 3. Instantiate it and invoke 'start'.
+  #
+  # == Example
+  #
+  #   class FooApp < Application
+  #     def initialize(foo_app, application_specific, arguments)
+  #       super('FooApp') # Name of the application.
+  #     end
+  #
+  #     def run
+  #       ...
+  #       log(WARN, 'warning', 'my_method1')
+  #       ...
+  #       @log.error('my_method2') { 'Error!' }
+  #       ...
+  #     end
+  #   end
+  #
+  #   status = FooApp.new(....).start
+  #
+  class Application
+    include Logger::Severity
+
+    attr_reader :appname
+    attr_reader :logdev
+
+    #
+    # == Synopsis
+    #
+    #   Application.new(appname = '')
+    #
+    # == Args
+    #
+    # +appname+:: Name of the application.
+    #
+    # == Description
+    #
+    # Create an instance.  Log device is +STDERR+ by default.  This can be
+    # changed with #set_log.
+    #
+    def initialize(appname = nil)
+      @appname = appname
+      @log = Logger.new(STDERR)
+      @log.progname = @appname
+      @level = @log.level
+    end
+
+    #
+    # Start the application.  Return the status code.
+    #
+    def start
+      status = -1
+      begin
+	log(INFO, "Start of #{ @appname }.")
+	status = run
+      rescue
+	log(FATAL, "Detected an exception. Stopping ... #{$!} (#{$!.class})\n" << $@.join("\n"))
+      ensure
+	log(INFO, "End of #{ @appname }. (status: #{ status.to_s })")
+      end
+      status
+    end
+
+    #
+    # Sets the log device for this application.  See the class Logger for an
+    # explanation of the arguments.
+    #
+    def set_log(logdev, shift_age = 0, shift_size = 1024000)
+      @log = Logger.new(logdev, shift_age, shift_size)
+      @log.progname = @appname
+      @log.level = @level
+    end
+
+    def log=(logdev)
+      set_log(logdev)
+    end
+
+    #
+    # Set the logging threshold, just like <tt>Logger#level=</tt>.
+    #
+    def level=(level)
+      @level = level
+      @log.level = @level
+    end
+
+    #
+    # See Logger#add.  This application's +appname+ is used.
+    #
+    def log(severity, message = nil, &block)
+      @log.add(severity, message, @appname, &block) if @log
+    end
+
+  private
+
+    def run
+      raise RuntimeError.new('Method run must be defined in the derived class.')
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/mailread.rb b/ruby_1_8_6/lib/mailread.rb
new file mode 100644
index 0000000000..08b33c92a4
--- /dev/null
+++ b/ruby_1_8_6/lib/mailread.rb
@@ -0,0 +1,62 @@
+# The Mail class represents an internet mail message (as per RFC822, RFC2822)
+# with headers and a body. 
+class Mail
+
+  # Create a new Mail where +f+ is either a stream which responds to gets(),
+  # or a path to a file.  If +f+ is a path it will be opened.
+  #
+  # The whole message is read so it can be made available through the #header,
+  # #[] and #body methods.
+  #
+  # The "From " line is ignored if the mail is in mbox format.
+  def initialize(f)
+    unless defined? f.gets
+      f = open(f, "r")
+      opened = true
+    end
+
+    @header = {}
+    @body = []
+    begin
+      while line = f.gets()
+	line.chop!
+	next if /^From /=~line	# skip From-line
+	break if /^$/=~line	# end of header
+
+	if /^(\S+?):\s*(.*)/=~line
+	  (attr = $1).capitalize!
+	  @header[attr] = $2
+	elsif attr
+	  line.sub!(/^\s*/, '')
+	  @header[attr] += "\n" + line
+	end
+      end
+  
+      return unless line
+
+      while line = f.gets()
+	break if /^From /=~line
+	@body.push(line)
+      end
+    ensure
+      f.close if opened
+    end
+  end
+
+  # Return the headers as a Hash.
+  def header
+    return @header
+  end
+
+  # Return the message body as an Array of lines
+  def body
+    return @body
+  end
+
+  # Return the header corresponding to +field+. 
+  #
+  # Matching is case-insensitive.
+  def [](field)
+    @header[field.capitalize]
+  end
+end
diff --git a/ruby_1_8_6/lib/mathn.rb b/ruby_1_8_6/lib/mathn.rb
new file mode 100644
index 0000000000..a5a121c6c6
--- /dev/null
+++ b/ruby_1_8_6/lib/mathn.rb
@@ -0,0 +1,308 @@
+#
+#   mathn.rb - 
+#   	$Release Version: 0.5 $
+#   	$Revision: 1.1.1.1.4.1 $
+#   	$Date: 1998/01/16 12:36:05 $
+#   	by Keiju ISHITSUKA(SHL Japan Inc.)
+#
+# --
+#
+#   
+#
+
+require "complex.rb"
+require "rational.rb"
+require "matrix.rb"
+
+class Integer
+
+  def gcd2(int)
+    a = self.abs
+    b = int.abs
+    a, b = b, a if a < b
+    
+    pd_a = a.prime_division
+    pd_b = b.prime_division
+    
+    gcd = 1
+    for pair in pd_a
+      as = pd_b.assoc(pair[0])
+      if as
+	gcd *= as[0] ** [as[1], pair[1]].min
+      end
+    end
+    return gcd
+  end
+  
+  def Integer.from_prime_division(pd)
+    value = 1
+    for prime, index in pd
+      value *= prime**index
+    end
+    value
+  end
+  
+  def prime_division
+    raise ZeroDivisionError if self == 0
+    ps = Prime.new
+    value = self
+    pv = []
+    for prime in ps
+      count = 0
+      while (value1, mod = value.divmod(prime)
+	     mod) == 0
+	value = value1
+	count += 1
+      end
+      if count != 0
+	pv.push [prime, count]
+      end
+      break if prime * prime  >= value
+    end
+    if value > 1
+      pv.push [value, 1]
+    end
+    return pv
+  end
+end
+  
+class Prime
+  include Enumerable
+
+  def initialize
+    @seed = 1
+    @primes = []
+    @counts = []
+  end
+  
+  def succ
+    i = -1
+    size = @primes.size
+    while i < size
+      if i == -1
+	@seed += 1
+	i += 1
+      else
+	while @seed > @counts[i]
+	  @counts[i] += @primes[i]
+	end
+	if @seed != @counts[i]
+	  i += 1
+	else
+	  i = -1
+	end
+      end
+    end
+    @primes.push @seed
+    @counts.push @seed + @seed
+    return @seed
+  end
+  alias next succ
+
+  def each
+    loop do
+      yield succ
+    end
+  end
+end
+
+class Fixnum
+  alias / quo
+end
+
+class Bignum
+  alias / quo
+end
+
+class Rational
+  Unify = true
+
+  def inspect
+    format "%s/%s", numerator.inspect, denominator.inspect
+  end
+
+  alias power! **
+
+  def ** (other)
+    if other.kind_of?(Rational)
+      other2 = other
+      if self < 0
+	return Complex.new!(self, 0) ** other
+      elsif other == 0
+	return Rational(1,1)
+      elsif self == 0
+	return Rational(0,1)
+      elsif self == 1
+	return Rational(1,1)
+      end
+      
+      npd = numerator.prime_division
+      dpd = denominator.prime_division
+      if other < 0
+	other = -other
+	npd, dpd = dpd, npd
+      end
+      
+      for elm in npd
+	elm[1] = elm[1] * other
+	if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
+         return Float(self) ** other2
+	end
+	elm[1] = elm[1].to_i
+      end
+      
+      for elm in dpd
+	elm[1] = elm[1] * other
+	if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
+         return Float(self) ** other2
+	end
+	elm[1] = elm[1].to_i
+      end
+      
+      num = Integer.from_prime_division(npd)
+      den = Integer.from_prime_division(dpd)
+      
+      Rational(num,den)
+      
+    elsif other.kind_of?(Integer)
+      if other > 0
+	num = numerator ** other
+	den = denominator ** other
+      elsif other < 0
+	num = denominator ** -other
+	den = numerator ** -other
+      elsif other == 0
+	num = 1
+	den = 1
+      end
+      Rational.new!(num, den)
+    elsif other.kind_of?(Float)
+      Float(self) ** other
+    else
+      x , y = other.coerce(self)
+      x ** y
+    end
+  end
+
+  def power2(other)
+    if other.kind_of?(Rational)
+      if self < 0
+	return Complex(self, 0) ** other
+      elsif other == 0
+	return Rational(1,1)
+      elsif self == 0
+	return Rational(0,1)
+      elsif self == 1
+	return Rational(1,1)
+      end
+      
+      dem = nil
+      x = self.denominator.to_f.to_i
+      neard = self.denominator.to_f ** (1.0/other.denominator.to_f)
+      loop do
+	if (neard**other.denominator == self.denominator)
+	  dem = neaed
+	  break
+	end
+      end
+      nearn = self.numerator.to_f ** (1.0/other.denominator.to_f)
+      Rational(num,den)
+      
+    elsif other.kind_of?(Integer)
+      if other > 0
+	num = numerator ** other
+	den = denominator ** other
+      elsif other < 0
+	num = denominator ** -other
+	den = numerator ** -other
+      elsif other == 0
+	num = 1
+	den = 1
+      end
+      Rational.new!(num, den)
+    elsif other.kind_of?(Float)
+      Float(self) ** other
+    else
+      x , y = other.coerce(self)
+      x ** y
+    end
+  end
+end
+
+module Math
+  def sqrt(a)
+    if a.kind_of?(Complex)
+      abs = sqrt(a.real*a.real + a.image*a.image)
+#      if not abs.kind_of?(Rational)
+#	return a**Rational(1,2)
+#      end
+      x = sqrt((a.real + abs)/Rational(2))
+      y = sqrt((-a.real + abs)/Rational(2))
+#      if !(x.kind_of?(Rational) and y.kind_of?(Rational))
+#	return a**Rational(1,2)
+#      end
+      if a.image >= 0 
+	Complex(x, y)
+      else
+	Complex(x, -y)
+      end
+    elsif a >= 0
+      rsqrt(a)
+    else
+      Complex(0,rsqrt(-a))
+    end
+  end
+  
+  def rsqrt(a)
+    if a.kind_of?(Float)
+      sqrt!(a)
+    elsif a.kind_of?(Rational)
+      rsqrt(a.numerator)/rsqrt(a.denominator)
+    else
+      src = a
+      max = 2 ** 32
+      byte_a = [src & 0xffffffff]
+      # ruby's bug
+      while (src >= max) and (src >>= 32)
+	byte_a.unshift src & 0xffffffff
+      end
+      
+      answer = 0
+      main = 0
+      side = 0
+      for elm in byte_a
+	main = (main << 32) + elm
+	side <<= 16
+	if answer != 0
+	  if main * 4  < side * side
+	    applo = main.div(side)
+	  else 
+	    applo = ((sqrt!(side * side + 4 * main) - side)/2.0).to_i + 1
+	  end
+	else
+	  applo = sqrt!(main).to_i + 1
+	end
+	
+	while (x = (side + applo) * applo) > main
+	  applo -= 1
+	end
+	main -= x
+	answer = (answer << 16) + applo
+	side += applo * 2
+      end
+      if main == 0
+	answer
+      else
+	sqrt!(a)
+      end
+    end
+  end
+
+  module_function :sqrt
+  module_function :rsqrt
+end
+
+class Complex
+  Unify = true
+end
+
diff --git a/ruby_1_8_6/lib/matrix.rb b/ruby_1_8_6/lib/matrix.rb
new file mode 100644
index 0000000000..c62acdf9aa
--- /dev/null
+++ b/ruby_1_8_6/lib/matrix.rb
@@ -0,0 +1,1272 @@
+#!/usr/local/bin/ruby
+#--
+#   matrix.rb - 
+#       $Release Version: 1.0$
+#       $Revision: 1.11 $
+#       $Date: 1999/10/06 11:01:53 $
+#       Original Version from Smalltalk-80 version
+#          on July 23, 1985 at 8:37:17 am
+#       by Keiju ISHITSUKA
+#++
+#
+# = matrix.rb
+#
+# An implementation of Matrix and Vector classes.
+#
+# Author:: Keiju ISHITSUKA
+# Documentation:: Gavin Sinclair (sourced from <i>Ruby in a Nutshell</i> (Matsumoto, O'Reilly)) 
+#
+# See classes Matrix and Vector for documentation. 
+#
+
+
+require "e2mmap.rb"
+
+module ExceptionForMatrix # :nodoc:
+  extend Exception2MessageMapper
+  def_e2message(TypeError, "wrong argument type %s (expected %s)")
+  def_e2message(ArgumentError, "Wrong # of arguments(%d for %d)")
+  
+  def_exception("ErrDimensionMismatch", "\#{self.name} dimension mismatch")
+  def_exception("ErrNotRegular", "Not Regular Matrix")
+  def_exception("ErrOperationNotDefined", "This operation(%s) can\\'t defined")
+end
+
+#
+# The +Matrix+ class represents a mathematical matrix, and provides methods for creating
+# special-case matrices (zero, identity, diagonal, singular, vector), operating on them
+# arithmetically and algebraically, and determining their mathematical properties (trace, rank,
+# inverse, determinant).
+#
+# Note that although matrices should theoretically be rectangular, this is not
+# enforced by the class.
+#
+# Also note that the determinant of integer matrices may be incorrectly calculated unless you
+# also <tt>require 'mathn'</tt>.  This may be fixed in the future.
+#
+# == Method Catalogue
+#
+# To create a matrix:
+# * <tt> Matrix[*rows]                  </tt>
+# * <tt> Matrix.[](*rows)               </tt>
+# * <tt> Matrix.rows(rows, copy = true) </tt>
+# * <tt> Matrix.columns(columns)        </tt>
+# * <tt> Matrix.diagonal(*values)       </tt>
+# * <tt> Matrix.scalar(n, value)        </tt>
+# * <tt> Matrix.scalar(n, value)        </tt>
+# * <tt> Matrix.identity(n)             </tt>
+# * <tt> Matrix.unit(n)                 </tt>
+# * <tt> Matrix.I(n)                    </tt>
+# * <tt> Matrix.zero(n)                 </tt>
+# * <tt> Matrix.row_vector(row)         </tt>
+# * <tt> Matrix.column_vector(column)   </tt>
+#
+# To access Matrix elements/columns/rows/submatrices/properties: 
+# * <tt>  [](i, j)                      </tt>
+# * <tt> #row_size                      </tt>
+# * <tt> #column_size                   </tt>
+# * <tt> #row(i)                        </tt>
+# * <tt> #column(j)                     </tt>
+# * <tt> #collect                       </tt>
+# * <tt> #map                           </tt>
+# * <tt> #minor(*param)                 </tt>
+#
+# Properties of a matrix:
+# * <tt> #regular?                      </tt>
+# * <tt> #singular?                     </tt>
+# * <tt> #square?                       </tt>
+#
+# Matrix arithmetic:
+# * <tt>  *(m)                          </tt>
+# * <tt>  +(m)                          </tt>
+# * <tt>  -(m)                          </tt>
+# * <tt> #/(m)                          </tt>
+# * <tt> #inverse                       </tt>
+# * <tt> #inv                           </tt>
+# * <tt>  **                            </tt>
+#
+# Matrix functions:
+# * <tt> #determinant                   </tt>
+# * <tt> #det                           </tt>
+# * <tt> #rank                          </tt>
+# * <tt> #trace                         </tt>
+# * <tt> #tr                            </tt>
+# * <tt> #transpose                     </tt>
+# * <tt> #t                             </tt>
+#
+# Conversion to other data types:
+# * <tt> #coerce(other)                 </tt>
+# * <tt> #row_vectors                   </tt>
+# * <tt> #column_vectors                </tt>
+# * <tt> #to_a                          </tt>
+#
+# String representations:
+# * <tt> #to_s                          </tt>
+# * <tt> #inspect                       </tt>
+#
+class Matrix
+  @RCS_ID='-$Id: matrix.rb,v 1.11 1999/10/06 11:01:53 keiju Exp keiju $-'
+  
+#  extend Exception2MessageMapper
+  include ExceptionForMatrix
+  
+  # instance creations
+  private_class_method :new
+  
+  #
+  # Creates a matrix where each argument is a row.
+  #   Matrix[ [25, 93], [-1, 66] ]
+  #      =>  25 93
+  #          -1 66
+  #
+  def Matrix.[](*rows)
+    new(:init_rows, rows, false)
+  end
+  
+  #
+  # Creates a matrix where +rows+ is an array of arrays, each of which is a row
+  # to the matrix.  If the optional argument +copy+ is false, use the given
+  # arrays as the internal structure of the matrix without copying.
+  #   Matrix.rows([[25, 93], [-1, 66]])
+  #      =>  25 93
+  #          -1 66
+  def Matrix.rows(rows, copy = true)
+    new(:init_rows, rows, copy)
+  end
+  
+  #
+  # Creates a matrix using +columns+ as an array of column vectors.
+  #   Matrix.columns([[25, 93], [-1, 66]])
+  #      =>  25 -1
+  #          93 66
+  #
+  #
+  def Matrix.columns(columns)
+    rows = (0 .. columns[0].size - 1).collect {
+      |i|
+      (0 .. columns.size - 1).collect {
+        |j|
+        columns[j][i]
+      }
+    }
+    Matrix.rows(rows, false)
+  end
+  
+  #
+  # Creates a matrix where the diagonal elements are composed of +values+.
+  #   Matrix.diagonal(9, 5, -3)
+  #     =>  9  0  0
+  #         0  5  0
+  #         0  0 -3
+  #
+  def Matrix.diagonal(*values)
+    size = values.size
+    rows = (0 .. size  - 1).collect {
+      |j|
+      row = Array.new(size).fill(0, 0, size)
+      row[j] = values[j]
+      row
+    }
+    rows(rows, false)
+  end
+  
+  #
+  # Creates an +n+ by +n+ diagonal matrix where each diagonal element is
+  # +value+.
+  #   Matrix.scalar(2, 5)
+  #     => 5 0
+  #        0 5
+  #
+  def Matrix.scalar(n, value)
+    Matrix.diagonal(*Array.new(n).fill(value, 0, n))
+  end
+
+  #
+  # Creates an +n+ by +n+ identity matrix.
+  #   Matrix.identity(2)
+  #     => 1 0
+  #        0 1
+  #
+  def Matrix.identity(n)
+    Matrix.scalar(n, 1)
+  end
+  class << Matrix 
+    alias unit identity
+    alias I identity
+  end
+  
+  #
+  # Creates an +n+ by +n+ zero matrix.
+  #   Matrix.zero(2)
+  #     => 0 0
+  #        0 0
+  #
+  def Matrix.zero(n)
+    Matrix.scalar(n, 0)
+  end
+  
+  #
+  # Creates a single-row matrix where the values of that row are as given in
+  # +row+.
+  #   Matrix.row_vector([4,5,6])
+  #     => 4 5 6
+  #
+  def Matrix.row_vector(row)
+    case row
+    when Vector
+      Matrix.rows([row.to_a], false)
+    when Array
+      Matrix.rows([row.dup], false)
+    else
+      Matrix.rows([[row]], false)
+    end
+  end
+  
+  #
+  # Creates a single-column matrix where the values of that column are as given
+  # in +column+.
+  #   Matrix.column_vector([4,5,6])
+  #     => 4
+  #        5
+  #        6
+  #
+  def Matrix.column_vector(column)
+    case column
+    when Vector
+      Matrix.columns([column.to_a])
+    when Array
+      Matrix.columns([column])
+    else
+      Matrix.columns([[column]])
+    end
+  end
+
+  #
+  # This method is used by the other methods that create matrices, and is of no
+  # use to general users.
+  #
+  def initialize(init_method, *argv)
+    self.send(init_method, *argv)
+  end
+  
+  def init_rows(rows, copy)
+    if copy
+      @rows = rows.collect{|row| row.dup}
+    else
+      @rows = rows
+    end
+    self
+  end
+  private :init_rows
+  
+  #
+  # Returns element (+i+,+j+) of the matrix.  That is: row +i+, column +j+.
+  #
+  def [](i, j)
+    @rows[i][j]
+  end
+
+  #
+  # Returns the number of rows.
+  #
+  def row_size
+    @rows.size
+  end
+  
+  #
+  # Returns the number of columns.  Note that it is possible to construct a
+  # matrix with uneven columns (e.g. Matrix[ [1,2,3], [4,5] ]), but this is
+  # mathematically unsound.  This method uses the first row to determine the
+  # result.
+  #
+  def column_size
+    @rows[0].size
+  end
+
+  #
+  # Returns row vector number +i+ of the matrix as a Vector (starting at 0 like
+  # an array).  When a block is given, the elements of that vector are iterated.
+  #
+  def row(i) # :yield: e
+    if block_given?
+      for e in @rows[i]
+        yield e
+      end
+    else
+      Vector.elements(@rows[i])
+    end
+  end
+
+  #
+  # Returns column vector number +j+ of the matrix as a Vector (starting at 0
+  # like an array).  When a block is given, the elements of that vector are
+  # iterated.
+  #
+  def column(j) # :yield: e
+    if block_given?
+      0.upto(row_size - 1) do
+        |i|
+        yield @rows[i][j]
+      end
+    else
+      col = (0 .. row_size - 1).collect {
+        |i|
+        @rows[i][j]
+      }
+      Vector.elements(col, false)
+    end
+  end
+  
+  #
+  # Returns a matrix that is the result of iteration of the given block over all
+  # elements of the matrix.
+  #   Matrix[ [1,2], [3,4] ].collect { |i| i**2 }
+  #     => 1  4
+  #        9 16
+  #
+  def collect # :yield: e
+    rows = @rows.collect{|row| row.collect{|e| yield e}}
+    Matrix.rows(rows, false)
+  end
+  alias map collect
+  
+  #
+  # Returns a section of the matrix.  The parameters are either:
+  # *  start_row, nrows, start_col, ncols; OR
+  # *  col_range, row_range
+  #
+  #   Matrix.diagonal(9, 5, -3).minor(0..1, 0..2)
+  #     => 9 0 0
+  #        0 5 0
+  #
+  def minor(*param)
+    case param.size
+    when 2
+      from_row = param[0].first
+      size_row = param[0].end - from_row
+      size_row += 1 unless param[0].exclude_end?
+      from_col = param[1].first
+      size_col = param[1].end - from_col
+      size_col += 1 unless param[1].exclude_end?
+    when 4
+      from_row = param[0]
+      size_row = param[1]
+      from_col = param[2]
+      size_col = param[3]
+    else
+      Matrix.Raise ArgumentError, param.inspect
+    end
+    
+    rows = @rows[from_row, size_row].collect{
+      |row|
+      row[from_col, size_col]
+    }
+    Matrix.rows(rows, false)
+  end
+ 
+  #--
+  # TESTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  #++
+
+  #
+  # Returns +true+ if this is a regular matrix.
+  #
+  def regular?
+    square? and rank == column_size
+  end
+  
+  #
+  # Returns +true+ is this is a singular (i.e. non-regular) matrix.
+  #
+  def singular?
+    not regular?
+  end
+
+  #
+  # Returns +true+ is this is a square matrix.  See note in column_size about this
+  # being unreliable, though.
+  #
+  def square?
+    column_size == row_size
+  end
+  
+  #--
+  # OBJECT METHODS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  #++
+
+  #
+  # Returns +true+ if and only if the two matrices contain equal elements.
+  #
+  def ==(other)
+    return false unless Matrix === other
+    
+    other.compare_by_row_vectors(@rows)
+  end
+  alias eql? ==
+  
+  #
+  # Not really intended for general consumption.
+  #
+  def compare_by_row_vectors(rows)
+    return false unless @rows.size == rows.size
+    
+    0.upto(@rows.size - 1) do
+      |i|
+      return false unless @rows[i] == rows[i]
+    end
+    true
+  end
+  
+  #
+  # Returns a clone of the matrix, so that the contents of each do not reference
+  # identical objects.
+  #
+  def clone
+    Matrix.rows(@rows)
+  end
+  
+  #
+  # Returns a hash-code for the matrix.
+  #
+  def hash
+    value = 0
+    for row in @rows
+      for e in row
+        value ^= e.hash
+      end
+    end
+    return value
+  end
+  
+  #--
+  # ARITHMETIC -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  #++
+  
+  #
+  # Matrix multiplication.
+  #   Matrix[[2,4], [6,8]] * Matrix.identity(2)
+  #     => 2 4
+  #        6 8
+  #
+  def *(m) # m is matrix or vector or number
+    case(m)
+    when Numeric
+      rows = @rows.collect {
+        |row|
+        row.collect {
+          |e|
+          e * m
+        }
+      }
+      return Matrix.rows(rows, false)
+    when Vector
+      m = Matrix.column_vector(m)
+      r = self * m
+      return r.column(0)
+    when Matrix
+      Matrix.Raise ErrDimensionMismatch if column_size != m.row_size
+    
+      rows = (0 .. row_size - 1).collect {
+        |i|
+        (0 .. m.column_size - 1).collect {
+          |j|
+          vij = 0
+          0.upto(column_size - 1) do
+            |k|
+            vij += self[i, k] * m[k, j]
+          end
+          vij
+        }
+      }
+      return Matrix.rows(rows, false)
+    else
+      x, y = m.coerce(self)
+      return x * y
+    end
+  end
+  
+  #
+  # Matrix addition.
+  #   Matrix.scalar(2,5) + Matrix[[1,0], [-4,7]]
+  #     =>  6  0
+  #        -4 12
+  #
+  def +(m)
+    case m
+    when Numeric
+      Matrix.Raise ErrOperationNotDefined, "+"
+    when Vector
+      m = Matrix.column_vector(m)
+    when Matrix
+    else
+      x, y = m.coerce(self)
+      return x + y
+    end
+    
+    Matrix.Raise ErrDimensionMismatch unless row_size == m.row_size and column_size == m.column_size
+    
+    rows = (0 .. row_size - 1).collect {
+      |i|
+      (0 .. column_size - 1).collect {
+        |j|
+        self[i, j] + m[i, j]
+      }
+    }
+    Matrix.rows(rows, false)
+  end
+
+  #
+  # Matrix subtraction.
+  #   Matrix[[1,5], [4,2]] - Matrix[[9,3], [-4,1]]
+  #     => -8  2
+  #         8  1
+  #
+  def -(m)
+    case m
+    when Numeric
+      Matrix.Raise ErrOperationNotDefined, "-"
+    when Vector
+      m = Matrix.column_vector(m)
+    when Matrix
+    else
+      x, y = m.coerce(self)
+      return x - y
+    end
+    
+    Matrix.Raise ErrDimensionMismatch unless row_size == m.row_size and column_size == m.column_size
+    
+    rows = (0 .. row_size - 1).collect {
+      |i|
+      (0 .. column_size - 1).collect {
+        |j|
+        self[i, j] - m[i, j]
+      }
+    }
+    Matrix.rows(rows, false)
+  end
+  
+  #
+  # Matrix division (multiplication by the inverse).
+  #   Matrix[[7,6], [3,9]] / Matrix[[2,9], [3,1]]
+  #     => -7  1
+  #        -3 -6
+  #
+  def /(other)
+    case other
+    when Numeric
+      rows = @rows.collect {
+        |row|
+        row.collect {
+          |e|
+          e / other
+        }
+      }
+      return Matrix.rows(rows, false)
+    when Matrix
+      return self * other.inverse
+    else
+      x, y = other.coerce(self)
+      rerurn x / y
+    end
+  end
+
+  #
+  # Returns the inverse of the matrix.
+  #   Matrix[[1, 2], [2, 1]].inverse
+  #     => -1  1
+  #         0 -1
+  #
+  def inverse
+    Matrix.Raise ErrDimensionMismatch unless square?
+    Matrix.I(row_size).inverse_from(self)
+  end
+  alias inv inverse
+
+  #
+  # Not for public consumption?
+  #
+  def inverse_from(src)
+    size = row_size - 1
+    a = src.to_a
+    
+    for k in 0..size
+      if (akk = a[k][k]) == 0
+        i = k
+        begin
+          Matrix.Raise ErrNotRegular if (i += 1) > size
+        end while a[i][k] == 0
+        a[i], a[k] = a[k], a[i]
+        @rows[i], @rows[k] = @rows[k], @rows[i]
+        akk = a[k][k]
+      end
+      
+      for i in 0 .. size
+        next if i == k
+        q = a[i][k] / akk
+        a[i][k] = 0
+        
+        (k + 1).upto(size) do   
+          |j|
+          a[i][j] -= a[k][j] * q
+        end
+        0.upto(size) do
+          |j|
+          @rows[i][j] -= @rows[k][j] * q
+        end
+      end
+      
+      (k + 1).upto(size) do
+        |j|
+        a[k][j] /= akk
+      end
+      0.upto(size) do
+        |j|
+        @rows[k][j] /= akk
+      end
+    end
+    self
+  end
+  #alias reciprocal inverse
+  
+  #
+  # Matrix exponentiation.  Defined for integer powers only.  Equivalent to
+  # multiplying the matrix by itself N times.
+  #   Matrix[[7,6], [3,9]] ** 2
+  #     => 67 96
+  #        48 99
+  #
+  def ** (other)
+    if other.kind_of?(Integer)
+      x = self
+      if other <= 0
+        x = self.inverse
+        return Matrix.identity(self.column_size) if other == 0
+        other = -other
+      end
+      z = x
+      n = other  - 1
+      while n != 0
+        while (div, mod = n.divmod(2)
+               mod == 0)
+          x = x * x
+          n = div
+        end
+        z *= x
+        n -= 1
+      end
+      z
+    elsif other.kind_of?(Float) || defined?(Rational) && other.kind_of?(Rational)
+      Matrix.Raise ErrOperationNotDefined, "**"
+    else
+      Matrix.Raise ErrOperationNotDefined, "**"
+    end
+  end
+  
+  #--
+  # MATRIX FUNCTIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  #++
+  
+  #
+  # Returns the determinant of the matrix.  If the matrix is not square, the
+  # result is 0.
+  #   Matrix[[7,6], [3,9]].determinant
+  #     => 63
+  #
+  def determinant
+    return 0 unless square?
+    
+    size = row_size - 1
+    a = to_a
+    
+    det = 1
+    k = 0
+    begin 
+      if (akk = a[k][k]) == 0
+        i = k
+        begin
+          return 0 if (i += 1) > size
+        end while a[i][k] == 0
+        a[i], a[k] = a[k], a[i]
+        akk = a[k][k]
+        det *= -1
+      end
+      (k + 1).upto(size) do
+        |i|
+        q = a[i][k] / akk
+        (k + 1).upto(size) do
+          |j|
+          a[i][j] -= a[k][j] * q
+        end
+      end
+      det *= akk
+    end while (k += 1) <= size
+    det
+  end
+  alias det determinant
+        
+  #
+  # Returns the rank of the matrix.  Beware that using Float values, with their
+  # usual lack of precision, can affect the value returned by this method.  Use
+  # Rational values instead if this is important to you.
+  #   Matrix[[7,6], [3,9]].rank
+  #     => 2
+  #
+  def rank
+    if column_size > row_size
+      a = transpose.to_a
+      a_column_size = row_size
+      a_row_size = column_size
+    else
+      a = to_a
+      a_column_size = column_size
+      a_row_size = row_size
+    end
+    rank = 0
+    k = 0
+    begin
+      if (akk = a[k][k]) == 0
+        i = k
+        exists = true
+        begin
+          if (i += 1) > a_column_size - 1
+            exists = false
+            break
+          end
+        end while a[i][k] == 0
+        if exists
+          a[i], a[k] = a[k], a[i]
+          akk = a[k][k]
+        else
+          i = k
+          exists = true
+          begin
+            if (i += 1) > a_row_size - 1
+              exists = false
+              break
+            end
+          end while a[k][i] == 0
+          if exists
+            k.upto(a_column_size - 1) do
+              |j|
+              a[j][k], a[j][i] = a[j][i], a[j][k]
+            end
+            akk = a[k][k]
+          else
+            next
+          end
+        end
+      end
+      (k + 1).upto(a_row_size - 1) do
+        |i|
+        q = a[i][k] / akk
+        (k + 1).upto(a_column_size - 1) do
+          |j|
+          a[i][j] -= a[k][j] * q
+        end
+      end
+      rank += 1
+    end while (k += 1) <= a_column_size - 1
+    return rank
+  end
+
+  #
+  # Returns the trace (sum of diagonal elements) of the matrix.
+  #   Matrix[[7,6], [3,9]].trace
+  #     => 16
+  #
+  def trace
+    tr = 0
+    0.upto(column_size - 1) do
+      |i|
+      tr += @rows[i][i]
+    end
+    tr
+  end
+  alias tr trace
+  
+  #
+  # Returns the transpose of the matrix.
+  #   Matrix[[1,2], [3,4], [5,6]]
+  #     => 1 2
+  #        3 4
+  #        5 6
+  #   Matrix[[1,2], [3,4], [5,6]].transpose
+  #     => 1 3 5
+  #        2 4 6
+  #
+  def transpose
+    Matrix.columns(@rows)
+  end
+  alias t transpose
+  
+  #--
+  # CONVERTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  #++
+  
+  #
+  # FIXME: describe #coerce.
+  #
+  def coerce(other)
+    case other
+    when Numeric
+      return Scalar.new(other), self
+    else
+      raise TypeError, "#{self.class} can't be coerced into #{other.class}"
+    end
+  end
+
+  #
+  # Returns an array of the row vectors of the matrix.  See Vector.
+  #
+  def row_vectors
+    rows = (0 .. row_size - 1).collect {
+      |i|
+      row(i)
+    }
+    rows
+  end
+  
+  #
+  # Returns an array of the column vectors of the matrix.  See Vector.
+  #
+  def column_vectors
+    columns = (0 .. column_size - 1).collect {
+      |i|
+      column(i)
+    }
+    columns
+  end
+  
+  #
+  # Returns an array of arrays that describe the rows of the matrix.
+  #
+  def to_a
+    @rows.collect{|row| row.collect{|e| e}}
+  end
+  
+  #--
+  # PRINTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  #++
+  
+  #
+  # Overrides Object#to_s
+  #
+  def to_s
+    "Matrix[" + @rows.collect{
+      |row|
+      "[" + row.collect{|e| e.to_s}.join(", ") + "]"
+    }.join(", ")+"]"
+  end
+  
+  #
+  # Overrides Object#inspect
+  #
+  def inspect
+    "Matrix"+@rows.inspect
+  end
+  
+  # Private CLASS
+  
+  class Scalar < Numeric # :nodoc:
+    include ExceptionForMatrix
+    
+    def initialize(value)
+      @value = value
+    end
+    
+    # ARITHMETIC
+    def +(other)
+      case other
+      when Numeric
+        Scalar.new(@value + other)
+      when Vector, Matrix
+        Scalar.Raise WrongArgType, other.class, "Numeric or Scalar"
+      when Scalar
+        Scalar.new(@value + other.value)
+      else
+        x, y = other.coerce(self)
+        x + y
+      end
+    end
+    
+    def -(other)
+      case other
+      when Numeric
+        Scalar.new(@value - other)
+      when Vector, Matrix
+        Scalar.Raise WrongArgType, other.class, "Numeric or Scalar"
+      when Scalar
+        Scalar.new(@value - other.value)
+      else
+        x, y = other.coerce(self)
+        x - y
+      end
+    end
+    
+    def *(other)
+      case other
+      when Numeric
+        Scalar.new(@value * other)
+      when Vector, Matrix
+        other.collect{|e| @value * e}
+      else
+        x, y = other.coerce(self)
+        x * y
+      end
+    end
+    
+    def / (other)
+      case other
+      when Numeric
+        Scalar.new(@value / other)
+      when Vector
+        Scalar.Raise WrongArgType, other.class, "Numeric or Scalar or Matrix"
+      when Matrix
+        self * _M.inverse
+      else
+        x, y = other.coerce(self)
+        x / y
+      end
+    end
+    
+    def ** (other)
+      case other
+      when Numeric
+        Scalar.new(@value ** other)
+      when Vector
+        Scalar.Raise WrongArgType, other.class, "Numeric or Scalar or Matrix"
+      when Matrix
+        other.powered_by(self)
+      else
+        x, y = other.coerce(self)
+        x ** y
+      end
+    end
+  end
+end
+
+
+#
+# The +Vector+ class represents a mathematical vector, which is useful in its own right, and
+# also constitutes a row or column of a Matrix.
+#
+# == Method Catalogue
+#
+# To create a Vector:
+# * <tt>  Vector.[](*array)                   </tt>
+# * <tt>  Vector.elements(array, copy = true) </tt>
+#
+# To access elements:
+# * <tt>  [](i)                               </tt>
+#
+# To enumerate the elements:
+# * <tt> #each2(v)                            </tt>
+# * <tt> #collect2(v)                         </tt>
+#
+# Vector arithmetic:
+# * <tt>  *(x) "is matrix or number"          </tt>
+# * <tt>  +(v)                                </tt>
+# * <tt>  -(v)                                </tt>
+#
+# Vector functions:
+# * <tt> #inner_product(v)                    </tt>
+# * <tt> #collect                             </tt>
+# * <tt> #map                                 </tt>
+# * <tt> #map2(v)                             </tt>
+# * <tt> #r                                   </tt>
+# * <tt> #size                                </tt>
+#
+# Conversion to other data types:
+# * <tt> #covector                            </tt>
+# * <tt> #to_a                                </tt>
+# * <tt> #coerce(other)                       </tt>
+#
+# String representations:
+# * <tt> #to_s                                </tt>
+# * <tt> #inspect                             </tt>
+#
+class Vector
+  include ExceptionForMatrix
+  
+  #INSTANCE CREATION
+  
+  private_class_method :new
+
+  #
+  # Creates a Vector from a list of elements.
+  #   Vector[7, 4, ...]
+  #
+  def Vector.[](*array)
+    new(:init_elements, array, copy = false)
+  end
+  
+  #
+  # Creates a vector from an Array.  The optional second argument specifies
+  # whether the array itself or a copy is used internally.
+  #
+  def Vector.elements(array, copy = true)
+    new(:init_elements, array, copy)
+  end
+  
+  #
+  # For internal use.
+  #
+  def initialize(method, array, copy)
+    self.send(method, array, copy)
+  end
+  
+  #
+  # For internal use.
+  #
+  def init_elements(array, copy)
+    if copy
+      @elements = array.dup
+    else
+      @elements = array
+    end
+  end
+  
+  # ACCESSING
+         
+  #
+  # Returns element number +i+ (starting at zero) of the vector.
+  #
+  def [](i)
+    @elements[i]
+  end
+  
+  #
+  # Returns the number of elements in the vector.
+  #
+  def size
+    @elements.size
+  end
+  
+  #--
+  # ENUMERATIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  #++
+
+  #
+  # Iterate over the elements of this vector and +v+ in conjunction.
+  #
+  def each2(v) # :yield: e1, e2
+    Vector.Raise ErrDimensionMismatch if size != v.size
+    0.upto(size - 1) do
+      |i|
+      yield @elements[i], v[i]
+    end
+  end
+  
+  #
+  # Collects (as in Enumerable#collect) over the elements of this vector and +v+
+  # in conjunction.
+  #
+  def collect2(v) # :yield: e1, e2
+    Vector.Raise ErrDimensionMismatch if size != v.size
+    (0 .. size - 1).collect do
+      |i|
+      yield @elements[i], v[i]
+    end
+  end
+
+  #--
+  # COMPARING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  #++
+
+  #
+  # Returns +true+ iff the two vectors have the same elements in the same order.
+  #
+  def ==(other)
+    return false unless Vector === other
+    
+    other.compare_by(@elements)
+  end
+  alias eqn? ==
+  
+  #
+  # For internal use.
+  #
+  def compare_by(elements)
+    @elements == elements
+  end
+  
+  #
+  # Return a copy of the vector.
+  #
+  def clone
+    Vector.elements(@elements)
+  end
+  
+  #
+  # Return a hash-code for the vector.
+  #
+  def hash
+    @elements.hash
+  end
+  
+  #--
+  # ARITHMETIC -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  #++
+  
+  #
+  # Multiplies the vector by +x+, where +x+ is a number or another vector.
+  #
+  def *(x)
+    case x
+    when Numeric
+      els = @elements.collect{|e| e * x}
+      Vector.elements(els, false)
+    when Matrix
+      Matrix.column_vector(self) * x
+    else
+      s, x = x.coerce(self)
+      s * x
+    end
+  end
+
+  #
+  # Vector addition.
+  #
+  def +(v)
+    case v
+    when Vector
+      Vector.Raise ErrDimensionMismatch if size != v.size
+      els = collect2(v) {
+        |v1, v2|
+        v1 + v2
+      }
+      Vector.elements(els, false)
+    when Matrix
+      Matrix.column_vector(self) + v
+    else
+      s, x = v.coerce(self)
+      s + x
+    end
+  end
+
+  #
+  # Vector subtraction.
+  #
+  def -(v)
+    case v
+    when Vector
+      Vector.Raise ErrDimensionMismatch if size != v.size
+      els = collect2(v) {
+        |v1, v2|
+        v1 - v2
+      }
+      Vector.elements(els, false)
+    when Matrix
+      Matrix.column_vector(self) - v
+    else
+      s, x = v.coerce(self)
+      s - x
+    end
+  end
+  
+  #--
+  # VECTOR FUNCTIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  #++
+  
+  #
+  # Returns the inner product of this vector with the other.
+  #   Vector[4,7].inner_product Vector[10,1]  => 47
+  #
+  def inner_product(v)
+    Vector.Raise ErrDimensionMismatch if size != v.size
+    
+    p = 0
+    each2(v) {
+      |v1, v2|
+      p += v1 * v2
+    }
+    p
+  end
+  
+  #
+  # Like Array#collect.
+  #
+  def collect # :yield: e
+    els = @elements.collect {
+      |v|
+      yield v
+    }
+    Vector.elements(els, false)
+  end
+  alias map collect
+  
+  #
+  # Like Vector#collect2, but returns a Vector instead of an Array.
+  #
+  def map2(v) # :yield: e1, e2
+    els = collect2(v) {
+      |v1, v2|
+      yield v1, v2
+    }
+    Vector.elements(els, false)
+  end
+  
+  #
+  # Returns the modulus (Pythagorean distance) of the vector.
+  #   Vector[5,8,2].r => 9.643650761
+  #
+  def r
+    v = 0
+    for e in @elements
+      v += e*e
+    end
+    return Math.sqrt(v)
+  end
+  
+  #--
+  # CONVERTING
+  #++
+
+  #
+  # Creates a single-row matrix from this vector.
+  #
+  def covector
+    Matrix.row_vector(self)
+  end
+  
+  #
+  # Returns the elements of the vector in an array.
+  #
+  def to_a
+    @elements.dup
+  end
+  
+  #
+  # FIXME: describe Vector#coerce.
+  #
+  def coerce(other)
+    case other
+    when Numeric
+      return Scalar.new(other), self
+    else
+      raise TypeError, "#{self.class} can't be coerced into #{other.class}"
+    end
+  end
+  
+  #--
+  # PRINTING -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  #++
+  
+  #
+  # Overrides Object#to_s
+  #
+  def to_s
+    "Vector[" + @elements.join(", ") + "]"
+  end
+  
+  #
+  # Overrides Object#inspect
+  #
+  def inspect
+    str = "Vector"+@elements.inspect
+  end
+end
+
+
+# Documentation comments:
+#  - Matrix#coerce and Vector#coerce need to be documented
diff --git a/ruby_1_8_6/lib/mkmf.rb b/ruby_1_8_6/lib/mkmf.rb
new file mode 100644
index 0000000000..f02003fb27
--- /dev/null
+++ b/ruby_1_8_6/lib/mkmf.rb
@@ -0,0 +1,1553 @@
+# module to create Makefile for extension modules
+# invoke like: ruby -r mkmf extconf.rb
+
+require 'rbconfig'
+require 'fileutils'
+require 'shellwords'
+
+CONFIG = Config::MAKEFILE_CONFIG
+ORIG_LIBPATH = ENV['LIB']
+
+CXX_EXT = %w[cc cxx cpp]
+if /mswin|bccwin|mingw|msdosdjgpp|human|os2/ !~ CONFIG['build_os']
+  CXX_EXT.concat(%w[C])
+end
+SRC_EXT = %w[c m] << CXX_EXT
+$static = $config_h = nil
+$default_static = $static
+
+unless defined? $configure_args
+  $configure_args = {}
+  args = CONFIG["configure_args"]
+  if ENV["CONFIGURE_ARGS"]
+    args << " " << ENV["CONFIGURE_ARGS"]
+  end
+  for arg in Shellwords::shellwords(args)
+    arg, val = arg.split('=', 2)
+    next unless arg
+    arg.tr!('_', '-')
+    if arg.sub!(/^(?!--)/, '--')
+      val or next
+      arg.downcase!
+    end
+    next if /^--(?:top|topsrc|src|cur)dir$/ =~ arg
+    $configure_args[arg] = val || true
+  end
+  for arg in ARGV
+    arg, val = arg.split('=', 2)
+    next unless arg
+    arg.tr!('_', '-')
+    if arg.sub!(/^(?!--)/, '--')
+      val or next
+      arg.downcase!
+    end
+    $configure_args[arg] = val || true
+  end
+end
+
+$libdir = CONFIG["libdir"]
+$rubylibdir = CONFIG["rubylibdir"]
+$archdir = CONFIG["archdir"]
+$sitedir = CONFIG["sitedir"]
+$sitelibdir = CONFIG["sitelibdir"]
+$sitearchdir = CONFIG["sitearchdir"]
+
+$mswin = /mswin/ =~ RUBY_PLATFORM
+$bccwin = /bccwin/ =~ RUBY_PLATFORM
+$mingw = /mingw/ =~ RUBY_PLATFORM
+$cygwin = /cygwin/ =~ RUBY_PLATFORM
+$human = /human/ =~ RUBY_PLATFORM
+$netbsd = /netbsd/ =~ RUBY_PLATFORM
+$os2 = /os2/ =~ RUBY_PLATFORM
+$beos = /beos/ =~ RUBY_PLATFORM
+$solaris = /solaris/ =~ RUBY_PLATFORM
+$dest_prefix_pattern = (File::PATH_SEPARATOR == ';' ? /\A([[:alpha:]]:)?/ : /\A/)
+
+def config_string(key, config = CONFIG)
+  s = config[key] and !s.empty? and block_given? ? yield(s) : s
+end
+
+def dir_re(dir)
+  Regexp.new('\$(?:\('+dir+'\)|\{'+dir+'\})(?:\$(?:\(target_prefix\)|\{target_prefix\}))?')
+end
+
+INSTALL_DIRS = [
+  [dir_re('commondir'), "$(RUBYCOMMONDIR)"],
+  [dir_re("sitedir"), "$(RUBYCOMMONDIR)"],
+  [dir_re('rubylibdir'), "$(RUBYLIBDIR)"],
+  [dir_re('archdir'), "$(RUBYARCHDIR)"],
+  [dir_re('sitelibdir'), "$(RUBYLIBDIR)"],
+  [dir_re('sitearchdir'), "$(RUBYARCHDIR)"]
+]
+
+def install_dirs(target_prefix = nil)
+  if $extout
+    dirs = [
+      ['RUBYCOMMONDIR', '$(extout)/common'],
+      ['RUBYLIBDIR',    '$(RUBYCOMMONDIR)$(target_prefix)'],
+      ['RUBYARCHDIR',   '$(extout)/$(arch)$(target_prefix)'],
+      ['extout',        "#$extout"],
+      ['extout_prefix', "#$extout_prefix"],
+    ]
+  elsif $extmk
+    dirs = [
+      ['RUBYCOMMONDIR', '$(rubylibdir)'],
+      ['RUBYLIBDIR',    '$(rubylibdir)$(target_prefix)'],
+      ['RUBYARCHDIR',   '$(archdir)$(target_prefix)'],
+    ]
+  else
+    dirs = [
+      ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
+      ['RUBYLIBDIR',    '$(sitelibdir)$(target_prefix)'],
+      ['RUBYARCHDIR',   '$(sitearchdir)$(target_prefix)'],
+    ]
+  end
+  dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]
+  dirs
+end
+
+def map_dir(dir, map = nil)
+  map ||= INSTALL_DIRS
+  map.inject(dir) {|dir, (orig, new)| dir.gsub(orig, new)}
+end
+
+topdir = File.dirname(libdir = File.dirname(__FILE__))
+extdir = File.expand_path("ext", topdir)
+$extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/"
+if not $extmk and File.exist?(Config::CONFIG["archdir"] + "/ruby.h")
+  $hdrdir = $topdir = Config::CONFIG["archdir"]
+elsif File.exist?(($top_srcdir ||= topdir)  + "/ruby.h") and
+    File.exist?(($topdir ||= Config::CONFIG["topdir"]) + "/config.h")
+  $hdrdir = $top_srcdir
+else
+  abort "can't find header files for ruby."
+end
+
+OUTFLAG = CONFIG['OUTFLAG']
+CPPOUTFILE = CONFIG['CPPOUTFILE']
+
+CONFTEST_C = "conftest.c"
+
+class String
+  def quote
+    /\s/ =~ self ? "\"#{self}\"" : self
+  end
+end
+class Array
+  def quote
+    map {|s| s.quote}
+  end
+end
+
+def rm_f(*files)
+  FileUtils.rm_f(Dir[files.join("\0")])
+end
+
+def modified?(target, times)
+  (t = File.mtime(target)) rescue return nil
+  Array === times or times = [times]
+  t if times.all? {|n| n <= t}
+end
+
+def merge_libs(*libs)
+  libs.inject([]) do |x, y|
+    xy = x & y
+    xn = yn = 0
+    y = y.inject([]) {|ary, e| ary.last == e ? ary : ary << e}
+    y.each_with_index do |v, yi|
+      if xy.include?(v)
+        xi = [x.index(v), xn].max()
+        x[xi, 1] = y[yn..yi]
+        xn, yn = xi + (yi - yn + 1), yi + 1
+      end
+    end
+    x.concat(y[yn..-1] || [])
+  end
+end
+
+module Logging
+  @log = nil
+  @logfile = 'mkmf.log'
+  @orgerr = $stderr.dup
+  @orgout = $stdout.dup
+  @postpone = 0
+
+  def self::open
+    @log ||= File::open(@logfile, 'w')
+    @log.sync = true
+    $stderr.reopen(@log)
+    $stdout.reopen(@log)
+    yield
+  ensure
+    $stderr.reopen(@orgerr)
+    $stdout.reopen(@orgout)
+  end
+
+  def self::message(*s)
+    @log ||= File::open(@logfile, 'w')
+    @log.sync = true
+    @log.printf(*s)
+  end
+
+  def self::logfile file
+    @logfile = file
+    if @log and not @log.closed?
+      @log.flush
+      @log.close
+      @log = nil
+    end
+  end
+  
+  def self::postpone
+    tmplog = "mkmftmp#{@postpone += 1}.log"
+    open do
+      log, *save = @log, @logfile, @orgout, @orgerr
+      @log, @logfile, @orgout, @orgerr = nil, tmplog, log, log
+      begin
+        log.print(open {yield})
+        @log.close
+        File::open(tmplog) {|t| FileUtils.copy_stream(t, log)}
+      ensure
+        @log, @logfile, @orgout, @orgerr = log, *save
+        @postpone -= 1
+        rm_f tmplog
+      end
+    end
+  end
+end
+
+def xsystem command
+  Logging::open do
+    puts command.quote
+    system(command)
+  end
+end
+
+def xpopen command, *mode, &block
+  Logging::open do
+    case mode[0]
+    when nil, /^r/
+      puts "#{command} |"
+    else
+      puts "| #{command}"
+    end
+    IO.popen(command, *mode, &block)
+  end
+end
+
+def log_src(src)
+  src = src.split(/^/)
+  fmt = "%#{src.size.to_s.size}d: %s"
+  Logging::message <<"EOM"
+checked program was:
+/* begin */
+EOM
+  src.each_with_index {|line, no| Logging::message fmt, no+1, line}
+  Logging::message <<"EOM"
+/* end */
+
+EOM
+end
+
+def create_tmpsrc(src)
+  src = yield(src) if block_given?
+  src = src.gsub(/[ \t]+$/, '').gsub(/\A\n+|^\n+$/, '').sub(/[^\n]\z/, "\\&\n")
+  open(CONFTEST_C, "wb") do |cfile|
+    cfile.print src
+  end
+  src
+end
+
+def try_do(src, command, &b)
+  src = create_tmpsrc(src, &b)
+  xsystem(command)
+ensure
+  log_src(src)
+end
+
+def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
+  conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote,
+                              'src' => CONFTEST_C,
+                              'INCFLAGS' => $INCFLAGS,
+                              'CPPFLAGS' => $CPPFLAGS,
+                              'CFLAGS' => "#$CFLAGS",
+                              'ARCH_FLAG' => "#$ARCH_FLAG",
+                              'LDFLAGS' => "#$LDFLAGS #{ldflags}",
+                              'LIBPATH' => libpathflag(libpath),
+                              'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
+                              'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
+  Config::expand(TRY_LINK.dup, conf)
+end
+
+def cc_command(opt="")
+  conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)
+  Config::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
+		 conf)
+end
+
+def cpp_command(outfile, opt="")
+  conf = Config::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)
+  Config::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
+		 conf)
+end
+
+def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
+  libpath.map{|x|
+    case x
+    when "$(topdir)", /\A\./
+      LIBPATHFLAG
+    else
+      LIBPATHFLAG+RPATHFLAG
+    end % x.quote
+  }.join
+end
+
+def try_link0(src, opt="", &b)
+  try_do(src, link_command("", opt), &b)
+end
+
+def try_link(src, opt="", &b)
+  try_link0(src, opt, &b)
+ensure
+  rm_f "conftest*", "c0x32*"
+end
+
+def try_compile(src, opt="", &b)
+  try_do(src, cc_command(opt), &b)
+ensure
+  rm_f "conftest*"
+end
+
+def try_cpp(src, opt="", &b)
+  try_do(src, cpp_command(CPPOUTFILE, opt), &b)
+ensure
+  rm_f "conftest*"
+end
+
+def cpp_include(header)
+  if header
+    header = [header] unless header.kind_of? Array
+    header.map {|h| "#include <#{h}>\n"}.join
+  else
+    ""
+  end
+end
+
+def with_cppflags(flags)
+  cppflags = $CPPFLAGS
+  $CPPFLAGS = flags
+  ret = yield
+ensure
+  $CPPFLAGS = cppflags unless ret
+end
+
+def with_cflags(flags)
+  cflags = $CFLAGS
+  $CFLAGS = flags
+  ret = yield
+ensure
+  $CFLAGS = cflags unless ret
+end
+
+def with_ldflags(flags)
+  ldflags = $LDFLAGS
+  $LDFLAGS = flags
+  ret = yield
+ensure
+  $LDFLAGS = ldflags unless ret
+end
+
+def try_static_assert(expr, headers = nil, opt = "", &b)
+  headers = cpp_include(headers)
+  try_compile(<<SRC, opt, &b)
+#{COMMON_HEADERS}
+#{headers}
+/*top*/
+int conftest_const[(#{expr}) ? 1 : -1];
+SRC
+end
+
+def try_constant(const, headers = nil, opt = "", &b)
+  includes = cpp_include(headers)
+  if CROSS_COMPILING
+    if try_static_assert("#{const} > 0", headers, opt)
+      # positive constant
+    elsif try_static_assert("#{const} < 0", headers, opt)
+      neg = true
+      const = "-(#{const})"
+    elsif try_static_assert("#{const} == 0", headers, opt)
+      return 0
+    else
+      # not a constant
+      return nil
+    end
+    upper = 1
+    lower = 0
+    until try_static_assert("#{const} <= #{upper}", headers, opt)
+      lower = upper
+      upper <<= 1
+    end
+    return nil unless lower
+    while upper > lower + 1
+      mid = (upper + lower) / 2
+      if try_static_assert("#{const} > #{mid}", headers, opt)
+        lower = mid
+      else
+        upper = mid
+      end
+    end
+    upper = -upper if neg
+    return upper
+  else
+    src = %{#{COMMON_HEADERS}
+#{includes}
+#include <stdio.h>
+/*top*/
+int conftest_const = (int)(#{const});
+int main() {printf("%d\\n", conftest_const); return 0;}
+}
+    if try_link0(src, opt, &b)
+      xpopen("./conftest") do |f|
+        return Integer(f.gets)
+      end
+    end
+  end
+  nil
+end
+
+def try_func(func, libs, headers = nil, &b)
+  headers = cpp_include(headers)
+  try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
+#{COMMON_HEADERS}
+#{headers}
+/*top*/
+int main() { return 0; }
+int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
+SRC
+#{headers}
+/*top*/
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+end
+
+def try_var(var, headers = nil, &b)
+  headers = cpp_include(headers)
+  try_compile(<<"SRC", &b)
+#{COMMON_HEADERS}
+#{headers}
+/*top*/
+int main() { return 0; }
+int t() { const volatile void *volatile p; p = (void *)&#{var}; return 0; }
+SRC
+end
+
+def egrep_cpp(pat, src, opt = "", &b)
+  src = create_tmpsrc(src, &b)
+  xpopen(cpp_command('', opt)) do |f|
+    if Regexp === pat
+      puts("    ruby -ne 'print if #{pat.inspect}'")
+      f.grep(pat) {|l|
+	puts "#{f.lineno}: #{l}"
+	return true
+      }
+      false
+    else
+      puts("    egrep '#{pat}'")
+      begin
+	stdin = $stdin.dup
+	$stdin.reopen(f)
+	system("egrep", pat)
+      ensure
+	$stdin.reopen(stdin)
+      end
+    end
+  end
+ensure
+  rm_f "conftest*"
+  log_src(src)
+end
+
+def macro_defined?(macro, src, opt = "", &b)
+  src = src.sub(/[^\n]\z/, "\\&\n")
+  try_compile(src + <<"SRC", opt, &b)
+/*top*/
+#ifndef #{macro}
+# error
+>>>>>> #{macro} undefined <<<<<<
+#endif
+SRC
+end
+
+def try_run(src, opt = "", &b)
+  if try_link0(src, opt, &b)
+    xsystem("./conftest")
+  else
+    nil
+  end
+ensure
+  rm_f "conftest*"
+end
+
+def install_files(mfile, ifiles, map = nil, srcprefix = nil)
+  ifiles or return
+  srcprefix ||= '$(srcdir)'
+  Config::expand(srcdir = srcprefix.dup)
+  dirs = []
+  path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]}
+  ifiles.each do |files, dir, prefix|
+    dir = map_dir(dir, map)
+    prefix = %r|\A#{Regexp.quote(prefix)}/?| if prefix
+    if /\A\.\// =~ files
+      # install files which are in current working directory.
+      files = files[2..-1]
+      len = nil
+    else
+      # install files which are under the $(srcdir).
+      files = File.join(srcdir, files)
+      len = srcdir.size
+    end
+    f = nil
+    Dir.glob(files) do |f|
+      f[0..len] = "" if len
+      d = File.dirname(f)
+      d.sub!(prefix, "") if prefix
+      d = (d.empty? || d == ".") ? dir : File.join(dir, d)
+      f = File.join(srcprefix, f) if len
+      path[d] << f
+    end
+    unless len or f
+      d = File.dirname(files)
+      d.sub!(prefix, "") if prefix
+      d = (d.empty? || d == ".") ? dir : File.join(dir, d)
+      path[d] << files
+    end
+  end
+  dirs
+end
+
+def install_rb(mfile, dest, srcdir = nil)
+  install_files(mfile, [["lib/**/*.rb", dest, "lib"]], nil, srcdir)
+end
+
+def append_library(libs, lib)
+  format(LIBARG, lib) + " " + libs
+end
+
+def message(*s)
+  unless $extmk and not $VERBOSE
+    printf(*s)
+    $stdout.flush
+  end
+end
+
+def checking_for(m, fmt = nil)
+  f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim
+  m = "checking #{/\Acheck/ =~ f ? '' : 'for '}#{m}... "
+  message "%s", m
+  a = r = nil
+  Logging::postpone do
+    r = yield
+    a = (fmt ? fmt % r : r ? "yes" : "no") << "\n"
+    "#{f}#{m}-------------------- #{a}\n"
+  end
+  message(a)
+  Logging::message "--------------------\n\n"
+  r
+end
+
+def checking_message(target, place = nil, opt = nil)
+  [["in", place], ["with", opt]].inject("#{target}") do |msg, (pre, noun)|
+    if noun
+      [[:to_str], [:join, ","], [:to_s]].each do |meth, *args|
+        if noun.respond_to?(meth)
+          break noun = noun.send(meth, *args)
+        end
+      end
+      msg << " #{pre} #{noun}" unless noun.empty?
+    end
+    msg
+  end
+end
+
+# Returns whether or not +macro+ is defined either in the common header
+# files or within any +headers+ you provide.
+#
+# Any options you pass to +opt+ are passed along to the compiler.
+#
+def have_macro(macro, headers = nil, opt = "", &b)
+  checking_for checking_message(macro, headers, opt) do
+    macro_defined?(macro, cpp_include(headers), opt, &b)
+  end
+end
+
+# Returns whether or not the given entry point +func+ can be found within
+# +lib+.  If +func+ is nil, the 'main()' entry point is used by default.
+# If found, it adds the library to list of libraries to be used when linking
+# your extension.
+#
+# If +headers+ are provided, it will include those header files as the
+# header files it looks in when searching for +func+.
+#
+# Real name of the library to be linked can be altered by
+# '--with-FOOlib' configuration option.
+#
+def have_library(lib, func = nil, headers = nil, &b)
+  func = "main" if !func or func.empty?
+  lib = with_config(lib+'lib', lib)
+  checking_for checking_message("#{func}()", LIBARG%lib) do
+    if COMMON_LIBS.include?(lib)
+      true
+    else
+      libs = append_library($libs, lib)
+      if try_func(func, libs, headers, &b)
+        $libs = libs
+        true
+      else
+        false
+      end
+    end
+  end
+end
+
+# Returns whether or not the entry point +func+ can be found within the library
+# +lib+ in one of the +paths+ specified, where +paths+ is an array of strings.
+# If +func+ is nil , then the main() function is used as the entry point.
+#
+# If +lib+ is found, then the path it was found on is added to the list of
+# library paths searched and linked against.
+#
+def find_library(lib, func, *paths, &b)
+  func = "main" if !func or func.empty?
+  lib = with_config(lib+'lib', lib)
+  paths = paths.collect {|path| path.split(File::PATH_SEPARATOR)}.flatten
+  checking_for "#{func}() in #{LIBARG%lib}" do
+    libpath = $LIBPATH
+    libs = append_library($libs, lib)
+    begin
+      until r = try_func(func, libs, &b) or paths.empty?
+	$LIBPATH = libpath | [paths.shift]
+      end
+      if r
+	$libs = libs
+	libpath = nil
+      end
+    ensure
+      $LIBPATH = libpath if libpath
+    end
+    r
+  end
+end
+
+# Returns whether or not the function +func+ can be found in the common
+# header files, or within any +headers+ that you provide.  If found, a
+# macro is passed as a preprocessor constant to the compiler using the
+# function name, in uppercase, prepended with 'HAVE_'.
+#
+# For example, if have_func('foo') returned true, then the HAVE_FOO
+# preprocessor macro would be passed to the compiler.
+#
+def have_func(func, headers = nil, &b)
+  checking_for checking_message("#{func}()", headers) do
+    if try_func(func, $libs, headers, &b)
+      $defs.push(format("-DHAVE_%s", func.upcase))
+      true
+    else
+      false
+    end
+  end
+end
+
+# Returns whether or not the variable +var+ can be found in the common
+# header files, or within any +headers+ that you provide.  If found, a
+# macro is passed as a preprocessor constant to the compiler using the
+# variable name, in uppercase, prepended with 'HAVE_'.
+#
+# For example, if have_var('foo') returned true, then the HAVE_FOO
+# preprocessor macro would be passed to the compiler.
+#
+def have_var(var, headers = nil, &b)
+  checking_for checking_message(var, headers) do
+    if try_var(var, headers, &b)
+      $defs.push(format("-DHAVE_%s", var.upcase))
+      true
+    else
+      false
+    end
+  end
+end
+
+# Returns whether or not the given +header+ file can be found on your system.
+# If found, a macro is passed as a preprocessor constant to the compiler using
+# the header file name, in uppercase, prepended with 'HAVE_'.
+#
+# For example, if have_header('foo.h') returned true, then the HAVE_FOO_H
+# preprocessor macro would be passed to the compiler.
+#
+def have_header(header, &b)
+  checking_for header do
+    if try_cpp(cpp_include(header), &b)
+      $defs.push(format("-DHAVE_%s", header.tr("a-z./\055", "A-Z___")))
+      true
+    else
+      false
+    end
+  end
+end
+
+# Instructs mkmf to search for the given +header+ in any of the +paths+
+# provided, and returns whether or not it was found in those paths.
+#
+# If the header is found then the path it was found on is added to the list
+# of included directories that are sent to the compiler (via the -I switch).
+#
+def find_header(header, *paths)
+  header = cpp_include(header)
+  checking_for header do
+    if try_cpp(header)
+      true
+    else
+      found = false
+      paths.each do |dir|
+        opt = "-I#{dir}".quote
+        if try_cpp(header, opt)
+          $INCFLAGS << " " << opt
+          found = true
+          break
+        end
+      end
+      found
+    end
+  end
+end
+
+# Returns whether or not the struct of type +type+ contains +member+.  If
+# it does not, or the struct type can't be found, then false is returned.  You
+# may optionally specify additional +headers+ in which to look for the struct
+# (in addition to the common header files).
+#
+# If found, a macro is passed as a preprocessor constant to the compiler using
+# the member name, in uppercase, prepended with 'HAVE_ST_'.
+#
+# For example, if have_struct_member('foo', 'bar') returned true, then the
+# HAVE_ST_BAR preprocessor macro would be passed to the compiler.
+# 
+def have_struct_member(type, member, headers = nil, &b)
+  checking_for checking_message("#{type}.#{member}", headers) do
+    if try_compile(<<"SRC", &b)
+#{COMMON_HEADERS}
+#{cpp_include(headers)}
+/*top*/
+int main() { return 0; }
+int s = (char *)&((#{type}*)0)->#{member} - (char *)0;
+SRC
+      $defs.push(format("-DHAVE_ST_%s", member.upcase))
+      true
+    else
+      false
+    end
+  end
+end
+
+# Returns whether or not the static type +type+ is defined.  You may
+# optionally pass additional +headers+ to check against in addition to the
+# common header files.
+#
+# You may also pass additional flags to +opt+ which are then passed along to
+# the compiler.
+#
+# If found, a macro is passed as a preprocessor constant to the compiler using
+# the type name, in uppercase, prepended with 'HAVE_TYPE_'.
+#
+# For example, if have_type('foo') returned true, then the HAVE_TYPE_FOO
+# preprocessor macro would be passed to the compiler.
+#
+def have_type(type, headers = nil, opt = "", &b)
+  checking_for checking_message(type, headers, opt) do
+    headers = cpp_include(headers)
+    if try_compile(<<"SRC", opt, &b)
+#{COMMON_HEADERS}
+#{headers}
+/*top*/
+typedef #{type} conftest_type;
+static conftest_type conftestval[sizeof(conftest_type)?1:-1];
+SRC
+      $defs.push(format("-DHAVE_TYPE_%s", type.strip.upcase.tr_s("^A-Z0-9_", "_")))
+      true
+    else
+      false
+    end
+  end
+end
+
+# Returns the size of the given +type+.  You may optionally specify additional
+# +headers+ to search in for the +type+.
+#
+# If found, a macro is passed as a preprocessor constant to the compiler using
+# the type name, in uppercase, prepended with 'SIZEOF_', followed by the type
+# name, followed by '=X' where 'X' is the actual size.
+#
+# For example, if check_sizeof('mystruct') returned 12, then the
+# SIZEOF_MYSTRUCT=12 preprocessor macro would be passed to the compiler.
+#
+def check_sizeof(type, headers = nil, &b)
+  expr = "sizeof(#{type})"
+  fmt = "%d"
+  def fmt.%(x)
+    x ? super : "failed"
+  end
+  checking_for checking_message("size of #{type}", headers), fmt do
+    if size = try_constant(expr, headers, &b)
+      $defs.push(format("-DSIZEOF_%s=%d", type.upcase.tr_s("^A-Z0-9_", "_"), size))
+      size
+    end
+  end
+end
+
+def scalar_ptr_type?(type, member = nil, headers = nil, &b)
+  try_compile(<<"SRC", &b)   # pointer
+#{COMMON_HEADERS}
+#{cpp_include(headers)}
+/*top*/
+volatile #{type} conftestval;
+int main() { return 0; }
+int t() {return (int)(1-*(conftestval#{member ? ".#{member}" : ""}));}
+SRC
+end
+
+def scalar_type?(type, member = nil, headers = nil, &b)
+  try_compile(<<"SRC", &b)   # pointer
+#{COMMON_HEADERS}
+#{cpp_include(headers)}
+/*top*/
+volatile #{type} conftestval;
+int main() { return 0; }
+int t() {return (int)(1-(conftestval#{member ? ".#{member}" : ""}));}
+SRC
+end
+
+def what_type?(type, member = nil, headers = nil, &b)
+  m = "#{type}"
+  name = type
+  if member
+    m << "." << member
+    name = "(((#{type} *)0)->#{member})"
+  end
+  fmt = "seems %s"
+  def fmt.%(x)
+    x ? super : "unknown"
+  end
+  checking_for checking_message(m, headers), fmt do
+    if scalar_ptr_type?(type, member, headers, &b)
+      if try_static_assert("sizeof(*#{name}) == 1", headers)
+        "string"
+      end
+    elsif scalar_type?(type, member, headers, &b)
+      if try_static_assert("sizeof(#{name}) > sizeof(long)", headers)
+        "long long"
+      elsif try_static_assert("sizeof(#{name}) > sizeof(int)", headers)
+        "long"
+      elsif try_static_assert("sizeof(#{name}) > sizeof(short)", headers)
+        "int"
+      elsif try_static_assert("sizeof(#{name}) > 1", headers)
+        "short"
+      else
+        "char"
+      end
+    end
+  end
+end
+
+def find_executable0(bin, path = nil)
+  ext = config_string('EXEEXT')
+  if File.expand_path(bin) == bin
+    return bin if File.executable?(bin)
+    ext and File.executable?(file = bin + ext) and return file
+    return nil
+  end
+  if path ||= ENV['PATH']
+    path = path.split(File::PATH_SEPARATOR)
+  else
+    path = %w[/usr/local/bin /usr/ucb /usr/bin /bin]
+  end
+  file = nil
+  path.each do |dir|
+    return file if File.executable?(file = File.join(dir, bin))
+    return file if ext and File.executable?(file << ext)
+  end
+  nil
+end
+
+def find_executable(bin, path = nil)
+  checking_for checking_message(bin, path) do
+    find_executable0(bin, path)
+  end
+end
+
+def arg_config(config, *defaults, &block)
+  $arg_config << [config, *defaults]
+  defaults << nil if !block and defaults.empty?
+  $configure_args.fetch(config.tr('_', '-'), *defaults, &block)
+end
+
+def with_config(config, *defaults)
+  config = config.sub(/^--with[-_]/, '')
+  val = arg_config("--with-"+config) do
+    if arg_config("--without-"+config)
+      false
+    elsif block_given?
+      yield(config, *defaults)
+    else
+      break *defaults
+    end
+  end
+  case val
+  when "yes"
+    true
+  when "no"
+    false
+  else
+    val
+  end
+end
+
+def enable_config(config, *defaults)
+  if arg_config("--enable-"+config)
+    true
+  elsif arg_config("--disable-"+config)
+    false
+  elsif block_given?
+    yield(config, *defaults)
+  else
+    return *defaults
+  end
+end
+
+def create_header(header = "extconf.h")
+  message "creating %s\n", header
+  sym = header.tr("a-z./\055", "A-Z___")
+  hdr = ["#ifndef #{sym}\n#define #{sym}\n"]
+  for line in $defs
+    case line
+    when /^-D([^=]+)(?:=(.*))?/
+      hdr << "#define #$1 #{$2 ? Shellwords.shellwords($2)[0] : 1}\n"
+    when /^-U(.*)/
+      hdr << "#undef #$1\n"
+    end
+  end
+  hdr << "#endif\n"
+  hdr = hdr.join
+  unless (IO.read(header) == hdr rescue false)
+    open(header, "w") do |hfile|
+      hfile.write(hdr)
+    end
+  end
+  $extconf_h = header
+end
+
+# Sets a +target+ name that the user can then use to configure various 'with'
+# options with on the command line by using that name.  For example, if the
+# target is set to "foo", then the user could use the --with-foo-dir command
+# line option.
+#
+# You may pass along additional 'include' or 'lib' defaults via the +idefault+
+# and +ldefault+ parameters, respectively.
+#
+# Note that dir_config only adds to the list of places to search for libraries
+# and include files.  It does not link the libraries into your application.
+#
+def dir_config(target, idefault=nil, ldefault=nil)
+  if dir = with_config(target + "-dir", (idefault unless ldefault))
+    defaults = Array === dir ? dir : dir.split(File::PATH_SEPARATOR)
+    idefault = ldefault = nil
+  end
+
+  idir = with_config(target + "-include", idefault)
+  $arg_config.last[1] ||= "${#{target}-dir}/include"
+  ldir = with_config(target + "-lib", ldefault)
+  $arg_config.last[1] ||= "${#{target}-dir}/lib"
+
+  idirs = idir ? Array === idir ? idir : idir.split(File::PATH_SEPARATOR) : []
+  if defaults
+    idirs.concat(defaults.collect {|dir| dir + "/include"})
+    idir = ([idir] + idirs).compact.join(File::PATH_SEPARATOR)
+  end
+  unless idirs.empty?
+    idirs.collect! {|dir| "-I" + dir}
+    idirs -= Shellwords.shellwords($CPPFLAGS)
+    unless idirs.empty?
+      $CPPFLAGS = (idirs.quote << $CPPFLAGS).join(" ")
+    end
+  end
+
+  ldirs = ldir ? Array === ldir ? ldir : ldir.split(File::PATH_SEPARATOR) : []
+  if defaults
+    ldirs.concat(defaults.collect {|dir| dir + "/lib"})
+    ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
+  end
+  $LIBPATH = ldirs | $LIBPATH
+
+  [idir, ldir]
+end
+
+def pkg_config(pkg)
+  if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig)
+    # iff package specific config command is given
+    get = proc {|opt| `#{pkgconfig} --#{opt}`.chomp}
+  elsif ($PKGCONFIG ||= 
+         (pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) &&
+         find_executable0(pkgconfig) && pkgconfig) and
+      system("#{$PKGCONFIG} --exists #{pkg}")
+    # default to pkg-config command
+    get = proc {|opt| `#{$PKGCONFIG} --#{opt} #{pkg}`.chomp}
+  elsif find_executable0(pkgconfig = "#{pkg}-config")
+    # default to package specific config command, as a last resort.
+    get = proc {|opt| `#{pkgconfig} --#{opt}`.chomp}
+  end
+  if get
+    cflags = get['cflags']
+    ldflags = get['libs']
+    libs = get['libs-only-l']
+    ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ")
+    $CFLAGS += " " << cflags
+    $LDFLAGS += " " << ldflags
+    $libs += " " << libs
+    Logging::message "package configuration for %s\n", pkg
+    Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n",
+                     cflags, ldflags, libs
+    [cflags, ldflags, libs]
+  else
+    Logging::message "package configuration for %s is not found\n", pkg
+    nil
+  end
+end
+
+def with_destdir(dir)
+  dir = dir.sub($dest_prefix_pattern, '')
+  /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
+end
+
+def winsep(s)
+  s.tr('/', '\\')
+end
+
+def configuration(srcdir)
+  mk = []
+  vpath = %w[$(srcdir) $(topdir) $(hdrdir)]
+  if !CROSS_COMPILING
+    case CONFIG['build_os']
+    when 'cygwin'
+      if CONFIG['target_os'] != 'cygwin'
+        vpath.each {|p| p.sub!(/.*/, '$(shell cygpath -u \&)')}
+      end
+    when 'msdosdjgpp', 'mingw32'
+      CONFIG['PATH_SEPARATOR'] = ';'
+    end
+  end
+  mk << %{
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}.quote}
+topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote}
+hdrdir = #{$extmk ? CONFIG["hdrdir"].quote : '$(topdir)'}
+VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
+}
+  if $extmk
+    mk << "RUBYLIB = -\nRUBYOPT = -rpurelib.rb\n"
+  end
+  if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1]
+    mk << "\nDESTDIR = #{destdir}\n"
+  end
+  CONFIG.each do |key, var|
+    next unless /prefix$/ =~ key
+    mk << "#{key} = #{with_destdir(var)}\n"
+  end
+  CONFIG.each do |key, var|
+    next if /^abs_/ =~ key
+    next unless /^(?:src|top|hdr|(.*))dir$/ =~ key and $1
+    mk << "#{key} = #{with_destdir(var)}\n"
+  end
+  if !$extmk and !$configure_args.has_key?('--ruby') and
+      sep = config_string('BUILD_FILE_SEPARATOR')
+    sep = ":/=#{sep}"
+  else
+    sep = ""
+  end
+  extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ")<<" "
+  mk << %{
+CC = #{CONFIG['CC']}
+LIBRUBY = #{CONFIG['LIBRUBY']}
+LIBRUBY_A = #{CONFIG['LIBRUBY_A']}
+LIBRUBYARG_SHARED = #$LIBRUBYARG_SHARED
+LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
+
+RUBY_EXTCONF_H = #{$extconf_h}
+CFLAGS   = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG
+INCFLAGS = -I. #$INCFLAGS
+CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
+CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
+DLDFLAGS = #$LDFLAGS #$DLDFLAGS #$ARCH_FLAG
+LDSHARED = #{CONFIG['LDSHARED']}
+AR = #{CONFIG['AR']}
+EXEEXT = #{CONFIG['EXEEXT']}
+
+RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTALL_NAME']}
+RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
+arch = #{CONFIG['arch']}
+sitearch = #{CONFIG['sitearch']}
+ruby_version = #{Config::CONFIG['ruby_version']}
+ruby = #{$ruby}
+RUBY = $(ruby#{sep})
+RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'}
+MAKEDIRS = #{config_string('MAKEDIRS') || '@$(RUBY) -run -e mkdir -- -p'}
+INSTALL = #{config_string('INSTALL') || '@$(RUBY) -run -e install -- -vp'}
+INSTALL_PROG = #{config_string('INSTALL_PROG') || '$(INSTALL) -m 0755'}
+INSTALL_DATA = #{config_string('INSTALL_DATA') || '$(INSTALL) -m 0644'}
+COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'}
+
+#### End of system configuration section. ####
+
+preload = #{$preload ? $preload.join(' ') : ''}
+}
+  if $nmake == ?b
+    mk.each do |x|
+      x.gsub!(/^(MAKEDIRS|INSTALL_(?:PROG|DATA))+\s*=.*\n/) do
+        "!ifndef " + $1 + "\n" +
+        $& +
+	"!endif\n"
+      end
+    end
+  end
+  mk
+end
+
+def dummy_makefile(srcdir)
+  configuration(srcdir) << <<RULES << CLEANINGS
+CLEANFILES = #{$cleanfiles.join(' ')}
+DISTCLEANFILES = #{$distcleanfiles.join(' ')}
+
+all install static install-so install-rb: Makefile
+
+RULES
+end
+
+# Generates the Makefile for your extension, passing along any options and
+# preprocessor constants that you may have generated through other methods.
+#
+# The +target+ name should correspond the name of the global function name
+# defined within your C extension, minus the 'Init_'.  For example, if your
+# C extension is defined as 'Init_foo', then your target would simply be 'foo'.
+#
+# If any '/' characters are present in the target name, only the last name
+# is interpreted as the target name, and the rest are considered toplevel
+# directory names, and the generated Makefile will be altered accordingly to
+# follow that directory structure.
+#
+# For example, if you pass 'test/foo' as a target name, your extension will
+# be installed under the 'test' directory.  This means that in order to
+# load the file within a Ruby program later, that directory structure will
+# have to be followed, e.g. "require 'test/foo'".
+#
+def create_makefile(target, srcprefix = nil)
+  $target = target
+  libpath = $DEFLIBPATH|$LIBPATH
+  message "creating Makefile\n"
+  rm_f "conftest*"
+  if CONFIG["DLEXT"] == $OBJEXT
+    for lib in libs = $libs.split
+      lib.sub!(/-l(.*)/, %%"lib\\1.#{$LIBEXT}"%)
+    end
+    $defs.push(format("-DEXTLIB='%s'", libs.join(",")))
+  end
+
+  if target.include?('/')
+    target_prefix, target = File.split(target)
+    target_prefix[0,0] = '/'
+  else
+    target_prefix = ""
+  end
+
+  srcprefix ||= '$(srcdir)'
+  Config::expand(srcdir = srcprefix.dup)
+
+  if not $objs
+    $objs = []
+    srcs = Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
+    for f in srcs
+      obj = File.basename(f, ".*") << ".o"
+      $objs.push(obj) unless $objs.index(obj)
+    end
+  elsif !(srcs = $srcs)
+    srcs = $objs.collect {|obj| obj.sub(/\.o\z/, '.c')}
+  end
+  $srcs = srcs
+  for i in $objs
+    i.sub!(/\.o\z/, ".#{$OBJEXT}")
+  end
+  $objs = $objs.join(" ")
+
+  target = nil if $objs == ""
+
+  if target and EXPORT_PREFIX
+    if File.exist?(File.join(srcdir, target + '.def'))
+      deffile = "$(srcdir)/$(TARGET).def"
+      unless EXPORT_PREFIX.empty?
+        makedef = %{-pe "sub!(/^(?=\\w)/,'#{EXPORT_PREFIX}') unless 1../^EXPORTS$/i"}
+      end
+    else
+      makedef = %{-e "puts 'EXPORTS', '#{EXPORT_PREFIX}Init_$(TARGET)'"}
+    end
+    if makedef
+      $distcleanfiles << '$(DEFFILE)'
+      origdef = deffile
+      deffile = "$(TARGET)-$(arch).def"
+    end
+  end
+  origdef ||= ''
+
+  libpath = libpathflag(libpath)
+
+  dllib = target ? "$(TARGET).#{CONFIG['DLEXT']}" : ""
+  staticlib = target ? "$(TARGET).#$LIBEXT" : ""
+  mfile = open("Makefile", "wb")
+  mfile.print configuration(srcprefix)
+  mfile.print "
+libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
+LIBPATH = #{libpath}
+DEFFILE = #{deffile}
+
+CLEANFILES = #{$cleanfiles.join(' ')}
+DISTCLEANFILES = #{$distcleanfiles.join(' ')}
+
+extout = #{$extout}
+extout_prefix = #{$extout_prefix}
+target_prefix = #{target_prefix}
+LOCAL_LIBS = #{$LOCAL_LIBS}
+LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
+SRCS = #{srcs.collect(&File.method(:basename)).join(' ')}
+OBJS = #{$objs}
+TARGET = #{target}
+DLLIB = #{dllib}
+EXTSTATIC = #{$static || ""}
+STATIC_LIB = #{staticlib unless $static.nil?}
+#{!$extout && defined?($installed_list) ? "INSTALLED_LIST = #{$installed_list}\n" : ""}
+"
+  install_dirs.each {|d| mfile.print("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]}
+  n = ($extout ? '$(RUBYARCHDIR)/' : '') + '$(TARGET).'
+  mfile.print "
+TARGET_SO     = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB)
+CLEANLIBS     = #{n}#{CONFIG['DLEXT']} #{n}il? #{n}tds #{n}map
+CLEANOBJS     = *.#{$OBJEXT} *.#{$LIBEXT} *.s[ol] *.pdb *.exp *.bak
+
+all:		#{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
+static:		$(STATIC_LIB)#{$extout ? " install-rb" : ""}
+"
+  mfile.print CLEANINGS
+  dirs = []
+  mfile.print "install: install-so install-rb\n\n"
+  sodir = (dir = "$(RUBYARCHDIR)").dup
+  mfile.print("install-so: #{dir}\n")
+  if target
+    f = "$(DLLIB)"
+    dest = "#{dir}/#{f}"
+    mfile.print "install-so: #{dest}\n"
+    unless $extout
+      mfile.print "#{dest}: #{f}\n"
+      if (sep = config_string('BUILD_FILE_SEPARATOR'))
+        f.gsub!("/", sep)
+        dir.gsub!("/", sep)
+        sep = ":/="+sep
+        f.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
+        f.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
+        dir.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
+        dir.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
+      end
+      mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n"
+      if defined?($installed_list)
+	mfile.print "\t@echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n"
+      end
+    end
+  end
+  mfile.print("install-rb: pre-install-rb install-rb-default\n")
+  mfile.print("install-rb-default: pre-install-rb-default\n")
+  mfile.print("pre-install-rb: Makefile\n")
+  mfile.print("pre-install-rb-default: Makefile\n")
+  for sfx, i in [["-default", [["lib/**/*.rb", "$(RUBYLIBDIR)", "lib"]]], ["", $INSTALLFILES]]
+    files = install_files(mfile, i, nil, srcprefix) or next
+    for dir, *files in files
+      unless dirs.include?(dir)
+	dirs << dir
+	mfile.print "pre-install-rb#{sfx}: #{dir}\n"
+      end
+      files.each do |f|
+	dest = "#{dir}/#{File.basename(f)}"
+	mfile.print("install-rb#{sfx}: #{dest}\n")
+	mfile.print("#{dest}: #{f}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ")
+	sep = config_string('BUILD_FILE_SEPARATOR')
+	if sep
+	  f = f.gsub("/", sep)
+	  sep = ":/="+sep
+	  f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2}
+	  f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2}
+	else
+	  sep = ""
+	end
+	mfile.print("#{f} $(@D#{sep})\n")
+	if defined?($installed_list) and !$extout
+	  mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")
+	end
+      end
+    end
+  end
+  dirs.unshift(sodir) if target and !dirs.include?(sodir)
+  dirs.each {|dir| mfile.print "#{dir}:\n\t$(MAKEDIRS) $@\n"}
+
+  mfile.print <<-SITEINSTALL
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+  SITEINSTALL
+
+  return unless target
+
+  mfile.puts SRC_EXT.collect {|ext| ".path.#{ext} = $(VPATH)"} if $nmake == ?b
+  mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n"
+  mfile.print "\n"
+
+  CXX_EXT.each do |ext|
+    COMPILE_RULES.each do |rule|
+      mfile.printf(rule, ext, $OBJEXT)
+      mfile.printf("\n\t%s\n\n", COMPILE_CXX)
+    end
+  end
+  %w[c].each do |ext|
+    COMPILE_RULES.each do |rule|
+      mfile.printf(rule, ext, $OBJEXT)
+      mfile.printf("\n\t%s\n\n", COMPILE_C)
+    end
+  end
+
+  mfile.print "$(RUBYARCHDIR)/" if $extout
+  mfile.print "$(DLLIB): ", (makedef ? "$(DEFFILE) " : ""), "$(OBJS)\n"
+  mfile.print "\t@-$(RM) $@\n"
+  mfile.print "\t@-$(MAKEDIRS) $(@D)\n" if $extout
+  link_so = LINK_SO.gsub(/^/, "\t")
+  mfile.print link_so, "\n\n"
+  unless $static.nil?
+    mfile.print "$(STATIC_LIB): $(OBJS)\n\t"
+    mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)"
+    config_string('RANLIB') do |ranlib|
+      mfile.print "\n\t@-#{ranlib} $(DLLIB) 2> /dev/null || true"
+    end
+  end
+  mfile.print "\n\n"
+  if makedef
+    mfile.print "$(DEFFILE): #{origdef}\n"
+    mfile.print "\t$(RUBY) #{makedef} #{origdef} > $@\n\n"
+  end
+
+  depend = File.join(srcdir, "depend")
+  if File.exist?(depend)
+    suffixes = []
+    depout = []
+    open(depend, "r") do |dfile|
+      mfile.printf "###\n"
+      cont = implicit = nil
+      impconv = proc do
+	COMPILE_RULES.each {|rule| depout << (rule % implicit[0]) << implicit[1]}
+	implicit = nil
+      end
+      ruleconv = proc do |line|
+	if implicit
+	  if /\A\t/ =~ line
+	    implicit[1] << line
+	    next
+	  else
+	    impconv[]
+	  end
+	end
+	if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line)
+	  suffixes << m[1] << m[2]
+	  implicit = [[m[1], m[2]], [m.post_match]]
+	  next
+	elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line
+	  line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2}
+	end
+	depout << line
+      end
+      while line = dfile.gets()
+	line.gsub!(/\.o\b/, ".#{$OBJEXT}")
+	line.gsub!(/\$\(hdrdir\)\/config.h/, $config_h) if $config_h
+	if /(?:^|[^\\])(?:\\\\)*\\$/ =~ line
+	  (cont ||= []) << line
+	  next
+	elsif cont
+	  line = (cont << line).join
+	  cont = nil
+	end
+	ruleconv.call(line)
+      end
+      if cont
+	ruleconv.call(cont.join)
+      elsif implicit
+	impconv.call
+      end
+    end
+    unless suffixes.empty?
+      mfile.print ".SUFFIXES: .", suffixes.uniq.join(" ."), "\n\n"
+    end
+    mfile.print "$(OBJS): $(RUBY_EXTCONF_H)\n\n" if $extconf_h
+    mfile.print depout
+  else
+    headers = %w[ruby.h defines.h]
+    if RULE_SUBST
+      headers.each {|h| h.sub!(/.*/) {|*m| RULE_SUBST % m}}
+    end
+    headers << $config_h if $config_h
+    headers << "$(RUBY_EXTCONF_H)" if $extconf_h
+    mfile.print "$(OBJS): ", headers.join(' '), "\n"
+  end
+
+  $makefile_created = true
+ensure
+  mfile.close if mfile
+end
+
+def init_mkmf(config = CONFIG)
+  $makefile_created = false
+  $arg_config = []
+  $enable_shared = config['ENABLE_SHARED'] == 'yes'
+  $defs = []
+  $extconf_h = nil
+  $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup
+  $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup
+  $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup
+  $LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).dup
+  $INCFLAGS = "-I$(topdir) -I$(hdrdir) -I$(srcdir)"
+  $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
+  $LIBEXT = config['LIBEXT'].dup
+  $OBJEXT = config["OBJEXT"].dup
+  $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}"
+  $LIBRUBYARG = ""
+  $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
+  $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
+  $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
+  $DEFLIBPATH.unshift(".")
+  $LIBPATH = []
+  $INSTALLFILES = nil
+
+  $objs = nil
+  $srcs = nil
+  $libs = ""
+  if $enable_shared or Config.expand(config["LIBRUBY"].dup) != Config.expand(config["LIBRUBY_A"].dup)
+    $LIBRUBYARG = config['LIBRUBYARG']
+  end
+
+  $LOCAL_LIBS = ""
+
+  $cleanfiles = config_string('CLEANFILES') {|s| Shellwords.shellwords(s)} || []
+  $cleanfiles << "mkmf.log"
+  $distcleanfiles = config_string('DISTCLEANFILES') {|s| Shellwords.shellwords(s)} || []
+
+  $extout ||= nil
+  $extout_prefix ||= nil
+
+  $arg_config.clear
+  dir_config("opt")
+end
+
+FailedMessage = <<MESSAGE
+Could not create Makefile due to some reason, probably lack of
+necessary libraries and/or headers.  Check the mkmf.log file for more
+details.  You may need configuration options.
+
+Provided configuration options:
+MESSAGE
+
+def mkmf_failed(path)
+  unless $makefile_created or File.exist?("Makefile")
+    opts = $arg_config.collect {|t, n| "\t#{t}#{n ? "=#{n}" : ""}\n"}
+    abort "*** #{path} failed ***\n" + FailedMessage + opts.join
+  end
+end
+
+init_mkmf
+
+$make = with_config("make-prog", ENV["MAKE"] || "make")
+make, = Shellwords.shellwords($make)
+$nmake = nil
+case
+when $mswin
+  $nmake = ?m if /nmake/i =~ make
+when $bccwin
+  $nmake = ?b if /Borland/i =~ `#{make} -h`
+end
+
+Config::CONFIG["srcdir"] = CONFIG["srcdir"] =
+  $srcdir = arg_config("--srcdir", File.dirname($0))
+$configure_args["--topsrcdir"] ||= $srcdir
+if $curdir = arg_config("--curdir")
+  Config.expand(curdir = $curdir.dup)
+else
+  curdir = $curdir = "."
+end
+unless File.expand_path(Config::CONFIG["topdir"]) == File.expand_path(curdir)
+  CONFIG["topdir"] = $curdir
+  Config::CONFIG["topdir"] = curdir
+end
+$configure_args["--topdir"] ||= $curdir
+$ruby = arg_config("--ruby", File.join(Config::CONFIG["bindir"], CONFIG["ruby_install_name"]))
+
+split = Shellwords.method(:shellwords).to_proc
+
+EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip}
+
+hdr = []
+config_string('COMMON_MACROS') do |s|
+  Shellwords.shellwords(s).each do |w|
+    hdr << "#define " + w.split(/=/, 2).join(" ")
+  end
+end
+config_string('COMMON_HEADERS') do |s|
+  Shellwords.shellwords(s).each {|s| hdr << "#include <#{s}>"}
+end
+COMMON_HEADERS = hdr.join("\n")
+COMMON_LIBS = config_string('COMMON_LIBS', &split) || []
+
+COMPILE_RULES = config_string('COMPILE_RULES', &split) || %w[.%s.%s:]
+RULE_SUBST = config_string('RULE_SUBST')
+COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<'
+COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<'
+TRY_LINK = config_string('TRY_LINK') ||
+  "$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \
+  "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
+LINK_SO = config_string('LINK_SO') ||
+  if CONFIG["DLEXT"] == $OBJEXT
+    "ld $(DLDFLAGS) -r -o $@ $(OBJS)\n"
+  else
+    "$(LDSHARED) #{OUTFLAG}$@ $(OBJS) " \
+    "$(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)"
+  end
+LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"'
+RPATHFLAG = config_string('RPATHFLAG') || ''
+LIBARG = config_string('LIBARG') || '-l%s'
+
+sep = config_string('BUILD_FILE_SEPARATOR') {|sep| ":/=#{sep}" if sep != "/"} || ""
+CLEANINGS = "
+clean:
+		@-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep})
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
+
+realclean:	distclean
+"
+
+if not $extmk and /\A(extconf|makefile).rb\z/ =~ File.basename($0)
+  END {mkmf_failed($0)}
+end
diff --git a/ruby_1_8_6/lib/monitor.rb b/ruby_1_8_6/lib/monitor.rb
new file mode 100644
index 0000000000..4c146c8086
--- /dev/null
+++ b/ruby_1_8_6/lib/monitor.rb
@@ -0,0 +1,352 @@
+=begin
+
+= monitor.rb
+
+Copyright (C) 2001  Shugo Maeda <shugo@ruby-lang.org>
+
+This library is distributed under the terms of the Ruby license.
+You can freely distribute/modify this library.
+
+== example
+
+This is a simple example.
+
+  require 'monitor.rb'
+  
+  buf = []
+  buf.extend(MonitorMixin)
+  empty_cond = buf.new_cond
+  
+  # consumer
+  Thread.start do
+    loop do
+      buf.synchronize do
+        empty_cond.wait_while { buf.empty? }
+        print buf.shift
+      end
+    end
+  end
+  
+  # producer
+  while line = ARGF.gets
+    buf.synchronize do
+      buf.push(line)
+      empty_cond.signal
+    end
+  end
+
+The consumer thread waits for the producer thread to push a line
+to buf while buf.empty?, and the producer thread (main thread)
+reads a line from ARGF and push it to buf, then call
+empty_cond.signal.
+
+=end
+  
+
+#
+# Adds monitor functionality to an arbitrary object by mixing the module with
+# +include+.  For example:
+#
+#    require 'monitor.rb'
+#    
+#    buf = []
+#    buf.extend(MonitorMixin)
+#    empty_cond = buf.new_cond
+#    
+#    # consumer
+#    Thread.start do
+#      loop do
+#        buf.synchronize do
+#          empty_cond.wait_while { buf.empty? }
+#          print buf.shift
+#        end
+#      end
+#    end
+#    
+#    # producer
+#    while line = ARGF.gets
+#      buf.synchronize do
+#        buf.push(line)
+#        empty_cond.signal
+#      end
+#    end
+# 
+# The consumer thread waits for the producer thread to push a line
+# to buf while buf.empty?, and the producer thread (main thread)
+# reads a line from ARGF and push it to buf, then call
+# empty_cond.signal.
+#
+module MonitorMixin
+  #
+  # FIXME: This isn't documented in Nutshell.
+  #
+  # Since MonitorMixin.new_cond returns a ConditionVariable, and the example
+  # above calls while_wait and signal, this class should be documented.
+  #
+  class ConditionVariable
+    class Timeout < Exception; end
+    
+    # Create a new timer with the argument timeout, and add the
+    # current thread to the list of waiters.  Then the thread is
+    # stopped.  It will be resumed when a corresponding #signal 
+    # occurs.
+    def wait(timeout = nil)
+      @monitor.instance_eval {mon_check_owner()}
+      timer = create_timer(timeout)
+      
+      Thread.critical = true
+      count = @monitor.instance_eval {mon_exit_for_cond()}
+      @waiters.push(Thread.current)
+
+      begin
+	Thread.stop
+        return true
+      rescue Timeout
+        return false
+      ensure
+	Thread.critical = true
+	begin
+	  if timer && timer.alive?
+	    Thread.kill(timer)
+	  end
+	  if @waiters.include?(Thread.current)  # interrupted?
+	    @waiters.delete(Thread.current)
+	  end
+	  @monitor.instance_eval {mon_enter_for_cond(count)}
+	ensure
+	  Thread.critical = false
+	end
+      end
+    end
+    
+
+    # call #wait while the supplied block returns +true+.
+    def wait_while
+      while yield
+	wait
+      end
+    end
+    
+    # call #wait until the supplied block returns +true+.
+    def wait_until
+      until yield
+	wait
+      end
+    end
+    
+    # Wake up and run the next waiter
+    def signal
+      @monitor.instance_eval {mon_check_owner()}
+      Thread.critical = true
+      t = @waiters.shift
+      t.wakeup if t
+      Thread.critical = false
+      Thread.pass
+    end
+    
+    # Wake up all the waiters.
+    def broadcast
+      @monitor.instance_eval {mon_check_owner()}
+      Thread.critical = true
+      for t in @waiters
+	t.wakeup
+      end
+      @waiters.clear
+      Thread.critical = false
+      Thread.pass
+    end
+    
+    def count_waiters
+      return @waiters.length
+    end
+    
+    private
+
+    def initialize(monitor)
+      @monitor = monitor
+      @waiters = []
+    end
+
+    def create_timer(timeout)
+      if timeout
+	waiter = Thread.current
+	return Thread.start {
+	  Thread.pass
+	  sleep(timeout)
+	  Thread.critical = true
+	  waiter.raise(Timeout.new)
+	}
+      else
+        return nil
+      end
+    end
+  end
+  
+  def self.extend_object(obj)
+    super(obj)
+    obj.instance_eval {mon_initialize()}
+  end
+  
+  #
+  # Attempts to enter exclusive section.  Returns +false+ if lock fails.
+  #
+  def mon_try_enter
+    result = false
+    Thread.critical = true
+    if @mon_owner.nil?
+      @mon_owner = Thread.current
+    end
+    if @mon_owner == Thread.current
+      @mon_count += 1
+      result = true
+    end
+    Thread.critical = false
+    return result
+  end
+  # For backward compatibility
+  alias try_mon_enter mon_try_enter
+
+  #
+  # Enters exclusive section.
+  #
+  def mon_enter
+    Thread.critical = true
+    mon_acquire(@mon_entering_queue)
+    @mon_count += 1
+  ensure
+    Thread.critical = false
+  end
+  
+  #
+  # Leaves exclusive section.
+  #
+  def mon_exit
+    mon_check_owner
+    Thread.critical = true
+    @mon_count -= 1
+    if @mon_count == 0
+      mon_release
+    end
+    Thread.critical = false
+    Thread.pass
+  end
+
+  #
+  # Enters exclusive section and executes the block.  Leaves the exclusive
+  # section automatically when the block exits.  See example under
+  # +MonitorMixin+.
+  #
+  def mon_synchronize
+    mon_enter
+    begin
+      yield
+    ensure
+      mon_exit
+    end
+  end
+  alias synchronize mon_synchronize
+  
+  #
+  # FIXME: This isn't documented in Nutshell.
+  # 
+  # Create a new condition variable for this monitor.
+  # This facilitates control of the monitor with #signal and #wait.
+  #
+  def new_cond
+    return ConditionVariable.new(self)
+  end
+
+  private
+
+  def initialize(*args)
+    super
+    mon_initialize
+  end
+
+  # called by initialize method to set defaults for instance variables.
+  def mon_initialize
+    @mon_owner = nil
+    @mon_count = 0
+    @mon_entering_queue = []
+    @mon_waiting_queue = []
+  end
+
+  # Throw a ThreadError exception if the current thread
+  # does't own the monitor
+  def mon_check_owner
+    if @mon_owner != Thread.current
+      raise ThreadError, "current thread not owner"
+    end
+  end
+
+  def mon_acquire(queue)
+    while @mon_owner && @mon_owner != Thread.current
+      queue.push(Thread.current)
+      Thread.stop
+      Thread.critical = true
+    end
+    @mon_owner = Thread.current
+  end
+
+  def mon_release
+    @mon_owner = nil
+    t = @mon_waiting_queue.shift
+    t = @mon_entering_queue.shift unless t
+    t.wakeup if t
+  end
+
+  def mon_enter_for_cond(count)
+    mon_acquire(@mon_waiting_queue)
+    @mon_count = count
+  end
+
+  def mon_exit_for_cond
+    count = @mon_count
+    @mon_count = 0
+    return count
+  ensure
+    mon_release
+  end
+end
+
+# Monitors provide means of mutual exclusion for Thread programming.
+# A critical region is created by means of the synchronize method,
+# which takes a block.
+# The condition variables (created with #new_cond) may be used 
+# to control the execution of a monitor with #signal and #wait.
+#
+# the Monitor class wraps MonitorMixin, and provides aliases
+#  alias try_enter try_mon_enter
+#  alias enter mon_enter
+#  alias exit mon_exit
+# to access its methods more concisely.
+class Monitor
+  include MonitorMixin
+  alias try_enter try_mon_enter
+  alias enter mon_enter
+  alias exit mon_exit
+end
+
+
+# Documentation comments:
+#  - All documentation comes from Nutshell.
+#  - MonitorMixin.new_cond appears in the example, but is not documented in
+#    Nutshell.
+#  - All the internals (internal modules Accessible and Initializable, class
+#    ConditionVariable) appear in RDoc.  It might be good to hide them, by
+#    making them private, or marking them :nodoc:, etc.
+#  - The entire example from the RD section at the top is replicated in the RDoc
+#    comment for MonitorMixin.  Does the RD section need to remain?
+#  - RDoc doesn't recognise aliases, so we have mon_synchronize documented, but
+#    not synchronize.
+#  - mon_owner is in Nutshell, but appears as an accessor in a separate module
+#    here, so is hard/impossible to RDoc.  Some other useful accessors
+#    (mon_count and some queue stuff) are also in this module, and don't appear
+#    directly in the RDoc output.
+#  - in short, it may be worth changing the code layout in this file to make the
+#    documentation easier
+
+# Local variables:
+# mode: Ruby
+# tab-width: 8
+# End:
diff --git a/ruby_1_8_6/lib/mutex_m.rb b/ruby_1_8_6/lib/mutex_m.rb
new file mode 100644
index 0000000000..8e0d42bc8d
--- /dev/null
+++ b/ruby_1_8_6/lib/mutex_m.rb
@@ -0,0 +1,122 @@
+#--
+#   mutex_m.rb - 
+#   	$Release Version: 3.0$
+#   	$Revision: 1.7 $
+#   	$Date: 1998/02/27 04:28:57 $
+#       Original from mutex.rb
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
+#       modified by matz
+#       patched by akira yamada
+#++
+#
+# == Usage
+#
+# Extend an object and use it like a Mutex object:
+#
+#   require "mutex_m.rb"
+#   obj = Object.new
+#   obj.extend Mutex_m
+#   # ...
+#
+# Or, include Mutex_m in a class to have its instances behave like a Mutex
+# object:
+#
+#   class Foo
+#     include Mutex_m
+#     # ...
+#   end
+#   
+#   obj = Foo.new
+
+module Mutex_m
+  def Mutex_m.define_aliases(cl)
+    cl.module_eval %q{
+      alias locked? mu_locked?
+      alias lock mu_lock
+      alias unlock mu_unlock
+      alias try_lock mu_try_lock
+      alias synchronize mu_synchronize
+    }
+  end  
+
+  def Mutex_m.append_features(cl)
+    super
+    define_aliases(cl) unless cl.instance_of?(Module)
+  end
+  
+  def Mutex_m.extend_object(obj)
+    super
+    obj.mu_extended
+  end
+
+  def mu_extended
+    unless (defined? locked? and
+	    defined? lock and
+	    defined? unlock and
+	    defined? try_lock and
+	    defined? synchronize)
+      Mutex_m.define_aliases(class<<self;self;end)
+    end
+    mu_initialize
+  end
+  
+  # locking 
+  def mu_synchronize
+    begin
+      mu_lock
+      yield
+    ensure
+      mu_unlock
+    end
+  end
+  
+  def mu_locked?
+    @mu_locked
+  end
+  
+  def mu_try_lock
+    result = false
+    Thread.critical = true
+    unless @mu_locked
+      @mu_locked = true
+      result = true
+    end
+    Thread.critical = false
+    result
+  end
+  
+  def mu_lock
+    while (Thread.critical = true; @mu_locked)
+      @mu_waiting.push Thread.current
+      Thread.stop
+    end
+    @mu_locked = true
+    Thread.critical = false
+    self
+  end
+  
+  def mu_unlock
+    return unless @mu_locked
+    Thread.critical = true
+    wait = @mu_waiting
+    @mu_waiting = []
+    @mu_locked = false
+    Thread.critical = false
+    for w in wait
+      w.run
+    end
+    self
+  end
+  
+  private
+  
+  def mu_initialize
+    @mu_waiting = []
+    @mu_locked = false;
+  end
+
+  def initialize(*args)
+    mu_initialize
+    super
+  end
+end
diff --git a/ruby_1_8_6/lib/net/ftp.rb b/ruby_1_8_6/lib/net/ftp.rb
new file mode 100644
index 0000000000..dfbcf1499f
--- /dev/null
+++ b/ruby_1_8_6/lib/net/ftp.rb
@@ -0,0 +1,923 @@
+# 
+# = net/ftp.rb - FTP Client Library
+# 
+# Written by Shugo Maeda <shugo@ruby-lang.org>.
+#
+# Documentation by Gavin Sinclair, sourced from "Programming Ruby" (Hunt/Thomas)
+# and "Ruby In a Nutshell" (Matsumoto), used with permission.
+# 
+# This library is distributed under the terms of the Ruby license.
+# You can freely distribute/modify this library.
+#
+# It is included in the Ruby standard library.
+#
+# See the Net::FTP class for an overview.
+#
+
+require "socket"
+require "monitor"
+
+module Net
+
+  # :stopdoc:
+  class FTPError < StandardError; end
+  class FTPReplyError < FTPError; end
+  class FTPTempError < FTPError; end 
+  class FTPPermError < FTPError; end 
+  class FTPProtoError < FTPError; end
+  # :startdoc:
+
+  #
+  # This class implements the File Transfer Protocol.  If you have used a
+  # command-line FTP program, and are familiar with the commands, you will be
+  # able to use this class easily.  Some extra features are included to take
+  # advantage of Ruby's style and strengths.
+  #
+  # == Example
+  # 
+  #   require 'net/ftp'
+  #
+  # === Example 1
+  #  
+  #   ftp = Net::FTP.new('ftp.netlab.co.jp')
+  #   ftp.login
+  #   files = ftp.chdir('pub/lang/ruby/contrib')
+  #   files = ftp.list('n*')
+  #   ftp.getbinaryfile('nif.rb-0.91.gz', 'nif.gz', 1024)
+  #   ftp.close
+  #
+  # === Example 2
+  #
+  #   Net::FTP.open('ftp.netlab.co.jp') do |ftp|
+  #     ftp.login
+  #     files = ftp.chdir('pub/lang/ruby/contrib')
+  #     files = ftp.list('n*')
+  #     ftp.getbinaryfile('nif.rb-0.91.gz', 'nif.gz', 1024)
+  #   end
+  #
+  # == Major Methods
+  #
+  # The following are the methods most likely to be useful to users:
+  # - FTP.open
+  # - #getbinaryfile
+  # - #gettextfile
+  # - #putbinaryfile
+  # - #puttextfile
+  # - #chdir
+  # - #nlst
+  # - #size
+  # - #rename
+  # - #delete
+  #
+  class FTP
+    include MonitorMixin
+    
+    # :stopdoc:
+    FTP_PORT = 21
+    CRLF = "\r\n"
+    DEFAULT_BLOCKSIZE = 4096
+    # :startdoc:
+    
+    # When +true+, transfers are performed in binary mode.  Default: +true+.
+    attr_accessor :binary
+
+    # When +true+, the connection is in passive mode.  Default: +false+.
+    attr_accessor :passive
+
+    # When +true+, all traffic to and from the server is written
+    # to +$stdout+.  Default: +false+.
+    attr_accessor :debug_mode
+
+    # Sets or retrieves the +resume+ status, which decides whether incomplete
+    # transfers are resumed or restarted.  Default: +false+.
+    attr_accessor :resume
+
+    # The server's welcome message.
+    attr_reader :welcome
+
+    # The server's last response code.
+    attr_reader :last_response_code
+    alias lastresp last_response_code
+
+    # The server's last response.
+    attr_reader :last_response
+    
+    #
+    # A synonym for <tt>FTP.new</tt>, but with a mandatory host parameter.
+    #
+    # If a block is given, it is passed the +FTP+ object, which will be closed
+    # when the block finishes, or when an exception is raised.
+    #
+    def FTP.open(host, user = nil, passwd = nil, acct = nil)
+      if block_given?
+        ftp = new(host, user, passwd, acct)
+        begin
+          yield ftp
+        ensure
+          ftp.close
+        end
+      else
+        new(host, user, passwd, acct)
+      end
+    end
+    
+    #
+    # Creates and returns a new +FTP+ object. If a +host+ is given, a connection
+    # is made. Additionally, if the +user+ is given, the given user name,
+    # password, and (optionally) account are used to log in.  See #login.
+    #
+    def initialize(host = nil, user = nil, passwd = nil, acct = nil)
+      super()
+      @binary = true
+      @passive = false
+      @debug_mode = false
+      @resume = false
+      if host
+	connect(host)
+	if user
+	  login(user, passwd, acct)
+	end
+      end
+    end
+
+    # Obsolete
+    def return_code
+      $stderr.puts("warning: Net::FTP#return_code is obsolete and do nothing")
+      return "\n"
+    end
+
+    # Obsolete
+    def return_code=(s)
+      $stderr.puts("warning: Net::FTP#return_code= is obsolete and do nothing")
+    end
+
+    def open_socket(host, port)
+      if defined? SOCKSsocket and ENV["SOCKS_SERVER"]
+	@passive = true
+	return SOCKSsocket.open(host, port)
+      else
+	return TCPSocket.open(host, port)
+      end
+    end
+    private :open_socket
+    
+    #
+    # Establishes an FTP connection to host, optionally overriding the default
+    # port. If the environment variable +SOCKS_SERVER+ is set, sets up the
+    # connection through a SOCKS proxy. Raises an exception (typically
+    # <tt>Errno::ECONNREFUSED</tt>) if the connection cannot be established.
+    #
+    def connect(host, port = FTP_PORT)
+      if @debug_mode
+	print "connect: ", host, ", ", port, "\n"
+      end
+      synchronize do
+	@sock = open_socket(host, port)
+	voidresp
+      end
+    end
+
+    #
+    # WRITEME or make private
+    #
+    def set_socket(sock, get_greeting = true)
+      synchronize do
+	@sock = sock
+	if get_greeting
+	  voidresp
+	end
+      end
+    end
+
+    def sanitize(s)
+      if s =~ /^PASS /i
+	return s[0, 5] + "*" * (s.length - 5)
+      else
+	return s
+      end
+    end
+    private :sanitize
+    
+    def putline(line)
+      if @debug_mode
+	print "put: ", sanitize(line), "\n"
+      end
+      line = line + CRLF
+      @sock.write(line)
+    end
+    private :putline
+    
+    def getline
+      line = @sock.readline # if get EOF, raise EOFError
+      line.sub!(/(\r\n|\n|\r)\z/n, "")
+      if @debug_mode
+	print "get: ", sanitize(line), "\n"
+      end
+      return line
+    end
+    private :getline
+    
+    def getmultiline
+      line = getline
+      buff = line
+      if line[3] == ?-
+	  code = line[0, 3]
+	begin
+	  line = getline
+	  buff << "\n" << line
+	end until line[0, 3] == code and line[3] != ?-
+      end
+      return buff << "\n"
+    end
+    private :getmultiline
+    
+    def getresp
+      @last_response = getmultiline
+      @last_response_code = @last_response[0, 3]
+      case @last_response_code
+      when /\A[123]/
+	return @last_response
+      when /\A4/
+	raise FTPTempError, @last_response
+      when /\A5/
+	raise FTPPermError, @last_response
+      else
+	raise FTPProtoError, @last_response
+      end
+    end
+    private :getresp
+    
+    def voidresp
+      resp = getresp
+      if resp[0] != ?2
+	raise FTPReplyError, resp
+      end
+    end
+    private :voidresp
+    
+    #
+    # Sends a command and returns the response.
+    #
+    def sendcmd(cmd)
+      synchronize do
+	putline(cmd)
+	return getresp
+      end
+    end
+    
+    #
+    # Sends a command and expect a response beginning with '2'.
+    #
+    def voidcmd(cmd)
+      synchronize do
+	putline(cmd)
+	voidresp
+      end
+    end
+    
+    def sendport(host, port)
+      af = (@sock.peeraddr)[0]
+      if af == "AF_INET"
+	hbytes = host.split(".")
+	pbytes = [port / 256, port % 256]
+	bytes = hbytes + pbytes
+	cmd = "PORT " + bytes.join(",")
+      elsif af == "AF_INET6"
+	cmd = "EPRT |2|" + host + "|" + sprintf("%d", port) + "|"
+      else
+	raise FTPProtoError, host
+      end
+      voidcmd(cmd)
+    end
+    private :sendport
+    
+    def makeport
+      sock = TCPServer.open(@sock.addr[3], 0)
+      port = sock.addr[1]
+      host = sock.addr[3]
+      resp = sendport(host, port)
+      return sock
+    end
+    private :makeport
+    
+    def makepasv
+      if @sock.peeraddr[0] == "AF_INET"
+	host, port = parse227(sendcmd("PASV"))
+      else
+	host, port = parse229(sendcmd("EPSV"))
+	#     host, port = parse228(sendcmd("LPSV"))
+      end
+      return host, port
+    end
+    private :makepasv
+    
+    def transfercmd(cmd, rest_offset = nil)
+      if @passive
+	host, port = makepasv
+	conn = open_socket(host, port)
+	if @resume and rest_offset
+	  resp = sendcmd("REST " + rest_offset.to_s) 
+	  if resp[0] != ?3
+	    raise FTPReplyError, resp
+	  end
+	end
+	resp = sendcmd(cmd)
+	if resp[0] != ?1
+	  raise FTPReplyError, resp
+	end
+      else
+	sock = makeport
+	if @resume and rest_offset
+	  resp = sendcmd("REST " + rest_offset.to_s) 
+	  if resp[0] != ?3
+	    raise FTPReplyError, resp
+	  end
+	end
+	resp = sendcmd(cmd)
+	if resp[0] != ?1
+	  raise FTPReplyError, resp
+	end
+	conn = sock.accept
+	sock.close
+      end
+      return conn
+    end
+    private :transfercmd
+    
+    def getaddress
+      thishost = Socket.gethostname
+      if not thishost.index(".")
+	thishost = Socket.gethostbyname(thishost)[0]
+      end
+      if ENV.has_key?("LOGNAME")
+	realuser = ENV["LOGNAME"]
+      elsif ENV.has_key?("USER")
+	realuser = ENV["USER"]
+      else
+	realuser = "anonymous"
+      end
+      return realuser + "@" + thishost
+    end
+    private :getaddress
+    
+    #
+    # Logs in to the remote host. The session must have been previously
+    # connected.  If +user+ is the string "anonymous" and the +password+ is
+    # +nil+, a password of <tt>user@host</tt> is synthesized. If the +acct+
+    # parameter is not +nil+, an FTP ACCT command is sent following the
+    # successful login.  Raises an exception on error (typically
+    # <tt>Net::FTPPermError</tt>).
+    #
+    def login(user = "anonymous", passwd = nil, acct = nil)
+      if user == "anonymous" and passwd == nil
+	passwd = getaddress
+      end
+      
+      resp = ""
+      synchronize do
+	resp = sendcmd('USER ' + user)
+	if resp[0] == ?3
+	  resp = sendcmd('PASS ' + passwd)
+	end
+	if resp[0] == ?3
+	  resp = sendcmd('ACCT ' + acct)
+	end
+      end
+      if resp[0] != ?2
+	raise FTPReplyError, resp
+      end
+      @welcome = resp
+    end
+    
+    #
+    # Puts the connection into binary (image) mode, issues the given command,
+    # and fetches the data returned, passing it to the associated block in
+    # chunks of +blocksize+ characters. Note that +cmd+ is a server command
+    # (such as "RETR myfile").
+    #
+    def retrbinary(cmd, blocksize, rest_offset = nil) # :yield: data
+      synchronize do
+	voidcmd("TYPE I")
+	conn = transfercmd(cmd, rest_offset)
+	loop do
+	  data = conn.read(blocksize)
+	  break if data == nil
+	  yield(data)
+	end
+	conn.close
+	voidresp
+      end
+    end
+    
+    #
+    # Puts the connection into ASCII (text) mode, issues the given command, and
+    # passes the resulting data, one line at a time, to the associated block. If
+    # no block is given, prints the lines. Note that +cmd+ is a server command
+    # (such as "RETR myfile").
+    #
+    def retrlines(cmd) # :yield: line
+      synchronize do
+	voidcmd("TYPE A")
+	conn = transfercmd(cmd)
+	loop do
+	  line = conn.gets
+	  break if line == nil
+	  if line[-2, 2] == CRLF
+	    line = line[0 .. -3]
+	  elsif line[-1] == ?\n
+	    line = line[0 .. -2]
+	  end
+	  yield(line)
+	end
+	conn.close
+	voidresp
+      end
+    end
+    
+    #
+    # Puts the connection into binary (image) mode, issues the given server-side
+    # command (such as "STOR myfile"), and sends the contents of the file named
+    # +file+ to the server. If the optional block is given, it also passes it
+    # the data, in chunks of +blocksize+ characters.
+    #
+    def storbinary(cmd, file, blocksize, rest_offset = nil, &block) # :yield: data
+      if rest_offset
+        file.seek(rest_offset, IO::SEEK_SET)
+      end
+      synchronize do
+	voidcmd("TYPE I")
+	conn = transfercmd(cmd, rest_offset)
+	loop do
+	  buf = file.read(blocksize)
+	  break if buf == nil
+	  conn.write(buf)
+	  yield(buf) if block
+	end
+	conn.close
+	voidresp
+      end
+    end
+    
+    #
+    # Puts the connection into ASCII (text) mode, issues the given server-side
+    # command (such as "STOR myfile"), and sends the contents of the file
+    # named +file+ to the server, one line at a time. If the optional block is
+    # given, it also passes it the lines.
+    #
+    def storlines(cmd, file, &block) # :yield: line
+      synchronize do
+	voidcmd("TYPE A")
+	conn = transfercmd(cmd)
+	loop do
+	  buf = file.gets
+	  break if buf == nil
+	  if buf[-2, 2] != CRLF
+	    buf = buf.chomp + CRLF
+	  end
+	  conn.write(buf)
+	  yield(buf) if block
+	end
+	conn.close
+	voidresp
+      end
+    end
+
+    #
+    # Retrieves +remotefile+ in binary mode, storing the result in +localfile+.
+    # If a block is supplied, it is passed the retrieved data in +blocksize+
+    # chunks.
+    #
+    def getbinaryfile(remotefile, localfile = File.basename(remotefile),
+		      blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
+      if @resume
+	rest_offset = File.size?(localfile)
+	f = open(localfile, "a")
+      else
+	rest_offset = nil
+	f = open(localfile, "w")
+      end
+      begin
+	f.binmode
+	retrbinary("RETR " + remotefile, blocksize, rest_offset) do |data|
+	  f.write(data)
+	  yield(data) if block
+	end
+      ensure
+	f.close
+      end
+    end
+    
+    #
+    # Retrieves +remotefile+ in ASCII (text) mode, storing the result in
+    # +localfile+. If a block is supplied, it is passed the retrieved data one
+    # line at a time.
+    #
+    def gettextfile(remotefile, localfile = File.basename(remotefile), &block) # :yield: line
+      f = open(localfile, "w")
+      begin
+	retrlines("RETR " + remotefile) do |line|
+	  f.puts(line)
+	  yield(line) if block
+	end
+      ensure
+	f.close
+      end
+    end
+
+    #
+    # Retrieves +remotefile+ in whatever mode the session is set (text or
+    # binary).  See #gettextfile and #getbinaryfile.
+    #
+    def get(remotefile, localfile = File.basename(remotefile),
+	    blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
+      unless @binary
+	gettextfile(remotefile, localfile, &block)
+      else
+	getbinaryfile(remotefile, localfile, blocksize, &block)
+      end
+    end
+    
+    #
+    # Transfers +localfile+ to the server in binary mode, storing the result in
+    # +remotefile+. If a block is supplied, calls it, passing in the transmitted
+    # data in +blocksize+ chunks.
+    #
+    def putbinaryfile(localfile, remotefile = File.basename(localfile),
+		      blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
+      if @resume
+        begin
+          rest_offset = size(remotefile)
+        rescue Net::FTPPermError
+          rest_offset = nil
+        end
+      else
+	rest_offset = nil
+      end
+      f = open(localfile)
+      begin
+	f.binmode
+	storbinary("STOR " + remotefile, f, blocksize, rest_offset, &block)
+      ensure
+	f.close
+      end
+    end
+    
+    #
+    # Transfers +localfile+ to the server in ASCII (text) mode, storing the result
+    # in +remotefile+. If callback or an associated block is supplied, calls it,
+    # passing in the transmitted data one line at a time.
+    #
+    def puttextfile(localfile, remotefile = File.basename(localfile), &block) # :yield: line
+      f = open(localfile)
+      begin
+	storlines("STOR " + remotefile, f, &block)
+      ensure
+	f.close
+      end
+    end
+
+    #
+    # Transfers +localfile+ to the server in whatever mode the session is set
+    # (text or binary).  See #puttextfile and #putbinaryfile.
+    #
+    def put(localfile, remotefile = File.basename(localfile),
+	    blocksize = DEFAULT_BLOCKSIZE, &block)
+      unless @binary
+	puttextfile(localfile, remotefile, &block)
+      else
+	putbinaryfile(localfile, remotefile, blocksize, &block)
+      end
+    end
+
+    #
+    # Sends the ACCT command.  TODO: more info.
+    #
+    def acct(account)
+      cmd = "ACCT " + account
+      voidcmd(cmd)
+    end
+    
+    #
+    # Returns an array of filenames in the remote directory.
+    #
+    def nlst(dir = nil)
+      cmd = "NLST"
+      if dir
+	cmd = cmd + " " + dir
+      end
+      files = []
+      retrlines(cmd) do |line|
+	files.push(line)
+      end
+      return files
+    end
+    
+    #
+    # Returns an array of file information in the directory (the output is like
+    # `ls -l`).  If a block is given, it iterates through the listing.
+    #
+    def list(*args, &block) # :yield: line
+      cmd = "LIST"
+      args.each do |arg|
+	cmd = cmd + " " + arg
+      end
+      if block
+	retrlines(cmd, &block)
+      else
+	lines = []
+	retrlines(cmd) do |line|
+	  lines << line
+	end
+	return lines
+      end
+    end
+    alias ls list
+    alias dir list
+    
+    #
+    # Renames a file on the server.
+    #
+    def rename(fromname, toname)
+      resp = sendcmd("RNFR " + fromname)
+      if resp[0] != ?3
+	raise FTPReplyError, resp
+      end
+      voidcmd("RNTO " + toname)
+    end
+    
+    #
+    # Deletes a file on the server.
+    #
+    def delete(filename)
+      resp = sendcmd("DELE " + filename)
+      if resp[0, 3] == "250"
+	return
+      elsif resp[0] == ?5
+	raise FTPPermError, resp
+      else
+	raise FTPReplyError, resp
+      end
+    end
+    
+    #
+    # Changes the (remote) directory.
+    #
+    def chdir(dirname)
+      if dirname == ".."
+	begin
+	  voidcmd("CDUP")
+	  return
+	rescue FTPPermError
+	  if $![0, 3] != "500"
+	    raise FTPPermError, $!
+	  end
+	end
+      end
+      cmd = "CWD " + dirname
+      voidcmd(cmd)
+    end
+    
+    #
+    # Returns the size of the given (remote) filename.
+    #
+    def size(filename)
+      voidcmd("TYPE I")
+      resp = sendcmd("SIZE " + filename)
+      if resp[0, 3] != "213" 
+	raise FTPReplyError, resp
+      end
+      return resp[3..-1].strip.to_i
+    end
+    
+    MDTM_REGEXP = /^(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)/  # :nodoc:
+    
+    #
+    # Returns the last modification time of the (remote) file.  If +local+ is
+    # +true+, it is returned as a local time, otherwise it's a UTC time.
+    #
+    def mtime(filename, local = false)
+      str = mdtm(filename)
+      ary = str.scan(MDTM_REGEXP)[0].collect {|i| i.to_i}
+      return local ? Time.local(*ary) : Time.gm(*ary)
+    end
+    
+    #
+    # Creates a remote directory.
+    #
+    def mkdir(dirname)
+      resp = sendcmd("MKD " + dirname)
+      return parse257(resp)
+    end
+    
+    #
+    # Removes a remote directory.
+    #
+    def rmdir(dirname)
+      voidcmd("RMD " + dirname)
+    end
+    
+    #
+    # Returns the current remote directory.
+    #
+    def pwd
+      resp = sendcmd("PWD")
+      return parse257(resp)
+    end
+    alias getdir pwd
+    
+    #
+    # Returns system information.
+    #
+    def system
+      resp = sendcmd("SYST")
+      if resp[0, 3] != "215"
+	raise FTPReplyError, resp
+      end
+      return resp[4 .. -1]
+    end
+    
+    #
+    # Aborts the previous command (ABOR command).
+    #
+    def abort
+      line = "ABOR" + CRLF
+      print "put: ABOR\n" if @debug_mode
+      @sock.send(line, Socket::MSG_OOB)
+      resp = getmultiline
+      unless ["426", "226", "225"].include?(resp[0, 3])
+	raise FTPProtoError, resp
+      end
+      return resp
+    end
+    
+    #
+    # Returns the status (STAT command).
+    #
+    def status
+      line = "STAT" + CRLF
+      print "put: STAT\n" if @debug_mode
+      @sock.send(line, Socket::MSG_OOB)
+      return getresp
+    end
+    
+    #
+    # Issues the MDTM command.  TODO: more info.
+    #
+    def mdtm(filename)
+      resp = sendcmd("MDTM " + filename)
+      if resp[0, 3] == "213"
+	return resp[3 .. -1].strip
+      end
+    end
+    
+    #
+    # Issues the HELP command.
+    #
+    def help(arg = nil)
+      cmd = "HELP"
+      if arg
+	cmd = cmd + " " + arg
+      end
+      sendcmd(cmd)
+    end
+    
+    #
+    # Exits the FTP session.
+    #
+    def quit
+      voidcmd("QUIT")
+    end
+
+    #
+    # Issues a NOOP command.
+    #
+    def noop
+      voidcmd("NOOP")
+    end
+
+    #
+    # Issues a SITE command.
+    #
+    def site(arg)
+      cmd = "SITE " + arg
+      voidcmd(cmd)
+    end
+    
+    #
+    # Closes the connection.  Further operations are impossible until you open
+    # a new connection with #connect.
+    #
+    def close
+      @sock.close if @sock and not @sock.closed?
+    end
+    
+    #
+    # Returns +true+ iff the connection is closed.
+    #
+    def closed?
+      @sock == nil or @sock.closed?
+    end
+    
+    def parse227(resp)
+      if resp[0, 3] != "227"
+	raise FTPReplyError, resp
+      end
+      left = resp.index("(")
+      right = resp.index(")")
+      if left == nil or right == nil
+	raise FTPProtoError, resp
+      end
+      numbers = resp[left + 1 .. right - 1].split(",")
+      if numbers.length != 6
+	raise FTPProtoError, resp
+      end
+      host = numbers[0, 4].join(".")
+      port = (numbers[4].to_i << 8) + numbers[5].to_i
+      return host, port
+    end
+    private :parse227
+    
+    def parse228(resp)
+      if resp[0, 3] != "228"
+	raise FTPReplyError, resp
+      end
+      left = resp.index("(")
+      right = resp.index(")")
+      if left == nil or right == nil
+	raise FTPProtoError, resp
+      end
+      numbers = resp[left + 1 .. right - 1].split(",")
+      if numbers[0] == "4"
+	if numbers.length != 9 || numbers[1] != "4" || numbers[2 + 4] != "2"
+	  raise FTPProtoError, resp
+	end
+	host = numbers[2, 4].join(".")
+	port = (numbers[7].to_i << 8) + numbers[8].to_i
+      elsif numbers[0] == "6"
+	if numbers.length != 21 || numbers[1] != "16" || numbers[2 + 16] != "2"
+	  raise FTPProtoError, resp
+	end
+	v6 = ["", "", "", "", "", "", "", ""]
+	for i in 0 .. 7
+	  v6[i] = sprintf("%02x%02x", numbers[(i * 2) + 2].to_i,
+			  numbers[(i * 2) + 3].to_i)
+	end
+	host = v6[0, 8].join(":")
+	port = (numbers[19].to_i << 8) + numbers[20].to_i
+      end 
+      return host, port
+    end
+    private :parse228
+    
+    def parse229(resp)
+      if resp[0, 3] != "229"
+	raise FTPReplyError, resp
+      end
+      left = resp.index("(")
+      right = resp.index(")")
+      if left == nil or right == nil
+	raise FTPProtoError, resp
+      end
+      numbers = resp[left + 1 .. right - 1].split(resp[left + 1, 1])
+      if numbers.length != 4
+	raise FTPProtoError, resp
+      end
+      port = numbers[3].to_i
+      host = (@sock.peeraddr())[3]
+      return host, port
+    end
+    private :parse229
+    
+    def parse257(resp)
+      if resp[0, 3] != "257"
+	raise FTPReplyError, resp
+      end
+      if resp[3, 2] != ' "'
+	return ""
+      end
+      dirname = ""
+      i = 5
+      n = resp.length
+      while i < n
+	c = resp[i, 1]
+	i = i + 1
+	if c == '"'
+	  if i > n or resp[i, 1] != '"'
+	    break
+	  end
+	  i = i + 1
+	end
+	dirname = dirname + c
+      end
+      return dirname
+    end
+    private :parse257
+  end
+
+end
+
+
+# Documentation comments:
+#  - sourced from pickaxe and nutshell, with improvements (hopefully)
+#  - three methods should be private (search WRITEME)
+#  - two methods need more information (search TODO)
diff --git a/ruby_1_8_6/lib/net/http.rb b/ruby_1_8_6/lib/net/http.rb
new file mode 100644
index 0000000000..46d95b27b4
--- /dev/null
+++ b/ruby_1_8_6/lib/net/http.rb
@@ -0,0 +1,2274 @@
+#
+# = net/http.rb
+#
+# Copyright (c) 1999-2006 Yukihiro Matsumoto
+# Copyright (c) 1999-2006 Minero Aoki
+# Copyright (c) 2001 GOTOU Yuuzou
+# 
+# Written and maintained by Minero Aoki <aamine@loveruby.net>.
+# HTTPS support added by GOTOU Yuuzou <gotoyuzo@notwork.org>.
+#
+# This file is derived from "http-access.rb".
+#
+# Documented by Minero Aoki; converted to RDoc by William Webber.
+# 
+# This program is free software. You can re-distribute and/or
+# modify this program under the same terms of ruby itself ---
+# Ruby Distribution License or GNU General Public License.
+#
+# See Net::HTTP for an overview and examples. 
+# 
+# NOTE: You can find Japanese version of this document here:
+# http://www.ruby-lang.org/ja/man/?cmd=view;name=net%2Fhttp.rb
+# 
+#--
+# $Id$
+#++ 
+
+require 'net/protocol'
+require 'uri'
+
+module Net   #:nodoc:
+
+  # :stopdoc:
+  class HTTPBadResponse < StandardError; end
+  class HTTPHeaderSyntaxError < StandardError; end
+  # :startdoc:
+
+  # == What Is This Library?
+  # 
+  # This library provides your program functions to access WWW
+  # documents via HTTP, Hyper Text Transfer Protocol version 1.1.
+  # For details of HTTP, refer [RFC2616]
+  # (http://www.ietf.org/rfc/rfc2616.txt).
+  # 
+  # == Examples
+  # 
+  # === Getting Document From WWW Server
+  # 
+  # Example #1: Simple GET+print
+  # 
+  #     require 'net/http'
+  #     Net::HTTP.get_print 'www.example.com', '/index.html'
+  # 
+  # Example #2: Simple GET+print by URL
+  # 
+  #     require 'net/http'
+  #     require 'uri'
+  #     Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
+  # 
+  # Example #3: More generic GET+print
+  # 
+  #     require 'net/http'
+  #     require 'uri'
+  #
+  #     url = URI.parse('http://www.example.com/index.html')
+  #     res = Net::HTTP.start(url.host, url.port) {|http|
+  #       http.get('/index.html')
+  #     }
+  #     puts res.body
+  #
+  # Example #4: More generic GET+print
+  # 
+  #     require 'net/http'
+  #
+  #     url = URI.parse('http://www.example.com/index.html')
+  #     req = Net::HTTP::Get.new(url.path)
+  #     res = Net::HTTP.start(url.host, url.port) {|http|
+  #       http.request(req)
+  #     }
+  #     puts res.body
+  # 
+  # === Posting Form Data
+  # 
+  #     require 'net/http'
+  #     require 'uri'
+  #
+  #     #1: Simple POST
+  #     res = Net::HTTP.post_form(URI.parse('http://www.example.com/search.cgi'),
+  #                               {'q'=>'ruby', 'max'=>'50'})
+  #     puts res.body
+  #
+  #     #2: POST with basic authentication
+  #     res = Net::HTTP.post_form(URI.parse('http://jack:pass@www.example.com/todo.cgi'),
+  #                                         {'from'=>'2005-01-01', 'to'=>'2005-03-31'})
+  #     puts res.body
+  #
+  #     #3: Detailed control
+  #     url = URI.parse('http://www.example.com/todo.cgi')
+  #     req = Net::HTTP::Post.new(url.path)
+  #     req.basic_auth 'jack', 'pass'
+  #     req.set_form_data({'from'=>'2005-01-01', 'to'=>'2005-03-31'}, ';')
+  #     res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
+  #     case res
+  #     when Net::HTTPSuccess, Net::HTTPRedirection
+  #       # OK
+  #     else
+  #       res.error!
+  #     end
+  # 
+  # === Accessing via Proxy
+  # 
+  # Net::HTTP.Proxy creates http proxy class. It has same
+  # methods of Net::HTTP but its instances always connect to
+  # proxy, instead of given host.
+  # 
+  #     require 'net/http'
+  # 
+  #     proxy_addr = 'your.proxy.host'
+  #     proxy_port = 8080
+  #             :
+  #     Net::HTTP::Proxy(proxy_addr, proxy_port).start('www.example.com') {|http|
+  #       # always connect to your.proxy.addr:8080
+  #             :
+  #     }
+  # 
+  # Since Net::HTTP.Proxy returns Net::HTTP itself when proxy_addr is nil,
+  # there's no need to change code if there's proxy or not.
+  # 
+  # There are two additional parameters in Net::HTTP.Proxy which allow to
+  # specify proxy user name and password:
+  # 
+  #     Net::HTTP::Proxy(proxy_addr, proxy_port, proxy_user = nil, proxy_pass = nil)
+  # 
+  # You may use them to work with authorization-enabled proxies:
+  # 
+  #     require 'net/http'
+  #     require 'uri'
+  #     
+  #     proxy_host = 'your.proxy.host'
+  #     proxy_port = 8080
+  #     uri = URI.parse(ENV['http_proxy'])
+  #     proxy_user, proxy_pass = uri.userinfo.split(/:/) if uri.userinfo
+  #     Net::HTTP::Proxy(proxy_host, proxy_port,
+  #                      proxy_user, proxy_pass).start('www.example.com') {|http|
+  #       # always connect to your.proxy.addr:8080 using specified username and password
+  #             :
+  #     }
+  #
+  # Note that net/http never rely on HTTP_PROXY environment variable.
+  # If you want to use proxy, set it explicitly.
+  # 
+  # === Following Redirection
+  # 
+  #     require 'net/http'
+  #     require 'uri'
+  # 
+  #     def fetch(uri_str, limit = 10)
+  #       # You should choose better exception. 
+  #       raise ArgumentError, 'HTTP redirect too deep' if limit == 0
+  # 
+  #       response = Net::HTTP.get_response(URI.parse(uri_str))
+  #       case response
+  #       when Net::HTTPSuccess     then response
+  #       when Net::HTTPRedirection then fetch(response['location'], limit - 1)
+  #       else
+  #         response.error!
+  #       end
+  #     end
+  # 
+  #     print fetch('http://www.ruby-lang.org')
+  # 
+  # Net::HTTPSuccess and Net::HTTPRedirection is a HTTPResponse class.
+  # All HTTPResponse objects belong to its own response class which
+  # indicate HTTP result status. For details of response classes,
+  # see section "HTTP Response Classes".
+  # 
+  # === Basic Authentication
+  # 
+  #     require 'net/http'
+  # 
+  #     Net::HTTP.start('www.example.com') {|http|
+  #       req = Net::HTTP::Get.new('/secret-page.html')
+  #       req.basic_auth 'account', 'password'
+  #       response = http.request(req)
+  #       print response.body
+  #     }
+  # 
+  # === HTTP Request Classes
+  #
+  # Here is HTTP request class hierarchy.
+  #
+  #   Net::HTTPRequest
+  #       Net::HTTP::Get
+  #       Net::HTTP::Head
+  #       Net::HTTP::Post
+  #       Net::HTTP::Put
+  #       Net::HTTP::Proppatch
+  #       Net::HTTP::Lock
+  #       Net::HTTP::Unlock
+  #       Net::HTTP::Options
+  #       Net::HTTP::Propfind
+  #       Net::HTTP::Delete
+  #       Net::HTTP::Move
+  #       Net::HTTP::Copy
+  #       Net::HTTP::Mkcol
+  #       Net::HTTP::Trace
+  #
+  # === HTTP Response Classes
+  #
+  # Here is HTTP response class hierarchy.
+  # All classes are defined in Net module.
+  #
+  #   HTTPResponse
+  #       HTTPUnknownResponse
+  #       HTTPInformation                    # 1xx
+  #           HTTPContinue                       # 100
+  #           HTTPSwitchProtocl                  # 101
+  #       HTTPSuccess                        # 2xx
+  #           HTTPOK                             # 200
+  #           HTTPCreated                        # 201
+  #           HTTPAccepted                       # 202
+  #           HTTPNonAuthoritativeInformation    # 203
+  #           HTTPNoContent                      # 204
+  #           HTTPResetContent                   # 205
+  #           HTTPPartialContent                 # 206
+  #       HTTPRedirection                    # 3xx
+  #           HTTPMultipleChoice                 # 300
+  #           HTTPMovedPermanently               # 301
+  #           HTTPFound                          # 302
+  #           HTTPSeeOther                       # 303
+  #           HTTPNotModified                    # 304
+  #           HTTPUseProxy                       # 305
+  #           HTTPTemporaryRedirect              # 307
+  #       HTTPClientError                    # 4xx
+  #           HTTPBadRequest                     # 400
+  #           HTTPUnauthorized                   # 401
+  #           HTTPPaymentRequired                # 402
+  #           HTTPForbidden                      # 403
+  #           HTTPNotFound                       # 404
+  #           HTTPMethodNotAllowed               # 405
+  #           HTTPNotAcceptable                  # 406
+  #           HTTPProxyAuthenticationRequired    # 407
+  #           HTTPRequestTimeOut                 # 408
+  #           HTTPConflict                       # 409
+  #           HTTPGone                           # 410
+  #           HTTPLengthRequired                 # 411
+  #           HTTPPreconditionFailed             # 412
+  #           HTTPRequestEntityTooLarge          # 413
+  #           HTTPRequestURITooLong              # 414
+  #           HTTPUnsupportedMediaType           # 415
+  #           HTTPRequestedRangeNotSatisfiable   # 416
+  #           HTTPExpectationFailed              # 417
+  #       HTTPServerError                    # 5xx
+  #           HTTPInternalServerError            # 500
+  #           HTTPNotImplemented                 # 501
+  #           HTTPBadGateway                     # 502
+  #           HTTPServiceUnavailable             # 503
+  #           HTTPGatewayTimeOut                 # 504
+  #           HTTPVersionNotSupported            # 505
+  # 
+  # == Switching Net::HTTP versions
+  # 
+  # You can use net/http.rb 1.1 features (bundled with Ruby 1.6)
+  # by calling HTTP.version_1_1. Calling Net::HTTP.version_1_2
+  # allows you to use 1.2 features again.
+  # 
+  #     # example
+  #     Net::HTTP.start {|http1| ...(http1 has 1.2 features)... }
+  # 
+  #     Net::HTTP.version_1_1
+  #     Net::HTTP.start {|http2| ...(http2 has 1.1 features)... }
+  # 
+  #     Net::HTTP.version_1_2
+  #     Net::HTTP.start {|http3| ...(http3 has 1.2 features)... }
+  # 
+  # This function is NOT thread-safe.
+  #
+  class HTTP < Protocol
+
+    # :stopdoc:
+    Revision = %q$Revision$.split[1]
+    HTTPVersion = '1.1'
+    @newimpl = true
+    # :startdoc:
+
+    # Turns on net/http 1.2 (ruby 1.8) features.
+    # Defaults to ON in ruby 1.8.
+    #
+    # I strongly recommend to call this method always.
+    #
+    #   require 'net/http'
+    #   Net::HTTP.version_1_2
+    #
+    def HTTP.version_1_2
+      @newimpl = true
+    end
+
+    # Turns on net/http 1.1 (ruby 1.6) features.
+    # Defaults to OFF in ruby 1.8.
+    def HTTP.version_1_1
+      @newimpl = false
+    end
+
+    # true if net/http is in version 1.2 mode.
+    # Defaults to true.
+    def HTTP.version_1_2?
+      @newimpl
+    end
+
+    # true if net/http is in version 1.1 compatible mode.
+    # Defaults to true.
+    def HTTP.version_1_1?
+      not @newimpl
+    end
+
+    class << HTTP
+      alias is_version_1_1? version_1_1?   #:nodoc:
+      alias is_version_1_2? version_1_2?   #:nodoc:
+    end
+
+    #
+    # short cut methods
+    #
+
+    #
+    # Get body from target and output it to +$stdout+.  The
+    # target can either be specified as (+uri+), or as
+    # (+host+, +path+, +port+ = 80); so: 
+    #
+    #    Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
+    #
+    # or:
+    #
+    #    Net::HTTP.get_print 'www.example.com', '/index.html'
+    #
+    def HTTP.get_print(uri_or_host, path = nil, port = nil)
+      get_response(uri_or_host, path, port) {|res|
+        res.read_body do |chunk|
+          $stdout.print chunk
+        end
+      }
+      nil
+    end
+
+    # Send a GET request to the target and return the response
+    # as a string.  The target can either be specified as
+    # (+uri+), or as (+host+, +path+, +port+ = 80); so:
+    # 
+    #    print Net::HTTP.get(URI.parse('http://www.example.com/index.html'))
+    #
+    # or:
+    #
+    #    print Net::HTTP.get('www.example.com', '/index.html')
+    #
+    def HTTP.get(uri_or_host, path = nil, port = nil)
+      get_response(uri_or_host, path, port).body
+    end
+
+    # Send a GET request to the target and return the response
+    # as a Net::HTTPResponse object.  The target can either be specified as
+    # (+uri+), or as (+host+, +path+, +port+ = 80); so:
+    # 
+    #    res = Net::HTTP.get_response(URI.parse('http://www.example.com/index.html'))
+    #    print res.body
+    #
+    # or:
+    #
+    #    res = Net::HTTP.get_response('www.example.com', '/index.html')
+    #    print res.body
+    #
+    def HTTP.get_response(uri_or_host, path = nil, port = nil, &block)
+      if path
+        host = uri_or_host
+        new(host, port || HTTP.default_port).start {|http|
+          return http.request_get(path, &block)
+        }
+      else
+        uri = uri_or_host
+        new(uri.host, uri.port).start {|http|
+          return http.request_get(uri.request_uri, &block)
+        }
+      end
+    end
+
+    # Posts HTML form data to the +URL+.
+    # Form data must be represented as a Hash of String to String, e.g:
+    #
+    #   { "cmd" => "search", "q" => "ruby", "max" => "50" }
+    #
+    # This method also does Basic Authentication iff +URL+.user exists.
+    #
+    # Example:
+    #
+    #   require 'net/http'
+    #   require 'uri'
+    #
+    #   HTTP.post_form URI.parse('http://www.example.com/search.cgi'),
+    #                  { "q" => "ruby", "max" => "50" }
+    #
+    def HTTP.post_form(url, params)
+      req = Post.new(url.path)
+      req.form_data = params
+      req.basic_auth url.user, url.password if url.user
+      new(url.host, url.port).start {|http|
+        http.request(req)
+      }
+    end
+
+    #
+    # HTTP session management
+    #
+
+    # The default port to use for HTTP requests; defaults to 80.
+    def HTTP.default_port
+      http_default_port()
+    end
+
+    # The default port to use for HTTP requests; defaults to 80.
+    def HTTP.http_default_port
+      80
+    end
+
+    # The default port to use for HTTPS requests; defaults to 443.
+    def HTTP.https_default_port
+      443
+    end
+
+    def HTTP.socket_type   #:nodoc: obsolete
+      BufferedIO
+    end
+
+    # creates a new Net::HTTP object and opens its TCP connection and 
+    # HTTP session.  If the optional block is given, the newly 
+    # created Net::HTTP object is passed to it and closed when the 
+    # block finishes.  In this case, the return value of this method
+    # is the return value of the block.  If no block is given, the
+    # return value of this method is the newly created Net::HTTP object
+    # itself, and the caller is responsible for closing it upon completion.
+    def HTTP.start(address, port = nil, p_addr = nil, p_port = nil, p_user = nil, p_pass = nil, &block) # :yield: +http+
+      new(address, port, p_addr, p_port, p_user, p_pass).start(&block)
+    end
+
+    class << HTTP
+      alias newobj new
+    end
+
+    # Creates a new Net::HTTP object.
+    # If +proxy_addr+ is given, creates an Net::HTTP object with proxy support.
+    # This method does not open the TCP connection.
+    def HTTP.new(address, port = nil, p_addr = nil, p_port = nil, p_user = nil, p_pass = nil)
+      h = Proxy(p_addr, p_port, p_user, p_pass).newobj(address, port)
+      h.instance_eval {
+        @newimpl = ::Net::HTTP.version_1_2?
+      }
+      h
+    end
+
+    # Creates a new Net::HTTP object for the specified +address+.
+    # This method does not open the TCP connection.
+    def initialize(address, port = nil)
+      @address = address
+      @port    = (port || HTTP.default_port)
+      @curr_http_version = HTTPVersion
+      @seems_1_0_server = false
+      @close_on_empty_response = false
+      @socket  = nil
+      @started = false
+      @open_timeout = nil
+      @read_timeout = 60
+      @debug_output = nil
+      @use_ssl = false
+      @ssl_context = nil
+    end
+
+    def inspect
+      "#<#{self.class} #{@address}:#{@port} open=#{started?}>"
+    end
+
+    # *WARNING* This method causes serious security hole.
+    # Never use this method in production code.
+    #
+    # Set an output stream for debugging.
+    #
+    #   http = Net::HTTP.new
+    #   http.set_debug_output $stderr
+    #   http.start { .... }
+    #
+    def set_debug_output(output)
+      warn 'Net::HTTP#set_debug_output called after HTTP started' if started?
+      @debug_output = output
+    end
+
+    # The host name to connect to.
+    attr_reader :address
+
+    # The port number to connect to.
+    attr_reader :port
+
+    # Seconds to wait until connection is opened.
+    # If the HTTP object cannot open a connection in this many seconds,
+    # it raises a TimeoutError exception.
+    attr_accessor :open_timeout
+
+    # Seconds to wait until reading one block (by one read(2) call).
+    # If the HTTP object cannot open a connection in this many seconds,
+    # it raises a TimeoutError exception.
+    attr_reader :read_timeout
+
+    # Setter for the read_timeout attribute.
+    def read_timeout=(sec)
+      @socket.read_timeout = sec if @socket
+      @read_timeout = sec
+    end
+
+    # returns true if the HTTP session is started.
+    def started?
+      @started
+    end
+
+    alias active? started?   #:nodoc: obsolete
+
+    attr_accessor :close_on_empty_response
+
+    # returns true if use SSL/TLS with HTTP.
+    def use_ssl?
+      false   # redefined in net/https
+    end
+
+    # Opens TCP connection and HTTP session.
+    # 
+    # When this method is called with block, gives a HTTP object
+    # to the block and closes the TCP connection / HTTP session
+    # after the block executed.
+    #
+    # When called with a block, returns the return value of the
+    # block; otherwise, returns self.
+    #
+    def start  # :yield: http
+      raise IOError, 'HTTP session already opened' if @started
+      if block_given?
+        begin
+          do_start
+          return yield(self)
+        ensure
+          do_finish
+        end
+      end
+      do_start
+      self
+    end
+
+    def do_start
+      connect
+      @started = true
+    end
+    private :do_start
+
+    def connect
+      D "opening connection to #{conn_address()}..."
+      s = timeout(@open_timeout) { TCPSocket.open(conn_address(), conn_port()) }
+      D "opened"
+      if use_ssl?
+        unless @ssl_context.verify_mode
+          warn "warning: peer certificate won't be verified in this SSL session"
+          @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
+        s.sync_close = true
+      end
+      @socket = BufferedIO.new(s)
+      @socket.read_timeout = @read_timeout
+      @socket.debug_output = @debug_output
+      if use_ssl?
+        if proxy?
+          @socket.writeline sprintf('CONNECT %s:%s HTTP/%s',
+                                    @address, @port, HTTPVersion)
+          @socket.writeline "Host: #{@address}:#{@port}"
+          if proxy_user
+            credential = ["#{proxy_user}:#{proxy_pass}"].pack('m')
+            credential.delete!("\r\n")
+            @socket.writeline "Proxy-Authorization: Basic #{credential}"
+          end
+          @socket.writeline ''
+          HTTPResponse.read_new(@socket).value
+        end
+        s.connect
+      end
+      on_connect
+    end
+    private :connect
+
+    def on_connect
+    end
+    private :on_connect
+
+    # Finishes HTTP session and closes TCP connection.
+    # Raises IOError if not started.
+    def finish
+      raise IOError, 'HTTP session not yet started' unless started?
+      do_finish
+    end
+
+    def do_finish
+      @started = false
+      @socket.close if @socket and not @socket.closed?
+      @socket = nil
+    end
+    private :do_finish
+
+    #
+    # proxy
+    #
+
+    public
+
+    # no proxy
+    @is_proxy_class = false
+    @proxy_addr = nil
+    @proxy_port = nil
+    @proxy_user = nil
+    @proxy_pass = nil
+
+    # Creates an HTTP proxy class.
+    # Arguments are address/port of proxy host and username/password
+    # if authorization on proxy server is required.
+    # You can replace the HTTP class with created proxy class.
+    # 
+    # If ADDRESS is nil, this method returns self (Net::HTTP).
+    # 
+    #     # Example
+    #     proxy_class = Net::HTTP::Proxy('proxy.example.com', 8080)
+    #                     :
+    #     proxy_class.start('www.ruby-lang.org') {|http|
+    #       # connecting proxy.foo.org:8080
+    #                     :
+    #     }
+    # 
+    def HTTP.Proxy(p_addr, p_port = nil, p_user = nil, p_pass = nil)
+      return self unless p_addr
+      delta = ProxyDelta
+      proxyclass = Class.new(self)
+      proxyclass.module_eval {
+        include delta
+        # with proxy
+        @is_proxy_class = true
+        @proxy_address = p_addr
+        @proxy_port    = p_port || default_port()
+        @proxy_user    = p_user
+        @proxy_pass    = p_pass
+      }
+      proxyclass
+    end
+
+    class << HTTP
+      # returns true if self is a class which was created by HTTP::Proxy.
+      def proxy_class?
+        @is_proxy_class
+      end
+
+      attr_reader :proxy_address
+      attr_reader :proxy_port
+      attr_reader :proxy_user
+      attr_reader :proxy_pass
+    end
+
+    # True if self is a HTTP proxy class.
+    def proxy?
+      self.class.proxy_class?
+    end
+
+    # Address of proxy host. If self does not use a proxy, nil.
+    def proxy_address
+      self.class.proxy_address
+    end
+
+    # Port number of proxy host. If self does not use a proxy, nil.
+    def proxy_port
+      self.class.proxy_port
+    end
+
+    # User name for accessing proxy. If self does not use a proxy, nil.
+    def proxy_user
+      self.class.proxy_user
+    end
+
+    # User password for accessing proxy. If self does not use a proxy, nil.
+    def proxy_pass
+      self.class.proxy_pass
+    end
+
+    alias proxyaddr proxy_address   #:nodoc: obsolete
+    alias proxyport proxy_port      #:nodoc: obsolete
+
+    private
+
+    # without proxy
+
+    def conn_address
+      address()
+    end
+
+    def conn_port
+      port()
+    end
+
+    def edit_path(path)
+      path
+    end
+
+    module ProxyDelta   #:nodoc: internal use only
+      private
+
+      def conn_address
+        proxy_address()
+      end
+
+      def conn_port
+        proxy_port()
+      end
+
+      def edit_path(path)
+        use_ssl? ? path : "http://#{addr_port()}#{path}"
+      end
+    end
+
+    #
+    # HTTP operations
+    #
+
+    public
+
+    # Gets data from +path+ on the connected-to host.
+    # +header+ must be a Hash like { 'Accept' => '*/*', ... }.
+    #
+    # In version 1.1 (ruby 1.6), this method returns a pair of objects,
+    # a Net::HTTPResponse object and the entity body string.
+    # In version 1.2 (ruby 1.8), this method returns a Net::HTTPResponse
+    # object.
+    #
+    # If called with a block, yields each fragment of the
+    # entity body in turn as a string as it is read from
+    # the socket.  Note that in this case, the returned response
+    # object will *not* contain a (meaningful) body.
+    #
+    # +dest+ argument is obsolete.
+    # It still works but you must not use it.
+    #
+    # In version 1.1, this method might raise an exception for 
+    # 3xx (redirect). In this case you can get a HTTPResponse object
+    # by "anException.response".
+    #
+    # In version 1.2, this method never raises exception.
+    #
+    #     # version 1.1 (bundled with Ruby 1.6)
+    #     response, body = http.get('/index.html')
+    #
+    #     # version 1.2 (bundled with Ruby 1.8 or later)
+    #     response = http.get('/index.html')
+    #     
+    #     # using block
+    #     File.open('result.txt', 'w') {|f|
+    #       http.get('/~foo/') do |str|
+    #         f.write str
+    #       end
+    #     }
+    #
+    def get(path, initheader = nil, dest = nil, &block) # :yield: +body_segment+
+      res = nil
+      request(Get.new(path, initheader)) {|r|
+        r.read_body dest, &block
+        res = r
+      }
+      unless @newimpl
+        res.value
+        return res, res.body
+      end
+
+      res
+    end
+
+    # Gets only the header from +path+ on the connected-to host.
+    # +header+ is a Hash like { 'Accept' => '*/*', ... }.
+    # 
+    # This method returns a Net::HTTPResponse object.
+    # 
+    # In version 1.1, this method might raise an exception for 
+    # 3xx (redirect). On the case you can get a HTTPResponse object
+    # by "anException.response".
+    # In version 1.2, this method never raises an exception.
+    # 
+    #     response = nil
+    #     Net::HTTP.start('some.www.server', 80) {|http|
+    #       response = http.head('/index.html')
+    #     }
+    #     p response['content-type']
+    #
+    def head(path, initheader = nil) 
+      res = request(Head.new(path, initheader))
+      res.value unless @newimpl
+      res
+    end
+
+    # Posts +data+ (must be a String) to +path+. +header+ must be a Hash
+    # like { 'Accept' => '*/*', ... }.
+    # 
+    # In version 1.1 (ruby 1.6), this method returns a pair of objects, a
+    # Net::HTTPResponse object and an entity body string.
+    # In version 1.2 (ruby 1.8), this method returns a Net::HTTPResponse object.
+    # 
+    # If called with a block, yields each fragment of the
+    # entity body in turn as a string as it are read from
+    # the socket.  Note that in this case, the returned response
+    # object will *not* contain a (meaningful) body.
+    #
+    # +dest+ argument is obsolete.
+    # It still works but you must not use it.
+    # 
+    # In version 1.1, this method might raise an exception for 
+    # 3xx (redirect). In this case you can get an HTTPResponse object
+    # by "anException.response".
+    # In version 1.2, this method never raises exception.
+    # 
+    #     # version 1.1
+    #     response, body = http.post('/cgi-bin/search.rb', 'query=foo')
+    # 
+    #     # version 1.2
+    #     response = http.post('/cgi-bin/search.rb', 'query=foo')
+    # 
+    #     # using block
+    #     File.open('result.txt', 'w') {|f|
+    #       http.post('/cgi-bin/search.rb', 'query=foo') do |str|
+    #         f.write str
+    #       end
+    #     }
+    #
+    # You should set Content-Type: header field for POST.
+    # If no Content-Type: field given, this method uses
+    # "application/x-www-form-urlencoded" by default.
+    #
+    def post(path, data, initheader = nil, dest = nil, &block) # :yield: +body_segment+
+      res = nil
+      request(Post.new(path, initheader), data) {|r|
+        r.read_body dest, &block
+        res = r
+      }
+      unless @newimpl
+        res.value
+        return res, res.body
+      end
+      res
+    end
+
+    def put(path, data, initheader = nil)   #:nodoc:
+      res = request(Put.new(path, initheader), data)
+      res.value unless @newimpl
+      res
+    end
+
+    # Sends a PROPPATCH request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    def proppatch(path, body, initheader = nil)
+      request(Proppatch.new(path, initheader), body)
+    end
+
+    # Sends a LOCK request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    def lock(path, body, initheader = nil)
+      request(Lock.new(path, initheader), body)
+    end
+
+    # Sends a UNLOCK request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    def unlock(path, body, initheader = nil)
+      request(Unlock.new(path, initheader), body)
+    end
+
+    # Sends a OPTIONS request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    def options(path, initheader = nil)
+      request(Options.new(path, initheader))
+    end
+
+    # Sends a PROPFIND request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    def propfind(path, body = nil, initheader = {'Depth' => '0'})
+      request(Propfind.new(path, initheader), body)
+    end
+
+    # Sends a DELETE request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    def delete(path, initheader = {'Depth' => 'Infinity'})
+      request(Delete.new(path, initheader))
+    end
+
+    # Sends a MOVE request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    def move(path, initheader = nil)
+      request(Move.new(path, initheader))
+    end
+
+    # Sends a COPY request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    def copy(path, initheader = nil)
+      request(Copy.new(path, initheader))
+    end
+
+    # Sends a MKCOL request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    def mkcol(path, body = nil, initheader = nil)
+      request(Mkcol.new(path, initheader), body)
+    end
+
+    # Sends a TRACE request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    def trace(path, initheader = nil)
+      request(Trace.new(path, initheader))
+    end
+
+    # Sends a GET request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    # 
+    # When called with a block, yields an HTTPResponse object.
+    # The body of this response will not have been read yet;
+    # the caller can process it using HTTPResponse#read_body,
+    # if desired.
+    #
+    # Returns the response.
+    # 
+    # This method never raises Net::* exceptions.
+    # 
+    #     response = http.request_get('/index.html')
+    #     # The entity body is already read here.
+    #     p response['content-type']
+    #     puts response.body
+    # 
+    #     # using block
+    #     http.request_get('/index.html') {|response|
+    #       p response['content-type']
+    #       response.read_body do |str|   # read body now
+    #         print str
+    #       end
+    #     }
+    #
+    def request_get(path, initheader = nil, &block) # :yield: +response+
+      request(Get.new(path, initheader), &block)
+    end
+
+    # Sends a HEAD request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    #
+    # Returns the response.
+    # 
+    # This method never raises Net::* exceptions.
+    # 
+    #     response = http.request_head('/index.html')
+    #     p response['content-type']
+    #
+    def request_head(path, initheader = nil, &block)
+      request(Head.new(path, initheader), &block)
+    end
+
+    # Sends a POST request to the +path+ and gets a response,
+    # as an HTTPResponse object.
+    # 
+    # When called with a block, yields an HTTPResponse object.
+    # The body of this response will not have been read yet;
+    # the caller can process it using HTTPResponse#read_body,
+    # if desired.
+    #
+    # Returns the response.
+    # 
+    # This method never raises Net::* exceptions.
+    # 
+    #     # example
+    #     response = http.request_post('/cgi-bin/nice.rb', 'datadatadata...')
+    #     p response.status
+    #     puts response.body          # body is already read
+    # 
+    #     # using block
+    #     http.request_post('/cgi-bin/nice.rb', 'datadatadata...') {|response|
+    #       p response.status
+    #       p response['content-type']
+    #       response.read_body do |str|   # read body now
+    #         print str
+    #       end
+    #     }
+    #
+    def request_post(path, data, initheader = nil, &block) # :yield: +response+
+      request Post.new(path, initheader), data, &block
+    end
+
+    def request_put(path, data, initheader = nil, &block)   #:nodoc:
+      request Put.new(path, initheader), data, &block
+    end
+
+    alias get2   request_get    #:nodoc: obsolete
+    alias head2  request_head   #:nodoc: obsolete
+    alias post2  request_post   #:nodoc: obsolete
+    alias put2   request_put    #:nodoc: obsolete
+
+
+    # Sends an HTTP request to the HTTP server.
+    # This method also sends DATA string if DATA is given.
+    #
+    # Returns a HTTPResponse object.
+    # 
+    # This method never raises Net::* exceptions.
+    #
+    #    response = http.send_request('GET', '/index.html')
+    #    puts response.body
+    #
+    def send_request(name, path, data = nil, header = nil)
+      r = HTTPGenericRequest.new(name,(data ? true : false),true,path,header)
+      request r, data
+    end
+
+    # Sends an HTTPRequest object REQUEST to the HTTP server.
+    # This method also sends DATA string if REQUEST is a post/put request.
+    # Giving DATA for get/head request causes ArgumentError.
+    # 
+    # When called with a block, yields an HTTPResponse object.
+    # The body of this response will not have been read yet;
+    # the caller can process it using HTTPResponse#read_body,
+    # if desired.
+    #
+    # Returns a HTTPResponse object.
+    # 
+    # This method never raises Net::* exceptions.
+    #
+    def request(req, body = nil, &block)  # :yield: +response+
+      unless started?
+        start {
+          req['connection'] ||= 'close'
+          return request(req, body, &block)
+        }
+      end
+      if proxy_user()
+        unless use_ssl?
+          req.proxy_basic_auth proxy_user(), proxy_pass()
+        end
+      end
+
+      req.set_body_internal body
+      begin_transport req
+        req.exec @socket, @curr_http_version, edit_path(req.path)
+        begin
+          res = HTTPResponse.read_new(@socket)
+        end while res.kind_of?(HTTPContinue)
+        res.reading_body(@socket, req.response_body_permitted?) {
+          yield res if block_given?
+        }
+      end_transport req, res
+
+      res
+    end
+
+    private
+
+    def begin_transport(req)
+      if @socket.closed?
+        connect
+      end
+      if @seems_1_0_server
+        req['connection'] ||= 'close'
+      end
+      if not req.response_body_permitted? and @close_on_empty_response
+        req['connection'] ||= 'close'
+      end
+      req['host'] ||= addr_port()
+    end
+
+    def end_transport(req, res)
+      @curr_http_version = res.http_version
+      if not res.body and @close_on_empty_response
+        D 'Conn close'
+        @socket.close
+      elsif keep_alive?(req, res)
+        D 'Conn keep-alive'
+        if @socket.closed?
+          D 'Conn (but seems 1.0 server)'
+          @seems_1_0_server = true
+        end
+      else
+        D 'Conn close'
+        @socket.close
+      end
+    end
+
+    def keep_alive?(req, res)
+      return false if /close/i =~ req['connection'].to_s
+      return false if @seems_1_0_server
+      return true  if /keep-alive/i =~ res['connection'].to_s
+      return false if /close/i      =~ res['connection'].to_s
+      return true  if /keep-alive/i =~ res['proxy-connection'].to_s
+      return false if /close/i      =~ res['proxy-connection'].to_s
+      (@curr_http_version == '1.1')
+    end
+
+    #
+    # utils
+    #
+
+    private
+
+    def addr_port
+      if use_ssl?
+        address() + (port == HTTP.https_default_port ? '' : ":#{port()}")
+      else
+        address() + (port == HTTP.http_default_port ? '' : ":#{port()}")
+      end
+    end
+
+    def D(msg)
+      return unless @debug_output
+      @debug_output << msg
+      @debug_output << "\n"
+    end
+
+  end
+
+  HTTPSession = HTTP
+
+
+  #
+  # Header module.
+  #
+  # Provides access to @header in the mixed-into class as a hash-like
+  # object, except with case-insensitive keys.  Also provides
+  # methods for accessing commonly-used header values in a more
+  # convenient format.
+  #
+  module HTTPHeader
+
+    def initialize_http_header(initheader)
+      @header = {}
+      return unless initheader
+      initheader.each do |key, value|
+        warn "net/http: warning: duplicated HTTP header: #{key}" if key?(key) and $VERBOSE
+        @header[key.downcase] = [value.strip]
+      end
+    end
+
+    def size   #:nodoc: obsolete
+      @header.size
+    end
+
+    alias length size   #:nodoc: obsolete
+
+    # Returns the header field corresponding to the case-insensitive key.
+    # For example, a key of "Content-Type" might return "text/html"
+    def [](key)
+      a = @header[key.downcase] or return nil
+      a.join(', ')
+    end
+
+    # Sets the header field corresponding to the case-insensitive key.
+    def []=(key, val)
+      unless val
+        @header.delete key.downcase
+        return val
+      end
+      @header[key.downcase] = [val]
+    end
+
+    # [Ruby 1.8.3]
+    # Adds header field instead of replace.
+    # Second argument +val+ must be a String.
+    # See also #[]=, #[] and #get_fields.
+    #
+    #   request.add_field 'X-My-Header', 'a'
+    #   p request['X-My-Header']              #=> "a"
+    #   p request.get_fields('X-My-Header')   #=> ["a"]
+    #   request.add_field 'X-My-Header', 'b'
+    #   p request['X-My-Header']              #=> "a, b"
+    #   p request.get_fields('X-My-Header')   #=> ["a", "b"]
+    #   request.add_field 'X-My-Header', 'c'
+    #   p request['X-My-Header']              #=> "a, b, c"
+    #   p request.get_fields('X-My-Header')   #=> ["a", "b", "c"]
+    #
+    def add_field(key, val)
+      if @header.key?(key.downcase)
+        @header[key.downcase].push val
+      else
+        @header[key.downcase] = [val]
+      end
+    end
+
+    # [Ruby 1.8.3]
+    # Returns an array of header field strings corresponding to the
+    # case-insensitive +key+.  This method allows you to get duplicated
+    # header fields without any processing.  See also #[].
+    #
+    #   p response.get_fields('Set-Cookie')
+    #     #=> ["session=al98axx; expires=Fri, 31-Dec-1999 23:58:23",
+    #          "query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"]
+    #   p response['Set-Cookie']
+    #     #=> "session=al98axx; expires=Fri, 31-Dec-1999 23:58:23, query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"
+    #
+    def get_fields(key)
+      return nil unless @header[key.downcase]
+      @header[key.downcase].dup
+    end
+
+    # Returns the header field corresponding to the case-insensitive key.
+    # Returns the default value +args+, or the result of the block, or nil,
+    # if there's no header field named key.  See Hash#fetch
+    def fetch(key, *args, &block)   #:yield: +key+
+      a = @header.fetch(key.downcase, *args, &block)
+      a.join(', ')
+    end
+
+    # Iterates for each header names and values.
+    def each_header   #:yield: +key+, +value+
+      @header.each do |k,va|
+        yield k, va.join(', ')
+      end
+    end
+
+    alias each each_header
+
+    # Iterates for each header names.
+    def each_name(&block)   #:yield: +key+
+      @header.each_key(&block)
+    end
+
+    alias each_key each_name
+
+    # Iterates for each capitalized header names.
+    def each_capitalized_name(&block)   #:yield: +key+
+      @header.each_key do |k|
+        yield capitalize(k)
+      end
+    end
+
+    # Iterates for each header values.
+    def each_value   #:yield: +value+
+      @header.each_value do |va|
+        yield va.join(', ')
+      end
+    end
+
+    # Removes a header field.
+    def delete(key)
+      @header.delete(key.downcase)
+    end
+
+    # true if +key+ header exists.
+    def key?(key)
+      @header.key?(key.downcase)
+    end
+
+    # Returns a Hash consist of header names and values.
+    def to_hash
+      @header.dup
+    end
+
+    # As for #each_header, except the keys are provided in capitalized form.
+    def each_capitalized
+      @header.each do |k,v|
+        yield capitalize(k), v.join(', ')
+      end
+    end
+
+    alias canonical_each each_capitalized
+
+    def capitalize(name)
+      name.split(/-/).map {|s| s.capitalize }.join('-')
+    end
+    private :capitalize
+
+    # Returns an Array of Range objects which represents Range: header field,
+    # or +nil+ if there is no such header.
+    def range
+      return nil unless @header['range']
+      self['Range'].split(/,/).map {|spec|
+        m = /bytes\s*=\s*(\d+)?\s*-\s*(\d+)?/i.match(spec) or
+                raise HTTPHeaderSyntaxError, "wrong Range: #{spec}"
+        d1 = m[1].to_i
+        d2 = m[2].to_i
+        if    m[1] and m[2] then  d1..d2
+        elsif m[1]          then  d1..-1
+        elsif          m[2] then -d2..-1
+        else
+          raise HTTPHeaderSyntaxError, 'range is not specified'
+        end
+      }
+    end
+
+    # Set Range: header from Range (arg r) or beginning index and
+    # length from it (arg idx&len).
+    #
+    #   req.range = (0..1023)
+    #   req.set_range 0, 1023
+    #
+    def set_range(r, e = nil)
+      unless r
+        @header.delete 'range'
+        return r
+      end
+      r = (r...r+e) if e
+      case r
+      when Numeric
+        n = r.to_i
+        rangestr = (n > 0 ? "0-#{n-1}" : "-#{-n}")
+      when Range
+        first = r.first
+        last = r.last
+        last -= 1 if r.exclude_end?
+        if last == -1
+          rangestr = (first > 0 ? "#{first}-" : "-#{-first}")
+        else
+          raise HTTPHeaderSyntaxError, 'range.first is negative' if first < 0
+          raise HTTPHeaderSyntaxError, 'range.last is negative' if last < 0
+          raise HTTPHeaderSyntaxError, 'must be .first < .last' if first > last
+          rangestr = "#{first}-#{last}"
+        end
+      else
+        raise TypeError, 'Range/Integer is required'
+      end
+      @header['range'] = ["bytes=#{rangestr}"]
+      r
+    end
+
+    alias range= set_range
+
+    # Returns an Integer object which represents the Content-Length: header field
+    # or +nil+ if that field is not provided.
+    def content_length
+      return nil unless key?('Content-Length')
+      len = self['Content-Length'].slice(/\d+/) or
+          raise HTTPHeaderSyntaxError, 'wrong Content-Length format'
+      len.to_i
+    end
+    
+    def content_length=(len)
+      unless len
+        @header.delete 'content-length'
+        return nil
+      end
+      @header['content-length'] = [len.to_i.to_s]
+    end
+
+    # Returns "true" if the "transfer-encoding" header is present and
+    # set to "chunked".  This is an HTTP/1.1 feature, allowing the 
+    # the content to be sent in "chunks" without at the outset
+    # stating the entire content length.
+    def chunked?
+      return false unless @header['transfer-encoding']
+      field = self['Transfer-Encoding']
+      (/(?:\A|[^\-\w])chunked(?![\-\w])/i =~ field) ? true : false
+    end
+
+    # Returns a Range object which represents Content-Range: header field.
+    # This indicates, for a partial entity body, where this fragment
+    # fits inside the full entity body, as range of byte offsets.
+    def content_range
+      return nil unless @header['content-range']
+      m = %r<bytes\s+(\d+)-(\d+)/(\d+|\*)>i.match(self['Content-Range']) or
+          raise HTTPHeaderSyntaxError, 'wrong Content-Range format'
+      m[1].to_i .. m[2].to_i + 1
+    end
+
+    # The length of the range represented in Content-Range: header.
+    def range_length
+      r = content_range() or return nil
+      r.end - r.begin
+    end
+
+    # Returns a content type string such as "text/html".
+    # This method returns nil if Content-Type: header field does not exist.
+    def content_type
+      return nil unless main_type()
+      if sub_type()
+      then "#{main_type()}/#{sub_type()}"
+      else main_type()
+      end
+    end
+
+    # Returns a content type string such as "text".
+    # This method returns nil if Content-Type: header field does not exist.
+    def main_type
+      return nil unless @header['content-type']
+      self['Content-Type'].split(';').first.to_s.split('/')[0].to_s.strip
+    end
+    
+    # Returns a content type string such as "html".
+    # This method returns nil if Content-Type: header field does not exist
+    # or sub-type is not given (e.g. "Content-Type: text").
+    def sub_type
+      return nil unless @header['content-type']
+      main, sub = *self['Content-Type'].split(';').first.to_s.split('/')
+      return nil unless sub
+      sub.strip
+    end
+
+    # Returns content type parameters as a Hash as like
+    # {"charset" => "iso-2022-jp"}.
+    def type_params
+      result = {}
+      list = self['Content-Type'].to_s.split(';')
+      list.shift
+      list.each do |param|
+        k, v = *param.split('=', 2)
+        result[k.strip] = v.strip
+      end
+      result
+    end
+
+    # Set Content-Type: header field by +type+ and +params+.
+    # +type+ must be a String, +params+ must be a Hash.
+    def set_content_type(type, params = {})
+      @header['content-type'] = [type + params.map{|k,v|"; #{k}=#{v}"}.join('')]
+    end
+
+    alias content_type= set_content_type
+
+    # Set header fields and a body from HTML form data.
+    # +params+ should be a Hash containing HTML form data.
+    # Optional argument +sep+ means data record separator.
+    #
+    # This method also set Content-Type: header field to
+    # application/x-www-form-urlencoded.
+    def set_form_data(params, sep = '&')
+      self.body = params.map {|k,v| "#{urlencode(k.to_s)}=#{urlencode(v.to_s)}" }.join(sep)
+      self.content_type = 'application/x-www-form-urlencoded'
+    end
+
+    alias form_data= set_form_data
+
+    def urlencode(str)
+      str.gsub(/[^a-zA-Z0-9_\.\-]/n) {|s| sprintf('%%%02x', s[0]) }
+    end
+    private :urlencode
+
+    # Set the Authorization: header for "Basic" authorization.
+    def basic_auth(account, password)
+      @header['authorization'] = [basic_encode(account, password)]
+    end
+
+    # Set Proxy-Authorization: header for "Basic" authorization.
+    def proxy_basic_auth(account, password)
+      @header['proxy-authorization'] = [basic_encode(account, password)]
+    end
+
+    def basic_encode(account, password)
+      'Basic ' + ["#{account}:#{password}"].pack('m').delete("\r\n")
+    end
+    private :basic_encode
+
+  end
+
+
+  #
+  # Parent of HTTPRequest class.  Do not use this directly; use
+  # a subclass of HTTPRequest.
+  #
+  # Mixes in the HTTPHeader module.
+  #
+  class HTTPGenericRequest
+
+    include HTTPHeader
+
+    def initialize(m, reqbody, resbody, path, initheader = nil)
+      @method = m
+      @request_has_body = reqbody
+      @response_has_body = resbody
+      raise ArgumentError, "HTTP request path is empty" if path.empty?
+      @path = path
+      initialize_http_header initheader
+      self['Accept'] ||= '*/*'
+      @body = nil
+      @body_stream = nil
+    end
+
+    attr_reader :method
+    attr_reader :path
+
+    def inspect
+      "\#<#{self.class} #{@method}>"
+    end
+
+    def request_body_permitted?
+      @request_has_body
+    end
+
+    def response_body_permitted?
+      @response_has_body
+    end
+
+    def body_exist?
+      warn "Net::HTTPRequest#body_exist? is obsolete; use response_body_permitted?" if $VERBOSE
+      response_body_permitted?
+    end
+
+    attr_reader :body
+
+    def body=(str)
+      @body = str
+      @body_stream = nil
+      str
+    end
+
+    attr_reader :body_stream
+
+    def body_stream=(input)
+      @body = nil
+      @body_stream = input
+      input
+    end
+
+    def set_body_internal(str)   #:nodoc: internal use only
+      raise ArgumentError, "both of body argument and HTTPRequest#body set" if str and (@body or @body_stream)
+      self.body = str if str
+    end
+
+    #
+    # write
+    #
+
+    def exec(sock, ver, path)   #:nodoc: internal use only
+      if @body
+        send_request_with_body sock, ver, path, @body
+      elsif @body_stream
+        send_request_with_body_stream sock, ver, path, @body_stream
+      else
+        write_header sock, ver, path
+      end
+    end
+
+    private
+
+    def send_request_with_body(sock, ver, path, body)
+      self.content_length = body.length
+      delete 'Transfer-Encoding'
+      supply_default_content_type
+      write_header sock, ver, path
+      sock.write body
+    end
+
+    def send_request_with_body_stream(sock, ver, path, f)
+      unless content_length() or chunked?
+        raise ArgumentError,
+            "Content-Length not given and Transfer-Encoding is not `chunked'"
+      end
+      supply_default_content_type
+      write_header sock, ver, path
+      if chunked?
+        while s = f.read(1024)
+          sock.write(sprintf("%x\r\n", s.length) << s << "\r\n")
+        end
+        sock.write "0\r\n\r\n"
+      else
+        while s = f.read(1024)
+          sock.write s
+        end
+      end
+    end
+
+    def supply_default_content_type
+      return if content_type()
+      warn 'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded' if $VERBOSE
+      set_content_type 'application/x-www-form-urlencoded'
+    end
+
+    def write_header(sock, ver, path)
+      buf = "#{@method} #{path} HTTP/#{ver}\r\n"
+      each_capitalized do |k,v|
+        buf << "#{k}: #{v}\r\n"
+      end
+      buf << "\r\n"
+      sock.write buf
+    end
+  
+  end
+
+
+  # 
+  # HTTP request class. This class wraps request header and entity path.
+  # You *must* use its subclass, Net::HTTP::Get, Post, Head.
+  # 
+  class HTTPRequest < HTTPGenericRequest
+
+    # Creates HTTP request object.
+    def initialize(path, initheader = nil)
+      super self.class::METHOD,
+            self.class::REQUEST_HAS_BODY,
+            self.class::RESPONSE_HAS_BODY,
+            path, initheader
+    end
+  end
+
+
+  class HTTP   # reopen
+    #
+    # HTTP 1.1 methods --- RFC2616
+    #
+
+    class Get < HTTPRequest
+      METHOD = 'GET'
+      REQUEST_HAS_BODY  = false
+      RESPONSE_HAS_BODY = true
+    end
+
+    class Head < HTTPRequest
+      METHOD = 'HEAD'
+      REQUEST_HAS_BODY = false
+      RESPONSE_HAS_BODY = false
+    end
+
+    class Post < HTTPRequest
+      METHOD = 'POST'
+      REQUEST_HAS_BODY = true
+      RESPONSE_HAS_BODY = true
+    end
+
+    class Put < HTTPRequest
+      METHOD = 'PUT'
+      REQUEST_HAS_BODY = true
+      RESPONSE_HAS_BODY = true
+    end
+
+    class Delete < HTTPRequest
+      METHOD = 'DELETE'
+      REQUEST_HAS_BODY = false
+      RESPONSE_HAS_BODY = true
+    end
+
+    class Options < HTTPRequest
+      METHOD = 'OPTIONS'
+      REQUEST_HAS_BODY = false
+      RESPONSE_HAS_BODY = false
+    end
+
+    class Trace < HTTPRequest
+      METHOD = 'TRACE'
+      REQUEST_HAS_BODY = false
+      RESPONSE_HAS_BODY = true
+    end
+
+    #
+    # WebDAV methods --- RFC2518
+    #
+
+    class Propfind < HTTPRequest
+      METHOD = 'PROPFIND'
+      REQUEST_HAS_BODY = true
+      RESPONSE_HAS_BODY = true
+    end
+
+    class Proppatch < HTTPRequest
+      METHOD = 'PROPPATCH'
+      REQUEST_HAS_BODY = true
+      RESPONSE_HAS_BODY = true
+    end
+
+    class Mkcol < HTTPRequest
+      METHOD = 'MKCOL'
+      REQUEST_HAS_BODY = true
+      RESPONSE_HAS_BODY = true
+    end
+
+    class Copy < HTTPRequest
+      METHOD = 'COPY'
+      REQUEST_HAS_BODY = false
+      RESPONSE_HAS_BODY = true
+    end
+
+    class Move < HTTPRequest
+      METHOD = 'MOVE'
+      REQUEST_HAS_BODY = false
+      RESPONSE_HAS_BODY = true
+    end
+
+    class Lock < HTTPRequest
+      METHOD = 'LOCK'
+      REQUEST_HAS_BODY = true
+      RESPONSE_HAS_BODY = true
+    end
+
+    class Unlock < HTTPRequest
+      METHOD = 'UNLOCK'
+      REQUEST_HAS_BODY = true
+      RESPONSE_HAS_BODY = true
+    end
+  end
+
+
+  ###
+  ### Response
+  ###
+
+  # HTTP exception class.
+  # You must use its subclasses.
+  module HTTPExceptions
+    def initialize(msg, res)   #:nodoc:
+      super msg
+      @response = res
+    end
+    attr_reader :response
+    alias data response    #:nodoc: obsolete
+  end
+  class HTTPError < ProtocolError
+    include HTTPExceptions
+  end
+  class HTTPRetriableError < ProtoRetriableError
+    include HTTPExceptions
+  end
+  class HTTPServerException < ProtoServerError
+    # We cannot use the name "HTTPServerError", it is the name of the response.
+    include HTTPExceptions
+  end
+  class HTTPFatalError < ProtoFatalError
+    include HTTPExceptions
+  end
+
+
+  # HTTP response class. This class wraps response header and entity.
+  # Mixes in the HTTPHeader module, which provides access to response
+  # header values both via hash-like methods and individual readers.
+  # Note that each possible HTTP response code defines its own 
+  # HTTPResponse subclass.  These are listed below.
+  # All classes are
+  # defined under the Net module. Indentation indicates inheritance.
+  # 
+  #   xxx        HTTPResponse
+  # 
+  #     1xx        HTTPInformation
+  #       100        HTTPContinue    
+  #       101        HTTPSwitchProtocol
+  # 
+  #     2xx        HTTPSuccess
+  #       200        HTTPOK
+  #       201        HTTPCreated
+  #       202        HTTPAccepted
+  #       203        HTTPNonAuthoritativeInformation
+  #       204        HTTPNoContent
+  #       205        HTTPResetContent
+  #       206        HTTPPartialContent
+  # 
+  #     3xx        HTTPRedirection
+  #       300        HTTPMultipleChoice
+  #       301        HTTPMovedPermanently
+  #       302        HTTPFound
+  #       303        HTTPSeeOther
+  #       304        HTTPNotModified
+  #       305        HTTPUseProxy
+  #       307        HTTPTemporaryRedirect
+  # 
+  #     4xx        HTTPClientError
+  #       400        HTTPBadRequest
+  #       401        HTTPUnauthorized
+  #       402        HTTPPaymentRequired
+  #       403        HTTPForbidden
+  #       404        HTTPNotFound
+  #       405        HTTPMethodNotAllowed
+  #       406        HTTPNotAcceptable
+  #       407        HTTPProxyAuthenticationRequired
+  #       408        HTTPRequestTimeOut
+  #       409        HTTPConflict
+  #       410        HTTPGone
+  #       411        HTTPLengthRequired
+  #       412        HTTPPreconditionFailed
+  #       413        HTTPRequestEntityTooLarge
+  #       414        HTTPRequestURITooLong
+  #       415        HTTPUnsupportedMediaType
+  #       416        HTTPRequestedRangeNotSatisfiable
+  #       417        HTTPExpectationFailed
+  # 
+  #     5xx        HTTPServerError
+  #       500        HTTPInternalServerError
+  #       501        HTTPNotImplemented
+  #       502        HTTPBadGateway
+  #       503        HTTPServiceUnavailable
+  #       504        HTTPGatewayTimeOut
+  #       505        HTTPVersionNotSupported
+  # 
+  #     xxx        HTTPUnknownResponse
+  #
+  class HTTPResponse
+    # true if the response has body.
+    def HTTPResponse.body_permitted?
+      self::HAS_BODY
+    end
+
+    def HTTPResponse.exception_type   # :nodoc: internal use only
+      self::EXCEPTION_TYPE
+    end
+  end   # reopened after
+
+  # :stopdoc:
+
+  class HTTPUnknownResponse < HTTPResponse
+    HAS_BODY = true
+    EXCEPTION_TYPE = HTTPError
+  end
+  class HTTPInformation < HTTPResponse           # 1xx
+    HAS_BODY = false
+    EXCEPTION_TYPE = HTTPError
+  end
+  class HTTPSuccess < HTTPResponse               # 2xx
+    HAS_BODY = true
+    EXCEPTION_TYPE = HTTPError
+  end
+  class HTTPRedirection < HTTPResponse           # 3xx
+    HAS_BODY = true
+    EXCEPTION_TYPE = HTTPRetriableError
+  end
+  class HTTPClientError < HTTPResponse           # 4xx
+    HAS_BODY = true
+    EXCEPTION_TYPE = HTTPServerException   # for backward compatibility
+  end
+  class HTTPServerError < HTTPResponse           # 5xx
+    HAS_BODY = true
+    EXCEPTION_TYPE = HTTPFatalError    # for backward compatibility
+  end
+
+  class HTTPContinue < HTTPInformation           # 100
+    HAS_BODY = false
+  end
+  class HTTPSwitchProtocol < HTTPInformation     # 101
+    HAS_BODY = false
+  end
+
+  class HTTPOK < HTTPSuccess                            # 200
+    HAS_BODY = true
+  end
+  class HTTPCreated < HTTPSuccess                       # 201
+    HAS_BODY = true
+  end
+  class HTTPAccepted < HTTPSuccess                      # 202
+    HAS_BODY = true
+  end
+  class HTTPNonAuthoritativeInformation < HTTPSuccess   # 203
+    HAS_BODY = true
+  end
+  class HTTPNoContent < HTTPSuccess                     # 204
+    HAS_BODY = false
+  end
+  class HTTPResetContent < HTTPSuccess                  # 205
+    HAS_BODY = false
+  end
+  class HTTPPartialContent < HTTPSuccess                # 206
+    HAS_BODY = true
+  end
+
+  class HTTPMultipleChoice < HTTPRedirection     # 300
+    HAS_BODY = true
+  end
+  class HTTPMovedPermanently < HTTPRedirection   # 301
+    HAS_BODY = true
+  end
+  class HTTPFound < HTTPRedirection              # 302
+    HAS_BODY = true
+  end
+  HTTPMovedTemporarily = HTTPFound
+  class HTTPSeeOther < HTTPRedirection           # 303
+    HAS_BODY = true
+  end
+  class HTTPNotModified < HTTPRedirection        # 304
+    HAS_BODY = false
+  end
+  class HTTPUseProxy < HTTPRedirection           # 305
+    HAS_BODY = false
+  end
+  # 306 unused
+  class HTTPTemporaryRedirect < HTTPRedirection  # 307
+    HAS_BODY = true
+  end
+
+  class HTTPBadRequest < HTTPClientError                    # 400
+    HAS_BODY = true
+  end
+  class HTTPUnauthorized < HTTPClientError                  # 401
+    HAS_BODY = true
+  end
+  class HTTPPaymentRequired < HTTPClientError               # 402
+    HAS_BODY = true
+  end
+  class HTTPForbidden < HTTPClientError                     # 403
+    HAS_BODY = true
+  end
+  class HTTPNotFound < HTTPClientError                      # 404
+    HAS_BODY = true
+  end
+  class HTTPMethodNotAllowed < HTTPClientError              # 405
+    HAS_BODY = true
+  end
+  class HTTPNotAcceptable < HTTPClientError                 # 406
+    HAS_BODY = true
+  end
+  class HTTPProxyAuthenticationRequired < HTTPClientError   # 407
+    HAS_BODY = true
+  end
+  class HTTPRequestTimeOut < HTTPClientError                # 408
+    HAS_BODY = true
+  end
+  class HTTPConflict < HTTPClientError                      # 409
+    HAS_BODY = true
+  end
+  class HTTPGone < HTTPClientError                          # 410
+    HAS_BODY = true
+  end
+  class HTTPLengthRequired < HTTPClientError                # 411
+    HAS_BODY = true
+  end
+  class HTTPPreconditionFailed < HTTPClientError            # 412
+    HAS_BODY = true
+  end
+  class HTTPRequestEntityTooLarge < HTTPClientError         # 413
+    HAS_BODY = true
+  end
+  class HTTPRequestURITooLong < HTTPClientError             # 414
+    HAS_BODY = true
+  end
+  HTTPRequestURITooLarge = HTTPRequestURITooLong
+  class HTTPUnsupportedMediaType < HTTPClientError          # 415
+    HAS_BODY = true
+  end
+  class HTTPRequestedRangeNotSatisfiable < HTTPClientError  # 416
+    HAS_BODY = true
+  end
+  class HTTPExpectationFailed < HTTPClientError             # 417
+    HAS_BODY = true
+  end
+
+  class HTTPInternalServerError < HTTPServerError   # 500
+    HAS_BODY = true
+  end
+  class HTTPNotImplemented < HTTPServerError        # 501
+    HAS_BODY = true
+  end
+  class HTTPBadGateway < HTTPServerError            # 502
+    HAS_BODY = true
+  end
+  class HTTPServiceUnavailable < HTTPServerError    # 503
+    HAS_BODY = true
+  end
+  class HTTPGatewayTimeOut < HTTPServerError        # 504
+    HAS_BODY = true
+  end
+  class HTTPVersionNotSupported < HTTPServerError   # 505
+    HAS_BODY = true
+  end
+
+  # :startdoc:
+
+
+  class HTTPResponse   # reopen
+
+    CODE_CLASS_TO_OBJ = {
+      '1' => HTTPInformation,
+      '2' => HTTPSuccess,
+      '3' => HTTPRedirection,
+      '4' => HTTPClientError,
+      '5' => HTTPServerError
+    }
+    CODE_TO_OBJ = {
+      '100' => HTTPContinue,
+      '101' => HTTPSwitchProtocol,
+
+      '200' => HTTPOK,
+      '201' => HTTPCreated,
+      '202' => HTTPAccepted,
+      '203' => HTTPNonAuthoritativeInformation,
+      '204' => HTTPNoContent,
+      '205' => HTTPResetContent,
+      '206' => HTTPPartialContent,
+
+      '300' => HTTPMultipleChoice,
+      '301' => HTTPMovedPermanently,
+      '302' => HTTPFound,
+      '303' => HTTPSeeOther,
+      '304' => HTTPNotModified,
+      '305' => HTTPUseProxy,
+      '307' => HTTPTemporaryRedirect,
+
+      '400' => HTTPBadRequest,
+      '401' => HTTPUnauthorized,
+      '402' => HTTPPaymentRequired,
+      '403' => HTTPForbidden,
+      '404' => HTTPNotFound,
+      '405' => HTTPMethodNotAllowed,
+      '406' => HTTPNotAcceptable,
+      '407' => HTTPProxyAuthenticationRequired,
+      '408' => HTTPRequestTimeOut,
+      '409' => HTTPConflict,
+      '410' => HTTPGone,
+      '411' => HTTPLengthRequired,
+      '412' => HTTPPreconditionFailed,
+      '413' => HTTPRequestEntityTooLarge,
+      '414' => HTTPRequestURITooLong,
+      '415' => HTTPUnsupportedMediaType,
+      '416' => HTTPRequestedRangeNotSatisfiable,
+      '417' => HTTPExpectationFailed,
+
+      '500' => HTTPInternalServerError,
+      '501' => HTTPNotImplemented,
+      '502' => HTTPBadGateway,
+      '503' => HTTPServiceUnavailable,
+      '504' => HTTPGatewayTimeOut,
+      '505' => HTTPVersionNotSupported
+    }
+
+    class << HTTPResponse
+      def read_new(sock)   #:nodoc: internal use only
+        httpv, code, msg = read_status_line(sock)
+        res = response_class(code).new(httpv, code, msg)
+        each_response_header(sock) do |k,v|
+          res.add_field k, v
+        end
+        res
+      end
+
+      private
+
+      def read_status_line(sock)
+        str = sock.readline
+        m = /\AHTTP(?:\/(\d+\.\d+))?\s+(\d\d\d)\s*(.*)\z/in.match(str) or
+          raise HTTPBadResponse, "wrong status line: #{str.dump}"
+        m.captures
+      end
+
+      def response_class(code)
+        CODE_TO_OBJ[code] or
+        CODE_CLASS_TO_OBJ[code[0,1]] or
+        HTTPUnknownResponse
+      end
+
+      def each_response_header(sock)
+        while true
+          line = sock.readuntil("\n", true).sub(/\s+\z/, '')
+          break if line.empty?
+          m = /\A([^:]+):\s*/.match(line) or
+              raise HTTPBadResponse, 'wrong header line format'
+          yield m[1], m.post_match
+        end
+      end
+    end
+
+    # next is to fix bug in RDoc, where the private inside class << self
+    # spills out.
+    public 
+
+    include HTTPHeader
+
+    def initialize(httpv, code, msg)   #:nodoc: internal use only
+      @http_version = httpv
+      @code         = code
+      @message      = msg
+      initialize_http_header nil
+      @body = nil
+      @read = false
+    end
+
+    # The HTTP version supported by the server.
+    attr_reader :http_version
+
+    # HTTP result code string. For example, '302'.  You can also
+    # determine the response type by which response subclass the
+    # response object is an instance of.
+    attr_reader :code
+
+    # HTTP result message. For example, 'Not Found'.
+    attr_reader :message
+    alias msg message   # :nodoc: obsolete
+
+    def inspect
+      "#<#{self.class} #{@code} #{@message} readbody=#{@read}>"
+    end
+
+    # For backward compatibility.
+    # To allow Net::HTTP 1.1 style assignment
+    # e.g.
+    #    response, body = Net::HTTP.get(....)
+    # 
+    def to_ary
+      warn "net/http.rb: warning: Net::HTTP v1.1 style assignment found at #{caller(1)[0]}; use `response = http.get(...)' instead." if $VERBOSE
+      res = self.dup
+      class << res
+        undef to_ary
+      end
+      [res, res.body]
+    end
+
+    #
+    # response <-> exception relationship
+    #
+
+    def code_type   #:nodoc:
+      self.class
+    end
+
+    def error!   #:nodoc:
+      raise error_type().new(@code + ' ' + @message.dump, self)
+    end
+
+    def error_type   #:nodoc:
+      self.class::EXCEPTION_TYPE
+    end
+
+    # Raises HTTP error if the response is not 2xx.
+    def value
+      error! unless self.kind_of?(HTTPSuccess)
+    end
+
+    #
+    # header (for backward compatibility only; DO NOT USE)
+    #
+
+    def response   #:nodoc:
+      warn "#{caller(1)[0]}: warning: HTTPResponse#response is obsolete" if $VERBOSE
+      self
+    end
+
+    def header   #:nodoc:
+      warn "#{caller(1)[0]}: warning: HTTPResponse#header is obsolete" if $VERBOSE
+      self
+    end
+
+    def read_header   #:nodoc:
+      warn "#{caller(1)[0]}: warning: HTTPResponse#read_header is obsolete" if $VERBOSE
+      self
+    end
+
+    #
+    # body
+    #
+
+    def reading_body(sock, reqmethodallowbody)  #:nodoc: internal use only
+      @socket = sock
+      @body_exist = reqmethodallowbody && self.class.body_permitted?
+      begin
+        yield
+        self.body   # ensure to read body
+      ensure
+        @socket = nil
+      end
+    end
+
+    # Gets entity body.  If the block given, yields it to +block+.
+    # The body is provided in fragments, as it is read in from the socket.
+    #
+    # Calling this method a second or subsequent time will return the
+    # already read string.
+    #
+    #   http.request_get('/index.html') {|res|
+    #     puts res.read_body
+    #   }
+    #
+    #   http.request_get('/index.html') {|res|
+    #     p res.read_body.object_id   # 538149362
+    #     p res.read_body.object_id   # 538149362
+    #   }
+    #
+    #   # using iterator
+    #   http.request_get('/index.html') {|res|
+    #     res.read_body do |segment|
+    #       print segment
+    #     end
+    #   }
+    #
+    def read_body(dest = nil, &block)
+      if @read
+        raise IOError, "#{self.class}\#read_body called twice" if dest or block
+        return @body
+      end
+      to = procdest(dest, block)
+      stream_check
+      if @body_exist
+        read_body_0 to
+        @body = to
+      else
+        @body = nil
+      end
+      @read = true
+
+      @body
+    end
+
+    # Returns the entity body.
+    #
+    # Calling this method a second or subsequent time will return the
+    # already read string.
+    #
+    #   http.request_get('/index.html') {|res|
+    #     puts res.body
+    #   }
+    #
+    #   http.request_get('/index.html') {|res|
+    #     p res.body.object_id   # 538149362
+    #     p res.body.object_id   # 538149362
+    #   }
+    #
+    def body
+      read_body()
+    end
+
+    alias entity body   #:nodoc: obsolete
+
+    private
+
+    def read_body_0(dest)
+      if chunked?
+        read_chunked dest
+        return
+      end
+      clen = content_length()
+      if clen
+        @socket.read clen, dest, true   # ignore EOF
+        return
+      end
+      clen = range_length()
+      if clen
+        @socket.read clen, dest
+        return
+      end
+      @socket.read_all dest
+    end
+
+    def read_chunked(dest)
+      len = nil
+      total = 0
+      while true
+        line = @socket.readline
+        hexlen = line.slice(/[0-9a-fA-F]+/) or
+            raise HTTPBadResponse, "wrong chunk size line: #{line}"
+        len = hexlen.hex
+        break if len == 0
+        @socket.read len, dest; total += len
+        @socket.read 2   # \r\n
+      end
+      until @socket.readline.empty?
+        # none
+      end
+    end
+
+    def stream_check
+      raise IOError, 'attempt to read body out of block' if @socket.closed?
+    end
+
+    def procdest(dest, block)
+      raise ArgumentError, 'both arg and block given for HTTP method' \
+          if dest and block
+      if block
+        ReadAdapter.new(block)
+      else
+        dest || ''
+      end
+    end
+
+  end
+
+
+  # :enddoc:
+
+  #--
+  # for backward compatibility
+  class HTTP
+    ProxyMod = ProxyDelta
+  end
+  module NetPrivate
+    HTTPRequest = ::Net::HTTPRequest
+  end
+
+  HTTPInformationCode = HTTPInformation
+  HTTPSuccessCode     = HTTPSuccess
+  HTTPRedirectionCode = HTTPRedirection
+  HTTPRetriableCode   = HTTPRedirection
+  HTTPClientErrorCode = HTTPClientError
+  HTTPFatalErrorCode  = HTTPClientError
+  HTTPServerErrorCode = HTTPServerError
+  HTTPResponceReceiver = HTTPResponse
+
+end   # module Net
diff --git a/ruby_1_8_6/lib/net/https.rb b/ruby_1_8_6/lib/net/https.rb
new file mode 100644
index 0000000000..e296dbbed4
--- /dev/null
+++ b/ruby_1_8_6/lib/net/https.rb
@@ -0,0 +1,173 @@
+=begin
+
+= $RCSfile$ -- SSL/TLS enhancement for Net::HTTP.
+
+== Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2001 GOTOU Yuuzou <gotoyuzo@notwork.org>
+  All rights reserved.
+
+== Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+== Requirements
+  This program requires Net 1.2.0 or higher version.
+  You can get it from RAA or Ruby's CVS repository.
+
+== Version
+  $Id$
+  
+  2001-11-06: Contiributed to Ruby/OpenSSL project.
+  2004-03-06: Some code is merged in to net/http.
+
+== Example
+
+Here is a simple HTTP client:
+
+    require 'net/http'
+    require 'uri'
+
+    uri = URI.parse(ARGV[0] || 'http://localhost/')
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.start {
+      http.request_get(uri.path) {|res|
+        print res.body
+      }
+    }
+
+It can be replaced by the following code:
+
+    require 'net/https'
+    require 'uri'
+
+    uri = URI.parse(ARGV[0] || 'https://localhost/')
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true if uri.scheme == "https"  # enable SSL/TLS
+    http.start {
+      http.request_get(uri.path) {|res|
+        print res.body
+      }
+    }
+
+== class Net::HTTP
+
+=== Instance Methods
+
+: use_ssl?
+    returns true if use SSL/TLS with HTTP.
+
+: use_ssl=((|true_or_false|))
+    sets use_ssl.
+
+: peer_cert
+    return the X.509 certificates the server presented.
+
+: key, key=((|key|))
+    Sets an OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
+    (This method is appeared in Michal Rokos's OpenSSL extention.)
+
+: cert, cert=((|cert|))
+    Sets an OpenSSL::X509::Certificate object as client certificate
+    (This method is appeared in Michal Rokos's OpenSSL extention).
+
+: ca_file, ca_file=((|path|))
+    Sets path of a CA certification file in PEM format.
+    The file can contrain several CA certificats.
+
+: ca_path, ca_path=((|path|))
+    Sets path of a CA certification directory containing certifications
+    in PEM format.
+
+: verify_mode, verify_mode=((|mode|))
+    Sets the flags for server the certification verification at
+    begining of SSL/TLS session.
+    OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable.
+
+: verify_callback, verify_callback=((|proc|))
+    Sets the verify callback for the server certification verification.
+
+: verify_depth, verify_depth=((|num|))
+    Sets the maximum depth for the certificate chain verification.
+
+: cert_store, cert_store=((|store|))
+    Sets the X509::Store to verify peer certificate.
+
+: ssl_timeout, ssl_timeout=((|sec|))
+    Sets the SSL timeout seconds.
+
+=end
+
+require 'net/http'
+require 'openssl'
+
+module Net
+
+  class HTTP
+    remove_method :use_ssl?
+    def use_ssl?
+      @use_ssl
+    end
+
+    # For backward compatibility.
+    alias use_ssl use_ssl?
+
+    # Turn on/off SSL.
+    # This flag must be set before starting session.
+    # If you change use_ssl value after session started,
+    # a Net::HTTP object raises IOError.
+    def use_ssl=(flag)
+      flag = (flag ? true : false)
+      raise IOError, "use_ssl value changed, but session already started" \
+          if started? and @use_ssl != flag
+      if flag and not @ssl_context
+        @ssl_context = OpenSSL::SSL::SSLContext.new
+      end
+      @use_ssl = flag
+    end
+
+    def self.ssl_context_accessor(name)
+      module_eval(<<-End, __FILE__, __LINE__ + 1)
+        def #{name}
+          return nil unless @ssl_context
+          @ssl_context.#{name}
+        end
+
+        def #{name}=(val)
+          @ssl_context ||= OpenSSL::SSL::SSLContext.new
+          @ssl_context.#{name} = val
+        end
+      End
+    end
+
+    ssl_context_accessor :key
+    ssl_context_accessor :cert
+    ssl_context_accessor :ca_file
+    ssl_context_accessor :ca_path
+    ssl_context_accessor :verify_mode
+    ssl_context_accessor :verify_callback
+    ssl_context_accessor :verify_depth
+    ssl_context_accessor :cert_store
+
+    def ssl_timeout
+      return nil unless @ssl_context
+      @ssl_context.timeout
+    end
+
+    def ssl_timeout=(sec)
+      raise ArgumentError, 'Net::HTTP#ssl_timeout= called but use_ssl=false' \
+          unless use_ssl?
+      @ssl_context ||= OpenSSL::SSL::SSLContext.new
+      @ssl_context.timeout = sec
+    end
+
+    # For backward compatibility
+    alias timeout= ssl_timeout=
+
+    def peer_cert
+      return nil if not use_ssl? or not @socket
+      @socket.io.peer_cert
+    end
+  end
+
+end
diff --git a/ruby_1_8_6/lib/net/imap.rb b/ruby_1_8_6/lib/net/imap.rb
new file mode 100644
index 0000000000..6436940df6
--- /dev/null
+++ b/ruby_1_8_6/lib/net/imap.rb
@@ -0,0 +1,3370 @@
+#
+# = net/imap.rb
+#
+# Copyright (C) 2000  Shugo Maeda <shugo@ruby-lang.org>
+#
+# This library is distributed under the terms of the Ruby license.
+# You can freely distribute/modify this library.
+#
+# Documentation: Shugo Maeda, with RDoc conversion and overview by William
+# Webber.
+#
+# See Net::IMAP for documentation. 
+#
+
+
+require "socket"
+require "monitor"
+require "digest/md5"
+begin
+  require "openssl"
+rescue LoadError
+end
+
+module Net
+
+  #
+  # Net::IMAP implements Internet Message Access Protocol (IMAP) client
+  # functionality.  The protocol is described in [IMAP].
+  #
+  # == IMAP Overview
+  #
+  # An IMAP client connects to a server, and then authenticates
+  # itself using either #authenticate() or #login().  Having
+  # authenticated itself, there is a range of commands
+  # available to it.  Most work with mailboxes, which may be
+  # arranged in an hierarchical namespace, and each of which
+  # contains zero or more messages.  How this is implemented on
+  # the server is implementation-dependent; on a UNIX server, it
+  # will frequently be implemented as a files in mailbox format
+  # within a hierarchy of directories.
+  #
+  # To work on the messages within a mailbox, the client must
+  # first select that mailbox, using either #select() or (for
+  # read-only access) #examine().  Once the client has successfully
+  # selected a mailbox, they enter _selected_ state, and that
+  # mailbox becomes the _current_ mailbox, on which mail-item
+  # related commands implicitly operate.  
+  #
+  # Messages have two sorts of identifiers: message sequence
+  # numbers, and UIDs.  
+  #
+  # Message sequence numbers number messages within a mail box 
+  # from 1 up to the number of items in the mail box.  If new
+  # message arrives during a session, it receives a sequence
+  # number equal to the new size of the mail box.  If messages
+  # are expunged from the mailbox, remaining messages have their
+  # sequence numbers "shuffled down" to fill the gaps.
+  #
+  # UIDs, on the other hand, are permanently guaranteed not to
+  # identify another message within the same mailbox, even if 
+  # the existing message is deleted.  UIDs are required to
+  # be assigned in ascending (but not necessarily sequential)
+  # order within a mailbox; this means that if a non-IMAP client
+  # rearranges the order of mailitems within a mailbox, the
+  # UIDs have to be reassigned.  An IMAP client cannot thus
+  # rearrange message orders.
+  #
+  # == Examples of Usage
+  #
+  # === List sender and subject of all recent messages in the default mailbox
+  #
+  #   imap = Net::IMAP.new('mail.example.com')
+  #   imap.authenticate('LOGIN', 'joe_user', 'joes_password')
+  #   imap.examine('INBOX')
+  #   imap.search(["RECENT"]).each do |message_id|
+  #     envelope = imap.fetch(message_id, "ENVELOPE")[0].attr["ENVELOPE"]
+  #     puts "#{envelope.from[0].name}: \t#{envelope.subject}"
+  #   end
+  #
+  # === Move all messages from April 2003 from "Mail/sent-mail" to "Mail/sent-apr03"
+  #
+  #   imap = Net::IMAP.new('mail.example.com')
+  #   imap.authenticate('LOGIN', 'joe_user', 'joes_password')
+  #   imap.select('Mail/sent-mail')
+  #   if not imap.list('Mail/', 'sent-apr03')
+  #     imap.create('Mail/sent-apr03')
+  #   end
+  #   imap.search(["BEFORE", "30-Apr-2003", "SINCE", "1-Apr-2003"]).each do |message_id|
+  #     imap.copy(message_id, "Mail/sent-apr03")
+  #     imap.store(message_id, "+FLAGS", [:Deleted])
+  #   end
+  #   imap.expunge
+  # 
+  # == Thread Safety
+  #
+  # Net::IMAP supports concurrent threads. For example,
+  # 
+  #   imap = Net::IMAP.new("imap.foo.net", "imap2")
+  #   imap.authenticate("cram-md5", "bar", "password")
+  #   imap.select("inbox")
+  #   fetch_thread = Thread.start { imap.fetch(1..-1, "UID") }
+  #   search_result = imap.search(["BODY", "hello"])
+  #   fetch_result = fetch_thread.value
+  #   imap.disconnect
+  # 
+  # This script invokes the FETCH command and the SEARCH command concurrently.
+  #
+  # == Errors
+  #
+  # An IMAP server can send three different types of responses to indicate
+  # failure:
+  #
+  # NO:: the attempted command could not be successfully completed.  For
+  #      instance, the username/password used for logging in are incorrect;
+  #      the selected mailbox does not exists; etc.  
+  #
+  # BAD:: the request from the client does not follow the server's 
+  #       understanding of the IMAP protocol.  This includes attempting
+  #       commands from the wrong client state; for instance, attempting
+  #       to perform a SEARCH command without having SELECTed a current
+  #       mailbox.  It can also signal an internal server
+  #       failure (such as a disk crash) has occurred.
+  #
+  # BYE:: the server is saying goodbye.  This can be part of a normal
+  #       logout sequence, and can be used as part of a login sequence
+  #       to indicate that the server is (for some reason) unwilling
+  #       to accept our connection.  As a response to any other command,
+  #       it indicates either that the server is shutting down, or that
+  #       the server is timing out the client connection due to inactivity.
+  #
+  # These three error response are represented by the errors
+  # Net::IMAP::NoResponseError, Net::IMAP::BadResponseError, and
+  # Net::IMAP::ByeResponseError, all of which are subclasses of
+  # Net::IMAP::ResponseError.  Essentially, all methods that involve
+  # sending a request to the server can generate one of these errors.
+  # Only the most pertinent instances have been documented below.
+  #
+  # Because the IMAP class uses Sockets for communication, its methods
+  # are also susceptible to the various errors that can occur when
+  # working with sockets.  These are generally represented as
+  # Errno errors.  For instance, any method that involves sending a
+  # request to the server and/or receiving a response from it could
+  # raise an Errno::EPIPE error if the network connection unexpectedly
+  # goes down.  See the socket(7), ip(7), tcp(7), socket(2), connect(2),
+  # and associated man pages.
+  #
+  # Finally, a Net::IMAP::DataFormatError is thrown if low-level data
+  # is found to be in an incorrect format (for instance, when converting
+  # between UTF-8 and UTF-16), and Net::IMAP::ResponseParseError is 
+  # thrown if a server response is non-parseable. 
+  #
+  #
+  # == References
+  #
+  # [[IMAP]]
+  #    M. Crispin, "INTERNET MESSAGE ACCESS PROTOCOL - VERSION 4rev1",
+  #    RFC 2060, December 1996.  (Note: since obsoleted by RFC 3501)
+  #
+  # [[LANGUAGE-TAGS]]
+  #    Alvestrand, H., "Tags for the Identification of
+  #    Languages", RFC 1766, March 1995.
+  #
+  # [[MD5]]
+  #    Myers, J., and M. Rose, "The Content-MD5 Header Field", RFC
+  #    1864, October 1995.
+  #
+  # [[MIME-IMB]]
+  #    Freed, N., and N. Borenstein, "MIME (Multipurpose Internet
+  #    Mail Extensions) Part One: Format of Internet Message Bodies", RFC
+  #    2045, November 1996.
+  #
+  # [[RFC-822]]
+  #    Crocker, D., "Standard for the Format of ARPA Internet Text
+  #    Messages", STD 11, RFC 822, University of Delaware, August 1982.
+  #
+  # [[RFC-2087]]
+  #    Myers, J., "IMAP4 QUOTA extension", RFC 2087, January 1997.
+  #
+  # [[RFC-2086]]
+  #    Myers, J., "IMAP4 ACL extension", RFC 2086, January 1997.
+  #
+  # [[RFC-2195]]
+  #    Klensin, J., Catoe, R., and Krumviede, P., "IMAP/POP AUTHorize Extension
+  #    for Simple Challenge/Response", RFC 2195, September 1997.
+  #
+  # [[SORT-THREAD-EXT]]
+  #    Crispin, M., "INTERNET MESSAGE ACCESS PROTOCOL - SORT and THREAD
+  #    Extensions", draft-ietf-imapext-sort, May 2003.
+  #
+  # [[OSSL]]
+  #    http://www.openssl.org
+  #
+  # [[RSSL]]
+  #    http://savannah.gnu.org/projects/rubypki
+  #
+  # [[UTF7]]
+  #    Goldsmith, D. and Davis, M., "UTF-7: A Mail-Safe Transformation Format of
+  #    Unicode", RFC 2152, May 1997.
+  #
+  class IMAP
+    include MonitorMixin
+    if defined?(OpenSSL)
+      include OpenSSL
+      include SSL
+    end
+
+    #  Returns an initial greeting response from the server.
+    attr_reader :greeting
+
+    # Returns recorded untagged responses.  For example:
+    #
+    #   imap.select("inbox")
+    #   p imap.responses["EXISTS"][-1]
+    #   #=> 2
+    #   p imap.responses["UIDVALIDITY"][-1]
+    #   #=> 968263756
+    attr_reader :responses
+
+    # Returns all response handlers.
+    attr_reader :response_handlers
+
+    # The thread to receive exceptions.
+    attr_accessor :client_thread
+
+    # Flag indicating a message has been seen
+    SEEN = :Seen
+
+    # Flag indicating a message has been answered
+    ANSWERED = :Answered
+
+    # Flag indicating a message has been flagged for special or urgent
+    # attention
+    FLAGGED = :Flagged
+
+    # Flag indicating a message has been marked for deletion.  This
+    # will occur when the mailbox is closed or expunged.
+    DELETED = :Deleted
+
+    # Flag indicating a message is only a draft or work-in-progress version.
+    DRAFT = :Draft
+
+    # Flag indicating that the message is "recent", meaning that this
+    # session is the first session in which the client has been notified
+    # of this message.
+    RECENT = :Recent
+
+    # Flag indicating that a mailbox context name cannot contain
+    # children.
+    NOINFERIORS = :Noinferiors
+
+    # Flag indicating that a mailbox is not selected.
+    NOSELECT = :Noselect
+
+    # Flag indicating that a mailbox has been marked "interesting" by
+    # the server; this commonly indicates that the mailbox contains
+    # new messages.
+    MARKED = :Marked
+
+    # Flag indicating that the mailbox does not contains new messages.
+    UNMARKED = :Unmarked
+
+    # Returns the debug mode.
+    def self.debug
+      return @@debug
+    end
+
+    # Sets the debug mode.
+    def self.debug=(val)
+      return @@debug = val
+    end
+
+    # Adds an authenticator for Net::IMAP#authenticate.  +auth_type+
+    # is the type of authentication this authenticator supports
+    # (for instance, "LOGIN").  The +authenticator+ is an object
+    # which defines a process() method to handle authentication with
+    # the server.  See Net::IMAP::LoginAuthenticator and 
+    # Net::IMAP::CramMD5Authenticator for examples.
+    #
+    # If +auth_type+ refers to an existing authenticator, it will be
+    # replaced by the new one.
+    def self.add_authenticator(auth_type, authenticator)
+      @@authenticators[auth_type] = authenticator
+    end
+
+    # Disconnects from the server.
+    def disconnect
+      if SSL::SSLSocket === @sock
+        @sock.io.shutdown
+      else
+        @sock.shutdown
+      end
+      @receiver_thread.join
+      @sock.close
+    end
+
+    # Returns true if disconnected from the server.
+    def disconnected?
+      return @sock.closed?
+    end
+
+    # Sends a CAPABILITY command, and returns an array of
+    # capabilities that the server supports.  Each capability
+    # is a string.  See [IMAP] for a list of possible
+    # capabilities.
+    #
+    # Note that the Net::IMAP class does not modify its
+    # behaviour according to the capabilities of the server;
+    # it is up to the user of the class to ensure that 
+    # a certain capability is supported by a server before
+    # using it.
+    def capability
+      synchronize do
+        send_command("CAPABILITY")
+        return @responses.delete("CAPABILITY")[-1]
+      end
+    end
+
+    # Sends a NOOP command to the server. It does nothing.
+    def noop
+      send_command("NOOP")
+    end
+
+    # Sends a LOGOUT command to inform the server that the client is
+    # done with the connection.
+    def logout
+      send_command("LOGOUT")
+    end
+
+    # Sends an AUTHENTICATE command to authenticate the client.
+    # The +auth_type+ parameter is a string that represents
+    # the authentication mechanism to be used. Currently Net::IMAP
+    # supports authentication mechanisms:
+    #
+    #   LOGIN:: login using cleartext user and password. 
+    #   CRAM-MD5:: login with cleartext user and encrypted password
+    #              (see [RFC-2195] for a full description).  This
+    #              mechanism requires that the server have the user's
+    #              password stored in clear-text password.
+    #
+    # For both these mechanisms, there should be two +args+: username
+    # and (cleartext) password.  A server may not support one or other
+    # of these mechanisms; check #capability() for a capability of
+    # the form "AUTH=LOGIN" or "AUTH=CRAM-MD5".
+    #
+    # Authentication is done using the appropriate authenticator object:
+    # see @@authenticators for more information on plugging in your own
+    # authenticator.
+    #
+    # For example:
+    #
+    #    imap.authenticate('LOGIN', user, password)
+    #
+    # A Net::IMAP::NoResponseError is raised if authentication fails.
+    def authenticate(auth_type, *args)
+      auth_type = auth_type.upcase
+      unless @@authenticators.has_key?(auth_type)
+        raise ArgumentError,
+          format('unknown auth type - "%s"', auth_type)
+      end
+      authenticator = @@authenticators[auth_type].new(*args)
+      send_command("AUTHENTICATE", auth_type) do |resp|
+        if resp.instance_of?(ContinuationRequest)
+          data = authenticator.process(resp.data.text.unpack("m")[0])
+          s = [data].pack("m").gsub(/\n/, "")
+          send_string_data(s)
+          put_string(CRLF)
+        end
+      end
+    end
+
+    # Sends a LOGIN command to identify the client and carries
+    # the plaintext +password+ authenticating this +user+.  Note
+    # that, unlike calling #authenticate() with an +auth_type+
+    # of "LOGIN", #login() does *not* use the login authenticator.
+    #
+    # A Net::IMAP::NoResponseError is raised if authentication fails.
+    def login(user, password)
+      send_command("LOGIN", user, password)
+    end
+
+    # Sends a SELECT command to select a +mailbox+ so that messages
+    # in the +mailbox+ can be accessed. 
+    #
+    # After you have selected a mailbox, you may retrieve the
+    # number of items in that mailbox from @responses["EXISTS"][-1],
+    # and the number of recent messages from @responses["RECENT"][-1].
+    # Note that these values can change if new messages arrive
+    # during a session; see #add_response_handler() for a way of
+    # detecting this event.
+    #
+    # A Net::IMAP::NoResponseError is raised if the mailbox does not
+    # exist or is for some reason non-selectable.
+    def select(mailbox)
+      synchronize do
+        @responses.clear
+        send_command("SELECT", mailbox)
+      end
+    end
+
+    # Sends a EXAMINE command to select a +mailbox+ so that messages
+    # in the +mailbox+ can be accessed.  Behaves the same as #select(),
+    # except that the selected +mailbox+ is identified as read-only.
+    #
+    # A Net::IMAP::NoResponseError is raised if the mailbox does not
+    # exist or is for some reason non-examinable.
+    def examine(mailbox)
+      synchronize do
+        @responses.clear
+        send_command("EXAMINE", mailbox)
+      end
+    end
+
+    # Sends a CREATE command to create a new +mailbox+.
+    #
+    # A Net::IMAP::NoResponseError is raised if a mailbox with that name
+    # cannot be created.
+    def create(mailbox)
+      send_command("CREATE", mailbox)
+    end
+
+    # Sends a DELETE command to remove the +mailbox+.
+    #
+    # A Net::IMAP::NoResponseError is raised if a mailbox with that name
+    # cannot be deleted, either because it does not exist or because the
+    # client does not have permission to delete it.
+    def delete(mailbox)
+      send_command("DELETE", mailbox)
+    end
+
+    # Sends a RENAME command to change the name of the +mailbox+ to
+    # +newname+.
+    #
+    # A Net::IMAP::NoResponseError is raised if a mailbox with the 
+    # name +mailbox+ cannot be renamed to +newname+ for whatever
+    # reason; for instance, because +mailbox+ does not exist, or
+    # because there is already a mailbox with the name +newname+.
+    def rename(mailbox, newname)
+      send_command("RENAME", mailbox, newname)
+    end
+
+    # Sends a SUBSCRIBE command to add the specified +mailbox+ name to
+    # the server's set of "active" or "subscribed" mailboxes as returned
+    # by #lsub().
+    #
+    # A Net::IMAP::NoResponseError is raised if +mailbox+ cannot be
+    # subscribed to, for instance because it does not exist.
+    def subscribe(mailbox)
+      send_command("SUBSCRIBE", mailbox)
+    end
+
+    # Sends a UNSUBSCRIBE command to remove the specified +mailbox+ name
+    # from the server's set of "active" or "subscribed" mailboxes.
+    #
+    # A Net::IMAP::NoResponseError is raised if +mailbox+ cannot be
+    # unsubscribed from, for instance because the client is not currently
+    # subscribed to it.
+    def unsubscribe(mailbox)
+      send_command("UNSUBSCRIBE", mailbox)
+    end
+
+    # Sends a LIST command, and returns a subset of names from
+    # the complete set of all names available to the client.
+    # +refname+ provides a context (for instance, a base directory
+    # in a directory-based mailbox hierarchy).  +mailbox+ specifies
+    # a mailbox or (via wildcards) mailboxes under that context.
+    # Two wildcards may be used in +mailbox+: '*', which matches
+    # all characters *including* the hierarchy delimiter (for instance,
+    # '/' on a UNIX-hosted directory-based mailbox hierarchy); and '%',
+    # which matches all characters *except* the hierarchy delimiter.
+    #
+    # If +refname+ is empty, +mailbox+ is used directly to determine
+    # which mailboxes to match.  If +mailbox+ is empty, the root
+    # name of +refname+ and the hierarchy delimiter are returned.
+    #
+    # The return value is an array of +Net::IMAP::MailboxList+. For example:
+    #
+    #   imap.create("foo/bar")
+    #   imap.create("foo/baz")
+    #   p imap.list("", "foo/%")
+    #   #=> [#<Net::IMAP::MailboxList attr=[:Noselect], delim="/", name="foo/">, \\ 
+    #        #<Net::IMAP::MailboxList attr=[:Noinferiors, :Marked], delim="/", name="foo/bar">, \\ 
+    #        #<Net::IMAP::MailboxList attr=[:Noinferiors], delim="/", name="foo/baz">]
+    def list(refname, mailbox)
+      synchronize do
+        send_command("LIST", refname, mailbox)
+        return @responses.delete("LIST")
+      end
+    end
+
+    # Sends the GETQUOTAROOT command along with specified +mailbox+.
+    # This command is generally available to both admin and user.
+    # If mailbox exists, returns an array containing objects of
+    # Net::IMAP::MailboxQuotaRoot and Net::IMAP::MailboxQuota.
+    def getquotaroot(mailbox)
+      synchronize do
+        send_command("GETQUOTAROOT", mailbox)
+        result = []
+        result.concat(@responses.delete("QUOTAROOT"))
+        result.concat(@responses.delete("QUOTA"))
+        return result
+      end
+    end
+
+    # Sends the GETQUOTA command along with specified +mailbox+.
+    # If this mailbox exists, then an array containing a
+    # Net::IMAP::MailboxQuota object is returned.  This
+    # command generally is only available to server admin.
+    def getquota(mailbox)
+      synchronize do
+        send_command("GETQUOTA", mailbox)
+        return @responses.delete("QUOTA")
+      end
+    end
+
+    # Sends a SETQUOTA command along with the specified +mailbox+ and
+    # +quota+.  If +quota+ is nil, then quota will be unset for that
+    # mailbox.  Typically one needs to be logged in as server admin
+    # for this to work.  The IMAP quota commands are described in
+    # [RFC-2087].
+    def setquota(mailbox, quota)
+      if quota.nil?
+        data = '()'
+      else
+        data = '(STORAGE ' + quota.to_s + ')'
+      end
+      send_command("SETQUOTA", mailbox, RawData.new(data))
+    end
+
+    # Sends the SETACL command along with +mailbox+, +user+ and the
+    # +rights+ that user is to have on that mailbox.  If +rights+ is nil,
+    # then that user will be stripped of any rights to that mailbox.
+    # The IMAP ACL commands are described in [RFC-2086].
+    def setacl(mailbox, user, rights)
+      if rights.nil? 
+        send_command("SETACL", mailbox, user, "")
+      else
+        send_command("SETACL", mailbox, user, rights)
+      end
+    end
+
+    # Send the GETACL command along with specified +mailbox+.
+    # If this mailbox exists, an array containing objects of
+    # Net::IMAP::MailboxACLItem will be returned.
+    def getacl(mailbox)
+      synchronize do
+        send_command("GETACL", mailbox)
+        return @responses.delete("ACL")[-1]
+      end
+    end
+
+    # Sends a LSUB command, and returns a subset of names from the set
+    # of names that the user has declared as being "active" or
+    # "subscribed".  +refname+ and +mailbox+ are interpreted as 
+    # for #list().
+    # The return value is an array of +Net::IMAP::MailboxList+.
+    def lsub(refname, mailbox)
+      synchronize do
+        send_command("LSUB", refname, mailbox)
+        return @responses.delete("LSUB")
+      end
+    end
+
+    # Sends a STATUS command, and returns the status of the indicated
+    # +mailbox+. +attr+ is a list of one or more attributes that
+    # we are request the status of.  Supported attributes include:
+    #
+    #   MESSAGES:: the number of messages in the mailbox.
+    #   RECENT:: the number of recent messages in the mailbox.
+    #   UNSEEN:: the number of unseen messages in the mailbox.
+    #
+    # The return value is a hash of attributes. For example:
+    #
+    #   p imap.status("inbox", ["MESSAGES", "RECENT"])
+    #   #=> {"RECENT"=>0, "MESSAGES"=>44}
+    #
+    # A Net::IMAP::NoResponseError is raised if status values 
+    # for +mailbox+ cannot be returned, for instance because it
+    # does not exist.
+    def status(mailbox, attr)
+      synchronize do
+        send_command("STATUS", mailbox, attr)
+        return @responses.delete("STATUS")[-1].attr
+      end
+    end
+
+    # Sends a APPEND command to append the +message+ to the end of
+    # the +mailbox+. The optional +flags+ argument is an array of 
+    # flags to initially passing to the new message.  The optional
+    # +date_time+ argument specifies the creation time to assign to the 
+    # new message; it defaults to the current time.
+    # For example:
+    #
+    #   imap.append("inbox", <<EOF.gsub(/\n/, "\r\n"), [:Seen], Time.now)
+    #   Subject: hello
+    #   From: shugo@ruby-lang.org
+    #   To: shugo@ruby-lang.org
+    #   
+    #   hello world
+    #   EOF
+    #
+    # A Net::IMAP::NoResponseError is raised if the mailbox does
+    # not exist (it is not created automatically), or if the flags,
+    # date_time, or message arguments contain errors.
+    def append(mailbox, message, flags = nil, date_time = nil)
+      args = []
+      if flags
+        args.push(flags)
+      end
+      args.push(date_time) if date_time
+      args.push(Literal.new(message))
+      send_command("APPEND", mailbox, *args)
+    end
+
+    # Sends a CHECK command to request a checkpoint of the currently
+    # selected mailbox.  This performs implementation-specific
+    # housekeeping, for instance, reconciling the mailbox's 
+    # in-memory and on-disk state.
+    def check
+      send_command("CHECK")
+    end
+
+    # Sends a CLOSE command to close the currently selected mailbox.
+    # The CLOSE command permanently removes from the mailbox all
+    # messages that have the \Deleted flag set.
+    def close
+      send_command("CLOSE")
+    end
+
+    # Sends a EXPUNGE command to permanently remove from the currently
+    # selected mailbox all messages that have the \Deleted flag set.
+    def expunge
+      synchronize do
+        send_command("EXPUNGE")
+        return @responses.delete("EXPUNGE")
+      end
+    end
+
+    # Sends a SEARCH command to search the mailbox for messages that
+    # match the given searching criteria, and returns message sequence
+    # numbers.  +keys+ can either be a string holding the entire 
+    # search string, or a single-dimension array of search keywords and 
+    # arguments.  The following are some common search criteria;
+    # see [IMAP] section 6.4.4 for a full list.
+    #
+    # <message set>:: a set of message sequence numbers.  ',' indicates
+    #                 an interval, ':' indicates a range.  For instance,
+    #                 '2,10:12,15' means "2,10,11,12,15".
+    #
+    # BEFORE <date>:: messages with an internal date strictly before
+    #                 <date>.  The date argument has a format similar
+    #                 to 8-Aug-2002.
+    #
+    # BODY <string>:: messages that contain <string> within their body.
+    #
+    # CC <string>:: messages containing <string> in their CC field.
+    #
+    # FROM <string>:: messages that contain <string> in their FROM field.
+    #
+    # NEW:: messages with the \Recent, but not the \Seen, flag set.
+    #
+    # NOT <search-key>:: negate the following search key.
+    #
+    # OR <search-key> <search-key>:: "or" two search keys together.
+    #
+    # ON <date>:: messages with an internal date exactly equal to <date>, 
+    #             which has a format similar to 8-Aug-2002.
+    #
+    # SINCE <date>:: messages with an internal date on or after <date>.
+    #
+    # SUBJECT <string>:: messages with <string> in their subject.
+    #
+    # TO <string>:: messages with <string> in their TO field.
+    # 
+    # For example:
+    #
+    #   p imap.search(["SUBJECT", "hello", "NOT", "NEW"])
+    #   #=> [1, 6, 7, 8]
+    def search(keys, charset = nil)
+      return search_internal("SEARCH", keys, charset)
+    end
+
+    # As for #search(), but returns unique identifiers.
+    def uid_search(keys, charset = nil)
+      return search_internal("UID SEARCH", keys, charset)
+    end
+
+    # Sends a FETCH command to retrieve data associated with a message
+    # in the mailbox. The +set+ parameter is a number or an array of
+    # numbers or a Range object. The number is a message sequence
+    # number.  +attr+ is a list of attributes to fetch; see the
+    # documentation for Net::IMAP::FetchData for a list of valid
+    # attributes.
+    # The return value is an array of Net::IMAP::FetchData. For example:
+    #
+    #   p imap.fetch(6..8, "UID")
+    #   #=> [#<Net::IMAP::FetchData seqno=6, attr={"UID"=>98}>, \\ 
+    #        #<Net::IMAP::FetchData seqno=7, attr={"UID"=>99}>, \\ 
+    #        #<Net::IMAP::FetchData seqno=8, attr={"UID"=>100}>]
+    #   p imap.fetch(6, "BODY[HEADER.FIELDS (SUBJECT)]")
+    #   #=> [#<Net::IMAP::FetchData seqno=6, attr={"BODY[HEADER.FIELDS (SUBJECT)]"=>"Subject: test\r\n\r\n"}>]
+    #   data = imap.uid_fetch(98, ["RFC822.SIZE", "INTERNALDATE"])[0]
+    #   p data.seqno
+    #   #=> 6
+    #   p data.attr["RFC822.SIZE"]
+    #   #=> 611
+    #   p data.attr["INTERNALDATE"]
+    #   #=> "12-Oct-2000 22:40:59 +0900"
+    #   p data.attr["UID"]
+    #   #=> 98
+    def fetch(set, attr)
+      return fetch_internal("FETCH", set, attr)
+    end
+
+    # As for #fetch(), but +set+ contains unique identifiers.
+    def uid_fetch(set, attr)
+      return fetch_internal("UID FETCH", set, attr)
+    end
+
+    # Sends a STORE command to alter data associated with messages
+    # in the mailbox, in particular their flags. The +set+ parameter 
+    # is a number or an array of numbers or a Range object. Each number 
+    # is a message sequence number.  +attr+ is the name of a data item 
+    # to store: 'FLAGS' means to replace the message's flag list
+    # with the provided one; '+FLAGS' means to add the provided flags;
+    # and '-FLAGS' means to remove them.  +flags+ is a list of flags.
+    #
+    # The return value is an array of Net::IMAP::FetchData. For example:
+    #
+    #   p imap.store(6..8, "+FLAGS", [:Deleted])
+    #   #=> [#<Net::IMAP::FetchData seqno=6, attr={"FLAGS"=>[:Seen, :Deleted]}>, \\ 
+    #        #<Net::IMAP::FetchData seqno=7, attr={"FLAGS"=>[:Seen, :Deleted]}>, \\  
+    #        #<Net::IMAP::FetchData seqno=8, attr={"FLAGS"=>[:Seen, :Deleted]}>]
+    def store(set, attr, flags)
+      return store_internal("STORE", set, attr, flags)
+    end
+
+    # As for #store(), but +set+ contains unique identifiers.
+    def uid_store(set, attr, flags)
+      return store_internal("UID STORE", set, attr, flags)
+    end
+
+    # Sends a COPY command to copy the specified message(s) to the end
+    # of the specified destination +mailbox+. The +set+ parameter is
+    # a number or an array of numbers or a Range object. The number is
+    # a message sequence number.
+    def copy(set, mailbox)
+      copy_internal("COPY", set, mailbox)
+    end
+
+    # As for #copy(), but +set+ contains unique identifiers.
+    def uid_copy(set, mailbox)
+      copy_internal("UID COPY", set, mailbox)
+    end
+
+    # Sends a SORT command to sort messages in the mailbox.
+    # Returns an array of message sequence numbers. For example:
+    #
+    #   p imap.sort(["FROM"], ["ALL"], "US-ASCII")
+    #   #=> [1, 2, 3, 5, 6, 7, 8, 4, 9]
+    #   p imap.sort(["DATE"], ["SUBJECT", "hello"], "US-ASCII")
+    #   #=> [6, 7, 8, 1]
+    #
+    # See [SORT-THREAD-EXT] for more details.
+    def sort(sort_keys, search_keys, charset)
+      return sort_internal("SORT", sort_keys, search_keys, charset)
+    end
+
+    # As for #sort(), but returns an array of unique identifiers.
+    def uid_sort(sort_keys, search_keys, charset)
+      return sort_internal("UID SORT", sort_keys, search_keys, charset)
+    end
+
+    # Adds a response handler. For example, to detect when 
+    # the server sends us a new EXISTS response (which normally
+    # indicates new messages being added to the mail box), 
+    # you could add the following handler after selecting the
+    # mailbox.
+    #
+    #   imap.add_response_handler { |resp|
+    #     if resp.kind_of?(Net::IMAP::UntaggedResponse) and resp.name == "EXISTS"
+    #       puts "Mailbox now has #{resp.data} messages"
+    #     end
+    #   }
+    #
+    def add_response_handler(handler = Proc.new)
+      @response_handlers.push(handler)
+    end
+
+    # Removes the response handler.
+    def remove_response_handler(handler)
+      @response_handlers.delete(handler)
+    end
+
+    # As for #search(), but returns message sequence numbers in threaded
+    # format, as a Net::IMAP::ThreadMember tree.  The supported algorithms
+    # are:
+    #
+    # ORDEREDSUBJECT:: split into single-level threads according to subject,
+    #                  ordered by date.
+    # REFERENCES:: split into threads by parent/child relationships determined
+    #              by which message is a reply to which.
+    #
+    # Unlike #search(), +charset+ is a required argument.  US-ASCII
+    # and UTF-8 are sample values.
+    #
+    # See [SORT-THREAD-EXT] for more details.
+    def thread(algorithm, search_keys, charset)
+      return thread_internal("THREAD", algorithm, search_keys, charset)
+    end
+
+    # As for #thread(), but returns unique identifiers instead of 
+    # message sequence numbers.
+    def uid_thread(algorithm, search_keys, charset)
+      return thread_internal("UID THREAD", algorithm, search_keys, charset)
+    end
+
+    # Decode a string from modified UTF-7 format to UTF-8.
+    #
+    # UTF-7 is a 7-bit encoding of Unicode [UTF7].  IMAP uses a
+    # slightly modified version of this to encode mailbox names
+    # containing non-ASCII characters; see [IMAP] section 5.1.3.
+    #
+    # Net::IMAP does _not_ automatically encode and decode
+    # mailbox names to and from utf7.
+    def self.decode_utf7(s)
+      return s.gsub(/&(.*?)-/n) {
+        if $1.empty?
+          "&"
+        else
+          base64 = $1.tr(",", "/")
+          x = base64.length % 4
+          if x > 0
+            base64.concat("=" * (4 - x))
+          end
+          u16tou8(base64.unpack("m")[0])
+        end
+      }
+    end
+
+    # Encode a string from UTF-8 format to modified UTF-7.
+    def self.encode_utf7(s)
+      return s.gsub(/(&)|([^\x20-\x25\x27-\x7e]+)/n) { |x|
+        if $1
+          "&-"
+        else
+          base64 = [u8tou16(x)].pack("m")
+          "&" + base64.delete("=\n").tr("/", ",") + "-"
+        end
+      }
+    end
+
+    private
+
+    CRLF = "\r\n"      # :nodoc:
+    PORT = 143         # :nodoc:
+
+    @@debug = false
+    @@authenticators = {}
+
+    # Creates a new Net::IMAP object and connects it to the specified
+    # +port+ (143 by default) on the named +host+.  If +usessl+ is true, 
+    # then an attempt will
+    # be made to use SSL (now TLS) to connect to the server.  For this
+    # to work OpenSSL [OSSL] and the Ruby OpenSSL [RSSL]
+    # extensions need to be installed.  The +certs+ parameter indicates
+    # the path or file containing the CA cert of the server, and the
+    # +verify+ parameter is for the OpenSSL verification callback.
+    #
+    # The most common errors are:
+    #
+    # Errno::ECONNREFUSED:: connection refused by +host+ or an intervening
+    #                       firewall.
+    # Errno::ETIMEDOUT:: connection timed out (possibly due to packets
+    #                    being dropped by an intervening firewall).
+    # Errno::ENETUNREACH:: there is no route to that network.
+    # SocketError:: hostname not known or other socket error.
+    # Net::IMAP::ByeResponseError:: we connected to the host, but they 
+    #                               immediately said goodbye to us.
+    def initialize(host, port = PORT, usessl = false, certs = nil, verify = false)
+      super()
+      @host = host
+      @port = port
+      @tag_prefix = "RUBY"
+      @tagno = 0
+      @parser = ResponseParser.new
+      @sock = TCPSocket.open(host, port)
+      if usessl
+        unless defined?(OpenSSL)
+          raise "SSL extension not installed"
+        end
+        @usessl = true
+
+        # verify the server.
+        context = SSLContext::new()
+        context.ca_file = certs if certs && FileTest::file?(certs)
+        context.ca_path = certs if certs && FileTest::directory?(certs)
+        context.verify_mode = VERIFY_PEER if verify
+        if defined?(VerifyCallbackProc)
+          context.verify_callback = VerifyCallbackProc 
+        end
+        @sock = SSLSocket.new(@sock, context)
+        @sock.connect   # start ssl session.
+      else
+        @usessl = false
+      end
+      @responses = Hash.new([].freeze)
+      @tagged_responses = {}
+      @response_handlers = []
+      @response_arrival = new_cond
+      @continuation_request = nil
+      @logout_command_tag = nil
+      @debug_output_bol = true
+
+      @greeting = get_response
+      if @greeting.name == "BYE"
+        @sock.close
+        raise ByeResponseError, @greeting.raw_data
+      end
+
+      @client_thread = Thread.current
+      @receiver_thread = Thread.start {
+        receive_responses
+      }
+    end
+
+    def receive_responses
+      while true
+        begin
+          resp = get_response
+        rescue Exception
+          @sock.close
+          @client_thread.raise($!)
+          break
+        end
+        break unless resp
+        begin
+          synchronize do
+            case resp
+            when TaggedResponse
+              @tagged_responses[resp.tag] = resp
+              @response_arrival.broadcast
+              if resp.tag == @logout_command_tag
+                return
+              end
+            when UntaggedResponse
+              record_response(resp.name, resp.data)
+              if resp.data.instance_of?(ResponseText) &&
+                  (code = resp.data.code)
+                record_response(code.name, code.data)
+              end
+              if resp.name == "BYE" && @logout_command_tag.nil?
+                @sock.close
+                raise ByeResponseError, resp.raw_data
+              end
+            when ContinuationRequest
+              @continuation_request = resp
+              @response_arrival.broadcast
+            end
+            @response_handlers.each do |handler|
+              handler.call(resp)
+            end
+          end
+        rescue Exception
+          @client_thread.raise($!)
+        end
+      end
+    end
+
+    def get_tagged_response(tag)
+      until @tagged_responses.key?(tag)
+        @response_arrival.wait
+      end
+      return pick_up_tagged_response(tag)
+    end
+
+    def pick_up_tagged_response(tag)
+      resp = @tagged_responses.delete(tag)
+      case resp.name
+      when /\A(?:NO)\z/ni
+        raise NoResponseError, resp.data.text
+      when /\A(?:BAD)\z/ni
+        raise BadResponseError, resp.data.text
+      else
+        return resp
+      end
+    end
+
+    def get_response
+      buff = ""
+      while true
+        s = @sock.gets(CRLF)
+        break unless s
+        buff.concat(s)
+        if /\{(\d+)\}\r\n/n =~ s
+          s = @sock.read($1.to_i)
+          buff.concat(s)
+        else
+          break
+        end
+      end
+      return nil if buff.length == 0
+      if @@debug
+        $stderr.print(buff.gsub(/^/n, "S: "))
+      end
+      return @parser.parse(buff)
+    end
+
+    def record_response(name, data)
+      unless @responses.has_key?(name)
+        @responses[name] = []
+      end
+      @responses[name].push(data)
+    end
+
+    def send_command(cmd, *args, &block)
+      synchronize do
+        tag = Thread.current[:net_imap_tag] = generate_tag
+        put_string(tag + " " + cmd)
+        args.each do |i|
+          put_string(" ")
+          send_data(i)
+        end
+        put_string(CRLF)
+        if cmd == "LOGOUT"
+          @logout_command_tag = tag
+        end
+        if block
+          add_response_handler(block)
+        end
+        begin
+          return get_tagged_response(tag)
+        ensure
+          if block
+            remove_response_handler(block)
+          end
+        end
+      end
+    end
+
+    def generate_tag
+      @tagno += 1
+      return format("%s%04d", @tag_prefix, @tagno)
+    end
+    
+    def put_string(str)
+      @sock.print(str)
+      if @@debug
+        if @debug_output_bol
+          $stderr.print("C: ")
+        end
+        $stderr.print(str.gsub(/\n(?!\z)/n, "\nC: "))
+        if /\r\n\z/n.match(str)
+          @debug_output_bol = true
+        else
+          @debug_output_bol = false
+        end
+      end
+    end
+
+    def send_data(data)
+      case data
+      when nil
+        put_string("NIL")
+      when String
+        send_string_data(data)
+      when Integer
+        send_number_data(data)
+      when Array
+        send_list_data(data)
+      when Time
+        send_time_data(data)
+      when Symbol
+        send_symbol_data(data)
+      else
+        data.send_data(self)
+      end
+    end
+
+    def send_string_data(str)
+      case str
+      when ""
+        put_string('""')
+      when /[\x80-\xff\r\n]/n
+        # literal
+        send_literal(str)
+      when /[(){ \x00-\x1f\x7f%*"\\]/n
+        # quoted string
+        send_quoted_string(str)
+      else
+        put_string(str)
+      end
+    end
+    
+    def send_quoted_string(str)
+      put_string('"' + str.gsub(/["\\]/n, "\\\\\\&") + '"')
+    end
+
+    def send_literal(str)
+      put_string("{" + str.length.to_s + "}" + CRLF)
+      while @continuation_request.nil? &&
+        !@tagged_responses.key?(Thread.current[:net_imap_tag])
+        @response_arrival.wait
+      end
+      if @continuation_request.nil?
+        pick_up_tagged_response(Thread.current[:net_imap_tag])
+        raise ResponseError.new("expected continuation request")
+      end
+      @continuation_request = nil
+      put_string(str)
+    end
+
+    def send_number_data(num)
+      if num < 0 || num >= 4294967296
+        raise DataFormatError, num.to_s
+      end
+      put_string(num.to_s)
+    end
+
+    def send_list_data(list)
+      put_string("(")
+      first = true
+      list.each do |i|
+        if first
+          first = false
+        else
+          put_string(" ")
+        end
+        send_data(i)
+      end
+      put_string(")")
+    end
+
+    DATE_MONTH = %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)
+
+    def send_time_data(time)
+      t = time.dup.gmtime
+      s = format('"%2d-%3s-%4d %02d:%02d:%02d +0000"',
+                 t.day, DATE_MONTH[t.month - 1], t.year,
+                 t.hour, t.min, t.sec)
+      put_string(s)
+    end
+
+    def send_symbol_data(symbol)
+      put_string("\\" + symbol.to_s)
+    end
+
+    def search_internal(cmd, keys, charset)
+      if keys.instance_of?(String)
+        keys = [RawData.new(keys)]
+      else
+        normalize_searching_criteria(keys)
+      end
+      synchronize do
+        if charset
+          send_command(cmd, "CHARSET", charset, *keys)
+        else
+          send_command(cmd, *keys)
+        end
+        return @responses.delete("SEARCH")[-1]
+      end
+    end
+
+    def fetch_internal(cmd, set, attr)
+      if attr.instance_of?(String)
+        attr = RawData.new(attr)
+      end
+      synchronize do
+        @responses.delete("FETCH")
+        send_command(cmd, MessageSet.new(set), attr)
+        return @responses.delete("FETCH")
+      end
+    end
+
+    def store_internal(cmd, set, attr, flags)
+      if attr.instance_of?(String)
+        attr = RawData.new(attr)
+      end
+      synchronize do
+        @responses.delete("FETCH")
+        send_command(cmd, MessageSet.new(set), attr, flags)
+        return @responses.delete("FETCH")
+      end
+    end
+
+    def copy_internal(cmd, set, mailbox)
+      send_command(cmd, MessageSet.new(set), mailbox)
+    end
+
+    def sort_internal(cmd, sort_keys, search_keys, charset)
+      if search_keys.instance_of?(String)
+        search_keys = [RawData.new(search_keys)]
+      else
+        normalize_searching_criteria(search_keys)
+      end
+      normalize_searching_criteria(search_keys)
+      synchronize do
+        send_command(cmd, sort_keys, charset, *search_keys)
+        return @responses.delete("SORT")[-1]
+      end
+    end
+
+    def thread_internal(cmd, algorithm, search_keys, charset)
+      if search_keys.instance_of?(String)
+        search_keys = [RawData.new(search_keys)]
+      else
+        normalize_searching_criteria(search_keys)
+      end
+      normalize_searching_criteria(search_keys)
+      send_command(cmd, algorithm, charset, *search_keys)
+      return @responses.delete("THREAD")[-1]
+    end
+
+    def normalize_searching_criteria(keys)
+      keys.collect! do |i|
+        case i
+        when -1, Range, Array
+          MessageSet.new(i)
+        else
+          i
+        end
+      end
+    end
+
+    def self.u16tou8(s)
+      len = s.length
+      if len < 2
+        return ""
+      end
+      buf = ""
+      i = 0
+      while i < len
+        c = s[i] << 8 | s[i + 1]
+        i += 2
+        if c == 0xfeff
+          next
+        elsif c < 0x0080
+          buf.concat(c)
+        elsif c < 0x0800
+          b2 = c & 0x003f
+          b1 = c >> 6
+          buf.concat(b1 | 0xc0)
+          buf.concat(b2 | 0x80)
+        elsif c >= 0xdc00 && c < 0xe000
+          raise DataFormatError, "invalid surrogate detected"
+        elsif c >= 0xd800 && c < 0xdc00
+          if i + 2 > len
+            raise DataFormatError, "invalid surrogate detected"
+          end
+          low = s[i] << 8 | s[i + 1]
+          i += 2
+          if low < 0xdc00 || low > 0xdfff
+            raise DataFormatError, "invalid surrogate detected"
+          end
+          c = (((c & 0x03ff)) << 10 | (low & 0x03ff)) + 0x10000
+          b4 = c & 0x003f
+          b3 = (c >> 6) & 0x003f
+          b2 = (c >> 12) & 0x003f
+          b1 = c >> 18;
+          buf.concat(b1 | 0xf0)
+          buf.concat(b2 | 0x80)
+          buf.concat(b3 | 0x80)
+          buf.concat(b4 | 0x80)
+        else # 0x0800-0xffff
+          b3 = c & 0x003f
+          b2 = (c >> 6) & 0x003f
+          b1 = c >> 12
+          buf.concat(b1 | 0xe0)
+          buf.concat(b2 | 0x80)
+          buf.concat(b3 | 0x80)
+        end
+      end
+      return buf
+    end
+    private_class_method :u16tou8
+
+    def self.u8tou16(s)
+      len = s.length
+      buf = ""
+      i = 0
+      while i < len
+        c = s[i]
+        if (c & 0x80) == 0
+          buf.concat(0x00)
+          buf.concat(c)
+          i += 1
+        elsif (c & 0xe0) == 0xc0 &&
+            len >= 2 &&
+            (s[i + 1] & 0xc0) == 0x80
+          if c == 0xc0 || c == 0xc1
+            raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
+          end
+          u = ((c & 0x1f) << 6) | (s[i + 1] & 0x3f)
+          buf.concat(u >> 8)
+          buf.concat(u & 0x00ff)
+          i += 2
+        elsif (c & 0xf0) == 0xe0 &&
+            i + 2 < len &&
+            (s[i + 1] & 0xc0) == 0x80 &&
+            (s[i + 2] & 0xc0) == 0x80
+          if c == 0xe0 && s[i + 1] < 0xa0
+            raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
+          end
+          u = ((c & 0x0f) << 12) | ((s[i + 1] & 0x3f) << 6) | (s[i + 2] & 0x3f)
+          # surrogate chars
+          if u >= 0xd800 && u <= 0xdfff
+            raise DataFormatError, format("none-UTF-16 char detected (%04x)", u)
+          end
+          buf.concat(u >> 8)
+          buf.concat(u & 0x00ff)
+          i += 3
+        elsif (c & 0xf8) == 0xf0 &&
+            i + 3 < len &&
+            (s[i + 1] & 0xc0) == 0x80 &&
+            (s[i + 2] & 0xc0) == 0x80 &&
+            (s[i + 3] & 0xc0) == 0x80
+          if c == 0xf0 && s[i + 1] < 0x90
+            raise DataFormatError, format("non-shortest UTF-8 sequence (%02x)", c)
+          end
+          u = ((c & 0x07) << 18) | ((s[i + 1] & 0x3f) << 12) |
+            ((s[i + 2] & 0x3f) << 6) | (s[i + 3] & 0x3f)
+          if u < 0x10000
+            buf.concat(u >> 8)
+            buf.concat(u & 0x00ff)
+          elsif u < 0x110000
+            high = ((u - 0x10000) >> 10) | 0xd800
+            low = (u & 0x03ff) | 0xdc00
+            buf.concat(high >> 8)
+            buf.concat(high & 0x00ff)
+            buf.concat(low >> 8)
+            buf.concat(low & 0x00ff)
+          else
+            raise DataFormatError, format("none-UTF-16 char detected (%04x)", u)
+          end
+          i += 4
+        else
+          raise DataFormatError, format("illegal UTF-8 sequence (%02x)", c)
+        end
+      end
+      return buf
+    end
+    private_class_method :u8tou16
+
+    class RawData # :nodoc:
+      def send_data(imap)
+        imap.send(:put_string, @data)
+      end
+
+      private
+
+      def initialize(data)
+        @data = data
+      end
+    end
+
+    class Atom # :nodoc:
+      def send_data(imap)
+        imap.send(:put_string, @data)
+      end
+
+      private
+
+      def initialize(data)
+        @data = data
+      end
+    end
+
+    class QuotedString # :nodoc:
+      def send_data(imap)
+        imap.send(:send_quoted_string, @data)
+      end
+
+      private
+
+      def initialize(data)
+        @data = data
+      end
+    end
+
+    class Literal # :nodoc:
+      def send_data(imap)
+        imap.send(:send_literal, @data)
+      end
+
+      private
+
+      def initialize(data)
+        @data = data
+      end
+    end
+
+    class MessageSet # :nodoc:
+      def send_data(imap)
+        imap.send(:put_string, format_internal(@data))
+      end
+
+      private
+
+      def initialize(data)
+        @data = data
+      end
+
+      def format_internal(data)
+        case data
+        when "*"
+          return data
+        when Integer
+          ensure_nz_number(data)
+          if data == -1
+            return "*"
+          else
+            return data.to_s
+          end
+        when Range
+          return format_internal(data.first) +
+            ":" + format_internal(data.last)
+        when Array
+          return data.collect {|i| format_internal(i)}.join(",")
+        when ThreadMember
+          return data.seqno.to_s +
+            ":" + data.children.collect {|i| format_internal(i).join(",")}
+        else
+          raise DataFormatError, data.inspect
+        end
+      end
+
+      def ensure_nz_number(num)
+        if num < -1 || num == 0 || num >= 4294967296
+          msg = "nz_number must be non-zero unsigned 32-bit integer: " +
+                num.inspect
+          raise DataFormatError, msg
+        end
+      end
+    end
+
+    # Net::IMAP::ContinuationRequest represents command continuation requests.
+    # 
+    # The command continuation request response is indicated by a "+" token
+    # instead of a tag.  This form of response indicates that the server is
+    # ready to accept the continuation of a command from the client.  The
+    # remainder of this response is a line of text.
+    # 
+    #   continue_req    ::= "+" SPACE (resp_text / base64)
+    # 
+    # ==== Fields:
+    # 
+    # data:: Returns the data (Net::IMAP::ResponseText).
+    # 
+    # raw_data:: Returns the raw data string.
+    ContinuationRequest = Struct.new(:data, :raw_data)
+
+    # Net::IMAP::UntaggedResponse represents untagged responses.
+    # 
+    # Data transmitted by the server to the client and status responses
+    # that do not indicate command completion are prefixed with the token
+    # "*", and are called untagged responses.
+    # 
+    #   response_data   ::= "*" SPACE (resp_cond_state / resp_cond_bye /
+    #                       mailbox_data / message_data / capability_data)
+    # 
+    # ==== Fields:
+    # 
+    # name:: Returns the name such as "FLAGS", "LIST", "FETCH"....
+    # 
+    # data:: Returns the data such as an array of flag symbols,
+    #         a ((<Net::IMAP::MailboxList>)) object....
+    # 
+    # raw_data:: Returns the raw data string.
+    UntaggedResponse = Struct.new(:name, :data, :raw_data)
+     
+    # Net::IMAP::TaggedResponse represents tagged responses.
+    # 
+    # The server completion result response indicates the success or
+    # failure of the operation.  It is tagged with the same tag as the
+    # client command which began the operation.
+    # 
+    #   response_tagged ::= tag SPACE resp_cond_state CRLF
+    #   
+    #   tag             ::= 1*<any ATOM_CHAR except "+">
+    #   
+    #   resp_cond_state ::= ("OK" / "NO" / "BAD") SPACE resp_text
+    # 
+    # ==== Fields:
+    # 
+    # tag:: Returns the tag.
+    # 
+    # name:: Returns the name. the name is one of "OK", "NO", "BAD".
+    # 
+    # data:: Returns the data. See ((<Net::IMAP::ResponseText>)).
+    # 
+    # raw_data:: Returns the raw data string.
+    #
+    TaggedResponse = Struct.new(:tag, :name, :data, :raw_data)
+     
+    # Net::IMAP::ResponseText represents texts of responses.
+    # The text may be prefixed by the response code.
+    # 
+    #   resp_text       ::= ["[" resp_text_code "]" SPACE] (text_mime2 / text)
+    #                       ;; text SHOULD NOT begin with "[" or "="
+    # 
+    # ==== Fields:
+    # 
+    # code:: Returns the response code. See ((<Net::IMAP::ResponseCode>)).
+    #       
+    # text:: Returns the text.
+    # 
+    ResponseText = Struct.new(:code, :text)
+
+    # 
+    # Net::IMAP::ResponseCode represents response codes.
+    # 
+    #   resp_text_code  ::= "ALERT" / "PARSE" /
+    #                       "PERMANENTFLAGS" SPACE "(" #(flag / "\*") ")" /
+    #                       "READ-ONLY" / "READ-WRITE" / "TRYCREATE" /
+    #                       "UIDVALIDITY" SPACE nz_number /
+    #                       "UNSEEN" SPACE nz_number /
+    #                       atom [SPACE 1*<any TEXT_CHAR except "]">]
+    # 
+    # ==== Fields:
+    # 
+    # name:: Returns the name such as "ALERT", "PERMANENTFLAGS", "UIDVALIDITY"....
+    # 
+    # data:: Returns the data if it exists.
+    #
+    ResponseCode = Struct.new(:name, :data)
+
+    # Net::IMAP::MailboxList represents contents of the LIST response.
+    # 
+    #   mailbox_list    ::= "(" #("\Marked" / "\Noinferiors" /
+    #                       "\Noselect" / "\Unmarked" / flag_extension) ")"
+    #                       SPACE (<"> QUOTED_CHAR <"> / nil) SPACE mailbox
+    # 
+    # ==== Fields:
+    # 
+    # attr:: Returns the name attributes. Each name attribute is a symbol
+    #        capitalized by String#capitalize, such as :Noselect (not :NoSelect).
+    # 
+    # delim:: Returns the hierarchy delimiter
+    # 
+    # name:: Returns the mailbox name.
+    #
+    MailboxList = Struct.new(:attr, :delim, :name)
+
+    # Net::IMAP::MailboxQuota represents contents of GETQUOTA response.
+    # This object can also be a response to GETQUOTAROOT.  In the syntax
+    # specification below, the delimiter used with the "#" construct is a
+    # single space (SPACE).
+    # 
+    #    quota_list      ::= "(" #quota_resource ")"
+    # 
+    #    quota_resource  ::= atom SPACE number SPACE number
+    # 
+    #    quota_response  ::= "QUOTA" SPACE astring SPACE quota_list
+    # 
+    # ==== Fields:
+    # 
+    # mailbox:: The mailbox with the associated quota.
+    # 
+    # usage:: Current storage usage of mailbox.
+    # 
+    # quota:: Quota limit imposed on mailbox.
+    #
+    MailboxQuota = Struct.new(:mailbox, :usage, :quota)
+
+    # Net::IMAP::MailboxQuotaRoot represents part of the GETQUOTAROOT
+    # response. (GETQUOTAROOT can also return Net::IMAP::MailboxQuota.)
+    # 
+    #    quotaroot_response ::= "QUOTAROOT" SPACE astring *(SPACE astring)
+    # 
+    # ==== Fields:
+    # 
+    # mailbox:: The mailbox with the associated quota.
+    # 
+    # quotaroots:: Zero or more quotaroots that effect the quota on the
+    #              specified mailbox.
+    #
+    MailboxQuotaRoot = Struct.new(:mailbox, :quotaroots)
+
+    # Net::IMAP::MailboxACLItem represents response from GETACL.
+    # 
+    #    acl_data        ::= "ACL" SPACE mailbox *(SPACE identifier SPACE rights)
+    # 
+    #    identifier      ::= astring
+    # 
+    #    rights          ::= astring
+    # 
+    # ==== Fields:
+    # 
+    # user:: Login name that has certain rights to the mailbox
+    #        that was specified with the getacl command.
+    # 
+    # rights:: The access rights the indicated user has to the
+    #          mailbox.
+    #
+    MailboxACLItem = Struct.new(:user, :rights)
+
+    # Net::IMAP::StatusData represents contents of the STATUS response.
+    # 
+    # ==== Fields:
+    # 
+    # mailbox:: Returns the mailbox name.
+    # 
+    # attr:: Returns a hash. Each key is one of "MESSAGES", "RECENT", "UIDNEXT",
+    #        "UIDVALIDITY", "UNSEEN". Each value is a number.
+    # 
+    StatusData = Struct.new(:mailbox, :attr)
+
+    # Net::IMAP::FetchData represents contents of the FETCH response.
+    # 
+    # ==== Fields:
+    # 
+    # seqno:: Returns the message sequence number.
+    #         (Note: not the unique identifier, even for the UID command response.)
+    # 
+    # attr:: Returns a hash. Each key is a data item name, and each value is
+    #        its value.
+    # 
+    #        The current data items are:
+    # 
+    #        [BODY]
+    #           A form of BODYSTRUCTURE without extension data.
+    #        [BODY[<section>]<<origin_octet>>]
+    #           A string expressing the body contents of the specified section.
+    #        [BODYSTRUCTURE]
+    #           An object that describes the [MIME-IMB] body structure of a message.
+    #           See Net::IMAP::BodyTypeBasic, Net::IMAP::BodyTypeText,
+    #           Net::IMAP::BodyTypeMessage, Net::IMAP::BodyTypeMultipart.
+    #        [ENVELOPE]
+    #           A Net::IMAP::Envelope object that describes the envelope
+    #           structure of a message.
+    #        [FLAGS]
+    #           A array of flag symbols that are set for this message. flag symbols
+    #           are capitalized by String#capitalize.
+    #        [INTERNALDATE]
+    #           A string representing the internal date of the message.
+    #        [RFC822]
+    #           Equivalent to BODY[].
+    #        [RFC822.HEADER]
+    #           Equivalent to BODY.PEEK[HEADER].
+    #        [RFC822.SIZE]
+    #           A number expressing the [RFC-822] size of the message.
+    #        [RFC822.TEXT]
+    #           Equivalent to BODY[TEXT].
+    #        [UID]
+    #           A number expressing the unique identifier of the message.
+    # 
+    FetchData = Struct.new(:seqno, :attr)
+
+    # Net::IMAP::Envelope represents envelope structures of messages.
+    # 
+    # ==== Fields:
+    # 
+    # date:: Returns a string that represents the date.
+    # 
+    # subject:: Returns a string that represents the subject.
+    # 
+    # from:: Returns an array of Net::IMAP::Address that represents the from.
+    # 
+    # sender:: Returns an array of Net::IMAP::Address that represents the sender.
+    # 
+    # reply_to:: Returns an array of Net::IMAP::Address that represents the reply-to.
+    # 
+    # to:: Returns an array of Net::IMAP::Address that represents the to.
+    # 
+    # cc:: Returns an array of Net::IMAP::Address that represents the cc.
+    # 
+    # bcc:: Returns an array of Net::IMAP::Address that represents the bcc.
+    # 
+    # in_reply_to:: Returns a string that represents the in-reply-to.
+    # 
+    # message_id:: Returns a string that represents the message-id.
+    # 
+    Envelope = Struct.new(:date, :subject, :from, :sender, :reply_to,
+                          :to, :cc, :bcc, :in_reply_to, :message_id)
+
+    # 
+    # Net::IMAP::Address represents electronic mail addresses.
+    # 
+    # ==== Fields:
+    # 
+    # name:: Returns the phrase from [RFC-822] mailbox.
+    # 
+    # route:: Returns the route from [RFC-822] route-addr.
+    # 
+    # mailbox:: nil indicates end of [RFC-822] group.
+    #           If non-nil and host is nil, returns [RFC-822] group name.
+    #           Otherwise, returns [RFC-822] local-part
+    # 
+    # host:: nil indicates [RFC-822] group syntax.
+    #        Otherwise, returns [RFC-822] domain name.
+    #
+    Address = Struct.new(:name, :route, :mailbox, :host)
+
+    # 
+    # Net::IMAP::ContentDisposition represents Content-Disposition fields.
+    # 
+    # ==== Fields:
+    # 
+    # dsp_type:: Returns the disposition type.
+    # 
+    # param:: Returns a hash that represents parameters of the Content-Disposition
+    #         field.
+    # 
+    ContentDisposition = Struct.new(:dsp_type, :param)
+
+    # Net::IMAP::ThreadMember represents a thread-node returned 
+    # by Net::IMAP#thread
+    #
+    # ==== Fields:
+    #
+    # seqno:: The sequence number of this message.
+    #
+    # children:: an array of Net::IMAP::ThreadMember objects for mail
+    # items that are children of this in the thread.
+    #
+    ThreadMember = Struct.new(:seqno, :children)
+
+    # Net::IMAP::BodyTypeBasic represents basic body structures of messages.
+    # 
+    # ==== Fields:
+    # 
+    # media_type:: Returns the content media type name as defined in [MIME-IMB].
+    # 
+    # subtype:: Returns the content subtype name as defined in [MIME-IMB].
+    # 
+    # param:: Returns a hash that represents parameters as defined in [MIME-IMB].
+    # 
+    # content_id:: Returns a string giving the content id as defined in [MIME-IMB].
+    # 
+    # description:: Returns a string giving the content description as defined in
+    #               [MIME-IMB].
+    # 
+    # encoding:: Returns a string giving the content transfer encoding as defined in
+    #            [MIME-IMB].
+    # 
+    # size:: Returns a number giving the size of the body in octets.
+    # 
+    # md5:: Returns a string giving the body MD5 value as defined in [MD5].
+    # 
+    # disposition:: Returns a Net::IMAP::ContentDisposition object giving
+    #               the content disposition.
+    # 
+    # language:: Returns a string or an array of strings giving the body
+    #            language value as defined in [LANGUAGE-TAGS].
+    # 
+    # extension:: Returns extension data.
+    # 
+    # multipart?:: Returns false.
+    # 
+    class BodyTypeBasic < Struct.new(:media_type, :subtype,
+                                     :param, :content_id,
+                                     :description, :encoding, :size,
+                                     :md5, :disposition, :language,
+                                     :extension)
+      def multipart?
+        return false
+      end
+
+      # Obsolete: use +subtype+ instead.  Calling this will
+      # generate a warning message to +stderr+, then return 
+      # the value of +subtype+.
+      def media_subtype
+        $stderr.printf("warning: media_subtype is obsolete.\n")
+        $stderr.printf("         use subtype instead.\n")
+        return subtype
+      end
+    end
+
+    # Net::IMAP::BodyTypeText represents TEXT body structures of messages.
+    # 
+    # ==== Fields:
+    # 
+    # lines:: Returns the size of the body in text lines.
+    # 
+    # And Net::IMAP::BodyTypeText has all fields of Net::IMAP::BodyTypeBasic.
+    # 
+    class BodyTypeText < Struct.new(:media_type, :subtype,
+                                    :param, :content_id,
+                                    :description, :encoding, :size,
+                                    :lines,
+                                    :md5, :disposition, :language,
+                                    :extension)
+      def multipart?
+        return false
+      end
+
+      # Obsolete: use +subtype+ instead.  Calling this will
+      # generate a warning message to +stderr+, then return 
+      # the value of +subtype+.
+      def media_subtype
+        $stderr.printf("warning: media_subtype is obsolete.\n")
+        $stderr.printf("         use subtype instead.\n")
+        return subtype
+      end
+    end
+
+    # Net::IMAP::BodyTypeMessage represents MESSAGE/RFC822 body structures of messages.
+    # 
+    # ==== Fields:
+    # 
+    # envelope:: Returns a Net::IMAP::Envelope giving the envelope structure.
+    # 
+    # body:: Returns an object giving the body structure.
+    # 
+    # And Net::IMAP::BodyTypeMessage has all methods of Net::IMAP::BodyTypeText.
+    #
+    class BodyTypeMessage < Struct.new(:media_type, :subtype,
+                                       :param, :content_id,
+                                       :description, :encoding, :size,
+                                       :envelope, :body, :lines,
+                                       :md5, :disposition, :language,
+                                       :extension)
+      def multipart?
+        return false
+      end
+
+      # Obsolete: use +subtype+ instead.  Calling this will
+      # generate a warning message to +stderr+, then return 
+      # the value of +subtype+.
+      def media_subtype
+        $stderr.printf("warning: media_subtype is obsolete.\n")
+        $stderr.printf("         use subtype instead.\n")
+        return subtype
+      end
+    end
+
+    # Net::IMAP::BodyTypeMultipart represents multipart body structures 
+    # of messages.
+    # 
+    # ==== Fields:
+    # 
+    # media_type:: Returns the content media type name as defined in [MIME-IMB].
+    # 
+    # subtype:: Returns the content subtype name as defined in [MIME-IMB].
+    # 
+    # parts:: Returns multiple parts.
+    # 
+    # param:: Returns a hash that represents parameters as defined in [MIME-IMB].
+    # 
+    # disposition:: Returns a Net::IMAP::ContentDisposition object giving
+    #               the content disposition.
+    # 
+    # language:: Returns a string or an array of strings giving the body
+    #            language value as defined in [LANGUAGE-TAGS].
+    # 
+    # extension:: Returns extension data.
+    # 
+    # multipart?:: Returns true.
+    # 
+    class BodyTypeMultipart < Struct.new(:media_type, :subtype,
+                                         :parts,
+                                         :param, :disposition, :language,
+                                         :extension)
+      def multipart?
+        return true
+      end
+
+      # Obsolete: use +subtype+ instead.  Calling this will
+      # generate a warning message to +stderr+, then return 
+      # the value of +subtype+.
+      def media_subtype
+        $stderr.printf("warning: media_subtype is obsolete.\n")
+        $stderr.printf("         use subtype instead.\n")
+        return subtype
+      end
+    end
+
+    class ResponseParser # :nodoc:
+      def parse(str)
+        @str = str
+        @pos = 0
+        @lex_state = EXPR_BEG
+        @token = nil
+        return response
+      end
+
+      private
+
+      EXPR_BEG          = :EXPR_BEG
+      EXPR_DATA         = :EXPR_DATA
+      EXPR_TEXT         = :EXPR_TEXT
+      EXPR_RTEXT        = :EXPR_RTEXT
+      EXPR_CTEXT        = :EXPR_CTEXT
+
+      T_SPACE   = :SPACE
+      T_NIL     = :NIL
+      T_NUMBER  = :NUMBER
+      T_ATOM    = :ATOM
+      T_QUOTED  = :QUOTED
+      T_LPAR    = :LPAR
+      T_RPAR    = :RPAR
+      T_BSLASH  = :BSLASH
+      T_STAR    = :STAR
+      T_LBRA    = :LBRA
+      T_RBRA    = :RBRA
+      T_LITERAL = :LITERAL
+      T_PLUS    = :PLUS
+      T_PERCENT = :PERCENT
+      T_CRLF    = :CRLF
+      T_EOF     = :EOF
+      T_TEXT    = :TEXT
+
+      BEG_REGEXP = /\G(?:\
+(?# 1:  SPACE   )( +)|\
+(?# 2:  NIL     )(NIL)(?=[\x80-\xff(){ \x00-\x1f\x7f%*"\\\[\]+])|\
+(?# 3:  NUMBER  )(\d+)(?=[\x80-\xff(){ \x00-\x1f\x7f%*"\\\[\]+])|\
+(?# 4:  ATOM    )([^\x80-\xff(){ \x00-\x1f\x7f%*"\\\[\]+]+)|\
+(?# 5:  QUOTED  )"((?:[^\x00\r\n"\\]|\\["\\])*)"|\
+(?# 6:  LPAR    )(\()|\
+(?# 7:  RPAR    )(\))|\
+(?# 8:  BSLASH  )(\\)|\
+(?# 9:  STAR    )(\*)|\
+(?# 10: LBRA    )(\[)|\
+(?# 11: RBRA    )(\])|\
+(?# 12: LITERAL )\{(\d+)\}\r\n|\
+(?# 13: PLUS    )(\+)|\
+(?# 14: PERCENT )(%)|\
+(?# 15: CRLF    )(\r\n)|\
+(?# 16: EOF     )(\z))/ni
+
+      DATA_REGEXP = /\G(?:\
+(?# 1:  SPACE   )( )|\
+(?# 2:  NIL     )(NIL)|\
+(?# 3:  NUMBER  )(\d+)|\
+(?# 4:  QUOTED  )"((?:[^\x00\r\n"\\]|\\["\\])*)"|\
+(?# 5:  LITERAL )\{(\d+)\}\r\n|\
+(?# 6:  LPAR    )(\()|\
+(?# 7:  RPAR    )(\)))/ni
+
+      TEXT_REGEXP = /\G(?:\
+(?# 1:  TEXT    )([^\x00\r\n]*))/ni
+
+      RTEXT_REGEXP = /\G(?:\
+(?# 1:  LBRA    )(\[)|\
+(?# 2:  TEXT    )([^\x00\r\n]*))/ni
+
+      CTEXT_REGEXP = /\G(?:\
+(?# 1:  TEXT    )([^\x00\r\n\]]*))/ni
+
+      Token = Struct.new(:symbol, :value)
+
+      def response
+        token = lookahead
+        case token.symbol
+        when T_PLUS
+          result = continue_req
+        when T_STAR
+          result = response_untagged
+        else
+          result = response_tagged
+        end
+        match(T_CRLF)
+        match(T_EOF)
+        return result
+      end
+
+      def continue_req
+        match(T_PLUS)
+        match(T_SPACE)
+        return ContinuationRequest.new(resp_text, @str)
+      end
+
+      def response_untagged
+        match(T_STAR)
+        match(T_SPACE)
+        token = lookahead
+        if token.symbol == T_NUMBER
+          return numeric_response
+        elsif token.symbol == T_ATOM
+          case token.value
+          when /\A(?:OK|NO|BAD|BYE|PREAUTH)\z/ni
+            return response_cond
+          when /\A(?:FLAGS)\z/ni
+            return flags_response
+          when /\A(?:LIST|LSUB)\z/ni
+            return list_response
+          when /\A(?:QUOTA)\z/ni
+            return getquota_response
+          when /\A(?:QUOTAROOT)\z/ni
+            return getquotaroot_response
+          when /\A(?:ACL)\z/ni
+            return getacl_response
+          when /\A(?:SEARCH|SORT)\z/ni
+            return search_response
+          when /\A(?:THREAD)\z/ni
+            return thread_response
+          when /\A(?:STATUS)\z/ni
+            return status_response
+          when /\A(?:CAPABILITY)\z/ni
+            return capability_response
+          else
+            return text_response
+          end
+        else
+          parse_error("unexpected token %s", token.symbol)
+        end
+      end
+
+      def response_tagged
+        tag = atom
+        match(T_SPACE)
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        return TaggedResponse.new(tag, name, resp_text, @str)
+      end
+
+      def response_cond
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        return UntaggedResponse.new(name, resp_text, @str)
+      end
+
+      def numeric_response
+        n = number
+        match(T_SPACE)
+        token = match(T_ATOM)
+        name = token.value.upcase
+        case name
+        when "EXISTS", "RECENT", "EXPUNGE"
+          return UntaggedResponse.new(name, n, @str)
+        when "FETCH"
+          shift_token
+          match(T_SPACE)
+          data = FetchData.new(n, msg_att)
+          return UntaggedResponse.new(name, data, @str)
+        end
+      end
+
+      def msg_att
+        match(T_LPAR)
+        attr = {}
+        while true
+          token = lookahead
+          case token.symbol
+          when T_RPAR
+            shift_token
+            break
+          when T_SPACE
+            shift_token
+            token = lookahead
+          end
+          case token.value
+          when /\A(?:ENVELOPE)\z/ni
+            name, val = envelope_data
+          when /\A(?:FLAGS)\z/ni
+            name, val = flags_data
+          when /\A(?:INTERNALDATE)\z/ni
+            name, val = internaldate_data
+          when /\A(?:RFC822(?:\.HEADER|\.TEXT)?)\z/ni
+            name, val = rfc822_text
+          when /\A(?:RFC822\.SIZE)\z/ni
+            name, val = rfc822_size
+          when /\A(?:BODY(?:STRUCTURE)?)\z/ni
+            name, val = body_data
+          when /\A(?:UID)\z/ni
+            name, val = uid_data
+          else
+            parse_error("unknown attribute `%s'", token.value)
+          end
+          attr[name] = val
+        end
+        return attr
+      end
+
+      def envelope_data
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        return name, envelope
+      end
+
+      def envelope
+        @lex_state = EXPR_DATA
+        token = lookahead
+        if token.symbol == T_NIL
+          shift_token
+          result = nil
+        else
+          match(T_LPAR)
+          date = nstring
+          match(T_SPACE)
+          subject = nstring
+          match(T_SPACE)
+          from = address_list
+          match(T_SPACE)
+          sender = address_list
+          match(T_SPACE)
+          reply_to = address_list
+          match(T_SPACE)
+          to = address_list
+          match(T_SPACE)
+          cc = address_list
+          match(T_SPACE)
+          bcc = address_list
+          match(T_SPACE)
+          in_reply_to = nstring
+          match(T_SPACE)
+          message_id = nstring
+          match(T_RPAR)
+          result = Envelope.new(date, subject, from, sender, reply_to,
+                                to, cc, bcc, in_reply_to, message_id)
+        end
+        @lex_state = EXPR_BEG
+        return result
+      end
+
+      def flags_data
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        return name, flag_list
+      end
+
+      def internaldate_data
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        token = match(T_QUOTED)
+        return name, token.value
+      end
+
+      def rfc822_text
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        return name, nstring
+      end
+
+      def rfc822_size
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        return name, number
+      end
+
+      def body_data
+        token = match(T_ATOM)
+        name = token.value.upcase
+        token = lookahead
+        if token.symbol == T_SPACE
+          shift_token
+          return name, body
+        end
+        name.concat(section)
+        token = lookahead
+        if token.symbol == T_ATOM
+          name.concat(token.value)
+          shift_token
+        end
+        match(T_SPACE)
+        data = nstring
+        return name, data
+      end
+
+      def body
+        @lex_state = EXPR_DATA
+        token = lookahead
+        if token.symbol == T_NIL
+          shift_token
+          result = nil
+        else
+          match(T_LPAR)
+          token = lookahead
+          if token.symbol == T_LPAR
+            result = body_type_mpart
+          else
+            result = body_type_1part
+          end
+          match(T_RPAR)
+        end
+        @lex_state = EXPR_BEG
+        return result
+      end
+
+      def body_type_1part
+        token = lookahead
+        case token.value
+        when /\A(?:TEXT)\z/ni
+          return body_type_text
+        when /\A(?:MESSAGE)\z/ni
+          return body_type_msg
+        else
+          return body_type_basic
+        end
+      end
+
+      def body_type_basic
+        mtype, msubtype = media_type
+        token = lookahead
+        if token.symbol == T_RPAR
+          return BodyTypeBasic.new(mtype, msubtype)
+        end
+        match(T_SPACE)
+        param, content_id, desc, enc, size = body_fields
+        md5, disposition, language, extension = body_ext_1part
+        return BodyTypeBasic.new(mtype, msubtype,
+                                 param, content_id,
+                                 desc, enc, size,
+                                 md5, disposition, language, extension)
+      end
+
+      def body_type_text
+        mtype, msubtype = media_type
+        match(T_SPACE)
+        param, content_id, desc, enc, size = body_fields
+        match(T_SPACE)
+        lines = number
+        md5, disposition, language, extension = body_ext_1part
+        return BodyTypeText.new(mtype, msubtype,
+                                param, content_id,
+                                desc, enc, size,
+                                lines,
+                                md5, disposition, language, extension)
+      end
+
+      def body_type_msg
+        mtype, msubtype = media_type
+        match(T_SPACE)
+        param, content_id, desc, enc, size = body_fields
+        match(T_SPACE)
+        env = envelope
+        match(T_SPACE)
+        b = body
+        match(T_SPACE)
+        lines = number
+        md5, disposition, language, extension = body_ext_1part
+        return BodyTypeMessage.new(mtype, msubtype,
+                                   param, content_id,
+                                   desc, enc, size,
+                                   env, b, lines,
+                                   md5, disposition, language, extension)
+      end
+
+      def body_type_mpart
+        parts = []
+        while true
+          token = lookahead
+          if token.symbol == T_SPACE
+            shift_token
+            break
+          end
+          parts.push(body)
+        end
+        mtype = "MULTIPART"
+        msubtype = case_insensitive_string
+        param, disposition, language, extension = body_ext_mpart
+        return BodyTypeMultipart.new(mtype, msubtype, parts,
+                                     param, disposition, language,
+                                     extension)
+      end
+
+      def media_type
+        mtype = case_insensitive_string
+        match(T_SPACE)
+        msubtype = case_insensitive_string
+        return mtype, msubtype
+      end
+
+      def body_fields
+        param = body_fld_param
+        match(T_SPACE)
+        content_id = nstring
+        match(T_SPACE)
+        desc = nstring
+        match(T_SPACE)
+        enc = case_insensitive_string
+        match(T_SPACE)
+        size = number
+        return param, content_id, desc, enc, size
+      end
+
+      def body_fld_param
+        token = lookahead
+        if token.symbol == T_NIL
+          shift_token
+          return nil
+        end
+        match(T_LPAR)
+        param = {}
+        while true
+          token = lookahead
+          case token.symbol
+          when T_RPAR
+            shift_token
+            break
+          when T_SPACE
+            shift_token
+          end
+          name = case_insensitive_string
+          match(T_SPACE)
+          val = string
+          param[name] = val
+        end
+        return param
+      end
+
+      def body_ext_1part
+        token = lookahead
+        if token.symbol == T_SPACE
+          shift_token
+        else
+          return nil
+        end
+        md5 = nstring
+
+        token = lookahead
+        if token.symbol == T_SPACE
+          shift_token
+        else
+          return md5
+        end
+        disposition = body_fld_dsp
+
+        token = lookahead
+        if token.symbol == T_SPACE
+          shift_token
+        else
+          return md5, disposition
+        end
+        language = body_fld_lang
+
+        token = lookahead
+        if token.symbol == T_SPACE
+          shift_token
+        else
+          return md5, disposition, language
+        end
+
+        extension = body_extensions
+        return md5, disposition, language, extension
+      end
+
+      def body_ext_mpart
+        token = lookahead
+        if token.symbol == T_SPACE
+          shift_token
+        else
+          return nil
+        end
+        param = body_fld_param
+
+        token = lookahead
+        if token.symbol == T_SPACE
+          shift_token
+        else
+          return param
+        end
+        disposition = body_fld_dsp
+        match(T_SPACE)
+        language = body_fld_lang
+
+        token = lookahead
+        if token.symbol == T_SPACE
+          shift_token
+        else
+          return param, disposition, language
+        end
+
+        extension = body_extensions
+        return param, disposition, language, extension
+      end
+
+      def body_fld_dsp
+        token = lookahead
+        if token.symbol == T_NIL
+          shift_token
+          return nil
+        end
+        match(T_LPAR)
+        dsp_type = case_insensitive_string
+        match(T_SPACE)
+        param = body_fld_param
+        match(T_RPAR)
+        return ContentDisposition.new(dsp_type, param)
+      end
+
+      def body_fld_lang
+        token = lookahead
+        if token.symbol == T_LPAR
+          shift_token
+          result = []
+          while true
+            token = lookahead
+            case token.symbol
+            when T_RPAR
+              shift_token
+              return result
+            when T_SPACE
+              shift_token
+            end
+            result.push(case_insensitive_string)
+          end
+        else
+          lang = nstring
+          if lang
+            return lang.upcase
+          else
+            return lang
+          end
+        end
+      end
+
+      def body_extensions
+        result = []
+        while true
+          token = lookahead
+          case token.symbol
+          when T_RPAR
+            return result
+          when T_SPACE
+            shift_token
+          end
+          result.push(body_extension)
+        end
+      end
+
+      def body_extension
+        token = lookahead
+        case token.symbol
+        when T_LPAR
+          shift_token
+          result = body_extensions
+          match(T_RPAR)
+          return result
+        when T_NUMBER
+          return number
+        else
+          return nstring
+        end
+      end
+
+      def section
+        str = ""
+        token = match(T_LBRA)
+        str.concat(token.value)
+        token = match(T_ATOM, T_NUMBER, T_RBRA)
+        if token.symbol == T_RBRA
+          str.concat(token.value)
+          return str
+        end
+        str.concat(token.value)
+        token = lookahead
+        if token.symbol == T_SPACE
+          shift_token
+          str.concat(token.value)
+          token = match(T_LPAR)
+          str.concat(token.value)
+          while true
+            token = lookahead
+            case token.symbol
+            when T_RPAR
+              str.concat(token.value)
+              shift_token
+              break
+            when T_SPACE
+              shift_token
+              str.concat(token.value)
+            end
+            str.concat(format_string(astring))
+          end
+        end
+        token = match(T_RBRA)
+        str.concat(token.value)
+        return str
+      end
+
+      def format_string(str)
+        case str
+        when ""
+          return '""'
+        when /[\x80-\xff\r\n]/n
+          # literal
+          return "{" + str.length.to_s + "}" + CRLF + str
+        when /[(){ \x00-\x1f\x7f%*"\\]/n
+          # quoted string
+          return '"' + str.gsub(/["\\]/n, "\\\\\\&") + '"'
+        else
+          # atom
+          return str
+        end
+      end
+
+      def uid_data
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        return name, number
+      end
+
+      def text_response
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        @lex_state = EXPR_TEXT
+        token = match(T_TEXT)
+        @lex_state = EXPR_BEG
+        return UntaggedResponse.new(name, token.value)
+      end
+
+      def flags_response
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        return UntaggedResponse.new(name, flag_list, @str)
+      end
+
+      def list_response
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        return UntaggedResponse.new(name, mailbox_list, @str)
+      end
+
+      def mailbox_list
+        attr = flag_list
+        match(T_SPACE)
+        token = match(T_QUOTED, T_NIL)
+        if token.symbol == T_NIL
+          delim = nil
+        else
+          delim = token.value
+        end
+        match(T_SPACE)
+        name = astring
+        return MailboxList.new(attr, delim, name)
+      end
+
+      def getquota_response
+        # If quota never established, get back
+        # `NO Quota root does not exist'.
+        # If quota removed, get `()' after the
+        # folder spec with no mention of `STORAGE'.
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        mailbox = astring
+        match(T_SPACE)
+        match(T_LPAR)
+        token = lookahead
+        case token.symbol
+        when T_RPAR
+          shift_token
+          data = MailboxQuota.new(mailbox, nil, nil)
+          return UntaggedResponse.new(name, data, @str)
+        when T_ATOM
+          shift_token
+          match(T_SPACE)
+          token = match(T_NUMBER)
+          usage = token.value
+          match(T_SPACE)
+          token = match(T_NUMBER)
+          quota = token.value
+          match(T_RPAR)
+          data = MailboxQuota.new(mailbox, usage, quota)
+          return UntaggedResponse.new(name, data, @str)
+        else
+          parse_error("unexpected token %s", token.symbol)
+        end
+      end
+
+      def getquotaroot_response
+        # Similar to getquota, but only admin can use getquota.
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        mailbox = astring
+        quotaroots = []
+        while true
+          token = lookahead
+          break unless token.symbol == T_SPACE
+          shift_token
+          quotaroots.push(astring)
+        end
+        data = MailboxQuotaRoot.new(mailbox, quotaroots)
+        return UntaggedResponse.new(name, data, @str)
+      end
+
+      def getacl_response
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        mailbox = astring
+        data = []
+        token = lookahead
+        if token.symbol == T_SPACE
+          shift_token
+          while true
+            token = lookahead
+            case token.symbol
+            when T_CRLF
+              break
+            when T_SPACE
+              shift_token
+            end
+            user = astring
+            match(T_SPACE)
+            rights = astring
+            ##XXX data.push([user, rights])
+            data.push(MailboxACLItem.new(user, rights))
+          end
+        end
+        return UntaggedResponse.new(name, data, @str)
+      end
+
+      def search_response
+        token = match(T_ATOM)
+        name = token.value.upcase
+        token = lookahead
+        if token.symbol == T_SPACE
+          shift_token
+          data = []
+          while true
+            token = lookahead
+            case token.symbol
+            when T_CRLF
+              break
+            when T_SPACE
+              shift_token
+            end
+            data.push(number)
+          end
+        else
+          data = []
+        end
+        return UntaggedResponse.new(name, data, @str)
+      end
+
+      def thread_response
+        token = match(T_ATOM)
+        name = token.value.upcase
+        token = lookahead
+
+        if token.symbol == T_SPACE
+          threads = []
+
+          while true
+            shift_token
+            token = lookahead
+
+            case token.symbol
+            when T_LPAR
+              threads << thread_branch(token)
+            when T_CRLF
+              break
+            end
+          end
+        else
+          # no member
+          threads = []
+        end
+
+        return UntaggedResponse.new(name, threads, @str)
+      end
+
+      def thread_branch(token)
+        rootmember = nil
+        lastmember = nil
+        
+        while true
+          shift_token    # ignore first T_LPAR
+          token = lookahead
+          
+          case token.symbol
+          when T_NUMBER
+            # new member
+            newmember = ThreadMember.new(number, [])
+            if rootmember.nil?
+              rootmember = newmember
+            else    
+              lastmember.children << newmember
+            end     
+            lastmember = newmember
+          when T_SPACE 
+            # do nothing 
+          when T_LPAR
+            if rootmember.nil?
+              # dummy member
+              lastmember = rootmember = ThreadMember.new(nil, [])
+            end     
+            
+            lastmember.children << thread_branch(token)
+          when T_RPAR
+            break   
+          end     
+        end
+        
+        return rootmember
+      end
+
+      def status_response
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        mailbox = astring
+        match(T_SPACE)
+        match(T_LPAR)
+        attr = {}
+        while true
+          token = lookahead
+          case token.symbol
+          when T_RPAR
+            shift_token
+            break
+          when T_SPACE
+            shift_token
+          end
+          token = match(T_ATOM)
+          key = token.value.upcase
+          match(T_SPACE)
+          val = number
+          attr[key] = val
+        end
+        data = StatusData.new(mailbox, attr)
+        return UntaggedResponse.new(name, data, @str)
+      end
+
+      def capability_response
+        token = match(T_ATOM)
+        name = token.value.upcase
+        match(T_SPACE)
+        data = []
+        while true
+          token = lookahead
+          case token.symbol
+          when T_CRLF
+            break
+          when T_SPACE
+            shift_token
+          end
+          data.push(atom.upcase)
+        end
+        return UntaggedResponse.new(name, data, @str)
+      end
+
+      def resp_text
+        @lex_state = EXPR_RTEXT
+        token = lookahead
+        if token.symbol == T_LBRA
+          code = resp_text_code
+        else
+          code = nil
+        end
+        token = match(T_TEXT)
+        @lex_state = EXPR_BEG
+        return ResponseText.new(code, token.value)
+      end
+
+      def resp_text_code
+        @lex_state = EXPR_BEG
+        match(T_LBRA)
+        token = match(T_ATOM)
+        name = token.value.upcase
+        case name
+        when /\A(?:ALERT|PARSE|READ-ONLY|READ-WRITE|TRYCREATE|NOMODSEQ)\z/n
+          result = ResponseCode.new(name, nil)
+        when /\A(?:PERMANENTFLAGS)\z/n
+          match(T_SPACE)
+          result = ResponseCode.new(name, flag_list)
+        when /\A(?:UIDVALIDITY|UIDNEXT|UNSEEN)\z/n
+          match(T_SPACE)
+          result = ResponseCode.new(name, number)
+        else
+          match(T_SPACE)
+          @lex_state = EXPR_CTEXT
+          token = match(T_TEXT)
+          @lex_state = EXPR_BEG
+          result = ResponseCode.new(name, token.value)
+        end
+        match(T_RBRA)
+        @lex_state = EXPR_RTEXT
+        return result
+      end
+
+      def address_list
+        token = lookahead
+        if token.symbol == T_NIL
+          shift_token
+          return nil
+        else
+          result = []
+          match(T_LPAR)
+          while true
+            token = lookahead
+            case token.symbol
+            when T_RPAR
+              shift_token
+              break
+            when T_SPACE
+              shift_token
+            end
+            result.push(address)
+          end
+          return result
+        end
+      end
+
+      ADDRESS_REGEXP = /\G\
+(?# 1: NAME     )(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)") \
+(?# 2: ROUTE    )(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)") \
+(?# 3: MAILBOX  )(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)") \
+(?# 4: HOST     )(?:NIL|"((?:[^\x80-\xff\x00\r\n"\\]|\\["\\])*)")\
+\)/ni
+
+      def address
+        match(T_LPAR)
+        if @str.index(ADDRESS_REGEXP, @pos)
+          # address does not include literal.
+          @pos = $~.end(0)
+          name = $1
+          route = $2
+          mailbox = $3
+          host = $4
+          for s in [name, route, mailbox, host]
+            if s
+              s.gsub!(/\\(["\\])/n, "\\1")
+            end
+          end
+        else
+          name = nstring
+          match(T_SPACE)
+          route = nstring
+          match(T_SPACE)
+          mailbox = nstring
+          match(T_SPACE)
+          host = nstring
+          match(T_RPAR)
+        end
+        return Address.new(name, route, mailbox, host)
+      end
+
+#        def flag_list
+#       result = []
+#       match(T_LPAR)
+#       while true
+#         token = lookahead
+#         case token.symbol
+#         when T_RPAR
+#           shift_token
+#           break
+#         when T_SPACE
+#           shift_token
+#         end
+#         result.push(flag)
+#       end
+#       return result
+#        end
+
+#        def flag
+#       token = lookahead
+#       if token.symbol == T_BSLASH
+#         shift_token
+#         token = lookahead
+#         if token.symbol == T_STAR
+#           shift_token
+#           return token.value.intern
+#         else
+#           return atom.intern
+#         end
+#       else
+#         return atom
+#       end
+#        end
+
+      FLAG_REGEXP = /\
+(?# FLAG        )\\([^\x80-\xff(){ \x00-\x1f\x7f%"\\]+)|\
+(?# ATOM        )([^\x80-\xff(){ \x00-\x1f\x7f%*"\\]+)/n
+
+      def flag_list
+        if @str.index(/\(([^)]*)\)/ni, @pos)
+          @pos = $~.end(0)
+          return $1.scan(FLAG_REGEXP).collect { |flag, atom|
+            atom || flag.capitalize.intern
+          }
+        else
+          parse_error("invalid flag list")
+        end
+      end
+
+      def nstring
+        token = lookahead
+        if token.symbol == T_NIL
+          shift_token
+          return nil
+        else
+          return string
+        end
+      end
+
+      def astring
+        token = lookahead
+        if string_token?(token)
+          return string
+        else
+          return atom
+        end
+      end
+
+      def string
+        token = lookahead
+        if token.symbol == T_NIL
+          shift_token
+          return nil
+        end
+        token = match(T_QUOTED, T_LITERAL)
+        return token.value
+      end
+
+      STRING_TOKENS = [T_QUOTED, T_LITERAL, T_NIL]
+
+      def string_token?(token)
+        return STRING_TOKENS.include?(token.symbol)
+      end
+
+      def case_insensitive_string
+        token = lookahead
+        if token.symbol == T_NIL
+          shift_token
+          return nil
+        end
+        token = match(T_QUOTED, T_LITERAL)
+        return token.value.upcase
+      end
+
+      def atom
+        result = ""
+        while true
+          token = lookahead
+          if atom_token?(token)
+            result.concat(token.value)
+            shift_token
+          else
+            if result.empty?
+              parse_error("unexpected token %s", token.symbol)
+            else
+              return result
+            end
+          end
+        end
+      end
+
+      ATOM_TOKENS = [
+        T_ATOM,
+        T_NUMBER,
+        T_NIL,
+        T_LBRA,
+        T_RBRA,
+        T_PLUS
+      ]
+
+      def atom_token?(token)
+        return ATOM_TOKENS.include?(token.symbol)
+      end
+
+      def number
+        token = lookahead
+        if token.symbol == T_NIL
+          shift_token
+          return nil
+        end
+        token = match(T_NUMBER)
+        return token.value.to_i
+      end
+
+      def nil_atom
+        match(T_NIL)
+        return nil
+      end
+
+      def match(*args)
+        token = lookahead
+        unless args.include?(token.symbol)
+          parse_error('unexpected token %s (expected %s)',
+                      token.symbol.id2name,
+                      args.collect {|i| i.id2name}.join(" or "))
+        end
+        shift_token
+        return token
+      end
+
+      def lookahead
+        unless @token
+          @token = next_token
+        end
+        return @token
+      end
+
+      def shift_token
+        @token = nil
+      end
+
+      def next_token
+        case @lex_state
+        when EXPR_BEG
+          if @str.index(BEG_REGEXP, @pos)
+            @pos = $~.end(0)
+            if $1
+              return Token.new(T_SPACE, $+)
+            elsif $2
+              return Token.new(T_NIL, $+)
+            elsif $3
+              return Token.new(T_NUMBER, $+)
+            elsif $4
+              return Token.new(T_ATOM, $+)
+            elsif $5
+              return Token.new(T_QUOTED,
+                               $+.gsub(/\\(["\\])/n, "\\1"))
+            elsif $6
+              return Token.new(T_LPAR, $+)
+            elsif $7
+              return Token.new(T_RPAR, $+)
+            elsif $8
+              return Token.new(T_BSLASH, $+)
+            elsif $9
+              return Token.new(T_STAR, $+)
+            elsif $10
+              return Token.new(T_LBRA, $+)
+            elsif $11
+              return Token.new(T_RBRA, $+)
+            elsif $12
+              len = $+.to_i
+              val = @str[@pos, len]
+              @pos += len
+              return Token.new(T_LITERAL, val)
+            elsif $13
+              return Token.new(T_PLUS, $+)
+            elsif $14
+              return Token.new(T_PERCENT, $+)
+            elsif $15
+              return Token.new(T_CRLF, $+)
+            elsif $16
+              return Token.new(T_EOF, $+)
+            else
+              parse_error("[Net::IMAP BUG] BEG_REGEXP is invalid")
+            end
+          else
+            @str.index(/\S*/n, @pos)
+            parse_error("unknown token - %s", $&.dump)
+          end
+        when EXPR_DATA
+          if @str.index(DATA_REGEXP, @pos)
+            @pos = $~.end(0)
+            if $1
+              return Token.new(T_SPACE, $+)
+            elsif $2
+              return Token.new(T_NIL, $+)
+            elsif $3
+              return Token.new(T_NUMBER, $+)
+            elsif $4
+              return Token.new(T_QUOTED,
+                               $+.gsub(/\\(["\\])/n, "\\1"))
+            elsif $5
+              len = $+.to_i
+              val = @str[@pos, len]
+              @pos += len
+              return Token.new(T_LITERAL, val)
+            elsif $6
+              return Token.new(T_LPAR, $+)
+            elsif $7
+              return Token.new(T_RPAR, $+)
+            else
+              parse_error("[Net::IMAP BUG] DATA_REGEXP is invalid")
+            end
+          else
+            @str.index(/\S*/n, @pos)
+            parse_error("unknown token - %s", $&.dump)
+          end
+        when EXPR_TEXT
+          if @str.index(TEXT_REGEXP, @pos)
+            @pos = $~.end(0)
+            if $1
+              return Token.new(T_TEXT, $+)
+            else
+              parse_error("[Net::IMAP BUG] TEXT_REGEXP is invalid")
+            end
+          else
+            @str.index(/\S*/n, @pos)
+            parse_error("unknown token - %s", $&.dump)
+          end
+        when EXPR_RTEXT
+          if @str.index(RTEXT_REGEXP, @pos)
+            @pos = $~.end(0)
+            if $1
+              return Token.new(T_LBRA, $+)
+            elsif $2
+              return Token.new(T_TEXT, $+)
+            else
+              parse_error("[Net::IMAP BUG] RTEXT_REGEXP is invalid")
+            end
+          else
+            @str.index(/\S*/n, @pos)
+            parse_error("unknown token - %s", $&.dump)
+          end
+        when EXPR_CTEXT
+          if @str.index(CTEXT_REGEXP, @pos)
+            @pos = $~.end(0)
+            if $1
+              return Token.new(T_TEXT, $+)
+            else
+              parse_error("[Net::IMAP BUG] CTEXT_REGEXP is invalid")
+            end
+          else
+            @str.index(/\S*/n, @pos) #/
+            parse_error("unknown token - %s", $&.dump)
+          end
+        else
+          parse_error("illegal @lex_state - %s", @lex_state.inspect)
+        end
+      end
+
+      def parse_error(fmt, *args)
+        if IMAP.debug
+          $stderr.printf("@str: %s\n", @str.dump)
+          $stderr.printf("@pos: %d\n", @pos)
+          $stderr.printf("@lex_state: %s\n", @lex_state)
+          if @token
+            $stderr.printf("@token.symbol: %s\n", @token.symbol)
+            $stderr.printf("@token.value: %s\n", @token.value.inspect)
+          end
+        end
+        raise ResponseParseError, format(fmt, *args)
+      end
+    end
+
+    # Authenticator for the "LOGIN" authentication type.  See
+    # #authenticate().
+    class LoginAuthenticator
+      def process(data)
+        case @state
+        when STATE_USER
+          @state = STATE_PASSWORD
+          return @user
+        when STATE_PASSWORD
+          return @password
+        end
+      end
+
+      private
+
+      STATE_USER = :USER
+      STATE_PASSWORD = :PASSWORD
+
+      def initialize(user, password)
+        @user = user
+        @password = password
+        @state = STATE_USER
+      end
+    end
+    add_authenticator "LOGIN", LoginAuthenticator
+
+    # Authenticator for the "CRAM-MD5" authentication type.  See
+    # #authenticate().
+    class CramMD5Authenticator
+      def process(challenge)
+        digest = hmac_md5(challenge, @password)
+        return @user + " " + digest
+      end
+
+      private
+
+      def initialize(user, password)
+        @user = user
+        @password = password
+      end
+
+      def hmac_md5(text, key)
+        if key.length > 64
+          key = Digest::MD5.digest(key)
+        end
+
+        k_ipad = key + "\0" * (64 - key.length)
+        k_opad = key + "\0" * (64 - key.length)
+        for i in 0..63
+          k_ipad[i] ^= 0x36
+          k_opad[i] ^= 0x5c
+        end
+
+        digest = Digest::MD5.digest(k_ipad + text)
+
+        return Digest::MD5.hexdigest(k_opad + digest)
+      end
+    end
+    add_authenticator "CRAM-MD5", CramMD5Authenticator
+
+    # Superclass of IMAP errors.
+    class Error < StandardError
+    end
+
+    # Error raised when data is in the incorrect format.
+    class DataFormatError < Error
+    end
+
+    # Error raised when a response from the server is non-parseable.
+    class ResponseParseError < Error
+    end
+
+    # Superclass of all errors used to encapsulate "fail" responses
+    # from the server.
+    class ResponseError < Error
+    end
+
+    # Error raised upon a "NO" response from the server, indicating
+    # that the client command could not be completed successfully.
+    class NoResponseError < ResponseError
+    end
+
+    # Error raised upon a "BAD" response from the server, indicating
+    # that the client command violated the IMAP protocol, or an internal
+    # server failure has occurred.
+    class BadResponseError < ResponseError
+    end
+
+    # Error raised upon a "BYE" response from the server, indicating 
+    # that the client is not being allowed to login, or has been timed
+    # out due to inactivity.
+    class ByeResponseError < ResponseError
+    end
+  end
+end
+
+if __FILE__ == $0
+  # :enddoc:
+  require "getoptlong"
+
+  $stdout.sync = true
+  $port = nil
+  $user = ENV["USER"] || ENV["LOGNAME"]
+  $auth = "login"
+  $ssl = false
+
+  def usage
+    $stderr.print <<EOF
+usage: #{$0} [options] <host>
+
+  --help                        print this message
+  --port=PORT                   specifies port
+  --user=USER                   specifies user
+  --auth=AUTH                   specifies auth type
+  --ssl                         use ssl
+EOF
+  end
+
+  def get_password
+    print "password: "
+    system("stty", "-echo")
+    begin
+      return gets.chop
+    ensure
+      system("stty", "echo")
+      print "\n"
+    end
+  end
+
+  def get_command
+    printf("%s@%s> ", $user, $host)
+    if line = gets
+      return line.strip.split(/\s+/)
+    else
+      return nil
+    end
+  end
+
+  parser = GetoptLong.new
+  parser.set_options(['--debug', GetoptLong::NO_ARGUMENT],
+                     ['--help', GetoptLong::NO_ARGUMENT],
+                     ['--port', GetoptLong::REQUIRED_ARGUMENT],
+                     ['--user', GetoptLong::REQUIRED_ARGUMENT],
+                     ['--auth', GetoptLong::REQUIRED_ARGUMENT],
+                     ['--ssl', GetoptLong::NO_ARGUMENT])
+  begin
+    parser.each_option do |name, arg|
+      case name
+      when "--port"
+        $port = arg
+      when "--user"
+        $user = arg
+      when "--auth"
+        $auth = arg
+      when "--ssl"
+        $ssl = true
+      when "--debug"
+        Net::IMAP.debug = true
+      when "--help"
+        usage
+        exit(1)
+      end
+    end
+  rescue
+    usage
+    exit(1)
+  end
+
+  $host = ARGV.shift
+  unless $host
+    usage
+    exit(1)
+  end
+  $port ||= $ssl ? 993 : 143
+    
+  imap = Net::IMAP.new($host, $port, $ssl)
+  begin
+    password = get_password
+    imap.authenticate($auth, $user, password)
+    while true
+      cmd, *args = get_command
+      break unless cmd
+      begin
+        case cmd
+        when "list"
+          for mbox in imap.list("", args[0] || "*")
+            if mbox.attr.include?(Net::IMAP::NOSELECT)
+              prefix = "!"
+            elsif mbox.attr.include?(Net::IMAP::MARKED)
+              prefix = "*"
+            else
+              prefix = " "
+            end
+            print prefix, mbox.name, "\n"
+          end
+        when "select"
+          imap.select(args[0] || "inbox")
+          print "ok\n"
+        when "close"
+          imap.close
+          print "ok\n"
+        when "summary"
+          unless messages = imap.responses["EXISTS"][-1]
+            puts "not selected"
+            next
+          end
+          if messages > 0
+            for data in imap.fetch(1..-1, ["ENVELOPE"])
+              print data.seqno, ": ", data.attr["ENVELOPE"].subject, "\n"
+            end
+          else
+            puts "no message"
+          end
+        when "fetch"
+          if args[0]
+            data = imap.fetch(args[0].to_i, ["RFC822.HEADER", "RFC822.TEXT"])[0]
+            puts data.attr["RFC822.HEADER"]
+            puts data.attr["RFC822.TEXT"]
+          else
+            puts "missing argument"
+          end
+        when "logout", "exit", "quit"
+          break
+        when "help", "?"
+          print <<EOF
+list [pattern]                  list mailboxes
+select [mailbox]                select mailbox
+close                           close mailbox
+summary                         display summary
+fetch [msgno]                   display message
+logout                          logout
+help, ?                         display help message
+EOF
+        else
+          print "unknown command: ", cmd, "\n"
+        end
+      rescue Net::IMAP::Error
+        puts $!
+      end
+    end
+  ensure
+    imap.logout
+    imap.disconnect
+  end
+end
+
diff --git a/ruby_1_8_6/lib/net/pop.rb b/ruby_1_8_6/lib/net/pop.rb
new file mode 100644
index 0000000000..2ecbcbdf28
--- /dev/null
+++ b/ruby_1_8_6/lib/net/pop.rb
@@ -0,0 +1,879 @@
+# = net/pop.rb
+#
+# Copyright (c) 1999-2003 Yukihiro Matsumoto.
+#
+# Copyright (c) 1999-2003 Minero Aoki.
+# 
+# Written & maintained by Minero Aoki <aamine@loveruby.net>.
+#
+# Documented by William Webber and Minero Aoki.
+# 
+# This program is free software. You can re-distribute and/or
+# modify this program under the same terms as Ruby itself,
+# Ruby Distribute License or GNU General Public License.
+# 
+# NOTE: You can find Japanese version of this document in
+# the doc/net directory of the standard ruby interpreter package.
+# 
+#   $Id$
+#
+# See Net::POP3 for documentation.
+#
+
+require 'net/protocol'
+require 'digest/md5'
+
+module Net
+
+  # Non-authentication POP3 protocol error
+  # (reply code "-ERR", except authentication).
+  class POPError < ProtocolError; end
+
+  # POP3 authentication error.
+  class POPAuthenticationError < ProtoAuthError; end
+
+  # Unexpected response from the server.
+  class POPBadResponse < POPError; end
+
+  #
+  # = Net::POP3
+  #
+  # == What is This Library?
+  # 
+  # This library provides functionality for retrieving 
+  # email via POP3, the Post Office Protocol version 3. For details
+  # of POP3, see [RFC1939] (http://www.ietf.org/rfc/rfc1939.txt).
+  # 
+  # == Examples
+  # 
+  # === Retrieving Messages 
+  # 
+  # This example retrieves messages from the server and deletes them 
+  # on the server.
+  #
+  # Messages are written to files named 'inbox/1', 'inbox/2', ....
+  # Replace 'pop.example.com' with your POP3 server address, and
+  # 'YourAccount' and 'YourPassword' with the appropriate account
+  # details.
+  # 
+  #     require 'net/pop'
+  # 
+  #     pop = Net::POP3.new('pop.example.com')
+  #     pop.start('YourAccount', 'YourPassword')             # (1)
+  #     if pop.mails.empty?
+  #       puts 'No mail.'
+  #     else
+  #       i = 0
+  #       pop.each_mail do |m|   # or "pop.mails.each ..."   # (2)
+  #         File.open("inbox/#{i}", 'w') do |f|
+  #           f.write m.pop
+  #         end
+  #         m.delete
+  #         i += 1
+  #       end
+  #       puts "#{pop.mails.size} mails popped."
+  #     end
+  #     pop.finish                                           # (3)
+  # 
+  # 1. Call Net::POP3#start and start POP session.
+  # 2. Access messages by using POP3#each_mail and/or POP3#mails.
+  # 3. Close POP session by calling POP3#finish or use the block form of #start.
+  # 
+  # === Shortened Code
+  # 
+  # The example above is very verbose. You can shorten the code by using
+  # some utility methods. First, the block form of Net::POP3.start can
+  # be used instead of POP3.new, POP3#start and POP3#finish.
+  # 
+  #     require 'net/pop'
+  # 
+  #     Net::POP3.start('pop.example.com', 110,
+  #                     'YourAccount', 'YourPassword') do |pop|
+  #       if pop.mails.empty?
+  #         puts 'No mail.'
+  #       else
+  #         i = 0
+  #         pop.each_mail do |m|   # or "pop.mails.each ..."
+  #           File.open("inbox/#{i}", 'w') do |f|
+  #             f.write m.pop
+  #           end
+  #           m.delete
+  #           i += 1
+  #         end
+  #         puts "#{pop.mails.size} mails popped."
+  #       end
+  #     end
+  # 
+  # POP3#delete_all is an alternative for #each_mail and #delete.
+  # 
+  #     require 'net/pop'
+  # 
+  #     Net::POP3.start('pop.example.com', 110,
+  #                     'YourAccount', 'YourPassword') do |pop|
+  #       if pop.mails.empty?
+  #         puts 'No mail.'
+  #       else
+  #         i = 1
+  #         pop.delete_all do |m|
+  #           File.open("inbox/#{i}", 'w') do |f|
+  #             f.write m.pop
+  #           end
+  #           i += 1
+  #         end
+  #       end
+  #     end
+  # 
+  # And here is an even shorter example.
+  # 
+  #     require 'net/pop'
+  # 
+  #     i = 0
+  #     Net::POP3.delete_all('pop.example.com', 110,
+  #                          'YourAccount', 'YourPassword') do |m|
+  #       File.open("inbox/#{i}", 'w') do |f|
+  #         f.write m.pop
+  #       end
+  #       i += 1
+  #     end
+  # 
+  # === Memory Space Issues
+  # 
+  # All the examples above get each message as one big string.
+  # This example avoids this.
+  # 
+  #     require 'net/pop'
+  # 
+  #     i = 1
+  #     Net::POP3.delete_all('pop.example.com', 110,
+  #                          'YourAccount', 'YourPassword') do |m|
+  #       File.open("inbox/#{i}", 'w') do |f|
+  #         m.pop do |chunk|    # get a message little by little.
+  #           f.write chunk
+  #         end
+  #         i += 1
+  #       end
+  #     end
+  # 
+  # === Using APOP
+  # 
+  # The net/pop library supports APOP authentication.
+  # To use APOP, use the Net::APOP class instead of the Net::POP3 class.
+  # You can use the utility method, Net::POP3.APOP(). For example:
+  # 
+  #     require 'net/pop'
+  # 
+  #     # Use APOP authentication if $isapop == true
+  #     pop = Net::POP3.APOP($is_apop).new('apop.example.com', 110)
+  #     pop.start(YourAccount', 'YourPassword') do |pop|
+  #       # Rest of the code is the same.
+  #     end
+  # 
+  # === Fetch Only Selected Mail Using 'UIDL' POP Command
+  # 
+  # If your POP server provides UIDL functionality,
+  # you can grab only selected mails from the POP server.
+  # e.g.
+  # 
+  #     def need_pop?( id )
+  #       # determine if we need pop this mail...
+  #     end
+  # 
+  #     Net::POP3.start('pop.example.com', 110,
+  #                     'Your account', 'Your password') do |pop|
+  #       pop.mails.select { |m| need_pop?(m.unique_id) }.each do |m|
+  #         do_something(m.pop)
+  #       end
+  #     end
+  # 
+  # The POPMail#unique_id() method returns the unique-id of the message as a
+  # String. Normally the unique-id is a hash of the message.
+  # 
+  class POP3 < Protocol
+
+    Revision = %q$Revision$.split[1]
+
+    #
+    # Class Parameters
+    #
+
+    # The default port for POP3 connections, port 110
+    def POP3.default_port
+      110
+    end
+
+    def POP3.socket_type   #:nodoc: obsolete
+      Net::InternetMessageIO
+    end
+
+    #
+    # Utilities
+    #
+
+    # Returns the APOP class if +isapop+ is true; otherwise, returns
+    # the POP class.  For example:
+    #
+    #     # Example 1
+    #     pop = Net::POP3::APOP($is_apop).new(addr, port)
+    #
+    #     # Example 2
+    #     Net::POP3::APOP($is_apop).start(addr, port) do |pop|
+    #       ....
+    #     end
+    #
+    def POP3.APOP( isapop )
+      isapop ? APOP : POP3
+    end
+
+    # Starts a POP3 session and iterates over each POPMail object,
+    # yielding it to the +block+.
+    # This method is equivalent to:
+    #
+    #     Net::POP3.start(address, port, account, password) do |pop|
+    #       pop.each_mail do |m|
+    #         yield m
+    #       end
+    #     end
+    #
+    # This method raises a POPAuthenticationError if authentication fails.
+    #
+    # === Example
+    #
+    #     Net::POP3.foreach('pop.example.com', 110,
+    #                       'YourAccount', 'YourPassword') do |m|
+    #       file.write m.pop
+    #       m.delete if $DELETE
+    #     end
+    #
+    def POP3.foreach( address, port = nil,
+                      account = nil, password = nil,
+                      isapop = false, &block )  # :yields: message
+      start(address, port, account, password, isapop) {|pop|
+        pop.each_mail(&block)
+      }
+    end
+
+    # Starts a POP3 session and deletes all messages on the server.
+    # If a block is given, each POPMail object is yielded to it before
+    # being deleted.
+    #
+    # This method raises a POPAuthenticationError if authentication fails.
+    #
+    # === Example
+    #
+    #     Net::POP3.delete_all('pop.example.com', 110,
+    #                          'YourAccount', 'YourPassword') do |m|
+    #       file.write m.pop
+    #     end
+    #
+    def POP3.delete_all( address, port = nil,
+                         account = nil, password = nil,
+                         isapop = false, &block )
+      start(address, port, account, password, isapop) {|pop|
+        pop.delete_all(&block)
+      }
+    end
+
+    # Opens a POP3 session, attempts authentication, and quits.
+    #
+    # This method raises POPAuthenticationError if authentication fails.
+    #
+    # === Example: normal POP3
+    #
+    #     Net::POP3.auth_only('pop.example.com', 110,
+    #                         'YourAccount', 'YourPassword')
+    #
+    # === Example: APOP
+    #
+    #     Net::POP3.auth_only('pop.example.com', 110,
+    #                         'YourAccount', 'YourPassword', true)
+    #
+    def POP3.auth_only( address, port = nil,
+                        account = nil, password = nil,
+                        isapop = false )
+      new(address, port, isapop).auth_only account, password
+    end
+
+    # Starts a pop3 session, attempts authentication, and quits.
+    # This method must not be called while POP3 session is opened.
+    # This method raises POPAuthenticationError if authentication fails.
+    def auth_only( account, password )
+      raise IOError, 'opening previously opened POP session' if started?
+      start(account, password) {
+        ;
+      }
+    end
+
+    #
+    # Session management
+    #
+
+    # Creates a new POP3 object and open the connection.  Equivalent to 
+    #
+    #   Net::POP3.new(address, port, isapop).start(account, password)
+    #
+    # If +block+ is provided, yields the newly-opened POP3 object to it,
+    # and automatically closes it at the end of the session.
+    #
+    # === Example
+    #
+    #    Net::POP3.start(addr, port, account, password) do |pop|
+    #      pop.each_mail do |m|
+    #        file.write m.pop
+    #        m.delete
+    #      end
+    #    end
+    #
+    def POP3.start( address, port = nil,
+                    account = nil, password = nil,
+                    isapop = false, &block ) # :yield: pop
+      new(address, port, isapop).start(account, password, &block)
+    end
+
+    # Creates a new POP3 object.
+    #
+    # +address+ is the hostname or ip address of your POP3 server.
+    #
+    # The optional +port+ is the port to connect to; it defaults to 110.
+    #
+    # The optional +isapop+ specifies whether this connection is going
+    # to use APOP authentication; it defaults to +false+.
+    #
+    # This method does *not* open the TCP connection.
+    def initialize( addr, port = nil, isapop = false )
+      @address = addr
+      @port = port || self.class.default_port
+      @apop = isapop
+
+      @command = nil
+      @socket = nil
+      @started = false
+      @open_timeout = 30
+      @read_timeout = 60
+      @debug_output = nil
+
+      @mails = nil
+      @n_mails = nil
+      @n_bytes = nil
+    end
+
+    # Does this instance use APOP authentication?
+    def apop?
+      @apop
+    end
+
+    # Provide human-readable stringification of class state.
+    def inspect
+      "#<#{self.class} #{@address}:#{@port} open=#{@started}>"
+    end
+
+    # *WARNING*: This method causes a serious security hole.
+    # Use this method only for debugging.
+    #
+    # Set an output stream for debugging.
+    #
+    # === Example
+    #
+    #   pop = Net::POP.new(addr, port)
+    #   pop.set_debug_output $stderr
+    #   pop.start(account, passwd) do |pop|
+    #     ....
+    #   end
+    #
+    def set_debug_output( arg )
+      @debug_output = arg
+    end
+
+    # The address to connect to.
+    attr_reader :address
+
+    # The port number to connect to.
+    attr_reader :port
+
+    # Seconds to wait until a connection is opened.
+    # If the POP3 object cannot open a connection within this time,
+    # it raises a TimeoutError exception.
+    attr_accessor :open_timeout
+
+    # Seconds to wait until reading one block (by one read(1) call).
+    # If the POP3 object cannot complete a read() within this time,
+    # it raises a TimeoutError exception.
+    attr_reader :read_timeout
+
+    # Set the read timeout.
+    def read_timeout=( sec )
+      @command.socket.read_timeout = sec if @command
+      @read_timeout = sec
+    end
+
+    # +true+ if the POP3 session has started.
+    def started?
+      @started
+    end
+
+    alias active? started?   #:nodoc: obsolete
+
+    # Starts a POP3 session.
+    #
+    # When called with block, gives a POP3 object to the block and
+    # closes the session after block call finishes.
+    #
+    # This method raises a POPAuthenticationError if authentication fails.
+    def start( account, password ) # :yield: pop
+      raise IOError, 'POP session already started' if @started
+
+      if block_given?
+        begin
+          do_start account, password
+          return yield(self)
+        ensure
+          do_finish
+        end
+      else
+        do_start account, password
+        return self
+      end
+    end
+
+    def do_start( account, password )
+      @socket = self.class.socket_type.old_open(@address, @port,
+                                   @open_timeout, @read_timeout, @debug_output)
+      on_connect
+      @command = POP3Command.new(@socket)
+      if apop?
+        @command.apop account, password
+      else
+        @command.auth account, password
+      end
+      @started = true
+    ensure
+      do_finish if not @started
+    end
+    private :do_start
+
+    def on_connect
+    end
+    private :on_connect
+
+    # Finishes a POP3 session and closes TCP connection.
+    def finish
+      raise IOError, 'POP session not yet started' unless started?
+      do_finish
+    end
+
+    def do_finish
+      @mails = nil
+      @command.quit if @command
+    ensure
+      @started = false
+      @command = nil
+      @socket.close if @socket and not @socket.closed?
+      @socket = nil
+    end
+    private :do_finish
+
+    def command
+      raise IOError, 'POP session not opened yet' \
+                                      if not @socket or @socket.closed?
+      @command
+    end
+    private :command
+
+    #
+    # POP protocol wrapper
+    #
+
+    # Returns the number of messages on the POP server.
+    def n_mails
+      return @n_mails if @n_mails
+      @n_mails, @n_bytes = command().stat
+      @n_mails
+    end
+
+    # Returns the total size in bytes of all the messages on the POP server.
+    def n_bytes
+      return @n_bytes if @n_bytes
+      @n_mails, @n_bytes = command().stat
+      @n_bytes
+    end
+
+    # Returns an array of Net::POPMail objects, representing all the
+    # messages on the server.  This array is renewed when the session
+    # restarts; otherwise, it is fetched from the server the first time
+    # this method is called (directly or indirectly) and cached.
+    #
+    # This method raises a POPError if an error occurs.
+    def mails
+      return @mails.dup if @mails
+      if n_mails() == 0
+        # some popd raises error for LIST on the empty mailbox.
+        @mails = []
+        return []
+      end
+
+      @mails = command().list.map {|num, size|
+        POPMail.new(num, size, self, command())
+      }
+      @mails.dup
+    end
+
+    # Yields each message to the passed-in block in turn.
+    # Equivalent to:
+    # 
+    #   pop3.mails.each do |popmail|
+    #     ....
+    #   end
+    #
+    # This method raises a POPError if an error occurs.
+    def each_mail( &block )  # :yield: message
+      mails().each(&block)
+    end
+
+    alias each each_mail
+
+    # Deletes all messages on the server.
+    #
+    # If called with a block, yields each message in turn before deleting it.
+    #
+    # === Example
+    #
+    #     n = 1
+    #     pop.delete_all do |m|
+    #       File.open("inbox/#{n}") do |f|
+    #         f.write m.pop
+    #       end
+    #       n += 1
+    #     end
+    #
+    # This method raises a POPError if an error occurs.
+    #
+    def delete_all # :yield: message
+      mails().each do |m|
+        yield m if block_given?
+        m.delete unless m.deleted?
+      end
+    end
+
+    # Resets the session.  This clears all "deleted" marks from messages.
+    #
+    # This method raises a POPError if an error occurs.
+    def reset
+      command().rset
+      mails().each do |m|
+        m.instance_eval {
+          @deleted = false
+        }
+      end
+    end
+
+    def set_all_uids   #:nodoc: internal use only (called from POPMail#uidl)
+      command().uidl.each do |num, uid|
+        @mails.find {|m| m.number == num }.uid = uid
+      end
+    end
+
+  end   # class POP3
+
+  # class aliases
+  POP = POP3
+  POPSession  = POP3
+  POP3Session = POP3
+
+  #
+  # This class is equivalent to POP3, except that it uses APOP authentication.
+  #
+  class APOP < POP3
+    # Always returns true.
+    def apop?
+      true
+    end
+  end
+
+  # class aliases
+  APOPSession = APOP
+
+  #
+  # This class represents a message which exists on the POP server.
+  # Instances of this class are created by the POP3 class; they should
+  # not be directly created by the user.
+  #
+  class POPMail
+
+    def initialize( num, len, pop, cmd )   #:nodoc:
+      @number = num
+      @length = len
+      @pop = pop
+      @command = cmd
+      @deleted = false
+      @uid = nil
+    end
+
+    # The sequence number of the message on the server.
+    attr_reader :number
+
+    # The length of the message in octets.
+    attr_reader :length
+    alias size length
+
+    # Provide human-readable stringification of class state.
+    def inspect
+      "#<#{self.class} #{@number}#{@deleted ? ' deleted' : ''}>"
+    end
+
+    #
+    # This method fetches the message.  If called with a block, the
+    # message is yielded to the block one chunk at a time.  If called
+    # without a block, the message is returned as a String.  The optional 
+    # +dest+ argument will be prepended to the returned String; this
+    # argument is essentially obsolete.
+    #
+    # === Example without block
+    #
+    #     POP3.start('pop.example.com', 110,
+    #                'YourAccount, 'YourPassword') do |pop|
+    #       n = 1
+    #       pop.mails.each do |popmail|
+    #         File.open("inbox/#{n}", 'w') do |f|
+    #           f.write popmail.pop              
+    #         end
+    #         popmail.delete
+    #         n += 1
+    #       end
+    #     end
+    #
+    # === Example with block
+    #
+    #     POP3.start('pop.example.com', 110,
+    #                'YourAccount, 'YourPassword') do |pop|
+    #       n = 1
+    #       pop.mails.each do |popmail|
+    #         File.open("inbox/#{n}", 'w') do |f|
+    #           popmail.pop do |chunk|            ####
+    #             f.write chunk
+    #           end
+    #         end
+    #         n += 1
+    #       end
+    #     end
+    #
+    # This method raises a POPError if an error occurs.
+    #
+    def pop( dest = '', &block ) # :yield: message_chunk
+      if block_given?
+        @command.retr(@number, &block)
+        nil
+      else
+        @command.retr(@number) do |chunk|
+          dest << chunk
+        end
+        dest
+      end
+    end
+
+    alias all pop    #:nodoc: obsolete
+    alias mail pop   #:nodoc: obsolete
+
+    # Fetches the message header and +lines+ lines of body. 
+    #
+    # The optional +dest+ argument is obsolete.
+    #
+    # This method raises a POPError if an error occurs.
+    def top( lines, dest = '' )
+      @command.top(@number, lines) do |chunk|
+        dest << chunk
+      end
+      dest
+    end
+
+    # Fetches the message header.     
+    #
+    # The optional +dest+ argument is obsolete.
+    #
+    # This method raises a POPError if an error occurs.
+    def header( dest = '' )
+      top(0, dest)
+    end
+
+    # Marks a message for deletion on the server.  Deletion does not
+    # actually occur until the end of the session; deletion may be
+    # cancelled for _all_ marked messages by calling POP3#reset().
+    #
+    # This method raises a POPError if an error occurs.
+    #
+    # === Example
+    #
+    #     POP3.start('pop.example.com', 110,
+    #                'YourAccount, 'YourPassword') do |pop|
+    #       n = 1
+    #       pop.mails.each do |popmail|
+    #         File.open("inbox/#{n}", 'w') do |f|
+    #           f.write popmail.pop
+    #         end
+    #         popmail.delete         ####
+    #         n += 1
+    #       end
+    #     end
+    #
+    def delete
+      @command.dele @number
+      @deleted = true
+    end
+
+    alias delete! delete    #:nodoc: obsolete
+
+    # True if the mail has been deleted.
+    def deleted?
+      @deleted
+    end
+
+    # Returns the unique-id of the message.
+    # Normally the unique-id is a hash string of the message.
+    #
+    # This method raises a POPError if an error occurs.
+    def unique_id
+      return @uid if @uid
+      @pop.set_all_uids
+      @uid
+    end
+
+    alias uidl unique_id
+
+    def uid=( uid )   #:nodoc: internal use only (used from POP3#set_all_uids)
+      @uid = uid
+    end
+
+  end   # class POPMail
+
+
+  class POP3Command   #:nodoc: internal use only
+
+    def initialize( sock )
+      @socket = sock
+      @error_occured = false
+      res = check_response(critical { recv_response() })
+      @apop_stamp = res.slice(/<.+>/)
+    end
+
+    def inspect
+      "#<#{self.class} socket=#{@socket}>"
+    end
+
+    def auth( account, password )
+      check_response_auth(critical {
+        check_response_auth(get_response('USER %s', account))
+        get_response('PASS %s', password)
+      })
+    end
+
+    def apop( account, password )
+      raise POPAuthenticationError, 'not APOP server; cannot login' \
+                                                      unless @apop_stamp
+      check_response_auth(critical {
+        get_response('APOP %s %s',
+                     account,
+                     Digest::MD5.hexdigest(@apop_stamp + password))
+      })
+    end
+
+    def list
+      critical {
+        getok 'LIST'
+        list = []
+        @socket.each_list_item do |line|
+          m = /\A(\d+)[ \t]+(\d+)/.match(line) or
+                  raise POPBadResponse, "bad response: #{line}"
+          list.push  [m[1].to_i, m[2].to_i]
+        end
+        return list
+      }
+    end
+
+    def stat
+      res = check_response(critical { get_response('STAT') })
+      m = /\A\+OK\s+(\d+)\s+(\d+)/.match(res) or
+              raise POPBadResponse, "wrong response format: #{res}"
+      [m[1].to_i, m[2].to_i]
+    end
+
+    def rset
+      check_response(critical { get_response 'RSET' })
+    end
+
+    def top( num, lines = 0, &block )
+      critical {
+        getok('TOP %d %d', num, lines)
+        @socket.each_message_chunk(&block)
+      }
+    end
+
+    def retr( num, &block )
+      critical {
+        getok('RETR %d', num)
+        @socket.each_message_chunk(&block)
+      }
+    end
+    
+    def dele( num )
+      check_response(critical { get_response('DELE %d', num) })
+    end
+
+    def uidl( num = nil )
+      if num
+        res = check_response(critical { get_response('UIDL %d', num) })
+        return res.split(/ /)[1]
+      else
+        critical {
+          getok('UIDL')
+          table = {}
+          @socket.each_list_item do |line|
+            num, uid = line.split
+            table[num.to_i] = uid
+          end
+          return table
+        }
+      end
+    end
+
+    def quit
+      check_response(critical { get_response('QUIT') })
+    end
+
+    private
+
+    def getok( fmt, *fargs )
+      @socket.writeline sprintf(fmt, *fargs)
+      check_response(recv_response())
+    end
+
+    def get_response( fmt, *fargs )
+      @socket.writeline sprintf(fmt, *fargs)
+      recv_response()
+    end
+
+    def recv_response
+      @socket.readline
+    end
+
+    def check_response( res )
+      raise POPError, res unless /\A\+OK/i === res
+      res
+    end
+
+    def check_response_auth( res )
+      raise POPAuthenticationError, res unless /\A\+OK/i === res
+      res
+    end
+
+    def critical
+      return '+OK dummy ok response' if @error_occured
+      begin
+        return yield()
+      rescue Exception
+        @error_occured = true
+        raise
+      end
+    end
+
+  end   # class POP3Command
+
+end   # module Net
+
diff --git a/ruby_1_8_6/lib/net/protocol.rb b/ruby_1_8_6/lib/net/protocol.rb
new file mode 100644
index 0000000000..d722fdcbd4
--- /dev/null
+++ b/ruby_1_8_6/lib/net/protocol.rb
@@ -0,0 +1,390 @@
+#
+# = net/protocol.rb
+#
+#--
+# Copyright (c) 1999-2005 Yukihiro Matsumoto
+# Copyright (c) 1999-2005 Minero Aoki
+#
+# written and maintained by Minero Aoki <aamine@loveruby.net>
+#
+# This program is free software. You can re-distribute and/or
+# modify this program under the same terms as Ruby itself,
+# Ruby Distribute License or GNU General Public License.
+#
+# $Id$
+#++
+#
+# WARNING: This file is going to remove.
+# Do not rely on the implementation written in this file.
+#
+
+require 'socket'
+require 'timeout'
+
+module Net # :nodoc:
+
+  class Protocol   #:nodoc: internal use only
+    private
+    def Protocol.protocol_param(name, val)
+      module_eval(<<-End, __FILE__, __LINE__ + 1)
+        def #{name}
+          #{val}
+        end
+      End
+    end
+  end
+
+
+  class ProtocolError          < StandardError; end
+  class ProtoSyntaxError       < ProtocolError; end
+  class ProtoFatalError        < ProtocolError; end
+  class ProtoUnknownError      < ProtocolError; end
+  class ProtoServerError       < ProtocolError; end
+  class ProtoAuthError         < ProtocolError; end
+  class ProtoCommandError      < ProtocolError; end
+  class ProtoRetriableError    < ProtocolError; end
+  ProtocRetryError = ProtoRetriableError
+
+
+  class BufferedIO   #:nodoc: internal use only
+    def initialize(io)
+      @io = io
+      @read_timeout = 60
+      @debug_output = nil
+      @rbuf = ''
+    end
+
+    attr_reader :io
+    attr_accessor :read_timeout
+    attr_accessor :debug_output
+
+    def inspect
+      "#<#{self.class} io=#{@io}>"
+    end
+
+    def closed?
+      @io.closed?
+    end
+
+    def close
+      @io.close
+    end
+
+    #
+    # Read
+    #
+
+    public
+
+    def read(len, dest = '', ignore_eof = false)
+      LOG "reading #{len} bytes..."
+      read_bytes = 0
+      begin
+        while read_bytes + @rbuf.size < len
+          dest << (s = rbuf_consume(@rbuf.size))
+          read_bytes += s.size
+          rbuf_fill
+        end
+        dest << (s = rbuf_consume(len - read_bytes))
+        read_bytes += s.size
+      rescue EOFError
+        raise unless ignore_eof
+      end
+      LOG "read #{read_bytes} bytes"
+      dest
+    end
+
+    def read_all(dest = '')
+      LOG 'reading all...'
+      read_bytes = 0
+      begin
+        while true
+          dest << (s = rbuf_consume(@rbuf.size))
+          read_bytes += s.size
+          rbuf_fill
+        end
+      rescue EOFError
+        ;
+      end
+      LOG "read #{read_bytes} bytes"
+      dest
+    end
+
+    def readuntil(terminator, ignore_eof = false)
+      begin
+        until idx = @rbuf.index(terminator)
+          rbuf_fill
+        end
+        return rbuf_consume(idx + terminator.size)
+      rescue EOFError
+        raise unless ignore_eof
+        return rbuf_consume(@rbuf.size)
+      end
+    end
+        
+    def readline
+      readuntil("\n").chop
+    end
+
+    private
+
+    def rbuf_fill
+      timeout(@read_timeout) {
+        @rbuf << @io.sysread(1024)
+      }
+    end
+
+    def rbuf_consume(len)
+      s = @rbuf.slice!(0, len)
+      @debug_output << %Q[-> #{s.dump}\n] if @debug_output
+      s
+    end
+
+    #
+    # Write
+    #
+
+    public
+
+    def write(str)
+      writing {
+        write0 str
+      }
+    end
+
+    def writeline(str)
+      writing {
+        write0 str + "\r\n"
+      }
+    end
+
+    private
+
+    def writing
+      @written_bytes = 0
+      @debug_output << '<- ' if @debug_output
+      yield
+      @debug_output << "\n" if @debug_output
+      bytes = @written_bytes
+      @written_bytes = nil
+      bytes
+    end
+
+    def write0(str)
+      @debug_output << str.dump if @debug_output
+      len = @io.write(str)
+      @written_bytes += len
+      len
+    end
+
+    #
+    # Logging
+    #
+
+    private
+
+    def LOG_off
+      @save_debug_out = @debug_output
+      @debug_output = nil
+    end
+
+    def LOG_on
+      @debug_output = @save_debug_out
+    end
+
+    def LOG(msg)
+      return unless @debug_output
+      @debug_output << msg + "\n"
+    end
+  end
+
+
+  class InternetMessageIO < BufferedIO   #:nodoc: internal use only
+    def InternetMessageIO.old_open(addr, port,
+        open_timeout = nil, read_timeout = nil, debug_output = nil)
+      debug_output << "opening connection to #{addr}...\n" if debug_output
+      s = timeout(open_timeout) { TCPsocket.new(addr, port) }
+      io = new(s)
+      io.read_timeout = read_timeout
+      io.debug_output = debug_output
+      io
+    end
+
+    def initialize(io)
+      super
+      @wbuf = nil
+    end
+
+    #
+    # Read
+    #
+
+    def each_message_chunk
+      LOG 'reading message...'
+      LOG_off()
+      read_bytes = 0
+      while (line = readuntil("\r\n")) != ".\r\n"
+        read_bytes += line.size
+        yield line.sub(/\A\./, '')
+      end
+      LOG_on()
+      LOG "read message (#{read_bytes} bytes)"
+    end
+  
+    # *library private* (cannot handle 'break')
+    def each_list_item
+      while (str = readuntil("\r\n")) != ".\r\n"
+        yield str.chop
+      end
+    end
+
+    def write_message_0(src)
+      prev = @written_bytes
+      each_crlf_line(src) do |line|
+        write0 line.sub(/\A\./, '..')
+      end
+      @written_bytes - prev
+    end
+
+    #
+    # Write
+    #
+
+    def write_message(src)
+      LOG "writing message from #{src.class}"
+      LOG_off()
+      len = writing {
+        using_each_crlf_line {
+          write_message_0 src
+        }
+      }
+      LOG_on()
+      LOG "wrote #{len} bytes"
+      len
+    end
+
+    def write_message_by_block(&block)
+      LOG 'writing message from block'
+      LOG_off()
+      len = writing {
+        using_each_crlf_line {
+          begin
+            block.call(WriteAdapter.new(self, :write_message_0))
+          rescue LocalJumpError
+            # allow `break' from writer block
+          end
+        }
+      }
+      LOG_on()
+      LOG "wrote #{len} bytes"
+      len
+    end
+
+    private
+
+    def using_each_crlf_line
+      @wbuf = ''
+      yield
+      if not @wbuf.empty?   # unterminated last line
+        write0 @wbuf.chomp + "\r\n"
+      elsif @written_bytes == 0   # empty src
+        write0 "\r\n"
+      end
+      write0 ".\r\n"
+      @wbuf = nil
+    end
+
+    def each_crlf_line(src)
+      buffer_filling(@wbuf, src) do
+        while line = @wbuf.slice!(/\A.*(?:\n|\r\n|\r(?!\z))/n)
+          yield line.chomp("\n") + "\r\n"
+        end
+      end
+    end
+
+    def buffer_filling(buf, src)
+      case src
+      when String    # for speeding up.
+        0.step(src.size - 1, 1024) do |i|
+          buf << src[i, 1024]
+          yield
+        end
+      when File    # for speeding up.
+        while s = src.read(1024)
+          buf << s
+          yield
+        end
+      else    # generic reader
+        src.each do |s|
+          buf << s
+          yield if buf.size > 1024
+        end
+        yield unless buf.empty?
+      end
+    end
+  end
+
+
+  #
+  # The writer adapter class
+  #
+  class WriteAdapter
+    def initialize(socket, method)
+      @socket = socket
+      @method_id = method
+    end
+
+    def inspect
+      "#<#{self.class} socket=#{@socket.inspect}>"
+    end
+
+    def write(str)
+      @socket.__send__(@method_id, str)
+    end
+
+    alias print write
+
+    def <<(str)
+      write str
+      self
+    end
+
+    def puts(str = '')
+      write str.chomp("\n") + "\n"
+    end
+
+    def printf(*args)
+      write sprintf(*args)
+    end
+  end
+
+
+  class ReadAdapter   #:nodoc: internal use only
+    def initialize(block)
+      @block = block
+    end
+
+    def inspect
+      "#<#{self.class}>"
+    end
+
+    def <<(str)
+      call_block(str, &@block) if @block
+    end
+
+    private
+
+    # This method is needed because @block must be called by yield,
+    # not Proc#call.  You can see difference when using `break' in
+    # the block.
+    def call_block(str)
+      yield str
+    end
+  end
+
+
+  module NetPrivate   #:nodoc: obsolete
+    Socket = ::Net::InternetMessageIO
+  end
+
+end   # module Net
diff --git a/ruby_1_8_6/lib/net/smtp.rb b/ruby_1_8_6/lib/net/smtp.rb
new file mode 100644
index 0000000000..dda9dab072
--- /dev/null
+++ b/ruby_1_8_6/lib/net/smtp.rb
@@ -0,0 +1,697 @@
+# = net/smtp.rb
+# 
+# Copyright (c) 1999-2003 Yukihiro Matsumoto.
+#
+# Copyright (c) 1999-2003 Minero Aoki.
+# 
+# Written & maintained by Minero Aoki <aamine@loveruby.net>.
+#
+# Documented by William Webber and Minero Aoki.
+# 
+# This program is free software. You can re-distribute and/or
+# modify this program under the same terms as Ruby itself,
+# Ruby Distribute License or GNU General Public License.
+# 
+# NOTE: You can find Japanese version of this document in
+# the doc/net directory of the standard ruby interpreter package.
+# 
+# $Id$
+#
+# See Net::SMTP for documentation. 
+# 
+
+require 'net/protocol'
+require 'digest/md5'
+
+module Net
+
+  # Module mixed in to all SMTP error classes
+  module SMTPError
+    # This *class* is module for some reason.
+    # In ruby 1.9.x, this module becomes a class.
+  end
+
+  # Represents an SMTP authentication error.
+  class SMTPAuthenticationError < ProtoAuthError
+    include SMTPError
+  end
+
+  # Represents SMTP error code 420 or 450, a temporary error.
+  class SMTPServerBusy < ProtoServerError
+    include SMTPError
+  end
+
+  # Represents an SMTP command syntax error (error code 500)
+  class SMTPSyntaxError < ProtoSyntaxError
+    include SMTPError
+  end
+
+  # Represents a fatal SMTP error (error code 5xx, except for 500)
+  class SMTPFatalError < ProtoFatalError
+    include SMTPError
+  end
+
+  # Unexpected reply code returned from server.
+  class SMTPUnknownError < ProtoUnknownError
+    include SMTPError
+  end
+
+  #
+  # = Net::SMTP
+  #
+  # == What is This Library?
+  # 
+  # This library provides functionality to send internet
+  # mail via SMTP, the Simple Mail Transfer Protocol. For details of
+  # SMTP itself, see [RFC2821] (http://www.ietf.org/rfc/rfc2821.txt).
+  # 
+  # == What is This Library NOT?
+  # 
+  # This library does NOT provide functions to compose internet mails.
+  # You must create them by yourself. If you want better mail support,
+  # try RubyMail or TMail. You can get both libraries from RAA.
+  # (http://www.ruby-lang.org/en/raa.html)
+  # 
+  # FYI: the official documentation on internet mail is: [RFC2822] (http://www.ietf.org/rfc/rfc2822.txt).
+  # 
+  # == Examples
+  # 
+  # === Sending Messages
+  # 
+  # You must open a connection to an SMTP server before sending messages.
+  # The first argument is the address of your SMTP server, and the second 
+  # argument is the port number. Using SMTP.start with a block is the simplest 
+  # way to do this. This way, the SMTP connection is closed automatically 
+  # after the block is executed.
+  # 
+  #     require 'net/smtp'
+  #     Net::SMTP.start('your.smtp.server', 25) do |smtp|
+  #       # Use the SMTP object smtp only in this block.
+  #     end
+  # 
+  # Replace 'your.smtp.server' with your SMTP server. Normally
+  # your system manager or internet provider supplies a server
+  # for you.
+  # 
+  # Then you can send messages.
+  # 
+  #     msgstr = <<END_OF_MESSAGE
+  #     From: Your Name <your@mail.address>
+  #     To: Destination Address <someone@example.com>
+  #     Subject: test message
+  #     Date: Sat, 23 Jun 2001 16:26:43 +0900
+  #     Message-Id: <unique.message.id.string@example.com>
+  # 
+  #     This is a test message.
+  #     END_OF_MESSAGE
+  # 
+  #     require 'net/smtp'
+  #     Net::SMTP.start('your.smtp.server', 25) do |smtp|
+  #       smtp.send_message msgstr,
+  #                         'your@mail.address',
+  #                         'his_addess@example.com'
+  #     end
+  # 
+  # === Closing the Session
+  # 
+  # You MUST close the SMTP session after sending messages, by calling 
+  # the #finish method:
+  # 
+  #     # using SMTP#finish
+  #     smtp = Net::SMTP.start('your.smtp.server', 25)
+  #     smtp.send_message msgstr, 'from@address', 'to@address'
+  #     smtp.finish
+  # 
+  # You can also use the block form of SMTP.start/SMTP#start.  This closes
+  # the SMTP session automatically:
+  # 
+  #     # using block form of SMTP.start
+  #     Net::SMTP.start('your.smtp.server', 25) do |smtp|
+  #       smtp.send_message msgstr, 'from@address', 'to@address'
+  #     end
+  # 
+  # I strongly recommend this scheme.  This form is simpler and more robust.
+  # 
+  # === HELO domain
+  # 
+  # In almost all situations, you must provide a third argument
+  # to SMTP.start/SMTP#start. This is the domain name which you are on
+  # (the host to send mail from). It is called the "HELO domain".
+  # The SMTP server will judge whether it should send or reject
+  # the SMTP session by inspecting the HELO domain.
+  # 
+  #     Net::SMTP.start('your.smtp.server', 25,
+  #                     'mail.from.domain') { |smtp| ... }
+  # 
+  # === SMTP Authentication
+  # 
+  # The Net::SMTP class supports three authentication schemes;
+  # PLAIN, LOGIN and CRAM MD5.  (SMTP Authentication: [RFC2554])
+  # To use SMTP authentication, pass extra arguments to 
+  # SMTP.start/SMTP#start.
+  # 
+  #     # PLAIN
+  #     Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
+  #                     'Your Account', 'Your Password', :plain)
+  #     # LOGIN
+  #     Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
+  #                     'Your Account', 'Your Password', :login)
+  # 
+  #     # CRAM MD5
+  #     Net::SMTP.start('your.smtp.server', 25, 'mail.from.domain',
+  #                     'Your Account', 'Your Password', :cram_md5)
+  #
+  class SMTP
+
+    Revision = %q$Revision$.split[1]
+
+    # The default SMTP port, port 25.
+    def SMTP.default_port
+      25
+    end
+
+    #
+    # Creates a new Net::SMTP object.
+    #
+    # +address+ is the hostname or ip address of your SMTP
+    # server.  +port+ is the port to connect to; it defaults to
+    # port 25.
+    #
+    # This method does not open the TCP connection.  You can use
+    # SMTP.start instead of SMTP.new if you want to do everything
+    # at once.  Otherwise, follow SMTP.new with SMTP#start.
+    #
+    def initialize( address, port = nil )
+      @address = address
+      @port = (port || SMTP.default_port)
+      @esmtp = true
+      @socket = nil
+      @started = false
+      @open_timeout = 30
+      @read_timeout = 60
+      @error_occured = false
+      @debug_output = nil
+    end
+
+    # Provide human-readable stringification of class state.
+    def inspect
+      "#<#{self.class} #{@address}:#{@port} started=#{@started}>"
+    end
+
+    # +true+ if the SMTP object uses ESMTP (which it does by default).
+    def esmtp?
+      @esmtp
+    end
+
+    #
+    # Set whether to use ESMTP or not.  This should be done before 
+    # calling #start.  Note that if #start is called in ESMTP mode,
+    # and the connection fails due to a ProtocolError, the SMTP
+    # object will automatically switch to plain SMTP mode and
+    # retry (but not vice versa).
+    #
+    def esmtp=( bool )
+      @esmtp = bool
+    end
+
+    alias esmtp esmtp?
+
+    # The address of the SMTP server to connect to.
+    attr_reader :address
+
+    # The port number of the SMTP server to connect to.
+    attr_reader :port
+
+    # Seconds to wait while attempting to open a connection.
+    # If the connection cannot be opened within this time, a
+    # TimeoutError is raised.
+    attr_accessor :open_timeout
+
+    # Seconds to wait while reading one block (by one read(2) call).
+    # If the read(2) call does not complete within this time, a
+    # TimeoutError is raised.
+    attr_reader :read_timeout
+
+    # Set the number of seconds to wait until timing-out a read(2)
+    # call.
+    def read_timeout=( sec )
+      @socket.read_timeout = sec if @socket
+      @read_timeout = sec
+    end
+
+    #
+    # WARNING: This method causes serious security holes.
+    # Use this method for only debugging.
+    #
+    # Set an output stream for debug logging.
+    # You must call this before #start.
+    #
+    #   # example
+    #   smtp = Net::SMTP.new(addr, port)
+    #   smtp.set_debug_output $stderr
+    #   smtp.start do |smtp|
+    #     ....
+    #   end
+    #
+    def set_debug_output( arg )
+      @debug_output = arg
+    end
+
+    #
+    # SMTP session control
+    #
+
+    #
+    # Creates a new Net::SMTP object and connects to the server.
+    #
+    # This method is equivalent to:
+    # 
+    #   Net::SMTP.new(address, port).start(helo_domain, account, password, authtype)
+    #
+    # === Example
+    #
+    #     Net::SMTP.start('your.smtp.server') do |smtp|
+    #       smtp.send_message msgstr, 'from@example.com', ['dest@example.com']
+    #     end
+    #
+    # === Block Usage
+    #
+    # If called with a block, the newly-opened Net::SMTP object is yielded
+    # to the block, and automatically closed when the block finishes.  If called
+    # without a block, the newly-opened Net::SMTP object is returned to
+    # the caller, and it is the caller's responsibility to close it when
+    # finished.
+    #
+    # === Parameters
+    #
+    # +address+ is the hostname or ip address of your smtp server.
+    #
+    # +port+ is the port to connect to; it defaults to port 25.
+    #
+    # +helo+ is the _HELO_ _domain_ provided by the client to the
+    # server (see overview comments); it defaults to 'localhost.localdomain'. 
+    #
+    # The remaining arguments are used for SMTP authentication, if required
+    # or desired.  +user+ is the account name; +secret+ is your password
+    # or other authentication token; and +authtype+ is the authentication
+    # type, one of :plain, :login, or :cram_md5.  See the discussion of
+    # SMTP Authentication in the overview notes.
+    #
+    # === Errors
+    #
+    # This method may raise:
+    #
+    # * Net::SMTPAuthenticationError
+    # * Net::SMTPServerBusy
+    # * Net::SMTPSyntaxError
+    # * Net::SMTPFatalError
+    # * Net::SMTPUnknownError
+    # * IOError
+    # * TimeoutError
+    #
+    def SMTP.start( address, port = nil,
+                    helo = 'localhost.localdomain',
+                    user = nil, secret = nil, authtype = nil,
+                    &block) # :yield: smtp
+      new(address, port).start(helo, user, secret, authtype, &block)
+    end
+
+    # +true+ if the SMTP session has been started.
+    def started?
+      @started
+    end
+
+    #
+    # Opens a TCP connection and starts the SMTP session.
+    #
+    # === Parameters
+    #
+    # +helo+ is the _HELO_ _domain_ that you'll dispatch mails from; see
+    # the discussion in the overview notes.
+    #
+    # If both of +user+ and +secret+ are given, SMTP authentication 
+    # will be attempted using the AUTH command.  +authtype+ specifies 
+    # the type of authentication to attempt; it must be one of
+    # :login, :plain, and :cram_md5.  See the notes on SMTP Authentication
+    # in the overview. 
+    #
+    # === Block Usage
+    #
+    # When this methods is called with a block, the newly-started SMTP
+    # object is yielded to the block, and automatically closed after
+    # the block call finishes.  Otherwise, it is the caller's 
+    # responsibility to close the session when finished.
+    #
+    # === Example
+    #
+    # This is very similar to the class method SMTP.start.
+    #
+    #     require 'net/smtp' 
+    #     smtp = Net::SMTP.new('smtp.mail.server', 25)
+    #     smtp.start(helo_domain, account, password, authtype) do |smtp|
+    #       smtp.send_message msgstr, 'from@example.com', ['dest@example.com']
+    #     end 
+    #
+    # The primary use of this method (as opposed to SMTP.start)
+    # is probably to set debugging (#set_debug_output) or ESMTP
+    # (#esmtp=), which must be done before the session is
+    # started.  
+    #
+    # === Errors
+    #
+    # If session has already been started, an IOError will be raised.
+    #
+    # This method may raise:
+    #
+    # * Net::SMTPAuthenticationError
+    # * Net::SMTPServerBusy
+    # * Net::SMTPSyntaxError
+    # * Net::SMTPFatalError
+    # * Net::SMTPUnknownError
+    # * IOError
+    # * TimeoutError
+    #
+    def start( helo = 'localhost.localdomain',
+               user = nil, secret = nil, authtype = nil ) # :yield: smtp
+      if block_given?
+        begin
+          do_start(helo, user, secret, authtype)
+          return yield(self)
+        ensure
+          do_finish
+        end
+      else
+        do_start(helo, user, secret, authtype)
+        return self
+      end
+    end
+
+    def do_start( helodomain, user, secret, authtype )
+      raise IOError, 'SMTP session already started' if @started
+      check_auth_args user, secret, authtype if user or secret
+
+      @socket = InternetMessageIO.old_open(@address, @port,
+                                       @open_timeout, @read_timeout,
+                                       @debug_output)
+      check_response(critical { recv_response() })
+      begin
+        if @esmtp
+          ehlo helodomain
+        else
+          helo helodomain
+        end
+      rescue ProtocolError
+        if @esmtp
+          @esmtp = false
+          @error_occured = false
+          retry
+        end
+        raise
+      end
+      authenticate user, secret, authtype if user
+      @started = true
+    ensure
+      @socket.close if not @started and @socket and not @socket.closed?
+    end
+    private :do_start
+
+    # Finishes the SMTP session and closes TCP connection.
+    # Raises IOError if not started.
+    def finish
+      raise IOError, 'not yet started' unless started?
+      do_finish
+    end
+
+    def do_finish
+      quit if @socket and not @socket.closed? and not @error_occured
+    ensure
+      @started = false
+      @error_occured = false
+      @socket.close if @socket and not @socket.closed?
+      @socket = nil
+    end
+    private :do_finish
+
+    #
+    # message send
+    #
+
+    public
+
+    #
+    # Sends +msgstr+ as a message.  Single CR ("\r") and LF ("\n") found
+    # in the +msgstr+, are converted into the CR LF pair.  You cannot send a
+    # binary message with this method. +msgstr+ should include both 
+    # the message headers and body.
+    #
+    # +from_addr+ is a String representing the source mail address.
+    #
+    # +to_addr+ is a String or Strings or Array of Strings, representing
+    # the destination mail address or addresses.
+    #
+    # === Example
+    #
+    #     Net::SMTP.start('smtp.example.com') do |smtp|
+    #       smtp.send_message msgstr,
+    #                         'from@example.com',
+    #                         ['dest@example.com', 'dest2@example.com']
+    #     end
+    #
+    # === Errors
+    #
+    # This method may raise:
+    #
+    # * Net::SMTPServerBusy
+    # * Net::SMTPSyntaxError
+    # * Net::SMTPFatalError
+    # * Net::SMTPUnknownError
+    # * IOError
+    # * TimeoutError
+    #
+    def send_message( msgstr, from_addr, *to_addrs )
+      send0(from_addr, to_addrs.flatten) {
+        @socket.write_message msgstr
+      }
+    end
+
+    alias send_mail send_message
+    alias sendmail send_message   # obsolete
+
+    #
+    # Opens a message writer stream and gives it to the block.
+    # The stream is valid only in the block, and has these methods:
+    #
+    # puts(str = '')::       outputs STR and CR LF.
+    # print(str)::           outputs STR.
+    # printf(fmt, *args)::   outputs sprintf(fmt,*args).
+    # write(str)::           outputs STR and returns the length of written bytes.
+    # <<(str)::              outputs STR and returns self.
+    #
+    # If a single CR ("\r") or LF ("\n") is found in the message,
+    # it is converted to the CR LF pair.  You cannot send a binary
+    # message with this method.
+    #
+    # === Parameters
+    #
+    # +from_addr+ is a String representing the source mail address.
+    #
+    # +to_addr+ is a String or Strings or Array of Strings, representing
+    # the destination mail address or addresses.
+    #
+    # === Example
+    #
+    #     Net::SMTP.start('smtp.example.com', 25) do |smtp|
+    #       smtp.open_message_stream('from@example.com', ['dest@example.com']) do |f|
+    #         f.puts 'From: from@example.com'
+    #         f.puts 'To: dest@example.com'
+    #         f.puts 'Subject: test message'
+    #         f.puts
+    #         f.puts 'This is a test message.'
+    #       end
+    #     end
+    #
+    # === Errors
+    #
+    # This method may raise:
+    #
+    # * Net::SMTPServerBusy
+    # * Net::SMTPSyntaxError
+    # * Net::SMTPFatalError
+    # * Net::SMTPUnknownError
+    # * IOError
+    # * TimeoutError
+    #
+    def open_message_stream( from_addr, *to_addrs, &block ) # :yield: stream
+      send0(from_addr, to_addrs.flatten) {
+        @socket.write_message_by_block(&block)
+      }
+    end
+
+    alias ready open_message_stream   # obsolete
+
+    private
+
+    def send0( from_addr, to_addrs )
+      raise IOError, 'closed session' unless @socket
+      raise ArgumentError, 'mail destination not given' if to_addrs.empty?
+      if $SAFE > 0
+        raise SecurityError, 'tainted from_addr' if from_addr.tainted?
+        to_addrs.each do |to| 
+          raise SecurityError, 'tainted to_addr' if to.tainted?
+        end
+      end
+
+      mailfrom from_addr
+      to_addrs.each do |to|
+        rcptto to
+      end
+      res = critical {
+        check_response(get_response('DATA'), true)
+        yield
+        recv_response()
+      }
+      check_response(res)
+    end
+
+    #
+    # auth
+    #
+
+    private
+
+    def check_auth_args( user, secret, authtype )
+      raise ArgumentError, 'both user and secret are required'\
+                      unless user and secret
+      auth_method = "auth_#{authtype || 'cram_md5'}"
+      raise ArgumentError, "wrong auth type #{authtype}"\
+                      unless respond_to?(auth_method, true)
+    end
+
+    def authenticate( user, secret, authtype )
+      __send__("auth_#{authtype || 'cram_md5'}", user, secret)
+    end
+
+    def auth_plain( user, secret )
+      res = critical { get_response('AUTH PLAIN %s',
+                                    base64_encode("\0#{user}\0#{secret}")) }
+      raise SMTPAuthenticationError, res unless /\A2../ === res
+    end
+
+    def auth_login( user, secret )
+      res = critical {
+        check_response(get_response('AUTH LOGIN'), true)
+        check_response(get_response(base64_encode(user)), true)
+        get_response(base64_encode(secret))
+      }
+      raise SMTPAuthenticationError, res unless /\A2../ === res
+    end
+
+    def auth_cram_md5( user, secret )
+      # CRAM-MD5: [RFC2195]
+      res = nil
+      critical {
+        res = check_response(get_response('AUTH CRAM-MD5'), true)
+        challenge = res.split(/ /)[1].unpack('m')[0]
+        secret = Digest::MD5.digest(secret) if secret.size > 64
+
+        isecret = secret + "\0" * (64 - secret.size)
+        osecret = isecret.dup
+        0.upto(63) do |i|
+          isecret[i] ^= 0x36
+          osecret[i] ^= 0x5c
+        end
+        tmp = Digest::MD5.digest(isecret + challenge)
+        tmp = Digest::MD5.hexdigest(osecret + tmp)
+
+        res = get_response(base64_encode(user + ' ' + tmp))
+      }
+      raise SMTPAuthenticationError, res unless /\A2../ === res
+    end
+
+    def base64_encode( str )
+      # expects "str" may not become too long
+      [str].pack('m').gsub(/\s+/, '')
+    end
+
+    #
+    # SMTP command dispatcher
+    #
+
+    private
+
+    def helo( domain )
+      getok('HELO %s', domain)
+    end
+
+    def ehlo( domain )
+      getok('EHLO %s', domain)
+    end
+
+    def mailfrom( fromaddr )
+      getok('MAIL FROM:<%s>', fromaddr)
+    end
+
+    def rcptto( to )
+      getok('RCPT TO:<%s>', to)
+    end
+
+    def quit
+      getok('QUIT')
+    end
+
+    #
+    # row level library
+    #
+
+    private
+
+    def getok( fmt, *args )
+      res = critical {
+        @socket.writeline sprintf(fmt, *args)
+        recv_response()
+      }
+      return check_response(res)
+    end
+
+    def get_response( fmt, *args )
+      @socket.writeline sprintf(fmt, *args)
+      recv_response()
+    end
+
+    def recv_response
+      res = ''
+      while true
+        line = @socket.readline
+        res << line << "\n"
+        break unless line[3] == ?-   # "210-PIPELINING"
+      end
+      res
+    end
+
+    def check_response( res, allow_continue = false )
+      return res if /\A2/ === res
+      return res if allow_continue and /\A3/ === res
+      err = case res
+            when /\A4/  then SMTPServerBusy
+            when /\A50/ then SMTPSyntaxError
+            when /\A55/ then SMTPFatalError
+            else SMTPUnknownError
+            end
+      raise err, res
+    end
+
+    def critical( &block )
+      return '200 dummy reply code' if @error_occured
+      begin
+        return yield()
+      rescue Exception
+        @error_occured = true
+        raise
+      end
+    end
+
+  end   # class SMTP
+
+  SMTPSession = SMTP
+
+end   # module Net
diff --git a/ruby_1_8_6/lib/net/telnet.rb b/ruby_1_8_6/lib/net/telnet.rb
new file mode 100644
index 0000000000..c5f8b0429a
--- /dev/null
+++ b/ruby_1_8_6/lib/net/telnet.rb
@@ -0,0 +1,742 @@
+# = net/telnet.rb - Simple Telnet Client Library
+# 
+# Author:: Wakou Aoyama <wakou@ruby-lang.org>
+# Documentation:: William Webber and Wakou Aoyama 
+#
+# This file holds the class Net::Telnet, which provides client-side
+# telnet functionality.
+#
+# For documentation, see Net::Telnet.
+#
+
+require "socket"
+require "delegate"
+require "timeout"
+require "English"
+ 
+module Net
+
+  #
+  # == Net::Telnet
+  #
+  # Provides telnet client functionality.
+  #
+  # This class also has, through delegation, all the methods of a
+  # socket object (by default, a +TCPSocket+, but can be set by the
+  # +Proxy+ option to <tt>new()</tt>).  This provides methods such as
+  # <tt>close()</tt> to end the session and <tt>sysread()</tt> to read
+  # data directly from the host, instead of via the <tt>waitfor()</tt>
+  # mechanism.  Note that if you do use <tt>sysread()</tt> directly
+  # when in telnet mode, you should probably pass the output through
+  # <tt>preprocess()</tt> to extract telnet command sequences.
+  #
+  # == Overview
+  #
+  # The telnet protocol allows a client to login remotely to a user
+  # account on a server and execute commands via a shell.  The equivalent
+  # is done by creating a Net::Telnet class with the +Host+ option
+  # set to your host, calling #login() with your user and password,
+  # issuing one or more #cmd() calls, and then calling #close()
+  # to end the session.  The #waitfor(), #print(), #puts(), and
+  # #write() methods, which #cmd() is implemented on top of, are
+  # only needed if you are doing something more complicated.
+  #
+  # A Net::Telnet object can also be used to connect to non-telnet
+  # services, such as SMTP or HTTP.  In this case, you normally
+  # want to provide the +Port+ option to specify the port to
+  # connect to, and set the +Telnetmode+ option to false to prevent
+  # the client from attempting to interpret telnet command sequences.
+  # Generally, #login() will not work with other protocols, and you
+  # have to handle authentication yourself.
+  #
+  # For some protocols, it will be possible to specify the +Prompt+
+  # option once when you create the Telnet object and use #cmd() calls; 
+  # for others, you will have to specify the response sequence to
+  # look for as the Match option to every #cmd() call, or call
+  # #puts() and #waitfor() directly; for yet others, you will have 
+  # to use #sysread() instead of #waitfor() and parse server 
+  # responses yourself.
+  #
+  # It is worth noting that when you create a new Net::Telnet object,
+  # you can supply a proxy IO channel via the Proxy option.  This
+  # can be used to attach the Telnet object to other Telnet objects,
+  # to already open sockets, or to any read-write IO object.  This
+  # can be useful, for instance, for setting up a test fixture for
+  # unit testing.
+  # 
+  # == Examples
+  # 
+  # === Log in and send a command, echoing all output to stdout
+  # 
+  #   localhost = Net::Telnet::new("Host" => "localhost",
+  #                                "Timeout" => 10,
+  #                                "Prompt" => /[$%#>] \z/n)
+  #   localhost.login("username", "password") { |c| print c }
+  #   localhost.cmd("command") { |c| print c }
+  #   localhost.close
+  # 
+  # 
+  # === Check a POP server to see if you have mail
+  # 
+  #   pop = Net::Telnet::new("Host" => "your_destination_host_here",
+  #                          "Port" => 110,
+  #                          "Telnetmode" => false,
+  #                          "Prompt" => /^\+OK/n)
+  #   pop.cmd("user " + "your_username_here") { |c| print c }
+  #   pop.cmd("pass " + "your_password_here") { |c| print c }
+  #   pop.cmd("list") { |c| print c }
+  #
+  # == References
+  #
+  # There are a large number of RFCs relevant to the Telnet protocol.
+  # RFCs 854-861 define the base protocol.  For a complete listing
+  # of relevant RFCs, see
+  # http://www.omnifarious.org/~hopper/technical/telnet-rfc.html
+  #
+  class Telnet < SimpleDelegator
+
+    # :stopdoc:
+    IAC   = 255.chr # "\377" # "\xff" # interpret as command
+    DONT  = 254.chr # "\376" # "\xfe" # you are not to use option 
+    DO    = 253.chr # "\375" # "\xfd" # please, you use option 
+    WONT  = 252.chr # "\374" # "\xfc" # I won't use option 
+    WILL  = 251.chr # "\373" # "\xfb" # I will use option 
+    SB    = 250.chr # "\372" # "\xfa" # interpret as subnegotiation 
+    GA    = 249.chr # "\371" # "\xf9" # you may reverse the line 
+    EL    = 248.chr # "\370" # "\xf8" # erase the current line 
+    EC    = 247.chr # "\367" # "\xf7" # erase the current character 
+    AYT   = 246.chr # "\366" # "\xf6" # are you there 
+    AO    = 245.chr # "\365" # "\xf5" # abort output--but let prog finish 
+    IP    = 244.chr # "\364" # "\xf4" # interrupt process--permanently 
+    BREAK = 243.chr # "\363" # "\xf3" # break 
+    DM    = 242.chr # "\362" # "\xf2" # data mark--for connect. cleaning 
+    NOP   = 241.chr # "\361" # "\xf1" # nop 
+    SE    = 240.chr # "\360" # "\xf0" # end sub negotiation 
+    EOR   = 239.chr # "\357" # "\xef" # end of record (transparent mode) 
+    ABORT = 238.chr # "\356" # "\xee" # Abort process 
+    SUSP  = 237.chr # "\355" # "\xed" # Suspend process 
+    EOF   = 236.chr # "\354" # "\xec" # End of file 
+    SYNCH = 242.chr # "\362" # "\xf2" # for telfunc calls 
+
+    OPT_BINARY         =   0.chr # "\000" # "\x00" # Binary Transmission 
+    OPT_ECHO           =   1.chr # "\001" # "\x01" # Echo 
+    OPT_RCP            =   2.chr # "\002" # "\x02" # Reconnection 
+    OPT_SGA            =   3.chr # "\003" # "\x03" # Suppress Go Ahead 
+    OPT_NAMS           =   4.chr # "\004" # "\x04" # Approx Message Size Negotiation 
+    OPT_STATUS         =   5.chr # "\005" # "\x05" # Status 
+    OPT_TM             =   6.chr # "\006" # "\x06" # Timing Mark 
+    OPT_RCTE           =   7.chr # "\a"   # "\x07" # Remote Controlled Trans and Echo 
+    OPT_NAOL           =   8.chr # "\010" # "\x08" # Output Line Width 
+    OPT_NAOP           =   9.chr # "\t"   # "\x09" # Output Page Size 
+    OPT_NAOCRD         =  10.chr # "\n"   # "\x0a" # Output Carriage-Return Disposition 
+    OPT_NAOHTS         =  11.chr # "\v"   # "\x0b" # Output Horizontal Tab Stops 
+    OPT_NAOHTD         =  12.chr # "\f"   # "\x0c" # Output Horizontal Tab Disposition 
+    OPT_NAOFFD         =  13.chr # "\r"   # "\x0d" # Output Formfeed Disposition 
+    OPT_NAOVTS         =  14.chr # "\016" # "\x0e" # Output Vertical Tabstops 
+    OPT_NAOVTD         =  15.chr # "\017" # "\x0f" # Output Vertical Tab Disposition 
+    OPT_NAOLFD         =  16.chr # "\020" # "\x10" # Output Linefeed Disposition 
+    OPT_XASCII         =  17.chr # "\021" # "\x11" # Extended ASCII 
+    OPT_LOGOUT         =  18.chr # "\022" # "\x12" # Logout 
+    OPT_BM             =  19.chr # "\023" # "\x13" # Byte Macro 
+    OPT_DET            =  20.chr # "\024" # "\x14" # Data Entry Terminal 
+    OPT_SUPDUP         =  21.chr # "\025" # "\x15" # SUPDUP 
+    OPT_SUPDUPOUTPUT   =  22.chr # "\026" # "\x16" # SUPDUP Output 
+    OPT_SNDLOC         =  23.chr # "\027" # "\x17" # Send Location 
+    OPT_TTYPE          =  24.chr # "\030" # "\x18" # Terminal Type 
+    OPT_EOR            =  25.chr # "\031" # "\x19" # End of Record 
+    OPT_TUID           =  26.chr # "\032" # "\x1a" # TACACS User Identification 
+    OPT_OUTMRK         =  27.chr # "\e"   # "\x1b" # Output Marking 
+    OPT_TTYLOC         =  28.chr # "\034" # "\x1c" # Terminal Location Number 
+    OPT_3270REGIME     =  29.chr # "\035" # "\x1d" # Telnet 3270 Regime 
+    OPT_X3PAD          =  30.chr # "\036" # "\x1e" # X.3 PAD 
+    OPT_NAWS           =  31.chr # "\037" # "\x1f" # Negotiate About Window Size 
+    OPT_TSPEED         =  32.chr # " "    # "\x20" # Terminal Speed 
+    OPT_LFLOW          =  33.chr # "!"    # "\x21" # Remote Flow Control 
+    OPT_LINEMODE       =  34.chr # "\""   # "\x22" # Linemode 
+    OPT_XDISPLOC       =  35.chr # "#"    # "\x23" # X Display Location 
+    OPT_OLD_ENVIRON    =  36.chr # "$"    # "\x24" # Environment Option 
+    OPT_AUTHENTICATION =  37.chr # "%"    # "\x25" # Authentication Option 
+    OPT_ENCRYPT        =  38.chr # "&"    # "\x26" # Encryption Option 
+    OPT_NEW_ENVIRON    =  39.chr # "'"    # "\x27" # New Environment Option 
+    OPT_EXOPL          = 255.chr # "\377" # "\xff" # Extended-Options-List 
+
+    NULL = "\000" 
+    CR   = "\015"   
+    LF   = "\012" 
+    EOL  = CR + LF 
+    REVISION = '$Id$'
+    # :startdoc:
+
+    #
+    # Creates a new Net::Telnet object.
+    #
+    # Attempts to connect to the host (unless the Proxy option is
+    # provided: see below).  If a block is provided, it is yielded
+    # status messages on the attempt to connect to the server, of
+    # the form:
+    # 
+    #   Trying localhost...
+    #   Connected to localhost.
+    #
+    # +options+ is a hash of options.  The following example lists
+    # all options and their default values.
+    # 
+    #   host = Net::Telnet::new(
+    #            "Host"       => "localhost",  # default: "localhost"
+    #            "Port"       => 23,           # default: 23
+    #            "Binmode"    => false,        # default: false
+    #            "Output_log" => "output_log", # default: nil (no output)
+    #            "Dump_log"   => "dump_log",   # default: nil (no output)
+    #            "Prompt"     => /[$%#>] \z/n, # default: /[$%#>] \z/n
+    #            "Telnetmode" => true,         # default: true
+    #            "Timeout"    => 10,           # default: 10
+    #              # if ignore timeout then set "Timeout" to false.
+    #            "Waittime"   => 0,            # default: 0
+    #            "Proxy"      => proxy         # default: nil
+    #                            # proxy is Net::Telnet or IO object
+    #          )
+    #
+    # The options have the following meanings:
+    #
+    # Host:: the hostname or IP address of the host to connect to, as a String. 
+    #        Defaults to "localhost".
+    #
+    # Port:: the port to connect to.  Defaults to 23.
+    #
+    # Binmode:: if false (the default), newline substitution is performed.  
+    #           Outgoing LF is
+    #           converted to CRLF, and incoming CRLF is converted to LF.  If
+    #           true, this substitution is not performed.  This value can
+    #           also be set with the #binmode() method.  The 
+    #           outgoing conversion only applies to the #puts() and #print()
+    #           methods, not the #write() method.  The precise nature of
+    #           the newline conversion is also affected by the telnet options
+    #           SGA and BIN.
+    #
+    # Output_log:: the name of the file to write connection status messages
+    #              and all received traffic to.  In the case of a proper
+    #              Telnet session, this will include the client input as
+    #              echoed by the host; otherwise, it only includes server
+    #              responses.  Output is appended verbatim to this file.  
+    #              By default, no output log is kept.
+    #
+    # Dump_log:: as for Output_log, except that output is written in hexdump
+    #            format (16 bytes per line as hex pairs, followed by their
+    #            printable equivalent), with connection status messages
+    #            preceded by '#', sent traffic preceded by '>', and 
+    #            received traffic preceded by '<'.  By default, not dump log
+    #            is kept.
+    #
+    # Prompt:: a regular expression matching the host's command-line prompt
+    #          sequence.  This is needed by the Telnet class to determine
+    #          when the output from a command has finished and the host is
+    #          ready to receive a new command.  By default, this regular
+    #          expression is /[$%#>] \z/n.
+    #
+    # Telnetmode:: a boolean value, true by default.  In telnet mode, 
+    #              traffic received from the host is parsed for special
+    #              command sequences, and these sequences are escaped
+    #              in outgoing traffic sent using #puts() or #print()
+    #              (but not #write()).  If you are using the Net::Telnet
+    #              object to connect to a non-telnet service (such as
+    #              SMTP or POP), this should be set to "false" to prevent
+    #              undesired data corruption.  This value can also be set
+    #              by the #telnetmode() method.
+    #
+    # Timeout:: the number of seconds to wait before timing out both the
+    #           initial attempt to connect to host (in this constructor),
+    #           and all attempts to read data from the host (in #waitfor(),
+    #           #cmd(), and #login()).  Exceeding this timeout causes a
+    #           TimeoutError to be raised.  The default value is 10 seconds.
+    #           You can disable the timeout by setting this value to false.
+    #           In this case, the connect attempt will eventually timeout
+    #           on the underlying connect(2) socket call with an
+    #           Errno::ETIMEDOUT error (but generally only after a few
+    #           minutes), but other attempts to read data from the host
+    #           will hand indefinitely if no data is forthcoming.
+    #
+    # Waittime:: the amount of time to wait after seeing what looks like a 
+    #            prompt (that is, received data that matches the Prompt
+    #            option regular expression) to see if more data arrives.
+    #            If more data does arrive in this time, Net::Telnet assumes
+    #            that what it saw was not really a prompt.  This is to try to 
+    #            avoid false matches, but it can also lead to missing real
+    #            prompts (if, for instance, a background process writes to
+    #            the terminal soon after the prompt is displayed).  By
+    #            default, set to 0, meaning not to wait for more data.
+    #
+    # Proxy:: a proxy object to used instead of opening a direct connection
+    #         to the host.  Must be either another Net::Telnet object or
+    #         an IO object.  If it is another Net::Telnet object, this 
+    #         instance will use that one's socket for communication.  If an
+    #         IO object, it is used directly for communication.  Any other
+    #         kind of object will cause an error to be raised.
+    #
+    def initialize(options) # :yield: mesg 
+      @options = options
+      @options["Host"]       = "localhost"   unless @options.has_key?("Host")
+      @options["Port"]       = 23            unless @options.has_key?("Port")
+      @options["Prompt"]     = /[$%#>] \z/n  unless @options.has_key?("Prompt")
+      @options["Timeout"]    = 10            unless @options.has_key?("Timeout")
+      @options["Waittime"]   = 0             unless @options.has_key?("Waittime")
+      unless @options.has_key?("Binmode")
+        @options["Binmode"]    = false         
+      else
+        unless (true == @options["Binmode"] or false == @options["Binmode"])
+          raise ArgumentError, "Binmode option must be true or false"
+        end
+      end
+
+      unless @options.has_key?("Telnetmode")
+        @options["Telnetmode"] = true          
+      else
+        unless (true == @options["Telnetmode"] or false == @options["Telnetmode"])
+          raise ArgumentError, "Telnetmode option must be true or false"
+        end
+      end
+
+      @telnet_option = { "SGA" => false, "BINARY" => false }
+
+      if @options.has_key?("Output_log")
+        @log = File.open(@options["Output_log"], 'a+')
+        @log.sync = true
+        @log.binmode
+      end
+
+      if @options.has_key?("Dump_log")
+        @dumplog = File.open(@options["Dump_log"], 'a+')
+        @dumplog.sync = true
+        @dumplog.binmode
+        def @dumplog.log_dump(dir, x)  # :nodoc:
+          len = x.length
+          addr = 0
+          offset = 0
+          while 0 < len
+            if len < 16
+              line = x[offset, len]
+            else
+              line = x[offset, 16]
+            end
+            hexvals = line.unpack('H*')[0]
+            hexvals += ' ' * (32 - hexvals.length)
+            hexvals = format("%s %s %s %s  " * 4, *hexvals.unpack('a2' * 16))
+            line = line.gsub(/[\000-\037\177-\377]/n, '.')
+            printf "%s 0x%5.5x: %s%s\n", dir, addr, hexvals, line
+            addr += 16
+            offset += 16
+            len -= 16
+          end
+          print "\n"
+        end
+      end
+
+      if @options.has_key?("Proxy")
+        if @options["Proxy"].kind_of?(Net::Telnet)
+          @sock = @options["Proxy"].sock
+        elsif @options["Proxy"].kind_of?(IO)
+          @sock = @options["Proxy"]
+        else
+          raise "Error: Proxy must be an instance of Net::Telnet or IO."
+        end
+      else
+        message = "Trying " + @options["Host"] + "...\n"
+        yield(message) if block_given?
+        @log.write(message) if @options.has_key?("Output_log")
+        @dumplog.log_dump('#', message) if @options.has_key?("Dump_log")
+
+        begin
+          if @options["Timeout"] == false
+            @sock = TCPSocket.open(@options["Host"], @options["Port"])
+          else
+            timeout(@options["Timeout"]) do
+              @sock = TCPSocket.open(@options["Host"], @options["Port"])
+            end
+          end
+        rescue TimeoutError
+          raise TimeoutError, "timed out while opening a connection to the host"
+        rescue
+          @log.write($ERROR_INFO.to_s + "\n") if @options.has_key?("Output_log")
+          @dumplog.log_dump('#', $ERROR_INFO.to_s + "\n") if @options.has_key?("Dump_log")
+          raise
+        end
+        @sock.sync = true
+        @sock.binmode
+
+        message = "Connected to " + @options["Host"] + ".\n"
+        yield(message) if block_given?
+        @log.write(message) if @options.has_key?("Output_log")
+        @dumplog.log_dump('#', message) if @options.has_key?("Dump_log")
+      end
+
+      super(@sock)
+    end # initialize
+
+    # The socket the Telnet object is using.  Note that this object becomes
+    # a delegate of the Telnet object, so normally you invoke its methods
+    # directly on the Telnet object.
+    attr :sock 
+
+    # Set telnet command interpretation on (+mode+ == true) or off
+    # (+mode+ == false), or return the current value (+mode+ not
+    # provided).  It should be on for true telnet sessions, off if
+    # using Net::Telnet to connect to a non-telnet service such
+    # as SMTP.
+    def telnetmode(mode = nil)
+      case mode
+      when nil
+        @options["Telnetmode"]
+      when true, false
+        @options["Telnetmode"] = mode
+      else
+        raise ArgumentError, "argument must be true or false, or missing"
+      end
+    end
+
+    # Turn telnet command interpretation on (true) or off (false).  It
+    # should be on for true telnet sessions, off if using Net::Telnet
+    # to connect to a non-telnet service such as SMTP.
+    def telnetmode=(mode)
+      if (true == mode or false == mode)
+        @options["Telnetmode"] = mode
+      else
+        raise ArgumentError, "argument must be true or false"
+      end
+    end
+
+    # Turn newline conversion on (+mode+ == false) or off (+mode+ == true),
+    # or return the current value (+mode+ is not specified).
+    def binmode(mode = nil)
+      case mode
+      when nil
+        @options["Binmode"] 
+      when true, false
+        @options["Binmode"] = mode
+      else
+        raise ArgumentError, "argument must be true or false"
+      end
+    end
+
+    # Turn newline conversion on (false) or off (true).
+    def binmode=(mode)
+      if (true == mode or false == mode)
+        @options["Binmode"] = mode
+      else
+        raise ArgumentError, "argument must be true or false"
+      end
+    end
+
+    # Preprocess received data from the host.
+    #
+    # Performs newline conversion and detects telnet command sequences.
+    # Called automatically by #waitfor().  You should only use this 
+    # method yourself if you have read input directly using sysread()
+    # or similar, and even then only if in telnet mode.
+    def preprocess(string)
+      # combine CR+NULL into CR
+      string = string.gsub(/#{CR}#{NULL}/no, CR) if @options["Telnetmode"]
+
+      # combine EOL into "\n"
+      string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
+
+      string.gsub(/#{IAC}(
+                   [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
+                   [#{DO}#{DONT}#{WILL}#{WONT}]
+                     [#{OPT_BINARY}-#{OPT_NEW_ENVIRON}#{OPT_EXOPL}]|
+                   #{SB}[^#{IAC}]*#{IAC}#{SE}
+                 )/xno) do
+        if    IAC == $1  # handle escaped IAC characters
+          IAC
+        elsif AYT == $1  # respond to "IAC AYT" (are you there)
+          self.write("nobody here but us pigeons" + EOL)
+          ''
+        elsif DO[0] == $1[0]  # respond to "IAC DO x"
+          if OPT_BINARY[0] == $1[1]
+            @telnet_option["BINARY"] = true
+            self.write(IAC + WILL + OPT_BINARY)
+          else
+            self.write(IAC + WONT + $1[1..1])
+          end
+          ''
+        elsif DONT[0] == $1[0]  # respond to "IAC DON'T x" with "IAC WON'T x"
+          self.write(IAC + WONT + $1[1..1])
+          ''
+        elsif WILL[0] == $1[0]  # respond to "IAC WILL x"
+          if    OPT_BINARY[0] == $1[1]
+            self.write(IAC + DO + OPT_BINARY)
+          elsif OPT_ECHO[0] == $1[1]
+            self.write(IAC + DO + OPT_ECHO)
+          elsif OPT_SGA[0]  == $1[1]
+            @telnet_option["SGA"] = true
+            self.write(IAC + DO + OPT_SGA)
+          else
+            self.write(IAC + DONT + $1[1..1])
+          end
+          ''
+        elsif WONT[0] == $1[0]  # respond to "IAC WON'T x"
+          if    OPT_ECHO[0] == $1[1]
+            self.write(IAC + DONT + OPT_ECHO)
+          elsif OPT_SGA[0]  == $1[1]
+            @telnet_option["SGA"] = false
+            self.write(IAC + DONT + OPT_SGA)
+          else
+            self.write(IAC + DONT + $1[1..1])
+          end
+          ''
+        else
+          ''
+        end
+      end
+    end # preprocess
+
+    # Read data from the host until a certain sequence is matched.
+    #
+    # If a block is given, the received data will be yielded as it
+    # is read in (not necessarily all in one go), or nil if EOF 
+    # occurs before any data is received.  Whether a block is given
+    # or not, all data read will be returned in a single string, or again 
+    # nil if EOF occurs before any data is received.  Note that
+    # received data includes the matched sequence we were looking for.
+    #
+    # +options+ can be either a regular expression or a hash of options.
+    # If a regular expression, this specifies the data to wait for.
+    # If a hash, this can specify the following options:
+    #
+    # Match:: a regular expression, specifying the data to wait for.
+    # Prompt:: as for Match; used only if Match is not specified.
+    # String:: as for Match, except a string that will be converted
+    #          into a regular expression.  Used only if Match and
+    #          Prompt are not specified.
+    # Timeout:: the number of seconds to wait for data from the host
+    #           before raising a TimeoutError.  If set to false, 
+    #           no timeout will occur.  If not specified, the
+    #           Timeout option value specified when this instance
+    #           was created will be used, or, failing that, the
+    #           default value of 10 seconds.
+    # Waittime:: the number of seconds to wait after matching against
+    #            the input data to see if more data arrives.  If more
+    #            data arrives within this time, we will judge ourselves
+    #            not to have matched successfully, and will continue
+    #            trying to match.  If not specified, the Waittime option
+    #            value specified when this instance was created will be
+    #            used, or, failing that, the default value of 0 seconds,
+    #            which means not to wait for more input.
+    #           
+    def waitfor(options) # :yield: recvdata
+      time_out = @options["Timeout"]
+      waittime = @options["Waittime"]
+
+      if options.kind_of?(Hash)
+        prompt   = if options.has_key?("Match")
+                     options["Match"]
+                   elsif options.has_key?("Prompt")
+                     options["Prompt"]
+                   elsif options.has_key?("String")
+                     Regexp.new( Regexp.quote(options["String"]) )
+                   end
+        time_out = options["Timeout"]  if options.has_key?("Timeout")
+        waittime = options["Waittime"] if options.has_key?("Waittime")
+      else
+        prompt = options
+      end
+
+      if time_out == false
+        time_out = nil
+      end
+
+      line = ''
+      buf = ''
+      rest = ''
+      until(prompt === line and not IO::select([@sock], nil, nil, waittime))
+        unless IO::select([@sock], nil, nil, time_out)
+          raise TimeoutError, "timed out while waiting for more data"
+        end
+        begin
+          c = @sock.readpartial(1024 * 1024)
+          @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
+          if @options["Telnetmode"]
+            c = rest + c
+            if Integer(c.rindex(/#{IAC}#{SE}/no)) <
+               Integer(c.rindex(/#{IAC}#{SB}/no))
+              buf = preprocess(c[0 ... c.rindex(/#{IAC}#{SB}/no)])
+              rest = c[c.rindex(/#{IAC}#{SB}/no) .. -1]
+            elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no)
+              buf = preprocess(c[0 ... pt])
+              rest = c[pt .. -1]
+            else
+              buf = preprocess(c)
+              rest = ''
+            end
+         else
+           # Not Telnetmode.
+           #
+           # We cannot use preprocess() on this data, because that
+           # method makes some Telnetmode-specific assumptions.
+           buf = c
+           buf.gsub!(/#{EOL}/no, "\n") unless @options["Binmode"]
+           rest = ''
+          end
+          @log.print(buf) if @options.has_key?("Output_log")
+          line += buf
+          yield buf if block_given?
+        rescue EOFError # End of file reached
+          if line == ''
+            line = nil
+            yield nil if block_given?
+          end
+          break
+        end
+      end
+      line
+    end
+
+    # Write +string+ to the host.
+    #
+    # Does not perform any conversions on +string+.  Will log +string+ to the
+    # dumplog, if the Dump_log option is set.
+    def write(string)
+      length = string.length
+      while 0 < length
+        IO::select(nil, [@sock])
+        @dumplog.log_dump('>', string[-length..-1]) if @options.has_key?("Dump_log")
+        length -= @sock.syswrite(string[-length..-1])
+      end
+    end
+
+    # Sends a string to the host.
+    #
+    # This does _not_ automatically append a newline to the string.  Embedded
+    # newlines may be converted and telnet command sequences escaped 
+    # depending upon the values of telnetmode, binmode, and telnet options
+    # set by the host.
+    def print(string)
+      string = string.gsub(/#{IAC}/no, IAC + IAC) if @options["Telnetmode"]
+
+      if @options["Binmode"]
+        self.write(string)
+      else
+        if @telnet_option["BINARY"] and @telnet_option["SGA"]
+          # IAC WILL SGA IAC DO BIN send EOL --> CR
+          self.write(string.gsub(/\n/n, CR))
+        elsif @telnet_option["SGA"]
+          # IAC WILL SGA send EOL --> CR+NULL
+          self.write(string.gsub(/\n/n, CR + NULL))
+        else
+          # NONE send EOL --> CR+LF
+          self.write(string.gsub(/\n/n, EOL))
+        end
+      end
+    end
+
+    # Sends a string to the host.
+    #
+    # Same as #print(), but appends a newline to the string.
+    def puts(string)
+      self.print(string + "\n")
+    end
+
+    # Send a command to the host.
+    #
+    # More exactly, sends a string to the host, and reads in all received
+    # data until is sees the prompt or other matched sequence.
+    #
+    # If a block is given, the received data will be yielded to it as
+    # it is read in.  Whether a block is given or not, the received data 
+    # will be return as a string.  Note that the received data includes
+    # the prompt and in most cases the host's echo of our command.
+    #
+    # +options+ is either a String, specified the string or command to
+    # send to the host; or it is a hash of options.  If a hash, the
+    # following options can be specified:
+    #
+    # String:: the command or other string to send to the host.
+    # Match:: a regular expression, the sequence to look for in
+    #         the received data before returning.  If not specified,
+    #         the Prompt option value specified when this instance
+    #         was created will be used, or, failing that, the default
+    #         prompt of /[$%#>] \z/n.
+    # Timeout:: the seconds to wait for data from the host before raising
+    #           a Timeout error.  If not specified, the Timeout option
+    #           value specified when this instance was created will be
+    #           used, or, failing that, the default value of 10 seconds.
+    #
+    # The command or other string will have the newline sequence appended
+    # to it.
+    def cmd(options) # :yield: recvdata
+      match    = @options["Prompt"]
+      time_out = @options["Timeout"]
+
+      if options.kind_of?(Hash)
+        string   = options["String"]
+        match    = options["Match"]   if options.has_key?("Match")
+        time_out = options["Timeout"] if options.has_key?("Timeout")
+      else
+        string = options
+      end
+
+      self.puts(string)
+      if block_given?
+        waitfor({"Prompt" => match, "Timeout" => time_out}){|c| yield c }
+      else
+        waitfor({"Prompt" => match, "Timeout" => time_out})
+      end
+    end
+
+    # Login to the host with a given username and password.
+    #
+    # The username and password can either be provided as two string
+    # arguments in that order, or as a hash with keys "Name" and
+    # "Password".    
+    #
+    # This method looks for the strings "login" and "Password" from the
+    # host to determine when to send the username and password.  If the
+    # login sequence does not follow this pattern (for instance, you
+    # are connecting to a service other than telnet), you will need
+    # to handle login yourself.
+    #
+    # The password can be omitted, either by only
+    # provided one String argument, which will be used as the username,
+    # or by providing a has that has no "Password" key.  In this case,
+    # the method will not look for the "Password:" prompt; if it is
+    # sent, it will have to be dealt with by later calls.
+    #
+    # The method returns all data received during the login process from
+    # the host, including the echoed username but not the password (which
+    # the host should not echo).  If a block is passed in, this received
+    # data is also yielded to the block as it is received.
+    def login(options, password = nil) # :yield: recvdata
+      login_prompt = /[Ll]ogin[: ]*\z/n
+      password_prompt = /Password[: ]*\z/n
+      if options.kind_of?(Hash)
+        username = options["Name"]
+        password = options["Password"]
+	login_prompt = options["LoginPrompt"] if options["LoginPrompt"]
+	password_prompt = options["PasswordPrompt"] if options["PasswordPrompt"]
+      else
+        username = options
+      end
+
+      if block_given?
+        line = waitfor(login_prompt){|c| yield c }
+        if password
+          line += cmd({"String" => username,
+                       "Match" => password_prompt}){|c| yield c }
+          line += cmd(password){|c| yield c }
+        else
+          line += cmd(username){|c| yield c }
+        end
+      else
+        line = waitfor(login_prompt)
+        if password
+          line += cmd({"String" => username,
+                       "Match" => password_prompt})
+          line += cmd(password)
+        else
+          line += cmd(username)
+        end
+      end
+      line
+    end
+
+  end  # class Telnet
+end  # module Net
+
diff --git a/ruby_1_8_6/lib/observer.rb b/ruby_1_8_6/lib/observer.rb
new file mode 100644
index 0000000000..64c7d81351
--- /dev/null
+++ b/ruby_1_8_6/lib/observer.rb
@@ -0,0 +1,192 @@
+#
+# observer.rb implements the _Observer_ object-oriented design pattern.  The
+# following documentation is copied, with modifications, from "Programming
+# Ruby", by Hunt and Thomas; http://www.rubycentral.com/book/lib_patterns.html.
+#
+# == About
+#
+# The Observer pattern, also known as Publish/Subscribe, provides a simple
+# mechanism for one object to inform a set of interested third-party objects
+# when its state changes. 
+#
+# == Mechanism
+#
+# In the Ruby implementation, the notifying class mixes in the +Observable+
+# module, which provides the methods for managing the associated observer
+# objects.
+#
+# The observers must implement the +update+ method to receive notifications.
+#
+# The observable object must:
+# * assert that it has +changed+
+# * call +notify_observers+
+#
+# == Example
+#
+# The following example demonstrates this nicely.  A +Ticker+, when run,
+# continually receives the stock +Price+ for its +@symbol+.  A +Warner+ is a
+# general observer of the price, and two warners are demonstrated, a +WarnLow+
+# and a +WarnHigh+, which print a warning if the price is below or above their
+# set limits, respectively.
+#
+# The +update+ callback allows the warners to run without being explicitly
+# called.  The system is set up with the +Ticker+ and several observers, and the
+# observers do their duty without the top-level code having to interfere.
+#
+# Note that the contract between publisher and subscriber (observable and
+# observer) is not declared or enforced.  The +Ticker+ publishes a time and a
+# price, and the warners receive that.  But if you don't ensure that your
+# contracts are correct, nothing else can warn you.
+#
+#   require "observer"
+#   
+#   class Ticker          ### Periodically fetch a stock price.
+#     include Observable
+#   
+#     def initialize(symbol)
+#       @symbol = symbol
+#     end
+#   
+#     def run
+#       lastPrice = nil
+#       loop do
+#         price = Price.fetch(@symbol)
+#         print "Current price: #{price}\n"
+#         if price != lastPrice
+#           changed                 # notify observers
+#           lastPrice = price
+#           notify_observers(Time.now, price)
+#         end
+#         sleep 1
+#       end
+#     end
+#   end
+#
+#   class Price           ### A mock class to fetch a stock price (60 - 140).
+#     def Price.fetch(symbol)
+#       60 + rand(80)
+#     end
+#   end
+#   
+#   class Warner          ### An abstract observer of Ticker objects.
+#     def initialize(ticker, limit)
+#       @limit = limit
+#       ticker.add_observer(self)
+#     end
+#   end
+#   
+#   class WarnLow < Warner
+#     def update(time, price)       # callback for observer
+#       if price < @limit
+#         print "--- #{time.to_s}: Price below #@limit: #{price}\n"
+#       end
+#     end
+#   end
+#   
+#   class WarnHigh < Warner
+#     def update(time, price)       # callback for observer
+#       if price > @limit
+#         print "+++ #{time.to_s}: Price above #@limit: #{price}\n"
+#       end
+#     end
+#   end
+#
+#   ticker = Ticker.new("MSFT")
+#   WarnLow.new(ticker, 80)
+#   WarnHigh.new(ticker, 120)
+#   ticker.run
+#
+# Produces:
+#
+#   Current price: 83
+#   Current price: 75
+#   --- Sun Jun 09 00:10:25 CDT 2002: Price below 80: 75
+#   Current price: 90
+#   Current price: 134
+#   +++ Sun Jun 09 00:10:25 CDT 2002: Price above 120: 134
+#   Current price: 134
+#   Current price: 112
+#   Current price: 79
+#   --- Sun Jun 09 00:10:25 CDT 2002: Price below 80: 79
+
+
+#
+# Implements the Observable design pattern as a mixin so that other objects can
+# be notified of changes in state.  See observer.rb for details and an example.
+#
+module Observable
+
+  #
+  # Add +observer+ as an observer on this object. +observer+ will now receive
+  # notifications.
+  #
+  def add_observer(observer)
+    @observer_peers = [] unless defined? @observer_peers
+    unless observer.respond_to? :update
+      raise NoMethodError, "observer needs to respond to `update'" 
+    end
+    @observer_peers.push observer
+  end
+
+  #
+  # Delete +observer+ as an observer on this object. It will no longer receive
+  # notifications.
+  #
+  def delete_observer(observer)
+    @observer_peers.delete observer if defined? @observer_peers
+  end
+
+  #
+  # Delete all observers associated with this object.
+  #
+  def delete_observers
+    @observer_peers.clear if defined? @observer_peers
+  end
+
+  #
+  # Return the number of observers associated with this object.
+  #
+  def count_observers
+    if defined? @observer_peers
+      @observer_peers.size
+    else
+      0
+    end
+  end
+
+  #
+  # Set the changed state of this object.  Notifications will be sent only if
+  # the changed +state+ is +true+.
+  #
+  def changed(state=true)
+    @observer_state = state
+  end
+
+  #
+  # Query the changed state of this object.
+  #
+  def changed?
+    if defined? @observer_state and @observer_state
+      true
+    else
+      false
+    end
+  end
+
+  #
+  # If this object's changed state is +true+, invoke the update method in each
+  # currently associated observer in turn, passing it the given arguments. The
+  # changed state is then set to +false+.
+  #
+  def notify_observers(*arg)
+    if defined? @observer_state and @observer_state
+      if defined? @observer_peers
+	for i in @observer_peers.dup
+	  i.update(*arg)
+	end
+      end
+      @observer_state = false
+    end
+  end
+
+end
diff --git a/ruby_1_8_6/lib/open-uri.rb b/ruby_1_8_6/lib/open-uri.rb
new file mode 100644
index 0000000000..d69f7dbe41
--- /dev/null
+++ b/ruby_1_8_6/lib/open-uri.rb
@@ -0,0 +1,688 @@
+require 'uri'
+require 'stringio'
+require 'time'
+
+module Kernel
+  private
+  alias open_uri_original_open open # :nodoc:
+
+  # makes possible to open various resources including URIs.
+  # If the first argument respond to `open' method,
+  # the method is called with the rest arguments.
+  #
+  # If the first argument is a string which begins with xxx://,
+  # it is parsed by URI.parse.  If the parsed object respond to `open' method,
+  # the method is called with the rest arguments.
+  #
+  # Otherwise original open is called.
+  #
+  # Since open-uri.rb provides URI::HTTP#open, URI::HTTPS#open and
+  # URI::FTP#open,
+  # Kernel[#.]open can accepts such URIs and strings which begins with
+  # http://, https:// and ftp://.
+  # In these case, the opened file object is extended by OpenURI::Meta.
+  def open(name, *rest, &block) # :doc:
+    if name.respond_to?(:open)
+      name.open(*rest, &block)
+    elsif name.respond_to?(:to_str) &&
+          %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ name &&
+          (uri = URI.parse(name)).respond_to?(:open)
+      uri.open(*rest, &block)
+    else
+      open_uri_original_open(name, *rest, &block)
+    end
+  end
+  module_function :open
+end
+
+# OpenURI is an easy-to-use wrapper for net/http, net/https and net/ftp.
+#
+#== Example
+#
+# It is possible to open http/https/ftp URL as usual like opening a file:
+#
+#   open("http://www.ruby-lang.org/") {|f|
+#     f.each_line {|line| p line}
+#   }
+#
+# The opened file has several methods for meta information as follows since
+# it is extended by OpenURI::Meta.
+#
+#   open("http://www.ruby-lang.org/en") {|f|
+#     f.each_line {|line| p line}
+#     p f.base_uri         # <URI::HTTP:0x40e6ef2 URL:http://www.ruby-lang.org/en/>
+#     p f.content_type     # "text/html"
+#     p f.charset          # "iso-8859-1"
+#     p f.content_encoding # []
+#     p f.last_modified    # Thu Dec 05 02:45:02 UTC 2002
+#   }
+#
+# Additional header fields can be specified by an optional hash argument.
+#
+#   open("http://www.ruby-lang.org/en/",
+#     "User-Agent" => "Ruby/#{RUBY_VERSION}",
+#     "From" => "foo@bar.invalid",
+#     "Referer" => "http://www.ruby-lang.org/") {|f|
+#     # ...
+#   }
+#
+# The environment variables such as http_proxy, https_proxy and ftp_proxy
+# are in effect by default.  :proxy => nil disables proxy.
+#
+#   open("http://www.ruby-lang.org/en/raa.html", :proxy => nil) {|f|
+#     # ...
+#   }
+#
+# URI objects can be opened in a similar way.
+#
+#   uri = URI.parse("http://www.ruby-lang.org/en/")
+#   uri.open {|f|
+#     # ...
+#   }
+#
+# URI objects can be read directly. The returned string is also extended by
+# OpenURI::Meta.
+#
+#   str = uri.read
+#   p str.base_uri
+#
+# Author:: Tanaka Akira <akr@m17n.org>
+
+module OpenURI
+  Options = {
+    :proxy => true,
+    :progress_proc => true,
+    :content_length_proc => true,
+    :http_basic_authentication => true,
+  }
+
+  def OpenURI.check_options(options) # :nodoc:
+    options.each {|k, v|
+      next unless Symbol === k
+      unless Options.include? k
+        raise ArgumentError, "unrecognized option: #{k}"
+      end
+    }
+  end
+
+  def OpenURI.scan_open_optional_arguments(*rest) # :nodoc:
+    if !rest.empty? && (String === rest.first || Integer === rest.first)
+      mode = rest.shift
+      if !rest.empty? && Integer === rest.first
+        perm = rest.shift
+      end
+    end
+    return mode, perm, rest
+  end
+
+  def OpenURI.open_uri(name, *rest) # :nodoc:
+    uri = URI::Generic === name ? name : URI.parse(name)
+    mode, perm, rest = OpenURI.scan_open_optional_arguments(*rest)
+    options = rest.shift if !rest.empty? && Hash === rest.first
+    raise ArgumentError.new("extra arguments") if !rest.empty?
+    options ||= {}
+    OpenURI.check_options(options)
+
+    unless mode == nil ||
+           mode == 'r' || mode == 'rb' ||
+           mode == File::RDONLY
+      raise ArgumentError.new("invalid access mode #{mode} (#{uri.class} resource is read only.)")
+    end
+
+    io = open_loop(uri, options)
+    if block_given?
+      begin
+        yield io
+      ensure
+        io.close
+      end
+    else
+      io
+    end
+  end
+
+  def OpenURI.open_loop(uri, options) # :nodoc:
+    case opt_proxy = options.fetch(:proxy, true)
+    when true
+      find_proxy = lambda {|u| u.find_proxy}
+    when nil, false
+      find_proxy = lambda {|u| nil}
+    when String
+      opt_proxy = URI.parse(opt_proxy)
+      find_proxy = lambda {|u| opt_proxy}
+    when URI::Generic
+      find_proxy = lambda {|u| opt_proxy}
+    else
+      raise ArgumentError.new("Invalid proxy option: #{opt_proxy}")
+    end
+
+    uri_set = {}
+    buf = nil
+    while true
+      redirect = catch(:open_uri_redirect) {
+        buf = Buffer.new
+        uri.buffer_open(buf, find_proxy.call(uri), options)
+        nil
+      }
+      if redirect
+        if redirect.relative?
+          # Although it violates RFC2616, Location: field may have relative
+          # URI.  It is converted to absolute URI using uri as a base URI.
+          redirect = uri + redirect
+        end
+        unless OpenURI.redirectable?(uri, redirect)
+          raise "redirection forbidden: #{uri} -> #{redirect}"
+        end
+        if options.include? :http_basic_authentication
+          # send authentication only for the URI directly specified.
+          options = options.dup
+          options.delete :http_basic_authentication
+        end
+        uri = redirect
+        raise "HTTP redirection loop: #{uri}" if uri_set.include? uri.to_s
+        uri_set[uri.to_s] = true
+      else
+        break
+      end
+    end
+    io = buf.io
+    io.base_uri = uri
+    io
+  end
+
+  def OpenURI.redirectable?(uri1, uri2) # :nodoc:
+    # This test is intended to forbid a redirection from http://... to
+    # file:///etc/passwd.
+    # However this is ad hoc.  It should be extensible/configurable.
+    uri1.scheme.downcase == uri2.scheme.downcase ||
+    (/\A(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:http|ftp)\z/i =~ uri2.scheme)
+  end
+
+  def OpenURI.open_http(buf, target, proxy, options) # :nodoc:
+    if proxy
+      raise "Non-HTTP proxy URI: #{proxy}" if proxy.class != URI::HTTP
+    end
+
+    if target.userinfo && "1.9.0" <= RUBY_VERSION
+      # don't raise for 1.8 because compatibility.
+      raise ArgumentError, "userinfo not supported.  [RFC3986]"
+    end
+
+    require 'net/http'
+    klass = Net::HTTP
+    if URI::HTTP === target
+      # HTTP or HTTPS
+      if proxy
+        klass = Net::HTTP::Proxy(proxy.host, proxy.port)
+      end
+      target_host = target.host
+      target_port = target.port
+      request_uri = target.request_uri
+    else
+      # FTP over HTTP proxy
+      target_host = proxy.host
+      target_port = proxy.port
+      request_uri = target.to_s
+    end
+
+    http = klass.new(target_host, target_port)
+    if target.class == URI::HTTPS
+      require 'net/https'
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      store = OpenSSL::X509::Store.new
+      store.set_default_paths
+      http.cert_store = store
+    end
+
+    header = {}
+    options.each {|k, v| header[k] = v if String === k }
+
+    resp = nil
+    http.start {
+      if target.class == URI::HTTPS
+        # xxx: information hiding violation
+        sock = http.instance_variable_get(:@socket)
+        if sock.respond_to?(:io)
+          sock = sock.io # 1.9
+        else
+          sock = sock.instance_variable_get(:@socket) # 1.8
+        end
+        sock.post_connection_check(target_host)
+      end
+      req = Net::HTTP::Get.new(request_uri, header)
+      if options.include? :http_basic_authentication
+        user, pass = options[:http_basic_authentication]
+        req.basic_auth user, pass
+      end
+      http.request(req) {|response|
+        resp = response
+        if options[:content_length_proc] && Net::HTTPSuccess === resp
+          if resp.key?('Content-Length')
+            options[:content_length_proc].call(resp['Content-Length'].to_i)
+          else
+            options[:content_length_proc].call(nil)
+          end
+        end
+        resp.read_body {|str|
+          buf << str
+          if options[:progress_proc] && Net::HTTPSuccess === resp
+            options[:progress_proc].call(buf.size)
+          end
+        }
+      }
+    }
+    io = buf.io
+    io.rewind
+    io.status = [resp.code, resp.message]
+    resp.each {|name,value| buf.io.meta_add_field name, value }
+    case resp
+    when Net::HTTPSuccess
+    when Net::HTTPMovedPermanently, # 301
+         Net::HTTPFound, # 302
+         Net::HTTPSeeOther, # 303
+         Net::HTTPTemporaryRedirect # 307
+      throw :open_uri_redirect, URI.parse(resp['location'])
+    else
+      raise OpenURI::HTTPError.new(io.status.join(' '), io)
+    end
+  end
+
+  class HTTPError < StandardError
+    def initialize(message, io)
+      super(message)
+      @io = io
+    end
+    attr_reader :io
+  end
+
+  class Buffer # :nodoc:
+    def initialize
+      @io = StringIO.new
+      @size = 0
+    end
+    attr_reader :size
+
+    StringMax = 10240
+    def <<(str)
+      @io << str
+      @size += str.length
+      if StringIO === @io && StringMax < @size
+        require 'tempfile'
+        io = Tempfile.new('open-uri')
+        io.binmode
+        Meta.init io, @io if @io.respond_to? :meta
+        io << @io.string
+        @io = io
+      end
+    end
+
+    def io
+      Meta.init @io unless @io.respond_to? :meta
+      @io
+    end
+  end
+
+  # Mixin for holding meta-information.
+  module Meta
+    def Meta.init(obj, src=nil) # :nodoc:
+      obj.extend Meta
+      obj.instance_eval {
+        @base_uri = nil
+        @meta = {}
+      }
+      if src
+        obj.status = src.status
+        obj.base_uri = src.base_uri
+        src.meta.each {|name, value|
+          obj.meta_add_field(name, value)
+        }
+      end
+    end
+
+    # returns an Array which consists status code and message.
+    attr_accessor :status
+
+    # returns a URI which is base of relative URIs in the data.
+    # It may differ from the URI supplied by a user because redirection.
+    attr_accessor :base_uri
+
+    # returns a Hash which represents header fields.
+    # The Hash keys are downcased for canonicalization.
+    attr_reader :meta
+
+    def meta_add_field(name, value) # :nodoc:
+      @meta[name.downcase] = value
+    end
+
+    # returns a Time which represents Last-Modified field.
+    def last_modified
+      if v = @meta['last-modified']
+        Time.httpdate(v)
+      else
+        nil
+      end
+    end
+
+    RE_LWS = /[\r\n\t ]+/n
+    RE_TOKEN = %r{[^\x00- ()<>@,;:\\"/\[\]?={}\x7f]+}n
+    RE_QUOTED_STRING = %r{"(?:[\r\n\t !#-\[\]-~\x80-\xff]|\\[\x00-\x7f])*"}n
+    RE_PARAMETERS = %r{(?:;#{RE_LWS}?#{RE_TOKEN}#{RE_LWS}?=#{RE_LWS}?(?:#{RE_TOKEN}|#{RE_QUOTED_STRING})#{RE_LWS}?)*}n
+
+    def content_type_parse # :nodoc:
+      v = @meta['content-type']
+      # The last (?:;#{RE_LWS}?)? matches extra ";" which violates RFC2045.
+      if v && %r{\A#{RE_LWS}?(#{RE_TOKEN})#{RE_LWS}?/(#{RE_TOKEN})#{RE_LWS}?(#{RE_PARAMETERS})(?:;#{RE_LWS}?)?\z}no =~ v
+        type = $1.downcase
+        subtype = $2.downcase
+        parameters = []
+        $3.scan(/;#{RE_LWS}?(#{RE_TOKEN})#{RE_LWS}?=#{RE_LWS}?(?:(#{RE_TOKEN})|(#{RE_QUOTED_STRING}))/no) {|att, val, qval|
+          val = qval.gsub(/[\r\n\t !#-\[\]-~\x80-\xff]+|(\\[\x00-\x7f])/) { $1 ? $1[1,1] : $& } if qval
+          parameters << [att.downcase, val]
+        }
+        ["#{type}/#{subtype}", *parameters]
+      else
+        nil
+      end
+    end
+
+    # returns "type/subtype" which is MIME Content-Type.
+    # It is downcased for canonicalization.
+    # Content-Type parameters are stripped.
+    def content_type
+      type, *parameters = content_type_parse
+      type || 'application/octet-stream'
+    end
+
+    # returns a charset parameter in Content-Type field.
+    # It is downcased for canonicalization.
+    #
+    # If charset parameter is not given but a block is given,
+    # the block is called and its result is returned.
+    # It can be used to guess charset.
+    #
+    # If charset parameter and block is not given,
+    # nil is returned except text type in HTTP.
+    # In that case, "iso-8859-1" is returned as defined by RFC2616 3.7.1.
+    def charset
+      type, *parameters = content_type_parse
+      if pair = parameters.assoc('charset')
+        pair.last.downcase
+      elsif block_given?
+        yield
+      elsif type && %r{\Atext/} =~ type &&
+            @base_uri && /\Ahttp\z/i =~ @base_uri.scheme
+        "iso-8859-1" # RFC2616 3.7.1
+      else
+        nil
+      end
+    end
+
+    # returns a list of encodings in Content-Encoding field
+    # as an Array of String.
+    # The encodings are downcased for canonicalization.
+    def content_encoding
+      v = @meta['content-encoding']
+      if v && %r{\A#{RE_LWS}?#{RE_TOKEN}#{RE_LWS}?(?:,#{RE_LWS}?#{RE_TOKEN}#{RE_LWS}?)*}o =~ v
+        v.scan(RE_TOKEN).map {|content_coding| content_coding.downcase}
+      else
+        []
+      end
+    end
+  end
+
+  # Mixin for HTTP and FTP URIs.
+  module OpenRead
+    # OpenURI::OpenRead#open provides `open' for URI::HTTP and URI::FTP.
+    #
+    # OpenURI::OpenRead#open takes optional 3 arguments as:
+    # OpenURI::OpenRead#open([mode [, perm]] [, options]) [{|io| ... }]
+    #
+    # `mode', `perm' is same as Kernel#open.
+    #
+    # However, `mode' must be read mode because OpenURI::OpenRead#open doesn't
+    # support write mode (yet).
+    # Also `perm' is just ignored because it is meaningful only for file
+    # creation.
+    #
+    # `options' must be a hash.
+    #
+    # Each pairs which key is a string in the hash specify a extra header
+    # field for HTTP.
+    # I.e. it is ignored for FTP without HTTP proxy.
+    #
+    # The hash may include other options which key is a symbol:
+    #
+    # [:proxy]
+    #  Synopsis:
+    #    :proxy => "http://proxy.foo.com:8000/"
+    #    :proxy => URI.parse("http://proxy.foo.com:8000/")
+    #    :proxy => true
+    #    :proxy => false
+    #    :proxy => nil
+    #   
+    #  If :proxy option is specified, the value should be String, URI,
+    #  boolean or nil.
+    #  When String or URI is given, it is treated as proxy URI.
+    #  When true is given or the option itself is not specified,
+    #  environment variable `scheme_proxy' is examined.
+    #  `scheme' is replaced by `http', `https' or `ftp'.
+    #  When false or nil is given, the environment variables are ignored and
+    #  connection will be made to a server directly.
+    #
+    # [:http_basic_authentication]
+    #  Synopsis:
+    #    :http_basic_authentication=>[user, password]
+    #
+    #  If :http_basic_authentication is specified,
+    #  the value should be an array which contains 2 strings:
+    #  username and password.
+    #  It is used for HTTP Basic authentication defined by RFC 2617.
+    #
+    # [:content_length_proc]
+    #  Synopsis:
+    #    :content_length_proc => lambda {|content_length| ... }
+    # 
+    #  If :content_length_proc option is specified, the option value procedure
+    #  is called before actual transfer is started.
+    #  It takes one argument which is expected content length in bytes.
+    # 
+    #  If two or more transfer is done by HTTP redirection, the procedure
+    #  is called only one for a last transfer.
+    # 
+    #  When expected content length is unknown, the procedure is called with
+    #  nil.
+    #  It is happen when HTTP response has no Content-Length header.
+    #
+    # [:progress_proc]
+    #  Synopsis:
+    #    :progress_proc => lambda {|size| ...}
+    #
+    #  If :progress_proc option is specified, the proc is called with one
+    #  argument each time when `open' gets content fragment from network.
+    #  The argument `size' `size' is a accumulated transfered size in bytes.
+    #
+    #  If two or more transfer is done by HTTP redirection, the procedure
+    #  is called only one for a last transfer.
+    #
+    #  :progress_proc and :content_length_proc are intended to be used for
+    #  progress bar.
+    #  For example, it can be implemented as follows using Ruby/ProgressBar.
+    #
+    #    pbar = nil
+    #    open("http://...",
+    #      :content_length_proc => lambda {|t|
+    #        if t && 0 < t
+    #          pbar = ProgressBar.new("...", t)
+    #          pbar.file_transfer_mode
+    #        end
+    #      },
+    #      :progress_proc => lambda {|s|
+    #        pbar.set s if pbar
+    #      }) {|f| ... }
+    #
+    # OpenURI::OpenRead#open returns an IO like object if block is not given.
+    # Otherwise it yields the IO object and return the value of the block.
+    # The IO object is extended with OpenURI::Meta.
+    def open(*rest, &block)
+      OpenURI.open_uri(self, *rest, &block)
+    end
+
+    # OpenURI::OpenRead#read([options]) reads a content referenced by self and
+    # returns the content as string.
+    # The string is extended with OpenURI::Meta.
+    # The argument `options' is same as OpenURI::OpenRead#open.
+    def read(options={})
+      self.open(options) {|f|
+        str = f.read
+        Meta.init str, f
+        str
+      }
+    end
+  end
+end
+
+module URI
+  class Generic
+    # returns a proxy URI.
+    # The proxy URI is obtained from environment variables such as http_proxy,
+    # ftp_proxy, no_proxy, etc.
+    # If there is no proper proxy, nil is returned.
+    #
+    # Note that capitalized variables (HTTP_PROXY, FTP_PROXY, NO_PROXY, etc.)
+    # are examined too.
+    #
+    # But http_proxy and HTTP_PROXY is treated specially under CGI environment.
+    # It's because HTTP_PROXY may be set by Proxy: header.
+    # So HTTP_PROXY is not used.
+    # http_proxy is not used too if the variable is case insensitive.
+    # CGI_HTTP_PROXY can be used instead.
+    def find_proxy
+      name = self.scheme.downcase + '_proxy'
+      proxy_uri = nil
+      if name == 'http_proxy' && ENV.include?('REQUEST_METHOD') # CGI?
+        # HTTP_PROXY conflicts with *_proxy for proxy settings and
+        # HTTP_* for header information in CGI.
+        # So it should be careful to use it.
+        pairs = ENV.reject {|k, v| /\Ahttp_proxy\z/i !~ k }
+        case pairs.length
+        when 0 # no proxy setting anyway.
+          proxy_uri = nil
+        when 1
+          k, v = pairs.shift
+          if k == 'http_proxy' && ENV[k.upcase] == nil
+            # http_proxy is safe to use because ENV is case sensitive.
+            proxy_uri = ENV[name]
+          else
+            proxy_uri = nil
+          end
+        else # http_proxy is safe to use because ENV is case sensitive.
+          proxy_uri = ENV[name]
+        end
+        if !proxy_uri
+          # Use CGI_HTTP_PROXY.  cf. libwww-perl.
+          proxy_uri = ENV["CGI_#{name.upcase}"]
+        end
+      elsif name == 'http_proxy'
+        unless proxy_uri = ENV[name]
+          if proxy_uri = ENV[name.upcase]
+            warn 'The environment variable HTTP_PROXY is discouraged.  Use http_proxy.'
+          end
+        end
+      else
+        proxy_uri = ENV[name] || ENV[name.upcase]
+      end
+
+      if proxy_uri && self.host
+        require 'socket'
+        begin
+          addr = IPSocket.getaddress(self.host)
+          proxy_uri = nil if /\A127\.|\A::1\z/ =~ addr
+        rescue SocketError
+        end
+      end
+
+      if proxy_uri
+        proxy_uri = URI.parse(proxy_uri)
+        name = 'no_proxy'
+        if no_proxy = ENV[name] || ENV[name.upcase]
+          no_proxy.scan(/([^:,]*)(?::(\d+))?/) {|host, port|
+            if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host &&
+               (!port || self.port == port.to_i)
+              proxy_uri = nil
+              break
+            end
+          }
+        end
+        proxy_uri
+      else
+        nil
+      end
+    end
+  end
+
+  class HTTP
+    def buffer_open(buf, proxy, options) # :nodoc:
+      OpenURI.open_http(buf, self, proxy, options)
+    end
+
+    include OpenURI::OpenRead
+  end
+
+  class FTP
+    def buffer_open(buf, proxy, options) # :nodoc:
+      if proxy
+        OpenURI.open_http(buf, self, proxy, options)
+        return
+      end
+      require 'net/ftp'
+
+      directories = self.path.split(%r{/}, -1)
+      directories.shift if directories[0] == '' # strip a field before leading slash
+      directories.each {|d|
+        d.gsub!(/%([0-9A-Fa-f][0-9A-Fa-f])/) { [$1].pack("H2") }
+      }
+      unless filename = directories.pop
+        raise ArgumentError, "no filename: #{self.inspect}"
+      end
+      directories.each {|d|
+        if /[\r\n]/ =~ d
+          raise ArgumentError, "invalid directory: #{d.inspect}"
+        end
+      }
+      if /[\r\n]/ =~ filename
+        raise ArgumentError, "invalid filename: #{filename.inspect}"
+      end
+      typecode = self.typecode
+      if typecode && /\A[aid]\z/ !~ typecode
+        raise ArgumentError, "invalid typecode: #{typecode.inspect}"
+      end
+
+      # The access sequence is defined by RFC 1738
+      ftp = Net::FTP.open(self.host)
+      # todo: extract user/passwd from .netrc.
+      user = 'anonymous'
+      passwd = nil
+      user, passwd = self.userinfo.split(/:/) if self.userinfo
+      ftp.login(user, passwd)
+      directories.each {|cwd|
+        ftp.voidcmd("CWD #{cwd}")
+      }
+      if typecode
+        # xxx: typecode D is not handled.
+        ftp.voidcmd("TYPE #{typecode.upcase}")
+      end
+      if options[:content_length_proc]
+        options[:content_length_proc].call(ftp.size(filename))
+      end
+      ftp.retrbinary("RETR #{filename}", 4096) { |str|
+        buf << str
+        options[:progress_proc].call(buf.size) if options[:progress_proc]
+      }
+      ftp.close
+      buf.io.rewind
+    end
+
+    include OpenURI::OpenRead
+  end
+end
diff --git a/ruby_1_8_6/lib/open3.rb b/ruby_1_8_6/lib/open3.rb
new file mode 100644
index 0000000000..c4dacc9473
--- /dev/null
+++ b/ruby_1_8_6/lib/open3.rb
@@ -0,0 +1,101 @@
+#
+# = open3.rb: Popen, but with stderr, too
+#
+# Author:: Yukihiro Matsumoto
+# Documentation:: Konrad Meyer
+#
+# Open3 gives you access to stdin, stdout, and stderr when running other
+# programs.
+#
+
+#
+# Open3 grants you access to stdin, stdout, and stderr when running another
+# program. Example:
+#
+#   require "open3"
+#   include Open3
+#   
+#   stdin, stdout, stderr = popen3('nroff -man')
+#
+# Open3.popen3 can also take a block which will receive stdin, stdout and
+# stderr as parameters.  This ensures stdin, stdout and stderr are closed
+# once the block exits. Example:
+#
+#   require "open3"
+#
+#   Open3.popen3('nroff -man') { |stdin, stdout, stderr| ... }
+#
+
+module Open3
+  # 
+  # Open stdin, stdout, and stderr streams and start external executable.
+  # Non-block form:
+  #   
+  #   require 'open3'
+  #
+  #   [stdin, stdout, stderr] = Open3.popen3(cmd)
+  #
+  # Block form:
+  #
+  #   require 'open3'
+  #
+  #   Open3.popen3(cmd) { |stdin, stdout, stderr| ... }
+  #
+  # The parameter +cmd+ is passed directly to Kernel#exec.
+  #
+  def popen3(*cmd)
+    pw = IO::pipe   # pipe[0] for read, pipe[1] for write
+    pr = IO::pipe
+    pe = IO::pipe
+
+    pid = fork{
+      # child
+      fork{
+	# grandchild
+	pw[1].close
+	STDIN.reopen(pw[0])
+	pw[0].close
+
+	pr[0].close
+	STDOUT.reopen(pr[1])
+	pr[1].close
+
+	pe[0].close
+	STDERR.reopen(pe[1])
+	pe[1].close
+
+	exec(*cmd)
+      }
+      exit!(0)
+    }
+
+    pw[0].close
+    pr[1].close
+    pe[1].close
+    Process.waitpid(pid)
+    pi = [pw[1], pr[0], pe[0]]
+    pw[1].sync = true
+    if defined? yield
+      begin
+	return yield(*pi)
+      ensure
+	pi.each{|p| p.close unless p.closed?}
+      end
+    end
+    pi
+  end
+  module_function :popen3
+end
+
+if $0 == __FILE__
+  a = Open3.popen3("nroff -man")
+  Thread.start do
+    while line = gets
+      a[0].print line
+    end
+    a[0].close
+  end
+  while line = a[1].gets
+    print ":", line
+  end
+end
diff --git a/ruby_1_8_6/lib/optparse.rb b/ruby_1_8_6/lib/optparse.rb
new file mode 100644
index 0000000000..2c91cd004f
--- /dev/null
+++ b/ruby_1_8_6/lib/optparse.rb
@@ -0,0 +1,1788 @@
+#
+# optparse.rb - command-line option analysis with the OptionParser class.
+# 
+# Author:: Nobu Nakada
+# Documentation:: Nobu Nakada and Gavin Sinclair.
+#
+# See OptionParser for documentation. 
+#
+
+
+# == Developer Documentation (not for RDoc output) 
+# 
+# === Class tree
+#
+# - OptionParser:: front end
+# - OptionParser::Switch:: each switches
+# - OptionParser::List:: options list
+# - OptionParser::ParseError:: errors on parsing
+#   - OptionParser::AmbiguousOption
+#   - OptionParser::NeedlessArgument
+#   - OptionParser::MissingArgument
+#   - OptionParser::InvalidOption
+#   - OptionParser::InvalidArgument
+#     - OptionParser::AmbiguousArgument
+#
+# === Object relationship diagram
+#
+#   +--------------+
+#   | OptionParser |<>-----+
+#   +--------------+       |                      +--------+
+#                          |                    ,-| Switch |
+#        on_head -------->+---------------+    /  +--------+
+#        accept/reject -->| List          |<|>-
+#                         |               |<|>-  +----------+
+#        on ------------->+---------------+    `-| argument |
+#                           :           :        |  class   |
+#                         +---------------+      |==========|
+#        on_tail -------->|               |      |pattern   |
+#                         +---------------+      |----------|
+#   OptionParser.accept ->| DefaultList   |      |converter |
+#                reject   |(shared between|      +----------+
+#                         | all instances)|
+#                         +---------------+
+#
+# == OptionParser
+#
+# === Introduction
+#
+# OptionParser is a class for command-line option analysis.  It is much more
+# advanced, yet also easier to use, than GetoptLong, and is a more Ruby-oriented
+# solution.
+#
+# === Features
+# 
+# 1. The argument specification and the code to handle it are written in the
+#    same place.
+# 2. It can output an option summary; you don't need to maintain this string
+#    separately.
+# 3. Optional and mandatory arguments are specified very gracefully.
+# 4. Arguments can be automatically converted to a specified class.
+# 5. Arguments can be restricted to a certain set.
+#
+# All of these features are demonstrated in the examples below.
+#
+# === Minimal example
+#
+#   require 'optparse'
+#
+#   options = {}
+#   OptionParser.new do |opts|
+#     opts.banner = "Usage: example.rb [options]"
+#
+#     opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+#       options[:verbose] = v
+#     end
+#   end.parse!
+#
+#   p options
+#   p ARGV
+#
+# === Complete example
+#
+# The following example is a complete Ruby program.  You can run it and see the
+# effect of specifying various options.  This is probably the best way to learn
+# the features of +optparse+.
+#
+#   require 'optparse'
+#   require 'optparse/time'
+#   require 'ostruct'
+#   require 'pp'
+#   
+#   class OptparseExample
+#   
+#     CODES = %w[iso-2022-jp shift_jis euc-jp utf8 binary]
+#     CODE_ALIASES = { "jis" => "iso-2022-jp", "sjis" => "shift_jis" }
+#   
+#     #
+#     # Return a structure describing the options.
+#     #
+#     def self.parse(args)
+#       # The options specified on the command line will be collected in *options*.
+#       # We set default values here.
+#       options = OpenStruct.new
+#       options.library = []
+#       options.inplace = false
+#       options.encoding = "utf8"
+#       options.transfer_type = :auto
+#       options.verbose = false
+#       
+#       opts = OptionParser.new do |opts|
+#         opts.banner = "Usage: example.rb [options]"
+#       
+#         opts.separator ""
+#         opts.separator "Specific options:"
+#       
+#         # Mandatory argument.
+#         opts.on("-r", "--require LIBRARY",
+#                 "Require the LIBRARY before executing your script") do |lib|
+#           options.library << lib
+#         end
+#       
+#         # Optional argument; multi-line description.
+#         opts.on("-i", "--inplace [EXTENSION]",
+#                 "Edit ARGV files in place",
+#                 "  (make backup if EXTENSION supplied)") do |ext|
+#           options.inplace = true
+#           options.extension = ext || ''
+#           options.extension.sub!(/\A\.?(?=.)/, ".")  # Ensure extension begins with dot.
+#         end
+#       
+#         # Cast 'delay' argument to a Float.
+#         opts.on("--delay N", Float, "Delay N seconds before executing") do |n|
+#           options.delay = n
+#         end
+#       
+#         # Cast 'time' argument to a Time object.
+#         opts.on("-t", "--time [TIME]", Time, "Begin execution at given time") do |time|
+#           options.time = time
+#         end
+#       
+#         # Cast to octal integer.
+#         opts.on("-F", "--irs [OCTAL]", OptionParser::OctalInteger,
+#                 "Specify record separator (default \\0)") do |rs|
+#           options.record_separator = rs
+#         end
+#       
+#         # List of arguments.
+#         opts.on("--list x,y,z", Array, "Example 'list' of arguments") do |list|
+#           options.list = list
+#         end
+#       
+#         # Keyword completion.  We are specifying a specific set of arguments (CODES
+#         # and CODE_ALIASES - notice the latter is a Hash), and the user may provide
+#         # the shortest unambiguous text.
+#         code_list = (CODE_ALIASES.keys + CODES).join(',')
+#         opts.on("--code CODE", CODES, CODE_ALIASES, "Select encoding",
+#                 "  (#{code_list})") do |encoding|
+#           options.encoding = encoding
+#         end
+#       
+#         # Optional argument with keyword completion.
+#         opts.on("--type [TYPE]", [:text, :binary, :auto],
+#                 "Select transfer type (text, binary, auto)") do |t|
+#           options.transfer_type = t
+#         end
+#       
+#         # Boolean switch.
+#         opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+#           options.verbose = v
+#         end
+#       
+#         opts.separator ""
+#         opts.separator "Common options:"
+#       
+#         # No argument, shows at tail.  This will print an options summary.
+#         # Try it and see!
+#         opts.on_tail("-h", "--help", "Show this message") do
+#           puts opts
+#           exit
+#         end
+#       
+#         # Another typical switch to print the version.
+#         opts.on_tail("--version", "Show version") do
+#           puts OptionParser::Version.join('.')
+#           exit
+#         end
+#       end
+#       
+#       opts.parse!(args)
+#       options
+#     end  # parse()
+#   
+#   end  # class OptparseExample
+#   
+#   options = OptparseExample.parse(ARGV)
+#   pp options
+#
+# === Further documentation
+#
+# The above examples should be enough to learn how to use this class.  If you
+# have any questions, email me (gsinclair@soyabean.com.au) and I will update
+# this document.
+#
+class OptionParser
+  # :stopdoc:
+  RCSID = %w$Id$[1..-1].each {|s| s.freeze}.freeze
+  Version = (RCSID[1].split('.').collect {|s| s.to_i}.extend(Comparable).freeze if RCSID[1])
+  LastModified = (Time.gm(*RCSID[2, 2].join('-').scan(/\d+/).collect {|s| s.to_i}) if RCSID[2])
+  Release = RCSID[2]
+
+  NoArgument = [NO_ARGUMENT = :NONE, nil].freeze
+  RequiredArgument = [REQUIRED_ARGUMENT = :REQUIRED, true].freeze
+  OptionalArgument = [OPTIONAL_ARGUMENT = :OPTIONAL, false].freeze
+  # :startdoc:
+
+  #
+  # Keyword completion module.  This allows partial arguments to be specified
+  # and resolved against a list of acceptable values.
+  #
+  module Completion
+    def complete(key, icase = false, pat = nil)
+      pat ||= Regexp.new('\A' + Regexp.quote(key).gsub(/\w+\b/, '\&\w*'),
+                         icase)
+      canon, sw, k, v, cn = nil
+      candidates = []
+      each do |k, *v|
+        (if Regexp === k
+           kn = nil
+           k === key
+         else
+           kn = defined?(k.id2name) ? k.id2name : k
+           pat === kn
+         end) or next
+        v << k if v.empty?
+        candidates << [k, v, kn]
+      end
+      candidates = candidates.sort_by {|k, v, kn| kn.size}
+      if candidates.size == 1
+        canon, sw, * = candidates[0]
+      elsif candidates.size > 1
+        canon, sw, cn = candidates.shift
+        candidates.each do |k, v, kn|
+          next if sw == v
+          if String === cn and String === kn
+            if cn.rindex(kn, 0)
+              canon, sw, cn = k, v, kn
+              next
+            elsif kn.rindex(cn, 0)
+              next
+            end
+          end
+          throw :ambiguous, key
+        end
+      end
+      if canon
+        block_given? or return key, *sw
+        yield(key, *sw)
+      end
+    end
+
+    def convert(opt = nil, val = nil, *)
+      val
+    end
+  end
+
+
+  #
+  # Map from option/keyword string to object with completion.
+  #
+  class OptionMap < Hash
+    include Completion
+  end
+
+
+  #
+  # Individual switch class.  Not important to the user.
+  #
+  # Defined within Switch are several Switch-derived classes: NoArgument,
+  # RequiredArgument, etc. 
+  #
+  class Switch
+    attr_reader :pattern, :conv, :short, :long, :arg, :desc, :block
+
+    #
+    # Guesses argument style from +arg+.  Returns corresponding
+    # OptionParser::Switch class (OptionalArgument, etc.).
+    #
+    def self.guess(arg)
+      case arg
+      when ""
+        t = self
+      when /\A=?\[/
+        t = Switch::OptionalArgument
+      when /\A\s+\[/
+        t = Switch::PlacedArgument
+      else
+        t = Switch::RequiredArgument
+      end
+      self >= t or incompatible_argument_styles(arg, t)
+      t
+    end
+
+    def self.incompatible_argument_styles(arg, t)
+      raise ArgumentError, "#{arg}: incompatible argument styles\n  #{self}, #{t}"
+    end
+
+    def self.pattern
+      NilClass
+    end
+
+    def initialize(pattern = nil, conv = nil,
+                   short = nil, long = nil, arg = nil,
+                   desc = ([] if short or long), block = Proc.new)
+      raise if Array === pattern
+      @pattern, @conv, @short, @long, @arg, @desc, @block =
+        pattern, conv, short, long, arg, desc, block
+    end
+
+    #
+    # Parses +arg+ and returns rest of +arg+ and matched portion to the
+    # argument pattern. Yields when the pattern doesn't match substring.
+    #
+    def parse_arg(arg)
+      pattern or return nil, arg
+      unless m = pattern.match(arg)
+        yield(InvalidArgument, arg)
+        return arg, nil
+      end
+      if String === m
+        m = [s = m]
+      else
+        m = m.to_a
+        s = m[0]
+        return nil, m unless String === s
+      end
+      raise InvalidArgument, arg unless arg.rindex(s, 0)
+      return nil, m if s.length == arg.length
+      yield(InvalidArgument, arg) # didn't match whole arg
+      return arg[s.length..-1], m
+    end
+    private :parse_arg
+
+    #
+    # Parses argument, converts and returns +arg+, +block+ and result of
+    # conversion. Yields at semi-error condition instead of raising an
+    # exception.
+    #
+    def conv_arg(arg, val = nil)
+      if conv
+        val = conv.call(*val)
+      else
+        val = proc {|val| val}.call(*val)
+      end
+      return arg, block, val
+    end
+    private :conv_arg
+
+    #
+    # Produces the summary text. Each line of the summary is yielded to the
+    # block (without newline).
+    #
+    # +sdone+::  Already summarized short style options keyed hash.
+    # +ldone+::  Already summarized long style options keyed hash.
+    # +width+::  Width of left side (option part). In other words, the right
+    #            side (description part) starts after +width+ columns.
+    # +max+::    Maximum width of left side -> the options are filled within
+    #            +max+ columns.
+    # +indent+:: Prefix string indents all summarized lines.
+    #
+    def summarize(sdone = [], ldone = [], width = 1, max = width - 1, indent = "")
+      sopts, lopts, s = [], [], nil
+      @short.each {|s| sdone.fetch(s) {sopts << s}; sdone[s] = true} if @short
+      @long.each {|s| ldone.fetch(s) {lopts << s}; ldone[s] = true} if @long
+      return if sopts.empty? and lopts.empty? # completely hidden
+
+      left = [sopts.join(', ')]
+      right = desc.dup
+
+      while s = lopts.shift
+        l = left[-1].length + s.length
+        l += arg.length if left.size == 1 && arg
+        l < max or left << ''
+        left[-1] << if left[-1].empty? then ' ' * 4 else ', ' end << s
+      end
+
+      left[0] << arg if arg
+      mlen = left.collect {|s| s.length}.max.to_i
+      while mlen > width and l = left.shift
+        mlen = left.collect {|s| s.length}.max.to_i if l.length == mlen
+        yield(indent + l)
+      end
+
+      while begin l = left.shift; r = right.shift; l or r end
+        l = l.to_s.ljust(width) + ' ' + r if r and !r.empty?
+        yield(indent + l)
+      end
+
+      self
+    end
+
+    def add_banner(to)  # :nodoc:
+      unless @short or @long
+        s = desc.join
+        to << " [" + s + "]..." unless s.empty?
+      end
+      to
+    end
+
+    def match_nonswitch?(str) # :nodoc:
+      @pattern =~ str unless @short or @long
+    end
+
+    #
+    # Main name of the switch.
+    #
+    def switch_name
+      (long.first || short.first).sub(/\A-+(?:\[no-\])?/, '')
+    end
+
+    #
+    # Switch that takes no arguments.
+    #
+    class NoArgument < self
+
+      #
+      # Raises an exception if any arguments given.
+      #
+      def parse(arg, argv)
+        yield(NeedlessArgument, arg) if arg
+        conv_arg(arg)
+      end
+
+      def self.incompatible_argument_styles(*)
+      end
+
+      def self.pattern
+        Object
+      end
+    end
+
+    #
+    # Switch that takes an argument.
+    #
+    class RequiredArgument < self
+
+      #
+      # Raises an exception if argument is not present.
+      #
+      def parse(arg, argv)
+        unless arg
+          raise MissingArgument if argv.empty?
+          arg = argv.shift
+        end
+        conv_arg(*parse_arg(arg) {|*exc| raise(*exc)})
+      end
+    end
+
+    #
+    # Switch that can omit argument.
+    #
+    class OptionalArgument < self
+
+      #
+      # Parses argument if given, or uses default value.
+      #
+      def parse(arg, argv, &error)
+        if arg
+          conv_arg(*parse_arg(arg, &error))
+        else
+          conv_arg(arg)
+        end
+      end
+    end
+
+    #
+    # Switch that takes an argument, which does not begin with '-'.
+    #
+    class PlacedArgument < self
+
+      #
+      # Returns nil if argument is not present or begins with '-'.
+      #
+      def parse(arg, argv, &error)
+        if !(val = arg) and (argv.empty? or /\A-/ =~ (val = argv[0]))
+          return nil, block, nil
+        end
+        opt = (val = parse_arg(val, &error))[1]
+        val = conv_arg(*val)
+        if opt and !arg
+          argv.shift
+        else
+          val[0] = nil
+        end
+        val
+      end
+    end
+  end
+
+  #
+  # Simple option list providing mapping from short and/or long option
+  # string to OptionParser::Switch and mapping from acceptable argument to
+  # matching pattern and converter pair. Also provides summary feature.
+  #
+  class List
+    # Map from acceptable argument types to pattern and converter pairs.
+    attr_reader :atype
+    
+    # Map from short style option switches to actual switch objects.
+    attr_reader :short
+    
+    # Map from long style option switches to actual switch objects.
+    attr_reader :long
+    
+    # List of all switches and summary string.
+    attr_reader :list
+
+    #
+    # Just initializes all instance variables.
+    #
+    def initialize
+      @atype = {}
+      @short = OptionMap.new
+      @long = OptionMap.new
+      @list = []
+    end
+
+    #
+    # See OptionParser.accept.
+    #
+    def accept(t, pat = /.*/nm, &block)
+      if pat
+        pat.respond_to?(:match) or raise TypeError, "has no `match'"
+      else
+        pat = t if t.respond_to?(:match)
+      end
+      unless block
+        block = pat.method(:convert).to_proc if pat.respond_to?(:convert)
+      end
+      @atype[t] = [pat, block]
+    end
+
+    #
+    # See OptionParser.reject.
+    #
+    def reject(t)
+      @atype.delete(t)
+    end
+
+    #
+    # Adds +sw+ according to +sopts+, +lopts+ and +nlopts+.
+    #
+    # +sw+::     OptionParser::Switch instance to be added.
+    # +sopts+::  Short style option list.
+    # +lopts+::  Long style option list.
+    # +nlopts+:: Negated long style options list.
+    #
+    def update(sw, sopts, lopts, nsw = nil, nlopts = nil)
+      o = nil
+      sopts.each {|o| @short[o] = sw} if sopts
+      lopts.each {|o| @long[o] = sw} if lopts
+      nlopts.each {|o| @long[o] = nsw} if nsw and nlopts
+      used = @short.invert.update(@long.invert)
+      @list.delete_if {|o| Switch === o and !used[o]}
+    end
+    private :update
+
+    #
+    # Inserts +switch+ at the head of the list, and associates short, long
+    # and negated long options. Arguments are:
+    # 
+    # +switch+::      OptionParser::Switch instance to be inserted.
+    # +short_opts+::  List of short style options.
+    # +long_opts+::   List of long style options.
+    # +nolong_opts+:: List of long style options with "no-" prefix.
+    #
+    #   prepend(switch, short_opts, long_opts, nolong_opts)
+    #
+    def prepend(*args)
+      update(*args)
+      @list.unshift(args[0])
+    end
+
+    #
+    # Appends +switch+ at the tail of the list, and associates short, long
+    # and negated long options. Arguments are:
+    # 
+    # +switch+::      OptionParser::Switch instance to be inserted.
+    # +short_opts+::  List of short style options.
+    # +long_opts+::   List of long style options.
+    # +nolong_opts+:: List of long style options with "no-" prefix.
+    #
+    #   append(switch, short_opts, long_opts, nolong_opts)
+    #
+    def append(*args)
+      update(*args)
+      @list.push(args[0])
+    end
+
+    #
+    # Searches +key+ in +id+ list. The result is returned or yielded if a
+    # block is given. If it isn't found, nil is returned.
+    #
+    def search(id, key)
+      if list = __send__(id)
+        val = list.fetch(key) {return nil}
+        block_given? ? yield(val) : val
+      end
+    end
+
+    #
+    # Searches list +id+ for +opt+ and the optional patterns for completion
+    # +pat+. If +icase+ is true, the search is case insensitive. The result
+    # is returned or yielded if a block is given. If it isn't found, nil is
+    # returned.
+    #
+    def complete(id, opt, icase = false, *pat, &block)
+      __send__(id).complete(opt, icase, *pat, &block)
+    end
+
+    #
+    # Iterates over each option, passing the option to the +block+.
+    #
+    def each_option(&block)
+      list.each(&block)
+    end
+
+    #
+    # Creates the summary table, passing each line to the +block+ (without
+    # newline). The arguments +args+ are passed along to the summarize
+    # method which is called on every option.
+    #
+    def summarize(*args, &block)
+      list.each do |opt|
+        if opt.respond_to?(:summarize) # perhaps OptionParser::Switch
+          opt.summarize(*args, &block)
+        elsif !opt or opt.empty?
+          yield("")
+        else
+          opt.each(&block)
+        end
+      end
+    end
+
+    def add_banner(to)  # :nodoc:
+      list.each do |opt|
+        if opt.respond_to?(:add_banner)
+          opt.add_banner(to)
+        end
+      end
+      to
+    end
+  end
+
+  #
+  # Hash with completion search feature. See OptionParser::Completion.
+  #
+  class CompletingHash < Hash
+    include Completion
+
+    #
+    # Completion for hash key.
+    #
+    def match(key)
+      return key, *fetch(key) {
+        raise AmbiguousArgument, catch(:ambiguous) {return complete(key)}
+      }
+    end
+  end
+
+  # :stopdoc:
+
+  #
+  # Enumeration of acceptable argument styles. Possible values are:
+  #
+  # NO_ARGUMENT::       The switch takes no arguments. (:NONE)
+  # REQUIRED_ARGUMENT:: The switch requires an argument. (:REQUIRED)
+  # OPTIONAL_ARGUMENT:: The switch requires an optional argument. (:OPTIONAL)
+  #
+  # Use like --switch=argument (long style) or -Xargument (short style). For
+  # short style, only portion matched to argument pattern is dealed as
+  # argument.
+  #
+  ArgumentStyle = {}
+  NoArgument.each {|el| ArgumentStyle[el] = Switch::NoArgument}
+  RequiredArgument.each {|el| ArgumentStyle[el] = Switch::RequiredArgument}
+  OptionalArgument.each {|el| ArgumentStyle[el] = Switch::OptionalArgument}
+  ArgumentStyle.freeze
+
+  #
+  # Switches common used such as '--', and also provides default
+  # argument classes
+  #
+  DefaultList = List.new
+  DefaultList.short['-'] = Switch::NoArgument.new {}
+  DefaultList.long[''] = Switch::NoArgument.new {throw :terminate}
+
+  #
+  # Default options for ARGV, which never appear in option summary.
+  #
+  Officious = {}
+
+  #
+  # --help
+  # Shows option summary.
+  #
+  Officious['help'] = proc do |parser|
+    Switch::NoArgument.new do
+      puts parser.help
+      exit
+    end
+  end
+
+  #
+  # --version
+  # Shows version string if Version is defined.
+  #
+  Officious['version'] = proc do |parser|
+    Switch::OptionalArgument.new do |pkg|
+      if pkg
+        begin
+          require 'optparse/version'
+        rescue LoadError
+        else
+          show_version(*pkg.split(/,/)) or
+            abort("#{parser.program_name}: no version found in package #{pkg}")
+          exit
+        end
+      end
+      v = parser.ver or abort("#{parser.program_name}: version unknown")
+      puts v
+      exit
+    end
+  end
+
+  # :startdoc:
+
+  #
+  # Class methods
+  #
+
+  #
+  # Initializes a new instance and evaluates the optional block in context
+  # of the instance. Arguments +args+ are passed to #new, see there for
+  # description of parameters.
+  # 
+  # This method is *deprecated*, its behavior corresponds to the older #new
+  # method.
+  #
+  def self.with(*args, &block)
+    opts = new(*args)
+    opts.instance_eval(&block)
+    opts
+  end
+
+  #
+  # Returns an incremented value of +default+ according to +arg+.
+  #
+  def self.inc(arg, default = nil)
+    case arg
+    when Integer
+      arg.nonzero?
+    when nil
+      default.to_i + 1
+    end
+  end
+  def inc(*args)
+    self.class.inc(*args)
+  end
+
+  #
+  # Initializes the instance and yields itself if called with a block.
+  #
+  # +banner+:: Banner message.
+  # +width+::  Summary width.
+  # +indent+:: Summary indent.
+  #
+  def initialize(banner = nil, width = 32, indent = ' ' * 4)
+    @stack = [DefaultList, List.new, List.new]
+    @program_name = nil
+    @banner = banner
+    @summary_width = width
+    @summary_indent = indent
+    @default_argv = ARGV
+    add_officious
+    yield self if block_given?
+  end
+
+  def add_officious  # :nodoc:
+    list = base()
+    Officious.each do |opt, block|
+      list.long[opt] ||= block.call(self)
+    end
+  end
+
+  #
+  # Terminates option parsing. Optional parameter +arg+ is a string pushed
+  # back to be the first non-option argument.
+  #
+  def terminate(arg = nil)
+    self.class.terminate(arg)
+  end
+  def self.terminate(arg = nil)
+    throw :terminate, arg
+  end
+
+  @stack = [DefaultList]
+  def self.top() DefaultList end
+
+  #
+  # Directs to accept specified class +t+. The argument string is passed to
+  # the block in which it should be converted to the desired class.
+  #
+  # +t+::   Argument class specifier, any object including Class.
+  # +pat+:: Pattern for argument, defaults to +t+ if it responds to match.
+  #
+  #   accept(t, pat, &block)
+  #
+  def accept(*args, &blk) top.accept(*args, &blk) end
+  #
+  # See #accept.
+  #
+  def self.accept(*args, &blk) top.accept(*args, &blk) end
+
+  #
+  # Directs to reject specified class argument.
+  #
+  # +t+:: Argument class speficier, any object including Class.
+  #
+  #   reject(t)
+  #
+  def reject(*args, &blk) top.reject(*args, &blk) end
+  #
+  # See #reject.
+  #
+  def self.reject(*args, &blk) top.reject(*args, &blk) end
+
+  #
+  # Instance methods
+  #
+
+  # Heading banner preceding summary.
+  attr_writer :banner
+
+  # Program name to be emitted in error message and default banner,
+  # defaults to $0.
+  attr_writer :program_name
+
+  # Width for option list portion of summary. Must be Numeric.
+  attr_accessor :summary_width
+
+  # Indentation for summary. Must be String (or have + String method).
+  attr_accessor :summary_indent
+
+  # Strings to be parsed in default.
+  attr_accessor :default_argv
+
+  #
+  # Heading banner preceding summary.
+  #
+  def banner
+    unless @banner
+      @banner = "Usage: #{program_name} [options]"
+      visit(:add_banner, @banner)
+    end
+    @banner
+  end
+
+  #
+  # Program name to be emitted in error message and default banner, defaults
+  # to $0.
+  #
+  def program_name
+    @program_name || File.basename($0, '.*')
+  end
+
+  # for experimental cascading :-)
+  alias set_banner banner=
+  alias set_program_name program_name=
+  alias set_summary_width summary_width=
+  alias set_summary_indent summary_indent=
+
+  # Version
+  attr_writer :version
+  # Release code
+  attr_writer :release
+
+  #
+  # Version
+  #
+  def version
+    @version || (defined?(::Version) && ::Version)
+  end
+
+  #
+  # Release code
+  #
+  def release
+    @release || (defined?(::Release) && ::Release) || (defined?(::RELEASE) && ::RELEASE)
+  end
+
+  #
+  # Returns version string from program_name, version and release.
+  #
+  def ver
+    if v = version
+      str = "#{program_name} #{[v].join('.')}"
+      str << " (#{v})" if v = release
+      str
+    end
+  end
+
+  def warn(mesg = $!)
+    super("#{program_name}: #{mesg}")
+  end
+
+  def abort(mesg = $!)
+    super("#{program_name}: #{mesg}")
+  end
+
+  #
+  # Subject of #on / #on_head, #accept / #reject
+  #
+  def top
+    @stack[-1]
+  end
+
+  #
+  # Subject of #on_tail.
+  #
+  def base
+    @stack[1]
+  end
+
+  #
+  # Pushes a new List.
+  #
+  def new
+    @stack.push(List.new)
+    if block_given?
+      yield self
+    else
+      self
+    end
+  end
+
+  #
+  # Removes the last List.
+  #
+  def remove
+    @stack.pop
+  end
+
+  #
+  # Puts option summary into +to+ and returns +to+. Yields each line if
+  # a block is given.
+  #
+  # +to+:: Output destination, which must have method <<. Defaults to [].
+  # +width+:: Width of left side, defaults to @summary_width.
+  # +max+:: Maximum length allowed for left side, defaults to +width+ - 1.
+  # +indent+:: Indentation, defaults to @summary_indent.
+  #
+  def summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent, &blk)
+    visit(:summarize, {}, {}, width, max, indent, &(blk || proc {|l| to << l + $/}))
+    to
+  end
+
+  #
+  # Returns option summary string.
+  #
+  def help; summarize(banner.to_s.sub(/\n?\z/, "\n")) end
+  alias to_s help
+
+  #
+  # Returns option summary list.
+  #
+  def to_a; summarize(banner.to_a.dup) end
+
+  #
+  # Checks if an argument is given twice, in which case an ArgumentError is
+  # raised. Called from OptionParser#switch only.
+  #
+  # +obj+:: New argument.
+  # +prv+:: Previously specified argument.
+  # +msg+:: Exception message.
+  #
+  def notwice(obj, prv, msg)
+    unless !prv or prv == obj
+      begin
+        raise ArgumentError, "argument #{msg} given twice: #{obj}"
+      rescue
+        $@[0, 2] = nil
+        raise
+      end
+    end
+    obj
+  end
+  private :notwice
+
+  #
+  # Creates an OptionParser::Switch from the parameters. The parsed argument
+  # value is passed to the given block, where it can be processed.
+  #
+  # See at the beginning of OptionParser for some full examples.
+  #
+  # +opts+ can include the following elements:
+  #
+  # [Argument style:]
+  #   One of the following:
+  #     :NONE, :REQUIRED, :OPTIONAL
+  #
+  # [Argument pattern:]
+  #   Acceptable option argument format, must be pre-defined with
+  #   OptionParser.accept or OptionParser#accept, or Regexp. This can appear
+  #   once or assigned as String if not present, otherwise causes an
+  #   ArgumentError. Examples:
+  #     Float, Time, Array
+  #
+  # [Possible argument values:]
+  #   Hash or Array.
+  #     [:text, :binary, :auto]
+  #     %w[iso-2022-jp shift_jis euc-jp utf8 binary]
+  #     { "jis" => "iso-2022-jp", "sjis" => "shift_jis" }
+  #
+  # [Long style switch:]
+  #   Specifies a long style switch which takes a mandatory, optional or no
+  #   argument. It's a string of the following form:
+  #     "--switch=MANDATORY" or "--switch MANDATORY"
+  #     "--switch[=OPTIONAL]"
+  #     "--switch"
+  #
+  # [Short style switch:]
+  #   Specifies short style switch which takes a mandatory, optional or no
+  #   argument. It's a string of the following form:
+  #     "-xMANDATORY"
+  #     "-x[OPTIONAL]"
+  #     "-x"
+  #   There is also a special form which matches character range (not full
+  #   set of regural expression):
+  #     "-[a-z]MANDATORY"
+  #     "-[a-z][OPTIONAL]" 
+  #     "-[a-z]"
+  #
+  # [Argument style and description:]
+  #   Instead of specifying mandatory or optional orguments directly in the
+  #   switch parameter, this separate parameter can be used.
+  #     "=MANDATORY"
+  #     "=[OPTIONAL]"
+  #
+  # [Description:]
+  #   Description string for the option.
+  #     "Run verbosely"
+  # 
+  # [Handler:]
+  #   Handler for the parsed argument value. Either give a block or pass a
+  #   Proc or Method as an argument.
+  #
+  def make_switch(opts, block = nil)
+    short, long, nolong, style, pattern, conv, not_pattern, not_conv, not_style = [], [], []
+    ldesc, sdesc, desc, arg = [], [], []
+    default_style = Switch::NoArgument
+    default_pattern = nil
+    klass = nil
+    o = nil
+    n, q, a = nil
+
+    opts.each do |o|
+      # argument class
+      next if search(:atype, o) do |pat, c|
+        klass = notwice(o, klass, 'type')
+        if not_style and not_style != Switch::NoArgument
+          not_pattern, not_conv = pat, c
+        else
+          default_pattern, conv = pat, c
+        end
+      end
+
+      # directly specified pattern(any object possible to match)
+      if !(String === o) and o.respond_to?(:match)
+        pattern = notwice(o, pattern, 'pattern')
+        conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
+        next
+      end
+
+      # anything others
+      case o
+      when Proc, Method
+        block = notwice(o, block, 'block')
+      when Array, Hash
+        case pattern
+        when CompletingHash
+        when nil
+          pattern = CompletingHash.new
+          conv = (pattern.method(:convert).to_proc if pattern.respond_to?(:convert))
+        else
+          raise ArgumentError, "argument pattern given twice"
+        end
+        o.each {|(o, *v)| pattern[o] = v.fetch(0) {o}}
+      when Module
+        raise ArgumentError, "unsupported argument type: #{o}"
+      when *ArgumentStyle.keys
+        style = notwice(ArgumentStyle[o], style, 'style')
+      when /^--no-([^\[\]=\s]*)(.+)?/
+        q, a = $1, $2
+        o = notwice(a ? Object : TrueClass, klass, 'type')
+        not_pattern, not_conv = search(:atype, o) unless not_style
+        not_style = (not_style || default_style).guess(arg = a) if a
+        default_style = Switch::NoArgument
+        default_pattern, conv = search(:atype, FalseClass) unless default_pattern
+        ldesc << "--no-#{q}"
+        long << 'no-' + (q = q.downcase)
+        nolong << q
+      when /^--\[no-\]([^\[\]=\s]*)(.+)?/
+        q, a = $1, $2
+        o = notwice(a ? Object : TrueClass, klass, 'type')
+        if a
+          default_style = default_style.guess(arg = a)
+          default_pattern, conv = search(:atype, o) unless default_pattern
+        end
+        ldesc << "--[no-]#{q}"
+        long << (o = q.downcase)
+        not_pattern, not_conv = search(:atype, FalseClass) unless not_style
+        not_style = Switch::NoArgument
+        nolong << 'no-' + o
+      when /^--([^\[\]=\s]*)(.+)?/
+        q, a = $1, $2
+        if a
+          o = notwice(NilClass, klass, 'type')
+          default_style = default_style.guess(arg = a)
+          default_pattern, conv = search(:atype, o) unless default_pattern
+        end
+        ldesc << "--#{q}"
+        long << (o = q.downcase)
+      when /^-(\[\^?\]?(?:[^\\\]]|\\.)*\])(.+)?/
+        q, a = $1, $2
+        o = notwice(Object, klass, 'type')
+        if a
+          default_style = default_style.guess(arg = a)
+          default_pattern, conv = search(:atype, o) unless default_pattern
+        end
+        sdesc << "-#{q}"
+        short << Regexp.new(q)
+      when /^-(.)(.+)?/
+        q, a = $1, $2
+        if a
+          o = notwice(NilClass, klass, 'type')
+          default_style = default_style.guess(arg = a)
+          default_pattern, conv = search(:atype, o) unless default_pattern
+        end
+        sdesc << "-#{q}"
+        short << q
+      when /^=/
+        style = notwice(default_style.guess(arg = o), style, 'style')
+        default_pattern, conv = search(:atype, Object) unless default_pattern
+      else
+        desc.push(o)
+      end
+    end
+
+    default_pattern, conv = search(:atype, default_style.pattern) unless default_pattern
+    if !(short.empty? and long.empty?)
+      s = (style || default_style).new(pattern || default_pattern,
+                                       conv, sdesc, ldesc, arg, desc, block)
+    elsif !block
+      raise ArgumentError, "no switch given" if style or pattern
+      s = desc
+    else
+      short << pattern
+      s = (style || default_style).new(pattern,
+                                       conv, nil, nil, arg, desc, block)
+    end
+    return s, short, long,
+      (not_style.new(not_pattern, not_conv, sdesc, ldesc, nil, desc, block) if not_style),
+      nolong
+  end
+
+  def define(*opts, &block)
+    top.append(*(sw = make_switch(opts, block)))
+    sw[0]
+  end
+
+  #
+  # Add option switch and handler. See #make_switch for an explanation of
+  # parameters.
+  #
+  def on(*opts, &block)
+    define(*opts, &block)
+    self
+  end
+  alias def_option define
+
+  def define_head(*opts, &block)
+    top.prepend(*(sw = make_switch(opts, block)))
+    sw[0]
+  end
+
+  #
+  # Add option switch like with #on, but at head of summary.
+  #
+  def on_head(*opts, &block)
+    define_head(*opts, &block)
+    self
+  end
+  alias def_head_option define_head
+
+  def define_tail(*opts, &block)
+    base.append(*(sw = make_switch(opts, block)))
+    sw[0]
+  end
+
+  #
+  # Add option switch like with #on, but at tail of summary.
+  #
+  def on_tail(*opts, &block)
+    define_tail(*opts, &block)
+    self
+  end
+  alias def_tail_option define_tail
+
+  #
+  # Add separator in summary.
+  #
+  def separator(string)
+    top.append(string, nil, nil)
+  end
+
+  #
+  # Parses command line arguments +argv+ in order. When a block is given,
+  # each non-option argument is yielded.
+  #
+  # Returns the rest of +argv+ left unparsed.
+  #
+  def order(*argv, &block)
+    argv = argv[0].dup if argv.size == 1 and Array === argv[0]
+    order!(argv, &block)
+  end
+
+  #
+  # Same as #order, but removes switches destructively.
+  #
+  def order!(argv = default_argv, &nonopt)
+    parse_in_order(argv, &nonopt)
+  end
+
+  def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
+    opt, arg, sw, val, rest = nil
+    nonopt ||= proc {|arg| throw :terminate, arg}
+    argv.unshift(arg) if arg = catch(:terminate) {
+      while arg = argv.shift
+        case arg
+        # long option
+        when /\A--([^=]*)(?:=(.*))?/nm
+          opt, rest = $1, $2
+          begin
+            sw, = complete(:long, opt, true)
+          rescue ParseError
+            raise $!.set_option(arg, true)
+          end
+          begin
+            opt, cb, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
+            val = cb.call(val) if cb
+            setter.call(sw.switch_name, val) if setter
+          rescue ParseError
+            raise $!.set_option(arg, rest)
+          end
+
+        # short option
+        when /\A-(.)((=).*|.+)?/nm
+          opt, has_arg, eq, val, rest = $1, $3, $3, $2, $2
+          begin
+            sw, = search(:short, opt)
+            unless sw
+              begin
+                sw, = complete(:short, opt)
+                # short option matched.
+                val = arg.sub(/\A-/, '')
+                has_arg = true
+              rescue InvalidOption
+                # if no short options match, try completion with long
+                # options.
+                sw, = complete(:long, opt)
+                eq ||= !rest
+              end
+            end
+          rescue ParseError
+            raise $!.set_option(arg, true)
+          end
+          begin
+            opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
+            raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
+            argv.unshift(opt) if opt and (opt = opt.sub(/\A-*/, '-')) != '-'
+            val = cb.call(val) if cb
+            setter.call(sw.switch_name, val) if setter
+          rescue ParseError
+            raise $!.set_option(arg, arg.length > 2)
+          end
+
+        # non-option argument
+        else
+          catch(:prune) do
+            visit(:each_option) do |sw|
+              sw.block.call(arg) if Switch === sw and sw.match_nonswitch?(arg)
+            end
+            nonopt.call(arg)
+          end
+        end
+      end
+
+      nil
+    }
+
+    visit(:search, :short, nil) {|sw| sw.block.call(*argv) if !sw.pattern}
+
+    argv
+  end
+  private :parse_in_order
+
+  #
+  # Parses command line arguments +argv+ in permutation mode and returns
+  # list of non-option arguments.
+  #
+  def permute(*argv)
+    argv = argv[0].dup if argv.size == 1 and Array === argv[0]
+    permute!(argv)
+  end
+
+  #
+  # Same as #permute, but removes switches destructively.
+  #
+  def permute!(argv = default_argv)
+    nonopts = []
+    arg = nil
+    order!(argv) {|arg| nonopts << arg}
+    argv[0, 0] = nonopts
+    argv
+  end
+
+  #
+  # Parses command line arguments +argv+ in order when environment variable
+  # POSIXLY_CORRECT is set, and in permutation mode otherwise.
+  #
+  def parse(*argv)
+    argv = argv[0].dup if argv.size == 1 and Array === argv[0]
+    parse!(argv)
+  end
+
+  #
+  # Same as #parse, but removes switches destructively.
+  #
+  def parse!(argv = default_argv)
+    if ENV.include?('POSIXLY_CORRECT')
+      order!(argv)
+    else
+      permute!(argv)
+    end
+  end
+
+  #
+  # Wrapper method for getopts.rb.
+  #
+  #   params = ARGV.getopts("ab:", "foo", "bar:")
+  #   # params[:a] = true   # -a
+  #   # params[:b] = "1"    # -b1
+  #   # params[:foo] = "1"  # --foo
+  #   # params[:bar] = "x"  # --bar x
+  #
+  def getopts(*args)
+    argv = Array === args.first ? args.shift : default_argv
+    single_options, *long_options = *args
+
+    result = {}
+
+    single_options.scan(/(.)(:)?/) do |opt, val|
+      if val
+        result[opt] = nil
+        define("-#{opt} VAL")
+      else
+        result[opt] = false
+        define("-#{opt}")
+      end
+    end if single_options
+
+    long_options.each do |arg|
+      opt, val = arg.split(':', 2)
+      if val
+        result[opt] = val.empty? ? nil : val
+        define("--#{opt} VAL")
+      else
+        result[opt] = false
+        define("--#{opt}")
+      end
+    end
+
+    parse_in_order(argv, result.method(:[]=))
+    result
+  end
+
+  #
+  # See #getopts.
+  #
+  def self.getopts(*args)
+    new.getopts(*args)
+  end
+
+  #
+  # Traverses @stack, sending each element method +id+ with +args+ and
+  # +block+.
+  #
+  def visit(id, *args, &block)
+    el = nil
+    @stack.reverse_each do |el|
+      el.send(id, *args, &block)
+    end
+    nil
+  end
+  private :visit
+
+  #
+  # Searches +key+ in @stack for +id+ hash and returns or yields the result.
+  #
+  def search(id, key)
+    block_given = block_given?
+    visit(:search, id, key) do |k|
+      return block_given ? yield(k) : k
+    end
+  end
+  private :search
+
+  #
+  # Completes shortened long style option switch and returns pair of
+  # canonical switch and switch descriptor OptionParser::Switch.
+  #
+  # +id+::    Searching table.
+  # +opt+::   Searching key.
+  # +icase+:: Search case insensitive if true.
+  # +pat+::   Optional pattern for completion.
+  #
+  def complete(typ, opt, icase = false, *pat)
+    if pat.empty?
+      search(typ, opt) {|sw| return [sw, opt]} # exact match or...
+    end
+    raise AmbiguousOption, catch(:ambiguous) {
+      visit(:complete, typ, opt, icase, *pat) {|opt, *sw| return sw}
+      raise InvalidOption, opt
+    }
+  end
+  private :complete
+
+  #
+  # Loads options from file names as +filename+. Does nothing when the file
+  # is not present. Returns whether successfully loaded.
+  #
+  # +filename+ defaults to basename of the program without suffix in a
+  # directory ~/.options.
+  #
+  def load(filename = nil)
+    begin
+      filename ||= File.expand_path(File.basename($0, '.*'), '~/.options')
+    rescue
+      return false
+    end
+    begin
+      parse(*IO.readlines(filename).each {|s| s.chomp!})
+      true
+    rescue Errno::ENOENT, Errno::ENOTDIR
+      false
+    end
+  end
+
+  #
+  # Parses environment variable +env+ or its uppercase with splitting like a
+  # shell.
+  #
+  # +env+ defaults to the basename of the program.
+  #
+  def environment(env = File.basename($0, '.*'))
+    env = ENV[env] || ENV[env.upcase] or return
+    parse(*Shellwords.shellwords(env))
+  end
+
+  #
+  # Acceptable argument classes
+  #
+
+  #
+  # Any string and no conversion. This is fall-back.
+  #
+  accept(Object) {|s,|s or s.nil?}
+
+  accept(NilClass) {|s,|s}
+
+  #
+  # Any non-empty string, and no conversion.
+  #
+  accept(String, /.+/nm) {|s,*|s}
+
+  #
+  # Ruby/C-like integer, octal for 0-7 sequence, binary for 0b, hexadecimal
+  # for 0x, and decimal for others; with optional sign prefix. Converts to
+  # Integer.
+  #
+  decimal = '\d+(?:_\d+)*'
+  binary = 'b[01]+(?:_[01]+)*'
+  hex = 'x[\da-f]+(?:_[\da-f]+)*'
+  octal = "0(?:[0-7]*(?:_[0-7]+)*|#{binary}|#{hex})"
+  integer = "#{octal}|#{decimal}"
+  accept(Integer, %r"\A[-+]?(?:#{integer})"io) {|s,| Integer(s) if s}
+
+  #
+  # Float number format, and converts to Float.
+  #
+  float = "(?:#{decimal}(?:\\.(?:#{decimal})?)?|\\.#{decimal})(?:E[-+]?#{decimal})?"
+  floatpat = %r"\A[-+]?#{float}"io
+  accept(Float, floatpat) {|s,| s.to_f if s}
+
+  #
+  # Generic numeric format, converts to Integer for integer format, Float
+  # for float format.
+  #
+  accept(Numeric, %r"\A[-+]?(?:#{octal}|#{float})"io) {|s,| eval(s) if s}
+
+  #
+  # Decimal integer format, to be converted to Integer.
+  #
+  DecimalInteger = /\A[-+]?#{decimal}/io
+  accept(DecimalInteger) {|s,| s.to_i if s}
+
+  #
+  # Ruby/C like octal/hexadecimal/binary integer format, to be converted to
+  # Integer.
+  #
+  OctalInteger = /\A[-+]?(?:[0-7]+(?:_[0-7]+)*|0(?:#{binary}|#{hex}))/io
+  accept(OctalInteger) {|s,| s.oct if s}
+
+  #
+  # Decimal integer/float number format, to be converted to Integer for
+  # integer format, Float for float format.
+  #
+  DecimalNumeric = floatpat     # decimal integer is allowed as float also.
+  accept(DecimalNumeric) {|s,| eval(s) if s}
+
+  #
+  # Boolean switch, which means whether it is present or not, whether it is
+  # absent or not with prefix no-, or it takes an argument
+  # yes/no/true/false/+/-.
+  #
+  yesno = CompletingHash.new
+  %w[- no false].each {|el| yesno[el] = false}
+  %w[+ yes true].each {|el| yesno[el] = true}
+  yesno['nil'] = false          # shoud be nil?
+  accept(TrueClass, yesno) {|arg, val| val == nil or val}
+  #
+  # Similar to TrueClass, but defaults to false.
+  #
+  accept(FalseClass, yesno) {|arg, val| val != nil and val}
+
+  #
+  # List of strings separated by ",".
+  #
+  accept(Array) do |s,|
+    if s
+      s = s.split(',').collect {|s| s unless s.empty?}
+    end
+    s
+  end
+
+  #
+  # Regular expression with options.
+  #
+  accept(Regexp, %r"\A/((?:\\.|[^\\])*)/([[:alpha:]]+)?\z|.*") do |all, s, o|
+    f = 0
+    if o
+      f |= Regexp::IGNORECASE if /i/ =~ o
+      f |= Regexp::MULTILINE if /m/ =~ o
+      f |= Regexp::EXTENDED if /x/ =~ o
+      k = o.delete("^imx")
+    end
+    Regexp.new(s || all, f, k)
+  end
+
+  #
+  # Exceptions
+  #
+
+  #
+  # Base class of exceptions from OptionParser.
+  #
+  class ParseError < RuntimeError
+    # Reason which caused the error.
+    Reason = 'parse error'.freeze
+
+    def initialize(*args)
+      @args = args
+      @reason = nil
+    end
+
+    attr_reader :args
+    attr_writer :reason
+
+    #
+    # Pushes back erred argument(s) to +argv+.
+    #
+    def recover(argv)
+      argv[0, 0] = @args
+      argv
+    end
+
+    def set_option(opt, eq)
+      if eq
+        @args[0] = opt
+      else
+        @args.unshift(opt)
+      end
+      self
+    end
+
+    #
+    # Returns error reason. Override this for I18N.
+    #
+    def reason
+      @reason || self.class::Reason
+    end
+
+    def inspect
+      "#<#{self.class.to_s}: #{args.join(' ')}>"
+    end
+
+    #
+    # Default stringizing method to emit standard error message.
+    #
+    def message
+      reason + ': ' + args.join(' ')
+    end
+
+    alias to_s message
+  end
+
+  #
+  # Raises when ambiguously completable string is encountered.
+  #
+  class AmbiguousOption < ParseError
+    const_set(:Reason, 'ambiguous option'.freeze)
+  end
+
+  #
+  # Raises when there is an argument for a switch which takes no argument.
+  #
+  class NeedlessArgument < ParseError
+    const_set(:Reason, 'needless argument'.freeze)
+  end
+
+  #
+  # Raises when a switch with mandatory argument has no argument.
+  #
+  class MissingArgument < ParseError
+    const_set(:Reason, 'missing argument'.freeze)
+  end
+
+  #
+  # Raises when switch is undefined.
+  #
+  class InvalidOption < ParseError
+    const_set(:Reason, 'invalid option'.freeze)
+  end
+
+  #
+  # Raises when the given argument does not match required format.
+  #
+  class InvalidArgument < ParseError
+    const_set(:Reason, 'invalid argument'.freeze)
+  end
+
+  #
+  # Raises when the given argument word can't be completed uniquely.
+  #
+  class AmbiguousArgument < InvalidArgument
+    const_set(:Reason, 'ambiguous argument'.freeze)
+  end
+
+  #
+  # Miscellaneous
+  #
+
+  #
+  # Extends command line arguments array (ARGV) to parse itself.
+  #
+  module Arguable
+
+    #
+    # Sets OptionParser object, when +opt+ is +false+ or +nil+, methods
+    # OptionParser::Arguable#options and OptionParser::Arguable#options= are
+    # undefined. Thus, there is no ways to access the OptionParser object
+    # via the receiver object.
+    #
+    def options=(opt)
+      unless @optparse = opt
+        class << self
+          undef_method(:options)
+          undef_method(:options=)
+        end
+      end
+    end
+
+    #
+    # Actual OptionParser object, automatically created if nonexistent.
+    #
+    # If called with a block, yields the OptionParser object and returns the
+    # result of the block. If an OptionParser::ParseError exception occurs
+    # in the block, it is rescued, a error message printed to STDERR and
+    # +nil+ returned.
+    #
+    def options
+      @optparse ||= OptionParser.new
+      @optparse.default_argv = self
+      block_given? or return @optparse
+      begin
+        yield @optparse
+      rescue ParseError
+        @optparse.warn $!
+        nil
+      end
+    end
+
+    #
+    # Parses +self+ destructively in order and returns +self+ containing the
+    # rest arguments left unparsed.
+    #
+    def order!(&blk) options.order!(self, &blk) end
+
+    #
+    # Parses +self+ destructively in permutation mode and returns +self+
+    # containing the rest arguments left unparsed.
+    #
+    def permute!() options.permute!(self) end
+
+    #
+    # Parses +self+ destructively and returns +self+ containing the
+    # rest arguments left unparsed.
+    #
+    def parse!() options.parse!(self) end
+
+    #
+    # Substitution of getopts is possible as follows. Also see
+    # OptionParser#getopts.
+    #
+    #   def getopts(*args)
+    #     ($OPT = ARGV.getopts(*args)).each do |opt, val|
+    #       eval "$OPT_#{opt.gsub(/[^A-Za-z0-9_]/, '_')} = val"
+    #     end
+    #   rescue OptionParser::ParseError
+    #   end
+    #
+    def getopts(*args)
+      options.getopts(self, *args)
+    end
+
+    #
+    # Initializes instance variable.
+    #
+    def self.extend_object(obj)
+      super
+      obj.instance_eval {@optparse = nil}
+    end
+    def initialize(*args)
+      super
+      @optparse = nil
+    end
+  end
+
+  #
+  # Acceptable argument classes. Now contains DecimalInteger, OctalInteger
+  # and DecimalNumeric. See Acceptable argument classes (in source code).
+  #
+  module Acceptables
+    const_set(:DecimalInteger, OptionParser::DecimalInteger)
+    const_set(:OctalInteger, OptionParser::OctalInteger)
+    const_set(:DecimalNumeric, OptionParser::DecimalNumeric)
+  end
+end
+
+# ARGV is arguable by OptionParser
+ARGV.extend(OptionParser::Arguable)
+
+if $0 == __FILE__
+  Version = OptionParser::Version
+  ARGV.options {|q|
+    q.parse!.empty? or puts "what's #{ARGV.join(' ')}?"
+  } or abort(ARGV.options.to_s)
+end
diff --git a/ruby_1_8_6/lib/optparse/date.rb b/ruby_1_8_6/lib/optparse/date.rb
new file mode 100644
index 0000000000..d680559f37
--- /dev/null
+++ b/ruby_1_8_6/lib/optparse/date.rb
@@ -0,0 +1,17 @@
+require 'optparse'
+require 'date'
+
+OptionParser.accept(DateTime) do |s,|
+  begin
+    DateTime.parse(s) if s
+  rescue ArgumentError
+    raise OptionParser::InvalidArgument, s
+  end
+end
+OptionParser.accept(Date) do |s,|
+  begin
+    Date.parse(s) if s
+  rescue ArgumentError
+    raise OptionParser::InvalidArgument, s
+  end
+end
diff --git a/ruby_1_8_6/lib/optparse/shellwords.rb b/ruby_1_8_6/lib/optparse/shellwords.rb
new file mode 100644
index 0000000000..0422d7c887
--- /dev/null
+++ b/ruby_1_8_6/lib/optparse/shellwords.rb
@@ -0,0 +1,6 @@
+# -*- ruby -*-
+
+require 'shellwords'
+require 'optparse'
+
+OptionParser.accept(Shellwords) {|s,| Shellwords.shellwords(s)}
diff --git a/ruby_1_8_6/lib/optparse/time.rb b/ruby_1_8_6/lib/optparse/time.rb
new file mode 100644
index 0000000000..402cadcf16
--- /dev/null
+++ b/ruby_1_8_6/lib/optparse/time.rb
@@ -0,0 +1,10 @@
+require 'optparse'
+require 'time'
+
+OptionParser.accept(Time) do |s,|
+  begin
+    (Time.httpdate(s) rescue Time.parse(s)) if s
+  rescue
+    raise OptionParser::InvalidArgument, s
+  end
+end
diff --git a/ruby_1_8_6/lib/optparse/uri.rb b/ruby_1_8_6/lib/optparse/uri.rb
new file mode 100644
index 0000000000..024dc69eac
--- /dev/null
+++ b/ruby_1_8_6/lib/optparse/uri.rb
@@ -0,0 +1,6 @@
+# -*- ruby -*-
+
+require 'optparse'
+require 'uri'
+
+OptionParser.accept(URI) {|s,| URI.parse(s) if s}
diff --git a/ruby_1_8_6/lib/optparse/version.rb b/ruby_1_8_6/lib/optparse/version.rb
new file mode 100644
index 0000000000..558d9d710b
--- /dev/null
+++ b/ruby_1_8_6/lib/optparse/version.rb
@@ -0,0 +1,70 @@
+# OptionParser internal utility
+
+class << OptionParser
+  def show_version(*pkg)
+    progname = ARGV.options.program_name
+    result = false
+    show = proc do |klass, cname, version|
+      str = "#{progname}"
+      unless klass == ::Object and cname == :VERSION
+        version = version.join(".") if Array === version
+        str << ": #{klass}" unless klass == Object
+        str << " version #{version}"
+      end
+      [:Release, :RELEASE].find do |rel|
+        if klass.const_defined?(rel)
+          str << " (#{klass.const_get(rel)})"
+        end
+      end
+      puts str
+      result = true
+    end
+    if pkg.size == 1 and pkg[0] == "all"
+      self.search_const(::Object, /\AV(?:ERSION|ersion)\z/) do |klass, cname, version|
+        unless cname[1] == ?e and klass.const_defined?(:Version)
+          show.call(klass, cname.intern, version)
+        end
+      end
+    else
+      pkg.each do |pkg|
+        begin
+          pkg = pkg.split(/::|\//).inject(::Object) {|m, c| m.const_get(c)}
+          v = case
+              when pkg.const_defined?(:Version)
+                pkg.const_get(n = :Version)
+              when pkg.const_defined?(:VERSION)
+                pkg.const_get(n = :VERSION)
+              else
+                n = nil
+                "unknown"
+              end
+          show.call(pkg, n, v)
+        rescue NameError
+        end
+      end
+    end
+    result
+  end
+
+  def each_const(path, klass = ::Object)
+    path.split(/::|\//).inject(klass) do |klass, name|
+      raise NameError, path unless Module === klass
+      klass.constants.grep(/#{name}/i) do |c|
+        klass.const_defined?(c) or next
+        c = klass.const_get(c)
+      end
+    end
+  end
+
+  def search_const(klass, name)
+    klasses = [klass]
+    while klass = klasses.shift
+      klass.constants.each do |cname|
+        klass.const_defined?(cname) or next
+        const = klass.const_get(cname)
+        yield klass, cname, const if name === cname
+        klasses << const if Module === const and const != ::Object
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/ostruct.rb b/ruby_1_8_6/lib/ostruct.rb
new file mode 100644
index 0000000000..6af5bbdac0
--- /dev/null
+++ b/ruby_1_8_6/lib/ostruct.rb
@@ -0,0 +1,146 @@
+#
+# = ostruct.rb: OpenStruct implementation
+#
+# Author:: Yukihiro Matsumoto
+# Documentation:: Gavin Sinclair
+#
+# OpenStruct allows the creation of data objects with arbitrary attributes.
+# See OpenStruct for an example.
+#
+
+#
+# OpenStruct allows you to create data objects and set arbitrary attributes.
+# For example:
+#
+#   require 'ostruct' 
+#
+#   record = OpenStruct.new
+#   record.name    = "John Smith"
+#   record.age     = 70
+#   record.pension = 300
+#   
+#   puts record.name     # -> "John Smith"
+#   puts record.address  # -> nil
+#
+# It is like a hash with a different way to access the data.  In fact, it is
+# implemented with a hash, and you can initialize it with one.
+#
+#   hash = { "country" => "Australia", :population => 20_000_000 }
+#   data = OpenStruct.new(hash)
+#
+#   p data        # -> <OpenStruct country="Australia" population=20000000>
+#
+class OpenStruct
+  #
+  # Create a new OpenStruct object.  The optional +hash+, if given, will
+  # generate attributes and values.  For example.
+  #
+  #   require 'ostruct'
+  #   hash = { "country" => "Australia", :population => 20_000_000 }
+  #   data = OpenStruct.new(hash)
+  #
+  #   p data        # -> <OpenStruct country="Australia" population=20000000>
+  #
+  # By default, the resulting OpenStruct object will have no attributes. 
+  #
+  def initialize(hash=nil)
+    @table = {}
+    if hash
+      for k,v in hash
+        @table[k.to_sym] = v
+        new_ostruct_member(k)
+      end
+    end
+  end
+
+  # Duplicate an OpenStruct object members. 
+  def initialize_copy(orig)
+    super
+    @table = @table.dup
+  end
+
+  def marshal_dump
+    @table
+  end
+  def marshal_load(x)
+    @table = x
+    @table.each_key{|key| new_ostruct_member(key)}
+  end
+
+  def new_ostruct_member(name)
+    name = name.to_sym
+    unless self.respond_to?(name)
+      meta = class << self; self; end
+      meta.send(:define_method, name) { @table[name] }
+      meta.send(:define_method, :"#{name}=") { |x| @table[name] = x }
+    end
+  end
+
+  def method_missing(mid, *args) # :nodoc:
+    mname = mid.id2name
+    len = args.length
+    if mname =~ /=$/
+      if len != 1
+        raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
+      end
+      if self.frozen?
+        raise TypeError, "can't modify frozen #{self.class}", caller(1)
+      end
+      mname.chop!
+      self.new_ostruct_member(mname)
+      @table[mname.intern] = args[0]
+    elsif len == 0
+      @table[mid]
+    else
+      raise NoMethodError, "undefined method `#{mname}' for #{self}", caller(1)
+    end
+  end
+
+  #
+  # Remove the named field from the object.
+  #
+  def delete_field(name)
+    @table.delete name.to_sym
+  end
+
+  InspectKey = :__inspect_key__ # :nodoc:
+
+  #
+  # Returns a string containing a detailed summary of the keys and values.
+  #
+  def inspect
+    str = "#<#{self.class}"
+
+    Thread.current[InspectKey] ||= []
+    if Thread.current[InspectKey].include?(self) then
+      str << " ..."
+    else
+      first = true
+      for k,v in @table
+        str << "," unless first
+        first = false
+
+        Thread.current[InspectKey] << v
+        begin
+          str << " #{k}=#{v.inspect}"
+        ensure
+          Thread.current[InspectKey].pop
+        end
+      end
+    end
+
+    str << ">"
+  end
+  alias :to_s :inspect
+
+  attr_reader :table # :nodoc:
+  protected :table
+
+  #
+  # Compare this object and +other+ for equality.
+  #
+  def ==(other)
+    return false unless(other.kind_of?(OpenStruct))
+    return @table == other.table
+  end
+end
diff --git a/ruby_1_8_6/lib/parsearg.rb b/ruby_1_8_6/lib/parsearg.rb
new file mode 100644
index 0000000000..cab2dba789
--- /dev/null
+++ b/ruby_1_8_6/lib/parsearg.rb
@@ -0,0 +1,87 @@
+#
+#		parsearg.rb - parse arguments
+#			$Release Version: $
+#			$Revision$
+#			$Date$
+#			by Yasuo OHBA(SHL Japan Inc. Technology Dept.)
+#
+# --
+#
+#	
+#
+
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: parsearg is deprecated after Ruby 1.8.1; use optparse instead"
+
+$RCS_ID=%q$Header$
+
+require "getopts"
+
+def printUsageAndExit()
+  if $USAGE
+    eval($USAGE)
+  end
+  exit()
+end
+
+def setParenthesis(ex, opt, c)
+  if opt != ""
+    ex = sprintf("%s$OPT_%s%s", ex, opt, c)
+  else
+    ex = sprintf("%s%s", ex, c)
+  end
+  return ex
+end
+
+def setOrAnd(ex, opt, c)
+  if opt != ""
+    ex = sprintf("%s$OPT_%s %s%s ", ex, opt, c, c)
+  else
+    ex = sprintf("%s %s%s ", ex, c, c)
+  end
+  return ex
+end
+
+def setExpression(ex, opt, op)
+  if !op
+    ex = sprintf("%s$OPT_%s", ex, opt)
+    return ex
+  end
+  case op.chr
+  when "(", ")"
+    ex = setParenthesis(ex, opt, op.chr)
+  when "|", "&"
+    ex = setOrAnd(ex, opt, op.chr)
+  else
+    return nil
+  end
+  return ex
+end
+
+# parseArgs is obsolete.  Use OptionParser instead.
+
+def parseArgs(argc, nopt, single_opts, *opts)
+  if (noOptions = getopts(single_opts, *opts)) == nil
+    printUsageAndExit()
+  end
+  if nopt
+    ex = nil
+    pos = 0
+    for o in nopt.split(/[()|&]/)
+      pos += o.length
+      ex = setExpression(ex, o, nopt[pos])
+      pos += 1
+    end
+    begin
+      if !eval(ex)
+	printUsageAndExit()
+      end
+    rescue
+      print "Format Error!! : \"" + nopt + "\"\t[parseArgs]\n"
+      exit!(-1)
+    end
+  end
+  if ARGV.length < argc
+    printUsageAndExit()
+  end
+  return noOptions
+end
diff --git a/ruby_1_8_6/lib/parsedate.rb b/ruby_1_8_6/lib/parsedate.rb
new file mode 100644
index 0000000000..b52a79ba47
--- /dev/null
+++ b/ruby_1_8_6/lib/parsedate.rb
@@ -0,0 +1,53 @@
+#
+# = parsedate.rb: Parses dates
+#
+# Author:: Tadayoshi Funaba
+# Documentation:: Konrad Meyer
+#
+# ParseDate munches on a date and turns it into an array of values.
+#
+
+#
+# ParseDate converts a date into an array of values.
+# For example:
+#
+#   require 'parsedate'
+#
+#   ParseDate.parsedate "Tuesday, July 6th, 2007, 18:35:20 UTC"
+#   # => [2007, 7, 6, 18, 35, 20, "UTC", 2]
+#
+# The order is of the form [year, month, day of month, hour, minute, second,
+# timezone, day of the week].
+
+require 'date/format'
+
+module ParseDate
+  #
+  # Parse a string representation of a date into values.
+  # For example:
+  #
+  #   require 'parsedate'
+  #
+  #   ParseDate.parsedate "Tuesday, July 5th, 2007, 18:35:20 UTC"
+  #   # => [2007, 7, 5, 18, 35, 20, "UTC", 2]
+  #
+  # The order is of the form [year, month, day of month, hour, minute,
+  # second, timezone, day of week].
+  #
+  # ParseDate.parsedate can also take a second argument, +comp+, which
+  # is a boolean telling the method to compensate for dates with years
+  # expressed as two digits. Example:
+  #
+  #   require 'parsedate'
+  #
+  #   ParseDate.parsedate "Mon Dec 25 00 06:53:24 UTC", true
+  #   # => [2000, 12, 25, 6, 53, 24, "UTC", 1]
+  #
+  def parsedate(str, comp=false)
+    Date._parse(str, comp).
+      values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :wday)
+  end
+
+  module_function :parsedate
+
+end
diff --git a/ruby_1_8_6/lib/pathname.rb b/ruby_1_8_6/lib/pathname.rb
new file mode 100644
index 0000000000..e4ca5489ce
--- /dev/null
+++ b/ruby_1_8_6/lib/pathname.rb
@@ -0,0 +1,1062 @@
+#
+# = pathname.rb
+#
+# Object-Oriented Pathname Class
+#
+# Author:: Tanaka Akira <akr@m17n.org>
+# Documentation:: Author and Gavin Sinclair
+#
+# For documentation, see class Pathname.
+#
+# <tt>pathname.rb</tt> is distributed with Ruby since 1.8.0.
+#
+
+#
+# == Pathname
+#
+# Pathname represents a pathname which locates a file in a filesystem.
+# The pathname depends on OS: Unix, Windows, etc.
+# Pathname library works with pathnames of local OS.
+# However non-Unix pathnames are supported experimentally.
+#
+# It does not represent the file itself.
+# A Pathname can be relative or absolute.  It's not until you try to
+# reference the file that it even matters whether the file exists or not.
+#
+# Pathname is immutable.  It has no method for destructive update.
+#
+# The value of this class is to manipulate file path information in a neater
+# way than standard Ruby provides.  The examples below demonstrate the
+# difference.  *All* functionality from File, FileTest, and some from Dir and
+# FileUtils is included, in an unsurprising way.  It is essentially a facade for
+# all of these, and more.
+#
+# == Examples
+#
+# === Example 1: Using Pathname
+#
+#   require 'pathname'
+#   p = Pathname.new("/usr/bin/ruby")
+#   size = p.size              # 27662
+#   isdir = p.directory?       # false
+#   dir  = p.dirname           # Pathname:/usr/bin
+#   base = p.basename          # Pathname:ruby
+#   dir, base = p.split        # [Pathname:/usr/bin, Pathname:ruby]
+#   data = p.read
+#   p.open { |f| _ } 
+#   p.each_line { |line| _ }
+#
+# === Example 2: Using standard Ruby
+#
+#   p = "/usr/bin/ruby"
+#   size = File.size(p)        # 27662
+#   isdir = File.directory?(p) # false
+#   dir  = File.dirname(p)     # "/usr/bin"
+#   base = File.basename(p)    # "ruby"
+#   dir, base = File.split(p)  # ["/usr/bin", "ruby"]
+#   data = File.read(p)
+#   File.open(p) { |f| _ } 
+#   File.foreach(p) { |line| _ }
+#
+# === Example 3: Special features
+#
+#   p1 = Pathname.new("/usr/lib")   # Pathname:/usr/lib
+#   p2 = p1 + "ruby/1.8"            # Pathname:/usr/lib/ruby/1.8
+#   p3 = p1.parent                  # Pathname:/usr
+#   p4 = p2.relative_path_from(p3)  # Pathname:lib/ruby/1.8
+#   pwd = Pathname.pwd              # Pathname:/home/gavin
+#   pwd.absolute?                   # true
+#   p5 = Pathname.new "."           # Pathname:.
+#   p5 = p5 + "music/../articles"   # Pathname:music/../articles
+#   p5.cleanpath                    # Pathname:articles
+#   p5.realpath                     # Pathname:/home/gavin/articles
+#   p5.children                     # [Pathname:/home/gavin/articles/linux, ...]
+# 
+# == Breakdown of functionality
+#
+# === Core methods
+#
+# These methods are effectively manipulating a String, because that's all a path
+# is.  Except for #mountpoint?, #children, and #realpath, they don't access the
+# filesystem.
+#
+# - +
+# - #join
+# - #parent
+# - #root?
+# - #absolute?
+# - #relative?
+# - #relative_path_from
+# - #each_filename
+# - #cleanpath
+# - #realpath
+# - #children
+# - #mountpoint?
+#
+# === File status predicate methods
+#
+# These methods are a facade for FileTest:
+# - #blockdev?
+# - #chardev?
+# - #directory?
+# - #executable?
+# - #executable_real?
+# - #exist?
+# - #file?
+# - #grpowned?
+# - #owned?
+# - #pipe?
+# - #readable?
+# - #world_readable?
+# - #readable_real?
+# - #setgid?
+# - #setuid?
+# - #size
+# - #size?
+# - #socket?
+# - #sticky?
+# - #symlink?
+# - #writable?
+# - #world_writable?
+# - #writable_real?
+# - #zero?
+#
+# === File property and manipulation methods
+#
+# These methods are a facade for File:
+# - #atime
+# - #ctime
+# - #mtime
+# - #chmod(mode)
+# - #lchmod(mode)
+# - #chown(owner, group)
+# - #lchown(owner, group)
+# - #fnmatch(pattern, *args)
+# - #fnmatch?(pattern, *args)
+# - #ftype
+# - #make_link(old)
+# - #open(*args, &block)
+# - #readlink
+# - #rename(to)
+# - #stat
+# - #lstat
+# - #make_symlink(old)
+# - #truncate(length)
+# - #utime(atime, mtime)
+# - #basename(*args)
+# - #dirname
+# - #extname
+# - #expand_path(*args)
+# - #split
+#
+# === Directory methods
+#
+# These methods are a facade for Dir:
+# - Pathname.glob(*args)
+# - Pathname.getwd / Pathname.pwd
+# - #rmdir
+# - #entries
+# - #each_entry(&block)
+# - #mkdir(*args)
+# - #opendir(*args)
+#
+# === IO
+#
+# These methods are a facade for IO:
+# - #each_line(*args, &block)
+# - #read(*args)
+# - #readlines(*args)
+# - #sysopen(*args)
+#
+# === Utilities
+#
+# These methods are a mixture of Find, FileUtils, and others:
+# - #find(&block)
+# - #mkpath
+# - #rmtree
+# - #unlink / #delete
+#
+#
+# == Method documentation
+#
+# As the above section shows, most of the methods in Pathname are facades.  The
+# documentation for these methods generally just says, for instance, "See
+# FileTest.writable?", as you should be familiar with the original method
+# anyway, and its documentation (e.g. through +ri+) will contain more
+# information.  In some cases, a brief description will follow.
+#
+class Pathname
+
+  # :stopdoc:
+  if RUBY_VERSION < "1.9"
+    TO_PATH = :to_str
+  else
+    # to_path is implemented so Pathname objects are usable with File.open, etc.
+    TO_PATH = :to_path
+  end
+  # :startdoc:
+
+  #
+  # Create a Pathname object from the given String (or String-like object).
+  # If +path+ contains a NUL character (<tt>\0</tt>), an ArgumentError is raised.
+  #
+  def initialize(path)
+    path = path.__send__(TO_PATH) if path.respond_to? TO_PATH
+    @path = path.dup
+
+    if /\0/ =~ @path
+      raise ArgumentError, "pathname contains \\0: #{@path.inspect}"
+    end
+
+    self.taint if @path.tainted?
+  end
+
+  def freeze() super; @path.freeze; self end
+  def taint() super; @path.taint; self end
+  def untaint() super; @path.untaint; self end
+
+  #
+  # Compare this pathname with +other+.  The comparison is string-based.
+  # Be aware that two different paths (<tt>foo.txt</tt> and <tt>./foo.txt</tt>)
+  # can refer to the same file.
+  #
+  def ==(other)
+    return false unless Pathname === other
+    other.to_s == @path
+  end
+  alias === ==
+  alias eql? ==
+
+  # Provides for comparing pathnames, case-sensitively.
+  def <=>(other)
+    return nil unless Pathname === other
+    @path.tr('/', "\0") <=> other.to_s.tr('/', "\0")
+  end
+
+  def hash # :nodoc:
+    @path.hash
+  end
+
+  # Return the path as a String.
+  def to_s
+    @path.dup
+  end
+
+  # to_path is implemented so Pathname objects are usable with File.open, etc.
+  alias_method TO_PATH, :to_s
+
+  def inspect # :nodoc:
+    "#<#{self.class}:#{@path}>"
+  end
+
+  # Return a pathname which is substituted by String#sub.
+  def sub(pattern, *rest, &block)
+    self.class.new(@path.sub(pattern, *rest, &block))
+  end
+
+  if File::ALT_SEPARATOR
+    SEPARATOR_PAT = /[#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}]/
+  else
+    SEPARATOR_PAT = /#{Regexp.quote File::SEPARATOR}/
+  end
+
+  # chop_basename(path) -> [pre-basename, basename] or nil
+  def chop_basename(path)
+    base = File.basename(path)
+    if /\A#{SEPARATOR_PAT}?\z/ =~ base
+      return nil
+    else
+      return path[0, path.rindex(base)], base
+    end
+  end
+  private :chop_basename
+
+  # split_names(path) -> prefix, [name, ...]
+  def split_names(path)
+    names = []
+    while r = chop_basename(path)
+      path, basename = r
+      names.unshift basename
+    end
+    return path, names
+  end
+  private :split_names
+
+  def prepend_prefix(prefix, relpath)
+    if relpath.empty?
+      File.dirname(prefix)
+    elsif /#{SEPARATOR_PAT}/ =~ prefix
+      prefix = File.dirname(prefix)
+      prefix = File.join(prefix, "") if File.basename(prefix + 'a') != 'a'
+      prefix + relpath
+    else
+      prefix + relpath
+    end
+  end
+  private :prepend_prefix
+
+  # Returns clean pathname of +self+ with consecutive slashes and useless dots
+  # removed.  The filesystem is not accessed.
+  #
+  # If +consider_symlink+ is +true+, then a more conservative algorithm is used
+  # to avoid breaking symbolic linkages.  This may retain more <tt>..</tt>
+  # entries than absolutely necessary, but without accessing the filesystem,
+  # this can't be avoided.  See #realpath.
+  #
+  def cleanpath(consider_symlink=false)
+    if consider_symlink
+      cleanpath_conservative
+    else
+      cleanpath_aggressive
+    end
+  end
+
+  #
+  # Clean the path simply by resolving and removing excess "." and ".." entries.
+  # Nothing more, nothing less.
+  #
+  def cleanpath_aggressive
+    path = @path
+    names = []
+    pre = path
+    while r = chop_basename(pre)
+      pre, base = r
+      case base
+      when '.'
+      when '..'
+        names.unshift base
+      else
+        if names[0] == '..'
+          names.shift
+        else
+          names.unshift base
+        end
+      end
+    end
+    if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
+      names.shift while names[0] == '..'
+    end
+    self.class.new(prepend_prefix(pre, File.join(*names)))
+  end
+  private :cleanpath_aggressive
+
+  # has_trailing_separator?(path) -> bool
+  def has_trailing_separator?(path)
+    if r = chop_basename(path)
+      pre, basename = r
+      pre.length + basename.length < path.length
+    else
+      false
+    end
+  end
+  private :has_trailing_separator?
+
+  # add_trailing_separator(path) -> path
+  def add_trailing_separator(path)
+    if File.basename(path + 'a') == 'a'
+      path
+    else
+      File.join(path, "") # xxx: Is File.join is appropriate to add separator?
+    end
+  end
+  private :add_trailing_separator
+
+  def del_trailing_separator(path)
+    if r = chop_basename(path)
+      pre, basename = r
+      pre + basename
+    elsif /#{SEPARATOR_PAT}+\z/o =~ path
+      $` + File.dirname(path)[/#{SEPARATOR_PAT}*\z/o]
+    else
+      path
+    end
+  end
+  private :del_trailing_separator
+
+  def cleanpath_conservative
+    path = @path
+    names = []
+    pre = path
+    while r = chop_basename(pre)
+      pre, base = r
+      names.unshift base if base != '.'
+    end
+    if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
+      names.shift while names[0] == '..'
+    end
+    if names.empty?
+      self.class.new(File.dirname(pre))
+    else
+      if names.last != '..' && File.basename(path) == '.'
+        names << '.'
+      end
+      result = prepend_prefix(pre, File.join(*names))
+      if /\A(?:\.|\.\.)\z/ !~ names.last && has_trailing_separator?(path)
+        self.class.new(add_trailing_separator(result))
+      else
+        self.class.new(result)
+      end
+    end
+  end
+  private :cleanpath_conservative
+
+  def realpath_rec(prefix, unresolved, h)
+    resolved = []
+    until unresolved.empty?
+      n = unresolved.shift
+      if n == '.'
+        next
+      elsif n == '..'
+        resolved.pop
+      else
+        path = prepend_prefix(prefix, File.join(*(resolved + [n])))
+        if h.include? path
+          if h[path] == :resolving
+            raise Errno::ELOOP.new(path)
+          else
+            prefix, *resolved = h[path]
+          end
+        else
+          s = File.lstat(path)
+          if s.symlink?
+            h[path] = :resolving
+            link_prefix, link_names = split_names(File.readlink(path))
+            if link_prefix == ''
+              prefix, *resolved = h[path] = realpath_rec(prefix, resolved + link_names, h)
+            else
+              prefix, *resolved = h[path] = realpath_rec(link_prefix, link_names, h)
+            end
+          else
+            resolved << n
+            h[path] = [prefix, *resolved]
+          end
+        end
+      end
+    end
+    return prefix, *resolved
+  end
+  private :realpath_rec
+
+  #
+  # Returns a real (absolute) pathname of +self+ in the actual filesystem.
+  # The real pathname doesn't contain symlinks or useless dots.
+  #
+  # No arguments should be given; the old behaviour is *obsoleted*. 
+  #
+  def realpath
+    path = @path
+    prefix, names = split_names(path)
+    if prefix == ''
+      prefix, names2 = split_names(Dir.pwd)
+      names = names2 + names
+    end
+    prefix, *names = realpath_rec(prefix, names, {})
+    self.class.new(prepend_prefix(prefix, File.join(*names)))
+  end
+
+  # #parent returns the parent directory.
+  #
+  # This is same as <tt>self + '..'</tt>.
+  def parent
+    self + '..'
+  end
+
+  # #mountpoint? returns +true+ if <tt>self</tt> points to a mountpoint.
+  def mountpoint?
+    begin
+      stat1 = self.lstat
+      stat2 = self.parent.lstat
+      stat1.dev == stat2.dev && stat1.ino == stat2.ino ||
+        stat1.dev != stat2.dev
+    rescue Errno::ENOENT
+      false
+    end
+  end
+
+  #
+  # #root? is a predicate for root directories.  I.e. it returns +true+ if the
+  # pathname consists of consecutive slashes.
+  #
+  # It doesn't access actual filesystem.  So it may return +false+ for some
+  # pathnames which points to roots such as <tt>/usr/..</tt>.
+  #
+  def root?
+    !!(chop_basename(@path) == nil && /#{SEPARATOR_PAT}/o =~ @path)
+  end
+
+  # Predicate method for testing whether a path is absolute.
+  # It returns +true+ if the pathname begins with a slash.
+  def absolute?
+    !relative?
+  end
+
+  # The opposite of #absolute?
+  def relative?
+    path = @path
+    while r = chop_basename(path)
+      path, basename = r
+    end
+    path == ''
+  end
+
+  #
+  # Iterates over each component of the path.
+  #
+  #   Pathname.new("/usr/bin/ruby").each_filename {|filename| ... }
+  #     # yields "usr", "bin", and "ruby".
+  #
+  def each_filename # :yield: filename
+    prefix, names = split_names(@path)
+    names.each {|filename| yield filename }
+    nil
+  end
+
+  # Iterates over and yields a new Pathname object
+  # for each element in the given path in descending order.
+  #
+  #  Pathname.new('/path/to/some/file.rb').descend {|v| p v}
+  #     #<Pathname:/>
+  #     #<Pathname:/path>
+  #     #<Pathname:/path/to>
+  #     #<Pathname:/path/to/some>
+  #     #<Pathname:/path/to/some/file.rb>
+  #
+  #  Pathname.new('path/to/some/file.rb').descend {|v| p v}
+  #     #<Pathname:path>
+  #     #<Pathname:path/to>
+  #     #<Pathname:path/to/some>
+  #     #<Pathname:path/to/some/file.rb>
+  #
+  # It doesn't access actual filesystem.
+  #
+  # This method is available since 1.8.5.
+  #
+  def descend
+    vs = []
+    ascend {|v| vs << v }
+    vs.reverse_each {|v| yield v }
+    nil
+  end
+
+  # Iterates over and yields a new Pathname object
+  # for each element in the given path in ascending order.
+  #
+  #  Pathname.new('/path/to/some/file.rb').ascend {|v| p v}
+  #     #<Pathname:/path/to/some/file.rb>
+  #     #<Pathname:/path/to/some>
+  #     #<Pathname:/path/to>
+  #     #<Pathname:/path>
+  #     #<Pathname:/>
+  #
+  #  Pathname.new('path/to/some/file.rb').ascend {|v| p v}
+  #     #<Pathname:path/to/some/file.rb>
+  #     #<Pathname:path/to/some>
+  #     #<Pathname:path/to>
+  #     #<Pathname:path>
+  #
+  # It doesn't access actual filesystem.
+  #
+  # This method is available since 1.8.5.
+  #
+  def ascend
+    path = @path
+    yield self
+    while r = chop_basename(path)
+      path, name = r
+      break if path.empty?
+      yield self.class.new(del_trailing_separator(path))
+    end
+  end
+
+  #
+  # Pathname#+ appends a pathname fragment to this one to produce a new Pathname
+  # object.
+  #
+  #   p1 = Pathname.new("/usr")      # Pathname:/usr
+  #   p2 = p1 + "bin/ruby"           # Pathname:/usr/bin/ruby
+  #   p3 = p1 + "/etc/passwd"        # Pathname:/etc/passwd
+  #
+  # This method doesn't access the file system; it is pure string manipulation. 
+  #
+  def +(other)
+    other = Pathname.new(other) unless Pathname === other
+    Pathname.new(plus(@path, other.to_s))
+  end
+
+  def plus(path1, path2) # -> path
+    prefix2 = path2
+    index_list2 = []
+    basename_list2 = []
+    while r2 = chop_basename(prefix2)
+      prefix2, basename2 = r2
+      index_list2.unshift prefix2.length
+      basename_list2.unshift basename2
+    end
+    return path2 if prefix2 != ''
+    prefix1 = path1
+    while true
+      while !basename_list2.empty? && basename_list2.first == '.'
+        index_list2.shift
+        basename_list2.shift
+      end
+      break unless r1 = chop_basename(prefix1)
+      prefix1, basename1 = r1
+      next if basename1 == '.'
+      if basename1 == '..' || basename_list2.empty? || basename_list2.first != '..'
+        prefix1 = prefix1 + basename1
+        break
+      end
+      index_list2.shift
+      basename_list2.shift
+    end
+    r1 = chop_basename(prefix1)
+    if !r1 && /#{SEPARATOR_PAT}/o =~ File.basename(prefix1)
+      while !basename_list2.empty? && basename_list2.first == '..'
+        index_list2.shift
+        basename_list2.shift
+      end
+    end
+    if !basename_list2.empty?
+      suffix2 = path2[index_list2.first..-1]
+      r1 ? File.join(prefix1, suffix2) : prefix1 + suffix2
+    else
+      r1 ? prefix1 : File.dirname(prefix1)
+    end
+  end
+  private :plus
+
+  #
+  # Pathname#join joins pathnames.
+  #
+  # <tt>path0.join(path1, ..., pathN)</tt> is the same as
+  # <tt>path0 + path1 + ... + pathN</tt>.
+  #
+  def join(*args)
+    args.unshift self
+    result = args.pop
+    result = Pathname.new(result) unless Pathname === result
+    return result if result.absolute?
+    args.reverse_each {|arg|
+      arg = Pathname.new(arg) unless Pathname === arg
+      result = arg + result
+      return result if result.absolute?
+    }
+    result
+  end
+
+  #
+  # Returns the children of the directory (files and subdirectories, not
+  # recursive) as an array of Pathname objects.  By default, the returned
+  # pathnames will have enough information to access the files.  If you set
+  # +with_directory+ to +false+, then the returned pathnames will contain the
+  # filename only.
+  #
+  # For example:
+  #   p = Pathname("/usr/lib/ruby/1.8")
+  #   p.children
+  #       # -> [ Pathname:/usr/lib/ruby/1.8/English.rb,
+  #              Pathname:/usr/lib/ruby/1.8/Env.rb,
+  #              Pathname:/usr/lib/ruby/1.8/abbrev.rb, ... ]
+  #   p.children(false)
+  #       # -> [ Pathname:English.rb, Pathname:Env.rb, Pathname:abbrev.rb, ... ]
+  #
+  # Note that the result never contain the entries <tt>.</tt> and <tt>..</tt> in
+  # the directory because they are not children.
+  #
+  # This method has existed since 1.8.1.
+  #
+  def children(with_directory=true)
+    with_directory = false if @path == '.'
+    result = []
+    Dir.foreach(@path) {|e|
+      next if e == '.' || e == '..'
+      if with_directory
+        result << self.class.new(File.join(@path, e))
+      else
+        result << self.class.new(e)
+      end
+    }
+    result
+  end
+
+  #
+  # #relative_path_from returns a relative path from the argument to the
+  # receiver.  If +self+ is absolute, the argument must be absolute too.  If
+  # +self+ is relative, the argument must be relative too.
+  #
+  # #relative_path_from doesn't access the filesystem.  It assumes no symlinks.
+  #
+  # ArgumentError is raised when it cannot find a relative path.
+  #
+  # This method has existed since 1.8.1.
+  #
+  def relative_path_from(base_directory)
+    dest_directory = self.cleanpath.to_s
+    base_directory = base_directory.cleanpath.to_s
+    dest_prefix = dest_directory
+    dest_names = []
+    while r = chop_basename(dest_prefix)
+      dest_prefix, basename = r
+      dest_names.unshift basename if basename != '.'
+    end
+    base_prefix = base_directory
+    base_names = []
+    while r = chop_basename(base_prefix)
+      base_prefix, basename = r
+      base_names.unshift basename if basename != '.'
+    end
+    if dest_prefix != base_prefix
+      raise ArgumentError, "different prefix: #{dest_prefix.inspect} and #{base_directory.inspect}"
+    end
+    while !dest_names.empty? &&
+          !base_names.empty? &&
+          dest_names.first == base_names.first
+      dest_names.shift
+      base_names.shift
+    end
+    if base_names.include? '..'
+      raise ArgumentError, "base_directory has ..: #{base_directory.inspect}"
+    end
+    base_names.fill('..')
+    relpath_names = base_names + dest_names
+    if relpath_names.empty?
+      Pathname.new('.')
+    else
+      Pathname.new(File.join(*relpath_names))
+    end
+  end
+end
+
+class Pathname    # * IO *
+  #
+  # #each_line iterates over the line in the file.  It yields a String object
+  # for each line.
+  #
+  # This method has existed since 1.8.1.
+  #
+  def each_line(*args, &block) # :yield: line
+    IO.foreach(@path, *args, &block)
+  end
+
+  # Pathname#foreachline is *obsoleted* at 1.8.1.  Use #each_line.
+  def foreachline(*args, &block)
+    warn "Pathname#foreachline is obsoleted.  Use Pathname#each_line."
+    each_line(*args, &block)
+  end
+
+  # See <tt>IO.read</tt>.  Returns all the bytes from the file, or the first +N+
+  # if specified.
+  def read(*args) IO.read(@path, *args) end
+
+  # See <tt>IO.readlines</tt>.  Returns all the lines from the file.
+  def readlines(*args) IO.readlines(@path, *args) end
+
+  # See <tt>IO.sysopen</tt>.
+  def sysopen(*args) IO.sysopen(@path, *args) end
+end
+
+
+class Pathname    # * File *
+
+  # See <tt>File.atime</tt>.  Returns last access time.
+  def atime() File.atime(@path) end
+
+  # See <tt>File.ctime</tt>.  Returns last (directory entry, not file) change time.
+  def ctime() File.ctime(@path) end
+
+  # See <tt>File.mtime</tt>.  Returns last modification time.
+  def mtime() File.mtime(@path) end
+
+  # See <tt>File.chmod</tt>.  Changes permissions.
+  def chmod(mode) File.chmod(mode, @path) end
+
+  # See <tt>File.lchmod</tt>.
+  def lchmod(mode) File.lchmod(mode, @path) end
+
+  # See <tt>File.chown</tt>.  Change owner and group of file.
+  def chown(owner, group) File.chown(owner, group, @path) end
+
+  # See <tt>File.lchown</tt>.
+  def lchown(owner, group) File.lchown(owner, group, @path) end
+
+  # See <tt>File.fnmatch</tt>.  Return +true+ if the receiver matches the given
+  # pattern.
+  def fnmatch(pattern, *args) File.fnmatch(pattern, @path, *args) end
+
+  # See <tt>File.fnmatch?</tt> (same as #fnmatch).
+  def fnmatch?(pattern, *args) File.fnmatch?(pattern, @path, *args) end
+
+  # See <tt>File.ftype</tt>.  Returns "type" of file ("file", "directory",
+  # etc).
+  def ftype() File.ftype(@path) end
+
+  # See <tt>File.link</tt>.  Creates a hard link.
+  def make_link(old) File.link(old, @path) end
+
+  # See <tt>File.open</tt>.  Opens the file for reading or writing.
+  def open(*args, &block) # :yield: file
+    File.open(@path, *args, &block)
+  end
+
+  # See <tt>File.readlink</tt>.  Read symbolic link.
+  def readlink() self.class.new(File.readlink(@path)) end
+
+  # See <tt>File.rename</tt>.  Rename the file.
+  def rename(to) File.rename(@path, to) end
+
+  # See <tt>File.stat</tt>.  Returns a <tt>File::Stat</tt> object.
+  def stat() File.stat(@path) end
+
+  # See <tt>File.lstat</tt>.
+  def lstat() File.lstat(@path) end
+
+  # See <tt>File.symlink</tt>.  Creates a symbolic link.
+  def make_symlink(old) File.symlink(old, @path) end
+
+  # See <tt>File.truncate</tt>.  Truncate the file to +length+ bytes.
+  def truncate(length) File.truncate(@path, length) end
+
+  # See <tt>File.utime</tt>.  Update the access and modification times.
+  def utime(atime, mtime) File.utime(atime, mtime, @path) end
+
+  # See <tt>File.basename</tt>.  Returns the last component of the path.
+  def basename(*args) self.class.new(File.basename(@path, *args)) end
+
+  # See <tt>File.dirname</tt>.  Returns all but the last component of the path.
+  def dirname() self.class.new(File.dirname(@path)) end
+
+  # See <tt>File.extname</tt>.  Returns the file's extension.
+  def extname() File.extname(@path) end
+
+  # See <tt>File.expand_path</tt>.
+  def expand_path(*args) self.class.new(File.expand_path(@path, *args)) end
+
+  # See <tt>File.split</tt>.  Returns the #dirname and the #basename in an
+  # Array.
+  def split() File.split(@path).map {|f| self.class.new(f) } end
+
+  # Pathname#link is confusing and *obsoleted* because the receiver/argument
+  # order is inverted to corresponding system call.
+  def link(old)
+    warn 'Pathname#link is obsoleted.  Use Pathname#make_link.'
+    File.link(old, @path)
+  end
+
+  # Pathname#symlink is confusing and *obsoleted* because the receiver/argument
+  # order is inverted to corresponding system call.
+  def symlink(old)
+    warn 'Pathname#symlink is obsoleted.  Use Pathname#make_symlink.'
+    File.symlink(old, @path)
+  end
+end
+
+
+class Pathname    # * FileTest *
+
+  # See <tt>FileTest.blockdev?</tt>.
+  def blockdev?() FileTest.blockdev?(@path) end
+
+  # See <tt>FileTest.chardev?</tt>.
+  def chardev?() FileTest.chardev?(@path) end
+
+  # See <tt>FileTest.executable?</tt>.
+  def executable?() FileTest.executable?(@path) end
+
+  # See <tt>FileTest.executable_real?</tt>.
+  def executable_real?() FileTest.executable_real?(@path) end
+
+  # See <tt>FileTest.exist?</tt>.
+  def exist?() FileTest.exist?(@path) end
+
+  # See <tt>FileTest.grpowned?</tt>.
+  def grpowned?() FileTest.grpowned?(@path) end
+
+  # See <tt>FileTest.directory?</tt>.
+  def directory?() FileTest.directory?(@path) end
+
+  # See <tt>FileTest.file?</tt>.
+  def file?() FileTest.file?(@path) end
+
+  # See <tt>FileTest.pipe?</tt>.
+  def pipe?() FileTest.pipe?(@path) end
+
+  # See <tt>FileTest.socket?</tt>.
+  def socket?() FileTest.socket?(@path) end
+
+  # See <tt>FileTest.owned?</tt>.
+  def owned?() FileTest.owned?(@path) end
+
+  # See <tt>FileTest.readable?</tt>.
+  def readable?() FileTest.readable?(@path) end
+
+  # See <tt>FileTest.world_readable?</tt>.
+  def world_readable?() FileTest.world_readable?(@path) end
+
+  # See <tt>FileTest.readable_real?</tt>.
+  def readable_real?() FileTest.readable_real?(@path) end
+
+  # See <tt>FileTest.setuid?</tt>.
+  def setuid?() FileTest.setuid?(@path) end
+
+  # See <tt>FileTest.setgid?</tt>.
+  def setgid?() FileTest.setgid?(@path) end
+
+  # See <tt>FileTest.size</tt>.
+  def size() FileTest.size(@path) end
+
+  # See <tt>FileTest.size?</tt>.
+  def size?() FileTest.size?(@path) end
+
+  # See <tt>FileTest.sticky?</tt>.
+  def sticky?() FileTest.sticky?(@path) end
+
+  # See <tt>FileTest.symlink?</tt>.
+  def symlink?() FileTest.symlink?(@path) end
+
+  # See <tt>FileTest.writable?</tt>.
+  def writable?() FileTest.writable?(@path) end
+
+  # See <tt>FileTest.world_writable?</tt>.
+  def world_writable?() FileTest.world_writable?(@path) end
+
+  # See <tt>FileTest.writable_real?</tt>.
+  def writable_real?() FileTest.writable_real?(@path) end
+
+  # See <tt>FileTest.zero?</tt>.
+  def zero?() FileTest.zero?(@path) end
+end
+
+
+class Pathname    # * Dir *
+  # See <tt>Dir.glob</tt>.  Returns or yields Pathname objects.
+  def Pathname.glob(*args) # :yield: p
+    if block_given?
+      Dir.glob(*args) {|f| yield self.new(f) }
+    else
+      Dir.glob(*args).map {|f| self.new(f) }
+    end
+  end
+
+  # See <tt>Dir.getwd</tt>.  Returns the current working directory as a Pathname.
+  def Pathname.getwd() self.new(Dir.getwd) end
+  class << self; alias pwd getwd end
+
+  # Pathname#chdir is *obsoleted* at 1.8.1.
+  def chdir(&block)
+    warn "Pathname#chdir is obsoleted.  Use Dir.chdir."
+    Dir.chdir(@path, &block)
+  end
+
+  # Pathname#chroot is *obsoleted* at 1.8.1.
+  def chroot
+    warn "Pathname#chroot is obsoleted.  Use Dir.chroot."
+    Dir.chroot(@path)
+  end
+
+  # Return the entries (files and subdirectories) in the directory, each as a
+  # Pathname object.
+  def entries() Dir.entries(@path).map {|f| self.class.new(f) } end
+
+  # Iterates over the entries (files and subdirectories) in the directory.  It
+  # yields a Pathname object for each entry.
+  #
+  # This method has existed since 1.8.1.
+  def each_entry(&block) # :yield: p
+    Dir.foreach(@path) {|f| yield self.class.new(f) }
+  end
+
+  # Pathname#dir_foreach is *obsoleted* at 1.8.1.
+  def dir_foreach(*args, &block)
+    warn "Pathname#dir_foreach is obsoleted.  Use Pathname#each_entry."
+    each_entry(*args, &block)
+  end
+
+  # See <tt>Dir.mkdir</tt>.  Create the referenced directory.
+  def mkdir(*args) Dir.mkdir(@path, *args) end
+
+  # See <tt>Dir.rmdir</tt>.  Remove the referenced directory.
+  def rmdir() Dir.rmdir(@path) end
+
+  # See <tt>Dir.open</tt>.
+  def opendir(&block) # :yield: dir
+    Dir.open(@path, &block)
+  end
+end
+
+
+class Pathname    # * Find *
+  #
+  # Pathname#find is an iterator to traverse a directory tree in a depth first
+  # manner.  It yields a Pathname for each file under "this" directory.
+  #
+  # Since it is implemented by <tt>find.rb</tt>, <tt>Find.prune</tt> can be used
+  # to control the traverse.
+  #
+  # If +self+ is <tt>.</tt>, yielded pathnames begin with a filename in the
+  # current directory, not <tt>./</tt>.
+  #
+  def find(&block) # :yield: p
+    require 'find'
+    if @path == '.'
+      Find.find(@path) {|f| yield self.class.new(f.sub(%r{\A\./}, '')) }
+    else
+      Find.find(@path) {|f| yield self.class.new(f) }
+    end
+  end
+end
+
+
+class Pathname    # * FileUtils *
+  # See <tt>FileUtils.mkpath</tt>.  Creates a full path, including any
+  # intermediate directories that don't yet exist.
+  def mkpath
+    require 'fileutils'
+    FileUtils.mkpath(@path)
+    nil
+  end
+
+  # See <tt>FileUtils.rm_r</tt>.  Deletes a directory and all beneath it.
+  def rmtree
+    # The name "rmtree" is borrowed from File::Path of Perl.
+    # File::Path provides "mkpath" and "rmtree".
+    require 'fileutils'
+    FileUtils.rm_r(@path)
+    nil
+  end
+end
+
+
+class Pathname    # * mixed *
+  # Removes a file or directory, using <tt>File.unlink</tt> or
+  # <tt>Dir.unlink</tt> as necessary.
+  def unlink()
+    begin
+      Dir.unlink @path
+    rescue Errno::ENOTDIR
+      File.unlink @path
+    end
+  end
+  alias delete unlink
+
+  # This method is *obsoleted* at 1.8.1.  Use #each_line or #each_entry.
+  def foreach(*args, &block)
+    warn "Pathname#foreach is obsoleted.  Use each_line or each_entry."
+    if FileTest.directory? @path
+      # For polymorphism between Dir.foreach and IO.foreach,
+      # Pathname#foreach doesn't yield Pathname object.
+      Dir.foreach(@path, *args, &block)
+    else
+      IO.foreach(@path, *args, &block)
+    end
+  end
+end
+
+module Kernel
+  # create a pathname object.
+  #
+  # This method is available since 1.8.5.
+  def Pathname(path) # :doc:
+    Pathname.new(path)
+  end
+  private :Pathname
+end
diff --git a/ruby_1_8_6/lib/ping.rb b/ruby_1_8_6/lib/ping.rb
new file mode 100644
index 0000000000..c2966b619c
--- /dev/null
+++ b/ruby_1_8_6/lib/ping.rb
@@ -0,0 +1,64 @@
+#
+# = ping.rb: Check a host for upness
+#
+# Author:: Yukihiro Matsumoto
+# Documentation:: Konrad Meyer
+# 
+# Performs the function of the basic network testing tool, ping.
+# See: Ping.
+#
+
+require 'timeout'
+require "socket"
+
+# 
+# Ping contains routines to test for the reachability of remote hosts.
+# Currently the only routine implemented is pingecho().
+#
+# Ping.pingecho uses a TCP echo (not an ICMP echo) to determine if the
+# remote host is reachable. This is usually adequate to tell that a remote
+# host is available to telnet, ftp, or ssh to.
+#
+# Warning: Ping.pingecho may block for a long time if DNS resolution is
+# slow. Requiring 'resolv-replace' allows non-blocking name resolution.
+#
+# Usage:
+# 
+#   require 'ping'
+#
+#   puts "'jimmy' is alive and kicking" if Ping.pingecho('jimmy', 10)
+#
+module Ping
+
+  # 
+  # Return true if we can open a connection to the hostname or IP address
+  # +host+ on port +service+ (which defaults to the "echo" port) waiting up
+  # to +timeout+ seconds.
+  #
+  # Example:
+  #
+  #   require 'ping'
+  #
+  #   Ping.pingecho "google.com", 10, 80
+  #
+  def pingecho(host, timeout=5, service="echo")
+    begin
+      timeout(timeout) do
+	s = TCPSocket.new(host, service)
+	s.close
+      end
+    rescue Errno::ECONNREFUSED
+      return true
+    rescue Timeout::Error, StandardError
+      return false
+    end
+    return true
+  end
+  module_function :pingecho
+end
+
+if $0 == __FILE__
+  host = ARGV[0]
+  host ||= "localhost"
+  printf("%s alive? - %s\n", host,  Ping::pingecho(host, 5))
+end
diff --git a/ruby_1_8_6/lib/pp.rb b/ruby_1_8_6/lib/pp.rb
new file mode 100644
index 0000000000..8080d879f9
--- /dev/null
+++ b/ruby_1_8_6/lib/pp.rb
@@ -0,0 +1,647 @@
+# == Pretty-printer for Ruby objects.
+# 
+# = Which seems better?
+# 
+# non-pretty-printed output by #p is:
+#   #<PP:0x81fedf0 @genspace=#<Proc:0x81feda0>, @group_queue=#<PrettyPrint::GroupQueue:0x81fed3c @queue=[[#<PrettyPrint::Group:0x81fed78 @breakables=[], @depth=0, @break=false>], []]>, @buffer=[], @newline="\n", @group_stack=[#<PrettyPrint::Group:0x81fed78 @breakables=[], @depth=0, @break=false>], @buffer_width=0, @indent=0, @maxwidth=79, @output_width=2, @output=#<IO:0x8114ee4>>
+# 
+# pretty-printed output by #pp is:
+#   #<PP:0x81fedf0
+#    @buffer=[],
+#    @buffer_width=0,
+#    @genspace=#<Proc:0x81feda0>,
+#    @group_queue=
+#     #<PrettyPrint::GroupQueue:0x81fed3c
+#      @queue=
+#       [[#<PrettyPrint::Group:0x81fed78 @break=false, @breakables=[], @depth=0>],
+#        []]>,
+#    @group_stack=
+#     [#<PrettyPrint::Group:0x81fed78 @break=false, @breakables=[], @depth=0>],
+#    @indent=0,
+#    @maxwidth=79,
+#    @newline="\n",
+#    @output=#<IO:0x8114ee4>,
+#    @output_width=2>
+# 
+# I like the latter.  If you do too, this library is for you.
+# 
+# = Usage
+# 
+#   pp(obj)
+#
+# output +obj+ to +$>+ in pretty printed format.
+# 
+# It returns +nil+.
+# 
+# = Output Customization
+# To define your customized pretty printing function for your classes,
+# redefine a method #pretty_print(+pp+) in the class.
+# It takes an argument +pp+ which is an instance of the class PP.
+# The method should use PP#text, PP#breakable, PP#nest, PP#group and
+# PP#pp to print the object.
+#
+# = Author
+# Tanaka Akira <akr@m17n.org>
+
+require 'prettyprint'
+
+module Kernel
+  # returns a pretty printed object as a string.
+  def pretty_inspect
+    PP.pp(self, '')
+  end
+
+  private
+  # prints arguments in pretty form.
+  #
+  # pp returns nil.
+  def pp(*objs) # :doc:
+    objs.each {|obj|
+      PP.pp(obj)
+    }
+    nil
+  end
+  module_function :pp
+end
+
+class PP < PrettyPrint
+  # Outputs +obj+ to +out+ in pretty printed format of
+  # +width+ columns in width.
+  # 
+  # If +out+ is omitted, +$>+ is assumed.
+  # If +width+ is omitted, 79 is assumed.
+  # 
+  # PP.pp returns +out+.
+  def PP.pp(obj, out=$>, width=79)
+    q = PP.new(out, width)
+    q.guard_inspect_key {q.pp obj}
+    q.flush
+    #$pp = q
+    out << "\n"
+  end
+
+  # Outputs +obj+ to +out+ like PP.pp but with no indent and
+  # newline.
+  # 
+  # PP.singleline_pp returns +out+.
+  def PP.singleline_pp(obj, out=$>)
+    q = SingleLine.new(out)
+    q.guard_inspect_key {q.pp obj}
+    q.flush
+    out
+  end
+
+  # :stopdoc:
+  def PP.mcall(obj, mod, meth, *args, &block)
+    mod.instance_method(meth).bind(obj).call(*args, &block)
+  end
+  # :startdoc:
+
+  @sharing_detection = false
+  class << self
+    # Returns the sharing detection flag as a boolean value.
+    # It is false by default.
+    attr_accessor :sharing_detection
+  end
+
+  module PPMethods
+    InspectKey = :__inspect_key__
+
+    def guard_inspect_key
+      if Thread.current[InspectKey] == nil
+        Thread.current[InspectKey] = []
+      end
+
+      save = Thread.current[InspectKey]
+
+      begin
+        Thread.current[InspectKey] = []
+        yield
+      ensure
+        Thread.current[InspectKey] = save
+      end
+    end
+
+    # Adds +obj+ to the pretty printing buffer
+    # using Object#pretty_print or Object#pretty_print_cycle.
+    # 
+    # Object#pretty_print_cycle is used when +obj+ is already
+    # printed, a.k.a the object reference chain has a cycle.
+    def pp(obj)
+      id = obj.__id__
+
+      if Thread.current[InspectKey].include? id
+        group {obj.pretty_print_cycle self}
+        return
+      end
+
+      begin
+        Thread.current[InspectKey] << id
+        group {obj.pretty_print self}
+      ensure
+        Thread.current[InspectKey].pop unless PP.sharing_detection
+      end
+    end
+
+    # A convenience method which is same as follows:
+    # 
+    #   group(1, '#<' + obj.class.name, '>') { ... }
+    def object_group(obj, &block) # :yield:
+      group(1, '#<' + obj.class.name, '>', &block)
+    end
+
+    def object_address_group(obj, &block)
+      id = "%x" % (obj.__id__ * 2)
+      id.sub!(/\Af(?=[[:xdigit:]]{2}+\z)/, '') if id.sub!(/\A\.\./, '')
+      group(1, "\#<#{obj.class}:0x#{id}", '>', &block)
+    end
+
+    # A convenience method which is same as follows:
+    # 
+    #   text ','
+    #   breakable
+    def comma_breakable
+      text ','
+      breakable
+    end
+
+    # Adds a separated list.
+    # The list is separated by comma with breakable space, by default.
+    # 
+    # #seplist iterates the +list+ using +iter_method+.
+    # It yields each object to the block given for #seplist.
+    # The procedure +separator_proc+ is called between each yields.
+    # 
+    # If the iteration is zero times, +separator_proc+ is not called at all.
+    # 
+    # If +separator_proc+ is nil or not given,
+    # +lambda { comma_breakable }+ is used.
+    # If +iter_method+ is not given, :each is used.
+    # 
+    # For example, following 3 code fragments has similar effect.
+    # 
+    #   q.seplist([1,2,3]) {|v| xxx v }
+    # 
+    #   q.seplist([1,2,3], lambda { comma_breakable }, :each) {|v| xxx v }
+    # 
+    #   xxx 1
+    #   q.comma_breakable
+    #   xxx 2
+    #   q.comma_breakable
+    #   xxx 3
+    def seplist(list, sep=nil, iter_method=:each) # :yield: element
+      sep ||= lambda { comma_breakable }
+      first = true
+      list.__send__(iter_method) {|*v|
+        if first
+          first = false
+        else
+          sep.call
+        end
+        yield(*v)
+      }
+    end
+
+    def pp_object(obj)
+      object_address_group(obj) {
+        seplist(obj.pretty_print_instance_variables, lambda { text ',' }) {|v|
+          breakable
+          v = v.to_s if Symbol === v
+          text v
+          text '='
+          group(1) {
+            breakable ''
+            pp(obj.instance_eval(v))
+          }
+        }
+      }
+    end
+
+    def pp_hash(obj)
+      group(1, '{', '}') {
+        seplist(obj, nil, :each_pair) {|k, v|
+          group {
+            pp k
+            text '=>'
+            group(1) {
+              breakable ''
+              pp v
+            }
+          }
+        }
+      }
+    end
+  end
+
+  include PPMethods
+
+  class SingleLine < PrettyPrint::SingleLine
+    include PPMethods
+  end
+
+  module ObjectMixin
+    # 1. specific pretty_print
+    # 2. specific inspect
+    # 3. specific to_s if instance variable is empty
+    # 4. generic pretty_print
+
+    # A default pretty printing method for general objects.
+    # It calls #pretty_print_instance_variables to list instance variables.
+    # 
+    # If +self+ has a customized (redefined) #inspect method,
+    # the result of self.inspect is used but it obviously has no
+    # line break hints.
+    # 
+    # This module provides predefined #pretty_print methods for some of
+    # the most commonly used built-in classes for convenience.
+    def pretty_print(q)
+      if /\(Kernel\)#/ !~ method(:inspect).inspect
+        q.text self.inspect
+      elsif /\(Kernel\)#/ !~ method(:to_s).inspect && instance_variables.empty?
+        q.text self.to_s
+      else
+        q.pp_object(self)
+      end
+    end
+
+    # A default pretty printing method for general objects that are
+    # detected as part of a cycle.
+    def pretty_print_cycle(q)
+      q.object_address_group(self) {
+        q.breakable
+        q.text '...'
+      }
+    end
+
+    # Returns a sorted array of instance variable names.
+    # 
+    # This method should return an array of names of instance variables as symbols or strings as:
+    # +[:@a, :@b]+.
+    def pretty_print_instance_variables
+      instance_variables.sort
+    end
+
+    # Is #inspect implementation using #pretty_print.
+    # If you implement #pretty_print, it can be used as follows.
+    # 
+    #   alias inspect pretty_print_inspect
+    #
+    # However, doing this requires that every class that #inspect is called on
+    # implement #pretty_print, or a RuntimeError will be raised.
+    def pretty_print_inspect
+      if /\(PP::ObjectMixin\)#/ =~ method(:pretty_print).inspect
+        raise "pretty_print is not overridden for #{self.class}"
+      end
+      PP.singleline_pp(self, '')
+    end
+  end
+end
+
+class Array
+  def pretty_print(q)
+    q.group(1, '[', ']') {
+      q.seplist(self) {|v|
+        q.pp v
+      }
+    }
+  end
+
+  def pretty_print_cycle(q)
+    q.text(empty? ? '[]' : '[...]')
+  end
+end
+
+class Hash
+  def pretty_print(q)
+    q.pp_hash self
+  end
+
+  def pretty_print_cycle(q)
+    q.text(empty? ? '{}' : '{...}')
+  end
+end
+
+class << ENV
+  def pretty_print(q)
+    q.pp_hash self
+  end
+end
+
+class Struct
+  def pretty_print(q)
+    q.group(1, '#<struct ' + PP.mcall(self, Kernel, :class).name, '>') {
+      q.seplist(PP.mcall(self, Struct, :members), lambda { q.text "," }) {|member|
+        q.breakable
+        q.text member.to_s
+        q.text '='
+        q.group(1) {
+          q.breakable ''
+          q.pp self[member]
+        }
+      }
+    }
+  end
+
+  def pretty_print_cycle(q)
+    q.text sprintf("#<struct %s:...>", PP.mcall(self, Kernel, :class).name)
+  end
+end
+
+class Range
+  def pretty_print(q)
+    q.pp self.begin
+    q.breakable ''
+    q.text(self.exclude_end? ? '...' : '..')
+    q.breakable ''
+    q.pp self.end
+  end
+end
+
+class File
+  class Stat
+    def pretty_print(q)
+      require 'etc.so'
+      q.object_group(self) {
+        q.breakable
+        q.text sprintf("dev=0x%x", self.dev); q.comma_breakable
+        q.text "ino="; q.pp self.ino; q.comma_breakable
+        q.group {
+          m = self.mode
+          q.text sprintf("mode=0%o", m)
+          q.breakable
+          q.text sprintf("(%s %c%c%c%c%c%c%c%c%c)",
+            self.ftype,
+            (m & 0400 == 0 ? ?- : ?r),
+            (m & 0200 == 0 ? ?- : ?w),
+            (m & 0100 == 0 ? (m & 04000 == 0 ? ?- : ?S) :
+                             (m & 04000 == 0 ? ?x : ?s)),
+            (m & 0040 == 0 ? ?- : ?r),
+            (m & 0020 == 0 ? ?- : ?w),
+            (m & 0010 == 0 ? (m & 02000 == 0 ? ?- : ?S) :
+                             (m & 02000 == 0 ? ?x : ?s)),
+            (m & 0004 == 0 ? ?- : ?r),
+            (m & 0002 == 0 ? ?- : ?w),
+            (m & 0001 == 0 ? (m & 01000 == 0 ? ?- : ?T) :
+                             (m & 01000 == 0 ? ?x : ?t)))
+        }
+        q.comma_breakable
+        q.text "nlink="; q.pp self.nlink; q.comma_breakable
+        q.group {
+          q.text "uid="; q.pp self.uid
+          begin
+            pw = Etc.getpwuid(self.uid)
+          rescue ArgumentError
+          end
+          if pw
+            q.breakable; q.text "(#{pw.name})"
+          end
+        }
+        q.comma_breakable
+        q.group {
+          q.text "gid="; q.pp self.gid
+          begin
+            gr = Etc.getgrgid(self.gid)
+          rescue ArgumentError
+          end
+          if gr
+            q.breakable; q.text "(#{gr.name})"
+          end
+        }
+        q.comma_breakable
+        q.group {
+          q.text sprintf("rdev=0x%x", self.rdev)
+          q.breakable
+          q.text sprintf('(%d, %d)', self.rdev_major, self.rdev_minor)
+        }
+        q.comma_breakable
+        q.text "size="; q.pp self.size; q.comma_breakable
+        q.text "blksize="; q.pp self.blksize; q.comma_breakable
+        q.text "blocks="; q.pp self.blocks; q.comma_breakable
+        q.group {
+          t = self.atime
+          q.text "atime="; q.pp t
+          q.breakable; q.text "(#{t.tv_sec})"
+        }
+        q.comma_breakable
+        q.group {
+          t = self.mtime
+          q.text "mtime="; q.pp t
+          q.breakable; q.text "(#{t.tv_sec})"
+        }
+        q.comma_breakable
+        q.group {
+          t = self.ctime
+          q.text "ctime="; q.pp t
+          q.breakable; q.text "(#{t.tv_sec})"
+        }
+      }
+    end
+  end
+end
+
+class MatchData
+  def pretty_print(q)
+    q.object_group(self) {
+      q.breakable
+      q.seplist(1..self.size, lambda { q.breakable }) {|i|
+        q.pp self[i-1]
+      }
+    }
+  end
+end
+
+class Object
+  include PP::ObjectMixin
+end
+
+[Numeric, Symbol, FalseClass, TrueClass, NilClass, Module].each {|c|
+  c.class_eval {
+    def pretty_print_cycle(q)
+      q.text inspect
+    end
+  }
+}
+
+[Numeric, FalseClass, TrueClass, Module].each {|c|
+  c.class_eval {
+    def pretty_print(q)
+      q.text inspect
+    end
+  }
+}
+
+# :enddoc:
+if __FILE__ == $0
+  require 'test/unit'
+
+  class PPTest < Test::Unit::TestCase
+    def test_list0123_12
+      assert_equal("[0, 1, 2, 3]\n", PP.pp([0,1,2,3], '', 12))
+    end
+
+    def test_list0123_11
+      assert_equal("[0,\n 1,\n 2,\n 3]\n", PP.pp([0,1,2,3], '', 11))
+    end
+
+    OverriddenStruct = Struct.new("OverriddenStruct", :members, :class)
+    def test_struct_override_members # [ruby-core:7865]
+      a = OverriddenStruct.new(1,2)
+      assert_equal("#<struct Struct::OverriddenStruct members=1, class=2>\n", PP.pp(a, ''))
+    end
+  end
+
+  class HasInspect
+    def initialize(a)
+      @a = a
+    end
+
+    def inspect
+      return "<inspect:#{@a.inspect}>"
+    end
+  end
+
+  class HasPrettyPrint
+    def initialize(a)
+      @a = a
+    end
+
+    def pretty_print(q)
+      q.text "<pretty_print:"
+      q.pp @a
+      q.text ">"
+    end
+  end
+
+  class HasBoth
+    def initialize(a)
+      @a = a
+    end
+
+    def inspect
+      return "<inspect:#{@a.inspect}>"
+    end
+
+    def pretty_print(q)
+      q.text "<pretty_print:"
+      q.pp @a
+      q.text ">"
+    end
+  end
+
+  class PrettyPrintInspect < HasPrettyPrint
+    alias inspect pretty_print_inspect
+  end
+
+  class PrettyPrintInspectWithoutPrettyPrint
+    alias inspect pretty_print_inspect
+  end
+
+  class PPInspectTest < Test::Unit::TestCase
+    def test_hasinspect
+      a = HasInspect.new(1)
+      assert_equal("<inspect:1>\n", PP.pp(a, ''))
+    end
+
+    def test_hasprettyprint
+      a = HasPrettyPrint.new(1)
+      assert_equal("<pretty_print:1>\n", PP.pp(a, ''))
+    end
+
+    def test_hasboth
+      a = HasBoth.new(1)
+      assert_equal("<pretty_print:1>\n", PP.pp(a, ''))
+    end
+
+    def test_pretty_print_inspect
+      a = PrettyPrintInspect.new(1)
+      assert_equal("<pretty_print:1>", a.inspect)
+      a = PrettyPrintInspectWithoutPrettyPrint.new
+      assert_raise(RuntimeError) { a.inspect }
+    end
+
+    def test_proc
+      a = proc {1}
+      assert_equal("#{a.inspect}\n", PP.pp(a, ''))
+    end
+
+    def test_to_s_with_iv
+      a = Object.new
+      def a.to_s() "aaa" end
+      a.instance_eval { @a = nil }
+      result = PP.pp(a, '')
+      assert_equal("#{a.inspect}\n", result)
+      assert_match(/\A#<Object.*>\n\z/m, result)
+      a = 1.0
+      a.instance_eval { @a = nil }
+      result = PP.pp(a, '')
+      assert_equal("#{a.inspect}\n", result)
+    end
+    
+    def test_to_s_without_iv
+      a = Object.new
+      def a.to_s() "aaa" end
+      result = PP.pp(a, '')
+      assert_equal("#{a.inspect}\n", result)
+      assert_equal("aaa\n", result)
+    end
+  end
+
+  class PPCycleTest < Test::Unit::TestCase
+    def test_array
+      a = []
+      a << a
+      assert_equal("[[...]]\n", PP.pp(a, ''))
+      assert_equal("#{a.inspect}\n", PP.pp(a, ''))
+    end
+
+    def test_hash
+      a = {}
+      a[0] = a
+      assert_equal("{0=>{...}}\n", PP.pp(a, ''))
+      assert_equal("#{a.inspect}\n", PP.pp(a, ''))
+    end
+
+    S = Struct.new("S", :a, :b)
+    def test_struct
+      a = S.new(1,2)
+      a.b = a
+      assert_equal("#<struct Struct::S a=1, b=#<struct Struct::S:...>>\n", PP.pp(a, ''))
+      assert_equal("#{a.inspect}\n", PP.pp(a, ''))
+    end
+
+    def test_object
+      a = Object.new
+      a.instance_eval {@a = a}
+      assert_equal(a.inspect + "\n", PP.pp(a, ''))
+    end
+
+    def test_anonymous
+      a = Class.new.new
+      assert_equal(a.inspect + "\n", PP.pp(a, ''))
+    end
+
+    def test_withinspect
+      a = []
+      a << HasInspect.new(a)
+      assert_equal("[<inspect:[...]>]\n", PP.pp(a, ''))
+      assert_equal("#{a.inspect}\n", PP.pp(a, ''))
+    end
+
+    def test_share_nil
+      begin
+        PP.sharing_detection = true
+        a = [nil, nil]
+        assert_equal("[nil, nil]\n", PP.pp(a, ''))
+      ensure
+        PP.sharing_detection = false
+      end
+    end
+  end
+
+  class PPSingleLineTest < Test::Unit::TestCase
+    def test_hash
+      assert_equal("{1=>1}", PP.singleline_pp({ 1 => 1}, '')) # [ruby-core:02699]
+      assert_equal("[1#{', 1'*99}]", PP.singleline_pp([1]*100, ''))
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/prettyprint.rb b/ruby_1_8_6/lib/prettyprint.rb
new file mode 100644
index 0000000000..315c422e9e
--- /dev/null
+++ b/ruby_1_8_6/lib/prettyprint.rb
@@ -0,0 +1,896 @@
+# $Id$
+
+# This class implements a pretty printing algorithm. It finds line breaks and
+# nice indentations for grouped structure.
+# 
+# By default, the class assumes that primitive elements are strings and each
+# byte in the strings have single column in width. But it can be used for
+# other situations by giving suitable arguments for some methods:
+# * newline object and space generation block for PrettyPrint.new
+# * optional width argument for PrettyPrint#text
+# * PrettyPrint#breakable
+#
+# There are several candidate uses:
+# * text formatting using proportional fonts
+# * multibyte characters which has columns different to number of bytes
+# * non-string formatting
+#
+# == Bugs
+# * Box based formatting?
+# * Other (better) model/algorithm?
+# 
+# == References
+# Christian Lindig, Strictly Pretty, March 2000,
+# http://www.st.cs.uni-sb.de/~lindig/papers/#pretty
+# 
+# Philip Wadler, A prettier printer, March 1998,
+# http://homepages.inf.ed.ac.uk/wadler/topics/language-design.html#prettier
+# 
+# == Author
+# Tanaka Akira <akr@m17n.org>
+# 
+class PrettyPrint
+
+  # This is a convenience method which is same as follows:
+  # 
+  #   begin
+  #     q = PrettyPrint.new(output, maxwidth, newline, &genspace)
+  #     ...
+  #     q.flush
+  #     output
+  #   end
+  # 
+  def PrettyPrint.format(output='', maxwidth=79, newline="\n", genspace=lambda {|n| ' ' * n})
+    q = PrettyPrint.new(output, maxwidth, newline, &genspace)
+    yield q
+    q.flush
+    output
+  end
+
+  # This is similar to PrettyPrint::format but the result has no breaks.
+  #
+  # +maxwidth+, +newline+ and +genspace+ are ignored.
+  #
+  # The invocation of +breakable+ in the block doesn't break a line and is
+  # treated as just an invocation of +text+.
+  #
+  def PrettyPrint.singleline_format(output='', maxwidth=nil, newline=nil, genspace=nil)
+    q = SingleLine.new(output)
+    yield q
+    output
+  end
+
+  # Creates a buffer for pretty printing.
+  #
+  # +output+ is an output target. If it is not specified, '' is assumed. It
+  # should have a << method which accepts the first argument +obj+ of
+  # PrettyPrint#text, the first argument +sep+ of PrettyPrint#breakable, the
+  # first argument +newline+ of PrettyPrint.new, and the result of a given
+  # block for PrettyPrint.new.
+  #
+  # +maxwidth+ specifies maximum line length. If it is not specified, 79 is
+  # assumed. However actual outputs may overflow +maxwidth+ if long
+  # non-breakable texts are provided.
+  #
+  # +newline+ is used for line breaks. "\n" is used if it is not specified.
+  #
+  # The block is used to generate spaces. {|width| ' ' * width} is used if it
+  # is not given.
+  #
+  def initialize(output='', maxwidth=79, newline="\n", &genspace)
+    @output = output
+    @maxwidth = maxwidth
+    @newline = newline
+    @genspace = genspace || lambda {|n| ' ' * n}
+
+    @output_width = 0
+    @buffer_width = 0
+    @buffer = []
+
+    root_group = Group.new(0)
+    @group_stack = [root_group]
+    @group_queue = GroupQueue.new(root_group)
+    @indent = 0
+  end
+  attr_reader :output, :maxwidth, :newline, :genspace
+  attr_reader :indent, :group_queue
+
+  def current_group
+    @group_stack.last
+  end
+
+  # first? is a predicate to test the call is a first call to first? with
+  # current group.
+  #
+  # It is useful to format comma separated values as:
+  #
+  #   q.group(1, '[', ']') {
+  #     xxx.each {|yyy|
+  #       unless q.first?
+  #         q.text ','
+  #         q.breakable
+  #       end
+  #       ... pretty printing yyy ...
+  #     }
+  #   }
+  #
+  # first? is obsoleted in 1.8.2.
+  #
+  def first?
+    warn "PrettyPrint#first? is obsoleted at 1.8.2."
+    current_group.first?
+  end
+
+  def break_outmost_groups
+    while @maxwidth < @output_width + @buffer_width
+      return unless group = @group_queue.deq
+      until group.breakables.empty?
+        data = @buffer.shift
+        @output_width = data.output(@output, @output_width)
+        @buffer_width -= data.width
+      end
+      while !@buffer.empty? && Text === @buffer.first
+        text = @buffer.shift
+        @output_width = text.output(@output, @output_width)
+        @buffer_width -= text.width
+      end
+    end
+  end
+
+  # This adds +obj+ as a text of +width+ columns in width.
+  #
+  # If +width+ is not specified, obj.length is used.
+  #
+  def text(obj, width=obj.length)
+    if @buffer.empty?
+      @output << obj
+      @output_width += width
+    else
+      text = @buffer.last
+      unless Text === text
+        text = Text.new
+        @buffer << text
+      end
+      text.add(obj, width)
+      @buffer_width += width
+      break_outmost_groups
+    end
+  end
+
+  def fill_breakable(sep=' ', width=sep.length)
+    group { breakable sep, width }
+  end
+
+  # This tells "you can break a line here if necessary", and a +width+\-column
+  # text +sep+ is inserted if a line is not broken at the point.
+  #
+  # If +sep+ is not specified, " " is used.
+  #
+  # If +width+ is not specified, +sep.length+ is used. You will have to
+  # specify this when +sep+ is a multibyte character, for example.
+  #
+  def breakable(sep=' ', width=sep.length)
+    group = @group_stack.last
+    if group.break?
+      flush
+      @output << @newline
+      @output << @genspace.call(@indent)
+      @output_width = @indent
+      @buffer_width = 0
+    else
+      @buffer << Breakable.new(sep, width, self)
+      @buffer_width += width
+      break_outmost_groups
+    end
+  end
+
+  # Groups line break hints added in the block. The line break hints are all
+  # to be used or not.
+  #
+  # If +indent+ is specified, the method call is regarded as nested by
+  # nest(indent) { ... }.
+  #
+  # If +open_obj+ is specified, <tt>text open_obj, open_width</tt> is called
+  # before grouping. If +close_obj+ is specified, <tt>text close_obj,
+  # close_width</tt> is called after grouping.
+  #
+  def group(indent=0, open_obj='', close_obj='', open_width=open_obj.length, close_width=close_obj.length)
+    text open_obj, open_width
+    group_sub {
+      nest(indent) {
+        yield
+      }
+    }
+    text close_obj, close_width
+  end
+
+  def group_sub
+    group = Group.new(@group_stack.last.depth + 1)
+    @group_stack.push group
+    @group_queue.enq group
+    begin
+      yield
+    ensure
+      @group_stack.pop
+      if group.breakables.empty?
+        @group_queue.delete group
+      end
+    end
+  end
+
+  # Increases left margin after newline with +indent+ for line breaks added in
+  # the block.
+  #
+  def nest(indent)
+    @indent += indent
+    begin
+      yield
+    ensure
+      @indent -= indent
+    end
+  end
+
+  # outputs buffered data.
+  #
+  def flush
+    @buffer.each {|data|
+      @output_width = data.output(@output, @output_width)
+    }
+    @buffer.clear
+    @buffer_width = 0
+  end
+
+  class Text
+    def initialize
+      @objs = []
+      @width = 0
+    end
+    attr_reader :width
+
+    def output(out, output_width)
+      @objs.each {|obj| out << obj}
+      output_width + @width
+    end
+
+    def add(obj, width)
+      @objs << obj
+      @width += width
+    end
+  end
+
+  class Breakable
+    def initialize(sep, width, q)
+      @obj = sep
+      @width = width
+      @pp = q
+      @indent = q.indent
+      @group = q.current_group
+      @group.breakables.push self
+    end
+    attr_reader :obj, :width, :indent
+
+    def output(out, output_width)
+      @group.breakables.shift
+      if @group.break?
+        out << @pp.newline
+        out << @pp.genspace.call(@indent)
+        @indent
+      else
+        @pp.group_queue.delete @group if @group.breakables.empty?
+        out << @obj
+        output_width + @width
+      end
+    end
+  end
+
+  class Group
+    def initialize(depth)
+      @depth = depth
+      @breakables = []
+      @break = false
+    end
+    attr_reader :depth, :breakables
+
+    def break
+      @break = true
+    end
+
+    def break?
+      @break
+    end
+
+    def first?
+      if defined? @first
+        false
+      else
+        @first = false
+        true
+      end
+    end
+  end
+
+  class GroupQueue
+    def initialize(*groups)
+      @queue = []
+      groups.each {|g| enq g}
+    end
+
+    def enq(group)
+      depth = group.depth
+      @queue << [] until depth < @queue.length
+      @queue[depth] << group
+    end
+
+    def deq
+      @queue.each {|gs|
+        (gs.length-1).downto(0) {|i|
+          unless gs[i].breakables.empty?
+            group = gs.slice!(i, 1).first
+            group.break
+            return group
+          end
+        }
+        gs.each {|group| group.break}
+        gs.clear
+      }
+      return nil
+    end
+
+    def delete(group)
+      @queue[group.depth].delete(group)
+    end
+  end
+
+  class SingleLine
+    def initialize(output, maxwidth=nil, newline=nil)
+      @output = output
+      @first = [true]
+    end
+
+    def text(obj, width=nil)
+      @output << obj
+    end
+
+    def breakable(sep=' ', width=nil)
+      @output << sep
+    end
+
+    def nest(indent)
+      yield
+    end
+
+    def group(indent=nil, open_obj='', close_obj='', open_width=nil, close_width=nil)
+      @first.push true
+      @output << open_obj
+      yield
+      @output << close_obj
+      @first.pop
+    end
+
+    def flush
+    end
+
+    def first?
+      result = @first[-1]
+      @first[-1] = false
+      result
+    end
+  end
+end
+
+if __FILE__ == $0
+  require 'test/unit'
+
+  class WadlerExample < Test::Unit::TestCase # :nodoc:
+    def setup
+      @tree = Tree.new("aaaa", Tree.new("bbbbb", Tree.new("ccc"),
+                                                 Tree.new("dd")),
+                               Tree.new("eee"),
+                               Tree.new("ffff", Tree.new("gg"),
+                                                Tree.new("hhh"),
+                                                Tree.new("ii")))
+    end
+
+    def hello(width)
+      PrettyPrint.format('', width) {|hello|
+        hello.group {
+          hello.group {
+            hello.group {
+              hello.group {
+                hello.text 'hello'
+                hello.breakable; hello.text 'a'
+              }
+              hello.breakable; hello.text 'b'
+            }
+            hello.breakable; hello.text 'c'
+          }
+          hello.breakable; hello.text 'd'
+        }
+      }
+    end
+
+    def test_hello_00_06
+      expected = <<'End'.chomp
+hello
+a
+b
+c
+d
+End
+      assert_equal(expected, hello(0))
+      assert_equal(expected, hello(6))
+    end
+
+    def test_hello_07_08
+      expected = <<'End'.chomp
+hello a
+b
+c
+d
+End
+      assert_equal(expected, hello(7))
+      assert_equal(expected, hello(8))
+    end
+
+    def test_hello_09_10
+      expected = <<'End'.chomp
+hello a b
+c
+d
+End
+      out = hello(9); assert_equal(expected, out)
+      out = hello(10); assert_equal(expected, out)
+    end
+
+    def test_hello_11_12
+      expected = <<'End'.chomp
+hello a b c
+d
+End
+      assert_equal(expected, hello(11))
+      assert_equal(expected, hello(12))
+    end
+
+    def test_hello_13
+      expected = <<'End'.chomp
+hello a b c d
+End
+      assert_equal(expected, hello(13))
+    end
+
+    def tree(width)
+      PrettyPrint.format('', width) {|q| @tree.show(q)}
+    end
+
+    def test_tree_00_19
+      expected = <<'End'.chomp
+aaaa[bbbbb[ccc,
+           dd],
+     eee,
+     ffff[gg,
+          hhh,
+          ii]]
+End
+      assert_equal(expected, tree(0))
+      assert_equal(expected, tree(19))
+    end
+
+    def test_tree_20_22
+      expected = <<'End'.chomp
+aaaa[bbbbb[ccc, dd],
+     eee,
+     ffff[gg,
+          hhh,
+          ii]]
+End
+      assert_equal(expected, tree(20))
+      assert_equal(expected, tree(22))
+    end
+
+    def test_tree_23_43
+      expected = <<'End'.chomp
+aaaa[bbbbb[ccc, dd],
+     eee,
+     ffff[gg, hhh, ii]]
+End
+      assert_equal(expected, tree(23))
+      assert_equal(expected, tree(43))
+    end
+
+    def test_tree_44
+      assert_equal(<<'End'.chomp, tree(44))
+aaaa[bbbbb[ccc, dd], eee, ffff[gg, hhh, ii]]
+End
+    end
+
+    def tree_alt(width)
+      PrettyPrint.format('', width) {|q| @tree.altshow(q)}
+    end
+
+    def test_tree_alt_00_18
+      expected = <<'End'.chomp
+aaaa[
+  bbbbb[
+    ccc,
+    dd
+  ],
+  eee,
+  ffff[
+    gg,
+    hhh,
+    ii
+  ]
+]
+End
+      assert_equal(expected, tree_alt(0))
+      assert_equal(expected, tree_alt(18))
+    end
+
+    def test_tree_alt_19_20
+      expected = <<'End'.chomp
+aaaa[
+  bbbbb[ ccc, dd ],
+  eee,
+  ffff[
+    gg,
+    hhh,
+    ii
+  ]
+]
+End
+      assert_equal(expected, tree_alt(19))
+      assert_equal(expected, tree_alt(20))
+    end
+
+    def test_tree_alt_20_49
+      expected = <<'End'.chomp
+aaaa[
+  bbbbb[ ccc, dd ],
+  eee,
+  ffff[ gg, hhh, ii ]
+]
+End
+      assert_equal(expected, tree_alt(21))
+      assert_equal(expected, tree_alt(49))
+    end
+
+    def test_tree_alt_50
+      expected = <<'End'.chomp
+aaaa[ bbbbb[ ccc, dd ], eee, ffff[ gg, hhh, ii ] ]
+End
+      assert_equal(expected, tree_alt(50))
+    end
+
+    class Tree # :nodoc:
+      def initialize(string, *children)
+        @string = string
+        @children = children
+      end
+
+      def show(q)
+        q.group {
+          q.text @string
+          q.nest(@string.length) {
+            unless @children.empty?
+              q.text '['
+              q.nest(1) {
+                first = true
+                @children.each {|t|
+                  if first
+                    first = false
+                  else
+                    q.text ','
+                    q.breakable
+                  end
+                  t.show(q)
+                }
+              }
+              q.text ']'
+            end
+          }
+        }
+      end
+
+      def altshow(q)
+        q.group {
+          q.text @string
+          unless @children.empty?
+            q.text '['
+            q.nest(2) {
+              q.breakable
+              first = true
+              @children.each {|t|
+                if first
+                  first = false
+                else
+                  q.text ','
+                  q.breakable
+                end
+                t.altshow(q)
+              }
+            }
+            q.breakable
+            q.text ']'
+          end
+        }
+      end
+
+    end
+  end
+
+  class StrictPrettyExample < Test::Unit::TestCase # :nodoc:
+    def prog(width)
+      PrettyPrint.format('', width) {|q|
+        q.group {
+          q.group {q.nest(2) {
+                       q.text "if"; q.breakable;
+                       q.group {
+                         q.nest(2) {
+                           q.group {q.text "a"; q.breakable; q.text "=="}
+                           q.breakable; q.text "b"}}}}
+          q.breakable
+          q.group {q.nest(2) {
+                       q.text "then"; q.breakable;
+                       q.group {
+                         q.nest(2) {
+                           q.group {q.text "a"; q.breakable; q.text "<<"}
+                           q.breakable; q.text "2"}}}}
+          q.breakable
+          q.group {q.nest(2) {
+                       q.text "else"; q.breakable;
+                       q.group {
+                         q.nest(2) {
+                           q.group {q.text "a"; q.breakable; q.text "+"}
+                           q.breakable; q.text "b"}}}}}
+      }
+    end
+
+    def test_00_04
+      expected = <<'End'.chomp
+if
+  a
+    ==
+    b
+then
+  a
+    <<
+    2
+else
+  a
+    +
+    b
+End
+      assert_equal(expected, prog(0))
+      assert_equal(expected, prog(4))
+    end
+
+    def test_05
+      expected = <<'End'.chomp
+if
+  a
+    ==
+    b
+then
+  a
+    <<
+    2
+else
+  a +
+    b
+End
+      assert_equal(expected, prog(5))
+    end
+
+    def test_06
+      expected = <<'End'.chomp
+if
+  a ==
+    b
+then
+  a <<
+    2
+else
+  a +
+    b
+End
+      assert_equal(expected, prog(6))
+    end
+
+    def test_07
+      expected = <<'End'.chomp
+if
+  a ==
+    b
+then
+  a <<
+    2
+else
+  a + b
+End
+      assert_equal(expected, prog(7))
+    end
+
+    def test_08
+      expected = <<'End'.chomp
+if
+  a == b
+then
+  a << 2
+else
+  a + b
+End
+      assert_equal(expected, prog(8))
+    end
+
+    def test_09
+      expected = <<'End'.chomp
+if a == b
+then
+  a << 2
+else
+  a + b
+End
+      assert_equal(expected, prog(9))
+    end
+
+    def test_10
+      expected = <<'End'.chomp
+if a == b
+then
+  a << 2
+else a + b
+End
+      assert_equal(expected, prog(10))
+    end
+
+    def test_11_31
+      expected = <<'End'.chomp
+if a == b
+then a << 2
+else a + b
+End
+      assert_equal(expected, prog(11))
+      assert_equal(expected, prog(15))
+      assert_equal(expected, prog(31))
+    end
+
+    def test_32
+      expected = <<'End'.chomp
+if a == b then a << 2 else a + b
+End
+      assert_equal(expected, prog(32))
+    end
+
+  end
+
+  class TailGroup < Test::Unit::TestCase # :nodoc:
+    def test_1
+      out = PrettyPrint.format('', 10) {|q|
+        q.group {
+          q.group {
+            q.text "abc"
+            q.breakable
+            q.text "def"
+          }
+          q.group {
+            q.text "ghi"
+            q.breakable
+            q.text "jkl"
+          }
+        }
+      }
+      assert_equal("abc defghi\njkl", out)
+    end
+  end
+
+  class NonString < Test::Unit::TestCase # :nodoc:
+    def format(width)
+      PrettyPrint.format([], width, 'newline', lambda {|n| "#{n} spaces"}) {|q|
+        q.text(3, 3)
+        q.breakable(1, 1)
+        q.text(3, 3)
+      }
+    end
+
+    def test_6
+      assert_equal([3, "newline", "0 spaces", 3], format(6))
+    end
+
+    def test_7
+      assert_equal([3, 1, 3], format(7))
+    end
+
+  end
+
+  class Fill < Test::Unit::TestCase # :nodoc:
+    def format(width)
+      PrettyPrint.format('', width) {|q|
+        q.group {
+          q.text 'abc'
+          q.fill_breakable
+          q.text 'def'
+          q.fill_breakable
+          q.text 'ghi'
+          q.fill_breakable
+          q.text 'jkl'
+          q.fill_breakable
+          q.text 'mno'
+          q.fill_breakable
+          q.text 'pqr'
+          q.fill_breakable
+          q.text 'stu'
+        }
+      }
+    end
+
+    def test_00_06
+      expected = <<'End'.chomp
+abc
+def
+ghi
+jkl
+mno
+pqr
+stu
+End
+      assert_equal(expected, format(0))
+      assert_equal(expected, format(6))
+    end
+
+    def test_07_10
+      expected = <<'End'.chomp
+abc def
+ghi jkl
+mno pqr
+stu
+End
+      assert_equal(expected, format(7))
+      assert_equal(expected, format(10))
+    end
+
+    def test_11_14
+      expected = <<'End'.chomp
+abc def ghi
+jkl mno pqr
+stu
+End
+      assert_equal(expected, format(11))
+      assert_equal(expected, format(14))
+    end
+
+    def test_15_18
+      expected = <<'End'.chomp
+abc def ghi jkl
+mno pqr stu
+End
+      assert_equal(expected, format(15))
+      assert_equal(expected, format(18))
+    end
+
+    def test_19_22
+      expected = <<'End'.chomp
+abc def ghi jkl mno
+pqr stu
+End
+      assert_equal(expected, format(19))
+      assert_equal(expected, format(22))
+    end
+
+    def test_23_26
+      expected = <<'End'.chomp
+abc def ghi jkl mno pqr
+stu
+End
+      assert_equal(expected, format(23))
+      assert_equal(expected, format(26))
+    end
+
+    def test_27
+      expected = <<'End'.chomp
+abc def ghi jkl mno pqr stu
+End
+      assert_equal(expected, format(27))
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/lib/profile.rb b/ruby_1_8_6/lib/profile.rb
new file mode 100644
index 0000000000..104cb205b9
--- /dev/null
+++ b/ruby_1_8_6/lib/profile.rb
@@ -0,0 +1,6 @@
+require 'profiler'
+
+END {
+  Profiler__::print_profile(STDERR)
+}
+Profiler__::start_profile
diff --git a/ruby_1_8_6/lib/profiler.rb b/ruby_1_8_6/lib/profiler.rb
new file mode 100644
index 0000000000..9762fa1181
--- /dev/null
+++ b/ruby_1_8_6/lib/profiler.rb
@@ -0,0 +1,59 @@
+module Profiler__
+  # internal values
+  @@start = @@stack = @@map = nil
+  PROFILE_PROC = proc{|event, file, line, id, binding, klass|
+    case event
+    when "call", "c-call"
+      now = Process.times[0]
+      @@stack.push [now, 0.0]
+    when "return", "c-return"
+      now = Process.times[0]
+      key = [klass, id]
+      if tick = @@stack.pop
+        data = (@@map[key] ||= [0, 0.0, 0.0, key])
+        data[0] += 1
+        cost = now - tick[0]
+        data[1] += cost
+        data[2] += cost - tick[1]
+        @@stack[-1][1] += cost if @@stack[-1]
+      end
+    end
+  }
+module_function
+  def start_profile
+    @@start = Process.times[0]
+    @@stack = []
+    @@map = {}
+    set_trace_func PROFILE_PROC
+  end
+  def stop_profile
+    set_trace_func nil
+  end
+  def print_profile(f)
+    stop_profile
+    total = Process.times[0] - @@start
+    if total == 0 then total = 0.01 end
+    data = @@map.values
+    data.sort!{|a,b| b[2] <=> a[2]}
+    sum = 0
+    f.printf "  %%   cumulative   self              self     total\n"
+    f.printf " time   seconds   seconds    calls  ms/call  ms/call  name\n"
+    for d in data
+      sum += d[2]
+      f.printf "%6.2f %8.2f  %8.2f %8d ", d[2]/total*100, sum, d[2], d[0]
+      f.printf "%8.2f %8.2f  %s\n", d[2]*1000/d[0], d[1]*1000/d[0], get_name(*d[3])
+    end
+    f.printf "%6.2f %8.2f  %8.2f %8d ", 0.0, total, 0.0, 1     # ???
+    f.printf "%8.2f %8.2f  %s\n", 0.0, total*1000, "#toplevel" # ???
+  end
+  def get_name(klass, id)
+    name = klass.to_s || ""
+    if klass.kind_of? Class
+      name += "#"
+    else
+      name += "."
+    end
+    name + id.id2name
+  end
+  private :get_name
+end
diff --git a/ruby_1_8_6/lib/pstore.rb b/ruby_1_8_6/lib/pstore.rb
new file mode 100644
index 0000000000..6df64474ab
--- /dev/null
+++ b/ruby_1_8_6/lib/pstore.rb
@@ -0,0 +1,395 @@
+# = PStore -- Transactional File Storage for Ruby Objects
+#
+# pstore.rb -
+#   originally by matz
+#   documentation by Kev Jackson and James Edward Gray II
+#
+# See PStore for documentation.
+
+
+require "fileutils"
+require "digest/md5"
+
+#
+# PStore implements a file based persistance mechanism based on a Hash.  User
+# code can store hierarchies of Ruby objects (values) into the data store file
+# by name (keys).  An object hierarchy may be just a single object.  User code 
+# may later read values back from the data store or even update data, as needed.
+# 
+# The transactional behavior ensures that any changes succeed or fail together.
+# This can be used to ensure that the data store is not left in a transitory
+# state, where some values were upated but others were not.
+# 
+# Behind the scenes, Ruby objects are stored to the data store file with 
+# Marshal.  That carries the usual limitations.  Proc objects cannot be 
+# marshalled, for example.
+#
+# == Usage example:
+# 
+#  require "pstore"
+#  
+#  # a mock wiki object...
+#  class WikiPage
+#    def initialize( page_name, author, contents )
+#      @page_name = page_name
+#      @revisions = Array.new
+#      
+#      add_revision(author, contents)
+#    end
+#    
+#    attr_reader :page_name
+#    
+#    def add_revision( author, contents )
+#      @revisions << { :created  => Time.now,
+#                      :author   => author,
+#                      :contents => contents }
+#    end
+#    
+#    def wiki_page_references
+#      [@page_name] + @revisions.last[:contents].scan(/\b(?:[A-Z]+[a-z]+){2,}/)
+#    end
+#    
+#    # ...
+#  end
+#  
+#  # create a new page...
+#  home_page = WikiPage.new( "HomePage", "James Edward Gray II",
+#                            "A page about the JoysOfDocumentation..." )
+#  
+#  # then we want to update page data and the index together, or not at all...
+#  wiki = PStore.new("wiki_pages.pstore")
+#  wiki.transaction do  # begin transaction; do all of this or none of it
+#    # store page...
+#    wiki[home_page.page_name] = home_page
+#    # ensure that an index has been created...
+#    wiki[:wiki_index] ||= Array.new
+#    # update wiki index...
+#    wiki[:wiki_index].push(*home_page.wiki_page_references)
+#  end                   # commit changes to wiki data store file
+#  
+#  ### Some time later... ###
+#  
+#  # read wiki data...
+#  wiki.transaction(true) do  # begin read-only transaction, no changes allowed
+#    wiki.roots.each do |data_root_name|
+#      p data_root_name
+#      p wiki[data_root_name]
+#    end
+#  end
+#
+class PStore
+  binmode = defined?(File::BINARY) ? File::BINARY : 0
+  RDWR_ACCESS = File::RDWR | File::CREAT | binmode
+  RD_ACCESS = File::RDONLY | binmode
+  WR_ACCESS = File::WRONLY | File::CREAT | File::TRUNC | binmode
+
+  # The error type thrown by all PStore methods.
+  class Error < StandardError
+  end
+
+  # 
+  # To construct a PStore object, pass in the _file_ path where you would like 
+  # the data to be stored.
+  # 
+  def initialize(file)
+    dir = File::dirname(file)
+    unless File::directory? dir
+      raise PStore::Error, format("directory %s does not exist", dir)
+    end
+    if File::exist? file and not File::readable? file
+      raise PStore::Error, format("file %s not readable", file)
+    end
+    @transaction = false
+    @filename = file
+    @abort = false
+  end
+
+  # Raises PStore::Error if the calling code is not in a PStore#transaction.
+  def in_transaction
+    raise PStore::Error, "not in transaction" unless @transaction
+  end
+  # 
+  # Raises PStore::Error if the calling code is not in a PStore#transaction or
+  # if the code is in a read-only PStore#transaction.
+  # 
+  def in_transaction_wr()
+    in_transaction()
+    raise PStore::Error, "in read-only transaction" if @rdonly
+  end
+  private :in_transaction, :in_transaction_wr
+
+  #
+  # Retrieves a value from the PStore file data, by _name_.  The hierarchy of 
+  # Ruby objects stored under that root _name_ will be returned.
+  # 
+  # *WARNING*:  This method is only valid in a PStore#transaction.  It will
+  # raise PStore::Error if called at any other time.
+  #
+  def [](name)
+    in_transaction
+    @table[name]
+  end
+  #
+  # This method is just like PStore#[], save that you may also provide a 
+  # _default_ value for the object.  In the event the specified _name_ is not 
+  # found in the data store, your _default_ will be returned instead.  If you do 
+  # not specify a default, PStore::Error will be raised if the object is not 
+  # found.
+  # 
+  # *WARNING*:  This method is only valid in a PStore#transaction.  It will
+  # raise PStore::Error if called at any other time.
+  #
+  def fetch(name, default=PStore::Error)
+    in_transaction
+    unless @table.key? name
+      if default==PStore::Error
+	raise PStore::Error, format("undefined root name `%s'", name)
+      else
+	return default
+      end
+    end
+    @table[name]
+  end
+  #
+  # Stores an individual Ruby object or a hierarchy of Ruby objects in the data
+  # store file under the root _name_.  Assigning to a _name_ already in the data
+  # store clobbers the old data.
+  # 
+  # == Example:
+  # 
+  #  require "pstore"
+  #  
+  #  store = PStore.new("data_file.pstore")
+  #  store.transaction do  # begin transaction
+  #    # load some data into the store...
+  #    store[:single_object] = "My data..."
+  #    store[:obj_heirarchy] = { "Kev Jackson" => ["rational.rb", "pstore.rb"],
+  #                              "James Gray"  => ["erb.rb", "pstore.rb"] }
+  #  end                   # commit changes to data store file
+  # 
+  # *WARNING*:  This method is only valid in a PStore#transaction and it cannot
+  # be read-only.  It will raise PStore::Error if called at any other time.
+  #
+  def []=(name, value)
+    in_transaction_wr()
+    @table[name] = value
+  end
+  #
+  # Removes an object hierarchy from the data store, by _name_.
+  # 
+  # *WARNING*:  This method is only valid in a PStore#transaction and it cannot
+  # be read-only.  It will raise PStore::Error if called at any other time.
+  #
+  def delete(name)
+    in_transaction_wr()
+    @table.delete name
+  end
+
+  #
+  # Returns the names of all object hierarchies currently in the store.
+  # 
+  # *WARNING*:  This method is only valid in a PStore#transaction.  It will
+  # raise PStore::Error if called at any other time.
+  #
+  def roots
+    in_transaction
+    @table.keys
+  end
+  #
+  # Returns true if the supplied _name_ is currently in the data store.
+  # 
+  # *WARNING*:  This method is only valid in a PStore#transaction.  It will
+  # raise PStore::Error if called at any other time.
+  #
+  def root?(name)
+    in_transaction
+    @table.key? name
+  end
+  # Returns the path to the data store file.
+  def path
+    @filename
+  end
+
+  #
+  # Ends the current PStore#transaction, committing any changes to the data
+  # store immediately.
+  # 
+  # == Example:
+  # 
+  #  require "pstore"
+  #   
+  #  store = PStore.new("data_file.pstore")
+  #  store.transaction do  # begin transaction
+  #    # load some data into the store...
+  #    store[:one] = 1
+  #    store[:two] = 2
+  #  
+  #    store.commit        # end transaction here, committing changes
+  #  
+  #    store[:three] = 3   # this change is never reached
+  #  end
+  # 
+  # *WARNING*:  This method is only valid in a PStore#transaction.  It will
+  # raise PStore::Error if called at any other time.
+  #
+  def commit
+    in_transaction
+    @abort = false
+    throw :pstore_abort_transaction
+  end
+  #
+  # Ends the current PStore#transaction, discarding any changes to the data
+  # store.
+  # 
+  # == Example:
+  # 
+  #  require "pstore"
+  #   
+  #  store = PStore.new("data_file.pstore")
+  #  store.transaction do  # begin transaction
+  #    store[:one] = 1     # this change is not applied, see below...
+  #    store[:two] = 2     # this change is not applied, see below...
+  #  
+  #    store.abort         # end transaction here, discard all changes
+  #  
+  #    store[:three] = 3   # this change is never reached
+  #  end
+  # 
+  # *WARNING*:  This method is only valid in a PStore#transaction.  It will
+  # raise PStore::Error if called at any other time.
+  #
+  def abort
+    in_transaction
+    @abort = true
+    throw :pstore_abort_transaction
+  end
+
+  #
+  # Opens a new transaction for the data store.  Code executed inside a block
+  # passed to this method may read and write data to and from the data store 
+  # file.
+  # 
+  # At the end of the block, changes are committed to the data store
+  # automatically.  You may exit the transaction early with a call to either 
+  # PStore#commit or PStore#abort.  See those methods for details about how
+  # changes are handled.  Raising an uncaught Exception in the block is 
+  # equivalent to calling PStore#abort.
+  # 
+  # If _read_only_ is set to +true+, you will only be allowed to read from the
+  # data store during the transaction and any attempts to change the data will
+  # raise a PStore::Error.
+  # 
+  # Note that PStore does not support nested transactions.
+  #
+  def transaction(read_only=false)  # :yields:  pstore
+    raise PStore::Error, "nested transaction" if @transaction
+    begin
+      @rdonly = read_only
+      @abort = false
+      @transaction = true
+      value = nil
+      new_file = @filename + ".new"
+
+      content = nil
+      unless read_only
+        file = File.open(@filename, RDWR_ACCESS)
+        file.flock(File::LOCK_EX)
+        commit_new(file) if FileTest.exist?(new_file)
+        content = file.read()
+      else
+        begin
+          file = File.open(@filename, RD_ACCESS)
+          file.flock(File::LOCK_SH)
+          content = (File.open(new_file, RD_ACCESS) {|n| n.read} rescue file.read())
+        rescue Errno::ENOENT
+          content = ""
+        end
+      end
+
+      if content != ""
+	@table = load(content)
+        if !read_only
+          size = content.size
+          md5 = Digest::MD5.digest(content)
+        end
+      else
+	@table = {}
+      end
+      content = nil		# unreference huge data
+
+      begin
+	catch(:pstore_abort_transaction) do
+	  value = yield(self)
+	end
+      rescue Exception
+	@abort = true
+	raise
+      ensure
+	if !read_only and !@abort
+          tmp_file = @filename + ".tmp"
+	  content = dump(@table)
+	  if !md5 || size != content.size || md5 != Digest::MD5.digest(content)
+            File.open(tmp_file, WR_ACCESS) {|t| t.write(content)}
+            File.rename(tmp_file, new_file)
+            commit_new(file)
+          end
+          content = nil		# unreference huge data
+	end
+      end
+    ensure
+      @table = nil
+      @transaction = false
+      file.close if file
+    end
+    value
+  end
+
+  # This method is just a wrapped around Marshal.dump.
+  def dump(table)  # :nodoc:
+    Marshal::dump(table)
+  end
+
+  # This method is just a wrapped around Marshal.load.
+  def load(content)  # :nodoc:
+    Marshal::load(content)
+  end
+
+  # This method is just a wrapped around Marshal.load.
+  def load_file(file)  # :nodoc:
+    Marshal::load(file)
+  end
+
+  private
+  # Commits changes to the data store file.
+  def commit_new(f)
+    f.truncate(0)
+    f.rewind
+    new_file = @filename + ".new"
+    File.open(new_file, RD_ACCESS) do |nf|
+      FileUtils.copy_stream(nf, f)
+    end
+    File.unlink(new_file)
+  end
+end
+
+# :enddoc:
+
+if __FILE__ == $0
+  db = PStore.new("/tmp/foo")
+  db.transaction do
+    p db.roots
+    ary = db["root"] = [1,2,3,4]
+    ary[1] = [1,1.5]
+  end
+
+  1000.times do
+    db.transaction do
+      db["root"][0] += 1
+      p db["root"][0]
+    end
+  end
+
+  db.transaction(true) do
+    p db["root"]
+  end
+end
diff --git a/ruby_1_8_6/lib/racc/parser.rb b/ruby_1_8_6/lib/racc/parser.rb
new file mode 100644
index 0000000000..a7408dd00a
--- /dev/null
+++ b/ruby_1_8_6/lib/racc/parser.rb
@@ -0,0 +1,442 @@
+#
+# $originalId: parser.rb,v 1.8 2006/07/06 11:42:07 aamine Exp $
+#
+# Copyright (c) 1999-2006 Minero Aoki
+#
+# This program is free software.
+# You can distribute/modify this program under the same terms of ruby.
+#
+# As a special exception, when this code is copied by Racc
+# into a Racc output file, you may use that output file
+# without restriction.
+#
+
+unless defined?(NotImplementedError)
+  NotImplementedError = NotImplementError
+end
+
+module Racc
+  class ParseError < StandardError; end
+end
+unless defined?(::ParseError)
+  ParseError = Racc::ParseError
+end
+
+module Racc
+
+  unless defined?(Racc_No_Extentions)
+    Racc_No_Extentions = false
+  end
+
+  class Parser
+
+    Racc_Runtime_Version = '1.4.5'
+    Racc_Runtime_Revision = '$originalRevision: 1.8 $'.split[1]
+
+    Racc_Runtime_Core_Version_R = '1.4.5'
+    Racc_Runtime_Core_Revision_R = '$originalRevision: 1.8 $'.split[1]
+    begin
+      require 'racc/cparse'
+    # Racc_Runtime_Core_Version_C  = (defined in extention)
+      Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split[2]
+      unless new.respond_to?(:_racc_do_parse_c, true)
+        raise LoadError, 'old cparse.so'
+      end
+      if Racc_No_Extentions
+        raise LoadError, 'selecting ruby version of racc runtime core'
+      end
+
+      Racc_Main_Parsing_Routine    = :_racc_do_parse_c
+      Racc_YY_Parse_Method         = :_racc_yyparse_c
+      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_C
+      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_C
+      Racc_Runtime_Type            = 'c'
+    rescue LoadError
+      Racc_Main_Parsing_Routine    = :_racc_do_parse_rb
+      Racc_YY_Parse_Method         = :_racc_yyparse_rb
+      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_R
+      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_R
+      Racc_Runtime_Type            = 'ruby'
+    end
+
+    def Parser.racc_runtime_type
+      Racc_Runtime_Type
+    end
+
+    private
+
+    def _racc_setup
+      @yydebug = false unless self.class::Racc_debug_parser
+      @yydebug = false unless defined?(@yydebug)
+      if @yydebug
+        @racc_debug_out = $stderr unless defined?(@racc_debug_out)
+        @racc_debug_out ||= $stderr
+      end
+      arg = self.class::Racc_arg
+      arg[13] = true if arg.size < 14
+      arg
+    end
+
+    def _racc_init_sysvars
+      @racc_state  = [0]
+      @racc_tstack = []
+      @racc_vstack = []
+
+      @racc_t = nil
+      @racc_val = nil
+
+      @racc_read_next = true
+
+      @racc_user_yyerror = false
+      @racc_error_status = 0
+    end
+
+    ###
+    ### do_parse
+    ###
+
+    def do_parse
+      __send__(Racc_Main_Parsing_Routine, _racc_setup(), false)
+    end
+
+    def next_token
+      raise NotImplementedError, "#{self.class}\#next_token is not defined"
+    end
+
+    def _racc_do_parse_rb(arg, in_debug)
+      action_table, action_check, action_default, action_pointer,
+      goto_table,   goto_check,   goto_default,   goto_pointer,
+      nt_base,      reduce_table, token_table,    shift_n,
+      reduce_n,     use_result,   * = arg
+
+      _racc_init_sysvars
+      tok = act = i = nil
+      nerr = 0
+
+      catch(:racc_end_parse) {
+        while true
+          if i = action_pointer[@racc_state[-1]]
+            if @racc_read_next
+              if @racc_t != 0   # not EOF
+                tok, @racc_val = next_token()
+                unless tok      # EOF
+                  @racc_t = 0
+                else
+                  @racc_t = (token_table[tok] or 1)   # error token
+                end
+                racc_read_token(@racc_t, tok, @racc_val) if @yydebug
+                @racc_read_next = false
+              end
+            end
+            i += @racc_t
+            unless i >= 0 and
+                   act = action_table[i] and
+                   action_check[i] == @racc_state[-1]
+              act = action_default[@racc_state[-1]]
+            end
+          else
+            act = action_default[@racc_state[-1]]
+          end
+          while act = _racc_evalact(act, arg)
+            ;
+          end
+        end
+      }
+    end
+
+    ###
+    ### yyparse
+    ###
+
+    def yyparse(recv, mid)
+      __send__(Racc_YY_Parse_Method, recv, mid, _racc_setup(), true)
+    end
+
+    def _racc_yyparse_rb(recv, mid, arg, c_debug)
+      action_table, action_check, action_default, action_pointer,
+      goto_table,   goto_check,   goto_default,   goto_pointer,
+      nt_base,      reduce_table, token_table,    shift_n,
+      reduce_n,     use_result,   * = arg
+
+      _racc_init_sysvars
+      tok = nil
+      act = nil
+      i = nil
+      nerr = 0
+
+      catch(:racc_end_parse) {
+        until i = action_pointer[@racc_state[-1]]
+          while act = _racc_evalact(action_default[@racc_state[-1]], arg)
+            ;
+          end
+        end
+        recv.__send__(mid) do |tok, val|
+          unless tok
+            @racc_t = 0
+          else
+            @racc_t = (token_table[tok] or 1)   # error token
+          end
+          @racc_val = val
+          @racc_read_next = false
+
+          i += @racc_t
+          unless i >= 0 and
+                 act = action_table[i] and
+                 action_check[i] == @racc_state[-1]
+            act = action_default[@racc_state[-1]]
+          end
+          while act = _racc_evalact(act, arg)
+            ;
+          end
+
+          while not (i = action_pointer[@racc_state[-1]]) or
+                not @racc_read_next or
+                @racc_t == 0   # $
+            unless i and i += @racc_t and
+                   i >= 0 and
+                   act = action_table[i] and
+                   action_check[i] == @racc_state[-1]
+              act = action_default[@racc_state[-1]]
+            end
+            while act = _racc_evalact(act, arg)
+              ;
+            end
+          end
+        end
+      }
+    end
+
+    ###
+    ### common
+    ###
+
+    def _racc_evalact(act, arg)
+      action_table, action_check, action_default, action_pointer,
+      goto_table,   goto_check,   goto_default,   goto_pointer,
+      nt_base,      reduce_table, token_table,    shift_n,
+      reduce_n,     use_result,   * = arg
+      nerr = 0   # tmp
+
+      if act > 0 and act < shift_n
+        #
+        # shift
+        #
+        if @racc_error_status > 0
+          @racc_error_status -= 1 unless @racc_t == 1   # error token
+        end
+        @racc_vstack.push @racc_val
+        @racc_state.push act
+        @racc_read_next = true
+        if @yydebug
+          @racc_tstack.push @racc_t
+          racc_shift @racc_t, @racc_tstack, @racc_vstack
+        end
+
+      elsif act < 0 and act > -reduce_n
+        #
+        # reduce
+        #
+        code = catch(:racc_jump) {
+          @racc_state.push _racc_do_reduce(arg, act)
+          false
+        }
+        if code
+          case code
+          when 1 # yyerror
+            @racc_user_yyerror = true   # user_yyerror
+            return -reduce_n
+          when 2 # yyaccept
+            return shift_n
+          else
+            raise '[Racc Bug] unknown jump code'
+          end
+        end
+
+      elsif act == shift_n
+        #
+        # accept
+        #
+        racc_accept if @yydebug
+        throw :racc_end_parse, @racc_vstack[0]
+
+      elsif act == -reduce_n
+        #
+        # error
+        #
+        case @racc_error_status
+        when 0
+          unless arg[21]    # user_yyerror
+            nerr += 1
+            on_error @racc_t, @racc_val, @racc_vstack
+          end
+        when 3
+          if @racc_t == 0   # is $
+            throw :racc_end_parse, nil
+          end
+          @racc_read_next = true
+        end
+        @racc_user_yyerror = false
+        @racc_error_status = 3
+        while true
+          if i = action_pointer[@racc_state[-1]]
+            i += 1   # error token
+            if  i >= 0 and
+                (act = action_table[i]) and
+                action_check[i] == @racc_state[-1]
+              break
+            end
+          end
+          throw :racc_end_parse, nil if @racc_state.size <= 1
+          @racc_state.pop
+          @racc_vstack.pop
+          if @yydebug
+            @racc_tstack.pop
+            racc_e_pop @racc_state, @racc_tstack, @racc_vstack
+          end
+        end
+        return act
+
+      else
+        raise "[Racc Bug] unknown action #{act.inspect}"
+      end
+
+      racc_next_state(@racc_state[-1], @racc_state) if @yydebug
+
+      nil
+    end
+
+    def _racc_do_reduce(arg, act)
+      action_table, action_check, action_default, action_pointer,
+      goto_table,   goto_check,   goto_default,   goto_pointer,
+      nt_base,      reduce_table, token_table,    shift_n,
+      reduce_n,     use_result,   * = arg
+      state = @racc_state
+      vstack = @racc_vstack
+      tstack = @racc_tstack
+
+      i = act * -3
+      len       = reduce_table[i]
+      reduce_to = reduce_table[i+1]
+      method_id = reduce_table[i+2]
+      void_array = []
+
+      tmp_t = tstack[-len, len] if @yydebug
+      tmp_v = vstack[-len, len]
+      tstack[-len, len] = void_array if @yydebug
+      vstack[-len, len] = void_array
+      state[-len, len]  = void_array
+
+      # tstack must be updated AFTER method call
+      if use_result
+        vstack.push __send__(method_id, tmp_v, vstack, tmp_v[0])
+      else
+        vstack.push __send__(method_id, tmp_v, vstack)
+      end
+      tstack.push reduce_to
+
+      racc_reduce(tmp_t, reduce_to, tstack, vstack) if @yydebug
+
+      k1 = reduce_to - nt_base
+      if i = goto_pointer[k1]
+        i += state[-1]
+        if i >= 0 and (curstate = goto_table[i]) and goto_check[i] == k1
+          return curstate
+        end
+      end
+      goto_default[k1]
+    end
+
+    def on_error(t, val, vstack)
+      raise ParseError, sprintf("\nparse error on value %s (%s)",
+                                val.inspect, token_to_str(t) || '?')
+    end
+
+    def yyerror
+      throw :racc_jump, 1
+    end
+
+    def yyaccept
+      throw :racc_jump, 2
+    end
+
+    def yyerrok
+      @racc_error_status = 0
+    end
+
+    #
+    # for debugging output
+    #
+
+    def racc_read_token(t, tok, val)
+      @racc_debug_out.print 'read    '
+      @racc_debug_out.print tok.inspect, '(', racc_token2str(t), ') '
+      @racc_debug_out.puts val.inspect
+      @racc_debug_out.puts
+    end
+
+    def racc_shift(tok, tstack, vstack)
+      @racc_debug_out.puts "shift   #{racc_token2str tok}"
+      racc_print_stacks tstack, vstack
+      @racc_debug_out.puts
+    end
+
+    def racc_reduce(toks, sim, tstack, vstack)
+      out = @racc_debug_out
+      out.print 'reduce '
+      if toks.empty?
+        out.print ' <none>'
+      else
+        toks.each {|t| out.print ' ', racc_token2str(t) }
+      end
+      out.puts " --> #{racc_token2str(sim)}"
+          
+      racc_print_stacks tstack, vstack
+      @racc_debug_out.puts
+    end
+
+    def racc_accept
+      @racc_debug_out.puts 'accept'
+      @racc_debug_out.puts
+    end
+
+    def racc_e_pop(state, tstack, vstack)
+      @racc_debug_out.puts 'error recovering mode: pop token'
+      racc_print_states state
+      racc_print_stacks tstack, vstack
+      @racc_debug_out.puts
+    end
+
+    def racc_next_state(curstate, state)
+      @racc_debug_out.puts  "goto    #{curstate}"
+      racc_print_states state
+      @racc_debug_out.puts
+    end
+
+    def racc_print_stacks(t, v)
+      out = @racc_debug_out
+      out.print '        ['
+      t.each_index do |i|
+        out.print ' (', racc_token2str(t[i]), ' ', v[i].inspect, ')'
+      end
+      out.puts ' ]'
+    end
+
+    def racc_print_states(s)
+      out = @racc_debug_out
+      out.print '        ['
+      s.each {|st| out.print ' ', st }
+      out.puts ' ]'
+    end
+
+    def racc_token2str(tok)
+      self.class::Racc_token_to_s_table[tok] or
+          raise "[Racc Bug] can't convert token #{tok} to string"
+    end
+
+    def token_to_str(t)
+      self.class::Racc_token_to_s_table[t]
+    end
+
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rational.rb b/ruby_1_8_6/lib/rational.rb
new file mode 100644
index 0000000000..ce754cfa3c
--- /dev/null
+++ b/ruby_1_8_6/lib/rational.rb
@@ -0,0 +1,530 @@
+#
+#   rational.rb -
+#       $Release Version: 0.5 $
+#       $Revision: 1.7 $
+#       $Date: 1999/08/24 12:49:28 $
+#       by Keiju ISHITSUKA(SHL Japan Inc.)
+#
+# Documentation by Kevin Jackson and Gavin Sinclair.
+# 
+# When you <tt>require 'rational'</tt>, all interactions between numbers
+# potentially return a rational result.  For example:
+#
+#   1.quo(2)              # -> 0.5
+#   require 'rational'
+#   1.quo(2)              # -> Rational(1,2)
+# 
+# See Rational for full documentation.
+#
+
+
+#
+# Creates a Rational number (i.e. a fraction).  +a+ and +b+ should be Integers:
+# 
+#   Rational(1,3)           # -> 1/3
+#
+# Note: trying to construct a Rational with floating point or real values
+# produces errors:
+#
+#   Rational(1.1, 2.3)      # -> NoMethodError
+#
+def Rational(a, b = 1)
+  if a.kind_of?(Rational) && b == 1
+    a
+  else
+    Rational.reduce(a, b)
+  end
+end
+
+#
+# Rational implements a rational class for numbers.
+#
+# <em>A rational number is a number that can be expressed as a fraction p/q
+# where p and q are integers and q != 0.  A rational number p/q is said to have
+# numerator p and denominator q.  Numbers that are not rational are called
+# irrational numbers.</em> (http://mathworld.wolfram.com/RationalNumber.html)
+#
+# To create a Rational Number:
+#   Rational(a,b)             # -> a/b
+#   Rational.new!(a,b)        # -> a/b
+#
+# Examples:
+#   Rational(5,6)             # -> 5/6
+#   Rational(5)               # -> 5/1
+# 
+# Rational numbers are reduced to their lowest terms:
+#   Rational(6,10)            # -> 3/5
+#
+# But not if you use the unusual method "new!":
+#   Rational.new!(6,10)       # -> 6/10
+#
+# Division by zero is obviously not allowed:
+#   Rational(3,0)             # -> ZeroDivisionError
+#
+class Rational < Numeric
+  @RCS_ID='-$Id: rational.rb,v 1.7 1999/08/24 12:49:28 keiju Exp keiju $-'
+
+  #
+  # Reduces the given numerator and denominator to their lowest terms.  Use
+  # Rational() instead.
+  #
+  def Rational.reduce(num, den = 1)
+    raise ZeroDivisionError, "denominator is zero" if den == 0
+
+    if den < 0
+      num = -num
+      den = -den
+    end
+    gcd = num.gcd(den)
+    num = num.div(gcd)
+    den = den.div(gcd)
+    if den == 1 && defined?(Unify)
+      num
+    else
+      new!(num, den)
+    end
+  end
+
+  #
+  # Implements the constructor.  This method does not reduce to lowest terms or
+  # check for division by zero.  Therefore #Rational() should be preferred in
+  # normal use.
+  #
+  def Rational.new!(num, den = 1)
+    new(num, den)
+  end
+
+  private_class_method :new
+
+  #
+  # This method is actually private.
+  #
+  def initialize(num, den)
+    if den < 0
+      num = -num
+      den = -den
+    end
+    if num.kind_of?(Integer) and den.kind_of?(Integer)
+      @numerator = num
+      @denominator = den
+    else
+      @numerator = num.to_i
+      @denominator = den.to_i
+    end
+  end
+
+  #
+  # Returns the addition of this value and +a+.
+  #
+  # Examples:
+  #   r = Rational(3,4)      # -> Rational(3,4)
+  #   r + 1                  # -> Rational(7,4)
+  #   r + 0.5                # -> 1.25
+  #
+  def + (a)
+    if a.kind_of?(Rational)
+      num = @numerator * a.denominator
+      num_a = a.numerator * @denominator
+      Rational(num + num_a, @denominator * a.denominator)
+    elsif a.kind_of?(Integer)
+      self + Rational.new!(a, 1)
+    elsif a.kind_of?(Float)
+      Float(self) + a
+    else
+      x, y = a.coerce(self)
+      x + y
+    end
+  end
+
+  #
+  # Returns the difference of this value and +a+.
+  # subtracted.
+  #
+  # Examples:
+  #   r = Rational(3,4)    # -> Rational(3,4)
+  #   r - 1                # -> Rational(-1,4)
+  #   r - 0.5              # -> 0.25
+  #
+  def - (a)
+    if a.kind_of?(Rational)
+      num = @numerator * a.denominator
+      num_a = a.numerator * @denominator
+      Rational(num - num_a, @denominator*a.denominator)
+    elsif a.kind_of?(Integer)
+      self - Rational.new!(a, 1)
+    elsif a.kind_of?(Float)
+      Float(self) - a
+    else
+      x, y = a.coerce(self)
+      x - y
+    end
+  end
+
+  #
+  # Returns the product of this value and +a+.
+  #
+  # Examples:
+  #   r = Rational(3,4)    # -> Rational(3,4)
+  #   r * 2                # -> Rational(3,2)
+  #   r * 4                # -> Rational(3,1)
+  #   r * 0.5              # -> 0.375
+  #   r * Rational(1,2)    # -> Rational(3,8)
+  #
+  def * (a)
+    if a.kind_of?(Rational)
+      num = @numerator * a.numerator
+      den = @denominator * a.denominator
+      Rational(num, den)
+    elsif a.kind_of?(Integer)
+      self * Rational.new!(a, 1)
+    elsif a.kind_of?(Float)
+      Float(self) * a
+    else
+      x, y = a.coerce(self)
+      x * y
+    end
+  end
+
+  #
+  # Returns the quotient of this value and +a+.
+  #   r = Rational(3,4)    # -> Rational(3,4)
+  #   r / 2                # -> Rational(3,8)
+  #   r / 2.0              # -> 0.375
+  #   r / Rational(1,2)    # -> Rational(3,2)
+  #
+  def / (a)
+    if a.kind_of?(Rational)
+      num = @numerator * a.denominator
+      den = @denominator * a.numerator
+      Rational(num, den)
+    elsif a.kind_of?(Integer)
+      raise ZeroDivisionError, "division by zero" if a == 0
+      self / Rational.new!(a, 1)
+    elsif a.kind_of?(Float)
+      Float(self) / a
+    else
+      x, y = a.coerce(self)
+      x / y
+    end
+  end
+
+  #
+  # Returns this value raised to the given power.
+  #
+  # Examples:
+  #   r = Rational(3,4)    # -> Rational(3,4)
+  #   r ** 2               # -> Rational(9,16)
+  #   r ** 2.0             # -> 0.5625
+  #   r ** Rational(1,2)   # -> 0.866025403784439
+  #
+  def ** (other)
+    if other.kind_of?(Rational)
+      Float(self) ** other
+    elsif other.kind_of?(Integer)
+      if other > 0
+	num = @numerator ** other
+	den = @denominator ** other
+      elsif other < 0
+	num = @denominator ** -other
+	den = @numerator ** -other
+      elsif other == 0
+	num = 1
+	den = 1
+      end
+      Rational.new!(num, den)
+    elsif other.kind_of?(Float)
+      Float(self) ** other
+    else
+      x, y = other.coerce(self)
+      x ** y
+    end
+  end
+
+  #
+  # Returns the remainder when this value is divided by +other+.
+  #
+  # Examples:
+  #   r = Rational(7,4)    # -> Rational(7,4)
+  #   r % Rational(1,2)    # -> Rational(1,4)
+  #   r % 1                # -> Rational(3,4)
+  #   r % Rational(1,7)    # -> Rational(1,28)
+  #   r % 0.26             # -> 0.19
+  #
+  def % (other)
+    value = (self / other).to_i
+    return self - other * value
+  end
+
+  #
+  # Returns the quotient _and_ remainder.
+  #
+  # Examples:
+  #   r = Rational(7,4)        # -> Rational(7,4)
+  #   r.divmod Rational(1,2)   # -> [3, Rational(1,4)]
+  #
+  def divmod(other)
+    value = (self / other).to_i
+    return value, self - other * value
+  end
+
+  #
+  # Returns the absolute value.
+  #
+  def abs
+    if @numerator > 0
+      Rational.new!(@numerator, @denominator)
+    else
+      Rational.new!(-@numerator, @denominator)
+    end
+  end
+
+  #
+  # Returns +true+ iff this value is numerically equal to +other+.
+  #
+  # But beware:
+  #   Rational(1,2) == Rational(4,8)          # -> true
+  #   Rational(1,2) == Rational.new!(4,8)     # -> false
+  #
+  # Don't use Rational.new!
+  #
+  def == (other)
+    if other.kind_of?(Rational)
+      @numerator == other.numerator and @denominator == other.denominator
+    elsif other.kind_of?(Integer)
+      self == Rational.new!(other, 1)
+    elsif other.kind_of?(Float)
+      Float(self) == other
+    else
+      other == self
+    end
+  end
+
+  #
+  # Standard comparison operator.
+  #
+  def <=> (other)
+    if other.kind_of?(Rational)
+      num = @numerator * other.denominator
+      num_a = other.numerator * @denominator
+      v = num - num_a
+      if v > 0
+	return 1
+      elsif v < 0
+	return  -1
+      else
+	return 0
+      end
+    elsif other.kind_of?(Integer)
+      return self <=> Rational.new!(other, 1)
+    elsif other.kind_of?(Float)
+      return Float(self) <=> other
+    elsif defined? other.coerce
+      x, y = other.coerce(self)
+      return x <=> y
+    else
+      return nil
+    end
+  end
+
+  def coerce(other)
+    if other.kind_of?(Float)
+      return other, self.to_f
+    elsif other.kind_of?(Integer)
+      return Rational.new!(other, 1), self
+    else
+      super
+    end
+  end
+
+  #
+  # Converts the rational to an Integer.  Not the _nearest_ integer, the
+  # truncated integer.  Study the following example carefully:
+  #   Rational(+7,4).to_i             # -> 1
+  #   Rational(-7,4).to_i             # -> -2
+  #   (-1.75).to_i                    # -> -1
+  #
+  # In other words:
+  #   Rational(-7,4) == -1.75                 # -> true
+  #   Rational(-7,4).to_i == (-1.75).to_i     # false
+  #
+  def to_i
+    Integer(@numerator.div(@denominator))
+  end
+
+  #
+  # Converts the rational to a Float.
+  #
+  def to_f
+    @numerator.to_f/@denominator.to_f
+  end
+
+  #
+  # Returns a string representation of the rational number.
+  #
+  # Example:
+  #   Rational(3,4).to_s          #  "3/4"
+  #   Rational(8).to_s            #  "8"
+  #
+  def to_s
+    if @denominator == 1
+      @numerator.to_s
+    else
+      @numerator.to_s+"/"+@denominator.to_s
+    end
+  end
+
+  #
+  # Returns +self+.
+  #
+  def to_r
+    self
+  end
+
+  #
+  # Returns a reconstructable string representation:
+  #
+  #   Rational(5,8).inspect     # -> "Rational(5, 8)"
+  #
+  def inspect
+    sprintf("Rational(%s, %s)", @numerator.inspect, @denominator.inspect)
+  end
+
+  #
+  # Returns a hash code for the object.
+  #
+  def hash
+    @numerator.hash ^ @denominator.hash
+  end
+
+  attr :numerator
+  attr :denominator
+
+  private :initialize
+end
+
+class Integer
+  #
+  # In an integer, the value _is_ the numerator of its rational equivalent.
+  # Therefore, this method returns +self+.
+  #
+  def numerator
+    self
+  end
+
+  #
+  # In an integer, the denominator is 1.  Therefore, this method returns 1.
+  #
+  def denominator
+    1
+  end
+
+  #
+  # Returns a Rational representation of this integer.
+  #
+  def to_r
+    Rational(self, 1)
+  end
+
+  #
+  # Returns the <em>greatest common denominator</em> of the two numbers (+self+
+  # and +n+).
+  #
+  # Examples:
+  #   72.gcd 168           # -> 24
+  #   19.gcd 36            # -> 1
+  #
+  # The result is positive, no matter the sign of the arguments.
+  #
+  def gcd(other)
+    min = self.abs
+    max = other.abs
+    while min > 0
+      tmp = min
+      min = max % min
+      max = tmp
+    end
+    max
+  end
+
+  #
+  # Returns the <em>lowest common multiple</em> (LCM) of the two arguments
+  # (+self+ and +other+).
+  #
+  # Examples:
+  #   6.lcm 7        # -> 42
+  #   6.lcm 9        # -> 18
+  #
+  def lcm(other)
+    if self.zero? or other.zero?
+      0
+    else
+      (self.div(self.gcd(other)) * other).abs
+    end
+  end
+
+  #
+  # Returns the GCD _and_ the LCM (see #gcd and #lcm) of the two arguments
+  # (+self+ and +other+).  This is more efficient than calculating them
+  # separately.
+  #
+  # Example:
+  #   6.gcdlcm 9     # -> [3, 18]
+  #
+  def gcdlcm(other)
+    gcd = self.gcd(other)
+    if self.zero? or other.zero?
+      [gcd, 0]
+    else
+      [gcd, (self.div(gcd) * other).abs]
+    end
+  end
+end
+
+class Fixnum
+  undef quo
+  # If Rational is defined, returns a Rational number instead of a Fixnum.
+  def quo(other)
+    Rational.new!(self,1) / other
+  end
+  alias rdiv quo
+
+  # Returns a Rational number if the result is in fact rational (i.e. +other+ < 0).
+  def rpower (other)
+    if other >= 0
+      self.power!(other)
+    else
+      Rational.new!(self,1)**other
+    end
+  end
+
+  unless defined? 1.power!
+    alias power! **
+    alias ** rpower
+  end
+end
+
+class Bignum
+  unless defined? Complex
+    alias power! **
+  end
+
+  undef quo
+  # If Rational is defined, returns a Rational number instead of a Bignum.
+  def quo(other)
+    Rational.new!(self,1) / other
+  end
+  alias rdiv quo
+
+  # Returns a Rational number if the result is in fact rational (i.e. +other+ < 0).
+  def rpower (other)
+    if other >= 0
+      self.power!(other)
+    else
+      Rational.new!(self, 1)**other
+    end
+  end
+
+  unless defined? Complex
+    alias ** rpower
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/README b/ruby_1_8_6/lib/rdoc/README
new file mode 100644
index 0000000000..89ea0fbd3f
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/README
@@ -0,0 +1,489 @@
+= RDOC - Ruby Documentation System
+
+This package contains Rdoc and SimpleMarkup. Rdoc is an application
+that produces documentation for one or more Ruby source files. We work
+similarly to JavaDoc, parsing the source, and extracting the
+definition for classes, modules, and methods (along with includes and
+requires).  We associate with these optional documentation contained
+in the immediately preceding comment block, and then render the result
+using a pluggable output formatter. (Currently, HTML is the only
+supported format. Markup is a library that converts plain text into
+various output formats. The Markup library is used to interpret the
+comment blocks that Rdoc uses to document methods, classes, and so on.
+
+This library contains two packages, rdoc itself and a text markup
+library, 'markup'. 
+
+== Roadmap
+
+* If you want to use Rdoc to create documentation for your Ruby source
+  files, read on.
+* If you want to include extensions written in C, see rdoc/parsers/parse_c.rb.
+* For information on the various markups available in comment
+  blocks, see markup/simple_markup.rb.
+* If you want to drive Rdoc programatically, see RDoc::RDoc.
+* If you want to use the library to format text blocks into HTML,
+  have a look at SM::SimpleMarkup.
+* If you want to try writing your own HTML output template, see
+  RDoc::Page.
+
+== Summary
+
+Once installed, you can create documentation using the 'rdoc' command
+(the command is 'rdoc.bat' under Windows)
+
+  % rdoc [options]  [names...]
+
+Type "rdoc --help" for an up-to-date option summary.
+
+A typical use might be to generate documentation for a package of Ruby
+source (such as rdoc itself). 
+
+  % rdoc
+
+This command generates documentation for all the Ruby and C source
+files in and below the current directory. These will be stored in a
+documentation tree starting in the subdirectory 'doc'.
+
+You can make this slightly more useful for your readers by having the
+index page contain the documentation for the primary file. In our
+case, we could type
+
+  % rdoc --main rdoc/rdoc.rb
+
+You'll find information on the various formatting tricks you can use
+in comment blocks in the documentation this generates.
+
+RDoc uses file extensions to determine how to process each file. File
+names ending <tt>.rb</tt> and <tt>.rbw</tt> are assumed to be Ruby
+source. Files ending <tt>.c</tt> are parsed as C files. All other
+files are assumed to contain just SimpleMarkup-style markup (with or
+without leading '#' comment markers). If directory names are passed to
+RDoc, they are scanned recursively for C and Ruby source files only.
+
+== Credits
+
+* The Ruby parser in rdoc/parse.rb is based heavily on the outstanding
+  work of Keiju ISHITSUKA of Nippon Rational Inc, who produced the Ruby
+  parser for irb and the rtags package.
+
+* Code to diagram classes and modules was written by Sergey A Yanovitsky
+  (Jah) of Enticla. 
+
+* Charset patch from MoonWolf.
+
+* Rich Kilmer wrote the kilmer.rb output template.
+
+* Dan Brickley led the design of the RDF format.
+
+== License
+
+RDoc is Copyright (c) 2001-2003 Dave Thomas, The Pragmatic Programmers.  It
+is free software, and may be redistributed under the terms specified
+in the README file of the Ruby distribution.
+
+= Usage
+
+RDoc is invoked from the command line using:
+
+   % rdoc <options> [name...]
+
+Files are parsed, and the information they contain collected, before
+any output is produced. This allows cross references between all files
+to be resolved. If a name is a directory, it is traversed. If no
+names are specified, all Ruby files in the current directory (and
+subdirectories) are processed.
+
+Options are:
+
+[<tt>--accessor</tt> <i>name[,name...]</i>]
+    specifies the name(s) of additional methods that should be treated
+    as if they were <tt>attr_</tt><i>xxx</i> methods. Specifying
+    "--accessor db_opt" means lines such as
+
+         db_opt :name, :age
+  
+    will get parsed and displayed in the documentation. Each name may have an
+    optional "=flagtext" appended, in which case the given flagtext will appear
+    where (for example) the 'rw' appears for attr_accessor.
+
+[<tt>--all</tt>]
+    include protected and private methods in the output (by default
+    only public methods are included)
+
+[<tt>--charset</tt> _charset_]
+    Set the character set for the generated HTML.
+
+[<tt>--diagram</tt>]
+    include diagrams showing modules and classes.  This is currently
+    an experimental feature, and may not be supported by all output
+    templates. You need dot V1.8.6 or later to use the --diagram
+    option correctly (http://www.research.att.com/sw/tools/graphviz/).
+
+[<tt>--exclude</tt> <i>pattern</i>]
+    exclude files and directories matching this pattern from processing
+
+[<tt>--extension</tt> <i>new=old</i>]
+    treat files ending <i>.new</i> as if they ended
+    <i>.old</i>. Saying '--extension cgi=rb' causes RDoc to treat .cgi
+    files as Ruby source.
+
+[<tt>fileboxes</tt>]
+    Classes are put in boxes which represents files, where these
+    classes reside. Classes shared between more than one file are
+    shown with list of files that sharing them.  Silently discarded if
+    --diagram is not given Experimental.
+
+[<tt>--fmt</tt> _fmt_]
+    generate output in a particular format.
+
+[<tt>--help</tt>]
+    generate a usage summary.
+
+[<tt>--help-output</tt>]
+    explain the various output options.
+
+[<tt>--image-format</tt> <i>gif/png/jpg/jpeg</i>]
+    sets output image format for diagrams. Can be png, gif, jpeg,
+    jpg. If this option is omitted, png is used. Requires --diagram.
+
+[<tt>--include</tt> <i>dir,...</i>]
+    specify one or more directories to be searched when satisfying
+    :+include+: directives. Multiple <tt>--include</tt> options may be
+    given. The directory containing the file currently being processed
+    is always searched.
+
+[<tt>--inline-source</tt>]
+    By default, the source code of methods is shown in a popup. With
+    this option, it's displayed inline.
+
+[<tt>line-numbers</tt>]
+    include line numbers in the source code
+
+[<tt>--main</tt> _name_]
+    the class of module _name_ will appear on the index page. If you
+    want to set a particular file as a main page (a README, for
+    example) simply specifiy its name as the first on the command
+    line.
+
+[<tt>--merge</tt>]
+    when generating _ri_ output, if classes being processed already
+    exist in the destination directory, merge in the current details
+    rather than overwrite them.
+
+[<tt>--one-file</tt>]
+    place all the output into a single file
+
+[<tt>--op</tt> _dir_]
+    set the output directory to _dir_ (the default is the directory
+    "doc")
+
+[<tt>--op-name</tt> _name_]
+    set the name of the output. Has no effect for HTML.
+    "doc")
+
+[<tt>--opname</tt> _name_]
+    set the output name (has no effect for HTML).
+
+[<tt>--promiscuous</tt>]
+    If a module or class is defined in more than one source file, and
+    you click on a particular file's name in the top navigation pane,
+    RDoc will normally only show you the inner classes and modules of
+    that class that are defined in the particular file. Using this
+    option makes it show all classes and modules defined in the class,
+    regardless of the file they were defined in.
+
+[<tt>--quiet</tt>]
+    do not display progress messages
+
+[<tt>--ri</tt>, <tt>--ri-site</tt>, _and_ <tt>--ri-system</tt>]
+    generate output than can be read by the _ri_ command-line tool.
+    By default --ri places its output in ~/.rdoc, --ri-site in
+    $datadir/ri/<ver>/site, and --ri-system in
+    $datadir/ri/<ver>/system. All can be overridden with a subsequent
+    --op option. All default directories are in ri's default search
+    path.
+
+[<tt>--show-hash</tt>]
+    A name of the form #name in a comment is a possible hyperlink to
+    an instance method name. When displayed, the '#' is removed unless
+    this option is specified
+
+[<tt>--style</tt> <i>stylesheet url</i>]
+    specifies the URL of an external stylesheet to use (rather than
+    generating one of our own)
+
+[<tt>tab-width</tt> _n_]
+    set the width of tab characters (default 8)
+
+[<tt>--template</tt> <i>name</i>]
+    specify an alternate template to use when generating output (the
+    default is 'standard'). This template should be in a directory
+    accessible via $: as rdoc/generators/xxxx_template, where 'xxxx'
+    depends on the output formatter.
+
+[<tt>--version</tt>]
+   display  RDoc's version
+
+[<tt>--webcvs</tt> _url_]
+    Specify a URL for linking to a web frontend to CVS. If the URL
+    contains a '\%s', the name of the current file will be
+    substituted; if the URL doesn't contain a '\%s', the filename will
+    be appended to it.
+
+= Example
+
+A typical small Ruby program commented using RDoc might be as follows. You
+can see the formatted result in EXAMPLE.rb and Anagram.
+
+      :include: EXAMPLE.rb
+
+= Markup
+
+Comment blocks can be written fairly naturally, either using '#' on
+successive lines of the comment, or by including the comment in 
+an =begin/=end block. If you use the latter form, the =begin line
+must be flagged with an RDoc tag:
+
+  =begin rdoc
+  Documentation to 
+  be processed by RDoc.
+  =end
+
+Paragraphs are lines that share the left margin. Text indented past
+this margin are formatted verbatim.
+
+1. Lists are typed as indented paragraphs with:
+   * a '*' or '-' (for bullet lists)
+   * a digit followed by a period for 
+     numbered lists
+   * an upper or lower case letter followed
+     by a period for alpha lists.
+
+   For example, the input that produced the above paragraph looked like
+       1. Lists are typed as indented 
+          paragraphs with:
+          * a '*' or '-' (for bullet lists)
+          * a digit followed by a period for 
+            numbered lists
+          * an upper or lower case letter followed
+            by a period for alpha lists.
+
+2. Labeled lists (sometimes called description
+   lists) are typed using square brackets for the label.
+      [cat]   small domestic animal
+      [+cat+] command to copy standard input
+
+3. Labeled lists may also be produced by putting a double colon
+   after the label. This sets the result in tabular form, so the
+   descriptions all line up. This was used to create the 'author'
+   block at the bottom of this description.
+      cat::   small domestic animal
+      +cat+:: command to copy standard input
+
+   For both kinds of labeled lists, if the body text starts on the same
+   line as the label, then the start of that text determines the block
+   indent for the rest of the body. The text may also start on the line
+   following the label, indented from the start of the label. This is
+   often preferable if the label is long. Both the following are
+   valid labeled list entries:
+
+      <tt>--output</tt> <i>name [, name]</i>::
+          specify the name of one or more output files. If multiple
+          files are present, the first is used as the index.
+
+      <tt>--quiet:</tt>:: do not output the names, sizes, byte counts,
+                          index areas, or bit ratios of units as
+                          they are processed.
+
+4. Headings are entered using equals signs
+
+      = Level One Heading
+      == Level Two Heading
+   and so on
+
+5. Rules (horizontal lines) are entered using three or
+   more hyphens.
+
+6. Non-verbatim text can be marked up:
+
+   _italic_::     \_word_ or \<em>text</em>
+   *bold*::       \*word* or \<b>text</b>
+   +typewriter+:: \+word+ or \<tt>text</tt>
+
+   The first form only works around 'words', where a word is a
+   sequence of upper and lower case letters and underscores. Putting a
+   backslash before inline markup stops it being interpreted, which is
+   how I created the table above:
+
+     _italic_::     \_word_ or \<em>text</em>
+     *bold*::       \*word* or \<b>text</b>
+     +typewriter+:: \+word+ or \<tt>text</tt>
+
+7. Names of classes, source files, and any method names
+   containing an underscore or preceded by a hash
+   character are automatically hyperlinked from
+   comment text to their description. 
+
+8. Hyperlinks to the web starting http:, mailto:, ftp:, or www. are
+   recognized. An HTTP url that references an external image file is
+   converted into an inline <IMG..>.  Hyperlinks starting 'link:' are
+   assumed to refer to local files whose path is relative to the --op
+   directory.
+
+   Hyperlinks can also be of the form <tt>label</tt>[url], in which
+   case the label is used in the displayed text, and <tt>url</tt> is
+   used as the target. If <tt>label</tt> contains multiple words,
+   put it in braces: <em>{multi word label}[</em>url<em>]</em>.
+       
+9. Method parameter lists are extracted and displayed with
+   the method description. If a method calls +yield+, then
+   the parameters passed to yield will also be displayed:
+
+      def fred
+        ...
+        yield line, address
+
+   This will get documented as
+
+      fred() { |line, address| ... }
+
+   You can override this using a comment containing 
+   ':yields: ...' immediately after the method definition
+
+      def fred      # :yields: index, position
+        ...
+        yield line, address
+
+   which will get documented as
+
+       fred() { |index, position| ... }
+
+
+10. ':yields:' is an example of a documentation modifier. These appear
+    immediately after the start of the document element they are modifying.
+    Other modifiers include
+
+    [<tt>:nodoc:</tt><i>[all]</i>]
+         don't include this element in the documentation.  For classes
+         and modules, the methods, aliases, constants, and attributes
+         directly within the affected class or module will also be
+         omitted.  By default, though, modules and classes within that
+         class of module _will_ be documented. This is turned off by
+         adding the +all+ modifier.
+
+              module SM  #:nodoc:
+                class Input
+                end
+              end
+              module Markup #:nodoc: all
+                class Output
+                end
+              end
+
+         In the above code, only class <tt>SM::Input</tt> will be
+         documented.
+
+    [<tt>:doc:</tt>]
+         force a method or attribute to be documented even if it
+         wouldn't otherwise be. Useful if, for example, you want to
+         include documentation of a particular private method.
+
+    [<tt>:notnew:</tt>]
+         only applicable to the +initialize+ instance method. Normally
+         RDoc assumes that the documentation and parameters for
+         #initialize are actually for the ::new method, and so fakes
+         out a ::new for the class. THe :notnew: modifier stops
+         this. Remember that #initialize is protected, so you won't
+         see the documentation unless you use the -a command line
+         option.
+
+
+11. RDoc stops processing comments if it finds a comment
+    line containing '<tt>#--</tt>'. This can be used to 
+    separate external from internal comments, or 
+    to stop a comment being associated with a method, 
+    class, or module. Commenting can be turned back on with
+    a line that starts '<tt>#++</tt>'.
+
+        # Extract the age and calculate the
+        # date-of-birth.
+        #--
+        # FIXME: fails if the birthday falls on
+        # February 29th
+        #++
+        # The DOB is returned as a Time object.
+
+        def get_dob(person)
+           ...
+
+12. Comment blocks can contain other directives:
+
+    [<tt>:section: title</tt>]
+        Starts a new section in the output. The title following
+	<tt>:section:</tt> is used as the section heading, and the
+	remainder of the comment containing the section is used as
+	introductory text. Subsequent methods, aliases, attributes,
+	and classes will be documented in this section. A :section:
+	comment block may have one or more lines before the :section:
+	directive. These will be removed, and any identical lines at
+	the end of the block are also removed. This allows you to add
+	visual cues such as
+
+           # ----------------------------------------
+	   # :section: My Section
+	   # This is the section that I wrote.
+	   # See it glisten in the noon-day sun.
+           # ----------------------------------------
+
+    [<tt>call-seq:</tt>]
+        lines up to the next blank line in the comment are treated as
+        the method's calling sequence, overriding the
+        default parsing of method parameters and yield arguments.
+
+    [<tt>:include:</tt><i>filename</i>] 
+         include the contents of the named file at this point. The
+         file will be searched for in the directories listed by
+         the <tt>--include</tt> option, or in the current
+         directory by default.  The contents of the file will be
+         shifted to have the same indentation as the ':' at the
+         start of the :include: directive.
+
+    [<tt>:title:</tt><i>text</i>]
+         Sets the title for the document. Equivalent to the --title command
+         line parameter. (The command line parameter overrides any :title:
+         directive in the source).
+
+    [<tt>:enddoc:</tt>]
+         Document nothing further at the current level.
+
+    [<tt>:main:</tt><i>name</i>]
+         Equivalent to the --main command line parameter.
+
+    [<tt>:stopdoc: / :startdoc:</tt>]
+         Stop and start adding new documentation elements to the
+         current container. For example, if a class has a number of
+         constants that you don't want to document, put a
+         <tt>:stopdoc:</tt> before the first, and a
+         <tt>:startdoc:</tt> after the last. If you don't specifiy a
+         <tt>:startdoc:</tt> by the end of the container, disables
+         documentation for the entire class or module.
+
+
+---
+
+See also markup/simple_markup.rb.
+
+= Other stuff
+
+Author::   Dave Thomas <dave@pragmaticprogrammer.com>
+Requires:: Ruby 1.8.1 or later
+License::  Copyright (c) 2001-2003 Dave Thomas.
+           Released under the same license as Ruby.
+
+== Warranty
+
+This software is provided "as is" and without any express or
+implied warranties, including, without limitation, the implied
+warranties of merchantibility and fitness for a particular
+purpose.
diff --git a/ruby_1_8_6/lib/rdoc/code_objects.rb b/ruby_1_8_6/lib/rdoc/code_objects.rb
new file mode 100644
index 0000000000..d6c4f1bdb9
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/code_objects.rb
@@ -0,0 +1,765 @@
+# We represent the various high-level code constructs that appear
+# in Ruby programs: classes, modules, methods, and so on.
+
+require 'rdoc/tokenstream'
+
+module RDoc
+
+
+  # We contain the common stuff for contexts (which are containers)
+  # and other elements (methods, attributes and so on)
+  #
+  class CodeObject
+
+    attr_accessor :parent
+
+    # We are the model of the code, but we know that at some point
+    # we will be worked on by viewers. By implementing the Viewable
+    # protocol, viewers can associated themselves with these objects.
+
+    attr_accessor :viewer
+
+    # are we done documenting (ie, did we come across a :enddoc:)?
+
+    attr_accessor :done_documenting
+
+    # Which section are we in
+
+    attr_accessor :section
+
+    # do we document ourselves?
+
+    attr_reader :document_self
+
+    def document_self=(val)
+      @document_self = val
+      if !val
+	remove_methods_etc
+      end
+    end
+
+    # set and cleared by :startdoc: and :enddoc:, this is used to toggle
+    # the capturing of documentation
+    def start_doc
+      @document_self = true
+      @document_children = true
+    end
+
+    def stop_doc
+      @document_self = false
+      @document_children = false
+    end
+
+    # do we document ourselves and our children
+
+    attr_reader :document_children
+
+    def document_children=(val)
+      @document_children = val
+      if !val
+	remove_classes_and_modules
+      end
+    end
+
+    # Do we _force_ documentation, even is we wouldn't normally show the entity
+    attr_accessor :force_documentation
+
+    # Default callbacks to nothing, but this is overridden for classes
+    # and modules
+    def remove_classes_and_modules
+    end
+
+    def remove_methods_etc
+    end
+
+    def initialize
+      @document_self = true
+      @document_children = true
+      @force_documentation = false
+      @done_documenting = false
+    end
+
+    # Access the code object's comment
+    attr_reader :comment
+
+    # Update the comment, but don't overwrite a real comment
+    # with an empty one
+    def comment=(comment)
+      @comment = comment unless comment.empty?
+    end
+
+    # There's a wee trick we pull. Comment blocks can have directives that
+    # override the stuff we extract during the parse. So, we have a special
+    # class method, attr_overridable, that lets code objects list
+    # those directives. Wehn a comment is assigned, we then extract
+    # out any matching directives and update our object
+
+    def CodeObject.attr_overridable(name, *aliases)
+      @overridables ||= {}
+
+      attr_accessor name
+
+      aliases.unshift name
+      aliases.each do |directive_name|
+        @overridables[directive_name.to_s] = name
+      end
+    end
+
+  end
+
+  # A Context is something that can hold modules, classes, methods, 
+  # attributes, aliases, requires, and includes. Classes, modules, and
+  # files are all Contexts.
+
+  class Context < CodeObject
+    attr_reader   :name, :method_list, :attributes, :aliases, :constants
+    attr_reader   :requires, :includes, :in_files, :visibility
+
+    attr_reader   :sections
+
+    class Section
+      attr_reader :title, :comment, :sequence
+
+      @@sequence = "SEC00000"
+
+      def initialize(title, comment)
+        @title = title
+        @@sequence.succ!
+        @sequence = @@sequence.dup
+        set_comment(comment)
+      end
+
+      private
+
+      # Set the comment for this section from the original comment block
+      # If the first line contains :section:, strip it and use the rest. Otherwise
+      # remove lines up to the line containing :section:, and look for 
+      # those lines again at the end and remove them. This lets us write
+      #
+      #   # ---------------------
+      #   # :SECTION: The title
+      #   # The body
+      #   # ---------------------
+
+      def set_comment(comment)
+        return unless comment
+
+        if comment =~ /^.*?:section:.*$/
+          start = $`
+          rest = $'
+          if start.empty?
+            @comment = rest
+          else
+            @comment = rest.sub(/#{start.chomp}\Z/, '')
+          end
+        else
+          @comment = comment
+        end
+        @comment = nil if @comment.empty?
+      end
+    end
+
+
+    def initialize
+      super()
+
+      @in_files    = []
+
+      @name    ||= "unknown"
+      @comment ||= ""
+      @parent  = nil
+      @visibility = :public
+
+      @current_section = Section.new(nil, nil)
+      @sections = [ @current_section ]
+
+      initialize_methods_etc
+      initialize_classes_and_modules
+    end
+
+    # map the class hash to an array externally
+    def classes
+      @classes.values
+    end
+
+    # map the module hash to an array externally
+    def modules
+      @modules.values
+    end
+
+    # Change the default visibility for new methods
+    def ongoing_visibility=(vis)
+      @visibility = vis
+    end
+
+    # Given an array +methods+ of method names, set the
+    # visibility of the corresponding AnyMethod object
+
+    def set_visibility_for(methods, vis, singleton=false)
+      count = 0
+      @method_list.each do |m|
+        if methods.include?(m.name) && m.singleton == singleton
+          m.visibility = vis
+          count += 1
+        end
+      end
+
+      return if count == methods.size || singleton
+
+      # perhaps we need to look at attributes
+
+      @attributes.each do |a|
+        if methods.include?(a.name)
+          a.visibility = vis
+          count += 1
+        end
+      end
+    end
+
+    # Record the file that we happen to find it in
+    def record_location(toplevel)
+      @in_files << toplevel unless @in_files.include?(toplevel)
+    end
+
+    # Return true if at least part of this thing was defined in +file+
+    def defined_in?(file)
+      @in_files.include?(file)
+    end
+
+    def add_class(class_type, name, superclass)
+      add_class_or_module(@classes, class_type, name, superclass)
+    end
+
+    def add_module(class_type, name)
+      add_class_or_module(@modules, class_type, name, nil)
+    end
+
+    def add_method(a_method)
+      puts "Adding #@visibility method #{a_method.name} to #@name" if $DEBUG
+      a_method.visibility = @visibility
+      add_to(@method_list, a_method)
+    end
+
+    def add_attribute(an_attribute)
+      add_to(@attributes, an_attribute)
+    end
+
+    def add_alias(an_alias)
+      meth = find_instance_method_named(an_alias.old_name)
+      if meth
+        new_meth = AnyMethod.new(an_alias.text, an_alias.new_name)
+        new_meth.is_alias_for = meth
+        new_meth.singleton    = meth.singleton
+        new_meth.params       = meth.params
+        new_meth.comment = "Alias for \##{meth.name}"
+        meth.add_alias(new_meth)
+        add_method(new_meth)
+      else
+        add_to(@aliases, an_alias)
+      end
+    end
+
+    def add_include(an_include)
+      add_to(@includes, an_include)
+    end
+
+    def add_constant(const)
+      add_to(@constants, const)
+    end
+
+    # Requires always get added to the top-level (file) context
+    def add_require(a_require)
+      if self.kind_of? TopLevel
+        add_to(@requires, a_require)
+      else
+        parent.add_require(a_require)
+      end
+    end
+
+    def add_class_or_module(collection, class_type, name, superclass=nil)
+      cls = collection[name]
+      if cls
+        puts "Reusing class/module #{name}" if $DEBUG
+      else
+        cls = class_type.new(name, superclass)
+        puts "Adding class/module #{name} to #@name" if $DEBUG
+#        collection[name] = cls if @document_self  && !@done_documenting
+        collection[name] = cls if !@done_documenting
+        cls.parent = self
+        cls.section = @current_section
+      end
+      cls
+    end
+
+    def add_to(array, thing)
+      array <<  thing if @document_self  && !@done_documenting
+      thing.parent = self
+      thing.section = @current_section
+    end
+
+    # If a class's documentation is turned off after we've started
+    # collecting methods etc., we need to remove the ones
+    # we have
+
+    def remove_methods_etc
+      initialize_methods_etc
+    end
+
+    def initialize_methods_etc
+      @method_list = []
+      @attributes  = []
+      @aliases     = []
+      @requires    = []
+      @includes    = []
+      @constants   = []
+    end
+
+    # and remove classes and modules when we see a :nodoc: all
+    def remove_classes_and_modules
+      initialize_classes_and_modules
+    end
+
+    def initialize_classes_and_modules
+      @classes     = {}
+      @modules     = {}
+    end
+
+    # Find a named module
+    def find_module_named(name)
+      return self if self.name == name
+      res = @modules[name] || @classes[name]
+      return res if res
+      find_enclosing_module_named(name)
+    end
+
+    # find a module at a higher scope
+    def find_enclosing_module_named(name)
+      parent && parent.find_module_named(name)
+    end
+
+    # Iterate over all the classes and modules in
+    # this object
+
+    def each_classmodule
+      @modules.each_value {|m| yield m}
+      @classes.each_value {|c| yield c}
+    end
+
+    def each_method
+      @method_list.each {|m| yield m}
+    end
+
+    def each_attribute 
+      @attributes.each {|a| yield a}
+    end
+
+    def each_constant
+      @constants.each {|c| yield c}
+    end
+
+    # Return the toplevel that owns us
+
+    def toplevel
+      return @toplevel if defined? @toplevel
+      @toplevel = self
+      @toplevel = @toplevel.parent until TopLevel === @toplevel
+      @toplevel
+    end
+
+    # allow us to sort modules by name
+    def <=>(other)
+      name <=> other.name
+    end
+
+    # Look up the given symbol. If method is non-nil, then
+    # we assume the symbol references a module that
+    # contains that method
+    def find_symbol(symbol, method=nil)
+      result = nil
+      case symbol
+      when /^::(.*)/
+        result = toplevel.find_symbol($1)
+      when /::/
+        modules = symbol.split(/::/)
+        unless modules.empty?
+          module_name = modules.shift
+          result = find_module_named(module_name)
+          if result
+            modules.each do |module_name|
+              result = result.find_module_named(module_name)
+              break unless result
+            end
+          end
+        end
+      else
+        # if a method is specified, then we're definitely looking for
+        # a module, otherwise it could be any symbol
+        if method
+          result = find_module_named(symbol)
+        else
+          result = find_local_symbol(symbol)
+          if result.nil?
+            if symbol =~ /^[A-Z]/
+              result = parent
+              while result && result.name != symbol
+                result = result.parent
+              end
+            end
+          end
+        end
+      end
+      if result && method
+        if !result.respond_to?(:find_local_symbol)
+          p result.name
+          p method
+          fail
+        end
+        result = result.find_local_symbol(method)
+      end
+      result
+    end
+           
+    def find_local_symbol(symbol)
+      res = find_method_named(symbol) ||
+            find_constant_named(symbol) ||
+            find_attribute_named(symbol) ||
+            find_module_named(symbol) 
+    end
+
+    # Handle sections
+
+    def set_current_section(title, comment)
+      @current_section = Section.new(title, comment)
+      @sections << @current_section
+    end
+
+    private
+
+    # Find a named method, or return nil
+    def find_method_named(name)
+      @method_list.find {|meth| meth.name == name}
+    end
+
+    # Find a named instance method, or return nil
+    def find_instance_method_named(name)
+      @method_list.find {|meth| meth.name == name && !meth.singleton}
+    end
+
+    # Find a named constant, or return nil
+    def find_constant_named(name)
+      @constants.find {|m| m.name == name}
+    end
+
+    # Find a named attribute, or return nil
+    def find_attribute_named(name)
+      @attributes.find {|m| m.name == name}
+    end
+    
+  end
+
+
+  # A TopLevel context is a source file
+
+  class TopLevel < Context
+    attr_accessor :file_stat
+    attr_accessor :file_relative_name
+    attr_accessor :file_absolute_name
+    attr_accessor :diagram
+    
+    @@all_classes = {}
+    @@all_modules = {}
+
+    def TopLevel::reset
+      @@all_classes = {}
+      @@all_modules = {}
+    end
+
+    def initialize(file_name)
+      super()
+      @name = "TopLevel"
+      @file_relative_name = file_name
+      @file_absolute_name = file_name
+      @file_stat          = File.stat(file_name)
+      @diagram            = nil
+    end
+
+    def full_name
+      nil
+    end
+
+    # Adding a class or module to a TopLevel is special, as we only
+    # want one copy of a particular top-level class. For example,
+    # if both file A and file B implement class C, we only want one
+    # ClassModule object for C. This code arranges to share
+    # classes and modules between files.
+
+    def add_class_or_module(collection, class_type, name, superclass)
+      cls = collection[name]
+      if cls
+        puts "Reusing class/module #{name}" if $DEBUG
+      else
+        if class_type == NormalModule
+          all = @@all_modules
+        else
+          all = @@all_classes
+        end
+        cls = all[name]
+        if !cls
+          cls = class_type.new(name, superclass)
+          all[name] = cls  unless @done_documenting
+        end
+        puts "Adding class/module #{name} to #@name" if $DEBUG
+        collection[name] = cls unless @done_documenting
+        cls.parent = self
+      end
+      cls
+    end
+
+    def TopLevel.all_classes_and_modules
+      @@all_classes.values + @@all_modules.values
+    end
+
+    def TopLevel.find_class_named(name)
+     @@all_classes.each_value do |c|
+        res = c.find_class_named(name) 
+        return res if res
+      end
+      nil
+    end
+
+    def find_local_symbol(symbol)
+      find_class_or_module_named(symbol) || super
+    end
+
+    def find_class_or_module_named(symbol)
+      @@all_classes.each_value {|c| return c if c.name == symbol}
+      @@all_modules.each_value {|m| return m if m.name == symbol}
+      nil
+    end
+
+    # Find a named module
+    def find_module_named(name)
+      find_class_or_module_named(name) || find_enclosing_module_named(name)
+    end
+
+
+  end
+
+  # ClassModule is the base class for objects representing either a
+  # class or a module.
+
+  class ClassModule < Context
+
+    attr_reader   :superclass
+    attr_accessor :diagram
+
+    def initialize(name, superclass = nil)
+      @name       = name
+      @diagram    = nil
+      @superclass = superclass
+      @comment    = ""
+      super()
+    end
+
+    # Return the fully qualified name of this class or module
+    def full_name
+      if @parent && @parent.full_name
+        @parent.full_name + "::" + @name
+      else
+        @name
+      end
+    end
+
+    def http_url(prefix)
+      path = full_name.split("::")
+      File.join(prefix, *path) + ".html"
+    end
+
+    # Return +true+ if this object represents a module
+    def is_module?
+      false
+    end
+
+    # to_s is simply for debugging
+    def to_s
+      res = self.class.name + ": " + @name 
+      res << @comment.to_s
+      res << super
+      res
+    end
+
+    def find_class_named(name)
+      return self if full_name == name
+      @classes.each_value {|c| return c if c.find_class_named(name) }
+      nil
+    end
+  end
+
+  # Anonymous classes
+  class AnonClass < ClassModule
+  end
+
+  # Normal classes
+  class NormalClass < ClassModule
+  end
+
+  # Singleton classes
+  class SingleClass < ClassModule
+  end
+
+  # Module
+  class NormalModule < ClassModule
+    def is_module?
+      true
+    end
+  end
+
+
+  # AnyMethod is the base class for objects representing methods
+
+  class AnyMethod < CodeObject
+    attr_accessor :name
+    attr_accessor :visibility
+    attr_accessor :block_params
+    attr_accessor :dont_rename_initialize
+    attr_accessor :singleton
+    attr_reader   :aliases           # list of other names for this method
+    attr_accessor :is_alias_for      # or a method we're aliasing
+
+    attr_overridable :params, :param, :parameters, :parameter
+
+    attr_accessor :call_seq
+
+
+    include TokenStream
+
+    def initialize(text, name)
+      super()
+      @text = text
+      @name = name
+      @token_stream  = nil
+      @visibility    = :public
+      @dont_rename_initialize = false
+      @block_params  = nil
+      @aliases       = []
+      @is_alias_for  = nil
+      @comment = ""
+      @call_seq = nil
+    end
+
+    def <=>(other)
+      @name <=> other.name
+    end
+
+    def to_s
+      res = self.class.name + ": " + @name + " (" + @text + ")\n"
+      res << @comment.to_s
+      res
+    end
+
+    def param_seq
+      p = params.gsub(/\s*\#.*/, '')
+      p = p.tr("\n", " ").squeeze(" ")
+      p = "(" + p + ")" unless p[0] == ?(
+
+      if (block = block_params)
+        # If this method has explicit block parameters, remove any
+        # explicit &block
+$stderr.puts p
+        p.sub!(/,?\s*&\w+/)
+$stderr.puts p
+
+        block.gsub!(/\s*\#.*/, '')
+        block = block.tr("\n", " ").squeeze(" ")
+        if block[0] == ?(
+          block.sub!(/^\(/, '').sub!(/\)/, '')
+        end
+        p << " {|#{block}| ...}"
+      end
+      p
+    end
+
+    def add_alias(method)
+      @aliases << method
+    end
+  end
+
+
+  # Represent an alias, which is an old_name/ new_name pair associated
+  # with a particular context
+  class Alias < CodeObject
+    attr_accessor :text, :old_name, :new_name, :comment
+    
+    def initialize(text, old_name, new_name, comment)
+      super()
+      @text = text
+      @old_name = old_name
+      @new_name = new_name
+      self.comment = comment
+    end
+
+    def to_s
+      "alias: #{self.old_name} ->  #{self.new_name}\n#{self.comment}"
+    end
+  end
+
+  # Represent a constant
+  class Constant < CodeObject
+    attr_accessor :name, :value
+
+    def initialize(name, value, comment)
+      super()
+      @name = name
+      @value = value
+      self.comment = comment
+    end
+  end
+
+  # Represent attributes
+  class Attr < CodeObject
+    attr_accessor :text, :name, :rw, :visibility
+
+    def initialize(text, name, rw, comment)
+      super()
+      @text = text
+      @name = name
+      @rw = rw
+      @visibility = :public
+      self.comment = comment
+    end
+
+    def to_s
+      "attr: #{self.name} #{self.rw}\n#{self.comment}"
+    end
+
+    def <=>(other)
+      self.name <=> other.name
+    end
+  end
+
+  # a required file
+
+  class Require < CodeObject
+    attr_accessor :name
+
+    def initialize(name, comment)
+      super()
+      @name = name.gsub(/'|"/, "") #'
+      self.comment = comment
+    end
+
+  end
+
+  # an included module
+  class Include < CodeObject
+    attr_accessor :name
+
+    def initialize(name, comment)
+      super()
+      @name = name
+      self.comment = comment
+    end
+
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rdoc/diagram.rb b/ruby_1_8_6/lib/rdoc/diagram.rb
new file mode 100644
index 0000000000..9fdc49c02e
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/diagram.rb
@@ -0,0 +1,335 @@
+# A wonderful hack by to draw package diagrams using the dot package.
+# Originally written by  Jah, team Enticla.
+#
+# You must have the V1.7 or later in your path
+# http://www.research.att.com/sw/tools/graphviz/
+
+require "rdoc/dot/dot"
+require 'rdoc/options'
+
+module RDoc
+
+  # Draw a set of diagrams representing the modules and classes in the
+  # system. We draw one diagram for each file, and one for each toplevel
+  # class or module. This means there will be overlap. However, it also
+  # means that you'll get better context for objects.
+  #
+  # To use, simply
+  #
+  #   d = Diagram.new(info)   # pass in collection of top level infos
+  #   d.draw
+  #
+  # The results will be written to the +dot+ subdirectory. The process
+  # also sets the +diagram+ attribute in each object it graphs to
+  # the name of the file containing the image. This can be used
+  # by output generators to insert images.
+
+  class Diagram
+
+    FONT = "Arial"
+
+    DOT_PATH = "dot"
+
+    # Pass in the set of top level objects. The method also creates
+    # the subdirectory to hold the images
+
+    def initialize(info, options)
+      @info = info
+      @options = options
+      @counter = 0
+      File.makedirs(DOT_PATH)
+      @diagram_cache = {}
+    end
+
+    # Draw the diagrams. We traverse the files, drawing a diagram for
+    # each. We also traverse each top-level class and module in that
+    # file drawing a diagram for these too. 
+
+    def draw
+      unless @options.quiet
+        $stderr.print "Diagrams: "
+        $stderr.flush
+      end
+
+      @info.each_with_index do |i, file_count|
+        @done_modules = {}
+        @local_names = find_names(i)
+        @global_names = []
+        @global_graph = graph = DOT::DOTDigraph.new('name' => 'TopLevel',
+                                    'fontname' => FONT,
+                                    'fontsize' => '8',
+                                    'bgcolor'  => 'lightcyan1',
+                                    'compound' => 'true')
+        
+        # it's a little hack %) i'm too lazy to create a separate class
+        # for default node
+        graph << DOT::DOTNode.new('name' => 'node',
+                                  'fontname' => FONT,
+                                  'color' => 'black',
+                                  'fontsize' => 8)
+        
+        i.modules.each do |mod|
+          draw_module(mod, graph, true, i.file_relative_name)
+        end
+        add_classes(i, graph, i.file_relative_name)
+
+        i.diagram = convert_to_png("f_#{file_count}", graph)
+        
+        # now go through and document each top level class and
+        # module independently
+        i.modules.each_with_index do |mod, count|
+          @done_modules = {}
+          @local_names = find_names(mod)
+          @global_names = []
+
+          @global_graph = graph = DOT::DOTDigraph.new('name' => 'TopLevel',
+                                      'fontname' => FONT,
+                                      'fontsize' => '8',
+                                      'bgcolor'  => 'lightcyan1',
+                                      'compound' => 'true')
+
+          graph << DOT::DOTNode.new('name' => 'node',
+                                    'fontname' => FONT,
+                                    'color' => 'black',
+                                    'fontsize' => 8)
+          draw_module(mod, graph, true)
+          mod.diagram = convert_to_png("m_#{file_count}_#{count}", 
+                                       graph) 
+        end
+      end
+      $stderr.puts unless @options.quiet
+    end
+
+    #######
+    private
+    #######
+
+    def find_names(mod)
+      return [mod.full_name] + mod.classes.collect{|cl| cl.full_name} +
+        mod.modules.collect{|m| find_names(m)}.flatten
+    end
+
+    def find_full_name(name, mod)
+      full_name = name.dup
+      return full_name if @local_names.include?(full_name)
+      mod_path = mod.full_name.split('::')[0..-2]
+      unless mod_path.nil?
+        until mod_path.empty?
+          full_name = mod_path.pop + '::' + full_name
+          return full_name if @local_names.include?(full_name)
+        end
+      end
+      return name
+    end
+
+    def draw_module(mod, graph, toplevel = false, file = nil)
+      return if  @done_modules[mod.full_name] and not toplevel
+
+      @counter += 1
+      url = mod.http_url("classes")
+      m = DOT::DOTSubgraph.new('name' => "cluster_#{mod.full_name.gsub( /:/,'_' )}",
+                               'label' => mod.name,
+                               'fontname' => FONT,
+                               'color' => 'blue', 
+                               'style' => 'filled', 
+                               'URL'   => %{"#{url}"},
+                               'fillcolor' => toplevel ? 'palegreen1' : 'palegreen3')
+      
+      @done_modules[mod.full_name] = m
+      add_classes(mod, m, file)
+      graph << m
+
+      unless mod.includes.empty?
+        mod.includes.each do |m|
+          m_full_name = find_full_name(m.name, mod)
+          if @local_names.include?(m_full_name)
+            @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
+                                      'to' => "#{mod.full_name.gsub( /:/,'_' )}",
+                                      'ltail' => "cluster_#{m_full_name.gsub( /:/,'_' )}",
+                                      'lhead' => "cluster_#{mod.full_name.gsub( /:/,'_' )}")
+          else
+            unless @global_names.include?(m_full_name)
+              path = m_full_name.split("::")
+              url = File.join('classes', *path) + ".html"
+              @global_graph << DOT::DOTNode.new('name' => "#{m_full_name.gsub( /:/,'_' )}",
+                                        'shape' => 'box',
+                                        'label' => "#{m_full_name}",
+                                        'URL'   => %{"#{url}"})
+              @global_names << m_full_name
+            end
+            @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
+                                      'to' => "#{mod.full_name.gsub( /:/,'_' )}",
+                                      'lhead' => "cluster_#{mod.full_name.gsub( /:/,'_' )}")
+          end
+        end
+      end
+    end
+
+    def add_classes(container, graph, file = nil )
+
+      use_fileboxes = Options.instance.fileboxes
+
+      files = {}
+
+      # create dummy node (needed if empty and for module includes)
+      if container.full_name
+        graph << DOT::DOTNode.new('name'     => "#{container.full_name.gsub( /:/,'_' )}",
+                                  'label'    => "",
+                                  'width'  => (container.classes.empty? and 
+                                               container.modules.empty?) ? 
+                                  '0.75' : '0.01',
+                                  'height' => '0.01',
+                                  'shape' => 'plaintext')
+      end
+      container.classes.each_with_index do |cl, cl_index|
+        last_file = cl.in_files[-1].file_relative_name
+
+        if use_fileboxes && !files.include?(last_file)
+          @counter += 1
+          files[last_file] =
+            DOT::DOTSubgraph.new('name'     => "cluster_#{@counter}",
+                                 'label'    => "#{last_file}",
+                                 'fontname' => FONT,
+                                 'color'=>
+                                 last_file == file ? 'red' : 'black')
+        end
+
+        next if cl.name == 'Object' || cl.name[0,2] == "<<"
+
+        url = cl.http_url("classes")
+        
+        label = cl.name.dup
+        if use_fileboxes && cl.in_files.length > 1
+          label <<  '\n[' + 
+                        cl.in_files.collect {|i|
+                             i.file_relative_name 
+                        }.sort.join( '\n' ) +
+                    ']'
+        end 
+                
+        attrs = {
+          'name' => "#{cl.full_name.gsub( /:/, '_' )}",
+          'fontcolor' => 'black',
+          'style'=>'filled',
+          'color'=>'palegoldenrod',
+          'label' => label,
+          'shape' => 'ellipse',
+          'URL'   => %{"#{url}"}
+        }
+
+        c = DOT::DOTNode.new(attrs)
+        
+        if use_fileboxes
+          files[last_file].push c 
+        else
+          graph << c
+        end
+      end
+      
+      if use_fileboxes
+        files.each_value do |val|
+          graph << val
+        end
+      end
+      
+      unless container.classes.empty?
+        container.classes.each_with_index do |cl, cl_index|
+          cl.includes.each do |m|
+            m_full_name = find_full_name(m.name, cl)
+            if @local_names.include?(m_full_name)
+              @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
+                                      'to' => "#{cl.full_name.gsub( /:/,'_' )}",
+                                      'ltail' => "cluster_#{m_full_name.gsub( /:/,'_' )}")
+            else
+              unless @global_names.include?(m_full_name)
+                path = m_full_name.split("::")
+                url = File.join('classes', *path) + ".html"
+                @global_graph << DOT::DOTNode.new('name' => "#{m_full_name.gsub( /:/,'_' )}",
+                                          'shape' => 'box',
+                                          'label' => "#{m_full_name}",
+                                          'URL'   => %{"#{url}"})
+                @global_names << m_full_name
+              end
+              @global_graph << DOT::DOTEdge.new('from' => "#{m_full_name.gsub( /:/,'_' )}",
+                                      'to' => "#{cl.full_name.gsub( /:/, '_')}")
+            end
+          end
+
+          sclass = cl.superclass
+          next if sclass.nil? || sclass == 'Object'
+          sclass_full_name = find_full_name(sclass,cl)
+          unless @local_names.include?(sclass_full_name) or @global_names.include?(sclass_full_name)
+            path = sclass_full_name.split("::")
+            url = File.join('classes', *path) + ".html"
+            @global_graph << DOT::DOTNode.new(
+                       'name' => "#{sclass_full_name.gsub( /:/, '_' )}",
+                       'label' => sclass_full_name,
+                       'URL'   => %{"#{url}"})
+            @global_names << sclass_full_name
+          end
+          @global_graph << DOT::DOTEdge.new('from' => "#{sclass_full_name.gsub( /:/,'_' )}",
+                                    'to' => "#{cl.full_name.gsub( /:/, '_')}")
+        end
+      end
+
+      container.modules.each do |submod|
+        draw_module(submod, graph)
+      end
+      
+    end
+
+    def convert_to_png(file_base, graph)
+      str = graph.to_s
+      return @diagram_cache[str] if @diagram_cache[str]
+      op_type = Options.instance.image_format
+      dotfile = File.join(DOT_PATH, file_base)
+      src = dotfile + ".dot"
+      dot = dotfile + "." + op_type
+
+      unless @options.quiet
+        $stderr.print "."
+        $stderr.flush
+      end
+
+      File.open(src, 'w+' ) do |f|
+        f << str << "\n"
+      end
+      
+      system "dot", "-T#{op_type}", src, "-o", dot
+
+      # Now construct the imagemap wrapper around
+      # that png
+
+      ret = wrap_in_image_map(src, dot)
+      @diagram_cache[str] = ret
+      return ret
+    end
+
+    # Extract the client-side image map from dot, and use it
+    # to generate the imagemap proper. Return the whole
+    # <map>..<img> combination, suitable for inclusion on
+    # the page
+
+    def wrap_in_image_map(src, dot)
+      res = %{<map id="map" name="map">\n}
+      dot_map = `dot -Tismap #{src}`
+      dot_map.each do |area|
+        unless area =~ /^rectangle \((\d+),(\d+)\) \((\d+),(\d+)\) ([\/\w.]+)\s*(.*)/
+          $stderr.puts "Unexpected output from dot:\n#{area}"
+          return nil
+        end
+        
+        xs, ys = [$1.to_i, $3.to_i], [$2.to_i, $4.to_i]
+        url, area_name = $5, $6
+
+        res <<  %{  <area shape="rect" coords="#{xs.min},#{ys.min},#{xs.max},#{ys.max}" }
+        res <<  %{     href="#{url}" alt="#{area_name}" />\n}
+      end
+      res << "</map>\n"
+#      map_file = src.sub(/.dot/, '.map')
+#      system("dot -Timap #{src} -o #{map_file}")
+      res << %{<img src="#{dot}" usemap="#map" border="0" alt="#{dot}">}
+      return res
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/dot/dot.rb b/ruby_1_8_6/lib/rdoc/dot/dot.rb
new file mode 100644
index 0000000000..6dbb7cb237
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/dot/dot.rb
@@ -0,0 +1,255 @@
+module DOT
+
+    # these glogal vars are used to make nice graph source
+    $tab = '    '
+    $tab2 = $tab * 2
+
+    # if we don't like 4 spaces, we can change it any time
+    def change_tab( t )
+        $tab = t
+        $tab2 = t * 2
+    end
+
+    # options for node declaration
+    NODE_OPTS = [
+        'bgcolor',
+        'color',
+        'fontcolor',
+        'fontname',
+        'fontsize',
+        'height',
+        'width',
+        'label',
+        'layer',
+        'rank',
+        'shape',
+        'shapefile',
+        'style',
+        'URL',
+    ]
+
+    # options for edge declaration
+    EDGE_OPTS = [
+        'color',
+        'decorate',
+        'dir',
+        'fontcolor',
+        'fontname',
+        'fontsize',
+        'id',
+        'label',
+        'layer',
+        'lhead',
+        'ltail',
+        'minlen',
+        'style',
+        'weight'
+    ]
+
+    # options for graph declaration
+    GRAPH_OPTS = [
+        'bgcolor',
+        'center',
+        'clusterrank',
+        'color',
+        'compound',
+        'concentrate',
+        'fillcolor',
+        'fontcolor',
+        'fontname',
+        'fontsize',
+        'label',
+        'layerseq',
+        'margin',
+        'mclimit',
+        'nodesep',
+        'nslimit',
+        'ordering',
+        'orientation',
+        'page',
+        'rank',
+        'rankdir',
+        'ranksep',
+        'ratio',
+        'size',
+        'style',
+        'URL'
+    ]
+
+    # a root class for any element in dot notation
+    class DOTSimpleElement
+        attr_accessor :name
+
+        def initialize( params = {} )
+            @label = params['name'] ? params['name'] : ''
+        end
+
+        def to_s
+            @name
+        end
+    end
+
+    # an element that has options ( node, edge or graph )
+    class DOTElement < DOTSimpleElement
+        #attr_reader :parent
+        attr_accessor :name, :options
+
+        def initialize( params = {}, option_list = [] )
+            super( params )
+            @name = params['name'] ? params['name'] : nil
+            @parent = params['parent'] ? params['parent'] : nil
+            @options = {}
+            option_list.each{ |i|
+                @options[i] = params[i] if params[i]
+            }
+            @options['label'] ||= @name if @name != 'node'
+        end
+
+        def each_option
+            @options.each{ |i| yield i }
+        end
+
+        def each_option_pair
+            @options.each_pair{ |key, val| yield key, val }
+        end
+
+        #def parent=( thing )
+        #    @parent.delete( self ) if defined?( @parent ) and @parent
+        #    @parent = thing
+        #end
+    end
+
+
+    # this is used when we build nodes that have shape=record
+    # ports don't have options :)
+    class DOTPort < DOTSimpleElement
+        attr_accessor :label
+
+        def initialize( params = {} )
+            super( params )
+            @name = params['label'] ? params['label'] : ''
+        end
+        def to_s
+            ( @name && @name != "" ? "<#{@name}>" : "" ) + "#{@label}"
+        end
+    end
+
+    # node element
+    class DOTNode < DOTElement
+
+        def initialize( params = {}, option_list = NODE_OPTS )
+            super( params, option_list )
+            @ports = params['ports'] ? params['ports'] : []
+        end
+
+        def each_port
+            @ports.each{ |i| yield i }
+        end
+
+        def << ( thing )
+            @ports << thing
+        end
+
+        def push ( thing )
+            @ports.push( thing )
+        end
+
+        def pop
+            @ports.pop
+        end
+
+        def to_s( t = '' )
+
+            label = @options['shape'] != 'record' && @ports.length == 0 ?
+                @options['label'] ?
+                    t + $tab + "label = \"#{@options['label']}\"\n" :
+                    '' :
+                t + $tab + 'label = "' + " \\\n" +
+                t + $tab2 + "#{@options['label']}| \\\n" +
+                @ports.collect{ |i|
+                    t + $tab2 + i.to_s
+                }.join( "| \\\n" ) + " \\\n" +
+                t + $tab + '"' + "\n"
+
+            t + "#{@name} [\n" +
+            @options.to_a.collect{ |i|
+                i[1] && i[0] != 'label' ?
+                    t + $tab + "#{i[0]} = #{i[1]}" : nil
+            }.compact.join( ",\n" ) + ( label != '' ? ",\n" : "\n" ) +
+            label +
+            t + "]\n"
+        end
+    end
+
+    # subgraph element is the same to graph, but has another header in dot
+    # notation
+    class DOTSubgraph < DOTElement
+
+        def initialize( params = {}, option_list = GRAPH_OPTS )
+            super( params, option_list )
+            @nodes = params['nodes'] ? params['nodes'] : []
+            @dot_string = 'subgraph'
+        end
+
+        def each_node
+            @nodes.each{ |i| yield i }
+        end
+
+        def << ( thing )
+            @nodes << thing
+        end
+
+        def push( thing )
+            @nodes.push( thing )
+        end
+
+        def pop
+            @nodes.pop
+        end
+
+        def to_s( t = '' )
+          hdr = t + "#{@dot_string} #{@name} {\n"
+
+          options = @options.to_a.collect{ |name, val|
+            val && name != 'label' ?
+            t + $tab + "#{name} = #{val}" :
+              name ? t + $tab + "#{name} = \"#{val}\"" : nil
+          }.compact.join( "\n" ) + "\n"
+
+          nodes = @nodes.collect{ |i|
+            i.to_s( t + $tab )
+          }.join( "\n" ) + "\n"
+          hdr + options + nodes + t + "}\n"
+        end
+    end
+
+    # this is graph
+    class DOTDigraph < DOTSubgraph
+        def initialize( params = {}, option_list = GRAPH_OPTS )
+            super( params, option_list )
+            @dot_string = 'digraph'
+        end
+    end
+
+    # this is edge
+    class DOTEdge < DOTElement
+        attr_accessor :from, :to
+        def initialize( params = {}, option_list = EDGE_OPTS )
+            super( params, option_list )
+            @from = params['from'] ? params['from'] : nil
+            @to = params['to'] ? params['to'] : nil
+        end
+
+        def to_s( t = '' )
+            t + "#{@from} -> #{to} [\n" +
+            @options.to_a.collect{ |i|
+                i[1] && i[0] != 'label' ?
+                    t + $tab + "#{i[0]} = #{i[1]}" :
+                    i[1] ? t + $tab + "#{i[0]} = \"#{i[1]}\"" : nil
+            }.compact.join( "\n" ) + "\n" + t + "]\n"
+        end
+    end
+end
+
+
+
diff --git a/ruby_1_8_6/lib/rdoc/generators/chm_generator.rb b/ruby_1_8_6/lib/rdoc/generators/chm_generator.rb
new file mode 100644
index 0000000000..51eeda8dd1
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/generators/chm_generator.rb
@@ -0,0 +1,112 @@
+require 'rdoc/generators/html_generator'
+
+module Generators
+
+  class CHMGenerator < HTMLGenerator
+
+    HHC_PATH = "c:/Program Files/HTML Help Workshop/hhc.exe"
+
+    # Standard generator factory
+    def CHMGenerator.for(options)
+      CHMGenerator.new(options)
+    end
+
+    
+    def initialize(*args)
+      super
+      @op_name = @options.op_name || "rdoc"
+      check_for_html_help_workshop
+    end
+
+    def check_for_html_help_workshop
+      stat = File.stat(HHC_PATH)
+    rescue
+      $stderr <<
+	"\n.chm output generation requires that Microsoft's Html Help\n" <<
+	"Workshop is installed. RDoc looks for it in:\n\n    " <<
+	HHC_PATH <<
+	"\n\nYou can download a copy for free from:\n\n" <<
+	"    http://msdn.microsoft.com/library/default.asp?" <<
+	"url=/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp\n\n"
+      
+      exit 99
+    end
+
+    # Generate the html as normal, then wrap it
+    # in a help project
+    def generate(info)
+      super
+      @project_name = @op_name + ".hhp"
+      create_help_project
+    end
+
+    # The project contains the project file, a table of contents
+    # and an index
+    def create_help_project
+      create_project_file
+      create_contents_and_index
+      compile_project
+    end
+
+    # The project file links together all the various
+    # files that go to make up the help.
+
+    def create_project_file
+      template = TemplatePage.new(RDoc::Page::HPP_FILE)
+      values = { "title" => @options.title, "opname" => @op_name }
+      files = []
+      @files.each do |f|
+	files << { "html_file_name" => f.path }
+      end
+
+      values['all_html_files'] = files
+      
+      File.open(@project_name, "w") do |f|
+        template.write_html_on(f, values)
+      end
+    end
+
+    # The contents is a list of all files and modules.
+    # For each we include  as sub-entries the list
+    # of methods they contain. As we build the contents
+    # we also build an index file
+
+    def create_contents_and_index
+      contents = []
+      index    = []
+
+      (@files+@classes).sort.each do |entry|
+	content_entry = { "c_name" => entry.name, "ref" => entry.path }
+	index << { "name" => entry.name, "aref" => entry.path }
+
+	internals = []
+
+	methods = entry.build_method_summary_list(entry.path)
+
+	content_entry["methods"] = methods unless methods.empty?
+        contents << content_entry
+	index.concat methods
+      end
+
+      values = { "contents" => contents }
+      template = TemplatePage.new(RDoc::Page::CONTENTS)
+      File.open("contents.hhc", "w") do |f|
+	template.write_html_on(f, values)
+      end
+
+      values = { "index" => index }
+      template = TemplatePage.new(RDoc::Page::CHM_INDEX)
+      File.open("index.hhk", "w") do |f|
+	template.write_html_on(f, values)
+      end      
+    end
+
+    # Invoke the windows help compiler to compiler the project
+    def compile_project
+      system(HHC_PATH, @project_name)
+    end
+
+  end
+
+
+end
diff --git a/ruby_1_8_6/lib/rdoc/generators/html_generator.rb b/ruby_1_8_6/lib/rdoc/generators/html_generator.rb
new file mode 100644
index 0000000000..1f9b808e8d
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/generators/html_generator.rb
@@ -0,0 +1,1509 @@
+# We're responsible for generating all the HTML files
+# from the object tree defined in code_objects.rb. We
+# generate:
+#
+# [files]   an html file for each input file given. These
+#           input files appear as objects of class
+#           TopLevel
+#
+# [classes] an html file for each class or module encountered.
+#           These classes are not grouped by file: if a file
+#           contains four classes, we'll generate an html
+#           file for the file itself, and four html files 
+#           for the individual classes. 
+#
+# [indices] we generate three indices for files, classes,
+#           and methods. These are displayed in a browser
+#           like window with three index panes across the
+#           top and the selected description below
+#
+# Method descriptions appear in whatever entity (file, class,
+# or module) that contains them.
+#
+# We generate files in a structure below a specified subdirectory,
+# normally +doc+.
+#
+#  opdir
+#     |
+#     |___ files
+#     |       |__  per file summaries
+#     |
+#     |___ classes
+#             |__ per class/module descriptions
+#
+# HTML is generated using the Template class.
+#
+
+require 'ftools'
+
+require 'rdoc/options'
+require 'rdoc/template'
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_html'
+require 'cgi'
+
+module Generators
+
+  # Name of sub-direcories that hold file and class/module descriptions
+
+  FILE_DIR  = "files"
+  CLASS_DIR = "classes"
+  CSS_NAME  = "rdoc-style.css"
+  
+
+  ##
+  # Build a hash of all items that can be cross-referenced.
+  # This is used when we output required and included names: 
+  # if the names appear in this hash, we can generate
+  # an html cross reference to the appropriate description.
+  # We also use this when parsing comment blocks: any decorated 
+  # words matching an entry in this list are hyperlinked.
+
+  class AllReferences
+    @@refs = {}
+    
+    def AllReferences::reset
+      @@refs = {}
+    end
+
+    def AllReferences.add(name, html_class)
+      @@refs[name] = html_class
+    end
+
+    def AllReferences.[](name)
+      @@refs[name]
+    end
+
+    def AllReferences.keys
+      @@refs.keys
+    end
+  end
+
+
+  ##
+  # Subclass of the SM::ToHtml class that supports looking
+  # up words in the AllReferences list. Those that are
+  # found (like AllReferences in this comment) will
+  # be hyperlinked
+
+  class HyperlinkHtml < SM::ToHtml
+    # We need to record the html path of our caller so we can generate
+    # correct relative paths for any hyperlinks that we find
+    def initialize(from_path, context)
+      super()
+      @from_path = from_path
+
+      @parent_name = context.parent_name
+      @parent_name += "::" if @parent_name
+      @context = context
+    end
+
+    # We're invoked when any text matches the CROSSREF pattern
+    # (defined in MarkUp). If we fine the corresponding reference,
+    # generate a hyperlink. If the name we're looking for contains
+    # no punctuation, we look for it up the module/class chain. For
+    # example, HyperlinkHtml is found, even without the Generators::
+    # prefix, because we look for it in module Generators first.
+
+    def handle_special_CROSSREF(special)
+      name = special.text
+      if name[0,1] == '#'
+        lookup = name[1..-1]
+        name = lookup unless Options.instance.show_hash
+      else
+        lookup = name
+      end
+
+      # Find class, module, or method in class or module.
+      if /([A-Z]\w*)[.\#](\w+[!?=]?)/ =~ lookup
+        container = $1
+        method = $2
+        ref = @context.find_symbol(container, method)
+      elsif /([A-Za-z]\w*)[.\#](\w+(\([\.\w+\*\/\+\-\=\<\>]+\))?)/ =~ lookup
+        container = $1
+        method = $2
+        ref = @context.find_symbol(container, method)
+      else
+        ref = @context.find_symbol(lookup)
+      end
+
+      if ref and ref.document_self
+        "<a href=\"#{ref.as_href(@from_path)}\">#{name}</a>"
+      else
+        name
+      end
+    end
+
+
+    # Generate a hyperlink for url, labeled with text. Handle the
+    # special cases for img: and link: described under handle_special_HYPEDLINK
+    def gen_url(url, text)
+      if url =~ /([A-Za-z]+):(.*)/
+        type = $1
+        path = $2
+      else
+        type = "http"
+        path = url
+        url  = "http://#{url}"
+      end
+
+      if type == "link"
+        if path[0,1] == '#'     # is this meaningful?
+          url = path
+        else
+          url = HTMLGenerator.gen_url(@from_path, path)
+        end
+      end
+
+      if (type == "http" || type == "link") && 
+          url =~ /\.(gif|png|jpg|jpeg|bmp)$/
+
+        "<img src=\"#{url}\" />"
+      else
+        "<a href=\"#{url}\">#{text.sub(%r{^#{type}:/*}, '')}</a>"
+      end
+    end
+
+    # And we're invoked with a potential external hyperlink mailto:
+    # just gets inserted. http: links are checked to see if they
+    # reference an image. If so, that image gets inserted using an
+    # <img> tag. Otherwise a conventional <a href> is used.  We also
+    # support a special type of hyperlink, link:, which is a reference
+    # to a local file whose path is relative to the --op directory.
+
+    def handle_special_HYPERLINK(special)
+      url = special.text
+      gen_url(url, url)
+    end
+
+    # HEre's a hypedlink where the label is different to the URL
+    #  <label>[url]
+    #
+    
+    def handle_special_TIDYLINK(special)
+      text = special.text
+#      unless text =~ /(\S+)\[(.*?)\]/
+      unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/ 
+        return text
+      end
+      label = $1
+      url   = $2
+      gen_url(url, label)
+    end
+
+  end
+
+
+  
+  #####################################################################
+  #
+  # Handle common markup tasks for the various Html classes
+  #
+
+  module MarkUp
+
+    # Convert a string in markup format into HTML. We keep a cached
+    # SimpleMarkup object lying around after the first time we're
+    # called per object.
+
+    def markup(str, remove_para=false)
+      return '' unless str
+      unless defined? @markup
+        @markup = SM::SimpleMarkup.new
+
+        # class names, variable names, or instance variables
+        @markup.add_special(/(
+                               \w+(::\w+)*[.\#]\w+(\([\.\w+\*\/\+\-\=\<\>]+\))?  # A::B.meth(**) (for operator in Fortran95)
+                             | \#\w+(\([.\w\*\/\+\-\=\<\>]+\))?  #  meth(**) (for operator in Fortran95)
+                             | \b([A-Z]\w*(::\w+)*[.\#]\w+)  #    A::B.meth
+                             | \b([A-Z]\w+(::\w+)*)       #    A::B..
+                             | \#\w+[!?=]?                #    #meth_name 
+                             | \b\w+([_\/\.]+\w+)*[!?=]?  #    meth_name
+                             )/x, 
+                            :CROSSREF)
+
+        # external hyperlinks
+        @markup.add_special(/((link:|https?:|mailto:|ftp:|www\.)\S+\w)/, :HYPERLINK)
+
+        # and links of the form  <text>[<url>]
+        @markup.add_special(/(((\{.*?\})|\b\S+?)\[\S+?\.\S+?\])/, :TIDYLINK)
+#        @markup.add_special(/\b(\S+?\[\S+?\.\S+?\])/, :TIDYLINK)
+
+      end
+      unless defined? @html_formatter
+        @html_formatter = HyperlinkHtml.new(self.path, self)
+      end
+
+      # Convert leading comment markers to spaces, but only
+      # if all non-blank lines have them
+
+      if str =~ /^(?>\s*)[^\#]/
+        content = str
+      else
+        content = str.gsub(/^\s*(#+)/)  { $1.tr('#',' ') }
+      end
+
+      res = @markup.convert(content, @html_formatter)
+      if remove_para
+        res.sub!(/^<p>/, '')
+        res.sub!(/<\/p>$/, '')
+      end
+      res
+    end
+
+    # Qualify a stylesheet URL; if if +css_name+ does not begin with '/' or
+    # 'http[s]://', prepend a prefix relative to +path+. Otherwise, return it
+    # unmodified.
+
+    def style_url(path, css_name=nil)
+#      $stderr.puts "style_url( #{path.inspect}, #{css_name.inspect} )"
+      css_name ||= CSS_NAME
+      if %r{^(https?:/)?/} =~ css_name
+        return css_name
+      else
+        return HTMLGenerator.gen_url(path, css_name)
+      end
+    end
+
+    # Build a webcvs URL with the given 'url' argument. URLs with a '%s' in them
+    # get the file's path sprintfed into them; otherwise they're just catenated
+    # together.
+
+    def cvs_url(url, full_path)
+      if /%s/ =~ url
+        return sprintf( url, full_path )
+      else
+        return url + full_path
+      end
+    end
+  end
+
+
+  #####################################################################
+  #
+  # A Context is built by the parser to represent a container: contexts
+  # hold classes, modules, methods, require lists and include lists.
+  # ClassModule and TopLevel are the context objects we process here
+  # 
+  class ContextUser
+
+    include MarkUp
+
+    attr_reader :context
+    
+    def initialize(context, options)
+      @context = context
+      @options = options
+    end
+      
+    # convenience method to build a hyperlink
+    def href(link, cls, name)
+      %{<a href="#{link}" class="#{cls}">#{name}</a>} #"
+    end
+
+    # return a reference to outselves to be used as an href=
+    # the form depends on whether we're all in one file
+    # or in multiple files
+
+    def as_href(from_path)
+      if @options.all_one_file
+        "#" + path
+      else
+        HTMLGenerator.gen_url(from_path, path)
+      end
+    end
+
+    # Create a list of HtmlMethod objects for each method
+    # in the corresponding context object. If the @options.show_all
+    # variable is set (corresponding to the <tt>--all</tt> option,
+    # we include all methods, otherwise just the public ones.
+
+    def collect_methods
+      list = @context.method_list
+      unless @options.show_all
+        list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
+      end
+      @methods = list.collect {|m| HtmlMethod.new(m, self, @options) }
+    end
+
+    # Build a summary list of all the methods in this context
+    def build_method_summary_list(path_prefix="")
+      collect_methods unless @methods
+      meths = @methods.sort
+      res = []
+      meths.each do |meth|
+	res << {
+          "name" => CGI.escapeHTML(meth.name),
+          "aref" => "#{path_prefix}\##{meth.aref}" 
+        }
+      end
+      res
+    end
+
+
+    # Build a list of aliases for which we couldn't find a
+    # corresponding method
+    def build_alias_summary_list(section)
+      values = []
+      @context.aliases.each do |al|
+        next unless al.section == section
+        res = {
+          'old_name' => al.old_name,
+          'new_name' => al.new_name,
+        }
+        if al.comment && !al.comment.empty?
+          res['desc'] = markup(al.comment, true)
+        end
+        values << res
+      end
+      values
+    end
+    
+    # Build a list of constants
+    def build_constants_summary_list(section)
+      values = []
+      @context.constants.each do |co|
+        next unless co.section == section
+        res = {
+          'name'  => co.name,
+          'value' => CGI.escapeHTML(co.value)
+        }
+        res['desc'] = markup(co.comment, true) if co.comment && !co.comment.empty?
+        values << res
+      end
+      values
+    end
+    
+    def build_requires_list(context)
+      potentially_referenced_list(context.requires) {|fn| [fn + ".rb"] }
+    end
+
+    def build_include_list(context)
+      potentially_referenced_list(context.includes)
+    end
+
+    # Build a list from an array of <i>Htmlxxx</i> items. Look up each
+    # in the AllReferences hash: if we find a corresponding entry,
+    # we generate a hyperlink to it, otherwise just output the name.
+    # However, some names potentially need massaging. For example,
+    # you may require a Ruby file without the .rb extension,
+    # but the file names we know about may have it. To deal with
+    # this, we pass in a block which performs the massaging,
+    # returning an array of alternative names to match
+
+    def potentially_referenced_list(array)
+      res = []
+      array.each do |i|
+        ref = AllReferences[i.name] 
+#         if !ref
+#           container = @context.parent
+#           while !ref && container
+#             name = container.name + "::" + i.name
+#             ref = AllReferences[name] 
+#             container = container.parent
+#           end
+#         end
+
+        ref = @context.find_symbol(i.name)
+        ref = ref.viewer if ref
+
+        if !ref && block_given?
+          possibles = yield(i.name)
+          while !ref and !possibles.empty?
+            ref = AllReferences[possibles.shift]
+          end
+        end
+        h_name = CGI.escapeHTML(i.name)
+        if ref and ref.document_self
+          path = url(ref.path)
+          res << { "name" => h_name, "aref" => path }
+        else
+          res << { "name" => h_name }
+        end
+      end
+      res
+    end
+
+    # Build an array of arrays of method details. The outer array has up
+    # to six entries, public, private, and protected for both class
+    # methods, the other for instance methods. The inner arrays contain
+    # a hash for each method
+
+    def build_method_detail_list(section)
+      outer = []
+
+      methods = @methods.sort
+      for singleton in [true, false]
+        for vis in [ :public, :protected, :private ] 
+          res = []
+          methods.each do |m|
+            if m.section == section and
+                m.document_self and 
+                m.visibility == vis and 
+                m.singleton == singleton
+              row = {}
+              if m.call_seq
+                row["callseq"] = m.call_seq.gsub(/->/, '&rarr;')
+              else
+                row["name"]        = CGI.escapeHTML(m.name)
+                row["params"]      = m.params
+              end
+              desc = m.description.strip
+              row["m_desc"]      = desc unless desc.empty?
+              row["aref"]        = m.aref
+              row["visibility"]  = m.visibility.to_s
+
+              alias_names = []
+              m.aliases.each do |other|
+                if other.viewer   # won't be if the alias is private
+                  alias_names << {
+                    'name' => other.name,
+                    'aref'  => other.viewer.as_href(path)
+                  } 
+                end
+              end
+              unless alias_names.empty?
+                row["aka"] = alias_names
+              end
+
+              if @options.inline_source
+                code = m.source_code
+                row["sourcecode"] = code if code
+              else
+                code = m.src_url
+                if code
+                  row["codeurl"] = code
+                  row["imgurl"]  = m.img_url
+                end
+              end
+              res << row
+            end
+          end
+          if res.size > 0 
+            outer << {
+              "type"    => vis.to_s.capitalize,
+              "category"    => singleton ? "Class" : "Instance",
+              "methods" => res
+            }
+          end
+        end
+      end
+      outer
+    end
+
+    # Build the structured list of classes and modules contained
+    # in this context. 
+
+    def build_class_list(level, from, section, infile=nil)
+      res = ""
+      prefix = "&nbsp;&nbsp;::" * level;
+
+      from.modules.sort.each do |mod|
+        next unless mod.section == section
+        next if infile && !mod.defined_in?(infile)
+        if mod.document_self
+          res << 
+            prefix <<
+            "Module " <<
+            href(url(mod.viewer.path), "link", mod.full_name) <<
+            "<br />\n" <<
+            build_class_list(level + 1, mod, section, infile)
+        end
+      end
+
+      from.classes.sort.each do |cls|
+        next unless cls.section == section
+        next if infile && !cls.defined_in?(infile)
+        if cls.document_self
+          res      <<
+            prefix << 
+            "Class " <<
+            href(url(cls.viewer.path), "link", cls.full_name) <<
+            "<br />\n" <<
+            build_class_list(level + 1, cls, section, infile)
+        end
+      end
+
+      res
+    end
+    
+    def url(target)
+      HTMLGenerator.gen_url(path, target)
+    end
+
+    def aref_to(target)
+      if @options.all_one_file
+        "#" + target
+      else
+        url(target)
+      end
+    end
+
+    def document_self
+      @context.document_self
+    end
+
+    def diagram_reference(diagram)
+      res = diagram.gsub(/((?:src|href)=")(.*?)"/) {
+        $1 + url($2) + '"'
+      }
+      res
+    end
+
+
+    # Find a symbol in ourselves or our parent
+    def find_symbol(symbol, method=nil)
+      res = @context.find_symbol(symbol, method)
+      if res
+        res = res.viewer
+      end
+      res
+    end
+
+    # create table of contents if we contain sections
+      
+    def add_table_of_sections
+      toc = []
+      @context.sections.each do |section|
+        if section.title
+          toc << {
+            'secname' => section.title,
+            'href'    => section.sequence
+          }
+        end
+      end
+      
+      @values['toc'] = toc unless toc.empty?
+    end
+
+
+  end
+
+  #####################################################################
+  #
+  # Wrap a ClassModule context
+
+  class HtmlClass < ContextUser
+
+    attr_reader :path
+
+    def initialize(context, html_file, prefix, options)
+      super(context, options)
+
+      @html_file = html_file
+      @is_module = context.is_module?
+      @values    = {}
+
+      context.viewer = self
+
+      if options.all_one_file
+        @path = context.full_name
+      else
+        @path = http_url(context.full_name, prefix)
+      end
+
+      collect_methods
+
+      AllReferences.add(name, self)
+    end
+
+    # return the relative file name to store this class in,
+    # which is also its url
+    def http_url(full_name, prefix)
+      path = full_name.dup
+      if path['<<']
+        path.gsub!(/<<\s*(\w*)/) { "from-#$1" }
+      end
+      File.join(prefix, path.split("::")) + ".html"
+    end
+
+
+    def name
+      @context.full_name
+    end
+
+    def parent_name
+      @context.parent.full_name
+    end
+
+    def index_name
+      name
+    end
+
+    def write_on(f)
+      value_hash
+      template = TemplatePage.new(RDoc::Page::BODY,
+                                      RDoc::Page::CLASS_PAGE,
+                                      RDoc::Page::METHOD_LIST)
+      template.write_html_on(f, @values)
+    end
+
+    def value_hash
+      class_attribute_values
+      add_table_of_sections
+
+      @values["charset"] = @options.charset
+      @values["style_url"] = style_url(path, @options.css)
+
+      d = markup(@context.comment)
+      @values["description"] = d unless d.empty?
+
+      ml = build_method_summary_list
+      @values["methods"] = ml unless ml.empty?
+
+      il = build_include_list(@context)
+      @values["includes"] = il unless il.empty?
+
+      @values["sections"] = @context.sections.map do |section|
+
+        secdata = {
+          "sectitle" => section.title,
+          "secsequence" => section.sequence,
+          "seccomment" => markup(section.comment)
+        }
+
+        al = build_alias_summary_list(section)
+        secdata["aliases"] = al unless al.empty?
+        
+        co = build_constants_summary_list(section)
+        secdata["constants"] = co unless co.empty?
+        
+        al = build_attribute_list(section)
+        secdata["attributes"] = al unless al.empty?
+        
+        cl = build_class_list(0, @context, section)
+        secdata["classlist"] = cl unless cl.empty?
+        
+        mdl = build_method_detail_list(section)
+        secdata["method_list"] = mdl unless mdl.empty?
+
+        secdata
+      end
+
+      @values
+    end
+
+    def build_attribute_list(section)
+      atts = @context.attributes.sort
+      res = []
+      atts.each do |att|
+        next unless att.section == section
+        if att.visibility == :public || att.visibility == :protected || @options.show_all
+          entry = {
+            "name"   => CGI.escapeHTML(att.name), 
+            "rw"     => att.rw, 
+            "a_desc" => markup(att.comment, true)
+          }
+          unless att.visibility == :public || att.visibility == :protected
+            entry["rw"] << "-"
+          end
+          res << entry
+        end
+      end
+      res
+    end
+
+    def class_attribute_values
+      h_name = CGI.escapeHTML(name)
+
+      @values["classmod"]  = @is_module ? "Module" : "Class"
+      @values["title"]     = "#{@values['classmod']}: #{h_name}"
+
+      c = @context
+      c = c.parent while c and !c.diagram
+      if c && c.diagram
+        @values["diagram"] = diagram_reference(c.diagram)
+      end
+
+      @values["full_name"] = h_name
+
+      parent_class = @context.superclass
+
+      if parent_class
+	@values["parent"] = CGI.escapeHTML(parent_class)
+
+	if parent_name
+	  lookup = parent_name + "::" + parent_class
+	else
+	  lookup = parent_class
+	end
+
+	parent_url = AllReferences[lookup] || AllReferences[parent_class]
+
+	if parent_url and parent_url.document_self
+	  @values["par_url"] = aref_to(parent_url.path)
+	end
+      end
+
+      files = []
+      @context.in_files.each do |f|
+        res = {}
+        full_path = CGI.escapeHTML(f.file_absolute_name)
+
+        res["full_path"]     = full_path
+        res["full_path_url"] = aref_to(f.viewer.path) if f.document_self
+
+        if @options.webcvs
+          res["cvsurl"] = cvs_url( @options.webcvs, full_path )
+        end
+
+        files << res
+      end
+
+      @values['infiles'] = files
+    end
+
+    def <=>(other)
+      self.name <=> other.name
+    end
+
+  end
+
+  #####################################################################
+  #
+  # Handles the mapping of a file's information to HTML. In reality,
+  # a file corresponds to a +TopLevel+ object, containing modules,
+  # classes, and top-level methods. In theory it _could_ contain
+  # attributes and aliases, but we ignore these for now.
+
+  class HtmlFile < ContextUser
+
+    attr_reader :path
+    attr_reader :name
+
+    def initialize(context, options, file_dir)
+      super(context, options)
+
+      @values = {}
+
+      if options.all_one_file
+        @path = filename_to_label
+      else
+        @path = http_url(file_dir)
+      end
+
+      @name = @context.file_relative_name
+
+      collect_methods
+      AllReferences.add(name, self)
+      context.viewer = self
+    end
+
+    def http_url(file_dir)
+      File.join(file_dir, @context.file_relative_name.tr('.', '_')) +
+        ".html"
+    end
+
+    def filename_to_label
+      @context.file_relative_name.gsub(/%|\/|\?|\#/) {|s| '%' + ("%x" % s[0]) }
+    end
+
+    def index_name
+      name
+    end
+
+    def parent_name
+      nil
+    end
+
+    def value_hash
+      file_attribute_values
+      add_table_of_sections
+
+      @values["charset"]   = @options.charset
+      @values["href"]      = path
+      @values["style_url"] = style_url(path, @options.css)
+
+      if @context.comment
+        d = markup(@context.comment)
+        @values["description"] = d if d.size > 0
+      end
+
+      ml = build_method_summary_list
+      @values["methods"] = ml unless ml.empty?
+
+      il = build_include_list(@context)
+      @values["includes"] = il unless il.empty?
+
+      rl = build_requires_list(@context)
+      @values["requires"] = rl unless rl.empty?
+
+      if @options.promiscuous
+        file_context = nil
+      else
+        file_context = @context
+      end
+
+
+      @values["sections"] = @context.sections.map do |section|
+
+        secdata = {
+          "sectitle" => section.title,
+          "secsequence" => section.sequence,
+          "seccomment" => markup(section.comment)
+        }
+
+        cl = build_class_list(0, @context, section, file_context)
+        @values["classlist"] = cl unless cl.empty?
+
+        mdl = build_method_detail_list(section)
+        secdata["method_list"] = mdl unless mdl.empty?
+
+        al = build_alias_summary_list(section)
+        secdata["aliases"] = al unless al.empty?
+        
+        co = build_constants_summary_list(section)
+        @values["constants"] = co unless co.empty?
+
+        secdata
+      end
+      
+      @values
+    end
+    
+    def write_on(f)
+      value_hash
+      template = TemplatePage.new(RDoc::Page::BODY,
+                                  RDoc::Page::FILE_PAGE,
+                                  RDoc::Page::METHOD_LIST)
+      template.write_html_on(f, @values)
+    end
+
+    def file_attribute_values
+      full_path = @context.file_absolute_name
+      short_name = File.basename(full_path)
+      
+      @values["title"] = CGI.escapeHTML("File: #{short_name}")
+
+      if @context.diagram
+        @values["diagram"] = diagram_reference(@context.diagram)
+      end
+
+      @values["short_name"]   = CGI.escapeHTML(short_name)
+      @values["full_path"]    = CGI.escapeHTML(full_path)
+      @values["dtm_modified"] = @context.file_stat.mtime.to_s
+
+      if @options.webcvs
+        @values["cvsurl"] = cvs_url( @options.webcvs, @values["full_path"] )
+      end
+    end
+
+    def <=>(other)
+      self.name <=> other.name
+    end
+  end
+
+  #####################################################################
+
+  class HtmlMethod
+    include MarkUp
+
+    attr_reader :context
+    attr_reader :src_url
+    attr_reader :img_url
+    attr_reader :source_code
+
+    @@seq = "M000000"
+
+    @@all_methods = []
+
+    def HtmlMethod::reset
+      @@all_methods = []
+    end
+
+    def initialize(context, html_class, options)
+      @context    = context
+      @html_class = html_class
+      @options    = options
+      @@seq       = @@seq.succ
+      @seq        = @@seq
+      @@all_methods << self
+
+      context.viewer = self
+
+      if (ts = @context.token_stream)
+        @source_code = markup_code(ts)
+        unless @options.inline_source
+          @src_url = create_source_code_file(@source_code)
+          @img_url = HTMLGenerator.gen_url(path, 'source.png')
+        end
+      end
+
+      AllReferences.add(name, self)
+    end
+    
+    # return a reference to outselves to be used as an href=
+    # the form depends on whether we're all in one file
+    # or in multiple files
+
+    def as_href(from_path)
+      if @options.all_one_file
+        "#" + path
+      else
+        HTMLGenerator.gen_url(from_path, path)
+      end
+    end
+
+    def name
+      @context.name
+    end
+
+    def section
+      @context.section
+    end
+
+    def index_name
+      "#{@context.name} (#{@html_class.name})"
+    end
+
+    def parent_name
+      if @context.parent.parent
+        @context.parent.parent.full_name
+      else
+        nil
+      end
+    end
+
+    def aref
+      @seq
+    end
+
+    def path
+      if @options.all_one_file
+	aref
+      else
+	@html_class.path + "#" + aref
+      end
+    end
+
+    def description
+      markup(@context.comment)
+    end
+
+    def visibility
+      @context.visibility
+    end
+
+    def singleton
+      @context.singleton
+    end
+
+    def call_seq
+      cs = @context.call_seq
+      if cs
+        cs.gsub(/\n/, "<br />\n")
+      else
+        nil
+      end
+    end
+
+    def params
+      # params coming from a call-seq in 'C' will start with the
+      # method name
+      p = @context.params
+      if p !~ /^\w/
+        p = @context.params.gsub(/\s*\#.*/, '')
+        p = p.tr("\n", " ").squeeze(" ")
+        p = "(" + p + ")" unless p[0] == ?(
+        
+        if (block = @context.block_params)
+         # If this method has explicit block parameters, remove any
+         # explicit &block
+
+         p.sub!(/,?\s*&\w+/, '')
+
+          block.gsub!(/\s*\#.*/, '')
+          block = block.tr("\n", " ").squeeze(" ")
+          if block[0] == ?(
+            block.sub!(/^\(/, '').sub!(/\)/, '')
+          end
+          p << " {|#{block.strip}| ...}"
+        end
+      end
+      CGI.escapeHTML(p)
+    end
+    
+    def create_source_code_file(code_body)
+      meth_path = @html_class.path.sub(/\.html$/, '.src')
+      File.makedirs(meth_path)
+      file_path = File.join(meth_path, @seq) + ".html"
+
+      template = TemplatePage.new(RDoc::Page::SRC_PAGE)
+      File.open(file_path, "w") do |f|
+        values = {
+          'title'     => CGI.escapeHTML(index_name),
+          'code'      => code_body,
+          'style_url' => style_url(file_path, @options.css),
+          'charset'   => @options.charset
+        }
+        template.write_html_on(f, values)
+      end
+      HTMLGenerator.gen_url(path, file_path)
+    end
+
+    def HtmlMethod.all_methods
+      @@all_methods
+    end
+
+    def <=>(other)
+      @context <=> other.context
+    end
+
+    ##
+    # Given a sequence of source tokens, mark up the source code
+    # to make it look purty.
+
+
+    def markup_code(tokens)
+      src = ""
+      tokens.each do |t|
+        next unless t
+        #    p t.class
+#        style = STYLE_MAP[t.class]
+        style = case t
+                when RubyToken::TkCONSTANT then "ruby-constant"
+                when RubyToken::TkKW       then "ruby-keyword kw"
+                when RubyToken::TkIVAR     then "ruby-ivar"
+                when RubyToken::TkOp       then "ruby-operator"
+                when RubyToken::TkId       then "ruby-identifier"
+                when RubyToken::TkNode     then "ruby-node"
+                when RubyToken::TkCOMMENT  then "ruby-comment cmt"
+                when RubyToken::TkREGEXP   then "ruby-regexp re"
+                when RubyToken::TkSTRING   then "ruby-value str"
+                when RubyToken::TkVal      then "ruby-value"
+                else
+                    nil
+                end
+
+        text = CGI.escapeHTML(t.text)
+
+        if style
+          src << "<span class=\"#{style}\">#{text}</span>"
+        else
+          src << text
+        end
+      end
+
+      add_line_numbers(src) if Options.instance.include_line_numbers
+      src
+    end
+
+    # we rely on the fact that the first line of a source code
+    # listing has 
+    #    # File xxxxx, line dddd
+
+    def add_line_numbers(src)
+      if src =~ /\A.*, line (\d+)/
+        first = $1.to_i - 1
+        last  = first + src.count("\n")
+        size = last.to_s.length
+        real_fmt = "%#{size}d: "
+        fmt = " " * (size+2)
+        src.gsub!(/^/) do
+          res = sprintf(fmt, first) 
+          first += 1
+          fmt = real_fmt
+          res
+        end
+      end
+    end
+
+    def document_self
+      @context.document_self
+    end
+
+    def aliases
+      @context.aliases
+    end
+
+    def find_symbol(symbol, method=nil)
+      res = @context.parent.find_symbol(symbol, method)
+      if res
+        res = res.viewer
+      end
+      res
+    end
+  end
+
+  #####################################################################
+
+  class HTMLGenerator
+
+    include MarkUp
+
+    ##
+    # convert a target url to one that is relative to a given
+    # path
+    
+    def HTMLGenerator.gen_url(path, target)
+      from          = File.dirname(path)
+      to, to_file   = File.split(target)
+      
+      from = from.split("/")
+      to   = to.split("/")
+      
+      while from.size > 0 and to.size > 0 and from[0] == to[0]
+        from.shift
+        to.shift
+      end
+      
+      from.fill("..")
+      from.concat(to)
+      from << to_file
+      File.join(*from)
+    end
+
+    # Generators may need to return specific subclasses depending
+    # on the options they are passed. Because of this
+    # we create them using a factory
+
+    def HTMLGenerator.for(options)
+      AllReferences::reset
+      HtmlMethod::reset
+
+      if options.all_one_file
+        HTMLGeneratorInOne.new(options)
+      else
+        HTMLGenerator.new(options)
+      end
+    end
+
+    class <<self
+      protected :new
+    end
+
+    # Set up a new HTML generator. Basically all we do here is load
+    # up the correct output temlate
+
+    def initialize(options) #:not-new:
+      @options    = options
+      load_html_template
+    end
+
+
+    ##
+    # Build the initial indices and output objects
+    # based on an array of TopLevel objects containing
+    # the extracted information. 
+
+    def generate(toplevels)
+      @toplevels  = toplevels
+      @files      = []
+      @classes    = []
+
+      write_style_sheet
+      gen_sub_directories()
+      build_indices
+      generate_html
+    end
+
+    private
+
+    ##
+    # Load up the HTML template specified in the options.
+    # If the template name contains a slash, use it literally
+    #
+    def load_html_template
+      template = @options.template
+      unless template =~ %r{/|\\}
+        template = File.join("rdoc/generators/template",
+                             @options.generator.key, template)
+      end
+      require template
+      extend RDoc::Page
+    rescue LoadError
+      $stderr.puts "Could not find HTML template '#{template}'"
+      exit 99
+    end
+
+    ##
+    # Write out the style sheet used by the main frames
+    #
+    
+    def write_style_sheet
+      template = TemplatePage.new(RDoc::Page::STYLE)
+      unless @options.css
+        File.open(CSS_NAME, "w") do |f|
+          values = { "fonts" => RDoc::Page::FONTS }
+          template.write_html_on(f, values)
+        end
+      end
+    end
+
+    ##
+    # See the comments at the top for a description of the
+    # directory structure
+
+    def gen_sub_directories
+      File.makedirs(FILE_DIR, CLASS_DIR)
+    rescue 
+      $stderr.puts $!.message
+      exit 1
+    end
+
+    ##
+    # Generate:
+    #
+    # * a list of HtmlFile objects for each TopLevel object.
+    # * a list of HtmlClass objects for each first level
+    #   class or module in the TopLevel objects
+    # * a complete list of all hyperlinkable terms (file,
+    #   class, module, and method names)
+
+    def build_indices
+
+      @toplevels.each do |toplevel|
+        @files << HtmlFile.new(toplevel, @options, FILE_DIR)
+      end
+
+      RDoc::TopLevel.all_classes_and_modules.each do |cls|
+        build_class_list(cls, @files[0], CLASS_DIR)
+      end
+    end
+
+    def build_class_list(from, html_file, class_dir)
+      @classes << HtmlClass.new(from, html_file, class_dir, @options)
+      from.each_classmodule do |mod|
+        build_class_list(mod, html_file, class_dir)
+      end
+    end
+
+    ##
+    # Generate all the HTML
+    #
+    def generate_html
+      # the individual descriptions for files and classes
+      gen_into(@files)
+      gen_into(@classes)
+      # and the index files
+      gen_file_index
+      gen_class_index
+      gen_method_index
+      gen_main_index
+      
+      # this method is defined in the template file
+      write_extra_pages if defined? write_extra_pages
+    end
+
+    def gen_into(list)
+      list.each do |item|
+        if item.document_self
+          op_file = item.path
+          File.makedirs(File.dirname(op_file))
+          File.open(op_file, "w") { |file| item.write_on(file) }
+        end
+      end
+
+    end
+
+    def gen_file_index
+      gen_an_index(@files, 'Files', 
+                   RDoc::Page::FILE_INDEX, 
+                   "fr_file_index.html")
+    end
+
+    def gen_class_index
+      gen_an_index(@classes, 'Classes',
+                   RDoc::Page::CLASS_INDEX,
+                   "fr_class_index.html")
+    end
+
+    def gen_method_index
+      gen_an_index(HtmlMethod.all_methods, 'Methods', 
+                   RDoc::Page::METHOD_INDEX,
+                   "fr_method_index.html")
+    end
+
+    
+    def gen_an_index(collection, title, template, filename)
+      template = TemplatePage.new(RDoc::Page::FR_INDEX_BODY, template)
+      res = []
+      collection.sort.each do |f|
+        if f.document_self
+          res << { "href" => f.path, "name" => f.index_name }
+        end
+      end
+
+      values = {
+        "entries"    => res,
+        'list_title' => CGI.escapeHTML(title),
+        'index_url'  => main_url,
+        'charset'    => @options.charset,
+        'style_url'  => style_url('', @options.css),
+      }
+
+      File.open(filename, "w") do |f|
+        template.write_html_on(f, values)
+      end
+    end
+
+    # The main index page is mostly a template frameset, but includes
+    # the initial page. If the <tt>--main</tt> option was given,
+    # we use this as our main page, otherwise we use the
+    # first file specified on the command line.
+
+    def gen_main_index
+      template = TemplatePage.new(RDoc::Page::INDEX)
+      File.open("index.html", "w") do |f|
+        values = {
+          "initial_page" => main_url,
+          'title'        => CGI.escapeHTML(@options.title),
+          'charset'      => @options.charset
+        }
+        if @options.inline_source
+          values['inline_source'] = true
+        end
+        template.write_html_on(f, values)
+      end
+    end
+
+    # return the url of the main page
+    def main_url
+      main_page = @options.main_page
+      ref = nil
+      if main_page
+        ref = AllReferences[main_page]
+        if ref
+          ref = ref.path
+        else
+          $stderr.puts "Could not find main page #{main_page}"
+        end
+      end
+
+      unless ref
+        for file in @files
+          if file.document_self
+            ref = file.path 
+            break
+          end
+        end
+      end
+
+      unless ref
+        $stderr.puts "Couldn't find anything to document"
+        $stderr.puts "Perhaps you've used :stopdoc: in all classes"
+        exit(1)
+      end
+
+      ref
+    end
+
+
+  end
+
+
+  ######################################################################
+
+
+  class HTMLGeneratorInOne < HTMLGenerator
+
+    def initialize(*args)
+      super
+    end
+
+    ##
+    # Build the initial indices and output objects
+    # based on an array of TopLevel objects containing
+    # the extracted information. 
+
+    def generate(info)
+      @toplevels  = info
+      @files      = []
+      @classes    = []
+      @hyperlinks = {}
+
+      build_indices
+      generate_xml
+    end
+
+
+    ##
+    # Generate:
+    #
+    # * a list of HtmlFile objects for each TopLevel object.
+    # * a list of HtmlClass objects for each first level
+    #   class or module in the TopLevel objects
+    # * a complete list of all hyperlinkable terms (file,
+    #   class, module, and method names)
+
+    def build_indices
+
+      @toplevels.each do |toplevel|
+        @files << HtmlFile.new(toplevel, @options, FILE_DIR)
+      end
+
+      RDoc::TopLevel.all_classes_and_modules.each do |cls|
+        build_class_list(cls, @files[0], CLASS_DIR)
+      end
+    end
+
+    def build_class_list(from, html_file, class_dir)
+      @classes << HtmlClass.new(from, html_file, class_dir, @options)
+      from.each_classmodule do |mod|
+        build_class_list(mod, html_file, class_dir)
+      end
+    end
+
+    ##
+    # Generate all the HTML. For the one-file case, we generate
+    # all the information in to one big hash
+    #
+    def generate_xml
+      values = { 
+        'charset' => @options.charset,
+        'files'   => gen_into(@files),
+        'classes' => gen_into(@classes),
+        'title'        => CGI.escapeHTML(@options.title),
+      }
+      
+      # this method is defined in the template file
+      write_extra_pages if defined? write_extra_pages
+
+      template = TemplatePage.new(RDoc::Page::ONE_PAGE)
+
+      if @options.op_name
+        opfile = File.open(@options.op_name, "w")
+      else
+        opfile = $stdout
+      end
+      template.write_html_on(opfile, values)
+    end
+
+    def gen_into(list)
+      res = []
+      list.each do |item|
+        res << item.value_hash
+      end
+      res
+    end
+
+    def gen_file_index
+      gen_an_index(@files, 'Files')
+    end
+
+    def gen_class_index
+      gen_an_index(@classes, 'Classes')
+    end
+
+    def gen_method_index
+      gen_an_index(HtmlMethod.all_methods, 'Methods')
+    end
+
+    
+    def gen_an_index(collection, title)
+      res = []
+      collection.sort.each do |f|
+        if f.document_self
+          res << { "href" => f.path, "name" => f.index_name }
+        end
+      end
+
+      return {
+        "entries" => res,
+        'list_title' => title,
+        'index_url'  => main_url,
+      }
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/generators/ri_generator.rb b/ruby_1_8_6/lib/rdoc/generators/ri_generator.rb
new file mode 100644
index 0000000000..c7d0bbd8f0
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/generators/ri_generator.rb
@@ -0,0 +1,268 @@
+# We're responsible for generating all the HTML files
+# from the object tree defined in code_objects.rb. We
+# generate:
+#
+# [files]   an html file for each input file given. These
+#           input files appear as objects of class
+#           TopLevel
+#
+# [classes] an html file for each class or module encountered.
+#           These classes are not grouped by file: if a file
+#           contains four classes, we'll generate an html
+#           file for the file itself, and four html files 
+#           for the individual classes. 
+#
+# [indices] we generate three indices for files, classes,
+#           and methods. These are displayed in a browser
+#           like window with three index panes across the
+#           top and the selected description below
+#
+# Method descriptions appear in whatever entity (file, class,
+# or module) that contains them.
+#
+# We generate files in a structure below a specified subdirectory,
+# normally +doc+.
+#
+#  opdir
+#     |
+#     |___ files
+#     |       |__  per file summaries
+#     |
+#     |___ classes
+#             |__ per class/module descriptions
+#
+# HTML is generated using the Template class.
+#
+
+require 'ftools'
+
+require 'rdoc/options'
+require 'rdoc/template'
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_flow'
+require 'cgi'
+
+require 'rdoc/ri/ri_cache'
+require 'rdoc/ri/ri_reader'
+require 'rdoc/ri/ri_writer'
+require 'rdoc/ri/ri_descriptions'
+
+module Generators
+
+
+  class RIGenerator
+
+    # Generators may need to return specific subclasses depending
+    # on the options they are passed. Because of this
+    # we create them using a factory
+
+    def RIGenerator.for(options)
+      new(options)
+    end
+
+    class <<self
+      protected :new
+    end
+
+    # Set up a new HTML generator. Basically all we do here is load
+    # up the correct output temlate
+
+    def initialize(options) #:not-new:
+      @options   = options
+      @ri_writer = RI::RiWriter.new(".")
+      @markup    = SM::SimpleMarkup.new
+      @to_flow   = SM::ToFlow.new
+    end
+
+
+    ##
+    # Build the initial indices and output objects
+    # based on an array of TopLevel objects containing
+    # the extracted information. 
+
+    def generate(toplevels)
+      RDoc::TopLevel.all_classes_and_modules.each do |cls|
+        process_class(cls)
+      end
+    end
+
+    def process_class(from_class)
+      generate_class_info(from_class)
+
+      # now recure into this classes constituent classess
+      from_class.each_classmodule do |mod|
+        process_class(mod)
+      end
+    end
+
+    def generate_class_info(cls)
+      if cls === RDoc::NormalModule
+        cls_desc = RI::ModuleDescription.new
+      else
+        cls_desc = RI::ClassDescription.new
+        cls_desc.superclass  = cls.superclass
+      end
+      cls_desc.name        = cls.name
+      cls_desc.full_name   = cls.full_name
+      cls_desc.comment     = markup(cls.comment)
+
+      cls_desc.attributes =cls.attributes.sort.map do |a|
+        RI::Attribute.new(a.name, a.rw, markup(a.comment))
+      end
+
+      cls_desc.constants = cls.constants.map do |c|
+        RI::Constant.new(c.name, c.value, markup(c.comment))
+      end
+
+      cls_desc.includes = cls.includes.map do |i|
+        RI::IncludedModule.new(i.name)
+      end
+
+      class_methods, instance_methods = method_list(cls)
+
+      cls_desc.class_methods = class_methods.map do |m|
+        RI::MethodSummary.new(m.name)
+      end
+      cls_desc.instance_methods = instance_methods.map do |m|
+        RI::MethodSummary.new(m.name)
+      end
+
+      update_or_replace(cls_desc)
+
+      class_methods.each do |m|
+        generate_method_info(cls_desc, m)
+      end
+
+      instance_methods.each do |m|
+        generate_method_info(cls_desc, m)
+      end
+    end
+
+
+    def generate_method_info(cls_desc, method)
+      meth_desc = RI::MethodDescription.new
+      meth_desc.name = method.name
+      meth_desc.full_name = cls_desc.full_name
+      if method.singleton
+        meth_desc.full_name += "::"
+      else
+        meth_desc.full_name += "#"
+      end
+      meth_desc.full_name << method.name
+
+      meth_desc.comment = markup(method.comment)
+      meth_desc.params = params_of(method)
+      meth_desc.visibility = method.visibility.to_s
+      meth_desc.is_singleton = method.singleton
+      meth_desc.block_params = method.block_params
+
+      meth_desc.aliases = method.aliases.map do |a|
+        RI::AliasName.new(a.name)
+      end
+
+      @ri_writer.add_method(cls_desc, meth_desc)
+    end
+
+    private
+
+    # return a list of class and instance methods that we'll be
+    # documenting
+
+    def method_list(cls)
+      list = cls.method_list
+      unless @options.show_all
+        list = list.find_all do |m|
+          m.visibility == :public || m.visibility == :protected || m.force_documentation
+        end
+      end
+
+      c = []
+      i = []
+      list.sort.each do |m|
+        if m.singleton
+          c << m
+        else
+          i << m
+        end
+      end
+      return c,i
+    end
+    
+    def params_of(method)
+      if method.call_seq
+        method.call_seq
+      else
+        params = method.params || ""
+        
+        p = params.gsub(/\s*\#.*/, '')
+        p = p.tr("\n", " ").squeeze(" ")
+        p = "(" + p + ")" unless p[0] == ?(
+        
+        if (block = method.block_params)
+          block.gsub!(/\s*\#.*/, '')
+          block = block.tr("\n", " ").squeeze(" ")
+          if block[0] == ?(
+            block.sub!(/^\(/, '').sub!(/\)/, '')
+          end
+          p << " {|#{block.strip}| ...}"
+        end
+        p
+      end
+    end
+
+    def markup(comment)
+      return nil if !comment || comment.empty?
+
+      # Convert leading comment markers to spaces, but only
+      # if all non-blank lines have them
+      
+      if comment =~ /^(?>\s*)[^\#]/
+        content = comment
+      else
+        content = comment.gsub(/^\s*(#+)/)  { $1.tr('#',' ') }
+      end
+      @markup.convert(content, @to_flow)
+    end
+
+
+    # By default we replace existing classes with the
+    # same name. If the --merge option was given, we instead
+    # merge this definition into an existing class. We add
+    # our methods, aliases, etc to that class, but do not
+    # change the class's description.
+
+    def update_or_replace(cls_desc)
+      old_cls = nil
+
+      if @options.merge
+        rdr = RI::RiReader.new(RI::RiCache.new(@options.op_dir))
+
+        namespace = rdr.top_level_namespace
+        namespace = rdr.lookup_namespace_in(cls_desc.name, namespace)
+        if namespace.empty?
+          $stderr.puts "You asked me to merge this source into existing "
+          $stderr.puts "documentation. This file references a class or "
+          $stderr.puts "module called #{cls_desc.name} which I don't"
+          $stderr.puts "have existing documentation for."
+          $stderr.puts 
+          $stderr.puts "Perhaps you need to generate its documentation first"
+          exit 1
+        else
+          old_cls = namespace[0]
+        end
+      end
+
+      if old_cls.nil?
+        # no merge: simply overwrite
+        @ri_writer.remove_class(cls_desc)
+        @ri_writer.add_class(cls_desc)
+      else
+        # existing class: merge in
+        old_desc = rdr.get_class(old_cls)
+
+        old_desc.merge_in(cls_desc)
+        @ri_writer.add_class(old_desc)
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/generators/template/chm/chm.rb b/ruby_1_8_6/lib/rdoc/generators/template/chm/chm.rb
new file mode 100644
index 0000000000..4a89c26520
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/generators/template/chm/chm.rb
@@ -0,0 +1,87 @@
+module RDoc
+module Page
+
+require "rdoc/generators/template/html/html"
+
+# This is a nasty little hack, but hhc doesn't support the <?xml
+# tag, so...
+
+BODY.sub!(/<\?xml.*\?>/, '')
+SRC_PAGE.sub!(/<\?xml.*\?>/, '')
+
+HPP_FILE = %{
+[OPTIONS]
+Auto Index = Yes
+Compatibility=1.1 or later
+Compiled file=%opname%.chm
+Contents file=contents.hhc
+Full-text search=Yes
+Index file=index.hhk
+Language=0x409 English(United States)
+Title=%title%
+
+[FILES]
+START:all_html_files
+%html_file_name%
+END:all_html_files
+}
+
+CONTENTS = %{
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<HTML>
+<HEAD>
+<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
+<!-- Sitemap 1.0 -->
+</HEAD><BODY>
+<OBJECT type="text/site properties">
+	<param name="Foreground" value="0x80">
+	<param name="Window Styles" value="0x800025">
+	<param name="ImageType" value="Folder">
+</OBJECT>
+<UL>
+START:contents
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="%c_name%">
+		<param name="Local" value="%ref%">
+		</OBJECT>
+IF:methods
+<ul>
+START:methods
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="%name%">
+		<param name="Local" value="%aref%">
+		</OBJECT>
+END:methods
+</ul>
+ENDIF:methods
+        </LI>
+END:contents
+</UL>
+</BODY></HTML>
+}
+
+
+CHM_INDEX  = %{
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<HTML>
+<HEAD>
+<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
+<!-- Sitemap 1.0 -->
+</HEAD><BODY>
+<OBJECT type="text/site properties">
+	<param name="Foreground" value="0x80">
+	<param name="Window Styles" value="0x800025">
+	<param name="ImageType" value="Folder">
+</OBJECT>
+<UL>
+START:index
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="%name%">
+		<param name="Local" value="%aref%">
+		</OBJECT>
+END:index
+</UL>
+</BODY></HTML>
+}
+end
+end
diff --git a/ruby_1_8_6/lib/rdoc/generators/template/html/hefss.rb b/ruby_1_8_6/lib/rdoc/generators/template/html/hefss.rb
new file mode 100644
index 0000000000..e68ca85823
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/generators/template/html/hefss.rb
@@ -0,0 +1,418 @@
+module RDoc
+module Page
+
+
+FONTS = "Verdana, Arial, Helvetica, sans-serif"
+
+STYLE = %{
+body,p { font-family: Verdana, Arial, Helvetica, sans-serif; 
+       color: #000040; background: #BBBBBB;
+}
+
+td { font-family: Verdana, Arial, Helvetica, sans-serif; 
+       color: #000040;
+}
+
+.attr-rw { font-size: small; color: #444488 }
+
+.title-row {color:      #eeeeff;
+	    background: #BBBBDD;
+}
+
+.big-title-font { color: white;
+                  font-family: Verdana, Arial, Helvetica, sans-serif;
+                  font-size: large; 
+                  height: 50px}
+
+.small-title-font { color: purple;
+                    font-family: Verdana, Arial, Helvetica, sans-serif;
+                    font-size: small; }
+
+.aqua { color: purple }
+
+.method-name, attr-name {
+      font-family: monospace; font-weight: bold;
+}
+
+.tablesubtitle {
+   width: 100%;
+   margin-top: 1ex;
+   margin-bottom: .5ex;
+   padding: 5px 0px 5px 20px;
+   font-size: large;
+   color: purple;
+   background: #BBBBCC;
+}
+
+.tablesubsubtitle {
+   width: 100%;
+   margin-top: 1ex;
+   margin-bottom: .5ex;
+   padding: 5px 0px 5px 20px;
+   font-size: medium;
+   color: white;
+   background: #BBBBCC;
+}
+
+.name-list {
+  font-family: monospace;
+  margin-left: 40px;
+  margin-bottom: 2ex;
+  line-height: 140%;
+}
+
+.description {
+  margin-left: 40px;
+  margin-bottom: 2ex;
+  line-height: 140%;
+}
+
+.methodtitle {
+  font-size: medium;
+  text_decoration: none;
+  padding: 3px 3px 3px 20px;
+  color: #0000AA;
+}
+
+.column-title {
+  font-size: medium;
+  font-weight: bold;
+  text_decoration: none;
+  padding: 3px 3px 3px 20px;
+  color: #3333CC;
+  }
+
+.variable-name {
+  font-family: monospace;
+  font-size: medium;
+  text_decoration: none;
+  padding: 3px 3px 3px 20px;
+  color: #0000AA;
+}
+
+.row-name {
+  font-size: medium;
+  font-weight: medium;
+  font-family: monospace;
+  text_decoration: none;
+  padding: 3px 3px 3px 20px;
+}
+
+.paramsig {
+   font-size: small;
+}
+
+.srcbut { float: right }
+
+}
+
+
+############################################################################
+
+
+BODY = %{
+<html><head>
+  <title>%title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+  <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+  <script type="text/javascript" language="JavaScript">
+  <!--
+  function popCode(url) {
+    parent.frames.source.location = url
+  }
+  //-->
+  </script>
+</head>
+<body bgcolor="#BBBBBB">
+
+!INCLUDE!  <!-- banner header -->
+
+IF:diagram
+<table width="100%"><tr><td align="center">
+%diagram%
+</td></tr></table>
+ENDIF:diagram
+
+IF:description
+<div class="description">%description%</div>
+ENDIF:description
+
+IF:requires
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Required files</td></tr>
+</table><br />
+<div class="name-list">
+START:requires
+HREF:aref:name:
+END:requires
+ENDIF:requires
+</div>
+
+IF:methods
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Subroutines and Functions</td></tr>
+</table><br />
+<div class="name-list">
+START:methods
+HREF:aref:name:,
+END:methods
+</div>
+ENDIF:methods
+
+IF:attributes
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Arguments</td></tr>
+</table><br />
+<table cellspacing="5">
+START:attributes
+     <tr valign="top">
+IF:rw
+       <td align="center" class="attr-rw">&nbsp;[%rw%]&nbsp;</td>
+ENDIF:rw
+IFNOT:rw
+       <td></td>
+ENDIF:rw
+       <td class="attr-name">%name%</td>
+       <td>%a_desc%</td>
+     </tr>
+END:attributes
+</table>
+ENDIF:attributes
+
+IF:classlist
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Modules</td></tr>
+</table><br />
+%classlist%<br />
+ENDIF:classlist
+
+  !INCLUDE!  <!-- method descriptions -->
+
+</body>
+</html>
+}
+
+###############################################################################
+
+FILE_PAGE = <<_FILE_PAGE_
+<table width="100%">
+ <tr class="title-row">
+ <td><table width="100%"><tr>
+   <td class="big-title-font" colspan="2"><font size="-3"><b>File</b><br /></font>%short_name%</td>
+   <td align="right"><table cellspacing="0" cellpadding="2">
+         <tr>
+           <td  class="small-title-font">Path:</td>
+           <td class="small-title-font">%full_path%
+IF:cvsurl
+				&nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+           </td>
+         </tr>
+         <tr>
+           <td class="small-title-font">Modified:</td>
+           <td class="small-title-font">%dtm_modified%</td>
+         </tr>
+        </table>
+    </td></tr></table></td>
+  </tr>
+</table><br />
+_FILE_PAGE_
+
+###################################################################
+
+CLASS_PAGE = %{
+<table width="100%" border="0" cellspacing="0">
+ <tr class="title-row">
+ <td class="big-title-font">
+   <font size="-3"><b>%classmod%</b><br /></font>%full_name%
+ </td>
+ <td align="right">
+   <table cellspacing="0" cellpadding="2">
+     <tr valign="top">
+      <td class="small-title-font">In:</td>
+      <td class="small-title-font">
+START:infiles
+HREF:full_path_url:full_path:
+IF:cvsurl
+&nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+END:infiles
+      </td>
+     </tr>
+IF:parent
+     <tr>
+      <td class="small-title-font">Parent:</td>
+      <td class="small-title-font">
+IF:par_url
+        <a href="%par_url%" class="cyan">
+ENDIF:par_url
+%parent%
+IF:par_url
+         </a>
+ENDIF:par_url
+      </td>
+     </tr>
+ENDIF:parent
+   </table>
+  </td>
+  </tr>
+</table><br />
+}
+
+###################################################################
+
+METHOD_LIST = %{
+IF:includes
+<div class="tablesubsubtitle">Uses</div><br />
+<div class="name-list">
+START:includes
+    <span class="method-name">HREF:aref:name:</span>
+END:includes
+</div>
+ENDIF:includes
+
+IF:method_list
+START:method_list
+IF:methods
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">%type% %category% methods</td></tr>
+</table>
+START:methods
+<table width="100%" cellspacing="0" cellpadding="5" border="0">
+<tr><td class="methodtitle">
+<a name="%aref%">
+<b>%name%</b>%params% 
+IF:codeurl
+<a href="%codeurl%" target="source" class="srclink">src</a>
+ENDIF:codeurl
+</a></td></tr>
+</table>
+IF:m_desc
+<div class="description">
+%m_desc%
+</div>
+ENDIF:m_desc
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+}
+
+=begin
+=end
+
+########################## Source code ##########################
+
+SRC_PAGE = %{
+<html>
+<head><title>%title%</title>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<style type="text/css">
+  .kw { color: #3333FF; font-weight: bold }
+  .cmt { color: green; font-style: italic }
+  .str { color: #662222; font-style: italic }
+  .re  { color: #662222; }
+.ruby-comment    { color: green; font-style: italic }
+.ruby-constant   { color: #4433aa; font-weight: bold; }
+.ruby-identifier { color: #222222;  }
+.ruby-ivar       { color: #2233dd; }
+.ruby-keyword    { color: #3333FF; font-weight: bold }
+.ruby-node       { color: #777777; }
+.ruby-operator   { color: #111111;  }
+.ruby-regexp     { color: #662222; }
+.ruby-value      { color: #662222; font-style: italic }
+</style>
+</head>
+<body bgcolor="#BBBBBB">
+<pre>%code%</pre>
+</body>
+</html>
+}
+
+########################## Index ################################
+
+FR_INDEX_BODY = %{
+!INCLUDE!
+}
+
+FILE_INDEX = %{
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<style type="text/css">
+<!--
+  body {
+background-color: #bbbbbb;
+     font-family: #{FONTS}; 
+       font-size: 11px; 
+      font-style: normal;
+     line-height: 14px; 
+           color: #000040;
+  }
+div.banner {
+  background: #bbbbcc;
+  color:      white;
+  padding: 1;
+  margin: 0;
+  font-size: 90%;
+  font-weight: bold;
+  line-height: 1.1;
+  text-align: center;
+  width: 100%;
+}
+  
+-->
+</style>
+<base target="docwin">
+</head>
+<body>
+<div class="banner">%list_title%</div>
+START:entries
+<a href="%href%">%name%</a><br />
+END:entries
+</body></html>
+}
+
+CLASS_INDEX = FILE_INDEX
+METHOD_INDEX = FILE_INDEX
+
+INDEX = %{
+<html>
+<head>
+  <title>%title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+</head>
+
+<frameset cols="20%,*">
+    <frameset rows="15%,35%,50%">
+        <frame src="fr_file_index.html"   title="Files" name="Files">
+        <frame src="fr_class_index.html"  name="Modules">
+        <frame src="fr_method_index.html" name="Subroutines and Functions">
+    </frameset>
+    <frameset rows="80%,20%">
+      <frame  src="%initial_page%" name="docwin">
+      <frame  src="blank.html" name="source">
+    </frameset>
+    <noframes>
+          <body bgcolor="#BBBBBB">
+            Click <a href="html/index.html">here</a> for a non-frames
+            version of this page.
+          </body>
+    </noframes>
+</frameset>
+
+</html>
+}
+
+# and a blank page to use as a target
+BLANK = %{
+<html><body bgcolor="#BBBBBB"></body></html>
+}
+
+def write_extra_pages
+  template = TemplatePage.new(BLANK)
+  File.open("blank.html", "w") { |f| template.write_html_on(f, {}) }
+end
+
+end
+end
diff --git a/ruby_1_8_6/lib/rdoc/generators/template/html/html.rb b/ruby_1_8_6/lib/rdoc/generators/template/html/html.rb
new file mode 100644
index 0000000000..7f9e599465
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/generators/template/html/html.rb
@@ -0,0 +1,711 @@
+#
+# = CSS2 RDoc HTML template
+#
+# This is a template for RDoc that uses XHTML 1.0 Transitional and dictates a
+# bit more of the appearance of the output to cascading stylesheets than the
+# default. It was designed for clean inline code display, and uses DHTMl to
+# toggle the visbility of each method's source with each click on the '[source]'
+# link.
+#
+# == Authors
+#
+# * Michael Granger <ged@FaerieMUD.org>
+#
+# Copyright (c) 2002, 2003 The FaerieMUD Consortium. Some rights reserved.
+#
+# This work is licensed under the Creative Commons Attribution License. To view
+# a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or
+# send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California
+# 94305, USA.
+#
+
+module RDoc
+  module Page
+
+    FONTS = "Verdana,Arial,Helvetica,sans-serif"
+
+STYLE = %{
+body {
+    font-family: Verdana,Arial,Helvetica,sans-serif;
+    font-size:   90%;
+    margin: 0;
+    margin-left: 40px;
+    padding: 0;
+    background: white;
+}
+
+h1,h2,h3,h4 { margin: 0; color: #efefef; background: transparent; }
+h1 { font-size: 150%; }
+h2,h3,h4 { margin-top: 1em; }
+
+a { background: #eef; color: #039; text-decoration: none; }
+a:hover { background: #039; color: #eef; }
+
+/* Override the base stylesheet's Anchor inside a table cell */
+td > a {
+  background: transparent;
+  color: #039;
+  text-decoration: none;
+}
+
+/* and inside a section title */
+.section-title > a {
+  background: transparent;
+  color: #eee;
+  text-decoration: none;
+}
+
+/* === Structural elements =================================== */
+
+div#index {
+    margin: 0;
+    margin-left: -40px;
+    padding: 0;
+    font-size: 90%;
+}
+
+
+div#index a {
+    margin-left: 0.7em;
+}
+
+div#index .section-bar {
+   margin-left: 0px;
+   padding-left: 0.7em;
+   background: #ccc;
+   font-size: small;
+}
+
+
+div#classHeader, div#fileHeader {
+    width: auto;
+    color: white;
+    padding: 0.5em 1.5em 0.5em 1.5em;
+    margin: 0;
+    margin-left: -40px;
+    border-bottom: 3px solid #006;
+}
+
+div#classHeader a, div#fileHeader a {
+    background: inherit;
+    color: white;
+}
+
+div#classHeader td, div#fileHeader td {
+    background: inherit;
+    color: white;
+}
+
+
+div#fileHeader {
+    background: #057;
+}
+
+div#classHeader {
+    background: #048;
+}
+
+
+.class-name-in-header {
+  font-size:  180%;
+  font-weight: bold;
+}
+
+
+div#bodyContent {
+    padding: 0 1.5em 0 1.5em;
+}
+
+div#description {
+    padding: 0.5em 1.5em;
+    background: #efefef;
+    border: 1px dotted #999;
+}
+
+div#description h1,h2,h3,h4,h5,h6 {
+    color: #125;;
+    background: transparent;
+}
+
+div#validator-badges {
+    text-align: center;
+}
+div#validator-badges img { border: 0; }
+
+div#copyright {
+    color: #333;
+    background: #efefef;
+    font: 0.75em sans-serif;
+    margin-top: 5em;
+    margin-bottom: 0;
+    padding: 0.5em 2em;
+}
+
+
+/* === Classes =================================== */
+
+table.header-table {
+    color: white;
+    font-size: small;
+}
+
+.type-note {
+    font-size: small;
+    color: #DEDEDE;
+}
+
+.xxsection-bar {
+    background: #eee;
+    color: #333;
+    padding: 3px;
+}
+
+.section-bar {
+   color: #333;
+   border-bottom: 1px solid #999;
+    margin-left: -20px;
+}
+
+
+.section-title {
+    background: #79a;
+    color: #eee;
+    padding: 3px;
+    margin-top: 2em;
+    margin-left: -30px;
+    border: 1px solid #999;
+}
+
+.top-aligned-row {  vertical-align: top }
+.bottom-aligned-row { vertical-align: bottom }
+
+/* --- Context section classes ----------------------- */
+
+.context-row { }
+.context-item-name { font-family: monospace; font-weight: bold; color: black; }
+.context-item-value { font-size: small; color: #448; }
+.context-item-desc { color: #333; padding-left: 2em; }
+
+/* --- Method classes -------------------------- */
+.method-detail {
+    background: #efefef;
+    padding: 0;
+    margin-top: 0.5em;
+    margin-bottom: 1em;
+    border: 1px dotted #ccc;
+}
+.method-heading {
+  color: black;
+  background: #ccc;
+  border-bottom: 1px solid #666;
+  padding: 0.2em 0.5em 0 0.5em;
+}
+.method-signature { color: black; background: inherit; }
+.method-name { font-weight: bold; }
+.method-args { font-style: italic; }
+.method-description { padding: 0 0.5em 0 0.5em; }
+
+/* --- Source code sections -------------------- */
+
+a.source-toggle { font-size: 90%; }
+div.method-source-code {
+    background: #262626;
+    color: #ffdead;
+    margin: 1em;
+    padding: 0.5em;
+    border: 1px dashed #999;
+    overflow: hidden;
+}
+
+div.method-source-code pre { color: #ffdead; overflow: hidden; }
+
+/* --- Ruby keyword styles --------------------- */
+
+.standalone-code { background: #221111; color: #ffdead; overflow: hidden; }
+
+.ruby-constant  { color: #7fffd4; background: transparent; }
+.ruby-keyword { color: #00ffff; background: transparent; }
+.ruby-ivar    { color: #eedd82; background: transparent; }
+.ruby-operator  { color: #00ffee; background: transparent; }
+.ruby-identifier { color: #ffdead; background: transparent; }
+.ruby-node    { color: #ffa07a; background: transparent; }
+.ruby-comment { color: #b22222; font-weight: bold; background: transparent; }
+.ruby-regexp  { color: #ffa07a; background: transparent; }
+.ruby-value   { color: #7fffd4; background: transparent; }
+}
+
+
+#####################################################################
+### H E A D E R   T E M P L A T E  
+#####################################################################
+
+XHTML_PREAMBLE = %{<?xml version="1.0" encoding="%charset%"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+}
+
+HEADER = XHTML_PREAMBLE + %{
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>%title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+  <meta http-equiv="Content-Script-Type" content="text/javascript" />
+  <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+  <script type="text/javascript">
+  // <![CDATA[
+
+  function popupCode( url ) {
+    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
+  }
+
+  function toggleCode( id ) {
+    if ( document.getElementById )
+      elem = document.getElementById( id );
+    else if ( document.all )
+      elem = eval( "document.all." + id );
+    else
+      return false;
+
+    elemStyle = elem.style;
+    
+    if ( elemStyle.display != "block" ) {
+      elemStyle.display = "block"
+    } else {
+      elemStyle.display = "none"
+    }
+
+    return true;
+  }
+  
+  // Make codeblocks hidden by default
+  document.writeln( "<style type=\\"text/css\\">div.method-source-code { display: none }</style>" )
+  
+  // ]]>
+  </script>
+
+</head>
+<body>
+}
+
+
+#####################################################################
+### C O N T E X T   C O N T E N T   T E M P L A T E
+#####################################################################
+
+CONTEXT_CONTENT = %{
+}
+
+
+#####################################################################
+### F O O T E R   T E M P L A T E
+#####################################################################
+FOOTER = %{
+<div id="validator-badges">
+  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+</div>
+
+</body>
+</html>
+}
+
+
+#####################################################################
+### F I L E   P A G E   H E A D E R   T E M P L A T E
+#####################################################################
+
+FILE_PAGE = %{
+  <div id="fileHeader">
+    <h1>%short_name%</h1>
+    <table class="header-table">
+    <tr class="top-aligned-row">
+      <td><strong>Path:</strong></td>
+      <td>%full_path%
+IF:cvsurl
+        &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+      </td>
+    </tr>
+    <tr class="top-aligned-row">
+      <td><strong>Last Update:</strong></td>
+      <td>%dtm_modified%</td>
+    </tr>
+    </table>
+  </div>
+}
+
+
+#####################################################################
+### C L A S S   P A G E   H E A D E R   T E M P L A T E
+#####################################################################
+
+CLASS_PAGE = %{
+    <div id="classHeader">
+        <table class="header-table">
+        <tr class="top-aligned-row">
+          <td><strong>%classmod%</strong></td>
+          <td class="class-name-in-header">%full_name%</td>
+        </tr>
+        <tr class="top-aligned-row">
+            <td><strong>In:</strong></td>
+            <td>
+START:infiles
+IF:full_path_url
+                <a href="%full_path_url%">
+ENDIF:full_path_url
+                %full_path%
+IF:full_path_url
+                </a>
+ENDIF:full_path_url
+IF:cvsurl
+        &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+        <br />
+END:infiles
+            </td>
+        </tr>
+
+IF:parent
+        <tr class="top-aligned-row">
+            <td><strong>Parent:</strong></td>
+            <td>
+IF:par_url
+                <a href="%par_url%">
+ENDIF:par_url
+                %parent%
+IF:par_url
+               </a>
+ENDIF:par_url
+            </td>
+        </tr>
+ENDIF:parent
+        </table>
+    </div>
+}
+
+
+#####################################################################
+### M E T H O D   L I S T   T E M P L A T E
+#####################################################################
+
+METHOD_LIST = %{
+
+  <div id="contextContent">
+IF:diagram
+    <div id="diagram">
+      %diagram%
+    </div>
+ENDIF:diagram
+
+IF:description
+    <div id="description">
+      %description%
+    </div>
+ENDIF:description
+
+IF:requires
+    <div id="requires-list">
+      <h3 class="section-bar">Required files</h3>
+
+      <div class="name-list">
+START:requires
+      HREF:aref:name:&nbsp;&nbsp;
+END:requires
+      </div>
+    </div>
+ENDIF:requires
+
+IF:toc
+    <div id="contents-list">
+      <h3 class="section-bar">Contents</h3>
+      <ul>
+START:toc
+      <li><a href="#%href%">%secname%</a></li>
+END:toc
+     </ul>
+ENDIF:toc
+   </div>
+
+IF:methods
+    <div id="method-list">
+      <h3 class="section-bar">Methods</h3>
+
+      <div class="name-list">
+START:methods
+      HREF:aref:name:&nbsp;&nbsp;
+END:methods
+      </div>
+    </div>
+ENDIF:methods
+
+  </div>
+
+
+    <!-- if includes -->
+IF:includes
+    <div id="includes">
+      <h3 class="section-bar">Included Modules</h3>
+
+      <div id="includes-list">
+START:includes
+        <span class="include-name">HREF:aref:name:</span>
+END:includes
+      </div>
+    </div>
+ENDIF:includes
+
+START:sections
+    <div id="section">
+IF:sectitle
+      <h2 class="section-title"><a name="%secsequence%">%sectitle%</a></h2>
+IF:seccomment
+      <div class="section-comment">
+        %seccomment%
+      </div>      
+ENDIF:seccomment
+ENDIF:sectitle
+
+IF:classlist
+    <div id="class-list">
+      <h3 class="section-bar">Classes and Modules</h3>
+
+      %classlist%
+    </div>
+ENDIF:classlist
+
+IF:constants
+    <div id="constants-list">
+      <h3 class="section-bar">Constants</h3>
+
+      <div class="name-list">
+        <table summary="Constants">
+START:constants
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">%name%</td>
+          <td>=</td>
+          <td class="context-item-value">%value%</td>
+IF:desc
+          <td width="3em">&nbsp;</td>
+          <td class="context-item-desc">%desc%</td>
+ENDIF:desc
+        </tr>
+END:constants
+        </table>
+      </div>
+    </div>
+ENDIF:constants
+
+IF:aliases
+    <div id="aliases-list">
+      <h3 class="section-bar">External Aliases</h3>
+
+      <div class="name-list">
+                        <table summary="aliases">
+START:aliases
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">%old_name%</td>
+          <td>-&gt;</td>
+          <td class="context-item-value">%new_name%</td>
+        </tr>
+IF:desc
+      <tr class="top-aligned-row context-row">
+        <td>&nbsp;</td>
+        <td colspan="2" class="context-item-desc">%desc%</td>
+      </tr>
+ENDIF:desc
+END:aliases
+                        </table>
+      </div>
+    </div>
+ENDIF:aliases
+
+
+IF:attributes
+    <div id="attribute-list">
+      <h3 class="section-bar">Attributes</h3>
+
+      <div class="name-list">
+        <table>
+START:attributes
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">%name%</td>
+IF:rw
+          <td class="context-item-value">&nbsp;[%rw%]&nbsp;</td>
+ENDIF:rw
+IFNOT:rw
+          <td class="context-item-value">&nbsp;&nbsp;</td>
+ENDIF:rw
+          <td class="context-item-desc">%a_desc%</td>
+        </tr>
+END:attributes
+        </table>
+      </div>
+    </div>
+ENDIF:attributes
+      
+
+
+    <!-- if method_list -->
+IF:method_list
+    <div id="methods">
+START:method_list
+IF:methods
+      <h3 class="section-bar">%type% %category% methods</h3>
+
+START:methods
+      <div id="method-%aref%" class="method-detail">
+        <a name="%aref%"></a>
+
+        <div class="method-heading">
+IF:codeurl
+          <a href="%codeurl%" target="Code" class="method-signature"
+            onclick="popupCode('%codeurl%');return false;">
+ENDIF:codeurl
+IF:sourcecode
+          <a href="#%aref%" class="method-signature">
+ENDIF:sourcecode
+IF:callseq
+          <span class="method-name">%callseq%</span>
+ENDIF:callseq
+IFNOT:callseq
+          <span class="method-name">%name%</span><span class="method-args">%params%</span>
+ENDIF:callseq
+IF:codeurl
+          </a>
+ENDIF:codeurl
+IF:sourcecode
+          </a>
+ENDIF:sourcecode
+        </div>
+      
+        <div class="method-description">
+IF:m_desc
+          %m_desc%
+ENDIF:m_desc
+IF:sourcecode
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('%aref%-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="%aref%-source">
+<pre>
+%sourcecode%
+</pre>
+          </div>
+ENDIF:sourcecode
+        </div>
+      </div>
+
+END:methods
+ENDIF:methods
+END:method_list
+
+    </div>
+ENDIF:method_list
+END:sections
+}
+
+
+#####################################################################
+### B O D Y   T E M P L A T E
+#####################################################################
+
+BODY = HEADER + %{
+
+!INCLUDE!  <!-- banner header -->
+
+  <div id="bodyContent">
+
+} +  METHOD_LIST + %{
+
+  </div>
+
+} + FOOTER
+
+
+
+#####################################################################
+### S O U R C E   C O D E   T E M P L A T E
+#####################################################################
+
+SRC_PAGE = XHTML_PREAMBLE + %{
+<html>
+<head>
+  <title>%title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+  <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre>%code%</pre>
+</body>
+</html>
+}
+
+
+#####################################################################
+### I N D E X   F I L E   T E M P L A T E S
+#####################################################################
+
+FR_INDEX_BODY = %{
+!INCLUDE!
+}
+
+FILE_INDEX = XHTML_PREAMBLE + %{
+<!--
+
+    %list_title%
+
+  -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>%list_title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+  <link rel="stylesheet" href="%style_url%" type="text/css" />
+  <base target="docwin" />
+</head>
+<body>
+<div id="index">
+  <h1 class="section-bar">%list_title%</h1>
+  <div id="index-entries">
+START:entries
+    <a href="%href%">%name%</a><br />
+END:entries
+  </div>
+</div>
+</body>
+</html>
+}
+
+CLASS_INDEX = FILE_INDEX
+METHOD_INDEX = FILE_INDEX
+
+INDEX = %{<?xml version="1.0" encoding="%charset%"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+
+<!--
+
+    %title%
+
+  -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>%title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+</head>
+<frameset rows="20%, 80%">
+    <frameset cols="25%,35%,45%">
+        <frame src="fr_file_index.html"   title="Files" name="Files" />
+        <frame src="fr_class_index.html"  name="Classes" />
+        <frame src="fr_method_index.html" name="Methods" />
+    </frameset>
+    <frame src="%initial_page%" name="docwin" />
+</frameset>
+</html>
+}
+
+
+
+  end # module Page
+end # class RDoc
+
+require 'rdoc/generators/template/html/one_page_html'
diff --git a/ruby_1_8_6/lib/rdoc/generators/template/html/kilmer.rb b/ruby_1_8_6/lib/rdoc/generators/template/html/kilmer.rb
new file mode 100644
index 0000000000..55071fc026
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/generators/template/html/kilmer.rb
@@ -0,0 +1,435 @@
+module RDoc
+module Page
+
+
+FONTS = "Verdana, Arial, Helvetica, sans-serif"
+
+STYLE = %{
+body,td,p { font-family: %fonts%; 
+       color: #000040;
+}
+
+.attr-rw { font-size: xx-small; color: #444488 }
+
+.title-row { background-color: #CCCCFF;
+             color:      #000010;
+}
+
+.big-title-font { 
+  color: black;
+  font-weight: bold;
+  font-family: %fonts%; 
+  font-size: large; 
+  height: 60px;
+  padding: 10px 3px 10px 3px;
+}
+
+.small-title-font { color: black;
+                    font-family: %fonts%;
+                    font-size:10; }
+
+.aqua { color: black }
+
+.method-name, .attr-name {
+      font-family: font-family: %fonts%; 
+      font-weight: bold;
+      font-size: small;
+      margin-left: 20px;
+      color: #000033;
+}
+
+.tablesubtitle, .tablesubsubtitle {
+   width: 100%;
+   margin-top: 1ex;
+   margin-bottom: .5ex;
+   padding: 5px 0px 5px 3px;
+   font-size: large;
+   color: black;
+   background-color: #CCCCFF;
+   border: thin;
+}
+
+.name-list {
+  margin-left: 5px;
+  margin-bottom: 2ex;
+  line-height: 105%;
+}
+
+.description {
+  margin-left: 5px;
+  margin-bottom: 2ex;
+  line-height: 105%;
+  font-size: small;
+}
+
+.methodtitle {
+  font-size: small;
+  font-weight: bold;
+  text-decoration: none;
+  color: #000033;
+  background-color: white; 
+}
+
+.srclink {
+  font-size: small;
+  font-weight: bold;
+  text-decoration: none;
+  color: #0000DD;
+  background-color: white;
+}
+
+.paramsig {
+   font-size: small;
+}
+
+.srcbut { float: right }
+
+}
+
+
+############################################################################
+
+
+BODY = %{
+<html><head>
+  <title>%title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+  <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+  <script type="text/javascript" language="JavaScript">
+  <!--
+  function popCode(url) {
+    parent.frames.source.location = url
+  }
+  //-->
+  </script>
+</head>
+<body bgcolor="white">
+
+!INCLUDE!  <!-- banner header -->
+
+IF:diagram
+<table width="100%"><tr><td align="center">
+%diagram%
+</td></tr></table>
+ENDIF:diagram
+
+IF:description
+<div class="description">%description%</div>
+ENDIF:description
+
+IF:requires
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Required files</td></tr>
+</table><br />
+<div class="name-list">
+START:requires
+HREF:aref:name:
+END:requires
+ENDIF:requires
+</div>
+
+IF:methods
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Methods</td></tr>
+</table><br />
+<div class="name-list">
+START:methods
+HREF:aref:name:,
+END:methods
+</div>
+ENDIF:methods
+
+
+START:sections
+    <div id="section">
+IF:sectitle
+      <h2 class="section-title"><a name="%secsequence%">%sectitle%</a></h2>
+IF:seccomment
+      <div class="section-comment">
+        %seccomment%
+      </div>      
+ENDIF:seccomment
+ENDIF:sectitle
+
+IF:attributes
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Attributes</td></tr>
+</table><br />
+<table cellspacing="5">
+START:attributes
+     <tr valign="top">
+IF:rw
+       <td align="center" class="attr-rw">&nbsp;[%rw%]&nbsp;</td>
+ENDIF:rw
+IFNOT:rw
+       <td></td>
+ENDIF:rw
+       <td class="attr-name">%name%</td>
+       <td>%a_desc%</td>
+     </tr>
+END:attributes
+</table>
+ENDIF:attributes
+
+IF:classlist
+<table cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Classes and Modules</td></tr>
+</table><br />
+%classlist%<br />
+ENDIF:classlist
+
+  !INCLUDE!  <!-- method descriptions -->
+
+END:sections
+
+</body>
+</html>
+}
+
+###############################################################################
+
+FILE_PAGE = <<_FILE_PAGE_
+<table width="100%">
+ <tr class="title-row">
+ <td><table width="100%"><tr>
+   <td class="big-title-font" colspan="2"><font size="-3"><b>File</b><br /></font>%short_name%</td>
+   <td align="right"><table cellspacing="0" cellpadding="2">
+         <tr>
+           <td  class="small-title-font">Path:</td>
+           <td class="small-title-font">%full_path%
+IF:cvsurl
+				&nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+           </td>
+         </tr>
+         <tr>
+           <td class="small-title-font">Modified:</td>
+           <td class="small-title-font">%dtm_modified%</td>
+         </tr>
+        </table>
+    </td></tr></table></td>
+  </tr>
+</table><br />
+_FILE_PAGE_
+
+###################################################################
+
+CLASS_PAGE = %{
+<table width="100%" border="0" cellspacing="0">
+ <tr class="title-row">
+ <td class="big-title-font">
+   <font size="-3"><b>%classmod%</b><br /></font>%full_name%
+ </td>
+ <td align="right">
+   <table cellspacing="0" cellpadding="2">
+     <tr valign="top">
+      <td class="small-title-font">In:</td>
+      <td class="small-title-font">
+START:infiles
+HREF:full_path_url:full_path:
+IF:cvsurl
+&nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+END:infiles
+      </td>
+     </tr>
+IF:parent
+     <tr>
+      <td class="small-title-font">Parent:</td>
+      <td class="small-title-font">
+IF:par_url
+        <a href="%par_url%" class="cyan">
+ENDIF:par_url
+%parent%
+IF:par_url
+         </a>
+ENDIF:par_url
+      </td>
+     </tr>
+ENDIF:parent
+   </table>
+  </td>
+  </tr>
+</table><br />
+}
+
+###################################################################
+
+METHOD_LIST = %{
+IF:includes
+<div class="tablesubsubtitle">Included modules</div><br />
+<div class="name-list">
+START:includes
+    <span class="method-name">HREF:aref:name:</span>
+END:includes
+</div>
+ENDIF:includes
+
+IF:method_list
+START:method_list
+IF:methods
+<table cellpadding=5 width="100%">
+<tr><td class="tablesubtitle">%type% %category% methods</td></tr>
+</table>
+START:methods
+<table width="100%" cellspacing="0" cellpadding="5" border="0">
+<tr><td class="methodtitle">
+<a name="%aref%">
+IF:callseq
+<b>%callseq%</b>
+ENDIF:callseq
+IFNOT:callseq
+ <b>%name%</b>%params%
+ENDIF:callseq
+IF:codeurl
+<a href="%codeurl%" target="source" class="srclink">src</a>
+ENDIF:codeurl
+</a></td></tr>
+</table>
+IF:m_desc
+<div class="description">
+%m_desc%
+</div>
+ENDIF:m_desc
+IF:aka
+<div class="aka">
+This method is also aliased as
+START:aka
+<a href="%aref%">%name%</a>
+END:aka
+</div>
+ENDIF:aka
+IF:sourcecode
+<pre class="source">
+%sourcecode%
+</pre>
+ENDIF:sourcecode
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+}
+
+=begin
+=end
+
+########################## Source code ##########################
+
+SRC_PAGE = %{
+<html>
+<head><title>%title%</title>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<style type="text/css">
+.ruby-comment    { color: green; font-style: italic }
+.ruby-constant   { color: #4433aa; font-weight: bold; }
+.ruby-identifier { color: #222222;  }
+.ruby-ivar       { color: #2233dd; }
+.ruby-keyword    { color: #3333FF; font-weight: bold }
+.ruby-node       { color: #777777; }
+.ruby-operator   { color: #111111;  }
+.ruby-regexp     { color: #662222; }
+.ruby-value      { color: #662222; font-style: italic }
+  .kw { color: #3333FF; font-weight: bold }
+  .cmt { color: green; font-style: italic }
+  .str { color: #662222; font-style: italic }
+  .re  { color: #662222; }
+</style>
+</head>
+<body bgcolor="white">
+<pre>%code%</pre>
+</body>
+</html>
+}
+
+########################## Index ################################
+
+FR_INDEX_BODY = %{
+!INCLUDE!
+}
+
+FILE_INDEX = %{
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<style>
+<!--
+  body {
+background-color: #ddddff;
+     font-family: #{FONTS}; 
+       font-size: 11px; 
+      font-style: normal;
+     line-height: 14px; 
+           color: #000040;
+  }
+div.banner {
+  background: #0000aa;
+  color:      white;
+  padding: 1;
+  margin: 0;
+  font-size: 90%;
+  font-weight: bold;
+  line-height: 1.1;
+  text-align: center;
+  width: 100%;
+}
+  
+-->
+</style>
+<base target="docwin">
+</head>
+<body>
+<div class="banner">%list_title%</div>
+START:entries
+<a href="%href%">%name%</a><br />
+END:entries
+</body></html>
+}
+
+CLASS_INDEX = FILE_INDEX
+METHOD_INDEX = FILE_INDEX
+
+INDEX = %{
+<html>
+<head>
+  <title>%title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+</head>
+
+<frameset cols="20%,*">
+    <frameset rows="15%,35%,50%">
+        <frame src="fr_file_index.html"   title="Files" name="Files">
+        <frame src="fr_class_index.html"  name="Classes">
+        <frame src="fr_method_index.html" name="Methods">
+    </frameset>
+IF:inline_source
+      <frame  src="%initial_page%" name="docwin">
+ENDIF:inline_source
+IFNOT:inline_source
+    <frameset rows="80%,20%">
+      <frame  src="%initial_page%" name="docwin">
+      <frame  src="blank.html" name="source">
+    </frameset>
+ENDIF:inline_source
+    <noframes>
+          <body bgcolor="white">
+            Click <a href="html/index.html">here</a> for a non-frames
+            version of this page.
+          </body>
+    </noframes>
+</frameset>
+
+</html>
+}
+
+# and a blank page to use as a target
+BLANK = %{
+<html><body bgcolor="white"></body></html>
+}
+
+def write_extra_pages
+  template = TemplatePage.new(BLANK)
+  File.open("blank.html", "w") { |f| template.write_html_on(f, {}) }
+end
+
+end
+end
diff --git a/ruby_1_8_6/lib/rdoc/generators/template/html/old_html.rb b/ruby_1_8_6/lib/rdoc/generators/template/html/old_html.rb
new file mode 100644
index 0000000000..ca66302a08
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/generators/template/html/old_html.rb
@@ -0,0 +1,728 @@
+module RDoc
+
+# This is how you define the HTML that RDoc generates. Simply create
+# a file in rdoc/generators/html_templates that creates the
+# module RDoc::Page and populate it as described below. Then invoke
+# rdoc using the --template <name of your file> option, and
+# your template will be used.
+#
+# The constants defining pages use a simple templating system:
+#
+# * The templating system is passed a hash. Keys in the hash correspond
+#   to tags on this page. The tag %abc% is looked up in the hash,
+#   and is replaced by the corresponding hash value.
+#
+# * Some tags are optional. You can detect this using IF/ENDIF
+#
+#      IF: title
+#      The value of title is %title%
+#      ENDIF: title
+#
+# * Some entries in the hash have values that are arrays, where each
+#   entry in the array is itself a hash. These are used to generate
+#   lists using the START: construct. For example, given a hash
+#   containing
+# 
+#      { 'people' => [ { 'name' => 'Fred', 'age' => '12' },
+#                      { 'name' => 'Mary', 'age' => '21' } ]
+#
+#   You could generate a simple table using
+#
+#      <table>
+#      START:people
+#        <tr><td>%name%<td>%age%</tr>
+#      END:people
+#      </table>
+#
+#   These lists can be nested to an arbitrary depth
+#
+# * the construct HREF:url:name: generates <a href="%url%">%name%</a>
+#   if +url+ is defined in the hash, or %name% otherwise.
+#
+#
+# Your file must contain the following constants
+#
+# [*FONTS*]  a list of fonts to be used
+# [*STYLE*]  a CSS section (without the <style> or comments). This is
+#            used to generate a style.css file
+#
+# [*BODY*] 
+#   The main body of all non-index RDoc pages. BODY will contain
+#   two !INCLUDE!s. The first is used to include a document-type
+#   specific header (FILE_PAGE or CLASS_PAGE). The second include
+#   is for the method list (METHOD_LIST). THe body is passed:
+#
+#   %title%::
+#       the page's title
+#
+#   %style_url%::
+#       the url of a style sheet for this page
+#
+#   %diagram%::
+#       the optional URL of a diagram for this page
+#
+#   %description%::
+#       a (potentially multi-paragraph) string containing the
+#       description for th file/class/module.
+#
+#   %requires%::
+#       an optional list of %aref%/%name% pairs, one for each module
+#       required by this file.
+#
+#   %methods%::
+#       an optional list of %aref%/%name%, one for each method
+#       documented on this page. This is intended to be an index.
+#
+#   %attributes%::  
+#       An optional list. For each attribute it contains:
+#       %name%::   the attribute name
+#       %rw%::     r/o, w/o, or r/w
+#       %a_desc%:: description of the attribute
+#
+#   %classlist%:: 
+#       An optional string containing an already-formatted list of
+#       classes and modules documented in this file
+#
+#   For FILE_PAGE entries, the body will be passed
+#
+#   %short_name%::  
+#       The name of the file
+#
+#   %full_path%::
+#       The full path to the file
+#
+#   %dtm_modified%::
+#       The date/time the file was last changed
+#
+#   For class and module pages, the body will be passed
+#
+#   %classmod%::
+#       The name of the class or module
+#
+#   %files%::
+#       A list. For each file this class is defined in, it contains:
+#       %full_path_url%:: an (optional) URL of the RDoc page
+#                         for this file
+#       %full_path%::     the name of the file
+#
+#   %par_url%::
+#       The (optional) URL of the RDoc page documenting this class's
+#       parent class
+#
+#   %parent%::
+#       The name of this class's parent.
+#
+#   For both files and classes, the body is passed the following information
+#   on includes and methods:
+#
+#   %includes%::    
+#       Optional list of included modules. For each, it receives
+#       %aref%:: optional URL to RDoc page for the module
+#       %name%:: the name of the module
+#
+#   %method_list%::
+#       Optional list of methods of a particular class and category.
+#
+#   Each method list entry contains:
+#
+#   %type%::        public/private/protected
+#   %category%::    instance/class
+#   %methods%::     a list of method descriptions
+#
+#   Each method description contains:
+#
+#   %aref%::        a target aref, used when referencing this method
+#                   description. You should code this as <a name="%aref%">
+#   %codeurl%::     the optional URL to the page containing this method's
+#                   source code.
+#   %name%::        the method's name
+#   %params%::      the method's parameters
+#   %callseq%::     a full calling sequence
+#   %m_desc%::      the (potentially multi-paragraph) description of
+#                   this method.
+#
+# [*CLASS_PAGE*]
+#         Header for pages documenting classes and modules. See
+#         BODY above for the available parameters.
+#
+# [*FILE_PAGE*]
+#         Header for pages documenting files. See
+#         BODY above for the available parameters.
+#
+# [*METHOD_LIST*]
+#         Controls the display of the listing of methods. See BODY for
+#         parameters.
+#
+# [*INDEX*]
+#         The top-level index page. For a browser-like environment
+#         define a frame set that includes the file, class, and 
+#         method indices. Passed
+#         %title%:: title of page
+#         %initial_page% :: url of initial page to display
+#
+# [*CLASS_INDEX*]
+#         Individual files for the three indexes. Passed:
+#         %index_url%:: URL of main index page
+#         %entries%::   List of
+#                       %name%:: name of an index entry
+#                       %href%:: url of corresponding page
+# [*METHOD_INDEX*]
+#         Same as CLASS_INDEX for methods
+#
+# [*FILE_INDEX*]
+#         Same as CLASS_INDEX for methods
+#
+# [*FR_INDEX_BODY*]
+#         A wrapper around CLASS_INDEX, METHOD_INDEX, and FILE_INDEX.
+#         If those index strings contain the complete HTML for the
+#         output, then FR_INDEX_BODY can simply be !INCLUDE!
+#
+# [*SRC_PAGE*]
+#         Page used to display source code. Passed %title% and %code%,
+#         the latter being a multi-line string of code.
+
+module Page
+
+FONTS = "Verdana, Arial, Helvetica, sans-serif"
+
+STYLE = %{
+body,td,p { font-family: %fonts%; 
+       color: #000040;
+}
+
+.attr-rw { font-size: x-small; color: #444488 }
+
+.title-row { background: #0000aa;
+             color:      #eeeeff;
+}
+
+.big-title-font { color: white;
+                  font-family: %fonts%;
+                  font-size: large; 
+                  height: 50px}
+
+.small-title-font { color: aqua;
+                    font-family: %fonts%;
+                    font-size: xx-small; }
+
+.aqua { color: aqua }
+
+.method-name, attr-name {
+      font-family: monospace; font-weight: bold;
+}
+
+.tablesubtitle, .tablesubsubtitle {
+   width: 100%;
+   margin-top: 1ex;
+   margin-bottom: .5ex;
+   padding: 5px 0px 5px 20px;
+   font-size: large;
+   color: aqua;
+   background: #3333cc;
+}
+
+.name-list {
+  font-family: monospace;
+  margin-left: 40px;
+  margin-bottom: 2ex;
+  line-height: 140%;
+}
+
+.description {
+  margin-left: 40px;
+  margin-top: -2ex;
+  margin-bottom: 2ex;
+}
+
+.description p {
+  line-height: 140%;
+}
+
+.aka {
+  margin-left: 40px;
+  margin-bottom: 2ex;
+  line-height: 100%;
+  font-size:   small;
+  color:       #808080;
+}
+
+.methodtitle {
+  font-size: medium;
+  text-decoration: none;
+  color: #0000AA;
+  background: white; 
+}
+
+.paramsig {
+   font-size: small;
+}
+
+.srcbut { float: right }
+
+pre { font-size: 1.2em; }
+tt  { font-size: 1.2em; }
+
+pre.source {
+  border-style: groove;
+  background-color: #ddddff;
+  margin-left:  40px;
+  padding: 1em 0em 1em 2em;
+}
+
+.classlist {
+  margin-left: 40px;
+  margin-bottom: 2ex;
+  line-height: 140%;
+}
+
+li {
+  display:    list-item;
+  margin-top: .6em;
+}
+
+.ruby-comment    { color: green; font-style: italic }
+.ruby-constant   { color: #4433aa; font-weight: bold; }
+.ruby-identifier { color: #222222;  }
+.ruby-ivar       { color: #2233dd; }
+.ruby-keyword    { color: #3333FF; font-weight: bold }
+.ruby-node       { color: #777777; }
+.ruby-operator   { color: #111111;  }
+.ruby-regexp     { color: #662222; }
+.ruby-value      { color: #662222; font-style: italic }
+
+}
+
+
+############################################################################
+
+
+HEADER = %{
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>%title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+  <link rel=StyleSheet href="%style_url%" type="text/css" media="screen" />
+  <script type="text/javascript" language="JavaScript">
+  <!--
+  function popCode(url) {
+    window.open(url, "Code", 
+          "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
+  }
+  //-->
+  </script>
+</head>
+}
+
+
+###################################################################
+
+METHOD_LIST = %{
+IF:includes
+<table summary="Included modules" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Included modules</td></tr>
+</table>
+<div class="name-list">
+START:includes
+    <span class="method-name">HREF:aref:name:</span>
+END:includes
+</div>
+ENDIF:includes
+
+IF:method_list
+START:method_list
+IF:methods
+<table summary="Method list" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">%type% %category% methods</td></tr>
+</table>
+START:methods
+<table summary="method"  width="100%" cellspacing="0" cellpadding="5" border="0">
+<tr><td class="methodtitle">
+<a name="%aref%"></a>
+IF:codeurl
+<a href="%codeurl%" target="Code" class="methodtitle"
+ onClick="popCode('%codeurl%');return false;">
+ENDIF:codeurl
+IF:callseq
+<b>%callseq%</b>
+ENDIF:callseq
+IFNOT:callseq
+<b>%name%</b>%params%
+ENDIF:callseq
+IF:codeurl
+</a>
+ENDIF:codeurl
+</td></tr>
+</table>
+IF:m_desc
+<div class="description">
+%m_desc%
+</div>
+ENDIF:m_desc
+IF:aka
+<div class="aka">
+This method is also aliased as
+START:aka
+<a href="%aref%">%name%</a>
+END:aka
+</div>
+ENDIF:aka
+IF:sourcecode
+<pre class="source">
+%sourcecode%
+</pre>
+ENDIF:sourcecode
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+}
+
+###################################################################
+
+CONTEXT_CONTENT = %{
+IF:diagram
+<table summary="Diagram of classes and modules" width="100%">
+<tr><td align="center">
+%diagram%
+</td></tr></table>
+ENDIF:diagram
+
+
+IF:description
+<div class="description">%description%</div>
+ENDIF:description
+
+IF:requires
+<table summary="Requires" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Required files</td></tr>
+</table>
+<div class="name-list">
+START:requires
+HREF:aref:name:&nbsp; &nbsp;
+END:requires
+</div>
+ENDIF:requires
+
+IF:methods
+<table summary="Methods" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Methods</td></tr>
+</table>
+<div class="name-list">
+START:methods
+HREF:aref:name:&nbsp; &nbsp;
+END:methods
+</div>
+ENDIF:methods
+
+IF:constants
+<table summary="Constants" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Constants</td></tr>
+</table>
+<table cellpadding="5">
+START:constants
+<tr valign="top"><td>%name%</td><td>=</td><td>%value%</td></tr>
+IF:desc
+<tr><td></td><td></td><td>%desc%</td></tr>
+ENDIF:desc
+END:constants
+</table>
+ENDIF:constants
+
+IF:aliases
+<table summary="Aliases" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">External Aliases</td></tr>
+</table>
+<div class="name-list">
+START:aliases
+%old_name% -> %new_name%<br />
+END:aliases
+</div>
+ENDIF:aliases
+
+IF:attributes
+<table summary="Attributes" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Attributes</td></tr>
+</table>
+<table summary="Attribute details" cellspacing="5">
+START:attributes
+     <tr valign="top">
+       <td class="attr-name">%name%</td>
+IF:rw
+       <td align="center" class="attr-rw">&nbsp;[%rw%]&nbsp;</td>
+ENDIF:rw
+IFNOT:rw
+       <td></td>
+ENDIF:rw
+       <td>%a_desc%</td>
+     </tr>
+END:attributes
+</table>
+ENDIF:attributes
+
+IF:classlist
+<table summary="List of classes" cellpadding="5" width="100%">
+<tr><td class="tablesubtitle">Classes and Modules</td></tr>
+</table>
+<div class="classlist">
+%classlist%
+</div>
+ENDIF:classlist
+}
+
+###############################################################################
+
+BODY = HEADER + %{
+<body bgcolor="white">
+!INCLUDE!  <!-- banner header -->
+} +
+CONTEXT_CONTENT + METHOD_LIST +
+%{
+</body>
+</html>
+}
+
+
+###############################################################################
+
+FILE_PAGE = <<_FILE_PAGE_
+<table summary="Information on file" width="100%">
+ <tr class="title-row">
+ <td><table summary="layout" width="100%"><tr>
+   <td class="big-title-font" colspan="2">%short_name%</td>
+   <td align="right"><table summary="layout" cellspacing="0" cellpadding="2">
+         <tr>
+           <td  class="small-title-font">Path:</td>
+           <td class="small-title-font">%full_path%
+IF:cvsurl
+				&nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+           </td>
+         </tr>
+         <tr>
+           <td class="small-title-font">Modified:</td>
+           <td class="small-title-font">%dtm_modified%</td>
+         </tr>
+        </table>
+    </td></tr></table></td>
+  </tr>
+</table>
+_FILE_PAGE_
+
+###################################################################
+
+CLASS_PAGE = %{
+<table summary="Information on class" width="100%" border="0" cellspacing="0">
+ <tr class="title-row">
+ <td class="big-title-font">
+   <sup><font color="aqua">%classmod%</font></sup> %full_name%
+ </td>
+ <td align="right">
+   <table summary="layout" cellspacing="0" cellpadding="2">
+     <tr valign="top">
+      <td class="small-title-font">In:</td>
+      <td class="small-title-font">
+START:infiles
+IF:full_path_url
+        <a href="%full_path_url%" class="aqua">
+ENDIF:full_path_url
+%full_path%
+IF:full_path_url
+         </a>
+ENDIF:full_path_url
+IF:cvsurl
+         &nbsp;(<a href="%cvsurl%"><acronym title="Concurrent Versioning System">CVS</acronym></a>)
+ENDIF:cvsurl
+<br />
+END:infiles
+      </td>
+     </tr>
+IF:parent
+     <tr>
+      <td class="small-title-font">Parent:</td>
+      <td class="small-title-font">
+IF:par_url
+        <a href="%par_url%" class="aqua">
+ENDIF:par_url
+%parent%
+IF:par_url
+         </a>
+ENDIF:par_url
+      </td>
+     </tr>
+ENDIF:parent
+   </table>
+  </td>
+  </tr>
+</table>
+}
+
+=begin
+=end
+
+########################## Source code ##########################
+
+SRC_PAGE = %{
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<title>%title%</title>
+<link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+</head>
+<body bgcolor="white">
+<pre>%code%</pre>
+</body>
+</html>
+}
+
+########################## Index ################################
+
+FR_INDEX_BODY = %{
+!INCLUDE!
+}
+
+FILE_INDEX = %{
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<title>%list_title%</title>
+<style type="text/css">
+<!--
+  body {
+background-color: #ddddff;
+     font-family: #{FONTS}; 
+       font-size: 11px; 
+      font-style: normal;
+     line-height: 14px; 
+           color: #000040;
+  }
+div.banner {
+  background: #0000aa;
+  color:      white;
+  padding: 1;
+  margin: 0;
+  font-size: 90%;
+  font-weight: bold;
+  line-height: 1.1;
+  text-align: center;
+  width: 100%;
+}
+
+A.xx { color: white; font-weight: bold; }
+-->
+</style>
+<base target="docwin">
+</head>
+<body>
+<div class="banner"><a href="%index_url%" class="xx">%list_title%</a></div>
+START:entries
+<a href="%href%">%name%</a><br />
+END:entries
+</body></html>
+}
+
+CLASS_INDEX = FILE_INDEX
+METHOD_INDEX = FILE_INDEX
+
+INDEX = %{
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<title>%title%</title></head>
+
+<frameset rows="20%, 80%">
+    <frameset cols="25%,35%,45%">
+        <frame src="fr_file_index.html"   title="Files" name="Files">
+        <frame src="fr_class_index.html"  name="Classes">
+        <frame src="fr_method_index.html" name="Methods">
+    </frameset>
+    <frame  src="%initial_page%" name="docwin">
+    <noframes>
+          <body bgcolor="white">
+            Sorry, RDoc currently only generates HTML using frames.
+          </body>
+    </noframes>
+</frameset>
+
+</html>
+}
+
+######################################################################
+#
+# The following is used for the -1 option
+#
+
+CONTENTS_XML = %{
+IF:description
+%description%
+ENDIF:description
+
+IF:requires
+<h4>Requires:</h4>
+<ul>
+START:requires
+IF:aref
+<li><a href="%aref%">%name%</a></li>
+ENDIF:aref
+IFNOT:aref
+<li>%name%</li>
+ENDIF:aref 
+END:requires
+</ul>
+ENDIF:requires
+
+IF:attributes
+<h4>Attributes</h4>
+<table>
+START:attributes
+<tr><td>%name%</td><td>%rw%</td><td>%a_desc%</td></tr>
+END:attributes
+</table>
+ENDIF:attributes
+
+IF:includes
+<h4>Includes</h4>
+<ul>
+START:includes
+IF:aref
+<li><a href="%aref%">%name%</a></li>
+ENDIF:aref
+IFNOT:aref
+<li>%name%</li>
+ENDIF:aref 
+END:includes
+</ul>
+ENDIF:includes
+
+IF:method_list
+<h3>Methods</h3>
+START:method_list
+IF:methods
+START:methods
+<h4>%type% %category% method: <a name="%aref%">%name%%params%</a></h4>
+
+IF:m_desc
+%m_desc%
+ENDIF:m_desc
+
+IF:sourcecode
+<blockquote><pre>
+%sourcecode%
+</pre></blockquote>
+ENDIF:sourcecode
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+}
+
+
+end
+end
+
+require 'rdoc/generators/template/html/one_page_html'
diff --git a/ruby_1_8_6/lib/rdoc/generators/template/html/one_page_html.rb b/ruby_1_8_6/lib/rdoc/generators/template/html/one_page_html.rb
new file mode 100644
index 0000000000..19441f4725
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/generators/template/html/one_page_html.rb
@@ -0,0 +1,122 @@
+module RDoc
+module Page
+######################################################################
+#
+# The following is used for the -1 option
+#
+
+CONTENTS_XML = %{
+IF:description
+%description%
+ENDIF:description
+
+IF:requires
+<h4>Requires:</h4>
+<ul>
+START:requires
+IF:aref
+<li><a href="%aref%">%name%</a></li>
+ENDIF:aref
+IFNOT:aref
+<li>%name%</li>
+ENDIF:aref 
+END:requires
+</ul>
+ENDIF:requires
+
+IF:attributes
+<h4>Attributes</h4>
+<table>
+START:attributes
+<tr><td>%name%</td><td>%rw%</td><td>%a_desc%</td></tr>
+END:attributes
+</table>
+ENDIF:attributes
+
+IF:includes
+<h4>Includes</h4>
+<ul>
+START:includes
+IF:aref
+<li><a href="%aref%">%name%</a></li>
+ENDIF:aref
+IFNOT:aref
+<li>%name%</li>
+ENDIF:aref 
+END:includes
+</ul>
+ENDIF:includes
+
+IF:method_list
+<h3>Methods</h3>
+START:method_list
+IF:methods
+START:methods
+<h4>%type% %category% method: 
+IF:callseq
+<a name="%aref%">%callseq%</a>
+ENDIF:callseq
+IFNOT:callseq
+<a name="%aref%">%name%%params%</a></h4>
+ENDIF:callseq
+
+IF:m_desc
+%m_desc%
+ENDIF:m_desc
+
+IF:sourcecode
+<blockquote><pre>
+%sourcecode%
+</pre></blockquote>
+ENDIF:sourcecode
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+}
+
+########################################################################
+
+ONE_PAGE = %{
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>%title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+</head>
+<body>
+START:files
+<h2>File: %short_name%</h2>
+<table>
+  <tr><td>Path:</td><td>%full_path%</td></tr>
+  <tr><td>Modified:</td><td>%dtm_modified%</td></tr>
+</table>
+} + CONTENTS_XML + %{
+END:files
+
+IF:classes
+<h2>Classes</h2>
+START:classes
+IF:parent
+<h3>%classmod% %full_name% &lt; HREF:par_url:parent:</h3>
+ENDIF:parent
+IFNOT:parent
+<h3>%classmod% %full_name%</h3>
+ENDIF:parent
+
+IF:infiles
+(in files
+START:infiles
+HREF:full_path_url:full_path:
+END:infiles
+)
+ENDIF:infiles
+} + CONTENTS_XML + %{
+END:classes
+ENDIF:classes
+</body>
+</html>
+}
+
+end
+end
diff --git a/ruby_1_8_6/lib/rdoc/generators/template/xml/rdf.rb b/ruby_1_8_6/lib/rdoc/generators/template/xml/rdf.rb
new file mode 100644
index 0000000000..1545d81a2f
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/generators/template/xml/rdf.rb
@@ -0,0 +1,112 @@
+module RDoc
+module Page
+
+
+
+CONTENTS_RDF = %{
+IF:description
+    <description rd:parseType="Literal">
+%description%
+    </description>
+ENDIF:description
+
+IF:requires
+START:requires
+         <rd:required-file rd:name="%name%" />
+END:requires
+ENDIF:requires
+
+IF:attributes
+START:attributes
+        <contents>
+        <Attribute rd:name="%name%">
+IF:rw
+          <attribute-rw>%rw%</attribute-rw>
+ENDIF:rw
+          <description rdf:parseType="Literal">%a_desc%</description>
+        </Attribute>
+        </contents>
+END:attributes
+ENDIF:attributes
+
+IF:includes
+      <IncludedModuleList>
+START:includes
+        <included-module rd:name="%name%"  />
+END:includes
+      </IncludedModuleList>
+ENDIF:includes
+
+IF:method_list
+START:method_list
+IF:methods
+START:methods
+	<contents>
+        <Method rd:name="%name%" rd:visibility="%type%"
+                rd:category="%category%" rd:id="%aref%">
+          <parameters>%params%</parameters>
+IF:m_desc
+          <description rdf:parseType="Literal">
+%m_desc%
+          </description>
+ENDIF:m_desc
+IF:sourcecode
+          <source-code-listing rdf:parseType="Literal">
+%sourcecode%
+          </source-code-listing>
+ENDIF:sourcecode
+        </Method>
+       </contents>
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+     <!-- end method list -->
+}
+
+########################################################################
+
+ONE_PAGE = %{<?xml version="1.0" encoding="utf-8"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://pragprog.com/rdoc/rdoc.rdf#"
+        xmlns:rd="http://pragprog.com/rdoc/rdoc.rdf#">
+
+<!-- RDoc -->
+START:files
+  <rd:File rd:name="%short_name%" rd:id="%href%">
+      <path>%full_path%</path>
+      <dtm-modified>%dtm_modified%</dtm-modified>
+} + CONTENTS_RDF + %{
+  </rd:File>
+END:files
+START:classes
+  <%classmod% rd:name="%full_name%" rd:id="%full_name%">
+    <classmod-info>
+IF:infiles
+      <InFiles>
+START:infiles
+        <infile>
+          <File rd:name="%full_path%"
+IF:full_path_url
+                rdf:about="%full_path_url%"
+ENDIF:full_path_url
+           />
+         </infile>
+END:infiles
+      </InFiles>
+ENDIF:infiles
+IF:parent
+     <superclass>HREF:par_url:parent:</superclass>
+ENDIF:parent
+    </classmod-info>
+} + CONTENTS_RDF + %{
+  </%classmod%>
+END:classes
+<!-- /RDoc -->
+</rdf:RDF>
+}
+
+
+end
+end
+
diff --git a/ruby_1_8_6/lib/rdoc/generators/template/xml/xml.rb b/ruby_1_8_6/lib/rdoc/generators/template/xml/xml.rb
new file mode 100644
index 0000000000..4a0c8c9ac4
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/generators/template/xml/xml.rb
@@ -0,0 +1,112 @@
+module RDoc
+module Page
+
+
+
+CONTENTS_XML = %{
+IF:description
+    <description>
+%description%
+    </description>
+ENDIF:description
+    <contents>
+IF:requires
+      <required-file-list>
+START:requires
+         <required-file name="%name%"
+IF:aref 
+                        href="%aref%"
+ENDIF:aref
+         />
+END:requires
+      </required-file-list>
+ENDIF:requires
+IF:attributes
+      <attribute-list>
+START:attributes
+        <attribute name="%name%">
+IF:rw
+          <attribute-rw>%rw%</attribute-rw>
+ENDIF:rw
+          <description>%a_desc%</description>
+        </attribute>
+END:attributes
+      </attribute-list>
+ENDIF:attributes
+IF:includes
+      <included-module-list>
+START:includes
+        <included-module name="%name%"
+IF:aref
+                         href="%aref%"
+ENDIF:aref
+        />
+END:includes
+      </included-module-list>
+ENDIF:includes
+IF:method_list
+      <method-list>
+START:method_list
+IF:methods
+START:methods
+        <method name="%name%" type="%type%" category="%category%" id="%aref%">
+          <parameters>%params%</parameters>
+IF:m_desc
+          <description>
+%m_desc%
+          </description>
+ENDIF:m_desc
+IF:sourcecode
+          <source-code-listing>
+%sourcecode%
+          </source-code-listing>
+ENDIF:sourcecode
+        </method>
+END:methods
+ENDIF:methods
+END:method_list
+      </method-list>
+ENDIF:method_list
+     </contents>
+}
+
+########################################################################
+
+ONE_PAGE = %{<?xml version="1.0" encoding="utf-8"?>
+<rdoc>
+<file-list>
+START:files
+  <file name="%short_name%" id="%href%">
+    <file-info>
+      <path>%full_path%</path>
+      <dtm-modified>%dtm_modified%</dtm-modified>
+    </file-info>
+} + CONTENTS_XML + %{
+  </file>
+END:files
+</file-list>
+<class-module-list>
+START:classes
+  <%classmod% name="%full_name%" id="%full_name%">
+    <classmod-info>
+IF:infiles
+      <infiles>      
+START:infiles
+        <infile>HREF:full_path_url:full_path:</infile>
+END:infiles
+      </infiles>
+ENDIF:infiles
+IF:parent
+     <superclass>HREF:par_url:parent:</superclass>
+ENDIF:parent
+    </classmod-info>
+} + CONTENTS_XML + %{
+  </%classmod%>
+END:classes
+</class-module-list>
+</rdoc>
+}
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/rdoc/generators/xml_generator.rb b/ruby_1_8_6/lib/rdoc/generators/xml_generator.rb
new file mode 100644
index 0000000000..8c1a76d62b
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/generators/xml_generator.rb
@@ -0,0 +1,130 @@
+
+require 'ftools'
+
+require 'rdoc/options'
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_html'
+require 'rdoc/generators/html_generator'
+
+module Generators
+
+  # Generate XML output as one big file
+
+  class XMLGenerator < HTMLGenerator
+
+    # Standard generator factory
+    def XMLGenerator.for(options)
+      XMLGenerator.new(options)
+    end
+
+    
+    def initialize(*args)
+      super
+    end
+
+    ##
+    # Build the initial indices and output objects
+    # based on an array of TopLevel objects containing
+    # the extracted information. 
+
+    def generate(info)
+      @info       = info
+      @files      = []
+      @classes    = []
+      @hyperlinks = {}
+
+      build_indices
+      generate_xml
+    end
+
+
+    ##
+    # Generate:
+    #
+    # * a list of HtmlFile objects for each TopLevel object.
+    # * a list of HtmlClass objects for each first level
+    #   class or module in the TopLevel objects
+    # * a complete list of all hyperlinkable terms (file,
+    #   class, module, and method names)
+
+    def build_indices
+
+      @info.each do |toplevel|
+        @files << HtmlFile.new(toplevel, @options, FILE_DIR)
+      end
+
+      RDoc::TopLevel.all_classes_and_modules.each do |cls|
+        build_class_list(cls, @files[0], CLASS_DIR)
+      end
+    end
+
+    def build_class_list(from, html_file, class_dir)
+      @classes << HtmlClass.new(from, html_file, class_dir, @options)
+      from.each_classmodule do |mod|
+        build_class_list(mod, html_file, class_dir)
+      end
+    end
+
+    ##
+    # Generate all the HTML. For the one-file case, we generate
+    # all the information in to one big hash
+    #
+    def generate_xml
+      values = { 
+        'charset' => @options.charset,
+        'files'   => gen_into(@files),
+        'classes' => gen_into(@classes)
+      }
+      
+      # this method is defined in the template file
+      write_extra_pages if defined? write_extra_pages
+
+      template = TemplatePage.new(RDoc::Page::ONE_PAGE)
+
+      if @options.op_name
+        opfile = File.open(@options.op_name, "w")
+      else
+        opfile = $stdout
+      end
+      template.write_html_on(opfile, values)
+    end
+
+    def gen_into(list)
+      res = []
+      list.each do |item|
+        res << item.value_hash
+      end
+      res
+    end
+
+    def gen_file_index
+      gen_an_index(@files, 'Files')
+    end
+
+    def gen_class_index
+      gen_an_index(@classes, 'Classes')
+    end
+
+    def gen_method_index
+      gen_an_index(HtmlMethod.all_methods, 'Methods')
+    end
+
+    
+    def gen_an_index(collection, title)
+      res = []
+      collection.sort.each do |f|
+        if f.document_self
+          res << { "href" => f.path, "name" => f.index_name }
+        end
+      end
+
+      return {
+        "entries" => res,
+        'list_title' => title,
+        'index_url'  => main_url,
+      }
+    end
+
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rdoc/markup/.document b/ruby_1_8_6/lib/rdoc/markup/.document
new file mode 100644
index 0000000000..3cf4f21bd7
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/.document
@@ -0,0 +1,2 @@
+simple_markup
+simple_markup.rb
diff --git a/ruby_1_8_6/lib/rdoc/markup/sample/rdoc2latex.rb b/ruby_1_8_6/lib/rdoc/markup/sample/rdoc2latex.rb
new file mode 100644
index 0000000000..26563b75da
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/sample/rdoc2latex.rb
@@ -0,0 +1,16 @@
+#!/usr/local/bin/ruby
+# Illustration of a script to convert an RDoc-style file to a LaTeX
+# document
+
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_latex'
+
+p = SM::SimpleMarkup.new
+h = SM::ToLaTeX.new
+
+#puts "\\documentclass{report}"
+#puts "\\usepackage{tabularx}"
+#puts "\\usepackage{parskip}"
+#puts "\\begin{document}"
+puts p.convert(ARGF.read, h)
+#puts "\\end{document}"
diff --git a/ruby_1_8_6/lib/rdoc/markup/sample/sample.rb b/ruby_1_8_6/lib/rdoc/markup/sample/sample.rb
new file mode 100644
index 0000000000..a375b54564
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/sample/sample.rb
@@ -0,0 +1,42 @@
+# This program illustrates the basic use of the SimpleMarkup
+# class. It extracts the first comment block from the 
+# simple_markup.rb file and converts it into HTML on
+# standard output. Run it using
+#
+#  % ruby sample.rb
+#
+# You should be in the sample/ directory when you do this,
+# as it hardwires the path to the files it needs to require.
+# This isn't necessary in the code you write once you've 
+# installed the package.
+#
+# For a better way of formatting code comment blocks (and more)
+# see the rdoc package.
+#
+
+$:.unshift "../../.."
+
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_html'
+
+# Extract the comment block from the source file
+
+input_string = ""
+
+File.foreach("../simple_markup.rb") do |line|
+  break unless line.gsub!(/^\# ?/, '')
+  input_string << line
+end
+
+# Create a markup object
+markup = SM::SimpleMarkup.new
+
+# Attach it to an HTML formatter
+h = SM::ToHtml.new
+
+# And convert out comment block to html. Wrap it a body
+# tag pair to let browsers view it
+
+puts "<html><body>"
+puts markup.convert(input_string, h)
+puts "</body></html>"
diff --git a/ruby_1_8_6/lib/rdoc/markup/simple_markup.rb b/ruby_1_8_6/lib/rdoc/markup/simple_markup.rb
new file mode 100644
index 0000000000..8193ca02d4
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/simple_markup.rb
@@ -0,0 +1,476 @@
+# = Introduction
+#
+# SimpleMarkup parses plain text documents and attempts to decompose
+# them into their constituent parts. Some of these parts are high-level:
+# paragraphs, chunks of verbatim text, list entries and the like. Other
+# parts happen at the character level: a piece of bold text, a word in
+# code font. This markup is similar in spirit to that used on WikiWiki
+# webs, where folks create web pages using a simple set of formatting
+# rules.
+#
+# SimpleMarkup itself does no output formatting: this is left to a
+# different set of classes.
+#
+# SimpleMarkup is extendable at runtime: you can add new markup
+# elements to be recognised in the documents that SimpleMarkup parses.
+#
+# SimpleMarkup is intended to be the basis for a family of tools which
+# share the common requirement that simple, plain-text should be
+# rendered in a variety of different output formats and media. It is
+# envisaged that SimpleMarkup could be the basis for formating RDoc
+# style comment blocks, Wiki entries, and online FAQs.
+#
+# = Basic Formatting
+#
+# * SimpleMarkup looks for a document's natural left margin. This is
+#   used as the initial margin for the document.
+#
+# * Consecutive lines starting at this margin are considered to be a
+#   paragraph.
+#
+# * If a paragraph starts with a "*", "-", or with "<digit>.", then it is
+#   taken to be the start of a list. The margin in increased to be the
+#   first non-space following the list start flag. Subsequent lines
+#   should be indented to this new margin until the list ends. For
+#   example:
+#
+#      * this is a list with three paragraphs in
+#        the first item. This is the first paragraph.
+#
+#        And this is the second paragraph.
+#
+#        1. This is an indented, numbered list.
+#        2. This is the second item in that list
+#
+#        This is the third conventional paragraph in the
+#        first list item.
+#
+#      * This is the second item in the original list
+#
+# * You can also construct labeled lists, sometimes called description
+#   or definition lists. Do this by putting the label in square brackets
+#   and indenting the list body:
+#
+#       [cat]  a small furry mammal
+#              that seems to sleep a lot
+#
+#       [ant]  a little insect that is known
+#              to enjoy picnics
+#
+#   A minor variation on labeled lists uses two colons to separate the
+#   label from the list body:
+#
+#       cat::  a small furry mammal
+#              that seems to sleep a lot
+#
+#       ant::  a little insect that is known
+#              to enjoy picnics
+#     
+#   This latter style guarantees that the list bodies' left margins are
+#   aligned: think of them as a two column table.
+#
+# * Any line that starts to the right of the current margin is treated
+#   as verbatim text. This is useful for code listings. The example of a
+#   list above is also verbatim text.
+#
+# * A line starting with an equals sign (=) is treated as a
+#   heading. Level one headings have one equals sign, level two headings
+#   have two,and so on.
+#
+# * A line starting with three or more hyphens (at the current indent)
+#   generates a horizontal rule. THe more hyphens, the thicker the rule
+#   (within reason, and if supported by the output device)
+#
+# * You can use markup within text (except verbatim) to change the
+#   appearance of parts of that text. Out of the box, SimpleMarkup
+#   supports word-based and general markup.
+#
+#   Word-based markup uses flag characters around individual words:
+#
+#   [\*word*]  displays word in a *bold* font
+#   [\_word_]  displays word in an _emphasized_ font
+#   [\+word+]  displays word in a +code+ font
+#
+#   General markup affects text between a start delimiter and and end
+#   delimiter. Not surprisingly, these delimiters look like HTML markup.
+#
+#   [\<b>text...</b>]    displays word in a *bold* font
+#   [\<em>text...</em>]  displays word in an _emphasized_ font
+#   [\<i>text...</i>]    displays word in an _emphasized_ font
+#   [\<tt>text...</tt>]  displays word in a +code+ font
+#
+#   Unlike conventional Wiki markup, general markup can cross line
+#   boundaries. You can turn off the interpretation of markup by
+#   preceding the first character with a backslash, so \\\<b>bold
+#   text</b> and \\\*bold* produce \<b>bold text</b> and \*bold
+#   respectively.
+#
+# = Using SimpleMarkup
+#
+# For information on using SimpleMarkup programatically, 
+# see SM::SimpleMarkup.
+#
+# Author::   Dave Thomas,  dave@pragmaticprogrammer.com
+# Version::  0.0
+# License::  Ruby license
+
+
+
+require 'rdoc/markup/simple_markup/fragments'
+require 'rdoc/markup/simple_markup/lines.rb'
+
+module SM  #:nodoc:
+
+  # == Synopsis
+  #
+  # This code converts <tt>input_string</tt>, which is in the format
+  # described in markup/simple_markup.rb, to HTML. The conversion
+  # takes place in the +convert+ method, so you can use the same
+  # SimpleMarkup object to convert multiple input strings.
+  #
+  #   require 'rdoc/markup/simple_markup'
+  #   require 'rdoc/markup/simple_markup/to_html'
+  #
+  #   p = SM::SimpleMarkup.new
+  #   h = SM::ToHtml.new
+  #
+  #   puts p.convert(input_string, h)
+  #
+  # You can extend the SimpleMarkup parser to recognise new markup
+  # sequences, and to add special processing for text that matches a
+  # regular epxression. Here we make WikiWords significant to the parser,
+  # and also make the sequences {word} and \<no>text...</no> signify
+  # strike-through text. When then subclass the HTML output class to deal
+  # with these:
+  #
+  #   require 'rdoc/markup/simple_markup'
+  #   require 'rdoc/markup/simple_markup/to_html'
+  #
+  #   class WikiHtml < SM::ToHtml
+  #     def handle_special_WIKIWORD(special)
+  #       "<font color=red>" + special.text + "</font>"
+  #     end
+  #   end
+  #
+  #   p = SM::SimpleMarkup.new
+  #   p.add_word_pair("{", "}", :STRIKE)
+  #   p.add_html("no", :STRIKE)
+  #
+  #   p.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
+  #
+  #   h = WikiHtml.new
+  #   h.add_tag(:STRIKE, "<strike>", "</strike>")
+  #
+  #   puts "<body>" + p.convert(ARGF.read, h) + "</body>"
+  #
+  # == Output Formatters
+  #
+  # _missing_
+  #
+  #
+
+  class SimpleMarkup
+
+    SPACE = ?\s
+
+    # List entries look like:
+    #  *       text
+    #  1.      text
+    #  [label] text
+    #  label:: text
+    #
+    # Flag it as a list entry, and
+    # work out the indent for subsequent lines
+
+    SIMPLE_LIST_RE = /^(
+                  (  \*          (?# bullet)
+                    |-           (?# bullet)
+                    |\d+\.       (?# numbered )
+                    |[A-Za-z]\.  (?# alphabetically numbered )
+                  )
+                  \s+
+                )\S/x
+
+    LABEL_LIST_RE = /^(
+                        (  \[.*?\]    (?# labeled  )
+                          |\S.*::     (?# note     )
+                        )(?:\s+|$)
+                      )/x
+
+
+    ##
+    # take a block of text and use various heuristics to determine
+    # it's structure (paragraphs, lists, and so on). Invoke an
+    # event handler as we identify significant chunks.
+    #
+
+    def initialize
+      @am = AttributeManager.new
+      @output = nil
+    end
+
+    ##
+    # Add to the sequences used to add formatting to an individual word 
+    # (such as *bold*). Matching entries will generate attibutes
+    # that the output formatters can recognize by their +name+
+
+    def add_word_pair(start, stop, name)
+      @am.add_word_pair(start, stop, name)
+    end
+
+    ##
+    # Add to the sequences recognized as general markup
+    #
+
+    def add_html(tag, name)
+      @am.add_html(tag, name)
+    end
+
+    ##
+    # Add to other inline sequences. For example, we could add
+    # WikiWords using something like:
+    #
+    #    parser.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
+    #
+    # Each wiki word will be presented to the output formatter 
+    # via the accept_special method
+    #
+
+    def add_special(pattern, name)
+      @am.add_special(pattern, name)
+    end
+
+
+    # We take a string, split it into lines, work out the type of
+    # each line, and from there deduce groups of lines (for example
+    # all lines in a paragraph). We then invoke the output formatter
+    # using a Visitor to display the result
+
+    def convert(str, op)
+      @lines = Lines.new(str.split(/\r?\n/).collect { |aLine| 
+                           Line.new(aLine) })
+      return "" if @lines.empty?
+      @lines.normalize
+      assign_types_to_lines
+      group = group_lines
+      # call the output formatter to handle the result
+      #      group.to_a.each {|i| p i}
+      group.accept(@am, op)
+    end
+
+
+    #######
+    private
+    #######
+
+
+    ##
+    # Look through the text at line indentation. We flag each line as being
+    # Blank, a paragraph, a list element, or verbatim text
+    #
+
+    def assign_types_to_lines(margin = 0, level = 0)
+
+      while line = @lines.next
+        if line.isBlank?
+          line.stamp(Line::BLANK, level)
+          next
+        end
+        
+        # if a line contains non-blanks before the margin, then it must belong
+        # to an outer level
+
+        text = line.text
+        
+        for i in 0...margin
+          if text[i] != SPACE
+            @lines.unget
+            return
+          end
+        end
+
+        active_line = text[margin..-1]
+
+        # Rules (horizontal lines) look like
+        #
+        #  ---   (three or more hyphens)
+        #
+        # The more hyphens, the thicker the rule
+        #
+
+        if /^(---+)\s*$/ =~ active_line
+          line.stamp(Line::RULE, level, $1.length-2)
+          next
+        end
+
+        # Then look for list entries. First the ones that have to have
+        # text following them (* xxx, - xxx, and dd. xxx)
+
+        if SIMPLE_LIST_RE =~ active_line
+
+          offset = margin + $1.length
+          prefix = $2
+          prefix_length = prefix.length
+
+          flag = case prefix
+                 when "*","-" then ListBase::BULLET
+                 when /^\d/   then ListBase::NUMBER
+                 when /^[A-Z]/ then ListBase::UPPERALPHA
+                 when /^[a-z]/ then ListBase::LOWERALPHA
+                 else raise "Invalid List Type: #{self.inspect}"
+                 end
+
+          line.stamp(Line::LIST, level+1, prefix, flag)
+          text[margin, prefix_length] = " " * prefix_length
+          assign_types_to_lines(offset, level + 1)
+          next
+        end
+
+
+        if LABEL_LIST_RE =~ active_line
+          offset = margin + $1.length
+          prefix = $2
+          prefix_length = prefix.length
+
+          next if handled_labeled_list(line, level, margin, offset, prefix)
+        end
+
+        # Headings look like
+        # = Main heading
+        # == Second level
+        # === Third
+        #
+        # Headings reset the level to 0
+
+        if active_line[0] == ?= and active_line =~ /^(=+)\s*(.*)/
+          prefix_length = $1.length
+          prefix_length = 6 if prefix_length > 6
+          line.stamp(Line::HEADING, 0, prefix_length)
+          line.strip_leading(margin + prefix_length)
+          next
+        end
+        
+        # If the character's a space, then we have verbatim text,
+        # otherwise 
+
+        if active_line[0] == SPACE
+          line.strip_leading(margin) if margin > 0
+          line.stamp(Line::VERBATIM, level)
+        else
+          line.stamp(Line::PARAGRAPH, level)
+        end
+      end
+    end
+
+    # Handle labeled list entries, We have a special case
+    # to deal with. Because the labels can be long, they force
+    # the remaining block of text over the to right:
+    #
+    # this is a long label that I wrote:: and here is the
+    #                                     block of text with
+    #                                     a silly margin
+    #
+    # So we allow the special case. If the label is followed
+    # by nothing, and if the following line is indented, then
+    # we take the indent of that line as the new margin
+    #
+    # this is a long label that I wrote::
+    #     here is a more reasonably indented block which
+    #     will ab attached to the label.
+    #
+    
+    def handled_labeled_list(line, level, margin, offset, prefix)
+      prefix_length = prefix.length
+      text = line.text
+      flag = nil
+      case prefix
+      when /^\[/
+        flag = ListBase::LABELED
+        prefix = prefix[1, prefix.length-2]
+      when /:$/
+        flag = ListBase::NOTE
+        prefix.chop!
+      else raise "Invalid List Type: #{self.inspect}"
+      end
+      
+      # body is on the next line
+      
+      if text.length <= offset
+        original_line = line
+        line = @lines.next
+        return(false) unless line
+        text = line.text
+        
+        for i in 0..margin
+          if text[i] != SPACE
+            @lines.unget
+            return false
+          end
+        end
+        i = margin
+        i += 1 while text[i] == SPACE
+        if i >= text.length
+          @lines.unget
+          return false
+        else
+          offset = i
+          prefix_length = 0
+          @lines.delete(original_line)
+        end
+      end
+      
+      line.stamp(Line::LIST, level+1, prefix, flag)
+      text[margin, prefix_length] = " " * prefix_length
+      assign_types_to_lines(offset, level + 1)
+      return true
+    end
+
+    # Return a block consisting of fragments which are
+    # paragraphs, list entries or verbatim text. We merge consecutive
+    # lines of the same type and level together. We are also slightly
+    # tricky with lists: the lines following a list introduction
+    # look like paragraph lines at the next level, and we remap them
+    # into list entries instead
+
+    def group_lines
+      @lines.rewind
+
+      inList = false
+      wantedType = wantedLevel = nil
+
+      block = LineCollection.new
+      group = nil
+
+      while line = @lines.next
+        if line.level == wantedLevel and line.type == wantedType
+          group.add_text(line.text)
+        else
+          group = block.fragment_for(line)
+          block.add(group)
+          if line.type == Line::LIST
+            wantedType = Line::PARAGRAPH
+          else
+            wantedType = line.type
+          end
+          wantedLevel = line.type == Line::HEADING ? line.param : line.level
+        end
+      end
+
+      block.normalize
+      block
+    end
+
+    ## for debugging, we allow access to our line contents as text
+    def content
+      @lines.as_text
+    end
+    public :content
+
+    ## for debugging, return the list of line types
+    def get_line_types
+      @lines.line_types
+    end
+    public :get_line_types
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rdoc/markup/simple_markup/fragments.rb b/ruby_1_8_6/lib/rdoc/markup/simple_markup/fragments.rb
new file mode 100644
index 0000000000..6ca06382ab
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/simple_markup/fragments.rb
@@ -0,0 +1,328 @@
+require 'rdoc/markup/simple_markup/lines.rb'
+#require 'rdoc/markup/simple_markup/to_flow.rb'
+
+module SM
+
+  ##
+  # A Fragment is a chunk of text, subclassed as a paragraph, a list
+  # entry, or verbatim text
+
+  class Fragment
+    attr_reader   :level, :param, :txt
+    attr_accessor :type
+
+    def initialize(level, param, type, txt)
+      @level = level
+      @param = param
+      @type  = type
+      @txt   = ""
+      add_text(txt) if txt
+    end
+
+    def add_text(txt)
+      @txt << " " if @txt.length > 0
+      @txt << txt.tr_s("\n ", "  ").strip
+    end
+
+    def to_s
+      "L#@level: #{self.class.name.split('::')[-1]}\n#@txt"
+    end
+
+    ######
+    # This is a simple factory system that lets us associate fragement
+    # types (a string) with a subclass of fragment
+
+    TYPE_MAP = {}
+
+    def Fragment.type_name(name)
+      TYPE_MAP[name] = self
+    end
+
+    def Fragment.for(line)
+      klass =  TYPE_MAP[line.type] ||
+        raise("Unknown line type: '#{line.type.inspect}:' '#{line.text}'")
+      return klass.new(line.level, line.param, line.flag, line.text)
+    end
+  end
+
+  ##
+  # A paragraph is a fragment which gets wrapped to fit. We remove all
+  # newlines when we're created, and have them put back on output
+
+  class Paragraph < Fragment
+    type_name Line::PARAGRAPH
+  end
+
+  class BlankLine < Paragraph
+    type_name Line::BLANK
+  end
+
+  class Heading < Paragraph
+    type_name Line::HEADING
+
+    def head_level
+      @param.to_i
+    end
+  end
+
+  ##
+  # A List is a fragment with some kind of label
+  #
+
+  class ListBase < Paragraph
+    # List types
+    BULLET  = :BULLET
+    NUMBER  = :NUMBER
+    UPPERALPHA  = :UPPERALPHA
+    LOWERALPHA  = :LOWERALPHA
+    LABELED = :LABELED
+    NOTE    = :NOTE
+  end
+
+  class ListItem < ListBase
+    type_name Line::LIST
+
+    #  def label
+    #    am = AttributeManager.new(@param)
+    #    am.flow
+    #  end
+  end
+
+  class ListStart < ListBase
+    def initialize(level, param, type)
+      super(level, param, type, nil)
+    end
+  end
+
+  class ListEnd < ListBase
+    def initialize(level, type)
+      super(level, "", type, nil)
+    end
+  end
+
+  ##
+  # Verbatim code contains lines that don't get wrapped.
+
+  class Verbatim < Fragment
+    type_name  Line::VERBATIM
+
+    def add_text(txt)
+      @txt << txt.chomp << "\n"
+    end
+
+  end
+
+  ##
+  # A horizontal rule
+  class Rule < Fragment
+    type_name Line::RULE
+  end
+
+
+  # Collect groups of lines together. Each group
+  # will end up containing a flow of text
+
+  class LineCollection
+    
+    def initialize
+      @fragments = []
+    end
+
+    def add(fragment)
+      @fragments << fragment
+    end
+
+    def each(&b)
+      @fragments.each(&b)
+    end
+
+    # For testing
+    def to_a
+      @fragments.map {|fragment| fragment.to_s}
+    end
+
+    # Factory for different fragment types
+    def fragment_for(*args)
+      Fragment.for(*args)
+    end
+
+    # tidy up at the end
+    def normalize
+      change_verbatim_blank_lines
+      add_list_start_and_ends
+      add_list_breaks
+      tidy_blank_lines
+    end
+
+    def to_s
+      @fragments.join("\n----\n")
+    end
+
+    def accept(am, visitor)
+
+      visitor.start_accepting
+
+      @fragments.each do |fragment|
+        case fragment
+        when Verbatim
+          visitor.accept_verbatim(am, fragment)
+        when Rule
+          visitor.accept_rule(am, fragment)
+        when ListStart
+          visitor.accept_list_start(am, fragment)
+        when ListEnd
+          visitor.accept_list_end(am, fragment)
+        when ListItem
+          visitor.accept_list_item(am, fragment)
+        when BlankLine
+          visitor.accept_blank_line(am, fragment)
+        when Heading
+          visitor.accept_heading(am, fragment)
+        when Paragraph
+          visitor.accept_paragraph(am, fragment)
+        end
+      end
+
+      visitor.end_accepting
+    end
+    #######
+    private
+    #######
+
+    # If you have:
+    #
+    #    normal paragraph text.
+    #
+    #       this is code
+    #   
+    #       and more code
+    #
+    # You'll end up with the fragments Paragraph, BlankLine, 
+    # Verbatim, BlankLine, Verbatim, BlankLine, etc
+    #
+    # The BlankLine in the middle of the verbatim chunk needs to
+    # be changed to a real verbatim newline, and the two
+    # verbatim blocks merged
+    #
+    #    
+    def change_verbatim_blank_lines
+      frag_block = nil
+      blank_count = 0
+      @fragments.each_with_index do |frag, i|
+        if frag_block.nil?
+          frag_block = frag if Verbatim === frag
+        else
+          case frag
+          when Verbatim
+            blank_count.times { frag_block.add_text("\n") }
+            blank_count = 0
+            frag_block.add_text(frag.txt)
+            @fragments[i] = nil    # remove out current fragment
+          when BlankLine
+            if frag_block
+              blank_count += 1
+              @fragments[i] = nil
+            end
+          else
+            frag_block = nil
+            blank_count = 0
+          end
+        end
+      end
+      @fragments.compact!
+    end
+
+    # List nesting is implicit given the level of
+    # Make it explicit, just to make life a tad
+    # easier for the output processors
+
+    def add_list_start_and_ends
+      level = 0
+      res = []
+      type_stack = []
+
+      @fragments.each do |fragment|
+        # $stderr.puts "#{level} : #{fragment.class.name} : #{fragment.level}"
+        new_level = fragment.level
+        while (level < new_level)
+          level += 1
+          type = fragment.type
+          res << ListStart.new(level, fragment.param, type) if type
+          type_stack.push type
+          # $stderr.puts "Start: #{level}"
+        end
+
+        while level > new_level
+          type = type_stack.pop
+          res << ListEnd.new(level, type) if type
+          level -= 1
+          # $stderr.puts "End: #{level}, #{type}"
+        end
+
+        res << fragment
+        level = fragment.level
+      end
+      level.downto(1) do |i|
+        type = type_stack.pop
+        res << ListEnd.new(i, type) if type
+      end
+
+      @fragments = res
+    end
+
+    # now insert start/ends between list entries at the
+    # same level that have different element types
+
+    def add_list_breaks
+      res = @fragments
+
+      @fragments = []
+      list_stack = []
+
+      res.each do |fragment|
+        case fragment
+        when ListStart
+          list_stack.push fragment
+        when ListEnd
+          start = list_stack.pop
+          fragment.type = start.type
+        when ListItem
+          l = list_stack.last
+          if fragment.type != l.type
+            @fragments << ListEnd.new(l.level, l.type)
+            start = ListStart.new(l.level, fragment.param, fragment.type)
+            @fragments << start
+            list_stack.pop
+            list_stack.push start
+          end
+        else
+          ;
+        end
+        @fragments << fragment
+      end
+    end
+
+    # Finally tidy up the blank lines:
+    # * change Blank/ListEnd into ListEnd/Blank
+    # * remove blank lines at the front
+
+    def tidy_blank_lines
+      (@fragments.size - 1).times do |i|
+        if @fragments[i].kind_of?(BlankLine) and 
+            @fragments[i+1].kind_of?(ListEnd)
+          @fragments[i], @fragments[i+1] = @fragments[i+1], @fragments[i] 
+        end
+      end
+
+      # remove leading blanks
+      @fragments.each_with_index do |f, i|
+        break unless f.kind_of? BlankLine
+        @fragments[i] = nil
+      end
+
+      @fragments.compact!
+    end
+
+  end
+  
+end
diff --git a/ruby_1_8_6/lib/rdoc/markup/simple_markup/inline.rb b/ruby_1_8_6/lib/rdoc/markup/simple_markup/inline.rb
new file mode 100644
index 0000000000..d54fe1e667
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/simple_markup/inline.rb
@@ -0,0 +1,340 @@
+module SM
+
+  # We manage a set of attributes. Each attribute has a symbol name
+  # and a bit value
+
+  class Attribute
+    SPECIAL = 1
+
+    @@name_to_bitmap = { :_SPECIAL_ => SPECIAL }
+    @@next_bitmap = 2
+
+    def Attribute.bitmap_for(name)
+      bitmap = @@name_to_bitmap[name]
+      if !bitmap
+        bitmap = @@next_bitmap
+        @@next_bitmap <<= 1
+        @@name_to_bitmap[name] = bitmap
+      end
+      bitmap
+    end
+
+    def Attribute.as_string(bitmap)
+      return "none" if bitmap.zero?
+      res = []
+      @@name_to_bitmap.each do |name, bit|
+        res << name if (bitmap & bit) != 0
+      end
+      res.join(",")
+    end
+
+    def Attribute.each_name_of(bitmap)
+      @@name_to_bitmap.each do |name, bit|
+        next if bit == SPECIAL
+        yield name.to_s if (bitmap & bit) != 0
+      end
+    end
+  end
+
+
+  # An AttrChanger records a change in attributes. It contains
+  # a bitmap of the attributes to turn on, and a bitmap of those to
+  # turn off
+
+  AttrChanger = Struct.new(:turn_on, :turn_off)
+  class AttrChanger
+    def to_s
+      "Attr: +#{Attribute.as_string(@turn_on)}/-#{Attribute.as_string(@turn_on)}"
+    end
+  end
+
+  # An array of attributes which parallels the characters in a string
+  class AttrSpan
+    def initialize(length)
+      @attrs = Array.new(length, 0)
+    end
+
+    def set_attrs(start, length, bits)
+      for i in start ... (start+length)
+        @attrs[i] |= bits
+      end
+    end
+
+    def [](n)
+      @attrs[n]
+    end
+  end
+
+  ##
+  # Hold details of a special sequence
+
+  class Special
+    attr_reader   :type
+    attr_accessor :text
+
+    def initialize(type, text)
+      @type, @text = type, text
+    end
+
+    def ==(o)
+      self.text == o.text && self.type == o.type
+    end
+
+    def to_s
+      "Special: type=#{type}, text=#{text.dump}"
+    end
+  end
+  
+  class AttributeManager
+
+    NULL = "\000".freeze
+
+    ##
+    # We work by substituting non-printing characters in to the
+    # text. For now I'm assuming that I can substitute
+    # a character in the range 0..8 for a 7 bit character
+    # without damaging the encoded string, but this might
+    # be optimistic
+    #
+
+    A_PROTECT  = 004
+    PROTECT_ATTR  = A_PROTECT.chr
+
+    # This maps delimiters that occur around words (such as
+    # *bold* or +tt+) where the start and end delimiters
+    # and the same. This lets us optimize the regexp
+    MATCHING_WORD_PAIRS = {}
+
+    # And this is used when the delimiters aren't the same. In this
+    # case the hash maps a pattern to the attribute character
+    WORD_PAIR_MAP = {}
+
+    # This maps HTML tags to the corresponding attribute char
+    HTML_TAGS = {}
+
+    # And this maps _special_ sequences to a name. A special sequence
+    # is something like a WikiWord
+    SPECIAL = {}
+
+    # Return an attribute object with the given turn_on
+    # and turn_off bits set
+
+    def attribute(turn_on, turn_off)
+      AttrChanger.new(turn_on, turn_off)
+    end
+
+
+    def change_attribute(current, new)
+      diff = current ^ new
+      attribute(new & diff, current & diff)
+    end
+
+    def changed_attribute_by_name(current_set, new_set)
+      current = new = 0
+      current_set.each {|name| current |= Attribute.bitmap_for(name) }
+      new_set.each {|name| new |= Attribute.bitmap_for(name) }
+      change_attribute(current, new)
+    end
+
+    def copy_string(start_pos, end_pos)
+      res = @str[start_pos...end_pos]
+      res.gsub!(/\000/, '')
+      res
+    end
+
+    # Map attributes like <b>text</b>to the sequence \001\002<char>\001\003<char>,
+    # where <char> is a per-attribute specific character
+
+    def convert_attrs(str, attrs)
+      # first do matching ones
+      tags = MATCHING_WORD_PAIRS.keys.join("")
+      re = "(^|\\W)([#{tags}])([A-Za-z_]+?)\\2(\\W|\$)"
+#      re = "(^|\\W)([#{tags}])(\\S+?)\\2(\\W|\$)"
+      1 while str.gsub!(Regexp.new(re)) {
+        attr = MATCHING_WORD_PAIRS[$2];
+        attrs.set_attrs($`.length + $1.length + $2.length, $3.length, attr)
+        $1 + NULL*$2.length + $3 + NULL*$2.length + $4
+      }
+
+      # then non-matching
+      unless WORD_PAIR_MAP.empty?
+        WORD_PAIR_MAP.each do |regexp, attr|
+          str.gsub!(regexp) { 
+            attrs.set_attrs($`.length + $1.length, $2.length, attr)
+            NULL*$1.length + $2 + NULL*$3.length
+          }
+        end
+      end
+    end
+
+    def convert_html(str, attrs)
+      tags = HTML_TAGS.keys.join("|")
+      re = "<(#{tags})>(.*?)</\\1>"
+      1 while str.gsub!(Regexp.new(re, Regexp::IGNORECASE)) {
+        attr = HTML_TAGS[$1.downcase]
+        html_length = $1.length + 2
+        seq = NULL * html_length
+        attrs.set_attrs($`.length + html_length, $2.length, attr)
+        seq + $2 + seq + NULL
+      }
+    end
+
+    def convert_specials(str, attrs)
+      unless SPECIAL.empty?
+        SPECIAL.each do |regexp, attr|
+          str.scan(regexp) do
+            attrs.set_attrs($`.length, $&.length, attr | Attribute::SPECIAL)
+          end
+        end
+      end
+    end
+
+    # A \ in front of a character that would normally be
+    # processed turns off processing. We do this by turning
+    # \< into <#{PROTECT}
+    
+    PROTECTABLE = [ "<" << "\\" ]  #"
+
+
+    def mask_protected_sequences
+      protect_pattern = Regexp.new("\\\\([#{Regexp.escape(PROTECTABLE.join(''))}])")
+      @str.gsub!(protect_pattern, "\\1#{PROTECT_ATTR}")
+    end
+
+    def unmask_protected_sequences
+      @str.gsub!(/(.)#{PROTECT_ATTR}/, "\\1\000")
+    end
+
+    def initialize
+      add_word_pair("*", "*", :BOLD)
+      add_word_pair("_", "_", :EM)
+      add_word_pair("+", "+", :TT)
+      
+      add_html("em", :EM)
+      add_html("i",  :EM)
+      add_html("b",  :BOLD)
+      add_html("tt",   :TT)
+      add_html("code", :TT)
+
+      add_special(/<!--(.*?)-->/, :COMMENT)
+    end
+
+    def add_word_pair(start, stop, name)
+      raise "Word flags may not start '<'" if start[0] == ?<
+      bitmap = Attribute.bitmap_for(name)
+      if start == stop
+        MATCHING_WORD_PAIRS[start] = bitmap
+      else
+        pattern = Regexp.new("(" + Regexp.escape(start) + ")" +
+#                             "([A-Za-z]+)" +
+                             "(\\S+)" +
+                             "(" + Regexp.escape(stop) +")")
+        WORD_PAIR_MAP[pattern] = bitmap
+      end
+      PROTECTABLE << start[0,1]
+      PROTECTABLE.uniq!
+    end
+
+    def add_html(tag, name)
+      HTML_TAGS[tag.downcase] = Attribute.bitmap_for(name)
+    end
+
+    def add_special(pattern, name)
+      SPECIAL[pattern] = Attribute.bitmap_for(name)
+    end
+
+    def flow(str)
+      @str = str
+
+      puts("Before flow, str='#{@str.dump}'") if $DEBUG
+      mask_protected_sequences
+ 
+      @attrs = AttrSpan.new(@str.length)
+
+      puts("After protecting, str='#{@str.dump}'") if $DEBUG
+      convert_attrs(@str, @attrs)
+      convert_html(@str, @attrs)
+      convert_specials(str, @attrs)
+      unmask_protected_sequences
+      puts("After flow, str='#{@str.dump}'") if $DEBUG
+      return split_into_flow
+    end
+
+    def display_attributes
+      puts
+      puts @str.tr(NULL, "!")
+      bit = 1
+      16.times do |bno|
+        line = ""
+        @str.length.times do |i|
+          if (@attrs[i] & bit) == 0
+            line << " "
+          else
+            if bno.zero?
+              line << "S"
+            else
+              line << ("%d" % (bno+1))
+            end
+          end
+        end
+        puts(line) unless line =~ /^ *$/
+        bit <<= 1
+      end
+    end
+
+    def split_into_flow
+
+      display_attributes if $DEBUG
+
+      res = []
+      current_attr = 0
+      str = ""
+
+      
+      str_len = @str.length
+
+      # skip leading invisible text
+      i = 0
+      i += 1 while i < str_len and @str[i].zero?
+      start_pos = i
+
+      # then scan the string, chunking it on attribute changes
+      while i < str_len
+        new_attr = @attrs[i]
+        if new_attr != current_attr
+          if i > start_pos
+            res << copy_string(start_pos, i)
+            start_pos = i
+          end
+
+          res << change_attribute(current_attr, new_attr)
+          current_attr = new_attr
+
+          if (current_attr & Attribute::SPECIAL) != 0
+            i += 1 while i < str_len and (@attrs[i] & Attribute::SPECIAL) != 0
+            res << Special.new(current_attr, copy_string(start_pos, i))
+            start_pos = i
+            next
+          end
+        end
+
+        # move on, skipping any invisible characters
+        begin
+          i += 1
+        end while i < str_len and @str[i].zero?
+      end
+      
+      # tidy up trailing text
+      if start_pos < str_len
+        res << copy_string(start_pos, str_len)
+      end
+
+      # and reset to all attributes off
+      res << change_attribute(current_attr, 0) if current_attr != 0
+
+      return res
+    end
+
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rdoc/markup/simple_markup/lines.rb b/ruby_1_8_6/lib/rdoc/markup/simple_markup/lines.rb
new file mode 100644
index 0000000000..4e294f27dc
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/simple_markup/lines.rb
@@ -0,0 +1,151 @@
+##########################################################################
+#
+# We store the lines we're working on as objects of class Line.
+# These contain the text of the line, along with a flag indicating the
+# line type, and an indentation level
+
+module SM
+
+  class Line
+    INFINITY = 9999
+
+    BLANK     = :BLANK
+    HEADING   = :HEADING
+    LIST      = :LIST
+    RULE      = :RULE
+    PARAGRAPH = :PARAGRAPH
+    VERBATIM  = :VERBATIM
+    
+    # line type
+    attr_accessor :type
+
+    # The indentation nesting level
+    attr_accessor :level
+
+    # The contents
+    attr_accessor :text
+
+    # A prefix or parameter. For LIST lines, this is
+    # the text that introduced the list item (the label)
+    attr_accessor  :param
+
+    # A flag. For list lines, this is the type of the list
+    attr_accessor :flag
+
+    # the number of leading spaces
+    attr_accessor :leading_spaces
+
+    # true if this line has been deleted from the list of lines
+    attr_accessor :deleted
+    
+
+    def initialize(text)
+      @text    = text.dup
+      @deleted = false
+
+      # expand tabs
+      1 while @text.gsub!(/\t+/) { ' ' * (8*$&.length - $`.length % 8)}  && $~ #`
+
+      # Strip trailing whitespace
+      @text.sub!(/\s+$/, '')
+
+      # and look for leading whitespace
+      if @text.length > 0
+        @text =~ /^(\s*)/
+        @leading_spaces = $1.length
+      else
+        @leading_spaces = INFINITY
+      end
+    end
+
+    # Return true if this line is blank
+    def isBlank?
+      @text.length.zero?
+    end
+
+    # stamp a line with a type, a level, a prefix, and a flag
+    def stamp(type, level, param="", flag=nil)
+      @type, @level, @param, @flag = type, level, param, flag
+    end
+
+    ##
+    # Strip off the leading margin
+    #
+
+    def strip_leading(size)
+      if @text.size > size
+        @text[0,size] = ""
+      else
+        @text = ""
+      end
+    end
+
+    def to_s
+      "#@type#@level: #@text"
+    end
+  end
+
+  ###############################################################################
+  #
+  # A container for all the lines
+  #
+
+  class Lines
+    include Enumerable
+
+    attr_reader :lines   # for debugging
+
+    def initialize(lines)
+      @lines = lines
+      rewind
+    end
+
+    def empty?
+      @lines.size.zero?
+    end
+
+    def each
+      @lines.each do |line|
+        yield line unless line.deleted
+      end
+    end
+
+#    def [](index)
+#      @lines[index]
+#    end
+
+    def rewind
+      @nextline = 0
+    end
+
+    def next
+      begin
+        res = @lines[@nextline]
+        @nextline += 1 if @nextline < @lines.size
+      end while res and res.deleted and @nextline < @lines.size
+      res
+    end
+
+    def unget
+      @nextline -= 1
+    end
+
+    def delete(a_line)
+      a_line.deleted = true
+    end
+
+    def normalize
+      margin = @lines.collect{|l| l.leading_spaces}.min
+      margin = 0 if margin == Line::INFINITY
+      @lines.each {|line| line.strip_leading(margin) } if margin > 0
+    end
+
+    def as_text
+      @lines.map {|l| l.text}.join("\n")
+    end
+
+    def line_types
+      @lines.map {|l| l.type }
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/markup/simple_markup/preprocess.rb b/ruby_1_8_6/lib/rdoc/markup/simple_markup/preprocess.rb
new file mode 100644
index 0000000000..101c9bdeb1
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/simple_markup/preprocess.rb
@@ -0,0 +1,73 @@
+module SM
+
+  ## 
+  # Handle common directives that can occur in a block of text:
+  #
+  # : include : filename
+  #
+
+  class PreProcess
+
+    def initialize(input_file_name, include_path)
+      @input_file_name = input_file_name
+      @include_path = include_path
+    end
+
+    # Look for common options in a chunk of text. Options that
+    # we don't handle are passed back to our caller
+    # as |directive, param| 
+
+    def handle(text)
+      text.gsub!(/^([ \t#]*):(\w+):\s*(.+)?\n/) do 
+        prefix    = $1
+        directive = $2.downcase
+        param     = $3
+
+        case directive
+        when "include"
+          filename = param.split[0]
+          include_file(filename, prefix)
+
+        else
+          yield(directive, param)
+        end
+      end
+    end
+
+    #######
+    private
+    #######
+
+    # Include a file, indenting it correctly
+
+    def include_file(name, indent)
+      if (full_name = find_include_file(name))
+        content = File.open(full_name) {|f| f.read}
+        # strip leading '#'s, but only if all lines start with them
+        if content =~ /^[^#]/
+          content.gsub(/^/, indent)
+        else
+          content.gsub(/^#?/, indent)
+        end
+      else
+        $stderr.puts "Couldn't find file to include: '#{name}'"
+        ''
+      end
+    end
+
+    # Look for the given file in the directory containing the current
+    # file, and then in each of the directories specified in the
+    # RDOC_INCLUDE path
+
+    def find_include_file(name)
+      to_search = [ File.dirname(@input_file_name) ].concat @include_path
+      to_search.each do |dir|
+        full_name = File.join(dir, name)
+        stat = File.stat(full_name) rescue next
+        return full_name if stat.readable?
+      end
+      nil
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/markup/simple_markup/to_flow.rb b/ruby_1_8_6/lib/rdoc/markup/simple_markup/to_flow.rb
new file mode 100644
index 0000000000..048e71abce
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/simple_markup/to_flow.rb
@@ -0,0 +1,188 @@
+require 'rdoc/markup/simple_markup/fragments'
+require 'rdoc/markup/simple_markup/inline'
+require 'cgi'
+
+module SM
+
+  module Flow
+    P = Struct.new(:body)
+    VERB = Struct.new(:body)
+    RULE = Struct.new(:width)
+    class LIST
+      attr_reader :type, :contents
+      def initialize(type)
+        @type = type
+        @contents = []
+      end
+      def <<(stuff)
+        @contents << stuff
+      end
+    end
+    LI = Struct.new(:label, :body)
+    H = Struct.new(:level, :text)
+  end
+
+  class ToFlow
+    LIST_TYPE_TO_HTML = {
+      SM::ListBase::BULLET     =>  [ "<ul>", "</ul>" ],
+      SM::ListBase::NUMBER     =>  [ "<ol>", "</ol>" ],
+      SM::ListBase::UPPERALPHA =>  [ "<ol>", "</ol>" ],
+      SM::ListBase::LOWERALPHA =>  [ "<ol>", "</ol>" ],
+      SM::ListBase::LABELED    =>  [ "<dl>", "</dl>" ],
+      SM::ListBase::NOTE       =>  [ "<table>", "</table>" ],
+    }
+
+    InlineTag = Struct.new(:bit, :on, :off)
+
+    def initialize
+      init_tags
+    end
+
+    ##
+    # Set up the standard mapping of attributes to HTML tags
+    #
+    def init_tags
+      @attr_tags = [
+        InlineTag.new(SM::Attribute.bitmap_for(:BOLD), "<b>", "</b>"),
+        InlineTag.new(SM::Attribute.bitmap_for(:TT),   "<tt>", "</tt>"),
+        InlineTag.new(SM::Attribute.bitmap_for(:EM),   "<em>", "</em>"),
+      ]
+    end
+
+    ##
+    # Add a new set of HTML tags for an attribute. We allow
+    # separate start and end tags for flexibility
+    #
+    def add_tag(name, start, stop)
+      @attr_tags << InlineTag.new(SM::Attribute.bitmap_for(name), start, stop)
+    end
+
+    ##
+    # Given an HTML tag, decorate it with class information
+    # and the like if required. This is a no-op in the base
+    # class, but is overridden in HTML output classes that
+    # implement style sheets
+
+    def annotate(tag)
+      tag
+    end
+
+    ## 
+    # Here's the client side of the visitor pattern
+
+    def start_accepting
+      @res = []
+      @list_stack = []
+    end
+
+    def end_accepting
+      @res
+    end
+
+    def accept_paragraph(am, fragment)
+      @res << Flow::P.new((convert_flow(am.flow(fragment.txt))))
+    end
+
+    def accept_verbatim(am, fragment)
+      @res << Flow::VERB.new((convert_flow(am.flow(fragment.txt))))
+    end
+
+    def accept_rule(am, fragment)
+      size = fragment.param
+      size = 10 if size > 10
+      @res << Flow::RULE.new(size)
+    end
+
+    def accept_list_start(am, fragment)
+      @list_stack.push(@res)
+      list = Flow::LIST.new(fragment.type)
+      @res << list
+      @res = list
+    end
+
+    def accept_list_end(am, fragment)
+      @res = @list_stack.pop
+    end
+
+    def accept_list_item(am, fragment)
+      @res << Flow::LI.new(fragment.param, convert_flow(am.flow(fragment.txt)))
+    end
+
+    def accept_blank_line(am, fragment)
+      # @res << annotate("<p />") << "\n"
+    end
+
+    def accept_heading(am, fragment)
+      @res << Flow::H.new(fragment.head_level, convert_flow(am.flow(fragment.txt)))
+    end
+
+
+    #######################################################################
+
+    private
+
+    #######################################################################
+
+    def on_tags(res, item)
+      attr_mask = item.turn_on
+      return if attr_mask.zero?
+
+      @attr_tags.each do |tag|
+        if attr_mask & tag.bit != 0
+          res << annotate(tag.on)
+        end
+      end
+    end
+
+    def off_tags(res, item)
+      attr_mask = item.turn_off
+      return if attr_mask.zero?
+
+      @attr_tags.reverse_each do |tag|
+        if attr_mask & tag.bit != 0
+          res << annotate(tag.off)
+        end
+      end
+    end
+
+    def convert_flow(flow)
+      res = ""
+      flow.each do |item|
+        case item
+        when String
+          res << convert_string(item)
+        when AttrChanger
+          off_tags(res, item)
+          on_tags(res,  item)
+        when Special
+          res << convert_special(item)
+        else
+          raise "Unknown flow element: #{item.inspect}"
+        end
+      end
+      res
+    end
+
+    # some of these patterns are taken from SmartyPants...
+
+    def convert_string(item)
+      CGI.escapeHTML(item)
+    end
+
+    def convert_special(special)
+      handled = false
+      Attribute.each_name_of(special.type) do |name|
+        method_name = "handle_special_#{name}"
+        if self.respond_to? method_name
+          special.text = send(method_name, special)
+          handled = true
+        end
+      end
+      raise "Unhandled special: #{special}" unless handled
+      special.text
+    end
+
+
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rdoc/markup/simple_markup/to_html.rb b/ruby_1_8_6/lib/rdoc/markup/simple_markup/to_html.rb
new file mode 100644
index 0000000000..26b5f4ce70
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/simple_markup/to_html.rb
@@ -0,0 +1,289 @@
+require 'rdoc/markup/simple_markup/fragments'
+require 'rdoc/markup/simple_markup/inline'
+
+require 'cgi'
+
+module SM
+
+  class ToHtml
+
+    LIST_TYPE_TO_HTML = {
+      ListBase::BULLET =>  [ "<ul>", "</ul>" ],
+      ListBase::NUMBER =>  [ "<ol>", "</ol>" ],
+      ListBase::UPPERALPHA =>  [ "<ol>", "</ol>" ],
+      ListBase::LOWERALPHA =>  [ "<ol>", "</ol>" ],
+      ListBase::LABELED => [ "<dl>", "</dl>" ],
+      ListBase::NOTE    => [ "<table>", "</table>" ],
+    }
+
+    InlineTag = Struct.new(:bit, :on, :off)
+
+    def initialize
+      init_tags
+    end
+
+    ##
+    # Set up the standard mapping of attributes to HTML tags
+    #
+    def init_tags
+      @attr_tags = [
+        InlineTag.new(SM::Attribute.bitmap_for(:BOLD), "<b>", "</b>"),
+        InlineTag.new(SM::Attribute.bitmap_for(:TT),   "<tt>", "</tt>"),
+        InlineTag.new(SM::Attribute.bitmap_for(:EM),   "<em>", "</em>"),
+      ]
+    end
+
+    ##
+    # Add a new set of HTML tags for an attribute. We allow
+    # separate start and end tags for flexibility
+    #
+    def add_tag(name, start, stop)
+      @attr_tags << InlineTag.new(SM::Attribute.bitmap_for(name), start, stop)
+    end
+
+    ##
+    # Given an HTML tag, decorate it with class information
+    # and the like if required. This is a no-op in the base
+    # class, but is overridden in HTML output classes that
+    # implement style sheets
+
+    def annotate(tag)
+      tag
+    end
+
+    ## 
+    # Here's the client side of the visitor pattern
+
+    def start_accepting
+      @res = ""
+      @in_list_entry = []
+    end
+
+    def end_accepting
+      @res
+    end
+
+    def accept_paragraph(am, fragment)
+      @res << annotate("<p>") + "\n"
+      @res << wrap(convert_flow(am.flow(fragment.txt)))
+      @res << annotate("</p>") + "\n"
+    end
+
+    def accept_verbatim(am, fragment)
+      @res << annotate("<pre>") + "\n"
+      @res << CGI.escapeHTML(fragment.txt)
+      @res << annotate("</pre>") << "\n"
+    end
+
+    def accept_rule(am, fragment)
+      size = fragment.param
+      size = 10 if size > 10
+      @res << "<hr size=\"#{size}\"></hr>"
+    end
+
+    def accept_list_start(am, fragment)
+      @res << html_list_name(fragment.type, true) <<"\n"
+      @in_list_entry.push false
+    end
+
+    def accept_list_end(am, fragment)
+      if tag = @in_list_entry.pop
+        @res << annotate(tag) << "\n"
+      end
+      @res << html_list_name(fragment.type, false) <<"\n"
+    end
+
+    def accept_list_item(am, fragment)
+      if tag = @in_list_entry.last
+        @res << annotate(tag) << "\n"
+      end
+      @res << list_item_start(am, fragment)
+      @res << wrap(convert_flow(am.flow(fragment.txt))) << "\n"
+      @in_list_entry[-1] = list_end_for(fragment.type)
+    end
+
+    def accept_blank_line(am, fragment)
+      # @res << annotate("<p />") << "\n"
+    end
+
+    def accept_heading(am, fragment)
+      @res << convert_heading(fragment.head_level, am.flow(fragment.txt))
+    end
+
+    # This is a higher speed (if messier) version of wrap
+
+    def wrap(txt, line_len = 76)
+      res = ""
+      sp = 0
+      ep = txt.length
+      while sp < ep
+        # scan back for a space
+        p = sp + line_len - 1
+        if p >= ep
+          p = ep
+        else
+          while p > sp and txt[p] != ?\s
+            p -= 1
+          end
+          if p <= sp
+            p = sp + line_len
+            while p < ep and txt[p] != ?\s
+              p += 1
+            end
+          end
+        end
+        res << txt[sp...p] << "\n"
+        sp = p
+        sp += 1 while sp < ep and txt[sp] == ?\s
+      end
+      res
+    end
+
+    #######################################################################
+
+    private
+
+    #######################################################################
+
+    def on_tags(res, item)
+      attr_mask = item.turn_on
+      return if attr_mask.zero?
+
+      @attr_tags.each do |tag|
+        if attr_mask & tag.bit != 0
+          res << annotate(tag.on)
+        end
+      end
+    end
+
+    def off_tags(res, item)
+      attr_mask = item.turn_off
+      return if attr_mask.zero?
+
+      @attr_tags.reverse_each do |tag|
+        if attr_mask & tag.bit != 0
+          res << annotate(tag.off)
+        end
+      end
+    end
+
+    def convert_flow(flow)
+      res = ""
+      flow.each do |item|
+        case item
+        when String
+          res << convert_string(item)
+        when AttrChanger
+          off_tags(res, item)
+          on_tags(res,  item)
+        when Special
+          res << convert_special(item)
+        else
+          raise "Unknown flow element: #{item.inspect}"
+        end
+      end
+      res
+    end
+
+    # some of these patterns are taken from SmartyPants...
+
+    def convert_string(item)
+      CGI.escapeHTML(item).
+      
+      
+      # convert -- to em-dash, (-- to en-dash)
+        gsub(/---?/, '&#8212;'). #gsub(/--/, '&#8211;').
+
+      # convert ... to elipsis (and make sure .... becomes .<elipsis>)
+        gsub(/\.\.\.\./, '.&#8230;').gsub(/\.\.\./, '&#8230;').
+
+      # convert single closing quote
+        gsub(%r{([^ \t\r\n\[\{\(])\'}) { "#$1&#8217;" }.
+        gsub(%r{\'(?=\W|s\b)}) { "&#8217;" }.
+
+      # convert single opening quote
+        gsub(/'/, '&#8216;').
+
+      # convert double closing quote
+        gsub(%r{([^ \t\r\n\[\{\(])\'(?=\W)}) { "#$1&#8221;" }.
+
+      # convert double opening quote
+        gsub(/'/, '&#8220;').
+
+      # convert copyright
+        gsub(/\(c\)/, '&#169;').
+
+      # convert and registered trademark
+        gsub(/\(r\)/, '&#174;')
+
+    end
+
+    def convert_special(special)
+      handled = false
+      Attribute.each_name_of(special.type) do |name|
+        method_name = "handle_special_#{name}"
+        if self.respond_to? method_name
+          special.text = send(method_name, special)
+          handled = true
+        end
+      end
+      raise "Unhandled special: #{special}" unless handled
+      special.text
+    end
+
+    def convert_heading(level, flow)
+      res =
+        annotate("<h#{level}>") + 
+        convert_flow(flow) + 
+        annotate("</h#{level}>\n")
+    end
+
+    def html_list_name(list_type, is_open_tag)
+      tags = LIST_TYPE_TO_HTML[list_type] || raise("Invalid list type: #{list_type.inspect}")
+      annotate(tags[ is_open_tag ? 0 : 1])
+    end
+
+    def list_item_start(am, fragment)
+      case fragment.type
+      when ListBase::BULLET, ListBase::NUMBER
+        annotate("<li>")
+
+      when ListBase::UPPERALPHA
+	annotate("<li type=\"A\">")
+
+      when ListBase::LOWERALPHA
+	annotate("<li type=\"a\">")
+
+      when ListBase::LABELED
+        annotate("<dt>") +
+          convert_flow(am.flow(fragment.param)) + 
+          annotate("</dt>") +
+          annotate("<dd>")
+
+      when ListBase::NOTE
+        annotate("<tr>") +
+          annotate("<td valign=\"top\">") +
+          convert_flow(am.flow(fragment.param)) + 
+          annotate("</td>") +
+          annotate("<td>")
+      else
+        raise "Invalid list type"
+      end
+    end
+
+    def list_end_for(fragment_type)
+      case fragment_type
+      when ListBase::BULLET, ListBase::NUMBER, ListBase::UPPERALPHA, ListBase::LOWERALPHA
+        "</li>"
+      when ListBase::LABELED
+        "</dd>"
+      when ListBase::NOTE
+        "</td></tr>"
+      else
+        raise "Invalid list type"
+      end
+    end
+
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rdoc/markup/simple_markup/to_latex.rb b/ruby_1_8_6/lib/rdoc/markup/simple_markup/to_latex.rb
new file mode 100644
index 0000000000..6c16278652
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/simple_markup/to_latex.rb
@@ -0,0 +1,333 @@
+require 'rdoc/markup/simple_markup/fragments'
+require 'rdoc/markup/simple_markup/inline'
+
+require 'cgi'
+
+module SM
+
+  # Convert SimpleMarkup to basic LaTeX report format
+
+  class ToLaTeX
+
+    BS = "\020"   # \
+    OB = "\021"   # {
+    CB = "\022"   # }
+    DL = "\023"   # Dollar
+
+    BACKSLASH   = "#{BS}symbol#{OB}92#{CB}"
+    HAT         = "#{BS}symbol#{OB}94#{CB}"
+    BACKQUOTE   = "#{BS}symbol#{OB}0#{CB}"
+    TILDE       = "#{DL}#{BS}sim#{DL}"
+    LESSTHAN    = "#{DL}<#{DL}"
+    GREATERTHAN = "#{DL}>#{DL}"
+
+    def self.l(str)
+      str.tr('\\', BS).tr('{', OB).tr('}', CB).tr('$', DL)
+    end
+
+    def l(arg)
+      SM::ToLaTeX.l(arg)
+    end
+
+    LIST_TYPE_TO_LATEX = {
+      ListBase::BULLET =>  [ l("\\begin{itemize}"), l("\\end{itemize}") ],
+      ListBase::NUMBER =>  [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\arabic" ],
+      ListBase::UPPERALPHA =>  [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\Alph" ],
+      ListBase::LOWERALPHA =>  [ l("\\begin{enumerate}"), l("\\end{enumerate}"), "\\alph" ],
+      ListBase::LABELED => [ l("\\begin{description}"), l("\\end{description}") ],
+      ListBase::NOTE    => [
+        l("\\begin{tabularx}{\\linewidth}{@{} l X @{}}"), 
+        l("\\end{tabularx}") ],
+    }
+
+    InlineTag = Struct.new(:bit, :on, :off)
+
+    def initialize
+      init_tags
+      @list_depth = 0
+      @prev_list_types = []
+    end
+
+    ##
+    # Set up the standard mapping of attributes to LaTeX
+    #
+    def init_tags
+      @attr_tags = [
+        InlineTag.new(SM::Attribute.bitmap_for(:BOLD), l("\\textbf{"), l("}")),
+        InlineTag.new(SM::Attribute.bitmap_for(:TT),   l("\\texttt{"), l("}")),
+        InlineTag.new(SM::Attribute.bitmap_for(:EM),   l("\\emph{"), l("}")),
+      ]
+    end
+
+    ##
+    # Escape a LaTeX string
+    def escape(str)
+# $stderr.print "FE: ", str
+      s = str.
+#        sub(/\s+$/, '').
+        gsub(/([_\${}&%#])/, "#{BS}\\1").
+        gsub(/\\/, BACKSLASH).
+        gsub(/\^/, HAT).
+        gsub(/~/,  TILDE).
+        gsub(/</,  LESSTHAN).
+        gsub(/>/,  GREATERTHAN).
+        gsub(/,,/, ",{},").
+        gsub(/\`/,  BACKQUOTE)
+# $stderr.print "-> ", s, "\n"
+      s
+    end
+
+    ##
+    # Add a new set of LaTeX tags for an attribute. We allow
+    # separate start and end tags for flexibility
+    #
+    def add_tag(name, start, stop)
+      @attr_tags << InlineTag.new(SM::Attribute.bitmap_for(name), start, stop)
+    end
+
+
+    ## 
+    # Here's the client side of the visitor pattern
+
+    def start_accepting
+      @res = ""
+      @in_list_entry = []
+    end
+
+    def end_accepting
+      @res.tr(BS, '\\').tr(OB, '{').tr(CB, '}').tr(DL, '$')
+    end
+
+    def accept_paragraph(am, fragment)
+      @res << wrap(convert_flow(am.flow(fragment.txt)))
+      @res << "\n"
+    end
+
+    def accept_verbatim(am, fragment)
+      @res << "\n\\begin{code}\n"
+      @res << fragment.txt.sub(/[\n\s]+\Z/, '')
+      @res << "\n\\end{code}\n\n"
+    end
+
+    def accept_rule(am, fragment)
+      size = fragment.param
+      size = 10 if size > 10
+      @res << "\n\n\\rule{\\linewidth}{#{size}pt}\n\n"
+    end
+
+    def accept_list_start(am, fragment)
+      @res << list_name(fragment.type, true) <<"\n"
+      @in_list_entry.push false
+    end
+
+    def accept_list_end(am, fragment)
+      if tag = @in_list_entry.pop
+        @res << tag << "\n"
+      end
+      @res << list_name(fragment.type, false) <<"\n"
+    end
+
+    def accept_list_item(am, fragment)
+      if tag = @in_list_entry.last
+        @res << tag << "\n"
+      end
+      @res << list_item_start(am, fragment)
+      @res << wrap(convert_flow(am.flow(fragment.txt))) << "\n"
+      @in_list_entry[-1] = list_end_for(fragment.type)
+    end
+
+    def accept_blank_line(am, fragment)
+      # @res << "\n"
+    end
+
+    def accept_heading(am, fragment)
+      @res << convert_heading(fragment.head_level, am.flow(fragment.txt))
+    end
+
+    # This is a higher speed (if messier) version of wrap
+
+    def wrap(txt, line_len = 76)
+      res = ""
+      sp = 0
+      ep = txt.length
+      while sp < ep
+        # scan back for a space
+        p = sp + line_len - 1
+        if p >= ep
+          p = ep
+        else
+          while p > sp and txt[p] != ?\s
+            p -= 1
+          end
+          if p <= sp
+            p = sp + line_len
+            while p < ep and txt[p] != ?\s
+              p += 1
+            end
+          end
+        end
+        res << txt[sp...p] << "\n"
+        sp = p
+        sp += 1 while sp < ep and txt[sp] == ?\s
+      end
+      res
+    end
+
+    #######################################################################
+
+    private
+
+    #######################################################################
+
+    def on_tags(res, item)
+      attr_mask = item.turn_on
+      return if attr_mask.zero?
+
+      @attr_tags.each do |tag|
+        if attr_mask & tag.bit != 0
+          res << tag.on
+        end
+      end
+    end
+
+    def off_tags(res, item)
+      attr_mask = item.turn_off
+      return if attr_mask.zero?
+
+      @attr_tags.reverse_each do |tag|
+        if attr_mask & tag.bit != 0
+          res << tag.off
+        end
+      end
+    end
+
+    def convert_flow(flow)
+      res = ""
+      flow.each do |item|
+        case item
+        when String
+#          $stderr.puts "Converting '#{item}'"
+          res << convert_string(item)
+        when AttrChanger
+          off_tags(res, item)
+          on_tags(res,  item)
+        when Special
+          res << convert_special(item)
+        else
+          raise "Unknown flow element: #{item.inspect}"
+        end
+      end
+      res
+    end
+
+    # some of these patterns are taken from SmartyPants...
+
+    def convert_string(item)
+
+      escape(item).
+      
+      
+      # convert ... to elipsis (and make sure .... becomes .<elipsis>)
+        gsub(/\.\.\.\./, '.\ldots{}').gsub(/\.\.\./, '\ldots{}').
+
+      # convert single closing quote
+        gsub(%r{([^ \t\r\n\[\{\(])\'}) { "#$1'" }.
+        gsub(%r{\'(?=\W|s\b)}) { "'" }.
+
+      # convert single opening quote
+        gsub(/'/, '`').
+
+      # convert double closing quote
+        gsub(%r{([^ \t\r\n\[\{\(])\"(?=\W)}) { "#$1''" }.
+
+      # convert double opening quote
+        gsub(/"/, "``").
+
+      # convert copyright
+        gsub(/\(c\)/, '\copyright{}')
+
+    end
+
+    def convert_special(special)
+      handled = false
+      Attribute.each_name_of(special.type) do |name|
+        method_name = "handle_special_#{name}"
+        if self.respond_to? method_name
+          special.text = send(method_name, special)
+          handled = true
+        end
+      end
+      raise "Unhandled special: #{special}" unless handled
+      special.text
+    end
+
+    def convert_heading(level, flow)
+      res =
+        case level
+        when 1 then "\\chapter{"
+        when 2 then "\\section{"
+        when 3 then "\\subsection{"
+        when 4 then "\\subsubsection{"
+        else  "\\paragraph{"
+        end +
+        convert_flow(flow) + 
+        "}\n"
+    end
+
+    def list_name(list_type, is_open_tag)
+      tags = LIST_TYPE_TO_LATEX[list_type] || raise("Invalid list type: #{list_type.inspect}")
+      if tags[2] # enumerate
+        if is_open_tag
+          @list_depth += 1
+          if @prev_list_types[@list_depth] != tags[2]
+            case @list_depth
+            when 1
+              roman = "i"
+            when 2
+              roman = "ii"
+            when 3
+              roman = "iii"
+            when 4
+              roman = "iv"
+            else
+              raise("Too deep list: level #{@list_depth}")
+            end
+            @prev_list_types[@list_depth] = tags[2]
+            return l("\\renewcommand{\\labelenum#{roman}}{#{tags[2]}{enum#{roman}}}") + "\n" + tags[0]
+          end
+        else
+          @list_depth -= 1
+        end
+      end
+      tags[ is_open_tag ? 0 : 1]
+    end
+
+    def list_item_start(am, fragment)
+      case fragment.type
+      when ListBase::BULLET, ListBase::NUMBER, ListBase::UPPERALPHA, ListBase::LOWERALPHA
+        "\\item "
+
+      when ListBase::LABELED
+        "\\item[" + convert_flow(am.flow(fragment.param)) + "] "
+
+      when ListBase::NOTE
+          convert_flow(am.flow(fragment.param)) + " & "
+      else
+        raise "Invalid list type"
+      end
+    end
+
+    def list_end_for(fragment_type)
+      case fragment_type
+      when ListBase::BULLET, ListBase::NUMBER, ListBase::UPPERALPHA, ListBase::LOWERALPHA, ListBase::LABELED
+        ""
+      when ListBase::NOTE
+        "\\\\\n"
+      else
+        raise "Invalid list type"
+      end
+    end
+
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rdoc/markup/test/AllTests.rb b/ruby_1_8_6/lib/rdoc/markup/test/AllTests.rb
new file mode 100644
index 0000000000..b9c8c9dfcc
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/test/AllTests.rb
@@ -0,0 +1,2 @@
+require 'TestParse.rb'
+require 'TestInline.rb'
diff --git a/ruby_1_8_6/lib/rdoc/markup/test/TestInline.rb b/ruby_1_8_6/lib/rdoc/markup/test/TestInline.rb
new file mode 100644
index 0000000000..a067d4c24c
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/test/TestInline.rb
@@ -0,0 +1,154 @@
+require "test/unit"
+
+$:.unshift "../../.."
+
+require "rdoc/markup/simple_markup/inline"
+
+class TestInline < Test::Unit::TestCase
+
+
+  def setup
+    @am = SM::AttributeManager.new
+
+    @bold_on  = @am.changed_attribute_by_name([], [:BOLD])
+    @bold_off = @am.changed_attribute_by_name([:BOLD], [])
+    
+    @tt_on    = @am.changed_attribute_by_name([], [:TT])
+    @tt_off   = @am.changed_attribute_by_name([:TT], [])
+    
+    @em_on    = @am.changed_attribute_by_name([], [:EM])
+    @em_off   = @am.changed_attribute_by_name([:EM], [])
+    
+    @bold_em_on   = @am.changed_attribute_by_name([], [:BOLD] | [:EM])
+    @bold_em_off  = @am.changed_attribute_by_name([:BOLD] | [:EM], [])
+    
+    @em_then_bold = @am.changed_attribute_by_name([:EM], [:EM] | [:BOLD])
+    
+    @em_to_bold   = @am.changed_attribute_by_name([:EM], [:BOLD])
+    
+    @am.add_word_pair("{", "}", :WOMBAT)
+    @wombat_on    = @am.changed_attribute_by_name([], [:WOMBAT])
+    @wombat_off   = @am.changed_attribute_by_name([:WOMBAT], [])
+  end
+
+  def crossref(text)
+    [ @am.changed_attribute_by_name([], [:CROSSREF] | [:_SPECIAL_]),
+      SM::Special.new(33, text),
+      @am.changed_attribute_by_name([:CROSSREF] | [:_SPECIAL_], [])
+    ]
+  end
+
+  def test_special
+    # class names, variable names, file names, or instance variables
+    @am.add_special(/(
+                       \b([A-Z]\w+(::\w+)*)
+                       | \#\w+[!?=]?
+                       | \b\w+([_\/\.]+\w+)+[!?=]?
+                      )/x, 
+                    :CROSSREF)
+    
+    assert_equal(["cat"], @am.flow("cat"))
+
+    assert_equal(["cat ", crossref("#fred"), " dog"].flatten,
+                  @am.flow("cat #fred dog"))
+
+    assert_equal([crossref("#fred"), " dog"].flatten,
+                  @am.flow("#fred dog"))
+
+    assert_equal(["cat ", crossref("#fred")].flatten, @am.flow("cat #fred"))
+  end
+
+  def test_basic
+    assert_equal(["cat"], @am.flow("cat"))
+
+    assert_equal(["cat ", @bold_on, "and", @bold_off, " dog"],
+                  @am.flow("cat *and* dog"))
+
+    assert_equal(["cat ", @bold_on, "AND", @bold_off, " dog"],
+                  @am.flow("cat *AND* dog"))
+
+    assert_equal(["cat ", @em_on, "And", @em_off, " dog"],
+                  @am.flow("cat _And_ dog"))
+
+    assert_equal(["cat *and dog*"], @am.flow("cat *and dog*"))
+
+    assert_equal(["*cat and* dog"], @am.flow("*cat and* dog"))
+
+    assert_equal(["cat *and ", @bold_on, "dog", @bold_off],
+                  @am.flow("cat *and *dog*"))
+
+    assert_equal(["cat ", @em_on, "and", @em_off, " dog"],
+                  @am.flow("cat _and_ dog"))
+
+    assert_equal(["cat_and_dog"],
+                  @am.flow("cat_and_dog"))
+
+    assert_equal(["cat ", @tt_on, "and", @tt_off, " dog"],
+                  @am.flow("cat +and+ dog"))
+
+    assert_equal(["cat ", @bold_on, "a_b_c", @bold_off, " dog"],
+                  @am.flow("cat *a_b_c* dog"))
+
+    assert_equal(["cat __ dog"],
+                  @am.flow("cat __ dog"))
+
+    assert_equal(["cat ", @em_on, "_", @em_off, " dog"],
+                  @am.flow("cat ___ dog"))
+
+  end
+
+  def test_combined
+    assert_equal(["cat ", @em_on, "and", @em_off, " ", @bold_on, "dog", @bold_off],
+                  @am.flow("cat _and_ *dog*"))
+
+    assert_equal(["cat ", @em_on, "a__nd", @em_off, " ", @bold_on, "dog", @bold_off], 
+                  @am.flow("cat _a__nd_ *dog*"))
+  end
+
+  def test_html_like
+    assert_equal(["cat ", @tt_on, "dog", @tt_off], @am.flow("cat <tt>dog</Tt>"))
+
+    assert_equal(["cat ", @em_on, "and", @em_off, " ", @bold_on, "dog", @bold_off], 
+                  @am.flow("cat <i>and</i> <B>dog</b>"))
+    
+    assert_equal(["cat ", @em_on, "and ", @em_then_bold, "dog", @bold_em_off], 
+                  @am.flow("cat <i>and <B>dog</B></I>"))
+    
+    assert_equal(["cat ", @em_on, "and ", @em_to_bold, "dog", @bold_off], 
+                  @am.flow("cat <i>and </i><b>dog</b>"))
+    
+    assert_equal(["cat ", @em_on, "and ", @em_to_bold, "dog", @bold_off], 
+                  @am.flow("cat <i>and <b></i>dog</b>"))
+    
+    assert_equal([@tt_on, "cat", @tt_off, " ", @em_on, "and ", @em_to_bold, "dog", @bold_off], 
+                  @am.flow("<tt>cat</tt> <i>and <b></i>dog</b>"))
+
+    assert_equal(["cat ", @em_on, "and ", @em_then_bold, "dog", @bold_em_off], 
+                  @am.flow("cat <i>and <b>dog</b></i>"))
+    
+    assert_equal(["cat ", @bold_em_on, "and", @bold_em_off, " dog"], 
+                  @am.flow("cat <i><b>and</b></i> dog"))
+    
+    
+  end
+
+  def test_protect
+    assert_equal(['cat \\ dog'], @am.flow('cat \\ dog'))
+
+    assert_equal(["cat <tt>dog</Tt>"], @am.flow("cat \\<tt>dog</Tt>"))
+
+    assert_equal(["cat ", @em_on, "and", @em_off, " <B>dog</b>"], 
+                  @am.flow("cat <i>and</i> \\<B>dog</b>"))
+    
+    assert_equal(["*word* or <b>text</b>"], @am.flow("\\*word* or \\<b>text</b>"))
+
+    assert_equal(["_cat_", @em_on, "dog", @em_off], 
+                  @am.flow("\\_cat_<i>dog</i>"))
+  end
+
+  def test_adding
+    assert_equal(["cat ", @wombat_on, "and", @wombat_off, " dog" ],
+                  @am.flow("cat {and} dog"))
+#    assert_equal(["cat {and} dog" ], @am.flow("cat \\{and} dog"))
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/markup/test/TestParse.rb b/ruby_1_8_6/lib/rdoc/markup/test/TestParse.rb
new file mode 100644
index 0000000000..3ec541ce7a
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/markup/test/TestParse.rb
@@ -0,0 +1,503 @@
+require 'test/unit'
+
+$:.unshift "../../.."
+
+require 'rdoc/markup/simple_markup'
+
+include SM
+
+class TestParse < Test::Unit::TestCase
+
+  class MockOutput
+    def start_accepting
+      @res = []
+      end
+    
+    def end_accepting
+      @res
+    end
+
+    def accept_paragraph(am, fragment)
+      @res << fragment.to_s
+    end
+
+    def accept_verbatim(am, fragment)
+      @res << fragment.to_s
+    end
+
+    def accept_list_start(am, fragment)
+      @res << fragment.to_s
+    end
+
+    def accept_list_end(am, fragment)
+      @res << fragment.to_s
+    end
+
+    def accept_list_item(am, fragment)
+      @res << fragment.to_s
+    end
+
+    def accept_blank_line(am, fragment)
+      @res << fragment.to_s
+    end
+
+    def accept_heading(am, fragment)
+      @res << fragment.to_s
+    end
+
+    def accept_rule(am, fragment)
+      @res << fragment.to_s
+    end
+
+  end
+
+  def basic_conv(str)
+    sm = SimpleMarkup.new
+    mock = MockOutput.new
+    sm.convert(str, mock)
+    sm.content
+  end
+
+  def line_types(str, expected)
+    p = SimpleMarkup.new
+    mock = MockOutput.new
+    p.convert(str, mock)
+    assert_equal(expected, p.get_line_types.map{|type| type.to_s[0,1]}.join(''))
+  end
+
+  def line_groups(str, expected)
+    p = SimpleMarkup.new
+    mock = MockOutput.new
+
+    block = p.convert(str, mock)
+
+    if block != expected
+      rows = (0...([expected.size, block.size].max)).collect{|i|
+        [expected[i]||"nil", block[i]||"nil"] 
+      }
+      printf "\n\n%35s %35s\n", "Expected", "Got"
+      rows.each {|e,g| printf "%35s %35s\n", e.dump, g.dump }
+    end
+
+    assert_equal(expected, block)
+  end
+
+  def test_tabs
+    str = "hello\n  dave"
+    assert_equal(str, basic_conv(str))
+    str = "hello\n\tdave"
+    assert_equal("hello\n        dave", basic_conv(str))
+    str = "hello\n \tdave"
+    assert_equal("hello\n        dave", basic_conv(str))
+    str = "hello\n  \tdave"
+    assert_equal("hello\n        dave", basic_conv(str))
+    str = "hello\n   \tdave"
+    assert_equal("hello\n        dave", basic_conv(str))
+    str = "hello\n    \tdave"
+    assert_equal("hello\n        dave", basic_conv(str))
+    str = "hello\n     \tdave"
+    assert_equal("hello\n        dave", basic_conv(str))
+    str = "hello\n      \tdave"
+    assert_equal("hello\n        dave", basic_conv(str))
+    str = "hello\n       \tdave"
+    assert_equal("hello\n        dave", basic_conv(str))
+    str = "hello\n        \tdave"
+    assert_equal("hello\n                dave", basic_conv(str))
+    str = ".\t\t."
+    assert_equal(".               .", basic_conv(str))
+  end
+
+  def test_whitespace
+    assert_equal("hello", basic_conv("hello"))
+    assert_equal("hello", basic_conv(" hello "))
+    assert_equal("hello", basic_conv(" \t \t hello\t\t"))
+
+    assert_equal("1\n 2\n  3", basic_conv("1\n 2\n  3"))
+    assert_equal("1\n 2\n  3", basic_conv("  1\n   2\n    3"))
+
+    assert_equal("1\n 2\n  3\n1\n 2", basic_conv("1\n 2\n  3\n1\n 2"))
+    assert_equal("1\n 2\n  3\n1\n 2", basic_conv("  1\n   2\n    3\n  1\n   2"))
+
+    assert_equal("1\n 2\n\n  3", basic_conv("  1\n   2\n\n    3"))
+  end
+
+  def test_types
+    str = "now is the time"
+    line_types(str, 'P')
+
+    str = "now is the time\nfor all good men"
+    line_types(str, 'PP')
+
+    str = "now is the time\n  code\nfor all good men"
+    line_types(str, 'PVP')
+
+    str = "now is the time\n  code\n more code\nfor all good men"
+    line_types(str, 'PVVP')
+
+    str = "now is\n---\nthe time"
+    line_types(str, 'PRP')
+
+    str = %{\
+       now is
+       * l1
+       * l2
+       the time}
+    line_types(str, 'PLLP')
+
+    str = %{\
+       now is
+       * l1
+         l1+
+       * l2
+       the time}
+    line_types(str, 'PLPLP')
+
+    str = %{\
+       now is
+       * l1
+         * l1.1
+       * l2
+       the time}
+    line_types(str, 'PLLLP')
+
+    str = %{\
+       now is
+       * l1
+         * l1.1
+           text
+             code
+             code
+
+           text
+       * l2
+       the time}
+    line_types(str, 'PLLPVVBPLP')
+
+    str = %{\
+       now is
+       1. l1
+          * l1.1
+       2. l2
+       the time}
+    line_types(str, 'PLLLP')
+
+    str = %{\
+       now is
+       [cat] l1
+             * l1.1
+       [dog] l2
+       the time}
+    line_types(str, 'PLLLP')
+
+    str = %{\
+       now is
+       [cat] l1
+             continuation
+       [dog] l2
+       the time}
+    line_types(str, 'PLPLP')
+  end
+
+  def test_groups
+    str = "now is the time"
+    line_groups(str, ["L0: Paragraph\nnow is the time"] )
+
+    str = "now is the time\nfor all good men"
+    line_groups(str, ["L0: Paragraph\nnow is the time for all good men"] )
+
+    str = %{\
+      now is the time
+        code _line_ here
+      for all good men}
+
+    line_groups(str,
+                [ "L0: Paragraph\nnow is the time",
+                  "L0: Verbatim\n  code _line_ here\n",
+                  "L0: Paragraph\nfor all good men"
+                ] )
+
+    str = "now is the time\n  code\n more code\nfor all good men"
+    line_groups(str,
+                [ "L0: Paragraph\nnow is the time",
+                  "L0: Verbatim\n  code\n more code\n",
+                  "L0: Paragraph\nfor all good men"
+                ] )
+
+    str = %{\
+       now is
+       * l1
+       * l2
+       the time}
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L1: ListStart\n",
+                  "L1: ListItem\nl1",
+                  "L1: ListItem\nl2",
+                  "L1: ListEnd\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+    str = %{\
+       now is
+       * l1
+         l1+
+       * l2
+       the time}
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L1: ListStart\n",
+                  "L1: ListItem\nl1 l1+",
+                  "L1: ListItem\nl2",
+                  "L1: ListEnd\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+    str = %{\
+       now is
+       * l1
+         * l1.1
+       * l2
+       the time}
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L1: ListStart\n",
+                  "L1: ListItem\nl1",
+                  "L2: ListStart\n",
+                  "L2: ListItem\nl1.1",
+                  "L2: ListEnd\n",
+                  "L1: ListItem\nl2",
+                  "L1: ListEnd\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+
+    str = %{\
+       now is
+       * l1
+         * l1.1
+           text
+             code
+               code
+
+           text
+       * l2
+       the time}
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L1: ListStart\n",
+                  "L1: ListItem\nl1",
+                  "L2: ListStart\n",
+                  "L2: ListItem\nl1.1 text",
+                  "L2: Verbatim\n  code\n    code\n",
+                  "L2: Paragraph\ntext",
+                  "L2: ListEnd\n",
+                  "L1: ListItem\nl2",
+                  "L1: ListEnd\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+
+    str = %{\
+       now is
+       1. l1
+          * l1.1
+       2. l2
+       the time}
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L1: ListStart\n",
+                  "L1: ListItem\nl1",
+                  "L2: ListStart\n",
+                  "L2: ListItem\nl1.1",
+                  "L2: ListEnd\n",
+                  "L1: ListItem\nl2",
+                  "L1: ListEnd\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+    str = %{\
+       now is
+       [cat] l1
+             * l1.1
+       [dog] l2
+       the time}
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L1: ListStart\n",
+                  "L1: ListItem\nl1",
+                  "L2: ListStart\n",
+                  "L2: ListItem\nl1.1",
+                  "L2: ListEnd\n",
+                  "L1: ListItem\nl2",
+                  "L1: ListEnd\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+    str = %{\
+       now is
+       [cat] l1
+             continuation
+       [dog] l2
+       the time}
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L1: ListStart\n",
+                  "L1: ListItem\nl1 continuation",
+                  "L1: ListItem\nl2",
+                  "L1: ListEnd\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+    
+  end
+
+  def test_verbatim_merge
+    str = %{\
+       now is
+          code
+       the time}
+
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L0: Verbatim\n   code\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+
+    str = %{\
+       now is
+          code
+          code1
+       the time}
+
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L0: Verbatim\n   code\n   code1\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+
+    str = %{\
+       now is
+          code
+
+          code1
+       the time}
+
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L0: Verbatim\n   code\n\n   code1\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+
+    str = %{\
+       now is
+          code
+
+          code1
+
+       the time}
+
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L0: Verbatim\n   code\n\n   code1\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+
+    str = %{\
+       now is
+          code
+
+          code1
+
+          code2
+       the time}
+
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L0: Verbatim\n   code\n\n   code1\n\n   code2\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+
+    # Folds multiple blank lines
+    str = %{\
+       now is
+          code
+
+
+          code1
+
+       the time}
+
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L0: Verbatim\n   code\n\n   code1\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+
+  end
+ 
+  def test_list_split
+    str = %{\
+       now is
+       * l1
+       1. n1
+       2. n2
+       * l2
+       the time}
+    line_groups(str,
+                [ "L0: Paragraph\nnow is",
+                  "L1: ListStart\n",
+                  "L1: ListItem\nl1",
+                  "L1: ListEnd\n",
+                  "L1: ListStart\n",
+                  "L1: ListItem\nn1",
+                  "L1: ListItem\nn2",
+                  "L1: ListEnd\n",
+                  "L1: ListStart\n",
+                  "L1: ListItem\nl2",
+                  "L1: ListEnd\n",
+                  "L0: Paragraph\nthe time"
+                ])
+
+  end
+
+
+  def test_headings
+    str = "= heading one"
+    line_groups(str, 
+                [ "L0: Heading\nheading one"
+                ])
+
+    str = "=== heading three"
+    line_groups(str, 
+                [ "L0: Heading\nheading three"
+                ])
+
+    str = "text\n   === heading three"
+    line_groups(str, 
+                [ "L0: Paragraph\ntext",
+                  "L0: Verbatim\n   === heading three\n"
+                ])
+
+    str = "text\n   code\n   === heading three"
+    line_groups(str, 
+                [ "L0: Paragraph\ntext",
+                  "L0: Verbatim\n   code\n   === heading three\n"
+                ])
+
+    str = "text\n   code\n=== heading three"
+    line_groups(str, 
+                [ "L0: Paragraph\ntext",
+                  "L0: Verbatim\n   code\n",
+                  "L0: Heading\nheading three"
+                ])
+
+  end
+
+  
+end
diff --git a/ruby_1_8_6/lib/rdoc/options.rb b/ruby_1_8_6/lib/rdoc/options.rb
new file mode 100644
index 0000000000..4dfe45169c
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/options.rb
@@ -0,0 +1,586 @@
+# We handle the parsing of options, and subsequently as a singleton
+# object to be queried for option values
+
+require "rdoc/ri/ri_paths"
+
+class Options
+
+  require 'singleton'
+  require 'getoptlong'
+
+  include Singleton
+
+  # files matching this pattern will be excluded
+  attr_accessor :exclude
+
+  # the name of the output directory
+  attr_accessor :op_dir
+  
+  # the name to use for the output
+  attr_reader :op_name
+
+  # include private and protected methods in the
+  # output
+  attr_accessor :show_all
+  
+  # name of the file, class or module to display in
+  # the initial index page (if not specified
+  # the first file we encounter is used)
+  attr_accessor :main_page
+
+  # merge into classes of the name name when generating ri
+  attr_reader :merge
+
+  # Don't display progress as we process the files
+  attr_reader :quiet
+
+  # description of the output generator (set with the <tt>-fmt</tt>
+  # option
+  attr_accessor :generator
+
+  # and the list of files to be processed
+  attr_reader :files
+
+  # array of directories to search for files to satisfy an :include:
+  attr_reader :rdoc_include
+
+  # title to be used out the output
+  #attr_writer :title
+
+  # template to be used when generating output
+  attr_reader :template
+
+  # should diagrams be drawn
+  attr_reader :diagram
+
+  # should we draw fileboxes in diagrams
+  attr_reader :fileboxes
+
+  # include the '#' at the front of hyperlinked instance method names
+  attr_reader :show_hash
+
+  # image format for diagrams
+  attr_reader :image_format
+
+  # character-set
+  attr_reader :charset
+
+  # should source code be included inline, or displayed in a popup
+  attr_reader :inline_source
+
+  # should the output be placed into a single file
+  attr_reader :all_one_file
+
+  # the number of columns in a tab
+  attr_reader :tab_width
+
+  # include line numbers in the source listings
+  attr_reader :include_line_numbers
+
+  # pattern for additional attr_... style methods
+  attr_reader :extra_accessors
+  attr_reader :extra_accessor_flags
+
+  # URL of stylesheet
+  attr_reader :css
+
+  # URL of web cvs frontend
+  attr_reader :webcvs
+
+  # Are we promiscuous about showing module contents across
+  # multiple files
+  attr_reader :promiscuous
+
+  # scan newer sources than the flag file if true.
+  attr_reader :force_update
+
+  module OptionList
+
+    OPTION_LIST = [
+      [ "--accessor",      "-A",   "accessorname[,..]",
+        "comma separated list of additional class methods\n" +
+        "that should be treated like 'attr_reader' and\n" +
+        "friends. Option may be repeated. Each accessorname\n" +
+        "may have '=text' appended, in which case that text\n" +
+        "appears where the r/w/rw appears for normal accessors."],
+                                                                   
+      [ "--all",           "-a",   nil,
+        "include all methods (not just public)\nin the output" ],
+
+      [ "--charset",       "-c",   "charset",
+        "specifies HTML character-set" ],
+
+      [ "--debug",         "-D",   nil,
+        "displays lots on internal stuff" ],
+
+      [ "--diagram",       "-d",   nil,
+        "Generate diagrams showing modules and classes.\n" +
+        "You need dot V1.8.6 or later to use the --diagram\n" +
+        "option correctly. Dot is available from\n"+
+        "http://www.research.att.com/sw/tools/graphviz/" ],
+
+      [ "--exclude",       "-x",   "pattern",
+        "do not process files or directories matching\n" +
+        "pattern. Files given explicitly on the command\n" +
+        "line will never be excluded." ],
+
+      [ "--extension",     "-E",   "new=old",
+        "Treat files ending with .new as if they ended with\n" +
+        ".old. Using '-E cgi=rb' will cause xxx.cgi to be\n" +
+        "parsed as a Ruby file"],
+
+      [ "--fileboxes",     "-F",   nil,
+        "classes are put in boxes which represents\n" +
+        "files, where these classes reside. Classes\n" +
+        "shared between more than one file are\n" +
+        "shown with list of files that sharing them.\n" +
+        "Silently discarded if --diagram is not given\n" +
+        "Experimental." ],
+
+      [ "--force-update",  "-U",   nil,
+        "forces to scan all sources even if newer than\n" +
+        "the flag file." ],
+
+      [ "--fmt",           "-f",   "format name",
+        "set the output formatter (see below)" ],
+
+      [ "--help",          "-h",   nil,
+        "you're looking at it" ],
+
+      [ "--help-output",   "-O",   nil,
+        "explain the various output options" ],
+
+      [ "--image-format",  "-I",   "gif/png/jpg/jpeg",
+        "Sets output image format for diagrams. Can\n" +
+        "be png, gif, jpeg, jpg. If this option is\n" +
+        "omitted, png is used. Requires --diagram." ],
+
+      [ "--include",       "-i",   "dir[,dir...]",
+        "set (or add to) the list of directories\n" +
+        "to be searched when satisfying :include:\n" +
+        "requests. Can be used more than once." ],
+
+      [ "--inline-source", "-S",   nil,
+        "Show method source code inline, rather\n" +
+        "than via a popup link" ],
+
+      [ "--line-numbers", "-N", nil,
+        "Include line numbers in the source code" ],
+
+      [ "--main",          "-m",   "name",
+        "'name' will be the initial page displayed" ],
+
+      [ "--merge",         "-M",   nil,
+        "when creating ri output, merge processed classes\n" +
+        "into previously documented classes of the name name"],
+
+      [ "--one-file",      "-1",   nil,
+        "put all the output into a single file" ],
+
+      [ "--op",            "-o",   "dir",
+        "set the output directory" ],
+
+      [ "--opname",       "-n",    "name",
+        "Set the 'name' of the output. Has no\n" +
+        "effect for HTML." ],
+
+      [ "--promiscuous",   "-p",   nil,
+        "When documenting a file that contains a module\n" +
+        "or class also defined in other files, show\n" +
+        "all stuff for that module/class in each files\n" +
+        "page. By default, only show stuff defined in\n" +
+        "that particular file." ],
+
+      [ "--quiet",         "-q",   nil,
+        "don't show progress as we parse" ],
+
+      [ "--ri",            "-r",   nil,
+       "generate output for use by 'ri.' The files are\n" +
+       "stored in the '.rdoc' directory under your home\n"+
+       "directory unless overridden by a subsequent\n" +
+       "--op parameter, so no special privileges are needed." ],
+
+      [ "--ri-site",       "-R",   nil,
+       "generate output for use by 'ri.' The files are\n" +
+       "stored in a site-wide directory, making them accessible\n"+
+       "to others, so special privileges are needed." ],
+
+      [ "--ri-system",     "-Y",   nil,
+       "generate output for use by 'ri.' The files are\n" +
+       "stored in a system-level directory, making them accessible\n"+
+       "to others, so special privileges are needed. This option\n"+
+       "is intended to be used during Ruby installations" ],
+
+      [ "--show-hash",     "-H",   nil,
+        "A name of the form #name in a comment\n" +
+        "is a possible hyperlink to an instance\n" +
+        "method name. When displayed, the '#' is\n" +
+        "removed unless this option is specified" ],
+
+      [ "--style",         "-s",   "stylesheet url",
+        "specifies the URL of a separate stylesheet." ],
+
+      [ "--tab-width",     "-w",   "n",
+        "Set the width of tab characters (default 8)"],
+
+      [ "--template",      "-T",   "template name",
+        "Set the template used when generating output" ],
+
+      [ "--title",         "-t",   "text",
+        "Set 'txt' as the title for the output" ],
+
+      [ "--version",       "-v",   nil,
+        "display  RDoc's version" ],
+
+      [ "--webcvs",        "-W",   "url",
+        "Specify a URL for linking to a web frontend\n" +
+        "to CVS. If the URL contains a '\%s', the\n" +
+        "name of the current file will be substituted;\n" +
+        "if the URL doesn't contain a '\%s', the\n" +
+        "filename will be appended to it." ],
+    ]
+
+    def OptionList.options
+      OPTION_LIST.map do |long, short, arg,|
+        [ long, 
+          short, 
+          arg ? GetoptLong::REQUIRED_ARGUMENT : GetoptLong::NO_ARGUMENT 
+        ]
+      end
+    end
+
+
+    def OptionList.strip_output(text)
+      text =~ /^\s+/
+      leading_spaces = $&
+      text.gsub!(/^#{leading_spaces}/, '')
+      $stdout.puts text
+    end
+
+
+    # Show an error and exit
+
+    def OptionList.error(msg)
+      $stderr.puts
+      $stderr.puts msg
+      $stderr.puts "\nFor help on options, try 'rdoc --help'\n\n"
+      exit 1
+    end
+
+    # Show usage and exit
+    
+    def OptionList.usage(generator_names)
+      
+      puts
+      puts(VERSION_STRING)
+      puts
+
+      name = File.basename($0)
+      OptionList.strip_output(<<-EOT)
+          Usage:
+
+            #{name} [options]  [names...]
+
+          Files are parsed, and the information they contain
+          collected, before any output is produced. This allows cross
+          references between all files to be resolved. If a name is a
+          directory, it is traversed. If no names are specified, all
+          Ruby files in the current directory (and subdirectories) are
+          processed.
+
+          Options:
+
+      EOT
+
+      OPTION_LIST.each do |long, short, arg, desc|
+        opt = sprintf("%20s", "#{long}, #{short}")
+        oparg = sprintf("%-7s", arg)
+        print "#{opt} #{oparg}"
+        desc = desc.split("\n")
+        if arg.nil? || arg.length < 7
+          puts desc.shift
+        else
+          puts
+        end
+        desc.each do |line|
+          puts(" "*28 + line)
+        end
+        puts
+      end
+
+      puts "\nAvailable output formatters: " +
+        generator_names.sort.join(', ') + "\n\n"
+
+      puts "For information on where the output goes, use\n\n"
+      puts "   rdoc --help-output\n\n"
+
+      exit 0
+    end
+
+    def OptionList.help_output
+      OptionList.strip_output(<<-EOT)
+      How RDoc generates output depends on the output formatter being
+      used, and on the options you give.
+
+      - HTML output is normally produced into a number of separate files
+        (one per class, module, and file, along with various indices). 
+        These files will appear in the directory given by the --op
+        option (doc/ by default).
+
+      - XML output by default is written to standard output. If a
+        --opname option is given, the output will instead be written
+        to a file with that name in the output directory.
+
+      - .chm files (Windows help files) are written in the --op directory.
+        If an --opname parameter is present, that name is used, otherwise
+        the file will be called rdoc.chm.
+
+      For information on other RDoc options, use "rdoc --help".
+      EOT
+      exit 0
+    end
+  end
+
+  # Parse command line options. We're passed a hash containing
+  # output generators, keyed by the generator name
+
+  def parse(argv, generators)
+    old_argv = ARGV.dup
+    begin
+      ARGV.replace(argv)
+      @op_dir = "doc"
+      @op_name = nil
+      @show_all = false
+      @main_page = nil
+      @marge     = false
+      @exclude   = []
+      @quiet = false
+      @generator_name = 'html'
+      @generator = generators[@generator_name]
+      @rdoc_include = []
+      @title = nil
+      @template = nil
+      @diagram = false
+      @fileboxes = false
+      @show_hash = false
+      @image_format = 'png'
+      @inline_source = false
+      @all_one_file  = false
+      @tab_width = 8
+      @include_line_numbers = false
+      @extra_accessor_flags = {}
+      @promiscuous = false
+      @force_update = false
+
+      @css = nil
+      @webcvs = nil
+
+      @charset = case $KCODE
+                 when /^S/i
+                   'Shift_JIS'
+                 when /^E/i
+                   'EUC-JP'
+                 else
+                   'iso-8859-1'
+                 end
+
+      accessors = []
+
+      go = GetoptLong.new(*OptionList.options)
+      go.quiet = true
+
+      go.each do |opt, arg|
+	case opt
+        when "--all"           then @show_all      = true
+        when "--charset"       then @charset       = arg
+        when "--debug"         then $DEBUG         = true
+        when "--exclude"       then @exclude       << Regexp.new(arg)
+        when "--inline-source" then @inline_source = true
+        when "--line-numbers"  then @include_line_numbers = true
+        when "--main"          then @main_page     = arg
+        when "--merge"         then @merge         = true
+        when "--one-file"      then @all_one_file  = @inline_source = true
+        when "--op"            then @op_dir        = arg
+        when "--opname"        then @op_name       = arg
+        when "--promiscuous"   then @promiscuous   = true
+        when "--quiet"         then @quiet         = true
+        when "--show-hash"     then @show_hash     = true
+        when "--style"         then @css           = arg
+        when "--template"      then @template      = arg
+        when "--title"         then @title         = arg
+        when "--webcvs"        then @webcvs        = arg
+
+        when "--accessor" 
+          arg.split(/,/).each do |accessor|
+            if accessor =~ /^(\w+)(=(.*))?$/
+              accessors << $1
+              @extra_accessor_flags[$1] = $3
+            end
+          end
+
+        when "--diagram"
+          check_diagram
+          @diagram = true
+
+        when "--fileboxes"
+          @fileboxes = true if @diagram
+
+	when "--fmt"
+          @generator_name = arg.downcase
+          setup_generator(generators)
+
+        when "--help"      
+          OptionList.usage(generators.keys)
+
+        when "--help-output"      
+          OptionList.help_output
+
+        when "--image-format"
+          if ['gif', 'png', 'jpeg', 'jpg'].include?(arg)
+            @image_format = arg
+          else
+            raise GetoptLong::InvalidOption.new("unknown image format: #{arg}")
+          end
+
+        when "--include"   
+          @rdoc_include.concat arg.split(/\s*,\s*/)
+
+        when "--ri", "--ri-site", "--ri-system"
+          @generator_name = "ri"
+          @op_dir = case opt
+                    when "--ri" then RI::Paths::HOMEDIR 
+                    when "--ri-site" then RI::Paths::SITEDIR
+                    when "--ri-system" then RI::Paths::SYSDIR
+                    else fail opt
+                    end
+          setup_generator(generators)
+
+        when "--tab-width"
+          begin
+            @tab_width     = Integer(arg)
+          rescue 
+            $stderr.puts "Invalid tab width: '#{arg}'"
+            exit 1
+          end
+
+        when "--extension"
+          new, old = arg.split(/=/, 2)
+          OptionList.error("Invalid parameter to '-E'") unless new && old
+          unless RDoc::ParserFactory.alias_extension(old, new)
+            OptionList.error("Unknown extension .#{old} to -E")
+          end
+
+        when "--force-update"
+          @force_update = true
+
+	when "--version"
+	  puts VERSION_STRING
+	  exit
+	end
+
+      end
+
+      @files = ARGV.dup
+
+      @rdoc_include << "." if @rdoc_include.empty?
+
+      if @exclude.empty?
+        @exclude = nil
+      else
+        @exclude = Regexp.new(@exclude.join("|"))
+      end
+
+      check_files
+
+      # If no template was specified, use the default
+      # template for the output formatter
+
+      @template ||= @generator_name
+
+      # Generate a regexp from the accessors
+      unless accessors.empty?
+        re = '^(' + accessors.map{|a| Regexp.quote(a)}.join('|') + ')$' 
+        @extra_accessors = Regexp.new(re)
+      end
+
+    rescue GetoptLong::InvalidOption, GetoptLong::MissingArgument => error
+      OptionList.error(error.message)
+
+    ensure
+      ARGV.replace(old_argv)
+    end
+  end
+
+
+  def title
+    @title ||= "RDoc Documentation"
+  end
+  
+  # Set the title, but only if not already set. This means that a title set from 
+  # the command line trumps one set in a source file
+
+  def title=(string)
+    @title ||= string
+  end
+
+
+  private
+
+  # Set up an output generator for the format in @generator_name
+  def setup_generator(generators)
+    @generator = generators[@generator_name]
+    if !@generator
+      OptionList.error("Invalid output formatter")
+    end
+    
+    if @generator_name == "xml"
+      @all_one_file = true
+      @inline_source = true
+    end
+  end
+
+  # Check that the right version of 'dot' is available.
+  # Unfortuately this doesn't work correctly under Windows NT, 
+  # so we'll bypass the test under Windows
+
+  def check_diagram
+    return if RUBY_PLATFORM =~ /win/
+
+    ok = false
+    ver = nil
+    IO.popen("dot -V 2>&1") do |io|
+      ver = io.read
+      if ver =~ /dot\s+version(?:\s+gviz)?\s+(\d+)\.(\d+)/
+        ok = ($1.to_i > 1) || ($1.to_i == 1 && $2.to_i >= 8)
+      end
+    end
+    unless ok
+      if ver =~ /^dot version/
+        $stderr.puts "Warning: You may need dot V1.8.6 or later to use\n",
+          "the --diagram option correctly. You have:\n\n   ",
+          ver,
+          "\nDiagrams might have strange background colors.\n\n"
+      else
+        $stderr.puts "You need the 'dot' program to produce diagrams.",
+          "(see http://www.research.att.com/sw/tools/graphviz/)\n\n"
+        exit
+      end
+#      exit
+    end
+  end
+  
+  # Check that the files on the command line exist
+  
+  def check_files
+    @files.each do |f|
+      stat = File.stat f rescue error("File not found: #{f}")
+      error("File '#{f}' not readable") unless stat.readable?
+    end
+  end
+
+  def error(str)
+    $stderr.puts str
+    exit(1)
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rdoc/parsers/parse_c.rb b/ruby_1_8_6/lib/rdoc/parsers/parse_c.rb
new file mode 100644
index 0000000000..25fc66af3f
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/parsers/parse_c.rb
@@ -0,0 +1,773 @@
+# Classes and modules built in to the interpreter. We need
+# these to define superclasses of user objects
+
+require "rdoc/code_objects"
+require "rdoc/parsers/parserfactory"
+require "rdoc/options"
+require "rdoc/rdoc"
+
+module RDoc
+
+  ##
+  # Ruby's built-in classes.
+
+  KNOWN_CLASSES = {
+    "rb_cObject"           => "Object",
+    "rb_cArray"            => "Array",
+    "rb_cBignum"           => "Bignum",
+    "rb_cClass"            => "Class",
+    "rb_cDir"              => "Dir",
+    "rb_cData"             => "Data",
+    "rb_cFalseClass"       => "FalseClass",
+    "rb_cFile"             => "File",
+    "rb_cFixnum"           => "Fixnum",
+    "rb_cFloat"            => "Float",
+    "rb_cHash"             => "Hash",
+    "rb_cInteger"          => "Integer",
+    "rb_cIO"               => "IO",
+    "rb_cModule"           => "Module",
+    "rb_cNilClass"         => "NilClass",
+    "rb_cNumeric"          => "Numeric",
+    "rb_cProc"             => "Proc",
+    "rb_cRange"            => "Range",
+    "rb_cRegexp"           => "Regexp",
+    "rb_cString"           => "String",
+    "rb_cSymbol"           => "Symbol",
+    "rb_cThread"           => "Thread",
+    "rb_cTime"             => "Time",
+    "rb_cTrueClass"        => "TrueClass",
+    "rb_cStruct"           => "Struct",
+    "rb_eException"        => "Exception",
+    "rb_eStandardError"    => "StandardError",
+    "rb_eSystemExit"       => "SystemExit",
+    "rb_eInterrupt"        => "Interrupt",
+    "rb_eSignal"           => "Signal",
+    "rb_eFatal"            => "Fatal",
+    "rb_eArgError"         => "ArgError",
+    "rb_eEOFError"         => "EOFError",
+    "rb_eIndexError"       => "IndexError",
+    "rb_eRangeError"       => "RangeError",
+    "rb_eIOError"          => "IOError",
+    "rb_eRuntimeError"     => "RuntimeError",
+    "rb_eSecurityError"    => "SecurityError",
+    "rb_eSystemCallError"  => "SystemCallError",
+    "rb_eTypeError"        => "TypeError",
+    "rb_eZeroDivError"     => "ZeroDivError",
+    "rb_eNotImpError"      => "NotImpError",
+    "rb_eNoMemError"       => "NoMemError",
+    "rb_eFloatDomainError" => "FloatDomainError",
+    "rb_eScriptError"      => "ScriptError",
+    "rb_eNameError"        => "NameError",
+    "rb_eSyntaxError"      => "SyntaxError",
+    "rb_eLoadError"        => "LoadError",
+
+    "rb_mKernel"           => "Kernel",
+    "rb_mComparable"       => "Comparable",
+    "rb_mEnumerable"       => "Enumerable",
+    "rb_mPrecision"        => "Precision",
+    "rb_mErrno"            => "Errno",
+    "rb_mFileTest"         => "FileTest",
+    "rb_mGC"               => "GC",
+    "rb_mMath"             => "Math",
+    "rb_mProcess"          => "Process"
+  }
+
+  ##
+  # We attempt to parse C extension files. Basically we look for
+  # the standard patterns that you find in extensions: <tt>rb_define_class,
+  # rb_define_method</tt> and so on. We also try to find the corresponding
+  # C source for the methods and extract comments, but if we fail
+  # we don't worry too much.
+  #
+  # The comments associated with a Ruby method are extracted from the C
+  # comment block associated with the routine that _implements_ that
+  # method, that is to say the method whose name is given in the
+  # <tt>rb_define_method</tt> call. For example, you might write:
+  #
+  #  /*
+  #   * Returns a new array that is a one-dimensional flattening of this
+  #   * array (recursively). That is, for every element that is an array,
+  #   * extract its elements into the new array.
+  #   *
+  #   *    s = [ 1, 2, 3 ]           #=> [1, 2, 3]
+  #   *    t = [ 4, 5, 6, [7, 8] ]   #=> [4, 5, 6, [7, 8]]
+  #   *    a = [ s, t, 9, 10 ]       #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
+  #   *    a.flatten                 #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+  #   */
+  #   static VALUE
+  #   rb_ary_flatten(ary)
+  #       VALUE ary;
+  #   {
+  #       ary = rb_obj_dup(ary);
+  #       rb_ary_flatten_bang(ary);
+  #       return ary;
+  #   }
+  #
+  #   ...
+  #
+  #   void
+  #   Init_Array()
+  #   {
+  #     ...
+  #     rb_define_method(rb_cArray, "flatten", rb_ary_flatten, 0);
+  #
+  # Here RDoc will determine from the rb_define_method line that there's a
+  # method called "flatten" in class Array, and will look for the implementation
+  # in the method rb_ary_flatten. It will then use the comment from that
+  # method in the HTML output. This method must be in the same source file
+  # as the rb_define_method.
+  #
+  # C classes can be diagramed (see /tc/dl/ruby/ruby/error.c), and RDoc
+  # integrates C and Ruby source into one tree
+  #
+  # The comment blocks may include special direcives:
+  #
+  # [Document-class: <i>name</i>]
+  #   This comment block is documentation for the given class. Use this
+  #   when the <tt>Init_xxx</tt> method is not named after the class.
+  #
+  # [Document-method: <i>name</i>]
+  #   This comment documents the named method. Use when RDoc cannot
+  #   automatically find the method from it's declaration
+  #
+  # [call-seq:  <i>text up to an empty line</i>]
+  #   Because C source doesn't give descripive names to Ruby-level parameters,
+  #   you need to document the calling sequence explicitly
+  #
+  # In additon, RDoc assumes by default that the C method implementing a 
+  # Ruby function is in the same source file as the rb_define_method call.
+  # If this isn't the case, add the comment 
+  #
+  #    rb_define_method(....);  // in: filename
+  #
+  # As an example, we might have an extension that defines multiple classes
+  # in its Init_xxx method. We could document them using
+  #
+  #  
+  #  /*
+  #   * Document-class:  MyClass
+  #   *
+  #   * Encapsulate the writing and reading of the configuration
+  #   * file. ...
+  #   */
+  #  
+  #  /*
+  #   * Document-method: read_value
+  #   *
+  #   * call-seq:
+  #   *   cfg.read_value(key)            -> value
+  #   *   cfg.read_value(key} { |key| }  -> value
+  #   *
+  #   * Return the value corresponding to +key+ from the configuration.
+  #   * In the second form, if the key isn't found, invoke the
+  #   * block and return its value.
+  #   */
+  #
+
+  class C_Parser
+
+    attr_accessor :progress
+
+    extend ParserFactory
+    parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/)
+
+    @@known_bodies = {}
+
+    # prepare to parse a C file
+    def initialize(top_level, file_name, body, options, stats)
+      @known_classes = KNOWN_CLASSES.dup
+      @body = handle_tab_width(handle_ifdefs_in(body))
+      @options = options
+      @stats   = stats
+      @top_level = top_level
+      @classes = Hash.new
+      @file_dir = File.dirname(file_name)
+      @progress = $stderr unless options.quiet
+    end
+
+    # Extract the classes/modules and methods from a C file
+    # and return the corresponding top-level object
+    def scan
+      remove_commented_out_lines
+      do_classes
+      do_constants
+      do_methods
+      do_includes
+      do_aliases
+      @top_level
+    end
+
+    #######
+    private
+    #######
+
+    def progress(char)
+      unless @options.quiet
+        @progress.print(char)
+        @progress.flush
+      end
+    end
+
+    def warn(msg)
+      $stderr.puts
+      $stderr.puts msg
+      $stderr.flush
+    end
+
+    def remove_private_comments(comment)
+       comment.gsub!(/\/?\*--(.*?)\/?\*\+\+/m, '')
+       comment.sub!(/\/?\*--.*/m, '')
+    end
+
+    ##
+    # removes lines that are commented out that might otherwise get picked up
+    # when scanning for classes and methods
+
+    def remove_commented_out_lines
+      @body.gsub!(%r{//.*rb_define_}, '//')
+    end
+    
+    def handle_class_module(var_name, class_mod, class_name, parent, in_module)
+      progress(class_mod[0, 1])
+
+      parent_name = @known_classes[parent] || parent
+
+      if in_module
+        enclosure = @classes[in_module]
+        unless enclosure
+          if enclosure = @known_classes[in_module]
+            handle_class_module(in_module, (/^rb_m/ =~ in_module ? "module" : "class"),
+                                enclosure, nil, nil)
+            enclosure = @classes[in_module]
+          end
+        end
+        unless enclosure
+          warn("Enclosing class/module '#{in_module}' for " +
+                "#{class_mod} #{class_name} not known")
+          return
+        end
+      else
+        enclosure = @top_level
+      end
+
+      if class_mod == "class" 
+        cm = enclosure.add_class(NormalClass, class_name, parent_name)
+        @stats.num_classes += 1
+      else
+        cm = enclosure.add_module(NormalModule, class_name)
+        @stats.num_modules += 1
+      end
+      cm.record_location(enclosure.toplevel)
+
+      find_class_comment(cm.full_name, cm)
+      @classes[var_name] = cm
+      @known_classes[var_name] = cm.full_name
+    end
+
+    ##
+    # Look for class or module documentation above Init_+class_name+(void),
+    # in a Document-class +class_name+ (or module) comment or above an
+    # rb_define_class (or module).  If a comment is supplied above a matching
+    # Init_ and a rb_define_class the Init_ comment is used.
+    #
+    #   /*
+    #    * This is a comment for Foo
+    #    */
+    #   Init_Foo(void) {
+    #       VALUE cFoo = rb_define_class("Foo", rb_cObject);
+    #   }
+    #
+    #   /*
+    #    * Document-class: Foo
+    #    * This is a comment for Foo
+    #    */
+    #   Init_foo(void) {
+    #       VALUE cFoo = rb_define_class("Foo", rb_cObject);
+    #   }
+    #
+    #   /*
+    #    * This is a comment for Foo
+    #    */
+    #   VALUE cFoo = rb_define_class("Foo", rb_cObject);
+
+    def find_class_comment(class_name, class_meth)
+      comment = nil
+      if @body =~ %r{((?>/\*.*?\*/\s+))
+                     (static\s+)?void\s+Init_#{class_name}\s*(?:_\(\s*)?\(\s*(?:void\s*)?\)}xmi
+        comment = $1
+      elsif @body =~ %r{Document-(class|module):\s#{class_name}\s*?\n((?>.*?\*/))}m
+        comment = $2
+      else
+        if @body =~ /rb_define_(class|module)/m then
+          class_name = class_name.split("::").last
+          comments = []
+          @body.split(/(\/\*.*?\*\/)\s*?\n/m).each_with_index do |chunk, index|
+            comments[index] = chunk
+            if chunk =~ /rb_define_(class|module).*?"(#{class_name})"/m then
+              comment = comments[index-1]
+              break
+            end
+          end
+        end
+      end
+      class_meth.comment = mangle_comment(comment) if comment
+    end
+    
+    ############################################################
+
+    def do_classes
+      @body.scan(/(\w+)\s* = \s*rb_define_module\s*\(\s*"(\w+)"\s*\)/mx) do 
+        |var_name, class_name|
+        handle_class_module(var_name, "module", class_name, nil, nil)
+      end
+      
+      # The '.' lets us handle SWIG-generated files
+      @body.scan(/([\w\.]+)\s* = \s*rb_define_class\s*
+                \( 
+                   \s*"(\w+)",
+                   \s*(\w+)\s*
+                \)/mx) do 
+        
+        |var_name, class_name, parent|
+        handle_class_module(var_name, "class", class_name, parent, nil)
+      end
+      
+      @body.scan(/(\w+)\s*=\s*boot_defclass\s*\(\s*"(\w+?)",\s*(\w+?)\s*\)/) do
+        |var_name, class_name, parent|
+        parent = nil if parent == "0"
+        handle_class_module(var_name, "class", class_name, parent, nil)
+      end
+
+      @body.scan(/(\w+)\s* = \s*rb_define_module_under\s*
+                \( 
+                   \s*(\w+),
+                   \s*"(\w+)"
+                \s*\)/mx) do 
+        
+        |var_name, in_module, class_name|
+        handle_class_module(var_name, "module", class_name, nil, in_module)
+      end
+      
+      @body.scan(/([\w\.]+)\s* = \s*rb_define_class_under\s*
+                \( 
+                   \s*(\w+),
+                   \s*"(\w+)",
+                   \s*(\w+)\s*
+                \s*\)/mx) do 
+        
+        |var_name, in_module, class_name, parent|
+        handle_class_module(var_name, "class", class_name, parent, in_module)
+      end
+      
+    end
+
+		###########################################################
+
+    def do_constants
+      @body.scan(%r{\Wrb_define_
+                     (
+                        variable |
+                        readonly_variable |
+                        const |
+                        global_const |
+                      )
+                 \s*\( 
+                   (?:\s*(\w+),)?
+                   \s*"(\w+)",
+                   \s*(.*?)\s*\)\s*;
+                   }xm) do
+        
+        |type, var_name, const_name, definition|
+        var_name = "rb_cObject" if !var_name or var_name == "rb_mKernel"
+				handle_constants(type, var_name, const_name, definition)
+      end
+    end
+    
+    ############################################################
+    
+    def do_methods
+
+      @body.scan(%r{rb_define_
+                     (
+                        singleton_method |
+                        method           |
+                        module_function  |
+                        private_method
+                     )
+                     \s*\(\s*([\w\.]+),
+                       \s*"([^"]+)",
+                       \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
+                       \s*(-?\w+)\s*\)
+                     (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))?
+                   }xm) do
+        |type, var_name, meth_name, meth_body, param_count, source_file|
+       #" 
+
+        # Ignore top-object and weird struct.c dynamic stuff
+        next if var_name == "ruby_top_self" 
+        next if var_name == "nstr"
+        next if var_name == "envtbl"
+        next if var_name == "argf"   # it'd be nice to handle this one
+
+        var_name = "rb_cObject" if var_name == "rb_mKernel"
+        handle_method(type, var_name, meth_name, 
+                      meth_body, param_count, source_file)
+      end
+
+      @body.scan(%r{rb_define_attr\(
+                               \s*([\w\.]+),
+                               \s*"([^"]+)",
+                               \s*(\d+),
+                               \s*(\d+)\s*\);
+                  }xm) do  #"
+        |var_name, attr_name, attr_reader, attr_writer|
+        
+        #var_name = "rb_cObject" if var_name == "rb_mKernel"
+        handle_attr(var_name, attr_name,
+                    attr_reader.to_i != 0,
+                    attr_writer.to_i != 0)
+      end
+
+      @body.scan(%r{rb_define_global_function\s*\(
+                               \s*"([^"]+)",
+                               \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
+                               \s*(-?\w+)\s*\)
+                  (?:;\s*/[*/]\s+in\s+(\w+?\.[cy]))?
+                  }xm) do  #"
+        |meth_name, meth_body, param_count, source_file|
+        handle_method("method", "rb_mKernel", meth_name, 
+                      meth_body, param_count, source_file)
+      end
+  
+      @body.scan(/define_filetest_function\s*\(
+                               \s*"([^"]+)",
+                               \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
+                               \s*(-?\w+)\s*\)/xm) do  #"
+        |meth_name, meth_body, param_count|
+        
+        handle_method("method", "rb_mFileTest", meth_name, meth_body, param_count)
+        handle_method("singleton_method", "rb_cFile", meth_name, meth_body, param_count)
+      end
+   end
+
+    ############################################################
+    
+    def do_aliases
+      @body.scan(%r{rb_define_alias\s*\(\s*(\w+),\s*"([^"]+)",\s*"([^"]+)"\s*\)}m) do
+        |var_name, new_name, old_name|
+        @stats.num_methods += 1
+        class_name = @known_classes[var_name] || var_name
+        class_obj  = find_class(var_name, class_name)
+
+        class_obj.add_alias(Alias.new("", old_name, new_name, ""))
+      end
+   end
+
+    ##
+    # Adds constant comments.  By providing some_value: at the start ofthe
+    # comment you can override the C value of the comment to give a friendly
+    # definition.
+    #
+    #   /* 300: The perfect score in bowling */
+    #   rb_define_const(cFoo, "PERFECT", INT2FIX(300);
+    #
+    # Will override +INT2FIX(300)+ with the value +300+ in the output RDoc.
+    # Values may include quotes and escaped colons (\:).
+
+    def handle_constants(type, var_name, const_name, definition)
+      #@stats.num_constants += 1
+      class_name = @known_classes[var_name]
+      
+      return unless class_name
+
+      class_obj  = find_class(var_name, class_name)
+
+      unless class_obj
+        warn("Enclosing class/module '#{const_name}' for not known")
+        return
+      end
+      
+      comment = find_const_comment(type, const_name)
+
+      # In the case of rb_define_const, the definition and comment are in
+      # "/* definition: comment */" form.  The literal ':' and '\' characters
+      # can be escaped with a backslash.
+      if type.downcase == 'const' then
+         elements = mangle_comment(comment).split(':')
+         if elements.nil? or elements.empty? then
+            con = Constant.new(const_name, definition, mangle_comment(comment))
+         else
+            new_definition = elements[0..-2].join(':')
+            if new_definition.empty? then # Default to literal C definition
+               new_definition = definition
+            else
+               new_definition.gsub!("\:", ":")
+               new_definition.gsub!("\\", '\\')
+            end
+            new_definition.sub!(/\A(\s+)/, '')
+            new_comment = $1.nil? ? elements.last : "#{$1}#{elements.last.lstrip}"
+            con = Constant.new(const_name, new_definition,
+                               mangle_comment(new_comment))
+         end
+      else
+         con = Constant.new(const_name, definition, mangle_comment(comment))
+      end
+
+      class_obj.add_constant(con)
+    end
+
+    ##
+    # Finds a comment matching +type+ and +const_name+ either above the
+    # comment or in the matching Document- section.
+
+    def find_const_comment(type, const_name)
+      if @body =~ %r{((?>^\s*/\*.*?\*/\s+))
+                     rb_define_#{type}\((?:\s*(\w+),)?\s*"#{const_name}"\s*,.*?\)\s*;}xmi
+        $1
+      elsif @body =~ %r{Document-(?:const|global|variable):\s#{const_name}\s*?\n((?>.*?\*/))}m
+        $1
+      else
+        ''
+      end
+    end
+
+    ###########################################################
+
+    def handle_attr(var_name, attr_name, reader, writer)
+      rw = ''
+      if reader 
+        #@stats.num_methods += 1
+        rw << 'R'
+      end
+      if writer
+        #@stats.num_methods += 1
+        rw << 'W'
+      end
+
+      class_name = @known_classes[var_name]
+
+      return unless class_name
+      
+      class_obj  = find_class(var_name, class_name)
+
+      if class_obj
+        comment = find_attr_comment(attr_name)
+        unless comment.empty?
+          comment = mangle_comment(comment)
+        end
+        att = Attr.new('', attr_name, rw, comment)
+        class_obj.add_attribute(att)
+      end
+
+    end
+
+    ###########################################################
+
+    def find_attr_comment(attr_name)
+      if @body =~ %r{((?>/\*.*?\*/\s+))
+                     rb_define_attr\((?:\s*(\w+),)?\s*"#{attr_name}"\s*,.*?\)\s*;}xmi
+        $1
+      elsif @body =~ %r{Document-attr:\s#{attr_name}\s*?\n((?>.*?\*/))}m
+        $1
+      else
+        ''
+      end
+    end
+
+    ###########################################################
+
+    def handle_method(type, var_name, meth_name, 
+                      meth_body, param_count, source_file = nil)
+      progress(".")
+
+      @stats.num_methods += 1
+      class_name = @known_classes[var_name]
+
+      return unless class_name
+
+      class_obj  = find_class(var_name, class_name)
+      
+      if class_obj
+        if meth_name == "initialize"
+          meth_name = "new"
+          type = "singleton_method"
+        end
+        meth_obj = AnyMethod.new("", meth_name)
+        meth_obj.singleton =
+	  %w{singleton_method module_function}.include?(type) 
+        
+        p_count = (Integer(param_count) rescue -1)
+        
+        if p_count < 0
+          meth_obj.params = "(...)"
+        elsif p_count == 0
+          meth_obj.params = "()"
+        else
+          meth_obj.params = "(" +
+                            (1..p_count).map{|i| "p#{i}"}.join(", ") + 
+                                                ")"
+        end
+
+        if source_file
+          file_name = File.join(@file_dir, source_file)
+          body = (@@known_bodies[source_file] ||= File.read(file_name))
+        else
+          body = @body
+        end
+        if find_body(meth_body, meth_obj, body) and meth_obj.document_self
+          class_obj.add_method(meth_obj)
+        end
+      end
+    end
+    
+    ############################################################
+
+    # Find the C code corresponding to a Ruby method
+    def find_body(meth_name, meth_obj, body, quiet = false)
+      case body
+      when %r{((?>/\*.*?\*/\s*))(?:static\s+)?VALUE\s+#{meth_name}
+              \s*(\(.*?\)).*?^}xm
+        comment, params = $1, $2
+        body_text = $&
+
+        remove_private_comments(comment) if comment
+
+        # see if we can find the whole body
+        
+        re = Regexp.escape(body_text) + '[^(]*^\{.*?^\}'
+        if Regexp.new(re, Regexp::MULTILINE).match(body)
+          body_text = $&
+        end
+
+        # The comment block may have been overridden with a
+        # 'Document-method' block. This happens in the interpreter
+        # when multiple methods are vectored through to the same
+        # C method but those methods are logically distinct (for
+        # example Kernel.hash and Kernel.object_id share the same
+        # implementation
+
+        override_comment = find_override_comment(meth_obj.name)
+        comment = override_comment if override_comment
+
+        find_modifiers(comment, meth_obj) if comment
+        
+#        meth_obj.params = params
+        meth_obj.start_collecting_tokens
+        meth_obj.add_token(RubyToken::Token.new(1,1).set_text(body_text))
+        meth_obj.comment = mangle_comment(comment)
+      when %r{((?>/\*.*?\*/\s*))^\s*\#\s*define\s+#{meth_name}\s+(\w+)}m
+        comment = $1
+        find_body($2, meth_obj, body, true)
+        find_modifiers(comment, meth_obj)
+        meth_obj.comment = mangle_comment(comment) + meth_obj.comment
+      when %r{^\s*\#\s*define\s+#{meth_name}\s+(\w+)}m
+        unless find_body($1, meth_obj, body, true)
+          warn "No definition for #{meth_name}" unless quiet
+          return false
+        end
+      else
+
+        # No body, but might still have an override comment
+        comment = find_override_comment(meth_obj.name)
+
+        if comment
+          find_modifiers(comment, meth_obj)
+          meth_obj.comment = mangle_comment(comment)
+        else
+          warn "No definition for #{meth_name}" unless quiet
+          return false
+        end
+      end
+      true
+    end
+
+
+    ##
+    # If the comment block contains a section that looks like:
+    #
+    #    call-seq:
+    #        Array.new
+    #        Array.new(10)
+    #
+    # use it for the parameters.
+
+    def find_modifiers(comment, meth_obj)
+      if comment.sub!(/:nodoc:\s*^\s*\*?\s*$/m, '') or
+         comment.sub!(/\A\/\*\s*:nodoc:\s*\*\/\Z/, '')
+        meth_obj.document_self = false
+      end
+      if comment.sub!(/call-seq:(.*?)^\s*\*?\s*$/m, '') or
+         comment.sub!(/\A\/\*\s*call-seq:(.*?)\*\/\Z/, '')
+        seq = $1
+        seq.gsub!(/^\s*\*\s*/, '')
+        meth_obj.call_seq = seq
+      end
+    end
+
+    ############################################################
+
+    def find_override_comment(meth_name)
+      name = Regexp.escape(meth_name)
+      if @body =~ %r{Document-method:\s#{name}\s*?\n((?>.*?\*/))}m
+        $1
+      end
+    end
+
+    ##
+    # Look for includes of the form:
+    #
+    #     rb_include_module(rb_cArray, rb_mEnumerable);
+
+    def do_includes
+      @body.scan(/rb_include_module\s*\(\s*(\w+?),\s*(\w+?)\s*\)/) do |c,m|
+        if cls = @classes[c]
+          m = @known_classes[m] || m
+          cls.add_include(Include.new(m, ""))
+        end
+      end
+    end
+
+    ##
+    # Remove the /*'s and leading asterisks from C comments
+    
+    def mangle_comment(comment)
+      comment.sub!(%r{/\*+}) { " " * $&.length }
+      comment.sub!(%r{\*+/}) { " " * $&.length }
+      comment.gsub!(/^[ \t]*\*/m) { " " * $&.length }
+      comment
+    end
+
+    def find_class(raw_name, name)
+      unless @classes[raw_name]
+        if raw_name =~ /^rb_m/ 
+          @classes[raw_name] = @top_level.add_module(NormalModule, name)
+        else
+          @classes[raw_name] = @top_level.add_class(NormalClass, name, nil)
+        end
+      end
+      @classes[raw_name]
+    end
+
+    def handle_tab_width(body)
+      if /\t/ =~ body
+        tab_width = Options.instance.tab_width
+        body.split(/\n/).map do |line|
+          1 while line.gsub!(/\t+/) { ' ' * (tab_width*$&.length - $`.length % tab_width)}  && $~ #`
+          line
+        end .join("\n")
+      else
+        body
+      end
+    end
+
+    ##
+    # Removes #ifdefs that would otherwise confuse us
+    
+    def handle_ifdefs_in(body)
+      body.gsub(/^#ifdef HAVE_PROTOTYPES.*?#else.*?\n(.*?)#endif.*?\n/m) { $1 }
+    end
+    
+  end
+
+end
+
diff --git a/ruby_1_8_6/lib/rdoc/parsers/parse_f95.rb b/ruby_1_8_6/lib/rdoc/parsers/parse_f95.rb
new file mode 100644
index 0000000000..f3f6d76103
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/parsers/parse_f95.rb
@@ -0,0 +1,1841 @@
+#= parse_f95.rb - Fortran95 Parser
+#
+#== Overview
+#
+#"parse_f95.rb" parses Fortran95 files with suffixes "f90", "F90", "f95"
+#and "F95". Fortran95 files are expected to be conformed to Fortran95
+#standards.
+#
+#== Rules
+#
+#Fundamental rules are same as that of the Ruby parser.
+#But comment markers are '!' not '#'.
+#
+#=== Correspondence between RDoc documentation and Fortran95 programs
+#
+#"parse_f95.rb" parses main programs, modules, subroutines, functions,
+#derived-types, public variables, public constants,
+#defined operators and defined assignments.
+#These components are described in items of RDoc documentation, as follows.
+#
+#Files :: Files (same as Ruby)
+#Classes :: Modules
+#Methods :: Subroutines, functions, variables, constants, derived-types, defined operators, defined assignments
+#Required files :: Files in which imported modules, external subroutines and external functions are defined.
+#Included Modules :: List of imported modules
+#Attributes :: List of derived-types, List of imported modules all of whose components are published again
+#
+#Components listed in 'Methods' (subroutines, functions, ...)
+#defined in modules are described in the item of 'Classes'.
+#On the other hand, components defined in main programs or
+#as external procedures are described in the item of 'Files'.
+#
+#=== Components parsed by default
+#
+#By default, documentation on public components (subroutines, functions, 
+#variables, constants, derived-types, defined operators, 
+#defined assignments) are generated. 
+#With "--all" option, documentation on all components
+#are generated (almost same as the Ruby parser).
+#
+#=== Information parsed automatically
+#
+#The following information is automatically parsed.
+#
+#* Types of arguments
+#* Types of variables and constants
+#* Types of variables in the derived types, and initial values
+#* NAMELISTs and types of variables in them, and initial values
+#
+#Aliases by interface statement are described in the item of 'Methods'.
+#
+#Components which are imported from other modules and published again 
+#are described in the item of 'Methods'.
+#
+#=== Format of comment blocks
+#
+#Comment blocks should be written as follows.
+#Comment blocks are considered to be ended when the line without '!'
+#appears.
+#The indentation is not necessary.
+#
+#     ! (Top of file)
+#     !
+#     ! Comment blocks for the files.
+#     !
+#     !--
+#     ! The comment described in the part enclosed by
+#     ! "!--" and "!++" is ignored.
+#     !++
+#     !
+#     module hogehoge
+#       !
+#       ! Comment blocks for the modules (or the programs).
+#       !
+#
+#       private
+#
+#       logical            :: a     ! a private variable
+#       real, public       :: b     ! a public variable
+#       integer, parameter :: c = 0 ! a public constant
+#
+#       public :: c
+#       public :: MULTI_ARRAY
+#       public :: hoge, foo
+#
+#       type MULTI_ARRAY
+#         !
+#         ! Comment blocks for the derived-types.
+#         !
+#         real, pointer :: var(:) =>null() ! Comments block for the variables.
+#         integer       :: num = 0
+#       end type MULTI_ARRAY
+#
+#     contains
+#
+#       subroutine hoge( in,   &   ! Comment blocks between continuation lines are ignored.
+#           &            out )
+#         !
+#         ! Comment blocks for the subroutines or functions
+#         !
+#         character(*),intent(in):: in ! Comment blocks for the arguments.
+#         character(*),intent(out),allocatable,target  :: in
+#                                      ! Comment blocks can be
+#                                      ! written under Fortran statements.
+#
+#         character(32) :: file ! This comment parsed as a variable in below NAMELIST.
+#         integer       :: id
+#
+#         namelist /varinfo_nml/ file, id
+#                 !
+#                 ! Comment blocks for the NAMELISTs.
+#                 ! Information about variables are described above.
+#                 !
+#
+#       ....
+#
+#       end subroutine hoge
+#
+#       integer function foo( in )
+#         !
+#         ! This part is considered as comment block.
+#
+#         ! Comment blocks under blank lines are ignored.
+#         !
+#         integer, intent(in):: inA ! This part is considered as comment block.
+#
+#                                   ! This part is ignored.
+#
+#       end function foo
+#
+#       subroutine hide( in,   &
+#         &              out )      !:nodoc:
+#         !
+#         ! If "!:nodoc:" is described at end-of-line in subroutine
+#         ! statement as above, the subroutine is ignored.
+#         ! This assignment can be used to modules, subroutines,
+#         ! functions, variables, constants, derived-types,
+#         ! defined operators, defined assignments,
+#         ! list of imported modules ("use" statement).
+#         !
+#
+#       ....
+#
+#       end subroutine hide
+#
+#     end module hogehoge
+#
+
+
+require "rdoc/code_objects"
+
+module RDoc
+
+  class Token
+
+    NO_TEXT = "??".freeze
+
+    def initialize(line_no, char_no)
+      @line_no = line_no
+      @char_no = char_no
+      @text    = NO_TEXT
+    end
+    # Because we're used in contexts that expect to return a token,
+    # we set the text string and then return ourselves
+    def set_text(text)
+      @text = text
+      self
+    end
+
+    attr_reader :line_no, :char_no, :text
+
+  end
+
+  # See rdoc/parsers/parse_f95.rb
+
+  class Fortran95parser
+
+    extend ParserFactory
+    parse_files_matching(/\.((f|F)9(0|5)|F)$/)
+
+    @@external_aliases = []
+    @@public_methods   = []
+
+    # "false":: Comments are below source code
+    # "true" :: Comments are upper source code
+    COMMENTS_ARE_UPPER  = false
+
+    # Internal alias message
+    INTERNAL_ALIAS_MES = "Alias for"
+
+    # External alias message
+    EXTERNAL_ALIAS_MES = "The entity is"
+
+    # prepare to parse a Fortran 95 file
+    def initialize(top_level, file_name, body, options, stats)
+      @body = body
+      @stats = stats
+      @file_name  = file_name
+      @options = options
+      @top_level = top_level
+      @progress = $stderr unless options.quiet
+    end
+
+    # devine code constructs
+    def scan
+
+      # remove private comment
+      remaining_code = remove_private_comments(@body)
+
+      # continuation lines are united to one line
+      remaining_code = united_to_one_line(remaining_code)
+
+      # semicolons are replaced to line feed
+      remaining_code = semicolon_to_linefeed(remaining_code)
+
+      # collect comment for file entity
+      whole_comment, remaining_code = collect_first_comment(remaining_code)
+      @top_level.comment = whole_comment
+
+      # String "remaining_code" is converted to Array "remaining_lines"
+      remaining_lines = remaining_code.split("\n")
+
+      # "module" or "program" parts are parsed (new)
+      #
+      level_depth = 0
+      block_searching_flag = nil
+      block_searching_lines = []
+      pre_comment = []
+      module_program_trailing = ""
+      module_program_name = ""
+      other_block_level_depth = 0
+      other_block_searching_flag = nil
+      remaining_lines.collect!{|line|
+        if !block_searching_flag && !other_block_searching_flag
+          if line =~ /^\s*?module\s+(\w+)\s*?(!.*?)?$/i
+            block_searching_flag = :module
+            block_searching_lines << line
+            module_program_name = $1
+            module_program_trailing = find_comments($2)
+            next false
+          elsif line =~ /^\s*?program\s+(\w+)\s*?(!.*?)?$/i ||
+                 line =~ /^\s*?\w/ && !block_start?(line)
+            block_searching_flag = :program
+            block_searching_lines << line
+            module_program_name = $1 || ""
+            module_program_trailing = find_comments($2)
+            next false
+
+          elsif block_start?(line)
+            other_block_searching_flag = true
+            next line
+
+          elsif line =~ /^\s*?!\s?(.*)/
+            pre_comment << line
+            next line
+          else
+            pre_comment = []
+            next line
+          end
+        elsif other_block_searching_flag
+          other_block_level_depth += 1 if block_start?(line)
+          other_block_level_depth -= 1 if block_end?(line)
+          if other_block_level_depth < 0
+            other_block_level_depth = 0
+            other_block_searching_flag = nil
+          end
+          next line
+        end
+
+        block_searching_lines << line
+        level_depth += 1 if block_start?(line)
+        level_depth -= 1 if block_end?(line)
+        if level_depth >= 0
+          next false
+        end
+
+        # "module_program_code" is formatted.
+        # ":nodoc:" flag is checked.
+        #
+        module_program_code = block_searching_lines.join("\n")
+        module_program_code = remove_empty_head_lines(module_program_code)
+        if module_program_trailing =~ /^:nodoc:/
+          # next loop to search next block
+          level_depth = 0
+          block_searching_flag = false
+          block_searching_lines = []
+          pre_comment = []
+          next false
+        end
+
+        # NormalClass is created, and added to @top_level
+        #
+        if block_searching_flag == :module
+          module_name = module_program_name
+          module_code = module_program_code
+          module_trailing = module_program_trailing
+          progress "m"
+          @stats.num_modules += 1
+          f9x_module = @top_level.add_module NormalClass, module_name
+          f9x_module.record_location @top_level
+
+          f9x_comment = COMMENTS_ARE_UPPER ? 
+            find_comments(pre_comment.join("\n"))  + "\n" + module_trailing :
+              module_trailing + "\n" + find_comments(module_code.sub(/^.*$\n/i, ''))
+          f9x_module.comment = f9x_comment
+          parse_program_or_module(f9x_module, module_code)
+
+          TopLevel.all_files.each do |name, toplevel|
+            if toplevel.include_includes?(module_name, @options.ignore_case)
+              if !toplevel.include_requires?(@file_name, @options.ignore_case)
+                toplevel.add_require(Require.new(@file_name, ""))
+              end
+            end
+            toplevel.each_classmodule{|m|
+              if m.include_includes?(module_name, @options.ignore_case)
+                if !m.include_requires?(@file_name, @options.ignore_case)
+                  m.add_require(Require.new(@file_name, ""))
+                end
+              end
+            }
+          end
+        elsif block_searching_flag == :program
+          program_name = module_program_name
+          program_code = module_program_code
+          program_trailing = module_program_trailing
+          progress "p"
+          program_comment = COMMENTS_ARE_UPPER ? 
+            find_comments(pre_comment.join("\n")) + "\n" + program_trailing : 
+              program_trailing + "\n" + find_comments(program_code.sub(/^.*$\n/i, ''))
+          program_comment = "\n\n= <i>Program</i> <tt>#{program_name}</tt>\n\n" \
+                            + program_comment
+          @top_level.comment << program_comment
+          parse_program_or_module(@top_level, program_code, :private)
+        end
+
+        # next loop to search next block
+        level_depth = 0
+        block_searching_flag = false
+        block_searching_lines = []
+        pre_comment = []
+        next false
+      }
+
+      remaining_lines.delete_if{ |line|
+        line == false
+      }
+
+      # External subprograms and functions are parsed
+      #
+      parse_program_or_module(@top_level, remaining_lines.join("\n"),
+                              :public, true)
+
+      @top_level
+    end  # End of scan
+
+    private
+
+    def parse_program_or_module(container, code,
+                                visibility=:public, external=nil)
+      return unless container
+      return unless code
+      remaining_lines = code.split("\n")
+      remaining_code = "#{code}"
+
+      #
+      # Parse variables before "contains" in module
+      #
+      level_depth = 0
+      before_contains_lines = []
+      before_contains_code = nil
+      before_contains_flag = nil
+      remaining_lines.each{ |line|
+        if !before_contains_flag
+          if line =~ /^\s*?module\s+\w+\s*?(!.*?)?$/i
+            before_contains_flag = true
+          end
+        else
+          break if line =~ /^\s*?contains\s*?(!.*?)?$/i
+          level_depth += 1 if block_start?(line)
+          level_depth -= 1 if block_end?(line)
+          break if level_depth < 0
+          before_contains_lines << line
+        end
+      }
+      before_contains_code = before_contains_lines.join("\n")
+      if before_contains_code
+        before_contains_code.gsub!(/^\s*?interface\s+.*?\s+end\s+interface.*?$/im, "")
+        before_contains_code.gsub!(/^\s*?type[\s\,]+.*?\s+end\s+type.*?$/im, "")
+      end
+
+      #
+      # Parse global "use"
+      #
+      use_check_code = "#{before_contains_code}"
+      cascaded_modules_list = []
+      while use_check_code =~ /^\s*?use\s+(\w+)(.*?)(!.*?)?$/i
+        use_check_code = $~.pre_match
+        use_check_code << $~.post_match
+        used_mod_name = $1.strip.chomp
+        used_list = $2 || ""
+        used_trailing = $3 || ""
+        next if used_trailing =~ /!:nodoc:/
+        if !container.include_includes?(used_mod_name, @options.ignore_case)
+          progress "."
+          container.add_include Include.new(used_mod_name, "")
+        end
+        if ! (used_list =~ /\,\s*?only\s*?:/i )
+          cascaded_modules_list << "\#" + used_mod_name
+        end
+      end
+
+      #
+      # Parse public and private, and store information.
+      # This information is used when "add_method" and
+      # "set_visibility_for" are called.
+      #
+      visibility_default, visibility_info = 
+                parse_visibility(remaining_lines.join("\n"), visibility, container)
+      @@public_methods.concat visibility_info
+      if visibility_default == :public
+        if !cascaded_modules_list.empty?
+          cascaded_modules = 
+            Attr.new("Cascaded Modules",
+                     "Imported modules all of whose components are published again",
+                     "",
+                     cascaded_modules_list.join(", "))
+          container.add_attribute(cascaded_modules)
+        end
+      end
+
+      #
+      # Check rename elements
+      #
+      use_check_code = "#{before_contains_code}"
+      while use_check_code =~ /^\s*?use\s+(\w+)\s*?\,(.+)$/i
+        use_check_code = $~.pre_match
+        use_check_code << $~.post_match
+        used_mod_name = $1.strip.chomp
+        used_elements = $2.sub(/\s*?only\s*?:\s*?/i, '')
+        used_elements.split(",").each{ |used|
+          if /\s*?(\w+)\s*?=>\s*?(\w+)\s*?/ =~ used
+            local = $1
+            org = $2
+            @@public_methods.collect!{ |pub_meth|
+              if local == pub_meth["name"] ||
+                  local.upcase == pub_meth["name"].upcase &&
+                  @options.ignore_case
+                pub_meth["name"] = org
+                pub_meth["local_name"] = local
+              end
+              pub_meth
+            }
+          end
+        }
+      end
+
+      #
+      # Parse private "use"
+      #
+      use_check_code = remaining_lines.join("\n")
+      while use_check_code =~ /^\s*?use\s+(\w+)(.*?)(!.*?)?$/i
+        use_check_code = $~.pre_match
+        use_check_code << $~.post_match
+        used_mod_name = $1.strip.chomp
+        used_trailing = $3 || ""
+        next if used_trailing =~ /!:nodoc:/
+        if !container.include_includes?(used_mod_name, @options.ignore_case)
+          progress "."
+          container.add_include Include.new(used_mod_name, "")
+        end
+      end
+
+      container.each_includes{ |inc|
+        TopLevel.all_files.each do |name, toplevel|
+          indicated_mod = toplevel.find_symbol(inc.name,
+                                               nil, @options.ignore_case)
+          if indicated_mod
+            indicated_name = indicated_mod.parent.file_relative_name
+            if !container.include_requires?(indicated_name, @options.ignore_case)
+              container.add_require(Require.new(indicated_name, ""))
+            end
+            break
+          end
+        end
+      }
+
+      #
+      # Parse derived-types definitions
+      #
+      derived_types_comment = ""
+      remaining_code = remaining_lines.join("\n")
+      while remaining_code =~ /^\s*?
+                                    type[\s\,]+(public|private)?\s*?(::)?\s*?
+                                    (\w+)\s*?(!.*?)?$
+                                    (.*?)
+                                    ^\s*?end\s+type.*?$
+                              /imx
+        remaining_code = $~.pre_match
+        remaining_code << $~.post_match
+        typename = $3.chomp.strip
+        type_elements = $5 || ""
+        type_code = remove_empty_head_lines($&)
+        type_trailing = find_comments($4)
+        next if type_trailing =~ /^:nodoc:/
+        type_visibility = $1
+        type_comment = COMMENTS_ARE_UPPER ? 
+          find_comments($~.pre_match) + "\n" + type_trailing :
+            type_trailing + "\n" + find_comments(type_code.sub(/^.*$\n/i, ''))
+        type_element_visibility_public = true
+        type_code.split("\n").each{ |line|
+          if /^\s*?private\s*?$/ =~ line
+            type_element_visibility_public = nil
+            break
+          end
+        } if type_code
+
+        args_comment = ""
+        type_args_info = nil
+
+        if @options.show_all
+          args_comment = find_arguments(nil, type_code, true)
+        else
+          type_public_args_list = []
+          type_args_info = definition_info(type_code)
+          type_args_info.each{ |arg|
+            arg_is_public = type_element_visibility_public
+            arg_is_public = true if arg.include_attr?("public")
+            arg_is_public = nil if arg.include_attr?("private")
+            type_public_args_list << arg.varname if arg_is_public
+          }
+          args_comment = find_arguments(type_public_args_list, type_code)
+        end
+
+        type = AnyMethod.new("type #{typename}", typename)
+        type.singleton = false
+        type.params = ""
+        type.comment = "<b><em> Derived Type </em></b> :: <tt></tt>\n"
+        type.comment << args_comment if args_comment
+        type.comment << type_comment if type_comment
+        progress "t"
+        @stats.num_methods += 1
+        container.add_method type
+
+        set_visibility(container, typename, visibility_default, @@public_methods)
+
+        if type_visibility
+          type_visibility.gsub!(/\s/,'')
+          type_visibility.gsub!(/\,/,'')
+          type_visibility.gsub!(/:/,'')
+          type_visibility.downcase!
+          if type_visibility == "public"
+            container.set_visibility_for([typename], :public)
+          elsif type_visibility == "private"
+            container.set_visibility_for([typename], :private)
+          end
+        end
+
+        check_public_methods(type, container.name)
+
+        if @options.show_all
+          derived_types_comment << ", " unless derived_types_comment.empty?
+          derived_types_comment << typename
+        else
+          if type.visibility == :public
+          derived_types_comment << ", " unless derived_types_comment.empty?
+          derived_types_comment << typename
+          end
+        end
+
+      end
+
+      if !derived_types_comment.empty?
+        derived_types_table = 
+          Attr.new("Derived Types", "Derived_Types", "", 
+                   derived_types_comment)
+        container.add_attribute(derived_types_table)
+      end
+
+      #
+      # move interface scope
+      #
+      interface_code = ""
+      while remaining_code =~ /^\s*?
+                                   interface(
+                                              \s+\w+                      |
+                                              \s+operator\s*?\(.*?\)       |
+                                              \s+assignment\s*?\(\s*?=\s*?\)
+                                            )?\s*?$
+                                   (.*?)
+                                   ^\s*?end\s+interface.*?$
+                              /imx
+        interface_code << remove_empty_head_lines($&) + "\n"
+        remaining_code = $~.pre_match
+        remaining_code << $~.post_match
+      end
+
+      #
+      # Parse global constants or variables in modules
+      #
+      const_var_defs = definition_info(before_contains_code)
+      const_var_defs.each{|defitem|
+        next if defitem.nodoc
+        const_or_var_type = "Variable"
+        const_or_var_progress = "v"
+        if defitem.include_attr?("parameter")
+          const_or_var_type = "Constant"
+          const_or_var_progress = "c"
+        end
+        const_or_var = AnyMethod.new(const_or_var_type, defitem.varname)
+        const_or_var.singleton = false
+        const_or_var.params = ""
+        self_comment = find_arguments([defitem.varname], before_contains_code)
+        const_or_var.comment = "<b><em>" + const_or_var_type + "</em></b> :: <tt></tt>\n"
+        const_or_var.comment << self_comment if self_comment
+        progress const_or_var_progress
+        @stats.num_methods += 1
+        container.add_method const_or_var
+
+        set_visibility(container, defitem.varname, visibility_default, @@public_methods)
+
+        if defitem.include_attr?("public")
+          container.set_visibility_for([defitem.varname], :public)
+        elsif defitem.include_attr?("private")
+          container.set_visibility_for([defitem.varname], :private)
+        end
+
+        check_public_methods(const_or_var, container.name)
+
+      } if const_var_defs
+
+      remaining_lines = remaining_code.split("\n")
+
+      # "subroutine" or "function" parts are parsed (new)
+      #
+      level_depth = 0
+      block_searching_flag = nil
+      block_searching_lines = []
+      pre_comment = []
+      procedure_trailing = ""
+      procedure_name = ""
+      procedure_params = ""
+      procedure_prefix = ""
+      procedure_result_arg = ""
+      procedure_type = ""
+      contains_lines = []
+      contains_flag = nil
+      remaining_lines.collect!{|line|
+        if !block_searching_flag
+          # subroutine
+          if line =~ /^\s*?
+                           (recursive|pure|elemental)?\s*?
+                           subroutine\s+(\w+)\s*?(\(.*?\))?\s*?(!.*?)?$
+                     /ix
+            block_searching_flag = :subroutine
+            block_searching_lines << line
+
+            procedure_name = $2.chomp.strip
+            procedure_params = $3 || ""
+            procedure_prefix = $1 || ""
+            procedure_trailing = $4 || "!"
+            next false
+
+          # function
+          elsif line =~ /^\s*?
+                         (recursive|pure|elemental)?\s*?
+                         (
+                             character\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                           | type\s*?\([\w\s]+?\)\s+
+                           | integer\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                           | real\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                           | double\s+precision\s+
+                           | logical\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                           | complex\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                         )?
+                         function\s+(\w+)\s*?
+                         (\(.*?\))?(\s+result\((.*?)\))?\s*?(!.*?)?$
+                        /ix
+            block_searching_flag = :function
+            block_searching_lines << line
+
+            procedure_prefix = $1 || ""
+            procedure_type = $2 ? $2.chomp.strip : nil
+            procedure_name = $8.chomp.strip
+            procedure_params = $9 || ""
+            procedure_result_arg = $11 ? $11.chomp.strip : procedure_name
+            procedure_trailing = $12 || "!"
+            next false
+          elsif line =~ /^\s*?!\s?(.*)/
+            pre_comment << line
+            next line
+          else
+            pre_comment = []
+            next line
+          end
+        end
+        contains_flag = true if line =~ /^\s*?contains\s*?(!.*?)?$/
+        block_searching_lines << line
+        contains_lines << line if contains_flag
+
+        level_depth += 1 if block_start?(line)
+        level_depth -= 1 if block_end?(line)
+        if level_depth >= 0
+          next false
+        end
+
+        # "procedure_code" is formatted.
+        # ":nodoc:" flag is checked.
+        #
+        procedure_code = block_searching_lines.join("\n")
+        procedure_code = remove_empty_head_lines(procedure_code)
+        if procedure_trailing =~ /^!:nodoc:/
+          # next loop to search next block
+          level_depth = 0
+          block_searching_flag = nil
+          block_searching_lines = []
+          pre_comment = []
+          procedure_trailing = ""
+          procedure_name = ""
+          procedure_params = ""
+          procedure_prefix = ""
+          procedure_result_arg = ""
+          procedure_type = ""
+          contains_lines = []
+          contains_flag = nil
+          next false
+        end
+
+        # AnyMethod is created, and added to container
+        #
+        subroutine_function = nil
+        if block_searching_flag == :subroutine
+          subroutine_prefix   = procedure_prefix
+          subroutine_name     = procedure_name
+          subroutine_params   = procedure_params
+          subroutine_trailing = procedure_trailing
+          subroutine_code     = procedure_code
+
+          subroutine_comment = COMMENTS_ARE_UPPER ? 
+            pre_comment.join("\n") + "\n" + subroutine_trailing : 
+              subroutine_trailing + "\n" + subroutine_code.sub(/^.*$\n/i, '')
+          subroutine = AnyMethod.new("subroutine", subroutine_name)
+          parse_subprogram(subroutine, subroutine_params,
+                           subroutine_comment, subroutine_code,
+                           before_contains_code, nil, subroutine_prefix)
+          progress "s"
+          @stats.num_methods += 1
+          container.add_method subroutine
+          subroutine_function = subroutine
+
+        elsif block_searching_flag == :function
+          function_prefix     = procedure_prefix
+          function_type       = procedure_type
+          function_name       = procedure_name
+          function_params_org = procedure_params
+          function_result_arg = procedure_result_arg
+          function_trailing   = procedure_trailing
+          function_code_org   = procedure_code
+
+          function_comment = COMMENTS_ARE_UPPER ?
+            pre_comment.join("\n") + "\n" + function_trailing :
+              function_trailing + "\n " + function_code_org.sub(/^.*$\n/i, '')
+
+          function_code = "#{function_code_org}"
+          if function_type
+            function_code << "\n" + function_type + " :: " + function_result_arg
+          end
+
+          function_params =
+            function_params_org.sub(/^\(/, "\(#{function_result_arg}, ")
+
+          function = AnyMethod.new("function", function_name)
+          parse_subprogram(function, function_params,
+                           function_comment, function_code,
+                           before_contains_code, true, function_prefix)
+
+          # Specific modification due to function
+          function.params.sub!(/\(\s*?#{function_result_arg}\s*?,\s*?/, "\( ")
+          function.params << " result(" + function_result_arg + ")"
+          function.start_collecting_tokens
+          function.add_token Token.new(1,1).set_text(function_code_org)
+
+          progress "f"
+          @stats.num_methods += 1
+          container.add_method function
+          subroutine_function = function
+
+        end
+
+        # The visibility of procedure is specified
+        #
+        set_visibility(container, procedure_name, 
+                       visibility_default, @@public_methods)
+
+        # The alias for this procedure from external modules
+        #
+        check_external_aliases(procedure_name,
+                               subroutine_function.params,
+                               subroutine_function.comment, subroutine_function) if external
+        check_public_methods(subroutine_function, container.name)
+
+
+        # contains_lines are parsed as private procedures
+        if contains_flag
+          parse_program_or_module(container,
+                                  contains_lines.join("\n"), :private)
+        end
+
+        # next loop to search next block
+        level_depth = 0
+        block_searching_flag = nil
+        block_searching_lines = []
+        pre_comment = []
+        procedure_trailing = ""
+        procedure_name = ""
+        procedure_params = ""
+        procedure_prefix = ""
+        procedure_result_arg = ""
+        contains_lines = []
+        contains_flag = nil
+        next false
+      } # End of remaining_lines.collect!{|line|
+
+      # Array remains_lines is converted to String remains_code again
+      #
+      remaining_code = remaining_lines.join("\n")
+
+      #
+      # Parse interface
+      #
+      interface_scope = false
+      generic_name = ""
+      interface_code.split("\n").each{ |line|
+        if /^\s*?
+                 interface(
+                            \s+\w+|
+                            \s+operator\s*?\(.*?\)|
+                            \s+assignment\s*?\(\s*?=\s*?\)
+                          )?
+                 \s*?(!.*?)?$
+           /ix =~ line
+          generic_name = $1 ? $1.strip.chomp : nil
+          interface_trailing = $2 || "!"
+          interface_scope = true
+          interface_scope = false if interface_trailing =~ /!:nodoc:/
+#          if generic_name =~ /operator\s*?\((.*?)\)/i
+#            operator_name = $1
+#            if operator_name && !operator_name.empty?
+#              generic_name = "#{operator_name}"
+#            end
+#          end
+#          if generic_name =~ /assignment\s*?\((.*?)\)/i
+#            assignment_name = $1
+#            if assignment_name && !assignment_name.empty?
+#              generic_name = "#{assignment_name}"
+#            end
+#          end
+        end
+        if /^\s*?end\s+interface/i =~ line
+          interface_scope = false
+          generic_name = nil
+        end
+        # internal alias
+        if interface_scope && /^\s*?module\s+procedure\s+(.*?)(!.*?)?$/i =~ line
+          procedures = $1.strip.chomp
+          procedures_trailing = $2 || "!"
+          next if procedures_trailing =~ /!:nodoc:/
+          procedures.split(",").each{ |proc|
+            proc.strip!
+            proc.chomp!
+            next if generic_name == proc || !generic_name
+            old_meth = container.find_symbol(proc, nil, @options.ignore_case)
+            next if !old_meth
+            nolink = old_meth.visibility == :private ? true : nil
+            nolink = nil if @options.show_all
+            new_meth = 
+               initialize_external_method(generic_name, proc, 
+                                          old_meth.params, nil, 
+                                          old_meth.comment, 
+                                          old_meth.clone.token_stream[0].text, 
+                                          true, nolink)
+            new_meth.singleton = old_meth.singleton
+
+            progress "i"
+            @stats.num_methods += 1
+            container.add_method new_meth
+
+            set_visibility(container, generic_name, visibility_default, @@public_methods)
+
+            check_public_methods(new_meth, container.name)
+
+          }
+        end
+
+        # external aliases
+        if interface_scope
+          # subroutine
+          proc = nil
+          params = nil
+          procedures_trailing = nil
+          if line =~ /^\s*?
+                           (recursive|pure|elemental)?\s*?
+                           subroutine\s+(\w+)\s*?(\(.*?\))?\s*?(!.*?)?$
+                     /ix
+            proc = $2.chomp.strip
+            generic_name = proc unless generic_name
+            params = $3 || ""
+            procedures_trailing = $4 || "!"
+
+          # function
+          elsif line =~ /^\s*?
+                         (recursive|pure|elemental)?\s*?
+                         (
+                             character\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                           | type\s*?\([\w\s]+?\)\s+
+                           | integer\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                           | real\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                           | double\s+precision\s+
+                           | logical\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                           | complex\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                         )?
+                         function\s+(\w+)\s*?
+                         (\(.*?\))?(\s+result\((.*?)\))?\s*?(!.*?)?$
+                        /ix
+            proc = $8.chomp.strip
+            generic_name = proc unless generic_name
+            params = $9 || ""
+            procedures_trailing = $12 || "!"
+          else
+            next
+          end
+          next if procedures_trailing =~ /!:nodoc:/
+          indicated_method = nil
+          indicated_file   = nil
+          TopLevel.all_files.each do |name, toplevel|
+            indicated_method = toplevel.find_local_symbol(proc, @options.ignore_case)
+            indicated_file = name
+            break if indicated_method
+          end
+
+          if indicated_method
+            external_method = 
+              initialize_external_method(generic_name, proc, 
+                                         indicated_method.params, 
+                                         indicated_file, 
+                                         indicated_method.comment)
+
+            progress "e"
+            @stats.num_methods += 1
+            container.add_method external_method
+            set_visibility(container, generic_name, visibility_default, @@public_methods)
+            if !container.include_requires?(indicated_file, @options.ignore_case)
+              container.add_require(Require.new(indicated_file, ""))
+            end
+            check_public_methods(external_method, container.name)
+
+          else
+            @@external_aliases << {
+              "new_name"  => generic_name,
+              "old_name"  => proc,
+              "file_or_module" => container,
+              "visibility" => find_visibility(container, generic_name, @@public_methods) || visibility_default
+            }
+          end
+        end
+
+      } if interface_code # End of interface_code.split("\n").each ...
+
+      #
+      # Already imported methods are removed from @@public_methods.
+      # Remainders are assumed to be imported from other modules.
+      #
+      @@public_methods.delete_if{ |method| method["entity_is_discovered"]}
+
+      @@public_methods.each{ |pub_meth|
+        next unless pub_meth["file_or_module"].name == container.name
+        pub_meth["used_modules"].each{ |used_mod|
+          TopLevel.all_classes_and_modules.each{ |modules|
+            if modules.name == used_mod ||
+                modules.name.upcase == used_mod.upcase &&
+                @options.ignore_case
+              modules.method_list.each{ |meth|
+                if meth.name == pub_meth["name"] ||
+                    meth.name.upcase == pub_meth["name"].upcase &&
+                    @options.ignore_case
+                  new_meth = initialize_public_method(meth,
+                                                      modules.name)
+                  if pub_meth["local_name"]
+                    new_meth.name = pub_meth["local_name"]
+                  end
+                  progress "e"
+                  @stats.num_methods += 1
+                  container.add_method new_meth
+                end
+              }
+            end
+          }
+        }
+      }
+
+      container
+    end  # End of parse_program_or_module
+
+    #
+    # Parse arguments, comment, code of subroutine and function.
+    # Return AnyMethod object.
+    #
+    def parse_subprogram(subprogram, params, comment, code, 
+                         before_contains=nil, function=nil, prefix=nil)
+      subprogram.singleton = false
+      prefix = "" if !prefix
+      arguments = params.sub(/\(/, "").sub(/\)/, "").split(",") if params
+      args_comment, params_opt = 
+        find_arguments(arguments, code.sub(/^s*?contains\s*?(!.*?)?$.*/im, ""),
+                       nil, nil, true)
+      params_opt = "( " + params_opt + " ) " if params_opt
+      subprogram.params = params_opt || ""
+      namelist_comment = find_namelists(code, before_contains)
+
+      block_comment = find_comments comment
+      if function
+        subprogram.comment = "<b><em> Function </em></b> :: <em>#{prefix}</em>\n"
+      else
+        subprogram.comment = "<b><em> Subroutine </em></b> :: <em>#{prefix}</em>\n"
+      end
+      subprogram.comment << args_comment if args_comment
+      subprogram.comment << block_comment if block_comment
+      subprogram.comment << namelist_comment if namelist_comment
+
+      # For output source code
+      subprogram.start_collecting_tokens
+      subprogram.add_token Token.new(1,1).set_text(code)
+
+      subprogram
+    end
+
+    #
+    # Collect comment for file entity
+    #
+    def collect_first_comment(body)
+      comment = ""
+      not_comment = ""
+      comment_start = false
+      comment_end   = false
+      body.split("\n").each{ |line|
+        if comment_end
+          not_comment << line
+          not_comment << "\n"
+        elsif /^\s*?!\s?(.*)$/i =~ line
+          comment_start = true
+          comment << $1
+          comment << "\n"
+        elsif /^\s*?$/i =~ line
+          comment_end = true if comment_start && COMMENTS_ARE_UPPER
+        else
+          comment_end = true
+          not_comment << line
+          not_comment << "\n"
+        end
+      }
+      return comment, not_comment
+    end
+
+
+    # Return comments of definitions of arguments
+    #
+    # If "all" argument is true, information of all arguments are returned.
+    # If "modified_params" is true, list of arguments are decorated,
+    # for exameple, optional arguments are parenthetic as "[arg]".
+    #
+    def find_arguments(args, text, all=nil, indent=nil, modified_params=nil)
+      return unless args || all
+      indent = "" unless indent
+      args = ["all"] if all
+      params = "" if modified_params
+      comma = ""
+      return unless text
+      args_rdocforms = "\n"
+      remaining_lines = "#{text}"
+      definitions = definition_info(remaining_lines)
+      args.each{ |arg|
+        arg.strip!
+        arg.chomp!
+        definitions.each { |defitem|
+          if arg == defitem.varname.strip.chomp || all
+            args_rdocforms << <<-"EOF"
+
+#{indent}<tt><b>#{defitem.varname.chomp.strip}#{defitem.arraysuffix}</b> #{defitem.inivalue}</tt> :: 
+#{indent}   <tt>#{defitem.types.chomp.strip}</tt>
+EOF
+            if !defitem.comment.chomp.strip.empty?
+              comment = ""
+              defitem.comment.split("\n").each{ |line|
+                comment << "       " + line + "\n"
+              }
+              args_rdocforms << <<-"EOF"
+
+#{indent}   <tt></tt> :: 
+#{indent}       <tt></tt>
+#{indent}       #{comment.chomp.strip}
+EOF
+            end
+
+            if modified_params
+              if defitem.include_attr?("optional")
+                params << "#{comma}[#{arg}]"
+              else
+                params << "#{comma}#{arg}"
+              end
+              comma = ", "
+            end
+          end
+        }
+      }
+      if modified_params
+        return args_rdocforms, params
+      else
+        return args_rdocforms
+      end
+    end
+
+    # Return comments of definitions of namelists
+    #
+    def find_namelists(text, before_contains=nil)
+      return nil if !text
+      result = ""
+      lines = "#{text}"
+      before_contains = "" if !before_contains
+      while lines =~ /^\s*?namelist\s+\/\s*?(\w+)\s*?\/([\s\w\,]+)$/i
+        lines = $~.post_match
+        nml_comment = COMMENTS_ARE_UPPER ? 
+            find_comments($~.pre_match) : find_comments($~.post_match)
+        nml_name = $1
+        nml_args = $2.split(",")
+        result << "\n\n=== NAMELIST <tt><b>" + nml_name + "</tt></b>\n\n"
+        result << nml_comment + "\n" if nml_comment
+        if lines.split("\n")[0] =~ /^\//i
+          lines = "namelist " + lines
+        end
+        result << find_arguments(nml_args, "#{text}" + "\n" + before_contains)
+      end
+      return result
+    end
+
+    #
+    # Comments just after module or subprogram, or arguments are
+    # returnd. If "COMMENTS_ARE_UPPER" is true, comments just before
+    # modules or subprograms are returnd
+    #
+    def find_comments text
+      return "" unless text
+      lines = text.split("\n")
+      lines.reverse! if COMMENTS_ARE_UPPER
+      comment_block = Array.new
+      lines.each do |line|
+        break if line =~ /^\s*?\w/ || line =~ /^\s*?$/
+        if COMMENTS_ARE_UPPER
+          comment_block.unshift line.sub(/^\s*?!\s?/,"")
+        else
+          comment_block.push line.sub(/^\s*?!\s?/,"")
+        end
+      end
+      nice_lines = comment_block.join("\n").split "\n\s*?\n"
+      nice_lines[0] ||= ""
+      nice_lines.shift
+    end
+
+    def progress(char)
+      unless @options.quiet
+        @progress.print(char)
+        @progress.flush
+      end
+    end
+
+    #
+    # Create method for internal alias
+    #
+    def initialize_public_method(method, parent)
+      return if !method || !parent
+
+      new_meth = AnyMethod.new("External Alias for module", method.name)
+      new_meth.singleton    = method.singleton
+      new_meth.params       = method.params.clone
+      new_meth.comment      = remove_trailing_alias(method.comment.clone)
+      new_meth.comment      << "\n\n#{EXTERNAL_ALIAS_MES} #{parent.strip.chomp}\##{method.name}"
+
+      return new_meth
+    end
+
+    #
+    # Create method for external alias
+    #
+    # If argument "internal" is true, file is ignored.
+    #
+    def initialize_external_method(new, old, params, file, comment, token=nil,
+                                   internal=nil, nolink=nil)
+      return nil unless new || old
+
+      if internal
+        external_alias_header = "#{INTERNAL_ALIAS_MES} "
+        external_alias_text   = external_alias_header + old 
+      elsif file
+        external_alias_header = "#{EXTERNAL_ALIAS_MES} "
+        external_alias_text   = external_alias_header + file + "#" + old
+      else
+        return nil
+      end
+      external_meth = AnyMethod.new(external_alias_text, new)
+      external_meth.singleton    = false
+      external_meth.params       = params
+      external_comment = remove_trailing_alias(comment) + "\n\n" if comment
+      external_meth.comment = external_comment || ""
+      if nolink && token
+        external_meth.start_collecting_tokens
+        external_meth.add_token Token.new(1,1).set_text(token)
+      else
+        external_meth.comment << external_alias_text
+      end
+
+      return external_meth
+    end
+
+
+
+    #
+    # Parse visibility
+    #
+    def parse_visibility(code, default, container)
+      result = []
+      visibility_default = default || :public
+
+      used_modules = []
+      container.includes.each{|i| used_modules << i.name} if container
+
+      remaining_code = code.gsub(/^\s*?type[\s\,]+.*?\s+end\s+type.*?$/im, "")
+      remaining_code.split("\n").each{ |line|
+        if /^\s*?private\s*?$/ =~ line
+          visibility_default = :private
+          break
+        end
+      } if remaining_code
+
+      remaining_code.split("\n").each{ |line|
+        if /^\s*?private\s*?(::)?\s+(.*)\s*?(!.*?)?/i =~ line
+          methods = $2.sub(/!.*$/, '')
+          methods.split(",").each{ |meth|
+            meth.sub!(/!.*$/, '')
+            meth.gsub!(/:/, '')
+            result << {
+              "name" => meth.chomp.strip,
+              "visibility" => :private,
+              "used_modules" => used_modules.clone,
+              "file_or_module" => container,
+              "entity_is_discovered" => nil,
+              "local_name" => nil
+            }
+          }
+        elsif /^\s*?public\s*?(::)?\s+(.*)\s*?(!.*?)?/i =~ line
+          methods = $2.sub(/!.*$/, '')
+          methods.split(",").each{ |meth|
+            meth.sub!(/!.*$/, '')
+            meth.gsub!(/:/, '')
+            result << {
+              "name" => meth.chomp.strip,
+              "visibility" => :public,
+              "used_modules" => used_modules.clone,
+              "file_or_module" => container,
+              "entity_is_discovered" => nil,
+              "local_name" => nil
+            }
+          }
+        end
+      } if remaining_code
+
+      if container
+        result.each{ |vis_info|
+          vis_info["parent"] = container.name
+        }
+      end
+
+      return visibility_default, result
+    end
+
+    #
+    # Set visibility
+    #
+    # "subname" element of "visibility_info" is deleted.
+    #
+    def set_visibility(container, subname, visibility_default, visibility_info)
+      return unless container || subname || visibility_default || visibility_info
+      not_found = true
+      visibility_info.collect!{ |info|
+        if info["name"] == subname ||
+            @options.ignore_case && info["name"].upcase == subname.upcase
+          if info["file_or_module"].name == container.name
+            container.set_visibility_for([subname], info["visibility"])
+            info["entity_is_discovered"] = true
+            not_found = false
+          end
+        end
+        info
+      }
+      if not_found
+        return container.set_visibility_for([subname], visibility_default)
+      else
+        return container
+      end
+    end
+
+    #
+    # Find visibility
+    #
+    def find_visibility(container, subname, visibility_info)
+      return nil if !subname || !visibility_info
+      visibility_info.each{ |info|
+        if info["name"] == subname ||
+            @options.ignore_case && info["name"].upcase == subname.upcase
+          if info["parent"] == container.name
+            return info["visibility"]
+          end
+        end
+      }
+      return nil
+    end
+
+    #
+    # Check external aliases
+    #
+    def check_external_aliases(subname, params, comment, test=nil)
+      @@external_aliases.each{ |alias_item|
+        if subname == alias_item["old_name"] ||
+                    subname.upcase == alias_item["old_name"].upcase &&
+                            @options.ignore_case
+
+          new_meth = initialize_external_method(alias_item["new_name"], 
+                                                subname, params, @file_name, 
+                                                comment)
+          new_meth.visibility = alias_item["visibility"]
+
+          progress "e"
+          @stats.num_methods += 1
+          alias_item["file_or_module"].add_method(new_meth)
+
+          if !alias_item["file_or_module"].include_requires?(@file_name, @options.ignore_case)
+            alias_item["file_or_module"].add_require(Require.new(@file_name, ""))
+          end
+        end
+      }
+    end
+
+    #
+    # Check public_methods
+    #
+    def check_public_methods(method, parent)
+      return if !method || !parent
+      @@public_methods.each{ |alias_item|
+        parent_is_used_module = nil
+        alias_item["used_modules"].each{ |used_module|
+          if used_module == parent ||
+              used_module.upcase == parent.upcase &&
+              @options.ignore_case
+            parent_is_used_module = true
+          end
+        }
+        next if !parent_is_used_module
+
+        if method.name == alias_item["name"] ||
+            method.name.upcase == alias_item["name"].upcase &&
+            @options.ignore_case
+
+          new_meth = initialize_public_method(method, parent)
+          if alias_item["local_name"]
+            new_meth.name = alias_item["local_name"]
+          end
+
+          progress "e"
+          @stats.num_methods += 1
+          alias_item["file_or_module"].add_method new_meth
+        end
+      }
+    end
+
+    #
+    # Continuous lines are united.
+    #
+    # Comments in continuous lines are removed.
+    #
+    def united_to_one_line(f90src)
+      return "" unless f90src
+      lines = f90src.split("\n")
+      previous_continuing = false
+      now_continuing = false
+      body = ""
+      lines.each{ |line|
+        words = line.split("")
+        next if words.empty? && previous_continuing
+        commentout = false
+        brank_flag = true ; brank_char = ""
+        squote = false    ; dquote = false
+        ignore = false
+        words.collect! { |char|
+          if previous_continuing && brank_flag
+            now_continuing = true
+            ignore         = true
+            case char
+            when "!"                       ; break
+            when " " ; brank_char << char  ; next ""
+            when "&"
+              brank_flag = false
+              now_continuing = false
+              next ""
+            else 
+              brank_flag     = false
+              now_continuing = false
+              ignore         = false
+              next brank_char + char
+            end
+          end
+          ignore = false
+
+          if now_continuing
+            next ""
+          elsif !(squote) && !(dquote) && !(commentout)
+            case char
+            when "!" ; commentout = true     ; next char
+            when "\""; dquote = true         ; next char
+            when "\'"; squote = true         ; next char
+            when "&" ; now_continuing = true ; next ""
+            else next char
+            end
+          elsif commentout
+            next char
+          elsif squote
+            case char
+            when "\'"; squote = false ; next char
+            else next char
+            end
+          elsif dquote
+            case char
+            when "\""; dquote = false ; next char
+            else next char
+            end
+          end
+        }
+        if !ignore && !previous_continuing || !brank_flag
+          if previous_continuing
+            body << words.join("")
+          else
+            body << "\n" + words.join("")
+          end
+        end
+        previous_continuing = now_continuing ? true : nil
+        now_continuing = nil
+      }
+      return body
+    end
+
+
+    #
+    # Continuous line checker
+    #
+    def continuous_line?(line)
+      continuous = false
+      if /&\s*?(!.*)?$/ =~ line
+        continuous = true
+        if comment_out?($~.pre_match)
+          continuous = false
+        end
+      end
+      return continuous
+    end
+
+    #
+    # Comment out checker
+    #
+    def comment_out?(line)
+      return nil unless line
+      commentout = false
+      squote = false ; dquote = false
+      line.split("").each { |char|
+        if !(squote) && !(dquote)
+          case char
+          when "!" ; commentout = true ; break
+          when "\""; dquote = true
+          when "\'"; squote = true
+          else next
+          end
+        elsif squote
+          case char
+          when "\'"; squote = false
+          else next
+          end
+        elsif dquote
+          case char
+          when "\""; dquote = false
+          else next
+          end
+        end
+      }
+      return commentout
+    end
+
+    #
+    # Semicolons are replaced to line feed.
+    #
+    def semicolon_to_linefeed(text)
+      return "" unless text
+      lines = text.split("\n")
+      lines.collect!{ |line|
+        words = line.split("")
+        commentout = false
+        squote = false ; dquote = false
+        words.collect! { |char|
+          if !(squote) && !(dquote) && !(commentout)
+            case char
+            when "!" ; commentout = true ; next char
+            when "\""; dquote = true     ; next char
+            when "\'"; squote = true     ; next char
+            when ";" ;                     "\n"
+            else next char
+            end
+          elsif commentout
+            next char
+          elsif squote
+            case char
+            when "\'"; squote = false ; next char
+            else next char
+            end
+          elsif dquote
+            case char
+            when "\""; dquote = false ; next char
+            else next char
+            end
+          end
+        }
+        words.join("")
+      }
+      return lines.join("\n")
+    end
+
+    #
+    # Which "line" is start of block (module, program, block data,
+    # subroutine, function) statement ?
+    #
+    def block_start?(line)
+      return nil if !line
+
+      if line =~ /^\s*?module\s+(\w+)\s*?(!.*?)?$/i    ||
+          line =~ /^\s*?program\s+(\w+)\s*?(!.*?)?$/i  ||
+          line =~ /^\s*?block\s+data(\s+\w+)?\s*?(!.*?)?$/i     ||
+          line =~ \
+                  /^\s*?
+                   (recursive|pure|elemental)?\s*?
+                   subroutine\s+(\w+)\s*?(\(.*?\))?\s*?(!.*?)?$
+                  /ix ||
+          line =~ \
+                  /^\s*?
+                   (recursive|pure|elemental)?\s*?
+                   (
+                       character\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                     | type\s*?\([\w\s]+?\)\s+
+                     | integer\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                     | real\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                     | double\s+precision\s+
+                     | logical\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                     | complex\s*?(\([\w\s\=\(\)\*]+?\))?\s+
+                   )?
+                   function\s+(\w+)\s*?
+                   (\(.*?\))?(\s+result\((.*?)\))?\s*?(!.*?)?$
+                  /ix
+        return true
+      end
+
+      return nil
+    end
+
+    #
+    # Which "line" is end of block (module, program, block data,
+    # subroutine, function) statement ?
+    #
+    def block_end?(line)
+      return nil if !line
+
+      if line =~ /^\s*?end\s*?(!.*?)?$/i                 ||
+          line =~ /^\s*?end\s+module(\s+\w+)?\s*?(!.*?)?$/i       ||
+          line =~ /^\s*?end\s+program(\s+\w+)?\s*?(!.*?)?$/i      ||
+          line =~ /^\s*?end\s+block\s+data(\s+\w+)?\s*?(!.*?)?$/i  ||
+          line =~ /^\s*?end\s+subroutine(\s+\w+)?\s*?(!.*?)?$/i   ||
+          line =~ /^\s*?end\s+function(\s+\w+)?\s*?(!.*?)?$/i
+        return true
+      end
+
+      return nil
+    end
+
+    #
+    # Remove "Alias for" in end of comments
+    #
+    def remove_trailing_alias(text)
+      return "" if !text
+      lines = text.split("\n").reverse
+      comment_block = Array.new
+      checked = false
+      lines.each do |line|
+        if !checked 
+          if /^\s?#{INTERNAL_ALIAS_MES}/ =~ line ||
+              /^\s?#{EXTERNAL_ALIAS_MES}/ =~ line
+            checked = true
+            next
+          end
+        end
+        comment_block.unshift line
+      end
+      nice_lines = comment_block.join("\n")
+      nice_lines ||= ""
+      return nice_lines
+    end
+
+    # Empty lines in header are removed
+    def remove_empty_head_lines(text)
+      return "" unless text
+      lines = text.split("\n")
+      header = true
+      lines.delete_if{ |line|
+        header = false if /\S/ =~ line
+        header && /^\s*?$/ =~ line
+      }
+      lines.join("\n")
+    end
+
+
+    # header marker "=", "==", ... are removed
+    def remove_header_marker(text)
+      return text.gsub(/^\s?(=+)/, '<tt></tt>\1')
+    end
+
+    def remove_private_comments(body)
+      body.gsub!(/^\s*!--\s*?$.*?^\s*!\+\+\s*?$/m, '')
+      return body
+    end
+
+
+    #
+    # Information of arguments of subroutines and functions in Fortran95
+    #
+    class Fortran95Definition
+
+      # Name of variable
+      #
+      attr_reader   :varname
+
+      # Types of variable
+      #
+      attr_reader   :types
+
+      # Initial Value
+      #
+      attr_reader   :inivalue
+
+      # Suffix of array
+      #
+      attr_reader   :arraysuffix
+
+      # Comments
+      #
+      attr_accessor   :comment
+
+      # Flag of non documentation
+      #
+      attr_accessor   :nodoc
+
+      def initialize(varname, types, inivalue, arraysuffix, comment,
+                     nodoc=false)
+        @varname = varname
+        @types = types
+        @inivalue = inivalue
+        @arraysuffix = arraysuffix
+        @comment = comment
+        @nodoc = nodoc
+      end
+
+      def to_s
+        return <<-EOF
+<Fortran95Definition: 
+  varname=#{@varname}, types=#{types},
+  inivalue=#{@inivalue}, arraysuffix=#{@arraysuffix}, nodoc=#{@nodoc}, 
+  comment=
+#{@comment}
+>
+EOF
+      end
+
+      #
+      # If attr is included, true is returned
+      #
+      def include_attr?(attr)
+        return if !attr
+        @types.split(",").each{ |type|
+          return true if type.strip.chomp.upcase == attr.strip.chomp.upcase
+        }
+        return nil
+      end
+
+    end # End of Fortran95Definition
+
+    #
+    # Parse string argument "text", and Return Array of
+    # Fortran95Definition object
+    #
+    def definition_info(text)
+      return nil unless text
+      lines = "#{text}"
+      defs = Array.new
+      comment = ""
+      trailing_comment = ""
+      under_comment_valid = false
+      lines.split("\n").each{ |line|
+        if /^\s*?!\s?(.*)/ =~ line
+          if COMMENTS_ARE_UPPER
+            comment << remove_header_marker($1)
+            comment << "\n"
+          elsif defs[-1] && under_comment_valid
+            defs[-1].comment << "\n"
+            defs[-1].comment << remove_header_marker($1)
+          end
+          next
+        elsif /^\s*?$/ =~ line
+          comment = ""
+          under_comment_valid = false
+          next
+        end
+        type = ""
+        characters = ""
+        if line =~ /^\s*?
+                    (
+                        character\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
+                      | type\s*?\([\w\s]+?\)[\s\,]*
+                      | integer\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
+                      | real\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
+                      | double\s+precision[\s\,]*
+                      | logical\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
+                      | complex\s*?(\([\w\s\=\(\)\*]+?\))?[\s\,]*
+                    )
+                    (.*?::)?
+                    (.+)$
+                   /ix
+          characters = $8
+          type = $1
+          type << $7.gsub(/::/, '').gsub(/^\s*?\,/, '') if $7
+        else
+          under_comment_valid = false
+          next
+        end
+        squote = false ; dquote = false ; bracket = 0
+        iniflag = false; commentflag = false
+        varname = "" ; arraysuffix = "" ; inivalue = ""
+        start_pos = defs.size
+        characters.split("").each { |char|
+          if !(squote) && !(dquote) && bracket <= 0 && !(iniflag) && !(commentflag)
+            case char
+            when "!" ; commentflag = true
+            when "(" ; bracket += 1       ; arraysuffix = char
+            when "\""; dquote = true
+            when "\'"; squote = true
+            when "=" ; iniflag = true     ; inivalue << char
+            when ","
+              defs << Fortran95Definition.new(varname, type, inivalue, arraysuffix, comment)
+              varname = "" ; arraysuffix = "" ; inivalue = ""
+              under_comment_valid = true
+            when " " ; next
+            else     ; varname << char
+            end
+          elsif commentflag
+            comment << remove_header_marker(char)
+            trailing_comment << remove_header_marker(char)
+          elsif iniflag
+            if dquote
+              case char
+              when "\"" ; dquote = false ; inivalue << char
+              else      ; inivalue << char
+              end
+            elsif squote
+              case char
+              when "\'" ; squote = false ; inivalue << char
+              else      ; inivalue << char
+              end
+            elsif bracket > 0
+              case char
+              when "(" ; bracket += 1 ; inivalue << char
+              when ")" ; bracket -= 1 ; inivalue << char
+              else     ; inivalue << char
+              end
+            else
+              case char
+              when ","
+                defs << Fortran95Definition.new(varname, type, inivalue, arraysuffix, comment)
+                varname = "" ; arraysuffix = "" ; inivalue = ""
+                iniflag = false
+                under_comment_valid = true
+              when "(" ; bracket += 1 ; inivalue << char
+              when "\""; dquote = true  ; inivalue << char
+              when "\'"; squote = true  ; inivalue << char
+              when "!" ; commentflag = true
+              else     ; inivalue << char
+              end
+            end
+          elsif !(squote) && !(dquote) && bracket > 0
+            case char
+            when "(" ; bracket += 1 ; arraysuffix << char
+            when ")" ; bracket -= 1 ; arraysuffix << char
+            else     ; arraysuffix << char
+            end
+          elsif squote
+            case char
+            when "\'"; squote = false ; inivalue << char
+            else     ; inivalue << char
+            end
+          elsif dquote
+            case char
+            when "\""; dquote = false ; inivalue << char
+            else     ; inivalue << char
+            end
+          end
+        }
+        defs << Fortran95Definition.new(varname, type, inivalue, arraysuffix, comment)
+        if trailing_comment =~ /^:nodoc:/
+          defs[start_pos..-1].collect!{ |defitem|
+            defitem.nodoc = true
+          }
+        end
+        varname = "" ; arraysuffix = "" ; inivalue = ""
+        comment = ""
+        under_comment_valid = true
+        trailing_comment = ""
+      }
+      return defs
+    end
+
+
+  end # class Fortran95parser
+
+end # module RDoc
diff --git a/ruby_1_8_6/lib/rdoc/parsers/parse_rb.rb b/ruby_1_8_6/lib/rdoc/parsers/parse_rb.rb
new file mode 100644
index 0000000000..58ba06084e
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/parsers/parse_rb.rb
@@ -0,0 +1,2605 @@
+#!/usr/local/bin/ruby
+
+# Parse a Ruby source file, building a set of objects
+# representing the modules, classes, methods,
+# requires, and includes we find (these classes
+# are defined in code_objects.rb).
+
+# This file contains stuff stolen outright from:
+#
+#   rtags.rb - 
+#   ruby-lex.rb - ruby lexcal analizer
+#   ruby-token.rb - ruby tokens 
+#   	by Keiju ISHITSUKA (Nippon Rational Inc.)
+#
+
+require "e2mmap"
+require "irb/slex"
+
+require "rdoc/code_objects"
+require "rdoc/tokenstream"
+
+require "rdoc/markup/simple_markup/preprocess"
+
+require "rdoc/parsers/parserfactory"
+
+$TOKEN_DEBUG = $DEBUG
+
+# Definitions of all tokens involved in the lexical analysis
+
+module RubyToken
+  EXPR_BEG   = :EXPR_BEG
+  EXPR_MID   = :EXPR_MID
+  EXPR_END   = :EXPR_END
+  EXPR_ARG   = :EXPR_ARG
+  EXPR_FNAME = :EXPR_FNAME
+  EXPR_DOT   = :EXPR_DOT
+  EXPR_CLASS = :EXPR_CLASS
+  
+  class Token
+    NO_TEXT = "??".freeze
+    attr :text
+
+    def initialize(line_no, char_no)
+      @line_no = line_no
+      @char_no = char_no
+      @text    = NO_TEXT
+    end
+
+    # Because we're used in contexts that expect to return a token,
+    # we set the text string and then return ourselves
+    def set_text(text)
+      @text = text
+      self
+    end
+
+    attr_reader :line_no, :char_no, :text
+  end
+
+  class TkNode < Token
+    attr :node
+  end
+
+  class TkId < Token
+    def initialize(line_no, char_no, name)
+      super(line_no, char_no)
+      @name = name
+    end
+    attr :name
+  end
+
+  class TkKW < TkId
+  end
+
+  class TkVal < Token
+    def initialize(line_no, char_no, value = nil)
+      super(line_no, char_no)
+      set_text(value)
+    end
+  end
+
+  class TkOp < Token
+    def name
+      self.class.op_name
+    end
+  end
+
+  class TkOPASGN < TkOp
+    def initialize(line_no, char_no, op)
+      super(line_no, char_no)
+      op = TkReading2Token[op] unless op.kind_of?(Symbol)
+      @op = op
+    end
+    attr :op
+  end
+
+  class TkUnknownChar < Token
+    def initialize(line_no, char_no, id)
+      super(line_no, char_no)
+      @name = char_no.chr
+    end
+    attr :name
+  end
+
+  class TkError < Token
+  end
+
+  def set_token_position(line, char)
+    @prev_line_no = line
+    @prev_char_no = char
+  end
+
+  def Token(token, value = nil)
+    tk = nil
+    case token
+    when String, Symbol
+      source = token.kind_of?(String) ? TkReading2Token : TkSymbol2Token
+      if (tk = source[token]).nil?
+	IRB.fail TkReading2TokenNoKey, token
+      end
+      tk = Token(tk[0], value) 
+    else 
+      tk = if (token.ancestors & [TkId, TkVal, TkOPASGN, TkUnknownChar]).empty?
+             token.new(@prev_line_no, @prev_char_no)
+           else
+             token.new(@prev_line_no, @prev_char_no, value)
+           end
+    end
+    tk
+  end
+
+  TokenDefinitions = [
+    [:TkCLASS,      TkKW,  "class",  EXPR_CLASS],
+    [:TkMODULE,     TkKW,  "module", EXPR_BEG],
+    [:TkDEF,	    TkKW,  "def",    EXPR_FNAME],
+    [:TkUNDEF,      TkKW,  "undef",  EXPR_FNAME],
+    [:TkBEGIN,      TkKW,  "begin",  EXPR_BEG],
+    [:TkRESCUE,     TkKW,  "rescue", EXPR_MID],
+    [:TkENSURE,     TkKW,  "ensure", EXPR_BEG],
+    [:TkEND,	    TkKW,  "end",    EXPR_END],
+    [:TkIF,         TkKW,  "if",     EXPR_BEG, :TkIF_MOD],
+    [:TkUNLESS,     TkKW,  "unless", EXPR_BEG, :TkUNLESS_MOD],
+    [:TkTHEN,	    TkKW,  "then",   EXPR_BEG],
+    [:TkELSIF,      TkKW,  "elsif",  EXPR_BEG],
+    [:TkELSE,	    TkKW,  "else",   EXPR_BEG],
+    [:TkCASE,	    TkKW,  "case",   EXPR_BEG],
+    [:TkWHEN,	    TkKW,  "when",   EXPR_BEG],
+    [:TkWHILE,      TkKW,  "while",  EXPR_BEG, :TkWHILE_MOD],
+    [:TkUNTIL,      TkKW,  "until",  EXPR_BEG, :TkUNTIL_MOD],
+    [:TkFOR,	    TkKW,  "for",    EXPR_BEG],
+    [:TkBREAK,      TkKW,  "break",  EXPR_END],
+    [:TkNEXT,	    TkKW,  "next",   EXPR_END],
+    [:TkREDO,	    TkKW,  "redo",   EXPR_END],
+    [:TkRETRY,      TkKW,  "retry",  EXPR_END],
+    [:TkIN,	    TkKW,  "in",     EXPR_BEG],
+    [:TkDO,	    TkKW,  "do",     EXPR_BEG],
+    [:TkRETURN,     TkKW,  "return", EXPR_MID],
+    [:TkYIELD,      TkKW,  "yield",  EXPR_END],
+    [:TkSUPER,      TkKW,  "super",  EXPR_END],
+    [:TkSELF,	    TkKW,  "self",   EXPR_END],
+    [:TkNIL, 	    TkKW,  "nil",    EXPR_END],
+    [:TkTRUE,	    TkKW,  "true",   EXPR_END],
+    [:TkFALSE,      TkKW,  "false",  EXPR_END],
+    [:TkAND,	    TkKW,  "and",    EXPR_BEG],
+    [:TkOR, 	    TkKW,  "or",     EXPR_BEG],
+    [:TkNOT,	    TkKW,  "not",    EXPR_BEG],
+    [:TkIF_MOD,     TkKW],
+    [:TkUNLESS_MOD, TkKW],
+    [:TkWHILE_MOD,  TkKW],
+    [:TkUNTIL_MOD,  TkKW],
+    [:TkALIAS,      TkKW,  "alias",    EXPR_FNAME],
+    [:TkDEFINED,    TkKW,  "defined?", EXPR_END],
+    [:TklBEGIN,     TkKW,  "BEGIN",    EXPR_END],
+    [:TklEND,	    TkKW,  "END",      EXPR_END],
+    [:Tk__LINE__,   TkKW,  "__LINE__", EXPR_END],
+    [:Tk__FILE__,   TkKW,  "__FILE__", EXPR_END],
+
+    [:TkIDENTIFIER, TkId],
+    [:TkFID,	    TkId],
+    [:TkGVAR,	    TkId],
+    [:TkIVAR,	    TkId],
+    [:TkCONSTANT,   TkId],
+
+    [:TkINTEGER,    TkVal],
+    [:TkFLOAT,      TkVal],
+    [:TkSTRING,     TkVal],
+    [:TkXSTRING,    TkVal],
+    [:TkREGEXP,     TkVal],
+    [:TkCOMMENT,    TkVal],
+
+    [:TkDSTRING,    TkNode],
+    [:TkDXSTRING,   TkNode],
+    [:TkDREGEXP,    TkNode],
+    [:TkNTH_REF,    TkId],
+    [:TkBACK_REF,   TkId],
+
+    [:TkUPLUS,      TkOp,   "+@"],
+    [:TkUMINUS,     TkOp,   "-@"],
+    [:TkPOW,	    TkOp,   "**"],
+    [:TkCMP,	    TkOp,   "<=>"],
+    [:TkEQ,	    TkOp,   "=="],
+    [:TkEQQ,	    TkOp,   "==="],
+    [:TkNEQ,	    TkOp,   "!="],
+    [:TkGEQ,	    TkOp,   ">="],
+    [:TkLEQ,	    TkOp,   "<="],
+    [:TkANDOP,      TkOp,   "&&"],
+    [:TkOROP,	    TkOp,   "||"],
+    [:TkMATCH,      TkOp,   "=~"],
+    [:TkNMATCH,     TkOp,   "!~"],
+    [:TkDOT2,	    TkOp,   ".."],
+    [:TkDOT3,	    TkOp,   "..."],
+    [:TkAREF,	    TkOp,   "[]"],
+    [:TkASET,	    TkOp,   "[]="],
+    [:TkLSHFT,      TkOp,   "<<"],
+    [:TkRSHFT,      TkOp,   ">>"],
+    [:TkCOLON2,     TkOp],
+    [:TkCOLON3,     TkOp],
+#   [:OPASGN,	    TkOp],               # +=, -=  etc. #
+    [:TkASSOC,      TkOp,   "=>"],
+    [:TkQUESTION,   TkOp,   "?"],	 #?
+    [:TkCOLON,      TkOp,   ":"],        #:
+    
+    [:TkfLPAREN],         # func( #
+    [:TkfLBRACK],         # func[ #
+    [:TkfLBRACE],         # func{ #
+    [:TkSTAR],            # *arg
+    [:TkAMPER],           # &arg #
+    [:TkSYMBOL,     TkId],          # :SYMBOL
+    [:TkSYMBEG,     TkId], 
+    [:TkGT,	    TkOp,   ">"],
+    [:TkLT,	    TkOp,   "<"],
+    [:TkPLUS,	    TkOp,   "+"],
+    [:TkMINUS,      TkOp,   "-"],
+    [:TkMULT,	    TkOp,   "*"],
+    [:TkDIV,	    TkOp,   "/"],
+    [:TkMOD,	    TkOp,   "%"],
+    [:TkBITOR,      TkOp,   "|"],
+    [:TkBITXOR,     TkOp,   "^"],
+    [:TkBITAND,     TkOp,   "&"],
+    [:TkBITNOT,     TkOp,   "~"],
+    [:TkNOTOP,      TkOp,   "!"],
+
+    [:TkBACKQUOTE,  TkOp,   "`"],
+
+    [:TkASSIGN,     Token,  "="],
+    [:TkDOT,	    Token,  "."],
+    [:TkLPAREN,     Token,  "("],  #(exp)
+    [:TkLBRACK,     Token,  "["],  #[arry]
+    [:TkLBRACE,     Token,  "{"],  #{hash}
+    [:TkRPAREN,     Token,  ")"],
+    [:TkRBRACK,     Token,  "]"],
+    [:TkRBRACE,     Token,  "}"],
+    [:TkCOMMA,      Token,  ","],
+    [:TkSEMICOLON,  Token,  ";"],
+
+    [:TkRD_COMMENT],
+    [:TkSPACE],
+    [:TkNL],
+    [:TkEND_OF_SCRIPT],
+
+    [:TkBACKSLASH,  TkUnknownChar,  "\\"],
+    [:TkAT,	    TkUnknownChar,  "@"],
+    [:TkDOLLAR,     TkUnknownChar,  "\$"], #"
+  ]
+
+  # {reading => token_class}
+  # {reading => [token_class, *opt]}
+  TkReading2Token = {}
+  TkSymbol2Token = {}
+
+  def RubyToken.def_token(token_n, super_token = Token, reading = nil, *opts)
+    token_n = token_n.id2name unless token_n.kind_of?(String)
+    if RubyToken.const_defined?(token_n)
+      IRB.fail AlreadyDefinedToken, token_n
+    end
+
+    token_c =  Class.new super_token
+    RubyToken.const_set token_n, token_c
+#    token_c.inspect
+ 
+    if reading
+      if TkReading2Token[reading]
+	IRB.fail TkReading2TokenDuplicateError, token_n, reading
+      end
+      if opts.empty?
+	TkReading2Token[reading] = [token_c]
+      else
+	TkReading2Token[reading] = [token_c].concat(opts)
+      end
+    end
+    TkSymbol2Token[token_n.intern] = token_c
+
+    if token_c <= TkOp
+      token_c.class_eval %{
+        def self.op_name; "#{reading}"; end
+      }
+    end
+  end
+
+  for defs in TokenDefinitions
+    def_token(*defs)
+  end
+
+  NEWLINE_TOKEN = TkNL.new(0,0)
+  NEWLINE_TOKEN.set_text("\n")
+
+end
+
+
+
+# Lexical analyzer for Ruby source
+
+class RubyLex
+
+  ######################################################################
+  #
+  # Read an input stream character by character. We allow for unlimited
+  # ungetting of characters just read.
+  #
+  # We simplify the implementation greatly by reading the entire input
+  # into a buffer initially, and then simply traversing it using
+  # pointers.
+  #
+  # We also have to allow for the <i>here document diversion</i>. This
+  # little gem comes about when the lexer encounters a here
+  # document. At this point we effectively need to split the input
+  # stream into two parts: one to read the body of the here document,
+  # the other to read the rest of the input line where the here
+  # document was initially encountered. For example, we might have
+  #
+  #   do_something(<<-A, <<-B)
+  #     stuff
+  #     for
+  #   A
+  #     stuff
+  #     for
+  #   B
+  #
+  # When the lexer encounters the <<A, it reads until the end of the
+  # line, and keeps it around for later. It then reads the body of the
+  # here document.  Once complete, it needs to read the rest of the
+  # original line, but then skip the here document body.
+  #
+  
+  class BufferedReader
+    
+    attr_reader :line_num
+    
+    def initialize(content)
+      if /\t/ =~ content
+        tab_width = Options.instance.tab_width
+        content = content.split(/\n/).map do |line|
+          1 while line.gsub!(/\t+/) { ' ' * (tab_width*$&.length - $`.length % tab_width)}  && $~ #`
+          line
+        end .join("\n")
+      end
+      @content   = content
+      @content << "\n" unless @content[-1,1] == "\n"
+      @size      = @content.size
+      @offset    = 0
+      @hwm       = 0
+      @line_num  = 1
+      @read_back_offset = 0
+      @last_newline = 0
+      @newline_pending = false
+    end
+    
+    def column
+      @offset - @last_newline
+    end
+    
+    def getc
+      return nil if @offset >= @size
+      ch = @content[@offset, 1]
+      
+      @offset += 1
+      @hwm = @offset if @hwm < @offset
+      
+      if @newline_pending
+        @line_num += 1
+        @last_newline = @offset - 1
+        @newline_pending = false
+      end
+      
+      if ch == "\n"
+        @newline_pending = true
+      end
+      ch
+    end
+    
+    def getc_already_read
+      getc
+    end
+    
+    def ungetc(ch)
+      raise "unget past beginning of file" if @offset <= 0
+      @offset -= 1
+      if @content[@offset] == ?\n
+        @newline_pending = false
+      end
+    end
+    
+    def get_read
+      res = @content[@read_back_offset...@offset]
+      @read_back_offset = @offset
+      res
+    end
+    
+    def peek(at)
+      pos = @offset + at
+      if pos >= @size
+        nil
+      else
+        @content[pos, 1]
+      end
+    end
+    
+    def peek_equal(str)
+      @content[@offset, str.length] == str
+    end
+    
+    def divert_read_from(reserve)
+      @content[@offset, 0] = reserve
+      @size      = @content.size
+    end
+  end
+
+  # end of nested class BufferedReader
+
+  extend Exception2MessageMapper
+  def_exception(:AlreadyDefinedToken, "Already defined token(%s)")
+  def_exception(:TkReading2TokenNoKey, "key nothing(key='%s')")
+  def_exception(:TkSymbol2TokenNoKey, "key nothing(key='%s')")
+  def_exception(:TkReading2TokenDuplicateError, 
+		"key duplicate(token_n='%s', key='%s')")
+  def_exception(:SyntaxError, "%s")
+  
+  include RubyToken
+  include IRB
+
+  attr_reader :continue
+  attr_reader :lex_state
+
+  def RubyLex.debug?
+    false
+  end
+
+  def initialize(content)
+    lex_init
+
+    @reader = BufferedReader.new(content)
+
+    @exp_line_no = @line_no = 1
+    @base_char_no = 0
+    @indent = 0
+
+    @ltype = nil
+    @quoted = nil
+    @lex_state = EXPR_BEG
+    @space_seen = false
+    
+    @continue = false
+    @line = ""
+
+    @skip_space = false
+    @read_auto_clean_up = false
+    @exception_on_syntax_error = true
+  end
+
+  attr :skip_space, true
+  attr :read_auto_clean_up, true
+  attr :exception_on_syntax_error, true
+
+  attr :indent
+
+  # io functions
+  def line_no
+    @reader.line_num
+  end
+
+  def char_no
+    @reader.column
+  end
+
+  def get_read
+    @reader.get_read
+  end
+
+  def getc
+    @reader.getc
+  end
+
+  def getc_of_rests
+    @reader.getc_already_read
+  end
+
+  def gets
+    c = getc or return
+    l = ""
+    begin
+      l.concat c unless c == "\r"
+      break if c == "\n"
+    end while c = getc
+    l
+  end
+
+
+  def ungetc(c = nil)
+    @reader.ungetc(c)
+  end
+
+  def peek_equal?(str)
+    @reader.peek_equal(str)
+  end
+
+  def peek(i = 0)
+    @reader.peek(i)
+  end
+
+  def lex
+    until (((tk = token).kind_of?(TkNL) || tk.kind_of?(TkEND_OF_SCRIPT)) &&
+	     !@continue or
+	     tk.nil?)
+    end
+    line = get_read
+
+    if line == "" and tk.kind_of?(TkEND_OF_SCRIPT) || tk.nil?
+      nil
+    else
+      line
+    end
+  end
+
+  def token
+    set_token_position(line_no, char_no)
+    begin
+      begin
+	tk = @OP.match(self)
+	@space_seen = tk.kind_of?(TkSPACE)
+      rescue SyntaxError
+	abort if @exception_on_syntax_error
+	tk = TkError.new(line_no, char_no)
+      end
+    end while @skip_space and tk.kind_of?(TkSPACE)
+    if @read_auto_clean_up
+      get_read
+    end
+#   throw :eof unless tk
+    p tk if $DEBUG
+    tk
+  end
+  
+  ENINDENT_CLAUSE = [
+    "case", "class", "def", "do", "for", "if",
+    "module", "unless", "until", "while", "begin" #, "when"
+  ]
+  DEINDENT_CLAUSE = ["end" #, "when"
+  ]
+
+  PERCENT_LTYPE = {
+    "q" => "\'",
+    "Q" => "\"",
+    "x" => "\`",
+    "r" => "/",
+    "w" => "]"
+  }
+  
+  PERCENT_PAREN = {
+    "{" => "}",
+    "[" => "]",
+    "<" => ">",
+    "(" => ")"
+  }
+
+  Ltype2Token = {
+    "\'" => TkSTRING,
+    "\"" => TkSTRING,
+    "\`" => TkXSTRING,
+    "/" => TkREGEXP,
+    "]" => TkDSTRING
+  }
+  Ltype2Token.default = TkSTRING
+
+  DLtype2Token = {
+    "\"" => TkDSTRING,
+    "\`" => TkDXSTRING,
+    "/" => TkDREGEXP,
+  }
+
+  def lex_init()
+    @OP = SLex.new
+    @OP.def_rules("\0", "\004", "\032") do |chars, io|
+      Token(TkEND_OF_SCRIPT).set_text(chars)
+    end
+
+    @OP.def_rules(" ", "\t", "\f", "\r", "\13") do |chars, io|
+      @space_seen = TRUE
+      while (ch = getc) =~ /[ \t\f\r\13]/
+        chars << ch
+      end
+      ungetc
+      Token(TkSPACE).set_text(chars)
+    end
+
+    @OP.def_rule("#") do
+      |op, io|
+      identify_comment
+    end
+
+    @OP.def_rule("=begin", proc{@prev_char_no == 0 && peek(0) =~ /\s/}) do
+      |op, io|
+      str = op
+      @ltype = "="
+
+
+      begin
+        line = ""
+        begin
+          ch = getc
+          line << ch
+        end until ch == "\n"
+        str << line
+      end until line =~ /^=end/
+
+      ungetc
+
+      @ltype = nil
+
+      if str =~ /\A=begin\s+rdoc/i
+        str.sub!(/\A=begin.*\n/, '')
+        str.sub!(/^=end.*/m, '')
+        Token(TkCOMMENT).set_text(str)
+      else
+        Token(TkRD_COMMENT)#.set_text(str)
+      end
+    end
+
+    @OP.def_rule("\n") do
+      print "\\n\n" if RubyLex.debug?
+      case @lex_state
+      when EXPR_BEG, EXPR_FNAME, EXPR_DOT
+	@continue = TRUE
+      else
+	@continue = FALSE
+	@lex_state = EXPR_BEG
+      end
+      Token(TkNL).set_text("\n")
+    end
+
+    @OP.def_rules("*", "**",	
+		  "!", "!=", "!~",
+		  "=", "==", "===", 
+		  "=~", "<=>",	
+		  "<", "<=",
+		  ">", ">=", ">>") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token(op).set_text(op)
+    end
+
+    @OP.def_rules("<<") do
+      |op, io|
+      tk = nil
+      if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
+	  (@lex_state != EXPR_ARG || @space_seen)
+	c = peek(0)
+	if /[-\w_\"\'\`]/ =~ c
+	  tk = identify_here_document
+	end
+      end
+      if !tk
+        @lex_state = EXPR_BEG
+        tk = Token(op).set_text(op)
+      end
+      tk
+    end
+
+    @OP.def_rules("'", '"') do
+      |op, io|
+      identify_string(op)
+    end
+
+    @OP.def_rules("`") do
+      |op, io|
+      if @lex_state == EXPR_FNAME
+	Token(op).set_text(op)
+      else
+	identify_string(op)
+      end
+    end
+
+    @OP.def_rules('?') do
+      |op, io|
+      if @lex_state == EXPR_END
+	@lex_state = EXPR_BEG
+	Token(TkQUESTION).set_text(op)
+      else
+	ch = getc
+	if @lex_state == EXPR_ARG && ch !~ /\s/
+	  ungetc
+	  @lex_state = EXPR_BEG;
+	  Token(TkQUESTION).set_text(op)
+	else
+          str = op
+          str << ch
+	  if (ch == '\\') #'
+	    str << read_escape
+	  end
+	  @lex_state = EXPR_END
+	  Token(TkINTEGER).set_text(str)
+	end
+      end
+    end
+
+    @OP.def_rules("&", "&&", "|", "||") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token(op).set_text(op)
+    end
+    
+    @OP.def_rules("+=", "-=", "*=", "**=", 
+		  "&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      op =~ /^(.*)=$/
+      Token(TkOPASGN, $1).set_text(op)
+    end
+
+    @OP.def_rule("+@", proc{@lex_state == EXPR_FNAME}) do |op, io|
+      Token(TkUPLUS).set_text(op)
+    end
+
+    @OP.def_rule("-@", proc{@lex_state == EXPR_FNAME}) do |op, io|
+      Token(TkUMINUS).set_text(op)
+    end
+
+    @OP.def_rules("+", "-") do
+      |op, io|
+      catch(:RET) do
+	if @lex_state == EXPR_ARG
+	  if @space_seen and peek(0) =~ /[0-9]/
+	    throw :RET, identify_number(op)
+	  else
+	    @lex_state = EXPR_BEG
+	  end
+	elsif @lex_state != EXPR_END and peek(0) =~ /[0-9]/
+	  throw :RET, identify_number(op)
+	else
+	  @lex_state = EXPR_BEG
+	end
+	Token(op).set_text(op)
+      end
+    end
+
+    @OP.def_rule(".") do
+      @lex_state = EXPR_BEG
+      if peek(0) =~ /[0-9]/
+	ungetc
+	identify_number("")
+      else
+	# for obj.if
+	@lex_state = EXPR_DOT
+	Token(TkDOT).set_text(".")
+      end
+    end
+
+    @OP.def_rules("..", "...") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token(op).set_text(op)
+    end
+
+    lex_int2
+  end
+  
+  def lex_int2
+    @OP.def_rules("]", "}", ")") do
+      |op, io|
+      @lex_state = EXPR_END
+      @indent -= 1
+      Token(op).set_text(op)
+    end
+
+    @OP.def_rule(":") do
+      if @lex_state == EXPR_END || peek(0) =~ /\s/
+	@lex_state = EXPR_BEG
+	tk = Token(TkCOLON)
+      else
+	@lex_state = EXPR_FNAME;
+	tk = Token(TkSYMBEG)
+      end
+      tk.set_text(":")
+    end
+
+    @OP.def_rule("::") do
+#      p @lex_state.id2name, @space_seen
+      if @lex_state == EXPR_BEG or @lex_state == EXPR_ARG && @space_seen
+	@lex_state = EXPR_BEG
+	tk = Token(TkCOLON3)
+      else
+	@lex_state = EXPR_DOT
+	tk = Token(TkCOLON2)
+      end
+      tk.set_text("::")
+    end
+
+    @OP.def_rule("/") do
+      |op, io|
+      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+	identify_string(op)
+      elsif peek(0) == '='
+	getc
+	@lex_state = EXPR_BEG
+	Token(TkOPASGN, :/).set_text("/=") #")
+      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
+	identify_string(op)
+      else 
+	@lex_state = EXPR_BEG
+        Token("/").set_text(op)
+      end
+    end
+
+    @OP.def_rules("^") do
+      @lex_state = EXPR_BEG
+      Token("^").set_text("^")
+    end
+
+    #       @OP.def_rules("^=") do
+    # 	@lex_state = EXPR_BEG
+    # 	Token(TkOPASGN, :^)
+    #       end
+    
+    @OP.def_rules(",", ";") do
+      |op, io|
+      @lex_state = EXPR_BEG
+      Token(op).set_text(op)
+    end
+
+    @OP.def_rule("~") do
+      @lex_state = EXPR_BEG
+      Token("~").set_text("~")
+    end
+
+    @OP.def_rule("~@", proc{@lex_state = EXPR_FNAME}) do
+      @lex_state = EXPR_BEG
+      Token("~").set_text("~@")
+    end
+    
+    @OP.def_rule("(") do
+      @indent += 1
+      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+	@lex_state = EXPR_BEG
+	tk = Token(TkfLPAREN)
+      else
+	@lex_state = EXPR_BEG
+	tk = Token(TkLPAREN)
+      end
+      tk.set_text("(")
+    end
+
+    @OP.def_rule("[]", proc{@lex_state == EXPR_FNAME}) do
+      Token("[]").set_text("[]")
+    end
+
+    @OP.def_rule("[]=", proc{@lex_state == EXPR_FNAME}) do
+      Token("[]=").set_text("[]=")
+    end
+
+    @OP.def_rule("[") do
+      @indent += 1
+      if @lex_state == EXPR_FNAME
+	t = Token(TkfLBRACK)
+      else
+	if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+	  t = Token(TkLBRACK)
+	elsif @lex_state == EXPR_ARG && @space_seen
+	  t = Token(TkLBRACK)
+	else
+	  t = Token(TkfLBRACK)
+	end
+	@lex_state = EXPR_BEG
+      end
+      t.set_text("[")
+    end
+
+    @OP.def_rule("{") do
+      @indent += 1
+      if @lex_state != EXPR_END && @lex_state != EXPR_ARG
+	t = Token(TkLBRACE)
+      else
+	t = Token(TkfLBRACE)
+      end
+      @lex_state = EXPR_BEG
+      t.set_text("{")
+    end
+
+    @OP.def_rule('\\') do   #'
+      if getc == "\n" 
+	@space_seen = true
+	@continue = true
+	Token(TkSPACE).set_text("\\\n")
+      else 
+	ungetc
+	Token("\\").set_text("\\")  #"
+      end 
+    end 
+
+    @OP.def_rule('%') do
+      |op, io|
+      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+	identify_quotation('%')
+      elsif peek(0) == '='
+	getc
+	Token(TkOPASGN, "%").set_text("%=")
+      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
+	identify_quotation('%')
+      else
+	@lex_state = EXPR_BEG
+	Token("%").set_text("%")
+      end
+    end
+
+    @OP.def_rule('$') do  #'
+      identify_gvar
+    end
+
+    @OP.def_rule('@') do
+      if peek(0) =~ /[@\w_]/
+	ungetc
+	identify_identifier
+      else
+	Token("@").set_text("@")
+      end
+    end
+
+    #       @OP.def_rule("def", proc{|op, io| /\s/ =~ io.peek(0)}) do 
+    # 	|op, io|
+    # 	@indent += 1
+    # 	@lex_state = EXPR_FNAME
+    # #	@lex_state = EXPR_END
+    # #	until @rests[0] == "\n" or @rests[0] == ";"
+    # #	  rests.shift
+    # #	end
+    #       end
+
+    @OP.def_rule("__END__", proc{@prev_char_no == 0 && peek(0) =~ /[\r\n]/}) do
+      throw :eof
+    end
+
+    @OP.def_rule("") do
+      |op, io|
+      printf "MATCH: start %s: %s\n", op, io.inspect if RubyLex.debug?
+      if peek(0) =~ /[0-9]/
+	t = identify_number("")
+      elsif peek(0) =~ /[\w_]/
+	t = identify_identifier
+      end
+      printf "MATCH: end %s: %s\n", op, io.inspect if RubyLex.debug?
+      t
+    end
+    
+    p @OP if RubyLex.debug?
+  end
+  
+  def identify_gvar
+    @lex_state = EXPR_END
+    str = "$"
+
+    tk = case ch = getc
+         when /[~_*$?!@\/\\;,=:<>".]/   #"
+           str << ch
+           Token(TkGVAR, str)
+           
+         when "-"
+           str << "-" << getc
+           Token(TkGVAR, str)
+           
+         when "&", "`", "'", "+"
+           str << ch
+           Token(TkBACK_REF, str)
+           
+         when /[1-9]/
+           str << ch
+           while (ch = getc) =~ /[0-9]/
+             str << ch
+           end
+           ungetc
+           Token(TkNTH_REF)
+         when /\w/
+           ungetc
+           ungetc
+           return identify_identifier
+         else 
+           ungetc
+           Token("$")     
+         end
+    tk.set_text(str)
+  end
+  
+  def identify_identifier
+    token = ""
+    token.concat getc if peek(0) =~ /[$@]/
+    token.concat getc if peek(0) == "@"
+
+    while (ch = getc) =~ /\w|_/
+      print ":", ch, ":" if RubyLex.debug?
+      token.concat ch
+    end
+    ungetc
+    
+    if ch == "!" or ch == "?"
+      token.concat getc
+    end
+    # fix token
+
+    # $stderr.puts "identifier - #{token}, state = #@lex_state"
+
+    case token
+    when /^\$/
+      return Token(TkGVAR, token).set_text(token)
+    when /^\@/
+      @lex_state = EXPR_END
+      return Token(TkIVAR, token).set_text(token)
+    end
+    
+    if @lex_state != EXPR_DOT
+      print token, "\n" if RubyLex.debug?
+
+      token_c, *trans = TkReading2Token[token]
+      if token_c
+	# reserved word?
+
+	if (@lex_state != EXPR_BEG &&
+	    @lex_state != EXPR_FNAME &&
+	    trans[1])
+	  # modifiers
+	  token_c = TkSymbol2Token[trans[1]]
+	  @lex_state = trans[0]
+	else
+	  if @lex_state != EXPR_FNAME
+	    if ENINDENT_CLAUSE.include?(token)
+	      @indent += 1
+	    elsif DEINDENT_CLAUSE.include?(token)
+	      @indent -= 1
+	    end
+	    @lex_state = trans[0]
+	  else
+	    @lex_state = EXPR_END
+	  end
+	end
+	return Token(token_c, token).set_text(token)
+      end
+    end
+
+    if @lex_state == EXPR_FNAME
+      @lex_state = EXPR_END
+      if peek(0) == '='
+	token.concat getc
+      end
+    elsif @lex_state == EXPR_BEG || @lex_state == EXPR_DOT
+      @lex_state = EXPR_ARG
+    else
+      @lex_state = EXPR_END
+    end
+
+    if token[0, 1] =~ /[A-Z]/
+      return Token(TkCONSTANT, token).set_text(token)
+    elsif token[token.size - 1, 1] =~ /[!?]/
+      return Token(TkFID, token).set_text(token)
+    else
+      return Token(TkIDENTIFIER, token).set_text(token)
+    end
+  end
+
+  def identify_here_document
+    ch = getc
+    if ch == "-"
+      ch = getc
+      indent = true
+    end
+    if /['"`]/ =~ ch            # '
+      lt = ch
+      quoted = ""
+      while (c = getc) && c != lt
+	quoted.concat c
+      end
+    else
+      lt = '"'
+      quoted = ch.dup
+      while (c = getc) && c =~ /\w/
+	quoted.concat c
+      end
+      ungetc
+    end
+
+    ltback, @ltype = @ltype, lt
+    reserve = ""
+
+    while ch = getc
+      reserve << ch
+      if ch == "\\"    #"
+        ch = getc
+	reserve << ch
+      elsif ch == "\n"
+	break
+      end
+    end
+
+    str = ""
+    while (l = gets)
+      l.chomp!
+      l.strip! if indent
+      break if l == quoted
+      str << l.chomp << "\n"
+    end
+
+    @reader.divert_read_from(reserve)
+
+    @ltype = ltback
+    @lex_state = EXPR_END
+    Token(Ltype2Token[lt], str).set_text(str.dump)
+  end
+  
+  def identify_quotation(initial_char)
+    ch = getc
+    if lt = PERCENT_LTYPE[ch]
+      initial_char += ch
+      ch = getc
+    elsif ch =~ /\W/
+      lt = "\""
+    else
+      RubyLex.fail SyntaxError, "unknown type of %string ('#{ch}')"
+    end
+#     if ch !~ /\W/
+#       ungetc
+#       next
+#     end
+    #@ltype = lt
+    @quoted = ch unless @quoted = PERCENT_PAREN[ch]
+    identify_string(lt, @quoted, ch, initial_char)
+  end
+
+  def identify_number(start)
+    str = start.dup
+
+    if start == "+" or start == "-" or start == ""
+      start = getc
+      str << start
+    end
+
+    @lex_state = EXPR_END
+
+    if start == "0"
+      if peek(0) == "x"
+        ch = getc
+        str << ch
+        match = /[0-9a-f_]/
+      else
+        match = /[0-7_]/
+      end
+      while ch = getc
+        if ch !~ match
+          ungetc
+          break
+        else
+          str << ch
+        end
+      end
+      return Token(TkINTEGER).set_text(str)
+    end
+
+    type = TkINTEGER
+    allow_point = TRUE
+    allow_e = TRUE
+    while ch = getc
+      case ch
+      when /[0-9_]/
+        str << ch
+
+      when allow_point && "."
+	type = TkFLOAT
+	if peek(0) !~ /[0-9]/
+	  ungetc
+	  break
+	end
+        str << ch
+	allow_point = false
+
+      when allow_e && "e", allow_e && "E"
+        str << ch
+	type = TkFLOAT
+	if peek(0) =~ /[+-]/
+	  str << getc
+	end
+	allow_e = false
+	allow_point = false
+      else
+	ungetc
+	break
+      end
+    end
+    Token(type).set_text(str)
+  end
+  
+  def identify_string(ltype, quoted = ltype, opener=nil, initial_char = nil)
+    @ltype = ltype
+    @quoted = quoted
+    subtype = nil
+
+    str = ""
+    str << initial_char if initial_char
+    str << (opener||quoted)
+
+    nest = 0
+    begin
+      while ch = getc 
+	str << ch
+	if @quoted == ch 
+          if nest == 0
+            break
+          else
+            nest -= 1
+          end
+        elsif opener == ch
+          nest += 1
+	elsif @ltype != "'" && @ltype != "]" and ch == "#"
+          ch = getc
+          if ch == "{"
+            subtype = true
+            str << ch << skip_inner_expression
+          else
+            ungetc(ch)
+          end
+	elsif ch == '\\' #'
+	  str << read_escape
+	end
+      end
+      if @ltype == "/"
+	if peek(0) =~ /i|o|n|e|s/
+	  str << getc
+	end
+      end
+      if subtype
+	Token(DLtype2Token[ltype], str)
+      else
+	Token(Ltype2Token[ltype], str)
+      end.set_text(str)
+    ensure
+      @ltype = nil
+      @quoted = nil
+      @lex_state = EXPR_END
+    end
+  end
+
+  def skip_inner_expression
+    res = ""
+    nest = 0
+    while (ch = getc)
+      res << ch
+      if ch == '}'
+        break if nest.zero?
+        nest -= 1
+      elsif ch == '{'
+        nest += 1
+      end
+    end
+    res
+  end
+
+  def identify_comment
+    @ltype = "#"
+    comment = "#"
+    while ch = getc
+      if ch == "\\"
+        ch = getc
+        if ch == "\n"
+          ch = " "
+        else
+          comment << "\\" 
+        end
+      else
+        if ch == "\n"
+          @ltype = nil
+          ungetc
+          break
+        end
+      end
+      comment << ch
+    end
+    return Token(TkCOMMENT).set_text(comment)
+  end
+  
+  def read_escape
+    res = ""
+    case ch = getc
+    when /[0-7]/
+      ungetc ch
+      3.times do
+	case ch = getc
+	when /[0-7]/
+	when nil
+	  break
+	else
+	  ungetc
+	  break
+	end
+        res << ch
+      end
+      
+    when "x"
+      res << ch
+      2.times do
+	case ch = getc
+	when /[0-9a-fA-F]/
+	when nil
+	  break
+	else
+	  ungetc
+	  break
+	end
+        res << ch
+      end
+
+    when "M"
+      res << ch
+      if (ch = getc) != '-'
+	ungetc
+      else
+        res << ch
+	if (ch = getc) == "\\" #"
+          res << ch
+	  res << read_escape
+        else
+          res << ch
+	end
+      end
+
+    when "C", "c" #, "^"
+      res << ch
+      if ch == "C" and (ch = getc) != "-"
+	ungetc
+      else
+        res << ch
+        if (ch = getc) == "\\" #"
+          res << ch
+          res << read_escape
+        else
+          res << ch
+        end
+      end
+    else
+      res << ch
+    end
+    res
+  end
+end
+
+
+
+# Extract code elements from a source file, returning a TopLevel
+# object containing the constituent file elements.
+#
+# This file is based on rtags
+
+module RDoc
+
+  GENERAL_MODIFIERS = [ 'nodoc' ].freeze
+
+  CLASS_MODIFIERS = GENERAL_MODIFIERS
+
+  ATTR_MODIFIERS  = GENERAL_MODIFIERS
+
+  CONSTANT_MODIFIERS = GENERAL_MODIFIERS
+
+  METHOD_MODIFIERS = GENERAL_MODIFIERS + 
+    [ 'arg', 'args', 'yield', 'yields', 'notnew', 'not-new', 'not_new', 'doc' ]
+
+
+  class RubyParser
+    include RubyToken
+    include TokenStream
+
+    extend ParserFactory
+
+    parse_files_matching(/\.rbw?$/)
+
+
+    def initialize(top_level, file_name, content, options, stats)
+      @options = options
+      @stats   = stats
+      @size = 0
+      @token_listeners = nil
+      @input_file_name = file_name
+      @scanner = RubyLex.new(content)
+      @scanner.exception_on_syntax_error = false
+      @top_level = top_level
+      @progress = $stderr unless options.quiet
+    end
+
+    def scan
+      @tokens = []
+      @unget_read = []
+      @read = []
+      catch(:eof) do
+        catch(:enddoc) do
+          begin
+            parse_toplevel_statements(@top_level)
+          rescue Exception => e
+            $stderr.puts "\n\n"
+            $stderr.puts "RDoc failure in #@input_file_name at or around " +
+                         "line #{@scanner.line_no} column #{@scanner.char_no}"
+            $stderr.puts 
+            $stderr.puts "Before reporting this, could you check that the file"
+            $stderr.puts "you're documenting compiles cleanly--RDoc is not a"
+            $stderr.puts "full Ruby parser, and gets confused easily if fed"
+            $stderr.puts "invalid programs."
+            $stderr.puts
+            $stderr.puts "The internal error was:\n\n"
+            
+            e.set_backtrace(e.backtrace[0,4])
+            raise
+          end
+        end
+      end
+      @top_level
+    end
+
+    private 
+
+    def make_message(msg)
+      prefix = "\n" + @input_file_name + ":"
+      if @scanner
+        prefix << "#{@scanner.line_no}:#{@scanner.char_no}: "
+      end
+      return prefix + msg
+    end
+
+    def warn(msg)
+      return if @options.quiet
+      msg = make_message msg
+      $stderr.puts msg
+    end
+
+    def error(msg)
+      msg = make_message msg
+      $stderr.puts msg
+      exit(1)
+    end
+
+    def progress(char)
+      unless @options.quiet
+        @progress.print(char)
+	@progress.flush
+      end
+    end
+
+    def add_token_listener(obj)
+      @token_listeners ||= []
+      @token_listeners << obj
+    end
+
+    def remove_token_listener(obj)
+      @token_listeners.delete(obj)
+    end
+
+    def get_tk
+      tk = nil
+      if @tokens.empty?
+	tk = @scanner.token
+	@read.push @scanner.get_read
+	puts "get_tk1 => #{tk.inspect}" if $TOKEN_DEBUG
+      else
+	@read.push @unget_read.shift
+	tk = @tokens.shift
+	puts "get_tk2 => #{tk.inspect}" if $TOKEN_DEBUG
+      end
+
+      if tk.kind_of?(TkSYMBEG)
+        set_token_position(tk.line_no, tk.char_no)
+        tk1 = get_tk
+        if tk1.kind_of?(TkId) || tk1.kind_of?(TkOp)
+          tk = Token(TkSYMBOL).set_text(":" + tk1.name)
+          # remove the identifier we just read (we're about to
+          # replace it with a symbol)
+          @token_listeners.each do |obj|
+            obj.pop_token
+          end if @token_listeners
+        else
+          warn("':' not followed by identifier or operator")
+          tk = tk1
+        end
+      end
+
+      # inform any listeners of our shiny new token
+      @token_listeners.each do |obj|
+        obj.add_token(tk)
+      end if @token_listeners
+
+      tk
+    end
+
+    def peek_tk
+      unget_tk(tk = get_tk)
+      tk
+    end
+
+    def unget_tk(tk)
+      @tokens.unshift tk
+      @unget_read.unshift @read.pop
+
+      # Remove this token from any listeners
+      @token_listeners.each do |obj|
+        obj.pop_token
+      end if @token_listeners
+    end
+
+    def skip_tkspace(skip_nl = true)
+      tokens = []
+      while ((tk = get_tk).kind_of?(TkSPACE) ||
+	     (skip_nl && tk.kind_of?(TkNL)))
+	tokens.push tk
+      end
+      unget_tk(tk)
+      tokens
+    end
+
+    def get_tkread
+      read = @read.join("")
+      @read = []
+      read
+    end
+
+    def peek_read
+      @read.join('')
+    end
+
+    NORMAL = "::"
+    SINGLE = "<<"
+
+    # Look for the first comment in a file that isn't
+    # a shebang line.
+
+    def collect_first_comment
+      skip_tkspace
+      res = ''
+      first_line = true
+
+      tk = get_tk
+      while tk.kind_of?(TkCOMMENT)
+        if first_line && tk.text[0,2] == "#!"
+          skip_tkspace
+          tk = get_tk
+        else
+          res << tk.text << "\n"
+          tk = get_tk
+          if tk.kind_of? TkNL
+            skip_tkspace(false)
+            tk = get_tk
+          end
+        end
+        first_line = false
+      end
+      unget_tk(tk)
+      res
+    end
+
+    def parse_toplevel_statements(container)
+      comment = collect_first_comment
+      look_for_directives_in(container, comment)
+      container.comment = comment unless comment.empty?
+      parse_statements(container, NORMAL, nil, comment)
+    end
+    
+    def parse_statements(container, single=NORMAL, current_method=nil, comment='')
+      nest = 1
+      save_visibility = container.visibility
+      
+#      if container.kind_of?(TopLevel)
+#      else
+#        comment = ''
+#      end
+
+      non_comment_seen = true
+      
+      while tk = get_tk
+        
+        keep_comment = false
+        
+        non_comment_seen = true unless tk.kind_of?(TkCOMMENT)
+        
+	case tk
+
+        when TkNL
+          skip_tkspace(true)   # Skip blanks and newlines
+          tk = get_tk
+          if tk.kind_of?(TkCOMMENT)
+            if non_comment_seen
+              comment = ''
+              non_comment_seen = false
+            end
+            while tk.kind_of?(TkCOMMENT)
+              comment << tk.text << "\n"
+              tk = get_tk          # this is the newline 
+              skip_tkspace(false)  # leading spaces
+              tk = get_tk
+            end
+            unless comment.empty?
+              look_for_directives_in(container, comment) 
+              if container.done_documenting
+                container.ongoing_visibility = save_visibility
+#                return
+              end
+            end
+            keep_comment = true
+          else
+            non_comment_seen = true
+          end
+          unget_tk(tk)
+          keep_comment = true
+
+
+	when TkCLASS
+	  if container.document_children
+            parse_class(container, single, tk, comment)
+	  else
+	    nest += 1
+          end
+
+	when TkMODULE
+	  if container.document_children
+            parse_module(container, single, tk, comment)
+	  else
+	    nest += 1
+          end
+
+	when TkDEF
+	  if container.document_self
+	    parse_method(container, single, tk, comment)
+	  else
+	    nest += 1
+          end
+
+        when TkCONSTANT
+          if container.document_self
+            parse_constant(container, single, tk, comment)
+          end
+
+	when TkALIAS
+ 	  if container.document_self
+	    parse_alias(container, single, tk, comment)
+	  end
+
+        when TkYIELD
+          if current_method.nil?
+            warn("Warning: yield outside of method") if container.document_self
+          else
+            parse_yield(container, single, tk, current_method)
+          end
+
+          # Until and While can have a 'do', which shouldn't increas
+          # the nesting. We can't solve the general case, but we can
+          # handle most occurrences by ignoring a do at the end of a line
+
+        when  TkUNTIL, TkWHILE
+          nest += 1
+          puts "FOUND #{tk.class} in #{container.name}, nest = #{nest}, " +
+            "line #{tk.line_no}" if $DEBUG
+          skip_optional_do_after_expression
+
+          # 'for' is trickier
+        when TkFOR
+          nest += 1
+          puts "FOUND #{tk.class} in #{container.name}, nest = #{nest}, " +
+            "line #{tk.line_no}" if $DEBUG
+          skip_for_variable
+          skip_optional_do_after_expression
+
+	when TkCASE, TkDO, TkIF, TkUNLESS, TkBEGIN
+	  nest += 1
+          puts "Found #{tk.class} in #{container.name}, nest = #{nest}, " +
+            "line #{tk.line_no}" if $DEBUG
+
+	when TkIDENTIFIER
+          if nest == 1 and current_method.nil?
+            case tk.name
+            when "private", "protected", "public",
+                 "private_class_method", "public_class_method"
+              parse_visibility(container, single, tk)
+              keep_comment = true
+            when "attr"
+              parse_attr(container, single, tk, comment)
+            when /^attr_(reader|writer|accessor)$/, @options.extra_accessors
+              parse_attr_accessor(container, single, tk, comment)
+            when "alias_method"
+              if container.document_self
+	        parse_alias(container, single, tk, comment)
+	      end
+            end
+	  end
+	  
+	  case tk.name
+	  when "require"
+	    parse_require(container, comment)
+	  when "include"
+	    parse_include(container, comment)
+	  end
+
+
+	when TkEND
+          nest -= 1
+          puts "Found 'end' in #{container.name}, nest = #{nest}, line #{tk.line_no}" if $DEBUG
+          puts "Method = #{current_method.name}" if $DEBUG and current_method
+	  if nest == 0
+            read_documentation_modifiers(container, CLASS_MODIFIERS)
+            container.ongoing_visibility = save_visibility
+            return
+          end
+
+	end
+
+        comment = '' unless keep_comment
+	begin
+	  get_tkread
+	  skip_tkspace(false)
+	end while peek_tk == TkNL
+
+      end
+    end
+    
+    def parse_class(container, single, tk, comment, &block)
+      progress("c")
+
+      @stats.num_classes += 1
+
+      container, name_t = get_class_or_module(container)
+
+      case name_t
+      when TkCONSTANT
+	name = name_t.name
+        superclass = "Object"
+
+        if peek_tk.kind_of?(TkLT)
+          get_tk
+          skip_tkspace(true)
+          superclass = get_class_specification
+          superclass = "<unknown>" if superclass.empty?
+        end
+
+	if single == SINGLE
+	  cls_type = SingleClass
+	else
+	  cls_type = NormalClass
+	end
+
+        cls = container.add_class(cls_type, name, superclass)
+        read_documentation_modifiers(cls, CLASS_MODIFIERS)
+        cls.record_location(@top_level)
+	parse_statements(cls)
+        cls.comment = comment
+
+      when TkLSHFT
+	case name = get_class_specification
+	when "self", container.name
+	  parse_statements(container, SINGLE, &block)
+	else
+          other = TopLevel.find_class_named(name)
+          unless other
+#            other = @top_level.add_class(NormalClass, name, nil)
+#            other.record_location(@top_level)
+#            other.comment = comment
+            other = NormalClass.new("Dummy", nil)
+          end
+          read_documentation_modifiers(other, CLASS_MODIFIERS)
+          parse_statements(other, SINGLE, &block)
+	end
+
+      else
+	warn("Expected class name or '<<'. Got #{name_t.class}: #{name_t.text.inspect}")
+      end
+    end
+
+    def parse_module(container, single, tk, comment)
+      progress("m")
+      @stats.num_modules += 1
+      container, name_t  = get_class_or_module(container)
+#      skip_tkspace
+      name = name_t.name
+      mod = container.add_module(NormalModule, name)
+      mod.record_location(@top_level)
+      read_documentation_modifiers(mod, CLASS_MODIFIERS)
+      parse_statements(mod)
+      mod.comment = comment
+    end
+
+    # Look for the name of a class of module (optionally with a leading :: or
+    # with :: separated named) and return the ultimate name and container
+
+    def get_class_or_module(container)
+      skip_tkspace
+      name_t = get_tk
+
+      # class ::A -> A is in the top level
+      if name_t.kind_of?(TkCOLON2)
+        name_t = get_tk
+        container = @top_level
+      end
+
+      skip_tkspace(false)
+
+      while peek_tk.kind_of?(TkCOLON2)
+        prev_container = container
+        container = container.find_module_named(name_t.name)
+        if !container
+#          warn("Couldn't find module #{name_t.name}")
+          container = prev_container.add_module(NormalModule, name_t.name)
+        end
+        get_tk
+        name_t = get_tk
+      end
+      skip_tkspace(false)
+      return [container, name_t]
+    end
+
+    def parse_constant(container, single, tk, comment)
+      name = tk.name
+      skip_tkspace(false)
+      eq_tk = get_tk
+
+      unless eq_tk.kind_of?(TkASSIGN)
+        unget_tk(eq_tk)
+        return
+      end
+
+
+      nest = 0
+      get_tkread
+
+      tk = get_tk
+      if tk.kind_of? TkGT
+        unget_tk(tk)
+        unget_tk(eq_tk)
+        return
+      end
+
+      loop do
+        puts("Param: #{tk}, #{@scanner.continue} " +
+          "#{@scanner.lex_state} #{nest}")  if $DEBUG
+
+        case tk
+        when TkSEMICOLON
+          break
+        when TkLPAREN, TkfLPAREN
+          nest += 1
+        when TkRPAREN
+          nest -= 1
+        when TkCOMMENT
+          if nest <= 0 && @scanner.lex_state == EXPR_END
+            unget_tk(tk)
+            break
+          end
+        when TkNL
+          if (@scanner.lex_state == EXPR_END and nest <= 0) || !@scanner.continue
+            unget_tk(tk)
+            break
+          end
+        end
+        tk = get_tk
+      end
+
+      res = get_tkread.tr("\n", " ").strip
+      res = "" if res == ";"
+      con = Constant.new(name, res, comment)
+      read_documentation_modifiers(con, CONSTANT_MODIFIERS)
+      if con.document_self
+	container.add_constant(con)
+      end
+    end
+
+    def parse_method(container, single, tk, comment)
+      progress(".")
+      @stats.num_methods += 1
+      line_no = tk.line_no
+      column  = tk.char_no
+      
+      start_collecting_tokens
+      add_token(tk)
+      add_token_listener(self)
+      
+      @scanner.instance_eval{@lex_state = EXPR_FNAME}
+      skip_tkspace(false)
+      name_t = get_tk
+      back_tk = skip_tkspace
+      meth = nil
+      added_container = false
+
+      dot = get_tk
+      if dot.kind_of?(TkDOT) or dot.kind_of?(TkCOLON2)
+	@scanner.instance_eval{@lex_state = EXPR_FNAME}
+	skip_tkspace
+	name_t2 = get_tk
+	case name_t
+	when TkSELF
+	  name = name_t2.name
+	when TkCONSTANT
+          name = name_t2.name
+          prev_container = container
+          container = container.find_module_named(name_t.name)
+          if !container
+            added_container = true
+            obj = name_t.name.split("::").inject(Object) do |state, item|
+              state.const_get(item)
+            end rescue nil
+
+            type = obj.class == Class ? NormalClass : NormalModule
+            if not [Class, Module].include?(obj.class)
+              warn("Couldn't find #{name_t.name}. Assuming it's a module")
+            end
+
+            if type == NormalClass then
+              container = prev_container.add_class(type, name_t.name, obj.superclass.name)
+            else
+              container = prev_container.add_module(type, name_t.name)
+            end
+          end
+	else
+	  # warn("Unexpected token '#{name_t2.inspect}'")
+	  # break
+          skip_method(container)
+          return
+	end
+	meth =  AnyMethod.new(get_tkread, name)
+        meth.singleton = true
+      else
+	unget_tk dot
+	back_tk.reverse_each do
+	  |tk|
+	  unget_tk tk
+	end
+	name = name_t.name
+
+        meth =  AnyMethod.new(get_tkread, name)
+        meth.singleton = (single == SINGLE)
+      end
+
+      remove_token_listener(self)
+
+      meth.start_collecting_tokens
+      indent = TkSPACE.new(1,1)
+      indent.set_text(" " * column)
+
+      meth.add_tokens([TkCOMMENT.new(line_no,
+                                     1,
+                                     "# File #{@top_level.file_absolute_name}, line #{line_no}"),
+                        NEWLINE_TOKEN,
+                        indent])
+
+      meth.add_tokens(@token_stream)
+
+      add_token_listener(meth)
+
+      @scanner.instance_eval{@continue = false}
+      parse_method_parameters(meth)
+
+      if meth.document_self
+        container.add_method(meth)
+      elsif added_container
+        container.document_self = false
+      end
+
+      # Having now read the method parameters and documentation modifiers, we
+      # now know whether we have to rename #initialize to ::new
+
+      if name == "initialize" && !meth.singleton
+        if meth.dont_rename_initialize
+          meth.visibility = :protected
+        else
+          meth.singleton = true
+          meth.name = "new"
+          meth.visibility = :public
+        end
+      end
+      
+      parse_statements(container, single, meth)
+      
+      remove_token_listener(meth)
+
+      # Look for a 'call-seq' in the comment, and override the
+      # normal parameter stuff
+
+      if comment.sub!(/:?call-seq:(.*?)^\s*\#?\s*$/m, '')
+        seq = $1
+        seq.gsub!(/^\s*\#\s*/, '')
+        meth.call_seq = seq
+      end
+      
+      meth.comment = comment
+
+    end
+    
+    def skip_method(container)
+      meth =  AnyMethod.new("", "anon")
+      parse_method_parameters(meth)
+      parse_statements(container, false, meth)
+    end
+    
+    # Capture the method's parameters. Along the way,
+    # look for a comment containing 
+    #
+    #    # yields: ....
+    #
+    # and add this as the block_params for the method
+
+    def parse_method_parameters(method)
+      res = parse_method_or_yield_parameters(method)
+      res = "(" + res + ")" unless res[0] == ?(
+      method.params = res unless method.params
+      if method.block_params.nil?
+          skip_tkspace(false)
+	  read_documentation_modifiers(method, METHOD_MODIFIERS)
+      end
+    end
+
+    def parse_method_or_yield_parameters(method=nil, modifiers=METHOD_MODIFIERS)
+      skip_tkspace(false)
+      tk = get_tk
+
+      # Little hack going on here. In the statement
+      #  f = 2*(1+yield)
+      # We see the RPAREN as the next token, so we need
+      # to exit early. This still won't catch all cases
+      # (such as "a = yield + 1"
+      end_token = case tk
+                  when TkLPAREN, TkfLPAREN
+                    TkRPAREN
+                  when TkRPAREN
+                    return ""
+                  else
+                    TkNL
+                  end
+      nest = 0
+
+      loop do
+        puts("Param: #{tk.inspect}, #{@scanner.continue} " +
+          "#{@scanner.lex_state} #{nest}")  if $DEBUG
+        case tk
+        when TkSEMICOLON
+          break
+        when TkLBRACE
+          nest += 1
+        when TkRBRACE
+          # we might have a.each {|i| yield i }
+          unget_tk(tk) if nest.zero?
+          nest -= 1
+          break if nest <= 0
+        when TkLPAREN, TkfLPAREN
+          nest += 1
+        when end_token
+          if end_token == TkRPAREN
+            nest -= 1
+            break if @scanner.lex_state == EXPR_END and nest <= 0
+          else
+            break unless @scanner.continue
+          end
+        when method && method.block_params.nil? && TkCOMMENT
+	  unget_tk(tk)
+	  read_documentation_modifiers(method, modifiers)
+        end
+        tk = get_tk
+      end
+      res = get_tkread.tr("\n", " ").strip
+      res = "" if res == ";"
+      res
+    end
+
+    # skip the var [in] part of a 'for' statement
+    def skip_for_variable
+      skip_tkspace(false)
+      tk = get_tk
+      skip_tkspace(false)
+      tk = get_tk
+      unget_tk(tk) unless tk.kind_of?(TkIN)
+    end
+
+    # while, until, and for have an optional 
+    def skip_optional_do_after_expression
+      skip_tkspace(false)
+      tk = get_tk
+      case tk
+      when TkLPAREN, TkfLPAREN
+        end_token = TkRPAREN
+      else
+        end_token = TkNL
+      end
+
+      nest = 0
+      @scanner.instance_eval{@continue = false}
+
+      loop do
+        puts("\nWhile: #{tk}, #{@scanner.continue} " +
+          "#{@scanner.lex_state} #{nest}") if $DEBUG
+        case tk
+        when TkSEMICOLON
+          break
+        when TkLPAREN, TkfLPAREN
+          nest += 1
+        when TkDO
+          break if nest.zero?
+        when end_token
+          if end_token == TkRPAREN
+            nest -= 1
+            break if @scanner.lex_state == EXPR_END and nest.zero?
+          else
+            break unless @scanner.continue
+          end
+        end
+        tk = get_tk
+      end
+      skip_tkspace(false)
+      if peek_tk.kind_of? TkDO
+        get_tk
+      end
+    end
+    
+    # Return a superclass, which can be either a constant
+    # of an expression
+
+    def get_class_specification
+      tk = get_tk
+      return "self" if tk.kind_of?(TkSELF)
+        
+      res = ""
+      while tk.kind_of?(TkCOLON2) ||
+          tk.kind_of?(TkCOLON3)   ||
+          tk.kind_of?(TkCONSTANT)   
+        
+        res += tk.text
+        tk = get_tk
+      end
+
+      unget_tk(tk)
+      skip_tkspace(false)
+
+      get_tkread # empty out read buffer
+
+      tk = get_tk
+
+      case tk
+      when TkNL, TkCOMMENT, TkSEMICOLON
+        unget_tk(tk)
+        return res
+      end
+
+      res += parse_call_parameters(tk)
+      res
+    end
+
+    def parse_call_parameters(tk)
+
+      end_token = case tk
+                  when TkLPAREN, TkfLPAREN
+                    TkRPAREN
+                  when TkRPAREN
+                    return ""
+                  else
+                    TkNL
+                  end
+      nest = 0
+
+      loop do
+        puts("Call param: #{tk}, #{@scanner.continue} " +
+          "#{@scanner.lex_state} #{nest}") if $DEBUG
+        case tk
+        when TkSEMICOLON
+          break
+        when TkLPAREN, TkfLPAREN
+          nest += 1
+        when end_token
+          if end_token == TkRPAREN
+            nest -= 1
+            break if @scanner.lex_state == EXPR_END and nest <= 0
+          else
+            break unless @scanner.continue
+          end
+        when TkCOMMENT
+	  unget_tk(tk)
+	  break
+        end
+        tk = get_tk
+      end
+      res = get_tkread.tr("\n", " ").strip
+      res = "" if res == ";"
+      res
+    end
+
+
+    # Parse a constant, which might be qualified by
+    # one or more class or module names
+
+    def get_constant
+      res = ""
+      skip_tkspace(false)
+      tk = get_tk
+
+      while tk.kind_of?(TkCOLON2) ||
+          tk.kind_of?(TkCOLON3)   ||
+          tk.kind_of?(TkCONSTANT)          
+        
+        res += tk.text
+        tk = get_tk
+      end
+
+#      if res.empty?
+#        warn("Unexpected token #{tk} in constant")
+#      end 
+      unget_tk(tk)
+      res
+    end
+
+    # Get a constant that may be surrounded by parens
+    
+    def get_constant_with_optional_parens
+      skip_tkspace(false)
+      nest = 0
+      while (tk = peek_tk).kind_of?(TkLPAREN)  || tk.kind_of?(TkfLPAREN)
+        get_tk
+        skip_tkspace(true)
+        nest += 1
+      end
+
+      name = get_constant
+
+      while nest > 0
+        skip_tkspace(true)
+        tk = get_tk
+        nest -= 1 if tk.kind_of?(TkRPAREN)
+      end
+      name
+    end
+
+    # Directives are modifier comments that can appear after class, module,
+    # or method names. For example
+    #
+    #   def fred    # :yields:  a, b
+    #
+    # or
+    #
+    #   class SM  # :nodoc:
+    #
+    # we return the directive name and any parameters as a two element array
+    
+    def read_directive(allowed)
+      tk = get_tk
+      puts "directive: #{tk.inspect}" if $DEBUG
+      result = nil
+      if tk.kind_of?(TkCOMMENT) 
+        if tk.text =~ /\s*:?(\w+):\s*(.*)/
+          directive = $1.downcase
+          if allowed.include?(directive)
+            result = [directive, $2]
+          end
+        end
+      else
+        unget_tk(tk)
+      end
+      result
+    end
+
+    
+    def read_documentation_modifiers(context, allow)
+      dir = read_directive(allow)
+
+      case dir[0]
+
+      when "notnew", "not_new", "not-new"
+        context.dont_rename_initialize = true
+
+      when "nodoc"
+        context.document_self = false
+	if dir[1].downcase == "all"
+	  context.document_children = false
+	end
+
+      when "doc"
+        context.document_self = true
+        context.force_documentation = true
+
+      when "yield", "yields"
+        unless context.params.nil?
+          context.params.sub!(/(,|)\s*&\w+/,'') # remove parameter &proc
+        end
+	context.block_params = dir[1]
+
+      when "arg", "args"
+        context.params = dir[1]
+      end if dir
+    end
+
+    
+    # Look for directives in a normal comment block:
+    #
+    #   #--       - don't display comment from this point forward
+    #  
+    #
+    # This routine modifies it's parameter
+
+    def look_for_directives_in(context, comment)
+
+      preprocess = SM::PreProcess.new(@input_file_name,
+                                      @options.rdoc_include)
+
+      preprocess.handle(comment) do |directive, param|
+        case directive
+        when "stopdoc"
+          context.stop_doc
+          ""
+        when "startdoc"
+          context.start_doc
+          context.force_documentation = true
+          ""
+
+        when "enddoc"
+          #context.done_documenting = true
+          #""
+          throw :enddoc
+
+        when "main"
+          options = Options.instance
+          options.main_page = param
+	  ""
+
+        when "title"
+          options = Options.instance
+          options.title = param
+          ""
+
+        when "section"
+          context.set_current_section(param, comment)
+          comment.replace("") # 1.8 doesn't support #clear
+          break 
+        else
+          warn "Unrecognized directive '#{directive}'"
+          break
+        end
+      end
+
+      remove_private_comments(comment)
+    end
+
+    def remove_private_comments(comment)
+      comment.gsub!(/^#--.*?^#\+\+/m, '')
+      comment.sub!(/^#--.*/m, '')
+    end
+
+
+
+    def get_symbol_or_name
+      tk = get_tk
+      case tk
+      when  TkSYMBOL
+        tk.text.sub(/^:/, '')
+      when TkId, TkOp
+        tk.name
+      when TkSTRING
+        tk.text
+      else
+        raise "Name or symbol expected (got #{tk})"
+      end
+    end
+    
+    def parse_alias(context, single, tk, comment)
+      skip_tkspace
+      if (peek_tk.kind_of? TkLPAREN)
+        get_tk
+        skip_tkspace
+      end
+      new_name = get_symbol_or_name
+      @scanner.instance_eval{@lex_state = EXPR_FNAME}
+      skip_tkspace
+      if (peek_tk.kind_of? TkCOMMA)
+        get_tk
+        skip_tkspace
+      end
+      old_name = get_symbol_or_name
+
+      al = Alias.new(get_tkread, old_name, new_name, comment)
+      read_documentation_modifiers(al, ATTR_MODIFIERS)
+      if al.document_self
+	context.add_alias(al)
+      end
+    end
+
+    def parse_yield_parameters
+      parse_method_or_yield_parameters
+    end
+
+  def parse_yield(context, single, tk, method)
+    if method.block_params.nil?
+      get_tkread
+      @scanner.instance_eval{@continue = false}
+      method.block_params = parse_yield_parameters
+    end
+  end
+
+  def parse_require(context, comment)
+    skip_tkspace_comment
+    tk = get_tk
+    if tk.kind_of? TkLPAREN
+      skip_tkspace_comment
+      tk = get_tk
+    end
+
+    name = nil
+    case tk
+    when TkSTRING
+      name = tk.text
+#    when TkCONSTANT, TkIDENTIFIER, TkIVAR, TkGVAR
+#      name = tk.name
+    when TkDSTRING
+      warn "Skipping require of dynamic string: #{tk.text}"
+ #   else
+ #     warn "'require' used as variable"
+    end
+    if name
+      context.add_require(Require.new(name, comment))
+    else
+      unget_tk(tk)
+    end
+  end
+
+  def parse_include(context, comment)
+    loop do
+      skip_tkspace_comment
+      name = get_constant_with_optional_parens
+      unless name.empty?
+        context.add_include(Include.new(name, comment))
+      end
+      return unless peek_tk.kind_of?(TkCOMMA)
+      get_tk
+    end
+  end
+
+    def get_bool
+      skip_tkspace
+      tk = get_tk
+      case tk
+      when TkTRUE
+        true
+      when TkFALSE, TkNIL
+        false
+      else
+        unget_tk tk
+        true
+      end
+    end
+
+    def parse_attr(context, single, tk, comment)
+      args = parse_symbol_arg(1)
+      if args.size > 0
+	name = args[0]
+        rw = "R"
+        skip_tkspace(false)
+        tk = get_tk
+        if tk.kind_of? TkCOMMA
+          rw = "RW" if get_bool
+        else
+          unget_tk tk
+        end
+	att = Attr.new(get_tkread, name, rw, comment)
+	read_documentation_modifiers(att, ATTR_MODIFIERS)
+	if att.document_self
+	  context.add_attribute(att)
+	end
+      else
+	warn("'attr' ignored - looks like a variable")
+      end    
+
+    end
+
+    def parse_visibility(container, single, tk)
+      singleton = (single == SINGLE)
+      vis = case tk.name
+            when "private"   then :private
+            when "protected" then :protected
+            when "public"    then :public
+            when "private_class_method"
+              singleton = true
+              :private
+            when "public_class_method"
+              singleton = true
+              :public
+            else raise "Invalid visibility: #{tk.name}"
+            end
+            
+      skip_tkspace_comment(false)
+      case peek_tk
+        # Ryan Davis suggested the extension to ignore modifiers, because he
+        # often writes
+        #
+        #   protected unless $TESTING
+        #
+      when TkNL, TkUNLESS_MOD, TkIF_MOD
+#        error("Missing argument") if singleton        
+        container.ongoing_visibility = vis
+      else
+        args = parse_symbol_arg
+        container.set_visibility_for(args, vis, singleton)
+      end
+    end
+
+    def parse_attr_accessor(context, single, tk, comment)
+      args = parse_symbol_arg
+      read = get_tkread
+      rw = "?"
+
+      # If nodoc is given, don't document any of them
+
+      tmp = CodeObject.new
+      read_documentation_modifiers(tmp, ATTR_MODIFIERS)
+      return unless tmp.document_self
+
+      case tk.name
+      when "attr_reader"   then rw = "R"
+      when "attr_writer"   then rw = "W"
+      when "attr_accessor" then rw = "RW"
+      else
+        rw = @options.extra_accessor_flags[tk.name]
+      end
+      
+      for name in args
+	att = Attr.new(get_tkread, name, rw, comment)
+        context.add_attribute(att)
+      end    
+    end
+
+    def skip_tkspace_comment(skip_nl = true)
+      loop do
+        skip_tkspace(skip_nl)
+        return unless peek_tk.kind_of? TkCOMMENT
+        get_tk
+      end
+    end
+
+    def parse_symbol_arg(no = nil)
+
+      args = []
+      skip_tkspace_comment
+      case tk = get_tk
+      when TkLPAREN
+	loop do
+	  skip_tkspace_comment
+	  if tk1 = parse_symbol_in_arg
+	    args.push tk1
+	    break if no and args.size >= no
+	  end
+	  
+	  skip_tkspace_comment
+	  case tk2 = get_tk
+	  when TkRPAREN
+	    break
+	  when TkCOMMA
+	  else
+           warn("unexpected token: '#{tk2.inspect}'") if $DEBUG
+	    break
+	  end
+	end
+      else
+	unget_tk tk
+	if tk = parse_symbol_in_arg
+	  args.push tk
+	  return args if no and args.size >= no
+	end
+
+	loop do
+#	  skip_tkspace_comment(false)
+	  skip_tkspace(false)
+
+	  tk1 = get_tk
+	  unless tk1.kind_of?(TkCOMMA) 
+	    unget_tk tk1
+	    break
+	  end
+	  
+	  skip_tkspace_comment
+	  if tk = parse_symbol_in_arg
+	    args.push tk
+	    break if no and args.size >= no
+	  end
+	end
+      end
+      args
+    end
+
+    def parse_symbol_in_arg
+      case tk = get_tk
+      when TkSYMBOL
+        tk.text.sub(/^:/, '')
+      when TkSTRING
+	eval @read[-1]
+      else
+	warn("Expected symbol or string, got #{tk.inspect}") if $DEBUG
+	nil
+      end
+    end
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rdoc/parsers/parse_simple.rb b/ruby_1_8_6/lib/rdoc/parsers/parse_simple.rb
new file mode 100644
index 0000000000..3f1a546964
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/parsers/parse_simple.rb
@@ -0,0 +1,41 @@
+# Parse a non-source file. We basically take the whole thing 
+# as one big comment. If the first character in the file
+# is '#', we strip leading pound signs.
+
+
+require "rdoc/code_objects"
+require "rdoc/markup/simple_markup/preprocess"
+
+module RDoc
+  # See rdoc/parsers/parse_c.rb
+
+  class SimpleParser
+    
+    # prepare to parse a plain file
+    def initialize(top_level, file_name, body, options, stats)
+      
+      preprocess = SM::PreProcess.new(file_name, options.rdoc_include)
+      
+      preprocess.handle(body) do |directive, param|
+        $stderr.puts "Unrecognized directive '#{directive}' in #{file_name}"
+      end
+      
+      @body = body
+      @options = options
+      @top_level = top_level
+    end
+    
+    # Extract the file contents and attach them to the toplevel as a
+    # comment
+    
+    def scan
+      #    @body.gsub(/^(\s\n)+/, '')
+      @top_level.comment = remove_private_comments(@body)
+      @top_level
+    end
+
+    def remove_private_comments(comment)
+      comment.gsub(/^--.*?^\+\+/m, '').sub(/^--.*/m, '')
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/parsers/parserfactory.rb b/ruby_1_8_6/lib/rdoc/parsers/parserfactory.rb
new file mode 100644
index 0000000000..00a82cf4b1
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/parsers/parserfactory.rb
@@ -0,0 +1,99 @@
+require "rdoc/parsers/parse_simple"
+
+module RDoc
+
+  # A parser is simple a class that implements
+  #
+  #   #initialize(file_name, body, options)
+  #
+  # and
+  #
+  #   #scan
+  #
+  # The initialize method takes a file name to be used, the body of the
+  # file, and an RDoc::Options object. The scan method is then called
+  # to return an appropriately parsed TopLevel code object.
+  #
+  # The ParseFactory is used to redirect to the correct parser given a filename
+  # extension. This magic works because individual parsers have to register 
+  # themselves with us as they are loaded in. The do this using the following
+  # incantation
+  #
+  #
+  #    require "rdoc/parsers/parsefactory"
+  #    
+  #    module RDoc
+  #    
+  #      class XyzParser
+  #        extend ParseFactory                  <<<<
+  #        parse_files_matching /\.xyz$/        <<<<
+  #    
+  #        def initialize(file_name, body, options)
+  #          ...
+  #        end
+  #    
+  #        def scan
+  #          ...
+  #        end
+  #      end
+  #    end
+  #
+  # Just to make life interesting, if we suspect a plain text file, we
+  # also look for a shebang line just in case it's a potential
+  # shell script
+
+
+
+  module ParserFactory
+
+    @@parsers = []
+
+    Parsers = Struct.new(:regexp, :parser)
+
+    # Record the fact that a particular class parses files that
+    # match a given extension
+
+    def parse_files_matching(regexp)
+      @@parsers.unshift Parsers.new(regexp, self)
+    end
+
+    # Return a parser that can handle a particular extension
+
+    def ParserFactory.can_parse(file_name)
+      @@parsers.find {|p| p.regexp.match(file_name) }
+    end
+
+    # Alias an extension to another extension. After this call,
+    # files ending "new_ext" will be parsed using the same parser
+    # as "old_ext"
+
+    def ParserFactory.alias_extension(old_ext, new_ext)
+      parser = ParserFactory.can_parse("xxx.#{old_ext}")
+      return false unless parser
+      @@parsers.unshift Parsers.new(Regexp.new("\\.#{new_ext}$"), parser.parser)
+      true
+    end
+
+    # Find the correct parser for a particular file name. Return a 
+    # SimpleParser for ones that we don't know
+
+    def ParserFactory.parser_for(top_level, file_name, body, options, stats)
+      # If no extension, look for shebang
+      if file_name !~ /\.\w+$/ && body =~ %r{\A#!(.+)}
+        shebang = $1
+        case shebang
+        when %r{env\s+ruby}, %r{/ruby}
+          file_name = "dummy.rb"
+        end
+      end
+      parser_description = can_parse(file_name)
+      if parser_description
+        parser = parser_description.parser 
+      else
+        parser = SimpleParser
+      end
+
+      parser.new(top_level, file_name, body, options, stats)
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/rdoc.rb b/ruby_1_8_6/lib/rdoc/rdoc.rb
new file mode 100644
index 0000000000..91f5611196
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/rdoc.rb
@@ -0,0 +1,298 @@
+# See README.
+#
+ 
+
+VERSION_STRING = %{RDoc V1.0.1 - 20041108}
+
+
+require 'rdoc/parsers/parse_rb.rb'
+require 'rdoc/parsers/parse_c.rb'
+require 'rdoc/parsers/parse_f95.rb'
+
+require 'rdoc/parsers/parse_simple.rb'
+require 'rdoc/options'
+
+require 'rdoc/diagram'
+
+require 'find'
+require 'ftools'
+require 'time'
+
+# We put rdoc stuff in the RDoc module to avoid namespace
+# clutter.
+#
+# ToDo: This isn't universally true.
+#
+# :include: README
+
+module RDoc
+
+  # Name of the dotfile that contains the description of files to be
+  # processed in the current directory
+  DOT_DOC_FILENAME = ".document"
+
+  # Simple stats collector
+  class Stats
+    attr_accessor :num_files, :num_classes, :num_modules, :num_methods
+    def initialize
+      @num_files = @num_classes = @num_modules = @num_methods = 0
+      @start = Time.now
+    end
+    def print
+      puts "Files:   #@num_files"
+      puts "Classes: #@num_classes"
+      puts "Modules: #@num_modules"
+      puts "Methods: #@num_methods"
+      puts "Elapsed: " + sprintf("%0.3fs", Time.now - @start)
+    end
+  end
+
+
+  # Exception thrown by any rdoc error. Only the #message part is
+  # of use externally.
+
+  class RDocError < Exception
+  end
+
+  # Encapsulate the production of rdoc documentation. Basically
+  # you can use this as you would invoke rdoc from the command
+  # line:
+  #
+  #    rdoc = RDoc::RDoc.new
+  #    rdoc.document(args)
+  #
+  # where _args_ is an array of strings, each corresponding to
+  # an argument you'd give rdoc on the command line. See rdoc/rdoc.rb 
+  # for details.
+  
+  class RDoc
+
+    ##
+    # This is the list of output generators that we
+    # support
+    
+    Generator = Struct.new(:file_name, :class_name, :key)
+    
+    GENERATORS = {}
+    $:.collect {|d|
+      File::expand_path(d)
+    }.find_all {|d|
+      File::directory?("#{d}/rdoc/generators")
+    }.each {|dir|
+      Dir::entries("#{dir}/rdoc/generators").each {|gen|
+        next unless /(\w+)_generator.rb$/ =~ gen
+        type = $1
+        unless GENERATORS.has_key? type
+          GENERATORS[type] = Generator.new("rdoc/generators/#{gen}",
+                                           "#{type.upcase}Generator".intern,
+                                           type)
+        end
+      }
+    }                                                    
+
+    #######
+    private
+    #######
+
+    ##
+    # Report an error message and exit
+    
+    def error(msg)
+      raise RDocError.new(msg)
+    end
+    
+    ##
+    # Create an output dir if it doesn't exist. If it does
+    # exist, but doesn't contain the flag file <tt>created.rid</tt>
+    # then we refuse to use it, as we may clobber some
+    # manually generated documentation
+    
+    def setup_output_dir(op_dir, force)
+      flag_file = output_flag_file(op_dir)
+      if File.exist?(op_dir)
+        unless File.directory?(op_dir)
+          error "'#{op_dir}' exists, and is not a directory" 
+        end
+        begin
+          created = File.read(flag_file)
+        rescue SystemCallError
+          error "\nDirectory #{op_dir} already exists, but it looks like it\n" +
+            "isn't an RDoc directory. Because RDoc doesn't want to risk\n" +
+            "destroying any of your existing files, you'll need to\n" +
+            "specify a different output directory name (using the\n" +
+            "--op <dir> option).\n\n"
+        else
+          last = (Time.parse(created) unless force rescue nil)
+        end
+      else
+        File.makedirs(op_dir)
+      end
+      last
+    end
+
+    # Update the flag file in an output directory.
+    def update_output_dir(op_dir, time)
+      File.open(output_flag_file(op_dir), "w") {|f| f.puts time.rfc2822 }
+    end
+
+    # Return the path name of the flag file in an output directory.
+    def output_flag_file(op_dir)
+      File.join(op_dir, "created.rid")
+    end
+
+    # The .document file contains a list of file and directory name
+    # patterns, representing candidates for documentation. It may
+    # also contain comments (starting with '#')
+    def parse_dot_doc_file(in_dir, filename, options)
+      # read and strip comments
+      patterns = File.read(filename).gsub(/#.*/, '')
+
+      result = []
+
+      patterns.split.each do |patt|
+        candidates = Dir.glob(File.join(in_dir, patt))
+        result.concat(normalized_file_list(options,  candidates))
+      end
+      result
+    end
+
+
+    # Given a list of files and directories, create a list
+    # of all the Ruby files they contain. 
+    #
+    # If +force_doc+ is true, we always add the given files.
+    # If false, only add files that we guarantee we can parse
+    # It is true when looking at files given on the command line,
+    # false when recursing through subdirectories. 
+    #
+    # The effect of this is that if you want a file with a non-
+    # standard extension parsed, you must name it explicity.
+    #
+
+    def normalized_file_list(options, relative_files, force_doc = false, exclude_pattern=nil)
+      file_list = []
+
+      relative_files.each do |rel_file_name|
+        next if exclude_pattern && exclude_pattern =~ rel_file_name
+        stat = File.stat(rel_file_name)
+        case type = stat.ftype
+        when "file"
+          next if @last_created and stat.mtime < @last_created
+          file_list << rel_file_name.sub(/^\.\//, '') if force_doc || ParserFactory.can_parse(rel_file_name)
+        when "directory"
+          next if rel_file_name == "CVS" || rel_file_name == ".svn"
+          dot_doc = File.join(rel_file_name, DOT_DOC_FILENAME)
+          if File.file?(dot_doc)
+            file_list.concat(parse_dot_doc_file(rel_file_name, dot_doc, options))
+          else
+            file_list.concat(list_files_in_directory(rel_file_name, options))
+          end
+        else
+          raise RDocError.new("I can't deal with a #{type} #{rel_file_name}")
+        end
+      end
+      file_list
+    end
+
+    # Return a list of the files to be processed in
+    # a directory. We know that this directory doesn't have
+    # a .document file, so we're looking for real files. However
+    # we may well contain subdirectories which must
+    # be tested for .document files
+    def list_files_in_directory(dir, options)
+      normalized_file_list(options, Dir.glob(File.join(dir, "*")), false, options.exclude)
+    end
+
+
+    # Parse each file on the command line, recursively entering
+    # directories
+
+    def parse_files(options)
+ 
+      file_info = []
+
+      files = options.files
+      files = ["."] if files.empty?
+
+      file_list = normalized_file_list(options, files, true)
+
+      file_list.each do |fn|
+        $stderr.printf("\n%35s: ", File.basename(fn)) unless options.quiet
+        
+        content = File.open(fn, "r") {|f| f.read}
+
+        top_level = TopLevel.new(fn)
+        parser = ParserFactory.parser_for(top_level, fn, content, options, @stats)
+        file_info << parser.scan
+        @stats.num_files += 1
+      end
+
+      file_info
+    end
+
+
+    public
+
+    ###################################################################
+    #
+    # Format up one or more files according to the given arguments.
+    # For simplicity, _argv_ is an array of strings, equivalent to the
+    # strings that would be passed on the command line. (This isn't a
+    # coincidence, as we _do_ pass in ARGV when running
+    # interactively). For a list of options, see rdoc/rdoc.rb. By
+    # default, output will be stored in a directory called +doc+ below
+    # the current directory, so make sure you're somewhere writable
+    # before invoking.
+    #
+    # Throws: RDocError on error
+
+    def document(argv)
+
+      TopLevel::reset
+
+      @stats = Stats.new
+
+      options = Options.instance
+      options.parse(argv, GENERATORS)
+
+      @last_created = nil
+      unless options.all_one_file
+        @last_created = setup_output_dir(options.op_dir, options.force_update)
+      end
+      start_time = Time.now
+
+      file_info = parse_files(options)
+
+      if file_info.empty?
+        $stderr.puts "\nNo newer files." unless options.quiet
+      else
+        gen = options.generator
+
+        $stderr.puts "\nGenerating #{gen.key.upcase}..." unless options.quiet
+
+        require gen.file_name
+
+        gen_class = Generators.const_get(gen.class_name)
+        gen = gen_class.for(options)
+
+        pwd = Dir.pwd
+
+        Dir.chdir(options.op_dir)  unless options.all_one_file
+
+        begin
+          Diagram.new(file_info, options).draw if options.diagram
+          gen.generate(file_info)
+          update_output_dir(".", start_time)
+        ensure
+          Dir.chdir(pwd)
+        end
+      end
+
+      unless options.quiet
+        puts
+        @stats.print
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/lib/rdoc/ri/ri_cache.rb b/ruby_1_8_6/lib/rdoc/ri/ri_cache.rb
new file mode 100644
index 0000000000..1844ac969e
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/ri/ri_cache.rb
@@ -0,0 +1,187 @@
+module RI
+
+  class ClassEntry
+
+    attr_reader :name
+    attr_reader :path_names
+    
+    def initialize(path_name, name, in_class)
+      @path_names = [ path_name ]
+      @name = name
+      @in_class = in_class
+      @class_methods    = []
+      @instance_methods = []
+      @inferior_classes = []
+    end
+
+    # We found this class in more tha one place, so add
+    # in the name from there.
+    def add_path(path)
+      @path_names << path
+    end
+
+    # read in our methods and any classes
+    # and modules in our namespace. Methods are
+    # stored in files called name-c|i.yaml,
+    # where the 'name' portion is the external
+    # form of the method name and the c|i is a class|instance
+    # flag
+
+    def load_from(dir)
+      Dir.foreach(dir) do |name|
+        next if name =~ /^\./
+
+        # convert from external to internal form, and
+        # extract the instance/class flag
+
+        if name =~ /^(.*?)-(c|i).yaml$/
+          external_name = $1
+          is_class_method = $2 == "c"
+          internal_name = RiWriter.external_to_internal(external_name)
+          list = is_class_method ? @class_methods : @instance_methods
+          path = File.join(dir, name)
+          list << MethodEntry.new(path, internal_name, is_class_method, self)
+        else
+          full_name = File.join(dir, name)
+          if File.directory?(full_name)
+            inf_class = @inferior_classes.find {|c| c.name == name }
+            if inf_class
+              inf_class.add_path(full_name)
+            else
+              inf_class = ClassEntry.new(full_name, name, self)
+              @inferior_classes << inf_class
+            end
+            inf_class.load_from(full_name)
+          end
+        end
+      end
+    end
+
+    # Return a list of any classes or modules that we contain
+    # that match a given string
+
+    def contained_modules_matching(name)
+      @inferior_classes.find_all {|c| c.name[name]}
+    end
+
+    def classes_and_modules
+      @inferior_classes
+    end
+
+    # Return an exact match to a particular name
+    def contained_class_named(name)
+      @inferior_classes.find {|c| c.name == name}
+    end
+
+    # return the list of local methods matching name
+    # We're split into two because we need distinct behavior
+    # when called from the _toplevel_
+    def methods_matching(name, is_class_method)
+      local_methods_matching(name, is_class_method)
+    end
+
+    # Find methods matching 'name' in ourselves and in
+    # any classes we contain
+    def recursively_find_methods_matching(name, is_class_method)
+      res = local_methods_matching(name, is_class_method)
+      @inferior_classes.each do |c|
+        res.concat(c.recursively_find_methods_matching(name, is_class_method))
+      end
+      res
+    end
+
+
+    # Return our full name
+    def full_name
+      res = @in_class.full_name
+      res << "::" unless res.empty?
+      res << @name
+    end
+
+    # Return a list of all out method names
+    def all_method_names
+      res = @class_methods.map {|m| m.full_name }
+      @instance_methods.each {|m| res << m.full_name}
+      res
+    end
+
+    private
+
+    # Return a list of all our methods matching a given string.
+    # Is +is_class_methods+ if 'nil', we don't care if the method
+    # is a class method or not, otherwise we only return
+    # those methods that match
+    def local_methods_matching(name, is_class_method)
+
+      list = case is_class_method
+             when nil then  @class_methods + @instance_methods
+             when true then @class_methods
+             when false then @instance_methods
+             else fail "Unknown is_class_method: #{is_class_method.inspect}"
+             end
+
+      list.find_all {|m| m.name;  m.name[name]}
+    end
+  end
+
+  # A TopLevelEntry is like a class entry, but when asked to search
+  # for methods searches all classes, not just itself
+
+  class TopLevelEntry < ClassEntry
+    def methods_matching(name, is_class_method)
+      res = recursively_find_methods_matching(name, is_class_method)
+    end
+
+    def full_name
+      ""
+    end
+
+    def module_named(name)
+      
+    end
+
+  end
+
+  class MethodEntry
+    attr_reader :name
+    attr_reader :path_name
+
+    def initialize(path_name, name, is_class_method, in_class)
+      @path_name = path_name
+      @name = name
+      @is_class_method = is_class_method
+      @in_class = in_class
+    end
+
+    def full_name
+      res = @in_class.full_name
+      unless res.empty?
+        if @is_class_method
+          res << "::"
+        else
+          res << "#"
+        end
+      end
+      res << @name
+    end
+  end
+
+  # We represent everything know about all 'ri' files
+  # accessible to this program
+
+  class RiCache
+
+    attr_reader :toplevel
+
+    def initialize(dirs)
+      # At the top level we have a dummy module holding the
+      # overall namespace
+      @toplevel = TopLevelEntry.new('', '::', nil)
+
+      dirs.each do |dir|
+        @toplevel.load_from(dir)
+      end
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/ri/ri_descriptions.rb b/ruby_1_8_6/lib/rdoc/ri/ri_descriptions.rb
new file mode 100644
index 0000000000..e5ea9f2fbf
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/ri/ri_descriptions.rb
@@ -0,0 +1,154 @@
+require 'yaml'
+require 'rdoc/markup/simple_markup/fragments'
+
+# Descriptions are created by RDoc (in ri_generator) and
+# written out in serialized form into the documentation
+# tree. ri then reads these to generate the documentation
+
+module RI
+  class NamedThing
+    attr_reader :name
+    def initialize(name)
+      @name = name
+    end
+    def <=>(other)
+      @name <=> other.name
+    end
+
+    def hash
+      @name.hash
+    end
+
+    def eql?(other)
+      @name.eql?(other)
+    end
+  end
+
+#  Alias          = Struct.new(:old_name, :new_name)
+
+  class AliasName < NamedThing
+  end
+
+  class Attribute < NamedThing
+    attr_reader :rw, :comment
+    def initialize(name, rw, comment)
+      super(name)
+      @rw = rw
+      @comment = comment
+    end
+  end
+
+  class Constant < NamedThing
+    attr_reader :value, :comment
+    def initialize(name, value, comment)
+      super(name)
+      @value = value
+      @comment = comment
+    end
+  end
+
+  class IncludedModule < NamedThing
+  end
+
+
+  class MethodSummary < NamedThing
+    def initialize(name="")
+      super
+    end
+  end
+
+
+
+  class Description
+    attr_accessor :name
+    attr_accessor :full_name
+    attr_accessor :comment
+
+    def serialize
+      self.to_yaml
+    end
+
+    def Description.deserialize(from)
+      YAML.load(from)
+    end
+
+    def <=>(other)
+      @name <=> other.name
+    end
+  end
+  
+  class ModuleDescription < Description
+    
+    attr_accessor :class_methods
+    attr_accessor :instance_methods
+    attr_accessor :attributes
+    attr_accessor :constants
+    attr_accessor :includes
+
+    # merge in another class desscription into this one
+    def merge_in(old)
+      merge(@class_methods, old.class_methods)
+      merge(@instance_methods, old.instance_methods)
+      merge(@attributes, old.attributes)
+      merge(@constants, old.constants)
+      merge(@includes, old.includes)
+      if @comment.nil? || @comment.empty?
+        @comment = old.comment
+      else
+        unless old.comment.nil? or old.comment.empty? then
+          @comment << SM::Flow::RULE.new
+          @comment.concat old.comment
+        end
+      end
+    end
+
+    def display_name
+      "Module"
+    end
+
+    # the 'ClassDescription' subclass overrides this
+    # to format up the name of a parent
+    def superclass_string
+      nil
+    end
+
+    private
+
+    def merge(into, from)
+      names = {}
+      into.each {|i| names[i.name] = i }
+      from.each {|i| names[i.name] = i }
+      into.replace(names.keys.sort.map {|n| names[n]})
+    end
+  end
+  
+  class ClassDescription < ModuleDescription
+    attr_accessor :superclass
+
+    def display_name
+      "Class"
+    end
+
+    def superclass_string
+      if @superclass && @superclass != "Object"
+        @superclass
+      else
+        nil
+      end
+    end
+  end
+
+
+  class MethodDescription < Description
+    
+    attr_accessor :is_class_method
+    attr_accessor :visibility
+    attr_accessor :block_params
+    attr_accessor :is_singleton
+    attr_accessor :aliases
+    attr_accessor :is_alias_for
+    attr_accessor :params
+
+  end
+  
+end
diff --git a/ruby_1_8_6/lib/rdoc/ri/ri_display.rb b/ruby_1_8_6/lib/rdoc/ri/ri_display.rb
new file mode 100644
index 0000000000..67962fc2c1
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/ri/ri_display.rb
@@ -0,0 +1,255 @@
+require 'rdoc/ri/ri_util'
+require 'rdoc/ri/ri_formatter'
+require 'rdoc/ri/ri_options'
+
+
+# This is a kind of 'flag' module. If you want to write your
+# own 'ri' display module (perhaps because you'r writing
+# an IDE or somesuch beast), you simply write a class
+# which implements the various 'display' methods in 'DefaultDisplay',
+# and include the 'RiDisplay' module in that class. 
+#
+# To access your class from the command line, you can do
+#
+#    ruby -r <your source file>  ../ri ....
+#
+# If folks _really_ want to do this from the command line,
+# I'll build an option in
+
+module RiDisplay
+  @@display_class = nil
+
+  def RiDisplay.append_features(display_class)
+    @@display_class = display_class
+  end
+
+  def RiDisplay.new(*args)
+    @@display_class.new(*args)
+  end
+end
+
+######################################################################
+#
+# A paging display module. Uses the ri_formatter class to do the
+# actual presentation
+#
+
+class  DefaultDisplay
+
+  include RiDisplay
+
+  def initialize(options)
+    @options = options
+    @formatter = @options.formatter.new(@options, "     ")
+  end    
+  
+  
+  ######################################################################
+  
+  def display_usage
+    page do
+      RI::Options::OptionList.usage(short_form=true)
+    end
+  end
+
+
+  ######################################################################
+  
+  def display_method_info(method)
+    page do
+      @formatter.draw_line(method.full_name)
+      display_params(method)
+      @formatter.draw_line
+      display_flow(method.comment)
+      if method.aliases && !method.aliases.empty?
+        @formatter.blankline
+        aka = "(also known as "
+        aka << method.aliases.map {|a| a.name }.join(", ") 
+        aka << ")"
+        @formatter.wrap(aka)
+      end
+    end
+  end
+  
+  ######################################################################
+  
+  def display_class_info(klass, ri_reader)
+    page do 
+      superclass = klass.superclass_string
+      
+      if superclass
+        superclass = " < " + superclass
+      else
+        superclass = ""
+      end
+      
+      @formatter.draw_line(klass.display_name + ": " +
+                           klass.full_name + superclass)
+      
+      display_flow(klass.comment)
+      @formatter.draw_line 
+    
+      unless klass.includes.empty?
+        @formatter.blankline
+        @formatter.display_heading("Includes:", 2, "")
+        incs = []
+        klass.includes.each do |inc|
+          inc_desc = ri_reader.find_class_by_name(inc.name)
+          if inc_desc
+            str = inc.name + "("
+            str << inc_desc.instance_methods.map{|m| m.name}.join(", ")
+            str << ")"
+            incs << str
+          else
+            incs << inc.name
+          end
+      end
+        @formatter.wrap(incs.sort.join(', '))
+      end
+      
+      unless klass.constants.empty?
+        @formatter.blankline
+        @formatter.display_heading("Constants:", 2, "")
+        len = 0
+        klass.constants.each { |c| len = c.name.length if c.name.length > len }
+        len += 2
+        klass.constants.each do |c|
+          @formatter.wrap(c.value, 
+                          @formatter.indent+((c.name+":").ljust(len)))
+        end 
+      end
+      
+      unless klass.class_methods.empty?
+        @formatter.blankline
+        @formatter.display_heading("Class methods:", 2, "")
+        @formatter.wrap(klass.class_methods.map{|m| m.name}.sort.join(', '))
+      end
+      
+      unless klass.instance_methods.empty?
+        @formatter.blankline
+        @formatter.display_heading("Instance methods:", 2, "")
+        @formatter.wrap(klass.instance_methods.map{|m| m.name}.sort.join(', '))
+      end
+      
+      unless klass.attributes.empty?
+        @formatter.blankline
+        @formatter.wrap("Attributes:", "")
+        @formatter.wrap(klass.attributes.map{|a| a.name}.sort.join(', '))
+      end
+    end
+  end
+  
+  ######################################################################
+  
+  # Display a list of method names
+  
+  def display_method_list(methods)
+    page do
+      puts "More than one method matched your request. You can refine"
+      puts "your search by asking for information on one of:\n\n"
+      @formatter.wrap(methods.map {|m| m.full_name} .join(", "))
+    end
+  end
+  
+  ######################################################################
+  
+  def display_class_list(namespaces)
+    page do
+      puts "More than one class or module matched your request. You can refine"
+      puts "your search by asking for information on one of:\n\n"
+      @formatter.wrap(namespaces.map {|m| m.full_name}.join(", "))
+    end
+  end
+  
+  ######################################################################
+
+  def list_known_classes(classes)
+    if classes.empty?
+      warn_no_database
+    else
+      page do 
+        @formatter.draw_line("Known classes and modules")
+        @formatter.blankline
+        @formatter.wrap(classes.sort.join(", "))
+      end
+    end
+  end
+
+  ######################################################################
+
+  def list_known_names(names)
+    if names.empty?
+      warn_no_database
+    else
+      page do 
+        names.each {|n| @formatter.raw_print_line(n)}
+      end
+    end
+  end
+
+  ######################################################################
+
+  private
+
+  ######################################################################
+
+  def page
+    return yield unless pager = setup_pager
+    begin
+      save_stdout = STDOUT.clone
+      STDOUT.reopen(pager)
+      yield
+    ensure
+      STDOUT.reopen(save_stdout)
+      save_stdout.close
+      pager.close
+    end
+  end
+
+  ######################################################################
+
+  def setup_pager
+    unless @options.use_stdout
+      for pager in [ ENV['PAGER'], "less", "more", 'pager' ].compact.uniq
+        return IO.popen(pager, "w") rescue nil
+      end
+      @options.use_stdout = true
+      nil
+    end
+  end
+
+  ######################################################################
+  
+  def display_params(method)
+
+    params = method.params
+
+    if params[0,1] == "("
+      if method.is_singleton
+        params = method.full_name + params
+      else
+        params = method.name + params
+      end
+    end
+    params.split(/\n/).each do |p|
+      @formatter.wrap(p) 
+      @formatter.break_to_newline
+    end
+  end
+  ######################################################################
+  
+  def display_flow(flow)
+    if !flow || flow.empty?
+      @formatter.wrap("(no description...)")
+    else
+      @formatter.display_flow(flow)
+    end
+  end
+
+  ######################################################################
+  
+  def warn_no_database
+    puts "Before using ri, you need to generate documentation"
+    puts "using 'rdoc' with the --ri option"
+  end
+end  # class RiDisplay
diff --git a/ruby_1_8_6/lib/rdoc/ri/ri_driver.rb b/ruby_1_8_6/lib/rdoc/ri/ri_driver.rb
new file mode 100644
index 0000000000..a00f20ee3b
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/ri/ri_driver.rb
@@ -0,0 +1,143 @@
+require 'rdoc/ri/ri_paths'
+require 'rdoc/usage'
+require 'rdoc/ri/ri_cache'
+require 'rdoc/ri/ri_util'
+require 'rdoc/ri/ri_reader'
+require 'rdoc/ri/ri_formatter'
+require 'rdoc/ri/ri_options'
+
+
+######################################################################
+
+class  RiDriver
+
+  def initialize
+    @options = RI::Options.instance
+
+    args = ARGV
+    if ENV["RI"]
+      args = ENV["RI"].split.concat(ARGV)
+    end
+
+    @options.parse(args)
+
+    path = @options.path
+    report_missing_documentation @options.raw_path if path.empty?
+
+    @ri_reader = RI::RiReader.new(RI::RiCache.new(path))
+    @display   = @options.displayer
+  end
+  
+  # Couldn't find documentation in +path+, so tell the user what to do
+
+  def report_missing_documentation(path)
+    STDERR.puts "No ri documentation found in:"
+    path.each do |d|
+      STDERR.puts "     #{d}"
+    end
+    STDERR.puts "\nWas rdoc run to create documentation?\n\n"
+    RDoc::usage("Installing Documentation")
+  end
+  
+  ######################################################################
+  
+  # If the list of matching methods contains exactly one entry, or
+  # if it contains an entry that exactly matches the requested method,
+  # then display that entry, otherwise display the list of
+  # matching method names
+  
+  def report_method_stuff(requested_method_name, methods)
+    if methods.size == 1
+      method = @ri_reader.get_method(methods[0])
+      @display.display_method_info(method)
+    else
+      entries = methods.find_all {|m| m.name == requested_method_name}
+      if entries.size == 1
+        method = @ri_reader.get_method(entries[0])
+        @display.display_method_info(method)
+      else
+        @display.display_method_list(methods)
+      end
+    end
+  end
+  
+  ######################################################################
+  
+  def report_class_stuff(namespaces)
+    if namespaces.size == 1
+      klass = @ri_reader.get_class(namespaces[0])
+      @display.display_class_info(klass, @ri_reader)
+    else 
+#      entries = namespaces.find_all {|m| m.full_name == requested_class_name}
+#      if entries.size == 1
+#        klass = @ri_reader.get_class(entries[0])
+#        @display.display_class_info(klass, @ri_reader)
+#      else
+        @display.display_class_list(namespaces)
+#      end
+    end
+  end
+  
+  ######################################################################
+  
+  
+  def get_info_for(arg)
+    desc = NameDescriptor.new(arg)
+
+    namespaces = @ri_reader.top_level_namespace
+    
+    for class_name in desc.class_names
+      namespaces = @ri_reader.lookup_namespace_in(class_name, namespaces)
+      if namespaces.empty?
+        raise RiError.new("Nothing known about #{arg}")
+      end
+    end
+
+    # at this point, if we have multiple possible namespaces, but one
+    # is an exact match for our requested class, prune down to just it
+
+    full_class_name = desc.full_class_name
+    entries = namespaces.find_all {|m| m.full_name == full_class_name}
+    namespaces = entries if entries.size == 1
+
+    if desc.method_name.nil?
+      report_class_stuff(namespaces)
+    else
+      methods = @ri_reader.find_methods(desc.method_name, 
+                                        desc.is_class_method,
+                                        namespaces)
+
+      if methods.empty?
+        raise RiError.new("Nothing known about #{arg}")
+      else
+        report_method_stuff(desc.method_name, methods)
+      end
+    end
+  end
+
+  ######################################################################
+
+  def process_args
+    if @options.list_classes
+      classes = @ri_reader.full_class_names
+      @display.list_known_classes(classes)
+    elsif @options.list_names
+      names = @ri_reader.all_names
+      @display.list_known_names(names)
+    else
+      if ARGV.size.zero?
+        @display.display_usage
+      else
+        begin
+          ARGV.each do |arg|
+            get_info_for(arg)
+          end
+        rescue RiError => e
+          STDERR.puts(e.message)
+          exit(1)
+        end
+      end
+    end
+  end
+
+end  # class RiDriver
diff --git a/ruby_1_8_6/lib/rdoc/ri/ri_formatter.rb b/ruby_1_8_6/lib/rdoc/ri/ri_formatter.rb
new file mode 100644
index 0000000000..34eb561ca3
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/ri/ri_formatter.rb
@@ -0,0 +1,672 @@
+module RI
+  class TextFormatter
+
+    attr_reader :indent
+    
+    def initialize(options, indent)
+      @options = options
+      @width   = options.width
+      @indent  = indent
+    end
+    
+    
+    ######################################################################
+    
+    def draw_line(label=nil)
+      len = @width
+      len -= (label.size+1) if label
+      print "-"*len
+      if label
+        print(" ")
+        bold_print(label) 
+      end
+      puts
+    end
+    
+    ######################################################################
+    
+    def wrap(txt,  prefix=@indent, linelen=@width)
+      return unless txt && !txt.empty?
+      work = conv_markup(txt)
+      textLen = linelen - prefix.length
+      patt = Regexp.new("^(.{0,#{textLen}})[ \n]")
+      next_prefix = prefix.tr("^ ", " ")
+
+      res = []
+
+      while work.length > textLen
+        if work =~ patt
+          res << $1
+          work.slice!(0, $&.length)
+        else
+          res << work.slice!(0, textLen)
+        end
+      end
+      res << work if work.length.nonzero?
+      puts(prefix + res.join("\n" + next_prefix))
+    end
+
+    ######################################################################
+
+    def blankline
+      puts
+    end
+    
+    ######################################################################
+
+    # called when we want to ensure a nbew 'wrap' starts on a newline
+    # Only needed for HtmlFormatter, because the rest do their
+    # own line breaking
+
+    def break_to_newline
+    end
+    
+    ######################################################################
+
+    def bold_print(txt)
+      print txt
+    end
+
+    ######################################################################
+
+    def raw_print_line(txt)
+      puts txt
+    end
+
+    ######################################################################
+
+    # convert HTML entities back to ASCII
+    def conv_html(txt)
+      txt.
+          gsub(/&gt;/, '>').
+          gsub(/&lt;/, '<').
+          gsub(/&quot;/, '"').
+          gsub(/&amp;/, '&')
+          
+    end
+
+    # convert markup into display form
+    def conv_markup(txt)
+      txt.
+          gsub(%r{<tt>(.*?)</tt>}) { "+#$1+" } .
+          gsub(%r{<code>(.*?)</code>}) { "+#$1+" } .
+          gsub(%r{<b>(.*?)</b>}) { "*#$1*" } .
+          gsub(%r{<em>(.*?)</em>}) { "_#$1_" }
+    end
+
+    ######################################################################
+
+    def display_list(list)
+      case list.type
+
+      when SM::ListBase::BULLET 
+        prefixer = proc { |ignored| @indent + "*   " }
+
+      when SM::ListBase::NUMBER,
+      SM::ListBase::UPPERALPHA,
+      SM::ListBase::LOWERALPHA
+
+        start = case list.type
+                when SM::ListBase::NUMBER      then 1
+                when  SM::ListBase::UPPERALPHA then 'A'
+                when SM::ListBase::LOWERALPHA  then 'a'
+                end
+        prefixer = proc do |ignored|
+          res = @indent + "#{start}.".ljust(4)
+          start = start.succ
+          res
+        end
+        
+      when SM::ListBase::LABELED
+        prefixer = proc do |li|
+          li.label
+        end
+
+      when SM::ListBase::NOTE
+        longest = 0
+        list.contents.each do |item|
+          if item.kind_of?(SM::Flow::LI) && item.label.length > longest
+            longest = item.label.length
+          end
+        end
+
+        prefixer = proc do |li|
+          @indent + li.label.ljust(longest+1)
+        end
+
+      else
+        fail "unknown list type"
+
+      end
+
+      list.contents.each do |item|
+        if item.kind_of? SM::Flow::LI
+          prefix = prefixer.call(item)
+          display_flow_item(item, prefix)
+        else
+          display_flow_item(item)
+        end
+       end
+    end
+
+    ######################################################################
+
+    def display_flow_item(item, prefix=@indent)
+      case item
+      when SM::Flow::P, SM::Flow::LI
+        wrap(conv_html(item.body), prefix)
+        blankline
+        
+      when SM::Flow::LIST
+        display_list(item)
+
+      when SM::Flow::VERB
+        display_verbatim_flow_item(item, @indent)
+
+      when SM::Flow::H
+        display_heading(conv_html(item.text), item.level, @indent)
+
+      when SM::Flow::RULE
+        draw_line
+
+      else
+        fail "Unknown flow element: #{item.class}"
+      end
+    end
+
+    ######################################################################
+
+    def display_verbatim_flow_item(item, prefix=@indent)
+        item.body.split(/\n/).each do |line|
+          print @indent, conv_html(line), "\n"
+        end
+        blankline
+    end
+
+    ######################################################################
+
+    def display_heading(text, level, indent)
+      text = strip_attributes(text)
+      case level
+      when 1
+        ul = "=" * text.length
+        puts
+        puts text.upcase
+        puts ul
+#        puts
+        
+      when 2
+        ul = "-" * text.length
+        puts
+        puts text
+        puts ul
+#        puts
+      else
+        print indent, text, "\n"
+      end
+    end
+
+
+    def display_flow(flow)
+      flow.each do |f|
+        display_flow_item(f)
+      end
+    end
+
+    def strip_attributes(txt)
+      tokens = txt.split(%r{(</?(?:b|code|em|i|tt)>)})
+      text = [] 
+      attributes = 0
+      tokens.each do |tok|
+        case tok
+        when %r{^</(\w+)>$}, %r{^<(\w+)>$}
+          ;
+        else
+          text << tok
+        end
+      end
+      text.join
+    end
+
+
+  end
+  
+  
+  ######################################################################
+  # Handle text with attributes. We're a base class: there are
+  # different presentation classes (one, for example, uses overstrikes
+  # to handle bold and underlining, while another using ANSI escape
+  # sequences
+  
+  class AttributeFormatter < TextFormatter
+    
+    BOLD      = 1
+    ITALIC    = 2
+    CODE      = 4
+
+    ATTR_MAP = {
+      "b"    => BOLD,
+      "code" => CODE,
+      "em"   => ITALIC,
+      "i"    => ITALIC,
+      "tt"   => CODE
+    }
+
+    # TODO: struct?
+    class AttrChar
+      attr_reader :char
+      attr_reader :attr
+
+      def initialize(char, attr)
+        @char = char
+        @attr = attr
+      end
+    end
+
+    
+    class AttributeString
+      attr_reader :txt
+
+      def initialize
+        @txt = []
+        @optr = 0
+      end
+
+      def <<(char)
+        @txt << char
+      end
+
+      def empty?
+        @optr >= @txt.length
+      end
+
+      # accept non space, then all following spaces
+      def next_word
+        start = @optr
+        len = @txt.length
+
+        while @optr < len && @txt[@optr].char != " "
+          @optr += 1
+        end
+
+        while @optr < len && @txt[@optr].char == " "
+          @optr += 1
+        end
+
+        @txt[start...@optr]
+      end
+    end
+
+    ######################################################################
+    # overrides base class. Looks for <tt>...</tt> etc sequences
+    # and generates an array of AttrChars. This array is then used
+    # as the basis for the split
+
+    def wrap(txt,  prefix=@indent, linelen=@width)
+      return unless txt && !txt.empty?
+
+      txt = add_attributes_to(txt)
+      next_prefix = prefix.tr("^ ", " ")
+      linelen -= prefix.size
+
+      line = []
+
+      until txt.empty?
+        word = txt.next_word
+        if word.size + line.size > linelen
+          write_attribute_text(prefix, line)
+          prefix = next_prefix
+          line = []
+        end
+        line.concat(word)
+      end
+
+      write_attribute_text(prefix, line) if line.length > 0
+    end
+
+    protected
+
+    # overridden in specific formatters
+
+    def write_attribute_text(prefix, line)
+      print prefix
+      line.each do |achar|
+        print achar.char
+      end
+      puts
+    end
+
+    # again, overridden
+
+    def bold_print(txt)
+      print txt
+    end
+
+    private
+
+    def add_attributes_to(txt)
+      tokens = txt.split(%r{(</?(?:b|code|em|i|tt)>)})
+      text = AttributeString.new
+      attributes = 0
+      tokens.each do |tok|
+        case tok
+        when %r{^</(\w+)>$} then attributes &= ~(ATTR_MAP[$1]||0)
+        when %r{^<(\w+)>$}  then attributes  |= (ATTR_MAP[$1]||0)
+        else
+          tok.split(//).each {|ch| text << AttrChar.new(ch, attributes)}
+        end
+      end
+      text
+    end
+
+  end
+
+
+  ##################################################
+  
+  # This formatter generates overstrike-style formatting, which
+  # works with pagers such as man and less.
+
+  class OverstrikeFormatter < AttributeFormatter
+
+    BS = "\C-h"
+
+    def write_attribute_text(prefix, line)
+      print prefix
+      line.each do |achar|
+        attr = achar.attr
+        if (attr & (ITALIC+CODE)) != 0
+          print "_", BS
+        end
+        if (attr & BOLD) != 0
+          print achar.char, BS
+        end
+        print achar.char
+      end
+      puts
+    end
+
+    # draw a string in bold
+    def bold_print(text)
+      text.split(//).each do |ch|
+        print ch, BS, ch
+      end
+    end
+  end
+
+  ##################################################
+  
+  # This formatter uses ANSI escape sequences
+  # to colorize stuff
+  # works with pages such as man and less.
+
+  class AnsiFormatter < AttributeFormatter
+
+    def initialize(*args)
+      print "\033[0m"
+      super
+    end
+
+    def write_attribute_text(prefix, line)
+      print prefix
+      curr_attr = 0
+      line.each do |achar|
+        attr = achar.attr
+        if achar.attr != curr_attr
+          update_attributes(achar.attr)
+          curr_attr = achar.attr
+        end
+        print achar.char
+      end
+      update_attributes(0) unless curr_attr.zero?
+      puts
+    end
+
+
+    def bold_print(txt)
+      print "\033[1m#{txt}\033[m"
+    end
+
+    HEADINGS = {
+      1 => [ "\033[1;32m", "\033[m" ] ,
+      2 => ["\033[4;32m", "\033[m" ],
+      3 => ["\033[32m", "\033[m" ]
+    }
+
+    def display_heading(text, level, indent)
+      level = 3 if level > 3
+      heading = HEADINGS[level]
+      print indent
+      print heading[0]
+      print strip_attributes(text)
+      puts heading[1]
+    end
+    
+    private
+
+    ATTR_MAP = {
+      BOLD   => "1",
+      ITALIC => "33",
+      CODE   => "36"
+    }
+
+    def update_attributes(attr)
+      str = "\033["
+      for quality in [ BOLD, ITALIC, CODE]
+        unless (attr & quality).zero?
+          str << ATTR_MAP[quality]
+        end
+      end
+      print str, "m"
+    end
+  end
+
+  ##################################################
+  
+  # This formatter uses HTML.
+
+  class HtmlFormatter < AttributeFormatter
+
+    def initialize(*args)
+      super
+    end
+
+    def write_attribute_text(prefix, line)
+      curr_attr = 0
+      line.each do |achar|
+        attr = achar.attr
+        if achar.attr != curr_attr
+          update_attributes(curr_attr, achar.attr)
+          curr_attr = achar.attr
+        end
+        print(escape(achar.char))
+      end
+      update_attributes(curr_attr, 0) unless curr_attr.zero?
+    end
+
+    def draw_line(label=nil)
+      if label != nil
+        bold_print(label)
+      end
+      puts("<hr>")
+    end
+
+    def bold_print(txt)
+      tag("b") { txt }
+    end
+
+    def blankline()
+      puts("<p>")
+    end
+
+    def break_to_newline
+      puts("<br>")
+    end
+
+    def display_heading(text, level, indent)
+      level = 4 if level > 4
+      tag("h#{level}") { text }
+      puts
+    end
+    
+    ######################################################################
+
+    def display_list(list)
+
+      case list.type
+      when SM::ListBase::BULLET 
+        list_type = "ul"
+        prefixer = proc { |ignored| "<li>" }
+
+      when SM::ListBase::NUMBER,
+      SM::ListBase::UPPERALPHA,
+      SM::ListBase::LOWERALPHA
+        list_type = "ol"
+        prefixer = proc { |ignored| "<li>" }
+        
+      when SM::ListBase::LABELED
+        list_type = "dl"
+        prefixer = proc do |li|
+          "<dt><b>" + escape(li.label) + "</b><dd>"
+        end
+
+      when SM::ListBase::NOTE
+        list_type = "table"
+        prefixer = proc do |li|
+          %{<tr valign="top"><td>#{li.label.gsub(/ /, '&nbsp;')}</td><td>}
+        end
+      else
+        fail "unknown list type"
+      end
+
+      print "<#{list_type}>"
+      list.contents.each do |item|
+        if item.kind_of? SM::Flow::LI
+          prefix = prefixer.call(item)
+          print prefix
+          display_flow_item(item, prefix)
+        else
+          display_flow_item(item)
+        end
+      end
+      print "</#{list_type}>"
+    end
+
+    def display_verbatim_flow_item(item, prefix=@indent)
+        print("<pre>")
+        puts item.body
+        puts("</pre>")
+    end
+
+    private
+
+    ATTR_MAP = {
+      BOLD   => "b>",
+      ITALIC => "i>",
+      CODE   => "tt>"
+    }
+
+    def update_attributes(current, wanted)
+      str = ""
+      # first turn off unwanted ones
+      off = current & ~wanted
+      for quality in [ BOLD, ITALIC, CODE]
+        if (off & quality) > 0
+          str << "</" + ATTR_MAP[quality]
+        end
+      end
+
+      # now turn on wanted
+      for quality in [ BOLD, ITALIC, CODE]
+        unless (wanted & quality).zero?
+          str << "<" << ATTR_MAP[quality]
+        end
+      end
+      print str
+    end
+
+    def tag(code)
+        print("<#{code}>")
+        print(yield)
+        print("</#{code}>")
+    end
+
+    def escape(str)
+      str.
+          gsub(/&/n, '&amp;').
+          gsub(/\"/n, '&quot;').
+          gsub(/>/n, '&gt;').
+          gsub(/</n, '&lt;')
+    end
+
+  end
+
+  ##################################################
+  
+  # This formatter reduces extra lines for a simpler output.
+  # It improves way output looks for tools like IRC bots.
+
+  class SimpleFormatter < TextFormatter
+
+    ######################################################################
+
+    # No extra blank lines
+
+    def blankline
+    end
+
+    ######################################################################
+
+    # Display labels only, no lines
+
+    def draw_line(label=nil)
+      unless label.nil? then
+        bold_print(label) 
+        puts
+      end
+    end
+
+    ######################################################################
+
+    # Place heading level indicators inline with heading.
+
+    def display_heading(text, level, indent)
+      text = strip_attributes(text)
+      case level
+      when 1
+        puts "= " + text.upcase
+      when 2
+        puts "-- " + text
+      else
+        print indent, text, "\n"
+      end
+    end
+
+  end
+
+
+  # Finally, fill in the list of known formatters
+
+  class TextFormatter
+
+    FORMATTERS = {
+      "ansi"   => AnsiFormatter,
+      "bs"     => OverstrikeFormatter,
+      "html"   => HtmlFormatter,
+      "plain"  => TextFormatter,
+      "simple" => SimpleFormatter,
+    }
+      
+    def TextFormatter.list
+      FORMATTERS.keys.sort.join(", ")
+    end
+
+    def TextFormatter.for(name)
+      FORMATTERS[name.downcase]
+    end
+
+  end
+
+end
+
+
diff --git a/ruby_1_8_6/lib/rdoc/ri/ri_options.rb b/ruby_1_8_6/lib/rdoc/ri/ri_options.rb
new file mode 100644
index 0000000000..db9f4afecf
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/ri/ri_options.rb
@@ -0,0 +1,313 @@
+# We handle the parsing of options, and subsequently as a singleton
+# object to be queried for option values
+
+module RI
+
+  require 'rdoc/ri/ri_paths'
+  require 'rdoc/ri/ri_display'
+
+  VERSION_STRING = "ri v1.0.1 - 20041108"
+
+  class Options
+    
+    require 'singleton'
+    require 'getoptlong'
+    
+    include Singleton
+
+    # No not use a pager. Writable, because ri sets it if it
+    # can't find a pager
+    attr_accessor :use_stdout
+
+    # should we just display a class list and exit
+    attr_reader :list_classes
+
+    # should we display a list of all names
+    attr_reader :list_names
+
+    # The width of the output line
+    attr_reader :width
+
+    # the formatting we apply to the output
+    attr_reader :formatter
+
+    # the directory we search for original documentation
+    attr_reader :doc_dir
+
+    module OptionList
+      
+      OPTION_LIST = [
+        [ "--help",          "-h",   nil,
+          "you're looking at it" ],
+
+        [ "--classes",      "-c",   nil,
+          "Display the names of classes and modules we\n" +
+          "know about"],
+
+        [ "--doc-dir",      "-d",   "<dirname>",
+          "A directory to search for documentation. If not\n" +
+          "specified, we search the standard rdoc/ri directories.\n" +
+          "May be repeated."],
+
+        [ "--system",       nil,    nil,
+          "Include documentation from Ruby's standard library:\n  " +
+          RI::Paths::SYSDIR ],
+
+        [ "--site",         nil,    nil,
+          "Include documentation from libraries installed in site_lib:\n  " +
+          RI::Paths::SITEDIR ],
+
+        [ "--home",         nil,    nil,
+          "Include documentation stored in ~/.rdoc:\n  " +
+          (RI::Paths::HOMEDIR || "No ~/.rdoc found") ],
+
+        [ "--gems",         nil,    nil,
+          "Include documentation from Rubygems:\n  " +
+          (RI::Paths::GEMDIRS ? "#{Gem.path}/doc/*/ri" :
+                                "No Rubygems ri found.") ],
+                                                           
+        [ "--format",       "-f",   "<name>",
+          "Format to use when displaying output:\n" +
+          "   " + RI::TextFormatter.list + "\n" +
+          "Use 'bs' (backspace) with most pager programs.\n" +
+          "To use ANSI, either also use the -T option, or\n" +
+          "tell your pager to allow control characters\n" +
+          "(for example using the -R option to less)"],
+
+        [ "--list-names",    "-l",   nil,
+          "List all the names known to RDoc, one per line"
+        ],
+
+        [ "--no-pager",      "-T",   nil,
+          "Send output directly to stdout." 
+        ],
+
+        [ "--width",         "-w",   "output width",
+        "Set the width of the output" ],
+
+        [ "--version",       "-v",   nil,
+         "Display the version of ri"
+        ],
+
+      ]
+
+      def OptionList.options
+        OPTION_LIST.map do |long, short, arg,|
+          option = []
+          option << long
+          option << short unless short.nil?
+          option << (arg ? GetoptLong::REQUIRED_ARGUMENT :
+                           GetoptLong::NO_ARGUMENT)
+          option
+        end
+      end
+
+
+      def OptionList.strip_output(text)
+        text =~ /^\s+/
+        leading_spaces = $&
+        text.gsub!(/^#{leading_spaces}/, '')
+        $stdout.puts text
+      end
+      
+      
+      # Show an error and exit
+      
+      def OptionList.error(msg)
+        $stderr.puts
+        $stderr.puts msg
+        $stderr.puts "\nFor help on options, try 'ri --help'\n\n"
+        exit 1
+      end
+      
+      # Show usage and exit
+      
+      def OptionList.usage(short_form=false)
+        
+        puts
+        puts(RI::VERSION_STRING)
+        puts
+        
+        name = File.basename($0)
+
+        directories = [
+          RI::Paths::SYSDIR,
+          RI::Paths::SITEDIR,
+          RI::Paths::HOMEDIR
+        ]
+
+        directories << "#{Gem.path}/doc/*/ri" if RI::Paths::GEMDIRS
+
+        directories = directories.join("\n    ")
+
+        OptionList.strip_output(<<-EOT)
+          Usage:
+
+            #{name} [options]  [names...]
+
+          Display information on Ruby classes, modules, and methods.
+          Give the names of classes or methods to see their documentation.
+          Partial names may be given: if the names match more than
+          one entity, a list will be shown, otherwise details on
+          that entity will be displayed.
+
+          Nested classes and modules can be specified using the normal
+          Name::Name notation, and instance methods can be distinguished
+          from class methods using "." (or "#") instead of "::".
+
+          For example:
+
+              ri  File
+              ri  File.new
+              ri  F.n
+              ri  zip
+
+          Note that shell quoting may be required for method names
+          containing punctuation:
+
+              ri 'Array.[]'
+              ri compact\\!
+
+          By default ri searches for documentation in the following
+          directories:
+
+              #{directories}
+
+          Specifying the --system, --site, --home, --gems or --doc-dir
+          options will limit ri to searching only the specified
+          directories.
+
+        EOT
+
+        if short_form
+          puts "For help on options, type 'ri -h'"
+          puts "For a list of classes I know about, type 'ri -c'"
+        else
+          puts "Options:\n\n"
+          OPTION_LIST.each do|long, short, arg, desc|
+            opt = ''
+            opt << (short ? sprintf("%15s", "#{long}, #{short}") :
+                            sprintf("%15s", long))
+            if arg
+              opt << " " << arg
+            end
+            print opt
+            desc = desc.split("\n")
+            if opt.size < 17
+              print " "*(18-opt.size)
+              puts desc.shift
+            else
+              puts
+            end
+            desc.each do |line|
+              puts(" "*18 + line)
+            end
+            puts
+          end
+          puts "Options may also be passed in the 'RI' environment variable"
+          exit 0
+        end
+      end
+    end
+
+    # Show the version and exit
+    def show_version
+      puts VERSION_STRING
+      exit(0)
+    end
+
+    def initialize
+      @use_stdout   = !STDOUT.tty?
+      @width        = 72
+      @formatter    = RI::TextFormatter.for("plain") 
+      @list_classes = false
+      @list_names   = false
+
+      # By default all paths are used.  If any of these are true, only those
+      # directories are used.
+      @use_system = false
+      @use_site = false
+      @use_home = false
+      @use_gems = false
+      @doc_dirs = []
+    end
+
+    # Parse command line options.
+
+    def parse(args)
+    
+      old_argv = ARGV.dup
+
+      ARGV.replace(args)
+
+      begin
+
+        go = GetoptLong.new(*OptionList.options)
+        go.quiet = true
+
+        go.each do |opt, arg|
+          case opt
+          when "--help"       then OptionList.usage
+          when "--version"    then show_version
+          when "--list-names" then @list_names = true
+          when "--no-pager"   then @use_stdout = true
+          when "--classes"    then @list_classes = true
+
+          when "--system"     then @use_system = true
+          when "--site"       then @use_site = true
+          when "--home"       then @use_home = true
+          when "--gems"       then @use_gems = true
+
+          when "--doc-dir"
+            if File.directory?(arg)
+              @doc_dirs << arg
+            else
+              $stderr.puts "Invalid directory: #{arg}"
+              exit 1
+            end
+
+          when "--format"
+            @formatter = RI::TextFormatter.for(arg)
+            unless @formatter
+              $stderr.print "Invalid formatter (should be one of "
+              $stderr.puts RI::TextFormatter.list + ")"
+              exit 1
+            end
+          when "--width"
+            begin
+              @width = Integer(arg)
+            rescue 
+              $stderr.puts "Invalid width: '#{arg}'"
+              exit 1
+            end
+          end
+        end
+
+      rescue GetoptLong::InvalidOption, GetoptLong::MissingArgument => error
+        OptionList.error(error.message)
+
+      end
+    end
+
+    # Return the selected documentation directories.
+
+    def path
+      RI::Paths.path(@use_system, @use_site, @use_home, @use_gems, *@doc_dirs)
+    end
+
+    def raw_path
+      RI::Paths.raw_path(@use_system, @use_site, @use_home, @use_gems,
+                         *@doc_dirs)
+    end
+
+    # Return an instance of the displayer (the thing that actually writes
+    # the information). This allows us to load in new displayer classes
+    # at runtime (for example to help with IDE integration)
+    
+    def displayer
+      ::RiDisplay.new(self)
+    end
+  end
+
+end
+
diff --git a/ruby_1_8_6/lib/rdoc/ri/ri_paths.rb b/ruby_1_8_6/lib/rdoc/ri/ri_paths.rb
new file mode 100644
index 0000000000..32363bf70a
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/ri/ri_paths.rb
@@ -0,0 +1,80 @@
+module RI
+
+  # Encapsulate all the strangeness to do with finding out
+  # where to find RDoc files
+  #
+  # We basically deal with three directories:
+  #
+  # 1. The 'system' documentation directory, which holds
+  #    the documentation distributed with Ruby, and which
+  #    is managed by the Ruby install process
+  # 2. The 'site' directory, which contains site-wide
+  #    documentation added locally.
+  # 3. The 'user' documentation directory, stored under the
+  #    user's own home directory.
+  #
+  # There's contention about all this, but for now:
+  #
+  # system:: $datadir/ri/<ver>/system/...
+  # site::   $datadir/ri/<ver>/site/...
+  # user::   ~/.rdoc
+
+  module Paths
+
+    #:stopdoc:
+    require 'rbconfig'
+    
+    DOC_DIR  = "doc/rdoc"
+
+    version = Config::CONFIG['ruby_version']
+
+    base    = File.join(Config::CONFIG['datadir'], "ri", version)
+    SYSDIR  = File.join(base, "system")
+    SITEDIR = File.join(base, "site")
+    homedir = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH']
+
+    if homedir
+      HOMEDIR = File.join(homedir, ".rdoc")
+    else
+      HOMEDIR = nil
+    end
+
+    # This is the search path for 'ri'
+    PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
+
+    begin
+      require 'rubygems'
+      GEMDIRS = Dir["#{Gem.path}/doc/*/ri"]
+      GEMDIRS.each { |path| RI::Paths::PATH << path }
+    rescue LoadError
+      GEMDIRS = nil
+    end
+
+    # Returns the selected documentation directories as an Array, or PATH if no
+    # overriding directories were given.
+
+    def self.path(use_system, use_site, use_home, use_gems, *extra_dirs)
+      path = raw_path(use_system, use_site, use_home, use_gems, *extra_dirs)
+      return path.select { |path| File.directory? path }
+    end
+
+    # Returns the selected documentation directories including nonexistent
+    # directories.  Used to print out what paths were searched if no ri was
+    # found.
+
+    def self.raw_path(use_system, use_site, use_home, use_gems, *extra_dirs)
+      return PATH unless use_system or use_site or use_home or use_gems or
+                         not extra_dirs.empty?
+
+      path = []
+      path << extra_dirs unless extra_dirs.empty?
+      path << RI::Paths::SYSDIR if use_system
+      path << RI::Paths::SITEDIR if use_site
+      path << RI::Paths::HOMEDIR if use_home
+      path << RI::Paths::GEMDIRS if use_gems
+
+      return path.flatten.compact
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/ri/ri_reader.rb b/ruby_1_8_6/lib/rdoc/ri/ri_reader.rb
new file mode 100644
index 0000000000..fb2c373e38
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/ri/ri_reader.rb
@@ -0,0 +1,100 @@
+require 'rdoc/ri/ri_descriptions'
+require 'rdoc/ri/ri_writer'
+require 'rdoc/markup/simple_markup/to_flow'
+
+module RI
+  class RiReader
+
+    def initialize(ri_cache)
+      @cache = ri_cache
+    end
+
+    def top_level_namespace
+      [ @cache.toplevel ]
+    end
+
+    def lookup_namespace_in(target, namespaces)
+      result = []
+      for n in namespaces
+        result.concat(n.contained_modules_matching(target))
+      end
+      result
+    end
+
+    def find_class_by_name(full_name)
+      names = full_name.split(/::/)
+      ns = @cache.toplevel
+      for name in names
+        ns = ns.contained_class_named(name)
+        return nil if ns.nil?
+      end
+      get_class(ns)
+    end
+
+    def find_methods(name, is_class_method, namespaces)
+      result = []
+      namespaces.each do |ns|
+        result.concat ns.methods_matching(name, is_class_method)
+      end
+      result
+    end
+
+    # return the MethodDescription for a given MethodEntry
+    # by deserializing the YAML
+    def get_method(method_entry)
+      path = method_entry.path_name
+      File.open(path) { |f| RI::Description.deserialize(f) }
+    end
+
+    # Return a class description
+    def get_class(class_entry)
+      result = nil
+      for path in class_entry.path_names
+        path = RiWriter.class_desc_path(path, class_entry)
+        desc = File.open(path) {|f| RI::Description.deserialize(f) }
+        if result
+          result.merge_in(desc)
+        else
+          result = desc
+        end
+      end
+      result
+    end
+
+    # return the names of all classes and modules
+    def full_class_names
+      res = []
+      find_classes_in(res, @cache.toplevel)
+    end
+
+    # return a list of all classes, modules, and methods
+    def all_names
+      res = []
+      find_names_in(res, @cache.toplevel)
+    end
+
+    # ----
+    private
+    # ----
+
+    def find_classes_in(res, klass)
+      classes = klass.classes_and_modules
+      for c in classes
+        res << c.full_name
+        find_classes_in(res, c)
+      end
+      res
+    end
+
+    def find_names_in(res, klass)
+      classes = klass.classes_and_modules
+      for c in classes
+        res << c.full_name
+        res.concat c.all_method_names
+        find_names_in(res, c)
+      end
+      res
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/ri/ri_util.rb b/ruby_1_8_6/lib/rdoc/ri/ri_util.rb
new file mode 100644
index 0000000000..8a01255897
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/ri/ri_util.rb
@@ -0,0 +1,75 @@
+######################################################################
+
+class RiError < Exception; end
+#
+# Break argument into its constituent class or module names, an
+# optional method type, and a method name
+
+class NameDescriptor
+
+  attr_reader :class_names
+  attr_reader :method_name
+
+  # true and false have the obvious meaning. nil means we don't care
+  attr_reader :is_class_method
+
+  # arg may be
+  # 1. a class or module name (optionally qualified with other class
+  #    or module names (Kernel, File::Stat etc)
+  # 2. a method name
+  # 3. a method name qualified by a optionally fully qualified class
+  #    or module name
+  #
+  # We're fairly casual about delimiters: folks can say Kernel::puts,
+  # Kernel.puts, or Kernel\#puts for example. There's one exception:
+  # if you say IO::read, we look for a class method, but if you
+  # say IO.read, we look for an instance method
+
+  def initialize(arg)
+    @class_names = []
+    separator = nil
+
+    tokens = arg.split(/(\.|::|#)/)
+
+    # Skip leading '::', '#' or '.', but remember it might
+    # be a method name qualifier
+    separator = tokens.shift if tokens[0] =~ /^(\.|::|#)/
+
+    # Skip leading '::', but remember we potentially have an inst
+
+    # leading stuff must be class names
+    
+    while tokens[0] =~ /^[A-Z]/
+      @class_names << tokens.shift
+      unless tokens.empty?
+        separator = tokens.shift
+        break unless separator == "::"
+      end
+    end
+    
+    # Now must have a single token, the method name, or an empty
+    # array
+    unless tokens.empty?
+      @method_name = tokens.shift
+      # We may now have a trailing !, ?, or = to roll into
+      # the method name
+      if !tokens.empty? && tokens[0] =~ /^[!?=]$/
+        @method_name << tokens.shift
+      end
+
+      if @method_name =~ /::|\.|#/ or !tokens.empty?
+        raise RiError.new("Bad argument: #{arg}") 
+      end
+      if separator && separator != '.'
+        @is_class_method = separator == "::"
+      end
+    end
+  end
+
+  # Return the full class name (with '::' between the components)
+  # or "" if there's no class name
+
+  def full_class_name
+    @class_names.join("::")
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/ri/ri_writer.rb b/ruby_1_8_6/lib/rdoc/ri/ri_writer.rb
new file mode 100644
index 0000000000..78c68e8409
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/ri/ri_writer.rb
@@ -0,0 +1,62 @@
+require 'fileutils'
+
+module RI
+  class RiWriter
+
+    def RiWriter.class_desc_path(dir, class_desc)
+      File.join(dir, "cdesc-" + class_desc.name + ".yaml")
+    end
+
+    
+    # Convert a name from internal form (containing punctuation)
+    # to an external form (where punctuation is replaced
+    # by %xx)
+
+    def RiWriter.internal_to_external(name)
+      name.gsub(/\W/) { sprintf("%%%02x", $&[0]) }
+    end
+
+    # And the reverse operation
+    def RiWriter.external_to_internal(name)
+      name.gsub(/%([0-9a-f]{2,2})/) { $1.to_i(16).chr }
+    end
+
+    def initialize(base_dir)
+      @base_dir = base_dir
+    end
+
+    def remove_class(class_desc)
+      FileUtils.rm_rf(path_to_dir(class_desc.full_name))
+    end
+
+    def add_class(class_desc)
+      dir = path_to_dir(class_desc.full_name)
+      FileUtils.mkdir_p(dir)
+      class_file_name = RiWriter.class_desc_path(dir, class_desc)
+      File.open(class_file_name, "w") do |f|
+        f.write(class_desc.serialize)
+      end
+    end
+
+    def add_method(class_desc, method_desc)
+      dir = path_to_dir(class_desc.full_name)
+      file_name = RiWriter.internal_to_external(method_desc.name)
+      meth_file_name = File.join(dir, file_name)
+      if method_desc.is_singleton
+        meth_file_name += "-c.yaml"
+      else
+        meth_file_name += "-i.yaml"
+      end
+
+      File.open(meth_file_name, "w") do |f|
+        f.write(method_desc.serialize)
+      end
+    end
+
+    private
+
+    def path_to_dir(class_name)
+      File.join(@base_dir, *class_name.split('::'))
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/template.rb b/ruby_1_8_6/lib/rdoc/template.rb
new file mode 100644
index 0000000000..469e10fb4b
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/template.rb
@@ -0,0 +1,234 @@
+# Cheap-n-cheerful HTML page template system. You create a 
+# template containing:
+#
+# * variable names between percent signs (<tt>%fred%</tt>)
+# * blocks of repeating stuff:
+#
+#     START:key
+#       ... stuff
+#     END:key
+#
+# You feed the code a hash. For simple variables, the values
+# are resolved directly from the hash. For blocks, the hash entry
+# corresponding to +key+ will be an array of hashes. The block will
+# be generated once for each entry. Blocks can be nested arbitrarily
+# deeply.
+#
+# The template may also contain
+#
+#   IF:key
+#     ... stuff
+#   ENDIF:key
+#
+# _stuff_ will only be included in the output if the corresponding
+# key is set in the value hash.
+#
+# Usage:  Given a set of templates <tt>T1, T2,</tt> etc
+#
+#            values = { "name" => "Dave", state => "TX" }
+#
+#            t = TemplatePage.new(T1, T2, T3)
+#            File.open(name, "w") {|f| t.write_html_on(f, values)}
+#         or
+#            res = ''
+#            t.write_html_on(res, values)
+#
+#
+
+class TemplatePage
+
+  ##########
+  # A context holds a stack of key/value pairs (like a symbol
+  # table). When asked to resolve a key, it first searches the top of
+  # the stack, then the next level, and so on until it finds a match
+  # (or runs out of entries)
+
+  class Context
+    def initialize
+      @stack = []
+    end
+
+    def push(hash)
+      @stack.push(hash)
+    end
+
+    def pop
+      @stack.pop
+    end
+
+    # Find a scalar value, throwing an exception if not found. This
+    # method is used when substituting the %xxx% constructs
+
+    def find_scalar(key)
+      @stack.reverse_each do |level|
+        if val = level[key]
+          return val unless val.kind_of? Array
+        end
+      end
+      raise "Template error: can't find variable '#{key}'"
+    end
+
+    # Lookup any key in the stack of hashes
+
+    def lookup(key)
+      @stack.reverse_each do |level|
+        val = level[key]
+        return val if val
+      end
+      nil
+    end
+  end
+
+  #########
+  # Simple class to read lines out of a string
+
+  class LineReader
+    # we're initialized with an array of lines
+    def initialize(lines)
+      @lines = lines
+    end
+
+    # read the next line 
+    def read
+      @lines.shift
+    end
+
+    # Return a list of lines up to the line that matches
+    # a pattern. That last line is discarded.
+    def read_up_to(pattern)
+      res = []
+      while line = read
+        if pattern.match(line)
+          return LineReader.new(res) 
+        else
+          res << line
+        end
+      end
+      raise "Missing end tag in template: #{pattern.source}"
+    end
+
+    # Return a copy of ourselves that can be modified without
+    # affecting us
+    def dup
+      LineReader.new(@lines.dup)
+    end
+  end
+
+
+
+  # +templates+ is an array of strings containing the templates.
+  # We start at the first, and substitute in subsequent ones
+  # where the string <tt>!INCLUDE!</tt> occurs. For example,
+  # we could have the overall page template containing
+  #
+  #   <html><body>
+  #     <h1>Master</h1>
+  #     !INCLUDE!
+  #   </bost></html>
+  #
+  # and substitute subpages in to it by passing [master, sub_page].
+  # This gives us a cheap way of framing pages
+
+  def initialize(*templates)
+    result = "!INCLUDE!"
+    templates.each do |content|
+      result.sub!(/!INCLUDE!/, content)
+    end
+    @lines = LineReader.new(result.split($/))
+  end
+
+  # Render the templates into HTML, storing the result on +op+ 
+  # using the method <tt><<</tt>. The <tt>value_hash</tt> contains
+  # key/value pairs used to drive the substitution (as described above)
+
+  def write_html_on(op, value_hash)
+    @context = Context.new
+    op << substitute_into(@lines, value_hash).tr("\000", '\\')
+  end
+
+
+  # Substitute a set of key/value pairs into the given template. 
+  # Keys with scalar values have them substituted directly into
+  # the page. Those with array values invoke <tt>substitute_array</tt>
+  # (below), which examples a block of the template once for each 
+  # row in the array.
+  #
+  # This routine also copes with the <tt>IF:</tt>_key_ directive,
+  # removing chunks of the template if the corresponding key
+  # does not appear in the hash, and the START: directive, which
+  # loops its contents for each value in an array
+
+  def substitute_into(lines, values)
+    @context.push(values)
+    skip_to = nil
+    result = []
+
+    while line = lines.read
+
+      case line
+
+      when /^IF:(\w+)/
+        lines.read_up_to(/^ENDIF:#$1/) unless @context.lookup($1)
+
+    when /^IFNOT:(\w+)/
+        lines.read_up_to(/^ENDIF:#$1/) if @context.lookup($1)
+
+      when /^ENDIF:/
+        ;
+
+      when /^START:(\w+)/
+        tag = $1
+        body = lines.read_up_to(/^END:#{tag}/)
+        inner_values = @context.lookup(tag)
+        raise "unknown tag: #{tag}" unless inner_values
+        raise "not array: #{tag}"   unless inner_values.kind_of?(Array)
+        inner_values.each do |vals|
+          result << substitute_into(body.dup, vals)
+        end
+      else
+        result << expand_line(line.dup)
+      end
+    end
+
+    @context.pop
+
+    result.join("\n")
+  end
+
+  # Given an individual line, we look for %xxx% constructs and 
+  # HREF:ref:name: constructs, substituting for each.
+
+  def expand_line(line)
+    # Generate a cross reference if a reference is given,
+    # otherwise just fill in the name part
+
+    line.gsub!(/HREF:(\w+?):(\w+?):/) {
+      ref = @context.lookup($1)
+      name = @context.find_scalar($2)
+
+      if ref and !ref.kind_of?(Array)
+	"<a href=\"#{ref}\">#{name}</a>"
+      else
+	name
+      end
+    }
+
+    # Substitute in values for %xxx% constructs.  This is made complex
+    # because the replacement string may contain characters that are
+    # meaningful to the regexp (like \1)
+
+    line = line.gsub(/%([a-zA-Z]\w*)%/) {
+      val = @context.find_scalar($1) 
+      val.tr('\\', "\000")
+    }
+
+
+    line
+  rescue Exception => e
+    $stderr.puts "Error in template: #{e}"
+    $stderr.puts "Original line: #{line}"
+    exit
+  end
+
+end
+
diff --git a/ruby_1_8_6/lib/rdoc/tokenstream.rb b/ruby_1_8_6/lib/rdoc/tokenstream.rb
new file mode 100644
index 0000000000..0a0720d8a9
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/tokenstream.rb
@@ -0,0 +1,25 @@
+# A TokenStream is a list of tokens, gathered during the parse
+# of some entity (say a method). Entities populate these streams
+# by being registered with the lexer. Any class can collect tokens
+# by including TokenStream. From the outside, you use such an object
+# by calling the start_collecting_tokens method, followed by calls
+# to add_token and pop_token
+
+module TokenStream
+  def token_stream
+    @token_stream
+  end
+
+  def start_collecting_tokens
+    @token_stream = []
+  end
+  def add_token(tk)
+    @token_stream << tk
+  end
+  def add_tokens(tks)
+    tks.each  {|tk| add_token(tk)}
+  end
+  def pop_token
+    @token_stream.pop
+  end
+end
diff --git a/ruby_1_8_6/lib/rdoc/usage.rb b/ruby_1_8_6/lib/rdoc/usage.rb
new file mode 100644
index 0000000000..def516b3d7
--- /dev/null
+++ b/ruby_1_8_6/lib/rdoc/usage.rb
@@ -0,0 +1,210 @@
+# = Synopsis
+#
+# This library allows command-line tools to encapsulate their usage
+# as a comment at the top of the main file. Calling <tt>RDoc::usage</tt>
+# then displays some or all of that comment, and optionally exits
+# the program with an exit status. We always look for the comment
+# in the main program file, so it is safe to call this method
+# from anywhere in the executing program.
+#
+# = Usage
+#
+#   RDoc::usage( [ exit_status ], [ section, ...])
+#   RDoc::usage_no_exit( [ section, ...])
+#
+# where:
+#
+# exit_status::
+#     the integer exit code (default zero). RDoc::usage will exit
+#     the calling program with this status.
+#
+# section::
+#     an optional list of section names. If specified, only the
+#     sections with the given names as headings will be output.
+#     For example, this section is named 'Usage', and the next
+#     section is named 'Examples'. The section names are case
+#     insensitive.
+#
+# = Examples
+#
+#    # Comment block describing usage
+#    # with (optional) section headings
+#    # . . .
+#
+#    require 'rdoc/usage'
+#
+#    # Display all usage and exit with a status of 0
+#
+#    RDoc::usage
+#
+#    # Display all usage and exit with a status of 99
+#
+#    RDoc::usage(99)
+#
+#    # Display usage in the 'Summary' section only, then
+#    # exit with a status of 99
+#
+#    RDoc::usage(99, 'Summary')
+#
+#    # Display information in the Author and Copyright
+#    # sections, then exit 0.
+#    
+#    RDoc::usage('Author', 'Copyright')
+#
+#    # Display information in the Author and Copyright
+#    # sections, but don't exit
+#  
+#    RDoc::usage_no_exit('Author', 'Copyright')
+#
+# = Author
+#
+# Dave Thomas, The Pragmatic Programmers, LLC
+#
+# = Copyright
+#
+# Copyright (c) 2004 Dave Thomas.
+# Licensed under the same terms as Ruby
+#
+
+require 'rdoc/markup/simple_markup'
+require 'rdoc/markup/simple_markup/to_flow'
+require 'rdoc/ri/ri_formatter'
+require 'rdoc/ri/ri_options'
+
+module RDoc
+
+  # Display usage information from the comment at the top of
+  # the file. String arguments identify specific sections of the
+  # comment to display. An optional integer first argument
+  # specifies the exit status  (defaults to 0)
+
+  def RDoc.usage(*args)
+    exit_code = 0
+
+    if args.size > 0
+      status = args[0]
+      if status.respond_to?(:to_int)
+        exit_code = status.to_int
+        args.shift
+      end
+    end
+
+    # display the usage and exit with the given code
+    usage_no_exit(*args)
+    exit(exit_code)
+  end
+
+  # Display usage
+  def RDoc.usage_no_exit(*args)
+    main_program_file = caller[-1].sub(/:\d+$/, '')
+    comment = File.open(main_program_file) do |file|
+      find_comment(file)
+    end
+
+    comment = comment.gsub(/^\s*#/, '')
+
+    markup = SM::SimpleMarkup.new
+    flow_convertor = SM::ToFlow.new
+    
+    flow = markup.convert(comment, flow_convertor)
+
+    format = "plain"
+
+    unless args.empty?
+      flow = extract_sections(flow, args)
+    end
+
+    options = RI::Options.instance
+    if args = ENV["RI"]
+      options.parse(args.split)
+    end
+    formatter = options.formatter.new(options, "")
+    formatter.display_flow(flow)
+  end
+
+  ######################################################################
+
+  private
+
+  # Find the first comment in the file (that isn't a shebang line)
+  # If the file doesn't start with a comment, report the fact
+  # and return empty string
+
+  def RDoc.gets(file)
+    if (line = file.gets) && (line =~ /^#!/) # shebang
+      throw :exit, find_comment(file)
+    else
+      line
+    end
+  end
+
+  def RDoc.find_comment(file)
+    catch(:exit) do
+      # skip leading blank lines
+      0 while (line = gets(file)) && (line =~ /^\s*$/)
+
+      comment = []
+      while line && line =~ /^\s*#/
+        comment << line
+        line = gets(file)
+      end
+
+      0 while line && (line = gets(file))
+      return no_comment if comment.empty?
+      return comment.join
+    end
+  end
+
+
+  #####
+  # Given an array of flow items and an array of section names, extract those
+  # sections from the flow which have headings corresponding to
+  # a section name in the list. Return them in the order
+  # of names in the +sections+ array.
+
+  def RDoc.extract_sections(flow, sections)
+    result = []
+    sections.each do |name|
+      name = name.downcase
+      copy_upto_level = nil
+
+      flow.each do |item|
+        case item
+        when SM::Flow::H
+          if copy_upto_level && item.level >= copy_upto_level
+            copy_upto_level = nil
+          else
+            if item.text.downcase == name
+              result << item
+              copy_upto_level = item.level
+            end
+          end
+        else
+          if copy_upto_level
+            result << item
+          end
+        end
+      end
+    end
+    if result.empty?
+      puts "Note to developer: requested section(s) [#{sections.join(', ')}] " +
+           "not found"
+      result = flow
+    end
+    result
+  end
+
+  #####
+  # Report the fact that no doc comment count be found
+  def RDoc.no_comment
+    $stderr.puts "No usage information available for this program"
+    ""
+  end
+end
+
+
+if $0 == __FILE__
+
+  RDoc::usage(*ARGV)
+
+end
diff --git a/ruby_1_8_6/lib/readbytes.rb b/ruby_1_8_6/lib/readbytes.rb
new file mode 100644
index 0000000000..ebb5fc0bd4
--- /dev/null
+++ b/ruby_1_8_6/lib/readbytes.rb
@@ -0,0 +1,41 @@
+# TruncatedDataError is raised when IO#readbytes fails to read enough data.
+
+class TruncatedDataError<IOError
+  def initialize(mesg, data) # :nodoc:
+    @data = data
+    super(mesg)
+  end
+
+  # The read portion of an IO#readbytes attempt.
+  attr_reader :data
+end
+
+class IO
+  # Reads exactly +n+ bytes.
+  #
+  # If the data read is nil an EOFError is raised.
+  #
+  # If the data read is too short a TruncatedDataError is raised and the read
+  # data is obtainable via its #data method.
+  def readbytes(n)
+    str = read(n)
+    if str == nil
+      raise EOFError, "End of file reached"
+    end
+    if str.size < n
+      raise TruncatedDataError.new("data truncated", str) 
+    end
+    str
+  end
+end
+
+if __FILE__ == $0
+  begin
+    loop do
+      print STDIN.readbytes(6)
+    end
+  rescue TruncatedDataError
+    p $!.data
+    raise
+  end
+end
diff --git a/ruby_1_8_6/lib/resolv-replace.rb b/ruby_1_8_6/lib/resolv-replace.rb
new file mode 100644
index 0000000000..5d15b4577c
--- /dev/null
+++ b/ruby_1_8_6/lib/resolv-replace.rb
@@ -0,0 +1,62 @@
+require 'socket'
+require 'resolv'
+
+class << IPSocket
+  alias original_resolv_getaddress getaddress
+  def getaddress(host)
+    begin
+      return Resolv.getaddress(host).to_s
+    rescue Resolv::ResolvError
+      raise SocketError, "Hostname not known: #{host}"
+    end
+  end
+end
+
+class TCPSocket
+  alias original_resolv_initialize initialize
+  def initialize(host, serv, *rest)
+    rest[0] = IPSocket.getaddress(rest[0]) unless rest.empty?
+    original_resolv_initialize(IPSocket.getaddress(host), serv, *rest)
+  end
+end
+
+class UDPSocket
+  alias original_resolv_bind bind
+  def bind(host, port)
+    original_resolv_bind(IPSocket.getaddress(host), port)
+  end
+
+  alias original_resolv_connect connect
+  def connect(host, port)
+    original_resolv_connect(IPSocket.getaddress(host), port)
+  end
+
+  alias original_resolv_send send
+  def send(mesg, flags, *rest)
+    if rest.length == 2
+      host, port = rest
+      begin
+        addrs = Resolv.getaddresses(host)
+      rescue Resolv::ResolvError
+        raise SocketError, "Hostname not known: #{host}"
+      end
+      err = nil
+      addrs[0...-1].each {|addr|
+        begin
+          return original_resolv_send(mesg, flags, addr, port)
+        rescue SystemCallError
+        end
+      }
+      original_resolv_send(mesg, flags, addrs[-1], port)
+    else
+      original_resolv_send(mesg, flags, *rest)
+    end
+  end
+end
+
+class SOCKSSocket
+  alias original_resolv_initialize initialize
+  def initialize(host, serv)
+    original_resolv_initialize(IPSocket.getaddress(host), port)
+  end
+end if defined? SOCKSSocket
diff --git a/ruby_1_8_6/lib/resolv.rb b/ruby_1_8_6/lib/resolv.rb
new file mode 100644
index 0000000000..49e40bdf07
--- /dev/null
+++ b/ruby_1_8_6/lib/resolv.rb
@@ -0,0 +1,1884 @@
+=begin
+= resolv library
+resolv.rb is a resolver library written in Ruby.
+Since it is written in Ruby, it is thread-aware.
+I.e. it can resolv many hostnames concurrently.
+
+It is possible to lookup various resources of DNS using DNS module directly.
+
+== example
+  p Resolv.getaddress("www.ruby-lang.org")
+  p Resolv.getname("210.251.121.214")
+
+  Resolv::DNS.open {|dns|
+    p dns.getresources("www.ruby-lang.org", Resolv::DNS::Resource::IN::A).collect {|r| r.address}
+    p dns.getresources("ruby-lang.org", Resolv::DNS::Resource::IN::MX).collect {|r| [r.exchange.to_s, r.preference]}
+  }
+
+== Resolv class
+
+=== class methods
+--- Resolv.getaddress(name)
+--- Resolv.getaddresses(name)
+--- Resolv.each_address(name) {|address| ...}
+    They lookups IP addresses of ((|name|)) which represents a hostname
+    as a string by default resolver.
+
+    getaddress returns first entry of lookupped addresses.
+    getaddresses returns lookupped addresses as an array.
+    each_address iterates over lookupped addresses.
+
+--- Resolv.getname(address)
+--- Resolv.getnames(address)
+--- Resolv.each_name(address) {|name| ...}
+    lookups hostnames of ((|address|)) which represents IP address as a string.
+
+    getname returns first entry of lookupped names.
+    getnames returns lookupped names as an array.
+    each_names iterates over lookupped names.
+
+== Resolv::Hosts class
+hostname resolver using /etc/hosts format.
+
+=== class methods
+--- Resolv::Hosts.new(hosts='/etc/hosts')
+
+=== methods
+--- Resolv::Hosts#getaddress(name)
+--- Resolv::Hosts#getaddresses(name)
+--- Resolv::Hosts#each_address(name) {|address| ...}
+    address lookup methods.
+
+--- Resolv::Hosts#getname(address)
+--- Resolv::Hosts#getnames(address)
+--- Resolv::Hosts#each_name(address) {|name| ...}
+    hostnames lookup methods.
+
+== Resolv::DNS class
+DNS stub resolver.
+
+=== class methods
+--- Resolv::DNS.new(config_info=nil)
+
+    ((|config_info|)) should be nil, a string or a hash.
+    If nil is given, /etc/resolv.conf and platform specific information is used.
+    If a string is given, it should be a filename which format is same as /etc/resolv.conf.
+    If a hash is given, it may contains information for nameserver, search and ndots as follows.
+
+      Resolv::DNS.new({:nameserver=>["210.251.121.21"], :search=>["ruby-lang.org"], :ndots=>1})
+
+--- Resolv::DNS.open(config_info=nil)
+--- Resolv::DNS.open(config_info=nil) {|dns| ...}
+
+=== methods
+--- Resolv::DNS#close
+
+--- Resolv::DNS#getaddress(name)
+--- Resolv::DNS#getaddresses(name)
+--- Resolv::DNS#each_address(name) {|address| ...}
+    address lookup methods.
+
+    ((|name|)) must be a instance of Resolv::DNS::Name or String.  Lookupped
+    address is represented as an instance of Resolv::IPv4 or Resolv::IPv6.
+
+--- Resolv::DNS#getname(address)
+--- Resolv::DNS#getnames(address)
+--- Resolv::DNS#each_name(address) {|name| ...}
+    hostnames lookup methods.
+
+    ((|address|)) must be a instance of Resolv::IPv4, Resolv::IPv6 or String.
+    Lookupped name is represented as an instance of Resolv::DNS::Name.
+
+--- Resolv::DNS#getresource(name, typeclass)
+--- Resolv::DNS#getresources(name, typeclass)
+--- Resolv::DNS#each_resource(name, typeclass) {|resource| ...}
+    They lookup DNS resources of ((|name|)).
+    ((|name|)) must be a instance of Resolv::Name or String.
+
+    ((|typeclass|)) should be one of follows:
+    * Resolv::DNS::Resource::IN::ANY
+    * Resolv::DNS::Resource::IN::NS
+    * Resolv::DNS::Resource::IN::CNAME
+    * Resolv::DNS::Resource::IN::SOA
+    * Resolv::DNS::Resource::IN::HINFO
+    * Resolv::DNS::Resource::IN::MINFO
+    * Resolv::DNS::Resource::IN::MX
+    * Resolv::DNS::Resource::IN::TXT
+    * Resolv::DNS::Resource::IN::ANY
+    * Resolv::DNS::Resource::IN::A
+    * Resolv::DNS::Resource::IN::WKS
+    * Resolv::DNS::Resource::IN::PTR
+    * Resolv::DNS::Resource::IN::AAAA
+
+    Lookupped resource is represented as an instance of (a subclass of)
+    Resolv::DNS::Resource. 
+    (Resolv::DNS::Resource::IN::A, etc.)
+
+== Resolv::DNS::Resource::IN::NS class
+--- name
+== Resolv::DNS::Resource::IN::CNAME class
+--- name
+== Resolv::DNS::Resource::IN::SOA class
+--- mname
+--- rname
+--- serial
+--- refresh
+--- retry
+--- expire
+--- minimum
+== Resolv::DNS::Resource::IN::HINFO class
+--- cpu
+--- os
+== Resolv::DNS::Resource::IN::MINFO class
+--- rmailbx
+--- emailbx
+== Resolv::DNS::Resource::IN::MX class
+--- preference
+--- exchange
+== Resolv::DNS::Resource::IN::TXT class
+--- data
+== Resolv::DNS::Resource::IN::A class
+--- address
+== Resolv::DNS::Resource::IN::WKS class
+--- address
+--- protocol
+--- bitmap
+== Resolv::DNS::Resource::IN::PTR class
+--- name
+== Resolv::DNS::Resource::IN::AAAA class
+--- address
+
+== Resolv::DNS::Name class
+
+=== class methods
+--- Resolv::DNS::Name.create(name)
+
+=== methods
+--- Resolv::DNS::Name#to_s
+
+== Resolv::DNS::Resource class
+
+== Resolv::IPv4 class
+=== class methods
+--- Resolv::IPv4.create(address)
+
+=== methods
+--- Resolv::IPv4#to_s
+--- Resolv::IPv4#to_name
+
+=== constants
+--- Resolv::IPv4::Regex
+    regular expression for IPv4 address.
+
+== Resolv::IPv6 class
+=== class methods
+--- Resolv::IPv6.create(address)
+
+=== methods
+--- Resolv::IPv6#to_s
+--- Resolv::IPv6#to_name
+
+=== constants
+--- Resolv::IPv6::Regex
+    regular expression for IPv6 address.
+
+== Bugs
+* NIS is not supported.
+* /etc/nsswitch.conf is not supported.
+* IPv6 is not supported.
+
+=end
+
+require 'socket'
+require 'fcntl'
+require 'timeout'
+require 'thread'
+
+class Resolv
+  def self.getaddress(name)
+    DefaultResolver.getaddress(name)
+  end
+
+  def self.getaddresses(name)
+    DefaultResolver.getaddresses(name)
+  end
+
+  def self.each_address(name, &block)
+    DefaultResolver.each_address(name, &block)
+  end
+
+  def self.getname(address)
+    DefaultResolver.getname(address)
+  end
+
+  def self.getnames(address)
+    DefaultResolver.getnames(address)
+  end
+
+  def self.each_name(address, &proc)
+    DefaultResolver.each_name(address, &proc)
+  end
+
+  def initialize(resolvers=[Hosts.new, DNS.new])
+    @resolvers = resolvers
+  end
+
+  def getaddress(name)
+    each_address(name) {|address| return address}
+    raise ResolvError.new("no address for #{name}")
+  end
+
+  def getaddresses(name)
+    ret = []
+    each_address(name) {|address| ret << address}
+    return ret
+  end
+
+  def each_address(name)
+    if AddressRegex =~ name
+      yield name
+      return
+    end
+    yielded = false
+    @resolvers.each {|r|
+      r.each_address(name) {|address|
+        yield address.to_s
+        yielded = true
+      }
+      return if yielded
+    }
+  end
+
+  def getname(address)
+    each_name(address) {|name| return name}
+    raise ResolvError.new("no name for #{address}")
+  end
+
+  def getnames(address)
+    ret = []
+    each_name(address) {|name| ret << name}
+    return ret
+  end
+
+  def each_name(address)
+    yielded = false
+    @resolvers.each {|r|
+      r.each_name(address) {|name|
+        yield name.to_s
+        yielded = true
+      }
+      return if yielded
+    }
+  end
+
+  class ResolvError < StandardError
+  end
+
+  class ResolvTimeout < TimeoutError
+  end
+
+  class Hosts
+    if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
+      require 'win32/resolv'
+      DefaultFileName = Win32::Resolv.get_hosts_path
+    else
+      DefaultFileName = '/etc/hosts'
+    end
+
+    def initialize(filename = DefaultFileName)
+      @filename = filename
+      @mutex = Mutex.new
+      @initialized = nil
+    end
+
+    def lazy_initialize
+      @mutex.synchronize {
+        unless @initialized
+          @name2addr = {}
+          @addr2name = {}
+          open(@filename) {|f|
+            f.each {|line|
+              line.sub!(/#.*/, '')
+              addr, hostname, *aliases = line.split(/\s+/)
+              next unless addr
+              addr.untaint
+              hostname.untaint
+              @addr2name[addr] = [] unless @addr2name.include? addr
+              @addr2name[addr] << hostname
+              @addr2name[addr] += aliases
+              @name2addr[hostname] = [] unless @name2addr.include? hostname
+              @name2addr[hostname] << addr
+              aliases.each {|n|
+                n.untaint
+                @name2addr[n] = [] unless @name2addr.include? n
+                @name2addr[n] << addr
+              }
+            }
+          }
+          @name2addr.each {|name, arr| arr.reverse!}
+          @initialized = true
+        end
+      }
+      self
+    end
+
+    def getaddress(name)
+      each_address(name) {|address| return address}
+      raise ResolvError.new("#{@filename} has no name: #{name}")
+    end
+
+    def getaddresses(name)
+      ret = []
+      each_address(name) {|address| ret << address}
+      return ret
+    end
+
+    def each_address(name, &proc)
+      lazy_initialize
+      if @name2addr.include?(name)
+        @name2addr[name].each(&proc)
+      end
+    end
+
+    def getname(address)
+      each_name(address) {|name| return name}
+      raise ResolvError.new("#{@filename} has no address: #{address}")
+    end
+
+    def getnames(address)
+      ret = []
+      each_name(address) {|name| ret << name}
+      return ret
+    end
+
+    def each_name(address, &proc)
+      lazy_initialize
+      if @addr2name.include?(address)
+        @addr2name[address].each(&proc)
+      end
+    end
+  end
+
+  class DNS
+    # STD0013 (RFC 1035, etc.)
+    # ftp://ftp.isi.edu/in-notes/iana/assignments/dns-parameters
+
+    Port = 53
+    UDPSize = 512
+
+    DNSThreadGroup = ThreadGroup.new
+
+    def self.open(*args)
+      dns = new(*args)
+      return dns unless block_given?
+      begin
+        yield dns
+      ensure
+        dns.close
+      end
+    end
+
+    def initialize(config_info=nil)
+      @mutex = Mutex.new
+      @config = Config.new(config_info)
+      @initialized = nil
+    end
+
+    def lazy_initialize
+      @mutex.synchronize {
+        unless @initialized
+          @config.lazy_initialize
+
+          if nameserver = @config.single?
+            @requester = Requester::ConnectedUDP.new(nameserver)
+          else
+            @requester = Requester::UnconnectedUDP.new
+          end
+
+          @initialized = true
+        end
+      }
+      self
+    end
+
+    def close
+      @mutex.synchronize {
+        if @initialized
+          @requester.close if @requester
+          @requester = nil
+          @initialized = false
+        end
+      }
+    end
+
+    def getaddress(name)
+      each_address(name) {|address| return address}
+      raise ResolvError.new("DNS result has no information for #{name}")
+    end
+
+    def getaddresses(name)
+      ret = []
+      each_address(name) {|address| ret << address}
+      return ret
+    end
+
+    def each_address(name)
+      each_resource(name, Resource::IN::A) {|resource| yield resource.address}
+    end
+
+    def getname(address)
+      each_name(address) {|name| return name}
+      raise ResolvError.new("DNS result has no information for #{address}")
+    end
+
+    def getnames(address)
+      ret = []
+      each_name(address) {|name| ret << name}
+      return ret
+    end
+
+    def each_name(address)
+      case address
+      when Name
+        ptr = address
+      when IPv4::Regex
+        ptr = IPv4.create(address).to_name
+      when IPv6::Regex
+        ptr = IPv6.create(address).to_name
+      else
+        raise ResolvError.new("cannot interpret as address: #{address}")
+      end
+      each_resource(ptr, Resource::IN::PTR) {|resource| yield resource.name}
+    end
+
+    def getresource(name, typeclass)
+      each_resource(name, typeclass) {|resource| return resource}
+      raise ResolvError.new("DNS result has no information for #{name}")
+    end
+
+    def getresources(name, typeclass)
+      ret = []
+      each_resource(name, typeclass) {|resource| ret << resource}
+      return ret
+    end
+
+    def each_resource(name, typeclass, &proc)
+      lazy_initialize
+      q = Queue.new
+      senders = {}
+      begin
+        @config.resolv(name) {|candidate, tout, nameserver|
+          msg = Message.new
+          msg.rd = 1
+          msg.add_question(candidate, typeclass)
+          unless sender = senders[[candidate, nameserver]]
+            sender = senders[[candidate, nameserver]] =
+              @requester.sender(msg, candidate, q, nameserver)
+          end
+          sender.send
+          reply = reply_name = nil
+          timeout(tout, ResolvTimeout) { reply, reply_name = q.pop }
+          case reply.rcode
+          when RCode::NoError
+            extract_resources(reply, reply_name, typeclass, &proc)
+            return
+          when RCode::NXDomain
+            raise Config::NXDomain.new(reply_name.to_s)
+          else
+            raise Config::OtherResolvError.new(reply_name.to_s)
+          end
+        }
+      ensure
+        @requester.delete(q)
+      end
+    end
+
+    def extract_resources(msg, name, typeclass)
+      if typeclass < Resource::ANY
+        n0 = Name.create(name)
+        msg.each_answer {|n, ttl, data|
+          yield data if n0 == n
+        }
+      end
+      yielded = false
+      n0 = Name.create(name)
+      msg.each_answer {|n, ttl, data|
+        if n0 == n
+          case data
+          when typeclass
+            yield data
+            yielded = true
+          when Resource::CNAME
+            n0 = data.name
+          end
+        end
+      }
+      return if yielded
+      msg.each_answer {|n, ttl, data|
+        if n0 == n
+          case data
+          when typeclass
+            yield data
+          end
+        end
+      }
+    end
+
+    class Requester
+      def initialize
+        @senders = {}
+      end
+
+      def close
+        thread, sock, @thread, @sock = @thread, @sock
+        begin
+          if thread
+            thread.kill
+            thread.join
+          end
+        ensure
+          sock.close if sock
+        end
+      end
+
+      def delete(arg)
+        case arg
+        when Sender
+          @senders.delete_if {|k, s| s == arg }
+        when Queue
+          @senders.delete_if {|k, s| s.queue == arg }
+        else
+          raise ArgumentError.new("neither Sender or Queue: #{arg}")
+        end
+      end
+
+      class Sender
+        def initialize(msg, data, sock, queue)
+          @msg = msg
+          @data = data
+          @sock = sock
+          @queue = queue
+        end
+        attr_reader :queue
+
+        def recv(msg)
+          @queue.push([msg, @data])
+        end
+      end
+
+      class UnconnectedUDP < Requester
+        def initialize
+          super()
+          @sock = UDPSocket.new
+          @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
+          @id = {}
+          @id.default = -1
+          @thread = Thread.new {
+            DNSThreadGroup.add Thread.current
+            loop {
+              reply, from = @sock.recvfrom(UDPSize)
+              msg = begin
+                Message.decode(reply)
+              rescue DecodeError
+                STDERR.print("DNS message decoding error: #{reply.inspect}\n")
+                next
+              end
+              if s = @senders[[[from[3],from[1]],msg.id]]
+                s.recv msg
+              else
+                #STDERR.print("non-handled DNS message: #{msg.inspect} from #{from.inspect}\n")
+              end
+            }
+          }
+        end
+
+        def sender(msg, data, queue, host, port=Port)
+          service = [host, port]
+          id = Thread.exclusive {
+            @id[service] = (@id[service] + 1) & 0xffff
+          }
+          request = msg.encode
+          request[0,2] = [id].pack('n')
+          return @senders[[service, id]] =
+            Sender.new(request, data, @sock, host, port, queue)
+        end
+
+        class Sender < Requester::Sender
+          def initialize(msg, data, sock, host, port, queue)
+            super(msg, data, sock, queue)
+            @host = host
+            @port = port
+          end
+
+          def send
+            @sock.send(@msg, 0, @host, @port)
+          end
+        end
+      end
+
+      class ConnectedUDP < Requester
+        def initialize(host, port=Port)
+          super()
+          @host = host
+          @port = port
+          @sock = UDPSocket.new(host.index(':') ? Socket::AF_INET6 : Socket::AF_INET)
+          @sock.connect(host, port)
+          @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
+          @id = -1
+          @thread = Thread.new {
+            DNSThreadGroup.add Thread.current
+            loop {
+              reply = @sock.recv(UDPSize)
+              msg = begin
+                Message.decode(reply)
+              rescue DecodeError
+                STDERR.print("DNS message decoding error: #{reply.inspect}")
+                next
+              end
+              if s = @senders[msg.id]
+                s.recv msg
+              else
+                #STDERR.print("non-handled DNS message: #{msg.inspect}")
+              end
+            }
+          }
+        end
+
+        def sender(msg, data, queue, host=@host, port=@port)
+          unless host == @host && port == @port
+            raise RequestError.new("host/port don't match: #{host}:#{port}")
+          end
+          id = Thread.exclusive { @id = (@id + 1) & 0xffff }
+          request = msg.encode
+          request[0,2] = [id].pack('n')
+          return @senders[id] = Sender.new(request, data, @sock, queue)
+        end
+
+        class Sender < Requester::Sender
+          def send
+            @sock.send(@msg, 0)
+          end
+        end
+      end
+
+      class TCP < Requester
+        def initialize(host, port=Port)
+          super()
+          @host = host
+          @port = port
+          @sock = TCPSocket.new
+          @sock.connect(host, port)
+          @sock.fcntl(Fcntl::F_SETFD, 1) if defined? Fcntl::F_SETFD
+          @id = -1
+          @senders = {}
+          @thread = Thread.new {
+            DNSThreadGroup.add Thread.current
+            loop {
+              len = @sock.read(2).unpack('n')
+              reply = @sock.read(len)
+              msg = begin
+                Message.decode(reply)
+              rescue DecodeError
+                STDERR.print("DNS message decoding error: #{reply.inspect}")
+                next
+              end
+              if s = @senders[msg.id]
+                s.push msg
+              else
+                #STDERR.print("non-handled DNS message: #{msg.inspect}")
+              end
+            }
+          }
+        end
+
+        def sender(msg, data, queue, host=@host, port=@port)
+          unless host == @host && port == @port
+            raise RequestError.new("host/port don't match: #{host}:#{port}")
+          end
+          id = Thread.exclusive { @id = (@id + 1) & 0xffff }
+          request = msg.encode
+          request[0,2] = [request.length, id].pack('nn')
+          return @senders[id] = Sender.new(request, data, @sock, queue)
+        end
+
+        class Sender < Requester::Sender
+          def send
+            @sock.print(@msg)
+            @sock.flush
+          end
+        end
+      end
+
+      class RequestError < StandardError
+      end
+    end
+
+    class Config
+      def initialize(config_info=nil)
+        @mutex = Mutex.new
+        @config_info = config_info
+        @initialized = nil
+      end
+
+      def Config.parse_resolv_conf(filename)
+        nameserver = []
+        search = nil
+        ndots = 1
+        open(filename) {|f|
+          f.each {|line|
+            line.sub!(/[#;].*/, '')
+            keyword, *args = line.split(/\s+/)
+            args.each { |arg|
+              arg.untaint
+            }
+            next unless keyword
+            case keyword
+            when 'nameserver'
+              nameserver += args
+            when 'domain'
+              next if args.empty?
+              search = [args[0]]
+            when 'search'
+              next if args.empty?
+              search = args
+            when 'options'
+              args.each {|arg|
+                case arg
+                when /\Andots:(\d+)\z/
+                  ndots = $1.to_i
+                end
+              }
+            end
+          }
+        }
+        return { :nameserver => nameserver, :search => search, :ndots => ndots }
+      end
+
+      def Config.default_config_hash(filename="/etc/resolv.conf")
+        if File.exist? filename
+          config_hash = Config.parse_resolv_conf(filename)
+        else
+          if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
+            search, nameserver = Win32::Resolv.get_resolv_info
+            config_hash = {}
+            config_hash[:nameserver] = nameserver if nameserver
+            config_hash[:search] = [search].flatten if search
+          end
+        end
+        config_hash
+      end
+
+      def lazy_initialize
+        @mutex.synchronize {
+          unless @initialized
+            @nameserver = []
+            @search = nil
+            @ndots = 1
+            case @config_info
+            when nil
+              config_hash = Config.default_config_hash
+            when String
+              config_hash = Config.parse_resolv_conf(@config_info)
+            when Hash
+              config_hash = @config_info.dup
+              if String === config_hash[:nameserver]
+                config_hash[:nameserver] = [config_hash[:nameserver]]
+              end
+              if String === config_hash[:search]
+                config_hash[:search] = [config_hash[:search]]
+              end
+            else
+              raise ArgumentError.new("invalid resolv configuration: #{@config_info.inspect}")
+            end
+            @nameserver = config_hash[:nameserver] if config_hash.include? :nameserver
+            @search = config_hash[:search] if config_hash.include? :search
+            @ndots = config_hash[:ndots] if config_hash.include? :ndots
+
+            @nameserver = ['0.0.0.0'] if @nameserver.empty?
+            if @search
+              @search = @search.map {|arg| Label.split(arg) }
+            else
+              hostname = Socket.gethostname
+              if /\./ =~ hostname
+                @search = [Label.split($')]
+              else
+                @search = [[]]
+              end
+            end
+
+            if !@nameserver.kind_of?(Array) ||
+               !@nameserver.all? {|ns| String === ns }
+              raise ArgumentError.new("invalid nameserver config: #{@nameserver.inspect}")
+            end
+
+            if !@search.kind_of?(Array) ||
+               !@search.all? {|ls| ls.all? {|l| Label::Str === l } }
+              raise ArgumentError.new("invalid search config: #{@search.inspect}")
+            end
+
+            if !@ndots.kind_of?(Integer)
+              raise ArgumentError.new("invalid ndots config: #{@ndots.inspect}")
+            end
+
+            @initialized = true
+          end
+        }
+        self
+      end
+
+      def single?
+        lazy_initialize
+        if @nameserver.length == 1
+          return @nameserver[0]
+        else
+          return nil
+        end
+      end
+
+      def generate_candidates(name)
+        candidates = nil
+        name = Name.create(name)
+        if name.absolute?
+          candidates = [name]
+        else
+          if @ndots <= name.length - 1
+            candidates = [Name.new(name.to_a)]
+          else
+            candidates = []
+          end
+          candidates.concat(@search.map {|domain| Name.new(name.to_a + domain)})
+        end
+        return candidates
+      end
+
+      InitialTimeout = 5
+
+      def generate_timeouts
+        ts = [InitialTimeout]
+        ts << ts[-1] * 2 / @nameserver.length
+        ts << ts[-1] * 2
+        ts << ts[-1] * 2
+        return ts
+      end
+
+      def resolv(name)
+        candidates = generate_candidates(name)
+        timeouts = generate_timeouts
+        begin
+          candidates.each {|candidate|
+            begin
+              timeouts.each {|tout|
+                @nameserver.each {|nameserver|
+                  begin
+                    yield candidate, tout, nameserver
+                  rescue ResolvTimeout
+                  end
+                }
+              }
+              raise ResolvError.new("DNS resolv timeout: #{name}")
+            rescue NXDomain
+            end
+          }
+        rescue ResolvError
+        end
+      end
+
+      class NXDomain < ResolvError
+      end
+
+      class OtherResolvError < ResolvError
+      end
+    end
+
+    module OpCode
+      Query = 0
+      IQuery = 1
+      Status = 2
+      Notify = 4
+      Update = 5
+    end
+
+    module RCode
+      NoError = 0
+      FormErr = 1
+      ServFail = 2
+      NXDomain = 3
+      NotImp = 4
+      Refused = 5
+      YXDomain = 6
+      YXRRSet = 7
+      NXRRSet = 8
+      NotAuth = 9
+      NotZone = 10
+      BADVERS = 16
+      BADSIG = 16
+      BADKEY = 17
+      BADTIME = 18
+      BADMODE = 19
+      BADNAME = 20
+      BADALG = 21
+    end
+
+    class DecodeError < StandardError
+    end
+
+    class EncodeError < StandardError
+    end
+
+    module Label
+      def self.split(arg)
+        labels = []
+        arg.scan(/[^\.]+/) {labels << Str.new($&)}
+        return labels
+      end
+
+      class Str
+        def initialize(string)
+          @string = string
+          @downcase = string.downcase
+        end
+        attr_reader :string, :downcase
+
+        def to_s
+          return @string
+        end
+
+        def inspect
+          return "#<#{self.class} #{self.to_s}>"
+        end
+
+        def ==(other)
+          return @downcase == other.downcase
+        end
+
+        def eql?(other)
+          return self == other
+        end
+
+        def hash
+          return @downcase.hash
+        end
+      end
+    end
+
+    class Name
+      def self.create(arg)
+        case arg
+        when Name
+          return arg
+        when String
+          return Name.new(Label.split(arg), /\.\z/ =~ arg ? true : false)
+        else
+          raise ArgumentError.new("cannot interpret as DNS name: #{arg.inspect}")
+        end
+      end
+
+      def initialize(labels, absolute=true)
+        @labels = labels
+        @absolute = absolute
+      end
+
+      def inspect
+        "#<#{self.class}: #{self.to_s}#{@absolute ? '.' : ''}>"
+      end
+
+      def absolute?
+        return @absolute
+      end
+
+      def ==(other)
+        return false unless Name === other
+        return @labels == other.to_a && @absolute == other.absolute?
+      end
+      alias eql? ==
+
+      # tests subdomain-of relation.
+      #
+      #   domain = Resolv::DNS::Name.create("y.z")
+      #   p Resolv::DNS::Name.create("w.x.y.z").subdomain_of?(domain) #=> true
+      #   p Resolv::DNS::Name.create("x.y.z").subdomain_of?(domain) #=> true
+      #   p Resolv::DNS::Name.create("y.z").subdomain_of?(domain) #=> false
+      #   p Resolv::DNS::Name.create("z").subdomain_of?(domain) #=> false
+      #   p Resolv::DNS::Name.create("x.y.z.").subdomain_of?(domain) #=> false
+      #   p Resolv::DNS::Name.create("w.z").subdomain_of?(domain) #=> false
+      #
+      def subdomain_of?(other)
+        raise ArgumentError, "not a domain name: #{other.inspect}" unless Name === other
+        return false if @absolute != other.absolute?
+        other_len = other.length
+        return false if @labels.length <= other_len
+        return @labels[-other_len, other_len] == other.to_a
+      end
+
+      def hash
+        return @labels.hash ^ @absolute.hash
+      end
+
+      def to_a
+        return @labels
+      end
+
+      def length
+        return @labels.length
+      end
+
+      def [](i)
+        return @labels[i]
+      end
+
+      # returns the domain name as a string.
+      #
+      # The domain name doesn't have a trailing dot even if the name object is
+      # absolute.
+      #
+      #   p Resolv::DNS::Name.create("x.y.z.").to_s #=> "x.y.z"
+      #   p Resolv::DNS::Name.create("x.y.z").to_s #=> "x.y.z"
+      #
+      def to_s
+        return @labels.join('.')
+      end
+    end
+
+    class Message
+      @@identifier = -1
+
+      def initialize(id = (@@identifier += 1) & 0xffff)
+        @id = id
+        @qr = 0
+        @opcode = 0
+        @aa = 0
+        @tc = 0
+        @rd = 0 # recursion desired
+        @ra = 0 # recursion available
+        @rcode = 0
+        @question = []
+        @answer = []
+        @authority = []
+        @additional = []
+      end
+
+      attr_accessor :id, :qr, :opcode, :aa, :tc, :rd, :ra, :rcode
+      attr_reader :question, :answer, :authority, :additional
+
+      def ==(other)
+        return @id == other.id &&
+               @qr == other.qr &&
+               @opcode == other.opcode &&
+               @aa == other.aa &&
+               @tc == other.tc &&
+               @rd == other.rd &&
+               @ra == other.ra &&
+               @rcode == other.rcode &&
+               @question == other.question &&
+               @answer == other.answer &&
+               @authority == other.authority &&
+               @additional == other.additional
+      end
+
+      def add_question(name, typeclass)
+        @question << [Name.create(name), typeclass]
+      end
+
+      def each_question
+        @question.each {|name, typeclass|
+          yield name, typeclass
+        }
+      end
+
+      def add_answer(name, ttl, data)
+        @answer << [Name.create(name), ttl, data]
+      end
+
+      def each_answer
+        @answer.each {|name, ttl, data|
+          yield name, ttl, data
+        }
+      end
+
+      def add_authority(name, ttl, data)
+        @authority << [Name.create(name), ttl, data]
+      end
+
+      def each_authority
+        @authority.each {|name, ttl, data|
+          yield name, ttl, data
+        }
+      end
+
+      def add_additional(name, ttl, data)
+        @additional << [Name.create(name), ttl, data]
+      end
+
+      def each_additional
+        @additional.each {|name, ttl, data|
+          yield name, ttl, data
+        }
+      end
+
+      def each_resource
+        each_answer {|name, ttl, data| yield name, ttl, data}
+        each_authority {|name, ttl, data| yield name, ttl, data}
+        each_additional {|name, ttl, data| yield name, ttl, data}
+      end
+
+      def encode
+        return MessageEncoder.new {|msg|
+          msg.put_pack('nnnnnn',
+            @id,
+            (@qr & 1) << 15 |
+            (@opcode & 15) << 11 |
+            (@aa & 1) << 10 |
+            (@tc & 1) << 9 |
+            (@rd & 1) << 8 |
+            (@ra & 1) << 7 |
+            (@rcode & 15),
+            @question.length,
+            @answer.length,
+            @authority.length,
+            @additional.length)
+          @question.each {|q|
+            name, typeclass = q
+            msg.put_name(name)
+            msg.put_pack('nn', typeclass::TypeValue, typeclass::ClassValue)
+          }
+          [@answer, @authority, @additional].each {|rr|
+            rr.each {|r|
+              name, ttl, data = r
+              msg.put_name(name)
+              msg.put_pack('nnN', data.class::TypeValue, data.class::ClassValue, ttl)
+              msg.put_length16 {data.encode_rdata(msg)}
+            }
+          }
+        }.to_s
+      end
+
+      class MessageEncoder
+        def initialize
+          @data = ''
+          @names = {}
+          yield self
+        end
+
+        def to_s
+          return @data
+        end
+
+        def put_bytes(d)
+          @data << d
+        end
+
+        def put_pack(template, *d)
+          @data << d.pack(template)
+        end
+
+        def put_length16
+          length_index = @data.length
+          @data << "\0\0"
+          data_start = @data.length
+          yield
+          data_end = @data.length
+          @data[length_index, 2] = [data_end - data_start].pack("n")
+        end
+
+        def put_string(d)
+          self.put_pack("C", d.length)
+          @data << d
+        end
+
+        def put_string_list(ds)
+          ds.each {|d|
+            self.put_string(d)
+          }
+        end
+
+        def put_name(d)
+          put_labels(d.to_a)
+        end
+
+        def put_labels(d)
+          d.each_index {|i|
+            domain = d[i..-1]
+            if idx = @names[domain]
+              self.put_pack("n", 0xc000 | idx)
+              return
+            else
+              @names[domain] = @data.length
+              self.put_label(d[i])
+            end
+          }
+          @data << "\0"
+        end
+
+        def put_label(d)
+          self.put_string(d.string)
+        end
+      end
+
+      def Message.decode(m)
+        o = Message.new(0)
+        MessageDecoder.new(m) {|msg|
+          id, flag, qdcount, ancount, nscount, arcount =
+            msg.get_unpack('nnnnnn')
+          o.id = id
+          o.qr = (flag >> 15) & 1
+          o.opcode = (flag >> 11) & 15
+          o.aa = (flag >> 10) & 1
+          o.tc = (flag >> 9) & 1
+          o.rd = (flag >> 8) & 1
+          o.ra = (flag >> 7) & 1
+          o.rcode = flag & 15
+          (1..qdcount).each {
+            name, typeclass = msg.get_question
+            o.add_question(name, typeclass)
+          }
+          (1..ancount).each {
+            name, ttl, data = msg.get_rr
+            o.add_answer(name, ttl, data)
+          }
+          (1..nscount).each {
+            name, ttl, data = msg.get_rr
+            o.add_authority(name, ttl, data)
+          }
+          (1..arcount).each {
+            name, ttl, data = msg.get_rr
+            o.add_additional(name, ttl, data)
+          }
+        }
+        return o
+      end
+
+      class MessageDecoder
+        def initialize(data)
+          @data = data
+          @index = 0
+          @limit = data.length
+          yield self
+        end
+
+        def get_length16
+          len, = self.get_unpack('n')
+          save_limit = @limit
+          @limit = @index + len
+          d = yield(len)
+          if @index < @limit
+            raise DecodeError.new("junk exists")
+          elsif @limit < @index
+            raise DecodeError.new("limit exceeded")
+          end
+          @limit = save_limit
+          return d
+        end
+
+        def get_bytes(len = @limit - @index)
+          d = @data[@index, len]
+          @index += len
+          return d
+        end
+
+        def get_unpack(template)
+          len = 0
+          template.each_byte {|byte|
+            case byte
+            when ?c, ?C
+              len += 1
+            when ?n
+              len += 2
+            when ?N
+              len += 4
+            else
+              raise StandardError.new("unsupported template: '#{byte.chr}' in '#{template}'")
+            end
+          }
+          raise DecodeError.new("limit exceeded") if @limit < @index + len
+          arr = @data.unpack("@#{@index}#{template}")
+          @index += len
+          return arr
+        end
+
+        def get_string
+          len = @data[@index]
+          raise DecodeError.new("limit exceeded") if @limit < @index + 1 + len
+          d = @data[@index + 1, len]
+          @index += 1 + len
+          return d
+        end
+
+        def get_string_list
+          strings = []
+          while @index < @limit
+            strings << self.get_string
+          end
+          strings
+        end
+
+        def get_name
+          return Name.new(self.get_labels)
+        end
+
+        def get_labels(limit=nil)
+          limit = @index if !limit || @index < limit
+          d = []
+          while true
+            case @data[@index]
+            when 0
+              @index += 1
+              return d
+            when 192..255
+              idx = self.get_unpack('n')[0] & 0x3fff
+              if limit <= idx
+                raise DecodeError.new("non-backward name pointer")
+              end
+              save_index = @index
+              @index = idx
+              d += self.get_labels(limit)
+              @index = save_index
+              return d
+            else
+              d << self.get_label
+            end
+          end
+          return d
+        end
+
+        def get_label
+          return Label::Str.new(self.get_string)
+        end
+
+        def get_question
+          name = self.get_name
+          type, klass = self.get_unpack("nn")
+          return name, Resource.get_class(type, klass)
+        end
+
+        def get_rr
+          name = self.get_name
+          type, klass, ttl = self.get_unpack('nnN')
+          typeclass = Resource.get_class(type, klass)
+          return name, ttl, self.get_length16 {typeclass.decode_rdata(self)}
+        end
+      end
+    end
+
+    class Query
+      def encode_rdata(msg)
+        raise EncodeError.new("#{self.class} is query.") 
+      end
+
+      def self.decode_rdata(msg)
+        raise DecodeError.new("#{self.class} is query.") 
+      end
+    end
+
+    class Resource < Query
+      ClassHash = {}
+
+      def encode_rdata(msg)
+        raise NotImplementedError.new
+      end
+
+      def self.decode_rdata(msg)
+        raise NotImplementedError.new
+      end
+
+      def ==(other)
+        return self.class == other.class &&
+          self.instance_variables == other.instance_variables &&
+          self.instance_variables.collect {|name| self.instance_eval name} ==
+            other.instance_variables.collect {|name| other.instance_eval name}
+      end
+
+      def eql?(other)
+        return self == other
+      end
+
+      def hash
+        h = 0
+        self.instance_variables.each {|name|
+          h ^= self.instance_eval("#{name}.hash")
+        }
+        return h
+      end
+
+      def self.get_class(type_value, class_value)
+        return ClassHash[[type_value, class_value]] ||
+               Generic.create(type_value, class_value)
+      end
+
+      class Generic < Resource
+        def initialize(data)
+          @data = data
+        end
+        attr_reader :data
+
+        def encode_rdata(msg)
+          msg.put_bytes(data)
+        end
+
+        def self.decode_rdata(msg)
+          return self.new(msg.get_bytes)
+        end
+
+        def self.create(type_value, class_value)
+          c = Class.new(Generic)
+          c.const_set(:TypeValue, type_value)
+          c.const_set(:ClassValue, class_value)
+          Generic.const_set("Type#{type_value}_Class#{class_value}", c)
+          ClassHash[[type_value, class_value]] = c
+          return c
+        end
+      end
+
+      class DomainName < Resource
+        def initialize(name)
+          @name = name
+        end
+        attr_reader :name
+
+        def encode_rdata(msg)
+          msg.put_name(@name)
+        end
+
+        def self.decode_rdata(msg)
+          return self.new(msg.get_name)
+        end
+      end
+
+      # Standard (class generic) RRs
+      ClassValue = nil
+
+      class NS < DomainName
+        TypeValue = 2
+      end
+
+      class CNAME < DomainName
+        TypeValue = 5
+      end
+
+      class SOA < Resource
+        TypeValue = 6
+
+        def initialize(mname, rname, serial, refresh, retry_, expire, minimum)
+          @mname = mname
+          @rname = rname
+          @serial = serial
+          @refresh = refresh
+          @retry = retry_
+          @expire = expire
+          @minimum = minimum
+        end
+        attr_reader :mname, :rname, :serial, :refresh, :retry, :expire, :minimum
+
+        def encode_rdata(msg)
+          msg.put_name(@mname)
+          msg.put_name(@rname)
+          msg.put_pack('NNNNN', @serial, @refresh, @retry, @expire, @minimum)
+        end
+
+        def self.decode_rdata(msg)
+          mname = msg.get_name
+          rname = msg.get_name
+          serial, refresh, retry_, expire, minimum = msg.get_unpack('NNNNN')
+          return self.new(
+            mname, rname, serial, refresh, retry_, expire, minimum)
+        end
+      end
+
+      class PTR < DomainName
+        TypeValue = 12
+      end
+
+      class HINFO < Resource
+        TypeValue = 13
+
+        def initialize(cpu, os)
+          @cpu = cpu
+          @os = os
+        end
+        attr_reader :cpu, :os
+
+        def encode_rdata(msg)
+          msg.put_string(@cpu)
+          msg.put_string(@os)
+        end
+
+        def self.decode_rdata(msg)
+          cpu = msg.get_string
+          os = msg.get_string
+          return self.new(cpu, os)
+        end
+      end
+
+      class MINFO < Resource
+        TypeValue = 14
+
+        def initialize(rmailbx, emailbx)
+          @rmailbx = rmailbx
+          @emailbx = emailbx
+        end
+        attr_reader :rmailbx, :emailbx
+
+        def encode_rdata(msg)
+          msg.put_name(@rmailbx)
+          msg.put_name(@emailbx)
+        end
+
+        def self.decode_rdata(msg)
+          rmailbx = msg.get_string
+          emailbx = msg.get_string
+          return self.new(rmailbx, emailbx)
+        end
+      end
+
+      class MX < Resource
+        TypeValue= 15
+
+        def initialize(preference, exchange)
+          @preference = preference
+          @exchange = exchange
+        end
+        attr_reader :preference, :exchange
+
+        def encode_rdata(msg)
+          msg.put_pack('n', @preference)
+          msg.put_name(@exchange)
+        end
+
+        def self.decode_rdata(msg)
+          preference, = msg.get_unpack('n')
+          exchange = msg.get_name
+          return self.new(preference, exchange)
+        end
+      end
+
+      class TXT < Resource
+        TypeValue = 16
+
+        def initialize(first_string, *rest_strings)
+          @strings = [first_string, *rest_strings]
+        end
+        attr_reader :strings
+
+        def data
+          @strings[0]
+        end
+
+        def encode_rdata(msg)
+          msg.put_string_list(@strings)
+        end
+
+        def self.decode_rdata(msg)
+          strings = msg.get_string_list
+          return self.new(*strings)
+        end
+      end
+
+      class ANY < Query
+        TypeValue = 255
+      end
+
+      ClassInsensitiveTypes = [
+        NS, CNAME, SOA, PTR, HINFO, MINFO, MX, TXT, ANY
+      ]
+
+      # ARPA Internet specific RRs
+      module IN
+        ClassValue = 1
+
+        ClassInsensitiveTypes.each {|s|
+          c = Class.new(s)
+          c.const_set(:TypeValue, s::TypeValue)
+          c.const_set(:ClassValue, ClassValue)
+          ClassHash[[s::TypeValue, ClassValue]] = c
+          self.const_set(s.name.sub(/.*::/, ''), c)
+        }
+
+        class A < Resource
+          ClassHash[[TypeValue = 1, ClassValue = ClassValue]] = self
+
+          def initialize(address)
+            @address = IPv4.create(address)
+          end
+          attr_reader :address
+
+          def encode_rdata(msg)
+            msg.put_bytes(@address.address)
+          end
+
+          def self.decode_rdata(msg)
+            return self.new(IPv4.new(msg.get_bytes(4)))
+          end
+        end
+
+        class WKS < Resource
+          ClassHash[[TypeValue = 11, ClassValue = ClassValue]] = self
+
+          def initialize(address, protocol, bitmap)
+            @address = IPv4.create(address)
+            @protocol = protocol
+            @bitmap = bitmap
+          end
+          attr_reader :address, :protocol, :bitmap
+
+          def encode_rdata(msg)
+            msg.put_bytes(@address.address)
+            msg.put_pack("n", @protocol)
+            msg.put_bytes(@bitmap)
+          end
+
+          def self.decode_rdata(msg)
+            address = IPv4.new(msg.get_bytes(4))
+            protocol, = msg.get_unpack("n")
+            bitmap = msg.get_bytes
+            return self.new(address, protocol, bitmap)
+          end
+        end
+
+        class AAAA < Resource
+          ClassHash[[TypeValue = 28, ClassValue = ClassValue]] = self
+
+          def initialize(address)
+            @address = IPv6.create(address)
+          end
+          attr_reader :address
+
+          def encode_rdata(msg)
+            msg.put_bytes(@address.address)
+          end
+
+          def self.decode_rdata(msg)
+            return self.new(IPv6.new(msg.get_bytes(16)))
+          end
+        end
+
+        # SRV resource record defined in RFC 2782
+        # 
+        # These records identify the hostname and port that a service is
+        # available at.
+        # 
+        # The format is:
+        #   _Service._Proto.Name TTL Class SRV Priority Weight Port Target
+        #
+        # The fields specific to SRV are defined in RFC 2782 as meaning:
+        # - +priority+ The priority of this target host.  A client MUST attempt
+        #   to contact the target host with the lowest-numbered priority it can
+        #   reach; target hosts with the same priority SHOULD be tried in an
+        #   order defined by the weight field.  The range is 0-65535.  Note that
+        #   it is not widely implemented and should be set to zero.
+        # 
+        # - +weight+ A server selection mechanism.  The weight field specifies
+        #   a relative weight for entries with the same priority. Larger weights
+        #   SHOULD be given a proportionately higher probability of being
+        #   selected. The range of this number is 0-65535.  Domain administrators
+        #   SHOULD use Weight 0 when there isn't any server selection to do, to
+        #   make the RR easier to read for humans (less noisy). Note that it is
+        #   not widely implemented and should be set to zero.
+        #
+        # - +port+  The port on this target host of this service.  The range is 0-
+        #   65535.
+        # 
+        # - +target+ The domain name of the target host. A target of "." means
+        #   that the service is decidedly not available at this domain.
+        class SRV < Resource
+          ClassHash[[TypeValue = 33, ClassValue = ClassValue]] = self
+
+          # Create a SRV resource record.
+          def initialize(priority, weight, port, target)
+            @priority = priority.to_int
+            @weight = weight.to_int
+            @port = port.to_int
+            @target = Name.create(target)
+          end
+
+          attr_reader :priority, :weight, :port, :target
+
+          def encode_rdata(msg)
+            msg.put_pack("n", @priority)
+            msg.put_pack("n", @weight)
+            msg.put_pack("n", @port)
+            msg.put_name(@target)
+          end
+
+          def self.decode_rdata(msg)
+            priority, = msg.get_unpack("n")
+            weight,   = msg.get_unpack("n")
+            port,     = msg.get_unpack("n")
+            target    = msg.get_name
+            return self.new(priority, weight, port, target)
+          end
+        end
+
+      end
+    end
+  end
+
+  class IPv4
+    Regex = /\A(\d+)\.(\d+)\.(\d+)\.(\d+)\z/
+
+    def self.create(arg)
+      case arg
+      when IPv4
+        return arg
+      when Regex
+        if (0..255) === (a = $1.to_i) &&
+           (0..255) === (b = $2.to_i) &&
+           (0..255) === (c = $3.to_i) &&
+           (0..255) === (d = $4.to_i)
+          return self.new([a, b, c, d].pack("CCCC"))
+        else
+          raise ArgumentError.new("IPv4 address with invalid value: " + arg)
+        end
+      else
+        raise ArgumentError.new("cannot interpret as IPv4 address: #{arg.inspect}")
+      end
+    end
+
+    def initialize(address)
+      unless address.kind_of?(String) && address.length == 4
+        raise ArgumentError.new('IPv4 address must be 4 bytes')
+      end
+      @address = address
+    end
+    attr_reader :address
+
+    def to_s
+      return sprintf("%d.%d.%d.%d", *@address.unpack("CCCC"))
+    end
+
+    def inspect
+      return "#<#{self.class} #{self.to_s}>"
+    end
+
+    def to_name
+      return DNS::Name.create(
+        '%d.%d.%d.%d.in-addr.arpa.' % @address.unpack('CCCC').reverse)
+    end
+
+    def ==(other)
+      return @address == other.address
+    end
+
+    def eql?(other)
+      return self == other
+    end
+
+    def hash
+      return @address.hash
+    end
+  end
+
+  class IPv6
+    Regex_8Hex = /\A
+      (?:[0-9A-Fa-f]{1,4}:){7}
+         [0-9A-Fa-f]{1,4}
+      \z/x
+
+    Regex_CompressedHex = /\A
+      ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::
+      ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)
+      \z/x
+
+    Regex_6Hex4Dec = /\A
+      ((?:[0-9A-Fa-f]{1,4}:){6,6})
+      (\d+)\.(\d+)\.(\d+)\.(\d+)
+      \z/x
+
+    Regex_CompressedHex4Dec = /\A
+      ((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::
+      ((?:[0-9A-Fa-f]{1,4}:)*)
+      (\d+)\.(\d+)\.(\d+)\.(\d+)
+      \z/x
+
+    Regex = /
+      (?:#{Regex_8Hex}) |
+      (?:#{Regex_CompressedHex}) |
+      (?:#{Regex_6Hex4Dec}) |
+      (?:#{Regex_CompressedHex4Dec})/x
+
+    def self.create(arg)
+      case arg
+      when IPv6
+        return arg
+      when String
+        address = ''
+        if Regex_8Hex =~ arg
+          arg.scan(/[0-9A-Fa-f]+/) {|hex| address << [hex.hex].pack('n')}
+        elsif Regex_CompressedHex =~ arg
+          prefix = $1
+          suffix = $2
+          a1 = ''
+          a2 = ''
+          prefix.scan(/[0-9A-Fa-f]+/) {|hex| a1 << [hex.hex].pack('n')}
+          suffix.scan(/[0-9A-Fa-f]+/) {|hex| a2 << [hex.hex].pack('n')}
+          omitlen = 16 - a1.length - a2.length
+          address << a1 << "\0" * omitlen << a2
+        elsif Regex_6Hex4Dec =~ arg
+          prefix, a, b, c, d = $1, $2.to_i, $3.to_i, $4.to_i, $5.to_i
+          if (0..255) === a && (0..255) === b && (0..255) === c && (0..255) === d
+            prefix.scan(/[0-9A-Fa-f]+/) {|hex| address << [hex.hex].pack('n')}
+            address << [a, b, c, d].pack('CCCC')
+          else
+            raise ArgumentError.new("not numeric IPv6 address: " + arg)
+          end
+        elsif Regex_CompressedHex4Dec =~ arg
+          prefix, suffix, a, b, c, d = $1, $2, $3.to_i, $4.to_i, $5.to_i, $6.to_i
+          if (0..255) === a && (0..255) === b && (0..255) === c && (0..255) === d
+            a1 = ''
+            a2 = ''
+            prefix.scan(/[0-9A-Fa-f]+/) {|hex| a1 << [hex.hex].pack('n')}
+            suffix.scan(/[0-9A-Fa-f]+/) {|hex| a2 << [hex.hex].pack('n')}
+            omitlen = 12 - a1.length - a2.length
+            address << a1 << "\0" * omitlen << a2 << [a, b, c, d].pack('CCCC')
+          else
+            raise ArgumentError.new("not numeric IPv6 address: " + arg)
+          end
+        else
+          raise ArgumentError.new("not numeric IPv6 address: " + arg)
+        end
+        return IPv6.new(address)
+      else
+        raise ArgumentError.new("cannot interpret as IPv6 address: #{arg.inspect}")
+      end
+    end
+
+    def initialize(address)
+      unless address.kind_of?(String) && address.length == 16
+        raise ArgumentError.new('IPv6 address must be 16 bytes')
+      end
+      @address = address
+    end
+    attr_reader :address
+
+    def to_s
+      address = sprintf("%X:%X:%X:%X:%X:%X:%X:%X", *@address.unpack("nnnnnnnn"))
+      unless address.sub!(/(^|:)0(:0)+(:|$)/, '::')
+        address.sub!(/(^|:)0(:|$)/, '::')
+      end
+      return address
+    end
+
+    def inspect
+      return "#<#{self.class} #{self.to_s}>"
+    end
+
+    def to_name
+      # ip6.arpa should be searched too. [RFC3152]
+      return DNS::Name.new(
+        @address.unpack("H32")[0].split(//).reverse + ['ip6', 'int'])
+    end
+
+    def ==(other)
+      return @address == other.address
+    end
+
+    def eql?(other)
+      return self == other
+    end
+
+    def hash
+      return @address.hash
+    end
+  end
+
+  DefaultResolver = self.new
+  AddressRegex = /(?:#{IPv4::Regex})|(?:#{IPv6::Regex})/
+end
diff --git a/ruby_1_8_6/lib/rexml/attlistdecl.rb b/ruby_1_8_6/lib/rexml/attlistdecl.rb
new file mode 100644
index 0000000000..d4b5c38af6
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/attlistdecl.rb
@@ -0,0 +1,62 @@
+#vim:ts=2 sw=2 noexpandtab:
+require 'rexml/child'
+require 'rexml/source'
+
+module REXML
+	# This class needs:
+	# * Documentation
+	# * Work!  Not all types of attlists are intelligently parsed, so we just
+	# spew back out what we get in.  This works, but it would be better if
+	# we formatted the output ourselves.
+	#
+	# AttlistDecls provide *just* enough support to allow namespace
+	# declarations.  If you need some sort of generalized support, or have an
+	# interesting idea about how to map the hideous, terrible design of DTD
+	# AttlistDecls onto an intuitive Ruby interface, let me know.  I'm desperate
+	# for anything to make DTDs more palateable.
+	class AttlistDecl < Child
+		include Enumerable
+
+		# What is this?  Got me.
+		attr_reader :element_name
+
+		# Create an AttlistDecl, pulling the information from a Source.  Notice
+		# that this isn't very convenient; to create an AttlistDecl, you basically
+		# have to format it yourself, and then have the initializer parse it.
+		# Sorry, but for the forseeable future, DTD support in REXML is pretty
+		# weak on convenience.  Have I mentioned how much I hate DTDs?
+		def initialize(source)
+			super()
+			if (source.kind_of? Array)
+				@element_name, @pairs, @contents = *source
+			end
+		end
+	
+		# Access the attlist attribute/value pairs.
+		#  value = attlist_decl[ attribute_name ]
+		def [](key)
+			@pairs[key]
+		end
+
+		# Whether an attlist declaration includes the given attribute definition
+		#  if attlist_decl.include? "xmlns:foobar"
+		def include?(key)
+			@pairs.keys.include? key
+		end
+
+		# Itterate over the key/value pairs:
+		#  attlist_decl.each { |attribute_name, attribute_value| ... }
+		def each(&block)
+			@pairs.each(&block)
+		end
+
+		# Write out exactly what we got in.
+		def write out, indent=-1
+			out << @contents
+		end
+
+		def node_type
+			:attlistdecl
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/attribute.rb b/ruby_1_8_6/lib/rexml/attribute.rb
new file mode 100644
index 0000000000..029035d675
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/attribute.rb
@@ -0,0 +1,185 @@
+require "rexml/namespace"
+require 'rexml/text'
+
+module REXML
+	# Defines an Element Attribute; IE, a attribute=value pair, as in:
+	# <element attribute="value"/>.  Attributes can be in their own
+	# namespaces.  General users of REXML will not interact with the
+	# Attribute class much.
+	class Attribute
+		include Node
+		include Namespace
+
+		# The element to which this attribute belongs
+		attr_reader :element
+		# The normalized value of this attribute.  That is, the attribute with
+		# entities intact.
+		attr_writer :normalized	
+		PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\2/um
+
+		# Constructor.
+    # FIXME: The parser doesn't catch illegal characters in attributes
+    #
+    # first:: 
+    #   Either: an Attribute, which this new attribute will become a
+    #   clone of; or a String, which is the name of this attribute
+    # second::
+    #   If +first+ is an Attribute, then this may be an Element, or nil.
+    #   If nil, then the Element parent of this attribute is the parent
+    #   of the +first+ Attribute.  If the first argument is a String, 
+    #   then this must also be a String, and is the content of the attribute.  
+    #   If this is the content, it must be fully normalized (contain no
+    #   illegal characters).
+    # parent::
+    #   Ignored unless +first+ is a String; otherwise, may be the Element 
+    #   parent of this attribute, or nil.
+    #
+		#
+		#  Attribute.new( attribute_to_clone )
+		#  Attribute.new( attribute_to_clone, parent_element )
+		#  Attribute.new( "attr", "attr_value" )
+		#  Attribute.new( "attr", "attr_value", parent_element )
+		def initialize( first, second=nil, parent=nil )
+			@normalized = @unnormalized = @element = nil
+			if first.kind_of? Attribute
+				self.name = first.expanded_name
+				@unnormalized = first.value
+				if second.kind_of? Element
+					@element = second
+				else
+					@element = first.element
+				end
+			elsif first.kind_of? String
+				@element = parent if parent.kind_of? Element
+				self.name = first
+				@normalized = second.to_s
+			else
+				raise "illegal argument #{first.class.name} to Attribute constructor"
+			end
+		end
+
+		# Returns the namespace of the attribute.
+		# 
+		#  e = Element.new( "elns:myelement" )
+		#  e.add_attribute( "nsa:a", "aval" )
+		#  e.add_attribute( "b", "bval" )
+		#  e.attributes.get_attribute( "a" ).prefix   # -> "nsa"
+		#  e.attributes.get_attribute( "b" ).prefix   # -> "elns"
+		#  a = Attribute.new( "x", "y" )
+		#  a.prefix                                   # -> ""
+		def prefix
+			pf = super
+			if pf == ""
+				pf = @element.prefix if @element
+			end
+			pf
+		end
+
+		# Returns the namespace URL, if defined, or nil otherwise
+		# 
+		#  e = Element.new("el")
+		#  e.add_attributes({"xmlns:ns", "http://url"})
+		#  e.namespace( "ns" )              # -> "http://url"
+		def namespace arg=nil
+			arg = prefix if arg.nil?
+			@element.namespace arg
+		end
+
+		# Returns true if other is an Attribute and has the same name and value,
+		# false otherwise.
+		def ==( other )
+			other.kind_of?(Attribute) and other.name==name and other.value==value
+		end
+
+		# Creates (and returns) a hash from both the name and value
+		def hash
+			name.hash + value.hash
+		end
+
+		# Returns this attribute out as XML source, expanding the name
+		#
+		#  a = Attribute.new( "x", "y" )
+		#  a.to_string     # -> "x='y'"
+		#  b = Attribute.new( "ns:x", "y" )
+		#  b.to_string     # -> "ns:x='y'"
+		def to_string
+			if @element and @element.context and @element.context[:attribute_quote] == :quote
+				%Q^#@expanded_name="#{to_s().gsub(/"/, '&quote;')}"^
+			else
+				"#@expanded_name='#{to_s().gsub(/'/, '&apos;')}'"
+			end
+		end
+
+		# Returns the attribute value, with entities replaced
+		def to_s
+			return @normalized if @normalized
+
+			doctype = nil
+			if @element
+				doc = @element.document
+				doctype = doc.doctype if doc
+			end
+
+			@normalized = Text::normalize( @unnormalized, doctype )
+			@unnormalized = nil
+      @normalized
+		end
+
+		# Returns the UNNORMALIZED value of this attribute.  That is, entities
+		# have been expanded to their values
+		def value
+			return @unnormalized if @unnormalized
+			doctype = nil
+			if @element
+				doc = @element.document
+				doctype = doc.doctype if doc
+			end
+			@unnormalized = Text::unnormalize( @normalized, doctype )
+			@normalized = nil
+      @unnormalized
+		end
+
+		# Returns a copy of this attribute
+		def clone
+			Attribute.new self
+		end
+
+		# Sets the element of which this object is an attribute.  Normally, this
+		# is not directly called.
+		#
+		# Returns this attribute
+		def element=( element )
+			@element = element
+			self
+		end
+
+		# Removes this Attribute from the tree, and returns true if successfull
+		# 
+		# This method is usually not called directly.
+		def remove
+			@element.attributes.delete self.name unless @element.nil?
+		end
+
+		# Writes this attribute (EG, puts 'key="value"' to the output)
+		def write( output, indent=-1 )
+			output << to_string
+		end
+
+    def node_type
+      :attribute
+    end
+
+    def inspect
+      rv = ""
+      write( rv )
+      rv
+    end
+
+    def xpath
+      path = @element.xpath
+      path += "/@#{self.expanded_name}"
+      return path
+    end
+	end
+end
+#vim:ts=2 sw=2 noexpandtab:
diff --git a/ruby_1_8_6/lib/rexml/cdata.rb b/ruby_1_8_6/lib/rexml/cdata.rb
new file mode 100644
index 0000000000..efcb71160a
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/cdata.rb
@@ -0,0 +1,67 @@
+require "rexml/text"
+
+module REXML
+	class CData < Text
+		START = '<![CDATA['
+		STOP = ']]>'
+		ILLEGAL = /(\]\]>)/
+
+		#	Constructor.  CData is data between <![CDATA[ ... ]]>
+		#
+		# _Examples_
+		#  CData.new( source )
+		#  CData.new( "Here is some CDATA" )
+		#  CData.new( "Some unprocessed data", respect_whitespace_TF, parent_element )
+		def initialize( first, whitespace=true, parent=nil )
+			super( first, whitespace, parent, true, true, ILLEGAL )
+		end
+
+		# Make a copy of this object
+		# 
+		# _Examples_
+		#  c = CData.new( "Some text" )
+		#  d = c.clone
+		#  d.to_s        # -> "Some text"
+		def clone
+			CData.new self
+		end
+
+		# Returns the content of this CData object
+		#
+		# _Examples_
+		#  c = CData.new( "Some text" )
+		#  c.to_s        # -> "Some text"
+		def to_s
+			@string
+		end
+
+    def value
+      @string
+    end
+
+    # == DEPRECATED
+    # See the rexml/formatters package
+    #
+		# Generates XML output of this object
+		#
+		# output::
+		#   Where to write the string.  Defaults to $stdout
+		# indent::
+    #   The amount to indent this node by
+		# transitive::
+    #   Ignored
+		# ie_hack::
+    #   Ignored
+		#
+		# _Examples_
+		#  c = CData.new( " Some text " )
+		#  c.write( $stdout )     #->  <![CDATA[ Some text ]]>
+		def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
+      Kernel.warn( "#{self.class.name}.write is deprecated" )
+			indent( output, indent )
+			output << START
+			output << @string
+			output << STOP
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/child.rb b/ruby_1_8_6/lib/rexml/child.rb
new file mode 100644
index 0000000000..6d3c9df5e6
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/child.rb
@@ -0,0 +1,96 @@
+require "rexml/node"
+
+module REXML
+	##
+	# A Child object is something contained by a parent, and this class
+	# contains methods to support that.  Most user code will not use this
+	# class directly.
+	class Child
+		include Node
+		attr_reader :parent		# The Parent of this object
+
+		# Constructor.  Any inheritors of this class should call super to make
+		# sure this method is called.
+		# parent::
+		#   if supplied, the parent of this child will be set to the
+		#   supplied value, and self will be added to the parent
+		def initialize( parent = nil )
+			@parent = nil  
+			# Declare @parent, but don't define it.  The next line sets the 
+			# parent.
+			parent.add( self ) if parent
+		end
+
+		# Replaces this object with another object.  Basically, calls
+		# Parent.replace_child
+		#
+		# Returns:: self
+		def replace_with( child )
+			@parent.replace_child( self, child )
+			self
+		end
+
+		# Removes this child from the parent.
+		#
+		# Returns:: self
+		def remove
+			unless @parent.nil?
+				@parent.delete self
+			end
+			self
+		end
+
+		# Sets the parent of this child to the supplied argument.
+		#
+		# other::
+		#   Must be a Parent object.  If this object is the same object as the
+		#   existing parent of this child, no action is taken. Otherwise, this
+		#   child is removed from the current parent (if one exists), and is added
+		#   to the new parent.
+		# Returns:: The parent added
+		def parent=( other )
+			return @parent if @parent == other
+			@parent.delete self if defined? @parent and @parent
+			@parent = other
+		end
+
+		alias :next_sibling :next_sibling_node
+		alias :previous_sibling :previous_sibling_node
+
+		# Sets the next sibling of this child.  This can be used to insert a child
+		# after some other child.
+		#  a = Element.new("a")
+		#  b = a.add_element("b")
+		#  c = Element.new("c")
+		#  b.next_sibling = c
+		#  # => <a><b/><c/></a>
+		def next_sibling=( other )
+		  parent.insert_after self, other
+		end
+
+		# Sets the previous sibling of this child.  This can be used to insert a 
+		# child before some other child.
+		#  a = Element.new("a")
+		#  b = a.add_element("b")
+		#  c = Element.new("c")
+		#  b.previous_sibling = c
+		#  # => <a><b/><c/></a>
+		def previous_sibling=(other)
+		  parent.insert_before self, other
+		end
+
+		# Returns:: the document this child belongs to, or nil if this child
+		# belongs to no document
+		def document
+			return parent.document unless parent.nil?
+			nil
+		end
+
+		# This doesn't yet handle encodings
+		def bytes
+			encoding = document.encoding
+
+			to_s
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/comment.rb b/ruby_1_8_6/lib/rexml/comment.rb
new file mode 100644
index 0000000000..2b9b4b89c9
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/comment.rb
@@ -0,0 +1,80 @@
+require "rexml/child"
+
+module REXML
+	##
+	# Represents an XML comment; that is, text between \<!-- ... -->
+	class Comment < Child
+		include Comparable
+		START = "<!--"
+		STOP = "-->"
+
+		# The content text
+
+		attr_accessor :string
+
+		##
+		# Constructor.  The first argument can be one of three types:
+		# @param first If String, the contents of this comment are set to the 
+		# argument.  If Comment, the argument is duplicated.  If
+		# Source, the argument is scanned for a comment.
+		# @param second If the first argument is a Source, this argument 
+		# should be nil, not supplied, or a Parent to be set as the parent 
+		# of this object
+		def initialize( first, second = nil )
+			#puts "IN COMMENT CONSTRUCTOR; SECOND IS #{second.type}"
+			super(second)
+			if first.kind_of? String
+				@string = first
+			elsif first.kind_of? Comment
+				@string = first.string
+			end
+		end
+
+		def clone
+			Comment.new self
+		end
+
+    # == DEPRECATED
+    # See REXML::Formatters
+    #
+		# output::
+		#	 Where to write the string
+		# indent::
+		#	 An integer.	If -1, no indenting will be used; otherwise, the
+		#	 indentation will be this number of spaces, and children will be
+		#	 indented an additional amount.
+		# transitive::
+		#	 Ignored by this class.	The contents of comments are never modified.
+		# ie_hack::
+		#	 Needed for conformity to the child API, but not used by this class.
+		def write( output, indent=-1, transitive=false, ie_hack=false )
+      Kernel.warn("Comment.write is deprecated.  See REXML::Formatters")
+			indent( output, indent )
+			output << START
+			output << @string
+			output << STOP
+		end
+
+		alias :to_s :string
+
+		##
+		# Compares this Comment to another; the contents of the comment are used
+		# in the comparison.
+		def <=>(other)
+			other.to_s <=> @string
+		end
+
+		##
+		# Compares this Comment to another; the contents of the comment are used
+		# in the comparison.
+		def ==( other )
+			other.kind_of? Comment and
+			(other <=> self) == 0
+		end
+
+    def node_type
+      :comment
+    end
+	end
+end
+#vim:ts=2 sw=2 noexpandtab:
diff --git a/ruby_1_8_6/lib/rexml/doctype.rb b/ruby_1_8_6/lib/rexml/doctype.rb
new file mode 100644
index 0000000000..05cd4ab331
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/doctype.rb
@@ -0,0 +1,271 @@
+require "rexml/parent"
+require "rexml/parseexception"
+require "rexml/namespace"
+require 'rexml/entity'
+require 'rexml/attlistdecl'
+require 'rexml/xmltokens'
+
+module REXML
+  # Represents an XML DOCTYPE declaration; that is, the contents of <!DOCTYPE
+  # ... >.  DOCTYPES can be used to declare the DTD of a document, as well as
+  # being used to declare entities used in the document.
+  class DocType < Parent
+    include XMLTokens
+    START = "<!DOCTYPE"
+    STOP = ">"
+    SYSTEM = "SYSTEM"
+    PUBLIC = "PUBLIC"
+    DEFAULT_ENTITIES = { 
+      'gt'=>EntityConst::GT, 
+      'lt'=>EntityConst::LT, 
+      'quot'=>EntityConst::QUOT, 
+      "apos"=>EntityConst::APOS 
+    }
+
+    # name is the name of the doctype
+    # external_id is the referenced DTD, if given
+    attr_reader :name, :external_id, :entities, :namespaces
+
+    # Constructor
+    #
+    #   dt = DocType.new( 'foo', '-//I/Hate/External/IDs' )
+    #   # <!DOCTYPE foo '-//I/Hate/External/IDs'>
+    #   dt = DocType.new( doctype_to_clone )
+    #   # Incomplete.  Shallow clone of doctype
+    #
+    # +Note+ that the constructor: 
+    #
+    #  Doctype.new( Source.new( "<!DOCTYPE foo 'bar'>" ) )
+    #
+    # is _deprecated_.  Do not use it.  It will probably disappear.
+    def initialize( first, parent=nil )
+      @entities = DEFAULT_ENTITIES
+      @long_name = @uri = nil
+      if first.kind_of? String
+        super()
+        @name = first
+        @external_id = parent
+      elsif first.kind_of? DocType
+        super( parent )
+        @name = first.name
+        @external_id = first.external_id
+      elsif first.kind_of? Array
+        super( parent )
+        @name = first[0]
+        @external_id = first[1]
+        @long_name = first[2]
+        @uri = first[3]
+      elsif first.kind_of? Source
+        super( parent )
+        parser = Parsers::BaseParser.new( first )
+        event = parser.pull
+        if event[0] == :start_doctype
+          @name, @external_id, @long_name, @uri, = event[1..-1]
+        end
+      else
+        super()
+      end
+    end
+
+    def node_type
+      :doctype
+    end
+
+    def attributes_of element
+      rv = []
+      each do |child|
+        child.each do |key,val|
+          rv << Attribute.new(key,val)
+        end if child.kind_of? AttlistDecl and child.element_name == element
+      end
+      rv
+    end
+
+    def attribute_of element, attribute
+      att_decl = find do |child|
+        child.kind_of? AttlistDecl and
+        child.element_name == element and
+        child.include? attribute
+      end
+      return nil unless att_decl
+      att_decl[attribute]
+    end
+
+    def clone
+      DocType.new self
+    end
+
+    # output::
+    #   Where to write the string
+    # indent::
+    #   An integer.  If -1, no indentation will be used; otherwise, the
+    #   indentation will be this number of spaces, and children will be
+    #   indented an additional amount.
+    # transitive::
+    #   Ignored
+    # ie_hack::
+    #   Ignored
+    def write( output, indent=0, transitive=false, ie_hack=false )
+      f = REXML::Formatters::Default.new
+      indent( output, indent )
+      output << START
+      output << ' '
+      output << @name
+      output << " #@external_id" if @external_id
+      output << " #{@long_name.inspect}" if @long_name
+      output << " #{@uri.inspect}" if @uri
+      unless @children.empty?
+        next_indent = indent + 1
+        output << ' ['
+        child = nil    # speed
+        @children.each { |child|
+          output << "\n"
+          f.write( child, output )
+        }
+        output << "\n]"
+      end
+      output << STOP
+    end
+
+    def context
+      @parent.context
+    end
+
+    def entity( name )
+      @entities[name].unnormalized if @entities[name]
+    end
+
+    def add child
+      super(child)
+      @entities = DEFAULT_ENTITIES.clone if @entities == DEFAULT_ENTITIES
+      @entities[ child.name ] = child if child.kind_of? Entity
+    end
+    
+    # This method retrieves the public identifier identifying the document's 
+    # DTD.
+    #
+    # Method contributed by Henrik Martensson
+    def public
+      case @external_id
+      when "SYSTEM"
+        nil
+      when "PUBLIC"
+        strip_quotes(@long_name)
+      end
+    end
+    
+    # This method retrieves the system identifier identifying the document's DTD
+    #
+    # Method contributed by Henrik Martensson
+    def system
+      case @external_id
+      when "SYSTEM"
+        strip_quotes(@long_name)
+      when "PUBLIC"
+        @uri.kind_of?(String) ? strip_quotes(@uri) : nil
+      end
+    end
+    
+    # This method returns a list of notations that have been declared in the
+    # _internal_ DTD subset. Notations in the external DTD subset are not 
+    # listed.
+    #
+    # Method contributed by Henrik Martensson
+    def notations
+      children().select {|node| node.kind_of?(REXML::NotationDecl)}
+    end
+    
+    # Retrieves a named notation. Only notations declared in the internal
+    # DTD subset can be retrieved.
+    #
+    # Method contributed by Henrik Martensson
+    def notation(name)
+      notations.find { |notation_decl|
+        notation_decl.name == name
+      }
+    end
+    
+    private
+    
+    # Method contributed by Henrik Martensson
+    def strip_quotes(quoted_string)
+      quoted_string =~ /^[\'\"].*[\卒\"]$/ ?
+        quoted_string[1, quoted_string.length-2] :
+        quoted_string
+    end
+  end
+
+  # We don't really handle any of these since we're not a validating
+  # parser, so we can be pretty dumb about them.  All we need to be able
+  # to do is spew them back out on a write()
+
+  # This is an abstract class.  You never use this directly; it serves as a
+  # parent class for the specific declarations.
+  class Declaration < Child
+    def initialize src
+      super()
+      @string = src
+    end
+
+    def to_s
+      @string+'>'
+    end
+
+    # == DEPRECATED
+    # See REXML::Formatters
+    #
+    def write( output, indent )
+      output << to_s
+    end
+  end
+  
+  public
+  class ElementDecl < Declaration
+    def initialize( src )
+      super
+    end
+  end
+
+  class ExternalEntity < Child
+    def initialize( src )
+      super()
+      @entity = src
+    end
+    def to_s
+      @entity
+    end
+    def write( output, indent )
+      output << @entity
+    end
+  end
+
+  class NotationDecl < Child
+    attr_accessor :public, :system
+    def initialize name, middle, pub, sys
+      super(nil)
+      @name = name
+      @middle = middle
+      @public = pub
+      @system = sys
+    end
+
+    def to_s
+      "<!NOTATION #@name #@middle#{
+        @public ? ' ' + public.inspect : '' 
+      }#{
+        @system ? ' ' +@system.inspect : ''
+      }>"
+    end
+
+    def write( output, indent=-1 )
+      output << to_s
+    end
+    
+    # This method retrieves the name of the notation.
+    #
+    # Method contributed by Henrik Martensson
+    def name
+      @name
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/document.rb b/ruby_1_8_6/lib/rexml/document.rb
new file mode 100644
index 0000000000..558b5d731a
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/document.rb
@@ -0,0 +1,207 @@
+require "rexml/element"
+require "rexml/xmldecl"
+require "rexml/source"
+require "rexml/comment"
+require "rexml/doctype"
+require "rexml/instruction"
+require "rexml/rexml"
+require "rexml/parseexception"
+require "rexml/output"
+require "rexml/parsers/baseparser"
+require "rexml/parsers/streamparser"
+require "rexml/parsers/treeparser"
+
+module REXML
+  # Represents a full XML document, including PIs, a doctype, etc.  A
+  # Document has a single child that can be accessed by root().
+  # Note that if you want to have an XML declaration written for a document
+  # you create, you must add one; REXML documents do not write a default
+	# declaration for you.  See |DECLARATION| and |write|.
+	class Document < Element
+		# A convenient default XML declaration.  If you want an XML declaration,
+		# the easiest way to add one is mydoc << Document::DECLARATION
+    # +DEPRECATED+
+    # Use: mydoc << XMLDecl.default
+		DECLARATION = XMLDecl.default
+
+		# Constructor
+		# @param source if supplied, must be a Document, String, or IO. 
+		# Documents have their context and Element attributes cloned.
+	  # Strings are expected to be valid XML documents.  IOs are expected
+	  # to be sources of valid XML documents.
+	  # @param context if supplied, contains the context of the document;
+	  # this should be a Hash.
+		def initialize( source = nil, context = {} )
+			super()
+			@context = context
+			return if source.nil?
+			if source.kind_of? Document
+				@context = source.context
+				super source
+			else
+				build(  source )
+			end
+		end
+
+    def node_type
+      :document
+    end
+
+		# Should be obvious
+		def clone
+			Document.new self
+		end
+
+		# According to the XML spec, a root node has no expanded name
+		def expanded_name
+			''
+			#d = doc_type
+			#d ? d.name : "UNDEFINED"
+		end
+
+		alias :name :expanded_name
+
+		# We override this, because XMLDecls and DocTypes must go at the start
+		# of the document
+		def add( child )
+			if child.kind_of? XMLDecl
+				@children.unshift child
+			elsif child.kind_of? DocType
+        # Find first Element or DocType node and insert the decl right 
+        # before it.  If there is no such node, just insert the child at the
+        # end.  If there is a child and it is an DocType, then replace it.
+        insert_before_index = 0
+        @children.find { |x| 
+          insert_before_index += 1
+          x.kind_of?(Element) || x.kind_of?(DocType)
+        }
+        if @children[ insert_before_index ] # Not null = not end of list
+          if @children[ insert_before_index ].kind_of DocType
+            @children[ insert_before_index ] = child
+          else
+            @children[ index_before_index-1, 0 ] = child
+          end
+        else  # Insert at end of list
+          @children[insert_before_index] = child
+        end
+				child.parent = self
+			else
+				rv = super
+				raise "attempted adding second root element to document" if @elements.size > 1
+				rv
+			end
+		end
+		alias :<< :add
+
+		def add_element(arg=nil, arg2=nil)
+			rv = super
+			raise "attempted adding second root element to document" if @elements.size > 1
+			rv
+		end
+
+		# @return the root Element of the document, or nil if this document
+		# has no children.
+		def root
+      elements[1]
+      #self
+      #@children.find { |item| item.kind_of? Element }
+		end
+
+		# @return the DocType child of the document, if one exists,
+		# and nil otherwise.
+		def doctype
+			@children.find { |item| item.kind_of? DocType }
+		end
+
+		# @return the XMLDecl of this document; if no XMLDecl has been
+		# set, the default declaration is returned.
+		def xml_decl
+			rv = @children[0]
+      return rv if rv.kind_of? XMLDecl
+      rv = @children.unshift(XMLDecl.default)[0]
+		end
+
+		# @return the XMLDecl version of this document as a String.
+		# If no XMLDecl has been set, returns the default version.
+		def version
+			xml_decl().version
+		end
+
+		# @return the XMLDecl encoding of this document as a String.
+		# If no XMLDecl has been set, returns the default encoding.
+		def encoding
+			xml_decl().encoding
+		end
+
+		# @return the XMLDecl standalone value of this document as a String.
+		# If no XMLDecl has been set, returns the default setting.
+		def stand_alone?
+			xml_decl().stand_alone?
+		end
+
+    # Write the XML tree out, optionally with indent.  This writes out the
+    # entire XML document, including XML declarations, doctype declarations,
+    # and processing instructions (if any are given).
+    #
+    # A controversial point is whether Document should always write the XML
+    # declaration (<?xml version='1.0'?>) whether or not one is given by the
+    # user (or source document).  REXML does not write one if one was not
+    # specified, because it adds unneccessary bandwidth to applications such
+    # as XML-RPC.
+    #
+    # See also the classes in the rexml/formatters package for the proper way
+    # to change the default formatting of XML output
+    #
+    # _Examples_
+    #   Document.new("<a><b/></a>").serialize
+    #
+    #   output_string = ""
+    #   tr = Transitive.new( output_string )
+    #   Document.new("<a><b/></a>").serialize( tr )
+    #
+    # output::
+    #	  output an object which supports '<< string'; this is where the
+    #   document will be written.
+    # indent::
+    #   An integer.  If -1, no indenting will be used; otherwise, the
+    #   indentation will be twice this number of spaces, and children will be
+    #   indented an additional amount.  For a value of 3, every item will be 
+    #   indented 3 more levels, or 6 more spaces (2 * 3). Defaults to -1
+    # trans::
+    #   If transitive is true and indent is >= 0, then the output will be
+    #   pretty-printed in such a way that the added whitespace does not affect
+    #   the absolute *value* of the document -- that is, it leaves the value
+    #   and number of Text nodes in the document unchanged.
+    # ie_hack::
+    #   Internet Explorer is the worst piece of crap to have ever been
+    #   written, with the possible exception of Windows itself.  Since IE is
+    #   unable to parse proper XML, we have to provide a hack to generate XML
+    #   that IE's limited abilities can handle.  This hack inserts a space 
+    #   before the /> on empty tags.  Defaults to false
+		def write( output=$stdout, indent=-1, trans=false, ie_hack=false )
+      if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
+        output = Output.new( output, xml_decl.encoding )
+      end
+      formatter = if indent > -1
+          if transitive
+            REXML::Formatters::Transitive.new( indent, ie_hack )
+          else
+            REXML::Formatters::Pretty.new( indent, ie_hack )
+          end
+        else
+          REXML::Formatters::Default.new( ie_hack )
+        end
+      formatter.write( self, output )
+		end
+
+		
+		def Document::parse_stream( source, listener )
+			Parsers::StreamParser.new( source, listener ).parse
+		end
+
+		private
+		def build( source )
+      Parsers::TreeParser.new( source, self ).parse
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/dtd/attlistdecl.rb b/ruby_1_8_6/lib/rexml/dtd/attlistdecl.rb
new file mode 100644
index 0000000000..e176bb0749
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/dtd/attlistdecl.rb
@@ -0,0 +1,10 @@
+require "rexml/child"
+module REXML
+	module DTD
+		class AttlistDecl < Child
+			START = "<!ATTLIST"
+			START_RE = /^\s*#{START}/um
+			PATTERN_RE = /\s*(#{START}.*?>)/um
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/dtd/dtd.rb b/ruby_1_8_6/lib/rexml/dtd/dtd.rb
new file mode 100644
index 0000000000..4f735d4812
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/dtd/dtd.rb
@@ -0,0 +1,51 @@
+require "rexml/dtd/elementdecl"
+require "rexml/dtd/entitydecl"
+require "rexml/comment"
+require "rexml/dtd/notationdecl"
+require "rexml/dtd/attlistdecl"
+require "rexml/parent"
+
+module REXML
+	module DTD
+		class Parser
+			def Parser.parse( input )
+				case input
+				when String
+					parse_helper input
+				when File
+					parse_helper input.read
+				end
+			end
+
+			# Takes a String and parses it out
+			def Parser.parse_helper( input )
+				contents = Parent.new
+				while input.size > 0
+					case input
+					when ElementDecl.PATTERN_RE
+						match = $&
+						source = $'
+						contents << ElementDecl.new( match )
+					when AttlistDecl.PATTERN_RE
+						matchdata = $~
+						source = $'
+						contents << AttlistDecl.new( matchdata )
+					when EntityDecl.PATTERN_RE
+						matchdata = $~
+						source = $'
+						contents << EntityDecl.new( matchdata )
+					when Comment.PATTERN_RE
+						matchdata = $~
+						source = $'
+						contents << Comment.new( matchdata )
+					when NotationDecl.PATTERN_RE
+						matchdata = $~
+						source = $'
+						contents << NotationDecl.new( matchdata )
+					end
+				end
+				contents
+			end
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/dtd/elementdecl.rb b/ruby_1_8_6/lib/rexml/dtd/elementdecl.rb
new file mode 100644
index 0000000000..c4e620f389
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/dtd/elementdecl.rb
@@ -0,0 +1,17 @@
+require "rexml/child"
+module REXML
+	module DTD
+		class ElementDecl < Child
+			START = "<!ELEMENT"
+			START_RE = /^\s*#{START}/um
+			PATTERN_RE = /^\s*(#{START}.*?)>/um
+			PATTERN_RE = /^\s*#{START}\s+((?:[:\w_][-\.\w_]*:)?[-!\*\.\w_]*)(.*?)>/
+			#\s*((((["']).*?\5)|[^\/'">]*)*?)(\/)?>/um, true)
+
+			def initialize match
+				@name = match[1]
+				@rest = match[2]
+			end
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/dtd/entitydecl.rb b/ruby_1_8_6/lib/rexml/dtd/entitydecl.rb
new file mode 100644
index 0000000000..a5f1520f2b
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/dtd/entitydecl.rb
@@ -0,0 +1,56 @@
+require "rexml/child"
+module REXML
+	module DTD
+		class EntityDecl < Child
+			START = "<!ENTITY"
+			START_RE = /^\s*#{START}/um
+			PUBLIC = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+PUBLIC\s+((["']).*?\3)\s+((["']).*?\5)\s*>/um
+			SYSTEM = /^\s*#{START}\s+(?:%\s+)?(\w+)\s+SYSTEM\s+((["']).*?\3)(?:\s+NDATA\s+\w+)?\s*>/um
+			PLAIN = /^\s*#{START}\s+(\w+)\s+((["']).*?\3)\s*>/um
+			PERCENT = /^\s*#{START}\s+%\s+(\w+)\s+((["']).*?\3)\s*>/um
+			# <!ENTITY name SYSTEM "...">
+			# <!ENTITY name "...">
+			def initialize src
+				super()
+				md = nil
+				if src.match( PUBLIC )
+					md = src.match( PUBLIC, true )
+					@middle = "PUBLIC"
+					@content = "#{md[2]} #{md[4]}"
+				elsif src.match( SYSTEM )
+					md = src.match( SYSTEM, true )
+					@middle = "SYSTEM"
+					@content = md[2]
+				elsif src.match( PLAIN )
+					md = src.match( PLAIN, true )
+					@middle = ""
+					@content = md[2]
+				elsif src.match( PERCENT )
+					md = src.match( PERCENT, true )
+					@middle = ""
+					@content = md[2]
+				end
+				raise ParseException.new("failed Entity match", src) if md.nil?
+				@name = md[1]
+			end
+
+			def to_s
+				rv = "<!ENTITY #@name "
+				rv << "#@middle " if @middle.size > 0
+				rv << @content
+				rv
+			end
+
+			def write( output, indent )
+        indent( output, indent )
+				output << to_s
+			end
+
+			def EntityDecl.parse_source source, listener
+				md = source.match( PATTERN_RE, true )
+				thing = md[0].squeeze(" \t\n\r")
+				listener.send inspect.downcase, thing 
+			end
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/dtd/notationdecl.rb b/ruby_1_8_6/lib/rexml/dtd/notationdecl.rb
new file mode 100644
index 0000000000..a47ff8f24b
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/dtd/notationdecl.rb
@@ -0,0 +1,39 @@
+require "rexml/child"
+module REXML
+	module DTD
+		class NotationDecl < Child
+			START = "<!NOTATION"
+			START_RE = /^\s*#{START}/um
+			PUBLIC = /^\s*#{START}\s+(\w[\w-]*)\s+(PUBLIC)\s+((["']).*?\4)\s*>/um
+			SYSTEM = /^\s*#{START}\s+(\w[\w-]*)\s+(SYSTEM)\s+((["']).*?\4)\s*>/um
+			def initialize src
+				super()
+				if src.match( PUBLIC )
+					md = src.match( PUBLIC, true )
+				elsif src.match( SYSTEM )
+					md = src.match( SYSTEM, true )
+				else
+					raise ParseException.new( "error parsing notation: no matching pattern", src )
+				end
+				@name = md[1]
+				@middle = md[2]
+				@rest = md[3]
+			end
+
+			def to_s
+				"<!NOTATION #@name #@middle #@rest>"
+			end
+
+			def write( output, indent )
+        indent( output, indent )
+				output << to_s
+			end
+
+			def NotationDecl.parse_source source, listener
+				md = source.match( PATTERN_RE, true )
+				thing = md[0].squeeze(" \t\n\r")
+				listener.send inspect.downcase, thing 
+			end
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/element.rb b/ruby_1_8_6/lib/rexml/element.rb
new file mode 100644
index 0000000000..f757cfffa8
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/element.rb
@@ -0,0 +1,1226 @@
+require "rexml/parent"
+require "rexml/namespace"
+require "rexml/attribute"
+require "rexml/cdata"
+require "rexml/xpath"
+require "rexml/parseexception"
+
+module REXML
+  # An implementation note about namespaces:
+  # As we parse, when we find namespaces we put them in a hash and assign
+  # them a unique ID.  We then convert the namespace prefix for the node
+  # to the unique ID.  This makes namespace lookup much faster for the
+  # cost of extra memory use.  We save the namespace prefix for the
+  # context node and convert it back when we write it.
+  @@namespaces = {}
+
+  # Represents a tagged XML element.  Elements are characterized by
+  # having children, attributes, and names, and can themselves be
+  # children.
+  class Element < Parent
+    include Namespace
+
+    UNDEFINED = "UNDEFINED";		# The default name
+
+    # Mechanisms for accessing attributes and child elements of this
+    # element.
+    attr_reader :attributes, :elements
+    # The context holds information about the processing environment, such as
+    # whitespace handling.
+    attr_accessor :context
+
+    # Constructor
+    # arg:: 
+    # 	if not supplied, will be set to the default value.
+    # 	If a String, the name of this object will be set to the argument.
+    # 	If an Element, the object will be shallowly cloned; name, 
+    # 	attributes, and namespaces will be copied.  Children will +not+ be
+    # 	copied.
+    # parent:: 
+    # 	if supplied, must be a Parent, and will be used as
+    # 	the parent of this object.
+    # context::
+    # 	If supplied, must be a hash containing context items.  Context items
+    # 	include:
+    # * <tt>:respect_whitespace</tt> the value of this is :+all+ or an array of
+    #   strings being the names of the elements to respect
+    #   whitespace for.  Defaults to :+all+.
+    # * <tt>:compress_whitespace</tt> the value can be :+all+ or an array of
+    #   strings being the names of the elements to ignore whitespace on.
+    #   Overrides :+respect_whitespace+.
+    # * <tt>:ignore_whitespace_nodes</tt> the value can be :+all+ or an array
+    #   of strings being the names of the elements in which to ignore
+    #   whitespace-only nodes.  If this is set, Text nodes which contain only
+    #   whitespace will not be added to the document tree.
+    # * <tt>:raw</tt> can be :+all+, or an array of strings being the names of
+    #   the elements to process in raw mode.  In raw mode, special
+    #   characters in text is not converted to or from entities.
+    def initialize( arg = UNDEFINED, parent=nil, context=nil )
+      super(parent)
+
+      @elements = Elements.new(self)
+      @attributes = Attributes.new(self)
+      @context = context
+
+      if arg.kind_of? String
+        self.name = arg
+      elsif arg.kind_of? Element
+        self.name = arg.expanded_name
+        arg.attributes.each_attribute{ |attribute|
+          @attributes << Attribute.new( attribute )
+        }
+        @context = arg.context
+      end
+    end
+
+    def inspect
+      rv = "<#@expanded_name"
+
+      @attributes.each_attribute do |attr|
+        rv << " "
+        attr.write( rv, 0 )
+      end
+
+      if children.size > 0
+        rv << "> ... </>"
+      else
+        rv << "/>"
+      end
+    end
+
+
+    # Creates a shallow copy of self.
+    #   d = Document.new "<a><b/><b/><c><d/></c></a>"
+    #   new_a = d.root.clone
+    #   puts new_a  # => "<a/>"
+    def clone
+      self.class.new self
+    end
+
+    # Evaluates to the root node of the document that this element 
+    # belongs to. If this element doesn't belong to a document, but does
+    # belong to another Element, the parent's root will be returned, until the
+    # earliest ancestor is found.
+    #
+    # Note that this is not the same as the document element.
+    # In the following example, <a> is the document element, and the root
+    # node is the parent node of the document element.  You may ask yourself
+    # why the root node is useful: consider the doctype and XML declaration,
+    # and any processing instructions before the document element... they
+    # are children of the root node, or siblings of the document element.
+    # The only time this isn't true is when an Element is created that is
+    # not part of any Document.  In this case, the ancestor that has no
+    # parent acts as the root node.
+    #  d = Document.new '<a><b><c/></b></a>'
+    #  a = d[1] ; c = a[1][1]
+    #  d.root_node == d   # TRUE
+    #  a.root_node        # namely, d
+    #  c.root_node        # again, d
+    def root_node
+      parent.nil? ? self : parent.root_node
+    end
+
+    def root
+      return elements[1] if self.kind_of? Document
+      return self if parent.kind_of? Document or parent.nil?
+      return parent.root
+    end
+
+    # Evaluates to the document to which this element belongs, or nil if this
+    # element doesn't belong to a document.
+    def document
+      rt = root
+      rt.parent if rt
+    end
+
+    # Evaluates to +true+ if whitespace is respected for this element.  This
+    # is the case if:
+    # 1. Neither :+respect_whitespace+ nor :+compress_whitespace+ has any value
+    # 2. The context has :+respect_whitespace+ set to :+all+ or
+    #    an array containing the name of this element, and 
+    #    :+compress_whitespace+ isn't set to :+all+ or an array containing the 
+    #    name of this element.
+    # The evaluation is tested against +expanded_name+, and so is namespace
+    # sensitive.
+    def whitespace
+      @whitespace = nil
+      if @context
+        if @context[:respect_whitespace]
+          @whitespace = (@context[:respect_whitespace] == :all or
+                         @context[:respect_whitespace].include? expanded_name)
+        end
+        @whitespace = false if (@context[:compress_whitespace] and
+                                (@context[:compress_whitespace] == :all or
+                                 @context[:compress_whitespace].include? expanded_name)
+                               )
+      end
+      @whitespace = true unless @whitespace == false
+      @whitespace
+    end
+
+    def ignore_whitespace_nodes
+      @ignore_whitespace_nodes = false
+      if @context
+        if @context[:ignore_whitespace_nodes]
+          @ignore_whitespace_nodes = 
+            (@context[:ignore_whitespace_nodes] == :all or
+             @context[:ignore_whitespace_nodes].include? expanded_name)
+        end
+      end
+    end
+
+    # Evaluates to +true+ if raw mode is set for this element.  This
+    # is the case if the context has :+raw+ set to :+all+ or
+    # an array containing the name of this element.
+    #
+    # The evaluation is tested against +expanded_name+, and so is namespace
+    # sensitive.
+    def raw
+      @raw = (@context and @context[:raw] and
+              (@context[:raw] == :all or
+               @context[:raw].include? expanded_name))
+               @raw
+    end
+
+    #once :whitespace, :raw, :ignore_whitespace_nodes
+
+    #################################################
+    # Namespaces                                    #
+    #################################################
+
+    # Evaluates to an +Array+ containing the prefixes (names) of all defined
+    # namespaces at this context node.
+    #  doc = Document.new("<a xmlns:x='1' xmlns:y='2'><b/><c xmlns:z='3'/></a>")
+    #  doc.elements['//b'].prefixes # -> ['x', 'y']
+    def prefixes
+      prefixes = []
+      prefixes = parent.prefixes if parent
+      prefixes |= attributes.prefixes
+      return prefixes
+    end
+
+    def namespaces
+      namespaces = {}
+      namespaces = parent.namespaces if parent
+      namespaces = namespaces.merge( attributes.namespaces )
+      return namespaces
+    end
+
+    # Evalutas to the URI for a prefix, or the empty string if no such 
+    # namespace is declared for this element. Evaluates recursively for
+    # ancestors.  Returns the default namespace, if there is one.
+    # prefix:: 
+    #   the prefix to search for.  If not supplied, returns the default
+    #   namespace if one exists
+    # Returns:: 
+    #   the namespace URI as a String, or nil if no such namespace
+    #   exists.  If the namespace is undefined, returns an empty string
+    #  doc = Document.new("<a xmlns='1' xmlns:y='2'><b/><c xmlns:z='3'/></a>")
+    #  b = doc.elements['//b']
+    #  b.namespace           # -> '1'
+    #  b.namespace("y")      # -> '2'
+    def namespace(prefix=nil)
+      if prefix.nil?
+        prefix = prefix()
+      end
+      if prefix == ''
+        prefix = "xmlns"
+      else
+        prefix = "xmlns:#{prefix}" unless prefix[0,5] == 'xmlns'
+      end
+      ns = attributes[ prefix ]
+      ns = parent.namespace(prefix) if ns.nil? and parent
+      ns = '' if ns.nil? and prefix == 'xmlns'
+      return ns
+    end
+
+    # Adds a namespace to this element.
+    # prefix:: 
+    #   the prefix string, or the namespace URI if +uri+ is not
+    #   supplied
+    # uri::    
+    #   the namespace URI.  May be nil, in which +prefix+ is used as
+    #   the URI
+    # Evaluates to: this Element
+    #  a = Element.new("a")
+    #  a.add_namespace("xmlns:foo", "bar" )
+    #  a.add_namespace("foo", "bar")  # shorthand for previous line
+    #  a.add_namespace("twiddle")
+    #  puts a   #-> <a xmlns:foo='bar' xmlns='twiddle'/>
+    def add_namespace( prefix, uri=nil )
+      unless uri
+        @attributes["xmlns"] = prefix
+      else
+        prefix = "xmlns:#{prefix}" unless prefix =~ /^xmlns:/
+        @attributes[ prefix ] = uri
+      end
+      self
+    end
+
+    # Removes a namespace from this node.  This only works if the namespace is
+    # actually declared in this node.  If no argument is passed, deletes the
+    # default namespace.
+    #
+    # Evaluates to: this element
+    #  doc = Document.new "<a xmlns:foo='bar' xmlns='twiddle'/>"
+    #  doc.root.delete_namespace
+    #  puts doc     # -> <a xmlns:foo='bar'/>
+    #  doc.root.delete_namespace 'foo'
+    #  puts doc     # -> <a/>
+    def delete_namespace namespace="xmlns"
+      namespace = "xmlns:#{namespace}" unless namespace == 'xmlns'
+      attribute = attributes.get_attribute(namespace)
+      attribute.remove unless attribute.nil?
+      self
+    end
+
+    #################################################
+    # Elements                                      #
+    #################################################
+
+    # Adds a child to this element, optionally setting attributes in
+    # the element.
+    # element:: 
+    #   optional.  If Element, the element is added.
+    #   Otherwise, a new Element is constructed with the argument (see
+    #   Element.initialize).
+    # attrs:: 
+    #   If supplied, must be a Hash containing String name,value 
+    #   pairs, which will be used to set the attributes of the new Element.
+    # Returns:: the Element that was added
+    #  el = doc.add_element 'my-tag'
+    #  el = doc.add_element 'my-tag', {'attr1'=>'val1', 'attr2'=>'val2'}
+    #  el = Element.new 'my-tag'
+    #  doc.add_element el
+    def add_element element, attrs=nil
+      raise "First argument must be either an element name, or an Element object" if element.nil?
+      el = @elements.add(element)
+      attrs.each do |key, value|
+        el.attributes[key]=Attribute.new(key,value,self)
+      end	if attrs.kind_of? Hash
+      el
+    end
+
+    # Deletes a child element.
+    # element:: 
+    #   Must be an +Element+, +String+, or +Integer+.  If Element, 
+    #   the element is removed.  If String, the element is found (via XPath) 
+    #   and removed.  <em>This means that any parent can remove any
+    #   descendant.<em>  If Integer, the Element indexed by that number will be
+    #   removed.
+    # Returns:: the element that was removed.
+    #  doc.delete_element "/a/b/c[@id='4']"
+    #  doc.delete_element doc.elements["//k"]
+    #  doc.delete_element 1
+    def delete_element element
+      @elements.delete element
+    end
+
+    # Evaluates to +true+ if this element has at least one child Element
+    #  doc = Document.new "<a><b/><c>Text</c></a>"
+    #  doc.root.has_elements               # -> true
+    #  doc.elements["/a/b"].has_elements   # -> false
+    #  doc.elements["/a/c"].has_elements   # -> false
+    def has_elements?
+      !@elements.empty?
+    end
+
+    # Iterates through the child elements, yielding for each Element that
+    # has a particular attribute set.
+    # key:: 
+    #   the name of the attribute to search for
+    # value:: 
+    #   the value of the attribute
+    # max:: 
+    #   (optional) causes this method to return after yielding 
+    #   for this number of matching children
+    # name:: 
+    #   (optional) if supplied, this is an XPath that filters
+    #   the children to check.
+    #
+    #  doc = Document.new "<a><b @id='1'/><c @id='2'/><d @id='1'/><e/></a>"
+    #  # Yields b, c, d
+    #  doc.root.each_element_with_attribute( 'id' ) {|e| p e}
+    #  # Yields b, d
+    #  doc.root.each_element_with_attribute( 'id', '1' ) {|e| p e}
+    #  # Yields b
+    #  doc.root.each_element_with_attribute( 'id', '1', 1 ) {|e| p e}
+    #  # Yields d
+    #  doc.root.each_element_with_attribute( 'id', '1', 0, 'd' ) {|e| p e}
+    def each_element_with_attribute( key, value=nil, max=0, name=nil, &block ) # :yields: Element
+      each_with_something( proc {|child| 
+        if value.nil?
+          child.attributes[key] != nil
+        else
+          child.attributes[key]==value
+        end
+      }, max, name, &block )
+    end
+
+    # Iterates through the children, yielding for each Element that
+    # has a particular text set.
+    # text:: 
+    #   the text to search for.  If nil, or not supplied, will itterate
+    #   over all +Element+ children that contain at least one +Text+ node.
+    # max:: 
+    #   (optional) causes this method to return after yielding
+    #   for this number of matching children
+    # name:: 
+    #   (optional) if supplied, this is an XPath that filters
+    #   the children to check.
+    #
+    #  doc = Document.new '<a><b>b</b><c>b</c><d>d</d><e/></a>'
+    #  # Yields b, c, d
+    #  doc.each_element_with_text {|e|p e}
+    #  # Yields b, c
+    #  doc.each_element_with_text('b'){|e|p e}
+    #  # Yields b
+    #  doc.each_element_with_text('b', 1){|e|p e}
+    #  # Yields d
+    #  doc.each_element_with_text(nil, 0, 'd'){|e|p e}
+    def each_element_with_text( text=nil, max=0, name=nil, &block ) # :yields: Element
+      each_with_something( proc {|child| 
+        if text.nil?
+          child.has_text?
+        else
+          child.text == text
+        end
+      }, max, name, &block )
+    end
+
+    # Synonym for Element.elements.each
+    def each_element( xpath=nil, &block ) # :yields: Element
+      @elements.each( xpath, &block )
+    end
+
+    # Synonym for Element.to_a
+    # This is a little slower than calling elements.each directly.
+    # xpath:: any XPath by which to search for elements in the tree
+    # Returns:: an array of Elements that match the supplied path
+    def get_elements( xpath )
+      @elements.to_a( xpath )
+    end
+
+    # Returns the next sibling that is an element, or nil if there is
+    # no Element sibling after this one
+    #  doc = Document.new '<a><b/>text<c/></a>'
+    #  doc.root.elements['b'].next_element          #-> <c/>
+    #  doc.root.elements['c'].next_element          #-> nil
+    def next_element
+      element = next_sibling
+      element = element.next_sibling until element.nil? or element.kind_of? Element 
+      return element
+    end
+
+    # Returns the previous sibling that is an element, or nil if there is
+    # no Element sibling prior to this one
+    #  doc = Document.new '<a><b/>text<c/></a>'
+    #  doc.root.elements['c'].previous_element          #-> <b/>
+    #  doc.root.elements['b'].previous_element          #-> nil
+    def previous_element
+      element = previous_sibling
+      element = element.previous_sibling until element.nil? or element.kind_of? Element
+      return element
+    end
+
+
+    #################################################
+    # Text                                          #
+    #################################################
+
+    # Evaluates to +true+ if this element has at least one Text child
+    def has_text?
+      not text().nil?
+    end
+
+    # A convenience method which returns the String value of the _first_
+    # child text element, if one exists, and +nil+ otherwise.
+    #
+    # <em>Note that an element may have multiple Text elements, perhaps
+    # separated by other children</em>.  Be aware that this method only returns
+    # the first Text node.
+    #
+    # This method returns the +value+ of the first text child node, which
+    # ignores the +raw+ setting, so always returns normalized text. See
+    # the Text::value documentation.
+    #
+    #  doc = Document.new "<p>some text <b>this is bold!</b> more text</p>"
+    #  # The element 'p' has two text elements, "some text " and " more text".
+    #  doc.root.text              #-> "some text "
+    def text( path = nil )
+      rv = get_text(path)
+      return rv.value unless rv.nil?
+      nil
+    end
+
+    # Returns the first child Text node, if any, or +nil+ otherwise.
+    # This method returns the actual +Text+ node, rather than the String content.
+    #  doc = Document.new "<p>some text <b>this is bold!</b> more text</p>"
+    #  # The element 'p' has two text elements, "some text " and " more text".
+    #  doc.root.get_text.value            #-> "some text "
+    def get_text path = nil
+      rv = nil
+      if path
+        element = @elements[ path ]
+        rv = element.get_text unless element.nil?
+      else
+        rv = @children.find { |node| node.kind_of? Text }
+      end
+      return rv
+    end
+
+    # Sets the first Text child of this object.  See text() for a
+    # discussion about Text children.
+    #
+    # If a Text child already exists, the child is replaced by this
+    # content.  This means that Text content can be deleted by calling
+    # this method with a nil argument.  In this case, the next Text
+    # child becomes the first Text child.  In no case is the order of
+    # any siblings disturbed.
+    # text:: 
+    #   If a String, a new Text child is created and added to
+    #   this Element as the first Text child.  If Text, the text is set
+    #   as the first Child element.  If nil, then any existing first Text
+    #   child is removed.
+    # Returns:: this Element.
+    #  doc = Document.new '<a><b/></a>'
+    #  doc.root.text = 'Sean'      #-> '<a><b/>Sean</a>'
+    #  doc.root.text = 'Elliott'   #-> '<a><b/>Elliott</a>'
+    #  doc.root.add_element 'c'    #-> '<a><b/>Elliott<c/></a>'
+    #  doc.root.text = 'Russell'   #-> '<a><b/>Russell<c/></a>'
+    #  doc.root.text = nil         #-> '<a><b/><c/></a>'
+    def text=( text )
+      if text.kind_of? String
+        text = Text.new( text, whitespace(), nil, raw() )
+      elsif text and !text.kind_of? Text
+        text = Text.new( text.to_s, whitespace(), nil, raw() )
+      end
+      old_text = get_text
+      if text.nil?
+        old_text.remove unless old_text.nil?
+      else
+        if old_text.nil?
+          self << text
+        else
+          old_text.replace_with( text )
+        end
+      end
+      return self
+    end
+
+    # A helper method to add a Text child.  Actual Text instances can
+    # be added with regular Parent methods, such as add() and <<()
+    # text::
+    #   if a String, a new Text instance is created and added
+    #   to the parent.  If Text, the object is added directly.
+    # Returns:: this Element
+    #  e = Element.new('a')          #-> <e/>
+    #  e.add_text 'foo'              #-> <e>foo</e>
+    #  e.add_text Text.new(' bar')    #-> <e>foo bar</e>
+    # Note that at the end of this example, the branch has <b>3</b> nodes; the 'e'
+    # element and <b>2</b> Text node children.
+    def add_text( text )
+      if text.kind_of? String 
+        if @children[-1].kind_of? Text
+          @children[-1] << text
+          return
+        end
+        text = Text.new( text, whitespace(), nil, raw() )
+      end
+      self << text unless text.nil?
+      return self
+    end
+
+    def node_type
+      :element
+    end
+
+    def xpath
+      path_elements = []
+      cur = self
+      path_elements << __to_xpath_helper( self )
+      while cur.parent
+        cur = cur.parent
+        path_elements << __to_xpath_helper( cur )
+      end
+      return path_elements.reverse.join( "/" )
+    end
+
+    #################################################
+    # Attributes                                    #
+    #################################################
+
+    def attribute( name, namespace=nil )
+      prefix = nil
+      prefix = namespaces.index(namespace) if namespace
+      attributes.get_attribute( "#{prefix ? prefix + ':' : ''}#{name}" )
+    end
+
+    # Evaluates to +true+ if this element has any attributes set, false
+    # otherwise.
+    def has_attributes?
+      return !@attributes.empty?
+    end
+
+    # Adds an attribute to this element, overwriting any existing attribute
+    # by the same name.
+    # key::
+    #   can be either an Attribute or a String.  If an Attribute,
+    #   the attribute is added to the list of Element attributes.  If String,
+    #   the argument is used as the name of the new attribute, and the value
+    #   parameter must be supplied.
+    # value:: 
+    #   Required if +key+ is a String, and ignored if the first argument is
+    #   an Attribute.  This is a String, and is used as the value
+    #   of the new Attribute.  This should be the unnormalized value of the
+    #   attribute (without entities).
+    # Returns:: the Attribute added
+    #  e = Element.new 'e'
+    #  e.add_attribute( 'a', 'b' )               #-> <e a='b'/>
+    #  e.add_attribute( 'x:a', 'c' )             #-> <e a='b' x:a='c'/>
+    #  e.add_attribute Attribute.new('b', 'd')   #-> <e a='b' x:a='c' b='d'/>
+    def add_attribute( key, value=nil )
+      if key.kind_of? Attribute
+        @attributes << key
+      else
+        @attributes[key] = value
+      end
+    end
+
+    # Add multiple attributes to this element.
+    # hash:: is either a hash, or array of arrays
+    #  el.add_attributes( {"name1"=>"value1", "name2"=>"value2"} )
+    #  el.add_attributes( [ ["name1","value1"], ["name2"=>"value2"] ] )
+    def add_attributes hash
+      if hash.kind_of? Hash
+        hash.each_pair {|key, value| @attributes[key] = value }
+      elsif hash.kind_of? Array
+        hash.each { |value| @attributes[ value[0] ] = value[1] }
+      end
+    end
+
+    # Removes an attribute
+    # key::
+    #   either an Attribute or a String.  In either case, the
+    #   attribute is found by matching the attribute name to the argument,
+    #   and then removed.  If no attribute is found, no action is taken.
+    # Returns:: 
+    #   the attribute removed, or nil if this Element did not contain
+    #   a matching attribute
+    #  e = Element.new('E')
+    #  e.add_attribute( 'name', 'Sean' )             #-> <E name='Sean'/>
+    #  r = e.add_attribute( 'sur:name', 'Russell' )  #-> <E name='Sean' sur:name='Russell'/>
+    #  e.delete_attribute( 'name' )                  #-> <E sur:name='Russell'/>
+    #  e.delete_attribute( r )                       #-> <E/>
+    def delete_attribute(key)
+      attr = @attributes.get_attribute(key)
+      attr.remove unless attr.nil?
+    end
+
+    #################################################
+    # Other Utilities                               #
+    #################################################
+
+    # Get an array of all CData children.  
+    # IMMUTABLE
+    def cdatas
+      find_all { |child| child.kind_of? CData }.freeze
+    end
+
+    # Get an array of all Comment children.
+    # IMMUTABLE
+    def comments
+      find_all { |child| child.kind_of? Comment }.freeze
+    end
+
+    # Get an array of all Instruction children.
+    # IMMUTABLE
+    def instructions
+      find_all { |child| child.kind_of? Instruction }.freeze
+    end
+
+    # Get an array of all Text children.
+    # IMMUTABLE
+    def texts
+      find_all { |child| child.kind_of? Text }.freeze
+    end
+
+    # == DEPRECATED
+    # See REXML::Formatters
+    #
+    # Writes out this element, and recursively, all children.
+    # output::
+    #	  output an object which supports '<< string'; this is where the
+    #   document will be written.
+    # indent::
+    #   An integer.  If -1, no indenting will be used; otherwise, the
+    #   indentation will be this number of spaces, and children will be
+    #   indented an additional amount.  Defaults to -1
+    # transitive::
+    #   If transitive is true and indent is >= 0, then the output will be
+    #   pretty-printed in such a way that the added whitespace does not affect
+    #   the parse tree of the document
+    # ie_hack::
+    #   Internet Explorer is the worst piece of crap to have ever been
+    #   written, with the possible exception of Windows itself.  Since IE is
+    #   unable to parse proper XML, we have to provide a hack to generate XML
+    #   that IE's limited abilities can handle.  This hack inserts a space 
+    #   before the /> on empty tags.  Defaults to false
+    #
+    #  out = ''
+    #  doc.write( out )     #-> doc is written to the string 'out'
+    #  doc.write( $stdout ) #-> doc written to the console
+    def write(writer=$stdout, indent=-1, transitive=false, ie_hack=false)
+      Kernel.warn("#{self.class.name}.write is deprecated.  See REXML::Formatters")
+      formatter = if indent > -1
+          if transitive
+            REXML::Formatters::Transitive.new( indent, ie_hack )
+          else
+            REXML::Formatters::Pretty.new( indent, ie_hack )
+          end
+        else
+          REXML::Formatters::Default.new( ie_hack )
+        end
+      formatter.write( self, output )
+    end
+
+
+    private
+    def __to_xpath_helper node
+      rv = node.expanded_name.clone
+      if node.parent
+        results = node.parent.find_all {|n| 
+          n.kind_of?(REXML::Element) and n.expanded_name == node.expanded_name 
+        }
+        if results.length > 1
+          idx = results.index( node )
+          rv << "[#{idx+1}]"
+        end
+      end
+      rv
+    end
+
+    # A private helper method
+    def each_with_something( test, max=0, name=nil )
+      num = 0
+      child=nil
+      @elements.each( name ){ |child|
+        yield child if test.call(child) and num += 1
+        return if max>0 and num == max
+      }
+    end
+  end
+
+  ########################################################################
+  # ELEMENTS                                                             #
+  ########################################################################
+
+  # A class which provides filtering of children for Elements, and
+  # XPath search support.  You are expected to only encounter this class as
+  # the <tt>element.elements</tt> object.  Therefore, you are 
+  # _not_ expected to instantiate this yourself.
+  class Elements
+    include Enumerable
+    # Constructor
+    # parent:: the parent Element
+    def initialize parent
+      @element = parent
+    end
+
+    # Fetches a child element.  Filters only Element children, regardless of
+    # the XPath match.
+    # index:: 
+    #   the search parameter.  This is either an Integer, which
+    #   will be used to find the index'th child Element, or an XPath,
+    #   which will be used to search for the Element.  <em>Because
+    #   of the nature of XPath searches, any element in the connected XML
+    #   document can be fetched through any other element.</em>  <b>The
+    #   Integer index is 1-based, not 0-based.</b>  This means that the first
+    #   child element is at index 1, not 0, and the +n+th element is at index
+    #   +n+, not <tt>n-1</tt>.  This is because XPath indexes element children
+    #   starting from 1, not 0, and the indexes should be the same.
+    # name:: 
+    #   optional, and only used in the first argument is an
+    #   Integer.  In that case, the index'th child Element that has the
+    #   supplied name will be returned.  Note again that the indexes start at 1.
+    # Returns:: the first matching Element, or nil if no child matched
+    #  doc = Document.new '<a><b/><c id="1"/><c id="2"/><d/></a>'
+    #  doc.root.elements[1]       #-> <b/>
+    #  doc.root.elements['c']     #-> <c id="1"/>
+    #  doc.root.elements[2,'c']   #-> <c id="2"/>
+    def []( index, name=nil)
+      if index.kind_of? Integer
+        raise "index (#{index}) must be >= 1" if index < 1
+        name = literalize(name) if name
+        num = 0
+        child = nil
+        @element.find { |child|
+          child.kind_of? Element and
+          (name.nil? ? true : child.has_name?( name )) and 
+          (num += 1) == index
+        }
+      else
+        return XPath::first( @element, index )
+        #{ |element| 
+        #	return element if element.kind_of? Element
+        #}
+        #return nil
+      end
+    end
+
+    # Sets an element, replacing any previous matching element.  If no
+    # existing element is found ,the element is added.
+    # index:: Used to find a matching element to replace.  See []().
+    # element:: 
+    #   The element to replace the existing element with
+    #   the previous element
+    # Returns:: nil if no previous element was found.
+    #
+    #  doc = Document.new '<a/>'
+    #  doc.root.elements[10] = Element.new('b')    #-> <a><b/></a>
+    #  doc.root.elements[1]                        #-> <b/>
+    #  doc.root.elements[1] = Element.new('c')     #-> <a><c/></a>
+    #  doc.root.elements['c'] = Element.new('d')   #-> <a><d/></a>
+    def []=( index, element )
+      previous = self[index]
+      if previous.nil?
+        @element.add element
+      else
+        previous.replace_with element
+      end
+      return previous
+    end
+
+    # Returns +true+ if there are no +Element+ children, +false+ otherwise
+    def empty?
+      @element.find{ |child| child.kind_of? Element}.nil?
+    end
+
+    # Returns the index of the supplied child (starting at 1), or -1 if 
+    # the element is not a child
+    # element:: an +Element+ child
+    def index element
+      rv = 0
+      found = @element.find do |child| 
+        child.kind_of? Element and
+        (rv += 1) and
+        child == element
+      end
+      return rv if found == element
+      return -1
+    end
+
+    # Deletes a child Element
+    # element:: 
+    #   Either an Element, which is removed directly; an
+    #   xpath, where the first matching child is removed; or an Integer,
+    #   where the n'th Element is removed.
+    # Returns:: the removed child
+    #  doc = Document.new '<a><b/><c/><c id="1"/></a>'
+    #  b = doc.root.elements[1]
+    #  doc.root.elements.delete b           #-> <a><c/><c id="1"/></a>
+    #  doc.elements.delete("a/c[@id='1']")  #-> <a><c/></a>
+    #  doc.root.elements.delete 1           #-> <a/>
+    def delete element
+      if element.kind_of? Element
+        @element.delete element
+      else
+        el = self[element]
+        el.remove if el
+      end
+    end
+
+    # Removes multiple elements.  Filters for Element children, regardless of
+    # XPath matching.
+    # xpath:: all elements matching this String path are removed.
+    # Returns:: an Array of Elements that have been removed
+    #  doc = Document.new '<a><c/><c/><c/><c/></a>'
+    #  deleted = doc.elements.delete_all 'a/c' #-> [<c/>, <c/>, <c/>, <c/>]
+    def delete_all( xpath )
+      rv = []
+      XPath::each( @element, xpath) {|element| 
+        rv << element if element.kind_of? Element
+      }
+      rv.each do |element|
+        @element.delete element
+        element.remove
+      end
+      return rv
+    end
+
+    # Adds an element
+    # element:: 
+    #   if supplied, is either an Element, String, or
+    #   Source (see Element.initialize).  If not supplied or nil, a
+    #   new, default Element will be constructed
+    # Returns:: the added Element
+    #  a = Element.new 'a'
+    #  a.elements.add Element.new 'b'  #-> <a><b/></a>
+    #  a.elements.add 'c'              #-> <a><b/><c/></a>
+    def add element=nil
+      rv = nil
+      if element.nil?
+        Element.new "", self, @element.context
+      elsif not element.kind_of?(Element)
+        Element.new element, self, @element.context
+      else
+        @element << element
+        element.context = @element.context
+        element
+      end
+    end
+
+    alias :<< :add
+
+    # Iterates through all of the child Elements, optionally filtering
+    # them by a given XPath
+    # xpath:: 
+    #   optional.  If supplied, this is a String XPath, and is used to 
+    #   filter the children, so that only matching children are yielded.  Note
+    #   that XPaths are automatically filtered for Elements, so that
+    #   non-Element children will not be yielded
+    #  doc = Document.new '<a><b/><c/><d/>sean<b/><c/><d/></a>'
+    #  doc.root.each {|e|p e}       #-> Yields b, c, d, b, c, d elements
+    #  doc.root.each('b') {|e|p e}  #-> Yields b, b elements
+    #  doc.root.each('child::node()')  {|e|p e}
+    #  #-> Yields <b/>, <c/>, <d/>, <b/>, <c/>, <d/>
+    #  XPath.each(doc.root, 'child::node()', &block)
+    #  #-> Yields <b/>, <c/>, <d/>, sean, <b/>, <c/>, <d/>
+    def each( xpath=nil, &block)
+      XPath::each( @element, xpath ) {|e| yield e if e.kind_of? Element }
+    end
+
+    def collect( xpath=nil, &block )
+      collection = []
+      XPath::each( @element, xpath ) {|e| 
+        collection << yield(e)  if e.kind_of?(Element) 
+      }
+      collection
+    end
+
+    def inject( xpath=nil, initial=nil, &block )
+      first = true
+      XPath::each( @element, xpath ) {|e|
+        if (e.kind_of? Element)
+          if (first and initial == nil)
+            initial = e
+            first = false
+          else
+            initial = yield( initial, e ) if e.kind_of? Element
+          end
+        end
+      }
+      initial
+    end
+
+    # Returns the number of +Element+ children of the parent object.
+    #  doc = Document.new '<a>sean<b/>elliott<b/>russell<b/></a>'
+    #  doc.root.size            #-> 6, 3 element and 3 text nodes
+    #  doc.root.elements.size   #-> 3
+    def size
+      count = 0
+      @element.each {|child| count+=1 if child.kind_of? Element }
+      count
+    end
+
+    # Returns an Array of Element children.  An XPath may be supplied to
+    # filter the children.  Only Element children are returned, even if the
+    # supplied XPath matches non-Element children.
+    #  doc = Document.new '<a>sean<b/>elliott<c/></a>'
+    #  doc.root.elements.to_a                  #-> [ <b/>, <c/> ]
+    #  doc.root.elements.to_a("child::node()") #-> [ <b/>, <c/> ] 
+    #  XPath.match(doc.root, "child::node()")  #-> [ sean, <b/>, elliott, <c/> ]
+    def to_a( xpath=nil )
+      rv = XPath.match( @element, xpath )
+      return rv.find_all{|e| e.kind_of? Element} if xpath
+      rv
+    end
+
+    private
+    # Private helper class.  Removes quotes from quoted strings
+    def literalize name
+      name = name[1..-2] if name[0] == ?' or name[0] == ?"               #'
+      name
+    end
+  end
+
+  ########################################################################
+  # ATTRIBUTES                                                           #
+  ########################################################################
+
+  # A class that defines the set of Attributes of an Element and provides 
+  # operations for accessing elements in that set.
+  class Attributes < Hash
+    # Constructor
+    # element:: the Element of which this is an Attribute
+    def initialize element
+      @element = element
+    end
+
+    # Fetches an attribute value.  If you want to get the Attribute itself,
+    # use get_attribute()
+    # name:: an XPath attribute name.  Namespaces are relevant here.
+    # Returns:: 
+    #   the String value of the matching attribute, or +nil+ if no
+    #   matching attribute was found.  This is the unnormalized value
+    #   (with entities expanded).
+    # 
+    #  doc = Document.new "<a foo:att='1' bar:att='2' att='&lt;'/>"
+    #  doc.root.attributes['att']         #-> '<'
+    #  doc.root.attributes['bar:att']     #-> '2'
+    def [](name)
+      attr = get_attribute(name)
+      return attr.value unless attr.nil?
+      return nil
+    end
+
+    def to_a
+      values.flatten
+    end
+
+    # Returns the number of attributes the owning Element contains.
+    #  doc = Document "<a x='1' y='2' foo:x='3'/>"
+    #  doc.root.attributes.length        #-> 3
+    def length
+      c = 0
+      each_attribute { c+=1 }
+      c
+    end
+    alias :size :length
+
+    # Itterates over the attributes of an Element.  Yields actual Attribute
+    # nodes, not String values.
+    # 
+    #  doc = Document.new '<a x="1" y="2"/>'
+    #  doc.root.attributes.each_attribute {|attr|
+    #    p attr.expanded_name+" => "+attr.value
+    #  }
+    def each_attribute # :yields: attribute
+      each_value do |val|
+        if val.kind_of? Attribute
+          yield val
+        else
+          val.each_value { |atr| yield atr }
+        end
+      end
+    end
+
+    # Itterates over each attribute of an Element, yielding the expanded name
+    # and value as a pair of Strings.
+    #
+    #  doc = Document.new '<a x="1" y="2"/>'
+    #  doc.root.attributes.each {|name, value| p name+" => "+value }
+    def each
+      each_attribute do |attr|
+        yield attr.expanded_name, attr.value
+      end
+    end
+
+    # Fetches an attribute
+    # name:: 
+    #   the name by which to search for the attribute.  Can be a
+    #   <tt>prefix:name</tt> namespace name.
+    # Returns:: The first matching attribute, or nil if there was none.  This
+    # value is an Attribute node, not the String value of the attribute.
+    #  doc = Document.new '<a x:foo="1" foo="2" bar="3"/>'
+    #  doc.root.attributes.get_attribute("foo").value    #-> "2"
+    #  doc.root.attributes.get_attribute("x:foo").value  #-> "1"
+    def get_attribute( name )
+      attr = fetch( name, nil )
+      if attr.nil?
+        return nil if name.nil?
+        # Look for prefix
+        name =~ Namespace::NAMESPLIT
+        prefix, n = $1, $2
+        if prefix
+          attr = fetch( n, nil )
+          # check prefix
+          if attr == nil
+          elsif attr.kind_of? Attribute
+            return attr if prefix == attr.prefix
+          else
+            attr = attr[ prefix ]
+            return attr
+          end
+        end
+        element_document = @element.document
+        if element_document and element_document.doctype
+          expn = @element.expanded_name
+          expn = element_document.doctype.name if expn.size == 0
+          attr_val = element_document.doctype.attribute_of(expn, name)
+          return Attribute.new( name, attr_val ) if attr_val
+        end
+        return nil
+      end
+      if attr.kind_of? Hash
+        attr = attr[ @element.prefix ]
+      end
+      return attr
+    end
+
+    # Sets an attribute, overwriting any existing attribute value by the
+    # same name.  Namespace is significant.
+    # name:: the name of the attribute
+    # value:: 
+    #   (optional) If supplied, the value of the attribute.  If
+    #   nil, any existing matching attribute is deleted.
+    # Returns:: 
+    #   Owning element
+    #  doc = Document.new "<a x:foo='1' foo='3'/>"
+    #  doc.root.attributes['y:foo'] = '2'
+    #  doc.root.attributes['foo'] = '4'
+    #  doc.root.attributes['x:foo'] = nil
+    def []=( name, value )
+      if value.nil?		# Delete the named attribute
+        attr = get_attribute(name)
+        delete attr
+        return
+      end
+      element_document = @element.document
+      unless value.kind_of? Attribute
+        if @element.document and @element.document.doctype
+          value = Text::normalize( value, @element.document.doctype )
+        else
+          value = Text::normalize( value, nil )
+        end
+        value = Attribute.new(name, value)
+      end
+      value.element = @element
+      old_attr = fetch(value.name, nil)
+      if old_attr.nil?
+        store(value.name, value)
+      elsif old_attr.kind_of? Hash
+        old_attr[value.prefix] = value
+      elsif old_attr.prefix != value.prefix
+        # Check for conflicting namespaces
+        raise ParseException.new( 
+          "Namespace conflict in adding attribute \"#{value.name}\": "+
+          "Prefix \"#{old_attr.prefix}\" = "+
+          "\"#{@element.namespace(old_attr.prefix)}\" and prefix "+
+          "\"#{value.prefix}\" = \"#{@element.namespace(value.prefix)}\"") if 
+          value.prefix != "xmlns" and old_attr.prefix != "xmlns" and
+          @element.namespace( old_attr.prefix ) == 
+            @element.namespace( value.prefix )
+          store value.name, { old_attr.prefix	=> old_attr,
+            value.prefix		=> value }
+      else
+        store value.name, value
+      end
+      return @element
+    end
+
+    # Returns an array of Strings containing all of the prefixes declared 
+    # by this set of # attributes.  The array does not include the default
+    # namespace declaration, if one exists.
+    #  doc = Document.new("<a xmlns='foo' xmlns:x='bar' xmlns:y='twee' "+
+    #        "z='glorp' p:k='gru'/>")
+    #  prefixes = doc.root.attributes.prefixes    #-> ['x', 'y']
+    def prefixes
+      ns = []
+      each_attribute do |attribute|
+        ns << attribute.name if attribute.prefix == 'xmlns'
+      end
+      if @element.document and @element.document.doctype
+        expn = @element.expanded_name
+        expn = @element.document.doctype.name if expn.size == 0
+        @element.document.doctype.attributes_of(expn).each {
+          |attribute|
+          ns << attribute.name if attribute.prefix == 'xmlns'
+        }
+      end
+      ns
+    end
+
+    def namespaces
+      namespaces = {}
+      each_attribute do |attribute|
+        namespaces[attribute.name] = attribute.value if attribute.prefix == 'xmlns' or attribute.name == 'xmlns'
+      end
+      if @element.document and @element.document.doctype
+        expn = @element.expanded_name
+        expn = @element.document.doctype.name if expn.size == 0
+        @element.document.doctype.attributes_of(expn).each {
+          |attribute|
+          namespaces[attribute.name] = attribute.value if attribute.prefix == 'xmlns' or attribute.name == 'xmlns'
+        }
+      end
+      namespaces
+    end
+
+    # Removes an attribute
+    # attribute:: 
+    #   either a String, which is the name of the attribute to remove --
+    #   namespaces are significant here -- or the attribute to remove.
+    # Returns:: the owning element
+    #  doc = Document.new "<a y:foo='0' x:foo='1' foo='3' z:foo='4'/>"
+    #  doc.root.attributes.delete 'foo'   #-> <a y:foo='0' x:foo='1' z:foo='4'/>"
+    #  doc.root.attributes.delete 'x:foo' #-> <a y:foo='0' z:foo='4'/>"
+    #  attr = doc.root.attributes.get_attribute('y:foo')
+    #  doc.root.attributes.delete attr    #-> <a z:foo='4'/>"
+    def delete( attribute )
+      name = nil
+      prefix = nil
+      if attribute.kind_of? Attribute
+        name = attribute.name
+        prefix = attribute.prefix
+      else
+        attribute =~ Namespace::NAMESPLIT
+        prefix, name = $1, $2
+        prefix = '' unless prefix
+      end
+      old = fetch(name, nil)
+      attr = nil
+      if old.kind_of? Hash # the supplied attribute is one of many
+        attr = old.delete(prefix)
+        if old.size == 1
+          repl = nil
+          old.each_value{|v| repl = v}
+          store name, repl
+        end
+      elsif old.nil?
+        return @element
+      else # the supplied attribute is a top-level one
+        attr = old
+        res = super(name)
+      end
+      @element
+    end
+
+    # Adds an attribute, overriding any existing attribute by the
+    # same name.  Namespaces are significant.
+    # attribute:: An Attribute
+    def add( attribute )
+      self[attribute.name] = attribute
+    end
+
+    alias :<< :add
+
+    # Deletes all attributes matching a name.  Namespaces are significant.
+    # name:: 
+    #   A String; all attributes that match this path will be removed
+    # Returns:: an Array of the Attributes that were removed
+    def delete_all( name )
+      rv = []
+      each_attribute { |attribute| 
+        rv << attribute if attribute.expanded_name == name
+      }
+      rv.each{ |attr| attr.remove }
+      return rv
+    end
+
+    # The +get_attribute_ns+ method retrieves a method by its namespace
+    # and name. Thus it is possible to reliably identify an attribute
+    # even if an XML processor has changed the prefix.
+    # 
+    # Method contributed by Henrik Martensson
+    def get_attribute_ns(namespace, name)
+      each_attribute() { |attribute|
+        if name == attribute.name &&
+          namespace == attribute.namespace()
+          return attribute
+        end
+      }
+      nil
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/encoding.rb b/ruby_1_8_6/lib/rexml/encoding.rb
new file mode 100644
index 0000000000..6cae6b644d
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/encoding.rb
@@ -0,0 +1,66 @@
+# -*- mode: ruby; ruby-indent-level: 2; indent-tabs-mode: t; tab-width: 2 -*- vim: sw=2 ts=2
+module REXML
+  module Encoding
+    @encoding_methods = {}
+    def self.register(enc, &block)
+      @encoding_methods[enc] = block
+    end
+    def self.apply(obj, enc)
+      @encoding_methods[enc][obj]
+    end
+    def self.encoding_method(enc)
+      @encoding_methods[enc]
+    end
+
+    # Native, default format is UTF-8, so it is declared here rather than in
+    # an encodings/ definition.
+    UTF_8 = 'UTF-8'
+    UTF_16 = 'UTF-16'
+    UNILE = 'UNILE'
+
+    # ID ---> Encoding name
+    attr_reader :encoding
+    def encoding=( enc )
+      old_verbosity = $VERBOSE
+      begin
+        $VERBOSE = false
+        enc = enc.nil? ? nil : enc.upcase
+        return false if defined? @encoding and enc == @encoding
+        if enc and enc != UTF_8
+          @encoding = enc
+          raise ArgumentError, "Bad encoding name #@encoding" unless @encoding =~ /^[\w-]+$/
+          @encoding.untaint 
+          begin
+            require 'rexml/encodings/ICONV.rb'
+            Encoding.apply(self, "ICONV")
+          rescue LoadError, Exception
+            begin
+              enc_file = File.join( "rexml", "encodings", "#@encoding.rb" )
+              require enc_file
+              Encoding.apply(self, @encoding)
+            rescue LoadError => err
+              puts err.message
+              raise ArgumentError, "No decoder found for encoding #@encoding.  Please install iconv."
+            end
+          end
+        else
+          @encoding = UTF_8
+          require 'rexml/encodings/UTF-8.rb'
+          Encoding.apply(self, @encoding)
+        end
+      ensure
+        $VERBOSE = old_verbosity
+      end
+      true
+    end
+
+    def check_encoding str
+      # We have to recognize UTF-16, LSB UTF-16, and UTF-8
+      return UTF_16 if /\A\xfe\xff/n =~ str
+      return UNILE if /\A\xff\xfe/n =~ str
+      str =~ /^\s*<\?xml\s+version\s*=\s*(['"]).*?\1\s+encoding\s*=\s*(["'])(.*?)\2/um
+      return $3.upcase if $3
+      return UTF_8
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/encodings/CP-1252.rb b/ruby_1_8_6/lib/rexml/encodings/CP-1252.rb
new file mode 100644
index 0000000000..8675f9ff98
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/encodings/CP-1252.rb
@@ -0,0 +1,103 @@
+#
+# This class was contributed by Mikko Tiihonen mikko DOT tiihonen AT hut DOT fi
+#
+module REXML
+  module Encoding
+  	register( "CP-1252" ) do |o|
+  		class << o
+  			alias encode encode_cp1252
+			alias decode decode_cp1252
+  		end
+  	end
+
+    # Convert from UTF-8
+    def encode_cp1252(content)
+      array_utf8 = content.unpack('U*')
+      array_enc = []
+      array_utf8.each do |num|
+        case num
+          # shortcut first bunch basic characters
+        when 0..0xFF; array_enc << num
+          # characters added compared to iso-8859-1
+        when 0x20AC; array_enc << 0x80 # 0xe2 0x82 0xac
+        when 0x201A; array_enc << 0x82 # 0xe2 0x82 0x9a
+        when 0x0192; array_enc << 0x83 # 0xc6 0x92
+        when 0x201E; array_enc << 0x84 # 0xe2 0x82 0x9e
+        when 0x2026; array_enc << 0x85 # 0xe2 0x80 0xa6
+        when 0x2020; array_enc << 0x86 # 0xe2 0x80 0xa0
+        when 0x2021; array_enc << 0x87 # 0xe2 0x80 0xa1
+        when 0x02C6; array_enc << 0x88 # 0xcb 0x86
+        when 0x2030; array_enc << 0x89 # 0xe2 0x80 0xb0
+        when 0x0160; array_enc << 0x8A # 0xc5 0xa0
+        when 0x2039; array_enc << 0x8B # 0xe2 0x80 0xb9
+        when 0x0152; array_enc << 0x8C # 0xc5 0x92
+        when 0x017D; array_enc << 0x8E # 0xc5 0xbd
+        when 0x2018; array_enc << 0x91 # 0xe2 0x80 0x98
+        when 0x2019; array_enc << 0x92 # 0xe2 0x80 0x99
+        when 0x201C; array_enc << 0x93 # 0xe2 0x80 0x9c
+        when 0x201D; array_enc << 0x94 # 0xe2 0x80 0x9d
+        when 0x2022; array_enc << 0x95 # 0xe2 0x80 0xa2
+        when 0x2013; array_enc << 0x96 # 0xe2 0x80 0x93
+        when 0x2014; array_enc << 0x97 # 0xe2 0x80 0x94
+        when 0x02DC; array_enc << 0x98 # 0xcb 0x9c
+        when 0x2122; array_enc << 0x99 # 0xe2 0x84 0xa2
+        when 0x0161; array_enc << 0x9A # 0xc5 0xa1
+        when 0x203A; array_enc << 0x9B # 0xe2 0x80 0xba
+        when 0x0152; array_enc << 0x9C # 0xc5 0x93
+        when 0x017E; array_enc << 0x9E # 0xc5 0xbe
+        when 0x0178; array_enc << 0x9F # 0xc5 0xb8
+        else
+          # all remaining basic characters can be used directly
+          if num <= 0xFF
+            array_enc << num
+          else
+            # Numeric entity (&#nnnn;); shard by  Stefan Scholl
+            array_enc.concat "&\##{num};".unpack('C*')
+          end
+        end
+      end
+      array_enc.pack('C*')
+    end
+    
+    # Convert to UTF-8
+    def decode_cp1252(str)
+      array_latin9 = str.unpack('C*')
+      array_enc = []
+      array_latin9.each do |num|
+        case num
+          # characters that added compared to iso-8859-1
+        when 0x80; array_enc << 0x20AC # 0xe2 0x82 0xac
+        when 0x82; array_enc << 0x201A # 0xe2 0x82 0x9a
+        when 0x83; array_enc << 0x0192 # 0xc6 0x92
+        when 0x84; array_enc << 0x201E # 0xe2 0x82 0x9e
+        when 0x85; array_enc << 0x2026 # 0xe2 0x80 0xa6
+        when 0x86; array_enc << 0x2020 # 0xe2 0x80 0xa0
+        when 0x87; array_enc << 0x2021 # 0xe2 0x80 0xa1
+        when 0x88; array_enc << 0x02C6 # 0xcb 0x86
+        when 0x89; array_enc << 0x2030 # 0xe2 0x80 0xb0
+        when 0x8A; array_enc << 0x0160 # 0xc5 0xa0
+        when 0x8B; array_enc << 0x2039 # 0xe2 0x80 0xb9
+        when 0x8C; array_enc << 0x0152 # 0xc5 0x92
+        when 0x8E; array_enc << 0x017D # 0xc5 0xbd
+        when 0x91; array_enc << 0x2018 # 0xe2 0x80 0x98
+        when 0x92; array_enc << 0x2019 # 0xe2 0x80 0x99
+        when 0x93; array_enc << 0x201C # 0xe2 0x80 0x9c
+        when 0x94; array_enc << 0x201D # 0xe2 0x80 0x9d
+        when 0x95; array_enc << 0x2022 # 0xe2 0x80 0xa2
+        when 0x96; array_enc << 0x2013 # 0xe2 0x80 0x93
+        when 0x97; array_enc << 0x2014 # 0xe2 0x80 0x94
+        when 0x98; array_enc << 0x02DC # 0xcb 0x9c
+        when 0x99; array_enc << 0x2122 # 0xe2 0x84 0xa2
+        when 0x9A; array_enc << 0x0161 # 0xc5 0xa1
+        when 0x9B; array_enc << 0x203A # 0xe2 0x80 0xba
+        when 0x9C; array_enc << 0x0152 # 0xc5 0x93
+        when 0x9E; array_enc << 0x017E # 0xc5 0xbe
+        when 0x9F; array_enc << 0x0178 # 0xc5 0xb8
+        else
+          array_enc << num
+        end
+      end
+      array_enc.pack('U*')
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/encodings/EUC-JP.rb b/ruby_1_8_6/lib/rexml/encodings/EUC-JP.rb
new file mode 100644
index 0000000000..db37b6bf0d
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/encodings/EUC-JP.rb
@@ -0,0 +1,35 @@
+module REXML
+  module Encoding
+    begin
+      require 'uconv'
+
+      def decode_eucjp(str)
+        Uconv::euctou8(str)
+      end
+
+      def encode_eucjp content
+        Uconv::u8toeuc(content)
+      end
+    rescue LoadError
+      require 'nkf'
+
+      EUCTOU8 = '-Ewm0'
+      U8TOEUC = '-Wem0'
+
+      def decode_eucjp(str)
+        NKF.nkf(EUCTOU8, str)
+      end
+
+      def encode_eucjp content
+        NKF.nkf(U8TOEUC, content)
+      end
+    end
+
+    register("EUC-JP") do |obj|
+      class << obj
+        alias decode decode_eucjp
+        alias encode encode_eucjp
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/encodings/ICONV.rb b/ruby_1_8_6/lib/rexml/encodings/ICONV.rb
new file mode 100644
index 0000000000..172fba7cd1
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/encodings/ICONV.rb
@@ -0,0 +1,22 @@
+require "iconv"
+raise LoadError unless defined? Iconv
+
+module REXML
+  module Encoding
+    def decode_iconv(str)
+      Iconv.conv(UTF_8, @encoding, str)
+    end
+
+    def encode_iconv(content)
+      Iconv.conv(@encoding, UTF_8, content)
+    end
+
+    register("ICONV") do |obj|
+      Iconv.conv(UTF_8, obj.encoding, nil)
+      class << obj
+        alias decode decode_iconv
+        alias encode encode_iconv
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/encodings/ISO-8859-1.rb b/ruby_1_8_6/lib/rexml/encodings/ISO-8859-1.rb
new file mode 100644
index 0000000000..2873d13bf0
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/encodings/ISO-8859-1.rb
@@ -0,0 +1,7 @@
+require 'rexml/encodings/US-ASCII'
+
+module REXML
+  module Encoding
+    register("ISO-8859-1", &encoding_method("US-ASCII"))
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/encodings/ISO-8859-15.rb b/ruby_1_8_6/lib/rexml/encodings/ISO-8859-15.rb
new file mode 100644
index 0000000000..8dea0d38a4
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/encodings/ISO-8859-15.rb
@@ -0,0 +1,72 @@
+#
+# This class was contributed by Mikko Tiihonen mikko DOT tiihonen AT hut DOT fi
+#
+module REXML
+  module Encoding
+  	register("ISO-8859-15") do |o|
+  		alias encode to_iso_8859_15
+      alias decode from_iso_8859_15
+  	end
+
+    # Convert from UTF-8
+    def to_iso_8859_15(content)
+      array_utf8 = content.unpack('U*')
+      array_enc = []
+      array_utf8.each do |num|
+        case num
+          # shortcut first bunch basic characters
+        when 0..0xA3; array_enc << num
+          # characters removed compared to iso-8859-1
+        when 0xA4; array_enc << '&#164;'
+        when 0xA6; array_enc << '&#166;'
+        when 0xA8; array_enc << '&#168;'
+        when 0xB4; array_enc << '&#180;'
+        when 0xB8; array_enc << '&#184;'
+        when 0xBC; array_enc << '&#188;'
+        when 0xBD; array_enc << '&#189;'
+        when 0xBE; array_enc << '&#190;'
+          # characters added compared to iso-8859-1
+        when 0x20AC; array_enc << 0xA4 # 0xe2 0x82 0xac
+        when 0x0160; array_enc << 0xA6 # 0xc5 0xa0
+        when 0x0161; array_enc << 0xA8 # 0xc5 0xa1
+        when 0x017D; array_enc << 0xB4 # 0xc5 0xbd
+        when 0x017E; array_enc << 0xB8 # 0xc5 0xbe
+        when 0x0152; array_enc << 0xBC # 0xc5 0x92
+        when 0x0153; array_enc << 0xBD # 0xc5 0x93
+        when 0x0178; array_enc << 0xBE # 0xc5 0xb8
+        else
+          # all remaining basic characters can be used directly
+          if num <= 0xFF
+            array_enc << num
+          else
+            # Numeric entity (&#nnnn;); shard by  Stefan Scholl
+            array_enc.concat "&\##{num};".unpack('C*')
+          end
+        end
+      end
+      array_enc.pack('C*')
+    end
+    
+    # Convert to UTF-8
+    def from_iso_8859_15(str)
+      array_latin9 = str.unpack('C*')
+      array_enc = []
+      array_latin9.each do |num|
+        case num
+          # characters that differ compared to iso-8859-1
+        when 0xA4; array_enc << 0x20AC
+        when 0xA6; array_enc << 0x0160
+        when 0xA8; array_enc << 0x0161
+        when 0xB4; array_enc << 0x017D
+        when 0xB8; array_enc << 0x017E
+        when 0xBC; array_enc << 0x0152
+        when 0xBD; array_enc << 0x0153
+        when 0xBE; array_enc << 0x0178
+        else
+          array_enc << num
+        end
+      end
+      array_enc.pack('U*')
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/encodings/SHIFT-JIS.rb b/ruby_1_8_6/lib/rexml/encodings/SHIFT-JIS.rb
new file mode 100644
index 0000000000..93c7877afd
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/encodings/SHIFT-JIS.rb
@@ -0,0 +1,37 @@
+module REXML
+  module Encoding
+    begin
+      require 'uconv'
+
+      def decode_sjis content
+        Uconv::sjistou8(content)
+      end
+
+      def encode_sjis(str)
+        Uconv::u8tosjis(str)
+      end
+    rescue LoadError
+      require 'nkf'
+
+      SJISTOU8 = '-Swm0'
+      U8TOSJIS = '-Wsm0'
+
+      def decode_sjis(str)
+        NKF.nkf(SJISTOU8, str)
+      end
+
+      def encode_sjis content
+        NKF.nkf(U8TOSJIS, content)
+      end
+    end
+
+    b = proc do |obj|
+      class << obj
+        alias decode decode_sjis
+        alias encode encode_sjis
+      end
+    end
+    register("SHIFT-JIS", &b)
+    register("SHIFT_JIS", &b)
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/encodings/SHIFT_JIS.rb b/ruby_1_8_6/lib/rexml/encodings/SHIFT_JIS.rb
new file mode 100644
index 0000000000..e355704a7c
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/encodings/SHIFT_JIS.rb
@@ -0,0 +1 @@
+require 'rexml/encodings/SHIFT-JIS'
diff --git a/ruby_1_8_6/lib/rexml/encodings/UNILE.rb b/ruby_1_8_6/lib/rexml/encodings/UNILE.rb
new file mode 100644
index 0000000000..d054140c40
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/encodings/UNILE.rb
@@ -0,0 +1,34 @@
+module REXML
+  module Encoding
+    def encode_unile content
+      array_utf8 = content.unpack("U*")
+      array_enc = []
+      array_utf8.each do |num|
+        if ((num>>16) > 0)
+          array_enc << ??
+          array_enc << 0
+        else
+          array_enc << (num & 0xFF)
+          array_enc << (num >> 8)
+        end
+      end
+      array_enc.pack('C*')
+    end
+
+    def decode_unile(str)
+      array_enc=str.unpack('C*')
+      array_utf8 = []
+      0.step(array_enc.size-1, 2){|i| 
+        array_utf8 << (array_enc.at(i) + array_enc.at(i+1)*0x100)
+      }
+      array_utf8.pack('U*')
+    end
+
+    register(UNILE) do |obj|
+      class << obj
+        alias decode decode_unile
+        alias encode encode_unile
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/encodings/US-ASCII.rb b/ruby_1_8_6/lib/rexml/encodings/US-ASCII.rb
new file mode 100644
index 0000000000..fb4c217074
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/encodings/US-ASCII.rb
@@ -0,0 +1,30 @@
+module REXML
+  module Encoding
+    # Convert from UTF-8
+    def encode_ascii content
+      array_utf8 = content.unpack('U*')
+      array_enc = []
+      array_utf8.each do |num|
+        if num <= 0x7F
+          array_enc << num
+        else
+          # Numeric entity (&#nnnn;); shard by  Stefan Scholl
+          array_enc.concat "&\##{num};".unpack('C*')
+        end
+      end
+      array_enc.pack('C*')
+    end
+
+    # Convert to UTF-8
+    def decode_ascii(str)
+      str.unpack('C*').pack('U*')
+    end
+
+    register("US-ASCII") do |obj|
+      class << obj
+        alias decode decode_ascii
+        alias encode encode_ascii
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/encodings/UTF-16.rb b/ruby_1_8_6/lib/rexml/encodings/UTF-16.rb
new file mode 100644
index 0000000000..007c493d9c
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/encodings/UTF-16.rb
@@ -0,0 +1,35 @@
+module REXML
+  module Encoding
+    def encode_utf16 content
+      array_utf8 = content.unpack("U*")
+      array_enc = []
+      array_utf8.each do |num|
+        if ((num>>16) > 0)
+          array_enc << 0
+          array_enc << ??
+        else
+          array_enc << (num >> 8)
+          array_enc << (num & 0xFF)
+        end
+      end
+      array_enc.pack('C*')
+    end
+
+    def decode_utf16(str)
+      str = str[2..-1] if /^\376\377/n =~ str
+      array_enc=str.unpack('C*')
+      array_utf8 = []
+      0.step(array_enc.size-1, 2){|i| 
+        array_utf8 << (array_enc.at(i+1) + array_enc.at(i)*0x100)
+      }
+      array_utf8.pack('U*')
+    end
+
+    register(UTF_16) do |obj|
+      class << obj
+        alias decode decode_utf16
+        alias encode encode_utf16
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/encodings/UTF-8.rb b/ruby_1_8_6/lib/rexml/encodings/UTF-8.rb
new file mode 100644
index 0000000000..bb08f44100
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/encodings/UTF-8.rb
@@ -0,0 +1,18 @@
+module REXML
+  module Encoding
+    def encode_utf8 content
+      content
+    end
+
+    def decode_utf8(str)
+      str
+    end
+
+    register(UTF_8) do |obj|
+      class << obj
+        alias decode decode_utf8
+        alias encode encode_utf8
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/entity.rb b/ruby_1_8_6/lib/rexml/entity.rb
new file mode 100644
index 0000000000..ff2d45f39b
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/entity.rb
@@ -0,0 +1,165 @@
+require 'rexml/child'
+require 'rexml/source'
+require 'rexml/xmltokens'
+
+module REXML
+	# God, I hate DTDs.  I really do.  Why this idiot standard still
+	# plagues us is beyond me.
+	class Entity < Child
+		include XMLTokens
+		PUBIDCHAR = "\x20\x0D\x0Aa-zA-Z0-9\\-()+,./:=?;!*@$_%#"
+		SYSTEMLITERAL = %Q{((?:"[^"]*")|(?:'[^']*'))}
+		PUBIDLITERAL = %Q{("[#{PUBIDCHAR}']*"|'[#{PUBIDCHAR}]*')}
+		EXTERNALID = "(?:(?:(SYSTEM)\\s+#{SYSTEMLITERAL})|(?:(PUBLIC)\\s+#{PUBIDLITERAL}\\s+#{SYSTEMLITERAL}))"
+		NDATADECL = "\\s+NDATA\\s+#{NAME}"
+		PEREFERENCE = "%#{NAME};"
+		ENTITYVALUE = %Q{((?:"(?:[^%&"]|#{PEREFERENCE}|#{REFERENCE})*")|(?:'([^%&']|#{PEREFERENCE}|#{REFERENCE})*'))}
+		PEDEF = "(?:#{ENTITYVALUE}|#{EXTERNALID})"
+		ENTITYDEF = "(?:#{ENTITYVALUE}|(?:#{EXTERNALID}(#{NDATADECL})?))"
+		PEDECL = "<!ENTITY\\s+(%)\\s+#{NAME}\\s+#{PEDEF}\\s*>"
+		GEDECL = "<!ENTITY\\s+#{NAME}\\s+#{ENTITYDEF}\\s*>"
+		ENTITYDECL = /\s*(?:#{GEDECL})|(?:#{PEDECL})/um
+
+		attr_reader :name, :external, :ref, :ndata, :pubid
+
+		# Create a new entity.  Simple entities can be constructed by passing a
+		# name, value to the constructor; this creates a generic, plain entity
+		# reference. For anything more complicated, you have to pass a Source to
+		# the constructor with the entity definiton, or use the accessor methods.
+		# +WARNING+: There is no validation of entity state except when the entity
+		# is read from a stream.  If you start poking around with the accessors,
+		# you can easily create a non-conformant Entity.  The best thing to do is
+		# dump the stupid DTDs and use XMLSchema instead.
+		# 
+		#  e = Entity.new( 'amp', '&' )
+		def initialize stream, value=nil, parent=nil, reference=false
+			super(parent)
+			@ndata = @pubid = @value = @external = nil
+			if stream.kind_of? Array
+				@name = stream[1]
+				if stream[-1] == '%'
+					@reference = true 
+					stream.pop
+				else
+					@reference = false
+				end
+				if stream[2] =~ /SYSTEM|PUBLIC/
+					@external = stream[2]
+					if @external == 'SYSTEM'
+						@ref = stream[3]
+						@ndata = stream[4] if stream.size == 5
+					else
+						@pubid = stream[3]
+						@ref = stream[4]
+					end
+				else
+					@value = stream[2]
+				end
+			else
+				@reference = reference
+				@external = nil
+				@name = stream
+				@value = value
+			end
+		end
+
+		# Evaluates whether the given string matchs an entity definition,
+		# returning true if so, and false otherwise.
+		def Entity::matches? string
+			(ENTITYDECL =~ string) == 0
+		end
+
+		# Evaluates to the unnormalized value of this entity; that is, replacing
+		# all entities -- both %ent; and &ent; entities.  This differs from
+		# +value()+ in that +value+ only replaces %ent; entities.
+		def unnormalized
+			v = value()
+			return nil if v.nil?
+			@unnormalized = Text::unnormalize(v, parent)
+			@unnormalized
+		end
+
+		#once :unnormalized
+
+		# Returns the value of this entity unprocessed -- raw.  This is the
+		# normalized value; that is, with all %ent; and &ent; entities intact
+		def normalized
+			@value
+		end
+
+		# Write out a fully formed, correct entity definition (assuming the Entity
+		# object itself is valid.)
+    #
+    # out::
+    #   An object implementing <TT>&lt;&lt;<TT> to which the entity will be
+    #   output
+    # indent::
+    #   *DEPRECATED* and ignored
+		def write out, indent=-1
+			out << '<!ENTITY '
+			out << '% ' if @reference
+			out << @name
+			out << ' '
+			if @external
+				out << @external << ' '
+				if @pubid
+					q = @pubid.include?('"')?"'":'"'
+					out << q << @pubid << q << ' '
+				end
+				q = @ref.include?('"')?"'":'"'
+				out << q << @ref << q
+				out << ' NDATA ' << @ndata if @ndata
+			else
+				q = @value.include?('"')?"'":'"'
+				out << q << @value << q
+			end
+			out << '>'
+		end
+
+		# Returns this entity as a string.  See write().
+		def to_s
+			rv = ''
+			write rv
+			rv
+		end
+
+		PEREFERENCE_RE = /#{PEREFERENCE}/um
+		# Returns the value of this entity.  At the moment, only internal entities
+		# are processed.  If the value contains internal references (IE,
+		# %blah;), those are replaced with their values.  IE, if the doctype
+		# contains:
+		#  <!ENTITY % foo "bar">
+		#  <!ENTITY yada "nanoo %foo; nanoo>
+		# then:
+		#  doctype.entity('yada').value   #-> "nanoo bar nanoo"
+		def value
+			if @value
+				matches = @value.scan(PEREFERENCE_RE)
+				rv = @value.clone
+				if @parent
+					matches.each do |entity_reference|
+						entity_value = @parent.entity( entity_reference[0] )
+						rv.gsub!( /%#{entity_reference};/um, entity_value )
+					end
+				end
+				return rv
+			end
+			nil
+		end
+	end
+
+	# This is a set of entity constants -- the ones defined in the XML
+	# specification.  These are +gt+, +lt+, +amp+, +quot+ and +apos+.
+	module EntityConst
+		# +>+
+		GT = Entity.new( 'gt', '>' )
+		# +<+
+		LT = Entity.new( 'lt', '<' )
+		# +&+
+		AMP = Entity.new( 'amp', '&' )
+		# +"+
+		QUOT = Entity.new( 'quot', '"' )
+		# +'+
+		APOS = Entity.new( 'apos', "'" )
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/formatters/default.rb b/ruby_1_8_6/lib/rexml/formatters/default.rb
new file mode 100644
index 0000000000..77381bdf84
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/formatters/default.rb
@@ -0,0 +1,109 @@
+module REXML
+  module Formatters
+    class Default
+      # Prints out the XML document with no formatting -- except if id_hack is
+      # set.
+      #
+      # ie_hack::
+      #   If set to true, then inserts whitespace before the close of an empty
+      #   tag, so that IE's bad XML parser doesn't choke.
+      def initialize( ie_hack=false )
+        @ie_hack = ie_hack
+      end
+
+      # Writes the node to some output.
+      #
+      # node::
+      #   The node to write
+      # output::
+      #   A class implementing <TT>&lt;&lt;</TT>.  Pass in an Output object to
+      #   change the output encoding.
+      def write( node, output )
+        case node
+
+        when Document 
+          if node.xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
+            output = Output.new( output, node.xml_decl.encoding )
+          end
+          write_document( node, output )
+
+        when Element
+          write_element( node, output )
+
+        when Declaration, ElementDecl, NotationDecl, ExternalEntity, Entity,
+             Attribute, AttlistDecl
+          node.write( output,-1 )
+
+        when Instruction
+          write_instruction( node, output )
+
+        when DocType, XMLDecl
+          node.write( output )
+
+        when Comment
+          write_comment( node, output )
+
+        when CData
+          write_cdata( node, output )
+
+        when Text
+          write_text( node, output )
+
+        else
+          raise Exception.new("XML FORMATTING ERROR")
+
+        end
+      end
+
+      protected
+      def write_document( node, output )
+        node.children.each { |child| write( child, output ) }
+      end
+
+      def write_element( node, output )
+        output << "<#{node.expanded_name}"
+
+        node.attributes.each_attribute do |attr|
+          output << " "
+          attr.write( output )
+        end unless node.attributes.empty?
+
+        if node.children.empty?
+          output << " " if @ie_hack
+          output << "/" 
+        else
+          output << ">"
+          node.children.each { |child|
+            write( child, output )
+          }
+          output << "</#{node.expanded_name}"
+        end
+        output << ">"
+      end
+
+      def write_text( node, output )
+        output << node.to_s()
+      end
+
+      def write_comment( node, output )
+        output << Comment::START
+        output << node.to_s
+        output << Comment::STOP
+      end
+
+      def write_cdata( node, output )
+        output << CData::START
+        output << node.to_s
+        output << CData::STOP
+      end
+
+      def write_instruction( node, output )
+        output << Instruction::START.sub(/\\/u, '')
+        output << node.target
+        output << ' '
+        output << node.content
+        output << Instruction::STOP.sub(/\\/u, '')
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/formatters/pretty.rb b/ruby_1_8_6/lib/rexml/formatters/pretty.rb
new file mode 100644
index 0000000000..22b6d857cd
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/formatters/pretty.rb
@@ -0,0 +1,137 @@
+require 'rexml/formatters/default'
+
+module REXML
+  module Formatters
+    # Pretty-prints an XML document.  This destroys whitespace in text nodes
+    # and will insert carriage returns and indentations.
+    #
+    # TODO: Add an option to print attributes on new lines
+    class Pretty < Default
+
+      # If compact is set to true, then the formatter will attempt to use as
+      # little space as possible
+      attr_accessor :compact
+      # The width of a page.  Used for formatting text
+      attr_accessor :width
+
+      # Create a new pretty printer.
+      #
+      # output::
+      #   An object implementing '<<(String)', to which the output will be written.
+      # indentation::
+      #   An integer greater than 0.  The indentation of each level will be
+      #   this number of spaces.  If this is < 1, the behavior of this object
+      #   is undefined.  Defaults to 2.
+      # ie_hack::
+      #   If true, the printer will insert whitespace before closing empty
+      #   tags, thereby allowing Internet Explorer's feeble XML parser to
+      #   function. Defaults to false.
+      def initialize( indentation=2, ie_hack=false )
+        @indentation = indentation
+        @level = 0
+        @ie_hack = ie_hack
+        @width = 80
+      end
+
+      protected
+      def write_element(node, output)
+        output << ' '*@level
+        output << "<#{node.expanded_name}"
+
+        node.attributes.each_attribute do |attr|
+          output << " "
+          attr.write( output )
+        end unless node.attributes.empty?
+
+        if node.children.empty?
+          if @ie_hack
+            output << " "
+          end
+          output << "/" 
+        else
+          output << ">"
+          # If compact and all children are text, and if the formatted output
+          # is less than the specified width, then try to print everything on
+          # one line
+          skip = false
+          if compact
+            if node.children.inject(true) {|s,c| s & c.kind_of?(Text)}
+              string = ""
+              old_level = @level
+              @level = 0
+              node.children.each { |child| write( child, string ) }
+              @level = old_level
+              if string.length < @width
+                output << string
+                skip = true
+              end
+            end
+          end
+          unless skip
+            output << "\n"
+            @level += @indentation
+            node.children.each { |child|
+              next if child.kind_of?(Text) and child.to_s.strip.length == 0
+              write( child, output )
+              output << "\n"
+            }
+            @level -= @indentation
+            output << ' '*@level
+          end
+          output << "</#{node.expanded_name}"
+        end
+        output << ">"
+      end
+
+      def write_text( node, output )
+        s = node.to_s()
+        s.gsub!(/\s/,' ')
+        s.squeeze!(" ")
+        s = wrap(s, 80-@level)
+        s = indent_text(s, @level, " ", true)
+        output << (' '*@level + s)
+      end
+
+      def write_comment( node, output)
+        output << ' ' * @level
+        super
+      end
+
+      def write_cdata( node, output)
+        output << ' ' * @level
+        super
+      end
+
+      def write_document( node, output )
+        # Ok, this is a bit odd.  All XML documents have an XML declaration,
+        # but it may not write itself if the user didn't specifically add it,
+        # either through the API or in the input document.  If it doesn't write
+        # itself, then we don't need a carriage return... which makes this
+        # logic more complex.
+        node.children.each { |child|
+          next if child == node.children[-1] and child.instance_of?(Text)
+          unless child == node.children[0] or child.instance_of?(Text) or
+            (child == node.children[1] and !node.children[0].writethis)
+            output << "\n"
+          end
+          write( child, output )
+        }
+      end
+
+      private
+      def indent_text(string, level=1, style="\t", indentfirstline=true)
+        return string if level < 0
+        string.gsub(/\n/, "\n#{style*level}")
+      end
+
+      def wrap(string, width)
+        # Recursivly wrap string at width.
+        return string if string.length <= width
+        place = string.rindex(' ', width) # Position in string with last ' ' before cutoff
+        return string[0,place] + "\n" + wrap(string[place+1..-1], width)
+      end
+
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/lib/rexml/formatters/transitive.rb b/ruby_1_8_6/lib/rexml/formatters/transitive.rb
new file mode 100644
index 0000000000..1d80f21fbb
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/formatters/transitive.rb
@@ -0,0 +1,56 @@
+require 'rexml/formatters/pretty'
+
+module REXML
+  module Formatters
+    # The Transitive formatter writes an XML document that parses to an
+    # identical document as the source document.  This means that no extra
+    # whitespace nodes are inserted, and whitespace within text nodes is
+    # preserved.  Within these constraints, the document is pretty-printed,
+    # with whitespace inserted into the metadata to introduce formatting.
+    #
+    # Note that this is only useful if the original XML is not already
+    # formatted.  Since this formatter does not alter whitespace nodes, the
+    # results of formatting already formatted XML will be odd.
+    class Transitive < Default
+      def initialize( indentation=2 )
+        @indentation = indentation
+        @level = 0
+      end
+
+      protected
+      def write_element( node, output )
+        output << "<#{node.expanded_name}"
+
+        node.attributes.each_attribute do |attr|
+          output << " "
+          attr.write( output )
+        end unless node.attributes.empty?
+
+        output << "\n"
+        output << ' '*@level
+        if node.children.empty?
+          output << "/" 
+        else
+          output << ">"
+          # If compact and all children are text, and if the formatted output
+          # is less than the specified width, then try to print everything on
+          # one line
+          skip = false
+          @level += @indentation
+          node.children.each { |child|
+            write( child, output )
+          }
+          @level -= @indentation
+          output << "</#{node.expanded_name}"
+          output << "\n"
+          output << ' '*@level
+        end
+        output << ">"
+      end
+
+      def write_text( node, output )
+        output << node.to_s()
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/functions.rb b/ruby_1_8_6/lib/rexml/functions.rb
new file mode 100644
index 0000000000..8293e9c5ac
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/functions.rb
@@ -0,0 +1,382 @@
+module REXML
+  # If you add a method, keep in mind two things:
+  # (1) the first argument will always be a list of nodes from which to
+  # filter.  In the case of context methods (such as position), the function
+  # should return an array with a value for each child in the array.
+  # (2) all method calls from XML will have "-" replaced with "_".
+  # Therefore, in XML, "local-name()" is identical (and actually becomes)
+  # "local_name()"
+  module Functions
+    @@context = nil
+    @@namespace_context = {}
+    @@variables = {}
+
+    def Functions::namespace_context=(x) ; @@namespace_context=x ; end
+    def Functions::variables=(x) ; @@variables=x ; end
+    def Functions::namespace_context ; @@namespace_context ; end
+    def Functions::variables ; @@variables ; end
+
+    def Functions::context=(value); @@context = value; end
+
+    def Functions::text( )
+      if @@context[:node].node_type == :element
+        return @@context[:node].find_all{|n| n.node_type == :text}.collect{|n| n.value}
+      elsif @@context[:node].node_type == :text
+        return @@context[:node].value
+      else
+        return false
+      end
+    end
+
+    def Functions::last( )
+      @@context[:size]
+    end
+
+    def Functions::position( )
+      @@context[:index]
+    end
+
+    def Functions::count( node_set )
+      node_set.size
+    end
+
+    # Since REXML is non-validating, this method is not implemented as it
+    # requires a DTD
+    def Functions::id( object )
+    end
+
+    # UNTESTED
+    def Functions::local_name( node_set=nil )
+      get_namespace( node_set ) do |node|
+        return node.local_name 
+      end
+    end
+
+    def Functions::namespace_uri( node_set=nil )
+      get_namespace( node_set ) {|node| node.namespace}
+    end
+
+    def Functions::name( node_set=nil )
+      get_namespace( node_set ) do |node| 
+        node.expanded_name
+      end
+    end
+
+    # Helper method.
+    def Functions::get_namespace( node_set = nil )
+      if node_set == nil
+        yield @@context[:node] if defined? @@context[:node].namespace
+      else  
+        if node_set.respond_to? :each
+          node_set.each { |node| yield node if defined? node.namespace }
+        elsif node_set.respond_to? :namespace
+          yield node_set
+        end
+      end
+    end
+
+    # A node-set is converted to a string by returning the string-value of the
+    # node in the node-set that is first in document order. If the node-set is
+    # empty, an empty string is returned.
+    #
+    # A number is converted to a string as follows
+    #
+    # NaN is converted to the string NaN 
+    #
+    # positive zero is converted to the string 0 
+    #
+    # negative zero is converted to the string 0 
+    #
+    # positive infinity is converted to the string Infinity 
+    #
+    # negative infinity is converted to the string -Infinity 
+    #
+    # if the number is an integer, the number is represented in decimal form
+    # as a Number with no decimal point and no leading zeros, preceded by a
+    # minus sign (-) if the number is negative
+    #
+    # otherwise, the number is represented in decimal form as a Number
+    # including a decimal point with at least one digit before the decimal
+    # point and at least one digit after the decimal point, preceded by a
+    # minus sign (-) if the number is negative; there must be no leading zeros
+    # before the decimal point apart possibly from the one required digit
+    # immediately before the decimal point; beyond the one required digit
+    # after the decimal point there must be as many, but only as many, more
+    # digits as are needed to uniquely distinguish the number from all other
+    # IEEE 754 numeric values.
+    #
+    # The boolean false value is converted to the string false. The boolean
+    # true value is converted to the string true.
+    #
+    # An object of a type other than the four basic types is converted to a
+    # string in a way that is dependent on that type.
+    def Functions::string( object=nil )
+      #object = @context unless object
+      if object.instance_of? Array
+        string( object[0] )
+      elsif defined? object.node_type
+        if object.node_type == :attribute
+          object.value
+        elsif object.node_type == :element || object.node_type == :document
+          string_value(object)
+        else
+          object.to_s
+        end
+      elsif object.nil?
+        return ""
+      else
+        object.to_s
+      end
+    end
+
+    def Functions::string_value( o )
+      rv = ""
+      o.children.each { |e|
+        if e.node_type == :text
+          rv << e.to_s
+        elsif e.node_type == :element
+          rv << string_value( e )
+        end
+      }
+      rv
+    end
+
+    # UNTESTED
+    def Functions::concat( *objects )
+      objects.join
+    end
+
+    # Fixed by Mike Stok
+    def Functions::starts_with( string, test )
+      string(string).index(string(test)) == 0
+    end
+
+    # Fixed by Mike Stok
+    def Functions::contains( string, test )
+      string(string).include?(string(test))
+    end
+
+    # Kouhei fixed this 
+    def Functions::substring_before( string, test )
+      ruby_string = string(string)
+      ruby_index = ruby_string.index(string(test))
+      if ruby_index.nil?
+        ""
+      else
+        ruby_string[ 0...ruby_index ]
+      end
+    end
+ 
+    # Kouhei fixed this too
+    def Functions::substring_after( string, test )
+      ruby_string = string(string)
+      test_string = string(test)
+      return $1 if ruby_string =~ /#{test}(.*)/
+      ""
+    end
+
+    # Take equal portions of Mike Stok and Sean Russell; mix 
+    # vigorously, and pour into a tall, chilled glass.  Serves 10,000.
+    def Functions::substring( string, start, length=nil )
+      ruby_string = string(string)
+      ruby_length = if length.nil? 
+                      ruby_string.length.to_f
+                    else
+                      number(length)
+                    end
+      ruby_start = number(start)
+
+      # Handle the special cases
+      return '' if (
+        ruby_length.nan? or 
+        ruby_start.nan? or
+        ruby_start.infinite?
+      )
+
+      infinite_length = ruby_length.infinite? == 1
+      ruby_length = ruby_string.length if infinite_length
+        
+      # Now, get the bounds.  The XPath bounds are 1..length; the ruby bounds 
+      # are 0..length.  Therefore, we have to offset the bounds by one.
+      ruby_start = ruby_start.round - 1
+      ruby_length = ruby_length.round
+
+      if ruby_start < 0
+       ruby_length += ruby_start unless infinite_length
+       ruby_start = 0
+      end
+      return '' if ruby_length <= 0
+      ruby_string[ruby_start,ruby_length]
+    end
+
+    # UNTESTED
+    def Functions::string_length( string )
+      string(string).length
+    end
+
+    # UNTESTED
+    def Functions::normalize_space( string=nil )
+      string = string(@@context[:node]) if string.nil?
+      if string.kind_of? Array
+        string.collect{|x| string.to_s.strip.gsub(/\s+/um, ' ') if string}
+      else
+        string.to_s.strip.gsub(/\s+/um, ' ')
+      end
+    end
+
+    # This is entirely Mike Stok's beast
+    def Functions::translate( string, tr1, tr2 )
+      from = string(tr1)
+      to = string(tr2)
+
+      # the map is our translation table.
+      #
+      # if a character occurs more than once in the
+      # from string then we ignore the second &
+      # subsequent mappings
+      #
+      # if a charactcer maps to nil then we delete it
+      # in the output.  This happens if the from
+      # string is longer than the to string
+      #
+      # there's nothing about - or ^ being special in
+      # http://www.w3.org/TR/xpath#function-translate
+      # so we don't build ranges or negated classes
+
+      map = Hash.new
+      0.upto(from.length - 1) { |pos|
+        from_char = from[pos]
+        unless map.has_key? from_char
+          map[from_char] = 
+          if pos < to.length
+            to[pos]
+          else
+            nil
+          end
+        end
+      }
+
+      string(string).unpack('U*').collect { |c|
+        if map.has_key? c then map[c] else c end
+      }.compact.pack('U*')
+    end
+
+    # UNTESTED
+    def Functions::boolean( object=nil )
+      if object.kind_of? String
+        if object =~ /\d+/u
+          return object.to_f != 0
+        else
+          return object.size > 0
+        end
+      elsif object.kind_of? Array
+        object = object.find{|x| x and true}
+      end
+      return object ? true : false
+    end
+
+    # UNTESTED
+    def Functions::not( object )
+      not boolean( object )
+    end
+
+    # UNTESTED
+    def Functions::true( )
+      true
+    end
+
+    # UNTESTED
+    def Functions::false(  )
+      false
+    end
+
+    # UNTESTED
+    def Functions::lang( language )
+      lang = false
+      node = @@context[:node]
+      attr = nil
+      until node.nil?
+        if node.node_type == :element
+          attr = node.attributes["xml:lang"]
+          unless attr.nil?
+            lang = compare_language(string(language), attr)
+            break
+          else
+          end
+        end
+        node = node.parent
+      end
+      lang
+    end
+
+    def Functions::compare_language lang1, lang2
+      lang2.downcase.index(lang1.downcase) == 0
+    end
+
+    # a string that consists of optional whitespace followed by an optional
+    # minus sign followed by a Number followed by whitespace is converted to
+    # the IEEE 754 number that is nearest (according to the IEEE 754
+    # round-to-nearest rule) to the mathematical value represented by the
+    # string; any other string is converted to NaN
+    #
+    # boolean true is converted to 1; boolean false is converted to 0
+    #
+    # a node-set is first converted to a string as if by a call to the string
+    # function and then converted in the same way as a string argument
+    #
+    # an object of a type other than the four basic types is converted to a
+    # number in a way that is dependent on that type
+    def Functions::number( object=nil )
+      object = @@context[:node] unless object
+      case object
+      when true
+        Float(1)
+      when false
+        Float(0)
+      when Array
+        number(string( object ))
+      when Numeric
+        object.to_f
+      else
+        str = string( object )
+        # If XPath ever gets scientific notation...
+        #if str =~ /^\s*-?(\d*\.?\d+|\d+\.)([Ee]\d*)?\s*$/
+        if str =~ /^\s*-?(\d*\.?\d+|\d+\.)\s*$/
+          str.to_f
+        else
+          (0.0 / 0.0)
+        end
+      end
+    end
+
+    def Functions::sum( nodes )
+      nodes = [nodes] unless nodes.kind_of? Array
+      nodes.inject(0) { |r,n| r += number(string(n)) }
+    end
+    
+    def Functions::floor( number )
+      number(number).floor
+    end
+
+    def Functions::ceiling( number )
+      number(number).ceil
+    end
+
+    def Functions::round( number )
+      begin
+        number(number).round
+      rescue FloatDomainError
+        number(number)
+      end
+    end
+
+    def Functions::processing_instruction( node )
+      node.node_type == :processing_instruction
+    end
+
+    def Functions::method_missing( id )
+      puts "METHOD MISSING #{id.id2name}"
+      XPath.match( @@context[:node], id.id2name )
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/instruction.rb b/ruby_1_8_6/lib/rexml/instruction.rb
new file mode 100644
index 0000000000..c16b894b4a
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/instruction.rb
@@ -0,0 +1,70 @@
+require "rexml/child"
+require "rexml/source"
+
+module REXML
+	# Represents an XML Instruction; IE, <? ... ?>
+	# TODO: Add parent arg (3rd arg) to constructor
+	class Instruction < Child
+		START = '<\?'
+		STOP = '\?>'
+
+		# target is the "name" of the Instruction; IE, the "tag" in <?tag ...?>
+		# content is everything else.
+		attr_accessor :target, :content
+
+		# Constructs a new Instruction
+		# @param target can be one of a number of things.  If String, then 
+		# the target of this instruction is set to this.  If an Instruction,
+		# then the Instruction is shallowly cloned (target and content are
+		# copied).  If a Source, then the source is scanned and parsed for
+		# an Instruction declaration.
+		# @param content Must be either a String, or a Parent.  Can only
+		# be a Parent if the target argument is a Source.  Otherwise, this
+		# String is set as the content of this instruction.
+		def initialize(target, content=nil)
+			if target.kind_of? String
+				super()
+				@target = target
+				@content = content
+			elsif target.kind_of? Instruction
+				super(content)
+				@target = target.target
+				@content = target.content
+			end
+			@content.strip! if @content
+		end
+
+		def clone
+			Instruction.new self
+		end
+		
+    # == DEPRECATED
+    # See the rexml/formatters package
+    #
+		def write writer, indent=-1, transitive=false, ie_hack=false
+      Kernel.warn( "#{self.class.name}.write is deprecated" )
+			indent(writer, indent)
+			writer << START.sub(/\\/u, '')
+			writer << @target
+			writer << ' '
+			writer << @content
+			writer << STOP.sub(/\\/u, '')
+		end
+
+		# @return true if other is an Instruction, and the content and target
+		# of the other matches the target and content of this object.
+		def ==( other )
+			other.kind_of? Instruction and
+			other.target == @target and
+			other.content == @content
+		end
+
+    def node_type
+      :processing_instruction
+    end
+
+    def inspect
+      "<?p-i #{target} ...?>"
+    end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/light/node.rb b/ruby_1_8_6/lib/rexml/light/node.rb
new file mode 100644
index 0000000000..943ec5f1a0
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/light/node.rb
@@ -0,0 +1,196 @@
+require 'rexml/xmltokens'
+require 'rexml/light/node'
+
+# [ :element, parent, name, attributes, children* ]
+	# a = Node.new
+	# a << "B"		# => <a>B</a>
+	# a.b			# => <a>B<b/></a>
+	# a.b[1]			# => <a>B<b/><b/><a>
+	# a.b[1]["x"] = "y"	# => <a>B<b/><b x="y"/></a>
+	# a.b[0].c		# => <a>B<b><c/></b><b x="y"/></a>
+	# a.b.c << "D"		# => <a>B<b><c>D</c></b><b x="y"/></a>
+module REXML
+	module Light
+		# Represents a tagged XML element.  Elements are characterized by
+		# having children, attributes, and names, and can themselves be
+		# children.
+		class Node
+			NAMESPLIT = /^(?:(#{XMLTokens::NCNAME_STR}):)?(#{XMLTokens::NCNAME_STR})/u
+			PARENTS = [ :element, :document, :doctype ]
+			# Create a new element.
+			def initialize node=nil
+				@node = node
+				if node.kind_of? String
+					node = [ :text, node ]
+				elsif node.nil?
+					node = [ :document, nil, nil ]
+				elsif node[0] == :start_element
+					node[0] = :element
+				elsif node[0] == :start_doctype
+					node[0] = :doctype
+				elsif node[0] == :start_document
+					node[0] = :document
+				end
+			end
+
+			def size
+				if PARENTS.include? @node[0]
+					@node[-1].size
+				else
+					0
+				end
+			end
+
+			def each( &block )
+				size.times { |x| yield( at(x+4) ) }
+			end
+
+			def name
+				at(2)
+			end
+
+			def name=( name_str, ns=nil )
+				pfx = ''
+				pfx = "#{prefix(ns)}:" if ns
+				_old_put(2, "#{pfx}#{name_str}")
+			end
+
+			def parent=( node )
+				_old_put(1,node)
+			end
+
+			def local_name
+				namesplit
+				@name
+			end
+
+			def local_name=( name_str )
+				_old_put( 1, "#@prefix:#{name_str}" )
+			end
+
+			def prefix( namespace=nil )
+				prefix_of( self, namespace )
+			end
+
+			def namespace( prefix=prefix() )
+				namespace_of( self, prefix )
+			end
+
+			def namespace=( namespace )
+				@prefix = prefix( namespace )
+				pfx = ''
+				pfx = "#@prefix:" if @prefix.size > 0
+				_old_put(1, "#{pfx}#@name")
+			end
+
+			def []( reference, ns=nil )
+				if reference.kind_of? String
+					pfx = ''
+					pfx = "#{prefix(ns)}:" if ns
+					at(3)["#{pfx}#{reference}"]
+				elsif reference.kind_of? Range
+					_old_get( Range.new(4+reference.begin, reference.end, reference.exclude_end?) )
+				else
+					_old_get( 4+reference )
+				end
+			end
+
+			def =~( path )
+				XPath.match( self, path )
+			end
+
+			# Doesn't handle namespaces yet
+			def []=( reference, ns, value=nil )
+				if reference.kind_of? String
+					value = ns unless value
+					at( 3 )[reference] = value
+				elsif reference.kind_of? Range
+					_old_put( Range.new(3+reference.begin, reference.end, reference.exclude_end?), ns )
+				else
+					if value
+						_old_put( 4+reference, ns, value )
+					else
+						_old_put( 4+reference, ns )
+					end
+				end
+			end
+
+			# Append a child to this element, optionally under a provided namespace.
+			# The namespace argument is ignored if the element argument is an Element
+			# object.  Otherwise, the element argument is a string, the namespace (if
+			# provided) is the namespace the element is created in.
+			def << element
+				if node_type() == :text
+					at(-1) << element
+				else
+					newnode = Node.new( element )
+					newnode.parent = self
+					self.push( newnode )
+				end
+				at(-1)
+			end
+
+			def node_type
+				_old_get(0)
+			end
+
+			def text=( foo )
+				replace = at(4).kind_of?(String)? 1 : 0
+				self._old_put(4,replace, normalizefoo)
+			end
+
+			def root
+				context = self
+				context = context.at(1) while context.at(1)
+			end
+
+			def has_name?( name, namespace = '' )
+				at(3) == name and namespace() == namespace
+			end
+
+			def children
+				self
+			end
+
+			def parent
+				at(1)
+			end
+
+			def to_s
+
+			end
+
+			private
+
+			def namesplit
+				return if @name.defined?
+				at(2) =~ NAMESPLIT
+				@prefix = '' || $1
+				@name = $2
+			end
+
+			def namespace_of( node, prefix=nil )
+				if not prefix
+					name = at(2)
+					name =~ NAMESPLIT
+					prefix = $1
+				end
+				to_find = 'xmlns'
+				to_find = "xmlns:#{prefix}" if not prefix.nil?
+				ns = at(3)[ to_find ]
+				ns ? ns : namespace_of( @node[0], prefix )
+			end
+
+			def prefix_of( node, namespace=nil )
+				if not namespace
+					name = node.name
+					name =~ NAMESPLIT
+					$1
+				else
+					ns = at(3).find { |k,v| v == namespace }
+					ns ? ns : prefix_of( node.parent, namespace )
+				end
+			end
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/namespace.rb b/ruby_1_8_6/lib/rexml/namespace.rb
new file mode 100644
index 0000000000..3e8790580b
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/namespace.rb
@@ -0,0 +1,47 @@
+require 'rexml/xmltokens'
+
+module REXML
+	# Adds named attributes to an object.
+	module Namespace
+		# The name of the object, valid if set
+		attr_reader :name, :expanded_name
+		# The expanded name of the object, valid if name is set
+		attr_accessor :prefix
+		include XMLTokens
+		NAMESPLIT = /^(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})/u
+
+		# Sets the name and the expanded name
+		def name=( name )
+			@expanded_name = name
+			name =~ NAMESPLIT
+			if $1
+				@prefix = $1
+			else
+				@prefix = ""
+				@namespace = ""
+			end
+			@name = $2
+		end
+
+		# Compares names optionally WITH namespaces
+		def has_name?( other, ns=nil )
+			if ns
+				return (namespace() == ns and name() == other)
+			elsif other.include? ":"
+				return fully_expanded_name == other
+			else
+				return name == other
+			end
+		end
+
+		alias :local_name :name
+
+		# Fully expand the name, even if the prefix wasn't specified in the
+		# source file.
+		def fully_expanded_name
+			ns = prefix
+			return "#{ns}:#@name" if ns.size > 0 
+			return @name
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/node.rb b/ruby_1_8_6/lib/rexml/node.rb
new file mode 100644
index 0000000000..9780376829
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/node.rb
@@ -0,0 +1,75 @@
+require "rexml/parseexception"
+require "rexml/formatters/pretty"
+require "rexml/formatters/default"
+
+module REXML
+	# Represents a node in the tree.  Nodes are never encountered except as
+	# superclasses of other objects.  Nodes have siblings.
+	module Node
+		# @return the next sibling (nil if unset)
+		def next_sibling_node
+			return nil if @parent.nil?
+			@parent[ @parent.index(self) + 1 ]
+		end
+
+		# @return the previous sibling (nil if unset)
+		def previous_sibling_node
+			return nil if @parent.nil?
+			ind = @parent.index(self)
+			return nil if ind == 0
+			@parent[ ind - 1 ]
+		end
+
+    # indent::
+    #   *DEPRECATED* This parameter is now ignored.  See the formatters in the
+    #   REXML::Formatters package for changing the output style.
+		def to_s indent=nil
+      unless indent.nil?
+        Kernel.warn( "#{self.class.name}.to_s(indent) parameter is deprecated" )
+        f = REXML::Formatters::Pretty.new( indent )
+        f.write( self, rv, indent )
+      else
+        f = REXML::Formatters::Default.new
+        f.write( self, rv = "" )
+      end
+      return rv
+		end
+
+		def indent to, ind
+ 			if @parent and @parent.context and not @parent.context[:indentstyle].nil? then
+ 				indentstyle = @parent.context[:indentstyle]
+ 			else
+ 				indentstyle = '  '
+ 			end
+ 			to << indentstyle*ind unless ind<1
+		end
+
+		def parent?
+			false;
+		end
+
+
+		# Visit all subnodes of +self+ recursively
+		def each_recursive(&block) # :yields: node
+			self.elements.each {|node|
+				block.call(node)
+				node.each_recursive(&block)
+			}
+		end
+
+		# Find (and return) first subnode (recursively) for which the block 
+    # evaluates to true. Returns +nil+ if none was found.
+		def find_first_recursive(&block) # :yields: node
+      each_recursive {|node|
+        return node if block.call(node)
+      }
+      return nil
+    end
+
+    # Returns the position that +self+ holds in its parent's array, indexed
+    # from 1.
+    def index_in_parent
+      parent.index(self)+1
+    end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/output.rb b/ruby_1_8_6/lib/rexml/output.rb
new file mode 100644
index 0000000000..be4d23d42d
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/output.rb
@@ -0,0 +1,24 @@
+require 'rexml/encoding'
+
+module REXML
+	class Output
+		include Encoding
+    
+    attr_reader :encoding
+
+		def initialize real_IO, encd="iso-8859-1"
+			@output = real_IO
+			self.encoding = encd
+
+			@to_utf = encd == UTF_8 ? false : true
+		end
+
+		def <<( content )
+			@output << (@to_utf ? self.encode(content) : content)
+		end
+
+    def to_s
+      "Output[#{encoding}]"
+    end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/parent.rb b/ruby_1_8_6/lib/rexml/parent.rb
new file mode 100644
index 0000000000..a20aaaef6b
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/parent.rb
@@ -0,0 +1,166 @@
+require "rexml/child"
+
+module REXML
+  # A parent has children, and has methods for accessing them.  The Parent
+  # class is never encountered except as the superclass for some other
+  # object.
+  class Parent < Child
+    include Enumerable
+    
+    # Constructor
+    # @param parent if supplied, will be set as the parent of this object
+    def initialize parent=nil
+      super(parent)
+      @children = []
+    end
+    
+    def add( object )
+      #puts "PARENT GOTS #{size} CHILDREN"
+      object.parent = self
+      @children << object
+      #puts "PARENT NOW GOTS #{size} CHILDREN"
+      object
+    end
+    
+    alias :push :add
+    alias :<< :push
+    
+    def unshift( object )
+      object.parent = self
+      @children.unshift object
+    end
+    
+    def delete( object )
+      found = false
+      @children.delete_if {|c| c.equal?(object) and found = true }
+      object.parent = nil if found
+    end
+    
+    def each(&block)
+      @children.each(&block)
+    end
+    
+    def delete_if( &block )
+      @children.delete_if(&block)
+    end
+    
+    def delete_at( index )
+      @children.delete_at index
+    end
+    
+    def each_index( &block )
+      @children.each_index(&block)
+    end
+    
+    # Fetches a child at a given index
+    # @param index the Integer index of the child to fetch
+    def []( index )
+      @children[index]
+    end
+    
+    alias :each_child :each
+    
+    
+    
+    # Set an index entry.  See Array.[]=
+    # @param index the index of the element to set
+    # @param opt either the object to set, or an Integer length
+    # @param child if opt is an Integer, this is the child to set
+    # @return the parent (self)
+    def []=( *args )
+      args[-1].parent = self
+      @children[*args[0..-2]] = args[-1]
+    end
+    
+    # Inserts an child before another child
+    # @param child1 this is either an xpath or an Element.  If an Element,
+    # child2 will be inserted before child1 in the child list of the parent.
+    # If an xpath, child2 will be inserted before the first child to match
+    # the xpath.
+    # @param child2 the child to insert
+    # @return the parent (self)
+    def insert_before( child1, child2 )
+      if child1.kind_of? String
+        child1 = XPath.first( self, child1 )
+        child1.parent.insert_before child1, child2
+      else
+        ind = index(child1)
+        child2.parent.delete(child2) if child2.parent
+        @children[ind,0] = child2
+        child2.parent = self
+      end
+      self
+    end
+    
+    # Inserts an child after another child
+    # @param child1 this is either an xpath or an Element.  If an Element,
+    # child2 will be inserted after child1 in the child list of the parent.
+    # If an xpath, child2 will be inserted after the first child to match
+    # the xpath.
+    # @param child2 the child to insert
+    # @return the parent (self)
+    def insert_after( child1, child2 )
+      if child1.kind_of? String
+        child1 = XPath.first( self, child1 )
+        child1.parent.insert_after child1, child2
+      else
+        ind = index(child1)+1
+        child2.parent.delete(child2) if child2.parent
+        @children[ind,0] = child2
+        child2.parent = self
+      end
+      self
+    end
+    
+    def to_a
+      @children.dup
+    end
+    
+    # Fetches the index of a given child
+    # @param child the child to get the index of
+    # @return the index of the child, or nil if the object is not a child
+    # of this parent.
+    def index( child )
+      count = -1
+      @children.find { |i| count += 1 ; i.hash == child.hash }
+      count
+    end
+    
+    # @return the number of children of this parent
+    def size
+      @children.size
+    end
+    
+    alias :length :size
+    
+    # Replaces one child with another, making sure the nodelist is correct
+    # @param to_replace the child to replace (must be a Child)
+    # @param replacement the child to insert into the nodelist (must be a 
+    # Child)
+    def replace_child( to_replace, replacement )
+      @children.map! {|c| c.equal?( to_replace ) ? replacement : c }
+      to_replace.parent = nil
+      replacement.parent = self
+    end
+    
+    # Deeply clones this object.  This creates a complete duplicate of this
+    # Parent, including all descendants.
+    def deep_clone
+      cl = clone()
+      each do |child|
+        if child.kind_of? Parent
+          cl << child.deep_clone
+        else
+          cl << child.clone
+        end
+      end
+      cl
+    end
+    
+    alias :children :to_a
+    
+    def parent?
+      true
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/parseexception.rb b/ruby_1_8_6/lib/rexml/parseexception.rb
new file mode 100644
index 0000000000..feb7a7e638
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/parseexception.rb
@@ -0,0 +1,51 @@
+module REXML
+  class ParseException < RuntimeError
+    attr_accessor :source, :parser, :continued_exception
+
+    def initialize( message, source=nil, parser=nil, exception=nil )
+      super(message)
+      @source = source
+      @parser = parser
+      @continued_exception = exception
+    end
+
+    def to_s
+      # Quote the original exception, if there was one
+      if @continued_exception
+        err = @continued_exception.inspect
+        err << "\n"
+        err << @continued_exception.backtrace.join("\n")
+        err << "\n...\n"
+      else
+        err = ""
+      end
+
+      # Get the stack trace and error message
+      err << super
+
+      # Add contextual information
+      if @source
+        err << "\nLine: #{line}\n"
+        err << "Position: #{position}\n"
+        err << "Last 80 unconsumed characters:\n"
+        err << @source.buffer[0..80].gsub(/\n/, ' ')
+      end
+      
+      err
+    end
+
+    def position
+      @source.current_line[0] if @source and defined? @source.current_line and
+      @source.current_line
+    end
+
+    def line
+      @source.current_line[2] if @source and defined? @source.current_line and 
+      @source.current_line
+    end
+
+    def context
+      @source.current_line
+    end
+  end  
+end
diff --git a/ruby_1_8_6/lib/rexml/parsers/baseparser.rb b/ruby_1_8_6/lib/rexml/parsers/baseparser.rb
new file mode 100644
index 0000000000..3782d61b2c
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/parsers/baseparser.rb
@@ -0,0 +1,463 @@
+require 'rexml/parseexception'
+require 'rexml/source'
+
+module REXML
+  module Parsers
+    # = Using the Pull Parser
+    # <em>This API is experimental, and subject to change.</em>
+    #  parser = PullParser.new( "<a>text<b att='val'/>txet</a>" )
+    #  while parser.has_next?
+    #    res = parser.next
+    #    puts res[1]['att'] if res.start_tag? and res[0] == 'b'
+    #  end
+    # See the PullEvent class for information on the content of the results.
+    # The data is identical to the arguments passed for the various events to
+    # the StreamListener API.
+    #
+    # Notice that:
+    #  parser = PullParser.new( "<a>BAD DOCUMENT" )
+    #  while parser.has_next?
+    #    res = parser.next
+    #    raise res[1] if res.error?
+    #  end
+    #
+    # Nat Price gave me some good ideas for the API.
+    class BaseParser
+      NCNAME_STR= '[\w:][\-\w\d.]*'
+      NAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
+
+      NAMECHAR = '[\-\w\d\.:]'
+      NAME = "([\\w:]#{NAMECHAR}*)"
+      NMTOKEN = "(?:#{NAMECHAR})+"
+      NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*"
+      REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)"
+      REFERENCE_RE = /#{REFERENCE}/
+
+      DOCTYPE_START = /\A\s*<!DOCTYPE\s/um
+      DOCTYPE_PATTERN = /\s*<!DOCTYPE\s+(.*?)(\[|>)/um
+      ATTRIBUTE_PATTERN = /\s*(#{NAME_STR})\s*=\s*(["'])(.*?)\2/um
+      COMMENT_START = /\A<!--/u
+      COMMENT_PATTERN = /<!--(.*?)-->/um
+      CDATA_START = /\A<!\[CDATA\[/u
+      CDATA_END = /^\s*\]\s*>/um
+      CDATA_PATTERN = /<!\[CDATA\[(.*?)\]\]>/um
+      XMLDECL_START = /\A<\?xml\s/u;
+      XMLDECL_PATTERN = /<\?xml\s+(.*?)\?>/um
+      INSTRUCTION_START = /\A<\?/u
+      INSTRUCTION_PATTERN = /<\?(.*?)(\s+.*?)?\?>/um
+      TAG_MATCH = /^<((?>#{NAME_STR}))\s*((?>\s+#{NAME_STR}\s*=\s*(["']).*?\3)*)\s*(\/)?>/um
+      CLOSE_MATCH = /^\s*<\/(#{NAME_STR})\s*>/um
+
+      VERSION = /\bversion\s*=\s*["'](.*?)['"]/um
+      ENCODING = /\bencoding\s*=\s*["'](.*?)['"]/um
+      STANDALONE = /\bstandalone\s*=\s["'](.*?)['"]/um
+
+      ENTITY_START = /^\s*<!ENTITY/
+      IDENTITY = /^([!\*\w\-]+)(\s+#{NCNAME_STR})?(\s+["'](.*?)['"])?(\s+['"](.*?)["'])?/u
+      ELEMENTDECL_START = /^\s*<!ELEMENT/um
+      ELEMENTDECL_PATTERN = /^\s*(<!ELEMENT.*?)>/um
+      SYSTEMENTITY = /^\s*(%.*?;)\s*$/um
+      ENUMERATION = "\\(\\s*#{NMTOKEN}(?:\\s*\\|\\s*#{NMTOKEN})*\\s*\\)"
+      NOTATIONTYPE = "NOTATION\\s+\\(\\s*#{NAME}(?:\\s*\\|\\s*#{NAME})*\\s*\\)"
+      ENUMERATEDTYPE = "(?:(?:#{NOTATIONTYPE})|(?:#{ENUMERATION}))"
+      ATTTYPE = "(CDATA|ID|IDREF|IDREFS|ENTITY|ENTITIES|NMTOKEN|NMTOKENS|#{ENUMERATEDTYPE})"
+      ATTVALUE = "(?:\"((?:[^<&\"]|#{REFERENCE})*)\")|(?:'((?:[^<&']|#{REFERENCE})*)')"
+      DEFAULTDECL = "(#REQUIRED|#IMPLIED|(?:(#FIXED\\s+)?#{ATTVALUE}))"
+      ATTDEF = "\\s+#{NAME}\\s+#{ATTTYPE}\\s+#{DEFAULTDECL}"
+      ATTDEF_RE = /#{ATTDEF}/
+      ATTLISTDECL_START = /^\s*<!ATTLIST/um
+      ATTLISTDECL_PATTERN = /^\s*<!ATTLIST\s+#{NAME}(?:#{ATTDEF})*\s*>/um
+      NOTATIONDECL_START = /^\s*<!NOTATION/um
+      PUBLIC = /^\s*<!NOTATION\s+(\w[\-\w]*)\s+(PUBLIC)\s+(["'])(.*?)\3(?:\s+(["'])(.*?)\5)?\s*>/um
+      SYSTEM = /^\s*<!NOTATION\s+(\w[\-\w]*)\s+(SYSTEM)\s+(["'])(.*?)\3\s*>/um
+
+      TEXT_PATTERN = /\A([^<]*)/um
+
+      # Entity constants
+      PUBIDCHAR = "\x20\x0D\x0Aa-zA-Z0-9\\-()+,./:=?;!*@$_%#"
+      SYSTEMLITERAL = %Q{((?:"[^"]*")|(?:'[^']*'))}
+      PUBIDLITERAL = %Q{("[#{PUBIDCHAR}']*"|'[#{PUBIDCHAR}]*')}
+      EXTERNALID = "(?:(?:(SYSTEM)\\s+#{SYSTEMLITERAL})|(?:(PUBLIC)\\s+#{PUBIDLITERAL}\\s+#{SYSTEMLITERAL}))"
+      NDATADECL = "\\s+NDATA\\s+#{NAME}"
+      PEREFERENCE = "%#{NAME};"
+      ENTITYVALUE = %Q{((?:"(?:[^%&"]|#{PEREFERENCE}|#{REFERENCE})*")|(?:'([^%&']|#{PEREFERENCE}|#{REFERENCE})*'))}
+      PEDEF = "(?:#{ENTITYVALUE}|#{EXTERNALID})"
+      ENTITYDEF = "(?:#{ENTITYVALUE}|(?:#{EXTERNALID}(#{NDATADECL})?))"
+      PEDECL = "<!ENTITY\\s+(%)\\s+#{NAME}\\s+#{PEDEF}\\s*>"
+      GEDECL = "<!ENTITY\\s+#{NAME}\\s+#{ENTITYDEF}\\s*>"
+      ENTITYDECL = /\s*(?:#{GEDECL})|(?:#{PEDECL})/um
+
+      EREFERENCE = /&(?!#{NAME};)/
+
+      DEFAULT_ENTITIES = { 
+        'gt' => [/&gt;/, '&gt;', '>', />/], 
+        'lt' => [/&lt;/, '&lt;', '<', /</], 
+        'quot' => [/&quot;/, '&quot;', '"', /"/], 
+        "apos" => [/&apos;/, "&apos;", "'", /'/] 
+      }
+
+
+      ######################################################################
+      # These are patterns to identify common markup errors, to make the
+      # error messages more informative.
+      ######################################################################
+      MISSING_ATTRIBUTE_QUOTES = /^<#{NAME_STR}\s+#{NAME_STR}\s*=\s*[^"']/um
+
+      def initialize( source )
+        self.stream = source
+      end
+
+      def add_listener( listener )
+        if !defined?(@listeners) or !@listeners
+          @listeners = []
+          instance_eval <<-EOL
+            alias :_old_pull :pull
+            def pull
+              event = _old_pull
+              @listeners.each do |listener|
+                listener.receive event
+              end
+              event
+            end
+          EOL
+        end
+        @listeners << listener
+      end
+
+      attr_reader :source
+
+      def stream=( source )
+        @source = SourceFactory.create_from( source )
+        @closed = nil
+        @document_status = nil
+        @tags = []
+        @stack = []
+        @entities = []
+      end
+
+      def position
+        if @source.respond_to? :position
+          @source.position
+        else
+          # FIXME
+          0
+        end
+      end
+
+      # Returns true if there are no more events
+      def empty?
+        return (@source.empty? and @stack.empty?)
+      end
+
+      # Returns true if there are more events.  Synonymous with !empty?
+      def has_next?
+        return !(@source.empty? and @stack.empty?)
+      end
+
+      # Push an event back on the head of the stream.  This method
+      # has (theoretically) infinite depth.
+      def unshift token
+        @stack.unshift(token)
+      end
+
+      # Peek at the +depth+ event in the stack.  The first element on the stack
+      # is at depth 0.  If +depth+ is -1, will parse to the end of the input
+      # stream and return the last event, which is always :end_document.
+      # Be aware that this causes the stream to be parsed up to the +depth+ 
+      # event, so you can effectively pre-parse the entire document (pull the 
+      # entire thing into memory) using this method.  
+      def peek depth=0
+        raise %Q[Illegal argument "#{depth}"] if depth < -1
+        temp = []
+        if depth == -1
+          temp.push(pull()) until empty?
+        else
+          while @stack.size+temp.size < depth+1
+            temp.push(pull())
+          end
+        end
+        @stack += temp if temp.size > 0
+        @stack[depth]
+      end
+
+      # Returns the next event.  This is a +PullEvent+ object.
+      def pull
+        if @closed
+          x, @closed = @closed, nil
+          return [ :end_element, x ]
+        end
+        return [ :end_document ] if empty?
+        return @stack.shift if @stack.size > 0
+        @source.read if @source.buffer.size<2
+        #STDERR.puts "BUFFER = #{@source.buffer.inspect}"
+        if @document_status == nil
+          #@source.consume( /^\s*/um )
+          word = @source.match( /^((?:\s+)|(?:<[^>]*>))/um )
+          word = word[1] unless word.nil?
+          #STDERR.puts "WORD = #{word.inspect}"
+          case word
+          when COMMENT_START
+            return [ :comment, @source.match( COMMENT_PATTERN, true )[1] ]
+          when XMLDECL_START
+            #STDERR.puts "XMLDECL"
+            results = @source.match( XMLDECL_PATTERN, true )[1]
+            version = VERSION.match( results )
+            version = version[1] unless version.nil?
+            encoding = ENCODING.match(results)
+            encoding = encoding[1] unless encoding.nil?
+            @source.encoding = encoding
+            standalone = STANDALONE.match(results)
+            standalone = standalone[1] unless standalone.nil?
+            return [ :xmldecl, version, encoding, standalone ]
+          when INSTRUCTION_START
+            return [ :processing_instruction, *@source.match(INSTRUCTION_PATTERN, true)[1,2] ]
+          when DOCTYPE_START
+            md = @source.match( DOCTYPE_PATTERN, true )
+            identity = md[1]
+            close = md[2]
+            identity =~ IDENTITY
+            name = $1
+            raise REXML::ParseException.new("DOCTYPE is missing a name") if name.nil?
+            pub_sys = $2.nil? ? nil : $2.strip
+            long_name = $4.nil? ? nil : $4.strip
+            uri = $6.nil? ? nil : $6.strip
+            args = [ :start_doctype, name, pub_sys, long_name, uri ]
+            if close == ">"
+              @document_status = :after_doctype
+              @source.read if @source.buffer.size<2
+              md = @source.match(/^\s*/um, true)
+              @stack << [ :end_doctype ]
+            else
+              @document_status = :in_doctype
+            end
+            return args
+          when /^\s+/
+          else
+            @document_status = :after_doctype
+            @source.read if @source.buffer.size<2
+            md = @source.match(/\s*/um, true)
+          end
+        end
+        if @document_status == :in_doctype
+          md = @source.match(/\s*(.*?>)/um)
+          case md[1]
+          when SYSTEMENTITY 
+            match = @source.match( SYSTEMENTITY, true )[1]
+            return [ :externalentity, match ]
+
+          when ELEMENTDECL_START
+            return [ :elementdecl, @source.match( ELEMENTDECL_PATTERN, true )[1] ]
+
+          when ENTITY_START
+            match = @source.match( ENTITYDECL, true ).to_a.compact
+            match[0] = :entitydecl
+            ref = false
+            if match[1] == '%'
+              ref = true
+              match.delete_at 1
+            end
+            # Now we have to sort out what kind of entity reference this is
+            if match[2] == 'SYSTEM'
+              # External reference
+              match[3] = match[3][1..-2] # PUBID
+              match.delete_at(4) if match.size > 4 # Chop out NDATA decl
+              # match is [ :entity, name, SYSTEM, pubid(, ndata)? ]
+            elsif match[2] == 'PUBLIC'
+              # External reference
+              match[3] = match[3][1..-2] # PUBID
+              match[4] = match[4][1..-2] # HREF
+              # match is [ :entity, name, PUBLIC, pubid, href ]
+            else
+              match[2] = match[2][1..-2]
+              match.pop if match.size == 4
+              # match is [ :entity, name, value ]
+            end
+            match << '%' if ref
+            return match
+          when ATTLISTDECL_START
+            md = @source.match( ATTLISTDECL_PATTERN, true )
+            raise REXML::ParseException.new( "Bad ATTLIST declaration!", @source ) if md.nil?
+            element = md[1]
+            contents = md[0]
+
+            pairs = {}
+            values = md[0].scan( ATTDEF_RE )
+            values.each do |attdef|
+              unless attdef[3] == "#IMPLIED"
+                attdef.compact!
+                val = attdef[3]
+                val = attdef[4] if val == "#FIXED "
+                pairs[attdef[0]] = val
+              end
+            end
+            return [ :attlistdecl, element, pairs, contents ]
+          when NOTATIONDECL_START
+            md = nil
+            if @source.match( PUBLIC )
+              md = @source.match( PUBLIC, true )
+              vals = [md[1],md[2],md[4],md[6]]
+            elsif @source.match( SYSTEM )
+              md = @source.match( SYSTEM, true )
+              vals = [md[1],md[2],nil,md[4]]
+            else
+              raise REXML::ParseException.new( "error parsing notation: no matching pattern", @source )
+            end
+            return [ :notationdecl, *vals ]
+          when CDATA_END
+            @document_status = :after_doctype
+            @source.match( CDATA_END, true )
+            return [ :end_doctype ]
+          end
+        end
+        begin
+          if @source.buffer[0] == ?<
+            if @source.buffer[1] == ?/
+              last_tag = @tags.pop
+              #md = @source.match_to_consume( '>', CLOSE_MATCH)
+              md = @source.match( CLOSE_MATCH, true )
+              raise REXML::ParseException.new( "Missing end tag for "+
+                "'#{last_tag}' (got \"#{md[1]}\")", 
+                @source) unless last_tag == md[1]
+              return [ :end_element, last_tag ]
+            elsif @source.buffer[1] == ?!
+              md = @source.match(/\A(\s*[^>]*>)/um)
+              #STDERR.puts "SOURCE BUFFER = #{source.buffer}, #{source.buffer.size}"
+              raise REXML::ParseException.new("Malformed node", @source) unless md
+              if md[0][2] == ?-
+                md = @source.match( COMMENT_PATTERN, true )
+                return [ :comment, md[1] ] if md
+              else
+                md = @source.match( CDATA_PATTERN, true )
+                return [ :cdata, md[1] ] if md
+              end
+              raise REXML::ParseException.new( "Declarations can only occur "+
+                "in the doctype declaration.", @source)
+            elsif @source.buffer[1] == ??
+              md = @source.match( INSTRUCTION_PATTERN, true )
+              return [ :processing_instruction, md[1], md[2] ] if md
+              raise REXML::ParseException.new( "Bad instruction declaration",
+                @source)
+            else
+              # Get the next tag
+              md = @source.match(TAG_MATCH, true)
+              unless md
+                # Check for missing attribute quotes
+                raise REXML::ParseException.new("missing attribute quote", @source) if @source.match(MISSING_ATTRIBUTE_QUOTES )
+                raise REXML::ParseException.new("malformed XML: missing tag start", @source) 
+              end
+              attrs = []
+              if md[2].size > 0
+                attrs = md[2].scan( ATTRIBUTE_PATTERN )
+                raise REXML::ParseException.new( "error parsing attributes: [#{attrs.join ', '}], excess = \"#$'\"", @source) if $' and $'.strip.size > 0
+              end
+        
+              if md[4]
+                @closed = md[1]
+              else
+                @tags.push( md[1] )
+              end
+              attributes = {}
+              attrs.each { |a,b,c| attributes[a] = c }
+              return [ :start_element, md[1], attributes ]
+            end
+          else
+            md = @source.match( TEXT_PATTERN, true )
+            if md[0].length == 0
+              @source.match( /(\s+)/, true )
+            end
+            #STDERR.puts "GOT #{md[1].inspect}" unless md[0].length == 0
+            #return [ :text, "" ] if md[0].length == 0
+            # unnormalized = Text::unnormalize( md[1], self )
+            # return PullEvent.new( :text, md[1], unnormalized )
+            return [ :text, md[1] ]
+          end
+        rescue REXML::ParseException
+          raise
+        rescue Exception, NameError => error
+          raise REXML::ParseException.new( "Exception parsing",
+            @source, self, (error ? error : $!) )
+        end
+        return [ :dummy ]
+      end
+
+      def entity( reference, entities )
+        value = nil
+        value = entities[ reference ] if entities
+        if not value
+          value = DEFAULT_ENTITIES[ reference ]
+          value = value[2] if value
+        end
+        unnormalize( value, entities ) if value
+      end
+
+      # Escapes all possible entities
+      def normalize( input, entities=nil, entity_filter=nil )
+        copy = input.clone
+        # Doing it like this rather than in a loop improves the speed
+        copy.gsub!( EREFERENCE, '&amp;' )
+        entities.each do |key, value|
+          copy.gsub!( value, "&#{key};" ) unless entity_filter and 
+                                      entity_filter.include?(entity)
+        end if entities
+        copy.gsub!( EREFERENCE, '&amp;' )
+        DEFAULT_ENTITIES.each do |key, value|
+          copy.gsub!( value[3], value[1] )
+        end
+        copy
+      end
+
+      # Unescapes all possible entities
+      def unnormalize( string, entities=nil, filter=nil )
+        rv = string.clone
+        rv.gsub!( /\r\n?/, "\n" )
+        matches = rv.scan( REFERENCE_RE )
+        return rv if matches.size == 0
+        rv.gsub!( /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/ ) {|m|
+          m=$1
+          m = "0#{m}" if m[0] == ?x
+          [Integer(m)].pack('U*')
+        }
+        matches.collect!{|x|x[0]}.compact!
+        if matches.size > 0
+          matches.each do |entity_reference|
+            unless filter and filter.include?(entity_reference)
+              entity_value = entity( entity_reference, entities )
+              if entity_value
+                re = /&#{entity_reference};/
+                rv.gsub!( re, entity_value )
+              end
+            end
+          end
+          matches.each do |entity_reference|
+            unless filter and filter.include?(entity_reference)
+              er = DEFAULT_ENTITIES[entity_reference]
+              rv.gsub!( er[0], er[2] ) if er
+            end
+          end
+          rv.gsub!( /&amp;/, '&' )
+        end
+        rv
+      end
+    end
+  end
+end
+
+=begin
+  case event[0]
+  when :start_element
+  when :text
+  when :end_element
+  when :processing_instruction
+  when :cdata
+  when :comment
+  when :xmldecl
+  when :start_doctype
+  when :end_doctype
+  when :externalentity
+  when :elementdecl
+  when :entity
+  when :attlistdecl
+  when :notationdecl
+  when :end_doctype
+  end
+=end
diff --git a/ruby_1_8_6/lib/rexml/parsers/lightparser.rb b/ruby_1_8_6/lib/rexml/parsers/lightparser.rb
new file mode 100644
index 0000000000..0f35034993
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/parsers/lightparser.rb
@@ -0,0 +1,60 @@
+require 'rexml/parsers/streamparser'
+require 'rexml/parsers/baseparser'
+require 'rexml/light/node'
+
+module REXML
+	module Parsers
+		class LightParser
+			def initialize stream
+				@stream = stream
+				@parser = REXML::Parsers::BaseParser.new( stream )
+			end
+
+      def add_listener( listener )
+        @parser.add_listener( listener )
+      end
+
+      def rewind
+        @stream.rewind
+        @parser.stream = @stream
+      end
+
+			def parse
+				root = context = [ :document ]
+				while true
+					event = @parser.pull
+					case event[0]
+					when :end_document
+						break
+					when :end_doctype
+						context = context[1]
+					when :start_element, :start_doctype
+						new_node = event
+						context << new_node
+						new_node[1,0] = [context]
+						context = new_node
+					when :end_element, :end_doctype
+						context = context[1]
+					else
+						new_node = event
+						context << new_node
+						new_node[1,0] = [context]
+					end
+				end
+				root
+			end
+		end
+
+		# An element is an array.  The array contains:
+		#  0			The parent element
+		#  1			The tag name
+		#  2			A hash of attributes
+		#  3..-1	The child elements
+		# An element is an array of size > 3
+		# Text is a String
+		# PIs are [ :processing_instruction, target, data ]
+		# Comments are [ :comment, data ]
+		# DocTypes are DocType structs
+		# The root is an array with XMLDecls, Text, DocType, Array, Text
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/parsers/pullparser.rb b/ruby_1_8_6/lib/rexml/parsers/pullparser.rb
new file mode 100644
index 0000000000..36dc7160c3
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/parsers/pullparser.rb
@@ -0,0 +1,196 @@
+require 'forwardable'
+
+require 'rexml/parseexception'
+require 'rexml/parsers/baseparser'
+require 'rexml/xmltokens'
+
+module REXML
+  module Parsers
+    # = Using the Pull Parser
+    # <em>This API is experimental, and subject to change.</em>
+    #  parser = PullParser.new( "<a>text<b att='val'/>txet</a>" )
+    #  while parser.has_next?
+    #    res = parser.next
+    #    puts res[1]['att'] if res.start_tag? and res[0] == 'b'
+    #  end
+    # See the PullEvent class for information on the content of the results.
+    # The data is identical to the arguments passed for the various events to
+    # the StreamListener API.
+    #
+    # Notice that:
+    #  parser = PullParser.new( "<a>BAD DOCUMENT" )
+    #  while parser.has_next?
+    #    res = parser.next
+    #    raise res[1] if res.error?
+    #  end
+    #
+    # Nat Price gave me some good ideas for the API.
+    class PullParser
+      include XMLTokens
+      extend Forwardable
+
+      def_delegators( :@parser, :has_next? )
+      def_delegators( :@parser, :entity )
+      def_delegators( :@parser, :empty? )
+      def_delegators( :@parser, :source )
+
+      def initialize stream
+        @entities = {}
+        @listeners = nil
+        @parser = BaseParser.new( stream )
+        @my_stack = []
+      end
+
+      def add_listener( listener )
+        @listeners = [] unless @listeners
+        @listeners << listener
+      end
+
+      def each
+        while has_next?
+          yield self.pull
+        end
+      end
+
+      def peek depth=0
+        if @my_stack.length <= depth
+          (depth - @my_stack.length + 1).times {
+            e = PullEvent.new(@parser.pull)
+            @my_stack.push(e)
+          }
+        end
+        @my_stack[depth]
+      end
+
+      def pull
+        return @my_stack.shift if @my_stack.length > 0
+
+        event = @parser.pull
+        case event[0]
+        when :entitydecl
+          @entities[ event[1] ] = 
+            event[2] unless event[2] =~ /PUBLIC|SYSTEM/
+        when :text
+          unnormalized = @parser.unnormalize( event[1], @entities )
+          event << unnormalized
+        end
+        PullEvent.new( event )
+      end
+
+      def unshift token
+        @my_stack.unshift token
+      end
+    end
+
+    # A parsing event.  The contents of the event are accessed as an +Array?,
+    # and the type is given either by the ...? methods, or by accessing the
+    # +type+ accessor.  The contents of this object vary from event to event,
+    # but are identical to the arguments passed to +StreamListener+s for each
+    # event.
+    class PullEvent
+      # The type of this event.  Will be one of :tag_start, :tag_end, :text,
+      # :processing_instruction, :comment, :doctype, :attlistdecl, :entitydecl,
+      # :notationdecl, :entity, :cdata, :xmldecl, or :error.
+      def initialize(arg)
+        @contents = arg
+      end
+
+      def []( start, endd=nil)
+        if start.kind_of? Range
+          @contents.slice( start.begin+1 .. start.end )
+        elsif start.kind_of? Numeric
+          if endd.nil?
+            @contents.slice( start+1 )
+          else
+            @contents.slice( start+1, endd )
+          end
+        else
+          raise "Illegal argument #{start.inspect} (#{start.class})"
+        end
+      end
+
+      def event_type
+        @contents[0]
+      end
+
+      # Content: [ String tag_name, Hash attributes ]
+      def start_element?
+        @contents[0] == :start_element
+      end
+
+      # Content: [ String tag_name ]
+      def end_element?
+        @contents[0] == :end_element
+      end
+
+      # Content: [ String raw_text, String unnormalized_text ]
+      def text?
+        @contents[0] == :text
+      end
+
+      # Content: [ String text ]
+      def instruction?
+        @contents[0] == :processing_instruction
+      end
+
+      # Content: [ String text ]
+      def comment?
+        @contents[0] == :comment
+      end
+
+      # Content: [ String name, String pub_sys, String long_name, String uri ]
+      def doctype?
+        @contents[0] == :start_doctype
+      end
+
+      # Content: [ String text ]
+      def attlistdecl?
+        @contents[0] == :attlistdecl
+      end
+
+      # Content: [ String text ]
+      def elementdecl?
+        @contents[0] == :elementdecl
+      end
+
+      # Due to the wonders of DTDs, an entity declaration can be just about
+      # anything.  There's no way to normalize it; you'll have to interpret the
+      # content yourself.  However, the following is true:
+      #
+      # * If the entity declaration is an internal entity:
+      #   [ String name, String value ]
+      # Content: [ String text ]
+      def entitydecl?
+        @contents[0] == :entitydecl
+      end
+
+      # Content: [ String text ]
+      def notationdecl?
+        @contents[0] == :notationdecl
+      end
+
+      # Content: [ String text ]
+      def entity?
+        @contents[0] == :entity
+      end
+
+      # Content: [ String text ]
+      def cdata?
+        @contents[0] == :cdata
+      end
+
+      # Content: [ String version, String encoding, String standalone ]
+      def xmldecl?
+        @contents[0] == :xmldecl
+      end
+
+      def error?
+        @contents[0] == :error
+      end
+
+      def inspect
+        @contents[0].to_s + ": " + @contents[1..-1].inspect
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/parsers/sax2parser.rb b/ruby_1_8_6/lib/rexml/parsers/sax2parser.rb
new file mode 100644
index 0000000000..e402eb7747
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/parsers/sax2parser.rb
@@ -0,0 +1,238 @@
+require 'rexml/parsers/baseparser'
+require 'rexml/parseexception'
+require 'rexml/namespace'
+require 'rexml/text'
+
+module REXML
+	module Parsers
+    # SAX2Parser
+		class SAX2Parser
+			def initialize source
+				@parser = BaseParser.new(source)
+				@listeners = []
+				@procs = []
+				@namespace_stack = []
+				@has_listeners = false
+				@tag_stack = []
+        @entities = {}
+			end
+
+      def source
+        @parser.source
+      end
+			
+      def add_listener( listener )
+        @parser.add_listener( listener )
+      end
+
+			# Listen arguments:
+			#
+			# Symbol, Array, Block
+			# 	Listen to Symbol events on Array elements
+			# Symbol, Block
+			#   Listen to Symbol events
+			# Array, Listener
+			# 	Listen to all events on Array elements
+			# Array, Block
+			# 	Listen to :start_element events on Array elements
+			# Listener
+			# 	Listen to All events
+			#
+			# Symbol can be one of: :start_element, :end_element,
+			# :start_prefix_mapping, :end_prefix_mapping, :characters,
+			# :processing_instruction, :doctype, :attlistdecl, :elementdecl,
+			# :entitydecl, :notationdecl, :cdata, :xmldecl, :comment
+      #
+      # There is an additional symbol that can be listened for: :progress.
+      # This will be called for every event generated, passing in the current 
+      # stream position.
+			#
+			# Array contains regular expressions or strings which will be matched
+			# against fully qualified element names.
+			#
+			# Listener must implement the methods in SAX2Listener
+			#
+			# Block will be passed the same arguments as a SAX2Listener method would
+			# be, where the method name is the same as the matched Symbol.
+			# See the SAX2Listener for more information.
+			def listen( *args, &blok )
+				if args[0].kind_of? Symbol
+					if args.size == 2
+						args[1].each { |match| @procs << [args[0], match, blok] }
+					else
+						add( [args[0], nil, blok] )
+					end
+				elsif args[0].kind_of? Array
+					if args.size == 2
+						args[0].each { |match| add( [nil, match, args[1]] ) }
+					else
+						args[0].each { |match| add( [ :start_element, match, blok ] ) }
+					end
+				else
+					add([nil, nil, args[0]])
+				end
+			end
+			
+			def deafen( listener=nil, &blok )
+				if listener
+					@listeners.delete_if {|item| item[-1] == listener }
+					@has_listeners = false if @listeners.size == 0
+				else
+					@procs.delete_if {|item| item[-1] == blok }
+				end
+			end
+			
+			def parse
+				@procs.each { |sym,match,block| block.call if sym == :start_document }
+				@listeners.each { |sym,match,block| 
+					block.start_document if sym == :start_document or sym.nil?
+				}
+				root = context = []
+				while true
+					event = @parser.pull
+					case event[0]
+					when :end_document
+						handle( :end_document )
+						break
+          when :start_doctype
+            handle( :doctype, *event[1..-1])
+					when :end_doctype
+						context = context[1]
+					when :start_element
+						@tag_stack.push(event[1])
+						# find the observers for namespaces
+						procs = get_procs( :start_prefix_mapping, event[1] )
+						listeners = get_listeners( :start_prefix_mapping, event[1] )
+						if procs or listeners
+							# break out the namespace declarations
+							# The attributes live in event[2]
+							event[2].each {|n, v| event[2][n] = @parser.normalize(v)}
+							nsdecl = event[2].find_all { |n, value| n =~ /^xmlns(:|$)/ }
+							nsdecl.collect! { |n, value| [ n[6..-1], value ] }
+							@namespace_stack.push({})
+							nsdecl.each do |n,v|
+								@namespace_stack[-1][n] = v
+								# notify observers of namespaces
+								procs.each { |ob| ob.call( n, v ) } if procs
+								listeners.each { |ob| ob.start_prefix_mapping(n, v) } if listeners
+							end
+						end
+						event[1] =~ Namespace::NAMESPLIT
+						prefix = $1
+						local = $2
+						uri = get_namespace(prefix)
+						# find the observers for start_element
+						procs = get_procs( :start_element, event[1] )
+						listeners = get_listeners( :start_element, event[1] )
+						# notify observers
+						procs.each { |ob| ob.call( uri, local, event[1], event[2] ) } if procs
+						listeners.each { |ob| 
+							ob.start_element( uri, local, event[1], event[2] ) 
+						} if listeners
+					when :end_element
+						@tag_stack.pop
+						event[1] =~ Namespace::NAMESPLIT
+						prefix = $1
+						local = $2
+						uri = get_namespace(prefix)
+						# find the observers for start_element
+						procs = get_procs( :end_element, event[1] )
+						listeners = get_listeners( :end_element, event[1] )
+						# notify observers
+						procs.each { |ob| ob.call( uri, local, event[1] ) } if procs
+						listeners.each { |ob| 
+							ob.end_element( uri, local, event[1] ) 
+						} if listeners
+
+						namespace_mapping = @namespace_stack.pop
+						# find the observers for namespaces
+						procs = get_procs( :end_prefix_mapping, event[1] )
+						listeners = get_listeners( :end_prefix_mapping, event[1] )
+						if procs or listeners
+							namespace_mapping.each do |prefix, uri|
+								# notify observers of namespaces
+								procs.each { |ob| ob.call( prefix ) } if procs
+								listeners.each { |ob| ob.end_prefix_mapping(prefix) } if listeners
+							end
+						end
+					when :text
+            #normalized = @parser.normalize( event[1] )
+            #handle( :characters, normalized )
+            copy = event[1].clone
+            @entities.each { |key, value| copy = copy.gsub("&#{key};", value) }
+            copy.gsub!( Text::NUMERICENTITY ) {|m|
+              m=$1
+              m = "0#{m}" if m[0] == ?x
+              [Integer(m)].pack('U*')
+            }
+            handle( :characters, copy )
+          when :entitydecl
+            @entities[ event[1] ] = event[2] if event.size == 3
+						handle( *event )
+					when :processing_instruction, :comment, :attlistdecl, 
+						:elementdecl, :cdata, :notationdecl, :xmldecl
+						handle( *event )
+					end
+          handle( :progress, @parser.position )
+				end
+			end
+
+			private
+			def handle( symbol, *arguments )
+				tag = @tag_stack[-1]
+				procs = get_procs( symbol, tag )
+				listeners = get_listeners( symbol, tag )
+				# notify observers
+				procs.each { |ob| ob.call( *arguments ) } if procs
+				listeners.each { |l| 
+					l.send( symbol.to_s, *arguments ) 
+				} if listeners
+			end
+
+			# The following methods are duplicates, but it is faster than using
+			# a helper
+			def get_procs( symbol, name )
+				return nil if @procs.size == 0
+				@procs.find_all do |sym, match, block|
+          #puts sym.inspect+"=="+symbol.inspect+ "\t"+match.inspect+"=="+name.inspect+ "\t"+( (sym.nil? or symbol == sym) and ((name.nil? and match.nil?) or match.nil? or ( (name == match) or (match.kind_of? Regexp and name =~ match)))).to_s
+					(
+						(sym.nil? or symbol == sym) and 
+						((name.nil? and match.nil?) or match.nil? or (
+							(name == match) or
+							(match.kind_of? Regexp and name =~ match)
+							)
+						)
+					)
+				end.collect{|x| x[-1]}
+			end
+			def get_listeners( symbol, name )
+				return nil if @listeners.size == 0
+				@listeners.find_all do |sym, match, block|
+					(
+						(sym.nil? or symbol == sym) and 
+						((name.nil? and match.nil?) or match.nil? or (
+							(name == match) or
+							(match.kind_of? Regexp and name =~ match)
+							)
+						)
+					)
+				end.collect{|x| x[-1]}
+			end
+
+			def add( pair )
+				if pair[-1].respond_to? :call
+					@procs << pair unless @procs.include? pair
+				else
+					@listeners << pair unless @listeners.include? pair
+					@has_listeners = true
+				end
+			end
+
+			def get_namespace( prefix ) 
+        uris = (@namespace_stack.find_all { |ns| not ns[prefix].nil? }) ||
+					(@namespace_stack.find { |ns| not ns[nil].nil? })
+				uris[-1][prefix] unless uris.nil? or 0 == uris.size
+			end
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/parsers/streamparser.rb b/ruby_1_8_6/lib/rexml/parsers/streamparser.rb
new file mode 100644
index 0000000000..256d0f611c
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/parsers/streamparser.rb
@@ -0,0 +1,46 @@
+module REXML
+  module Parsers
+    class StreamParser
+      def initialize source, listener
+        @listener = listener
+        @parser = BaseParser.new( source )
+      end
+      
+      def add_listener( listener )
+        @parser.add_listener( listener )
+      end
+      
+      def parse
+        # entity string
+        while true
+          event = @parser.pull
+          case event[0]
+          when :end_document
+            return
+          when :start_element
+            attrs = event[2].each do |n, v|
+              event[2][n] = @parser.unnormalize( v )
+            end
+            @listener.tag_start( event[1], attrs )
+          when :end_element
+            @listener.tag_end( event[1] )
+          when :text
+            normalized = @parser.unnormalize( event[1] )
+            @listener.text( normalized )
+          when :processing_instruction
+            @listener.instruction( *event[1,2] )
+          when :start_doctype
+            @listener.doctype( *event[1..-1] )
+          when :end_doctype
+            # FIXME: remove this condition for milestone:3.2
+            @listener.doctype_end if @listener.respond_to? :doctype_end
+          when :comment, :attlistdecl, :cdata, :xmldecl, :elementdecl
+            @listener.send( event[0].to_s, *event[1..-1] )
+          when :entitydecl, :notationdecl
+            @listener.send( event[0].to_s, event[1..-1] )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/parsers/treeparser.rb b/ruby_1_8_6/lib/rexml/parsers/treeparser.rb
new file mode 100644
index 0000000000..a53fa41925
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/parsers/treeparser.rb
@@ -0,0 +1,95 @@
+require 'rexml/validation/validationexception'
+
+module REXML
+  module Parsers
+    class TreeParser
+      def initialize( source, build_context = Document.new )
+        @build_context = build_context
+        @parser = Parsers::BaseParser.new( source )
+      end
+
+      def add_listener( listener )
+        @parser.add_listener( listener )
+      end
+
+      def parse
+        tag_stack = []
+        in_doctype = false
+        entities = nil
+        begin
+          while true
+            event = @parser.pull
+            #STDERR.puts "TREEPARSER GOT #{event.inspect}"
+            case event[0]
+            when :end_document
+              unless tag_stack.empty?
+                #raise ParseException.new("No close tag for #{tag_stack.inspect}")
+                raise ParseException.new("No close tag for #{@build_context.xpath}")
+              end
+              return
+            when :start_element
+              tag_stack.push(event[1])
+              # find the observers for namespaces
+              @build_context = @build_context.add_element( event[1], event[2] )
+            when :end_element
+              tag_stack.pop
+              @build_context = @build_context.parent
+            when :text
+              if not in_doctype
+                if @build_context[-1].instance_of? Text
+                  @build_context[-1] << event[1]
+                else
+                  @build_context.add( 
+                    Text.new(event[1], @build_context.whitespace, nil, true) 
+                  ) unless (
+                    @build_context.ignore_whitespace_nodes and
+                    event[1].strip.size==0
+                  )
+                end
+              end
+            when :comment
+              c = Comment.new( event[1] )
+              @build_context.add( c )
+            when :cdata
+              c = CData.new( event[1] )
+              @build_context.add( c )
+            when :processing_instruction
+              @build_context.add( Instruction.new( event[1], event[2] ) )
+            when :end_doctype
+              in_doctype = false
+              entities.each { |k,v| entities[k] = @build_context.entities[k].value }
+              @build_context = @build_context.parent
+            when :start_doctype
+              doctype = DocType.new( event[1..-1], @build_context )
+              @build_context = doctype
+              entities = {}
+              in_doctype = true
+            when :attlistdecl
+              n = AttlistDecl.new( event[1..-1] )
+              @build_context.add( n )
+            when :externalentity
+              n = ExternalEntity.new( event[1] )
+              @build_context.add( n )
+            when :elementdecl
+              n = ElementDecl.new( event[1] )
+              @build_context.add(n)
+            when :entitydecl
+              entities[ event[1] ] = event[2] unless event[2] =~ /PUBLIC|SYSTEM/
+              @build_context.add(Entity.new(event))
+            when :notationdecl
+              n = NotationDecl.new( *event[1..-1] )
+              @build_context.add( n )
+            when :xmldecl
+              x = XMLDecl.new( event[1], event[2], event[3] )
+              @build_context.add( x )
+            end
+          end
+        rescue REXML::Validation::ValidationException
+          raise
+        rescue
+          raise ParseException.new( $!.message, @parser.source, @parser, $! )
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/parsers/ultralightparser.rb b/ruby_1_8_6/lib/rexml/parsers/ultralightparser.rb
new file mode 100644
index 0000000000..adc4af18e2
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/parsers/ultralightparser.rb
@@ -0,0 +1,56 @@
+require 'rexml/parsers/streamparser'
+require 'rexml/parsers/baseparser'
+
+module REXML
+	module Parsers
+		class UltraLightParser
+			def initialize stream
+				@stream = stream
+				@parser = REXML::Parsers::BaseParser.new( stream )
+			end
+
+      def add_listener( listener )
+        @parser.add_listener( listener )
+      end
+
+      def rewind
+        @stream.rewind
+        @parser.stream = @stream
+      end
+
+			def parse
+				root = context = []
+				while true
+					event = @parser.pull
+					case event[0]
+					when :end_document
+						break
+					when :end_doctype
+						context = context[1]
+					when :start_element, :doctype
+						context << event
+						event[1,0] = [context]
+						context = event
+					when :end_element
+						context = context[1]
+					else
+						context << event
+					end
+				end
+				root
+			end
+		end
+
+		# An element is an array.  The array contains:
+		#  0			The parent element
+		#  1			The tag name
+		#  2			A hash of attributes
+		#  3..-1	The child elements
+		# An element is an array of size > 3
+		# Text is a String
+		# PIs are [ :processing_instruction, target, data ]
+		# Comments are [ :comment, data ]
+		# DocTypes are DocType structs
+		# The root is an array with XMLDecls, Text, DocType, Array, Text
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/parsers/xpathparser.rb b/ruby_1_8_6/lib/rexml/parsers/xpathparser.rb
new file mode 100644
index 0000000000..de2530e347
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/parsers/xpathparser.rb
@@ -0,0 +1,698 @@
+require 'rexml/namespace'
+require 'rexml/xmltokens'
+
+module REXML
+  module Parsers
+    # You don't want to use this class.  Really.  Use XPath, which is a wrapper
+    # for this class.  Believe me.  You don't want to poke around in here.
+    # There is strange, dark magic at work in this code.  Beware.  Go back!  Go
+    # back while you still can!
+    class XPathParser
+      include XMLTokens
+      LITERAL    = /^'([^']*)'|^"([^"]*)"/u
+
+      def namespaces=( namespaces )
+        Functions::namespace_context = namespaces
+        @namespaces = namespaces
+      end
+
+      def parse path
+        path.gsub!(/([\(\[])\s+/, '\1') # Strip ignorable spaces
+        path.gsub!( /\s+([\]\)])/, '\1' )
+        parsed = []
+        path = OrExpr(path, parsed)
+        parsed
+      end
+
+      def predicate path
+        parsed = []
+        Predicate( "[#{path}]", parsed )
+        parsed
+      end
+
+      def abbreviate( path )
+        path = path.kind_of?(String) ? parse( path ) : path
+        string = ""
+        document = false
+        while path.size > 0
+          op = path.shift
+          case op
+          when :node
+          when :attribute
+						string << "/" if string.size > 0
+						string << "@"
+          when :child
+						string << "/" if string.size > 0
+          when :descendant_or_self
+            string << "/"
+          when :self
+            string << "."
+          when :parent
+            string << ".."
+          when :any
+            string << "*"
+					when :text
+						string << "text()"
+          when :following, :following_sibling, 
+                :ancestor, :ancestor_or_self, :descendant, 
+                :namespace, :preceding, :preceding_sibling
+            string << "/" unless string.size == 0
+            string << op.to_s.tr("_", "-")
+            string << "::"
+          when :qname
+            prefix = path.shift
+            name = path.shift
+            string << prefix+":" if prefix.size > 0
+            string << name
+          when :predicate
+            string << '['
+            string << predicate_to_string( path.shift ) {|x| abbreviate( x ) }
+            string << ']'
+          when :document
+            document = true
+					when :function
+						string << path.shift
+						string << "( "
+						string << predicate_to_string( path.shift[0] ) {|x| abbreviate( x )}
+						string << " )"
+					when :literal
+						string << %Q{ "#{path.shift}" }
+          else
+            string << "/" unless string.size == 0
+            string << "UNKNOWN("
+            string << op.inspect
+            string << ")"
+          end
+        end
+				string = "/"+string if document
+        return string
+      end
+
+      def expand( path )
+        path = path.kind_of?(String) ? parse( path ) : path
+        string = ""
+        document = false
+        while path.size > 0
+          op = path.shift
+          case op
+          when :node
+            string << "node()"
+          when :attribute, :child, :following, :following_sibling, 
+                :ancestor, :ancestor_or_self, :descendant, :descendant_or_self,
+                :namespace, :preceding, :preceding_sibling, :self, :parent
+            string << "/" unless string.size == 0
+            string << op.to_s.tr("_", "-")
+            string << "::"
+          when :any
+            string << "*"
+          when :qname
+            prefix = path.shift
+            name = path.shift
+            string << prefix+":" if prefix.size > 0
+            string << name
+          when :predicate
+            string << '['
+            string << predicate_to_string( path.shift ) { |x| expand(x) }
+            string << ']'
+          when :document
+            document = true
+          else
+            string << "/" unless string.size == 0
+            string << "UNKNOWN("
+            string << op.inspect
+            string << ")"
+          end
+        end
+        string = "/"+string if document
+        return string
+      end
+
+      def predicate_to_string( path, &block )
+        string = ""
+        case path[0]
+        when :and, :or, :mult, :plus, :minus, :neq, :eq, :lt, :gt, :lteq, :gteq, :div, :mod, :union
+          op = path.shift
+          case op
+          when :eq
+            op = "="
+          when :lt
+            op = "<"
+          when :gt
+            op = ">"
+          when :lteq
+            op = "<="
+          when :gteq
+            op = ">="
+          when :neq
+            op = "!="
+          when :union
+            op = "|"
+          end
+          left = predicate_to_string( path.shift, &block )
+          right = predicate_to_string( path.shift, &block )
+          string << " "
+          string << left
+          string << " "
+          string << op.to_s
+          string << " "
+          string << right
+          string << " "
+        when :function
+          path.shift
+          name = path.shift
+          string << name
+          string << "( "
+          string << predicate_to_string( path.shift, &block )
+          string << " )"
+        when :literal
+          path.shift
+          string << " "
+          string << path.shift.inspect
+          string << " "
+        else
+          string << " "
+          string << yield( path )
+          string << " "
+        end
+        return string.squeeze(" ")
+      end
+
+      private
+      #LocationPath
+      #  | RelativeLocationPath
+      #  | '/' RelativeLocationPath?
+      #  | '//' RelativeLocationPath
+      def LocationPath path, parsed
+        #puts "LocationPath '#{path}'"
+        path = path.strip
+        if path[0] == ?/
+          parsed << :document
+          if path[1] == ?/
+            parsed << :descendant_or_self
+            parsed << :node
+            path = path[2..-1]
+          else
+            path = path[1..-1]
+          end
+        end
+        #puts parsed.inspect
+        return RelativeLocationPath( path, parsed ) if path.size > 0
+      end
+
+      #RelativeLocationPath
+      #  |                                                    Step
+      #    | (AXIS_NAME '::' | '@' | '')                     AxisSpecifier
+      #      NodeTest
+      #        Predicate
+      #    | '.' | '..'                                      AbbreviatedStep
+      #  |  RelativeLocationPath '/' Step
+      #  | RelativeLocationPath '//' Step
+      AXIS = /^(ancestor|ancestor-or-self|attribute|child|descendant|descendant-or-self|following|following-sibling|namespace|parent|preceding|preceding-sibling|self)::/
+      def RelativeLocationPath path, parsed
+        #puts "RelativeLocationPath #{path}"
+        while path.size > 0
+          # (axis or @ or <child::>) nodetest predicate  >
+          # OR                                          >  / Step
+          # (. or ..)                                    >
+          if path[0] == ?.
+            if path[1] == ?.
+              parsed << :parent
+              parsed << :node
+              path = path[2..-1]
+            else
+              parsed << :self
+              parsed << :node
+              path = path[1..-1]
+            end
+          else
+            if path[0] == ?@
+              #puts "ATTRIBUTE"
+              parsed << :attribute
+              path = path[1..-1]
+              # Goto Nodetest
+            elsif path =~ AXIS
+              parsed << $1.tr('-','_').intern
+              path = $'
+              # Goto Nodetest
+            else
+              parsed << :child
+            end
+
+            #puts "NODETESTING '#{path}'"
+            n = []
+            path = NodeTest( path, n)
+            #puts "NODETEST RETURNED '#{path}'"
+
+            if path[0] == ?[
+              path = Predicate( path, n )
+            end
+
+            parsed.concat(n)
+          end
+          
+          if path.size > 0
+            if path[0] == ?/
+              if path[1] == ?/
+                parsed << :descendant_or_self
+                parsed << :node
+                path = path[2..-1]
+              else
+                path = path[1..-1]
+              end
+            else
+              return path
+            end
+          end
+        end
+        return path
+      end
+
+      # Returns a 1-1 map of the nodeset
+      # The contents of the resulting array are either:
+      #   true/false, if a positive match
+      #   String, if a name match
+      #NodeTest
+      #  | ('*' | NCNAME ':' '*' | QNAME)                NameTest
+      #  | NODE_TYPE '(' ')'                              NodeType
+      #  | PI '(' LITERAL ')'                            PI
+      #    | '[' expr ']'                                Predicate
+      NCNAMETEST= /^(#{NCNAME_STR}):\*/u
+      QNAME     = Namespace::NAMESPLIT
+      NODE_TYPE  = /^(comment|text|node)\(\s*\)/m
+      PI        = /^processing-instruction\(/
+      def NodeTest path, parsed
+        #puts "NodeTest with #{path}"
+        res = nil
+        case path
+        when /^\*/
+          path = $'
+          parsed << :any
+        when NODE_TYPE
+          type = $1
+          path = $'
+          parsed << type.tr('-', '_').intern
+        when PI
+          path = $'
+          literal = nil
+          if path !~ /^\s*\)/
+            path =~ LITERAL
+            literal = $1
+            path = $'
+            raise ParseException.new("Missing ')' after processing instruction") if path[0] != ?)
+            path = path[1..-1]
+          end
+          parsed << :processing_instruction
+          parsed << (literal || '')
+        when NCNAMETEST
+          #puts "NCNAMETEST"
+          prefix = $1
+          path = $'
+          parsed << :namespace
+          parsed << prefix
+        when QNAME
+          #puts "QNAME"
+          prefix = $1
+          name = $2
+          path = $'
+          prefix = "" unless prefix
+          parsed << :qname
+          parsed << prefix
+          parsed << name
+        end
+        return path
+      end
+
+      # Filters the supplied nodeset on the predicate(s)
+      def Predicate path, parsed
+        #puts "PREDICATE with #{path}"
+        return nil unless path[0] == ?[
+        predicates = []
+        while path[0] == ?[
+          path, expr = get_group(path)
+          predicates << expr[1..-2] if expr
+        end
+        #puts "PREDICATES = #{predicates.inspect}"
+        predicates.each{ |expr| 
+          #puts "ORING #{expr}"
+          preds = []
+          parsed << :predicate
+          parsed << preds
+          OrExpr(expr, preds) 
+        }
+        #puts "PREDICATES = #{predicates.inspect}"
+        path
+      end
+
+      # The following return arrays of true/false, a 1-1 mapping of the
+      # supplied nodeset, except for axe(), which returns a filtered
+      # nodeset
+
+      #| OrExpr S 'or' S AndExpr
+      #| AndExpr
+      def OrExpr path, parsed
+        #puts "OR >>> #{path}"
+        n = []
+        rest = AndExpr( path, n )
+        #puts "OR <<< #{rest}"
+        if rest != path
+          while rest =~ /^\s*( or )/
+            n = [ :or, n, [] ]
+            rest = AndExpr( $', n[-1] )
+          end
+        end
+        if parsed.size == 0 and n.size != 0
+          parsed.replace(n)
+        elsif n.size > 0
+          parsed << n
+        end
+        rest
+      end
+
+      #| AndExpr S 'and' S EqualityExpr
+      #| EqualityExpr
+      def AndExpr path, parsed
+        #puts "AND >>> #{path}"
+        n = []
+        rest = EqualityExpr( path, n )
+        #puts "AND <<< #{rest}"
+        if rest != path
+          while rest =~ /^\s*( and )/
+            n = [ :and, n, [] ]
+            #puts "AND >>> #{rest}"
+            rest = EqualityExpr( $', n[-1] )
+            #puts "AND <<< #{rest}"
+          end
+        end
+        if parsed.size == 0 and n.size != 0
+          parsed.replace(n)
+        elsif n.size > 0
+          parsed << n
+        end
+        rest
+      end
+
+      #| EqualityExpr ('=' | '!=')  RelationalExpr
+      #| RelationalExpr
+      def EqualityExpr path, parsed
+        #puts "EQUALITY >>> #{path}"
+        n = []
+        rest = RelationalExpr( path, n )
+        #puts "EQUALITY <<< #{rest}"
+        if rest != path
+          while rest =~ /^\s*(!?=)\s*/
+            if $1[0] == ?!
+              n = [ :neq, n, [] ]
+            else
+              n = [ :eq, n, [] ]
+            end
+            rest = RelationalExpr( $', n[-1] )
+          end
+        end
+        if parsed.size == 0 and n.size != 0
+          parsed.replace(n)
+        elsif n.size > 0
+          parsed << n
+        end
+        rest
+      end
+
+      #| RelationalExpr ('<' | '>' | '<=' | '>=') AdditiveExpr
+      #| AdditiveExpr
+      def RelationalExpr path, parsed
+        #puts "RELATION >>> #{path}"
+        n = []
+        rest = AdditiveExpr( path, n )
+        #puts "RELATION <<< #{rest}"
+        if rest != path
+          while rest =~ /^\s*([<>]=?)\s*/
+            if $1[0] == ?<
+              sym = "lt"
+            else
+              sym = "gt"
+            end
+            sym << "eq" if $1[-1] == ?=
+            n = [ sym.intern, n, [] ]
+            rest = AdditiveExpr( $', n[-1] )
+          end
+        end
+        if parsed.size == 0 and n.size != 0
+          parsed.replace(n)
+        elsif n.size > 0
+          parsed << n
+        end
+        rest
+      end
+
+      #| AdditiveExpr ('+' | S '-') MultiplicativeExpr
+      #| MultiplicativeExpr
+      def AdditiveExpr path, parsed
+        #puts "ADDITIVE >>> #{path}"
+        n = []
+        rest = MultiplicativeExpr( path, n )
+        #puts "ADDITIVE <<< #{rest}"
+        if rest != path
+          while rest =~ /^\s*(\+| -)\s*/
+            if $1[0] == ?+
+              n = [ :plus, n, [] ]
+            else
+              n = [ :minus, n, [] ]
+            end
+            rest = MultiplicativeExpr( $', n[-1] )
+          end
+        end
+        if parsed.size == 0 and n.size != 0
+          parsed.replace(n)
+        elsif n.size > 0
+          parsed << n
+        end
+        rest
+      end
+
+      #| MultiplicativeExpr ('*' | S ('div' | 'mod') S) UnaryExpr
+      #| UnaryExpr
+      def MultiplicativeExpr path, parsed
+        #puts "MULT >>> #{path}"
+        n = []
+        rest = UnaryExpr( path, n )
+        #puts "MULT <<< #{rest}"
+        if rest != path
+          while rest =~ /^\s*(\*| div | mod )\s*/
+            if $1[0] == ?*
+              n = [ :mult, n, [] ]
+            elsif $1.include?( "div" )
+              n = [ :div, n, [] ]
+            else
+              n = [ :mod, n, [] ]
+            end
+            rest = UnaryExpr( $', n[-1] )
+          end
+        end
+        if parsed.size == 0 and n.size != 0
+          parsed.replace(n)
+        elsif n.size > 0
+          parsed << n
+        end
+        rest
+      end
+
+      #| '-' UnaryExpr
+      #| UnionExpr
+      def UnaryExpr path, parsed
+        path =~ /^(\-*)/
+        path = $'
+        if $1 and (($1.size % 2) != 0)
+          mult = -1
+        else
+          mult = 1
+        end
+        parsed << :neg if mult < 0
+
+        #puts "UNARY >>> #{path}"
+        n = []
+        path = UnionExpr( path, n )
+        #puts "UNARY <<< #{path}"
+        parsed.concat( n )
+        path
+      end
+
+      #| UnionExpr '|' PathExpr
+      #| PathExpr
+      def UnionExpr path, parsed
+        #puts "UNION >>> #{path}"
+        n = []
+        rest = PathExpr( path, n )
+        #puts "UNION <<< #{rest}"
+        if rest != path
+          while rest =~ /^\s*(\|)\s*/
+            n = [ :union, n, [] ]
+            rest = PathExpr( $', n[-1] )
+          end
+        end
+        if parsed.size == 0 and n.size != 0
+          parsed.replace( n )
+        elsif n.size > 0
+          parsed << n
+        end
+        rest
+      end
+
+      #| LocationPath
+      #| FilterExpr ('/' | '//') RelativeLocationPath
+      def PathExpr path, parsed
+        path =~ /^\s*/
+        path = $'
+        #puts "PATH >>> #{path}"
+        n = []
+        rest = FilterExpr( path, n )
+        #puts "PATH <<< '#{rest}'"
+        if rest != path
+          if rest and rest[0] == ?/
+            return RelativeLocationPath(rest, n)
+          end
+        end
+        #puts "BEFORE WITH '#{rest}'"
+        rest = LocationPath(rest, n) if rest =~ /\A[\/\.\@\[\w_*]/
+        parsed.concat(n)
+        return rest
+      end
+
+      #| FilterExpr Predicate
+      #| PrimaryExpr
+      def FilterExpr path, parsed
+        #puts "FILTER >>> #{path}"
+        n = []
+        path = PrimaryExpr( path, n )
+        #puts "FILTER <<< #{path}"
+        path = Predicate(path, n) if path and path[0] == ?[
+        #puts "FILTER <<< #{path}"
+        parsed.concat(n)
+        path
+      end
+
+      #| VARIABLE_REFERENCE
+      #| '(' expr ')'
+      #| LITERAL
+      #| NUMBER
+      #| FunctionCall
+      VARIABLE_REFERENCE  = /^\$(#{NAME_STR})/u
+      NUMBER              = /^(\d*\.?\d+)/
+      NT        = /^comment|text|processing-instruction|node$/
+      def PrimaryExpr path, parsed
+        arry = []
+        case path
+        when VARIABLE_REFERENCE
+          varname = $1
+          path = $'
+          parsed << :variable
+          parsed << varname
+          #arry << @variables[ varname ]
+        when /^(\w[-\w]*)(?:\()/
+          #puts "PrimaryExpr :: Function >>> #$1 -- '#$''"
+          fname = $1
+          tmp = $'
+          #puts "#{fname} =~ #{NT.inspect}"
+          return path if fname =~ NT
+          path = tmp
+          parsed << :function
+          parsed << fname
+          path = FunctionCall(path, parsed)
+        when NUMBER
+          #puts "LITERAL or NUMBER: #$1"
+          varname = $1.nil? ? $2 : $1
+          path = $'
+          parsed << :literal 
+          parsed << (varname.include?('.') ? varname.to_f : varname.to_i)
+        when LITERAL
+          #puts "LITERAL or NUMBER: #$1"
+          varname = $1.nil? ? $2 : $1
+          path = $'
+          parsed << :literal 
+          parsed << varname
+        when /^\(/                                               #/
+          path, contents = get_group(path)
+          contents = contents[1..-2]
+          n = []
+          OrExpr( contents, n )
+          parsed.concat(n)
+        end
+        path
+      end
+
+      #| FUNCTION_NAME '(' ( expr ( ',' expr )* )? ')'
+      def FunctionCall rest, parsed
+        path, arguments = parse_args(rest)
+        argset = []
+        for argument in arguments
+          args = []
+          OrExpr( argument, args )
+          argset << args
+        end
+        parsed << argset
+        path
+      end
+
+      # get_group( '[foo]bar' ) -> ['bar', '[foo]']
+      def get_group string
+        ind = 0
+        depth = 0
+        st = string[0,1]
+        en = (st == "(" ? ")" : "]")
+        begin
+          case string[ind,1]
+          when st
+            depth += 1
+          when en
+            depth -= 1
+          end
+          ind += 1
+        end while depth > 0 and ind < string.length
+        return nil unless depth==0
+        [string[ind..-1], string[0..ind-1]]
+      end
+      
+      def parse_args( string )
+        arguments = []
+        ind = 0
+				inquot = false
+				inapos = false
+        depth = 1
+        begin
+          case string[ind]
+          when ?"
+          	inquot = !inquot unless inapos
+          when ?'
+          	inapos = !inapos unless inquot
+          else
+          	unless inquot or inapos
+          		case string[ind]
+							when ?(
+								depth += 1
+                if depth == 1
+                	string = string[1..-1]
+                	ind -= 1
+                end
+							when ?)
+								depth -= 1
+								if depth == 0
+									s = string[0,ind].strip
+									arguments << s unless s == ""
+									string = string[ind+1..-1]
+								end
+							when ?,
+								if depth == 1
+									s = string[0,ind].strip
+									arguments << s unless s == ""
+									string = string[ind+1..-1]
+									ind = -1 
+								end
+							end
+            end
+          end
+          ind += 1
+        end while depth > 0 and ind < string.length
+        return nil unless depth==0
+        [string,arguments]
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/quickpath.rb b/ruby_1_8_6/lib/rexml/quickpath.rb
new file mode 100644
index 0000000000..c099db8579
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/quickpath.rb
@@ -0,0 +1,266 @@
+require 'rexml/functions'
+require 'rexml/xmltokens'
+
+module REXML
+	class QuickPath
+		include Functions
+		include XMLTokens
+
+		EMPTY_HASH = {}
+
+		def QuickPath::first element, path, namespaces=EMPTY_HASH
+			match(element, path, namespaces)[0]
+		end
+
+		def QuickPath::each element, path, namespaces=EMPTY_HASH, &block
+			path = "*" unless path
+			match(element, path, namespaces).each( &block )
+		end
+
+		def QuickPath::match element, path, namespaces=EMPTY_HASH
+			raise "nil is not a valid xpath" unless path
+			results = nil
+			Functions::namespace_context = namespaces
+			case path
+			when /^\/([^\/]|$)/u
+				# match on root
+				path = path[1..-1]
+				return [element.root.parent] if path == ''
+				results = filter([element.root], path)
+			when /^[-\w]*::/u
+				results = filter([element], path)
+			when /^\*/u
+				results = filter(element.to_a, path)
+			when /^[\[!\w:]/u
+				# match on child
+				matches = []
+				children = element.to_a
+				results = filter(children, path)
+			else
+				results = filter([element], path)
+			end
+			return results
+		end
+
+		# Given an array of nodes it filters the array based on the path. The
+		# result is that when this method returns, the array will contain elements
+		# which match the path
+		def QuickPath::filter elements, path
+			return elements if path.nil? or path == '' or elements.size == 0
+			case path
+			when /^\/\//u											# Descendant
+				return axe( elements, "descendant-or-self", $' )
+			when /^\/?\b(\w[-\w]*)\b::/u							# Axe
+				axe_name = $1
+				rest = $'
+				return axe( elements, $1, $' )
+			when /^\/(?=\b([:!\w][-\.\w]*:)?[-!\*\.\w]*\b([^:(]|$)|\*)/u	# Child
+				rest = $'
+				results = []
+				elements.each do |element|
+					results |= filter( element.to_a, rest )
+				end
+				return results
+			when /^\/?(\w[-\w]*)\(/u							# / Function
+				return function( elements, $1, $' )
+			when Namespace::NAMESPLIT		# Element name
+				name = $2
+				ns = $1
+				rest = $'
+				elements.delete_if do |element|
+					!(element.kind_of? Element and 
+						(element.expanded_name == name or
+						 (element.name == name and
+						  element.namespace == Functions.namespace_context[ns])))
+				end
+				return filter( elements, rest )
+			when /^\/\[/u
+				matches = []
+				elements.each do |element|
+					matches |= predicate( element.to_a, path[1..-1] ) if element.kind_of? Element
+				end
+				return matches
+			when /^\[/u												# Predicate
+				return predicate( elements, path )
+			when /^\/?\.\.\./u										# Ancestor
+				return axe( elements, "ancestor", $' )
+			when /^\/?\.\./u											# Parent
+				return filter( elements.collect{|e|e.parent}, $' )
+			when /^\/?\./u												# Self
+				return filter( elements, $' )
+			when /^\*/u													# Any
+				results = []
+				elements.each do |element|
+					results |= filter( [element], $' ) if element.kind_of? Element
+					#if element.kind_of? Element
+					#	children = element.to_a
+					#	children.delete_if { |child| !child.kind_of?(Element) }
+					#	results |= filter( children, $' )
+					#end
+				end
+				return results
+			end
+			return []
+		end
+
+		def QuickPath::axe( elements, axe_name, rest )
+			matches = []
+			matches = filter( elements.dup, rest ) if axe_name =~ /-or-self$/u
+			case axe_name
+			when /^descendant/u
+				elements.each do |element|
+					matches |= filter( element.to_a, "descendant-or-self::#{rest}" ) if element.kind_of? Element
+				end
+			when /^ancestor/u
+				elements.each do |element|
+					while element.parent
+						matches << element.parent
+						element = element.parent
+					end
+				end
+				matches = filter( matches, rest )
+			when "self"
+				matches = filter( elements, rest )
+			when "child"
+				elements.each do |element|
+					matches |= filter( element.to_a, rest ) if element.kind_of? Element
+				end
+			when "attribute"
+				elements.each do |element|
+					matches << element.attributes[ rest ] if element.kind_of? Element
+				end
+			when "parent"
+				matches = filter(elements.collect{|element| element.parent}.uniq, rest)
+			when "following-sibling"
+				matches = filter(elements.collect{|element| element.next_sibling}.uniq,
+					rest)
+			when "previous-sibling"
+				matches = filter(elements.collect{|element| 
+					element.previous_sibling}.uniq, rest )
+			end
+			return matches.uniq
+		end
+
+		# A predicate filters a node-set with respect to an axis to produce a
+		# new node-set. For each node in the node-set to be filtered, the 
+		# PredicateExpr is evaluated with that node as the context node, with 
+		# the number of nodes in the node-set as the context size, and with the 
+		# proximity position of the node in the node-set with respect to the
+		# axis as the context position; if PredicateExpr evaluates to true for
+		# that node, the node is included in the new node-set; otherwise, it is
+		# not included.
+		#
+		# A PredicateExpr is evaluated by evaluating the Expr and converting
+		# the result to a boolean. If the result is a number, the result will
+		# be converted to true if the number is equal to the context position
+		# and will be converted to false otherwise; if the result is not a
+		# number, then the result will be converted as if by a call to the
+		# boolean function. Thus a location path para[3] is equivalent to
+		# para[position()=3].
+		def QuickPath::predicate( elements, path ) 
+			ind = 1
+			bcount = 1
+			while bcount > 0
+				bcount += 1 if path[ind] == ?[
+				bcount -= 1 if path[ind] == ?]
+				ind += 1
+			end
+			ind -= 1
+			predicate = path[1..ind-1]
+			rest = path[ind+1..-1]
+
+			# have to change 'a [=<>] b [=<>] c' into 'a [=<>] b and b [=<>] c'
+			predicate.gsub!( /([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)/u ) { 
+				"#$1 #$2 #$3 and #$3 #$4 #$5"
+			}
+			# Let's do some Ruby trickery to avoid some work:
+			predicate.gsub!( /&/u, "&&" )
+			predicate.gsub!( /=/u, "==" )
+			predicate.gsub!( /@(\w[-\w.]*)/u ) {
+				"attribute(\"#$1\")" 
+			}
+			predicate.gsub!( /\bmod\b/u, "%" )
+			predicate.gsub!( /\b(\w[-\w.]*\()/u ) {
+				fname = $1
+				fname.gsub( /-/u, "_" )
+			}
+			
+			Functions.pair = [ 0, elements.size ]
+			results = []
+			elements.each do |element|
+				Functions.pair[0] += 1
+				Functions.node = element
+				res = eval( predicate )
+				case res
+				when true
+					results << element
+				when Fixnum
+					results << element if Functions.pair[0] == res
+				when String
+					results << element
+				end
+			end
+			return filter( results, rest )
+		end
+
+		def QuickPath::attribute( name )
+			return Functions.node.attributes[name] if Functions.node.kind_of? Element
+		end
+
+		def QuickPath::name()
+			return Functions.node.name if Functions.node.kind_of? Element
+		end
+
+		def QuickPath::method_missing( id, *args )
+			begin
+				Functions.send( id.id2name, *args )
+			rescue Exception
+				raise "METHOD: #{id.id2name}(#{args.join ', '})\n#{$!.message}"
+			end
+		end
+
+		def QuickPath::function( elements, fname, rest )
+			args = parse_args( elements, rest )
+			Functions.pair = [0, elements.size]
+			results = []
+			elements.each do |element|
+				Functions.pair[0] += 1
+				Functions.node = element
+				res = Functions.send( fname, *args )
+				case res
+				when true
+					results << element
+				when Fixnum
+					results << element if Functions.pair[0] == res
+				end
+			end
+			return results
+		end
+
+		def QuickPath::parse_args( element, string )
+			# /.*?(?:\)|,)/
+			arguments = []
+			buffer = ""
+			while string and string != ""
+				c = string[0]
+				string.sub!(/^./u, "")
+				case c
+				when ?,
+					# if depth = 1, then we start a new argument
+					arguments << evaluate( buffer )
+					#arguments << evaluate( string[0..count] )
+				when ?(
+					# start a new method call
+					function( element, buffer, string )
+					buffer = ""
+				when ?)
+					# close the method call and return arguments
+					return arguments
+				else
+					buffer << c
+				end
+			end
+			""
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/rexml.rb b/ruby_1_8_6/lib/rexml/rexml.rb
new file mode 100644
index 0000000000..19805d61e1
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/rexml.rb
@@ -0,0 +1,30 @@
+# REXML is an XML toolkit for Ruby[http://www.ruby-lang.org], in Ruby.
+#
+# REXML is a _pure_ Ruby, XML 1.0 conforming,
+# non-validating[http://www.w3.org/TR/2004/REC-xml-20040204/#sec-conformance]
+# toolkit with an intuitive API.  REXML passes 100% of the non-validating Oasis
+# tests[http://www.oasis-open.org/committees/xml-conformance/xml-test-suite.shtml],
+# and provides tree, stream, SAX2, pull, and lightweight APIs.  REXML also 
+# includes a full XPath[http://www.w3c.org/tr/xpath] 1.0 implementation. Since 
+# Ruby 1.8, REXML is included in the standard Ruby distribution.
+#
+# Main page:: http://www.germane-software.com/software/rexml
+# Author:: Sean Russell <serATgermaneHYPHENsoftwareDOTcom>
+# Version:: 3.1.7.1
+# Date:: 2007/209
+# 
+# This API documentation can be downloaded from the REXML home page, or can
+# be accessed online[http://www.germane-software.com/software/rexml_doc]
+#
+# A tutorial is available in the REXML distribution in docs/tutorial.html,
+# or can be accessed 
+# online[http://www.germane-software.com/software/rexml/docs/tutorial.html]
+module REXML
+  COPYRIGHT = "Copyright 息 2001-2007 Sean Russell <ser@germane-software.com>"
+  DATE = "2007/209"
+  VERSION = "3.1.7.1"
+  REVISION = "$Revision: 1270$".gsub(/\$Revision:|\$/,'').strip
+
+  Copyright = COPYRIGHT
+  Version = VERSION
+end
diff --git a/ruby_1_8_6/lib/rexml/sax2listener.rb b/ruby_1_8_6/lib/rexml/sax2listener.rb
new file mode 100644
index 0000000000..8db1389d06
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/sax2listener.rb
@@ -0,0 +1,97 @@
+module REXML
+	# A template for stream parser listeners.
+	# Note that the declarations (attlistdecl, elementdecl, etc) are trivially
+	# processed; REXML doesn't yet handle doctype entity declarations, so you 
+	# have to parse them out yourself.
+	# === Missing methods from SAX2
+	#  ignorable_whitespace
+	# === Methods extending SAX2 
+	# +WARNING+
+	# These methods are certainly going to change, until DTDs are fully
+	# supported.  Be aware of this.
+	#  start_document
+	#  end_document
+	#  doctype
+	#  elementdecl
+	#  attlistdecl
+	#  entitydecl
+	#  notationdecl
+	#  cdata
+	#  xmldecl
+	#  comment
+	module SAX2Listener
+		def start_document
+		end
+		def end_document
+		end
+		def start_prefix_mapping prefix, uri
+		end
+		def end_prefix_mapping prefix
+		end
+		def start_element uri, localname, qname, attributes
+		end
+		def end_element uri, localname, qname
+		end
+		def characters text
+		end
+		def processing_instruction target, data
+		end
+		# Handles a doctype declaration. Any attributes of the doctype which are
+		# not supplied will be nil.  # EG, <!DOCTYPE me PUBLIC "foo" "bar">
+		# @p name the name of the doctype; EG, "me"
+		# @p pub_sys "PUBLIC", "SYSTEM", or nil.  EG, "PUBLIC"
+		# @p long_name the supplied long name, or nil.  EG, "foo"
+		# @p uri the uri of the doctype, or nil.  EG, "bar"
+		def doctype name, pub_sys, long_name, uri
+		end
+		# If a doctype includes an ATTLIST declaration, it will cause this
+		# method to be called.  The content is the declaration itself, unparsed.
+		# EG, <!ATTLIST el attr CDATA #REQUIRED> will come to this method as "el
+		# attr CDATA #REQUIRED".  This is the same for all of the .*decl
+		# methods.
+		def attlistdecl(element, pairs, contents)
+		end
+		# <!ELEMENT ...>
+		def elementdecl content
+		end
+		# <!ENTITY ...>
+		# The argument passed to this method is an array of the entity
+		# declaration.  It can be in a number of formats, but in general it
+		# returns (example, result):
+		#  <!ENTITY % YN '"Yes"'>  
+		#  ["%", "YN", "'\"Yes\"'", "\""]
+		#  <!ENTITY % YN 'Yes'>
+		#  ["%", "YN", "'Yes'", "s"]
+		#  <!ENTITY WhatHeSaid "He said %YN;">
+		#  ["WhatHeSaid", "\"He said %YN;\"", "YN"]
+		#  <!ENTITY open-hatch SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
+		#  ["open-hatch", "SYSTEM", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
+		#  <!ENTITY open-hatch PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN" "http://www.textuality.com/boilerplate/OpenHatch.xml">
+		#  ["open-hatch", "PUBLIC", "\"-//Textuality//TEXT Standard open-hatch boilerplate//EN\"", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
+		#  <!ENTITY hatch-pic SYSTEM "../grafix/OpenHatch.gif" NDATA gif>
+		#  ["hatch-pic", "SYSTEM", "\"../grafix/OpenHatch.gif\"", "\n\t\t\t\t\t\t\tNDATA gif", "gif"]
+		def entitydecl name, decl
+		end
+		# <!NOTATION ...>
+		def notationdecl content
+		end
+		# Called when <![CDATA[ ... ]]> is encountered in a document.
+		# @p content "..."
+		def cdata content
+		end
+		# Called when an XML PI is encountered in the document.
+		# EG: <?xml version="1.0" encoding="utf"?>
+		# @p version the version attribute value.  EG, "1.0"
+		# @p encoding the encoding attribute value, or nil.  EG, "utf"
+		# @p standalone the standalone attribute value, or nil.  EG, nil
+    # @p spaced the declaration is followed by a line break
+		def xmldecl version, encoding, standalone
+		end
+		# Called when a comment is encountered.
+		# @p comment The content of the comment
+		def comment comment
+		end
+    def progress position
+    end
+	end	
+end
diff --git a/ruby_1_8_6/lib/rexml/source.rb b/ruby_1_8_6/lib/rexml/source.rb
new file mode 100644
index 0000000000..ada876cde5
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/source.rb
@@ -0,0 +1,247 @@
+require 'rexml/encoding'
+
+module REXML
+  # Generates Source-s.  USE THIS CLASS.
+  class SourceFactory
+    # Generates a Source object
+    # @param arg Either a String, or an IO
+    # @return a Source, or nil if a bad argument was given
+    def SourceFactory::create_from(arg)
+      if arg.kind_of? String
+        Source.new(arg)
+      elsif arg.respond_to? :read and
+            arg.respond_to? :readline and
+            arg.respond_to? :nil? and
+            arg.respond_to? :eof?
+        IOSource.new(arg)
+      elsif arg.kind_of? Source
+        arg
+      else
+        raise "#{source.class} is not a valid input stream.  It must walk \n"+
+        "like either a String, IO, or Source."
+      end
+    end
+  end
+
+  # A Source can be searched for patterns, and wraps buffers and other
+  # objects and provides consumption of text
+  class Source
+    include Encoding
+    # The current buffer (what we're going to read next)
+    attr_reader :buffer
+    # The line number of the last consumed text
+    attr_reader :line
+    attr_reader :encoding
+
+    # Constructor
+    # @param arg must be a String, and should be a valid XML document
+    # @param encoding if non-null, sets the encoding of the source to this
+    # value, overriding all encoding detection
+    def initialize(arg, encoding=nil)
+      @orig = @buffer = arg
+      if encoding
+        self.encoding = encoding
+      else
+        self.encoding = check_encoding( @buffer )
+      end
+      @line = 0
+    end
+
+
+    # Inherited from Encoding
+    # Overridden to support optimized en/decoding
+    def encoding=(enc)
+      return unless super
+      @line_break = encode( '>' )
+      if enc != UTF_8
+        @buffer = decode(@buffer)
+        @to_utf = true
+      else
+        @to_utf = false
+      end
+    end
+
+    # Scans the source for a given pattern.  Note, that this is not your
+    # usual scan() method.  For one thing, the pattern argument has some
+    # requirements; for another, the source can be consumed.  You can easily
+    # confuse this method.  Originally, the patterns were easier
+    # to construct and this method more robust, because this method 
+    # generated search regexes on the fly; however, this was 
+    # computationally expensive and slowed down the entire REXML package 
+    # considerably, since this is by far the most commonly called method.
+    # @param pattern must be a Regexp, and must be in the form of
+    # /^\s*(#{your pattern, with no groups})(.*)/.  The first group
+    # will be returned; the second group is used if the consume flag is
+    # set.
+    # @param consume if true, the pattern returned will be consumed, leaving
+    # everything after it in the Source.
+    # @return the pattern, if found, or nil if the Source is empty or the
+    # pattern is not found.
+    def scan(pattern, cons=false)
+      return nil if @buffer.nil?
+      rv = @buffer.scan(pattern)
+      @buffer = $' if cons and rv.size>0
+      rv
+    end
+
+    def read
+    end
+
+    def consume( pattern )
+      @buffer = $' if pattern.match( @buffer )
+    end
+
+    def match_to( char, pattern )
+      return pattern.match(@buffer)
+    end
+
+    def match_to_consume( char, pattern )
+      md = pattern.match(@buffer)
+      @buffer = $'
+      return md
+    end
+
+    def match(pattern, cons=false)
+      md = pattern.match(@buffer)
+      @buffer = $' if cons and md
+      return md
+    end
+
+    # @return true if the Source is exhausted
+    def empty?
+      @buffer == ""
+    end
+
+    def position
+      @orig.index( @buffer )
+    end
+
+    # @return the current line in the source
+    def current_line
+      lines = @orig.split
+      res = lines.grep @buffer[0..30]
+      res = res[-1] if res.kind_of? Array
+      lines.index( res ) if res
+    end
+  end
+
+  # A Source that wraps an IO.  See the Source class for method
+  # documentation
+  class IOSource < Source
+    #attr_reader :block_size
+
+    # block_size has been deprecated
+    def initialize(arg, block_size=500, encoding=nil)
+      @er_source = @source = arg
+      @to_utf = false
+      # Determining the encoding is a deceptively difficult issue to resolve.
+      # First, we check the first two bytes for UTF-16.  Then we
+      # assume that the encoding is at least ASCII enough for the '>', and
+      # we read until we get one of those.  This gives us the XML declaration,
+      # if there is one.  If there isn't one, the file MUST be UTF-8, as per
+      # the XML spec.  If there is one, we can determine the encoding from
+      # it.
+      @buffer = ""
+      str = @source.read( 2 )
+      if encoding
+        self.encoding = encoding
+      elsif /\A(?:\xfe\xff|\xff\xfe)/n =~ str
+        self.encoding = check_encoding( str )
+      elsif (0xef == str[0] && 0xbb == str[1])
+        str += @source.read(1)
+        str = '' if (0xbf == str[2])
+      else
+        @line_break = '>'
+      end
+      super str+@source.readline( @line_break )
+    end
+
+    def scan(pattern, cons=false)
+      rv = super
+      # You'll notice that this next section is very similar to the same
+      # section in match(), but just a liiittle different.  This is
+      # because it is a touch faster to do it this way with scan()
+      # than the way match() does it; enough faster to warrent duplicating
+      # some code
+      if rv.size == 0
+        until @buffer =~ pattern or @source.nil?
+          begin
+            # READLINE OPT
+            #str = @source.read(@block_size)
+            str = @source.readline(@line_break)
+            str = decode(str) if @to_utf and str
+            @buffer << str
+          rescue Iconv::IllegalSequence
+            raise
+          rescue
+            @source = nil
+          end
+        end
+        rv = super
+      end
+      rv.taint
+      rv
+    end
+
+    def read
+      begin
+        str = @source.readline(@line_break)
+        str = decode(str) if @to_utf and str 
+        @buffer << str
+      rescue Exception, NameError
+        @source = nil
+      end
+    end
+
+    def consume( pattern )
+      match( pattern, true )
+    end
+
+    def match( pattern, cons=false )
+      rv = pattern.match(@buffer)
+      @buffer = $' if cons and rv
+      while !rv and @source
+        begin
+          str = @source.readline(@line_break)
+          str = decode(str) if @to_utf and str
+          @buffer << str
+          rv = pattern.match(@buffer)
+          @buffer = $' if cons and rv
+        rescue
+          @source = nil
+        end
+      end
+      rv.taint
+      rv
+    end
+    
+    def empty?
+      super and ( @source.nil? || @source.eof? )
+    end
+
+    def position
+      @er_source.stat.pipe? ? 0 : @er_source.pos
+    end
+
+    # @return the current line in the source
+    def current_line
+      begin
+        pos = @er_source.pos        # The byte position in the source
+        lineno = @er_source.lineno  # The XML < position in the source
+        @er_source.rewind
+        line = 0                    # The \r\n position in the source
+        begin
+          while @er_source.pos < pos
+            @er_source.readline
+            line += 1
+          end
+        rescue
+        end
+      rescue IOError
+        pos = -1
+        line = -1
+      end
+      [pos, lineno, line]
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/streamlistener.rb b/ruby_1_8_6/lib/rexml/streamlistener.rb
new file mode 100644
index 0000000000..6f401125b5
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/streamlistener.rb
@@ -0,0 +1,92 @@
+module REXML
+	# A template for stream parser listeners.
+	# Note that the declarations (attlistdecl, elementdecl, etc) are trivially
+	# processed; REXML doesn't yet handle doctype entity declarations, so you 
+	# have to parse them out yourself.
+	module StreamListener
+		# Called when a tag is encountered.
+		# @p name the tag name
+		# @p attrs an array of arrays of attribute/value pairs, suitable for
+		# use with assoc or rassoc.  IE, <tag attr1="value1" attr2="value2">
+		# will result in 
+		# tag_start( "tag", # [["attr1","value1"],["attr2","value2"]])
+		def tag_start name, attrs
+		end
+		# Called when the end tag is reached.  In the case of <tag/>, tag_end
+		# will be called immidiately after tag_start
+		# @p the name of the tag
+		def tag_end name
+		end
+		# Called when text is encountered in the document
+		# @p text the text content.
+		def text text
+		end
+		# Called when an instruction is encountered.  EG: <?xsl sheet='foo'?>
+		# @p name the instruction name; in the example, "xsl"
+		# @p instruction the rest of the instruction.  In the example,
+		# "sheet='foo'"
+		def instruction name, instruction
+		end
+		# Called when a comment is encountered.
+		# @p comment The content of the comment
+		def comment comment
+		end
+		# Handles a doctype declaration. Any attributes of the doctype which are
+		# not supplied will be nil.  # EG, <!DOCTYPE me PUBLIC "foo" "bar">
+		# @p name the name of the doctype; EG, "me"
+		# @p pub_sys "PUBLIC", "SYSTEM", or nil.  EG, "PUBLIC"
+		# @p long_name the supplied long name, or nil.  EG, "foo"
+		# @p uri the uri of the doctype, or nil.  EG, "bar"
+		def doctype name, pub_sys, long_name, uri
+		end
+		# Called when the doctype is done
+		def doctype_end
+		end
+		# If a doctype includes an ATTLIST declaration, it will cause this
+		# method to be called.  The content is the declaration itself, unparsed.
+		# EG, <!ATTLIST el attr CDATA #REQUIRED> will come to this method as "el
+		# attr CDATA #REQUIRED".  This is the same for all of the .*decl
+		# methods.
+		def attlistdecl element_name, attributes, raw_content
+		end
+		# <!ELEMENT ...>
+		def elementdecl content
+		end
+		# <!ENTITY ...>
+		# The argument passed to this method is an array of the entity
+		# declaration.  It can be in a number of formats, but in general it
+		# returns (example, result):
+		#  <!ENTITY % YN '"Yes"'>  
+		#  ["%", "YN", "'\"Yes\"'", "\""]
+		#  <!ENTITY % YN 'Yes'>
+		#  ["%", "YN", "'Yes'", "s"]
+		#  <!ENTITY WhatHeSaid "He said %YN;">
+		#  ["WhatHeSaid", "\"He said %YN;\"", "YN"]
+		#  <!ENTITY open-hatch SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
+		#  ["open-hatch", "SYSTEM", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
+		#  <!ENTITY open-hatch PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN" "http://www.textuality.com/boilerplate/OpenHatch.xml">
+		#  ["open-hatch", "PUBLIC", "\"-//Textuality//TEXT Standard open-hatch boilerplate//EN\"", "\"http://www.textuality.com/boilerplate/OpenHatch.xml\""]
+		#  <!ENTITY hatch-pic SYSTEM "../grafix/OpenHatch.gif" NDATA gif>
+		#  ["hatch-pic", "SYSTEM", "\"../grafix/OpenHatch.gif\"", "\n\t\t\t\t\t\t\tNDATA gif", "gif"]
+		def entitydecl content
+		end
+		# <!NOTATION ...>
+		def notationdecl content
+		end
+		# Called when %foo; is encountered in a doctype declaration.
+		# @p content "foo"
+		def entity content
+		end
+		# Called when <![CDATA[ ... ]]> is encountered in a document.
+		# @p content "..."
+		def cdata content
+		end
+		# Called when an XML PI is encountered in the document.
+		# EG: <?xml version="1.0" encoding="utf"?>
+		# @p version the version attribute value.  EG, "1.0"
+		# @p encoding the encoding attribute value, or nil.  EG, "utf"
+		# @p standalone the standalone attribute value, or nil.  EG, nil
+		def xmldecl version, encoding, standalone
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/syncenumerator.rb b/ruby_1_8_6/lib/rexml/syncenumerator.rb
new file mode 100644
index 0000000000..955e006cb2
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/syncenumerator.rb
@@ -0,0 +1,33 @@
+module REXML
+  class SyncEnumerator
+    include Enumerable
+
+    # Creates a new SyncEnumerator which enumerates rows of given
+    # Enumerable objects.
+    def initialize(*enums)
+      @gens = enums
+      @biggest = @gens[0]
+      @gens.each {|x| @biggest = x if x.size > @biggest.size }
+    end
+
+    # Returns the number of enumerated Enumerable objects, i.e. the size
+    # of each row.
+    def size
+      @gens.size
+    end
+
+    # Returns the number of enumerated Enumerable objects, i.e. the size
+    # of each row.
+    def length
+      @gens.length
+    end
+
+    # Enumerates rows of the Enumerable objects.
+    def each
+      @biggest.zip( *@gens ) {|a|
+        yield(*a[1..-1])
+      }
+      self
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/text.rb b/ruby_1_8_6/lib/rexml/text.rb
new file mode 100644
index 0000000000..9804aa710b
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/text.rb
@@ -0,0 +1,344 @@
+require 'rexml/entity'
+require 'rexml/doctype'
+require 'rexml/child'
+require 'rexml/doctype'
+require 'rexml/parseexception'
+
+module REXML
+  # Represents text nodes in an XML document
+  class Text < Child
+    include Comparable
+    # The order in which the substitutions occur
+    SPECIALS = [ /&(?!#?[\w-]+;)/u, /</u, />/u, /"/u, /'/u, /\r/u ]
+    SUBSTITUTES = ['&amp;', '&lt;', '&gt;', '&quot;', '&apos;', '&#13;']
+    # Characters which are substituted in written strings
+    SLAICEPS = [ '<', '>', '"', "'", '&' ]
+    SETUTITSBUS = [ /&lt;/u, /&gt;/u, /&quot;/u, /&apos;/u, /&amp;/u ]
+
+    # If +raw+ is true, then REXML leaves the value alone
+    attr_accessor :raw
+
+    ILLEGAL = /(<|&(?!(#{Entity::NAME})|(#0*((?:\d+)|(?:x[a-fA-F0-9]+)));))/um
+    NUMERICENTITY = /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/ 
+
+    # Constructor
+    # +arg+ if a String, the content is set to the String.  If a Text,
+    # the object is shallowly cloned.  
+    #
+    # +respect_whitespace+ (boolean, false) if true, whitespace is
+    # respected
+    #
+    # +parent+ (nil) if this is a Parent object, the parent
+    # will be set to this.  
+    #
+    # +raw+ (nil) This argument can be given three values.
+    # If true, then the value of used to construct this object is expected to 
+    # contain no unescaped XML markup, and REXML will not change the text. If 
+    # this value is false, the string may contain any characters, and REXML will
+    # escape any and all defined entities whose values are contained in the
+    # text.  If this value is nil (the default), then the raw value of the 
+    # parent will be used as the raw value for this node.  If there is no raw
+    # value for the parent, and no value is supplied, the default is false.
+    # Use this field if you have entities defined for some text, and you don't
+    # want REXML to escape that text in output.
+    #   Text.new( "<&", false, nil, false ) #-> "&lt;&amp;"
+    #   Text.new( "&lt;&amp;", false, nil, false ) #-> "&amp;lt;&amp;amp;"
+    #   Text.new( "<&", false, nil, true )  #-> Parse exception
+    #   Text.new( "&lt;&amp;", false, nil, true )  #-> "&lt;&amp;"
+    #   # Assume that the entity "s" is defined to be "sean"
+    #   # and that the entity    "r" is defined to be "russell"
+    #   Text.new( "sean russell" )          #-> "&s; &r;"
+    #   Text.new( "sean russell", false, nil, true ) #-> "sean russell"
+    #
+    # +entity_filter+ (nil) This can be an array of entities to match in the
+    # supplied text.  This argument is only useful if +raw+ is set to false.
+    #   Text.new( "sean russell", false, nil, false, ["s"] ) #-> "&s; russell"
+    #   Text.new( "sean russell", false, nil, true, ["s"] ) #-> "sean russell"
+    # In the last example, the +entity_filter+ argument is ignored.
+    #
+    # +pattern+ INTERNAL USE ONLY
+    def initialize(arg, respect_whitespace=false, parent=nil, raw=nil, 
+      entity_filter=nil, illegal=ILLEGAL )
+
+      @raw = false
+
+      if parent
+        super( parent )
+        @raw = parent.raw 
+      else
+        @parent = nil
+      end
+
+      @raw = raw unless raw.nil?
+      @entity_filter = entity_filter
+      @normalized = @unnormalized = nil
+
+      if arg.kind_of? String
+        @string = arg.clone
+        @string.squeeze!(" \n\t") unless respect_whitespace
+      elsif arg.kind_of? Text
+        @string = arg.to_s
+        @raw = arg.raw
+      elsif
+        raise "Illegal argument of type #{arg.type} for Text constructor (#{arg})"
+      end
+
+      @string.gsub!( /\r\n?/, "\n" )
+
+      # check for illegal characters
+      if @raw
+        if @string =~ illegal
+          raise "Illegal character '#{$1}' in raw string \"#{@string}\""
+        end
+      end
+    end
+
+    def node_type
+      :text
+    end
+
+    def empty?
+      @string.size==0
+    end
+
+
+    def clone
+      return Text.new(self)
+    end
+
+
+    # Appends text to this text node.  The text is appended in the +raw+ mode
+    # of this text node.
+    def <<( to_append )
+      @string << to_append.gsub( /\r\n?/, "\n" )
+    end
+
+
+    # +other+ a String or a Text
+    # +returns+ the result of (to_s <=> arg.to_s)
+    def <=>( other )
+      to_s() <=> other.to_s
+    end
+
+    REFERENCE = /#{Entity::REFERENCE}/
+    # Returns the string value of this text node.  This string is always
+    # escaped, meaning that it is a valid XML text node string, and all
+    # entities that can be escaped, have been inserted.  This method respects
+    # the entity filter set in the constructor.
+    #   
+    #   # Assume that the entity "s" is defined to be "sean", and that the 
+    #   # entity "r" is defined to be "russell"
+    #   t = Text.new( "< & sean russell", false, nil, false, ['s'] ) 
+    #   t.to_s   #-> "&lt; &amp; &s; russell"
+    #   t = Text.new( "< & &s; russell", false, nil, false ) 
+    #   t.to_s   #-> "&lt; &amp; &s; russell"
+    #   u = Text.new( "sean russell", false, nil, true )
+    #   u.to_s   #-> "sean russell"
+    def to_s
+      return @string if @raw
+      return @normalized if @normalized
+
+      doctype = nil
+      if @parent
+        doc = @parent.document
+        doctype = doc.doctype if doc
+      end
+
+      @normalized = Text::normalize( @string, doctype, @entity_filter )
+    end
+
+    def inspect
+      @string.inspect
+    end
+
+    # Returns the string value of this text.  This is the text without
+    # entities, as it might be used programmatically, or printed to the
+    # console.  This ignores the 'raw' attribute setting, and any
+    # entity_filter.
+    #
+    #   # Assume that the entity "s" is defined to be "sean", and that the 
+    #   # entity "r" is defined to be "russell"
+    #   t = Text.new( "< & sean russell", false, nil, false, ['s'] ) 
+    #   t.value   #-> "< & sean russell"
+    #   t = Text.new( "< & &s; russell", false, nil, false )
+    #   t.value   #-> "< & sean russell"
+    #   u = Text.new( "sean russell", false, nil, true )
+    #   u.value   #-> "sean russell"
+    def value
+      @unnormalized if @unnormalized
+      doctype = nil
+      if @parent
+        doc = @parent.document
+        doctype = doc.doctype if doc
+      end
+      @unnormalized = Text::unnormalize( @string, doctype )
+    end
+
+    # Sets the contents of this text node.  This expects the text to be 
+    # unnormalized.  It returns self.
+    #
+    #   e = Element.new( "a" )
+    #   e.add_text( "foo" )   # <a>foo</a>
+    #   e[0].value = "bar"    # <a>bar</a>
+    #   e[0].value = "<a>"    # <a>&lt;a&gt;</a>
+    def value=( val )
+      @string = val.gsub( /\r\n?/, "\n" )
+      @unnormalized = nil
+      @normalized = nil
+      @raw = false
+    end
+ 
+     def wrap(string, width, addnewline=false)
+       # Recursivly wrap string at width.
+       return string if string.length <= width
+       place = string.rindex(' ', width) # Position in string with last ' ' before cutoff
+       if addnewline then
+         return "\n" + string[0,place] + "\n" + wrap(string[place+1..-1], width)
+       else
+         return string[0,place] + "\n" + wrap(string[place+1..-1], width)
+       end
+     end
+
+    def indent_text(string, level=1, style="\t", indentfirstline=true)
+      return string if level < 0
+      new_string = ''
+      string.each { |line|
+        indent_string = style * level
+        new_line = (indent_string + line).sub(/[\s]+$/,'')
+        new_string << new_line
+      }
+      new_string.strip! unless indentfirstline
+      return new_string
+    end
+ 
+    # == DEPRECATED
+    # See REXML::Formatters
+    #
+    def write( writer, indent=-1, transitive=false, ie_hack=false ) 
+      Kernel.warn("#{self.class.name}.write is deprecated.  See REXML::Formatters")
+      formatter = if indent > -1
+          REXML::Formatters::Pretty.new( indent )
+        else
+          REXML::Formatters::Default.new
+        end
+      formatter.write( self, writer )
+    end
+
+    # FIXME
+    # This probably won't work properly
+    def xpath
+      path = @parent.xpath
+      path += "/text()"
+      return path
+    end
+
+    # Writes out text, substituting special characters beforehand.
+    # +out+ A String, IO, or any other object supporting <<( String )
+    # +input+ the text to substitute and the write out
+    #
+    #   z=utf8.unpack("U*")
+    #   ascOut=""
+    #   z.each{|r|
+    #     if r <  0x100
+    #       ascOut.concat(r.chr)
+    #     else
+    #       ascOut.concat(sprintf("&#x%x;", r))
+    #     end
+    #   }
+    #   puts ascOut
+    def write_with_substitution out, input
+      copy = input.clone
+      # Doing it like this rather than in a loop improves the speed
+      copy.gsub!( SPECIALS[0], SUBSTITUTES[0] )
+      copy.gsub!( SPECIALS[1], SUBSTITUTES[1] )
+      copy.gsub!( SPECIALS[2], SUBSTITUTES[2] )
+      copy.gsub!( SPECIALS[3], SUBSTITUTES[3] )
+      copy.gsub!( SPECIALS[4], SUBSTITUTES[4] )
+      copy.gsub!( SPECIALS[5], SUBSTITUTES[5] )
+      out << copy
+    end
+
+    # Reads text, substituting entities
+    def Text::read_with_substitution( input, illegal=nil )
+      copy = input.clone
+
+      if copy =~ illegal
+        raise ParseException.new( "malformed text: Illegal character #$& in \"#{copy}\"" )
+      end if illegal
+      
+      copy.gsub!( /\r\n?/, "\n" )
+      if copy.include? ?&
+        copy.gsub!( SETUTITSBUS[0], SLAICEPS[0] )
+        copy.gsub!( SETUTITSBUS[1], SLAICEPS[1] )
+        copy.gsub!( SETUTITSBUS[2], SLAICEPS[2] )
+        copy.gsub!( SETUTITSBUS[3], SLAICEPS[3] )
+        copy.gsub!( SETUTITSBUS[4], SLAICEPS[4] )
+        copy.gsub!( /&#0*((?:\d+)|(?:x[a-f0-9]+));/ ) {|m|
+          m=$1
+          #m='0' if m==''
+          m = "0#{m}" if m[0] == ?x
+          [Integer(m)].pack('U*')
+        }
+      end
+      copy
+    end
+
+    EREFERENCE = /&(?!#{Entity::NAME};)/
+    # Escapes all possible entities
+    def Text::normalize( input, doctype=nil, entity_filter=nil )
+      copy = input
+      # Doing it like this rather than in a loop improves the speed
+      #copy = copy.gsub( EREFERENCE, '&amp;' )
+      copy = copy.gsub( "&", "&amp;" )
+      if doctype
+        # Replace all ampersands that aren't part of an entity
+        doctype.entities.each_value do |entity|
+          copy = copy.gsub( entity.value, 
+            "&#{entity.name};" ) if entity.value and 
+              not( entity_filter and entity_filter.include?(entity) )
+        end
+      else
+        # Replace all ampersands that aren't part of an entity
+        DocType::DEFAULT_ENTITIES.each_value do |entity|
+          copy = copy.gsub(entity.value, "&#{entity.name};" )
+        end
+      end
+      copy
+    end
+
+    # Unescapes all possible entities
+    def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil )
+      rv = string.clone
+      rv.gsub!( /\r\n?/, "\n" )
+      matches = rv.scan( REFERENCE )
+      return rv if matches.size == 0
+      rv.gsub!( NUMERICENTITY ) {|m|
+        m=$1
+        m = "0#{m}" if m[0] == ?x
+        [Integer(m)].pack('U*')
+      }
+      matches.collect!{|x|x[0]}.compact!
+      if matches.size > 0
+        if doctype
+          matches.each do |entity_reference|
+            unless filter and filter.include?(entity_reference)
+              entity_value = doctype.entity( entity_reference )
+              re = /&#{entity_reference};/
+              rv.gsub!( re, entity_value ) if entity_value
+            end
+          end
+        else
+          matches.each do |entity_reference|
+            unless filter and filter.include?(entity_reference)
+              entity_value = DocType::DEFAULT_ENTITIES[ entity_reference ]
+              re = /&#{entity_reference};/
+              rv.gsub!( re, entity_value.value ) if entity_value
+            end
+          end
+        end
+        rv.gsub!( /&amp;/, '&' )
+      end
+      rv
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/validation/relaxng.rb b/ruby_1_8_6/lib/rexml/validation/relaxng.rb
new file mode 100644
index 0000000000..969f51bc95
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/validation/relaxng.rb
@@ -0,0 +1,559 @@
+require "rexml/validation/validation"
+require "rexml/parsers/baseparser"
+
+module REXML
+  module Validation
+    # Implemented:
+    # * empty
+    # * element
+    # * attribute
+    # * text
+    # * optional
+    # * choice
+    # * oneOrMore
+    # * zeroOrMore
+    # * group
+    # * value
+    # * interleave
+    # * mixed
+    # * ref
+    # * grammar
+    # * start
+    # * define
+    #
+    # Not implemented:
+    # * data
+    # * param
+    # * include
+    # * externalRef
+    # * notAllowed
+    # * anyName
+    # * nsName
+    # * except
+    # * name
+    class RelaxNG
+      include Validator
+
+      INFINITY = 1.0 / 0.0
+      EMPTY = Event.new( nil )
+      TEXT = [:start_element, "text"]
+      attr_accessor :current
+      attr_accessor :count
+      attr_reader :references
+
+      # FIXME: Namespaces
+      def initialize source
+        parser = REXML::Parsers::BaseParser.new( source )
+
+        @count = 0
+        @references = {}
+        @root = @current = Sequence.new(self)
+        @root.previous = true
+        states = [ @current ]
+        begin
+          event = parser.pull
+          case event[0]
+          when :start_element
+            case event[1]
+            when "empty"
+            when "element", "attribute", "text", "value"
+              states[-1] << event
+            when "optional"
+              states << Optional.new( self )
+              states[-2] << states[-1]
+            when "choice"
+              states << Choice.new( self )
+              states[-2] << states[-1]
+            when "oneOrMore"
+              states << OneOrMore.new( self )
+              states[-2] << states[-1]
+            when "zeroOrMore"
+              states << ZeroOrMore.new( self )
+              states[-2] << states[-1]
+            when "group"
+              states << Sequence.new( self )
+              states[-2] << states[-1]
+            when "interleave"
+              states << Interleave.new( self )
+              states[-2] << states[-1]
+            when "mixed"
+              states << Interleave.new( self )
+              states[-2] << states[-1]
+              states[-1] << TEXT 
+            when "define"
+              states << [ event[2]["name"] ]
+            when "ref"
+              states[-1] << Ref.new( event[2]["name"] )
+            when "anyName"
+              states << AnyName.new( self )
+              states[-2] << states[-1]
+            when "nsName"
+            when "except"
+            when "name"
+            when "data"
+            when "param"
+            when "include"
+            when "grammar"
+            when "start"
+            when "externalRef"
+            when "notAllowed"
+            end
+          when :end_element
+            case event[1]
+            when "element", "attribute"
+              states[-1] << event
+            when "zeroOrMore", "oneOrMore", "choice", "optional", 
+              "interleave", "group", "mixed"
+              states.pop
+            when "define"
+              ref = states.pop
+              @references[ ref.shift ] = ref
+            #when "empty"
+            end
+          when :end_document
+            states[-1] << event
+          when :text
+            states[-1] << event
+          end
+        end while event[0] != :end_document
+      end
+
+      def receive event
+        validate( event )
+      end
+    end
+
+    class State
+      def initialize( context )
+        @previous = []
+        @events = []
+        @current = 0
+        @count = context.count += 1
+        @references = context.references
+        @value = false
+      end
+
+      def reset
+        return if @current == 0
+        @current = 0
+        @events.each {|s| s.reset if s.kind_of? State }
+      end
+
+      def previous=( previous ) 
+        @previous << previous
+      end
+
+      def next( event )
+        #print "In next with #{event.inspect}.  "
+        #puts "Next (#@current) is #{@events[@current]}"
+        #p @previous
+        return @previous.pop.next( event ) if @events[@current].nil?
+        expand_ref_in( @events, @current ) if @events[@current].class == Ref
+        if ( @events[@current].kind_of? State )
+          @current += 1
+          @events[@current-1].previous = self
+          return @events[@current-1].next( event )
+        end
+        #puts "Current isn't a state"
+        if ( @events[@current].matches?(event) )
+          @current += 1
+          if @events[@current].nil?
+            #puts "#{inspect[0,5]} 1RETURNING #{@previous.inspect[0,5]}"
+            return @previous.pop
+          elsif @events[@current].kind_of? State
+            @current += 1
+            #puts "#{inspect[0,5]} 2RETURNING (#{@current-1}) #{@events[@current-1].inspect[0,5]}; on return, next is #{@events[@current]}"
+            @events[@current-1].previous = self
+            return @events[@current-1]
+          else
+            #puts "#{inspect[0,5]} RETURNING self w/ next(#@current) = #{@events[@current]}"
+            return self
+          end
+        else
+          return nil
+        end
+      end
+
+      def to_s
+        # Abbreviated:
+        self.class.name =~ /(?:::)(\w)\w+$/
+        # Full:
+        #self.class.name =~ /(?:::)(\w+)$/
+        "#$1.#@count"
+      end
+
+      def inspect
+        "< #{to_s} #{@events.collect{|e| 
+          pre = e == @events[@current] ? '#' : ''
+          pre + e.inspect unless self == e
+        }.join(', ')} >"
+      end
+
+      def expected
+        return [@events[@current]]
+      end
+
+      def <<( event )
+        add_event_to_arry( @events, event )
+      end
+
+
+      protected
+      def expand_ref_in( arry, ind )
+        new_events = []
+        @references[ arry[ind].to_s ].each{ |evt| 
+          add_event_to_arry(new_events,evt)
+        }
+        arry[ind,1] = new_events
+      end
+
+      def add_event_to_arry( arry, evt ) 
+        evt = generate_event( evt )
+        if evt.kind_of? String 
+          arry[-1].event_arg = evt if arry[-1].kind_of? Event and @value
+          @value = false
+        else
+          arry << evt
+        end
+      end
+
+      def generate_event( event )
+        return event if event.kind_of? State or event.class == Ref
+        evt = nil
+        arg = nil
+        case event[0]
+        when :start_element
+          case event[1]
+          when "element"
+            evt = :start_element
+            arg = event[2]["name"]
+          when "attribute"
+            evt = :start_attribute
+            arg = event[2]["name"]
+          when "text"
+            evt = :text
+          when "value"
+            evt = :text
+            @value = true
+          end
+        when :text
+          return event[1]
+        when :end_document
+          return Event.new( event[0] )
+        else # then :end_element
+          case event[1]
+          when "element"
+            evt = :end_element
+          when "attribute"
+            evt = :end_attribute
+          end
+        end
+        return Event.new( evt, arg )
+      end
+    end
+
+
+    class Sequence < State
+      def matches?(event)
+        @events[@current].matches?( event )
+      end
+    end
+
+
+    class Optional < State
+      def next( event )
+        if @current == 0
+          rv = super
+          return rv if rv
+          @prior = @previous.pop
+          return @prior.next( event )
+        end
+        super
+      end
+
+      def matches?(event)
+        @events[@current].matches?(event) || 
+        (@current == 0 and @previous[-1].matches?(event))
+      end
+
+      def expected
+        return [ @prior.expected, @events[0] ].flatten if @current == 0
+        return [@events[@current]]
+      end
+    end
+
+
+    class ZeroOrMore < Optional
+      def next( event )
+        expand_ref_in( @events, @current ) if @events[@current].class == Ref
+        if ( @events[@current].matches?(event) )
+          @current += 1
+          if @events[@current].nil?
+            @current = 0
+            return self
+          elsif @events[@current].kind_of? State
+            @current += 1
+            @events[@current-1].previous = self
+            return @events[@current-1]
+          else
+            return self
+          end
+        else
+          @prior = @previous.pop
+          return @prior.next( event ) if @current == 0
+          return nil
+        end
+      end
+
+      def expected
+        return [ @prior.expected, @events[0] ].flatten if @current == 0
+        return [@events[@current]]
+      end
+    end
+
+
+    class OneOrMore < State
+      def initialize context
+        super
+        @ord = 0
+      end
+
+      def reset
+        super 
+        @ord = 0
+      end
+
+      def next( event )
+        expand_ref_in( @events, @current ) if @events[@current].class == Ref
+        if ( @events[@current].matches?(event) )
+          @current += 1
+          @ord += 1
+          if @events[@current].nil?
+            @current = 0
+            return self
+          elsif @events[@current].kind_of? State
+            @current += 1
+            @events[@current-1].previous = self
+            return @events[@current-1]
+          else
+            return self
+          end
+        else
+          return @previous.pop.next( event ) if @current == 0 and @ord > 0
+          return nil
+        end
+      end
+
+      def matches?( event )
+        @events[@current].matches?(event) || 
+        (@current == 0 and @ord > 0 and @previous[-1].matches?(event))
+      end
+
+      def expected
+        if @current == 0 and @ord > 0
+          return [@previous[-1].expected, @events[0]].flatten
+        else
+          return [@events[@current]]
+        end
+      end
+    end
+
+
+    class Choice < State
+      def initialize context
+        super
+        @choices = []
+      end
+
+      def reset
+        super
+        @events = []
+        @choices.each { |c| c.each { |s| s.reset if s.kind_of? State } }
+      end
+
+      def <<( event )
+        add_event_to_arry( @choices, event )
+      end
+
+      def next( event )
+        # Make the choice if we haven't
+        if @events.size == 0
+          c = 0 ; max = @choices.size
+          while c < max
+            if @choices[c][0].class == Ref
+              expand_ref_in( @choices[c], 0 )
+              @choices += @choices[c]
+              @choices.delete( @choices[c] )
+              max -= 1
+            else
+              c += 1
+            end
+          end
+          @events = @choices.find { |evt| evt[0].matches? event }
+          # Remove the references
+          # Find the events
+        end
+        #puts "In next with #{event.inspect}."
+        #puts "events is #{@events.inspect}"
+        unless @events
+          @events = []
+          return nil
+        end
+        #puts "current = #@current"
+        super
+      end
+
+      def matches?( event )
+        return @events[@current].matches?( event ) if @events.size > 0
+        !@choices.find{|evt| evt[0].matches?(event)}.nil?
+      end
+
+      def expected
+        #puts "IN CHOICE EXPECTED"
+        #puts "EVENTS = #{@events.inspect}"
+        return [@events[@current]] if @events.size > 0
+        return @choices.collect do |x| 
+          if x[0].kind_of? State
+            x[0].expected
+          else
+            x[0]
+          end
+        end.flatten
+      end
+
+      def inspect
+        "< #{to_s} #{@choices.collect{|e| e.collect{|f|f.to_s}.join(', ')}.join(' or ')} >"
+      end
+
+      protected
+      def add_event_to_arry( arry, evt ) 
+        if evt.kind_of? State or evt.class == Ref
+          arry << [evt]
+        elsif evt[0] == :text 
+         if arry[-1] and
+            arry[-1][-1].kind_of?( Event ) and 
+            arry[-1][-1].event_type == :text and @value
+
+            arry[-1][-1].event_arg = evt[1]
+            @value = false
+          end
+        else
+          arry << [] if evt[0] == :start_element
+          arry[-1] << generate_event( evt )
+        end
+      end
+    end
+
+
+    class Interleave < Choice
+      def initialize context
+        super
+        @choice = 0
+      end
+
+      def reset
+        @choice = 0
+      end
+
+      def next_current( event )
+        # Expand references
+        c = 0 ; max = @choices.size
+        while c < max
+          if @choices[c][0].class == Ref
+            expand_ref_in( @choices[c], 0 )
+            @choices += @choices[c]
+            @choices.delete( @choices[c] )
+            max -= 1
+          else
+            c += 1
+          end
+        end
+        @events = @choices[@choice..-1].find { |evt| evt[0].matches? event }
+        @current = 0
+        if @events
+          # reorder the choices
+          old = @choices[@choice]
+          idx = @choices.index( @events )
+          @choices[@choice] = @events
+          @choices[idx] = old
+          @choice += 1
+        end
+        
+       #puts "In next with #{event.inspect}."
+       #puts "events is #{@events.inspect}"
+        @events = [] unless @events
+      end
+
+
+      def next( event )
+        # Find the next series
+        next_current(event) unless @events[@current]
+        return nil unless @events[@current]
+
+        expand_ref_in( @events, @current ) if @events[@current].class == Ref 
+       #puts "In next with #{event.inspect}."
+       #puts "Next (#@current) is #{@events[@current]}"
+        if ( @events[@current].kind_of? State )
+          @current += 1
+          @events[@current-1].previous = self
+          return @events[@current-1].next( event )
+        end
+       #puts "Current isn't a state"
+        return @previous.pop.next( event ) if @events[@current].nil?
+        if ( @events[@current].matches?(event) )
+          @current += 1
+          if @events[@current].nil?
+           #puts "#{inspect[0,5]} 1RETURNING self" unless @choices[@choice].nil?
+            return self unless @choices[@choice].nil?
+           #puts "#{inspect[0,5]} 1RETURNING #{@previous[-1].inspect[0,5]}"
+            return @previous.pop
+          elsif @events[@current].kind_of? State
+            @current += 1
+           #puts "#{inspect[0,5]} 2RETURNING (#{@current-1}) #{@events[@current-1].inspect[0,5]}; on return, next is #{@events[@current]}"
+            @events[@current-1].previous = self
+            return @events[@current-1]
+          else
+           #puts "#{inspect[0,5]} RETURNING self w/ next(#@current) = #{@events[@current]}"
+            return self
+          end
+        else
+          return nil
+        end
+      end
+
+      def matches?( event )
+        return @events[@current].matches?( event ) if @events[@current]
+        !@choices[@choice..-1].find{|evt| evt[0].matches?(event)}.nil?
+      end
+
+      def expected
+        #puts "IN CHOICE EXPECTED"
+        #puts "EVENTS = #{@events.inspect}"
+        return [@events[@current]] if @events[@current]
+        return @choices[@choice..-1].collect do |x| 
+          if x[0].kind_of? State
+            x[0].expected
+          else
+            x[0]
+          end
+        end.flatten
+      end
+
+      def inspect
+        "< #{to_s} #{@choices.collect{|e| e.collect{|f|f.to_s}.join(', ')}.join(' and ')} >"
+      end
+    end
+
+    class Ref
+      def initialize value
+        @value = value
+      end
+      def to_s
+        @value
+      end
+      def inspect
+        "{#{to_s}}"
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/validation/validation.rb b/ruby_1_8_6/lib/rexml/validation/validation.rb
new file mode 100644
index 0000000000..160ea96b31
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/validation/validation.rb
@@ -0,0 +1,155 @@
+require 'rexml/validation/validationexception'
+
+module REXML
+  module Validation
+    module Validator
+      NILEVENT = [ nil ]
+      def reset
+        @current = @root
+        @root.reset
+        @root.previous = true
+        @attr_stack = []
+        self
+      end
+      def dump
+        puts @root.inspect
+      end
+      def validate( event ) 
+        #puts "Current: #@current"
+        #puts "Event: #{event.inspect}"
+        @attr_stack = [] unless defined? @attr_stack
+        match = @current.next(event)
+        raise ValidationException.new( "Validation error.  Expected: "+
+          @current.expected.join( " or " )+" from #{@current.inspect} "+
+          " but got #{Event.new( event[0], event[1] ).inspect}" ) unless match
+        @current = match
+
+        # Check for attributes
+        case event[0]
+        when :start_element
+          #puts "Checking attributes"
+          @attr_stack << event[2]
+          begin
+            sattr = [:start_attribute, nil]
+            eattr = [:end_attribute]
+            text = [:text, nil]
+            k,v = event[2].find { |k,v| 
+              sattr[1] = k
+              #puts "Looking for #{sattr.inspect}"
+              m = @current.next( sattr )
+              #puts "Got #{m.inspect}"
+              if m 
+                # If the state has text children...
+                #puts "Looking for #{eattr.inspect}"
+                #puts "Expect #{m.expected}"
+                if m.matches?( eattr )
+                  #puts "Got end"
+                  @current = m
+                else
+                  #puts "Didn't get end"
+                  text[1] = v
+                  #puts "Looking for #{text.inspect}"
+                  m = m.next( text )
+                  #puts "Got #{m.inspect}"
+                  text[1] = nil
+                  return false unless m
+                  @current = m if m
+                end
+                m = @current.next( eattr )
+                if m
+                  @current = m
+                  true
+                else
+                  false
+                end
+              else
+                false
+              end
+            }
+            event[2].delete(k) if k
+          end while k
+        when :end_element
+          attrs = @attr_stack.pop
+          raise ValidationException.new( "Validation error.  Illegal "+
+            " attributes: #{attrs.inspect}") if attrs.length > 0
+        end
+      end
+    end
+
+    class Event
+      def initialize(event_type, event_arg=nil )
+        @event_type = event_type
+        @event_arg = event_arg
+      end
+
+      attr_reader :event_type
+      attr_accessor :event_arg
+
+      def done?
+        @done
+      end
+
+      def single?
+        return (@event_type != :start_element and @event_type != :start_attribute)
+      end
+
+      def matches?( event )
+        #puts "#@event_type =? #{event[0]} && #@event_arg =? #{event[1]} "
+        return false unless event[0] == @event_type
+        case event[0]
+        when nil
+          return true
+        when :start_element
+          return true if event[1] == @event_arg
+        when :end_element
+          return true
+        when :start_attribute
+          return true if event[1] == @event_arg
+        when :end_attribute
+          return true
+        when :end_document
+          return true
+        when :text
+          return (@event_arg.nil? or @event_arg == event[1])
+=begin
+        when :processing_instruction
+          false
+        when :xmldecl
+          false
+        when :start_doctype
+          false
+        when :end_doctype
+          false
+        when :externalentity
+          false
+        when :elementdecl
+          false
+        when :entity
+          false
+        when :attlistdecl
+          false
+        when :notationdecl
+          false
+        when :end_doctype
+          false
+=end
+        else
+          false
+        end
+      end
+
+      def ==( other )
+        return false unless other.kind_of? Event
+        @event_type == other.event_type and @event_arg == other.event_arg
+      end
+
+      def to_s
+        inspect
+      end
+
+      def inspect
+        "#{@event_type.inspect}( #@event_arg )"
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/validation/validationexception.rb b/ruby_1_8_6/lib/rexml/validation/validationexception.rb
new file mode 100644
index 0000000000..4723d9e4d3
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/validation/validationexception.rb
@@ -0,0 +1,9 @@
+module REXML
+  module Validation
+    class ValidationException < RuntimeError
+      def initialize msg
+        super
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rexml/xmldecl.rb b/ruby_1_8_6/lib/rexml/xmldecl.rb
new file mode 100644
index 0000000000..427eb78cf8
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/xmldecl.rb
@@ -0,0 +1,119 @@
+require 'rexml/encoding'
+require 'rexml/source'
+
+module REXML
+	# NEEDS DOCUMENTATION
+	class XMLDecl < Child
+		include Encoding
+
+		DEFAULT_VERSION = "1.0";
+		DEFAULT_ENCODING = "UTF-8";
+		DEFAULT_STANDALONE = "no";
+		START = '<\?xml';
+		STOP = '\?>';
+
+		attr_accessor :version, :standalone
+    attr_reader :writeencoding, :writethis
+
+		def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil)
+      @writethis = true
+      @writeencoding = !encoding.nil?
+			if version.kind_of? XMLDecl
+				super()
+				@version = version.version
+				self.encoding = version.encoding
+        @writeencoding = version.writeencoding
+				@standalone = version.standalone
+			else
+				super()
+				@version = version
+				self.encoding = encoding
+				@standalone = standalone
+			end
+			@version = DEFAULT_VERSION if @version.nil?
+		end
+
+		def clone
+			XMLDecl.new(self)
+		end
+
+    # indent::
+    #   Ignored.  There must be no whitespace before an XML declaration
+    # transitive::
+    #   Ignored
+    # ie_hack::
+    #   Ignored
+		def write(writer, indent=-1, transitive=false, ie_hack=false)
+      return nil unless @writethis or writer.kind_of? Output
+			writer << START.sub(/\\/u, '')
+      if writer.kind_of? Output
+        writer << " #{content writer.encoding}"
+      else
+        writer << " #{content encoding}"
+      end
+			writer << STOP.sub(/\\/u, '')
+		end
+
+		def ==( other )
+		  other.kind_of?(XMLDecl) and
+		  other.version == @version and
+		  other.encoding == self.encoding and
+		  other.standalone == @standalone
+		end
+
+		def xmldecl version, encoding, standalone
+			@version = version
+			self.encoding = encoding
+			@standalone = standalone
+		end
+
+		def node_type
+			:xmldecl
+		end
+
+		alias :stand_alone? :standalone
+    alias :old_enc= :encoding=
+
+    def encoding=( enc )
+      if enc.nil?
+        self.old_enc = "UTF-8"
+        @writeencoding = false
+      else
+        self.old_enc = enc
+        @writeencoding = true
+      end
+      self.dowrite
+    end
+
+    # Only use this if you do not want the XML declaration to be written;
+    # this object is ignored by the XML writer.  Otherwise, instantiate your
+    # own XMLDecl and add it to the document.
+    #
+    # Note that XML 1.1 documents *must* include an XML declaration
+    def XMLDecl.default
+      rv = XMLDecl.new( "1.0" )
+      rv.nowrite
+      rv
+    end
+
+    def nowrite
+      @writethis = false
+    end
+
+    def dowrite
+      @writethis = true
+    end
+
+    def inspect
+      START.sub(/\\/u, '') + " ... " + STOP.sub(/\\/u, '')
+    end
+
+		private
+		def content(enc)
+			rv = "version='#@version'"
+			rv << " encoding='#{enc}'" if @writeencoding || enc !~ /utf-8/i
+			rv << " standalone='#@standalone'" if @standalone
+			rv
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/xmltokens.rb b/ruby_1_8_6/lib/rexml/xmltokens.rb
new file mode 100644
index 0000000000..6bbe5b07d5
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/xmltokens.rb
@@ -0,0 +1,18 @@
+module REXML
+	# Defines a number of tokens used for parsing XML.  Not for general
+	# consumption.
+	module XMLTokens
+		NCNAME_STR= '[\w:][\-\w\d.]*'
+		NAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
+
+		NAMECHAR = '[\-\w\d\.:]'
+		NAME = "([\\w:]#{NAMECHAR}*)"
+		NMTOKEN = "(?:#{NAMECHAR})+"
+		NMTOKENS = "#{NMTOKEN}(\\s+#{NMTOKEN})*"
+		REFERENCE = "(?:&#{NAME};|&#\\d+;|&#x[0-9a-fA-F]+;)"
+
+		#REFERENCE = "(?:#{ENTITYREF}|#{CHARREF})"
+		#ENTITYREF = "&#{NAME};"
+		#CHARREF = "&#\\d+;|&#x[0-9a-fA-F]+;"
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/xpath.rb b/ruby_1_8_6/lib/rexml/xpath.rb
new file mode 100644
index 0000000000..939399e283
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/xpath.rb
@@ -0,0 +1,66 @@
+require 'rexml/functions'
+require 'rexml/xpath_parser'
+
+module REXML
+	# Wrapper class.  Use this class to access the XPath functions.
+	class XPath
+		include Functions
+		EMPTY_HASH = {}
+
+		# Finds and returns the first node that matches the supplied xpath.
+		# element::
+		# 	The context element
+		# path::
+		# 	The xpath to search for.  If not supplied or nil, returns the first
+		# 	node matching '*'.
+		# namespaces::
+		# 	If supplied, a Hash which defines a namespace mapping.
+		#
+		#  XPath.first( node )
+		#  XPath.first( doc, "//b"} )
+		#  XPath.first( node, "a/x:b", { "x"=>"http://doofus" } )
+    def XPath::first element, path=nil, namespaces=nil, variables={}
+      raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash)
+      raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash)
+			parser = XPathParser.new
+			parser.namespaces = namespaces
+			parser.variables = variables
+			path = "*" unless path
+			element = [element] unless element.kind_of? Array
+			parser.parse(path, element).flatten[0]
+		end
+
+		# Itterates over nodes that match the given path, calling the supplied
+		# block with the match.
+		# element::
+		#   The context element
+		# path::
+		#   The xpath to search for.  If not supplied or nil, defaults to '*'
+		# namespaces::
+		# 	If supplied, a Hash which defines a namespace mapping
+		#
+		#  XPath.each( node ) { |el| ... }
+		#  XPath.each( node, '/*[@attr='v']' ) { |el| ... }
+		#  XPath.each( node, 'ancestor::x' ) { |el| ... }
+		def XPath::each element, path=nil, namespaces=nil, variables={}, &block
+      raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.nil? or namespaces.kind_of?(Hash)
+      raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of?(Hash)
+			parser = XPathParser.new
+			parser.namespaces = namespaces
+			parser.variables = variables
+			path = "*" unless path
+			element = [element] unless element.kind_of? Array
+			parser.parse(path, element).each( &block )
+		end
+
+		# Returns an array of nodes matching a given XPath.  
+		def XPath::match element, path=nil, namespaces=nil, variables={}
+			parser = XPathParser.new
+			parser.namespaces = namespaces
+			parser.variables = variables
+			path = "*" unless path
+			element = [element] unless element.kind_of? Array
+			parser.parse(path,element)
+		end
+	end
+end
diff --git a/ruby_1_8_6/lib/rexml/xpath_parser.rb b/ruby_1_8_6/lib/rexml/xpath_parser.rb
new file mode 100644
index 0000000000..eb608fdb34
--- /dev/null
+++ b/ruby_1_8_6/lib/rexml/xpath_parser.rb
@@ -0,0 +1,792 @@
+require 'rexml/namespace'
+require 'rexml/xmltokens'
+require 'rexml/attribute'
+require 'rexml/syncenumerator'
+require 'rexml/parsers/xpathparser'
+
+class Object
+  def dclone
+    clone
+  end
+end
+class Symbol
+  def dclone ; self ; end
+end
+class Fixnum
+  def dclone ; self ; end
+end
+class Float
+  def dclone ; self ; end
+end
+class Array
+  def dclone
+    klone = self.clone
+    klone.clear
+    self.each{|v| klone << v.dclone}
+    klone
+  end
+end
+
+module REXML
+  # You don't want to use this class.  Really.  Use XPath, which is a wrapper
+  # for this class.  Believe me.  You don't want to poke around in here.
+  # There is strange, dark magic at work in this code.  Beware.  Go back!  Go
+  # back while you still can!
+  class XPathParser
+    include XMLTokens
+    LITERAL    = /^'([^']*)'|^"([^"]*)"/u
+
+    def initialize( )
+      @parser = REXML::Parsers::XPathParser.new
+      @namespaces = nil
+      @variables = {}
+    end
+
+    def namespaces=( namespaces={} )
+      Functions::namespace_context = namespaces
+      @namespaces = namespaces
+    end
+
+    def variables=( vars={} )
+      Functions::variables = vars
+      @variables = vars
+    end
+
+    def parse path, nodeset
+     #puts "#"*40
+     path_stack = @parser.parse( path )
+     #puts "PARSE: #{path} => #{path_stack.inspect}"
+     #puts "PARSE: nodeset = #{nodeset.inspect}"
+     match( path_stack, nodeset )
+    end
+
+    def get_first path, nodeset
+     #puts "#"*40
+     path_stack = @parser.parse( path )
+     #puts "PARSE: #{path} => #{path_stack.inspect}"
+     #puts "PARSE: nodeset = #{nodeset.inspect}"
+     first( path_stack, nodeset )
+    end
+
+    def predicate path, nodeset
+      path_stack = @parser.parse( path )
+      expr( path_stack, nodeset )
+    end
+
+    def []=( variable_name, value )
+      @variables[ variable_name ] = value
+    end
+
+
+    # Performs a depth-first (document order) XPath search, and returns the
+    # first match.  This is the fastest, lightest way to return a single result.
+    #
+    # FIXME: This method is incomplete!
+    def first( path_stack, node )
+      #puts "#{depth}) Entering match( #{path.inspect}, #{tree.inspect} )"
+      return nil if path.size == 0
+
+      case path[0]
+      when :document
+        # do nothing 
+        return first( path[1..-1], node )
+      when :child
+        for c in node.children
+          #puts "#{depth}) CHILD checking #{name(c)}"
+          r = first( path[1..-1], c )
+          #puts "#{depth}) RETURNING #{r.inspect}" if r
+          return r if r
+        end
+      when :qname
+        name = path[2]
+        #puts "#{depth}) QNAME #{name(tree)} == #{name} (path => #{path.size})"
+        if node.name == name
+          #puts "#{depth}) RETURNING #{tree.inspect}" if path.size == 3
+          return node if path.size == 3
+          return first( path[3..-1], node )
+        else
+          return nil
+        end
+      when :descendant_or_self
+        r = first( path[1..-1], node )
+        return r if r
+        for c in node.children
+          r = first( path, c )
+          return r if r
+        end
+      when :node
+        return first( path[1..-1], node )
+      when :any
+        return first( path[1..-1], node )
+      end
+      return nil
+    end
+
+
+    def match( path_stack, nodeset ) 
+      #puts "MATCH: path_stack = #{path_stack.inspect}"
+      #puts "MATCH: nodeset = #{nodeset.inspect}"
+      r = expr( path_stack, nodeset )
+      #puts "MAIN EXPR => #{r.inspect}"
+      r
+    end
+
+    private
+
+
+    # Returns a String namespace for a node, given a prefix
+    # The rules are:
+    # 
+    #  1. Use the supplied namespace mapping first.
+    #  2. If no mapping was supplied, use the context node to look up the namespace
+    def get_namespace( node, prefix )
+      if @namespaces
+        return @namespaces[prefix] || ''
+      else
+        return node.namespace( prefix ) if node.node_type == :element
+        return ''
+      end
+    end
+
+
+    # Expr takes a stack of path elements and a set of nodes (either a Parent
+    # or an Array and returns an Array of matching nodes
+    ALL = [ :attribute, :element, :text, :processing_instruction, :comment ]
+    ELEMENTS = [ :element ]
+    def expr( path_stack, nodeset, context=nil )
+      #puts "#"*15
+      #puts "In expr with #{path_stack.inspect}"
+      #puts "Returning" if path_stack.length == 0 || nodeset.length == 0
+      node_types = ELEMENTS
+      return nodeset if path_stack.length == 0 || nodeset.length == 0
+      while path_stack.length > 0
+        #puts "#"*5
+        #puts "Path stack = #{path_stack.inspect}"
+        #puts "Nodeset is #{nodeset.inspect}"
+        if nodeset.length == 0
+          path_stack.clear
+          return []
+        end
+        case (op = path_stack.shift)
+        when :document
+          nodeset = [ nodeset[0].root_node ]
+          #puts ":document, nodeset = #{nodeset.inspect}"
+
+        when :qname
+          #puts "IN QNAME"
+          prefix = path_stack.shift
+          name = path_stack.shift
+          nodeset.delete_if do |node|
+            # FIXME: This DOUBLES the time XPath searches take
+            ns = get_namespace( node, prefix )
+            #puts "NS = #{ns.inspect}"
+            #puts "node.node_type == :element => #{node.node_type == :element}"
+            if node.node_type == :element
+              #puts "node.name == #{name} => #{node.name == name}"
+              if node.name == name
+                #puts "node.namespace == #{ns.inspect} => #{node.namespace == ns}"
+              end
+            end
+            !(node.node_type == :element and 
+              node.name == name and 
+              node.namespace == ns )
+          end
+          node_types = ELEMENTS
+
+        when :any
+          #puts "ANY 1: nodeset = #{nodeset.inspect}"
+          #puts "ANY 1: node_types = #{node_types.inspect}"
+          nodeset.delete_if { |node| !node_types.include?(node.node_type) }
+          #puts "ANY 2: nodeset = #{nodeset.inspect}"
+
+        when :self
+          # This space left intentionally blank
+
+        when :processing_instruction
+          target = path_stack.shift
+          nodeset.delete_if do |node|
+            (node.node_type != :processing_instruction) or 
+            ( target!='' and ( node.target != target ) )
+          end
+
+        when :text
+          nodeset.delete_if { |node| node.node_type != :text }
+
+        when :comment
+          nodeset.delete_if { |node| node.node_type != :comment }
+
+        when :node
+          # This space left intentionally blank
+          node_types = ALL
+
+        when :child
+          new_nodeset = []
+          nt = nil
+          for node in nodeset
+            nt = node.node_type
+            new_nodeset += node.children if nt == :element or nt == :document
+          end
+          nodeset = new_nodeset
+          node_types = ELEMENTS
+
+        when :literal
+          return path_stack.shift
+        
+        when :attribute
+          new_nodeset = []
+          case path_stack.shift
+          when :qname
+            prefix = path_stack.shift
+            name = path_stack.shift
+            for element in nodeset
+              if element.node_type == :element
+                #puts "Element name = #{element.name}"
+                #puts "get_namespace( #{element.inspect}, #{prefix} ) = #{get_namespace(element, prefix)}"
+                attrib = element.attribute( name, get_namespace(element, prefix) )
+                #puts "attrib = #{attrib.inspect}"
+                new_nodeset << attrib if attrib
+              end
+            end
+          when :any
+            #puts "ANY"
+            for element in nodeset
+              if element.node_type == :element
+                new_nodeset += element.attributes.to_a
+              end
+            end
+          end
+          nodeset = new_nodeset
+
+        when :parent
+          #puts "PARENT 1: nodeset = #{nodeset}"
+          nodeset = nodeset.collect{|n| n.parent}.compact
+          #nodeset = expr(path_stack.dclone, nodeset.collect{|n| n.parent}.compact)
+          #puts "PARENT 2: nodeset = #{nodeset.inspect}"
+          node_types = ELEMENTS
+
+        when :ancestor
+          new_nodeset = []
+          for node in nodeset
+            while node.parent
+              node = node.parent
+              new_nodeset << node unless new_nodeset.include? node
+            end
+          end
+          nodeset = new_nodeset
+          node_types = ELEMENTS
+
+        when :ancestor_or_self
+          new_nodeset = []
+          for node in nodeset
+            if node.node_type == :element
+              new_nodeset << node
+              while ( node.parent )
+                node = node.parent
+                new_nodeset << node unless new_nodeset.include? node
+              end
+            end
+          end
+          nodeset = new_nodeset
+          node_types = ELEMENTS
+
+        when :predicate
+          new_nodeset = []
+          subcontext = { :size => nodeset.size }
+          pred = path_stack.shift
+          nodeset.each_with_index { |node, index|
+            subcontext[ :node ] = node
+            #puts "PREDICATE SETTING CONTEXT INDEX TO #{index+1}"
+            subcontext[ :index ] = index+1
+            pc = pred.dclone
+            #puts "#{node.hash}) Recursing with #{pred.inspect} and [#{node.inspect}]"
+            result = expr( pc, [node], subcontext )
+            result = result[0] if result.kind_of? Array and result.length == 1
+            #puts "#{node.hash}) Result = #{result.inspect} (#{result.class.name})"
+            if result.kind_of? Numeric
+              #puts "Adding node #{node.inspect}" if result == (index+1)
+              new_nodeset << node if result == (index+1)
+            elsif result.instance_of? Array
+              if result.size > 0 and result.inject(false) {|k,s| s or k}
+                #puts "Adding node #{node.inspect}" if result.size > 0
+                new_nodeset << node if result.size > 0
+              end
+            else
+              #puts "Adding node #{node.inspect}" if result
+              new_nodeset << node if result
+            end
+          }
+          #puts "New nodeset = #{new_nodeset.inspect}"
+          #puts "Path_stack  = #{path_stack.inspect}"
+          nodeset = new_nodeset
+=begin
+          predicate = path_stack.shift
+          ns = nodeset.clone
+          result = expr( predicate, ns )
+          #puts "Result = #{result.inspect} (#{result.class.name})"
+          #puts "nodeset = #{nodeset.inspect}"
+          if result.kind_of? Array
+            nodeset = result.zip(ns).collect{|m,n| n if m}.compact
+          else
+            nodeset = result ? nodeset : []
+          end
+          #puts "Outgoing NS = #{nodeset.inspect}"
+=end
+
+        when :descendant_or_self
+          rv = descendant_or_self( path_stack, nodeset )
+          path_stack.clear
+          nodeset = rv
+          node_types = ELEMENTS
+
+        when :descendant
+          results = []
+          nt = nil
+          for node in nodeset
+            nt = node.node_type
+            results += expr( path_stack.dclone.unshift( :descendant_or_self ),
+              node.children ) if nt == :element or nt == :document
+          end
+          nodeset = results
+          node_types = ELEMENTS
+
+        when :following_sibling
+          #puts "FOLLOWING_SIBLING 1: nodeset = #{nodeset}"
+          results = []
+          nodeset.each do |node|
+            next if node.parent.nil?
+            all_siblings = node.parent.children
+            current_index = all_siblings.index( node )
+            following_siblings = all_siblings[ current_index+1 .. -1 ]
+            results += expr( path_stack.dclone, following_siblings )
+          end
+          #puts "FOLLOWING_SIBLING 2: nodeset = #{nodeset}"
+          nodeset = results
+
+        when :preceding_sibling
+          results = []
+          nodeset.each do |node|
+            next if node.parent.nil?
+            all_siblings = node.parent.children
+            current_index = all_siblings.index( node )
+            preceding_siblings = all_siblings[ 0, current_index ].reverse
+            results += preceding_siblings
+          end
+          nodeset = results
+          node_types = ELEMENTS
+
+        when :preceding
+          new_nodeset = []
+          for node in nodeset
+            new_nodeset += preceding( node )
+          end
+          #puts "NEW NODESET => #{new_nodeset.inspect}"
+          nodeset = new_nodeset
+          node_types = ELEMENTS
+
+        when :following
+          new_nodeset = []
+          for node in nodeset
+            new_nodeset += following( node )
+          end
+          nodeset = new_nodeset
+          node_types = ELEMENTS
+
+        when :namespace
+          #puts "In :namespace"
+          new_nodeset = []
+          prefix = path_stack.shift
+          for node in nodeset
+            if (node.node_type == :element or node.node_type == :attribute)
+              if @namespaces
+                namespaces = @namespaces
+              elsif (node.node_type == :element)
+                namespaces = node.namespaces
+              else
+                namespaces = node.element.namesapces
+              end
+              #puts "Namespaces = #{namespaces.inspect}"
+              #puts "Prefix = #{prefix.inspect}"
+              #puts "Node.namespace = #{node.namespace}"
+              if (node.namespace == namespaces[prefix])
+                new_nodeset << node
+              end
+            end
+          end
+          nodeset = new_nodeset
+
+        when :variable
+          var_name = path_stack.shift
+          return @variables[ var_name ]
+
+        # :and, :or, :eq, :neq, :lt, :lteq, :gt, :gteq
+				# TODO: Special case for :or and :and -- not evaluate the right
+				# operand if the left alone determines result (i.e. is true for
+				# :or and false for :and).
+        when :eq, :neq, :lt, :lteq, :gt, :gteq, :and, :or
+          left = expr( path_stack.shift, nodeset.dup, context )
+          #puts "LEFT => #{left.inspect} (#{left.class.name})"
+          right = expr( path_stack.shift, nodeset.dup, context )
+          #puts "RIGHT => #{right.inspect} (#{right.class.name})"
+          res = equality_relational_compare( left, op, right )
+          #puts "RES => #{res.inspect}"
+          return res
+
+        when :and
+          left = expr( path_stack.shift, nodeset.dup, context )
+          #puts "LEFT => #{left.inspect} (#{left.class.name})"
+          if left == false || left.nil? || !left.inject(false) {|a,b| a | b}
+            return []
+          end
+          right = expr( path_stack.shift, nodeset.dup, context )
+          #puts "RIGHT => #{right.inspect} (#{right.class.name})"
+          res = equality_relational_compare( left, op, right )
+          #puts "RES => #{res.inspect}"
+          return res
+
+        when :div
+          left = Functions::number(expr(path_stack.shift, nodeset, context)).to_f
+          right = Functions::number(expr(path_stack.shift, nodeset, context)).to_f
+          return (left / right)
+
+        when :mod
+          left = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          right = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          return (left % right)
+
+        when :mult
+          left = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          right = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          return (left * right)
+
+        when :plus
+          left = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          right = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          return (left + right)
+
+        when :minus
+          left = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          right = Functions::number(expr(path_stack.shift, nodeset, context )).to_f
+          return (left - right)
+
+        when :union
+          left = expr( path_stack.shift, nodeset, context )
+          right = expr( path_stack.shift, nodeset, context )
+          return (left | right)
+
+        when :neg
+          res = expr( path_stack, nodeset, context )
+          return -(res.to_f)
+
+        when :not
+        when :function
+          func_name = path_stack.shift.tr('-','_')
+          arguments = path_stack.shift
+          #puts "FUNCTION 0: #{func_name}(#{arguments.collect{|a|a.inspect}.join(', ')})" 
+          subcontext = context ? nil : { :size => nodeset.size }
+
+          res = []
+          cont = context
+          nodeset.each_with_index { |n, i| 
+            if subcontext
+              subcontext[:node]  = n
+              subcontext[:index] = i
+              cont = subcontext
+            end
+            arg_clone = arguments.dclone
+            args = arg_clone.collect { |arg| 
+              #puts "FUNCTION 1: Calling expr( #{arg.inspect}, [#{n.inspect}] )"
+              expr( arg, [n], cont ) 
+            }
+            #puts "FUNCTION 2: #{func_name}(#{args.collect{|a|a.inspect}.join(', ')})" 
+            Functions.context = cont
+            res << Functions.send( func_name, *args )
+            #puts "FUNCTION 3: #{res[-1].inspect}"
+          }
+          return res
+
+        end
+      end # while
+      #puts "EXPR returning #{nodeset.inspect}"
+      return nodeset
+    end
+
+
+    ##########################################################
+    # FIXME
+    # The next two methods are BAD MOJO!
+    # This is my achilles heel.  If anybody thinks of a better
+    # way of doing this, be my guest.  This really sucks, but 
+    # it is a wonder it works at all.
+    # ########################################################
+    
+    def descendant_or_self( path_stack, nodeset )
+      rs = []
+      #puts "#"*80
+      #puts "PATH_STACK = #{path_stack.inspect}"
+      #puts "NODESET = #{nodeset.collect{|n|n.inspect}.inspect}"
+      d_o_s( path_stack, nodeset, rs )
+      #puts "RS = #{rs.collect{|n|n.inspect}.inspect}"
+      document_order(rs.flatten.compact)
+      #rs.flatten.compact
+    end
+
+    def d_o_s( p, ns, r )
+      #puts "IN DOS with #{ns.inspect}; ALREADY HAVE #{r.inspect}"
+      nt = nil
+      ns.each_index do |i|
+        n = ns[i]
+        #puts "P => #{p.inspect}"
+        x = expr( p.dclone, [ n ] )
+        nt = n.node_type
+        d_o_s( p, n.children, x ) if nt == :element or nt == :document and n.children.size > 0
+        r.concat(x) if x.size > 0
+      end
+    end
+
+
+    # Reorders an array of nodes so that they are in document order
+    # It tries to do this efficiently.
+    #
+    # FIXME: I need to get rid of this, but the issue is that most of the XPath 
+    # interpreter functions as a filter, which means that we lose context going
+    # in and out of function calls.  If I knew what the index of the nodes was,
+    # I wouldn't have to do this.  Maybe add a document IDX for each node?
+    # Problems with mutable documents.  Or, rewrite everything.
+    def document_order( array_of_nodes )
+      new_arry = []
+      array_of_nodes.each { |node|
+        node_idx = [] 
+        np = node.node_type == :attribute ? node.element : node
+        while np.parent and np.parent.node_type == :element
+          node_idx << np.parent.index( np )
+          np = np.parent
+        end
+        new_arry << [ node_idx.reverse, node ]
+      }
+      #puts "new_arry = #{new_arry.inspect}"
+      new_arry.sort{ |s1, s2| s1[0] <=> s2[0] }.collect{ |s| s[1] }
+    end
+
+
+    def recurse( nodeset, &block )
+      for node in nodeset
+        yield node
+        recurse( node, &block ) if node.node_type == :element
+      end
+    end
+
+
+
+    # Builds a nodeset of all of the preceding nodes of the supplied node,
+    # in reverse document order
+    # preceding:: includes every element in the document that precedes this node, 
+    # except for ancestors
+    def preceding( node )
+      #puts "IN PRECEDING"
+      ancestors = []
+      p = node.parent
+      while p
+        ancestors << p
+        p = p.parent
+      end
+
+      acc = []
+      p = preceding_node_of( node )
+      #puts "P = #{p.inspect}"
+      while p
+        if ancestors.include? p
+          ancestors.delete(p)
+        else
+          acc << p
+        end
+        p = preceding_node_of( p )
+        #puts "P = #{p.inspect}"
+      end
+      acc
+    end
+
+    def preceding_node_of( node )
+     #puts "NODE: #{node.inspect}"
+     #puts "PREVIOUS NODE: #{node.previous_sibling_node.inspect}"
+     #puts "PARENT NODE: #{node.parent}"
+      psn = node.previous_sibling_node 
+      if psn.nil?
+        if node.parent.nil? or node.parent.class == Document 
+          return nil
+        end
+        return node.parent
+        #psn = preceding_node_of( node.parent )
+      end
+      while psn and psn.kind_of? Element and psn.children.size > 0
+        psn = psn.children[-1]
+      end
+      psn
+    end
+
+    def following( node )
+      #puts "IN PRECEDING"
+      acc = []
+      p = next_sibling_node( node )
+      #puts "P = #{p.inspect}"
+      while p
+        acc << p
+        p = following_node_of( p )
+        #puts "P = #{p.inspect}"
+      end
+      acc
+    end
+
+    def following_node_of( node )
+      #puts "NODE: #{node.inspect}"
+      #puts "PREVIOUS NODE: #{node.previous_sibling_node.inspect}"
+      #puts "PARENT NODE: #{node.parent}"
+      if node.kind_of? Element and node.children.size > 0
+        return node.children[0]
+      end
+      return next_sibling_node(node)
+    end
+
+    def next_sibling_node(node)
+      psn = node.next_sibling_node 
+      while psn.nil?
+        if node.parent.nil? or node.parent.class == Document 
+          return nil
+        end
+        node = node.parent
+        psn = node.next_sibling_node
+        #puts "psn = #{psn.inspect}"
+      end
+      return psn
+    end
+
+    def norm b
+      case b
+      when true, false
+        return b
+      when 'true', 'false'
+        return Functions::boolean( b )
+      when /^\d+(\.\d+)?$/
+        return Functions::number( b )
+      else
+        return Functions::string( b )
+      end
+    end
+
+    def equality_relational_compare( set1, op, set2 )
+      #puts "EQ_REL_COMP(#{set1.inspect} #{op.inspect} #{set2.inspect})"
+      if set1.kind_of? Array and set2.kind_of? Array
+			  #puts "#{set1.size} & #{set2.size}"
+        if set1.size == 1 and set2.size == 1
+          set1 = set1[0]
+          set2 = set2[0]
+        elsif set1.size == 0 or set2.size == 0
+          nd = set1.size==0 ? set2 : set1
+          rv = nd.collect { |il| compare( il, op, nil ) }
+          #puts "RV = #{rv.inspect}"
+          return rv
+        else
+          res = []
+          enum = SyncEnumerator.new( set1, set2 ).each { |i1, i2|
+            #puts "i1 = #{i1.inspect} (#{i1.class.name})"
+            #puts "i2 = #{i2.inspect} (#{i2.class.name})"
+            i1 = norm( i1 )
+            i2 = norm( i2 )
+            res << compare( i1, op, i2 )
+          }
+          return res
+        end
+      end
+		  #puts "EQ_REL_COMP: #{set1.inspect} (#{set1.class.name}), #{op}, #{set2.inspect} (#{set2.class.name})"
+      #puts "COMPARING VALUES"
+      # If one is nodeset and other is number, compare number to each item
+      # in nodeset s.t. number op number(string(item))
+      # If one is nodeset and other is string, compare string to each item
+      # in nodeset s.t. string op string(item)
+      # If one is nodeset and other is boolean, compare boolean to each item
+      # in nodeset s.t. boolean op boolean(item)
+      if set1.kind_of? Array or set2.kind_of? Array
+			  #puts "ISA ARRAY"
+        if set1.kind_of? Array
+          a = set1
+          b = set2
+        else
+          a = set2
+          b = set1
+        end
+
+        case b
+        when true, false
+          return a.collect {|v| compare( Functions::boolean(v), op, b ) }
+        when Numeric
+          return a.collect {|v| compare( Functions::number(v), op, b )}
+        when /^\d+(\.\d+)?$/
+          b = Functions::number( b )
+          #puts "B = #{b.inspect}"
+          return a.collect {|v| compare( Functions::number(v), op, b )}
+        else
+				  #puts "Functions::string( #{b}(#{b.class.name}) ) = #{Functions::string(b)}"
+          b = Functions::string( b )
+          return a.collect { |v| compare( Functions::string(v), op, b ) }
+        end
+      else
+        # If neither is nodeset,
+        #   If op is = or !=
+        #     If either boolean, convert to boolean
+        #     If either number, convert to number
+        #     Else, convert to string
+        #   Else
+        #     Convert both to numbers and compare
+        s1 = set1.to_s
+        s2 = set2.to_s
+        #puts "EQ_REL_COMP: #{set1}=>#{s1}, #{set2}=>#{s2}"
+        if s1 == 'true' or s1 == 'false' or s2 == 'true' or s2 == 'false'
+          #puts "Functions::boolean(#{set1})=>#{Functions::boolean(set1)}"
+          #puts "Functions::boolean(#{set2})=>#{Functions::boolean(set2)}"
+          set1 = Functions::boolean( set1 )
+          set2 = Functions::boolean( set2 )
+        else
+          if op == :eq or op == :neq
+            if s1 =~ /^\d+(\.\d+)?$/ or s2 =~ /^\d+(\.\d+)?$/
+              set1 = Functions::number( s1 )
+              set2 = Functions::number( s2 )
+            else
+              set1 = Functions::string( set1 )
+              set2 = Functions::string( set2 )
+            end
+          else
+            set1 = Functions::number( set1 )
+            set2 = Functions::number( set2 )
+          end
+        end
+        #puts "EQ_REL_COMP: #{set1} #{op} #{set2}"
+        #puts ">>> #{compare( set1, op, set2 )}"
+        return compare( set1, op, set2 )
+      end
+      return false
+    end
+
+    def compare a, op, b
+      #puts "COMPARE #{a.inspect}(#{a.class.name}) #{op} #{b.inspect}(#{b.class.name})"
+      case op
+      when :eq
+        a == b
+      when :neq
+        a != b
+      when :lt
+        a < b
+      when :lteq
+        a <= b
+      when :gt
+        a > b
+      when :gteq
+        a >= b
+      when :and
+        a and b
+      when :or
+        a or b
+      else
+        false
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rinda/rinda.rb b/ruby_1_8_6/lib/rinda/rinda.rb
new file mode 100644
index 0000000000..6c59e68654
--- /dev/null
+++ b/ruby_1_8_6/lib/rinda/rinda.rb
@@ -0,0 +1,283 @@
+require 'drb/drb'
+require 'thread'
+
+##
+# A module to implement the Linda distributed computing paradigm in Ruby.
+#
+# Rinda is part of DRb (dRuby).
+#
+# == Example(s)
+#
+# See the sample/drb/ directory in the Ruby distribution, from 1.8.2 onwards.
+#
+#--
+# TODO
+# == Introduction to Linda/rinda?
+#
+# == Why is this library separate from DRb?
+
+module Rinda
+
+  ##
+  # Rinda error base class
+
+  class RindaError < RuntimeError; end
+
+  ##
+  # Raised when a hash-based tuple has an invalid key.
+
+  class InvalidHashTupleKey < RindaError; end
+
+  ##
+  # Raised when trying to use a canceled tuple.
+
+  class RequestCanceledError < ThreadError; end
+
+  ##
+  # Raised when trying to use an expired tuple.
+
+  class RequestExpiredError < ThreadError; end
+
+  ##
+  # A tuple is the elementary object in Rinda programming.
+  # Tuples may be matched against templates if the tuple and
+  # the template are the same size.
+
+  class Tuple
+
+    ##
+    # Creates a new Tuple from +ary_or_hash+ which must be an Array or Hash.
+
+    def initialize(ary_or_hash)
+      if hash?(ary_or_hash)
+        init_with_hash(ary_or_hash)
+      else
+        init_with_ary(ary_or_hash)
+      end
+    end
+
+    ##
+    # The number of elements in the tuple.
+    
+    def size
+      @tuple.size
+    end
+
+    ##
+    # Accessor method for elements of the tuple.
+
+    def [](k)
+      @tuple[k]
+    end
+
+    ##
+    # Fetches item +k+ from the tuple.
+
+    def fetch(k)
+      @tuple.fetch(k)
+    end
+
+    ##
+    # Iterate through the tuple, yielding the index or key, and the
+    # value, thus ensuring arrays are iterated similarly to hashes.
+
+    def each # FIXME
+      if Hash === @tuple
+        @tuple.each { |k, v| yield(k, v) }
+      else
+        @tuple.each_with_index { |v, k| yield(k, v) }
+      end
+    end
+
+    ##
+    # Return the tuple itself
+    def value
+      @tuple
+    end
+
+    private
+
+    def hash?(ary_or_hash)
+      ary_or_hash.respond_to?(:keys)
+    end
+
+    ##
+    # Munges +ary+ into a valid Tuple.
+
+    def init_with_ary(ary)
+      @tuple = Array.new(ary.size)
+      @tuple.size.times do |i|
+        @tuple[i] = ary[i]
+      end
+    end
+
+    ##
+    # Ensures +hash+ is a valid Tuple.
+
+    def init_with_hash(hash)
+      @tuple = Hash.new
+      hash.each do |k, v|
+        raise InvalidHashTupleKey unless String === k
+        @tuple[k] = v
+      end
+    end
+
+  end
+
+  ##
+  # Templates are used to match tuples in Rinda.
+
+  class Template < Tuple
+
+    ##
+    # Matches this template against +tuple+.  The +tuple+ must be the same
+    # size as the template.  An element with a +nil+ value in a template acts
+    # as a wildcard, matching any value in the corresponding position in the
+    # tuple.  Elements of the template match the +tuple+ if the are #== or
+    # #===.
+    #
+    #   Template.new([:foo, 5]).match   Tuple.new([:foo, 5]) # => true
+    #   Template.new([:foo, nil]).match Tuple.new([:foo, 5]) # => true
+    #   Template.new([String]).match    Tuple.new(['hello']) # => true
+    #
+    #   Template.new([:foo]).match      Tuple.new([:foo, 5]) # => false
+    #   Template.new([:foo, 6]).match   Tuple.new([:foo, 5]) # => false
+    #   Template.new([:foo, nil]).match Tuple.new([:foo])    # => false
+    #   Template.new([:foo, 6]).match   Tuple.new([:foo])    # => false
+
+    def match(tuple)
+      return false unless tuple.respond_to?(:size)
+      return false unless tuple.respond_to?(:fetch)
+      return false unless self.size == tuple.size
+      each do |k, v|
+        begin
+          it = tuple.fetch(k)
+        rescue
+          return false
+        end
+        next if v.nil?
+        next if v == it
+        next if v === it
+        return false
+      end
+      return true
+    end
+    
+    ##
+    # Alias for #match.
+
+    def ===(tuple)
+      match(tuple)
+    end
+
+  end
+  
+  ##
+  # <i>Documentation?</i>
+
+  class DRbObjectTemplate
+
+    ##
+    # Creates a new DRbObjectTemplate that will match against +uri+ and +ref+.
+
+    def initialize(uri=nil, ref=nil)
+      @drb_uri = uri
+      @drb_ref = ref
+    end
+    
+    ##
+    # This DRbObjectTemplate matches +ro+ if the remote object's drburi and
+    # drbref are the same.  +nil+ is used as a wildcard.
+
+    def ===(ro)
+      return true if super(ro)
+      unless @drb_uri.nil?
+        return false unless (@drb_uri === ro.__drburi rescue false)
+      end
+      unless @drb_ref.nil?
+        return false unless (@drb_ref === ro.__drbref rescue false)
+      end
+      true
+    end
+
+  end
+
+  ##
+  # TupleSpaceProxy allows a remote Tuplespace to appear as local.
+
+  class TupleSpaceProxy
+
+    ##
+    # Creates a new TupleSpaceProxy to wrap +ts+.
+
+    def initialize(ts)
+      @ts = ts
+    end
+    
+    ##
+    # Adds +tuple+ to the proxied TupleSpace.  See TupleSpace#write.
+
+    def write(tuple, sec=nil)
+      @ts.write(tuple, sec)
+    end
+    
+    ##
+    # Takes +tuple+ from the proxied TupleSpace.  See TupleSpace#take.
+
+    def take(tuple, sec=nil, &block)
+      port = []
+      @ts.move(DRbObject.new(port), tuple, sec, &block)
+      port[0]
+    end
+    
+    ##
+    # Reads +tuple+ from the proxied TupleSpace.  See TupleSpace#read.
+
+    def read(tuple, sec=nil, &block)
+      @ts.read(tuple, sec, &block)
+    end
+    
+    ##
+    # Reads all tuples matching +tuple+ from the proxied TupleSpace.  See
+    # TupleSpace#read_all.
+
+    def read_all(tuple)
+      @ts.read_all(tuple)
+    end
+    
+    ##
+    # Registers for notifications of event +ev+ on the proxied TupleSpace.
+    # See TupleSpace#notify
+
+    def notify(ev, tuple, sec=nil)
+      @ts.notify(ev, tuple, sec)
+    end
+
+  end
+
+  ##
+  # An SimpleRenewer allows a TupleSpace to check if a TupleEntry is still
+  # alive.
+
+  class SimpleRenewer
+
+    include DRbUndumped
+
+    ##
+    # Creates a new SimpleRenewer that keeps an object alive for another +sec+
+    # seconds.
+
+    def initialize(sec=180)
+      @sec = sec
+    end
+
+    ##
+    # Called by the TupleSpace to check if the object is still alive.
+
+    def renew
+      @sec
+    end
+  end
+
+end
+
diff --git a/ruby_1_8_6/lib/rinda/ring.rb b/ruby_1_8_6/lib/rinda/ring.rb
new file mode 100644
index 0000000000..ac8a716216
--- /dev/null
+++ b/ruby_1_8_6/lib/rinda/ring.rb
@@ -0,0 +1,271 @@
+#
+# Note: Rinda::Ring API is unstable.
+#
+require 'drb/drb'
+require 'rinda/rinda'
+require 'thread'
+
+module Rinda
+
+  ##
+  # The default port Ring discovery will use.
+
+  Ring_PORT = 7647
+
+  ##
+  # A RingServer allows a Rinda::TupleSpace to be located via UDP broadcasts.
+  # Service location uses the following steps:
+  #
+  # 1. A RingServer begins listening on the broadcast UDP address.
+  # 2. A RingFinger sends a UDP packet containing the DRb URI where it will
+  #    listen for a reply.
+  # 3. The RingServer recieves the UDP packet and connects back to the
+  #    provided DRb URI with the DRb service.
+
+  class RingServer
+
+    include DRbUndumped
+
+    ##
+    # Advertises +ts+ on the UDP broadcast address at +port+.
+
+    def initialize(ts, port=Ring_PORT)
+      @ts = ts
+      @soc = UDPSocket.open
+      @soc.bind('', port)
+      @w_service = write_service
+      @r_service = reply_service
+    end
+
+    ##
+    # Creates a thread that picks up UDP packets and passes them to do_write
+    # for decoding.
+
+    def write_service
+      Thread.new do
+	loop do
+	  msg = @soc.recv(1024)
+	  do_write(msg)
+	end
+      end
+    end
+  
+    ##
+    # Extracts the response URI from +msg+ and adds it to TupleSpace where it
+    # will be picked up by +reply_service+ for notification.
+
+    def do_write(msg)
+      Thread.new do
+	begin
+	  tuple, sec = Marshal.load(msg)
+	  @ts.write(tuple, sec)
+	rescue
+	end
+      end
+    end
+
+    ##
+    # Creates a thread that notifies waiting clients from the TupleSpace.
+
+    def reply_service
+      Thread.new do
+	loop do
+	  do_reply
+	end
+      end
+    end
+    
+    ##
+    # Pulls lookup tuples out of the TupleSpace and sends their DRb object the
+    # address of the local TupleSpace.
+
+    def do_reply
+      tuple = @ts.take([:lookup_ring, nil])
+      Thread.new { tuple[1].call(@ts) rescue nil}
+    rescue
+    end
+
+  end
+
+  ##
+  # RingFinger is used by RingServer clients to discover the RingServer's
+  # TupleSpace.  Typically, all a client needs to do is call
+  # RingFinger.primary to retrieve the remote TupleSpace, which it can then
+  # begin using.
+
+  class RingFinger
+
+    @@broadcast_list = ['<broadcast>', 'localhost']
+
+    @@finger = nil
+
+    ##
+    # Creates a singleton RingFinger and looks for a RingServer.  Returns the
+    # created RingFinger.
+
+    def self.finger
+      unless @@finger 
+	@@finger = self.new
+	@@finger.lookup_ring_any
+      end
+      @@finger
+    end
+
+    ##
+    # Returns the first advertised TupleSpace.
+
+    def self.primary
+      finger.primary
+    end
+
+    ##
+    # Contains all discoverd TupleSpaces except for the primary.
+
+    def self.to_a
+      finger.to_a
+    end
+
+    ##
+    # The list of addresses where RingFinger will send query packets.
+
+    attr_accessor :broadcast_list
+
+    ##
+    # The port that RingFinger will send query packets to.
+
+    attr_accessor :port
+
+    ##
+    # Contain the first advertised TupleSpace after lookup_ring_any is called.
+
+    attr_accessor :primary
+
+    ##
+    # Creates a new RingFinger that will look for RingServers at +port+ on
+    # the addresses in +broadcast_list+.
+
+    def initialize(broadcast_list=@@broadcast_list, port=Ring_PORT)
+      @broadcast_list = broadcast_list || ['localhost']
+      @port = port
+      @primary = nil
+      @rings = []
+    end
+
+    ##
+    # Contains all discovered TupleSpaces except for the primary.
+
+    def to_a
+      @rings
+    end
+
+    ##
+    # Iterates over all discovered TupleSpaces starting with the primary.
+
+    def each
+      lookup_ring_any unless @primary
+      return unless @primary
+      yield(@primary)
+      @rings.each { |x| yield(x) }
+    end
+
+    ##
+    # Looks up RingServers waiting +timeout+ seconds.  RingServers will be
+    # given +block+ as a callback, which will be called with the remote
+    # TupleSpace.
+
+    def lookup_ring(timeout=5, &block)
+      return lookup_ring_any(timeout) unless block_given?
+
+      msg = Marshal.dump([[:lookup_ring, DRbObject.new(block)], timeout])
+      @broadcast_list.each do |it|
+	soc = UDPSocket.open
+	begin
+	  soc.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
+	  soc.send(msg, 0, it, @port)
+	rescue
+	  nil
+	ensure
+	  soc.close
+	end
+      end
+      sleep(timeout)
+    end
+
+    ##
+    # Returns the first found remote TupleSpace.  Any further recovered
+    # TupleSpaces can be found by calling +to_a+.
+
+    def lookup_ring_any(timeout=5)
+      queue = Queue.new
+
+      th = Thread.new do
+	self.lookup_ring(timeout) do |ts|
+	  queue.push(ts)
+	end
+	queue.push(nil)
+	while it = queue.pop
+	  @rings.push(it)
+	end
+      end
+      
+      @primary = queue.pop
+      raise('RingNotFound') if @primary.nil?
+      @primary
+    end
+
+  end
+
+  ##
+  # RingProvider uses a RingServer advertised TupleSpace as a name service.
+  # TupleSpace clients can register themselves with the remote TupleSpace and
+  # look up other provided services via the remote TupleSpace.
+  #
+  # Services are registered with a tuple of the format [:name, klass,
+  # DRbObject, description].
+
+  class RingProvider
+
+    ##
+    # Creates a RingProvider that will provide a +klass+ service running on
+    # +front+, with a +description+.  +renewer+ is optional.
+
+    def initialize(klass, front, desc, renewer = nil)
+      @tuple = [:name, klass, front, desc]
+      @renewer = renewer || Rinda::SimpleRenewer.new
+    end
+
+    ##
+    # Advertises this service on the primary remote TupleSpace.
+
+    def provide
+      ts = Rinda::RingFinger.primary
+      ts.write(@tuple, @renewer)
+    end
+
+  end
+
+end
+
+if __FILE__ == $0
+  DRb.start_service
+  case ARGV.shift
+  when 's'
+    require 'rinda/tuplespace'
+    ts = Rinda::TupleSpace.new
+    place = Rinda::RingServer.new(ts)
+    $stdin.gets
+  when 'w'
+    finger = Rinda::RingFinger.new(nil)
+    finger.lookup_ring do |ts|
+      p ts
+      ts.write([:hello, :world])
+    end
+  when 'r'
+    finger = Rinda::RingFinger.new(nil)
+    finger.lookup_ring do |ts|
+      p ts
+      p ts.take([nil, nil])
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/lib/rinda/tuplespace.rb b/ruby_1_8_6/lib/rinda/tuplespace.rb
new file mode 100644
index 0000000000..6d58a0fd15
--- /dev/null
+++ b/ruby_1_8_6/lib/rinda/tuplespace.rb
@@ -0,0 +1,592 @@
+require 'monitor'
+require 'thread'
+require 'drb/drb'
+require 'rinda/rinda'
+
+module Rinda
+
+  ##
+  # A TupleEntry is a Tuple (i.e. a possible entry in some Tuplespace)
+  # together with expiry and cancellation data.
+
+  class TupleEntry
+
+    include DRbUndumped
+
+    attr_accessor :expires
+
+    ##
+    # Creates a TupleEntry based on +ary+ with an optional renewer or expiry
+    # time +sec+.
+    #
+    # A renewer must implement the +renew+ method which returns a Numeric,
+    # nil, or true to indicate when the tuple has expired.
+
+    def initialize(ary, sec=nil)
+      @cancel = false
+      @expires = nil
+      @tuple = make_tuple(ary)
+      @renewer = nil
+      renew(sec)
+    end
+
+    ##
+    # Marks this TupleEntry as canceled.
+
+    def cancel
+      @cancel = true
+    end
+
+    ##
+    # A TupleEntry is dead when it is canceled or expired.
+
+    def alive?
+      !canceled? && !expired?
+    end
+
+    ##
+    # Return the object which makes up the tuple itself: the Array
+    # or Hash.
+
+    def value; @tuple.value; end
+
+    ##
+    # Returns the canceled status.
+
+    def canceled?; @cancel; end
+
+    ##
+    # Has this tuple expired? (true/false).
+    #
+    # A tuple has expired when its expiry timer based on the +sec+ argument to
+    # #initialize runs out.
+
+    def expired?
+      return true unless @expires
+      return false if @expires > Time.now
+      return true if @renewer.nil?
+      renew(@renewer)
+      return true unless @expires
+      return @expires < Time.now
+    end
+
+    ##
+    # Reset the expiry time according to +sec_or_renewer+.  
+    #
+    # +nil+::    it is set to expire in the far future.
+    # +false+::  it has expired.
+    # Numeric::  it will expire in that many seconds.
+    #
+    # Otherwise the argument refers to some kind of renewer object
+    # which will reset its expiry time. 
+
+    def renew(sec_or_renewer)
+      sec, @renewer = get_renewer(sec_or_renewer)
+      @expires = make_expires(sec)
+    end
+
+    ##
+    # Returns an expiry Time based on +sec+ which can be one of:
+    # Numeric:: +sec+ seconds into the future
+    # +true+::  the expiry time is the start of 1970 (i.e. expired)
+    # +nil+::   it is  Tue Jan 19 03:14:07 GMT Standard Time 2038 (i.e. when
+    #           UNIX clocks will die)
+
+    def make_expires(sec=nil)
+      case sec
+      when Numeric
+        Time.now + sec
+      when true
+        Time.at(1)
+      when nil
+        Time.at(2**31-1)
+      end
+    end
+
+    ##
+    # Retrieves +key+ from the tuple.
+
+    def [](key)
+      @tuple[key]
+    end
+
+    ##
+    # Fetches +key+ from the tuple.
+
+    def fetch(key)
+      @tuple.fetch(key)
+    end
+
+    ##
+    # The size of the tuple.
+
+    def size
+      @tuple.size
+    end
+
+    ##
+    # Creates a Rinda::Tuple for +ary+.
+
+    def make_tuple(ary)
+      Rinda::Tuple.new(ary)
+    end
+
+    private
+
+    ##
+    # Returns a valid argument to make_expires and the renewer or nil.
+    #
+    # Given +true+, +nil+, or Numeric, returns that value and +nil+ (no actual
+    # renewer).  Otherwise it returns an expiry value from calling +it.renew+
+    # and the renewer.
+
+    def get_renewer(it)
+      case it
+      when Numeric, true, nil
+        return it, nil
+      else
+        begin
+          return it.renew, it
+        rescue Exception
+          return it, nil
+        end
+      end
+    end
+
+  end
+
+  ##
+  # A TemplateEntry is a Template together with expiry and cancellation data.
+
+  class TemplateEntry < TupleEntry
+    ##
+    # Matches this TemplateEntry against +tuple+.  See Template#match for
+    # details on how a Template matches a Tuple.
+
+    def match(tuple)
+      @tuple.match(tuple)
+    end
+    
+    alias === match
+
+    def make_tuple(ary) # :nodoc:
+      Rinda::Template.new(ary)
+    end
+
+  end
+
+  ##
+  # <i>Documentation?</i>
+
+  class WaitTemplateEntry < TemplateEntry
+
+    attr_reader :found
+
+    def initialize(place, ary, expires=nil)
+      super(ary, expires)
+      @place = place
+      @cond = place.new_cond
+      @found = nil
+    end
+
+    def cancel
+      super
+      signal
+    end
+
+    def wait
+      @cond.wait
+    end
+
+    def read(tuple)
+      @found = tuple
+      signal
+    end
+
+    def signal
+      @place.synchronize do
+        @cond.signal
+      end
+    end
+
+  end
+
+  ##
+  # A NotifyTemplateEntry is returned by TupleSpace#notify and is notified of
+  # TupleSpace changes.  You may receive either your subscribed event or the
+  # 'close' event when iterating over notifications.
+  #
+  # See TupleSpace#notify_event for valid notification types.
+  #
+  # == Example
+  #
+  #   ts = Rinda::TupleSpace.new
+  #   observer = ts.notify 'write', [nil]
+  #   
+  #   Thread.start do
+  #     observer.each { |t| p t }
+  #   end
+  #   
+  #   3.times { |i| ts.write [i] }
+  #
+  # Outputs:
+  #
+  #   ['write', [0]]
+  #   ['write', [1]]
+  #   ['write', [2]]
+
+  class NotifyTemplateEntry < TemplateEntry
+
+    ##
+    # Creates a new NotifyTemplateEntry that watches +place+ for +event+s that
+    # match +tuple+.
+
+    def initialize(place, event, tuple, expires=nil)
+      ary = [event, Rinda::Template.new(tuple)]
+      super(ary, expires)
+      @queue = Queue.new
+      @done = false
+    end
+
+    ##
+    # Called by TupleSpace to notify this NotifyTemplateEntry of a new event.
+
+    def notify(ev)
+      @queue.push(ev)
+    end
+
+    ##
+    # Retrieves a notification.  Raises RequestExpiredError when this
+    # NotifyTemplateEntry expires.
+
+    def pop
+      raise RequestExpiredError if @done
+      it = @queue.pop
+      @done = true if it[0] == 'close'
+      return it
+    end
+
+    ##
+    # Yields event/tuple pairs until this NotifyTemplateEntry expires.
+
+    def each # :yields: event, tuple
+      while !@done
+        it = pop
+        yield(it)
+      end
+    rescue 
+    ensure
+      cancel
+    end
+
+  end
+
+  ##
+  # TupleBag is an unordered collection of tuples. It is the basis
+  # of Tuplespace.
+
+  class TupleBag
+
+    def initialize # :nodoc:
+      @hash = {}
+    end
+
+    ##
+    # +true+ if the TupleBag to see if it has any expired entries.
+
+    def has_expires?
+      @hash.each do |k, v|
+        v.each do |tuple|
+          return true if tuple.expires
+        end
+      end
+      false
+    end
+
+    ##
+    # Add +ary+ to the TupleBag.
+
+    def push(ary)
+      size = ary.size
+      @hash[size] ||= []
+      @hash[size].push(ary)
+    end
+
+    ##
+    # Removes +ary+ from the TupleBag.
+
+    def delete(ary)
+      size = ary.size
+      @hash.fetch(size, []).delete(ary)
+    end
+
+    ##
+    # Finds all live tuples that match +template+.
+
+    def find_all(template)
+      @hash.fetch(template.size, []).find_all do |tuple|
+        tuple.alive? && template.match(tuple)
+      end
+    end
+
+    ##
+    # Finds a live tuple that matches +template+.
+
+    def find(template)
+      @hash.fetch(template.size, []).find do |tuple|
+        tuple.alive? && template.match(tuple)
+      end
+    end
+
+    ##
+    # Finds all tuples in the TupleBag which when treated as templates, match
+    # +tuple+ and are alive.
+
+    def find_all_template(tuple)
+      @hash.fetch(tuple.size, []).find_all do |template|
+        template.alive? && template.match(tuple)
+      end
+    end
+
+    ##
+    # Delete tuples which dead tuples from the TupleBag, returning the deleted
+    # tuples.
+
+    def delete_unless_alive
+      deleted = []
+      @hash.keys.each do |size|
+        ary = []
+        @hash[size].each do |tuple|
+          if tuple.alive?
+            ary.push(tuple)
+          else
+            deleted.push(tuple)
+          end
+        end
+        @hash[size] = ary
+      end
+      deleted
+    end
+
+  end
+
+  ##
+  # The Tuplespace manages access to the tuples it contains,
+  # ensuring mutual exclusion requirements are met.
+  #
+  # The +sec+ option for the write, take, move, read and notify methods may
+  # either be a number of seconds or a Renewer object.
+
+  class TupleSpace
+
+    include DRbUndumped
+    include MonitorMixin
+
+    ##
+    # Creates a new TupleSpace.  +period+ is used to control how often to look
+    # for dead tuples after modifications to the TupleSpace.
+    #
+    # If no dead tuples are found +period+ seconds after the last
+    # modification, the TupleSpace will stop looking for dead tuples.
+
+    def initialize(period=60)
+      super()
+      @bag = TupleBag.new
+      @read_waiter = TupleBag.new
+      @take_waiter = TupleBag.new
+      @notify_waiter = TupleBag.new
+      @period = period
+      @keeper = nil
+    end
+
+    ##
+    # Adds +tuple+
+
+    def write(tuple, sec=nil)
+      entry = TupleEntry.new(tuple, sec)
+      synchronize do
+        if entry.expired?
+          @read_waiter.find_all_template(entry).each do |template|
+            template.read(tuple)
+          end
+          notify_event('write', entry.value)
+          notify_event('delete', entry.value)
+        else
+          @bag.push(entry)
+          start_keeper if entry.expires
+          @read_waiter.find_all_template(entry).each do |template|
+            template.read(tuple)
+          end
+          @take_waiter.find_all_template(entry).each do |template|
+            template.signal
+          end
+          notify_event('write', entry.value)
+        end
+      end
+      entry
+    end
+
+    ##
+    # Removes +tuple+
+
+    def take(tuple, sec=nil, &block)
+      move(nil, tuple, sec, &block)
+    end
+
+    ##
+    # Moves +tuple+ to +port+.
+
+    def move(port, tuple, sec=nil)
+      template = WaitTemplateEntry.new(self, tuple, sec)
+      yield(template) if block_given?
+      synchronize do
+        entry = @bag.find(template)
+        if entry
+          port.push(entry.value) if port
+          @bag.delete(entry)
+          notify_event('take', entry.value)
+          return entry.value
+        end
+        raise RequestExpiredError if template.expired?
+
+        begin
+          @take_waiter.push(template)
+          start_keeper if template.expires
+          while true
+            raise RequestCanceledError if template.canceled?
+            raise RequestExpiredError if template.expired?
+            entry = @bag.find(template)
+            if entry
+              port.push(entry.value) if port
+              @bag.delete(entry)
+              notify_event('take', entry.value)
+              return entry.value
+            end
+            template.wait
+          end
+        ensure
+          @take_waiter.delete(template)
+        end
+      end
+    end
+
+    ##
+    # Reads +tuple+, but does not remove it.
+
+    def read(tuple, sec=nil)
+      template = WaitTemplateEntry.new(self, tuple, sec)
+      yield(template) if block_given?
+      synchronize do
+        entry = @bag.find(template)
+        return entry.value if entry
+        raise RequestExpiredError if template.expired?
+
+        begin
+          @read_waiter.push(template)
+          start_keeper if template.expires
+          template.wait
+          raise RequestCanceledError if template.canceled?
+          raise RequestExpiredError if template.expired?
+          return template.found
+        ensure
+          @read_waiter.delete(template)
+        end
+      end
+    end
+
+    ##
+    # Returns all tuples matching +tuple+.  Does not remove the found tuples.
+
+    def read_all(tuple)
+      template = WaitTemplateEntry.new(self, tuple, nil)
+      synchronize do
+        entry = @bag.find_all(template)
+        entry.collect do |e|
+          e.value
+        end
+      end
+    end
+
+    ##
+    # Registers for notifications of +event+.  Returns a NotifyTemplateEntry.
+    # See NotifyTemplateEntry for examples of how to listen for notifications.
+    #
+    # +event+ can be:
+    # 'write'::  A tuple was added
+    # 'take'::   A tuple was taken or moved
+    # 'delete':: A tuple was lost after being overwritten or expiring
+    #
+    # The TupleSpace will also notify you of the 'close' event when the
+    # NotifyTemplateEntry has expired.
+
+    def notify(event, tuple, sec=nil)
+      template = NotifyTemplateEntry.new(self, event, tuple, sec)
+      synchronize do
+        @notify_waiter.push(template)
+      end
+      template
+    end
+
+    private
+
+    ##
+    # Removes dead tuples.
+
+    def keep_clean
+      synchronize do
+        @read_waiter.delete_unless_alive.each do |e|
+          e.signal
+        end
+        @take_waiter.delete_unless_alive.each do |e|
+          e.signal
+        end
+        @notify_waiter.delete_unless_alive.each do |e|
+          e.notify(['close'])
+        end
+        @bag.delete_unless_alive.each do |e|
+          notify_event('delete', e.value)
+        end
+      end
+    end
+
+    ##
+    # Notifies all registered listeners for +event+ of a status change of
+    # +tuple+.
+
+    def notify_event(event, tuple)
+      ev = [event, tuple]
+      @notify_waiter.find_all_template(ev).each do |template|
+        template.notify(ev)
+      end
+    end
+
+    ##
+    # Creates a thread that scans the tuplespace for expired tuples.
+
+    def start_keeper
+      return if @keeper && @keeper.alive?
+      @keeper = Thread.new do
+        while true
+          synchronize do
+            break unless need_keeper?
+            keep_clean
+          end
+          sleep(@period)
+        end
+      end
+    end
+
+    ##
+    # Checks the tuplespace to see if it needs cleaning.
+
+    def need_keeper?
+      return true if @bag.has_expires?
+      return true if @read_waiter.has_expires?
+      return true if @take_waiter.has_expires?
+      return true if @notify_waiter.has_expires?
+    end
+
+  end
+
+end
+
diff --git a/ruby_1_8_6/lib/rss.rb b/ruby_1_8_6/lib/rss.rb
new file mode 100644
index 0000000000..495edb1b98
--- /dev/null
+++ b/ruby_1_8_6/lib/rss.rb
@@ -0,0 +1,16 @@
+# Copyright (c) 2003-2005 Kouhei Sutou.  You can redistribute it and/or
+# modify it under the same terms as Ruby.
+#
+# Author:: Kouhei Sutou <kou@cozmixng.org>
+# Tutorial:: http://www.cozmixng.org/~rwiki/?cmd=view;name=RSS+Parser%3A%3ATutorial.en
+
+require 'rss/1.0'
+require 'rss/2.0'
+require 'rss/content'
+require 'rss/dublincore'
+require 'rss/image'
+require 'rss/syndication'
+#require 'rss/taxonomy'
+require 'rss/trackback'
+
+require "rss/maker"
diff --git a/ruby_1_8_6/lib/rss/0.9.rb b/ruby_1_8_6/lib/rss/0.9.rb
new file mode 100644
index 0000000000..69e01ddd57
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/0.9.rb
@@ -0,0 +1,422 @@
+require "rss/parser"
+
+module RSS
+
+  module RSS09
+    NSPOOL = {}
+    ELEMENTS = []
+
+    def self.append_features(klass)
+      super
+      
+      klass.install_must_call_validator('', "")
+    end
+  end
+
+  class Rss < Element
+
+    include RSS09
+    include RootElementMixin
+
+    %w(channel).each do |name|
+      install_have_child_element(name, "", nil)
+    end
+
+    attr_accessor :rss_version, :version, :encoding, :standalone
+    
+    def initialize(rss_version, version=nil, encoding=nil, standalone=nil)
+      super
+    end
+
+    def items
+      if @channel
+        @channel.items
+      else
+        []
+      end
+    end
+
+    def image
+      if @channel
+        @channel.image
+      else
+        nil
+      end
+    end
+
+    def textinput
+      if @channel
+        @channel.textInput
+      else
+        nil
+      end
+    end
+
+    def setup_maker_elements(maker)
+      super
+      items.each do |item|
+        item.setup_maker(maker.items)
+      end
+    end
+
+    private
+    def _attrs
+      [
+        ["version", true, "rss_version"],
+      ]
+    end
+
+    class Channel < Element
+
+      include RSS09
+
+      [
+        ["title", nil, :text],
+        ["link", nil, :text],
+        ["description", nil, :text],
+        ["language", nil, :text],
+        ["copyright", "?", :text],
+        ["managingEditor", "?", :text],
+        ["webMaster", "?", :text],
+        ["rating", "?", :text],
+        ["pubDate", "?", :date, :rfc822],
+        ["lastBuildDate", "?", :date, :rfc822],
+        ["docs", "?", :text],
+        ["cloud", "?", :have_attribute],
+        ["skipDays", "?", :have_child],
+        ["skipHours", "?", :have_child],
+        ["image", nil, :have_child],
+        ["item", "*", :have_children],
+        ["textInput", "?", :have_child],
+      ].each do |name, occurs, type, *args|
+        __send__("install_#{type}_element", name, "", occurs, name, *args)
+      end
+      alias date pubDate
+      alias date= pubDate=
+
+      private
+      def maker_target(maker)
+        maker.channel
+      end
+
+      def setup_maker_elements(channel)
+        super
+        [
+          [skipDays, "day"],
+          [skipHours, "hour"],
+        ].each do |skip, key|
+          if skip
+            skip.__send__("#{key}s").each do |val|
+              target_skips = channel.__send__("skip#{key.capitalize}s")
+              new_target = target_skips.__send__("new_#{key}")
+              new_target.content = val.content
+            end
+          end
+        end
+      end
+
+      def not_need_to_call_setup_maker_variables
+        %w(image textInput)
+      end
+    
+      class SkipDays < Element
+        include RSS09
+
+        [
+          ["day", "*"]
+        ].each do |name, occurs|
+          install_have_children_element(name, "", occurs)
+        end
+
+        class Day < Element
+          include RSS09
+
+          content_setup
+
+          def initialize(*args)
+            if Utils.element_initialize_arguments?(args)
+              super
+            else
+              super()
+              self.content = args[0]
+            end
+          end
+      
+        end
+        
+      end
+      
+      class SkipHours < Element
+        include RSS09
+
+        [
+          ["hour", "*"]
+        ].each do |name, occurs|
+          install_have_children_element(name, "", occurs)
+        end
+
+        class Hour < Element
+          include RSS09
+
+          content_setup(:integer)
+
+          def initialize(*args)
+            if Utils.element_initialize_arguments?(args)
+              super
+            else
+              super()
+              self.content = args[0]
+            end
+          end
+        end
+        
+      end
+      
+      class Image < Element
+
+        include RSS09
+        
+        %w(url title link).each do |name|
+          install_text_element(name, "", nil)
+        end
+        [
+          ["width", :integer],
+          ["height", :integer],
+          ["description"],
+        ].each do |name, type|
+          install_text_element(name, "", "?", name, type)
+        end
+
+        def initialize(*args)
+          if Utils.element_initialize_arguments?(args)
+            super
+          else
+            super()
+            self.url = args[0]
+            self.title = args[1]
+            self.link = args[2]
+            self.width = args[3]
+            self.height = args[4]
+            self.description = args[5]
+          end
+        end
+
+        private
+        def maker_target(maker)
+          maker.image
+        end
+      end
+
+      class Cloud < Element
+
+        include RSS09
+
+        [
+          ["domain", "", true],
+          ["port", "", true, :integer],
+          ["path", "", true],
+          ["registerProcedure", "", true],
+          ["protocol", "", true],
+        ].each do |name, uri, required, type|
+          install_get_attribute(name, uri, required, type)
+        end
+
+        def initialize(*args)
+          if Utils.element_initialize_arguments?(args)
+            super
+          else
+            super()
+            self.domain = args[0]
+            self.port = args[1]
+            self.path = args[2]
+            self.registerProcedure = args[3]
+            self.protocol = args[4]
+          end
+        end
+      end
+      
+      class Item < Element
+        
+        include RSS09
+
+        [
+          ["title", '?', :text],
+          ["link", '?', :text],
+          ["description", '?', :text],
+          ["category", '*', :have_children, "categories"],
+          ["source", '?', :have_child],
+          ["enclosure", '?', :have_child],
+        ].each do |tag, occurs, type, *args|
+          __send__("install_#{type}_element", tag, "", occurs, tag, *args)
+        end
+
+        private
+        def maker_target(items)
+          if items.respond_to?("items")
+            # For backward compatibility
+            items = items.items
+          end
+          items.new_item
+        end
+
+        def setup_maker_element(item)
+          super
+          @enclosure.setup_maker(item) if @enclosure
+          @source.setup_maker(item) if @source
+        end
+        
+        class Source < Element
+
+          include RSS09
+
+          [
+            ["url", "", true]
+          ].each do |name, uri, required|
+            install_get_attribute(name, uri, required)
+          end
+          
+          content_setup
+
+          def initialize(*args)
+            if Utils.element_initialize_arguments?(args)
+              super
+            else
+              super()
+              self.url = args[0]
+              self.content = args[1]
+            end
+          end
+
+          private
+          def maker_target(item)
+            item.source
+          end
+
+          def setup_maker_attributes(source)
+            source.url = url
+            source.content = content
+          end
+        end
+
+        class Enclosure < Element
+
+          include RSS09
+
+          [
+            ["url", "", true],
+            ["length", "", true, :integer],
+            ["type", "", true],
+          ].each do |name, uri, required, type|
+            install_get_attribute(name, uri, required, type)
+          end
+
+          def initialize(*args)
+            if Utils.element_initialize_arguments?(args)
+              super
+            else
+              super()
+              self.url = args[0]
+              self.length = args[1]
+              self.type = args[2]
+            end
+          end
+
+          private
+          def maker_target(item)
+            item.enclosure
+          end
+
+          def setup_maker_attributes(enclosure)
+            enclosure.url = url
+            enclosure.length = length
+            enclosure.type = type
+          end
+        end
+
+        class Category < Element
+
+          include RSS09
+          
+          [
+            ["domain", "", false]
+          ].each do |name, uri, required|
+            install_get_attribute(name, uri, required)
+          end
+
+          content_setup
+
+          def initialize(*args)
+            if Utils.element_initialize_arguments?(args)
+              super
+            else
+              super()
+              self.domain = args[0]
+              self.content = args[1]
+            end
+          end
+
+          private
+          def maker_target(item)
+            item.new_category
+          end
+
+          def setup_maker_attributes(category)
+            category.domain = domain
+            category.content = content
+          end
+          
+        end
+
+      end
+      
+      class TextInput < Element
+
+        include RSS09
+
+        %w(title description name link).each do |name|
+          install_text_element(name, "", nil)
+        end
+
+        def initialize(*args)
+          if Utils.element_initialize_arguments?(args)
+            super
+          else
+            super()
+            self.title = args[0]
+            self.description = args[1]
+            self.name = args[2]
+            self.link = args[3]
+          end
+        end
+
+        private
+        def maker_target(maker)
+          maker.textinput
+        end
+      end
+      
+    end
+    
+  end
+
+  RSS09::ELEMENTS.each do |name|
+    BaseListener.install_get_text_element("", name, "#{name}=")
+  end
+
+  module ListenerMixin
+    private
+    def start_rss(tag_name, prefix, attrs, ns)
+      check_ns(tag_name, prefix, ns, "")
+      
+      @rss = Rss.new(attrs['version'], @version, @encoding, @standalone)
+      @rss.do_validate = @do_validate
+      @rss.xml_stylesheets = @xml_stylesheets
+      @last_element = @rss
+      @proc_stack.push Proc.new { |text, tags|
+        @rss.validate_for_stream(tags, @ignore_unknown_element) if @do_validate
+      }
+    end
+    
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rss/1.0.rb b/ruby_1_8_6/lib/rss/1.0.rb
new file mode 100644
index 0000000000..a945434fbf
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/1.0.rb
@@ -0,0 +1,451 @@
+require "rss/parser"
+
+module RSS
+
+  module RSS10
+    NSPOOL = {}
+    ELEMENTS = []
+
+    def self.append_features(klass)
+      super
+      
+      klass.install_must_call_validator('', ::RSS::URI)
+    end
+
+  end
+
+  class RDF < Element
+
+    include RSS10
+    include RootElementMixin
+
+    class << self
+
+      def required_uri
+        URI
+      end
+
+    end
+
+    @tag_name = 'RDF'
+
+    PREFIX = 'rdf'
+    URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+
+    install_ns('', ::RSS::URI)
+    install_ns(PREFIX, URI)
+
+    [
+      ["channel", nil],
+      ["image", "?"],
+      ["item", "+", :children],
+      ["textinput", "?"],
+    ].each do |tag, occurs, type|
+      type ||= :child
+      __send__("install_have_#{type}_element", tag, ::RSS::URI, occurs)
+    end
+
+    attr_accessor :rss_version, :version, :encoding, :standalone
+    
+    def initialize(version=nil, encoding=nil, standalone=nil)
+      super('1.0', version, encoding, standalone)
+    end
+
+    def full_name
+      tag_name_with_prefix(PREFIX)
+    end
+
+    class Li < Element
+
+      include RSS10
+
+      class << self
+        def required_uri
+          URI
+        end
+      end
+      
+      [
+        ["resource", [URI, ""], true]
+      ].each do |name, uri, required|
+        install_get_attribute(name, uri, required)
+      end
+      
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.resource = args[0]
+        end
+      end
+
+      def full_name
+        tag_name_with_prefix(PREFIX)
+      end
+    end
+
+    class Seq < Element
+
+      include RSS10
+
+      Li = ::RSS::RDF::Li
+
+      class << self
+        def required_uri
+          URI
+        end
+      end
+
+      @tag_name = 'Seq'
+      
+      install_have_children_element("li", URI, "*")
+      install_must_call_validator('rdf', ::RSS::RDF::URI)
+      
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          @li = args[0] if args[0]
+        end
+      end
+
+      def full_name
+        tag_name_with_prefix(PREFIX)
+      end
+      
+      def setup_maker(target)
+        lis.each do |li|
+          target << li.resource
+        end
+      end
+    end
+
+    class Bag < Element
+
+      include RSS10
+
+      Li = ::RSS::RDF::Li
+
+      class << self
+        def required_uri
+          URI
+        end
+      end
+
+      @tag_name = 'Bag'
+      
+      install_have_children_element("li", URI, "*")
+      install_must_call_validator('rdf', URI)
+      
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          @li = args[0] if args[0]
+        end
+      end
+
+      def full_name
+        tag_name_with_prefix(PREFIX)
+      end
+      
+      def setup_maker(target)
+        lis.each do |li|
+          target << li.resource
+        end
+      end
+    end
+
+    class Channel < Element
+
+      include RSS10
+      
+      class << self
+
+        def required_uri
+          ::RSS::URI
+        end
+
+      end
+
+      [
+        ["about", URI, true]
+      ].each do |name, uri, required|
+        install_get_attribute(name, uri, required, nil, nil,
+                              "#{PREFIX}:#{name}")
+      end
+
+      [
+        ['title', nil, :text],
+        ['link', nil, :text],
+        ['description', nil, :text],
+        ['image', '?', :have_child],
+        ['items', nil, :have_child],
+        ['textinput', '?', :have_child],
+      ].each do |tag, occurs, type|
+        __send__("install_#{type}_element", tag, ::RSS::URI, occurs)
+      end
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.about = args[0]
+        end
+      end
+
+      private
+      def maker_target(maker)
+        maker.channel
+      end
+      
+      def setup_maker_attributes(channel)
+        channel.about = about
+      end
+
+      class Image < Element
+        
+        include RSS10
+
+        class << self
+          
+          def required_uri
+            ::RSS::URI
+          end
+
+        end
+
+        [
+          ["resource", URI, true]
+        ].each do |name, uri, required|
+          install_get_attribute(name, uri, required, nil, nil,
+                                "#{PREFIX}:#{name}")
+        end
+      
+        def initialize(*args)
+          if Utils.element_initialize_arguments?(args)
+            super
+          else
+            super()
+            self.resource = args[0]
+          end
+        end
+      end
+
+      class Textinput < Element
+        
+        include RSS10
+
+        class << self
+          
+          def required_uri
+            ::RSS::URI
+          end
+
+        end
+
+        [
+          ["resource", URI, true]
+        ].each do |name, uri, required|
+          install_get_attribute(name, uri, required, nil, nil,
+                                "#{PREFIX}:#{name}")
+        end
+      
+        def initialize(*args)
+          if Utils.element_initialize_arguments?(args)
+            super
+          else
+            super()
+            self.resource = args[0]
+          end
+        end
+      end
+      
+      class Items < Element
+
+        include RSS10
+
+        Seq = ::RSS::RDF::Seq
+
+        class << self
+          
+          def required_uri
+            ::RSS::URI
+          end
+          
+        end
+
+        install_have_child_element("Seq", URI, nil)
+        install_must_call_validator('rdf', URI)
+        
+        def initialize(*args)
+          if Utils.element_initialize_arguments?(args)
+            super
+          else
+            super()
+            self.Seq = args[0]
+          end
+          self.Seq ||= Seq.new
+        end
+
+        def resources
+          if @Seq
+            @Seq.lis.collect do |li|
+              li.resource
+            end
+          else
+            []
+          end
+        end
+      end
+    end
+
+    class Image < Element
+
+      include RSS10
+
+      class << self
+        
+        def required_uri
+          ::RSS::URI
+        end
+
+      end
+
+      [
+        ["about", URI, true]
+      ].each do |name, uri, required|
+        install_get_attribute(name, uri, required, nil, nil,
+                              "#{PREFIX}:#{name}")
+      end
+
+      %w(title url link).each do |name|
+        install_text_element(name, ::RSS::URI, nil)
+      end
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.about = args[0]
+        end
+      end
+
+      private
+      def maker_target(maker)
+        maker.image
+      end
+    end
+
+    class Item < Element
+
+      include RSS10
+
+      class << self
+
+        def required_uri
+          ::RSS::URI
+        end
+        
+      end
+
+
+      [
+        ["about", URI, true]
+      ].each do |name, uri, required|
+        install_get_attribute(name, uri, required, nil, nil,
+                              "#{PREFIX}:#{name}")
+      end
+
+      [
+        ["title", nil],
+        ["link", nil],
+        ["description", "?"],
+      ].each do |tag, occurs|
+        install_text_element(tag, ::RSS::URI, occurs)
+      end
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.about = args[0]
+        end
+      end
+
+      private
+      def maker_target(items)
+        if items.respond_to?("items")
+          # For backward compatibility
+          items = items.items
+        end
+        items.new_item
+      end
+    end
+
+    class Textinput < Element
+
+      include RSS10
+
+      class << self
+
+        def required_uri
+          ::RSS::URI
+        end
+
+      end
+
+      [
+        ["about", URI, true]
+      ].each do |name, uri, required|
+        install_get_attribute(name, uri, required, nil, nil,
+                              "#{PREFIX}:#{name}")
+      end
+
+      %w(title description name link).each do |name|
+        install_text_element(name, ::RSS::URI, nil)
+      end
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.about = args[0]
+        end
+      end
+
+      private
+      def maker_target(maker)
+        maker.textinput
+      end
+    end
+
+  end
+
+  RSS10::ELEMENTS.each do |name|
+    BaseListener.install_get_text_element(URI, name, "#{name}=")
+  end
+
+  module ListenerMixin
+    private
+    def start_RDF(tag_name, prefix, attrs, ns)
+      check_ns(tag_name, prefix, ns, RDF::URI)
+
+      @rss = RDF.new(@version, @encoding, @standalone)
+      @rss.do_validate = @do_validate
+      @rss.xml_stylesheets = @xml_stylesheets
+      @last_element = @rss
+      @proc_stack.push Proc.new { |text, tags|
+        @rss.validate_for_stream(tags, @ignore_unknown_element) if @do_validate
+      }
+    end
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rss/2.0.rb b/ruby_1_8_6/lib/rss/2.0.rb
new file mode 100644
index 0000000000..44bdb4f1ae
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/2.0.rb
@@ -0,0 +1,111 @@
+require "rss/0.9"
+
+module RSS
+
+  class Rss
+
+    class Channel
+
+      [
+        ["generator"],
+        ["ttl", :integer],
+      ].each do |name, type|
+        install_text_element(name, "", "?", name, type)
+      end
+
+      [
+        %w(category categories),
+      ].each do |name, plural_name|
+        install_have_children_element(name, "", "*", name, plural_name)
+      end
+
+      [
+        ["image", "?"],
+        ["language", "?"],
+      ].each do |name, occurs|
+        install_model(name, "", occurs)
+      end
+
+      Category = Item::Category
+
+      class Item
+      
+        [
+          ["comments", "?"],
+          ["author", "?"],
+        ].each do |name, occurs|
+          install_text_element(name, "", occurs)
+        end
+
+        [
+          ["pubDate", '?'],
+        ].each do |name, occurs|
+          install_date_element(name, "", occurs, name, 'rfc822')
+        end
+        alias date pubDate
+        alias date= pubDate=
+
+        [
+          ["guid", '?'],
+        ].each do |name, occurs|
+          install_have_child_element(name, "", occurs)
+        end
+
+        private
+        alias _setup_maker_element setup_maker_element
+        def setup_maker_element(item)
+          _setup_maker_element(item)
+          @guid.setup_maker(item) if @guid
+        end
+        
+        class Guid < Element
+          
+          include RSS09
+
+          [
+            ["isPermaLink", "", false, :boolean]
+          ].each do |name, uri, required, type|
+            install_get_attribute(name, uri, required, type)
+          end
+
+          content_setup
+
+          def initialize(*args)
+            if Utils.element_initialize_arguments?(args)
+              super
+            else
+              super()
+              self.isPermaLink = args[0]
+              self.content = args[1]
+            end
+          end
+
+          alias_method :_PermaLink?, :PermaLink?
+          private :_PermaLink?
+          def PermaLink?
+            perma = _PermaLink?
+            perma or perma.nil?
+          end
+
+          private
+          def maker_target(item)
+            item.guid
+          end
+
+          def setup_maker_attributes(guid)
+            guid.isPermaLink = isPermaLink
+            guid.content = content
+          end
+        end
+
+      end
+
+    end
+
+  end
+
+  RSS09::ELEMENTS.each do |name|
+    BaseListener.install_get_text_element("", name, "#{name}=")
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rss/content.rb b/ruby_1_8_6/lib/rss/content.rb
new file mode 100644
index 0000000000..1b13f39fcf
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/content.rb
@@ -0,0 +1,38 @@
+require "rss/1.0"
+
+module RSS
+
+  CONTENT_PREFIX = 'content'
+  CONTENT_URI = "http://purl.org/rss/1.0/modules/content/"
+
+  RDF.install_ns(CONTENT_PREFIX, CONTENT_URI)
+
+  module ContentModel
+
+    extend BaseModel
+
+    ELEMENTS = []
+
+    def self.append_features(klass)
+      super
+
+      klass.install_must_call_validator(CONTENT_PREFIX, CONTENT_URI)
+      %w(encoded).each do |name|
+        klass.install_text_element(name, CONTENT_URI, "?",
+                                   "#{CONTENT_PREFIX}_#{name}")
+      end
+    end
+  end
+
+  class RDF
+    class Item; include ContentModel; end
+  end
+
+  prefix_size = CONTENT_PREFIX.size + 1
+  ContentModel::ELEMENTS.uniq!
+  ContentModel::ELEMENTS.each do |full_name|
+    name = full_name[prefix_size..-1]
+    BaseListener.install_get_text_element(CONTENT_URI, name, "#{full_name}=")
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rss/converter.rb b/ruby_1_8_6/lib/rss/converter.rb
new file mode 100644
index 0000000000..d928c48223
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/converter.rb
@@ -0,0 +1,158 @@
+require "rss/utils"
+
+module RSS
+
+  class Converter
+    
+    include Utils
+
+    def initialize(to_enc, from_enc=nil)
+      normalized_to_enc = to_enc.downcase.gsub(/-/, '_')
+      from_enc ||= 'utf-8'
+      normalized_from_enc = from_enc.downcase.gsub(/-/, '_')
+      if normalized_to_enc == normalized_from_enc
+        def_same_enc()
+      else
+        def_diff_enc = "def_to_#{normalized_to_enc}_from_#{normalized_from_enc}"
+        if respond_to?(def_diff_enc)
+          __send__(def_diff_enc)
+        else
+          def_else_enc(to_enc, from_enc)
+        end
+      end
+    end
+
+    def convert(value)
+      value
+    end
+
+    def def_convert(depth=0)
+      instance_eval(<<-EOC, *get_file_and_line_from_caller(depth))
+      def convert(value)
+        if value.kind_of?(String)
+          #{yield('value')}
+        else
+          value
+        end
+      end
+      EOC
+    end
+
+    def def_iconv_convert(to_enc, from_enc, depth=0)
+      begin
+        require "iconv"
+        @iconv = Iconv.new(to_enc, from_enc)
+        def_convert(depth+1) do |value|
+          <<-EOC
+          begin
+            @iconv.iconv(#{value})
+          rescue Iconv::Failure
+            raise ConversionError.new(#{value}, "#{to_enc}", "#{from_enc}")
+          end
+          EOC
+        end
+      rescue LoadError, ArgumentError, SystemCallError
+        raise UnknownConversionMethodError.new(to_enc, from_enc)
+      end
+    end
+    
+    def def_else_enc(to_enc, from_enc)
+      def_iconv_convert(to_enc, from_enc, 0)
+    end
+    
+    def def_same_enc()
+      def_convert do |value|
+        value
+      end
+    end
+
+    def def_uconv_convert_if_can(meth, to_enc, from_enc, nkf_arg)
+      begin
+        require "uconv"
+        def_convert(1) do |value|
+          <<-EOC
+          begin
+            Uconv.#{meth}(#{value})
+          rescue Uconv::Error
+            raise ConversionError.new(#{value}, "#{to_enc}", "#{from_enc}")
+          end
+          EOC
+        end
+      rescue LoadError
+        require 'nkf'
+        def_convert(1) do |value|
+          "NKF.nkf(#{nkf_arg.dump}, #{value})"
+        end
+      end
+    end
+
+    def def_to_euc_jp_from_utf_8
+      def_uconv_convert_if_can('u8toeuc', 'EUC-JP', 'UTF-8', '-We')
+    end
+    
+    def def_to_utf_8_from_euc_jp
+      def_uconv_convert_if_can('euctou8', 'UTF-8', 'EUC-JP', '-Ew')
+    end
+    
+    def def_to_shift_jis_from_utf_8
+      def_uconv_convert_if_can('u8tosjis', 'Shift_JIS', 'UTF-8', '-Ws')
+    end
+    
+    def def_to_utf_8_from_shift_jis
+      def_uconv_convert_if_can('sjistou8', 'UTF-8', 'Shift_JIS', '-Sw')
+    end
+    
+    def def_to_euc_jp_from_shift_jis
+      require "nkf"
+      def_convert do |value|
+        "NKF.nkf('-Se', #{value})"
+      end
+    end
+    
+    def def_to_shift_jis_from_euc_jp
+      require "nkf"
+      def_convert do |value|
+        "NKF.nkf('-Es', #{value})"
+      end
+    end
+    
+    def def_to_euc_jp_from_iso_2022_jp
+      require "nkf"
+      def_convert do |value|
+        "NKF.nkf('-Je', #{value})"
+      end
+    end
+    
+    def def_to_iso_2022_jp_from_euc_jp
+      require "nkf"
+      def_convert do |value|
+        "NKF.nkf('-Ej', #{value})"
+      end
+    end
+
+    def def_to_utf_8_from_iso_8859_1
+      def_convert do |value|
+        "#{value}.unpack('C*').pack('U*')"
+      end
+    end
+    
+    def def_to_iso_8859_1_from_utf_8
+      def_convert do |value|
+        <<-EOC
+        array_utf8 = #{value}.unpack('U*')
+        array_enc = []
+        array_utf8.each do |num|
+          if num <= 0xFF
+            array_enc << num
+          else
+            array_enc.concat "&\#\#{num};".unpack('C*')
+          end
+        end
+        array_enc.pack('C*')
+        EOC
+      end
+    end
+    
+  end
+  
+end
diff --git a/ruby_1_8_6/lib/rss/dublincore.rb b/ruby_1_8_6/lib/rss/dublincore.rb
new file mode 100644
index 0000000000..8a4afd4dd9
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/dublincore.rb
@@ -0,0 +1,154 @@
+require "rss/1.0"
+
+module RSS
+
+  DC_PREFIX = 'dc'
+  DC_URI = "http://purl.org/dc/elements/1.1/"
+  
+  RDF.install_ns(DC_PREFIX, DC_URI)
+
+  module BaseDublinCoreModel
+    def append_features(klass)
+      super
+
+      return if klass.instance_of?(Module)
+      DublinCoreModel::ELEMENT_NAME_INFOS.each do |name, plural_name|
+        plural = plural_name || "#{name}s"
+        full_name = "#{DC_PREFIX}_#{name}"
+        full_plural_name = "#{DC_PREFIX}_#{plural}"
+        klass_name = "DublinCore#{Utils.to_class_name(name)}"
+        klass.install_must_call_validator(DC_PREFIX, DC_URI)
+        klass.install_have_children_element(name, DC_URI, "*",
+                                            full_name, full_plural_name)
+        klass.module_eval(<<-EOC, *get_file_and_line_from_caller(0))
+          remove_method :#{full_name}
+          remove_method :#{full_name}=
+          remove_method :set_#{full_name}
+
+          def #{full_name}
+            @#{full_name}.first and @#{full_name}.first.value
+          end
+          
+          def #{full_name}=(new_value)
+            @#{full_name}[0] = Utils.new_with_value_if_need(#{klass_name}, new_value)
+          end
+          alias set_#{full_name} #{full_name}=
+        EOC
+      end
+      klass.module_eval(<<-EOC, *get_file_and_line_from_caller(0))
+        alias date #{DC_PREFIX}_date
+        alias date= #{DC_PREFIX}_date=
+      EOC
+    end
+  end
+  
+  module DublinCoreModel
+
+    extend BaseModel
+    extend BaseDublinCoreModel
+
+    TEXT_ELEMENTS = {
+      "title" => nil,
+      "description" => nil,
+      "creator" => nil,
+      "subject" => nil,
+      "publisher" => nil,
+      "contributor" => nil,
+      "type" => nil,
+      "format" => nil,
+      "identifier" => nil,
+      "source" => nil,
+      "language" => nil,
+      "relation" => nil,
+      "coverage" => nil,
+      "rights" => "rightses" # FIXME
+    }
+
+    DATE_ELEMENTS = {
+      "date" => "w3cdtf",
+    }
+    
+    ELEMENT_NAME_INFOS = DublinCoreModel::TEXT_ELEMENTS.to_a
+    DublinCoreModel::DATE_ELEMENTS.each do |name, |
+      ELEMENT_NAME_INFOS << [name, nil]
+    end
+    
+    ELEMENTS = TEXT_ELEMENTS.keys + DATE_ELEMENTS.keys
+
+    ELEMENTS.each do |name, plural_name|
+      module_eval(<<-EOC, *get_file_and_line_from_caller(0))
+        class DublinCore#{Utils.to_class_name(name)} < Element
+          include RSS10
+          
+          content_setup
+
+          class << self
+            def required_prefix
+              DC_PREFIX
+            end
+        
+            def required_uri
+              DC_URI
+            end
+          end
+
+          @tag_name = #{name.dump}
+
+          alias_method(:value, :content)
+          alias_method(:value=, :content=)
+          
+          def initialize(*args)
+            if Utils.element_initialize_arguments?(args)
+              super
+            else
+              super()
+              self.content = args[0]
+            end
+          end
+      
+          def full_name
+            tag_name_with_prefix(DC_PREFIX)
+          end
+
+          def maker_target(target)
+            target.new_#{name}
+          end
+
+          def setup_maker_attributes(#{name})
+            #{name}.content = content
+          end
+        end
+      EOC
+    end
+
+    DATE_ELEMENTS.each do |name, type|
+      module_eval(<<-EOC, *get_file_and_line_from_caller(0))
+        class DublinCore#{Utils.to_class_name(name)} < Element
+          remove_method(:content=)
+          remove_method(:value=)
+
+          date_writer("content", #{type.dump}, #{name.dump})
+          
+          alias_method(:value=, :content=)
+        end
+      EOC
+    end
+  end
+
+  # For backward compatibility
+  DublincoreModel = DublinCoreModel
+
+  class RDF
+    class Channel; include DublinCoreModel; end
+    class Image; include DublinCoreModel; end
+    class Item; include DublinCoreModel; end
+    class Textinput; include DublinCoreModel; end
+  end
+
+  DublinCoreModel::ELEMENTS.each do |name|
+    class_name = Utils.to_class_name(name)
+    BaseListener.install_class_name(DC_URI, name, "DublinCore#{class_name}")
+  end
+
+  DublinCoreModel::ELEMENTS.collect! {|name| "#{DC_PREFIX}_#{name}"}
+end
diff --git a/ruby_1_8_6/lib/rss/image.rb b/ruby_1_8_6/lib/rss/image.rb
new file mode 100644
index 0000000000..a9e9e9094e
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/image.rb
@@ -0,0 +1,193 @@
+require 'rss/1.0'
+require 'rss/dublincore'
+
+module RSS
+
+  IMAGE_PREFIX = 'image'
+  IMAGE_URI = 'http://web.resource.org/rss/1.0/modules/image/'
+
+  RDF.install_ns(IMAGE_PREFIX, IMAGE_URI)
+
+  IMAGE_ELEMENTS = []
+
+  %w(item favicon).each do |name|
+    class_name = Utils.to_class_name(name)
+    BaseListener.install_class_name(IMAGE_URI, name, "Image#{class_name}")
+    IMAGE_ELEMENTS << "#{IMAGE_PREFIX}_#{name}"
+  end
+  
+  module ImageModelUtils
+    def validate_one_tag_name(ignore_unknown_element, name, tags)
+      if !ignore_unknown_element
+        invalid = tags.find {|tag| tag != name}
+        raise UnknownTagError.new(invalid, IMAGE_URI) if invalid
+      end
+      raise TooMuchTagError.new(name, tag_name) if tags.size > 1
+    end
+  end
+  
+  module ImageItemModel
+    include ImageModelUtils
+    extend BaseModel
+
+    def self.append_features(klass)
+      super
+
+      klass.install_have_child_element("item", IMAGE_URI, "?",
+                                       "#{IMAGE_PREFIX}_item")
+      klass.install_must_call_validator(IMAGE_PREFIX, IMAGE_URI)
+    end
+
+    class ImageItem < Element
+      include RSS10
+      include DublinCoreModel
+
+      @tag_name = "item"
+      
+      class << self
+        def required_prefix
+          IMAGE_PREFIX
+        end
+        
+        def required_uri
+          IMAGE_URI
+        end
+      end
+
+      install_must_call_validator(IMAGE_PREFIX, IMAGE_URI)
+
+      [
+        ["about", ::RSS::RDF::URI, true],
+        ["resource", ::RSS::RDF::URI, false],
+      ].each do |name, uri, required|
+        install_get_attribute(name, uri, required, nil, nil,
+                              "#{::RSS::RDF::PREFIX}:#{name}")
+      end
+
+      %w(width height).each do |tag|
+        full_name = "#{IMAGE_PREFIX}_#{tag}"
+        disp_name = "#{IMAGE_PREFIX}:#{tag}"
+        install_text_element(tag, IMAGE_URI, "?",
+                             full_name, :integer, disp_name)
+        BaseListener.install_get_text_element(IMAGE_URI, tag, "#{full_name}=")
+      end
+
+      alias width= image_width=
+      alias width image_width
+      alias height= image_height=
+      alias height image_height
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.about = args[0]
+          self.resource = args[1]
+        end
+      end
+
+      def full_name
+        tag_name_with_prefix(IMAGE_PREFIX)
+      end
+
+      private
+      def maker_target(target)
+        target.image_item
+      end
+
+      def setup_maker_attributes(item)
+        item.about = self.about
+        item.resource = self.resource
+      end
+    end
+  end
+  
+  module ImageFaviconModel
+    include ImageModelUtils
+    extend BaseModel
+    
+    def self.append_features(klass)
+      super
+
+      unless klass.class == Module
+        klass.install_have_child_element("favicon", IMAGE_URI, "?",
+                                         "#{IMAGE_PREFIX}_favicon")
+        klass.install_must_call_validator(IMAGE_PREFIX, IMAGE_URI)
+      end
+    end
+
+    class ImageFavicon < Element
+      include RSS10
+      include DublinCoreModel
+
+      @tag_name = "favicon"
+      
+      class << self
+        def required_prefix
+          IMAGE_PREFIX
+        end
+        
+        def required_uri
+          IMAGE_URI
+        end
+      end
+
+      [
+        ["about", ::RSS::RDF::URI, true, ::RSS::RDF::PREFIX],
+        ["size", IMAGE_URI, true, IMAGE_PREFIX],
+      ].each do |name, uri, required, prefix|
+        install_get_attribute(name, uri, required, nil, nil,
+                              "#{prefix}:#{name}")
+      end
+
+      AVAILABLE_SIZES = %w(small medium large)
+      alias_method :_size=, :size=
+      private :_size=
+      def size=(new_value)
+        if @do_validate and !new_value.nil?
+          new_value = new_value.strip
+          unless AVAILABLE_SIZES.include?(new_value)
+            attr_name = "#{IMAGE_PREFIX}:size"
+            raise NotAvailableValueError.new(full_name, new_value, attr_name)
+          end
+        end
+        __send__(:_size=, new_value)
+      end
+      
+      alias image_size= size=
+      alias image_size size
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.about = args[0]
+          self.size = args[1]
+        end
+      end
+
+      def full_name
+        tag_name_with_prefix(IMAGE_PREFIX)
+      end
+
+      private
+      def maker_target(target)
+        target.image_favicon
+      end
+
+      def setup_maker_attributes(favicon)
+        favicon.about = self.about
+        favicon.size = self.size
+      end
+    end
+
+  end
+
+  class RDF
+    class Channel; include ImageFaviconModel; end
+    class Item; include ImageItemModel; end
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rss/maker.rb b/ruby_1_8_6/lib/rss/maker.rb
new file mode 100644
index 0000000000..9ed799ac7f
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/maker.rb
@@ -0,0 +1,37 @@
+require "rss/rss"
+
+module RSS
+
+  module Maker
+
+    MAKERS = {}
+    
+    class << self
+      def make(version, &block)
+        maker(version).make(&block)
+      end
+
+      def maker(version)
+        MAKERS[version]
+      end
+
+      def add_maker(version, maker)
+        MAKERS[version] = maker
+      end
+
+      def filename_to_version(filename)
+        File.basename(filename, ".*")
+      end
+    end
+  end
+  
+end
+
+require "rss/maker/1.0"
+require "rss/maker/2.0"
+require "rss/maker/content"
+require "rss/maker/dublincore"
+require "rss/maker/syndication"
+require "rss/maker/taxonomy"
+require "rss/maker/trackback"
+require "rss/maker/image"
diff --git a/ruby_1_8_6/lib/rss/maker/0.9.rb b/ruby_1_8_6/lib/rss/maker/0.9.rb
new file mode 100644
index 0000000000..b82585fb96
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/maker/0.9.rb
@@ -0,0 +1,224 @@
+require "rss/0.9"
+
+require "rss/maker/base"
+
+module RSS
+  module Maker
+    
+    class RSS09 < RSSBase
+      
+      def initialize(rss_version="0.91")
+        super
+      end
+      
+      private
+      def make_rss
+        Rss.new(@rss_version, @version, @encoding, @standalone)
+      end
+
+      def setup_elements(rss)
+        setup_channel(rss)
+      end
+
+      class Channel < ChannelBase
+        
+        def to_rss(rss)
+          channel = Rss::Channel.new
+          set = setup_values(channel)
+          if set
+            rss.channel = channel
+            setup_items(rss)
+            setup_image(rss)
+            setup_textinput(rss)
+            setup_other_elements(rss)
+            if rss.channel.image
+              rss
+            else
+              nil
+            end
+          elsif variable_is_set?
+            raise NotSetError.new("maker.channel", not_set_required_variables)
+          end
+        end
+        
+        def have_required_values?
+          @title and @link and @description and @language
+        end
+        
+        private
+        def setup_items(rss)
+          @maker.items.to_rss(rss)
+        end
+        
+        def setup_image(rss)
+          @maker.image.to_rss(rss)
+        end
+        
+        def setup_textinput(rss)
+          @maker.textinput.to_rss(rss)
+        end
+        
+        def variables
+          super + ["pubDate"]
+        end
+
+        def required_variable_names
+          %w(title link description language)
+        end
+        
+        class SkipDays < SkipDaysBase
+          def to_rss(rss, channel)
+            unless @days.empty?
+              skipDays = Rss::Channel::SkipDays.new
+              channel.skipDays = skipDays
+              @days.each do |day|
+                day.to_rss(rss, skipDays.days)
+              end
+            end
+          end
+          
+          class Day < DayBase
+            def to_rss(rss, days)
+              day = Rss::Channel::SkipDays::Day.new
+              set = setup_values(day)
+              if set
+                days << day
+                setup_other_elements(rss)
+              end
+            end
+
+            def have_required_values?
+              @content
+            end
+          end
+        end
+        
+        class SkipHours < SkipHoursBase
+          def to_rss(rss, channel)
+            unless @hours.empty?
+              skipHours = Rss::Channel::SkipHours.new
+              channel.skipHours = skipHours
+              @hours.each do |hour|
+                hour.to_rss(rss, skipHours.hours)
+              end
+            end
+          end
+          
+          class Hour < HourBase
+            def to_rss(rss, hours)
+              hour = Rss::Channel::SkipHours::Hour.new
+              set = setup_values(hour)
+              if set
+                hours << hour
+                setup_other_elements(rss)
+              end
+            end
+
+            def have_required_values?
+              @content
+            end
+          end
+        end
+        
+        class Cloud < CloudBase
+          def to_rss(*args)
+          end
+        end
+
+        class Categories < CategoriesBase
+          def to_rss(*args)
+          end
+
+          class Category < CategoryBase
+          end
+        end
+      end
+      
+      class Image < ImageBase
+        def to_rss(rss)
+          image = Rss::Channel::Image.new
+          set = setup_values(image)
+          if set
+            image.link = link
+            rss.channel.image = image
+            setup_other_elements(rss)
+          end
+        end
+        
+        def have_required_values?
+          @url and @title and link
+        end
+      end
+      
+      class Items < ItemsBase
+        def to_rss(rss)
+          if rss.channel
+            normalize.each do |item|
+              item.to_rss(rss)
+            end
+            setup_other_elements(rss)
+          end
+        end
+        
+        class Item < ItemBase
+          def to_rss(rss)
+            item = Rss::Channel::Item.new
+            set = setup_values(item)
+            if set
+              rss.items << item
+              setup_other_elements(rss)
+            end
+          end
+          
+          private
+          def have_required_values?
+            @title and @link
+          end
+
+          class Guid < GuidBase
+            def to_rss(*args)
+            end
+          end
+        
+          class Enclosure < EnclosureBase
+            def to_rss(*args)
+            end
+          end
+        
+          class Source < SourceBase
+            def to_rss(*args)
+            end
+          end
+        
+          class Categories < CategoriesBase
+            def to_rss(*args)
+            end
+
+            class Category < CategoryBase
+            end
+          end
+          
+        end
+      end
+      
+      class Textinput < TextinputBase
+        def to_rss(rss)
+          textInput = Rss::Channel::TextInput.new
+          set = setup_values(textInput)
+          if set
+            rss.channel.textInput = textInput
+            setup_other_elements(rss)
+          end
+        end
+
+        private
+        def have_required_values?
+          @title and @description and @name and @link
+        end
+      end
+    end
+    
+    add_maker(filename_to_version(__FILE__), RSS09)
+    add_maker(filename_to_version(__FILE__) + "1", RSS09)
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/maker/1.0.rb b/ruby_1_8_6/lib/rss/maker/1.0.rb
new file mode 100644
index 0000000000..3e6542a007
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/maker/1.0.rb
@@ -0,0 +1,204 @@
+require "rss/1.0"
+
+require "rss/maker/base"
+
+module RSS
+  module Maker
+
+    class RSS10 < RSSBase
+
+      def initialize
+        super("1.0")
+      end
+
+      private
+      def make_rss
+        RDF.new(@version, @encoding, @standalone)
+      end
+
+      def setup_elements(rss)
+        setup_channel(rss)
+        setup_image(rss)
+        setup_items(rss)
+        setup_textinput(rss)
+      end
+
+      class Channel < ChannelBase
+
+        def to_rss(rss)
+          set = false
+          if @about
+            channel = RDF::Channel.new(@about)
+            set = setup_values(channel)
+            if set
+              channel.dc_dates.clear
+              rss.channel = channel
+              setup_items(rss)
+              setup_image(rss)
+              setup_textinput(rss)
+              setup_other_elements(rss)
+            end
+          end
+
+          if (!@about or !set) and variable_is_set?
+            raise NotSetError.new("maker.channel", not_set_required_variables)
+          end
+        end
+
+        def have_required_values?
+          @about and @title and @link and @description
+        end
+
+        private
+        def setup_items(rss)
+          items = RDF::Channel::Items.new
+          seq = items.Seq
+          @maker.items.normalize.each do |item|
+            seq.lis << RDF::Channel::Items::Seq::Li.new(item.link)
+          end
+          rss.channel.items = items
+        end
+        
+        def setup_image(rss)
+          if @maker.image.have_required_values?
+            rss.channel.image = RDF::Channel::Image.new(@maker.image.url)
+          end
+        end
+
+        def setup_textinput(rss)
+          if @maker.textinput.have_required_values?
+            textinput = RDF::Channel::Textinput.new(@maker.textinput.link)
+            rss.channel.textinput = textinput
+          end
+        end
+
+        def required_variable_names
+          %w(about title link description)
+        end
+        
+        class SkipDays < SkipDaysBase
+          def to_rss(*args)
+          end
+          
+          class Day < DayBase
+          end
+        end
+        
+        class SkipHours < SkipHoursBase
+          def to_rss(*args)
+          end
+
+          class Hour < HourBase
+          end
+        end
+        
+        class Cloud < CloudBase
+          def to_rss(*args)
+          end
+        end
+
+        class Categories < CategoriesBase
+          def to_rss(*args)
+          end
+
+          class Category < CategoryBase
+          end
+        end
+      end
+
+      class Image < ImageBase
+        def to_rss(rss)
+          if @url
+            image = RDF::Image.new(@url)
+            set = setup_values(image)
+            if set
+              rss.image = image
+              setup_other_elements(rss)
+            end
+          end
+        end
+
+        def have_required_values?
+          @url and @title and link and @maker.channel.have_required_values?
+        end
+
+        private
+        def variables
+          super + ["link"]
+        end
+      end
+
+      class Items < ItemsBase
+        def to_rss(rss)
+          if rss.channel
+            normalize.each do |item|
+              item.to_rss(rss)
+            end
+            setup_other_elements(rss)
+          end
+        end
+
+        class Item < ItemBase
+          def to_rss(rss)
+            if @link
+              item = RDF::Item.new(@link)
+              set = setup_values(item)
+              if set
+                item.dc_dates.clear
+                rss.items << item
+                setup_other_elements(rss)
+              end
+            end
+          end
+
+          def have_required_values?
+            @title and @link
+          end
+
+          class Guid < GuidBase
+            def to_rss(*args)
+            end
+          end
+        
+          class Enclosure < EnclosureBase
+            def to_rss(*args)
+            end
+          end
+        
+          class Source < SourceBase
+            def to_rss(*args)
+            end
+          end
+        
+          class Categories < CategoriesBase
+            def to_rss(*args)
+            end
+
+            class Category < CategoryBase
+            end
+          end
+        end
+      end
+      
+      class Textinput < TextinputBase
+        def to_rss(rss)
+          if @link
+            textinput = RDF::Textinput.new(@link)
+            set = setup_values(textinput)
+            if set
+              rss.textinput = textinput
+              setup_other_elements(rss)
+            end
+          end
+        end
+
+        def have_required_values?
+          @title and @description and @name and @link and
+            @maker.channel.have_required_values?
+        end
+      end
+    end
+
+    add_maker(filename_to_version(__FILE__), RSS10)
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/maker/2.0.rb b/ruby_1_8_6/lib/rss/maker/2.0.rb
new file mode 100644
index 0000000000..a958661614
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/maker/2.0.rb
@@ -0,0 +1,168 @@
+require "rss/2.0"
+
+require "rss/maker/0.9"
+
+module RSS
+  module Maker
+    
+    class RSS20 < RSS09
+      
+      def initialize(rss_version="2.0")
+        super
+      end
+
+      class Channel < RSS09::Channel
+
+        def have_required_values?
+          @title and @link and @description
+        end
+
+        def required_variable_names
+          %w(title link description)
+        end
+        
+        class SkipDays < RSS09::Channel::SkipDays
+          class Day < RSS09::Channel::SkipDays::Day
+          end
+        end
+        
+        class SkipHours < RSS09::Channel::SkipHours
+          class Hour < RSS09::Channel::SkipHours::Hour
+          end
+        end
+        
+        class Cloud < RSS09::Channel::Cloud
+          def to_rss(rss, channel)
+            cloud = Rss::Channel::Cloud.new
+            set = setup_values(cloud)
+            if set
+              channel.cloud = cloud
+              setup_other_elements(rss)
+            end
+          end
+
+          def have_required_values?
+            @domain and @port and @path and
+              @registerProcedure and @protocol
+          end
+        end
+
+        class Categories < RSS09::Channel::Categories
+          def to_rss(rss, channel)
+            @categories.each do |category|
+              category.to_rss(rss, channel)
+            end
+          end
+          
+          class Category < RSS09::Channel::Categories::Category
+            def to_rss(rss, channel)
+              category = Rss::Channel::Category.new
+              set = setup_values(category)
+              if set
+                channel.categories << category
+                setup_other_elements(rss)
+              end
+            end
+            
+            def have_required_values?
+              @content
+            end
+          end
+        end
+        
+      end
+      
+      class Image < RSS09::Image
+      end
+      
+      class Items < RSS09::Items
+        
+        class Item < RSS09::Items::Item
+
+          def have_required_values?
+            @title or @description
+          end
+
+          private
+          def variables
+            super + ["pubDate"]
+          end
+
+          class Guid < RSS09::Items::Item::Guid
+            def to_rss(rss, item)
+              guid = Rss::Channel::Item::Guid.new
+              set = setup_values(guid)
+              if set
+                item.guid = guid
+                setup_other_elements(rss)
+              end
+            end
+            
+            def have_required_values?
+              @content
+            end
+          end
+
+          class Enclosure < RSS09::Items::Item::Enclosure
+            def to_rss(rss, item)
+              enclosure = Rss::Channel::Item::Enclosure.new
+              set = setup_values(enclosure)
+              if set
+                item.enclosure = enclosure
+                setup_other_elements(rss)
+              end
+            end
+            
+            def have_required_values?
+              @url and @length and @type
+            end
+          end
+
+          class Source < RSS09::Items::Item::Source
+            def to_rss(rss, item)
+              source = Rss::Channel::Item::Source.new
+              set = setup_values(source)
+              if set
+                item.source = source
+                setup_other_elements(rss)
+              end
+            end
+            
+            def have_required_values?
+              @url and @content
+            end
+          end
+
+          class Categories < RSS09::Items::Item::Categories
+            def to_rss(rss, item)
+              @categories.each do |category|
+                category.to_rss(rss, item)
+              end
+            end
+          
+            class Category < RSS09::Items::Item::Categories::Category
+              def to_rss(rss, item)
+                category = Rss::Channel::Item::Category.new
+                set = setup_values(category)
+                if set
+                  item.categories << category
+                  setup_other_elements(rss)
+                end
+              end
+              
+              def have_required_values?
+                @content
+              end
+            end
+          end
+        end
+        
+      end
+      
+      class Textinput < RSS09::Textinput
+      end
+    end
+    
+    add_maker(filename_to_version(__FILE__), RSS20)
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/maker/base.rb b/ruby_1_8_6/lib/rss/maker/base.rb
new file mode 100644
index 0000000000..2327dd98e4
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/maker/base.rb
@@ -0,0 +1,546 @@
+require 'forwardable'
+
+require 'rss/rss'
+
+module RSS
+  module Maker
+
+    module Base
+
+      def self.append_features(klass)
+        super
+
+        klass.module_eval(<<-EOC, __FILE__, __LINE__)
+
+        OTHER_ELEMENTS = []
+        NEED_INITIALIZE_VARIABLES = []
+
+        def self.inherited(subclass)
+          subclass.const_set("OTHER_ELEMENTS", [])
+          subclass.const_set("NEED_INITIALIZE_VARIABLES", [])
+
+          subclass.module_eval(<<-EOEOC, __FILE__, __LINE__)
+            def self.other_elements
+              OTHER_ELEMENTS + super
+            end
+
+            def self.need_initialize_variables
+              NEED_INITIALIZE_VARIABLES + super
+            end
+          EOEOC
+        end
+
+        def self.add_other_element(variable_name)
+          OTHER_ELEMENTS << variable_name
+        end
+
+        def self.other_elements
+          OTHER_ELEMENTS
+        end
+
+        def self.add_need_initialize_variable(variable_name, init_value="nil")
+          NEED_INITIALIZE_VARIABLES << [variable_name, init_value]
+        end
+
+        def self.need_initialize_variables
+          NEED_INITIALIZE_VARIABLES
+        end
+
+        def self.def_array_element(name)
+          include Enumerable
+          extend Forwardable
+
+          def_delegators("@\#{name}", :<<, :[], :[]=, :first, :last)
+          def_delegators("@\#{name}", :push, :pop, :shift, :unshift)
+          def_delegators("@\#{name}", :each, :size)
+          
+          add_need_initialize_variable(name, "[]")
+        end
+        EOC
+      end
+      
+      def initialize(maker)
+        @maker = maker
+        initialize_variables
+      end
+
+      def have_required_values?
+        true
+      end
+      
+      private
+      def initialize_variables
+        self.class.need_initialize_variables.each do |variable_name, init_value|
+          instance_eval("@#{variable_name} = #{init_value}", __FILE__, __LINE__)
+        end
+      end
+
+      def setup_other_elements(rss)
+        self.class.other_elements.each do |element|
+          __send__("setup_#{element}", rss, current_element(rss))
+        end
+      end
+
+      def current_element(rss)
+        rss
+      end
+      
+      def setup_values(target)
+        set = false
+        if have_required_values?
+          variables.each do |var|
+            setter = "#{var}="
+            if target.respond_to?(setter)
+              value = __send__(var)
+              if value
+                target.__send__(setter, value)
+                set = true
+              end
+            end
+          end
+        end
+        set
+      end
+
+      def variables
+        self.class.need_initialize_variables.find_all do |name, init|
+          "nil" == init
+        end.collect do |name, init|
+          name
+        end
+      end
+
+      def variable_is_set?
+        variables.find {|var| !__send__(var).nil?}
+      end
+
+      def not_set_required_variables
+        required_variable_names.find_all do |var|
+          __send__(var).nil?
+        end
+      end
+
+      def required_variables_are_set?
+        required_variable_names.each do |var|
+          return false if __send__(var).nil?
+        end
+        true
+      end
+      
+    end
+
+    class RSSBase
+      include Base
+
+      class << self
+        def make(&block)
+          new.make(&block)
+        end
+      end
+
+      %w(xml_stylesheets channel image items textinput).each do |element|
+        attr_reader element
+        add_need_initialize_variable(element, "make_#{element}")
+        module_eval(<<-EOC, __FILE__, __LINE__)
+          private
+          def setup_#{element}(rss)
+            @#{element}.to_rss(rss)
+          end
+
+          def make_#{element}
+            self.class::#{Utils.to_class_name(element)}.new(self)
+          end
+EOC
+      end
+      
+      attr_reader :rss_version
+      attr_accessor :version, :encoding, :standalone
+      
+      def initialize(rss_version)
+        super(self)
+        @rss_version = rss_version
+        @version = "1.0"
+        @encoding = "UTF-8"
+        @standalone = nil
+      end
+      
+      def make
+        if block_given?
+          yield(self)
+          to_rss
+        else
+          nil
+        end
+      end
+
+      def to_rss
+        rss = make_rss
+        setup_xml_stylesheets(rss)
+        setup_elements(rss)
+        setup_other_elements(rss)
+        if rss.channel
+          rss
+        else
+          nil
+        end
+      end
+      
+      private
+      remove_method :make_xml_stylesheets
+      def make_xml_stylesheets
+        XMLStyleSheets.new(self)
+      end
+      
+    end
+
+    class XMLStyleSheets
+      include Base
+
+      def_array_element("xml_stylesheets")
+
+      def to_rss(rss)
+        @xml_stylesheets.each do |xss|
+          xss.to_rss(rss)
+        end
+      end
+
+      def new_xml_stylesheet
+        xss = XMLStyleSheet.new(@maker)
+        @xml_stylesheets << xss
+        if block_given?
+          yield xss
+        else
+          xss
+        end
+      end
+
+      class XMLStyleSheet
+        include Base
+
+        ::RSS::XMLStyleSheet::ATTRIBUTES.each do |attribute|
+          attr_accessor attribute
+          add_need_initialize_variable(attribute)
+        end
+        
+        def to_rss(rss)
+          xss = ::RSS::XMLStyleSheet.new
+          guess_type_if_need(xss)
+          set = setup_values(xss)
+          if set
+            rss.xml_stylesheets << xss
+          end
+        end
+
+        def have_required_values?
+          @href and @type
+        end
+
+        private
+        def guess_type_if_need(xss)
+          if @type.nil?
+            xss.href = @href
+            @type = xss.type
+          end
+        end
+      end
+    end
+    
+    class ChannelBase
+      include Base
+
+      %w(cloud categories skipDays skipHours).each do |element|
+        attr_reader element
+        add_other_element(element)
+        add_need_initialize_variable(element, "make_#{element}")
+        module_eval(<<-EOC, __FILE__, __LINE__)
+          private
+          def setup_#{element}(rss, current)
+            @#{element}.to_rss(rss, current)
+          end
+
+          def make_#{element}
+            self.class::#{Utils.to_class_name(element)}.new(@maker)
+          end
+EOC
+      end
+
+      %w(about title link description language copyright
+         managingEditor webMaster rating docs date
+         lastBuildDate generator ttl).each do |element|
+        attr_accessor element
+        add_need_initialize_variable(element)
+      end
+
+      alias_method(:pubDate, :date)
+      alias_method(:pubDate=, :date=)
+
+      def current_element(rss)
+        rss.channel
+      end
+
+      class SkipDaysBase
+        include Base
+
+        def_array_element("days")
+
+        def new_day
+          day = self.class::Day.new(@maker)
+          @days << day
+          if block_given?
+            yield day
+          else
+            day
+          end
+        end
+        
+        def current_element(rss)
+          rss.channel.skipDays
+        end
+
+        class DayBase
+          include Base
+          
+          %w(content).each do |element|
+            attr_accessor element
+            add_need_initialize_variable(element)
+          end
+
+          def current_element(rss)
+            rss.channel.skipDays.last
+          end
+
+        end
+      end
+      
+      class SkipHoursBase
+        include Base
+
+        def_array_element("hours")
+
+        def new_hour
+          hour = self.class::Hour.new(@maker)
+          @hours << hour
+          if block_given?
+            yield hour
+          else
+            hour
+          end
+        end
+        
+        def current_element(rss)
+          rss.channel.skipHours
+        end
+
+        class HourBase
+          include Base
+          
+          %w(content).each do |element|
+            attr_accessor element
+            add_need_initialize_variable(element)
+          end
+
+          def current_element(rss)
+            rss.channel.skipHours.last
+          end
+
+        end
+      end
+      
+      class CloudBase
+        include Base
+        
+        %w(domain port path registerProcedure protocol).each do |element|
+          attr_accessor element
+          add_need_initialize_variable(element)
+        end
+        
+        def current_element(rss)
+          rss.channel.cloud
+        end
+
+      end
+
+      class CategoriesBase
+        include Base
+        
+        def_array_element("categories")
+
+        def new_category
+          category = self.class::Category.new(@maker)
+          @categories << category
+          if block_given?
+            yield category
+          else
+            category
+          end
+        end
+
+        class CategoryBase
+          include Base
+
+          %w(domain content).each do |element|
+            attr_accessor element
+            add_need_initialize_variable(element)
+          end
+        end
+      end
+    end
+    
+    class ImageBase
+      include Base
+
+      %w(title url width height description).each do |element|
+        attr_accessor element
+        add_need_initialize_variable(element)
+      end
+      
+      def link
+        @maker.channel.link
+      end
+
+      def current_element(rss)
+        rss.image
+      end
+    end
+    
+    class ItemsBase
+      include Base
+
+      def_array_element("items")
+      
+      attr_accessor :do_sort, :max_size
+      
+      def initialize(maker)
+        super
+        @do_sort = false
+        @max_size = -1
+      end
+      
+      def normalize
+        if @max_size >= 0
+          sort_if_need[0...@max_size]
+        else
+          sort_if_need[0..@max_size]
+        end
+      end
+      
+      def current_element(rss)
+        rss.items
+      end
+
+      def new_item
+        item = self.class::Item.new(@maker)
+        @items << item
+        if block_given?
+          yield item
+        else
+          item
+        end
+      end
+      
+      private
+      def sort_if_need
+        if @do_sort.respond_to?(:call)
+          @items.sort do |x, y|
+            @do_sort.call(x, y)
+          end
+        elsif @do_sort
+          @items.sort do |x, y|
+            y <=> x
+          end
+        else
+          @items
+        end
+      end
+
+      class ItemBase
+        include Base
+        
+        %w(guid enclosure source categories).each do |element|
+          attr_reader element
+          add_other_element(element)
+          add_need_initialize_variable(element, "make_#{element}")
+          module_eval(<<-EOC, __FILE__, __LINE__)
+          private
+          def setup_#{element}(rss, current)
+            @#{element}.to_rss(rss, current)
+          end
+
+          def make_#{element}
+            self.class::#{Utils.to_class_name(element)}.new(@maker)
+          end
+EOC
+        end
+      
+        %w(title link description date author comments).each do |element|
+          attr_accessor element
+          add_need_initialize_variable(element)
+        end
+
+        alias_method(:pubDate, :date)
+        alias_method(:pubDate=, :date=)
+
+        def <=>(other)
+          if date and other.date
+            date <=> other.date
+          elsif date
+            1
+          elsif other.date
+            -1
+          else
+            0
+          end
+        end
+      
+        def current_element(rss)
+          rss.items.last
+        end
+
+        class GuidBase
+          include Base
+
+          %w(isPermaLink content).each do |element|
+            attr_accessor element
+            add_need_initialize_variable(element)
+          end
+        end
+      
+        class EnclosureBase
+          include Base
+
+          %w(url length type).each do |element|
+            attr_accessor element
+            add_need_initialize_variable(element)
+          end
+        end
+      
+        class SourceBase
+          include Base
+
+          %w(url content).each do |element|
+            attr_accessor element
+            add_need_initialize_variable(element)
+          end
+        end
+      
+        CategoriesBase = ChannelBase::CategoriesBase
+      
+      end
+    end
+
+    class TextinputBase
+      include Base
+
+      %w(title description name link).each do |element|
+        attr_accessor element
+        add_need_initialize_variable(element)
+      end
+      
+      def current_element(rss)
+        rss.textinput
+      end
+
+    end
+    
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/maker/content.rb b/ruby_1_8_6/lib/rss/maker/content.rb
new file mode 100644
index 0000000000..18590d0cf8
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/maker/content.rb
@@ -0,0 +1,29 @@
+require 'rss/content'
+require 'rss/maker/1.0'
+
+module RSS
+  module Maker
+    module ContentModel
+      def self.append_features(klass)
+        super
+
+        ::RSS::ContentModel::ELEMENTS.each do |element|
+          klass.add_need_initialize_variable(element)
+          klass.add_other_element(element)
+          klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+            attr_accessor :#{element}
+            def setup_#{element}(rss, current)
+              if #{element} and current.respond_to?(:#{element}=)
+                current.#{element} = @#{element} if @#{element}
+              end
+            end
+          EOC
+        end
+      end
+    end
+
+    class ItemsBase
+      class ItemBase; include ContentModel; end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/maker/dublincore.rb b/ruby_1_8_6/lib/rss/maker/dublincore.rb
new file mode 100644
index 0000000000..0cf1255e82
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/maker/dublincore.rb
@@ -0,0 +1,169 @@
+require 'rss/dublincore'
+require 'rss/maker/1.0'
+
+module RSS
+  module Maker
+    module DublinCoreModel
+      def self.append_features(klass)
+        super
+
+        ::RSS::DublinCoreModel::ELEMENT_NAME_INFOS.each do |name, plural_name|
+          plural_name ||= "#{name}s"
+          full_name = "#{RSS::DC_PREFIX}_#{name}"
+          full_plural_name = "#{RSS::DC_PREFIX}_#{plural_name}"
+          klass_name = Utils.to_class_name(name)
+          plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}"
+          full_plural_klass_name = "self.class::#{plural_klass_name}"
+          full_klass_name = "#{full_plural_klass_name}::#{klass_name}"
+          klass.add_need_initialize_variable(full_plural_name,
+                                             "make_#{full_plural_name}")
+          klass.add_other_element(full_plural_name)
+          klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+            attr_accessor :#{full_plural_name}
+            def make_#{full_plural_name}
+              #{full_plural_klass_name}.new(@maker)
+            end
+            
+            def setup_#{full_plural_name}(rss, current)
+              @#{full_plural_name}.to_rss(rss, current)
+            end
+
+            def #{full_name}
+              @#{full_plural_name}[0] and @#{full_plural_name}[0].value
+            end
+            
+            def #{full_name}=(new_value)
+              @#{full_plural_name}[0] = #{full_klass_name}.new(self)
+              @#{full_plural_name}[0].value = new_value
+            end
+EOC
+        end
+      end
+
+      ::RSS::DublinCoreModel::ELEMENT_NAME_INFOS.each do |name, plural_name|
+        plural_name ||= "#{name}s"
+        klass_name = Utils.to_class_name(name)
+        plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}"
+        module_eval(<<-EOC, __FILE__, __LINE__)
+        class #{plural_klass_name}Base
+          include Base
+
+          def_array_element(#{plural_name.dump})
+                            
+          def new_#{name}
+            #{name} = self.class::#{klass_name}.new(self)
+            @#{plural_name} << #{name}
+            if block_given?
+              yield #{name}
+            else
+              #{name}
+            end
+          end
+
+          def to_rss(rss, current)
+            @#{plural_name}.each do |#{name}|
+              #{name}.to_rss(rss, current)
+            end
+          end
+        
+          class #{klass_name}Base
+            include Base
+
+            attr_accessor :value
+            add_need_initialize_variable("value")
+            alias_method(:content, :value)
+            alias_method(:content=, :value=)
+
+            def have_required_values?
+              @value
+            end
+          end
+        end
+        EOC
+      end
+
+      def self.install_dublin_core(klass)
+        ::RSS::DublinCoreModel::ELEMENT_NAME_INFOS.each do |name, plural_name|
+          plural_name ||= "#{name}s"
+          klass_name = Utils.to_class_name(name)
+          plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}"
+          full_klass_name = "DublinCore#{klass_name}"
+          klass.module_eval(<<-EOC, *Utils.get_file_and_line_from_caller(1))
+          class #{plural_klass_name} < #{plural_klass_name}Base
+            class #{klass_name} < #{klass_name}Base
+              def to_rss(rss, current)
+                if value and current.respond_to?(:dc_#{name})
+                  new_item = current.class::#{full_klass_name}.new(value)
+                  current.dc_#{plural_name} << new_item
+                end
+              end
+            end
+          end
+EOC
+        end
+      end
+    end
+
+    class ChannelBase
+      include DublinCoreModel
+      
+      remove_method(:date)
+      remove_method(:date=)
+      alias_method(:date, :dc_date)
+      alias_method(:date=, :dc_date=)
+    end
+    
+    class ImageBase; include DublinCoreModel; end
+    class ItemsBase
+      class ItemBase
+        include DublinCoreModel
+        
+        remove_method(:date)
+        remove_method(:date=)
+        alias_method(:date, :dc_date)
+        alias_method(:date=, :dc_date=)
+      end
+    end
+    class TextinputBase; include DublinCoreModel; end
+
+    class RSS10
+      class Channel
+        DublinCoreModel.install_dublin_core(self)
+      end
+
+      class Image
+        DublinCoreModel.install_dublin_core(self)
+      end
+
+      class Items
+        class Item
+          DublinCoreModel.install_dublin_core(self)
+        end
+      end
+
+      class Textinput
+        DublinCoreModel.install_dublin_core(self)
+      end
+    end
+    
+    class RSS09
+      class Channel
+        DublinCoreModel.install_dublin_core(self)
+      end
+
+      class Image
+        DublinCoreModel.install_dublin_core(self)
+      end
+
+      class Items
+        class Item
+          DublinCoreModel.install_dublin_core(self)
+        end
+      end
+
+      class Textinput
+        DublinCoreModel.install_dublin_core(self)
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/maker/image.rb b/ruby_1_8_6/lib/rss/maker/image.rb
new file mode 100644
index 0000000000..ed51c8ecba
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/maker/image.rb
@@ -0,0 +1,145 @@
+require 'rss/image'
+require 'rss/maker/1.0'
+require 'rss/maker/dublincore'
+
+module RSS
+  module Maker
+    module ImageItemModel
+      def self.append_features(klass)
+        super
+
+        name = "#{RSS::IMAGE_PREFIX}_item"
+        klass.add_need_initialize_variable(name, "make_#{name}")
+        klass.add_other_element(name)
+        klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+          attr_reader :#{name}
+          def setup_#{name}(rss, current)
+            if @#{name}
+              @#{name}.to_rss(rss, current)
+            end
+          end
+
+          def make_#{name}
+            self.class::#{Utils.to_class_name(name)}.new(@maker)
+          end
+EOC
+      end
+
+      class ImageItemBase
+        include Base
+        include Maker::DublinCoreModel
+
+        attr_accessor :about, :resource, :image_width, :image_height
+        add_need_initialize_variable("about")
+        add_need_initialize_variable("resource")
+        add_need_initialize_variable("image_width")
+        add_need_initialize_variable("image_height")
+        alias width= image_width=
+        alias width image_width
+        alias height= image_height=
+        alias height image_height
+
+        def have_required_values?
+          @about
+        end
+      end
+    end
+
+    module ImageFaviconModel
+      def self.append_features(klass)
+        super
+
+        name = "#{RSS::IMAGE_PREFIX}_favicon"
+        klass.add_need_initialize_variable(name, "make_#{name}")
+        klass.add_other_element(name)
+        klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+          attr_reader :#{name}
+          def setup_#{name}(rss, current)
+            if @#{name}
+              @#{name}.to_rss(rss, current)
+            end
+          end
+
+          def make_#{name}
+            self.class::#{Utils.to_class_name(name)}.new(@maker)
+          end
+EOC
+      end
+
+      class ImageFaviconBase
+        include Base
+        include Maker::DublinCoreModel
+
+        attr_accessor :about, :image_size
+        add_need_initialize_variable("about")
+        add_need_initialize_variable("image_size")
+        alias size image_size
+        alias size= image_size=
+
+        def have_required_values?
+          @about and @image_size
+        end
+      end
+    end
+
+    class ChannelBase; include Maker::ImageFaviconModel; end
+    
+    class ItemsBase
+      class ItemBase; include Maker::ImageItemModel; end
+    end
+
+    class RSS10
+      class Items
+        class Item
+          class ImageItem < ImageItemBase
+            DublinCoreModel.install_dublin_core(self)
+            def to_rss(rss, current)
+              if @about
+                item = ::RSS::ImageItemModel::ImageItem.new(@about, @resource)
+                setup_values(item)
+                setup_other_elements(item)
+                current.image_item = item
+              end
+            end
+          end
+        end
+      end
+      
+      class Channel
+        class ImageFavicon < ImageFaviconBase
+          DublinCoreModel.install_dublin_core(self)
+          def to_rss(rss, current)
+            if @about and @image_size
+              args = [@about, @image_size]
+              favicon = ::RSS::ImageFaviconModel::ImageFavicon.new(*args)
+              setup_values(favicon)
+              setup_other_elements(favicon)
+              current.image_favicon = favicon
+            end
+          end
+        end
+      end
+    end
+
+    class RSS09
+      class Items
+        class Item
+          class ImageItem < ImageItemBase
+            DublinCoreModel.install_dublin_core(self)
+            def to_rss(*args)
+            end
+          end
+        end
+      end
+      
+      class Channel
+        class ImageFavicon < ImageFaviconBase
+          DublinCoreModel.install_dublin_core(self)
+          def to_rss(*args)
+          end
+        end
+      end
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/maker/syndication.rb b/ruby_1_8_6/lib/rss/maker/syndication.rb
new file mode 100644
index 0000000000..3717086257
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/maker/syndication.rb
@@ -0,0 +1,27 @@
+require 'rss/syndication'
+require 'rss/maker/1.0'
+
+module RSS
+  module Maker
+    module SyndicationModel
+      def self.append_features(klass)
+        super
+
+        ::RSS::SyndicationModel::ELEMENTS.each do |element|
+          klass.add_need_initialize_variable(element)
+          klass.add_other_element(element)
+          klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+            attr_accessor :#{element}
+            def setup_#{element}(rss, current)
+              if #{element} and current.respond_to?(:#{element}=)
+                current.#{element} = @#{element} if @#{element}
+              end
+            end
+          EOC
+        end
+      end
+    end
+
+    class ChannelBase; include SyndicationModel; end
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/maker/taxonomy.rb b/ruby_1_8_6/lib/rss/maker/taxonomy.rb
new file mode 100644
index 0000000000..f272996581
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/maker/taxonomy.rb
@@ -0,0 +1,182 @@
+require 'rss/taxonomy'
+require 'rss/maker/1.0'
+require 'rss/maker/dublincore'
+
+module RSS
+  module Maker
+    module TaxonomyTopicsModel
+      def self.append_features(klass)
+        super
+
+        klass.add_need_initialize_variable("taxo_topics", "make_taxo_topics")
+        klass.add_other_element("taxo_topics")
+        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+          attr_reader :taxo_topics
+          def make_taxo_topics
+            self.class::TaxonomyTopics.new(@maker)
+          end
+            
+          def setup_taxo_topics(rss, current)
+            @taxo_topics.to_rss(rss, current)
+          end
+EOC
+      end
+
+      def self.install_taxo_topics(klass)
+        klass.module_eval(<<-EOC, *Utils.get_file_and_line_from_caller(1))
+          class TaxonomyTopics < TaxonomyTopicsBase
+            def to_rss(rss, current)
+              if current.respond_to?(:taxo_topics)
+                topics = current.class::TaxonomyTopics.new
+                bag = topics.Bag
+                @resources.each do |resource|
+                  bag.lis << RDF::Bag::Li.new(resource)
+                end
+                current.taxo_topics = topics
+              end
+            end
+          end
+EOC
+      end
+
+      class TaxonomyTopicsBase
+        include Base
+
+        attr_reader :resources
+        def_array_element("resources")
+      end
+    end
+
+    module TaxonomyTopicModel
+      def self.append_features(klass)
+        super
+
+        klass.add_need_initialize_variable("taxo_topics", "make_taxo_topics")
+        klass.add_other_element("taxo_topics")
+        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+          attr_reader :taxo_topics
+          def make_taxo_topics
+            self.class::TaxonomyTopics.new(@maker)
+          end
+            
+          def setup_taxo_topics(rss, current)
+            @taxo_topics.to_rss(rss, current)
+          end
+
+          def taxo_topic
+            @taxo_topics[0] and @taxo_topics[0].value
+          end
+            
+          def taxo_topic=(new_value)
+            @taxo_topic[0] = self.class::TaxonomyTopic.new(self)
+            @taxo_topic[0].value = new_value
+          end
+EOC
+      end
+    
+      def self.install_taxo_topic(klass)
+        klass.module_eval(<<-EOC, *Utils.get_file_and_line_from_caller(1))
+          class TaxonomyTopics < TaxonomyTopicsBase
+            class TaxonomyTopic < TaxonomyTopicBase
+              DublinCoreModel.install_dublin_core(self)
+              TaxonomyTopicsModel.install_taxo_topics(self)
+
+              def to_rss(rss, current)
+                if current.respond_to?(:taxo_topics)
+                  topic = current.class::TaxonomyTopic.new(value)
+                  topic.taxo_link = value
+                  taxo_topics.to_rss(rss, topic) if taxo_topics
+                  current.taxo_topics << topic
+                  setup_other_elements(rss)
+                end
+              end
+
+              def current_element(rss)
+                super.taxo_topics.last
+              end
+            end
+          end
+EOC
+      end
+
+      class TaxonomyTopicsBase
+        include Base
+        
+        def_array_element("taxo_topics")
+                            
+        def new_taxo_topic
+          taxo_topic = self.class::TaxonomyTopic.new(self)
+          @taxo_topics << taxo_topic
+          if block_given?
+            yield taxo_topic
+          else
+            taxo_topic
+          end
+        end
+
+        def to_rss(rss, current)
+          @taxo_topics.each do |taxo_topic|
+            taxo_topic.to_rss(rss, current)
+          end
+        end
+        
+        class TaxonomyTopicBase
+          include Base
+          include DublinCoreModel
+          include TaxonomyTopicsModel
+          
+          attr_accessor :value
+          add_need_initialize_variable("value")
+          alias_method(:taxo_link, :value)
+          alias_method(:taxo_link=, :value=)
+          
+          def have_required_values?
+            @value
+          end
+        end
+      end
+    end
+
+    class RSSBase
+      include TaxonomyTopicModel
+    end
+    
+    class ChannelBase
+      include TaxonomyTopicsModel
+    end
+    
+    class ItemsBase
+      class ItemBase
+        include TaxonomyTopicsModel
+      end
+    end
+
+    class RSS10
+      TaxonomyTopicModel.install_taxo_topic(self)
+      
+      class Channel
+        TaxonomyTopicsModel.install_taxo_topics(self)
+      end
+
+      class Items
+        class Item
+          TaxonomyTopicsModel.install_taxo_topics(self)
+        end
+      end
+    end
+    
+    class RSS09
+      TaxonomyTopicModel.install_taxo_topic(self)
+      
+      class Channel
+        TaxonomyTopicsModel.install_taxo_topics(self)
+      end
+
+      class Items
+        class Item
+          TaxonomyTopicsModel.install_taxo_topics(self)
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/maker/trackback.rb b/ruby_1_8_6/lib/rss/maker/trackback.rb
new file mode 100644
index 0000000000..4ae6164f68
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/maker/trackback.rb
@@ -0,0 +1,130 @@
+require 'rss/trackback'
+require 'rss/maker/1.0'
+require 'rss/maker/2.0'
+
+module RSS
+  module Maker
+    module TrackBackModel
+      def self.append_features(klass)
+        super
+
+        name = "#{RSS::TRACKBACK_PREFIX}_ping"
+        klass.add_need_initialize_variable(name)
+        klass.add_other_element(name)
+        klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+          attr_accessor :#{name}
+          def setup_#{name}(rss, current)
+            if #{name} and current.respond_to?(:#{name}=)
+              current.#{name} = #{name}
+            end
+          end
+        EOC
+
+        name = "#{RSS::TRACKBACK_PREFIX}_abouts"
+        klass.add_need_initialize_variable(name, "make_#{name}")
+        klass.add_other_element(name)
+        klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
+          attr_accessor :#{name}
+          def make_#{name}
+            self.class::TrackBackAbouts.new(self)
+          end
+
+          def setup_#{name}(rss, current)
+            @#{name}.to_rss(rss, current)
+          end
+        EOC
+      end
+
+      class TrackBackAboutsBase
+        include Base
+
+        def_array_element("abouts")
+        
+        def new_about
+          about = self.class::TrackBackAbout.new(@maker)
+          @abouts << about
+          if block_given?
+            yield about
+          else
+            about
+          end
+        end
+
+        def to_rss(rss, current)
+          @abouts.each do |about|
+            about.to_rss(rss, current)
+          end
+        end
+        
+        class TrackBackAboutBase
+          include Base
+
+          attr_accessor :value
+          add_need_initialize_variable("value")
+          
+          alias_method(:resource, :value)
+          alias_method(:resource=, :value=)
+          alias_method(:content, :value)
+          alias_method(:content=, :value=)
+        
+          def have_required_values?
+            @value
+          end
+          
+        end
+      end
+    end
+
+    class ItemsBase
+      class ItemBase; include TrackBackModel; end
+    end
+
+    class RSS10
+      class Items
+        class Item
+          class TrackBackAbouts < TrackBackAboutsBase
+            class TrackBackAbout < TrackBackAboutBase
+              def to_rss(rss, current)
+                if resource
+                  about = ::RSS::TrackBackModel10::TrackBackAbout.new(resource)
+                  current.trackback_abouts << about
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    class RSS09
+      class Items
+        class Item
+          class TrackBackAbouts < TrackBackAboutsBase
+            def to_rss(*args)
+            end
+            class TrackBackAbout < TrackBackAboutBase
+            end
+          end
+        end
+      end
+    end
+    
+    class RSS20
+      class Items
+        class Item
+          class TrackBackAbouts < TrackBackAboutsBase
+            class TrackBackAbout < TrackBackAboutBase
+              def to_rss(rss, current)
+                if content
+                  about = ::RSS::TrackBackModel20::TrackBackAbout.new(content)
+                  current.trackback_abouts << about
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+    
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/parser.rb b/ruby_1_8_6/lib/rss/parser.rb
new file mode 100644
index 0000000000..033bc123aa
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/parser.rb
@@ -0,0 +1,476 @@
+require "forwardable"
+require "open-uri"
+
+require "rss/rss"
+
+module RSS
+
+  class NotWellFormedError < Error
+    attr_reader :line, :element
+
+    # Create a new NotWellFormedError for an error at +line+
+    # in +element+.  If a block is given the return value of
+    # the block ends up in the error message.
+    def initialize(line=nil, element=nil)
+      message = "This is not well formed XML"
+      if element or line
+        message << "\nerror occurred"
+        message << " in #{element}" if element
+        message << " at about #{line} line" if line
+      end
+      message << "\n#{yield}" if block_given?
+      super(message)
+    end
+  end
+
+  class XMLParserNotFound < Error
+    def initialize
+      super("available XML parser was not found in " <<
+            "#{AVAILABLE_PARSER_LIBRARIES.inspect}.")
+    end
+  end
+
+  class NotValidXMLParser < Error
+    def initialize(parser)
+      super("#{parser} is not an available XML parser. " <<
+            "Available XML parser"<<
+            (AVAILABLE_PARSERS.size > 1 ? "s are ": " is ") <<
+            "#{AVAILABLE_PARSERS.inspect}.")
+    end
+  end
+
+  class NSError < InvalidRSSError
+    attr_reader :tag, :prefix, :uri
+    def initialize(tag, prefix, require_uri)
+      @tag, @prefix, @uri = tag, prefix, require_uri
+      super("prefix <#{prefix}> doesn't associate uri " <<
+            "<#{require_uri}> in tag <#{tag}>")
+    end
+  end
+
+  class Parser
+
+    extend Forwardable
+
+    class << self
+
+      @@default_parser = nil
+
+      def default_parser
+        @@default_parser || AVAILABLE_PARSERS.first
+      end
+
+      # Set @@default_parser to new_value if it is one of the
+      # available parsers. Else raise NotValidXMLParser error.
+      def default_parser=(new_value)
+        if AVAILABLE_PARSERS.include?(new_value)
+          @@default_parser = new_value
+        else
+          raise NotValidXMLParser.new(new_value)
+        end
+      end
+
+      def parse(rss, do_validate=true, ignore_unknown_element=true,
+                parser_class=default_parser)
+        parser = new(rss, parser_class)
+        parser.do_validate = do_validate
+        parser.ignore_unknown_element = ignore_unknown_element
+        parser.parse
+      end
+    end
+
+    def_delegators(:@parser, :parse, :rss,
+                   :ignore_unknown_element,
+                   :ignore_unknown_element=, :do_validate,
+                   :do_validate=)
+
+    def initialize(rss, parser_class=self.class.default_parser)
+      @parser = parser_class.new(normalize_rss(rss))
+    end
+
+    private
+
+    # Try to get the XML associated with +rss+.
+    # Return +rss+ if it already looks like XML, or treat it as a URI,
+    # or a file to get the XML,
+    def normalize_rss(rss)
+      return rss if maybe_xml?(rss)
+
+      uri = to_uri(rss)
+      
+      if uri.respond_to?(:read)
+        uri.read
+      elsif !rss.tainted? and File.readable?(rss)
+        File.open(rss) {|f| f.read}
+      else
+        rss
+      end
+    end
+
+    # maybe_xml? tests if source is a string that looks like XML.
+    def maybe_xml?(source)
+      source.is_a?(String) and /</ =~ source
+    end
+
+    # Attempt to convert rss to a URI, but just return it if 
+    # there's a ::URI::Error
+    def to_uri(rss)
+      return rss if rss.is_a?(::URI::Generic)
+
+      begin
+        URI(rss)
+      rescue ::URI::Error
+        rss
+      end
+    end
+  end
+
+  class BaseParser
+
+    class << self
+      def raise_for_undefined_entity?
+        listener.raise_for_undefined_entity?
+      end
+    end
+    
+    def initialize(rss)
+      @listener = self.class.listener.new
+      @rss = rss
+    end
+
+    def rss
+      @listener.rss
+    end
+
+    def ignore_unknown_element
+      @listener.ignore_unknown_element
+    end
+
+    def ignore_unknown_element=(new_value)
+      @listener.ignore_unknown_element = new_value
+    end
+
+    def do_validate
+      @listener.do_validate
+    end
+
+    def do_validate=(new_value)
+      @listener.do_validate = new_value
+    end
+
+    def parse
+      if @listener.rss.nil?
+        _parse
+      end
+      @listener.rss
+    end
+
+  end
+
+  class BaseListener
+
+    extend Utils
+
+    class << self
+
+      @@setters = {}
+      @@registered_uris = {}
+      @@class_names = {}
+
+      # return the setter for the uri, tag_name pair, or nil.
+      def setter(uri, tag_name)
+        begin
+          @@setters[uri][tag_name]
+        rescue NameError
+          nil
+        end
+      end
+
+
+      # return the tag_names for setters associated with uri
+      def available_tags(uri)
+        begin
+          @@setters[uri].keys
+        rescue NameError
+          []
+        end
+      end
+      
+      # register uri against this name.
+      def register_uri(uri, name)
+        @@registered_uris[name] ||= {}
+        @@registered_uris[name][uri] = nil
+      end
+      
+      # test if this uri is registered against this name
+      def uri_registered?(uri, name)
+        @@registered_uris[name].has_key?(uri)
+      end
+
+      # record class_name for the supplied uri and tag_name
+      def install_class_name(uri, tag_name, class_name)
+        @@class_names[uri] ||= {}
+        @@class_names[uri][tag_name] = class_name
+      end
+
+      # retrieve class_name for the supplied uri and tag_name
+      # If it doesn't exist, capitalize the tag_name
+      def class_name(uri, tag_name)
+        begin
+          @@class_names[uri][tag_name]
+        rescue NameError
+          tag_name[0,1].upcase + tag_name[1..-1]
+        end
+      end
+
+      def install_get_text_element(uri, name, setter)
+        install_setter(uri, name, setter)
+        def_get_text_element(uri, name, *get_file_and_line_from_caller(1))
+      end
+      
+      def raise_for_undefined_entity?
+        true
+      end
+    
+      private
+      # set the setter for the uri, tag_name pair
+      def install_setter(uri, tag_name, setter)
+        @@setters[uri] ||= {}
+        @@setters[uri][tag_name] = setter
+      end
+
+      def def_get_text_element(uri, name, file, line)
+        register_uri(uri, name)
+        unless private_instance_methods(false).include?("start_#{name}")
+          module_eval(<<-EOT, file, line)
+          def start_#{name}(name, prefix, attrs, ns)
+            uri = _ns(ns, prefix)
+            if self.class.uri_registered?(uri, #{name.inspect})
+              start_get_text_element(name, prefix, ns, uri)
+            else
+              start_else_element(name, prefix, attrs, ns)
+            end
+          end
+          EOT
+          __send__("private", "start_#{name}")
+        end
+      end
+
+    end
+
+  end
+
+  module ListenerMixin
+
+    attr_reader :rss
+
+    attr_accessor :ignore_unknown_element
+    attr_accessor :do_validate
+
+    def initialize
+      @rss = nil
+      @ignore_unknown_element = true
+      @do_validate = true
+      @ns_stack = [{}]
+      @tag_stack = [[]]
+      @text_stack = ['']
+      @proc_stack = []
+      @last_element = nil
+      @version = @encoding = @standalone = nil
+      @xml_stylesheets = []
+    end
+    
+    # set instance vars for version, encoding, standalone
+    def xmldecl(version, encoding, standalone)
+      @version, @encoding, @standalone = version, encoding, standalone
+    end
+
+    def instruction(name, content)
+      if name == "xml-stylesheet"
+        params = parse_pi_content(content)
+        if params.has_key?("href")
+          @xml_stylesheets << XMLStyleSheet.new(*params)
+        end
+      end
+    end
+
+    def tag_start(name, attributes)
+      @text_stack.push('')
+
+      ns = @ns_stack.last.dup
+      attrs = {}
+      attributes.each do |n, v|
+        if /\Axmlns(?:\z|:)/ =~ n
+          ns[$POSTMATCH] = v
+        else
+          attrs[n] = v
+        end
+      end
+      @ns_stack.push(ns)
+
+      prefix, local = split_name(name)
+      @tag_stack.last.push([_ns(ns, prefix), local])
+      @tag_stack.push([])
+      if respond_to?("start_#{local}", true)
+        __send__("start_#{local}", local, prefix, attrs, ns.dup)
+      else
+        start_else_element(local, prefix, attrs, ns.dup)
+      end
+    end
+
+    def tag_end(name)
+      if DEBUG
+        p "end tag #{name}"
+        p @tag_stack
+      end
+      text = @text_stack.pop
+      tags = @tag_stack.pop
+      pr = @proc_stack.pop
+      pr.call(text, tags) unless pr.nil?
+      @ns_stack.pop
+    end
+
+    def text(data)
+      @text_stack.last << data
+    end
+
+    private
+    def _ns(ns, prefix)
+      ns.fetch(prefix, "")
+    end
+
+    CONTENT_PATTERN = /\s*([^=]+)=(["'])([^\2]+?)\2/
+    # Extract the first name="value" pair from content.
+    # Works with single quotes according to the constant
+    # CONTENT_PATTERN. Return a Hash.
+    def parse_pi_content(content)
+      params = {}
+      content.scan(CONTENT_PATTERN) do |name, quote, value|
+        params[name] = value
+      end
+      params
+    end
+
+    def start_else_element(local, prefix, attrs, ns)
+      class_name = self.class.class_name(_ns(ns, prefix), local)
+      current_class = @last_element.class
+      if current_class.constants.include?(class_name)
+        next_class = current_class.const_get(class_name)
+        start_have_something_element(local, prefix, attrs, ns, next_class)
+      else
+        if !@do_validate or @ignore_unknown_element
+          @proc_stack.push(nil)
+        else
+          parent = "ROOT ELEMENT???"
+          if current_class.tag_name
+            parent = current_class.tag_name
+          end
+          raise NotExpectedTagError.new(local, _ns(ns, prefix), parent)
+        end
+      end
+    end
+
+    NAMESPLIT = /^(?:([\w:][-\w\d.]*):)?([\w:][-\w\d.]*)/
+    def split_name(name)
+      name =~ NAMESPLIT
+      [$1 || '', $2]
+    end
+
+    def check_ns(tag_name, prefix, ns, require_uri)
+      if @do_validate
+        if _ns(ns, prefix) == require_uri
+          #ns.delete(prefix)
+        else
+          raise NSError.new(tag_name, prefix, require_uri)
+        end
+      end
+    end
+
+    def start_get_text_element(tag_name, prefix, ns, required_uri)
+      @proc_stack.push Proc.new {|text, tags|
+        setter = self.class.setter(required_uri, tag_name)
+        if @last_element.respond_to?(setter)
+          @last_element.__send__(setter, text.to_s)
+        else
+          if @do_validate and !@ignore_unknown_element
+            raise NotExpectedTagError.new(tag_name, _ns(ns, prefix),
+                                          @last_element.tag_name)
+          end
+        end
+      }
+    end
+
+    def start_have_something_element(tag_name, prefix, attrs, ns, klass)
+
+      check_ns(tag_name, prefix, ns, klass.required_uri)
+
+      attributes = {}
+      klass.get_attributes.each do |a_name, a_uri, required, element_name|
+
+        if a_uri.is_a?(String) or !a_uri.respond_to?(:include?)
+          a_uri = [a_uri]
+        end
+        unless a_uri == [""]
+          for prefix, uri in ns
+            if a_uri.include?(uri)
+              val = attrs["#{prefix}:#{a_name}"]
+              break if val
+            end
+          end
+        end
+        if val.nil? and a_uri.include?("")
+          val = attrs[a_name]
+        end
+
+        if @do_validate and required and val.nil?
+          unless a_uri.include?("")
+            for prefix, uri in ns
+              if a_uri.include?(uri)
+                a_name = "#{prefix}:#{a_name}"
+              end
+            end
+          end
+          raise MissingAttributeError.new(tag_name, a_name)
+        end
+
+        attributes[a_name] = val
+      end
+
+      previous = @last_element
+      next_element = klass.new(@do_validate, attributes)
+      previous.instance_eval {set_next_element(tag_name, next_element)}
+      @last_element = next_element
+      @proc_stack.push Proc.new { |text, tags|
+        p(@last_element.class) if DEBUG
+        @last_element.content = text if klass.have_content?
+        if @do_validate
+          @last_element.validate_for_stream(tags, @ignore_unknown_element)
+        end
+        @last_element = previous
+      }
+    end
+
+  end
+
+  unless const_defined? :AVAILABLE_PARSER_LIBRARIES
+    AVAILABLE_PARSER_LIBRARIES = [
+      ["rss/xmlparser", :XMLParserParser],
+      ["rss/xmlscanner", :XMLScanParser],
+      ["rss/rexmlparser", :REXMLParser],
+    ]
+  end
+
+  AVAILABLE_PARSERS = []
+
+  AVAILABLE_PARSER_LIBRARIES.each do |lib, parser|
+    begin
+      require lib
+      AVAILABLE_PARSERS.push(const_get(parser))
+    rescue LoadError
+    end
+  end
+
+  if AVAILABLE_PARSERS.empty?
+    raise XMLParserNotFound
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/rexmlparser.rb b/ruby_1_8_6/lib/rss/rexmlparser.rb
new file mode 100644
index 0000000000..4dabf59199
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/rexmlparser.rb
@@ -0,0 +1,54 @@
+require "rexml/document"
+require "rexml/streamlistener"
+
+/\A(\d+)\.(\d+)(?:\.\d+)+\z/ =~ REXML::Version
+if ([$1.to_i, $2.to_i] <=> [2, 5]) < 0
+  raise LoadError, "needs REXML 2.5 or later (#{REXML::Version})"
+end
+
+module RSS
+  
+  class REXMLParser < BaseParser
+
+    class << self
+      def listener
+        REXMLListener
+      end
+    end
+    
+    private
+    def _parse
+      begin
+        REXML::Document.parse_stream(@rss, @listener)
+      rescue RuntimeError => e
+        raise NotWellFormedError.new{e.message}
+      rescue REXML::ParseException => e
+        context = e.context
+        line = context[0] if context
+        raise NotWellFormedError.new(line){e.message}
+      end
+    end
+    
+  end
+  
+  class REXMLListener < BaseListener
+
+    include REXML::StreamListener
+    include ListenerMixin
+
+    class << self
+      def raise_for_undefined_entity?
+        false
+      end
+    end
+    
+    def xmldecl(version, encoding, standalone)
+      super(version, encoding, standalone == "yes")
+      # Encoding is converted to UTF-8 when REXML parse XML.
+      @encoding = 'UTF-8'
+    end
+
+    alias_method(:cdata, :text)
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rss/rss.rb b/ruby_1_8_6/lib/rss/rss.rb
new file mode 100644
index 0000000000..a06985af94
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/rss.rb
@@ -0,0 +1,1015 @@
+require "time"
+
+class Time
+  class << self
+    unless respond_to?(:w3cdtf)
+      def w3cdtf(date)
+        if /\A\s*
+            (-?\d+)-(\d\d)-(\d\d)
+            (?:T
+            (\d\d):(\d\d)(?::(\d\d))?
+            (\.\d+)?
+            (Z|[+-]\d\d:\d\d)?)?
+            \s*\z/ix =~ date and (($5 and $8) or (!$5 and !$8))
+          datetime = [$1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i] 
+          datetime << $7.to_f * 1000000 if $7
+          if $8
+            Time.utc(*datetime) - zone_offset($8)
+          else
+            Time.local(*datetime)
+          end
+        else
+          raise ArgumentError.new("invalid date: #{date.inspect}")
+        end
+      end
+    end
+  end
+
+  unless instance_methods.include?("w3cdtf")
+    alias w3cdtf iso8601
+  end
+end
+
+require "English"
+require "rss/utils"
+require "rss/converter"
+require "rss/xml-stylesheet"
+
+module RSS
+
+  VERSION = "0.1.6"
+
+  URI = "http://purl.org/rss/1.0/"
+
+  DEBUG = false
+
+  class Error < StandardError; end
+
+  class OverlappedPrefixError < Error
+    attr_reader :prefix
+    def initialize(prefix)
+      @prefix = prefix
+    end
+  end
+
+  class InvalidRSSError < Error; end
+
+  class MissingTagError < InvalidRSSError
+    attr_reader :tag, :parent
+    def initialize(tag, parent)
+      @tag, @parent = tag, parent
+      super("tag <#{tag}> is missing in tag <#{parent}>")
+    end
+  end
+
+  class TooMuchTagError < InvalidRSSError
+    attr_reader :tag, :parent
+    def initialize(tag, parent)
+      @tag, @parent = tag, parent
+      super("tag <#{tag}> is too much in tag <#{parent}>")
+    end
+  end
+
+  class MissingAttributeError < InvalidRSSError
+    attr_reader :tag, :attribute
+    def initialize(tag, attribute)
+      @tag, @attribute = tag, attribute
+      super("attribute <#{attribute}> is missing in tag <#{tag}>")
+    end
+  end
+
+  class UnknownTagError < InvalidRSSError
+    attr_reader :tag, :uri
+    def initialize(tag, uri)
+      @tag, @uri = tag, uri
+      super("tag <#{tag}> is unknown in namespace specified by uri <#{uri}>")
+    end
+  end
+
+  class NotExpectedTagError < InvalidRSSError
+    attr_reader :tag, :uri, :parent
+    def initialize(tag, uri, parent)
+      @tag, @uri, @parent = tag, uri, parent
+      super("tag <{#{uri}}#{tag}> is not expected in tag <#{parent}>")
+    end
+  end
+  # For backward compatibility :X
+  NotExceptedTagError = NotExpectedTagError
+
+  class NotAvailableValueError < InvalidRSSError
+    attr_reader :tag, :value, :attribute
+    def initialize(tag, value, attribute=nil)
+      @tag, @value, @attribute = tag, value, attribute
+      message = "value <#{value}> of "
+      message << "attribute <#{attribute}> of " if attribute
+      message << "tag <#{tag}> is not available."
+      super(message)
+    end
+  end
+
+  class UnknownConversionMethodError < Error
+    attr_reader :to, :from
+    def initialize(to, from)
+      @to = to
+      @from = from
+      super("can't convert to #{to} from #{from}.")
+    end
+  end
+  # for backward compatibility
+  UnknownConvertMethod = UnknownConversionMethodError
+
+  class ConversionError < Error
+    attr_reader :string, :to, :from
+    def initialize(string, to, from)
+      @string = string
+      @to = to
+      @from = from
+      super("can't convert #{@string} to #{to} from #{from}.")
+    end
+  end
+
+  class NotSetError < Error
+    attr_reader :name, :variables
+    def initialize(name, variables)
+      @name = name
+      @variables = variables
+      super("required variables of #{@name} are not set: #{@variables.join(', ')}")
+    end
+  end
+  
+  module BaseModel
+
+    include Utils
+
+    def install_have_child_element(tag_name, uri, occurs, name=nil)
+      name ||= tag_name
+      add_need_initialize_variable(name)
+      install_model(tag_name, uri, occurs, name)
+
+      attr_accessor name
+      install_element(name) do |n, elem_name|
+        <<-EOC
+        if @#{n}
+          "\#{@#{n}.to_s(need_convert, indent)}"
+        else
+          ''
+        end
+EOC
+      end
+    end
+    alias_method(:install_have_attribute_element, :install_have_child_element)
+
+    def install_have_children_element(tag_name, uri, occurs, name=nil, plural_name=nil)
+      name ||= tag_name
+      plural_name ||= "#{name}s"
+      add_have_children_element(name, plural_name)
+      add_plural_form(name, plural_name)
+      install_model(tag_name, uri, occurs, plural_name)
+
+      def_children_accessor(name, plural_name)
+      install_element(name, "s") do |n, elem_name|
+        <<-EOC
+        rv = []
+        @#{n}.each do |x|
+          value = "\#{x.to_s(need_convert, indent)}"
+          rv << value if /\\A\\s*\\z/ !~ value
+        end
+        rv.join("\n")
+EOC
+      end
+    end
+
+    def install_text_element(tag_name, uri, occurs, name=nil, type=nil, disp_name=nil)
+      name ||= tag_name
+      disp_name ||= name
+      self::ELEMENTS << name
+      add_need_initialize_variable(name)
+      install_model(tag_name, uri, occurs, name)
+
+      def_corresponded_attr_writer name, type, disp_name
+      convert_attr_reader name
+      install_element(name) do |n, elem_name|
+        <<-EOC
+        if @#{n}
+          rv = "\#{indent}<#{elem_name}>"
+          value = html_escape(@#{n})
+          if need_convert
+            rv << convert(value)
+          else
+            rv << value
+          end
+    	    rv << "</#{elem_name}>"
+          rv
+        else
+          ''
+        end
+EOC
+      end
+    end
+
+    def install_date_element(tag_name, uri, occurs, name=nil, type=nil, disp_name=nil)
+      name ||= tag_name
+      type ||= :w3cdtf
+      disp_name ||= name
+      self::ELEMENTS << name
+      add_need_initialize_variable(name)
+      install_model(tag_name, uri, occurs, name)
+
+      # accessor
+      convert_attr_reader name
+      date_writer(name, type, disp_name)
+      
+      install_element(name) do |n, elem_name|
+        <<-EOC
+        if @#{n}
+          rv = "\#{indent}<#{elem_name}>"
+          value = html_escape(@#{n}.#{type})
+          if need_convert
+            rv << convert(value)
+          else
+            rv << value
+          end
+    	    rv << "</#{elem_name}>"
+          rv
+        else
+          ''
+        end
+EOC
+      end
+
+    end
+
+    private
+    def install_element(name, postfix="")
+      elem_name = name.sub('_', ':')
+      method_name = "#{name}_element#{postfix}"
+      add_to_element_method(method_name)
+      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
+      def #{method_name}(need_convert=true, indent='')
+        #{yield(name, elem_name)}
+      end
+      private :#{method_name}
+EOC
+    end
+
+    def convert_attr_reader(*attrs)
+      attrs.each do |attr|
+        attr = attr.id2name if attr.kind_of?(Integer)
+        module_eval(<<-EOC, *get_file_and_line_from_caller(2))
+        def #{attr}
+          if @converter
+            @converter.convert(@#{attr})
+          else
+            @#{attr}
+          end
+        end
+EOC
+      end
+    end
+
+    def date_writer(name, type, disp_name=name)
+      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
+      def #{name}=(new_value)
+        if new_value.nil? or new_value.kind_of?(Time)
+          @#{name} = new_value
+        else
+          if @do_validate
+            begin
+              @#{name} = Time.__send__('#{type}', new_value)
+            rescue ArgumentError
+              raise NotAvailableValueError.new('#{disp_name}', new_value)
+            end
+          else
+            @#{name} = nil
+            if /\\A\\s*\\z/ !~ new_value.to_s
+              begin
+                @#{name} = Time.parse(new_value)
+              rescue ArgumentError
+              end
+            end
+          end
+        end
+
+        # Is it need?
+        if @#{name}
+          class << @#{name}
+            undef_method(:to_s)
+            alias_method(:to_s, :#{type})
+          end
+        end
+
+      end
+EOC
+    end
+
+    def integer_writer(name, disp_name=name)
+      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
+      def #{name}=(new_value)
+        if new_value.nil?
+          @#{name} = new_value
+        else
+          if @do_validate
+            begin
+              @#{name} = Integer(new_value)
+            rescue ArgumentError
+              raise NotAvailableValueError.new('#{disp_name}', new_value)
+            end
+          else
+            @#{name} = new_value.to_i
+          end
+        end
+      end
+EOC
+    end
+
+    def positive_integer_writer(name, disp_name=name)
+      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
+      def #{name}=(new_value)
+        if new_value.nil?
+          @#{name} = new_value
+        else
+          if @do_validate
+            begin
+              tmp = Integer(new_value)
+              raise ArgumentError if tmp <= 0
+              @#{name} = tmp
+            rescue ArgumentError
+              raise NotAvailableValueError.new('#{disp_name}', new_value)
+            end
+          else
+            @#{name} = new_value.to_i
+          end
+        end
+      end
+EOC
+    end
+
+    def boolean_writer(name, disp_name=name)
+      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
+      def #{name}=(new_value)
+        if new_value.nil?
+          @#{name} = new_value
+        else
+          if @do_validate and
+              ![true, false, "true", "false"].include?(new_value)
+            raise NotAvailableValueError.new('#{disp_name}', new_value)
+          end
+          if [true, false].include?(new_value)
+            @#{name} = new_value
+          else
+            @#{name} = new_value == "true"
+          end
+        end
+      end
+EOC
+    end
+
+    def def_children_accessor(accessor_name, plural_name)
+      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
+      def #{plural_name}
+        @#{accessor_name}
+      end
+
+      def #{accessor_name}(*args)
+        if args.empty?
+          @#{accessor_name}.first
+        else
+          @#{accessor_name}[*args]
+        end
+      end
+
+      def #{accessor_name}=(*args)
+        warn("Warning:\#{caller.first.sub(/:in `.*'\z/, '')}: " \
+             "Don't use `#{accessor_name} = XXX'/`set_#{accessor_name}(XXX)'. " \
+             "Those APIs are not sense of Ruby. " \
+             "Use `#{plural_name} << XXX' instead of them.")
+        if args.size == 1
+          @#{accessor_name}.push(args[0])
+        else
+          @#{accessor_name}.__send__("[]=", *args)
+        end
+      end
+      alias_method(:set_#{accessor_name}, :#{accessor_name}=)
+EOC
+    end
+  end
+
+  class Element
+
+    extend BaseModel
+    include Utils
+
+    INDENT = "  "
+    
+    MUST_CALL_VALIDATORS = {}
+    MODELS = []
+    GET_ATTRIBUTES = []
+    HAVE_CHILDREN_ELEMENTS = []
+    TO_ELEMENT_METHODS = []
+    NEED_INITIALIZE_VARIABLES = []
+    PLURAL_FORMS = {}
+    
+    class << self
+
+      def must_call_validators
+        MUST_CALL_VALIDATORS
+      end
+      def models
+        MODELS
+      end
+      def get_attributes
+        GET_ATTRIBUTES
+      end
+      def have_children_elements
+        HAVE_CHILDREN_ELEMENTS
+      end
+      def to_element_methods
+        TO_ELEMENT_METHODS
+      end
+      def need_initialize_variables
+        NEED_INITIALIZE_VARIABLES
+      end
+      def plural_forms
+        PLURAL_FORMS
+      end
+
+      
+      def inherited(klass)
+        klass.const_set("MUST_CALL_VALIDATORS", {})
+        klass.const_set("MODELS", [])
+        klass.const_set("GET_ATTRIBUTES", [])
+        klass.const_set("HAVE_CHILDREN_ELEMENTS", [])
+        klass.const_set("TO_ELEMENT_METHODS", [])
+        klass.const_set("NEED_INITIALIZE_VARIABLES", [])
+        klass.const_set("PLURAL_FORMS", {})
+
+        klass.module_eval(<<-EOC)
+        public
+        
+        @tag_name = name.split(/::/).last
+        @tag_name[0,1] = @tag_name[0,1].downcase
+        @have_content = false
+
+        def self.must_call_validators
+          super.merge(MUST_CALL_VALIDATORS)
+        end
+        def self.models
+          MODELS + super
+        end
+        def self.get_attributes
+          GET_ATTRIBUTES + super
+        end
+        def self.have_children_elements
+          HAVE_CHILDREN_ELEMENTS + super
+        end
+        def self.to_element_methods
+          TO_ELEMENT_METHODS + super
+        end
+        def self.need_initialize_variables
+          NEED_INITIALIZE_VARIABLES + super
+        end
+        def self.plural_forms
+          super.merge(PLURAL_FORMS)
+        end
+
+      
+        def self.install_must_call_validator(prefix, uri)
+          MUST_CALL_VALIDATORS[uri] = prefix
+        end
+        
+        def self.install_model(tag, uri, occurs=nil, getter=nil)
+          getter ||= tag
+          if m = MODELS.find {|t, u, o, g| t == tag and u == uri}
+            m[2] = occurs
+          else
+            MODELS << [tag, uri, occurs, getter]
+          end
+        end
+
+        def self.install_get_attribute(name, uri, required=true,
+                                       type=nil, disp_name=nil,
+                                       element_name=nil)
+          disp_name ||= name
+          element_name ||= name
+          def_corresponded_attr_writer name, type, disp_name
+          convert_attr_reader name
+          if type == :boolean and /^is/ =~ name
+            alias_method "\#{$POSTMATCH}?", name
+          end
+          GET_ATTRIBUTES << [name, uri, required, element_name]
+          add_need_initialize_variable(disp_name)
+        end
+
+        def self.def_corresponded_attr_writer(name, type=nil, disp_name=name)
+          case type
+          when :integer
+            integer_writer name, disp_name
+          when :positive_integer
+            positive_integer_writer name, disp_name
+          when :boolean
+            boolean_writer name, disp_name
+          when :w3cdtf, :rfc822, :rfc2822
+            date_writer name, type, disp_name
+          else
+            attr_writer name
+          end
+        end
+
+        def self.content_setup(type=nil)
+          def_corresponded_attr_writer "content", type
+          convert_attr_reader :content
+          @have_content = true
+        end
+
+        def self.have_content?
+          @have_content
+        end
+
+        def self.add_have_children_element(variable_name, plural_name)
+          HAVE_CHILDREN_ELEMENTS << [variable_name, plural_name]
+        end
+        
+        def self.add_to_element_method(method_name)
+          TO_ELEMENT_METHODS << method_name
+        end
+
+        def self.add_need_initialize_variable(variable_name)
+          NEED_INITIALIZE_VARIABLES << variable_name
+        end
+        
+        def self.add_plural_form(singular, plural)
+          PLURAL_FORMS[singular] = plural
+        end
+        
+        EOC
+      end
+
+      def required_prefix
+        nil
+      end
+
+      def required_uri
+        ""
+      end
+      
+      def install_ns(prefix, uri)
+        if self::NSPOOL.has_key?(prefix)
+          raise OverlappedPrefixError.new(prefix)
+        end
+        self::NSPOOL[prefix] = uri
+      end
+
+      def tag_name
+        @tag_name
+      end
+    end
+
+    attr_accessor :do_validate
+
+    def initialize(do_validate=true, attrs={})
+      @converter = nil
+      @do_validate = do_validate
+      initialize_variables(attrs)
+    end
+
+    def tag_name
+      self.class.tag_name
+    end
+
+    def full_name
+      tag_name
+    end
+    
+    def converter=(converter)
+      @converter = converter
+      targets = children.dup
+      self.class.have_children_elements.each do |variable_name, plural_name|
+        targets.concat(__send__(plural_name))
+      end
+      targets.each do |target|
+        target.converter = converter unless target.nil?
+      end
+    end
+
+    def convert(value)
+      if @converter
+        @converter.convert(value)
+      else
+        value
+      end
+    end
+    
+    def validate(ignore_unknown_element=true)
+      validate_attribute
+      __validate(ignore_unknown_element)
+    end
+    
+    def validate_for_stream(tags, ignore_unknown_element=true)
+      validate_attribute
+      __validate(ignore_unknown_element, tags, false)
+    end
+
+    def setup_maker(maker)
+      target = maker_target(maker)
+      unless target.nil?
+        setup_maker_attributes(target)
+        setup_maker_element(target)
+        setup_maker_elements(target)
+      end
+    end
+
+    def to_s(need_convert=true, indent='')
+      if self.class.have_content?
+        return "" unless @content
+        rv = tag(indent) do |next_indent|
+          h(@content)
+        end
+      else
+        rv = tag(indent) do |next_indent|
+          self.class.to_element_methods.collect do |method_name|
+            __send__(method_name, false, next_indent)
+          end
+        end
+      end
+      rv = convert(rv) if need_convert
+      rv
+    end
+
+    private
+    def initialize_variables(attrs)
+      normalized_attrs = {}
+      attrs.each do |key, value|
+        normalized_attrs[key.to_s] = value
+      end
+      self.class.need_initialize_variables.each do |variable_name|
+        value = normalized_attrs[variable_name.to_s]
+        if value
+          __send__("#{variable_name}=", value)
+        else
+          instance_eval("@#{variable_name} = nil")
+        end
+      end
+      initialize_have_children_elements
+      @content = "" if self.class.have_content?
+    end
+
+    def initialize_have_children_elements
+      self.class.have_children_elements.each do |variable_name, plural_name|
+        instance_eval("@#{variable_name} = []")
+      end
+    end
+
+    def tag(indent, additional_attrs={}, &block)
+      next_indent = indent + INDENT
+
+      attrs = collect_attrs
+      return "" if attrs.nil?
+
+      attrs.update(additional_attrs)
+      start_tag = make_start_tag(indent, next_indent, attrs)
+
+      if block
+        content = block.call(next_indent)
+      else
+        content = []
+      end
+
+      if content.is_a?(String)
+        content = [content]
+        start_tag << ">"
+        end_tag = "</#{full_name}>"
+      else
+        content = content.reject{|x| x.empty?}
+        if content.empty?
+          end_tag = "/>"
+        else
+          start_tag << ">\n"
+          end_tag = "\n#{indent}</#{full_name}>"
+        end
+      end
+      
+      start_tag + content.join("\n") + end_tag
+    end
+
+    def make_start_tag(indent, next_indent, attrs)
+      start_tag = ["#{indent}<#{full_name}"]
+      unless attrs.empty?
+        start_tag << attrs.collect do |key, value|
+          %Q[#{h key}="#{h value}"]
+        end.join("\n#{next_indent}")
+      end
+      start_tag.join(" ")
+    end
+
+    def collect_attrs
+      attrs = {}
+      _attrs.each do |name, required, alias_name|
+        value = __send__(alias_name || name)
+        return nil if required and value.nil?
+        next if value.nil?
+        return nil if attrs.has_key?(name)
+        attrs[name] = value
+      end
+      attrs
+    end
+    
+    def tag_name_with_prefix(prefix)
+      "#{prefix}:#{tag_name}"
+    end
+
+    # For backward compatibility
+    def calc_indent
+      ''
+    end
+
+    def maker_target(maker)
+      nil
+    end
+    
+    def setup_maker_attributes(target)
+    end
+    
+    def setup_maker_element(target)
+      self.class.need_initialize_variables.each do |var|
+        value = __send__(var)
+        if value.respond_to?("setup_maker") and
+            !not_need_to_call_setup_maker_variables.include?(var)
+          value.setup_maker(target)
+        else
+          setter = "#{var}="
+          if target.respond_to?(setter)
+            target.__send__(setter, value)
+          end
+        end
+      end
+    end
+
+    def not_need_to_call_setup_maker_variables
+      []
+    end
+    
+    def setup_maker_elements(parent)
+      self.class.have_children_elements.each do |name, plural_name|
+        if parent.respond_to?(plural_name)
+          target = parent.__send__(plural_name)
+          __send__(plural_name).each do |elem|
+            elem.setup_maker(target)
+          end
+        end
+      end
+    end
+
+    def set_next_element(tag_name, next_element)
+      klass = next_element.class
+      prefix = ""
+      prefix << "#{klass.required_prefix}_" if klass.required_prefix
+      key = "#{prefix}#{tag_name}"
+      if self.class.plural_forms.has_key?(key)
+        ary = __send__("#{self.class.plural_forms[key]}")
+        ary << next_element
+      else
+        __send__("#{prefix}#{tag_name}=", next_element)
+      end
+    end
+
+    def children
+      rv = []
+      self.class.models.each do |name, uri, occurs, getter|
+        value = __send__(getter)
+        next if value.nil?
+        value = [value] unless value.is_a?(Array)
+        value.each do |v|
+          rv << v if v.is_a?(Element)
+        end
+      end
+      rv
+    end
+
+    def _tags
+      rv = []
+      self.class.models.each do |name, uri, occurs, getter|
+        value = __send__(getter)
+        next if value.nil?
+        if value.is_a?(Array)
+          rv.concat([[uri, name]] * value.size)
+        else
+          rv << [uri, name]
+        end
+      end
+      rv
+    end
+
+    def _attrs
+      self.class.get_attributes.collect do |name, uri, required, element_name|
+        [element_name, required, name]
+      end
+    end
+
+    def __validate(ignore_unknown_element, tags=_tags, recursive=true)
+      if recursive
+        children.compact.each do |child|
+          child.validate
+        end
+      end
+      must_call_validators = self.class.must_call_validators
+      tags = tag_filter(tags.dup)
+      p tags if DEBUG
+      must_call_validators.each do |uri, prefix|
+        _validate(ignore_unknown_element, tags[uri], uri)
+        meth = "#{prefix}_validate"
+        if respond_to?(meth, true)
+          __send__(meth, ignore_unknown_element, tags[uri], uri)
+        end
+      end
+    end
+
+    def validate_attribute
+      _attrs.each do |a_name, required, alias_name|
+        if required and __send__(alias_name || a_name).nil?
+          raise MissingAttributeError.new(tag_name, a_name)
+        end
+      end
+    end
+
+    def _validate(ignore_unknown_element, tags, uri, models=self.class.models)
+      count = 1
+      do_redo = false
+      not_shift = false
+      tag = nil
+      models = models.find_all {|model| model[1] == uri}
+      element_names = models.collect {|model| model[0]}
+      if tags
+        tags_size = tags.size
+        tags = tags.sort_by {|x| element_names.index(x) || tags_size}
+      end
+
+      models.each_with_index do |model, i|
+        name, model_uri, occurs, getter = model
+
+        if DEBUG
+          p "before" 
+          p tags
+          p model
+        end
+
+        if not_shift
+          not_shift = false
+        elsif tags
+          tag = tags.shift
+        end
+
+        if DEBUG
+          p "mid"
+          p count
+        end
+
+        case occurs
+        when '?'
+          if count > 2
+            raise TooMuchTagError.new(name, tag_name)
+          else
+            if name == tag
+              do_redo = true
+            else
+              not_shift = true
+            end
+          end
+        when '*'
+          if name == tag
+            do_redo = true
+          else
+            not_shift = true
+          end
+        when '+'
+          if name == tag
+            do_redo = true
+          else
+            if count > 1
+              not_shift = true
+            else
+              raise MissingTagError.new(name, tag_name)
+            end
+          end
+        else
+          if name == tag
+            if models[i+1] and models[i+1][0] != name and
+                tags and tags.first == name
+              raise TooMuchTagError.new(name, tag_name)
+            end
+          else
+            raise MissingTagError.new(name, tag_name)
+          end
+        end
+
+        if DEBUG
+          p "after"
+          p not_shift
+          p do_redo
+          p tag
+        end
+
+        if do_redo
+          do_redo = false
+          count += 1
+          redo
+        else
+          count = 1
+        end
+
+      end
+
+      if !ignore_unknown_element and !tags.nil? and !tags.empty?
+        raise NotExpectedTagError.new(tags.first, uri, tag_name)
+      end
+
+    end
+
+    def tag_filter(tags)
+      rv = {}
+      tags.each do |tag|
+        rv[tag[0]] = [] unless rv.has_key?(tag[0])
+        rv[tag[0]].push(tag[1])
+      end
+      rv
+    end
+
+  end
+
+  module RootElementMixin
+
+    include XMLStyleSheetMixin
+    
+    attr_reader :output_encoding
+
+    def initialize(rss_version, version=nil, encoding=nil, standalone=nil)
+      super()
+      @rss_version = rss_version
+      @version = version || '1.0'
+      @encoding = encoding
+      @standalone = standalone
+      @output_encoding = nil
+    end
+
+    def output_encoding=(enc)
+      @output_encoding = enc
+      self.converter = Converter.new(@output_encoding, @encoding)
+    end
+
+    def setup_maker(maker)
+      maker.version = version
+      maker.encoding = encoding
+      maker.standalone = standalone
+
+      xml_stylesheets.each do |xss|
+        xss.setup_maker(maker)
+      end
+
+      setup_maker_elements(maker)
+    end
+
+    def to_xml(version=nil, &block)
+      if version.nil? or version == @rss_version
+        to_s
+      else
+        RSS::Maker.make(version) do |maker|
+          setup_maker(maker)
+          block.call(maker) if block
+        end.to_s
+      end
+    end
+
+    private
+    def tag(indent, attrs={}, &block)
+      rv = xmldecl + xml_stylesheet_pi
+      rv << super(indent, ns_declarations.merge(attrs), &block)
+      rv
+    end
+
+    def xmldecl
+      rv = %Q[<?xml version="#{@version}"]
+      if @output_encoding or @encoding
+        rv << %Q[ encoding="#{@output_encoding or @encoding}"]
+      end
+      rv << %Q[ standalone="yes"] if @standalone
+      rv << "?>\n"
+      rv
+    end
+    
+    def ns_declarations
+      decls = {}
+      self.class::NSPOOL.collect do |prefix, uri|
+        prefix = ":#{prefix}" unless prefix.empty?
+        decls["xmlns#{prefix}"] = uri
+      end
+      decls
+    end
+    
+    def setup_maker_elements(maker)
+      channel.setup_maker(maker) if channel
+      image.setup_maker(maker) if image
+      textinput.setup_maker(maker) if textinput
+      super(maker)
+    end
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rss/syndication.rb b/ruby_1_8_6/lib/rss/syndication.rb
new file mode 100644
index 0000000000..93d35c89a7
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/syndication.rb
@@ -0,0 +1,64 @@
+require "rss/1.0"
+
+module RSS
+
+  SY_PREFIX = 'sy'
+  SY_URI = "http://purl.org/rss/1.0/modules/syndication/"
+
+  RDF.install_ns(SY_PREFIX, SY_URI)
+
+  module SyndicationModel
+    
+    extend BaseModel
+    
+    ELEMENTS = []
+    
+    def self.append_features(klass)
+      super
+
+      klass.install_must_call_validator(SY_PREFIX, SY_URI)
+      klass.module_eval do
+        [
+          ["updatePeriod"],
+          ["updateFrequency", :positive_integer]
+        ].each do |name, type|
+          install_text_element(name, SY_URI, "?",
+                               "#{SY_PREFIX}_#{name}", type,
+                               "#{SY_PREFIX}:#{name}")
+        end
+
+        %w(updateBase).each do |name|
+          install_date_element(name, SY_URI, "?",
+                               "#{SY_PREFIX}_#{name}", 'w3cdtf', name)
+        end
+
+        alias_method(:_sy_updatePeriod=, :sy_updatePeriod=)
+        def sy_updatePeriod=(new_value)
+          new_value = new_value.strip
+          validate_sy_updatePeriod(new_value) if @do_validate
+          self._sy_updatePeriod = new_value
+        end
+      end
+    end
+
+    private
+    SY_UPDATEPERIOD_AVAILABLE_VALUES = %w(hourly daily weekly monthly yearly)
+    def validate_sy_updatePeriod(value)
+      unless SY_UPDATEPERIOD_AVAILABLE_VALUES.include?(value)
+        raise NotAvailableValueError.new("updatePeriod", value)
+      end
+    end
+  end
+
+  class RDF
+    class Channel; include SyndicationModel; end
+  end
+
+  prefix_size = SY_PREFIX.size + 1
+  SyndicationModel::ELEMENTS.uniq!
+  SyndicationModel::ELEMENTS.each do |full_name|
+    name = full_name[prefix_size..-1]
+    BaseListener.install_get_text_element(SY_URI, name, "#{full_name}=")
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rss/taxonomy.rb b/ruby_1_8_6/lib/rss/taxonomy.rb
new file mode 100644
index 0000000000..8caa25e2a4
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/taxonomy.rb
@@ -0,0 +1,145 @@
+require "rss/1.0"
+require "rss/dublincore"
+
+module RSS
+
+  TAXO_PREFIX = "taxo"
+  TAXO_URI = "http://purl.org/rss/1.0/modules/taxonomy/"
+
+  RDF.install_ns(TAXO_PREFIX, TAXO_URI)
+
+  TAXO_ELEMENTS = []
+
+  %w(link).each do |name|
+    full_name = "#{TAXO_PREFIX}_#{name}"
+    BaseListener.install_get_text_element(TAXO_URI, name, "#{full_name}=")
+    TAXO_ELEMENTS << "#{TAXO_PREFIX}_#{name}"
+  end
+
+  %w(topic topics).each do |name|
+    class_name = Utils.to_class_name(name)
+    BaseListener.install_class_name(TAXO_URI, name, "Taxonomy#{class_name}")
+    TAXO_ELEMENTS << "#{TAXO_PREFIX}_#{name}"
+  end
+
+  module TaxonomyTopicsModel
+    extend BaseModel
+    
+    def self.append_features(klass)
+      super
+
+      klass.install_must_call_validator(TAXO_PREFIX, TAXO_URI)
+      %w(topics).each do |name|
+        klass.install_have_child_element(name, TAXO_URI, "?",
+                                         "#{TAXO_PREFIX}_#{name}")
+      end
+    end
+
+    class TaxonomyTopics < Element
+      include RSS10
+      
+      Bag = ::RSS::RDF::Bag
+
+      class << self
+        def required_prefix
+          TAXO_PREFIX
+        end
+        
+        def required_uri
+          TAXO_URI
+        end
+      end
+
+      @tag_name = "topics"
+      
+      install_have_child_element("Bag", RDF::URI, nil)
+      install_must_call_validator('rdf', RDF::URI)
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.Bag = args[0]
+        end
+        self.Bag ||= Bag.new
+      end
+
+      def full_name
+        tag_name_with_prefix(TAXO_PREFIX)
+      end
+
+      def maker_target(target)
+        target.taxo_topics
+      end
+
+      def resources
+        if @Bag
+          @Bag.lis.collect do |li|
+            li.resource
+          end
+        else
+          []
+        end
+      end
+    end
+  end
+  
+  module TaxonomyTopicModel
+    extend BaseModel
+    
+    def self.append_features(klass)
+      super
+      var_name = "#{TAXO_PREFIX}_topic"
+      klass.install_have_children_element("topic", TAXO_URI, "*", var_name)
+    end
+
+    class TaxonomyTopic < Element
+      include RSS10
+
+      include DublinCoreModel
+      include TaxonomyTopicsModel
+      
+      class << self
+        def required_prefix
+          TAXO_PREFIX
+        end
+        
+        def required_uri
+          TAXO_URI
+        end
+      end
+
+      @tag_name = "topic"
+
+      install_get_attribute("about", ::RSS::RDF::URI, true, nil, nil,
+                            "#{RDF::PREFIX}:about")
+      install_text_element("link", TAXO_URI, "?", "#{TAXO_PREFIX}_link")
+        
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.about = args[0]
+        end
+      end
+
+      def full_name
+        tag_name_with_prefix(TAXO_PREFIX)
+      end
+
+      def maker_target(target)
+        target.new_taxo_topic
+      end
+    end
+  end
+
+  class RDF
+    include TaxonomyTopicModel
+    class Channel
+      include TaxonomyTopicsModel
+    end
+    class Item; include TaxonomyTopicsModel; end
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/trackback.rb b/ruby_1_8_6/lib/rss/trackback.rb
new file mode 100644
index 0000000000..ee2491f332
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/trackback.rb
@@ -0,0 +1,288 @@
+require 'rss/1.0'
+require 'rss/2.0'
+
+module RSS
+
+  TRACKBACK_PREFIX = 'trackback'
+  TRACKBACK_URI = 'http://madskills.com/public/xml/rss/module/trackback/'
+
+  RDF.install_ns(TRACKBACK_PREFIX, TRACKBACK_URI)
+  Rss.install_ns(TRACKBACK_PREFIX, TRACKBACK_URI)
+
+  module TrackBackUtils
+    private
+    def trackback_validate(ignore_unknown_element, tags, uri)
+      return if tags.nil?
+      if tags.find {|tag| tag == "about"} and
+          !tags.find {|tag| tag == "ping"}
+        raise MissingTagError.new("#{TRACKBACK_PREFIX}:ping", tag_name)
+      end
+    end
+  end
+
+  module BaseTrackBackModel
+
+    ELEMENTS = %w(ping about)
+    
+    def append_features(klass)
+      super
+
+      unless klass.class == Module
+        klass.module_eval {include TrackBackUtils}
+
+        klass.install_must_call_validator(TRACKBACK_PREFIX, TRACKBACK_URI)
+        %w(ping).each do |name|
+          var_name = "#{TRACKBACK_PREFIX}_#{name}"
+          klass_name = "TrackBack#{Utils.to_class_name(name)}"
+          klass.install_have_child_element(name, TRACKBACK_URI, "?", var_name)
+          klass.module_eval(<<-EOC, __FILE__, __LINE__)
+            remove_method :#{var_name}
+            def #{var_name}
+              @#{var_name} and @#{var_name}.value
+            end
+
+            remove_method :#{var_name}=
+            def #{var_name}=(value)
+              @#{var_name} = Utils.new_with_value_if_need(#{klass_name}, value)
+            end
+          EOC
+        end
+        
+        [%w(about s)].each do |name, postfix|
+          var_name = "#{TRACKBACK_PREFIX}_#{name}"
+          klass_name = "TrackBack#{Utils.to_class_name(name)}"
+          klass.install_have_children_element(name, TRACKBACK_URI, "*",
+                                              var_name)
+          klass.module_eval(<<-EOC, __FILE__, __LINE__)
+            remove_method :#{var_name}
+            def #{var_name}(*args)
+              if args.empty?
+                @#{var_name}.first and @#{var_name}.first.value
+              else
+                ret = @#{var_name}.__send__("[]", *args)
+                if ret.is_a?(Array)
+                  ret.collect {|x| x.value}
+                else
+                  ret.value
+                end
+              end
+            end
+
+            remove_method :#{var_name}=
+            remove_method :set_#{var_name}
+            def #{var_name}=(*args)
+              if args.size == 1
+                item = Utils.new_with_value_if_need(#{klass_name}, args[0])
+                @#{var_name}.push(item)
+              else
+                new_val = args.last
+                if new_val.is_a?(Array)
+                  new_val = new_value.collect do |val|
+                    Utils.new_with_value_if_need(#{klass_name}, val)
+                  end
+                else
+                  new_val = Utils.new_with_value_if_need(#{klass_name}, new_val)
+                end
+                @#{var_name}.__send__("[]=", *(args[0..-2] + [new_val]))
+              end
+            end
+            alias set_#{var_name} #{var_name}=
+          EOC
+        end
+      end
+    end
+  end
+
+  module TrackBackModel10
+    extend BaseModel
+    extend BaseTrackBackModel
+
+    class TrackBackPing < Element
+      include RSS10
+
+      class << self
+
+        def required_prefix
+          TRACKBACK_PREFIX
+        end
+        
+        def required_uri
+          TRACKBACK_URI
+        end
+
+      end
+
+      @tag_name = "ping"
+
+      [
+        ["resource", ::RSS::RDF::URI, true]
+      ].each do |name, uri, required|
+        install_get_attribute(name, uri, required, nil, nil,
+                              "#{::RSS::RDF::PREFIX}:#{name}")
+      end
+
+      alias_method(:value, :resource)
+      alias_method(:value=, :resource=)
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.resource = args[0]
+        end
+      end
+
+      def full_name
+        tag_name_with_prefix(TRACKBACK_PREFIX)
+      end
+    end
+
+    class TrackBackAbout < Element
+      include RSS10
+
+      class << self
+        
+        def required_prefix
+          TRACKBACK_PREFIX
+        end
+        
+        def required_uri
+          TRACKBACK_URI
+        end
+
+      end
+      
+      @tag_name = "about"
+
+      [
+        ["resource", ::RSS::RDF::URI, true]
+      ].each do |name, uri, required|
+        install_get_attribute(name, uri, required, nil, nil,
+                              "#{::RSS::RDF::PREFIX}:#{name}")
+      end
+
+      alias_method(:value, :resource)
+      alias_method(:value=, :resource=)
+      
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.resource = args[0]
+        end
+      end
+
+      def full_name
+        tag_name_with_prefix(TRACKBACK_PREFIX)
+      end
+
+      private
+      def maker_target(abouts)
+        abouts.new_about
+      end
+
+      def setup_maker_attributes(about)
+        about.resource = self.resource
+      end
+      
+    end
+  end
+
+  module TrackBackModel20
+    extend BaseModel
+    extend BaseTrackBackModel
+
+    class TrackBackPing < Element
+      include RSS09
+
+      @tag_name = "ping"
+      
+      content_setup
+
+      class << self
+
+        def required_prefix
+          TRACKBACK_PREFIX
+        end
+        
+        def required_uri
+          TRACKBACK_URI
+        end
+
+      end
+      
+      alias_method(:value, :content)
+      alias_method(:value=, :content=)
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.content = args[0]
+        end
+      end
+      
+      def full_name
+        tag_name_with_prefix(TRACKBACK_PREFIX)
+      end
+      
+    end
+
+    class TrackBackAbout < Element
+      include RSS09
+
+      @tag_name = "about"
+      
+      content_setup
+
+      class << self
+        
+        def required_prefix
+          TRACKBACK_PREFIX
+        end
+        
+        def required_uri
+          TRACKBACK_URI
+        end
+
+      end
+
+      alias_method(:value, :content)
+      alias_method(:value=, :content=)
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.content = args[0]
+        end
+      end
+      
+      def full_name
+        tag_name_with_prefix(TRACKBACK_PREFIX)
+      end
+      
+    end
+  end
+
+  class RDF
+    class Item; include TrackBackModel10; end
+  end
+
+  class Rss
+    class Channel
+      class Item; include TrackBackModel20; end
+    end
+  end
+
+  BaseTrackBackModel::ELEMENTS.each do |name|
+    class_name = Utils.to_class_name(name)
+    BaseListener.install_class_name(TRACKBACK_URI, name,
+                                    "TrackBack#{class_name}")
+  end
+
+  BaseTrackBackModel::ELEMENTS.collect! {|name| "#{TRACKBACK_PREFIX}_#{name}"}
+end
diff --git a/ruby_1_8_6/lib/rss/utils.rb b/ruby_1_8_6/lib/rss/utils.rb
new file mode 100644
index 0000000000..b242a72292
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/utils.rb
@@ -0,0 +1,37 @@
+module RSS
+  module Utils
+    module_function
+
+    # Convert a name_with_underscores to CamelCase.
+    def to_class_name(name)
+      name.split(/_/).collect do |part|
+        "#{part[0, 1].upcase}#{part[1..-1]}"
+      end.join("")
+    end
+    
+    def get_file_and_line_from_caller(i=0)
+      file, line, = caller[i].split(':')
+      [file, line.to_i]
+    end
+
+    # escape '&', '"', '<' and '>' for use in HTML.
+    def html_escape(s)
+      s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
+    end
+    alias h html_escape
+    
+    # If +value+ is an instance of class +klass+, return it, else
+    # create a new instance of +klass+ with value +value+.
+    def new_with_value_if_need(klass, value)
+      if value.is_a?(klass)
+        value
+      else
+        klass.new(value)
+      end
+    end
+
+    def element_initialize_arguments?(args)
+      [true, false].include?(args[0]) and args[1].is_a?(Hash)
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/xml-stylesheet.rb b/ruby_1_8_6/lib/rss/xml-stylesheet.rb
new file mode 100644
index 0000000000..66e3161dd0
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/xml-stylesheet.rb
@@ -0,0 +1,101 @@
+require "rss/utils"
+
+module RSS
+
+  module XMLStyleSheetMixin
+    attr_accessor :xml_stylesheets
+    def initialize(*args)
+      super
+      @xml_stylesheets = []
+    end
+    
+    private
+    def xml_stylesheet_pi
+      xsss = @xml_stylesheets.collect do |xss|
+        pi = xss.to_s
+        pi = nil if /\A\s*\z/ =~ pi
+        pi
+      end.compact
+      xsss.push("") unless xsss.empty?
+      xsss.join("\n")
+    end
+  end
+
+  class XMLStyleSheet
+
+    include Utils
+
+    ATTRIBUTES = %w(href type title media charset alternate)
+
+    GUESS_TABLE = {
+      "xsl" => "text/xsl",
+      "css" => "text/css",
+    }
+
+    attr_accessor(*ATTRIBUTES)
+    attr_accessor(:do_validate)
+    def initialize(*attrs)
+      @do_validate = true
+      ATTRIBUTES.each do |attr|
+        __send__("#{attr}=", nil)
+      end
+      vars = ATTRIBUTES.dup
+      vars.unshift(:do_validate)
+      attrs.each do |name, value|
+        if vars.include?(name.to_s)
+          __send__("#{name}=", value)
+        end
+      end
+    end
+
+    def to_s
+      rv = ""
+      if @href
+        rv << %Q[<?xml-stylesheet]
+        ATTRIBUTES.each do |name|
+          if __send__(name)
+            rv << %Q[ #{name}="#{h __send__(name)}"]
+          end
+        end
+        rv << %Q[?>]
+      end
+      rv
+    end
+
+    remove_method(:href=)
+    def href=(value)
+      @href = value
+      if @href and @type.nil?
+        @type = guess_type(@href)
+      end
+      @href
+    end
+
+    remove_method(:alternate=)
+    def alternate=(value)
+      if value.nil? or /\A(?:yes|no)\z/ =~ value
+        @alternate = value
+      else
+        if @do_validate
+          args = ["?xml-stylesheet?", %Q[alternate="#{value}"]]
+          raise NotAvailableValueError.new(*args)
+        end
+      end
+      @alternate
+    end
+
+    def setup_maker(maker)
+      xss = maker.xml_stylesheets.new_xml_stylesheet
+      ATTRIBUTES.each do |attr|
+        xss.__send__("#{attr}=", __send__(attr))
+      end
+    end
+    
+    private
+    def guess_type(filename)
+      /\.([^.]+)$/ =~ filename
+      GUESS_TABLE[$1]
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/lib/rss/xmlparser.rb b/ruby_1_8_6/lib/rss/xmlparser.rb
new file mode 100644
index 0000000000..3dfe7d461a
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/xmlparser.rb
@@ -0,0 +1,93 @@
+begin
+  require "xml/parser"
+rescue LoadError
+  require "xmlparser"
+end
+
+begin
+  require "xml/encoding-ja"
+rescue LoadError
+  require "xmlencoding-ja"
+  if defined?(Kconv)
+    module XMLEncoding_ja
+      class SJISHandler
+        include Kconv
+      end
+    end
+  end
+end
+
+module XML
+  class Parser
+    unless defined?(Error)
+      Error = ::XMLParserError
+    end
+  end
+end
+
+module RSS
+  
+  class REXMLLikeXMLParser < ::XML::Parser
+    
+    include ::XML::Encoding_ja
+
+    def listener=(listener)
+      @listener = listener
+    end
+
+    def startElement(name, attrs)
+      @listener.tag_start(name, attrs)
+    end
+    
+    def endElement(name)
+      @listener.tag_end(name)
+    end
+
+    def character(data)
+      @listener.text(data)
+    end
+
+    def xmlDecl(version, encoding, standalone)
+      @listener.xmldecl(version, encoding, standalone == 1)
+    end
+
+    def processingInstruction(target, content)
+      @listener.instruction(target, content)
+    end
+
+  end
+
+  class XMLParserParser < BaseParser
+
+    class << self
+      def listener
+        XMLParserListener
+      end
+    end
+    
+    private
+    def _parse
+      begin
+        parser = REXMLLikeXMLParser.new
+        parser.listener = @listener
+        parser.parse(@rss)
+      rescue ::XML::Parser::Error => e
+        raise NotWellFormedError.new(parser.line){e.message}
+      end
+    end
+    
+  end
+  
+  class XMLParserListener < BaseListener
+
+    include ListenerMixin
+    
+    def xmldecl(version, encoding, standalone)
+      super
+      # Encoding is converted to UTF-8 when XMLParser parses XML.
+      @encoding = 'UTF-8'
+    end
+
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rss/xmlscanner.rb b/ruby_1_8_6/lib/rss/xmlscanner.rb
new file mode 100644
index 0000000000..61b9fa6bf4
--- /dev/null
+++ b/ruby_1_8_6/lib/rss/xmlscanner.rb
@@ -0,0 +1,121 @@
+require 'xmlscan/scanner'
+require 'stringio'
+
+module RSS
+  
+  class XMLScanParser < BaseParser
+    
+    class << self
+      def listener
+        XMLScanListener
+      end
+    end
+    
+    private
+    def _parse
+      begin
+        if @rss.is_a?(String)
+          input = StringIO.new(@rss)
+        else
+          input = @rss
+        end
+        scanner = XMLScan::XMLScanner.new(@listener)
+        scanner.parse(input)
+      rescue XMLScan::Error => e
+        lineno = e.lineno || scanner.lineno || input.lineno
+        raise NotWellFormedError.new(lineno){e.message}
+      end
+    end
+    
+  end
+
+  class XMLScanListener < BaseListener
+    
+    include XMLScan::Visitor
+    include ListenerMixin
+
+    ENTITIES = {
+      'lt' => '<',
+      'gt' => '>',
+      'amp' => '&',
+      'quot' => '"',
+      'apos' => '\''
+    }
+
+    def on_xmldecl_version(str)
+      @version = str
+    end
+
+    def on_xmldecl_encoding(str)
+      @encoding = str
+    end
+
+    def on_xmldecl_standalone(str)
+      @standalone = str
+    end
+
+    def on_xmldecl_end
+      xmldecl(@version, @encoding, @standalone == "yes")
+    end
+
+    alias_method(:on_pi, :instruction)
+    alias_method(:on_chardata, :text)
+    alias_method(:on_cdata, :text)
+
+    def on_etag(name)
+      tag_end(name)
+    end
+
+    def on_entityref(ref)
+      text(entity(ref))
+    end
+
+    def on_charref(code)
+      text([code].pack('U'))
+    end
+
+    alias_method(:on_charref_hex, :on_charref)
+
+    def on_stag(name)
+      @attrs = {}
+    end
+
+    def on_attribute(name)
+      @attrs[name] = @current_attr = ''
+    end
+
+    def on_attr_value(str)
+      @current_attr << str
+    end
+
+    def on_attr_entityref(ref)
+      @current_attr << entity(ref)
+    end
+
+    def on_attr_charref(code)
+      @current_attr << [code].pack('U')
+    end
+
+    alias_method(:on_attr_charref_hex, :on_attr_charref)
+
+    def on_stag_end(name)
+      tag_start(name, @attrs)
+    end
+
+    def on_stag_end_empty(name)
+      tag_start(name, @attrs)
+      tag_end(name)
+    end
+
+    private
+    def entity(ref)
+      ent = ENTITIES[ref]
+      if ent
+        ent
+      else
+        wellformed_error("undefined entity: #{ref}")
+      end
+    end
+  end
+
+end
diff --git a/ruby_1_8_6/lib/rubyunit.rb b/ruby_1_8_6/lib/rubyunit.rb
new file mode 100644
index 0000000000..1aca37864f
--- /dev/null
+++ b/ruby_1_8_6/lib/rubyunit.rb
@@ -0,0 +1,6 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'runit/testcase'
+require 'test/unit'
diff --git a/ruby_1_8_6/lib/runit/assert.rb b/ruby_1_8_6/lib/runit/assert.rb
new file mode 100644
index 0000000000..c752b19a25
--- /dev/null
+++ b/ruby_1_8_6/lib/runit/assert.rb
@@ -0,0 +1,73 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/assertions'
+require 'runit/error'
+
+module RUNIT
+  module Assert
+    include Test::Unit::Assertions
+
+    def setup_assert
+    end
+
+    def assert_no_exception(*args, &block)
+      assert_nothing_raised(*args, &block)
+    end
+
+    # To deal with the fact that RubyUnit does not check that the
+    # regular expression is, indeed, a regular expression, if it is
+    # not, we do our own assertion using the same semantics as
+    # RubyUnit
+    def assert_match(actual_string, expected_re, message="")
+      _wrap_assertion {
+        full_message = build_message(message, "Expected <?> to match <?>", actual_string, expected_re)
+        assert_block(full_message) {
+          expected_re =~ actual_string
+        }
+        Regexp.last_match
+      }
+    end
+
+    def assert_not_nil(actual, message="")
+      assert(!actual.nil?, message)
+    end
+
+    def assert_not_match(actual_string, expected_re, message="")
+      assert_no_match(expected_re, actual_string, message)
+    end
+
+    def assert_matches(*args)
+      assert_match(*args)
+    end
+
+    def assert_fail(message="")
+      flunk(message)
+    end
+
+    def assert_equal_float(expected, actual, delta, message="")
+      assert_in_delta(expected, actual, delta, message)
+    end
+
+    def assert_send(object, method, *args)
+      super([object, method, *args])
+    end
+
+    def assert_exception(exception, message="", &block)
+      assert_raises(exception, message, &block)
+    end
+
+    def assert_respond_to(method, object, message="")
+      if (called_internally?)
+        super
+      else
+        super(object, method, message)
+      end
+    end
+
+    def called_internally?
+      /assertions\.rb/.match(caller[1])
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/runit/cui/testrunner.rb b/ruby_1_8_6/lib/runit/cui/testrunner.rb
new file mode 100644
index 0000000000..d521ec16ad
--- /dev/null
+++ b/ruby_1_8_6/lib/runit/cui/testrunner.rb
@@ -0,0 +1,51 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/ui/console/testrunner'
+require 'runit/testresult'
+
+module RUNIT
+  module CUI
+    class TestRunner < Test::Unit::UI::Console::TestRunner
+      @@quiet_mode = false
+      
+      def self.run(suite)
+        self.new().run(suite)
+      end
+      
+      def initialize
+        super nil
+      end
+      
+      def run(suite, quiet_mode=@@quiet_mode)
+        @suite = suite
+        def @suite.suite
+          self
+        end
+        @output_level = (quiet_mode ? Test::Unit::UI::PROGRESS_ONLY : Test::Unit::UI::VERBOSE)
+        start
+      end
+      
+      def create_mediator(suite)
+        mediator = Test::Unit::UI::TestRunnerMediator.new(suite)
+        class << mediator
+          attr_writer :result_delegate
+          def create_result
+            return @result_delegate.create_result
+          end
+        end
+        mediator.result_delegate = self
+        return mediator
+      end
+      
+      def create_result
+        return RUNIT::TestResult.new
+      end
+      
+      def self.quiet_mode=(boolean)
+        @@quiet_mode = boolean
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/runit/error.rb b/ruby_1_8_6/lib/runit/error.rb
new file mode 100644
index 0000000000..4a727fb02b
--- /dev/null
+++ b/ruby_1_8_6/lib/runit/error.rb
@@ -0,0 +1,9 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/assertionfailederror.rb'
+
+module RUNIT
+  AssertionFailedError = Test::Unit::AssertionFailedError
+end
diff --git a/ruby_1_8_6/lib/runit/testcase.rb b/ruby_1_8_6/lib/runit/testcase.rb
new file mode 100644
index 0000000000..4576cb8644
--- /dev/null
+++ b/ruby_1_8_6/lib/runit/testcase.rb
@@ -0,0 +1,45 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'runit/testresult'
+require 'runit/testsuite'
+require 'runit/assert'
+require 'runit/error'
+require 'test/unit/testcase'
+
+module RUNIT
+  class TestCase < Test::Unit::TestCase  
+    include RUNIT::Assert
+    
+    def self.suite
+      method_names = instance_methods(true)
+      tests = method_names.delete_if { |method_name| method_name !~ /^test/ }
+      suite = TestSuite.new(name)
+      tests.each {
+        |test|
+        catch(:invalid_test) {
+          suite << new(test, name)
+        }
+      }
+      return suite
+    end
+    
+    def initialize(test_name, suite_name=self.class.name)
+      super(test_name)
+    end
+    
+    def assert_equals(*args)
+      assert_equal(*args)
+    end
+    
+    def name
+      super.sub(/^(.*?)\((.*)\)$/, '\2#\1')
+    end
+    
+    def run(result, &progress_block)
+      progress_block = proc {} unless (block_given?)
+      super(result, &progress_block)
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/runit/testresult.rb b/ruby_1_8_6/lib/runit/testresult.rb
new file mode 100644
index 0000000000..7f70778171
--- /dev/null
+++ b/ruby_1_8_6/lib/runit/testresult.rb
@@ -0,0 +1,44 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/testresult'
+
+module RUNIT
+  class TestResult < Test::Unit::TestResult
+    attr_reader(:errors, :failures)
+    def succeed?
+      return passed?
+    end
+    def failure_size
+      return failure_count
+    end
+    def run_asserts
+      return assertion_count
+    end
+    def error_size
+      return error_count
+    end
+    def run_tests
+      return run_count
+    end
+    def add_failure(failure)
+      def failure.at
+        return location
+      end
+      def failure.err
+        return message
+      end
+      super(failure)
+    end
+    def add_error(error)
+      def error.at
+        return location
+      end
+      def error.err
+        return exception
+      end
+      super(error)
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/runit/testsuite.rb b/ruby_1_8_6/lib/runit/testsuite.rb
new file mode 100644
index 0000000000..63baf65707
--- /dev/null
+++ b/ruby_1_8_6/lib/runit/testsuite.rb
@@ -0,0 +1,26 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/testsuite'
+
+module RUNIT
+  class TestSuite < Test::Unit::TestSuite
+    def add_test(*args)
+      add(*args)
+    end
+    
+    def add(*args)
+      self.<<(*args)
+    end
+    
+    def count_test_cases
+      return size
+    end
+    
+    def run(result, &progress_block)
+      progress_block = proc {} unless (block_given?)
+      super(result, &progress_block)
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/runit/topublic.rb b/ruby_1_8_6/lib/runit/topublic.rb
new file mode 100644
index 0000000000..566f0dd35c
--- /dev/null
+++ b/ruby_1_8_6/lib/runit/topublic.rb
@@ -0,0 +1,8 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module RUNIT
+  module ToPublic
+  end
+end
diff --git a/ruby_1_8_6/lib/scanf.rb b/ruby_1_8_6/lib/scanf.rb
new file mode 100644
index 0000000000..2972bf9d60
--- /dev/null
+++ b/ruby_1_8_6/lib/scanf.rb
@@ -0,0 +1,702 @@
+# scanf for Ruby
+#
+# $Revision$
+# $Id$
+# $Author$
+# $Date$
+#
+# A product of the Austin Ruby Codefest (Austin, Texas, August 2002)
+
+=begin
+
+=scanf for Ruby
+
+==Description
+
+scanf for Ruby is an implementation of the C function scanf(3),
+modified as necessary for Ruby compatibility.
+
+The methods provided are String#scanf, IO#scanf, and
+Kernel#scanf. Kernel#scanf is a wrapper around STDIN.scanf.  IO#scanf
+can be used on any IO stream, including file handles and sockets.
+scanf can be called either with or without a block.
+
+scanf for Ruby scans an input string or stream according to a
+<b>format</b>, as described below ("Conversions"), and returns an
+array of matches between the format and the input.  The format is
+defined in a string, and is similar (though not identical) to the
+formats used in Kernel#printf and Kernel#sprintf.
+
+The format may contain <b>conversion specifiers</b>, which tell scanf
+what form (type) each particular matched substring should be converted
+to (e.g., decimal integer, floating point number, literal string,
+etc.)  The matches and conversions take place from left to right, and
+the conversions themselves are returned as an array.
+
+The format string may also contain characters other than those in the
+conversion specifiers.  White space (blanks, tabs, or newlines) in the
+format string matches any amount of white space, including none, in
+the input.  Everything else matches only itself.
+
+Scanning stops, and scanf returns, when any input character fails to
+match the specifications in the format string, or when input is
+exhausted, or when everything in the format string has been
+matched. All matches found up to the stopping point are returned in
+the return array (or yielded to the block, if a block was given).
+
+
+==Basic usage
+
+   require 'scanf.rb'
+
+   # String#scanf and IO#scanf take a single argument (a format string)
+   array = aString.scanf("%d%s")
+   array = anIO.scanf("%d%s")
+
+   # Kernel#scanf reads from STDIN
+   array = scanf("%d%s")
+
+==Block usage
+
+When called with a block, scanf keeps scanning the input, cycling back
+to the beginning of the format string, and yields a new array of
+conversions to the block every time the format string is matched
+(including partial matches, but not including complete failures).  The
+actual return value of scanf when called with a block is an array
+containing the results of all the executions of the block. 
+
+   str = "123 abc 456 def 789 ghi"
+   str.scanf("%d%s") { |num,str| [ num * 2, str.upcase ] }
+     # => [[246, "ABC"], [912, "DEF"], [1578, "GHI"]]
+
+==Conversions
+
+The single argument to scanf is a format string, which generally
+includes one or more conversion specifiers. Conversion specifiers
+begin with the percent character ('%') and include information about
+what scanf should next scan for (string, decimal number, single
+character, etc.).
+
+There may be an optional maximum field width, expressed as a decimal
+integer, between the % and the conversion. If no width is given, a
+default of `infinity' is used (with the exception of the %c specifier;
+see below).  Otherwise, given a field width of <em>n</em> for a given
+conversion, at most <em>n</em> characters are scanned in processing
+that conversion.  Before conversion begins, most conversions skip
+white space in the input string; this white space is not counted
+against the field width.
+
+The following conversions are available. (See the files EXAMPLES
+and <tt>tests/scanftests.rb</tt> for examples.)
+
+[%]
+  Matches a literal `%'. That is, `%%' in the format string matches a
+  single input `%' character. No conversion is done, and the resulting
+  '%' is not included in the return array.
+
+[d]
+  Matches an optionally signed decimal integer.
+
+[u]
+  Same as d.
+
+[i] 
+  Matches an optionally signed integer. The integer is read in base
+  16 if it begins with `0x' or `0X', in base 8 if it begins with `0',
+  and in base 10 other- wise. Only characters that correspond to the
+  base are recognized.
+
+[o]
+  Matches an optionally signed octal integer.
+
+[x,X]
+  Matches an optionally signed hexadecimal integer,
+
+[f,g,e,E]
+  Matches an optionally signed floating-point number.
+
+[s]
+  Matches a sequence of non-white-space character. The input string stops at
+  white space or at the maximum field width, whichever occurs first.
+
+[c]
+  Matches a single character, or a sequence of <em>n</em> characters if a
+  field width of <em>n</em> is specified. The usual skip of leading white
+  space is suppressed. To skip white space first, use an explicit space in
+  the format.
+
+[<tt>[</tt>]
+  Matches a nonempty sequence of characters from the specified set
+  of accepted characters.  The usual skip of leading white space is
+  suppressed.  This bracketed sub-expression is interpreted exactly like a
+  character class in a Ruby regular expression.  (In fact, it is placed as-is
+  in a regular expression.)  The matching against the input string ends with
+  the appearance of a character not in (or, with a circumflex, in) the set,
+  or when the field width runs out, whichever comes first.
+
+===Assignment suppression
+
+To require that a particular match occur, but without including the result
+in the return array, place the <b>assignment suppression flag</b>, which is
+the star character ('*'), immediately after the leading '%' of a format
+specifier (just before the field width, if any).
+
+==Examples
+
+See the files <tt>EXAMPLES</tt> and <tt>tests/scanftests.rb</tt>.
+
+==scanf for Ruby compared with scanf in C
+
+scanf for Ruby is based on the C function scanf(3), but with modifications,
+dictated mainly by the underlying differences between the languages.
+
+===Unimplemented flags and specifiers
+
+* The only flag implemented in scanf for Ruby is '<tt>*</tt>' (ignore
+  upcoming conversion). Many of the flags available in C versions of scanf(4)
+  have to do with the type of upcoming pointer arguments, and are literally
+  meaningless in Ruby.
+
+* The <tt>n</tt> specifier (store number of characters consumed so far in
+  next pointer) is not implemented.
+
+* The <tt>p</tt> specifier (match a pointer value) is not implemented.
+
+===Altered specifiers
+
+[o,u,x,X]
+  In scanf for Ruby, all of these specifiers scan for an optionally signed
+  integer, rather than for an unsigned integer like their C counterparts.
+
+===Return values
+
+scanf for Ruby returns an array of successful conversions, whereas
+scanf(3) returns the number of conversions successfully
+completed. (See below for more details on scanf for Ruby's return
+values.)
+
+==Return values
+
+Without a block, scanf returns an array containing all the conversions
+it has found. If none are found, scanf will return an empty array. An
+unsuccesful match is never ignored, but rather always signals the end
+of the scanning operation. If the first unsuccessful match takes place
+after one or more successful matches have already taken place, the
+returned array will contain the results of those successful matches.
+
+With a block scanf returns a 'map'-like array of transformations from
+the block -- that is, an array reflecting what the block did with each
+yielded result from the iterative scanf operation.  (See "Block
+usage", above.)
+
+==Test suite
+
+scanf for Ruby includes a suite of unit tests (requiring the
+<tt>TestUnit</tt> package), which can be run with the command <tt>ruby
+tests/scanftests.rb</tt> or the command <tt>make test</tt>.
+
+==Current limitations and bugs
+
+When using IO#scanf under Windows, make sure you open your files in
+binary mode:
+
+    File.open("filename", "rb")
+
+so that scanf can keep track of characters correctly.
+
+Support for character classes is reasonably complete (since it
+essentially piggy-backs on Ruby's regular expression handling of
+character classes), but users are advised that character class testing
+has not been exhaustive, and that they should exercise some caution
+in using any of the more complex and/or arcane character class
+idioms.
+
+
+==Technical notes
+
+===Rationale behind scanf for Ruby
+
+The impetus for a scanf implementation in Ruby comes chiefly from the fact
+that existing pattern matching operations, such as Regexp#match and
+String#scan, return all results as strings, which have to be converted to
+integers or floats explicitly in cases where what's ultimately wanted are
+integer or float values.
+
+===Design of scanf for Ruby
+
+scanf for Ruby is essentially a <format string>-to-<regular
+expression> converter.
+
+When scanf is called, a FormatString object is generated from the
+format string ("%d%s...") argument. The FormatString object breaks the
+format string down into atoms ("%d", "%5f", "blah", etc.), and from
+each atom it creates a FormatSpecifier object, which it
+saves.
+
+Each FormatSpecifier has a regular expression fragment and a "handler"
+associated with it. For example, the regular expression fragment
+associated with the format "%d" is "([-+]?\d+)", and the handler
+associated with it is a wrapper around String#to_i. scanf itself calls
+FormatString#match, passing in the input string. FormatString#match
+iterates through its FormatSpecifiers; for each one, it matches the
+corresponding regular expression fragment against the string. If
+there's a match, it sends the matched string to the handler associated
+with the FormatSpecifier.
+
+Thus, to follow up the "%d" example: if "123" occurs in the input
+string when a FormatSpecifier consisting of "%d" is reached, the "123"
+will be matched against "([-+]?\d+)", and the matched string will be
+rendered into an integer by a call to to_i.
+
+The rendered match is then saved to an accumulator array, and the
+input string is reduced to the post-match substring. Thus the string
+is "eaten" from the left as the FormatSpecifiers are applied in
+sequence.  (This is done to a duplicate string; the original string is
+not altered.)
+
+As soon as a regular expression fragment fails to match the string, or
+when the FormatString object runs out of FormatSpecifiers, scanning
+stops and results accumulated so far are returned in an array.
+
+==License and copyright
+
+Copyright:: (c) 2002-2003 David Alan Black
+License:: Distributed on the same licensing terms as Ruby itself
+
+==Warranty disclaimer
+
+This software is provided "as is" and without any express or implied
+warranties, including, without limitation, the implied warranties of
+merchantibility and fitness for a particular purpose.
+
+==Credits and acknowledgements
+
+scanf for Ruby was developed as the major activity of the Austin
+Ruby Codefest (Austin, Texas, August 2002).
+
+Principal author:: David Alan Black (mailto:dblack@superlink.net)
+Co-author:: Hal Fulton (mailto:hal9000@hypermetrics.com)
+Project contributors:: Nolan Darilek, Jason Johnston
+
+Thanks to Hal Fulton for hosting the Codefest.
+
+Thanks to Matz for suggestions about the class design.  
+
+Thanks to Gavin Sinclair for some feedback on the documentation.
+
+The text for parts of this document, especially the Description and
+Conversions sections, above, were adapted from the Linux Programmer's
+Manual manpage for scanf(3), dated 1995-11-01.
+
+==Bugs and bug reports
+
+scanf for Ruby is based on something of an amalgam of C scanf
+implementations and documentation, rather than on a single canonical
+description. Suggestions for features and behaviors which appear in
+other scanfs, and would be meaningful in Ruby, are welcome, as are
+reports of suspicious behaviors and/or bugs. (Please see "Credits and
+acknowledgements", above, for email addresses.)
+
+=end
+
+module Scanf
+
+  class FormatSpecifier
+
+    attr_reader :re_string, :matched_string, :conversion, :matched
+
+    private
+
+    def skip;  /^\s*%\*/.match(@spec_string); end
+
+    def extract_float(s); s.to_f if s &&! skip; end
+    def extract_decimal(s); s.to_i if s &&! skip; end
+    def extract_hex(s); s.hex if s &&! skip; end
+    def extract_octal(s); s.oct if s &&! skip; end
+    def extract_integer(s); Integer(s) if s &&! skip; end
+    def extract_plain(s); s unless skip; end
+
+    def nil_proc(s); nil; end
+
+    public
+
+    def to_s
+      @spec_string
+    end
+
+    def count_space?
+      /(?:\A|\S)%\*?\d*c|\[/.match(@spec_string)
+    end
+
+    def initialize(str)
+      @spec_string = str
+      h = '[A-Fa-f0-9]'
+
+      @re_string, @handler = 
+        case @spec_string
+
+          # %[[:...:]]
+        when /%\*?(\[\[:[a-z]+:\]\])/
+          [ "(#{$1}+)", :extract_plain ]
+
+          # %5[[:...:]]
+        when /%\*?(\d+)(\[\[:[a-z]+:\]\])/
+          [ "(#{$2}{1,#{$1}})", :extract_plain ]
+
+          # %[...]
+        when /%\*?\[([^\]]*)\]/
+          yes = $1
+          if /^\^/.match(yes) then no = yes[1..-1] else no = '^' + yes end
+          [ "([#{yes}]+)(?=[#{no}]|\\z)", :extract_plain ]
+
+          # %5[...]
+        when /%\*?(\d+)\[([^\]]*)\]/
+          yes = $2
+          w = $1
+          [ "([#{yes}]{1,#{w}})", :extract_plain ]
+
+          # %i
+        when /%\*?i/
+          [ "([-+]?(?:(?:0[0-7]+)|(?:0[Xx]#{h}+)|(?:[1-9]\\d+)))", :extract_integer ]
+
+          # %5i
+        when /%\*?(\d+)i/
+          n = $1.to_i
+          s = "("
+          if n > 1 then s += "[1-9]\\d{1,#{n-1}}|" end
+          if n > 1 then s += "0[0-7]{1,#{n-1}}|" end
+          if n > 2 then s += "[-+]0[0-7]{1,#{n-2}}|" end
+          if n > 2 then s += "[-+][1-9]\\d{1,#{n-2}}|" end
+          if n > 2 then s += "0[Xx]#{h}{1,#{n-2}}|" end
+          if n > 3 then s += "[-+]0[Xx]#{h}{1,#{n-3}}|" end
+          s += "\\d"
+          s += ")"
+          [ s, :extract_integer ]
+
+          # %d, %u
+        when /%\*?[du]/
+          [ '([-+]?\d+)', :extract_decimal ]
+
+          # %5d, %5u
+        when /%\*?(\d+)[du]/
+          n = $1.to_i
+          s = "("
+          if n > 1 then s += "[-+]\\d{1,#{n-1}}|" end
+          s += "\\d{1,#{$1}})"
+          [ s, :extract_decimal ]
+
+          # %x
+        when /%\*?[Xx]/
+          [ "([-+]?(?:0[Xx])?#{h}+)", :extract_hex ]
+
+          # %5x
+        when /%\*?(\d+)[Xx]/
+          n = $1.to_i
+          s = "("
+          if n > 3 then s += "[-+]0[Xx]#{h}{1,#{n-3}}|" end
+          if n > 2 then s += "0[Xx]#{h}{1,#{n-2}}|" end
+          if n > 1 then s += "[-+]#{h}{1,#{n-1}}|" end
+          s += "#{h}{1,#{n}}"
+          s += ")"
+          [ s, :extract_hex ]
+
+          # %o
+        when /%\*?o/
+          [ '([-+]?[0-7]+)', :extract_octal ]
+
+          # %5o
+        when /%\*?(\d+)o/
+          [ "([-+][0-7]{1,#{$1.to_i-1}}|[0-7]{1,#{$1}})", :extract_octal ]
+
+          # %f
+        when /%\*?f/
+          [ '([-+]?((\d+(?>(?=[^\d.]|$)))|(\d*(\.(\d*([eE][-+]?\d+)?)))))', :extract_float ]
+
+          # %5f
+        when /%\*?(\d+)f/
+          [ "(\\S{1,#{$1}})", :extract_float ]
+
+          # %5s
+        when /%\*?(\d+)s/
+          [ "(\\S{1,#{$1}})", :extract_plain ]
+
+          # %s
+        when /%\*?s/
+          [ '(\S+)', :extract_plain ]
+
+          # %c
+        when /\s%\*?c/
+          [ "\\s*(.)", :extract_plain ]
+
+          # %c
+        when /%\*?c/
+          [ "(.)", :extract_plain ]
+
+          # %5c (whitespace issues are handled by the count_*_space? methods)
+        when /%\*?(\d+)c/
+          [ "(.{1,#{$1}})", :extract_plain ]
+
+          # %%
+        when /%%/
+          [ '(\s*%)', :nil_proc ]
+
+          # literal characters
+        else
+          [ "(#{Regexp.escape(@spec_string)})", :nil_proc ]
+        end
+
+      @re_string = '\A' + @re_string
+    end
+
+    def to_re
+      Regexp.new(@re_string,Regexp::MULTILINE)
+    end
+
+    def match(str)
+      @matched = false
+      s = str.dup
+      s.sub!(/\A\s+/,'') unless count_space?
+      res = to_re.match(s)
+      if res
+        @conversion = send(@handler, res[1])
+        @matched_string = @conversion.to_s
+        @matched = true
+      end
+      res
+    end
+
+    def letter
+      /%\*?\d*([a-z\[])/.match(@spec_string).to_a[1]
+    end
+
+    def width
+      w = /%\*?(\d+)/.match(@spec_string).to_a[1]
+      w && w.to_i
+    end
+
+    def mid_match?
+      return false unless @matched
+      cc_no_width    = letter == '[' &&! width
+      c_or_cc_width  = (letter == 'c' || letter == '[') && width
+      width_left     = c_or_cc_width && (matched_string.size < width)
+
+      return width_left || cc_no_width
+    end
+    
+  end
+
+  class FormatString
+
+    attr_reader :string_left, :last_spec_tried,
+                :last_match_tried, :matched_count, :space
+
+    SPECIFIERS = 'diuXxofeEgsc'
+    REGEX = /
+        # possible space, followed by...
+          (?:\s*
+          # percent sign, followed by...
+            %
+            # another percent sign, or...
+              (?:%|
+        	 # optional assignment suppression flag
+        	 \*?
+        	 # optional maximum field width
+        	 \d*
+        	   # named character class, ...
+        	   (?:\[\[:\w+:\]\]|
+        	   # traditional character class, or...
+        	      \[[^\]]*\]|
+        	   # specifier letter.
+        	      [#{SPECIFIERS}])))|
+            # or miscellaneous characters
+              [^%\s]+/ix
+
+    def initialize(str)
+      @specs = []
+      @i = 1
+      s = str.to_s
+      return unless /\S/.match(s)
+      @space = true if /\s\z/.match(s)
+      @specs.replace s.scan(REGEX).map {|spec| FormatSpecifier.new(spec) }
+    end
+
+    def to_s
+      @specs.join('')
+    end
+
+    def prune(n=matched_count)
+      n.times { @specs.shift }
+    end
+
+    def spec_count
+      @specs.size
+    end
+
+    def last_spec
+      @i == spec_count - 1
+    end
+
+    def match(str)
+      accum = []
+      @string_left = str
+      @matched_count = 0
+
+      @specs.each_with_index do |spec,@i|
+        @last_spec_tried = spec
+        @last_match_tried = spec.match(@string_left)
+        break unless @last_match_tried
+        @matched_count += 1
+
+        accum << spec.conversion
+
+        @string_left = @last_match_tried.post_match
+        break if @string_left.empty?
+      end
+      return accum.compact
+    end
+  end
+end
+
+class IO
+
+# The trick here is doing a match where you grab one *line*
+# of input at a time.  The linebreak may or may not occur
+# at the boundary where the string matches a format specifier.
+# And if it does, some rule about whitespace may or may not
+# be in effect...
+#
+# That's why this is much more elaborate than the string
+# version.
+#
+# For each line:
+# Match succeeds (non-emptily)
+# and the last attempted spec/string sub-match succeeded:
+#
+#   could the last spec keep matching?
+#     yes: save interim results and continue (next line)
+#
+# The last attempted spec/string did not match:
+#
+# are we on the next-to-last spec in the string?
+#   yes:
+#     is fmt_string.string_left all spaces?
+#       yes: does current spec care about input space?
+#         yes: fatal failure
+#         no: save interim results and continue
+#   no: continue  [this state could be analyzed further]
+#
+#
+
+  def scanf(str,&b)
+    return block_scanf(str,&b) if b
+    return [] unless str.size > 0
+
+    start_position = pos rescue 0
+    matched_so_far = 0
+    source_buffer = ""
+    result_buffer = []
+    final_result = []
+
+    fstr = Scanf::FormatString.new(str)
+
+    loop do
+      if eof || (tty? &&! fstr.match(source_buffer))
+        final_result.concat(result_buffer)
+        break
+      end
+
+      source_buffer << gets
+
+      current_match = fstr.match(source_buffer)
+
+      spec = fstr.last_spec_tried
+
+      if spec.matched
+        if spec.mid_match?
+          result_buffer.replace(current_match)
+          next
+        end
+
+      elsif (fstr.matched_count == fstr.spec_count - 1)
+        if /\A\s*\z/.match(fstr.string_left)
+          break if spec.count_space?
+          result_buffer.replace(current_match)
+          next
+        end
+      end
+
+      final_result.concat(current_match)
+
+      matched_so_far += source_buffer.size
+      source_buffer.replace(fstr.string_left)
+      matched_so_far -= source_buffer.size
+      break if fstr.last_spec
+      fstr.prune
+    end
+    seek(start_position + matched_so_far, IO::SEEK_SET) rescue Errno::ESPIPE
+    soak_up_spaces if fstr.last_spec && fstr.space
+
+    return final_result
+  end
+
+  private
+
+  def soak_up_spaces
+    c = getc
+    ungetc(c) if c
+    until eof ||! c || /\S/.match(c.chr)
+      c = getc
+    end
+    ungetc(c) if (c && /\S/.match(c.chr))
+  end
+
+  def block_scanf(str)
+    final = []
+# Sub-ideal, since another FS gets created in scanf.
+# But used here to determine the number of specifiers.
+    fstr = Scanf::FormatString.new(str)
+    last_spec = fstr.last_spec
+    begin
+      current = scanf(str)
+      break if current.empty?
+      final.push(yield(current))
+    end until eof || fstr.last_spec_tried == last_spec
+    return final
+  end
+end
+
+class String
+
+  def scanf(fstr,&b)
+    if b
+      block_scanf(fstr,&b)
+    else
+      fs = 
+        if fstr.is_a? Scanf::FormatString
+          fstr 
+        else 
+          Scanf::FormatString.new(fstr)
+        end
+      fs.match(self)
+    end
+  end
+
+  def block_scanf(fstr,&b)
+    fs = Scanf::FormatString.new(fstr)
+    str = self.dup
+    final = []
+    begin
+      current = str.scanf(fs)
+      final.push(yield(current)) unless current.empty?
+      str = fs.string_left
+    end until current.empty? || str.empty?
+    return final
+  end
+end
+
+module Kernel
+  private
+  def scanf(fs,&b)
+    STDIN.scanf(fs,&b)
+  end
+end
diff --git a/ruby_1_8_6/lib/set.rb b/ruby_1_8_6/lib/set.rb
new file mode 100644
index 0000000000..5a9287ba89
--- /dev/null
+++ b/ruby_1_8_6/lib/set.rb
@@ -0,0 +1,1227 @@
+#!/usr/bin/env ruby
+#--
+# set.rb - defines the Set class
+#++
+# Copyright (c) 2002 Akinori MUSHA <knu@iDaemons.org>
+#
+# Documentation by Akinori MUSHA and Gavin Sinclair. 
+#
+# All rights reserved.  You can redistribute and/or modify it under the same
+# terms as Ruby.
+#
+#   $Id$
+#
+# == Overview 
+# 
+# This library provides the Set class, which deals with a collection
+# of unordered values with no duplicates.  It is a hybrid of Array's
+# intuitive inter-operation facilities and Hash's fast lookup.  If you
+# need to keep values ordered, use the SortedSet class.
+#
+# The method +to_set+ is added to Enumerable for convenience.
+#
+# See the Set class for an example of usage.
+
+
+#
+# Set implements a collection of unordered values with no duplicates.
+# This is a hybrid of Array's intuitive inter-operation facilities and
+# Hash's fast lookup.
+#
+# Several methods accept any Enumerable object (implementing +each+)
+# for greater flexibility: new, replace, merge, subtract, |, &, -, ^.
+#
+# The equality of each couple of elements is determined according to
+# Object#eql? and Object#hash, since Set uses Hash as storage.
+#
+# Finally, if you are using class Set, you can also use Enumerable#to_set
+# for convenience.
+#
+# == Example
+#
+#   require 'set'
+#   s1 = Set.new [1, 2]                   # -> #<Set: {1, 2}>
+#   s2 = [1, 2].to_set                    # -> #<Set: {1, 2}>
+#   s1 == s2                              # -> true
+#   s1.add("foo")                         # -> #<Set: {1, 2, "foo"}>
+#   s1.merge([2, 6])                      # -> #<Set: {6, 1, 2, "foo"}>
+#   s1.subset? s2                         # -> false
+#   s2.subset? s1                         # -> true
+#
+class Set
+  include Enumerable
+
+  # Creates a new set containing the given objects.
+  def self.[](*ary)
+    new(ary)
+  end
+
+  # Creates a new set containing the elements of the given enumerable
+  # object.
+  #
+  # If a block is given, the elements of enum are preprocessed by the
+  # given block.
+  def initialize(enum = nil, &block) # :yields: o
+    @hash ||= Hash.new
+
+    enum.nil? and return
+
+    if block
+      enum.each { |o| add(block[o]) }
+    else
+      merge(enum)
+    end
+  end
+
+  # Copy internal hash.
+  def initialize_copy(orig)
+    @hash = orig.instance_eval{@hash}.dup
+  end
+
+  # Returns the number of elements.
+  def size
+    @hash.size
+  end
+  alias length size
+
+  # Returns true if the set contains no elements.
+  def empty?
+    @hash.empty?
+  end
+
+  # Removes all elements and returns self.
+  def clear
+    @hash.clear
+    self
+  end
+
+  # Replaces the contents of the set with the contents of the given
+  # enumerable object and returns self.
+  def replace(enum)
+    if enum.class == self.class
+      @hash.replace(enum.instance_eval { @hash })
+    else
+      enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
+      clear
+      enum.each { |o| add(o) }
+    end
+
+    self
+  end
+
+  # Converts the set to an array.  The order of elements is uncertain.
+  def to_a
+    @hash.keys
+  end
+
+  def flatten_merge(set, seen = Set.new)
+    set.each { |e|
+      if e.is_a?(Set)
+	if seen.include?(e_id = e.object_id)
+	  raise ArgumentError, "tried to flatten recursive Set"
+	end
+
+	seen.add(e_id)
+	flatten_merge(e, seen)
+	seen.delete(e_id)
+      else
+	add(e)
+      end
+    }
+
+    self
+  end
+  protected :flatten_merge
+
+  # Returns a new set that is a copy of the set, flattening each
+  # containing set recursively.
+  def flatten
+    self.class.new.flatten_merge(self)
+  end
+
+  # Equivalent to Set#flatten, but replaces the receiver with the
+  # result in place.  Returns nil if no modifications were made.
+  def flatten!
+    if detect { |e| e.is_a?(Set) }
+      replace(flatten())
+    else
+      nil
+    end
+  end
+
+  # Returns true if the set contains the given object.
+  def include?(o)
+    @hash.include?(o)
+  end
+  alias member? include?
+
+  # Returns true if the set is a superset of the given set.
+  def superset?(set)
+    set.is_a?(Set) or raise ArgumentError, "value must be a set"
+    return false if size < set.size
+    set.all? { |o| include?(o) }
+  end
+
+  # Returns true if the set is a proper superset of the given set.
+  def proper_superset?(set)
+    set.is_a?(Set) or raise ArgumentError, "value must be a set"
+    return false if size <= set.size
+    set.all? { |o| include?(o) }
+  end
+
+  # Returns true if the set is a subset of the given set.
+  def subset?(set)
+    set.is_a?(Set) or raise ArgumentError, "value must be a set"
+    return false if set.size < size
+    all? { |o| set.include?(o) }
+  end
+
+  # Returns true if the set is a proper subset of the given set.
+  def proper_subset?(set)
+    set.is_a?(Set) or raise ArgumentError, "value must be a set"
+    return false if set.size <= size
+    all? { |o| set.include?(o) }
+  end
+
+  # Calls the given block once for each element in the set, passing
+  # the element as parameter.
+  def each
+    @hash.each_key { |o| yield(o) }
+    self
+  end
+
+  # Adds the given object to the set and returns self.  Use +merge+ to
+  # add several elements at once.
+  def add(o)
+    @hash[o] = true
+    self
+  end
+  alias << add
+
+  # Adds the given object to the set and returns self.  If the
+  # object is already in the set, returns nil.
+  def add?(o)
+    if include?(o)
+      nil
+    else
+      add(o)
+    end
+  end
+
+  # Deletes the given object from the set and returns self.  Use +subtract+ to
+  # delete several items at once.
+  def delete(o)
+    @hash.delete(o)
+    self
+  end
+
+  # Deletes the given object from the set and returns self.  If the
+  # object is not in the set, returns nil.
+  def delete?(o)
+    if include?(o)
+      delete(o)
+    else
+      nil
+    end
+  end
+
+  # Deletes every element of the set for which block evaluates to
+  # true, and returns self.
+  def delete_if
+    @hash.delete_if { |o,| yield(o) }
+    self
+  end
+
+  # Do collect() destructively.
+  def collect!
+    set = self.class.new
+    each { |o| set << yield(o) }
+    replace(set)
+  end
+  alias map! collect!
+
+  # Equivalent to Set#delete_if, but returns nil if no changes were
+  # made.
+  def reject!
+    n = size
+    delete_if { |o| yield(o) }
+    size == n ? nil : self
+  end
+
+  # Merges the elements of the given enumerable object to the set and
+  # returns self.
+  def merge(enum)
+    if enum.is_a?(Set)
+      @hash.update(enum.instance_eval { @hash })
+    else
+      enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
+      enum.each { |o| add(o) }
+    end
+
+    self
+  end
+
+  # Deletes every element that appears in the given enumerable object
+  # and returns self.
+  def subtract(enum)
+    enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
+    enum.each { |o| delete(o) }
+    self
+  end
+
+  # Returns a new set built by merging the set and the elements of the
+  # given enumerable object.
+  def |(enum)
+    enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
+    dup.merge(enum)
+  end
+  alias + |		##
+  alias union |		##
+
+  # Returns a new set built by duplicating the set, removing every
+  # element that appears in the given enumerable object.
+  def -(enum)
+    enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
+    dup.subtract(enum)
+  end
+  alias difference -	##
+
+  # Returns a new set containing elements common to the set and the
+  # given enumerable object.
+  def &(enum)
+    enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
+    n = self.class.new
+    enum.each { |o| n.add(o) if include?(o) }
+    n
+  end
+  alias intersection &	##
+
+  # Returns a new set containing elements exclusive between the set
+  # and the given enumerable object.  (set ^ enum) is equivalent to
+  # ((set | enum) - (set & enum)).
+  def ^(enum)
+    enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
+    n = Set.new(enum)
+    each { |o| if n.include?(o) then n.delete(o) else n.add(o) end }
+    n
+  end
+
+  # Returns true if two sets are equal.  The equality of each couple
+  # of elements is defined according to Object#eql?.
+  def ==(set)
+    equal?(set) and return true
+
+    set.is_a?(Set) && size == set.size or return false
+
+    hash = @hash.dup
+    set.all? { |o| hash.include?(o) }
+  end
+
+  def hash	# :nodoc:
+    @hash.hash
+  end
+
+  def eql?(o)	# :nodoc:
+    return false unless o.is_a?(Set)
+    @hash.eql?(o.instance_eval{@hash})
+  end
+
+  # Classifies the set by the return value of the given block and
+  # returns a hash of {value => set of elements} pairs.  The block is
+  # called once for each element of the set, passing the element as
+  # parameter.
+  #
+  # e.g.:
+  #
+  #   require 'set'
+  #   files = Set.new(Dir.glob("*.rb"))
+  #   hash = files.classify { |f| File.mtime(f).year }
+  #   p hash    # => {2000=>#<Set: {"a.rb", "b.rb"}>,
+  #             #     2001=>#<Set: {"c.rb", "d.rb", "e.rb"}>,
+  #             #     2002=>#<Set: {"f.rb"}>}
+  def classify # :yields: o
+    h = {}
+
+    each { |i|
+      x = yield(i)
+      (h[x] ||= self.class.new).add(i)
+    }
+
+    h
+  end
+
+  # Divides the set into a set of subsets according to the commonality
+  # defined by the given block.
+  #
+  # If the arity of the block is 2, elements o1 and o2 are in common
+  # if block.call(o1, o2) is true.  Otherwise, elements o1 and o2 are
+  # in common if block.call(o1) == block.call(o2).
+  #
+  # e.g.:
+  #
+  #   require 'set'
+  #   numbers = Set[1, 3, 4, 6, 9, 10, 11]
+  #   set = numbers.divide { |i,j| (i - j).abs == 1 }
+  #   p set     # => #<Set: {#<Set: {1}>,
+  #             #            #<Set: {11, 9, 10}>,
+  #             #            #<Set: {3, 4}>,
+  #             #            #<Set: {6}>}>
+  def divide(&func)
+    if func.arity == 2
+      require 'tsort'
+
+      class << dig = {}		# :nodoc:
+	include TSort
+
+	alias tsort_each_node each_key
+	def tsort_each_child(node, &block)
+	  fetch(node).each(&block)
+	end
+      end
+
+      each { |u|
+	dig[u] = a = []
+	each{ |v| func.call(u, v) and a << v }
+      }
+
+      set = Set.new()
+      dig.each_strongly_connected_component { |css|
+	set.add(self.class.new(css))
+      }
+      set
+    else
+      Set.new(classify(&func).values)
+    end
+  end
+
+  InspectKey = :__inspect_key__         # :nodoc:
+
+  # Returns a string containing a human-readable representation of the
+  # set. ("#<Set: {element1, element2, ...}>")
+  def inspect
+    ids = (Thread.current[InspectKey] ||= [])
+
+    if ids.include?(object_id)
+      return sprintf('#<%s: {...}>', self.class.name)
+    end
+
+    begin
+      ids << object_id
+      return sprintf('#<%s: {%s}>', self.class, to_a.inspect[1..-2])
+    ensure
+      ids.pop
+    end
+  end
+
+  def pretty_print(pp)	# :nodoc:
+    pp.text sprintf('#<%s: {', self.class.name)
+    pp.nest(1) {
+      pp.seplist(self) { |o|
+	pp.pp o
+      }
+    }
+    pp.text "}>"
+  end
+
+  def pretty_print_cycle(pp)	# :nodoc:
+    pp.text sprintf('#<%s: {%s}>', self.class.name, empty? ? '' : '...')
+  end
+end
+
+# SortedSet implements a set which elements are sorted in order.  See Set.
+class SortedSet < Set
+  @@setup = false
+
+  class << self
+    def [](*ary)	# :nodoc:
+      new(ary)
+    end
+
+    def setup	# :nodoc:
+      @@setup and return
+
+      module_eval {
+        # a hack to shut up warning
+        alias old_init initialize
+        remove_method :old_init
+      }
+      begin
+	require 'rbtree'
+
+	module_eval %{
+	  def initialize(*args, &block)
+	    @hash = RBTree.new
+	    super
+	  end
+	}
+      rescue LoadError
+	module_eval %{
+	  def initialize(*args, &block)
+	    @keys = nil
+	    super
+	  end
+
+	  def clear
+	    @keys = nil
+	    super
+	  end
+
+	  def replace(enum)
+	    @keys = nil
+	    super
+	  end
+
+	  def add(o)
+	    @keys = nil
+	    @hash[o] = true
+	    self
+	  end
+	  alias << add
+
+	  def delete(o)
+	    @keys = nil
+	    @hash.delete(o)
+	    self
+	  end
+
+	  def delete_if
+	    n = @hash.size
+	    @hash.delete_if { |o,| yield(o) }
+	    @keys = nil if @hash.size != n
+	    self
+	  end
+
+	  def merge(enum)
+	    @keys = nil
+	    super
+	  end
+
+	  def each
+	    to_a.each { |o| yield(o) }
+	  end
+
+	  def to_a
+	    (@keys = @hash.keys).sort! unless @keys
+	    @keys
+	  end
+	}
+      end
+
+      @@setup = true
+    end
+  end
+
+  def initialize(*args, &block)	# :nodoc:
+    SortedSet.setup
+    initialize(*args, &block)
+  end
+end
+
+module Enumerable
+  # Makes a set from the enumerable object with given arguments.
+  # Needs to +require "set"+ to use this method.
+  def to_set(klass = Set, *args, &block)
+    klass.new(self, *args, &block)
+  end
+end
+
+# =begin
+# == RestricedSet class
+# RestricedSet implements a set with restrictions defined by a given
+# block.
+# 
+# === Super class
+#     Set
+# 
+# === Class Methods
+# --- RestricedSet::new(enum = nil) { |o| ... }
+# --- RestricedSet::new(enum = nil) { |rset, o| ... }
+#     Creates a new restricted set containing the elements of the given
+#     enumerable object.  Restrictions are defined by the given block.
+# 
+#     If the block's arity is 2, it is called with the RestrictedSet
+#     itself and an object to see if the object is allowed to be put in
+#     the set.
+# 
+#     Otherwise, the block is called with an object to see if the object
+#     is allowed to be put in the set.
+# 
+# === Instance Methods
+# --- restriction_proc
+#     Returns the restriction procedure of the set.
+# 
+# =end
+# 
+# class RestricedSet < Set
+#   def initialize(*args, &block)
+#     @proc = block or raise ArgumentError, "missing a block"
+# 
+#     if @proc.arity == 2
+#       instance_eval %{
+# 	def add(o)
+# 	  @hash[o] = true if @proc.call(self, o)
+# 	  self
+# 	end
+# 	alias << add
+# 
+# 	def add?(o)
+# 	  if include?(o) || !@proc.call(self, o)
+# 	    nil
+# 	  else
+# 	    @hash[o] = true
+# 	    self
+# 	  end
+# 	end
+# 
+# 	def replace(enum)
+# 	  enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
+# 	  clear
+# 	  enum.each { |o| add(o) }
+# 
+# 	  self
+# 	end
+# 
+# 	def merge(enum)
+# 	  enum.is_a?(Enumerable) or raise ArgumentError, "value must be enumerable"
+# 	  enum.each { |o| add(o) }
+# 
+# 	  self
+# 	end
+#       }
+#     else
+#       instance_eval %{
+# 	def add(o)
+#         if @proc.call(o)
+# 	    @hash[o] = true 
+#         end
+# 	  self
+# 	end
+# 	alias << add
+# 
+# 	def add?(o)
+# 	  if include?(o) || !@proc.call(o)
+# 	    nil
+# 	  else
+# 	    @hash[o] = true
+# 	    self
+# 	  end
+# 	end
+#       }
+#     end
+# 
+#     super(*args)
+#   end
+# 
+#   def restriction_proc
+#     @proc
+#   end
+# end
+
+if $0 == __FILE__
+  eval DATA.read, nil, $0, __LINE__+4
+end
+
+__END__
+
+require 'test/unit'
+
+class TC_Set < Test::Unit::TestCase
+  def test_aref
+    assert_nothing_raised {
+      Set[]
+      Set[nil]
+      Set[1,2,3]
+    }
+
+    assert_equal(0, Set[].size)
+    assert_equal(1, Set[nil].size)
+    assert_equal(1, Set[[]].size)
+    assert_equal(1, Set[[nil]].size)
+
+    set = Set[2,4,6,4]
+    assert_equal(Set.new([2,4,6]), set)
+  end
+
+  def test_s_new
+    assert_nothing_raised {
+      Set.new()
+      Set.new(nil)
+      Set.new([])
+      Set.new([1,2])
+      Set.new('a'..'c')
+      Set.new('XYZ')
+    }
+    assert_raises(ArgumentError) {
+      Set.new(false)
+    }
+    assert_raises(ArgumentError) {
+      Set.new(1)
+    }
+    assert_raises(ArgumentError) {
+      Set.new(1,2)
+    }
+
+    assert_equal(0, Set.new().size)
+    assert_equal(0, Set.new(nil).size)
+    assert_equal(0, Set.new([]).size)
+    assert_equal(1, Set.new([nil]).size)
+
+    ary = [2,4,6,4]
+    set = Set.new(ary)
+    ary.clear
+    assert_equal(false, set.empty?)
+    assert_equal(3, set.size)
+
+    ary = [1,2,3]
+
+    s = Set.new(ary) { |o| o * 2 }
+    assert_equal([2,4,6], s.sort)
+  end
+
+  def test_clone
+    set1 = Set.new
+    set2 = set1.clone
+    set1 << 'abc'
+    assert_equal(Set.new, set2)
+  end
+
+  def test_dup
+    set1 = Set[1,2]
+    set2 = set1.dup
+
+    assert_not_same(set1, set2)
+
+    assert_equal(set1, set2)
+
+    set1.add(3)
+
+    assert_not_equal(set1, set2)
+  end
+
+  def test_size
+    assert_equal(0, Set[].size)
+    assert_equal(2, Set[1,2].size)
+    assert_equal(2, Set[1,2,1].size)
+  end
+
+  def test_empty?
+    assert_equal(true, Set[].empty?)
+    assert_equal(false, Set[1, 2].empty?)
+  end
+
+  def test_clear
+    set = Set[1,2]
+    ret = set.clear
+
+    assert_same(set, ret)
+    assert_equal(true, set.empty?)
+  end
+
+  def test_replace
+    set = Set[1,2]
+    ret = set.replace('a'..'c')
+
+    assert_same(set, ret)
+    assert_equal(Set['a','b','c'], set)
+  end
+
+  def test_to_a
+    set = Set[1,2,3,2]
+    ary = set.to_a
+
+    assert_equal([1,2,3], ary.sort)
+  end
+
+  def test_flatten
+    # test1
+    set1 = Set[
+      1,
+      Set[
+	5,
+	Set[7,
+	  Set[0]
+	],
+	Set[6,2],
+	1
+      ],
+      3,
+      Set[3,4]
+    ]
+
+    set2 = set1.flatten
+    set3 = Set.new(0..7)
+
+    assert_not_same(set2, set1)
+    assert_equal(set3, set2)
+
+    # test2; destructive
+    orig_set1 = set1
+    set1.flatten!
+
+    assert_same(orig_set1, set1)
+    assert_equal(set3, set1)
+
+    # test3; multiple occurrences of a set in an set
+    set1 = Set[1, 2]
+    set2 = Set[set1, Set[set1, 4], 3]
+
+    assert_nothing_raised {
+      set2.flatten!
+    }
+
+    assert_equal(Set.new(1..4), set2)
+
+    # test4; recursion
+    set2 = Set[]
+    set1 = Set[1, set2]
+    set2.add(set1)
+
+    assert_raises(ArgumentError) {
+      set1.flatten!
+    }
+
+    # test5; miscellaneous
+    empty = Set[]
+    set =  Set[Set[empty, "a"],Set[empty, "b"]]
+
+    assert_nothing_raised {
+      set.flatten
+    }
+
+    set1 = empty.merge(Set["no_more", set])
+
+    assert_nil(Set.new(0..31).flatten!)
+
+    x = Set[Set[],Set[1,2]].flatten!
+    y = Set[1,2]
+
+    assert_equal(x, y)
+  end
+
+  def test_include?
+    set = Set[1,2,3]
+
+    assert_equal(true, set.include?(1))
+    assert_equal(true, set.include?(2))
+    assert_equal(true, set.include?(3))
+    assert_equal(false, set.include?(0))
+    assert_equal(false, set.include?(nil))
+
+    set = Set["1",nil,"2",nil,"0","1",false]
+    assert_equal(true, set.include?(nil))
+    assert_equal(true, set.include?(false))
+    assert_equal(true, set.include?("1"))
+    assert_equal(false, set.include?(0))
+    assert_equal(false, set.include?(true))
+  end
+
+  def test_superset?
+    set = Set[1,2,3]
+
+    assert_raises(ArgumentError) {
+      set.superset?()
+    }
+
+    assert_raises(ArgumentError) {
+      set.superset?(2)
+    }
+
+    assert_raises(ArgumentError) {
+      set.superset?([2])
+    }
+
+    assert_equal(true, set.superset?(Set[]))
+    assert_equal(true, set.superset?(Set[1,2]))
+    assert_equal(true, set.superset?(Set[1,2,3]))
+    assert_equal(false, set.superset?(Set[1,2,3,4]))
+    assert_equal(false, set.superset?(Set[1,4]))
+
+    assert_equal(true, Set[].superset?(Set[]))
+  end
+
+  def test_proper_superset?
+    set = Set[1,2,3]
+
+    assert_raises(ArgumentError) {
+      set.proper_superset?()
+    }
+
+    assert_raises(ArgumentError) {
+      set.proper_superset?(2)
+    }
+
+    assert_raises(ArgumentError) {
+      set.proper_superset?([2])
+    }
+
+    assert_equal(true, set.proper_superset?(Set[]))
+    assert_equal(true, set.proper_superset?(Set[1,2]))
+    assert_equal(false, set.proper_superset?(Set[1,2,3]))
+    assert_equal(false, set.proper_superset?(Set[1,2,3,4]))
+    assert_equal(false, set.proper_superset?(Set[1,4]))
+
+    assert_equal(false, Set[].proper_superset?(Set[]))
+  end
+
+  def test_subset?
+    set = Set[1,2,3]
+
+    assert_raises(ArgumentError) {
+      set.subset?()
+    }
+
+    assert_raises(ArgumentError) {
+      set.subset?(2)
+    }
+
+    assert_raises(ArgumentError) {
+      set.subset?([2])
+    }
+
+    assert_equal(true, set.subset?(Set[1,2,3,4]))
+    assert_equal(true, set.subset?(Set[1,2,3]))
+    assert_equal(false, set.subset?(Set[1,2]))
+    assert_equal(false, set.subset?(Set[]))
+
+    assert_equal(true, Set[].subset?(Set[1]))
+    assert_equal(true, Set[].subset?(Set[]))
+  end
+
+  def test_proper_subset?
+    set = Set[1,2,3]
+
+    assert_raises(ArgumentError) {
+      set.proper_subset?()
+    }
+
+    assert_raises(ArgumentError) {
+      set.proper_subset?(2)
+    }
+
+    assert_raises(ArgumentError) {
+      set.proper_subset?([2])
+    }
+
+    assert_equal(true, set.proper_subset?(Set[1,2,3,4]))
+    assert_equal(false, set.proper_subset?(Set[1,2,3]))
+    assert_equal(false, set.proper_subset?(Set[1,2]))
+    assert_equal(false, set.proper_subset?(Set[]))
+
+    assert_equal(false, Set[].proper_subset?(Set[]))
+  end
+
+  def test_each
+    ary = [1,3,5,7,10,20]
+    set = Set.new(ary)
+
+    assert_raises(LocalJumpError) {
+      set.each
+    }
+
+    assert_nothing_raised {
+      set.each { |o|
+	ary.delete(o) or raise "unexpected element: #{o}"
+      }
+
+      ary.empty? or raise "forgotten elements: #{ary.join(', ')}"
+    }
+  end
+
+  def test_add
+    set = Set[1,2,3]
+
+    ret = set.add(2)
+    assert_same(set, ret)
+    assert_equal(Set[1,2,3], set)
+
+    ret = set.add?(2)
+    assert_nil(ret)
+    assert_equal(Set[1,2,3], set)
+
+    ret = set.add(4)
+    assert_same(set, ret)
+    assert_equal(Set[1,2,3,4], set)
+
+    ret = set.add?(5)
+    assert_same(set, ret)
+    assert_equal(Set[1,2,3,4,5], set)
+  end
+
+  def test_delete
+    set = Set[1,2,3]
+
+    ret = set.delete(4)
+    assert_same(set, ret)
+    assert_equal(Set[1,2,3], set)
+
+    ret = set.delete?(4)
+    assert_nil(ret)
+    assert_equal(Set[1,2,3], set)
+
+    ret = set.delete(2)
+    assert_equal(set, ret)
+    assert_equal(Set[1,3], set)
+
+    ret = set.delete?(1)
+    assert_equal(set, ret)
+    assert_equal(Set[3], set)
+  end
+
+  def test_delete_if
+    set = Set.new(1..10)
+    ret = set.delete_if { |i| i > 10 }
+    assert_same(set, ret)
+    assert_equal(Set.new(1..10), set)
+
+    set = Set.new(1..10)
+    ret = set.delete_if { |i| i % 3 == 0 }
+    assert_same(set, ret)
+    assert_equal(Set[1,2,4,5,7,8,10], set)
+  end
+
+  def test_collect!
+    set = Set[1,2,3,'a','b','c',-1..1,2..4]
+
+    ret = set.collect! { |i|
+      case i
+      when Numeric
+	i * 2
+      when String
+	i.upcase
+      else
+	nil
+      end
+    }
+
+    assert_same(set, ret)
+    assert_equal(Set[2,4,6,'A','B','C',nil], set)
+  end
+
+  def test_reject!
+    set = Set.new(1..10)
+
+    ret = set.reject! { |i| i > 10 }
+    assert_nil(ret)
+    assert_equal(Set.new(1..10), set)
+
+    ret = set.reject! { |i| i % 3 == 0 }
+    assert_same(set, ret)
+    assert_equal(Set[1,2,4,5,7,8,10], set)
+  end
+
+  def test_merge
+    set = Set[1,2,3]
+
+    ret = set.merge([2,4,6])
+    assert_same(set, ret)
+    assert_equal(Set[1,2,3,4,6], set)
+  end
+
+  def test_subtract
+    set = Set[1,2,3]
+
+    ret = set.subtract([2,4,6])
+    assert_same(set, ret)
+    assert_equal(Set[1,3], set)
+  end
+
+  def test_plus
+    set = Set[1,2,3]
+
+    ret = set + [2,4,6]
+    assert_not_same(set, ret)
+    assert_equal(Set[1,2,3,4,6], ret)
+  end
+
+  def test_minus
+    set = Set[1,2,3]
+
+    ret = set - [2,4,6]
+    assert_not_same(set, ret)
+    assert_equal(Set[1,3], ret)
+  end
+
+  def test_and
+    set = Set[1,2,3,4]
+
+    ret = set & [2,4,6]
+    assert_not_same(set, ret)
+    assert_equal(Set[2,4], ret)
+  end
+
+  def test_xor
+    set = Set[1,2,3,4]
+    ret = set ^ [2,4,5,5]
+    assert_not_same(set, ret)
+    assert_equal(Set[1,3,5], ret)
+  end
+
+  def test_eq
+    set1 = Set[2,3,1]
+    set2 = Set[1,2,3]
+
+    assert_equal(set1, set1)
+    assert_equal(set1, set2)
+    assert_not_equal(Set[1], [1])
+
+    set1 = Class.new(Set)["a", "b"]
+    set2 = Set["a", "b", set1]
+    set1 = set1.add(set1.clone)
+
+#    assert_equal(set1, set2)
+#    assert_equal(set2, set1)
+    assert_equal(set2, set2.clone)
+    assert_equal(set1.clone, set1)
+
+    assert_not_equal(Set[Exception.new,nil], Set[Exception.new,Exception.new], "[ruby-dev:26127]")
+  end
+
+  # def test_hash
+  # end
+
+  # def test_eql?
+  # end
+
+  def test_classify
+    set = Set.new(1..10)
+    ret = set.classify { |i| i % 3 }
+
+    assert_equal(3, ret.size)
+    assert_instance_of(Hash, ret)
+    ret.each_value { |value| assert_instance_of(Set, value) }
+    assert_equal(Set[3,6,9], ret[0])
+    assert_equal(Set[1,4,7,10], ret[1])
+    assert_equal(Set[2,5,8], ret[2])
+  end
+
+  def test_divide
+    set = Set.new(1..10)
+    ret = set.divide { |i| i % 3 }
+
+    assert_equal(3, ret.size)
+    n = 0
+    ret.each { |s| n += s.size }
+    assert_equal(set.size, n)
+    assert_equal(set, ret.flatten)
+
+    set = Set[7,10,5,11,1,3,4,9,0]
+    ret = set.divide { |a,b| (a - b).abs == 1 }
+
+    assert_equal(4, ret.size)
+    n = 0
+    ret.each { |s| n += s.size }
+    assert_equal(set.size, n)
+    assert_equal(set, ret.flatten)
+    ret.each { |s|
+      if s.include?(0)
+	assert_equal(Set[0,1], s)
+      elsif s.include?(3)
+	assert_equal(Set[3,4,5], s)
+      elsif s.include?(7)
+	assert_equal(Set[7], s)
+      elsif s.include?(9)
+	assert_equal(Set[9,10,11], s)
+      else
+	raise "unexpected group: #{s.inspect}"
+      end
+    }
+  end
+
+  def test_inspect
+    set1 = Set[1]
+
+    assert_equal('#<Set: {1}>', set1.inspect)
+
+    set2 = Set[Set[0], 1, 2, set1]
+    assert_equal(false, set2.inspect.include?('#<Set: {...}>'))
+
+    set1.add(set2)
+    assert_equal(true, set1.inspect.include?('#<Set: {...}>'))
+  end
+
+  # def test_pretty_print
+  # end
+
+  # def test_pretty_print_cycle
+  # end
+end
+
+class TC_SortedSet < Test::Unit::TestCase
+  def test_sortedset
+    s = SortedSet[4,5,3,1,2]
+
+    assert_equal([1,2,3,4,5], s.to_a)
+
+    prev = nil
+    s.each { |o| assert(prev < o) if prev; prev = o }
+    assert_not_nil(prev)
+
+    s.map! { |o| -2 * o }
+
+    assert_equal([-10,-8,-6,-4,-2], s.to_a)
+
+    prev = nil
+    s.each { |o| assert(prev < o) if prev; prev = o }
+    assert_not_nil(prev)
+
+    s = SortedSet.new([2,1,3]) { |o| o * -2 }
+    assert_equal([-6,-4,-2], s.to_a)
+  end
+end
+
+class TC_Enumerable < Test::Unit::TestCase
+  def test_to_set
+    ary = [2,5,4,3,2,1,3]
+
+    set = ary.to_set
+    assert_instance_of(Set, set)
+    assert_equal([1,2,3,4,5], set.sort)
+
+    set = ary.to_set { |o| o * -2 }
+    assert_instance_of(Set, set)
+    assert_equal([-10,-8,-6,-4,-2], set.sort)
+
+    set = ary.to_set(SortedSet)
+    assert_instance_of(SortedSet, set)
+    assert_equal([1,2,3,4,5], set.to_a)
+
+    set = ary.to_set(SortedSet) { |o| o * -2 }
+    assert_instance_of(SortedSet, set)
+    assert_equal([-10,-8,-6,-4,-2], set.sort)
+  end
+end
+
+# class TC_RestricedSet < Test::Unit::TestCase
+#   def test_s_new
+#     assert_raises(ArgumentError) { RestricedSet.new }
+# 
+#     s = RestricedSet.new([-1,2,3]) { |o| o > 0 }
+#     assert_equal([2,3], s.sort)
+#   end
+# 
+#   def test_restriction_proc
+#     s = RestricedSet.new([-1,2,3]) { |o| o > 0 }
+# 
+#     f = s.restriction_proc
+#     assert_instance_of(Proc, f)
+#     assert(f[1])
+#     assert(!f[0])
+#   end
+# 
+#   def test_replace
+#     s = RestricedSet.new(-3..3) { |o| o > 0 }
+#     assert_equal([1,2,3], s.sort)
+# 
+#     s.replace([-2,0,3,4,5])
+#     assert_equal([3,4,5], s.sort)
+#   end
+# 
+#   def test_merge
+#     s = RestricedSet.new { |o| o > 0 }
+#     s.merge(-5..5)
+#     assert_equal([1,2,3,4,5], s.sort)
+# 
+#     s.merge([10,-10,-8,8])
+#     assert_equal([1,2,3,4,5,8,10], s.sort)
+#   end
+# end
diff --git a/ruby_1_8_6/lib/shell.rb b/ruby_1_8_6/lib/shell.rb
new file mode 100644
index 0000000000..039f849ef5
--- /dev/null
+++ b/ruby_1_8_6/lib/shell.rb
@@ -0,0 +1,269 @@
+#
+#   shell.rb - 
+#   	$Release Version: 0.6.0 $
+#   	$Revision: 1.8 $
+#   	$Date: 2001/03/19 09:01:11 $
+#   	by Keiju ISHITSUKA(Nippon Rational Inc.)
+#
+# --
+#
+#   
+#
+
+require "e2mmap"
+require "thread"
+
+require "shell/error"
+require "shell/command-processor"
+require "shell/process-controller"
+
+class Shell
+  @RCS_ID='-$Id: shell.rb,v 1.8 2001/03/19 09:01:11 keiju Exp keiju $-'
+
+  include Error
+  extend Exception2MessageMapper
+
+#  @cascade = true
+  # debug: true -> normal debug
+  # debug: 1    -> eval definition debug
+  # debug: 2    -> detail inspect debug
+  @debug = false
+  @verbose = true
+
+  class << Shell
+    attr :cascade, true
+    attr :debug, true
+    attr :verbose, true
+
+#    alias cascade? cascade
+    alias debug? debug
+    alias verbose? verbose
+    @verbose = true
+
+    def debug=(val)
+      @debug = val
+      @verbose = val if val
+    end
+
+    def cd(path)
+      sh = new
+      sh.cd path
+      sh
+    end
+
+    def default_system_path
+      if @default_system_path
+	@default_system_path
+      else
+	ENV["PATH"].split(":")
+      end
+    end
+
+    def default_system_path=(path)
+      @default_system_path = path
+    end
+
+    def default_record_separator
+      if @default_record_separator
+	@default_record_separator
+      else
+	$/
+      end
+    end
+
+    def default_record_separator=(rs)
+      @default_record_separator = rs
+    end
+  end
+
+  def initialize
+    @cwd = Dir.pwd
+    @dir_stack = []
+    @umask = nil
+
+    @system_path = Shell.default_system_path
+    @record_separator = Shell.default_record_separator
+
+    @command_processor = CommandProcessor.new(self)
+    @process_controller = ProcessController.new(self)
+
+    @verbose = Shell.verbose
+    @debug = Shell.debug
+  end
+
+  attr_reader :system_path
+
+  def system_path=(path)
+    @system_path = path
+    rehash
+  end
+
+  attr :umask, true
+  attr :record_separator, true
+
+  attr :verbose, true
+  attr :debug, true
+
+  def debug=(val)
+    @debug = val
+    @verbose = val if val
+  end
+
+  alias verbose? verbose
+  alias debug? debug
+
+  attr_reader :command_processor
+  attr_reader :process_controller
+
+  def expand_path(path)
+    File.expand_path(path, @cwd)
+  end
+
+  # Most Shell commands are defined via CommandProcessor
+
+  #
+  # Dir related methods
+  #
+  # Shell#cwd/dir/getwd/pwd
+  # Shell#chdir/cd
+  # Shell#pushdir/pushd
+  # Shell#popdir/popd
+  # Shell#mkdir
+  # Shell#rmdir
+
+  attr :cwd
+  alias dir cwd
+  alias getwd cwd
+  alias pwd cwd
+
+  attr :dir_stack
+  alias dirs dir_stack
+
+  # If called as iterator, it restores the current directory when the
+  # block ends.
+  def chdir(path = nil)
+    if iterator?
+      cwd_old = @cwd
+      begin
+	chdir(path)
+	yield
+      ensure
+	chdir(cwd_old)
+      end
+    else
+      path = "~" unless path
+      @cwd = expand_path(path)
+      notify "current dir: #{@cwd}"
+      rehash
+      self
+    end
+  end
+  alias cd chdir
+
+  def pushdir(path = nil)
+    if iterator?
+      pushdir(path)
+      begin
+	yield
+      ensure
+	popdir
+      end
+    elsif path
+      @dir_stack.push @cwd
+      chdir path
+      notify "dir stack: [#{@dir_stack.join ', '}]"
+      self
+    else
+      if pop = @dir_stack.pop
+	@dir_stack.push @cwd
+	chdir pop
+	notify "dir stack: [#{@dir_stack.join ', '}]"
+	self
+      else
+	Shell.Fail DirStackEmpty
+      end
+    end
+  end
+  alias pushd pushdir
+
+  def popdir
+    if pop = @dir_stack.pop
+      chdir pop
+      notify "dir stack: [#{@dir_stack.join ', '}]"
+      self
+    else
+      Shell.Fail DirStackEmpty
+    end
+  end
+  alias popd popdir
+
+
+  #
+  # process management
+  #
+  def jobs
+    @process_controller.jobs
+  end
+
+  def kill(sig, command)
+    @process_controller.kill_job(sig, command)
+  end
+
+  #
+  # command definitions
+  #
+  def Shell.def_system_command(command, path = command)
+    CommandProcessor.def_system_command(command, path)
+  end
+
+  def Shell.undef_system_command(command)
+    CommandProcessor.undef_system_command(command)
+  end
+
+  def Shell.alias_command(ali, command, *opts, &block)
+    CommandProcessor.alias_command(ali, command, *opts, &block)
+  end
+
+  def Shell.unalias_command(ali)
+    CommandProcessor.unalias_command(ali)
+  end
+
+  def Shell.install_system_commands(pre = "sys_")
+    CommandProcessor.install_system_commands(pre)
+  end
+
+  #
+  def inspect
+    if debug.kind_of?(Integer) && debug > 2
+      super
+    else
+      to_s
+    end
+  end
+
+  def self.notify(*opts, &block)
+    Thread.exclusive do
+    if opts[-1].kind_of?(String)
+      yorn = verbose?
+    else
+      yorn = opts.pop
+    end
+    return unless yorn
+
+    _head = true
+    print opts.collect{|mes|
+      mes = mes.dup
+      yield mes if iterator?
+      if _head
+	_head = false
+	"shell: " + mes
+      else
+	"       " + mes
+      end
+    }.join("\n")+"\n"
+    end
+  end
+
+  CommandProcessor.initialize
+  CommandProcessor.run_config
+end
diff --git a/ruby_1_8_6/lib/shell/builtin-command.rb b/ruby_1_8_6/lib/shell/builtin-command.rb
new file mode 100644
index 0000000000..db1adfa48b
--- /dev/null
+++ b/ruby_1_8_6/lib/shell/builtin-command.rb
@@ -0,0 +1,154 @@
+#
+#   shell/builtin-command.rb - 
+#   	$Release Version: 0.6.0 $
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
+#
+# --
+#
+#   
+#
+
+require "shell/filter"
+
+class Shell
+  class BuiltInCommand<Filter
+    def wait?
+      false
+    end
+    def active?
+      true
+    end
+  end
+
+  class Echo < BuiltInCommand
+    def initialize(sh, *strings)
+      super sh
+      @strings = strings
+    end
+    
+    def each(rs = nil)
+      rs =  @shell.record_separator unless rs
+      for str  in @strings
+	yield str + rs
+      end
+    end
+  end
+
+  class Cat < BuiltInCommand
+    def initialize(sh, *filenames)
+      super sh
+      @cat_files = filenames
+    end
+
+    def each(rs = nil)
+      if @cat_files.empty?
+	super
+      else
+	for src in @cat_files
+	  @shell.foreach(src, rs){|l| yield l}
+	end
+      end
+    end
+  end
+
+  class Glob < BuiltInCommand
+    def initialize(sh, pattern)
+      super sh
+
+      @pattern = pattern
+      Thread.critical = true
+      back = Dir.pwd
+      begin
+	Dir.chdir @shell.cwd
+	@files = Dir[pattern]
+      ensure
+	Dir.chdir back
+	Thread.critical = false
+      end
+    end
+
+    def each(rs = nil)
+      rs =  @shell.record_separator unless rs
+      for f  in @files
+	yield f+rs
+      end
+    end
+  end
+
+#   class Sort < Cat
+#     def initialize(sh, *filenames)
+#       super
+#     end
+#
+#     def each(rs = nil)
+#       ary = []
+#       super{|l|	ary.push l}
+#       for l in ary.sort!
+# 	yield l
+#       end
+#     end
+#   end
+
+  class AppendIO < BuiltInCommand
+    def initialize(sh, io, filter)
+      super sh
+      @input = filter
+      @io = io
+    end
+
+    def input=(filter)
+      @input.input=filter
+      for l in @input
+	@io << l
+      end
+    end
+
+  end
+
+  class AppendFile < AppendIO
+    def initialize(sh, to_filename, filter)
+      @file_name = to_filename
+      io = sh.open(to_filename, "a")
+      super(sh, io, filter)
+    end
+
+    def input=(filter)
+      begin
+	super
+      ensure
+	@io.close
+      end
+    end
+  end
+
+  class Tee < BuiltInCommand
+    def initialize(sh, filename)
+      super sh
+      @to_filename = filename
+    end
+
+    def each(rs = nil)
+      to = @shell.open(@to_filename, "w")
+      begin
+	super{|l| to << l; yield l}
+      ensure
+	to.close
+      end
+    end
+  end
+
+  class Concat < BuiltInCommand
+    def initialize(sh, *jobs)
+      super(sh)
+      @jobs = jobs
+    end
+
+    def each(rs = nil)
+      while job = @jobs.shift
+	job.each{|l| yield l}
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/shell/command-processor.rb b/ruby_1_8_6/lib/shell/command-processor.rb
new file mode 100644
index 0000000000..ecf6c7d5eb
--- /dev/null
+++ b/ruby_1_8_6/lib/shell/command-processor.rb
@@ -0,0 +1,592 @@
+#
+#   shell/command-controller.rb - 
+#   	$Release Version: 0.6.0 $
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(Nippon Rational Inc.)
+#
+# --
+#
+#   
+#
+
+require "e2mmap"
+require "ftools"
+require "thread"
+
+require "shell/error"
+require "shell/filter"
+require "shell/system-command"
+require "shell/builtin-command"
+
+class Shell
+  class CommandProcessor
+#    include Error
+
+    #
+    # initialize of Shell and related classes.
+    #
+    NoDelegateMethods = ["initialize", "expand_path"]
+    def self.initialize
+
+      install_builtin_commands
+
+      # define CommandProccessor#methods to Shell#methods and Filter#methods
+      for m in CommandProcessor.instance_methods(false) - NoDelegateMethods
+	add_delegate_command_to_shell(m)
+      end
+      
+      def self.method_added(id)
+	add_delegate_command_to_shell(id)
+      end
+    end
+
+    #
+    # include run file.
+    #
+    def self.run_config
+      begin
+	load File.expand_path("~/.rb_shell") if ENV.key?("HOME")
+      rescue LoadError, Errno::ENOENT
+      rescue
+	print "load error: #{rc}\n"
+	print $!.class, ": ", $!, "\n"
+	for err in $@[0, $@.size - 2]
+	  print "\t", err, "\n"
+	end
+      end
+    end
+
+    def initialize(shell)
+      @shell = shell
+      @system_commands = {}
+    end
+
+    #
+    # CommandProcessor#expand_path(path)
+    #	  path:	  String
+    #	  return: String
+    #	returns the absolute path for <path>
+    #
+    def expand_path(path)
+      @shell.expand_path(path)
+    end
+
+    #
+    # File related commands
+    # Shell#foreach
+    # Shell#open
+    # Shell#unlink
+    # Shell#test
+    #
+    # -
+    #	
+    # CommandProcessor#foreach(path, rs)
+    #	  path: String
+    #	  rs:	String - record separator
+    #	  iterator
+    #	Same as:
+    #	  File#foreach (when path is file)
+    #	  Dir#foreach (when path is directory)
+    #	path is relative to pwd
+    #
+    def foreach(path = nil, *rs)
+      path = "." unless path
+      path = expand_path(path)
+
+      if File.directory?(path)
+	Dir.foreach(path){|fn| yield fn}
+      else
+	IO.foreach(path, *rs){|l| yield l}
+      end
+    end
+
+    #
+    # CommandProcessor#open(path, mode)
+    #	  path:	  String
+    #	  mode:	  String
+    #	  return: File or Dir
+    #	Same as:
+    #	  File#open (when path is file)
+    #	  Dir#open  (when path is directory)
+    #	mode has an effect only when path is a file
+    #
+    def open(path, mode)
+      path = expand_path(path)
+      if File.directory?(path)
+	Dir.open(path)
+      else
+	effect_umask do
+	  File.open(path, mode)
+	end
+      end
+    end
+    #  public :open
+
+    #
+    # CommandProcessor#unlink(path)
+    #	same as:
+    #	  Dir#unlink  (when path is directory)
+    #	  File#unlink (when path is file)
+    #
+    def unlink(path)
+      path = expand_path(path)
+      if File.directory?(path)
+	Dir.unlink(path)
+      else
+	IO.unlink(path)
+      end
+    end
+
+    #
+    # CommandProcessor#test(command, file1, file2)
+    # CommandProcessor#[command, file1, file2]
+    #	  command: char or String or Symbol
+    #	  file1:   String
+    #	  file2:   String(optional)
+    #	  return: Boolean
+    #	same as:
+    #	  test()	   (when command is char or length 1 string or symbol)
+    #	  FileTest.command (others)
+    #	example:
+    #	  sh[?e, "foo"]
+    #	  sh[:e, "foo"]
+    #	  sh["e", "foo"]
+    #	  sh[:exists?, "foo"]
+    #	  sh["exists?", "foo"]
+    #	  
+    def test(command, file1, file2=nil)
+      file1 = expand_path(file1)
+      file2 = expand_path(file2) if file2
+      command = command.id2name if command.kind_of?(Symbol)
+
+      case command
+      when Integer
+	top_level_test(command, file1, file2)
+      when String
+	if command.size == 1
+	  if file2
+	    top_level_test(command, file1, file2)
+	  else
+	    top_level_test(command, file1)
+	  end
+	else
+	  if file2
+	    FileTest.send(command, file1, file2)
+	  else
+	    FileTest.send(command, file1)
+	  end
+	end
+      end
+    end
+    alias [] test
+
+    #
+    # Dir related methods
+    #
+    # Shell#mkdir
+    # Shell#rmdir
+    #
+    #--
+    #
+    # CommandProcessor#mkdir(*path)
+    #	  path: String
+    #	same as Dir.mkdir()
+    #	  
+    def mkdir(*path)
+      for dir in path
+	Dir.mkdir(expand_path(dir))
+      end
+    end
+
+    #
+    # CommandProcessor#rmdir(*path)
+    #	  path: String
+    #	same as Dir.rmdir()
+    #	  
+    def rmdir(*path)
+      for dir in path
+	Dir.rmdir(expand_path(dir))
+      end
+    end
+
+    #
+    # CommandProcessor#system(command, *opts)
+    #	  command: String
+    #	  opts:	   String
+    #	  return:  SystemCommand
+    #	Same as system() function
+    #	example:
+    #	  print sh.system("ls", "-l")
+    #	  sh.system("ls", "-l") | sh.head > STDOUT
+    # 
+    def system(command, *opts)
+      if opts.empty?
+	if command =~ /\*|\?|\{|\}|\[|\]|<|>|\(|\)|~|&|\||\\|\$|;|'|`|"|\n/
+	  return SystemCommand.new(@shell, find_system_command("sh"), "-c", command)
+	else
+	  command, *opts = command.split(/\s+/)
+	end
+      end
+      SystemCommand.new(@shell, find_system_command(command), *opts)
+    end
+
+    #
+    # ProcessCommand#rehash
+    #	clear command hash table.
+    #
+    def rehash
+      @system_commands = {}
+    end
+
+    #
+    # ProcessCommand#transact
+    #
+    def check_point
+      @shell.process_controller.wait_all_jobs_execution
+    end
+    alias finish_all_jobs check_point
+
+    def transact(&block)
+      begin
+	@shell.instance_eval(&block)
+      ensure
+	check_point
+      end
+    end
+
+    #
+    # internal commands
+    #
+    def out(dev = STDOUT, &block)
+      dev.print transact(&block)
+    end
+
+    def echo(*strings)
+      Echo.new(@shell, *strings)
+    end
+
+    def cat(*filenames)
+      Cat.new(@shell, *filenames)
+    end
+
+    #   def sort(*filenames)
+    #     Sort.new(self, *filenames)
+    #   end
+
+    def glob(pattern)
+      Glob.new(@shell, pattern)
+    end
+
+    def append(to, filter)
+      case to
+      when String
+	AppendFile.new(@shell, to, filter)
+      when IO
+	AppendIO.new(@shell, to, filter)
+      else
+	Shell.Fail Error::CantApplyMethod, "append", to.class
+      end
+    end
+
+    def tee(file)
+      Tee.new(@shell, file)
+    end
+
+    def concat(*jobs)
+      Concat.new(@shell, *jobs)
+    end
+
+    # %pwd, %cwd -> @pwd
+    def notify(*opts, &block)
+      Thread.exclusive do
+	Shell.notify(*opts) {|mes|
+	  yield mes if iterator?
+	
+	  mes.gsub!("%pwd", "#{@cwd}")
+	  mes.gsub!("%cwd", "#{@cwd}")
+	}
+      end
+    end
+
+    #
+    # private functions
+    #
+    def effect_umask
+      if @shell.umask
+	Thread.critical = true
+	save = File.umask
+	begin
+	  yield
+	ensure
+	  File.umask save
+	  Thread.critical = false
+	end
+      else
+	yield
+      end
+    end
+    private :effect_umask
+
+    def find_system_command(command)
+      return command if /^\// =~ command
+      case path = @system_commands[command]
+      when String
+	if exists?(path)
+	  return path
+	else
+	  Shell.Fail Error::CommandNotFound, command
+	end
+      when false
+	Shell.Fail Error::CommandNotFound, command
+      end
+
+      for p in @shell.system_path
+	path = join(p, command)
+	if FileTest.exists?(path)
+	  @system_commands[command] = path
+	  return path
+	end
+      end
+      @system_commands[command] = false
+      Shell.Fail Error::CommandNotFound, command
+    end
+
+    #
+    # CommandProcessor.def_system_command(command, path)
+    #	  command:  String
+    #	  path:	    String
+    #	define 'command()' method as method.
+    #
+    def self.def_system_command(command, path = command)
+      begin
+	eval((d = %Q[def #{command}(*opts)
+     	          SystemCommand.new(@shell, '#{path}', *opts)
+               end]), nil, __FILE__, __LINE__ - 1)
+      rescue SyntaxError
+	Shell.notify "warn: Can't define #{command} path: #{path}." 
+      end
+      Shell.notify "Define #{command} path: #{path}.", Shell.debug?
+      Shell.notify("Definition of #{command}: ", d, 
+	     Shell.debug.kind_of?(Integer) && Shell.debug > 1)
+    end
+
+    def self.undef_system_command(command)
+      command = command.id2name if command.kind_of?(Symbol)
+      remove_method(command)
+      Shell.module_eval{remove_method(command)}
+      Filter.module_eval{remove_method(command)}
+      self
+    end
+
+    # define command alias
+    # ex)
+    # def_alias_command("ls_c", "ls", "-C", "-F")
+    # def_alias_command("ls_c", "ls"){|*opts| ["-C", "-F", *opts]}
+    #
+    @alias_map = {}
+    def self.alias_map
+      @alias_map
+    end
+    def self.alias_command(ali, command, *opts, &block)
+      ali = ali.id2name if ali.kind_of?(Symbol)
+      command = command.id2name if command.kind_of?(Symbol)
+      begin
+	if iterator?
+	  @alias_map[ali.intern] = proc
+
+	  eval((d = %Q[def #{ali}(*opts)
+                          @shell.__send__(:#{command},
+                                          *(CommandProcessor.alias_map[:#{ali}].call *opts))
+	                end]), nil, __FILE__, __LINE__ - 1)
+    
+	else
+           args = opts.collect{|opt| '"' + opt + '"'}.join(",")
+           eval((d = %Q[def #{ali}(*opts)
+                          @shell.__send__(:#{command}, #{args}, *opts)
+                        end]), nil, __FILE__, __LINE__ - 1)
+	end
+      rescue SyntaxError
+	Shell.notify "warn: Can't alias #{ali} command: #{command}." 
+	Shell.notify("Definition of #{ali}: ", d)
+	raise
+      end
+      Shell.notify "Define #{ali} command: #{command}.", Shell.debug?
+      Shell.notify("Definition of #{ali}: ", d, 
+	     Shell.debug.kind_of?(Integer) && Shell.debug > 1)
+      self
+    end
+   
+    def self.unalias_command(ali)
+      ali = ali.id2name if ali.kind_of?(Symbol)
+      @alias_map.delete ali.intern
+      undef_system_command(ali)
+    end
+   
+    #
+    # CommandProcessor.def_builtin_commands(delegation_class, command_specs)
+    #	  delegation_class: Class or Module
+    #	  command_specs: [[command_name, [argument,...]],...]
+    #	     command_name: String
+    #	     arguments:	   String
+    #		FILENAME?? -> expand_path(filename??)
+    #		*FILENAME?? -> filename??.collect{|f|expand_path(f)}.join(", ")
+    #	define command_name(argument,...) as
+    #	    delegation_class.command_name(argument,...)
+    #
+    def self.def_builtin_commands(delegation_class, command_specs)
+      for meth, args in command_specs
+	arg_str = args.collect{|arg| arg.downcase}.join(", ")
+	call_arg_str = args.collect{
+	  |arg|
+	  case arg
+	  when /^(FILENAME.*)$/
+	    format("expand_path(%s)", $1.downcase)
+	  when /^(\*FILENAME.*)$/
+	    # \*FILENAME* -> filenames.collect{|fn| expand_path(fn)}.join(", ")
+	    $1.downcase + '.collect{|fn| expand_path(fn)}'
+	  else
+	    arg
+	  end
+	}.join(", ")
+	d = %Q[def #{meth}(#{arg_str})
+		    #{delegation_class}.#{meth}(#{call_arg_str})
+		 end]
+	Shell.notify "Define #{meth}(#{arg_str})", Shell.debug?
+	Shell.notify("Definition of #{meth}: ", d, 
+	     Shell.debug.kind_of?(Integer) && Shell.debug > 1)
+	eval d
+      end
+    end
+
+    #
+    # CommandProcessor.install_system_commands(pre)
+    #	    pre: String - command name prefix
+    # defines every command which belongs in default_system_path via
+    # CommandProcessor.command().  It doesn't define already defined
+    # methods twice.  By default, "pre_" is prefixes to each method
+    # name.  Characters that may not be used in a method name are
+    # all converted to '_'.  Definition errors are just ignored.
+    #
+    def self.install_system_commands(pre = "sys_")
+      defined_meth = {}
+      for m in Shell.methods
+	defined_meth[m] = true
+      end
+      sh = Shell.new
+      for path in Shell.default_system_path
+	next unless sh.directory? path
+	sh.cd path
+	sh.foreach do
+	  |cn|
+	  if !defined_meth[pre + cn] && sh.file?(cn) && sh.executable?(cn)
+	    command = (pre + cn).gsub(/\W/, "_").sub(/^([0-9])/, '_\1')
+	    begin
+	      def_system_command(command, sh.expand_path(cn))
+	    rescue
+	      Shell.notify "warn: Can't define #{command} path: #{cn}"
+	    end
+	    defined_meth[command] = command
+	  end
+	end
+      end
+    end
+
+    #----------------------------------------------------------------------
+    #
+    #  class initializing methods  - 
+    #
+    #----------------------------------------------------------------------
+    def self.add_delegate_command_to_shell(id)
+      id = id.intern if id.kind_of?(String)
+      name = id.id2name
+      if Shell.method_defined?(id)
+	Shell.notify "warn: override definnition of Shell##{name}."
+	Shell.notify "warn: alias Shell##{name} to Shell##{name}_org.\n"
+	Shell.module_eval "alias #{name}_org #{name}"
+      end
+      Shell.notify "method added: Shell##{name}.", Shell.debug?
+      Shell.module_eval(%Q[def #{name}(*args, &block)
+			    begin
+			      @command_processor.__send__(:#{name}, *args, &block)
+			    rescue Exception
+			      $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
+	                      $@.delete_if{|s| /^\\(eval\\):/ =~ s}
+			    raise
+			    end
+                          end], __FILE__, __LINE__)
+
+      if Shell::Filter.method_defined?(id)
+	Shell.notify "warn: override definnition of Shell::Filter##{name}."
+	Shell.notify "warn: alias Shell##{name} to Shell::Filter##{name}_org."
+	Filter.module_eval "alias #{name}_org #{name}"
+      end
+      Shell.notify "method added: Shell::Filter##{name}.", Shell.debug?
+      Filter.module_eval(%Q[def #{name}(*args, &block)
+			    begin
+			      self | @shell.__send__(:#{name}, *args, &block)
+			    rescue Exception
+			      $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
+	                      $@.delete_if{|s| /^\\(eval\\):/ =~ s}
+			    raise
+			    end
+                          end], __FILE__, __LINE__)
+    end
+
+    #
+    # define default builtin commands
+    #
+    def self.install_builtin_commands
+      # method related File.
+      #	(exclude open/foreach/unlink)
+      normal_delegation_file_methods = [
+	["atime", ["FILENAME"]],
+	["basename", ["fn", "*opts"]],
+	["chmod", ["mode", "*FILENAMES"]], 
+	["chown", ["owner", "group", "*FILENAME"]],
+	["ctime", ["FILENAMES"]],
+	["delete", ["*FILENAMES"]],
+	["dirname", ["FILENAME"]],
+	["ftype", ["FILENAME"]],
+	["join", ["*items"]],
+	["link", ["FILENAME_O", "FILENAME_N"]],
+	["lstat", ["FILENAME"]],
+	["mtime", ["FILENAME"]],
+	["readlink", ["FILENAME"]],
+	["rename", ["FILENAME_FROM", "FILENAME_TO"]],
+	#      ["size", ["FILENAME"]],
+	["split", ["pathname"]],
+	["stat", ["FILENAME"]],
+	["symlink", ["FILENAME_O", "FILENAME_N"]],
+	["truncate", ["FILENAME", "length"]],
+	["utime", ["atime", "mtime", "*FILENAMES"]]]
+
+      def_builtin_commands(File, normal_delegation_file_methods)
+      alias_method :rm, :delete
+
+      # method related FileTest
+      def_builtin_commands(FileTest, 
+		   FileTest.singleton_methods(false).collect{|m| [m, ["FILENAME"]]})
+
+      # method related ftools
+      normal_delegation_ftools_methods = [
+	["syscopy", ["FILENAME_FROM", "FILENAME_TO"]],
+	["copy", ["FILENAME_FROM", "FILENAME_TO"]],
+	["move", ["FILENAME_FROM", "FILENAME_TO"]],
+	["compare", ["FILENAME_FROM", "FILENAME_TO"]],
+	["safe_unlink", ["*FILENAMES"]],
+	["makedirs", ["*FILENAMES"]],
+	#    ["chmod", ["mode", "*FILENAMES"]],
+	["install", ["FILENAME_FROM", "FILENAME_TO", "mode"]],
+      ]
+      def_builtin_commands(File,
+		   normal_delegation_ftools_methods)
+      alias_method :cmp, :compare
+      alias_method :mv, :move
+      alias_method :cp, :copy
+      alias_method :rm_f, :safe_unlink
+      alias_method :mkpath, :makedirs
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/lib/shell/error.rb b/ruby_1_8_6/lib/shell/error.rb
new file mode 100644
index 0000000000..d338b1c5d1
--- /dev/null
+++ b/ruby_1_8_6/lib/shell/error.rb
@@ -0,0 +1,26 @@
+#
+#   shell/error.rb - 
+#   	$Release Version: 0.6.0 $
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
+#
+# --
+#
+#   
+#
+
+require "e2mmap"
+
+class Shell
+  module Error
+    extend Exception2MessageMapper
+    def_e2message TypeError, "wrong argument type %s (expected %s)"
+
+    def_exception :DirStackEmpty, "Directory stack empty."
+    def_exception :CantDefine, "Can't define method(%s, %s)."
+    def_exception :CantApplyMethod, "This method(%s) does not apply to this type(%s)."
+    def_exception :CommandNotFound, "Command not found(%s)."
+  end
+end
+
diff --git a/ruby_1_8_6/lib/shell/filter.rb b/ruby_1_8_6/lib/shell/filter.rb
new file mode 100644
index 0000000000..27c5534695
--- /dev/null
+++ b/ruby_1_8_6/lib/shell/filter.rb
@@ -0,0 +1,110 @@
+#
+#   shell/filter.rb - 
+#   	$Release Version: 0.6.0 $
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
+#
+# --
+#
+#   
+#
+
+class Shell
+  #
+  # Filter
+  # A method to require
+  #    each()
+  #
+  class Filter
+    include Enumerable
+
+    def initialize(sh)
+      @shell = sh	  # parent shell
+      @input = nil	  # input filter
+    end
+
+    attr_reader :input
+
+    def input=(filter)
+      @input = filter
+    end
+    
+    def each(rs = nil)
+      rs = @shell.record_separator unless rs
+      if @input
+	@input.each(rs){|l| yield l}
+      end
+    end
+
+    def < (src)
+      case src
+      when String
+	cat = Cat.new(@shell, src)
+	cat | self
+      when IO
+	self.input = src
+	self
+      else
+	Shell.Fail Error::CantApplyMethod, "<", to.class
+      end
+    end
+
+    def > (to)
+      case to
+      when String
+	dst = @shell.open(to, "w")
+	begin
+	  each(){|l| dst << l}
+	ensure
+	  dst.close
+	end
+      when IO
+	each(){|l| to << l}
+      else
+	Shell.Fail Error::CantApplyMethod, ">", to.class
+      end
+      self
+    end
+
+    def >> (to)
+      begin
+	Shell.cd(@shell.pwd).append(to, self)
+      rescue CantApplyMethod
+	Shell.Fail Error::CantApplyMethod, ">>", to.class
+      end
+    end
+
+    def | (filter)
+      filter.input = self
+      if active?
+	@shell.process_controller.start_job filter
+      end
+      filter
+    end
+
+    def + (filter)
+      Join.new(@shell, self, filter)
+    end
+
+    def to_a
+      ary = []
+      each(){|l| ary.push l}
+      ary
+    end
+
+    def to_s
+      str = ""
+      each(){|l| str.concat l}
+      str
+    end
+
+    def inspect
+      if @shell.debug.kind_of?(Integer) && @shell.debug > 2
+	super
+      else
+	to_s
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/shell/process-controller.rb b/ruby_1_8_6/lib/shell/process-controller.rb
new file mode 100644
index 0000000000..8929805506
--- /dev/null
+++ b/ruby_1_8_6/lib/shell/process-controller.rb
@@ -0,0 +1,260 @@
+#
+#   shell/process-controller.rb - 
+#   	$Release Version: 0.6.0 $
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
+#
+# --
+#
+#   
+#
+
+require "mutex_m"
+require "monitor"
+require "sync"
+
+class Shell
+  class ProcessController
+
+    @ProcessControllers = {}
+    @ProcessControllers.extend Mutex_m
+
+    class<<self
+
+      def process_controllers_exclusive
+	begin
+	  @ProcessControllers.lock unless Thread.critical 
+	  yield
+	ensure
+	  @ProcessControllers.unlock unless Thread.critical 
+	end
+      end
+
+      def activate(pc)
+	process_controllers_exclusive do
+	  @ProcessControllers[pc] ||= 0
+	  @ProcessControllers[pc] += 1
+	end
+      end
+
+      def inactivate(pc)
+	process_controllers_exclusive do
+	  if @ProcessControllers[pc]
+	    if (@ProcessControllers[pc] -= 1) == 0
+	      @ProcessControllers.delete(pc)
+	    end
+	  end
+	end
+      end
+
+      def each_active_object
+	process_controllers_exclusive do
+	  for ref in @ProcessControllers.keys
+	    yield ref
+	  end
+	end
+      end
+    end
+
+    def initialize(shell)
+      @shell = shell
+      @waiting_jobs = []
+      @active_jobs = []
+      @jobs_sync = Sync.new
+
+      @job_monitor = Mutex.new
+      @job_condition = ConditionVariable.new
+    end
+
+    def jobs
+      jobs = []
+      @jobs_sync.synchronize(:SH) do
+	jobs.concat @waiting_jobs
+	jobs.concat @active_jobs
+      end
+      jobs
+    end
+
+    def active_jobs
+      @active_jobs
+    end
+
+    def waiting_jobs
+      @waiting_jobs
+    end
+    
+    def jobs_exist?
+      @jobs_sync.synchronize(:SH) do
+	@active_jobs.empty? or @waiting_jobs.empty?
+      end
+    end
+
+    def active_jobs_exist?
+      @jobs_sync.synchronize(:SH) do
+	@active_jobs.empty?
+      end
+    end
+
+    def waiting_jobs_exist?
+      @jobs_sync.synchronize(:SH) do
+	@waiting_jobs.empty?
+      end
+    end
+
+    # schedule a command
+    def add_schedule(command)
+      @jobs_sync.synchronize(:EX) do
+	ProcessController.activate(self)
+	if @active_jobs.empty?
+	  start_job command
+	else
+	  @waiting_jobs.push(command)
+	end
+      end
+    end
+
+    # start a job
+    def start_job(command = nil)
+      @jobs_sync.synchronize(:EX) do
+	if command
+	  return if command.active?
+	  @waiting_jobs.delete command
+	else
+	  command = @waiting_jobs.shift
+	  return unless command
+	end
+	@active_jobs.push command
+	command.start
+
+	# start all jobs that input from the job
+	for job in @waiting_jobs
+	  start_job(job) if job.input == command
+	end
+      end
+    end
+
+    def waiting_job?(job)
+      @jobs_sync.synchronize(:SH) do
+	@waiting_jobs.include?(job)
+      end
+    end
+
+    def active_job?(job)
+      @jobs_sync.synchronize(:SH) do
+	@active_jobs.include?(job)
+      end
+    end
+
+    # terminate a job
+    def terminate_job(command)
+      @jobs_sync.synchronize(:EX) do
+	@active_jobs.delete command
+	ProcessController.inactivate(self)
+	if @active_jobs.empty?
+	  start_job
+	end
+      end
+    end
+
+    # kill a job
+    def kill_job(sig, command)
+      @jobs_sync.synchronize(:SH) do
+	if @waiting_jobs.delete command
+	  ProcessController.inactivate(self)
+	  return
+	elsif @active_jobs.include?(command)
+	  begin
+	    r = command.kill(sig)
+	    ProcessController.inactivate(self)
+	  rescue
+	    print "Shell: Warn: $!\n" if @shell.verbose?
+	    return nil
+	  end
+	  @active_jobs.delete command
+	  r
+	end
+      end
+    end
+
+    # wait for all jobs to terminate
+    def wait_all_jobs_execution
+      @job_monitor.synchronize do
+	begin
+	  while !jobs.empty?
+	    @job_condition.wait(@job_monitor)
+	  end
+	ensure
+	  redo unless jobs.empty?
+	end
+      end
+    end
+
+    # simple fork
+    def sfork(command, &block)
+      pipe_me_in, pipe_peer_out = IO.pipe
+      pipe_peer_in, pipe_me_out = IO.pipe
+      Thread.critical = true
+
+      STDOUT.flush
+      ProcessController.each_active_object do |pc|
+	for jobs in pc.active_jobs
+	  jobs.flush
+	end
+      end
+      
+      pid = fork {
+	Thread.critical = true
+
+	Thread.list.each do |th| 
+	  th.kill unless [Thread.main, Thread.current].include?(th)
+	end
+
+	STDIN.reopen(pipe_peer_in)
+	STDOUT.reopen(pipe_peer_out)
+
+	ObjectSpace.each_object(IO) do |io| 
+	  if ![STDIN, STDOUT, STDERR].include?(io)
+	    io.close unless io.closed?
+	  end
+	end
+	yield
+      }
+
+      pipe_peer_in.close
+      pipe_peer_out.close
+      command.notify "job(%name:##{pid}) start", @shell.debug?
+      Thread.critical = false
+
+      th = Thread.start {
+	Thread.critical = true
+	begin
+	  _pid = nil
+	  command.notify("job(%id) start to waiting finish.", @shell.debug?)
+	  Thread.critical = false
+	  _pid = Process.waitpid(pid, nil)
+	rescue Errno::ECHILD
+	  command.notify "warn: job(%id) was done already waitipd."
+	  _pid = true
+	ensure
+	  # when the process ends, wait until the command termintes
+	  if _pid
+	  else
+	    command.notify("notice: Process finishing...",
+			   "wait for Job[%id] to finish.",
+			   "You can use Shell#transact or Shell#check_point for more safe execution.")
+	    redo
+	  end
+	  Thread.exclusive do
+	    @job_monitor.synchronize do 
+	      terminate_job(command)
+	      @job_condition.signal
+	      command.notify "job(%id) finish.", @shell.debug?
+	    end
+	  end
+	end
+      }
+      return pid, pipe_me_in, pipe_me_out
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/shell/system-command.rb b/ruby_1_8_6/lib/shell/system-command.rb
new file mode 100644
index 0000000000..f87ba890ea
--- /dev/null
+++ b/ruby_1_8_6/lib/shell/system-command.rb
@@ -0,0 +1,168 @@
+#
+#   shell/system-command.rb - 
+#   	$Release Version: 0.6.0 $
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
+#
+# --
+#
+#   
+#
+
+require "shell/filter"
+
+class Shell
+  class SystemCommand < Filter
+    def initialize(sh, command, *opts)
+      if t = opts.find{|opt| !opt.kind_of?(String) && opt.class}
+	Shell.Fail Error::TypeError, t.class, "String"
+      end
+      super(sh)
+      @command = command
+      @opts = opts
+      
+      @input_queue = Queue.new
+      @pid = nil
+
+      sh.process_controller.add_schedule(self)
+    end
+
+    attr_reader :command
+    alias name command
+
+    def wait?
+      @shell.process_controller.waiting_job?(self)
+    end
+
+    def active?
+      @shell.process_controller.active_job?(self)
+    end
+
+    def input=(inp)
+      super
+      if active?
+	start_export
+      end
+    end
+
+    def start
+      @pid, @pipe_in, @pipe_out = @shell.process_controller.sfork(self) {
+	Dir.chdir @shell.pwd
+	exec(@command, *@opts)
+      }
+      if @input
+	start_export
+      end
+      start_import
+    end
+
+    def flush
+      @pipe_out.flush if @pipe_out and !@pipe_out.closed?
+    end
+
+    def terminate
+      begin
+	@pipe_in.close
+      rescue IOError
+      end
+      begin
+	@pipe_out.close
+      rescue IOError
+      end
+    end
+
+    def kill(sig)
+      if @pid
+	Process.kill(sig, @pid)
+      end
+    end
+
+
+    def start_import
+#      Thread.critical = true
+      notify "Job(%id) start imp-pipe.", @shell.debug?
+      rs = @shell.record_separator unless rs
+      _eop = true
+#      Thread.critical = false
+      th = Thread.start {
+	Thread.critical = true
+	begin
+	  Thread.critical = false
+	  while l = @pipe_in.gets
+	    @input_queue.push l
+	  end
+	  _eop = false
+	rescue Errno::EPIPE
+	  _eop = false
+	ensure
+	  if _eop
+	    notify("warn: Process finishing...",
+		   "wait for Job[%id] to finish pipe importing.",
+		   "You can use Shell#transact or Shell#check_point for more safe execution.")
+#	    Tracer.on
+	    Thread.current.run
+	    redo
+	  end
+	  Thread.exclusive do
+	    notify "job(%id}) close imp-pipe.", @shell.debug?
+	    @input_queue.push :EOF
+	    @pipe_in.close
+	  end
+	end
+      }
+    end
+
+    def start_export
+      notify "job(%id) start exp-pipe.", @shell.debug?
+      _eop = true
+      th = Thread.start{
+	Thread.critical = true
+	begin
+	  Thread.critical = false
+	  @input.each{|l| @pipe_out.print l}
+	  _eop = false
+	rescue Errno::EPIPE
+	  _eop = false
+	ensure
+	  if _eop
+	    notify("shell: warn: Process finishing...",
+		   "wait for Job(%id) to finish pipe exporting.",
+		   "You can use Shell#transact or Shell#check_point for more safe execution.")
+#	    Tracer.on
+	    redo
+	  end
+	  Thread.exclusive do
+	    notify "job(%id) close exp-pipe.", @shell.debug?
+	    @pipe_out.close
+	  end
+	end
+      }
+    end
+
+    alias super_each each
+    def each(rs = nil)
+      while (l = @input_queue.pop) != :EOF
+	yield l
+      end
+    end
+
+    # ex)
+    #    if you wish to output: 
+    #	    "shell: job(#{@command}:#{@pid}) close pipe-out."
+    #	 then 
+    #	    mes: "job(%id) close pipe-out."
+    #    yorn: Boolean(@shell.debug? or @shell.verbose?)
+    def notify(*opts, &block)
+      Thread.exclusive do
+	@shell.notify(*opts) {|mes|
+	  yield mes if iterator?
+
+	  mes.gsub!("%id", "#{@command}:##{@pid}")
+	  mes.gsub!("%name", "#{@command}")
+	  mes.gsub!("%pid", "#{@pid}")
+	}
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/shell/version.rb b/ruby_1_8_6/lib/shell/version.rb
new file mode 100644
index 0000000000..6694c804d8
--- /dev/null
+++ b/ruby_1_8_6/lib/shell/version.rb
@@ -0,0 +1,16 @@
+#
+#   version.rb - shell version definition file
+#   	$Release Version: 0.6.0$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd)
+#
+# --
+#
+#   
+#
+
+class Shell
+  @RELEASE_VERSION = "0.6.0"
+  @LAST_UPDATE_DATE = "01/03/19"
+end
diff --git a/ruby_1_8_6/lib/shellwords.rb b/ruby_1_8_6/lib/shellwords.rb
new file mode 100644
index 0000000000..e87b9e656b
--- /dev/null
+++ b/ruby_1_8_6/lib/shellwords.rb
@@ -0,0 +1,60 @@
+#
+# shellwords.rb: Split text into an array of tokens a la UNIX shell
+#
+
+#
+# This module is originally a port of shellwords.pl, but modified to
+# conform to POSIX / SUSv3 (IEEE Std 1003.1-2001).
+#
+# Examples:
+#
+#   require 'shellwords'
+#   words = Shellwords.shellwords(line)
+#
+# or
+#
+#   require 'shellwords'
+#   include Shellwords
+#   words = shellwords(line)
+#
+module Shellwords
+
+  #
+  # Split text into an array of tokens in the same way the UNIX Bourne
+  # shell does.
+  #
+  # See the +Shellwords+ module documentation for an example.
+  #
+  def shellwords(line)
+    line = String.new(line) rescue
+      raise(ArgumentError, "Argument must be a string")
+    line.lstrip!
+    words = []
+    until line.empty?
+      field = ''
+      loop do
+	if line.sub!(/\A"(([^"\\]|\\.)*)"/, '') then
+	  snippet = $1.gsub(/\\(.)/, '\1')
+	elsif line =~ /\A"/ then
+	  raise ArgumentError, "Unmatched double quote: #{line}"
+	elsif line.sub!(/\A'([^']*)'/, '') then
+	  snippet = $1
+	elsif line =~ /\A'/ then
+	  raise ArgumentError, "Unmatched single quote: #{line}"
+	elsif line.sub!(/\A\\(.)?/, '') then
+	  snippet = $1 || '\\'
+	elsif line.sub!(/\A([^\s\\'"]+)/, '') then
+	  snippet = $1
+	else
+	  line.lstrip!
+	  break
+	end
+	field.concat(snippet)
+      end
+      words.push(field)
+    end
+    words
+  end
+
+  module_function :shellwords
+end
diff --git a/ruby_1_8_6/lib/singleton.rb b/ruby_1_8_6/lib/singleton.rb
new file mode 100644
index 0000000000..0ab8517275
--- /dev/null
+++ b/ruby_1_8_6/lib/singleton.rb
@@ -0,0 +1,360 @@
+# The Singleton module implements the Singleton pattern.
+#
+# Usage:
+#    class Klass
+#       include Singleton
+#       # ...
+#    end
+#
+# *  this ensures that only one instance of Klass lets call it
+#    ``the instance'' can be created.
+#
+#    a,b  = Klass.instance, Klass.instance
+#    a == b   # => true
+#    a.new    #  NoMethodError - new is private ...
+#
+# *  ``The instance'' is created at instantiation time, in other
+#    words the first call of Klass.instance(), thus
+#
+#      class OtherKlass
+#        include Singleton
+#        # ...
+#      end
+#      ObjectSpace.each_object(OtherKlass){} # => 0.
+#
+# *  This behavior is preserved under inheritance and cloning.
+#
+#
+#
+# This is achieved by marking
+# *  Klass.new and Klass.allocate - as private
+#
+# Providing (or modifying) the class methods
+# *  Klass.inherited(sub_klass) and Klass.clone()  - 
+#    to ensure that the Singleton pattern is properly
+#    inherited and cloned.
+#
+# *  Klass.instance()  -  returning ``the instance''. After a
+#    successful self modifying (normally the first) call the
+#    method body is a simple:
+#
+#       def Klass.instance()
+#         return @__instance__
+#       end
+#
+# *  Klass._load(str)  -  calling Klass.instance()
+#
+# *  Klass._instantiate?()  -  returning ``the instance'' or
+#    nil. This hook method puts a second (or nth) thread calling
+#    Klass.instance() on a waiting loop. The return value
+#    signifies the successful completion or premature termination
+#    of the first, or more generally, current "instantiation thread".
+#
+#
+# The instance method of Singleton are
+# * clone and dup - raising TypeErrors to prevent cloning or duping
+#
+# *  _dump(depth) - returning the empty string.  Marshalling strips
+#    by default all state information, e.g. instance variables and
+#    taint state, from ``the instance''.  Providing custom _load(str)
+#    and _dump(depth) hooks allows the (partially) resurrections of
+#    a previous state of ``the instance''.
+
+
+
+module Singleton
+  #  disable build-in copying methods
+  def clone
+    raise TypeError, "can't clone instance of singleton #{self.class}"
+  end
+  def dup
+    raise TypeError, "can't dup instance of singleton #{self.class}"
+  end
+  
+  private 
+  #  default marshalling strategy
+  def _dump(depth=-1) 
+    ''
+  end
+end
+
+
+class << Singleton
+  #  Method body of first instance call.
+  FirstInstanceCall = proc do
+    #  @__instance__ takes on one of the following values
+    #  * nil     -  before and after a failed creation
+    #  * false  -  during creation
+    #  * sub_class instance  -  after a successful creation
+    #  the form makes up for the lack of returns in progs
+    Thread.critical = true
+    if  @__instance__.nil?
+      @__instance__  = false
+      Thread.critical = false
+      begin
+        @__instance__ = new
+      ensure
+        if @__instance__
+          class <<self
+            remove_method :instance
+            def instance; @__instance__ end
+          end
+        else
+          @__instance__ = nil #  failed instance creation
+        end
+      end
+    elsif  _instantiate?()
+      Thread.critical = false    
+    else
+      @__instance__  = false
+      Thread.critical = false
+      begin
+        @__instance__ = new
+      ensure
+        if @__instance__
+          class <<self
+            remove_method :instance
+            def instance; @__instance__ end
+          end
+        else
+          @__instance__ = nil
+        end
+      end
+    end
+    @__instance__
+  end
+  
+  module SingletonClassMethods  
+    # properly clone the Singleton pattern - did you know
+    # that duping doesn't copy class methods?  
+    def clone
+      Singleton.__init__(super)
+    end
+    
+    private
+    
+    #  ensure that the Singleton pattern is properly inherited   
+    def inherited(sub_klass)
+      super
+      Singleton.__init__(sub_klass)
+    end
+    
+    def _load(str) 
+      instance 
+    end
+    
+    # waiting-loop hook
+    def _instantiate?()
+      while false.equal?(@__instance__)
+        Thread.critical = false
+        sleep(0.08)   # timeout
+        Thread.critical = true
+      end
+      @__instance__
+    end
+  end
+  
+  def __init__(klass)
+    klass.instance_eval { @__instance__ = nil }
+    class << klass
+      define_method(:instance,FirstInstanceCall)
+    end
+    klass
+  end
+  
+  private
+  #  extending an object with Singleton is a bad idea
+  undef_method :extend_object
+  
+  def append_features(mod)
+    #  help out people counting on transitive mixins
+    unless mod.instance_of?(Class)
+      raise TypeError, "Inclusion of the OO-Singleton module in module #{mod}"
+    end
+    super
+  end
+  
+  def included(klass)
+    super
+    klass.private_class_method  :new, :allocate
+    klass.extend SingletonClassMethods
+    Singleton.__init__(klass)
+  end
+end
+ 
+
+
+if __FILE__ == $0
+
+def num_of_instances(klass)
+    "#{ObjectSpace.each_object(klass){}} #{klass} instance(s)"
+end 
+
+# The basic and most important example.
+
+class SomeSingletonClass
+  include Singleton
+end
+puts "There are #{num_of_instances(SomeSingletonClass)}" 
+
+a = SomeSingletonClass.instance
+b = SomeSingletonClass.instance # a and b are same object
+puts "basic test is #{a == b}"
+
+begin
+  SomeSingletonClass.new
+rescue  NoMethodError => mes
+  puts mes
+end
+
+
+
+puts "\nThreaded example with exception and customized #_instantiate?() hook"; p
+Thread.abort_on_exception = false
+
+class Ups < SomeSingletonClass
+  def initialize
+    self.class.__sleep
+    puts "initialize called by thread ##{Thread.current[:i]}"
+  end
+end
+  
+class << Ups
+  def _instantiate?
+    @enter.push Thread.current[:i]
+    while false.equal?(@__instance__)
+      Thread.critical = false
+      sleep 0.08 
+      Thread.critical = true
+    end
+    @leave.push Thread.current[:i]
+    @__instance__
+  end
+  
+  def __sleep
+    sleep(rand(0.08))
+  end
+  
+  def new
+    begin
+      __sleep
+      raise  "boom - thread ##{Thread.current[:i]} failed to create instance"
+    ensure
+      # simple flip-flop
+      class << self
+        remove_method :new
+      end
+    end
+  end
+  
+  def instantiate_all
+    @enter = []
+    @leave = []
+    1.upto(9) {|i|  
+      Thread.new { 
+        begin
+          Thread.current[:i] = i
+          __sleep
+          instance
+        rescue RuntimeError => mes
+          puts mes
+        end
+      }
+    }
+    puts "Before there were #{num_of_instances(self)}"
+    sleep 3
+    puts "Now there is #{num_of_instances(self)}"
+    puts "#{@enter.join '; '} was the order of threads entering the waiting loop"
+    puts "#{@leave.join '; '} was the order of threads leaving the waiting loop"
+  end
+end
+
+
+Ups.instantiate_all
+# results in message like
+# Before there were 0 Ups instance(s)
+# boom - thread #6 failed to create instance
+# initialize called by thread #3
+# Now there is 1 Ups instance(s)
+# 3; 2; 1; 8; 4; 7; 5 was the order of threads entering the waiting loop
+# 3; 2; 1; 7; 4; 8; 5 was the order of threads leaving the waiting loop
+
+
+puts "\nLets see if class level cloning really works"
+Yup = Ups.clone
+def Yup.new
+  begin
+    __sleep
+    raise  "boom - thread ##{Thread.current[:i]} failed to create instance"
+  ensure
+    # simple flip-flop
+    class << self
+      remove_method :new
+    end
+  end
+end
+Yup.instantiate_all
+
+
+puts "\n\n","Customized marshalling"
+class A
+  include Singleton
+  attr_accessor :persist, :die
+  def _dump(depth)
+    # this strips the @die information from the instance
+    Marshal.dump(@persist,depth)
+  end
+end
+
+def A._load(str)
+  instance.persist = Marshal.load(str)
+  instance
+end
+
+a = A.instance
+a.persist = ["persist"]
+a.die = "die"
+a.taint
+
+stored_state = Marshal.dump(a)
+# change state
+a.persist = nil
+a.die = nil
+b = Marshal.load(stored_state)
+p a == b  #  => true
+p a.persist  #  => ["persist"]
+p a.die      #  => nil
+
+
+puts "\n\nSingleton with overridden default #inherited() hook"
+class Up
+end
+def Up.inherited(sub_klass)
+  puts "#{sub_klass} subclasses #{self}"
+end
+
+
+class Middle < Up
+  include Singleton
+end
+
+class Down < Middle; end
+
+puts  "and basic \"Down test\" is #{Down.instance == Down.instance}\n
+Various exceptions"  
+
+begin
+  module AModule
+    include Singleton
+  end
+rescue TypeError => mes
+  puts mes  #=> Inclusion of the OO-Singleton module in module AModule
+end
+
+begin
+  'aString'.extend Singleton
+rescue NoMethodError => mes
+  puts mes  #=> undefined method `extend_object' for Singleton:Module
+end
+
+end
diff --git a/ruby_1_8_6/lib/soap/attachment.rb b/ruby_1_8_6/lib/soap/attachment.rb
new file mode 100644
index 0000000000..1a59b14018
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/attachment.rb
@@ -0,0 +1,107 @@
+# soap/attachment.rb: SOAP4R - SwA implementation.
+# Copyright (C) 2002, 2003  Jamie Herre and NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/baseData'
+require 'soap/mapping'
+
+
+module SOAP
+
+
+class SOAPAttachment < SOAPExternalReference
+  attr_reader :data
+
+  def initialize(value)
+    super()
+    @data = value
+  end
+
+private
+
+  def external_contentid
+    @data.contentid
+  end
+end
+
+
+class Attachment
+  attr_reader :io
+  attr_accessor :contenttype
+
+  def initialize(string_or_readable = nil)
+    @string_or_readable = string_or_readable
+    @contenttype = "application/octet-stream"
+    @contentid = nil
+  end
+
+  def contentid
+    @contentid ||= Attachment.contentid(self)
+  end
+
+  def contentid=(contentid)
+    @contentid = contentid
+  end
+
+  def mime_contentid
+    '<' + contentid + '>'
+  end
+
+  def content
+    if @content == nil and @string_or_readable != nil
+      @content = @string_or_readable.respond_to?(:read) ?
+	@string_or_readable.read : @string_or_readable
+    end
+    @content
+  end
+
+  def to_s
+    content
+  end
+
+  def write(out)
+    out.write(content)
+  end
+
+  def save(filename)
+    File.open(filename, "wb") do |f|
+      write(f)
+    end
+  end
+
+  def self.contentid(obj)
+    # this needs to be fixed
+    [obj.__id__.to_s, Process.pid.to_s].join('.')
+  end
+
+  def self.mime_contentid(obj)
+    '<' + contentid(obj) + '>'
+  end
+end
+
+
+module Mapping
+  class AttachmentFactory < SOAP::Mapping::Factory
+    def obj2soap(soap_class, obj, info, map)
+      soap_obj = soap_class.new(obj)
+      mark_marshalled_obj(obj, soap_obj)
+      soap_obj
+    end
+
+    def soap2obj(obj_class, node, info, map)
+      obj = node.data
+      mark_unmarshalled_obj(node, obj)
+      return true, obj
+    end
+  end
+
+  DefaultRegistry.add(::SOAP::Attachment, ::SOAP::SOAPAttachment,
+    AttachmentFactory.new, nil)
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/baseData.rb b/ruby_1_8_6/lib/soap/baseData.rb
new file mode 100644
index 0000000000..0e8b00d450
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/baseData.rb
@@ -0,0 +1,942 @@
+# soap/baseData.rb: SOAP4R - Base type library
+# Copyright (C) 2000, 2001, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/datatypes'
+require 'soap/soap'
+
+
+module SOAP
+
+
+###
+## Mix-in module for SOAP base type classes.
+#
+module SOAPModuleUtils
+  include SOAP
+
+public
+
+  def decode(elename)
+    d = self.new
+    d.elename = elename
+    d
+  end
+end
+
+
+###
+## for SOAP type(base and compound)
+#
+module SOAPType
+  attr_accessor :encodingstyle
+  attr_accessor :elename
+  attr_accessor :id
+  attr_reader :precedents
+  attr_accessor :root
+  attr_accessor :parent
+  attr_accessor :position
+  attr_reader :extraattr
+  attr_accessor :definedtype
+
+  def initialize(*arg)
+    super
+    @encodingstyle = nil
+    @elename = XSD::QName::EMPTY
+    @id = nil
+    @precedents = []
+    @root = false
+    @parent = nil
+    @position = nil
+    @definedtype = nil
+    @extraattr = {}
+  end
+
+  def inspect
+    if self.is_a?(XSD::NSDBase)
+      sprintf("#<%s:0x%x %s %s>", self.class.name, __id__, self.elename, self.type)
+    else
+      sprintf("#<%s:0x%x %s>", self.class.name, __id__, self.elename)
+    end
+  end
+
+  def rootnode
+    node = self
+    while node = node.parent
+      break if SOAPEnvelope === node
+    end
+    node
+  end
+end
+
+
+###
+## for SOAP base type
+#
+module SOAPBasetype
+  include SOAPType
+  include SOAP
+
+  def initialize(*arg)
+    super
+  end
+end
+
+
+###
+## for SOAP compound type
+#
+module SOAPCompoundtype
+  include SOAPType
+  include SOAP
+
+  def initialize(*arg)
+    super
+  end
+end
+
+
+###
+## Convenience datatypes.
+#
+class SOAPReference < XSD::NSDBase
+  include SOAPBasetype
+  extend SOAPModuleUtils
+
+public
+
+  attr_accessor :refid
+
+  # Override the definition in SOAPBasetype.
+  def initialize(obj = nil)
+    super()
+    @type = XSD::QName::EMPTY
+    @refid = nil
+    @obj = nil
+    __setobj__(obj) if obj
+  end
+
+  def __getobj__
+    @obj
+  end
+
+  def __setobj__(obj)
+    @obj = obj
+    @refid = @obj.id || SOAPReference.create_refid(@obj)
+    @obj.id = @refid unless @obj.id
+    @obj.precedents << self
+    # Copies NSDBase information
+    @obj.type = @type unless @obj.type
+  end
+
+  # Why don't I use delegate.rb?
+  # -> delegate requires target object type at initialize time.
+  # Why don't I use forwardable.rb?
+  # -> forwardable requires a list of forwarding methods.
+  #
+  # ToDo: Maybe I should use forwardable.rb and give it a methods list like
+  # delegate.rb...
+  #
+  def method_missing(msg_id, *params)
+    if @obj
+      @obj.send(msg_id, *params)
+    else
+      nil
+    end
+  end
+
+  def refidstr
+    '#' + @refid
+  end
+
+  def self.create_refid(obj)
+    'id' + obj.__id__.to_s
+  end
+
+  def self.decode(elename, refidstr)
+    if /\A#(.*)\z/ =~ refidstr
+      refid = $1
+    elsif /\Acid:(.*)\z/ =~ refidstr
+      refid = $1
+    else
+      raise ArgumentError.new("illegal refid #{refidstr}")
+    end
+    d = super(elename)
+    d.refid = refid
+    d
+  end
+end
+
+
+class SOAPExternalReference < XSD::NSDBase
+  include SOAPBasetype
+  extend SOAPModuleUtils
+
+  def initialize
+    super()
+    @type = XSD::QName::EMPTY
+  end
+
+  def referred
+    rootnode.external_content[external_contentid] = self
+  end
+
+  def refidstr
+    'cid:' + external_contentid
+  end
+
+private
+
+  def external_contentid
+    raise NotImplementedError.new
+  end
+end
+
+
+class SOAPNil < XSD::XSDNil
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+# SOAPRawString is for sending raw string.  In contrast to SOAPString,
+# SOAP4R does not do XML encoding and does not convert its CES.  The string it
+# holds is embedded to XML instance directly as a 'xsd:string'.
+class SOAPRawString < XSD::XSDString
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+
+###
+## Basic datatypes.
+#
+class SOAPAnySimpleType < XSD::XSDAnySimpleType
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPString < XSD::XSDString
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPBoolean < XSD::XSDBoolean
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPDecimal < XSD::XSDDecimal
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPFloat < XSD::XSDFloat
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPDouble < XSD::XSDDouble
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPDuration < XSD::XSDDuration
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPDateTime < XSD::XSDDateTime
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPTime < XSD::XSDTime
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPDate < XSD::XSDDate
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPGYearMonth < XSD::XSDGYearMonth
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPGYear < XSD::XSDGYear
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPGMonthDay < XSD::XSDGMonthDay
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPGDay < XSD::XSDGDay
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPGMonth < XSD::XSDGMonth
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPHexBinary < XSD::XSDHexBinary
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPBase64 < XSD::XSDBase64Binary
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  Type = QName.new(EncodingNamespace, Base64Literal)
+
+public
+  # Override the definition in SOAPBasetype.
+  def initialize(value = nil)
+    super(value)
+    @type = Type
+  end
+
+  def as_xsd
+    @type = XSD::XSDBase64Binary::Type
+  end
+end
+
+class SOAPAnyURI < XSD::XSDAnyURI
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPQName < XSD::XSDQName
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+
+class SOAPInteger < XSD::XSDInteger
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPNonPositiveInteger < XSD::XSDNonPositiveInteger
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPNegativeInteger < XSD::XSDNegativeInteger
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPLong < XSD::XSDLong
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPInt < XSD::XSDInt
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPShort < XSD::XSDShort
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPByte < XSD::XSDByte
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPNonNegativeInteger < XSD::XSDNonNegativeInteger
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPUnsignedLong < XSD::XSDUnsignedLong
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPUnsignedInt < XSD::XSDUnsignedInt
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPUnsignedShort < XSD::XSDUnsignedShort
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPUnsignedByte < XSD::XSDUnsignedByte
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+class SOAPPositiveInteger < XSD::XSDPositiveInteger
+  include SOAPBasetype
+  extend SOAPModuleUtils
+end
+
+
+###
+## Compound datatypes.
+#
+class SOAPStruct < XSD::NSDBase
+  include SOAPCompoundtype
+  include Enumerable
+
+public
+
+  def initialize(type = nil)
+    super()
+    @type = type || XSD::QName::EMPTY
+    @array = []
+    @data = []
+  end
+
+  def to_s()
+    str = ''
+    self.each do |key, data|
+      str << "#{key}: #{data}\n"
+    end
+    str
+  end
+
+  def add(name, value)
+    add_member(name, value)
+  end
+
+  def [](idx)
+    if idx.is_a?(Range)
+      @data[idx]
+    elsif idx.is_a?(Integer)
+      if (idx > @array.size)
+        raise ArrayIndexOutOfBoundsError.new('In ' << @type.name)
+      end
+      @data[idx]
+    else
+      if @array.include?(idx)
+	@data[@array.index(idx)]
+      else
+	nil
+      end
+    end
+  end
+
+  def []=(idx, data)
+    if @array.include?(idx)
+      data.parent = self if data.respond_to?(:parent=)
+      @data[@array.index(idx)] = data
+    else
+      add(idx, data)
+    end
+  end
+
+  def key?(name)
+    @array.include?(name)
+  end
+
+  def members
+    @array
+  end
+
+  def to_obj
+    hash = {}
+    proptype = {}
+    each do |k, v|
+      value = v.respond_to?(:to_obj) ? v.to_obj : v.to_s
+      case proptype[k]
+      when :single
+        hash[k] = [hash[k], value]
+        proptype[k] = :multi
+      when :multi
+        hash[k] << value
+      else
+        hash[k] = value
+        proptype[k] = :single
+      end
+    end
+    hash
+  end
+
+  def each
+    idx = 0
+    while idx < @array.length
+      yield(@array[idx], @data[idx])
+      idx += 1
+    end
+  end
+
+  def replace
+    members.each do |member|
+      self[member] = yield(self[member])
+    end
+  end
+
+  def self.decode(elename, type)
+    s = SOAPStruct.new(type)
+    s.elename = elename
+    s
+  end
+
+private
+
+  def add_member(name, value = nil)
+    value = SOAPNil.new() if value.nil?
+    @array.push(name)
+    value.elename = value.elename.dup_name(name)
+    @data.push(value)
+    value.parent = self if value.respond_to?(:parent=)
+    value
+  end
+end
+
+
+# SOAPElement is not typed so it is not derived from NSDBase.
+class SOAPElement
+  include Enumerable
+
+  attr_accessor :encodingstyle
+
+  attr_accessor :elename
+  attr_accessor :id
+  attr_reader :precedents
+  attr_accessor :root
+  attr_accessor :parent
+  attr_accessor :position
+  attr_accessor :extraattr
+
+  attr_accessor :qualified
+
+  def initialize(elename, text = nil)
+    if !elename.is_a?(XSD::QName)
+      elename = XSD::QName.new(nil, elename)
+    end
+    @encodingstyle = LiteralNamespace
+    @elename = elename
+    @id = nil
+    @precedents = []
+    @root = false
+    @parent = nil
+    @position = nil
+    @extraattr = {}
+
+    @qualified = nil
+
+    @array = []
+    @data = []
+    @text = text
+  end
+
+  def inspect
+    sprintf("#<%s:0x%x %s>", self.class.name, __id__, self.elename)
+  end
+
+  # Text interface.
+  attr_accessor :text
+  alias data text
+
+  # Element interfaces.
+  def add(value)
+    add_member(value.elename.name, value)
+  end
+
+  def [](idx)
+    if @array.include?(idx)
+      @data[@array.index(idx)]
+    else
+      nil
+    end
+  end
+
+  def []=(idx, data)
+    if @array.include?(idx)
+      data.parent = self if data.respond_to?(:parent=)
+      @data[@array.index(idx)] = data
+    else
+      add(data)
+    end
+  end
+
+  def key?(name)
+    @array.include?(name)
+  end
+
+  def members
+    @array
+  end
+
+  def to_obj
+    if members.empty?
+      @text
+    else
+      hash = {}
+      proptype = {}
+      each do |k, v|
+        value = v.respond_to?(:to_obj) ? v.to_obj : v.to_s
+        case proptype[k]
+        when :single
+          hash[k] = [hash[k], value]
+          proptype[k] = :multi
+        when :multi
+          hash[k] << value
+        else
+          hash[k] = value
+          proptype[k] = :single
+        end
+      end
+      hash
+    end
+  end
+
+  def each
+    idx = 0
+    while idx < @array.length
+      yield(@array[idx], @data[idx])
+      idx += 1
+    end
+  end
+
+  def self.decode(elename)
+    o = SOAPElement.new(elename)
+    o
+  end
+
+  def self.from_obj(obj, namespace = nil)
+    o = SOAPElement.new(nil)
+    case obj
+    when nil
+      o.text = nil
+    when Hash
+      obj.each do |elename, value|
+        if value.is_a?(Array)
+          value.each do |subvalue|
+            child = from_obj(subvalue, namespace)
+            child.elename = to_elename(elename, namespace)
+            o.add(child)
+          end
+        else
+          child = from_obj(value, namespace)
+          child.elename = to_elename(elename, namespace)
+          o.add(child)
+        end
+      end
+    else
+      o.text = obj.to_s
+    end
+    o
+  end
+
+  def self.to_elename(obj, namespace = nil)
+    if obj.is_a?(XSD::QName)
+      obj
+    elsif /\A(.+):([^:]+)\z/ =~ obj.to_s
+      XSD::QName.new($1, $2)
+    else
+      XSD::QName.new(namespace, obj.to_s)
+    end
+  end
+
+private
+
+  def add_member(name, value)
+    add_accessor(name)
+    @array.push(name)
+    @data.push(value)
+    value.parent = self if value.respond_to?(:parent=)
+    value
+  end
+
+  if RUBY_VERSION > "1.7.0"
+    def add_accessor(name)
+      methodname = name
+      if self.respond_to?(methodname)
+        methodname = safe_accessor_name(methodname)
+      end
+      Mapping.define_singleton_method(self, methodname) do
+        @data[@array.index(name)]
+      end
+      Mapping.define_singleton_method(self, methodname + '=') do |value|
+        @data[@array.index(name)] = value
+      end
+    end
+  else
+    def add_accessor(name)
+      methodname = safe_accessor_name(name)
+      instance_eval <<-EOS
+        def #{methodname}
+          @data[@array.index(#{name.dump})]
+        end
+
+        def #{methodname}=(value)
+          @data[@array.index(#{name.dump})] = value
+        end
+      EOS
+    end
+  end
+
+  def safe_accessor_name(name)
+    "var_" << name.gsub(/[^a-zA-Z0-9_]/, '')
+  end
+end
+
+
+class SOAPArray < XSD::NSDBase
+  include SOAPCompoundtype
+  include Enumerable
+
+public
+
+  attr_accessor :sparse
+
+  attr_reader :offset, :rank
+  attr_accessor :size, :size_fixed
+  attr_reader :arytype
+
+  def initialize(type = nil, rank = 1, arytype = nil)
+    super()
+    @type = type || ValueArrayName
+    @rank = rank
+    @data = Array.new
+    @sparse = false
+    @offset = Array.new(rank, 0)
+    @size = Array.new(rank, 0)
+    @size_fixed = false
+    @position = nil
+    @arytype = arytype
+  end
+
+  def offset=(var)
+    @offset = var
+    @sparse = true
+  end
+
+  def add(value)
+    self[*(@offset)] = value
+  end
+
+  def [](*idxary)
+    if idxary.size != @rank
+      raise ArgumentError.new("given #{idxary.size} params does not match rank: #{@rank}")
+    end
+
+    retrieve(idxary)
+  end
+
+  def []=(*idxary)
+    value = idxary.slice!(-1)
+
+    if idxary.size != @rank
+      raise ArgumentError.new("given #{idxary.size} params(#{idxary})" +
+        " does not match rank: #{@rank}")
+    end
+
+    idx = 0
+    while idx < idxary.size
+      if idxary[idx] + 1 > @size[idx]
+	@size[idx] = idxary[idx] + 1
+      end
+      idx += 1
+    end
+
+    data = retrieve(idxary[0, idxary.size - 1])
+    data[idxary.last] = value
+
+    if value.is_a?(SOAPType)
+      value.elename = ITEM_NAME
+      # Sync type
+      unless @type.name
+	@type = XSD::QName.new(value.type.namespace,
+	  SOAPArray.create_arytype(value.type.name, @rank))
+      end
+      value.type ||= @type
+    end
+
+    @offset = idxary
+    value.parent = self if value.respond_to?(:parent=)
+    offsetnext
+  end
+
+  def each
+    @data.each do |data|
+      yield(data)
+    end
+  end
+
+  def to_a
+    @data.dup
+  end
+
+  def replace
+    @data = deep_map(@data) do |ele|
+      yield(ele)
+    end
+  end
+
+  def deep_map(ary, &block)
+    ary.collect do |ele|
+      if ele.is_a?(Array)
+	deep_map(ele, &block)
+      else
+	new_obj = block.call(ele)
+	new_obj.elename = ITEM_NAME
+	new_obj
+      end
+    end
+  end
+
+  def include?(var)
+    traverse_data(@data) do |v, *rank|
+      if v.is_a?(SOAPBasetype) && v.data == var
+	return true
+      end
+    end
+    false
+  end
+
+  def traverse
+    traverse_data(@data) do |v, *rank|
+      unless @sparse
+       yield(v)
+      else
+       yield(v, *rank) if v && !v.is_a?(SOAPNil)
+      end
+    end
+  end
+
+  def soap2array(ary)
+    traverse_data(@data) do |v, *position|
+      iteary = ary
+      rank = 1
+      while rank < position.size
+	idx = position[rank - 1]
+	if iteary[idx].nil?
+	  iteary = iteary[idx] = Array.new
+	else
+	  iteary = iteary[idx]
+	end
+        rank += 1
+      end
+      if block_given?
+	iteary[position.last] = yield(v)
+      else
+	iteary[position.last] = v
+      end
+    end
+  end
+
+  def position
+    @position
+  end
+
+private
+
+  ITEM_NAME = XSD::QName.new(nil, 'item')
+
+  def retrieve(idxary)
+    data = @data
+    rank = 1
+    while rank <= idxary.size
+      idx = idxary[rank - 1]
+      if data[idx].nil?
+	data = data[idx] = Array.new
+      else
+	data = data[idx]
+      end
+      rank += 1
+    end
+    data
+  end
+
+  def traverse_data(data, rank = 1)
+    idx = 0
+    while idx < ranksize(rank)
+      if rank < @rank
+	traverse_data(data[idx], rank + 1) do |*v|
+	  v[1, 0] = idx
+       	  yield(*v)
+	end
+      else
+	yield(data[idx], idx)
+      end
+      idx += 1
+    end
+  end
+
+  def ranksize(rank)
+    @size[rank - 1]
+  end
+
+  def offsetnext
+    move = false
+    idx = @offset.size - 1
+    while !move && idx >= 0
+      @offset[idx] += 1
+      if @size_fixed
+	if @offset[idx] < @size[idx]
+	  move = true
+	else
+	  @offset[idx] = 0
+	  idx -= 1
+	end
+      else
+	move = true
+      end
+    end
+  end
+
+  # Module function
+
+public
+
+  def self.decode(elename, type, arytype)
+    typestr, nofary = parse_type(arytype.name)
+    rank = nofary.count(',') + 1
+    plain_arytype = XSD::QName.new(arytype.namespace, typestr)
+    o = SOAPArray.new(type, rank, plain_arytype)
+    size = []
+    nofary.split(',').each do |s|
+      if s.empty?
+	size.clear
+	break
+      else
+	size << s.to_i
+      end
+    end
+    unless size.empty?
+      o.size = size
+      o.size_fixed = true
+    end
+    o.elename = elename
+    o
+  end
+
+private
+
+  def self.create_arytype(typename, rank)
+    "#{typename}[" << ',' * (rank - 1) << ']'
+  end
+
+  TypeParseRegexp = Regexp.new('^(.+)\[([\d,]*)\]$')
+
+  def self.parse_type(string)
+    TypeParseRegexp =~ string
+    return $1, $2
+  end
+end
+
+
+require 'soap/mapping/typeMap'
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/element.rb b/ruby_1_8_6/lib/soap/element.rb
new file mode 100644
index 0000000000..cc58b5d341
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/element.rb
@@ -0,0 +1,258 @@
+# SOAP4R - SOAP elements library
+# Copyright (C) 2000, 2001, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'soap/baseData'
+
+
+module SOAP
+
+
+###
+## SOAP elements
+#
+module SOAPEnvelopeElement; end
+
+class SOAPFault < SOAPStruct
+  include SOAPEnvelopeElement
+  include SOAPCompoundtype
+
+public
+
+  def faultcode
+    self['faultcode']
+  end
+
+  def faultstring
+    self['faultstring']
+  end
+
+  def faultactor
+    self['faultactor']
+  end
+
+  def detail
+    self['detail']
+  end
+
+  def faultcode=(rhs)
+    self['faultcode'] = rhs
+  end
+
+  def faultstring=(rhs)
+    self['faultstring'] = rhs
+  end
+
+  def faultactor=(rhs)
+    self['faultactor'] = rhs
+  end
+
+  def detail=(rhs)
+    self['detail'] = rhs
+  end
+
+  def initialize(faultcode = nil, faultstring = nil, faultactor = nil, detail = nil)
+    super(EleFaultName)
+    @elename = EleFaultName
+    @encodingstyle = EncodingNamespace
+
+    if faultcode
+      self.faultcode = faultcode
+      self.faultstring = faultstring
+      self.faultactor = faultactor
+      self.detail = detail
+      self.faultcode.elename = EleFaultCodeName if self.faultcode
+      self.faultstring.elename = EleFaultStringName if self.faultstring
+      self.faultactor.elename = EleFaultActorName if self.faultactor
+      self.detail.elename = EleFaultDetailName if self.detail
+    end
+    faultcode.parent = self if faultcode
+    faultstring.parent = self if faultstring
+    faultactor.parent = self if faultactor
+    detail.parent = self if detail
+  end
+
+  def encode(generator, ns, attrs = {})
+    SOAPGenerator.assign_ns(attrs, ns, EnvelopeNamespace)
+    SOAPGenerator.assign_ns(attrs, ns, EncodingNamespace)
+    attrs[ns.name(AttrEncodingStyleName)] = EncodingNamespace
+    name = ns.name(@elename)
+    generator.encode_tag(name, attrs)
+    yield(self.faultcode)
+    yield(self.faultstring)
+    yield(self.faultactor)
+    yield(self.detail) if self.detail
+    generator.encode_tag_end(name, true)
+  end
+end
+
+
+class SOAPBody < SOAPStruct
+  include SOAPEnvelopeElement
+
+  def initialize(data = nil, is_fault = false)
+    super(nil)
+    @elename = EleBodyName
+    @encodingstyle = nil
+    if data
+      if data.respond_to?(:elename)
+        add(data.elename.name, data)
+      else
+        data.to_a.each do |datum|
+          add(datum.elename.name, datum)
+        end
+      end
+    end
+    @is_fault = is_fault
+  end
+
+  def encode(generator, ns, attrs = {})
+    name = ns.name(@elename)
+    generator.encode_tag(name, attrs)
+    if @is_fault
+      yield(@data)
+    else
+      @data.each do |data|
+	yield(data)
+      end
+    end
+    generator.encode_tag_end(name, true)
+  end
+
+  def root_node
+    @data.each do |node|
+      if node.root == 1
+	return node
+      end
+    end
+    # No specified root...
+    @data.each do |node|
+      if node.root != 0
+	return node
+      end
+    end
+
+    raise Parser::FormatDecodeError.new('no root element')
+  end
+end
+
+
+class SOAPHeaderItem < XSD::NSDBase
+  include SOAPEnvelopeElement
+  include SOAPCompoundtype
+
+public
+
+  attr_accessor :element
+  attr_accessor :mustunderstand
+  attr_accessor :encodingstyle
+
+  def initialize(element, mustunderstand = true, encodingstyle = nil)
+    super()
+    @type = nil
+    @element = element
+    @mustunderstand = mustunderstand
+    @encodingstyle = encodingstyle
+    element.parent = self if element
+  end
+
+  def encode(generator, ns, attrs = {})
+    attrs.each do |key, value|
+      @element.extraattr[key] = value
+    end
+    @element.extraattr[ns.name(AttrMustUnderstandName)] =
+      (@mustunderstand ? '1' : '0')
+    if @encodingstyle
+      @element.extraattr[ns.name(AttrEncodingStyleName)] = @encodingstyle
+    end
+    @element.encodingstyle = @encodingstyle if !@element.encodingstyle
+    yield(@element)
+  end
+end
+
+
+class SOAPHeader < SOAPStruct
+  include SOAPEnvelopeElement
+
+  def initialize
+    super(nil)
+    @elename = EleHeaderName
+    @encodingstyle = nil
+  end
+
+  def encode(generator, ns, attrs = {})
+    name = ns.name(@elename)
+    generator.encode_tag(name, attrs)
+    @data.each do |data|
+      yield(data)
+    end
+    generator.encode_tag_end(name, true)
+  end
+
+  def add(name, value)
+    mu = (value.extraattr[AttrMustUnderstandName] == '1')
+    encstyle = value.extraattr[AttrEncodingStyleName]
+    item = SOAPHeaderItem.new(value, mu, encstyle)
+    super(name, item)
+  end
+
+  def length
+    @data.length
+  end
+  alias size length
+end
+
+
+class SOAPEnvelope < XSD::NSDBase
+  include SOAPEnvelopeElement
+  include SOAPCompoundtype
+
+  attr_reader :header
+  attr_reader :body
+  attr_reader :external_content
+
+  def initialize(header = nil, body = nil)
+    super()
+    @type = nil
+    @elename = EleEnvelopeName
+    @encodingstyle = nil
+    @header = header
+    @body = body
+    @external_content = {}
+    header.parent = self if header
+    body.parent = self if body
+  end
+
+  def header=(header)
+    header.parent = self
+    @header = header
+  end
+
+  def body=(body)
+    body.parent = self
+    @body = body
+  end
+
+  def encode(generator, ns, attrs = {})
+    SOAPGenerator.assign_ns(attrs, ns, elename.namespace, SOAPNamespaceTag)
+    name = ns.name(@elename)
+    generator.encode_tag(name, attrs)
+
+    yield(@header) if @header and @header.length > 0
+    yield(@body)
+
+    generator.encode_tag_end(name, true)
+  end
+
+  def to_ary
+    [header, body]
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/encodingstyle/aspDotNetHandler.rb b/ruby_1_8_6/lib/soap/encodingstyle/aspDotNetHandler.rb
new file mode 100644
index 0000000000..fd7e0fa217
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/encodingstyle/aspDotNetHandler.rb
@@ -0,0 +1,213 @@
+# SOAP4R - ASP.NET EncodingStyle handler library
+# Copyright (C) 2001, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/encodingstyle/handler'
+
+
+module SOAP
+module EncodingStyle
+
+
+class ASPDotNetHandler < Handler
+  Namespace = 'http://tempuri.org/ASP.NET'
+  add_handler
+
+  def initialize(charset = nil)
+    super(charset)
+    @textbuf = ''
+    @decode_typemap = nil
+  end
+
+
+  ###
+  ## encode interface.
+  #
+  def encode_data(generator, ns, data, parent)
+    attrs = {}
+    # ASPDotNetHandler is intended to be used for accessing an ASP.NET doc/lit
+    # service as an rpc/encoded service.  in the situation, local elements
+    # should be qualified.  propagate parent's namespace to children.
+    if data.elename.namespace.nil?
+      data.elename.namespace = parent.elename.namespace
+    end
+    name = generator.encode_name(ns, data, attrs)
+    case data
+    when SOAPRawString
+      generator.encode_tag(name, attrs)
+      generator.encode_rawstring(data.to_s)
+    when XSD::XSDString
+      generator.encode_tag(name, attrs)
+      generator.encode_string(@charset ?
+        XSD::Charset.encoding_to_xml(data.to_s, @charset) : data.to_s)
+    when XSD::XSDAnySimpleType
+      generator.encode_tag(name, attrs)
+      generator.encode_string(data.to_s)
+    when SOAPStruct
+      generator.encode_tag(name, attrs)
+      data.each do |key, value|
+        generator.encode_child(ns, value, data)
+      end
+    when SOAPArray
+      generator.encode_tag(name, attrs)
+      data.traverse do |child, *rank|
+	data.position = nil
+        generator.encode_child(ns, child, data)
+      end
+    else
+      raise EncodingStyleError.new(
+        "unknown object:#{data} in this encodingStyle")
+    end
+  end
+
+  def encode_data_end(generator, ns, data, parent)
+    name = generator.encode_name_end(ns, data)
+    cr = data.is_a?(SOAPCompoundtype)
+    generator.encode_tag_end(name, cr)
+  end
+
+
+  ###
+  ## decode interface.
+  #
+  class SOAPTemporalObject
+    attr_accessor :parent
+
+    def initialize
+      @parent = nil
+    end
+  end
+
+  class SOAPUnknown < SOAPTemporalObject
+    def initialize(handler, elename)
+      super()
+      @handler = handler
+      @elename = elename
+    end
+
+    def as_struct
+      o = SOAPStruct.decode(@elename, XSD::AnyTypeName)
+      o.parent = @parent
+      o.type.name = @name
+      @handler.decode_parent(@parent, o)
+      o
+    end
+
+    def as_string
+      o = SOAPString.decode(@elename)
+      o.parent = @parent
+      @handler.decode_parent(@parent, o)
+      o
+    end
+
+    def as_nil
+      o = SOAPNil.decode(@elename)
+      o.parent = @parent
+      @handler.decode_parent(@parent, o)
+      o
+    end
+  end
+
+  def decode_tag(ns, elename, attrs, parent)
+    @textbuf = ''
+    o = SOAPUnknown.new(self, elename)
+    o.parent = parent
+    o
+  end
+
+  def decode_tag_end(ns, node)
+    o = node.node
+    if o.is_a?(SOAPUnknown)
+      newnode = o.as_string
+#	if /\A\s*\z/ =~ @textbuf
+#	  o.as_struct
+#	else
+#	  o.as_string
+#	end
+      node.replace_node(newnode)
+      o = node.node
+    end
+
+    decode_textbuf(o)
+    @textbuf = ''
+  end
+
+  def decode_text(ns, text)
+    # @textbuf is set at decode_tag_end.
+    @textbuf << text
+  end
+
+  def decode_prologue
+  end
+
+  def decode_epilogue
+  end
+
+  def decode_parent(parent, node)
+    case parent.node
+    when SOAPUnknown
+      newparent = parent.node.as_struct
+      node.parent = newparent
+      parent.replace_node(newparent)
+      decode_parent(parent, node)
+
+    when SOAPStruct
+      data = parent.node[node.elename.name]
+      case data
+      when nil
+	parent.node.add(node.elename.name, node)
+      when SOAPArray
+	name, type_ns = node.elename.name, node.type.namespace
+	data.add(node)
+	node.elename, node.type.namespace = name, type_ns
+      else
+	parent.node[node.elename.name] = SOAPArray.new
+	name, type_ns = data.elename.name, data.type.namespace
+	parent.node[node.elename.name].add(data)
+	data.elename.name, data.type.namespace = name, type_ns
+	name, type_ns = node.elename.name, node.type.namespace
+	parent.node[node.elename.name].add(node)
+	node.elename.name, node.type.namespace = name, type_ns
+      end
+
+    when SOAPArray
+      if node.position
+	parent.node[*(decode_arypos(node.position))] = node
+	parent.node.sparse = true
+      else
+	parent.node.add(node)
+      end
+
+    when SOAPBasetype
+      raise EncodingStyleError.new("SOAP base type must not have a child")
+
+    else
+      # SOAPUnknown does not have parent.
+      # raise EncodingStyleError.new("illegal parent: #{parent}")
+    end
+  end
+
+private
+
+  def decode_textbuf(node)
+    if node.is_a?(XSD::XSDString)
+      if @charset
+	node.set(XSD::Charset.encoding_from_xml(@textbuf, @charset))
+      else
+	node.set(@textbuf)
+      end
+    else
+      # Nothing to do...
+    end
+  end
+end
+
+ASPDotNetHandler.new
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/encodingstyle/handler.rb b/ruby_1_8_6/lib/soap/encodingstyle/handler.rb
new file mode 100644
index 0000000000..c015417435
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/encodingstyle/handler.rb
@@ -0,0 +1,100 @@
+# SOAP4R - EncodingStyle handler library
+# Copyright (C) 2001, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/soap'
+require 'soap/baseData'
+require 'soap/element'
+
+
+module SOAP
+module EncodingStyle
+
+
+class Handler
+  @@handlers = {}
+
+  class EncodingStyleError < Error; end
+
+  class << self
+    def uri
+      self::Namespace
+    end
+
+    def handler(uri)
+      @@handlers[uri]
+    end
+
+    def each
+      @@handlers.each do |key, value|
+	yield(value)
+      end
+    end
+
+  private
+
+    def add_handler
+      @@handlers[self.uri] = self
+    end
+  end
+
+  attr_reader :charset
+  attr_accessor :generate_explicit_type
+  def decode_typemap=(definedtypes)
+    @decode_typemap = definedtypes
+  end
+
+  def initialize(charset)
+    @charset = charset
+    @generate_explicit_type = true
+    @decode_typemap = nil
+  end
+
+  ###
+  ## encode interface.
+  #
+  # Returns a XML instance as a string.
+  def encode_data(generator, ns, data, parent)
+    raise NotImplementError
+  end
+
+  def encode_data_end(generator, ns, data, parent)
+    raise NotImplementError
+  end
+
+  def encode_prologue
+  end
+
+  def encode_epilogue
+  end
+
+  ###
+  ## decode interface.
+  #
+  # Returns SOAP/OM data.
+  def decode_tag(ns, name, attrs, parent)
+    raise NotImplementError.new('Method decode_tag must be defined in derived class.')
+  end
+
+  def decode_tag_end(ns, name)
+    raise NotImplementError.new('Method decode_tag_end must be defined in derived class.')
+  end
+
+  def decode_text(ns, text)
+    raise NotImplementError.new('Method decode_text must be defined in derived class.')
+  end
+
+  def decode_prologue
+  end
+
+  def decode_epilogue
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/encodingstyle/literalHandler.rb b/ruby_1_8_6/lib/soap/encodingstyle/literalHandler.rb
new file mode 100644
index 0000000000..59c7205366
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/encodingstyle/literalHandler.rb
@@ -0,0 +1,226 @@
+# SOAP4R - XML Literal EncodingStyle handler library
+# Copyright (C) 2001, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/encodingstyle/handler'
+
+
+module SOAP
+module EncodingStyle
+
+
+class LiteralHandler < Handler
+  Namespace = SOAP::LiteralNamespace
+  add_handler
+
+  def initialize(charset = nil)
+    super(charset)
+    @textbuf = ''
+  end
+
+
+  ###
+  ## encode interface.
+  #
+  def encode_data(generator, ns, data, parent)
+    attrs = {}
+    name = generator.encode_name(ns, data, attrs)
+    data.extraattr.each do |k, v|
+      # ToDo: check generator.attributeformdefault here
+      if k.is_a?(XSD::QName)
+        if k.namespace
+          SOAPGenerator.assign_ns(attrs, ns, k.namespace)
+          k = ns.name(k)
+        else
+          k = k.name
+        end
+      end
+      attrs[k] = v
+    end
+    case data
+    when SOAPRawString
+      generator.encode_tag(name, attrs)
+      generator.encode_rawstring(data.to_s)
+    when XSD::XSDString
+      generator.encode_tag(name, attrs)
+      str = data.to_s
+      str = XSD::Charset.encoding_to_xml(str, @charset) if @charset
+      generator.encode_string(str)
+    when XSD::XSDAnySimpleType
+      generator.encode_tag(name, attrs)
+      generator.encode_string(data.to_s)
+    when SOAPStruct
+      generator.encode_tag(name, attrs)
+      data.each do |key, value|
+        generator.encode_child(ns, value, data)
+      end
+    when SOAPArray
+      generator.encode_tag(name, attrs)
+      data.traverse do |child, *rank|
+	data.position = nil
+        generator.encode_child(ns, child, data)
+      end
+    when SOAPElement
+      # passes 2 times for simplifying namespace definition
+      data.each do |key, value|
+        if value.elename.namespace
+          SOAPGenerator.assign_ns(attrs, ns, value.elename.namespace)
+        end
+      end
+      generator.encode_tag(name, attrs)
+      generator.encode_rawstring(data.text) if data.text
+      data.each do |key, value|
+        generator.encode_child(ns, value, data)
+      end
+    else
+      raise EncodingStyleError.new(
+        "unknown object:#{data} in this encodingStyle")
+    end
+  end
+
+  def encode_data_end(generator, ns, data, parent)
+    name = generator.encode_name_end(ns, data)
+    cr = (data.is_a?(SOAPCompoundtype) or
+      (data.is_a?(SOAPElement) and !data.text))
+    generator.encode_tag_end(name, cr)
+  end
+
+
+  ###
+  ## decode interface.
+  #
+  class SOAPTemporalObject
+    attr_accessor :parent
+
+    def initialize
+      @parent = nil
+    end
+  end
+
+  class SOAPUnknown < SOAPTemporalObject
+    def initialize(handler, elename, extraattr)
+      super()
+      @handler = handler
+      @elename = elename
+      @extraattr = extraattr
+    end
+
+    def as_element
+      o = SOAPElement.decode(@elename)
+      o.parent = @parent
+      o.extraattr.update(@extraattr)
+      @handler.decode_parent(@parent, o)
+      o
+    end
+
+    def as_string
+      o = SOAPString.decode(@elename)
+      o.parent = @parent
+      o.extraattr.update(@extraattr)
+      @handler.decode_parent(@parent, o)
+      o
+    end
+
+    def as_nil
+      o = SOAPNil.decode(@elename)
+      o.parent = @parent
+      o.extraattr.update(@extraattr)
+      @handler.decode_parent(@parent, o)
+      o
+    end
+  end
+
+  def decode_tag(ns, elename, attrs, parent)
+    @textbuf = ''
+    o = SOAPUnknown.new(self, elename, decode_attrs(ns, attrs))
+    o.parent = parent
+    o
+  end
+
+  def decode_tag_end(ns, node)
+    o = node.node
+    if o.is_a?(SOAPUnknown)
+      newnode = if /\A\s*\z/ =~ @textbuf
+	  o.as_element
+	else
+	  o.as_string
+	end
+      node.replace_node(newnode)
+      o = node.node
+    end
+
+    decode_textbuf(o)
+    @textbuf = ''
+  end
+
+  def decode_text(ns, text)
+    # @textbuf is set at decode_tag_end.
+    @textbuf << text
+  end
+
+  def decode_attrs(ns, attrs)
+    extraattr = {}
+    attrs.each do |key, value|
+      qname = ns.parse_local(key)
+      extraattr[qname] = value
+    end
+    extraattr
+  end
+
+  def decode_prologue
+  end
+
+  def decode_epilogue
+  end
+
+  def decode_parent(parent, node)
+    return unless parent.node
+    case parent.node
+    when SOAPUnknown
+      newparent = parent.node.as_element
+      node.parent = newparent
+      parent.replace_node(newparent)
+      decode_parent(parent, node)
+    when SOAPElement
+      parent.node.add(node)
+      node.parent = parent.node
+    when SOAPStruct
+      parent.node.add(node.elename.name, node)
+      node.parent = parent.node
+    when SOAPArray
+      if node.position
+	parent.node[*(decode_arypos(node.position))] = node
+	parent.node.sparse = true
+      else
+	parent.node.add(node)
+      end
+      node.parent = parent.node
+    else
+      raise EncodingStyleError.new("illegal parent: #{parent.node}")
+    end
+  end
+
+private
+
+  def decode_textbuf(node)
+    if node.is_a?(XSD::XSDString)
+      if @charset
+	node.set(XSD::Charset.encoding_from_xml(@textbuf, @charset))
+      else
+	node.set(@textbuf)
+      end
+    else
+      # Nothing to do...
+    end
+  end
+end
+
+LiteralHandler.new
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/encodingstyle/soapHandler.rb b/ruby_1_8_6/lib/soap/encodingstyle/soapHandler.rb
new file mode 100644
index 0000000000..a522392625
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/encodingstyle/soapHandler.rb
@@ -0,0 +1,582 @@
+# SOAP4R - SOAP EncodingStyle handler library
+# Copyright (C) 2001, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/encodingstyle/handler'
+
+
+module SOAP
+module EncodingStyle
+
+
+class SOAPHandler < Handler
+  Namespace = SOAP::EncodingNamespace
+  add_handler
+
+  def initialize(charset = nil)
+    super(charset)
+    @refpool = []
+    @idpool = []
+    @textbuf = ''
+    @is_first_top_ele = true
+  end
+
+
+  ###
+  ## encode interface.
+  #
+  def encode_data(generator, ns, data, parent)
+    attrs = encode_attrs(generator, ns, data, parent)
+    if parent && parent.is_a?(SOAPArray) && parent.position
+      attrs[ns.name(AttrPositionName)] = "[#{parent.position.join(',')}]"
+    end
+    name = generator.encode_name(ns, data, attrs)
+    case data
+    when SOAPReference
+      attrs['href'] = data.refidstr
+      generator.encode_tag(name, attrs)
+    when SOAPExternalReference
+      data.referred
+      attrs['href'] = data.refidstr
+      generator.encode_tag(name, attrs)
+    when SOAPRawString
+      generator.encode_tag(name, attrs)
+      generator.encode_rawstring(data.to_s)
+    when XSD::XSDString
+      generator.encode_tag(name, attrs)
+      generator.encode_string(@charset ?
+	XSD::Charset.encoding_to_xml(data.to_s, @charset) : data.to_s)
+    when XSD::XSDAnySimpleType
+      generator.encode_tag(name, attrs)
+      generator.encode_string(data.to_s)
+    when SOAPStruct
+      generator.encode_tag(name, attrs)
+      data.each do |key, value|
+        generator.encode_child(ns, value, data)
+      end
+    when SOAPArray
+      generator.encode_tag(name, attrs)
+      data.traverse do |child, *rank|
+	data.position = data.sparse ? rank : nil
+        generator.encode_child(ns, child, data)
+      end
+    else
+      raise EncodingStyleError.new(
+	"unknown object:#{data} in this encodingStyle")
+    end
+  end
+
+  def encode_data_end(generator, ns, data, parent)
+    name = generator.encode_name_end(ns, data)
+    cr = data.is_a?(SOAPCompoundtype)
+    generator.encode_tag_end(name, cr)
+  end
+
+
+  ###
+  ## decode interface.
+  #
+  class SOAPTemporalObject
+    attr_accessor :parent
+    attr_accessor :position
+    attr_accessor :id
+    attr_accessor :root
+
+    def initialize
+      @parent = nil
+      @position = nil
+      @id = nil
+      @root = nil
+    end
+  end
+
+  class SOAPUnknown < SOAPTemporalObject
+    attr_reader :type
+    attr_accessor :definedtype
+    attr_reader :extraattr
+
+    def initialize(handler, elename, type, extraattr)
+      super()
+      @handler = handler
+      @elename = elename
+      @type = type
+      @extraattr = extraattr
+      @definedtype = nil
+    end
+
+    def as_struct
+      o = SOAPStruct.decode(@elename, @type)
+      o.id = @id
+      o.root = @root
+      o.parent = @parent
+      o.position = @position
+      o.extraattr.update(@extraattr)
+      @handler.decode_parent(@parent, o)
+      o
+    end
+
+    def as_string
+      o = SOAPString.decode(@elename)
+      o.id = @id
+      o.root = @root
+      o.parent = @parent
+      o.position = @position
+      o.extraattr.update(@extraattr)
+      @handler.decode_parent(@parent, o)
+      o
+    end
+
+    def as_nil
+      o = SOAPNil.decode(@elename)
+      o.id = @id
+      o.root = @root
+      o.parent = @parent
+      o.position = @position
+      o.extraattr.update(@extraattr)
+      @handler.decode_parent(@parent, o)
+      o
+    end
+  end
+
+  def decode_tag(ns, elename, attrs, parent)
+    @textbuf = ''
+    is_nil, type, arytype, root, offset, position, href, id, extraattr =
+      decode_attrs(ns, attrs)
+    o = nil
+    if is_nil
+      o = SOAPNil.decode(elename)
+    elsif href
+      o = SOAPReference.decode(elename, href)
+      @refpool << o
+    elsif @decode_typemap
+      o = decode_tag_by_wsdl(ns, elename, type, parent.node, arytype, extraattr)
+    else
+      o = decode_tag_by_type(ns, elename, type, parent.node, arytype, extraattr)
+    end
+
+    if o.is_a?(SOAPArray)
+      if offset
+	o.offset = decode_arypos(offset)
+	o.sparse = true
+      else
+	o.sparse = false
+      end
+    end
+
+    o.parent = parent
+    o.id = id
+    o.root = root
+    o.position = position
+
+    unless o.is_a?(SOAPTemporalObject)
+      @idpool << o if o.id
+      decode_parent(parent, o)
+    end
+    o
+  end
+
+  def decode_tag_end(ns, node)
+    o = node.node
+    if o.is_a?(SOAPUnknown)
+      newnode = if /\A\s*\z/ =~ @textbuf
+	o.as_struct
+      else
+	o.as_string
+      end
+      if newnode.id
+	@idpool << newnode
+      end
+      node.replace_node(newnode)
+      o = node.node
+    end
+    decode_textbuf(o)
+    # unlink definedtype
+    o.definedtype = nil
+  end
+
+  def decode_text(ns, text)
+    @textbuf << text
+  end
+
+  def decode_prologue
+    @refpool.clear
+    @idpool.clear
+    @is_first_top_ele = true
+  end
+
+  def decode_epilogue
+    decode_resolve_id
+  end
+
+  def decode_parent(parent, node)
+    return unless parent.node
+    case parent.node
+    when SOAPUnknown
+      newparent = parent.node.as_struct
+      node.parent = newparent
+      if newparent.id
+	@idpool << newparent
+      end
+      parent.replace_node(newparent)
+      decode_parent(parent, node)
+    when SOAPStruct
+      parent.node.add(node.elename.name, node)
+      node.parent = parent.node
+    when SOAPArray
+      if node.position
+	parent.node[*(decode_arypos(node.position))] = node
+	parent.node.sparse = true
+      else
+	parent.node.add(node)
+      end
+      node.parent = parent.node
+    else
+      raise EncodingStyleError.new("illegal parent: #{parent.node}")
+    end
+  end
+
+private
+
+  def content_ranksize(typename)
+    typename.scan(/\[[\d,]*\]$/)[0]
+  end
+
+  def content_typename(typename)
+    typename.sub(/\[,*\]$/, '')
+  end
+
+  def create_arytype(ns, data)
+    XSD::QName.new(data.arytype.namespace,
+      content_typename(data.arytype.name) + "[#{data.size.join(',')}]")
+  end
+
+  def encode_attrs(generator, ns, data, parent)
+    attrs = {}
+    return attrs if data.is_a?(SOAPReference)
+
+    if !parent || parent.encodingstyle != EncodingNamespace
+      if @generate_explicit_type
+        SOAPGenerator.assign_ns(attrs, ns, EnvelopeNamespace)
+        attrs[ns.name(AttrEncodingStyleName)] = EncodingNamespace
+      end
+      data.encodingstyle = EncodingNamespace
+    end
+
+    if data.is_a?(SOAPNil)
+      attrs[ns.name(XSD::AttrNilName)] = XSD::NilValue
+    elsif @generate_explicit_type
+      if data.type.namespace
+        SOAPGenerator.assign_ns(attrs, ns, data.type.namespace)
+      end
+      if data.is_a?(SOAPArray)
+	if data.arytype.namespace
+          SOAPGenerator.assign_ns(attrs, ns, data.arytype.namespace)
+   	end
+	SOAPGenerator.assign_ns(attrs, ns, EncodingNamespace)
+	attrs[ns.name(AttrArrayTypeName)] = ns.name(create_arytype(ns, data))
+	if data.type.name
+	  attrs[ns.name(XSD::AttrTypeName)] = ns.name(data.type)
+	end
+      elsif parent && parent.is_a?(SOAPArray) && (parent.arytype == data.type)
+	# No need to add.
+      elsif !data.type.namespace
+	# No need to add.
+      else
+	attrs[ns.name(XSD::AttrTypeName)] = ns.name(data.type)
+      end
+    end
+
+    data.extraattr.each do |key, value|
+      SOAPGenerator.assign_ns(attrs, ns, key.namespace)
+      attrs[ns.name(key)] = encode_attr_value(generator, ns, key, value)
+    end
+    if data.id
+      attrs['id'] = data.id
+    end
+    attrs
+  end
+
+  def encode_attr_value(generator, ns, qname, value)
+    if value.is_a?(SOAPType)
+      ref = SOAPReference.new(value)
+      generator.add_reftarget(qname.name, value)
+      ref.refidstr
+    else
+      value.to_s
+    end
+  end
+
+  def decode_tag_by_wsdl(ns, elename, typestr, parent, arytypestr, extraattr)
+    o = nil
+    if parent.class == SOAPBody
+      # root element: should branch by root attribute?
+      if @is_first_top_ele
+	# Unqualified name is allowed here.
+	@is_first_top_ele = false
+	type = @decode_typemap[elename] ||
+	  @decode_typemap.find_name(elename.name)
+	if type
+	  o = SOAPStruct.new(elename)
+	  o.definedtype = type
+	  return o
+	end
+      end
+      # multi-ref element.
+      if typestr
+	typename = ns.parse(typestr)
+	typedef = @decode_typemap[typename]
+	if typedef
+          return decode_definedtype(elename, typename, typedef, arytypestr)
+	end
+      end
+      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
+	extraattr)
+    end
+
+    if parent.type == XSD::AnyTypeName
+      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
+	extraattr)
+    end
+
+    # parent.definedtype == nil means the parent is SOAPUnknown.  SOAPUnknown
+    # is generated by decode_tag_by_type when its type is anyType.
+    parenttype = parent.definedtype || @decode_typemap[parent.type]
+    unless parenttype
+      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
+	extraattr)
+    end
+
+    definedtype_name = parenttype.child_type(elename)
+    if definedtype_name and (klass = TypeMap[definedtype_name])
+      return decode_basetype(klass, elename)
+    elsif definedtype_name == XSD::AnyTypeName
+      return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
+	extraattr)
+    end
+
+    if definedtype_name
+      typedef = @decode_typemap[definedtype_name]
+    else
+      typedef = parenttype.child_defined_complextype(elename)
+    end
+    decode_definedtype(elename, definedtype_name, typedef, arytypestr)
+  end
+
+  def decode_definedtype(elename, typename, typedef, arytypestr)
+    unless typedef
+      raise EncodingStyleError.new("unknown type '#{typename}'")
+    end
+    if typedef.is_a?(::WSDL::XMLSchema::SimpleType)
+      decode_defined_simpletype(elename, typename, typedef, arytypestr)
+    else
+      decode_defined_complextype(elename, typename, typedef, arytypestr)
+    end
+  end
+
+  def decode_basetype(klass, elename)
+    klass.decode(elename)
+  end
+
+  def decode_defined_simpletype(elename, typename, typedef, arytypestr)
+    o = decode_basetype(TypeMap[typedef.base], elename)
+    o.definedtype = typedef
+    o
+  end
+
+  def decode_defined_complextype(elename, typename, typedef, arytypestr)
+    case typedef.compoundtype
+    when :TYPE_STRUCT, :TYPE_MAP
+      o = SOAPStruct.decode(elename, typename)
+      o.definedtype = typedef
+      return o
+    when :TYPE_ARRAY
+      expected_arytype = typedef.find_arytype
+      if arytypestr
+	actual_arytype = XSD::QName.new(expected_arytype.namespace,
+	  content_typename(expected_arytype.name) <<
+	  content_ranksize(arytypestr))
+	o = SOAPArray.decode(elename, typename, actual_arytype)
+      else
+	o = SOAPArray.new(typename, 1, expected_arytype)
+	o.elename = elename
+      end
+      o.definedtype = typedef
+      return o
+    when :TYPE_EMPTY
+      o = SOAPNil.decode(elename)
+      o.definedtype = typedef
+      return o
+    else
+      raise RuntimeError.new(
+        "Unknown kind of complexType: #{typedef.compoundtype}")
+    end
+    nil
+  end
+
+  def decode_tag_by_type(ns, elename, typestr, parent, arytypestr, extraattr)
+    if arytypestr
+      type = typestr ? ns.parse(typestr) : ValueArrayName
+      node = SOAPArray.decode(elename, type, ns.parse(arytypestr))
+      node.extraattr.update(extraattr)
+      return node
+    end
+
+    type = nil
+    if typestr
+      type = ns.parse(typestr)
+    elsif parent.is_a?(SOAPArray)
+      type = parent.arytype
+    else
+      # Since it's in dynamic(without any type) encoding process,
+      # assumes entity as its type itself.
+      #   <SOAP-ENC:Array ...> => type Array in SOAP-ENC.
+      #   <Country xmlns="foo"> => type Country in foo.
+      type = elename
+    end
+
+    if (klass = TypeMap[type])
+      node = decode_basetype(klass, elename)
+      node.extraattr.update(extraattr)
+      return node
+    end
+
+    # Unknown type... Struct or String
+    SOAPUnknown.new(self, elename, type, extraattr)
+  end
+
+  def decode_textbuf(node)
+    case node
+    when XSD::XSDHexBinary, XSD::XSDBase64Binary
+      node.set_encoded(@textbuf)
+    when XSD::XSDString
+      if @charset
+	@textbuf = XSD::Charset.encoding_from_xml(@textbuf, @charset)
+      end
+      if node.definedtype
+        node.definedtype.check_lexical_format(@textbuf)
+      end
+      node.set(@textbuf)
+    when SOAPNil
+      # Nothing to do.
+    when SOAPBasetype
+      node.set(@textbuf)
+    else
+      # Nothing to do...
+    end
+    @textbuf = ''
+  end
+
+  NilLiteralMap = {
+    'true' => true,
+    '1' => true,
+    'false' => false,
+    '0' => false
+  }
+  RootLiteralMap = {
+    '1' => 1,
+    '0' => 0
+  }
+  def decode_attrs(ns, attrs)
+    is_nil = false
+    type = nil
+    arytype = nil
+    root = nil
+    offset = nil
+    position = nil
+    href = nil
+    id = nil
+    extraattr = {}
+
+    attrs.each do |key, value|
+      qname = ns.parse(key)
+      case qname.namespace
+      when XSD::InstanceNamespace
+        case qname.name
+        when XSD::NilLiteral
+          is_nil = NilLiteralMap[value] or
+            raise EncodingStyleError.new("cannot accept attribute value: #{value} as the value of xsi:#{XSD::NilLiteral} (expected 'true', 'false', '1', or '0')")
+          next
+        when XSD::AttrType
+          type = value
+          next
+        end
+      when EncodingNamespace
+        case qname.name
+        when AttrArrayType
+          arytype = value
+          next
+        when AttrRoot
+          root = RootLiteralMap[value] or
+            raise EncodingStyleError.new(
+	      "illegal root attribute value: #{value}")
+          next
+        when AttrOffset
+          offset = value
+          next
+        when AttrPosition
+          position = value
+          next
+        end
+      end
+      if key == 'href'
+        href = value
+        next
+      elsif key == 'id'
+        id = value
+        next
+      end
+      qname = ns.parse_local(key)
+      extraattr[qname] = decode_attr_value(ns, qname, value)
+    end
+
+    return is_nil, type, arytype, root, offset, position, href, id, extraattr
+  end
+
+  def decode_attr_value(ns, qname, value)
+    if /\A#/ =~ value
+      o = SOAPReference.decode(nil, value)
+      @refpool << o
+      o
+    else
+      value
+    end
+  end
+
+  def decode_arypos(position)
+    /^\[(.+)\]$/ =~ position
+    $1.split(',').collect { |s| s.to_i }
+  end
+
+  def decode_resolve_id
+    count = @refpool.length	# To avoid infinite loop
+    while !@refpool.empty? && count > 0
+      @refpool = @refpool.find_all { |ref|
+	o = @idpool.find { |item|
+	  item.id == ref.refid
+	}
+	if o.is_a?(SOAPReference)
+	  true	# link of link.
+	elsif o
+	  ref.__setobj__(o)
+	  false
+	elsif o = ref.rootnode.external_content[ref.refid]
+	  ref.__setobj__(o)
+      	  false
+	else
+	  raise EncodingStyleError.new("unresolved reference: #{ref.refid}")
+	end
+      }
+      count -= 1
+    end
+  end
+end
+
+SOAPHandler.new
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/generator.rb b/ruby_1_8_6/lib/soap/generator.rb
new file mode 100644
index 0000000000..f179555e1d
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/generator.rb
@@ -0,0 +1,268 @@
+# SOAP4R - SOAP XML Instance Generator library.
+# Copyright (C) 2001, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/ns'
+require 'soap/soap'
+require 'soap/baseData'
+require 'soap/encodingstyle/handler'
+
+
+module SOAP
+
+
+###
+## CAUTION: MT-unsafe
+#
+class SOAPGenerator
+  include SOAP
+
+  class FormatEncodeError < Error; end
+
+public
+
+  attr_accessor :charset
+  attr_accessor :default_encodingstyle
+  attr_accessor :generate_explicit_type
+  attr_accessor :use_numeric_character_reference
+
+  def initialize(opt = {})
+    @reftarget = nil
+    @handlers = {}
+    @charset = opt[:charset] || XSD::Charset.xml_encoding_label
+    @default_encodingstyle = opt[:default_encodingstyle] || EncodingNamespace
+    @generate_explicit_type =
+      opt.key?(:generate_explicit_type) ? opt[:generate_explicit_type] : true
+    @elementformdefault = opt[:elementformdefault]
+    @attributeformdefault = opt[:attributeformdefault]
+    @use_numeric_character_reference = opt[:use_numeric_character_reference]
+    @indentstr = opt[:no_indent] ? '' : '  '
+    @buf = @indent = @curr = nil
+  end
+
+  def generate(obj, io = nil)
+    @buf = io || ''
+    @indent = ''
+
+    prologue
+    @handlers.each do |uri, handler|
+      handler.encode_prologue
+    end
+
+    ns = XSD::NS.new
+    @buf << xmldecl
+    encode_data(ns, obj, nil)
+
+    @handlers.each do |uri, handler|
+      handler.encode_epilogue
+    end
+    epilogue
+
+    @buf
+  end
+
+  def encode_data(ns, obj, parent)
+    if obj.is_a?(SOAPEnvelopeElement)
+      encode_element(ns, obj, parent)
+      return
+    end
+    if @reftarget && !obj.precedents.empty?
+      add_reftarget(obj.elename.name, obj)
+      ref = SOAPReference.new(obj)
+      ref.elename = ref.elename.dup_name(obj.elename.name)
+      obj.precedents.clear	# Avoid cyclic delay.
+      obj.encodingstyle = parent.encodingstyle
+      # SOAPReference is encoded here.
+      obj = ref
+    end
+    encodingstyle = obj.encodingstyle
+    # Children's encodingstyle is derived from its parent.
+    encodingstyle ||= parent.encodingstyle if parent
+    obj.encodingstyle = encodingstyle
+    handler = find_handler(encodingstyle || @default_encodingstyle)
+    unless handler
+      raise FormatEncodeError.new("Unknown encodingStyle: #{ encodingstyle }.")
+    end
+    if !obj.elename.name
+      raise FormatEncodeError.new("Element name not defined: #{ obj }.")
+    end
+    handler.encode_data(self, ns, obj, parent)
+    handler.encode_data_end(self, ns, obj, parent)
+  end
+
+  def add_reftarget(name, node)
+    unless @reftarget
+      raise FormatEncodeError.new("Reftarget is not defined.")
+    end
+    @reftarget.add(name, node)
+  end
+
+  def encode_child(ns, child, parent)
+    indent_backup, @indent = @indent, @indent + @indentstr
+    encode_data(ns.clone_ns, child, parent)
+    @indent = indent_backup
+  end
+
+  def encode_element(ns, obj, parent)
+    attrs = {}
+    if obj.is_a?(SOAPBody)
+      @reftarget = obj
+      obj.encode(self, ns, attrs) do |child|
+	indent_backup, @indent = @indent, @indent + @indentstr
+        encode_data(ns.clone_ns, child, obj)
+	@indent = indent_backup
+      end
+      @reftarget = nil
+    else
+      if obj.is_a?(SOAPEnvelope)
+        # xsi:nil="true" can appear even if dumping without explicit type.
+        SOAPGenerator.assign_ns(attrs, ns,
+	  XSD::InstanceNamespace, XSINamespaceTag)
+        if @generate_explicit_type
+          SOAPGenerator.assign_ns(attrs, ns, XSD::Namespace, XSDNamespaceTag)
+        end
+      end
+      obj.encode(self, ns, attrs) do |child|
+	indent_backup, @indent = @indent, @indent + @indentstr
+        encode_data(ns.clone_ns, child, obj)
+	@indent = indent_backup
+      end
+    end
+  end
+
+  def encode_name(ns, data, attrs)
+    if element_local?(data)
+      data.elename.name
+    else
+      if element_qualified?(data)
+        SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace, '')
+      else
+        SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
+      end
+      ns.name(data.elename)
+    end
+  end
+
+  def encode_name_end(ns, data)
+    if element_local?(data)
+      data.elename.name
+    else
+      ns.name(data.elename)
+    end
+  end
+
+  def encode_tag(elename, attrs = nil)
+    if !attrs or attrs.empty?
+      @buf << "\n#{ @indent }<#{ elename }>"
+    elsif attrs.size == 1
+      key, value = attrs.shift
+      @buf << %Q[\n#{ @indent }<#{ elename } #{ key }="#{ value }">]
+    else
+      @buf << "\n#{ @indent }<#{ elename } " <<
+        attrs.collect { |key, value|
+          %Q[#{ key }="#{ value }"]
+        }.join("\n#{ @indent }#{ @indentstr * 2 }") <<
+	'>'
+    end
+  end
+
+  def encode_tag_end(elename, cr = nil)
+    if cr
+      @buf << "\n#{ @indent }</#{ elename }>"
+    else
+      @buf << "</#{ elename }>"
+    end
+  end
+
+  def encode_rawstring(str)
+    @buf << str
+  end
+
+  EncodeMap = {
+    '&' => '&amp;',
+    '<' => '&lt;',
+    '>' => '&gt;',
+    '"' => '&quot;',
+    '\'' => '&apos;',
+    "\r" => '&#xd;'
+  }
+  EncodeCharRegexp = Regexp.new("[#{EncodeMap.keys.join}]")
+  def encode_string(str)
+    if @use_numeric_character_reference and !XSD::Charset.is_us_ascii(str)
+      str.gsub!(EncodeCharRegexp) { |c| EncodeMap[c] }
+      @buf << str.unpack("U*").collect { |c|
+        if c == 0x9 or c == 0xa or c == 0xd or (c >= 0x20 and c <= 0x7f)
+          c.chr
+        else
+          sprintf("&#x%x;", c)
+        end
+      }.join
+    else
+      @buf << str.gsub(EncodeCharRegexp) { |c| EncodeMap[c] }
+    end
+  end
+
+  def element_local?(element)
+    element.elename.namespace.nil?
+  end
+
+  def element_qualified?(element)
+    if element.respond_to?(:qualified)
+      if element.qualified.nil?
+        @elementformdefault
+      else
+        element.qualified
+      end
+    else
+      @elementformdefault
+    end
+  end
+
+  def self.assign_ns(attrs, ns, namespace, tag = nil)
+    if namespace.nil?
+      raise FormatEncodeError.new("empty namespace")
+    end
+    unless ns.assigned?(namespace)
+      tag = ns.assign(namespace, tag)
+      if tag == ''
+        attr = 'xmlns'
+      else
+        attr = "xmlns:#{tag}"
+      end
+      attrs[attr] = namespace
+    end
+  end
+
+private
+
+  def prologue
+  end
+
+  def epilogue
+  end
+
+  def find_handler(encodingstyle)
+    unless @handlers.key?(encodingstyle)
+      handler = SOAP::EncodingStyle::Handler.handler(encodingstyle).new(@charset)
+      handler.generate_explicit_type = @generate_explicit_type
+      handler.encode_prologue
+      @handlers[encodingstyle] = handler
+    end
+    @handlers[encodingstyle]
+  end
+
+  def xmldecl
+    if @charset
+      %Q[<?xml version="1.0" encoding="#{ @charset }" ?>]
+    else
+      %Q[<?xml version="1.0" ?>]
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/header/handler.rb b/ruby_1_8_6/lib/soap/header/handler.rb
new file mode 100644
index 0000000000..7da2836e24
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/header/handler.rb
@@ -0,0 +1,57 @@
+# SOAP4R - SOAP Header handler item
+# Copyright (C) 2003, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/element'
+
+
+module SOAP
+module Header
+
+
+class Handler
+  attr_reader :elename
+  attr_reader :mustunderstand
+  attr_reader :encodingstyle
+
+  def initialize(elename)
+    @elename = elename
+    @mustunderstand = false
+    @encodingstyle = nil
+  end
+
+  # Should return a SOAP/OM, a SOAPHeaderItem or nil.
+  def on_outbound
+    nil
+  end
+
+  # Given header is a SOAPHeaderItem or nil.
+  def on_inbound(header, mustunderstand = false)
+    # do something.
+  end
+
+  def on_outbound_headeritem
+    item = on_outbound
+    if item.nil?
+      nil
+    elsif item.is_a?(::SOAP::SOAPHeaderItem)
+      item.elename = @elename
+      item
+    else
+      item.elename = @elename
+      ::SOAP::SOAPHeaderItem.new(item, @mustunderstand, @encodingstyle)
+    end
+  end
+
+  def on_inbound_headeritem(header)
+    on_inbound(header.element, header.mustunderstand)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/header/handlerset.rb b/ruby_1_8_6/lib/soap/header/handlerset.rb
new file mode 100644
index 0000000000..a8eee03023
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/header/handlerset.rb
@@ -0,0 +1,70 @@
+# SOAP4R - SOAP Header handler set
+# Copyright (C) 2003, 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/namedelements'
+
+
+module SOAP
+module Header
+
+
+class HandlerSet
+  def initialize
+    @store = XSD::NamedElements.new
+  end
+
+  def dup
+    obj = HandlerSet.new
+    obj.store = @store.dup
+    obj
+  end
+
+  def add(handler)
+    @store << handler
+  end
+  alias << add
+
+  def delete(handler)
+    @store.delete(handler)
+  end
+
+  def include?(handler)
+    @store.include?(handler)
+  end
+
+  # returns: Array of SOAPHeaderItem
+  def on_outbound
+    @store.collect { |handler|
+      handler.on_outbound_headeritem
+    }.compact
+  end
+
+  # headers: SOAPHeaderItem enumerable object
+  def on_inbound(headers)
+    headers.each do |name, item|
+      handler = @store.find { |handler|
+        handler.elename == item.element.elename
+      }
+      if handler
+        handler.on_inbound_headeritem(item)
+      elsif item.mustunderstand
+        raise UnhandledMustUnderstandHeaderError.new(item.element.elename.to_s)
+      end
+    end
+  end
+
+protected
+
+  def store=(store)
+    @store = store
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/header/simplehandler.rb b/ruby_1_8_6/lib/soap/header/simplehandler.rb
new file mode 100644
index 0000000000..7b206f77db
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/header/simplehandler.rb
@@ -0,0 +1,44 @@
+# SOAP4R - SOAP Simple header item handler
+# Copyright (C) 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/header/handler'
+require 'soap/baseData'
+
+
+module SOAP
+module Header
+
+
+class SimpleHandler < SOAP::Header::Handler
+  def initialize(elename)
+    super(elename)
+  end
+
+  # Should return a Hash, String or nil.
+  def on_simple_outbound
+    nil
+  end
+
+  # Given header is a Hash, String or nil.
+  def on_simple_inbound(header, mustunderstand)
+  end
+
+  def on_outbound
+    h = on_simple_outbound
+    h ? SOAPElement.from_obj(h, elename.namespace) : nil
+  end
+
+  def on_inbound(header, mustunderstand)
+    h = header.respond_to?(:to_obj) ? header.to_obj : header.data
+    on_simple_inbound(h, mustunderstand)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/httpconfigloader.rb b/ruby_1_8_6/lib/soap/httpconfigloader.rb
new file mode 100644
index 0000000000..cd7bca8a65
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/httpconfigloader.rb
@@ -0,0 +1,119 @@
+# SOAP4R - HTTP config loader.
+# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/property'
+
+
+module SOAP
+
+
+module HTTPConfigLoader
+module_function
+
+  def set_options(client, options)
+    client.proxy = options["proxy"]
+    options.add_hook("proxy") do |key, value|
+      client.proxy = value
+    end
+    client.no_proxy = options["no_proxy"]
+    options.add_hook("no_proxy") do |key, value|
+      client.no_proxy = value
+    end
+    if client.respond_to?(:protocol_version=)
+      client.protocol_version = options["protocol_version"]
+      options.add_hook("protocol_version") do |key, value|
+        client.protocol_version = value
+      end
+    end
+    ssl_config = options["ssl_config"] ||= ::SOAP::Property.new
+    set_ssl_config(client, ssl_config)
+    ssl_config.add_hook(true) do |key, value|
+      set_ssl_config(client, ssl_config)
+    end
+    basic_auth = options["basic_auth"] ||= ::SOAP::Property.new
+    set_basic_auth(client, basic_auth)
+    basic_auth.add_hook do |key, value|
+      set_basic_auth(client, basic_auth)
+    end
+    options.add_hook("connect_timeout") do |key, value|
+      client.connect_timeout = value
+    end
+    options.add_hook("send_timeout") do |key, value|
+      client.send_timeout = value
+    end
+    options.add_hook("receive_timeout") do |key, value|
+      client.receive_timeout = value
+    end
+  end
+
+  def set_basic_auth(client, basic_auth)
+    basic_auth.values.each do |url, userid, passwd|
+      client.set_basic_auth(url, userid, passwd)
+    end
+  end
+
+  def set_ssl_config(client, ssl_config)
+    ssl_config.each do |key, value|
+      cfg = client.ssl_config
+      if cfg.nil?
+        raise NotImplementedError.new("SSL not supported")
+      end
+      case key
+      when 'client_cert'
+        cfg.client_cert = cert_from_file(value)
+      when 'client_key'
+        cfg.client_key = key_from_file(value)
+      when 'client_ca'
+        cfg.client_ca = value
+      when 'ca_path'
+        cfg.set_trust_ca(value)
+      when 'ca_file'
+        cfg.set_trust_ca(value)
+      when 'crl'
+        cfg.set_crl(value)
+      when 'verify_mode'
+        cfg.verify_mode = ssl_config_int(value)
+      when 'verify_depth'
+        cfg.verify_depth = ssl_config_int(value)
+      when 'options'
+        cfg.options = value
+      when 'ciphers'
+        cfg.ciphers = value
+      when 'verify_callback'
+        cfg.verify_callback = value
+      when 'cert_store'
+        cfg.cert_store = value
+      else
+        raise ArgumentError.new("unknown ssl_config property #{key}")
+      end
+    end
+  end
+
+  def ssl_config_int(value)
+    if value.nil? or value.to_s.empty?
+      nil
+    else
+      begin
+        Integer(value)
+      rescue ArgumentError
+        ::SOAP::Property::Util.const_from_name(value.to_s)
+      end
+    end
+  end
+
+  def cert_from_file(filename)
+    OpenSSL::X509::Certificate.new(File.open(filename) { |f| f.read })
+  end
+
+  def key_from_file(filename)
+    OpenSSL::PKey::RSA.new(File.open(filename) { |f| f.read })
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/mapping.rb b/ruby_1_8_6/lib/soap/mapping.rb
new file mode 100644
index 0000000000..b83f8b484a
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/mapping.rb
@@ -0,0 +1,10 @@
+# SOAP4R - Ruby type mapping utility.
+# Copyright (C) 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/mapping/mapping'
+require 'soap/mapping/registry'
diff --git a/ruby_1_8_6/lib/soap/mapping/factory.rb b/ruby_1_8_6/lib/soap/mapping/factory.rb
new file mode 100644
index 0000000000..978b303b3d
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/mapping/factory.rb
@@ -0,0 +1,355 @@
+# SOAP4R - Mapping factory.
+# Copyright (C) 2000, 2001, 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module SOAP
+module Mapping
+
+
+class Factory
+  include TraverseSupport
+
+  def initialize
+    # nothing to do
+  end
+
+  def obj2soap(soap_class, obj, info, map)
+    raise NotImplementError.new
+    # return soap_obj
+  end
+
+  def soap2obj(obj_class, node, info, map)
+    raise NotImplementError.new
+    # return convert_succeeded_or_not, obj
+  end
+
+  def setiv2obj(obj, node, map)
+    return if node.nil?
+    if obj.is_a?(Array)
+      setiv2ary(obj, node, map)
+    else
+      setiv2struct(obj, node, map)
+    end
+  end
+
+  def setiv2soap(node, obj, map)
+    if obj.class.class_variables.include?('@@schema_element')
+      obj.class.class_eval('@@schema_element').each do |name, info|
+        type, qname = info
+        if qname
+          elename = qname.name
+        else
+          elename = Mapping.name2elename(name)
+        end
+        node.add(elename,
+          Mapping._obj2soap(obj.instance_variable_get('@' + name), map))
+      end
+    else
+      # should we sort instance_variables?
+      obj.instance_variables.each do |var|
+        name = var.sub(/^@/, '')
+        elename = Mapping.name2elename(name)
+        node.add(elename,
+          Mapping._obj2soap(obj.instance_variable_get(var), map))
+      end
+    end
+  end
+
+private
+
+  def setiv2ary(obj, node, map)
+    node.each do |name, value|
+      Array.instance_method(:<<).bind(obj).call(Mapping._soap2obj(value, map))
+    end
+  end
+
+  def setiv2struct(obj, node, map)
+    vars = {}
+    node.each do |name, value|
+      vars[Mapping.elename2name(name)] = Mapping._soap2obj(value, map)
+    end
+    Mapping.set_attributes(obj, vars)
+  end
+end
+
+class StringFactory_ < Factory
+  def initialize(allow_original_mapping = false)
+    super()
+    @allow_original_mapping = allow_original_mapping
+  end
+
+  def obj2soap(soap_class, obj, info, map)
+    if !@allow_original_mapping and !obj.instance_variables.empty?
+      return nil
+    end
+    begin
+      unless XSD::Charset.is_ces(obj, Thread.current[:SOAPExternalCES])
+        return nil
+      end
+      encoded = XSD::Charset.encoding_conv(obj,
+        Thread.current[:SOAPExternalCES], XSD::Charset.encoding)
+      soap_obj = soap_class.new(encoded)
+    rescue XSD::ValueSpaceError
+      return nil
+    end
+    mark_marshalled_obj(obj, soap_obj)
+    soap_obj
+  end
+
+  def soap2obj(obj_class, node, info, map)
+    obj = Mapping.create_empty_object(obj_class)
+    decoded = XSD::Charset.encoding_conv(node.data, XSD::Charset.encoding,
+      Thread.current[:SOAPExternalCES])
+    obj.replace(decoded)
+    mark_unmarshalled_obj(node, obj)
+    return true, obj
+  end
+end
+
+class BasetypeFactory_ < Factory
+  def initialize(allow_original_mapping = false)
+    super()
+    @allow_original_mapping = allow_original_mapping
+  end
+
+  def obj2soap(soap_class, obj, info, map)
+    if !@allow_original_mapping and !obj.instance_variables.empty?
+      return nil
+    end
+    soap_obj = nil
+    begin
+      soap_obj = soap_class.new(obj)
+    rescue XSD::ValueSpaceError
+      return nil
+    end
+    if @allow_original_mapping
+      # Basetype except String should not be multiref-ed in SOAP/1.1.
+      mark_marshalled_obj(obj, soap_obj)
+    end
+    soap_obj
+  end
+
+  def soap2obj(obj_class, node, info, map)
+    obj = node.data
+    mark_unmarshalled_obj(node, obj)
+    return true, obj
+  end
+end
+
+class DateTimeFactory_ < Factory
+  def initialize(allow_original_mapping = false)
+    super()
+    @allow_original_mapping = allow_original_mapping
+  end
+
+  def obj2soap(soap_class, obj, info, map)
+    if !@allow_original_mapping and
+	Time === obj and !obj.instance_variables.empty?
+      return nil
+    end
+    soap_obj = nil
+    begin
+      soap_obj = soap_class.new(obj)
+    rescue XSD::ValueSpaceError
+      return nil
+    end
+    mark_marshalled_obj(obj, soap_obj)
+    soap_obj
+  end
+
+  def soap2obj(obj_class, node, info, map)
+    if node.respond_to?(:to_obj)
+      obj = node.to_obj(obj_class)
+      return false if obj.nil?
+      mark_unmarshalled_obj(node, obj)
+      return true, obj
+    else
+      return false
+    end
+  end
+end
+
+class Base64Factory_ < Factory
+  def obj2soap(soap_class, obj, info, map)
+    return nil unless obj.instance_variables.empty?
+    soap_obj = soap_class.new(obj)
+    mark_marshalled_obj(obj, soap_obj) if soap_obj
+    soap_obj
+  end
+
+  def soap2obj(obj_class, node, info, map)
+    obj = node.string
+    mark_unmarshalled_obj(node, obj)
+    return true, obj
+  end
+end
+
+class URIFactory_ < Factory
+  def obj2soap(soap_class, obj, info, map)
+    soap_obj = soap_class.new(obj)
+    mark_marshalled_obj(obj, soap_obj) if soap_obj
+    soap_obj
+  end
+
+  def soap2obj(obj_class, node, info, map)
+    obj = node.data
+    mark_unmarshalled_obj(node, obj)
+    return true, obj
+  end
+end
+
+class ArrayFactory_ < Factory
+  def initialize(allow_original_mapping = false)
+    super()
+    @allow_original_mapping = allow_original_mapping
+  end
+
+  # [[1], [2]] is converted to Array of Array, not 2-D Array.
+  # To create M-D Array, you must call Mapping.ary2md.
+  def obj2soap(soap_class, obj, info, map)
+    if !@allow_original_mapping and !obj.instance_variables.empty?
+      return nil
+    end
+    arytype = Mapping.obj2element(obj)
+    if arytype.name
+      arytype.namespace ||= RubyTypeNamespace
+    else
+      arytype = XSD::AnyTypeName
+    end
+    soap_obj = SOAPArray.new(ValueArrayName, 1, arytype)
+    mark_marshalled_obj(obj, soap_obj)
+    obj.each do |item|
+      soap_obj.add(Mapping._obj2soap(item, map))
+    end
+    soap_obj
+  end
+
+  def soap2obj(obj_class, node, info, map)
+    obj = Mapping.create_empty_object(obj_class)
+    mark_unmarshalled_obj(node, obj)
+    node.soap2array(obj) do |elem|
+      elem ? Mapping._soap2obj(elem, map) : nil
+    end
+    return true, obj
+  end
+end
+
+class TypedArrayFactory_ < Factory
+  def initialize(allow_original_mapping = false)
+    super()
+    @allow_original_mapping = allow_original_mapping
+  end
+
+  def obj2soap(soap_class, obj, info, map)
+    if !@allow_original_mapping and !obj.instance_variables.empty?
+      return nil
+    end
+    arytype = info[:type] || info[0]
+    soap_obj = SOAPArray.new(ValueArrayName, 1, arytype)
+    mark_marshalled_obj(obj, soap_obj)
+    obj.each do |var|
+      soap_obj.add(Mapping._obj2soap(var, map))
+    end
+    soap_obj
+  end
+
+  def soap2obj(obj_class, node, info, map)
+    if node.rank > 1
+      return false
+    end
+    arytype = info[:type] || info[0]
+    unless node.arytype == arytype
+      return false
+    end
+    obj = Mapping.create_empty_object(obj_class)
+    mark_unmarshalled_obj(node, obj)
+    node.soap2array(obj) do |elem|
+      elem ? Mapping._soap2obj(elem, map) : nil
+    end
+    return true, obj
+  end
+end
+
+class TypedStructFactory_ < Factory
+  def obj2soap(soap_class, obj, info, map)
+    type = info[:type] || info[0]
+    soap_obj = soap_class.new(type)
+    mark_marshalled_obj(obj, soap_obj)
+    if obj.class <= SOAP::Marshallable
+      setiv2soap(soap_obj, obj, map)
+    else
+      setiv2soap(soap_obj, obj, map)
+    end
+    soap_obj
+  end
+
+  def soap2obj(obj_class, node, info, map)
+    type = info[:type] || info[0]
+    unless node.type == type
+      return false
+    end
+    obj = Mapping.create_empty_object(obj_class)
+    mark_unmarshalled_obj(node, obj)
+    setiv2obj(obj, node, map)
+    return true, obj
+  end
+end
+
+MapQName = XSD::QName.new(ApacheSOAPTypeNamespace, 'Map')
+class HashFactory_ < Factory
+  def initialize(allow_original_mapping = false)
+    super()
+    @allow_original_mapping = allow_original_mapping
+  end
+
+  def obj2soap(soap_class, obj, info, map)
+    if !@allow_original_mapping and !obj.instance_variables.empty?
+      return nil
+    end
+    if !obj.default.nil? or
+	(obj.respond_to?(:default_proc) and obj.default_proc)
+      return nil
+    end
+    soap_obj = SOAPStruct.new(MapQName)
+    mark_marshalled_obj(obj, soap_obj)
+    obj.each do |key, value|
+      elem = SOAPStruct.new
+      elem.add("key", Mapping._obj2soap(key, map))
+      elem.add("value", Mapping._obj2soap(value, map))
+      # ApacheAxis allows only 'item' here.
+      soap_obj.add("item", elem)
+    end
+    soap_obj
+  end
+
+  def soap2obj(obj_class, node, info, map)
+    unless node.type == MapQName
+      return false
+    end
+    if node.class == SOAPStruct and node.key?('default')
+      return false
+    end
+    obj = Mapping.create_empty_object(obj_class)
+    mark_unmarshalled_obj(node, obj)
+    if node.class == SOAPStruct
+      node.each do |key, value|
+	obj[Mapping._soap2obj(value['key'], map)] =
+	  Mapping._soap2obj(value['value'], map)
+      end
+    else
+      node.each do |value|
+	obj[Mapping._soap2obj(value['key'], map)] =
+	  Mapping._soap2obj(value['value'], map)
+      end
+    end
+    return true, obj
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/mapping/mapping.rb b/ruby_1_8_6/lib/soap/mapping/mapping.rb
new file mode 100644
index 0000000000..65d6bb4d5b
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/mapping/mapping.rb
@@ -0,0 +1,381 @@
+# SOAP4R - Ruby type mapping utility.
+# Copyright (C) 2000, 2001, 2003-2005  NAKAMURA Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/codegen/gensupport'
+
+
+module SOAP
+
+
+module Mapping
+  RubyTypeNamespace = 'http://www.ruby-lang.org/xmlns/ruby/type/1.6'
+  RubyTypeInstanceNamespace =
+    'http://www.ruby-lang.org/xmlns/ruby/type-instance'
+  RubyCustomTypeNamespace = 'http://www.ruby-lang.org/xmlns/ruby/type/custom'
+  ApacheSOAPTypeNamespace = 'http://xml.apache.org/xml-soap'
+
+
+  # TraverseSupport breaks following thread variables.
+  #   Thread.current[:SOAPMarshalDataKey]
+  module TraverseSupport
+    def mark_marshalled_obj(obj, soap_obj)
+      raise if obj.nil?
+      Thread.current[:SOAPMarshalDataKey][obj.__id__] = soap_obj
+    end
+
+    def mark_unmarshalled_obj(node, obj)
+      return if obj.nil?
+      # node.id is not Object#id but SOAPReference#id
+      Thread.current[:SOAPMarshalDataKey][node.id] = obj
+    end
+  end
+
+
+  EMPTY_OPT = {}
+  def self.obj2soap(obj, registry = nil, type = nil, opt = EMPTY_OPT)
+    registry ||= Mapping::DefaultRegistry
+    soap_obj = nil
+    protect_threadvars(:SOAPMarshalDataKey, :SOAPExternalCES, :SOAPMarshalNoReference) do
+      Thread.current[:SOAPMarshalDataKey] = {}
+      Thread.current[:SOAPExternalCES] = opt[:external_ces] || $KCODE
+      Thread.current[:SOAPMarshalNoReference] = opt[:no_reference]
+      soap_obj = _obj2soap(obj, registry, type)
+    end
+    soap_obj
+  end
+
+  def self.soap2obj(node, registry = nil, klass = nil, opt = EMPTY_OPT)
+    registry ||= Mapping::DefaultRegistry
+    obj = nil
+    protect_threadvars(:SOAPMarshalDataKey, :SOAPExternalCES, :SOAPMarshalNoReference) do
+      Thread.current[:SOAPMarshalDataKey] = {}
+      Thread.current[:SOAPExternalCES] = opt[:external_ces] || $KCODE
+      Thread.current[:SOAPMarshalNoReference] = opt[:no_reference]
+      obj = _soap2obj(node, registry, klass)
+    end
+    obj
+  end
+
+  def self.ary2soap(ary, type_ns = XSD::Namespace, typename = XSD::AnyTypeLiteral, registry = nil, opt = EMPTY_OPT)
+    registry ||= Mapping::DefaultRegistry
+    type = XSD::QName.new(type_ns, typename)
+    soap_ary = SOAPArray.new(ValueArrayName, 1, type)
+    protect_threadvars(:SOAPMarshalDataKey, :SOAPExternalCES, :SOAPMarshalNoReference) do
+      Thread.current[:SOAPMarshalDataKey] = {}
+      Thread.current[:SOAPExternalCES] = opt[:external_ces] || $KCODE
+      Thread.current[:SOAPMarshalNoReference] = opt[:no_reference]
+      ary.each do |ele|
+        soap_ary.add(_obj2soap(ele, registry, type))
+      end
+    end
+    soap_ary
+  end
+
+  def self.ary2md(ary, rank, type_ns = XSD::Namespace, typename = XSD::AnyTypeLiteral, registry = nil, opt = EMPTY_OPT)
+    registry ||= Mapping::DefaultRegistry
+    type = XSD::QName.new(type_ns, typename)
+    md_ary = SOAPArray.new(ValueArrayName, rank, type)
+    protect_threadvars(:SOAPMarshalDataKey, :SOAPExternalCES, :SOAPMarshalNoReference) do
+      Thread.current[:SOAPMarshalDataKey] = {}
+      Thread.current[:SOAPExternalCES] = opt[:external_ces] || $KCODE
+      Thread.current[:SOAPMarshalNoReference] = opt[:no_reference]
+      add_md_ary(md_ary, ary, [], registry)
+    end
+    md_ary
+  end
+
+  def self.fault2exception(fault, registry = nil)
+    registry ||= Mapping::DefaultRegistry
+    detail = if fault.detail
+        soap2obj(fault.detail, registry) || ""
+      else
+        ""
+      end
+    if detail.is_a?(Mapping::SOAPException)
+      begin
+        e = detail.to_e
+	remote_backtrace = e.backtrace
+        e.set_backtrace(nil)
+        raise e # ruby sets current caller as local backtrace of e => e2.
+      rescue Exception => e
+	e.set_backtrace(remote_backtrace + e.backtrace[1..-1])
+        raise
+      end
+    else
+      fault.detail = detail
+      fault.set_backtrace(
+        if detail.is_a?(Array)
+	  detail
+        else
+          [detail.to_s]
+        end
+      )
+      raise
+    end
+  end
+
+  def self._obj2soap(obj, registry, type = nil)
+    if referent = Thread.current[:SOAPMarshalDataKey][obj.__id__] and
+        !Thread.current[:SOAPMarshalNoReference]
+      SOAPReference.new(referent)
+    elsif registry
+      registry.obj2soap(obj, type)
+    else
+      raise MappingError.new("no mapping registry given")
+    end
+  end
+
+  def self._soap2obj(node, registry, klass = nil)
+    if node.nil?
+      return nil
+    elsif node.is_a?(SOAPReference)
+      target = node.__getobj__
+      # target.id is not Object#id but SOAPReference#id
+      if referent = Thread.current[:SOAPMarshalDataKey][target.id] and
+          !Thread.current[:SOAPMarshalNoReference]
+        return referent
+      else
+        return _soap2obj(target, registry, klass)
+      end
+    end
+    return registry.soap2obj(node, klass)
+  end
+
+  if Object.respond_to?(:allocate)
+    # ruby/1.7 or later.
+    def self.create_empty_object(klass)
+      klass.allocate
+    end
+  else
+    MARSHAL_TAG = {
+      String => ['"', 1],
+      Regexp => ['/', 2],
+      Array => ['[', 1],
+      Hash => ['{', 1]
+    }
+    def self.create_empty_object(klass)
+      if klass <= Struct
+	name = klass.name
+	return ::Marshal.load(sprintf("\004\006S:%c%s\000", name.length + 5, name))
+      end
+      if MARSHAL_TAG.has_key?(klass)
+	tag, terminate = MARSHAL_TAG[klass]
+	return ::Marshal.load(sprintf("\004\006%s%s", tag, "\000" * terminate))
+      end
+      MARSHAL_TAG.each do |k, v|
+	if klass < k
+	  name = klass.name
+	  tag, terminate = v
+	  return ::Marshal.load(sprintf("\004\006C:%c%s%s%s", name.length + 5, name, tag, "\000" * terminate))
+	end
+      end
+      name = klass.name
+      ::Marshal.load(sprintf("\004\006o:%c%s\000", name.length + 5, name))
+    end
+  end
+
+  # Allow only (Letter | '_') (Letter | Digit | '-' | '_')* here.
+  # Caution: '.' is not allowed here.
+  # To follow XML spec., it should be NCName.
+  #   (denied chars) => .[0-F][0-F]
+  #   ex. a.b => a.2eb
+  #
+  def self.name2elename(name)
+    name.gsub(/([^a-zA-Z0-9:_\-]+)/n) {
+      '.' << $1.unpack('H2' * $1.size).join('.')
+    }.gsub(/::/n, '..')
+  end
+
+  def self.elename2name(name)
+    name.gsub(/\.\./n, '::').gsub(/((?:\.[0-9a-fA-F]{2})+)/n) {
+      [$1.delete('.')].pack('H*')
+    }
+  end
+
+  def self.const_from_name(name, lenient = false)
+    const = ::Object
+    name.sub(/\A::/, '').split('::').each do |const_str|
+      if XSD::CodeGen::GenSupport.safeconstname?(const_str)
+        if const.const_defined?(const_str)
+          const = const.const_get(const_str)
+          next
+        end
+      elsif lenient
+        const_str = XSD::CodeGen::GenSupport.safeconstname(const_str)
+        if const.const_defined?(const_str)
+          const = const.const_get(const_str)
+          next
+        end
+      end
+      return nil
+    end
+    const
+  end
+
+  def self.class_from_name(name, lenient = false)
+    const = const_from_name(name, lenient)
+    if const.is_a?(::Class)
+      const
+    else
+      nil
+    end
+  end
+
+  def self.module_from_name(name, lenient = false)
+    const = const_from_name(name, lenient)
+    if const.is_a?(::Module)
+      const
+    else
+      nil
+    end
+  end
+
+  def self.class2qname(klass)
+    name = schema_type_definition(klass)
+    namespace = schema_ns_definition(klass)
+    XSD::QName.new(namespace, name)
+  end
+
+  def self.class2element(klass)
+    type = Mapping.class2qname(klass)
+    type.name ||= Mapping.name2elename(klass.name)
+    type.namespace ||= RubyCustomTypeNamespace
+    type
+  end
+
+  def self.obj2element(obj)
+    name = namespace = nil
+    ivars = obj.instance_variables
+    if ivars.include?('@schema_type')
+      name = obj.instance_variable_get('@schema_type')
+    end
+    if ivars.include?('@schema_ns')
+      namespace = obj.instance_variable_get('@schema_ns')
+    end
+    if !name or !namespace
+      class2qname(obj.class)
+    else
+      XSD::QName.new(namespace, name)
+    end
+  end
+
+  def self.define_singleton_method(obj, name, &block)
+    sclass = (class << obj; self; end)
+    sclass.class_eval {
+      define_method(name, &block)
+    }
+  end
+
+  def self.get_attribute(obj, attr_name)
+    if obj.is_a?(::Hash)
+      obj[attr_name] || obj[attr_name.intern]
+    else
+      name = XSD::CodeGen::GenSupport.safevarname(attr_name)
+      if obj.instance_variables.include?('@' + name)
+        obj.instance_variable_get('@' + name)
+      elsif ((obj.is_a?(::Struct) or obj.is_a?(Marshallable)) and
+          obj.respond_to?(name))
+        obj.__send__(name)
+      end
+    end
+  end
+
+  def self.set_attributes(obj, values)
+    if obj.is_a?(::SOAP::Mapping::Object)
+      values.each do |attr_name, value|
+        obj.__add_xmlele_value(attr_name, value)
+      end
+    else
+      values.each do |attr_name, value|
+        name = XSD::CodeGen::GenSupport.safevarname(attr_name)
+        setter = name + "="
+        if obj.respond_to?(setter)
+          obj.__send__(setter, value)
+        else
+          obj.instance_variable_set('@' + name, value)
+          begin
+            define_attr_accessor(obj, name,
+              proc { instance_variable_get('@' + name) },
+              proc { |value| instance_variable_set('@' + name, value) })
+          rescue TypeError
+            # singleton class may not exist (e.g. Float)
+          end
+        end
+      end
+    end
+  end
+
+  def self.define_attr_accessor(obj, name, getterproc, setterproc = nil)
+    define_singleton_method(obj, name, &getterproc)
+    define_singleton_method(obj, name + '=', &setterproc) if setterproc
+  end
+
+  def self.schema_type_definition(klass)
+    class_schema_variable(:schema_type, klass)
+  end
+
+  def self.schema_ns_definition(klass)
+    class_schema_variable(:schema_ns, klass)
+  end
+
+  def self.schema_element_definition(klass)
+    schema_element = class_schema_variable(:schema_element, klass) or return nil
+    schema_ns = schema_ns_definition(klass)
+    elements = []
+    as_array = []
+    schema_element.each do |varname, definition|
+      class_name, name = definition
+      if /\[\]$/ =~ class_name
+        class_name = class_name.sub(/\[\]$/, '')
+        as_array << (name ? name.name : varname)
+      end
+      elements << [name || XSD::QName.new(schema_ns, varname), class_name]
+    end
+    [elements, as_array]
+  end
+
+  def self.schema_attribute_definition(klass)
+    class_schema_variable(:schema_attribute, klass)
+  end
+
+  class << Mapping
+  private
+
+    def class_schema_variable(sym, klass)
+      var = "@@#{sym}"
+      klass.class_variables.include?(var) ? klass.class_eval(var) : nil
+    end
+
+    def protect_threadvars(*symbols)
+      backup = {}
+      begin
+        symbols.each do |sym|
+          backup[sym] = Thread.current[sym]
+        end
+        yield
+      ensure
+        symbols.each do |sym|
+          Thread.current[sym] = backup[sym]
+        end
+      end
+    end
+
+    def add_md_ary(md_ary, ary, indices, registry)
+      for idx in 0..(ary.size - 1)
+        if ary[idx].is_a?(Array)
+          add_md_ary(md_ary, ary[idx], indices + [idx], registry)
+        else
+          md_ary[*(indices + [idx])] = _obj2soap(ary[idx], registry)
+        end
+      end
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/mapping/registry.rb b/ruby_1_8_6/lib/soap/mapping/registry.rb
new file mode 100644
index 0000000000..823e80666d
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/mapping/registry.rb
@@ -0,0 +1,541 @@
+# SOAP4R - Mapping registry.
+# Copyright (C) 2000, 2001, 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/baseData'
+require 'soap/mapping/mapping'
+require 'soap/mapping/typeMap'
+require 'soap/mapping/factory'
+require 'soap/mapping/rubytypeFactory'
+
+
+module SOAP
+
+
+module Marshallable
+  # @@type_ns = Mapping::RubyCustomTypeNamespace
+end
+
+
+module Mapping
+
+  
+module MappedException; end
+
+
+RubyTypeName = XSD::QName.new(RubyTypeInstanceNamespace, 'rubyType')
+RubyExtendName = XSD::QName.new(RubyTypeInstanceNamespace, 'extends')
+RubyIVarName = XSD::QName.new(RubyTypeInstanceNamespace, 'ivars')
+
+
+# Inner class to pass an exception.
+class SOAPException; include Marshallable
+  attr_reader :excn_type_name, :cause
+  def initialize(e)
+    @excn_type_name = Mapping.name2elename(e.class.to_s)
+    @cause = e
+  end
+
+  def to_e
+    if @cause.is_a?(::Exception)
+      @cause.extend(::SOAP::Mapping::MappedException)
+      return @cause
+    elsif @cause.respond_to?(:message) and @cause.respond_to?(:backtrace)
+      e = RuntimeError.new(@cause.message)
+      e.set_backtrace(@cause.backtrace)
+      return e
+    end
+    klass = Mapping.class_from_name(Mapping.elename2name(@excn_type_name.to_s))
+    if klass.nil? or not klass <= ::Exception
+      return RuntimeError.new(@cause.inspect)
+    end
+    obj = klass.new(@cause.message)
+    obj.extend(::SOAP::Mapping::MappedException)
+    obj
+  end
+end
+
+
+# For anyType object: SOAP::Mapping::Object not ::Object
+class Object; include Marshallable
+  def initialize
+    @__xmlele_type = {}
+    @__xmlele = []
+    @__xmlattr = {}
+  end
+
+  def inspect
+    sprintf("#<%s:0x%x%s>", self.class.name, __id__,
+      @__xmlele.collect { |name, value| " #{name}=#{value.inspect}" }.join)
+  end
+
+  def __xmlattr
+    @__xmlattr
+  end
+
+  def __xmlele
+    @__xmlele
+  end
+
+  def [](qname)
+    unless qname.is_a?(XSD::QName)
+      qname = XSD::QName.new(nil, qname)
+    end
+    @__xmlele.each do |k, v|
+      return v if k == qname
+    end
+    # fallback
+    @__xmlele.each do |k, v|
+      return v if k.name == qname.name
+    end
+    nil
+  end
+
+  def []=(qname, value)
+    unless qname.is_a?(XSD::QName)
+      qname = XSD::QName.new(nil, qname)
+    end
+    found = false
+    @__xmlele.each do |pair|
+      if pair[0] == qname
+        found = true
+        pair[1] = value
+      end
+    end
+    unless found
+      __define_attr_accessor(qname)
+      @__xmlele << [qname, value]
+    end
+    @__xmlele_type[qname] = :single
+  end
+
+  def __add_xmlele_value(qname, value)
+    found = false
+    @__xmlele.map! do |k, v|
+      if k == qname
+        found = true
+        [k, __set_xmlele_value(k, v, value)]
+      else
+        [k, v]
+      end
+    end
+    unless found
+      __define_attr_accessor(qname)
+      @__xmlele << [qname, value]
+      @__xmlele_type[qname] = :single
+    end
+    value
+  end
+
+private
+
+  if RUBY_VERSION > "1.7.0"
+    def __define_attr_accessor(qname)
+      name = XSD::CodeGen::GenSupport.safemethodname(qname.name)
+      Mapping.define_attr_accessor(self, name,
+        proc { self[qname] },
+        proc { |value| self[qname] = value })
+    end
+  else
+    def __define_attr_accessor(qname)
+      name = XSD::CodeGen::GenSupport.safemethodname(qname.name)
+      instance_eval <<-EOS
+        def #{name}
+          self[#{qname.dump}]
+        end
+
+        def #{name}=(value)
+          self[#{qname.dump}] = value
+        end
+      EOS
+    end
+  end
+
+  def __set_xmlele_value(key, org, value)
+    case @__xmlele_type[key]
+    when :multi
+      org << value
+      org
+    when :single
+      @__xmlele_type[key] = :multi
+      [org, value]
+    else
+      raise RuntimeError.new("unknown type")
+    end
+  end
+end
+
+
+class MappingError < Error; end
+
+
+class Registry
+  class Map
+    def initialize(registry)
+      @obj2soap = {}
+      @soap2obj = {}
+      @registry = registry
+    end
+
+    def obj2soap(obj)
+      klass = obj.class
+      if map = @obj2soap[klass]
+        map.each do |soap_class, factory, info|
+          ret = factory.obj2soap(soap_class, obj, info, @registry)
+          return ret if ret
+        end
+      end
+      ancestors = klass.ancestors
+      ancestors.delete(klass)
+      ancestors.delete(::Object)
+      ancestors.delete(::Kernel)
+      ancestors.each do |klass|
+        if map = @obj2soap[klass]
+          map.each do |soap_class, factory, info|
+            if info[:derived_class]
+              ret = factory.obj2soap(soap_class, obj, info, @registry)
+              return ret if ret
+            end
+          end
+        end
+      end
+      nil
+    end
+
+    def soap2obj(node, klass = nil)
+      if map = @soap2obj[node.class]
+        map.each do |obj_class, factory, info|
+          next if klass and obj_class != klass
+          conv, obj = factory.soap2obj(obj_class, node, info, @registry)
+          return true, obj if conv
+        end
+      end
+      return false, nil
+    end
+
+    # Give priority to former entry.
+    def init(init_map = [])
+      clear
+      init_map.reverse_each do |obj_class, soap_class, factory, info|
+        add(obj_class, soap_class, factory, info)
+      end
+    end
+
+    # Give priority to latter entry.
+    def add(obj_class, soap_class, factory, info)
+      info ||= {}
+      (@obj2soap[obj_class] ||= []).unshift([soap_class, factory, info])
+      (@soap2obj[soap_class] ||= []).unshift([obj_class, factory, info])
+    end
+
+    def clear
+      @obj2soap.clear
+      @soap2obj.clear
+    end
+
+    def find_mapped_soap_class(target_obj_class)
+      map = @obj2soap[target_obj_class]
+      map.empty? ? nil : map[0][1]
+    end
+
+    def find_mapped_obj_class(target_soap_class)
+      map = @soap2obj[target_soap_class]
+      map.empty? ? nil : map[0][0]
+    end
+  end
+
+  StringFactory = StringFactory_.new
+  BasetypeFactory = BasetypeFactory_.new
+  DateTimeFactory = DateTimeFactory_.new
+  ArrayFactory = ArrayFactory_.new
+  Base64Factory = Base64Factory_.new
+  URIFactory = URIFactory_.new
+  TypedArrayFactory = TypedArrayFactory_.new
+  TypedStructFactory = TypedStructFactory_.new
+
+  HashFactory = HashFactory_.new
+
+  SOAPBaseMap = [
+    [::NilClass,     ::SOAP::SOAPNil,        BasetypeFactory],
+    [::TrueClass,    ::SOAP::SOAPBoolean,    BasetypeFactory],
+    [::FalseClass,   ::SOAP::SOAPBoolean,    BasetypeFactory],
+    [::String,       ::SOAP::SOAPString,     StringFactory],
+    [::DateTime,     ::SOAP::SOAPDateTime,   DateTimeFactory],
+    [::Date,         ::SOAP::SOAPDate,       DateTimeFactory],
+    [::Time,         ::SOAP::SOAPDateTime,   DateTimeFactory],
+    [::Time,         ::SOAP::SOAPTime,       DateTimeFactory],
+    [::Float,        ::SOAP::SOAPDouble,     BasetypeFactory,
+      {:derived_class => true}],
+    [::Float,        ::SOAP::SOAPFloat,      BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPInt,        BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPLong,       BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPInteger,    BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPShort,      BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPByte,       BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPNonPositiveInteger, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPNegativeInteger, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPNonNegativeInteger, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPPositiveInteger, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPUnsignedLong, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPUnsignedInt, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPUnsignedShort, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPUnsignedByte, BasetypeFactory,
+      {:derived_class => true}],
+    [::URI::Generic, ::SOAP::SOAPAnyURI,     URIFactory,
+      {:derived_class => true}],
+    [::String,       ::SOAP::SOAPBase64,     Base64Factory],
+    [::String,       ::SOAP::SOAPHexBinary,  Base64Factory],
+    [::String,       ::SOAP::SOAPDecimal,    BasetypeFactory],
+    [::String,       ::SOAP::SOAPDuration,   BasetypeFactory],
+    [::String,       ::SOAP::SOAPGYearMonth, BasetypeFactory],
+    [::String,       ::SOAP::SOAPGYear,      BasetypeFactory],
+    [::String,       ::SOAP::SOAPGMonthDay,  BasetypeFactory],
+    [::String,       ::SOAP::SOAPGDay,       BasetypeFactory],
+    [::String,       ::SOAP::SOAPGMonth,     BasetypeFactory],
+    [::String,       ::SOAP::SOAPQName,      BasetypeFactory],
+
+    [::Hash,         ::SOAP::SOAPArray,      HashFactory],
+    [::Hash,         ::SOAP::SOAPStruct,     HashFactory],
+
+    [::Array,        ::SOAP::SOAPArray,      ArrayFactory,
+      {:derived_class => true}],
+
+    [::SOAP::Mapping::SOAPException,
+		     ::SOAP::SOAPStruct,     TypedStructFactory,
+      {:type => XSD::QName.new(RubyCustomTypeNamespace, "SOAPException")}],
+ ]
+
+  RubyOriginalMap = [
+    [::NilClass,     ::SOAP::SOAPNil,        BasetypeFactory],
+    [::TrueClass,    ::SOAP::SOAPBoolean,    BasetypeFactory],
+    [::FalseClass,   ::SOAP::SOAPBoolean,    BasetypeFactory],
+    [::String,       ::SOAP::SOAPString,     StringFactory],
+    [::DateTime,     ::SOAP::SOAPDateTime,   DateTimeFactory],
+    [::Date,         ::SOAP::SOAPDate,       DateTimeFactory],
+    [::Time,         ::SOAP::SOAPDateTime,   DateTimeFactory],
+    [::Time,         ::SOAP::SOAPTime,       DateTimeFactory],
+    [::Float,        ::SOAP::SOAPDouble,     BasetypeFactory,
+      {:derived_class => true}],
+    [::Float,        ::SOAP::SOAPFloat,      BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPInt,        BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPLong,       BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPInteger,    BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPShort,      BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPByte,       BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPNonPositiveInteger, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPNegativeInteger, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPNonNegativeInteger, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPPositiveInteger, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPUnsignedLong, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPUnsignedInt, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPUnsignedShort, BasetypeFactory,
+      {:derived_class => true}],
+    [::Integer,      ::SOAP::SOAPUnsignedByte, BasetypeFactory,
+      {:derived_class => true}],
+    [::URI::Generic, ::SOAP::SOAPAnyURI,     URIFactory,
+      {:derived_class => true}],
+    [::String,       ::SOAP::SOAPBase64,     Base64Factory],
+    [::String,       ::SOAP::SOAPHexBinary,  Base64Factory],
+    [::String,       ::SOAP::SOAPDecimal,    BasetypeFactory],
+    [::String,       ::SOAP::SOAPDuration,   BasetypeFactory],
+    [::String,       ::SOAP::SOAPGYearMonth, BasetypeFactory],
+    [::String,       ::SOAP::SOAPGYear,      BasetypeFactory],
+    [::String,       ::SOAP::SOAPGMonthDay,  BasetypeFactory],
+    [::String,       ::SOAP::SOAPGDay,       BasetypeFactory],
+    [::String,       ::SOAP::SOAPGMonth,     BasetypeFactory],
+    [::String,       ::SOAP::SOAPQName,      BasetypeFactory],
+
+    [::Hash,         ::SOAP::SOAPArray,      HashFactory],
+    [::Hash,         ::SOAP::SOAPStruct,     HashFactory],
+
+    # Does not allow Array's subclass here.
+    [::Array,        ::SOAP::SOAPArray,      ArrayFactory],
+
+    [::SOAP::Mapping::SOAPException,
+                     ::SOAP::SOAPStruct,     TypedStructFactory,
+      {:type => XSD::QName.new(RubyCustomTypeNamespace, "SOAPException")}],
+  ]
+
+  attr_accessor :default_factory
+  attr_accessor :excn_handler_obj2soap
+  attr_accessor :excn_handler_soap2obj
+
+  def initialize(config = {})
+    @config = config
+    @map = Map.new(self)
+    if @config[:allow_original_mapping]
+      @allow_original_mapping = true
+      @map.init(RubyOriginalMap)
+    else
+      @allow_original_mapping = false
+      @map.init(SOAPBaseMap)
+    end
+    @allow_untyped_struct = @config.key?(:allow_untyped_struct) ?
+      @config[:allow_untyped_struct] : true
+    @rubytype_factory = RubytypeFactory.new(
+      :allow_untyped_struct => @allow_untyped_struct,
+      :allow_original_mapping => @allow_original_mapping
+    )
+    @default_factory = @rubytype_factory
+    @excn_handler_obj2soap = nil
+    @excn_handler_soap2obj = nil
+  end
+
+  def add(obj_class, soap_class, factory, info = nil)
+    @map.add(obj_class, soap_class, factory, info)
+  end
+  alias set add
+
+  # general Registry ignores type_qname
+  def obj2soap(obj, type_qname = nil)
+    soap = _obj2soap(obj)
+    if @allow_original_mapping
+      addextend2soap(soap, obj)
+    end
+    soap
+  end
+
+  def soap2obj(node, klass = nil)
+    obj = _soap2obj(node, klass)
+    if @allow_original_mapping
+      addextend2obj(obj, node.extraattr[RubyExtendName])
+      addiv2obj(obj, node.extraattr[RubyIVarName])
+    end
+    obj
+  end
+
+  def find_mapped_soap_class(obj_class)
+    @map.find_mapped_soap_class(obj_class)
+  end
+
+  def find_mapped_obj_class(soap_class)
+    @map.find_mapped_obj_class(soap_class)
+  end
+
+private
+
+  def _obj2soap(obj)
+    ret = nil
+    if obj.is_a?(SOAPStruct) or obj.is_a?(SOAPArray)
+      obj.replace do |ele|
+        Mapping._obj2soap(ele, self)
+      end
+      return obj
+    elsif obj.is_a?(SOAPBasetype)
+      return obj
+    end
+    begin 
+      ret = @map.obj2soap(obj) ||
+        @default_factory.obj2soap(nil, obj, nil, self)
+      return ret if ret
+    rescue MappingError
+    end
+    if @excn_handler_obj2soap
+      ret = @excn_handler_obj2soap.call(obj) { |yield_obj|
+        Mapping._obj2soap(yield_obj, self)
+      }
+      return ret if ret
+    end
+    raise MappingError.new("Cannot map #{ obj.class.name } to SOAP/OM.")
+  end
+
+  # Might return nil as a mapping result.
+  def _soap2obj(node, klass = nil)
+    if node.extraattr.key?(RubyTypeName)
+      conv, obj = @rubytype_factory.soap2obj(nil, node, nil, self)
+      return obj if conv
+    else
+      conv, obj = @map.soap2obj(node, klass)
+      return obj if conv
+      conv, obj = @default_factory.soap2obj(nil, node, nil, self)
+      return obj if conv
+    end
+    if @excn_handler_soap2obj
+      begin
+        return @excn_handler_soap2obj.call(node) { |yield_node|
+	    Mapping._soap2obj(yield_node, self)
+	  }
+      rescue Exception
+      end
+    end
+    raise MappingError.new("Cannot map #{ node.type.name } to Ruby object.")
+  end
+
+  def addiv2obj(obj, attr)
+    return unless attr
+    vars = {}
+    attr.__getobj__.each do |name, value|
+      vars[name] = Mapping._soap2obj(value, self)
+    end
+    Mapping.set_attributes(obj, vars)
+  end
+
+  if RUBY_VERSION >= '1.8.0'
+    def addextend2obj(obj, attr)
+      return unless attr
+      attr.split(/ /).reverse_each do |mstr|
+	obj.extend(Mapping.module_from_name(mstr))
+      end
+    end
+  else
+    # (class < false; self; end).ancestors includes "TrueClass" under 1.6...
+    def addextend2obj(obj, attr)
+      return unless attr
+      attr.split(/ /).reverse_each do |mstr|
+	m = Mapping.module_from_name(mstr)
+	obj.extend(m)
+      end
+    end
+  end
+
+  def addextend2soap(node, obj)
+    return if obj.is_a?(Symbol) or obj.is_a?(Fixnum)
+    list = (class << obj; self; end).ancestors - obj.class.ancestors
+    unless list.empty?
+      node.extraattr[RubyExtendName] = list.collect { |c|
+	if c.name.empty?
+  	  raise TypeError.new("singleton can't be dumped #{ obj }")
+   	end
+	c.name
+      }.join(" ")
+    end
+  end
+
+end
+
+
+DefaultRegistry = Registry.new
+RubyOriginalRegistry = Registry.new(:allow_original_mapping => true)
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/mapping/rubytypeFactory.rb b/ruby_1_8_6/lib/soap/mapping/rubytypeFactory.rb
new file mode 100644
index 0000000000..61c21d8b20
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/mapping/rubytypeFactory.rb
@@ -0,0 +1,475 @@
+# SOAP4R - Ruby type mapping factory.
+# Copyright (C) 2000-2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module SOAP
+module Mapping
+
+
+class RubytypeFactory < Factory
+  TYPE_STRING = XSD::QName.new(RubyTypeNamespace, 'String')
+  TYPE_TIME = XSD::QName.new(RubyTypeNamespace, 'Time')
+  TYPE_ARRAY = XSD::QName.new(RubyTypeNamespace, 'Array')
+  TYPE_REGEXP = XSD::QName.new(RubyTypeNamespace, 'Regexp')
+  TYPE_RANGE = XSD::QName.new(RubyTypeNamespace, 'Range')
+  TYPE_CLASS = XSD::QName.new(RubyTypeNamespace, 'Class')
+  TYPE_MODULE = XSD::QName.new(RubyTypeNamespace, 'Module')
+  TYPE_SYMBOL = XSD::QName.new(RubyTypeNamespace, 'Symbol')
+  TYPE_STRUCT = XSD::QName.new(RubyTypeNamespace, 'Struct')
+  TYPE_HASH = XSD::QName.new(RubyTypeNamespace, 'Map')
+
+  def initialize(config = {})
+    @config = config
+    @allow_untyped_struct = @config.key?(:allow_untyped_struct) ?
+      @config[:allow_untyped_struct] : true
+    @allow_original_mapping = @config.key?(:allow_original_mapping) ?
+      @config[:allow_original_mapping] : false
+    @string_factory = StringFactory_.new(true)
+    @basetype_factory = BasetypeFactory_.new(true)
+    @datetime_factory = DateTimeFactory_.new(true)
+    @array_factory = ArrayFactory_.new(true)
+    @hash_factory = HashFactory_.new(true)
+  end
+
+  def obj2soap(soap_class, obj, info, map)
+    param = nil
+    case obj
+    when ::String
+      unless @allow_original_mapping
+        return nil
+      end
+      param = @string_factory.obj2soap(SOAPString, obj, info, map)
+      if obj.class != String
+        param.extraattr[RubyTypeName] = obj.class.name
+      end
+      addiv2soapattr(param, obj, map)
+    when ::Time
+      unless @allow_original_mapping
+        return nil
+      end
+      param = @datetime_factory.obj2soap(SOAPDateTime, obj, info, map)
+      if obj.class != Time
+        param.extraattr[RubyTypeName] = obj.class.name
+      end
+      addiv2soapattr(param, obj, map)
+    when ::Array
+      unless @allow_original_mapping
+        return nil
+      end
+      param = @array_factory.obj2soap(nil, obj, info, map)
+      if obj.class != Array
+        param.extraattr[RubyTypeName] = obj.class.name
+      end
+      addiv2soapattr(param, obj, map)
+    when ::NilClass
+      unless @allow_original_mapping
+        return nil
+      end
+      param = @basetype_factory.obj2soap(SOAPNil, obj, info, map)
+      addiv2soapattr(param, obj, map)
+    when ::FalseClass, ::TrueClass
+      unless @allow_original_mapping
+        return nil
+      end
+      param = @basetype_factory.obj2soap(SOAPBoolean, obj, info, map)
+      addiv2soapattr(param, obj, map)
+    when ::Integer
+      unless @allow_original_mapping
+        return nil
+      end
+      param = @basetype_factory.obj2soap(SOAPInt, obj, info, map)
+      param ||= @basetype_factory.obj2soap(SOAPInteger, obj, info, map)
+      param ||= @basetype_factory.obj2soap(SOAPDecimal, obj, info, map)
+      addiv2soapattr(param, obj, map)
+    when ::Float
+      unless @allow_original_mapping
+        return nil
+      end
+      param = @basetype_factory.obj2soap(SOAPDouble, obj, info, map)
+      if obj.class != Float
+        param.extraattr[RubyTypeName] = obj.class.name
+      end
+      addiv2soapattr(param, obj, map)
+    when ::Hash
+      unless @allow_original_mapping
+        return nil
+      end
+      if obj.respond_to?(:default_proc) && obj.default_proc
+        raise TypeError.new("cannot dump hash with default proc")
+      end
+      param = SOAPStruct.new(TYPE_HASH)
+      mark_marshalled_obj(obj, param)
+      if obj.class != Hash
+        param.extraattr[RubyTypeName] = obj.class.name
+      end
+      obj.each do |key, value|
+        elem = SOAPStruct.new # Undefined type.
+        elem.add("key", Mapping._obj2soap(key, map))
+        elem.add("value", Mapping._obj2soap(value, map))
+        param.add("item", elem)
+      end
+      param.add('default', Mapping._obj2soap(obj.default, map))
+      addiv2soapattr(param, obj, map)
+    when ::Regexp
+      unless @allow_original_mapping
+        return nil
+      end
+      param = SOAPStruct.new(TYPE_REGEXP)
+      mark_marshalled_obj(obj, param)
+      if obj.class != Regexp
+        param.extraattr[RubyTypeName] = obj.class.name
+      end
+      param.add('source', SOAPBase64.new(obj.source))
+      if obj.respond_to?('options')
+        # Regexp#options is from Ruby/1.7
+        options = obj.options
+      else
+        options = 0
+        obj.inspect.sub(/^.*\//, '').each_byte do |c|
+          options += case c
+            when ?i
+              1
+            when ?x
+              2
+            when ?m
+              4
+            when ?n
+              16
+            when ?e
+              32
+            when ?s
+              48
+            when ?u
+              64
+            end
+        end
+      end
+      param.add('options', SOAPInt.new(options))
+      addiv2soapattr(param, obj, map)
+    when ::Range
+      unless @allow_original_mapping
+        return nil
+      end
+      param = SOAPStruct.new(TYPE_RANGE)
+      mark_marshalled_obj(obj, param)
+      if obj.class != Range
+        param.extraattr[RubyTypeName] = obj.class.name
+      end
+      param.add('begin', Mapping._obj2soap(obj.begin, map))
+      param.add('end', Mapping._obj2soap(obj.end, map))
+      param.add('exclude_end', SOAP::SOAPBoolean.new(obj.exclude_end?))
+      addiv2soapattr(param, obj, map)
+    when ::Class
+      unless @allow_original_mapping
+        return nil
+      end
+      if obj.to_s[0] == ?#
+        raise TypeError.new("can't dump anonymous class #{obj}")
+      end
+      param = SOAPStruct.new(TYPE_CLASS)
+      mark_marshalled_obj(obj, param)
+      param.add('name', SOAPString.new(obj.name))
+      addiv2soapattr(param, obj, map)
+    when ::Module
+      unless @allow_original_mapping
+        return nil
+      end
+      if obj.to_s[0] == ?#
+        raise TypeError.new("can't dump anonymous module #{obj}")
+      end
+      param = SOAPStruct.new(TYPE_MODULE)
+      mark_marshalled_obj(obj, param)
+      param.add('name', SOAPString.new(obj.name))
+      addiv2soapattr(param, obj, map)
+    when ::Symbol
+      unless @allow_original_mapping
+        return nil
+      end
+      param = SOAPStruct.new(TYPE_SYMBOL)
+      mark_marshalled_obj(obj, param)
+      param.add('id', SOAPString.new(obj.id2name))
+      addiv2soapattr(param, obj, map)
+    when ::Struct
+      unless @allow_original_mapping
+        # treat it as an user defined class. [ruby-talk:104980]
+        #param = unknownobj2soap(soap_class, obj, info, map)
+        param = SOAPStruct.new(XSD::AnyTypeName)
+        mark_marshalled_obj(obj, param)
+        obj.members.each do |member|
+          param.add(Mapping.name2elename(member),
+            Mapping._obj2soap(obj[member], map))
+        end
+      else
+        param = SOAPStruct.new(TYPE_STRUCT)
+        mark_marshalled_obj(obj, param)
+        param.add('type', ele_type = SOAPString.new(obj.class.to_s))
+        ele_member = SOAPStruct.new
+        obj.members.each do |member|
+          ele_member.add(Mapping.name2elename(member),
+            Mapping._obj2soap(obj[member], map))
+        end
+        param.add('member', ele_member)
+        addiv2soapattr(param, obj, map)
+      end
+    when ::IO, ::Binding, ::Continuation, ::Data, ::Dir, ::File::Stat,
+        ::MatchData, Method, ::Proc, ::Thread, ::ThreadGroup
+        # from 1.8: Process::Status, UnboundMethod
+      return nil
+    when ::SOAP::Mapping::Object
+      param = SOAPStruct.new(XSD::AnyTypeName)
+      mark_marshalled_obj(obj, param)
+      obj.__xmlele.each do |key, value|
+        param.add(key.name, Mapping._obj2soap(value, map))
+      end
+      obj.__xmlattr.each do |key, value|
+        param.extraattr[key] = value
+      end
+    when ::Exception
+      typestr = Mapping.name2elename(obj.class.to_s)
+      param = SOAPStruct.new(XSD::QName.new(RubyTypeNamespace, typestr))
+      mark_marshalled_obj(obj, param)
+      param.add('message', Mapping._obj2soap(obj.message, map))
+      param.add('backtrace', Mapping._obj2soap(obj.backtrace, map))
+      addiv2soapattr(param, obj, map)
+    else
+      param = unknownobj2soap(soap_class, obj, info, map)
+    end
+    param
+  end
+
+  def soap2obj(obj_class, node, info, map)
+    rubytype = node.extraattr[RubyTypeName]
+    if rubytype or node.type.namespace == RubyTypeNamespace
+      rubytype2obj(node, info, map, rubytype)
+    elsif node.type == XSD::AnyTypeName or node.type == XSD::AnySimpleTypeName
+      anytype2obj(node, info, map)
+    else
+      unknowntype2obj(node, info, map)
+    end
+  end
+
+private
+
+  def addiv2soapattr(node, obj, map)
+    return if obj.instance_variables.empty?
+    ivars = SOAPStruct.new    # Undefined type.
+    setiv2soap(ivars, obj, map)
+    node.extraattr[RubyIVarName] = ivars
+  end
+
+  def unknownobj2soap(soap_class, obj, info, map)
+    if obj.class.name.empty?
+      raise TypeError.new("can't dump anonymous class #{obj}")
+    end
+    singleton_class = class << obj; self; end
+    if !singleton_methods_true(obj).empty? or
+	!singleton_class.instance_variables.empty?
+      raise TypeError.new("singleton can't be dumped #{obj}")
+    end
+    if !(singleton_class.ancestors - obj.class.ancestors).empty?
+      typestr = Mapping.name2elename(obj.class.to_s)
+      type = XSD::QName.new(RubyTypeNamespace, typestr)
+    else
+      type = Mapping.class2element(obj.class)
+    end
+    param = SOAPStruct.new(type)
+    mark_marshalled_obj(obj, param)
+    setiv2soap(param, obj, map)
+    param
+  end
+
+  if RUBY_VERSION >= '1.8.0'
+    def singleton_methods_true(obj)
+      obj.singleton_methods(true)
+    end
+  else
+    def singleton_methods_true(obj)
+      obj.singleton_methods
+    end
+  end
+
+  def rubytype2obj(node, info, map, rubytype)
+    klass = rubytype ? Mapping.class_from_name(rubytype) : nil
+    obj = nil
+    case node
+    when SOAPString
+      return @string_factory.soap2obj(klass || String, node, info, map)
+    when SOAPDateTime
+      #return @datetime_factory.soap2obj(klass || Time, node, info, map)
+      klass ||= Time
+      t = node.to_time
+      arg = [t.year, t.month, t.mday, t.hour, t.min, t.sec, t.usec]
+      obj = t.gmt? ? klass.gm(*arg) : klass.local(*arg)
+      mark_unmarshalled_obj(node, obj)
+      return true, obj
+    when SOAPArray
+      return @array_factory.soap2obj(klass || Array, node, info, map)
+    when SOAPNil, SOAPBoolean, SOAPInt, SOAPInteger, SOAPDecimal, SOAPDouble
+      return @basetype_factory.soap2obj(nil, node, info, map)
+    when SOAPStruct
+      return rubytypestruct2obj(node, info, map, rubytype)
+    else
+      raise
+    end
+  end
+
+  def rubytypestruct2obj(node, info, map, rubytype)
+    klass = rubytype ? Mapping.class_from_name(rubytype) : nil
+    obj = nil
+    case node.type
+    when TYPE_HASH
+      klass = rubytype ? Mapping.class_from_name(rubytype) : Hash
+      obj = Mapping.create_empty_object(klass)
+      mark_unmarshalled_obj(node, obj)
+      node.each do |key, value|
+        next unless key == 'item'
+        obj[Mapping._soap2obj(value['key'], map)] =
+          Mapping._soap2obj(value['value'], map)
+      end
+      if node.key?('default')
+        obj.default = Mapping._soap2obj(node['default'], map)
+      end
+    when TYPE_REGEXP
+      klass = rubytype ? Mapping.class_from_name(rubytype) : Regexp
+      obj = Mapping.create_empty_object(klass)
+      mark_unmarshalled_obj(node, obj)
+      source = node['source'].string
+      options = node['options'].data || 0
+      Regexp.instance_method(:initialize).bind(obj).call(source, options)
+    when TYPE_RANGE
+      klass = rubytype ? Mapping.class_from_name(rubytype) : Range
+      obj = Mapping.create_empty_object(klass)
+      mark_unmarshalled_obj(node, obj)
+      first = Mapping._soap2obj(node['begin'], map)
+      last = Mapping._soap2obj(node['end'], map)
+      exclude_end = node['exclude_end'].data
+      Range.instance_method(:initialize).bind(obj).call(first, last, exclude_end)
+    when TYPE_CLASS
+      obj = Mapping.class_from_name(node['name'].data)
+    when TYPE_MODULE
+      obj = Mapping.class_from_name(node['name'].data)
+    when TYPE_SYMBOL
+      obj = node['id'].data.intern
+    when TYPE_STRUCT
+      typestr = Mapping.elename2name(node['type'].data)
+      klass = Mapping.class_from_name(typestr)
+      if klass.nil?
+        return false
+      end
+      unless klass <= ::Struct
+        return false
+      end
+      obj = Mapping.create_empty_object(klass)
+      mark_unmarshalled_obj(node, obj)
+      node['member'].each do |name, value|
+        obj[Mapping.elename2name(name)] = Mapping._soap2obj(value, map)
+      end
+    else
+      return unknowntype2obj(node, info, map)
+    end
+    return true, obj
+  end
+
+  def anytype2obj(node, info, map)
+    case node
+    when SOAPBasetype
+      return true, node.data
+    when SOAPStruct
+      klass = ::SOAP::Mapping::Object
+      obj = klass.new
+      mark_unmarshalled_obj(node, obj)
+      node.each do |name, value|
+        obj.__add_xmlele_value(XSD::QName.new(nil, name),
+          Mapping._soap2obj(value, map))
+      end
+      unless node.extraattr.empty?
+        obj.instance_variable_set('@__xmlattr', node.extraattr)
+      end
+      return true, obj
+    else
+      return false
+    end
+  end
+
+  def unknowntype2obj(node, info, map)
+    case node
+    when SOAPBasetype
+      return true, node.data
+    when SOAPArray
+      return @array_factory.soap2obj(Array, node, info, map)
+    when SOAPStruct
+      obj = unknownstruct2obj(node, info, map)
+      return true, obj if obj
+      if !@allow_untyped_struct
+        return false
+      end
+      return anytype2obj(node, info, map)
+    else
+      # Basetype which is not defined...
+      return false
+    end
+  end
+
+  def unknownstruct2obj(node, info, map)
+    unless node.type.name
+      return nil
+    end
+    typestr = Mapping.elename2name(node.type.name)
+    klass = Mapping.class_from_name(typestr)
+    if klass.nil? and @allow_untyped_struct
+      klass = Mapping.class_from_name(typestr, true)    # lenient
+    end
+    if klass.nil?
+      return nil
+    end
+    if klass <= ::Exception
+      return exception2obj(klass, node, map)
+    end
+    klass_type = Mapping.class2qname(klass)
+    return nil unless node.type.match(klass_type)
+    obj = nil
+    begin
+      obj = Mapping.create_empty_object(klass)
+    rescue
+      # type name "data" tries Data.new which raises TypeError
+      nil
+    end
+    mark_unmarshalled_obj(node, obj)
+    setiv2obj(obj, node, map)
+    obj
+  end
+
+  def exception2obj(klass, node, map)
+    message = Mapping._soap2obj(node['message'], map)
+    backtrace = Mapping._soap2obj(node['backtrace'], map)
+    obj = Mapping.create_empty_object(klass)
+    obj = obj.exception(message)
+    mark_unmarshalled_obj(node, obj)
+    obj.set_backtrace(backtrace)
+    obj
+  end
+
+  # Only creates empty array.  Do String#replace it with real string.
+  def array2obj(node, map, rubytype)
+    klass = rubytype ? Mapping.class_from_name(rubytype) : Array
+    obj = Mapping.create_empty_object(klass)
+    mark_unmarshalled_obj(node, obj)
+    obj
+  end
+
+  # Only creates empty string.  Do String#replace it with real string.
+  def string2obj(node, map, rubytype)
+    klass = rubytype ? Mapping.class_from_name(rubytype) : String
+    obj = Mapping.create_empty_object(klass)
+    mark_unmarshalled_obj(node, obj)
+    obj
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/mapping/typeMap.rb b/ruby_1_8_6/lib/soap/mapping/typeMap.rb
new file mode 100644
index 0000000000..34db19a5b6
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/mapping/typeMap.rb
@@ -0,0 +1,50 @@
+# SOAP4R - Base type mapping definition
+# Copyright (C) 2000, 2001, 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module SOAP
+
+
+TypeMap = {
+  XSD::XSDAnySimpleType::Type => SOAPAnySimpleType,
+  XSD::XSDString::Type => SOAPString,
+  XSD::XSDBoolean::Type => SOAPBoolean,
+  XSD::XSDDecimal::Type => SOAPDecimal,
+  XSD::XSDFloat::Type => SOAPFloat,
+  XSD::XSDDouble::Type => SOAPDouble,
+  XSD::XSDDuration::Type => SOAPDuration,
+  XSD::XSDDateTime::Type => SOAPDateTime,
+  XSD::XSDTime::Type => SOAPTime,
+  XSD::XSDDate::Type => SOAPDate,
+  XSD::XSDGYearMonth::Type => SOAPGYearMonth,
+  XSD::XSDGYear::Type => SOAPGYear,
+  XSD::XSDGMonthDay::Type => SOAPGMonthDay,
+  XSD::XSDGDay::Type => SOAPGDay,
+  XSD::XSDGMonth::Type => SOAPGMonth,
+  XSD::XSDHexBinary::Type => SOAPHexBinary,
+  XSD::XSDBase64Binary::Type => SOAPBase64,
+  XSD::XSDAnyURI::Type => SOAPAnyURI,
+  XSD::XSDQName::Type => SOAPQName,
+  XSD::XSDInteger::Type => SOAPInteger,
+  XSD::XSDNonPositiveInteger::Type => SOAPNonPositiveInteger,
+  XSD::XSDNegativeInteger::Type => SOAPNegativeInteger,
+  XSD::XSDLong::Type => SOAPLong,
+  XSD::XSDInt::Type => SOAPInt,
+  XSD::XSDShort::Type => SOAPShort,
+  XSD::XSDByte::Type => SOAPByte,
+  XSD::XSDNonNegativeInteger::Type => SOAPNonNegativeInteger,
+  XSD::XSDUnsignedLong::Type => SOAPUnsignedLong,
+  XSD::XSDUnsignedInt::Type => SOAPUnsignedInt,
+  XSD::XSDUnsignedShort::Type => SOAPUnsignedShort,
+  XSD::XSDUnsignedByte::Type => SOAPUnsignedByte,
+  XSD::XSDPositiveInteger::Type => SOAPPositiveInteger,
+
+  SOAP::SOAPBase64::Type => SOAPBase64,
+}
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/mapping/wsdlencodedregistry.rb b/ruby_1_8_6/lib/soap/mapping/wsdlencodedregistry.rb
new file mode 100644
index 0000000000..4efb60188f
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/mapping/wsdlencodedregistry.rb
@@ -0,0 +1,280 @@
+# SOAP4R - WSDL encoded mapping registry.
+# Copyright (C) 2000-2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'xsd/namedelements'
+require 'soap/baseData'
+require 'soap/mapping/mapping'
+require 'soap/mapping/typeMap'
+
+
+module SOAP
+module Mapping
+
+
+class WSDLEncodedRegistry < Registry
+  include TraverseSupport
+
+  attr_reader :definedelements
+  attr_reader :definedtypes
+  attr_accessor :excn_handler_obj2soap
+  attr_accessor :excn_handler_soap2obj
+
+  def initialize(definedtypes = XSD::NamedElements::Empty)
+    @definedtypes = definedtypes
+    # @definedelements = definedelements  needed?
+    @excn_handler_obj2soap = nil
+    @excn_handler_soap2obj = nil
+    # For mapping AnyType element.
+    @rubytype_factory = RubytypeFactory.new(
+      :allow_untyped_struct => true,
+      :allow_original_mapping => true
+    )
+    @schema_element_cache = {}
+  end
+
+  def obj2soap(obj, qname = nil)
+    soap_obj = nil
+    if type = @definedtypes[qname]
+      soap_obj = obj2typesoap(obj, type)
+    else
+      soap_obj = any2soap(obj, qname)
+    end
+    return soap_obj if soap_obj
+    if @excn_handler_obj2soap
+      soap_obj = @excn_handler_obj2soap.call(obj) { |yield_obj|
+        Mapping._obj2soap(yield_obj, self)
+      }
+      return soap_obj if soap_obj
+    end
+    if qname
+      raise MappingError.new("cannot map #{obj.class.name} as #{qname}")
+    else
+      raise MappingError.new("cannot map #{obj.class.name} to SOAP/OM")
+    end
+  end
+
+  # map anything for now: must refer WSDL while mapping.  [ToDo]
+  def soap2obj(node, obj_class = nil)
+    begin
+      return any2obj(node, obj_class)
+    rescue MappingError
+    end
+    if @excn_handler_soap2obj
+      begin
+        return @excn_handler_soap2obj.call(node) { |yield_node|
+	    Mapping._soap2obj(yield_node, self)
+	  }
+      rescue Exception
+      end
+    end
+    raise MappingError.new("cannot map #{node.type.name} to Ruby object")
+  end
+
+private
+
+  def any2soap(obj, qname)
+    if obj.nil?
+      SOAPNil.new
+    elsif qname.nil? or qname == XSD::AnyTypeName
+      @rubytype_factory.obj2soap(nil, obj, nil, self)
+    elsif obj.is_a?(XSD::NSDBase)
+      soap2soap(obj, qname)
+    elsif (type = TypeMap[qname])
+      base2soap(obj, type)
+    else
+      nil
+    end
+  end
+
+  def soap2soap(obj, type_qname)
+    if obj.is_a?(SOAPBasetype)
+      obj
+    elsif obj.is_a?(SOAPStruct) && (type = @definedtypes[type_qname])
+      soap_obj = obj
+      mark_marshalled_obj(obj, soap_obj)
+      elements2soap(obj, soap_obj, type.content.elements)
+      soap_obj
+    elsif obj.is_a?(SOAPArray) && (type = @definedtypes[type_qname])
+      soap_obj = obj
+      contenttype = type.child_type
+      mark_marshalled_obj(obj, soap_obj)
+      obj.replace do |ele|
+	Mapping._obj2soap(ele, self, contenttype)
+      end
+      soap_obj
+    else
+      nil
+    end
+  end
+
+  def obj2typesoap(obj, type)
+    if type.is_a?(::WSDL::XMLSchema::SimpleType)
+      simpleobj2soap(obj, type)
+    else
+      complexobj2soap(obj, type)
+    end
+  end
+
+  def simpleobj2soap(obj, type)
+    type.check_lexical_format(obj)
+    return SOAPNil.new if obj.nil?      # ToDo: check nillable.
+    o = base2soap(obj, TypeMap[type.base])
+    o
+  end
+
+  def complexobj2soap(obj, type)
+    case type.compoundtype
+    when :TYPE_STRUCT
+      struct2soap(obj, type.name, type)
+    when :TYPE_ARRAY
+      array2soap(obj, type.name, type)
+    when :TYPE_MAP
+      map2soap(obj, type.name, type)
+    when :TYPE_SIMPLE
+      simpleobj2soap(obj, type.simplecontent)
+    when :TYPE_EMPTY
+      raise MappingError.new("should be empty") unless obj.nil?
+      SOAPNil.new
+    else
+      raise MappingError.new("unknown compound type: #{type.compoundtype}")
+    end
+  end
+
+  def base2soap(obj, type)
+    soap_obj = nil
+    if type <= XSD::XSDString
+      str = XSD::Charset.encoding_conv(obj.to_s,
+        Thread.current[:SOAPExternalCES], XSD::Charset.encoding)
+      soap_obj = type.new(str)
+      mark_marshalled_obj(obj, soap_obj)
+    else
+      soap_obj = type.new(obj)
+    end
+    soap_obj
+  end
+
+  def struct2soap(obj, type_qname, type)
+    return SOAPNil.new if obj.nil?      # ToDo: check nillable.
+    soap_obj = SOAPStruct.new(type_qname)
+    unless obj.nil?
+      mark_marshalled_obj(obj, soap_obj)
+      elements2soap(obj, soap_obj, type.content.elements)
+    end
+    soap_obj
+  end
+
+  def array2soap(obj, type_qname, type)
+    return SOAPNil.new if obj.nil?      # ToDo: check nillable.
+    arytype = type.child_type
+    soap_obj = SOAPArray.new(ValueArrayName, 1, arytype)
+    unless obj.nil?
+      mark_marshalled_obj(obj, soap_obj)
+      obj.each do |item|
+        soap_obj.add(Mapping._obj2soap(item, self, arytype))
+      end
+    end
+    soap_obj
+  end
+
+  MapKeyName = XSD::QName.new(nil, "key")
+  MapValueName = XSD::QName.new(nil, "value")
+  def map2soap(obj, type_qname, type)
+    return SOAPNil.new if obj.nil?      # ToDo: check nillable.
+    keytype = type.child_type(MapKeyName) || XSD::AnyTypeName
+    valuetype = type.child_type(MapValueName) || XSD::AnyTypeName
+    soap_obj = SOAPStruct.new(MapQName)
+    unless obj.nil?
+      mark_marshalled_obj(obj, soap_obj)
+      obj.each do |key, value|
+        elem = SOAPStruct.new
+        elem.add("key", Mapping._obj2soap(key, self, keytype))
+        elem.add("value", Mapping._obj2soap(value, self, valuetype))
+        # ApacheAxis allows only 'item' here.
+        soap_obj.add("item", elem)
+      end
+    end
+    soap_obj
+  end
+
+  def elements2soap(obj, soap_obj, elements)
+    elements.each do |element|
+      name = element.name.name
+      child_obj = Mapping.get_attribute(obj, name)
+      soap_obj.add(name,
+        Mapping._obj2soap(child_obj, self, element.type || element.name))
+    end
+  end
+
+  def any2obj(node, obj_class)
+    unless obj_class
+      typestr = XSD::CodeGen::GenSupport.safeconstname(node.elename.name)
+      obj_class = Mapping.class_from_name(typestr)
+    end
+    if obj_class and obj_class.class_variables.include?('@@schema_element')
+      soap2stubobj(node, obj_class)
+    else
+      Mapping._soap2obj(node, Mapping::DefaultRegistry, obj_class)
+    end
+  end
+
+  def soap2stubobj(node, obj_class)
+    obj = Mapping.create_empty_object(obj_class)
+    unless node.is_a?(SOAPNil)
+      add_elements2stubobj(node, obj)
+    end
+    obj
+  end
+
+  def add_elements2stubobj(node, obj)
+    elements, as_array = schema_element_definition(obj.class)
+    vars = {}
+    node.each do |name, value|
+      item = elements.find { |k, v| k.name == name }
+      if item
+        elename, class_name = item
+        if klass = Mapping.class_from_name(class_name)
+          # klass must be a SOAPBasetype or a class
+          if klass.ancestors.include?(::SOAP::SOAPBasetype)
+            if value.respond_to?(:data)
+              child = klass.new(value.data).data
+            else
+              child = klass.new(nil).data
+            end
+          else
+            child = Mapping._soap2obj(value, self, klass)
+          end
+        elsif klass = Mapping.module_from_name(class_name)
+          # simpletype
+          if value.respond_to?(:data)
+            child = value.data
+          else
+            raise MappingError.new(
+              "cannot map to a module value: #{class_name}")
+          end
+        else
+          raise MappingError.new("unknown class: #{class_name}")
+        end
+      else      # untyped element is treated as anyType.
+        child = Mapping._soap2obj(value, self)
+      end
+      vars[name] = child
+    end
+    Mapping.set_attributes(obj, vars)
+  end
+
+  # it caches @@schema_element.  this means that @@schema_element must not be
+  # changed while a lifetime of a WSDLLiteralRegistry.
+  def schema_element_definition(klass)
+    @schema_element_cache[klass] ||= Mapping.schema_element_definition(klass)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/mapping/wsdlliteralregistry.rb b/ruby_1_8_6/lib/soap/mapping/wsdlliteralregistry.rb
new file mode 100644
index 0000000000..7bb8e12203
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/mapping/wsdlliteralregistry.rb
@@ -0,0 +1,418 @@
+# SOAP4R - WSDL literal mapping registry.
+# Copyright (C) 2004, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/baseData'
+require 'soap/mapping/mapping'
+require 'soap/mapping/typeMap'
+require 'xsd/codegen/gensupport'
+require 'xsd/namedelements'
+
+
+module SOAP
+module Mapping
+
+
+class WSDLLiteralRegistry < Registry
+  attr_reader :definedelements
+  attr_reader :definedtypes
+  attr_accessor :excn_handler_obj2soap
+  attr_accessor :excn_handler_soap2obj
+
+  def initialize(definedtypes = XSD::NamedElements::Empty,
+      definedelements = XSD::NamedElements::Empty)
+    @definedtypes = definedtypes
+    @definedelements = definedelements
+    @excn_handler_obj2soap = nil
+    @excn_handler_soap2obj = nil
+    @schema_element_cache = {}
+    @schema_attribute_cache = {}
+  end
+
+  def obj2soap(obj, qname)
+    soap_obj = nil
+    if ele = @definedelements[qname]
+      soap_obj = obj2elesoap(obj, ele)
+    elsif type = @definedtypes[qname]
+      soap_obj = obj2typesoap(obj, type, true)
+    else
+      soap_obj = any2soap(obj, qname)
+    end
+    return soap_obj if soap_obj
+    if @excn_handler_obj2soap
+      soap_obj = @excn_handler_obj2soap.call(obj) { |yield_obj|
+        Mapping.obj2soap(yield_obj, nil, nil, MAPPING_OPT)
+      }
+      return soap_obj if soap_obj
+    end
+    raise MappingError.new("cannot map #{obj.class.name} as #{qname}")
+  end
+
+  # node should be a SOAPElement
+  def soap2obj(node, obj_class = nil)
+    # obj_class is given when rpc/literal service.  but ignored for now.
+    begin
+      return any2obj(node)
+    rescue MappingError
+    end
+    if @excn_handler_soap2obj
+      begin
+        return @excn_handler_soap2obj.call(node) { |yield_node|
+	    Mapping.soap2obj(yield_node, nil, nil, MAPPING_OPT)
+	  }
+      rescue Exception
+      end
+    end
+    if node.respond_to?(:type)
+      raise MappingError.new("cannot map #{node.type.name} to Ruby object")
+    else
+      raise MappingError.new("cannot map #{node.elename.name} to Ruby object")
+    end
+  end
+
+private
+
+  MAPPING_OPT = { :no_reference => true }
+
+  def obj2elesoap(obj, ele)
+    o = nil
+    qualified = (ele.elementform == 'qualified')
+    if ele.type
+      if type = @definedtypes[ele.type]
+        o = obj2typesoap(obj, type, qualified)
+      elsif type = TypeMap[ele.type]
+        o = base2soap(obj, type)
+      else
+        raise MappingError.new("cannot find type #{ele.type}")
+      end
+    elsif ele.local_complextype
+      o = obj2typesoap(obj, ele.local_complextype, qualified)
+      add_attributes2soap(obj, o)
+    elsif ele.local_simpletype
+      o = obj2typesoap(obj, ele.local_simpletype, qualified)
+    else
+      raise MappingError.new('illegal schema?')
+    end
+    o.elename = ele.name
+    o
+  end
+
+  def obj2typesoap(obj, type, qualified)
+    if type.is_a?(::WSDL::XMLSchema::SimpleType)
+      simpleobj2soap(obj, type)
+    else
+      complexobj2soap(obj, type, qualified)
+    end
+  end
+
+  def simpleobj2soap(obj, type)
+    type.check_lexical_format(obj)
+    return SOAPNil.new if obj.nil?      # ToDo: check nillable.
+    o = base2soap(obj, TypeMap[type.base])
+    o
+  end
+
+  def complexobj2soap(obj, type, qualified)
+    o = SOAPElement.new(type.name)
+    o.qualified = qualified
+    type.each_element do |child_ele|
+      child = Mapping.get_attribute(obj, child_ele.name.name)
+      if child.nil?
+        if child_ele.nillable
+          # ToDo: test
+          # add empty element
+          child_soap = obj2elesoap(nil, child_ele)
+          o.add(child_soap)
+        elsif Integer(child_ele.minoccurs) == 0
+          # nothing to do
+        else
+          raise MappingError.new("nil not allowed: #{child_ele.name.name}")
+        end
+      elsif child_ele.map_as_array?
+        child.each do |item|
+          child_soap = obj2elesoap(item, child_ele)
+          o.add(child_soap)
+        end
+      else
+        child_soap = obj2elesoap(child, child_ele)
+        o.add(child_soap)
+      end
+    end
+    o
+  end
+
+  def any2soap(obj, qname)
+    if obj.is_a?(SOAPElement)
+      obj
+    elsif obj.class.class_variables.include?('@@schema_element')
+      stubobj2soap(obj, qname)
+    elsif obj.is_a?(SOAP::Mapping::Object)
+      mappingobj2soap(obj, qname)
+    elsif obj.is_a?(Hash)
+      ele = SOAPElement.from_obj(obj)
+      ele.elename = qname
+      ele
+    else
+      # expected to be a basetype or an anyType.
+      # SOAPStruct, etc. is used instead of SOAPElement.
+      begin
+        ele = Mapping.obj2soap(obj, nil, nil, MAPPING_OPT)
+        ele.elename = qname
+        ele
+      rescue MappingError
+        ele = SOAPElement.new(qname, obj.to_s)
+      end
+      if obj.respond_to?(:__xmlattr)
+        obj.__xmlattr.each do |key, value|
+          ele.extraattr[key] = value
+        end
+      end
+      ele
+    end
+  end
+
+  def stubobj2soap(obj, qname)
+    ele = SOAPElement.new(qname)
+    ele.qualified =
+      (obj.class.class_variables.include?('@@schema_qualified') and
+      obj.class.class_eval('@@schema_qualified'))
+    add_elements2soap(obj, ele)
+    add_attributes2soap(obj, ele)
+    ele
+  end
+
+  def mappingobj2soap(obj, qname)
+    ele = SOAPElement.new(qname)
+    obj.__xmlele.each do |key, value|
+      if value.is_a?(::Array)
+        value.each do |item|
+          ele.add(obj2soap(item, key))
+        end
+      else
+        ele.add(obj2soap(value, key))
+      end
+    end
+    obj.__xmlattr.each do |key, value|
+      ele.extraattr[key] = value
+    end
+    ele
+  end
+
+  def add_elements2soap(obj, ele)
+    elements, as_array = schema_element_definition(obj.class)
+    if elements
+      elements.each do |elename, type|
+        if child = Mapping.get_attribute(obj, elename.name)
+          if as_array.include?(elename.name)
+            child.each do |item|
+              ele.add(obj2soap(item, elename))
+            end
+          else
+            ele.add(obj2soap(child, elename))
+          end
+        elsif obj.is_a?(::Array) and as_array.include?(elename.name)
+          obj.each do |item|
+            ele.add(obj2soap(item, elename))
+          end
+        end
+      end
+    end
+  end
+  
+  def add_attributes2soap(obj, ele)
+    attributes = schema_attribute_definition(obj.class)
+    if attributes
+      attributes.each do |qname, param|
+        attr = obj.__send__('xmlattr_' +
+          XSD::CodeGen::GenSupport.safevarname(qname.name))
+        ele.extraattr[qname] = attr
+      end
+    end
+  end
+
+  def base2soap(obj, type)
+    soap_obj = nil
+    if type <= XSD::XSDString
+      str = XSD::Charset.encoding_conv(obj.to_s,
+        Thread.current[:SOAPExternalCES], XSD::Charset.encoding)
+      soap_obj = type.new(str)
+    else
+      soap_obj = type.new(obj)
+    end
+    soap_obj
+  end
+
+  def anytype2obj(node)
+    if node.is_a?(::SOAP::SOAPBasetype)
+      return node.data
+    end
+    klass = ::SOAP::Mapping::Object
+    obj = klass.new
+    obj
+  end
+
+  def any2obj(node, obj_class = nil)
+    unless obj_class
+      typestr = XSD::CodeGen::GenSupport.safeconstname(node.elename.name)
+      obj_class = Mapping.class_from_name(typestr)
+    end
+    if obj_class and obj_class.class_variables.include?('@@schema_element')
+      soapele2stubobj(node, obj_class)
+    elsif node.is_a?(SOAPElement) or node.is_a?(SOAPStruct)
+        # SOAPArray for literal?
+      soapele2plainobj(node)
+    else
+      obj = Mapping.soap2obj(node, nil, obj_class, MAPPING_OPT)
+      add_attributes2plainobj(node, obj)
+      obj
+    end
+  end
+
+  def soapele2stubobj(node, obj_class)
+    obj = Mapping.create_empty_object(obj_class)
+    add_elements2stubobj(node, obj)
+    add_attributes2stubobj(node, obj)
+    obj
+  end
+
+  def soapele2plainobj(node)
+    obj = anytype2obj(node)
+    add_elements2plainobj(node, obj)
+    add_attributes2plainobj(node, obj)
+    obj
+  end
+
+  def add_elements2stubobj(node, obj)
+    elements, as_array = schema_element_definition(obj.class)
+    vars = {}
+    node.each do |name, value|
+      item = elements.find { |k, v| k.name == name }
+      if item
+        elename, class_name = item
+        if klass = Mapping.class_from_name(class_name)
+          # klass must be a SOAPBasetype or a class
+          if klass.ancestors.include?(::SOAP::SOAPBasetype)
+            if value.respond_to?(:data)
+              child = klass.new(value.data).data
+            else
+              child = klass.new(nil).data
+            end
+          else
+            child = any2obj(value, klass)
+          end
+        elsif klass = Mapping.module_from_name(class_name)
+          # simpletype
+          if value.respond_to?(:data)
+            child = value.data
+          else
+            raise MappingError.new(
+              "cannot map to a module value: #{class_name}")
+          end
+        else
+          raise MappingError.new("unknown class/module: #{class_name}")
+        end
+      else      # untyped element is treated as anyType.
+        child = any2obj(value)
+      end
+      if as_array.include?(elename.name)
+        (vars[name] ||= []) << child
+      else
+        vars[name] = child
+      end
+    end
+    Mapping.set_attributes(obj, vars)
+  end
+
+  def add_attributes2stubobj(node, obj)
+    if attributes = schema_attribute_definition(obj.class)
+      define_xmlattr(obj)
+      attributes.each do |qname, class_name|
+        attr = node.extraattr[qname]
+        next if attr.nil? or attr.empty?
+        klass = Mapping.class_from_name(class_name)
+        if klass.ancestors.include?(::SOAP::SOAPBasetype)
+          child = klass.new(attr).data
+        else
+          child = attr
+        end
+        obj.__xmlattr[qname] = child
+        define_xmlattr_accessor(obj, qname)
+      end
+    end
+  end
+
+  def add_elements2plainobj(node, obj)
+    node.each do |name, value|
+      obj.__add_xmlele_value(value.elename, any2obj(value))
+    end
+  end
+
+  def add_attributes2plainobj(node, obj)
+    return if node.extraattr.empty?
+    define_xmlattr(obj)
+    node.extraattr.each do |qname, value|
+      obj.__xmlattr[qname] = value
+      define_xmlattr_accessor(obj, qname)
+    end
+  end
+
+  if RUBY_VERSION > "1.7.0"
+    def define_xmlattr_accessor(obj, qname)
+      name = XSD::CodeGen::GenSupport.safemethodname(qname.name)
+      Mapping.define_attr_accessor(obj, 'xmlattr_' + name,
+        proc { @__xmlattr[qname] },
+        proc { |value| @__xmlattr[qname] = value })
+    end
+  else
+    def define_xmlattr_accessor(obj, qname)
+      name = XSD::CodeGen::GenSupport.safemethodname(qname.name)
+      obj.instance_eval <<-EOS
+        def #{name}
+          @__xmlattr[#{qname.dump}]
+        end
+
+        def #{name}=(value)
+          @__xmlattr[#{qname.dump}] = value
+        end
+      EOS
+    end
+  end
+
+  if RUBY_VERSION > "1.7.0"
+    def define_xmlattr(obj)
+      obj.instance_variable_set('@__xmlattr', {})
+      unless obj.respond_to?(:__xmlattr)
+        Mapping.define_attr_accessor(obj, :__xmlattr, proc { @__xmlattr })
+      end
+    end
+  else
+    def define_xmlattr(obj)
+      obj.instance_variable_set('@__xmlattr', {})
+      unless obj.respond_to?(:__xmlattr)
+        obj.instance_eval <<-EOS
+          def __xmlattr
+            @__xmlattr
+          end
+        EOS
+      end
+    end
+  end
+
+  # it caches @@schema_element.  this means that @@schema_element must not be
+  # changed while a lifetime of a WSDLLiteralRegistry.
+  def schema_element_definition(klass)
+    @schema_element_cache[klass] ||= Mapping.schema_element_definition(klass)
+  end
+
+  def schema_attribute_definition(klass)
+    @schema_attribute_cache[klass] ||= Mapping.schema_attribute_definition(klass)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/marshal.rb b/ruby_1_8_6/lib/soap/marshal.rb
new file mode 100644
index 0000000000..1c3d5b01db
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/marshal.rb
@@ -0,0 +1,59 @@
+# SOAP4R - Marshalling/Unmarshalling Ruby's object using SOAP Encoding.
+# Copyright (C) 2001, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require "soap/mapping"
+require "soap/processor"
+
+
+module SOAP
+
+
+module Marshal
+  # Trying xsd:dateTime data to be recovered as aTime.
+  MarshalMappingRegistry = Mapping::Registry.new(
+    :allow_original_mapping => true)
+  MarshalMappingRegistry.add(
+    Time,
+    ::SOAP::SOAPDateTime,
+    ::SOAP::Mapping::Registry::DateTimeFactory
+  )
+
+  class << self
+  public
+    def dump(obj, io = nil)
+      marshal(obj, MarshalMappingRegistry, io)
+    end
+
+    def load(stream)
+      unmarshal(stream, MarshalMappingRegistry)
+    end
+
+    def marshal(obj, mapping_registry = MarshalMappingRegistry, io = nil)
+      elename = Mapping.name2elename(obj.class.to_s)
+      soap_obj = Mapping.obj2soap(obj, mapping_registry)
+      body = SOAPBody.new
+      body.add(elename, soap_obj)
+      env = SOAPEnvelope.new(nil, body)
+      SOAP::Processor.marshal(env, {}, io)
+    end
+
+    def unmarshal(stream, mapping_registry = MarshalMappingRegistry)
+      env = SOAP::Processor.unmarshal(stream)
+      if env.nil?
+	raise ArgumentError.new("Illegal SOAP marshal format.")
+      end
+      Mapping.soap2obj(env.body.root_node, mapping_registry)
+    end
+  end
+end
+
+
+end
+
+
+SOAPMarshal = SOAP::Marshal
diff --git a/ruby_1_8_6/lib/soap/mimemessage.rb b/ruby_1_8_6/lib/soap/mimemessage.rb
new file mode 100644
index 0000000000..acb4322e11
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/mimemessage.rb
@@ -0,0 +1,240 @@
+# SOAP4R - MIME Message implementation.
+# Copyright (C) 2002  Jamie Herre.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/attachment'
+
+
+module SOAP
+
+
+# Classes for MIME message handling.  Should be put somewhere else!
+# Tried using the 'tmail' module but found that I needed something
+# lighter in weight.
+
+
+class MIMEMessage
+  class MIMEMessageError < StandardError; end
+
+  MultipartContentType = 'multipart/\w+'
+
+  class Header
+    attr_accessor :str, :key, :root
+
+    def initialize
+      @attrs = {}
+    end
+
+    def [](key)
+      @attrs[key]
+    end
+
+    def []=(key, value)
+      @attrs[key] = value
+    end
+
+    def to_s
+      @key + ": " + @str
+    end
+  end
+
+  class Headers < Hash
+    def self.parse(str)
+      new.parse(str)
+    end
+
+    def parse(str)
+      header_cache = nil
+      str.each do |line|
+	case line
+	when /^\A[^\: \t]+:\s*.+$/
+	  parse_line(header_cache) if header_cache
+	  header_cache = line.sub(/\r?\n\z/, '')
+	when /^\A\s+(.*)$/
+	  # a continuous line at the beginning line crashes here.
+	  header_cache << line
+	else
+	  raise RuntimeError.new("unexpected header: #{line.inspect}")
+	end
+      end
+      parse_line(header_cache) if header_cache
+      self
+    end
+
+    def parse_line(line)
+      if /^\A([^\: \t]+):\s*(.+)\z/ =~ line
+    	header = parse_rhs($2.strip)
+	header.key = $1.strip
+	self[header.key.downcase] = header
+      else
+	raise RuntimeError.new("unexpected header line: #{line.inspect}")
+      end
+    end
+
+    def parse_rhs(str)
+      a = str.split(/;+\s+/)
+      header = Header.new
+      header.str = str
+      header.root = a.shift
+      a.each do |pair|
+	if pair =~ /(\w+)\s*=\s*"?([^"]+)"?/
+	  header[$1.downcase] = $2
+	else
+	  raise RuntimeError.new("unexpected header component: #{pair.inspect}")
+	end
+      end
+      header
+    end
+
+    def add(key, value)
+      if key != nil and value != nil
+	header = parse_rhs(value)
+	header.key = key
+	self[key.downcase] = header
+      end
+    end
+
+    def to_s
+      self.values.collect { |hdr|
+	hdr.to_s
+      }.join("\r\n")
+    end
+  end
+
+  class Part
+    attr_accessor :headers, :body
+
+    def initialize
+      @headers = Headers.new
+      @headers.add("Content-Transfer-Encoding", "8bit")
+      @body = nil
+      @contentid = nil
+    end
+
+    def self.parse(str)
+      new.parse(str)
+    end
+
+    def parse(str)
+      headers, body = str.split(/\r\n\r\n/s)
+      if headers != nil and body != nil
+	@headers = Headers.parse(headers)
+	@body = body.sub(/\r\n\z/, '')
+      else
+	raise RuntimeError.new("unexpected part: #{str.inspect}")
+      end
+      self
+    end
+
+    def contentid
+      if @contentid == nil and @headers.key?('content-id')
+	@contentid = @headers['content-id'].str
+	@contentid = $1 if @contentid =~ /^<(.+)>$/
+      end
+      @contentid
+    end
+
+    alias content body
+
+    def to_s
+      @headers.to_s + "\r\n\r\n" + @body
+    end
+  end
+
+  def initialize
+    @parts = []
+    @headers = Headers.new
+    @root = nil
+  end
+
+  def self.parse(head, str)
+    new.parse(head, str)
+  end
+
+  attr_reader :parts, :headers
+
+  def close
+    @headers.add(
+      "Content-Type",
+      "multipart/related; type=\"text/xml\"; boundary=\"#{boundary}\"; start=\"#{@parts[0].contentid}\""
+    )
+  end
+
+  def parse(head, str)
+    @headers = Headers.parse(head + "\r\n" + "From: jfh\r\n")
+    boundary = @headers['content-type']['boundary']
+    if boundary != nil
+      parts = str.split(/--#{Regexp.quote(boundary)}\s*(?:\r\n|--\r\n)/)
+      part = parts.shift	# preamble must be ignored.
+      @parts = parts.collect { |part| Part.parse(part) }
+    else
+      @parts = [Part.parse(str)]
+    end
+    if @parts.length < 1
+      raise MIMEMessageError.new("This message contains no valid parts!")
+    end
+    self
+  end
+
+  def root
+    if @root == nil
+      start = @headers['content-type']['start']
+      @root = (start && @parts.find { |prt| prt.contentid == start }) ||
+	@parts[0]
+    end
+    @root
+  end
+
+  def boundary
+    if @boundary == nil
+      @boundary = "----=Part_" + __id__.to_s + rand.to_s
+    end
+    @boundary
+  end
+
+  def add_part(content)
+    part = Part.new
+    part.headers.add("Content-Type",
+      "text/xml; charset=" + XSD::Charset.xml_encoding_label)
+    part.headers.add("Content-ID", Attachment.contentid(part))
+    part.body = content
+    @parts.unshift(part)
+  end
+
+  def add_attachment(attach)
+    part = Part.new
+    part.headers.add("Content-Type", attach.contenttype)
+    part.headers.add("Content-ID", attach.mime_contentid)
+    part.body = attach.content
+    @parts.unshift(part)
+  end
+
+  def has_parts?
+    (@parts.length > 0)
+  end
+
+  def headers_str
+    @headers.to_s
+  end
+
+  def content_str
+    str = ''
+    @parts.each do |prt|
+      str << "--" + boundary + "\r\n"
+      str << prt.to_s + "\r\n"
+    end
+    str << '--' + boundary + "--\r\n"
+    str
+  end
+
+  def to_s
+    str = headers_str + "\r\n\r\n" + conent_str
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/netHttpClient.rb b/ruby_1_8_6/lib/soap/netHttpClient.rb
new file mode 100644
index 0000000000..10d68e2a4c
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/netHttpClient.rb
@@ -0,0 +1,190 @@
+# SOAP4R - net/http wrapper
+# Copyright (C) 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'net/http'
+
+
+module SOAP
+
+
+class NetHttpClient
+
+  SSLEnabled = begin
+      require 'net/https'
+      true
+    rescue LoadError
+      false
+    end
+
+  attr_reader :proxy
+  attr_accessor :no_proxy
+  attr_accessor :debug_dev
+  attr_accessor :ssl_config		# ignored for now.
+  attr_accessor :protocol_version	# ignored for now.
+  attr_accessor :connect_timeout
+  attr_accessor :send_timeout           # ignored for now.
+  attr_accessor :receive_timeout
+
+  def initialize(proxy = nil, agent = nil)
+    @proxy = proxy ? URI.parse(proxy) : nil
+    @agent = agent
+    @debug_dev = nil
+    @session_manager = SessionManager.new
+    @no_proxy = @ssl_config = @protocol_version = nil
+    @connect_timeout = @send_timeout = @receive_timeout = nil
+  end
+
+  def test_loopback_response
+    raise NotImplementedError.new("not supported for now")
+  end
+  
+  def proxy=(proxy)
+    if proxy.nil?
+      @proxy = nil
+    else
+      if proxy.is_a?(URI)
+        @proxy = proxy
+      else
+        @proxy = URI.parse(proxy)
+      end
+      if @proxy.scheme == nil or @proxy.scheme.downcase != 'http' or
+	  @proxy.host == nil or @proxy.port == nil
+	raise ArgumentError.new("unsupported proxy `#{proxy}'")
+      end
+    end
+    reset_all
+    @proxy
+  end
+
+  def set_basic_auth(uri, user_id, passwd)
+    # net/http does not handle url.
+    @basic_auth = [user_id, passwd]
+    raise NotImplementedError.new("basic_auth is not supported under soap4r + net/http.")
+  end
+
+  def set_cookie_store(filename)
+    raise NotImplementedError.new
+  end
+
+  def save_cookie_store(filename)
+    raise NotImplementedError.new
+  end
+
+  def reset(url)
+    # no persistent connection.  ignored.
+  end
+
+  def reset_all
+    # no persistent connection.  ignored.
+  end
+
+  def post(url, req_body, header = {})
+    unless url.is_a?(URI)
+      url = URI.parse(url)
+    end
+    extra = header.dup
+    extra['User-Agent'] = @agent if @agent
+    res = start(url) { |http|
+      http.post(url.request_uri, req_body, extra)
+    }
+    Response.new(res)
+  end
+
+  def get_content(url, header = {})
+    unless url.is_a?(URI)
+      url = URI.parse(url)
+    end
+    extra = header.dup
+    extra['User-Agent'] = @agent if @agent
+    res = start(url) { |http|
+	http.get(url.request_uri, extra)
+      }
+    res.body
+  end
+
+private
+
+  def start(url)
+    http = create_connection(url)
+    response = nil
+    http.start { |worker|
+      response = yield(worker)
+      worker.finish
+    }
+    @debug_dev << response.body if @debug_dev
+    response
+  end
+
+  def create_connection(url)
+    proxy_host = proxy_port = nil
+    unless no_proxy?(url)
+      proxy_host = @proxy.host
+      proxy_port = @proxy.port
+    end
+    http = Net::HTTP::Proxy(proxy_host, proxy_port).new(url.host, url.port)
+    if http.respond_to?(:set_debug_output)
+      http.set_debug_output(@debug_dev)
+    end
+    http.open_timeout = @connect_timeout if @connect_timeout
+    http.read_timeout = @receive_timeout if @receive_timeout
+    case url
+    when URI::HTTPS
+      if SSLEnabled
+	http.use_ssl = true
+      else
+	raise RuntimeError.new("Cannot connect to #{url} (OpenSSL is not installed.)")
+      end
+    when URI::HTTP
+      # OK
+    else
+      raise RuntimeError.new("Cannot connect to #{url} (Not HTTP.)")
+    end
+    http
+  end
+
+  NO_PROXY_HOSTS = ['localhost']
+
+  def no_proxy?(uri)
+    if !@proxy or NO_PROXY_HOSTS.include?(uri.host)
+      return true
+    end
+    if @no_proxy
+      @no_proxy.scan(/([^:,]*)(?::(\d+))?/) do |host, port|
+  	if /(\A|\.)#{Regexp.quote(host)}\z/i =~ uri.host &&
+	    (!port || uri.port == port.to_i)
+	  return true
+	end
+      end
+    else
+      false
+    end
+  end
+
+  class SessionManager
+    attr_accessor :connect_timeout
+    attr_accessor :send_timeout
+    attr_accessor :receive_timeout
+  end
+
+  class Response
+    attr_reader :content
+    attr_reader :status
+    attr_reader :reason
+    attr_reader :contenttype
+
+    def initialize(res)
+      @status = res.code.to_i
+      @reason = res.message
+      @contenttype = res['content-type']
+      @content = res.body
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/parser.rb b/ruby_1_8_6/lib/soap/parser.rb
new file mode 100644
index 0000000000..412fd4855a
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/parser.rb
@@ -0,0 +1,251 @@
+# SOAP4R - SOAP XML Instance Parser library.
+# Copyright (C) 2001, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/ns'
+require 'xsd/xmlparser'
+require 'soap/soap'
+require 'soap/baseData'
+require 'soap/encodingstyle/handler'
+
+
+module SOAP
+
+
+class Parser
+  include SOAP
+
+  class ParseError < Error; end
+  class FormatDecodeError < ParseError; end
+  class UnexpectedElementError < ParseError; end
+
+private
+
+  class ParseFrame
+    attr_reader :node
+    attr_reader :name
+    attr_reader :ns, :encodingstyle
+
+    class NodeContainer
+      def initialize(node)
+	@node = node
+      end
+
+      def node
+	@node
+      end
+
+      def replace_node(node)
+	@node = node
+      end
+    end
+
+  public
+
+    def initialize(ns, name, node, encodingstyle)
+      @ns = ns
+      @name = name
+      self.node = node
+      @encodingstyle = encodingstyle
+    end
+
+    def node=(node)
+      @node = NodeContainer.new(node)
+    end
+  end
+
+public
+
+  attr_accessor :envelopenamespace
+  attr_accessor :default_encodingstyle
+  attr_accessor :decode_typemap
+  attr_accessor :allow_unqualified_element
+
+  def initialize(opt = {})
+    @opt = opt
+    @parser = XSD::XMLParser.create_parser(self, opt)
+    @parsestack = nil
+    @lastnode = nil
+    @handlers = {}
+    @envelopenamespace = opt[:envelopenamespace] || EnvelopeNamespace
+    @default_encodingstyle = opt[:default_encodingstyle] || EncodingNamespace
+    @decode_typemap = opt[:decode_typemap] || nil
+    @allow_unqualified_element = opt[:allow_unqualified_element] || false
+  end
+
+  def charset
+    @parser.charset
+  end
+
+  def parse(string_or_readable)
+    @parsestack = []
+    @lastnode = nil
+
+    @handlers.each do |uri, handler|
+      handler.decode_prologue
+    end
+
+    @parser.do_parse(string_or_readable)
+
+    unless @parsestack.empty?
+      raise FormatDecodeError.new("Unbalanced tag in XML.")
+    end
+
+    @handlers.each do |uri, handler|
+      handler.decode_epilogue
+    end
+
+    @lastnode
+  end
+
+  def start_element(name, attrs)
+    lastframe = @parsestack.last
+    ns = parent = parent_encodingstyle = nil
+    if lastframe
+      ns = lastframe.ns.clone_ns
+      parent = lastframe.node
+      parent_encodingstyle = lastframe.encodingstyle
+    else
+      ns = XSD::NS.new
+      parent = ParseFrame::NodeContainer.new(nil)
+      parent_encodingstyle = nil
+    end
+
+    attrs = XSD::XMLParser.filter_ns(ns, attrs)
+    encodingstyle = find_encodingstyle(ns, attrs)
+
+    # Children's encodingstyle is derived from its parent.
+    if encodingstyle.nil?
+      if parent.node.is_a?(SOAPHeader)
+        encodingstyle = LiteralNamespace
+      else
+        encodingstyle = parent_encodingstyle || @default_encodingstyle
+      end
+    end
+
+    node = decode_tag(ns, name, attrs, parent, encodingstyle)
+
+    @parsestack << ParseFrame.new(ns, name, node, encodingstyle)
+  end
+
+  def characters(text)
+    lastframe = @parsestack.last
+    if lastframe
+      # Need not to be cloned because character does not have attr.
+      decode_text(lastframe.ns, text, lastframe.encodingstyle)
+    else
+      # Ignore Text outside of SOAP Envelope.
+      p text if $DEBUG
+    end
+  end
+
+  def end_element(name)
+    lastframe = @parsestack.pop
+    unless name == lastframe.name
+      raise UnexpectedElementError.new("Closing element name '#{ name }' does not match with opening element '#{ lastframe.name }'.")
+    end
+    decode_tag_end(lastframe.ns, lastframe.node, lastframe.encodingstyle)
+    @lastnode = lastframe.node.node
+  end
+
+private
+
+  def find_encodingstyle(ns, attrs)
+    attrs.each do |key, value|
+      if (ns.compare(@envelopenamespace, AttrEncodingStyle, key))
+	return value
+      end
+    end
+    nil
+  end
+
+  def decode_tag(ns, name, attrs, parent, encodingstyle)
+    ele = ns.parse(name)
+
+    # Envelope based parsing.
+    if ((ele.namespace == @envelopenamespace) ||
+	(@allow_unqualified_element && ele.namespace.nil?))
+      o = decode_soap_envelope(ns, ele, attrs, parent)
+      return o if o
+    end
+
+    # Encoding based parsing.
+    handler = find_handler(encodingstyle)
+    if handler
+      return handler.decode_tag(ns, ele, attrs, parent)
+    else
+      raise FormatDecodeError.new("Unknown encodingStyle: #{ encodingstyle }.")
+    end
+  end
+
+  def decode_tag_end(ns, node, encodingstyle)
+    return unless encodingstyle
+
+    handler = find_handler(encodingstyle)
+    if handler
+      return handler.decode_tag_end(ns, node)
+    else
+      raise FormatDecodeError.new("Unknown encodingStyle: #{ encodingstyle }.")
+    end
+  end
+
+  def decode_text(ns, text, encodingstyle)
+    handler = find_handler(encodingstyle)
+
+    if handler
+      handler.decode_text(ns, text)
+    else
+      # How should I do?
+    end
+  end
+
+  def decode_soap_envelope(ns, ele, attrs, parent)
+    o = nil
+    if ele.name == EleEnvelope
+      o = SOAPEnvelope.new
+      if ext = @opt[:external_content]
+	ext.each do |k, v|
+	  o.external_content[k] = v
+	end
+      end
+    elsif ele.name == EleHeader
+      unless parent.node.is_a?(SOAPEnvelope)
+	raise FormatDecodeError.new("Header should be a child of Envelope.")
+      end
+      o = SOAPHeader.new
+      parent.node.header = o
+    elsif ele.name == EleBody
+      unless parent.node.is_a?(SOAPEnvelope)
+	raise FormatDecodeError.new("Body should be a child of Envelope.")
+      end
+      o = SOAPBody.new
+      parent.node.body = o
+    elsif ele.name == EleFault
+      unless parent.node.is_a?(SOAPBody)
+	raise FormatDecodeError.new("Fault should be a child of Body.")
+      end
+      o = SOAPFault.new
+      parent.node.fault = o
+    end
+    o
+  end
+
+  def find_handler(encodingstyle)
+    unless @handlers.key?(encodingstyle)
+      handler_factory = SOAP::EncodingStyle::Handler.handler(encodingstyle) ||
+	SOAP::EncodingStyle::Handler.handler(EncodingNamespace)
+      handler = handler_factory.new(@parser.charset)
+      handler.decode_typemap = @decode_typemap
+      handler.decode_prologue
+      @handlers[encodingstyle] = handler
+    end
+    @handlers[encodingstyle]
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/processor.rb b/ruby_1_8_6/lib/soap/processor.rb
new file mode 100644
index 0000000000..3c6dbedf2f
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/processor.rb
@@ -0,0 +1,66 @@
+# SOAP4R - marshal/unmarshal interface.
+# Copyright (C) 2000, 2001, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/datatypes'
+require 'soap/soap'
+require 'soap/element'
+require 'soap/parser'
+require 'soap/generator'
+require 'soap/encodingstyle/soapHandler'
+require 'soap/encodingstyle/literalHandler'
+require 'soap/encodingstyle/aspDotNetHandler'
+
+
+module SOAP
+
+
+module Processor
+  @@default_parser_option = {}
+
+  class << self
+  public
+
+    def marshal(env, opt = {}, io = nil)
+      generator = create_generator(opt)
+      marshalled_str = generator.generate(env, io)
+      unless env.external_content.empty?
+	opt[:external_content] = env.external_content
+      end
+      marshalled_str
+    end
+
+    def unmarshal(stream, opt = {})
+      parser = create_parser(opt)
+      parser.parse(stream)
+    end
+
+    def default_parser_option=(rhs)
+      @@default_parser_option = rhs
+    end
+
+    def default_parser_option
+      @@default_parser_option
+    end
+
+  private
+
+    def create_generator(opt)
+      SOAPGenerator.new(opt)
+    end
+
+    def create_parser(opt)
+      if opt.empty?
+	opt = @@default_parser_option
+      end
+      ::SOAP::Parser.new(opt)
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/property.rb b/ruby_1_8_6/lib/soap/property.rb
new file mode 100644
index 0000000000..882dcc6e28
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/property.rb
@@ -0,0 +1,333 @@
+# soap/property.rb: SOAP4R - Property implementation.
+# Copyright (C) 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module SOAP
+
+
+# Property stream format:
+#
+#   line separator is \r?\n.  1 line per a property.
+#   line which begins with '#' is a comment line.  empty line is ignored, too.
+#   key/value separator is ':' or '='.
+#   '\' as escape character.  but line separator cannot be escaped.
+#   \s at the head/tail of key/value are trimmed.
+#
+#   '[' + key + ']' indicates property section.  for example,
+#
+#     [aaa.bbb]
+#     ccc = ddd
+#     eee.fff = ggg
+#     []
+#     aaa.hhh = iii
+#
+#   is the same as;
+#
+#     aaa.bbb.ccc = ddd
+#     aaa.bbb.eee.fff = ggg
+#     aaa.hhh = iii
+#
+class Property
+  FrozenError = (RUBY_VERSION >= "1.9.0") ? RuntimeError : TypeError
+
+  include Enumerable
+
+  module Util
+    def const_from_name(fqname)
+      fqname.split("::").inject(Kernel) { |klass, name| klass.const_get(name) }
+    end
+    module_function :const_from_name
+
+    def require_from_name(fqname)
+      require File.join(fqname.split("::").collect { |ele| ele.downcase })
+    end
+    module_function :require_from_name
+  end
+
+  def self.load(stream)
+    new.load(stream)
+  end
+
+  def self.loadproperty(propname)
+    new.loadproperty(propname)
+  end
+
+  def initialize
+    @store = Hash.new
+    @hook = Hash.new
+    @self_hook = Array.new
+    @locked = false
+  end
+
+  KEY_REGSRC = '([^=:\\\\]*(?:\\\\.[^=:\\\\]*)*)'
+  DEF_REGSRC = '\\s*' + KEY_REGSRC + '\\s*[=:]\\s*(.*)'
+  COMMENT_REGEXP = Regexp.new('^(?:#.*|)$')
+  CATDEF_REGEXP = Regexp.new("^\\[\\s*#{KEY_REGSRC}\\s*\\]$")
+  LINE_REGEXP = Regexp.new("^#{DEF_REGSRC}$")
+  def load(stream)
+    key_prefix = ""
+    stream.each_with_index do |line, lineno|
+      line.sub!(/\r?\n\z/, '')
+      case line
+      when COMMENT_REGEXP
+	next
+      when CATDEF_REGEXP
+	key_prefix = $1.strip
+      when LINE_REGEXP
+	key, value = $1.strip, $2.strip
+	key = "#{key_prefix}.#{key}" unless key_prefix.empty?
+	key, value = loadstr(key), loadstr(value)
+	self[key] = value
+      else
+	raise TypeError.new(
+	  "property format error at line #{lineno + 1}: `#{line}'")
+      end
+    end
+    self
+  end
+
+  # find property from $:.
+  def loadproperty(propname)
+    return loadpropertyfile(propname) if File.file?(propname)
+    $:.each do |path|
+      if File.file?(file = File.join(path, propname))
+        return loadpropertyfile(file)
+      end
+    end
+    nil
+  end
+
+  # name: a Symbol, String or an Array
+  def [](name)
+    referent(name_to_a(name))
+  end
+
+  # name: a Symbol, String or an Array
+  # value: an Object
+  def []=(name, value)
+    name_pair = name_to_a(name).freeze
+    hooks = assign(name_pair, value)
+    hooks.each do |hook|
+      hook.call(name_pair, value)
+    end
+    value
+  end
+
+  # value: an Object
+  # key is generated by property
+  def <<(value)
+    self[generate_new_key] = value
+  end
+
+  # name: a Symbol, String or an Array; nil means hook to the root
+  # cascade: true/false; for cascading hook of sub key
+  # hook: block which will be called with 2 args, name and value
+  def add_hook(name = nil, cascade = false, &hook)
+    if name == nil or name == true or name == false
+      cascade = name
+      assign_self_hook(cascade, &hook)
+    else
+      assign_hook(name_to_a(name), cascade, &hook)
+    end
+  end
+
+  def each
+    @store.each do |key, value|
+      yield(key, value)
+    end
+  end
+
+  def empty?
+    @store.empty?
+  end
+
+  def keys
+    @store.keys
+  end
+
+  def values
+    @store.values
+  end
+
+  def lock(cascade = false)
+    if cascade
+      each_key do |key|
+	key.lock(cascade)
+      end
+    end
+    @locked = true
+    self
+  end
+
+  def unlock(cascade = false)
+    @locked = false
+    if cascade
+      each_key do |key|
+	key.unlock(cascade)
+      end
+    end
+    self
+  end
+
+  def locked?
+    @locked
+  end
+
+protected
+
+  def deref_key(key)
+    check_lock(key)
+    ref = @store[key] ||= self.class.new
+    unless propkey?(ref)
+      raise ArgumentError.new("key `#{key}' already defined as a value")
+    end
+    ref
+  end
+
+  def local_referent(key)
+    check_lock(key)
+    if propkey?(@store[key]) and @store[key].locked?
+      raise FrozenError.new("cannot split any key from locked property")
+    end
+    @store[key]
+  end
+
+  def local_assign(key, value)
+    check_lock(key)
+    if @locked
+      if propkey?(value)
+	raise FrozenError.new("cannot add any key to locked property")
+      elsif propkey?(@store[key])
+	raise FrozenError.new("cannot override any key in locked property")
+      end
+    end
+    @store[key] = value
+  end
+
+  def local_hook(key, direct)
+    hooks = []
+    (@self_hook + (@hook[key] || NO_HOOK)).each do |hook, cascade|
+      hooks << hook if direct or cascade
+    end
+    hooks
+  end
+
+  def local_assign_hook(key, cascade, &hook)
+    check_lock(key)
+    @store[key] ||= nil
+    (@hook[key] ||= []) << [hook, cascade]
+  end
+
+private
+
+  NO_HOOK = [].freeze
+
+  def referent(ary)
+    ary[0..-2].inject(self) { |ref, name|
+      ref.deref_key(to_key(name))
+    }.local_referent(to_key(ary.last))
+  end
+
+  def assign(ary, value)
+    ref = self
+    hook = NO_HOOK
+    ary[0..-2].each do |name|
+      key = to_key(name)
+      hook += ref.local_hook(key, false)
+      ref = ref.deref_key(key)
+    end
+    last_key = to_key(ary.last)
+    ref.local_assign(last_key, value)
+    hook + ref.local_hook(last_key, true)
+  end
+
+  def assign_hook(ary, cascade, &hook)
+    ary[0..-2].inject(self) { |ref, name|
+      ref.deref_key(to_key(name))
+    }.local_assign_hook(to_key(ary.last), cascade, &hook)
+  end
+
+  def assign_self_hook(cascade, &hook)
+    check_lock(nil)
+    @self_hook << [hook, cascade]
+  end
+
+  def each_key
+    self.each do |key, value|
+      if propkey?(value)
+	yield(value)
+      end
+    end
+  end
+
+  def check_lock(key)
+    if @locked and (key.nil? or !@store.key?(key))
+      raise FrozenError.new("cannot add any key to locked property")
+    end
+  end
+
+  def propkey?(value)
+    value.is_a?(::SOAP::Property)
+  end
+
+  def name_to_a(name)
+    case name
+    when Symbol
+      [name]
+    when String
+      name.scan(/[^.\\]+(?:\\.[^.\\])*/)	# split with unescaped '.'
+    when Array
+      name
+    else
+      raise ArgumentError.new("Unknown name #{name}(#{name.class})")
+    end
+  end
+
+  def to_key(name)
+    name.to_s.downcase
+  end
+
+  def generate_new_key
+    if @store.empty?
+      "0"
+    else
+      (key_max + 1).to_s
+    end
+  end
+
+  def key_max
+    (@store.keys.max { |l, r| l.to_s.to_i <=> r.to_s.to_i }).to_s.to_i
+  end
+
+  def loadpropertyfile(file)
+    puts "find property at #{file}" if $DEBUG
+    File.open(file) do |f|
+      load(f)
+    end
+  end
+
+  def loadstr(str)
+    str.gsub(/\\./) { |c| eval("\"#{c}\"") }
+  end
+end
+
+
+end
+
+
+# for ruby/1.6.
+unless Enumerable.instance_methods.include?('inject')
+  module Enumerable
+    def inject(init)
+      result = init
+      each do |item|
+	result = yield(result, item)
+      end
+      result
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/soap/rpc/cgistub.rb b/ruby_1_8_6/lib/soap/rpc/cgistub.rb
new file mode 100644
index 0000000000..487f05a9bf
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/rpc/cgistub.rb
@@ -0,0 +1,206 @@
+# SOAP4R - CGI/mod_ruby stub library
+# Copyright (C) 2001, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/streamHandler'
+require 'webrick/httpresponse'
+require 'webrick/httpstatus'
+require 'logger'
+require 'soap/rpc/soaplet'
+
+
+module SOAP
+module RPC
+
+
+###
+# SYNOPSIS
+#   CGIStub.new
+#
+# DESCRIPTION
+#   To be written...
+#
+class CGIStub < Logger::Application
+  include SOAP
+  include WEBrick
+
+  class SOAPRequest
+    attr_reader :body
+
+    def [](var); end
+
+    def meta_vars; end
+  end
+
+  class SOAPStdinRequest < SOAPRequest
+    attr_reader :body
+
+    def initialize(stream)
+      size = ENV['CONTENT_LENGTH'].to_i || 0
+      @body = stream.read(size)
+    end
+
+    def [](var)
+      ENV[var.gsub(/-/, '_').upcase]
+    end
+
+    def meta_vars
+      {
+        'HTTP_SOAPACTION' => ENV['HTTP_SOAPAction']
+      }
+    end
+  end
+
+  class SOAPFCGIRequest < SOAPRequest
+    attr_reader :body
+
+    def initialize(request)
+      @request = request
+      @body = @request.in.read
+    end
+
+    def [](var)
+      @request.env[var.gsub(/-/, '_').upcase]
+    end
+
+    def meta_vars
+      {
+        'HTTP_SOAPACTION' => @request.env['HTTP_SOAPAction']
+      }
+    end
+  end
+
+  def initialize(appname, default_namespace)
+    super(appname)
+    set_log(STDERR)
+    self.level = ERROR
+    @default_namespace = default_namespace
+    @remote_host = ENV['REMOTE_HOST'] || ENV['REMOTE_ADDR'] || 'unknown'
+    @router = ::SOAP::RPC::Router.new(self.class.name)
+    @soaplet = ::SOAP::RPC::SOAPlet.new(@router)
+    on_init
+  end
+  
+  def on_init
+    # do extra initialization in a derived class if needed.
+  end
+
+  def mapping_registry
+    @router.mapping_registry
+  end
+
+  def mapping_registry=(value)
+    @router.mapping_registry = value
+  end
+
+  def generate_explicit_type
+    @router.generate_explicit_type
+  end
+
+  def generate_explicit_type=(generate_explicit_type)
+    @router.generate_explicit_type = generate_explicit_type
+  end
+
+  # servant entry interface
+
+  def add_rpc_servant(obj, namespace = @default_namespace)
+    @router.add_rpc_servant(obj, namespace)
+  end
+  alias add_servant add_rpc_servant
+
+  def add_headerhandler(obj)
+    @router.add_headerhandler(obj)
+  end
+  alias add_rpc_headerhandler add_headerhandler
+
+  # method entry interface
+
+  def add_rpc_method(obj, name, *param)
+    add_rpc_method_with_namespace_as(@default_namespace, obj, name, name, *param)
+  end
+  alias add_method add_rpc_method
+
+  def add_rpc_method_as(obj, name, name_as, *param)
+    add_rpc_method_with_namespace_as(@default_namespace, obj, name, name_as, *param)
+  end
+  alias add_method_as add_rpc_method_as
+
+  def add_rpc_method_with_namespace(namespace, obj, name, *param)
+    add_rpc_method_with_namespace_as(namespace, obj, name, name, *param)
+  end
+  alias add_method_with_namespace add_rpc_method_with_namespace
+
+  def add_rpc_method_with_namespace_as(namespace, obj, name, name_as, *param)
+    qname = XSD::QName.new(namespace, name_as)
+    soapaction = nil
+    param_def = SOAPMethod.derive_rpc_param_def(obj, name, *param)
+    @router.add_rpc_operation(obj, qname, soapaction, name, param_def)
+  end
+  alias add_method_with_namespace_as add_rpc_method_with_namespace_as
+
+  def add_rpc_operation(receiver, qname, soapaction, name, param_def, opt = {})
+    @router.add_rpc_operation(receiver, qname, soapaction, name, param_def, opt)
+  end
+
+  def add_document_operation(receiver, soapaction, name, param_def, opt = {})
+    @router.add_document_operation(receiver, soapaction, name, param_def, opt)
+  end
+
+  def set_fcgi_request(request)
+    @fcgi = request
+  end
+
+private
+
+  HTTPVersion = WEBrick::HTTPVersion.new('1.0')       # dummy; ignored
+
+  def run
+    res = WEBrick::HTTPResponse.new({:HTTPVersion => HTTPVersion})
+    begin
+      @log.info { "received a request from '#{ @remote_host }'" }
+      if @fcgi
+        req = SOAPFCGIRequest.new(@fcgi)
+      else
+        req = SOAPStdinRequest.new($stdin)
+      end
+      @soaplet.do_POST(req, res)
+    rescue HTTPStatus::EOFError, HTTPStatus::RequestTimeout => ex
+      res.set_error(ex)
+    rescue HTTPStatus::Error => ex
+      res.set_error(ex)
+    rescue HTTPStatus::Status => ex
+      res.status = ex.code
+    rescue StandardError, NameError => ex # for Ruby 1.6
+      res.set_error(ex, true)
+    ensure
+      if defined?(MOD_RUBY)
+        r = Apache.request
+        r.status = res.status
+        r.content_type = res.content_type
+        r.send_http_header
+        buf = res.body
+      else
+        buf = ''
+        res.send_response(buf)
+        buf.sub!(/^[^\r]+\r\n/, '')       # Trim status line.
+      end
+      @log.debug { "SOAP CGI Response:\n#{ buf }" }
+      if @fcgi
+        @fcgi.out.print buf
+        @fcgi.finish
+        @fcgi = nil
+      else
+        print buf
+      end
+    end
+    0
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/rpc/driver.rb b/ruby_1_8_6/lib/soap/rpc/driver.rb
new file mode 100644
index 0000000000..0fb4e82488
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/rpc/driver.rb
@@ -0,0 +1,254 @@
+# SOAP4R - SOAP RPC driver
+# Copyright (C) 2000, 2001, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/soap'
+require 'soap/mapping'
+require 'soap/mapping/wsdlliteralregistry'
+require 'soap/rpc/rpc'
+require 'soap/rpc/proxy'
+require 'soap/rpc/element'
+require 'soap/streamHandler'
+require 'soap/property'
+require 'soap/header/handlerset'
+
+
+module SOAP
+module RPC
+
+
+class Driver
+  class << self
+    if RUBY_VERSION >= "1.7.0"
+      def __attr_proxy(symbol, assignable = false)
+        name = symbol.to_s
+        define_method(name) {
+          @proxy.__send__(name)
+        }
+        if assignable
+          aname = name + '='
+          define_method(aname) { |rhs|
+            @proxy.__send__(aname, rhs)
+          }
+        end
+      end
+    else
+      def __attr_proxy(symbol, assignable = false)
+        name = symbol.to_s
+        module_eval <<-EOS
+          def #{name}
+            @proxy.#{name}
+          end
+        EOS
+        if assignable
+          module_eval <<-EOS
+            def #{name}=(value)
+              @proxy.#{name} = value
+            end
+          EOS
+        end
+      end
+    end
+  end
+
+  __attr_proxy :endpoint_url, true
+  __attr_proxy :mapping_registry, true
+  __attr_proxy :default_encodingstyle, true
+  __attr_proxy :generate_explicit_type, true
+  __attr_proxy :allow_unqualified_element, true
+  __attr_proxy :headerhandler
+  __attr_proxy :streamhandler
+  __attr_proxy :test_loopback_response
+  __attr_proxy :reset_stream
+
+  attr_reader :proxy
+  attr_reader :options
+  attr_accessor :soapaction
+
+  def inspect
+    "#<#{self.class}:#{@proxy.inspect}>"
+  end
+
+  def httpproxy
+    options["protocol.http.proxy"]
+  end
+
+  def httpproxy=(httpproxy)
+    options["protocol.http.proxy"] = httpproxy
+  end
+
+  def wiredump_dev
+    options["protocol.http.wiredump_dev"]
+  end
+
+  def wiredump_dev=(wiredump_dev)
+    options["protocol.http.wiredump_dev"] = wiredump_dev
+  end
+
+  def mandatorycharset
+    options["protocol.mandatorycharset"]
+  end
+
+  def mandatorycharset=(mandatorycharset)
+    options["protocol.mandatorycharset"] = mandatorycharset
+  end
+
+  def wiredump_file_base
+    options["protocol.wiredump_file_base"]
+  end
+
+  def wiredump_file_base=(wiredump_file_base)
+    options["protocol.wiredump_file_base"] = wiredump_file_base
+  end
+
+  def initialize(endpoint_url, namespace = nil, soapaction = nil)
+    @namespace = namespace
+    @soapaction = soapaction
+    @options = setup_options
+    @wiredump_file_base = nil
+    @proxy = Proxy.new(endpoint_url, @soapaction, @options)
+  end
+
+  def loadproperty(propertyname)
+    unless options.loadproperty(propertyname)
+      raise LoadError.new("No such property to load -- #{propertyname}")
+    end
+  end
+
+  def add_rpc_method(name, *params)
+    add_rpc_method_with_soapaction_as(name, name, @soapaction, *params)
+  end
+
+  def add_rpc_method_as(name, name_as, *params)
+    add_rpc_method_with_soapaction_as(name, name_as, @soapaction, *params)
+  end
+
+  def add_rpc_method_with_soapaction(name, soapaction, *params)
+    add_rpc_method_with_soapaction_as(name, name, soapaction, *params)
+  end
+
+  def add_rpc_method_with_soapaction_as(name, name_as, soapaction, *params)
+    param_def = SOAPMethod.create_rpc_param_def(params)
+    qname = XSD::QName.new(@namespace, name_as)
+    @proxy.add_rpc_method(qname, soapaction, name, param_def)
+    add_rpc_method_interface(name, param_def)
+  end
+
+  # add_method is for shortcut of typical rpc/encoded method definition.
+  alias add_method add_rpc_method
+  alias add_method_as add_rpc_method_as
+  alias add_method_with_soapaction add_rpc_method_with_soapaction
+  alias add_method_with_soapaction_as add_rpc_method_with_soapaction_as
+
+  def add_document_method(name, soapaction, req_qname, res_qname)
+    param_def = SOAPMethod.create_doc_param_def(req_qname, res_qname)
+    @proxy.add_document_method(soapaction, name, param_def)
+    add_document_method_interface(name, param_def)
+  end
+
+  def add_rpc_operation(qname, soapaction, name, param_def, opt = {})
+    @proxy.add_rpc_operation(qname, soapaction, name, param_def, opt)
+    add_rpc_method_interface(name, param_def)
+  end
+
+  def add_document_operation(soapaction, name, param_def, opt = {})
+    @proxy.add_document_operation(soapaction, name, param_def, opt)
+    add_document_method_interface(name, param_def)
+  end
+
+  def invoke(headers, body)
+    if headers and !headers.is_a?(SOAPHeader)
+      headers = create_header(headers)
+    end
+    set_wiredump_file_base(body.elename.name)
+    env = @proxy.invoke(headers, body)
+    if env.nil?
+      return nil, nil
+    else
+      return env.header, env.body
+    end
+  end
+
+  def call(name, *params)
+    set_wiredump_file_base(name)
+    @proxy.call(name, *params)
+  end
+
+private
+
+  def set_wiredump_file_base(name)
+    if @wiredump_file_base
+      @proxy.set_wiredump_file_base("#{@wiredump_file_base}_#{name}")
+    end
+  end
+
+  def create_header(headers)
+    header = SOAPHeader.new()
+    headers.each do |content, mustunderstand, encodingstyle|
+      header.add(SOAPHeaderItem.new(content, mustunderstand, encodingstyle))
+    end
+    header
+  end
+
+  def setup_options
+    if opt = Property.loadproperty(::SOAP::PropertyName)
+      opt = opt["client"]
+    end
+    opt ||= Property.new
+    opt.add_hook("protocol.mandatorycharset") do |key, value|
+      @proxy.mandatorycharset = value
+    end
+    opt.add_hook("protocol.wiredump_file_base") do |key, value|
+      @wiredump_file_base = value
+    end
+    opt["protocol.http.charset"] ||= XSD::Charset.xml_encoding_label
+    opt["protocol.http.proxy"] ||= Env::HTTP_PROXY
+    opt["protocol.http.no_proxy"] ||= Env::NO_PROXY
+    opt
+  end
+
+  def add_rpc_method_interface(name, param_def)
+    param_count = RPC::SOAPMethod.param_count(param_def,
+      RPC::SOAPMethod::IN, RPC::SOAPMethod::INOUT)
+    add_method_interface(name, param_count)
+  end
+
+  def add_document_method_interface(name, param_def)
+    param_count = RPC::SOAPMethod.param_count(param_def, RPC::SOAPMethod::IN)
+    add_method_interface(name, param_count)
+  end
+
+  if RUBY_VERSION > "1.7.0"
+    def add_method_interface(name, param_count)
+      ::SOAP::Mapping.define_singleton_method(self, name) do |*arg|
+        unless arg.size == param_count
+          raise ArgumentError.new(
+          "wrong number of arguments (#{arg.size} for #{param_count})")
+        end
+        call(name, *arg)
+      end
+      self.method(name)
+    end
+  else
+    def add_method_interface(name, param_count)
+      instance_eval <<-EOS
+        def #{name}(*arg)
+          unless arg.size == #{param_count}
+            raise ArgumentError.new(
+              "wrong number of arguments (\#{arg.size} for #{param_count})")
+          end
+          call(#{name.dump}, *arg)
+        end
+      EOS
+      self.method(name)
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/rpc/element.rb b/ruby_1_8_6/lib/soap/rpc/element.rb
new file mode 100644
index 0000000000..c224b03d0d
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/rpc/element.rb
@@ -0,0 +1,325 @@
+# SOAP4R - RPC element definition.
+# Copyright (C) 2000, 2001, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/baseData'
+
+
+module SOAP
+
+# Add method definitions for RPC to common definition in element.rb
+class SOAPBody < SOAPStruct
+  public
+
+  def request
+    root_node
+  end
+
+  def response
+    root = root_node
+    if !@is_fault
+      if root.nil?
+        nil
+      elsif root.is_a?(SOAPBasetype)
+        root
+      else
+        # Initial element is [retval].
+        root[0]
+      end
+    else
+      root
+    end
+  end
+
+  def outparams
+    root = root_node
+    if !@is_fault and !root.nil? and !root.is_a?(SOAPBasetype)
+      op = root[1..-1]
+      op = nil if op && op.empty?
+      op
+    else
+      nil
+    end
+  end
+
+  def fault
+    if @is_fault
+      self['fault']
+    else
+      nil
+    end
+  end
+
+  def fault=(fault)
+    @is_fault = true
+    add_member('fault', fault)
+  end
+end
+
+
+module RPC
+
+
+class RPCError < Error; end
+class MethodDefinitionError < RPCError; end
+class ParameterError < RPCError; end
+
+class SOAPMethod < SOAPStruct
+  RETVAL = 'retval'
+  IN = 'in'
+  OUT = 'out'
+  INOUT = 'inout'
+
+  attr_reader :param_def
+  attr_reader :inparam
+  attr_reader :outparam
+  attr_reader :retval_name
+  attr_reader :retval_class_name
+
+  def initialize(qname, param_def = nil)
+    super(nil)
+    @elename = qname
+    @encodingstyle = nil
+
+    @param_def = param_def
+
+    @signature = []
+    @inparam_names = []
+    @inoutparam_names = []
+    @outparam_names = []
+
+    @inparam = {}
+    @outparam = {}
+    @retval_name = nil
+    @retval_class_name = nil
+
+    init_param(@param_def) if @param_def
+  end
+
+  def have_outparam?
+    @outparam_names.size > 0
+  end
+
+  def input_params
+    collect_params(IN, INOUT)
+  end
+
+  def output_params
+    collect_params(OUT, INOUT)
+  end
+
+  def set_param(params)
+    params.each do |param, data|
+      @inparam[param] = data
+      data.elename.name = param
+      data.parent = self
+    end
+  end
+
+  def set_outparam(params)
+    params.each do |param, data|
+      @outparam[param] = data
+      data.elename.name = param
+    end
+  end
+
+  def SOAPMethod.param_count(param_def, *type)
+    count = 0
+    param_def.each do |io_type, name, param_type|
+      if type.include?(io_type)
+        count += 1
+      end
+    end
+    count
+  end
+
+  def SOAPMethod.derive_rpc_param_def(obj, name, *param)
+    if param.size == 1 and param[0].is_a?(Array)
+      return param[0]
+    end
+    if param.empty?
+      method = obj.method(name)
+      param_names = (1..method.arity.abs).collect { |i| "p#{i}" }
+    else
+      param_names = param
+    end
+    create_rpc_param_def(param_names)
+  end
+
+  def SOAPMethod.create_rpc_param_def(param_names)
+    param_def = []
+    param_names.each do |param_name|
+      param_def.push([IN, param_name, nil])
+    end
+    param_def.push([RETVAL, 'return', nil])
+    param_def
+  end
+
+  def SOAPMethod.create_doc_param_def(req_qnames, res_qnames)
+    req_qnames = [req_qnames] if req_qnames.is_a?(XSD::QName)
+    res_qnames = [res_qnames] if res_qnames.is_a?(XSD::QName)
+    param_def = []
+    req_qnames.each do |qname|
+      param_def << [IN, qname.name, [nil, qname.namespace, qname.name]]
+    end
+    res_qnames.each do |qname|
+      param_def << [OUT, qname.name, [nil, qname.namespace, qname.name]]
+    end
+    param_def
+  end
+
+private
+
+  def collect_params(*type)
+    names = []
+    @signature.each do |io_type, name, param_type|
+      names << name if type.include?(io_type)
+    end
+    names
+  end
+
+  def init_param(param_def)
+    param_def.each do |io_type, name, param_type|
+      case io_type
+      when IN
+        @signature.push([IN, name, param_type])
+        @inparam_names.push(name)
+      when OUT
+        @signature.push([OUT, name, param_type])
+        @outparam_names.push(name)
+      when INOUT
+        @signature.push([INOUT, name, param_type])
+        @inoutparam_names.push(name)
+      when RETVAL
+        if @retval_name
+          raise MethodDefinitionError.new('duplicated retval')
+        end
+        @retval_name = name
+        @retval_class_name = nil
+        if param_type
+          if param_type[0].is_a?(String)
+            @retval_class_name = Mapping.class_from_name(param_type[0])
+          else
+            @retval_class_name = param_type[0]
+          end
+        end
+      else
+        raise MethodDefinitionError.new("unknown type: #{io_type}")
+      end
+    end
+  end
+end
+
+
+class SOAPMethodRequest < SOAPMethod
+  attr_accessor :soapaction
+
+  def SOAPMethodRequest.create_request(qname, *params)
+    param_def = []
+    param_value = []
+    i = 0
+    params.each do |param|
+      param_name = "p#{i}"
+      i += 1
+      param_def << [IN, param_name, nil]
+      param_value << [param_name, param]
+    end
+    param_def << [RETVAL, 'return', nil]
+    o = new(qname, param_def)
+    o.set_param(param_value)
+    o
+  end
+
+  def initialize(qname, param_def = nil, soapaction = nil)
+    check_elename(qname)
+    super(qname, param_def)
+    @soapaction = soapaction
+  end
+
+  def each
+    input_params.each do |name|
+      unless @inparam[name]
+        raise ParameterError.new("parameter: #{name} was not given")
+      end
+      yield(name, @inparam[name])
+    end
+  end
+
+  def dup
+    req = self.class.new(@elename.dup, @param_def, @soapaction)
+    req.encodingstyle = @encodingstyle
+    req
+  end
+
+  def create_method_response(response_name = nil)
+    response_name ||=
+      XSD::QName.new(@elename.namespace, @elename.name + 'Response')
+    SOAPMethodResponse.new(response_name, @param_def)
+  end
+
+private
+
+  def check_elename(qname)
+    # NCName & ruby's method name
+    unless /\A[\w_][\w\d_\-]*\z/ =~ qname.name
+      raise MethodDefinitionError.new("element name '#{qname.name}' not allowed")
+    end
+  end
+end
+
+
+class SOAPMethodResponse < SOAPMethod
+
+  def initialize(qname, param_def = nil)
+    super(qname, param_def)
+    @retval = nil
+  end
+
+  def retval=(retval)
+    @retval = retval
+    @retval.elename = @retval.elename.dup_name(@retval_name || 'return')
+    retval.parent = self
+    retval
+  end
+
+  def each
+    if @retval_name and !@retval.is_a?(SOAPVoid)
+      yield(@retval_name, @retval)
+    end
+
+    output_params.each do |name|
+      unless @outparam[name]
+        raise ParameterError.new("parameter: #{name} was not given")
+      end
+      yield(name, @outparam[name])
+    end
+  end
+end
+
+
+# To return(?) void explicitly.
+#  def foo(input_var)
+#    ...
+#    return SOAP::RPC::SOAPVoid.new
+#  end
+class SOAPVoid < XSD::XSDAnySimpleType
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  Name = XSD::QName.new(Mapping::RubyCustomTypeNamespace, nil)
+
+public
+  def initialize()
+    @elename = Name
+    @id = nil
+    @precedents = []
+    @parent = nil
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/rpc/httpserver.rb b/ruby_1_8_6/lib/soap/rpc/httpserver.rb
new file mode 100644
index 0000000000..6d2a72ebe3
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/rpc/httpserver.rb
@@ -0,0 +1,129 @@
+# SOAP4R - WEBrick HTTP Server
+# Copyright (C) 2003, 2004 by NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'logger'
+require 'soap/rpc/soaplet'
+require 'soap/streamHandler'
+require 'webrick'
+
+
+module SOAP
+module RPC
+
+
+class HTTPServer < Logger::Application
+  attr_reader :server
+  attr_accessor :default_namespace
+
+  def initialize(config)
+    super(config[:SOAPHTTPServerApplicationName] || self.class.name)
+    @default_namespace = config[:SOAPDefaultNamespace]
+    @webrick_config = config.dup
+    self.level = Logger::Severity::ERROR # keep silent by default
+    @webrick_config[:Logger] ||= @log
+    @log = @webrick_config[:Logger]     # sync logger of App and HTTPServer
+    @router = ::SOAP::RPC::Router.new(self.class.name)
+    @soaplet = ::SOAP::RPC::SOAPlet.new(@router)
+    on_init
+    @server = WEBrick::HTTPServer.new(@webrick_config)
+    @server.mount('/', @soaplet)
+  end
+
+  def on_init
+    # do extra initialization in a derived class if needed.
+  end
+
+  def status
+    @server.status if @server
+  end
+
+  def shutdown
+    @server.shutdown if @server
+  end
+
+  def mapping_registry
+    @router.mapping_registry
+  end
+
+  def mapping_registry=(mapping_registry)
+    @router.mapping_registry = mapping_registry
+  end
+
+  def generate_explicit_type
+    @router.generate_explicit_type
+  end
+
+  def generate_explicit_type=(generate_explicit_type)
+    @router.generate_explicit_type = generate_explicit_type
+  end
+
+  # servant entry interface
+
+  def add_rpc_request_servant(factory, namespace = @default_namespace)
+    @router.add_rpc_request_servant(factory, namespace)
+  end
+
+  def add_rpc_servant(obj, namespace = @default_namespace)
+    @router.add_rpc_servant(obj, namespace)
+  end
+  
+  def add_request_headerhandler(factory)
+    @router.add_request_headerhandler(factory)
+  end
+
+  def add_headerhandler(obj)
+    @router.add_headerhandler(obj)
+  end
+  alias add_rpc_headerhandler add_headerhandler
+
+  # method entry interface
+
+  def add_rpc_method(obj, name, *param)
+    add_rpc_method_as(obj, name, name, *param)
+  end
+  alias add_method add_rpc_method
+
+  def add_rpc_method_as(obj, name, name_as, *param)
+    qname = XSD::QName.new(@default_namespace, name_as)
+    soapaction = nil
+    param_def = SOAPMethod.derive_rpc_param_def(obj, name, *param)
+    @router.add_rpc_operation(obj, qname, soapaction, name, param_def)
+  end
+  alias add_method_as add_rpc_method_as
+
+  def add_document_method(obj, soapaction, name, req_qnames, res_qnames)
+    param_def = SOAPMethod.create_doc_param_def(req_qnames, res_qnames)
+    @router.add_document_operation(obj, soapaction, name, param_def)
+  end
+
+  def add_rpc_operation(receiver, qname, soapaction, name, param_def, opt = {})
+    @router.add_rpc_operation(receiver, qname, soapaction, name, param_def, opt)
+  end
+
+  def add_rpc_request_operation(factory, qname, soapaction, name, param_def, opt = {})
+    @router.add_rpc_request_operation(factory, qname, soapaction, name, param_def, opt)
+  end
+
+  def add_document_operation(receiver, soapaction, name, param_def, opt = {})
+    @router.add_document_operation(receiver, soapaction, name, param_def, opt)
+  end
+
+  def add_document_request_operation(factory, soapaction, name, param_def, opt = {})
+    @router.add_document_request_operation(factory, soapaction, name, param_def, opt)
+  end
+
+private
+
+  def run
+    @server.start
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/rpc/proxy.rb b/ruby_1_8_6/lib/soap/rpc/proxy.rb
new file mode 100644
index 0000000000..7dfda62006
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/rpc/proxy.rb
@@ -0,0 +1,497 @@
+# SOAP4R - RPC Proxy library.
+# Copyright (C) 2000, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/soap'
+require 'soap/processor'
+require 'soap/mapping'
+require 'soap/rpc/rpc'
+require 'soap/rpc/element'
+require 'soap/streamHandler'
+require 'soap/mimemessage'
+
+
+module SOAP
+module RPC
+
+
+class Proxy
+  include SOAP
+
+public
+
+  attr_accessor :soapaction
+  attr_accessor :mandatorycharset
+  attr_accessor :allow_unqualified_element
+  attr_accessor :default_encodingstyle
+  attr_accessor :generate_explicit_type
+  attr_reader :headerhandler
+  attr_reader :streamhandler
+
+  attr_accessor :mapping_registry
+  attr_accessor :literal_mapping_registry
+
+  attr_reader :operation
+
+  def initialize(endpoint_url, soapaction, options)
+    @endpoint_url = endpoint_url
+    @soapaction = soapaction
+    @options = options
+    @streamhandler = HTTPStreamHandler.new(
+      @options["protocol.http"] ||= ::SOAP::Property.new)
+    @operation = {}
+    @mandatorycharset = nil
+    @allow_unqualified_element = true
+    @default_encodingstyle = nil
+    @generate_explicit_type = true
+    @headerhandler = Header::HandlerSet.new
+    @mapping_registry = nil
+    @literal_mapping_registry = ::SOAP::Mapping::WSDLLiteralRegistry.new
+  end
+
+  def inspect
+    "#<#{self.class}:#{@endpoint_url}>"
+  end
+
+  def endpoint_url
+    @endpoint_url
+  end
+
+  def endpoint_url=(endpoint_url)
+    @endpoint_url = endpoint_url
+    reset_stream
+  end
+
+  def reset_stream
+    @streamhandler.reset(@endpoint_url)
+  end
+
+  def set_wiredump_file_base(wiredump_file_base)
+    @streamhandler.wiredump_file_base = wiredump_file_base
+  end
+
+  def test_loopback_response
+    @streamhandler.test_loopback_response
+  end
+
+  def add_rpc_operation(qname, soapaction, name, param_def, opt = {})
+    opt[:request_qname] = qname
+    opt[:request_style] ||= :rpc
+    opt[:response_style] ||= :rpc
+    opt[:request_use] ||= :encoded
+    opt[:response_use] ||= :encoded
+    @operation[name] = Operation.new(soapaction, param_def, opt)
+  end
+
+  def add_document_operation(soapaction, name, param_def, opt = {})
+    opt[:request_style] ||= :document
+    opt[:response_style] ||= :document
+    opt[:request_use] ||= :literal
+    opt[:response_use] ||= :literal
+    # default values of these values are unqualified in XML Schema.
+    # set true for backward compatibility.
+    unless opt.key?(:elementformdefault)
+      opt[:elementformdefault] = true
+    end
+    unless opt.key?(:attributeformdefault)
+      opt[:attributeformdefault] = true
+    end
+    @operation[name] = Operation.new(soapaction, param_def, opt)
+  end
+
+  # add_method is for shortcut of typical rpc/encoded method definition.
+  alias add_method add_rpc_operation
+  alias add_rpc_method add_rpc_operation
+  alias add_document_method add_document_operation
+
+  def invoke(req_header, req_body, opt = nil)
+    opt ||= create_encoding_opt
+    route(req_header, req_body, opt, opt)
+  end
+
+  def call(name, *params)
+    unless op_info = @operation[name]
+      raise MethodDefinitionError, "method: #{name} not defined"
+    end
+    mapping_opt = create_mapping_opt
+    req_header = create_request_header
+    req_body = SOAPBody.new(
+      op_info.request_body(params, @mapping_registry,
+        @literal_mapping_registry, mapping_opt)
+    )
+    reqopt = create_encoding_opt(
+      :soapaction => op_info.soapaction || @soapaction,
+      :envelopenamespace => @options["soap.envelope.requestnamespace"],
+      :default_encodingstyle =>
+        @default_encodingstyle || op_info.request_default_encodingstyle,
+      :elementformdefault => op_info.elementformdefault,
+      :attributeformdefault => op_info.attributeformdefault
+    )
+    resopt = create_encoding_opt(
+      :envelopenamespace => @options["soap.envelope.responsenamespace"],
+      :default_encodingstyle =>
+        @default_encodingstyle || op_info.response_default_encodingstyle,
+      :elementformdefault => op_info.elementformdefault,
+      :attributeformdefault => op_info.attributeformdefault
+    )
+    env = route(req_header, req_body, reqopt, resopt)
+    raise EmptyResponseError unless env
+    receive_headers(env.header)
+    begin
+      check_fault(env.body)
+    rescue ::SOAP::FaultError => e
+      op_info.raise_fault(e, @mapping_registry, @literal_mapping_registry)
+    end
+    op_info.response_obj(env.body, @mapping_registry,
+      @literal_mapping_registry, mapping_opt)
+  end
+
+  def route(req_header, req_body, reqopt, resopt)
+    req_env = ::SOAP::SOAPEnvelope.new(req_header, req_body)
+    unless reqopt[:envelopenamespace].nil?
+      set_envelopenamespace(req_env, reqopt[:envelopenamespace])
+    end
+    reqopt[:external_content] = nil
+    conn_data = marshal(req_env, reqopt)
+    if ext = reqopt[:external_content]
+      mime = MIMEMessage.new
+      ext.each do |k, v|
+      	mime.add_attachment(v.data)
+      end
+      mime.add_part(conn_data.send_string + "\r\n")
+      mime.close
+      conn_data.send_string = mime.content_str
+      conn_data.send_contenttype = mime.headers['content-type'].str
+    end
+    conn_data = @streamhandler.send(@endpoint_url, conn_data,
+      reqopt[:soapaction])
+    if conn_data.receive_string.empty?
+      return nil
+    end
+    unmarshal(conn_data, resopt)
+  end
+
+  def check_fault(body)
+    if body.fault
+      raise SOAP::FaultError.new(body.fault)
+    end
+  end
+
+private
+
+  def set_envelopenamespace(env, namespace)
+    env.elename = XSD::QName.new(namespace, env.elename.name)
+    if env.header
+      env.header.elename = XSD::QName.new(namespace, env.header.elename.name)
+    end
+    if env.body
+      env.body.elename = XSD::QName.new(namespace, env.body.elename.name)
+    end
+  end
+
+  def create_request_header
+    headers = @headerhandler.on_outbound
+    if headers.empty?
+      nil
+    else
+      h = ::SOAP::SOAPHeader.new
+      headers.each do |header|
+        h.add(header.elename.name, header)
+      end
+      h
+    end
+  end
+
+  def receive_headers(headers)
+    @headerhandler.on_inbound(headers) if headers
+  end
+
+  def marshal(env, opt)
+    send_string = Processor.marshal(env, opt)
+    StreamHandler::ConnectionData.new(send_string)
+  end
+
+  def unmarshal(conn_data, opt)
+    contenttype = conn_data.receive_contenttype
+    if /#{MIMEMessage::MultipartContentType}/i =~ contenttype
+      opt[:external_content] = {}
+      mime = MIMEMessage.parse("Content-Type: " + contenttype,
+	conn_data.receive_string)
+      mime.parts.each do |part|
+	value = Attachment.new(part.content)
+	value.contentid = part.contentid
+	obj = SOAPAttachment.new(value)
+	opt[:external_content][value.contentid] = obj if value.contentid
+      end
+      opt[:charset] = @mandatorycharset ||
+	StreamHandler.parse_media_type(mime.root.headers['content-type'].str)
+      env = Processor.unmarshal(mime.root.content, opt)
+    else
+      opt[:charset] = @mandatorycharset ||
+	::SOAP::StreamHandler.parse_media_type(contenttype)
+      env = Processor.unmarshal(conn_data.receive_string, opt)
+    end
+    unless env.is_a?(::SOAP::SOAPEnvelope)
+      raise ResponseFormatError.new(
+        "response is not a SOAP envelope: #{conn_data.receive_string}")
+    end
+    env
+  end
+
+  def create_header(headers)
+    header = SOAPHeader.new()
+    headers.each do |content, mustunderstand, encodingstyle|
+      header.add(SOAPHeaderItem.new(content, mustunderstand, encodingstyle))
+    end
+    header
+  end
+
+  def create_encoding_opt(hash = nil)
+    opt = {}
+    opt[:default_encodingstyle] = @default_encodingstyle
+    opt[:allow_unqualified_element] = @allow_unqualified_element
+    opt[:generate_explicit_type] = @generate_explicit_type
+    opt[:no_indent] = @options["soap.envelope.no_indent"]
+    opt[:use_numeric_character_reference] =
+      @options["soap.envelope.use_numeric_character_reference"]
+    opt.update(hash) if hash
+    opt
+  end
+
+  def create_mapping_opt(hash = nil)
+    opt = {
+      :external_ces => @options["soap.mapping.external_ces"]
+    }
+    opt.update(hash) if hash
+    opt
+  end
+
+  class Operation
+    attr_reader :soapaction
+    attr_reader :request_style
+    attr_reader :response_style
+    attr_reader :request_use
+    attr_reader :response_use
+    attr_reader :elementformdefault
+    attr_reader :attributeformdefault
+
+    def initialize(soapaction, param_def, opt)
+      @soapaction = soapaction
+      @request_style = opt[:request_style]
+      @response_style = opt[:response_style]
+      @request_use = opt[:request_use]
+      @response_use = opt[:response_use]
+      # set nil(unqualified) by default
+      @elementformdefault = opt[:elementformdefault]
+      @attributeformdefault = opt[:attributeformdefault]
+      check_style(@request_style)
+      check_style(@response_style)
+      check_use(@request_use)
+      check_use(@response_use)
+      if @request_style == :rpc
+        @rpc_request_qname = opt[:request_qname]
+        if @rpc_request_qname.nil?
+          raise MethodDefinitionError.new("rpc_request_qname must be given")
+        end
+        @rpc_method_factory =
+          RPC::SOAPMethodRequest.new(@rpc_request_qname, param_def, @soapaction)
+      else
+        @doc_request_qnames = []
+        @doc_request_qualified = []
+        @doc_response_qnames = []
+        @doc_response_qualified = []
+        param_def.each do |inout, paramname, typeinfo, eleinfo|
+          klass_not_used, nsdef, namedef = typeinfo
+          qualified = eleinfo
+          if namedef.nil?
+            raise MethodDefinitionError.new("qname must be given")
+          end
+          case inout
+          when SOAPMethod::IN
+            @doc_request_qnames << XSD::QName.new(nsdef, namedef)
+            @doc_request_qualified << qualified
+          when SOAPMethod::OUT
+            @doc_response_qnames << XSD::QName.new(nsdef, namedef)
+            @doc_response_qualified << qualified
+          else
+            raise MethodDefinitionError.new(
+              "illegal inout definition for document style: #{inout}")
+          end
+        end
+      end
+    end
+
+    def request_default_encodingstyle
+      (@request_use == :encoded) ? EncodingNamespace : LiteralNamespace
+    end
+
+    def response_default_encodingstyle
+      (@response_use == :encoded) ? EncodingNamespace : LiteralNamespace
+    end
+
+    def request_body(values, mapping_registry, literal_mapping_registry, opt)
+      if @request_style == :rpc
+        request_rpc(values, mapping_registry, literal_mapping_registry, opt)
+      else
+        request_doc(values, mapping_registry, literal_mapping_registry, opt)
+      end
+    end
+
+    def response_obj(body, mapping_registry, literal_mapping_registry, opt)
+      if @response_style == :rpc
+        response_rpc(body, mapping_registry, literal_mapping_registry, opt)
+      else
+        response_doc(body, mapping_registry, literal_mapping_registry, opt)
+      end
+    end
+
+    def raise_fault(e, mapping_registry, literal_mapping_registry)
+      if @response_style == :rpc
+        Mapping.fault2exception(e, mapping_registry)
+      else
+        Mapping.fault2exception(e, literal_mapping_registry)
+      end
+    end
+
+  private
+
+    def check_style(style)
+      unless [:rpc, :document].include?(style)
+        raise MethodDefinitionError.new("unknown style: #{style}")
+      end
+    end
+
+    def check_use(use)
+      unless [:encoded, :literal].include?(use)
+        raise MethodDefinitionError.new("unknown use: #{use}")
+      end
+    end
+
+    def request_rpc(values, mapping_registry, literal_mapping_registry, opt)
+      if @request_use == :encoded
+        request_rpc_enc(values, mapping_registry, opt)
+      else
+        request_rpc_lit(values, literal_mapping_registry, opt)
+      end
+    end
+
+    def request_doc(values, mapping_registry, literal_mapping_registry, opt)
+      if @request_use == :encoded
+        request_doc_enc(values, mapping_registry, opt)
+      else
+        request_doc_lit(values, literal_mapping_registry, opt)
+      end
+    end
+
+    def request_rpc_enc(values, mapping_registry, opt)
+      method = @rpc_method_factory.dup
+      names = method.input_params
+      obj = create_request_obj(names, values)
+      soap = Mapping.obj2soap(obj, mapping_registry, @rpc_request_qname, opt)
+      method.set_param(soap)
+      method
+    end
+
+    def request_rpc_lit(values, mapping_registry, opt)
+      method = @rpc_method_factory.dup
+      params = {}
+      idx = 0
+      method.input_params.each do |name|
+        params[name] = Mapping.obj2soap(values[idx], mapping_registry, 
+          XSD::QName.new(nil, name), opt)
+        idx += 1
+      end
+      method.set_param(params)
+      method
+    end
+
+    def request_doc_enc(values, mapping_registry, opt)
+      (0...values.size).collect { |idx|
+        ele = Mapping.obj2soap(values[idx], mapping_registry, nil, opt)
+        ele.elename = @doc_request_qnames[idx]
+        ele
+      }
+    end
+
+    def request_doc_lit(values, mapping_registry, opt)
+      (0...values.size).collect { |idx|
+        ele = Mapping.obj2soap(values[idx], mapping_registry,
+          @doc_request_qnames[idx], opt)
+        ele.encodingstyle = LiteralNamespace
+        if ele.respond_to?(:qualified)
+          ele.qualified = @doc_request_qualified[idx]
+        end
+        ele
+      }
+    end
+
+    def response_rpc(body, mapping_registry, literal_mapping_registry, opt)
+      if @response_use == :encoded
+        response_rpc_enc(body, mapping_registry, opt)
+      else
+        response_rpc_lit(body, literal_mapping_registry, opt)
+      end
+    end
+
+    def response_doc(body, mapping_registry, literal_mapping_registry, opt)
+      if @response_use == :encoded
+        return *response_doc_enc(body, mapping_registry, opt)
+      else
+        return *response_doc_lit(body, literal_mapping_registry, opt)
+      end
+    end
+
+    def response_rpc_enc(body, mapping_registry, opt)
+      ret = nil
+      if body.response
+        ret = Mapping.soap2obj(body.response, mapping_registry,
+          @rpc_method_factory.retval_class_name, opt)
+      end
+      if body.outparams
+        outparams = body.outparams.collect { |outparam|
+          Mapping.soap2obj(outparam, mapping_registry, nil, opt)
+        }
+        [ret].concat(outparams)
+      else
+        ret
+      end
+    end
+
+    def response_rpc_lit(body, mapping_registry, opt)
+      body.root_node.collect { |key, value|
+        Mapping.soap2obj(value, mapping_registry,
+          @rpc_method_factory.retval_class_name, opt)
+      }
+    end
+
+    def response_doc_enc(body, mapping_registry, opt)
+      body.collect { |key, value|
+        Mapping.soap2obj(value, mapping_registry, nil, opt)
+      }
+    end
+
+    def response_doc_lit(body, mapping_registry, opt)
+      body.collect { |key, value|
+        Mapping.soap2obj(value, mapping_registry)
+      }
+    end
+
+    def create_request_obj(names, params)
+      o = Object.new
+      idx = 0
+      while idx < params.length
+        o.instance_variable_set('@' + names[idx], params[idx])
+        idx += 1
+      end
+      o
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/rpc/router.rb b/ruby_1_8_6/lib/soap/rpc/router.rb
new file mode 100644
index 0000000000..71c6eb625b
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/rpc/router.rb
@@ -0,0 +1,594 @@
+# SOAP4R - RPC Routing library
+# Copyright (C) 2001, 2002, 2004, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/soap'
+require 'soap/processor'
+require 'soap/mapping'
+require 'soap/mapping/wsdlliteralregistry'
+require 'soap/rpc/rpc'
+require 'soap/rpc/element'
+require 'soap/streamHandler'
+require 'soap/mimemessage'
+require 'soap/header/handlerset'
+
+
+module SOAP
+module RPC
+
+
+class Router
+  include SOAP
+
+  attr_reader :actor
+  attr_accessor :mapping_registry
+  attr_accessor :literal_mapping_registry
+  attr_accessor :generate_explicit_type
+  attr_accessor :external_ces
+
+  def initialize(actor)
+    @actor = actor
+    @mapping_registry = nil
+    @headerhandler = Header::HandlerSet.new
+    @literal_mapping_registry = ::SOAP::Mapping::WSDLLiteralRegistry.new
+    @generate_explicit_type = true
+    @external_ces = nil
+    @operation_by_soapaction = {}
+    @operation_by_qname = {}
+    @headerhandlerfactory = []
+  end
+
+  ###
+  ## header handler interface
+  #
+  def add_request_headerhandler(factory)
+    unless factory.respond_to?(:create)
+      raise TypeError.new("factory must respond to 'create'")
+    end
+    @headerhandlerfactory << factory
+  end
+
+  def add_headerhandler(handler)
+    @headerhandler.add(handler)
+  end
+
+  ###
+  ## servant definition interface
+  #
+  def add_rpc_request_servant(factory, namespace)
+    unless factory.respond_to?(:create)
+      raise TypeError.new("factory must respond to 'create'")
+    end
+    obj = factory.create        # a dummy instance for introspection
+    ::SOAP::RPC.defined_methods(obj).each do |name|
+      begin
+        qname = XSD::QName.new(namespace, name)
+        param_def = ::SOAP::RPC::SOAPMethod.derive_rpc_param_def(obj, name)
+        opt = create_styleuse_option(:rpc, :encoded)
+        add_rpc_request_operation(factory, qname, nil, name, param_def, opt)
+      rescue SOAP::RPC::MethodDefinitionError => e
+        p e if $DEBUG
+      end
+    end
+  end
+
+  def add_rpc_servant(obj, namespace)
+    ::SOAP::RPC.defined_methods(obj).each do |name|
+      begin
+        qname = XSD::QName.new(namespace, name)
+        param_def = ::SOAP::RPC::SOAPMethod.derive_rpc_param_def(obj, name)
+        opt = create_styleuse_option(:rpc, :encoded)
+        add_rpc_operation(obj, qname, nil, name, param_def, opt)
+      rescue SOAP::RPC::MethodDefinitionError => e
+        p e if $DEBUG
+      end
+    end
+  end
+  alias add_servant add_rpc_servant
+
+  ###
+  ## operation definition interface
+  #
+  def add_rpc_operation(receiver, qname, soapaction, name, param_def, opt = {})
+    ensure_styleuse_option(opt, :rpc, :encoded)
+    opt[:request_qname] = qname
+    op = ApplicationScopeOperation.new(soapaction, receiver, name, param_def,
+      opt)
+    if opt[:request_style] != :rpc
+      raise RPCRoutingError.new("illegal request_style given")
+    end
+    assign_operation(soapaction, qname, op)
+  end
+  alias add_method add_rpc_operation
+  alias add_rpc_method add_rpc_operation
+
+  def add_rpc_request_operation(factory, qname, soapaction, name, param_def, opt = {})
+    ensure_styleuse_option(opt, :rpc, :encoded)
+    opt[:request_qname] = qname
+    op = RequestScopeOperation.new(soapaction, factory, name, param_def, opt)
+    if opt[:request_style] != :rpc
+      raise RPCRoutingError.new("illegal request_style given")
+    end
+    assign_operation(soapaction, qname, op)
+  end
+
+  def add_document_operation(receiver, soapaction, name, param_def, opt = {})
+    #
+    # adopt workaround for doc/lit wrapper method
+    # (you should consider to simply use rpc/lit service)
+    #
+    #unless soapaction
+    #  raise RPCRoutingError.new("soapaction is a must for document method")
+    #end
+    ensure_styleuse_option(opt, :document, :literal)
+    op = ApplicationScopeOperation.new(soapaction, receiver, name, param_def,
+      opt)
+    if opt[:request_style] != :document
+      raise RPCRoutingError.new("illegal request_style given")
+    end
+    assign_operation(soapaction, first_input_part_qname(param_def), op)
+  end
+  alias add_document_method add_document_operation
+
+  def add_document_request_operation(factory, soapaction, name, param_def, opt = {})
+    #
+    # adopt workaround for doc/lit wrapper method
+    # (you should consider to simply use rpc/lit service)
+    #
+    #unless soapaction
+    #  raise RPCRoutingError.new("soapaction is a must for document method")
+    #end
+    ensure_styleuse_option(opt, :document, :literal)
+    op = RequestScopeOperation.new(soapaction, receiver, name, param_def, opt)
+    if opt[:request_style] != :document
+      raise RPCRoutingError.new("illegal request_style given")
+    end
+    assign_operation(soapaction, first_input_part_qname(param_def), op)
+  end
+
+  def route(conn_data)
+    # we cannot set request_default_encodingsyle before parsing the content.
+    env = unmarshal(conn_data)
+    if env.nil?
+      raise ArgumentError.new("illegal SOAP marshal format")
+    end
+    op = lookup_operation(conn_data.soapaction, env.body)
+    headerhandler = @headerhandler.dup
+    @headerhandlerfactory.each do |f|
+      headerhandler.add(f.create)
+    end
+    receive_headers(headerhandler, env.header)
+    soap_response = default_encodingstyle = nil
+    begin
+      soap_response =
+        op.call(env.body, @mapping_registry, @literal_mapping_registry,
+          create_mapping_opt)
+      default_encodingstyle = op.response_default_encodingstyle
+    rescue Exception
+      soap_response = fault($!)
+      default_encodingstyle = nil
+    end
+    conn_data.is_fault = true if soap_response.is_a?(SOAPFault)
+    header = call_headers(headerhandler)
+    body = SOAPBody.new(soap_response)
+    env = SOAPEnvelope.new(header, body)
+    marshal(conn_data, env, default_encodingstyle)
+  end
+
+  # Create fault response string.
+  def create_fault_response(e)
+    env = SOAPEnvelope.new(SOAPHeader.new, SOAPBody.new(fault(e)))
+    opt = {}
+    opt[:external_content] = nil
+    response_string = Processor.marshal(env, opt)
+    conn_data = StreamHandler::ConnectionData.new(response_string)
+    conn_data.is_fault = true
+    if ext = opt[:external_content]
+      mimeize(conn_data, ext)
+    end
+    conn_data
+  end
+
+private
+
+  def first_input_part_qname(param_def)
+    param_def.each do |inout, paramname, typeinfo|
+      if inout == SOAPMethod::IN
+        klass, nsdef, namedef = typeinfo
+        return XSD::QName.new(nsdef, namedef)
+      end
+    end
+    nil
+  end
+
+  def create_styleuse_option(style, use)
+    opt = {}
+    opt[:request_style] = opt[:response_style] = style
+    opt[:request_use] = opt[:response_use] = use
+    opt
+  end
+
+  def ensure_styleuse_option(opt, style, use)
+    opt[:request_style] ||= style
+    opt[:response_style] ||= style
+    opt[:request_use] ||= use
+    opt[:response_use] ||= use
+  end
+
+  def assign_operation(soapaction, qname, op)
+    assigned = false
+    if soapaction and !soapaction.empty?
+      @operation_by_soapaction[soapaction] = op
+      assigned = true
+    end
+    if qname
+      @operation_by_qname[qname] = op
+      assigned = true
+    end
+    unless assigned
+      raise RPCRoutingError.new("cannot assign operation")
+    end
+  end
+
+  def lookup_operation(soapaction, body)
+    if op = @operation_by_soapaction[soapaction]
+      return op
+    end
+    qname = body.root_node.elename
+    if op = @operation_by_qname[qname]
+      return op
+    end
+    if soapaction
+      raise RPCRoutingError.new(
+        "operation: #{soapaction} #{qname} not supported")
+    else
+      raise RPCRoutingError.new("operation: #{qname} not supported")
+    end
+  end
+
+  def call_headers(headerhandler)
+    headers = headerhandler.on_outbound
+    if headers.empty?
+      nil
+    else
+      h = ::SOAP::SOAPHeader.new
+      headers.each do |header|
+        h.add(header.elename.name, header)
+      end
+      h
+    end
+  end
+
+  def receive_headers(headerhandler, headers)
+    headerhandler.on_inbound(headers) if headers
+  end
+
+  def unmarshal(conn_data)
+    opt = {}
+    contenttype = conn_data.receive_contenttype
+    if /#{MIMEMessage::MultipartContentType}/i =~ contenttype
+      opt[:external_content] = {}
+      mime = MIMEMessage.parse("Content-Type: " + contenttype,
+        conn_data.receive_string)
+      mime.parts.each do |part|
+	value = Attachment.new(part.content)
+	value.contentid = part.contentid
+	obj = SOAPAttachment.new(value)
+	opt[:external_content][value.contentid] = obj if value.contentid
+      end
+      opt[:charset] =
+	StreamHandler.parse_media_type(mime.root.headers['content-type'].str)
+      env = Processor.unmarshal(mime.root.content, opt)
+    else
+      opt[:charset] = ::SOAP::StreamHandler.parse_media_type(contenttype)
+      env = Processor.unmarshal(conn_data.receive_string, opt)
+    end
+    charset = opt[:charset]
+    conn_data.send_contenttype = "text/xml; charset=\"#{charset}\""
+    env
+  end
+
+  def marshal(conn_data, env, default_encodingstyle = nil)
+    opt = {}
+    opt[:external_content] = nil
+    opt[:default_encodingstyle] = default_encodingstyle
+    opt[:generate_explicit_type] = @generate_explicit_type
+    response_string = Processor.marshal(env, opt)
+    conn_data.send_string = response_string
+    if ext = opt[:external_content]
+      mimeize(conn_data, ext)
+    end
+    conn_data
+  end
+
+  def mimeize(conn_data, ext)
+    mime = MIMEMessage.new
+    ext.each do |k, v|
+      mime.add_attachment(v.data)
+    end
+    mime.add_part(conn_data.send_string + "\r\n")
+    mime.close
+    conn_data.send_string = mime.content_str
+    conn_data.send_contenttype = mime.headers['content-type'].str
+    conn_data
+  end
+
+  # Create fault response.
+  def fault(e)
+    detail = Mapping::SOAPException.new(e)
+    SOAPFault.new(
+      SOAPString.new('Server'),
+      SOAPString.new(e.to_s),
+      SOAPString.new(@actor),
+      Mapping.obj2soap(detail, @mapping_registry))
+  end
+
+  def create_mapping_opt
+    { :external_ces => @external_ces }
+  end
+
+  class Operation
+    attr_reader :name
+    attr_reader :soapaction
+    attr_reader :request_style
+    attr_reader :response_style
+    attr_reader :request_use
+    attr_reader :response_use
+
+    def initialize(soapaction, name, param_def, opt)
+      @soapaction = soapaction
+      @name = name
+      @request_style = opt[:request_style]
+      @response_style = opt[:response_style]
+      @request_use = opt[:request_use]
+      @response_use = opt[:response_use]
+      check_style(@request_style)
+      check_style(@response_style)
+      check_use(@request_use)
+      check_use(@response_use)
+      if @response_style == :rpc
+        request_qname = opt[:request_qname] or raise
+        @rpc_method_factory =
+          RPC::SOAPMethodRequest.new(request_qname, param_def, @soapaction)
+        @rpc_response_qname = opt[:response_qname]
+      else
+        @doc_request_qnames = []
+        @doc_request_qualified = []
+        @doc_response_qnames = []
+        @doc_response_qualified = []
+        param_def.each do |inout, paramname, typeinfo, eleinfo|
+          klass, nsdef, namedef = typeinfo
+          qualified = eleinfo
+          case inout
+          when SOAPMethod::IN
+            @doc_request_qnames << XSD::QName.new(nsdef, namedef)
+            @doc_request_qualified << qualified
+          when SOAPMethod::OUT
+            @doc_response_qnames << XSD::QName.new(nsdef, namedef)
+            @doc_response_qualified << qualified
+          else
+            raise ArgumentError.new(
+              "illegal inout definition for document style: #{inout}")
+          end
+        end
+      end
+    end
+
+    def request_default_encodingstyle
+      (@request_use == :encoded) ? EncodingNamespace : LiteralNamespace
+    end
+
+    def response_default_encodingstyle
+      (@response_use == :encoded) ? EncodingNamespace : LiteralNamespace
+    end
+
+    def call(body, mapping_registry, literal_mapping_registry, opt)
+      if @request_style == :rpc
+        values = request_rpc(body, mapping_registry, literal_mapping_registry,
+          opt)
+      else
+        values = request_document(body, mapping_registry,
+          literal_mapping_registry, opt)
+      end
+      result = receiver.method(@name.intern).call(*values)
+      return result if result.is_a?(SOAPFault)
+      if @response_style == :rpc
+        response_rpc(result, mapping_registry, literal_mapping_registry, opt)
+      else
+        response_doc(result, mapping_registry, literal_mapping_registry, opt)
+      end
+    end
+
+  private
+
+    def receiver
+      raise NotImplementedError.new('must be defined in derived class')
+    end
+
+    def request_rpc(body, mapping_registry, literal_mapping_registry, opt)
+      request = body.request
+      unless request.is_a?(SOAPStruct)
+        raise RPCRoutingError.new("not an RPC style")
+      end
+      if @request_use == :encoded
+        request_rpc_enc(request, mapping_registry, opt)
+      else
+        request_rpc_lit(request, literal_mapping_registry, opt)
+      end
+    end
+
+    def request_document(body, mapping_registry, literal_mapping_registry, opt)
+      # ToDo: compare names with @doc_request_qnames
+      if @request_use == :encoded
+        request_doc_enc(body, mapping_registry, opt)
+      else
+        request_doc_lit(body, literal_mapping_registry, opt)
+      end
+    end
+
+    def request_rpc_enc(request, mapping_registry, opt)
+      param = Mapping.soap2obj(request, mapping_registry, nil, opt)
+      request.collect { |key, value|
+        param[key]
+      }
+    end
+
+    def request_rpc_lit(request, mapping_registry, opt)
+      request.collect { |key, value|
+        Mapping.soap2obj(value, mapping_registry, nil, opt)
+      }
+    end
+
+    def request_doc_enc(body, mapping_registry, opt)
+      body.collect { |key, value|
+        Mapping.soap2obj(value, mapping_registry, nil, opt)
+      }
+    end
+
+    def request_doc_lit(body, mapping_registry, opt)
+      body.collect { |key, value|
+        Mapping.soap2obj(value, mapping_registry, nil, opt)
+      }
+    end
+
+    def response_rpc(result, mapping_registry, literal_mapping_registry, opt)
+      if @response_use == :encoded
+        response_rpc_enc(result, mapping_registry, opt)
+      else
+        response_rpc_lit(result, literal_mapping_registry, opt)
+      end
+    end
+    
+    def response_doc(result, mapping_registry, literal_mapping_registry, opt)
+      if @doc_response_qnames.size == 1 and !result.is_a?(Array)
+        result = [result]
+      end
+      if result.size != @doc_response_qnames.size
+        raise "required #{@doc_response_qnames.size} responses " +
+          "but #{result.size} given"
+      end
+      if @response_use == :encoded
+        response_doc_enc(result, mapping_registry, opt)
+      else
+        response_doc_lit(result, literal_mapping_registry, opt)
+      end
+    end
+
+    def response_rpc_enc(result, mapping_registry, opt)
+      soap_response =
+        @rpc_method_factory.create_method_response(@rpc_response_qname)
+      if soap_response.have_outparam?
+        unless result.is_a?(Array)
+          raise RPCRoutingError.new("out parameter was not returned")
+        end
+        outparams = {}
+        i = 1
+        soap_response.output_params.each do |outparam|
+          outparams[outparam] = Mapping.obj2soap(result[i], mapping_registry,
+            nil, opt)
+          i += 1
+        end
+        soap_response.set_outparam(outparams)
+        soap_response.retval = Mapping.obj2soap(result[0], mapping_registry,
+          nil, opt)
+      else
+        soap_response.retval = Mapping.obj2soap(result, mapping_registry, nil,
+          opt)
+      end
+      soap_response
+    end
+
+    def response_rpc_lit(result, mapping_registry, opt)
+      soap_response =
+        @rpc_method_factory.create_method_response(@rpc_response_qname)
+      if soap_response.have_outparam?
+        unless result.is_a?(Array)
+          raise RPCRoutingError.new("out parameter was not returned")
+        end
+        outparams = {}
+        i = 1
+        soap_response.output_params.each do |outparam|
+          outparams[outparam] = Mapping.obj2soap(result[i], mapping_registry,
+            XSD::QName.new(nil, outparam), opt)
+          i += 1
+        end
+        soap_response.set_outparam(outparams)
+        soap_response.retval = Mapping.obj2soap(result[0], mapping_registry,
+          XSD::QName.new(nil, soap_response.elename), opt)
+      else
+        soap_response.retval = Mapping.obj2soap(result, mapping_registry,
+          XSD::QName.new(nil, soap_response.elename), opt)
+      end
+      soap_response
+    end
+
+    def response_doc_enc(result, mapping_registry, opt)
+      (0...result.size).collect { |idx|
+        ele = Mapping.obj2soap(result[idx], mapping_registry, nil, opt)
+        ele.elename = @doc_response_qnames[idx]
+        ele
+      }
+    end
+
+    def response_doc_lit(result, mapping_registry, opt)
+      (0...result.size).collect { |idx|
+        ele = Mapping.obj2soap(result[idx], mapping_registry,
+          @doc_response_qnames[idx])
+        ele.encodingstyle = LiteralNamespace
+        if ele.respond_to?(:qualified)
+          ele.qualified = @doc_response_qualified[idx]
+        end
+        ele
+      }
+    end
+
+    def check_style(style)
+      unless [:rpc, :document].include?(style)
+        raise ArgumentError.new("unknown style: #{style}")
+      end
+    end
+
+    def check_use(use)
+      unless [:encoded, :literal].include?(use)
+        raise ArgumentError.new("unknown use: #{use}")
+      end
+    end
+  end
+
+  class ApplicationScopeOperation < Operation
+    def initialize(soapaction, receiver, name, param_def, opt)
+      super(soapaction, name, param_def, opt)
+      @receiver = receiver
+    end
+
+  private
+
+    def receiver
+      @receiver
+    end
+  end
+
+  class RequestScopeOperation < Operation
+    def initialize(soapaction, receiver_factory, name, param_def, opt)
+      super(soapaction, name, param_def, opt)
+      unless receiver_factory.respond_to?(:create)
+        raise TypeError.new("factory must respond to 'create'")
+      end
+      @receiver_factory = receiver_factory
+    end
+
+  private
+
+    def receiver
+      @receiver_factory.create
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/rpc/rpc.rb b/ruby_1_8_6/lib/soap/rpc/rpc.rb
new file mode 100644
index 0000000000..a48b525dbb
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/rpc/rpc.rb
@@ -0,0 +1,25 @@
+# SOAP4R - RPC utility.
+# Copyright (C) 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module SOAP
+
+
+module RPC
+  ServerException = Mapping::MappedException
+
+  def self.defined_methods(obj)
+    if obj.is_a?(Module)
+      obj.methods - Module.methods
+    else
+      obj.methods - Object.instance_methods(true)
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/rpc/soaplet.rb b/ruby_1_8_6/lib/soap/rpc/soaplet.rb
new file mode 100644
index 0000000000..7cccdd3e31
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/rpc/soaplet.rb
@@ -0,0 +1,162 @@
+# SOAP4R - SOAP handler servlet for WEBrick
+# Copyright (C) 2001-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'webrick/httpservlet/abstract'
+require 'webrick/httpstatus'
+require 'soap/rpc/router'
+require 'soap/streamHandler'
+begin
+  require 'stringio'
+  require 'zlib'
+rescue LoadError
+  warn("Loading stringio or zlib failed.  No gzipped response supported.") if $DEBUG
+end
+
+
+warn("Overriding WEBrick::Log#debug") if $DEBUG
+require 'webrick/log'
+module WEBrick
+  class Log < BasicLog
+    alias __debug debug
+    def debug(msg = nil)
+      if block_given? and msg.nil?
+        __debug(yield)
+      else
+        __debug(msg)
+      end
+    end
+  end
+end
+
+
+module SOAP
+module RPC
+
+
+class SOAPlet < WEBrick::HTTPServlet::AbstractServlet
+public
+  attr_reader :options
+
+  def initialize(router = nil)
+    @router = router || ::SOAP::RPC::Router.new(self.class.name)
+    @options = {}
+    @config = {}
+  end
+
+  # for backward compatibility
+  def app_scope_router
+    @router
+  end
+
+  # for backward compatibility
+  def add_servant(obj, namespace)
+    @router.add_rpc_servant(obj, namespace)
+  end
+
+  def allow_content_encoding_gzip=(allow)
+    @options[:allow_content_encoding_gzip] = allow
+  end
+
+  ###
+  ## Servlet interfaces for WEBrick.
+  #
+  def get_instance(config, *options)
+    @config = config
+    self
+  end
+
+  def require_path_info?
+    false
+  end
+
+  def do_GET(req, res)
+    res.header['Allow'] = 'POST'
+    raise WEBrick::HTTPStatus::MethodNotAllowed, "GET request not allowed"
+  end
+
+  def do_POST(req, res)
+    logger.debug { "SOAP request: " + req.body } if logger
+    begin
+      conn_data = ::SOAP::StreamHandler::ConnectionData.new
+      setup_req(conn_data, req)
+      @router.external_ces = @options[:external_ces]
+      conn_data = @router.route(conn_data)
+      setup_res(conn_data, req, res)
+    rescue Exception => e
+      conn_data = @router.create_fault_response(e)
+      res.status = WEBrick::HTTPStatus::RC_INTERNAL_SERVER_ERROR
+      res.body = conn_data.send_string
+      res['content-type'] = conn_data.send_contenttype || "text/xml"
+    end
+    if res.body.is_a?(IO)
+      res.chunked = true
+      logger.debug { "SOAP response: (chunked response not logged)" } if logger
+    else
+      logger.debug { "SOAP response: " + res.body } if logger
+    end
+  end
+
+private
+
+  def logger
+    @config[:Logger]
+  end
+
+  def setup_req(conn_data, req)
+    conn_data.receive_string = req.body
+    conn_data.receive_contenttype = req['content-type']
+    conn_data.soapaction = parse_soapaction(req.meta_vars['HTTP_SOAPACTION'])
+  end
+
+  def setup_res(conn_data, req, res)
+    res['content-type'] = conn_data.send_contenttype
+    if conn_data.is_fault
+      res.status = WEBrick::HTTPStatus::RC_INTERNAL_SERVER_ERROR
+    end
+    if outstring = encode_gzip(req, conn_data.send_string)
+      res['content-encoding'] = 'gzip'
+      res['content-length'] = outstring.size
+      res.body = outstring
+    else
+      res.body = conn_data.send_string
+    end
+  end
+
+  def parse_soapaction(soapaction)
+    if !soapaction.nil? and !soapaction.empty?
+      if /^"(.+)"$/ =~ soapaction
+        return $1
+      end
+    end
+    nil
+  end
+
+  def encode_gzip(req, outstring)
+    unless encode_gzip?(req)
+      return nil
+    end
+    begin
+      ostream = StringIO.new
+      gz = Zlib::GzipWriter.new(ostream)
+      gz.write(outstring)
+      ostream.string
+    ensure
+      gz.close
+    end
+  end
+
+  def encode_gzip?(req)
+    @options[:allow_content_encoding_gzip] and defined?(::Zlib) and
+      req['accept-encoding'] and
+      req['accept-encoding'].split(/,\s*/).include?('gzip')
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/rpc/standaloneServer.rb b/ruby_1_8_6/lib/soap/rpc/standaloneServer.rb
new file mode 100644
index 0000000000..080343ba33
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/rpc/standaloneServer.rb
@@ -0,0 +1,43 @@
+# SOAP4R - WEBrick Server
+# Copyright (C) 2003 by NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/rpc/httpserver'
+
+
+module SOAP
+module RPC
+
+
+class StandaloneServer < HTTPServer
+  def initialize(appname, default_namespace, host = "0.0.0.0", port = 8080)
+    @appname = appname
+    @default_namespace = default_namespace
+    @host = host
+    @port = port
+    super(create_config)
+  end
+
+  alias add_servant add_rpc_servant
+  alias add_headerhandler add_rpc_headerhandler
+
+private
+
+  def create_config
+    {
+      :BindAddress => @host,
+      :Port => @port,
+      :AccessLog => [],
+      :SOAPDefaultNamespace => @default_namespace,
+      :SOAPHTTPServerApplicationName => @appname,
+    }
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/soap/soap.rb b/ruby_1_8_6/lib/soap/soap.rb
new file mode 100644
index 0000000000..12e09eccfe
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/soap.rb
@@ -0,0 +1,140 @@
+# soap/soap.rb: SOAP4R - Base definitions.
+# Copyright (C) 2000-2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'xsd/charset'
+
+
+module SOAP
+
+
+VERSION = Version = '1.5.5'
+PropertyName = 'soap/property'
+
+EnvelopeNamespace = 'http://schemas.xmlsoap.org/soap/envelope/'
+EncodingNamespace = 'http://schemas.xmlsoap.org/soap/encoding/'
+LiteralNamespace = 'http://xml.apache.org/xml-soap/literalxml'
+
+NextActor = 'http://schemas.xmlsoap.org/soap/actor/next'
+
+EleEnvelope = 'Envelope'
+EleHeader = 'Header'
+EleBody = 'Body'
+EleFault = 'Fault'
+EleFaultString = 'faultstring'
+EleFaultActor = 'faultactor'
+EleFaultCode = 'faultcode'
+EleFaultDetail = 'detail'
+
+AttrMustUnderstand = 'mustUnderstand'
+AttrEncodingStyle = 'encodingStyle'
+AttrActor = 'actor'
+AttrRoot = 'root'
+AttrArrayType = 'arrayType'
+AttrOffset = 'offset'
+AttrPosition = 'position'
+ValueArray = 'Array'
+
+EleEnvelopeName = XSD::QName.new(EnvelopeNamespace, EleEnvelope).freeze
+EleHeaderName = XSD::QName.new(EnvelopeNamespace, EleHeader).freeze
+EleBodyName = XSD::QName.new(EnvelopeNamespace, EleBody).freeze
+EleFaultName = XSD::QName.new(EnvelopeNamespace, EleFault).freeze
+EleFaultStringName = XSD::QName.new(nil, EleFaultString).freeze
+EleFaultActorName = XSD::QName.new(nil, EleFaultActor).freeze
+EleFaultCodeName = XSD::QName.new(nil, EleFaultCode).freeze
+EleFaultDetailName = XSD::QName.new(nil, EleFaultDetail).freeze
+AttrMustUnderstandName = XSD::QName.new(EnvelopeNamespace, AttrMustUnderstand).freeze
+AttrEncodingStyleName = XSD::QName.new(EnvelopeNamespace, AttrEncodingStyle).freeze
+AttrRootName = XSD::QName.new(EncodingNamespace, AttrRoot).freeze
+AttrArrayTypeName = XSD::QName.new(EncodingNamespace, AttrArrayType).freeze
+AttrOffsetName = XSD::QName.new(EncodingNamespace, AttrOffset).freeze
+AttrPositionName = XSD::QName.new(EncodingNamespace, AttrPosition).freeze
+ValueArrayName = XSD::QName.new(EncodingNamespace, ValueArray).freeze
+
+Base64Literal = 'base64'
+
+SOAPNamespaceTag = 'env'
+XSDNamespaceTag = 'xsd'
+XSINamespaceTag = 'xsi'
+
+MediaType = 'text/xml'
+
+class Error < StandardError; end
+
+class StreamError < Error; end
+class HTTPStreamError < StreamError; end
+class PostUnavailableError < HTTPStreamError; end
+class MPostUnavailableError < HTTPStreamError; end
+
+class ArrayIndexOutOfBoundsError < Error; end
+class ArrayStoreError < Error; end
+
+class RPCRoutingError < Error; end
+class EmptyResponseError < Error; end
+class ResponseFormatError < Error; end
+
+class UnhandledMustUnderstandHeaderError < Error; end
+
+class FaultError < Error
+  attr_reader :faultcode
+  attr_reader :faultstring
+  attr_reader :faultactor
+  attr_accessor :detail
+
+  def initialize(fault)
+    @faultcode = fault.faultcode
+    @faultstring = fault.faultstring
+    @faultactor = fault.faultactor
+    @detail = fault.detail
+    super(self.to_s)
+  end
+
+  def to_s
+    str = nil
+    if @faultstring and @faultstring.respond_to?('data')
+      str = @faultstring.data
+    end
+    str || '(No faultstring)'
+  end
+end
+
+
+module Env
+  def self.getenv(name)
+    ENV[name.downcase] || ENV[name.upcase]
+  end
+
+  use_proxy = getenv('soap_use_proxy') == 'on'
+  HTTP_PROXY = use_proxy ? getenv('http_proxy') : nil
+  NO_PROXY = use_proxy ? getenv('no_proxy') : nil
+end
+
+
+end
+
+
+unless Object.respond_to?(:instance_variable_get)
+  class Object
+    def instance_variable_get(ivarname)
+      instance_eval(ivarname)
+    end
+
+    def instance_variable_set(ivarname, value)
+      instance_eval("#{ivarname} = value")
+    end
+  end
+end
+
+
+unless Kernel.respond_to?(:warn)
+  module Kernel
+    def warn(msg)
+      STDERR.puts(msg + "\n") unless $VERBOSE.nil?
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/soap/streamHandler.rb b/ruby_1_8_6/lib/soap/streamHandler.rb
new file mode 100644
index 0000000000..672396ecce
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/streamHandler.rb
@@ -0,0 +1,229 @@
+# SOAP4R - Stream handler.
+# Copyright (C) 2000, 2001, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/soap'
+require 'soap/httpconfigloader'
+begin
+  require 'stringio'
+  require 'zlib'
+rescue LoadError
+  warn("Loading stringio or zlib failed.  No gzipped response support.") if $DEBUG
+end
+
+
+module SOAP
+
+
+class StreamHandler
+  RUBY_VERSION_STRING = "ruby #{ RUBY_VERSION } (#{ RUBY_RELEASE_DATE }) [#{ RUBY_PLATFORM }]"
+
+  class ConnectionData
+    attr_accessor :send_string
+    attr_accessor :send_contenttype
+    attr_accessor :receive_string
+    attr_accessor :receive_contenttype
+    attr_accessor :is_fault
+    attr_accessor :soapaction
+
+    def initialize(send_string = nil)
+      @send_string = send_string
+      @send_contenttype = nil
+      @receive_string = nil
+      @receive_contenttype = nil
+      @is_fault = false
+      @soapaction = nil
+    end
+  end
+
+  def self.parse_media_type(str)
+    if /^#{ MediaType }(?:\s*;\s*charset=([^"]+|"[^"]+"))?$/i !~ str
+      return nil
+    end
+    charset = $1
+    charset.gsub!(/"/, '') if charset
+    charset || 'us-ascii'
+  end
+
+  def self.create_media_type(charset)
+    "#{ MediaType }; charset=#{ charset }"
+  end
+end
+
+
+class HTTPStreamHandler < StreamHandler
+  include SOAP
+
+  begin
+    require 'http-access2'
+    if HTTPAccess2::VERSION < "2.0"
+      raise LoadError.new("http-access/2.0 or later is required.")
+    end
+    Client = HTTPAccess2::Client
+    RETRYABLE = true
+  rescue LoadError
+    warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG
+    require 'soap/netHttpClient'
+    Client = SOAP::NetHttpClient
+    RETRYABLE = false
+  end
+
+
+public
+  
+  attr_reader :client
+  attr_accessor :wiredump_file_base
+  
+  MAX_RETRY_COUNT = 10       	# [times]
+
+  def initialize(options)
+    super()
+    @client = Client.new(nil, "SOAP4R/#{ Version }")
+    @wiredump_file_base = nil
+    @charset = @wiredump_dev = nil
+    @options = options
+    set_options
+    @client.debug_dev = @wiredump_dev
+    @cookie_store = nil
+    @accept_encoding_gzip = false
+  end
+
+  def test_loopback_response
+    @client.test_loopback_response
+  end
+
+  def accept_encoding_gzip=(allow)
+    @accept_encoding_gzip = allow
+  end
+
+  def inspect
+    "#<#{self.class}>"
+  end
+
+  def send(endpoint_url, conn_data, soapaction = nil, charset = @charset)
+    conn_data.soapaction ||= soapaction # for backward conpatibility
+    send_post(endpoint_url, conn_data, charset)
+  end
+
+  def reset(endpoint_url = nil)
+    if endpoint_url.nil?
+      @client.reset_all
+    else
+      @client.reset(endpoint_url)
+    end
+    @client.save_cookie_store if @cookie_store
+  end
+
+private
+
+  def set_options
+    HTTPConfigLoader.set_options(@client, @options)
+    @charset = @options["charset"] || XSD::Charset.xml_encoding_label
+    @options.add_hook("charset") do |key, value|
+      @charset = value
+    end
+    @wiredump_dev = @options["wiredump_dev"]
+    @options.add_hook("wiredump_dev") do |key, value|
+      @wiredump_dev = value
+      @client.debug_dev = @wiredump_dev
+    end
+    set_cookie_store_file(@options["cookie_store_file"])
+    @options.add_hook("cookie_store_file") do |key, value|
+      set_cookie_store_file(value)
+    end
+    ssl_config = @options["ssl_config"]
+    basic_auth = @options["basic_auth"]
+    @options.lock(true)
+    ssl_config.unlock
+    basic_auth.unlock
+  end
+
+  def set_cookie_store_file(value)
+    value = nil if value and value.empty?
+    @cookie_store = value
+    @client.set_cookie_store(@cookie_store) if @cookie_store
+  end
+
+  def send_post(endpoint_url, conn_data, charset)
+    conn_data.send_contenttype ||= StreamHandler.create_media_type(charset)
+
+    if @wiredump_file_base
+      filename = @wiredump_file_base + '_request.xml'
+      f = File.open(filename, "w")
+      f << conn_data.send_string
+      f.close
+    end
+
+    extra = {}
+    extra['Content-Type'] = conn_data.send_contenttype
+    extra['SOAPAction'] = "\"#{ conn_data.soapaction }\""
+    extra['Accept-Encoding'] = 'gzip' if send_accept_encoding_gzip?
+    send_string = conn_data.send_string
+    @wiredump_dev << "Wire dump:\n\n" if @wiredump_dev
+    begin
+      retry_count = 0
+      while true
+        res = @client.post(endpoint_url, send_string, extra)
+        if RETRYABLE and HTTP::Status.redirect?(res.status)
+          retry_count += 1
+          if retry_count >= MAX_RETRY_COUNT
+            raise HTTPStreamError.new("redirect count exceeded")
+          end
+          endpoint_url = res.header["location"][0]
+          puts "redirected to #{endpoint_url}" if $DEBUG
+        else
+          break
+        end
+      end
+    rescue
+      @client.reset(endpoint_url)
+      raise
+    end
+    @wiredump_dev << "\n\n" if @wiredump_dev
+    receive_string = res.content
+    if @wiredump_file_base
+      filename = @wiredump_file_base + '_response.xml'
+      f = File.open(filename, "w")
+      f << receive_string
+      f.close
+    end
+    case res.status
+    when 405
+      raise PostUnavailableError.new("#{ res.status }: #{ res.reason }")
+    when 200, 500
+      # Nothing to do.
+    else
+      raise HTTPStreamError.new("#{ res.status }: #{ res.reason }")
+    end
+    if res.respond_to?(:header) and !res.header['content-encoding'].empty? and
+        res.header['content-encoding'][0].downcase == 'gzip'
+      receive_string = decode_gzip(receive_string)
+    end
+    conn_data.receive_string = receive_string
+    conn_data.receive_contenttype = res.contenttype
+    conn_data
+  end
+
+  def send_accept_encoding_gzip?
+    @accept_encoding_gzip and defined?(::Zlib)
+  end
+
+  def decode_gzip(instring)
+    unless send_accept_encoding_gzip?
+      raise HTTPStreamError.new("Gzipped response content.")
+    end
+    begin
+      gz = Zlib::GzipReader.new(StringIO.new(instring))
+      gz.read
+    ensure
+      gz.close
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/soap/wsdlDriver.rb b/ruby_1_8_6/lib/soap/wsdlDriver.rb
new file mode 100644
index 0000000000..eba9608df5
--- /dev/null
+++ b/ruby_1_8_6/lib/soap/wsdlDriver.rb
@@ -0,0 +1,575 @@
+# SOAP4R - SOAP WSDL driver
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/parser'
+require 'wsdl/importer'
+require 'xsd/qname'
+require 'xsd/codegen/gensupport'
+require 'soap/mapping/wsdlencodedregistry'
+require 'soap/mapping/wsdlliteralregistry'
+require 'soap/rpc/driver'
+require 'wsdl/soap/methodDefCreator'
+
+
+module SOAP
+
+
+class WSDLDriverFactory
+  class FactoryError < StandardError; end
+
+  attr_reader :wsdl
+
+  def initialize(wsdl)
+    @wsdl = import(wsdl)
+    @methoddefcreator = WSDL::SOAP::MethodDefCreator.new(@wsdl)
+  end
+  
+  def inspect
+    "#<#{self.class}:#{@wsdl.name}>"
+  end
+
+  def create_rpc_driver(servicename = nil, portname = nil)
+    port = find_port(servicename, portname)
+    drv = SOAP::RPC::Driver.new(port.soap_address.location)
+    init_driver(drv, port)
+    add_operation(drv, port)
+    drv
+  end
+
+  # depricated old interface
+  def create_driver(servicename = nil, portname = nil)
+    warn("WSDLDriverFactory#create_driver is depricated.  Use create_rpc_driver instead.")
+    port = find_port(servicename, portname)
+    WSDLDriver.new(@wsdl, port, nil)
+  end
+
+  # Backward compatibility.
+  alias createDriver create_driver
+
+private
+
+  def find_port(servicename = nil, portname = nil)
+    service = port = nil
+    if servicename
+      service = @wsdl.service(
+        XSD::QName.new(@wsdl.targetnamespace, servicename))
+    else
+      service = @wsdl.services[0]
+    end
+    if service.nil?
+      raise FactoryError.new("service #{servicename} not found in WSDL")
+    end
+    if portname
+      port = service.ports[XSD::QName.new(@wsdl.targetnamespace, portname)]
+      if port.nil?
+        raise FactoryError.new("port #{portname} not found in WSDL")
+      end
+    else
+      port = service.ports.find { |port| !port.soap_address.nil? }
+      if port.nil?
+        raise FactoryError.new("no ports have soap:address")
+      end
+    end
+    if port.soap_address.nil?
+      raise FactoryError.new("soap:address element not found in WSDL")
+    end
+    port
+  end
+
+  def init_driver(drv, port)
+    wsdl_elements = @wsdl.collect_elements
+    wsdl_types = @wsdl.collect_complextypes + @wsdl.collect_simpletypes
+    rpc_decode_typemap = wsdl_types +
+      @wsdl.soap_rpc_complextypes(port.find_binding)
+    drv.proxy.mapping_registry =
+      Mapping::WSDLEncodedRegistry.new(rpc_decode_typemap)
+    drv.proxy.literal_mapping_registry =
+      Mapping::WSDLLiteralRegistry.new(wsdl_types, wsdl_elements)
+  end
+
+  def add_operation(drv, port)
+    port.find_binding.operations.each do |op_bind|
+      op_name = op_bind.soapoperation_name
+      soapaction = op_bind.soapaction || ''
+      orgname = op_name.name
+      name = XSD::CodeGen::GenSupport.safemethodname(orgname)
+      param_def = create_param_def(op_bind)
+      opt = {
+        :request_style => op_bind.soapoperation_style,
+        :response_style => op_bind.soapoperation_style,
+        :request_use => op_bind.input.soapbody_use,
+        :response_use => op_bind.output.soapbody_use,
+        :elementformdefault => false,
+        :attributeformdefault => false
+      }
+      if op_bind.soapoperation_style == :rpc
+        drv.add_rpc_operation(op_name, soapaction, name, param_def, opt)
+      else
+        drv.add_document_operation(soapaction, name, param_def, opt)
+      end
+      if orgname != name and orgname.capitalize == name.capitalize
+        ::SOAP::Mapping.define_singleton_method(drv, orgname) do |*arg|
+          __send__(name, *arg)
+        end
+      end
+    end
+  end
+
+  def import(location)
+    WSDL::Importer.import(location)
+  end
+
+  def create_param_def(op_bind)
+    op = op_bind.find_operation
+    if op_bind.soapoperation_style == :rpc
+      param_def = @methoddefcreator.collect_rpcparameter(op)
+    else
+      param_def = @methoddefcreator.collect_documentparameter(op)
+    end
+    # the first element of typedef in param_def is a String like
+    # "::SOAP::SOAPStruct".  turn this String to a class.
+    param_def.collect { |io, name, typedef|
+      typedef[0] = Mapping.class_from_name(typedef[0])
+      [io, name, typedef]
+    }
+  end
+
+  def partqname(part)
+    if part.type
+      part.type
+    else
+      part.element
+    end
+  end
+
+  def param_def(type, name, klass, partqname)
+    [type, name, [klass, partqname.namespace, partqname.name]]
+  end
+
+  def filter_parts(partsdef, partssource)
+    parts = partsdef.split(/\s+/)
+    partssource.find_all { |part| parts.include?(part.name) }
+  end
+end
+
+
+class WSDLDriver
+  class << self
+    if RUBY_VERSION >= "1.7.0"
+      def __attr_proxy(symbol, assignable = false)
+        name = symbol.to_s
+        define_method(name) {
+          @servant.__send__(name)
+        }
+        if assignable
+          aname = name + '='
+          define_method(aname) { |rhs|
+            @servant.__send__(aname, rhs)
+          }
+        end
+      end
+    else
+      def __attr_proxy(symbol, assignable = false)
+        name = symbol.to_s
+        module_eval <<-EOS
+          def #{name}
+            @servant.#{name}
+          end
+        EOS
+        if assignable
+          module_eval <<-EOS
+            def #{name}=(value)
+              @servant.#{name} = value
+            end
+          EOS
+        end
+      end
+    end
+  end
+
+  __attr_proxy :options
+  __attr_proxy :headerhandler
+  __attr_proxy :streamhandler
+  __attr_proxy :test_loopback_response
+  __attr_proxy :endpoint_url, true
+  __attr_proxy :mapping_registry, true		# for RPC unmarshal
+  __attr_proxy :wsdl_mapping_registry, true	# for RPC marshal
+  __attr_proxy :default_encodingstyle, true
+  __attr_proxy :generate_explicit_type, true
+  __attr_proxy :allow_unqualified_element, true
+
+  def httpproxy
+    @servant.options["protocol.http.proxy"]
+  end
+
+  def httpproxy=(httpproxy)
+    @servant.options["protocol.http.proxy"] = httpproxy
+  end
+
+  def wiredump_dev
+    @servant.options["protocol.http.wiredump_dev"]
+  end
+
+  def wiredump_dev=(wiredump_dev)
+    @servant.options["protocol.http.wiredump_dev"] = wiredump_dev
+  end
+
+  def mandatorycharset
+    @servant.options["protocol.mandatorycharset"]
+  end
+
+  def mandatorycharset=(mandatorycharset)
+    @servant.options["protocol.mandatorycharset"] = mandatorycharset
+  end
+
+  def wiredump_file_base
+    @servant.options["protocol.wiredump_file_base"]
+  end
+
+  def wiredump_file_base=(wiredump_file_base)
+    @servant.options["protocol.wiredump_file_base"] = wiredump_file_base
+  end
+
+  def initialize(wsdl, port, logdev)
+    @servant = Servant__.new(self, wsdl, port, logdev)
+  end
+
+  def inspect
+    "#<#{self.class}:#{@servant.port.name}>"
+  end
+
+  def reset_stream
+    @servant.reset_stream
+  end
+
+  # Backward compatibility.
+  alias generateEncodeType= generate_explicit_type=
+
+  class Servant__
+    include SOAP
+
+    attr_reader :options
+    attr_reader :port
+
+    attr_accessor :soapaction
+    attr_accessor :default_encodingstyle
+    attr_accessor :allow_unqualified_element
+    attr_accessor :generate_explicit_type
+    attr_accessor :mapping_registry
+    attr_accessor :wsdl_mapping_registry
+
+    def initialize(host, wsdl, port, logdev)
+      @host = host
+      @wsdl = wsdl
+      @port = port
+      @logdev = logdev
+      @soapaction = nil
+      @options = setup_options
+      @default_encodingstyle = nil
+      @allow_unqualified_element = nil
+      @generate_explicit_type = false
+      @mapping_registry = nil		# for rpc unmarshal
+      @wsdl_mapping_registry = nil	# for rpc marshal
+      @wiredump_file_base = nil
+      @mandatorycharset = nil
+      @wsdl_elements = @wsdl.collect_elements
+      @wsdl_types = @wsdl.collect_complextypes + @wsdl.collect_simpletypes
+      @rpc_decode_typemap = @wsdl_types +
+	@wsdl.soap_rpc_complextypes(port.find_binding)
+      @wsdl_mapping_registry = Mapping::WSDLEncodedRegistry.new(
+        @rpc_decode_typemap)
+      @doc_mapper = Mapping::WSDLLiteralRegistry.new(
+        @wsdl_types, @wsdl_elements)
+      endpoint_url = @port.soap_address.location
+      # Convert a map which key is QName, to a Hash which key is String.
+      @operation = {}
+      @port.inputoperation_map.each do |op_name, op_info|
+        orgname = op_name.name
+        name = XSD::CodeGen::GenSupport.safemethodname(orgname)
+	@operation[name] = @operation[orgname] = op_info
+	add_method_interface(op_info)
+      end
+      @proxy = ::SOAP::RPC::Proxy.new(endpoint_url, @soapaction, @options)
+    end
+
+    def inspect
+      "#<#{self.class}:#{@proxy.inspect}>"
+    end
+
+    def endpoint_url
+      @proxy.endpoint_url
+    end
+
+    def endpoint_url=(endpoint_url)
+      @proxy.endpoint_url = endpoint_url
+    end
+
+    def headerhandler
+      @proxy.headerhandler
+    end
+
+    def streamhandler
+      @proxy.streamhandler
+    end
+
+    def test_loopback_response
+      @proxy.test_loopback_response
+    end
+
+    def reset_stream
+      @proxy.reset_stream
+    end
+
+    def rpc_call(name, *values)
+      set_wiredump_file_base(name)
+      unless op_info = @operation[name]
+        raise RuntimeError, "method: #{name} not defined"
+      end
+      req_header = create_request_header
+      req_body = create_request_body(op_info, *values)
+      reqopt = create_options({
+        :soapaction => op_info.soapaction || @soapaction})
+      resopt = create_options({
+        :decode_typemap => @rpc_decode_typemap})
+      env = @proxy.route(req_header, req_body, reqopt, resopt)
+      raise EmptyResponseError unless env
+      receive_headers(env.header)
+      begin
+        @proxy.check_fault(env.body)
+      rescue ::SOAP::FaultError => e
+	Mapping.fault2exception(e)
+      end
+      ret = env.body.response ?
+	Mapping.soap2obj(env.body.response, @mapping_registry) : nil
+      if env.body.outparams
+	outparams = env.body.outparams.collect { |outparam|
+  	  Mapping.soap2obj(outparam)
+   	}
+    	return [ret].concat(outparams)
+      else
+      	return ret
+      end
+    end
+
+    # req_header: [[element, mustunderstand, encodingstyle(QName/String)], ...]
+    # req_body: SOAPBasetype/SOAPCompoundtype
+    def document_send(name, header_obj, body_obj)
+      set_wiredump_file_base(name)
+      unless op_info = @operation[name]
+        raise RuntimeError, "method: #{name} not defined"
+      end
+      req_header = header_obj ? header_from_obj(header_obj, op_info) : nil
+      req_body = body_from_obj(body_obj, op_info)
+      opt = create_options({
+        :soapaction => op_info.soapaction || @soapaction,
+        :decode_typemap => @wsdl_types})
+      env = @proxy.invoke(req_header, req_body, opt)
+      raise EmptyResponseError unless env
+      if env.body.fault
+	raise ::SOAP::FaultError.new(env.body.fault)
+      end
+      res_body_obj = env.body.response ?
+	Mapping.soap2obj(env.body.response, @mapping_registry) : nil
+      return env.header, res_body_obj
+    end
+
+  private
+
+    def create_options(hash = nil)
+      opt = {}
+      opt[:default_encodingstyle] = @default_encodingstyle
+      opt[:allow_unqualified_element] = @allow_unqualified_element
+      opt[:generate_explicit_type] = @generate_explicit_type
+      opt.update(hash) if hash
+      opt
+    end
+
+    def set_wiredump_file_base(name)
+      if @wiredump_file_base
+      	@proxy.set_wiredump_file_base(@wiredump_file_base + "_#{name}")
+      end
+    end
+
+    def create_request_header
+      headers = @proxy.headerhandler.on_outbound
+      if headers.empty?
+	nil
+      else
+	h = SOAPHeader.new
+	headers.each do |header|
+	  h.add(header.elename.name, header)
+	end
+	h
+      end
+    end
+
+    def receive_headers(headers)
+      @proxy.headerhandler.on_inbound(headers) if headers
+    end
+
+    def create_request_body(op_info, *values)
+      method = create_method_struct(op_info, *values)
+      SOAPBody.new(method)
+    end
+
+    def create_method_struct(op_info, *params)
+      parts_names = op_info.bodyparts.collect { |part| part.name }
+      obj = create_method_obj(parts_names, params)
+      method = Mapping.obj2soap(obj, @wsdl_mapping_registry, op_info.op_name)
+      if method.members.size != parts_names.size
+	new_method = SOAPStruct.new
+	method.each do |key, value|
+	  if parts_names.include?(key)
+	    new_method.add(key, value)
+	  end
+	end
+	method = new_method
+      end
+      method.elename = op_info.op_name
+      method.type = XSD::QName.new	# Request should not be typed.
+      method
+    end
+
+    def create_method_obj(names, params)
+      o = Object.new
+      idx = 0
+      while idx < params.length
+        o.instance_variable_set('@' + names[idx], params[idx])
+        idx += 1
+      end
+      o
+    end
+
+    def header_from_obj(obj, op_info)
+      if obj.is_a?(SOAPHeader)
+	obj
+      elsif op_info.headerparts.empty?
+	if obj.nil?
+	  nil
+	else
+	  raise RuntimeError.new("no header definition in schema: #{obj}")
+	end
+      elsif op_info.headerparts.size == 1
+       	part = op_info.headerparts[0]
+	header = SOAPHeader.new()
+	header.add(headeritem_from_obj(obj, part.element || part.eletype))
+	header
+      else
+	header = SOAPHeader.new()
+	op_info.headerparts.each do |part|
+	  child = Mapping.get_attribute(obj, part.name)
+	  ele = headeritem_from_obj(child, part.element || part.eletype)
+	  header.add(part.name, ele)
+	end
+	header
+      end
+    end
+
+    def headeritem_from_obj(obj, name)
+      if obj.nil?
+	SOAPElement.new(name)
+      elsif obj.is_a?(SOAPHeaderItem)
+	obj
+      else
+        Mapping.obj2soap(obj, @doc_mapper, name)
+      end
+    end
+
+    def body_from_obj(obj, op_info)
+      if obj.is_a?(SOAPBody)
+	obj
+      elsif op_info.bodyparts.empty?
+	if obj.nil?
+	  nil
+	else
+	  raise RuntimeError.new("no body found in schema")
+	end
+      elsif op_info.bodyparts.size == 1
+       	part = op_info.bodyparts[0]
+	ele = bodyitem_from_obj(obj, part.element || part.type)
+	SOAPBody.new(ele)
+      else
+	body = SOAPBody.new
+	op_info.bodyparts.each do |part|
+	  child = Mapping.get_attribute(obj, part.name)
+	  ele = bodyitem_from_obj(child, part.element || part.type)
+	  body.add(ele.elename.name, ele)
+	end
+	body
+      end
+    end
+
+    def bodyitem_from_obj(obj, name)
+      if obj.nil?
+	SOAPElement.new(name)
+      elsif obj.is_a?(SOAPElement)
+	obj
+      else
+        Mapping.obj2soap(obj, @doc_mapper, name)
+      end
+    end
+
+    def add_method_interface(op_info)
+      name = XSD::CodeGen::GenSupport.safemethodname(op_info.op_name.name)
+      orgname = op_info.op_name.name
+      parts_names = op_info.bodyparts.collect { |part| part.name }
+      case op_info.style
+      when :document
+        if orgname != name and orgname.capitalize == name.capitalize
+          add_document_method_interface(orgname, parts_names)
+        end
+	add_document_method_interface(name, parts_names)
+      when :rpc
+        if orgname != name and orgname.capitalize == name.capitalize
+          add_rpc_method_interface(orgname, parts_names)
+        end
+	add_rpc_method_interface(name, parts_names)
+      else
+	raise RuntimeError.new("unknown style: #{op_info.style}")
+      end
+    end
+
+    def add_rpc_method_interface(name, parts_names)
+      ::SOAP::Mapping.define_singleton_method(@host, name) do |*arg|
+        unless arg.size == parts_names.size
+          raise ArgumentError.new(
+            "wrong number of arguments (#{arg.size} for #{parts_names.size})")
+        end
+        @servant.rpc_call(name, *arg)
+      end
+      @host.method(name)
+    end
+
+    def add_document_method_interface(name, parts_names)
+      ::SOAP::Mapping.define_singleton_method(@host, name) do |h, b|
+        @servant.document_send(name, h, b)
+      end
+      @host.method(name)
+    end
+
+    def setup_options
+      if opt = Property.loadproperty(::SOAP::PropertyName)
+	opt = opt["client"]
+      end
+      opt ||= Property.new
+      opt.add_hook("protocol.mandatorycharset") do |key, value|
+	@mandatorycharset = value
+      end
+      opt.add_hook("protocol.wiredump_file_base") do |key, value|
+	@wiredump_file_base = value
+      end
+      opt["protocol.http.charset"] ||= XSD::Charset.xml_encoding_label
+      opt["protocol.http.proxy"] ||= Env::HTTP_PROXY
+      opt["protocol.http.no_proxy"] ||= Env::NO_PROXY
+      opt
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/sync.rb b/ruby_1_8_6/lib/sync.rb
new file mode 100644
index 0000000000..79522ed885
--- /dev/null
+++ b/ruby_1_8_6/lib/sync.rb
@@ -0,0 +1,311 @@
+#
+#   sync.rb - 2 phase lock with counter
+#   	$Release Version: 1.0$
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
+#
+# --
+#  Sync_m, Synchronizer_m
+#  Usage:
+#   obj.extend(Sync_m)
+#   or
+#   class Foo
+#	include Sync_m
+#	:
+#   end
+#
+#   Sync_m#sync_mode
+#   Sync_m#sync_locked?, locked?
+#   Sync_m#sync_shared?, shared?
+#   Sync_m#sync_exclusive?, sync_exclusive?
+#   Sync_m#sync_try_lock, try_lock
+#   Sync_m#sync_lock, lock
+#   Sync_m#sync_unlock, unlock
+#
+#   Sync, Synchronicer:
+#	include Sync_m
+#   Usage:
+#   sync = Sync.new
+#
+#   Sync#mode
+#   Sync#locked?
+#   Sync#shared?
+#   Sync#exclusive?
+#   Sync#try_lock(mode) -- mode = :EX, :SH, :UN
+#   Sync#lock(mode)     -- mode = :EX, :SH, :UN
+#   Sync#unlock
+#   Sync#synchronize(mode) {...}
+#   
+#
+
+unless defined? Thread
+  fail "Thread not available for this ruby interpreter"
+end
+
+module Sync_m
+  RCS_ID='-$Header$-'
+  
+  # lock mode
+  UN = :UN
+  SH = :SH
+  EX = :EX
+  
+  # exceptions
+  class Err < StandardError
+    def Err.Fail(*opt)
+      fail self, sprintf(self::Message, *opt)
+    end
+    
+    class UnknownLocker < Err
+      Message = "Thread(%s) not locked."
+      def UnknownLocker.Fail(th)
+	super(th.inspect)
+      end
+    end
+    
+    class LockModeFailer < Err
+      Message = "Unknown lock mode(%s)"
+      def LockModeFailer.Fail(mode)
+	if mode.id2name
+	  mode = id2name
+	end
+	super(mode)
+      end
+    end
+  end
+  
+  def Sync_m.define_aliases(cl)
+    cl.module_eval %q{
+      alias locked? sync_locked?
+      alias shared? sync_shared?
+      alias exclusive? sync_exclusive?
+      alias lock sync_lock
+      alias unlock sync_unlock
+      alias try_lock sync_try_lock
+      alias synchronize sync_synchronize
+    }
+  end
+  
+  def Sync_m.append_features(cl)
+    super
+    unless cl.instance_of?(Module)
+      # do nothing for Modules
+      # make aliases and include the proper module.
+      define_aliases(cl)
+    end
+  end
+  
+  def Sync_m.extend_object(obj)
+    super
+    obj.sync_extended
+  end
+
+  def sync_extended
+    unless (defined? locked? and
+	    defined? shared? and
+	    defined? exclusive? and
+	    defined? lock and
+	    defined? unlock and
+	    defined? try_lock and
+	    defined? synchronize)
+      Sync_m.define_aliases(class<<self;self;end)
+    end
+    sync_initialize
+  end
+
+  # accessing
+  def sync_locked?
+    sync_mode != UN
+  end
+  
+  def sync_shared?
+    sync_mode == SH
+  end
+  
+  def sync_exclusive?
+    sync_mode == EX
+  end
+  
+  # locking methods.
+  def sync_try_lock(mode = EX)
+    return unlock if sync_mode == UN
+    
+    Thread.critical = true
+    ret = sync_try_lock_sub(sync_mode)
+    Thread.critical = false
+    ret
+  end
+  
+  def sync_lock(m = EX)
+    return unlock if m == UN
+
+    until (Thread.critical = true; sync_try_lock_sub(m))
+      if sync_sh_locker[Thread.current]
+	sync_upgrade_waiting.push [Thread.current, sync_sh_locker[Thread.current]]
+	sync_sh_locker.delete(Thread.current)
+      else
+	sync_waiting.push Thread.current
+      end
+      Thread.stop
+    end
+    Thread.critical = false
+    self
+  end
+  
+  def sync_unlock(m = EX)
+    Thread.critical = true
+    if sync_mode == UN
+      Thread.critical = false
+      Err::UnknownLocker.Fail(Thread.current)
+    end
+    
+    m = sync_mode if m == EX and sync_mode == SH
+    
+    runnable = false
+    case m
+    when UN
+      Thread.critical = false
+      Err::UnknownLocker.Fail(Thread.current)
+      
+    when EX
+      if sync_ex_locker == Thread.current
+	if (self.sync_ex_count = sync_ex_count - 1) == 0
+	  self.sync_ex_locker = nil
+	  if sync_sh_locker.include?(Thread.current)
+	    self.sync_mode = SH
+	  else
+	    self.sync_mode = UN
+	  end
+	  runnable = true
+	end
+      else
+	Err::UnknownLocker.Fail(Thread.current)
+      end
+      
+    when SH
+      if (count = sync_sh_locker[Thread.current]).nil?
+	Err::UnknownLocker.Fail(Thread.current)
+      else
+	if (sync_sh_locker[Thread.current] = count - 1) == 0 
+	  sync_sh_locker.delete(Thread.current)
+	  if sync_sh_locker.empty? and sync_ex_count == 0
+	    self.sync_mode = UN
+	    runnable = true
+	  end
+	end
+      end
+    end
+    
+    if runnable
+      if sync_upgrade_waiting.size > 0
+	for k, v in sync_upgrade_waiting
+	  sync_sh_locker[k] = v
+	end
+	wait = sync_upgrade_waiting
+	self.sync_upgrade_waiting = []
+	Thread.critical = false
+	
+	for w, v in wait
+	  w.run
+	end
+      else
+	wait = sync_waiting
+	self.sync_waiting = []
+	Thread.critical = false
+	for w in wait
+	  w.run
+	end
+      end
+    end
+    
+    Thread.critical = false
+    self
+  end
+  
+  def sync_synchronize(mode = EX)
+    begin
+      sync_lock(mode)
+      yield
+    ensure
+      sync_unlock
+    end
+  end
+
+  attr :sync_mode, true
+    
+  attr :sync_waiting, true
+  attr :sync_upgrade_waiting, true
+  attr :sync_sh_locker, true
+  attr :sync_ex_locker, true
+  attr :sync_ex_count, true
+    
+  private
+
+  def sync_initialize
+    @sync_mode = UN
+    @sync_waiting = []
+    @sync_upgrade_waiting = []
+    @sync_sh_locker = Hash.new
+    @sync_ex_locker = nil
+    @sync_ex_count = 0
+  end
+
+  def initialize(*args)
+    sync_initialize
+    super
+  end
+    
+  def sync_try_lock_sub(m)
+    case m
+    when SH
+      case sync_mode
+      when UN
+	self.sync_mode = m
+	sync_sh_locker[Thread.current] = 1
+	ret = true
+      when SH
+	count = 0 unless count = sync_sh_locker[Thread.current]
+	sync_sh_locker[Thread.current] = count + 1
+	ret = true
+      when EX
+	# in EX mode, lock will upgrade to EX lock
+	if sync_ex_locker == Thread.current
+	  self.sync_ex_count = sync_ex_count + 1
+	  ret = true
+	else
+	  ret = false
+	end
+      end
+    when EX
+      if sync_mode == UN or
+	sync_mode == SH && sync_sh_locker.size == 1 && sync_sh_locker.include?(Thread.current) 
+	self.sync_mode = m
+	self.sync_ex_locker = Thread.current
+	self.sync_ex_count = 1
+	ret = true
+      elsif sync_mode == EX && sync_ex_locker == Thread.current
+	self.sync_ex_count = sync_ex_count + 1
+	ret = true
+      else
+	ret = false
+      end
+    else
+      Thread.critical = false
+      Err::LockModeFailer.Fail mode
+    end
+    return ret
+  end
+end
+Synchronizer_m = Sync_m
+
+class Sync
+  #Sync_m.extend_class self
+  include Sync_m
+    
+  def initialize
+    super
+  end
+    
+end
+Synchronizer = Sync
diff --git a/ruby_1_8_6/lib/tempfile.rb b/ruby_1_8_6/lib/tempfile.rb
new file mode 100644
index 0000000000..b885444b15
--- /dev/null
+++ b/ruby_1_8_6/lib/tempfile.rb
@@ -0,0 +1,193 @@
+#
+# tempfile - manipulates temporary files
+#
+# $Id$
+#
+
+require 'delegate'
+require 'tmpdir'
+
+# A class for managing temporary files.  This library is written to be
+# thread safe.
+class Tempfile < DelegateClass(File)
+  MAX_TRY = 10
+  @@cleanlist = []
+
+  # Creates a temporary file of mode 0600 in the temporary directory
+  # whose name is basename.pid.n and opens with mode "w+".  A Tempfile
+  # object works just like a File object.
+  #
+  # If tmpdir is omitted, the temporary directory is determined by
+  # Dir::tmpdir provided by 'tmpdir.rb'.
+  # When $SAFE > 0 and the given tmpdir is tainted, it uses
+  # /tmp. (Note that ENV values are tainted by default)
+  def initialize(basename, tmpdir=Dir::tmpdir)
+    if $SAFE > 0 and tmpdir.tainted?
+      tmpdir = '/tmp'
+    end
+
+    lock = nil
+    n = failure = 0
+    
+    begin
+      Thread.critical = true
+
+      begin
+	tmpname = File.join(tmpdir, make_tmpname(basename, n))
+	lock = tmpname + '.lock'
+	n += 1
+      end while @@cleanlist.include?(tmpname) or
+	File.exist?(lock) or File.exist?(tmpname)
+
+      Dir.mkdir(lock)
+    rescue
+      failure += 1
+      retry if failure < MAX_TRY
+      raise "cannot generate tempfile `%s'" % tmpname
+    ensure
+      Thread.critical = false
+    end
+
+    @data = [tmpname]
+    @clean_proc = Tempfile.callback(@data)
+    ObjectSpace.define_finalizer(self, @clean_proc)
+
+    @tmpfile = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL, 0600)
+    @tmpname = tmpname
+    @@cleanlist << @tmpname
+    @data[1] = @tmpfile
+    @data[2] = @@cleanlist
+
+    super(@tmpfile)
+
+    # Now we have all the File/IO methods defined, you must not
+    # carelessly put bare puts(), etc. after this.
+
+    Dir.rmdir(lock)
+  end
+
+  def make_tmpname(basename, n)
+    sprintf('%s.%d.%d', basename, $$, n)
+  end
+  private :make_tmpname
+
+  # Opens or reopens the file with mode "r+".
+  def open
+    @tmpfile.close if @tmpfile
+    @tmpfile = File.open(@tmpname, 'r+')
+    @data[1] = @tmpfile
+    __setobj__(@tmpfile)
+  end
+
+  def _close	# :nodoc:
+    @tmpfile.close if @tmpfile
+    @data[1] = @tmpfile = nil
+  end    
+  protected :_close
+
+  # Closes the file.  If the optional flag is true, unlinks the file
+  # after closing.
+  #
+  # If you don't explicitly unlink the temporary file, the removal
+  # will be delayed until the object is finalized.
+  def close(unlink_now=false)
+    if unlink_now
+      close!
+    else
+      _close
+    end
+  end
+
+  # Closes and unlinks the file.
+  def close!
+    _close
+    @clean_proc.call
+    ObjectSpace.undefine_finalizer(self)
+  end
+
+  # Unlinks the file.  On UNIX-like systems, it is often a good idea
+  # to unlink a temporary file immediately after creating and opening
+  # it, because it leaves other programs zero chance to access the
+  # file.
+  def unlink
+    # keep this order for thread safeness
+    begin
+      File.unlink(@tmpname) if File.exist?(@tmpname)
+      @@cleanlist.delete(@tmpname)
+      @data = @tmpname = nil
+      ObjectSpace.undefine_finalizer(self)
+    rescue Errno::EACCES
+      # may not be able to unlink on Windows; just ignore
+    end
+  end
+  alias delete unlink
+
+  # Returns the full path name of the temporary file.
+  def path
+    @tmpname
+  end
+
+  # Returns the size of the temporary file.  As a side effect, the IO
+  # buffer is flushed before determining the size.
+  def size
+    if @tmpfile
+      @tmpfile.flush
+      @tmpfile.stat.size
+    else
+      0
+    end
+  end
+  alias length size
+
+  class << self
+    def callback(data)	# :nodoc:
+      pid = $$
+      lambda{
+	if pid == $$ 
+	  path, tmpfile, cleanlist = *data
+
+	  print "removing ", path, "..." if $DEBUG
+
+	  tmpfile.close if tmpfile
+
+	  # keep this order for thread safeness
+	  File.unlink(path) if File.exist?(path)
+	  cleanlist.delete(path) if cleanlist
+
+	  print "done\n" if $DEBUG
+	end
+      }
+    end
+
+    # If no block is given, this is a synonym for new().
+    #
+    # If a block is given, it will be passed tempfile as an argument,
+    # and the tempfile will automatically be closed when the block
+    # terminates.  In this case, open() returns nil.
+    def open(*args)
+      tempfile = new(*args)
+
+      if block_given?
+	begin
+	  yield(tempfile)
+	ensure
+	  tempfile.close
+	end
+
+	nil
+      else
+	tempfile
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+#  $DEBUG = true
+  f = Tempfile.new("foo")
+  f.print("foo\n")
+  f.close
+  f.open
+  p f.gets # => "foo\n"
+  f.close!
+end
diff --git a/ruby_1_8_6/lib/test/unit.rb b/ruby_1_8_6/lib/test/unit.rb
new file mode 100644
index 0000000000..b71f644566
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit.rb
@@ -0,0 +1,280 @@
+require 'test/unit/testcase'
+require 'test/unit/autorunner'
+
+module Test # :nodoc:
+  #
+  # = Test::Unit - Ruby Unit Testing Framework
+  # 
+  # == Introduction
+  # 
+  # Unit testing is making waves all over the place, largely due to the
+  # fact that it is a core practice of XP. While XP is great, unit testing
+  # has been around for a long time and has always been a good idea. One
+  # of the keys to good unit testing, though, is not just writing tests,
+  # but having tests. What's the difference? Well, if you just _write_ a
+  # test and throw it away, you have no guarantee that something won't
+  # change later which breaks your code. If, on the other hand, you _have_
+  # tests (obviously you have to write them first), and run them as often
+  # as possible, you slowly build up a wall of things that cannot break
+  # without you immediately knowing about it. This is when unit testing
+  # hits its peak usefulness.
+  # 
+  # Enter Test::Unit, a framework for unit testing in Ruby, helping you to
+  # design, debug and evaluate your code by making it easy to write and
+  # have tests for it.
+  # 
+  # 
+  # == Notes
+  # 
+  # Test::Unit has grown out of and superceded Lapidary.
+  # 
+  # 
+  # == Feedback
+  # 
+  # I like (and do my best to practice) XP, so I value early releases,
+  # user feedback, and clean, simple, expressive code. There is always
+  # room for improvement in everything I do, and Test::Unit is no
+  # exception. Please, let me know what you think of Test::Unit as it
+  # stands, and what you'd like to see expanded/changed/improved/etc. If
+  # you find a bug, let me know ASAP; one good way to let me know what the
+  # bug is is to submit a new test that catches it :-) Also, I'd love to
+  # hear about any successes you have with Test::Unit, and any
+  # documentation you might add will be greatly appreciated. My contact
+  # info is below.
+  # 
+  # 
+  # == Contact Information
+  # 
+  # A lot of discussion happens about Ruby in general on the ruby-talk
+  # mailing list (http://www.ruby-lang.org/en/ml.html), and you can ask
+  # any questions you might have there. I monitor the list, as do many
+  # other helpful Rubyists, and you're sure to get a quick answer. Of
+  # course, you're also welcome to email me (Nathaniel Talbott) directly
+  # at mailto:testunit@talbott.ws, and I'll do my best to help you out.
+  # 
+  # 
+  # == Credits
+  # 
+  # I'd like to thank...
+  # 
+  # Matz, for a great language!
+  # 
+  # Masaki Suketa, for his work on RubyUnit, which filled a vital need in
+  # the Ruby world for a very long time. I'm also grateful for his help in
+  # polishing Test::Unit and getting the RubyUnit compatibility layer
+  # right. His graciousness in allowing Test::Unit to supercede RubyUnit
+  # continues to be a challenge to me to be more willing to defer my own
+  # rights.
+  # 
+  # Ken McKinlay, for his interest and work on unit testing, and for his
+  # willingness to dialog about it. He was also a great help in pointing
+  # out some of the holes in the RubyUnit compatibility layer.
+  # 
+  # Dave Thomas, for the original idea that led to the extremely simple
+  # "require 'test/unit'", plus his code to improve it even more by
+  # allowing the selection of tests from the command-line. Also, without
+  # RDoc, the documentation for Test::Unit would stink a lot more than it
+  # does now.
+  # 
+  # Everyone who's helped out with bug reports, feature ideas,
+  # encouragement to continue, etc. It's a real privilege to be a part of
+  # the Ruby community.
+  # 
+  # The guys at RoleModel Software, for putting up with me repeating, "But
+  # this would be so much easier in Ruby!" whenever we're coding in Java.
+  # 
+  # My Creator, for giving me life, and giving it more abundantly.
+  # 
+  # 
+  # == License
+  # 
+  # Test::Unit is copyright (c) 2000-2003 Nathaniel Talbott. It is free
+  # software, and is distributed under the Ruby license. See the COPYING
+  # file in the standard Ruby distribution for details.
+  # 
+  # 
+  # == Warranty
+  # 
+  # This software is provided "as is" and without any express or
+  # implied warranties, including, without limitation, the implied
+  # warranties of merchantibility and fitness for a particular
+  # purpose.
+  # 
+  # 
+  # == Author
+  # 
+  # Nathaniel Talbott.
+  # Copyright (c) 2000-2003, Nathaniel Talbott
+  #
+  # ----
+  #
+  # = Usage
+  #
+  # The general idea behind unit testing is that you write a _test_
+  # _method_ that makes certain _assertions_ about your code, working
+  # against a _test_ _fixture_. A bunch of these _test_ _methods_ are
+  # bundled up into a _test_ _suite_ and can be run any time the
+  # developer wants. The results of a run are gathered in a _test_
+  # _result_ and displayed to the user through some UI. So, lets break
+  # this down and see how Test::Unit provides each of these necessary
+  # pieces.
+  #
+  #
+  # == Assertions
+  #
+  # These are the heart of the framework. Think of an assertion as a
+  # statement of expected outcome, i.e. "I assert that x should be equal
+  # to y". If, when the assertion is executed, it turns out to be
+  # correct, nothing happens, and life is good. If, on the other hand,
+  # your assertion turns out to be false, an error is propagated with
+  # pertinent information so that you can go back and make your
+  # assertion succeed, and, once again, life is good. For an explanation
+  # of the current assertions, see Test::Unit::Assertions.
+  #
+  #
+  # == Test Method & Test Fixture
+  #
+  # Obviously, these assertions have to be called within a context that
+  # knows about them and can do something meaningful with their
+  # pass/fail value. Also, it's handy to collect a bunch of related
+  # tests, each test represented by a method, into a common test class
+  # that knows how to run them. The tests will be in a separate class
+  # from the code they're testing for a couple of reasons. First of all,
+  # it allows your code to stay uncluttered with test code, making it
+  # easier to maintain. Second, it allows the tests to be stripped out
+  # for deployment, since they're really there for you, the developer,
+  # and your users don't need them. Third, and most importantly, it
+  # allows you to set up a common test fixture for your tests to run
+  # against.
+  #
+  # What's a test fixture? Well, tests do not live in a vacuum; rather,
+  # they're run against the code they are testing. Often, a collection
+  # of tests will run against a common set of data, also called a
+  # fixture. If they're all bundled into the same test class, they can
+  # all share the setting up and tearing down of that data, eliminating
+  # unnecessary duplication and making it much easier to add related
+  # tests.
+  #
+  # Test::Unit::TestCase wraps up a collection of test methods together
+  # and allows you to easily set up and tear down the same test fixture
+  # for each test. This is done by overriding #setup and/or #teardown,
+  # which will be called before and after each test method that is
+  # run. The TestCase also knows how to collect the results of your
+  # assertions into a Test::Unit::TestResult, which can then be reported
+  # back to you... but I'm getting ahead of myself. To write a test,
+  # follow these steps:
+  #
+  # * Make sure Test::Unit is in your library path.
+  # * require 'test/unit' in your test script.
+  # * Create a class that subclasses Test::Unit::TestCase.
+  # * Add a method that begins with "test" to your class.
+  # * Make assertions in your test method.
+  # * Optionally define #setup and/or #teardown to set up and/or tear
+  #   down your common test fixture.
+  # * You can now run your test as you would any other Ruby
+  #   script... try it and see!
+  #
+  # A really simple test might look like this (#setup and #teardown are
+  # commented out to indicate that they are completely optional):
+  #
+  #     require 'test/unit'
+  #     
+  #     class TC_MyTest < Test::Unit::TestCase
+  #       # def setup
+  #       # end
+  #     
+  #       # def teardown
+  #       # end
+  #     
+  #       def test_fail
+  #         assert(false, 'Assertion was false.')
+  #       end
+  #     end
+  #
+  #
+  # == Test Runners
+  #
+  # So, now you have this great test class, but you still need a way to
+  # run it and view any failures that occur during the run. This is
+  # where Test::Unit::UI::Console::TestRunner (and others, such as
+  # Test::Unit::UI::GTK::TestRunner) comes into play. The console test
+  # runner is automatically invoked for you if you require 'test/unit'
+  # and simply run the file. To use another runner, or to manually
+  # invoke a runner, simply call its run class method and pass in an
+  # object that responds to the suite message with a
+  # Test::Unit::TestSuite. This can be as simple as passing in your
+  # TestCase class (which has a class suite method). It might look
+  # something like this:
+  #
+  #    require 'test/unit/ui/console/testrunner'
+  #    Test::Unit::UI::Console::TestRunner.run(TC_MyTest)
+  #
+  #
+  # == Test Suite
+  #
+  # As more and more unit tests accumulate for a given project, it
+  # becomes a real drag running them one at a time, and it also
+  # introduces the potential to overlook a failing test because you
+  # forget to run it. Suddenly it becomes very handy that the
+  # TestRunners can take any object that returns a Test::Unit::TestSuite
+  # in response to a suite method. The TestSuite can, in turn, contain
+  # other TestSuites or individual tests (typically created by a
+  # TestCase). In other words, you can easily wrap up a group of
+  # TestCases and TestSuites like this:
+  #
+  #  require 'test/unit/testsuite'
+  #  require 'tc_myfirsttests'
+  #  require 'tc_moretestsbyme'
+  #  require 'ts_anothersetoftests'
+  #
+  #  class TS_MyTests
+  #    def self.suite
+  #      suite = Test::Unit::TestSuite.new
+  #      suite << TC_MyFirstTests.suite
+  #      suite << TC_MoreTestsByMe.suite
+  #      suite << TS_AnotherSetOfTests.suite
+  #      return suite
+  #    end
+  #  end
+  #  Test::Unit::UI::Console::TestRunner.run(TS_MyTests)
+  #
+  # Now, this is a bit cumbersome, so Test::Unit does a little bit more
+  # for you, by wrapping these up automatically when you require
+  # 'test/unit'. What does this mean? It means you could write the above
+  # test case like this instead:
+  #
+  #  require 'test/unit'
+  #  require 'tc_myfirsttests'
+  #  require 'tc_moretestsbyme'
+  #  require 'ts_anothersetoftests'
+  #
+  # Test::Unit is smart enough to find all the test cases existing in
+  # the ObjectSpace and wrap them up into a suite for you. It then runs
+  # the dynamic suite using the console TestRunner.
+  #
+  #
+  # == Questions?
+  #
+  # I'd really like to get feedback from all levels of Ruby
+  # practitioners about typos, grammatical errors, unclear statements,
+  # missing points, etc., in this document (or any other).
+  #
+
+  module Unit
+    # If set to false Test::Unit will not automatically run at exit.
+    def self.run=(flag)
+      @run = flag
+    end
+
+    # Automatically run tests at exit?
+    def self.run?
+      @run ||= false
+    end
+  end
+end
+
+at_exit do
+  unless $! || Test::Unit.run?
+    exit Test::Unit::AutoRunner.run
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/assertionfailederror.rb b/ruby_1_8_6/lib/test/unit/assertionfailederror.rb
new file mode 100644
index 0000000000..a21e4b5870
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/assertionfailederror.rb
@@ -0,0 +1,14 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module Test
+  module Unit
+
+    # Thrown by Test::Unit::Assertions when an assertion fails.
+    class AssertionFailedError < StandardError
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/assertions.rb b/ruby_1_8_6/lib/test/unit/assertions.rb
new file mode 100644
index 0000000000..aa97799de8
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/assertions.rb
@@ -0,0 +1,622 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/assertionfailederror'
+require 'test/unit/util/backtracefilter'
+
+module Test
+  module Unit
+
+    ##
+    # Test::Unit::Assertions contains the standard Test::Unit assertions.
+    # Assertions is included in Test::Unit::TestCase.
+    #
+    # To include it in your own code and use its functionality, you simply
+    # need to rescue Test::Unit::AssertionFailedError. Additionally you may
+    # override add_assertion to get notified whenever an assertion is made.
+    #
+    # Notes:
+    # * The message to each assertion, if given, will be propagated with the
+    #   failure.
+    # * It is easy to add your own assertions based on assert_block().
+    #
+    # = Example Custom Assertion
+    #
+    #   def deny(boolean, message = nil)
+    #     message = build_message message, '<?> is not false or nil.', boolean
+    #     assert_block message do
+    #       not boolean
+    #     end
+    #   end
+
+    module Assertions
+
+      ##
+      # The assertion upon which all other assertions are based. Passes if the
+      # block yields true.
+      #
+      # Example:
+      #   assert_block "Couldn't do the thing" do
+      #     do_the_thing
+      #   end
+
+      public
+      def assert_block(message="assert_block failed.") # :yields: 
+        _wrap_assertion do
+          if (! yield)
+            raise AssertionFailedError.new(message.to_s)
+          end
+        end
+      end
+
+      ##
+      # Asserts that +boolean+ is not false or nil.
+      #
+      # Example:
+      #   assert [1, 2].include?(5)
+
+      public
+      def assert(boolean, message=nil)
+        _wrap_assertion do
+          assert_block("assert should not be called with a block.") { !block_given? }
+          assert_block(build_message(message, "<?> is not true.", boolean)) { boolean }
+        end
+      end
+
+      ##
+      # Passes if +expected+ == +actual.
+      #
+      # Note that the ordering of arguments is important, since a helpful
+      # error message is generated when this one fails that tells you the
+      # values of expected and actual.
+      #
+      # Example:
+      #   assert_equal 'MY STRING', 'my string'.upcase
+
+      public
+      def assert_equal(expected, actual, message=nil)
+        full_message = build_message(message, <<EOT, expected, actual)
+<?> expected but was
+<?>.
+EOT
+        assert_block(full_message) { expected == actual }
+      end
+
+      private
+      def _check_exception_class(args) # :nodoc:
+        args.partition do |klass|
+          next if klass.instance_of?(Module)
+          assert(Exception >= klass, "Should expect a class of exception, #{klass}")
+          true
+        end
+      end
+
+      private
+      def _expected_exception?(actual_exception, exceptions, modules) # :nodoc:
+        exceptions.include?(actual_exception.class) or
+          modules.any? {|mod| actual_exception.is_a?(mod)}
+      end
+
+      ##
+      # Passes if the block raises one of the given exceptions.
+      #
+      # Example:
+      #   assert_raise RuntimeError, LoadError do
+      #     raise 'Boom!!!'
+      #   end
+
+      public
+      def assert_raise(*args)
+        _wrap_assertion do
+          if Module === args.last
+            message = ""
+          else
+            message = args.pop
+          end
+          exceptions, modules = _check_exception_class(args)
+          expected = args.size == 1 ? args.first : args
+          actual_exception = nil
+          full_message = build_message(message, "<?> exception expected but none was thrown.", expected)
+          assert_block(full_message) do
+            begin
+              yield
+            rescue Exception => actual_exception
+              break
+            end
+            false
+          end
+          full_message = build_message(message, "<?> exception expected but was\n?", expected, actual_exception)
+          assert_block(full_message) {_expected_exception?(actual_exception, exceptions, modules)}
+          actual_exception
+        end
+      end
+
+      ##
+      # Alias of assert_raise.
+      #
+      # Will be deprecated in 1.9, and removed in 2.0.
+
+      public
+      def assert_raises(*args, &block)
+        assert_raise(*args, &block)
+      end
+
+      ##
+      # Passes if +object+ .instance_of? +klass+
+      #
+      # Example:
+      #   assert_instance_of String, 'foo'
+
+      public
+      def assert_instance_of(klass, object, message="")
+        _wrap_assertion do
+          assert_equal(Class, klass.class, "assert_instance_of takes a Class as its first argument")
+          full_message = build_message(message, <<EOT, object, klass, object.class)
+<?> expected to be an instance of
+<?> but was
+<?>.
+EOT
+          assert_block(full_message){object.instance_of?(klass)}
+        end
+      end
+
+      ##
+      # Passes if +object+ is nil.
+      #
+      # Example:
+      #   assert_nil [1, 2].uniq!
+
+      public
+      def assert_nil(object, message="")
+        assert_equal(nil, object, message)
+      end
+
+      ##
+      # Passes if +object+ .kind_of? +klass+
+      #
+      # Example:
+      #   assert_kind_of Object, 'foo'
+
+      public
+      def assert_kind_of(klass, object, message="")
+        _wrap_assertion do
+          assert(klass.kind_of?(Module), "The first parameter to assert_kind_of should be a kind_of Module.")
+          full_message = build_message(message, "<?>\nexpected to be kind_of\\?\n<?> but was\n<?>.", object, klass, object.class)
+          assert_block(full_message){object.kind_of?(klass)}
+        end
+      end
+
+      ##
+      # Passes if +object+ .respond_to? +method+
+      #
+      # Example:
+      #   assert_respond_to 'bugbear', :slice
+
+      public
+      def assert_respond_to(object, method, message="")
+        _wrap_assertion do
+          full_message = build_message(nil, "<?>\ngiven as the method name argument to #assert_respond_to must be a Symbol or #respond_to\\?(:to_str).", method)
+
+          assert_block(full_message) do
+            method.kind_of?(Symbol) || method.respond_to?(:to_str)
+          end
+          full_message = build_message(message, <<EOT, object, object.class, method)
+<?>
+of type <?>
+expected to respond_to\\?<?>.
+EOT
+          assert_block(full_message) { object.respond_to?(method) }
+        end
+      end
+
+      ##
+      # Passes if +string+ =~ +pattern+.
+      #
+      # Example:
+      #   assert_match(/\d+/, 'five, 6, seven')
+
+      public
+      def assert_match(pattern, string, message="")
+        _wrap_assertion do
+          pattern = case(pattern)
+            when String
+              Regexp.new(Regexp.escape(pattern))
+            else
+              pattern
+          end
+          full_message = build_message(message, "<?> expected to be =~\n<?>.", string, pattern)
+          assert_block(full_message) { string =~ pattern }
+        end
+      end
+
+      ##
+      # Passes if +actual+ .equal? +expected+ (i.e. they are the same
+      # instance).
+      #
+      # Example:
+      #   o = Object.new
+      #   assert_same o, o
+
+      public
+      def assert_same(expected, actual, message="")
+        full_message = build_message(message, <<EOT, expected, expected.__id__, actual, actual.__id__)
+<?>
+with id <?> expected to be equal\\? to
+<?>
+with id <?>.
+EOT
+        assert_block(full_message) { actual.equal?(expected) }
+      end
+
+      ##
+      # Compares the +object1+ with +object2+ using +operator+.
+      #
+      # Passes if object1.__send__(operator, object2) is true.
+      #
+      # Example:
+      #   assert_operator 5, :>=, 4
+
+      public
+      def assert_operator(object1, operator, object2, message="")
+        _wrap_assertion do
+          full_message = build_message(nil, "<?>\ngiven as the operator for #assert_operator must be a Symbol or #respond_to\\?(:to_str).", operator)
+          assert_block(full_message){operator.kind_of?(Symbol) || operator.respond_to?(:to_str)}
+          full_message = build_message(message, <<EOT, object1, AssertionMessage.literal(operator), object2)
+<?> expected to be
+?
+<?>.
+EOT
+          assert_block(full_message) { object1.__send__(operator, object2) }
+        end
+      end
+
+      ##
+      # Passes if block does not raise an exception.
+      #
+      # Example:
+      #   assert_nothing_raised do
+      #     [1, 2].uniq
+      #   end
+
+      public
+      def assert_nothing_raised(*args)
+        _wrap_assertion do
+          if Module === args.last
+            message = ""
+          else
+            message = args.pop
+          end
+          exceptions, modules = _check_exception_class(args)
+          begin
+            yield
+          rescue Exception => e
+            if ((args.empty? && !e.instance_of?(AssertionFailedError)) ||
+                _expected_exception?(e, exceptions, modules))
+              assert_block(build_message(message, "Exception raised:\n?", e)){false}
+            else
+              raise
+            end
+          end
+          nil
+        end
+      end
+
+      ##
+      # Flunk always fails.
+      #
+      # Example:
+      #   flunk 'Not done testing yet.'
+
+      public
+      def flunk(message="Flunked")
+        assert_block(build_message(message)){false}
+      end
+
+      ##
+      # Passes if ! +actual+ .equal? +expected+
+      #
+      # Example:
+      #   assert_not_same Object.new, Object.new
+
+      public
+      def assert_not_same(expected, actual, message="")
+        full_message = build_message(message, <<EOT, expected, expected.__id__, actual, actual.__id__)
+<?>
+with id <?> expected to not be equal\\? to
+<?>
+with id <?>.
+EOT
+        assert_block(full_message) { !actual.equal?(expected) }
+      end
+
+      ##
+      # Passes if +expected+ != +actual+
+      #
+      # Example:
+      #   assert_not_equal 'some string', 5
+
+      public
+      def assert_not_equal(expected, actual, message="")
+        full_message = build_message(message, "<?> expected to be != to\n<?>.", expected, actual)
+        assert_block(full_message) { expected != actual }
+      end
+
+      ##
+      # Passes if ! +object+ .nil?
+      #
+      # Example:
+      #   assert_not_nil '1 two 3'.sub!(/two/, '2')
+
+      public
+      def assert_not_nil(object, message="")
+        full_message = build_message(message, "<?> expected to not be nil.", object)
+        assert_block(full_message){!object.nil?}
+      end
+
+      ##
+      # Passes if +regexp+ !~ +string+ 
+      #
+      # Example:
+      #   assert_no_match(/two/, 'one 2 three')
+
+      public
+      def assert_no_match(regexp, string, message="")
+        _wrap_assertion do
+          assert_instance_of(Regexp, regexp, "The first argument to assert_no_match should be a Regexp.")
+          full_message = build_message(message, "<?> expected to not match\n<?>.", regexp, string)
+          assert_block(full_message) { regexp !~ string }
+        end
+      end
+
+      UncaughtThrow = {NameError => /^uncaught throw \`(.+)\'$/,
+                       ThreadError => /^uncaught throw \`(.+)\' in thread /} #`
+
+      ##
+      # Passes if the block throws +expected_symbol+
+      #
+      # Example:
+      #   assert_throws :done do
+      #     throw :done
+      #   end
+
+      public
+      def assert_throws(expected_symbol, message="", &proc)
+        _wrap_assertion do
+          assert_instance_of(Symbol, expected_symbol, "assert_throws expects the symbol that should be thrown for its first argument")
+          assert_block("Should have passed a block to assert_throws."){block_given?}
+          caught = true
+          begin
+            catch(expected_symbol) do
+              proc.call
+              caught = false
+            end
+            full_message = build_message(message, "<?> should have been thrown.", expected_symbol)
+            assert_block(full_message){caught}
+          rescue NameError, ThreadError => error
+            if UncaughtThrow[error.class] !~ error.message
+              raise error
+            end
+            full_message = build_message(message, "<?> expected to be thrown but\n<?> was thrown.", expected_symbol, $1.intern)
+            flunk(full_message)
+          end
+        end
+      end
+
+      ##
+      # Passes if block does not throw anything.
+      #
+      # Example:
+      #  assert_nothing_thrown do
+      #    [1, 2].uniq
+      #  end
+
+      public
+      def assert_nothing_thrown(message="", &proc)
+        _wrap_assertion do
+          assert(block_given?, "Should have passed a block to assert_nothing_thrown")
+          begin
+            proc.call
+          rescue NameError, ThreadError => error
+            if UncaughtThrow[error.class] !~ error.message
+              raise error
+            end
+            full_message = build_message(message, "<?> was thrown when nothing was expected", $1.intern)
+            flunk(full_message)
+          end
+          assert(true, "Expected nothing to be thrown")
+        end
+      end
+
+      ##
+      # Passes if +expected_float+ and +actual_float+ are equal
+      # within +delta+ tolerance.
+      #
+      # Example:
+      #   assert_in_delta 0.05, (50000.0 / 10**6), 0.00001
+
+      public
+      def assert_in_delta(expected_float, actual_float, delta, message="")
+        _wrap_assertion do
+          {expected_float => "first float", actual_float => "second float", delta => "delta"}.each do |float, name|
+            assert_respond_to(float, :to_f, "The arguments must respond to to_f; the #{name} did not")
+          end
+          assert_operator(delta, :>=, 0.0, "The delta should not be negative")
+          full_message = build_message(message, <<EOT, expected_float, actual_float, delta)
+<?> and
+<?> expected to be within
+<?> of each other.
+EOT
+          assert_block(full_message) { (expected_float.to_f - actual_float.to_f).abs <= delta.to_f }
+        end
+      end
+
+      ##
+      # Passes if the method send returns a true value.
+      #
+      # +send_array+ is composed of:
+      # * A receiver
+      # * A method
+      # * Arguments to the method
+      #
+      # Example:
+      #   assert_send [[1, 2], :include?, 4]
+
+      public
+      def assert_send(send_array, message="")
+        _wrap_assertion do
+          assert_instance_of(Array, send_array, "assert_send requires an array of send information")
+          assert(send_array.size >= 2, "assert_send requires at least a receiver and a message name")
+          full_message = build_message(message, <<EOT, send_array[0], AssertionMessage.literal(send_array[1].to_s), send_array[2..-1])
+<?> expected to respond to
+<?(?)> with a true value.
+EOT
+          assert_block(full_message) { send_array[0].__send__(send_array[1], *send_array[2..-1]) }
+        end
+      end
+
+      ##
+      # Builds a failure message.  +head+ is added before the +template+ and
+      # +arguments+ replaces the '?'s positionally in the template.
+
+      public
+      def build_message(head, template=nil, *arguments)
+        template &&= template.chomp
+        return AssertionMessage.new(head, template, arguments)
+      end
+
+      private
+      def _wrap_assertion
+        @_assertion_wrapped ||= false
+        unless (@_assertion_wrapped)
+          @_assertion_wrapped = true
+          begin
+            add_assertion
+            return yield
+          ensure
+            @_assertion_wrapped = false
+          end
+        else
+          return yield
+        end
+      end
+      
+      ##
+      # Called whenever an assertion is made.  Define this in classes that
+      # include Test::Unit::Assertions to record assertion counts.
+
+      private
+      def add_assertion
+      end
+
+      ##
+      # Select whether or not to use the pretty-printer. If this option is set
+      # to false before any assertions are made, pp.rb will not be required.
+
+      public
+      def self.use_pp=(value)
+        AssertionMessage.use_pp = value
+      end
+      
+      # :stopdoc:
+
+      class AssertionMessage
+        @use_pp = true
+        class << self
+          attr_accessor :use_pp
+        end
+
+        class Literal
+          def initialize(value)
+            @value = value
+          end
+          
+          def inspect
+            @value.to_s
+          end
+        end
+
+        class Template
+          def self.create(string)
+            parts = (string ? string.scan(/(?=[^\\])\?|(?:\\\?|[^\?])+/m) : [])
+            self.new(parts)
+          end
+
+          attr_reader :count
+
+          def initialize(parts)
+            @parts = parts
+            @count = parts.find_all{|e| e == '?'}.size
+          end
+
+          def result(parameters)
+            raise "The number of parameters does not match the number of substitutions." if(parameters.size != count)
+            params = parameters.dup
+            @parts.collect{|e| e == '?' ? params.shift : e.gsub(/\\\?/m, '?')}.join('')
+          end
+        end
+
+        def self.literal(value)
+          Literal.new(value)
+        end
+
+        include Util::BacktraceFilter
+
+        def initialize(head, template_string, parameters)
+          @head = head
+          @template_string = template_string
+          @parameters = parameters
+        end
+
+        def convert(object)
+          case object
+            when Exception
+              <<EOM.chop
+Class: <#{convert(object.class)}>
+Message: <#{convert(object.message)}>
+---Backtrace---
+#{filter_backtrace(object.backtrace).join("\n")}
+---------------
+EOM
+            else
+              if(self.class.use_pp)
+                begin
+                  require 'pp'
+                rescue LoadError
+                  self.class.use_pp = false
+                  return object.inspect
+                end unless(defined?(PP))
+                PP.pp(object, '').chomp
+              else
+                object.inspect
+              end
+          end
+        end
+
+        def template
+          @template ||= Template.create(@template_string)
+        end
+
+        def add_period(string)
+          (string =~ /\.\Z/ ? string : string + '.')
+        end
+
+        def to_s
+          message_parts = []
+          if (@head)
+            head = @head.to_s 
+            unless(head.empty?)
+              message_parts << add_period(head)
+            end
+          end
+          tail = template.result(@parameters.collect{|e| convert(e)})
+          message_parts << tail unless(tail.empty?)
+          message_parts.join("\n")
+        end
+      end
+
+      # :startdoc:
+
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/autorunner.rb b/ruby_1_8_6/lib/test/unit/autorunner.rb
new file mode 100644
index 0000000000..86c9b12940
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/autorunner.rb
@@ -0,0 +1,220 @@
+require 'test/unit'
+require 'test/unit/ui/testrunnerutilities'
+require 'optparse'
+
+module Test
+  module Unit
+    class AutoRunner
+      def self.run(force_standalone=false, default_dir=nil, argv=ARGV, &block)
+        r = new(force_standalone || standalone?, &block)
+        r.base = default_dir
+        r.process_args(argv)
+        r.run
+      end
+      
+      def self.standalone?
+        return false unless("-e" == $0)
+        ObjectSpace.each_object(Class) do |klass|
+          return false if(klass < TestCase)
+        end
+        true
+      end
+
+      RUNNERS = {
+        :console => proc do |r|
+          require 'test/unit/ui/console/testrunner'
+          Test::Unit::UI::Console::TestRunner
+        end,
+        :gtk => proc do |r|
+          require 'test/unit/ui/gtk/testrunner'
+          Test::Unit::UI::GTK::TestRunner
+        end,
+        :gtk2 => proc do |r|
+          require 'test/unit/ui/gtk2/testrunner'
+          Test::Unit::UI::GTK2::TestRunner
+        end,
+        :fox => proc do |r|
+          require 'test/unit/ui/fox/testrunner'
+          Test::Unit::UI::Fox::TestRunner
+        end,
+        :tk => proc do |r|
+          require 'test/unit/ui/tk/testrunner'
+          Test::Unit::UI::Tk::TestRunner
+        end,
+      }
+
+      OUTPUT_LEVELS = [
+        [:silent, UI::SILENT],
+        [:progress, UI::PROGRESS_ONLY],
+        [:normal, UI::NORMAL],
+        [:verbose, UI::VERBOSE],
+      ]
+
+      COLLECTORS = {
+        :objectspace => proc do |r|
+          require 'test/unit/collector/objectspace'
+          c = Collector::ObjectSpace.new
+          c.filter = r.filters
+          c.collect($0.sub(/\.rb\Z/, ''))
+        end,
+        :dir => proc do |r|
+          require 'test/unit/collector/dir'
+          c = Collector::Dir.new
+          c.filter = r.filters
+          c.pattern.concat(r.pattern) if(r.pattern)
+          c.exclude.concat(r.exclude) if(r.exclude)
+          c.base = r.base
+          $:.push(r.base) if r.base
+          c.collect(*(r.to_run.empty? ? ['.'] : r.to_run))
+        end,
+      }
+
+      attr_reader :suite
+      attr_accessor :output_level, :filters, :to_run, :pattern, :exclude, :base, :workdir
+      attr_writer :runner, :collector
+
+      def initialize(standalone)
+        Unit.run = true
+        @standalone = standalone
+        @runner = RUNNERS[:console]
+        @collector = COLLECTORS[(standalone ? :dir : :objectspace)]
+        @filters = []
+        @to_run = []
+        @output_level = UI::NORMAL
+        @workdir = nil
+        yield(self) if(block_given?)
+      end
+
+      def process_args(args = ARGV)
+        begin
+          options.order!(args) {|arg| @to_run << arg}
+        rescue OptionParser::ParseError => e
+          puts e
+          puts options
+          $! = nil
+          abort
+        else
+          @filters << proc{false} unless(@filters.empty?)
+        end
+        not @to_run.empty?
+      end
+
+      def options
+        @options ||= OptionParser.new do |o|
+          o.banner = "Test::Unit automatic runner."
+          o.banner << "\nUsage: #{$0} [options] [-- untouched arguments]"
+
+          o.on
+          o.on('-r', '--runner=RUNNER', RUNNERS,
+               "Use the given RUNNER.",
+               "(" + keyword_display(RUNNERS) + ")") do |r|
+            @runner = r
+          end
+
+          if(@standalone)
+            o.on('-b', '--basedir=DIR', "Base directory of test suites.") do |b|
+              @base = b
+            end
+
+            o.on('-w', '--workdir=DIR', "Working directory to run tests.") do |w|
+              @workdir = w
+            end
+
+            o.on('-a', '--add=TORUN', Array,
+                 "Add TORUN to the list of things to run;",
+                 "can be a file or a directory.") do |a|
+              @to_run.concat(a)
+            end
+
+            @pattern = []
+            o.on('-p', '--pattern=PATTERN', Regexp,
+                 "Match files to collect against PATTERN.") do |e|
+              @pattern << e
+            end
+
+            @exclude = []
+            o.on('-x', '--exclude=PATTERN', Regexp,
+                 "Ignore files to collect against PATTERN.") do |e|
+              @exclude << e
+            end
+          end
+
+          o.on('-n', '--name=NAME', String,
+               "Runs tests matching NAME.",
+               "(patterns may be used).") do |n|
+            n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
+            case n
+            when Regexp
+              @filters << proc{|t| n =~ t.method_name ? true : nil}
+            else
+              @filters << proc{|t| n == t.method_name ? true : nil}
+            end
+          end
+
+          o.on('-t', '--testcase=TESTCASE', String,
+               "Runs tests in TestCases matching TESTCASE.",
+               "(patterns may be used).") do |n|
+            n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
+            case n
+            when Regexp
+              @filters << proc{|t| n =~ t.class.name ? true : nil}
+            else
+              @filters << proc{|t| n == t.class.name ? true : nil}
+            end
+          end
+
+          o.on('-I', "--load-path=DIR[#{File::PATH_SEPARATOR}DIR...]",
+               "Appends directory list to $LOAD_PATH.") do |dirs|
+            $LOAD_PATH.concat(dirs.split(File::PATH_SEPARATOR))
+          end
+
+          o.on('-v', '--verbose=[LEVEL]', OUTPUT_LEVELS,
+               "Set the output level (default is verbose).",
+               "(" + keyword_display(OUTPUT_LEVELS) + ")") do |l|
+            @output_level = l || UI::VERBOSE
+          end
+
+          o.on('--',
+               "Stop processing options so that the",
+               "remaining options will be passed to the",
+               "test."){o.terminate}
+
+          o.on('-h', '--help', 'Display this help.'){puts o; exit}
+
+          o.on_tail
+          o.on_tail('Deprecated options:')
+
+          o.on_tail('--console', 'Console runner (use --runner).') do
+            warn("Deprecated option (--console).")
+            @runner = RUNNERS[:console]
+          end
+
+          o.on_tail('--gtk', 'GTK runner (use --runner).') do
+            warn("Deprecated option (--gtk).")
+            @runner = RUNNERS[:gtk]
+          end
+
+          o.on_tail('--fox', 'Fox runner (use --runner).') do
+            warn("Deprecated option (--fox).")
+            @runner = RUNNERS[:fox]
+          end
+
+          o.on_tail
+        end
+      end
+
+      def keyword_display(array)
+        list = array.collect {|e, *| e.to_s}
+        Array === array or list.sort!
+        list.collect {|e| e.sub(/^(.)([A-Za-z]+)(?=\w*$)/, '\\1[\\2]')}.join(", ")
+      end
+
+      def run
+        @suite = @collector[self]
+        result = @runner[self] or return false
+        Dir.chdir(@workdir) if @workdir
+        result.run(@suite, @output_level).passed?
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/collector.rb b/ruby_1_8_6/lib/test/unit/collector.rb
new file mode 100644
index 0000000000..9e9e654147
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/collector.rb
@@ -0,0 +1,43 @@
+module Test
+  module Unit
+    module Collector
+      def initialize
+        @filters = []
+      end
+
+      def filter=(filters)
+        @filters = case(filters)
+          when Proc
+            [filters]
+          when Array
+            filters
+        end
+      end
+
+      def add_suite(destination, suite)
+        to_delete = suite.tests.find_all{|t| !include?(t)}
+        to_delete.each{|t| suite.delete(t)}
+        destination << suite unless(suite.size == 0)
+      end
+
+      def include?(test)
+        return true if(@filters.empty?)
+        @filters.each do |filter|
+          result = filter[test]
+          if(result.nil?)
+            next
+          elsif(!result)
+            return false
+          else
+            return true
+          end
+        end
+        true
+      end
+
+      def sort(suites)
+        suites.sort_by{|s| s.name}
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/collector/dir.rb b/ruby_1_8_6/lib/test/unit/collector/dir.rb
new file mode 100644
index 0000000000..97c8d28481
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/collector/dir.rb
@@ -0,0 +1,107 @@
+require 'test/unit/testsuite'
+require 'test/unit/collector'
+
+module Test
+  module Unit
+    module Collector
+      class Dir
+        include Collector
+
+        attr_reader :pattern, :exclude
+        attr_accessor :base
+
+        def initialize(dir=::Dir, file=::File, object_space=::ObjectSpace, req=nil)
+          super()
+          @dir = dir
+          @file = file
+          @object_space = object_space
+          @req = req
+          @pattern = [/\btest_.*\.rb\Z/m]
+          @exclude = []
+        end
+
+        def collect(*from)
+          basedir = @base
+          $:.push(basedir) if basedir
+          if(from.empty?)
+            recursive_collect('.', find_test_cases)
+          elsif(from.size == 1)
+            recursive_collect(from.first, find_test_cases)
+          else
+            suites = []
+            from.each do |f|
+              suite = recursive_collect(f, find_test_cases)
+              suites << suite unless(suite.tests.empty?)
+            end
+            suite = TestSuite.new("[#{from.join(', ')}]")
+            sort(suites).each{|s| suite << s}
+            suite
+          end
+        ensure
+          $:.delete_at($:.rindex(basedir)) if basedir
+        end
+
+        def find_test_cases(ignore=[])
+          cases = []
+          @object_space.each_object(Class) do |c|
+            cases << c if(c < TestCase && !ignore.include?(c))
+          end
+          ignore.concat(cases)
+          cases
+        end
+
+        def recursive_collect(name, already_gathered)
+          sub_suites = []
+          path = realdir(name)
+          if @file.directory?(path)
+	    dir_name = name unless name == '.'
+            @dir.entries(path).each do |e|
+              next if(e == '.' || e == '..')
+              e_name = dir_name ? @file.join(dir_name, e) : e
+              if @file.directory?(realdir(e_name))
+                next if /\ACVS\z/ =~ e
+                sub_suite = recursive_collect(e_name, already_gathered)
+                sub_suites << sub_suite unless(sub_suite.empty?)
+              else
+                next if /~\z/ =~ e_name or /\A\.\#/ =~ e
+                if @pattern and !@pattern.empty?
+                  next unless @pattern.any? {|pat| pat =~ e_name}
+                end
+                if @exclude and !@exclude.empty?
+                  next if @exclude.any? {|pat| pat =~ e_name}
+                end
+                collect_file(e_name, sub_suites, already_gathered)
+              end
+            end
+          else
+            collect_file(name, sub_suites, already_gathered)
+          end
+          suite = TestSuite.new(@file.basename(name))
+          sort(sub_suites).each{|s| suite << s}
+          suite
+        end
+
+        def collect_file(name, suites, already_gathered)
+          dir = @file.dirname(@file.expand_path(name, @base))
+          $:.unshift(dir)
+          if(@req)
+            @req.require(name)
+          else
+            require(name)
+          end
+          find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)}
+        ensure
+          $:.delete_at($:.rindex(dir)) if(dir)
+        end
+
+	def realdir(path)
+	  if @base
+	    @file.join(@base, path)
+	  else
+	    path
+	  end
+	end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/collector/objectspace.rb b/ruby_1_8_6/lib/test/unit/collector/objectspace.rb
new file mode 100644
index 0000000000..d1127a981f
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/collector/objectspace.rb
@@ -0,0 +1,34 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/collector'
+
+module Test
+  module Unit
+    module Collector
+      class ObjectSpace
+        include Collector
+        
+        NAME = 'collected from the ObjectSpace'
+        
+        def initialize(source=::ObjectSpace)
+          super()
+          @source = source
+        end
+        
+        def collect(name=NAME)
+          suite = TestSuite.new(name)
+          sub_suites = []
+          @source.each_object(Class) do |klass|
+            if(Test::Unit::TestCase > klass)
+              add_suite(sub_suites, klass.suite)
+            end
+          end
+          sort(sub_suites).each{|s| suite << s}
+          suite
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/error.rb b/ruby_1_8_6/lib/test/unit/error.rb
new file mode 100644
index 0000000000..43a813f7d1
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/error.rb
@@ -0,0 +1,56 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/util/backtracefilter'
+
+module Test
+  module Unit
+
+    # Encapsulates an error in a test. Created by
+    # Test::Unit::TestCase when it rescues an exception thrown
+    # during the processing of a test.
+    class Error
+      include Util::BacktraceFilter
+
+      attr_reader(:test_name, :exception)
+
+      SINGLE_CHARACTER = 'E'
+
+      # Creates a new Error with the given test_name and
+      # exception.
+      def initialize(test_name, exception)
+        @test_name = test_name
+        @exception = exception
+      end
+
+      # Returns a single character representation of an error.
+      def single_character_display
+        SINGLE_CHARACTER
+      end
+
+      # Returns the message associated with the error.
+      def message
+        "#{@exception.class.name}: #{@exception.message}"
+      end
+
+      # Returns a brief version of the error description.
+      def short_display
+        "#@test_name: #{message.split("\n")[0]}"
+      end
+
+      # Returns a verbose version of the error description.
+      def long_display
+        backtrace = filter_backtrace(@exception.backtrace).join("\n    ")
+        "Error:\n#@test_name:\n#{message}\n    #{backtrace}"
+      end
+
+      # Overridden to return long_display.
+      def to_s
+        long_display
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/failure.rb b/ruby_1_8_6/lib/test/unit/failure.rb
new file mode 100644
index 0000000000..832c99857c
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/failure.rb
@@ -0,0 +1,51 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module Test
+  module Unit
+
+    # Encapsulates a test failure. Created by Test::Unit::TestCase
+    # when an assertion fails.
+    class Failure
+      attr_reader :test_name, :location, :message
+      
+      SINGLE_CHARACTER = 'F'
+
+      # Creates a new Failure with the given location and
+      # message.
+      def initialize(test_name, location, message)
+        @test_name = test_name
+        @location = location
+        @message = message
+      end
+      
+      # Returns a single character representation of a failure.
+      def single_character_display
+        SINGLE_CHARACTER
+      end
+
+      # Returns a brief version of the error description.
+      def short_display
+        "#@test_name: #{@message.split("\n")[0]}"
+      end
+
+      # Returns a verbose version of the error description.
+      def long_display
+        location_display = if(location.size == 1)
+          location[0].sub(/\A(.+:\d+).*/, ' [\\1]')
+        else
+          "\n    [#{location.join("\n     ")}]"
+        end
+        "Failure:\n#@test_name#{location_display}:\n#@message"
+      end
+
+      # Overridden to return long_display.
+      def to_s
+        long_display
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/testcase.rb b/ruby_1_8_6/lib/test/unit/testcase.rb
new file mode 100644
index 0000000000..f53b460c5d
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/testcase.rb
@@ -0,0 +1,160 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/assertions'
+require 'test/unit/failure'
+require 'test/unit/error'
+require 'test/unit/testsuite'
+require 'test/unit/assertionfailederror'
+require 'test/unit/util/backtracefilter'
+
+module Test
+  module Unit
+
+    # Ties everything together. If you subclass and add your own
+    # test methods, it takes care of making them into tests and
+    # wrapping those tests into a suite. It also does the
+    # nitty-gritty of actually running an individual test and
+    # collecting its results into a Test::Unit::TestResult object.
+    class TestCase
+      include Assertions
+      include Util::BacktraceFilter
+      
+      attr_reader :method_name
+      
+      STARTED = name + "::STARTED"
+      FINISHED = name + "::FINISHED"
+
+      ##
+      # These exceptions are not caught by #run.
+
+      PASSTHROUGH_EXCEPTIONS = [NoMemoryError, SignalException, Interrupt,
+                                SystemExit]
+
+      # Creates a new instance of the fixture for running the
+      # test represented by test_method_name.
+      def initialize(test_method_name)
+        unless(respond_to?(test_method_name) and
+               (method(test_method_name).arity == 0 ||
+                method(test_method_name).arity == -1))
+          throw :invalid_test
+        end
+        @method_name = test_method_name
+        @test_passed = true
+      end
+
+      # Rolls up all of the test* methods in the fixture into
+      # one suite, creating a new instance of the fixture for
+      # each method.
+      def self.suite
+        method_names = public_instance_methods(true)
+        tests = method_names.delete_if {|method_name| method_name !~ /^test./}
+        suite = TestSuite.new(name)
+        tests.sort.each do
+          |test|
+          catch(:invalid_test) do
+            suite << new(test)
+          end
+        end
+        if (suite.empty?)
+          catch(:invalid_test) do
+            suite << new("default_test")
+          end
+        end
+        return suite
+      end
+
+      # Runs the individual test method represented by this
+      # instance of the fixture, collecting statistics, failures
+      # and errors in result.
+      def run(result)
+        yield(STARTED, name)
+        @_result = result
+        begin
+          setup
+          __send__(@method_name)
+        rescue AssertionFailedError => e
+          add_failure(e.message, e.backtrace)
+        rescue Exception
+          raise if PASSTHROUGH_EXCEPTIONS.include? $!.class
+          add_error($!)
+        ensure
+          begin
+            teardown
+          rescue AssertionFailedError => e
+            add_failure(e.message, e.backtrace)
+          rescue Exception
+            raise if PASSTHROUGH_EXCEPTIONS.include? $!.class
+            add_error($!)
+          end
+        end
+        result.add_run
+        yield(FINISHED, name)
+      end
+
+      # Called before every test method runs. Can be used
+      # to set up fixture information.
+      def setup
+      end
+
+      # Called after every test method runs. Can be used to tear
+      # down fixture information.
+      def teardown
+      end
+      
+      def default_test
+        flunk("No tests were specified")
+      end
+
+      # Returns whether this individual test passed or
+      # not. Primarily for use in teardown so that artifacts
+      # can be left behind if the test fails.
+      def passed?
+        return @test_passed
+      end
+      private :passed?
+
+      def size
+        1
+      end
+
+      def add_assertion
+        @_result.add_assertion
+      end
+      private :add_assertion
+
+      def add_failure(message, all_locations=caller())
+        @test_passed = false
+        @_result.add_failure(Failure.new(name, filter_backtrace(all_locations), message))
+      end
+      private :add_failure
+
+      def add_error(exception)
+        @test_passed = false
+        @_result.add_error(Error.new(name, exception))
+      end
+      private :add_error
+
+      # Returns a human-readable name for the specific test that
+      # this instance of TestCase represents.
+      def name
+        "#{@method_name}(#{self.class.name})"
+      end
+
+      # Overridden to return #name.
+      def to_s
+        name
+      end
+      
+      # It's handy to be able to compare TestCase instances.
+      def ==(other)
+        return false unless(other.kind_of?(self.class))
+        return false unless(@method_name == other.method_name)
+        self.class == other.class
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/testresult.rb b/ruby_1_8_6/lib/test/unit/testresult.rb
new file mode 100644
index 0000000000..e3a472ef7f
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/testresult.rb
@@ -0,0 +1,80 @@
+#--
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/util/observable'
+
+module Test
+  module Unit
+
+    # Collects Test::Unit::Failure and Test::Unit::Error so that
+    # they can be displayed to the user. To this end, observers
+    # can be added to it, allowing the dynamic updating of, say, a
+    # UI.
+    class TestResult
+      include Util::Observable
+
+      CHANGED = "CHANGED"
+      FAULT = "FAULT"
+
+      attr_reader(:run_count, :assertion_count)
+
+      # Constructs a new, empty TestResult.
+      def initialize
+        @run_count, @assertion_count = 0, 0
+        @failures, @errors = Array.new, Array.new
+      end
+
+      # Records a test run.
+      def add_run
+        @run_count += 1
+        notify_listeners(CHANGED, self)
+      end
+
+      # Records a Test::Unit::Failure.
+      def add_failure(failure)
+        @failures << failure
+        notify_listeners(FAULT, failure)
+        notify_listeners(CHANGED, self)
+      end
+
+      # Records a Test::Unit::Error.
+      def add_error(error)
+        @errors << error
+        notify_listeners(FAULT, error)
+        notify_listeners(CHANGED, self)
+      end
+
+      # Records an individual assertion.
+      def add_assertion
+        @assertion_count += 1
+        notify_listeners(CHANGED, self)
+      end
+
+      # Returns a string contain the recorded runs, assertions,
+      # failures and errors in this TestResult.
+      def to_s
+        "#{run_count} tests, #{assertion_count} assertions, #{failure_count} failures, #{error_count} errors"
+      end
+
+      # Returns whether or not this TestResult represents
+      # successful completion.
+      def passed?
+        return @failures.empty? && @errors.empty?
+      end
+
+      # Returns the number of failures this TestResult has
+      # recorded.
+      def failure_count
+        return @failures.size
+      end
+
+      # Returns the number of errors this TestResult has
+      # recorded.
+      def error_count
+        return @errors.size
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/testsuite.rb b/ruby_1_8_6/lib/test/unit/testsuite.rb
new file mode 100644
index 0000000000..6fea976c50
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/testsuite.rb
@@ -0,0 +1,76 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module Test
+  module Unit
+
+    # A collection of tests which can be #run.
+    #
+    # Note: It is easy to confuse a TestSuite instance with
+    # something that has a static suite method; I know because _I_
+    # have trouble keeping them straight. Think of something that
+    # has a suite method as simply providing a way to get a
+    # meaningful TestSuite instance.
+    class TestSuite
+      attr_reader :name, :tests
+      
+      STARTED = name + "::STARTED"
+      FINISHED = name + "::FINISHED"
+
+      # Creates a new TestSuite with the given name.
+      def initialize(name="Unnamed TestSuite")
+        @name = name
+        @tests = []
+      end
+
+      # Runs the tests and/or suites contained in this
+      # TestSuite.
+      def run(result, &progress_block)
+        yield(STARTED, name)
+        @tests.each do |test|
+          test.run(result, &progress_block)
+        end
+        yield(FINISHED, name)
+      end
+
+      # Adds the test to the suite.
+      def <<(test)
+        @tests << test
+        self
+      end
+
+      def delete(test)
+        @tests.delete(test)
+      end
+
+      # Retuns the rolled up number of tests in this suite;
+      # i.e. if the suite contains other suites, it counts the
+      # tests within those suites, not the suites themselves.
+      def size
+        total_size = 0
+        @tests.each { |test| total_size += test.size }
+        total_size
+      end
+      
+      def empty?
+        tests.empty?
+      end
+
+      # Overridden to return the name given the suite at
+      # creation.
+      def to_s
+        @name
+      end
+      
+      # It's handy to be able to compare TestSuite instances.
+      def ==(other)
+        return false unless(other.kind_of?(self.class))
+        return false unless(@name == other.name)
+        @tests == other.tests
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/ui/console/testrunner.rb b/ruby_1_8_6/lib/test/unit/ui/console/testrunner.rb
new file mode 100644
index 0000000000..6b600e319a
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/ui/console/testrunner.rb
@@ -0,0 +1,127 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/ui/testrunnermediator'
+require 'test/unit/ui/testrunnerutilities'
+
+module Test
+  module Unit
+    module UI
+      module Console
+
+        # Runs a Test::Unit::TestSuite on the console.
+        class TestRunner
+          extend TestRunnerUtilities
+
+          # Creates a new TestRunner for running the passed
+          # suite. If quiet_mode is true, the output while
+          # running is limited to progress dots, errors and
+          # failures, and the final result. io specifies
+          # where runner output should go to; defaults to
+          # STDOUT.
+          def initialize(suite, output_level=NORMAL, io=STDOUT)
+            if (suite.respond_to?(:suite))
+              @suite = suite.suite
+            else
+              @suite = suite
+            end
+            @output_level = output_level
+            @io = io
+            @already_outputted = false
+            @faults = []
+          end
+
+          # Begins the test run.
+          def start
+            setup_mediator
+            attach_to_mediator
+            return start_mediator
+          end
+
+          private
+          def setup_mediator
+            @mediator = create_mediator(@suite)
+            suite_name = @suite.to_s
+            if ( @suite.kind_of?(Module) )
+              suite_name = @suite.name
+            end
+            output("Loaded suite #{suite_name}")
+          end
+          
+          def create_mediator(suite)
+            return TestRunnerMediator.new(suite)
+          end
+          
+          def attach_to_mediator
+            @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
+            @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
+            @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
+            @mediator.add_listener(TestCase::STARTED, &method(:test_started))
+            @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
+          end
+          
+          def start_mediator
+            return @mediator.run_suite
+          end
+          
+          def add_fault(fault)
+            @faults << fault
+            output_single(fault.single_character_display, PROGRESS_ONLY)
+            @already_outputted = true
+          end
+          
+          def started(result)
+            @result = result
+            output("Started")
+          end
+          
+          def finished(elapsed_time)
+            nl
+            output("Finished in #{elapsed_time} seconds.")
+            @faults.each_with_index do |fault, index|
+              nl
+              output("%3d) %s" % [index + 1, fault.long_display])
+            end
+            nl
+            output(@result)
+          end
+          
+          def test_started(name)
+            output_single(name + ": ", VERBOSE)
+          end
+          
+          def test_finished(name)
+            output_single(".", PROGRESS_ONLY) unless (@already_outputted)
+            nl(VERBOSE)
+            @already_outputted = false
+          end
+          
+          def nl(level=NORMAL)
+            output("", level)
+          end
+          
+          def output(something, level=NORMAL)
+            @io.puts(something) if (output?(level))
+            @io.flush
+          end
+          
+          def output_single(something, level=NORMAL)
+            @io.write(something) if (output?(level))
+            @io.flush
+          end
+          
+          def output?(level)
+            level <= @output_level
+          end
+        end
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+  Test::Unit::UI::Console::TestRunner.start_command_line_test
+end
diff --git a/ruby_1_8_6/lib/test/unit/ui/fox/testrunner.rb b/ruby_1_8_6/lib/test/unit/ui/fox/testrunner.rb
new file mode 100644
index 0000000000..a23a450567
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/ui/fox/testrunner.rb
@@ -0,0 +1,268 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'fox'
+require 'test/unit/ui/testrunnermediator'
+require 'test/unit/ui/testrunnerutilities'
+
+include Fox
+
+module Test
+  module Unit
+    module UI
+      module Fox
+
+        # Runs a Test::Unit::TestSuite in a Fox UI. Obviously,
+        # this one requires you to have Fox
+        # (http://www.fox-toolkit.org/fox.html) and the Ruby
+        # Fox extension (http://fxruby.sourceforge.net/)
+        # installed.
+        class TestRunner
+
+          extend TestRunnerUtilities
+          
+          RED_STYLE = FXRGBA(0xFF,0,0,0xFF) #0xFF000000
+          GREEN_STYLE = FXRGBA(0,0xFF,0,0xFF) #0x00FF0000
+
+          # Creates a new TestRunner for running the passed
+          # suite.
+          def initialize(suite, output_level = NORMAL)
+            if (suite.respond_to?(:suite))
+              @suite = suite.suite
+            else
+              @suite = suite
+            end
+
+            @result = nil
+            @red = false
+          end
+  
+          # Begins the test run.
+          def start
+            setup_ui
+            setup_mediator
+            attach_to_mediator
+            start_ui
+            @result
+          end
+
+          def setup_mediator
+            @mediator = TestRunnerMediator.new(@suite)
+            suite_name = @suite.to_s
+            if ( @suite.kind_of?(Module) )
+              suite_name = @suite.name
+            end
+            @suite_name_entry.text = suite_name
+          end
+          
+          def attach_to_mediator
+            @mediator.add_listener(TestRunnerMediator::RESET, &method(:reset_ui))
+            @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
+            @mediator.add_listener(TestResult::CHANGED, &method(:result_changed))
+            @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
+            @mediator.add_listener(TestCase::STARTED, &method(:test_started))
+            @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
+          end
+  
+          def start_ui
+            @application.create
+            @window.show(PLACEMENT_SCREEN)
+            @application.addTimeout(1) do
+              @mediator.run_suite
+            end
+            @application.run
+          end
+          
+          def stop
+            @application.exit(0)
+          end
+          
+          def reset_ui(count)
+            @test_progress_bar.barColor = GREEN_STYLE
+            @test_progress_bar.total = count
+            @test_progress_bar.progress = 0
+            @red = false
+  
+            @test_count_label.text = "0"
+            @assertion_count_label.text = "0"
+            @failure_count_label.text = "0"
+            @error_count_label.text = "0"
+  
+            @fault_list.clearItems
+          end
+          
+          def add_fault(fault)
+            if ( ! @red )
+              @test_progress_bar.barColor = RED_STYLE
+              @red = true
+            end
+            item = FaultListItem.new(fault)
+            @fault_list.appendItem(item)
+          end
+          
+          def show_fault(fault)
+            raw_show_fault(fault.long_display)
+          end
+          
+          def raw_show_fault(string)
+            @detail_text.setText(string)
+          end
+          
+          def clear_fault
+            raw_show_fault("")
+          end
+          
+          def result_changed(result)
+            @test_progress_bar.progress = result.run_count
+  
+            @test_count_label.text = result.run_count.to_s
+            @assertion_count_label.text = result.assertion_count.to_s
+            @failure_count_label.text = result.failure_count.to_s
+            @error_count_label.text = result.error_count.to_s
+
+             # repaint now!
+             @info_panel.repaint
+             @application.flush
+          end
+          
+          def started(result)
+            @result = result
+            output_status("Started...")
+          end
+          
+          def test_started(test_name)
+            output_status("Running #{test_name}...")
+          end
+          
+          def finished(elapsed_time)
+            output_status("Finished in #{elapsed_time} seconds")
+          end
+          
+          def output_status(string)
+            @status_entry.text = string
+            @status_entry.repaint
+          end
+  
+          def setup_ui
+            @application = create_application
+            create_tooltip(@application)
+
+            @window = create_window(@application)
+            
+            @status_entry = create_entry(@window)
+            
+            main_panel = create_main_panel(@window)
+            
+            suite_panel = create_suite_panel(main_panel)
+            create_label(suite_panel, "Suite:")
+            @suite_name_entry = create_entry(suite_panel)
+            create_button(suite_panel, "&Run\tRun the current suite", proc { @mediator.run_suite })
+            
+            @test_progress_bar = create_progress_bar(main_panel)
+            
+            @info_panel = create_info_panel(main_panel)
+            create_label(@info_panel, "Tests:")
+            @test_count_label = create_label(@info_panel, "0")
+            create_label(@info_panel, "Assertions:")
+            @assertion_count_label = create_label(@info_panel, "0")
+            create_label(@info_panel, "Failures:")
+            @failure_count_label = create_label(@info_panel, "0")
+            create_label(@info_panel, "Errors:")
+            @error_count_label = create_label(@info_panel, "0")
+            
+            list_panel = create_list_panel(main_panel)
+            @fault_list = create_fault_list(list_panel)
+            
+            detail_panel = create_detail_panel(main_panel)
+            @detail_text = create_text(detail_panel)
+          end
+          
+          def create_application
+            app = FXApp.new("TestRunner", "Test::Unit")
+            app.init([])
+            app
+          end
+          
+          def create_window(app)
+            FXMainWindow.new(app, "Test::Unit TestRunner", nil, nil, DECOR_ALL, 0, 0, 450)
+          end
+          
+          def create_tooltip(app)
+            FXTooltip.new(app)
+          end
+  
+          def create_main_panel(parent)
+            panel = FXVerticalFrame.new(parent, LAYOUT_FILL_X | LAYOUT_FILL_Y)
+            panel.vSpacing = 10
+            panel
+          end
+  
+          def create_suite_panel(parent)
+            FXHorizontalFrame.new(parent, LAYOUT_SIDE_LEFT | LAYOUT_FILL_X)
+          end
+          
+          def create_button(parent, text, action)
+            FXButton.new(parent, text).connect(SEL_COMMAND, &action)
+          end
+          
+          def create_progress_bar(parent)
+            FXProgressBar.new(parent, nil, 0, PROGRESSBAR_NORMAL | LAYOUT_FILL_X)
+          end
+          
+          def create_info_panel(parent)
+            FXMatrix.new(parent, 1, MATRIX_BY_ROWS | LAYOUT_FILL_X)
+          end
+          
+          def create_label(parent, text)
+            FXLabel.new(parent, text, nil, JUSTIFY_CENTER_X | LAYOUT_FILL_COLUMN)
+          end
+          
+          def create_list_panel(parent)
+            FXHorizontalFrame.new(parent, LAYOUT_FILL_X | FRAME_SUNKEN | FRAME_THICK)
+          end
+          
+          def create_fault_list(parent)
+            list = FXList.new(parent, 10, nil, 0, LIST_SINGLESELECT | LAYOUT_FILL_X) #, 0, 0, 0, 150)
+            list.connect(SEL_COMMAND) do |sender, sel, ptr|
+              if sender.retrieveItem(sender.currentItem).selected?
+                show_fault(sender.retrieveItem(sender.currentItem).fault)
+              else
+                clear_fault
+              end
+            end
+            list
+          end
+          
+          def create_detail_panel(parent)
+            FXHorizontalFrame.new(parent, LAYOUT_FILL_X | LAYOUT_FILL_Y | FRAME_SUNKEN | FRAME_THICK)
+          end
+          
+          def create_text(parent)
+            FXText.new(parent, nil, 0, TEXT_READONLY | LAYOUT_FILL_X | LAYOUT_FILL_Y)
+          end
+          
+          def create_entry(parent)
+            entry = FXTextField.new(parent, 30, nil, 0, TEXTFIELD_NORMAL | LAYOUT_SIDE_BOTTOM | LAYOUT_FILL_X)
+            entry.disable
+            entry
+          end
+        end
+  
+        class FaultListItem < FXListItem
+          attr_reader(:fault)
+          def initialize(fault)
+            super(fault.short_display)
+            @fault = fault
+          end
+        end
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+  Test::Unit::UI::Fox::TestRunner.start_command_line_test
+end
diff --git a/ruby_1_8_6/lib/test/unit/ui/gtk/testrunner.rb b/ruby_1_8_6/lib/test/unit/ui/gtk/testrunner.rb
new file mode 100644
index 0000000000..994328dc9b
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/ui/gtk/testrunner.rb
@@ -0,0 +1,416 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'gtk'
+require 'test/unit/ui/testrunnermediator'
+require 'test/unit/ui/testrunnerutilities'
+
+module Test
+  module Unit
+    module UI
+      module GTK
+
+        # Runs a Test::Unit::TestSuite in a Gtk UI. Obviously,
+        # this one requires you to have Gtk
+        # (http://www.gtk.org/) and the Ruby Gtk extension
+        # (http://ruby-gnome.sourceforge.net/) installed.
+        class TestRunner
+          extend TestRunnerUtilities
+
+          # Creates a new TestRunner for running the passed
+          # suite.
+          def initialize(suite, output_level = NORMAL)
+            if (suite.respond_to?(:suite))
+              @suite = suite.suite
+            else
+              @suite = suite
+            end
+            @result = nil
+
+            @runner = Thread.current
+            @restart_signal = Class.new(Exception)
+            @viewer = Thread.start do
+              @runner.join rescue @runner.run
+              Gtk.main
+            end
+            @viewer.join rescue nil # wait deadlock to handshake
+          end
+
+          # Begins the test run.
+          def start
+            setup_mediator
+            setup_ui
+            attach_to_mediator
+            start_ui
+            @result
+          end
+
+          private
+          def setup_mediator
+            @mediator = TestRunnerMediator.new(@suite)
+            suite_name = @suite.to_s
+            if ( @suite.kind_of?(Module) )
+              suite_name = @suite.name
+            end
+            suite_name_entry.set_text(suite_name)
+          end
+          
+          def attach_to_mediator
+            run_button.signal_connect("clicked", nil, &method(:run_test))
+            @mediator.add_listener(TestRunnerMediator::RESET, &method(:reset_ui))
+            @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
+            @mediator.add_listener(TestResult::CHANGED, &method(:result_changed))
+            @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
+            @mediator.add_listener(TestCase::STARTED, &method(:test_started))
+            @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
+            @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
+          end
+
+          def run_test(*)
+            @runner.raise(@restart_signal)
+          end
+          
+          def start_ui
+            @viewer.run
+            running = false
+            begin
+              loop do
+                if (running ^= true)
+                  run_button.child.text = "Stop"
+                  @mediator.run_suite
+                else
+                  run_button.child.text = "Run"
+                  @viewer.join
+                  break
+                end
+              end
+            rescue @restart_signal
+              retry
+            rescue
+            end
+          end
+          
+          def stop(*)
+            Gtk.main_quit
+          end
+          
+          def reset_ui(count)
+            test_progress_bar.set_style(green_style)
+            test_progress_bar.configure(0, 0, count)
+            @red = false
+  
+            run_count_label.set_text("0")
+            assertion_count_label.set_text("0")
+            failure_count_label.set_text("0")
+            error_count_label.set_text("0")
+  
+            fault_list.remove_items(fault_list.children)
+          end
+          
+          def add_fault(fault)
+            if ( ! @red )
+              test_progress_bar.set_style(red_style)
+              @red = true
+            end
+            item = FaultListItem.new(fault)
+            item.show
+            fault_list.append_items([item])
+          end
+          
+          def show_fault(fault)
+            raw_show_fault(fault.long_display)
+          end
+          
+          def raw_show_fault(string)
+            fault_detail_label.set_text(string)
+            outer_detail_sub_panel.queue_resize
+          end
+          
+          def clear_fault
+            raw_show_fault("")
+          end
+          
+          def result_changed(result)
+            run_count_label.set_text(result.run_count.to_s)
+            assertion_count_label.set_text(result.assertion_count.to_s)
+            failure_count_label.set_text(result.failure_count.to_s)
+            error_count_label.set_text(result.error_count.to_s)
+          end
+          
+          def started(result)
+            @result = result
+            output_status("Started...")
+          end
+          
+          def test_started(test_name)
+            output_status("Running #{test_name}...")
+          end
+          
+          def test_finished(test_name)
+            test_progress_bar.set_value(test_progress_bar.get_value + 1)
+          end
+          
+          def finished(elapsed_time)
+            output_status("Finished in #{elapsed_time} seconds")
+          end
+          
+          def output_status(string)
+            status_entry.set_text(string)
+          end
+  
+          def setup_ui
+            main_window.signal_connect("destroy", nil, &method(:stop))
+            main_window.show_all
+            fault_list.signal_connect("select-child", nil) {
+              | list, item, data |
+              show_fault(item.fault)
+            }
+            fault_list.signal_connect("unselect-child", nil) {
+              clear_fault
+            }
+            @red = false
+          end
+          
+          def main_window
+            lazy_initialize(:main_window) {
+              @main_window = Gtk::Window.new(Gtk::WINDOW_TOPLEVEL)
+              @main_window.set_title("Test::Unit TestRunner")
+              @main_window.set_usize(800, 600)
+              @main_window.set_uposition(20, 20)
+              @main_window.set_policy(true, true, false)
+              @main_window.add(main_panel)
+            }
+          end
+          
+          def main_panel
+            lazy_initialize(:main_panel) {
+              @main_panel = Gtk::VBox.new(false, 0)
+              @main_panel.pack_start(suite_panel, false, false, 0)
+              @main_panel.pack_start(progress_panel, false, false, 0)
+              @main_panel.pack_start(info_panel, false, false, 0)
+              @main_panel.pack_start(list_panel, false, false, 0)
+              @main_panel.pack_start(detail_panel, true, true, 0)
+              @main_panel.pack_start(status_panel, false, false, 0)
+            }
+          end
+          
+          def suite_panel
+            lazy_initialize(:suite_panel) {
+              @suite_panel = Gtk::HBox.new(false, 10)
+              @suite_panel.border_width(10)
+              @suite_panel.pack_start(Gtk::Label.new("Suite:"), false, false, 0)
+              @suite_panel.pack_start(suite_name_entry, true, true, 0)
+              @suite_panel.pack_start(run_button, false, false, 0)
+            }
+          end
+          
+          def suite_name_entry
+            lazy_initialize(:suite_name_entry) {
+              @suite_name_entry = Gtk::Entry.new
+              @suite_name_entry.set_editable(false)
+            }
+          end
+          
+          def run_button
+            lazy_initialize(:run_button) {
+              @run_button = Gtk::Button.new("Run")
+            }
+          end
+          
+          def progress_panel
+            lazy_initialize(:progress_panel) {
+              @progress_panel = Gtk::HBox.new(false, 10)
+              @progress_panel.border_width(10)
+              @progress_panel.pack_start(test_progress_bar, true, true, 0)
+            }
+          end
+          
+          def test_progress_bar
+            lazy_initialize(:test_progress_bar) {
+              @test_progress_bar = EnhancedProgressBar.new
+              @test_progress_bar.set_usize(@test_progress_bar.allocation.width,
+                                           info_panel.size_request.height)
+              @test_progress_bar.set_style(green_style)
+            }
+          end
+          
+          def green_style
+            lazy_initialize(:green_style) {
+              @green_style = Gtk::Style.new
+              @green_style.set_bg(Gtk::STATE_PRELIGHT, 0x0000, 0xFFFF, 0x0000)
+            }
+          end
+          
+          def red_style
+            lazy_initialize(:red_style) {
+              @red_style = Gtk::Style.new
+              @red_style.set_bg(Gtk::STATE_PRELIGHT, 0xFFFF, 0x0000, 0x0000)
+            }
+          end
+          
+          def info_panel
+            lazy_initialize(:info_panel) {
+              @info_panel = Gtk::HBox.new(false, 0)
+              @info_panel.border_width(10)
+              @info_panel.pack_start(Gtk::Label.new("Runs:"), false, false, 0)
+              @info_panel.pack_start(run_count_label, true, false, 0)
+              @info_panel.pack_start(Gtk::Label.new("Assertions:"), false, false, 0)
+              @info_panel.pack_start(assertion_count_label, true, false, 0)
+              @info_panel.pack_start(Gtk::Label.new("Failures:"), false, false, 0)
+              @info_panel.pack_start(failure_count_label, true, false, 0)
+              @info_panel.pack_start(Gtk::Label.new("Errors:"), false, false, 0)
+              @info_panel.pack_start(error_count_label, true, false, 0)
+            }
+          end
+          
+          def run_count_label
+            lazy_initialize(:run_count_label) {
+              @run_count_label = Gtk::Label.new("0")
+              @run_count_label.set_justify(Gtk::JUSTIFY_LEFT)
+            }
+          end
+          
+          def assertion_count_label
+            lazy_initialize(:assertion_count_label) {
+              @assertion_count_label = Gtk::Label.new("0")
+              @assertion_count_label.set_justify(Gtk::JUSTIFY_LEFT)
+            }
+          end
+          
+          def failure_count_label
+            lazy_initialize(:failure_count_label) {
+              @failure_count_label = Gtk::Label.new("0")
+              @failure_count_label.set_justify(Gtk::JUSTIFY_LEFT)
+            }
+          end
+          
+          def error_count_label
+            lazy_initialize(:error_count_label) {
+              @error_count_label = Gtk::Label.new("0")
+              @error_count_label.set_justify(Gtk::JUSTIFY_LEFT)
+            }
+          end
+          
+          def list_panel
+            lazy_initialize(:list_panel) {
+              @list_panel = Gtk::HBox.new
+              @list_panel.border_width(10)
+              @list_panel.pack_start(list_scrolled_window, true, true, 0)
+            }
+          end
+          
+          def list_scrolled_window
+            lazy_initialize(:list_scrolled_window) {
+              @list_scrolled_window = Gtk::ScrolledWindow.new
+              @list_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
+              @list_scrolled_window.set_usize(@list_scrolled_window.allocation.width, 150)
+              @list_scrolled_window.add_with_viewport(fault_list)
+            }
+          end
+          
+          def fault_list
+            lazy_initialize(:fault_list) {
+              @fault_list = Gtk::List.new
+            }
+          end
+          
+          def detail_panel
+            lazy_initialize(:detail_panel) {
+              @detail_panel = Gtk::HBox.new
+              @detail_panel.border_width(10)
+              @detail_panel.pack_start(detail_scrolled_window, true, true, 0)
+            }
+          end
+          
+          def detail_scrolled_window
+            lazy_initialize(:detail_scrolled_window) {
+              @detail_scrolled_window = Gtk::ScrolledWindow.new
+              @detail_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
+              @detail_scrolled_window.set_usize(400, @detail_scrolled_window.allocation.height)
+              @detail_scrolled_window.add_with_viewport(outer_detail_sub_panel)
+            }
+          end
+          
+          def outer_detail_sub_panel
+            lazy_initialize(:outer_detail_sub_panel) {
+              @outer_detail_sub_panel = Gtk::VBox.new
+              @outer_detail_sub_panel.pack_start(inner_detail_sub_panel, false, false, 0)
+            }
+          end
+          
+          def inner_detail_sub_panel
+            lazy_initialize(:inner_detail_sub_panel) {
+              @inner_detail_sub_panel = Gtk::HBox.new
+              @inner_detail_sub_panel.pack_start(fault_detail_label, false, false, 0)
+            }
+          end
+          
+          def fault_detail_label
+            lazy_initialize(:fault_detail_label) {
+              @fault_detail_label = EnhancedLabel.new("")
+              style = Gtk::Style.new
+              font = Gdk::Font.font_load("-*-Courier New-medium-r-normal--*-120-*-*-*-*-*-*")
+              begin
+                style.set_font(font)
+              rescue ArgumentError; end
+              @fault_detail_label.set_style(style)
+              @fault_detail_label.set_justify(Gtk::JUSTIFY_LEFT)
+              @fault_detail_label.set_line_wrap(false)
+            }
+          end
+          
+          def status_panel
+            lazy_initialize(:status_panel) {
+              @status_panel = Gtk::HBox.new
+              @status_panel.border_width(10)
+              @status_panel.pack_start(status_entry, true, true, 0)
+            }
+          end
+          
+          def status_entry
+            lazy_initialize(:status_entry) {
+              @status_entry = Gtk::Entry.new
+              @status_entry.set_editable(false)
+            }
+          end
+  
+          def lazy_initialize(symbol)
+            if (!instance_eval("defined?(@#{symbol.to_s})"))
+              yield
+            end
+            return instance_eval("@" + symbol.to_s)
+          end
+        end
+  
+        class EnhancedProgressBar < Gtk::ProgressBar
+          def set_style(style)
+            super
+            hide
+            show
+          end
+        end
+  
+        class EnhancedLabel < Gtk::Label
+          def set_text(text)
+            super(text.gsub(/\n\t/, "\n" + (" " * 4)))
+          end
+        end
+  
+        class FaultListItem < Gtk::ListItem
+          attr_reader(:fault)
+          def initialize(fault)
+            super(fault.short_display)
+            @fault = fault
+          end
+        end
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+  Test::Unit::UI::GTK::TestRunner.start_command_line_test
+end
diff --git a/ruby_1_8_6/lib/test/unit/ui/gtk2/testrunner.rb b/ruby_1_8_6/lib/test/unit/ui/gtk2/testrunner.rb
new file mode 100644
index 0000000000..b05549c0e8
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/ui/gtk2/testrunner.rb
@@ -0,0 +1,465 @@
+#--
+#
+# Author:: Kenta MURATA.
+# Copyright:: Copyright (c) 2000-2002 Kenta MURATA. All rights reserved.
+# License:: Ruby license.
+
+require "gtk2"
+require "test/unit/ui/testrunnermediator"
+require "test/unit/ui/testrunnerutilities"
+
+module Test
+  module Unit
+    module UI
+      module GTK2
+
+        Gtk.init
+
+        class EnhancedLabel < Gtk::Label
+          def set_text(text)
+            super(text.gsub(/\n\t/, "\n    "))
+          end
+        end
+
+        class FaultList < Gtk::TreeView
+          def initialize
+            @faults = []
+            @model = Gtk::ListStore.new(String, String)
+            super(@model)
+            column = Gtk::TreeViewColumn.new
+            column.visible = false
+            append_column(column)
+            renderer = Gtk::CellRendererText.new
+            column = Gtk::TreeViewColumn.new("Failures", renderer, {:text => 1})
+            append_column(column)
+            selection.mode = Gtk::SELECTION_SINGLE
+            set_rules_hint(true)
+            set_headers_visible(false)
+          end # def initialize
+
+          def add_fault(fault)
+            @faults.push(fault)
+            iter = @model.append
+            iter.set_value(0, (@faults.length - 1).to_s)
+            iter.set_value(1, fault.short_display)
+          end # def add_fault(fault)
+
+          def get_fault(iter)
+            @faults[iter.get_value(0).to_i]
+          end # def get_fault
+
+          def clear
+            model.clear
+          end # def clear
+        end
+
+        class TestRunner
+          extend TestRunnerUtilities
+
+          def lazy_initialize(symbol)
+            if !instance_eval("defined?(@#{symbol})") then
+              yield
+            end
+            return instance_eval("@#{symbol}")
+          end
+          private :lazy_initialize
+
+          def status_entry
+            lazy_initialize(:status_entry) do
+              @status_entry = Gtk::Entry.new
+              @status_entry.editable = false
+            end
+          end
+          private :status_entry
+
+          def status_panel
+            lazy_initialize(:status_panel) do
+              @status_panel = Gtk::HBox.new
+              @status_panel.border_width = 10
+              @status_panel.pack_start(status_entry, true, true, 0)
+            end
+          end
+          private :status_panel
+
+          def fault_detail_label
+            lazy_initialize(:fault_detail_label) do
+              @fault_detail_label = EnhancedLabel.new("")
+#              style = Gtk::Style.new
+#              font = Gdk::Font.
+#               font_load("-*-Courier 10 Pitch-medium-r-normal--*-120-*-*-*-*-*-*")
+#              style.set_font(font)
+#              @fault_detail_label.style = style
+              @fault_detail_label.justify = Gtk::JUSTIFY_LEFT
+              @fault_detail_label.wrap = false
+            end
+          end
+          private :fault_detail_label
+
+          def inner_detail_sub_panel
+            lazy_initialize(:inner_detail_sub_panel) do
+              @inner_detail_sub_panel = Gtk::HBox.new
+              @inner_detail_sub_panel.pack_start(fault_detail_label, false, false, 0)
+            end
+          end
+          private :inner_detail_sub_panel
+
+          def outer_detail_sub_panel
+            lazy_initialize(:outer_detail_sub_panel) do
+              @outer_detail_sub_panel = Gtk::VBox.new
+              @outer_detail_sub_panel.pack_start(inner_detail_sub_panel, false, false, 0)
+            end
+          end
+          private :outer_detail_sub_panel
+
+          def detail_scrolled_window
+            lazy_initialize(:detail_scrolled_window) do
+              @detail_scrolled_window = Gtk::ScrolledWindow.new
+              @detail_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
+              @detail_scrolled_window.
+                set_size_request(400, @detail_scrolled_window.allocation.height)
+              @detail_scrolled_window.add_with_viewport(outer_detail_sub_panel)
+            end
+          end
+          private :detail_scrolled_window
+
+          def detail_panel
+            lazy_initialize(:detail_panel) do
+              @detail_panel = Gtk::HBox.new
+              @detail_panel.border_width = 10
+              @detail_panel.pack_start(detail_scrolled_window, true, true, 0)
+            end
+          end
+          private :detail_panel
+
+          def fault_list
+            lazy_initialize(:fault_list) do
+              @fault_list = FaultList.new
+            end
+          end
+          private :fault_list
+
+          def list_scrolled_window
+            lazy_initialize(:list_scrolled_window) do
+              @list_scrolled_window = Gtk::ScrolledWindow.new
+              @list_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
+              @list_scrolled_window.
+                set_size_request(@list_scrolled_window.allocation.width, 150)
+              @list_scrolled_window.add_with_viewport(fault_list)
+            end
+          end
+          private :list_scrolled_window
+
+          def list_panel
+            lazy_initialize(:list_panel) do
+              @list_panel = Gtk::HBox.new
+              @list_panel.border_width = 10
+              @list_panel.pack_start(list_scrolled_window, true, true, 0)
+            end
+          end
+          private :list_panel
+
+          def error_count_label
+            lazy_initialize(:error_count_label) do
+              @error_count_label = Gtk::Label.new("0")
+              @error_count_label.justify = Gtk::JUSTIFY_LEFT
+            end
+          end
+          private :error_count_label
+
+          def failure_count_label
+            lazy_initialize(:failure_count_label) do
+              @failure_count_label = Gtk::Label.new("0")
+              @failure_count_label.justify = Gtk::JUSTIFY_LEFT
+            end
+          end
+          private :failure_count_label
+
+          def assertion_count_label
+            lazy_initialize(:assertion_count_label) do
+              @assertion_count_label = Gtk::Label.new("0")
+              @assertion_count_label.justify = Gtk::JUSTIFY_LEFT
+            end
+          end
+          private :assertion_count_label
+
+          def run_count_label
+            lazy_initialize(:run_count_label) do
+              @run_count_label = Gtk::Label.new("0")
+              @run_count_label.justify = Gtk::JUSTIFY_LEFT
+            end
+          end
+          private :run_count_label
+          
+          def info_panel
+            lazy_initialize(:info_panel) do
+              @info_panel = Gtk::HBox.new(false, 0)
+              @info_panel.border_width = 10
+              @info_panel.pack_start(Gtk::Label.new("Runs:"), false, false, 0)
+              @info_panel.pack_start(run_count_label, true, false, 0)
+              @info_panel.pack_start(Gtk::Label.new("Assertions:"), false, false, 0)
+              @info_panel.pack_start(assertion_count_label, true, false, 0)
+              @info_panel.pack_start(Gtk::Label.new("Failures:"), false, false, 0)
+              @info_panel.pack_start(failure_count_label, true, false, 0)
+              @info_panel.pack_start(Gtk::Label.new("Errors:"), false, false, 0)
+              @info_panel.pack_start(error_count_label, true, false, 0)
+            end
+          end # def info_panel
+          private :info_panel
+
+          def green_style
+            lazy_initialize(:green_style) do
+              @green_style = Gtk::Style.new
+              @green_style.set_bg(Gtk::STATE_PRELIGHT, 0x0000, 0xFFFF, 0x0000)
+            end
+          end # def green_style
+          private :green_style
+          
+          def red_style
+            lazy_initialize(:red_style) do
+              @red_style = Gtk::Style.new
+              @red_style.set_bg(Gtk::STATE_PRELIGHT, 0xFFFF, 0x0000, 0x0000)
+            end
+          end # def red_style
+          private :red_style
+          
+          def test_progress_bar
+            lazy_initialize(:test_progress_bar) {
+              @test_progress_bar = Gtk::ProgressBar.new
+              @test_progress_bar.fraction = 0.0
+              @test_progress_bar.
+                set_size_request(@test_progress_bar.allocation.width,
+                                 info_panel.size_request[1])
+              @test_progress_bar.style = green_style
+            }
+          end # def test_progress_bar
+          private :test_progress_bar
+          
+          def progress_panel
+            lazy_initialize(:progress_panel) do
+              @progress_panel = Gtk::HBox.new(false, 10)
+              @progress_panel.border_width = 10
+              @progress_panel.pack_start(test_progress_bar, true, true, 0)
+            end
+          end # def progress_panel
+
+          def run_button
+            lazy_initialize(:run_button) do
+              @run_button = Gtk::Button.new("Run")
+            end
+          end # def run_button
+
+          def suite_name_entry
+            lazy_initialize(:suite_name_entry) do
+              @suite_name_entry = Gtk::Entry.new
+              @suite_name_entry.editable = false
+            end
+          end # def suite_name_entry
+          private :suite_name_entry
+
+          def suite_panel
+            lazy_initialize(:suite_panel) do
+              @suite_panel = Gtk::HBox.new(false, 10)
+              @suite_panel.border_width = 10
+              @suite_panel.pack_start(Gtk::Label.new("Suite:"), false, false, 0)
+              @suite_panel.pack_start(suite_name_entry, true, true, 0)
+              @suite_panel.pack_start(run_button, false, false, 0)
+            end
+          end # def suite_panel
+          private :suite_panel
+
+          def main_panel
+            lazy_initialize(:main_panel) do
+              @main_panel = Gtk::VBox.new(false, 0)
+              @main_panel.pack_start(suite_panel, false, false, 0)
+              @main_panel.pack_start(progress_panel, false, false, 0)
+              @main_panel.pack_start(info_panel, false, false, 0)
+              @main_panel.pack_start(list_panel, false, false, 0)
+              @main_panel.pack_start(detail_panel, true, true, 0)
+              @main_panel.pack_start(status_panel, false, false, 0)
+            end
+          end # def main_panel
+          private :main_panel
+
+          def main_window
+            lazy_initialize(:main_window) do
+              @main_window = Gtk::Window.new(Gtk::Window::TOPLEVEL)
+              @main_window.set_title("Test::Unit TestRunner")
+              @main_window.set_default_size(800, 600)
+              @main_window.set_resizable(true)
+              @main_window.add(main_panel)
+            end
+          end # def main_window
+          private :main_window
+
+          def setup_ui
+            main_window.signal_connect("destroy", nil) { stop }
+            main_window.show_all
+            fault_list.selection.signal_connect("changed", nil) do
+              |selection, data|
+              if selection.selected then
+                show_fault(fault_list.get_fault(selection.selected))
+              else
+                clear_fault
+              end
+            end
+          end # def setup_ui
+          private :setup_ui
+
+          def output_status(string)
+            status_entry.set_text(string)
+          end # def output_status(string)
+          private :output_status
+
+          def finished(elapsed_time)
+            test_progress_bar.fraction = 1.0
+            output_status("Finished in #{elapsed_time} seconds")
+          end # def finished(elapsed_time)
+          private :finished
+
+          def test_started(test_name)
+            output_status("Running #{test_name}...")
+          end # def test_started(test_name)
+          private :test_started
+
+          def started(result)
+            @result = result
+            output_status("Started...")
+          end # def started(result)
+          private :started
+
+          def test_finished(result)
+            test_progress_bar.fraction += 1.0 / @count
+          end # def test_finished(result)
+
+          def result_changed(result)
+            run_count_label.label = result.run_count.to_s
+            assertion_count_label.label = result.assertion_count.to_s
+            failure_count_label.label = result.failure_count.to_s
+            error_count_label.label = result.error_count.to_s
+          end # def result_changed(result)
+          private :result_changed
+
+          def clear_fault
+            raw_show_fault("")
+          end # def clear_fault
+          private :clear_fault
+
+          def raw_show_fault(string)
+            fault_detail_label.set_text(string)
+            outer_detail_sub_panel.queue_resize
+          end # def raw_show_fault(string)
+          private :raw_show_fault
+
+          def show_fault(fault)
+            raw_show_fault(fault.long_display)
+          end # def show_fault(fault)
+          private :show_fault
+
+          def add_fault(fault)
+            if not @red then
+              test_progress_bar.style = red_style
+              @red = true
+            end
+            fault_list.add_fault(fault)
+          end # def add_fault(fault)
+          private :add_fault
+
+          def reset_ui(count)
+            test_progress_bar.style = green_style
+            test_progress_bar.fraction = 0.0
+            @count = count + 1
+            @red = false
+
+            run_count_label.set_text("0")
+            assertion_count_label.set_text("0")
+            failure_count_label.set_text("0")
+            error_count_label.set_text("0")
+
+            fault_list.clear
+          end # def reset_ui(count)
+          private :reset_ui
+
+          def stop
+            Gtk.main_quit
+          end # def stop
+          private :stop
+
+          def run_test
+            @runner.raise(@restart_signal)
+          end
+          private :run_test
+
+          def start_ui
+            @viewer.run
+            running = false
+            begin
+              loop do
+                if (running ^= true)
+                  run_button.child.text = "Stop"
+                  @mediator.run_suite
+                else
+                  run_button.child.text = "Run"
+                  @viewer.join
+                  break
+                end
+              end
+            rescue @restart_signal
+              retry
+            rescue
+            end
+          end # def start_ui
+          private :start_ui
+
+          def attach_to_mediator
+            run_button.signal_connect("clicked", nil) { run_test }
+            @mediator.add_listener(TestRunnerMediator::RESET, &method(:reset_ui))
+            @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
+            @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
+            @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
+            @mediator.add_listener(TestResult::CHANGED, &method(:result_changed))
+            @mediator.add_listener(TestCase::STARTED, &method(:test_started))
+            @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
+          end # def attach_to_mediator
+          private :attach_to_mediator
+
+          def setup_mediator
+            @mediator = TestRunnerMediator.new(@suite)
+            suite_name = @suite.to_s
+            if @suite.kind_of?(Module) then
+              suite_name = @suite.name
+            end
+            suite_name_entry.set_text(suite_name)
+          end # def setup_mediator
+          private :setup_mediator
+
+          def start
+            setup_mediator
+            setup_ui
+            attach_to_mediator
+            start_ui
+            @result
+          end # def start
+
+          def initialize(suite, output_level = NORMAL)
+            if suite.respond_to?(:suite) then
+              @suite = suite.suite
+            else
+              @suite = suite
+            end
+            @result = nil
+
+            @runner = Thread.current
+            @restart_signal = Class.new(Exception)
+            @viewer = Thread.start do
+              @runner.join rescue @runner.run
+              Gtk.main
+            end
+            @viewer.join rescue nil # wait deadlock to handshake
+          end # def initialize(suite)
+
+        end # class TestRunner
+
+      end # module GTK2
+    end # module UI
+  end # module Unit
+end # module Test
diff --git a/ruby_1_8_6/lib/test/unit/ui/testrunnermediator.rb b/ruby_1_8_6/lib/test/unit/ui/testrunnermediator.rb
new file mode 100644
index 0000000000..d34510d1c6
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/ui/testrunnermediator.rb
@@ -0,0 +1,68 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+require 'test/unit/util/observable'
+require 'test/unit/testresult'
+
+module Test
+  module Unit
+    module UI
+
+      # Provides an interface to write any given UI against,
+      # hopefully making it easy to write new UIs.
+      class TestRunnerMediator
+        RESET = name + "::RESET"
+        STARTED = name + "::STARTED"
+        FINISHED = name + "::FINISHED"
+        
+        include Util::Observable
+        
+        # Creates a new TestRunnerMediator initialized to run
+        # the passed suite.
+        def initialize(suite)
+          @suite = suite
+        end
+
+        # Runs the suite the TestRunnerMediator was created
+        # with.
+        def run_suite
+          Unit.run = true
+          begin_time = Time.now
+          notify_listeners(RESET, @suite.size)
+          result = create_result
+          notify_listeners(STARTED, result)
+          result_listener = result.add_listener(TestResult::CHANGED) do |updated_result|
+            notify_listeners(TestResult::CHANGED, updated_result)
+          end
+          
+          fault_listener = result.add_listener(TestResult::FAULT) do |fault|
+            notify_listeners(TestResult::FAULT, fault)
+          end
+          
+          @suite.run(result) do |channel, value|
+            notify_listeners(channel, value)
+          end
+          
+          result.remove_listener(TestResult::FAULT, fault_listener)
+          result.remove_listener(TestResult::CHANGED, result_listener)
+          end_time = Time.now
+          elapsed_time = end_time - begin_time
+          notify_listeners(FINISHED, elapsed_time) #"Finished in #{elapsed_time} seconds.")
+          return result
+        end
+
+        private
+        # A factory method to create the result the mediator
+        # should run with. Can be overridden by subclasses if
+        # one wants to use a different result.
+        def create_result
+          return TestResult.new
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/ui/testrunnerutilities.rb b/ruby_1_8_6/lib/test/unit/ui/testrunnerutilities.rb
new file mode 100644
index 0000000000..70b885bd6c
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/ui/testrunnerutilities.rb
@@ -0,0 +1,46 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module Test
+  module Unit
+    module UI
+
+      SILENT = 0
+      PROGRESS_ONLY = 1
+      NORMAL = 2
+      VERBOSE = 3
+
+      # Provides some utilities common to most, if not all,
+      # TestRunners.
+      #
+      #--
+      #
+      # Perhaps there ought to be a TestRunner superclass? There
+      # seems to be a decent amount of shared code between test
+      # runners.
+
+      module TestRunnerUtilities
+
+        # Creates a new TestRunner and runs the suite.
+        def run(suite, output_level=NORMAL)
+          return new(suite, output_level).start
+        end
+
+        # Takes care of the ARGV parsing and suite
+        # determination necessary for running one of the
+        # TestRunners from the command line.
+        def start_command_line_test
+          if ARGV.empty?
+            puts "You should supply the name of a test suite file to the runner"
+            exit
+          end
+          require ARGV[0].gsub(/.+::/, '')
+          new(eval(ARGV[0])).start
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/ui/tk/testrunner.rb b/ruby_1_8_6/lib/test/unit/ui/tk/testrunner.rb
new file mode 100644
index 0000000000..4d05f2fb22
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/ui/tk/testrunner.rb
@@ -0,0 +1,260 @@
+#--
+#
+# Original Author:: Nathaniel Talbott.
+# Author:: Kazuhiro NISHIYAMA.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# Copyright:: Copyright (c) 2003 Kazuhiro NISHIYAMA. All rights reserved.
+# License:: Ruby license.
+
+require 'tk'
+require 'test/unit/ui/testrunnermediator'
+require 'test/unit/ui/testrunnerutilities'
+
+module Test
+  module Unit
+    module UI
+      module Tk
+
+        # Runs a Test::Unit::TestSuite in a Tk UI. Obviously,
+        # this one requires you to have Tk
+        # and the Ruby Tk extension installed.
+        class TestRunner
+          extend TestRunnerUtilities
+
+          # Creates a new TestRunner for running the passed
+          # suite.
+          def initialize(suite, output_level = NORMAL)
+            if (suite.respond_to?(:suite))
+              @suite = suite.suite
+            else
+              @suite = suite
+            end
+            @result = nil
+
+            @red = false
+            @fault_detail_list = []
+            @runner = Thread.current
+            @restart_signal = Class.new(Exception)
+            @viewer = Thread.start do
+              @runner.join rescue @runner.run
+              ::Tk.mainloop
+            end
+            @viewer.join rescue nil # wait deadlock to handshake
+          end
+
+          # Begins the test run.
+          def start
+            setup_ui
+            setup_mediator
+            attach_to_mediator
+            start_ui
+            @result
+          end
+
+          private
+          def setup_mediator
+            @mediator = TestRunnerMediator.new(@suite)
+            suite_name = @suite.to_s
+            if ( @suite.kind_of?(Module) )
+              suite_name = @suite.name
+            end
+            @suite_name_entry.value = suite_name
+          end
+
+          def attach_to_mediator
+            @run_button.command(method(:run_test))
+            @fault_list.bind('ButtonPress-1', proc{|y|
+              fault = @fault_detail_list[@fault_list.nearest(y)]
+              if fault
+                show_fault(fault)
+              end
+            }, '%y')
+            @mediator.add_listener(TestRunnerMediator::RESET, &method(:reset_ui))
+            @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
+            @mediator.add_listener(TestResult::CHANGED, &method(:result_changed))
+            @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
+            @mediator.add_listener(TestCase::STARTED, &method(:test_started))
+            @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
+          end
+
+          def run_test
+            @runner.raise(@restart_signal)
+          end
+
+          def start_ui
+            @viewer.run
+            running = false
+            begin
+              loop do
+                if (running ^= true)
+                  @run_button.configure('text'=>'Stop')
+                  @mediator.run_suite
+                else
+                  @run_button.configure('text'=>'Run')
+                  @viewer.join
+                  break
+                end
+              end
+            rescue @restart_signal
+              retry
+            rescue
+            end
+          end
+
+          def stop
+            ::Tk.exit
+          end
+
+          def reset_ui(count)
+            @test_total_count = count.to_f
+            @test_progress_bar.configure('background'=>'green')
+            @test_progress_bar.place('relwidth'=>(count.zero? ? 0 : 0/count))
+            @red = false
+
+            @test_count_label.value = 0
+            @assertion_count_label.value = 0
+            @failure_count_label.value = 0
+            @error_count_label.value = 0
+
+            @fault_list.delete(0, 'end')
+            @fault_detail_list = []
+            clear_fault
+          end
+
+          def add_fault(fault)
+            if ( ! @red )
+              @test_progress_bar.configure('background'=>'red')
+              @red = true
+            end
+            @fault_detail_list.push fault
+            @fault_list.insert('end', fault.short_display)
+          end
+
+          def show_fault(fault)
+            raw_show_fault(fault.long_display)
+          end
+
+          def raw_show_fault(string)
+            @detail_text.value = string
+          end
+
+          def clear_fault
+            raw_show_fault("")
+          end
+
+          def result_changed(result)
+            @test_count_label.value = result.run_count
+            @test_progress_bar.place('relwidth'=>result.run_count/@test_total_count)
+            @assertion_count_label.value = result.assertion_count
+            @failure_count_label.value = result.failure_count
+            @error_count_label.value = result.error_count
+          end
+
+          def started(result)
+            @result = result
+            output_status("Started...")
+          end
+
+          def test_started(test_name)
+            output_status("Running #{test_name}...")
+          end
+
+          def finished(elapsed_time)
+            output_status("Finished in #{elapsed_time} seconds")
+          end
+
+          def output_status(string)
+            @status_entry.value = string
+          end
+
+          def setup_ui
+            @status_entry = TkVariable.new
+            l = TkLabel.new(nil, 'textvariable'=>@status_entry, 'relief'=>'sunken')
+            l.pack('side'=>'bottom', 'fill'=>'x')
+
+            suite_frame = TkFrame.new.pack('fill'=>'x')
+
+            @run_button = TkButton.new(suite_frame, 'text'=>'Run')
+            @run_button.pack('side'=>'right')
+
+            TkLabel.new(suite_frame, 'text'=>'Suite:').pack('side'=>'left')
+            @suite_name_entry = TkVariable.new
+            l = TkLabel.new(suite_frame, 'textvariable'=>@suite_name_entry, 'relief'=>'sunken')
+            l.pack('side'=>'left', 'fill'=>'x', 'expand'=>true)
+
+            f = TkFrame.new(nil, 'relief'=>'sunken', 'borderwidth'=>3, 'height'=>20).pack('fill'=>'x', 'padx'=>1)
+            @test_progress_bar = TkFrame.new(f, 'background'=>'green').place('anchor'=>'nw', 'relwidth'=>0.0, 'relheight'=>1.0)
+
+            info_frame = TkFrame.new.pack('fill'=>'x')
+            @test_count_label = create_count_label(info_frame, 'Tests:')
+            @assertion_count_label = create_count_label(info_frame, 'Assertions:')
+            @failure_count_label = create_count_label(info_frame, 'Failures:')
+            @error_count_label = create_count_label(info_frame, 'Errors:')
+
+	    if (::Tk.info('command', TkPanedWindow::TkCommandNames[0]) != "")
+	      # use panedwindow
+	      paned_frame = TkPanedWindow.new("orient"=>"vertical").pack('fill'=>'both', 'expand'=>true)
+
+	      fault_list_frame = TkFrame.new(paned_frame)
+	      detail_frame = TkFrame.new(paned_frame)
+
+	      paned_frame.add(fault_list_frame, detail_frame)
+	    else
+	      # no panedwindow
+	      paned_frame = nil
+	      fault_list_frame = TkFrame.new.pack('fill'=>'both', 'expand'=>true)
+	      detail_frame = TkFrame.new.pack('fill'=>'both', 'expand'=>true)
+	    end
+
+	    TkGrid.rowconfigure(fault_list_frame, 0, 'weight'=>1, 'minsize'=>0)
+	    TkGrid.columnconfigure(fault_list_frame, 0, 'weight'=>1, 'minsize'=>0)
+
+            fault_scrollbar_y = TkScrollbar.new(fault_list_frame)
+            fault_scrollbar_x = TkScrollbar.new(fault_list_frame)
+            @fault_list = TkListbox.new(fault_list_frame)
+            @fault_list.yscrollbar(fault_scrollbar_y)
+            @fault_list.xscrollbar(fault_scrollbar_x)
+
+	    TkGrid.rowconfigure(detail_frame, 0, 'weight'=>1, 'minsize'=>0)
+	    TkGrid.columnconfigure(detail_frame, 0, 'weight'=>1, 'minsize'=>0)
+
+	    ::Tk.grid(@fault_list, fault_scrollbar_y, 'sticky'=>'news')
+	    ::Tk.grid(fault_scrollbar_x, 'sticky'=>'news')
+
+            detail_scrollbar_y = TkScrollbar.new(detail_frame)
+            detail_scrollbar_x = TkScrollbar.new(detail_frame)
+            @detail_text = TkText.new(detail_frame, 'height'=>10, 'wrap'=>'none') {
+              bindtags(bindtags - [TkText])
+	    }
+	    @detail_text.yscrollbar(detail_scrollbar_y)
+	    @detail_text.xscrollbar(detail_scrollbar_x)
+
+	    ::Tk.grid(@detail_text, detail_scrollbar_y, 'sticky'=>'news')
+	    ::Tk.grid(detail_scrollbar_x, 'sticky'=>'news')
+
+	    # rubber-style pane
+	    if paned_frame
+	      ::Tk.update
+	      @height = paned_frame.winfo_height
+	      paned_frame.bind('Configure', proc{|h|
+		paned_frame.sash_place(0, 0, paned_frame.sash_coord(0)[1] * h / @height)
+		@height = h
+	      }, '%h')
+	    end
+          end
+
+          def create_count_label(parent, label)
+            TkLabel.new(parent, 'text'=>label).pack('side'=>'left', 'expand'=>true)
+            v = TkVariable.new(0)
+            TkLabel.new(parent, 'textvariable'=>v).pack('side'=>'left', 'expand'=>true)
+            v
+          end
+        end
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+  Test::Unit::UI::Tk::TestRunner.start_command_line_test
+end
diff --git a/ruby_1_8_6/lib/test/unit/util/backtracefilter.rb b/ruby_1_8_6/lib/test/unit/util/backtracefilter.rb
new file mode 100644
index 0000000000..7ebec2dfef
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/util/backtracefilter.rb
@@ -0,0 +1,40 @@
+module Test
+  module Unit
+    module Util
+      module BacktraceFilter
+        TESTUNIT_FILE_SEPARATORS = %r{[\\/:]}
+        TESTUNIT_PREFIX = __FILE__.split(TESTUNIT_FILE_SEPARATORS)[0..-3]
+        TESTUNIT_RB_FILE = /\.rb\Z/
+        
+        def filter_backtrace(backtrace, prefix=nil)
+          return ["No backtrace"] unless(backtrace)
+          split_p = if(prefix)
+            prefix.split(TESTUNIT_FILE_SEPARATORS)
+          else
+            TESTUNIT_PREFIX
+          end
+          match = proc do |e|
+            split_e = e.split(TESTUNIT_FILE_SEPARATORS)[0, split_p.size]
+            next false unless(split_e[0..-2] == split_p[0..-2])
+            split_e[-1].sub(TESTUNIT_RB_FILE, '') == split_p[-1]
+          end
+          return backtrace unless(backtrace.detect(&match))
+          found_prefix = false
+          new_backtrace = backtrace.reverse.reject do |e|
+            if(match[e])
+              found_prefix = true
+              true
+            elsif(found_prefix)
+              false
+            else
+              true
+            end
+          end.reverse
+          new_backtrace = (new_backtrace.empty? ? backtrace : new_backtrace)
+          new_backtrace = new_backtrace.reject(&match)
+          new_backtrace.empty? ? backtrace : new_backtrace
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/util/observable.rb b/ruby_1_8_6/lib/test/unit/util/observable.rb
new file mode 100644
index 0000000000..3567d34271
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/util/observable.rb
@@ -0,0 +1,90 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/util/procwrapper'
+
+module Test
+  module Unit
+    module Util
+
+      # This is a utility class that allows anything mixing
+      # it in to notify a set of listeners about interesting
+      # events.
+      module Observable
+        # We use this for defaults since nil might mean something
+        NOTHING = "NOTHING/#{__id__}"
+
+        # Adds the passed proc as a listener on the
+        # channel indicated by channel_name. listener_key
+        # is used to remove the listener later; if none is
+        # specified, the proc itself is used.
+        #
+        # Whatever is used as the listener_key is
+        # returned, making it very easy to use the proc
+        # itself as the listener_key:
+        #
+        #  listener = add_listener("Channel") { ... }
+        #  remove_listener("Channel", listener)
+        def add_listener(channel_name, listener_key=NOTHING, &listener) # :yields: value
+          unless(block_given?)
+            raise ArgumentError.new("No callback was passed as a listener")
+          end
+      
+          key = listener_key
+          if (listener_key == NOTHING)
+            listener_key = listener
+            key = ProcWrapper.new(listener)
+          end
+      
+          channels[channel_name] ||= {}
+          channels[channel_name][key] = listener
+          return listener_key
+        end
+
+        # Removes the listener indicated by listener_key
+        # from the channel indicated by
+        # channel_name. Returns the registered proc, or
+        # nil if none was found.
+        def remove_listener(channel_name, listener_key)
+          channel = channels[channel_name]
+          return nil unless (channel)
+          key = listener_key
+          if (listener_key.instance_of?(Proc))
+            key = ProcWrapper.new(listener_key)
+          end
+          if (channel.has_key?(key))
+            return channel.delete(key)
+          end
+          return nil
+        end
+
+        # Calls all the procs registered on the channel
+        # indicated by channel_name. If value is
+        # specified, it is passed in to the procs,
+        # otherwise they are called with no arguments.
+        #
+        #--
+        #
+        # Perhaps this should be private? Would it ever
+        # make sense for an external class to call this
+        # method directly?
+        def notify_listeners(channel_name, *arguments)
+          channel = channels[channel_name]
+          return 0 unless (channel)
+          listeners = channel.values
+          listeners.each { |listener| listener.call(*arguments) }
+          return listeners.size
+        end
+
+        private
+        def channels
+          @channels ||= {}
+          return @channels
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/test/unit/util/procwrapper.rb b/ruby_1_8_6/lib/test/unit/util/procwrapper.rb
new file mode 100644
index 0000000000..ad7252186d
--- /dev/null
+++ b/ruby_1_8_6/lib/test/unit/util/procwrapper.rb
@@ -0,0 +1,48 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module Test
+  module Unit
+    module Util
+
+      # Allows the storage of a Proc passed through '&' in a
+      # hash.
+      #
+      # Note: this may be inefficient, since the hash being
+      # used is not necessarily very good. In Observable,
+      # efficiency is not too important, since the hash is
+      # only accessed when adding and removing listeners,
+      # not when notifying.
+
+      class ProcWrapper
+
+        # Creates a new wrapper for a_proc.
+        def initialize(a_proc)
+          @a_proc = a_proc
+          @hash = a_proc.inspect.sub(/^(#<#{a_proc.class}:)/){''}.sub(/(>)$/){''}.hex
+        end
+
+        def hash
+          return @hash
+        end
+
+        def ==(other)
+          case(other)
+            when ProcWrapper
+              return @a_proc == other.to_proc
+            else
+              return super
+          end
+        end
+        alias :eql? :==
+
+        def to_proc
+          return @a_proc
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/thread.rb b/ruby_1_8_6/lib/thread.rb
new file mode 100644
index 0000000000..7df6a140f5
--- /dev/null
+++ b/ruby_1_8_6/lib/thread.rb
@@ -0,0 +1,479 @@
+#
+# NOTE:
+#   This file is overwritten by ext/thread/lib/thread.rb unless ruby
+#   is configured with --disable-fastthread.
+#
+#		thread.rb - thread support classes
+#			$Date$
+#			by Yukihiro Matsumoto <matz@netlab.co.jp>
+#
+# Copyright (C) 2001  Yukihiro Matsumoto
+# Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+# Copyright (C) 2000  Information-technology Promotion Agency, Japan
+#
+
+unless defined? Thread
+  fail "Thread not available for this ruby interpreter"
+end
+
+class Thread
+  #
+  # Wraps a block in Thread.critical, restoring the original value upon exit
+  # from the critical section.
+  #
+  def Thread.exclusive
+    _old = Thread.critical
+    begin
+      Thread.critical = true
+      return yield
+    ensure
+      Thread.critical = _old
+    end
+  end
+end
+
+#
+# Mutex implements a simple semaphore that can be used to coordinate access to
+# shared data from multiple concurrent threads.
+#
+# Example:
+#
+#   require 'thread'
+#   semaphore = Mutex.new
+#   
+#   a = Thread.new {
+#     semaphore.synchronize {
+#       # access shared resource
+#     }
+#   }
+#   
+#   b = Thread.new {
+#     semaphore.synchronize {
+#       # access shared resource
+#     }
+#   }
+#
+class Mutex
+  #
+  # Creates a new Mutex
+  #
+  def initialize
+    @waiting = []
+    @locked = false;
+    @waiting.taint		# enable tainted comunication
+    self.taint
+  end
+
+  #
+  # Returns +true+ if this lock is currently held by some thread.
+  #
+  def locked?
+    @locked
+  end
+
+  #
+  # Attempts to obtain the lock and returns immediately. Returns +true+ if the
+  # lock was granted.
+  #
+  def try_lock
+    result = false
+    Thread.critical = true
+    unless @locked
+      @locked = true
+      result = true
+    end
+    Thread.critical = false
+    result
+  end
+
+  #
+  # Attempts to grab the lock and waits if it isn't available.
+  #
+  def lock
+    while (Thread.critical = true; @locked)
+      @waiting.push Thread.current
+      Thread.stop
+    end
+    @locked = true
+    Thread.critical = false
+    self
+  end
+
+  #
+  # Releases the lock. Returns +nil+ if ref wasn't locked.
+  #
+  def unlock
+    return unless @locked
+    Thread.critical = true
+    @locked = false
+    begin
+      t = @waiting.shift
+      t.wakeup if t
+    rescue ThreadError
+      retry
+    end
+    Thread.critical = false
+    begin
+      t.run if t
+    rescue ThreadError
+    end
+    self
+  end
+
+  #
+  # Obtains a lock, runs the block, and releases the lock when the block
+  # completes.  See the example under Mutex.
+  #
+  def synchronize
+    lock
+    begin
+      yield
+    ensure
+      unlock
+    end
+  end
+
+  #
+  # If the mutex is locked, unlocks the mutex, wakes one waiting thread, and
+  # yields in a critical section.
+  #
+  def exclusive_unlock
+    return unless @locked
+    Thread.exclusive do
+      @locked = false
+      begin
+	t = @waiting.shift
+	t.wakeup if t
+      rescue ThreadError
+	retry
+      end
+      yield
+    end
+    self
+  end
+end
+
+# 
+# ConditionVariable objects augment class Mutex. Using condition variables,
+# it is possible to suspend while in the middle of a critical section until a
+# resource becomes available.
+#
+# Example:
+#
+#   require 'thread'
+#
+#   mutex = Mutex.new
+#   resource = ConditionVariable.new
+#   
+#   a = Thread.new {
+#     mutex.synchronize {
+#       # Thread 'a' now needs the resource
+#       resource.wait(mutex)
+#       # 'a' can now have the resource
+#     }
+#   }
+#   
+#   b = Thread.new {
+#     mutex.synchronize {
+#       # Thread 'b' has finished using the resource
+#       resource.signal
+#     }
+#   }
+#
+class ConditionVariable
+  #
+  # Creates a new ConditionVariable
+  #
+  def initialize
+    @waiters = []
+  end
+  
+  #
+  # Releases the lock held in +mutex+ and waits; reacquires the lock on wakeup.
+  #
+  def wait(mutex)
+    begin
+      mutex.exclusive_unlock do
+        @waiters.push(Thread.current)
+        Thread.stop
+      end
+    ensure
+      mutex.lock
+    end
+  end
+  
+  #
+  # Wakes up the first thread in line waiting for this lock.
+  #
+  def signal
+    begin
+      t = @waiters.shift
+      t.run if t
+    rescue ThreadError
+      retry
+    end
+  end
+    
+  #
+  # Wakes up all threads waiting for this lock.
+  #
+  def broadcast
+    waiters0 = nil
+    Thread.exclusive do
+      waiters0 = @waiters.dup
+      @waiters.clear
+    end
+    for t in waiters0
+      begin
+	t.run
+      rescue ThreadError
+      end
+    end
+  end
+end
+
+#
+# This class provides a way to synchronize communication between threads.
+#
+# Example:
+#
+#   require 'thread'
+#   
+#   queue = Queue.new
+#   
+#   producer = Thread.new do
+#     5.times do |i|
+#       sleep rand(i) # simulate expense
+#       queue << i
+#       puts "#{i} produced"
+#     end
+#   end
+#   
+#   consumer = Thread.new do
+#     5.times do |i|
+#       value = queue.pop
+#       sleep rand(i/2) # simulate expense
+#       puts "consumed #{value}"
+#     end
+#   end
+#   
+#   consumer.join
+#
+class Queue
+  #
+  # Creates a new queue.
+  #
+  def initialize
+    @que = []
+    @waiting = []
+    @que.taint		# enable tainted comunication
+    @waiting.taint
+    self.taint
+  end
+
+  #
+  # Pushes +obj+ to the queue.
+  #
+  def push(obj)
+    Thread.critical = true
+    @que.push obj
+    begin
+      t = @waiting.shift
+      t.wakeup if t
+    rescue ThreadError
+      retry
+    ensure
+      Thread.critical = false
+    end
+    begin
+      t.run if t
+    rescue ThreadError
+    end
+  end
+
+  #
+  # Alias of push
+  #
+  alias << push
+
+  #
+  # Alias of push
+  #
+  alias enq push
+
+  #
+  # Retrieves data from the queue.  If the queue is empty, the calling thread is
+  # suspended until data is pushed onto the queue.  If +non_block+ is true, the
+  # thread isn't suspended, and an exception is raised.
+  #
+  def pop(non_block=false)
+    while (Thread.critical = true; @que.empty?)
+      raise ThreadError, "queue empty" if non_block
+      @waiting.push Thread.current
+      Thread.stop
+    end
+    @que.shift
+  ensure
+    Thread.critical = false
+  end
+
+  #
+  # Alias of pop
+  #
+  alias shift pop
+
+  #
+  # Alias of pop
+  #
+  alias deq pop
+
+  #
+  # Returns +true+ is the queue is empty.
+  #
+  def empty?
+    @que.empty?
+  end
+
+  #
+  # Removes all objects from the queue.
+  #
+  def clear
+    @que.clear
+  end
+
+  #
+  # Returns the length of the queue.
+  #
+  def length
+    @que.length
+  end
+
+  #
+  # Alias of length.
+  #
+  alias size length
+
+  #
+  # Returns the number of threads waiting on the queue.
+  #
+  def num_waiting
+    @waiting.size
+  end
+end
+
+#
+# This class represents queues of specified size capacity.  The push operation
+# may be blocked if the capacity is full.
+#
+# See Queue for an example of how a SizedQueue works.
+#
+class SizedQueue<Queue
+  #
+  # Creates a fixed-length queue with a maximum size of +max+.
+  #
+  def initialize(max)
+    raise ArgumentError, "queue size must be positive" unless max > 0
+    @max = max
+    @queue_wait = []
+    @queue_wait.taint		# enable tainted comunication
+    super()
+  end
+
+  #
+  # Returns the maximum size of the queue.
+  #
+  def max
+    @max
+  end
+
+  #
+  # Sets the maximum size of the queue.
+  #
+  def max=(max)
+    Thread.critical = true
+    if max <= @max
+      @max = max
+      Thread.critical = false
+    else
+      diff = max - @max
+      @max = max
+      Thread.critical = false
+      diff.times do
+	begin
+	  t = @queue_wait.shift
+	  t.run if t
+	rescue ThreadError
+	  retry
+	end
+      end
+    end
+    max
+  end
+
+  #
+  # Pushes +obj+ to the queue.  If there is no space left in the queue, waits
+  # until space becomes available.
+  #
+  def push(obj)
+    Thread.critical = true
+    while @que.length >= @max
+      @queue_wait.push Thread.current
+      Thread.stop
+      Thread.critical = true
+    end
+    super
+  end
+
+  #
+  # Alias of push
+  #
+  alias << push
+
+  #
+  # Alias of push
+  #
+  alias enq push
+
+  #
+  # Retrieves data from the queue and runs a waiting thread, if any.
+  #
+  def pop(*args)
+    retval = super
+    Thread.critical = true
+    if @que.length < @max
+      begin
+	t = @queue_wait.shift
+	t.wakeup if t
+      rescue ThreadError
+	retry
+      ensure
+	Thread.critical = false
+      end
+      begin
+	t.run if t
+      rescue ThreadError
+      end
+    end
+    retval
+  end
+
+  #
+  # Alias of pop
+  #
+  alias shift pop
+
+  #
+  # Alias of pop
+  #
+  alias deq pop
+
+  #
+  # Returns the number of threads waiting on the queue.
+  #
+  def num_waiting
+    @waiting.size + @queue_wait.size
+  end
+end
+
+# Documentation comments:
+#  - How do you make RDoc inherit documentation from superclass?
diff --git a/ruby_1_8_6/lib/thwait.rb b/ruby_1_8_6/lib/thwait.rb
new file mode 100644
index 0000000000..95d294a85d
--- /dev/null
+++ b/ruby_1_8_6/lib/thwait.rb
@@ -0,0 +1,169 @@
+#
+#   thwait.rb - thread synchronization class
+#   	$Release Version: 0.9 $
+#   	$Revision: 1.3 $
+#   	$Date: 1998/06/26 03:19:34 $
+#   	by Keiju ISHITSUKA(Nihpon Rational Software Co.,Ltd.)
+#
+# --
+#  feature:
+#  provides synchronization for multiple threads.
+#
+#  class methods:
+#  * ThreadsWait.all_waits(thread1,...)
+#    waits until all of specified threads are terminated.
+#    if a block is supplied for the method, evaluates it for
+#    each thread termination.
+#  * th = ThreadsWait.new(thread1,...)
+#    creates synchronization object, specifying thread(s) to wait.
+#  
+#  methods:
+#  * th.threads
+#    list threads to be synchronized
+#  * th.empty?
+#    is there any thread to be synchronized.
+#  * th.finished?
+#    is there already terminated thread.
+#  * th.join(thread1,...) 
+#    wait for specified thread(s).
+#  * th.join_nowait(threa1,...)
+#    specifies thread(s) to wait.  non-blocking.
+#  * th.next_wait
+#    waits until any of specified threads is terminated.
+#  * th.all_waits
+#    waits until all of specified threads are terminated.
+#    if a block is supplied for the method, evaluates it for
+#    each thread termination.
+#
+
+require "thread.rb"
+require "e2mmap.rb"
+
+#
+# This class watches for termination of multiple threads.  Basic functionality
+# (wait until specified threads have terminated) can be accessed through the
+# class method ThreadsWait::all_waits.  Finer control can be gained using
+# instance methods.
+#
+# Example:
+#
+#   ThreadsWait.all_wait(thr1, thr2, ...) do |t|
+#     STDERR.puts "Thread #{t} has terminated."
+#   end
+#
+class ThreadsWait
+  RCS_ID='-$Id: thwait.rb,v 1.3 1998/06/26 03:19:34 keiju Exp keiju $-'
+  
+  Exception2MessageMapper.extend_to(binding)
+  def_exception("ErrNoWaitingThread", "No threads for waiting.")
+  def_exception("ErrNoFinishedThread", "No finished threads.")
+  
+  #
+  # Waits until all specified threads have terminated.  If a block is provided,
+  # it is executed for each thread termination.
+  #
+  def ThreadsWait.all_waits(*threads) # :yield: thread
+    tw = ThreadsWait.new(*threads)
+    if block_given?
+      tw.all_waits do |th|
+	yield th
+      end
+    else
+      tw.all_waits
+    end
+  end
+  
+  #
+  # Creates a ThreadsWait object, specifying the threads to wait on.
+  # Non-blocking.
+  #
+  def initialize(*threads)
+    @threads = []
+    @wait_queue = Queue.new
+    join_nowait(*threads) unless threads.empty?
+  end
+  
+  # Returns the array of threads in the wait queue.
+  attr :threads
+  
+  #
+  # Returns +true+ if there are no threads to be synchronized.
+  #
+  def empty?
+    @threads.empty?
+  end
+  
+  #
+  # Returns +true+ if any thread has terminated.
+  #
+  def finished?
+    !@wait_queue.empty?
+  end
+  
+  #
+  # Waits for specified threads to terminate.
+  #
+  def join(*threads)
+    join_nowait(*threads)
+    next_wait
+  end
+  
+  #
+  # Specifies the threads that this object will wait for, but does not actually
+  # wait.
+  #
+  def join_nowait(*threads)
+    threads.flatten!
+    @threads.concat threads
+    for th in threads
+      Thread.start(th) do |t|
+	begin
+	  t.join
+	ensure
+	  @wait_queue.push t
+	end
+      end
+    end
+  end
+  
+  #
+  # Waits until any of the specified threads has terminated, and returns the one
+  # that does.
+  #
+  # If there is no thread to wait, raises +ErrNoWaitingThread+.  If +nonblock+
+  # is true, and there is no terminated thread, raises +ErrNoFinishedThread+.
+  #
+  def next_wait(nonblock = nil)
+    ThreadsWait.fail ErrNoWaitingThread if @threads.empty?
+    begin
+      @threads.delete(th = @wait_queue.pop(nonblock))
+      th
+    rescue ThreadError
+      ThreadsWait.fail ErrNoFinishedThread
+    end
+  end
+  
+  #
+  # Waits until all of the specified threads are terminated.  If a block is
+  # supplied for the method, it is executed for each thread termination.
+  #
+  # Raises exceptions in the same manner as +next_wait+.
+  #
+  def all_waits
+    until @threads.empty?
+      th = next_wait
+      yield th if block_given?
+    end
+  end
+end
+
+ThWait = ThreadsWait
+
+
+# Documentation comments:
+#  - Source of documentation is evenly split between Nutshell, existing
+#    comments, and my own rephrasing.
+#  - I'm not particularly confident that the comments are all exactly correct.
+#  - The history, etc., up the top appears in the RDoc output.  Perhaps it would
+#    be better to direct that not to appear, and put something else there
+#    instead.
diff --git a/ruby_1_8_6/lib/time.rb b/ruby_1_8_6/lib/time.rb
new file mode 100644
index 0000000000..dbc25f4193
--- /dev/null
+++ b/ruby_1_8_6/lib/time.rb
@@ -0,0 +1,797 @@
+
+#
+# == Introduction
+# 
+# This library extends the Time class:
+# * conversion between date string and time object.
+#   * date-time defined by RFC 2822
+#   * HTTP-date defined by RFC 2616
+#   * dateTime defined by XML Schema Part 2: Datatypes (ISO 8601)
+#   * various formats handled by Date._parse (string to time only)
+# 
+# == Design Issues
+# 
+# === Specialized interface
+# 
+# This library provides methods dedicated to special purposes:
+# * RFC 2822, RFC 2616 and XML Schema.
+# * They makes usual life easier.
+# 
+# === Doesn't depend on strftime
+# 
+# This library doesn't use +strftime+.  Especially #rfc2822 doesn't depend
+# on +strftime+ because:
+# 
+# * %a and %b are locale sensitive
+# 
+#   Since they are locale sensitive, they may be replaced to
+#   invalid weekday/month name in some locales.
+#   Since ruby-1.6 doesn't invoke setlocale by default,
+#   the problem doesn't arise until some external library invokes setlocale.
+#   Ruby/GTK is the example of such library.
+# 
+# * %z is not portable
+# 
+#   %z is required to generate zone in date-time of RFC 2822
+#   but it is not portable.
+#
+# == Revision Information
+#
+# $Id$
+#
+
+require 'parsedate'
+
+#
+# Implements the extensions to the Time class that are described in the
+# documentation for the time.rb library.
+#
+class Time
+  class << Time
+
+    ZoneOffset = {
+      'UTC' => 0,
+      # ISO 8601
+      'Z' => 0,
+      # RFC 822
+      'UT' => 0, 'GMT' => 0,
+      'EST' => -5, 'EDT' => -4,
+      'CST' => -6, 'CDT' => -5,
+      'MST' => -7, 'MDT' => -6,
+      'PST' => -8, 'PDT' => -7,
+      # Following definition of military zones is original one.
+      # See RFC 1123 and RFC 2822 for the error in RFC 822.
+      'A' => +1, 'B' => +2, 'C' => +3, 'D' => +4,  'E' => +5,  'F' => +6, 
+      'G' => +7, 'H' => +8, 'I' => +9, 'K' => +10, 'L' => +11, 'M' => +12,
+      'N' => -1, 'O' => -2, 'P' => -3, 'Q' => -4,  'R' => -5,  'S' => -6, 
+      'T' => -7, 'U' => -8, 'V' => -9, 'W' => -10, 'X' => -11, 'Y' => -12,
+    }
+    def zone_offset(zone, year=Time.now.year)
+      off = nil
+      zone = zone.upcase
+      if /\A([+-])(\d\d):?(\d\d)\z/ =~ zone
+        off = ($1 == '-' ? -1 : 1) * ($2.to_i * 60 + $3.to_i) * 60
+      elsif /\A[+-]\d\d\z/ =~ zone
+        off = zone.to_i * 3600
+      elsif ZoneOffset.include?(zone)
+        off = ZoneOffset[zone] * 3600
+      elsif ((t = Time.local(year, 1, 1)).zone.upcase == zone rescue false)
+        off = t.utc_offset
+      elsif ((t = Time.local(year, 7, 1)).zone.upcase == zone rescue false)
+        off = t.utc_offset
+      end
+      off
+    end
+
+    def zone_utc?(zone)
+      # * +0000 means localtime. [RFC 2822]
+      # * GMT is a localtime abbreviation in Europe/London, etc.
+      if /\A(?:-00:00|-0000|-00|UTC|Z|UT)\z/i =~ zone
+        true
+      else
+        false
+      end
+    end
+    private :zone_utc?
+
+    LeapYearMonthDays = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+    CommonYearMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+    def month_days(y, m)
+      if ((y % 4 == 0) && (y % 100 != 0)) || (y % 400 == 0)
+        LeapYearMonthDays[m-1]
+      else
+        CommonYearMonthDays[m-1]
+      end
+    end
+    private :month_days
+
+    def apply_offset(year, mon, day, hour, min, sec, off)
+      if off < 0
+        off = -off
+        off, o = off.divmod(60)
+        if o != 0 then sec += o; o, sec = sec.divmod(60); off += o end
+        off, o = off.divmod(60)
+        if o != 0 then min += o; o, min = min.divmod(60); off += o end
+        off, o = off.divmod(24)
+        if o != 0 then hour += o; o, hour = hour.divmod(24); off += o end
+        if off != 0
+          day += off
+          if month_days(year, mon) < day
+            mon += 1
+            if 12 < mon
+              mon = 1
+              year += 1
+            end
+            day = 1
+          end
+        end
+      elsif 0 < off
+        off, o = off.divmod(60)
+        if o != 0 then sec -= o; o, sec = sec.divmod(60); off -= o end
+        off, o = off.divmod(60)
+        if o != 0 then min -= o; o, min = min.divmod(60); off -= o end
+        off, o = off.divmod(24)
+        if o != 0 then hour -= o; o, hour = hour.divmod(24); off -= o end
+        if off != 0 then
+          day -= off
+          if day < 1
+            mon -= 1
+            if mon < 1
+              year -= 1
+              mon = 12
+            end
+            day = month_days(year, mon)
+          end
+        end
+      end
+      return year, mon, day, hour, min, sec
+    end
+    private :apply_offset
+
+    def make_time(year, mon, day, hour, min, sec, sec_fraction, zone, now)
+      usec = nil
+      usec = (sec_fraction * 1000000).to_i if sec_fraction
+      if now
+        begin
+          break if year; year = now.year
+          break if mon; mon = now.mon
+          break if day; day = now.day
+          break if hour; hour = now.hour
+          break if min; min = now.min
+          break if sec; sec = now.sec
+          break if sec_fraction; usec = now.tv_usec
+        end until true
+      end
+
+      year ||= 1970
+      mon ||= 1
+      day ||= 1
+      hour ||= 0
+      min ||= 0
+      sec ||= 0
+      usec ||= 0
+
+      off = nil
+      off = zone_offset(zone, year) if zone
+
+      if off
+        year, mon, day, hour, min, sec =
+          apply_offset(year, mon, day, hour, min, sec, off)
+        t = Time.utc(year, mon, day, hour, min, sec, usec)
+        t.localtime if !zone_utc?(zone)
+        t
+      else
+        self.local(year, mon, day, hour, min, sec, usec)
+      end
+    end
+    private :make_time
+
+    #
+    # Parses +date+ using Date._parse and converts it to a Time object.
+    #
+    # If a block is given, the year described in +date+ is converted by the
+    # block.  For example:
+    #
+    #     Time.parse(...) {|y| y < 100 ? (y >= 69 ? y + 1900 : y + 2000) : y}
+    #
+    # If the upper components of the given time are broken or missing, they are
+    # supplied with those of +now+.  For the lower components, the minimum
+    # values (1 or 0) are assumed if broken or missing.  For example:
+    #
+    #     # Suppose it is "Thu Nov 29 14:33:20 GMT 2001" now and
+    #     # your timezone is GMT:
+    #     Time.parse("16:30")     #=> Thu Nov 29 16:30:00 GMT 2001
+    #     Time.parse("7/23")      #=> Mon Jul 23 00:00:00 GMT 2001
+    #     Time.parse("Aug 31")    #=> Fri Aug 31 00:00:00 GMT 2001
+    #
+    # Since there are numerous conflicts among locally defined timezone
+    # abbreviations all over the world, this method is not made to
+    # understand all of them.  For example, the abbreviation "CST" is
+    # used variously as:
+    #
+    #     -06:00 in America/Chicago,
+    #     -05:00 in America/Havana,
+    #     +08:00 in Asia/Harbin,
+    #     +09:30 in Australia/Darwin,
+    #     +10:30 in Australia/Adelaide,
+    #     etc.
+    #
+    # Based on the fact, this method only understands the timezone
+    # abbreviations described in RFC 822 and the system timezone, in the
+    # order named. (i.e. a definition in RFC 822 overrides the system
+    # timezone definition.)  The system timezone is taken from
+    # <tt>Time.local(year, 1, 1).zone</tt> and
+    # <tt>Time.local(year, 7, 1).zone</tt>.
+    # If the extracted timezone abbreviation does not match any of them,
+    # it is ignored and the given time is regarded as a local time.
+    #
+    # ArgumentError is raised if Date._parse cannot extract information from
+    # +date+ or Time class cannot represent specified date.
+    #
+    # This method can be used as fail-safe for other parsing methods as:
+    #
+    #   Time.rfc2822(date) rescue Time.parse(date)
+    #   Time.httpdate(date) rescue Time.parse(date)
+    #   Time.xmlschema(date) rescue Time.parse(date)
+    #
+    # A failure for Time.parse should be checked, though.
+    #
+    def parse(date, now=Time.now)
+      d = Date._parse(date, false)
+      year = d[:year]
+      year = yield(year) if year && block_given?
+      make_time(year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
+    end
+
+    MonthValue = {
+      'JAN' => 1, 'FEB' => 2, 'MAR' => 3, 'APR' => 4, 'MAY' => 5, 'JUN' => 6,
+      'JUL' => 7, 'AUG' => 8, 'SEP' => 9, 'OCT' =>10, 'NOV' =>11, 'DEC' =>12
+    }
+
+    #
+    # Parses +date+ as date-time defined by RFC 2822 and converts it to a Time
+    # object.  The format is identical to the date format defined by RFC 822 and
+    # updated by RFC 1123.
+    #
+    # ArgumentError is raised if +date+ is not compliant with RFC 2822
+    # or Time class cannot represent specified date.
+    #
+    # See #rfc2822 for more information on this format.
+    #
+    def rfc2822(date)
+      if /\A\s*
+          (?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*,\s*)?
+          (\d{1,2})\s+
+          (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+
+          (\d{2,})\s+
+          (\d{2})\s*
+          :\s*(\d{2})\s*
+          (?::\s*(\d{2}))?\s+
+          ([+-]\d{4}|
+           UT|GMT|EST|EDT|CST|CDT|MST|MDT|PST|PDT|[A-IK-Z])/ix =~ date
+        # Since RFC 2822 permit comments, the regexp has no right anchor.
+        day = $1.to_i
+        mon = MonthValue[$2.upcase]
+        year = $3.to_i
+        hour = $4.to_i
+        min = $5.to_i
+        sec = $6 ? $6.to_i : 0
+        zone = $7
+
+        # following year completion is compliant with RFC 2822.
+        year = if year < 50
+                 2000 + year
+               elsif year < 1000
+                 1900 + year
+               else
+                 year
+               end
+
+        year, mon, day, hour, min, sec =
+          apply_offset(year, mon, day, hour, min, sec, zone_offset(zone))
+        t = self.utc(year, mon, day, hour, min, sec)
+        t.localtime if !zone_utc?(zone)
+        t
+      else
+        raise ArgumentError.new("not RFC 2822 compliant date: #{date.inspect}")
+      end
+    end
+    alias rfc822 rfc2822
+
+    #
+    # Parses +date+ as HTTP-date defined by RFC 2616 and converts it to a Time
+    # object.
+    #
+    # ArgumentError is raised if +date+ is not compliant with RFC 2616 or Time
+    # class cannot represent specified date.
+    #
+    # See #httpdate for more information on this format.
+    #
+    def httpdate(date)
+      if /\A\s*
+          (?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\x20
+          (\d{2})\x20
+          (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\x20
+          (\d{4})\x20
+          (\d{2}):(\d{2}):(\d{2})\x20
+          GMT
+          \s*\z/ix =~ date
+        self.rfc2822(date)
+      elsif /\A\s*
+             (?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday),\x20
+             (\d\d)-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(\d\d)\x20
+             (\d\d):(\d\d):(\d\d)\x20
+             GMT
+             \s*\z/ix =~ date
+        self.parse(date)
+      elsif /\A\s*
+             (?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\x20
+             (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\x20
+             (\d\d|\x20\d)\x20
+             (\d\d):(\d\d):(\d\d)\x20
+             (\d{4})
+             \s*\z/ix =~ date
+        self.utc($6.to_i, MonthValue[$1.upcase], $2.to_i,
+                 $3.to_i, $4.to_i, $5.to_i)
+      else
+        raise ArgumentError.new("not RFC 2616 compliant date: #{date.inspect}")
+      end
+    end
+
+    #
+    # Parses +date+ as dateTime defined by XML Schema and converts it to a Time
+    # object.  The format is restricted version of the format defined by ISO
+    # 8601.
+    #
+    # ArgumentError is raised if +date+ is not compliant with the format or Time
+    # class cannot represent specified date.
+    #
+    # See #xmlschema for more information on this format.
+    #
+    def xmlschema(date)
+      if /\A\s*
+          (-?\d+)-(\d\d)-(\d\d)
+          T
+          (\d\d):(\d\d):(\d\d)
+          (\.\d*)?
+          (Z|[+-]\d\d:\d\d)?
+          \s*\z/ix =~ date
+        year = $1.to_i
+        mon = $2.to_i
+        day = $3.to_i
+        hour = $4.to_i
+        min = $5.to_i
+        sec = $6.to_i
+        usec = 0
+        usec = $7.to_f * 1000000 if $7
+        if $8
+          zone = $8
+          year, mon, day, hour, min, sec =
+            apply_offset(year, mon, day, hour, min, sec, zone_offset(zone))
+          Time.utc(year, mon, day, hour, min, sec, usec)
+        else
+          Time.local(year, mon, day, hour, min, sec, usec)
+        end
+      else
+        raise ArgumentError.new("invalid date: #{date.inspect}")
+      end
+    end
+    alias iso8601 xmlschema
+  end # class << self
+
+  #
+  # Returns a string which represents the time as date-time defined by RFC 2822:
+  #
+  #   day-of-week, DD month-name CCYY hh:mm:ss zone
+  #
+  # where zone is [+-]hhmm.
+  #
+  # If +self+ is a UTC time, -0000 is used as zone.
+  #
+  def rfc2822
+    sprintf('%s, %02d %s %d %02d:%02d:%02d ',
+      RFC2822_DAY_NAME[wday],
+      day, RFC2822_MONTH_NAME[mon-1], year,
+      hour, min, sec) +
+    if utc?
+      '-0000'
+    else
+      off = utc_offset
+      sign = off < 0 ? '-' : '+'
+      sprintf('%s%02d%02d', sign, *(off.abs / 60).divmod(60))
+    end
+  end
+  alias rfc822 rfc2822
+
+  RFC2822_DAY_NAME = [
+    'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'
+  ]
+  RFC2822_MONTH_NAME = [
+    'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+    'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
+  ]
+
+  #
+  # Returns a string which represents the time as rfc1123-date of HTTP-date
+  # defined by RFC 2616: 
+  # 
+  #   day-of-week, DD month-name CCYY hh:mm:ss GMT
+  #
+  # Note that the result is always UTC (GMT).
+  #
+  def httpdate
+    t = dup.utc
+    sprintf('%s, %02d %s %d %02d:%02d:%02d GMT',
+      RFC2822_DAY_NAME[t.wday],
+      t.day, RFC2822_MONTH_NAME[t.mon-1], t.year,
+      t.hour, t.min, t.sec)
+  end
+
+  #
+  # Returns a string which represents the time as dateTime defined by XML
+  # Schema:
+  #
+  #   CCYY-MM-DDThh:mm:ssTZD
+  #   CCYY-MM-DDThh:mm:ss.sssTZD
+  #
+  # where TZD is Z or [+-]hh:mm.
+  #
+  # If self is a UTC time, Z is used as TZD.  [+-]hh:mm is used otherwise.
+  #
+  # +fractional_seconds+ specifies a number of digits of fractional seconds.
+  # Its default value is 0.
+  #
+  def xmlschema(fraction_digits=0)
+    sprintf('%d-%02d-%02dT%02d:%02d:%02d',
+      year, mon, day, hour, min, sec) +
+    if fraction_digits == 0
+      ''
+    elsif fraction_digits <= 6
+      '.' + sprintf('%06d', usec)[0, fraction_digits]
+    else
+      '.' + sprintf('%06d', usec) + '0' * (fraction_digits - 6)
+    end +
+    if utc?
+      'Z'
+    else
+      off = utc_offset
+      sign = off < 0 ? '-' : '+'
+      sprintf('%s%02d:%02d', sign, *(off.abs / 60).divmod(60))
+    end
+  end
+  alias iso8601 xmlschema
+end
+
+if __FILE__ == $0
+  require 'test/unit'
+
+  class TimeExtentionTest < Test::Unit::TestCase # :nodoc:
+    def test_rfc822
+      assert_equal(Time.utc(1976, 8, 26, 14, 30) + 4 * 3600,
+                   Time.rfc2822("26 Aug 76 14:30 EDT"))
+      assert_equal(Time.utc(1976, 8, 27, 9, 32) + 7 * 3600,
+                   Time.rfc2822("27 Aug 76 09:32 PDT"))
+    end
+
+    def test_rfc2822
+      assert_equal(Time.utc(1997, 11, 21, 9, 55, 6) + 6 * 3600,
+                   Time.rfc2822("Fri, 21 Nov 1997 09:55:06 -0600"))
+      assert_equal(Time.utc(2003, 7, 1, 10, 52, 37) - 2 * 3600,
+                   Time.rfc2822("Tue, 1 Jul 2003 10:52:37 +0200"))
+      assert_equal(Time.utc(1997, 11, 21, 10, 1, 10) + 6 * 3600,
+                   Time.rfc2822("Fri, 21 Nov 1997 10:01:10 -0600"))
+      assert_equal(Time.utc(1997, 11, 21, 11, 0, 0) + 6 * 3600,
+                   Time.rfc2822("Fri, 21 Nov 1997 11:00:00 -0600"))
+      assert_equal(Time.utc(1997, 11, 24, 14, 22, 1) + 8 * 3600,
+                   Time.rfc2822("Mon, 24 Nov 1997 14:22:01 -0800"))
+      begin
+        Time.at(-1)
+      rescue ArgumentError
+        # ignore
+      else
+        assert_equal(Time.utc(1969, 2, 13, 23, 32, 54) + 3 * 3600 + 30 * 60,
+                     Time.rfc2822("Thu, 13 Feb 1969 23:32:54 -0330"))
+        assert_equal(Time.utc(1969, 2, 13, 23, 32, 0) + 3 * 3600 + 30 * 60,
+                     Time.rfc2822(" Thu,
+        13
+          Feb
+            1969
+        23:32
+                 -0330 (Newfoundland Time)"))
+      end
+      assert_equal(Time.utc(1997, 11, 21, 9, 55, 6),
+                   Time.rfc2822("21 Nov 97 09:55:06 GMT"))
+      assert_equal(Time.utc(1997, 11, 21, 9, 55, 6) + 6 * 3600,
+                   Time.rfc2822("Fri, 21 Nov 1997 09 :   55  :  06 -0600"))
+      assert_raise(ArgumentError) {
+        # inner comment is not supported.
+        Time.rfc2822("Fri, 21 Nov 1997 09(comment):   55  :  06 -0600")
+      }
+    end
+
+    def test_rfc2616
+      t = Time.utc(1994, 11, 6, 8, 49, 37)
+      assert_equal(t, Time.httpdate("Sun, 06 Nov 1994 08:49:37 GMT"))
+      assert_equal(t, Time.httpdate("Sunday, 06-Nov-94 08:49:37 GMT"))
+      assert_equal(t, Time.httpdate("Sun Nov  6 08:49:37 1994"))
+      assert_equal(Time.utc(1995, 11, 15, 6, 25, 24),
+                   Time.httpdate("Wed, 15 Nov 1995 06:25:24 GMT"))
+      assert_equal(Time.utc(1995, 11, 15, 4, 58, 8),
+                   Time.httpdate("Wed, 15 Nov 1995 04:58:08 GMT"))
+      assert_equal(Time.utc(1994, 11, 15, 8, 12, 31),
+                   Time.httpdate("Tue, 15 Nov 1994 08:12:31 GMT"))
+      assert_equal(Time.utc(1994, 12, 1, 16, 0, 0),
+                   Time.httpdate("Thu, 01 Dec 1994 16:00:00 GMT"))
+      assert_equal(Time.utc(1994, 10, 29, 19, 43, 31),
+                   Time.httpdate("Sat, 29 Oct 1994 19:43:31 GMT"))
+      assert_equal(Time.utc(1994, 11, 15, 12, 45, 26),
+                   Time.httpdate("Tue, 15 Nov 1994 12:45:26 GMT"))
+      assert_equal(Time.utc(1999, 12, 31, 23, 59, 59),
+                   Time.httpdate("Fri, 31 Dec 1999 23:59:59 GMT"))
+    end
+
+    def test_rfc3339
+      t = Time.utc(1985, 4, 12, 23, 20, 50, 520000)
+      s = "1985-04-12T23:20:50.52Z"
+      assert_equal(t, Time.iso8601(s))
+      assert_equal(s, t.iso8601(2))
+
+      t = Time.utc(1996, 12, 20, 0, 39, 57)
+      s = "1996-12-19T16:39:57-08:00"
+      assert_equal(t, Time.iso8601(s))
+      # There is no way to generate time string with arbitrary timezone.
+      s = "1996-12-20T00:39:57Z"
+      assert_equal(t, Time.iso8601(s))
+      assert_equal(s, t.iso8601)
+
+      t = Time.utc(1990, 12, 31, 23, 59, 60)
+      s = "1990-12-31T23:59:60Z"
+      assert_equal(t, Time.iso8601(s))
+      # leap second is representable only if timezone file has it.
+      s = "1990-12-31T15:59:60-08:00"
+      assert_equal(t, Time.iso8601(s))
+
+      begin
+        Time.at(-1)
+      rescue ArgumentError
+        # ignore
+      else
+        t = Time.utc(1937, 1, 1, 11, 40, 27, 870000)
+        s = "1937-01-01T12:00:27.87+00:20"
+        assert_equal(t, Time.iso8601(s))
+      end
+    end
+
+    # http://www.w3.org/TR/xmlschema-2/
+    def test_xmlschema
+      assert_equal(Time.utc(1999, 5, 31, 13, 20, 0) + 5 * 3600,
+                   Time.xmlschema("1999-05-31T13:20:00-05:00"))
+      assert_equal(Time.local(2000, 1, 20, 12, 0, 0),
+                   Time.xmlschema("2000-01-20T12:00:00"))
+      assert_equal(Time.utc(2000, 1, 20, 12, 0, 0),
+                   Time.xmlschema("2000-01-20T12:00:00Z"))
+      assert_equal(Time.utc(2000, 1, 20, 12, 0, 0) - 12 * 3600,
+                   Time.xmlschema("2000-01-20T12:00:00+12:00"))
+      assert_equal(Time.utc(2000, 1, 20, 12, 0, 0) + 13 * 3600,
+                   Time.xmlschema("2000-01-20T12:00:00-13:00"))
+      assert_equal(Time.utc(2000, 3, 4, 23, 0, 0) - 3 * 3600,
+                   Time.xmlschema("2000-03-04T23:00:00+03:00"))
+      assert_equal(Time.utc(2000, 3, 4, 20, 0, 0),
+                   Time.xmlschema("2000-03-04T20:00:00Z"))
+      assert_equal(Time.local(2000, 1, 15, 0, 0, 0),
+                   Time.xmlschema("2000-01-15T00:00:00"))
+      assert_equal(Time.local(2000, 2, 15, 0, 0, 0),
+                   Time.xmlschema("2000-02-15T00:00:00"))
+      assert_equal(Time.local(2000, 1, 15, 12, 0, 0),
+                   Time.xmlschema("2000-01-15T12:00:00"))
+      assert_equal(Time.utc(2000, 1, 16, 12, 0, 0),
+                   Time.xmlschema("2000-01-16T12:00:00Z"))
+      assert_equal(Time.local(2000, 1, 1, 12, 0, 0),
+                   Time.xmlschema("2000-01-01T12:00:00"))
+      assert_equal(Time.utc(1999, 12, 31, 23, 0, 0),
+                   Time.xmlschema("1999-12-31T23:00:00Z"))
+      assert_equal(Time.local(2000, 1, 16, 12, 0, 0),
+                   Time.xmlschema("2000-01-16T12:00:00"))
+      assert_equal(Time.local(2000, 1, 16, 0, 0, 0),
+                   Time.xmlschema("2000-01-16T00:00:00"))
+      assert_equal(Time.utc(2000, 1, 12, 12, 13, 14),
+                   Time.xmlschema("2000-01-12T12:13:14Z"))
+      assert_equal(Time.utc(2001, 4, 17, 19, 23, 17, 300000),
+                   Time.xmlschema("2001-04-17T19:23:17.3Z"))
+    end
+
+    def test_encode_xmlschema
+      t = Time.utc(2001, 4, 17, 19, 23, 17, 300000)
+      assert_equal("2001-04-17T19:23:17Z", t.xmlschema)
+      assert_equal("2001-04-17T19:23:17.3Z", t.xmlschema(1))
+      assert_equal("2001-04-17T19:23:17.300000Z", t.xmlschema(6))
+      assert_equal("2001-04-17T19:23:17.3000000Z", t.xmlschema(7))
+
+      t = Time.utc(2001, 4, 17, 19, 23, 17, 123456)
+      assert_equal("2001-04-17T19:23:17.1234560Z", t.xmlschema(7))
+      assert_equal("2001-04-17T19:23:17.123456Z", t.xmlschema(6))
+      assert_equal("2001-04-17T19:23:17.12345Z", t.xmlschema(5))
+      assert_equal("2001-04-17T19:23:17.1Z", t.xmlschema(1))
+
+      begin
+        Time.at(-1)
+      rescue ArgumentError
+        # ignore
+      else
+        t = Time.utc(1960, 12, 31, 23, 0, 0, 123456)
+        assert_equal("1960-12-31T23:00:00.123456Z", t.xmlschema(6))
+      end
+    end
+
+    def test_completion
+      now = Time.local(2001,11,29,21,26,35)
+      assert_equal(Time.local( 2001,11,29,21,12),
+                   Time.parse("2001/11/29 21:12", now))
+      assert_equal(Time.local( 2001,11,29),
+                   Time.parse("2001/11/29", now))
+      assert_equal(Time.local( 2001,11,29),
+                   Time.parse(     "11/29", now))
+      #assert_equal(Time.local(2001,11,1), Time.parse("Nov", now))
+      assert_equal(Time.local( 2001,11,29,10,22),
+                   Time.parse(           "10:22", now))
+    end
+
+    def test_invalid
+      # They were actually used in some web sites.
+      assert_raise(ArgumentError) { Time.httpdate("1 Dec 2001 10:23:57 GMT") }
+      assert_raise(ArgumentError) { Time.httpdate("Sat, 1 Dec 2001 10:25:42 GMT") }
+      assert_raise(ArgumentError) { Time.httpdate("Sat,  1-Dec-2001 10:53:55 GMT") }
+      assert_raise(ArgumentError) { Time.httpdate("Saturday, 01-Dec-2001 10:15:34 GMT") }
+      assert_raise(ArgumentError) { Time.httpdate("Saturday, 01-Dec-101 11:10:07 GMT") }
+      assert_raise(ArgumentError) { Time.httpdate("Fri, 30 Nov 2001 21:30:00 JST") }
+
+      # They were actually used in some mails.
+      assert_raise(ArgumentError) { Time.rfc2822("01-5-20") }
+      assert_raise(ArgumentError) { Time.rfc2822("7/21/00") }
+      assert_raise(ArgumentError) { Time.rfc2822("2001-8-28") }
+      assert_raise(ArgumentError) { Time.rfc2822("00-5-6 1:13:06") }
+      assert_raise(ArgumentError) { Time.rfc2822("2001-9-27 9:36:49") }
+      assert_raise(ArgumentError) { Time.rfc2822("2000-12-13 11:01:11") }
+      assert_raise(ArgumentError) { Time.rfc2822("2001/10/17 04:29:55") }
+      assert_raise(ArgumentError) { Time.rfc2822("9/4/2001 9:23:19 PM") }
+      assert_raise(ArgumentError) { Time.rfc2822("01 Nov 2001 09:04:31") }
+      assert_raise(ArgumentError) { Time.rfc2822("13 Feb 2001 16:4 GMT") }
+      assert_raise(ArgumentError) { Time.rfc2822("01 Oct 00 5:41:19 PM") }
+      assert_raise(ArgumentError) { Time.rfc2822("2 Jul 00 00:51:37 JST") }
+      assert_raise(ArgumentError) { Time.rfc2822("01 11 2001 06:55:57 -0500") }
+      assert_raise(ArgumentError) { Time.rfc2822("18 \343\366\356\341\370 2000") }
+      assert_raise(ArgumentError) { Time.rfc2822("Fri, Oct 2001  18:53:32") }
+      assert_raise(ArgumentError) { Time.rfc2822("Fri, 2 Nov 2001 03:47:54") }
+      assert_raise(ArgumentError) { Time.rfc2822("Fri, 27 Jul 2001 11.14.14 +0200") }
+      assert_raise(ArgumentError) { Time.rfc2822("Thu, 2 Nov 2000 04:13:53 -600") }
+      assert_raise(ArgumentError) { Time.rfc2822("Wed, 5 Apr 2000 22:57:09 JST") }
+      assert_raise(ArgumentError) { Time.rfc2822("Mon, 11 Sep 2000 19:47:33 00000") }
+      assert_raise(ArgumentError) { Time.rfc2822("Fri, 28 Apr 2000 20:40:47 +-900") }
+      assert_raise(ArgumentError) { Time.rfc2822("Fri, 19 Jan 2001 8:15:36 AM -0500") }
+      assert_raise(ArgumentError) { Time.rfc2822("Thursday, Sep 27 2001 7:42:35 AM EST") }
+      assert_raise(ArgumentError) { Time.rfc2822("3/11/2001 1:31:57 PM Pacific Daylight Time") }
+      assert_raise(ArgumentError) { Time.rfc2822("Mi, 28 Mrz 2001 11:51:36") }
+      assert_raise(ArgumentError) { Time.rfc2822("P, 30 sept 2001 23:03:14") }
+      assert_raise(ArgumentError) { Time.rfc2822("fr, 11 aug 2000 18:39:22") }
+      assert_raise(ArgumentError) { Time.rfc2822("Fr, 21 Sep 2001 17:44:03 -1000") }
+      assert_raise(ArgumentError) { Time.rfc2822("Mo, 18 Jun 2001 19:21:40 -1000") }
+      assert_raise(ArgumentError) { Time.rfc2822("l\366, 12 aug 2000 18:53:20") }
+      assert_raise(ArgumentError) { Time.rfc2822("l\366, 26 maj 2001 00:15:58") }
+      assert_raise(ArgumentError) { Time.rfc2822("Dom, 30 Sep 2001 17:36:30") }
+      assert_raise(ArgumentError) { Time.rfc2822("%&, 31 %2/ 2000 15:44:47 -0500") }
+      assert_raise(ArgumentError) { Time.rfc2822("dom, 26 ago 2001 03:57:07 -0300") }
+      assert_raise(ArgumentError) { Time.rfc2822("ter, 04 set 2001 16:27:58 -0300") }
+      assert_raise(ArgumentError) { Time.rfc2822("Wen, 3 oct 2001 23:17:49 -0400") }
+      assert_raise(ArgumentError) { Time.rfc2822("Wen, 3 oct 2001 23:17:49 -0400") }
+      assert_raise(ArgumentError) { Time.rfc2822("ele, 11 h: 2000 12:42:15 -0500") }
+      assert_raise(ArgumentError) { Time.rfc2822("Tue, 14 Aug 2001 3:55:3 +0200") }
+      assert_raise(ArgumentError) { Time.rfc2822("Fri, 25 Aug 2000 9:3:48 +0800") }
+      assert_raise(ArgumentError) { Time.rfc2822("Fri, 1 Dec 2000 0:57:50 EST") }
+      assert_raise(ArgumentError) { Time.rfc2822("Mon, 7 May 2001 9:39:51 +0200") }
+      assert_raise(ArgumentError) { Time.rfc2822("Wed, 1 Aug 2001 16:9:15 +0200") }
+      assert_raise(ArgumentError) { Time.rfc2822("Wed, 23 Aug 2000 9:17:36 +0800") }
+      assert_raise(ArgumentError) { Time.rfc2822("Fri, 11 Aug 2000 10:4:42 +0800") }
+      assert_raise(ArgumentError) { Time.rfc2822("Sat, 15 Sep 2001 13:22:2 +0300") }
+      assert_raise(ArgumentError) { Time.rfc2822("Wed,16 \276\305\324\302 2001 20:06:25 +0800") }
+      assert_raise(ArgumentError) { Time.rfc2822("Wed,7 \312\256\322\273\324\302 2001 23:47:22 +0800") }
+      assert_raise(ArgumentError) { Time.rfc2822("=?iso-8859-1?Q?(=C5=DA),?= 10   2 2001 23:32:26 +0900 (JST)") }
+      assert_raise(ArgumentError) { Time.rfc2822("\307\341\314\343\332\311, 30 \344\346\335\343\310\321 2001 10:01:06") }
+      assert_raise(ArgumentError) { Time.rfc2822("=?iso-8859-1?Q?(=BF=E5),?= 12  =?iso-8859-1?Q?9=B7=EE?= 2001 14:52:41\n+0900 (JST)") }
+    end
+
+    def test_zone_0000
+      assert_equal(true, Time.parse("2000-01-01T00:00:00Z").utc?)
+      assert_equal(true, Time.parse("2000-01-01T00:00:00-00:00").utc?)
+      assert_equal(false, Time.parse("2000-01-01T00:00:00+00:00").utc?)
+      assert_equal(false, Time.parse("Sat, 01 Jan 2000 00:00:00 GMT").utc?)
+      assert_equal(true, Time.parse("Sat, 01 Jan 2000 00:00:00 -0000").utc?)
+      assert_equal(false, Time.parse("Sat, 01 Jan 2000 00:00:00 +0000").utc?)
+      assert_equal(false, Time.rfc2822("Sat, 01 Jan 2000 00:00:00 GMT").utc?)
+      assert_equal(true, Time.rfc2822("Sat, 01 Jan 2000 00:00:00 -0000").utc?)
+      assert_equal(false, Time.rfc2822("Sat, 01 Jan 2000 00:00:00 +0000").utc?)
+      assert_equal(true, Time.rfc2822("Sat, 01 Jan 2000 00:00:00 UTC").utc?)
+    end
+
+    def test_parse_leap_second
+      t = Time.utc(1998,12,31,23,59,59)
+      assert_equal(t, Time.parse("Thu Dec 31 23:59:59 UTC 1998"))
+      assert_equal(t, Time.parse("Fri Dec 31 23:59:59 -0000 1998"));t.localtime
+      assert_equal(t, Time.parse("Fri Jan  1 08:59:59 +0900 1999"))
+      assert_equal(t, Time.parse("Fri Jan  1 00:59:59 +0100 1999"))
+      assert_equal(t, Time.parse("Fri Dec 31 23:59:59 +0000 1998"))
+      assert_equal(t, Time.parse("Fri Dec 31 22:59:59 -0100 1998"));t.utc
+      t += 1
+      assert_equal(t, Time.parse("Thu Dec 31 23:59:60 UTC 1998"))
+      assert_equal(t, Time.parse("Fri Dec 31 23:59:60 -0000 1998"));t.localtime
+      assert_equal(t, Time.parse("Fri Jan  1 08:59:60 +0900 1999"))
+      assert_equal(t, Time.parse("Fri Jan  1 00:59:60 +0100 1999"))
+      assert_equal(t, Time.parse("Fri Dec 31 23:59:60 +0000 1998"))
+      assert_equal(t, Time.parse("Fri Dec 31 22:59:60 -0100 1998"));t.utc
+      t += 1 if t.sec == 60
+      assert_equal(t, Time.parse("Thu Jan  1 00:00:00 UTC 1999"))
+      assert_equal(t, Time.parse("Fri Jan  1 00:00:00 -0000 1999"));t.localtime
+      assert_equal(t, Time.parse("Fri Jan  1 09:00:00 +0900 1999"))
+      assert_equal(t, Time.parse("Fri Jan  1 01:00:00 +0100 1999"))
+      assert_equal(t, Time.parse("Fri Jan  1 00:00:00 +0000 1999"))
+      assert_equal(t, Time.parse("Fri Dec 31 23:00:00 -0100 1998"))
+    end
+
+    def test_rfc2822_leap_second
+      t = Time.utc(1998,12,31,23,59,59)
+      assert_equal(t, Time.rfc2822("Thu, 31 Dec 1998 23:59:59 UTC"))
+      assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:59:59 -0000"));t.localtime                                  
+      assert_equal(t, Time.rfc2822("Fri,  1 Jan 1999 08:59:59 +0900"))
+      assert_equal(t, Time.rfc2822("Fri,  1 Jan 1999 00:59:59 +0100"))
+      assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:59:59 +0000"))
+      assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 22:59:59 -0100"));t.utc                                  
+      t += 1
+      assert_equal(t, Time.rfc2822("Thu, 31 Dec 1998 23:59:60 UTC"))
+      assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:59:60 -0000"));t.localtime                                  
+      assert_equal(t, Time.rfc2822("Fri,  1 Jan 1999 08:59:60 +0900"))
+      assert_equal(t, Time.rfc2822("Fri,  1 Jan 1999 00:59:60 +0100"))
+      assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:59:60 +0000"))
+      assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 22:59:60 -0100"));t.utc                                  
+      t += 1 if t.sec == 60
+      assert_equal(t, Time.rfc2822("Thu,  1 Jan 1999 00:00:00 UTC"))
+      assert_equal(t, Time.rfc2822("Fri,  1 Jan 1999 00:00:00 -0000"));t.localtime                                  
+      assert_equal(t, Time.rfc2822("Fri,  1 Jan 1999 09:00:00 +0900"))
+      assert_equal(t, Time.rfc2822("Fri,  1 Jan 1999 01:00:00 +0100"))
+      assert_equal(t, Time.rfc2822("Fri,  1 Jan 1999 00:00:00 +0000"))
+      assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:00:00 -0100"))
+    end
+
+    def test_xmlschema_leap_second
+      t = Time.utc(1998,12,31,23,59,59)
+      assert_equal(t, Time.xmlschema("1998-12-31T23:59:59Z"))
+      assert_equal(t, Time.xmlschema("1998-12-31T23:59:59-00:00"));t.localtime
+      assert_equal(t, Time.xmlschema("1999-01-01T08:59:59+09:00"))
+      assert_equal(t, Time.xmlschema("1999-01-01T00:59:59+01:00"))
+      assert_equal(t, Time.xmlschema("1998-12-31T23:59:59+00:00"))
+      assert_equal(t, Time.xmlschema("1998-12-31T22:59:59-01:00"));t.utc
+      t += 1
+      assert_equal(t, Time.xmlschema("1998-12-31T23:59:60Z"))
+      assert_equal(t, Time.xmlschema("1998-12-31T23:59:60-00:00"));t.localtime
+      assert_equal(t, Time.xmlschema("1999-01-01T08:59:60+09:00"))
+      assert_equal(t, Time.xmlschema("1999-01-01T00:59:60+01:00"))
+      assert_equal(t, Time.xmlschema("1998-12-31T23:59:60+00:00"))
+      assert_equal(t, Time.xmlschema("1998-12-31T22:59:60-01:00"));t.utc
+      t += 1 if t.sec == 60
+      assert_equal(t, Time.xmlschema("1999-01-01T00:00:00Z"))
+      assert_equal(t, Time.xmlschema("1999-01-01T00:00:00-00:00"));t.localtime
+      assert_equal(t, Time.xmlschema("1999-01-01T09:00:00+09:00"))
+      assert_equal(t, Time.xmlschema("1999-01-01T01:00:00+01:00"))
+      assert_equal(t, Time.xmlschema("1999-01-01T00:00:00+00:00"))
+      assert_equal(t, Time.xmlschema("1998-12-31T23:00:00-01:00"))
+    end
+
+    def test_ruby_talk_152866
+      t = Time::xmlschema('2005-08-30T22:48:00-07:00')
+      assert_equal(31, t.day)
+      assert_equal(8, t.mon)
+    end
+
+    def test_parse_fraction
+      assert_equal(500000, Time.parse("2000-01-01T00:00:00.5+00:00").tv_usec)
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/timeout.rb b/ruby_1_8_6/lib/timeout.rb
new file mode 100644
index 0000000000..dc92964c0b
--- /dev/null
+++ b/ruby_1_8_6/lib/timeout.rb
@@ -0,0 +1,105 @@
+#--
+# = timeout.rb
+#
+# execution timeout
+#
+# = Copyright
+#
+# Copyright:: (C) 2000  Network Applied Communication Laboratory, Inc.
+# Copyright:: (C) 2000  Information-technology Promotion Agency, Japan
+#
+#++
+#
+# = Description
+#
+# A way of performing a potentially long-running operation in a thread, and
+# terminating it's execution if it hasn't finished within fixed amount of
+# time.
+#
+# Previous versions of timeout didn't use a module for namespace. This version
+# provides both Timeout.timeout, and a backwards-compatible #timeout.
+#
+# = Synopsis
+#
+#   require 'timeout'
+#   status = Timeout::timeout(5) {
+#     # Something that should be interrupted if it takes too much time...
+#   }
+#
+
+module Timeout
+
+  ##
+  # Raised by Timeout#timeout when the block times out.
+
+  class Error<Interrupt
+  end
+
+  ##
+  # Executes the method's block. If the block execution terminates before +sec+
+  # seconds has passed, it returns true. If not, it terminates the execution
+  # and raises +exception+ (which defaults to Timeout::Error).
+  #
+  # Note that this is both a method of module Timeout, so you can 'include
+  # Timeout' into your classes so they have a #timeout method, as well as a
+  # module method, so you can call it directly as Timeout.timeout().
+
+  def timeout(sec, exception=Error)
+    return yield if sec == nil or sec.zero?
+    raise ThreadError, "timeout within critical session" if Thread.critical
+    begin
+      x = Thread.current
+      y = Thread.start {
+        sleep sec
+        x.raise exception, "execution expired" if x.alive?
+      }
+      yield sec
+      #    return true
+    ensure
+      y.kill if y and y.alive?
+    end
+  end
+
+  module_function :timeout
+
+end
+
+##
+# Identical to:
+#
+#   Timeout::timeout(n, e, &block).
+#
+# Defined for backwards compatibility with earlier versions of timeout.rb, see
+# Timeout#timeout.
+
+def timeout(n, e=Timeout::Error, &block) # :nodoc:
+  Timeout::timeout(n, e, &block)
+end
+
+##
+# Another name for Timeout::Error, defined for backwards compatibility with
+# earlier versions of timeout.rb.
+
+TimeoutError = Timeout::Error # :nodoc:
+
+if __FILE__ == $0
+  p timeout(5) {
+    45
+  }
+  p timeout(5, TimeoutError) {
+    45
+  }
+  p timeout(nil) {
+    54
+  }
+  p timeout(0) {
+    54
+  }
+  p timeout(5) {
+    loop {
+      p 10
+      sleep 1
+    }
+  }
+end
+
diff --git a/ruby_1_8_6/lib/tmpdir.rb b/ruby_1_8_6/lib/tmpdir.rb
new file mode 100644
index 0000000000..434d1bf053
--- /dev/null
+++ b/ruby_1_8_6/lib/tmpdir.rb
@@ -0,0 +1,45 @@
+#
+# tmpdir - retrieve temporary directory path
+#
+# $Id$
+#
+
+class Dir
+
+  @@systmpdir = '/tmp'
+
+  begin
+    require 'Win32API'
+    max_pathlen = 260
+    windir = ' '*(max_pathlen+1)
+    begin
+      getdir = Win32API.new('kernel32', 'GetSystemWindowsDirectory', 'PL', 'L')
+    rescue RuntimeError
+      getdir = Win32API.new('kernel32', 'GetWindowsDirectory', 'PL', 'L')
+    end
+    len = getdir.call(windir, windir.size)
+    windir = File.expand_path(windir[0, len])
+    temp = File.join(windir, 'temp')
+    @@systmpdir = temp if File.directory?(temp) and File.writable?(temp)
+  rescue LoadError
+  end
+
+  ##
+  # Returns the operating system's temporary file path.
+
+  def Dir::tmpdir
+    tmp = '.'
+    if $SAFE > 0
+      tmp = @@systmpdir
+    else
+      for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'],
+	          ENV['USERPROFILE'], @@systmpdir, '/tmp']
+	if dir and File.directory?(dir) and File.writable?(dir)
+	  tmp = dir
+	  break
+	end
+      end
+    end
+    File.expand_path(tmp)
+  end
+end
diff --git a/ruby_1_8_6/lib/tracer.rb b/ruby_1_8_6/lib/tracer.rb
new file mode 100644
index 0000000000..71aa49c306
--- /dev/null
+++ b/ruby_1_8_6/lib/tracer.rb
@@ -0,0 +1,167 @@
+#
+#   tracer.rb - 
+#   	$Release Version: 0.2$
+#   	$Revision: 1.8 $
+#   	$Date: 1998/05/19 03:42:49 $
+#   	by Keiju ISHITSUKA(Nippon Rational Inc.)
+#
+# --
+#
+#   
+#
+
+#
+# tracer main class
+#
+class Tracer
+  @RCS_ID='-$Id: tracer.rb,v 1.8 1998/05/19 03:42:49 keiju Exp keiju $-'
+
+  @stdout = STDOUT
+  @verbose = false
+  class << self
+    attr :verbose, true
+    alias verbose? verbose
+    attr :stdout, true
+  end
+  
+  EVENT_SYMBOL = {
+    "line" => "-",
+    "call" => ">",
+    "return" => "<",
+    "class" => "C",
+    "end" => "E",
+    "c-call" => ">",
+    "c-return" => "<",
+  }
+  
+  def initialize
+    @threads = Hash.new
+    if defined? Thread.main
+      @threads[Thread.main.object_id] = 0
+    else
+      @threads[Thread.current.object_id] = 0
+    end
+
+    @get_line_procs = {}
+
+    @filters = []
+  end
+  
+  def stdout
+    Tracer.stdout
+  end
+
+  def on
+    if block_given?
+      on
+      begin
+	yield
+      ensure
+	off
+      end
+    else
+      set_trace_func method(:trace_func).to_proc
+      stdout.print "Trace on\n" if Tracer.verbose?
+    end
+  end
+  
+  def off
+    set_trace_func nil
+    stdout.print "Trace off\n" if Tracer.verbose?
+  end
+
+  def add_filter(p = proc)
+    @filters.push p
+  end
+
+  def set_get_line_procs(file, p = proc)
+    @get_line_procs[file] = p
+  end
+  
+  def get_line(file, line)
+    if p = @get_line_procs[file]
+      return p.call(line)
+    end
+
+    unless list = SCRIPT_LINES__[file]
+      begin
+	f = open(file)
+	begin 
+	  SCRIPT_LINES__[file] = list = f.readlines
+	ensure
+	  f.close
+	end
+      rescue
+	SCRIPT_LINES__[file] = list = []
+      end
+    end
+
+    if l = list[line - 1]
+      l
+    else
+      "-\n"
+    end
+  end
+  
+  def get_thread_no
+    if no = @threads[Thread.current.object_id]
+      no
+    else
+      @threads[Thread.current.object_id] = @threads.size
+    end
+  end
+  
+  def trace_func(event, file, line, id, binding, klass, *)
+    return if file == __FILE__
+    
+    for p in @filters
+      return unless p.call event, file, line, id, binding, klass
+    end
+    
+    saved_crit = Thread.critical
+    Thread.critical = true
+    stdout.printf("#%d:%s:%d:%s:%s: %s",
+      get_thread_no,
+      file,
+      line,
+      klass || '',
+      EVENT_SYMBOL[event],
+      get_line(file, line))
+    Thread.critical = saved_crit
+  end
+
+  Single = new
+  def Tracer.on
+    if block_given?
+      Single.on{yield}
+    else
+      Single.on
+    end
+  end
+  
+  def Tracer.off
+    Single.off
+  end
+  
+  def Tracer.set_get_line_procs(file_name, p = proc)
+    Single.set_get_line_procs(file_name, p)
+  end
+
+  def Tracer.add_filter(p = proc)
+    Single.add_filter(p)
+  end
+  
+end
+
+SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
+
+if $0 == __FILE__
+  # direct call
+    
+  $0 = ARGV[0]
+  ARGV.shift
+  Tracer.on
+  require $0
+elsif caller(0).size == 1
+  Tracer.on
+end
diff --git a/ruby_1_8_6/lib/tsort.rb b/ruby_1_8_6/lib/tsort.rb
new file mode 100644
index 0000000000..a014e7f6c2
--- /dev/null
+++ b/ruby_1_8_6/lib/tsort.rb
@@ -0,0 +1,290 @@
+#!/usr/bin/env ruby
+#--
+# tsort.rb - provides a module for topological sorting and strongly connected components.
+#++
+#
+
+#
+# TSort implements topological sorting using Tarjan's algorithm for
+# strongly connected components.
+#
+# TSort is designed to be able to be used with any object which can be
+# interpreted as a directed graph.
+#
+# TSort requires two methods to interpret an object as a graph,
+# tsort_each_node and tsort_each_child.
+#
+# * tsort_each_node is used to iterate for all nodes over a graph.
+# * tsort_each_child is used to iterate for child nodes of a given node.
+#
+# The equality of nodes are defined by eql? and hash since
+# TSort uses Hash internally.
+#
+# == A Simple Example
+#
+# The following example demonstrates how to mix the TSort module into an
+# existing class (in this case, Hash). Here, we're treating each key in
+# the hash as a node in the graph, and so we simply alias the required
+# #tsort_each_node method to Hash's #each_key method. For each key in the
+# hash, the associated value is an array of the node's child nodes. This
+# choice in turn leads to our implementation of the required #tsort_each_child
+# method, which fetches the array of child nodes and then iterates over that
+# array using the user-supplied block.
+#
+#   require 'tsort'
+#   
+#   class Hash
+#     include TSort
+#     alias tsort_each_node each_key
+#     def tsort_each_child(node, &block)
+#       fetch(node).each(&block)
+#     end
+#   end
+#   
+#   {1=>[2, 3], 2=>[3], 3=>[], 4=>[]}.tsort
+#   #=> [3, 2, 1, 4]
+#   
+#   {1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}.strongly_connected_components
+#   #=> [[4], [2, 3], [1]]
+#
+# == A More Realistic Example
+#
+# A very simple `make' like tool can be implemented as follows:
+#
+#   require 'tsort'
+#   
+#   class Make
+#     def initialize
+#       @dep = {}
+#       @dep.default = []
+#     end
+#     
+#     def rule(outputs, inputs=[], &block)
+#       triple = [outputs, inputs, block]
+#       outputs.each {|f| @dep[f] = [triple]}
+#       @dep[triple] = inputs
+#     end
+#     
+#     def build(target)
+#       each_strongly_connected_component_from(target) {|ns|
+#         if ns.length != 1
+#           fs = ns.delete_if {|n| Array === n}
+#           raise TSort::Cyclic.new("cyclic dependencies: #{fs.join ', '}")
+#         end
+#         n = ns.first
+#         if Array === n
+#           outputs, inputs, block = n
+#           inputs_time = inputs.map {|f| File.mtime f}.max
+#           begin
+#             outputs_time = outputs.map {|f| File.mtime f}.min
+#           rescue Errno::ENOENT
+#             outputs_time = nil
+#           end
+#           if outputs_time == nil ||
+#              inputs_time != nil && outputs_time <= inputs_time
+#             sleep 1 if inputs_time != nil && inputs_time.to_i == Time.now.to_i
+#             block.call
+#           end
+#         end
+#       }
+#     end
+#     
+#     def tsort_each_child(node, &block)
+#       @dep[node].each(&block)
+#     end
+#     include TSort
+#   end
+#   
+#   def command(arg)
+#     print arg, "\n"
+#     system arg
+#   end
+#   
+#   m = Make.new
+#   m.rule(%w[t1]) { command 'date > t1' }
+#   m.rule(%w[t2]) { command 'date > t2' }
+#   m.rule(%w[t3]) { command 'date > t3' }
+#   m.rule(%w[t4], %w[t1 t3]) { command 'cat t1 t3 > t4' }
+#   m.rule(%w[t5], %w[t4 t2]) { command 'cat t4 t2 > t5' }
+#   m.build('t5')
+#
+# == Bugs
+#
+# * 'tsort.rb' is wrong name because this library uses
+#   Tarjan's algorithm for strongly connected components.
+#   Although 'strongly_connected_components.rb' is correct but too long.
+#
+# == References
+#
+# R. E. Tarjan, "Depth First Search and Linear Graph Algorithms",
+# <em>SIAM Journal on Computing</em>, Vol. 1, No. 2, pp. 146-160, June 1972.
+#
+
+module TSort
+  class Cyclic < StandardError
+  end
+
+  #
+  # Returns a topologically sorted array of nodes.
+  # The array is sorted from children to parents, i.e.
+  # the first element has no child and the last node has no parent.
+  #
+  # If there is a cycle, TSort::Cyclic is raised.
+  #
+  def tsort
+    result = []
+    tsort_each {|element| result << element}
+    result
+  end
+
+  #
+  # The iterator version of the #tsort method.
+  # <tt><em>obj</em>.tsort_each</tt> is similar to <tt><em>obj</em>.tsort.each</tt>, but
+  # modification of _obj_ during the iteration may lead to unexpected results.
+  #
+  # #tsort_each returns +nil+.
+  # If there is a cycle, TSort::Cyclic is raised.
+  #
+  def tsort_each # :yields: node
+    each_strongly_connected_component {|component|
+      if component.size == 1
+        yield component.first
+      else
+        raise Cyclic.new("topological sort failed: #{component.inspect}")
+      end
+    }
+  end
+
+  #
+  # Returns strongly connected components as an array of arrays of nodes.
+  # The array is sorted from children to parents.
+  # Each elements of the array represents a strongly connected component.
+  #
+  def strongly_connected_components
+    result = []
+    each_strongly_connected_component {|component| result << component}
+    result
+  end
+
+  #
+  # The iterator version of the #strongly_connected_components method.
+  # <tt><em>obj</em>.each_strongly_connected_component</tt> is similar to
+  # <tt><em>obj</em>.strongly_connected_components.each</tt>, but
+  # modification of _obj_ during the iteration may lead to unexpected results.
+  #
+  #
+  # #each_strongly_connected_component returns +nil+.
+  #
+  def each_strongly_connected_component # :yields: nodes
+    id_map = {}
+    stack = []
+    tsort_each_node {|node|
+      unless id_map.include? node
+        each_strongly_connected_component_from(node, id_map, stack) {|c|
+          yield c
+        }
+      end
+    }
+    nil
+  end
+
+  #
+  # Iterates over strongly connected component in the subgraph reachable from 
+  # _node_.
+  #
+  # Return value is unspecified.
+  #
+  # #each_strongly_connected_component_from doesn't call #tsort_each_node.
+  #
+  def each_strongly_connected_component_from(node, id_map={}, stack=[]) # :yields: nodes
+    minimum_id = node_id = id_map[node] = id_map.size
+    stack_length = stack.length
+    stack << node
+
+    tsort_each_child(node) {|child|
+      if id_map.include? child
+        child_id = id_map[child]
+        minimum_id = child_id if child_id && child_id < minimum_id
+      else
+        sub_minimum_id =
+          each_strongly_connected_component_from(child, id_map, stack) {|c|
+            yield c
+          }
+        minimum_id = sub_minimum_id if sub_minimum_id < minimum_id
+      end
+    }
+
+    if node_id == minimum_id
+      component = stack.slice!(stack_length .. -1)
+      component.each {|n| id_map[n] = nil}
+      yield component
+    end
+
+    minimum_id
+  end
+
+  #
+  # Should be implemented by a extended class.
+  #
+  # #tsort_each_node is used to iterate for all nodes over a graph.
+  #
+  def tsort_each_node # :yields: node
+    raise NotImplementedError.new
+  end
+
+  #
+  # Should be implemented by a extended class.
+  #
+  # #tsort_each_child is used to iterate for child nodes of _node_.
+  #
+  def tsort_each_child(node) # :yields: child
+    raise NotImplementedError.new
+  end
+end
+
+if __FILE__ == $0
+  require 'test/unit'
+
+  class TSortHash < Hash # :nodoc:
+    include TSort
+    alias tsort_each_node each_key
+    def tsort_each_child(node, &block)
+      fetch(node).each(&block)
+    end
+  end
+
+  class TSortArray < Array # :nodoc:
+    include TSort
+    alias tsort_each_node each_index
+    def tsort_each_child(node, &block)
+      fetch(node).each(&block)
+    end
+  end
+
+  class TSortTest < Test::Unit::TestCase # :nodoc:
+    def test_dag
+      h = TSortHash[{1=>[2, 3], 2=>[3], 3=>[]}]
+      assert_equal([3, 2, 1], h.tsort)
+      assert_equal([[3], [2], [1]], h.strongly_connected_components)
+    end
+
+    def test_cycle
+      h = TSortHash[{1=>[2], 2=>[3, 4], 3=>[2], 4=>[]}]
+      assert_equal([[4], [2, 3], [1]],
+        h.strongly_connected_components.map {|nodes| nodes.sort})
+      assert_raise(TSort::Cyclic) { h.tsort }
+    end
+
+    def test_array
+      a = TSortArray[[1], [0], [0], [2]]
+      assert_equal([[0, 1], [2], [3]],
+        a.strongly_connected_components.map {|nodes| nodes.sort})
+
+      a = TSortArray[[], [0]]
+      assert_equal([[0], [1]],
+        a.strongly_connected_components.map {|nodes| nodes.sort})
+    end
+  end
+
+end
+
diff --git a/ruby_1_8_6/lib/un.rb b/ruby_1_8_6/lib/un.rb
new file mode 100644
index 0000000000..9bf6c13146
--- /dev/null
+++ b/ruby_1_8_6/lib/un.rb
@@ -0,0 +1,235 @@
+# 
+# = un.rb
+# 
+# Copyright (c) 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+# 
+# This program is free software.
+# You can distribute/modify this program under the same terms of Ruby.
+# 
+# == Utilities to replace common UNIX commands in Makefiles etc
+#
+# == SYNOPSIS
+#
+#   ruby -run -e cp -- [OPTION] SOURCE DEST
+#   ruby -run -e ln -- [OPTION] TARGET LINK_NAME
+#   ruby -run -e mv -- [OPTION] SOURCE DEST
+#   ruby -run -e rm -- [OPTION] FILE
+#   ruby -run -e mkdir -- [OPTION] DIRS
+#   ruby -run -e rmdir -- [OPTION] DIRS
+#   ruby -run -e install -- [OPTION] SOURCE DEST
+#   ruby -run -e chmod -- [OPTION] OCTAL-MODE FILE
+#   ruby -run -e touch -- [OPTION] FILE
+#   ruby -run -e help [COMMAND]
+
+require "fileutils"
+require "optparse"
+
+module FileUtils
+#  @fileutils_label = ""
+  @fileutils_output = $stdout
+end
+
+def setup(options = "")
+  ARGV.map! do |x|
+    case x
+    when /^-/
+      x.delete "^-#{options}v"
+    when /[*?\[{]/
+      Dir[x]
+    else
+      x
+    end
+  end
+  ARGV.flatten!
+  ARGV.delete_if{|x| x == "-"}
+  opt_hash = {}
+  OptionParser.new do |o|
+    options.scan(/.:?/) do |s|
+      o.on("-" + s.tr(":", " ")) do |val|
+        opt_hash[s.delete(":").intern] = val
+      end
+    end
+    o.on("-v") do opt_hash[:verbose] = true end
+    o.parse!
+  end
+  yield ARGV, opt_hash
+end
+
+##
+# Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY
+#
+#   ruby -run -e cp -- [OPTION] SOURCE DEST
+#
+#   -p		preserve file attributes if possible
+#   -r		copy recursively
+#   -v		verbose
+#
+
+def cp
+  setup("pr") do |argv, options|
+    cmd = "cp"
+    cmd += "_r" if options.delete :r
+    options[:preserve] = true if options.delete :p
+    dest = argv.pop
+    argv = argv[0] if argv.size == 1
+    FileUtils.send cmd, argv, dest, options
+  end
+end
+
+##
+# Create a link to the specified TARGET with LINK_NAME.
+#
+#   ruby -run -e ln -- [OPTION] TARGET LINK_NAME
+#
+#   -s		make symbolic links instead of hard links
+#   -f		remove existing destination files
+#   -v		verbose
+#
+
+def ln
+  setup("sf") do |argv, options|
+    cmd = "ln"
+    cmd += "_s" if options.delete :s
+    options[:force] = true if options.delete :f
+    dest = argv.pop
+    argv = argv[0] if argv.size == 1
+    FileUtils.send cmd, argv, dest, options
+  end
+end
+
+##
+# Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.
+#
+#   ruby -run -e mv -- [OPTION] SOURCE DEST
+#
+#   -v		verbose
+#
+
+def mv
+  setup do |argv, options|
+    dest = argv.pop
+    argv = argv[0] if argv.size == 1
+    FileUtils.mv argv, dest, options
+  end
+end
+
+##
+# Remove the FILE
+#
+#   ruby -run -e rm -- [OPTION] FILE
+#
+#   -f		ignore nonexistent files
+#   -r		remove the contents of directories recursively
+#   -v		verbose
+#
+
+def rm
+  setup("fr") do |argv, options|
+    cmd = "rm"
+    cmd += "_r" if options.delete :r
+    options[:force] = true if options.delete :f
+    FileUtils.send cmd, argv, options
+  end
+end
+
+##
+# Create the DIR, if they do not already exist.
+#
+#   ruby -run -e mkdir -- [OPTION] DIR
+#
+#   -p		no error if existing, make parent directories as needed
+#   -v		verbose
+#
+
+def mkdir
+  setup("p") do |argv, options|
+    cmd = "mkdir"
+    cmd += "_p" if options.delete :p
+    FileUtils.send cmd, argv, options
+  end
+end
+
+##
+# Remove the DIR.
+#
+#   ruby -run -e rmdir -- [OPTION] DIR
+#
+#   -v		verbose
+#
+
+def rmdir
+  setup do |argv, options|
+    FileUtils.rmdir argv, options
+  end
+end
+
+##
+# Copy SOURCE to DEST.
+#
+#   ruby -run -e install -- [OPTION] SOURCE DEST
+#
+#   -p		apply access/modification times of SOURCE files to
+#  		corresponding destination files
+#   -m		set permission mode (as in chmod), instead of 0755
+#   -v		verbose
+#
+
+def install
+  setup("pm:") do |argv, options|
+    options[:mode] = (mode = options.delete :m) ? mode.oct : 0755
+    options[:preserve] = true if options.delete :p
+    dest = argv.pop
+    argv = argv[0] if argv.size == 1
+    FileUtils.install argv, dest, options
+  end
+end
+
+##
+# Change the mode of each FILE to OCTAL-MODE.
+#
+#   ruby -run -e chmod -- [OPTION] OCTAL-MODE FILE
+#
+#   -v		verbose
+#
+
+def chmod
+  setup do |argv, options|
+    mode = argv.shift.oct
+    FileUtils.chmod mode, argv, options
+  end
+end
+
+##
+# Update the access and modification times of each FILE to the current time.
+#
+#   ruby -run -e touch -- [OPTION] FILE
+#
+#   -v		verbose
+#
+
+def touch
+  setup do |argv, options|
+    FileUtils.touch argv, options
+  end
+end
+
+##
+# Display help message.
+#
+#   ruby -run -e help [COMMAND]
+#
+
+def help
+  setup do |argv,|
+    all = argv.empty?
+    open(__FILE__) do |me|
+      while me.gets("##\n")
+	if help = me.gets("\n\n")
+	  if all or argv.delete help[/-e \w+/].sub(/-e /, "")
+	    print help.gsub(/^# ?/, "")
+	  end
+	end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/uri.rb b/ruby_1_8_6/lib/uri.rb
new file mode 100644
index 0000000000..09c4f5fbcf
--- /dev/null
+++ b/ruby_1_8_6/lib/uri.rb
@@ -0,0 +1,28 @@
+#
+# URI support for Ruby
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# Documentation:: Akira Yamada <akira@ruby-lang.org>, Dmitry V. Sabanin <sdmitry@lrn.ru>
+# License:: 
+#  Copyright (c) 2001 akira yamada <akira@ruby-lang.org>
+#  You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+# 
+# See URI for documentation
+#
+
+module URI
+  # :stopdoc:
+  VERSION_CODE = '000911'.freeze
+  VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
+  # :startdoc:
+
+end
+
+require 'uri/common'
+require 'uri/generic'
+require 'uri/ftp'
+require 'uri/http'
+require 'uri/https'
+require 'uri/ldap'
+require 'uri/mailto'
diff --git a/ruby_1_8_6/lib/uri/common.rb b/ruby_1_8_6/lib/uri/common.rb
new file mode 100644
index 0000000000..f74f0eb2e1
--- /dev/null
+++ b/ruby_1_8_6/lib/uri/common.rb
@@ -0,0 +1,611 @@
+# = uri/common.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# Revision:: $Id$
+# License:: 
+#   You can redistribute it and/or modify it under the same term as Ruby.
+#
+
+module URI
+  module REGEXP
+    #
+    # Patterns used to parse URI's
+    #
+    module PATTERN
+      # :stopdoc:
+
+      # RFC 2396 (URI Generic Syntax)
+      # RFC 2732 (IPv6 Literal Addresses in URL's)
+      # RFC 2373 (IPv6 Addressing Architecture)
+
+      # alpha         = lowalpha | upalpha
+      ALPHA = "a-zA-Z"
+      # alphanum      = alpha | digit
+      ALNUM = "#{ALPHA}\\d"
+
+      # hex           = digit | "A" | "B" | "C" | "D" | "E" | "F" |
+      #                         "a" | "b" | "c" | "d" | "e" | "f"
+      HEX     = "a-fA-F\\d"
+      # escaped       = "%" hex hex
+      ESCAPED = "%[#{HEX}]{2}"
+      # mark          = "-" | "_" | "." | "!" | "~" | "*" | "'" |
+      #                 "(" | ")"
+      # unreserved    = alphanum | mark
+      UNRESERVED = "-_.!~*'()#{ALNUM}"
+      # reserved      = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+      #                 "$" | ","
+      # reserved      = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | 
+      #                 "$" | "," | "[" | "]" (RFC 2732)
+      RESERVED = ";/?:@&=+$,\\[\\]"
+
+      # uric          = reserved | unreserved | escaped
+      URIC = "(?:[#{UNRESERVED}#{RESERVED}]|#{ESCAPED})"
+      # uric_no_slash = unreserved | escaped | ";" | "?" | ":" | "@" |
+      #                 "&" | "=" | "+" | "$" | ","
+      URIC_NO_SLASH = "(?:[#{UNRESERVED};?:@&=+$,]|#{ESCAPED})"
+      # query         = *uric
+      QUERY = "#{URIC}*"
+      # fragment      = *uric
+      FRAGMENT = "#{URIC}*"
+
+      # domainlabel   = alphanum | alphanum *( alphanum | "-" ) alphanum
+      DOMLABEL = "(?:[#{ALNUM}](?:[-#{ALNUM}]*[#{ALNUM}])?)"
+      # toplabel      = alpha | alpha *( alphanum | "-" ) alphanum
+      TOPLABEL = "(?:[#{ALPHA}](?:[-#{ALNUM}]*[#{ALNUM}])?)"
+      # hostname      = *( domainlabel "." ) toplabel [ "." ]
+      HOSTNAME = "(?:#{DOMLABEL}\\.)*#{TOPLABEL}\\.?"
+
+      # RFC 2373, APPENDIX B:
+      # IPv6address = hexpart [ ":" IPv4address ]
+      # IPv4address   = 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT
+      # hexpart = hexseq | hexseq "::" [ hexseq ] | "::" [ hexseq ]
+      # hexseq  = hex4 *( ":" hex4)
+      # hex4    = 1*4HEXDIG
+      #
+      # XXX: This definition has a flaw. "::" + IPv4address must be
+      # allowed too.  Here is a replacement.
+      #
+      # IPv4address = 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT "." 1*3DIGIT
+      IPV4ADDR = "\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}"
+      # hex4     = 1*4HEXDIG
+      HEX4 = "[#{HEX}]{1,4}"
+      # lastpart = hex4 | IPv4address
+      LASTPART = "(?:#{HEX4}|#{IPV4ADDR})"
+      # hexseq1  = *( hex4 ":" ) hex4
+      HEXSEQ1 = "(?:#{HEX4}:)*#{HEX4}"
+      # hexseq2  = *( hex4 ":" ) lastpart
+      HEXSEQ2 = "(?:#{HEX4}:)*#{LASTPART}"
+      # IPv6address = hexseq2 | [ hexseq1 ] "::" [ hexseq2 ]
+      IPV6ADDR = "(?:#{HEXSEQ2}|(?:#{HEXSEQ1})?::(?:#{HEXSEQ2})?)"
+
+      # IPv6prefix  = ( hexseq1 | [ hexseq1 ] "::" [ hexseq1 ] ) "/" 1*2DIGIT
+      # unused
+
+      # ipv6reference = "[" IPv6address "]" (RFC 2732)
+      IPV6REF = "\\[#{IPV6ADDR}\\]"
+
+      # host          = hostname | IPv4address
+      # host          = hostname | IPv4address | IPv6reference (RFC 2732)
+      HOST = "(?:#{HOSTNAME}|#{IPV4ADDR}|#{IPV6REF})"
+      # port          = *digit
+      PORT = '\d*'
+      # hostport      = host [ ":" port ]
+      HOSTPORT = "#{HOST}(?::#{PORT})?"
+
+      # userinfo      = *( unreserved | escaped |
+      #                    ";" | ":" | "&" | "=" | "+" | "$" | "," )
+      USERINFO = "(?:[#{UNRESERVED};:&=+$,]|#{ESCAPED})*"
+
+      # pchar         = unreserved | escaped |
+      #                 ":" | "@" | "&" | "=" | "+" | "$" | ","
+      PCHAR = "(?:[#{UNRESERVED}:@&=+$,]|#{ESCAPED})"
+      # param         = *pchar
+      PARAM = "#{PCHAR}*"
+      # segment       = *pchar *( ";" param )
+      SEGMENT = "#{PCHAR}*(?:;#{PARAM})*"
+      # path_segments = segment *( "/" segment )
+      PATH_SEGMENTS = "#{SEGMENT}(?:/#{SEGMENT})*"
+
+      # server        = [ [ userinfo "@" ] hostport ]
+      SERVER = "(?:#{USERINFO}@)?#{HOSTPORT}"
+      # reg_name      = 1*( unreserved | escaped | "$" | "," |
+      #                     ";" | ":" | "@" | "&" | "=" | "+" )
+      REG_NAME = "(?:[#{UNRESERVED}$,;+@&=+]|#{ESCAPED})+"
+      # authority     = server | reg_name
+      AUTHORITY = "(?:#{SERVER}|#{REG_NAME})"
+
+      # rel_segment   = 1*( unreserved | escaped |
+      #                     ";" | "@" | "&" | "=" | "+" | "$" | "," )
+      REL_SEGMENT = "(?:[#{UNRESERVED};@&=+$,]|#{ESCAPED})+"
+
+      # scheme        = alpha *( alpha | digit | "+" | "-" | "." )
+      SCHEME = "[#{ALPHA}][-+.#{ALPHA}\\d]*"
+
+      # abs_path      = "/"  path_segments
+      ABS_PATH = "/#{PATH_SEGMENTS}"
+      # rel_path      = rel_segment [ abs_path ]
+      REL_PATH = "#{REL_SEGMENT}(?:#{ABS_PATH})?"
+      # net_path      = "//" authority [ abs_path ]
+      NET_PATH   = "//#{AUTHORITY}(?:#{ABS_PATH})?"
+
+      # hier_part     = ( net_path | abs_path ) [ "?" query ]
+      HIER_PART   = "(?:#{NET_PATH}|#{ABS_PATH})(?:\\?(?:#{QUERY}))?"
+      # opaque_part   = uric_no_slash *uric
+      OPAQUE_PART = "#{URIC_NO_SLASH}#{URIC}*"
+
+      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+      ABS_URI   = "#{SCHEME}:(?:#{HIER_PART}|#{OPAQUE_PART})"
+      # relativeURI   = ( net_path | abs_path | rel_path ) [ "?" query ]
+      REL_URI = "(?:#{NET_PATH}|#{ABS_PATH}|#{REL_PATH})(?:\\?#{QUERY})?"
+
+      # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+      URI_REF = "(?:#{ABS_URI}|#{REL_URI})?(?:##{FRAGMENT})?"
+
+      # XXX:
+      X_ABS_URI = "
+        (#{PATTERN::SCHEME}):                     (?# 1: scheme)
+        (?:
+           (#{PATTERN::OPAQUE_PART})              (?# 2: opaque)
+        |
+           (?:(?:
+             //(?:
+                 (?:(?:(#{PATTERN::USERINFO})@)?  (?# 3: userinfo)
+                   (?:(#{PATTERN::HOST})(?::(\\d*))?))?(?# 4: host, 5: port)
+               |
+                 (#{PATTERN::REG_NAME})           (?# 6: registry)
+               )
+             |
+             (?!//))                              (?# XXX: '//' is the mark for hostport)
+             (#{PATTERN::ABS_PATH})?              (?# 7: path)
+           )(?:\\?(#{PATTERN::QUERY}))?           (?# 8: query)
+        )
+        (?:\\#(#{PATTERN::FRAGMENT}))?            (?# 9: fragment)
+      "
+      X_REL_URI = "
+        (?:
+          (?:
+            //
+            (?:
+              (?:(#{PATTERN::USERINFO})@)?       (?# 1: userinfo)
+                (#{PATTERN::HOST})?(?::(\\d*))?  (?# 2: host, 3: port)
+            |
+              (#{PATTERN::REG_NAME})             (?# 4: registry)
+            )
+          )
+        |
+          (#{PATTERN::REL_SEGMENT})              (?# 5: rel_segment)
+        )?
+        (#{PATTERN::ABS_PATH})?                  (?# 6: abs_path)
+        (?:\\?(#{PATTERN::QUERY}))?              (?# 7: query)
+        (?:\\#(#{PATTERN::FRAGMENT}))?           (?# 8: fragment)
+      "
+      # :startdoc:
+    end # PATTERN
+
+    # :stopdoc:
+
+    # for URI::split
+    ABS_URI = Regexp.new('^' + PATTERN::X_ABS_URI + '$', #'
+                         Regexp::EXTENDED, 'N').freeze
+    REL_URI = Regexp.new('^' + PATTERN::X_REL_URI + '$', #'
+                         Regexp::EXTENDED, 'N').freeze
+
+    # for URI::extract
+    URI_REF     = Regexp.new(PATTERN::URI_REF, false, 'N').freeze
+    ABS_URI_REF = Regexp.new(PATTERN::X_ABS_URI, Regexp::EXTENDED, 'N').freeze
+    REL_URI_REF = Regexp.new(PATTERN::X_REL_URI, Regexp::EXTENDED, 'N').freeze
+
+    # for URI::escape/unescape
+    ESCAPED = Regexp.new(PATTERN::ESCAPED, false, 'N').freeze
+    UNSAFE  = Regexp.new("[^#{PATTERN::UNRESERVED}#{PATTERN::RESERVED}]",
+                         false, 'N').freeze
+
+    # for Generic#initialize
+    SCHEME   = Regexp.new("^#{PATTERN::SCHEME}$", false, 'N').freeze #"
+    USERINFO = Regexp.new("^#{PATTERN::USERINFO}$", false, 'N').freeze #"
+    HOST     = Regexp.new("^#{PATTERN::HOST}$", false, 'N').freeze #"
+    PORT     = Regexp.new("^#{PATTERN::PORT}$", false, 'N').freeze #"
+    OPAQUE   = Regexp.new("^#{PATTERN::OPAQUE_PART}$", false, 'N').freeze #"
+    REGISTRY = Regexp.new("^#{PATTERN::REG_NAME}$", false, 'N').freeze #"
+    ABS_PATH = Regexp.new("^#{PATTERN::ABS_PATH}$", false, 'N').freeze #"
+    REL_PATH = Regexp.new("^#{PATTERN::REL_PATH}$", false, 'N').freeze #"
+    QUERY    = Regexp.new("^#{PATTERN::QUERY}$", false, 'N').freeze #"
+    FRAGMENT = Regexp.new("^#{PATTERN::FRAGMENT}$", false, 'N').freeze #"
+    # :startdoc:
+  end # REGEXP
+
+  module Util # :nodoc:
+    def make_components_hash(klass, array_hash)
+      tmp = {}
+      if array_hash.kind_of?(Array) &&
+          array_hash.size == klass.component.size - 1
+        klass.component[1..-1].each_index do |i|
+          begin
+            tmp[klass.component[i + 1]] = array_hash[i].clone
+          rescue TypeError
+            tmp[klass.component[i + 1]] = array_hash[i]
+          end
+        end
+
+      elsif array_hash.kind_of?(Hash)
+        array_hash.each do |key, value|
+          begin
+            tmp[key] = value.clone
+          rescue TypeError
+            tmp[key] = value
+          end
+        end
+      else
+        raise ArgumentError, 
+          "expected Array of or Hash of components of #{klass.to_s} (#{klass.component[1..-1].join(', ')})"
+      end
+      tmp[:scheme] = klass.to_s.sub(/\A.*::/, '').downcase
+
+      return tmp
+    end
+    module_function :make_components_hash
+  end
+
+  module Escape
+    include REGEXP
+
+    #
+    # == Synopsis
+    #
+    #   URI.escape(str [, unsafe])
+    #
+    # == Args
+    #
+    # +str+::
+    #   String to replaces in.
+    # +unsafe+::
+    #   Regexp that matches all symbols that must be replaced with codes.
+    #   By default uses <tt>REGEXP::UNSAFE</tt>.
+    #   When this argument is a String, it represents a character set.
+    #
+    # == Description
+    #
+    # Escapes the string, replacing all unsafe characters with codes.
+    #
+    # == Usage
+    #
+    #   require 'uri'
+    #
+    #   enc_uri = URI.escape("http://example.com/?a=\11\15")
+    #   p enc_uri
+    #   # => "http://example.com/?a=%09%0D"
+    #
+    #   p URI.unescape(enc_uri)
+    #   # => "http://example.com/?a=\t\r"
+    #
+    #   p URI.escape("@?@!", "!?")
+    #   # => "@%3F@%21"
+    #
+    def escape(str, unsafe = UNSAFE)
+      unless unsafe.kind_of?(Regexp)
+        # perhaps unsafe is String object
+        unsafe = Regexp.new("[#{Regexp.quote(unsafe)}]", false, 'N')
+      end
+      str.gsub(unsafe) do |us|
+        tmp = ''
+        us.each_byte do |uc|
+          tmp << sprintf('%%%02X', uc)
+        end
+        tmp
+      end
+    end
+    alias encode escape
+    #
+    # == Synopsis
+    #
+    #   URI.unescape(str)
+    #
+    # == Args
+    #
+    # +str+::
+    #   Unescapes the string.
+    #
+    # == Usage
+    #
+    #   require 'uri'
+    #
+    #   enc_uri = URI.escape("http://example.com/?a=\11\15")
+    #   p enc_uri
+    #   # => "http://example.com/?a=%09%0D"
+    #
+    #   p URI.unescape(enc_uri)
+    #   # => "http://example.com/?a=\t\r"
+    #
+    def unescape(str)
+      str.gsub(ESCAPED) do
+        $&[1,2].hex.chr
+      end
+    end
+    alias decode unescape
+  end
+
+  include REGEXP
+  extend Escape
+
+  @@schemes = {}
+  
+  #
+  # Base class for all URI exceptions.
+  #
+  class Error < StandardError; end
+  #
+  # Not a URI.
+  #
+  class InvalidURIError < Error; end
+  #
+  # Not a URI component.
+  #
+  class InvalidComponentError < Error; end
+  #
+  # URI is valid, bad usage is not.
+  #
+  class BadURIError < Error; end
+
+  #
+  # == Synopsis
+  #
+  #   URI::split(uri)
+  #
+  # == Args
+  #
+  # +uri+::
+  #   String with URI.
+  #
+  # == Description
+  #
+  # Splits the string on following parts and returns array with result:
+  #
+  #   * Scheme
+  #   * Userinfo
+  #   * Host
+  #   * Port
+  #   * Registry
+  #   * Path
+  #   * Opaque
+  #   * Query
+  #   * Fragment
+  # 
+  # == Usage
+  #
+  #   require 'uri'
+  #
+  #   p URI.split("http://www.ruby-lang.org/")
+  #   # => ["http", nil, "www.ruby-lang.org", nil, nil, "/", nil, nil, nil]
+  #
+  def self.split(uri)
+    case uri
+    when ''
+      # null uri
+
+    when ABS_URI
+      scheme, opaque, userinfo, host, port, 
+        registry, path, query, fragment = $~[1..-1]
+
+      # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+
+      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+      # hier_part     = ( net_path | abs_path ) [ "?" query ]
+      # opaque_part   = uric_no_slash *uric
+
+      # abs_path      = "/"  path_segments
+      # net_path      = "//" authority [ abs_path ]
+
+      # authority     = server | reg_name
+      # server        = [ [ userinfo "@" ] hostport ]
+
+      if !scheme
+        raise InvalidURIError, 
+          "bad URI(absolute but no scheme): #{uri}"
+      end
+      if !opaque && (!path && (!host && !registry))
+        raise InvalidURIError,
+          "bad URI(absolute but no path): #{uri}" 
+      end
+
+    when REL_URI
+      scheme = nil
+      opaque = nil
+
+      userinfo, host, port, registry, 
+        rel_segment, abs_path, query, fragment = $~[1..-1]
+      if rel_segment && abs_path
+        path = rel_segment + abs_path
+      elsif rel_segment
+        path = rel_segment
+      elsif abs_path
+        path = abs_path
+      end
+
+      # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+
+      # relativeURI   = ( net_path | abs_path | rel_path ) [ "?" query ]
+
+      # net_path      = "//" authority [ abs_path ]
+      # abs_path      = "/"  path_segments
+      # rel_path      = rel_segment [ abs_path ]
+
+      # authority     = server | reg_name
+      # server        = [ [ userinfo "@" ] hostport ]
+
+    else
+      raise InvalidURIError, "bad URI(is not URI?): #{uri}"
+    end
+
+    path = '' if !path && !opaque # (see RFC2396 Section 5.2)
+    ret = [
+      scheme, 
+      userinfo, host, port,         # X
+      registry,                        # X
+      path,                         # Y
+      opaque,                        # Y
+      query,
+      fragment
+    ]
+    return ret
+  end
+
+  #
+  # == Synopsis
+  #
+  #   URI::parse(uri_str)
+  #
+  # == Args
+  #
+  # +uri_str+::
+  #   String with URI.
+  #
+  # == Description
+  #
+  # Creates one of the URI's subclasses instance from the string.
+  #  
+  # == Raises
+  #
+  # URI::InvalidURIError
+  #   Raised if URI given is not a correct one.
+  #
+  # == Usage
+  #
+  #   require 'uri'
+  #
+  #   uri = URI.parse("http://www.ruby-lang.org/")
+  #   p uri
+  #   # => #<URI::HTTP:0x202281be URL:http://www.ruby-lang.org/>
+  #   p uri.scheme 
+  #   # => "http" 
+  #   p uri.host 
+  #   # => "www.ruby-lang.org" 
+  # 
+  def self.parse(uri)
+    scheme, userinfo, host, port, 
+      registry, path, opaque, query, fragment = self.split(uri)
+
+    if scheme && @@schemes.include?(scheme.upcase)
+      @@schemes[scheme.upcase].new(scheme, userinfo, host, port, 
+                                   registry, path, opaque, query, 
+                                   fragment)
+    else
+      Generic.new(scheme, userinfo, host, port, 
+                  registry, path, opaque, query, 
+                  fragment)
+    end
+  end
+
+  #
+  # == Synopsis
+  #
+  #   URI::join(str[, str, ...])
+  #
+  # == Args
+  #
+  # +str+::
+  #   String(s) to work with
+  #
+  # == Description
+  #
+  # Joins URIs.
+  #
+  # == Usage
+  #
+  #   require 'uri'
+  #
+  #   p URI.join("http://localhost/","main.rbx")
+  #   # => #<URI::HTTP:0x2022ac02 URL:http://localhost/main.rbx>
+  #
+  def self.join(*str)
+    u = self.parse(str[0])
+    str[1 .. -1].each do |x|
+      u = u.merge(x)
+    end
+    u
+  end
+
+  #
+  # == Synopsis
+  #
+  #   URI::extract(str[, schemes][,&blk])
+  #
+  # == Args
+  #
+  # +str+:: 
+  #   String to extract URIs from.
+  # +schemes+::
+  #   Limit URI matching to a specific schemes.
+  #
+  # == Description
+  #
+  # Extracts URIs from a string. If block given, iterates through all matched URIs.
+  # Returns nil if block given or array with matches.
+  #
+  # == Usage
+  #
+  #   require "uri"
+  #
+  #   URI.extract("text here http://foo.example.org/bla and here mailto:test@example.com and here also.")
+  #   # => ["http://foo.example.com/bla", "mailto:test@example.com"]
+  #
+  def self.extract(str, schemes = nil, &block)
+    if block_given?
+      str.scan(regexp(schemes)) { yield $& }
+      nil
+    else
+      result = []
+      str.scan(regexp(schemes)) { result.push $& }
+      result
+    end
+  end
+
+  #
+  # == Synopsis
+  #
+  #   URI::regexp([match_schemes])
+  #
+  # == Args
+  #
+  # +match_schemes+:: 
+  #   Array of schemes. If given, resulting regexp matches to URIs
+  #   whose scheme is one of the match_schemes.
+  # 
+  # == Description
+  # Returns a Regexp object which matches to URI-like strings.
+  # The Regexp object returned by this method includes arbitrary
+  # number of capture group (parentheses).  Never rely on it's number.
+  # 
+  # == Usage
+  #
+  #   require 'uri'
+  #
+  #   # extract first URI from html_string
+  #   html_string.slice(URI.regexp)
+  # 
+  #   # remove ftp URIs
+  #   html_string.sub(URI.regexp(['ftp'])
+  # 
+  #   # You should not rely on the number of parentheses
+  #   html_string.scan(URI.regexp) do |*matches|
+  #     p $&
+  #   end
+  #
+  def self.regexp(schemes = nil)
+    unless schemes
+      ABS_URI_REF
+    else
+      /(?=#{Regexp.union(*schemes)}:)#{PATTERN::X_ABS_URI}/xn
+    end
+  end
+
+end
+
+module Kernel
+  # alias for URI.parse.
+  #
+  # This method is introduced at 1.8.2.
+  def URI(uri_str) # :doc:
+    URI.parse(uri_str)
+  end
+  module_function :URI
+end
diff --git a/ruby_1_8_6/lib/uri/ftp.rb b/ruby_1_8_6/lib/uri/ftp.rb
new file mode 100644
index 0000000000..26109e4d27
--- /dev/null
+++ b/ruby_1_8_6/lib/uri/ftp.rb
@@ -0,0 +1,148 @@
+#
+# = uri/ftp.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+
+require 'uri/generic'
+
+module URI
+
+  #
+  # RFC1738 section 3.2.
+  #
+  class FTP < Generic
+    DEFAULT_PORT = 21
+
+    COMPONENT = [
+      :scheme, 
+      :userinfo, :host, :port,
+      :path, :typecode
+    ].freeze
+    #
+    # Typecode is, "a", "i" or "d". 
+    # As for "a" the text, as for "i" binary, 
+    # as for "d" the directory is displayed. 
+    # "A" with the text, as for "i" being binary, 
+    # is because the respective data type was called ASCII and 
+    # IMAGE with the protocol of FTP.
+    #
+    TYPECODE = ['a', 'i', 'd'].freeze
+    TYPECODE_PREFIX = ';type='.freeze
+
+    def self.new2(user, password, host, port, path, 
+                  typecode = nil, arg_check = true)
+      typecode = nil if typecode.size == 0
+      if typecode && !TYPECODE.include?(typecode)
+        raise ArgumentError,
+          "bad typecode is specified: #{typecode}"
+      end
+
+      # do escape
+
+      self.new('ftp',
+               [user, password], 
+               host, port, nil, 
+               typecode ? path + TYPECODE_PREFIX + typecode : path, 
+               nil, nil, nil, arg_check)
+    end
+
+    #
+    # == Description
+    #
+    # Creates a new URI::FTP object from components of URI::FTP with
+    # check.  It is scheme, userinfo, host, port, path and typecode. It
+    # provided by an Array or a Hash. typecode is "a", "i" or "d".
+    #
+    def self.build(args)
+      tmp = Util::make_components_hash(self, args)
+
+      if tmp[:typecode]
+        if tmp[:typecode].size == 1
+          tmp[:typecode] = TYPECODE_PREFIX + tmp[:typecode] 
+        end
+        tmp[:path] << tmp[:typecode]
+      end
+
+      return super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Create a new URI::FTP object from ``generic'' components with no
+    # check.
+    #
+    # == Usage
+    #
+    #   require 'uri'
+    #   p ftp = URI.parse("ftp://ftp.ruby-lang.org/pub/ruby/;type=d") 
+    #   # => #<URI::FTP:0x201fad08 URL:ftp://ftp.ruby-lang.org/pub/ruby/;type=d>
+    #   p ftp.typecode
+    #   # => "d"
+    #
+    def initialize(*arg)
+      super(*arg)
+      @typecode = nil
+      tmp = @path.index(TYPECODE_PREFIX)
+      if tmp
+        typecode = @path[tmp + TYPECODE_PREFIX.size..-1]
+        self.set_path(@path[0..tmp - 1])
+        
+        if arg[-1]
+          self.typecode = typecode
+        else
+          self.set_typecode(typecode)
+        end
+      end
+    end
+    attr_reader :typecode
+
+    def check_typecode(v)
+      if TYPECODE.include?(v)
+        return true
+      else
+        raise InvalidComponentError,
+          "bad typecode(expected #{TYPECODE.join(', ')}): #{v}"
+      end
+    end
+    private :check_typecode
+
+    def set_typecode(v)
+      @typecode = v
+    end
+    protected :set_typecode
+
+    def typecode=(typecode)
+      check_typecode(typecode)
+      set_typecode(typecode)
+      typecode
+    end
+
+    def merge(oth) # :nodoc:
+      tmp = super(oth)
+      if self != tmp
+        tmp.set_typecode(oth.typecode)
+      end
+
+      return tmp
+    end
+
+    def to_s
+      save_path = nil
+      if @typecode
+        save_path = @path
+        @path = @path + TYPECODE_PREFIX + @typecode
+      end
+      str = super
+      if @typecode
+        @path = save_path
+      end
+
+      return str
+    end
+  end
+  @@schemes['FTP'] = FTP
+end
diff --git a/ruby_1_8_6/lib/uri/generic.rb b/ruby_1_8_6/lib/uri/generic.rb
new file mode 100644
index 0000000000..2b66adeb93
--- /dev/null
+++ b/ruby_1_8_6/lib/uri/generic.rb
@@ -0,0 +1,1121 @@
+#
+# = uri/generic.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+
+require 'uri/common'
+
+module URI
+  
+  #
+  # Base class for all URI classes.
+  # Implements generic URI syntax as per RFC 2396.
+  #
+  class Generic
+    include URI
+    include REGEXP
+
+    DEFAULT_PORT = nil
+
+    #
+    # Returns default port
+    #
+    def self.default_port
+      self::DEFAULT_PORT
+    end
+
+    def default_port
+      self.class.default_port
+    end
+
+    COMPONENT = [
+      :scheme, 
+      :userinfo, :host, :port, :registry, 
+      :path, :opaque, 
+      :query, 
+      :fragment
+    ].freeze
+
+    #
+    # Components of the URI in the order.
+    #
+    def self.component
+      self::COMPONENT
+    end
+
+    USE_REGISTRY = false
+
+    #
+    # DOC: FIXME!
+    #
+    def self.use_registry
+      self::USE_REGISTRY
+    end
+
+    #
+    # == Synopsis
+    #
+    # See #new
+    #
+    # == Description
+    #
+    # At first, tries to create a new URI::Generic instance using
+    # URI::Generic::build. But, if exception URI::InvalidComponentError is raised, 
+    # then it URI::Escape.escape all URI components and tries again.
+    #
+    #
+    def self.build2(args)
+      begin
+        return self.build(args)
+      rescue InvalidComponentError
+        if args.kind_of?(Array)
+          return self.build(args.collect{|x| 
+            if x
+              URI.escape(x)
+            else
+              x
+            end
+          })
+        elsif args.kind_of?(Hash)
+          tmp = {}
+          args.each do |key, value|
+            tmp[key] = if value
+                URI.escape(value)
+              else
+                value
+              end
+          end
+          return self.build(tmp)
+        end
+      end
+    end
+
+    #
+    # == Synopsis
+    #
+    # See #new
+    #
+    # == Description
+    #
+    # Creates a new URI::Generic instance from components of URI::Generic
+    # with check.  Components are: scheme, userinfo, host, port, registry, path,
+    # opaque, query and fragment. You can provide arguments either by an Array or a Hash.
+    # See #new for hash keys to use or for order of array items.
+    #
+    def self.build(args)
+      if args.kind_of?(Array) &&
+          args.size == ::URI::Generic::COMPONENT.size
+        tmp = args
+      elsif args.kind_of?(Hash)
+        tmp = ::URI::Generic::COMPONENT.collect do |c|
+          if args.include?(c)
+            args[c]
+          else
+            nil
+          end
+        end
+      else
+        raise ArgumentError, 
+        "expected Array of or Hash of components of #{self.class} (#{self.class.component.join(', ')})"
+      end
+
+      tmp << true
+      return self.new(*tmp)
+    end
+    #
+    # == Args
+    #
+    # +scheme+::
+    #   Protocol scheme, i.e. 'http','ftp','mailto' and so on.
+    # +userinfo+::
+    #   User name and password, i.e. 'sdmitry:bla'
+    # +host+::
+    #   Server host name
+    # +port+::
+    #   Server port
+    # +registry+::
+    #   DOC: FIXME!
+    # +path+::
+    #   Path on server
+    # +opaque+::
+    #   DOC: FIXME!
+    # +query+::
+    #   Query data
+    # +fragment+::
+    #   A part of URI after '#' sign
+    # +arg_check+::
+    #   Check arguments [false by default]
+    #
+    # == Description
+    #
+    # Creates a new URI::Generic instance from ``generic'' components without check.
+    #
+    def initialize(scheme, 
+                   userinfo, host, port, registry, 
+                   path, opaque, 
+                   query, 
+                   fragment,
+                   arg_check = false)
+      @scheme = nil
+      @user = nil
+      @password = nil
+      @host = nil
+      @port = nil
+      @path = nil
+      @query = nil
+      @opaque = nil
+      @registry = nil
+      @fragment = nil
+
+      if arg_check
+        self.scheme = scheme
+        self.userinfo = userinfo
+        self.host = host
+        self.port = port
+        self.path = path
+        self.query = query
+        self.opaque = opaque
+        self.registry = registry
+        self.fragment = fragment
+      else
+        self.set_scheme(scheme)
+        self.set_userinfo(userinfo)
+        self.set_host(host)
+        self.set_port(port)
+        self.set_path(path)
+        self.set_query(query)
+        self.set_opaque(opaque)
+        self.set_registry(registry)
+        self.set_fragment(fragment)
+      end
+      if @registry && !self.class.use_registry
+        raise InvalidURIError, 
+          "the scheme #{@scheme} does not accept registry part: #{@registry} (or bad hostname?)"
+      end
+      
+      @scheme.freeze if @scheme
+      self.set_path('') if !@path && !@opaque # (see RFC2396 Section 5.2)
+      self.set_port(self.default_port) if self.default_port && !@port
+    end
+    attr_reader :scheme
+    attr_reader :host
+    attr_reader :port
+    attr_reader :registry
+    attr_reader :path
+    attr_reader :query
+    attr_reader :opaque
+    attr_reader :fragment
+
+    # replace self by other URI object
+    def replace!(oth)
+      if self.class != oth.class
+        raise ArgumentError, "expected #{self.class} object"
+      end
+
+      component.each do |c|
+        self.__send__("#{c}=", oth.__send__(c))
+      end
+    end
+    private :replace!
+
+    def component
+      self.class.component
+    end
+
+    def check_scheme(v)
+      if v && SCHEME !~ v
+        raise InvalidComponentError,
+          "bad component(expected scheme component): #{v}"
+      end
+
+      return true
+    end
+    private :check_scheme
+
+    def set_scheme(v)
+      @scheme = v
+    end
+    protected :set_scheme
+
+    def scheme=(v)
+      check_scheme(v)
+      set_scheme(v)
+      v
+    end
+
+    def check_userinfo(user, password = nil)
+      if !password
+        user, password = split_userinfo(user)
+      end
+      check_user(user)
+      check_password(password, user)
+
+      return true
+    end
+    private :check_userinfo
+
+    def check_user(v)
+      if @registry || @opaque
+        raise InvalidURIError, 
+          "can not set user with registry or opaque"
+      end
+
+      return v unless v
+
+      if USERINFO !~ v
+        raise InvalidComponentError,
+          "bad component(expected userinfo component or user component): #{v}"
+      end
+
+      return true
+    end
+    private :check_user
+
+    def check_password(v, user = @user)
+      if @registry || @opaque
+        raise InvalidURIError, 
+          "can not set password with registry or opaque"
+      end
+      return v unless v
+
+      if !user
+        raise InvalidURIError,
+          "password component depends user component"
+      end
+
+      if USERINFO !~ v
+        raise InvalidComponentError,
+          "bad component(expected user component): #{v}"
+      end
+
+      return true
+    end
+    private :check_password
+
+    #
+    # Sets userinfo, argument is string like 'name:pass'
+    #
+    def userinfo=(userinfo)
+      if userinfo.nil?
+        return nil
+      end
+      check_userinfo(*userinfo)
+      set_userinfo(*userinfo)
+      # returns userinfo
+    end
+
+    def user=(user)
+      check_user(user)
+      set_user(user)
+      # returns user
+    end
+    
+    def password=(password)
+      check_password(password)
+      set_password(password)
+      # returns password
+    end
+
+    def set_userinfo(user, password = nil)
+      unless password 
+        user, password = split_userinfo(user)
+      end
+      @user     = user
+      @password = password if password
+
+      [@user, @password]
+    end
+    protected :set_userinfo
+
+    def set_user(v)
+      set_userinfo(v, @password)
+      v
+    end
+    protected :set_user
+
+    def set_password(v)
+      @password = v
+      # returns v
+    end
+    protected :set_password
+
+    def split_userinfo(ui)
+      return nil, nil unless ui
+      user, password = ui.split(/:/, 2)
+
+      return user, password
+    end
+    private :split_userinfo
+
+    def escape_userpass(v)
+      v = URI.escape(v, /[@:\/]/o) # RFC 1738 section 3.1 #/
+    end
+    private :escape_userpass
+
+    def userinfo
+      if @user.nil?
+        nil
+      elsif @password.nil?
+        @user
+      else
+        @user + ':' + @password
+      end
+    end
+
+    def user
+      @user
+    end
+
+    def password
+      @password
+    end
+
+    def check_host(v)
+      return v unless v
+
+      if @registry || @opaque
+        raise InvalidURIError, 
+          "can not set host with registry or opaque"
+      elsif HOST !~ v
+        raise InvalidComponentError,
+          "bad component(expected host component): #{v}"
+      end
+
+      return true
+    end
+    private :check_host
+
+    def set_host(v)
+      @host = v
+    end
+    protected :set_host
+
+    def host=(v)
+      check_host(v)
+      set_host(v)
+      v
+    end
+
+    def check_port(v)
+      return v unless v
+
+      if @registry || @opaque
+        raise InvalidURIError, 
+          "can not set port with registry or opaque"
+      elsif !v.kind_of?(Fixnum) && PORT !~ v
+        raise InvalidComponentError,
+          "bad component(expected port component): #{v}"
+      end
+
+      return true
+    end
+    private :check_port
+
+    def set_port(v)
+      unless !v || v.kind_of?(Fixnum)
+        if v.empty?
+          v = nil
+        else
+          v = v.to_i
+        end
+      end
+      @port = v
+    end
+    protected :set_port
+
+    def port=(v)
+      check_port(v)
+      set_port(v)
+      port
+    end
+
+    def check_registry(v)
+      return v unless v
+
+      # raise if both server and registry are not nil, because:
+      # authority     = server | reg_name
+      # server        = [ [ userinfo "@" ] hostport ]
+      if @host || @port || @user # userinfo = @user + ':' + @password
+        raise InvalidURIError, 
+          "can not set registry with host, port, or userinfo"
+      elsif v && REGISTRY !~ v
+        raise InvalidComponentError,
+          "bad component(expected registry component): #{v}"
+      end
+
+      return true
+    end
+    private :check_registry
+
+    def set_registry(v)
+      @registry = v
+    end
+    protected :set_registry
+
+    def registry=(v)
+      check_registry(v)
+      set_registry(v)
+      v
+    end
+
+    def check_path(v)
+      # raise if both hier and opaque are not nil, because:
+      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+      # hier_part     = ( net_path | abs_path ) [ "?" query ]
+      if v && @opaque
+        raise InvalidURIError, 
+          "path conflicts with opaque"
+      end
+
+      if @scheme
+        if v && v != '' && ABS_PATH !~ v
+          raise InvalidComponentError, 
+            "bad component(expected absolute path component): #{v}"
+        end
+      else
+        if v && v != '' && ABS_PATH !~ v && REL_PATH !~ v
+          raise InvalidComponentError, 
+            "bad component(expected relative path component): #{v}"
+        end
+      end
+
+      return true
+    end
+    private :check_path
+
+    def set_path(v)
+      @path = v
+    end
+    protected :set_path
+
+    def path=(v)
+      check_path(v)
+      set_path(v)
+      v
+    end
+
+    def check_query(v)
+      return v unless v
+
+      # raise if both hier and opaque are not nil, because:
+      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+      # hier_part     = ( net_path | abs_path ) [ "?" query ]
+      if @opaque
+        raise InvalidURIError, 
+          "query conflicts with opaque"
+      end
+
+      if v && v != '' && QUERY !~ v
+          raise InvalidComponentError, 
+            "bad component(expected query component): #{v}"
+        end
+
+      return true
+    end
+    private :check_query
+
+    def set_query(v)
+      @query = v
+    end
+    protected :set_query
+
+    def query=(v)
+      check_query(v)
+      set_query(v)
+      v
+    end
+
+    def check_opaque(v)
+      return v unless v
+
+      # raise if both hier and opaque are not nil, because:
+      # absoluteURI   = scheme ":" ( hier_part | opaque_part )
+      # hier_part     = ( net_path | abs_path ) [ "?" query ]
+      if @host || @port || @user || @path  # userinfo = @user + ':' + @password
+        raise InvalidURIError, 
+          "can not set opaque with host, port, userinfo or path"
+      elsif v && OPAQUE !~ v
+        raise InvalidComponentError,
+          "bad component(expected opaque component): #{v}"
+      end
+
+      return true
+    end
+    private :check_opaque
+
+    def set_opaque(v)
+      @opaque = v
+    end
+    protected :set_opaque
+
+    def opaque=(v)
+      check_opaque(v)
+      set_opaque(v)
+      v
+    end
+
+    def check_fragment(v)
+      return v unless v
+
+      if v && v != '' && FRAGMENT !~ v
+        raise InvalidComponentError, 
+          "bad component(expected fragment component): #{v}"
+      end
+
+      return true
+    end
+    private :check_fragment
+
+    def set_fragment(v)
+      @fragment = v
+    end
+    protected :set_fragment
+
+    def fragment=(v)
+      check_fragment(v)
+      set_fragment(v)
+      v
+    end
+
+    #
+    # Checks if URI has a path
+    #
+    def hierarchical?
+      if @path
+        true
+      else
+        false
+      end
+    end
+
+    #
+    # Checks if URI is an absolute one
+    #
+    def absolute?
+      if @scheme
+        true
+      else
+        false
+      end
+    end
+    alias absolute absolute?
+
+    #
+    # Checks if URI is relative
+    #
+    def relative?
+      !absolute?
+    end
+
+    def split_path(path)
+      path.split(%r{/+}, -1)
+    end
+    private :split_path
+
+    def merge_path(base, rel)
+      # RFC2396, Section 5.2, 5)
+      if rel[0] == ?/ #/
+        # RFC2396, Section 5.2, 5)
+        return rel
+
+      else
+        # RFC2396, Section 5.2, 6)
+        base_path = split_path(base)
+        rel_path  = split_path(rel)
+
+        # RFC2396, Section 5.2, 6), a)
+	base_path << '' if base_path.last == '..'
+	while i = base_path.index('..')
+	  base_path.slice!(i - 1, 2)
+        end
+        if base_path.empty?
+          base_path = [''] # keep '/' for root directory
+        else
+	  base_path.pop
+        end
+
+        # RFC2396, Section 5.2, 6), c)
+        # RFC2396, Section 5.2, 6), d)
+        rel_path.push('') if rel_path.last == '.' || rel_path.last == '..'
+        rel_path.delete('.')
+
+        # RFC2396, Section 5.2, 6), e)
+        tmp = []
+        rel_path.each do |x|
+          if x == '..' &&
+              !(tmp.empty? || tmp.last == '..')
+            tmp.pop
+          else
+            tmp << x
+          end
+        end
+
+        add_trailer_slash = true
+        while x = tmp.shift
+          if x == '..' && base_path.size > 1
+            # RFC2396, Section 4
+            # a .. or . in an absolute path has no special meaning
+            base_path.pop
+          else
+            # if x == '..'
+            #   valid absolute (but abnormal) path "/../..."
+            # else
+            #   valid absolute path
+            # end
+            base_path << x
+            tmp.each {|t| base_path << t}
+            add_trailer_slash = false
+            break
+          end
+        end
+        base_path.push('') if add_trailer_slash
+
+        return base_path.join('/')
+      end
+    end
+    private :merge_path
+
+    #
+    # == Args
+    #
+    # +oth+::
+    #    URI or String
+    #
+    # == Description
+    #
+    # Destructive form of #merge
+    #
+    # == Usage
+    #
+    #   require 'uri'
+    #
+    #   uri = URI.parse("http://my.example.com")
+    #   uri.merge!("/main.rbx?page=1")
+    #   p uri
+    #   # =>  #<URI::HTTP:0x2021f3b0 URL:http://my.example.com/main.rbx?page=1>
+    #
+    def merge!(oth)
+      t = merge(oth)
+      if self == t
+        nil
+      else
+        replace!(t)
+        self
+      end
+    end
+
+    #
+    # == Args
+    #
+    # +oth+::
+    #    URI or String
+    #
+    # == Description
+    #
+    # Merges two URI's.
+    #
+    # == Usage
+    #
+    #   require 'uri'
+    #
+    #   uri = URI.parse("http://my.example.com")
+    #   p uri.merge("/main.rbx?page=1")
+    #   # =>  #<URI::HTTP:0x2021f3b0 URL:http://my.example.com/main.rbx?page=1>
+    #
+    def merge(oth)
+      begin
+        base, rel = merge0(oth)
+      rescue
+        raise $!.class, $!.message
+      end
+
+      if base == rel
+        return base
+      end
+
+      authority = rel.userinfo || rel.host || rel.port
+
+      # RFC2396, Section 5.2, 2)
+      if (rel.path.nil? || rel.path.empty?) && !authority && !rel.query
+        base.set_fragment(rel.fragment) if rel.fragment
+        return base
+      end
+
+      base.set_query(nil)
+      base.set_fragment(nil)
+
+      # RFC2396, Section 5.2, 4)
+      if !authority
+        base.set_path(merge_path(base.path, rel.path)) if base.path && rel.path
+      else
+        # RFC2396, Section 5.2, 4)
+        base.set_path(rel.path) if rel.path
+      end
+
+      # RFC2396, Section 5.2, 7)
+      base.set_userinfo(rel.userinfo) if rel.userinfo
+      base.set_host(rel.host)         if rel.host
+      base.set_port(rel.port)         if rel.port
+      base.set_query(rel.query)       if rel.query
+      base.set_fragment(rel.fragment) if rel.fragment
+
+      return base
+    end # merge
+    alias + merge
+
+    # return base and rel.
+    # you can modify `base', but can not `rel'.
+    def merge0(oth)
+      case oth
+      when Generic
+      when String
+        oth = URI.parse(oth)
+      else
+        raise ArgumentError,
+          "bad argument(expected URI object or URI string)"
+      end
+
+      if self.relative? && oth.relative?
+        raise BadURIError, 
+          "both URI are relative"
+      end
+
+      if self.absolute? && oth.absolute?
+        #raise BadURIError, 
+        #  "both URI are absolute"
+        # hmm... should return oth for usability?
+        return oth, oth
+      end
+
+      if self.absolute?
+        return self.dup, oth
+      else
+        return oth, oth
+      end
+    end
+    private :merge0
+
+    def route_from_path(src, dst)
+      # RFC2396, Section 4.2
+      return '' if src == dst
+
+      src_path = split_path(src)
+      dst_path = split_path(dst)
+
+      # hmm... dst has abnormal absolute path, 
+      # like "/./", "/../", "/x/../", ...
+      if dst_path.include?('..') ||
+          dst_path.include?('.')
+        return dst.dup
+      end
+
+      src_path.pop
+
+      # discard same parts
+      while dst_path.first == src_path.first
+        break if dst_path.empty?
+
+        src_path.shift
+        dst_path.shift
+      end
+
+      tmp = dst_path.join('/')
+
+      # calculate
+      if src_path.empty?
+        if tmp.empty?
+          return './'
+        elsif dst_path.first.include?(':') # (see RFC2396 Section 5)
+          return './' + tmp
+        else
+          return tmp
+        end
+      end
+
+      return '../' * src_path.size + tmp
+    end
+    private :route_from_path
+
+    def route_from0(oth)
+      case oth
+      when Generic
+      when String
+        oth = URI.parse(oth)
+      else
+        raise ArgumentError,
+          "bad argument(expected URI object or URI string)"
+      end
+
+      if self.relative?
+        raise BadURIError, 
+          "relative URI: #{self}"
+      end
+      if oth.relative?
+        raise BadURIError, 
+          "relative URI: #{oth}"
+      end
+
+      if self.scheme != oth.scheme
+        return self, self.dup
+      end
+      rel = URI::Generic.new(nil, # it is relative URI
+                             self.userinfo, self.host, self.port, 
+                             self.registry, self.path, self.opaque,
+                             self.query, self.fragment)
+
+      if rel.userinfo != oth.userinfo ||
+          rel.host.to_s.downcase != oth.host.to_s.downcase ||
+          rel.port != oth.port
+	if self.userinfo.nil? && self.host.nil?
+	  return self, self.dup
+	end
+        rel.set_port(nil) if rel.port == oth.default_port
+        return rel, rel
+      end
+      rel.set_userinfo(nil)
+      rel.set_host(nil)
+      rel.set_port(nil)
+
+      if rel.path && rel.path == oth.path
+        rel.set_path('')
+        rel.set_query(nil) if rel.query == oth.query
+        return rel, rel
+      elsif rel.opaque && rel.opaque == oth.opaque
+        rel.set_opaque('')
+        rel.set_query(nil) if rel.query == oth.query
+        return rel, rel
+      end
+
+      # you can modify `rel', but can not `oth'.
+      return oth, rel
+    end
+    private :route_from0
+    #
+    # == Args
+    #
+    # +oth+::
+    #    URI or String
+    #
+    # == Description
+    #
+    # Calculates relative path from oth to self
+    #
+    # == Usage
+    #
+    #   require 'uri'
+    #
+    #   uri = URI.parse('http://my.example.com/main.rbx?page=1')
+    #   p uri.route_from('http://my.example.com')
+    #   #=> #<URI::Generic:0x20218858 URL:/main.rbx?page=1>
+    #
+    def route_from(oth)
+      # you can modify `rel', but can not `oth'.
+      begin
+        oth, rel = route_from0(oth)
+      rescue
+        raise $!.class, $!.message
+      end
+      if oth == rel
+        return rel
+      end
+
+      rel.set_path(route_from_path(oth.path, self.path))
+      if rel.path == './' && self.query
+        # "./?foo" -> "?foo"
+        rel.set_path('')
+      end
+
+      return rel
+    end
+
+    alias - route_from
+
+    #
+    # == Args
+    #
+    # +oth+::
+    #    URI or String
+    #
+    # == Description
+    #
+    # Calculates relative path to oth from self
+    #
+    # == Usage
+    #
+    #   require 'uri'
+    #
+    #   uri = URI.parse('http://my.example.com')
+    #   p uri.route_to('http://my.example.com/main.rbx?page=1')
+    #   #=> #<URI::Generic:0x2020c2f6 URL:/main.rbx?page=1>
+    #    
+    def route_to(oth)
+      case oth
+      when Generic
+      when String
+        oth = URI.parse(oth)
+      else
+        raise ArgumentError,
+          "bad argument(expected URI object or URI string)"
+      end
+
+      oth.route_from(self)
+    end
+
+    #
+    # Returns normalized URI
+    # 
+    def normalize
+      uri = dup
+      uri.normalize!
+      uri
+    end
+
+    #
+    # Destructive version of #normalize
+    #
+    def normalize!
+      if path && path == ''
+        set_path('/')
+      end
+      if host && host != host.downcase
+        set_host(self.host.downcase)
+      end        
+    end
+
+    def path_query
+      str = @path
+      if @query
+        str += '?' + @query
+      end
+      str
+    end
+    private :path_query
+
+    #
+    # Constructs String from URI
+    # 
+    def to_s
+      str = ''
+      if @scheme
+        str << @scheme
+        str << ':'
+      end
+
+      if @opaque
+        str << @opaque
+
+      else
+        if @registry
+          str << @registry
+        else
+          if @host
+            str << '//'
+          end
+          if self.userinfo
+            str << self.userinfo
+            str << '@'
+          end
+          if @host
+            str << @host
+          end
+          if @port && @port != self.default_port
+            str << ':'
+            str << @port.to_s
+          end
+        end
+
+        str << path_query
+      end
+
+      if @fragment
+        str << '#'
+        str << @fragment
+      end
+
+      str
+    end
+
+    #
+    # Compares to URI's
+    #
+    def ==(oth)
+      if self.class == oth.class
+        self.normalize.component_ary == oth.normalize.component_ary
+      else
+        false
+      end
+    end
+
+    def hash
+      self.component_ary.hash
+    end
+
+    def eql?(oth)
+      self.component_ary.eql?(oth.component_ary)
+    end
+
+=begin
+
+--- URI::Generic#===(oth)
+
+=end
+#    def ===(oth)
+#      raise NotImplementedError
+#    end
+
+=begin
+=end
+    def component_ary
+      component.collect do |x|
+        self.send(x)
+      end
+    end
+    protected :component_ary
+
+    # == Args
+    #
+    # +components+::
+    #    Multiple Symbol arguments defined in URI::HTTP
+    #
+    # == Description
+    #
+    # Selects specified components from URI
+    #
+    # == Usage
+    #
+    #   require 'uri'
+    #
+    #   uri = URI.parse('http://myuser:mypass@my.example.com/test.rbx')
+    #   p uri.select(:userinfo, :host, :path)
+    #   # => ["myuser:mypass", "my.example.com", "/test.rbx"]
+    #
+    def select(*components)
+      components.collect do |c|
+        if component.include?(c)
+          self.send(c)
+        else
+          raise ArgumentError, 
+            "expected of components of #{self.class} (#{self.class.component.join(', ')})"
+        end
+      end
+    end
+
+    def inspect
+      sprintf("#<%s:%#0x URL:%s>", self.class.to_s, self.object_id, self.to_s)
+    end
+
+    def coerce(oth)
+      case oth
+      when String
+        oth = URI.parse(oth)
+      else
+        super
+      end
+
+      return oth, self
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/uri/http.rb b/ruby_1_8_6/lib/uri/http.rb
new file mode 100644
index 0000000000..87eb8893f2
--- /dev/null
+++ b/ruby_1_8_6/lib/uri/http.rb
@@ -0,0 +1,100 @@
+#
+# = uri/http.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+
+require 'uri/generic'
+
+module URI
+
+  #
+  # The syntax of HTTP URIs is defined in RFC1738 section 3.3.
+  #
+  # Note that the Ruby URI library allows HTTP URLs containing usernames and
+  # passwords. This is not legal as per the RFC, but used to be 
+  # supported in Internet Explorer 5 and 6, before the MS04-004 security 
+  # update. See <URL:http://support.microsoft.com/kb/834489>.
+  #
+  class HTTP < Generic
+    DEFAULT_PORT = 80
+
+    COMPONENT = [
+      :scheme, 
+      :userinfo, :host, :port, 
+      :path, 
+      :query, 
+      :fragment
+    ].freeze
+
+    #
+    # == Description
+    #
+    # Create a new URI::HTTP object from components, with syntax checking.
+    #
+    # The components accepted are userinfo, host, port, path, query and
+    # fragment.
+    #
+    # The components should be provided either as an Array, or as a Hash 
+    # with keys formed by preceding the component names with a colon. 
+    #
+    # If an Array is used, the components must be passed in the order
+    # [userinfo, host, port, path, query, fragment].
+    #
+    # Example:
+    #
+    #     newuri = URI::HTTP.build({:host => 'www.example.com', 
+    #       :path> => '/foo/bar'})
+    #
+    #     newuri = URI::HTTP.build([nil, "www.example.com", nil, "/path", 
+    #       "query", 'fragment'])
+    #
+    # Currently, if passed userinfo components this method generates 
+    # invalid HTTP URIs as per RFC 1738.
+    #
+    def self.build(args)
+      tmp = Util::make_components_hash(self, args)
+      return super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Create a new URI::HTTP object from generic URI components as per
+    # RFC 2396. No HTTP-specific syntax checking (as per RFC 1738) is 
+    # performed.
+    #
+    # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+, 
+    # +opaque+, +query+ and +fragment+, in that order.
+    #
+    # Example:
+    #
+    #     uri = URI::HTTP.new(['http', nil, "www.example.com", nil, "/path",
+    #       "query", 'fragment'])
+    #
+    def initialize(*arg)
+      super(*arg)
+    end
+
+    #
+    # == Description
+    #
+    # Returns the full path for an HTTP request, as required by Net::HTTP::Get.
+    #
+    # If the URI contains a query, the full path is URI#path + '?' + URI#query.
+    # Otherwise, the path is simply URI#path.
+    #
+    def request_uri
+      r = path_query
+      if r[0] != ?/
+        r = '/' + r
+      end
+
+      r
+    end
+  end
+
+  @@schemes['HTTP'] = HTTP
+end
diff --git a/ruby_1_8_6/lib/uri/https.rb b/ruby_1_8_6/lib/uri/https.rb
new file mode 100644
index 0000000000..9761636304
--- /dev/null
+++ b/ruby_1_8_6/lib/uri/https.rb
@@ -0,0 +1,20 @@
+#
+# = uri/https.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+
+require 'uri/http'
+
+module URI
+
+  # The default port for HTTPS URIs is 443, and the scheme is 'https:' rather
+  # than 'http:'. Other than that, HTTPS URIs are identical to HTTP URIs;
+  # see URI::HTTP.
+  class HTTPS < HTTP
+    DEFAULT_PORT = 443
+  end
+  @@schemes['HTTPS'] = HTTPS
+end
diff --git a/ruby_1_8_6/lib/uri/ldap.rb b/ruby_1_8_6/lib/uri/ldap.rb
new file mode 100644
index 0000000000..163d2cda24
--- /dev/null
+++ b/ruby_1_8_6/lib/uri/ldap.rb
@@ -0,0 +1,190 @@
+#
+# = uri/ldap.rb
+#
+# Author:: 
+#  Takaaki Tateishi <ttate@jaist.ac.jp>
+#  Akira Yamada <akira@ruby-lang.org>
+# License:: 
+#   URI::LDAP is copyrighted free software by Takaaki Tateishi and Akira Yamada.
+#   You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+
+require 'uri/generic'
+
+module URI
+
+  #
+  # LDAP URI SCHEMA (described in RFC2255)
+  # ldap://<host>/<dn>[?<attrs>[?<scope>[?<filter>[?<extensions>]]]]
+  #
+  class LDAP < Generic
+
+    DEFAULT_PORT = 389
+    
+    COMPONENT = [
+      :scheme,
+      :host, :port,
+      :dn,
+      :attributes,
+      :scope,
+      :filter,
+      :extensions,
+    ].freeze
+
+    SCOPE = [
+      SCOPE_ONE = 'one',
+      SCOPE_SUB = 'sub',
+      SCOPE_BASE = 'base',
+    ].freeze
+
+    def self.build(args)
+      tmp = Util::make_components_hash(self, args)
+
+      if tmp[:dn]
+        tmp[:path] = tmp[:dn]
+      end
+
+      query = []
+      [:extensions, :filter, :scope, :attributes].collect do |x|
+        next if !tmp[x] && query.size == 0
+        query.unshift(tmp[x])
+      end
+
+      tmp[:query] = query.join('?')
+
+      return super(tmp)
+    end
+
+    def initialize(*arg)
+      super(*arg)
+
+      if @fragment
+        raise InvalidURIError, 'bad LDAP URL'
+      end
+
+      parse_dn
+      parse_query
+    end
+
+    def parse_dn
+      @dn = @path[1..-1]
+    end
+    private :parse_dn
+
+    def parse_query
+      @attributes = nil
+      @scope      = nil
+      @filter     = nil
+      @extensions = nil
+
+      if @query
+        attrs, scope, filter, extensions = @query.split('?')
+
+        @attributes = attrs if attrs && attrs.size > 0
+        @scope      = scope if scope && scope.size > 0
+        @filter     = filter if filter && filter.size > 0
+        @extensions = extensions if extensions && extensions.size > 0
+      end
+    end
+    private :parse_query
+
+    def build_path_query
+      @path = '/' + @dn
+
+      query = []
+      [@extensions, @filter, @scope, @attributes].each do |x|
+        next if !x && query.size == 0
+        query.unshift(x)
+      end
+      @query = query.join('?')
+    end
+    private :build_path_query
+
+    def dn
+      @dn
+    end
+
+    def set_dn(val)
+      @dn = val
+      build_path_query
+      @dn
+    end
+    protected :set_dn
+
+    def dn=(val)
+      set_dn(val)
+      val
+    end
+
+    def attributes
+      @attributes
+    end
+
+    def set_attributes(val)
+      @attributes = val
+      build_path_query
+      @attributes
+    end
+    protected :set_attributes
+
+    def attributes=(val)
+      set_attributes(val)
+      val
+    end
+
+    def scope
+      @scope
+    end
+
+    def set_scope(val)
+      @scope = val
+      build_path_query
+      @scope
+    end
+    protected :set_scope
+
+    def scope=(val)
+      set_scope(val)
+      val
+    end
+
+    def filter
+      @filter
+    end
+
+    def set_filter(val)
+      @filter = val
+      build_path_query
+      @filter
+    end
+    protected :set_filter
+
+    def filter=(val)
+      set_filter(val)
+      val
+    end
+
+    def extensions
+      @extensions
+    end
+
+    def set_extensions(val)
+      @extensions = val
+      build_path_query
+      @extensions
+    end
+    protected :set_extensions
+
+    def extensions=(val)
+      set_extensions(val)
+      val
+    end
+
+    def hierarchical?
+      false
+    end
+  end
+
+  @@schemes['LDAP'] = LDAP
+end
diff --git a/ruby_1_8_6/lib/uri/mailto.rb b/ruby_1_8_6/lib/uri/mailto.rb
new file mode 100644
index 0000000000..44f04f2dd5
--- /dev/null
+++ b/ruby_1_8_6/lib/uri/mailto.rb
@@ -0,0 +1,266 @@
+#
+# = uri/mailto.rb
+#
+# Author:: Akira Yamada <akira@ruby-lang.org>
+# License:: You can redistribute it and/or modify it under the same term as Ruby.
+# Revision:: $Id$
+#
+
+require 'uri/generic'
+
+module URI
+
+  #
+  # RFC2368, The mailto URL scheme
+  #
+  class MailTo < Generic
+    include REGEXP
+
+    DEFAULT_PORT = nil
+
+    COMPONENT = [ :scheme, :to, :headers ].freeze
+
+    # :stopdoc:
+    #  "hname" and "hvalue" are encodings of an RFC 822 header name and
+    #  value, respectively. As with "to", all URL reserved characters must
+    #  be encoded.
+    #
+    #  "#mailbox" is as specified in RFC 822 [RFC822]. This means that it
+    #  consists of zero or more comma-separated mail addresses, possibly
+    #  including "phrase" and "comment" components. Note that all URL
+    #  reserved characters in "to" must be encoded: in particular,
+    #  parentheses, commas, and the percent sign ("%"), which commonly occur
+    #  in the "mailbox" syntax.
+    #
+    #  Within mailto URLs, the characters "?", "=", "&" are reserved.
+
+    # hname      =  *urlc
+    # hvalue     =  *urlc
+    # header     =  hname "=" hvalue
+    HEADER_PATTERN = "(?:[^?=&]*=[^?=&]*)".freeze
+    HEADER_REGEXP  = Regexp.new(HEADER_PATTERN, 'N').freeze
+    # headers    =  "?" header *( "&" header )
+    # to         =  #mailbox
+    # mailtoURL  =  "mailto:" [ to ] [ headers ]
+    MAILBOX_PATTERN = "(?:#{PATTERN::ESCAPED}|[^(),%?=&])".freeze
+    MAILTO_REGEXP = Regexp.new(" # :nodoc:
+      \\A
+      (#{MAILBOX_PATTERN}*?)                          (?# 1: to)
+      (?:
+        \\?
+        (#{HEADER_PATTERN}(?:\\&#{HEADER_PATTERN})*)  (?# 2: headers)
+      )?
+      (?:
+        \\#
+        (#{PATTERN::FRAGMENT})                        (?# 3: fragment)
+      )?
+      \\z
+    ", Regexp::EXTENDED, 'N').freeze
+    # :startdoc:
+
+    #
+    # == Description
+    #
+    # Creates a new URI::MailTo object from components, with syntax checking.
+    #
+    # Components can be provided as an Array or Hash. If an Array is used,
+    # the components must be supplied as [to, headers].
+    #
+    # If a Hash is used, the keys are the component names preceded by colons.
+    #
+    # The headers can be supplied as a pre-encoded string, such as 
+    # "subject=subscribe&cc=address", or as an Array of Arrays like
+    # [['subject', 'subscribe'], ['cc', 'address']]
+    #
+    # Examples:
+    # 
+    #    require 'uri'
+    #    
+    #    m1 = URI::MailTo.build(['joe@example.com', 'subject=Ruby'])
+    #    puts m1.to_s  ->  mailto:joe@example.com?subject=Ruby
+    #    
+    #    m2 = URI::MailTo.build(['john@example.com', [['Subject', 'Ruby'], ['Cc', 'jack@example.com']]])
+    #    puts m2.to_s  ->  mailto:john@example.com?Subject=Ruby&Cc=jack@example.com
+    #    
+    #    m3 = URI::MailTo.build({:to => 'listman@example.com', :headers => [['subject', 'subscribe']]})
+    #    puts m3.to_s  ->  mailto:listman@example.com?subject=subscribe
+    #
+    def self.build(args)
+      tmp = Util::make_components_hash(self, args)
+
+      if tmp[:to]
+        tmp[:opaque] = tmp[:to]
+      else
+        tmp[:opaque] = ''
+      end
+
+      if tmp[:headers]
+        tmp[:opaque] << '?'
+
+        if tmp[:headers].kind_of?(Array)
+          tmp[:opaque] << tmp[:headers].collect { |x|
+            if x.kind_of?(Array)
+              x[0] + '=' + x[1..-1].to_s
+            else
+              x.to_s
+            end
+          }.join('&')
+
+        elsif tmp[:headers].kind_of?(Hash)
+          tmp[:opaque] << tmp[:headers].collect { |h,v|
+            h + '=' + v
+          }.join('&')
+
+        else
+          tmp[:opaque] << tmp[:headers].to_s
+        end
+      end
+
+      return super(tmp)
+    end
+
+    #
+    # == Description
+    #
+    # Creates a new URI::MailTo object from generic URL components with
+    # no syntax checking.
+    #
+    # This method is usually called from URI::parse, which checks
+    # the validity of each component.
+    #
+    def initialize(*arg)
+      super(*arg)
+
+      @to = nil
+      @headers = []
+
+      if MAILTO_REGEXP =~ @opaque
+         if arg[-1]
+          self.to = $1
+          self.headers = $2
+        else
+          set_to($1)
+          set_headers($2)
+        end
+
+      else
+        raise InvalidComponentError,
+          "unrecognised opaque part for mailtoURL: #{@opaque}"
+      end
+    end
+
+    # The primary e-mail address of the URL, as a String
+    attr_reader :to
+
+    # E-mail headers set by the URL, as an Array of Arrays
+    attr_reader :headers
+
+    def check_to(v)
+      return true unless v
+      return true if v.size == 0
+
+      if OPAQUE !~ v || /\A#{MAILBOX_PATTERN}*\z/o !~ v
+        raise InvalidComponentError,
+          "bad component(expected opaque component): #{v}"
+      end
+
+      return true
+    end
+    private :check_to
+
+    def set_to(v)
+      @to = v
+    end
+    protected :set_to
+
+    def to=(v)
+      check_to(v)
+      set_to(v)
+      v
+    end
+
+    def check_headers(v)
+      return true unless v
+      return true if v.size == 0
+
+      if OPAQUE !~ v || 
+          /\A(#{HEADER_PATTERN}(?:\&#{HEADER_PATTERN})*)\z/o !~ v
+        raise InvalidComponentError,
+          "bad component(expected opaque component): #{v}"
+      end
+
+      return true
+    end
+    private :check_headers
+
+    def set_headers(v)
+      @headers = []
+      if v
+        v.scan(HEADER_REGEXP) do |x|
+          @headers << x.split(/=/o, 2)
+        end
+      end
+    end
+    protected :set_headers
+
+    def headers=(v)
+      check_headers(v)
+      set_headers(v)
+      v
+    end
+
+    def to_s
+      @scheme + ':' + 
+        if @to 
+          @to
+        else
+          ''
+        end + 
+        if @headers.size > 0
+          '?' + @headers.collect{|x| x.join('=')}.join('&')
+        else
+          ''
+        end +
+        if @fragment
+          '#' + @fragment
+        else
+          ''
+        end
+    end
+    
+    # Returns the RFC822 e-mail text equivalent of the URL, as a String.
+    #
+    # Example:
+    #
+    #   require 'uri'
+    #
+    #   uri = URI.parse("mailto:ruby-list@ruby-lang.org?Subject=subscribe&cc=myaddr")
+    #   uri.to_mailtext
+    #   # => "To: ruby-list@ruby-lang.org\nSubject: subscribe\nCc: myaddr\n\n\n"
+    #
+    def to_mailtext
+      to = URI::unescape(@to)
+      head = ''
+      body = ''
+      @headers.each do |x|
+        case x[0]
+        when 'body'
+          body = URI::unescape(x[1])
+        when 'to'
+          to << ', ' + URI::unescape(x[1])
+        else
+          head << URI::unescape(x[0]).capitalize + ': ' +
+            URI::unescape(x[1])  + "\n"
+        end
+      end
+
+      return "To: #{to}
+#{head}
+#{body}
+"
+    end
+    alias to_rfc822text to_mailtext
+  end
+
+  @@schemes['MAILTO'] = MailTo
+end
diff --git a/ruby_1_8_6/lib/weakref.rb b/ruby_1_8_6/lib/weakref.rb
new file mode 100644
index 0000000000..591819c948
--- /dev/null
+++ b/ruby_1_8_6/lib/weakref.rb
@@ -0,0 +1,100 @@
+require "delegate"
+
+# WeakRef is a class to represent a reference to an object that is not seen by
+# the tracing phase of the garbage collector.  This allows the referenced
+# object to be garbage collected as if nothing is referring to it. Because
+# WeakRef delegates method calls to the referenced object, it may be used in
+# place of that object, i.e. it is of the same duck type.
+#
+# Usage:
+#
+#   foo = Object.new
+#   foo = Object.new
+#   p foo.to_s			# original's class
+#   foo = WeakRef.new(foo)
+#   p foo.to_s			# should be same class
+#   ObjectSpace.garbage_collect
+#   p foo.to_s			# should raise exception (recycled)
+class WeakRef<Delegator
+
+  # RefError is raised if an object cannot be referenced by a WeakRef.
+  class RefError<StandardError
+  end
+
+  @@id_map =  {}                # obj -> [ref,...]
+  @@id_rev_map =  {}            # ref -> obj
+  @@final = lambda{|id|
+    __old_status = Thread.critical
+    Thread.critical = true
+    begin
+      rids = @@id_map[id]
+      if rids
+	for rid in rids
+	  @@id_rev_map.delete(rid)
+	end
+	@@id_map.delete(id)
+      end
+      rid = @@id_rev_map[id]
+      if rid
+	@@id_rev_map.delete(id)
+	@@id_map[rid].delete(id)
+	@@id_map.delete(rid) if @@id_map[rid].empty?
+      end
+    ensure
+      Thread.critical = __old_status
+    end
+  }
+
+  # Create a new WeakRef from +orig+.
+  def initialize(orig)
+    super
+    __setobj__(orig)
+  end
+
+  # Return the object this WeakRef references. Raises RefError if the object
+  # has been garbage collected.  The object returned is the object to which
+  # method calls are delegated (see Delegator).
+  def __getobj__
+    unless @@id_rev_map[self.__id__] == @__id
+      raise RefError, "Illegal Reference - probably recycled", caller(2)
+    end
+    begin
+      ObjectSpace._id2ref(@__id)
+    rescue RangeError
+      raise RefError, "Illegal Reference - probably recycled", caller(2)
+    end
+  end
+
+  def __setobj__(obj)
+    @__id = obj.__id__
+    __old_status = Thread.critical
+    begin
+      Thread.critical = true
+      unless @@id_rev_map.key?(self)
+        ObjectSpace.define_finalizer obj, @@final
+        ObjectSpace.define_finalizer self, @@final
+      end
+      @@id_map[@__id] = [] unless @@id_map[@__id]
+    ensure
+      Thread.critical = __old_status
+    end
+    @@id_map[@__id].push self.__id__
+    @@id_rev_map[self.__id__] = @__id
+  end
+
+  # Returns true if the referenced object still exists, and false if it has
+  # been garbage collected.
+  def weakref_alive?
+    @@id_rev_map[self.__id__] == @__id
+  end
+end
+
+if __FILE__ == $0
+  require 'thread'
+  foo = Object.new
+  p foo.to_s			# original's class
+  foo = WeakRef.new(foo)
+  p foo.to_s			# should be same class
+  ObjectSpace.garbage_collect
+  p foo.to_s			# should raise exception (recycled)
+end
diff --git a/ruby_1_8_6/lib/webrick.rb b/ruby_1_8_6/lib/webrick.rb
new file mode 100644
index 0000000000..8fca81bafb
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick.rb
@@ -0,0 +1,29 @@
+#
+# WEBrick -- WEB server toolkit.
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU YUUZOU
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: webrick.rb,v 1.12 2002/10/01 17:16:31 gotoyuzo Exp $
+
+require 'webrick/compat.rb'
+
+require 'webrick/version.rb'
+require 'webrick/config.rb'
+require 'webrick/log.rb'
+require 'webrick/server.rb'
+require 'webrick/utils.rb'
+require 'webrick/accesslog'
+
+require 'webrick/htmlutils.rb'
+require 'webrick/httputils.rb'
+require 'webrick/cookie.rb'
+require 'webrick/httpversion.rb'
+require 'webrick/httpstatus.rb'
+require 'webrick/httprequest.rb'
+require 'webrick/httpresponse.rb'
+require 'webrick/httpserver.rb'
+require 'webrick/httpservlet.rb'
+require 'webrick/httpauth.rb'
diff --git a/ruby_1_8_6/lib/webrick/accesslog.rb b/ruby_1_8_6/lib/webrick/accesslog.rb
new file mode 100644
index 0000000000..f97769545e
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/accesslog.rb
@@ -0,0 +1,67 @@
+#
+# accesslog.rb -- Access log handling utilities
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2002 keita yamaguchi
+# Copyright (c) 2002 Internet Programming with Ruby writers
+#
+# $IPR: accesslog.rb,v 1.1 2002/10/01 17:16:32 gotoyuzo Exp $
+
+module WEBrick
+  module AccessLog
+    class AccessLogError < StandardError; end
+
+    CLF_TIME_FORMAT     = "[%d/%b/%Y:%H:%M:%S %Z]"
+    COMMON_LOG_FORMAT   = "%h %l %u %t \"%r\" %s %b"
+    CLF                 = COMMON_LOG_FORMAT
+    REFERER_LOG_FORMAT  = "%{Referer}i -> %U"
+    AGENT_LOG_FORMAT    = "%{User-Agent}i"
+    COMBINED_LOG_FORMAT = "#{CLF} \"%{Referer}i\" \"%{User-agent}i\""
+
+    module_function
+
+    # This format specification is a subset of mod_log_config of Apache.
+    #   http://httpd.apache.org/docs/mod/mod_log_config.html#formats
+    def setup_params(config, req, res)
+      params = Hash.new("")
+      params["a"] = req.peeraddr[3]
+      params["b"] = res.sent_size
+      params["e"] = ENV
+      params["f"] = res.filename || ""
+      params["h"] = req.peeraddr[2]
+      params["i"] = req
+      params["l"] = "-"
+      params["m"] = req.request_method
+      params["n"] = req.attributes
+      params["o"] = res
+      params["p"] = req.port
+      params["q"] = req.query_string
+      params["r"] = req.request_line.sub(/\x0d?\x0a\z/o, '')
+      params["s"] = res.status       # won't support "%>s"
+      params["t"] = req.request_time
+      params["T"] = Time.now - req.request_time
+      params["u"] = req.user || "-"
+      params["U"] = req.unparsed_uri
+      params["v"] = config[:ServerName]
+      params
+    end
+
+    def format(format_string, params)
+      format_string.gsub(/\%(?:\{(.*?)\})?>?([a-zA-Z%])/){
+         param, spec = $1, $2
+         case spec[0]
+         when ?e, ?i, ?n, ?o
+           raise AccessLogError,
+             "parameter is required for \"#{spec}\"" unless param
+           params[spec][param] || "-"
+         when ?t
+           params[spec].strftime(param || CLF_TIME_FORMAT)
+         when ?%
+           "%"
+         else
+           params[spec]
+         end
+      }
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/cgi.rb b/ruby_1_8_6/lib/webrick/cgi.rb
new file mode 100644
index 0000000000..ff5f7a6102
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/cgi.rb
@@ -0,0 +1,257 @@
+#
+# cgi.rb -- Yet another CGI library
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $Id$
+
+require "webrick/httprequest"
+require "webrick/httpresponse"
+require "webrick/config"
+require "stringio"
+
+module WEBrick
+  class CGI
+    CGIError = Class.new(StandardError)
+
+    attr_reader :config, :logger
+
+    def initialize(*args)
+      if defined?(MOD_RUBY)
+        unless ENV.has_key?("GATEWAY_INTERFACE")
+          Apache.request.setup_cgi_env
+        end
+      end
+      if %r{HTTP/(\d+\.\d+)} =~ ENV["SERVER_PROTOCOL"]
+        httpv = $1
+      end
+      @config = WEBrick::Config::HTTP.dup.update(
+        :ServerSoftware => ENV["SERVER_SOFTWARE"] || "null",
+        :HTTPVersion    => HTTPVersion.new(httpv || "1.0"),
+        :RunOnCGI       => true,   # to detect if it runs on CGI.
+        :NPH            => false   # set true to run as NPH script.
+      )
+      if config = args.shift
+        @config.update(config)
+      end
+      @config[:Logger] ||= WEBrick::BasicLog.new($stderr)
+      @logger = @config[:Logger]
+      @options = args
+    end
+
+    def [](key)
+      @config[key]
+    end
+
+    def start(env=ENV, stdin=$stdin, stdout=$stdout)
+      sock = WEBrick::CGI::Socket.new(@config, env, stdin, stdout)
+      req = HTTPRequest.new(@config)
+      res = HTTPResponse.new(@config)
+      unless @config[:NPH] or defined?(MOD_RUBY)
+        def res.setup_header
+          unless @header["status"]
+            phrase = HTTPStatus::reason_phrase(@status)
+            @header["status"] = "#{@status} #{phrase}"
+          end
+          super
+        end
+        def res.status_line
+          ""
+        end
+      end
+
+      begin
+        req.parse(sock)
+        req.script_name = (env["SCRIPT_NAME"] || File.expand_path($0)).dup
+        req.path_info = (env["PATH_INFO"] || "").dup
+        req.query_string = env["QUERY_STRING"]
+        req.user = env["REMOTE_USER"]
+        res.request_method = req.request_method
+        res.request_uri = req.request_uri
+        res.request_http_version = req.http_version
+        res.keep_alive = req.keep_alive?
+        self.service(req, res)
+      rescue HTTPStatus::Error => ex
+        res.set_error(ex)
+      rescue HTTPStatus::Status => ex
+        res.status = ex.code
+      rescue Exception => ex 
+        @logger.error(ex)
+        res.set_error(ex, true)
+      ensure
+        req.fixup
+        if defined?(MOD_RUBY)
+          res.setup_header
+          Apache.request.status_line = "#{res.status} #{res.reason_phrase}"
+          Apache.request.status = res.status
+          table = Apache.request.headers_out
+          res.header.each{|key, val|
+            case key
+            when /^content-encoding$/i
+              Apache::request.content_encoding = val
+            when /^content-type$/i
+              Apache::request.content_type = val
+            else
+              table[key] = val.to_s
+            end
+          }
+          res.cookies.each{|cookie|
+            table.add("Set-Cookie", cookie.to_s)
+          }
+          Apache.request.send_http_header
+          res.send_body(sock)
+        else
+          res.send_response(sock)
+        end
+      end
+    end
+
+    def service(req, res)
+      method_name = "do_" + req.request_method.gsub(/-/, "_")
+      if respond_to?(method_name)
+        __send__(method_name, req, res)
+      else
+        raise HTTPStatus::MethodNotAllowed,
+              "unsupported method `#{req.request_method}'."
+      end
+    end
+
+    class Socket
+      include Enumerable
+
+      private
+  
+      def initialize(config, env, stdin, stdout)
+        @config = config
+        @env = env
+        @header_part = StringIO.new
+        @body_part = stdin
+        @out_port = stdout
+        @out_port.binmode
+  
+        @server_addr = @env["SERVER_ADDR"] || "0.0.0.0"
+        @server_name = @env["SERVER_NAME"]
+        @server_port = @env["SERVER_PORT"]
+        @remote_addr = @env["REMOTE_ADDR"]
+        @remote_host = @env["REMOTE_HOST"] || @remote_addr
+        @remote_port = @env["REMOTE_PORT"] || 0
+
+        begin
+          @header_part << request_line << CRLF
+          setup_header
+          @header_part << CRLF
+          @header_part.rewind
+        rescue Exception => ex
+          raise CGIError, "invalid CGI environment"
+        end
+      end
+
+      def request_line
+        meth = @env["REQUEST_METHOD"] || "GET"
+        unless url = @env["REQUEST_URI"]
+          url = (@env["SCRIPT_NAME"] || File.expand_path($0)).dup
+          url << @env["PATH_INFO"].to_s
+          url = WEBrick::HTTPUtils.escape_path(url)
+          if query_string = @env["QUERY_STRING"]
+            unless query_string.empty?
+              url << "?" << query_string
+            end
+          end
+        end
+        # we cannot get real HTTP version of client ;)
+        httpv = @config[:HTTPVersion]
+        return "#{meth} #{url} HTTP/#{httpv}"
+      end
+  
+      def setup_header
+        add_header("CONTENT_TYPE", "Content-Type")
+        add_header("CONTENT_LENGTH", "Content-length")
+        @env.each_key{|name|
+          if /^HTTP_(.*)/ =~ name
+            add_header(name, $1.gsub(/_/, "-"))
+          end
+        }
+      end
+  
+      def add_header(envname, hdrname)
+        if value = @env[envname]
+          unless value.empty?
+            @header_part << hdrname << ": " << value << CRLF
+          end
+        end
+      end
+
+      def input
+        @header_part.eof? ? @body_part : @header_part
+      end
+  
+      public
+  
+      def peeraddr
+        [nil, @remote_port, @remote_host, @remote_addr]
+      end
+  
+      def addr
+        [nil, @server_port, @server_name, @server_addr]
+      end
+  
+      def gets(eol=LF)
+        input.gets(eol)
+      end
+  
+      def read(size=nil)
+        input.read(size)
+      end
+
+      def each
+        input.each{|line| yield(line) }
+      end
+  
+      def <<(data)
+        @out_port << data
+      end
+
+      def cert
+        return nil unless defined?(OpenSSL)
+        if pem = @env["SSL_SERVER_CERT"]
+          OpenSSL::X509::Certificate.new(pem) unless pem.empty?
+        end
+      end
+
+      def peer_cert
+        return nil unless defined?(OpenSSL)
+        if pem = @env["SSL_CLIENT_CERT"]
+          OpenSSL::X509::Certificate.new(pem) unless pem.empty?
+        end
+      end
+
+      def peer_cert_chain
+        return nil unless defined?(OpenSSL)
+        if @env["SSL_CLIENT_CERT_CHAIN_0"]
+          keys = @env.keys
+          certs = keys.sort.collect{|k|
+            if /^SSL_CLIENT_CERT_CHAIN_\d+$/ =~ k
+              if pem = @env[k]
+                OpenSSL::X509::Certificate.new(pem) unless pem.empty?
+              end
+            end
+          }
+          certs.compact
+        end
+      end
+
+      def cipher
+        return nil unless defined?(OpenSSL)
+        if cipher = @env["SSL_CIPHER"]
+          ret = [ cipher ]
+          ret << @env["SSL_PROTOCOL"]
+          ret << @env["SSL_CIPHER_USEKEYSIZE"]
+          ret << @env["SSL_CIPHER_ALGKEYSIZE"]
+          ret
+        end
+      end
+    end
+  end 
+end  
diff --git a/ruby_1_8_6/lib/webrick/compat.rb b/ruby_1_8_6/lib/webrick/compat.rb
new file mode 100644
index 0000000000..ad7760b640
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/compat.rb
@@ -0,0 +1,15 @@
+#
+# compat.rb -- cross platform compatibility
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2002 GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: compat.rb,v 1.6 2002/10/01 17:16:32 gotoyuzo Exp $
+
+module Errno
+  class EPROTO       < SystemCallError; end
+  class ECONNRESET   < SystemCallError; end
+  class ECONNABORTED < SystemCallError; end
+end
diff --git a/ruby_1_8_6/lib/webrick/config.rb b/ruby_1_8_6/lib/webrick/config.rb
new file mode 100644
index 0000000000..5897b977d8
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/config.rb
@@ -0,0 +1,97 @@
+#
+# config.rb -- Default configurations.
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: config.rb,v 1.52 2003/07/22 19:20:42 gotoyuzo Exp $
+
+require 'webrick/version'
+require 'webrick/httpversion'
+require 'webrick/httputils'
+require 'webrick/utils'
+require 'webrick/log'
+
+module WEBrick
+  module Config
+    LIBDIR = File::dirname(__FILE__)
+
+    # for GenericServer
+    General = {
+      :ServerName     => Utils::getservername,
+      :BindAddress    => nil,   # "0.0.0.0" or "::" or nil
+      :Port           => nil,   # users MUST specifiy this!!
+      :MaxClients     => 100,   # maximum number of the concurrent connections
+      :ServerType     => nil,   # default: WEBrick::SimpleServer
+      :Logger         => nil,   # default: WEBrick::Log.new
+      :ServerSoftware => "WEBrick/#{WEBrick::VERSION} " +
+                         "(Ruby/#{RUBY_VERSION}/#{RUBY_RELEASE_DATE})",
+      :TempDir        => ENV['TMPDIR']||ENV['TMP']||ENV['TEMP']||'/tmp',
+      :DoNotListen    => false,
+      :StartCallback  => nil,
+      :StopCallback   => nil,
+      :AcceptCallback => nil,
+    }
+
+    # for HTTPServer, HTTPRequest, HTTPResponse ...
+    HTTP = General.dup.update(
+      :Port           => 80,
+      :RequestTimeout => 30,
+      :HTTPVersion    => HTTPVersion.new("1.1"),
+      :AccessLog      => nil,
+      :MimeTypes      => HTTPUtils::DefaultMimeTypes,
+      :DirectoryIndex => ["index.html","index.htm","index.cgi","index.rhtml"],
+      :DocumentRoot   => nil,
+      :DocumentRootOptions => { :FancyIndexing => true },
+      :RequestHandler => nil,
+      :RequestCallback => nil,  # alias of :RequestHandler
+      :ServerAlias    => nil,
+
+      # for HTTPProxyServer
+      :ProxyAuthProc  => nil,
+      :ProxyContentHandler => nil,
+      :ProxyVia       => true,
+      :ProxyTimeout   => true,
+      :ProxyURI       => nil,
+
+      :CGIInterpreter => nil,
+      :CGIPathEnv     => nil,
+
+      # workaround: if Request-URIs contain 8bit chars,
+      # they should be escaped before calling of URI::parse().
+      :Escape8bitURI  => false
+    )
+
+    FileHandler = {
+      :NondisclosureName => [".ht*", "*~"],
+      :FancyIndexing     => false,
+      :HandlerTable      => {},
+      :HandlerCallback   => nil,
+      :DirectoryCallback => nil,
+      :FileCallback      => nil,
+      :UserDir           => nil,  # e.g. "public_html"
+      :AcceptableLanguages => []  # ["en", "ja", ... ]
+    }
+
+    BasicAuth = {
+      :AutoReloadUserDB     => true,
+    }
+
+    DigestAuth = {
+      :Algorithm            => 'MD5-sess', # or 'MD5' 
+      :Domain               => nil,        # an array includes domain names.
+      :Qop                  => [ 'auth' ], # 'auth' or 'auth-int' or both.
+      :UseOpaque            => true,
+      :UseNextNonce         => false,
+      :CheckNc              => false,
+      :UseAuthenticationInfoHeader => true,
+      :AutoReloadUserDB     => true,
+      :NonceExpirePeriod    => 30*60,
+      :NonceExpireDelta     => 60,
+      :InternetExplorerHack => true,
+      :OperaHack            => true,
+    }
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/cookie.rb b/ruby_1_8_6/lib/webrick/cookie.rb
new file mode 100644
index 0000000000..814e6645a3
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/cookie.rb
@@ -0,0 +1,110 @@
+#
+# cookie.rb -- Cookie class
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: cookie.rb,v 1.16 2002/09/21 12:23:35 gotoyuzo Exp $
+
+require 'time'
+require 'webrick/httputils'
+
+module WEBrick
+  class Cookie
+
+    attr_reader :name
+    attr_accessor :value, :version
+    attr_accessor :domain, :path, :secure
+    attr_accessor :comment, :max_age
+    #attr_accessor :comment_url, :discard, :port
+
+    def initialize(name, value)
+      @name = name
+      @value = value
+      @version = 0     # Netscape Cookie
+
+      @domain = @path = @secure = @comment = @max_age =
+      @expires = @comment_url = @discard = @port = nil
+    end
+
+    def expires=(t)
+      @expires = t && (t.is_a?(Time) ? t.httpdate : t.to_s)
+    end
+
+    def expires
+      @expires && Time.parse(@expires)
+    end
+
+    def to_s
+      ret = ""
+      ret << @name << "=" << @value
+      ret << "; " << "Version=" << @version.to_s if @version > 0
+      ret << "; " << "Domain="  << @domain  if @domain
+      ret << "; " << "Expires=" << @expires if @expires
+      ret << "; " << "Max-Age=" << @max_age.to_s if @max_age
+      ret << "; " << "Comment=" << @comment if @comment
+      ret << "; " << "Path="    << @path if @path
+      ret << "; " << "Secure"   if @secure
+      ret
+    end
+
+    # Cookie::parse()
+    #   It parses Cookie field sent from the user agent.
+    def self.parse(str)
+      if str
+        ret = []
+        cookie = nil
+        ver = 0
+        str.split(/[;,]\s+/).each{|x|
+          key, val = x.split(/=/,2)
+          val = val ? HTTPUtils::dequote(val) : ""
+          case key
+          when "$Version"; ver = val.to_i
+          when "$Path";    cookie.path = val
+          when "$Domain";  cookie.domain = val
+          when "$Port";    cookie.port = val
+          else
+            ret << cookie if cookie
+            cookie = self.new(key, val)
+            cookie.version = ver
+          end
+        }
+        ret << cookie if cookie
+        ret
+      end
+    end
+
+    def self.parse_set_cookie(str)
+      cookie_elem = str.split(/;/)
+      first_elem = cookie_elem.shift
+      first_elem.strip!
+      key, value = first_elem.split(/=/, 2)
+      cookie = new(key, HTTPUtils.dequote(value))
+      cookie_elem.each{|pair|
+        pair.strip!
+        key, value = pair.split(/=/, 2)
+        if value
+          value = HTTPUtils.dequote(value.strip)
+        end
+        case key.downcase
+        when "domain"  then cookie.domain  = value
+        when "path"    then cookie.path    = value
+        when "expires" then cookie.expires = value
+        when "max-age" then cookie.max_age = Integer(value)
+        when "comment" then cookie.comment = value
+        when "version" then cookie.version = Integer(value)
+        when "secure"  then cookie.secure = true
+        end
+      }
+      return cookie
+    end
+
+    def self.parse_set_cookies(str)
+      return str.split(/,(?=[^;,]*=)|,$/).collect{|c|
+        parse_set_cookie(c)
+      }
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/htmlutils.rb b/ruby_1_8_6/lib/webrick/htmlutils.rb
new file mode 100644
index 0000000000..cf8d542c09
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/htmlutils.rb
@@ -0,0 +1,25 @@
+#
+# htmlutils.rb -- HTMLUtils Module
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: htmlutils.rb,v 1.7 2002/09/21 12:23:35 gotoyuzo Exp $
+
+module WEBrick
+  module HTMLUtils
+
+    def escape(string)
+      str = string ? string.dup : ""
+      str.gsub!(/&/n, '&amp;')
+      str.gsub!(/\"/n, '&quot;')
+      str.gsub!(/>/n, '&gt;')
+      str.gsub!(/</n, '&lt;')
+      str
+    end
+    module_function :escape
+
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpauth.rb b/ruby_1_8_6/lib/webrick/httpauth.rb
new file mode 100644
index 0000000000..147c04021c
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpauth.rb
@@ -0,0 +1,45 @@
+#
+# httpauth.rb -- HTTP access authentication
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: httpauth.rb,v 1.14 2003/07/22 19:20:42 gotoyuzo Exp $
+
+require 'webrick/httpauth/basicauth'
+require 'webrick/httpauth/digestauth'
+require 'webrick/httpauth/htpasswd'
+require 'webrick/httpauth/htdigest'
+require 'webrick/httpauth/htgroup'
+
+module WEBrick
+  module HTTPAuth
+    module_function
+
+    def _basic_auth(req, res, realm, req_field, res_field, err_type, block)
+      user = pass = nil
+      if /^Basic\s+(.*)/o =~ req[req_field]
+        userpass = $1
+        user, pass = userpass.unpack("m*")[0].split(":", 2)
+      end
+      if block.call(user, pass)
+        req.user = user
+        return
+      end
+      res[res_field] = "Basic realm=\"#{realm}\""
+      raise err_type
+    end
+
+    def basic_auth(req, res, realm, &block)
+      _basic_auth(req, res, realm, "Authorization", "WWW-Authenticate",
+                  HTTPStatus::Unauthorized, block)
+    end
+
+    def proxy_basic_auth(req, res, realm, &block)
+      _basic_auth(req, res, realm, "Proxy-Authorization", "Proxy-Authenticate",
+                  HTTPStatus::ProxyAuthenticationRequired, block)
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpauth/authenticator.rb b/ruby_1_8_6/lib/webrick/httpauth/authenticator.rb
new file mode 100644
index 0000000000..fe2dbf4e0c
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpauth/authenticator.rb
@@ -0,0 +1,79 @@
+#
+# httpauth/authenticator.rb -- Authenticator mix-in module.
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: authenticator.rb,v 1.3 2003/02/20 07:15:47 gotoyuzo Exp $
+
+module WEBrick
+  module HTTPAuth
+    module Authenticator
+      RequestField      = "Authorization"
+      ResponseField     = "WWW-Authenticate"
+      ResponseInfoField = "Authentication-Info"
+      AuthException     = HTTPStatus::Unauthorized
+      AuthScheme        = nil # must override by the derived class
+
+      attr_reader :realm, :userdb, :logger
+
+      private
+
+      def check_init(config)
+        [:UserDB, :Realm].each{|sym|
+          unless config[sym]
+            raise ArgumentError, "Argument #{sym.inspect} missing."
+          end
+        } 
+        @realm     = config[:Realm]
+        @userdb    = config[:UserDB]
+        @logger    = config[:Logger] || Log::new($stderr)
+        @reload_db = config[:AutoReloadUserDB]
+        @request_field   = self::class::RequestField
+        @response_field  = self::class::ResponseField
+        @resp_info_field = self::class::ResponseInfoField
+        @auth_exception  = self::class::AuthException
+        @auth_scheme     = self::class::AuthScheme
+      end
+
+      def check_scheme(req)
+        unless credentials = req[@request_field]
+          error("no credentials in the request.")
+          return nil 
+        end  
+        unless match = /^#{@auth_scheme}\s+/.match(credentials)
+          error("invalid scheme in %s.", credentials)
+          info("%s: %s", @request_field, credentials) if $DEBUG
+          return nil
+        end
+        return match.post_match
+      end
+
+      def log(meth, fmt, *args)
+        msg = format("%s %s: ", @auth_scheme, @realm)
+        msg << fmt % args
+        @logger.send(meth, msg)
+      end
+
+      def error(fmt, *args)
+        if @logger.error?
+          log(:error, fmt, *args)
+        end
+      end                             
+
+      def info(fmt, *args)
+        if @logger.info?
+          log(:info, fmt, *args)
+        end
+      end
+    end
+
+    module ProxyAuthenticator
+      RequestField  = "Proxy-Authorization"
+      ResponseField = "Proxy-Authenticate"
+      InfoField     = "Proxy-Authentication-Info"
+      AuthException = HTTPStatus::ProxyAuthenticationRequired
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpauth/basicauth.rb b/ruby_1_8_6/lib/webrick/httpauth/basicauth.rb
new file mode 100644
index 0000000000..e835361dc2
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpauth/basicauth.rb
@@ -0,0 +1,65 @@
+#
+# httpauth/basicauth.rb -- HTTP basic access authentication
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: basicauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $
+
+require 'webrick/config'
+require 'webrick/httpstatus'
+require 'webrick/httpauth/authenticator'
+
+module WEBrick
+  module HTTPAuth
+    class BasicAuth
+      include Authenticator
+
+      AuthScheme = "Basic"
+
+      def self.make_passwd(realm, user, pass)
+        pass ||= ""
+        pass.crypt(Utils::random_string(2))
+      end
+
+      attr_reader :realm, :userdb, :logger
+
+      def initialize(config, default=Config::BasicAuth)
+        check_init(config)
+        @config = default.dup.update(config)
+      end
+
+      def authenticate(req, res)
+        unless basic_credentials = check_scheme(req)
+          challenge(req, res)
+        end
+        userid, password = basic_credentials.unpack("m*")[0].split(":", 2) 
+        password ||= ""
+        if userid.empty?
+          error("user id was not given.")
+          challenge(req, res)
+        end
+        unless encpass = @userdb.get_passwd(@realm, userid, @reload_db)
+          error("%s: the user is not allowed.", userid)
+          challenge(req, res)
+        end
+        if password.crypt(encpass) != encpass
+          error("%s: password unmatch.", userid)
+          challenge(req, res)
+        end
+        info("%s: authentication succeeded.", userid)
+        req.user = userid
+      end
+
+      def challenge(req, res)
+        res[@response_field] = "#{@auth_scheme} realm=\"#{@realm}\""
+        raise @auth_exception
+      end
+    end
+
+    class ProxyBasicAuth < BasicAuth
+      include ProxyAuthenticator
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpauth/digestauth.rb b/ruby_1_8_6/lib/webrick/httpauth/digestauth.rb
new file mode 100644
index 0000000000..318e0bf17f
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpauth/digestauth.rb
@@ -0,0 +1,343 @@
+#
+# httpauth/digestauth.rb -- HTTP digest access authentication
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2003 Internet Programming with Ruby writers.
+# Copyright (c) 2003 H.M.
+#
+# The original implementation is provided by H.M.
+#   URL: http://rwiki.jin.gr.jp/cgi-bin/rw-cgi.rb?cmd=view;name=
+#        %C7%A7%BE%DA%B5%A1%C7%BD%A4%F2%B2%FE%C2%A4%A4%B7%A4%C6%A4%DF%A4%EB
+#
+# $IPR: digestauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $
+
+require 'webrick/config'
+require 'webrick/httpstatus'
+require 'webrick/httpauth/authenticator'
+require 'digest/md5'
+require 'digest/sha1'
+
+module WEBrick
+  module HTTPAuth
+    class DigestAuth
+      include Authenticator
+
+      AuthScheme = "Digest"
+      OpaqueInfo = Struct.new(:time, :nonce, :nc)
+      attr_reader :algorithm, :qop
+
+      def self.make_passwd(realm, user, pass)
+        pass ||= ""
+        Digest::MD5::hexdigest([user, realm, pass].join(":"))
+      end
+
+      def initialize(config, default=Config::DigestAuth)
+        check_init(config)
+        @config                 = default.dup.update(config)
+        @algorithm              = @config[:Algorithm]
+        @domain                 = @config[:Domain]
+        @qop                    = @config[:Qop]
+        @use_opaque             = @config[:UseOpaque]
+        @use_next_nonce         = @config[:UseNextNonce]
+        @check_nc               = @config[:CheckNc]
+        @use_auth_info_header   = @config[:UseAuthenticationInfoHeader]
+        @nonce_expire_period    = @config[:NonceExpirePeriod]
+        @nonce_expire_delta     = @config[:NonceExpireDelta]
+        @internet_explorer_hack = @config[:InternetExplorerHack]
+        @opera_hack             = @config[:OperaHack]
+
+        case @algorithm
+        when 'MD5','MD5-sess'
+          @h = Digest::MD5
+        when 'SHA1','SHA1-sess'  # it is a bonus feature :-)
+          @h = Digest::SHA1
+        else
+          msg = format('Alogrithm "%s" is not supported.', @algorithm)
+          raise ArgumentError.new(msg)
+        end
+
+        @instance_key = hexdigest(self.__id__, Time.now.to_i, Process.pid)
+        @opaques = {}
+        @last_nonce_expire = Time.now
+        @mutex = Mutex.new
+      end
+
+      def authenticate(req, res)
+        unless result = @mutex.synchronize{ _authenticate(req, res) }
+          challenge(req, res)
+        end
+        if result == :nonce_is_stale
+          challenge(req, res, true)
+        end
+        return true
+      end
+
+      def challenge(req, res, stale=false)
+        nonce = generate_next_nonce(req)
+        if @use_opaque
+          opaque = generate_opaque(req)
+          @opaques[opaque].nonce = nonce
+        end
+
+        param = Hash.new
+        param["realm"]  = HTTPUtils::quote(@realm)
+        param["domain"] = HTTPUtils::quote(@domain.to_a.join(" ")) if @domain
+        param["nonce"]  = HTTPUtils::quote(nonce)
+        param["opaque"] = HTTPUtils::quote(opaque) if opaque
+        param["stale"]  = stale.to_s
+        param["algorithm"] = @algorithm
+        param["qop"]    = HTTPUtils::quote(@qop.to_a.join(",")) if @qop
+
+        res[@response_field] =
+          "#{@auth_scheme} " + param.map{|k,v| "#{k}=#{v}" }.join(", ")
+        info("%s: %s", @response_field, res[@response_field]) if $DEBUG
+        raise @auth_exception
+      end
+
+      private
+
+      MustParams = ['username','realm','nonce','uri','response']
+      MustParamsAuth = ['cnonce','nc']
+
+      def _authenticate(req, res)
+        unless digest_credentials = check_scheme(req)
+          return false
+        end
+
+        auth_req = split_param_value(digest_credentials)
+        if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
+          req_params = MustParams + MustParamsAuth
+        else
+          req_params = MustParams
+        end
+        req_params.each{|key|
+          unless auth_req.has_key?(key)
+            error('%s: parameter missing. "%s"', auth_req['username'], key)
+            raise HTTPStatus::BadRequest
+          end
+        }
+
+        if !check_uri(req, auth_req)
+          raise HTTPStatus::BadRequest  
+        end
+
+        if auth_req['realm'] != @realm  
+          error('%s: realm unmatch. "%s" for "%s"',
+                auth_req['username'], auth_req['realm'], @realm)
+          return false
+        end
+
+        auth_req['algorithm'] ||= 'MD5' 
+        if auth_req['algorithm'] != @algorithm &&
+           (@opera_hack && auth_req['algorithm'] != @algorithm.upcase)
+          error('%s: algorithm unmatch. "%s" for "%s"',
+                auth_req['username'], auth_req['algorithm'], @algorithm)
+          return false
+        end
+
+        if (@qop.nil? && auth_req.has_key?('qop')) ||
+           (@qop && (! @qop.member?(auth_req['qop'])))
+          error('%s: the qop is not allowed. "%s"',
+                auth_req['username'], auth_req['qop'])
+          return false
+        end
+
+        password = @userdb.get_passwd(@realm, auth_req['username'], @reload_db)
+        unless password
+          error('%s: the user is not allowd.', auth_req['username'])
+          return false
+        end
+
+        nonce_is_invalid = false
+        if @use_opaque
+          info("@opaque = %s", @opaque.inspect) if $DEBUG
+          if !(opaque = auth_req['opaque'])
+            error('%s: opaque is not given.', auth_req['username'])
+            nonce_is_invalid = true
+          elsif !(opaque_struct = @opaques[opaque])
+            error('%s: invalid opaque is given.', auth_req['username'])
+            nonce_is_invalid = true
+          elsif !check_opaque(opaque_struct, req, auth_req)
+            @opaques.delete(auth_req['opaque'])
+            nonce_is_invalid = true
+          end
+        elsif !check_nonce(req, auth_req)
+          nonce_is_invalid = true
+        end
+
+        if /-sess$/ =~ auth_req['algorithm'] ||
+           (@opera_hack && /-SESS$/ =~ auth_req['algorithm'])
+          ha1 = hexdigest(password, auth_req['nonce'], auth_req['cnonce'])
+        else
+          ha1 = password
+        end
+
+        if auth_req['qop'] == "auth" || auth_req['qop'] == nil
+          ha2 = hexdigest(req.request_method, auth_req['uri'])
+          ha2_res = hexdigest("", auth_req['uri'])
+        elsif auth_req['qop'] == "auth-int"
+          ha2 = hexdigest(req.request_method, auth_req['uri'],
+                          hexdigest(req.body))
+          ha2_res = hexdigest("", auth_req['uri'], hexdigest(res.body))
+        end
+
+        if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
+          param2 = ['nonce', 'nc', 'cnonce', 'qop'].map{|key|
+            auth_req[key]
+          }.join(':')
+          digest     = hexdigest(ha1, param2, ha2)
+          digest_res = hexdigest(ha1, param2, ha2_res)
+        else
+          digest     = hexdigest(ha1, auth_req['nonce'], ha2)
+          digest_res = hexdigest(ha1, auth_req['nonce'], ha2_res)
+        end
+
+        if digest != auth_req['response']
+          error("%s: digest unmatch.", auth_req['username'])
+          return false
+        elsif nonce_is_invalid
+          error('%s: digest is valid, but nonce is not valid.',
+                auth_req['username'])
+          return :nonce_is_stale
+        elsif @use_auth_info_header
+          auth_info = {
+            'nextnonce' => generate_next_nonce(req),
+            'rspauth'   => digest_res
+          }
+          if @use_opaque
+            opaque_struct.time  = req.request_time
+            opaque_struct.nonce = auth_info['nextnonce']
+            opaque_struct.nc    = "%08x" % (auth_req['nc'].hex + 1)
+          end
+          if auth_req['qop'] == "auth" || auth_req['qop'] == "auth-int"
+            ['qop','cnonce','nc'].each{|key|
+              auth_info[key] = auth_req[key]
+            }
+          end
+          res[@resp_info_field] = auth_info.keys.map{|key|
+            if key == 'nc'
+              key + '=' + auth_info[key]
+            else
+              key + "=" + HTTPUtils::quote(auth_info[key])
+            end
+          }.join(', ')
+        end
+        info('%s: authentication scceeded.', auth_req['username'])
+        req.user = auth_req['username']
+        return true
+      end
+
+      def split_param_value(string)
+        ret = {}
+        while string.size != 0
+          case string           
+          when /^\s*([\w\-\.\*\%\!]+)=\s*\"((\\.|[^\"])*)\"\s*,?/
+            key = $1
+            matched = $2
+            string = $'
+            ret[key] = matched.gsub(/\\(.)/, "\\1")
+          when /^\s*([\w\-\.\*\%\!]+)=\s*([^,\"]*),?/
+            key = $1
+            matched = $2
+            string = $'
+            ret[key] = matched.clone
+          when /^s*^,/
+            string = $'
+          else
+            break
+          end
+        end
+        ret
+      end
+
+      def generate_next_nonce(req)
+        now = "%012d" % req.request_time.to_i
+        pk  = hexdigest(now, @instance_key)[0,32]
+        nonce = [now + ":" + pk].pack("m*").chop # it has 60 length of chars.
+        nonce
+      end
+
+      def check_nonce(req, auth_req)
+        username = auth_req['username']
+        nonce = auth_req['nonce']
+
+        pub_time, pk = nonce.unpack("m*")[0].split(":", 2)
+        if (!pub_time || !pk)
+          error("%s: empty nonce is given", username)
+          return false
+        elsif (hexdigest(pub_time, @instance_key)[0,32] != pk)
+          error("%s: invalid private-key: %s for %s",
+                username, hexdigest(pub_time, @instance_key)[0,32], pk)
+          return false
+        end
+
+        diff_time = req.request_time.to_i - pub_time.to_i
+        if (diff_time < 0)
+          error("%s: difference of time-stamp is negative.", username)
+          return false
+        elsif diff_time > @nonce_expire_period
+          error("%s: nonce is expired.", username)
+          return false
+        end
+
+        return true
+      end
+
+      def generate_opaque(req)
+        @mutex.synchronize{
+          now = req.request_time
+          if now - @last_nonce_expire > @nonce_expire_delta
+            @opaques.delete_if{|key,val|
+              (now - val.time) > @nonce_expire_period
+            }
+            @last_nonce_expire = now
+          end
+          begin
+            opaque = Utils::random_string(16)
+          end while @opaques[opaque]
+          @opaques[opaque] = OpaqueInfo.new(now, nil, '00000001')
+          opaque
+        }
+      end
+
+      def check_opaque(opaque_struct, req, auth_req)
+        if (@use_next_nonce && auth_req['nonce'] != opaque_struct.nonce)
+          error('%s: nonce unmatched. "%s" for "%s"',
+                auth_req['username'], auth_req['nonce'], opaque_struct.nonce)
+          return false
+        elsif !check_nonce(req, auth_req)
+          return false
+        end
+        if (@check_nc && auth_req['nc'] != opaque_struct.nc)
+          error('%s: nc unmatched."%s" for "%s"',
+                auth_req['username'], auth_req['nc'], opaque_struct.nc)
+          return false
+        end
+        true
+      end
+
+      def check_uri(req, auth_req)
+        uri = auth_req['uri']
+        if uri != req.request_uri.to_s && uri != req.unparsed_uri &&
+           (@internet_explorer_hack && uri != req.path)
+          error('%s: uri unmatch. "%s" for "%s"', auth_req['username'], 
+                auth_req['uri'], req.request_uri.to_s)
+          return false
+        end
+        true
+      end
+
+      def hexdigest(*args)
+        @h.hexdigest(args.join(":"))
+      end
+    end
+
+    class ProxyDigestAuth < DigestAuth
+      include ProxyAuthenticator
+
+      def check_uri(req, auth_req)
+        return true
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpauth/htdigest.rb b/ruby_1_8_6/lib/webrick/httpauth/htdigest.rb
new file mode 100644
index 0000000000..3949756f2b
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpauth/htdigest.rb
@@ -0,0 +1,91 @@
+#
+# httpauth/htdigest.rb -- Apache compatible htdigest file
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: htdigest.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $
+
+require 'webrick/httpauth/userdb'
+require 'webrick/httpauth/digestauth'
+require 'tempfile'
+
+module WEBrick
+  module HTTPAuth
+    class Htdigest
+      include UserDB
+
+      def initialize(path)
+        @path = path
+        @mtime = Time.at(0)
+        @digest = Hash.new
+        @mutex = Mutex::new
+        @auth_type = DigestAuth
+        open(@path,"a").close unless File::exist?(@path)
+        reload
+      end
+
+      def reload
+        mtime = File::mtime(@path)
+        if mtime > @mtime
+          @digest.clear
+          open(@path){|io|
+            while line = io.gets
+              line.chomp!
+              user, realm, pass = line.split(/:/, 3)
+              unless @digest[realm]
+                @digest[realm] = Hash.new
+              end
+              @digest[realm][user] = pass
+            end
+          }
+          @mtime = mtime
+        end
+      end
+
+      def flush(output=nil)
+        output ||= @path
+        tmp = Tempfile.new("htpasswd", File::dirname(output))
+        begin
+          each{|item| tmp.puts(item.join(":")) }
+          tmp.close
+          File::rename(tmp.path, output)
+        rescue
+          tmp.close(true)
+        end
+      end
+
+      def get_passwd(realm, user, reload_db)
+        reload() if reload_db
+        if hash = @digest[realm]
+          hash[user]
+        end
+      end
+
+      def set_passwd(realm, user, pass)
+        @mutex.synchronize{
+          unless @digest[realm]
+            @digest[realm] = Hash.new
+          end
+          @digest[realm][user] = make_passwd(realm, user, pass)
+        }
+      end
+
+      def delete_passwd(realm, user)
+        if hash = @digest[realm]
+          hash.delete(user)
+        end
+      end
+
+      def each
+        @digest.keys.sort.each{|realm|
+          hash = @digest[realm]
+          hash.keys.sort.each{|user|
+            yield([user, realm, hash[user]])
+          }
+        }
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpauth/htgroup.rb b/ruby_1_8_6/lib/webrick/httpauth/htgroup.rb
new file mode 100644
index 0000000000..c9270c61cc
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpauth/htgroup.rb
@@ -0,0 +1,61 @@
+#
+# httpauth/htgroup.rb -- Apache compatible htgroup file
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: htgroup.rb,v 1.1 2003/02/16 22:22:56 gotoyuzo Exp $
+
+require 'tempfile'
+
+module WEBrick
+  module HTTPAuth
+    class Htgroup
+      def initialize(path)
+        @path = path
+        @mtime = Time.at(0)
+        @group = Hash.new
+        open(@path,"a").close unless File::exist?(@path)
+        reload
+      end
+
+      def reload
+        if (mtime = File::mtime(@path)) > @mtime
+          @group.clear
+          open(@path){|io|
+            while line = io.gets
+              line.chomp!
+              group, members = line.split(/:\s*/)
+              @group[group] = members.split(/\s+/)
+            end
+          }
+          @mtime = mtime
+        end
+      end
+
+      def flush(output=nil)
+        output ||= @path
+        tmp = Tempfile.new("htgroup", File::dirname(output))
+        begin
+          @group.keys.sort.each{|group|
+            tmp.puts(format("%s: %s", group, self.members(group).join(" ")))
+          }
+          tmp.close
+          File::rename(tmp.path, output)
+        rescue
+          tmp.close(true)
+        end
+      end
+
+      def members(group)
+        reload
+        @group[group] || []
+      end
+
+      def add(group, members)
+        @group[group] = members(group) | members
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpauth/htpasswd.rb b/ruby_1_8_6/lib/webrick/httpauth/htpasswd.rb
new file mode 100644
index 0000000000..40f9297b05
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpauth/htpasswd.rb
@@ -0,0 +1,83 @@
+#
+# httpauth/htpasswd -- Apache compatible htpasswd file
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: htpasswd.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $
+
+require 'webrick/httpauth/userdb'
+require 'webrick/httpauth/basicauth'
+require 'tempfile'
+
+module WEBrick
+  module HTTPAuth
+    class Htpasswd
+      include UserDB
+
+      def initialize(path)
+        @path = path
+        @mtime = Time.at(0)
+        @passwd = Hash.new
+        @auth_type = BasicAuth
+        open(@path,"a").close unless File::exist?(@path)
+        reload
+      end
+
+      def reload
+        mtime = File::mtime(@path)
+        if mtime > @mtime
+          @passwd.clear
+          open(@path){|io|
+            while line = io.gets
+              line.chomp!
+              case line
+              when %r!\A[^:]+:[a-zA-Z0-9./]{13}\z!
+                user, pass = line.split(":")
+              when /:\$/, /:\{SHA\}/
+                raise NotImplementedError,
+                      'MD5, SHA1 .htpasswd file not supported'
+              else
+                raise StandardError, 'bad .htpasswd file'
+              end
+              @passwd[user] = pass
+            end
+          }
+          @mtime = mtime
+        end
+      end
+
+      def flush(output=nil)
+        output ||= @path
+        tmp = Tempfile.new("htpasswd", File::dirname(output))
+        begin
+          each{|item| tmp.puts(item.join(":")) }
+          tmp.close
+          File::rename(tmp.path, output)
+        rescue
+          tmp.close(true)
+        end
+      end
+
+      def get_passwd(realm, user, reload_db)
+        reload() if reload_db
+        @passwd[user]
+      end
+
+      def set_passwd(realm, user, pass)
+        @passwd[user] = make_passwd(realm, user, pass)
+      end
+
+      def delete_passwd(realm, user)
+        @passwd.delete(user)
+      end
+
+      def each
+        @passwd.keys.sort.each{|user|
+          yield([user, @passwd[user]])
+        }
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpauth/userdb.rb b/ruby_1_8_6/lib/webrick/httpauth/userdb.rb
new file mode 100644
index 0000000000..33e01405f4
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpauth/userdb.rb
@@ -0,0 +1,29 @@
+#
+# httpauth/userdb.rb -- UserDB mix-in module.
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: userdb.rb,v 1.2 2003/02/20 07:15:48 gotoyuzo Exp $
+
+module WEBrick
+  module HTTPAuth
+    module UserDB
+      attr_accessor :auth_type # BasicAuth or DigestAuth
+
+      def make_passwd(realm, user, pass)
+        @auth_type::make_passwd(realm, user, pass)
+      end
+
+      def set_passwd(realm, user, pass)
+        self[user] = pass
+      end                             
+
+      def get_passwd(realm, user, reload_db=false)
+        # reload_db is dummy
+        make_passwd(realm, user, self[user])
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpproxy.rb b/ruby_1_8_6/lib/webrick/httpproxy.rb
new file mode 100644
index 0000000000..14e3499775
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpproxy.rb
@@ -0,0 +1,254 @@
+#
+# httpproxy.rb -- HTTPProxy Class
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2002 GOTO Kentaro
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: httpproxy.rb,v 1.18 2003/03/08 18:58:10 gotoyuzo Exp $
+# $kNotwork: straw.rb,v 1.3 2002/02/12 15:13:07 gotoken Exp $
+
+require "webrick/httpserver"
+require "net/http"
+
+Net::HTTP::version_1_2 if RUBY_VERSION < "1.7"
+
+module WEBrick
+  NullReader = Object.new
+  class << NullReader
+    def read(*args)
+      nil
+    end
+    alias gets read
+  end
+
+  class HTTPProxyServer < HTTPServer
+    def initialize(config)
+      super
+      c = @config
+      @via = "#{c[:HTTPVersion]} #{c[:ServerName]}:#{c[:Port]}"
+    end
+
+    def service(req, res)
+      if req.request_method == "CONNECT"
+        proxy_connect(req, res)
+      elsif req.unparsed_uri =~ %r!^http://!
+        proxy_service(req, res)
+      else
+        super(req, res)
+      end
+    end
+
+    def proxy_auth(req, res)
+      if proc = @config[:ProxyAuthProc]
+        proc.call(req, res)
+      end
+      req.header.delete("proxy-authorization")
+    end
+
+    # Some header fields shuold not be transfered.
+    HopByHop = %w( connection keep-alive proxy-authenticate upgrade
+                   proxy-authorization te trailers transfer-encoding )
+    ShouldNotTransfer = %w( set-cookie proxy-connection )
+    def split_field(f) f ? f.split(/,\s+/).collect{|i| i.downcase } : [] end
+
+    def choose_header(src, dst)
+      connections = split_field(src['connection'])
+      src.each{|key, value|
+        key = key.downcase
+        if HopByHop.member?(key)          || # RFC2616: 13.5.1
+           connections.member?(key)       || # RFC2616: 14.10
+           ShouldNotTransfer.member?(key)    # pragmatics
+          @logger.debug("choose_header: `#{key}: #{value}'")
+          next
+        end
+        dst[key] = value
+      }
+    end
+
+    # Net::HTTP is stupid about the multiple header fields.
+    # Here is workaround:
+    def set_cookie(src, dst)
+      if str = src['set-cookie']
+        cookies = []
+        str.split(/,\s*/).each{|token|
+          if /^[^=]+;/o =~ token
+            cookies[-1] << ", " << token
+          elsif /=/o =~ token
+            cookies << token
+          else
+            cookies[-1] << ", " << token
+          end
+        }
+        dst.cookies.replace(cookies)
+      end
+    end
+
+    def set_via(h)
+      if @config[:ProxyVia]
+        if  h['via']
+          h['via'] << ", " << @via
+        else
+          h['via'] = @via
+        end
+      end
+    end
+
+    def proxy_uri(req, res)
+      @config[:ProxyURI]
+    end
+
+    def proxy_service(req, res)
+      # Proxy Authentication
+      proxy_auth(req, res)      
+
+      # Create Request-URI to send to the origin server
+      uri  = req.request_uri
+      path = uri.path.dup
+      path << "?" << uri.query if uri.query
+
+      # Choose header fields to transfer
+      header = Hash.new
+      choose_header(req, header)
+      set_via(header)
+
+      # select upstream proxy server
+      if proxy = proxy_uri(req, res)
+        proxy_host = proxy.host
+        proxy_port = proxy.port
+        if proxy.userinfo
+          credentials = "Basic " + [proxy.userinfo].pack("m*")
+          credentials.chomp!
+          header['proxy-authorization'] = credentials
+        end
+      end
+
+      response = nil
+      begin
+        http = Net::HTTP.new(uri.host, uri.port, proxy_host, proxy_port)
+        http.start{
+          if @config[:ProxyTimeout]
+            ##################################   these issues are 
+            http.open_timeout = 30   # secs  #   necessary (maybe bacause
+            http.read_timeout = 60   # secs  #   Ruby's bug, but why?)
+            ##################################
+          end
+          case req.request_method
+          when "GET"  then response = http.get(path, header)
+          when "POST" then response = http.post(path, req.body || "", header)
+          when "HEAD" then response = http.head(path, header)
+          else
+            raise HTTPStatus::MethodNotAllowed,
+              "unsupported method `#{req.request_method}'."
+          end
+        }
+      rescue => err
+        logger.debug("#{err.class}: #{err.message}")
+        raise HTTPStatus::ServiceUnavailable, err.message
+      end
+  
+      # Persistent connction requirements are mysterious for me.
+      # So I will close the connection in every response.
+      res['proxy-connection'] = "close"
+      res['connection'] = "close"
+
+      # Convert Net::HTTP::HTTPResponse to WEBrick::HTTPProxy
+      res.status = response.code.to_i
+      choose_header(response, res)
+      set_cookie(response, res)
+      set_via(res)
+      res.body = response.body
+
+      # Process contents
+      if handler = @config[:ProxyContentHandler]
+        handler.call(req, res)
+      end
+    end
+
+    def proxy_connect(req, res)
+      # Proxy Authentication
+      proxy_auth(req, res)
+
+      ua = Thread.current[:WEBrickSocket]  # User-Agent
+      raise HTTPStatus::InternalServerError,
+        "[BUG] cannot get socket" unless ua
+
+      host, port = req.unparsed_uri.split(":", 2)
+      # Proxy authentication for upstream proxy server
+      if proxy = proxy_uri(req, res)
+        proxy_request_line = "CONNECT #{host}:#{port} HTTP/1.0"
+        if proxy.userinfo
+          credentials = "Basic " + [proxy.userinfo].pack("m*")
+          credentials.chomp!
+        end
+        host, port = proxy.host, proxy.port
+      end
+
+      begin
+        @logger.debug("CONNECT: upstream proxy is `#{host}:#{port}'.")
+        os = TCPSocket.new(host, port)     # origin server
+
+        if proxy
+          @logger.debug("CONNECT: sending a Request-Line")
+          os << proxy_request_line << CRLF
+          @logger.debug("CONNECT: > #{proxy_request_line}")
+          if credentials
+            @logger.debug("CONNECT: sending a credentials")
+            os << "Proxy-Authorization: " << credentials << CRLF
+          end
+          os << CRLF
+          proxy_status_line = os.gets(LF)
+          @logger.debug("CONNECT: read a Status-Line form the upstream server")
+          @logger.debug("CONNECT: < #{proxy_status_line}")
+          if %r{^HTTP/\d+\.\d+\s+200\s*} =~ proxy_status_line
+            while line = os.gets(LF)
+              break if /\A(#{CRLF}|#{LF})\z/om =~ line
+            end
+          else
+            raise HTTPStatus::BadGateway
+          end
+        end
+        @logger.debug("CONNECT #{host}:#{port}: succeeded")
+        res.status = HTTPStatus::RC_OK
+      rescue => ex
+        @logger.debug("CONNECT #{host}:#{port}: failed `#{ex.message}'")
+        res.set_error(ex)
+        raise HTTPStatus::EOFError
+      ensure
+        if handler = @config[:ProxyContentHandler]
+          handler.call(req, res)
+        end
+        res.send_response(ua)
+        access_log(@config, req, res)
+
+        # Should clear request-line not to send the sesponse twice.
+        # see: HTTPServer#run
+        req.parse(NullReader) rescue nil
+      end
+
+      begin
+        while fds = IO::select([ua, os])
+          if fds[0].member?(ua)
+            buf = ua.sysread(1024);
+            @logger.debug("CONNECT: #{buf.size} byte from User-Agent")
+            os.syswrite(buf)
+          elsif fds[0].member?(os)
+            buf = os.sysread(1024);
+            @logger.debug("CONNECT: #{buf.size} byte from #{host}:#{port}")
+            ua.syswrite(buf)
+          end
+        end
+      rescue => ex
+        os.close
+        @logger.debug("CONNECT #{host}:#{port}: closed")
+      end
+
+      raise HTTPStatus::EOFError
+    end
+
+    def do_OPTIONS(req, res)
+      res['allow'] = "GET,HEAD,POST,OPTIONS,CONNECT"
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httprequest.rb b/ruby_1_8_6/lib/webrick/httprequest.rb
new file mode 100644
index 0000000000..1d32293a27
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httprequest.rb
@@ -0,0 +1,365 @@
+#
+# httprequest.rb -- HTTPRequest Class
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: httprequest.rb,v 1.64 2003/07/13 17:18:22 gotoyuzo Exp $
+
+require 'timeout'
+require 'uri'
+
+require 'webrick/httpversion'
+require 'webrick/httpstatus'
+require 'webrick/httputils'
+require 'webrick/cookie'
+
+module WEBrick
+
+  class HTTPRequest
+    BODY_CONTAINABLE_METHODS = [ "POST", "PUT" ]
+    BUFSIZE = 1024*4
+
+    # Request line
+    attr_reader :request_line
+    attr_reader :request_method, :unparsed_uri, :http_version
+
+    # Request-URI
+    attr_reader :request_uri, :host, :port, :path
+    attr_accessor :script_name, :path_info, :query_string
+
+    # Header and entity body
+    attr_reader :raw_header, :header, :cookies
+    attr_reader :accept, :accept_charset
+    attr_reader :accept_encoding, :accept_language
+
+    # Misc
+    attr_accessor :user
+    attr_reader :addr, :peeraddr
+    attr_reader :attributes
+    attr_reader :keep_alive
+    attr_reader :request_time
+
+    def initialize(config)
+      @config = config
+      @logger = config[:Logger]
+
+      @request_line = @request_method =
+        @unparsed_uri = @http_version = nil
+
+      @request_uri = @host = @port = @path = nil
+      @script_name = @path_info = nil
+      @query_string = nil
+      @query = nil
+      @form_data = nil
+
+      @raw_header = Array.new
+      @header = nil
+      @cookies = []
+      @accept = []
+      @accept_charset = []
+      @accept_encoding = []
+      @accept_language = []
+      @body = ""
+
+      @addr = @peeraddr = nil
+      @attributes = {}
+      @user = nil
+      @keep_alive = false
+      @request_time = nil
+
+      @remaining_size = nil
+      @socket = nil
+    end
+
+    def parse(socket=nil)
+      @socket = socket
+      begin
+        @peeraddr = socket.respond_to?(:peeraddr) ? socket.peeraddr : []
+        @addr = socket.respond_to?(:addr) ? socket.addr : []
+      rescue Errno::ENOTCONN
+        raise HTTPStatus::EOFError
+      end
+
+      read_request_line(socket)
+      if @http_version.major > 0
+        read_header(socket)
+        @header['cookie'].each{|cookie|
+          @cookies += Cookie::parse(cookie)
+        }
+        @accept = HTTPUtils.parse_qvalues(self['accept'])
+        @accept_charset = HTTPUtils.parse_qvalues(self['accept-charset'])
+        @accept_encoding = HTTPUtils.parse_qvalues(self['accept-encoding'])
+        @accept_language = HTTPUtils.parse_qvalues(self['accept-language'])
+      end
+      return if @request_method == "CONNECT"
+      return if @unparsed_uri == "*"
+
+      begin
+        @request_uri = parse_uri(@unparsed_uri)
+        @path = HTTPUtils::unescape(@request_uri.path)
+        @path = HTTPUtils::normalize_path(@path)
+        @host = @request_uri.host
+        @port = @request_uri.port
+        @query_string = @request_uri.query
+        @script_name = ""
+        @path_info = @path.dup
+      rescue
+        raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'."
+      end
+
+      if /close/io =~ self["connection"]
+        @keep_alive = false
+      elsif /keep-alive/io =~ self["connection"]
+        @keep_alive = true
+      elsif @http_version < "1.1"
+        @keep_alive = false
+      else
+        @keep_alive = true
+      end
+    end
+
+    def body(&block)
+      block ||= Proc.new{|chunk| @body << chunk }
+      read_body(@socket, block)
+      @body.empty? ? nil : @body
+    end
+
+    def query
+      unless @query
+        parse_query()
+      end
+      @query
+    end
+
+    def content_length
+      return Integer(self['content-length'])
+    end
+
+    def content_type
+      return self['content-type']
+    end
+
+    def [](header_name)
+      if @header
+        value = @header[header_name.downcase]
+        value.empty? ? nil : value.join(", ")
+      end
+    end
+
+    def each
+      @header.each{|k, v|
+        value = @header[k]
+        yield(k, value.empty? ? nil : value.join(", "))
+      }
+    end
+
+    def keep_alive?
+      @keep_alive
+    end
+
+    def to_s
+      ret = @request_line.dup
+      @raw_header.each{|line| ret << line }
+      ret << CRLF
+      ret << body if body
+      ret
+    end
+
+    def fixup()
+      begin
+        body{|chunk| }   # read remaining body
+      rescue HTTPStatus::Error => ex
+        @logger.error("HTTPRequest#fixup: #{ex.class} occured.")
+        @keep_alive = false
+      rescue => ex
+        @logger.error(ex)
+        @keep_alive = false
+      end
+    end
+
+    def meta_vars
+      # This method provides the metavariables defined by the revision 3
+      # of ``The WWW Common Gateway Interface Version 1.1''.
+      # (http://Web.Golux.Com/coar/cgi/)
+
+      meta = Hash.new
+
+      cl = self["Content-Length"]
+      ct = self["Content-Type"]
+      meta["CONTENT_LENGTH"]    = cl if cl.to_i > 0
+      meta["CONTENT_TYPE"]      = ct.dup if ct
+      meta["GATEWAY_INTERFACE"] = "CGI/1.1"
+      meta["PATH_INFO"]         = @path_info ? @path_info.dup : ""
+     #meta["PATH_TRANSLATED"]   = nil      # no plan to be provided
+      meta["QUERY_STRING"]      = @query_string ? @query_string.dup : ""
+      meta["REMOTE_ADDR"]       = @peeraddr[3]
+      meta["REMOTE_HOST"]       = @peeraddr[2]
+     #meta["REMOTE_IDENT"]      = nil      # no plan to be provided
+      meta["REMOTE_USER"]       = @user
+      meta["REQUEST_METHOD"]    = @request_method.dup
+      meta["REQUEST_URI"]       = @request_uri.to_s
+      meta["SCRIPT_NAME"]       = @script_name.dup
+      meta["SERVER_NAME"]       = @host
+      meta["SERVER_PORT"]       = @port.to_s
+      meta["SERVER_PROTOCOL"]   = "HTTP/" + @config[:HTTPVersion].to_s
+      meta["SERVER_SOFTWARE"]   = @config[:ServerSoftware].dup
+
+      self.each{|key, val|
+        next if /^content-type$/i =~ key
+        next if /^content-length$/i =~ key
+        name = "HTTP_" + key
+        name.gsub!(/-/o, "_")
+        name.upcase!
+        meta[name] = val
+      }
+
+      meta
+    end
+
+    private
+
+    def read_request_line(socket)
+      @request_line = read_line(socket) if socket
+      @request_time = Time.now
+      raise HTTPStatus::EOFError unless @request_line
+      if /^(\S+)\s+(\S+)(?:\s+HTTP\/(\d+\.\d+))?\r?\n/mo =~ @request_line
+        @request_method = $1
+        @unparsed_uri   = $2
+        @http_version   = HTTPVersion.new($3 ? $3 : "0.9")
+      else
+        rl = @request_line.sub(/\x0d?\x0a\z/o, '')
+        raise HTTPStatus::BadRequest, "bad Request-Line `#{rl}'."
+      end
+    end
+
+    def read_header(socket)
+      if socket
+        while line = read_line(socket)
+          break if /\A(#{CRLF}|#{LF})\z/om =~ line
+          @raw_header << line
+        end
+      end
+      begin
+        @header = HTTPUtils::parse_header(@raw_header)
+      rescue => ex
+        raise  HTTPStatus::BadRequest, ex.message
+      end
+    end
+
+    def parse_uri(str, scheme="http")
+      if @config[:Escape8bitURI]
+        str = HTTPUtils::escape8bit(str)
+      end
+      uri = URI::parse(str)
+      return uri if uri.absolute?
+      if self["host"]
+        pattern = /\A(#{URI::REGEXP::PATTERN::HOST})(?::(\d+))?\z/n
+        host, port = *self['host'].scan(pattern)[0]
+      elsif @addr.size > 0
+        host, port = @addr[2], @addr[1]
+      else
+        host, port = @config[:ServerName], @config[:Port]
+      end
+      uri.scheme = scheme
+      uri.host = host
+      uri.port = port ? port.to_i : nil
+      return URI::parse(uri.to_s)
+    end
+
+    def read_body(socket, block)
+      return unless socket
+      if tc = self['transfer-encoding']
+        case tc
+        when /chunked/io then read_chunked(socket, block)
+        else raise HTTPStatus::NotImplemented, "Transfer-Encoding: #{tc}."
+        end
+      elsif self['content-length'] || @remaining_size
+        @remaining_size ||= self['content-length'].to_i
+        while @remaining_size > 0 
+          sz = BUFSIZE < @remaining_size ? BUFSIZE : @remaining_size
+          break unless buf = read_data(socket, sz)
+          @remaining_size -= buf.size
+          block.call(buf)
+        end
+        if @remaining_size > 0 && @socket.eof?
+          raise HTTPStatus::BadRequest, "invalid body size."
+        end
+      elsif BODY_CONTAINABLE_METHODS.member?(@request_method)
+        raise HTTPStatus::LengthRequired
+      end
+      return @body
+    end
+
+    def read_chunk_size(socket)
+      line = read_line(socket)
+      if /^([0-9a-fA-F]+)(?:;(\S+))?/ =~ line
+        chunk_size = $1.hex
+        chunk_ext = $2
+        [ chunk_size, chunk_ext ]
+      else
+        raise HTTPStatus::BadRequest, "bad chunk `#{line}'."
+      end
+    end
+
+    def read_chunked(socket, block)
+      chunk_size, = read_chunk_size(socket)
+      while chunk_size > 0
+        data = ""
+        while data.size < chunk_size
+          tmp = read_data(socket, chunk_size-data.size) # read chunk-data
+          break unless tmp
+          data << tmp
+        end
+        if data.nil? || data.size != chunk_size
+          raise BadRequest, "bad chunk data size."
+        end
+        read_line(socket)                    # skip CRLF
+        block.call(data)
+        chunk_size, = read_chunk_size(socket)
+      end
+      read_header(socket)                    # trailer + CRLF
+      @header.delete("transfer-encoding")
+      @remaining_size = 0
+    end
+
+    def _read_data(io, method, arg)
+      begin
+        timeout(@config[:RequestTimeout]){
+          return io.__send__(method, arg)
+        }
+      rescue Errno::ECONNRESET
+        return nil
+      rescue TimeoutError
+        raise HTTPStatus::RequestTimeout
+      end
+    end
+
+    def read_line(io)
+      _read_data(io, :gets, LF)
+    end
+
+    def read_data(io, size)
+      _read_data(io, :read, size)
+    end
+
+    def parse_query()
+      begin
+        if @request_method == "GET" || @request_method == "HEAD"
+          @query = HTTPUtils::parse_query(@query_string)
+        elsif self['content-type'] =~ /^application\/x-www-form-urlencoded/
+          @query = HTTPUtils::parse_query(body)
+        elsif self['content-type'] =~ /^multipart\/form-data; boundary=(.+)/
+          boundary = HTTPUtils::dequote($1)
+          @query = HTTPUtils::parse_form_data(body, boundary)
+        else
+          @query = Hash.new
+        end
+      rescue => ex
+        raise HTTPStatus::BadRequest, ex.message
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpresponse.rb b/ruby_1_8_6/lib/webrick/httpresponse.rb
new file mode 100644
index 0000000000..d0f232d1e1
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpresponse.rb
@@ -0,0 +1,327 @@
+#
+# httpresponse.rb -- HTTPResponse Class
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: httpresponse.rb,v 1.45 2003/07/11 11:02:25 gotoyuzo Exp $
+
+require 'time'
+require 'webrick/httpversion'
+require 'webrick/htmlutils'
+require 'webrick/httputils'
+require 'webrick/httpstatus'
+
+module WEBrick
+  class HTTPResponse
+    BUFSIZE = 1024*4
+
+    attr_reader :http_version, :status, :header
+    attr_reader :cookies
+    attr_accessor :reason_phrase
+    attr_accessor :body
+
+    attr_accessor :request_method, :request_uri, :request_http_version
+    attr_accessor :filename
+    attr_accessor :keep_alive
+    attr_reader :config, :sent_size
+
+    def initialize(config)
+      @config = config
+      @logger = config[:Logger]
+      @header = Hash.new
+      @status = HTTPStatus::RC_OK
+      @reason_phrase = nil
+      @http_version = HTTPVersion::convert(@config[:HTTPVersion])
+      @body = ''
+      @keep_alive = true
+      @cookies = []
+      @request_method = nil
+      @request_uri = nil
+      @request_http_version = @http_version  # temporary
+      @chunked = false
+      @filename = nil
+      @sent_size = 0
+    end
+
+    def status_line
+      "HTTP/#@http_version #@status #@reason_phrase #{CRLF}"
+    end
+
+    def status=(status)
+      @status = status
+      @reason_phrase = HTTPStatus::reason_phrase(status)
+    end
+
+    def [](field)
+      @header[field.downcase]
+    end
+
+    def []=(field, value)
+      @header[field.downcase] = value.to_s
+    end
+
+    def content_length
+      if len = self['content-length']
+        return Integer(len)
+      end
+    end
+
+    def content_length=(len)
+      self['content-length'] = len.to_s
+    end
+
+    def content_type
+      self['content-type']
+    end
+
+    def content_type=(type)
+      self['content-type'] = type
+    end
+
+    def each
+      @header.each{|k, v|  yield(k, v) }
+    end
+
+    def chunked?
+      @chunked
+    end
+
+    def chunked=(val)
+      @chunked = val ? true : false
+    end
+
+    def keep_alive?
+      @keep_alive
+    end
+
+    def send_response(socket)
+      begin
+        setup_header()
+        send_header(socket)
+        send_body(socket)
+      rescue Errno::EPIPE, Errno::ECONNRESET, Errno::ENOTCONN => ex
+        @logger.debug(ex)
+        @keep_alive = false
+      rescue Exception => ex
+        @logger.error(ex)
+        @keep_alive = false
+      end
+    end
+
+    def setup_header()
+      @reason_phrase    ||= HTTPStatus::reason_phrase(@status)
+      @header['server'] ||= @config[:ServerSoftware]
+      @header['date']   ||= Time.now.httpdate
+
+      # HTTP/0.9 features
+      if @request_http_version < "1.0"
+        @http_version = HTTPVersion.new("0.9")
+        @keep_alive = false
+      end
+
+      # HTTP/1.0 features
+      if @request_http_version < "1.1"
+        if chunked?
+          @chunked = false
+          ver = @request_http_version.to_s
+          msg = "chunked is set for an HTTP/#{ver} request. (ignored)"
+          @logger.warn(msg)
+        end
+      end
+
+      # Determin the message length (RFC2616 -- 4.4 Message Length)
+      if @status == 304 || @status == 204 || HTTPStatus::info?(@status)
+        @header.delete('content-length')
+        @body = ""
+      elsif chunked?
+        @header["transfer-encoding"] = "chunked"
+        @header.delete('content-length')
+      elsif %r{^multipart/byteranges} =~ @header['content-type']
+        @header.delete('content-length')
+      elsif @header['content-length'].nil?
+        unless @body.is_a?(IO)
+          @header['content-length'] = @body ? @body.size : 0
+        end
+      end
+
+      # Keep-Alive connection.
+      if @header['connection'] == "close"
+         @keep_alive = false
+      elsif keep_alive?
+        if chunked? || @header['content-length']
+          @header['connection'] = "Keep-Alive"
+        end
+      else
+        @header['connection'] = "close"
+      end
+
+      # Location is a single absoluteURI.
+      if location = @header['location']
+        if @request_uri
+          @header['location'] = @request_uri.merge(location)
+        end
+      end
+    end
+
+    def send_header(socket)
+      if @http_version.major > 0
+        data = status_line()
+        @header.each{|key, value|
+          tmp = key.gsub(/\bwww|^te$|\b\w/){|s| s.upcase }
+          data << "#{tmp}: #{value}" << CRLF
+        }
+        @cookies.each{|cookie|
+          data << "Set-Cookie: " << cookie.to_s << CRLF
+        }
+        data << CRLF
+        _write_data(socket, data)
+      end
+    end
+
+    def send_body(socket)
+      case @body
+      when IO then send_body_io(socket)
+      else send_body_string(socket)
+      end
+    end
+
+    def to_s
+      ret = ""
+      send_response(ret)
+      ret
+    end
+
+    def set_redirect(status, url)
+      @body = "<HTML><A HREF=\"#{url.to_s}\">#{url.to_s}</A>.</HTML>\n"
+      @header['location'] = url.to_s
+      raise status
+    end
+
+    def set_error(ex, backtrace=false)
+      case ex
+      when HTTPStatus::Status 
+        @keep_alive = false if HTTPStatus::error?(ex.code)
+        self.status = ex.code
+      else 
+        @keep_alive = false
+        self.status = HTTPStatus::RC_INTERNAL_SERVER_ERROR
+      end
+      @header['content-type'] = "text/html"
+
+      if respond_to?(:create_error_page)
+        create_error_page()
+        return
+      end
+
+      if @request_uri
+        host, port = @request_uri.host, @request_uri.port
+      else
+        host, port = @config[:ServerName], @config[:Port]
+      end
+
+      @body = ''
+      @body << <<-_end_of_html_
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+  <HEAD><TITLE>#{HTMLUtils::escape(@reason_phrase)}</TITLE></HEAD>
+  <BODY>
+    <H1>#{HTMLUtils::escape(@reason_phrase)}</H1>
+    #{HTMLUtils::escape(ex.message)}
+    <HR>
+      _end_of_html_
+
+      if backtrace && $DEBUG
+        @body << "backtrace of `#{HTMLUtils::escape(ex.class.to_s)}' "
+        @body << "#{HTMLUtils::escape(ex.message)}"
+        @body << "<PRE>"
+        ex.backtrace.each{|line| @body << "\t#{line}\n"}
+        @body << "</PRE><HR>"
+      end
+
+      @body << <<-_end_of_html_
+    <ADDRESS>
+     #{HTMLUtils::escape(@config[:ServerSoftware])} at
+     #{host}:#{port}
+    </ADDRESS>
+  </BODY>
+</HTML>
+      _end_of_html_
+    end
+
+    private
+
+    def send_body_io(socket)
+      begin
+        if @request_method == "HEAD"
+          # do nothing
+        elsif chunked?
+          while buf = @body.read(BUFSIZE)
+            next if buf.empty?
+            data = ""
+            data << format("%x", buf.size) << CRLF
+            data << buf << CRLF
+            _write_data(socket, data)
+            @sent_size += buf.size
+          end
+          _write_data(socket, "0#{CRLF}#{CRLF}")
+        else
+          size = @header['content-length'].to_i
+          _send_file(socket, @body, 0, size)
+          @sent_size = size
+        end
+      ensure
+        @body.close
+      end
+    end
+
+    def send_body_string(socket)
+      if @request_method == "HEAD"
+        # do nothing
+      elsif chunked?
+        remain = body ? @body.size : 0
+        while buf = @body[@sent_size, BUFSIZE]
+          break if buf.empty?
+          data = ""
+          data << format("%x", buf.size) << CRLF
+          data << buf << CRLF
+          _write_data(socket, data)
+          @sent_size += buf.size
+        end
+        _write_data(socket, "0#{CRLF}#{CRLF}")
+      else
+        if @body && @body.size > 0
+          _write_data(socket, @body)
+          @sent_size = @body.size
+        end
+      end
+    end
+
+    def _send_file(output, input, offset, size)
+      while offset > 0
+        sz = BUFSIZE < offset ? BUFSIZE : offset
+        buf = input.read(sz)
+        offset -= buf.size
+      end
+
+      if size == 0
+        while buf = input.read(BUFSIZE)
+          _write_data(output, buf)
+        end
+      else
+        while size > 0
+          sz = BUFSIZE < size ? BUFSIZE : size
+          buf = input.read(sz)
+          _write_data(output, buf)
+          size -= buf.size
+        end
+      end
+    end
+
+    def _write_data(socket, data)
+      socket << data
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/https.rb b/ruby_1_8_6/lib/webrick/https.rb
new file mode 100644
index 0000000000..81b65ce803
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/https.rb
@@ -0,0 +1,63 @@
+#
+# https.rb -- SSL/TLS enhancement for HTTPServer
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2001 GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: https.rb,v 1.15 2003/07/22 19:20:42 gotoyuzo Exp $
+
+require 'webrick/ssl'
+
+module WEBrick
+  module Config
+    HTTP.update(SSL)
+  end
+
+  class HTTPRequest
+    attr_reader :cipher, :server_cert, :client_cert
+
+    alias orig_parse parse
+
+    def parse(socket=nil)
+      if socket.respond_to?(:cert)
+        @server_cert = socket.cert || @config[:SSLCertificate]
+        @client_cert = socket.peer_cert
+        @client_cert_chain = socket.peer_cert_chain
+        @cipher      = socket.cipher
+      end
+      orig_parse(socket)
+    end
+
+    alias orig_parse_uri parse_uri
+
+    def parse_uri(str, scheme="https")
+      if @server_cert
+        return orig_parse_uri(str, scheme)
+      end
+      return orig_parse_uri(str)
+    end
+
+    alias orig_meta_vars meta_vars
+
+    def meta_vars
+      meta = orig_meta_vars
+      if @server_cert
+        meta["HTTPS"] = "on"
+        meta["SSL_SERVER_CERT"] = @server_cert.to_pem
+        meta["SSL_CLIENT_CERT"] = @client_cert ? @client_cert.to_pem : ""
+        if @client_cert_chain
+          @client_cert_chain.each_with_index{|cert, i|
+            meta["SSL_CLIENT_CERT_CHAIN_#{i}"] = cert.to_pem
+          }
+        end
+        meta["SSL_CIPHER"] = @cipher[0]
+        meta["SSL_PROTOCOL"] = @cipher[1]
+        meta["SSL_CIPHER_USEKEYSIZE"] = @cipher[2].to_s
+        meta["SSL_CIPHER_ALGKEYSIZE"] = @cipher[3].to_s
+      end
+      meta
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpserver.rb b/ruby_1_8_6/lib/webrick/httpserver.rb
new file mode 100644
index 0000000000..9edb0018f8
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpserver.rb
@@ -0,0 +1,210 @@
+#
+# httpserver.rb -- HTTPServer Class
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: httpserver.rb,v 1.63 2002/10/01 17:16:32 gotoyuzo Exp $
+
+require 'webrick/server'
+require 'webrick/httputils'
+require 'webrick/httpstatus'
+require 'webrick/httprequest'
+require 'webrick/httpresponse'
+require 'webrick/httpservlet'
+require 'webrick/accesslog'
+
+module WEBrick
+  class HTTPServerError < ServerError; end
+
+  class HTTPServer < ::WEBrick::GenericServer
+    def initialize(config={}, default=Config::HTTP)
+      super
+      @http_version = HTTPVersion::convert(@config[:HTTPVersion])
+
+      @mount_tab = MountTable.new
+      if @config[:DocumentRoot]
+        mount("/", HTTPServlet::FileHandler, @config[:DocumentRoot],
+              @config[:DocumentRootOptions])
+      end
+
+      unless @config[:AccessLog]
+        @config[:AccessLog] = [
+          [ $stderr, AccessLog::COMMON_LOG_FORMAT ],
+          [ $stderr, AccessLog::REFERER_LOG_FORMAT ]
+        ]
+      end
+ 
+      @virtual_hosts = Array.new
+    end
+
+    def run(sock)
+      while true 
+        res = HTTPResponse.new(@config)
+        req = HTTPRequest.new(@config)
+        server = self
+        begin
+          timeout = @config[:RequestTimeout]
+          while timeout > 0
+            break if IO.select([sock], nil, nil, 0.5)
+            timeout = 0 if @status != :Running
+            timeout -= 0.5
+          end
+          raise HTTPStatus::EOFError if timeout <= 0 || sock.eof?
+          req.parse(sock)
+          res.request_method = req.request_method
+          res.request_uri = req.request_uri
+          res.request_http_version = req.http_version
+          res.keep_alive = req.keep_alive?
+          server = lookup_server(req) || self
+          if callback = server[:RequestCallback] || server[:RequestHandler]
+            callback.call(req, res)
+          end
+          server.service(req, res)
+        rescue HTTPStatus::EOFError, HTTPStatus::RequestTimeout => ex
+          res.set_error(ex)
+        rescue HTTPStatus::Error => ex
+          @logger.error(ex.message)
+          res.set_error(ex)
+        rescue HTTPStatus::Status => ex
+          res.status = ex.code
+        rescue StandardError => ex
+          @logger.error(ex)
+          res.set_error(ex, true)
+        ensure
+          if req.request_line
+            req.fixup()
+            res.send_response(sock)
+            server.access_log(@config, req, res)
+          end
+        end
+        break if @http_version < "1.1"
+        break unless req.keep_alive?
+        break unless res.keep_alive?
+      end
+    end
+
+    def service(req, res)
+      if req.unparsed_uri == "*"
+        if req.request_method == "OPTIONS"
+          do_OPTIONS(req, res)
+          raise HTTPStatus::OK
+        end
+        raise HTTPStatus::NotFound, "`#{req.unparsed_uri}' not found."
+      end
+
+      servlet, options, script_name, path_info = search_servlet(req.path)
+      raise HTTPStatus::NotFound, "`#{req.path}' not found." unless servlet
+      req.script_name = script_name
+      req.path_info = path_info
+      si = servlet.get_instance(self, *options)
+      @logger.debug(format("%s is invoked.", si.class.name))
+      si.service(req, res)
+    end
+
+    def do_OPTIONS(req, res)
+      res["allow"] = "GET,HEAD,POST,OPTIONS"
+    end
+
+    def mount(dir, servlet, *options)
+      @logger.debug(sprintf("%s is mounted on %s.", servlet.inspect, dir))
+      @mount_tab[dir] = [ servlet, options ]
+    end
+
+    def mount_proc(dir, proc=nil, &block)
+      proc ||= block
+      raise HTTPServerError, "must pass a proc or block" unless proc
+      mount(dir, HTTPServlet::ProcHandler.new(proc))
+    end
+
+    def unmount(dir)
+      @logger.debug(sprintf("unmount %s.", dir))
+      @mount_tab.delete(dir)
+    end
+    alias umount unmount
+
+    def search_servlet(path)
+      script_name, path_info = @mount_tab.scan(path)
+      servlet, options = @mount_tab[script_name]
+      if servlet
+        [ servlet, options, script_name, path_info ]
+      end
+    end
+
+    def virtual_host(server)
+      @virtual_hosts << server
+      @virtual_hosts = @virtual_hosts.sort_by{|s|
+        num = 0
+        num -= 4 if s[:BindAddress]
+        num -= 2 if s[:Port]
+        num -= 1 if s[:ServerName]
+        num
+      }
+    end
+
+    def lookup_server(req)
+      @virtual_hosts.find{|s|
+        (s[:BindAddress].nil? || req.addr[3] == s[:BindAddress]) &&
+        (s[:Port].nil?        || req.port == s[:Port])           &&
+        ((s[:ServerName].nil?  || req.host == s[:ServerName]) ||
+         (!s[:ServerAlias].nil? && s[:ServerAlias].find{|h| h === req.host}))
+      }
+    end
+
+    def access_log(config, req, res)
+      param = AccessLog::setup_params(config, req, res)
+      @config[:AccessLog].each{|logger, fmt|
+        logger << AccessLog::format(fmt+"\n", param)
+      }
+    end
+
+    class MountTable
+      def initialize
+        @tab = Hash.new
+        compile
+      end
+
+      def [](dir)
+        dir = normalize(dir)
+        @tab[dir]
+      end
+
+      def []=(dir, val)
+        dir = normalize(dir)
+        @tab[dir] = val
+        compile
+        val
+      end
+
+      def delete(dir)
+        dir = normalize(dir)
+        res = @tab.delete(dir)
+        compile
+        res
+      end
+
+      def scan(path)
+        @scanner =~ path
+        [ $&, $' ]
+      end
+
+      private
+
+      def compile
+        k = @tab.keys
+        k.sort!
+        k.reverse!
+        k.collect!{|path| Regexp.escape(path) }
+        @scanner = Regexp.new("^(" + k.join("|") +")(?=/|$)")
+      end
+
+      def normalize(dir)
+        ret = dir ? dir.dup : ""
+        ret.sub!(%r|/+$|, "")
+        ret
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpservlet.rb b/ruby_1_8_6/lib/webrick/httpservlet.rb
new file mode 100644
index 0000000000..ac7c022bd7
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpservlet.rb
@@ -0,0 +1,22 @@
+#
+# httpservlet.rb -- HTTPServlet Utility File
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: httpservlet.rb,v 1.21 2003/02/23 12:24:46 gotoyuzo Exp $
+
+require 'webrick/httpservlet/abstract'
+require 'webrick/httpservlet/filehandler'
+require 'webrick/httpservlet/cgihandler'
+require 'webrick/httpservlet/erbhandler'
+require 'webrick/httpservlet/prochandler'
+
+module WEBrick
+  module HTTPServlet
+    FileHandler.add_handler("cgi", CGIHandler)
+    FileHandler.add_handler("rhtml", ERBHandler)
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpservlet/abstract.rb b/ruby_1_8_6/lib/webrick/httpservlet/abstract.rb
new file mode 100644
index 0000000000..03861e8fc7
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpservlet/abstract.rb
@@ -0,0 +1,71 @@
+#
+# httpservlet.rb -- HTTPServlet Module
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: abstract.rb,v 1.24 2003/07/11 11:16:46 gotoyuzo Exp $
+
+require 'thread'
+
+require 'webrick/htmlutils'
+require 'webrick/httputils'
+require 'webrick/httpstatus'
+
+module WEBrick
+  module HTTPServlet
+    class HTTPServletError < StandardError; end
+
+    class AbstractServlet
+      def self.get_instance(config, *options)
+        self.new(config, *options)
+      end
+
+      def initialize(server, *options)
+        @server = @config = server
+        @logger = @server[:Logger]
+        @options = options
+      end
+
+      def service(req, res)
+        method_name = "do_" + req.request_method.gsub(/-/, "_")
+        if respond_to?(method_name)
+          __send__(method_name, req, res)
+        else
+          raise HTTPStatus::MethodNotAllowed,
+                "unsupported method `#{req.request_method}'."
+        end
+      end
+
+      def do_GET(req, res)
+        raise HTTPStatus::NotFound, "not found."
+      end
+
+      def do_HEAD(req, res)
+        do_GET(req, res)
+      end
+
+      def do_OPTIONS(req, res)
+        m = self.methods.grep(/^do_[A-Z]+$/)
+        m.collect!{|i| i.sub(/do_/, "") }
+        m.sort!
+        res["allow"] = m.join(",")
+      end
+
+      private
+
+      def redirect_to_directory_uri(req, res)
+        if req.path[-1] != ?/
+          location = req.path + "/"
+          if req.query_string && req.query_string.size > 0
+            location << "?" << req.query_string
+          end
+          res.set_redirect(HTTPStatus::MovedPermanently, location)
+        end
+      end
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpservlet/cgi_runner.rb b/ruby_1_8_6/lib/webrick/httpservlet/cgi_runner.rb
new file mode 100644
index 0000000000..1069a68d58
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpservlet/cgi_runner.rb
@@ -0,0 +1,45 @@
+#
+# cgi_runner.rb -- CGI launcher.
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU YUUZOU
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: cgi_runner.rb,v 1.9 2002/09/25 11:33:15 gotoyuzo Exp $
+
+def sysread(io, size)
+  buf = ""
+  while size > 0
+    tmp = io.sysread(size)
+    buf << tmp
+    size -= tmp.size
+  end
+  return buf
+end
+
+STDIN.binmode
+
+buf = ""
+len = sysread(STDIN, 8).to_i
+out = sysread(STDIN, len)
+STDOUT.reopen(open(out, "w"))
+
+len = sysread(STDIN, 8).to_i
+err = sysread(STDIN, len)
+STDERR.reopen(open(err, "w"))
+
+len  = sysread(STDIN, 8).to_i
+dump = sysread(STDIN, len)
+hash = Marshal.restore(dump)
+ENV.keys.each{|name| ENV.delete(name) }
+hash.each{|k, v| ENV[k] = v if v }
+
+dir = File::dirname(ENV["SCRIPT_FILENAME"])
+Dir::chdir dir
+
+if interpreter = ARGV[0]
+  exec(interpreter, ENV["SCRIPT_FILENAME"])
+  # NOTREACHED
+end
+exec ENV["SCRIPT_FILENAME"]
diff --git a/ruby_1_8_6/lib/webrick/httpservlet/cgihandler.rb b/ruby_1_8_6/lib/webrick/httpservlet/cgihandler.rb
new file mode 100644
index 0000000000..a35b59edb8
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpservlet/cgihandler.rb
@@ -0,0 +1,104 @@
+# 
+# cgihandler.rb -- CGIHandler Class
+#       
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#   
+# $IPR: cgihandler.rb,v 1.27 2003/03/21 19:56:01 gotoyuzo Exp $
+
+require 'rbconfig'
+require 'tempfile'
+require 'webrick/config'
+require 'webrick/httpservlet/abstract'
+
+module WEBrick
+  module HTTPServlet
+
+    class CGIHandler < AbstractServlet
+      Ruby = File::join(::Config::CONFIG['bindir'],
+                        ::Config::CONFIG['ruby_install_name'])
+      Ruby << ::Config::CONFIG['EXEEXT']
+      CGIRunner = "\"#{Ruby}\" \"#{Config::LIBDIR}/httpservlet/cgi_runner.rb\""
+
+      def initialize(server, name)
+        super
+        @script_filename = name
+        @tempdir = server[:TempDir]
+        @cgicmd = "#{CGIRunner} #{server[:CGIInterpreter]}"
+      end
+
+      def do_GET(req, res)
+        data = nil
+        status = -1
+
+        cgi_in = IO::popen(@cgicmd, "wb")
+        cgi_out = Tempfile.new("webrick.cgiout.", @tempdir)
+        cgi_err = Tempfile.new("webrick.cgierr.", @tempdir)
+        begin
+          cgi_in.sync = true
+          meta = req.meta_vars
+          meta["SCRIPT_FILENAME"] = @script_filename
+          meta["PATH"] = @config[:CGIPathEnv]
+          if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM
+            meta["SystemRoot"] = ENV["SystemRoot"]
+          end
+          dump = Marshal.dump(meta)
+
+          cgi_in.write("%8d" % cgi_out.path.size)
+          cgi_in.write(cgi_out.path)
+          cgi_in.write("%8d" % cgi_err.path.size)
+          cgi_in.write(cgi_err.path)
+          cgi_in.write("%8d" % dump.size)
+          cgi_in.write(dump)
+
+          if req.body and req.body.size > 0
+            cgi_in.write(req.body)
+          end
+        ensure
+          cgi_in.close
+          status = $?.exitstatus
+          sleep 0.1 if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM
+          data = cgi_out.read
+          cgi_out.close(true)
+          if errmsg = cgi_err.read
+            if errmsg.size > 0
+              @logger.error("CGIHandler: #{@script_filename}:\n" + errmsg)
+            end
+          end 
+          cgi_err.close(true)
+        end
+        
+        if status != 0
+          @logger.error("CGIHandler: #{@script_filename} exit with #{status}")
+        end
+
+        data = "" unless data
+        raw_header, body = data.split(/^[\xd\xa]+/on, 2) 
+        raise HTTPStatus::InternalServerError,
+          "Premature end of script headers: #{@script_filename}" if body.nil?
+
+        begin
+          header = HTTPUtils::parse_header(raw_header)
+          if /^(\d+)/ =~ header['status'][0]
+            res.status = $1.to_i
+            header.delete('status')
+          end
+          if header.has_key?('set-cookie')
+            header['set-cookie'].each{|k|
+              res.cookies << Cookie.parse_set_cookie(k)
+            }
+            header.delete('set-cookie')
+          end
+          header.each{|key, val| res[key] = val.join(", ") }
+        rescue => ex
+          raise HTTPStatus::InternalServerError, ex.message
+        end
+        res.body = body
+      end
+      alias do_POST do_GET
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpservlet/erbhandler.rb b/ruby_1_8_6/lib/webrick/httpservlet/erbhandler.rb
new file mode 100644
index 0000000000..b9d5e65b65
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpservlet/erbhandler.rb
@@ -0,0 +1,54 @@
+# 
+# erbhandler.rb -- ERBHandler Class
+# 
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+# 
+# $IPR: erbhandler.rb,v 1.25 2003/02/24 19:25:31 gotoyuzo Exp $
+
+require 'webrick/httpservlet/abstract.rb'
+
+require 'erb'
+
+module WEBrick
+  module HTTPServlet
+
+    class ERBHandler < AbstractServlet
+      def initialize(server, name)
+        super
+        @script_filename = name
+      end
+
+      def do_GET(req, res)
+        unless defined?(ERB)
+          @logger.warn "#{self.class}: ERB not defined."
+          raise HTTPStatus::Forbidden, "ERBHandler cannot work."
+        end
+        begin
+          data = open(@script_filename){|io| io.read }
+          res.body = evaluate(ERB.new(data), req, res)
+          res['content-type'] =
+            HTTPUtils::mime_type(@script_filename, @config[:MimeTypes])
+        rescue StandardError => ex
+          raise
+        rescue Exception => ex
+          @logger.error(ex)
+          raise HTTPStatus::InternalServerError, ex.message
+        end
+      end
+
+      alias do_POST do_GET
+
+      private
+      def evaluate(erb, servlet_request, servlet_response)
+        Module.new.module_eval{
+          meta_vars = servlet_request.meta_vars
+          query = servlet_request.query
+          erb.result(binding)
+        }
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpservlet/filehandler.rb b/ruby_1_8_6/lib/webrick/httpservlet/filehandler.rb
new file mode 100644
index 0000000000..410cc6f9a9
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpservlet/filehandler.rb
@@ -0,0 +1,398 @@
+#
+# filehandler.rb -- FileHandler Module
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: filehandler.rb,v 1.44 2003/06/07 01:34:51 gotoyuzo Exp $
+
+require 'thread'
+require 'time'
+
+require 'webrick/htmlutils'
+require 'webrick/httputils'
+require 'webrick/httpstatus'
+
+module WEBrick
+  module HTTPServlet
+
+    class DefaultFileHandler < AbstractServlet
+      def initialize(server, local_path)
+        super
+        @local_path = local_path
+      end
+
+      def do_GET(req, res)
+        st = File::stat(@local_path)
+        mtime = st.mtime
+        res['etag'] = sprintf("%x-%x-%x", st.ino, st.size, st.mtime.to_i)
+
+        if not_modified?(req, res, mtime, res['etag'])
+          res.body = ''
+          raise HTTPStatus::NotModified
+        elsif req['range'] 
+          make_partial_content(req, res, @local_path, st.size)
+          raise HTTPStatus::PartialContent
+        else
+          mtype = HTTPUtils::mime_type(@local_path, @config[:MimeTypes])
+          res['content-type'] = mtype
+          res['content-length'] = st.size
+          res['last-modified'] = mtime.httpdate
+          res.body = open(@local_path, "rb")
+        end
+      end
+
+      def not_modified?(req, res, mtime, etag)
+        if ir = req['if-range']
+          begin
+            if Time.httpdate(ir) >= mtime
+              return true
+            end
+          rescue
+            if HTTPUtils::split_header_value(ir).member?(res['etag'])
+              return true
+            end
+          end
+        end
+
+        if (ims = req['if-modified-since']) && Time.parse(ims) >= mtime
+          return true
+        end
+
+        if (inm = req['if-none-match']) &&
+           HTTPUtils::split_header_value(inm).member?(res['etag'])
+          return true
+        end
+
+        return false
+      end
+
+      def make_partial_content(req, res, filename, filesize)
+        mtype = HTTPUtils::mime_type(filename, @config[:MimeTypes])
+        unless ranges = HTTPUtils::parse_range_header(req['range'])
+          raise HTTPStatus::BadRequest,
+            "Unrecognized range-spec: \"#{req['range']}\""
+        end
+        open(filename, "rb"){|io|
+          if ranges.size > 1
+            time = Time.now
+            boundary = "#{time.sec}_#{time.usec}_#{Process::pid}"
+            body = ''
+            ranges.each{|range|
+              first, last = prepare_range(range, filesize)
+              next if first < 0
+              io.pos = first
+              content = io.read(last-first+1)
+              body << "--" << boundary << CRLF
+              body << "Content-Type: #{mtype}" << CRLF
+              body << "Content-Range: #{first}-#{last}/#{filesize}" << CRLF
+              body << CRLF
+              body << content
+              body << CRLF
+            }
+            raise HTTPStatus::RequestRangeNotSatisfiable if body.empty?
+            body << "--" << boundary << "--" << CRLF
+            res["content-type"] = "multipart/byteranges; boundary=#{boundary}"
+            res.body = body
+          elsif range = ranges[0]
+            first, last = prepare_range(range, filesize)
+            raise HTTPStatus::RequestRangeNotSatisfiable if first < 0
+            if last == filesize - 1
+              content = io.dup
+              content.pos = first
+            else
+              io.pos = first
+              content = io.read(last-first+1)
+            end
+            res['content-type'] = mtype
+            res['content-range'] = "#{first}-#{last}/#{filesize}"
+            res['content-length'] = last - first + 1
+            res.body = content
+          else
+            raise HTTPStatus::BadRequest
+          end
+        }
+      end
+
+      def prepare_range(range, filesize)
+        first = range.first < 0 ? filesize + range.first : range.first
+        return -1, -1 if first < 0 || first >= filesize
+        last = range.last < 0 ? filesize + range.last : range.last
+        last = filesize - 1 if last >= filesize
+        return first, last
+      end
+    end
+
+    class FileHandler < AbstractServlet
+      HandlerTable = Hash.new
+
+      def self.add_handler(suffix, handler)
+        HandlerTable[suffix] = handler
+      end
+
+      def self.remove_handler(suffix)
+        HandlerTable.delete(suffix)
+      end
+
+      def initialize(server, root, options={}, default=Config::FileHandler)
+        @config = server.config
+        @logger = @config[:Logger]
+        @root = File.expand_path(root)
+        if options == true || options == false
+          options = { :FancyIndexing => options }
+        end
+        @options = default.dup.update(options)
+      end
+
+      def service(req, res)
+        # if this class is mounted on "/" and /~username is requested.
+        # we're going to override path informations before invoking service.
+        if defined?(Etc) && @options[:UserDir] && req.script_name.empty?
+          if %r|^(/~([^/]+))| =~ req.path_info
+            script_name, user = $1, $2
+            path_info = $'
+            begin
+              passwd = Etc::getpwnam(user)
+              @root = File::join(passwd.dir, @options[:UserDir])
+              req.script_name = script_name
+              req.path_info = path_info
+            rescue
+              @logger.debug "#{self.class}#do_GET: getpwnam(#{user}) failed"
+            end
+          end
+        end
+        super(req, res)
+      end
+
+      def do_GET(req, res)
+        unless exec_handler(req, res)
+          set_dir_list(req, res)
+        end
+      end
+
+      def do_POST(req, res)
+        unless exec_handler(req, res)
+          raise HTTPStatus::NotFound, "`#{req.path}' not found."
+        end
+      end
+
+      def do_OPTIONS(req, res)
+        unless exec_handler(req, res)
+          super(req, res)
+        end
+      end
+
+      # ToDo
+      # RFC2518: HTTP Extensions for Distributed Authoring -- WEBDAV
+      #
+      # PROPFIND PROPPATCH MKCOL DELETE PUT COPY MOVE
+      # LOCK UNLOCK
+
+      # RFC3253: Versioning Extensions to WebDAV
+      #          (Web Distributed Authoring and Versioning)
+      #
+      # VERSION-CONTROL REPORT CHECKOUT CHECK_IN UNCHECKOUT
+      # MKWORKSPACE UPDATE LABEL MERGE ACTIVITY
+
+      private
+
+      def exec_handler(req, res)
+        raise HTTPStatus::NotFound, "`#{req.path}' not found" unless @root
+        if set_filename(req, res)
+          handler = get_handler(req)
+          call_callback(:HandlerCallback, req, res)
+          h = handler.get_instance(@config, res.filename)
+          h.service(req, res)
+          return true
+        end
+        call_callback(:HandlerCallback, req, res)
+        return false
+      end
+
+      def get_handler(req)
+        suffix1 = (/\.(\w+)$/ =~ req.script_name) && $1.downcase
+        suffix2 = (/\.(\w+)\.[\w\-]+$/ =~ req.script_name) && $1.downcase
+        handler_table = @options[:HandlerTable]
+        return handler_table[suffix1] || handler_table[suffix2] ||
+               HandlerTable[suffix1] || HandlerTable[suffix2] ||
+               DefaultFileHandler
+      end
+
+      def set_filename(req, res)
+        res.filename = @root.dup
+        path_info = req.path_info.scan(%r|/[^/]*|)
+
+        path_info.unshift("")  # dummy for checking @root dir
+        while base = path_info.first
+          check_filename(req, res, base)
+          break if base == "/"
+          break unless File.directory?(res.filename + base)
+          shift_path_info(req, res, path_info)
+          call_callback(:DirectoryCallback, req, res)
+        end
+
+        if base = path_info.first
+          check_filename(req, res, base)
+          if base == "/"
+            if file = search_index_file(req, res)
+              shift_path_info(req, res, path_info, file)
+              call_callback(:FileCallback, req, res)
+              return true
+            end
+            shift_path_info(req, res, path_info)
+          elsif file = search_file(req, res, base)
+            shift_path_info(req, res, path_info, file)
+            call_callback(:FileCallback, req, res)
+            return true
+          else
+            raise HTTPStatus::NotFound, "`#{req.path}' not found."
+          end
+        end
+
+        return false
+      end
+
+      def check_filename(req, res, name)
+        @options[:NondisclosureName].each{|pattern|
+          if File.fnmatch("/#{pattern}", name)
+            @logger.warn("the request refers nondisclosure name `#{name}'.")
+            raise HTTPStatus::NotFound, "`#{req.path}' not found."
+          end
+        }
+      end
+
+      def shift_path_info(req, res, path_info, base=nil)
+        tmp = path_info.shift
+        base = base || tmp
+        req.path_info = path_info.join
+        req.script_name << base
+        res.filename << base
+      end
+
+      def search_index_file(req, res)
+        @config[:DirectoryIndex].each{|index|
+          if file = search_file(req, res, "/"+index)
+            return file
+          end
+        }
+        return nil
+      end
+
+      def search_file(req, res, basename)
+        langs = @options[:AcceptableLanguages]
+        path = res.filename + basename
+        if File.file?(path)
+          return basename
+        elsif langs.size > 0
+          req.accept_language.each{|lang|
+            path_with_lang = path + ".#{lang}"
+            if langs.member?(lang) && File.file?(path_with_lang)
+              return basename + ".#{lang}"
+            end
+          }
+          (langs - req.accept_language).each{|lang|
+            path_with_lang = path + ".#{lang}"
+            if File.file?(path_with_lang)
+              return basename + ".#{lang}"
+            end
+          }
+        end
+        return nil
+      end
+
+      def call_callback(callback_name, req, res)
+        if cb = @options[callback_name]
+          cb.call(req, res)
+        end
+      end
+
+      def nondisclosure_name?(name)
+        @options[:NondisclosureName].each{|pattern|
+          if File.fnmatch(pattern, name)
+            return true
+          end
+        }
+        return false
+      end
+
+      def set_dir_list(req, res)
+        redirect_to_directory_uri(req, res)
+        unless @options[:FancyIndexing]
+          raise HTTPStatus::Forbidden, "no access permission to `#{req.path}'"
+        end
+        local_path = res.filename
+        list = Dir::entries(local_path).collect{|name|
+          next if name == "." || name == ".."
+          next if nondisclosure_name?(name)
+          st = (File::stat(local_path + name) rescue nil)
+          if st.nil?
+            [ name, nil, -1 ]
+          elsif st.directory?
+            [ name + "/", st.mtime, -1 ]
+          else
+            [ name, st.mtime, st.size ]
+          end
+        }
+        list.compact!
+
+        if    d0 = req.query["N"]; idx = 0
+        elsif d0 = req.query["M"]; idx = 1
+        elsif d0 = req.query["S"]; idx = 2
+        else  d0 = "A"           ; idx = 0
+        end
+        d1 = (d0 == "A") ? "D" : "A"
+
+        if d0 == "A"
+          list.sort!{|a,b| a[idx] <=> b[idx] }
+        else
+          list.sort!{|a,b| b[idx] <=> a[idx] }
+        end
+
+        res['content-type'] = "text/html"
+
+        res.body = <<-_end_of_html_
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<HTML>
+  <HEAD><TITLE>Index of #{HTMLUtils::escape(req.path)}</TITLE></HEAD>
+  <BODY>
+    <H1>Index of #{HTMLUtils::escape(req.path)}</H1>
+        _end_of_html_
+
+        res.body << "<PRE>\n"
+        res.body << " <A HREF=\"?N=#{d1}\">Name</A>                          "
+        res.body << "<A HREF=\"?M=#{d1}\">Last modified</A>         "
+        res.body << "<A HREF=\"?S=#{d1}\">Size</A>\n"
+        res.body << "<HR>\n"
+       
+        list.unshift [ "..", File::mtime(local_path+".."), -1 ]
+        list.each{ |name, time, size|
+          if name == ".."
+            dname = "Parent Directory"
+          elsif name.size > 25
+            dname = name.sub(/^(.{23})(.*)/){ $1 + ".." }
+          else
+            dname = name
+          end
+          s =  " <A HREF=\"#{HTTPUtils::escape(name)}\">#{dname}</A>"
+          s << " " * (30 - dname.size)
+          s << (time ? time.strftime("%Y/%m/%d %H:%M      ") : " " * 22)
+          s << (size >= 0 ? size.to_s : "-") << "\n"
+          res.body << s
+        }
+        res.body << "</PRE><HR>"
+
+        res.body << <<-_end_of_html_    
+    <ADDRESS>
+     #{HTMLUtils::escape(@config[:ServerSoftware])}<BR>
+     at #{req.host}:#{req.port}
+    </ADDRESS>
+  </BODY>
+</HTML>
+        _end_of_html_
+      end
+
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpservlet/prochandler.rb b/ruby_1_8_6/lib/webrick/httpservlet/prochandler.rb
new file mode 100644
index 0000000000..783cb27896
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpservlet/prochandler.rb
@@ -0,0 +1,33 @@
+# 
+# prochandler.rb -- ProcHandler Class
+#       
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#   
+# $IPR: prochandler.rb,v 1.7 2002/09/21 12:23:42 gotoyuzo Exp $
+
+require 'webrick/httpservlet/abstract.rb'
+
+module WEBrick
+  module HTTPServlet
+
+    class ProcHandler < AbstractServlet
+      def get_instance(server, *options)
+        self
+      end  
+
+      def initialize(proc)
+        @proc = proc
+      end
+
+      def do_GET(request, response)
+        @proc.call(request, response)
+      end
+
+      alias do_POST do_GET
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpstatus.rb b/ruby_1_8_6/lib/webrick/httpstatus.rb
new file mode 100644
index 0000000000..0b22c992b3
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpstatus.rb
@@ -0,0 +1,126 @@
+#
+# httpstatus.rb -- HTTPStatus Class
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: httpstatus.rb,v 1.11 2003/03/24 20:18:55 gotoyuzo Exp $
+
+module WEBrick
+
+  module HTTPStatus
+
+    class Status      < StandardError; end
+    class Info        < Status; end
+    class Success     < Status; end
+    class Redirect    < Status; end
+    class Error       < Status; end
+    class ClientError < Error; end
+    class ServerError < Error; end
+    
+    class EOFError < StandardError; end
+
+    StatusMessage = {
+      100, 'Continue',
+      101, 'Switching Protocols',
+      200, 'OK',
+      201, 'Created',
+      202, 'Accepted',
+      203, 'Non-Authoritative Information',
+      204, 'No Content',
+      205, 'Reset Content',
+      206, 'Partial Content',
+      300, 'Multiple Choices',
+      301, 'Moved Permanently',
+      302, 'Found',
+      303, 'See Other',
+      304, 'Not Modified',
+      305, 'Use Proxy',
+      307, 'Temporary Redirect',
+      400, 'Bad Request',
+      401, 'Unauthorized',
+      402, 'Payment Required',
+      403, 'Forbidden',
+      404, 'Not Found',
+      405, 'Method Not Allowed',
+      406, 'Not Acceptable',
+      407, 'Proxy Authentication Required',
+      408, 'Request Timeout',
+      409, 'Conflict',
+      410, 'Gone',
+      411, 'Length Required',
+      412, 'Precondition Failed',
+      413, 'Request Entity Too Large',
+      414, 'Request-URI Too Large',
+      415, 'Unsupported Media Type',
+      416, 'Request Range Not Satisfiable',
+      417, 'Expectation Failed',
+      500, 'Internal Server Error',
+      501, 'Not Implemented',
+      502, 'Bad Gateway',
+      503, 'Service Unavailable',
+      504, 'Gateway Timeout',
+      505, 'HTTP Version Not Supported'
+    }
+
+    CodeToError = {}
+
+    StatusMessage.each{|code, message|
+      var_name = message.gsub(/[ \-]/,'_').upcase
+      err_name = message.gsub(/[ \-]/,'')
+
+      case code
+      when 100...200; parent = Info
+      when 200...300; parent = Success
+      when 300...400; parent = Redirect
+      when 400...500; parent = ClientError
+      when 500...600; parent = ServerError
+      end
+
+      eval %-
+        RC_#{var_name} = #{code}
+        class #{err_name} < #{parent}
+          def self.code() RC_#{var_name} end
+          def self.reason_phrase() StatusMessage[code] end
+          def code() self::class::code end 
+          def reason_phrase() self::class::reason_phrase end
+          alias to_i code
+        end
+      -
+
+      CodeToError[code] = const_get(err_name)
+    }
+
+    def reason_phrase(code)
+      StatusMessage[code.to_i]
+    end
+    def info?(code)
+      code.to_i >= 100 and code.to_i < 200
+    end
+    def success?(code)
+      code.to_i >= 200 and code.to_i < 300
+    end
+    def redirect?(code)
+      code.to_i >= 300 and code.to_i < 400
+    end
+    def error?(code)
+      code.to_i >= 400 and code.to_i < 600
+    end
+    def client_error?(code)
+      code.to_i >= 400 and code.to_i < 500
+    end
+    def server_error?(code)
+      code.to_i >= 500 and code.to_i < 600
+    end
+
+    def self.[](code)
+      CodeToError[code]
+    end
+
+    module_function :reason_phrase
+    module_function :info?, :success?, :redirect?, :error?
+    module_function :client_error?, :server_error?
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httputils.rb b/ruby_1_8_6/lib/webrick/httputils.rb
new file mode 100644
index 0000000000..c57af2c860
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httputils.rb
@@ -0,0 +1,399 @@
+#
+# httputils.rb -- HTTPUtils Module
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: httputils.rb,v 1.34 2003/06/05 21:34:08 gotoyuzo Exp $
+
+require 'socket'
+require 'tempfile'
+
+module WEBrick
+  CR   = "\x0d"
+  LF   = "\x0a"
+  CRLF = "\x0d\x0a"
+
+  module HTTPUtils
+
+    def normalize_path(path)
+      raise "abnormal path `#{path}'" if path[0] != ?/
+      ret = path.dup
+
+      ret.gsub!(%r{/+}o, '/')                    # //      => /
+      while ret.sub!(%r{/\.(/|\Z)}o, '/'); end   # /.      => /
+      begin                                      # /foo/.. => /foo
+        match = ret.sub!(%r{/([^/]+)/\.\.(/|\Z)}o){
+          if $1 == ".."
+            raise "abnormal path `#{path}'"
+          else
+            "/"
+          end
+        }
+      end while match
+
+      raise "abnormal path `#{path}'" if %r{/\.\.(/|\Z)} =~ ret
+      ret
+    end
+    module_function :normalize_path
+
+    #####
+
+    DefaultMimeTypes = {
+      "ai"    => "application/postscript",
+      "asc"   => "text/plain",
+      "avi"   => "video/x-msvideo",
+      "bin"   => "application/octet-stream",
+      "bmp"   => "image/bmp",
+      "class" => "application/octet-stream",
+      "cer"   => "application/pkix-cert",
+      "crl"   => "application/pkix-crl",
+      "crt"   => "application/x-x509-ca-cert",
+     #"crl"   => "application/x-pkcs7-crl",
+      "css"   => "text/css",
+      "dms"   => "application/octet-stream",
+      "doc"   => "application/msword",
+      "dvi"   => "application/x-dvi",
+      "eps"   => "application/postscript",
+      "etx"   => "text/x-setext",
+      "exe"   => "application/octet-stream",
+      "gif"   => "image/gif",
+      "htm"   => "text/html",
+      "html"  => "text/html",
+      "jpe"   => "image/jpeg",
+      "jpeg"  => "image/jpeg",
+      "jpg"   => "image/jpeg",
+      "lha"   => "application/octet-stream",
+      "lzh"   => "application/octet-stream",
+      "mov"   => "video/quicktime",
+      "mpe"   => "video/mpeg",
+      "mpeg"  => "video/mpeg",
+      "mpg"   => "video/mpeg",
+      "pbm"   => "image/x-portable-bitmap",
+      "pdf"   => "application/pdf",
+      "pgm"   => "image/x-portable-graymap",
+      "png"   => "image/png",
+      "pnm"   => "image/x-portable-anymap",
+      "ppm"   => "image/x-portable-pixmap",
+      "ppt"   => "application/vnd.ms-powerpoint",
+      "ps"    => "application/postscript",
+      "qt"    => "video/quicktime",
+      "ras"   => "image/x-cmu-raster",
+      "rb"    => "text/plain",
+      "rd"    => "text/plain",
+      "rtf"   => "application/rtf",
+      "sgm"   => "text/sgml",
+      "sgml"  => "text/sgml",
+      "tif"   => "image/tiff",
+      "tiff"  => "image/tiff",
+      "txt"   => "text/plain",
+      "xbm"   => "image/x-xbitmap",
+      "xls"   => "application/vnd.ms-excel",
+      "xml"   => "text/xml",
+      "xpm"   => "image/x-xpixmap",
+      "xwd"   => "image/x-xwindowdump",
+      "zip"   => "application/zip",
+    }
+
+    # Load Apache compatible mime.types file.
+    def load_mime_types(file)
+      open(file){ |io|
+        hash = Hash.new
+        io.each{ |line|
+          next if /^#/ =~ line
+          line.chomp!
+          mimetype, ext0 = line.split(/\s+/, 2)
+          next unless ext0   
+          next if ext0.empty?
+          ext0.split(/\s+/).each{ |ext| hash[ext] = mimetype }
+        }
+        hash
+      }
+    end
+    module_function :load_mime_types
+
+    def mime_type(filename, mime_tab)
+      suffix1 = (/\.(\w+)$/ =~ filename && $1.downcase)
+      suffix2 = (/\.(\w+)\.[\w\-]+$/ =~ filename && $1.downcase)
+      mime_tab[suffix1] || mime_tab[suffix2] || "application/octet-stream"
+    end
+    module_function :mime_type
+
+    #####
+
+    def parse_header(raw)
+      header = Hash.new([].freeze)
+      field = nil
+      raw.each{|line|
+        case line
+        when /^([A-Za-z0-9!\#$%&'*+\-.^_`|~]+):\s*(.*?)\s*\z/om
+          field, value = $1, $2
+          field.downcase!
+          header[field] = [] unless header.has_key?(field)
+          header[field] << value
+        when /^\s+(.*?)\s*\z/om
+          value = $1
+          unless field
+            raise "bad header '#{line.inspect}'."
+          end
+          header[field][-1] << " " << value
+        else
+          raise "bad header '#{line.inspect}'."
+        end
+      }
+      header.each{|key, values|
+        values.each{|value|
+          value.strip!
+          value.gsub!(/\s+/, " ")
+        }
+      }
+      header
+    end
+    module_function :parse_header
+
+    def split_header_value(str)
+      str.scan(/((?:"(?:\\.|[^"])+?"|[^",]+)+)
+                (?:,\s*|\Z)/xn).collect{|v| v[0] }
+    end
+    module_function :split_header_value
+
+    def parse_range_header(ranges_specifier)
+      if /^bytes=(.*)/ =~ ranges_specifier
+        byte_range_set = split_header_value($1)
+        byte_range_set.collect{|range_spec|
+          case range_spec
+          when /^(\d+)-(\d+)/ then $1.to_i .. $2.to_i
+          when /^(\d+)-/      then $1.to_i .. -1
+          when /^-(\d+)/      then -($1.to_i) .. -1
+          else return nil
+          end
+        }
+      end
+    end
+    module_function :parse_range_header
+
+    def parse_qvalues(value)
+      tmp = []
+      if value
+        parts = value.split(/,\s*/)
+        parts.each {|part|
+          if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
+            val = m[1]
+            q = (m[2] or 1).to_f
+            tmp.push([val, q])
+          end
+        }
+        tmp = tmp.sort_by{|val, q| -q}
+        tmp.collect!{|val, q| val}
+      end
+      return tmp
+    end
+    module_function :parse_qvalues
+
+    #####
+
+    def dequote(str)
+      ret = (/\A"(.*)"\Z/ =~ str) ? $1 : str.dup
+      ret.gsub!(/\\(.)/, "\\1")
+      ret
+    end
+    module_function :dequote
+
+    def quote(str)
+      '"' << str.gsub(/[\\\"]/o, "\\\1") << '"'
+    end
+    module_function :quote
+
+    #####
+
+    class FormData < String
+      EmptyRawHeader = [].freeze
+      EmptyHeader = {}.freeze
+
+      attr_accessor :name, :filename, :next_data
+      protected :next_data
+
+      def initialize(*args)
+        @name = @filename = @next_data = nil
+        if args.empty?
+          @raw_header = []
+          @header = nil
+          super("")
+        else
+          @raw_header = EmptyRawHeader
+          @header = EmptyHeader 
+          super(args.shift)
+          unless args.empty?
+            @next_data = self.class.new(*args)
+          end
+        end
+      end
+
+      def [](*key)
+        begin
+          @header[key[0].downcase].join(", ")
+        rescue StandardError, NameError
+          super
+        end
+      end
+
+      def <<(str)
+        if @header
+          super
+        elsif str == CRLF
+          @header = HTTPUtils::parse_header(@raw_header)
+          if cd = self['content-disposition']
+            if /\s+name="(.*?)"/ =~ cd then @name = $1 end
+            if /\s+filename="(.*?)"/ =~ cd then @filename = $1 end
+          end
+        else
+          @raw_header << str
+        end
+        self
+      end
+
+      def append_data(data)
+        tmp = self
+        while tmp
+          unless tmp.next_data 
+            tmp.next_data = data
+            break
+          end
+          tmp = tmp.next_data
+        end
+        self
+      end
+
+      def each_data
+        tmp = self
+        while tmp
+          next_data = tmp.next_data
+          yield(tmp)
+          tmp = next_data
+        end
+      end
+
+      def list
+        ret = []
+        each_data{|data|
+          ret << data.to_s
+        }
+        ret
+      end
+
+      alias :to_ary :list
+
+      def to_s
+        String.new(self)
+      end
+    end
+
+    def parse_query(str)
+      query = Hash.new
+      if str
+        str.split(/[&;]/).each{|x|
+          next if x.empty? 
+          key, val = x.split(/=/,2)
+          key = unescape_form(key)
+          val = unescape_form(val.to_s)
+          val = FormData.new(val)
+          val.name = key
+          if query.has_key?(key)
+            query[key].append_data(val)
+            next
+          end
+          query[key] = val
+        }
+      end
+      query
+    end
+    module_function :parse_query
+
+    def parse_form_data(io, boundary)
+      boundary_regexp = /\A--#{boundary}(--)?#{CRLF}\z/
+      form_data = Hash.new
+      return form_data unless io
+      data = nil
+      io.each{|line|
+        if boundary_regexp =~ line
+          if data
+            data.chop!
+            key = data.name
+            if form_data.has_key?(key)
+              form_data[key].append_data(data)
+            else
+              form_data[key] = data 
+            end
+          end
+          data = FormData.new
+          next
+        else
+          if data
+            data << line
+          end
+        end
+      }
+      return form_data
+    end
+    module_function :parse_form_data
+
+    #####
+
+    reserved = ';/?:@&=+$,'
+    num      = '0123456789'
+    lowalpha = 'abcdefghijklmnopqrstuvwxyz'
+    upalpha  = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+    mark     = '-_.!~*\'()'
+    unreserved = num + lowalpha + upalpha + mark
+    control  = (0x0..0x1f).collect{|c| c.chr }.join + "\x7f"
+    space    = " "
+    delims   = '<>#%"'
+    unwise   = '{}|\\^[]`'
+    nonascii = (0x80..0xff).collect{|c| c.chr }.join
+
+    module_function
+
+    def _make_regex(str) /([#{Regexp.escape(str)}])/n end
+    def _make_regex!(str) /([^#{Regexp.escape(str)}])/n end
+    def _escape(str, regex) str.gsub(regex){ "%%%02X" % $1[0] } end
+    def _unescape(str, regex) str.gsub(regex){ $1.hex.chr } end
+
+    UNESCAPED = _make_regex(control+space+delims+unwise+nonascii)
+    UNESCAPED_FORM = _make_regex(reserved+control+delims+unwise+nonascii)
+    NONASCII  = _make_regex(nonascii)
+    ESCAPED   = /%([0-9a-fA-F]{2})/
+    UNESCAPED_PCHAR = _make_regex!(unreserved+":@&=+$,")
+
+    def escape(str)
+      _escape(str, UNESCAPED)
+    end
+
+    def unescape(str)
+      _unescape(str, ESCAPED)
+    end
+
+    def escape_form(str)
+      ret = _escape(str, UNESCAPED_FORM)
+      ret.gsub!(/ /, "+")
+      ret
+    end
+
+    def unescape_form(str)
+      _unescape(str.gsub(/\+/, " "), ESCAPED)
+    end
+
+    def escape_path(str)
+      result = ""
+      str.scan(%r{/([^/]*)}).each{|i|
+        result << "/" << _escape(i[0], UNESCAPED_PCHAR)
+      }
+      return result
+    end
+
+    def escape8bit(str)
+      _escape(str, NONASCII)
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/httpversion.rb b/ruby_1_8_6/lib/webrick/httpversion.rb
new file mode 100644
index 0000000000..86907a26bd
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/httpversion.rb
@@ -0,0 +1,49 @@
+#
+# HTTPVersion.rb -- presentation of HTTP version
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: httpversion.rb,v 1.5 2002/09/21 12:23:37 gotoyuzo Exp $
+
+module WEBrick
+  class HTTPVersion
+    include Comparable
+
+    attr_accessor :major, :minor
+
+    def self.convert(version)
+      version.is_a?(self) ? version : new(version)
+    end
+
+    def initialize(version)
+      case version
+      when HTTPVersion
+        @major, @minor = version.major, version.minor
+      when String
+        if /^(\d+)\.(\d+)$/ =~ version
+          @major, @minor = $1.to_i, $2.to_i
+        end
+      end
+      if @major.nil? || @minor.nil?
+        raise ArgumentError,
+          format("cannot convert %s into %s", version.class, self.class)
+      end
+    end
+
+    def <=>(other)
+      unless other.is_a?(self.class)
+        other = self.class.new(other)
+      end
+      if (ret = @major <=> other.major) == 0
+        return @minor <=> other.minor
+      end
+      return ret
+    end
+
+    def to_s
+      format("%d.%d", @major, @minor)
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/log.rb b/ruby_1_8_6/lib/webrick/log.rb
new file mode 100644
index 0000000000..5d4fd0a174
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/log.rb
@@ -0,0 +1,88 @@
+#
+# log.rb -- Log Class
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: log.rb,v 1.26 2002/10/06 17:06:10 gotoyuzo Exp $
+
+module WEBrick
+  class BasicLog
+    # log-level constant
+    FATAL, ERROR, WARN, INFO, DEBUG = 1, 2, 3, 4, 5
+
+    attr_accessor :level
+
+    def initialize(log_file=nil, level=nil)
+      @level = level || INFO
+      case log_file
+      when String
+        @log = open(log_file, "a+")
+        @log.sync = true
+        @opened = true
+      when NilClass
+        @log = $stderr
+      else
+        @log = log_file  # requires "<<". (see BasicLog#log)
+      end
+    end
+
+    def close
+      @log.close if @opened
+      @log = nil
+    end
+
+    def log(level, data)
+      if @log && level <= @level
+        data += "\n" if /\n\Z/ !~ data
+        @log << data
+      end
+    end
+
+    def <<(obj)
+      log(INFO, obj.to_s)
+    end
+
+    def fatal(msg) log(FATAL, "FATAL " << format(msg)); end
+    def error(msg) log(ERROR, "ERROR " << format(msg)); end
+    def warn(msg)  log(WARN,  "WARN  " << format(msg)); end
+    def info(msg)  log(INFO,  "INFO  " << format(msg)); end
+    def debug(msg) log(DEBUG, "DEBUG " << format(msg)); end
+
+    def fatal?; @level >= FATAL; end
+    def error?; @level >= ERROR; end
+    def warn?;  @level >= WARN; end
+    def info?;  @level >= INFO; end
+    def debug?; @level >= DEBUG; end
+
+    private
+
+    def format(arg)
+      str = if arg.is_a?(Exception)
+        "#{arg.class}: #{arg.message}\n\t" <<
+        arg.backtrace.join("\n\t") << "\n"
+      elsif arg.respond_to?(:to_str)
+        arg.to_str
+      else
+        arg.inspect
+      end
+    end
+  end
+
+  class Log < BasicLog
+    attr_accessor :time_format 
+
+    def initialize(log_file=nil, level=nil)
+      super(log_file, level)
+      @time_format = "[%Y-%m-%d %H:%M:%S]"
+    end
+
+    def log(level, data)
+      tmp = Time.now.strftime(@time_format)
+      tmp << " " << data
+      super(level, tmp)
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/server.rb b/ruby_1_8_6/lib/webrick/server.rb
new file mode 100644
index 0000000000..16dbd46f98
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/server.rb
@@ -0,0 +1,200 @@
+#
+# server.rb -- GenericServer Class
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000, 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: server.rb,v 1.62 2003/07/22 19:20:43 gotoyuzo Exp $
+
+require 'thread'
+require 'socket'
+require 'timeout'
+require 'webrick/config'
+require 'webrick/log'
+
+module WEBrick
+
+  class ServerError < StandardError; end
+
+  class SimpleServer
+    def SimpleServer.start
+      yield
+    end
+  end
+
+  class Daemon
+    def Daemon.start
+      exit!(0) if fork
+      Process::setsid
+      exit!(0) if fork
+      Dir::chdir("/")
+      File::umask(0)
+      STDIN.reopen("/dev/null")
+      STDOUT.reopen("/dev/null", "w")
+      STDERR.reopen("/dev/null", "w")
+      yield if block_given?
+    end
+  end
+
+  class GenericServer
+    attr_reader :status, :config, :logger, :tokens, :listeners
+
+    def initialize(config={}, default=Config::General)
+      @config = default.dup.update(config)
+      @status = :Stop
+      @config[:Logger] ||= Log::new
+      @logger = @config[:Logger]
+
+      @tokens = SizedQueue.new(@config[:MaxClients])
+      @config[:MaxClients].times{ @tokens.push(nil) }
+
+      webrickv = WEBrick::VERSION
+      rubyv = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+      @logger.info("WEBrick #{webrickv}")
+      @logger.info("ruby #{rubyv}")
+
+      @listeners = []
+      unless @config[:DoNotListen]
+        if @config[:Listen]
+          warn(":Listen option is deprecated; use GenericServer#listen")
+        end
+        listen(@config[:BindAddress], @config[:Port])
+        if @config[:Port] == 0
+          @config[:Port] = @listeners[0].addr[1]
+        end
+      end
+    end
+
+    def [](key)
+      @config[key]
+    end
+
+    def listen(address, port)
+      @listeners += Utils::create_listeners(address, port, @logger)
+    end
+
+    def start(&block)
+      raise ServerError, "already started." if @status != :Stop
+      server_type = @config[:ServerType] || SimpleServer
+
+      server_type.start{
+        @logger.info \
+          "#{self.class}#start: pid=#{$$} port=#{@config[:Port]}"
+        call_callback(:StartCallback)
+
+        thgroup = ThreadGroup.new
+        @status = :Running
+        while @status == :Running
+          begin
+            if svrs = IO.select(@listeners, nil, nil, 2.0)
+              svrs[0].each{|svr|
+                @tokens.pop          # blocks while no token is there.
+                if sock = accept_client(svr)
+                  th = start_thread(sock, &block)
+                  th[:WEBrickThread] = true
+                  thgroup.add(th)
+                else
+                  @tokens.push(nil)
+                end
+              }
+            end
+          rescue Errno::EBADF, IOError => ex
+            # if the listening socket was closed in GenericServer#shutdown,
+            # IO::select raise it.
+          rescue Exception => ex
+            msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
+            @logger.error msg
+          end
+        end
+
+        @logger.info "going to shutdown ..."
+        thgroup.list.each{|th| th.join if th[:WEBrickThread] }
+        call_callback(:StopCallback)
+        @logger.info "#{self.class}#start done."
+        @status = :Stop
+      }
+    end
+
+    def stop
+      if @status == :Running
+        @status = :Shutdown
+      end
+    end
+
+    def shutdown
+      stop
+      @listeners.each{|s|
+        if @logger.debug?
+          addr = s.addr
+          @logger.debug("close TCPSocket(#{addr[2]}, #{addr[1]})")
+        end
+        s.close
+      }
+      @listeners.clear
+    end
+
+    def run(sock)
+      @logger.fatal "run() must be provided by user."
+    end
+
+    private
+
+    def accept_client(svr)
+      sock = nil
+      begin
+        sock = svr.accept
+        sock.sync = true
+        Utils::set_non_blocking(sock)
+        Utils::set_close_on_exec(sock)
+      rescue Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPROTO => ex
+        # TCP connection was established but RST segment was sent
+        # from peer before calling TCPServer#accept.
+      rescue Exception => ex
+        msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
+        @logger.error msg
+      end
+      return sock
+    end
+
+    def start_thread(sock, &block)
+      Thread.start{
+        begin
+          Thread.current[:WEBrickSocket] = sock
+          begin
+            addr = sock.peeraddr
+            @logger.debug "accept: #{addr[3]}:#{addr[1]}"
+          rescue SocketError
+            @logger.debug "accept: <address unknown>"
+            raise
+          end
+          call_callback(:AcceptCallback, sock)
+          block ? block.call(sock) : run(sock)
+        rescue Errno::ENOTCONN
+          @logger.debug "Errno::ENOTCONN raised"
+        rescue ServerError => ex
+          msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
+          @logger.error msg
+        rescue Exception => ex
+          @logger.error ex
+        ensure
+          @tokens.push(nil)
+          Thread.current[:WEBrickSocket] = nil
+          if addr
+            @logger.debug "close: #{addr[3]}:#{addr[1]}"
+          else
+            @logger.debug "close: <address unknown>"
+          end
+          sock.close
+        end
+      }
+    end
+
+    def call_callback(callback_name, *args)
+      if cb = @config[callback_name]
+        cb.call(*args)
+      end
+    end
+  end    # end of GenericServer
+end
diff --git a/ruby_1_8_6/lib/webrick/ssl.rb b/ruby_1_8_6/lib/webrick/ssl.rb
new file mode 100644
index 0000000000..03bfdf4aa0
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/ssl.rb
@@ -0,0 +1,126 @@
+#
+# ssl.rb -- SSL/TLS enhancement for GenericServer
+#
+# Copyright (c) 2003 GOTOU Yuuzou All rights reserved.
+# 
+# $Id$
+
+require 'webrick'
+require 'openssl'
+
+module WEBrick
+  module Config
+    svrsoft = General[:ServerSoftware]
+    osslv = ::OpenSSL::OPENSSL_VERSION.split[1]
+    SSL = {
+      :ServerSoftware       => "#{svrsoft} OpenSSL/#{osslv}",
+      :SSLEnable            => false,
+      :SSLCertificate       => nil,
+      :SSLPrivateKey        => nil,
+      :SSLClientCA          => nil,
+      :SSLExtraChainCert    => nil,
+      :SSLCACertificateFile => nil,
+      :SSLCACertificatePath => nil,
+      :SSLCertificateStore  => nil,
+      :SSLVerifyClient      => ::OpenSSL::SSL::VERIFY_NONE,
+      :SSLVerifyDepth       => nil,
+      :SSLVerifyCallback    => nil,   # custom verification
+      :SSLTimeout           => nil,
+      :SSLOptions           => nil,
+      :SSLStartImmediately  => true,
+      # Must specify if you use auto generated certificate.
+      :SSLCertName          => nil,
+      :SSLCertComment       => "Generated by Ruby/OpenSSL"
+    }
+    General.update(SSL)
+  end
+
+  module Utils
+    def create_self_signed_cert(bits, cn, comment)
+      rsa = OpenSSL::PKey::RSA.new(bits){|p, n|
+        case p
+        when 0; $stderr.putc "."  # BN_generate_prime
+        when 1; $stderr.putc "+"  # BN_generate_prime
+        when 2; $stderr.putc "*"  # searching good prime,  
+                                  # n = #of try,
+                                  # but also data from BN_generate_prime
+        when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
+                                  # but also data from BN_generate_prime
+        else;   $stderr.putc "*"  # BN_generate_prime
+        end
+      }
+      cert = OpenSSL::X509::Certificate.new
+      cert.version = 3
+      cert.serial = 0
+      name = OpenSSL::X509::Name.new(cn)
+      cert.subject = name
+      cert.issuer = name
+      cert.not_before = Time.now
+      cert.not_after = Time.now + (365*24*60*60)
+      cert.public_key = rsa.public_key
+
+      ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
+      ef.issuer_certificate = cert
+      cert.extensions = [
+        ef.create_extension("basicConstraints","CA:FALSE"),
+        ef.create_extension("keyUsage", "keyEncipherment"),
+        ef.create_extension("subjectKeyIdentifier", "hash"),
+        ef.create_extension("extendedKeyUsage", "serverAuth"),
+        ef.create_extension("nsComment", comment),
+      ]
+      aki = ef.create_extension("authorityKeyIdentifier",
+                                "keyid:always,issuer:always")
+      cert.add_extension(aki)
+      cert.sign(rsa, OpenSSL::Digest::SHA1.new)
+
+      return [ cert, rsa ]
+    end
+    module_function :create_self_signed_cert
+  end
+
+  class GenericServer
+    def ssl_context
+      @ssl_context ||= nil
+    end
+
+    def listen(address, port)
+      listeners = Utils::create_listeners(address, port, @logger)
+      if @config[:SSLEnable]
+        unless ssl_context
+          @ssl_context = setup_ssl_context(@config)
+          @logger.info("\n" + @config[:SSLCertificate].to_text) 
+        end
+        listeners.collect!{|svr|
+          ssvr = ::OpenSSL::SSL::SSLServer.new(svr, ssl_context)
+          ssvr.start_immediately = @config[:SSLStartImmediately]
+          ssvr
+        }
+      end
+      @listeners += listeners
+    end
+
+    def setup_ssl_context(config)
+      unless config[:SSLCertificate]
+        cn = config[:SSLCertName]
+        comment = config[:SSLCertComment]
+        cert, key = Utils::create_self_signed_cert(1024, cn, comment)
+        config[:SSLCertificate] = cert
+        config[:SSLPrivateKey] = key
+      end
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.key = config[:SSLPrivateKey]
+      ctx.cert = config[:SSLCertificate]
+      ctx.client_ca = config[:SSLClientCA]
+      ctx.extra_chain_cert = config[:SSLExtraChainCert]
+      ctx.ca_file = config[:SSLCACertificateFile]
+      ctx.ca_path = config[:SSLCACertificatePath]
+      ctx.cert_store = config[:SSLCertificateStore]
+      ctx.verify_mode = config[:SSLVerifyClient]
+      ctx.verify_depth = config[:SSLVerifyDepth]
+      ctx.verify_callback = config[:SSLVerifyCallback]
+      ctx.timeout = config[:SSLTimeout]
+      ctx.options = config[:SSLOptions]
+      ctx
+    end
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/utils.rb b/ruby_1_8_6/lib/webrick/utils.rb
new file mode 100644
index 0000000000..cf9da6f2ce
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/utils.rb
@@ -0,0 +1,100 @@
+#
+# utils.rb -- Miscellaneous utilities
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2001 TAKAHASHI Masayoshi, GOTOU Yuuzou
+# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: utils.rb,v 1.10 2003/02/16 22:22:54 gotoyuzo Exp $
+
+require 'socket'
+require 'fcntl'
+begin
+  require 'etc'
+rescue LoadError
+  nil
+end
+
+module WEBrick
+  module Utils
+    def set_non_blocking(io)
+      flag = File::NONBLOCK
+      if defined?(Fcntl::F_GETFL)
+        flag |= io.fcntl(Fcntl::F_GETFL)
+      end
+      io.fcntl(Fcntl::F_SETFL, flag)
+    end
+    module_function :set_non_blocking
+
+    def set_close_on_exec(io)
+      if defined?(Fcntl::FD_CLOEXEC)
+        io.fcntl(Fcntl::FD_CLOEXEC, 1)
+      end
+    end
+    module_function :set_close_on_exec
+
+    def su(user)
+      if defined?(Etc)
+        pw = Etc.getpwnam(user)
+        Process::initgroups(user, pw.gid)
+        Process::Sys::setgid(pw.gid)
+        Process::Sys::setuid(pw.uid)
+      else
+        warn("WEBrick::Utils::su doesn't work on this platform")
+      end
+    end
+    module_function :su
+
+    def getservername
+      host = Socket::gethostname
+      begin
+        Socket::gethostbyname(host)[0]
+      rescue
+        host
+      end
+    end
+    module_function :getservername
+
+    def create_listeners(address, port, logger=nil)
+      unless port
+        raise ArgumentError, "must specify port"
+      end
+      res = Socket::getaddrinfo(address, port,
+                                Socket::AF_UNSPEC,   # address family
+                                Socket::SOCK_STREAM, # socket type
+                                0,                   # protocol
+                                Socket::AI_PASSIVE)  # flag
+      last_error = nil
+      sockets = []
+      res.each{|ai|
+        begin
+          logger.debug("TCPServer.new(#{ai[3]}, #{port})") if logger
+          sock = TCPServer.new(ai[3], port)
+          port = sock.addr[1] if port == 0
+          Utils::set_close_on_exec(sock)
+          sockets << sock
+        rescue => ex
+          logger.warn("TCPServer Error: #{ex}") if logger
+          last_error  = ex
+        end
+      }
+      raise last_error if sockets.empty?
+      return sockets
+    end
+    module_function :create_listeners
+
+    RAND_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
+                 "0123456789" +
+                 "abcdefghijklmnopqrstuvwxyz" 
+
+    def random_string(len)
+      rand_max = RAND_CHARS.size
+      ret = "" 
+      len.times{ ret << RAND_CHARS[rand(rand_max)] }
+      ret 
+    end
+    module_function :random_string
+
+  end
+end
diff --git a/ruby_1_8_6/lib/webrick/version.rb b/ruby_1_8_6/lib/webrick/version.rb
new file mode 100644
index 0000000000..b2b9fd3b78
--- /dev/null
+++ b/ruby_1_8_6/lib/webrick/version.rb
@@ -0,0 +1,13 @@
+#
+# version.rb -- version and release date
+#
+# Author: IPR -- Internet Programming with Ruby -- writers
+# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU YUUZOU
+# Copyright (c) 2003 Internet Programming with Ruby writers. All rights
+# reserved.
+#
+# $IPR: version.rb,v 1.74 2003/07/22 19:20:43 gotoyuzo Exp $
+
+module WEBrick
+  VERSION      = "1.3.1"
+end
diff --git a/ruby_1_8_6/lib/wsdl/binding.rb b/ruby_1_8_6/lib/wsdl/binding.rb
new file mode 100644
index 0000000000..58a21d820d
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/binding.rb
@@ -0,0 +1,65 @@
+# WSDL4R - WSDL binding definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+
+
+class Binding < Info
+  attr_reader :name		# required
+  attr_reader :type		# required
+  attr_reader :operations
+  attr_reader :soapbinding
+
+  def initialize
+    super
+    @name = nil
+    @type = nil
+    @operations = XSD::NamedElements.new
+    @soapbinding = nil
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def parse_element(element)
+    case element
+    when OperationName
+      o = OperationBinding.new
+      @operations << o
+      o
+    when SOAPBindingName
+      o = WSDL::SOAP::Binding.new
+      @soapbinding = o
+      o
+    when DocumentationName
+      o = Documentation.new
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    when TypeAttrName
+      @type = value
+    else
+      nil
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/data.rb b/ruby_1_8_6/lib/wsdl/data.rb
new file mode 100644
index 0000000000..45eaad8526
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/data.rb
@@ -0,0 +1,64 @@
+# WSDL4R - WSDL data definitions.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'wsdl/documentation'
+require 'wsdl/definitions'
+require 'wsdl/types'
+require 'wsdl/message'
+require 'wsdl/part'
+require 'wsdl/portType'
+require 'wsdl/operation'
+require 'wsdl/param'
+require 'wsdl/binding'
+require 'wsdl/operationBinding'
+require 'wsdl/service'
+require 'wsdl/port'
+require 'wsdl/import'
+
+
+module WSDL
+
+
+ArrayTypeAttrName = XSD::QName.new(Namespace, 'arrayType')
+BindingName = XSD::QName.new(Namespace, 'binding')
+DefinitionsName = XSD::QName.new(Namespace, 'definitions')
+DocumentationName = XSD::QName.new(Namespace, 'documentation')
+FaultName = XSD::QName.new(Namespace, 'fault')
+ImportName = XSD::QName.new(Namespace, 'import')
+InputName = XSD::QName.new(Namespace, 'input')
+MessageName = XSD::QName.new(Namespace, 'message')
+OperationName = XSD::QName.new(Namespace, 'operation')
+OutputName = XSD::QName.new(Namespace, 'output')
+PartName = XSD::QName.new(Namespace, 'part')
+PortName = XSD::QName.new(Namespace, 'port')
+PortTypeName = XSD::QName.new(Namespace, 'portType')
+ServiceName = XSD::QName.new(Namespace, 'service')
+TypesName = XSD::QName.new(Namespace, 'types')
+
+SchemaName = XSD::QName.new(XSD::Namespace, 'schema')
+
+SOAPAddressName = XSD::QName.new(SOAPBindingNamespace, 'address')
+SOAPBindingName = XSD::QName.new(SOAPBindingNamespace, 'binding')
+SOAPHeaderName = XSD::QName.new(SOAPBindingNamespace, 'header')
+SOAPBodyName = XSD::QName.new(SOAPBindingNamespace, 'body')
+SOAPFaultName = XSD::QName.new(SOAPBindingNamespace, 'fault')
+SOAPOperationName = XSD::QName.new(SOAPBindingNamespace, 'operation')
+
+BindingAttrName = XSD::QName.new(nil, 'binding')
+ElementAttrName = XSD::QName.new(nil, 'element')
+LocationAttrName = XSD::QName.new(nil, 'location')
+MessageAttrName = XSD::QName.new(nil, 'message')
+NameAttrName = XSD::QName.new(nil, 'name')
+NamespaceAttrName = XSD::QName.new(nil, 'namespace')
+ParameterOrderAttrName = XSD::QName.new(nil, 'parameterOrder')
+TargetNamespaceAttrName = XSD::QName.new(nil, 'targetNamespace')
+TypeAttrName = XSD::QName.new(nil, 'type')
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/definitions.rb b/ruby_1_8_6/lib/wsdl/definitions.rb
new file mode 100644
index 0000000000..5235037cfe
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/definitions.rb
@@ -0,0 +1,250 @@
+# WSDL4R - WSDL definitions.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+
+
+class Definitions < Info
+  attr_reader :name
+  attr_reader :targetnamespace
+  attr_reader :imports
+
+  attr_accessor :location
+  attr_reader :importedschema
+
+  def initialize
+    super
+    @name = nil
+    @targetnamespace = nil
+    @location = nil
+    @importedschema = {}
+
+    @types = nil
+    @imports = []
+    @messages = XSD::NamedElements.new
+    @porttypes = XSD::NamedElements.new
+    @bindings = XSD::NamedElements.new
+    @services = XSD::NamedElements.new
+
+    @anontypes = XSD::NamedElements.new
+    @root = self
+  end
+
+  def inspect
+    sprintf("#<%s:0x%x %s>", self.class.name, __id__, @name || '(unnamed)')
+  end
+
+  def targetnamespace=(targetnamespace)
+    @targetnamespace = targetnamespace
+    if @name
+      @name = XSD::QName.new(@targetnamespace, @name.name)
+    end
+  end
+
+  def collect_attributes
+    result = XSD::NamedElements.new
+    if @types
+      @types.schemas.each do |schema|
+	result.concat(schema.collect_attributes)
+      end
+    end
+    @imports.each do |import|
+      result.concat(import.content.collect_attributes)
+    end
+    result
+  end
+
+  def collect_elements
+    result = XSD::NamedElements.new
+    if @types
+      @types.schemas.each do |schema|
+	result.concat(schema.collect_elements)
+      end
+    end
+    @imports.each do |import|
+      result.concat(import.content.collect_elements)
+    end
+    result
+  end
+
+  def collect_complextypes
+    result = @anontypes.dup
+    if @types
+      @types.schemas.each do |schema|
+	result.concat(schema.collect_complextypes)
+      end
+    end
+    @imports.each do |import|
+      result.concat(import.content.collect_complextypes)
+    end
+    result
+  end
+
+  def collect_simpletypes
+    result = XSD::NamedElements.new
+    if @types
+      @types.schemas.each do |schema|
+	result.concat(schema.collect_simpletypes)
+      end
+    end
+    @imports.each do |import|
+      result.concat(import.content.collect_simpletypes)
+    end
+    result
+  end
+
+  # ToDo: simpletype must be accepted...
+  def add_type(complextype)
+    @anontypes << complextype
+  end
+
+  def messages
+    result = @messages.dup
+    @imports.each do |import|
+      result.concat(import.content.messages) if self.class === import.content
+    end
+    result
+  end
+
+  def porttypes
+    result = @porttypes.dup
+    @imports.each do |import|
+      result.concat(import.content.porttypes) if self.class === import.content
+    end
+    result
+  end
+
+  def bindings
+    result = @bindings.dup
+    @imports.each do |import|
+      result.concat(import.content.bindings) if self.class === import.content
+    end
+    result
+  end
+
+  def services
+    result = @services.dup
+    @imports.each do |import|
+      result.concat(import.content.services) if self.class === import.content
+    end
+    result
+  end
+
+  def message(name)
+    message = @messages[name]
+    return message if message
+    @imports.each do |import|
+      message = import.content.message(name) if self.class === import.content
+      return message if message
+    end
+    nil
+  end
+
+  def porttype(name)
+    porttype = @porttypes[name]
+    return porttype if porttype
+    @imports.each do |import|
+      porttype = import.content.porttype(name) if self.class === import.content
+      return porttype if porttype
+    end
+    nil
+  end
+
+  def binding(name)
+    binding = @bindings[name]
+    return binding if binding
+    @imports.each do |import|
+      binding = import.content.binding(name) if self.class === import.content
+      return binding if binding
+    end
+    nil
+  end
+
+  def service(name)
+    service = @services[name]
+    return service if service
+    @imports.each do |import|
+      service = import.content.service(name) if self.class === import.content
+      return service if service
+    end
+    nil
+  end
+
+  def porttype_binding(name)
+    binding = @bindings.find { |item| item.type == name }
+    return binding if binding
+    @imports.each do |import|
+      binding = import.content.porttype_binding(name) if self.class === import.content
+      return binding if binding
+    end
+    nil
+  end
+
+  def parse_element(element)
+    case element
+    when ImportName
+      o = Import.new
+      @imports << o
+      o
+    when TypesName
+      o = Types.new
+      @types = o
+      o
+    when MessageName
+      o = Message.new
+      @messages << o
+      o
+    when PortTypeName
+      o = PortType.new
+      @porttypes << o
+      o
+    when BindingName
+      o = Binding.new
+      @bindings << o
+      o
+    when ServiceName
+      o = Service.new
+      @services << o
+      o
+    when DocumentationName
+      o = Documentation.new
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    when TargetNamespaceAttrName
+      self.targetnamespace = value.source
+    else
+      nil
+    end
+  end
+
+  def self.parse_element(element)
+    if element == DefinitionsName
+      Definitions.new
+    else
+      nil
+    end
+  end
+
+private
+
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/documentation.rb b/ruby_1_8_6/lib/wsdl/documentation.rb
new file mode 100644
index 0000000000..3a7fd7d23e
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/documentation.rb
@@ -0,0 +1,32 @@
+# WSDL4R - WSDL SOAP documentation element.
+# Copyright (C) 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Documentation < Info
+  def initialize
+    super
+  end
+
+  def parse_element(element)
+    # Accepts any element.
+    self
+  end
+
+  def parse_attr(attr, value)
+    # Accepts any attribute.
+    true
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/import.rb b/ruby_1_8_6/lib/wsdl/import.rb
new file mode 100644
index 0000000000..faf60871a5
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/import.rb
@@ -0,0 +1,80 @@
+# WSDL4R - WSDL import definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/importer'
+
+
+module WSDL
+
+
+class Import < Info
+  attr_reader :namespace
+  attr_reader :location
+  attr_reader :content
+
+  def initialize
+    super
+    @namespace = nil
+    @location = nil
+    @content = nil
+    @web_client = nil
+  end
+
+  def parse_element(element)
+    case element
+    when DocumentationName
+      o = Documentation.new
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NamespaceAttrName
+      @namespace = value.source
+      if @content
+	@content.targetnamespace = @namespace
+      end
+      @namespace
+    when LocationAttrName
+      @location = URI.parse(value.source)
+      if @location.relative? and !parent.location.nil? and
+          !parent.location.relative?
+        @location = parent.location + @location
+      end
+      if root.importedschema.key?(@location)
+        @content = root.importedschema[@location]
+      else
+        root.importedschema[@location] = nil      # placeholder
+        @content = import(@location)
+        if @content.is_a?(Definitions)
+          @content.root = root
+          if @namespace
+            @content.targetnamespace = @namespace
+          end
+        end
+        root.importedschema[@location] = @content
+      end
+      @location
+    else
+      nil
+    end
+  end
+
+private
+
+  def import(location)
+    Importer.import(location, root)
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/importer.rb b/ruby_1_8_6/lib/wsdl/importer.rb
new file mode 100644
index 0000000000..481bd81b25
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/importer.rb
@@ -0,0 +1,38 @@
+# WSDL4R - WSDL importer library.
+# Copyright (C) 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/xmlSchema/importer'
+require 'wsdl/parser'
+
+
+module WSDL
+
+
+class Importer < WSDL::XMLSchema::Importer
+  def self.import(location, originalroot = nil)
+    new.import(location, originalroot)
+  end
+
+private
+
+  def parse(content, location, originalroot)
+    opt = {
+      :location => location,
+      :originalroot => originalroot
+    }
+    begin
+      WSDL::Parser.new(opt).parse(content)
+    rescue WSDL::Parser::ParseError
+      super(content, location, originalroot)
+    end
+  end
+
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/info.rb b/ruby_1_8_6/lib/wsdl/info.rb
new file mode 100644
index 0000000000..ffd90390a4
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/info.rb
@@ -0,0 +1,39 @@
+# WSDL4R - WSDL information base.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module WSDL
+
+
+class Info
+  attr_accessor :root
+  attr_accessor :parent
+  attr_accessor :id
+
+  def initialize
+    @root = nil
+    @parent = nil
+    @id = nil
+  end
+
+  def inspect
+    if self.respond_to?(:name)
+      sprintf("#<%s:0x%x %s>", self.class.name, __id__, self.name)
+    else
+      sprintf("#<%s:0x%x>", self.class.name, __id__)
+    end
+  end
+
+  def parse_element(element); end	# abstract
+  
+  def parse_attr(attr, value); end	# abstract
+
+  def parse_epilogue; end		# abstract
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/message.rb b/ruby_1_8_6/lib/wsdl/message.rb
new file mode 100644
index 0000000000..cecc602da3
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/message.rb
@@ -0,0 +1,54 @@
+# WSDL4R - WSDL message definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Message < Info
+  attr_reader :name	# required
+  attr_reader :parts
+
+  def initialize
+    super
+    @name = nil
+    @parts = []
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def parse_element(element)
+    case element
+    when PartName
+      o = Part.new
+      @parts << o
+      o
+    when DocumentationName
+      o = Documentation.new
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = XSD::QName.new(parent.targetnamespace, value.source)
+    else
+      nil
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/operation.rb b/ruby_1_8_6/lib/wsdl/operation.rb
new file mode 100644
index 0000000000..fb7f4a80f4
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/operation.rb
@@ -0,0 +1,130 @@
+# WSDL4R - WSDL operation definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Operation < Info
+  class NameInfo
+    attr_reader :op_name
+    attr_reader :optype_name
+    attr_reader :parts
+    def initialize(op_name, optype_name, parts)
+      @op_name = op_name
+      @optype_name = optype_name
+      @parts = parts
+    end
+  end
+
+  attr_reader :name		# required
+  attr_reader :parameter_order	# optional
+  attr_reader :input
+  attr_reader :output
+  attr_reader :fault
+  attr_reader :type		# required
+
+  def initialize
+    super
+    @name = nil
+    @type = nil
+    @parameter_order = nil
+    @input = nil
+    @output = nil
+    @fault = []
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def input_info
+    typename = input.find_message.name
+    NameInfo.new(@name, typename, inputparts)
+  end
+
+  def output_info
+    typename = output.find_message.name
+    NameInfo.new(@name, typename, outputparts)
+  end
+
+  def inputparts
+    sort_parts(input.find_message.parts)
+  end
+
+  def inputname
+    XSD::QName.new(targetnamespace, input.name ? input.name.name : @name.name)
+  end
+
+  def outputparts
+    sort_parts(output.find_message.parts)
+  end
+
+  def outputname
+    XSD::QName.new(targetnamespace,
+      output.name ? output.name.name : @name.name + 'Response')
+  end
+
+  def parse_element(element)
+    case element
+    when InputName
+      o = Param.new
+      @input = o
+      o
+    when OutputName
+      o = Param.new
+      @output = o
+      o
+    when FaultName
+      o = Param.new
+      @fault << o
+      o
+    when DocumentationName
+      o = Documentation.new
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    when TypeAttrName
+      @type = value
+    when ParameterOrderAttrName
+      @parameter_order = value.source.split(/\s+/)
+    else
+      nil
+    end
+  end
+
+private
+
+  def sort_parts(parts)
+    return parts.dup unless parameter_order
+    result = []
+    parameter_order.each do |orderitem|
+      if (ele = parts.find { |part| part.name == orderitem })
+	result << ele
+      end
+    end
+    if result.length == 0
+      return parts.dup
+    end
+    # result length can be shorter than parts's.
+    # return part must not be a part of the parameterOrder.
+    result
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/operationBinding.rb b/ruby_1_8_6/lib/wsdl/operationBinding.rb
new file mode 100644
index 0000000000..c2b8cd6591
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/operationBinding.rb
@@ -0,0 +1,108 @@
+# WSDL4R - WSDL bound operation definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class OperationBinding < Info
+  attr_reader :name		# required
+  attr_reader :input
+  attr_reader :output
+  attr_reader :fault
+  attr_reader :soapoperation
+
+  def initialize
+    super
+    @name = nil
+    @input = nil
+    @output = nil
+    @fault = []
+    @soapoperation = nil
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def porttype
+    root.porttype(parent.type)
+  end
+
+  def find_operation
+    porttype.operations[@name] or raise RuntimeError.new("#{@name} not found")
+  end
+
+  def soapoperation_name
+    if @soapoperation
+      @soapoperation.input_info.op_name
+    else
+      find_operation.name
+    end
+  end
+
+  def soapoperation_style
+    style = nil
+    if @soapoperation
+      style = @soapoperation.operation_style
+    elsif parent.soapbinding
+      style = parent.soapbinding.style
+    else
+      raise TypeError.new("operation style definition not found")
+    end
+    style || :document
+  end
+
+  def soapaction
+    if @soapoperation
+      @soapoperation.soapaction
+    else
+      nil
+    end
+  end
+
+  def parse_element(element)
+    case element
+    when InputName
+      o = Param.new
+      @input = o
+      o
+    when OutputName
+      o = Param.new
+      @output = o
+      o
+    when FaultName
+      o = Param.new
+      @fault << o
+      o
+    when SOAPOperationName
+      o = WSDL::SOAP::Operation.new
+      @soapoperation = o
+      o
+    when DocumentationName
+      o = Documentation.new
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    else
+      nil
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/param.rb b/ruby_1_8_6/lib/wsdl/param.rb
new file mode 100644
index 0000000000..b6836b7def
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/param.rb
@@ -0,0 +1,85 @@
+# WSDL4R - WSDL param definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Param < Info
+  attr_reader :message	# required
+  attr_reader :name	# optional but required for fault.
+  attr_reader :soapbody
+  attr_reader :soapheader
+  attr_reader :soapfault
+
+  def initialize
+    super
+    @message = nil
+    @name = nil
+    @soapbody = nil
+    @soapheader = []
+    @soapfault = nil
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def find_message
+    root.message(@message) or raise RuntimeError.new("#{@message} not found")
+  end
+
+  def soapbody_use
+    if @soapbody
+      @soapbody.use || :literal
+    else
+      raise RuntimeError.new("soap:body not found")
+    end
+  end
+
+  def parse_element(element)
+    case element
+    when SOAPBodyName
+      o = WSDL::SOAP::Body.new
+      @soapbody = o
+      o
+    when SOAPHeaderName
+      o = WSDL::SOAP::Header.new
+      @soapheader << o
+      o
+    when SOAPFaultName
+      o = WSDL::SOAP::Fault.new
+      @soap_fault = o
+      o
+    when DocumentationName
+      o = Documentation.new
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when MessageAttrName
+      if value.namespace.nil?
+        value = XSD::QName.new(targetnamespace, value.source)
+      end
+      @message = value
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    else
+      nil
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/parser.rb b/ruby_1_8_6/lib/wsdl/parser.rb
new file mode 100644
index 0000000000..f96e96ee2a
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/parser.rb
@@ -0,0 +1,163 @@
+# WSDL4R - WSDL XML Instance parser library.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'xsd/ns'
+require 'xsd/charset'
+require 'xsd/datatypes'
+require 'xsd/xmlparser'
+require 'wsdl/wsdl'
+require 'wsdl/data'
+require 'wsdl/xmlSchema/data'
+require 'wsdl/soap/data'
+
+
+module WSDL
+
+
+class Parser
+  include WSDL
+
+  class ParseError < Error; end
+  class FormatDecodeError < ParseError; end
+  class UnknownElementError < FormatDecodeError; end
+  class UnknownAttributeError < FormatDecodeError; end
+  class UnexpectedElementError < FormatDecodeError; end
+  class ElementConstraintError < FormatDecodeError; end
+  class AttributeConstraintError < FormatDecodeError; end
+
+private
+
+  class ParseFrame
+    attr_reader :ns
+    attr_reader :name
+    attr_accessor :node
+
+  private
+
+    def initialize(ns, name, node)
+      @ns = ns
+      @name = name
+      @node = node
+    end
+  end
+
+public
+
+  def initialize(opt = {})
+    @parser = XSD::XMLParser.create_parser(self, opt)
+    @parsestack = nil
+    @lastnode = nil
+    @ignored = {}
+    @location = opt[:location]
+    @originalroot = opt[:originalroot]
+  end
+
+  def parse(string_or_readable)
+    @parsestack = []
+    @lastnode = nil
+    @textbuf = ''
+    @parser.do_parse(string_or_readable)
+    @lastnode
+  end
+
+  def charset
+    @parser.charset
+  end
+
+  def start_element(name, attrs)
+    lastframe = @parsestack.last
+    ns = parent = nil
+    if lastframe
+      ns = lastframe.ns.clone_ns
+      parent = lastframe.node
+    else
+      ns = XSD::NS.new
+      parent = nil
+    end
+    attrs = XSD::XMLParser.filter_ns(ns, attrs)
+    node = decode_tag(ns, name, attrs, parent)
+    @parsestack << ParseFrame.new(ns, name, node)
+  end
+
+  def characters(text)
+    lastframe = @parsestack.last
+    if lastframe
+      # Need not to be cloned because character does not have attr.
+      ns = lastframe.ns
+      decode_text(ns, text)
+    else
+      p text if $DEBUG
+    end
+  end
+
+  def end_element(name)
+    lastframe = @parsestack.pop
+    unless name == lastframe.name
+      raise UnexpectedElementError.new("closing element name '#{name}' does not match with opening element '#{lastframe.name}'")
+    end
+    decode_tag_end(lastframe.ns, lastframe.node)
+    @lastnode = lastframe.node
+  end
+
+private
+
+  def decode_tag(ns, name, attrs, parent)
+    o = nil
+    elename = ns.parse(name)
+    if !parent
+      if elename == DefinitionsName
+	o = Definitions.parse_element(elename)
+        o.location = @location
+      else
+	raise UnknownElementError.new("unknown element: #{elename}")
+      end
+      o.root = @originalroot if @originalroot   # o.root = o otherwise
+    else
+      if elename == XMLSchema::AnnotationName
+        # only the first annotation element is allowed for each xsd element.
+        o = XMLSchema::Annotation.new
+      else
+        o = parent.parse_element(elename)
+      end
+      unless o
+        unless @ignored.key?(elename)
+          warn("ignored element: #{elename}")
+          @ignored[elename] = elename
+        end
+	o = Documentation.new	# which accepts any element.
+      end
+      # node could be a pseudo element.  pseudo element has its own parent.
+      o.root = parent.root
+      o.parent = parent if o.parent.nil?
+    end
+    attrs.each do |key, value|
+      attr_ele = ns.parse(key, true)
+      value_ele = ns.parse(value, true)
+      value_ele.source = value  # for recovery; value may not be a QName
+      unless o.parse_attr(attr_ele, value_ele)
+        unless @ignored.key?(attr_ele)
+          warn("ignored attr: #{attr_ele}")
+          @ignored[attr_ele] = attr_ele
+        end
+      end
+    end
+    o
+  end
+
+  def decode_tag_end(ns, node)
+    node.parse_epilogue
+  end
+
+  def decode_text(ns, text)
+    @textbuf << text
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/part.rb b/ruby_1_8_6/lib/wsdl/part.rb
new file mode 100644
index 0000000000..5dafd4ee73
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/part.rb
@@ -0,0 +1,52 @@
+# WSDL4R - WSDL part definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Part < Info
+  attr_reader :name	# required
+  attr_reader :element	# optional
+  attr_reader :type	# optional
+
+  def initialize
+    super
+    @name = nil
+    @element = nil
+    @type = nil
+  end
+
+  def parse_element(element)
+    case element
+    when DocumentationName
+      o = Documentation.new
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = value.source
+    when ElementAttrName
+      @element = value
+    when TypeAttrName
+      @type = value
+    else
+      nil
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/port.rb b/ruby_1_8_6/lib/wsdl/port.rb
new file mode 100644
index 0000000000..883cc3232d
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/port.rb
@@ -0,0 +1,84 @@
+# WSDL4R - WSDL port definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Port < Info
+  attr_reader :name		# required
+  attr_reader :binding		# required
+  attr_reader :soap_address
+
+  def initialize
+    super
+    @name = nil
+    @binding = nil
+    @soap_address = nil
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def porttype
+    root.porttype(find_binding.type)
+  end
+
+  def find_binding
+    root.binding(@binding) or raise RuntimeError.new("#{@binding} not found")
+  end
+
+  def inputoperation_map
+    result = {}
+    find_binding.operations.each do |op_bind|
+      op_info = op_bind.soapoperation.input_info
+      result[op_info.op_name] = op_info
+    end
+    result
+  end
+
+  def outputoperation_map
+    result = {}
+    find_binding.operations.each do |op_bind|
+      op_info = op_bind.soapoperation.output_info
+      result[op_info.op_name] = op_info
+    end
+    result
+  end
+
+  def parse_element(element)
+    case element
+    when SOAPAddressName
+      o = WSDL::SOAP::Address.new
+      @soap_address = o
+      o
+    when DocumentationName
+      o = Documentation.new
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    when BindingAttrName
+      @binding = value
+    else
+      nil
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/portType.rb b/ruby_1_8_6/lib/wsdl/portType.rb
new file mode 100644
index 0000000000..03e37690a8
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/portType.rb
@@ -0,0 +1,73 @@
+# WSDL4R - WSDL portType definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+
+
+class PortType < Info
+  attr_reader :name		# required
+  attr_reader :operations
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def initialize
+    super
+    @name = nil
+    @operations = XSD::NamedElements.new
+  end
+
+  def find_binding
+    root.bindings.find { |item| item.type == @name } or
+      raise RuntimeError.new("#{@name} not found")
+  end
+
+  def locations
+    bind_name = find_binding.name
+    result = []
+    root.services.each do |service|
+      service.ports.each do |port|
+        if port.binding == bind_name
+          result << port.soap_address.location if port.soap_address
+        end
+      end
+    end
+    result
+  end
+
+  def parse_element(element)
+    case element
+    when OperationName
+      o = Operation.new
+      @operations << o
+      o
+    when DocumentationName
+      o = Documentation.new
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    else
+      nil
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/service.rb b/ruby_1_8_6/lib/wsdl/service.rb
new file mode 100644
index 0000000000..652b127331
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/service.rb
@@ -0,0 +1,61 @@
+# WSDL4R - WSDL service definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+
+
+class Service < Info
+  attr_reader :name		# required
+  attr_reader :ports
+  attr_reader :soap_address
+
+  def initialize
+    super
+    @name = nil
+    @ports = XSD::NamedElements.new
+    @soap_address = nil
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def parse_element(element)
+    case element
+    when PortName
+      o = Port.new
+      @ports << o
+      o
+    when SOAPAddressName
+      o = WSDL::SOAP::Address.new
+      @soap_address = o
+      o
+    when DocumentationName
+      o = Documentation.new
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    else
+      nil
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/address.rb b/ruby_1_8_6/lib/wsdl/soap/address.rb
new file mode 100644
index 0000000000..0b2b59caf0
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/address.rb
@@ -0,0 +1,40 @@
+# WSDL4R - WSDL SOAP address definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class Address < Info
+  attr_reader :location
+
+  def initialize
+    super
+    @location = nil
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when LocationAttrName
+      @location = value.source
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/binding.rb b/ruby_1_8_6/lib/wsdl/soap/binding.rb
new file mode 100644
index 0000000000..7e15a99701
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/binding.rb
@@ -0,0 +1,49 @@
+# WSDL4R - WSDL SOAP binding definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class Binding < Info
+  attr_reader :style
+  attr_reader :transport
+
+  def initialize
+    super
+    @style = nil
+    @transport = nil
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when StyleAttrName
+      if ["document", "rpc"].include?(value.source)
+	@style = value.source.intern
+      else
+	raise Parser::AttributeConstraintError.new(
+          "Unexpected value #{ value }.")
+      end
+    when TransportAttrName
+      @transport = value.source
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/body.rb b/ruby_1_8_6/lib/wsdl/soap/body.rb
new file mode 100644
index 0000000000..824f8121a2
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/body.rb
@@ -0,0 +1,56 @@
+# WSDL4R - WSDL SOAP body definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class Body < Info
+  attr_reader :parts
+  attr_reader :use	# required
+  attr_reader :encodingstyle
+  attr_reader :namespace
+
+  def initialize
+    super
+    @parts = nil
+    @use = nil
+    @encodingstyle = nil
+    @namespace = nil
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when PartsAttrName
+      @parts = value.source
+    when UseAttrName
+      if ['literal', 'encoded'].include?(value.source)
+        @use = value.source.intern
+      else
+        raise RuntimeError.new("unknown use of soap:body: #{value.source}")
+      end
+    when EncodingStyleAttrName
+      @encodingstyle = value.source
+    when NamespaceAttrName
+      @namespace = value.source
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/cgiStubCreator.rb b/ruby_1_8_6/lib/wsdl/soap/cgiStubCreator.rb
new file mode 100644
index 0000000000..2c4dff2f62
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/cgiStubCreator.rb
@@ -0,0 +1,76 @@
+# WSDL4R - Creating CGI stub code from WSDL.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/soap/mappingRegistryCreator'
+require 'wsdl/soap/methodDefCreator'
+require 'wsdl/soap/classDefCreatorSupport'
+
+
+module WSDL
+module SOAP
+
+
+class CGIStubCreator
+  include ClassDefCreatorSupport
+
+  attr_reader :definitions
+
+  def initialize(definitions)
+    @definitions = definitions
+  end
+
+  def dump(service_name)
+    warn("CGI stub can have only 1 port.  Creating stub for the first port...  Rests are ignored.")
+    port = @definitions.service(service_name).ports[0]
+    dump_porttype(port.porttype.name)
+  end
+
+private
+
+  def dump_porttype(name)
+    class_name = create_class_name(name)
+    methoddef, types = MethodDefCreator.new(@definitions).dump(name)
+    mr_creator = MappingRegistryCreator.new(@definitions)
+    c1 = XSD::CodeGen::ClassDef.new(class_name)
+    c1.def_require("soap/rpc/cgistub")
+    c1.def_require("soap/mapping/registry")
+    c1.def_const("MappingRegistry", "::SOAP::Mapping::Registry.new")
+    c1.def_code(mr_creator.dump(types))
+    c1.def_code <<-EOD
+Methods = [
+#{methoddef.gsub(/^/, "  ")}
+]
+    EOD
+    c2 = XSD::CodeGen::ClassDef.new(class_name + "App",
+      "::SOAP::RPC::CGIStub")
+    c2.def_method("initialize", "*arg") do
+      <<-EOD
+        super(*arg)
+        servant = #{class_name}.new
+        #{class_name}::Methods.each do |definitions|
+          opt = definitions.last
+          if opt[:request_style] == :document
+            @router.add_document_operation(servant, *definitions)
+          else
+            @router.add_rpc_operation(servant, *definitions)
+          end
+        end
+        self.mapping_registry = #{class_name}::MappingRegistry
+        self.level = Logger::Severity::ERROR
+      EOD
+    end
+    c1.dump + "\n" + c2.dump + format(<<-EOD)
+      #{class_name}App.new('app', nil).start
+    EOD
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/classDefCreator.rb b/ruby_1_8_6/lib/wsdl/soap/classDefCreator.rb
new file mode 100644
index 0000000000..aeb67c0613
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/classDefCreator.rb
@@ -0,0 +1,314 @@
+# WSDL4R - Creating class definition from WSDL
+# Copyright (C) 2002, 2003, 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/data'
+require 'wsdl/soap/classDefCreatorSupport'
+require 'xsd/codegen'
+
+
+module WSDL
+module SOAP
+
+
+class ClassDefCreator
+  include ClassDefCreatorSupport
+
+  def initialize(definitions)
+    @elements = definitions.collect_elements
+    @simpletypes = definitions.collect_simpletypes
+    @complextypes = definitions.collect_complextypes
+    @faulttypes = nil
+    if definitions.respond_to?(:collect_faulttypes)
+      @faulttypes = definitions.collect_faulttypes
+    end
+  end
+
+  def dump(type = nil)
+    result = "require 'xsd/qname'\n"
+    if type
+      result = dump_classdef(type.name, type)
+    else
+      str = dump_element
+      unless str.empty?
+        result << "\n" unless result.empty?
+        result << str
+      end
+      str = dump_complextype
+      unless str.empty?
+        result << "\n" unless result.empty?
+        result << str
+      end
+      str = dump_simpletype
+      unless str.empty?
+        result << "\n" unless result.empty?
+        result << str
+      end
+    end
+    result
+  end
+
+private
+
+  def dump_element
+    @elements.collect { |ele|
+      if ele.local_complextype
+        dump_classdef(ele.name, ele.local_complextype,
+          ele.elementform == 'qualified')
+      elsif ele.local_simpletype
+        dump_simpletypedef(ele.name, ele.local_simpletype)
+      else
+        nil
+      end
+    }.compact.join("\n")
+  end
+
+  def dump_simpletype
+    @simpletypes.collect { |type|
+      dump_simpletypedef(type.name, type)
+    }.compact.join("\n")
+  end
+
+  def dump_complextype
+    @complextypes.collect { |type|
+      case type.compoundtype
+      when :TYPE_STRUCT, :TYPE_EMPTY
+        dump_classdef(type.name, type)
+      when :TYPE_ARRAY
+        dump_arraydef(type)
+      when :TYPE_SIMPLE
+        dump_simpleclassdef(type)
+      when :TYPE_MAP
+        # mapped as a general Hash
+        nil
+      else
+        raise RuntimeError.new(
+          "unknown kind of complexContent: #{type.compoundtype}")
+      end
+    }.compact.join("\n")
+  end
+
+  def dump_simpletypedef(qname, simpletype)
+    if !simpletype.restriction or simpletype.restriction.enumeration.empty?
+      return nil
+    end
+    c = XSD::CodeGen::ModuleDef.new(create_class_name(qname))
+    c.comment = "#{qname}"
+    const = {}
+    simpletype.restriction.enumeration.each do |value|
+      constname = safeconstname(value)
+      const[constname] ||= 0
+      if (const[constname] += 1) > 1
+        constname += "_#{const[constname]}"
+      end
+      c.def_const(constname, ndq(value))
+    end
+    c.dump
+  end
+
+  def dump_simpleclassdef(type_or_element)
+    qname = type_or_element.name
+    base = create_class_name(type_or_element.simplecontent.base)
+    c = XSD::CodeGen::ClassDef.new(create_class_name(qname), base)
+    c.comment = "#{qname}"
+    c.dump
+  end
+
+  def dump_classdef(qname, typedef, qualified = false)
+    if @faulttypes and @faulttypes.index(qname)
+      c = XSD::CodeGen::ClassDef.new(create_class_name(qname),
+        '::StandardError')
+    else
+      c = XSD::CodeGen::ClassDef.new(create_class_name(qname))
+    end
+    c.comment = "#{qname}"
+    c.def_classvar('schema_type', ndq(qname.name))
+    c.def_classvar('schema_ns', ndq(qname.namespace))
+    c.def_classvar('schema_qualified', dq('true')) if qualified
+    schema_element = []
+    init_lines = ''
+    params = []
+    typedef.each_element do |element|
+      if element.type == XSD::AnyTypeName
+        type = nil
+      elsif klass = element_basetype(element)
+        type = klass.name
+      elsif element.type
+        type = create_class_name(element.type)
+      else
+        type = nil      # means anyType.
+        # do we define a class for local complexType from it's name?
+        #   type = create_class_name(element.name)
+        # <element>
+        #   <complexType>
+        #     <seq...>
+        #   </complexType>
+        # </element>
+      end
+      name = name_element(element).name
+      attrname = safemethodname?(name) ? name : safemethodname(name)
+      varname = safevarname(name)
+      c.def_attr(attrname, true, varname)
+      init_lines << "@#{varname} = #{varname}\n"
+      if element.map_as_array?
+        params << "#{varname} = []"
+        type << '[]' if type
+      else
+        params << "#{varname} = nil"
+      end
+      # nil means @@schema_ns + varname
+      eleqname =
+        (varname == name && element.name.namespace == qname.namespace) ?
+        nil : element.name
+      schema_element << [varname, eleqname, type]
+    end
+    unless typedef.attributes.empty?
+      define_attribute(c, typedef.attributes)
+      init_lines << "@__xmlattr = {}\n"
+    end
+    c.def_classvar('schema_element',
+      '[' +
+        schema_element.collect { |varname, name, type|
+          '[' +
+            (
+              if name
+                varname.dump + ', [' + ndq(type) + ', ' + dqname(name) + ']'
+              else
+                varname.dump + ', ' + ndq(type)
+              end
+            ) +
+          ']'
+        }.join(', ') +
+      ']'
+    )
+    c.def_method('initialize', *params) do
+      init_lines
+    end
+    c.dump
+  end
+
+  def element_basetype(ele)
+    if klass = basetype_class(ele.type)
+      klass
+    elsif ele.local_simpletype
+      basetype_class(ele.local_simpletype.base)
+    else
+      nil
+    end
+  end
+
+  def attribute_basetype(attr)
+    if klass = basetype_class(attr.type)
+      klass
+    elsif attr.local_simpletype
+      basetype_class(attr.local_simpletype.base)
+    else
+      nil
+    end
+  end
+
+  def basetype_class(type)
+    return nil if type.nil?
+    if simpletype = @simpletypes[type]
+      basetype_mapped_class(simpletype.base)
+    else
+      basetype_mapped_class(type)
+    end
+  end
+
+  def define_attribute(c, attributes)
+    schema_attribute = []
+    attributes.each do |attribute|
+      name = name_attribute(attribute)
+      if klass = attribute_basetype(attribute)
+        type = klass.name
+      else
+        type = nil
+      end
+      methodname = safemethodname('xmlattr_' + name.name)
+      c.def_method(methodname) do <<-__EOD__
+          (@__xmlattr ||= {})[#{dqname(name)}]
+        __EOD__
+      end
+      c.def_method(methodname + '=', 'value') do <<-__EOD__
+          (@__xmlattr ||= {})[#{dqname(name)}] = value
+        __EOD__
+      end
+      schema_attribute << [name, type]
+    end
+    c.def_classvar('schema_attribute',
+      '{' +
+        schema_attribute.collect { |name, type|
+          dqname(name) + ' => ' + ndq(type)
+        }.join(', ') +
+      '}'
+    )
+  end
+
+  def name_element(element)
+    return element.name if element.name 
+    return element.ref if element.ref
+    raise RuntimeError.new("cannot define name of #{element}")
+  end
+
+  def name_attribute(attribute)
+    return attribute.name if attribute.name 
+    return attribute.ref if attribute.ref
+    raise RuntimeError.new("cannot define name of #{attribute}")
+  end
+
+  DEFAULT_ITEM_NAME = XSD::QName.new(nil, 'item')
+
+  def dump_arraydef(complextype)
+    qname = complextype.name
+    c = XSD::CodeGen::ClassDef.new(create_class_name(qname), '::Array')
+    c.comment = "#{qname}"
+    child_type = complextype.child_type
+    c.def_classvar('schema_type', ndq(child_type.name))
+    c.def_classvar('schema_ns', ndq(child_type.namespace))
+    child_element = complextype.find_aryelement
+    schema_element = []
+    if child_type == XSD::AnyTypeName
+      type = nil
+    elsif child_element and (klass = element_basetype(child_element))
+      type = klass.name
+    elsif child_type
+      type = create_class_name(child_type)
+    else
+      type = nil
+    end
+    if child_element
+      if child_element.map_as_array?
+        type << '[]' if type
+      end
+      child_element_name = child_element.name
+    else
+      child_element_name = DEFAULT_ITEM_NAME
+    end
+    schema_element << [child_element_name.name, child_element_name, type]
+    c.def_classvar('schema_element',
+      '[' +
+        schema_element.collect { |varname, name, type|
+          '[' +
+            (
+              if name
+                varname.dump + ', [' + ndq(type) + ', ' + dqname(name) + ']'
+              else
+                varname.dump + ', ' + ndq(type)
+              end
+            ) +
+          ']'
+        }.join(', ') +
+      ']'
+    )
+    c.dump
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/classDefCreatorSupport.rb b/ruby_1_8_6/lib/wsdl/soap/classDefCreatorSupport.rb
new file mode 100644
index 0000000000..8f335653c8
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/classDefCreatorSupport.rb
@@ -0,0 +1,126 @@
+# WSDL4R - Creating class code support from WSDL.
+# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'soap/mapping'
+require 'soap/mapping/typeMap'
+require 'xsd/codegen/gensupport'
+
+
+module WSDL
+module SOAP
+
+
+module ClassDefCreatorSupport
+  include XSD::CodeGen::GenSupport
+
+  def create_class_name(qname)
+    if klass = basetype_mapped_class(qname)
+      ::SOAP::Mapping::DefaultRegistry.find_mapped_obj_class(klass).name
+    else
+      safeconstname(qname.name)
+    end
+  end
+
+  def basetype_mapped_class(name)
+    ::SOAP::TypeMap[name]
+  end
+
+  def dump_method_signature(operation)
+    name = operation.name.name
+    input = operation.input
+    output = operation.output
+    fault = operation.fault
+    signature = "#{ name }#{ dump_inputparam(input) }"
+    str = <<__EOD__
+# SYNOPSIS
+#   #{name}#{dump_inputparam(input)}
+#
+# ARGS
+#{dump_inout_type(input).chomp}
+#
+# RETURNS
+#{dump_inout_type(output).chomp}
+#
+__EOD__
+    unless fault.empty?
+      faultstr = (fault.collect { |f| dump_inout_type(f).chomp }).join(', ')
+      str <<<<__EOD__
+# RAISES
+#   #{faultstr}
+#
+__EOD__
+    end
+    str
+  end
+
+  def dq(ele)
+    ele.dump
+  end
+
+  def ndq(ele)
+    ele.nil? ? 'nil' : dq(ele)
+  end
+
+  def sym(ele)
+    ':' + ele
+  end
+
+  def dqname(qname)
+    qname.dump
+  end
+
+private
+
+  def dump_inout_type(param)
+    if param
+      message = param.find_message
+      params = ""
+      message.parts.each do |part|
+        name = safevarname(part.name)
+        if part.type
+          typename = safeconstname(part.type.name)
+          params << add_at("#   #{name}", "#{typename} - #{part.type}\n", 20)
+        elsif part.element
+          typename = safeconstname(part.element.name)
+          params << add_at("#   #{name}", "#{typename} - #{part.element}\n", 20)
+        end
+      end
+      unless params.empty?
+        return params
+      end
+    end
+    "#   N/A\n"
+  end
+
+  def dump_inputparam(input)
+    message = input.find_message
+    params = ""
+    message.parts.each do |part|
+      params << ", " unless params.empty?
+      params << safevarname(part.name)
+    end
+    if params.empty?
+      ""
+    else
+      "(#{ params })"
+    end
+  end
+
+  def add_at(base, str, pos)
+    if base.size >= pos
+      base + ' ' + str
+    else
+      base + ' ' * (pos - base.size) + str
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/clientSkeltonCreator.rb b/ruby_1_8_6/lib/wsdl/soap/clientSkeltonCreator.rb
new file mode 100644
index 0000000000..916f0d4dc0
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/clientSkeltonCreator.rb
@@ -0,0 +1,78 @@
+# WSDL4R - Creating client skelton code from WSDL.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/soap/classDefCreatorSupport'
+
+
+module WSDL
+module SOAP
+
+
+class ClientSkeltonCreator
+  include ClassDefCreatorSupport
+
+  attr_reader :definitions
+
+  def initialize(definitions)
+    @definitions = definitions
+  end
+
+  def dump(service_name)
+    result = ""
+    @definitions.service(service_name).ports.each do |port|
+      result << dump_porttype(port.porttype.name)
+      result << "\n"
+    end
+    result
+  end
+
+private
+
+  def dump_porttype(name)
+    drv_name = create_class_name(name)
+
+    result = ""
+    result << <<__EOD__
+endpoint_url = ARGV.shift
+obj = #{ drv_name }.new(endpoint_url)
+
+# run ruby with -d to see SOAP wiredumps.
+obj.wiredump_dev = STDERR if $DEBUG
+
+__EOD__
+    @definitions.porttype(name).operations.each do |operation|
+      result << dump_method_signature(operation)
+      result << dump_input_init(operation.input) << "\n"
+      result << dump_operation(operation) << "\n\n"
+    end
+    result
+  end
+
+  def dump_operation(operation)
+    name = operation.name
+    input = operation.input
+    "puts obj.#{ safemethodname(name.name) }#{ dump_inputparam(input) }"
+  end
+
+  def dump_input_init(input)
+    result = input.find_message.parts.collect { |part|
+      safevarname(part.name)
+    }.join(" = ")
+    if result.empty?
+      ""
+    else
+      result << " = nil"
+    end
+    result
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/complexType.rb b/ruby_1_8_6/lib/wsdl/soap/complexType.rb
new file mode 100644
index 0000000000..b2e13d0564
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/complexType.rb
@@ -0,0 +1,161 @@
+# WSDL4R - SOAP complexType definition for WSDL.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/xmlSchema/complexType'
+require 'soap/mapping'
+
+
+module WSDL
+module XMLSchema
+
+
+class ComplexType < Info
+  def compoundtype
+    @compoundtype ||= check_type
+  end
+
+  def check_type
+    if content
+      if attributes.empty? and
+          content.elements.size == 1 and content.elements[0].maxoccurs != '1'
+        if name == ::SOAP::Mapping::MapQName
+          :TYPE_MAP
+        else
+          :TYPE_ARRAY
+        end
+      else
+	:TYPE_STRUCT
+      end
+    elsif complexcontent
+      if complexcontent.base == ::SOAP::ValueArrayName
+        :TYPE_ARRAY
+      else
+        complexcontent.basetype.check_type
+      end
+    elsif simplecontent
+      :TYPE_SIMPLE
+    elsif !attributes.empty?
+      :TYPE_STRUCT
+    else # empty complexType definition (seen in partner.wsdl of salesforce)
+      :TYPE_EMPTY
+    end
+  end
+
+  def child_type(name = nil)
+    case compoundtype
+    when :TYPE_STRUCT
+      if ele = find_element(name)
+        ele.type
+      elsif ele = find_element_by_name(name.name)
+	ele.type
+      end
+    when :TYPE_ARRAY
+      @contenttype ||= content_arytype
+    when :TYPE_MAP
+      item_ele = find_element_by_name("item") or
+        raise RuntimeError.new("'item' element not found in Map definition.")
+      content = item_ele.local_complextype or
+        raise RuntimeError.new("No complexType definition for 'item'.")
+      if ele = content.find_element(name)
+        ele.type
+      elsif ele = content.find_element_by_name(name.name)
+        ele.type
+      end
+    else
+      raise NotImplementedError.new("Unknown kind of complexType.")
+    end
+  end
+
+  def child_defined_complextype(name)
+    ele = nil
+    case compoundtype
+    when :TYPE_STRUCT, :TYPE_MAP
+      unless ele = find_element(name)
+       	if name.namespace.nil?
+  	  ele = find_element_by_name(name.name)
+   	end
+      end
+    when :TYPE_ARRAY
+      if content.elements.size == 1
+	ele = content.elements[0]
+      else
+	raise RuntimeError.new("Assert: must not reach.")
+      end
+    else
+      raise RuntimeError.new("Assert: Not implemented.")
+    end
+    unless ele
+      raise RuntimeError.new("Cannot find #{name} as a children of #{@name}.")
+    end
+    ele.local_complextype
+  end
+
+  def find_arytype
+    unless compoundtype == :TYPE_ARRAY
+      raise RuntimeError.new("Assert: not for array")
+    end
+    if complexcontent
+      complexcontent.attributes.each do |attribute|
+	if attribute.ref == ::SOAP::AttrArrayTypeName
+	  return attribute.arytype
+	end
+      end
+      if check_array_content(complexcontent.content)
+        return element_simpletype(complexcontent.content.elements[0])
+      end
+    elsif check_array_content(content)
+      return element_simpletype(content.elements[0])
+    end
+    raise RuntimeError.new("Assert: Unknown array definition.")
+  end
+
+  def find_aryelement
+    unless compoundtype == :TYPE_ARRAY
+      raise RuntimeError.new("Assert: not for array")
+    end
+    if complexcontent
+      if check_array_content(complexcontent.content)
+        return complexcontent.content.elements[0]
+      end
+    elsif check_array_content(content)
+      return content.elements[0]
+    end
+    nil # use default item name
+  end
+
+private
+
+  def element_simpletype(element)
+    if element.type
+      element.type 
+    elsif element.local_simpletype
+      element.local_simpletype.base
+    else
+      nil
+    end
+  end
+
+  def check_array_content(content)
+    content and content.elements.size == 1 and
+      content.elements[0].maxoccurs != '1'
+  end
+
+  def content_arytype
+    if arytype = find_arytype
+      ns = arytype.namespace
+      name = arytype.name.sub(/\[(?:,)*\]$/, '')
+      XSD::QName.new(ns, name)
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/data.rb b/ruby_1_8_6/lib/wsdl/soap/data.rb
new file mode 100644
index 0000000000..48512d3751
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/data.rb
@@ -0,0 +1,42 @@
+# WSDL4R - WSDL SOAP binding data definitions.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'wsdl/soap/definitions'
+require 'wsdl/soap/binding'
+require 'wsdl/soap/operation'
+require 'wsdl/soap/body'
+require 'wsdl/soap/element'
+require 'wsdl/soap/header'
+require 'wsdl/soap/headerfault'
+require 'wsdl/soap/fault'
+require 'wsdl/soap/address'
+require 'wsdl/soap/complexType'
+
+
+module WSDL
+module SOAP
+
+
+HeaderFaultName = XSD::QName.new(SOAPBindingNamespace, 'headerfault')
+
+LocationAttrName = XSD::QName.new(nil, 'location')
+StyleAttrName = XSD::QName.new(nil, 'style')
+TransportAttrName = XSD::QName.new(nil, 'transport')
+UseAttrName = XSD::QName.new(nil, 'use')
+PartsAttrName = XSD::QName.new(nil, 'parts')
+PartAttrName = XSD::QName.new(nil, 'part')
+NameAttrName = XSD::QName.new(nil, 'name')
+MessageAttrName = XSD::QName.new(nil, 'message')
+EncodingStyleAttrName = XSD::QName.new(nil, 'encodingStyle')
+NamespaceAttrName = XSD::QName.new(nil, 'namespace')
+SOAPActionAttrName = XSD::QName.new(nil, 'soapAction')
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/definitions.rb b/ruby_1_8_6/lib/wsdl/soap/definitions.rb
new file mode 100644
index 0000000000..b014d5af6b
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/definitions.rb
@@ -0,0 +1,149 @@
+# WSDL4R - WSDL additional definitions for SOAP.
+# Copyright (C) 2002-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+require 'soap/mapping'
+
+
+module WSDL
+
+
+class Definitions < Info
+  def self.soap_rpc_complextypes
+    types = XSD::NamedElements.new
+    types << array_complextype
+    types << fault_complextype
+    types << exception_complextype
+    types
+  end
+
+  def self.array_complextype
+    type = XMLSchema::ComplexType.new(::SOAP::ValueArrayName)
+    type.complexcontent = XMLSchema::ComplexContent.new
+    type.complexcontent.base = ::SOAP::ValueArrayName
+    attr = XMLSchema::Attribute.new
+    attr.ref = ::SOAP::AttrArrayTypeName
+    anytype = XSD::AnyTypeName.dup
+    anytype.name += '[]'
+    attr.arytype = anytype
+    type.complexcontent.attributes << attr
+    type
+  end
+
+=begin
+<xs:complexType name="Fault" final="extension">
+  <xs:sequence>
+    <xs:element name="faultcode" type="xs:QName" /> 
+    <xs:element name="faultstring" type="xs:string" /> 
+    <xs:element name="faultactor" type="xs:anyURI" minOccurs="0" /> 
+    <xs:element name="detail" type="tns:detail" minOccurs="0" /> 
+  </xs:sequence>
+</xs:complexType>
+=end
+  def self.fault_complextype
+    type = XMLSchema::ComplexType.new(::SOAP::EleFaultName)
+    faultcode = XMLSchema::Element.new(::SOAP::EleFaultCodeName, XSD::XSDQName::Type)
+    faultstring = XMLSchema::Element.new(::SOAP::EleFaultStringName, XSD::XSDString::Type)
+    faultactor = XMLSchema::Element.new(::SOAP::EleFaultActorName, XSD::XSDAnyURI::Type)
+    faultactor.minoccurs = 0
+    detail = XMLSchema::Element.new(::SOAP::EleFaultDetailName, XSD::AnyTypeName)
+    detail.minoccurs = 0
+    type.all_elements = [faultcode, faultstring, faultactor, detail]
+    type.final = 'extension'
+    type
+  end
+
+  def self.exception_complextype
+    type = XMLSchema::ComplexType.new(XSD::QName.new(
+	::SOAP::Mapping::RubyCustomTypeNamespace, 'SOAPException'))
+    excn_name = XMLSchema::Element.new(XSD::QName.new(nil, 'excn_type_name'), XSD::XSDString::Type)
+    cause = XMLSchema::Element.new(XSD::QName.new(nil, 'cause'), XSD::AnyTypeName)
+    backtrace = XMLSchema::Element.new(XSD::QName.new(nil, 'backtrace'), ::SOAP::ValueArrayName)
+    message = XMLSchema::Element.new(XSD::QName.new(nil, 'message'), XSD::XSDString::Type)
+    type.all_elements = [excn_name, cause, backtrace, message]
+    type
+  end
+
+  def soap_rpc_complextypes(binding)
+    types = rpc_operation_complextypes(binding)
+    types + self.class.soap_rpc_complextypes
+  end
+
+  def collect_faulttypes
+    result = []
+    collect_fault_messages.each do |name|
+      faultparts = message(name).parts
+      if faultparts.size != 1
+	raise RuntimeError.new("expecting fault message to have only 1 part")
+      end
+      if result.index(faultparts[0].type).nil?
+	result << faultparts[0].type
+      end
+    end
+    result
+  end
+
+private
+
+  def collect_fault_messages
+    result = []
+    porttypes.each do |porttype|
+      porttype.operations.each do |operation|
+	operation.fault.each do |fault|
+	  if result.index(fault.message).nil?
+	    result << fault.message
+	  end
+	end
+      end
+    end
+    result
+  end
+
+  def rpc_operation_complextypes(binding)
+    types = XSD::NamedElements.new
+    binding.operations.each do |op_bind|
+      if op_bind_rpc?(op_bind)
+	operation = op_bind.find_operation
+	if op_bind.input
+	  type = XMLSchema::ComplexType.new(op_bind.soapoperation_name)
+	  message = messages[operation.input.message]
+	  type.sequence_elements = elements_from_message(message)
+	  types << type
+	end
+	if op_bind.output
+	  type = XMLSchema::ComplexType.new(operation.outputname)
+	  message = messages[operation.output.message]
+	  type.sequence_elements = elements_from_message(message)
+	  types << type
+	end
+      end
+    end
+    types
+  end
+
+  def op_bind_rpc?(op_bind)
+    op_bind.soapoperation_style == :rpc
+  end
+
+  def elements_from_message(message)
+    message.parts.collect { |part|
+      if part.element
+        collect_elements[part.element]
+      elsif part.name.nil? or part.type.nil?
+	raise RuntimeError.new("part of a message must be an element or typed")
+      else
+        qname = XSD::QName.new(nil, part.name)
+        XMLSchema::Element.new(qname, part.type)
+      end
+    }
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/driverCreator.rb b/ruby_1_8_6/lib/wsdl/soap/driverCreator.rb
new file mode 100644
index 0000000000..eba7c158a2
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/driverCreator.rb
@@ -0,0 +1,95 @@
+# WSDL4R - Creating driver code from WSDL.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/soap/mappingRegistryCreator'
+require 'wsdl/soap/methodDefCreator'
+require 'wsdl/soap/classDefCreatorSupport'
+require 'xsd/codegen'
+
+
+module WSDL
+module SOAP
+
+
+class DriverCreator
+  include ClassDefCreatorSupport
+
+  attr_reader :definitions
+
+  def initialize(definitions)
+    @definitions = definitions
+  end
+
+  def dump(porttype = nil)
+    if porttype.nil?
+      result = ""
+      @definitions.porttypes.each do |type|
+	result << dump_porttype(type.name)
+	result << "\n"
+      end
+    else
+      result = dump_porttype(porttype)
+    end
+    result
+  end
+
+private
+
+  def dump_porttype(name)
+    class_name = create_class_name(name)
+    methoddef, types = MethodDefCreator.new(@definitions).dump(name)
+    mr_creator = MappingRegistryCreator.new(@definitions)
+    binding = @definitions.bindings.find { |item| item.type == name }
+    return '' unless binding.soapbinding        # not a SOAP binding
+    address = @definitions.porttype(name).locations[0]
+
+    c = XSD::CodeGen::ClassDef.new(class_name, "::SOAP::RPC::Driver")
+    c.def_require("soap/rpc/driver")
+    c.def_const("MappingRegistry", "::SOAP::Mapping::Registry.new")
+    c.def_const("DefaultEndpointUrl", ndq(address))
+    c.def_code(mr_creator.dump(types))
+    c.def_code <<-EOD
+Methods = [
+#{methoddef.gsub(/^/, "  ")}
+]
+    EOD
+    c.def_method("initialize", "endpoint_url = nil") do
+      <<-EOD
+        endpoint_url ||= DefaultEndpointUrl
+        super(endpoint_url, nil)
+        self.mapping_registry = MappingRegistry
+        init_methods
+      EOD
+    end
+    c.def_privatemethod("init_methods") do
+      <<-EOD
+        Methods.each do |definitions|
+          opt = definitions.last
+          if opt[:request_style] == :document
+            add_document_operation(*definitions)
+          else
+            add_rpc_operation(*definitions)
+            qname = definitions[0]
+            name = definitions[2]
+            if qname.name != name and qname.name.capitalize == name.capitalize
+              ::SOAP::Mapping.define_singleton_method(self, qname.name) do |*arg|
+                __send__(name, *arg)
+              end
+            end
+          end
+        end
+      EOD
+    end
+    c.dump
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/element.rb b/ruby_1_8_6/lib/wsdl/soap/element.rb
new file mode 100644
index 0000000000..0fa6017c5b
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/element.rb
@@ -0,0 +1,28 @@
+# WSDL4R - XMLSchema element definition for WSDL.
+# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/xmlSchema/element'
+
+
+module WSDL
+module XMLSchema
+
+
+class Element < Info
+  def map_as_array?
+    maxoccurs != '1'
+  end
+
+  def attributes
+    @local_complextype.attributes
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/fault.rb b/ruby_1_8_6/lib/wsdl/soap/fault.rb
new file mode 100644
index 0000000000..2862b659ab
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/fault.rb
@@ -0,0 +1,56 @@
+# WSDL4R - WSDL SOAP body definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class Fault < Info
+  attr_reader :name	# required
+  attr_reader :use	# required
+  attr_reader :encodingstyle
+  attr_reader :namespace
+
+  def initialize
+    super
+    @name = nil
+    @use = nil
+    @encodingstyle = nil
+    @namespace = nil
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    when UseAttrName
+      @use = value.source
+    when EncodingStyleAttrName
+      @encodingstyle = value.source
+    when NamespaceAttrName
+      @namespace = value.source
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/header.rb b/ruby_1_8_6/lib/wsdl/soap/header.rb
new file mode 100644
index 0000000000..8d7c4e9d70
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/header.rb
@@ -0,0 +1,86 @@
+# WSDL4R - WSDL SOAP body definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class Header < Info
+  attr_reader :headerfault
+
+  attr_reader :message	# required
+  attr_reader :part	# required
+  attr_reader :use	# required
+  attr_reader :encodingstyle
+  attr_reader :namespace
+
+  def initialize
+    super
+    @message = nil
+    @part = nil
+    @use = nil
+    @encodingstyle = nil
+    @namespace = nil
+    @headerfault = nil
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def find_message
+    root.message(@message) or raise RuntimeError.new("#{@message} not found")
+  end
+
+  def find_part
+    find_message.parts.each do |part|
+      if part.name == @part
+	return part
+      end
+    end
+    raise RuntimeError.new("#{@part} not found")
+  end
+
+  def parse_element(element)
+    case element
+    when HeaderFaultName
+      o = WSDL::SOAP::HeaderFault.new
+      @headerfault = o
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when MessageAttrName
+      if value.namespace.nil?
+        value = XSD::QName.new(targetnamespace, value.source)
+      end
+      @message = value
+    when PartAttrName
+      @part = value.source
+    when UseAttrName
+      @use = value.source
+    when EncodingStyleAttrName
+      @encodingstyle = value.source
+    when NamespaceAttrName
+      @namespace = value.source
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/headerfault.rb b/ruby_1_8_6/lib/wsdl/soap/headerfault.rb
new file mode 100644
index 0000000000..d6b14f2646
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/headerfault.rb
@@ -0,0 +1,56 @@
+# WSDL4R - WSDL SOAP body definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class HeaderFault < Info
+  attr_reader :message	# required
+  attr_reader :part	# required
+  attr_reader :use	# required
+  attr_reader :encodingstyle
+  attr_reader :namespace
+
+  def initialize
+    super
+    @message = nil
+    @part = nil
+    @use = nil
+    @encodingstyle = nil
+    @namespace = nil
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when MessageAttrName
+      @message = value
+    when PartAttrName
+      @part = value.source
+    when UseAttrName
+      @use = value.source
+    when EncodingStyleAttrName
+      @encodingstyle = value.source
+    when NamespaceAttrName
+      @namespace = value.source
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/mappingRegistryCreator.rb b/ruby_1_8_6/lib/wsdl/soap/mappingRegistryCreator.rb
new file mode 100644
index 0000000000..8669339ce4
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/mappingRegistryCreator.rb
@@ -0,0 +1,92 @@
+# WSDL4R - Creating MappingRegistry code from WSDL.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/soap/classDefCreatorSupport'
+
+
+module WSDL
+module SOAP
+
+
+class MappingRegistryCreator
+  include ClassDefCreatorSupport
+
+  attr_reader :definitions
+
+  def initialize(definitions)
+    @definitions = definitions
+    @complextypes = @definitions.collect_complextypes
+    @types = nil
+  end
+
+  def dump(types)
+    @types = types
+    map_cache = []
+    map = ""
+    @types.each do |type|
+      if map_cache.index(type).nil?
+	map_cache << type
+	if type.namespace != XSD::Namespace
+	  if typemap = dump_typemap(type)
+            map << typemap
+          end
+	end
+      end
+   end
+    return map
+  end
+
+private
+
+  def dump_typemap(type)
+    if definedtype = @complextypes[type]
+      case definedtype.compoundtype
+      when :TYPE_STRUCT
+        dump_struct_typemap(definedtype)
+      when :TYPE_ARRAY
+        dump_array_typemap(definedtype)
+      when :TYPE_MAP, :TYPE_EMPTY
+        nil
+      else
+        raise NotImplementedError.new("must not reach here")
+      end
+    end
+  end
+
+  def dump_struct_typemap(definedtype)
+    ele = definedtype.name
+    return <<__EOD__
+MappingRegistry.set(
+  #{create_class_name(ele)},
+  ::SOAP::SOAPStruct,
+  ::SOAP::Mapping::Registry::TypedStructFactory,
+  { :type => #{dqname(ele)} }
+)
+__EOD__
+  end
+
+  def dump_array_typemap(definedtype)
+    ele = definedtype.name
+    arytype = definedtype.find_arytype || XSD::AnyTypeName
+    type = XSD::QName.new(arytype.namespace, arytype.name.sub(/\[(?:,)*\]$/, ''))
+    @types << type
+    return <<__EOD__
+MappingRegistry.set(
+  #{create_class_name(ele)},
+  ::SOAP::SOAPArray,
+  ::SOAP::Mapping::Registry::TypedArrayFactory,
+  { :type => #{dqname(type)} }
+)
+__EOD__
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/methodDefCreator.rb b/ruby_1_8_6/lib/wsdl/soap/methodDefCreator.rb
new file mode 100644
index 0000000000..f3ffadbe69
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/methodDefCreator.rb
@@ -0,0 +1,228 @@
+# WSDL4R - Creating driver code from WSDL.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/soap/classDefCreatorSupport'
+require 'soap/rpc/element'
+
+
+module WSDL
+module SOAP
+
+
+class MethodDefCreator
+  include ClassDefCreatorSupport
+
+  attr_reader :definitions
+
+  def initialize(definitions)
+    @definitions = definitions
+    @simpletypes = @definitions.collect_simpletypes
+    @complextypes = @definitions.collect_complextypes
+    @elements = @definitions.collect_elements
+    @types = []
+  end
+
+  def dump(porttype)
+    @types.clear
+    result = ""
+    operations = @definitions.porttype(porttype).operations
+    binding = @definitions.porttype_binding(porttype)
+    operations.each do |operation|
+      op_bind = binding.operations[operation.name]
+      next unless op_bind # no binding is defined
+      next unless op_bind.soapoperation # not a SOAP operation binding
+      result << ",\n" unless result.empty?
+      result << dump_method(operation, op_bind).chomp
+    end
+    return result, @types
+  end
+
+  def collect_rpcparameter(operation)
+    result = operation.inputparts.collect { |part|
+      collect_type(part.type)
+      param_set(::SOAP::RPC::SOAPMethod::IN, part.name, rpcdefinedtype(part))
+    }
+    outparts = operation.outputparts
+    if outparts.size > 0
+      retval = outparts[0]
+      collect_type(retval.type)
+      result << param_set(::SOAP::RPC::SOAPMethod::RETVAL, retval.name,
+        rpcdefinedtype(retval))
+      cdr(outparts).each { |part|
+	collect_type(part.type)
+	result << param_set(::SOAP::RPC::SOAPMethod::OUT, part.name,
+          rpcdefinedtype(part))
+      }
+    end
+    result
+  end
+
+  def collect_documentparameter(operation)
+    param = []
+    operation.inputparts.each do |input|
+      param << param_set(::SOAP::RPC::SOAPMethod::IN, input.name,
+        documentdefinedtype(input), elementqualified(input))
+    end
+    operation.outputparts.each do |output|
+      param << param_set(::SOAP::RPC::SOAPMethod::OUT, output.name,
+        documentdefinedtype(output), elementqualified(output))
+    end
+    param
+  end
+
+private
+
+  def dump_method(operation, binding)
+    name = safemethodname(operation.name.name)
+    name_as = operation.name.name
+    style = binding.soapoperation_style
+    inputuse = binding.input.soapbody_use
+    outputuse = binding.output.soapbody_use
+    namespace = binding.input.soapbody.namespace
+    if style == :rpc
+      qname = XSD::QName.new(namespace, name_as)
+      paramstr = param2str(collect_rpcparameter(operation))
+    else
+      qname = nil
+      paramstr = param2str(collect_documentparameter(operation))
+    end
+    if paramstr.empty?
+      paramstr = '[]'
+    else
+      paramstr = "[ " << paramstr.split(/\r?\n/).join("\n    ") << " ]"
+    end
+    definitions = <<__EOD__
+#{ndq(binding.soapaction)},
+  #{dq(name)},
+  #{paramstr},
+  { :request_style =>  #{sym(style.id2name)}, :request_use =>  #{sym(inputuse.id2name)},
+    :response_style => #{sym(style.id2name)}, :response_use => #{sym(outputuse.id2name)} }
+__EOD__
+    if style == :rpc
+      return <<__EOD__
+[ #{qname.dump},
+  #{definitions}]
+__EOD__
+    else
+      return <<__EOD__
+[ #{definitions}]
+__EOD__
+    end
+  end
+
+  def rpcdefinedtype(part)
+    if mapped = basetype_mapped_class(part.type)
+      ['::' + mapped.name]
+    elsif definedtype = @simpletypes[part.type]
+      ['::' + basetype_mapped_class(definedtype.base).name]
+    elsif definedtype = @elements[part.element]
+      #['::SOAP::SOAPStruct', part.element.namespace, part.element.name]
+      ['nil', part.element.namespace, part.element.name]
+    elsif definedtype = @complextypes[part.type]
+      case definedtype.compoundtype
+      when :TYPE_STRUCT, :TYPE_EMPTY    # ToDo: empty should be treated as void.
+        type = create_class_name(part.type)
+	[type, part.type.namespace, part.type.name]
+      when :TYPE_MAP
+	[Hash.name, part.type.namespace, part.type.name]
+      when :TYPE_ARRAY
+	arytype = definedtype.find_arytype || XSD::AnyTypeName
+	ns = arytype.namespace
+	name = arytype.name.sub(/\[(?:,)*\]$/, '')
+        type = create_class_name(XSD::QName.new(ns, name))
+	[type + '[]', ns, name]
+      else
+	raise NotImplementedError.new("must not reach here")
+      end
+    else
+      raise RuntimeError.new("part: #{part.name} cannot be resolved")
+    end
+  end
+
+  def documentdefinedtype(part)
+    if mapped = basetype_mapped_class(part.type)
+      ['::' + mapped.name, nil, part.name]
+    elsif definedtype = @simpletypes[part.type]
+      ['::' + basetype_mapped_class(definedtype.base).name, nil, part.name]
+    elsif definedtype = @elements[part.element]
+      ['::SOAP::SOAPElement', part.element.namespace, part.element.name]
+    elsif definedtype = @complextypes[part.type]
+      ['::SOAP::SOAPElement', part.type.namespace, part.type.name]
+    else
+      raise RuntimeError.new("part: #{part.name} cannot be resolved")
+    end
+  end
+
+  def elementqualified(part)
+    if mapped = basetype_mapped_class(part.type)
+      false
+    elsif definedtype = @simpletypes[part.type]
+      false
+    elsif definedtype = @elements[part.element]
+      definedtype.elementform == 'qualified'
+    elsif definedtype = @complextypes[part.type]
+      false
+    else
+      raise RuntimeError.new("part: #{part.name} cannot be resolved")
+    end
+  end
+
+  def param_set(io_type, name, type, ele = nil)
+    [io_type, name, type, ele]
+  end
+
+  def collect_type(type)
+    # ignore inline type definition.
+    return if type.nil?
+    return if @types.include?(type)
+    @types << type
+    return unless @complextypes[type]
+    @complextypes[type].each_element do |element|
+      collect_type(element.type)
+    end
+  end
+
+  def param2str(params)
+    params.collect { |param|
+      io, name, type, ele = param
+      unless ele.nil?
+        "[#{dq(io)}, #{dq(name)}, #{type2str(type)}, #{ele2str(ele)}]"
+      else
+        "[#{dq(io)}, #{dq(name)}, #{type2str(type)}]"
+      end
+    }.join(",\n")
+  end
+
+  def type2str(type)
+    if type.size == 1
+      "[#{dq(type[0])}]" 
+    else
+      "[#{dq(type[0])}, #{ndq(type[1])}, #{dq(type[2])}]" 
+    end
+  end
+
+  def ele2str(ele)
+    qualified = ele
+    if qualified
+      "true"
+    else
+      "false"
+    end
+  end
+
+  def cdr(ary)
+    result = ary.dup
+    result.shift
+    result
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/operation.rb b/ruby_1_8_6/lib/wsdl/soap/operation.rb
new file mode 100644
index 0000000000..502d34a07d
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/operation.rb
@@ -0,0 +1,122 @@
+# WSDL4R - WSDL SOAP operation definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module SOAP
+
+
+class Operation < Info
+  class OperationInfo
+    attr_reader :style
+    attr_reader :op_name
+    attr_reader :optype_name
+    attr_reader :headerparts
+    attr_reader :bodyparts
+    attr_reader :faultpart
+    attr_reader :soapaction
+    
+    def initialize(style, op_name, optype_name, headerparts, bodyparts, faultpart, soapaction)
+      @style = style
+      @op_name = op_name
+      @optype_name = optype_name
+      @headerparts = headerparts
+      @bodyparts = bodyparts
+      @faultpart = faultpart
+      @soapaction = soapaction
+    end
+  end
+
+  attr_reader :soapaction
+  attr_reader :style
+
+  def initialize
+    super
+    @soapaction = nil
+    @style = nil
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when StyleAttrName
+      if ["document", "rpc"].include?(value.source)
+	@style = value.source.intern
+      else
+	raise Parser::AttributeConstraintError.new(
+          "Unexpected value #{ value }.")
+      end
+    when SOAPActionAttrName
+      @soapaction = value.source
+    else
+      nil
+    end
+  end
+
+  def input_info
+    name_info = parent.find_operation.input_info
+    param_info(name_info, parent.input)
+  end
+
+  def output_info
+    name_info = parent.find_operation.output_info
+    param_info(name_info, parent.output)
+  end
+
+  def operation_style
+    return @style if @style
+    if parent_binding.soapbinding
+      return parent_binding.soapbinding.style
+    end
+    nil
+  end
+
+private
+
+  def parent_binding
+    parent.parent
+  end
+
+  def param_info(name_info, param)
+    op_name = name_info.op_name
+    optype_name = name_info.optype_name
+
+    soapheader = param.soapheader
+    headerparts = soapheader.collect { |item| item.find_part }
+
+    soapbody = param.soapbody
+    if soapbody.encodingstyle and
+	soapbody.encodingstyle != ::SOAP::EncodingNamespace
+      raise NotImplementedError.new(
+	"EncodingStyle '#{ soapbody.encodingstyle }' not supported.")
+    end
+    if soapbody.namespace
+      op_name = XSD::QName.new(soapbody.namespace, op_name.name)
+    end
+    if soapbody.parts
+      target = soapbody.parts.split(/\s+/)
+      bodyparts = name_info.parts.find_all { |part|
+	target.include?(part.name)
+      }
+    else
+      bodyparts = name_info.parts
+    end
+
+    faultpart = nil
+    OperationInfo.new(operation_style, op_name, optype_name, headerparts, bodyparts, faultpart, parent.soapaction)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/servantSkeltonCreator.rb b/ruby_1_8_6/lib/wsdl/soap/servantSkeltonCreator.rb
new file mode 100644
index 0000000000..88294ffed8
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/servantSkeltonCreator.rb
@@ -0,0 +1,67 @@
+# WSDL4R - Creating servant skelton code from WSDL.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/soap/classDefCreatorSupport'
+require 'xsd/codegen'
+
+
+module WSDL
+module SOAP
+
+
+class ServantSkeltonCreator
+  include ClassDefCreatorSupport
+  include XSD::CodeGen::GenSupport
+
+  attr_reader :definitions
+
+  def initialize(definitions)
+    @definitions = definitions
+  end
+
+  def dump(porttype = nil)
+    if porttype.nil?
+      result = ""
+      @definitions.porttypes.each do |type|
+	result << dump_porttype(type.name)
+	result << "\n"
+      end
+    else
+      result = dump_porttype(porttype)
+    end
+    result
+  end
+
+private
+
+  def dump_porttype(name)
+    class_name = create_class_name(name)
+    c = XSD::CodeGen::ClassDef.new(class_name)
+    operations = @definitions.porttype(name).operations
+    operations.each do |operation|
+      name = safemethodname(operation.name.name)
+      input = operation.input
+      params = input.find_message.parts.collect { |part|
+        safevarname(part.name)
+      }
+      m = XSD::CodeGen::MethodDef.new(name, params) do <<-EOD
+            p [#{params.join(", ")}]
+            raise NotImplementedError.new
+          EOD
+        end
+      m.comment = dump_method_signature(operation)
+      c.add_method(m)
+    end
+    c.dump
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/standaloneServerStubCreator.rb b/ruby_1_8_6/lib/wsdl/soap/standaloneServerStubCreator.rb
new file mode 100644
index 0000000000..0b751b5153
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/standaloneServerStubCreator.rb
@@ -0,0 +1,85 @@
+# WSDL4R - Creating standalone server stub code from WSDL.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/soap/mappingRegistryCreator'
+require 'wsdl/soap/methodDefCreator'
+require 'wsdl/soap/classDefCreatorSupport'
+
+
+module WSDL
+module SOAP
+
+
+class StandaloneServerStubCreator
+  include ClassDefCreatorSupport
+
+  attr_reader :definitions
+
+  def initialize(definitions)
+    @definitions = definitions
+  end
+
+  def dump(service_name)
+    warn("- Standalone stub can have only 1 port for now.  So creating stub for the first port and rests are ignored.")
+    warn("- Standalone server stub ignores port location defined in WSDL.  Location is http://localhost:10080/ by default.  Generated client from WSDL must be configured to point this endpoint manually.")
+    port = @definitions.service(service_name).ports[0]
+    dump_porttype(port.porttype.name)
+  end
+
+private
+
+  def dump_porttype(name)
+    class_name = create_class_name(name)
+    methoddef, types = MethodDefCreator.new(@definitions).dump(name)
+    mr_creator = MappingRegistryCreator.new(@definitions)
+
+    c1 = XSD::CodeGen::ClassDef.new(class_name)
+    c1.def_require("soap/rpc/standaloneServer")
+    c1.def_require("soap/mapping/registry")
+    c1.def_const("MappingRegistry", "::SOAP::Mapping::Registry.new")
+    c1.def_code(mr_creator.dump(types))
+    c1.def_code <<-EOD
+Methods = [
+#{methoddef.gsub(/^/, "  ")}
+]
+    EOD
+    c2 = XSD::CodeGen::ClassDef.new(class_name + "App",
+      "::SOAP::RPC::StandaloneServer")
+    c2.def_method("initialize", "*arg") do
+      <<-EOD
+        super(*arg)
+        servant = #{class_name}.new
+        #{class_name}::Methods.each do |definitions|
+          opt = definitions.last
+          if opt[:request_style] == :document
+            @router.add_document_operation(servant, *definitions)
+          else
+            @router.add_rpc_operation(servant, *definitions)
+          end
+        end
+        self.mapping_registry = #{class_name}::MappingRegistry
+      EOD
+    end
+    c1.dump + "\n" + c2.dump + format(<<-EOD)
+
+      if $0 == __FILE__
+        # Change listen port.
+        server = #{class_name}App.new('app', nil, '0.0.0.0', 10080)
+        trap(:INT) do
+          server.shutdown
+        end
+        server.start
+      end
+    EOD
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/soap/wsdl2ruby.rb b/ruby_1_8_6/lib/wsdl/soap/wsdl2ruby.rb
new file mode 100644
index 0000000000..16b05fb032
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/soap/wsdl2ruby.rb
@@ -0,0 +1,176 @@
+# WSDL4R - WSDL to ruby mapping library.
+# Copyright (C) 2002-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'logger'
+require 'xsd/qname'
+require 'wsdl/importer'
+require 'wsdl/soap/classDefCreator'
+require 'wsdl/soap/servantSkeltonCreator'
+require 'wsdl/soap/driverCreator'
+require 'wsdl/soap/clientSkeltonCreator'
+require 'wsdl/soap/standaloneServerStubCreator'
+require 'wsdl/soap/cgiStubCreator'
+
+
+module WSDL
+module SOAP
+
+
+class WSDL2Ruby
+  attr_accessor :location
+  attr_reader :opt
+  attr_accessor :logger
+  attr_accessor :basedir
+
+  def run
+    unless @location
+      raise RuntimeError, "WSDL location not given"
+    end
+    @wsdl = import(@location)
+    @name = @wsdl.name ? @wsdl.name.name : 'default'
+    create_file
+  end
+
+private
+
+  def initialize
+    @location = nil
+    @opt = {}
+    @logger = Logger.new(STDERR)
+    @basedir = nil
+    @wsdl = nil
+    @name = nil
+  end
+
+  def create_file
+    create_classdef if @opt.key?('classdef')
+    create_servant_skelton(@opt['servant_skelton']) if @opt.key?('servant_skelton')
+    create_cgi_stub(@opt['cgi_stub']) if @opt.key?('cgi_stub')
+    create_standalone_server_stub(@opt['standalone_server_stub']) if @opt.key?('standalone_server_stub')
+    create_driver(@opt['driver']) if @opt.key?('driver')
+    create_client_skelton(@opt['client_skelton']) if @opt.key?('client_skelton')
+  end
+
+  def create_classdef
+    @logger.info { "Creating class definition." }
+    @classdef_filename = @name + '.rb'
+    check_file(@classdef_filename) or return
+    write_file(@classdef_filename) do |f|
+      f << WSDL::SOAP::ClassDefCreator.new(@wsdl).dump
+    end
+  end
+
+  def create_client_skelton(servicename)
+    @logger.info { "Creating client skelton." }
+    servicename ||= @wsdl.services[0].name.name
+    @client_skelton_filename = servicename + 'Client.rb'
+    check_file(@client_skelton_filename) or return
+    write_file(@client_skelton_filename) do |f|
+      f << shbang << "\n"
+      f << "require '#{@driver_filename}'\n\n" if @driver_filename
+      f << WSDL::SOAP::ClientSkeltonCreator.new(@wsdl).dump(
+	create_name(servicename))
+    end
+  end
+
+  def create_servant_skelton(porttypename)
+    @logger.info { "Creating servant skelton." }
+    @servant_skelton_filename = (porttypename || @name + 'Servant') + '.rb'
+    check_file(@servant_skelton_filename) or return
+    write_file(@servant_skelton_filename) do |f|
+      f << "require '#{@classdef_filename}'\n\n" if @classdef_filename
+      f << WSDL::SOAP::ServantSkeltonCreator.new(@wsdl).dump(
+	create_name(porttypename))
+    end
+  end
+
+  def create_cgi_stub(servicename)
+    @logger.info { "Creating CGI stub." }
+    servicename ||= @wsdl.services[0].name.name
+    @cgi_stubFilename = servicename + '.cgi'
+    check_file(@cgi_stubFilename) or return
+    write_file(@cgi_stubFilename) do |f|
+      f << shbang << "\n"
+      if @servant_skelton_filename
+	f << "require '#{@servant_skelton_filename}'\n\n"
+      end
+      f << WSDL::SOAP::CGIStubCreator.new(@wsdl).dump(create_name(servicename))
+    end
+  end
+
+  def create_standalone_server_stub(servicename)
+    @logger.info { "Creating standalone stub." }
+    servicename ||= @wsdl.services[0].name.name
+    @standalone_server_stub_filename = servicename + '.rb'
+    check_file(@standalone_server_stub_filename) or return
+    write_file(@standalone_server_stub_filename) do |f|
+      f << shbang << "\n"
+      f << "require '#{@servant_skelton_filename}'\n\n" if @servant_skelton_filename
+      f << WSDL::SOAP::StandaloneServerStubCreator.new(@wsdl).dump(
+	create_name(servicename))
+    end
+  end
+
+  def create_driver(porttypename)
+    @logger.info { "Creating driver." }
+    @driver_filename = (porttypename || @name) + 'Driver.rb'
+    check_file(@driver_filename) or return
+    write_file(@driver_filename) do |f|
+      f << "require '#{@classdef_filename}'\n\n" if @classdef_filename
+      f << WSDL::SOAP::DriverCreator.new(@wsdl).dump(
+	create_name(porttypename))
+    end
+  end
+
+  def write_file(filename)
+    if @basedir
+      filename = File.join(basedir, filename)
+    end
+    File.open(filename, "w") do |f|
+      yield f
+    end
+  end
+
+  def check_file(filename)
+    if @basedir
+      filename = File.join(basedir, filename)
+    end
+    if FileTest.exist?(filename)
+      if @opt.key?('force')
+	@logger.warn {
+	  "File '#{filename}' exists but overrides it."
+	}
+	true
+      else
+	@logger.warn {
+	  "File '#{filename}' exists.  #{$0} did not override it."
+	}
+	false
+      end
+    else
+      @logger.info { "Creates file '#{filename}'." }
+      true
+    end
+  end
+
+  def shbang
+    "#!/usr/bin/env ruby"
+  end
+
+  def create_name(name)
+    name ? XSD::QName.new(@wsdl.targetnamespace, name) : nil
+  end
+
+  def import(location)
+    WSDL::Importer.import(location)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/types.rb b/ruby_1_8_6/lib/wsdl/types.rb
new file mode 100644
index 0000000000..96ae5a4988
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/types.rb
@@ -0,0 +1,43 @@
+# WSDL4R - WSDL types definition.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+
+
+class Types < Info
+  attr_reader :schemas
+
+  def initialize
+    super
+    @schemas = []
+  end
+
+  def parse_element(element)
+    case element
+    when SchemaName
+      o = XMLSchema::Schema.new
+      @schemas << o
+      o
+    when DocumentationName
+      o = Documentation.new
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    nil
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/wsdl.rb b/ruby_1_8_6/lib/wsdl/wsdl.rb
new file mode 100644
index 0000000000..eb13c18806
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/wsdl.rb
@@ -0,0 +1,23 @@
+# WSDL4R - Base definitions.
+# Copyright (C) 2000, 2001, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+
+
+module WSDL
+
+
+Version = '0.0.2'
+
+Namespace = 'http://schemas.xmlsoap.org/wsdl/'
+SOAPBindingNamespace ='http://schemas.xmlsoap.org/wsdl/soap/'
+
+class Error < StandardError; end
+
+
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/all.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/all.rb
new file mode 100644
index 0000000000..bb9566feac
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/all.rb
@@ -0,0 +1,69 @@
+# WSDL4R - XMLSchema complexType definition for WSDL.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class All < Info
+  attr_reader :minoccurs
+  attr_reader :maxoccurs
+  attr_reader :elements
+
+  def initialize
+    super()
+    @minoccurs = '1'
+    @maxoccurs = '1'
+    @elements = []
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def elementformdefault
+    parent.elementformdefault
+  end
+
+  def <<(element)
+    @elements << element
+  end
+
+  def parse_element(element)
+    case element
+    when AnyName
+      o = Any.new
+      @elements << o
+      o
+    when ElementName
+      o = Element.new
+      @elements << o
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when MaxOccursAttrName
+      @maxoccurs = value.source
+    when MinOccursAttrName
+      @minoccurs = value.source
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/annotation.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/annotation.rb
new file mode 100644
index 0000000000..633bd196f1
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/annotation.rb
@@ -0,0 +1,34 @@
+# WSDL4R - WSDL SOAP documentation element.
+# Copyright (C) 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class Annotation < Info
+  def initialize
+    super
+  end
+
+  def parse_element(element)
+    # Accepts any element.
+    self
+  end
+
+  def parse_attr(attr, value)
+    # Accepts any attribute.
+    true
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/any.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/any.rb
new file mode 100644
index 0000000000..72d25e8dde
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/any.rb
@@ -0,0 +1,56 @@
+# WSDL4R - XMLSchema any definition for WSDL.
+# Copyright (C) 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class Any < Info
+  attr_accessor :maxoccurs
+  attr_accessor :minoccurs
+  attr_accessor :namespace
+  attr_accessor :process_contents
+
+  def initialize
+    super()
+    @maxoccurs = '1'
+    @minoccurs = '1'
+    @namespace = '##any'
+    @process_contents = 'strict'
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when MaxOccursAttrName
+      @maxoccurs = value.source
+    when MinOccursAttrName
+      @minoccurs = value.source
+    when NamespaceAttrName
+      @namespace = value.source
+    when ProcessContentsAttrName
+      @process_contents = value.source
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/attribute.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/attribute.rb
new file mode 100644
index 0000000000..f9048661a2
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/attribute.rb
@@ -0,0 +1,127 @@
+# WSDL4R - XMLSchema attribute definition for WSDL.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class Attribute < Info
+  class << self
+    if RUBY_VERSION > "1.7.0"
+      def attr_reader_ref(symbol)
+        name = symbol.to_s
+        define_method(name) {
+          instance_variable_get("@#{name}") ||
+            (refelement ? refelement.__send__(name) : nil)
+        }
+      end
+    else
+      def attr_reader_ref(symbol)
+        name = symbol.to_s
+        module_eval <<-EOS
+          def #{name}
+            @#{name} || (refelement ? refelement.#{name} : nil)
+          end
+        EOS
+      end
+    end
+  end
+
+  attr_writer :use
+  attr_writer :form
+  attr_writer :name
+  attr_writer :type
+  attr_writer :local_simpletype
+  attr_writer :default
+  attr_writer :fixed
+
+  attr_reader_ref :use
+  attr_reader_ref :form
+  attr_reader_ref :name
+  attr_reader_ref :type
+  attr_reader_ref :local_simpletype
+  attr_reader_ref :default
+  attr_reader_ref :fixed
+
+  attr_accessor :ref
+  attr_accessor :arytype
+
+  def initialize
+    super
+    @use = nil
+    @form = nil
+    @name = nil
+    @type = nil
+    @local_simpletype = nil
+    @default = nil
+    @fixed = nil
+    @ref = nil
+    @refelement = nil
+    @arytype = nil
+  end
+
+  def refelement
+    @refelement ||= root.collect_attributes[@ref]
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def parse_element(element)
+    case element
+    when SimpleTypeName
+      @local_simpletype = SimpleType.new
+      @local_simpletype
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when RefAttrName
+      @ref = value
+    when UseAttrName
+      @use = value.source
+    when FormAttrName
+      @form = value.source
+    when NameAttrName
+      if directelement?
+        @name = XSD::QName.new(targetnamespace, value.source)
+      else
+        @name = XSD::QName.new(nil, value.source)
+      end
+    when TypeAttrName
+      @type = value
+    when DefaultAttrName
+      @default = value.source
+    when FixedAttrName
+      @fixed = value.source
+    when ArrayTypeAttrName
+      @arytype = if value.namespace.nil?
+          XSD::QName.new(XSD::Namespace, value.source)
+        else
+          value
+        end
+    else
+      nil
+    end
+  end
+
+private
+
+  def directelement?
+    parent.is_a?(Schema)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/choice.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/choice.rb
new file mode 100644
index 0000000000..f6d27fa38c
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/choice.rb
@@ -0,0 +1,69 @@
+# WSDL4R - XMLSchema complexType definition for WSDL.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class Choice < Info
+  attr_reader :minoccurs
+  attr_reader :maxoccurs
+  attr_reader :elements
+
+  def initialize
+    super()
+    @minoccurs = '1'
+    @maxoccurs = '1'
+    @elements = []
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def elementformdefault
+    parent.elementformdefault
+  end
+
+  def <<(element)
+    @elements << element
+  end
+
+  def parse_element(element)
+    case element
+    when AnyName
+      o = Any.new
+      @elements << o
+      o
+    when ElementName
+      o = Element.new
+      @elements << o
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when MaxOccursAttrName
+      @maxoccurs = value.source
+    when MinOccursAttrName
+      @minoccurs = value.source
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/complexContent.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/complexContent.rb
new file mode 100644
index 0000000000..f7fb6c16b4
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/complexContent.rb
@@ -0,0 +1,92 @@
+# WSDL4R - XMLSchema complexContent definition for WSDL.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+module XMLSchema
+
+
+class ComplexContent < Info
+  attr_accessor :base
+  attr_reader :derivetype
+  attr_reader :content
+  attr_reader :attributes
+
+  def initialize
+    super
+    @base = nil
+    @derivetype = nil
+    @content = nil
+    @attributes = XSD::NamedElements.new
+    @basetype = nil
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def elementformdefault
+    parent.elementformdefault
+  end
+
+  def basetype
+    @basetype ||= root.collect_complextypes[@base]
+  end
+
+  def parse_element(element)
+    case element
+    when RestrictionName, ExtensionName
+      @derivetype = element.name
+      self
+    when AllName
+      if @derivetype.nil?
+	raise Parser::ElementConstraintError.new("base attr not found.")
+      end
+      @content = All.new
+      @content
+    when SequenceName
+      if @derivetype.nil?
+	raise Parser::ElementConstraintError.new("base attr not found.")
+      end
+      @content = Sequence.new
+      @content
+    when ChoiceName
+      if @derivetype.nil?
+	raise Parser::ElementConstraintError.new("base attr not found.")
+      end
+      @content = Choice.new
+      @content
+    when AttributeName
+      if @derivetype.nil?
+	raise Parser::ElementConstraintError.new("base attr not found.")
+      end
+      o = Attribute.new
+      @attributes << o
+      o
+    end
+  end
+
+  def parse_attr(attr, value)
+    if @derivetype.nil?
+      return nil
+    end
+    case attr
+    when BaseAttrName
+      @base = value
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/complexType.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/complexType.rb
new file mode 100644
index 0000000000..dc9ec954fc
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/complexType.rb
@@ -0,0 +1,139 @@
+# WSDL4R - XMLSchema complexType definition for WSDL.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/xmlSchema/content'
+require 'wsdl/xmlSchema/element'
+require 'xsd/namedelements'
+
+
+module WSDL
+module XMLSchema
+
+
+class ComplexType < Info
+  attr_accessor :name
+  attr_accessor :complexcontent
+  attr_accessor :simplecontent
+  attr_reader :content
+  attr_accessor :final
+  attr_accessor :mixed
+  attr_reader :attributes
+
+  def initialize(name = nil)
+    super()
+    @name = name
+    @complexcontent = nil
+    @simplecontent = nil
+    @content = nil
+    @final = nil
+    @mixed = false
+    @attributes = XSD::NamedElements.new
+  end
+
+  def targetnamespace
+    # inner elements can be qualified
+    # parent.is_a?(WSDL::XMLSchema::Element) ? nil : parent.targetnamespace
+    parent.targetnamespace
+  end
+
+  def elementformdefault
+    parent.elementformdefault
+  end
+ 
+  AnyAsElement = Element.new(XSD::QName.new(nil, 'any'), XSD::AnyTypeName)
+  def each_element
+    if content
+      content.elements.each do |element|
+        if element.is_a?(Any)
+          yield(AnyAsElement)
+        else
+          yield(element)
+        end
+      end
+    end
+  end
+
+  def find_element(name)
+    if content
+      content.elements.each do |element|
+        if element.is_a?(Any)
+          return AnyAsElement if name == AnyAsElement.name
+        else
+          return element if name == element.name
+        end
+      end
+    end
+    nil
+  end
+
+  def find_element_by_name(name)
+    if content
+      content.elements.each do |element|
+        if element.is_a?(Any)
+          return AnyAsElement if name == AnyAsElement.name.name
+        else
+          return element if name == element.name.name
+        end
+      end
+    end
+    nil
+  end
+
+  def sequence_elements=(elements)
+    @content = Sequence.new
+    elements.each do |element|
+      @content << element
+    end
+  end
+
+  def all_elements=(elements)
+    @content = All.new
+    elements.each do |element|
+      @content << element
+    end
+  end
+
+  def parse_element(element)
+    case element
+    when AllName
+      @content = All.new
+    when SequenceName
+      @content = Sequence.new
+    when ChoiceName
+      @content = Choice.new
+    when ComplexContentName
+      @complexcontent = ComplexContent.new
+    when SimpleContentName
+      @simplecontent = SimpleContent.new
+    when AttributeName
+      o = Attribute.new
+      @attributes << o
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when FinalAttrName
+      @final = value.source
+    when MixedAttrName
+      @mixed = (value.source == 'true')
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/content.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/content.rb
new file mode 100644
index 0000000000..2f1dfb4b6c
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/content.rb
@@ -0,0 +1,96 @@
+# WSDL4R - XMLSchema complexType definition for WSDL.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class Content < Info
+  attr_accessor :final
+  attr_accessor :mixed
+  attr_accessor :type
+  attr_reader :contents
+  attr_reader :elements
+
+  def initialize
+    super()
+    @final = nil
+    @mixed = false
+    @type = nil
+    @contents = []
+    @elements = []
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def <<(content)
+    @contents << content
+    update_elements
+  end
+
+  def each
+    @contents.each do |content|
+      yield content
+    end
+  end
+
+  def parse_element(element)
+    case element
+    when AllName, SequenceName, ChoiceName
+      o = Content.new
+      o.type = element.name
+      @contents << o
+      o
+    when AnyName
+      o = Any.new
+      @contents << o
+      o
+    when ElementName
+      o = Element.new
+      @contents << o
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when FinalAttrName
+      @final = value.source
+    when MixedAttrName
+      @mixed = (value.source == 'true')
+    else
+      nil
+    end
+  end
+
+  def parse_epilogue
+    update_elements
+  end
+
+private
+
+  def update_elements
+    @elements = []
+    @contents.each do |content|
+      if content.is_a?(Element)
+	@elements << [content.name, content]
+      end
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/data.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/data.rb
new file mode 100644
index 0000000000..23ab1adf0b
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/data.rb
@@ -0,0 +1,80 @@
+# WSDL4R - XMLSchema data definitions.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/datatypes'
+require 'wsdl/xmlSchema/annotation'
+require 'wsdl/xmlSchema/schema'
+require 'wsdl/xmlSchema/import'
+require 'wsdl/xmlSchema/include'
+require 'wsdl/xmlSchema/simpleType'
+require 'wsdl/xmlSchema/simpleRestriction'
+require 'wsdl/xmlSchema/simpleExtension'
+require 'wsdl/xmlSchema/complexType'
+require 'wsdl/xmlSchema/complexContent'
+require 'wsdl/xmlSchema/simpleContent'
+require 'wsdl/xmlSchema/any'
+require 'wsdl/xmlSchema/element'
+require 'wsdl/xmlSchema/all'
+require 'wsdl/xmlSchema/choice'
+require 'wsdl/xmlSchema/sequence'
+require 'wsdl/xmlSchema/attribute'
+require 'wsdl/xmlSchema/unique'
+require 'wsdl/xmlSchema/enumeration'
+require 'wsdl/xmlSchema/length'
+require 'wsdl/xmlSchema/pattern'
+
+module WSDL
+module XMLSchema
+
+
+AllName = XSD::QName.new(XSD::Namespace, 'all')
+AnnotationName = XSD::QName.new(XSD::Namespace, 'annotation')
+AnyName = XSD::QName.new(XSD::Namespace, 'any')
+AttributeName = XSD::QName.new(XSD::Namespace, 'attribute')
+ChoiceName = XSD::QName.new(XSD::Namespace, 'choice')
+ComplexContentName = XSD::QName.new(XSD::Namespace, 'complexContent')
+ComplexTypeName = XSD::QName.new(XSD::Namespace, 'complexType')
+ElementName = XSD::QName.new(XSD::Namespace, 'element')
+EnumerationName = XSD::QName.new(XSD::Namespace, 'enumeration')
+ExtensionName = XSD::QName.new(XSD::Namespace, 'extension')
+ImportName = XSD::QName.new(XSD::Namespace, 'import')
+IncludeName = XSD::QName.new(XSD::Namespace, 'include')
+LengthName = XSD::QName.new(XSD::Namespace, 'length')
+PatternName = XSD::QName.new(XSD::Namespace, 'pattern')
+RestrictionName = XSD::QName.new(XSD::Namespace, 'restriction')
+SequenceName = XSD::QName.new(XSD::Namespace, 'sequence')
+SchemaName = XSD::QName.new(XSD::Namespace, 'schema')
+SimpleContentName = XSD::QName.new(XSD::Namespace, 'simpleContent')
+SimpleTypeName = XSD::QName.new(XSD::Namespace, 'simpleType')
+UniqueName = XSD::QName.new(XSD::Namespace, 'unique')
+
+AttributeFormDefaultAttrName = XSD::QName.new(nil, 'attributeFormDefault')
+BaseAttrName = XSD::QName.new(nil, 'base')
+DefaultAttrName = XSD::QName.new(nil, 'default')
+ElementFormDefaultAttrName = XSD::QName.new(nil, 'elementFormDefault')
+FinalAttrName = XSD::QName.new(nil, 'final')
+FixedAttrName = XSD::QName.new(nil, 'fixed')
+FormAttrName = XSD::QName.new(nil, 'form')
+IdAttrName = XSD::QName.new(nil, 'id')
+MaxOccursAttrName = XSD::QName.new(nil, 'maxOccurs')
+MinOccursAttrName = XSD::QName.new(nil, 'minOccurs')
+MixedAttrName = XSD::QName.new(nil, 'mixed')
+NameAttrName = XSD::QName.new(nil, 'name')
+NamespaceAttrName = XSD::QName.new(nil, 'namespace')
+NillableAttrName = XSD::QName.new(nil, 'nillable')
+ProcessContentsAttrName = XSD::QName.new(nil, 'processContents')
+RefAttrName = XSD::QName.new(nil, 'ref')
+SchemaLocationAttrName = XSD::QName.new(nil, 'schemaLocation')
+TargetNamespaceAttrName = XSD::QName.new(nil, 'targetNamespace')
+TypeAttrName = XSD::QName.new(nil, 'type')
+UseAttrName = XSD::QName.new(nil, 'use')
+ValueAttrName = XSD::QName.new(nil, 'value')
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/element.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/element.rb
new file mode 100644
index 0000000000..fffb6485d0
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/element.rb
@@ -0,0 +1,154 @@
+# WSDL4R - XMLSchema element definition for WSDL.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class Element < Info
+  class << self
+    if RUBY_VERSION > "1.7.0"
+      def attr_reader_ref(symbol)
+        name = symbol.to_s
+        define_method(name) {
+          instance_variable_get("@#{name}") ||
+            (refelement ? refelement.__send__(name) : nil)
+        }
+      end
+    else
+      def attr_reader_ref(symbol)
+        name = symbol.to_s
+        module_eval <<-EOS
+          def #{name}
+            @#{name} || (refelement ? refelement.#{name} : nil)
+          end
+        EOS
+      end
+    end
+  end
+
+  attr_writer :name	# required
+  attr_writer :form
+  attr_writer :type
+  attr_writer :local_simpletype
+  attr_writer :local_complextype
+  attr_writer :constraint
+  attr_writer :maxoccurs
+  attr_writer :minoccurs
+  attr_writer :nillable
+
+  attr_reader_ref :name
+  attr_reader_ref :form
+  attr_reader_ref :type
+  attr_reader_ref :local_simpletype
+  attr_reader_ref :local_complextype
+  attr_reader_ref :constraint
+  attr_reader_ref :maxoccurs
+  attr_reader_ref :minoccurs
+  attr_reader_ref :nillable
+
+  attr_accessor :ref
+
+  def initialize(name = nil, type = nil)
+    super()
+    @name = name
+    @form = nil
+    @type = type
+    @local_simpletype = @local_complextype = nil
+    @constraint = nil
+    @maxoccurs = '1'
+    @minoccurs = '1'
+    @nillable = nil
+    @ref = nil
+    @refelement = nil
+  end
+
+  def refelement
+    @refelement ||= (@ref ? root.collect_elements[@ref] : nil)
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def elementformdefault
+    parent.elementformdefault
+  end
+
+  def elementform
+    self.form.nil? ? parent.elementformdefault : self.form
+  end
+
+  def parse_element(element)
+    case element
+    when SimpleTypeName
+      @local_simpletype = SimpleType.new
+      @local_simpletype
+    when ComplexTypeName
+      @type = nil
+      @local_complextype = ComplexType.new
+      @local_complextype
+    when UniqueName
+      @constraint = Unique.new
+      @constraint
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      # namespace may be nil
+      if directelement? or elementform == 'qualified'
+        @name = XSD::QName.new(targetnamespace, value.source)
+      else
+        @name = XSD::QName.new(nil, value.source)
+      end
+    when FormAttrName
+      @form = value.source
+    when TypeAttrName
+      @type = value
+    when RefAttrName
+      @ref = value
+    when MaxOccursAttrName
+      if parent.is_a?(All)
+	if value.source != '1'
+	  raise Parser::AttrConstraintError.new(
+            "cannot parse #{value} for #{attr}")
+	end
+      end
+      @maxoccurs = value.source
+    when MinOccursAttrName
+      if parent.is_a?(All)
+	unless ['0', '1'].include?(value.source)
+	  raise Parser::AttrConstraintError.new(
+            "cannot parse #{value} for #{attr}")
+	end
+      end
+      @minoccurs = value.source
+    when NillableAttrName
+      @nillable = (value.source == 'true')
+    else
+      nil
+    end
+  end
+
+private
+
+  def directelement?
+    parent.is_a?(Schema)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/enumeration.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/enumeration.rb
new file mode 100644
index 0000000000..5a16476032
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/enumeration.rb
@@ -0,0 +1,36 @@
+# WSDL4R - XMLSchema enumeration definition for WSDL.
+# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class Enumeration < Info
+  def initialize
+    super
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when ValueAttrName
+      parent.enumeration << value.source
+      value.source
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/import.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/import.rb
new file mode 100644
index 0000000000..d3487af934
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/import.rb
@@ -0,0 +1,65 @@
+# WSDL4R - XMLSchema import definition.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/xmlSchema/importer'
+
+
+module WSDL
+module XMLSchema
+
+
+class Import < Info
+  attr_reader :namespace
+  attr_reader :schemalocation
+  attr_reader :content
+
+  def initialize
+    super
+    @namespace = nil
+    @schemalocation = nil
+    @content = nil
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NamespaceAttrName
+      @namespace = value.source
+    when SchemaLocationAttrName
+      @schemalocation = URI.parse(value.source)
+      if @schemalocation.relative? and !parent.location.nil? and
+          !parent.location.relative?
+        @schemalocation = parent.location + @schemalocation
+      end
+      if root.importedschema.key?(@schemalocation)
+        @content = root.importedschema[@schemalocation]
+      else
+        root.importedschema[@schemalocation] = nil      # placeholder
+        @content = import(@schemalocation)
+        root.importedschema[@schemalocation] = @content
+      end
+      @schemalocation
+    else
+      nil
+    end
+  end
+
+private
+
+  def import(location)
+    Importer.import(location, root)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/importer.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/importer.rb
new file mode 100644
index 0000000000..f57bfd972a
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/importer.rb
@@ -0,0 +1,87 @@
+# WSDL4R - XSD importer library.
+# Copyright (C) 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'soap/httpconfigloader'
+require 'wsdl/xmlSchema/parser'
+
+
+module WSDL
+module XMLSchema
+
+
+class Importer
+  def self.import(location, originalroot = nil)
+    new.import(location, originalroot)
+  end
+
+  def initialize
+    @web_client = nil
+  end
+
+  def import(location, originalroot = nil)
+    unless location.is_a?(URI)
+      location = URI.parse(location)
+    end
+    content = parse(fetch(location), location, originalroot)
+    content.location = location
+    content
+  end
+
+private
+
+  def parse(content, location, originalroot)
+    opt = {
+      :location => location,
+      :originalroot => originalroot
+    }
+    WSDL::XMLSchema::Parser.new(opt).parse(content)
+  end
+
+  def fetch(location)
+    warn("importing: #{location}") if $DEBUG
+    content = nil
+    if location.scheme == 'file' or
+        (location.relative? and FileTest.exist?(location.path))
+      content = File.open(location.path).read
+    elsif location.scheme and location.scheme.size == 1 and
+        FileTest.exist?(location.to_s)
+      # ToDo: remove this ugly workaround for a path with drive letter
+      # (D://foo/bar)
+      content = File.open(location.to_s).read
+    else
+      client = web_client.new(nil, "WSDL4R")
+      client.proxy = ::SOAP::Env::HTTP_PROXY
+      client.no_proxy = ::SOAP::Env::NO_PROXY
+      if opt = ::SOAP::Property.loadproperty(::SOAP::PropertyName)
+        ::SOAP::HTTPConfigLoader.set_options(client,
+          opt["client.protocol.http"])
+      end
+      content = client.get_content(location)
+    end
+    content
+  end
+
+  def web_client
+    @web_client ||= begin
+	require 'http-access2'
+	if HTTPAccess2::VERSION < "2.0"
+	  raise LoadError.new("http-access/2.0 or later is required.")
+	end
+	HTTPAccess2::Client
+      rescue LoadError
+	warn("Loading http-access2 failed.  Net/http is used.") if $DEBUG
+	require 'soap/netHttpClient'
+	::SOAP::NetHttpClient
+      end
+    @web_client
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/include.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/include.rb
new file mode 100644
index 0000000000..af1ef942bb
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/include.rb
@@ -0,0 +1,54 @@
+# WSDL4R - XMLSchema include definition.
+# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'wsdl/xmlSchema/importer'
+
+
+module WSDL
+module XMLSchema
+
+
+class Include < Info
+  attr_reader :schemalocation
+  attr_reader :content
+
+  def initialize
+    super
+    @schemalocation = nil
+    @content = nil
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when SchemaLocationAttrName
+      @schemalocation = URI.parse(value.source)
+      if @schemalocation.relative?
+        @schemalocation = parent.location + @schemalocation
+      end
+      @content = import(@schemalocation)
+      @schemalocation
+    else
+      nil
+    end
+  end
+
+private
+
+  def import(location)
+    Importer.import(location)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/length.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/length.rb
new file mode 100644
index 0000000000..7f61602da9
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/length.rb
@@ -0,0 +1,35 @@
+# WSDL4R - XMLSchema length definition for WSDL.
+# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class Length < Info
+  def initialize
+    super
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when ValueAttrName
+      value.source
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/parser.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/parser.rb
new file mode 100644
index 0000000000..057d9d9b70
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/parser.rb
@@ -0,0 +1,166 @@
+# WSDL4R - WSDL XML Instance parser library.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'xsd/ns'
+require 'xsd/charset'
+require 'xsd/datatypes'
+require 'xsd/xmlparser'
+require 'wsdl/xmlSchema/data'
+
+
+module WSDL
+module XMLSchema
+
+
+class Parser
+  include XSD
+
+  class ParseError < Error; end
+  class FormatDecodeError < ParseError; end
+  class UnknownElementError < FormatDecodeError; end
+  class UnknownAttributeError < FormatDecodeError; end
+  class UnexpectedElementError < FormatDecodeError; end
+  class ElementConstraintError < FormatDecodeError; end
+  class AttributeConstraintError < FormatDecodeError; end
+
+private
+
+  class ParseFrame
+    attr_reader :ns
+    attr_reader :name
+    attr_accessor :node
+
+  private
+
+    def initialize(ns, name, node)
+      @ns = ns
+      @name = name
+      @node = node
+    end
+  end
+
+public
+
+  def initialize(opt = {})
+    @parser = XSD::XMLParser.create_parser(self, opt)
+    @parsestack = nil
+    @lastnode = nil
+    @ignored = {}
+    @location = opt[:location]
+    @originalroot = opt[:originalroot]
+  end
+
+  def parse(string_or_readable)
+    @parsestack = []
+    @lastnode = nil
+    @textbuf = ''
+    @parser.do_parse(string_or_readable)
+    @lastnode
+  end
+
+  def charset
+    @parser.charset
+  end
+
+  def start_element(name, attrs)
+    lastframe = @parsestack.last
+    ns = parent = nil
+    if lastframe
+      ns = lastframe.ns.clone_ns
+      parent = lastframe.node
+    else
+      ns = XSD::NS.new
+      parent = nil
+    end
+    attrs = XSD::XMLParser.filter_ns(ns, attrs)
+    node = decode_tag(ns, name, attrs, parent)
+    @parsestack << ParseFrame.new(ns, name, node)
+  end
+
+  def characters(text)
+    lastframe = @parsestack.last
+    if lastframe
+      # Need not to be cloned because character does not have attr.
+      ns = lastframe.ns
+      decode_text(ns, text)
+    else
+      p text if $DEBUG
+    end
+  end
+
+  def end_element(name)
+    lastframe = @parsestack.pop
+    unless name == lastframe.name
+      raise UnexpectedElementError.new("closing element name '#{name}' does not match with opening element '#{lastframe.name}'")
+    end
+    decode_tag_end(lastframe.ns, lastframe.node)
+    @lastnode = lastframe.node
+  end
+
+private
+
+  def decode_tag(ns, name, attrs, parent)
+    o = nil
+    elename = ns.parse(name)
+    if !parent
+      if elename == SchemaName
+	o = Schema.parse_element(elename)
+        o.location = @location
+      else
+	raise UnknownElementError.new("unknown element: #{elename}")
+      end
+      o.root = @originalroot if @originalroot   # o.root = o otherwise
+    else
+      if elename == AnnotationName
+        # only the first annotation element is allowed for each element.
+        o = Annotation.new
+      else
+        o = parent.parse_element(elename)
+      end
+      unless o
+        unless @ignored.key?(elename)
+          warn("ignored element: #{elename} of #{parent.class}")
+          @ignored[elename] = elename
+        end
+	o = Documentation.new	# which accepts any element.
+      end
+      # node could be a pseudo element.  pseudo element has its own parent.
+      o.root = parent.root
+      o.parent = parent if o.parent.nil?
+    end
+    attrs.each do |key, value|
+      attr_ele = ns.parse(key, true)
+      value_ele = ns.parse(value, true)
+      value_ele.source = value  # for recovery; value may not be a QName
+      if attr_ele == IdAttrName
+	o.id = value_ele
+      else
+        unless o.parse_attr(attr_ele, value_ele)
+          unless @ignored.key?(attr_ele)
+            warn("ignored attr: #{attr_ele}")
+            @ignored[attr_ele] = attr_ele
+          end
+        end
+      end
+    end
+    o
+  end
+
+  def decode_tag_end(ns, node)
+    node.parse_epilogue
+  end
+
+  def decode_text(ns, text)
+    @textbuf << text
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/pattern.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/pattern.rb
new file mode 100644
index 0000000000..f826be4578
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/pattern.rb
@@ -0,0 +1,36 @@
+# WSDL4R - XMLSchema pattern definition for WSDL.
+# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class Pattern < Info
+  def initialize
+    super
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when ValueAttrName
+      parent.pattern = /\A#{value.source}\z/n
+      value.source
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/schema.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/schema.rb
new file mode 100644
index 0000000000..ec97d07aa5
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/schema.rb
@@ -0,0 +1,143 @@
+# WSDL4R - XMLSchema schema definition for WSDL.
+# Copyright (C) 2002, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+module XMLSchema
+
+
+class Schema < Info
+  attr_reader :targetnamespace	# required
+  attr_reader :complextypes
+  attr_reader :simpletypes
+  attr_reader :elements
+  attr_reader :attributes
+  attr_reader :imports
+  attr_accessor :attributeformdefault
+  attr_accessor :elementformdefault
+
+  attr_reader :importedschema
+
+  def initialize
+    super
+    @targetnamespace = nil
+    @complextypes = XSD::NamedElements.new
+    @simpletypes = XSD::NamedElements.new
+    @elements = XSD::NamedElements.new
+    @attributes = XSD::NamedElements.new
+    @imports = []
+    @attributeformdefault = "unqualified"
+    @elementformdefault = "unqualified"
+    @importedschema = {}
+    @location = nil
+    @root = self
+  end
+
+  def location
+    @location || (root.nil? ? nil : root.location)
+  end
+
+  def location=(location)
+    @location = location
+  end
+
+  def parse_element(element)
+    case element
+    when ImportName
+      o = Import.new
+      @imports << o
+      o
+    when IncludeName
+      o = Include.new
+      @imports << o
+      o
+    when ComplexTypeName
+      o = ComplexType.new
+      @complextypes << o
+      o
+    when SimpleTypeName
+      o = SimpleType.new
+      @simpletypes << o
+      o
+    when ElementName
+      o = Element.new
+      @elements << o
+      o
+    when AttributeName
+      o = Attribute.new
+      @attributes << o
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when TargetNamespaceAttrName
+      @targetnamespace = value.source
+    when AttributeFormDefaultAttrName
+      @attributeformdefault = value.source
+    when ElementFormDefaultAttrName
+      @elementformdefault = value.source
+    else
+      nil
+    end
+  end
+
+  def collect_attributes
+    result = XSD::NamedElements.new
+    result.concat(@attributes)
+    @imports.each do |import|
+      result.concat(import.content.collect_attributes) if import.content
+    end
+    result
+  end
+
+  def collect_elements
+    result = XSD::NamedElements.new
+    result.concat(@elements)
+    @imports.each do |import|
+      result.concat(import.content.collect_elements) if import.content
+    end
+    result
+  end
+
+  def collect_complextypes
+    result = XSD::NamedElements.new
+    result.concat(@complextypes)
+    @imports.each do |import|
+      result.concat(import.content.collect_complextypes) if import.content
+    end
+    result
+  end
+
+  def collect_simpletypes
+    result = XSD::NamedElements.new
+    result.concat(@simpletypes)
+    @imports.each do |import|
+      result.concat(import.content.collect_simpletypes) if import.content
+    end
+    result
+  end
+
+  def self.parse_element(element)
+    if element == SchemaName
+      Schema.new
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/sequence.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/sequence.rb
new file mode 100644
index 0000000000..823fa3b7f9
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/sequence.rb
@@ -0,0 +1,69 @@
+# WSDL4R - XMLSchema complexType definition for WSDL.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class Sequence < Info
+  attr_reader :minoccurs
+  attr_reader :maxoccurs
+  attr_reader :elements
+
+  def initialize
+    super()
+    @minoccurs = '1'
+    @maxoccurs = '1'
+    @elements = []
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def elementformdefault
+    parent.elementformdefault
+  end
+
+  def <<(element)
+    @elements << element
+  end
+
+  def parse_element(element)
+    case element
+    when AnyName
+      o = Any.new
+      @elements << o
+      o
+    when ElementName
+      o = Element.new
+      @elements << o
+      o
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when MaxOccursAttrName
+      @maxoccurs = value.source
+    when MinOccursAttrName
+      @minoccurs = value.source
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/simpleContent.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/simpleContent.rb
new file mode 100644
index 0000000000..e1f35c88b8
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/simpleContent.rb
@@ -0,0 +1,65 @@
+# WSDL4R - XMLSchema simpleContent definition for WSDL.
+# Copyright (C) 2004, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+module XMLSchema
+
+
+class SimpleContent < Info
+  attr_reader :restriction
+  attr_reader :extension
+
+  def check_lexical_format(value)
+    check(value)
+  end
+
+  def initialize
+    super
+    @restriction = nil
+    @extension = nil
+  end
+
+  def base
+    content.base
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def parse_element(element)
+    case element
+    when RestrictionName
+      @restriction = SimpleRestriction.new
+      @restriction
+    when ExtensionName
+      @extension = SimpleExtension.new
+      @extension
+    end
+  end
+
+private
+
+  def content
+    @restriction || @extension
+  end
+
+  def check(value)
+    unless content.valid?(value)
+      raise XSD::ValueSpaceError.new("#{@name}: cannot accept '#{value}'")
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/simpleExtension.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/simpleExtension.rb
new file mode 100644
index 0000000000..3c53a7328c
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/simpleExtension.rb
@@ -0,0 +1,54 @@
+# WSDL4R - XMLSchema simpleType extension definition for WSDL.
+# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+module XMLSchema
+
+
+class SimpleExtension < Info
+  attr_reader :base
+  attr_reader :attributes
+
+  def initialize
+    super
+    @base = nil
+    @attributes = XSD::NamedElements.new
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+  
+  def valid?(value)
+    true
+  end
+
+  def parse_element(element)
+    case element
+    when AttributeName
+      o = Attribute.new
+      @attributes << o
+      o
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when BaseAttrName
+      @base = value
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/simpleRestriction.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/simpleRestriction.rb
new file mode 100644
index 0000000000..e8bf3ebfa5
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/simpleRestriction.rb
@@ -0,0 +1,73 @@
+# WSDL4R - XMLSchema simpleContent restriction definition for WSDL.
+# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+module XMLSchema
+
+
+class SimpleRestriction < Info
+  attr_reader :base
+  attr_reader :enumeration
+  attr_accessor :length
+  attr_accessor :pattern
+
+  def initialize
+    super
+    @base = nil
+    @enumeration = []   # NamedElements?
+    @length = nil
+    @pattern = nil
+  end
+  
+  def valid?(value)
+    return false unless check_restriction(value)
+    return false unless check_length(value)
+    return false unless check_pattern(value)
+    true
+  end
+
+  def parse_element(element)
+    case element
+    when EnumerationName
+      Enumeration.new   # just a parsing handler
+    when LengthName
+      Length.new   # just a parsing handler
+    when PatternName
+      Pattern.new   # just a parsing handler
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when BaseAttrName
+      @base = value
+    end
+  end
+
+private
+
+  def check_restriction(value)
+    @enumeration.empty? or @enumeration.include?(value)
+  end
+
+  def check_length(value)
+    @length.nil? or value.size == @length
+  end
+
+  def check_pattern(value)
+    @pattern.nil? or @pattern =~ value
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/simpleType.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/simpleType.rb
new file mode 100644
index 0000000000..e808c318c4
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/simpleType.rb
@@ -0,0 +1,73 @@
+# WSDL4R - XMLSchema simpleType definition for WSDL.
+# Copyright (C) 2004, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+require 'xsd/namedelements'
+
+
+module WSDL
+module XMLSchema
+
+
+class SimpleType < Info
+  attr_accessor :name
+  attr_reader :restriction
+
+  def check_lexical_format(value)
+    if @restriction
+      check_restriction(value)
+    else
+      raise ArgumentError.new("incomplete simpleType")
+    end
+  end
+
+  def base
+    if @restriction
+      @restriction.base
+    else
+      raise ArgumentError.new("incomplete simpleType")
+    end
+  end
+
+  def initialize(name = nil)
+    super()
+    @name = name
+    @restriction = nil
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def parse_element(element)
+    case element
+    when RestrictionName
+      @restriction = SimpleRestriction.new
+      @restriction
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    end
+  end
+
+private
+
+  def check_restriction(value)
+    unless @restriction.valid?(value)
+      raise XSD::ValueSpaceError.new("#{@name}: cannot accept '#{value}'")
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/unique.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/unique.rb
new file mode 100644
index 0000000000..837ff22b4a
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/unique.rb
@@ -0,0 +1,34 @@
+# WSDL4R - XMLSchema unique element.
+# Copyright (C) 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class Unique < Info
+  def initialize
+    super
+  end
+
+  def parse_element(element)
+    # Accepts any element.
+    self
+  end
+
+  def parse_attr(attr, value)
+    # Accepts any attribute.
+    true
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/wsdl/xmlSchema/xsd2ruby.rb b/ruby_1_8_6/lib/wsdl/xmlSchema/xsd2ruby.rb
new file mode 100644
index 0000000000..afe5fc5ada
--- /dev/null
+++ b/ruby_1_8_6/lib/wsdl/xmlSchema/xsd2ruby.rb
@@ -0,0 +1,107 @@
+# XSD4R - XSD to ruby mapping library.
+# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/codegen/gensupport'
+require 'wsdl/xmlSchema/importer'
+require 'wsdl/soap/classDefCreator'
+
+
+module WSDL
+module XMLSchema
+
+
+class XSD2Ruby
+  attr_accessor :location
+  attr_reader :opt
+  attr_accessor :logger
+  attr_accessor :basedir
+
+  def run
+    unless @location
+      raise RuntimeError, "XML Schema location not given"
+    end
+    @xsd = import(@location)
+    @name = create_classname(@xsd)
+    create_file
+  end
+
+private
+
+  def initialize
+    @location = nil
+    @opt = {}
+    @logger = Logger.new(STDERR)
+    @basedir = nil
+    @xsd = nil
+    @name = nil
+  end
+
+  def create_file
+    create_classdef
+  end
+
+  def create_classdef
+    @logger.info { "Creating class definition." }
+    @classdef_filename = @name + '.rb'
+    check_file(@classdef_filename) or return
+    write_file(@classdef_filename) do |f|
+      f << WSDL::SOAP::ClassDefCreator.new(@xsd).dump
+    end
+  end
+
+  def write_file(filename)
+    if @basedir
+      filename = File.join(basedir, filename)
+    end
+    File.open(filename, "w") do |f|
+      yield f
+    end
+  end
+
+  def check_file(filename)
+    if @basedir
+      filename = File.join(basedir, filename)
+    end
+    if FileTest.exist?(filename)
+      if @opt.key?('force')
+	@logger.warn {
+	  "File '#{filename}' exists but overrides it."
+	}
+	true
+      else
+	@logger.warn {
+	  "File '#{filename}' exists.  #{$0} did not override it."
+	}
+	false
+      end
+    else
+      @logger.info { "Creates file '#{filename}'." }
+      true
+    end
+  end
+
+  def create_classname(xsd)
+    name = nil
+    if xsd.targetnamespace
+      name = xsd.targetnamespace.scan(/[a-zA-Z0-9]+$/)[0]
+    end
+    if name.nil?
+      'default'
+    else
+      XSD::CodeGen::GenSupport.safevarname(name)
+    end
+  end
+
+  def import(location)
+    WSDL::XMLSchema::Importer.import(location)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/xmlrpc/.document b/ruby_1_8_6/lib/xmlrpc/.document
new file mode 100644
index 0000000000..e475c53ed0
--- /dev/null
+++ b/ruby_1_8_6/lib/xmlrpc/.document
@@ -0,0 +1 @@
+README.rdoc
diff --git a/ruby_1_8_6/lib/xmlrpc/README.txt b/ruby_1_8_6/lib/xmlrpc/README.txt
new file mode 100644
index 0000000000..ade842d8b1
--- /dev/null
+++ b/ruby_1_8_6/lib/xmlrpc/README.txt
@@ -0,0 +1,31 @@
+= XMLRPC for Ruby, Standard Library Documentation
+
+== Overview
+
+XMLRPC is a lightweight protocol that enables remote procedure calls over
+HTTP.  It is defined at http://www.xmlrpc.com.
+
+XMLRPC allows you to create simple distributed computing solutions that span
+computer languages.  Its distinctive feature is its simplicity compared to
+other approaches like SOAP and CORBA.
+
+The Ruby standard library package 'xmlrpc' enables you to create a server that
+implements remote procedures and a client that calls them.  Very little code
+is required to achieve either of these.
+
+== Example
+
+Try the following code.  It calls a standard demonstration remote procedure.
+
+  require 'xmlrpc/client'
+  require 'pp'
+
+  server = XMLRPC::Client.new2("http://xmlrpc-c.sourceforge.net/api/sample.php")
+  result = server.call("sample.sumAndDifference", 5, 3)
+  pp result
+
+== Documentation
+
+See http://www.ntecs.de/projects/xmlrpc4r.  There is plenty of detail there to
+use the client and implement a server.
+
diff --git a/ruby_1_8_6/lib/xmlrpc/base64.rb b/ruby_1_8_6/lib/xmlrpc/base64.rb
new file mode 100644
index 0000000000..f9a21c703a
--- /dev/null
+++ b/ruby_1_8_6/lib/xmlrpc/base64.rb
@@ -0,0 +1,81 @@
+=begin
+= xmlrpc/base64.rb
+Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
+
+Released under the same term of license as Ruby.
+
+= Classes
+* ((<XMLRPC::Base64>))
+
+= XMLRPC::Base64
+== Description
+This class is necessary for (('xmlrpc4r')) to determine that a string should 
+be transmitted base64-encoded and not as a raw-string. 
+You can use (({XMLRPC::Base64})) on the client and server-side as a 
+parameter and/or return-value.
+
+== Class Methods
+--- XMLRPC::Base64.new( str, state = :dec )
+    Creates a new (({XMLRPC::Base64})) instance with string ((|str|)) as the
+    internal string. When ((|state|)) is (({:dec})) it assumes that the 
+    string ((|str|)) is not in base64 format (perhaps already decoded), 
+    otherwise if ((|state|)) is (({:enc})) it decodes ((|str|)) 
+    and stores it as the internal string.
+    
+--- XMLRPC::Base64.decode( str )
+    Decodes string ((|str|)) with base64 and returns that value.
+
+--- XMLRPC::Base64.encode( str )
+    Encodes string ((|str|)) with base64 and returns that value.
+
+== Instance Methods
+--- XMLRPC::Base64#decoded
+    Returns the internal string decoded.
+
+--- XMLRPC::Base64#encoded
+    Returns the internal string encoded with base64.
+
+=end
+
+module XMLRPC
+
+class Base64
+  
+  def initialize(str, state = :dec)
+    case state
+    when :enc
+      @str = Base64.decode(str)
+    when :dec
+      @str = str
+    else
+      raise ArgumentError, "wrong argument; either :enc or :dec"
+    end
+  end
+  
+  def decoded
+    @str  
+  end
+  
+  def encoded
+    Base64.encode(@str)
+  end
+
+
+  def Base64.decode(str)
+    str.gsub(/\s+/, "").unpack("m")[0]
+  end
+
+  def Base64.encode(str)
+    [str].pack("m")
+  end
+
+end
+
+
+end # module XMLRPC
+
+
+=begin
+= History
+    $Id$
+=end
diff --git a/ruby_1_8_6/lib/xmlrpc/client.rb b/ruby_1_8_6/lib/xmlrpc/client.rb
new file mode 100644
index 0000000000..10f547b632
--- /dev/null
+++ b/ruby_1_8_6/lib/xmlrpc/client.rb
@@ -0,0 +1,616 @@
+=begin
+= xmlrpc/client.rb
+Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
+
+Released under the same term of license as Ruby.
+
+= Classes
+* ((<XMLRPC::Client>))
+* ((<XMLRPC::Client::Proxy>))
+
+
+= XMLRPC::Client
+== Synopsis
+    require "xmlrpc/client"
+
+    server = XMLRPC::Client.new("www.ruby-lang.org", "/RPC2", 80)
+    begin
+      param = server.call("michael.add", 4, 5)
+      puts "4 + 5 = #{param}"
+    rescue XMLRPC::FaultException => e
+      puts "Error:"
+      puts e.faultCode
+      puts e.faultString
+    end
+
+or
+
+    require "xmlrpc/client"
+  
+    server = XMLRPC::Client.new("www.ruby-lang.org", "/RPC2", 80)
+    ok, param = server.call2("michael.add", 4, 5)
+    if ok then
+      puts "4 + 5 = #{param}"
+    else
+      puts "Error:"
+      puts param.faultCode
+      puts param.faultString
+    end
+
+== Description
+Class (({XMLRPC::Client})) provides remote procedure calls to a XML-RPC server.
+After setting the connection-parameters with ((<XMLRPC::Client.new>)) which
+creates a new (({XMLRPC::Client})) instance, you can execute a remote procedure 
+by sending the ((<call|XMLRPC::Client#call>)) or ((<call2|XMLRPC::Client#call2>))
+message to this new instance. The given parameters indicate which method to 
+call on the remote-side and of course the parameters for the remote procedure.
+
+== Class Methods
+--- XMLRPC::Client.new( host=nil, path=nil, port=nil, proxy_host=nil, proxy_port=nil, user=nil, password=nil, use_ssl=false, timeout =nil)
+    Creates an object which represents the remote XML-RPC server on the 
+    given host ((|host|)). If the server is CGI-based, ((|path|)) is the
+    path to the CGI-script, which will be called, otherwise (in the
+    case of a standalone server) ((|path|)) should be (({"/RPC2"})).
+    ((|port|)) is the port on which the XML-RPC server listens.
+    If ((|proxy_host|)) is given, then a proxy server listening at
+    ((|proxy_host|)) is used. ((|proxy_port|)) is the port of the
+    proxy server.
+
+    Default values for ((|host|)), ((|path|)) and ((|port|)) are 'localhost', '/RPC2' and
+    '80' respectively using SSL '443'.
+
+    If ((|user|)) and ((|password|)) are given, each time a request is send, 
+    a Authorization header is send. Currently only Basic Authentification is 
+    implemented no Digest.
+
+    If ((|use_ssl|)) is set to (({true})), comunication over SSL is enabled.
+    Note, that you need the SSL package from RAA installed.
+
+    Parameter ((|timeout|)) is the time to wait for a XML-RPC response, defaults to 30.
+
+--- XMLRPC::Client.new2( uri, proxy=nil, timeout=nil)
+--- XMLRPC::Client.new_from_uri( uri, proxy=nil, timeout=nil)
+:   uri
+    URI specifying protocol (http or https), host, port, path, user and password.
+    Example: https://user:password@host:port/path
+
+:   proxy
+    Is of the form "host:port".
+ 
+:   timeout
+    Defaults to 30. 
+
+--- XMLRPC::Client.new3( hash={} )
+--- XMLRPC::Client.new_from_hash( hash={} )
+    Parameter ((|hash|)) has following case-insensitive keys:
+    * host
+    * path
+    * port
+    * proxy_host
+    * proxy_port
+    * user
+    * password
+    * use_ssl
+    * timeout
+
+    Calls ((<XMLRPC::Client.new>)) with the corresponding values.
+
+== Instance Methods
+--- XMLRPC::Client#call( method, *args )
+    Invokes the method named ((|method|)) with the parameters given by 
+    ((|args|)) on the XML-RPC server.
+    The parameter ((|method|)) is converted into a (({String})) and should 
+    be a valid XML-RPC method-name.  
+    Each parameter of ((|args|)) must be of one of the following types,
+    where (({Hash})), (({Struct})) and (({Array})) can contain any of these listed ((:types:)):
+    * (({Fixnum})), (({Bignum}))
+    * (({TrueClass})), (({FalseClass})) ((({true})), (({false})))
+    * (({String})), (({Symbol}))
+    * (({Float}))
+    * (({Hash})), (({Struct}))
+    * (({Array}))
+    * (({Date})), (({Time})), (({XMLRPC::DateTime}))
+    * (({XMLRPC::Base64})) 
+    * A Ruby object which class includes XMLRPC::Marshallable (only if Config::ENABLE_MARSHALLABLE is (({true}))). 
+      That object is converted into a hash, with one additional key/value pair "___class___" which contains the class name
+      for restoring later that object.
+    
+    The method returns the return-value from the RPC 
+    ((-stands for Remote Procedure Call-)). 
+    The type of the return-value is one of the above shown,
+    only that a (({Bignum})) is only allowed when it fits in 32-bit and
+    that a XML-RPC (('dateTime.iso8601')) type is always returned as
+    a ((<(({XMLRPC::DateTime}))|URL:datetime.html>)) object and 
+    a (({Struct})) is never returned, only a (({Hash})), the same for a (({Symbol})), where
+    always a (({String})) is returned. 
+    A (({XMLRPC::Base64})) is returned as a (({String})) from xmlrpc4r version 1.6.1 on.
+    
+    If the remote procedure returned a fault-structure, then a 
+    (({XMLRPC::FaultException})) exception is raised, which has two accessor-methods
+    (({faultCode})) and (({faultString})) of type (({Integer})) and (({String})).
+
+--- XMLRPC::Client#call2( method, *args )
+    The difference between this method and ((<call|XMLRPC::Client#call>)) is, that
+    this method do ((*not*)) raise a (({XMLRPC::FaultException})) exception.
+    The method returns an array of two values. The first value indicates if 
+    the second value is a return-value ((({true}))) or an object of type
+    (({XMLRPC::FaultException})). 
+    Both are explained in ((<call|XMLRPC::Client#call>)).
+
+    Simple to remember: The "2" in "call2" denotes the number of values it returns.
+
+--- XMLRPC::Client#multicall( *methods )
+    You can use this method to execute several methods on a XMLRPC server which supports
+    the multi-call extension.
+    Example:
+
+      s.multicall(
+        ['michael.add', 3, 4],
+        ['michael.sub', 4, 5]
+      )
+      # => [7, -1]
+
+--- XMLRPC::Client#multicall2( *methods )
+    Same as ((<XMLRPC::Client#multicall>)), but returns like ((<XMLRPC::Client#call2>)) two parameters 
+    instead of raising an (({XMLRPC::FaultException})).
+
+--- XMLRPC::Client#proxy( prefix, *args )
+    Returns an object of class (({XMLRPC::Client::Proxy})), initialized with
+    ((|prefix|)) and ((|args|)). A proxy object returned by this method behaves
+    like ((<XMLRPC::Client#call>)), i.e. a call on that object will raise a
+    (({XMLRPC::FaultException})) when a fault-structure is returned by that call. 
+
+--- XMLRPC::Client#proxy2( prefix, *args )
+    Almost the same like ((<XMLRPC::Client#proxy>)) only that a call on the returned
+    (({XMLRPC::Client::Proxy})) object behaves like ((<XMLRPC::Client#call2>)), i.e.
+    a call on that object will return two parameters. 
+
+
+
+
+--- XMLRPC::Client#call_async(...)
+--- XMLRPC::Client#call2_async(...)
+--- XMLRPC::Client#multicall_async(...)
+--- XMLRPC::Client#multicall2_async(...)
+--- XMLRPC::Client#proxy_async(...)
+--- XMLRPC::Client#proxy2_async(...)
+    In contrast to corresponding methods without "_async", these can be
+    called concurrently and use for each request a new connection, where the 
+    non-asynchronous counterparts use connection-alive (one connection for all requests)
+    if possible. 
+
+    Note, that you have to use Threads to call these methods concurrently. 
+    The following example calls two methods concurrently:
+    
+      Thread.new {
+        p client.call_async("michael.add", 4, 5)
+      }
+ 
+      Thread.new {
+        p client.call_async("michael.div", 7, 9)
+      }
+ 
+
+--- XMLRPC::Client#timeout
+--- XMLRPC::Client#user
+--- XMLRPC::Client#password
+    Return the corresponding attributes.
+
+--- XMLRPC::Client#timeout= (new_timeout)
+--- XMLRPC::Client#user= (new_user)
+--- XMLRPC::Client#password= (new_password)
+    Set the corresponding attributes.
+    
+
+--- XMLRPC::Client#set_writer( writer )
+    Sets the XML writer to use for generating XML output.
+    Should be an instance of a class from module (({XMLRPC::XMLWriter})).
+    If this method is not called, then (({XMLRPC::Config::DEFAULT_WRITER})) is used. 
+
+--- XMLRPC::Client#set_parser( parser )
+    Sets the XML parser to use for parsing XML documents.
+    Should be an instance of a class from module (({XMLRPC::XMLParser})).
+    If this method is not called, then (({XMLRPC::Config::DEFAULT_PARSER})) is used.
+
+--- XMLRPC::Client#cookie
+--- XMLRPC::Client#cookie= (cookieString)
+    Get and set the HTTP Cookie header.
+
+--- XMLRPC::Client#http_header_extra= (additionalHeaders)
+    Set extra HTTP headers that are included in the request.
+
+--- XMLRPC::Client#http_header_extra
+    Access the via ((<XMLRPC::Client#http_header_extra=>)) assigned header. 
+
+--- XMLRPC::Client#http_last_response
+    Returns the (({Net::HTTPResponse})) object of the last RPC.
+
+= XMLRPC::Client::Proxy
+== Synopsis
+    require "xmlrpc/client"
+
+    server = XMLRPC::Client.new("www.ruby-lang.org", "/RPC2", 80)
+
+    michael  = server.proxy("michael")
+    michael2 = server.proxy("michael", 4)
+
+    # both calls should return the same value '9'.
+    p michael.add(4,5)
+    p michael2.add(5)
+
+== Description
+Class (({XMLRPC::Client::Proxy})) makes XML-RPC calls look nicer!
+You can call any method onto objects of that class - the object handles 
+(({method_missing})) and will forward the method call to a XML-RPC server.
+Don't use this class directly, but use instead method ((<XMLRPC::Client#proxy>)) or
+((<XMLRPC::Client#proxy2>)).
+
+== Class Methods
+--- XMLRPC::Client::Proxy.new( server, prefix, args=[], meth=:call, delim="." ) 
+    Creates an object which provides (({method_missing})).
+
+    ((|server|)) must be of type (({XMLRPC::Client})), which is the XML-RPC server to be used
+    for a XML-RPC call. ((|prefix|)) and ((|delim|)) will be prepended to the methodname
+    called onto this object. 
+
+    Parameter ((|meth|)) is the method (call, call2, call_async, call2_async) to use for
+    a RPC.
+
+    ((|args|)) are arguments which are automatically given
+    to every XML-RPC call before the arguments provides through (({method_missing})).
+    
+== Instance Methods
+Every method call is forwarded to the XML-RPC server defined in ((<new|XMLRPC::Client::Proxy#new>)).
+    
+Note: Inherited methods from class (({Object})) cannot be used as XML-RPC names, because they get around
+(({method_missing})). 
+          
+
+
+= History
+    $Id$
+
+=end
+
+
+
+require "xmlrpc/parser"
+require "xmlrpc/create"
+require "xmlrpc/config"
+require "xmlrpc/utils"     # ParserWriterChooseMixin
+require "net/http"
+
+module XMLRPC
+
+  class Client
+   
+    USER_AGENT = "XMLRPC::Client (Ruby #{RUBY_VERSION})"
+
+    include ParserWriterChooseMixin
+    include ParseContentType
+
+
+    # Constructors -------------------------------------------------------------------
+
+    def initialize(host=nil, path=nil, port=nil, proxy_host=nil, proxy_port=nil, 
+                   user=nil, password=nil, use_ssl=nil, timeout=nil)
+
+      @http_header_extra = nil
+      @http_last_response = nil 
+      @cookie = nil
+
+      @host       = host || "localhost"
+      @path       = path || "/RPC2"
+      @proxy_host = proxy_host
+      @proxy_port = proxy_port
+      @proxy_host ||= 'localhost' if @proxy_port != nil
+      @proxy_port ||= 8080 if @proxy_host != nil
+      @use_ssl    = use_ssl || false
+      @timeout    = timeout || 30
+
+      if use_ssl
+        require "net/https"
+        @port = port || 443
+      else
+        @port = port || 80
+      end
+
+      @user, @password = user, password
+
+      set_auth
+
+      # convert ports to integers
+      @port = @port.to_i if @port != nil
+      @proxy_port = @proxy_port.to_i if @proxy_port != nil
+
+      # HTTP object for synchronous calls
+      Net::HTTP.version_1_2
+      @http = Net::HTTP.new(@host, @port, @proxy_host, @proxy_port) 
+      @http.use_ssl = @use_ssl if @use_ssl
+      @http.read_timeout = @timeout
+      @http.open_timeout = @timeout
+
+      @parser = nil
+      @create = nil
+    end
+
+
+    class << self
+
+    def new2(uri, proxy=nil, timeout=nil)
+      if match = /^([^:]+):\/\/(([^@]+)@)?([^\/]+)(\/.*)?$/.match(uri)
+        proto = match[1]
+        user, passwd = (match[3] || "").split(":")
+        host, port = match[4].split(":") 
+        path = match[5]
+
+        if proto != "http" and proto != "https"
+          raise "Wrong protocol specified. Only http or https allowed!"
+        end
+
+      else
+        raise "Wrong URI as parameter!"
+      end
+ 
+      proxy_host, proxy_port = (proxy || "").split(":")
+
+      self.new(host, path, port, proxy_host, proxy_port, user, passwd, (proto == "https"), timeout)
+    end
+
+    alias new_from_uri new2
+
+    def new3(hash={})
+
+      # convert all keys into lowercase strings
+      h = {}
+      hash.each { |k,v| h[k.to_s.downcase] = v }
+
+      self.new(h['host'], h['path'], h['port'], h['proxy_host'], h['proxy_port'], h['user'], h['password'],
+               h['use_ssl'], h['timeout'])
+    end
+
+    alias new_from_hash new3
+
+    end
+
+
+    # Attribute Accessors -------------------------------------------------------------------
+
+    # add additional HTTP headers to the request
+    attr_accessor :http_header_extra
+
+    # makes last HTTP response accessible
+    attr_reader :http_last_response
+
+    # Cookie support
+    attr_accessor :cookie
+    
+
+    attr_reader :timeout, :user, :password
+
+    def timeout=(new_timeout)
+      @timeout = new_timeout
+      @http.read_timeout = @timeout
+      @http.open_timeout = @timeout
+    end
+
+    def user=(new_user)
+      @user = new_user
+      set_auth
+    end
+
+    def password=(new_password)
+      @password = new_password
+      set_auth
+    end
+
+    # Call methods --------------------------------------------------------------
+
+    def call(method, *args)
+      ok, param = call2(method, *args) 
+      if ok
+        param
+      else
+        raise param
+      end
+    end 
+
+    def call2(method, *args)
+      request = create().methodCall(method, *args)
+      data = do_rpc(request, false)
+      parser().parseMethodResponse(data)
+    end
+
+    def call_async(method, *args)
+      ok, param = call2_async(method, *args) 
+      if ok
+        param
+      else
+        raise param
+      end
+    end 
+
+    def call2_async(method, *args)
+      request = create().methodCall(method, *args)
+      data = do_rpc(request, true)
+      parser().parseMethodResponse(data)
+    end
+
+
+    # Multicall methods --------------------------------------------------------------
+
+    def multicall(*methods)
+      ok, params = multicall2(*methods)
+      if ok
+        params
+      else
+        raise params
+      end
+    end
+
+    def multicall2(*methods)
+      gen_multicall(methods, false)
+    end
+
+    def multicall_async(*methods)
+      ok, params = multicall2_async(*methods)
+      if ok
+        params
+      else
+        raise params
+      end
+    end
+
+    def multicall2_async(*methods)
+      gen_multicall(methods, true)
+    end
+
+
+    # Proxy generating methods ------------------------------------------
+    
+    def proxy(prefix=nil, *args)
+      Proxy.new(self, prefix, args, :call)
+    end
+
+    def proxy2(prefix=nil, *args)
+      Proxy.new(self, prefix, args, :call2)
+    end
+
+    def proxy_async(prefix=nil, *args)
+      Proxy.new(self, prefix, args, :call_async)
+    end
+
+    def proxy2_async(prefix=nil, *args)
+      Proxy.new(self, prefix, args, :call2_async)
+    end
+
+
+    private # ----------------------------------------------------------
+
+    def set_auth
+      if @user.nil?
+        @auth = nil
+      else
+        a =  "#@user"
+        a << ":#@password" if @password != nil
+        @auth = ("Basic " + [a].pack("m")).chomp
+      end
+    end
+
+    def do_rpc(request, async=false)
+      header = {  
+       "User-Agent"     =>  USER_AGENT,
+       "Content-Type"   => "text/xml; charset=utf-8",
+       "Content-Length" => request.size.to_s, 
+       "Connection"     => (async ? "close" : "keep-alive")
+      }
+
+      header["Cookie"] = @cookie        if @cookie
+      header.update(@http_header_extra) if @http_header_extra
+
+      if @auth != nil
+        # add authorization header
+        header["Authorization"] = @auth
+      end
+ 
+      resp = nil
+      @http_last_response = nil
+
+      if async
+        # use a new HTTP object for each call 
+        Net::HTTP.version_1_2
+        http = Net::HTTP.new(@host, @port, @proxy_host, @proxy_port) 
+        http.use_ssl = @use_ssl if @use_ssl
+        http.read_timeout = @timeout
+        http.open_timeout = @timeout
+        
+        # post request
+        http.start {
+          resp = http.post2(@path, request, header) 
+        }
+      else
+        # reuse the HTTP object for each call => connection alive is possible
+        
+        # post request
+        resp = @http.post2(@path, request, header) 
+      end
+  
+      @http_last_response = resp
+
+      data = resp.body
+
+      if resp.code == "401"
+        # Authorization Required
+        raise "Authorization failed.\nHTTP-Error: #{resp.code} #{resp.message}" 
+      elsif resp.code[0,1] != "2"
+        raise "HTTP-Error: #{resp.code} #{resp.message}" 
+      end
+
+      ct = parse_content_type(resp["Content-Type"]).first
+      if ct != "text/xml"
+        if ct == "text/html"
+          raise "Wrong content-type: \n#{data}"
+        else
+          raise "Wrong content-type"
+        end
+      end
+
+      expected = resp["Content-Length"] || "<unknown>"
+      if data.nil? or data.size == 0 
+        raise "Wrong size. Was #{data.size}, should be #{expected}" 
+      elsif expected != "<unknown>" and expected.to_i != data.size and resp["Transfer-Encoding"].nil?
+        raise "Wrong size. Was #{data.size}, should be #{expected}"
+      end
+
+      c = resp["Set-Cookie"]
+      @cookie = c if c
+
+      return data
+    end
+
+    def gen_multicall(methods=[], async=false)
+      meth = :call2
+      meth = :call2_async if async
+
+      ok, params = self.send(meth, "system.multicall", 
+        methods.collect {|m| {'methodName' => m[0], 'params' => m[1..-1]} }
+      )
+
+      if ok 
+        params = params.collect do |param|
+          if param.is_a? Array
+            param[0]
+          elsif param.is_a? Hash
+            XMLRPC::FaultException.new(param["faultCode"], param["faultString"])
+          else
+            raise "Wrong multicall return value"
+          end 
+        end
+      end
+
+      return ok, params
+    end
+
+
+
+    class Proxy
+
+      def initialize(server, prefix, args=[], meth=:call, delim=".")
+	@server = server
+	@prefix = prefix ? prefix + delim : ""
+	@args   = args 
+        @meth   = meth
+      end
+
+      def method_missing(mid, *args)
+	pre = @prefix + mid.to_s
+	arg = @args + args
+	@server.send(@meth, pre, *arg)
+      end
+
+    end # class Proxy
+
+  end # class Client
+
+end # module XMLRPC
+
diff --git a/ruby_1_8_6/lib/xmlrpc/config.rb b/ruby_1_8_6/lib/xmlrpc/config.rb
new file mode 100644
index 0000000000..c4d2c41aac
--- /dev/null
+++ b/ruby_1_8_6/lib/xmlrpc/config.rb
@@ -0,0 +1,40 @@
+#
+# $Id$
+# Configuration file for XML-RPC for Ruby
+#
+
+module XMLRPC
+
+  module Config
+
+    DEFAULT_WRITER = XMLWriter::Simple            # or XMLWriter::XMLParser
+    
+    # available parser:
+    #   * XMLParser::NQXMLTreeParser
+    #   * XMLParser::NQXMLStreamParser
+    #   * XMLParser::XMLTreeParser
+    #   * XMLParser::XMLStreamParser (fastest)
+    #   * XMLParser::REXMLStreamParser
+    #   * XMLParser::XMLScanStreamParser
+    DEFAULT_PARSER = XMLParser::REXMLStreamParser
+
+    # enable <nil/> tag
+    ENABLE_NIL_CREATE    = false
+    ENABLE_NIL_PARSER    = false
+    
+    # allows integers greater than 32-bit if true
+    ENABLE_BIGINT        = false
+
+    # enable marshalling ruby objects which include XMLRPC::Marshallable
+    ENABLE_MARSHALLING   = true 
+
+    # enable multiCall extension by default
+    ENABLE_MULTICALL     = false
+    
+    # enable Introspection extension by default
+    ENABLE_INTROSPECTION = false
+
+  end
+
+end
+
diff --git a/ruby_1_8_6/lib/xmlrpc/create.rb b/ruby_1_8_6/lib/xmlrpc/create.rb
new file mode 100644
index 0000000000..b5c94254a4
--- /dev/null
+++ b/ruby_1_8_6/lib/xmlrpc/create.rb
@@ -0,0 +1,290 @@
+#
+# Creates XML-RPC call/response documents
+# 
+# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
+#
+# $Id$
+#
+
+require "date"
+require "xmlrpc/base64"
+
+module XMLRPC
+
+  module XMLWriter
+
+    class Abstract
+      def ele(name, *children)
+	element(name, nil, *children)
+      end
+
+      def tag(name, txt)
+	element(name, nil, text(txt))
+      end
+    end
+
+
+    class Simple < Abstract
+
+      def document_to_str(doc)
+	doc
+      end
+
+      def document(*params)
+	params.join("")
+      end
+
+      def pi(name, *params)
+	"<?#{name} " + params.join(" ") + " ?>"
+      end
+
+      def element(name, attrs, *children)
+	raise "attributes not yet implemented" unless attrs.nil?
+        if children.empty?
+          "<#{name}/>" 
+        else
+          "<#{name}>" + children.join("") + "</#{name}>"
+        end
+      end
+
+      def text(txt)
+        cleaned = txt.dup
+        cleaned.gsub!(/&/, '&amp;')
+        cleaned.gsub!(/</, '&lt;')
+        cleaned.gsub!(/>/, '&gt;')
+        cleaned
+      end
+
+    end # class Simple
+
+
+    class XMLParser < Abstract
+
+      def initialize
+	require "xmltreebuilder"
+      end
+
+      def document_to_str(doc)
+	doc.to_s
+      end
+
+      def document(*params)
+	XML::SimpleTree::Document.new(*params) 
+      end
+
+      def pi(name, *params)
+	XML::SimpleTree::ProcessingInstruction.new(name, *params)
+      end
+
+      def element(name, attrs, *children)
+	XML::SimpleTree::Element.new(name, attrs, *children)
+      end
+
+      def text(txt)
+	XML::SimpleTree::Text.new(txt)
+      end
+
+    end # class XMLParser
+
+    Classes = [Simple, XMLParser]
+
+    # yields an instance of each installed XML writer
+    def self.each_installed_writer
+      XMLRPC::XMLWriter::Classes.each do |klass|
+        begin
+          yield klass.new
+        rescue LoadError
+        end
+      end
+    end
+
+  end # module XMLWriter
+
+  class Create
+
+    def initialize(xml_writer = nil)
+      @writer = xml_writer || Config::DEFAULT_WRITER.new
+    end
+
+
+    def methodCall(name, *params)
+      name = name.to_s
+
+      if name !~ /[a-zA-Z0-9_.:\/]+/
+	raise ArgumentError, "Wrong XML-RPC method-name"
+      end
+
+      parameter = params.collect do |param|
+	@writer.ele("param", conv2value(param))
+      end
+
+      tree = @writer.document(
+	       @writer.pi("xml", 'version="1.0"'),
+	       @writer.ele("methodCall",   
+		 @writer.tag("methodName", name),
+		 @writer.ele("params", *parameter)    
+	       )
+	     )
+
+      @writer.document_to_str(tree) + "\n"
+    end
+
+
+
+    #
+    # generates a XML-RPC methodResponse document
+    #
+    # if is_ret == false then the params array must
+    # contain only one element, which is a structure
+    # of a fault return-value.
+    # 
+    # if is_ret == true then a normal 
+    # return-value of all the given params is created.
+    #
+    def methodResponse(is_ret, *params)
+
+      if is_ret 
+	resp = params.collect do |param|
+	  @writer.ele("param", conv2value(param))
+	end
+     
+	resp = [@writer.ele("params", *resp)]
+      else
+	if params.size != 1 or params[0] === XMLRPC::FaultException 
+	  raise ArgumentError, "no valid fault-structure given"
+	end
+	resp = @writer.ele("fault", conv2value(params[0].to_h))
+      end
+
+	
+      tree = @writer.document(
+	       @writer.pi("xml", 'version="1.0"'),
+	       @writer.ele("methodResponse", resp) 
+	     )
+
+      @writer.document_to_str(tree) + "\n"
+    end
+
+
+
+    #####################################
+    private
+    #####################################
+
+    #
+    # converts a Ruby object into
+    # a XML-RPC <value> tag
+    #
+    def conv2value(param)
+
+	val = case param
+	when Fixnum 
+	  @writer.tag("i4", param.to_s)
+
+	when Bignum
+          if Config::ENABLE_BIGINT
+            @writer.tag("i4", param.to_s)
+          else
+            if param >= -(2**31) and param <= (2**31-1)
+              @writer.tag("i4", param.to_s)
+            else
+              raise "Bignum is too big! Must be signed 32-bit integer!"
+            end
+          end
+	when TrueClass, FalseClass
+	  @writer.tag("boolean", param ? "1" : "0")
+
+	when String 
+	  @writer.tag("string", param)
+
+	when Symbol 
+	  @writer.tag("string", param.to_s)
+
+        when NilClass
+          if Config::ENABLE_NIL_CREATE
+            @writer.ele("nil")
+          else
+            raise "Wrong type NilClass. Not allowed!"
+          end
+
+	when Float
+	  @writer.tag("double", param.to_s)
+
+	when Struct
+	  h = param.members.collect do |key| 
+	    value = param[key]
+	    @writer.ele("member", 
+	      @writer.tag("name", key.to_s),
+	      conv2value(value) 
+	    )
+	  end
+
+	  @writer.ele("struct", *h) 
+
+	when Hash
+	  # TODO: can a Hash be empty?
+	  
+	  h = param.collect do |key, value|
+	    @writer.ele("member", 
+	      @writer.tag("name", key.to_s),
+	      conv2value(value) 
+	    )
+	  end
+
+	  @writer.ele("struct", *h) 
+
+	when Array
+	  # TODO: can an Array be empty?
+	  a = param.collect {|v| conv2value(v) }
+	  
+	  @writer.ele("array", 
+	    @writer.ele("data", *a)
+	  )
+
+	when Time, Date, ::DateTime
+	  @writer.tag("dateTime.iso8601", param.strftime("%Y%m%dT%H:%M:%S"))  
+
+	when XMLRPC::DateTime
+	  @writer.tag("dateTime.iso8601", 
+	    format("%.4d%02d%02dT%02d:%02d:%02d", *param.to_a))
+   
+	when XMLRPC::Base64
+	  @writer.tag("base64", param.encoded) 
+
+	else 
+          if Config::ENABLE_MARSHALLING and param.class.included_modules.include? XMLRPC::Marshallable
+            # convert Ruby object into Hash
+            ret = {"___class___" => param.class.name}
+            param.instance_variables.each {|v| 
+              name = v[1..-1]
+              val = param.instance_variable_get(v)
+
+              if val.nil?
+                ret[name] = val if Config::ENABLE_NIL_CREATE
+              else
+                ret[name] = val
+              end
+            }
+            return conv2value(ret)
+          else 
+            ok, pa = wrong_type(param)
+            if ok
+              return conv2value(pa)
+            else 
+              raise "Wrong type!"
+            end
+          end
+	end
+	 
+	@writer.ele("value", val)
+    end
+
+    def wrong_type(value)
+      false
+    end
+
+    
+  end # class Create
+
+end # module XMLRPC
+
diff --git a/ruby_1_8_6/lib/xmlrpc/datetime.rb b/ruby_1_8_6/lib/xmlrpc/datetime.rb
new file mode 100644
index 0000000000..298263fe8a
--- /dev/null
+++ b/ruby_1_8_6/lib/xmlrpc/datetime.rb
@@ -0,0 +1,142 @@
+=begin
+= xmlrpc/datetime.rb
+Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
+
+Released under the same term of license as Ruby.
+
+= Classes
+* ((<XMLRPC::DateTime>))
+
+= XMLRPC::DateTime
+== Description
+This class is important to handle XMLRPC (('dateTime.iso8601')) values,
+correcly, because normal UNIX-dates (class (({Date}))) only handle dates 
+from year 1970 on, and class (({Time})) handles dates without the time
+component. (({XMLRPC::DateTime})) is able to store a XMLRPC 
+(('dateTime.iso8601')) value correctly.
+
+== Class Methods
+--- XMLRPC::DateTime.new( year, month, day, hour, min, sec )
+    Creates a new (({XMLRPC::DateTime})) instance with the
+    parameters ((|year|)), ((|month|)), ((|day|)) as date and 
+    ((|hour|)), ((|min|)), ((|sec|)) as time.
+    Raises (({ArgumentError})) if a parameter is out of range, or ((|year|)) is not
+    of type (({Integer})).
+    
+== Instance Methods
+--- XMLRPC::DateTime#year
+--- XMLRPC::DateTime#month
+--- XMLRPC::DateTime#day
+--- XMLRPC::DateTime#hour
+--- XMLRPC::DateTime#min
+--- XMLRPC::DateTime#sec
+    Return the value of the specified date/time component.
+
+--- XMLRPC::DateTime#mon
+    Alias for ((<XMLRPC::DateTime#month>)).
+
+--- XMLRPC::DateTime#year=( value )
+--- XMLRPC::DateTime#month=( value )
+--- XMLRPC::DateTime#day=( value )
+--- XMLRPC::DateTime#hour=( value )
+--- XMLRPC::DateTime#min=( value )
+--- XMLRPC::DateTime#sec=( value )
+    Set ((|value|)) as the new date/time component.
+    Raises (({ArgumentError})) if ((|value|)) is out of range, or in the case
+    of (({XMLRPC::DateTime#year=})) if ((|value|)) is not of type (({Integer})).
+
+--- XMLRPC::DateTime#mon=( value )
+    Alias for ((<XMLRPC::DateTime#month=>)).
+
+--- XMLRPC::DateTime#to_time
+    Return a (({Time})) object of the date/time which (({self})) represents.
+    If the (('year')) is below 1970, this method returns (({nil})), 
+    because (({Time})) cannot handle years below 1970.
+    The used timezone is GMT.
+
+--- XMLRPC::DateTime#to_date
+    Return a (({Date})) object of the date which (({self})) represents.
+    The (({Date})) object do ((*not*)) contain the time component (only date).
+
+--- XMLRPC::DateTime#to_a
+    Returns all date/time components in an array.
+    Returns (({[year, month, day, hour, min, sec]})).
+=end
+
+require "date"
+
+module XMLRPC
+
+class DateTime
+  
+  attr_reader :year, :month, :day, :hour, :min, :sec
+
+  def year= (value)
+    raise ArgumentError, "date/time out of range" unless value.is_a? Integer
+    @year = value
+  end
+
+  def month= (value)
+    raise ArgumentError, "date/time out of range" unless (1..12).include? value
+    @month = value
+  end
+
+  def day= (value)
+    raise ArgumentError, "date/time out of range" unless (1..31).include? value
+    @day = value
+  end
+
+  def hour= (value)
+    raise ArgumentError, "date/time out of range" unless (0..24).include? value
+    @hour = value
+  end
+
+  def min= (value)
+    raise ArgumentError, "date/time out of range" unless (0..59).include? value
+    @min = value
+  end
+
+  def sec= (value)
+    raise ArgumentError, "date/time out of range" unless (0..59).include? value
+    @sec = value
+  end
+
+  alias mon  month
+  alias mon= month= 
+ 
+
+  def initialize(year, month, day, hour, min, sec)
+    self.year, self.month, self.day = year, month, day
+    self.hour, self.min, self.sec   = hour, min, sec
+  end
+ 
+  def to_time
+    if @year >= 1970
+      Time.gm(*to_a)
+    else
+      nil
+    end
+  end
+
+  def to_date
+    Date.new(*to_a[0,3])
+  end
+
+  def to_a
+    [@year, @month, @day, @hour, @min, @sec]
+  end
+
+  def ==(o)
+    Array(self) == Array(o)
+  end
+
+end
+
+
+end # module XMLRPC
+
+
+=begin
+= History
+    $Id$
+=end
diff --git a/ruby_1_8_6/lib/xmlrpc/httpserver.rb b/ruby_1_8_6/lib/xmlrpc/httpserver.rb
new file mode 100644
index 0000000000..9afb5fd5ec
--- /dev/null
+++ b/ruby_1_8_6/lib/xmlrpc/httpserver.rb
@@ -0,0 +1,178 @@
+#
+# Implements a simple HTTP-server by using John W. Small's (jsmall@laser.net) 
+# ruby-generic-server.
+# 
+# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
+#
+# $Id$
+#
+
+
+require "gserver"
+
+class HttpServer < GServer
+
+  ##
+  # handle_obj specifies the object, that receives calls to request_handler
+  # and ip_auth_handler 
+  def initialize(handle_obj, port = 8080, host = DEFAULT_HOST, maxConnections = 4, 
+                 stdlog = $stdout, audit = true, debug = true)
+    @handler = handle_obj
+    super(port, host, maxConnections, stdlog, audit, debug)
+  end
+
+private
+
+  # Constants -----------------------------------------------
+  
+  CRLF        = "\r\n"
+  HTTP_PROTO  = "HTTP/1.0"
+  SERVER_NAME = "HttpServer (Ruby #{RUBY_VERSION})"
+
+  DEFAULT_HEADER = {
+    "Server" => SERVER_NAME
+  }
+
+  ##
+  # Mapping of status code and error message
+  #
+  StatusCodeMapping = {
+    200 => "OK",
+    400 => "Bad Request",
+    403 => "Forbidden",
+    405 => "Method Not Allowed",
+    411 => "Length Required",
+    500 => "Internal Server Error"
+  }
+
+  # Classes -------------------------------------------------
+  
+  class Request
+    attr_reader :data, :header, :method, :path, :proto
+    
+    def initialize(data, method=nil, path=nil, proto=nil)
+      @header, @data = Table.new, data
+      @method, @path, @proto = method, path, proto
+    end
+    
+    def content_length
+      len = @header['Content-Length']
+      return nil if len.nil?
+      return len.to_i 
+    end
+    
+  end
+  
+  class Response
+    attr_reader   :header
+    attr_accessor :body, :status, :status_message
+    
+    def initialize(status=200)
+      @status = status
+      @status_message = nil
+      @header = Table.new
+    end
+  end
+
+
+  ##
+  # a case-insensitive Hash class for HTTP header
+  #
+  class Table
+    include Enumerable
+
+    def initialize(hash={})
+      @hash = hash 
+      update(hash)
+    end
+
+    def [](key)
+      @hash[key.to_s.capitalize]
+    end
+
+    def []=(key, value)
+      @hash[key.to_s.capitalize] = value
+    end
+
+    def update(hash)
+      hash.each {|k,v| self[k] = v}
+      self
+    end
+
+    def each
+      @hash.each {|k,v| yield k.capitalize, v }
+    end
+
+    def writeTo(port)
+      each { |k,v| port << "#{k}: #{v}" << CRLF }
+    end
+  end # class Table
+
+
+  # Helper Methods ------------------------------------------
+
+  def http_header(header=nil)
+    new_header = Table.new(DEFAULT_HEADER)
+    new_header.update(header) unless header.nil? 
+
+    new_header["Connection"] = "close"
+    new_header["Date"]       = http_date(Time.now)
+
+    new_header
+  end
+
+  def http_date( aTime )
+    aTime.gmtime.strftime( "%a, %d %b %Y %H:%M:%S GMT" )
+  end
+
+  def http_resp(status_code, status_message=nil, header=nil, body=nil)
+    status_message ||= StatusCodeMapping[status_code]
+    
+    str = ""
+    str << "#{HTTP_PROTO} #{status_code} #{status_message}" << CRLF
+    http_header(header).writeTo(str)
+    str << CRLF
+    str << body unless body.nil?
+    str
+  end
+
+  # Main Serve Loop -----------------------------------------
+  
+  def serve(io)  
+    # perform IP authentification
+    unless @handler.ip_auth_handler(io)
+      io << http_resp(403, "Forbidden")
+      return
+    end
+
+    # parse first line
+    if io.gets =~ /^(\S+)\s+(\S+)\s+(\S+)/
+      request = Request.new(io, $1, $2, $3)
+    else
+      io << http_resp(400, "Bad Request") 
+      return
+    end
+     
+    # parse HTTP headers
+    while (line=io.gets) !~ /^(\n|\r)/
+      if line =~ /^([\w-]+):\s*(.*)$/
+	request.header[$1] = $2.strip
+      end
+    end
+
+    io.binmode    
+    response = Response.new
+
+    # execute request handler
+    @handler.request_handler(request, response)
+   
+    # write response back to the client
+    io << http_resp(response.status, response.status_message,
+                    response.header, response.body) 
+
+  rescue Exception => e
+    io << http_resp(500, "Internal Server Error")
+  end
+
+end # class HttpServer
+
diff --git a/ruby_1_8_6/lib/xmlrpc/marshal.rb b/ruby_1_8_6/lib/xmlrpc/marshal.rb
new file mode 100644
index 0000000000..26510124c2
--- /dev/null
+++ b/ruby_1_8_6/lib/xmlrpc/marshal.rb
@@ -0,0 +1,76 @@
+#
+# Marshalling of XML-RPC methodCall and methodResponse
+# 
+# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
+#
+# $Id$
+#
+
+require "xmlrpc/parser"
+require "xmlrpc/create"
+require "xmlrpc/config"
+require "xmlrpc/utils"
+
+module XMLRPC
+
+  class Marshal
+    include ParserWriterChooseMixin
+
+    # class methods -------------------------------
+   
+    class << self
+
+      def dump_call( methodName, *params )
+        new.dump_call( methodName, *params )
+      end
+
+      def dump_response( param )
+        new.dump_response( param )
+      end
+
+      def load_call( stringOrReadable )
+        new.load_call( stringOrReadable )
+      end
+
+      def load_response( stringOrReadable )
+        new.load_response( stringOrReadable )
+      end
+
+      alias dump dump_response
+      alias load load_response
+
+    end # class self
+
+    # instance methods ----------------------------
+
+    def initialize( parser = nil, writer = nil )
+      set_parser( parser )
+      set_writer( writer )
+    end
+
+    def dump_call( methodName, *params )
+      create.methodCall( methodName, *params )
+    end
+
+    def dump_response( param ) 
+      create.methodResponse( ! param.kind_of?( XMLRPC::FaultException ) , param )
+    end
+
+    ##
+    # returns [ methodname, params ]
+    #
+    def load_call( stringOrReadable )
+      parser.parseMethodCall( stringOrReadable )
+    end
+
+    ##
+    # returns paramOrFault
+    #
+    def load_response( stringOrReadable )
+      parser.parseMethodResponse( stringOrReadable )[1]
+    end
+
+  end # class Marshal
+
+end
+
diff --git a/ruby_1_8_6/lib/xmlrpc/parser.rb b/ruby_1_8_6/lib/xmlrpc/parser.rb
new file mode 100644
index 0000000000..d27d7c3827
--- /dev/null
+++ b/ruby_1_8_6/lib/xmlrpc/parser.rb
@@ -0,0 +1,813 @@
+#
+# Parser for XML-RPC call and response
+# 
+# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
+#
+# $Id$
+#
+
+
+require "date"
+require "xmlrpc/base64"
+require "xmlrpc/datetime"
+
+
+# add some methods to NQXML::Node
+module NQXML
+  class Node
+
+    def removeChild(node)
+      @children.delete(node)
+    end
+    def childNodes
+      @children
+    end
+    def hasChildNodes
+      not @children.empty?
+    end
+    def [] (index)
+      @children[index]
+    end
+
+    def nodeType
+      if @entity.instance_of? NQXML::Text then :TEXT
+      elsif @entity.instance_of? NQXML::Comment then :COMMENT
+      #elsif @entity.instance_of? NQXML::Element then :ELEMENT
+      elsif @entity.instance_of? NQXML::Tag then :ELEMENT
+      else :ELSE
+      end
+    end
+
+    def nodeValue
+      #TODO: error when wrong Entity-type
+      @entity.text
+    end
+    def nodeName
+      #TODO: error when wrong Entity-type
+      @entity.name
+    end
+  end # class Node
+end # module NQXML
+
+module XMLRPC
+
+  class FaultException < StandardError
+    attr_reader :faultCode, :faultString
+
+    alias message faultString
+
+    def initialize(faultCode, faultString)
+      @faultCode   = faultCode
+      @faultString = faultString
+    end
+    
+    # returns a hash
+    def to_h
+      {"faultCode" => @faultCode, "faultString" => @faultString}
+    end
+  end
+
+  module Convert
+    def self.int(str)
+      str.to_i
+    end
+
+    def self.boolean(str)
+      case str
+      when "0" then false
+      when "1" then true
+      else
+        raise "RPC-value of type boolean is wrong" 
+      end
+    end
+
+    def self.double(str)
+      str.to_f
+    end
+
+    def self.dateTime(str)
+      case str
+      when /^(-?\d\d\d\d)-?(\d\d)-?(\d\d)T(\d\d):(\d\d):(\d\d)(?:Z|([+-])(\d\d):?(\d\d))?$/
+        a = [$1, $2, $3, $4, $5, $6].collect{|i| i.to_i}
+        if $7
+          ofs = $8.to_i*3600 + $9.to_i*60
+          ofs = -ofs if $7=='+'
+          utc = Time.utc(a.reverse) + ofs
+          a = [ utc.year, utc.month, utc.day, utc.hour, utc.min, utc.sec ]
+        end
+        XMLRPC::DateTime.new(*a)
+      when /^(-?\d\d)-?(\d\d)-?(\d\d)T(\d\d):(\d\d):(\d\d)(Z|([+-]\d\d):(\d\d))?$/
+        a = [$1, $2, $3, $4, $5, $6].collect{|i| i.to_i}
+        if a[0] < 70
+          a[0] += 2000
+        else
+          a[0] += 1900
+        end
+        if $7
+          ofs = $8.to_i*3600 + $9.to_i*60
+          ofs = -ofs if $7=='+'
+          utc = Time.utc(a.reverse) + ofs
+          a = [ utc.year, utc.month, utc.day, utc.hour, utc.min, utc.sec ]
+        end
+        XMLRPC::DateTime.new(*a)
+      else
+        raise "wrong dateTime.iso8601 format " + str
+      end
+    end
+
+    def self.base64(str)
+      XMLRPC::Base64.decode(str)
+    end
+
+    def self.struct(hash)
+      # convert to marhalled object
+      klass = hash["___class___"]
+      if klass.nil? or Config::ENABLE_MARSHALLING == false 
+        hash
+      else
+        begin
+          mod = Module
+          klass.split("::").each {|const| mod = mod.const_get(const.strip)}
+
+          obj = mod.allocate
+          
+          hash.delete "___class___"
+          hash.each {|key, value| 
+            obj.instance_variable_set("@#{ key }", value) if key =~ /^([\w_][\w_0-9]*)$/
+          }
+          obj
+        rescue
+          hash
+        end
+      end
+    end
+
+    def self.fault(hash)
+      if hash.kind_of? Hash and hash.size == 2 and 
+        hash.has_key? "faultCode" and hash.has_key? "faultString" and 
+        hash["faultCode"].kind_of? Integer and hash["faultString"].kind_of? String
+
+        XMLRPC::FaultException.new(hash["faultCode"], hash["faultString"]) 
+      else
+        raise "wrong fault-structure: #{hash.inspect}"
+      end
+    end
+
+  end # module Convert
+
+  module XMLParser
+
+    class AbstractTreeParser
+
+      def parseMethodResponse(str)
+	methodResponse_document(createCleanedTree(str))
+      end
+
+      def parseMethodCall(str)
+	methodCall_document(createCleanedTree(str))
+      end
+
+      private
+
+      #
+      # remove all whitespaces but in the tags i4, int, boolean....
+      # and all comments
+      #
+      def removeWhitespacesAndComments(node)
+	remove = []
+	childs = node.childNodes.to_a
+	childs.each do |nd|
+	  case _nodeType(nd)
+	  when :TEXT
+            # TODO: add nil?
+            unless %w(i4 int boolean string double dateTime.iso8601 base64).include? node.nodeName
+
+               if node.nodeName == "value" 
+                 if not node.childNodes.to_a.detect {|n| _nodeType(n) == :ELEMENT}.nil?
+                   remove << nd if nd.nodeValue.strip == "" 
+                 end
+               else
+                 remove << nd if nd.nodeValue.strip == ""
+               end
+	    end
+	  when :COMMENT
+	    remove << nd
+	  else
+	    removeWhitespacesAndComments(nd)
+	  end 
+	end
+
+	remove.each { |i| node.removeChild(i) }
+      end
+
+
+      def nodeMustBe(node, name)
+	cmp = case name
+	when Array 
+	  name.include?(node.nodeName)
+	when String
+	  name == node.nodeName
+	else
+	  raise "error"
+	end  
+
+	if not cmp then
+	  raise "wrong xml-rpc (name)"
+	end
+
+	node
+      end
+
+      #
+      # returns, when successfully the only child-node
+      #
+      def hasOnlyOneChild(node, name=nil)
+	if node.childNodes.to_a.size != 1
+	  raise "wrong xml-rpc (size)"
+	end
+	if name != nil then
+	  nodeMustBe(node.firstChild, name)
+	end
+      end
+
+
+      def assert(b)
+	if not b then
+	  raise "assert-fail" 
+	end
+      end
+
+      # the node `node` has empty string or string
+      def text_zero_one(node)
+	nodes = node.childNodes.to_a.size
+
+	if nodes == 1
+	  text(node.firstChild)
+	elsif nodes == 0
+	  ""
+	else
+	  raise "wrong xml-rpc (size)"
+	end
+      end
+     
+
+      def integer(node)
+	#TODO: check string for float because to_i returnsa
+	#      0 when wrong string
+	 nodeMustBe(node, %w(i4 int))    
+	hasOnlyOneChild(node)
+	
+	Convert.int(text(node.firstChild))
+      end
+
+      def boolean(node)
+	nodeMustBe(node, "boolean")    
+	hasOnlyOneChild(node)
+	
+        Convert.boolean(text(node.firstChild))
+      end
+
+      def v_nil(node)
+        nodeMustBe(node, "nil")
+	assert( node.childNodes.to_a.size == 0 )
+        nil
+      end
+
+      def string(node)
+	nodeMustBe(node, "string")    
+	text_zero_one(node)
+      end
+
+      def double(node)
+	#TODO: check string for float because to_f returnsa
+	#      0.0 when wrong string
+	nodeMustBe(node, "double")    
+	hasOnlyOneChild(node)
+	
+	Convert.double(text(node.firstChild))
+      end
+
+      def dateTime(node)
+	nodeMustBe(node, "dateTime.iso8601")
+	hasOnlyOneChild(node)
+	
+        Convert.dateTime( text(node.firstChild) )
+      end
+
+      def base64(node)
+	nodeMustBe(node, "base64")
+	#hasOnlyOneChild(node)
+	 
+        Convert.base64(text_zero_one(node))
+      end
+
+      def member(node)
+	nodeMustBe(node, "member")
+	assert( node.childNodes.to_a.size == 2 ) 
+
+	[ name(node[0]), value(node[1]) ]
+      end
+
+      def name(node)
+	nodeMustBe(node, "name")
+	#hasOnlyOneChild(node)
+	text_zero_one(node) 
+      end
+
+      def array(node)
+	nodeMustBe(node, "array")
+	hasOnlyOneChild(node, "data") 
+	data(node.firstChild)  
+      end
+
+      def data(node)
+	nodeMustBe(node, "data")
+
+	node.childNodes.to_a.collect do |val|
+	  value(val)
+	end 
+      end
+
+      def param(node)
+	nodeMustBe(node, "param")
+	hasOnlyOneChild(node, "value")
+	value(node.firstChild) 
+      end
+ 
+      def methodResponse(node)
+	nodeMustBe(node, "methodResponse")
+	hasOnlyOneChild(node, %w(params fault))
+	child = node.firstChild
+
+	case child.nodeName
+	when "params"
+	  [ true, params(child,false) ] 
+	when "fault"
+	  [ false, fault(child) ]
+	else
+	  raise "unexpected error"
+	end
+
+      end
+
+      def methodName(node)
+	nodeMustBe(node, "methodName")
+	hasOnlyOneChild(node)
+	text(node.firstChild) 
+      end
+
+      def params(node, call=true)
+	nodeMustBe(node, "params")
+
+	if call 
+	  node.childNodes.to_a.collect do |n|
+	    param(n)
+	  end
+	else # response (only one param)
+	  hasOnlyOneChild(node)
+	  param(node.firstChild)
+	end
+      end
+
+      def fault(node)
+	nodeMustBe(node, "fault")
+	hasOnlyOneChild(node, "value")
+	f = value(node.firstChild) 
+        Convert.fault(f)
+      end
+
+
+
+      # _nodeType is defined in the subclass
+      def text(node)
+	assert( _nodeType(node) == :TEXT )
+	assert( node.hasChildNodes == false )
+	assert( node.nodeValue != nil )
+
+	node.nodeValue.to_s
+      end
+
+      def struct(node)
+	nodeMustBe(node, "struct")    
+
+	hash = {}
+	node.childNodes.to_a.each do |me|
+	  n, v = member(me)  
+	  hash[n] = v
+	end 
+
+        Convert.struct(hash)
+     end
+
+
+      def value(node)
+	nodeMustBe(node, "value")
+	nodes = node.childNodes.to_a.size
+        if nodes == 0 
+          return ""
+        elsif nodes > 1 
+	  raise "wrong xml-rpc (size)"
+        end
+
+	child = node.firstChild
+
+	case _nodeType(child)
+	when :TEXT
+          text_zero_one(node)
+	when :ELEMENT
+	  case child.nodeName
+	  when "i4", "int"        then integer(child)
+	  when "boolean"          then boolean(child)
+	  when "string"           then string(child)
+	  when "double"           then double(child)
+	  when "dateTime.iso8601" then dateTime(child)
+	  when "base64"           then base64(child)
+	  when "struct"           then struct(child)
+	  when "array"            then array(child) 
+          when "nil"              
+            if Config::ENABLE_NIL_PARSER
+              v_nil(child)
+            else
+              raise "wrong/unknown XML-RPC type 'nil'"
+            end
+	  else 
+	    raise "wrong/unknown XML-RPC type"
+	  end
+	else
+	  raise "wrong type of node"
+	end
+
+      end
+
+      def methodCall(node)
+	nodeMustBe(node, "methodCall")
+	assert( (1..2).include?( node.childNodes.to_a.size ) ) 
+	name = methodName(node[0])
+
+	if node.childNodes.to_a.size == 2 then
+	  pa = params(node[1])
+	else # no parameters given
+	  pa = []
+	end
+	[name, pa]
+      end
+
+    end # module TreeParserMixin
+
+    class AbstractStreamParser
+      def parseMethodResponse(str)
+        parser = @parser_class.new
+        parser.parse(str)
+        raise "No valid method response!" if parser.method_name != nil
+        if parser.fault != nil
+          # is a fault structure
+          [false, parser.fault] 
+        else
+          # is a normal return value
+          raise "Missing return value!" if parser.params.size == 0
+          raise "Too many return values. Only one allowed!" if parser.params.size > 1
+          [true, parser.params[0]]
+        end
+      end
+
+      def parseMethodCall(str)
+        parser = @parser_class.new
+        parser.parse(str)
+        raise "No valid method call - missing method name!" if parser.method_name.nil?
+        [parser.method_name, parser.params]
+      end
+    end
+
+    module StreamParserMixin
+      attr_reader :params
+      attr_reader :method_name
+      attr_reader :fault
+
+      def initialize(*a)
+        super(*a)
+        @params = []
+        @values = []
+        @val_stack = []
+
+        @names = []
+        @name = []
+
+        @structs = []
+        @struct = {}
+
+        @method_name = nil
+        @fault = nil
+
+        @data = nil
+      end
+
+      def startElement(name, attrs=[])
+        @data = nil
+        case name
+        when "value"
+          @value = nil
+        when "nil"
+          raise "wrong/unknown XML-RPC type 'nil'" unless Config::ENABLE_NIL_PARSER
+          @value = :nil 
+        when "array"
+          @val_stack << @values
+          @values = []
+        when "struct"
+          @names << @name
+          @name = []
+
+          @structs << @struct
+          @struct = {} 
+        end
+      end
+
+      def endElement(name)
+        @data ||= ""
+        case name
+        when "string"
+          @value = @data
+        when "i4", "int"
+          @value = Convert.int(@data)
+        when "boolean"
+          @value = Convert.boolean(@data)
+        when "double"
+          @value = Convert.double(@data)
+        when "dateTime.iso8601"
+          @value = Convert.dateTime(@data)
+        when "base64"
+          @value = Convert.base64(@data)
+        when "value"
+          @value = @data if @value.nil?
+          @values << (@value == :nil ? nil : @value) 
+        when "array"
+          @value = @values
+          @values = @val_stack.pop
+        when "struct"
+          @value = Convert.struct(@struct)
+
+          @name = @names.pop
+          @struct = @structs.pop
+        when "name"
+          @name[0] = @data 
+        when "member"
+          @struct[@name[0]] = @values.pop 
+
+        when "param"
+          @params << @values[0]
+          @values = []
+
+        when "fault"
+          @fault = Convert.fault(@values[0])
+
+        when "methodName"
+          @method_name = @data 
+        end
+
+        @data = nil
+      end
+
+      def character(data)
+        if @data
+          @data << data
+        else
+          @data = data
+        end
+      end
+
+    end # module StreamParserMixin
+
+    # ---------------------------------------------------------------------------
+    class XMLStreamParser < AbstractStreamParser
+      def initialize
+        require "xmlparser"
+        @parser_class = Class.new(::XMLParser) {
+          include StreamParserMixin
+        }
+      end
+    end # class XMLStreamParser
+    # ---------------------------------------------------------------------------
+    class NQXMLStreamParser < AbstractStreamParser
+      def initialize
+        require "nqxml/streamingparser"
+        @parser_class = XMLRPCParser
+      end
+
+      class XMLRPCParser 
+        include StreamParserMixin
+
+        def parse(str)
+          parser = NQXML::StreamingParser.new(str)
+          parser.each do |ele|
+            case ele
+            when NQXML::Text
+              @data = ele.text
+              #character(ele.text)
+            when NQXML::Tag
+              if ele.isTagEnd
+                endElement(ele.name)
+              else
+                startElement(ele.name, ele.attrs)
+              end
+            end
+          end # do
+        end # method parse
+      end # class XMLRPCParser
+
+    end # class NQXMLStreamParser
+    # ---------------------------------------------------------------------------
+    class XMLTreeParser < AbstractTreeParser
+
+      def initialize
+        require "xmltreebuilder"
+
+        # The new XMLParser library (0.6.2+) uses a slightly different DOM implementation. 
+        # The following code removes the differences between both versions.
+        if defined? XML::DOM::Builder 
+          return if defined? XML::DOM::Node::DOCUMENT # code below has been already executed
+          klass = XML::DOM::Node
+          klass.const_set("DOCUMENT", klass::DOCUMENT_NODE)
+          klass.const_set("TEXT", klass::TEXT_NODE)
+          klass.const_set("COMMENT", klass::COMMENT_NODE)
+          klass.const_set("ELEMENT", klass::ELEMENT_NODE)
+        end
+      end
+
+      private
+
+      def _nodeType(node)
+	tp = node.nodeType
+	if tp == XML::SimpleTree::Node::TEXT then :TEXT
+	elsif tp == XML::SimpleTree::Node::COMMENT then :COMMENT 
+	elsif tp == XML::SimpleTree::Node::ELEMENT then :ELEMENT 
+	else :ELSE
+	end
+      end
+
+
+      def methodResponse_document(node)
+	assert( node.nodeType == XML::SimpleTree::Node::DOCUMENT )
+	hasOnlyOneChild(node, "methodResponse")
+	
+	methodResponse(node.firstChild)
+      end
+
+      def methodCall_document(node)
+	assert( node.nodeType == XML::SimpleTree::Node::DOCUMENT )
+	hasOnlyOneChild(node, "methodCall")
+	
+	methodCall(node.firstChild)
+      end
+
+      def createCleanedTree(str)
+	doc = XML::SimpleTreeBuilder.new.parse(str)
+	doc.documentElement.normalize
+	removeWhitespacesAndComments(doc)
+	doc
+      end
+
+    end # class XMLParser
+    # ---------------------------------------------------------------------------
+    class NQXMLTreeParser < AbstractTreeParser
+
+      def initialize
+        require "nqxml/treeparser"
+      end
+
+      private
+
+      def _nodeType(node)
+	node.nodeType
+      end
+
+      def methodResponse_document(node)
+	methodResponse(node)
+      end
+
+      def methodCall_document(node)
+	methodCall(node)
+      end
+
+      def createCleanedTree(str)
+        doc = ::NQXML::TreeParser.new(str).document.rootNode 
+	removeWhitespacesAndComments(doc)
+	doc
+      end
+
+    end # class NQXMLTreeParser
+    # ---------------------------------------------------------------------------
+    class REXMLStreamParser < AbstractStreamParser
+      def initialize
+        require "rexml/document"
+        @parser_class = StreamListener
+      end
+
+      class StreamListener 
+        include StreamParserMixin
+
+        alias :tag_start :startElement
+        alias :tag_end :endElement
+        alias :text :character
+        alias :cdata :character
+
+        def method_missing(*a)
+          # ignore
+        end
+
+        def parse(str)
+          parser = REXML::Document.parse_stream(str, self)
+       end
+      end 
+
+    end
+    # ---------------------------------------------------------------------------
+    class XMLScanStreamParser < AbstractStreamParser
+      def initialize
+        require "xmlscan/parser"
+        @parser_class = XMLScanParser
+      end
+
+      class XMLScanParser
+        include StreamParserMixin
+
+        Entities = {
+          "lt"   => "<",
+          "gt"   => ">",
+          "amp"  => "&",
+          "quot" => '"',
+          "apos" => "'"
+        }
+
+        def parse(str)
+          parser  = XMLScan::XMLParser.new(self)
+          parser.parse(str)
+        end
+
+        alias :on_stag :startElement
+ 	alias :on_etag :endElement
+
+        def on_stag_end(name); end
+
+        def on_stag_end_empty(name)
+          startElement(name)
+          endElement(name)
+        end
+       
+        def on_chardata(str)
+          character(str)
+        end
+
+        def on_cdata(str)
+          character(str)
+        end
+
+        def on_entityref(ent)
+          str = Entities[ent]
+          if str
+            character(str)
+          else
+            raise "unknown entity"
+          end
+        end
+
+        def on_charref(code)
+          character(code.chr)
+        end
+
+        def on_charref_hex(code)
+          character(code.chr)
+        end
+
+        def method_missing(*a)
+        end
+
+        # TODO: call/implement?
+        # valid_name?
+        # valid_chardata?
+        # valid_char?
+        # parse_error  
+
+      end
+    end
+    # ---------------------------------------------------------------------------
+    XMLParser   = XMLTreeParser
+    NQXMLParser = NQXMLTreeParser
+
+    Classes = [XMLStreamParser, XMLTreeParser, 
+               NQXMLStreamParser, NQXMLTreeParser, 
+               REXMLStreamParser, XMLScanStreamParser]
+
+    # yields an instance of each installed parser
+    def self.each_installed_parser
+      XMLRPC::XMLParser::Classes.each do |klass|
+        begin
+          yield klass.new
+        rescue LoadError
+        end
+      end
+    end
+
+  end # module XMLParser
+
+
+end # module XMLRPC
+
diff --git a/ruby_1_8_6/lib/xmlrpc/server.rb b/ruby_1_8_6/lib/xmlrpc/server.rb
new file mode 100644
index 0000000000..59a5869408
--- /dev/null
+++ b/ruby_1_8_6/lib/xmlrpc/server.rb
@@ -0,0 +1,780 @@
+=begin
+= xmlrpc/server.rb
+Copyright (C) 2001, 2002, 2003, 2005 by Michael Neumann (mneumann@ntecs.de)
+
+Released under the same term of license as Ruby.
+
+= Classes
+* ((<XMLRPC::BasicServer>))
+* ((<XMLRPC::CGIServer>))
+* ((<XMLRPC::ModRubyServer>))
+* ((<XMLRPC::Server>))
+* ((<XMLRPC::WEBrickServlet>))
+
+= XMLRPC::BasicServer
+== Description
+Is the base class for all XML-RPC server-types (CGI, standalone).
+You can add handler and set a default handler. 
+Do not use this server, as this is/should be an abstract class.
+
+=== How the method to call is found
+The arity (number of accepted arguments) of a handler (method or (({Proc})) object) is 
+compared to the given arguments submitted by the client for a RPC ((-Remote Procedure Call-)). 
+A handler is only called if it accepts the number of arguments, otherwise the search 
+for another handler will go on. When at the end no handler was found, 
+the ((<default_handler|XMLRPC::BasicServer#set_default_handler>)) will be called.
+With this technique it is possible to do overloading by number of parameters, but
+only for (({Proc})) handler, because you cannot define two methods of the same name in
+the same class. 
+
+
+== Class Methods
+--- XMLRPC::BasicServer.new( class_delim="." )
+    Creates a new (({XMLRPC::BasicServer})) instance, which should not be 
+    done, because (({XMLRPC::BasicServer})) is an abstract class. This
+    method should be called from a subclass indirectly by a (({super})) call
+    in the method (({initialize})). The paramter ((|class_delim|)) is used
+    in ((<add_handler|XMLRPC::BasicServer#add_handler>)) when an object is
+    added as handler, to delimit the object-prefix and the method-name.
+
+== Instance Methods
+--- XMLRPC::BasicServer#add_handler( name, signature=nil, help=nil ) { aBlock }
+    Adds ((|aBlock|)) to the list of handlers, with ((|name|)) as the name of the method.
+    Parameters ((|signature|)) and ((|help|)) are used by the Introspection method if specified, 
+    where ((|signature|)) is either an Array containing strings each representing a type of it's 
+    signature (the first is the return value) or an Array of Arrays if the method has multiple 
+    signatures. Value type-names are "int, boolean, double, string, dateTime.iso8601, base64, array, struct".
+
+    Parameter ((|help|)) is a String with informations about how to call this method etc.
+
+    A handler method or code-block can return the types listed at
+    ((<XMLRPC::Client#call|URL:client.html#index:0>)). 
+    When a method fails, it can tell it the client by throwing an 
+    (({XMLRPC::FaultException})) like in this example:
+        s.add_handler("michael.div") do |a,b|
+          if b == 0
+            raise XMLRPC::FaultException.new(1, "division by zero")
+          else
+            a / b 
+          end
+        end 
+    The client gets in the case of (({b==0})) an object back of type
+    (({XMLRPC::FaultException})) that has a ((|faultCode|)) and ((|faultString|))
+    field.
+
+--- XMLRPC::BasicServer#add_handler( prefix, obj )
+    This is the second form of ((<add_handler|XMLRPC::BasicServer#add_handler>)).
+    To add an object write:
+        server.add_handler("michael", MyHandlerClass.new)
+    All public methods of (({MyHandlerClass})) are accessible to
+    the XML-RPC clients by (('michael."name of method"')). This is 
+    where the ((|class_delim|)) in ((<new|XMLRPC::BasicServer.new>)) 
+    has it's role, a XML-RPC method-name is defined by 
+    ((|prefix|)) + ((|class_delim|)) + (('"name of method"')). 
+
+--- XMLRPC::BasicServer#add_handler( interface, obj )
+    This is the third form of ((<add_handler|XMLRPC::BasicServer#add_handler>)).
+
+    Use (({XMLRPC::interface})) to generate an ServiceInterface object, which
+    represents an interface (with signature and help text) for a handler class.
+
+    Parameter ((|interface|)) must be of type (({XMLRPC::ServiceInterface})).
+    Adds all methods of ((|obj|)) which are defined in ((|interface|)) to the
+    server.
+
+    This is the recommended way of adding services to a server!
+
+
+--- XMLRPC::BasicServer#get_default_handler
+    Returns the default-handler, which is called when no handler for
+    a method-name is found.
+    It is a (({Proc})) object or (({nil})).
+
+--- XMLRPC::BasicServer#set_default_handler ( &handler )
+    Sets ((|handler|)) as the default-handler, which is called when 
+    no handler for a method-name is found. ((|handler|)) is a code-block.
+    The default-handler is called with the (XML-RPC) method-name as first argument, and
+    the other arguments are the parameters given by the client-call.
+  
+    If no block is specified the default of (({XMLRPC::BasicServer})) is used, which raises a
+    XMLRPC::FaultException saying "method missing".
+
+
+--- XMLRPC::BasicServer#set_writer( writer )
+    Sets the XML writer to use for generating XML output.
+    Should be an instance of a class from module (({XMLRPC::XMLWriter})).
+    If this method is not called, then (({XMLRPC::Config::DEFAULT_WRITER})) is used. 
+
+--- XMLRPC::BasicServer#set_parser( parser )
+    Sets the XML parser to use for parsing XML documents.
+    Should be an instance of a class from module (({XMLRPC::XMLParser})).
+    If this method is not called, then (({XMLRPC::Config::DEFAULT_PARSER})) is used.
+
+--- XMLRPC::BasicServer#add_introspection
+    Adds the introspection handlers "system.listMethods", "system.methodSignature" and "system.methodHelp", 
+    where only the first one works.
+
+--- XMLRPC::BasicServer#add_multicall
+    Adds the multi-call handler "system.multicall".
+
+--- XMLRPC::BasicServer#get_service_hook
+    Returns the service-hook, which is called on each service request (RPC) unless it's (({nil})).
+
+--- XMLRPC::BasicServer#set_service_hook ( &handler )
+    A service-hook is called for each service request (RPC).
+    You can use a service-hook for example to wrap existing methods and catch exceptions of them or
+    convert values to values recognized by XMLRPC. You can disable it by passing (({nil})) as parameter  
+    ((|handler|)) .
+
+    The service-hook is called with a (({Proc})) object and with the parameters for this (({Proc})).
+    An example:
+
+       server.set_service_hook {|obj, *args|
+         begin
+           ret = obj.call(*args)  # call the original service-method
+           # could convert the return value 
+         resuce
+           # rescue exceptions
+         end
+       }
+
+=end
+
+
+
+require "xmlrpc/parser"
+require "xmlrpc/create"
+require "xmlrpc/config"
+require "xmlrpc/utils"         # ParserWriterChooseMixin
+
+
+
+module XMLRPC
+
+
+class BasicServer
+
+  include ParserWriterChooseMixin
+  include ParseContentType
+
+  ERR_METHOD_MISSING        = 1 
+  ERR_UNCAUGHT_EXCEPTION    = 2
+  ERR_MC_WRONG_PARAM        = 3
+  ERR_MC_MISSING_PARAMS     = 4
+  ERR_MC_MISSING_METHNAME   = 5
+  ERR_MC_RECURSIVE_CALL     = 6
+  ERR_MC_WRONG_PARAM_PARAMS = 7
+  ERR_MC_EXPECTED_STRUCT    = 8
+
+
+  def initialize(class_delim=".")
+    @handler = []
+    @default_handler = nil 
+    @service_hook = nil
+
+    @class_delim = class_delim
+    @create = nil
+    @parser = nil
+
+    add_multicall     if Config::ENABLE_MULTICALL
+    add_introspection if Config::ENABLE_INTROSPECTION
+  end
+
+  def add_handler(prefix, obj_or_signature=nil, help=nil, &block)
+    if block_given?
+      # proc-handler
+      @handler << [prefix, block, obj_or_signature, help]   
+    else
+      if prefix.kind_of? String
+        # class-handler
+        raise ArgumentError, "Expected non-nil value" if obj_or_signature.nil?
+        @handler << [prefix + @class_delim, obj_or_signature]
+      elsif prefix.kind_of? XMLRPC::Service::BasicInterface
+        # class-handler with interface
+        # add all methods
+        @handler += prefix.get_methods(obj_or_signature, @class_delim)
+      else
+        raise ArgumentError, "Wrong type for parameter 'prefix'"
+      end
+    end
+    self
+  end
+
+  def get_service_hook
+    @service_hook
+  end
+
+  def set_service_hook(&handler)
+    @service_hook = handler
+    self
+  end
+ 
+  def get_default_handler
+    @default_handler
+  end
+
+  def set_default_handler (&handler)
+    @default_handler = handler
+    self
+  end  
+
+  def add_multicall
+    add_handler("system.multicall", %w(array array), "Multicall Extension") do |arrStructs|
+      unless arrStructs.is_a? Array 
+        raise XMLRPC::FaultException.new(ERR_MC_WRONG_PARAM, "system.multicall expects an array")
+      end
+
+      arrStructs.collect {|call|
+        if call.is_a? Hash
+          methodName = call["methodName"]
+          params     = call["params"]  
+
+          if params.nil?
+            multicall_fault(ERR_MC_MISSING_PARAMS, "Missing params")
+          elsif methodName.nil?
+            multicall_fault(ERR_MC_MISSING_METHNAME, "Missing methodName")
+          else
+            if methodName == "system.multicall"
+              multicall_fault(ERR_MC_RECURSIVE_CALL, "Recursive system.multicall forbidden")
+            else
+              unless params.is_a? Array
+                multicall_fault(ERR_MC_WRONG_PARAM_PARAMS, "Parameter params have to be an Array")
+              else
+                ok, val = call_method(methodName, *params)
+                if ok
+                  # correct return value
+                  [val]
+                else
+                  # exception
+                  multicall_fault(val.faultCode, val.faultString) 
+                end
+              end
+            end
+          end  
+           
+        else
+          multicall_fault(ERR_MC_EXPECTED_STRUCT, "system.multicall expected struct")
+        end
+      } 
+    end # end add_handler
+    self
+  end
+
+  def add_introspection
+    add_handler("system.listMethods",%w(array), "List methods available on this XML-RPC server") do
+      methods = []
+      @handler.each do |name, obj|
+        if obj.kind_of? Proc
+          methods << name
+        else
+          obj.methods.each {|meth| methods << name + meth}
+        end
+      end
+      methods
+    end
+
+    add_handler("system.methodSignature", %w(array string), "Returns method signature") do |meth|
+      sigs = []
+      @handler.each do |name, obj, sig|
+        if obj.kind_of? Proc and sig != nil and name == meth
+          if sig[0].kind_of? Array
+            # sig contains multiple signatures, e.g. [["array"], ["array", "string"]]
+            sig.each {|s| sigs << s}
+          else
+            # sig is a single signature, e.g. ["array"]
+            sigs << sig 
+          end
+        end
+      end
+      sigs.uniq! || sigs  # remove eventually duplicated signatures
+    end
+
+    add_handler("system.methodHelp", %w(string string), "Returns help on using this method") do |meth|
+      help = nil 
+      @handler.each do |name, obj, sig, hlp|
+        if obj.kind_of? Proc and name == meth 
+          help = hlp
+          break      
+        end
+      end
+      help || ""
+    end
+
+    self
+  end
+
+
+  
+  def process(data)
+    method, params = parser().parseMethodCall(data) 
+    handle(method, *params)
+  end
+ 
+  private # --------------------------------------------------------------
+
+  def multicall_fault(nr, str)
+    {"faultCode" => nr, "faultString" => str}
+  end
+ 
+  #
+  # method dispatch
+  #
+  def dispatch(methodname, *args)
+    for name, obj in @handler
+      if obj.kind_of? Proc
+        next unless methodname == name
+      else
+        next unless methodname =~ /^#{name}(.+)$/
+        next unless obj.respond_to? $1
+        obj = obj.method($1)
+      end
+
+      if check_arity(obj, args.size)
+        if @service_hook.nil?
+          return obj.call(*args) 
+        else
+          return @service_hook.call(obj, *args)
+        end
+      end
+    end 
+ 
+    if @default_handler.nil?
+      raise XMLRPC::FaultException.new(ERR_METHOD_MISSING, "Method #{methodname} missing or wrong number of parameters!")
+    else
+      @default_handler.call(methodname, *args) 
+    end
+  end
+
+
+  #
+  # returns true, if the arity of "obj" matches
+  #
+  def check_arity(obj, n_args)
+    ary = obj.arity
+
+    if ary >= 0
+      n_args == ary
+    else
+      n_args >= (ary+1).abs 
+    end
+  end
+
+
+
+  def call_method(methodname, *args)
+    begin
+      [true, dispatch(methodname, *args)]
+    rescue XMLRPC::FaultException => e  
+      [false, e]  
+    rescue Exception => e
+      [false, XMLRPC::FaultException.new(ERR_UNCAUGHT_EXCEPTION, "Uncaught exception #{e.message} in method #{methodname}")]
+    end
+  end
+
+  #
+  #
+  #
+  def handle(methodname, *args)
+    create().methodResponse(*call_method(methodname, *args))
+  end
+
+
+end
+
+
+=begin
+= XMLRPC::CGIServer
+== Synopsis
+    require "xmlrpc/server"
+ 
+    s = XMLRPC::CGIServer.new     
+
+    s.add_handler("michael.add") do |a,b|
+      a + b
+    end
+
+    s.add_handler("michael.div") do |a,b|
+      if b == 0
+        raise XMLRPC::FaultException.new(1, "division by zero")
+      else
+        a / b 
+      end
+    end 
+
+    s.set_default_handler do |name, *args|
+      raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
+                                       " or wrong number of parameters!")
+    end
+  
+    s.serve
+
+== Description
+Implements a CGI-based XML-RPC server.
+
+== Superclass
+((<XMLRPC::BasicServer>))
+
+== Class Methods
+--- XMLRPC::CGIServer.new( *a )
+    Creates a new (({XMLRPC::CGIServer})) instance. All parameters given
+    are by-passed to ((<XMLRPC::BasicServer.new>)). You can only create 
+    ((*one*)) (({XMLRPC::CGIServer})) instance, because more than one makes
+    no sense.
+
+== Instance Methods
+--- XMLRPC::CGIServer#serve
+    Call this after you have added all you handlers to the server.
+    This method processes a XML-RPC methodCall and sends the answer
+    back to the client. 
+    Make sure that you don't write to standard-output in a handler, or in
+    any other part of your program, this would case a CGI-based server to fail!
+=end
+
+class CGIServer < BasicServer
+  @@obj = nil
+
+  def CGIServer.new(*a)
+    @@obj = super(*a) if @@obj.nil?
+    @@obj
+  end
+
+  def initialize(*a)
+    super(*a)
+  end
+  
+  def serve
+    catch(:exit_serve) {
+      length = ENV['CONTENT_LENGTH'].to_i
+
+      http_error(405, "Method Not Allowed") unless ENV['REQUEST_METHOD'] == "POST" 
+      http_error(400, "Bad Request")        unless parse_content_type(ENV['CONTENT_TYPE']).first == "text/xml"
+      http_error(411, "Length Required")    unless length > 0 
+
+      # TODO: do we need a call to binmode?
+      $stdin.binmode if $stdin.respond_to? :binmode
+      data = $stdin.read(length)
+
+      http_error(400, "Bad Request")        if data.nil? or data.size != length
+
+      http_write(process(data), "Content-type" => "text/xml; charset=utf-8")
+    }
+  end
+
+
+  private
+
+  def http_error(status, message)
+    err = "#{status} #{message}"
+    msg = <<-"MSGEND" 
+      <html>
+        <head>
+          <title>#{err}</title>
+        </head>
+        <body>
+          <h1>#{err}</h1>
+          <p>Unexpected error occured while processing XML-RPC request!</p>
+        </body>
+      </html>
+    MSGEND
+
+    http_write(msg, "Status" => err, "Content-type" => "text/html")
+    throw :exit_serve # exit from the #serve method
+  end
+
+  def http_write(body, header)
+    h = {}
+    header.each {|key, value| h[key.to_s.capitalize] = value}
+    h['Status']         ||= "200 OK"
+    h['Content-length'] ||= body.size.to_s 
+
+    str = ""
+    h.each {|key, value| str << "#{key}: #{value}\r\n"}
+    str << "\r\n#{body}"
+
+    print str
+  end
+
+end
+
+=begin
+= XMLRPC::ModRubyServer
+== Description
+Implements a XML-RPC server, which works with Apache mod_ruby.
+
+Use it in the same way as CGIServer!
+
+== Superclass
+((<XMLRPC::BasicServer>))
+=end 
+
+class ModRubyServer < BasicServer
+
+  def initialize(*a)
+    @ap = Apache::request
+    super(*a)
+  end
+
+  def serve
+    catch(:exit_serve) {
+      header = {}
+      @ap.headers_in.each {|key, value| header[key.capitalize] = value}
+
+      length = header['Content-length'].to_i
+
+      http_error(405, "Method Not Allowed") unless @ap.request_method  == "POST" 
+      http_error(400, "Bad Request")        unless parse_content_type(header['Content-type']).first == "text/xml"
+      http_error(411, "Length Required")    unless length > 0 
+
+      # TODO: do we need a call to binmode?
+      @ap.binmode
+      data = @ap.read(length)
+
+      http_error(400, "Bad Request")        if data.nil? or data.size != length
+
+      http_write(process(data), 200, "Content-type" => "text/xml; charset=utf-8")
+    }
+  end
+
+
+  private
+
+  def http_error(status, message)
+    err = "#{status} #{message}"
+    msg = <<-"MSGEND" 
+      <html>
+        <head>
+          <title>#{err}</title>
+        </head>
+        <body>
+          <h1>#{err}</h1>
+          <p>Unexpected error occured while processing XML-RPC request!</p>
+        </body>
+      </html>
+    MSGEND
+
+    http_write(msg, status, "Status" => err, "Content-type" => "text/html")
+    throw :exit_serve # exit from the #serve method
+  end
+
+  def http_write(body, status, header)
+    h = {}
+    header.each {|key, value| h[key.to_s.capitalize] = value}
+    h['Status']         ||= "200 OK"
+    h['Content-length'] ||= body.size.to_s 
+
+    h.each {|key, value| @ap.headers_out[key] = value }
+    @ap.content_type = h["Content-type"] 
+    @ap.status = status.to_i 
+    @ap.send_http_header 
+
+    @ap.print body
+  end
+
+end
+
+=begin
+= XMLRPC::Server
+== Synopsis
+    require "xmlrpc/server"
+ 
+    s = XMLRPC::Server.new(8080) 
+
+    s.add_handler("michael.add") do |a,b|
+      a + b
+    end
+
+    s.add_handler("michael.div") do |a,b|
+      if b == 0
+        raise XMLRPC::FaultException.new(1, "division by zero")
+      else
+        a / b 
+      end
+    end 
+
+    s.set_default_handler do |name, *args|
+      raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
+                                       " or wrong number of parameters!")
+    end
+ 
+    s.serve
+
+== Description
+Implements a standalone XML-RPC server. The method (({serve}))) is left if a SIGHUP is sent to the
+program.
+
+== Superclass
+((<XMLRPC::WEBrickServlet>))
+
+== Class Methods
+--- XMLRPC::Server.new( port=8080, host="127.0.0.1", maxConnections=4, stdlog=$stdout, audit=true, debug=true, *a )
+    Creates a new (({XMLRPC::Server})) instance, which is a XML-RPC server listening on
+    port ((|port|)) and accepts requests for the host ((|host|)), which is by default only the localhost. 
+    The server is not started, to start it you have to call ((<serve|XMLRPC::Server#serve>)).
+
+    Parameters ((|audit|)) and ((|debug|)) are obsolete!
+
+    All additionally given parameters in ((|*a|)) are by-passed to ((<XMLRPC::BasicServer.new>)). 
+    
+== Instance Methods
+--- XMLRPC::Server#serve
+    Call this after you have added all you handlers to the server.
+    This method starts the server to listen for XML-RPC requests and answer them.
+
+--- XMLRPC::Server#shutdown
+    Stops and shuts the server down.
+    
+=end
+
+class WEBrickServlet < BasicServer; end # forward declaration
+
+class Server < WEBrickServlet
+
+  def initialize(port=8080, host="127.0.0.1", maxConnections=4, stdlog=$stdout, audit=true, debug=true, *a)
+    super(*a)
+    require 'webrick'
+    @server = WEBrick::HTTPServer.new(:Port => port, :BindAddress => host, :MaxClients => maxConnections, 
+                                      :Logger => WEBrick::Log.new(stdlog))
+    @server.mount("/", self)
+  end
+  
+  def serve
+    if RUBY_PLATFORM =~ /mingw|mswin32/
+      signal = 1
+    else
+      signal = "HUP"
+    end
+    trap(signal) { @server.shutdown }
+
+    @server.start
+  end
+  
+  def shutdown
+    @server.shutdown
+  end
+ 
+end
+
+=begin
+= XMLRPC::WEBrickServlet
+== Synopsis
+
+    require "webrick"
+    require "xmlrpc/server"
+
+    s = XMLRPC::WEBrickServlet.new
+    s.add_handler("michael.add") do |a,b|
+      a + b
+    end
+
+    s.add_handler("michael.div") do |a,b|
+      if b == 0
+        raise XMLRPC::FaultException.new(1, "division by zero")
+      else
+        a / b 
+      end
+    end 
+
+    s.set_default_handler do |name, *args|
+      raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
+                                       " or wrong number of parameters!")
+    end
+
+    httpserver = WEBrick::HTTPServer.new(:Port => 8080)    
+    httpserver.mount("/RPC2", s)
+    trap("HUP") { httpserver.shutdown }   # use 1 instead of "HUP" on Windows
+    httpserver.start
+
+== Instance Methods
+
+--- XMLRPC::WEBrickServlet#set_valid_ip( *ip_addr )
+    Specifies the valid IP addresses that are allowed to connect to the server.
+    Each IP is either a (({String})) or a (({Regexp})).
+
+--- XMLRPC::WEBrickServlet#get_valid_ip
+    Return the via method ((<set_valid_ip|XMLRPC::Server#set_valid_ip>)) specified
+    valid IP addresses.
+ 
+== Description
+Implements a servlet for use with WEBrick, a pure Ruby (HTTP-) server framework.
+
+== Superclass
+((<XMLRPC::BasicServer>))
+
+=end
+
+class WEBrickServlet < BasicServer
+  def initialize(*a)
+    super
+    require "webrick/httpstatus"
+    @valid_ip = nil
+  end
+
+  # deprecated from WEBrick/1.2.2. 
+  # but does not break anything.
+  def require_path_info?
+    false 
+  end
+
+  def get_instance(config, *options)
+    # TODO: set config & options
+    self
+  end
+
+  def set_valid_ip(*ip_addr)
+    if ip_addr.size == 1 and ip_addr[0].nil?
+      @valid_ip = nil
+    else
+      @valid_ip = ip_addr
+    end
+  end
+
+  def get_valid_ip
+    @valid_ip
+  end
+
+  def service(request, response)
+
+    if @valid_ip 
+      raise WEBrick::HTTPStatus::Forbidden unless @valid_ip.any? { |ip| request.peeraddr[3] =~ ip }
+    end
+
+    if request.request_method != "POST"
+      raise WEBrick::HTTPStatus::MethodNotAllowed,
+            "unsupported method `#{request.request_method}'."
+    end
+
+    if parse_content_type(request['Content-type']).first != "text/xml" 
+      raise WEBrick::HTTPStatus::BadRequest
+    end 
+
+    length = (request['Content-length'] || 0).to_i
+
+    raise WEBrick::HTTPStatus::LengthRequired unless length > 0
+
+    data = request.body
+
+    if data.nil? or data.size != length
+      raise WEBrick::HTTPStatus::BadRequest
+    end
+
+    resp = process(data)
+    if resp.nil? or resp.size <= 0  
+      raise WEBrick::HTTPStatus::InternalServerError
+    end
+
+    response.status = 200
+    response['Content-Length'] = resp.size
+    response['Content-Type']   = "text/xml; charset=utf-8"
+    response.body = resp 
+  end
+end
+
+
+end # module XMLRPC
+
+
+=begin
+= History
+    $Id$    
+=end
+
diff --git a/ruby_1_8_6/lib/xmlrpc/utils.rb b/ruby_1_8_6/lib/xmlrpc/utils.rb
new file mode 100644
index 0000000000..85c6bba372
--- /dev/null
+++ b/ruby_1_8_6/lib/xmlrpc/utils.rb
@@ -0,0 +1,165 @@
+#
+# Defines ParserWriterChooseMixin, which makes it possible to choose a
+# different XML writer and/or XML parser then the default one.
+# The Mixin is used in client.rb (class Client) and server.rb (class 
+# BasicServer)
+# 
+# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
+#
+# $Id$ 
+#
+
+module XMLRPC
+
+  #
+  # This module enables a user-class to be marshalled
+  # by XML-RPC for Ruby into a Hash, with one additional
+  # key/value pair "___class___" => ClassName
+  # 
+  module Marshallable
+  end
+
+
+  module ParserWriterChooseMixin
+
+    def set_writer(writer)
+      @create = Create.new(writer)
+      self
+    end
+
+    def set_parser(parser)
+      @parser = parser
+      self
+    end
+
+    private
+
+    def create
+      # if set_writer was not already called then call it now
+      if @create.nil? then
+	set_writer(Config::DEFAULT_WRITER.new)
+      end
+      @create
+    end
+
+    def parser
+      # if set_parser was not already called then call it now
+      if @parser.nil? then
+	set_parser(Config::DEFAULT_PARSER.new)
+      end
+      @parser
+    end
+
+  end # module ParserWriterChooseMixin
+
+
+  module Service
+
+  #
+  # base class for Service Interface definitions, used
+  # by BasicServer#add_handler
+  #
+
+  class BasicInterface
+    attr_reader :prefix, :methods
+
+    def initialize(prefix)
+      @prefix = prefix
+      @methods = []
+    end
+
+    def add_method(sig, help=nil, meth_name=nil)
+      mname = nil
+      sig = [sig] if sig.kind_of? String
+
+      sig = sig.collect do |s| 
+        name, si = parse_sig(s)
+        raise "Wrong signatures!" if mname != nil and name != mname 
+        mname = name
+        si
+      end
+
+      @methods << [mname, meth_name || mname, sig, help]
+    end
+
+    private # ---------------------------------
+  
+    def parse_sig(sig)
+      # sig is a String
+      if sig =~ /^\s*(\w+)\s+([^(]+)(\(([^)]*)\))?\s*$/
+        params = [$1]
+        name   = $2.strip 
+        $4.split(",").each {|i| params << i.strip} if $4 != nil
+        return name, params
+      else
+        raise "Syntax error in signature"
+      end
+    end
+
+  end # class BasicInterface
+
+  #
+  # class which wraps a Service Interface definition, used
+  # by BasicServer#add_handler
+  #
+  class Interface < BasicInterface
+    def initialize(prefix, &p)
+      raise "No interface specified" if p.nil?
+      super(prefix)
+      instance_eval(&p)
+    end
+
+    def get_methods(obj, delim=".") 
+      prefix = @prefix + delim
+      @methods.collect { |name, meth, sig, help| 
+        [prefix + name, obj.method(meth).to_proc, sig, help] 
+      }
+    end
+
+    private # ---------------------------------
+
+    def meth(*a)
+      add_method(*a)
+    end
+
+  end # class Interface
+
+  class PublicInstanceMethodsInterface < BasicInterface
+    def initialize(prefix)
+      super(prefix)
+    end
+
+    def get_methods(obj, delim=".")
+      prefix = @prefix + delim
+      obj.class.public_instance_methods(false).collect { |name|
+        [prefix + name, obj.method(name).to_proc, nil, nil] 
+      }
+    end
+  end
+
+
+  end # module Service
+
+
+  # 
+  # short-form to create a Service::Interface
+  #
+  def self.interface(prefix, &p)
+    Service::Interface.new(prefix, &p)  
+  end
+
+  # short-cut for creating a PublicInstanceMethodsInterface
+  def self.iPIMethods(prefix)
+    Service::PublicInstanceMethodsInterface.new(prefix) 
+  end
+
+
+  module ParseContentType
+    def parse_content_type(str)
+      a, *b = str.split(";")
+      return a.strip, *b
+    end
+  end
+
+end # module XMLRPC
+
diff --git a/ruby_1_8_6/lib/xsd/charset.rb b/ruby_1_8_6/lib/xsd/charset.rb
new file mode 100644
index 0000000000..15d5500fce
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/charset.rb
@@ -0,0 +1,187 @@
+# XSD4R - Charset handling library.
+# Copyright (C) 2001, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module XSD
+
+
+module Charset
+  @internal_encoding = $KCODE
+
+  class XSDError < StandardError; end
+  class CharsetError < XSDError; end
+  class UnknownCharsetError < CharsetError; end
+  class CharsetConversionError < CharsetError; end
+
+public
+
+  ###
+  ## Maps
+  #
+  EncodingConvertMap = {}
+  def Charset.init
+    EncodingConvertMap[['UTF8', 'X_ISO8859_1']] =
+      Proc.new { |str| str.unpack('U*').pack('C*') }
+    EncodingConvertMap[['X_ISO8859_1', 'UTF8']] =
+      Proc.new { |str| str.unpack('C*').pack('U*') }
+    begin
+      require 'xsd/iconvcharset'
+      @internal_encoding = 'UTF8'
+      sjtag = (/(mswin|bccwin|mingw|cygwin|emx)/ =~ RUBY_PLATFORM) ? 'cp932' :
+        'shift_jis'
+      EncodingConvertMap[['UTF8', 'EUC' ]] =
+        Proc.new { |str| IconvCharset.safe_iconv("euc-jp", "utf-8", str) }
+      EncodingConvertMap[['EUC' , 'UTF8']] =
+        Proc.new { |str| IconvCharset.safe_iconv("utf-8", "euc-jp", str) }
+      EncodingConvertMap[['EUC' , 'SJIS']] =
+        Proc.new { |str| IconvCharset.safe_iconv(sjtag, "euc-jp", str) }
+      EncodingConvertMap[['UTF8', 'SJIS']] =
+        Proc.new { |str| IconvCharset.safe_iconv(sjtag, "utf-8", str) }
+      EncodingConvertMap[['SJIS', 'UTF8']] =
+        Proc.new { |str| IconvCharset.safe_iconv("utf-8", sjtag, str) }
+      EncodingConvertMap[['SJIS', 'EUC' ]] =
+        Proc.new { |str| IconvCharset.safe_iconv("euc-jp", sjtag, str) }
+    rescue LoadError
+      begin
+       	require 'nkf'
+	EncodingConvertMap[['EUC' , 'SJIS']] =
+          Proc.new { |str| NKF.nkf('-sXm0', str) }
+	EncodingConvertMap[['SJIS', 'EUC' ]] =
+          Proc.new { |str| NKF.nkf('-eXm0', str) }
+      rescue LoadError
+      end
+  
+      begin
+	require 'uconv'
+	@internal_encoding = 'UTF8'
+	EncodingConvertMap[['UTF8', 'EUC' ]] = Uconv.method(:u8toeuc)
+	EncodingConvertMap[['UTF8', 'SJIS']] = Uconv.method(:u8tosjis)
+	EncodingConvertMap[['EUC' , 'UTF8']] = Uconv.method(:euctou8)
+	EncodingConvertMap[['SJIS', 'UTF8']] = Uconv.method(:sjistou8)
+      rescue LoadError
+      end
+    end
+  end
+  self.init
+
+  CharsetMap = {
+    'NONE' => 'us-ascii',
+    'EUC' => 'euc-jp',
+    'SJIS' => 'shift_jis',
+    'UTF8' => 'utf-8',
+    'X_ISO_8859_1' => 'iso-8859-1',
+    'X_UNKNOWN' => nil,
+  }
+
+
+  ###
+  ## handlers
+  #
+  def Charset.encoding
+    @internal_encoding
+  end
+
+  def Charset.encoding=(encoding)
+    warn("xsd charset is set to #{encoding}") if $DEBUG
+    @internal_encoding = encoding
+  end
+
+  def Charset.xml_encoding_label
+    charset_label(@internal_encoding)
+  end
+
+  def Charset.encoding_to_xml(str, charset)
+    encoding_conv(str, @internal_encoding, charset_str(charset))
+  end
+
+  def Charset.encoding_from_xml(str, charset)
+    encoding_conv(str, charset_str(charset), @internal_encoding)
+  end
+
+  def Charset.encoding_conv(str, enc_from, enc_to)
+    if enc_from == enc_to or enc_from == 'NONE' or enc_to == 'NONE'
+      str
+    elsif converter = EncodingConvertMap[[enc_from, enc_to]]
+      converter.call(str)
+    else
+      raise CharsetConversionError.new(
+	"Converter not found: #{enc_from} -> #{enc_to}")
+    end
+  end
+
+  def Charset.charset_label(encoding)
+    CharsetMap[encoding.upcase]
+  end
+
+  def Charset.charset_str(label)
+    if CharsetMap.respond_to?(:key)
+      CharsetMap.key(label.downcase) || 'X_UNKNOWN'
+    else
+      CharsetMap.index(label.downcase) || 'X_UNKNOWN'
+    end
+  end
+
+  # us_ascii = '[\x00-\x7F]'
+  us_ascii = '[\x9\xa\xd\x20-\x7F]'	# XML 1.0 restricted.
+  USASCIIRegexp = Regexp.new("\\A#{us_ascii}*\\z", nil, "NONE")
+
+  twobytes_euc = '(?:[\x8E\xA1-\xFE][\xA1-\xFE])'
+  threebytes_euc = '(?:\x8F[\xA1-\xFE][\xA1-\xFE])'
+  character_euc = "(?:#{us_ascii}|#{twobytes_euc}|#{threebytes_euc})"
+  EUCRegexp = Regexp.new("\\A#{character_euc}*\\z", nil, "NONE")
+
+  # onebyte_sjis = '[\x00-\x7F\xA1-\xDF]'
+  onebyte_sjis = '[\x9\xa\xd\x20-\x7F\xA1-\xDF]'	# XML 1.0 restricted.
+  twobytes_sjis = '(?:[\x81-\x9F\xE0-\xFC][\x40-\x7E\x80-\xFC])'
+  character_sjis = "(?:#{onebyte_sjis}|#{twobytes_sjis})"
+  SJISRegexp = Regexp.new("\\A#{character_sjis}*\\z", nil, "NONE")
+
+  # 0xxxxxxx
+  # 110yyyyy 10xxxxxx
+  twobytes_utf8 = '(?:[\xC0-\xDF][\x80-\xBF])'
+  # 1110zzzz 10yyyyyy 10xxxxxx
+  threebytes_utf8 = '(?:[\xE0-\xEF][\x80-\xBF][\x80-\xBF])'
+  # 11110uuu 10uuuzzz 10yyyyyy 10xxxxxx
+  fourbytes_utf8 = '(?:[\xF0-\xF7][\x80-\xBF][\x80-\xBF][\x80-\xBF])'
+  character_utf8 =
+    "(?:#{us_ascii}|#{twobytes_utf8}|#{threebytes_utf8}|#{fourbytes_utf8})"
+  UTF8Regexp = Regexp.new("\\A#{character_utf8}*\\z", nil, "NONE")
+
+  def Charset.is_us_ascii(str)
+    USASCIIRegexp =~ str
+  end
+
+  def Charset.is_utf8(str)
+    UTF8Regexp =~ str
+  end
+
+  def Charset.is_euc(str)
+    EUCRegexp =~ str
+  end
+
+  def Charset.is_sjis(str)
+    SJISRegexp =~ str
+  end
+
+  def Charset.is_ces(str, code = $KCODE)
+    case code
+    when 'NONE'
+      is_us_ascii(str)
+    when 'UTF8'
+      is_utf8(str)
+    when 'EUC'
+      is_euc(str)
+    when 'SJIS'
+      is_sjis(str)
+    else
+      raise UnknownCharsetError.new("Unknown charset: #{code}")
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/xsd/codegen.rb b/ruby_1_8_6/lib/xsd/codegen.rb
new file mode 100644
index 0000000000..d820ebf1f2
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/codegen.rb
@@ -0,0 +1,12 @@
+# XSD4R - Generating code library
+# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/codegen/gensupport'
+require 'xsd/codegen/moduledef'
+require 'xsd/codegen/classdef'
+require 'xsd/codegen/methoddef'
diff --git a/ruby_1_8_6/lib/xsd/codegen/classdef.rb b/ruby_1_8_6/lib/xsd/codegen/classdef.rb
new file mode 100644
index 0000000000..9eb1ce6607
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/codegen/classdef.rb
@@ -0,0 +1,203 @@
+# XSD4R - Generating class definition code
+# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/codegen/gensupport'
+require 'xsd/codegen/moduledef'
+require 'xsd/codegen/methoddef'
+
+
+module XSD
+module CodeGen
+
+
+class ClassDef < ModuleDef
+  include GenSupport
+
+  def initialize(name, baseclass = nil)
+    super(name)
+    @baseclass = baseclass
+    @classvar = []
+    @attrdef = []
+  end
+
+  def def_classvar(var, value)
+    var = var.sub(/\A@@/, "")
+    unless safevarname?(var)
+      raise ArgumentError.new("#{var} seems to be unsafe")
+    end
+    @classvar << [var, value]
+  end
+
+  def def_attr(attrname, writable = true, varname = nil)
+    unless safevarname?(varname || attrname)
+      raise ArgumentError.new("#{varname || attrname} seems to be unsafe")
+    end
+    @attrdef << [attrname, writable, varname]
+  end
+
+  def dump
+    buf = ""
+    unless @requirepath.empty?
+      buf << dump_requirepath 
+    end
+    buf << dump_emptyline unless buf.empty?
+    package = @name.split(/::/)[0..-2]
+    buf << dump_package_def(package) unless package.empty?
+    buf << dump_comment if @comment
+    buf << dump_class_def
+    spacer = false
+    unless @classvar.empty?
+      spacer = true
+      buf << dump_classvar
+    end
+    unless @const.empty?
+      buf << dump_emptyline if spacer
+      spacer = true
+      buf << dump_const
+    end
+    unless @code.empty?
+      buf << dump_emptyline if spacer
+      spacer = true
+      buf << dump_code
+    end
+    unless @attrdef.empty?
+      buf << dump_emptyline if spacer
+      spacer = true
+      buf << dump_attributes
+    end
+    unless @methoddef.empty?
+      buf << dump_emptyline if spacer
+      spacer = true
+      buf << dump_methods
+    end
+    buf << dump_class_def_end
+    buf << dump_package_def_end(package) unless package.empty?
+    buf.gsub(/^\s+$/, '')
+  end
+
+private
+
+  def dump_class_def
+    name = @name.to_s.split(/::/)
+    if @baseclass
+      format("class #{name.last} < #{@baseclass}")
+    else
+      format("class #{name.last}")
+    end
+  end
+
+  def dump_class_def_end
+    str = format("end")
+  end
+
+  def dump_classvar
+    dump_static(
+      @classvar.collect { |var, value|
+        %Q(@@#{var.sub(/^@@/, "")} = #{dump_value(value)})
+      }.join("\n")
+    )
+  end
+
+  def dump_attributes
+    str = ""
+    @attrdef.each do |attrname, writable, varname|
+      varname ||= attrname
+      if attrname == varname
+        str << format(dump_accessor(attrname, writable), 2)
+      end
+    end
+    @attrdef.each do |attrname, writable, varname|
+      varname ||= attrname
+      if attrname != varname
+        str << "\n" unless str.empty?
+        str << format(dump_attribute(attrname, writable, varname), 2)
+      end
+    end
+    str
+  end
+
+  def dump_accessor(attrname, writable)
+    if writable
+      "attr_accessor :#{attrname}"
+    else
+      "attr_reader :#{attrname}"
+    end
+  end
+
+  def dump_attribute(attrname, writable, varname)
+    str = nil
+    mr = MethodDef.new(attrname)
+    mr.definition = "@#{varname}"
+    str = mr.dump
+    if writable
+      mw = MethodDef.new(attrname + "=", 'value')
+      mw.definition = "@#{varname} = value"
+      str << "\n" + mw.dump
+    end
+    str
+  end
+end
+
+
+end
+end
+
+
+if __FILE__ == $0
+  require 'xsd/codegen/classdef'
+  include XSD::CodeGen
+  c = ClassDef.new("Foo::Bar::HobbitName", String)
+  c.def_require("foo/bar")
+  c.comment = <<-EOD
+      foo
+    bar
+      baz
+  EOD
+  c.def_const("FOO", 1)
+  c.def_classvar("@@foo", "var".dump)
+  c.def_classvar("baz", "1".dump)
+  c.def_attr("Foo", true, "foo")
+  c.def_attr("bar")
+  c.def_attr("baz", true)
+  c.def_attr("Foo2", true, "foo2")
+  c.def_attr("foo3", false, "foo3")
+  c.def_method("foo") do
+    <<-EOD
+        foo.bar = 1
+\tbaz.each do |ele|
+\t  ele
+        end
+    EOD
+  end
+  c.def_method("baz", "qux") do
+    <<-EOD
+      [1, 2, 3].each do |i|
+        p i
+      end
+    EOD
+  end
+
+  m = MethodDef.new("qux", "quxx", "quxxx") do
+    <<-EOD
+    p quxx + quxxx
+    EOD
+  end
+  m.comment = "hello world\n123"
+  c.add_method(m)
+  c.def_code <<-EOD
+    Foo.new
+    Bar.z
+  EOD
+  c.def_code <<-EOD
+    Foo.new
+    Bar.z
+  EOD
+  c.def_privatemethod("foo", "baz", "*arg", "&block")
+
+  puts c.dump
+end
diff --git a/ruby_1_8_6/lib/xsd/codegen/commentdef.rb b/ruby_1_8_6/lib/xsd/codegen/commentdef.rb
new file mode 100644
index 0000000000..c9493a1363
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/codegen/commentdef.rb
@@ -0,0 +1,34 @@
+# XSD4R - Generating comment definition code
+# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/codegen/gensupport'
+
+
+module XSD
+module CodeGen
+
+
+module CommentDef
+  include GenSupport
+
+  attr_accessor :comment
+
+private
+
+  def dump_comment
+    if /\A#/ =~ @comment
+      format(@comment)
+    else
+      format(@comment).gsub(/^/, '# ')
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/xsd/codegen/gensupport.rb b/ruby_1_8_6/lib/xsd/codegen/gensupport.rb
new file mode 100644
index 0000000000..1e85d3668f
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/codegen/gensupport.rb
@@ -0,0 +1,166 @@
+# XSD4R - Code generation support
+# Copyright (C) 2004, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module XSD
+module CodeGen
+
+# from the file 'keywords' in 1.9.
+KEYWORD = {}
+%w(
+__LINE__
+__FILE__
+BEGIN
+END
+alias
+and
+begin
+break
+case
+class
+def
+defined?
+do
+else
+elsif
+end
+ensure
+false
+for
+if
+in
+module
+next
+nil
+not
+or
+redo
+rescue
+retry
+return
+self
+super
+then
+true
+undef
+unless
+until
+when
+while
+yield
+).each { |k| KEYWORD[k] = nil }
+
+module GenSupport
+  def capitalize(target)
+    target.sub(/^([a-z])/) { $1.tr!('[a-z]', '[A-Z]') }
+  end
+  module_function :capitalize
+
+  def uncapitalize(target)
+    target.sub(/^([A-Z])/) { $1.tr!('[A-Z]', '[a-z]') }
+  end
+  module_function :uncapitalize
+
+  def safeconstname(name)
+    safename = name.scan(/[a-zA-Z0-9_]+/).collect { |ele|
+      GenSupport.capitalize(ele)
+    }.join
+    if /^[A-Z]/ !~ safename or keyword?(safename)
+      safename = "C_#{safename}"
+    end
+    safename
+  end
+  module_function :safeconstname
+
+  def safeconstname?(name)
+    /\A[A-Z][a-zA-Z0-9_]*\z/ =~ name and !keyword?(name)
+  end
+  module_function :safeconstname?
+
+  def safemethodname(name)
+    safename = name.scan(/[a-zA-Z0-9_]+/).join('_')
+    safename = uncapitalize(safename)
+    if /^[a-z]/ !~ safename
+      safename = "m_#{safename}"
+    end
+    safename
+  end
+  module_function :safemethodname
+
+  def safemethodname?(name)
+    /\A[a-zA-Z_][a-zA-Z0-9_]*[=!?]?\z/ =~ name
+  end
+  module_function :safemethodname?
+
+  def safevarname(name)
+    safename = uncapitalize(name.scan(/[a-zA-Z0-9_]+/).join('_'))
+    if /^[a-z]/ !~ safename or keyword?(safename)
+      "v_#{safename}"
+    else
+      safename
+    end
+  end
+  module_function :safevarname
+
+  def safevarname?(name)
+    /\A[a-z_][a-zA-Z0-9_]*\z/ =~ name and !keyword?(name)
+  end
+  module_function :safevarname?
+
+  def keyword?(word)
+    KEYWORD.key?(word)
+  end
+  module_function :keyword?
+
+  def format(str, indent = nil)
+    str = trim_eol(str)
+    str = trim_indent(str)
+    if indent
+      str.gsub(/^/, " " * indent)
+    else
+      str
+    end
+  end
+
+private
+
+  def trim_eol(str)
+    str.collect { |line|
+      line.sub(/\r?\n\z/, "") + "\n"
+    }.join
+  end
+
+  def trim_indent(str)
+    indent = nil
+    str = str.collect { |line| untab(line) }.join
+    str.each do |line|
+      head = line.index(/\S/)
+      if !head.nil? and (indent.nil? or head < indent)
+        indent = head
+      end
+    end
+    return str unless indent
+    str.collect { |line|
+      line.sub(/^ {0,#{indent}}/, "")
+    }.join
+  end
+
+  def untab(line, ts = 8)
+    while pos = line.index(/\t/)
+      line = line.sub(/\t/, " " * (ts - (pos % ts)))
+    end
+    line
+  end
+
+  def dump_emptyline
+    "\n"
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/xsd/codegen/methoddef.rb b/ruby_1_8_6/lib/xsd/codegen/methoddef.rb
new file mode 100644
index 0000000000..15892fc5bf
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/codegen/methoddef.rb
@@ -0,0 +1,63 @@
+# XSD4R - Generating method definition code
+# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/codegen/gensupport'
+require 'xsd/codegen/commentdef'
+
+
+module XSD
+module CodeGen
+
+
+class MethodDef
+  include GenSupport
+  include CommentDef
+
+  attr_accessor :definition
+
+  def initialize(name, *params)
+    unless safemethodname?(name)
+      raise ArgumentError.new("name '#{name}' seems to be unsafe")
+    end
+    @name = name
+    @params = params
+    @comment = nil
+    @definition = yield if block_given?
+  end
+
+  def dump
+    buf = ""
+    buf << dump_comment if @comment
+    buf << dump_method_def
+    buf << dump_definition if @definition and !@definition.empty?
+    buf << dump_method_def_end
+    buf
+  end
+
+private
+
+  def dump_method_def
+    if @params.empty?
+      format("def #{@name}")
+    else
+      format("def #{@name}(#{@params.join(", ")})")
+    end
+  end
+
+  def dump_method_def_end
+    format("end")
+  end
+
+  def dump_definition
+    format(@definition, 2)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/xsd/codegen/moduledef.rb b/ruby_1_8_6/lib/xsd/codegen/moduledef.rb
new file mode 100644
index 0000000000..744af2ff97
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/codegen/moduledef.rb
@@ -0,0 +1,191 @@
+# XSD4R - Generating module definition code
+# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/codegen/gensupport'
+require 'xsd/codegen/methoddef'
+require 'xsd/codegen/commentdef'
+
+
+module XSD
+module CodeGen
+
+
+class ModuleDef
+  include GenSupport
+  include CommentDef
+
+  def initialize(name)
+    @name = name
+    @comment = nil
+    @const = []
+    @code = []
+    @requirepath = []
+    @methoddef = []
+  end
+
+  def def_require(path)
+    @requirepath << path
+  end
+
+  def def_const(const, value)
+    unless safeconstname?(const)
+      raise ArgumentError.new("#{const} seems to be unsafe")
+    end
+    @const << [const, value]
+  end
+
+  def def_code(code)
+    @code << code
+  end
+
+  def def_method(name, *params)
+    add_method(MethodDef.new(name, *params) { yield if block_given? }, :public)
+  end
+  alias def_publicmethod def_method
+
+  def def_protectedmethod(name, *params)
+    add_method(MethodDef.new(name, *params) { yield if block_given? },
+      :protected)
+  end
+
+  def def_privatemethod(name, *params)
+    add_method(MethodDef.new(name, *params) { yield if block_given? }, :private)
+  end
+
+  def add_method(m, visibility = :public)
+    @methoddef << [visibility, m]
+  end
+
+  def dump
+    buf = ""
+    unless @requirepath.empty?
+      buf << dump_requirepath 
+    end
+    buf << dump_emptyline unless buf.empty?
+    package = @name.split(/::/)[0..-2]
+    buf << dump_package_def(package) unless package.empty?
+    buf << dump_comment if @comment
+    buf << dump_module_def
+    spacer = false
+    unless @const.empty?
+      buf << dump_emptyline if spacer
+      spacer = true
+      buf << dump_const
+    end
+    unless @code.empty?
+      buf << dump_emptyline if spacer
+      spacer = true
+      buf << dump_code
+    end
+    unless @methoddef.empty?
+      buf << dump_emptyline if spacer
+      spacer = true
+      buf << dump_methods
+    end
+    buf << dump_module_def_end
+    buf << dump_package_def_end(package) unless package.empty?
+    buf.gsub(/^\s+$/, '')
+  end
+
+private
+
+  def dump_requirepath
+    format(
+      @requirepath.collect { |path|
+        %Q(require '#{path}')
+      }.join("\n")
+    )
+  end
+
+  def dump_const
+    dump_static(
+      @const.sort.collect { |var, value|
+        %Q(#{var} = #{dump_value(value)})
+      }.join("\n")
+    )
+  end
+
+  def dump_code
+    dump_static(@code.join("\n"))
+  end
+
+  def dump_static(str)
+    format(str, 2)
+  end
+
+  def dump_methods
+    methods = {}
+    @methoddef.each do |visibility, method|
+      (methods[visibility] ||= []) << method
+    end
+    str = ""
+    [:public, :protected, :private].each do |visibility|
+      if methods[visibility]
+        str << "\n" unless str.empty?
+        str << visibility.to_s << "\n\n" unless visibility == :public
+        str << methods[visibility].collect { |m| format(m.dump, 2) }.join("\n")
+      end
+    end
+    str
+  end
+
+  def dump_value(value)
+    if value.respond_to?(:to_src)
+      value.to_src
+    else
+      value
+    end
+  end
+
+  def dump_package_def(package)
+    format(package.collect { |ele| "module #{ele}" }.join("; ")) + "\n\n"
+  end
+
+  def dump_package_def_end(package)
+    "\n\n" + format(package.collect { |ele| "end" }.join("; "))
+  end
+
+  def dump_module_def
+    name = @name.to_s.split(/::/)
+    format("module #{name.last}")
+  end
+
+  def dump_module_def_end
+    format("end")
+  end
+end
+
+
+end
+end
+
+
+if __FILE__ == $0
+  require 'xsd/codegen/moduledef'
+  include XSD::CodeGen
+  m = ModuleDef.new("Foo::Bar::HobbitName")
+  m.def_require("foo/bar")
+  m.def_require("baz")
+  m.comment = <<-EOD
+    foo
+    bar
+    baz
+  EOD
+  m.def_method("foo") do
+    <<-EOD
+      foo.bar = 1
+      baz.each do |ele|
+        ele + 1
+      end
+    EOD
+  end
+  m.def_method("baz", "qux")
+  #m.def_protectedmethod("aaa")
+  m.def_privatemethod("bbb")
+  puts m.dump
+end
diff --git a/ruby_1_8_6/lib/xsd/datatypes.rb b/ruby_1_8_6/lib/xsd/datatypes.rb
new file mode 100644
index 0000000000..bbe6c8578f
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/datatypes.rb
@@ -0,0 +1,1269 @@
+# XSD4R - XML Schema Datatype implementation.
+# Copyright (C) 2000, 2001, 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'xsd/charset'
+require 'uri'
+
+
+###
+## XMLSchamaDatatypes general definitions.
+#
+module XSD
+
+
+Namespace = 'http://www.w3.org/2001/XMLSchema'
+InstanceNamespace = 'http://www.w3.org/2001/XMLSchema-instance'
+
+AttrType = 'type'
+NilValue = 'true'
+
+AnyTypeLiteral = 'anyType'
+AnySimpleTypeLiteral = 'anySimpleType'
+NilLiteral = 'nil'
+StringLiteral = 'string'
+BooleanLiteral = 'boolean'
+DecimalLiteral = 'decimal'
+FloatLiteral = 'float'
+DoubleLiteral = 'double'
+DurationLiteral = 'duration'
+DateTimeLiteral = 'dateTime'
+TimeLiteral = 'time'
+DateLiteral = 'date'
+GYearMonthLiteral = 'gYearMonth'
+GYearLiteral = 'gYear'
+GMonthDayLiteral = 'gMonthDay'
+GDayLiteral = 'gDay'
+GMonthLiteral = 'gMonth'
+HexBinaryLiteral = 'hexBinary'
+Base64BinaryLiteral = 'base64Binary'
+AnyURILiteral = 'anyURI'
+QNameLiteral = 'QName'
+
+NormalizedStringLiteral = 'normalizedString'
+#3.3.2 token
+#3.3.3 language
+#3.3.4 NMTOKEN
+#3.3.5 NMTOKENS
+#3.3.6 Name
+#3.3.7 NCName
+#3.3.8 ID
+#3.3.9 IDREF
+#3.3.10 IDREFS
+#3.3.11 ENTITY
+#3.3.12 ENTITIES
+IntegerLiteral = 'integer'
+NonPositiveIntegerLiteral = 'nonPositiveInteger'
+NegativeIntegerLiteral = 'negativeInteger'
+LongLiteral = 'long'
+IntLiteral = 'int'
+ShortLiteral = 'short'
+ByteLiteral = 'byte'
+NonNegativeIntegerLiteral = 'nonNegativeInteger'
+UnsignedLongLiteral = 'unsignedLong'
+UnsignedIntLiteral = 'unsignedInt'
+UnsignedShortLiteral = 'unsignedShort'
+UnsignedByteLiteral = 'unsignedByte'
+PositiveIntegerLiteral = 'positiveInteger'
+
+AttrTypeName = QName.new(InstanceNamespace, AttrType)
+AttrNilName = QName.new(InstanceNamespace, NilLiteral)
+
+AnyTypeName = QName.new(Namespace, AnyTypeLiteral)
+AnySimpleTypeName = QName.new(Namespace, AnySimpleTypeLiteral)
+
+class Error < StandardError; end
+class ValueSpaceError < Error; end
+
+
+###
+## The base class of all datatypes with Namespace.
+#
+class NSDBase
+  @@types = []
+
+  attr_accessor :type
+
+  def self.inherited(klass)
+    @@types << klass
+  end
+
+  def self.types
+    @@types
+  end
+
+  def initialize
+  end
+
+  def init(type)
+    @type = type
+  end
+end
+
+
+###
+## The base class of XSD datatypes.
+#
+class XSDAnySimpleType < NSDBase
+  include XSD
+  Type = QName.new(Namespace, AnySimpleTypeLiteral)
+
+  # @data represents canonical space (ex. Integer: 123).
+  attr_reader :data
+  # @is_nil represents this data is nil or not.
+  attr_accessor :is_nil
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+  # true or raise
+  def check_lexical_format(value)
+    screen_data(value)
+    true
+  end
+
+  # set accepts a string which follows lexical space (ex. String: "+123"), or
+  # an object which follows canonical space (ex. Integer: 123).
+  def set(value)
+    if value.nil?
+      @is_nil = true
+      @data = nil
+      _set(nil)
+    else
+      @is_nil = false
+      _set(screen_data(value))
+    end
+  end
+
+  # to_s creates a string which follows lexical space (ex. String: "123").
+  def to_s()
+    if @is_nil
+      ""
+    else
+      _to_s
+    end
+  end
+
+private
+
+  def init(type, value)
+    super(type)
+    set(value)
+  end
+
+  # raises ValueSpaceError if check failed
+  def screen_data(value)
+    value
+  end
+
+  def _set(value)
+    @data = value
+  end
+
+  def _to_s
+    @data.to_s
+  end
+end
+
+class XSDNil < XSDAnySimpleType
+  Type = QName.new(Namespace, NilLiteral)
+  Value = 'true'
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+end
+
+
+###
+## Primitive datatypes.
+#
+class XSDString < XSDAnySimpleType
+  Type = QName.new(Namespace, StringLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    unless XSD::Charset.is_ces(value, XSD::Charset.encoding)
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
+    end
+    value
+  end
+end
+
+class XSDBoolean < XSDAnySimpleType
+  Type = QName.new(Namespace, BooleanLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    if value.is_a?(String)
+      str = value.strip
+      if str == 'true' || str == '1'
+	true
+      elsif str == 'false' || str == '0'
+	false
+      else
+	raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
+      end
+    else
+      value ? true : false
+    end
+  end
+end
+
+class XSDDecimal < XSDAnySimpleType
+  Type = QName.new(Namespace, DecimalLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+  def nonzero?
+    (@number != '0')
+  end
+
+private
+
+  def screen_data(d)
+    if d.is_a?(String)
+      # Integer("00012") => 10 in Ruby.
+      d.sub!(/^([+\-]?)0*(?=\d)/, "\\1")
+    end
+    screen_data_str(d)
+  end
+
+  def screen_data_str(str)
+    /^([+\-]?)(\d*)(?:\.(\d*)?)?$/ =~ str.to_s.strip
+    unless Regexp.last_match
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
+    end
+    sign = $1 || '+'
+    int_part = $2
+    frac_part = $3
+    int_part = '0' if int_part.empty?
+    frac_part = frac_part ? frac_part.sub(/0+$/, '') : ''
+    point = - frac_part.size
+    number = int_part + frac_part
+    # normalize
+    if sign == '+'
+      sign = ''
+    elsif sign == '-'
+      if number == '0'
+	sign = ''
+      end
+    end
+    [sign, point, number]
+  end
+
+  def _set(data)
+    if data.nil?
+      @sign = @point = @number = @data = nil
+      return
+    end
+    @sign, @point, @number = data
+    @data = _to_s
+    @data.freeze
+  end
+
+  # 0.0 -> 0; right?
+  def _to_s
+    str = @number.dup
+    if @point.nonzero?
+      str[@number.size + @point, 0] = '.'
+    end
+    @sign + str
+  end
+end
+
+module FloatConstants
+  NaN = 0.0/0.0
+  POSITIVE_INF = +1.0/0.0
+  NEGATIVE_INF = -1.0/0.0
+  POSITIVE_ZERO = +1.0/POSITIVE_INF
+  NEGATIVE_ZERO = -1.0/POSITIVE_INF
+  MIN_POSITIVE_SINGLE = 2.0 ** -149
+end
+
+class XSDFloat < XSDAnySimpleType
+  include FloatConstants
+  Type = QName.new(Namespace, FloatLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    # "NaN".to_f => 0 in some environment.  libc?
+    if value.is_a?(Float)
+      return narrow32bit(value)
+    end
+    str = value.to_s.strip
+    if str == 'NaN'
+      NaN
+    elsif str == 'INF'
+      POSITIVE_INF
+    elsif str == '-INF'
+      NEGATIVE_INF
+    else
+      if /^[+\-\.\deE]+$/ !~ str
+	raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
+      end
+      # Float("-1.4E") might fail on some system.
+      str << '0' if /e$/i =~ str
+      begin
+  	return narrow32bit(Float(str))
+      rescue ArgumentError
+  	raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
+      end
+    end
+  end
+
+  def _to_s
+    if @data.nan?
+      'NaN'
+    elsif @data.infinite? == 1
+      'INF'
+    elsif @data.infinite? == -1
+      '-INF'
+    else
+      sign = XSDFloat.positive?(@data) ? '+' : '-'
+      sign + sprintf("%.10g", @data.abs).sub(/[eE]([+-])?0+/) { 'e' + $1 }
+    end
+  end
+
+  # Convert to single-precision 32-bit floating point value.
+  def narrow32bit(f)
+    if f.nan? || f.infinite?
+      f
+    elsif f.abs < MIN_POSITIVE_SINGLE
+      XSDFloat.positive?(f) ? POSITIVE_ZERO : NEGATIVE_ZERO
+    else
+      f
+    end
+  end
+
+  def self.positive?(value)
+    (1 / value) > 0.0
+  end
+end
+
+# Ruby's Float is double-precision 64-bit floating point value.
+class XSDDouble < XSDAnySimpleType
+  include FloatConstants
+  Type = QName.new(Namespace, DoubleLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    # "NaN".to_f => 0 in some environment.  libc?
+    if value.is_a?(Float)
+      return value
+    end
+    str = value.to_s.strip
+    if str == 'NaN'
+      NaN
+    elsif str == 'INF'
+      POSITIVE_INF
+    elsif str == '-INF'
+      NEGATIVE_INF
+    else
+      begin
+	return Float(str)
+      rescue ArgumentError
+	# '1.4e' cannot be parsed on some architecture.
+	if /e\z/i =~ str
+	  begin
+	    return Float(str + '0')
+	  rescue ArgumentError
+	    raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
+	  end
+	else
+	  raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
+	end
+      end
+    end
+  end
+
+  def _to_s
+    if @data.nan?
+      'NaN'
+    elsif @data.infinite? == 1
+      'INF'
+    elsif @data.infinite? == -1
+      '-INF'
+    else
+      sign = (1 / @data > 0.0) ? '+' : '-'
+      sign + sprintf("%.16g", @data.abs).sub(/[eE]([+-])?0+/) { 'e' + $1 }
+    end
+  end
+end
+
+class XSDDuration < XSDAnySimpleType
+  Type = QName.new(Namespace, DurationLiteral)
+
+  attr_accessor :sign
+  attr_accessor :year
+  attr_accessor :month
+  attr_accessor :day
+  attr_accessor :hour
+  attr_accessor :min
+  attr_accessor :sec
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    /^([+\-]?)P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+(?:\.\d+)?)S)?)?$/ =~ value.to_s.strip
+    unless Regexp.last_match
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
+    end
+    if ($5 and ((!$2 and !$3 and !$4) or (!$6 and !$7 and !$8)))
+      # Should we allow 'PT5S' here?
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
+    end
+    sign = $1
+    year = $2.to_i
+    month = $3.to_i
+    day = $4.to_i
+    hour = $6.to_i
+    min = $7.to_i
+    sec = $8 ? XSDDecimal.new($8) : 0
+    [sign, year, month, day, hour, min, sec]
+  end
+
+  def _set(data)
+    if data.nil?
+      @sign = @year = @month = @day = @hour = @min = @sec = @data = nil
+      return
+    end
+    @sign, @year, @month, @day, @hour, @min, @sec = data
+    @data = _to_s
+    @data.freeze
+  end
+
+  def _to_s
+    str = ''
+    str << @sign if @sign
+    str << 'P'
+    l = ''
+    l << "#{ @year }Y" if @year.nonzero?
+    l << "#{ @month }M" if @month.nonzero?
+    l << "#{ @day }D" if @day.nonzero?
+    r = ''
+    r << "#{ @hour }H" if @hour.nonzero?
+    r << "#{ @min }M" if @min.nonzero?
+    r << "#{ @sec }S" if @sec.nonzero?
+    str << l
+    if l.empty?
+      str << "0D"
+    end
+    unless r.empty?
+      str << "T" << r
+    end
+    str
+  end
+end
+
+
+require 'rational'
+require 'date'
+
+module XSDDateTimeImpl
+  SecInDay = 86400	# 24 * 60 * 60
+
+  def to_obj(klass)
+    if klass == Time
+      to_time
+    elsif klass == Date
+      to_date
+    elsif klass == DateTime
+      to_datetime
+    else
+      nil
+    end
+  end
+
+  def to_time
+    begin
+      if @data.offset * SecInDay == Time.now.utc_offset
+        d = @data
+	usec = (d.sec_fraction * SecInDay * 1000000).round
+        Time.local(d.year, d.month, d.mday, d.hour, d.min, d.sec, usec)
+      else
+        d = @data.newof
+	usec = (d.sec_fraction * SecInDay * 1000000).round
+        Time.gm(d.year, d.month, d.mday, d.hour, d.min, d.sec, usec)
+      end
+    rescue ArgumentError
+      nil
+    end
+  end
+
+  def to_date
+    Date.new0(@data.class.jd_to_ajd(@data.jd, 0, 0), 0, @data.start)
+  end
+
+  def to_datetime
+    data
+  end
+
+  def tz2of(str)
+    /^(?:Z|(?:([+\-])(\d\d):(\d\d))?)$/ =~ str
+    sign = $1
+    hour = $2.to_i
+    min = $3.to_i
+
+    of = case sign
+      when '+'
+	of = +(hour.to_r * 60 + min) / 1440	# 24 * 60
+      when '-'
+	of = -(hour.to_r * 60 + min) / 1440	# 24 * 60
+      else
+	0
+      end
+    of
+  end
+
+  def of2tz(offset)
+    diffmin = offset * 24 * 60
+    if diffmin.zero?
+      'Z'
+    else
+      ((diffmin < 0) ? '-' : '+') << format('%02d:%02d',
+    	(diffmin.abs / 60.0).to_i, (diffmin.abs % 60.0).to_i)
+    end
+  end
+
+  def screen_data(t)
+    # convert t to a DateTime as an internal representation.
+    if t.respond_to?(:to_datetime)      # 1.9 or later
+      t.to_datetime
+    elsif t.is_a?(DateTime)
+      t
+    elsif t.is_a?(Date)
+      t = screen_data_str(t)
+      t <<= 12 if t.year < 0
+      t
+    elsif t.is_a?(Time)
+      jd = DateTime.civil_to_jd(t.year, t.mon, t.mday, DateTime::ITALY)
+      fr = DateTime.time_to_day_fraction(t.hour, t.min, [t.sec, 59].min) +
+        t.usec.to_r / 1000000 / SecInDay
+      of = t.utc_offset.to_r / SecInDay
+      DateTime.new0(DateTime.jd_to_ajd(jd, fr, of), of, DateTime::ITALY)
+    else
+      screen_data_str(t)
+    end
+  end
+
+  def add_tz(s)
+    s + of2tz(@data.offset)
+  end
+end
+
+class XSDDateTime < XSDAnySimpleType
+  include XSDDateTimeImpl
+  Type = QName.new(Namespace, DateTimeLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data_str(t)
+    /^([+\-]?\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d(?:\.(\d*))?)(Z|(?:[+\-]\d\d:\d\d)?)?$/ =~ t.to_s.strip
+    unless Regexp.last_match
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
+    end
+    if $1 == '0000'
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
+    end
+    year = $1.to_i
+    if year < 0
+      year += 1
+    end
+    mon = $2.to_i
+    mday = $3.to_i
+    hour = $4.to_i
+    min = $5.to_i
+    sec = $6.to_i
+    secfrac = $7
+    zonestr = $8
+    data = DateTime.civil(year, mon, mday, hour, min, sec, tz2of(zonestr))
+    if secfrac
+      diffday = secfrac.to_i.to_r / (10 ** secfrac.size) / SecInDay
+      data += diffday
+      # FYI: new0 and jd_to_rjd are not necessary to use if you don't have
+      # exceptional reason.
+    end
+    [data, secfrac]
+  end
+
+  def _set(data)
+    if data.nil?
+      @data = @secfrac = nil
+      return
+    end
+    @data, @secfrac = data
+  end
+
+  def _to_s
+    year = (@data.year > 0) ? @data.year : @data.year - 1
+    s = format('%.4d-%02d-%02dT%02d:%02d:%02d',
+      year, @data.mon, @data.mday, @data.hour, @data.min, @data.sec)
+    if @data.sec_fraction.nonzero?
+      if @secfrac
+  	s << ".#{ @secfrac }"
+      else
+	s << sprintf("%.16f",
+          (@data.sec_fraction * SecInDay).to_f).sub(/^0/, '').sub(/0*$/, '')
+      end
+    end
+    add_tz(s)
+  end
+end
+
+class XSDTime < XSDAnySimpleType
+  include XSDDateTimeImpl
+  Type = QName.new(Namespace, TimeLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data_str(t)
+    /^(\d\d):(\d\d):(\d\d(?:\.(\d*))?)(Z|(?:([+\-])(\d\d):(\d\d))?)?$/ =~ t.to_s.strip
+    unless Regexp.last_match
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
+    end
+    hour = $1.to_i
+    min = $2.to_i
+    sec = $3.to_i
+    secfrac = $4
+    zonestr = $5
+    data = DateTime.civil(1, 1, 1, hour, min, sec, tz2of(zonestr))
+    if secfrac
+      diffday = secfrac.to_i.to_r / (10 ** secfrac.size) / SecInDay
+      data += diffday
+    end
+    [data, secfrac]
+  end
+
+  def _set(data)
+    if data.nil?
+      @data = @secfrac = nil
+      return
+    end
+    @data, @secfrac = data
+  end
+
+  def _to_s
+    s = format('%02d:%02d:%02d', @data.hour, @data.min, @data.sec)
+    if @data.sec_fraction.nonzero?
+      if @secfrac
+  	s << ".#{ @secfrac }"
+      else
+	s << sprintf("%.16f",
+          (@data.sec_fraction * SecInDay).to_f).sub(/^0/, '').sub(/0*$/, '')
+      end
+    end
+    add_tz(s)
+  end
+end
+
+class XSDDate < XSDAnySimpleType
+  include XSDDateTimeImpl
+  Type = QName.new(Namespace, DateLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data_str(t)
+    /^([+\-]?\d{4,})-(\d\d)-(\d\d)(Z|(?:([+\-])(\d\d):(\d\d))?)?$/ =~ t.to_s.strip
+    unless Regexp.last_match
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
+    end
+    year = $1.to_i
+    if year < 0
+      year += 1
+    end
+    mon = $2.to_i
+    mday = $3.to_i
+    zonestr = $4
+    DateTime.civil(year, mon, mday, 0, 0, 0, tz2of(zonestr))
+  end
+
+  def _to_s
+    year = (@data.year > 0) ? @data.year : @data.year - 1
+    s = format('%.4d-%02d-%02d', year, @data.mon, @data.mday)
+    add_tz(s)
+  end
+end
+
+class XSDGYearMonth < XSDAnySimpleType
+  include XSDDateTimeImpl
+  Type = QName.new(Namespace, GYearMonthLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data_str(t)
+    /^([+\-]?\d{4,})-(\d\d)(Z|(?:([+\-])(\d\d):(\d\d))?)?$/ =~ t.to_s.strip
+    unless Regexp.last_match
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
+    end
+    year = $1.to_i
+    if year < 0
+      year += 1
+    end
+    mon = $2.to_i
+    zonestr = $3
+    DateTime.civil(year, mon, 1, 0, 0, 0, tz2of(zonestr))
+  end
+
+  def _to_s
+    year = (@data.year > 0) ? @data.year : @data.year - 1
+    s = format('%.4d-%02d', year, @data.mon)
+    add_tz(s)
+  end
+end
+
+class XSDGYear < XSDAnySimpleType
+  include XSDDateTimeImpl
+  Type = QName.new(Namespace, GYearLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data_str(t)
+    /^([+\-]?\d{4,})(Z|(?:([+\-])(\d\d):(\d\d))?)?$/ =~ t.to_s.strip
+    unless Regexp.last_match
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
+    end
+    year = $1.to_i
+    if year < 0
+      year += 1
+    end
+    zonestr = $2
+    DateTime.civil(year, 1, 1, 0, 0, 0, tz2of(zonestr))
+  end
+
+  def _to_s
+    year = (@data.year > 0) ? @data.year : @data.year - 1
+    s = format('%.4d', year)
+    add_tz(s)
+  end
+end
+
+class XSDGMonthDay < XSDAnySimpleType
+  include XSDDateTimeImpl
+  Type = QName.new(Namespace, GMonthDayLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data_str(t)
+    /^(\d\d)-(\d\d)(Z|(?:[+\-]\d\d:\d\d)?)?$/ =~ t.to_s.strip
+    unless Regexp.last_match
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
+    end
+    mon = $1.to_i
+    mday = $2.to_i
+    zonestr = $3
+    DateTime.civil(1, mon, mday, 0, 0, 0, tz2of(zonestr))
+  end
+
+  def _to_s
+    s = format('%02d-%02d', @data.mon, @data.mday)
+    add_tz(s)
+  end
+end
+
+class XSDGDay < XSDAnySimpleType
+  include XSDDateTimeImpl
+  Type = QName.new(Namespace, GDayLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data_str(t)
+    /^(\d\d)(Z|(?:[+\-]\d\d:\d\d)?)?$/ =~ t.to_s.strip
+    unless Regexp.last_match
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
+    end
+    mday = $1.to_i
+    zonestr = $2
+    DateTime.civil(1, 1, mday, 0, 0, 0, tz2of(zonestr))
+  end
+
+  def _to_s
+    s = format('%02d', @data.mday)
+    add_tz(s)
+  end
+end
+
+class XSDGMonth < XSDAnySimpleType
+  include XSDDateTimeImpl
+  Type = QName.new(Namespace, GMonthLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data_str(t)
+    /^(\d\d)(Z|(?:[+\-]\d\d:\d\d)?)?$/ =~ t.to_s.strip
+    unless Regexp.last_match
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ t }'.")
+    end
+    mon = $1.to_i
+    zonestr = $2
+    DateTime.civil(1, mon, 1, 0, 0, 0, tz2of(zonestr))
+  end
+
+  def _to_s
+    s = format('%02d', @data.mon)
+    add_tz(s)
+  end
+end
+
+class XSDHexBinary < XSDAnySimpleType
+  Type = QName.new(Namespace, HexBinaryLiteral)
+
+  # String in Ruby could be a binary.
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+  def set_encoded(value)
+    if /^[0-9a-fA-F]*$/ !~ value
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
+    end
+    @data = String.new(value).strip
+    @is_nil = false
+  end
+
+  def string
+    [@data].pack("H*")
+  end
+
+private
+
+  def screen_data(value)
+    value.unpack("H*")[0].tr('a-f', 'A-F')
+  end
+end
+
+class XSDBase64Binary < XSDAnySimpleType
+  Type = QName.new(Namespace, Base64BinaryLiteral)
+
+  # String in Ruby could be a binary.
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+  def set_encoded(value)
+    if /^[A-Za-z0-9+\/=]*$/ !~ value
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
+    end
+    @data = String.new(value).strip
+    @is_nil = false
+  end
+
+  def string
+    @data.unpack("m")[0]
+  end
+
+private
+
+  def screen_data(value)
+    [value].pack("m").strip
+  end
+end
+
+class XSDAnyURI < XSDAnySimpleType
+  Type = QName.new(Namespace, AnyURILiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    begin
+      URI.parse(value.to_s.strip)
+    rescue URI::InvalidURIError
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
+    end
+  end
+end
+
+class XSDQName < XSDAnySimpleType
+  Type = QName.new(Namespace, QNameLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    /^(?:([^:]+):)?([^:]+)$/ =~ value.to_s.strip
+    unless Regexp.last_match
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
+    end
+    prefix = $1
+    localpart = $2
+    [prefix, localpart]
+  end
+
+  def _set(data)
+    if data.nil?
+      @prefix = @localpart = @data = nil
+      return
+    end
+    @prefix, @localpart = data
+    @data = _to_s
+    @data.freeze
+  end
+
+  def _to_s
+    if @prefix
+      "#{ @prefix }:#{ @localpart }"
+    else
+      "#{ @localpart }"
+    end
+  end
+end
+
+
+###
+## Derived types
+#
+class XSDNormalizedString < XSDString
+  Type = QName.new(Namespace, NormalizedStringLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    if /[\t\r\n]/ =~ value
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
+    end
+    super
+  end
+end
+
+class XSDInteger < XSDDecimal
+  Type = QName.new(Namespace, IntegerLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data_str(str)
+    begin
+      data = Integer(str)
+    rescue ArgumentError
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
+    end
+    unless validate(data)
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
+    end
+    data
+  end
+
+  def _set(value)
+    @data = value
+  end
+
+  def _to_s()
+    @data.to_s
+  end
+
+  def validate(v)
+    max = maxinclusive
+    min = mininclusive
+    (max.nil? or v <= max) and (min.nil? or v >= min)
+  end
+
+  def maxinclusive
+    nil
+  end
+
+  def mininclusive
+    nil
+  end
+
+  PositiveMinInclusive = 1
+  def positive(v)
+    PositiveMinInclusive <= v
+  end
+end
+
+class XSDNonPositiveInteger < XSDInteger
+  Type = QName.new(Namespace, NonPositiveIntegerLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def maxinclusive
+    0
+  end
+
+  def mininclusive
+    nil
+  end
+end
+
+class XSDNegativeInteger < XSDNonPositiveInteger
+  Type = QName.new(Namespace, NegativeIntegerLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def maxinclusive
+    -1
+  end
+
+  def mininclusive
+    nil
+  end
+end
+
+class XSDLong < XSDInteger
+  Type = QName.new(Namespace, LongLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def maxinclusive
+    +9223372036854775807
+  end
+
+  def mininclusive
+    -9223372036854775808
+  end
+end
+
+class XSDInt < XSDLong
+  Type = QName.new(Namespace, IntLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def maxinclusive
+    +2147483647
+  end
+
+  def mininclusive
+    -2147483648
+  end
+end
+
+class XSDShort < XSDInt
+  Type = QName.new(Namespace, ShortLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def maxinclusive
+    +32767
+  end
+
+  def mininclusive
+    -32768
+  end
+end
+
+class XSDByte < XSDShort
+  Type = QName.new(Namespace, ByteLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def maxinclusive
+    +127
+  end
+
+  def mininclusive
+    -128
+  end
+end
+
+class XSDNonNegativeInteger < XSDInteger
+  Type = QName.new(Namespace, NonNegativeIntegerLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def maxinclusive
+    nil
+  end
+
+  def mininclusive
+    0
+  end
+end
+
+class XSDUnsignedLong < XSDNonNegativeInteger
+  Type = QName.new(Namespace, UnsignedLongLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def maxinclusive
+    +18446744073709551615
+  end
+
+  def mininclusive
+    0
+  end
+end
+
+class XSDUnsignedInt < XSDUnsignedLong
+  Type = QName.new(Namespace, UnsignedIntLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def maxinclusive
+    +4294967295
+  end
+
+  def mininclusive
+    0
+  end
+end
+
+class XSDUnsignedShort < XSDUnsignedInt
+  Type = QName.new(Namespace, UnsignedShortLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def maxinclusive
+    +65535
+  end
+
+  def mininclusive
+    0
+  end
+end
+
+class XSDUnsignedByte < XSDUnsignedShort
+  Type = QName.new(Namespace, UnsignedByteLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def maxinclusive
+    +255
+  end
+
+  def mininclusive
+    0
+  end
+end
+
+class XSDPositiveInteger < XSDNonNegativeInteger
+  Type = QName.new(Namespace, PositiveIntegerLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def maxinclusive
+    nil
+  end
+
+  def mininclusive
+    1
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/xsd/datatypes1999.rb b/ruby_1_8_6/lib/xsd/datatypes1999.rb
new file mode 100644
index 0000000000..c7d6479e54
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/datatypes1999.rb
@@ -0,0 +1,20 @@
+# XSD4R - XML Schema Datatype 1999 support
+# Copyright (C) 2001, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/datatypes'
+
+
+module XSD
+  Namespace.replace('http://www.w3.org/1999/XMLSchema')
+  InstanceNamespace.replace('http://www.w3.org/1999/XMLSchema-instance')
+  AnyTypeLiteral.replace('ur-type')
+  AnySimpleTypeLiteral.replace('ur-type')
+  NilLiteral.replace('null')
+  NilValue.replace('1')
+  DateTimeLiteral.replace('timeInstant')
+end
diff --git a/ruby_1_8_6/lib/xsd/iconvcharset.rb b/ruby_1_8_6/lib/xsd/iconvcharset.rb
new file mode 100644
index 0000000000..7e629d569b
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/iconvcharset.rb
@@ -0,0 +1,33 @@
+# XSD4R - Charset handling with iconv.
+# Copyright (C) 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'iconv'
+
+
+module XSD
+
+
+class IconvCharset
+  def self.safe_iconv(to, from, str)
+    iconv = Iconv.new(to, from)
+    out = ""
+    begin
+      out << iconv.iconv(str)
+    rescue Iconv::IllegalSequence => e
+      out << e.success
+      ch, str = e.failed.split(//, 2)
+      out << '?'
+      warn("Failed to convert #{ch}")
+      retry
+    end
+    return out
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/xsd/mapping.rb b/ruby_1_8_6/lib/xsd/mapping.rb
new file mode 100644
index 0000000000..06d30d4cbf
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/mapping.rb
@@ -0,0 +1,42 @@
+# XSD4R - XML Mapping for Ruby
+# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require "soap/parser"
+require 'soap/encodingstyle/literalHandler'
+require "soap/generator"
+require "soap/mapping"
+require "soap/mapping/wsdlliteralregistry"
+
+
+module XSD
+
+
+module Mapping
+  MappingRegistry = SOAP::Mapping::WSDLLiteralRegistry.new
+  MappingOpt = {:default_encodingstyle => SOAP::LiteralNamespace}
+
+  def self.obj2xml(obj, elename = nil, io = nil)
+    if !elename.nil? and !elename.is_a?(XSD::QName)
+      elename = XSD::QName.new(nil, elename)
+    end
+    elename ||= XSD::QName.new(nil, SOAP::Mapping.name2elename(obj.class.to_s))
+    soap = SOAP::Mapping.obj2soap(obj, MappingRegistry)
+    soap.elename = elename
+    generator = SOAP::SOAPGenerator.new(MappingOpt)
+    generator.generate(soap, io)
+  end
+
+  def self.xml2obj(stream)
+    parser = SOAP::Parser.new(MappingOpt)
+    soap = parser.parse(stream)
+    SOAP::Mapping.soap2obj(soap, MappingRegistry)
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/xsd/namedelements.rb b/ruby_1_8_6/lib/xsd/namedelements.rb
new file mode 100644
index 0000000000..a13396bb71
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/namedelements.rb
@@ -0,0 +1,95 @@
+# XSD4R - WSDL named element collection.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module XSD
+
+
+class NamedElements
+  include Enumerable
+
+  def initialize
+    @elements = []
+    @cache = {}
+  end
+
+  def dup
+    o = NamedElements.new
+    o.elements = @elements.dup
+    o
+  end
+
+  def freeze
+    super
+    @elements.freeze
+    self
+  end
+
+  def empty?
+    size == 0
+  end
+
+  def size
+    @elements.size
+  end
+
+  def [](idx)
+    if idx.is_a?(Numeric)
+      @elements[idx]
+    else
+      @cache[idx] ||= @elements.find { |item| item.name == idx }
+    end
+  end
+
+  def find_name(name)
+    @elements.find { |item| item.name.name == name }
+  end
+
+  def keys
+    collect { |element| element.name }
+  end
+
+  def each
+    @elements.each do |element|
+      yield(element)
+    end
+  end
+
+  def <<(rhs)
+    @elements << rhs
+    self
+  end
+  
+  def delete(rhs)
+    @elements.delete(rhs)
+  end
+
+  def +(rhs)
+    o = NamedElements.new
+    o.elements = @elements + rhs.elements
+    o
+  end
+
+  def concat(rhs)
+    @elements.concat(rhs.elements)
+    self
+  end
+
+  Empty = NamedElements.new.freeze
+
+protected
+
+  def elements=(rhs)
+    @elements = rhs
+  end
+
+  def elements
+    @elements
+  end
+end
+
+end
diff --git a/ruby_1_8_6/lib/xsd/ns.rb b/ruby_1_8_6/lib/xsd/ns.rb
new file mode 100644
index 0000000000..53eeae7130
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/ns.rb
@@ -0,0 +1,140 @@
+# XSD4R - XML Schema Namespace library
+# Copyright (C) 2000-2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/datatypes'
+
+
+module XSD
+
+
+class NS
+  class Assigner
+    def initialize
+      @count = 0
+    end
+
+    def assign(ns)
+      @count += 1
+      "n#{@count}"
+    end
+  end
+
+  attr_reader :default_namespace
+
+  class FormatError < Error; end
+
+public
+
+  def initialize(tag2ns = {})
+    @tag2ns = tag2ns
+    @assigner = nil
+    @ns2tag = {}
+    @tag2ns.each do |tag, ns|
+      @ns2tag[ns] = tag
+    end
+    @default_namespace = nil
+  end
+
+  def assign(ns, tag = nil)
+    if (tag == '')
+      @default_namespace = ns
+      tag
+    else
+      @assigner ||= Assigner.new
+      tag ||= @assigner.assign(ns)
+      @ns2tag[ns] = tag
+      @tag2ns[tag] = ns
+      tag
+    end
+  end
+
+  def assigned?(ns)
+    @default_namespace == ns or @ns2tag.key?(ns)
+  end
+
+  def assigned_tag?(tag)
+    @tag2ns.key?(tag)
+  end
+
+  def clone_ns
+    cloned = NS.new(@tag2ns.dup)
+    cloned.assigner = @assigner
+    cloned.assign(@default_namespace, '') if @default_namespace
+    cloned
+  end
+
+  def name(name)
+    if (name.namespace == @default_namespace)
+      name.name
+    elsif @ns2tag.key?(name.namespace)
+      "#{@ns2tag[name.namespace]}:#{name.name}"
+    else
+      raise FormatError.new("namespace: #{name.namespace} not defined yet")
+    end
+  end
+
+  def compare(ns, name, rhs)
+    if (ns == @default_namespace)
+      return true if (name == rhs)
+    end
+    @tag2ns.each do |assigned_tag, assigned_ns|
+      if assigned_ns == ns && "#{assigned_tag}:#{name}" == rhs
+	return true
+      end
+    end
+    false
+  end
+
+  # $1 and $2 are necessary.
+  ParseRegexp = Regexp.new('^([^:]+)(?::(.+))?$')
+
+  def parse(str, local = false)
+    if ParseRegexp =~ str
+      if (name = $2) and (ns = @tag2ns[$1])
+        return XSD::QName.new(ns, name)
+      end
+    end
+    XSD::QName.new(local ? nil : @default_namespace, str)
+  end
+
+  # For local attribute key parsing
+  #   <foo xmlns="urn:a" xmlns:n1="urn:a" bar="1" n1:baz="2" />
+  #     =>
+  #   {}bar, {urn:a}baz
+  def parse_local(elem)
+    ParseRegexp =~ elem
+    if $2
+      ns = @tag2ns[$1]
+      name = $2
+      if !ns
+	raise FormatError.new("unknown namespace qualifier: #{$1}")
+      end
+    elsif $1
+      ns = nil
+      name = $1
+    else
+      raise FormatError.new("illegal element format: #{elem}")
+    end
+    XSD::QName.new(ns, name)
+  end
+
+  def each_ns
+    @ns2tag.each do |ns, tag|
+      yield(ns, tag)
+    end
+  end
+
+protected
+
+  def assigner=(assigner)
+    @assigner = assigner
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/xsd/qname.rb b/ruby_1_8_6/lib/xsd/qname.rb
new file mode 100644
index 0000000000..bb9763a69a
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/qname.rb
@@ -0,0 +1,78 @@
+# XSD4R - XML QName definition.
+# Copyright (C) 2002, 2003, 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+module XSD
+
+
+class QName
+  attr_accessor :namespace
+  attr_accessor :name
+  attr_accessor :source
+
+  def initialize(namespace = nil, name = nil)
+    @namespace = namespace
+    @name = name
+    @source = nil
+  end
+
+  def dup_name(name)
+    XSD::QName.new(@namespace, name)
+  end
+
+  def dump
+    ns = @namespace.nil? ? 'nil' : @namespace.dump
+    name = @name.nil? ? 'nil' : @name.dump
+    "XSD::QName.new(#{ns}, #{name})"
+  end
+
+  def match(rhs)
+    if rhs.namespace and (rhs.namespace != @namespace)
+      return false
+    end
+    if rhs.name and (rhs.name != @name)
+      return false
+    end
+    true
+  end
+
+  def ==(rhs)
+    !rhs.nil? and @namespace == rhs.namespace and @name == rhs.name
+  end
+
+  def ===(rhs)
+    (self == rhs)
+  end
+
+  def eql?(rhs)
+    (self == rhs)
+  end
+
+  def hash
+    @namespace.hash ^ @name.hash
+  end
+  
+  def to_s
+    "{#{ namespace }}#{ name }"
+  end
+
+  def inspect
+    sprintf("#<%s:0x%x %s>", self.class.name, __id__,
+      "{#{ namespace }}#{ name }")
+  end
+
+  NormalizedNameRegexp = /^\{([^}]*)\}(.*)$/
+  def parse(str)
+    NormalizedNameRegexp =~ str
+    self.new($1, $2)
+  end
+
+  EMPTY = QName.new.freeze
+end
+
+
+end
diff --git a/ruby_1_8_6/lib/xsd/xmlparser.rb b/ruby_1_8_6/lib/xsd/xmlparser.rb
new file mode 100644
index 0000000000..e79e36c58c
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/xmlparser.rb
@@ -0,0 +1,61 @@
+# XSD4R - XML Instance parser library.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/xmlparser/parser'
+
+
+module XSD
+
+
+module XMLParser
+  def create_parser(host, opt)
+    XSD::XMLParser::Parser.create_parser(host, opt)
+  end
+  module_function :create_parser
+
+  # $1 is necessary.
+  NSParseRegexp = Regexp.new('^xmlns:?(.*)$')
+
+  def filter_ns(ns, attrs)
+    return attrs if attrs.nil? or attrs.empty?
+    newattrs = {}
+    attrs.each do |key, value|
+      if (NSParseRegexp =~ key)
+	# '' means 'default namespace'.
+	tag = $1 || ''
+	ns.assign(value, tag)
+      else
+	newattrs[key] = value
+      end
+    end
+    newattrs
+  end
+  module_function :filter_ns
+end
+
+
+end
+
+
+# Try to load XML processor.
+loaded = false
+[
+  'xsd/xmlparser/xmlparser',
+  'xsd/xmlparser/xmlscanner',
+  'xsd/xmlparser/rexmlparser',
+].each do |lib|
+  begin
+    require lib
+    loaded = true
+    break
+  rescue LoadError
+  end
+end
+unless loaded
+  raise RuntimeError.new("XML processor module not found.")
+end
diff --git a/ruby_1_8_6/lib/xsd/xmlparser/parser.rb b/ruby_1_8_6/lib/xsd/xmlparser/parser.rb
new file mode 100644
index 0000000000..ad01d55aa0
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/xmlparser/parser.rb
@@ -0,0 +1,96 @@
+# XSD4R - XML Instance parser library.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/qname'
+require 'xsd/ns'
+require 'xsd/charset'
+
+
+module XSD
+module XMLParser
+
+
+class Parser
+  class ParseError < Error; end
+  class FormatDecodeError < ParseError; end
+  class UnknownElementError < FormatDecodeError; end
+  class UnknownAttributeError < FormatDecodeError; end
+  class UnexpectedElementError < FormatDecodeError; end
+  class ElementConstraintError < FormatDecodeError; end
+
+  @@parser_factory = nil
+
+  def self.factory
+    @@parser_factory
+  end
+
+  def self.create_parser(host, opt = {})
+    @@parser_factory.new(host, opt)
+  end
+
+  def self.add_factory(factory)
+    if $DEBUG
+      puts "Set #{ factory } as XML processor."
+    end
+    @@parser_factory = factory
+  end
+
+public
+
+  attr_accessor :charset
+
+  def initialize(host, opt = {})
+    @host = host
+    @charset = opt[:charset] || nil
+  end
+
+  def parse(string_or_readable)
+    @textbuf = ''
+    prologue
+    do_parse(string_or_readable)
+    epilogue
+  end
+
+private
+
+  def do_parse(string_or_readable)
+    raise NotImplementError.new(
+      'Method do_parse must be defined in derived class.')
+  end
+
+  def start_element(name, attrs)
+    @host.start_element(name, attrs)
+  end
+
+  def characters(text)
+    @host.characters(text)
+  end
+
+  def end_element(name)
+    @host.end_element(name)
+  end
+
+  def prologue
+  end
+
+  def epilogue
+  end
+
+  def xmldecl_encoding=(charset)
+    if @charset.nil?
+      @charset = charset
+    else
+      # Definition in a stream (like HTTP) has a priority.
+      p "encoding definition: #{ charset } is ignored." if $DEBUG
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/xsd/xmlparser/rexmlparser.rb b/ruby_1_8_6/lib/xsd/xmlparser/rexmlparser.rb
new file mode 100644
index 0000000000..61da9aafc7
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/xmlparser/rexmlparser.rb
@@ -0,0 +1,54 @@
+# XSD4R - REXMLParser XML parser library.
+# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/xmlparser'
+require 'rexml/streamlistener'
+require 'rexml/document'
+
+
+module XSD
+module XMLParser
+
+
+class REXMLParser < XSD::XMLParser::Parser
+  include REXML::StreamListener
+
+  def do_parse(string_or_readable)
+    source = nil
+    source = REXML::SourceFactory.create_from(string_or_readable)
+    source.encoding = charset if charset
+    # Listener passes a String in utf-8.
+    @charset = 'utf-8'
+    REXML::Document.parse_stream(source, self)
+  end
+
+  def epilogue
+  end
+
+  def tag_start(name, attrs)
+    start_element(name, attrs)
+  end
+
+  def tag_end(name)
+    end_element(name)
+  end
+
+  def text(text)
+    characters(text)
+  end
+
+  def xmldecl(version, encoding, standalone)
+    # Version should be checked.
+  end
+
+  add_factory(self)
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/xsd/xmlparser/xmlparser.rb b/ruby_1_8_6/lib/xsd/xmlparser/xmlparser.rb
new file mode 100644
index 0000000000..6db914cd37
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/xmlparser/xmlparser.rb
@@ -0,0 +1,50 @@
+# XSD4R - XMLParser XML parser library.
+# Copyright (C) 2001, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/xmlparser'
+require 'xml/parser'
+
+
+module XSD
+module XMLParser
+
+
+class XMLParser < XSD::XMLParser::Parser
+  class Listener < XML::Parser
+    begin
+      require 'xml/encoding-ja'
+      include XML::Encoding_ja
+    rescue LoadError
+      # uconv may not be installed.
+    end
+  end
+
+  def do_parse(string_or_readable)
+    # XMLParser passes a String in utf-8.
+    @charset = 'utf-8'
+    @parser = Listener.new
+    @parser.parse(string_or_readable) do |type, name, data|
+      case type
+      when XML::Parser::START_ELEM
+	start_element(name, data)
+      when XML::Parser::END_ELEM
+	end_element(name)
+      when XML::Parser::CDATA
+	characters(data)
+      else
+	raise FormatDecodeError.new("Unexpected XML: #{ type }/#{ name }/#{ data }.")
+      end
+    end
+  end
+
+  add_factory(self)
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/xsd/xmlparser/xmlscanner.rb b/ruby_1_8_6/lib/xsd/xmlparser/xmlscanner.rb
new file mode 100644
index 0000000000..c80dc23910
--- /dev/null
+++ b/ruby_1_8_6/lib/xsd/xmlparser/xmlscanner.rb
@@ -0,0 +1,147 @@
+# XSD4R - XMLScan XML parser library.
+# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+
+
+require 'xsd/xmlparser'
+require 'xmlscan/scanner'
+
+
+module XSD
+module XMLParser
+
+
+class XMLScanner < XSD::XMLParser::Parser
+  include XMLScan::Visitor
+
+  def do_parse(string_or_readable)
+    @attrs = {}
+    @curattr = nil
+    @scanner = XMLScan::XMLScanner.new(self)
+    @scanner.kcode = XSD::Charset.charset_str(charset) if charset
+    @scanner.parse(string_or_readable)
+  end
+
+  def scanner_kcode=(charset)
+    @scanner.kcode = XSD::Charset.charset_str(charset) if charset
+    self.xmldecl_encoding = charset
+  end
+
+  ENTITY_REF_MAP = {
+    'lt' => '<',
+    'gt' => '>',
+    'amp' => '&',
+    'quot' => '"',
+    'apos' => '\''
+  }
+
+  def parse_error(msg)
+    raise ParseError.new(msg)
+  end
+
+  def wellformed_error(msg)
+    raise NotWellFormedError.new(msg)
+  end
+
+  def valid_error(msg)
+    raise NotValidError.new(msg)
+  end
+
+  def warning(msg)
+    p msg if $DEBUG
+  end
+
+  # def on_xmldecl; end
+
+  def on_xmldecl_version(str)
+    # 1.0 expected.
+  end
+
+  def on_xmldecl_encoding(str)
+    self.scanner_kcode = str
+  end
+
+  # def on_xmldecl_standalone(str); end
+
+  # def on_xmldecl_other(name, value); end
+
+  # def on_xmldecl_end; end
+
+  # def on_doctype(root, pubid, sysid); end
+
+  # def on_prolog_space(str); end
+
+  # def on_comment(str); end
+
+  # def on_pi(target, pi); end
+
+  def on_chardata(str)
+    characters(str)
+  end
+
+  # def on_cdata(str); end
+
+  def on_etag(name)
+    end_element(name)
+  end
+
+  def on_entityref(ref)
+    characters(ENTITY_REF_MAP[ref])
+  end
+
+  def on_charref(code)
+    characters([code].pack('U'))
+  end
+
+  def on_charref_hex(code)
+    on_charref(code)
+  end
+
+  # def on_start_document; end
+
+  # def on_end_document; end
+
+  def on_stag(name)
+    @attrs = {}
+  end
+
+  def on_attribute(name)
+    @attrs[name] = @curattr = ''
+  end
+
+  def on_attr_value(str)
+    @curattr << str
+  end
+
+  def on_attr_entityref(ref)
+    @curattr << ENTITY_REF_MAP[ref]
+  end
+
+  def on_attr_charref(code)
+    @curattr << [code].pack('U')
+  end
+
+  def on_attr_charref_hex(code)
+    on_attr_charref(code)
+  end
+
+  # def on_attribute_end(name); end
+
+  def on_stag_end_empty(name)
+    on_stag_end(name)
+    on_etag(name)
+  end
+
+  def on_stag_end(name)
+    start_element(name, @attrs)
+  end
+
+  add_factory(self)
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/lib/yaml.rb b/ruby_1_8_6/lib/yaml.rb
new file mode 100644
index 0000000000..fe8335c8f0
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml.rb
@@ -0,0 +1,436 @@
+# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
+# $Id$
+#
+# = yaml.rb: top-level module with methods for loading and parsing YAML documents
+#
+# Author:: why the lucky stiff
+# 
+
+require 'stringio'
+require 'yaml/error'
+require 'yaml/syck'
+require 'yaml/tag'
+require 'yaml/stream'
+require 'yaml/constants'
+
+# == YAML
+#
+# YAML(tm) (rhymes with 'camel') is a
+# straightforward machine parsable data serialization format designed for
+# human readability and interaction with scripting languages such as Perl
+# and Python. YAML is optimized for data serialization, formatted
+# dumping, configuration files, log files, Internet messaging and
+# filtering. This specification describes the YAML information model and
+# serialization format. Together with the Unicode standard for characters, it
+# provides all the information necessary to understand YAML Version 1.0
+# and construct computer programs to process it.
+#                         
+# See http://yaml.org/ for more information.  For a quick tutorial, please
+# visit YAML In Five Minutes (http://yaml.kwiki.org/?YamlInFiveMinutes).
+#                              
+# == About This Library
+#                         
+# The YAML 1.0 specification outlines four stages of YAML loading and dumping.
+# This library honors all four of those stages, although data is really only
+# available to you in three stages.
+#     
+# The four stages are: native, representation, serialization, and presentation.
+#     
+# The native stage refers to data which has been loaded completely into Ruby's
+# own types. (See +YAML::load+.)
+#
+# The representation stage means data which has been composed into
+# +YAML::BaseNode+ objects.  In this stage, the document is available as a
+# tree of node objects.  You can perform YPath queries and transformations
+# at this level.  (See +YAML::parse+.)
+#   
+# The serialization stage happens inside the parser.  The YAML parser used in
+# Ruby is called Syck.  Serialized nodes are available in the extension as
+# SyckNode structs.
+#       
+# The presentation stage is the YAML document itself.  This is accessible
+# to you as a string.  (See +YAML::dump+.)
+#   
+# For more information about the various information models, see Chapter
+# 3 of the YAML 1.0 Specification (http://yaml.org/spec/#id2491269).
+#
+# The YAML module provides quick access to the most common loading (YAML::load)
+# and dumping (YAML::dump) tasks.  This module also provides an API for registering
+# global types (YAML::add_domain_type).
+#
+# == Example
+#
+# A simple round-trip (load and dump) of an object.
+#
+#     require "yaml"
+#
+#     test_obj = ["dogs", "cats", "badgers"]
+#
+#     yaml_obj = YAML::dump( test_obj )
+#                         # -> ---
+#                              - dogs
+#                              - cats
+#                              - badgers
+#     ruby_obj = YAML::load( yaml_obj )
+#                         # => ["dogs", "cats", "badgers"]
+#     ruby_obj == test_obj
+#                         # => true
+#
+# To register your custom types with the global resolver, use +add_domain_type+.
+#
+#     YAML::add_domain_type( "your-site.com,2004", "widget" ) do |type, val|
+#         Widget.new( val )
+#     end
+#
+module YAML
+
+    Resolver = YAML::Syck::Resolver
+    DefaultResolver = YAML::Syck::DefaultResolver
+    DefaultResolver.use_types_at( @@tagged_classes )
+    GenericResolver = YAML::Syck::GenericResolver
+    Parser = YAML::Syck::Parser
+    Emitter = YAML::Syck::Emitter
+
+    # Returns a new default parser
+    def YAML.parser; Parser.new.set_resolver( YAML.resolver ); end
+    # Returns a new generic parser
+    def YAML.generic_parser; Parser.new.set_resolver( GenericResolver ); end
+    # Returns the default resolver
+    def YAML.resolver; DefaultResolver; end
+    # Returns a new default emitter
+    def YAML.emitter; Emitter.new.set_resolver( YAML.resolver ); end
+
+	#
+	# Converts _obj_ to YAML and writes the YAML result to _io_.
+    #     
+    #   File.open( 'animals.yaml', 'w' ) do |out|
+    #     YAML.dump( ['badger', 'elephant', 'tiger'], out )
+    #   end
+    #
+    # If no _io_ is provided, a string containing the dumped YAML
+    # is returned.
+	#
+    #   YAML.dump( :locked )
+    #      #=> "--- :locked"
+    #
+	def YAML.dump( obj, io = nil )
+        obj.to_yaml( io || io2 = StringIO.new )
+        io || ( io2.rewind; io2.read )
+	end
+
+	#
+	# Load a document from the current _io_ stream.
+	#
+    #   File.open( 'animals.yaml' ) { |yf| YAML::load( yf ) }
+    #      #=> ['badger', 'elephant', 'tiger']
+    #
+    # Can also load from a string.
+    #
+    #   YAML.load( "--- :locked" )
+    #      #=> :locked
+    #
+	def YAML.load( io )
+		yp = parser.load( io )
+	end
+
+    #
+    # Load a document from the file located at _filepath_.
+    #
+    #   YAML.load_file( 'animals.yaml' )
+    #      #=> ['badger', 'elephant', 'tiger']
+    #
+    def YAML.load_file( filepath )
+        File.open( filepath ) do |f|
+            load( f )
+        end
+    end
+
+	#
+	# Parse the first document from the current _io_ stream
+	#
+    #   File.open( 'animals.yaml' ) { |yf| YAML::load( yf ) }
+    #      #=> #<YAML::Syck::Node:0x82ccce0
+    #           @kind=:seq,
+    #           @value=
+    #            [#<YAML::Syck::Node:0x82ccd94
+    #              @kind=:scalar,
+    #              @type_id="str",
+    #              @value="badger">,
+    #             #<YAML::Syck::Node:0x82ccd58
+    #              @kind=:scalar,
+    #              @type_id="str",
+    #              @value="elephant">,
+    #             #<YAML::Syck::Node:0x82ccd1c
+    #              @kind=:scalar,
+    #              @type_id="str",
+    #              @value="tiger">]>
+    #
+    # Can also load from a string.
+    #
+    #   YAML.parse( "--- :locked" )
+    #      #=> #<YAML::Syck::Node:0x82edddc 
+    #            @type_id="tag:ruby.yaml.org,2002:sym", 
+    #            @value=":locked", @kind=:scalar>
+    #
+	def YAML.parse( io )
+		yp = generic_parser.load( io )
+	end
+
+    #
+    # Parse a document from the file located at _filepath_.
+    #
+    #   YAML.parse_file( 'animals.yaml' )
+    #      #=> #<YAML::Syck::Node:0x82ccce0
+    #           @kind=:seq,
+    #           @value=
+    #            [#<YAML::Syck::Node:0x82ccd94
+    #              @kind=:scalar,
+    #              @type_id="str",
+    #              @value="badger">,
+    #             #<YAML::Syck::Node:0x82ccd58
+    #              @kind=:scalar,
+    #              @type_id="str",
+    #              @value="elephant">,
+    #             #<YAML::Syck::Node:0x82ccd1c
+    #              @kind=:scalar,
+    #              @type_id="str",
+    #              @value="tiger">]>
+    #
+    def YAML.parse_file( filepath )
+        File.open( filepath ) do |f|
+            parse( f )
+        end
+    end
+
+	#
+	# Calls _block_ with each consecutive document in the YAML
+    # stream contained in _io_.
+    #
+    #   File.open( 'many-docs.yaml' ) do |yf|
+    #     YAML.each_document( yf ) do |ydoc|
+    #       ## ydoc contains the single object
+    #       ## from the YAML document
+    #     end
+    #   end
+	#
+	def YAML.each_document( io, &block )
+		yp = parser.load_documents( io, &block )
+    end
+
+	#
+	# Calls _block_ with each consecutive document in the YAML
+    # stream contained in _io_.
+    #
+    #   File.open( 'many-docs.yaml' ) do |yf|
+    #     YAML.load_documents( yf ) do |ydoc|
+    #       ## ydoc contains the single object
+    #       ## from the YAML document
+    #     end
+    #   end
+	#
+	def YAML.load_documents( io, &doc_proc )
+		YAML.each_document( io, &doc_proc )
+    end
+
+	#
+	# Calls _block_ with a tree of +YAML::BaseNodes+, one tree for
+    # each consecutive document in the YAML stream contained in _io_.
+    #
+    #   File.open( 'many-docs.yaml' ) do |yf|
+    #     YAML.each_node( yf ) do |ydoc|
+    #       ## ydoc contains a tree of nodes
+    #       ## from the YAML document
+    #     end
+    #   end
+	#
+	def YAML.each_node( io, &doc_proc )
+		yp = generic_parser.load_documents( io, &doc_proc )
+    end
+
+	#
+	# Calls _block_ with a tree of +YAML::BaseNodes+, one tree for
+    # each consecutive document in the YAML stream contained in _io_.
+    #
+    #   File.open( 'many-docs.yaml' ) do |yf|
+    #     YAML.parse_documents( yf ) do |ydoc|
+    #       ## ydoc contains a tree of nodes
+    #       ## from the YAML document
+    #     end
+    #   end
+	#
+	def YAML.parse_documents( io, &doc_proc )
+		YAML.each_node( io, &doc_proc )
+    end
+
+	#
+	# Loads all documents from the current _io_ stream, 
+    # returning a +YAML::Stream+ object containing all
+    # loaded documents.
+	#
+	def YAML.load_stream( io )
+		d = nil
+		parser.load_documents( io ) do |doc|
+			d = YAML::Stream.new if not d
+			d.add( doc ) 
+        end
+		return d
+	end
+
+	#
+    # Returns a YAML stream containing each of the items in +objs+,
+    # each having their own document.
+    #
+    #   YAML.dump_stream( 0, [], {} )
+    #     #=> --- 0
+    #         --- []
+    #         --- {}
+    #
+	def YAML.dump_stream( *objs )
+		d = YAML::Stream.new
+        objs.each do |doc|
+			d.add( doc ) 
+        end
+        d.emit
+	end
+
+	#
+	# Add a global handler for a YAML domain type.
+	#
+	def YAML.add_domain_type( domain, type_tag, &transfer_proc )
+        resolver.add_type( "tag:#{ domain }:#{ type_tag }", transfer_proc )
+	end
+
+	#
+	# Add a transfer method for a builtin type
+	#
+	def YAML.add_builtin_type( type_tag, &transfer_proc )
+	    resolver.add_type( "tag:yaml.org,2002:#{ type_tag }", transfer_proc )
+	end
+
+	#
+	# Add a transfer method for a builtin type
+	#
+	def YAML.add_ruby_type( type_tag, &transfer_proc )
+	    resolver.add_type( "tag:ruby.yaml.org,2002:#{ type_tag }", transfer_proc )
+	end
+
+	#
+	# Add a private document type
+	#
+	def YAML.add_private_type( type_re, &transfer_proc )
+	    resolver.add_type( "x-private:" + type_re, transfer_proc )
+	end
+
+    #
+    # Detect typing of a string
+    #
+    def YAML.detect_implicit( val )
+        resolver.detect_implicit( val )
+    end
+
+    #
+    # Convert a type_id to a taguri
+    #
+    def YAML.tagurize( val )
+        resolver.tagurize( val )
+    end
+
+    #
+    # Apply a transfer method to a Ruby object
+    #
+    def YAML.transfer( type_id, obj )
+        resolver.transfer( YAML.tagurize( type_id ), obj )
+    end
+
+	#
+	# Apply any implicit a node may qualify for
+	#
+	def YAML.try_implicit( obj )
+		YAML.transfer( YAML.detect_implicit( obj ), obj )
+	end
+
+    #
+    # Method to extract colon-seperated type and class, returning
+    # the type and the constant of the class
+    #
+    def YAML.read_type_class( type, obj_class )
+        scheme, domain, type, tclass = type.split( ':', 4 )
+        tclass.split( "::" ).each { |c| obj_class = obj_class.const_get( c ) } if tclass
+        return [ type, obj_class ]
+    end
+
+    #
+    # Allocate blank object
+    #
+    def YAML.object_maker( obj_class, val )
+        if Hash === val
+            o = obj_class.allocate
+            val.each_pair { |k,v|
+                o.instance_variable_set("@#{k}", v)
+            }
+            o
+        else
+            raise YAML::Error, "Invalid object explicitly tagged !ruby/Object: " + val.inspect
+        end
+    end
+
+	#
+	# Allocate an Emitter if needed
+	#
+	def YAML.quick_emit( oid, opts = {}, &e )
+        out = 
+            if opts.is_a? YAML::Emitter
+                opts
+            else
+                emitter.reset( opts )
+            end
+        out.emit( oid, &e )
+	end
+	
+end
+
+require 'yaml/rubytypes'
+require 'yaml/types'
+
+module Kernel
+    #
+    # ryan:: You know how Kernel.p is a really convenient way to dump ruby
+    #        structures?  The only downside is that it's not as legible as
+    #        YAML.
+    #
+    # _why:: (listening)
+    #
+    # ryan:: I know you don't want to urinate all over your users' namespaces.
+    #        But, on the other hand, convenience of dumping for debugging is,
+    #        IMO, a big YAML use case.
+    #
+    # _why:: Go nuts!  Have a pony parade!
+    #
+    # ryan:: Either way, I certainly will have a pony parade.
+    #
+
+    # Prints any supplied _objects_ out in YAML.  Intended as
+    # a variation on +Kernel::p+.
+    #
+    #   S = Struct.new(:name, :state)
+    #   s = S['dave', 'TX']
+    #   y s
+    #
+    # _produces:_
+    #
+    #   --- !ruby/struct:S 
+    #   name: dave
+    #   state: TX
+    #
+    def y( object, *objects )
+        objects.unshift object
+        puts( if objects.length == 1
+                  YAML::dump( *objects )
+              else
+                  YAML::dump_stream( *objects )
+              end )
+    end
+    private :y
+end
+
+
diff --git a/ruby_1_8_6/lib/yaml/baseemitter.rb b/ruby_1_8_6/lib/yaml/baseemitter.rb
new file mode 100644
index 0000000000..1aef152749
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/baseemitter.rb
@@ -0,0 +1,247 @@
+#
+# BaseEmitter
+#
+
+require 'yaml/constants'
+require 'yaml/encoding'
+require 'yaml/error'
+
+module YAML
+
+    module BaseEmitter
+
+        def options( opt = nil )
+            if opt
+                @options[opt] || YAML::DEFAULTS[opt]
+            else
+                @options
+            end
+        end
+
+        def options=( opt )
+            @options = opt
+        end
+
+        #
+        # Emit binary data
+        #
+        def binary_base64( value )
+            self << "!binary "
+            self.node_text( [value].pack("m"), '|' )
+        end
+
+		#
+		# Emit plain, normal flowing text
+		#
+		def node_text( value, block = nil )
+            @seq_map = false
+			valx = value.dup
+            unless block
+            block =
+                if options(:UseBlock)
+                    '|'
+                elsif not options(:UseFold) and valx =~ /\n[ \t]/ and not valx =~ /#{YAML::ESCAPE_CHAR}/
+                    '|'
+                else
+                    '>'
+                end 
+
+                indt = $&.to_i if block =~ /\d+/
+                if valx =~ /(\A\n*[ \t#]|^---\s+)/
+                    indt = options(:Indent) unless indt.to_i > 0
+                    block += indt.to_s
+                end
+
+            block +=
+                if valx =~ /\n\Z\n/
+                    "+"
+                elsif valx =~ /\Z\n/
+                    ""
+                else
+                    "-"
+                end
+            end
+            block += "\n"
+            if block[0] == ?"
+                esc_skip = ( "\t\n" unless valx =~ /^[ \t]/ ) || ""
+                valx = fold( YAML::escape( valx, esc_skip ) + "\"" ).chomp
+                self << '"' + indent_text( valx, indt, false )
+            else
+                if block[0] == ?> 
+                    valx = fold( valx ) 
+                end
+                #p [block, indt]
+                self << block + indent_text( valx, indt )
+            end
+		end
+
+		#
+		# Emit a simple, unqouted string
+		#
+		def simple( value )
+            @seq_map = false
+            self << value.to_s
+		end
+
+		#
+		# Emit double-quoted string
+		#
+		def double( value )
+			"\"#{YAML.escape( value )}\"" 
+		end
+
+		#
+		# Emit single-quoted string
+		#
+		def single( value )
+			"'#{value}'"
+		end
+
+		#
+		# Write a text block with the current indent
+		#
+		def indent_text( text, mod, first_line = true )
+			return "" if text.to_s.empty?
+            spacing = indent( mod )
+            text = text.gsub( /\A([^\n])/, "#{ spacing }\\1" ) if first_line
+			return text.gsub( /\n^([^\n])/, "\n#{spacing}\\1" )
+		end
+
+		#
+		# Write a current indent
+		#
+        def indent( mod = nil )
+            #p [ self.id, level, mod, :INDENT ]
+            if level <= 0
+                mod ||= 0
+            else
+                mod ||= options(:Indent)
+                mod += ( level - 1 ) * options(:Indent)
+            end
+            return " " * mod
+		end
+
+		#
+		# Add indent to the buffer
+		#
+		def indent!
+			self << indent
+		end
+
+		#
+		# Folding paragraphs within a column
+		#
+		def fold( value )
+            value.gsub( /(^[ \t]+.*$)|(\S.{0,#{options(:BestWidth) - 1}})(?:[ \t]+|(\n+(?=[ \t]|\Z))|$)/ ) do |s| 
+                $1 || $2 + ( $3 || "\n" )
+            end
+		end
+
+        #
+        # Quick mapping
+        #
+        def map( type, &e )
+            val = Mapping.new
+            e.call( val )
+			self << "#{type} " if type.length.nonzero?
+
+			#
+			# Empty hashes
+			#
+			if val.length.zero?
+				self << "{}"
+                @seq_map = false
+			else
+                # FIXME
+                # if @buffer.length == 1 and options(:UseHeader) == false and type.length.zero? 
+			    #     @headless = 1 
+                # end
+
+                defkey = @options.delete( :DefaultKey )
+                if defkey
+                    seq_map_shortcut
+                    self << "= : "
+                    defkey.to_yaml( :Emitter => self )
+                end
+
+				#
+				# Emit the key and value
+				#
+                val.each { |v|
+                    seq_map_shortcut
+                    if v[0].is_complex_yaml?
+                        self << "? "
+                    end
+                    v[0].to_yaml( :Emitter => self )
+                    if v[0].is_complex_yaml?
+                        self << "\n"
+                        indent!
+                    end
+                    self << ": " 
+                    v[1].to_yaml( :Emitter => self )
+                }
+			end
+        end
+
+        def seq_map_shortcut
+            # FIXME: seq_map needs to work with the new anchoring system
+            # if @seq_map
+            #     @anchor_extras[@buffer.length - 1] = "\n" + indent
+            #     @seq_map = false
+            # else
+                self << "\n"
+                indent! 
+            # end
+        end
+
+        #
+        # Quick sequence
+        #
+        def seq( type, &e )
+            @seq_map = false
+            val = Sequence.new
+            e.call( val )
+			self << "#{type} " if type.length.nonzero?
+
+			#
+			# Empty arrays
+			#
+			if val.length.zero?
+				self << "[]"
+			else
+                # FIXME
+                # if @buffer.length == 1 and options(:UseHeader) == false and type.length.zero? 
+			    #     @headless = 1 
+                # end
+
+				#
+				# Emit the key and value
+				#
+                val.each { |v|
+                    self << "\n"
+                    indent!
+                    self << "- "
+                    @seq_map = true if v.class == Hash
+                    v.to_yaml( :Emitter => self )
+                }
+			end
+        end
+
+    end
+
+    #
+    # Emitter helper classes
+    #
+    class Mapping < Array
+        def add( k, v )
+            push [k, v]
+        end
+    end
+
+    class Sequence < Array
+        def add( v )
+            push v
+        end
+    end
+
+end
diff --git a/ruby_1_8_6/lib/yaml/basenode.rb b/ruby_1_8_6/lib/yaml/basenode.rb
new file mode 100644
index 0000000000..d24f6172e9
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/basenode.rb
@@ -0,0 +1,216 @@
+#
+# YAML::BaseNode class
+#
+require 'yaml/ypath'
+
+module YAML
+
+    #
+    # YAML Generic Model container
+    #
+    module BaseNode
+
+        #
+        # Search for YPath entry and return
+        # qualified nodes.
+        #
+        def select( ypath_str )
+            matches = match_path( ypath_str )
+
+            #
+            # Create a new generic view of the elements selected
+            #
+            if matches
+                result = []
+                matches.each { |m|
+                    result.push m.last
+                }
+                YAML.transfer( 'seq', result )
+            end
+        end
+
+        #
+        # Search for YPath entry and return
+        # transformed nodes.
+        #
+        def select!( ypath_str )
+            matches = match_path( ypath_str )
+
+            #
+            # Create a new generic view of the elements selected
+            #
+            if matches
+                result = []
+                matches.each { |m|
+                    result.push m.last.transform
+                }
+                result
+            end
+        end
+
+        #
+        # Search for YPath entry and return a list of
+        # qualified paths.
+        #
+        def search( ypath_str )
+            matches = match_path( ypath_str )
+
+            if matches
+                matches.collect { |m|
+                    path = []
+                    m.each_index { |i|
+                        path.push m[i] if ( i % 2 ).zero?
+                    }
+                    "/" + path.compact.join( "/" )
+                }
+            end
+        end
+
+        def at( seg )
+            if Hash === @value
+                self[seg]
+            elsif Array === @value and seg =~ /\A\d+\Z/ and @value[seg.to_i]
+                @value[seg.to_i]
+            end
+        end
+
+        #
+        # YPath search returning a complete depth array
+        #
+        def match_path( ypath_str )
+            depth = 0
+            matches = []
+            YPath.each_path( ypath_str ) do |ypath|
+                seg = match_segment( ypath, 0 )
+                matches += seg if seg
+            end
+            matches.uniq
+        end
+
+        #
+        # Search a node for a single YPath segment
+        #
+        def match_segment( ypath, depth )
+            deep_nodes = []
+            seg = ypath.segments[ depth ]
+            if seg == "/"
+                unless String === @value
+                    idx = -1
+                    @value.collect { |v|
+                        idx += 1
+                        if Hash === @value
+                            match_init = [v[0].transform, v[1]]
+                            match_deep = v[1].match_segment( ypath, depth )
+                        else
+                            match_init = [idx, v]
+                            match_deep = v.match_segment( ypath, depth )
+                        end
+                        if match_deep
+                            match_deep.each { |m|
+                                deep_nodes.push( match_init + m )
+                            }
+                        end
+                    }
+                end
+                depth += 1
+                seg = ypath.segments[ depth ]
+            end
+            match_nodes =
+                case seg
+                when "."
+                    [[nil, self]]
+                when ".."
+                    [["..", nil]]
+                when "*"
+                    if @value.is_a? Enumerable
+                        idx = -1
+                        @value.collect { |h|
+                            idx += 1
+                            if Hash === @value
+                                [h[0].transform, h[1]]
+                            else
+                                [idx, h]
+                            end
+                        }
+                    end
+                else
+                    if seg =~ /^"(.*)"$/
+                        seg = $1
+                    elsif seg =~ /^'(.*)'$/
+                        seg = $1
+                    end
+                    if ( v = at( seg ) )
+                        [[ seg, v ]]
+                    end
+                end
+            return deep_nodes unless match_nodes
+            pred = ypath.predicates[ depth ]
+            if pred
+                case pred
+                when /^\.=/
+                    pred = $'   # '
+                    match_nodes.reject! { |n|
+                        n.last.value != pred
+                    }
+                else
+                    match_nodes.reject! { |n|
+                        n.last.at( pred ).nil?
+                    }
+                end
+            end
+            return match_nodes + deep_nodes unless ypath.segments.length > depth + 1
+
+            #puts "DEPTH: #{depth + 1}"
+            deep_nodes = []
+            match_nodes.each { |n|
+                if n[1].is_a? BaseNode
+                    match_deep = n[1].match_segment( ypath, depth + 1 )
+                    if match_deep
+                        match_deep.each { |m|
+                            deep_nodes.push( n + m )
+                        }
+                    end
+                else
+                    deep_nodes = []
+                end
+            }
+            deep_nodes = nil if deep_nodes.length == 0
+            deep_nodes
+        end
+
+        #
+        # We want the node to act like as Hash
+        # if it is.
+        #
+        def []( *key )
+            if Hash === @value
+                v = @value.detect { |k,v| k.transform == key.first }
+                v[1] if v
+            elsif Array === @value
+                @value.[]( *key )
+            end
+        end
+
+        def children
+            if Hash === @value
+                @value.values.collect { |c| c[1] }
+            elsif Array === @value
+                @value
+            end
+        end
+
+        def children_with_index
+            if Hash === @value
+                @value.keys.collect { |i| [self[i], i] }
+            elsif Array === @value
+                i = -1; @value.collect { |v| i += 1; [v, i] }
+            end
+        end
+
+        def emit
+            transform.to_yaml
+        end
+    end
+
+end
+
diff --git a/ruby_1_8_6/lib/yaml/constants.rb b/ruby_1_8_6/lib/yaml/constants.rb
new file mode 100644
index 0000000000..fb833d3077
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/constants.rb
@@ -0,0 +1,45 @@
+#
+# Constants used throughout the library
+#
+module YAML
+
+	#
+	# Constants
+	#
+	VERSION = '0.60'
+	SUPPORTED_YAML_VERSIONS = ['1.0']
+
+	#
+	# Parser tokens
+	#
+	WORD_CHAR = 'A-Za-z0-9'
+	PRINTABLE_CHAR = '-_A-Za-z0-9!?/()$\'". ' 
+	NOT_PLAIN_CHAR = '\x7f\x0-\x1f\x80-\x9f'
+	ESCAPE_CHAR = '[\\x00-\\x09\\x0b-\\x1f]'
+	INDICATOR_CHAR = '*&!|\\\\^@%{}[]='
+	SPACE_INDICATORS = '-#:,?'
+	RESTRICTED_INDICATORS = '#:,}]'
+	DNS_COMP_RE = "\\w(?:[-\\w]*\\w)?"
+	DNS_NAME_RE = "(?:(?:#{DNS_COMP_RE}\\.)+#{DNS_COMP_RE}|#{DNS_COMP_RE})"
+	ESCAPES = %w{\x00   \x01	\x02	\x03	\x04	\x05	\x06	\a
+			     \x08	\t		\n		\v		\f		\r		\x0e	\x0f
+				 \x10	\x11	\x12	\x13	\x14	\x15	\x16	\x17
+				 \x18	\x19	\x1a	\e		\x1c	\x1d	\x1e	\x1f
+			    }
+	UNESCAPES = {
+				'a' => "\x07", 'b' => "\x08", 't' => "\x09", 
+				'n' => "\x0a", 'v' => "\x0b", 'f' => "\x0c",
+				'r' => "\x0d", 'e' => "\x1b", '\\' => '\\',
+			    }
+
+	#
+	# Default settings
+	#
+	DEFAULTS = {
+		:Indent => 2, :UseHeader => false, :UseVersion => false, :Version => '1.0',
+		:SortKeys => false, :AnchorFormat => 'id%03d', :ExplicitTypes => false,
+		:WidthType => 'absolute', :BestWidth => 80,
+		:UseBlock => false, :UseFold => false, :Encoding => :None
+	}
+
+end
diff --git a/ruby_1_8_6/lib/yaml/dbm.rb b/ruby_1_8_6/lib/yaml/dbm.rb
new file mode 100644
index 0000000000..87d6009250
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/dbm.rb
@@ -0,0 +1,111 @@
+require 'yaml'
+require 'dbm'
+#
+# YAML + DBM = YDBM
+# - Same interface as DBM class
+#
+module YAML
+
+class DBM < ::DBM
+    VERSION = "0.1"
+    def []( key )
+        fetch( key )
+    end
+    def []=( key, val )
+        store( key, val )
+    end
+    def fetch( keystr, ifnone = nil )
+        begin
+            val = super( keystr )
+            return YAML::load( val ) if String === val
+        rescue IndexError
+        end
+        if block_given?
+            yield keystr
+        else
+            ifnone
+        end
+    end
+    def index( keystr )
+        super( keystr.to_yaml )
+    end
+    def values_at( *keys )
+        keys.collect { |k| fetch( k ) }
+    end
+    def delete( key )
+        v = super( key )
+        if String === v
+            v = YAML::load( v ) 
+        end
+        v
+    end
+    def delete_if
+        del_keys = keys.dup
+        del_keys.delete_if { |k| yield( k, fetch( k ) ) == false }
+        del_keys.each { |k| delete( k ) } 
+        self
+    end
+    def reject
+        hsh = self.to_hash
+        hsh.reject { |k,v| yield k, v }
+    end
+    def each_pair
+        keys.each { |k| yield k, fetch( k ) }
+        self
+    end
+    def each_value
+        super { |v| yield YAML::load( v ) }
+        self
+    end
+    def values
+        super.collect { |v| YAML::load( v ) }
+    end
+    def has_value?( val )
+        each_value { |v| return true if v == val }
+        return false
+    end
+    def invert
+        h = {}
+        keys.each { |k| h[ self.fetch( k ) ] = k }
+        h
+    end
+    def replace( hsh )
+        clear
+        update( hsh )
+    end
+    def shift
+        a = super
+        a[1] = YAML::load( a[1] ) if a
+        a
+    end
+    def select( *keys )
+        if block_given?
+            self.keys.collect { |k| v = self[k]; [k, v] if yield k, v }.compact
+        else
+            values_at( *keys )
+        end
+    end
+    def store( key, val )
+        super( key, val.to_yaml )
+        val
+    end
+    def update( hsh )
+        hsh.keys.each do |k|
+            self.store( k, hsh.fetch( k ) )
+        end
+        self
+    end
+    def to_a
+        a = []
+        keys.each { |k| a.push [ k, self.fetch( k ) ] }
+        a
+    end
+    def to_hash
+        h = {}
+        keys.each { |k| h[ k ] = self.fetch( k ) }
+        h
+    end
+    alias :each :each_pair
+end
+
+end
diff --git a/ruby_1_8_6/lib/yaml/encoding.rb b/ruby_1_8_6/lib/yaml/encoding.rb
new file mode 100644
index 0000000000..37f5cfda64
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/encoding.rb
@@ -0,0 +1,33 @@
+#
+# Handle Unicode-to-Internal conversion
+#
+
+module YAML
+
+	#
+	# Escape the string, condensing common escapes
+	#
+	def YAML.escape( value, skip = "" )
+		value.gsub( /\\/, "\\\\\\" ).
+              gsub( /"/, "\\\"" ).
+              gsub( /([\x00-\x1f])/ ) do |x|
+                 skip[x] || ESCAPES[ x.unpack("C")[0] ]
+             end
+	end
+
+	#
+	# Unescape the condenses escapes
+	#
+	def YAML.unescape( value )
+		value.gsub( /\\(?:([nevfbart\\])|0?x([0-9a-fA-F]{2})|u([0-9a-fA-F]{4}))/ ) { |x| 
+			if $3
+				["#$3".hex ].pack('U*')
+			elsif $2
+				[$2].pack( "H2" ) 
+			else
+				UNESCAPES[$1] 
+			end
+		}
+	end
+
+end
diff --git a/ruby_1_8_6/lib/yaml/error.rb b/ruby_1_8_6/lib/yaml/error.rb
new file mode 100644
index 0000000000..15865a9aa9
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/error.rb
@@ -0,0 +1,34 @@
+#
+# Error messages and exception class
+#
+
+module YAML
+
+	#
+	# Error messages
+	#
+
+	ERROR_NO_HEADER_NODE = "With UseHeader=false, the node Array or Hash must have elements"
+	ERROR_NEED_HEADER = "With UseHeader=false, the node must be an Array or Hash"
+	ERROR_BAD_EXPLICIT = "Unsupported explicit transfer: '%s'"
+    ERROR_MANY_EXPLICIT = "More than one explicit transfer"
+	ERROR_MANY_IMPLICIT = "More than one implicit request"
+	ERROR_NO_ANCHOR = "No anchor for alias '%s'"
+	ERROR_BAD_ANCHOR = "Invalid anchor: %s"
+	ERROR_MANY_ANCHOR = "More than one anchor"
+	ERROR_ANCHOR_ALIAS = "Can't define both an anchor and an alias"
+	ERROR_BAD_ALIAS = "Invalid alias: %s"
+	ERROR_MANY_ALIAS = "More than one alias"
+	ERROR_ZERO_INDENT = "Can't use zero as an indentation width"
+	ERROR_UNSUPPORTED_VERSION = "This release of YAML.rb does not support YAML version %s"
+	ERROR_UNSUPPORTED_ENCODING = "Attempt to use unsupported encoding: %s"
+
+	#
+	# YAML Error classes
+	#
+    
+	class Error < StandardError; end
+	class ParseError < Error; end
+    class TypeError < StandardError; end
+
+end
diff --git a/ruby_1_8_6/lib/yaml/loader.rb b/ruby_1_8_6/lib/yaml/loader.rb
new file mode 100644
index 0000000000..eb0709e103
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/loader.rb
@@ -0,0 +1,14 @@
+#
+# YAML::Loader class
+# .. type handling ..
+#
+module YAML
+    class Loader
+        TRANSFER_DOMAINS = {
+            'yaml.org,2002' => {},
+            'ruby.yaml.org,2002' => {}
+        }
+        PRIVATE_TYPES = {}
+        IMPLICIT_TYPES = [ 'null', 'bool', 'time', 'int', 'float' ]
+    end
+end
diff --git a/ruby_1_8_6/lib/yaml/rubytypes.rb b/ruby_1_8_6/lib/yaml/rubytypes.rb
new file mode 100644
index 0000000000..eebf027135
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/rubytypes.rb
@@ -0,0 +1,408 @@
+# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
+require 'date'
+
+class Class
+	def to_yaml( opts = {} )
+		raise TypeError, "can't dump anonymous class %s" % self.class
+	end
+end
+
+class Object
+    yaml_as "tag:ruby.yaml.org,2002:object"
+    def to_yaml_style; end
+    def to_yaml_properties; instance_variables.sort; end
+	def to_yaml( opts = {} )
+		YAML::quick_emit( object_id, opts ) do |out|
+            out.map( taguri, to_yaml_style ) do |map|
+				to_yaml_properties.each do |m|
+                    map.add( m[1..-1], instance_variable_get( m ) )
+                end
+            end
+        end
+	end
+end
+
+class Hash
+    yaml_as "tag:ruby.yaml.org,2002:hash"
+    yaml_as "tag:yaml.org,2002:map"
+    def yaml_initialize( tag, val )
+        if Array === val
+            update Hash.[]( *val )		# Convert the map to a sequence
+        elsif Hash === val
+            update val
+        else
+            raise YAML::TypeError, "Invalid map explicitly tagged #{ tag }: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+		YAML::quick_emit( object_id, opts ) do |out|
+            out.map( taguri, to_yaml_style ) do |map|
+                each do |k, v|
+                    map.add( k, v )
+                end
+            end
+        end
+	end
+end
+
+class Struct
+    yaml_as "tag:ruby.yaml.org,2002:struct"
+    def self.yaml_tag_class_name; self.name.gsub( "Struct::", "" ); end
+    def self.yaml_tag_read_class( name ); "Struct::#{ name }"; end
+    def self.yaml_new( klass, tag, val )
+        if Hash === val
+            struct_type = nil
+
+            #
+            # Use existing Struct if it exists
+            #
+            props = {}
+            val.delete_if { |k,v| props[k] = v if k =~ /^@/ }
+            begin
+                struct_name, struct_type = YAML.read_type_class( tag, Struct )
+            rescue NameError
+            end
+            if not struct_type
+                struct_def = [ tag.split( ':', 4 ).last ]
+                struct_type = Struct.new( *struct_def.concat( val.keys.collect { |k| k.intern } ) ) 
+            end
+
+            #
+            # Set the Struct properties
+            #
+            st = YAML::object_maker( struct_type, {} )
+            st.members.each do |m|
+                st.send( "#{m}=", val[m] )
+            end
+            props.each do |k,v|
+                st.instance_variable_set(k, v)
+            end
+            st
+        else
+            raise YAML::TypeError, "Invalid Ruby Struct: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+		YAML::quick_emit( object_id, opts ) do |out|
+			#
+			# Basic struct is passed as a YAML map
+			#
+            out.map( taguri, to_yaml_style ) do |map|
+				self.members.each do |m|
+                    map.add( m, self[m] )
+                end
+				self.to_yaml_properties.each do |m|
+                    map.add( m, instance_variable_get( m ) )
+                end
+            end
+        end
+	end
+end
+
+class Array
+    yaml_as "tag:ruby.yaml.org,2002:array"
+    yaml_as "tag:yaml.org,2002:seq"
+    def yaml_initialize( tag, val ); concat( val.to_a ); end
+	def to_yaml( opts = {} )
+		YAML::quick_emit( object_id, opts ) do |out|
+            out.seq( taguri, to_yaml_style ) do |seq|
+                each do |x|
+                    seq.add( x )
+                end
+            end
+        end
+	end
+end
+
+class Exception
+    yaml_as "tag:ruby.yaml.org,2002:exception"
+    def Exception.yaml_new( klass, tag, val )
+        o = YAML.object_maker( klass, { 'mesg' => val.delete( 'message' ) } )
+        val.each_pair do |k,v|
+            o.instance_variable_set("@#{k}", v)
+        end
+        o
+    end
+	def to_yaml( opts = {} )
+		YAML::quick_emit( object_id, opts ) do |out|
+            out.map( taguri, to_yaml_style ) do |map|
+                map.add( 'message', message )
+				to_yaml_properties.each do |m|
+                    map.add( m[1..-1], instance_variable_get( m ) )
+                end
+            end
+        end
+	end
+end
+
+class String
+    yaml_as "tag:ruby.yaml.org,2002:string"
+    yaml_as "tag:yaml.org,2002:binary"
+    yaml_as "tag:yaml.org,2002:str"
+    def is_complex_yaml?
+        to_yaml_style or not to_yaml_properties.empty? or self =~ /\n.+/
+    end
+    def is_binary_data?
+        ( self.count( "^ -~", "^\r\n" ) / self.size > 0.3 || self.count( "\x00" ) > 0 ) unless empty?
+    end
+    def String.yaml_new( klass, tag, val )
+        val = val.unpack("m")[0] if tag == "tag:yaml.org,2002:binary"
+        val = { 'str' => val } if String === val
+        if Hash === val
+            s = klass.allocate
+            # Thank you, NaHi
+            String.instance_method(:initialize).
+                  bind(s).
+                  call( val.delete( 'str' ) )
+            val.each { |k,v| s.instance_variable_set( k, v ) }
+            s
+        else
+            raise YAML::TypeError, "Invalid String: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+		YAML::quick_emit( is_complex_yaml? ? object_id : nil, opts ) do |out|
+            if is_binary_data?
+                out.scalar( "tag:yaml.org,2002:binary", [self].pack("m"), :literal )
+            elsif to_yaml_properties.empty?
+                out.scalar( taguri, self, self =~ /^:/ ? :quote2 : to_yaml_style )
+            else
+                out.map( taguri, to_yaml_style ) do |map|
+                    map.add( 'str', "#{self}" )
+                    to_yaml_properties.each do |m|
+                        map.add( m, instance_variable_get( m ) )
+                    end
+                end
+            end
+        end
+	end
+end
+
+class Symbol
+    yaml_as "tag:ruby.yaml.org,2002:symbol"
+    yaml_as "tag:ruby.yaml.org,2002:sym"
+    def Symbol.yaml_new( klass, tag, val )
+        if String === val
+            val = YAML::load( val ) if val =~ /\A(["']).*\1\z/
+            val.intern
+        else
+            raise YAML::TypeError, "Invalid Symbol: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+		YAML::quick_emit( nil, opts ) do |out|
+            out.scalar( "tag:yaml.org,2002:str", self.inspect, :plain )
+        end
+	end
+end
+
+class Range
+    yaml_as "tag:ruby.yaml.org,2002:range"
+    def Range.yaml_new( klass, tag, val )
+        inr = %r'(\w+|[+-]?\d+(?:\.\d+)?(?:e[+-]\d+)?|"(?:[^\\"]|\\.)*")'
+        opts = {}
+        if String === val and val =~ /^#{inr}(\.{2,3})#{inr}$/o
+            r1, rdots, r2 = $1, $2, $3
+            opts = {
+                'begin' => YAML.load( "--- #{r1}" ),
+                'end' => YAML.load( "--- #{r2}" ),
+                'excl' => rdots.length == 3
+            }
+            val = {}
+        elsif Hash === val
+            opts['begin'] = val.delete('begin')
+            opts['end'] = val.delete('end')
+            opts['excl'] = val.delete('excl')
+        end
+        if Hash === opts
+            r = YAML::object_maker( klass, {} )
+            # Thank you, NaHi
+            Range.instance_method(:initialize).
+                  bind(r).
+                  call( opts['begin'], opts['end'], opts['excl'] )
+            val.each { |k,v| r.instance_variable_set( k, v ) }
+            r
+        else
+            raise YAML::TypeError, "Invalid Range: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+		YAML::quick_emit( object_id, opts ) do |out|
+            # if self.begin.is_complex_yaml? or self.begin.respond_to? :to_str or
+            #   self.end.is_complex_yaml? or self.end.respond_to? :to_str or
+            #   not to_yaml_properties.empty?
+                out.map( taguri, to_yaml_style ) do |map|
+                    map.add( 'begin', self.begin )
+                    map.add( 'end', self.end )
+                    map.add( 'excl', self.exclude_end? )
+                    to_yaml_properties.each do |m|
+                        map.add( m, instance_variable_get( m ) )
+                    end
+                end
+            # else
+            #     out.scalar( taguri ) do |sc|
+            #         sc.embed( self.begin )
+            #         sc.concat( self.exclude_end? ? "..." : ".." )
+            #         sc.embed( self.end )
+            #     end
+            # end
+        end
+	end
+end
+
+class Regexp
+    yaml_as "tag:ruby.yaml.org,2002:regexp"
+    def Regexp.yaml_new( klass, tag, val )
+        if String === val and val =~ /^\/(.*)\/([mix]*)$/
+            val = { 'regexp' => $1, 'mods' => $2 }
+        end
+        if Hash === val
+            mods = nil
+            unless val['mods'].to_s.empty?
+                mods = 0x00
+                mods |= Regexp::EXTENDED if val['mods'].include?( 'x' )
+                mods |= Regexp::IGNORECASE if val['mods'].include?( 'i' )
+                mods |= Regexp::MULTILINE if val['mods'].include?( 'm' )
+            end
+            val.delete( 'mods' )
+            r = YAML::object_maker( klass, {} )
+            Regexp.instance_method(:initialize).
+                  bind(r).
+                  call( val.delete( 'regexp' ), mods )
+            val.each { |k,v| r.instance_variable_set( k, v ) }
+            r
+        else
+            raise YAML::TypeError, "Invalid Regular expression: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+		YAML::quick_emit( nil, opts ) do |out|
+            if to_yaml_properties.empty?
+                out.scalar( taguri, self.inspect, :plain )
+            else
+                out.map( taguri, to_yaml_style ) do |map|
+                    src = self.inspect
+                    if src =~ /\A\/(.*)\/([a-z]*)\Z/
+                        map.add( 'regexp', $1 )
+                        map.add( 'mods', $2 )
+                    else
+		                raise YAML::TypeError, "Invalid Regular expression: " + src
+                    end
+                    to_yaml_properties.each do |m|
+                        map.add( m, instance_variable_get( m ) )
+                    end
+                end
+            end
+        end
+	end
+end
+
+class Time
+    yaml_as "tag:ruby.yaml.org,2002:time"
+    yaml_as "tag:yaml.org,2002:timestamp"
+    def Time.yaml_new( klass, tag, val )
+        if Hash === val
+            t = val.delete( 'at' )
+            val.each { |k,v| t.instance_variable_set( k, v ) }
+            t
+        else
+            raise YAML::TypeError, "Invalid Time: " + val.inspect
+        end
+    end
+	def to_yaml( opts = {} )
+		YAML::quick_emit( object_id, opts ) do |out|
+            tz = "Z"
+            # from the tidy Tobias Peters <t-peters@gmx.de> Thanks!
+            unless self.utc?
+                utc_same_instant = self.dup.utc
+                utc_same_writing = Time.utc(year,month,day,hour,min,sec,usec)
+                difference_to_utc = utc_same_writing - utc_same_instant
+                if (difference_to_utc < 0) 
+                    difference_sign = '-'
+                    absolute_difference = -difference_to_utc
+                else
+                    difference_sign = '+'
+                    absolute_difference = difference_to_utc
+                end
+                difference_minutes = (absolute_difference/60).round
+                tz = "%s%02d:%02d" % [ difference_sign, difference_minutes / 60, difference_minutes % 60]
+            end
+            standard = self.strftime( "%Y-%m-%d %H:%M:%S" )
+            standard += ".%06d" % [usec] if usec.nonzero?
+            standard += " %s" % [tz]
+            if to_yaml_properties.empty?
+                out.scalar( taguri, standard, :plain )
+            else
+                out.map( taguri, to_yaml_style ) do |map|
+                    map.add( 'at', standard )
+                    to_yaml_properties.each do |m|
+                        map.add( m, instance_variable_get( m ) )
+                    end
+                end
+            end
+        end
+	end
+end
+
+class Date
+    yaml_as "tag:yaml.org,2002:timestamp#ymd"
+	def to_yaml( opts = {} )
+		YAML::quick_emit( object_id, opts ) do |out|
+            out.scalar( "tag:yaml.org,2002:timestamp", self.to_s, :plain )
+        end
+	end
+end
+
+class Integer
+    yaml_as "tag:yaml.org,2002:int"
+	def to_yaml( opts = {} )
+		YAML::quick_emit( nil, opts ) do |out|
+            out.scalar( "tag:yaml.org,2002:int", self.to_s, :plain )
+        end
+	end
+end
+
+class Float
+    yaml_as "tag:yaml.org,2002:float"
+	def to_yaml( opts = {} )
+		YAML::quick_emit( nil, opts ) do |out|
+            str = self.to_s
+            if str == "Infinity"
+                str = ".Inf"
+            elsif str == "-Infinity"
+                str = "-.Inf"
+            elsif str == "NaN"
+                str = ".NaN"
+            end
+            out.scalar( "tag:yaml.org,2002:float", str, :plain )
+        end
+	end
+end
+
+class TrueClass
+    yaml_as "tag:yaml.org,2002:bool#yes"
+	def to_yaml( opts = {} )
+		YAML::quick_emit( nil, opts ) do |out|
+            out.scalar( taguri, "true", :plain )
+        end
+	end
+end
+
+class FalseClass
+    yaml_as "tag:yaml.org,2002:bool#no"
+	def to_yaml( opts = {} )
+		YAML::quick_emit( nil, opts ) do |out|
+            out.scalar( taguri, "false", :plain )
+        end
+	end
+end
+
+class NilClass 
+    yaml_as "tag:yaml.org,2002:null"
+	def to_yaml( opts = {} )
+		YAML::quick_emit( nil, opts ) do |out|
+            out.scalar( taguri, "", :plain )
+        end
+	end
+end
+
diff --git a/ruby_1_8_6/lib/yaml/store.rb b/ruby_1_8_6/lib/yaml/store.rb
new file mode 100644
index 0000000000..2ffa9554b9
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/store.rb
@@ -0,0 +1,29 @@
+#
+# YAML::Store
+#
+require 'yaml'
+require 'pstore'
+
+class YAML::Store < PStore
+  def initialize( *o )
+    @opt = YAML::DEFAULTS.dup
+    if String === o.first
+      super(o.shift)
+    end
+    if o.last.is_a? Hash
+      @opt.update(o.pop)
+    end
+  end
+
+  def dump(table)
+    @table.to_yaml(@opt)
+  end
+
+  def load(content)
+    YAML::load(content)
+  end
+
+  def load_file(file)
+    YAML::load(file)
+  end
+end
diff --git a/ruby_1_8_6/lib/yaml/stream.rb b/ruby_1_8_6/lib/yaml/stream.rb
new file mode 100644
index 0000000000..060fbc4200
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/stream.rb
@@ -0,0 +1,40 @@
+module YAML
+
+	#
+	# YAML::Stream -- for emitting many documents
+	#
+	class Stream
+
+		attr_accessor :documents, :options
+
+		def initialize( opts = {} )
+			@options = opts
+			@documents = []
+		end
+		
+        def []( i )
+            @documents[ i ]
+        end
+
+		def add( doc )
+			@documents << doc
+		end
+
+		def edit( doc_num, doc )
+			@documents[ doc_num ] = doc
+		end
+
+		def emit( io = nil )
+            # opts = @options.dup
+			# opts[:UseHeader] = true if @documents.length > 1
+            out = YAML.emitter
+            out.reset( io || io2 = StringIO.new )
+            @documents.each { |v|
+                v.to_yaml( out )
+            }
+            io || ( io2.rewind; io2.read )
+		end
+
+	end
+
+end
diff --git a/ruby_1_8_6/lib/yaml/stringio.rb b/ruby_1_8_6/lib/yaml/stringio.rb
new file mode 100644
index 0000000000..8ad949fa2b
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/stringio.rb
@@ -0,0 +1,83 @@
+#
+# Limited StringIO if no core lib is available
+#
+begin
+require 'stringio'
+rescue LoadError
+    # StringIO based on code by MoonWolf
+    class StringIO
+        def initialize(string="")
+            @string=string
+            @pos=0
+            @eof=(string.size==0)
+        end
+        def pos
+            @pos
+        end    
+        def eof
+            @eof
+        end
+        alias eof? eof
+        def readline(rs=$/)
+            if @eof
+                raise EOFError
+            else
+                if p = @string[@pos..-1]=~rs
+                    line = @string[@pos,p+1]
+                else
+                    line = @string[@pos..-1]
+                end
+                @pos+=line.size
+                @eof =true if @pos==@string.size
+                $_ = line
+            end
+        end
+        def rewind
+            seek(0,0)
+        end
+        def seek(offset,whence)
+            case whence
+            when 0
+                @pos=offset
+            when 1
+                @pos+=offset
+            when 2
+                @pos=@string.size+offset
+            end
+            @eof=(@pos>=@string.size)
+            0
+        end
+    end
+
+	#
+	# Class method for creating streams
+	#
+	def YAML.make_stream( io )
+        if String === io
+            io = StringIO.new( io )
+        elsif not IO === io
+            raise YAML::Error, "YAML stream must be an IO or String object."
+        end
+        if YAML::unicode
+            def io.readline
+                YAML.utf_to_internal( readline( @ln_sep ), @utf_encoding )
+            end
+            def io.check_unicode
+                @utf_encoding = YAML.sniff_encoding( read( 4 ) )
+                @ln_sep = YAML.enc_separator( @utf_encoding )
+                seek( -4, IO::SEEK_CUR )
+            end
+		    def io.utf_encoding
+		    	@utf_encoding
+		    end
+            io.check_unicode
+        else
+            def io.utf_encoding
+                :None
+            end
+        end
+        io
+	end
+
+end
+
diff --git a/ruby_1_8_6/lib/yaml/syck.rb b/ruby_1_8_6/lib/yaml/syck.rb
new file mode 100644
index 0000000000..faf57e8036
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/syck.rb
@@ -0,0 +1,19 @@
+#
+# YAML::Syck module
+# .. glues syck and yaml.rb together ..
+#
+require 'syck'
+require 'yaml/basenode'
+
+module YAML
+    module Syck
+
+        #
+        # Mixin BaseNode functionality
+        #
+        class Node
+            include YAML::BaseNode
+        end
+
+    end
+end
diff --git a/ruby_1_8_6/lib/yaml/tag.rb b/ruby_1_8_6/lib/yaml/tag.rb
new file mode 100644
index 0000000000..0fb6bef9a0
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/tag.rb
@@ -0,0 +1,91 @@
+# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
+# $Id$
+#
+# = yaml/tag.rb: methods for associating a taguri to a class.
+#
+# Author:: why the lucky stiff
+# 
+module YAML
+    # A dictionary of taguris which map to
+    # Ruby classes.
+    @@tagged_classes = {}
+    
+    # 
+    # Associates a taguri _tag_ with a Ruby class _cls_.  The taguri is used to give types
+    # to classes when loading YAML.  Taguris are of the form:
+    #
+    #   tag:authorityName,date:specific
+    #
+    # The +authorityName+ is a domain name or email address.  The +date+ is the date the type
+    # was issued in YYYY or YYYY-MM or YYYY-MM-DD format.  The +specific+ is a name for
+    # the type being added.
+    # 
+    # For example, built-in YAML types have 'yaml.org' as the +authorityName+ and '2002' as the
+    # +date+.  The +specific+ is simply the name of the type:
+    #
+    #  tag:yaml.org,2002:int
+    #  tag:yaml.org,2002:float
+    #  tag:yaml.org,2002:timestamp
+    #
+    # The domain must be owned by you on the +date+ declared.  If you don't own any domains on the
+    # date you declare the type, you can simply use an e-mail address.
+    #
+    #  tag:why@ruby-lang.org,2004:notes/personal
+    #
+    def YAML.tag_class( tag, cls )
+        if @@tagged_classes.has_key? tag
+            warn "class #{ @@tagged_classes[tag] } held ownership of the #{ tag } tag"
+        end
+        @@tagged_classes[tag] = cls
+    end
+
+    # Returns the complete dictionary of taguris, paired with classes.  The key for
+    # the dictionary is the full taguri.  The value for each key is the class constant
+    # associated to that taguri.
+    #
+    #  YAML.tagged_classes["tag:yaml.org,2002:int"] => Integer
+    #
+    def YAML.tagged_classes
+        @@tagged_classes
+    end
+end
+
+class Module
+    # :stopdoc:
+
+    # Adds a taguri _tag_ to a class, used when dumping or loading the class
+    # in YAML.  See YAML::tag_class for detailed information on typing and
+    # taguris.
+    def yaml_as( tag, sc = true )
+        verbose, $VERBOSE = $VERBOSE, nil
+        class_eval <<-"end;", __FILE__, __LINE__+1
+            attr_writer :taguri
+            def taguri
+                if respond_to? :to_yaml_type
+                    YAML::tagurize( to_yaml_type[1..-1] )
+                else
+                    return @taguri if defined?(@taguri) and @taguri
+                    tag = #{ tag.dump }
+                    if self.class.yaml_tag_subclasses? and self.class != YAML::tagged_classes[tag]
+                        tag = "\#{ tag }:\#{ self.class.yaml_tag_class_name }"
+                    end
+                    tag
+                end
+            end
+            def self.yaml_tag_subclasses?; #{ sc ? 'true' : 'false' }; end
+        end;
+        YAML::tag_class tag, self
+    ensure
+        $VERBOSE = verbose
+    end
+    # Transforms the subclass name into a name suitable for display
+    # in a subclassed tag.
+    def yaml_tag_class_name
+        self.name
+    end
+    # Transforms the subclass name found in the tag into a Ruby
+    # constant name.
+    def yaml_tag_read_class( name )
+        name
+    end
+end
diff --git a/ruby_1_8_6/lib/yaml/types.rb b/ruby_1_8_6/lib/yaml/types.rb
new file mode 100644
index 0000000000..05113f216d
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/types.rb
@@ -0,0 +1,194 @@
+# -*- mode: ruby; ruby-indent-level: 4 -*- vim: sw=4
+#
+# Classes required by the full core typeset
+#
+
+module YAML
+
+    #
+    # Default private type
+    #
+    class PrivateType
+        def self.tag_subclasses?; false; end
+        attr_accessor :type_id, :value
+        verbose, $VERBOSE = $VERBOSE, nil
+        def initialize( type, val )
+            @type_id = type; @value = val
+            @value.taguri = "x-private:#{ @type_id }"
+        end
+        def to_yaml( opts = {} )
+            @value.to_yaml( opts )
+        end
+    ensure
+        $VERBOSE = verbose
+    end
+
+    #
+    # Default domain type
+    #
+    class DomainType
+        def self.tag_subclasses?; false; end
+        attr_accessor :domain, :type_id, :value
+        verbose, $VERBOSE = $VERBOSE, nil
+        def initialize( domain, type, val )
+            @domain = domain; @type_id = type; @value = val
+            @value.taguri = "tag:#{ @domain }:#{ @type_id }"
+        end
+        def to_yaml( opts = {} )
+            @value.to_yaml( opts )
+        end
+    ensure
+        $VERBOSE = verbose
+    end
+
+    #
+    # Unresolved objects
+    #
+    class Object
+        def self.tag_subclasses?; false; end
+        def to_yaml( opts = {} )
+            YAML::quick_emit( object_id, opts ) do |out|
+                out.map( "tag:ruby.yaml.org,2002:object:#{ @class }", to_yaml_style ) do |map|
+                    @ivars.each do |k,v|
+                        map.add( k, v )
+                    end
+                end
+            end
+        end
+    end
+
+    #
+    # YAML Hash class to support comments and defaults
+    #
+    class SpecialHash < ::Hash 
+        attr_accessor :default
+        def inspect
+            self.default.to_s
+        end
+        def to_s
+            self.default.to_s
+        end
+        def update( h )
+            if YAML::SpecialHash === h
+                @default = h.default if h.default
+            end
+            super( h )
+        end
+        def to_yaml( opts = {} )
+            opts[:DefaultKey] = self.default
+            super( opts )
+        end
+    end
+
+    #
+    # Builtin collection: !omap
+    #
+    class Omap < ::Array
+        yaml_as "tag:yaml.org,2002:omap"
+        def yaml_initialize( tag, val )
+            if Array === val
+                val.each do |v|
+                    if Hash === v
+                        concat( v.to_a )		# Convert the map to a sequence
+                    else
+                        raise YAML::Error, "Invalid !omap entry: " + val.inspect
+                    end
+                end
+            else
+                raise YAML::Error, "Invalid !omap: " + val.inspect
+            end
+            self
+        end
+        def self.[]( *vals )
+            o = Omap.new
+            0.step( vals.length - 1, 2 ) do |i|
+                o[vals[i]] = vals[i+1]
+            end
+            o
+        end
+        def []( k )
+            self.assoc( k ).to_a[1]
+        end
+        def []=( k, *rest )
+            val, set = rest.reverse
+            if ( tmp = self.assoc( k ) ) and not set
+                tmp[1] = val
+            else
+                self << [ k, val ] 
+            end
+            val
+        end
+        def has_key?( k )
+            self.assoc( k ) ? true : false
+        end
+        def is_complex_yaml?
+            true
+        end
+        def to_yaml( opts = {} )
+            YAML::quick_emit( self.object_id, opts ) do |out|
+                out.seq( taguri, to_yaml_style ) do |seq|
+                    self.each do |v|
+                        seq.add( Hash[ *v ] )
+                    end
+                end
+            end
+        end
+    end
+
+    #
+    # Builtin collection: !pairs
+    #
+    class Pairs < ::Array
+        yaml_as "tag:yaml.org,2002:pairs"
+        def yaml_initialize( tag, val )
+            if Array === val
+                val.each do |v|
+                    if Hash === v
+                        concat( v.to_a )		# Convert the map to a sequence
+                    else
+                        raise YAML::Error, "Invalid !pairs entry: " + val.inspect
+                    end
+                end
+            else
+                raise YAML::Error, "Invalid !pairs: " + val.inspect
+            end
+            self
+        end
+        def self.[]( *vals )
+            p = Pairs.new
+            0.step( vals.length - 1, 2 ) { |i|
+                p[vals[i]] = vals[i+1]
+            }
+            p
+        end
+        def []( k )
+            self.assoc( k ).to_a
+        end
+        def []=( k, val )
+            self << [ k, val ] 
+            val
+        end
+        def has_key?( k )
+            self.assoc( k ) ? true : false
+        end
+        def is_complex_yaml?
+            true
+        end
+        def to_yaml( opts = {} )
+            YAML::quick_emit( self.object_id, opts ) do |out|
+                out.seq( taguri, to_yaml_style ) do |seq|
+                    self.each do |v|
+                        seq.add( Hash[ *v ] )
+                    end
+                end
+            end
+        end
+    end
+
+    #
+    # Builtin collection: !set
+    #
+    class Set < ::Hash
+        yaml_as "tag:yaml.org,2002:set"
+    end
+end
diff --git a/ruby_1_8_6/lib/yaml/yamlnode.rb b/ruby_1_8_6/lib/yaml/yamlnode.rb
new file mode 100644
index 0000000000..e36a18e694
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/yamlnode.rb
@@ -0,0 +1,54 @@
+#
+# YAML::YamlNode class
+#
+require 'yaml/basenode'
+
+module YAML
+
+    #
+    # YAML Generic Model container
+    #
+    class YamlNode
+        include BaseNode
+        attr_accessor :kind, :type_id, :value, :anchor
+        def initialize( t, v )
+            @type_id = t
+            if Hash === v
+                @kind = 'map'
+                @value = {}
+                v.each { |k,v|
+                    @value[ k.transform ] = [ k, v ]
+                }
+            elsif Array === v
+                @kind = 'seq'
+                @value = v
+            elsif String === v
+                @kind = 'scalar'
+                @value = v
+            end
+        end
+
+        #
+        # Transform this node fully into a native type
+        #
+        def transform
+            t = nil
+            if @value.is_a? Hash
+                t = {}
+                @value.each { |k,v|
+                    t[ k ] = v[1].transform
+                }
+            elsif @value.is_a? Array
+                t = []
+                @value.each { |v|
+                    t.push v.transform
+                }
+            else
+                t = @value
+            end
+            YAML.transfer_method( @type_id, t )
+        end
+
+    end
+
+end
diff --git a/ruby_1_8_6/lib/yaml/ypath.rb b/ruby_1_8_6/lib/yaml/ypath.rb
new file mode 100644
index 0000000000..81348ca043
--- /dev/null
+++ b/ruby_1_8_6/lib/yaml/ypath.rb
@@ -0,0 +1,52 @@
+#
+# YAML::YPath
+#
+
+module YAML
+
+    class YPath
+        attr_accessor :segments, :predicates, :flags
+        def initialize( str )
+            @segments = []
+            @predicates = []
+            @flags = nil
+            while str =~ /^\/?(\/|[^\/\[]+)(?:\[([^\]]+)\])?/
+                @segments.push $1
+                @predicates.push $2
+                str = $'
+            end
+            unless str.to_s.empty?
+                @segments += str.split( "/" )
+            end
+            if @segments.length == 0
+                @segments.push "."
+            end
+        end
+        def YPath.each_path( str )
+            #
+            # Find choices
+            #
+            paths = []
+            str = "(#{ str })"
+            while str.sub!( /\(([^()]+)\)/, "\n#{ paths.length }\n" )
+                paths.push $1.split( '|' )
+            end
+
+            #
+            # Construct all possible paths
+            #
+            all = [ str ]
+            ( paths.length - 1 ).downto( 0 ) do |i|
+                all = all.collect do |a|
+                    paths[i].collect do |p|
+                        a.gsub( /\n#{ i }\n/, p )
+                    end
+                end.flatten.uniq
+            end
+            all.collect do |path|
+                yield YPath.new( path )
+            end
+        end
+    end
+
+end
diff --git a/ruby_1_8_6/main.c b/ruby_1_8_6/main.c
new file mode 100644
index 0000000000..bee9a4b15b
--- /dev/null
+++ b/ruby_1_8_6/main.c
@@ -0,0 +1,51 @@
+/**********************************************************************
+
+  main.c -
+
+  $Author$
+  $Date$
+  created at: Fri Aug 19 13:19:58 JST 1994
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+
+#ifdef __human68k__
+int _stacksize = 262144;
+#endif
+
+#if defined __MINGW32__
+int _CRT_glob = 0;
+#endif
+
+#if defined(__MACOS__) && defined(__MWERKS__)
+#include <console.h>
+#endif
+
+/* to link startup code with ObjC support */
+#if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
+static void objcdummyfunction( void ) { objc_msgSend(); }
+#endif
+
+int
+main(argc, argv, envp)
+    int argc;
+    char **argv, **envp;
+{
+#ifdef _WIN32
+    NtInitialize(&argc, &argv);
+#endif
+#if defined(__MACOS__) && defined(__MWERKS__)
+    argc = ccommand(&argv);
+#endif
+
+    {
+        RUBY_INIT_STACK
+        ruby_init();
+        ruby_options(argc, argv);
+        ruby_run();
+    }
+    return 0;
+}
diff --git a/ruby_1_8_6/marshal.c b/ruby_1_8_6/marshal.c
new file mode 100644
index 0000000000..185ace6a72
--- /dev/null
+++ b/ruby_1_8_6/marshal.c
@@ -0,0 +1,1510 @@
+/**********************************************************************
+
+  marshal.c -
+
+  $Author$
+  $Date$
+  created at: Thu Apr 27 16:30:01 JST 1995
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "rubyio.h"
+#include "st.h"
+#include "util.h"
+
+#include <math.h>
+#ifdef HAVE_FLOAT_H
+#include <float.h>
+#endif
+#ifdef HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
+
+#define BITSPERSHORT (2*CHAR_BIT)
+#define SHORTMASK ((1<<BITSPERSHORT)-1)
+#define SHORTDN(x) RSHIFT(x,BITSPERSHORT)
+
+#if SIZEOF_SHORT == SIZEOF_BDIGITS
+#define SHORTLEN(x) (x)
+#else
+static int
+shortlen(len, ds)
+    long len;
+    BDIGIT *ds;
+{
+    BDIGIT num;
+    int offset = 0;
+
+    num = ds[len-1];
+    while (num) {
+	num = SHORTDN(num);
+	offset++;
+    }
+    return (len - 1)*sizeof(BDIGIT)/2 + offset;
+}
+#define SHORTLEN(x) shortlen((x),d)
+#endif
+
+#define MARSHAL_MAJOR   4
+#define MARSHAL_MINOR   8
+
+#define TYPE_NIL	'0'
+#define TYPE_TRUE	'T'
+#define TYPE_FALSE	'F'
+#define TYPE_FIXNUM	'i'
+
+#define TYPE_EXTENDED	'e'
+#define TYPE_UCLASS	'C'
+#define TYPE_OBJECT	'o'
+#define TYPE_DATA       'd'
+#define TYPE_USERDEF	'u'
+#define TYPE_USRMARSHAL	'U'
+#define TYPE_FLOAT	'f'
+#define TYPE_BIGNUM	'l'
+#define TYPE_STRING	'"'
+#define TYPE_REGEXP	'/'
+#define TYPE_ARRAY	'['
+#define TYPE_HASH	'{'
+#define TYPE_HASH_DEF	'}'
+#define TYPE_STRUCT	'S'
+#define TYPE_MODULE_OLD	'M'
+#define TYPE_CLASS	'c'
+#define TYPE_MODULE	'm'
+
+#define TYPE_SYMBOL	':'
+#define TYPE_SYMLINK	';'
+
+#define TYPE_IVAR	'I'
+#define TYPE_LINK	'@'
+
+static ID s_dump, s_load, s_mdump, s_mload;
+static ID s_dump_data, s_load_data, s_alloc;
+static ID s_getc, s_read, s_write, s_binmode;
+
+struct dump_arg {
+    VALUE obj;
+    VALUE str, dest;
+    st_table *symbols;
+    st_table *data;
+    int taint;
+};
+
+struct dump_call_arg {
+    VALUE obj;
+    struct dump_arg *arg;
+    int limit;
+};
+
+static VALUE
+class2path(klass)
+    VALUE klass;
+{
+    VALUE path = rb_class_path(klass);
+    char *n = RSTRING(path)->ptr;
+
+    if (n[0] == '#') {
+	rb_raise(rb_eTypeError, "can't dump anonymous %s %s",
+		 (TYPE(klass) == T_CLASS ? "class" : "module"),
+		 n);
+    }
+    if (rb_path2class(n) != rb_class_real(klass)) {
+	rb_raise(rb_eTypeError, "%s can't be referred", n);
+    }
+    return path;
+}
+
+static void w_long _((long, struct dump_arg*));
+
+static void
+w_nbyte(s, n, arg)
+    char *s;
+    int n;
+    struct dump_arg *arg;
+{
+    VALUE buf = arg->str;
+    rb_str_buf_cat(buf, s, n);
+    if (arg->dest && RSTRING(buf)->len >= BUFSIZ) {
+	if (arg->taint) OBJ_TAINT(buf);
+	rb_io_write(arg->dest, buf);
+	rb_str_resize(buf, 0);
+    }
+}
+
+static void
+w_byte(c, arg)
+    char c;
+    struct dump_arg *arg;
+{
+    w_nbyte(&c, 1, arg);
+}
+
+static void
+w_bytes(s, n, arg)
+    char *s;
+    int n;
+    struct dump_arg *arg;
+{
+    w_long(n, arg);
+    w_nbyte(s, n, arg);
+}
+
+static void
+w_short(x, arg)
+    int x;
+    struct dump_arg *arg;
+{
+    w_byte((x >> 0) & 0xff, arg);
+    w_byte((x >> 8) & 0xff, arg);
+}
+
+static void
+w_long(x, arg)
+    long x;
+    struct dump_arg *arg;
+{
+    char buf[sizeof(long)+1];
+    int i, len = 0;
+
+#if SIZEOF_LONG > 4
+    if (!(RSHIFT(x, 31) == 0 || RSHIFT(x, 31) == -1)) {
+	/* big long does not fit in 4 bytes */
+	rb_raise(rb_eTypeError, "long too big to dump");
+    }
+#endif
+
+    if (x == 0) {
+	w_byte(0, arg);
+	return;
+    }
+    if (0 < x && x < 123) {
+	w_byte(x + 5, arg);
+	return;
+    }
+    if (-124 < x && x < 0) {
+	w_byte((x - 5)&0xff, arg);
+	return;
+    }
+    for (i=1;i<sizeof(long)+1;i++) {
+	buf[i] = x & 0xff;
+	x = RSHIFT(x,8);
+	if (x == 0) {
+	    buf[0] = i;
+	    break;
+	}
+	if (x == -1) {
+	    buf[0] = -i;
+	    break;
+	}
+    }
+    len = i;
+    for (i=0;i<=len;i++) {
+	w_byte(buf[i], arg);
+    }
+}
+
+#ifdef DBL_MANT_DIG
+#define DECIMAL_MANT (53-16)	/* from IEEE754 double precision */
+
+#if DBL_MANT_DIG > 32
+#define MANT_BITS 32
+#elif DBL_MANT_DIG > 24
+#define MANT_BITS 24
+#elif DBL_MANT_DIG > 16
+#define MANT_BITS 16
+#else
+#define MANT_BITS 8
+#endif
+
+static int
+save_mantissa(d, buf)
+    double d;
+    char *buf;
+{
+    int e, i = 0;
+    unsigned long m;
+    double n;
+
+    d = modf(ldexp(frexp(fabs(d), &e), DECIMAL_MANT), &d);
+    if (d > 0) {
+	buf[i++] = 0;
+	do {
+	    d = modf(ldexp(d, MANT_BITS), &n);
+	    m = (unsigned long)n;
+#if MANT_BITS > 24
+	    buf[i++] = m >> 24;
+#endif
+#if MANT_BITS > 16
+	    buf[i++] = m >> 16;
+#endif
+#if MANT_BITS > 8
+	    buf[i++] = m >> 8;
+#endif
+	    buf[i++] = m;
+	} while (d > 0);
+	while (!buf[i - 1]) --i;
+    }
+    return i;
+}
+
+static double
+load_mantissa(d, buf, len)
+    double d;
+    const char *buf;
+    int len;
+{
+    if (--len > 0 && !*buf++) {	/* binary mantissa mark */
+	int e, s = d < 0, dig = 0;
+	unsigned long m;
+
+	modf(ldexp(frexp(fabs(d), &e), DECIMAL_MANT), &d);
+	do {
+	    m = 0;
+	    switch (len) {
+	      default: m = *buf++ & 0xff;
+#if MANT_BITS > 24
+	      case 3: m = (m << 8) | (*buf++ & 0xff);
+#endif
+#if MANT_BITS > 16
+	      case 2: m = (m << 8) | (*buf++ & 0xff);
+#endif
+#if MANT_BITS > 8
+	      case 1: m = (m << 8) | (*buf++ & 0xff);
+#endif
+	    }
+	    dig -= len < MANT_BITS / 8 ? 8 * (unsigned)len : MANT_BITS;
+	    d += ldexp((double)m, dig);
+	} while ((len -= MANT_BITS / 8) > 0);
+	d = ldexp(d, e - DECIMAL_MANT);
+	if (s) d = -d;
+    }
+    return d;
+}
+#else
+#define load_mantissa(d, buf, len) (d)
+#define save_mantissa(d, buf) 0
+#endif
+
+#ifdef DBL_DIG
+#define FLOAT_DIG (DBL_DIG+2)
+#else
+#define FLOAT_DIG 17
+#endif
+
+static void
+w_float(d, arg)
+    double d;
+    struct dump_arg *arg;
+{
+    char buf[100];
+
+    if (isinf(d)) {
+	if (d < 0) strcpy(buf, "-inf");
+	else       strcpy(buf, "inf");
+    }
+    else if (isnan(d)) {
+	strcpy(buf, "nan");
+    }
+    else if (d == 0.0) {
+	if (1.0/d < 0) strcpy(buf, "-0");
+	else           strcpy(buf, "0");
+    }
+    else {
+	int len;
+
+	/* xxx: should not use system's sprintf(3) */
+	sprintf(buf, "%.*g", FLOAT_DIG, d);
+	len = strlen(buf);
+	w_bytes(buf, len + save_mantissa(d, buf + len), arg);
+	return;
+    }
+    w_bytes(buf, strlen(buf), arg);
+}
+
+static void
+w_symbol(id, arg)
+    ID id;
+    struct dump_arg *arg;
+{
+    char *sym = rb_id2name(id);
+    st_data_t num;
+
+    if (st_lookup(arg->symbols, id, &num)) {
+	w_byte(TYPE_SYMLINK, arg);
+	w_long((long)num, arg);
+    }
+    else {
+	w_byte(TYPE_SYMBOL, arg);
+	w_bytes(sym, strlen(sym), arg);
+	st_add_direct(arg->symbols, id, arg->symbols->num_entries);
+    }
+}
+
+static void
+w_unique(s, arg)
+    char *s;
+    struct dump_arg *arg;
+{
+    if (s[0] == '#') {
+	rb_raise(rb_eTypeError, "can't dump anonymous class %s", s);
+    }
+    w_symbol(rb_intern(s), arg);
+}
+
+static void w_object _((VALUE,struct dump_arg*,int));
+
+static int
+hash_each(key, value, arg)
+    VALUE key, value;
+    struct dump_call_arg *arg;
+{
+    w_object(key, arg->arg, arg->limit);
+    w_object(value, arg->arg, arg->limit);
+    return ST_CONTINUE;
+}
+
+static void
+w_extended(klass, arg, check)
+    VALUE klass;
+    struct dump_arg *arg;
+    int check;
+{
+    char *path;
+
+    if (check && FL_TEST(klass, FL_SINGLETON)) {
+	if (RCLASS(klass)->m_tbl->num_entries ||
+	    (RCLASS(klass)->iv_tbl && RCLASS(klass)->iv_tbl->num_entries > 1)) {
+	    rb_raise(rb_eTypeError, "singleton can't be dumped");
+	}
+	klass = RCLASS(klass)->super;
+    }
+    while (BUILTIN_TYPE(klass) == T_ICLASS) {
+	path = rb_class2name(RBASIC(klass)->klass);
+	w_byte(TYPE_EXTENDED, arg);
+	w_unique(path, arg);
+	klass = RCLASS(klass)->super;
+    }
+}
+
+static void
+w_class(type, obj, arg, check)
+    int type;
+    VALUE obj;
+    struct dump_arg *arg;
+    int check;
+{
+    char *path;
+
+    VALUE klass = CLASS_OF(obj);
+    w_extended(klass, arg, check);
+    w_byte(type, arg);
+    path = RSTRING(class2path(rb_class_real(klass)))->ptr;
+    w_unique(path, arg);
+}
+
+static void
+w_uclass(obj, base_klass, arg)
+    VALUE obj, base_klass;
+    struct dump_arg *arg;
+{
+    VALUE klass = CLASS_OF(obj);
+
+    w_extended(klass, arg, Qtrue);
+    klass = rb_class_real(klass);
+    if (klass != base_klass) {
+	w_byte(TYPE_UCLASS, arg);
+	w_unique(RSTRING(class2path(klass))->ptr, arg);
+    }
+}
+
+static int
+w_obj_each(id, value, arg)
+    ID id;
+    VALUE value;
+    struct dump_call_arg *arg;
+{
+    w_symbol(id, arg->arg);
+    w_object(value, arg->arg, arg->limit);
+    return ST_CONTINUE;
+}
+
+static void
+w_ivar(tbl, arg)
+    st_table *tbl;
+    struct dump_call_arg *arg;
+{
+    if (tbl) {
+	w_long(tbl->num_entries, arg->arg);
+	st_foreach_safe(tbl, w_obj_each, (st_data_t)arg);
+    }
+    else {
+	w_long(0, arg->arg);
+    }
+}
+
+static void
+w_object(obj, arg, limit)
+    VALUE obj;
+    struct dump_arg *arg;
+    int limit;
+{
+    struct dump_call_arg c_arg;
+    st_table *ivtbl = 0;
+    st_data_t num;
+
+    if (limit == 0) {
+	rb_raise(rb_eArgError, "exceed depth limit");
+    }
+
+    limit--;
+    c_arg.limit = limit;
+    c_arg.arg = arg;
+
+    if (st_lookup(arg->data, obj, &num)) {
+	w_byte(TYPE_LINK, arg);
+	w_long((long)num, arg);
+	return;
+    }
+
+    if (ivtbl = rb_generic_ivar_table(obj)) {
+	w_byte(TYPE_IVAR, arg);
+    }
+    if (obj == Qnil) {
+	w_byte(TYPE_NIL, arg);
+    }
+    else if (obj == Qtrue) {
+	w_byte(TYPE_TRUE, arg);
+    }
+    else if (obj == Qfalse) {
+	w_byte(TYPE_FALSE, arg);
+    }
+    else if (FIXNUM_P(obj)) {
+#if SIZEOF_LONG <= 4
+	w_byte(TYPE_FIXNUM, arg);
+	w_long(FIX2INT(obj), arg);
+#else
+	if (RSHIFT((long)obj, 31) == 0 || RSHIFT((long)obj, 31) == -1) {
+	    w_byte(TYPE_FIXNUM, arg);
+	    w_long(FIX2LONG(obj), arg);
+	}
+	else {
+	    w_object(rb_int2big(FIX2LONG(obj)), arg, limit);
+	}
+#endif
+    }
+    else if (SYMBOL_P(obj)) {
+	w_symbol(SYM2ID(obj), arg);
+    }
+    else {
+	if (OBJ_TAINTED(obj)) arg->taint = Qtrue;
+
+	st_add_direct(arg->data, obj, arg->data->num_entries);
+	if (rb_respond_to(obj, s_mdump)) {
+	    VALUE v;
+
+	    v = rb_funcall(obj, s_mdump, 0, 0);
+	    w_class(TYPE_USRMARSHAL, obj, arg, Qfalse);
+	    w_object(v, arg, limit);
+	    if (ivtbl) w_ivar(0, &c_arg);
+	    return;
+	}
+	if (rb_respond_to(obj, s_dump)) {
+	    VALUE v;
+
+	    v = rb_funcall(obj, s_dump, 1, INT2NUM(limit));
+	    if (TYPE(v) != T_STRING) {
+		rb_raise(rb_eTypeError, "_dump() must return string");
+	    }
+	    if (!ivtbl && (ivtbl = rb_generic_ivar_table(v))) {
+		w_byte(TYPE_IVAR, arg);
+	    }
+	    w_class(TYPE_USERDEF, obj, arg, Qfalse);
+	    w_bytes(RSTRING(v)->ptr, RSTRING(v)->len, arg);
+	    if (ivtbl) {
+		w_ivar(ivtbl, &c_arg);
+	    }
+	    return;
+	}
+
+	switch (BUILTIN_TYPE(obj)) {
+	  case T_CLASS:
+	    if (FL_TEST(obj, FL_SINGLETON)) {
+		rb_raise(rb_eTypeError, "singleton class can't be dumped");
+	    }
+	    w_byte(TYPE_CLASS, arg);
+	    {
+		VALUE path = class2path(obj);
+		w_bytes(RSTRING(path)->ptr, RSTRING(path)->len, arg);
+	    }
+	    break;
+
+	  case T_MODULE:
+	    w_byte(TYPE_MODULE, arg);
+	    {
+		VALUE path = class2path(obj);
+		w_bytes(RSTRING(path)->ptr, RSTRING(path)->len, arg);
+	    }
+	    break;
+
+	  case T_FLOAT:
+	    w_byte(TYPE_FLOAT, arg);
+	    w_float(RFLOAT(obj)->value, arg);
+	    break;
+
+	  case T_BIGNUM:
+	    w_byte(TYPE_BIGNUM, arg);
+	    {
+		char sign = RBIGNUM(obj)->sign ? '+' : '-';
+		long len = RBIGNUM(obj)->len;
+		BDIGIT *d = RBIGNUM(obj)->digits;
+
+		w_byte(sign, arg);
+		w_long(SHORTLEN(len), arg); /* w_short? */
+		while (len--) {
+#if SIZEOF_BDIGITS > SIZEOF_SHORT
+		    BDIGIT num = *d;
+		    int i;
+
+		    for (i=0; i<SIZEOF_BDIGITS; i+=SIZEOF_SHORT) {
+			w_short(num & SHORTMASK, arg);
+			num = SHORTDN(num);
+			if (len == 0 && num == 0) break;
+		    }
+#else
+		    w_short(*d, arg);
+#endif
+		    d++;
+		}
+	    }
+	    break;
+
+	  case T_STRING:
+	    w_uclass(obj, rb_cString, arg);
+	    w_byte(TYPE_STRING, arg);
+	    w_bytes(RSTRING(obj)->ptr, RSTRING(obj)->len, arg);
+	    break;
+
+	  case T_REGEXP:
+	    w_uclass(obj, rb_cRegexp, arg);
+	    w_byte(TYPE_REGEXP, arg);
+	    w_bytes(RREGEXP(obj)->str, RREGEXP(obj)->len, arg);
+	    w_byte(rb_reg_options(obj), arg);
+	    break;
+
+	  case T_ARRAY:
+	    w_uclass(obj, rb_cArray, arg);
+	    w_byte(TYPE_ARRAY, arg);
+	    {
+		long len = RARRAY(obj)->len;
+		VALUE *ptr = RARRAY(obj)->ptr;
+
+		w_long(len, arg);
+		while (len--) {
+		    w_object(*ptr, arg, limit);
+		    ptr++;
+		}
+	    }
+	    break;
+
+	  case T_HASH:
+	    w_uclass(obj, rb_cHash, arg);
+	    if (NIL_P(RHASH(obj)->ifnone)) {
+		w_byte(TYPE_HASH, arg);
+	    }
+	    else if (FL_TEST(obj, FL_USER2)) {
+		/* FL_USER2 means HASH_PROC_DEFAULT (see hash.c) */
+		rb_raise(rb_eTypeError, "can't dump hash with default proc");
+	    }
+	    else {
+		w_byte(TYPE_HASH_DEF, arg);
+	    }
+	    w_long(RHASH(obj)->tbl->num_entries, arg);
+	    rb_hash_foreach(obj, hash_each, (st_data_t)&c_arg);
+	    if (!NIL_P(RHASH(obj)->ifnone)) {
+		w_object(RHASH(obj)->ifnone, arg, limit);
+	    }
+	    break;
+
+	  case T_STRUCT:
+	    w_class(TYPE_STRUCT, obj, arg, Qtrue);
+	    {
+		long len = RSTRUCT(obj)->len;
+		VALUE mem;
+		long i;
+
+		w_long(len, arg);
+		mem = rb_struct_members(obj);
+		for (i=0; i<len; i++) {
+		    w_symbol(SYM2ID(RARRAY(mem)->ptr[i]), arg);
+		    w_object(RSTRUCT(obj)->ptr[i], arg, limit);
+		}
+	    }
+	    break;
+
+	  case T_OBJECT:
+	    w_class(TYPE_OBJECT, obj, arg, Qtrue);
+	    w_ivar(ROBJECT(obj)->iv_tbl, &c_arg);
+	    break;
+
+	  case T_DATA:
+	    {
+		VALUE v;
+
+		if (!rb_respond_to(obj, s_dump_data)) {
+		    rb_raise(rb_eTypeError,
+			     "no marshal_dump is defined for class %s",
+			     rb_obj_classname(obj));
+		}
+		v = rb_funcall(obj, s_dump_data, 0);
+		w_class(TYPE_DATA, obj, arg, Qtrue);
+		w_object(v, arg, limit);
+	    }
+	    break;
+
+	  default:
+	    rb_raise(rb_eTypeError, "can't dump %s",
+		     rb_obj_classname(obj));
+	    break;
+	}
+    }
+    if (ivtbl) {
+	w_ivar(ivtbl, &c_arg);
+    }
+}
+
+static VALUE
+dump(arg)
+    struct dump_call_arg *arg;
+{
+    w_object(arg->obj, arg->arg, arg->limit);
+    if (arg->arg->dest) {
+	rb_io_write(arg->arg->dest, arg->arg->str);
+	rb_str_resize(arg->arg->str, 0);
+    }
+    return 0;
+}
+
+static VALUE
+dump_ensure(arg)
+    struct dump_arg *arg;
+{
+    st_free_table(arg->symbols);
+    st_free_table(arg->data);
+    if (arg->taint) {
+	OBJ_TAINT(arg->str);
+    }
+    return 0;
+}
+
+/*
+ * call-seq:
+ *      dump( obj [, anIO] , limit=--1 ) => anIO
+ *
+ * Serializes obj and all descendent objects. If anIO is
+ * specified, the serialized data will be written to it, otherwise the
+ * data will be returned as a String. If limit is specified, the
+ * traversal of subobjects will be limited to that depth. If limit is
+ * negative, no checking of depth will be performed.
+ *
+ *     class Klass
+ *       def initialize(str)
+ *         @str = str
+ *       end
+ *       def sayHello
+ *         @str
+ *       end
+ *     end
+ *
+ * (produces no output)
+ *
+ *     o = Klass.new("hello\n")
+ *     data = Marshal.dump(o)
+ *     obj = Marshal.load(data)
+ *     obj.sayHello   #=> "hello\n"
+ */
+static VALUE
+marshal_dump(argc, argv)
+    int argc;
+    VALUE* argv;
+{
+    VALUE obj, port, a1, a2;
+    int limit = -1;
+    struct dump_arg arg;
+    struct dump_call_arg c_arg;
+
+    port = Qnil;
+    rb_scan_args(argc, argv, "12", &obj, &a1, &a2);
+    if (argc == 3) {
+	if (!NIL_P(a2)) limit = NUM2INT(a2);
+	if (NIL_P(a1)) goto type_error;
+	port = a1;
+    }
+    else if (argc == 2) {
+	if (FIXNUM_P(a1)) limit = FIX2INT(a1);
+	else if (NIL_P(a1)) goto type_error;
+	else port = a1;
+    }
+    arg.dest = 0;
+    if (!NIL_P(port)) {
+	if (!rb_respond_to(port, s_write)) {
+	  type_error:
+	    rb_raise(rb_eTypeError, "instance of IO needed");
+	}
+	arg.str = rb_str_buf_new(0);
+	arg.dest = port;
+	if (rb_respond_to(port, s_binmode)) {
+	    rb_funcall2(port, s_binmode, 0, 0);
+	}
+    }
+    else {
+	port = rb_str_buf_new(0);
+	arg.str = port;
+    }
+
+    arg.symbols = st_init_numtable();
+    arg.data    = st_init_numtable();
+    arg.taint   = Qfalse;
+    c_arg.obj   = obj;
+    c_arg.arg   = &arg;
+    c_arg.limit = limit;
+
+    w_byte(MARSHAL_MAJOR, &arg);
+    w_byte(MARSHAL_MINOR, &arg);
+
+    rb_ensure(dump, (VALUE)&c_arg, dump_ensure, (VALUE)&arg);
+
+    return port;
+}
+
+struct load_arg {
+    VALUE src;
+    long offset;
+    st_table *symbols;
+    VALUE data;
+    VALUE proc;
+    int taint;
+};
+
+static VALUE r_object _((struct load_arg *arg));
+
+static int
+r_byte(arg)
+    struct load_arg *arg;
+{
+    int c;
+
+    if (TYPE(arg->src) == T_STRING) {
+	if (RSTRING(arg->src)->len > arg->offset) {
+	    c = (unsigned char)RSTRING(arg->src)->ptr[arg->offset++];
+	}
+	else {
+	    rb_raise(rb_eArgError, "marshal data too short");
+	}
+    }
+    else {
+	VALUE src = arg->src;
+	VALUE v = rb_funcall2(src, s_getc, 0, 0);
+	if (NIL_P(v)) rb_eof_error();
+	c = (unsigned char)FIX2INT(v);
+    }
+    return c;
+}
+
+static void
+long_toobig(size)
+    int size;
+{
+    rb_raise(rb_eTypeError, "long too big for this architecture (size %d, given %d)",
+	     sizeof(long), size);
+}
+
+#undef SIGN_EXTEND_CHAR
+#if __STDC__
+# define SIGN_EXTEND_CHAR(c) ((signed char)(c))
+#else  /* not __STDC__ */
+/* As in Harbison and Steele.  */
+# define SIGN_EXTEND_CHAR(c) ((((unsigned char)(c)) ^ 128) - 128)
+#endif
+
+static long
+r_long(arg)
+    struct load_arg *arg;
+{
+    register long x;
+    int c = SIGN_EXTEND_CHAR(r_byte(arg));
+    long i;
+
+    if (c == 0) return 0;
+    if (c > 0) {
+	if (4 < c && c < 128) {
+	    return c - 5;
+	}
+	if (c > sizeof(long)) long_toobig(c);
+	x = 0;
+	for (i=0;i<c;i++) {
+	    x |= (long)r_byte(arg) << (8*i);
+	}
+    }
+    else {
+	if (-129 < c && c < -4) {
+	    return c + 5;
+	}
+	c = -c;
+	if (c > sizeof(long)) long_toobig(c);
+	x = -1;
+	for (i=0;i<c;i++) {
+	    x &= ~((long)0xff << (8*i));
+	    x |= (long)r_byte(arg) << (8*i);
+	}
+    }
+    return x;
+}
+
+#define r_bytes(arg) r_bytes0(r_long(arg), (arg))
+
+static VALUE
+r_bytes0(len, arg)
+    long len;
+    struct load_arg *arg;
+{
+    VALUE str;
+
+    if (len == 0) return rb_str_new(0, 0);
+    if (TYPE(arg->src) == T_STRING) {
+	if (RSTRING(arg->src)->len > arg->offset) {
+	    str = rb_str_new(RSTRING(arg->src)->ptr+arg->offset, len);
+	    arg->offset += len;
+	}
+	else {
+	  too_short:
+	    rb_raise(rb_eArgError, "marshal data too short");
+	}
+    }
+    else {
+	VALUE src = arg->src;
+	VALUE n = LONG2NUM(len);
+	str = rb_funcall2(src, s_read, 1, &n);
+	if (NIL_P(str)) goto too_short;
+	StringValue(str);
+	if (RSTRING(str)->len != len) goto too_short;
+	if (OBJ_TAINTED(str)) arg->taint = Qtrue;
+    }
+    return str;
+}
+
+static ID
+r_symlink(arg)
+    struct load_arg *arg;
+{
+    ID id;
+    long num = r_long(arg);
+
+    if (st_lookup(arg->symbols, num, &id)) {
+	return id;
+    }
+    rb_raise(rb_eArgError, "bad symbol");
+}
+
+static ID
+r_symreal(arg)
+    struct load_arg *arg;
+{
+    ID id;
+
+    id = rb_intern(RSTRING(r_bytes(arg))->ptr);
+    st_insert(arg->symbols, arg->symbols->num_entries, id);
+
+    return id;
+}
+
+static ID
+r_symbol(arg)
+    struct load_arg *arg;
+{
+    if (r_byte(arg) == TYPE_SYMLINK) {
+	return r_symlink(arg);
+    }
+    return r_symreal(arg);
+}
+
+static char*
+r_unique(arg)
+    struct load_arg *arg;
+{
+    return rb_id2name(r_symbol(arg));
+}
+
+static VALUE
+r_string(arg)
+    struct load_arg *arg;
+{
+    return r_bytes(arg);
+}
+
+static VALUE
+r_entry(v, arg)
+    VALUE v;
+    struct load_arg *arg;
+{
+    rb_hash_aset(arg->data, INT2FIX(RHASH(arg->data)->tbl->num_entries), v);
+    if (arg->taint) OBJ_TAINT(v);
+    return v;
+}
+
+static void
+r_ivar(obj, arg)
+    VALUE obj;
+    struct load_arg *arg;
+{
+    long len;
+
+    len = r_long(arg);
+    if (len > 0) {
+	while (len--) {
+	    ID id = r_symbol(arg);
+	    VALUE val = r_object(arg);
+	    rb_ivar_set(obj, id, val);
+	}
+    }
+}
+
+static VALUE
+path2class(path)
+    char *path;
+{
+    VALUE v = rb_path2class(path);
+
+    if (TYPE(v) != T_CLASS) {
+	rb_raise(rb_eArgError, "%s does not refer class", path);
+    }
+    return v;
+}
+
+static VALUE
+path2module(path)
+    char *path;
+{
+    VALUE v = rb_path2class(path);
+
+    if (TYPE(v) != T_MODULE) {
+	rb_raise(rb_eArgError, "%s does not refer module", path);
+    }
+    return v;
+}
+
+static VALUE
+r_object0(arg, proc, ivp, extmod)
+    struct load_arg *arg;
+    VALUE proc;
+    int *ivp;
+    VALUE extmod;
+{
+    VALUE v = Qnil;
+    int type = r_byte(arg);
+    long id;
+
+    switch (type) {
+      case TYPE_LINK:
+	id = r_long(arg);
+	v = rb_hash_aref(arg->data, LONG2FIX(id));
+	if (NIL_P(v)) {
+	    rb_raise(rb_eArgError, "dump format error (unlinked)");
+	}
+	return v;
+
+      case TYPE_IVAR:
+        {
+	    int ivar = Qtrue;
+
+	    v = r_object0(arg, 0, &ivar, extmod);
+	    if (ivar) r_ivar(v, arg);
+	}
+	break;
+
+      case TYPE_EXTENDED:
+	{
+	    VALUE m = path2module(r_unique(arg));
+
+            if (NIL_P(extmod)) extmod = rb_ary_new2(0);
+            rb_ary_push(extmod, m);
+
+	    v = r_object0(arg, 0, 0, extmod);
+            while (RARRAY(extmod)->len > 0) {
+                m = rb_ary_pop(extmod);
+                rb_extend_object(v, m);
+            }
+	}
+	break;
+
+      case TYPE_UCLASS:
+	{
+	    VALUE c = path2class(r_unique(arg));
+
+	    if (FL_TEST(c, FL_SINGLETON)) {
+		rb_raise(rb_eTypeError, "singleton can't be loaded");
+	    }
+	    v = r_object0(arg, 0, 0, extmod);
+	    if (rb_special_const_p(v) || TYPE(v) == T_OBJECT || TYPE(v) == T_CLASS) {
+	      format_error:
+		rb_raise(rb_eArgError, "dump format error (user class)");
+	    }
+	    if (TYPE(v) == T_MODULE || !RTEST(rb_class_inherited_p(c, RBASIC(v)->klass))) {
+		VALUE tmp = rb_obj_alloc(c);
+
+		if (TYPE(v) != TYPE(tmp)) goto format_error;
+	    }
+	    RBASIC(v)->klass = c;
+	}
+	break;
+
+      case TYPE_NIL:
+	v = Qnil;
+	break;
+
+      case TYPE_TRUE:
+	v = Qtrue;
+	break;
+
+      case TYPE_FALSE:
+	v = Qfalse;
+	break;
+
+      case TYPE_FIXNUM:
+	{
+	    long i = r_long(arg);
+	    v = LONG2FIX(i);
+	}
+	break;
+
+      case TYPE_FLOAT:
+	{
+	    double d, t = 0.0;
+	    VALUE str = r_bytes(arg);
+	    const char *ptr = RSTRING(str)->ptr;
+
+	    if (strcmp(ptr, "nan") == 0) {
+		d = t / t;
+	    }
+	    else if (strcmp(ptr, "inf") == 0) {
+		d = 1.0 / t;
+	    }
+	    else if (strcmp(ptr, "-inf") == 0) {
+		d = -1.0 / t;
+	    }
+	    else {
+		char *e;
+		d = strtod(ptr, &e);
+		d = load_mantissa(d, e, RSTRING(str)->len - (e - ptr));
+	    }
+	    v = rb_float_new(d);
+	    r_entry(v, arg);
+	}
+	break;
+
+      case TYPE_BIGNUM:
+	{
+	    long len;
+	    BDIGIT *digits;
+	    volatile VALUE data;
+
+	    NEWOBJ(big, struct RBignum);
+	    OBJSETUP(big, rb_cBignum, T_BIGNUM);
+	    big->sign = (r_byte(arg) == '+');
+	    len = r_long(arg);
+	    data = r_bytes0(len * 2, arg);
+#if SIZEOF_BDIGITS == SIZEOF_SHORT
+	    big->len = len;
+#else
+	    big->len = (len + 1) * 2 / sizeof(BDIGIT);
+#endif
+	    big->digits = digits = ALLOC_N(BDIGIT, big->len);
+	    MEMCPY(digits, RSTRING(data)->ptr, char, len * 2);
+#if SIZEOF_BDIGITS > SIZEOF_SHORT
+	    MEMZERO((char *)digits + len * 2, char,
+		    big->len * sizeof(BDIGIT) - len * 2);
+#endif
+	    len = big->len;
+	    while (len > 0) {
+		unsigned char *p = (unsigned char *)digits;
+		BDIGIT num = 0;
+#if SIZEOF_BDIGITS > SIZEOF_SHORT
+		int shift = 0;
+		int i;
+
+		for (i=0; i<SIZEOF_BDIGITS; i++) {
+		    num |= (int)p[i] << shift;
+		    shift += 8;
+		}
+#else
+		num = p[0] | (p[1] << 8);
+#endif
+		*digits++ = num;
+		len--;
+	    }
+	    v = rb_big_norm((VALUE)big);
+	    r_entry(v, arg);
+	}
+	break;
+
+      case TYPE_STRING:
+	v = r_entry(r_string(arg), arg);
+	break;
+
+      case TYPE_REGEXP:
+	{
+	    volatile VALUE str = r_bytes(arg);
+	    int options = r_byte(arg);
+	    v = r_entry(rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len, options), arg);
+	}
+	break;
+
+      case TYPE_ARRAY:
+	{
+	    volatile long len = r_long(arg); /* gcc 2.7.2.3 -O2 bug?? */
+
+	    v = rb_ary_new2(len);
+	    r_entry(v, arg);
+	    while (len--) {
+		rb_ary_push(v, r_object(arg));
+	    }
+	}
+	break;
+
+      case TYPE_HASH:
+      case TYPE_HASH_DEF:
+	{
+	    long len = r_long(arg);
+
+	    v = rb_hash_new();
+	    r_entry(v, arg);
+	    while (len--) {
+		VALUE key = r_object(arg);
+		VALUE value = r_object(arg);
+		rb_hash_aset(v, key, value);
+	    }
+	    if (type == TYPE_HASH_DEF) {
+		RHASH(v)->ifnone = r_object(arg);
+	    }
+	}
+	break;
+
+      case TYPE_STRUCT:
+	{
+	    VALUE klass, mem, values;
+	    volatile long i;	/* gcc 2.7.2.3 -O2 bug?? */
+	    long len;
+	    ID slot;
+
+	    klass = path2class(r_unique(arg));
+	    mem = rb_struct_s_members(klass);
+	    if (mem == Qnil) {
+		rb_raise(rb_eTypeError, "uninitialized struct");
+	    }
+	    len = r_long(arg);
+
+	    values = rb_ary_new2(len);
+	    for (i=0; i<len; i++) {
+		rb_ary_push(values, Qnil);
+	    }
+	    v = rb_struct_alloc(klass, values);
+	    r_entry(v, arg);
+	    for (i=0; i<len; i++) {
+		slot = r_symbol(arg);
+
+		if (RARRAY(mem)->ptr[i] != ID2SYM(slot)) {
+		    rb_raise(rb_eTypeError, "struct %s not compatible (:%s for :%s)",
+			     rb_class2name(klass),
+			     rb_id2name(slot),
+			     rb_id2name(SYM2ID(RARRAY(mem)->ptr[i])));
+		}
+		rb_struct_aset(v, LONG2FIX(i), r_object(arg));
+	    }
+	}
+	break;
+
+      case TYPE_USERDEF:
+        {
+	    VALUE klass = path2class(r_unique(arg));
+	    VALUE data;
+
+	    if (!rb_respond_to(klass, s_load)) {
+		rb_raise(rb_eTypeError, "class %s needs to have method `_load'",
+			 rb_class2name(klass));
+	    }
+	    data = r_string(arg);
+	    if (ivp) {
+		r_ivar(data, arg);
+		*ivp = Qfalse;
+	    }
+	    v = rb_funcall(klass, s_load, 1, data);
+	    r_entry(v, arg);
+	}
+        break;
+
+      case TYPE_USRMARSHAL:
+        {
+	    VALUE klass = path2class(r_unique(arg));
+	    VALUE data;
+
+	    v = rb_obj_alloc(klass);
+            if (! NIL_P(extmod)) {
+                while (RARRAY(extmod)->len > 0) {
+                    VALUE m = rb_ary_pop(extmod);
+                    rb_extend_object(v, m);
+                }
+            }
+	    if (!rb_respond_to(v, s_mload)) {
+		rb_raise(rb_eTypeError, "instance of %s needs to have method `marshal_load'",
+			 rb_class2name(klass));
+	    }
+	    r_entry(v, arg);
+	    data = r_object(arg);
+	    rb_funcall(v, s_mload, 1, data);
+	}
+        break;
+
+      case TYPE_OBJECT:
+	{
+	    VALUE klass = path2class(r_unique(arg));
+
+	    v = rb_obj_alloc(klass);
+	    if (TYPE(v) != T_OBJECT) {
+		rb_raise(rb_eArgError, "dump format error");
+	    }
+	    r_entry(v, arg);
+	    r_ivar(v, arg);
+	}
+	break;
+
+      case TYPE_DATA:
+       {
+           VALUE klass = path2class(r_unique(arg));
+           if (rb_respond_to(klass, s_alloc)) {
+	       static int warn = Qtrue;
+	       if (warn) {
+		   rb_warn("define `allocate' instead of `_alloc'");
+		   warn = Qfalse;
+	       }
+	       v = rb_funcall(klass, s_alloc, 0);
+           }
+	   else {
+	       v = rb_obj_alloc(klass);
+	   }
+           if (TYPE(v) != T_DATA) {
+               rb_raise(rb_eArgError, "dump format error");
+           }
+           r_entry(v, arg);
+           if (!rb_respond_to(v, s_load_data)) {
+               rb_raise(rb_eTypeError,
+                        "class %s needs to have instance method `_load_data'",
+                        rb_class2name(klass));
+           }
+           rb_funcall(v, s_load_data, 1, r_object0(arg, 0, 0, extmod));
+       }
+       break;
+
+      case TYPE_MODULE_OLD:
+        {
+	    volatile VALUE str = r_bytes(arg);
+
+	    v = rb_path2class(RSTRING(str)->ptr);
+	    r_entry(v, arg);
+	}
+	break;
+
+      case TYPE_CLASS:
+        {
+	    volatile VALUE str = r_bytes(arg);
+
+	    v = path2class(RSTRING(str)->ptr);
+	    r_entry(v, arg);
+	}
+	break;
+
+      case TYPE_MODULE:
+        {
+	    volatile VALUE str = r_bytes(arg);
+
+	    v = path2module(RSTRING(str)->ptr);
+	    r_entry(v, arg);
+	}
+	break;
+
+      case TYPE_SYMBOL:
+	v = ID2SYM(r_symreal(arg));
+	break;
+
+      case TYPE_SYMLINK:
+	return ID2SYM(r_symlink(arg));
+
+      default:
+	rb_raise(rb_eArgError, "dump format error(0x%x)", type);
+	break;
+    }
+    if (proc) {
+	rb_funcall(proc, rb_intern("call"), 1, v);
+    }
+    return v;
+}
+
+static VALUE
+r_object(arg)
+    struct load_arg *arg;
+{
+    return r_object0(arg, arg->proc, 0, Qnil);
+}
+
+static VALUE
+load(arg)
+    struct load_arg *arg;
+{
+    return r_object(arg);
+}
+
+static VALUE
+load_ensure(arg)
+    struct load_arg *arg;
+{
+    st_free_table(arg->symbols);
+    return 0;
+}
+
+/*
+ * call-seq:
+ *     load( source [, proc] ) => obj
+ *     restore( source [, proc] ) => obj
+ * 
+ * Returns the result of converting the serialized data in source into a
+ * Ruby object (possibly with associated subordinate objects). source
+ * may be either an instance of IO or an object that responds to
+ * to_str. If proc is specified, it will be passed each object as it
+ * is deserialized.
+ */
+static VALUE
+marshal_load(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE port, proc;
+    int major, minor;
+    VALUE v;
+    struct load_arg arg;
+
+    rb_scan_args(argc, argv, "11", &port, &proc);
+    if (rb_respond_to(port, rb_intern("to_str"))) {
+	arg.taint = OBJ_TAINTED(port); /* original taintedness */
+	StringValue(port);	       /* possible conversion */
+    }
+    else if (rb_respond_to(port, s_getc) && rb_respond_to(port, s_read)) {
+	if (rb_respond_to(port, s_binmode)) {
+	    rb_funcall2(port, s_binmode, 0, 0);
+	}
+	arg.taint = Qtrue;
+    }
+    else {
+	rb_raise(rb_eTypeError, "instance of IO needed");
+    }
+    arg.src = port;
+    arg.offset = 0;
+
+    major = r_byte(&arg);
+    minor = r_byte(&arg);
+    if (major != MARSHAL_MAJOR || minor > MARSHAL_MINOR) {
+	rb_raise(rb_eTypeError, "incompatible marshal file format (can't be read)\n\
+\tformat version %d.%d required; %d.%d given",
+		 MARSHAL_MAJOR, MARSHAL_MINOR, major, minor);
+    }
+    if (RTEST(ruby_verbose) && minor != MARSHAL_MINOR) {
+	rb_warn("incompatible marshal file format (can be read)\n\
+\tformat version %d.%d required; %d.%d given",
+		MARSHAL_MAJOR, MARSHAL_MINOR, major, minor);
+    }
+
+    arg.symbols = st_init_numtable();
+    arg.data   = rb_hash_new();
+    if (NIL_P(proc)) arg.proc = 0;
+    else             arg.proc = proc;
+    v = rb_ensure(load, (VALUE)&arg, load_ensure, (VALUE)&arg);
+
+    return v;
+}
+
+/*
+ * The marshaling library converts collections of Ruby objects into a
+ * byte stream, allowing them to be stored outside the currently
+ * active script. This data may subsequently be read and the original
+ * objects reconstituted.
+ * Marshaled data has major and minor version numbers stored along
+ * with the object information. In normal use, marshaling can only
+ * load data written with the same major version number and an equal
+ * or lower minor version number. If Ruby's ``verbose'' flag is set
+ * (normally using -d, -v, -w, or --verbose) the major and minor
+ * numbers must match exactly. Marshal versioning is independent of
+ * Ruby's version numbers. You can extract the version by reading the
+ * first two bytes of marshaled data.
+ *
+ *     str = Marshal.dump("thing")
+ *     RUBY_VERSION   #=> "1.8.0"
+ *     str[0]         #=> 4
+ *     str[1]         #=> 8
+ *
+ * Some objects cannot be dumped: if the objects to be dumped include
+ * bindings, procedure or method objects, instances of class IO, or
+ * singleton objects, a TypeError will be raised.
+ * If your class has special serialization needs (for example, if you
+ * want to serialize in some specific format), or if it contains
+ * objects that would otherwise not be serializable, you can implement
+ * your own serialization strategy by defining two methods, _dump and
+ * _load:
+ * The instance method _dump should return a String object containing
+ * all the information necessary to reconstitute objects of this class
+ * and all referenced objects up to a maximum depth given as an integer
+ * parameter (a value of -1 implies that you should disable depth checking).
+ * The class method _load should take a String and return an object of this class.
+ */
+void
+Init_marshal()
+{
+    VALUE rb_mMarshal = rb_define_module("Marshal");
+
+    s_dump = rb_intern("_dump");
+    s_load = rb_intern("_load");
+    s_mdump = rb_intern("marshal_dump");
+    s_mload = rb_intern("marshal_load");
+    s_dump_data = rb_intern("_dump_data");
+    s_load_data = rb_intern("_load_data");
+    s_alloc = rb_intern("_alloc");
+    s_getc = rb_intern("getc");
+    s_read = rb_intern("read");
+    s_write = rb_intern("write");
+    s_binmode = rb_intern("binmode");
+
+    rb_define_module_function(rb_mMarshal, "dump", marshal_dump, -1);
+    rb_define_module_function(rb_mMarshal, "load", marshal_load, -1);
+    rb_define_module_function(rb_mMarshal, "restore", marshal_load, -1);
+
+    rb_define_const(rb_mMarshal, "MAJOR_VERSION", INT2FIX(MARSHAL_MAJOR));
+    rb_define_const(rb_mMarshal, "MINOR_VERSION", INT2FIX(MARSHAL_MINOR));
+}
+
+VALUE
+rb_marshal_dump(obj, port)
+    VALUE obj, port;
+{
+    int argc = 1;
+    VALUE argv[2];
+
+    argv[0] = obj;
+    argv[1] = port;
+    if (!NIL_P(port)) argc = 2;
+    return marshal_dump(argc, argv);
+}
+
+VALUE
+rb_marshal_load(port)
+    VALUE port;
+{
+    return marshal_load(1, &port);
+}
diff --git a/ruby_1_8_6/math.c b/ruby_1_8_6/math.c
new file mode 100644
index 0000000000..60dd0b7204
--- /dev/null
+++ b/ruby_1_8_6/math.c
@@ -0,0 +1,529 @@
+/**********************************************************************
+
+  math.c -
+
+  $Author$
+  $Date$
+  created at: Tue Jan 25 14:12:56 JST 1994
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+#include <math.h>
+#include <errno.h>
+
+VALUE rb_mMath;
+
+#define Need_Float(x) (x) = rb_Float(x)
+#define Need_Float2(x,y) do {\
+    Need_Float(x);\
+    Need_Float(y);\
+} while (0)
+
+static void
+domain_check(x, msg)
+    double x;
+    char *msg;
+{
+    while(1) {
+	if (errno) {
+	    rb_sys_fail(msg);
+	}
+	if (isnan(x)) {
+#if defined(EDOM)
+	    errno = EDOM;
+#elif define(ERANGE)
+	    errno = ERANGE;
+#endif
+	    continue;
+	}
+	break;
+    }
+}
+
+
+/*
+ *  call-seq:
+ *     Math.atan2(y, x)  => float
+ *  
+ *  Computes the arc tangent given <i>y</i> and <i>x</i>. Returns
+ *  -PI..PI.
+ *     
+ */
+
+static VALUE
+math_atan2(obj, y, x)
+    VALUE obj, x, y;
+{
+    Need_Float2(y, x);
+    return rb_float_new(atan2(RFLOAT(y)->value, RFLOAT(x)->value));
+}
+
+
+/*
+ *  call-seq:
+ *     Math.cos(x)    => float
+ *  
+ *  Computes the cosine of <i>x</i> (expressed in radians). Returns
+ *  -1..1.
+ */
+
+static VALUE
+math_cos(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    return rb_float_new(cos(RFLOAT(x)->value));
+}
+
+/*
+ *  call-seq:
+ *     Math.sin(x)    => float
+ *  
+ *  Computes the sine of <i>x</i> (expressed in radians). Returns
+ *  -1..1.
+ */
+
+static VALUE
+math_sin(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+
+    return rb_float_new(sin(RFLOAT(x)->value));
+}
+
+
+/*
+ *  call-seq:
+ *     Math.tan(x)    => float
+ *  
+ *  Returns the tangent of <i>x</i> (expressed in radians).
+ */
+
+static VALUE
+math_tan(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+
+    return rb_float_new(tan(RFLOAT(x)->value));
+}
+
+/*
+ *  call-seq:
+ *     Math.acos(x)    => float
+ *  
+ *  Computes the arc cosine of <i>x</i>. Returns 0..PI.
+ */
+
+static VALUE
+math_acos(obj, x)
+    VALUE obj, x;
+{
+    double d;
+
+    Need_Float(x);
+    errno = 0;
+    d = acos(RFLOAT(x)->value);
+    domain_check(d, "acos");
+    return rb_float_new(d);
+}
+
+/*
+ *  call-seq:
+ *     Math.asin(x)    => float
+ *  
+ *  Computes the arc sine of <i>x</i>. Returns 0..PI.
+ */
+
+static VALUE
+math_asin(obj, x)
+    VALUE obj, x;
+{
+    double d;
+
+    Need_Float(x);
+    errno = 0;
+    d = asin(RFLOAT(x)->value);
+    domain_check(d, "asin");
+    return rb_float_new(d);
+}
+
+/*
+ *  call-seq:
+ *     Math.atan(x)    => float
+ *  
+ *  Computes the arc tangent of <i>x</i>. Returns -{PI/2} .. {PI/2}.
+ */
+
+static VALUE
+math_atan(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    return rb_float_new(atan(RFLOAT(x)->value));
+}
+
+#ifndef HAVE_COSH
+double
+cosh(x)
+    double x;
+{
+    return (exp(x) + exp(-x)) / 2;
+}
+#endif
+
+/*
+ *  call-seq:
+ *     Math.cosh(x)    => float
+ *  
+ *  Computes the hyperbolic cosine of <i>x</i> (expressed in radians).
+ */
+
+static VALUE
+math_cosh(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    
+    return rb_float_new(cosh(RFLOAT(x)->value));
+}
+
+#ifndef HAVE_SINH
+double
+sinh(x)
+    double x;
+{
+    return (exp(x) - exp(-x)) / 2;
+}
+#endif
+
+/*
+ *  call-seq:
+ *     Math.sinh(x)    => float
+ *  
+ *  Computes the hyperbolic sine of <i>x</i> (expressed in
+ *  radians).
+ */
+
+static VALUE
+math_sinh(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    return rb_float_new(sinh(RFLOAT(x)->value));
+}
+
+#ifndef HAVE_TANH
+double
+tanh(x)
+    double x;
+{
+    return sinh(x) / cosh(x);
+}
+#endif
+
+/*
+ *  call-seq:
+ *     Math.tanh()    => float
+ *  
+ *  Computes the hyperbolic tangent of <i>x</i> (expressed in
+ *  radians).
+ */
+
+static VALUE
+math_tanh(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    return rb_float_new(tanh(RFLOAT(x)->value));
+}
+
+/*
+ *  call-seq:
+ *     Math.acosh(x)    => float
+ *  
+ *  Computes the inverse hyperbolic cosine of <i>x</i>.
+ */
+
+static VALUE
+math_acosh(obj, x)
+    VALUE obj, x;
+{
+    double d;
+
+    Need_Float(x);
+    errno = 0;
+    d = acosh(RFLOAT(x)->value);
+    domain_check(d, "acosh");
+    return rb_float_new(d);
+}
+
+/*
+ *  call-seq:
+ *     Math.asinh(x)    => float
+ *  
+ *  Computes the inverse hyperbolic sine of <i>x</i>.
+ */
+
+static VALUE
+math_asinh(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    return rb_float_new(asinh(RFLOAT(x)->value));
+}
+
+/*
+ *  call-seq:
+ *     Math.atanh(x)    => float
+ *  
+ *  Computes the inverse hyperbolic tangent of <i>x</i>.
+ */
+
+static VALUE
+math_atanh(obj, x)
+    VALUE obj, x;
+{
+    double d;
+
+    Need_Float(x);
+    errno = 0;
+    d = atanh(RFLOAT(x)->value);
+    domain_check(d, "atanh");
+    return rb_float_new(d);
+}
+
+/*
+ *  call-seq:
+ *     Math.exp(x)    => float
+ *  
+ *  Returns e**x.
+ */
+
+static VALUE
+math_exp(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    return rb_float_new(exp(RFLOAT(x)->value));
+}
+
+#if defined __CYGWIN__
+# include <cygwin/version.h>
+# if CYGWIN_VERSION_DLL_MAJOR < 1005
+#  define nan(x) nan()
+# endif
+# define log(x) ((x) < 0.0 ? nan("") : log(x))
+# define log10(x) ((x) < 0.0 ? nan("") : log10(x))
+#endif
+
+/*
+ *  call-seq:
+ *     Math.log(numeric)    => float
+ *  
+ *  Returns the natural logarithm of <i>numeric</i>.
+ */
+
+static VALUE
+math_log(obj, x)
+    VALUE obj, x;
+{
+    double d;
+
+    Need_Float(x);
+    errno = 0;
+    d = log(RFLOAT(x)->value);
+    domain_check(d, "log");
+    return rb_float_new(d);
+}
+
+/*
+ *  call-seq:
+ *     Math.log10(numeric)    => float
+ *  
+ *  Returns the base 10 logarithm of <i>numeric</i>.
+ */
+
+static VALUE
+math_log10(obj, x)
+    VALUE obj, x;
+{
+    double d;
+
+    Need_Float(x);
+    errno = 0;
+    d = log10(RFLOAT(x)->value);
+    domain_check(d, "log10");
+    return rb_float_new(d);
+}
+
+/*
+ *  call-seq:
+ *     Math.sqrt(numeric)    => float
+ *  
+ *  Returns the non-negative square root of <i>numeric</i>.
+ */
+
+static VALUE
+math_sqrt(obj, x)
+    VALUE obj, x;
+{
+    double d;
+
+    Need_Float(x);
+    errno = 0;
+    d = sqrt(RFLOAT(x)->value);
+    domain_check(d, "sqrt");
+    return rb_float_new(d);
+}
+
+/*
+ *  call-seq:
+ *     Math.frexp(numeric)    => [ fraction, exponent ]
+ *  
+ *  Returns a two-element array containing the normalized fraction (a
+ *  <code>Float</code>) and exponent (a <code>Fixnum</code>) of
+ *  <i>numeric</i>.
+ *     
+ *     fraction, exponent = Math.frexp(1234)   #=> [0.6025390625, 11]
+ *     fraction * 2**exponent                  #=> 1234.0
+ */
+
+static VALUE
+math_frexp(obj, x)
+    VALUE obj, x;
+{
+    double d;
+    int exp;
+
+    Need_Float(x);
+    
+    d = frexp(RFLOAT(x)->value, &exp);
+    return rb_assoc_new(rb_float_new(d), INT2NUM(exp));
+}
+
+/*
+ *  call-seq:
+ *     Math.ldexp(flt, int) -> float
+ *  
+ *  Returns the value of <i>flt</i>*(2**<i>int</i>).
+ *     
+ *     fraction, exponent = Math.frexp(1234)
+ *     Math.ldexp(fraction, exponent)   #=> 1234.0
+ */
+
+static VALUE
+math_ldexp(obj, x, n)
+    VALUE obj, x, n;
+{
+    Need_Float(x);
+    return rb_float_new(ldexp(RFLOAT(x)->value, NUM2INT(n)));
+}
+
+/*
+ *  call-seq:
+ *     Math.hypot(x, y)    => float
+ *  
+ *  Returns sqrt(x**2 + y**2), the hypotenuse of a right-angled triangle
+ *  with sides <i>x</i> and <i>y</i>.
+ *     
+ *     Math.hypot(3, 4)   #=> 5.0
+ */
+
+static VALUE
+math_hypot(obj, x, y)
+    VALUE obj, x, y;
+{
+    Need_Float2(x, y);
+    return rb_float_new(hypot(RFLOAT(x)->value, RFLOAT(y)->value));
+}
+
+/*
+ * call-seq:
+ *    Math.erf(x)  => float
+ *
+ *  Calculates the error function of x.
+ */
+
+static VALUE
+math_erf(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    return rb_float_new(erf(RFLOAT(x)->value));
+}
+
+/*
+ * call-seq:
+ *    Math.erfc(x)  => float
+ *
+ *  Calculates the complementary error function of x.
+ */
+
+static VALUE
+math_erfc(obj, x)
+    VALUE obj, x;
+{
+    Need_Float(x);
+    return rb_float_new(erfc(RFLOAT(x)->value));
+}
+
+/*
+ *  The <code>Math</code> module contains module functions for basic
+ *  trigonometric and transcendental functions. See class
+ *  <code>Float</code> for a list of constants that
+ *  define Ruby's floating point accuracy.
+ */     
+
+
+void
+Init_Math()
+{
+    rb_mMath = rb_define_module("Math");
+
+#ifdef M_PI
+    rb_define_const(rb_mMath, "PI", rb_float_new(M_PI));
+#else
+    rb_define_const(rb_mMath, "PI", rb_float_new(atan(1.0)*4.0));
+#endif
+
+#ifdef M_E
+    rb_define_const(rb_mMath, "E", rb_float_new(M_E));
+#else
+    rb_define_const(rb_mMath, "E", rb_float_new(exp(1.0)));
+#endif
+
+    rb_define_module_function(rb_mMath, "atan2", math_atan2, 2);
+    rb_define_module_function(rb_mMath, "cos", math_cos, 1);
+    rb_define_module_function(rb_mMath, "sin", math_sin, 1);
+    rb_define_module_function(rb_mMath, "tan", math_tan, 1);
+
+    rb_define_module_function(rb_mMath, "acos", math_acos, 1);
+    rb_define_module_function(rb_mMath, "asin", math_asin, 1);
+    rb_define_module_function(rb_mMath, "atan", math_atan, 1);
+
+    rb_define_module_function(rb_mMath, "cosh", math_cosh, 1);
+    rb_define_module_function(rb_mMath, "sinh", math_sinh, 1);
+    rb_define_module_function(rb_mMath, "tanh", math_tanh, 1);
+
+    rb_define_module_function(rb_mMath, "acosh", math_acosh, 1);
+    rb_define_module_function(rb_mMath, "asinh", math_asinh, 1);
+    rb_define_module_function(rb_mMath, "atanh", math_atanh, 1);
+
+    rb_define_module_function(rb_mMath, "exp", math_exp, 1);
+    rb_define_module_function(rb_mMath, "log", math_log, 1);
+    rb_define_module_function(rb_mMath, "log10", math_log10, 1);
+    rb_define_module_function(rb_mMath, "sqrt", math_sqrt, 1);
+
+    rb_define_module_function(rb_mMath, "frexp", math_frexp, 1);
+    rb_define_module_function(rb_mMath, "ldexp", math_ldexp, 2);
+
+    rb_define_module_function(rb_mMath, "hypot", math_hypot, 2);
+
+    rb_define_module_function(rb_mMath, "erf",  math_erf,  1);
+    rb_define_module_function(rb_mMath, "erfc", math_erfc, 1);
+}
diff --git a/ruby_1_8_6/mdoc2man.rb b/ruby_1_8_6/mdoc2man.rb
new file mode 100755
index 0000000000..910b2e5745
--- /dev/null
+++ b/ruby_1_8_6/mdoc2man.rb
@@ -0,0 +1,465 @@
+#!/usr/bin/env ruby
+###
+### mdoc2man - mdoc to man converter
+###
+### Quick usage:  mdoc2man.rb < mdoc_manpage.8 > man_manpage.8
+###
+### Ported from Perl by Akinori MUSHA.
+###
+###  Copyright (c) 2001 University of Illinois Board of Trustees
+###  Copyright (c) 2001 Mark D. Roth
+###  Copyright (c) 2002, 2003 Akinori MUSHA
+###  All rights reserved.
+### 
+###  Redistribution and use in source and binary forms, with or without
+###  modification, are permitted provided that the following conditions
+###  are met:
+###  1. Redistributions of source code must retain the above copyright
+###     notice, this list of conditions and the following disclaimer.
+###  2. Redistributions in binary form must reproduce the above copyright
+###     notice, this list of conditions and the following disclaimer in the
+###     documentation and/or other materials provided with the distribution.
+###  3. All advertising materials mentioning features or use of this software
+###     must display the following acknowledgement:
+###     This product includes software developed by the University of
+###     Illinois at Urbana, and their contributors.
+###  4. The University nor the names of their
+###     contributors may be used to endorse or promote products derived from
+###     this software without specific prior written permission.
+### 
+###  THIS SOFTWARE IS PROVIDED BY THE TRUSTEES AND CONTRIBUTORS ``AS IS'' AND
+###  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+###  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+###  ARE DISCLAIMED.  IN NO EVENT SHALL THE TRUSTEES OR CONTRIBUTORS BE LIABLE
+###  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+###  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+###  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+###  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+###  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+###  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+###  SUCH DAMAGE.
+###
+### $Id$
+###
+
+class Mdoc2Man
+  ANGLE = 1
+  OPTION = 2
+  PAREN = 3
+
+  RE_PUNCT = /^[!"'),\.\/:;>\?\]`]$/
+
+  def initialize
+    @name = @date = @id = nil
+    @refauthors = @reftitle = @refissue = @refdate = @refopt = nil
+
+    @optlist = 0		### 1 = bullet, 2 = enum, 3 = tag, 4 = item
+    @oldoptlist = 0
+    @nospace = 0		### 0, 1, 2
+    @enum = 0
+    @synopsis = true
+    @reference = false
+    @ext = false
+    @extopt = false
+    @literal = false
+  end
+
+  def mdoc2man(i, o)
+    i.each { |line|
+      if /^\./ !~ line
+	o.print line
+	o.print ".br\n" if @literal
+	next
+      end
+
+      line.slice!(0, 1)
+
+      next if /\\"/ =~ line
+
+      line = parse_macro(line) and o.print line
+    }
+
+    initialize
+  end
+
+  def parse_macro(line)
+    words = line.split
+    retval = ''
+
+    quote = []
+    dl = false
+
+    while word = words.shift
+      case word
+      when RE_PUNCT
+	while q = quote.pop
+	  case q
+	  when OPTION
+	    retval << ']'
+	  when PAREN
+	    retval << ')'
+	  when ANGLE
+	    retval << '>'
+	  end
+	end
+	retval << word
+	next
+      when 'Li', 'Pf'
+	@nospace = 1
+	next
+      when 'Xo'
+	@ext = true
+	retval << ' ' unless retval.empty? || /[\n ]\z/ =~ retval
+	next
+      when 'Xc'
+	@ext = false
+	retval << "\n" unless @extopt
+	break
+      when 'Bd'
+	@literal = true if words[0] == '-literal'
+	retval << "\n"
+	break
+      when 'Ed'
+	@literal = false
+	break
+      when 'Ns'
+	@nospace = 1 if @nospace == 0
+	retval.chomp!(' ')
+	next
+      when 'No'
+	retval.chomp!(' ')
+	retval << words.shift
+	next
+      when 'Dq'
+	retval << '``'
+	begin
+	  retval << words.shift << ' '
+	end until words.empty? || RE_PUNCT =~ words[0]
+	retval.chomp!(' ')
+	retval << '\'\''
+	@nospace = 1 if @nospace == 0 && RE_PUNCT =~ words[0]
+	next
+      when 'Sq', 'Ql'
+	retval << '`' << words.shift << '\''
+	@nospace = 1 if @nospace == 0 && RE_PUNCT =~ words[0]
+	next
+	# when  'Ic'
+	#   retval << '\\fB' << words.shift << '\\fP'
+	#   next
+      when 'Oo'
+	#retval << "[\\c\n"
+	@extopt = true
+	@nospace = 1 if @nospace == 0
+	retval << '['
+	next
+      when 'Oc'
+	@extopt = false
+	retval << ']'
+	next
+      when 'Ao'
+	@nospace = 1 if @nospace == 0
+	retval << '<'
+	next
+      when 'Ac'
+	retval << '>'
+	next
+      end
+
+      retval << ' ' if @nospace == 0 && !(retval.empty? || /[\n ]\z/ =~ retval)
+      @nospace = 0 if @nospace == 1
+
+      case word
+      when 'Dd'
+	@date = words.join(' ')
+	return nil
+      when 'Dt'
+	if words.size >= 2 && words[1] == '""' &&
+	    /^(.*)\(([0-9])\)$/ =~ words[0]
+	  words[0] = $1
+	  words[1] = $2
+	end
+	@id = words.join(' ')
+	return nil
+      when 'Os'
+	retval << '.TH ' << @id << ' "' << @date << '" "' <<
+	  words.join(' ') << '"'
+	break
+      when 'Sh'
+	retval << '.SH'
+	@synopsis = (words[0] == 'SYNOPSIS')
+	next
+      when 'Xr'
+	retval << '\\fB' << words.shift <<
+	  '\\fP(' << words.shift << ')' << words.shift
+	break
+      when 'Rs'
+	@refauthors = []
+	@reftitle = ''
+	@refissue = ''
+	@refdate = ''
+	@refopt = ''
+	@reference = true
+	break
+      when 'Re'
+	retval << "\n"
+
+	# authors
+	while @refauthors.size > 1
+	  retval << @refauthors.shift << ', '
+	end
+	retval << 'and ' unless retval.empty?
+	retval << @refauthors.shift
+
+	# title 
+	retval << ', \\fI' << @reftitle << '\\fP'
+
+	# issue
+	retval << ', ' << @refissue unless @refissue.empty?
+
+	# date
+	retval << ', ' << @refdate unless @refdate.empty?
+
+	# optional info
+	retval << ', ' << @refopt unless @refopt.empty?
+
+	retval << ".\n"
+
+	@reference = false
+	break
+      when 'An'
+	next
+      when 'Dl'
+	retval << ".nf\n" << '\\&  '
+	dl = true
+	next
+      when 'Ux'
+	retval << "UNIX"
+	next
+      end
+
+      if @reference
+	case word
+	when '%A'
+	  @refauthors.unshift(words.join(' '))
+	  break
+	when '%T'
+	  @reftitle = words.join(' ')
+	  @reftitle.sub!(/^"/, '')
+	  @reftitle.sub!(/"$/, '')
+	  break
+	when '%N'
+	  @refissue = words.join(' ')
+	  break
+	when '%D'
+	  @refdate = words.join(' ')
+	  break
+	when '%O'
+	  @refopt = words.join(' ')
+	  break
+	end
+      end
+
+      case word
+      when 'Nm'
+	name = words.empty? ? @name : words.shift
+	@name ||= name
+	retval << ".br\n" if @synopsis
+	retval << "\\fB" << name << "\\fP"
+	@nospace = 1 if @nospace == 0 && RE_PUNCT =~ words[0]
+	next
+      when 'Nd'
+	retval << '\\-'
+	next
+      when 'Fl'
+	retval << '\\fB\\-' << words.shift << '\\fP'
+	@nospace = 1 if @nospace == 0 && RE_PUNCT =~ words[0]
+	next
+      when 'Ar'
+	retval << '\\fI'
+	if words.empty?
+	  retval << 'file ...\\fP'
+	else
+	  retval << words.shift << '\\fP'
+	  while words[0] == '|'
+	    retval << ' ' << words.shift << ' \\fI' << words.shift << '\\fP'
+	  end
+	  @nospace = 1 if @nospace == 0 && RE_PUNCT =~ words[0]
+	  next
+	end
+      when 'Cm'
+	retval << '\\fB' << words.shift << '\\fP'
+	while RE_PUNCT =~ words[0]
+	  retval << words.shift
+	end
+	next
+      when 'Op'
+	quote << OPTION
+	@nospace = 1 if @nospace == 0
+	retval << '['
+	# words.push(words.pop + ']')
+	next
+      when 'Aq'
+	quote << ANGLE
+	@nospace = 1 if @nospace == 0
+	retval << '<'
+	# words.push(words.pop + '>')
+	next
+      when 'Pp'
+	retval << "\n"
+	next
+      when 'Ss'
+	retval << '.SS'
+	next
+      end
+
+      if word == 'Pa' && !quote.include?(OPTION)
+	retval << '\\fI'
+	retval << '\\&' if /^\./ =~ words[0]
+	retval << words.shift << '\\fP'
+	while RE_PUNCT =~ words[0]
+	  retval << words.shift
+	end
+	# @nospace = 1 if @nospace == 0 && RE_PUNCT =~ words[0]
+	next
+      end
+
+      case word
+      when 'Dv'
+	retval << '.BR'
+	next
+      when 'Em', 'Ev'
+	retval << '.IR'
+	next
+      when 'Pq'
+	retval << '('
+	@nospace = 1
+	quote << PAREN
+	next
+      when 'Sx', 'Sy'
+	retval << '.B ' << words.join(' ')
+	break
+      when 'Ic'
+	retval << '\\fB'
+	until words.empty? || RE_PUNCT =~ words[0]
+	  case words[0]
+	  when 'Op'
+	    words.shift
+	    retval << '['
+	    words.push(words.pop + ']')
+	    next
+	  when 'Aq'
+	    words.shift
+	    retval << '<'
+	    words.push(words.pop + '>')
+	    next
+	  when 'Ar'
+	    words.shift
+	    retval << '\\fI' << words.shift << '\\fP'
+	  else
+	    retval << words.shift
+	  end
+
+	  retval << ' ' if @nospace == 0
+	end
+
+	retval.chomp!(' ')
+	retval << '\\fP'
+	retval << words.shift unless words.empty?
+	break
+      when 'Bl'
+	@oldoptlist = @optlist
+
+	case words[0]
+	when '-bullet'
+	  @optlist = 1
+	when '-enum'
+	  @optlist = 2
+	  @enum = 0
+	when '-tag'
+	  @optlist = 3
+	when '-item'
+	  @optlist = 4
+	end
+
+	break
+      when 'El'
+	@optlist = @oldoptlist
+	next
+      end
+
+      if @optlist != 0 && word == 'It'
+	case @optlist
+	when 1
+	  # bullets
+	  retval << '.IP \\(bu'
+	when 2
+	  # enum
+	  @enum += 1
+	  retval << '.IP ' << @enum << '.'
+	when 3
+	  # tags
+	  retval << ".TP\n"
+	  case words[0]
+	  when 'Pa', 'Ev'
+	    words.shift
+	    retval << '.B'
+	  end
+	when 4
+	  # item
+	  retval << ".IP\n"
+	end
+
+	next
+      end
+
+      case word
+      when 'Sm'
+	case words[0]
+	when 'off'
+	  @nospace = 2
+	when 'on'
+	  # retval << "\n"
+	  @nospace = 0
+	end
+	words.shift
+	next
+      end
+
+      retval << word
+    end
+
+    return nil if retval == '.'
+
+    retval.sub!(/\A\.([^a-zA-Z])/, "\\1")
+    # retval.chomp!(' ')
+
+    while q = quote.pop
+      case q
+      when OPTION
+	retval << ']'
+      when PAREN
+	retval << ')'
+      when ANGLE
+	retval << '>'
+      end
+    end
+
+    # retval << ' ' unless @nospace == 0 || retval.empty? || /\n\z/ =~ retval
+
+    retval << ' ' unless !@ext || @extopt || / $/ =~ retval
+
+    retval << "\n" unless @ext || @extopt || retval.empty? || /\n\z/ =~ retval
+
+    retval << ".fi\n" if dl
+
+    return retval
+  end
+
+  def self.mdoc2man(i, o)
+    new.mdoc2man(i, o)
+  end
+end
+
+if $0 == __FILE__
+  Mdoc2Man.mdoc2man(ARGF, STDOUT)
+end
diff --git a/ruby_1_8_6/misc/README b/ruby_1_8_6/misc/README
new file mode 100644
index 0000000000..c7e63d7799
--- /dev/null
+++ b/ruby_1_8_6/misc/README
@@ -0,0 +1,7 @@
+README            this file
+inf-ruby.el       program to run ruby under emacs
+ruby-mode.el      ruby mode for emacs
+rubydb2x.el       ruby debugger support for emacs 19.2x or before
+rubydb3x.el       ruby debugger support for emacs 19.3x or later
+ruby-electric.el  emacs minor mode providing electric commands
+rdebug.el         ruby-debug (rdebug) support for emacs 19.3x or later
diff --git a/ruby_1_8_6/misc/inf-ruby.el b/ruby_1_8_6/misc/inf-ruby.el
new file mode 100644
index 0000000000..0a7eb76bda
--- /dev/null
+++ b/ruby_1_8_6/misc/inf-ruby.el
@@ -0,0 +1,417 @@
+;;; -*-Emacs-Lisp-*-
+;;;
+;;;  $Id$
+;;;  $Author$
+;;;  $Date$
+;;;
+;;; Inferior Ruby Mode - ruby process in a buffer.
+;;;                      adapted from cmuscheme.el
+;;;
+;;; Usage:
+;;;
+;;; (0) check ruby-program-name variable that can run your environment.
+;;;
+;;; (1) modify .emacs to use ruby-mode 
+;;;     for example :
+;;;
+;;;    (autoload 'ruby-mode "ruby-mode"
+;;;      "Mode for editing ruby source files" t)
+;;;    (setq auto-mode-alist
+;;;          (append '(("\\.rb$" . ruby-mode)) auto-mode-alist))
+;;;    (setq interpreter-mode-alist (append '(("ruby" . ruby-mode))
+;;;    				     interpreter-mode-alist))
+;;;    
+;;; (2) set to load inf-ruby and set inf-ruby key definition in ruby-mode.
+;;;
+;;;    (autoload 'run-ruby "inf-ruby"
+;;;      "Run an inferior Ruby process")
+;;;    (autoload 'inf-ruby-keys "inf-ruby"
+;;;      "Set local key defs for inf-ruby in ruby-mode")
+;;;    (add-hook 'ruby-mode-hook
+;;;          '(lambda ()
+;;;             (inf-ruby-keys)
+;;;    ))
+;;;
+;;; HISTORY
+;;; senda -  8 Apr 1998: Created.
+;;;	 $Log$
+;;;	 Revision 1.7  2004/07/27 08:11:36  matz
+;;;	 * eval.c (rb_eval): copy on write for argument local variable
+;;;	   assignment.
+;;;
+;;;	 * eval.c (assign): ditto.
+;;;
+;;;	 * eval.c (rb_call0): update ruby_frame->argv with the default
+;;;	   value used for the optional arguments.
+;;;
+;;;	 * object.c (Init_Object): "===" calls rb_obj_equal() directly.
+;;;	   [ruby-list:39937]
+;;;
+;;;	 Revision 1.6  2002/09/07 14:35:46  nobu
+;;;	 * misc/inf-ruby.el (inferior-ruby-error-regexp-alist): regexp
+;;;	   alist for error message from ruby.
+;;;	
+;;;	 * misc/inf-ruby.el (inferior-ruby-mode): fixed for Emacs.
+;;;	
+;;;	 * misc/inf-ruby.el (ruby-send-region): compilation-parse-errors
+;;;	   doesn't parse first line, so insert separators before each
+;;;	   evaluations.
+;;;	
+;;;	 Revision 1.5  2002/08/19 10:05:47  nobu
+;;;	 * misc/inf-ruby.el (inf-ruby-keys): ruby-send-definition
+;;;	   conflicted with ruby-insert-end.
+;;;	
+;;;	 * misc/inf-ruby.el (inferior-ruby-mode): compilation-minor-mode.
+;;;	
+;;;	 * misc/inf-ruby.el (ruby-send-region): send as here document to
+;;;	   adjust source file/line.  [ruby-talk:47113], [ruby-dev:17965]
+;;;	
+;;;	 * misc/inf-ruby.el (ruby-send-terminator): added to make unique
+;;;	   terminator.
+;;;	
+;;;	 Revision 1.4  2002/01/29 07:16:09  matz
+;;;	 * file.c (rb_stat_rdev_major): added. [new]
+;;;	
+;;;	 * file.c (rb_stat_rdev_minor): added. [new]
+;;;	
+;;;	 * file.c (rb_stat_inspect): print mode in octal.
+;;;	
+;;;	 Revision 1.3  1999/12/01 09:24:18  matz
+;;;	 19991201
+;;;	
+;;;	 Revision 1.2  1999/08/13 05:45:18  matz
+;;;	 1.4.0
+;;;	
+;;;	 Revision 1.1.1.1.2.1  1999/07/15 07:59:59  matz
+;;;	 990715
+;;;	
+;;;	 Revision 1.1.1.1  1999/01/20 04:59:36  matz
+;;;	 ruby 1.3 cycle
+;;;	
+;;;	 Revision 1.1.2.1  1998/12/16 07:30:36  matz
+;;;	 first public release of 1.1d (pre1.2) series
+;;;	
+;;;	 Revision 1.4  1998/05/20 02:45:58  senda
+;;;	 default program to irb
+;;;
+;;;	 Revision 1.3  1998/04/10 04:11:30  senda
+;;;	 modification by Matsumoto san (1.1b9_09)
+;;;	 remove-in-string defined
+;;;	 global variable :
+;;;	 	 inferior-ruby-first-prompt-pattern
+;;;	       inferior-ruby-prompt-pattern
+;;;	 defined
+;;;
+;;;	 Revision 1.2  1998/04/09 07:53:42  senda
+;;;	 remove M-C-x in inferior-ruby-mode
+;;;
+;;;	 Revision 1.1  1998/04/09 07:28:36  senda
+;;;	 Initial revision
+;;;
+;;;
+
+(require 'comint)
+(require 'compile)
+(require 'ruby-mode)
+
+;;
+;; you may change these variables
+;;
+;(defvar ruby-program-name "rbc --noreadline"
+;  "*Program invoked by the run-ruby command")
+;
+;(defvar inferior-ruby-first-prompt-pattern "^rbc0> *"
+;  "first prompt regex pattern of ruby interpreter.")
+;
+;(defvar inferior-ruby-prompt-pattern "^\\(rbc.[>*\"'] *\\)+"
+;  "prompt regex pattern of ruby interpreter.")
+
+;;;; for irb
+(defvar ruby-program-name "irb --inf-ruby-mode"
+  "*Program invoked by the run-ruby command")
+
+(defvar inferior-ruby-first-prompt-pattern "^irb(.*)[0-9:]+0> *"
+  "first prompt regex pattern of ruby interpreter.")
+
+(defvar inferior-ruby-prompt-pattern "^\\(irb(.*)[0-9:]+[>*\"'] *\\)+"
+  "prompt regex pattern of ruby interpreter.")
+
+;;
+;; mode variables
+;;
+(defvar inferior-ruby-mode-hook nil
+  "*Hook for customising inferior-ruby mode.")
+(defvar inferior-ruby-mode-map nil
+  "*Mode map for inferior-ruby-mode")
+
+(defconst inferior-ruby-error-regexp-alist
+       '(("SyntaxError: compile error\n^\\([^\(].*\\):\\([1-9][0-9]*\\):" 1 2)
+	 ("^\tfrom \\([^\(].*\\):\\([1-9][0-9]*\\)\\(:in `.*'\\)?$" 1 2)))
+
+(cond ((not inferior-ruby-mode-map)
+       (setq inferior-ruby-mode-map
+	     (copy-keymap comint-mode-map))
+;       (define-key inferior-ruby-mode-map "\M-\C-x" ;gnu convention
+;	           'ruby-send-definition)
+;       (define-key inferior-ruby-mode-map "\C-x\C-e" 'ruby-send-last-sexp)
+       (define-key inferior-ruby-mode-map "\C-c\C-l" 'ruby-load-file)
+))
+
+(defun inf-ruby-keys ()
+  "Set local key defs for inf-ruby in ruby-mode"
+  (define-key ruby-mode-map "\M-\C-x" 'ruby-send-definition)
+;  (define-key ruby-mode-map "\C-x\C-e" 'ruby-send-last-sexp)
+  (define-key ruby-mode-map "\C-c\C-b" 'ruby-send-block)
+  (define-key ruby-mode-map "\C-c\M-b" 'ruby-send-block-and-go)
+  (define-key ruby-mode-map "\C-c\C-x" 'ruby-send-definition)
+  (define-key ruby-mode-map "\C-c\M-x" 'ruby-send-definition-and-go)
+  (define-key ruby-mode-map "\C-c\C-r" 'ruby-send-region)
+  (define-key ruby-mode-map "\C-c\M-r" 'ruby-send-region-and-go)
+  (define-key ruby-mode-map "\C-c\C-z" 'switch-to-ruby)
+  (define-key ruby-mode-map "\C-c\C-l" 'ruby-load-file)
+  (define-key ruby-mode-map "\C-c\C-s" 'run-ruby)
+)
+
+(defvar ruby-buffer nil "current ruby (actually irb) process buffer.")
+
+(defun inferior-ruby-mode ()
+  "Major mode for interacting with an inferior ruby (irb) process.
+
+The following commands are available:
+\\{inferior-ruby-mode-map}
+
+A ruby process can be fired up with M-x run-ruby.
+
+Customisation: Entry to this mode runs the hooks on comint-mode-hook and
+inferior-ruby-mode-hook (in that order).
+
+You can send text to the inferior ruby process from other buffers containing
+Ruby source.
+    switch-to-ruby switches the current buffer to the ruby process buffer.
+    ruby-send-definition sends the current definition to the ruby process.
+    ruby-send-region sends the current region to the ruby process.
+
+    ruby-send-definition-and-go, ruby-send-region-and-go,
+        switch to the ruby process buffer after sending their text.
+For information on running multiple processes in multiple buffers, see
+documentation for variable ruby-buffer.
+
+Commands:
+Return after the end of the process' output sends the text from the 
+    end of process to point.
+Return before the end of the process' output copies the sexp ending at point
+    to the end of the process' output, and sends it.
+Delete converts tabs to spaces as it moves back.
+Tab indents for ruby; with argument, shifts rest
+    of expression rigidly with the current line.
+C-M-q does Tab on each line starting within following expression.
+Paragraphs are separated only by blank lines.  # start comments.
+If you accidentally suspend your process, use \\[comint-continue-subjob]
+to continue it."
+  (interactive)
+  (comint-mode)
+  ;; Customise in inferior-ruby-mode-hook
+  ;(setq comint-prompt-regexp "^[^>\n]*>+ *")
+  (setq comint-prompt-regexp inferior-ruby-prompt-pattern)
+  ;;(scheme-mode-variables)
+  (ruby-mode-variables)
+  (setq major-mode 'inferior-ruby-mode)
+  (setq mode-name "Inferior Ruby")
+  (setq mode-line-process '(":%s"))
+  (use-local-map inferior-ruby-mode-map)
+  (setq comint-input-filter (function ruby-input-filter))
+  (setq comint-get-old-input (function ruby-get-old-input))
+  (compilation-shell-minor-mode t)
+  (make-local-variable 'compilation-error-regexp-alist)
+  (setq compilation-error-regexp-alist inferior-ruby-error-regexp-alist)
+  (run-hooks 'inferior-ruby-mode-hook))
+
+(defvar inferior-ruby-filter-regexp "\\`\\s *\\S ?\\S ?\\s *\\'"
+  "*Input matching this regexp are not saved on the history list.
+Defaults to a regexp ignoring all inputs of 0, 1, or 2 letters.")
+
+(defun ruby-input-filter (str)
+  "Don't save anything matching inferior-ruby-filter-regexp"
+  (not (string-match inferior-ruby-filter-regexp str)))
+
+;; adapted from replace-in-string in XEmacs (subr.el)
+(defun remove-in-string (str regexp)
+  "Remove all matches in STR for REGEXP and returns the new string."
+  (let ((rtn-str "") (start 0) match prev-start)
+    (while (setq match (string-match regexp str start))
+      (setq prev-start start
+	    start (match-end 0)
+	    rtn-str (concat rtn-str (substring str prev-start match))))
+    (concat rtn-str (substring str start))))
+
+(defun ruby-get-old-input ()
+  "Snarf the sexp ending at point"
+  (save-excursion
+    (let ((end (point)))
+      (re-search-backward inferior-ruby-first-prompt-pattern)
+      (remove-in-string (buffer-substring (point) end)
+			inferior-ruby-prompt-pattern)
+      )))
+
+(defun ruby-args-to-list (string)
+  (let ((where (string-match "[ \t]" string)))
+    (cond ((null where) (list string))
+	  ((not (= where 0))
+	   (cons (substring string 0 where)
+		 (ruby-args-to-list (substring string (+ 1 where)
+						 (length string)))))
+	  (t (let ((pos (string-match "[^ \t]" string)))
+	       (if (null pos)
+		   nil
+		 (ruby-args-to-list (substring string pos
+						 (length string)))))))))
+
+(defun run-ruby (cmd)
+  "Run an inferior Ruby process, input and output via buffer *ruby*.
+If there is a process already running in `*ruby*', switch to that buffer.
+With argument, allows you to edit the command line (default is value
+of `ruby-program-name').  Runs the hooks `inferior-ruby-mode-hook'
+\(after the `comint-mode-hook' is run).
+\(Type \\[describe-mode] in the process buffer for a list of commands.)"
+
+  (interactive (list (if current-prefix-arg
+			 (read-string "Run Ruby: " ruby-program-name)
+			 ruby-program-name)))
+  (if (not (comint-check-proc "*ruby*"))
+      (let ((cmdlist (ruby-args-to-list cmd)))
+	(set-buffer (apply 'make-comint "ruby" (car cmdlist)
+			   nil (cdr cmdlist)))
+	(inferior-ruby-mode)))
+  (setq ruby-program-name cmd)
+  (setq ruby-buffer "*ruby*")
+  (pop-to-buffer "*ruby*"))
+
+(defconst ruby-send-terminator "--inf-ruby-%x-%d-%d-%d--"
+  "Template for irb here document terminator.
+Must not contain ruby meta characters.")
+
+(defconst ruby-eval-separator "")
+
+(defun ruby-send-region (start end)
+  "Send the current region to the inferior Ruby process."
+  (interactive "r")
+  (let (term (file (buffer-file-name)) line)
+    (save-excursion
+      (save-restriction
+	(widen)
+	(goto-char start)
+	(setq line (+ start (forward-line (- start)) 1))
+	(goto-char start)
+	(while (progn
+		 (setq term (apply 'format ruby-send-terminator (random) (current-time)))
+		 (re-search-forward (concat "^" (regexp-quote term) "$") end t)))))
+    ;; compilation-parse-errors parses from second line.
+    (save-excursion
+      (let ((m (process-mark (ruby-proc))))
+	(set-buffer (marker-buffer m))
+	(goto-char m)
+	(insert ruby-eval-separator "\n")
+	(set-marker m (point))))
+    (comint-send-string (ruby-proc) (format "eval <<'%s', nil, %S, %d\n" term file line))
+    (comint-send-region (ruby-proc) start end)
+    (comint-send-string (ruby-proc) (concat "\n" term "\n"))))
+
+(defun ruby-send-definition ()
+  "Send the current definition to the inferior Ruby process."
+  (interactive)
+  (save-excursion
+    (ruby-end-of-defun)
+    (let ((end (point)))
+      (ruby-beginning-of-defun)
+      (ruby-send-region (point) end))))
+
+;(defun ruby-send-last-sexp ()
+;  "Send the previous sexp to the inferior Ruby process."
+;  (interactive)
+;  (ruby-send-region (save-excursion (backward-sexp) (point)) (point)))
+
+(defun ruby-send-block ()
+  "Send the current block to the inferior Ruby process."
+  (interactive)
+  (save-excursion
+    (ruby-end-of-block)
+    (end-of-line)
+    (let ((end (point)))
+      (ruby-beginning-of-block)
+      (ruby-send-region (point) end))))
+
+(defun switch-to-ruby (eob-p)
+  "Switch to the ruby process buffer.
+With argument, positions cursor at end of buffer."
+  (interactive "P")
+  (if (get-buffer ruby-buffer)
+      (pop-to-buffer ruby-buffer)
+      (error "No current process buffer. See variable ruby-buffer."))
+  (cond (eob-p
+	 (push-mark)
+	 (goto-char (point-max)))))
+
+(defun ruby-send-region-and-go (start end)
+  "Send the current region to the inferior Ruby process.
+Then switch to the process buffer."
+  (interactive "r")
+  (ruby-send-region start end)
+  (switch-to-ruby t))
+
+(defun ruby-send-definition-and-go ()
+  "Send the current definition to the inferior Ruby. 
+Then switch to the process buffer."
+  (interactive)
+  (ruby-send-definition)
+  (switch-to-ruby t))
+
+(defun ruby-send-block-and-go ()
+  "Send the current block to the inferior Ruby. 
+Then switch to the process buffer."
+  (interactive)
+  (ruby-send-block)
+  (switch-to-ruby t))
+
+(defvar ruby-source-modes '(ruby-mode)
+  "*Used to determine if a buffer contains Ruby source code.
+If it's loaded into a buffer that is in one of these major modes, it's
+considered a ruby source file by ruby-load-file.
+Used by these commands to determine defaults.")
+
+(defvar ruby-prev-l/c-dir/file nil
+  "Caches the last (directory . file) pair.
+Caches the last pair used in the last ruby-load-file command.
+Used for determining the default in the 
+next one.")
+
+(defun ruby-load-file (file-name)
+  "Load a Ruby file into the inferior Ruby process."
+  (interactive (comint-get-source "Load Ruby file: " ruby-prev-l/c-dir/file
+				  ruby-source-modes t)) ; T because LOAD 
+                                                          ; needs an exact name
+  (comint-check-source file-name) ; Check to see if buffer needs saved.
+  (setq ruby-prev-l/c-dir/file (cons (file-name-directory    file-name)
+				       (file-name-nondirectory file-name)))
+  (comint-send-string (ruby-proc) (concat "(load \""
+					    file-name
+					    "\"\)\n")))
+
+(defun ruby-proc ()
+  "Returns the current ruby process. See variable ruby-buffer."
+  (let ((proc (get-buffer-process (if (eq major-mode 'inferior-ruby-mode)
+				      (current-buffer)
+				    ruby-buffer))))
+    (or proc
+	(error "No current process. See variable ruby-buffer"))))
+
+;;; Do the user's customisation...
+
+(defvar inf-ruby-load-hook nil
+  "This hook is run when inf-ruby is loaded in.
+This is a good place to put keybindings.")
+	
+(run-hooks 'inf-ruby-load-hook)
+
+(provide 'inf-ruby)
+
+;;; inf-ruby.el ends here
diff --git a/ruby_1_8_6/misc/rdebug.el b/ruby_1_8_6/misc/rdebug.el
new file mode 100644
index 0000000000..81ab0071a0
--- /dev/null
+++ b/ruby_1_8_6/misc/rdebug.el
@@ -0,0 +1,136 @@
+;;  This file adds support for ruby-debug (rdebug) in Emacs.
+;;  Copyright (C) 2007 Martin Nordholts <enselic@gmail.com>
+;;
+;;  This file is based on 'rubydb3x.el' that comes with Ruby which is
+;;  Copyright (C) Yukihiro Matsumoto aka Matz
+;;
+;;  Installation:
+;;  -------------
+;;
+;;    1.  Make sure you have ruby-debug on your system (test by running
+;;        the commmand 'rdebug -v' in a shell).
+;;
+;;    2.  Copy this file into e.g. ~/.elisp and make sure this is in
+;;        your ~/.emacs:
+;;
+;;          (add-to-list 'load-path "~/.elisp")
+;;          (load-library "rdebug")
+;;
+;;        you can then start the debugger with M-x rdebug
+;;
+;;    3.  Setup convenient keybindings etc. This is what I have:
+;;
+;;          (global-set-key [f9] 'gud-step)
+;;          (global-set-key [f10] 'gud-next)
+;;          (global-set-key [f11] 'gud-cont)
+;;
+;;          (global-set-key "\C-c\C-d" 'rdebug)
+;;
+;;    4. Debug like crazy!
+;;
+;;  Bugs:
+;;  -----
+;;
+;;    Basic functionality works fine, though there might be a bug hiding somewhere.
+
+(require 'gud)
+(provide 'rdebug)
+
+;; ======================================================================
+;; rdebug functions
+
+;;; History of argument lists passed to rdebug.
+(defvar gud-rdebug-history nil)
+
+(if (fboundp 'gud-overload-functions)
+    (defun gud-rdebug-massage-args (file args)
+      (cons file args))
+  (defun gud-rdebug-massage-args (file args)
+    args))
+
+;; There's no guarantee that Emacs will hand the filter the entire
+;; marker at once; it could be broken up across several strings.  We
+;; might even receive a big chunk with several markers in it.  If we
+;; receive a chunk of text which looks like it might contain the
+;; beginning of a marker, we save it here between calls to the
+;; filter.
+(defvar gud-rdebug-marker-acc "")
+(make-variable-buffer-local 'gud-rdebug-marker-acc)
+
+(defun gud-rdebug-marker-filter (string)
+  (setq gud-rdebug-marker-acc (concat gud-rdebug-marker-acc string))
+  (let ((output ""))
+
+    ;; Process all the complete markers in this chunk.
+    (while (string-match "\\([^:\n]*\\):\\([0-9]+\\):.*\n"
+			 gud-rdebug-marker-acc)
+      (setq
+
+       ;; Extract the frame position from the marker.
+       gud-last-frame
+       (cons (substring gud-rdebug-marker-acc (match-beginning 1) (match-end 1))
+	     (string-to-int (substring gud-rdebug-marker-acc
+				       (match-beginning 2)
+				       (match-end 2))))
+
+
+       ;; Append any text before the marker to the output we're going
+       ;; to return - we don't include the marker in this text.
+       output (concat output
+		      (substring gud-rdebug-marker-acc 0 (match-beginning 0)))
+       
+       ;; Set the accumulator to the remaining text.
+       gud-rdebug-marker-acc (substring gud-rdebug-marker-acc (match-end 0))))
+    
+    (setq output (concat output gud-rdebug-marker-acc)
+	  gud-rdebug-marker-acc "")
+    
+    output))
+
+(defun gud-rdebug-find-file (f)
+  (save-excursion
+    (let ((buf (find-file-noselect f)))
+      (set-buffer buf)
+;;      (gud-make-debug-menu)
+      buf)))
+
+(defvar rdebug-command-name "rdebug"
+  "File name for executing rdebug.")
+
+;;;###autoload
+(defun rdebug (command-line)
+  "Run rdebug on program FILE in buffer *gud-FILE*.
+The directory containing FILE becomes the initial working directory
+and source-file directory for your debugger."
+  (interactive
+   (list (read-from-minibuffer "Run rdebug (like this): "
+			       (if (consp gud-rdebug-history)
+				   (car gud-rdebug-history)
+				 (concat rdebug-command-name " "))
+			       nil nil
+			       '(gud-rdebug-history . 1))))
+  
+  (if (not (fboundp 'gud-overload-functions))
+      (gud-common-init command-line 'gud-rdebug-massage-args
+		       'gud-rdebug-marker-filter 'gud-rdebug-find-file)
+    (gud-overload-functions '((gud-massage-args . gud-rdebug-massage-args)
+			      (gud-marker-filter . gud-rdebug-marker-filter)
+			      (gud-find-file . gud-rdebug-find-file)))
+    (gud-common-init command-line rdebug-command-name))
+  
+  (gud-def gud-break  "break %d%f:%l"   "\C-b" "Set breakpoint at current line in current file.")
+;  (gud-def gud-remove "delete %d%f:%l"  "\C-d" "Remove breakpoint at current line in current file.")
+  (gud-def gud-step   "step"            "\C-s" "Step one source line with display.")
+  (gud-def gud-next   "next"            "\C-n" "Step one line (skip functions).")
+  (gud-def gud-cont   "cont"            "\C-r" "Continue with display.")
+  (gud-def gud-finish "finish"          "\C-f" "Finish executing current function.")
+  (gud-def gud-up     "up %p"           "<" "Up N stack frames (numeric arg).")
+  (gud-def gud-down   "down %p"         ">" "Down N stack frames (numeric arg).")
+  (gud-def gud-print  "p %e"            "\C-p" "Evaluate ruby expression at point.")
+
+  (setq comint-prompt-regexp "^(rdb:-) ")
+  (if (boundp 'comint-last-output-start)
+      (set-marker comint-last-output-start (point)))
+  (set (make-local-variable 'paragraph-start) comint-prompt-regexp)
+  (run-hooks 'rdebug-mode-hook)
+  )
diff --git a/ruby_1_8_6/misc/ruby-electric.el b/ruby_1_8_6/misc/ruby-electric.el
new file mode 100644
index 0000000000..c361089938
--- /dev/null
+++ b/ruby_1_8_6/misc/ruby-electric.el
@@ -0,0 +1,200 @@
+;; -*-Emacs-Lisp-*-
+;;
+;; ruby-electric.el --- electric editing commands for ruby files
+;;
+;; Copyright (C) 2005 by Dee Zsombor <dee dot zsombor at gmail dot com>.
+;; Released under same license terms as Ruby.
+;;
+;; Due credit: this work was inspired by a code snippet posted by
+;; Frederick Ros at http://rubygarden.org/ruby?EmacsExtensions.
+;;
+;; Following improvements where added:
+;;
+;;       - handling of strings of type 'here document'
+;;       - more keywords, with special handling for 'do'
+;;       - packaged into a minor mode
+;;
+;; Usage:
+;;
+;;    0) copy ruby-electric.el into directory where emacs can find it.
+;;
+;;    1) modify your startup file (.emacs or whatever) by adding
+;;       following line:
+;;
+;;            (require 'ruby-electric)
+;;
+;;       note that you need to have font lock enabled beforehand.
+;;
+;;    2) toggle Ruby Electric Mode on/off with ruby-electric-mode.
+;;
+;; Changelog:
+;;
+;;  2005/Jan/14: inserts matching pair delimiters like {, [, (, ', ",
+;;  ' and | .
+;;
+;;  2005/Jan/14: added basic Custom support for configuring keywords
+;;  with electric closing.
+;;
+;;  2005/Jan/18: more Custom support for configuring characters for
+;;  which matching expansion should occur.
+;;
+;;  2005/Jan/18: no longer uses 'looking-back' or regexp character
+;;  classes like [:space:] since they are not implemented on XEmacs.
+;;
+;;  2005/Feb/01: explicitly provide default argument of 1 to
+;;  'backward-word' as it requires it on Emacs 21.3
+;;
+;;  2005/Mar/06: now stored inside ruby CVS; customize pages now have
+;;  ruby as parent; cosmetic fixes.
+
+
+(require 'ruby-mode)
+
+(defgroup ruby-electric nil
+  "Minor mode providing electric editing commands for ruby files"
+  :group 'ruby) 
+
+(defconst ruby-electric-expandable-do-re
+  "do\\s-$")
+
+(defconst ruby-electric-expandable-bar
+  "\\s-\\(do\\|{\\)\\s-+|")
+
+(defvar ruby-electric-matching-delimeter-alist
+  '((?\[ . ?\])
+    (?\( . ?\))
+    (?\' . ?\')
+    (?\` . ?\`)
+    (?\" . ?\")))
+
+(defcustom ruby-electric-simple-keywords-re 
+  "\\(def\\|if\\|class\\|module\\|unless\\|case\\|while\\|do\\|until\\|for\\|begin\\)"
+  "*Regular expresion matching keywords for which closing 'end'
+is to be inserted."
+  :type 'regexp :group 'ruby-electric)
+
+(defcustom ruby-electric-expand-delimiters-list '(all)
+  "*List of contexts where matching delimiter should be
+inserted. The word 'all' will do all insertions."
+  :type '(set :extra-offset 8
+	      (const :tag "Everything" all )
+	      (const :tag "Curly brace" ?\{ )
+	      (const :tag "Square brace" ?\[ )
+	      (const :tag "Round brace" ?\( )
+	      (const :tag "Quote" ?\' )
+	      (const :tag "Double quote" ?\" )
+	      (const :tag "Back quote" ?\` )
+	      (const :tag "Vertical bar" ?\| ))
+  :group 'ruby-electric) 
+
+(defcustom ruby-electric-newline-before-closing-bracket nil
+  "*Controls whether a newline should be inserted before the
+closing bracket or not."
+  :type 'boolean :group 'ruby-electric)
+
+(define-minor-mode ruby-electric-mode
+  "Toggle Ruby Electric minor mode.
+With no argument, this command toggles the mode.  Non-null prefix
+argument turns on the mode.  Null prefix argument turns off the
+mode.
+
+When Ruby Electric mode is enabled, an indented 'end' is
+heuristicaly inserted whenever typing a word like 'module',
+'class', 'def', 'if', 'unless', 'case', 'until', 'for', 'begin',
+'do'. Simple, double and back quotes as well as braces are paired
+auto-magically. Expansion does not occur inside comments and
+strings. Note that you must have Font Lock enabled."
+  ;; initial value.
+  nil
+  ;;indicator for the mode line.
+  " REl"
+  ;;keymap
+  ruby-mode-map
+  (ruby-electric-setup-keymap))
+
+(defun ruby-electric-setup-keymap()
+  (define-key ruby-mode-map " " 'ruby-electric-space)
+  (define-key ruby-mode-map "{" 'ruby-electric-curlies)
+  (define-key ruby-mode-map "(" 'ruby-electric-matching-char)
+  (define-key ruby-mode-map "[" 'ruby-electric-matching-char)
+  (define-key ruby-mode-map "\"" 'ruby-electric-matching-char)
+  (define-key ruby-mode-map "\'" 'ruby-electric-matching-char)
+  (define-key ruby-mode-map "|" 'ruby-electric-bar))
+
+(defun ruby-electric-space (arg)
+  (interactive "P")
+  (self-insert-command (prefix-numeric-value arg))
+  (if (ruby-electric-space-can-be-expanded-p)
+      (save-excursion
+	(ruby-indent-line t)
+	(newline)
+	(ruby-insert-end))))
+
+(defun ruby-electric-code-at-point-p()
+  (and ruby-electric-mode
+       (let* ((properties (text-properties-at (point))))
+	 (and (null (memq 'font-lock-string-face properties))
+	      (null (memq 'font-lock-comment-face properties))))))
+
+(defun ruby-electric-string-at-point-p()
+  (and ruby-electric-mode
+       (consp (memq 'font-lock-string-face (text-properties-at (point))))))
+
+(defun ruby-electric-is-last-command-char-expandable-punct-p()
+  (or (memq 'all ruby-electric-expand-delimiters-list)
+      (memq last-command-char ruby-electric-expand-delimiters-list))) 
+
+(defun ruby-electric-space-can-be-expanded-p()
+  (if (ruby-electric-code-at-point-p)
+      (let* ((ruby-electric-keywords-re 
+	      (concat ruby-electric-simple-keywords-re "\\s-$"))
+	     (ruby-electric-single-keyword-in-line-re 
+	      (concat "\\s-*" ruby-electric-keywords-re)))
+	(save-excursion
+	  (backward-word 1)
+	  (or (looking-at ruby-electric-expandable-do-re)
+	      (and (looking-at ruby-electric-keywords-re)
+		   (not (string= "do" (match-string 1)))
+		   (progn
+		     (beginning-of-line)
+		     (looking-at ruby-electric-single-keyword-in-line-re))))))))
+
+
+(defun ruby-electric-curlies(arg)
+  (interactive "P")
+  (self-insert-command (prefix-numeric-value arg))
+  (if (ruby-electric-is-last-command-char-expandable-punct-p)
+      (cond ((ruby-electric-code-at-point-p)
+	     (insert " ")
+	     (save-excursion
+	       (if ruby-electric-newline-before-closing-bracket
+		   (newline))
+	       (insert "}")))
+	    ((ruby-electric-string-at-point-p)
+	     (save-excursion
+	       (backward-char 1)
+	       (when (char-equal ?\# (preceding-char))
+		 (forward-char 1)
+		 (insert "}")))))))
+
+(defun ruby-electric-matching-char(arg)
+  (interactive "P")
+  (self-insert-command (prefix-numeric-value arg))
+  (and (ruby-electric-is-last-command-char-expandable-punct-p)
+       (ruby-electric-code-at-point-p)
+       (save-excursion
+	 (insert (cdr (assoc last-command-char 
+			     ruby-electric-matching-delimeter-alist))))))
+
+(defun ruby-electric-bar(arg)
+  (interactive "P")
+  (self-insert-command (prefix-numeric-value arg))
+  (and (ruby-electric-is-last-command-char-expandable-punct-p)
+       (ruby-electric-code-at-point-p)
+       (and (save-excursion (re-search-backward ruby-electric-expandable-bar nil t))
+	    (= (point) (match-end 0))) ;looking-back is missing on XEmacs
+       (save-excursion 
+	 (insert "|"))))
+
+
+(provide 'ruby-electric)
diff --git a/ruby_1_8_6/misc/ruby-mode.el b/ruby_1_8_6/misc/ruby-mode.el
new file mode 100644
index 0000000000..25c6b3008d
--- /dev/null
+++ b/ruby_1_8_6/misc/ruby-mode.el
@@ -0,0 +1,1207 @@
+;;;
+;;;  ruby-mode.el -
+;;;
+;;;  $Author$
+;;;  $Date$
+;;;  created at: Fri Feb  4 14:49:13 JST 1994
+;;;
+
+(defconst ruby-mode-revision "$Revision$")
+
+(defconst ruby-mode-version
+  (progn
+   (string-match "[0-9.]+" ruby-mode-revision)
+   (substring ruby-mode-revision (match-beginning 0) (match-end 0))))
+
+(defconst ruby-block-beg-re
+  "class\\|module\\|def\\|if\\|unless\\|case\\|while\\|until\\|for\\|begin\\|do"
+  )
+
+(defconst ruby-non-block-do-re
+  "\\(while\\|until\\|for\\|rescue\\)\\>[^_]"
+  )
+
+(defconst ruby-indent-beg-re
+  "\\(\\s *\\(class\\|module\\|def\\)\\)\\|if\\|unless\\|case\\|while\\|until\\|for\\|begin"
+    )
+
+(defconst ruby-modifier-beg-re
+  "if\\|unless\\|while\\|until"
+  )
+
+(defconst ruby-modifier-re
+  (concat ruby-modifier-beg-re "\\|rescue")
+  )
+
+(defconst ruby-block-mid-re
+  "then\\|else\\|elsif\\|when\\|rescue\\|ensure"
+  )
+
+(defconst ruby-block-op-re
+  "and\\|or\\|not"
+  )
+
+(defconst ruby-block-hanging-re
+  (concat ruby-modifier-beg-re "\\|" ruby-block-op-re)
+  )
+
+(defconst ruby-block-end-re "\\<end\\>")
+
+(defconst ruby-here-doc-beg-re
+  "<<\\(-\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\\([^']+\\)[']\\)")
+
+(defun ruby-here-doc-end-match ()
+  (concat "^"
+	  (if (match-string 1) "[ \t]*" nil)
+	  (regexp-quote
+	   (or (match-string 3)
+	       (match-string 4)
+	       (match-string 5)))))
+
+(defconst ruby-delimiter
+  (concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\<\\("
+	  ruby-block-beg-re
+	  "\\)\\>\\|" ruby-block-end-re
+	  "\\|^=begin\\|" ruby-here-doc-beg-re)
+  )
+
+(defconst ruby-negative
+  (concat "^[ \t]*\\(\\(" ruby-block-mid-re "\\)\\>\\|"
+	    ruby-block-end-re "\\|}\\|\\]\\)")
+  )
+
+(defconst ruby-operator-chars "-,.+*/%&|^~=<>:")
+(defconst ruby-operator-re (concat "[" ruby-operator-chars "]"))
+
+(defconst ruby-symbol-chars "a-zA-Z0-9_")
+(defconst ruby-symbol-re (concat "[" ruby-symbol-chars "]"))
+
+(defvar ruby-mode-abbrev-table nil
+  "Abbrev table in use in ruby-mode buffers.")
+
+(define-abbrev-table 'ruby-mode-abbrev-table ())
+
+(defvar ruby-mode-map nil "Keymap used in ruby mode.")
+
+(if ruby-mode-map
+    nil
+  (setq ruby-mode-map (make-sparse-keymap))
+  (define-key ruby-mode-map "{" 'ruby-electric-brace)
+  (define-key ruby-mode-map "}" 'ruby-electric-brace)
+  (define-key ruby-mode-map "\e\C-a" 'ruby-beginning-of-defun)
+  (define-key ruby-mode-map "\e\C-e" 'ruby-end-of-defun)
+  (define-key ruby-mode-map "\e\C-b" 'ruby-backward-sexp)
+  (define-key ruby-mode-map "\e\C-f" 'ruby-forward-sexp)
+  (define-key ruby-mode-map "\e\C-p" 'ruby-beginning-of-block)
+  (define-key ruby-mode-map "\e\C-n" 'ruby-end-of-block)
+  (define-key ruby-mode-map "\e\C-h" 'ruby-mark-defun)
+  (define-key ruby-mode-map "\e\C-q" 'ruby-indent-exp)
+  (define-key ruby-mode-map "\t" 'ruby-indent-command)
+  (define-key ruby-mode-map "\C-c\C-e" 'ruby-insert-end)
+  (define-key ruby-mode-map "\C-j" 'ruby-reindent-then-newline-and-indent)
+  (define-key ruby-mode-map "\C-m" 'newline))
+
+(defvar ruby-mode-syntax-table nil
+  "Syntax table in use in ruby-mode buffers.")
+
+(if ruby-mode-syntax-table
+    ()
+  (setq ruby-mode-syntax-table (make-syntax-table))
+  (modify-syntax-entry ?\' "\"" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\" "\"" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\` "\"" ruby-mode-syntax-table)
+  (modify-syntax-entry ?# "<" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\n ">" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\\ "\\" ruby-mode-syntax-table)
+  (modify-syntax-entry ?$ "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?? "_" ruby-mode-syntax-table)
+  (modify-syntax-entry ?_ "_" ruby-mode-syntax-table)
+  (modify-syntax-entry ?< "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?> "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?& "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?| "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?% "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?= "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?/ "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?+ "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?* "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?- "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?\; "." ruby-mode-syntax-table)
+  (modify-syntax-entry ?\( "()" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\) ")(" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\{ "(}" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\} "){" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\[ "(]" ruby-mode-syntax-table)
+  (modify-syntax-entry ?\] ")[" ruby-mode-syntax-table)
+  )
+
+(defcustom ruby-indent-tabs-mode nil
+  "*Indentation can insert tabs in ruby mode if this is non-nil."
+  :type 'boolean :group 'ruby)
+
+(defcustom ruby-indent-level 2
+  "*Indentation of ruby statements."
+  :type 'integer :group 'ruby)
+
+(defcustom ruby-comment-column 32
+  "*Indentation column of comments."
+  :type 'integer :group 'ruby)
+
+(defcustom ruby-deep-arglist t
+  "*Deep indent lists in parenthesis when non-nil.
+Also ignores spaces after parenthesis when 'space."
+  :group 'ruby)
+
+(defcustom ruby-deep-indent-paren '(?\( ?\[ ?\] t)
+  "*Deep indent lists in parenthesis when non-nil. t means continuous line.
+Also ignores spaces after parenthesis when 'space."
+  :group 'ruby)
+
+(defcustom ruby-deep-indent-paren-style 'space
+  "Default deep indent style."
+  :options '(t nil space) :group 'ruby)
+
+(eval-when-compile (require 'cl))
+(defun ruby-imenu-create-index-in-block (prefix beg end)
+  (let ((index-alist '()) (case-fold-search nil)
+	name next pos decl sing)
+    (goto-char beg)
+    (while (re-search-forward "^\\s *\\(\\(class\\>\\(\\s *<<\\)?\\|module\\>\\)\\s *\\([^\(<\n ]+\\)\\|\\(def\\|alias\\)\\>\\s *\\([^\(\n ]+\\)\\)" end t)
+      (setq sing (match-beginning 3))
+      (setq decl (match-string 5))
+      (setq next (match-end 0))
+      (setq name (or (match-string 4) (match-string 6)))
+      (setq pos (match-beginning 0))
+      (cond
+       ((string= "alias" decl)
+	(if prefix (setq name (concat prefix name)))
+	(push (cons name pos) index-alist))
+       ((string= "def" decl)
+	(if prefix
+	    (setq name
+		  (cond
+		   ((string-match "^self\." name)
+		    (concat (substring prefix 0 -1) (substring name 4)))
+		  (t (concat prefix name)))))
+	(push (cons name pos) index-alist)
+	(ruby-accurate-end-of-block end))
+       (t
+	(if (string= "self" name)
+	    (if prefix (setq name (substring prefix 0 -1)))
+	  (if prefix (setq name (concat (substring prefix 0 -1) "::" name)))
+	  (push (cons name pos) index-alist))
+	(ruby-accurate-end-of-block end)
+	(setq beg (point))
+	(setq index-alist
+	      (nconc (ruby-imenu-create-index-in-block
+		      (concat name (if sing "." "#"))
+		      next beg) index-alist))
+	(goto-char beg))))
+    index-alist))
+
+(defun ruby-imenu-create-index ()
+  (nreverse (ruby-imenu-create-index-in-block nil (point-min) nil)))
+
+(defun ruby-accurate-end-of-block (&optional end)
+  (let (state)
+    (or end (setq end (point-max)))
+    (while (and (setq state (apply 'ruby-parse-partial end state))
+		(>= (nth 2 state) 0) (< (point) end)))))
+
+(defun ruby-mode-variables ()
+  (set-syntax-table ruby-mode-syntax-table)
+  (setq local-abbrev-table ruby-mode-abbrev-table)
+  (make-local-variable 'indent-line-function)
+  (setq indent-line-function 'ruby-indent-line)
+  (make-local-variable 'require-final-newline)
+  (setq require-final-newline t)
+  (make-variable-buffer-local 'comment-start)
+  (setq comment-start "# ")
+  (make-variable-buffer-local 'comment-end)
+  (setq comment-end "")
+  (make-variable-buffer-local 'comment-column)
+  (setq comment-column ruby-comment-column)
+  (make-variable-buffer-local 'comment-start-skip)
+  (setq comment-start-skip "#+ *")
+  (setq indent-tabs-mode ruby-indent-tabs-mode)
+  (make-local-variable 'parse-sexp-ignore-comments)
+  (setq parse-sexp-ignore-comments t)
+  (make-local-variable 'paragraph-start)
+  (setq paragraph-start (concat "$\\|" page-delimiter))
+  (make-local-variable 'paragraph-separate)
+  (setq paragraph-separate paragraph-start)
+  (make-local-variable 'paragraph-ignore-fill-prefix)
+  (setq paragraph-ignore-fill-prefix t))
+
+;;;###autoload
+(defun ruby-mode ()
+  "Major mode for editing ruby scripts.
+\\[ruby-indent-command] properly indents subexpressions of multi-line
+class, module, def, if, while, for, do, and case statements, taking
+nesting into account.
+
+The variable ruby-indent-level controls the amount of indentation.
+\\{ruby-mode-map}"
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map ruby-mode-map)
+  (setq mode-name "Ruby")
+  (setq major-mode 'ruby-mode)
+  (ruby-mode-variables)
+
+  (make-local-variable 'imenu-create-index-function)
+  (setq imenu-create-index-function 'ruby-imenu-create-index)
+
+  (make-local-variable 'add-log-current-defun-function)
+  (setq add-log-current-defun-function 'ruby-add-log-current-method)
+
+  (run-hooks 'ruby-mode-hook))
+
+(defun ruby-current-indentation ()
+  (save-excursion
+    (beginning-of-line)
+    (back-to-indentation)
+    (current-column)))
+
+(defun ruby-indent-line (&optional flag)
+  "Correct indentation of the current ruby line."
+  (ruby-indent-to (ruby-calculate-indent)))
+
+(defun ruby-indent-command ()
+  (interactive)
+  (ruby-indent-line t))
+
+(defun ruby-indent-to (x)
+  (if x
+      (let (shift top beg)
+	(and (< x 0) (error "invalid nest"))
+	(setq shift (current-column))
+	(beginning-of-line)
+	(setq beg (point))
+	(back-to-indentation)
+	(setq top (current-column))
+	(skip-chars-backward " \t")
+	(if (>= shift top) (setq shift (- shift top))
+	  (setq shift 0))
+	(if (and (bolp)
+		 (= x top))
+	    (move-to-column (+ x shift))
+	  (move-to-column top)
+	  (delete-region beg (point))
+	  (beginning-of-line)
+	  (indent-to x)
+	  (move-to-column (+ x shift))))))
+
+(defun ruby-special-char-p (&optional pnt)
+  (setq pnt (or pnt (point)))
+  (let ((c (char-before pnt)) (b (and (< (point-min) pnt) (char-before (1- pnt)))))
+    (cond ((or (eq c ??) (eq c ?$)))
+	  ((and (eq c ?:) (or (not b) (eq (char-syntax b) ? ))))
+	  ((eq c ?\\) (eq b ??)))))
+
+(defun ruby-expr-beg (&optional option)
+  (save-excursion
+    (store-match-data nil)
+    (let ((space (skip-chars-backward " \t"))
+	  (start (point)))
+      (cond
+       ((bolp) t)
+       ((progn
+	  (forward-char -1)
+	  (and (looking-at "\\?")
+	       (or (eq (char-syntax (char-before (point))) ?w)
+		   (ruby-special-char-p))))
+	nil)
+       ((and (eq option 'heredoc) (< space 0)) t)
+       ((or (looking-at ruby-operator-re)
+	    (looking-at "[\\[({,;]")
+	    (and (looking-at "[!?]")
+		 (or (not (eq option 'modifier))
+		     (bolp)
+		     (save-excursion (forward-char -1) (looking-at "\\Sw$"))))
+	    (and (looking-at ruby-symbol-re)
+		 (skip-chars-backward ruby-symbol-chars)
+		 (cond
+		  ((or (looking-at (concat "\\<\\(" ruby-block-beg-re
+					   "|" ruby-block-op-re
+					   "|" ruby-block-mid-re "\\)\\>")))
+		   (goto-char (match-end 0))
+		   (not (looking-at "\\s_")))
+		  ((eq option 'expr-qstr)
+		   (looking-at "[a-zA-Z][a-zA-z0-9_]* +%[^ \t]"))
+		  ((eq option 'expr-re)
+		   (looking-at "[a-zA-Z][a-zA-z0-9_]* +/[^ \t]"))
+		  (t nil)))))))))
+
+(defun ruby-forward-string (term &optional end no-error expand)
+  (let ((n 1) (c (string-to-char term))
+	(re (if expand
+		(concat "[^\\]\\(\\\\\\\\\\)*\\([" term "]\\|\\(#{\\)\\)")
+	      (concat "[^\\]\\(\\\\\\\\\\)*[" term "]"))))
+    (while (and (re-search-forward re end no-error)
+		(if (match-beginning 3)
+		    (ruby-forward-string "}{" end no-error nil)
+		  (> (setq n (if (eq (char-before (point)) c)
+				     (1- n) (1+ n))) 0)))
+      (forward-char -1))
+    (cond ((zerop n))
+	  (no-error nil)
+	  ((error "unterminated string")))))
+
+(defun ruby-deep-indent-paren-p (c)
+  (cond ((listp ruby-deep-indent-paren)
+	 (let ((deep (assoc c ruby-deep-indent-paren)))
+	   (cond (deep
+		  (or (cdr deep) ruby-deep-indent-paren-style))
+		 ((memq c ruby-deep-indent-paren)
+		  ruby-deep-indent-paren-style))))
+	((eq c ruby-deep-indent-paren) ruby-deep-indent-paren-style)
+	((eq c ?\( ) ruby-deep-arglist)))
+
+(defun ruby-parse-partial (&optional end in-string nest depth pcol indent)
+  (or depth (setq depth 0))
+  (or indent (setq indent 0))
+  (when (re-search-forward ruby-delimiter end 'move)
+    (let ((pnt (point)) w re expand)
+      (goto-char (match-beginning 0))
+      (cond
+       ((and (memq (char-before) '(?@ ?$)) (looking-at "\\sw"))
+	(goto-char pnt))
+       ((looking-at "[\"`]")		;skip string
+	(cond
+	 ((and (not (eobp))
+	       (ruby-forward-string (buffer-substring (point) (1+ (point))) end t t))
+	  nil)
+	 (t
+	  (setq in-string (point))
+	  (goto-char end))))
+       ((looking-at "'")
+	(cond
+	 ((and (not (eobp))
+	       (re-search-forward "[^\\]\\(\\\\\\\\\\)*'" end t))
+	  nil)
+	 (t
+	  (setq in-string (point))
+	  (goto-char end))))
+       ((looking-at "/=") 
+	(goto-char pnt))
+       ((looking-at "/")
+	(cond
+	 ((and (not (eobp)) (ruby-expr-beg 'expr-re))
+	  (if (ruby-forward-string "/" end t t)
+	      nil
+	    (setq in-string (point))
+	    (goto-char end)))
+	 (t
+	  (goto-char pnt))))
+       ((looking-at "%")
+	(cond
+	 ((and (not (eobp))
+	       (ruby-expr-beg 'expr-qstr)
+	       (not (looking-at "%="))
+	       (looking-at "%[QqrxWw]?\\([^a-zA-Z0-9 \t\n]\\)"))
+	  (goto-char (match-beginning 1))
+	  (setq expand (not (memq (char-before) '(?q ?w))))
+	  (setq w (match-string 1))
+	  (cond
+	   ((string= w "[") (setq re "]["))
+	   ((string= w "{") (setq re "}{"))
+	   ((string= w "(") (setq re ")("))
+	   ((string= w "<") (setq re "><"))
+	   ((and expand (string= w "\\"))
+	    (setq w (concat "\\" w))))
+	  (unless (cond (re (ruby-forward-string re end t expand))
+			(expand (ruby-forward-string w end t t))
+			(t (re-search-forward
+			    (if (string= w "\\")
+				"\\\\[^\\]*\\\\"
+			      (concat "[^\\]\\(\\\\\\\\\\)*" w))
+			    end t)))
+	    (setq in-string (point))
+	    (goto-char end)))
+	 (t
+	  (goto-char pnt))))
+       ((looking-at "\\?")		;skip ?char
+	(cond
+	 ((and (ruby-expr-beg)
+	       (looking-at "?\\(\\\\C-\\|\\\\M-\\)*\\\\?."))
+	  (goto-char (match-end 0)))
+	 (t
+	  (goto-char pnt))))
+       ((looking-at "\\$")		;skip $char
+	(goto-char pnt)
+	(forward-char 1))
+       ((looking-at "#")		;skip comment
+	(forward-line 1)
+	(goto-char (point))
+	)
+       ((looking-at "[\\[{(]")
+	(let ((deep (ruby-deep-indent-paren-p (char-after))))
+	  (if (and deep (or (not (eq (char-after) ?\{)) (ruby-expr-beg)))
+	      (progn
+		(and (eq deep 'space) (looking-at ".\\s +[^# \t\n]")
+		     (setq pnt (1- (match-end 0))))
+		(setq nest (cons (cons (char-after (point)) pnt) nest))
+		(setq pcol (cons (cons pnt depth) pcol))
+		(setq depth 0))
+	    (setq nest (cons (cons (char-after (point)) pnt) nest))
+	    (setq depth (1+ depth))))
+	(goto-char pnt)
+	)
+       ((looking-at "[])}]")
+	(if (ruby-deep-indent-paren-p (matching-paren (char-after)))
+	    (setq depth (cdr (car pcol)) pcol (cdr pcol))
+	  (setq depth (1- depth)))
+	(setq nest (cdr nest))
+	(goto-char pnt))
+       ((looking-at ruby-block-end-re)
+	(if (or (and (not (bolp))
+		     (progn
+		       (forward-char -1)
+		       (setq w (char-after (point)))
+		       (or (eq ?_ w)
+			   (eq ?. w))))
+		(progn
+		  (goto-char pnt)
+		  (setq w (char-after (point)))
+		  (or (eq ?_ w)
+		      (eq ?! w)
+		      (eq ?? w))))
+	    nil
+	  (setq nest (cdr nest))
+	  (setq depth (1- depth)))
+	(goto-char pnt))
+       ((looking-at "def\\s +[^(\n;]*")
+	(if (or (bolp)
+		(progn
+		  (forward-char -1)
+		  (not (eq ?_ (char-after (point))))))
+	    (progn
+	      (setq nest (cons (cons nil pnt) nest))
+	      (setq depth (1+ depth))))
+	(goto-char (match-end 0)))
+       ((looking-at (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))
+	(and
+	 (save-match-data
+	   (or (not (looking-at "do\\>[^_]"))
+	       (save-excursion
+		 (back-to-indentation)
+		 (not (looking-at ruby-non-block-do-re)))))
+	 (or (bolp)
+	     (progn
+	       (forward-char -1)
+	       (setq w (char-after (point)))
+	       (not (or (eq ?_ w)
+			(eq ?. w)))))
+	 (goto-char pnt)
+	 (setq w (char-after (point)))
+	 (not (eq ?_ w))
+	 (not (eq ?! w))
+	 (not (eq ?? w))
+	 (skip-chars-forward " \t")
+	 (goto-char (match-beginning 0))
+	 (or (not (looking-at ruby-modifier-re))
+	     (ruby-expr-beg 'modifier))
+	 (goto-char pnt)
+	 (setq nest (cons (cons nil pnt) nest))
+	 (setq depth (1+ depth)))
+	(goto-char pnt))
+       ((looking-at ":\\(['\"]\\)\\(\\\\.\\|[^\\\\]\\)*\\1")
+	(goto-char (match-end 0)))
+       ((looking-at ":\\([-,.+*/%&|^~<>]=?\\|===?\\|<=>\\)")
+	(goto-char (match-end 0)))
+       ((looking-at ":\\([a-zA-Z_][a-zA-Z_0-9]*[!?=]?\\)?")
+	(goto-char (match-end 0)))
+       ((or (looking-at "\\.\\.\\.?")
+	    (looking-at "\\.[0-9]+")
+	    (looking-at "\\.[a-zA-Z_0-9]+")
+	    (looking-at "\\."))
+	(goto-char (match-end 0)))
+       ((looking-at "^=begin")
+	(if (re-search-forward "^=end" end t)
+	    (forward-line 1)
+	  (setq in-string (match-end 0))
+	  (goto-char end)))
+       ((looking-at "<<")
+	(cond
+	 ((and (ruby-expr-beg 'heredoc)
+	       (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\\sw\\|\\s_\\)+\\)"))
+	  (setq re (regexp-quote (or (match-string 4) (match-string 2))))
+	  (if (match-beginning 1) (setq re (concat "\\s *" re)))
+	  (let* ((id-end (goto-char (match-end 0)))
+		 (line-end-position (save-excursion (end-of-line) (point)))
+		 (state (list in-string nest depth pcol indent)))
+	    ;; parse the rest of the line
+	    (while (and (> line-end-position (point))
+			(setq state (apply 'ruby-parse-partial
+					   line-end-position state))))
+	    (setq in-string (car state)
+		  nest (nth 1 state)
+		  depth (nth 2 state)
+		  pcol (nth 3 state)
+		  indent (nth 4 state))
+	    ;; skip heredoc section
+	    (if (re-search-forward (concat "^" re "$") end 'move)
+		(forward-line 1)
+	      (setq in-string id-end)
+	      (goto-char end))))
+	 (t
+	  (goto-char pnt))))
+       ((looking-at "^__END__$")
+	(goto-char pnt))
+       ((looking-at ruby-here-doc-beg-re)
+	(if (re-search-forward (ruby-here-doc-end-match)
+			       indent-point t)
+	    (forward-line 1)
+	  (setq in-string (match-end 0))
+	  (goto-char indent-point)))
+       (t
+	(error (format "bad string %s"
+		       (buffer-substring (point) pnt)
+		       ))))))
+  (list in-string nest depth pcol))
+
+(defun ruby-parse-region (start end)
+  (let (state)
+    (save-excursion
+      (if start
+	  (goto-char start)
+	(ruby-beginning-of-indent))
+      (save-restriction
+	(narrow-to-region (point) end)
+	(while (and (> end (point))
+		    (setq state (apply 'ruby-parse-partial end state))))))
+    (list (nth 0 state)			; in-string
+	  (car (nth 1 state))		; nest
+	  (nth 2 state)			; depth
+	  (car (car (nth 3 state)))	; pcol
+	  ;(car (nth 5 state))		; indent
+	  )))
+
+(defun ruby-indent-size (pos nest)
+  (+ pos (* (or nest 1) ruby-indent-level)))
+
+(defun ruby-calculate-indent (&optional parse-start)
+  (save-excursion
+    (beginning-of-line)
+    (let ((indent-point (point))
+	  (case-fold-search nil)
+	  state bol eol begin op-end
+	  (paren (progn (skip-syntax-forward " ")
+			(and (char-after) (matching-paren (char-after)))))
+	  (indent 0))
+      (if parse-start
+	  (goto-char parse-start)
+	(ruby-beginning-of-indent)
+	(setq parse-start (point)))
+      (back-to-indentation)
+      (setq indent (current-column))
+      (setq state (ruby-parse-region parse-start indent-point))
+      (cond
+       ((nth 0 state)			; within string
+	(setq indent nil))		;  do nothing
+       ((car (nth 1 state))		; in paren
+	(goto-char (setq begin (cdr (nth 1 state))))
+	(let ((deep (ruby-deep-indent-paren-p (car (nth 1 state)))))
+	  (if deep
+	      (cond ((and (eq deep t) (eq (car (nth 1 state)) paren))
+		     (skip-syntax-backward " ")
+		     (setq indent (1- (current-column))))
+		    ((let ((s (ruby-parse-region (point) indent-point)))
+		       (and (nth 2 s) (> (nth 2 s) 0)
+			    (or (goto-char (cdr (nth 1 s))) t)))
+		     (forward-word -1)
+		     (setq indent (ruby-indent-size (current-column) (nth 2 state))))
+		    (t
+		     (setq indent (current-column))
+		     (cond ((eq deep 'space))
+			   (paren (setq indent (1- indent)))
+			   (t (setq indent (ruby-indent-size (1- indent) 1))))))
+	    (if (nth 3 state) (goto-char (nth 3 state))
+	      (goto-char parse-start) (back-to-indentation))
+	    (setq indent (ruby-indent-size (current-column) (nth 2 state))))
+	  (and (eq (car (nth 1 state)) paren)
+	       (ruby-deep-indent-paren-p (matching-paren paren))
+	       (search-backward (char-to-string paren))
+	       (setq indent (current-column)))))
+       ((and (nth 2 state) (> (nth 2 state) 0)) ; in nest
+	(if (null (cdr (nth 1 state)))
+	    (error "invalid nest"))
+	(goto-char (cdr (nth 1 state)))
+	(forward-word -1)		; skip back a keyword
+	(setq begin (point))
+	(cond
+	 ((looking-at "do\\>[^_]")	; iter block is a special case
+	  (if (nth 3 state) (goto-char (nth 3 state))
+	    (goto-char parse-start) (back-to-indentation))
+	  (setq indent (ruby-indent-size (current-column) (nth 2 state))))
+	 (t
+	  (setq indent (+ (current-column) ruby-indent-level)))))
+       
+       ((and (nth 2 state) (< (nth 2 state) 0)) ; in negative nest
+	(setq indent (ruby-indent-size (current-column) (nth 2 state)))))
+      (when indent
+	(goto-char indent-point)
+	(end-of-line)
+	(setq eol (point))
+	(beginning-of-line)
+	(cond
+	 ((and (not (ruby-deep-indent-paren-p paren))
+	       (re-search-forward ruby-negative eol t))
+	  (and (not (eq ?_ (char-after (match-end 0))))
+	       (setq indent (- indent ruby-indent-level))))
+	 ((and
+	   (save-excursion
+	     (beginning-of-line)
+	     (not (bobp)))
+	   (or (ruby-deep-indent-paren-p t)
+	       (null (car (nth 1 state)))))
+	  ;; goto beginning of non-empty no-comment line
+	  (let (end done)
+	    (while (not done)
+	      (skip-chars-backward " \t\n")
+	      (setq end (point))
+	      (beginning-of-line)
+	      (if (re-search-forward "^\\s *#" end t)
+		  (beginning-of-line)
+		(setq done t))))
+	  (setq bol (point))
+	  (end-of-line)
+	  ;; skip the comment at the end
+	  (skip-chars-backward " \t")
+	  (let (end (pos (point)))
+	    (beginning-of-line)
+	    (while (and (re-search-forward "#" pos t)
+			(setq end (1- (point)))
+			(or (ruby-special-char-p end)
+			    (and (setq state (ruby-parse-region parse-start end))
+				 (nth 0 state))))
+	      (setq end nil))
+	    (goto-char (or end pos))
+	    (skip-chars-backward " \t")
+	    (setq begin (if (nth 0 state) pos (cdr (nth 1 state))))
+	    (setq state (ruby-parse-region parse-start (point))))
+	  (or (bobp) (forward-char -1))
+	  (and
+	   (or (and (looking-at ruby-symbol-re)
+		    (skip-chars-backward ruby-symbol-chars)
+		    (looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>"))
+		    (not (eq (point) (nth 3 state)))
+		    (save-excursion
+		      (goto-char (match-end 0))
+		      (not (looking-at "[a-z_]"))))
+	       (and (looking-at ruby-operator-re)
+		    (not (ruby-special-char-p))
+		    ;; operator at the end of line
+		    (let ((c (char-after (point))))
+		      (and
+;; 		       (or (null begin)
+;; 			   (save-excursion
+;; 			     (goto-char begin)
+;; 			     (skip-chars-forward " \t")
+;; 			     (not (or (eolp) (looking-at "#")
+;; 				      (and (eq (car (nth 1 state)) ?{)
+;; 					   (looking-at "|"))))))
+		       (or (not (eq ?/ c))
+			   (null (nth 0 (ruby-parse-region (or begin parse-start) (point)))))
+		       (or (not (eq ?| (char-after (point))))
+			   (save-excursion
+			     (or (eolp) (forward-char -1))
+			     (cond
+			      ((search-backward "|" nil t)
+			       (skip-chars-backward " \t\n")
+			       (and (not (eolp))
+				    (progn
+				      (forward-char -1)
+				      (not (looking-at "{")))
+				    (progn
+				      (forward-word -1)
+				      (not (looking-at "do\\>[^_]")))))
+			      (t t))))
+		       (not (eq ?, c))
+		       (setq op-end t)))))
+	   (setq indent
+		 (cond
+		  ((and
+		    (null op-end)
+		    (not (looking-at (concat "\\<\\(" ruby-block-hanging-re "\\)\\>")))
+		    (eq (ruby-deep-indent-paren-p t) 'space)
+		    (not (bobp)))
+		   (save-excursion
+		     (widen)
+		     (goto-char (or begin parse-start))
+		     (skip-syntax-forward " ")
+		     (current-column)))
+		  ((car (nth 1 state)) indent)
+		  (t
+		   (+ indent ruby-indent-level))))))))
+      indent)))
+
+(defun ruby-electric-brace (arg)
+  (interactive "P")
+  (insert-char last-command-char 1)
+  (ruby-indent-line t)
+  (delete-char -1)
+  (self-insert-command (prefix-numeric-value arg)))
+
+(eval-when-compile
+  (defmacro defun-region-command (func args &rest body)
+    (let ((intr (car body)))
+      (when (featurep 'xemacs)
+	(if (stringp intr) (setq intr (cadr body)))
+	(and (eq (car intr) 'interactive)
+	     (setq intr (cdr intr))
+	     (setcar intr (concat "_" (car intr)))))
+      (cons 'defun (cons func (cons args body))))))
+
+(defun-region-command ruby-beginning-of-defun (&optional arg)
+  "Move backward to next beginning-of-defun.
+With argument, do this that many times.
+Returns t unless search stops due to end of buffer."
+  (interactive "p")
+  (and (re-search-backward (concat "^\\(" ruby-block-beg-re "\\)\\b")
+			   nil 'move (or arg 1))
+       (progn (beginning-of-line) t)))
+
+(defun ruby-beginning-of-indent ()
+  (and (re-search-backward (concat "^\\(" ruby-indent-beg-re "\\)\\b")
+			   nil 'move)
+       (progn
+	 (beginning-of-line)
+	 t)))
+
+(defun-region-command ruby-end-of-defun (&optional arg)
+  "Move forward to next end of defun.
+An end of a defun is found by moving forward from the beginning of one."
+  (interactive "p")
+  (and (re-search-forward (concat "^\\(" ruby-block-end-re "\\)\\($\\|\\b[^_]\\)")
+			  nil 'move (or arg 1))
+       (progn (beginning-of-line) t))
+  (forward-line 1))
+
+(defun ruby-move-to-block (n)
+  (let (start pos done down)
+    (setq start (ruby-calculate-indent))
+    (setq down (looking-at (if (< n 0) ruby-block-end-re
+			     (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))))
+    (while (and (not done) (not (if (< n 0) (bobp) (eobp))))
+      (forward-line n)
+      (cond
+       ((looking-at "^\\s *$"))
+       ((looking-at "^\\s *#"))
+       ((and (> n 0) (looking-at "^=begin\\>"))
+	(re-search-forward "^=end\\>"))
+       ((and (< n 0) (looking-at "^=end\\>"))
+	(re-search-backward "^=begin\\>"))
+       (t
+	(setq pos (current-indentation))
+	(cond
+	 ((< start pos)
+	  (setq down t))
+	 ((and down (= pos start))
+	  (setq done t))
+	 ((> start pos)
+	  (setq done t)))))
+      (if done
+	  (save-excursion
+	    (back-to-indentation)
+	    (if (looking-at (concat "\\<\\(" ruby-block-mid-re "\\)\\>"))
+		(setq done nil))))))
+  (back-to-indentation))
+
+(defun-region-command ruby-beginning-of-block (&optional arg)
+  "Move backward to next beginning-of-block"
+  (interactive "p")
+  (ruby-move-to-block (- (or arg 1))))
+
+(defun-region-command ruby-end-of-block (&optional arg)
+  "Move forward to next beginning-of-block"
+  (interactive "p")
+  (ruby-move-to-block (or arg 1)))
+
+(defun-region-command ruby-forward-sexp (&optional cnt)
+  (interactive "p")
+  (if (and (numberp cnt) (< cnt 0))
+      (ruby-backward-sexp (- cnt))
+    (let ((i (or cnt 1)))
+      (condition-case nil
+	  (while (> i 0)
+	    (skip-syntax-forward " ")
+	    (cond ((looking-at "\\?\\(\\\\[CM]-\\)*\\\\?\\S ")
+		   (goto-char (match-end 0)))
+		  ((progn
+		     (skip-chars-forward ",.:;|&^~=!?\\+\\-\\*")
+		     (looking-at "\\s("))
+		   (goto-char (scan-sexps (point) 1)))
+		  ((and (looking-at (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))
+			(not (eq (char-before (point)) ?.))
+			(not (eq (char-before (point)) ?:)))
+		   (ruby-end-of-block)
+		   (forward-word 1))
+		  ((looking-at "\\(\\$\\|@@?\\)?\\sw")
+		   (while (progn
+			    (while (progn (forward-word 1) (looking-at "_")))
+			    (cond ((looking-at "::") (forward-char 2) t)
+				  ((> (skip-chars-forward ".") 0))
+				  ((looking-at "\\?\\|!\\(=[~=>]\\|[^~=]\\)")
+				   (forward-char 1) nil)))))
+		  ((let (state expr)
+		     (while
+			 (progn
+			   (setq expr (or expr (ruby-expr-beg)
+					  (looking-at "%\\sw?\\Sw\\|[\"'`/]")))
+			   (nth 1 (setq state (apply 'ruby-parse-partial nil state))))
+		       (setq expr t)
+		       (skip-chars-forward "<"))
+		     (not expr))))
+	    (setq i (1- i)))
+	((error) (forward-word 1)))
+      i)))
+
+(defun-region-command ruby-backward-sexp (&optional cnt)
+  (interactive "p")
+  (if (and (numberp cnt) (< cnt 0))
+      (ruby-forward-sexp (- cnt))
+    (let ((i (or cnt 1)))
+      (condition-case nil
+	  (while (> i 0)
+	    (skip-chars-backward " \t\n,.:;|&^~=!?\\+\\-\\*")
+	    (forward-char -1)
+	    (cond ((looking-at "\\s)")
+		   (goto-char (scan-sexps (1+ (point)) -1))
+		   (case (char-before)
+		     (?% (forward-char -1))
+		     ('(?q ?Q ?w ?W ?r ?x)
+		      (if (eq (char-before (1- (point))) ?%) (forward-char -2))))
+		   nil)
+		  ((looking-at "\\s\"\\|\\\\\\S_")
+		   (let ((c (char-to-string (char-before (match-end 0)))))
+		     (while (and (search-backward c)
+				 (oddp (skip-chars-backward "\\")))))
+		   nil)
+		  ((looking-at "\\s.\\|\\s\\")
+		   (if (ruby-special-char-p) (forward-char -1)))
+		  ((looking-at "\\s(") nil)
+		  (t
+		   (forward-char 1)
+		   (while (progn (forward-word -1)
+				 (case (char-before)
+				   (?_ t)
+				   (?. (forward-char -1) t)
+				   ((?$ ?@)
+				    (forward-char -1)
+				    (and (eq (char-before) (char-after)) (forward-char -1)))
+				   (?:
+				    (forward-char -1)
+				    (eq (char-before) :)))))
+		   (if (looking-at ruby-block-end-re)
+		       (ruby-beginning-of-block))
+		   nil))
+	    (setq i (1- i)))
+	((error)))
+      i)))
+
+(defun ruby-reindent-then-newline-and-indent ()
+  (interactive "*")
+  (newline)
+  (save-excursion
+    (end-of-line 0)
+    (indent-according-to-mode)
+    (delete-region (point) (progn (skip-chars-backward " \t") (point))))
+  (indent-according-to-mode))
+
+(fset 'ruby-encomment-region (symbol-function 'comment-region))
+
+(defun ruby-decomment-region (beg end)
+  (interactive "r")
+  (save-excursion
+    (goto-char beg)
+    (while (re-search-forward "^\\([ \t]*\\)#" end t)
+      (replace-match "\\1" nil nil)
+      (save-excursion
+	(ruby-indent-line)))))
+
+(defun ruby-insert-end ()
+  (interactive)
+  (insert "end")
+  (ruby-indent-line t)
+  (end-of-line))
+
+(defun ruby-mark-defun ()
+  "Put mark at end of this Ruby function, point at beginning."
+  (interactive)
+  (push-mark (point))
+  (ruby-end-of-defun)
+  (push-mark (point) nil t)
+  (ruby-beginning-of-defun)
+  (re-search-backward "^\n" (- (point) 1) t))
+
+(defun ruby-indent-exp (&optional shutup-p)
+  "Indent each line in the balanced expression following point syntactically.
+If optional SHUTUP-P is non-nil, no errors are signalled if no
+balanced expression is found."
+  (interactive "*P")
+  (let ((here (point-marker)) start top column (nest t))
+    (set-marker-insertion-type here t)
+    (unwind-protect
+	(progn
+	  (beginning-of-line)
+	  (setq start (point) top (current-indentation))
+	  (while (and (not (eobp))
+		      (progn
+			(setq column (ruby-calculate-indent start))
+			(cond ((> column top)
+			       (setq nest t))
+			      ((and (= column top) nest)
+			       (setq nest nil) t))))
+	    (ruby-indent-to column)
+	    (beginning-of-line 2)))
+      (goto-char here)
+      (set-marker here nil))))
+
+(defun ruby-add-log-current-method ()
+  "Return current method string."
+  (condition-case nil
+      (save-excursion
+	(let ((mlist nil) (indent 0))
+	  ;; get current method (or class/module)
+	  (if (re-search-backward
+	       (concat "^[ \t]*\\(def\\|class\\|module\\)[ \t]+"
+		       "\\(" 
+		       ;; \\. for class method
+			"\\(" ruby-symbol-re "\\|\\." "\\)" 
+			"+\\)")
+	       nil t)
+	      (progn
+		(setq mlist (list (match-string 2)))
+		(goto-char (match-beginning 1))
+		(setq indent (current-column))
+		(beginning-of-line)))
+	  ;; nest class/module
+	  (while (and (> indent 0)
+		      (re-search-backward
+		       (concat
+			"^[ \t]*\\(class\\|module\\)[ \t]+"
+			"\\([A-Z]" ruby-symbol-re "+\\)")
+		       nil t))
+	    (goto-char (match-beginning 1))
+	    (if (< (current-column) indent)
+		(progn
+		  (setq mlist (cons (match-string 2) mlist))
+		  (setq indent (current-column))
+		  (beginning-of-line))))
+	  ;; generate string
+	  (if (consp mlist)
+	      (mapconcat (function identity) mlist "::")
+	    nil)))))
+
+(cond
+ ((featurep 'font-lock)
+  (or (boundp 'font-lock-variable-name-face)
+      (setq font-lock-variable-name-face font-lock-type-face))
+
+  (setq ruby-font-lock-syntactic-keywords
+	'(
+	  ;; #{ }, #$hoge, #@foo are not comments
+	  ("\\(#\\)[{$@]" 1 (1 . nil))
+	  ;; the last $', $", $` in the respective string is not variable
+	  ;; the last ?', ?", ?` in the respective string is not ascii code
+	  ("\\(^\\|[\[ \t\n<+\(,=]\\)\\(['\"`]\\)\\(\\\\.\\|\\2\\|[^'\"`\n\\\\]\\)*?\\\\?[?$]\\(\\2\\)"
+	   (2 (7 . nil))
+	   (4 (7 . nil)))
+	  ;; $' $" $` .... are variables
+	  ;; ?' ?" ?` are ascii codes
+	  ("\\(^\\|[^\\\\]\\)\\(\\\\\\\\\\)*[?$]\\([#\"'`]\\)" 3 (1 . nil))
+	  ;; regexps
+	  ("\\(^\\|[=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
+	   (4 (7 . ?/))
+	   (6 (7 . ?/)))
+	  ("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
+	  ("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil))))
+
+  (cond ((featurep 'xemacs)
+	 (put 'ruby-mode 'font-lock-defaults
+	      '((ruby-font-lock-keywords)
+		nil nil nil
+		beginning-of-line
+		(font-lock-syntactic-keywords
+		 . ruby-font-lock-syntactic-keywords))))
+	(t
+	 (add-hook 'ruby-mode-hook
+	    '(lambda ()
+	       (make-local-variable 'font-lock-defaults)
+	       (make-local-variable 'font-lock-keywords)
+	       (make-local-variable 'font-lock-syntax-table)
+	       (make-local-variable 'font-lock-syntactic-keywords)
+	       (setq font-lock-defaults '((ruby-font-lock-keywords) nil nil))
+	       (setq font-lock-keywords ruby-font-lock-keywords)
+	       (setq font-lock-syntax-table ruby-font-lock-syntax-table)
+	       (setq font-lock-syntactic-keywords ruby-font-lock-syntactic-keywords)))))
+
+  (defun ruby-font-lock-docs (limit)
+    (if (re-search-forward "^=begin\\(\\s \\|$\\)" limit t)
+	(let (beg)
+	  (beginning-of-line)
+	  (setq beg (point))
+	  (forward-line 1)
+	  (if (re-search-forward "^=end\\(\\s \\|$\\)" limit t)
+	      (progn
+		(set-match-data (list beg (point)))
+		t)))))
+
+  (defun ruby-font-lock-maybe-docs (limit)
+    (let (beg)
+      (save-excursion
+	(if (and (re-search-backward "^=\\(begin\\|end\\)\\(\\s \\|$\\)" nil t)
+		 (string= (match-string 1) "begin"))
+	    (progn
+	      (beginning-of-line)
+	      (setq beg (point)))))
+      (if (and beg (and (re-search-forward "^=\\(begin\\|end\\)\\(\\s \\|$\\)" nil t)
+			(string= (match-string 1) "end")))
+	  (progn
+	    (set-match-data (list beg (point)))
+	    t)
+	nil)))
+
+  (defvar ruby-font-lock-syntax-table
+    (let* ((tbl (copy-syntax-table ruby-mode-syntax-table)))
+      (modify-syntax-entry ?_ "w" tbl)
+      tbl))
+
+  (defun ruby-font-lock-here-docs (limit)
+    (if (re-search-forward ruby-here-doc-beg-re limit t)
+	(let (beg)
+	  (beginning-of-line)
+          (forward-line)
+	  (setq beg (point))
+	  (if (re-search-forward (ruby-here-doc-end-match) nil t)
+	      (progn
+		(set-match-data (list beg (point)))
+		t)))))
+
+  (defun ruby-font-lock-maybe-here-docs (limit)
+    (let (beg)
+      (save-excursion
+	(if (re-search-backward ruby-here-doc-beg-re nil t)
+	    (progn
+	      (beginning-of-line)
+              (forward-line)
+	      (setq beg (point)))))
+      (if (and beg
+	       (let ((end-match (ruby-here-doc-end-match)))
+                 (and (not (re-search-backward end-match beg t))
+		      (re-search-forward end-match nil t))))
+	  (progn
+	    (set-match-data (list beg (point)))
+	    t)
+          nil)))
+
+  (defvar ruby-font-lock-keywords
+    (list
+     ;; functions
+     '("^\\s *def\\s +\\([^( \t\n]+\\)"
+       1 font-lock-function-name-face)
+     ;; keywords
+     (cons (concat
+	    "\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(defined\\?\\|\\("
+	    (mapconcat
+	     'identity
+	     '("alias"
+	       "and"
+	       "begin"
+	       "break"
+	       "case"
+	       "catch"
+	       "class"
+	       "def"
+	       "do"
+	       "elsif"
+	       "else"
+	       "fail"
+	       "ensure"
+	       "for"
+	       "end"
+	       "if"
+	       "in"
+	       "module"
+	       "next"
+	       "not"
+	       "or"
+	       "raise"
+	       "redo"
+	       "rescue"
+	       "retry"
+	       "return"
+	       "then"
+	       "throw"
+	       "super"
+	       "unless"
+	       "undef"
+	       "until"
+	       "when"
+	       "while"
+	       "yield"
+	       )
+	     "\\|")
+	    "\\)\\>\\)")
+	   2)
+     ;; variables
+     '("\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(nil\\|self\\|true\\|false\\)\\>"
+       2 font-lock-variable-name-face)
+     ;; variables
+     '("\\(\\$\\([^a-zA-Z0-9 \n]\\|[0-9]\\)\\)\\W"
+       1 font-lock-variable-name-face)
+     '("\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+"
+       0 font-lock-variable-name-face)
+     ;; embedded document
+     '(ruby-font-lock-docs
+       0 font-lock-comment-face t)
+     '(ruby-font-lock-maybe-docs
+       0 font-lock-comment-face t)
+     ;; "here" document
+     '(ruby-font-lock-here-docs
+       0 font-lock-string-face t)
+     '(ruby-font-lock-maybe-here-docs
+       0 font-lock-string-face t)
+     `(,ruby-here-doc-beg-re
+       0 font-lock-string-face t)
+     ;; general delimited string
+     '("\\(^\\|[[ \t\n<+(,=]\\)\\(%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\3\\)\\)"
+       (2 font-lock-string-face))
+     ;; constants
+     '("\\(^\\|[^_]\\)\\b\\([A-Z]+\\(\\w\\|_\\)*\\)"
+       2 font-lock-type-face)
+     ;; symbols
+     '("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|\\[\\]=?\\|\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)"
+       2 font-lock-reference-face)
+     ;; expression expansion
+     '("#\\({[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\|\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+\\)"
+       0 font-lock-variable-name-face t)
+     ;; warn lower camel case
+     ;'("\\<[a-z]+[a-z0-9]*[A-Z][A-Za-z0-9]*\\([!?]?\\|\\>\\)"
+     ;  0 font-lock-warning-face)
+     )
+    "*Additional expressions to highlight in ruby mode."))
+
+ ((featurep 'hilit19)
+  (hilit-set-mode-patterns
+   'ruby-mode
+   '(("[^$\\?]\\(\"[^\\\"]*\\(\\\\\\(.\\|\n\\)[^\\\"]*\\)*\"\\)" 1 string)
+     ("[^$\\?]\\('[^\\']*\\(\\\\\\(.\\|\n\\)[^\\']*\\)*'\\)" 1 string)
+     ("[^$\\?]\\(`[^\\`]*\\(\\\\\\(.\\|\n\\)[^\\`]*\\)*`\\)" 1 string)
+     ("^\\s *#.*$" nil comment)
+     ("[^$@?\\]\\(#[^$@{\n].*$\\)" 1 comment)
+     ("[^a-zA-Z_]\\(\\?\\(\\\\[CM]-\\)*.\\)" 1 string)
+     ("^\\s *\\(require\\|load\\).*$" nil include)
+     ("^\\s *\\(include\\|alias\\|undef\\).*$" nil decl)
+     ("^\\s *\\<\\(class\\|def\\|module\\)\\>" "[)\n;]" defun)
+     ("[^_]\\<\\(begin\\|case\\|else\\|elsif\\|end\\|ensure\\|for\\|if\\|unless\\|rescue\\|then\\|when\\|while\\|until\\|do\\|yield\\)\\>\\([^_]\\|$\\)" 1 defun)
+     ("[^_]\\<\\(and\\|break\\|next\\|raise\\|fail\\|in\\|not\\|or\\|redo\\|retry\\|return\\|super\\|yield\\|catch\\|throw\\|self\\|nil\\)\\>\\([^_]\\|$\\)" 1 keyword)
+     ("\\$\\(.\\|\\sw+\\)" nil type)
+     ("[$@].[a-zA-Z_0-9]*" nil struct)
+     ("^__END__" nil label))))
+ )
+
+
+(provide 'ruby-mode)
diff --git a/ruby_1_8_6/misc/rubydb2x.el b/ruby_1_8_6/misc/rubydb2x.el
new file mode 100644
index 0000000000..a74265fb0e
--- /dev/null
+++ b/ruby_1_8_6/misc/rubydb2x.el
@@ -0,0 +1,104 @@
+(require 'gud)
+(provide 'rubydb)
+
+;; ======================================================================
+;; rubydb functions
+
+;;; History of argument lists passed to rubydb.
+(defvar gud-rubydb-history nil)
+
+(defun gud-rubydb-massage-args (file args)
+  (cons "-I" (cons "." (cons "-r" (cons "debug" (cons file args))))))
+
+;; There's no guarantee that Emacs will hand the filter the entire
+;; marker at once; it could be broken up across several strings.  We
+;; might even receive a big chunk with several markers in it.  If we
+;; receive a chunk of text which looks like it might contain the
+;; beginning of a marker, we save it here between calls to the
+;; filter.
+(defvar gud-rubydb-marker-acc "")
+
+(defun gud-rubydb-marker-filter (string)
+  (save-match-data
+    (setq gud-marker-acc (concat gud-marker-acc string))
+    (let ((output ""))
+      
+      ;; Process all the complete markers in this chunk.
+      (while (string-match "\032\032\\([^:\n]*\\):\\([0-9]*\\):.*\n"
+                           gud-marker-acc)
+        (setq
+         
+         ;; Extract the frame position from the marker.
+         gud-last-frame
+         (cons (substring gud-marker-acc (match-beginning 1) (match-end 1))
+               (string-to-int (substring gud-marker-acc
+                                         (match-beginning 2)
+                                         (match-end 2))))
+         
+         ;; Append any text before the marker to the output we're going
+         ;; to return - we don't include the marker in this text.
+         output (concat output
+                        (substring gud-marker-acc 0 (match-beginning 0)))
+         
+         ;; Set the accumulator to the remaining text.
+         gud-marker-acc (substring gud-marker-acc (match-end 0))))
+      
+      ;; Does the remaining text look like it might end with the
+      ;; beginning of another marker?  If it does, then keep it in
+      ;; gud-marker-acc until we receive the rest of it.  Since we
+      ;; know the full marker regexp above failed, it's pretty simple to
+      ;; test for marker starts.
+      (if (string-match "\032.*\\'" gud-marker-acc)
+          (progn
+            ;; Everything before the potential marker start can be output.
+            (setq output (concat output (substring gud-marker-acc
+                                                   0 (match-beginning 0))))
+            
+            ;; Everything after, we save, to combine with later input.
+            (setq gud-marker-acc
+                  (substring gud-marker-acc (match-beginning 0))))
+        
+        (setq output (concat output gud-marker-acc)
+              gud-marker-acc ""))
+      
+      output)))
+  
+(defun gud-rubydb-find-file (f)
+  (find-file-noselect f))
+
+(defvar rubydb-command-name "ruby"
+  "File name for executing ruby.")
+
+;;;###autoload
+(defun rubydb (command-line)
+  "Run rubydb on program FILE in buffer *gud-FILE*.
+The directory containing FILE becomes the initial working directory
+and source-file directory for your debugger."
+  (interactive
+   (list (read-from-minibuffer "Run rubydb (like this): "
+                               (if (consp gud-rubydb-history)
+                                   (car gud-rubydb-history)
+                                 (concat rubydb-command-name " "))
+                               nil nil
+                               '(gud-rubydb-history . 1))))
+
+  (gud-overload-functions '((gud-massage-args . gud-rubydb-massage-args)
+                            (gud-marker-filter . gud-rubydb-marker-filter)
+                            (gud-find-file . gud-rubydb-find-file)
+                            ))
+  (gud-common-init command-line)
+
+  (gud-def gud-break  "b %l"         "\C-b" "Set breakpoint at current line.")
+;  (gud-def gud-remove "clear %l"     "\C-d" "Remove breakpoint at current line")
+  (gud-def gud-step   "s"            "\C-s" "Step one source line with display.")
+  (gud-def gud-next   "n"            "\C-n" "Step one line (skip functions).")
+  (gud-def gud-cont   "c"            "\C-r" "Continue with display.")
+  (gud-def gud-finish "finish"       "\C-f" "Finish executing current function.")
+  (gud-def gud-up     "up %p"        "<" "Up N stack frames (numeric arg).")
+  (gud-def gud-down   "down %p"      ">" "Down N stack frames (numeric arg).")
+  (gud-def gud-print  "p %e"         "\C-p" "Evaluate ruby expression at point.")
+
+  (setq comint-prompt-regexp "^(rdb:-) ")
+  (setq paragraph-start comint-prompt-regexp)
+  (run-hooks 'rubydb-mode-hook)
+  )
diff --git a/ruby_1_8_6/misc/rubydb3x.el b/ruby_1_8_6/misc/rubydb3x.el
new file mode 100644
index 0000000000..98ce1a1978
--- /dev/null
+++ b/ruby_1_8_6/misc/rubydb3x.el
@@ -0,0 +1,115 @@
+(require 'gud)
+(provide 'rubydb)
+
+;; ======================================================================
+;; rubydb functions
+
+;;; History of argument lists passed to rubydb.
+(defvar gud-rubydb-history nil)
+
+(if (fboundp 'gud-overload-functions)
+    (defun gud-rubydb-massage-args (file args)
+      (cons "-r" (cons "debug" (cons file args))))
+  (defun gud-rubydb-massage-args (file args)
+      (cons "-r" (cons "debug" args))))
+
+;; There's no guarantee that Emacs will hand the filter the entire
+;; marker at once; it could be broken up across several strings.  We
+;; might even receive a big chunk with several markers in it.  If we
+;; receive a chunk of text which looks like it might contain the
+;; beginning of a marker, we save it here between calls to the
+;; filter.
+(defvar gud-rubydb-marker-acc "")
+(make-variable-buffer-local 'gud-rubydb-marker-acc)
+
+(defun gud-rubydb-marker-filter (string)
+  (setq gud-rubydb-marker-acc (concat gud-rubydb-marker-acc string))
+  (let ((output ""))
+
+    ;; Process all the complete markers in this chunk.
+    (while (string-match "\032\032\\([^:\n]*\\):\\([0-9]*\\):.*\n"
+			 gud-rubydb-marker-acc)
+      (setq
+
+       ;; Extract the frame position from the marker.
+       gud-last-frame
+       (cons (substring gud-rubydb-marker-acc (match-beginning 1) (match-end 1))
+	     (string-to-int (substring gud-rubydb-marker-acc
+				       (match-beginning 2)
+				       (match-end 2))))
+
+       ;; Append any text before the marker to the output we're going
+       ;; to return - we don't include the marker in this text.
+       output (concat output
+		      (substring gud-rubydb-marker-acc 0 (match-beginning 0)))
+
+       ;; Set the accumulator to the remaining text.
+       gud-rubydb-marker-acc (substring gud-rubydb-marker-acc (match-end 0))))
+
+    ;; Does the remaining text look like it might end with the
+    ;; beginning of another marker?  If it does, then keep it in
+    ;; gud-rubydb-marker-acc until we receive the rest of it.  Since we
+    ;; know the full marker regexp above failed, it's pretty simple to
+    ;; test for marker starts.
+    (if (string-match "\032.*\\'" gud-rubydb-marker-acc)
+	(progn
+	  ;; Everything before the potential marker start can be output.
+	  (setq output (concat output (substring gud-rubydb-marker-acc
+						 0 (match-beginning 0))))
+
+	  ;; Everything after, we save, to combine with later input.
+	  (setq gud-rubydb-marker-acc
+		(substring gud-rubydb-marker-acc (match-beginning 0))))
+
+      (setq output (concat output gud-rubydb-marker-acc)
+	    gud-rubydb-marker-acc ""))
+
+    output))
+
+(defun gud-rubydb-find-file (f)
+  (save-excursion
+    (let ((buf (find-file-noselect f)))
+      (set-buffer buf)
+;;      (gud-make-debug-menu)
+      buf)))
+
+(defvar rubydb-command-name "ruby"
+  "File name for executing ruby.")
+
+;;;###autoload
+(defun rubydb (command-line)
+  "Run rubydb on program FILE in buffer *gud-FILE*.
+The directory containing FILE becomes the initial working directory
+and source-file directory for your debugger."
+  (interactive
+   (list (read-from-minibuffer "Run rubydb (like this): "
+			       (if (consp gud-rubydb-history)
+				   (car gud-rubydb-history)
+				 (concat rubydb-command-name " "))
+			       nil nil
+			       '(gud-rubydb-history . 1))))
+
+  (if (not (fboundp 'gud-overload-functions))
+      (gud-common-init command-line 'gud-rubydb-massage-args
+		       'gud-rubydb-marker-filter 'gud-rubydb-find-file)
+    (gud-overload-functions '((gud-massage-args . gud-rubydb-massage-args)
+			      (gud-marker-filter . gud-rubydb-marker-filter)
+			      (gud-find-file . gud-rubydb-find-file)))
+    (gud-common-init command-line rubydb-command-name))
+
+  (gud-def gud-break  "b %l"         "\C-b" "Set breakpoint at current line.")
+;  (gud-def gud-remove "clear %l"     "\C-d" "Remove breakpoint at current line")
+  (gud-def gud-step   "s"            "\C-s" "Step one source line with display.")
+  (gud-def gud-next   "n"            "\C-n" "Step one line (skip functions).")
+  (gud-def gud-cont   "c"            "\C-r" "Continue with display.")
+  (gud-def gud-finish "finish"       "\C-f" "Finish executing current function.")
+  (gud-def gud-up     "up %p"        "<" "Up N stack frames (numeric arg).")
+  (gud-def gud-down   "down %p"      ">" "Down N stack frames (numeric arg).")
+  (gud-def gud-print  "p %e"         "\C-p" "Evaluate ruby expression at point.")
+
+  (setq comint-prompt-regexp "^(rdb:-) ")
+  (if (boundp 'comint-last-output-start)
+      (set-marker comint-last-output-start (point)))
+  (set (make-local-variable 'paragraph-start) comint-prompt-regexp)
+  (run-hooks 'rubydb-mode-hook)
+  )
diff --git a/ruby_1_8_6/missing.h b/ruby_1_8_6/missing.h
new file mode 100644
index 0000000000..3f56078259
--- /dev/null
+++ b/ruby_1_8_6/missing.h
@@ -0,0 +1,142 @@
+/************************************************
+
+  missing.h - prototype for *.c in ./missing, and
+  	      for missing timeval struct
+
+  $Author$
+  $Date$
+  created at: Sat May 11 23:46:03 JST 2002
+
+************************************************/
+
+#ifndef MISSING_H
+#define MISSING_H
+
+#if defined(HAVE_SYS_TIME_H)
+#  include <sys/time.h>
+#elif !defined(_WIN32)
+#  define time_t long
+struct timeval {
+    time_t tv_sec;	/* seconds */
+    time_t tv_usec;	/* microseconds */
+};
+#endif
+#if defined(HAVE_SYS_TYPES_H)
+#  include <sys/types.h>
+#endif
+
+#ifndef HAVE_ACOSH
+extern double acosh _((double));
+extern double asinh _((double));
+extern double atanh _((double));
+#endif
+
+#ifndef HAVE_CRYPT
+extern char *crypt _((char *, char *));
+#endif
+
+#ifndef HAVE_DUP2
+extern int dup2 _((int, int));
+#endif
+
+#ifndef HAVE_EACCESS
+extern int eaccess _((const char*, int));
+#endif
+
+#ifndef HAVE_FINITE
+extern int finite _((double));
+#endif
+
+#ifndef HAVE_FLOCK
+extern int flock _((int, int));
+#endif
+
+/*
+#ifndef HAVE_FREXP
+extern double frexp _((double, int *));
+#endif
+*/
+
+#ifndef HAVE_HYPOT
+extern double hypot _((double, double));
+#endif
+
+#ifndef HAVE_ERF
+extern double erf _((double));
+extern double erfc _((double));
+#endif
+
+#ifndef HAVE_ISINF
+# if defined(HAVE_FINITE) && defined(HAVE_ISNAN)
+# define isinf(x) (!finite(x) && !isnan(x))
+# else
+extern int isinf _((double));
+# endif
+#endif
+
+#ifndef HAVE_ISNAN
+extern int isnan _((double));
+#endif
+
+/*
+#ifndef HAVE_MEMCMP
+extern int memcmp _((char *, char *, int));
+#endif
+*/
+
+#ifndef HAVE_MEMMOVE
+extern void *memmove _((void *, void *, int));
+#endif
+
+/*
+#ifndef HAVE_MODF
+extern double modf _((double, double *));
+#endif
+*/
+
+#ifndef HAVE_STRCASECMP
+extern int strcasecmp _((char *, char *));
+#endif
+
+#ifndef HAVE_STRNCASECMP
+extern int strncasecmp _((char *, char *, int));
+#endif
+
+#ifndef HAVE_STRCHR
+extern char *strchr _((char *, int));
+extern char *strrchr _((char *, int));
+#endif
+
+#ifndef HAVE_STRERROR
+extern char *strerror _((int));
+#endif
+
+#ifndef HAVE_STRFTIME
+extern size_t strftime _((char *, size_t, const char *, const struct tm *));
+#endif
+
+#ifndef HAVE_STRSTR
+extern char *strstr _((char *, char *));
+#endif
+
+/*
+#ifndef HAVE_STRTOL
+extern long strtol _((char *, char **, int));
+#endif
+*/
+
+#ifndef HAVE_STRTOUL
+extern unsigned long strtoul _((char *, char **, int));
+#endif
+
+#ifndef HAVE_VSNPRINTF
+# ifdef HAVE_STDARG_PROTOTYPES
+#  include <stdarg.h>
+# else
+#  include <varargs.h>
+# endif
+extern int snprintf __((char *, size_t n, char const *, ...));
+extern int vsnprintf _((char *, size_t n, char const *, va_list));
+#endif
+
+#endif /* MISSING_H */
diff --git a/ruby_1_8_6/missing/acosh.c b/ruby_1_8_6/missing/acosh.c
new file mode 100644
index 0000000000..a4443e191f
--- /dev/null
+++ b/ruby_1_8_6/missing/acosh.c
@@ -0,0 +1,88 @@
+/**********************************************************************
+
+  acosh.c -
+
+  $Author$
+  $Date$
+  created at: Fri Apr 12 00:34:17 JST 2002
+
+  public domain rewrite of acosh(3), asinh(3) and atanh(3)
+
+**********************************************************************/
+
+#include <errno.h>
+#include <float.h>
+#include <math.h>
+
+/* DBL_MANT_DIG must be less than 4 times of bits of int */
+#ifndef DBL_MANT_DIG
+#define DBL_MANT_DIG 53		/* in this case, at least 12 digit precision */
+#endif
+#define BIG_CRITERIA_BIT (1<<DBL_MANT_DIG/2)
+#if BIG_CRITERIA_BIT > 0
+#define BIG_CRITERIA (1.0*BIG_CRITERIA_BIT)
+#else
+#define BIG_CRITERIA (1.0*(1<<DBL_MANT_DIG/4)*(1<<(DBL_MANT_DIG/2+1-DBL_MANT_DIG/4)))
+#endif
+#define SMALL_CRITERIA_BIT (1<<(DBL_MANT_DIG/3))
+#if SMALL_CRITERIA_BIT > 0
+#define SMALL_CRITERIA (1.0/SMALL_CRITERIA_BIT)
+#else
+#define SMALL_CRITERIA (1.0*(1<<DBL_MANT_DIG/4)*(1<<(DBL_MANT_DIG/3+1-DBL_MANT_DIG/4)))
+#endif
+
+#ifndef HAVE_ACOSH
+double
+acosh(x)
+    double x;
+{
+    if (x < 1)
+	x = -1;			/* NaN */
+    else if (x == 1)
+	return 0;
+    else if (x > BIG_CRITERIA)
+	x += x;
+    else
+	x += sqrt((x + 1) * (x - 1));
+    return log(x);
+}
+#endif
+
+#ifndef HAVE_ASINH
+double
+asinh(x)
+    double x;
+{
+    int neg = x < 0;
+    double z = fabs(x);
+
+    if (z < SMALL_CRITERIA) return x;
+    if (z < (1.0/(1<<DBL_MANT_DIG/5))) {
+	double x2 = z * z;
+	z *= 1 + x2 * (-1.0/6.0 + x2 * 3.0/40.0);
+    }
+    else if (z > BIG_CRITERIA) {
+	z = log(z + z);
+    }
+    else {
+	z = log(z + sqrt(z * z + 1));
+    }
+    if (neg) z = -z;
+    return z;
+}
+#endif
+
+#ifndef HAVE_ATANH
+double
+atanh(x)
+    double x;
+{
+    int neg = x < 0;
+    double z = fabs(x);
+
+    if (z < SMALL_CRITERIA) return x;
+    z = log(z > 1 ? -1 : (1 + z) / (1 - z)) / 2;
+    if (neg) z = -z;
+    return z;
+}
+#endif
diff --git a/ruby_1_8_6/missing/alloca.c b/ruby_1_8_6/missing/alloca.c
new file mode 100644
index 0000000000..39697f114a
--- /dev/null
+++ b/ruby_1_8_6/missing/alloca.c
@@ -0,0 +1,194 @@
+/* alloca -- (mostly) portable public-domain implementation -- D A Gwyn
+
+   last edit:	86/05/30	rms
+   include config.h, since on VMS it renames some symbols.
+   Use xmalloc instead of malloc.
+
+   This implementation of the PWB library alloca() function,
+   which is used to allocate space off the run-time stack so
+   that it is automatically reclaimed upon procedure exit, 
+   was inspired by discussions with J. Q. Johnson of Cornell.
+
+   It should work under any C implementation that uses an
+   actual procedure stack (as opposed to a linked list of
+   frames).  There are some preprocessor constants that can
+   be defined when compiling for your specific system, for
+   improved efficiency; however, the defaults should be okay.
+
+   The general concept of this implementation is to keep
+   track of all alloca()-allocated blocks, and reclaim any
+   that are found to be deeper in the stack than the current
+   invocation.  This heuristic does not reclaim storage as
+   soon as it becomes invalid, but it will do so eventually.
+
+   As a special case, alloca(0) reclaims storage without
+   allocating any.  It is a good idea to use alloca(0) in
+   your main control loop, etc. to force garbage collection.
+*/
+#ifndef lint
+static char	SCCSid[] = "@(#)alloca.c	1.1";	/* for the "what" utility */
+#endif
+
+#include "config.h"
+#ifdef emacs
+#ifdef static
+/* actually, only want this if static is defined as ""
+   -- this is for usg, in which emacs must undefine static
+   in order to make unexec workable
+   */
+#ifndef STACK_DIRECTION
+you
+lose
+-- must know STACK_DIRECTION at compile-time
+#endif /* STACK_DIRECTION undefined */
+#endif /* static */
+#endif /* emacs */
+
+#ifdef X3J11
+typedef void	*pointer;		/* generic pointer type */
+#else
+typedef char	*pointer;		/* generic pointer type */
+#endif /* X3J11 */
+
+#define	NULL	0			/* null pointer constant */
+
+#ifdef RUBY_LIB
+#define xmalloc ruby_xmalloc
+#define xfree ruby_xfree
+#endif
+
+extern void	xfree();
+extern pointer	xmalloc();
+
+/*
+	Define STACK_DIRECTION if you know the direction of stack
+	growth for your system; otherwise it will be automatically
+	deduced at run-time.
+
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown
+*/
+
+#ifndef STACK_DIRECTION
+#define	STACK_DIRECTION	0		/* direction unknown */
+#endif
+
+#if STACK_DIRECTION != 0
+
+#define	STACK_DIR	STACK_DIRECTION	/* known at compile-time */
+
+#else	/* STACK_DIRECTION == 0; need run-time code */
+
+static int	stack_dir;		/* 1 or -1 once known */
+#define	STACK_DIR	stack_dir
+
+static void
+find_stack_direction (/* void */)
+{
+  static char	*addr = NULL;	/* address of first
+				   `dummy', once known */
+  auto char	dummy;		/* to get stack address */
+
+  if (addr == NULL)
+    {				/* initial entry */
+      addr = &dummy;
+
+      find_stack_direction ();	/* recurse once */
+    }
+  else				/* second entry */
+    if (&dummy > addr)
+      stack_dir = 1;		/* stack grew upward */
+    else
+      stack_dir = -1;		/* stack grew downward */
+}
+
+#endif	/* STACK_DIRECTION == 0 */
+
+/*
+	An "alloca header" is used to:
+	(a) chain together all alloca()ed blocks;
+	(b) keep track of stack depth.
+
+	It is very important that sizeof(header) agree with malloc()
+	alignment chunk size.  The following default should work okay.
+*/
+
+#ifndef	ALIGN_SIZE
+#define	ALIGN_SIZE	sizeof(double)
+#endif
+
+typedef union hdr
+{
+  char	align[ALIGN_SIZE];	/* to force sizeof(header) */
+  struct
+    {
+      union hdr *next;		/* for chaining headers */
+      char *deep;		/* for stack depth measure */
+    } h;
+} header;
+
+/*
+	alloca( size ) returns a pointer to at least `size' bytes of
+	storage which will be automatically reclaimed upon exit from
+	the procedure that called alloca().  Originally, this space
+	was supposed to be taken from the current stack frame of the
+	caller, but that method cannot be made to work for some
+	implementations of C, for example under Gould's UTX/32.
+*/
+
+static header *last_alloca_header = NULL; /* -> last alloca header */
+
+pointer
+alloca (size)			/* returns pointer to storage */
+     unsigned	size;		/* # bytes to allocate */
+{
+  auto char	probe;		/* probes stack depth: */
+  register char	*depth = &probe;
+
+#if STACK_DIRECTION == 0
+  if (STACK_DIR == 0)		/* unknown growth direction */
+    find_stack_direction ();
+#endif
+
+  /* Reclaim garbage, defined as all alloca()ed storage that
+     was allocated from deeper in the stack than currently. */
+  {
+    register header	*hp;	/* traverses linked list */
+
+    for (hp = last_alloca_header; hp != NULL;)
+      if (STACK_DIR > 0 && hp->h.deep > depth
+	  || STACK_DIR < 0 && hp->h.deep < depth)
+	{
+	  register header	*np = hp->h.next;
+
+	  xfree ((pointer) hp);	/* collect garbage */
+
+	  hp = np;		/* -> next header */
+	}
+      else
+	break;			/* rest are not deeper */
+
+    last_alloca_header = hp;	/* -> last valid storage */
+  }
+
+  if (size == 0)
+    return NULL;		/* no allocation required */
+
+  /* Allocate combined header + user data storage. */
+
+  {
+    register pointer	new = xmalloc (sizeof (header) + size);
+    /* address of header */
+
+    ((header *)new)->h.next = last_alloca_header;
+    ((header *)new)->h.deep = depth;
+
+    last_alloca_header = (header *)new;
+
+    /* User storage begins just after header. */
+
+    return (pointer)((char *)new + sizeof(header));
+  }
+}
+
diff --git a/ruby_1_8_6/missing/crypt.c b/ruby_1_8_6/missing/crypt.c
new file mode 100644
index 0000000000..486df5050b
--- /dev/null
+++ b/ruby_1_8_6/missing/crypt.c
@@ -0,0 +1,970 @@
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Tom Truscott.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)crypt.c	8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <limits.h>
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
+#include <stdio.h>
+#ifndef _PASSWORD_EFMT1
+#define _PASSWORD_EFMT1 '_'
+#endif
+
+/*
+ * UNIX password, and DES, encryption.
+ * By Tom Truscott, trt@rti.rti.org,
+ * from algorithms by Robert W. Baldwin and James Gillogly.
+ *
+ * References:
+ * "Mathematical Cryptology for Computer Scientists and Mathematicians,"
+ * by Wayne Patterson, 1987, ISBN 0-8476-7438-X.
+ *
+ * "Password Security: A Case History," R. Morris and Ken Thompson,
+ * Communications of the ACM, vol. 22, pp. 594-597, Nov. 1979.
+ *
+ * "DES will be Totally Insecure within Ten Years," M.E. Hellman,
+ * IEEE Spectrum, vol. 16, pp. 32-39, July 1979.
+ */
+
+/* =====  Configuration ==================== */
+
+/*
+ * define "MUST_ALIGN" if your compiler cannot load/store
+ * long integers at arbitrary (e.g. odd) memory locations.
+ * (Either that or never pass unaligned addresses to des_cipher!)
+ */
+#if !defined(vax)
+#define	MUST_ALIGN
+#endif
+
+#ifdef CHAR_BITS
+#if CHAR_BITS != 8
+	#error C_block structure assumes 8 bit characters
+#endif
+#endif
+
+/*
+ * define "LONG_IS_32_BITS" only if sizeof(long)==4.
+ * This avoids use of bit fields (your compiler may be sloppy with them).
+ */
+#if !defined(cray)
+#define	LONG_IS_32_BITS
+#endif
+
+/*
+ * define "B64" to be the declaration for a 64 bit integer.
+ * XXX this feature is currently unused, see "endian" comment below.
+ */
+#if defined(cray)
+#define	B64	long
+#endif
+#if defined(convex)
+#define	B64	long long
+#endif
+
+/*
+ * define "LARGEDATA" to get faster permutations, by using about 72 kilobytes
+ * of lookup tables.  This speeds up des_setkey() and des_cipher(), but has
+ * little effect on crypt().
+ */
+#if defined(notdef)
+#define	LARGEDATA
+#endif
+
+/* compile with "-DSTATIC=int" when profiling */
+#ifndef STATIC
+#define	STATIC	static
+#endif
+STATIC init_des(), init_perm(), permute();
+#ifdef DEBUG
+STATIC prtab();
+#endif
+
+/* ==================================== */
+
+/*
+ * Cipher-block representation (Bob Baldwin):
+ *
+ * DES operates on groups of 64 bits, numbered 1..64 (sigh).  One
+ * representation is to store one bit per byte in an array of bytes.  Bit N of
+ * the NBS spec is stored as the LSB of the Nth byte (index N-1) in the array.
+ * Another representation stores the 64 bits in 8 bytes, with bits 1..8 in the
+ * first byte, 9..16 in the second, and so on.  The DES spec apparently has
+ * bit 1 in the MSB of the first byte, but that is particularly noxious so we
+ * bit-reverse each byte so that bit 1 is the LSB of the first byte, bit 8 is
+ * the MSB of the first byte.  Specifically, the 64-bit input data and key are
+ * converted to LSB format, and the output 64-bit block is converted back into
+ * MSB format.
+ *
+ * DES operates internally on groups of 32 bits which are expanded to 48 bits
+ * by permutation E and shrunk back to 32 bits by the S boxes.  To speed up
+ * the computation, the expansion is applied only once, the expanded
+ * representation is maintained during the encryption, and a compression
+ * permutation is applied only at the end.  To speed up the S-box lookups,
+ * the 48 bits are maintained as eight 6 bit groups, one per byte, which
+ * directly feed the eight S-boxes.  Within each byte, the 6 bits are the
+ * most significant ones.  The low two bits of each byte are zero.  (Thus,
+ * bit 1 of the 48 bit E expansion is stored as the "4"-valued bit of the
+ * first byte in the eight byte representation, bit 2 of the 48 bit value is
+ * the "8"-valued bit, and so on.)  In fact, a combined "SPE"-box lookup is
+ * used, in which the output is the 64 bit result of an S-box lookup which
+ * has been permuted by P and expanded by E, and is ready for use in the next
+ * iteration.  Two 32-bit wide tables, SPE[0] and SPE[1], are used for this
+ * lookup.  Since each byte in the 48 bit path is a multiple of four, indexed
+ * lookup of SPE[0] and SPE[1] is simple and fast.  The key schedule and
+ * "salt" are also converted to this 8*(6+2) format.  The SPE table size is
+ * 8*64*8 = 4K bytes.
+ *
+ * To speed up bit-parallel operations (such as XOR), the 8 byte
+ * representation is "union"ed with 32 bit values "i0" and "i1", and, on
+ * machines which support it, a 64 bit value "b64".  This data structure,
+ * "C_block", has two problems.  First, alignment restrictions must be
+ * honored.  Second, the byte-order (e.g. little-endian or big-endian) of
+ * the architecture becomes visible.
+ *
+ * The byte-order problem is unfortunate, since on the one hand it is good
+ * to have a machine-independent C_block representation (bits 1..8 in the
+ * first byte, etc.), and on the other hand it is good for the LSB of the
+ * first byte to be the LSB of i0.  We cannot have both these things, so we
+ * currently use the "little-endian" representation and avoid any multi-byte
+ * operations that depend on byte order.  This largely precludes use of the
+ * 64-bit datatype since the relative order of i0 and i1 are unknown.  It
+ * also inhibits grouping the SPE table to look up 12 bits at a time.  (The
+ * 12 bits can be stored in a 16-bit field with 3 low-order zeroes and 1
+ * high-order zero, providing fast indexing into a 64-bit wide SPE.)  On the
+ * other hand, 64-bit datatypes are currently rare, and a 12-bit SPE lookup
+ * requires a 128 kilobyte table, so perhaps this is not a big loss.
+ *
+ * Permutation representation (Jim Gillogly):
+ *
+ * A transformation is defined by its effect on each of the 8 bytes of the
+ * 64-bit input.  For each byte we give a 64-bit output that has the bits in
+ * the input distributed appropriately.  The transformation is then the OR
+ * of the 8 sets of 64-bits.  This uses 8*256*8 = 16K bytes of storage for
+ * each transformation.  Unless LARGEDATA is defined, however, a more compact
+ * table is used which looks up 16 4-bit "chunks" rather than 8 8-bit chunks.
+ * The smaller table uses 16*16*8 = 2K bytes for each transformation.  This
+ * is slower but tolerable, particularly for password encryption in which
+ * the SPE transformation is iterated many times.  The small tables total 9K
+ * bytes, the large tables total 72K bytes.
+ *
+ * The transformations used are:
+ * IE3264: MSB->LSB conversion, initial permutation, and expansion.
+ *	This is done by collecting the 32 even-numbered bits and applying
+ *	a 32->64 bit transformation, and then collecting the 32 odd-numbered
+ *	bits and applying the same transformation.  Since there are only
+ *	32 input bits, the IE3264 transformation table is half the size of
+ *	the usual table.
+ * CF6464: Compression, final permutation, and LSB->MSB conversion.
+ *	This is done by two trivial 48->32 bit compressions to obtain
+ *	a 64-bit block (the bit numbering is given in the "CIFP" table)
+ *	followed by a 64->64 bit "cleanup" transformation.  (It would
+ *	be possible to group the bits in the 64-bit block so that 2
+ *	identical 32->32 bit transformations could be used instead,
+ *	saving a factor of 4 in space and possibly 2 in time, but
+ *	byte-ordering and other complications rear their ugly head.
+ *	Similar opportunities/problems arise in the key schedule
+ *	transforms.)
+ * PC1ROT: MSB->LSB, PC1 permutation, rotate, and PC2 permutation.
+ *	This admittedly baroque 64->64 bit transformation is used to
+ *	produce the first code (in 8*(6+2) format) of the key schedule.
+ * PC2ROT[0]: Inverse PC2 permutation, rotate, and PC2 permutation.
+ *	It would be possible to define 15 more transformations, each
+ *	with a different rotation, to generate the entire key schedule.
+ *	To save space, however, we instead permute each code into the
+ *	next by using a transformation that "undoes" the PC2 permutation,
+ *	rotates the code, and then applies PC2.  Unfortunately, PC2
+ *	transforms 56 bits into 48 bits, dropping 8 bits, so PC2 is not
+ *	invertible.  We get around that problem by using a modified PC2
+ *	which retains the 8 otherwise-lost bits in the unused low-order
+ *	bits of each byte.  The low-order bits are cleared when the
+ *	codes are stored into the key schedule.
+ * PC2ROT[1]: Same as PC2ROT[0], but with two rotations.
+ *	This is faster than applying PC2ROT[0] twice,
+ *
+ * The Bell Labs "salt" (Bob Baldwin):
+ *
+ * The salting is a simple permutation applied to the 48-bit result of E.
+ * Specifically, if bit i (1 <= i <= 24) of the salt is set then bits i and
+ * i+24 of the result are swapped.  The salt is thus a 24 bit number, with
+ * 16777216 possible values.  (The original salt was 12 bits and could not
+ * swap bits 13..24 with 36..48.)
+ *
+ * It is possible, but ugly, to warp the SPE table to account for the salt
+ * permutation.  Fortunately, the conditional bit swapping requires only
+ * about four machine instructions and can be done on-the-fly with about an
+ * 8% performance penalty.
+ */
+
+typedef union {
+	unsigned char b[8];
+	struct {
+#if defined(LONG_IS_32_BITS)
+		/* long is often faster than a 32-bit bit field */
+		long	i0;
+		long	i1;
+#else
+		long	i0: 32;
+		long	i1: 32;
+#endif
+	} b32;
+#if defined(B64)
+	B64	b64;
+#endif
+} C_block;
+
+/*
+ * Convert twenty-four-bit long in host-order
+ * to six bits (and 2 low-order zeroes) per char little-endian format.
+ */
+#define	TO_SIX_BIT(rslt, src) {				\
+		C_block cvt;				\
+		cvt.b[0] = src; src >>= 6;		\
+		cvt.b[1] = src; src >>= 6;		\
+		cvt.b[2] = src; src >>= 6;		\
+		cvt.b[3] = src;				\
+		rslt = (cvt.b32.i0 & 0x3f3f3f3fL) << 2;	\
+	}
+
+/*
+ * These macros may someday permit efficient use of 64-bit integers.
+ */
+#define	ZERO(d,d0,d1)			d0 = 0, d1 = 0
+#define	LOAD(d,d0,d1,bl)		d0 = (bl).b32.i0, d1 = (bl).b32.i1
+#define	LOADREG(d,d0,d1,s,s0,s1)	d0 = s0, d1 = s1
+#define	OR(d,d0,d1,bl)			d0 |= (bl).b32.i0, d1 |= (bl).b32.i1
+#define	STORE(s,s0,s1,bl)		(bl).b32.i0 = s0, (bl).b32.i1 = s1
+#define	DCL_BLOCK(d,d0,d1)		long d0, d1
+
+#if defined(LARGEDATA)
+	/* Waste memory like crazy.  Also, do permutations in line */
+#define	LGCHUNKBITS	3
+#define	CHUNKBITS	(1<<LGCHUNKBITS)
+#define	PERM6464(d,d0,d1,cpp,p)				\
+	LOAD(d,d0,d1,(p)[(0<<CHUNKBITS)+(cpp)[0]]);		\
+	OR (d,d0,d1,(p)[(1<<CHUNKBITS)+(cpp)[1]]);		\
+	OR (d,d0,d1,(p)[(2<<CHUNKBITS)+(cpp)[2]]);		\
+	OR (d,d0,d1,(p)[(3<<CHUNKBITS)+(cpp)[3]]);		\
+	OR (d,d0,d1,(p)[(4<<CHUNKBITS)+(cpp)[4]]);		\
+	OR (d,d0,d1,(p)[(5<<CHUNKBITS)+(cpp)[5]]);		\
+	OR (d,d0,d1,(p)[(6<<CHUNKBITS)+(cpp)[6]]);		\
+	OR (d,d0,d1,(p)[(7<<CHUNKBITS)+(cpp)[7]]);
+#define	PERM3264(d,d0,d1,cpp,p)				\
+	LOAD(d,d0,d1,(p)[(0<<CHUNKBITS)+(cpp)[0]]);		\
+	OR (d,d0,d1,(p)[(1<<CHUNKBITS)+(cpp)[1]]);		\
+	OR (d,d0,d1,(p)[(2<<CHUNKBITS)+(cpp)[2]]);		\
+	OR (d,d0,d1,(p)[(3<<CHUNKBITS)+(cpp)[3]]);
+#else
+	/* "small data" */
+#define	LGCHUNKBITS	2
+#define	CHUNKBITS	(1<<LGCHUNKBITS)
+#define	PERM6464(d,d0,d1,cpp,p)				\
+	{ C_block tblk; permute(cpp,&tblk,p,8); LOAD (d,d0,d1,tblk); }
+#define	PERM3264(d,d0,d1,cpp,p)				\
+	{ C_block tblk; permute(cpp,&tblk,p,4); LOAD (d,d0,d1,tblk); }
+
+STATIC
+permute(cp, out, p, chars_in)
+	unsigned char *cp;
+	C_block *out;
+	register C_block *p;
+	int chars_in;
+{
+	register DCL_BLOCK(D,D0,D1);
+	register C_block *tp;
+	register int t;
+
+	ZERO(D,D0,D1);
+	do {
+		t = *cp++;
+		tp = &p[t&0xf]; OR(D,D0,D1,*tp); p += (1<<CHUNKBITS);
+		tp = &p[t>>4];  OR(D,D0,D1,*tp); p += (1<<CHUNKBITS);
+	} while (--chars_in > 0);
+	STORE(D,D0,D1,*out);
+}
+#endif /* LARGEDATA */
+
+
+/* =====  (mostly) Standard DES Tables ==================== */
+
+static unsigned char IP[] = {		/* initial permutation */
+	58, 50, 42, 34, 26, 18, 10,  2,
+	60, 52, 44, 36, 28, 20, 12,  4,
+	62, 54, 46, 38, 30, 22, 14,  6,
+	64, 56, 48, 40, 32, 24, 16,  8,
+	57, 49, 41, 33, 25, 17,  9,  1,
+	59, 51, 43, 35, 27, 19, 11,  3,
+	61, 53, 45, 37, 29, 21, 13,  5,
+	63, 55, 47, 39, 31, 23, 15,  7,
+};
+
+/* The final permutation is the inverse of IP - no table is necessary */
+
+static unsigned char ExpandTr[] = {	/* expansion operation */
+	32,  1,  2,  3,  4,  5,
+	 4,  5,  6,  7,  8,  9,
+	 8,  9, 10, 11, 12, 13,
+	12, 13, 14, 15, 16, 17,
+	16, 17, 18, 19, 20, 21,
+	20, 21, 22, 23, 24, 25,
+	24, 25, 26, 27, 28, 29,
+	28, 29, 30, 31, 32,  1,
+};
+
+static unsigned char PC1[] = {		/* permuted choice table 1 */
+	57, 49, 41, 33, 25, 17,  9,
+	 1, 58, 50, 42, 34, 26, 18,
+	10,  2, 59, 51, 43, 35, 27,
+	19, 11,  3, 60, 52, 44, 36,
+
+	63, 55, 47, 39, 31, 23, 15,
+	 7, 62, 54, 46, 38, 30, 22,
+	14,  6, 61, 53, 45, 37, 29,
+	21, 13,  5, 28, 20, 12,  4,
+};
+
+static unsigned char Rotates[] = {	/* PC1 rotation schedule */
+	1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1,
+};
+
+/* note: each "row" of PC2 is left-padded with bits that make it invertible */
+static unsigned char PC2[] = {		/* permuted choice table 2 */
+	 9, 18,    14, 17, 11, 24,  1,  5,
+	22, 25,     3, 28, 15,  6, 21, 10,
+	35, 38,    23, 19, 12,  4, 26,  8,
+	43, 54,    16,  7, 27, 20, 13,  2,
+
+	 0,  0,    41, 52, 31, 37, 47, 55,
+	 0,  0,    30, 40, 51, 45, 33, 48,
+	 0,  0,    44, 49, 39, 56, 34, 53,
+	 0,  0,    46, 42, 50, 36, 29, 32,
+};
+
+static unsigned char S[8][64] = {	/* 48->32 bit substitution tables */
+					/* S[1]			*/
+	14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
+	 0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
+	 4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
+	15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13,
+					/* S[2]			*/
+	15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
+	 3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
+	 0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
+	13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9,
+					/* S[3]			*/
+	10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
+	13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
+	13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
+	 1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12,
+					/* S[4]			*/
+	 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
+	13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
+	10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
+	 3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14,
+					/* S[5]			*/
+	 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
+	14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
+	 4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
+	11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3,
+					/* S[6]			*/
+	12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
+	10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
+	 9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
+	 4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13,
+					/* S[7]			*/
+	 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
+	13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
+	 1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
+	 6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12,
+					/* S[8]			*/
+	13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
+	 1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
+	 7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
+	 2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11,
+};
+
+static unsigned char P32Tr[] = {	/* 32-bit permutation function */
+	16,  7, 20, 21,
+	29, 12, 28, 17,
+	 1, 15, 23, 26,
+	 5, 18, 31, 10,
+	 2,  8, 24, 14,
+	32, 27,  3,  9,
+	19, 13, 30,  6,
+	22, 11,  4, 25,
+};
+
+static unsigned char CIFP[] = {		/* compressed/interleaved permutation */
+	 1,  2,  3,  4,   17, 18, 19, 20,
+	 5,  6,  7,  8,   21, 22, 23, 24,
+	 9, 10, 11, 12,   25, 26, 27, 28,
+	13, 14, 15, 16,   29, 30, 31, 32,
+
+	33, 34, 35, 36,   49, 50, 51, 52,
+	37, 38, 39, 40,   53, 54, 55, 56,
+	41, 42, 43, 44,   57, 58, 59, 60,
+	45, 46, 47, 48,   61, 62, 63, 64,
+};
+
+static unsigned char itoa64[] =		/* 0..63 => ascii-64 */
+	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+
+/* =====  Tables that are initialized at run time  ==================== */
+
+
+static unsigned char a64toi[128];	/* ascii-64 => 0..63 */
+
+/* Initial key schedule permutation */
+static C_block	PC1ROT[64/CHUNKBITS][1<<CHUNKBITS];
+
+/* Subsequent key schedule rotation permutations */
+static C_block	PC2ROT[2][64/CHUNKBITS][1<<CHUNKBITS];
+
+/* Initial permutation/expansion table */
+static C_block	IE3264[32/CHUNKBITS][1<<CHUNKBITS];
+
+/* Table that combines the S, P, and E operations.  */
+static long SPE[2][8][64];
+
+/* compressed/interleaved => final permutation table */
+static C_block	CF6464[64/CHUNKBITS][1<<CHUNKBITS];
+
+
+/* ==================================== */
+
+
+static C_block	constdatablock;			/* encryption constant */
+static char	cryptresult[1+4+4+11+1];	/* encrypted result */
+
+/*
+ * Return a pointer to static data consisting of the "setting"
+ * followed by an encryption produced by the "key" and "setting".
+ */
+char *
+crypt(key, setting)
+	register const char *key;
+	register const char *setting;
+{
+	register char *encp;
+	register long i;
+	register int t;
+	long salt;
+	int num_iter, salt_size;
+	C_block keyblock, rsltblock;
+
+	for (i = 0; i < 8; i++) {
+		if ((t = 2*(unsigned char)(*key)) != 0)
+			key++;
+		keyblock.b[i] = t;
+	}
+	if (des_setkey((char *)keyblock.b))	/* also initializes "a64toi" */
+		return (NULL);
+
+	encp = &cryptresult[0];
+	switch (*setting) {
+	case _PASSWORD_EFMT1:
+		/*
+		 * Involve the rest of the password 8 characters at a time.
+		 */
+		while (*key) {
+			if (des_cipher((char *)&keyblock,
+			    (char *)&keyblock, 0L, 1))
+				return (NULL);
+			for (i = 0; i < 8; i++) {
+				if ((t = 2*(unsigned char)(*key)) != 0)
+					key++;
+				keyblock.b[i] ^= t;
+			}
+			if (des_setkey((char *)keyblock.b))
+				return (NULL);
+		}
+
+		*encp++ = *setting++;
+
+		/* get iteration count */
+		num_iter = 0;
+		for (i = 4; --i >= 0; ) {
+			if ((t = (unsigned char)setting[i]) == '\0')
+				t = '.';
+			encp[i] = t;
+			num_iter = (num_iter<<6) | a64toi[t];
+		}
+		setting += 4;
+		encp += 4;
+		salt_size = 4;
+		break;
+	default:
+		num_iter = 25;
+		salt_size = 2;
+	}
+
+	salt = 0;
+	for (i = salt_size; --i >= 0; ) {
+		if ((t = (unsigned char)setting[i]) == '\0')
+			t = '.';
+		encp[i] = t;
+		salt = (salt<<6) | a64toi[t];
+	}
+	encp += salt_size;
+	if (des_cipher((char *)&constdatablock, (char *)&rsltblock,
+	    salt, num_iter))
+		return (NULL);
+
+	/*
+	 * Encode the 64 cipher bits as 11 ascii characters.
+	 */
+	i = ((long)((rsltblock.b[0]<<8) | rsltblock.b[1])<<8) | rsltblock.b[2];
+	encp[3] = itoa64[i&0x3f];	i >>= 6;
+	encp[2] = itoa64[i&0x3f];	i >>= 6;
+	encp[1] = itoa64[i&0x3f];	i >>= 6;
+	encp[0] = itoa64[i];		encp += 4;
+	i = ((long)((rsltblock.b[3]<<8) | rsltblock.b[4])<<8) | rsltblock.b[5];
+	encp[3] = itoa64[i&0x3f];	i >>= 6;
+	encp[2] = itoa64[i&0x3f];	i >>= 6;
+	encp[1] = itoa64[i&0x3f];	i >>= 6;
+	encp[0] = itoa64[i];		encp += 4;
+	i = ((long)((rsltblock.b[6])<<8) | rsltblock.b[7])<<2;
+	encp[2] = itoa64[i&0x3f];	i >>= 6;
+	encp[1] = itoa64[i&0x3f];	i >>= 6;
+	encp[0] = itoa64[i];
+
+	encp[3] = 0;
+
+	return (cryptresult);
+}
+
+
+/*
+ * The Key Schedule, filled in by des_setkey() or setkey().
+ */
+#define	KS_SIZE	16
+static C_block	KS[KS_SIZE];
+
+/*
+ * Set up the key schedule from the key.
+ */
+des_setkey(key)
+	register const char *key;
+{
+	register DCL_BLOCK(K, K0, K1);
+	register C_block *ptabp;
+	register int i;
+	static int des_ready = 0;
+
+	if (!des_ready) {
+		init_des();
+		des_ready = 1;
+	}
+
+	PERM6464(K,K0,K1,(unsigned char *)key,(C_block *)PC1ROT);
+	key = (char *)&KS[0];
+	STORE(K&~0x03030303L, K0&~0x03030303L, K1, *(C_block *)key);
+	for (i = 1; i < 16; i++) {
+		key += sizeof(C_block);
+		STORE(K,K0,K1,*(C_block *)key);
+		ptabp = (C_block *)PC2ROT[Rotates[i]-1];
+		PERM6464(K,K0,K1,(unsigned char *)key,ptabp);
+		STORE(K&~0x03030303L, K0&~0x03030303L, K1, *(C_block *)key);
+	}
+	return (0);
+}
+
+/*
+ * Encrypt (or decrypt if num_iter < 0) the 8 chars at "in" with abs(num_iter)
+ * iterations of DES, using the the given 24-bit salt and the pre-computed key
+ * schedule, and store the resulting 8 chars at "out" (in == out is permitted).
+ *
+ * NOTE: the performance of this routine is critically dependent on your
+ * compiler and machine architecture.
+ */
+des_cipher(in, out, salt, num_iter)
+	const char *in;
+	char *out;
+	long salt;
+	int num_iter;
+{
+	/* variables that we want in registers, most important first */
+#if defined(pdp11)
+	register int j;
+#endif
+	register long L0, L1, R0, R1, k;
+	register C_block *kp;
+	register int ks_inc, loop_count;
+	C_block B;
+
+	L0 = salt;
+	TO_SIX_BIT(salt, L0);	/* convert to 4*(6+2) format */
+
+#if defined(vax) || defined(pdp11)
+	salt = ~salt;	/* "x &~ y" is faster than "x & y". */
+#define	SALT (~salt)
+#else
+#define	SALT salt
+#endif
+
+#if defined(MUST_ALIGN)
+	B.b[0] = in[0]; B.b[1] = in[1]; B.b[2] = in[2]; B.b[3] = in[3];
+	B.b[4] = in[4]; B.b[5] = in[5]; B.b[6] = in[6]; B.b[7] = in[7];
+	LOAD(L,L0,L1,B);
+#else
+	LOAD(L,L0,L1,*(C_block *)in);
+#endif
+	LOADREG(R,R0,R1,L,L0,L1);
+	L0 &= 0x55555555L;
+	L1 &= 0x55555555L;
+	L0 = (L0 << 1) | L1;	/* L0 is the even-numbered input bits */
+	R0 &= 0xaaaaaaaaL;
+	R1 = (R1 >> 1) & 0x55555555L;
+	L1 = R0 | R1;		/* L1 is the odd-numbered input bits */
+	STORE(L,L0,L1,B);
+	PERM3264(L,L0,L1,B.b,  (C_block *)IE3264);	/* even bits */
+	PERM3264(R,R0,R1,B.b+4,(C_block *)IE3264);	/* odd bits */
+
+	if (num_iter >= 0)
+	{		/* encryption */
+		kp = &KS[0];
+		ks_inc  = sizeof(*kp);
+	}
+	else
+	{		/* decryption */
+		num_iter = -num_iter;
+		kp = &KS[KS_SIZE-1];
+		ks_inc  = -sizeof(*kp);
+	}
+
+	while (--num_iter >= 0) {
+		loop_count = 8;
+		do {
+
+#define	SPTAB(t, i)	(*(long *)((unsigned char *)t + i*(sizeof(long)/4)))
+#if defined(gould)
+			/* use this if B.b[i] is evaluated just once ... */
+#define	DOXOR(x,y,i)	x^=SPTAB(SPE[0][i],B.b[i]); y^=SPTAB(SPE[1][i],B.b[i]);
+#else
+#if defined(pdp11)
+			/* use this if your "long" int indexing is slow */
+#define	DOXOR(x,y,i)	j=B.b[i]; x^=SPTAB(SPE[0][i],j); y^=SPTAB(SPE[1][i],j);
+#else
+			/* use this if "k" is allocated to a register ... */
+#define	DOXOR(x,y,i)	k=B.b[i]; x^=SPTAB(SPE[0][i],k); y^=SPTAB(SPE[1][i],k);
+#endif
+#endif
+
+#define	CRUNCH(p0, p1, q0, q1)	\
+			k = (q0 ^ q1) & SALT;	\
+			B.b32.i0 = k ^ q0 ^ kp->b32.i0;		\
+			B.b32.i1 = k ^ q1 ^ kp->b32.i1;		\
+			kp = (C_block *)((char *)kp+ks_inc);	\
+							\
+			DOXOR(p0, p1, 0);		\
+			DOXOR(p0, p1, 1);		\
+			DOXOR(p0, p1, 2);		\
+			DOXOR(p0, p1, 3);		\
+			DOXOR(p0, p1, 4);		\
+			DOXOR(p0, p1, 5);		\
+			DOXOR(p0, p1, 6);		\
+			DOXOR(p0, p1, 7);
+
+			CRUNCH(L0, L1, R0, R1);
+			CRUNCH(R0, R1, L0, L1);
+		} while (--loop_count != 0);
+		kp = (C_block *)((char *)kp-(ks_inc*KS_SIZE));
+
+
+		/* swap L and R */
+		L0 ^= R0;  L1 ^= R1;
+		R0 ^= L0;  R1 ^= L1;
+		L0 ^= R0;  L1 ^= R1;
+	}
+
+	/* store the encrypted (or decrypted) result */
+	L0 = ((L0 >> 3) & 0x0f0f0f0fL) | ((L1 << 1) & 0xf0f0f0f0L);
+	L1 = ((R0 >> 3) & 0x0f0f0f0fL) | ((R1 << 1) & 0xf0f0f0f0L);
+	STORE(L,L0,L1,B);
+	PERM6464(L,L0,L1,B.b, (C_block *)CF6464);
+#if defined(MUST_ALIGN)
+	STORE(L,L0,L1,B);
+	out[0] = B.b[0]; out[1] = B.b[1]; out[2] = B.b[2]; out[3] = B.b[3];
+	out[4] = B.b[4]; out[5] = B.b[5]; out[6] = B.b[6]; out[7] = B.b[7];
+#else
+	STORE(L,L0,L1,*(C_block *)out);
+#endif
+	return (0);
+}
+
+
+/*
+ * Initialize various tables.  This need only be done once.  It could even be
+ * done at compile time, if the compiler were capable of that sort of thing.
+ */
+STATIC
+init_des()
+{
+	register int i, j;
+	register long k;
+	register int tableno;
+	static unsigned char perm[64], tmp32[32];	/* "static" for speed */
+
+	/*
+	 * table that converts chars "./0-9A-Za-z"to integers 0-63.
+	 */
+	for (i = 0; i < 64; i++)
+		a64toi[itoa64[i]] = i;
+
+	/*
+	 * PC1ROT - bit reverse, then PC1, then Rotate, then PC2.
+	 */
+	for (i = 0; i < 64; i++)
+		perm[i] = 0;
+	for (i = 0; i < 64; i++) {
+		if ((k = PC2[i]) == 0)
+			continue;
+		k += Rotates[0]-1;
+		if ((k%28) < Rotates[0]) k -= 28;
+		k = PC1[k];
+		if (k > 0) {
+			k--;
+			k = (k|07) - (k&07);
+			k++;
+		}
+		perm[i] = k;
+	}
+#ifdef DEBUG
+	prtab("pc1tab", perm, 8);
+#endif
+	init_perm(PC1ROT, perm, 8, 8);
+
+	/*
+	 * PC2ROT - PC2 inverse, then Rotate (once or twice), then PC2.
+	 */
+	for (j = 0; j < 2; j++) {
+		unsigned char pc2inv[64];
+		for (i = 0; i < 64; i++)
+			perm[i] = pc2inv[i] = 0;
+		for (i = 0; i < 64; i++) {
+			if ((k = PC2[i]) == 0)
+				continue;
+			pc2inv[k-1] = i+1;
+		}
+		for (i = 0; i < 64; i++) {
+			if ((k = PC2[i]) == 0)
+				continue;
+			k += j;
+			if ((k%28) <= j) k -= 28;
+			perm[i] = pc2inv[k];
+		}
+#ifdef DEBUG
+		prtab("pc2tab", perm, 8);
+#endif
+		init_perm(PC2ROT[j], perm, 8, 8);
+	}
+
+	/*
+	 * Bit reverse, then initial permutation, then expansion.
+	 */
+	for (i = 0; i < 8; i++) {
+		for (j = 0; j < 8; j++) {
+			k = (j < 2)? 0: IP[ExpandTr[i*6+j-2]-1];
+			if (k > 32)
+				k -= 32;
+			else if (k > 0)
+				k--;
+			if (k > 0) {
+				k--;
+				k = (k|07) - (k&07);
+				k++;
+			}
+			perm[i*8+j] = k;
+		}
+	}
+#ifdef DEBUG
+	prtab("ietab", perm, 8);
+#endif
+	init_perm(IE3264, perm, 4, 8);
+
+	/*
+	 * Compression, then final permutation, then bit reverse.
+	 */
+	for (i = 0; i < 64; i++) {
+		k = IP[CIFP[i]-1];
+		if (k > 0) {
+			k--;
+			k = (k|07) - (k&07);
+			k++;
+		}
+		perm[k-1] = i+1;
+	}
+#ifdef DEBUG
+	prtab("cftab", perm, 8);
+#endif
+	init_perm(CF6464, perm, 8, 8);
+
+	/*
+	 * SPE table
+	 */
+	for (i = 0; i < 48; i++)
+		perm[i] = P32Tr[ExpandTr[i]-1];
+	for (tableno = 0; tableno < 8; tableno++) {
+		for (j = 0; j < 64; j++)  {
+			k = (((j >> 0) &01) << 5)|
+			    (((j >> 1) &01) << 3)|
+			    (((j >> 2) &01) << 2)|
+			    (((j >> 3) &01) << 1)|
+			    (((j >> 4) &01) << 0)|
+			    (((j >> 5) &01) << 4);
+			k = S[tableno][k];
+			k = (((k >> 3)&01) << 0)|
+			    (((k >> 2)&01) << 1)|
+			    (((k >> 1)&01) << 2)|
+			    (((k >> 0)&01) << 3);
+			for (i = 0; i < 32; i++)
+				tmp32[i] = 0;
+			for (i = 0; i < 4; i++)
+				tmp32[4 * tableno + i] = (k >> i) & 01;
+			k = 0;
+			for (i = 24; --i >= 0; )
+				k = (k<<1) | tmp32[perm[i]-1];
+			TO_SIX_BIT(SPE[0][tableno][j], k);
+			k = 0;
+			for (i = 24; --i >= 0; )
+				k = (k<<1) | tmp32[perm[i+24]-1];
+			TO_SIX_BIT(SPE[1][tableno][j], k);
+		}
+	}
+}
+
+/*
+ * Initialize "perm" to represent transformation "p", which rearranges
+ * (perhaps with expansion and/or contraction) one packed array of bits
+ * (of size "chars_in" characters) into another array (of size "chars_out"
+ * characters).
+ *
+ * "perm" must be all-zeroes on entry to this routine.
+ */
+STATIC
+init_perm(perm, p, chars_in, chars_out)
+	C_block perm[64/CHUNKBITS][1<<CHUNKBITS];
+	unsigned char p[64];
+	int chars_in, chars_out;
+{
+	register int i, j, k, l;
+
+	for (k = 0; k < chars_out*8; k++) {	/* each output bit position */
+		l = p[k] - 1;		/* where this bit comes from */
+		if (l < 0)
+			continue;	/* output bit is always 0 */
+		i = l>>LGCHUNKBITS;	/* which chunk this bit comes from */
+		l = 1<<(l&(CHUNKBITS-1));	/* mask for this bit */
+		for (j = 0; j < (1<<CHUNKBITS); j++) {	/* each chunk value */
+			if ((j & l) != 0)
+				perm[i][j].b[k>>3] |= 1<<(k&07);
+		}
+	}
+}
+
+/*
+ * "setkey" routine (for backwards compatibility)
+ */
+setkey(key)
+	register const char *key;
+{
+	register int i, j, k;
+	C_block keyblock;
+
+	for (i = 0; i < 8; i++) {
+		k = 0;
+		for (j = 0; j < 8; j++) {
+			k <<= 1;
+			k |= (unsigned char)*key++;
+		}
+		keyblock.b[i] = k;
+	}
+	return (des_setkey((char *)keyblock.b));
+}
+
+/*
+ * "encrypt" routine (for backwards compatibility)
+ */
+encrypt(block, flag)
+	register char *block;
+	int flag;
+{
+	register int i, j, k;
+	C_block cblock;
+
+	for (i = 0; i < 8; i++) {
+		k = 0;
+		for (j = 0; j < 8; j++) {
+			k <<= 1;
+			k |= (unsigned char)*block++;
+		}
+		cblock.b[i] = k;
+	}
+	if (des_cipher((char *)&cblock, (char *)&cblock, 0L, (flag ? -1: 1)))
+		return (1);
+	for (i = 7; i >= 0; i--) {
+		k = cblock.b[i];
+		for (j = 7; j >= 0; j--) {
+			*--block = k&01;
+			k >>= 1;
+		}
+	}
+	return (0);
+}
+
+#ifdef DEBUG
+STATIC
+prtab(s, t, num_rows)
+	char *s;
+	unsigned char *t;
+	int num_rows;
+{
+	register int i, j;
+
+	(void)printf("%s:\n", s);
+	for (i = 0; i < num_rows; i++) {
+		for (j = 0; j < 8; j++) {
+			 (void)printf("%3d", t[i*8+j]);
+		}
+		(void)printf("\n");
+	}
+	(void)printf("\n");
+}
+#endif
diff --git a/ruby_1_8_6/missing/dup2.c b/ruby_1_8_6/missing/dup2.c
new file mode 100644
index 0000000000..e7cc46f4c1
--- /dev/null
+++ b/ruby_1_8_6/missing/dup2.c
@@ -0,0 +1,61 @@
+/*
+ * Public domain dup2() lookalike
+ * by Curtis Jackson @ AT&T Technologies, Burlington, NC
+ * electronic address:  burl!rcj
+ *
+ * dup2 performs the following functions:
+ *
+ * Check to make sure that fd1 is a valid open file descriptor.
+ * Check to see if fd2 is already open; if so, close it.
+ * Duplicate fd1 onto fd2; checking to make sure fd2 is a valid fd.
+ * Return fd2 if all went well; return BADEXIT otherwise.
+ */
+
+#include "config.h"
+
+#if defined(HAVE_FCNTL)
+# include <fcntl.h>
+#endif
+
+#if !defined(HAVE_FCNTL) || !defined(F_DUPFD)
+# include <errno.h>
+#endif
+
+#define BADEXIT -1
+
+int
+dup2(fd1, fd2)
+int fd1, fd2;
+{
+#if defined(HAVE_FCNTL) && defined(F_DUPFD)
+	if (fd1 != fd2) {
+#ifdef F_GETFL
+		if (fcntl(fd1, F_GETFL) < 0)
+			return BADEXIT;
+		if (fcntl(fd2, F_GETFL) >= 0)
+			close(fd2);
+#else
+		close(fd2);
+#endif
+		if (fcntl(fd1, F_DUPFD, fd2) < 0)
+			return BADEXIT;
+	}
+	return fd2;
+#else
+	extern int errno;
+	int i, fd, fds[256];
+
+	if (fd1 == fd2) return 0;
+	close(fd2);
+	for (i=0; i<256; i++) {
+		fd = fds[i] = dup(fd1);
+		if (fd == fd2) break;
+	}
+	while (i) {
+	    	close(fds[i--]);
+	}
+	if (fd == fd2) return 0;
+	errno = EMFILE;
+	return BADEXIT;
+#endif
+}
diff --git a/ruby_1_8_6/missing/erf.c b/ruby_1_8_6/missing/erf.c
new file mode 100644
index 0000000000..d9e7469024
--- /dev/null
+++ b/ruby_1_8_6/missing/erf.c
@@ -0,0 +1,92 @@
+/* erf.c  - public domain implementation of error function erf(3m)
+
+reference - Haruhiko Okumura: C-gengo niyoru saishin algorithm jiten
+            (New Algorithm handbook in C language) (Gijyutsu hyouron
+            sha, Tokyo, 1991) p.227 [in Japanese]                 */
+#include <stdio.h>
+#include <math.h>
+
+#ifdef _WIN32
+# include <float.h>
+# if !defined __MINGW32__ || defined __NO_ISOCEXT
+#  ifndef isnan
+#   define isnan(x) _isnan(x)
+#  endif
+#  ifndef isinf
+#   define isinf(x) (!_finite(x) && !_isnan(x))
+#  endif
+#  ifndef finite
+#   define finite(x) _finite(x)
+#  endif
+# endif
+#endif
+
+static double q_gamma(double, double, double);
+
+/* Incomplete gamma function
+   1 / Gamma(a) * Int_0^x exp(-t) t^(a-1) dt  */
+static double p_gamma(a, x, loggamma_a)
+    double a, x, loggamma_a;
+{
+    int k;
+    double result, term, previous;
+
+    if (x >= 1 + a) return 1 - q_gamma(a, x, loggamma_a);
+    if (x == 0)     return 0;
+    result = term = exp(a * log(x) - x - loggamma_a) / a;
+    for (k = 1; k < 1000; k++) {
+        term *= x / (a + k);
+        previous = result;  result += term;
+        if (result == previous) return result;
+    }
+    fprintf(stderr, "erf.c:%d:p_gamma() could not converge.", __LINE__);
+    return result;
+}
+
+/* Incomplete gamma function
+   1 / Gamma(a) * Int_x^inf exp(-t) t^(a-1) dt  */
+static double q_gamma(a, x, loggamma_a)
+    double a, x, loggamma_a;
+{
+    int k;
+    double result, w, temp, previous;
+    double la = 1, lb = 1 + x - a;  /* Laguerre polynomial */
+
+    if (x < 1 + a) return 1 - p_gamma(a, x, loggamma_a);
+    w = exp(a * log(x) - x - loggamma_a);
+    result = w / lb;
+    for (k = 2; k < 1000; k++) {
+        temp = ((k - 1 - a) * (lb - la) + (k + x) * lb) / k;
+        la = lb;  lb = temp;
+        w *= (k - 1 - a) / k;
+        temp = w / (la * lb);
+        previous = result;  result += temp;
+        if (result == previous) return result;
+    }
+    fprintf(stderr, "erf.c:%d:q_gamma() could not converge.", __LINE__);
+    return result;
+}
+
+#define LOG_PI_OVER_2 0.572364942924700087071713675675 /* log_e(PI)/2 */
+
+double erf(x)
+    double x;
+{
+    if (!finite(x)) {
+        if (isnan(x)) return x;      /* erf(NaN)   = NaN   */
+        return (x>0 ? 1.0 : -1.0);   /* erf(+-inf) = +-1.0 */
+    }
+    if (x >= 0) return   p_gamma(0.5, x * x, LOG_PI_OVER_2);
+    else        return - p_gamma(0.5, x * x, LOG_PI_OVER_2);
+}
+
+double erfc(x)
+    double x;
+{
+    if (!finite(x)) {
+        if (isnan(x)) return x;      /* erfc(NaN)   = NaN      */
+        return (x>0 ? 0.0 : 2.0);    /* erfc(+-inf) = 0.0, 2.0 */
+    }
+    if (x >= 0) return  q_gamma(0.5, x * x, LOG_PI_OVER_2);
+    else        return  1 + p_gamma(0.5, x * x, LOG_PI_OVER_2);
+}
diff --git a/ruby_1_8_6/missing/file.h b/ruby_1_8_6/missing/file.h
new file mode 100644
index 0000000000..2d491d0fc1
--- /dev/null
+++ b/ruby_1_8_6/missing/file.h
@@ -0,0 +1,22 @@
+/* This is file FILE.H */
+
+#ifndef _FILE_H_
+#define _FILE_H_
+
+#include <fcntl.h>
+
+#ifndef L_SET
+# define L_SET  0       /* seek from beginning.  */
+# define L_CURR	1       /* seek from current position.  */
+# define L_INCR	1       /* ditto.  */
+# define L_XTND 2       /* seek from end.  */
+#endif
+
+#ifndef R_OK
+# define R_OK  4        /* test whether readable.  */
+# define W_OK  2        /* test whether writable.  */
+# define X_OK  1        /* test whether execubale. */
+# define F_OK  0        /* test whether exist.  */
+#endif
+
+#endif
diff --git a/ruby_1_8_6/missing/fileblocks.c b/ruby_1_8_6/missing/fileblocks.c
new file mode 100644
index 0000000000..ccb8d667b4
--- /dev/null
+++ b/ruby_1_8_6/missing/fileblocks.c
@@ -0,0 +1 @@
+/* dummy for autoconf */
diff --git a/ruby_1_8_6/missing/finite.c b/ruby_1_8_6/missing/finite.c
new file mode 100644
index 0000000000..f91035a8cd
--- /dev/null
+++ b/ruby_1_8_6/missing/finite.c
@@ -0,0 +1,8 @@
+/* public domain rewrite of finite(3) */
+
+int
+finite(n)
+    double n;
+{
+    return !isnan(n) && !isinf(n);
+}
diff --git a/ruby_1_8_6/missing/flock.c b/ruby_1_8_6/missing/flock.c
new file mode 100644
index 0000000000..5f6b41c357
--- /dev/null
+++ b/ruby_1_8_6/missing/flock.c
@@ -0,0 +1,135 @@
+#include "config.h"
+
+#if defined _WIN32
+#elif defined HAVE_FCNTL && defined HAVE_FCNTL_H
+
+/* These are the flock() constants.  Since this sytems doesn't have
+   flock(), the values of the constants are probably not available.
+*/
+# ifndef LOCK_SH
+#  define LOCK_SH 1
+# endif
+# ifndef LOCK_EX
+#  define LOCK_EX 2
+# endif
+# ifndef LOCK_NB
+#  define LOCK_NB 4
+# endif
+# ifndef LOCK_UN
+#  define LOCK_UN 8
+# endif
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+
+int
+flock(fd, operation)
+    int fd;
+    int operation;
+{
+    struct flock lock;
+ 
+    switch (operation & ~LOCK_NB) {
+    case LOCK_SH:
+	lock.l_type = F_RDLCK;
+	break;
+    case LOCK_EX:
+	lock.l_type = F_WRLCK;
+	break;
+    case LOCK_UN:
+	lock.l_type = F_UNLCK;
+	break;
+    default:
+	errno = EINVAL;
+	return -1;
+    }
+    lock.l_whence = SEEK_SET;
+    lock.l_start = lock.l_len = 0L;
+ 
+    return fcntl(fd, (operation & LOCK_NB) ? F_SETLK : F_SETLKW, &lock);
+}
+
+#elif defined(HAVE_LOCKF)
+
+#include <unistd.h>
+#include <errno.h>
+
+/*  Emulate flock() with lockf() or fcntl().  This is just to increase
+    portability of scripts.  The calls might not be completely
+    interchangeable.  What's really needed is a good file
+    locking module.
+*/
+
+# ifndef F_ULOCK
+#  define F_ULOCK	0	/* Unlock a previously locked region */
+# endif
+# ifndef F_LOCK
+#  define F_LOCK	1	/* Lock a region for exclusive use */
+# endif
+# ifndef F_TLOCK
+#  define F_TLOCK	2	/* Test and lock a region for exclusive use */
+# endif
+# ifndef F_TEST
+#  define F_TEST	3	/* Test a region for other processes locks */
+# endif
+
+/* These are the flock() constants.  Since this sytems doesn't have
+   flock(), the values of the constants are probably not available.
+*/
+# ifndef LOCK_SH
+#  define LOCK_SH 1
+# endif
+# ifndef LOCK_EX
+#  define LOCK_EX 2
+# endif
+# ifndef LOCK_NB
+#  define LOCK_NB 4
+# endif
+# ifndef LOCK_UN
+#  define LOCK_UN 8
+# endif
+
+int
+flock(fd, operation)
+    int fd;
+    int operation;
+{
+    switch (operation) {
+
+	/* LOCK_SH - get a shared lock */
+      case LOCK_SH:
+        rb_notimplement();
+        return -1;
+	/* LOCK_EX - get an exclusive lock */
+      case LOCK_EX:
+	return lockf (fd, F_LOCK, 0);
+
+	/* LOCK_SH|LOCK_NB - get a non-blocking shared lock */
+      case LOCK_SH|LOCK_NB:
+        rb_notimplement();
+        return -1;
+	/* LOCK_EX|LOCK_NB - get a non-blocking exclusive lock */
+      case LOCK_EX|LOCK_NB:
+	return lockf (fd, F_TLOCK, 0);
+
+	/* LOCK_UN - unlock */
+      case LOCK_UN:
+	return lockf (fd, F_ULOCK, 0);
+
+	/* Default - can't decipher operation */
+      default:
+	errno = EINVAL;
+        return -1;
+    }
+}
+#else
+int
+flock(fd, operation)
+    int fd;
+    int operation;
+{
+    rb_notimplement();
+    return -1;
+}
+#endif
diff --git a/ruby_1_8_6/missing/hypot.c b/ruby_1_8_6/missing/hypot.c
new file mode 100644
index 0000000000..aad5259e92
--- /dev/null
+++ b/ruby_1_8_6/missing/hypot.c
@@ -0,0 +1,17 @@
+/* public domain rewrite of hypot */
+
+#include <math.h>
+
+double hypot(x,y)
+    double x, y;
+{
+    if (x < 0) x = -x;
+    if (y < 0) y = -y;
+    if (x < y) {
+	double tmp = x;
+	x = y; y = tmp;
+    }
+    if (y == 0.0) return x;
+    y /= x;
+    return x * sqrt(1.0+y*y);
+}
diff --git a/ruby_1_8_6/missing/isinf.c b/ruby_1_8_6/missing/isinf.c
new file mode 100644
index 0000000000..e44ef6c3c1
--- /dev/null
+++ b/ruby_1_8_6/missing/isinf.c
@@ -0,0 +1,65 @@
+/* public domain rewrite of isinf(3) */
+
+#ifdef __osf__
+
+#define _IEEE 1
+#include <nan.h>
+
+int
+isinf(n)
+    double n;
+{
+    if (IsNANorINF(n) && IsINF(n)) {
+	return 1;
+    }
+    else {
+	return 0;
+    }
+}
+
+#else
+
+#include "config.h"
+
+#if defined(HAVE_FINITE) && defined(HAVE_ISNAN)
+
+#include <math.h>
+#ifdef HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
+
+int
+isinf(n)
+    double n;
+{
+    return (!finite(n) && !isnan(n));
+}
+
+#else
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+static double zero()	{ return 0.0; }
+static double one()	{ return 1.0; }
+static double inf()	{ return one() / zero(); }
+
+int
+isinf(n)
+    double n;
+{
+    static double pinf = 0.0;
+    static double ninf = 0.0;
+
+    if (pinf == 0.0) {
+	pinf = inf();
+	ninf = -pinf;
+    }
+    return memcmp(&n, &pinf, sizeof n) == 0
+	|| memcmp(&n, &ninf, sizeof n) == 0;
+}
+#endif
+#endif
diff --git a/ruby_1_8_6/missing/isnan.c b/ruby_1_8_6/missing/isnan.c
new file mode 100644
index 0000000000..459048e936
--- /dev/null
+++ b/ruby_1_8_6/missing/isnan.c
@@ -0,0 +1,17 @@
+/* public domain rewrite of isnan(3) */
+
+static int double_ne();
+
+int
+isnan(n)
+    double n;
+{
+    return double_ne(n, n);
+}
+
+static int
+double_ne(n1, n2)
+    double n1, n2;
+{
+    return n1 != n2;
+}
diff --git a/ruby_1_8_6/missing/memcmp.c b/ruby_1_8_6/missing/memcmp.c
new file mode 100644
index 0000000000..9edc9c13b9
--- /dev/null
+++ b/ruby_1_8_6/missing/memcmp.c
@@ -0,0 +1,18 @@
+/* public domain rewrite of memcmp(3) */
+
+int
+memcmp(s1,s2,len)
+    char *s1;
+    char *s2;
+    register int len;
+{
+    register unsigned char *a = (unsigned char*)s1;
+    register unsigned char *b = (unsigned char*)s2;
+    register int tmp;
+
+    while (len--) {
+	if (tmp = *a++ - *b++)
+	    return tmp;
+    }
+    return 0;
+}
diff --git a/ruby_1_8_6/missing/memmove.c b/ruby_1_8_6/missing/memmove.c
new file mode 100644
index 0000000000..c9d67d8b45
--- /dev/null
+++ b/ruby_1_8_6/missing/memmove.c
@@ -0,0 +1,22 @@
+/* public domain rewrite of memcmp(3) */
+
+void *
+memmove (d, s, n)
+    void *d, *s;
+    int n;
+{
+    char *dst = d;
+    char *src = s;
+    void *ret = dst;
+
+    if (src < dst) {
+	src += n;
+	dst += n;
+	while (n--)
+	    *--dst = *--src;
+    }
+    else if (dst < src)
+	while (n--)
+	    *dst++ = *src++;
+    return ret;
+}
diff --git a/ruby_1_8_6/missing/os2.c b/ruby_1_8_6/missing/os2.c
new file mode 100644
index 0000000000..fe7238aad1
--- /dev/null
+++ b/ruby_1_8_6/missing/os2.c
@@ -0,0 +1,113 @@
+/* os/2 compatibility functions -- follows Ruby's license */
+
+#include "ruby.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <process.h>
+#include <limits.h>
+#include <errno.h>
+
+#define INCL_DOS
+#include <os2.h>
+
+int
+chown(char *path, int owner, int group)
+{
+	return 0;
+}
+
+int
+link(char *from, char *to)
+{
+	return -1;
+}
+
+typedef char* CHARP;
+
+int
+do_spawn(cmd)
+char *cmd;
+{
+    register char **a;
+    register char *s;
+    char **argv;
+    char *shell, *sw, *cmd2;
+    int status;
+
+    if ((shell = getenv("RUBYSHELL")) != NULL && *shell != '\0') {
+	s = shell;
+	do
+	    *s = isupper(*s) ? tolower(*s) : *s;
+	while (*++s);
+	if (strstr(shell, "cmd") || strstr(shell, "4os2"))
+	    sw = "/c";
+	else
+	    sw = "-c";
+    } else if ((shell = getenv("SHELL")) != NULL && *shell != '\0') {
+	s = shell;
+	do
+	    *s = isupper(*s) ? tolower(*s) : *s;
+	while (*++s);
+	if (strstr(shell, "cmd") || strstr(shell, "4os2"))
+	    sw = "/c";
+	else
+	    sw = "-c";
+    } else if ((shell = getenv("COMSPEC")) != NULL && *shell != '\0') {
+	s = shell;
+	do
+	    *s = isupper(*s) ? tolower(*s) : *s;
+	while (*++s);
+	if (strstr(shell, "cmd") || strstr(shell, "4os2"))
+	    sw = "/c";
+	else
+	    sw = "-c";
+    }
+    /* see if there are shell metacharacters in it */
+    /*SUPPRESS 530*/
+    /*    for (s = cmd; *s && isalpha(*s); s++) ;
+    if (*s == '=')
+    goto doshell; */
+    for (s = cmd; *s; s++) {
+	if (*sw == '-' && *s != ' ' && 
+	    !isalpha(*s) && index("$&*(){}[]'\";\\|?<>~`\n",*s)) {
+	    if (*s == '\n' && !s[1]) {
+		*s = '\0';
+		break;
+	    }
+	    goto doshell;
+	} else if (*sw == '/' && *s != ' ' && 
+	    !isalpha(*s) && index("^()<>|&\n",*s)) {
+	    if (*s == '\n' && !s[1]) {
+		*s = '\0';
+		break;
+	    }
+	  doshell:
+	    status = spawnlp(P_WAIT,shell,shell,sw,cmd,(char*)NULL);
+	    return status;
+	}
+    }
+    argv = ALLOC_N(CHARP,(strlen(cmd) / 2 + 2));
+    cmd2 = ALLOC_N(char, (strlen(cmd) + 1));
+    strcpy(cmd2, cmd);
+    a = argv;
+    for (s = cmd2; *s;) {
+	while (*s && isspace(*s)) s++;
+	if (*s)
+	    *(a++) = s;
+	while (*s && !isspace(*s)) s++;
+	if (*s)
+	    *s++ = '\0';
+    }
+    *a = NULL;
+    if (argv[0]) {
+	if ((status = spawnvp(P_WAIT, argv[0], argv)) == -1) {
+	    free(argv);
+	    free(cmd2);
+	    return -1;
+	}
+    }
+    free(cmd2);
+    free(argv);
+    return status;
+}
diff --git a/ruby_1_8_6/missing/strcasecmp.c b/ruby_1_8_6/missing/strcasecmp.c
new file mode 100644
index 0000000000..fddb8385be
--- /dev/null
+++ b/ruby_1_8_6/missing/strcasecmp.c
@@ -0,0 +1,16 @@
+/* public domain rewrite of strcasecmp(3) */
+
+#include <ctype.h>
+
+int
+strcasecmp(p1, p2)
+    char *p1, *p2;
+{
+    while (*p1 && *p2) {
+	if (toupper(*p1) != toupper(*p2))
+	    return toupper(*p1) - toupper(*p2);
+	p1++;
+	p2++;
+    }
+    return strlen(p1) - strlen(p2);
+}
diff --git a/ruby_1_8_6/missing/strchr.c b/ruby_1_8_6/missing/strchr.c
new file mode 100644
index 0000000000..886d70ede6
--- /dev/null
+++ b/ruby_1_8_6/missing/strchr.c
@@ -0,0 +1,32 @@
+/* public domain rewrite of strchr(3) and strrchr(3) */
+
+char *
+strchr(s, c)
+    char *s;
+    int c;
+{
+    if (c == 0) return s + strlen(s);
+    while (*s) {
+	if (*s == c)
+	    return s;
+	s++;
+    }
+    return 0;
+}
+
+char *
+strrchr(s, c)
+    char *s;
+    int c;
+{
+    char *save;
+
+    if (c == 0) return s + strlen(s);
+    save = 0;
+    while (*s) {
+	if (*s == c)
+	    save = s;
+	s++;
+    }
+    return save;
+}
diff --git a/ruby_1_8_6/missing/strerror.c b/ruby_1_8_6/missing/strerror.c
new file mode 100644
index 0000000000..c1bf6feff8
--- /dev/null
+++ b/ruby_1_8_6/missing/strerror.c
@@ -0,0 +1,17 @@
+/* public domain rewrite of strerror(3) */
+
+extern int sys_nerr;
+extern char *sys_errlist[];
+
+static char msg[50];
+
+char *
+strerror(error)
+    int error;
+{
+    if (error <= sys_nerr && error > 0) {
+	return sys_errlist[error];
+    }
+    sprintf(msg, "Unknown error (%d)", error);
+    return msg;
+}
diff --git a/ruby_1_8_6/missing/strftime.c b/ruby_1_8_6/missing/strftime.c
new file mode 100644
index 0000000000..970c6c5349
--- /dev/null
+++ b/ruby_1_8_6/missing/strftime.c
@@ -0,0 +1,907 @@
+/*
+ * strftime.c
+ *
+ * Public-domain implementation of ANSI C library routine.
+ *
+ * It's written in old-style C for maximal portability.
+ * However, since I'm used to prototypes, I've included them too.
+ *
+ * If you want stuff in the System V ascftime routine, add the SYSV_EXT define.
+ * For extensions from SunOS, add SUNOS_EXT.
+ * For stuff needed to implement the P1003.2 date command, add POSIX2_DATE.
+ * For VMS dates, add VMS_EXT.
+ * For a an RFC822 time format, add MAILHEADER_EXT.
+ * For ISO week years, add ISO_DATE_EXT.
+ * For complete POSIX semantics, add POSIX_SEMANTICS.
+ *
+ * The code for %c, %x, and %X now follows the 1003.2 specification for
+ * the POSIX locale.
+ * This version ignores LOCALE information.
+ * It also doesn't worry about multi-byte characters.
+ * So there.
+ *
+ * This file is also shipped with GAWK (GNU Awk), gawk specific bits of
+ * code are included if GAWK is defined.
+ *
+ * Arnold Robbins
+ * January, February, March, 1991
+ * Updated March, April 1992
+ * Updated April, 1993
+ * Updated February, 1994
+ * Updated May, 1994
+ * Updated January, 1995
+ * Updated September, 1995
+ * Updated January, 1996
+ *
+ * Fixes from ado@elsie.nci.nih.gov
+ * February 1991, May 1992
+ * Fixes from Tor Lillqvist tml@tik.vtt.fi
+ * May, 1993
+ * Further fixes from ado@elsie.nci.nih.gov
+ * February 1994
+ * %z code from chip@chinacat.unicom.com
+ * Applied September 1995
+ * %V code fixed (again) and %G, %g added,
+ * January 1996
+ */
+
+#include "config.h"
+
+#ifndef GAWK
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include <time.h>
+#endif
+#if defined(TM_IN_SYS_TIME) || !defined(GAWK) && !defined(_WIN32_WCE)
+#include <sys/types.h>
+#include <sys/time.h>
+#endif
+
+/* defaults: season to taste */
+#define SYSV_EXT	1	/* stuff in System V ascftime routine */
+#define SUNOS_EXT	1	/* stuff in SunOS strftime routine */
+#define POSIX2_DATE	1	/* stuff in Posix 1003.2 date command */
+#define VMS_EXT		1	/* include %v for VMS date format */
+#define MAILHEADER_EXT	1	/* add %z for HHMM format */
+#define ISO_DATE_EXT	1	/* %G and %g for year of ISO week */
+#ifndef GAWK
+#define POSIX_SEMANTICS	1	/* call tzset() if TZ changes */
+#endif
+
+#if defined(ISO_DATE_EXT)
+#if ! defined(POSIX2_DATE)
+#define POSIX2_DATE	1
+#endif
+#endif
+
+#if defined(POSIX2_DATE)
+#if ! defined(SYSV_EXT)
+#define SYSV_EXT	1
+#endif
+#if ! defined(SUNOS_EXT)
+#define SUNOS_EXT	1
+#endif
+#endif
+
+#if defined(POSIX2_DATE)
+#define adddecl(stuff)	stuff
+#else
+#define adddecl(stuff)
+#endif
+
+#undef strchr	/* avoid AIX weirdness */
+
+#ifndef __STDC__
+#define const	/**/
+extern void tzset();
+static int weeknumber();
+adddecl(static int iso8601wknum();)
+#else
+extern void tzset(void);
+static int weeknumber(const struct tm *timeptr, int firstweekday);
+adddecl(static int iso8601wknum(const struct tm *timeptr);)
+#endif
+
+#ifdef STDC_HEADERS
+#include <stdlib.h>
+#include <string.h>
+#else
+extern void *malloc();
+extern void *realloc();
+extern char *getenv();
+extern char *strchr();
+#endif
+
+#define range(low, item, hi)	max(low, min(item, hi))
+
+#if !defined(OS2) && !defined(MSDOS) && defined(HAVE_TZNAME)
+extern char *tzname[2];
+extern int daylight;
+#ifdef SOLARIS
+extern long timezone, altzone;
+#else
+#ifdef __hpux
+extern long timezone;
+#else
+extern int timezone, altzone;
+#endif
+#endif
+#endif
+
+#undef min	/* just in case */
+
+/* min --- return minimum of two numbers */
+
+#ifndef __STDC__
+static inline int
+min(a, b)
+int a, b;
+#else
+static inline int
+min(int a, int b)
+#endif
+{
+	return (a < b ? a : b);
+}
+
+#undef max	/* also, just in case */
+
+/* max --- return maximum of two numbers */
+
+#ifndef __STDC__
+static inline int
+max(a, b)
+int a, b;
+#else
+static inline int
+max(int a, int b)
+#endif
+{
+	return (a > b ? a : b);
+}
+
+/* strftime --- produce formatted time */
+
+#ifndef __STDC__
+size_t
+strftime(s, maxsize, format, timeptr)
+char *s;
+size_t maxsize;
+const char *format;
+const struct tm *timeptr;
+#else
+size_t
+strftime(char *s, size_t maxsize, const char *format, const struct tm *timeptr)
+#endif
+{
+	char *endp = s + maxsize;
+	char *start = s;
+	auto char tbuf[100];
+	long off;
+	int i, w;
+	long y;
+	static short first = 1;
+#ifdef POSIX_SEMANTICS
+	static char *savetz = NULL;
+	static int savetzlen = 0;
+	char *tz;
+#endif /* POSIX_SEMANTICS */
+#ifndef HAVE_TM_ZONE
+#ifndef HAVE_TM_NAME
+#ifndef HAVE_TZNAME
+	extern char *timezone();
+	struct timeval tv;
+	struct timezone zone;
+#else
+#ifdef __hpux
+	struct timeval tv;
+	struct timezone zone;
+#endif
+#endif /* HAVE_TZNAME */
+#endif /* HAVE_TM_NAME */
+#endif /* HAVE_TM_ZONE */
+
+	/* various tables, useful in North America */
+	static const char *days_a[] = {
+		"Sun", "Mon", "Tue", "Wed",
+		"Thu", "Fri", "Sat",
+	};
+	static const char *days_l[] = {
+		"Sunday", "Monday", "Tuesday", "Wednesday",
+		"Thursday", "Friday", "Saturday",
+	};
+	static const char *months_a[] = {
+		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+	};
+	static const char *months_l[] = {
+		"January", "February", "March", "April",
+		"May", "June", "July", "August", "September",
+		"October", "November", "December",
+	};
+	static const char *ampm[] = { "AM", "PM", };
+
+	if (s == NULL || format == NULL || timeptr == NULL || maxsize == 0)
+		return 0;
+
+	/* quick check if we even need to bother */
+	if (strchr(format, '%') == NULL && strlen(format) + 1 >= maxsize)
+		return 0;
+
+#ifndef POSIX_SEMANTICS
+	if (first) {
+		tzset();
+		first = 0;
+	}
+#else	/* POSIX_SEMANTICS */
+	tz = getenv("TZ");
+	if (first) {
+		if (tz != NULL) {
+			int tzlen = strlen(tz);
+
+			savetz = (char *) malloc(tzlen + 1);
+			if (savetz != NULL) {
+				savetzlen = tzlen + 1;
+				strcpy(savetz, tz);
+			}
+		}
+		tzset();
+		first = 0;
+	}
+	/* if we have a saved TZ, and it is different, recapture and reset */
+	if (tz && savetz && (tz[0] != savetz[0] || strcmp(tz, savetz) != 0)) {
+		i = strlen(tz) + 1;
+		if (i > savetzlen) {
+			savetz = (char *) realloc(savetz, i);
+			if (savetz) {
+				savetzlen = i;
+				strcpy(savetz, tz);
+			}
+		} else
+			strcpy(savetz, tz);
+		tzset();
+	}
+#endif	/* POSIX_SEMANTICS */
+
+	for (; *format && s < endp - 1; format++) {
+		tbuf[0] = '\0';
+		if (*format != '%') {
+			*s++ = *format;
+			continue;
+		}
+	again:
+		switch (*++format) {
+		case '\0':
+			*s++ = '%';
+			goto out;
+
+		case '%':
+			*s++ = '%';
+			continue;
+
+		case 'a':	/* abbreviated weekday name */
+			if (timeptr->tm_wday < 0 || timeptr->tm_wday > 6)
+				strcpy(tbuf, "?");
+			else
+				strcpy(tbuf, days_a[timeptr->tm_wday]);
+			break;
+
+		case 'A':	/* full weekday name */
+			if (timeptr->tm_wday < 0 || timeptr->tm_wday > 6)
+				strcpy(tbuf, "?");
+			else
+				strcpy(tbuf, days_l[timeptr->tm_wday]);
+			break;
+
+#ifdef SYSV_EXT
+		case 'h':	/* abbreviated month name */
+#endif
+		case 'b':	/* abbreviated month name */
+			if (timeptr->tm_mon < 0 || timeptr->tm_mon > 11)
+				strcpy(tbuf, "?");
+			else
+				strcpy(tbuf, months_a[timeptr->tm_mon]);
+			break;
+
+		case 'B':	/* full month name */
+			if (timeptr->tm_mon < 0 || timeptr->tm_mon > 11)
+				strcpy(tbuf, "?");
+			else
+				strcpy(tbuf, months_l[timeptr->tm_mon]);
+			break;
+
+		case 'c':	/* appropriate date and time representation */
+			strftime(tbuf, sizeof tbuf, "%a %b %e %H:%M:%S %Y", timeptr);
+			break;
+
+		case 'd':	/* day of the month, 01 - 31 */
+			i = range(1, timeptr->tm_mday, 31);
+			sprintf(tbuf, "%02d", i);
+			break;
+
+		case 'H':	/* hour, 24-hour clock, 00 - 23 */
+			i = range(0, timeptr->tm_hour, 23);
+			sprintf(tbuf, "%02d", i);
+			break;
+
+		case 'I':	/* hour, 12-hour clock, 01 - 12 */
+			i = range(0, timeptr->tm_hour, 23);
+			if (i == 0)
+				i = 12;
+			else if (i > 12)
+				i -= 12;
+			sprintf(tbuf, "%02d", i);
+			break;
+
+		case 'j':	/* day of the year, 001 - 366 */
+			sprintf(tbuf, "%03d", timeptr->tm_yday + 1);
+			break;
+
+		case 'm':	/* month, 01 - 12 */
+			i = range(0, timeptr->tm_mon, 11);
+			sprintf(tbuf, "%02d", i + 1);
+			break;
+
+		case 'M':	/* minute, 00 - 59 */
+			i = range(0, timeptr->tm_min, 59);
+			sprintf(tbuf, "%02d", i);
+			break;
+
+		case 'p':	/* am or pm based on 12-hour clock */
+			i = range(0, timeptr->tm_hour, 23);
+			if (i < 12)
+				strcpy(tbuf, ampm[0]);
+			else
+				strcpy(tbuf, ampm[1]);
+			break;
+
+		case 'S':	/* second, 00 - 60 */
+			i = range(0, timeptr->tm_sec, 60);
+			sprintf(tbuf, "%02d", i);
+			break;
+
+		case 'U':	/* week of year, Sunday is first day of week */
+			sprintf(tbuf, "%02d", weeknumber(timeptr, 0));
+			break;
+
+		case 'w':	/* weekday, Sunday == 0, 0 - 6 */
+			i = range(0, timeptr->tm_wday, 6);
+			sprintf(tbuf, "%d", i);
+			break;
+
+		case 'W':	/* week of year, Monday is first day of week */
+			sprintf(tbuf, "%02d", weeknumber(timeptr, 1));
+			break;
+
+		case 'x':	/* appropriate date representation */
+			strftime(tbuf, sizeof tbuf, "%m/%d/%y", timeptr);
+			break;
+
+		case 'X':	/* appropriate time representation */
+			strftime(tbuf, sizeof tbuf, "%H:%M:%S", timeptr);
+			break;
+
+		case 'y':	/* year without a century, 00 - 99 */
+			i = timeptr->tm_year % 100;
+			sprintf(tbuf, "%02d", i);
+			break;
+
+		case 'Y':	/* year with century */
+			sprintf(tbuf, "%ld", 1900L + timeptr->tm_year);
+			break;
+
+#ifdef MAILHEADER_EXT
+		/*
+		 * From: Chip Rosenthal <chip@chinacat.unicom.com>
+		 * Date: Sun, 19 Mar 1995 00:33:29 -0600 (CST)
+		 * 
+		 * Warning: the %z [code] is implemented by inspecting the
+		 * timezone name conditional compile settings, and
+		 * inferring a method to get timezone offsets. I've tried
+		 * this code on a couple of machines, but I don't doubt
+		 * there is some system out there that won't like it.
+		 * Maybe the easiest thing to do would be to bracket this
+		 * with an #ifdef that can turn it off. The %z feature
+		 * would be an admittedly obscure one that most folks can
+		 * live without, but it would be a great help to those of
+		 * us that muck around with various message processors.
+		 */
+ 		case 'z':	/* time zone offset east of GMT e.g. -0600 */
+#ifdef HAVE_TM_NAME
+			/*
+			 * Systems with tm_name probably have tm_tzadj as
+			 * secs west of GMT.  Convert to mins east of GMT.
+			 */
+			off = -timeptr->tm_tzadj / 60;
+#else /* !HAVE_TM_NAME */
+#ifdef HAVE_TM_ZONE
+			/*
+			 * Systems with tm_zone probably have tm_gmtoff as
+			 * secs east of GMT.  Convert to mins east of GMT.
+			 */
+			off = timeptr->tm_gmtoff / 60;
+#else /* !HAVE_TM_ZONE */
+#if HAVE_TZNAME
+			/*
+			 * Systems with tzname[] probably have timezone as
+			 * secs west of GMT.  Convert to mins east of GMT.
+			 */
+#ifdef __hpux
+			gettimeofday(&tv, &zone);
+			off = -zone.tz_minuteswest;
+#else
+			off = -(daylight ? timezone : altzone) / 60;
+#endif
+#else /* !HAVE_TZNAME */
+			gettimeofday(&tv, &zone);
+			off = -zone.tz_minuteswest;
+#endif /* !HAVE_TZNAME */
+#endif /* !HAVE_TM_ZONE */
+#endif /* !HAVE_TM_NAME */
+			if (off < 0) {
+				tbuf[0] = '-';
+				off = -off;
+			} else {
+				tbuf[0] = '+';
+			}
+			sprintf(tbuf+1, "%02u%02u", (unsigned)off/60, (unsigned)off%60);
+			break;
+#endif /* MAILHEADER_EXT */
+
+		case 'Z':	/* time zone name or abbrevation */
+#ifdef HAVE_TZNAME
+			i = (daylight && timeptr->tm_isdst > 0); /* 0 or 1 */
+			strcpy(tbuf, tzname[i]);
+#else
+#ifdef HAVE_TM_ZONE
+			strcpy(tbuf, timeptr->tm_zone);
+#else
+#ifdef HAVE_TM_NAME
+			strcpy(tbuf, timeptr->tm_name);
+#else
+			gettimeofday(& tv, & zone);
+#ifdef __CYGWIN__
+			strcpy(tbuf, timezone());
+#else
+			strcpy(tbuf, timezone(zone.tz_minuteswest,
+						timeptr->tm_isdst > 0));
+#endif
+#endif /* HAVE_TM_NAME */
+#endif /* HAVE_TM_ZONE */
+#endif /* HAVE_TZNAME */
+			break;
+
+#ifdef SYSV_EXT
+		case 'n':	/* same as \n */
+			tbuf[0] = '\n';
+			tbuf[1] = '\0';
+			break;
+
+		case 't':	/* same as \t */
+			tbuf[0] = '\t';
+			tbuf[1] = '\0';
+			break;
+
+		case 'D':	/* date as %m/%d/%y */
+			strftime(tbuf, sizeof tbuf, "%m/%d/%y", timeptr);
+			break;
+
+		case 'e':	/* day of month, blank padded */
+			sprintf(tbuf, "%2d", range(1, timeptr->tm_mday, 31));
+			break;
+
+		case 'r':	/* time as %I:%M:%S %p */
+			strftime(tbuf, sizeof tbuf, "%I:%M:%S %p", timeptr);
+			break;
+
+		case 'R':	/* time as %H:%M */
+			strftime(tbuf, sizeof tbuf, "%H:%M", timeptr);
+			break;
+
+		case 'T':	/* time as %H:%M:%S */
+			strftime(tbuf, sizeof tbuf, "%H:%M:%S", timeptr);
+			break;
+#endif
+
+#ifdef SUNOS_EXT
+		case 'k':	/* hour, 24-hour clock, blank pad */
+			sprintf(tbuf, "%2d", range(0, timeptr->tm_hour, 23));
+			break;
+
+		case 'l':	/* hour, 12-hour clock, 1 - 12, blank pad */
+			i = range(0, timeptr->tm_hour, 23);
+			if (i == 0)
+				i = 12;
+			else if (i > 12)
+				i -= 12;
+			sprintf(tbuf, "%2d", i);
+			break;
+#endif
+
+
+#ifdef VMS_EXT
+		case 'v':	/* date as dd-bbb-YYYY */
+			sprintf(tbuf, "%2d-%3.3s-%4ld",
+				range(1, timeptr->tm_mday, 31),
+				months_a[range(0, timeptr->tm_mon, 11)],
+				timeptr->tm_year + 1900L);
+			for (i = 3; i < 6; i++)
+				if (islower(tbuf[i]))
+					tbuf[i] = toupper(tbuf[i]);
+			break;
+#endif
+
+
+#ifdef POSIX2_DATE
+		case 'C':
+			sprintf(tbuf, "%02ld", (timeptr->tm_year + 1900L) / 100);
+			break;
+
+
+		case 'E':
+		case 'O':
+			/* POSIX locale extensions, ignored for now */
+			goto again;
+
+		case 'V':	/* week of year according ISO 8601 */
+			sprintf(tbuf, "%02d", iso8601wknum(timeptr));
+			break;
+
+		case 'u':
+		/* ISO 8601: Weekday as a decimal number [1 (Monday) - 7] */
+			sprintf(tbuf, "%d", timeptr->tm_wday == 0 ? 7 :
+					timeptr->tm_wday);
+			break;
+#endif	/* POSIX2_DATE */
+
+#ifdef ISO_DATE_EXT
+		case 'G':
+		case 'g':
+			/*
+			 * Year of ISO week.
+			 *
+			 * If it's December but the ISO week number is one,
+			 * that week is in next year.
+			 * If it's January but the ISO week number is 52 or
+			 * 53, that week is in last year.
+			 * Otherwise, it's this year.
+			 */
+			w = iso8601wknum(timeptr);
+			if (timeptr->tm_mon == 11 && w == 1)
+				y = 1900L + timeptr->tm_year + 1;
+			else if (timeptr->tm_mon == 0 && w >= 52)
+				y = 1900L + timeptr->tm_year - 1;
+			else
+				y = 1900L + timeptr->tm_year;
+
+			if (*format == 'G')
+				sprintf(tbuf, "%ld", y);
+			else
+				sprintf(tbuf, "%02ld", y % 100);
+			break;
+#endif /* ISO_DATE_EXT */
+		default:
+			tbuf[0] = '%';
+			tbuf[1] = *format;
+			tbuf[2] = '\0';
+			break;
+		}
+		i = strlen(tbuf);
+		if (i) {
+			if (s + i < endp - 1) {
+				strcpy(s, tbuf);
+				s += i;
+			} else
+				return 0;
+		}
+	}
+out:
+	if (s < endp && *format == '\0') {
+		*s = '\0';
+		return (s - start);
+	} else
+		return 0;
+}
+
+/* isleap --- is a year a leap year? */
+
+#ifndef __STDC__
+static int
+isleap(year)
+long year;
+#else
+static int
+isleap(long year)
+#endif
+{
+	return ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0);
+}
+
+
+#ifdef POSIX2_DATE
+/* iso8601wknum --- compute week number according to ISO 8601 */
+
+#ifndef __STDC__
+static int
+iso8601wknum(timeptr)
+const struct tm *timeptr;
+#else
+static int
+iso8601wknum(const struct tm *timeptr)
+#endif
+{
+	/*
+	 * From 1003.2:
+	 *	If the week (Monday to Sunday) containing January 1
+	 *	has four or more days in the new year, then it is week 1;
+	 *	otherwise it is the highest numbered week of the previous
+	 *	year (52 or 53), and the next week is week 1.
+	 *
+	 * ADR: This means if Jan 1 was Monday through Thursday,
+	 *	it was week 1, otherwise week 52 or 53.
+	 *
+	 * XPG4 erroneously included POSIX.2 rationale text in the
+	 * main body of the standard. Thus it requires week 53.
+	 */
+
+	int weeknum, jan1day, diff;
+
+	/* get week number, Monday as first day of the week */
+	weeknum = weeknumber(timeptr, 1);
+
+	/*
+	 * With thanks and tip of the hatlo to tml@tik.vtt.fi
+	 *
+	 * What day of the week does January 1 fall on?
+	 * We know that
+	 *	(timeptr->tm_yday - jan1.tm_yday) MOD 7 ==
+	 *		(timeptr->tm_wday - jan1.tm_wday) MOD 7
+	 * and that
+	 * 	jan1.tm_yday == 0
+	 * and that
+	 * 	timeptr->tm_wday MOD 7 == timeptr->tm_wday
+	 * from which it follows that. . .
+ 	 */
+	jan1day = timeptr->tm_wday - (timeptr->tm_yday % 7);
+	if (jan1day < 0)
+		jan1day += 7;
+
+	/*
+	 * If Jan 1 was a Monday through Thursday, it was in
+	 * week 1.  Otherwise it was last year's highest week, which is
+	 * this year's week 0.
+	 *
+	 * What does that mean?
+	 * If Jan 1 was Monday, the week number is exactly right, it can
+	 *	never be 0.
+	 * If it was Tuesday through Thursday, the weeknumber is one
+	 *	less than it should be, so we add one.
+	 * Otherwise, Friday, Saturday or Sunday, the week number is
+	 * OK, but if it is 0, it needs to be 52 or 53.
+	 */
+	switch (jan1day) {
+	case 1:		/* Monday */
+		break;
+	case 2:		/* Tuesday */
+	case 3:		/* Wednesday */
+	case 4:		/* Thursday */
+		weeknum++;
+		break;
+	case 5:		/* Friday */
+	case 6:		/* Saturday */
+	case 0:		/* Sunday */
+		if (weeknum == 0) {
+#ifdef USE_BROKEN_XPG4
+			/* XPG4 (as of March 1994) says 53 unconditionally */
+			weeknum = 53;
+#else
+			/* get week number of last week of last year */
+			struct tm dec31ly;	/* 12/31 last year */
+			dec31ly = *timeptr;
+			dec31ly.tm_year--;
+			dec31ly.tm_mon = 11;
+			dec31ly.tm_mday = 31;
+			dec31ly.tm_wday = (jan1day == 0) ? 6 : jan1day - 1;
+			dec31ly.tm_yday = 364 + isleap(dec31ly.tm_year + 1900L);
+			weeknum = iso8601wknum(& dec31ly);
+#endif
+		}
+		break;
+	}
+
+	if (timeptr->tm_mon == 11) {
+		/*
+		 * The last week of the year
+		 * can be in week 1 of next year.
+		 * Sigh.
+		 *
+		 * This can only happen if
+		 *	M   T  W
+		 *	29  30 31
+		 *	30  31
+		 *	31
+		 */
+		int wday, mday;
+
+		wday = timeptr->tm_wday;
+		mday = timeptr->tm_mday;
+		if (   (wday == 1 && (mday >= 29 && mday <= 31))
+		    || (wday == 2 && (mday == 30 || mday == 31))
+		    || (wday == 3 &&  mday == 31))
+			weeknum = 1;
+	}
+
+	return weeknum;
+}
+#endif
+
+/* weeknumber --- figure how many weeks into the year */
+
+/* With thanks and tip of the hatlo to ado@elsie.nci.nih.gov */
+
+#ifndef __STDC__
+static int
+weeknumber(timeptr, firstweekday)
+const struct tm *timeptr;
+int firstweekday;
+#else
+static int
+weeknumber(const struct tm *timeptr, int firstweekday)
+#endif
+{
+	int wday = timeptr->tm_wday;
+	int ret;
+
+	if (firstweekday == 1) {
+		if (wday == 0)	/* sunday */
+			wday = 6;
+		else
+			wday--;
+	}
+	ret = ((timeptr->tm_yday + 7 - wday) / 7);
+	if (ret < 0)
+		ret = 0;
+	return ret;
+}
+
+#if 0
+/* ADR --- I'm loathe to mess with ado's code ... */
+
+Date:         Wed, 24 Apr 91 20:54:08 MDT
+From: Michal Jaegermann <audfax!emory!vm.ucs.UAlberta.CA!NTOMCZAK>
+To: arnold@audiofax.com
+
+Hi Arnold,
+in a process of fixing of strftime() in libraries on Atari ST I grabbed
+some pieces of code from your own strftime.  When doing that it came
+to mind that your weeknumber() function compiles a little bit nicer
+in the following form:
+/*
+ * firstweekday is 0 if starting in Sunday, non-zero if in Monday
+ */
+{
+    return (timeptr->tm_yday - timeptr->tm_wday +
+	    (firstweekday ? (timeptr->tm_wday ? 8 : 1) : 7)) / 7;
+}
+How nicer it depends on a compiler, of course, but always a tiny bit.
+
+   Cheers,
+   Michal
+   ntomczak@vm.ucs.ualberta.ca
+#endif
+
+#ifdef	TEST_STRFTIME
+
+/*
+ * NAME:
+ *	tst
+ *
+ * SYNOPSIS:
+ *	tst
+ *
+ * DESCRIPTION:
+ *	"tst" is a test driver for the function "strftime".
+ *
+ * OPTIONS:
+ *	None.
+ *
+ * AUTHOR:
+ *	Karl Vogel
+ *	Control Data Systems, Inc.
+ *	vogelke@c-17igp.wpafb.af.mil
+ *
+ * BUGS:
+ *	None noticed yet.
+ *
+ * COMPILE:
+ *	cc -o tst -DTEST_STRFTIME strftime.c
+ */
+
+/* ADR: I reformatted this to my liking, and deleted some unneeded code. */
+
+#ifndef NULL
+#include	<stdio.h>
+#endif
+#include	<sys/time.h>
+#include	<string.h>
+
+#define		MAXTIME		132
+
+/*
+ * Array of time formats.
+ */
+
+static char *array[] =
+{
+	"(%%A)      full weekday name, var length (Sunday..Saturday)  %A",
+	"(%%B)       full month name, var length (January..December)  %B",
+	"(%%C)                                               Century  %C",
+	"(%%D)                                       date (%%m/%%d/%%y)  %D",
+	"(%%E)                           Locale extensions (ignored)  %E",
+	"(%%H)                          hour (24-hour clock, 00..23)  %H",
+	"(%%I)                          hour (12-hour clock, 01..12)  %I",
+	"(%%M)                                       minute (00..59)  %M",
+	"(%%O)                           Locale extensions (ignored)  %O",
+	"(%%R)                                 time, 24-hour (%%H:%%M)  %R",
+	"(%%S)                                       second (00..60)  %S",
+	"(%%T)                              time, 24-hour (%%H:%%M:%%S)  %T",
+	"(%%U)    week of year, Sunday as first day of week (00..53)  %U",
+	"(%%V)                    week of year according to ISO 8601  %V",
+	"(%%W)    week of year, Monday as first day of week (00..53)  %W",
+	"(%%X)     appropriate locale time representation (%H:%M:%S)  %X",
+	"(%%Y)                           year with century (1970...)  %Y",
+	"(%%Z) timezone (EDT), or blank if timezone not determinable  %Z",
+	"(%%a)          locale's abbreviated weekday name (Sun..Sat)  %a",
+	"(%%b)            locale's abbreviated month name (Jan..Dec)  %b",
+	"(%%c)           full date (Sat Nov  4 12:02:33 1989)%n%t%t%t  %c",
+	"(%%d)                             day of the month (01..31)  %d",
+	"(%%e)               day of the month, blank-padded ( 1..31)  %e",
+	"(%%h)                                should be same as (%%b)  %h",
+	"(%%j)                            day of the year (001..366)  %j",
+	"(%%k)               hour, 24-hour clock, blank pad ( 0..23)  %k",
+	"(%%l)               hour, 12-hour clock, blank pad ( 0..12)  %l",
+	"(%%m)                                        month (01..12)  %m",
+	"(%%p)              locale's AM or PM based on 12-hour clock  %p",
+	"(%%r)                   time, 12-hour (same as %%I:%%M:%%S %%p)  %r",
+	"(%%u) ISO 8601: Weekday as decimal number [1 (Monday) - 7]   %u",
+	"(%%v)                                VMS date (dd-bbb-YYYY)  %v",
+	"(%%w)                       day of week (0..6, Sunday == 0)  %w",
+	"(%%x)                appropriate locale date representation  %x",
+	"(%%y)                      last two digits of year (00..99)  %y",
+	"(%%z)      timezone offset east of GMT as HHMM (e.g. -0500)  %z",
+	(char *) NULL
+};
+
+/* main routine. */
+
+int
+main(argc, argv)
+int argc;
+char **argv;
+{
+	long time();
+
+	char *next;
+	char string[MAXTIME];
+
+	int k;
+	int length;
+
+	struct tm *tm;
+
+	long clock;
+
+	/* Call the function. */
+
+	clock = time((long *) 0);
+	tm = localtime(&clock);
+
+	for (k = 0; next = array[k]; k++) {
+		length = strftime(string, MAXTIME, next, tm);
+		printf("%s\n", string);
+	}
+
+	exit(0);
+}
+#endif	/* TEST_STRFTIME */
diff --git a/ruby_1_8_6/missing/strncasecmp.c b/ruby_1_8_6/missing/strncasecmp.c
new file mode 100644
index 0000000000..a4cc5828b8
--- /dev/null
+++ b/ruby_1_8_6/missing/strncasecmp.c
@@ -0,0 +1,21 @@
+/* public domain rewrite of strncasecmp(3) */
+
+#include <ctype.h>
+
+int
+strncasecmp(p1, p2, len)
+    char *p1;
+    char *p2;
+    int len;
+{
+    while (len != 0) {
+	if (toupper(*p1) != toupper(*p2)) {
+	    return toupper(*p1) - toupper(*p2);
+	}
+	if (*p1 == '\0') {
+	    return 0;
+	}
+	len--; p1++; p2++;
+    }
+    return 0;
+}
diff --git a/ruby_1_8_6/missing/strstr.c b/ruby_1_8_6/missing/strstr.c
new file mode 100644
index 0000000000..1673518f06
--- /dev/null
+++ b/ruby_1_8_6/missing/strstr.c
@@ -0,0 +1,26 @@
+/* public domain rewrite of strstr(3) */
+
+char *
+strstr(haystack, needle)
+    char *haystack, *needle;
+{
+    char *hend;
+    char *a, *b;
+
+    if (*needle == 0) return haystack;
+    hend = haystack + strlen(haystack) - strlen(needle) + 1;
+    while (haystack < hend) {
+	if (*haystack == *needle) {
+	    a = haystack;
+	    b = needle;
+	    for (;;) {
+		if (*b == 0) return haystack;
+		if (*a++ != *b++) {
+		    break;
+		}
+	    }
+	}
+	haystack++;
+    }
+    return 0;
+}
diff --git a/ruby_1_8_6/missing/strtod.c b/ruby_1_8_6/missing/strtod.c
new file mode 100644
index 0000000000..fdccd48081
--- /dev/null
+++ b/ruby_1_8_6/missing/strtod.c
@@ -0,0 +1,271 @@
+/* 
+ * strtod.c --
+ *
+ *	Source code for the "strtod" library procedure.
+ *
+ * Copyright (c) 1988-1993 The Regents of the University of California.
+ * Copyright (c) 1994 Sun Microsystems, Inc.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies.  The University of California
+ * makes no representations about the suitability of this
+ * software for any purpose.  It is provided "as is" without
+ * express or implied warranty.
+ *
+ * RCS: @(#) $Id$
+ */
+
+#include "config.h"
+#ifdef HAVE_STDLIB_H
+#   include <stdlib.h>
+#endif
+#include <ctype.h>
+#include <errno.h>
+extern  int     errno;
+
+#ifndef __STDC__
+# ifdef __GNUC__
+#  define const __const__
+# else
+#  define const
+# endif
+#endif
+
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+#ifndef NULL
+#define NULL 0
+#endif
+
+static int maxExponent = 511;	/* Largest possible base 10 exponent.  Any
+				 * exponent larger than this will already
+				 * produce underflow or overflow, so there's
+				 * no need to worry about additional digits.
+				 */
+static double powersOf10[] = {	/* Table giving binary powers of 10.  Entry */
+    10.,			/* is 10^2^i.  Used to convert decimal */
+    100.,			/* exponents into floating-point numbers. */
+    1.0e4,
+    1.0e8,
+    1.0e16,
+    1.0e32,
+    1.0e64,
+    1.0e128,
+    1.0e256
+};
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * strtod --
+ *
+ *	This procedure converts a floating-point number from an ASCII
+ *	decimal representation to internal double-precision format.
+ *
+ * Results:
+ *	The return value is the double-precision floating-point
+ *	representation of the characters in string.  If endPtr isn't
+ *	NULL, then *endPtr is filled in with the address of the
+ *	next character after the last one that was part of the
+ *	floating-point number.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+double
+strtod(string, endPtr)
+    const char *string;		/* A decimal ASCII floating-point number,
+				 * optionally preceded by white space.
+				 * Must have form "-I.FE-X", where I is the
+				 * integer part of the mantissa, F is the
+				 * fractional part of the mantissa, and X
+				 * is the exponent.  Either of the signs
+				 * may be "+", "-", or omitted.  Either I
+				 * or F may be omitted, or both.  The decimal
+				 * point isn't necessary unless F is present.
+				 * The "E" may actually be an "e".  E and X
+				 * may both be omitted (but not just one).
+				 */
+    char **endPtr;		/* If non-NULL, store terminating character's
+				 * address here. */
+{
+    int sign, expSign = FALSE;
+    double fraction, dblExp, *d;
+    register const char *p;
+    register int c;
+    int exp = 0;		/* Exponent read from "EX" field. */
+    int fracExp = 0;		/* Exponent that derives from the fractional
+				 * part.  Under normal circumstatnces, it is
+				 * the negative of the number of digits in F.
+				 * However, if I is very long, the last digits
+				 * of I get dropped (otherwise a long I with a
+				 * large negative exponent could cause an
+				 * unnecessary overflow on I alone).  In this
+				 * case, fracExp is incremented one for each
+				 * dropped digit. */
+    int mantSize;		/* Number of digits in mantissa. */
+    int decPt;			/* Number of mantissa digits BEFORE decimal
+				 * point. */
+    const char *pExp;		/* Temporarily holds location of exponent
+				 * in string. */
+
+    /*
+     * Strip off leading blanks and check for a sign.
+     */
+
+    p = string;
+    while (isspace(*p)) {
+	p += 1;
+    }
+    if (*p == '-') {
+	sign = TRUE;
+	p += 1;
+    } else {
+	if (*p == '+') {
+	    p += 1;
+	}
+	sign = FALSE;
+    }
+
+    /*
+     * Count the number of digits in the mantissa (including the decimal
+     * point), and also locate the decimal point.
+     */
+
+    decPt = -1;
+    for (mantSize = 0; ; mantSize += 1)
+    {
+	c = *p;
+	if (!isdigit(c)) {
+	    if ((c != '.') || (decPt >= 0)) {
+		break;
+	    }
+	    decPt = mantSize;
+	}
+	p += 1;
+    }
+
+    /*
+     * Now suck up the digits in the mantissa.  Use two integers to
+     * collect 9 digits each (this is faster than using floating-point).
+     * If the mantissa has more than 18 digits, ignore the extras, since
+     * they can't affect the value anyway.
+     */
+    
+    pExp  = p;
+    p -= mantSize;
+    if (decPt < 0) {
+	decPt = mantSize;
+    } else {
+	mantSize -= 1;			/* One of the digits was the point. */
+    }
+    if (mantSize > 18) {
+	fracExp = decPt - 18;
+	mantSize = 18;
+    } else {
+	fracExp = decPt - mantSize;
+    }
+    if (mantSize == 0) {
+	fraction = 0.0;
+	p = string;
+	goto done;
+    } else {
+	int frac1, frac2;
+	frac1 = 0;
+	for ( ; mantSize > 9; mantSize -= 1)
+	{
+	    c = *p;
+	    p += 1;
+	    if (c == '.') {
+		c = *p;
+		p += 1;
+	    }
+	    frac1 = 10*frac1 + (c - '0');
+	}
+	frac2 = 0;
+	for (; mantSize > 0; mantSize -= 1)
+	{
+	    c = *p;
+	    p += 1;
+	    if (c == '.') {
+		c = *p;
+		p += 1;
+	    }
+	    frac2 = 10*frac2 + (c - '0');
+	}
+	fraction = (1.0e9 * frac1) + frac2;
+    }
+
+    /*
+     * Skim off the exponent.
+     */
+
+    p = pExp;
+    if ((*p == 'E') || (*p == 'e')) {
+	p += 1;
+	if (*p == '-') {
+	    expSign = TRUE;
+	    p += 1;
+	} else {
+	    if (*p == '+') {
+		p += 1;
+	    }
+	    expSign = FALSE;
+	}
+	while (isdigit(*p)) {
+	    exp = exp * 10 + (*p - '0');
+	    p += 1;
+	}
+    }
+    if (expSign) {
+	exp = fracExp - exp;
+    } else {
+	exp = fracExp + exp;
+    }
+
+    /*
+     * Generate a floating-point number that represents the exponent.
+     * Do this by processing the exponent one bit at a time to combine
+     * many powers of 2 of 10. Then combine the exponent with the
+     * fraction.
+     */
+    
+    if (exp < 0) {
+	expSign = TRUE;
+	exp = -exp;
+    } else {
+	expSign = FALSE;
+    }
+    if (exp > maxExponent) {
+	exp = maxExponent;
+	errno = ERANGE;
+    }
+    dblExp = 1.0;
+    for (d = powersOf10; exp != 0; exp >>= 1, d += 1) {
+	if (exp & 01) {
+	    dblExp *= *d;
+	}
+    }
+    if (expSign) {
+	fraction /= dblExp;
+    } else {
+	fraction *= dblExp;
+    }
+
+done:
+    if (endPtr != NULL) {
+	*endPtr = (char *) p;
+    }
+
+    if (sign) {
+	return -fraction;
+    }
+    return fraction;
+}
diff --git a/ruby_1_8_6/missing/strtol.c b/ruby_1_8_6/missing/strtol.c
new file mode 100644
index 0000000000..e94aa54ca0
--- /dev/null
+++ b/ruby_1_8_6/missing/strtol.c
@@ -0,0 +1,29 @@
+/* public domain rewrite of strtol(3) */
+
+#include <ctype.h>
+
+long
+strtol(nptr, endptr, base)
+    char *nptr;
+    char **endptr;
+    int base;
+{
+    long result;
+    char *p = nptr;
+
+    while (isspace(*p)) {
+	p++;
+    }
+    if (*p == '-') {
+	p++;
+	result = -strtoul(p, endptr, base);
+    }
+    else {
+	if (*p == '+') p++;
+	result = strtoul(p, endptr, base);
+    }
+    if (endptr != 0 && *endptr == p) {
+	*endptr = nptr;
+    }
+    return result;
+}
diff --git a/ruby_1_8_6/missing/strtoul.c b/ruby_1_8_6/missing/strtoul.c
new file mode 100644
index 0000000000..f16f2ad9cf
--- /dev/null
+++ b/ruby_1_8_6/missing/strtoul.c
@@ -0,0 +1,184 @@
+/* 
+ * strtoul.c --
+ *
+ *	Source code for the "strtoul" library procedure.
+ *
+ * Copyright 1988 Regents of the University of California
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies.  The University of California
+ * makes no representations about the suitability of this
+ * software for any purpose.  It is provided "as is" without
+ * express or implied warranty.
+ */
+
+#include <ctype.h>
+
+/*
+ * The table below is used to convert from ASCII digits to a
+ * numerical equivalent.  It maps from '0' through 'z' to integers
+ * (100 for non-digit characters).
+ */
+
+static char cvtIn[] = {
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9,		/* '0' - '9' */
+    100, 100, 100, 100, 100, 100, 100,		/* punctuation */
+    10, 11, 12, 13, 14, 15, 16, 17, 18, 19,	/* 'A' - 'Z' */
+    20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+    30, 31, 32, 33, 34, 35,
+    100, 100, 100, 100, 100, 100,		/* punctuation */
+    10, 11, 12, 13, 14, 15, 16, 17, 18, 19,	/* 'a' - 'z' */
+    20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+    30, 31, 32, 33, 34, 35};
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * strtoul --
+ *
+ *	Convert an ASCII string into an integer.
+ *
+ * Results:
+ *	The return value is the integer equivalent of string.  If endPtr
+ *	is non-NULL, then *endPtr is filled in with the character
+ *	after the last one that was part of the integer.  If string
+ *	doesn't contain a valid integer value, then zero is returned
+ *	and *endPtr is set to string.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+unsigned long int
+strtoul(string, endPtr, base)
+    char *string;		/* String of ASCII digits, possibly
+				 * preceded by white space.  For bases
+				 * greater than 10, either lower- or
+				 * upper-case digits may be used.
+				 */
+    char **endPtr;		/* Where to store address of terminating
+				 * character, or NULL. */
+    int base;			/* Base for conversion.  Must be less
+				 * than 37.  If 0, then the base is chosen
+				 * from the leading characters of string:
+				 * "0x" means hex, "0" means octal, anything
+				 * else means decimal.
+				 */
+{
+    register char *p;
+    register unsigned long int result = 0;
+    register unsigned digit;
+    int anyDigits = 0;
+
+    /*
+     * Skip any leading blanks.
+     */
+
+    p = string;
+    while (isspace(*p)) {
+	p += 1;
+    }
+
+    /*
+     * If no base was provided, pick one from the leading characters
+     * of the string.
+     */
+    
+    if (base == 0)
+    {
+	if (*p == '0') {
+	    p += 1;
+	    if (*p == 'x') {
+		p += 1;
+		base = 16;
+	    } else {
+
+		/*
+		 * Must set anyDigits here, otherwise "0" produces a
+		 * "no digits" error.
+		 */
+
+		anyDigits = 1;
+		base = 8;
+	    }
+	}
+	else base = 10;
+    } else if (base == 16) {
+
+	/*
+	 * Skip a leading "0x" from hex numbers.
+	 */
+
+	if ((p[0] == '0') && (p[1] == 'x')) {
+	    p += 2;
+	}
+    }
+
+    /*
+     * Sorry this code is so messy, but speed seems important.  Do
+     * different things for base 8, 10, 16, and other.
+     */
+
+    if (base == 8) {
+	for ( ; ; p += 1) {
+	    digit = *p - '0';
+	    if (digit > 7) {
+		break;
+	    }
+	    result = (result << 3) + digit;
+	    anyDigits = 1;
+	}
+    } else if (base == 10) {
+	for ( ; ; p += 1) {
+	    digit = *p - '0';
+	    if (digit > 9) {
+		break;
+	    }
+	    result = (10*result) + digit;
+	    anyDigits = 1;
+	}
+    } else if (base == 16) {
+	for ( ; ; p += 1) {
+	    digit = *p - '0';
+	    if (digit > ('z' - '0')) {
+		break;
+	    }
+	    digit = cvtIn[digit];
+	    if (digit > 15) {
+		break;
+	    }
+	    result = (result << 4) + digit;
+	    anyDigits = 1;
+	}
+    } else {
+	for ( ; ; p += 1) {
+	    digit = *p - '0';
+	    if (digit > ('z' - '0')) {
+		break;
+	    }
+	    digit = cvtIn[digit];
+	    if (digit >= base) {
+		break;
+	    }
+	    result = result*base + digit;
+	    anyDigits = 1;
+	}
+    }
+
+    /*
+     * See if there were any digits at all.
+     */
+
+    if (!anyDigits) {
+	p = string;
+    }
+
+    if (endPtr != 0) {
+	*endPtr = p;
+    }
+
+    return result;
+}
diff --git a/ruby_1_8_6/missing/vsnprintf.c b/ruby_1_8_6/missing/vsnprintf.c
new file mode 100644
index 0000000000..6afdfa189f
--- /dev/null
+++ b/ruby_1_8_6/missing/vsnprintf.c
@@ -0,0 +1,1135 @@
+/*-
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * IMPORTANT NOTE:
+ * --------------
+ * From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+ * paragraph 3 above is now null and void.
+ */
+
+/* SNPRINTF.C  
+ * fjc 7-31-97 Modified by Mib Software to be a standalone snprintf.c module.
+ *      http://www.mibsoftware.com
+ * Mib Software does not warrant this software any differently than the
+ * University of California, Berkeley as described above.  All warranties
+ * are disclaimed.  Use this software at your own risk.
+ *
+ *      All code referencing FILE * functions was eliminated, since it could
+ *      never be called.  All header files and necessary files are collapsed
+ *      into one file, internal functions are declared static.  This should
+ *      allow inclusion into libraries with less chance of namespace collisions.
+ *
+ *      snprintf should be the only externally visible item.
+ *     
+ *      As of 7-31-97 FLOATING_POINT is NOT provided.  The code is somewhat
+ *        non-portable, so it is disabled.
+ */
+
+/* Define FLOATING_POINT to get floating point. */
+/*
+#define	FLOATING_POINT
+*/
+
+#include <sys/types.h>
+#define u_long unsigned long
+#define u_short unsigned short
+#define u_int unsigned int
+
+#undef __P
+#if defined(__STDC__)
+# include <stdarg.h>
+# if !defined(__P)
+#  define __P(x) x
+# endif
+#else
+# define __P(x) ()
+# if !defined(const)
+#  define const
+# endif
+# include <varargs.h>
+#endif
+#ifndef _BSD_VA_LIST_ 
+#define	_BSD_VA_LIST_ va_list
+#endif
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# ifndef LONG_MAX
+#  ifdef HAVE_LIMITS_H
+#   include <limits.h>
+#  else
+    /* assuming 32bit(2's compliment) long */
+#   define LONG_MAX 2147483647
+#  endif
+# endif
+#endif
+
+#if defined(__hpux) && !defined(__GNUC__) && !defined(__STDC__)
+#define const
+#endif
+
+#if defined(sgi)
+#undef __const
+#define __const
+#endif /* People who don't like const sys_error */
+
+#include <stddef.h>
+
+#ifndef NULL
+#define	NULL	0
+#endif
+
+/*
+ * NB: to fit things in six character monocase externals, the stdio
+ * code uses the prefix `__s' for stdio objects, typically followed
+ * by a three-character attempt at a mnemonic.
+ */
+
+/* stdio buffers */
+struct __sbuf {
+	unsigned char *_base;
+	int	_size;
+};
+
+
+/*
+ * stdio state variables.
+ *
+ * The following always hold:
+ *
+ *	if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
+ *		_lbfsize is -_bf._size, else _lbfsize is 0
+ *	if _flags&__SRD, _w is 0
+ *	if _flags&__SWR, _r is 0
+ *
+ * This ensures that the getc and putc macros (or inline functions) never
+ * try to write or read from a file that is in `read' or `write' mode.
+ * (Moreover, they can, and do, automatically switch from read mode to
+ * write mode, and back, on "r+" and "w+" files.)
+ *
+ * _lbfsize is used only to make the inline line-buffered output stream
+ * code as compact as possible.
+ *
+ * _ub, _up, and _ur are used when ungetc() pushes back more characters
+ * than fit in the current _bf, or when ungetc() pushes back a character
+ * that does not match the previous one in _bf.  When this happens,
+ * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
+ * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
+ *
+ * NB: see WARNING above before changing the layout of this structure!
+ */
+typedef	struct __sFILE {
+	unsigned char *_p;	/* current position in (some) buffer */
+	int	_r;		/* read space left for getc() */
+	int	_w;		/* write space left for putc() */
+	short	_flags;		/* flags, below; this FILE is free if 0 */
+	short	_file;		/* fileno, if Unix descriptor, else -1 */
+	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
+	int	_lbfsize;	/* 0 or -_bf._size, for inline putc */
+} FILE;
+
+
+#define	__SLBF	0x0001		/* line buffered */
+#define	__SNBF	0x0002		/* unbuffered */
+#define	__SRD	0x0004		/* OK to read */
+#define	__SWR	0x0008		/* OK to write */
+	/* RD and WR are never simultaneously asserted */
+#define	__SRW	0x0010		/* open for reading & writing */
+#define	__SEOF	0x0020		/* found EOF */
+#define	__SERR	0x0040		/* found error */
+#define	__SMBF	0x0080		/* _buf is from malloc */
+#define	__SAPP	0x0100		/* fdopen()ed in append mode */
+#define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
+#define	__SOPT	0x0400		/* do fseek() optimisation */
+#define	__SNPT	0x0800		/* do not do fseek() optimisation */
+#define	__SOFF	0x1000		/* set iff _offset is in fact correct */
+#define	__SMOD	0x2000		/* true => fgetln modified _p text */
+
+
+#define	EOF	(-1)
+
+
+#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
+#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
+#define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
+#define	__sfileno(p)	((p)->_file)
+
+#define	feof(p)		__sfeof(p)
+#define	ferror(p)	__sferror(p)
+#define	clearerr(p)	__sclearerr(p)
+
+#ifndef _ANSI_SOURCE
+#define	fileno(p)	__sfileno(p)
+#endif
+
+
+#if defined(__hpux) && !defined(__GNUC__) || defined(__DECC)
+#include <string.h>
+#endif
+
+/*
+ * I/O descriptors for __sfvwrite().
+ */
+struct __siov {
+	void	*iov_base;
+	size_t	iov_len;
+};
+struct __suio {
+	struct	__siov *uio_iov;
+	int	uio_iovcnt;
+	int	uio_resid;
+};
+
+/*
+ * Write some memory regions.  Return zero on success, EOF on error.
+ *
+ * This routine is large and unsightly, but most of the ugliness due
+ * to the three different kinds of output buffering is handled here.
+ */
+static BSD__sfvwrite(fp, uio)
+	register FILE *fp;
+	register struct __suio *uio;
+{
+	register size_t len;
+	register char *p;
+	register struct __siov *iov;
+	register int w;
+
+	if ((len = uio->uio_resid) == 0)
+		return (0);
+#ifndef __hpux
+#define	MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#define	COPY(n)	  (void)memcpy((void *)fp->_p, (void *)p, (size_t)(n))
+
+	iov = uio->uio_iov;
+	p = iov->iov_base;
+	len = iov->iov_len;
+	iov++;
+#define GETIOV(extra_work) \
+	while (len == 0) { \
+		extra_work; \
+		p = iov->iov_base; \
+		len = iov->iov_len; \
+		iov++; \
+	}
+	if (fp->_flags & __SNBF) {
+	/* fjc 7-31-97 Will never happen.  We are working with
+					   strings only
+	*/
+	} else if ((fp->_flags & __SLBF) == 0) {
+	/*
+		 * Fully buffered: fill partially full buffer, if any,
+		 * and then flush.  If there is no partial buffer, write
+		 * one _bf._size byte chunk directly (without copying).
+		 *
+		 * String output is a special case: write as many bytes
+		 * as fit, but pretend we wrote everything.  This makes
+		 * snprintf() return the number of bytes needed, rather
+		 * than the number used, and avoids its write function
+		 * (so that the write function can be invalid).
+		 */
+		do {
+			GETIOV(;);
+			w = fp->_w;
+			if (fp->_flags & __SSTR) {
+				if (len < w)
+					w = len;
+				COPY(w);	/* copy MIN(fp->_w,len), */
+				fp->_w -= w;
+				fp->_p += w;
+				w = len;	/* but pretend copied all */
+			} else {
+				/* fjc 7-31-97 Will never happen.  We are working with
+								   strings only
+				*/
+			}
+			p += w;
+			len -= w;
+		} while ((uio->uio_resid -= w) != 0);
+	} else {
+		/* fjc 7-31-97 Will never happen.  We are working with
+						   strings only
+		*/
+	}
+	return (0);
+
+err:
+	fp->_flags |= __SERR;
+	return (EOF);
+}
+
+/*
+ * Actual printf innards.
+ *
+ * This code is large and complicated...
+ */
+
+#if !defined(__CYGWIN32__) && defined(__hpux) && !defined(__GNUC__)
+#include <stdlib.h>
+#endif
+
+/*
+ * Flush out all the vectors defined by the given uio,
+ * then reset it so that it can be reused.
+ */
+static int
+BSD__sprint(fp, uio)
+	FILE *fp;
+	register struct __suio *uio;
+{
+	register int err;
+
+	if (uio->uio_resid == 0) {
+		uio->uio_iovcnt = 0;
+		return (0);
+	}
+	err = BSD__sfvwrite(fp, uio);
+	uio->uio_resid = 0;
+	uio->uio_iovcnt = 0;
+	return (err);
+}
+
+
+/*
+ * Helper function for `fprintf to unbuffered unix file': creates a
+ * temporary buffer.  We only work on write-only files; this avoids
+ * worries about ungetc buffers and so forth.
+ */
+static int
+BSD__sbprintf(fp, fmt, ap)
+	register FILE *fp;
+	const char *fmt;
+	va_list ap;
+{
+/* We don't support files. */
+	return 0;
+}
+
+
+/*
+ * Macros for converting digits to letters and vice versa
+ */
+#define	to_digit(c)	((c) - '0')
+#define is_digit(c)	((unsigned)to_digit(c) <= 9)
+#define	to_char(n)	((n) + '0')
+
+/*
+ * Convert an unsigned long to ASCII for printf purposes, returning
+ * a pointer to the first character of the string representation.
+ * Octal numbers can be forced to have a leading zero; hex numbers
+ * use the given digits.
+ */
+static char *
+BSD__ultoa(val, endp, base, octzero, xdigs)
+	register u_long val;
+	char *endp;
+	int base, octzero;
+	char *xdigs;
+{
+	register char *cp = endp;
+	register long sval;
+
+	/*
+	 * Handle the three cases separately, in the hope of getting
+	 * better/faster code.
+	 */
+	switch (base) {
+	case 10:
+		if (val < 10) {	/* many numbers are 1 digit */
+			*--cp = to_char(val);
+			return (cp);
+		}
+		/*
+		 * On many machines, unsigned arithmetic is harder than
+		 * signed arithmetic, so we do at most one unsigned mod and
+		 * divide; this is sufficient to reduce the range of
+		 * the incoming value to where signed arithmetic works.
+		 */
+		if (val > LONG_MAX) {
+			*--cp = to_char(val % 10);
+			sval = val / 10;
+		} else
+			sval = val;
+		do {
+			*--cp = to_char(sval % 10);
+			sval /= 10;
+		} while (sval != 0);
+		break;
+
+	case 8:
+		do {
+			*--cp = to_char(val & 7);
+			val >>= 3;
+		} while (val);
+		if (octzero && *cp != '0')
+			*--cp = '0';
+		break;
+
+	case 16:
+		do {
+			*--cp = xdigs[val & 15];
+			val >>= 4;
+		} while (val);
+		break;
+
+	default:			/* oops */
+		/* 
+		abort();
+		*/
+		break;	/* fjc 7-31-97.  Don't reference abort() here */
+	}
+	return (cp);
+}
+
+#ifdef FLOATING_POINT
+#include <math.h>
+/* #include "floatio.h" */
+
+#ifndef MAXEXP
+# define MAXEXP 1024
+#endif
+
+#ifndef MAXFRACT
+# define MAXFRACT 64
+#endif
+
+#define	BUF		(MAXEXP+MAXFRACT+1)	/* + decimal point */
+#define	DEFPREC		6
+
+static char *cvt __P((double, int, int, char *, int *, int, int *));
+static int exponent __P((char *, int, int));
+
+#else /* no FLOATING_POINT */
+
+#define	BUF		68
+
+#endif /* FLOATING_POINT */
+
+
+/*
+ * Flags used during conversion.
+ */
+#define	ALT		0x001		/* alternate form */
+#define	HEXPREFIX	0x002		/* add 0x or 0X prefix */
+#define	LADJUST		0x004		/* left adjustment */
+#define	LONGDBL		0x008		/* long double; unimplemented */
+#define	LONGINT		0x010		/* long integer */
+
+#ifdef _HAVE_SANE_QUAD_
+#define	QUADINT		0x020		/* quad integer */
+#endif /* _HAVE_SANE_QUAD_ */
+
+#define	SHORTINT	0x040		/* short integer */
+#define	ZEROPAD		0x080		/* zero (as opposed to blank) pad */
+#define FPT		0x100		/* Floating point number */
+static int
+BSD_vfprintf(fp, fmt0, ap)
+	FILE *fp;
+	const char *fmt0;
+	va_list ap;
+{
+	register char *fmt;	/* format string */
+	register int ch;	/* character from fmt */
+	register int n;		/* handy integer (short term usage) */
+	register char *cp;	/* handy char pointer (short term usage) */
+	register struct __siov *iovp;/* for PRINT macro */
+	register int flags;	/* flags as above */
+	int ret;		/* return value accumulator */
+	int width;		/* width from format (%8d), or 0 */
+	int prec;		/* precision from format (%.3d), or -1 */
+	char sign;		/* sign prefix (' ', '+', '-', or \0) */
+#ifdef FLOATING_POINT
+	char softsign;		/* temporary negative sign for floats */
+	double _double;		/* double precision arguments %[eEfgG] */
+	int expt;		/* integer value of exponent */
+	int expsize;		/* character count for expstr */
+	int ndig;		/* actual number of digits returned by cvt */
+	char expstr[7];		/* buffer for exponent string */
+#endif
+	u_long	ulval;		/* integer arguments %[diouxX] */
+#ifdef _HAVE_SANE_QUAD_
+	u_quad_t uqval;		/* %q integers */
+#endif /* _HAVE_SANE_QUAD_ */
+	int base;		/* base for [diouxX] conversion */
+	int dprec;		/* a copy of prec if [diouxX], 0 otherwise */
+	int fieldsz;		/* field size expanded by sign, etc */
+	int realsz;		/* field size expanded by dprec */
+	int size;		/* size of converted field or string */
+	char *xdigs;		/* digits for [xX] conversion */
+#define NIOV 8
+	struct __suio uio;	/* output information: summary */
+	struct __siov iov[NIOV];/* ... and individual io vectors */
+	char buf[BUF];		/* space for %c, %[diouxX], %[eEfgG] */
+	char ox[2];		/* space for 0x hex-prefix */
+
+	/*
+	 * Choose PADSIZE to trade efficiency vs. size.  If larger printf
+	 * fields occur frequently, increase PADSIZE and make the initialisers
+	 * below longer.
+	 */
+#define	PADSIZE	16		/* pad chunk size */
+	static char blanks[PADSIZE] =
+	 {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
+	static char zeroes[PADSIZE] =
+	 {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
+
+	/*
+	 * BEWARE, these `goto error' on error, and PAD uses `n'.
+	 */
+#define	PRINT(ptr, len) { \
+	iovp->iov_base = (ptr); \
+	iovp->iov_len = (len); \
+	uio.uio_resid += (len); \
+	iovp++; \
+	if (++uio.uio_iovcnt >= NIOV) { \
+		if (BSD__sprint(fp, &uio)) \
+			goto error; \
+		iovp = iov; \
+	} \
+}
+#define	PAD(howmany, with) { \
+	if ((n = (howmany)) > 0) { \
+		while (n > PADSIZE) { \
+			PRINT(with, PADSIZE); \
+			n -= PADSIZE; \
+		} \
+		PRINT(with, n); \
+	} \
+}
+#define	FLUSH() { \
+	if (uio.uio_resid && BSD__sprint(fp, &uio)) \
+		goto error; \
+	uio.uio_iovcnt = 0; \
+	iovp = iov; \
+}
+
+	/*
+	 * To extend shorts properly, we need both signed and unsigned
+	 * argument extraction methods.
+	 */
+#define	SARG() \
+	(flags&LONGINT ? va_arg(ap, long) : \
+	    flags&SHORTINT ? (long)(short)va_arg(ap, int) : \
+	    (long)va_arg(ap, int))
+#define	UARG() \
+	(flags&LONGINT ? va_arg(ap, u_long) : \
+	    flags&SHORTINT ? (u_long)(u_short)va_arg(ap, int) : \
+	    (u_long)va_arg(ap, u_int))
+
+	/* optimise fprintf(stderr) (and other unbuffered Unix files) */
+	if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
+	    fp->_file >= 0)
+		return (BSD__sbprintf(fp, fmt0, ap));
+
+	fmt = (char *)fmt0;
+	uio.uio_iov = iovp = iov;
+	uio.uio_resid = 0;
+	uio.uio_iovcnt = 0;
+	ret = 0;
+
+	/*
+	 * Scan the format for conversions (`%' character).
+	 */
+	for (;;) {
+		for (cp = fmt; (ch = *fmt) != '\0' && ch != '%'; fmt++)
+			/* void */;
+		if ((n = fmt - cp) != 0) {
+			PRINT(cp, n);
+			ret += n;
+		}
+		if (ch == '\0')
+			goto done;
+		fmt++;		/* skip over '%' */
+
+		flags = 0;
+		dprec = 0;
+		width = 0;
+		prec = -1;
+		sign = '\0';
+
+rflag:		ch = *fmt++;
+reswitch:	switch (ch) {
+		case ' ':
+			/*
+			 * ``If the space and + flags both appear, the space
+			 * flag will be ignored.''
+			 *	-- ANSI X3J11
+			 */
+			if (!sign)
+				sign = ' ';
+			goto rflag;
+		case '#':
+			flags |= ALT;
+			goto rflag;
+		case '*':
+			/*
+			 * ``A negative field width argument is taken as a
+			 * - flag followed by a positive field width.''
+			 *	-- ANSI X3J11
+			 * They don't exclude field widths read from args.
+			 */
+			if ((width = va_arg(ap, int)) >= 0)
+				goto rflag;
+			width = -width;
+			/* FALLTHROUGH */
+		case '-':
+			flags |= LADJUST;
+			goto rflag;
+		case '+':
+			sign = '+';
+			goto rflag;
+		case '.':
+			if ((ch = *fmt++) == '*') {
+				n = va_arg(ap, int);
+				prec = n < 0 ? -1 : n;
+				goto rflag;
+			}
+			n = 0;
+			while (is_digit(ch)) {
+				n = 10 * n + to_digit(ch);
+				ch = *fmt++;
+			}
+			prec = n < 0 ? -1 : n;
+			goto reswitch;
+		case '0':
+			/*
+			 * ``Note that 0 is taken as a flag, not as the
+			 * beginning of a field width.''
+			 *	-- ANSI X3J11
+			 */
+			flags |= ZEROPAD;
+			goto rflag;
+		case '1': case '2': case '3': case '4':
+		case '5': case '6': case '7': case '8': case '9':
+			n = 0;
+			do {
+				n = 10 * n + to_digit(ch);
+				ch = *fmt++;
+			} while (is_digit(ch));
+			width = n;
+			goto reswitch;
+#ifdef FLOATING_POINT
+		case 'L':
+			flags |= LONGDBL;
+			goto rflag;
+#endif
+		case 'h':
+			flags |= SHORTINT;
+			goto rflag;
+		case 'l':
+			flags |= LONGINT;
+			goto rflag;
+#ifdef _HAVE_SANE_QUAD_
+		case 'q':
+			flags |= QUADINT;
+			goto rflag;
+#endif /* _HAVE_SANE_QUAD_ */
+		case 'c':
+			*(cp = buf) = va_arg(ap, int);
+			size = 1;
+			sign = '\0';
+			break;
+		case 'D':
+			flags |= LONGINT;
+			/*FALLTHROUGH*/
+		case 'd':
+		case 'i':
+#ifdef _HAVE_SANE_QUAD_
+			if (flags & QUADINT) {
+				uqval = va_arg(ap, quad_t);
+				if ((quad_t)uqval < 0) {
+					uqval = -uqval;
+					sign = '-';
+				}
+			} else {
+#else /* _HAVE_SANE_QUAD_ */
+			{
+#endif /* _HAVE_SANE_QUAD_ */
+				ulval = SARG();
+				if ((long)ulval < 0) {
+					ulval = -ulval;
+					sign = '-';
+				}
+			}
+			base = 10;
+			goto number;
+#ifdef FLOATING_POINT
+		case 'e':		/* anomalous precision */
+		case 'E':
+			prec = (prec == -1) ?
+				DEFPREC + 1 : prec + 1;
+			/* FALLTHROUGH */
+			goto fp_begin;
+		case 'f':		/* always print trailing zeroes */
+			if (prec != 0)
+				flags |= ALT;
+		case 'g':
+		case 'G':
+			if (prec == -1)
+				prec = DEFPREC;
+fp_begin:		_double = va_arg(ap, double);
+			/* do this before tricky precision changes */
+			if (isinf(_double)) {
+				if (_double < 0)
+					sign = '-';
+				cp = "Inf";
+				size = 3;
+				break;
+			}
+			if (isnan(_double)) {
+				cp = "NaN";
+				size = 3;
+				break;
+			}
+			flags |= FPT;
+			cp = cvt(_double, prec, flags, &softsign,
+				&expt, ch, &ndig);
+			if (ch == 'g' || ch == 'G') {
+				if (expt <= -4 || expt > prec)
+					ch = (ch == 'g') ? 'e' : 'E';
+				else
+					ch = 'g';
+			} 
+			if (ch <= 'e') {	/* 'e' or 'E' fmt */
+				--expt;
+				expsize = exponent(expstr, expt, ch);
+				size = expsize + ndig;
+				if (ndig > 1 || flags & ALT)
+					++size;
+			} else if (ch == 'f') {		/* f fmt */
+				if (expt > 0) {
+					size = expt;
+					if (prec || flags & ALT)
+						size += prec + 1;
+				} else	/* "0.X" */
+					size = prec + 2;
+			} else if (expt >= ndig) {	/* fixed g fmt */
+				size = expt;
+				if (flags & ALT)
+					++size;
+			} else
+				size = ndig + (expt > 0 ?
+					1 : 2 - expt);
+
+			if (softsign)
+				sign = '-';
+			break;
+#endif /* FLOATING_POINT */
+		case 'n':
+#ifdef _HAVE_SANE_QUAD_
+			if (flags & QUADINT)
+				*va_arg(ap, quad_t *) = ret;
+			else if (flags & LONGINT)
+#else /* _HAVE_SANE_QUAD_ */
+			if (flags & LONGINT)
+#endif /* _HAVE_SANE_QUAD_ */
+				*va_arg(ap, long *) = ret;
+			else if (flags & SHORTINT)
+				*va_arg(ap, short *) = ret;
+			else
+				*va_arg(ap, int *) = ret;
+			continue;	/* no output */
+		case 'O':
+			flags |= LONGINT;
+			/*FALLTHROUGH*/
+		case 'o':
+#ifdef _HAVE_SANE_QUAD_
+			if (flags & QUADINT)
+				uqval = va_arg(ap, u_quad_t);
+			else
+#endif /* _HAVE_SANE_QUAD_ */
+				ulval = UARG();
+			base = 8;
+			goto nosign;
+		case 'p':
+			/*
+			 * ``The argument shall be a pointer to void.  The
+			 * value of the pointer is converted to a sequence
+			 * of printable characters, in an implementation-
+			 * defined manner.''
+			 *	-- ANSI X3J11
+			 */
+#ifdef _HAVE_LLP64_
+			uqval = (u_long)va_arg(ap, void *);
+			flags = (flags) | QUADINT | HEXPREFIX;
+#else
+			ulval = (u_long)va_arg(ap, void *);
+#ifdef _HAVE_SANE_QUAD_
+			flags = (flags & ~QUADINT) | HEXPREFIX;
+#else /* _HAVE_SANE_QUAD_ */
+			flags = (flags) | HEXPREFIX;
+#endif /* _HAVE_SANE_QUAD_ */
+#endif
+			base = 16;
+			xdigs = "0123456789abcdef";
+			ch = 'x';
+			goto nosign;
+		case 's':
+			if ((cp = va_arg(ap, char *)) == NULL)
+				cp = "(null)";
+			if (prec >= 0) {
+				/*
+				 * can't use strlen; can only look for the
+				 * NUL in the first `prec' characters, and
+				 * strlen() will go further.
+				 */
+				char *p = (char *)memchr(cp, 0, prec);
+
+				if (p != NULL) {
+					size = p - cp;
+					if (size > prec)
+						size = prec;
+				} else
+					size = prec;
+			} else
+				size = strlen(cp);
+			sign = '\0';
+			break;
+		case 'U':
+			flags |= LONGINT;
+			/*FALLTHROUGH*/
+		case 'u':
+#ifdef _HAVE_SANE_QUAD_
+			if (flags & QUADINT)
+				uqval = va_arg(ap, u_quad_t);
+			else
+#endif /* _HAVE_SANE_QUAD_ */
+				ulval = UARG();
+			base = 10;
+			goto nosign;
+		case 'X':
+			xdigs = "0123456789ABCDEF";
+			goto hex;
+		case 'x':
+			xdigs = "0123456789abcdef";
+hex:
+#ifdef _HAVE_SANE_QUAD_
+			if (flags & QUADINT)
+				uqval = va_arg(ap, u_quad_t);
+			else
+#endif /* _HAVE_SANE_QUAD_ */
+				ulval = UARG();
+			base = 16;
+			/* leading 0x/X only if non-zero */
+			if (flags & ALT &&
+#ifdef _HAVE_SANE_QUAD_
+			    (flags & QUADINT ? uqval != 0 : ulval != 0))
+#else /* _HAVE_SANE_QUAD_ */
+			    ulval != 0)
+#endif /* _HAVE_SANE_QUAD_ */
+				flags |= HEXPREFIX;
+
+			/* unsigned conversions */
+nosign:			sign = '\0';
+			/*
+			 * ``... diouXx conversions ... if a precision is
+			 * specified, the 0 flag will be ignored.''
+			 *	-- ANSI X3J11
+			 */
+number:			if ((dprec = prec) >= 0)
+				flags &= ~ZEROPAD;
+
+			/*
+			 * ``The result of converting a zero value with an
+			 * explicit precision of zero is no characters.''
+			 *	-- ANSI X3J11
+			 */
+			cp = buf + BUF;
+#ifdef _HAVE_SANE_QUAD_
+			if (flags & QUADINT) {
+				if (uqval != 0 || prec != 0)
+					cp = __uqtoa(uqval, cp, base,
+					    flags & ALT, xdigs);
+			} else {
+#else /* _HAVE_SANE_QUAD_ */
+			{
+#endif /* _HAVE_SANE_QUAD_ */
+				if (ulval != 0 || prec != 0)
+					cp = BSD__ultoa(ulval, cp, base,
+					    flags & ALT, xdigs);
+			}
+			size = buf + BUF - cp;
+			break;
+		default:	/* "%?" prints ?, unless ? is NUL */
+			if (ch == '\0')
+				goto done;
+			/* pretend it was %c with argument ch */
+			cp = buf;
+			*cp = ch;
+			size = 1;
+			sign = '\0';
+			break;
+		}
+
+		/*
+		 * All reasonable formats wind up here.  At this point, `cp'
+		 * points to a string which (if not flags&LADJUST) should be
+		 * padded out to `width' places.  If flags&ZEROPAD, it should
+		 * first be prefixed by any sign or other prefix; otherwise,
+		 * it should be blank padded before the prefix is emitted.
+		 * After any left-hand padding and prefixing, emit zeroes
+		 * required by a decimal [diouxX] precision, then print the
+		 * string proper, then emit zeroes required by any leftover
+		 * floating precision; finally, if LADJUST, pad with blanks.
+		 *
+		 * Compute actual size, so we know how much to pad.
+		 * fieldsz excludes decimal prec; realsz includes it.
+		 */
+		fieldsz = size;
+		if (sign)
+			fieldsz++;
+		else if (flags & HEXPREFIX)
+			fieldsz += 2;
+		realsz = dprec > fieldsz ? dprec : fieldsz;
+
+		/* right-adjusting blank padding */
+		if ((flags & (LADJUST|ZEROPAD)) == 0)
+			PAD(width - realsz, blanks);
+
+		/* prefix */
+		if (sign) {
+			PRINT(&sign, 1);
+		} else if (flags & HEXPREFIX) {
+			ox[0] = '0';
+			ox[1] = ch;
+			PRINT(ox, 2);
+		}
+
+		/* right-adjusting zero padding */
+		if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD)
+			PAD(width - realsz, zeroes);
+
+		/* leading zeroes from decimal precision */
+		PAD(dprec - fieldsz, zeroes);
+
+		/* the string or number proper */
+#ifdef FLOATING_POINT
+		if ((flags & FPT) == 0) {
+			PRINT(cp, size);
+		} else {	/* glue together f_p fragments */
+			if (ch >= 'f') {	/* 'f' or 'g' */
+				if (_double == 0) {
+				/* kludge for __dtoa irregularity */
+					if (prec == 0 ||
+					    (flags & ALT) == 0) {
+						PRINT("0", 1);
+					} else {
+						PRINT("0.", 2);
+						PAD(ndig - 1, zeroes);
+					}
+				} else if (expt <= 0) {
+					PRINT("0.", 2);
+					PAD(-expt, zeroes);
+					PRINT(cp, ndig);
+				} else if (expt >= ndig) {
+					PRINT(cp, ndig);
+					PAD(expt - ndig, zeroes);
+					if (flags & ALT)
+						PRINT(".", 1);
+				} else {
+					PRINT(cp, expt);
+					cp += expt;
+					PRINT(".", 1);
+					PRINT(cp, ndig-expt);
+				}
+			} else {	/* 'e' or 'E' */
+				if (ndig > 1 || flags & ALT) {
+					ox[0] = *cp++;
+					ox[1] = '.';
+					PRINT(ox, 2);
+					if (_double || flags & ALT == 0) {
+						PRINT(cp, ndig-1);
+					} else	/* 0.[0..] */
+						/* __dtoa irregularity */
+						PAD(ndig - 1, zeroes);
+				} else	/* XeYYY */
+					PRINT(cp, 1);
+				PRINT(expstr, expsize);
+			}
+		}
+#else
+		PRINT(cp, size);
+#endif
+		/* left-adjusting padding (always blank) */
+		if (flags & LADJUST)
+			PAD(width - realsz, blanks);
+
+		/* finally, adjust ret */
+		ret += width > realsz ? width : realsz;
+
+		FLUSH();	/* copy out the I/O vectors */
+	}
+done:
+	FLUSH();
+error:
+	return (__sferror(fp) ? EOF : ret);
+	/* NOTREACHED */
+}
+
+#ifdef FLOATING_POINT
+
+extern char *BSD__dtoa __P((double, int, int, int *, int *, char **));
+
+static char *
+cvt(value, ndigits, flags, sign, decpt, ch, length)
+	double value;
+	int ndigits, flags, *decpt, ch, *length;
+	char *sign;
+{
+	int mode, dsgn;
+	char *digits, *bp, *rve;
+
+	if (ch == 'f')
+		mode = 3;
+	else {
+		mode = 2;
+	}
+	if (value < 0) {
+		value = -value;
+		*sign = '-';
+	} else if (value == 0.0 && 1.0/value < 0) {
+	    *sign = '-';
+	} else {
+	    *sign = '\000';
+	}
+	digits = BSD__dtoa(value, mode, ndigits, decpt, &dsgn, &rve);
+	if (flags & ALT) {	/* Print trailing zeros */
+		bp = digits + ndigits;
+		if (ch == 'f') {
+			if (*digits == '0' && value)
+				*decpt = -ndigits + 1;
+			bp += *decpt;
+		}
+		if (value == 0)	/* kludge for __dtoa irregularity */
+			rve = bp;
+		while (rve < bp)
+			*rve++ = '0';
+	}
+	*length = rve - digits;
+	return (digits);
+}
+
+static int
+exponent(p0, exp, fmtch)
+	char *p0;
+	int exp, fmtch;
+{
+	register char *p, *t;
+	char expbuf[MAXEXP];
+
+	p = p0;
+	*p++ = fmtch;
+	if (exp < 0) {
+		exp = -exp;
+		*p++ = '-';
+	}
+	else
+		*p++ = '+';
+	t = expbuf + MAXEXP;
+	if (exp > 9) {
+		do {
+			*--t = to_char(exp % 10);
+		} while ((exp /= 10) > 9);
+		*--t = to_char(exp);
+		for (; t < expbuf + MAXEXP; *p++ = *t++);
+	}
+	else {
+		*p++ = '0';
+		*p++ = to_char(exp);
+	}
+	return (p - p0);
+}
+#endif /* FLOATING_POINT */
+
+int
+vsnprintf(str, n, fmt, ap)
+	char *str;
+	size_t n;
+	const char *fmt;
+	_BSD_VA_LIST_ ap;
+{
+	int ret;
+	FILE f;
+
+	if ((int)n < 1)
+		return (EOF);
+	f._flags = __SWR | __SSTR;
+	f._bf._base = f._p = (unsigned char *)str;
+	f._bf._size = f._w = n - 1;
+	ret = BSD_vfprintf(&f, fmt, ap);
+	*f._p = 0;
+	return (ret);
+}
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)snprintf.c	8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
+
+#if defined(__STDC__)
+# include <stdarg.h>
+#else
+# include <varargs.h>
+#endif
+
+int
+#if defined(__STDC__)
+snprintf(char *str, size_t n, char const *fmt, ...)
+#else
+snprintf(str, n, fmt, va_alist)
+char *str, *fmt;
+size_t n;
+va_dcl
+#endif
+{
+	int ret;
+	va_list ap;
+	FILE f;
+
+	if ((int)n < 1)
+		return (EOF);
+
+#if defined(__STDC__)
+	va_start(ap, fmt);
+#else
+	va_start(ap);
+#endif
+	f._flags = __SWR | __SSTR;
+	f._bf._base = f._p = (unsigned char *)str;
+	f._bf._size = f._w = n - 1;
+	ret = BSD_vfprintf(&f, fmt, ap);
+	*f._p = 0;
+	va_end(ap);
+	return (ret);
+}
diff --git a/ruby_1_8_6/missing/x68.c b/ruby_1_8_6/missing/x68.c
new file mode 100644
index 0000000000..8d00d50041
--- /dev/null
+++ b/ruby_1_8_6/missing/x68.c
@@ -0,0 +1,40 @@
+/* x68 compatibility functions -- follows Ruby's license */
+
+#include "config.h"
+
+#if !HAVE_SELECT
+#include "x68/select.c"
+#endif
+#if MISSING__DTOS18
+#include "x68/_dtos18.c"
+#endif
+#if MISSING_FCONVERT
+#include "x68/_round.c"
+#include "x68/fconvert.c"
+#endif
+
+/* missing some basic syscalls */
+int
+link(const char *src, const char *dst)
+{
+    return symlink(src, dst);
+}
+
+#ifndef HAVE_GETTIMEOFDAY
+#include <time.h>
+#include <sys/time.h>
+
+struct timezone {
+    int tz_minuteswest;
+    int tz_dsttime;
+};
+
+int
+gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+    tv->tv_sec = (long)time((time_t*)0);
+    tv->tv_usec = 0;
+
+    return 0;
+}
+#endif
diff --git a/ruby_1_8_6/mkconfig.rb b/ruby_1_8_6/mkconfig.rb
new file mode 100755
index 0000000000..fdc3dcf0af
--- /dev/null
+++ b/ruby_1_8_6/mkconfig.rb
@@ -0,0 +1,191 @@
+#!./miniruby -s
+
+# avoid warnings with -d.
+$install_name ||= nil
+$so_name ||= nil
+
+srcdir = File.dirname(__FILE__)
+$:.replace [srcdir+"/lib", "."]
+
+require "fileutils"
+mkconfig = File.basename($0)
+
+rbconfig_rb = ARGV[0] || 'rbconfig.rb'
+unless File.directory?(dir = File.dirname(rbconfig_rb))
+  FileUtils.makedirs(dir, :verbose => true)
+end
+
+version = RUBY_VERSION
+def (config = "").write(arg)
+  concat(arg.to_s)
+end
+$stdout = config
+
+fast = {'prefix'=>TRUE, 'ruby_install_name'=>TRUE, 'INSTALL'=>TRUE, 'EXEEXT'=>TRUE}
+print %[
+# This file was created by #{mkconfig} when ruby was built.  Any
+# changes made to this file will be lost the next time ruby is built.
+
+module Config
+  RUBY_VERSION == "#{version}" or
+    raise "ruby lib version (#{version}) doesn't match executable version (\#{RUBY_VERSION})"
+
+]
+
+v_fast = []
+v_others = []
+vars = {}
+has_version = false
+continued_name = nil
+continued_line = nil
+File.foreach "config.status" do |line|
+  next if /^#/ =~ line
+  name = nil
+  case line
+  when /^s([%,])@(\w+)@\1(?:\|\#_!!_\#\|)?(.*)\1/
+    name = $2
+    val = $3.gsub(/\\(?=,)/, '')
+  when /^S\["(\w+)"\]\s*=\s*"(.*)"\s*(\\)?$/
+    name = $1
+    val = $2
+    if $3
+      continued_line = []
+      continued_line << val
+      continued_name = name
+      next
+    end
+  when /^"(.+)"\s*(\\)?$/
+    if continued_line
+      continued_line <<  $1
+      unless $2
+	val = continued_line.join("")
+	name = continued_name
+	continued_line = nil
+      end
+    end
+  when /^(?:ac_given_)?INSTALL=(.*)/
+    v_fast << "  CONFIG[\"INSTALL\"] = " + $1 + "\n"
+  end
+
+  if name
+    next if /^(?:ac_.*|DEFS|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ name
+    next if /^\$\(ac_\w+\)$/ =~ val
+    next if /^\$\{ac_\w+\}$/ =~ val
+    next if /^\$ac_\w+$/ =~ val
+    next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name
+    next if $so_name and /^RUBY_SO_NAME$/ =~  name
+    if /^program_transform_name$/ =~ name and /^s(\\?.)(.*)\1$/ =~ val
+      next if $install_name
+      sep = %r"#{Regexp.quote($1)}"
+      ptn = $2.sub(/\$\$/, '$').split(sep, 2)
+      name = "ruby_install_name"
+      val = "ruby".sub(/#{ptn[0]}/, ptn[1])
+    end
+    val.gsub!(/ +(?!-)/, "=") if name == "configure_args" && /mswin32/ =~ RUBY_PLATFORM
+    val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
+    if /^prefix$/ =~ name
+      val = "(TOPDIR || DESTDIR + #{val})"
+    end
+    v = "  CONFIG[\"#{name}\"] #{vars[name] ? '<< "\n"' : '='} #{val}\n"
+    vars[name] = true
+    if fast[name]
+      v_fast << v
+    else
+      v_others << v
+    end
+    has_version = true if name == "MAJOR"
+  end
+#  break if /^CEOF/
+end
+
+drive = File::PATH_SEPARATOR == ';'
+
+prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM
+print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
+print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
+print "  CONFIG = {}\n"
+print "  CONFIG[\"DESTDIR\"] = DESTDIR\n"
+
+unless has_version
+  RUBY_VERSION.scan(/(\d+)\.(\d+)\.(\d+)/) {
+    print "  CONFIG[\"MAJOR\"] = \"" + $1 + "\"\n"
+    print "  CONFIG[\"MINOR\"] = \"" + $2 + "\"\n"
+    print "  CONFIG[\"TEENY\"] = \"" + $3 + "\"\n"
+  }
+  patchlevel = IO.foreach(File.join(srcdir, "version.h")) {|l|
+    m = /^\s*#\s*define\s+RUBY_PATCHLEVEL\s+(\d+)/.match(l) and break m[1]
+  }
+  print "  CONFIG[\"PATCHLEVEL\"] = \"#{patchlevel}\"\n"
+end
+
+dest = drive ? /= \"(?!\$[\(\{])(?:[a-z]:)?/i : /= \"(?!\$[\(\{])/
+v_others.collect! do |x|
+  if /^\s*CONFIG\["(?!abs_|old)[a-z]+(?:_prefix|dir)"\]/ === x
+    x.sub(dest, '= "$(DESTDIR)')
+  else
+    x
+  end
+end
+
+if $install_name
+  v_fast << "  CONFIG[\"ruby_install_name\"] = \"" + $install_name + "\"\n"
+  v_fast << "  CONFIG[\"RUBY_INSTALL_NAME\"] = \"" + $install_name + "\"\n"
+end
+if $so_name
+  v_fast << "  CONFIG[\"RUBY_SO_NAME\"] = \"" + $so_name + "\"\n"
+end
+
+print(*v_fast)
+print(*v_others)
+print <<EOS
+  CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
+  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
+  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
+  CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
+  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
+  CONFIG["topdir"] = File.dirname(__FILE__)
+  MAKEFILE_CONFIG = {}
+  CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
+  def Config::expand(val, config = CONFIG)
+    val.gsub!(/\\$\\$|\\$\\(([^()]+)\\)|\\$\\{([^{}]+)\\}/) do |var|
+      if !(v = $1 || $2)
+	'$'
+      elsif key = config[v = v[/\\A[^:]+(?=(?::(.*?)=(.*))?\\z)/]]
+	pat, sub = $1, $2
+	config[v] = false
+	Config::expand(key, config)
+	config[v] = key
+	key = key.gsub(/\#{Regexp.quote(pat)}(?=\\s|\\z)/n) {sub} if pat
+	key
+      else
+	var
+      end
+    end
+    val
+  end
+  CONFIG.each_value do |val|
+    Config::expand(val)
+  end
+end
+RbConfig = Config # compatibility for ruby-1.9
+CROSS_COMPILING = nil unless defined? CROSS_COMPILING
+EOS
+
+$stdout = STDOUT
+mode = IO::RDWR|IO::CREAT
+mode |= IO::BINARY if defined?(IO::BINARY)
+open(rbconfig_rb, mode) do |f|
+  if $timestamp and f.stat.size == config.size and f.read == config
+    puts "#{rbconfig_rb} unchanged"
+  else
+    puts "#{rbconfig_rb} updated"
+    f.rewind
+    f.truncate(0)
+    f.print(config)
+  end
+end
+if String === $timestamp
+  FileUtils.touch($timestamp)
+end
+
+# vi:set sw=2:
diff --git a/ruby_1_8_6/node.h b/ruby_1_8_6/node.h
new file mode 100644
index 0000000000..382d266563
--- /dev/null
+++ b/ruby_1_8_6/node.h
@@ -0,0 +1,474 @@
+/**********************************************************************
+
+  node.h -
+
+  $Author$
+  $Date$
+  created at: Fri May 28 15:14:02 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef NODE_H
+#define NODE_H
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+enum node_type {
+    NODE_METHOD,
+    NODE_FBODY,
+    NODE_CFUNC,
+    NODE_SCOPE,
+    NODE_BLOCK,
+    NODE_IF,
+    NODE_CASE,
+    NODE_WHEN,
+    NODE_OPT_N,
+    NODE_WHILE,
+    NODE_UNTIL,
+    NODE_ITER,
+    NODE_FOR,
+    NODE_BREAK,
+    NODE_NEXT,
+    NODE_REDO,
+    NODE_RETRY,
+    NODE_BEGIN,
+    NODE_RESCUE,
+    NODE_RESBODY,
+    NODE_ENSURE,
+    NODE_AND,
+    NODE_OR,
+    NODE_NOT,
+    NODE_MASGN,
+    NODE_LASGN,
+    NODE_DASGN,
+    NODE_DASGN_CURR,
+    NODE_GASGN,
+    NODE_IASGN,
+    NODE_CDECL,
+    NODE_CVASGN,
+    NODE_CVDECL,
+    NODE_OP_ASGN1,
+    NODE_OP_ASGN2,
+    NODE_OP_ASGN_AND,
+    NODE_OP_ASGN_OR,
+    NODE_CALL,
+    NODE_FCALL,
+    NODE_VCALL,
+    NODE_SUPER,
+    NODE_ZSUPER,
+    NODE_ARRAY,
+    NODE_ZARRAY,
+    NODE_HASH,
+    NODE_RETURN,
+    NODE_YIELD,
+    NODE_LVAR,
+    NODE_DVAR,
+    NODE_GVAR,
+    NODE_IVAR,
+    NODE_CONST,
+    NODE_CVAR,
+    NODE_NTH_REF,
+    NODE_BACK_REF,
+    NODE_MATCH,
+    NODE_MATCH2,
+    NODE_MATCH3,
+    NODE_LIT,
+    NODE_STR,
+    NODE_DSTR,
+    NODE_XSTR,
+    NODE_DXSTR,
+    NODE_EVSTR,
+    NODE_DREGX,
+    NODE_DREGX_ONCE,
+    NODE_ARGS,
+    NODE_ARGSCAT,
+    NODE_ARGSPUSH,
+    NODE_SPLAT,
+    NODE_TO_ARY,
+    NODE_SVALUE,
+    NODE_BLOCK_ARG,
+    NODE_BLOCK_PASS,
+    NODE_DEFN,
+    NODE_DEFS,
+    NODE_ALIAS,
+    NODE_VALIAS,
+    NODE_UNDEF,
+    NODE_CLASS,
+    NODE_MODULE,
+    NODE_SCLASS,
+    NODE_COLON2,
+    NODE_COLON3,
+    NODE_CREF,
+    NODE_DOT2,
+    NODE_DOT3,
+    NODE_FLIP2,
+    NODE_FLIP3,
+    NODE_ATTRSET,
+    NODE_SELF,
+    NODE_NIL,
+    NODE_TRUE,
+    NODE_FALSE,
+    NODE_DEFINED,
+    NODE_NEWLINE,
+    NODE_POSTEXE,
+    NODE_ALLOCA,
+    NODE_DMETHOD,
+    NODE_BMETHOD,
+    NODE_MEMO,
+    NODE_IFUNC,
+    NODE_DSYM,
+    NODE_ATTRASGN,
+    NODE_LAST
+};
+
+typedef struct RNode {
+    unsigned long flags;
+    char *nd_file;
+    union {
+	struct RNode *node;
+	ID id;
+	VALUE value;
+	VALUE (*cfunc)(ANYARGS);
+	ID *tbl;
+    } u1;
+    union {
+	struct RNode *node;
+	ID id;
+	long argc;
+	VALUE value;
+    } u2;
+    union {
+	struct RNode *node;
+	ID id;
+	long state;
+	struct global_entry *entry;
+	long cnt;
+	VALUE value;
+    } u3;
+} NODE;
+
+extern NODE *ruby_cref;
+extern NODE *ruby_top_cref;
+
+#define RNODE(obj)  (R_CAST(RNode)(obj))
+
+#define nd_type(n) ((int)(((RNODE(n))->flags>>FL_USHIFT)&0xff))
+#define nd_set_type(n,t) \
+    RNODE(n)->flags=((RNODE(n)->flags&~FL_UMASK)|(((t)<<FL_USHIFT)&FL_UMASK))
+
+#define NODE_LSHIFT (FL_USHIFT+8)
+#define NODE_LMASK  (((long)1<<(sizeof(NODE*)*CHAR_BIT-NODE_LSHIFT))-1)
+#define nd_line(n) ((unsigned int)(((RNODE(n))->flags>>NODE_LSHIFT)&NODE_LMASK))
+#define nd_set_line(n,l) \
+    RNODE(n)->flags=((RNODE(n)->flags&~(-1<<NODE_LSHIFT))|(((l)&NODE_LMASK)<<NODE_LSHIFT))
+
+#define nd_head  u1.node
+#define nd_alen  u2.argc
+#define nd_next  u3.node
+
+#define nd_cond  u1.node
+#define nd_body  u2.node
+#define nd_else  u3.node
+
+#define nd_orig  u3.value
+
+#define nd_resq  u2.node
+#define nd_ensr  u3.node
+
+#define nd_1st   u1.node
+#define nd_2nd   u2.node
+
+#define nd_stts  u1.node
+
+#define nd_entry u3.entry
+#define nd_vid   u1.id
+#define nd_cflag u2.id
+#define nd_cval  u3.value
+
+#define nd_cnt   u3.cnt
+#define nd_tbl   u1.tbl
+
+#define nd_var   u1.node
+#define nd_ibdy  u2.node
+#define nd_iter  u3.node
+
+#define nd_value u2.node
+#define nd_aid   u3.id
+
+#define nd_lit   u1.value
+
+#define nd_frml  u1.node
+#define nd_rest  u2.node
+#define nd_opt   u1.node
+
+#define nd_recv  u1.node
+#define nd_mid   u2.id
+#define nd_args  u3.node
+
+#define nd_noex  u1.id
+#define nd_defn  u3.node
+
+#define nd_cfnc  u1.cfunc
+#define nd_argc  u2.argc
+
+#define nd_cpath u1.node
+#define nd_super u3.node
+
+#define nd_modl  u1.id
+#define nd_clss  u1.value
+
+#define nd_beg   u1.node
+#define nd_end   u2.node
+#define nd_state u3.state
+#define nd_rval  u2.value
+
+#define nd_nth   u2.argc
+
+#define nd_tag   u1.id
+#define nd_tval  u2.value
+
+#define NEW_NODE(t,a0,a1,a2) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2))
+
+#define NEW_METHOD(n,x) NEW_NODE(NODE_METHOD,x,n,0)
+#define NEW_FBODY(n,i,o) NEW_NODE(NODE_FBODY,n,i,o)
+#define NEW_DEFN(i,a,d,p) NEW_NODE(NODE_DEFN,p,i,NEW_RFUNC(a,d))
+#define NEW_DEFS(r,i,a,d) NEW_NODE(NODE_DEFS,r,i,NEW_RFUNC(a,d))
+#define NEW_CFUNC(f,c) NEW_NODE(NODE_CFUNC,f,c,0)
+#define NEW_IFUNC(f,c) NEW_NODE(NODE_IFUNC,f,c,0)
+#define NEW_RFUNC(b1,b2) NEW_SCOPE(block_append(b1,b2))
+#define NEW_SCOPE(b) NEW_NODE(NODE_SCOPE,local_tbl(),0,(b))
+#define NEW_BLOCK(a) NEW_NODE(NODE_BLOCK,a,0,0)
+#define NEW_IF(c,t,e) NEW_NODE(NODE_IF,c,t,e)
+#define NEW_UNLESS(c,t,e) NEW_IF(c,e,t)
+#define NEW_CASE(h,b) NEW_NODE(NODE_CASE,h,b,0)
+#define NEW_WHEN(c,t,e) NEW_NODE(NODE_WHEN,c,t,e)
+#define NEW_OPT_N(b) NEW_NODE(NODE_OPT_N,0,b,0)
+#define NEW_WHILE(c,b,n) NEW_NODE(NODE_WHILE,c,b,n)
+#define NEW_UNTIL(c,b,n) NEW_NODE(NODE_UNTIL,c,b,n)
+#define NEW_FOR(v,i,b) NEW_NODE(NODE_FOR,v,b,i)
+#define NEW_ITER(v,i,b) NEW_NODE(NODE_ITER,v,b,i)
+#define NEW_BREAK(s) NEW_NODE(NODE_BREAK,s,0,0)
+#define NEW_NEXT(s) NEW_NODE(NODE_NEXT,s,0,0)
+#define NEW_REDO() NEW_NODE(NODE_REDO,0,0,0)
+#define NEW_RETRY() NEW_NODE(NODE_RETRY,0,0,0)
+#define NEW_BEGIN(b) NEW_NODE(NODE_BEGIN,0,b,0)
+#define NEW_RESCUE(b,res,e) NEW_NODE(NODE_RESCUE,b,res,e)
+#define NEW_RESBODY(a,ex,n) NEW_NODE(NODE_RESBODY,n,ex,a)
+#define NEW_ENSURE(b,en) NEW_NODE(NODE_ENSURE,b,0,en)
+#define NEW_RETURN(s) NEW_NODE(NODE_RETURN,s,0,0)
+#define NEW_YIELD(a,s) NEW_NODE(NODE_YIELD,a,0,s)
+#define NEW_LIST(a)  NEW_ARRAY(a)
+#define NEW_ARRAY(a) NEW_NODE(NODE_ARRAY,a,1,0)
+#define NEW_ZARRAY() NEW_NODE(NODE_ZARRAY,0,0,0)
+#define NEW_HASH(a)  NEW_NODE(NODE_HASH,a,0,0)
+#define NEW_NOT(a)   NEW_NODE(NODE_NOT,0,a,0)
+#define NEW_MASGN(l,r)   NEW_NODE(NODE_MASGN,l,0,r)
+#define NEW_GASGN(v,val) NEW_NODE(NODE_GASGN,v,val,rb_global_entry(v))
+#define NEW_LASGN(v,val) NEW_NODE(NODE_LASGN,v,val,local_cnt(v))
+#define NEW_DASGN(v,val) NEW_NODE(NODE_DASGN,v,val,0)
+#define NEW_DASGN_CURR(v,val) NEW_NODE(NODE_DASGN_CURR,v,val,0)
+#define NEW_IASGN(v,val) NEW_NODE(NODE_IASGN,v,val,0)
+#define NEW_CDECL(v,val,path) NEW_NODE(NODE_CDECL,v,val,path)
+#define NEW_CVASGN(v,val) NEW_NODE(NODE_CVASGN,v,val,0)
+#define NEW_CVDECL(v,val) NEW_NODE(NODE_CVDECL,v,val,0)
+#define NEW_OP_ASGN1(p,id,a) NEW_NODE(NODE_OP_ASGN1,p,id,a)
+#define NEW_OP_ASGN2(r,i,o,val) NEW_NODE(NODE_OP_ASGN2,r,val,NEW_OP_ASGN22(i,o))
+#define NEW_OP_ASGN22(i,o) NEW_NODE(NODE_OP_ASGN2,i,o,rb_id_attrset(i))
+#define NEW_OP_ASGN_OR(i,val) NEW_NODE(NODE_OP_ASGN_OR,i,val,0)
+#define NEW_OP_ASGN_AND(i,val) NEW_NODE(NODE_OP_ASGN_AND,i,val,0)
+#define NEW_GVAR(v) NEW_NODE(NODE_GVAR,v,0,rb_global_entry(v))
+#define NEW_LVAR(v) NEW_NODE(NODE_LVAR,v,0,local_cnt(v))
+#define NEW_DVAR(v) NEW_NODE(NODE_DVAR,v,0,0)
+#define NEW_IVAR(v) NEW_NODE(NODE_IVAR,v,0,0)
+#define NEW_CONST(v) NEW_NODE(NODE_CONST,v,0,0)
+#define NEW_CVAR(v) NEW_NODE(NODE_CVAR,v,0,0)
+#define NEW_NTH_REF(n)  NEW_NODE(NODE_NTH_REF,0,n,local_cnt('~'))
+#define NEW_BACK_REF(n) NEW_NODE(NODE_BACK_REF,0,n,local_cnt('~'))
+#define NEW_MATCH(c) NEW_NODE(NODE_MATCH,c,0,0)
+#define NEW_MATCH2(n1,n2) NEW_NODE(NODE_MATCH2,n1,n2,0)
+#define NEW_MATCH3(r,n2) NEW_NODE(NODE_MATCH3,r,n2,0)
+#define NEW_LIT(l) NEW_NODE(NODE_LIT,l,0,0)
+#define NEW_STR(s) NEW_NODE(NODE_STR,s,0,0)
+#define NEW_DSTR(s) NEW_NODE(NODE_DSTR,s,1,0)
+#define NEW_XSTR(s) NEW_NODE(NODE_XSTR,s,0,0)
+#define NEW_DXSTR(s) NEW_NODE(NODE_DXSTR,s,0,0)
+#define NEW_DSYM(s) NEW_NODE(NODE_DSYM,s,0,0)
+#define NEW_EVSTR(n) NEW_NODE(NODE_EVSTR,0,(n),0)
+#define NEW_CALL(r,m,a) NEW_NODE(NODE_CALL,r,m,a)
+#define NEW_FCALL(m,a) NEW_NODE(NODE_FCALL,0,m,a)
+#define NEW_VCALL(m) NEW_NODE(NODE_VCALL,0,m,0)
+#define NEW_SUPER(a) NEW_NODE(NODE_SUPER,0,0,a)
+#define NEW_ZSUPER() NEW_NODE(NODE_ZSUPER,0,0,0)
+#define NEW_ARGS(f,o,r) NEW_NODE(NODE_ARGS,o,r,f)
+#define NEW_ARGSCAT(a,b) NEW_NODE(NODE_ARGSCAT,a,b,0)
+#define NEW_ARGSPUSH(a,b) NEW_NODE(NODE_ARGSPUSH,a,b,0)
+#define NEW_SPLAT(a) NEW_NODE(NODE_SPLAT,a,0,0)
+#define NEW_TO_ARY(a) NEW_NODE(NODE_TO_ARY,a,0,0)
+#define NEW_SVALUE(a) NEW_NODE(NODE_SVALUE,a,0,0)
+#define NEW_BLOCK_ARG(v) NEW_NODE(NODE_BLOCK_ARG,v,0,local_cnt(v))
+#define NEW_BLOCK_PASS(b) NEW_NODE(NODE_BLOCK_PASS,0,b,0)
+#define NEW_ALIAS(n,o) NEW_NODE(NODE_ALIAS,n,o,0)
+#define NEW_VALIAS(n,o) NEW_NODE(NODE_VALIAS,n,o,0)
+#define NEW_UNDEF(i) NEW_NODE(NODE_UNDEF,0,i,0)
+#define NEW_CLASS(n,b,s) NEW_NODE(NODE_CLASS,n,NEW_SCOPE(b),(s))
+#define NEW_SCLASS(r,b) NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(b),0)
+#define NEW_MODULE(n,b) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(b),0)
+#define NEW_COLON2(c,i) NEW_NODE(NODE_COLON2,c,i,0)
+#define NEW_COLON3(i) NEW_NODE(NODE_COLON3,0,i,0)
+#define NEW_CREF(c) (NEW_NODE(NODE_CREF,0,0,c))
+#define NEW_DOT2(b,e) NEW_NODE(NODE_DOT2,b,e,0)
+#define NEW_DOT3(b,e) NEW_NODE(NODE_DOT3,b,e,0)
+#define NEW_ATTRSET(a) NEW_NODE(NODE_ATTRSET,a,0,0)
+#define NEW_SELF() NEW_NODE(NODE_SELF,0,0,0)
+#define NEW_NIL() NEW_NODE(NODE_NIL,0,0,0)
+#define NEW_TRUE() NEW_NODE(NODE_TRUE,0,0,0)
+#define NEW_FALSE() NEW_NODE(NODE_FALSE,0,0,0)
+#define NEW_DEFINED(e) NEW_NODE(NODE_DEFINED,e,0,0)
+#define NEW_NEWLINE(n) NEW_NODE(NODE_NEWLINE,0,0,n)
+#define NEW_PREEXE(b) NEW_SCOPE(b)
+#define NEW_POSTEXE() NEW_NODE(NODE_POSTEXE,0,0,0)
+#define NEW_DMETHOD(b) NEW_NODE(NODE_DMETHOD,0,0,b)
+#define NEW_BMETHOD(b) NEW_NODE(NODE_BMETHOD,0,0,b)
+#define NEW_ATTRASGN(r,m,a) NEW_NODE(NODE_ATTRASGN,r,m,a)
+
+#define NOEX_PUBLIC    0
+#define NOEX_NOSUPER   1
+#define NOEX_PRIVATE   2
+#define NOEX_PROTECTED 4
+#define NOEX_MASK      6
+
+#define NOEX_UNDEF     NOEX_NOSUPER
+
+NODE *rb_compile_cstr _((const char*, const char*, int, int));
+NODE *rb_compile_string _((const char*, VALUE, int));
+NODE *rb_compile_file _((const char*, VALUE, int));
+
+void rb_add_method _((VALUE, ID, NODE *, int));
+NODE *rb_node_newnode _((enum node_type,VALUE,VALUE,VALUE));
+
+NODE* rb_method_node _((VALUE klass, ID id));
+
+struct global_entry *rb_global_entry _((ID));
+VALUE rb_gvar_get _((struct global_entry *));
+VALUE rb_gvar_set _((struct global_entry *, VALUE));
+VALUE rb_gvar_defined _((struct global_entry *));
+
+typedef unsigned int rb_event_t;
+
+#define RUBY_EVENT_NONE     0x00
+#define RUBY_EVENT_LINE     0x01
+#define RUBY_EVENT_CLASS    0x02
+#define RUBY_EVENT_END      0x04
+#define RUBY_EVENT_CALL     0x08
+#define RUBY_EVENT_RETURN   0x10
+#define RUBY_EVENT_C_CALL   0x20
+#define RUBY_EVENT_C_RETURN 0x40
+#define RUBY_EVENT_RAISE    0x80
+#define RUBY_EVENT_ALL      0xff
+
+typedef void (*rb_event_hook_func_t) _((rb_event_t,NODE*,VALUE,ID,VALUE));
+void rb_add_event_hook _((rb_event_hook_func_t,rb_event_t));
+int rb_remove_event_hook _((rb_event_hook_func_t));
+
+#if defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT)
+#include <ucontext.h>
+#define USE_CONTEXT
+#endif
+#include <setjmp.h>
+#include "st.h"
+
+#ifdef USE_CONTEXT
+typedef struct {
+    ucontext_t context;
+    volatile int status;
+} rb_jmpbuf_t[1];
+#else
+typedef jmp_buf rb_jmpbuf_t;
+#endif
+
+enum rb_thread_status {
+    THREAD_TO_KILL,
+    THREAD_RUNNABLE,
+    THREAD_STOPPED,
+    THREAD_KILLED,
+};
+
+typedef struct rb_thread *rb_thread_t;
+
+struct rb_thread {
+    rb_thread_t next, prev;
+    rb_jmpbuf_t context;
+#if (defined _WIN32 && !defined _WIN32_WCE) || defined __CYGWIN__
+    unsigned long win32_exception_list;
+#endif
+
+    VALUE result;
+
+    long   stk_len;
+    long   stk_max;
+    VALUE *stk_ptr;
+    VALUE *stk_pos;
+#ifdef __ia64
+    long   bstr_len;
+    long   bstr_max;
+    VALUE *bstr_ptr;
+    VALUE *bstr_pos;
+#endif
+
+    struct FRAME *frame;
+    struct SCOPE *scope;
+    struct RVarmap *dyna_vars;
+    struct BLOCK *block;
+    struct iter *iter;
+    struct tag *tag;
+    VALUE klass;
+    VALUE wrapper;
+    NODE *cref;
+
+    int flags;		/* misc. states (vmode/rb_trap_immediate/raised) */
+
+    NODE *node;
+
+    int tracing;
+    VALUE errinfo;
+    VALUE last_status;
+    VALUE last_line;
+    VALUE last_match;
+
+    int safe;
+
+    enum rb_thread_status status;
+    int wait_for;
+    int fd;
+    fd_set readfds;
+    fd_set writefds;
+    fd_set exceptfds;
+    int select_value;
+    double delay;
+    rb_thread_t join;
+
+    int abort;
+    int priority;
+    VALUE thgroup;
+
+    struct st_table *locals;
+
+    VALUE thread;
+
+    VALUE sandbox;
+};
+
+extern VALUE (*ruby_sandbox_save)_((rb_thread_t));
+extern VALUE (*ruby_sandbox_restore)_((rb_thread_t));
+extern rb_thread_t rb_curr_thread;
+extern rb_thread_t rb_main_thread;
+
+#if defined(__cplusplus)
+}  /* extern "C" { */
+#endif
+
+#endif
diff --git a/ruby_1_8_6/numeric.c b/ruby_1_8_6/numeric.c
new file mode 100644
index 0000000000..51a1fb2337
--- /dev/null
+++ b/ruby_1_8_6/numeric.c
@@ -0,0 +1,2984 @@
+/**********************************************************************
+
+  numeric.c -
+
+  $Author$
+  $Date$
+  created at: Fri Aug 13 18:33:09 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "env.h"
+#include <ctype.h>
+#include <math.h>
+#include <stdio.h>
+
+#if defined(__FreeBSD__) && __FreeBSD__ < 4
+#include <floatingpoint.h>
+#endif
+
+#ifdef HAVE_FLOAT_H
+#include <float.h>
+#endif
+
+#ifdef HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
+
+/* use IEEE 64bit values if not defined */
+#ifndef FLT_RADIX
+#define FLT_RADIX 2
+#endif
+#ifndef FLT_ROUNDS
+#define FLT_ROUNDS 1
+#endif
+#ifndef DBL_MIN
+#define DBL_MIN 2.2250738585072014e-308
+#endif
+#ifndef DBL_MAX
+#define DBL_MAX 1.7976931348623157e+308
+#endif
+#ifndef DBL_MIN_EXP
+#define DBL_MIN_EXP (-1021)
+#endif
+#ifndef DBL_MAX_EXP
+#define DBL_MAX_EXP 1024
+#endif
+#ifndef DBL_MIN_10_EXP
+#define DBL_MIN_10_EXP (-307)
+#endif
+#ifndef DBL_MAX_10_EXP
+#define DBL_MAX_10_EXP 308
+#endif
+#ifndef DBL_DIG
+#define DBL_DIG 15
+#endif
+#ifndef DBL_MANT_DIG
+#define DBL_MANT_DIG 53
+#endif
+#ifndef DBL_EPSILON
+#define DBL_EPSILON 2.2204460492503131e-16
+#endif
+
+static ID id_coerce, id_to_i, id_eq;
+
+VALUE rb_cNumeric;
+VALUE rb_cFloat;
+VALUE rb_cInteger;
+VALUE rb_cFixnum;
+
+VALUE rb_eZeroDivError;
+VALUE rb_eFloatDomainError;
+
+void
+rb_num_zerodiv()
+{
+    rb_raise(rb_eZeroDivError, "divided by 0");
+}
+
+
+/*
+ *  call-seq:
+ *     num.coerce(numeric)   => array
+ *  
+ *  If <i>aNumeric</i> is the same type as <i>num</i>, returns an array
+ *  containing <i>aNumeric</i> and <i>num</i>. Otherwise, returns an
+ *  array with both <i>aNumeric</i> and <i>num</i> represented as
+ *  <code>Float</code> objects. This coercion mechanism is used by
+ *  Ruby to handle mixed-type numeric operations: it is intended to
+ *  find a compatible common type between the two operands of the operator.
+ *     
+ *     1.coerce(2.5)   #=> [2.5, 1.0]
+ *     1.2.coerce(3)   #=> [3.0, 1.2]
+ *     1.coerce(2)     #=> [2, 1]
+ */
+
+static VALUE
+num_coerce(x, y)
+    VALUE x, y;
+{
+    if (CLASS_OF(x) == CLASS_OF(y))
+	return rb_assoc_new(y, x);
+    return rb_assoc_new(rb_Float(y), rb_Float(x));
+}
+
+static VALUE
+coerce_body(x)
+    VALUE *x;
+{
+    return rb_funcall(x[1], id_coerce, 1, x[0]);
+}
+
+static VALUE
+coerce_rescue(x)
+    VALUE *x;
+{
+    volatile VALUE v = rb_inspect(x[1]);
+
+    rb_raise(rb_eTypeError, "%s can't be coerced into %s",
+	     rb_special_const_p(x[1])?
+	     RSTRING(v)->ptr:
+	     rb_obj_classname(x[1]),
+	     rb_obj_classname(x[0]));
+    return Qnil;		/* dummy */
+}
+
+static int
+do_coerce(x, y, err)
+    VALUE *x, *y;
+    int err;
+{
+    VALUE ary;
+    VALUE a[2];
+
+    a[0] = *x; a[1] = *y;
+
+    ary = rb_rescue(coerce_body, (VALUE)a, err?coerce_rescue:0, (VALUE)a);
+    if (TYPE(ary) != T_ARRAY || RARRAY(ary)->len != 2) {
+	if (err) {
+	    rb_raise(rb_eTypeError, "coerce must return [x, y]");
+	}
+	return Qfalse;
+    }
+
+    *x = RARRAY(ary)->ptr[0];
+    *y = RARRAY(ary)->ptr[1];
+    return Qtrue;
+}
+
+VALUE
+rb_num_coerce_bin(x, y)
+    VALUE x, y;
+{
+    do_coerce(&x, &y, Qtrue);
+    return rb_funcall(x, ruby_frame->orig_func, 1, y);
+}
+
+VALUE
+rb_num_coerce_cmp(x, y)
+    VALUE x, y;
+{
+    if (do_coerce(&x, &y, Qfalse)) 
+	return rb_funcall(x, ruby_frame->orig_func, 1, y);
+    return Qnil;
+}
+
+VALUE
+rb_num_coerce_relop(x, y)
+    VALUE x, y;
+{
+    VALUE c, x0 = x, y0 = y;
+
+    if (!do_coerce(&x, &y, Qfalse) ||
+	NIL_P(c = rb_funcall(x, ruby_frame->orig_func, 1, y))) {
+	rb_cmperr(x0, y0);
+	return Qnil;		/* not reached */
+    }
+    return c;
+}
+
+/*
+ * Trap attempts to add methods to <code>Numeric</code> objects. Always
+ * raises a <code>TypeError</code>
+ */
+
+static VALUE
+num_sadded(x, name)
+    VALUE x, name;
+{
+    ruby_frame = ruby_frame->prev; /* pop frame for "singleton_method_added" */
+    /* Numerics should be values; singleton_methods should not be added to them */
+    rb_raise(rb_eTypeError,
+	     "can't define singleton method \"%s\" for %s",
+	     rb_id2name(rb_to_id(name)),
+	     rb_obj_classname(x)); 
+    return Qnil;		/* not reached */
+}
+
+/* :nodoc: */
+static VALUE
+num_init_copy(x, y)
+    VALUE x, y;
+{
+    /* Numerics are immutable values, which should not be copied */
+    rb_raise(rb_eTypeError, "can't copy %s", rb_obj_classname(x));
+    return Qnil;		/* not reached */
+}
+
+/*
+ *  call-seq:
+ *     +num    => num
+ *  
+ *  Unary Plus---Returns the receiver's value.
+ */
+
+static VALUE
+num_uplus(num)
+    VALUE num;
+{
+    return num;
+}
+
+/*
+ *  call-seq:
+ *     -num    => numeric
+ *  
+ *  Unary Minus---Returns the receiver's value, negated.
+ */
+
+static VALUE
+num_uminus(num)
+    VALUE num;
+{
+    VALUE zero;
+
+    zero = INT2FIX(0);
+    do_coerce(&zero, &num, Qtrue);
+
+    return rb_funcall(zero, '-', 1, num);
+}
+
+/*
+ *  call-seq:
+ *     num.quo(numeric)    =>   result
+ *  
+ *  Equivalent to <code>Numeric#/</code>, but overridden in subclasses.
+ */
+
+static VALUE
+num_quo(x, y)
+    VALUE x, y;
+{
+    return rb_funcall(x, '/', 1, y);
+}
+
+
+static VALUE num_floor(VALUE num);
+
+/*
+ *  call-seq:
+ *     num.div(numeric)    => integer
+ *  
+ *  Uses <code>/</code> to perform division, then converts the result to
+ *  an integer. <code>Numeric</code> does not define the <code>/</code>
+ *  operator; this is left to subclasses.
+ */
+
+static VALUE
+num_div(x, y)
+    VALUE x, y;
+{
+    return num_floor(rb_funcall(x, '/', 1, y));
+}
+
+
+
+/*
+ *  call-seq:
+ *     num.divmod( aNumeric ) -> anArray
+ *  
+ *  Returns an array containing the quotient and modulus obtained by
+ *  dividing <i>num</i> by <i>aNumeric</i>. If <code>q, r =
+ *  x.divmod(y)</code>, then
+ *
+ *      q = floor(float(x)/float(y))
+ *      x = q*y + r
+ *     
+ *  The quotient is rounded toward -infinity, as shown in the following table:
+ *     
+ *     a    |  b  |  a.divmod(b)  |   a/b   | a.modulo(b) | a.remainder(b)
+ *    ------+-----+---------------+---------+-------------+---------------
+ *     13   |  4  |   3,    1     |   3     |    1        |     1
+ *    ------+-----+---------------+---------+-------------+---------------
+ *     13   | -4  |  -4,   -3     |  -3     |   -3        |     1
+ *    ------+-----+---------------+---------+-------------+---------------
+ *    -13   |  4  |  -4,    3     |  -4     |    3        |    -1
+ *    ------+-----+---------------+---------+-------------+---------------
+ *    -13   | -4  |   3,   -1     |   3     |   -1        |    -1
+ *    ------+-----+---------------+---------+-------------+---------------
+ *     11.5 |  4  |   2,    3.5   |   2.875 |    3.5      |     3.5
+ *    ------+-----+---------------+---------+-------------+---------------
+ *     11.5 | -4  |  -3,   -0.5   |  -2.875 |   -0.5      |     3.5
+ *    ------+-----+---------------+---------+-------------+---------------
+ *    -11.5 |  4  |  -3,    0.5   |  -2.875 |    0.5      |    -3.5
+ *    ------+-----+---------------+---------+-------------+---------------
+ *    -11.5 | -4  |   2    -3.5   |   2.875 |   -3.5      |    -3.5
+ *
+ *
+ *  Examples
+ *     11.divmod(3)         #=> [3, 2]
+ *     11.divmod(-3)        #=> [-4, -1]
+ *     11.divmod(3.5)       #=> [3, 0.5]
+ *     (-11).divmod(3.5)    #=> [-4, 3.0]
+ *     (11.5).divmod(3.5)   #=> [3, 1.0]
+ */
+
+static VALUE
+num_divmod(x, y)
+    VALUE x, y;
+{
+    return rb_assoc_new(num_div(x, y), rb_funcall(x, '%', 1, y));
+}
+
+/*
+ *  call-seq:
+ *     num.modulo(numeric)    => result
+ *  
+ *  Equivalent to
+ *  <i>num</i>.<code>divmod(</code><i>aNumeric</i><code>)[1]</code>.
+ */
+
+static VALUE
+num_modulo(x, y)
+    VALUE x, y;
+{
+    return rb_funcall(x, '%', 1, y);
+}
+
+/*
+ *  call-seq:
+ *     num.remainder(numeric)    => result
+ *  
+ *  If <i>num</i> and <i>numeric</i> have different signs, returns
+ *  <em>mod</em>-<i>numeric</i>; otherwise, returns <em>mod</em>. In
+ *  both cases <em>mod</em> is the value
+ *  <i>num</i>.<code>modulo(</code><i>numeric</i><code>)</code>. The
+ *  differences between <code>remainder</code> and modulo
+ *  (<code>%</code>) are shown in the table under <code>Numeric#divmod</code>.
+ */
+
+static VALUE
+num_remainder(x, y)
+    VALUE x, y;
+{
+    VALUE z = rb_funcall(x, '%', 1, y);
+
+    if ((!rb_equal(z, INT2FIX(0))) &&
+	((RTEST(rb_funcall(x, '<', 1, INT2FIX(0))) &&
+	  RTEST(rb_funcall(y, '>', 1, INT2FIX(0)))) ||
+	 (RTEST(rb_funcall(x, '>', 1, INT2FIX(0))) &&
+	  RTEST(rb_funcall(y, '<', 1, INT2FIX(0)))))) {
+	return rb_funcall(z, '-', 1, y);
+    }
+    return z;
+}
+
+/*
+ *  call-seq:
+ *     num.integer? -> true or false
+ *  
+ *  Returns <code>true</code> if <i>num</i> is an <code>Integer</code>
+ *  (including <code>Fixnum</code> and <code>Bignum</code>).
+ */
+
+static VALUE
+num_int_p(num)
+    VALUE num;
+{
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     num.abs   => num or numeric
+ *  
+ *  Returns the absolute value of <i>num</i>.
+ *     
+ *     12.abs         #=> 12
+ *     (-34.56).abs   #=> 34.56
+ *     -34.56.abs     #=> 34.56
+ */
+
+static VALUE
+num_abs(num)
+    VALUE num;
+{
+    if (RTEST(rb_funcall(num, '<', 1, INT2FIX(0)))) {
+	return rb_funcall(num, rb_intern("-@"), 0);
+    }
+    return num;
+}
+
+
+/*
+ *  call-seq:
+ *     num.zero?    => true or false
+ *  
+ *  Returns <code>true</code> if <i>num</i> has a zero value.
+ */
+
+static VALUE
+num_zero_p(num)
+    VALUE num;
+{
+    if (rb_equal(num, INT2FIX(0))) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     num.nonzero?    => num or nil
+ *  
+ *  Returns <i>num</i> if <i>num</i> is not zero, <code>nil</code>
+ *  otherwise. This behavior is useful when chaining comparisons:
+ *     
+ *     a = %w( z Bb bB bb BB a aA Aa AA A )
+ *     b = a.sort {|a,b| (a.downcase <=> b.downcase).nonzero? || a <=> b }
+ *     b   #=> ["A", "a", "AA", "Aa", "aA", "BB", "Bb", "bB", "bb", "z"]
+ */
+
+static VALUE
+num_nonzero_p(num)
+    VALUE num;
+{
+    if (RTEST(rb_funcall(num, rb_intern("zero?"), 0, 0))) {
+	return Qnil;
+    }
+    return num;
+}
+
+/*
+ *  call-seq:
+ *     num.to_int    => integer
+ *  
+ *  Invokes the child class's <code>to_i</code> method to convert
+ *  <i>num</i> to an integer.
+ */
+
+static VALUE
+num_to_int(num)
+    VALUE num;
+{
+    return rb_funcall(num, id_to_i, 0, 0);
+}
+
+
+/********************************************************************
+ * 
+ * Document-class: Float
+ *
+ *  <code>Float</code> objects represent real numbers using the native
+ *  architecture's double-precision floating point representation.
+ */
+
+VALUE
+rb_float_new(d)
+    double d;
+{
+    NEWOBJ(flt, struct RFloat);
+    OBJSETUP(flt, rb_cFloat, T_FLOAT);
+
+    flt->value = d;
+    return (VALUE)flt;
+}
+
+/*
+ *  call-seq:
+ *     flt.to_s    => string
+ *  
+ *  Returns a string containing a representation of self. As well as a
+ *  fixed or exponential form of the number, the call may return
+ *  ``<code>NaN</code>'', ``<code>Infinity</code>'', and
+ *  ``<code>-Infinity</code>''.
+ */
+
+static VALUE
+flo_to_s(flt)
+    VALUE flt;
+{
+    char buf[32];
+    double value = RFLOAT(flt)->value;
+    char *p, *e;
+
+    if (isinf(value))
+	return rb_str_new2(value < 0 ? "-Infinity" : "Infinity");
+    else if(isnan(value))
+	return rb_str_new2("NaN");
+
+    sprintf(buf, "%#.15g", value); /* ensure to print decimal point */
+    if (!(e = strchr(buf, 'e'))) {
+	e = buf + strlen(buf);
+    }
+    if (!ISDIGIT(e[-1])) { /* reformat if ended with decimal point (ex 111111111111111.) */
+	sprintf(buf, "%#.14e", value);
+	if (!(e = strchr(buf, 'e'))) {
+	    e = buf + strlen(buf);
+	}
+    }
+    p = e;
+    while (p[-1]=='0' && ISDIGIT(p[-2]))
+	p--;
+    memmove(p, e, strlen(e)+1);
+    return rb_str_new2(buf);
+}
+
+/*
+ * MISSING: documentation
+ */
+
+static VALUE
+flo_coerce(x, y)
+    VALUE x, y;
+{
+    return rb_assoc_new(rb_Float(y), x);
+}
+
+/*
+ * call-seq:
+ *    -float   => float
+ *
+ * Returns float, negated.
+ */
+
+static VALUE
+flo_uminus(flt)
+    VALUE flt;
+{
+    return rb_float_new(-RFLOAT(flt)->value);
+}
+
+/*
+ * call-seq:
+ *   float + other   => float
+ *
+ * Returns a new float which is the sum of <code>float</code>
+ * and <code>other</code>.
+ */
+
+static VALUE
+flo_plus(x, y)
+    VALUE x, y;
+{
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	return rb_float_new(RFLOAT(x)->value + (double)FIX2LONG(y));
+      case T_BIGNUM:
+	return rb_float_new(RFLOAT(x)->value + rb_big2dbl(y));
+      case T_FLOAT:
+	return rb_float_new(RFLOAT(x)->value + RFLOAT(y)->value);
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+}
+
+/*
+ * call-seq:
+ *   float + other   => float
+ *
+ * Returns a new float which is the difference of <code>float</code>
+ * and <code>other</code>.
+ */
+
+static VALUE
+flo_minus(x, y)
+    VALUE x, y;
+{
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	return rb_float_new(RFLOAT(x)->value - (double)FIX2LONG(y));
+      case T_BIGNUM:
+	return rb_float_new(RFLOAT(x)->value - rb_big2dbl(y));
+      case T_FLOAT:
+	return rb_float_new(RFLOAT(x)->value - RFLOAT(y)->value);
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+}
+
+/*
+ * call-seq:
+ *   float * other   => float
+ *
+ * Returns a new float which is the product of <code>float</code>
+ * and <code>other</code>.
+ */
+
+static VALUE
+flo_mul(x, y)
+    VALUE x, y;
+{
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	return rb_float_new(RFLOAT(x)->value * (double)FIX2LONG(y));
+      case T_BIGNUM:
+	return rb_float_new(RFLOAT(x)->value * rb_big2dbl(y));
+      case T_FLOAT:
+	return rb_float_new(RFLOAT(x)->value * RFLOAT(y)->value);
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+}
+
+/*
+ * call-seq:
+ *   float / other   => float
+ *
+ * Returns a new float which is the result of dividing
+ * <code>float</code> by <code>other</code>.
+ */
+
+static VALUE
+flo_div(x, y)
+    VALUE x, y;
+{
+    long f_y;
+    double d;
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	f_y = FIX2LONG(y);
+	return rb_float_new(RFLOAT(x)->value / (double)f_y);
+      case T_BIGNUM:
+	d = rb_big2dbl(y);
+	return rb_float_new(RFLOAT(x)->value / d);
+      case T_FLOAT:
+	return rb_float_new(RFLOAT(x)->value / RFLOAT(y)->value);
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+}
+
+
+static void
+flodivmod(x, y, divp, modp)
+    double x, y;
+    double *divp, *modp;
+{
+    double div, mod;
+
+#ifdef HAVE_FMOD
+    mod = fmod(x, y);
+#else
+    {
+	double z;
+
+	modf(x/y, &z);
+	mod = x - z * y;
+    }
+#endif
+    div = (x - mod) / y;
+    if (y*mod < 0) {
+	mod += y;
+	div -= 1.0;
+    }
+    if (modp) *modp = mod;
+    if (divp) *divp = div;
+}
+
+
+/*
+ *  call-seq:
+ *     flt % other         => float
+ *     flt.modulo(other)   => float
+ *  
+ *  Return the modulo after division of <code>flt</code> by <code>other</code>.
+ *     
+ *     6543.21.modulo(137)      #=> 104.21
+ *     6543.21.modulo(137.24)   #=> 92.9299999999996
+ */
+
+static VALUE
+flo_mod(x, y)
+    VALUE x, y;
+{
+    double fy, mod;
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	fy = (double)FIX2LONG(y);
+	break;
+      case T_BIGNUM:
+	fy = rb_big2dbl(y);
+	break;
+      case T_FLOAT:
+	fy = RFLOAT(y)->value;
+	break;
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+    flodivmod(RFLOAT(x)->value, fy, 0, &mod);
+    return rb_float_new(mod);
+}
+
+/*
+ *  call-seq:
+ *     flt.divmod(numeric)    => array
+ *  
+ *  See <code>Numeric#divmod</code>.
+ */
+
+static VALUE
+flo_divmod(x, y)
+    VALUE x, y;
+{
+    double fy, div, mod, val;
+    volatile VALUE a, b;
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	fy = (double)FIX2LONG(y);
+	break;
+      case T_BIGNUM:
+	fy = rb_big2dbl(y);
+	break;
+      case T_FLOAT:
+	fy = RFLOAT(y)->value;
+	break;
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+    flodivmod(RFLOAT(x)->value, fy, &div, &mod);
+    if (FIXABLE(div)) {
+        val = div;
+        a = LONG2FIX(val);
+    }
+    else {
+        a = rb_dbl2big(div);
+    }
+    b = rb_float_new(mod);
+    return rb_assoc_new(a, b);
+}
+
+/*
+ * call-seq:
+ *
+ *  flt ** other   => float
+ *
+ * Raises <code>float</code> the <code>other</code> power.
+ */
+ 
+static VALUE
+flo_pow(x, y)
+    VALUE x, y;
+{
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+        return rb_float_new(pow(RFLOAT(x)->value, (double)FIX2LONG(y)));
+      case T_BIGNUM:
+	return rb_float_new(pow(RFLOAT(x)->value, rb_big2dbl(y)));
+      case T_FLOAT:
+        return rb_float_new(pow(RFLOAT(x)->value, RFLOAT(y)->value));
+      default:
+        return rb_num_coerce_bin(x, y);
+    }
+}
+
+/*
+ *  call-seq:
+ *     num.eql?(numeric)    => true or false
+ *  
+ *  Returns <code>true</code> if <i>num</i> and <i>numeric</i> are the
+ *  same type and have equal values.
+ *     
+ *     1 == 1.0          #=> true
+ *     1.eql?(1.0)       #=> false
+ *     (1.0).eql?(1.0)   #=> true
+ */
+
+static VALUE
+num_eql(x, y)
+    VALUE x, y;
+{
+    if (TYPE(x) != TYPE(y)) return Qfalse;
+
+    return rb_equal(x, y);
+}
+
+/*
+ *  call-seq:
+ *     num <=> other -> 0 or nil
+ *  
+ *  Returns zero if <i>num</i> equals <i>other</i>, <code>nil</code>
+ *  otherwise.
+ */
+
+static VALUE
+num_cmp(x, y)
+    VALUE x, y;
+{
+    if (x == y) return INT2FIX(0);
+    return Qnil;
+}
+
+static VALUE
+num_equal(x, y)
+    VALUE x, y;
+{
+    if (x == y) return Qtrue;
+    return rb_funcall(y, id_eq, 1, x);
+}
+
+/*
+ *  call-seq:
+ *     flt == obj   => true or false
+ *  
+ *  Returns <code>true</code> only if <i>obj</i> has the same value
+ *  as <i>flt</i>. Contrast this with <code>Float#eql?</code>, which
+ *  requires <i>obj</i> to be a <code>Float</code>.
+ *     
+ *     1.0 == 1   #=> true
+ *     
+ */
+
+static VALUE
+flo_eq(x, y)
+    VALUE x, y;
+{
+    volatile double a, b;
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	b = FIX2LONG(y);
+	break;
+      case T_BIGNUM:
+	b = rb_big2dbl(y);
+	break;
+      case T_FLOAT:
+	b = RFLOAT(y)->value;
+	if (isnan(b)) return Qfalse;
+	break;
+      default:
+	return num_equal(x, y);
+    }
+    a = RFLOAT(x)->value;
+    if (isnan(a)) return Qfalse;
+    return (a == b)?Qtrue:Qfalse;
+}
+
+/*
+ * call-seq:
+ *   flt.hash   => integer
+ *
+ * Returns a hash code for this float.
+ */
+
+static VALUE
+flo_hash(num)
+    VALUE num;
+{
+    double d;
+    char *c;
+    int i, hash;
+
+    d = RFLOAT(num)->value;
+    if (d == 0) d = fabs(d);
+    c = (char*)&d;
+    for (hash=0, i=0; i<sizeof(double);i++) {
+	hash = (hash * 971) ^ (unsigned char)c[i];
+    }
+    if (hash < 0) hash = -hash;
+    return INT2FIX(hash);
+}
+
+VALUE
+rb_dbl_cmp(a, b)
+    double a, b;
+{
+    if (isnan(a) || isnan(b)) return Qnil;
+    if (a == b) return INT2FIX(0);
+    if (a > b) return INT2FIX(1);
+    if (a < b) return INT2FIX(-1);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     flt <=> numeric   => -1, 0, +1
+ *  
+ *  Returns -1, 0, or +1 depending on whether <i>flt</i> is less than,
+ *  equal to, or greater than <i>numeric</i>. This is the basis for the
+ *  tests in <code>Comparable</code>.
+ */
+
+static VALUE
+flo_cmp(x, y)
+    VALUE x, y;
+{
+    double a, b;
+
+    a = RFLOAT(x)->value;
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	b = (double)FIX2LONG(y);
+	break;
+
+      case T_BIGNUM:
+	b = rb_big2dbl(y);
+	break;
+
+      case T_FLOAT:
+	b = RFLOAT(y)->value;
+	break;
+
+      default:
+	return rb_num_coerce_cmp(x, y);
+    }
+    return rb_dbl_cmp(a, b);
+}
+
+/*
+ * call-seq:
+ *   flt > other    =>  true or false
+ *
+ * <code>true</code> if <code>flt</code> is greater than <code>other</code>.
+ */
+
+static VALUE
+flo_gt(x, y)
+    VALUE x, y;
+{
+    double a, b;
+
+    a = RFLOAT(x)->value;
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	b = (double)FIX2LONG(y);
+	break;
+
+      case T_BIGNUM:
+	b = rb_big2dbl(y);
+	break;
+
+      case T_FLOAT:
+	b = RFLOAT(y)->value;
+	if (isnan(b)) return Qfalse;
+	break;
+
+      default:
+	return rb_num_coerce_relop(x, y);
+    }
+    if (isnan(a)) return Qfalse;
+    return (a > b)?Qtrue:Qfalse;
+}
+
+/*
+ * call-seq:
+ *   flt >= other    =>  true or false
+ *
+ * <code>true</code> if <code>flt</code> is greater than 
+ * or equal to <code>other</code>.
+ */
+
+static VALUE
+flo_ge(x, y)
+    VALUE x, y;
+{
+    double a, b;
+
+    a = RFLOAT(x)->value;
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	b = (double)FIX2LONG(y);
+	break;
+
+      case T_BIGNUM:
+	b = rb_big2dbl(y);
+	break;
+
+      case T_FLOAT:
+	b = RFLOAT(y)->value;
+	if (isnan(b)) return Qfalse;
+	break;
+
+      default:
+	return rb_num_coerce_relop(x, y);
+    }
+    if (isnan(a)) return Qfalse;
+    return (a >= b)?Qtrue:Qfalse;
+}
+
+/*
+ * call-seq:
+ *   flt < other    =>  true or false
+ *
+ * <code>true</code> if <code>flt</code> is less than <code>other</code>.
+ */
+
+static VALUE
+flo_lt(x, y)
+    VALUE x, y;
+{
+    double a, b;
+
+    a = RFLOAT(x)->value;
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	b = (double)FIX2LONG(y);
+	break;
+
+      case T_BIGNUM:
+	b = rb_big2dbl(y);
+	break;
+
+      case T_FLOAT:
+	b = RFLOAT(y)->value;
+	if (isnan(b)) return Qfalse;
+	break;
+
+      default:
+	return rb_num_coerce_relop(x, y);
+    }
+    if (isnan(a)) return Qfalse;
+    return (a < b)?Qtrue:Qfalse;
+}
+
+/*
+ * call-seq:
+ *   flt <= other    =>  true or false
+ *
+ * <code>true</code> if <code>flt</code> is less than
+ * or equal to <code>other</code>.
+ */
+
+static VALUE
+flo_le(x, y)
+    VALUE x, y;
+{
+    double a, b;
+
+    a = RFLOAT(x)->value;
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	b = (double)FIX2LONG(y);
+	break;
+
+      case T_BIGNUM:
+	b = rb_big2dbl(y);
+	break;
+
+      case T_FLOAT:
+	b = RFLOAT(y)->value;
+	if (isnan(b)) return Qfalse;
+	break;
+
+      default:
+	return rb_num_coerce_relop(x, y);
+    }
+    if (isnan(a)) return Qfalse;
+    return (a <= b)?Qtrue:Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     flt.eql?(obj)   => true or false
+ *  
+ *  Returns <code>true</code> only if <i>obj</i> is a
+ *  <code>Float</code> with the same value as <i>flt</i>. Contrast this
+ *  with <code>Float#==</code>, which performs type conversions.
+ *     
+ *     1.0.eql?(1)   #=> false
+ */
+
+static VALUE
+flo_eql(x, y)
+    VALUE x, y;
+{
+    if (TYPE(y) == T_FLOAT) {
+	double a = RFLOAT(x)->value;
+	double b = RFLOAT(y)->value;
+
+	if (isnan(a) || isnan(b)) return Qfalse;
+	if (a == b) return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *   flt.to_f   => flt
+ *
+ * As <code>flt</code> is already a float, returns <i>self</i>.
+ */
+
+static VALUE
+flo_to_f(num)
+    VALUE num;
+{
+    return num;
+}
+
+/*
+ *  call-seq:
+ *     flt.abs    => float
+ *  
+ *  Returns the absolute value of <i>flt</i>.
+ *     
+ *     (-34.56).abs   #=> 34.56
+ *     -34.56.abs     #=> 34.56
+ *     
+ */
+
+static VALUE
+flo_abs(flt)
+    VALUE flt;
+{
+    double val = fabs(RFLOAT(flt)->value);
+    return rb_float_new(val);
+}
+
+/*
+ *  call-seq:
+ *     flt.zero? -> true or false
+ *  
+ *  Returns <code>true</code> if <i>flt</i> is 0.0.
+ *     
+ */
+
+static VALUE
+flo_zero_p(num)
+    VALUE num;
+{
+    if (RFLOAT(num)->value == 0.0) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     flt.nan? -> true or false
+ *  
+ *  Returns <code>true</code> if <i>flt</i> is an invalid IEEE floating
+ *  point number.
+ *     
+ *     a = -1.0      #=> -1.0
+ *     a.nan?        #=> false
+ *     a = 0.0/0.0   #=> NaN
+ *     a.nan?        #=> true
+ */
+
+static VALUE
+flo_is_nan_p(num)
+     VALUE num;
+{     
+    double value = RFLOAT(num)->value;
+
+    return isnan(value) ? Qtrue : Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     flt.infinite? -> nil, -1, +1
+ *  
+ *  Returns <code>nil</code>, -1, or +1 depending on whether <i>flt</i>
+ *  is finite, -infinity, or +infinity.
+ *     
+ *     (0.0).infinite?        #=> nil
+ *     (-1.0/0.0).infinite?   #=> -1
+ *     (+1.0/0.0).infinite?   #=> 1
+ */
+
+static VALUE
+flo_is_infinite_p(num)
+     VALUE num;
+{     
+    double value = RFLOAT(num)->value;
+
+    if (isinf(value)) {
+	return INT2FIX( value < 0 ? -1 : 1 );
+    }
+
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     flt.finite? -> true or false
+ *  
+ *  Returns <code>true</code> if <i>flt</i> is a valid IEEE floating
+ *  point number (it is not infinite, and <code>nan?</code> is
+ *  <code>false</code>).
+ *     
+ */
+
+static VALUE
+flo_is_finite_p(num)
+     VALUE num;
+{     
+    double value = RFLOAT(num)->value;
+
+#if HAVE_FINITE
+    if (!finite(value))
+	return Qfalse;
+#else
+    if (isinf(value) || isnan(value))
+	return Qfalse;
+#endif
+
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     flt.floor   => integer
+ *  
+ *  Returns the largest integer less than or equal to <i>flt</i>.
+ *     
+ *     1.2.floor      #=> 1
+ *     2.0.floor      #=> 2
+ *     (-1.2).floor   #=> -2
+ *     (-2.0).floor   #=> -2
+ */
+
+static VALUE
+flo_floor(num)
+    VALUE num;
+{
+    double f = floor(RFLOAT(num)->value);
+    long val;
+
+    if (!FIXABLE(f)) {
+	return rb_dbl2big(f);
+    }
+    val = f;
+    return LONG2FIX(val);
+}
+
+/*
+ *  call-seq:
+ *     flt.ceil    => integer
+ *  
+ *  Returns the smallest <code>Integer</code> greater than or equal to
+ *  <i>flt</i>.
+ *     
+ *     1.2.ceil      #=> 2
+ *     2.0.ceil      #=> 2
+ *     (-1.2).ceil   #=> -1
+ *     (-2.0).ceil   #=> -2
+ */
+
+static VALUE
+flo_ceil(num)
+    VALUE num;
+{
+    double f = ceil(RFLOAT(num)->value);
+    long val;
+
+    if (!FIXABLE(f)) {
+	return rb_dbl2big(f);
+    }
+    val = f;
+    return LONG2FIX(val);
+}
+
+/*
+ *  call-seq:
+ *     flt.round   => integer
+ *  
+ *  Rounds <i>flt</i> to the nearest integer. Equivalent to:
+ *     
+ *     def round
+ *       return (self+0.5).floor if self > 0.0
+ *       return (self-0.5).ceil  if self < 0.0
+ *       return 0
+ *     end
+ *     
+ *     1.5.round      #=> 2
+ *     (-1.5).round   #=> -2
+ *     
+ */
+
+static VALUE
+flo_round(num)
+    VALUE num;
+{
+    double f = RFLOAT(num)->value;
+    long val;
+
+    if (f > 0.0) f = floor(f+0.5);
+    if (f < 0.0) f = ceil(f-0.5);
+
+    if (!FIXABLE(f)) {
+	return rb_dbl2big(f);
+    }
+    val = f;
+    return LONG2FIX(val);
+}
+
+/*
+ *  call-seq:
+ *     flt.to_i       => integer
+ *     flt.to_int     => integer
+ *     flt.truncate   => integer
+ *  
+ *  Returns <i>flt</i> truncated to an <code>Integer</code>.
+ */
+
+static VALUE
+flo_truncate(num)
+    VALUE num;
+{
+    double f = RFLOAT(num)->value;
+    long val;
+
+    if (f > 0.0) f = floor(f);
+    if (f < 0.0) f = ceil(f);
+
+    if (!FIXABLE(f)) {
+	return rb_dbl2big(f);
+    }
+    val = f;
+    return LONG2FIX(val);
+}
+
+
+/*
+ *  call-seq:
+ *     num.floor    => integer
+ *  
+ *  Returns the largest integer less than or equal to <i>num</i>.
+ *  <code>Numeric</code> implements this by converting <i>anInteger</i>
+ *  to a <code>Float</code> and invoking <code>Float#floor</code>.
+ *     
+ *     1.floor      #=> 1
+ *     (-1).floor   #=> -1
+ */
+
+static VALUE
+num_floor(num)
+    VALUE num;
+{
+    return flo_floor(rb_Float(num));
+}
+
+
+/*
+ *  call-seq:
+ *     num.ceil    => integer
+ *  
+ *  Returns the smallest <code>Integer</code> greater than or equal to
+ *  <i>num</i>. Class <code>Numeric</code> achieves this by converting
+ *  itself to a <code>Float</code> then invoking
+ *  <code>Float#ceil</code>.
+ *     
+ *     1.ceil        #=> 1
+ *     1.2.ceil      #=> 2
+ *     (-1.2).ceil   #=> -1
+ *     (-1.0).ceil   #=> -1
+ */
+
+static VALUE
+num_ceil(num)
+    VALUE num;
+{
+    return flo_ceil(rb_Float(num));
+}
+
+/*
+ *  call-seq:
+ *     num.round    => integer
+ *  
+ *  Rounds <i>num</i> to the nearest integer. <code>Numeric</code>
+ *  implements this by converting itself to a
+ *  <code>Float</code> and invoking <code>Float#round</code>.
+ */
+
+static VALUE
+num_round(num)
+    VALUE num;
+{
+    return flo_round(rb_Float(num));
+}
+
+/*
+ *  call-seq:
+ *     num.truncate    => integer
+ *  
+ *  Returns <i>num</i> truncated to an integer. <code>Numeric</code>
+ *  implements this by converting its value to a float and invoking
+ *  <code>Float#truncate</code>.
+ */
+
+static VALUE
+num_truncate(num)
+    VALUE num;
+{
+    return flo_truncate(rb_Float(num));
+}
+
+
+/*
+ *  call-seq:
+ *     num.step(limit, step ) {|i| block }     => num
+ *  
+ *  Invokes <em>block</em> with the sequence of numbers starting at
+ *  <i>num</i>, incremented by <i>step</i> on each call. The loop
+ *  finishes when the value to be passed to the block is greater than
+ *  <i>limit</i> (if <i>step</i> is positive) or less than
+ *  <i>limit</i> (if <i>step</i> is negative). If all the arguments are
+ *  integers, the loop operates using an integer counter. If any of the
+ *  arguments are floating point numbers, all are converted to floats,
+ *  and the loop is executed <i>floor(n + n*epsilon)+ 1</i> times,
+ *  where <i>n = (limit - num)/step</i>. Otherwise, the loop
+ *  starts at <i>num</i>, uses either the <code><</code> or
+ *  <code>></code> operator to compare the counter against
+ *  <i>limit</i>, and increments itself using the <code>+</code>
+ *  operator.
+ *     
+ *     1.step(10, 2) { |i| print i, " " }
+ *     Math::E.step(Math::PI, 0.2) { |f| print f, " " }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     1 3 5 7 9
+ *     2.71828182845905 2.91828182845905 3.11828182845905
+ */
+
+static VALUE
+num_step(argc, argv, from)
+    int argc;
+    VALUE *argv;
+    VALUE from;
+{
+    VALUE to, step;
+
+    if (argc == 1) {
+	to = argv[0];
+	step = INT2FIX(1);
+    }
+    else {
+	if (argc == 2) {
+	    to = argv[0];
+	    step = argv[1];
+	}
+	else {
+	    rb_raise(rb_eArgError, "wrong number of arguments");
+	}
+	if (rb_equal(step, INT2FIX(0))) {
+	    rb_raise(rb_eArgError, "step can't be 0");
+	}
+    }
+
+    if (FIXNUM_P(from) && FIXNUM_P(to) && FIXNUM_P(step)) {
+	long i, end, diff;
+
+	i = FIX2LONG(from);
+	end = FIX2LONG(to);
+	diff = FIX2LONG(step);
+
+	if (diff > 0) {
+	    while (i <= end) {
+		rb_yield(LONG2FIX(i));
+		i += diff;
+	    }
+	}
+	else {
+	    while (i >= end) {
+		rb_yield(LONG2FIX(i));
+		i += diff;
+	    }
+	}
+    }
+    else if (TYPE(from) == T_FLOAT || TYPE(to) == T_FLOAT || TYPE(step) == T_FLOAT) {
+	const double epsilon = DBL_EPSILON;
+	double beg = NUM2DBL(from);
+	double end = NUM2DBL(to);
+	double unit = NUM2DBL(step);
+	double n = (end - beg)/unit;
+	double err = (fabs(beg) + fabs(end) + fabs(end-beg)) / fabs(unit) * epsilon;
+	long i;
+
+	if (err>0.5) err=0.5;
+	n = floor(n + err) + 1;
+	for (i=0; i<n; i++) {
+	    rb_yield(rb_float_new(i*unit+beg));
+	}
+    }
+    else {
+	VALUE i = from;
+	ID cmp;
+
+	if (RTEST(rb_funcall(step, '>', 1, INT2FIX(0)))) {
+	    cmp = '>';
+	}
+	else {
+	    cmp = '<';
+	}
+	for (;;) {
+	    if (RTEST(rb_funcall(i, cmp, 1, to))) break;
+	    rb_yield(i);
+	    i = rb_funcall(i, '+', 1, step);
+	}
+    }
+    return from;
+}
+
+long
+rb_num2long(val)
+    VALUE val;
+{
+    if (NIL_P(val)) {
+	rb_raise(rb_eTypeError, "no implicit conversion from nil to integer");
+    }
+
+    if (FIXNUM_P(val)) return FIX2LONG(val);
+
+    switch (TYPE(val)) {
+      case T_FLOAT:
+	if (RFLOAT(val)->value <= (double)LONG_MAX
+	    && RFLOAT(val)->value >= (double)LONG_MIN) {
+	    return (long)(RFLOAT(val)->value);
+	}
+	else {
+	    char buf[24];
+	    char *s;
+
+	    sprintf(buf, "%-.10g", RFLOAT(val)->value);
+	    if (s = strchr(buf, ' ')) *s = '\0';
+	    rb_raise(rb_eRangeError, "float %s out of range of integer", buf);
+	}
+
+      case T_BIGNUM:
+	return rb_big2long(val);
+
+      default:
+	val = rb_to_int(val);
+	return NUM2LONG(val);
+    }
+}
+
+unsigned long
+rb_num2ulong(val)
+    VALUE val;
+{
+    if (TYPE(val) == T_BIGNUM) {
+	return rb_big2ulong(val);
+    }
+    return (unsigned long)rb_num2long(val);
+}
+
+#if SIZEOF_INT < SIZEOF_LONG
+static void
+check_int(num)
+    long num;
+{
+    const char *s;
+
+    if (num < INT_MIN) {
+	s = "small";
+    }
+    else if (num > INT_MAX) {
+	s = "big";
+    }
+    else {
+	return;
+    }
+    rb_raise(rb_eRangeError, "integer %ld too %s to convert to `int'", num, s);
+}
+
+static void
+check_uint(num)
+    unsigned long num;
+{
+    if (num > UINT_MAX) {
+	rb_raise(rb_eRangeError, "integer %lu too big to convert to `unsigned int'", num);
+    }
+}
+
+long
+rb_num2int(val)
+    VALUE val;
+{
+    long num = rb_num2long(val);
+
+    check_int(num);
+    return num;
+}
+
+long
+rb_fix2int(val)
+    VALUE val;
+{
+    long num = FIXNUM_P(val)?FIX2LONG(val):rb_num2long(val);
+
+    check_int(num);
+    return num;
+}
+
+unsigned long
+rb_num2uint(val)
+    VALUE val;
+{
+    unsigned long num = rb_num2ulong(val);
+
+    if (RTEST(rb_funcall(INT2FIX(0), '<', 1, val))) {
+	check_uint(num);
+    }
+    return num;
+}
+
+unsigned long
+rb_fix2uint(val)
+    VALUE val;
+{
+    unsigned long num;
+
+    if (!FIXNUM_P(val)) {
+        return rb_num2uint(val);
+    }
+    num = FIX2ULONG(val);
+    if (FIX2LONG(val) > 0) {
+	check_uint(num);
+    }
+    return num;
+}
+#else
+long
+rb_num2int(val)
+    VALUE val;
+{
+    return rb_num2long(val);
+}
+
+long
+rb_fix2int(val)
+    VALUE val;
+{
+    return FIX2INT(val);
+}
+#endif
+
+VALUE
+rb_num2fix(val)
+    VALUE val;
+{
+    long v;
+
+    if (FIXNUM_P(val)) return val;
+
+    v = rb_num2long(val);
+    if (!FIXABLE(v))
+	rb_raise(rb_eRangeError, "integer %ld out of range of fixnum", v);
+    return LONG2FIX(v);
+}
+
+#if HAVE_LONG_LONG
+
+LONG_LONG
+rb_num2ll(val)
+    VALUE val;
+{
+    if (NIL_P(val)) {
+	rb_raise(rb_eTypeError, "no implicit conversion from nil");
+    }
+
+    if (FIXNUM_P(val)) return (LONG_LONG)FIX2LONG(val);
+
+    switch (TYPE(val)) {
+    case T_FLOAT:
+	if (RFLOAT(val)->value <= (double)LLONG_MAX
+	    && RFLOAT(val)->value >= (double)LLONG_MIN) {
+	    return (LONG_LONG)(RFLOAT(val)->value);
+	}
+	else {
+	    char buf[24];
+	    char *s;
+
+	    sprintf(buf, "%-.10g", RFLOAT(val)->value);
+	    if (s = strchr(buf, ' ')) *s = '\0';
+	    rb_raise(rb_eRangeError, "float %s out of range of long long", buf);
+	}
+
+    case T_BIGNUM:
+	return rb_big2ll(val);
+
+    case T_STRING:
+	rb_raise(rb_eTypeError, "no implicit conversion from string");
+	return Qnil;            /* not reached */
+
+    case T_TRUE:
+    case T_FALSE:
+	rb_raise(rb_eTypeError, "no implicit conversion from boolean");
+	return Qnil;		/* not reached */
+
+      default:
+	  val = rb_to_int(val);
+	  return NUM2LL(val);
+    }
+}
+
+unsigned LONG_LONG
+rb_num2ull(val)
+    VALUE val;
+{
+    if (TYPE(val) == T_BIGNUM) {
+	return rb_big2ull(val);
+    }
+    return (unsigned LONG_LONG)rb_num2ll(val);
+}
+
+#endif  /* HAVE_LONG_LONG */
+
+
+/*
+ * Document-class: Integer
+ *
+ *  <code>Integer</code> is the basis for the two concrete classes that
+ *  hold whole numbers, <code>Bignum</code> and <code>Fixnum</code>.
+ *     
+ */
+
+
+/*
+ *  call-seq:
+ *     int.to_i      => int
+ *     int.to_int    => int
+ *     int.floor     => int
+ *     int.ceil      => int
+ *     int.round     => int
+ *     int.truncate  => int
+ *
+ *  As <i>int</i> is already an <code>Integer</code>, all these
+ *  methods simply return the receiver.
+ */
+
+static VALUE
+int_to_i(num)
+    VALUE num;
+{
+    return num;
+}
+
+/*
+ *  call-seq:
+ *     int.integer? -> true
+ *  
+ *  Always returns <code>true</code>.
+ */
+
+static VALUE
+int_int_p(num)
+    VALUE num;
+{
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     int.next    => integer
+ *     int.succ    => integer
+ *  
+ *  Returns the <code>Integer</code> equal to <i>int</i> + 1.
+ *     
+ *     1.next      #=> 2
+ *     (-1).next   #=> 0
+ */
+
+static VALUE
+int_succ(num)
+    VALUE num;
+{
+    if (FIXNUM_P(num)) {
+	long i = FIX2LONG(num) + 1;
+	return LONG2NUM(i);
+    }
+    return rb_funcall(num, '+', 1, INT2FIX(1));
+}
+
+/*
+ *  call-seq:
+ *     int.chr    => string
+ *  
+ *  Returns a string containing the ASCII character represented by the
+ *  receiver's value.
+ *     
+ *     65.chr    #=> "A"
+ *     ?a.chr    #=> "a"
+ *     230.chr   #=> "\346"
+ */
+
+static VALUE
+int_chr(num)
+    VALUE num;
+{
+    char c;
+    long i = NUM2LONG(num);
+
+    if (i < 0 || 0xff < i)
+	rb_raise(rb_eRangeError, "%ld out of char range", i);
+    c = i;
+    return rb_str_new(&c, 1);
+}
+
+/********************************************************************
+ * 
+ * Document-class: Fixnum
+ *
+ *  A <code>Fixnum</code> holds <code>Integer</code> values that can be
+ *  represented in a native machine word (minus 1 bit). If any operation
+ *  on a <code>Fixnum</code> exceeds this range, the value is
+ *  automatically converted to a <code>Bignum</code>.
+ *     
+ *  <code>Fixnum</code> objects have immediate value. This means that
+ *  when they are assigned or passed as parameters, the actual object is
+ *  passed, rather than a reference to that object. Assignment does not
+ *  alias <code>Fixnum</code> objects. There is effectively only one
+ *  <code>Fixnum</code> object instance for any given integer value, so,
+ *  for example, you cannot add a singleton method to a
+ *  <code>Fixnum</code>.
+ */
+
+
+/*
+ * call-seq:
+ *   Fixnum.induced_from(obj)    =>  fixnum
+ *
+ * Convert <code>obj</code> to a Fixnum. Works with numeric parameters.
+ * Also works with Symbols, but this is deprecated.
+ */
+
+static VALUE
+rb_fix_induced_from(klass, x)
+    VALUE klass, x;
+{
+    return rb_num2fix(x);
+}
+
+/*
+ * call-seq:
+ *   Integer.induced_from(obj)    =>  fixnum, bignum
+ *
+ * Convert <code>obj</code> to an Integer.
+ */
+
+static VALUE
+rb_int_induced_from(klass, x)
+    VALUE klass, x;
+{
+    switch (TYPE(x)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+       return x;
+    case T_FLOAT:
+       return rb_funcall(x, id_to_i, 0);
+    default:
+       rb_raise(rb_eTypeError, "failed to convert %s into Integer",
+                rb_obj_classname(x));
+    }
+}
+
+/*
+ * call-seq:
+ *   Float.induced_from(obj)    =>  float
+ *
+ * Convert <code>obj</code> to a float.
+ */
+
+static VALUE
+rb_flo_induced_from(klass, x)
+    VALUE klass, x;
+{
+    switch (TYPE(x)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+       return rb_funcall(x, rb_intern("to_f"), 0);
+    case T_FLOAT:
+       return x;
+    default:
+       rb_raise(rb_eTypeError, "failed to convert %s into Float",
+                rb_obj_classname(x));
+    }
+}
+
+/*
+ * call-seq:
+ *   -fix   =>  integer
+ *
+ * Negates <code>fix</code> (which might return a Bignum).
+ */
+
+static VALUE
+fix_uminus(num)
+    VALUE num;
+{
+    return LONG2NUM(-FIX2LONG(num));
+}
+
+VALUE
+rb_fix2str(x, base)
+    VALUE x;
+    int base;
+{
+    extern const char ruby_digitmap[];
+    char buf[SIZEOF_LONG*CHAR_BIT + 2], *b = buf + sizeof buf;
+    long val = FIX2LONG(x);
+    int neg = 0;
+
+    if (base < 2 || 36 < base) {
+	rb_raise(rb_eArgError, "illegal radix %d", base);
+    }
+    if (val == 0) {
+	return rb_str_new2("0");
+    }
+    if (val < 0) {
+	val = -val;
+	neg = 1;
+    }
+    *--b = '\0';
+    do {
+	*--b = ruby_digitmap[(int)(val % base)];
+    } while (val /= base);
+    if (neg) {
+	*--b = '-';
+    }
+
+    return rb_str_new2(b);
+}
+
+/*
+ *  call-seq:
+ *     fix.to_s( base=10 ) -> aString
+ *  
+ *  Returns a string containing the representation of <i>fix</i> radix
+ *  <i>base</i> (between 2 and 36).
+ *     
+ *     12345.to_s       #=> "12345"
+ *     12345.to_s(2)    #=> "11000000111001"
+ *     12345.to_s(8)    #=> "30071"
+ *     12345.to_s(10)   #=> "12345"
+ *     12345.to_s(16)   #=> "3039"
+ *     12345.to_s(36)   #=> "9ix"
+ *
+ */
+static VALUE
+fix_to_s(argc, argv, x)
+    int argc;
+    VALUE *argv;
+    VALUE x;
+{
+    VALUE b;
+    int base;
+
+    rb_scan_args(argc, argv, "01", &b);
+    if (argc == 0) base = 10;
+    else base = NUM2INT(b);
+
+    return rb_fix2str(x, base);
+}
+
+/*
+ * call-seq:
+ *   fix + numeric   =>  numeric_result
+ *
+ * Performs addition: the class of the resulting object depends on
+ * the class of <code>numeric</code> and on the magnitude of the 
+ * result.
+ */
+
+static VALUE
+fix_plus(x, y)
+    VALUE x, y;
+{
+    if (FIXNUM_P(y)) {
+	long a, b, c;
+	VALUE r;
+
+	a = FIX2LONG(x);
+	b = FIX2LONG(y);
+	c = a + b;
+	r = LONG2NUM(c);
+
+	return r;
+    }
+    if (TYPE(y) == T_FLOAT) {
+	return rb_float_new((double)FIX2LONG(x) + RFLOAT(y)->value);
+    }
+    return rb_num_coerce_bin(x, y);
+}
+
+/*
+ * call-seq:
+ *   fix - numeric   =>  numeric_result
+ *
+ * Performs subtraction: the class of the resulting object depends on
+ * the class of <code>numeric</code> and on the magnitude of the 
+ * result.
+ */
+
+static VALUE
+fix_minus(x, y)
+    VALUE x, y;
+{
+    if (FIXNUM_P(y)) {
+	long a, b, c;
+	VALUE r;
+
+	a = FIX2LONG(x);
+	b = FIX2LONG(y);
+	c = a - b;
+	r = LONG2NUM(c);
+
+	return r;
+    }
+    if (TYPE(y) == T_FLOAT) {
+	return rb_float_new((double)FIX2LONG(x) - RFLOAT(y)->value);
+    }
+    return rb_num_coerce_bin(x, y);
+}
+
+/*
+ * call-seq:
+ *   fix * numeric   =>  numeric_result
+ *
+ * Performs multiplication: the class of the resulting object depends on
+ * the class of <code>numeric</code> and on the magnitude of the 
+ * result.
+ */
+
+static VALUE
+fix_mul(x, y)
+    VALUE x, y;
+{
+    if (FIXNUM_P(y)) {
+#ifdef __HP_cc
+        /* avoids an optimization bug of HP aC++/ANSI C B3910B A.06.05 [Jul 25 2005] */
+        volatile
+#endif
+	long a, b, c;
+	VALUE r;
+
+	a = FIX2LONG(x);
+	if (a == 0) return x;
+
+	b = FIX2LONG(y);
+	c = a * b;
+	r = LONG2FIX(c);
+
+	if (FIX2LONG(r) != c || c/a != b) {
+	    r = rb_big_mul(rb_int2big(a), rb_int2big(b));
+	}
+	return r;
+    }
+    if (TYPE(y) == T_FLOAT) {
+	return rb_float_new((double)FIX2LONG(x) * RFLOAT(y)->value);
+    }
+    return rb_num_coerce_bin(x, y);
+}
+
+static void
+fixdivmod(x, y, divp, modp)
+    long x, y;
+    long *divp, *modp;
+{
+    long div, mod;
+
+    if (y == 0) rb_num_zerodiv();
+    if (y < 0) {
+	if (x < 0)
+	    div = -x / -y;
+	else
+	    div = - (x / -y);
+    }
+    else {
+	if (x < 0)
+	    div = - (-x / y);
+	else
+	    div = x / y;
+    }
+    mod = x - div*y;
+    if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
+	mod += y;
+	div -= 1;
+    }
+    if (divp) *divp = div;
+    if (modp) *modp = mod;
+}
+
+/*
+ *  call-seq:
+ *     fix.quo(numeric)    => float
+ *  
+ *  Returns the floating point result of dividing <i>fix</i> by
+ *  <i>numeric</i>.
+ *     
+ *     654321.quo(13731)      #=> 47.6528293642124
+ *     654321.quo(13731.24)   #=> 47.6519964693647
+ *     
+ */
+
+static VALUE
+fix_quo(x, y)
+    VALUE x, y;
+{
+    if (FIXNUM_P(y)) {
+	return rb_float_new((double)FIX2LONG(x) / (double)FIX2LONG(y));
+    }
+    return rb_num_coerce_bin(x, y);
+}
+
+/*
+ * call-seq:
+ *   fix / numeric      =>  numeric_result
+ *   fix.div(numeric)   =>  numeric_result
+ *
+ * Performs division: the class of the resulting object depends on
+ * the class of <code>numeric</code> and on the magnitude of the 
+ * result.
+ */
+
+static VALUE
+fix_div(x, y)
+    VALUE x, y;
+{
+    if (FIXNUM_P(y)) {
+	long div;
+
+	fixdivmod(FIX2LONG(x), FIX2LONG(y), &div, 0);
+	return LONG2NUM(div);
+    }
+    return rb_num_coerce_bin(x, y);
+}
+
+/*
+ *  call-seq:
+ *    fix % other         => Numeric
+ *    fix.modulo(other)   => Numeric
+ *
+ *  Returns <code>fix</code> modulo <code>other</code>.
+ *  See <code>Numeric.divmod</code> for more information.
+ */
+
+static VALUE
+fix_mod(x, y)
+    VALUE x, y;
+{
+    if (FIXNUM_P(y)) {
+	long mod;
+
+	fixdivmod(FIX2LONG(x), FIX2LONG(y), 0, &mod);
+	return LONG2NUM(mod);
+    }
+    return rb_num_coerce_bin(x, y);
+}
+
+/*
+ *  call-seq:
+ *     fix.divmod(numeric)    => array
+ *  
+ *  See <code>Numeric#divmod</code>.
+ */
+static VALUE
+fix_divmod(x, y)
+    VALUE x, y;
+{
+    if (FIXNUM_P(y)) {
+	long div, mod;
+
+	fixdivmod(FIX2LONG(x), FIX2LONG(y), &div, &mod);
+
+	return rb_assoc_new(LONG2NUM(div), LONG2NUM(mod));
+    }
+    return rb_num_coerce_bin(x, y);
+}
+
+static VALUE
+int_even_p(VALUE num)
+{
+    if (rb_funcall(num, '%', 1, INT2FIX(2)) == INT2FIX(0)) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *    fix ** other         => Numeric
+ *
+ *  Raises <code>fix</code> to the <code>other</code> power, which may
+ *  be negative or fractional.
+ *
+ *    2 ** 3      #=> 8
+ *    2 ** -1     #=> 0.5
+ *    2 ** 0.5    #=> 1.4142135623731
+ */
+
+static VALUE
+fix_pow(x, y)
+    VALUE x, y;
+{
+    long a = FIX2LONG(x);
+
+    if (FIXNUM_P(y)) {
+	long b;
+
+	b = FIX2LONG(y);
+	if (b == 0) return INT2FIX(1);
+	if (b == 1) return x;
+	a = FIX2LONG(x);
+	if (a == 0) return INT2FIX(0);
+	if (a == 1) return INT2FIX(1);
+	if (a == -1) {
+	    if (b % 2 == 0)
+		return INT2FIX(1);
+	    else 
+		return INT2FIX(-1);
+	}
+	if (b > 0) {
+	    return rb_big_pow(rb_int2big(a), y);
+	}
+	return rb_float_new(pow((double)a, (double)b));
+    }
+    switch (TYPE(y)) {
+      case T_BIGNUM:
+	if (a == 0) return INT2FIX(0);
+	if (a == 1) return INT2FIX(1);
+	if (a == -1) {
+	    if (int_even_p(y)) return INT2FIX(1);
+	    else return INT2FIX(-1);
+	}
+	x = rb_int2big(FIX2LONG(x));
+	return rb_big_pow(x, y);
+      case T_FLOAT:
+	if (a == 0) return rb_float_new(0.0);
+	if (a == 1) return rb_float_new(1.0);
+	return rb_float_new(pow((double)a, RFLOAT(y)->value));
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+}
+
+/*
+ * call-seq:
+ *   fix == other
+ *
+ * Return <code>true</code> if <code>fix</code> equals <code>other</code>
+ * numerically.
+ *
+ *   1 == 2      #=> false
+ *   1 == 1.0    #=> true
+ */
+
+static VALUE
+fix_equal(x, y)
+    VALUE x, y;
+{
+    if (x == y) return Qtrue;
+    if (FIXNUM_P(y)) return Qfalse;
+    return num_equal(x, y);
+}
+
+/*
+ *  call-seq:
+ *     fix <=> numeric    => -1, 0, +1
+ *  
+ *  Comparison---Returns -1, 0, or +1 depending on whether <i>fix</i> is
+ *  less than, equal to, or greater than <i>numeric</i>. This is the
+ *  basis for the tests in <code>Comparable</code>.
+ */
+
+static VALUE
+fix_cmp(x, y)
+    VALUE x, y;
+{
+    if (x == y) return INT2FIX(0);
+    if (FIXNUM_P(y)) {
+	long a = FIX2LONG(x), b = FIX2LONG(y);
+
+	if (a > b) return INT2FIX(1);
+	return INT2FIX(-1);
+    }
+    else {
+	return rb_num_coerce_cmp(x, y);
+    }
+}
+
+/*
+ * call-seq:
+ *   fix > other     => true or false
+ *
+ * Returns <code>true</code> if the value of <code>fix</code> is
+ * greater than that of <code>other</code>.
+ */
+
+static VALUE
+fix_gt(x, y)
+    VALUE x, y;
+{
+    if (FIXNUM_P(y)) {
+	long a = FIX2LONG(x), b = FIX2LONG(y);
+
+	if (a > b) return Qtrue;
+	return Qfalse;
+    }
+    else {
+	return rb_num_coerce_relop(x, y);
+    }
+}
+
+/*
+ * call-seq:
+ *   fix >= other     => true or false
+ *
+ * Returns <code>true</code> if the value of <code>fix</code> is
+ * greater than or equal to that of <code>other</code>.
+ */
+
+static VALUE
+fix_ge(x, y)
+    VALUE x, y;
+{
+    if (FIXNUM_P(y)) {
+	long a = FIX2LONG(x), b = FIX2LONG(y);
+
+	if (a >= b) return Qtrue;
+	return Qfalse;
+    }
+    else {
+	return rb_num_coerce_relop(x, y);
+    }
+}
+
+/*
+ * call-seq:
+ *   fix < other     => true or false
+ *
+ * Returns <code>true</code> if the value of <code>fix</code> is
+ * less than that of <code>other</code>.
+ */
+
+static VALUE
+fix_lt(x, y)
+    VALUE x, y;
+{
+    if (FIXNUM_P(y)) {
+	long a = FIX2LONG(x), b = FIX2LONG(y);
+
+	if (a < b) return Qtrue;
+	return Qfalse;
+    }
+    else {
+	return rb_num_coerce_relop(x, y);
+    }
+}
+
+/*
+ * call-seq:
+ *   fix <= other     => true or false
+ *
+ * Returns <code>true</code> if the value of <code>fix</code> is
+ * less thanor equal to that of <code>other</code>.
+ */
+
+static VALUE
+fix_le(x, y)
+    VALUE x, y;
+{
+    if (FIXNUM_P(y)) {
+	long a = FIX2LONG(x), b = FIX2LONG(y);
+
+	if (a <= b) return Qtrue;
+	return Qfalse;
+    }
+    else {
+	return rb_num_coerce_relop(x, y);
+    }
+}
+
+/*
+ * call-seq:
+ *   ~fix     => integer
+ *
+ * One's complement: returns a number where each bit is flipped.
+ */
+
+static VALUE
+fix_rev(num)
+    VALUE num;
+{
+    long val = FIX2LONG(num);
+
+    val = ~val;
+    return LONG2NUM(val);
+}
+
+/*
+ * call-seq:
+ *   fix & other     => integer
+ *
+ * Bitwise AND.
+ */
+
+static VALUE
+fix_and(x, y)
+    VALUE x, y;
+{
+    long val;
+
+    if (TYPE(y) == T_BIGNUM) {
+	return rb_big_and(y, x);
+    }
+    val = FIX2LONG(x) & NUM2LONG(y);
+    return LONG2NUM(val);
+}
+
+/*
+ * call-seq:
+ *   fix | other     => integer
+ *
+ * Bitwise OR.
+ */
+
+static VALUE
+fix_or(x, y)
+    VALUE x, y;
+{
+    long val;
+
+    if (TYPE(y) == T_BIGNUM) {
+	return rb_big_or(y, x);
+    }
+    val = FIX2LONG(x) | NUM2LONG(y);
+    return LONG2NUM(val);
+}
+
+/*
+ * call-seq:
+ *   fix ^ other     => integer
+ *
+ * Bitwise EXCLUSIVE OR.
+ */
+
+static VALUE
+fix_xor(x, y)
+    VALUE x, y;
+{
+    long val;
+
+    if (TYPE(y) == T_BIGNUM) {
+	return rb_big_xor(y, x);
+    }
+    val = FIX2LONG(x) ^ NUM2LONG(y);
+    return LONG2NUM(val);
+}
+
+static VALUE fix_lshift _((long, unsigned long));
+static VALUE fix_rshift _((long, unsigned long));
+
+/*
+ * call-seq:
+ *   fix << count     => integer
+ *
+ * Shifts _fix_ left _count_ positions (right if _count_ is negative).
+ */
+
+static VALUE
+rb_fix_lshift(x, y)
+    VALUE x, y;
+{
+    long val, width;
+
+    val = NUM2LONG(x);
+    if (!FIXNUM_P(y))
+	return rb_big_lshift(rb_int2big(val), y);
+    width = FIX2LONG(y);
+    if (width < 0)
+	return fix_rshift(val, (unsigned long)-width);
+    return fix_lshift(val, width);
+}
+
+static VALUE
+fix_lshift(val, width)
+    long val;
+    unsigned long width;
+{
+    if (width > (sizeof(VALUE)*CHAR_BIT-1)
+	|| ((unsigned long)val)>>(sizeof(VALUE)*CHAR_BIT-1-width) > 0) {
+	return rb_big_lshift(rb_int2big(val), ULONG2NUM(width));
+    }
+    val = val << width;
+    return LONG2NUM(val);
+}
+
+/*
+ * call-seq:
+ *   fix >> count     => integer
+ *
+ * Shifts _fix_ right _count_ positions (left if _count_ is negative).
+ */
+
+static VALUE
+rb_fix_rshift(x, y)
+    VALUE x, y;
+{
+    long i, val;
+
+    val = FIX2LONG(x);
+    if (!FIXNUM_P(y))
+	return rb_big_rshift(rb_int2big(val), y);
+    i = FIX2LONG(y);
+    if (i == 0) return x;
+    if (i < 0)
+	return fix_lshift(val, (unsigned long)-i);
+    return fix_rshift(val, i);
+}
+
+static VALUE
+fix_rshift(long val, unsigned long i)
+{
+    if (i >= sizeof(long)*CHAR_BIT-1) {
+	if (val < 0) return INT2FIX(-1);
+	return INT2FIX(0);
+    }
+    val = RSHIFT(val, i);
+    return LONG2FIX(val);
+}
+
+/*
+ *  call-seq:
+ *     fix[n]     => 0, 1
+ *  
+ *  Bit Reference---Returns the <em>n</em>th bit in the binary
+ *  representation of <i>fix</i>, where <i>fix</i>[0] is the least
+ *  significant bit.
+ *     
+ *     a = 0b11001100101010
+ *     30.downto(0) do |n| print a[n] end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     0000000000000000011001100101010
+ */
+
+static VALUE
+fix_aref(fix, idx)
+    VALUE fix, idx;
+{
+    long val = FIX2LONG(fix);
+    long i;
+
+    if (TYPE(idx) == T_BIGNUM) {
+	idx = rb_big_norm(idx);
+	if (!FIXNUM_P(idx)) {
+	    if (!RBIGNUM(idx)->sign || val >= 0)
+		return INT2FIX(0);
+	    return INT2FIX(1);
+	}
+    }
+    i = NUM2LONG(idx);
+
+    if (i < 0) return INT2FIX(0);
+    if (sizeof(VALUE)*CHAR_BIT-1 < i) {
+	if (val < 0) return INT2FIX(1);
+	return INT2FIX(0);
+    }
+    if (val & (1L<<i))
+	return INT2FIX(1);
+    return INT2FIX(0);
+}
+
+/*
+ *  call-seq:
+ *     fix.to_f -> float
+ *  
+ *  Converts <i>fix</i> to a <code>Float</code>.
+ *     
+ */
+
+static VALUE
+fix_to_f(num)
+    VALUE num;
+{
+    double val;
+
+    val = (double)FIX2LONG(num);
+
+    return rb_float_new(val);
+}
+
+/*
+ *  call-seq:
+ *     fix.abs -> aFixnum
+ *  
+ *  Returns the absolute value of <i>fix</i>.
+ *     
+ *     -12345.abs   #=> 12345
+ *     12345.abs    #=> 12345
+ *     
+ */
+
+static VALUE
+fix_abs(fix)
+    VALUE fix;
+{
+    long i = FIX2LONG(fix);
+
+    if (i < 0) i = -i;
+
+    return LONG2NUM(i);
+}
+
+/*
+ *  call-seq:
+ *     fix.id2name -> string or nil
+ *  
+ *  Returns the name of the object whose symbol id is <i>fix</i>. If
+ *  there is no symbol in the symbol table with this value, returns
+ *  <code>nil</code>. <code>id2name</code> has nothing to do with the
+ *  <code>Object.id</code> method. See also <code>Fixnum#to_sym</code>,
+ *  <code>String#intern</code>, and class <code>Symbol</code>.
+ *     
+ *     symbol = :@inst_var    #=> :@inst_var
+ *     id     = symbol.to_i   #=> 9818
+ *     id.id2name             #=> "@inst_var"
+ */
+
+static VALUE
+fix_id2name(fix)
+    VALUE fix;
+{
+    char *name = rb_id2name(FIX2UINT(fix));
+    if (name) return rb_str_new2(name);
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     fix.to_sym -> aSymbol
+ *  
+ *  Returns the symbol whose integer value is <i>fix</i>. See also
+ *  <code>Fixnum#id2name</code>.
+ *     
+ *     fred = :fred.to_i
+ *     fred.id2name   #=> "fred"
+ *     fred.to_sym    #=> :fred
+ */
+
+static VALUE
+fix_to_sym(fix)
+    VALUE fix;
+{
+    ID id = FIX2UINT(fix);
+
+    if (rb_id2name(id)) {
+	return ID2SYM(id);
+    }
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     fix.size -> fixnum
+ *  
+ *  Returns the number of <em>bytes</em> in the machine representation
+ *  of a <code>Fixnum</code>.
+ *     
+ *     1.size            #=> 4
+ *     -1.size           #=> 4
+ *     2147483647.size   #=> 4
+ */
+
+static VALUE
+fix_size(fix)
+    VALUE fix;
+{
+    return INT2FIX(sizeof(long));
+}
+
+/*
+ *  call-seq:
+ *     int.upto(limit) {|i| block }     => int
+ *  
+ *  Iterates <em>block</em>, passing in integer values from <i>int</i>
+ *  up to and including <i>limit</i>.
+ *     
+ *     5.upto(10) { |i| print i, " " }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     5 6 7 8 9 10
+ */
+
+static VALUE
+int_upto(from, to)
+    VALUE from, to;
+{
+    if (FIXNUM_P(from) && FIXNUM_P(to)) {
+	long i, end;
+
+	end = FIX2LONG(to);
+	for (i = FIX2LONG(from); i <= end; i++) {
+	    rb_yield(LONG2FIX(i));
+	}
+    }
+    else {
+	VALUE i = from, c;
+
+	while (!(c = rb_funcall(i, '>', 1, to))) {
+	    rb_yield(i);
+	    i = rb_funcall(i, '+', 1, INT2FIX(1));
+	}
+	if (NIL_P(c)) rb_cmperr(i, to);
+    }
+    return from;
+}
+
+/*
+ *  call-seq:
+ *     int.downto(limit) {|i| block }     => int
+ *  
+ *  Iterates <em>block</em>, passing decreasing values from <i>int</i>
+ *  down to and including <i>limit</i>.
+ *     
+ *     5.downto(1) { |n| print n, ".. " }
+ *     print "  Liftoff!\n"
+ *     
+ *  <em>produces:</em>
+ *     
+ *     5.. 4.. 3.. 2.. 1..   Liftoff!
+ */
+
+static VALUE
+int_downto(from, to)
+    VALUE from, to;
+{
+    if (FIXNUM_P(from) && FIXNUM_P(to)) {
+	long i, end;
+
+	end = FIX2LONG(to);
+	for (i=FIX2LONG(from); i >= end; i--) {
+	    rb_yield(LONG2FIX(i));
+	}
+    }
+    else {
+	VALUE i = from, c;
+
+	while (!(c = rb_funcall(i, '<', 1, to))) {
+	    rb_yield(i);
+	    i = rb_funcall(i, '-', 1, INT2FIX(1));
+	}
+	if (NIL_P(c)) rb_cmperr(i, to);
+    }
+    return from;
+}
+
+/*
+ *  call-seq:
+ *     int.times {|i| block }     => int
+ *  
+ *  Iterates block <i>int</i> times, passing in values from zero to
+ *  <i>int</i> - 1.
+ *     
+ *     5.times do |i|
+ *       print i, " "
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     0 1 2 3 4
+ */
+
+static VALUE
+int_dotimes(num)
+    VALUE num;
+{
+    if (FIXNUM_P(num)) {
+	long i, end;
+
+	end = FIX2LONG(num);
+	for (i=0; i<end; i++) {
+	    rb_yield(LONG2FIX(i));
+	}
+    }
+    else {
+	VALUE i = INT2FIX(0);
+
+	for (;;) {
+	    if (!RTEST(rb_funcall(i, '<', 1, num))) break;
+	    rb_yield(i);
+	    i = rb_funcall(i, '+', 1, INT2FIX(1));
+	}
+    }
+    return num;
+}
+
+/*
+ *  call-seq:
+ *     fix.zero?    => true or false
+ *  
+ *  Returns <code>true</code> if <i>fix</i> is zero.
+ *     
+ */
+
+static VALUE
+fix_zero_p(num)
+    VALUE num;
+{
+    if (FIX2LONG(num) == 0) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+void
+Init_Numeric()
+{
+#if defined(__FreeBSD__) && __FreeBSD__ < 4
+    /* allow divide by zero -- Inf */
+    fpsetmask(fpgetmask() & ~(FP_X_DZ|FP_X_INV|FP_X_OFL));
+#elif defined(_UNICOSMP)
+    /* Turn off floating point exceptions for divide by zero, etc. */
+    _set_Creg(0, 0);
+#elif defined(__BORLANDC__)
+    /* Turn off floating point exceptions for overflow, etc. */
+    _control87(MCW_EM, MCW_EM);
+#endif
+    id_coerce = rb_intern("coerce");
+    id_to_i = rb_intern("to_i");
+    id_eq = rb_intern("==");
+
+    rb_eZeroDivError = rb_define_class("ZeroDivisionError", rb_eStandardError);
+    rb_eFloatDomainError = rb_define_class("FloatDomainError", rb_eRangeError);
+    rb_cNumeric = rb_define_class("Numeric", rb_cObject);
+
+    rb_define_method(rb_cNumeric, "singleton_method_added", num_sadded, 1);
+    rb_include_module(rb_cNumeric, rb_mComparable);
+    rb_define_method(rb_cNumeric, "initialize_copy", num_init_copy, 1);
+    rb_define_method(rb_cNumeric, "coerce", num_coerce, 1);
+
+    rb_define_method(rb_cNumeric, "+@", num_uplus, 0);
+    rb_define_method(rb_cNumeric, "-@", num_uminus, 0);
+    rb_define_method(rb_cNumeric, "<=>", num_cmp, 1);
+    rb_define_method(rb_cNumeric, "eql?", num_eql, 1);
+    rb_define_method(rb_cNumeric, "quo", num_quo, 1);
+    rb_define_method(rb_cNumeric, "div", num_div, 1);
+    rb_define_method(rb_cNumeric, "divmod", num_divmod, 1);
+    rb_define_method(rb_cNumeric, "modulo", num_modulo, 1);
+    rb_define_method(rb_cNumeric, "remainder", num_remainder, 1);
+    rb_define_method(rb_cNumeric, "abs", num_abs, 0);
+    rb_define_method(rb_cNumeric, "to_int", num_to_int, 0);
+
+    rb_define_method(rb_cNumeric, "integer?", num_int_p, 0);
+    rb_define_method(rb_cNumeric, "zero?", num_zero_p, 0);
+    rb_define_method(rb_cNumeric, "nonzero?", num_nonzero_p, 0);
+
+    rb_define_method(rb_cNumeric, "floor", num_floor, 0);
+    rb_define_method(rb_cNumeric, "ceil", num_ceil, 0);
+    rb_define_method(rb_cNumeric, "round", num_round, 0);
+    rb_define_method(rb_cNumeric, "truncate", num_truncate, 0);
+    rb_define_method(rb_cNumeric, "step", num_step, -1);
+
+    rb_cInteger = rb_define_class("Integer", rb_cNumeric);
+    rb_undef_alloc_func(rb_cInteger);
+    rb_undef_method(CLASS_OF(rb_cInteger), "new");
+
+    rb_define_method(rb_cInteger, "integer?", int_int_p, 0);
+    rb_define_method(rb_cInteger, "upto", int_upto, 1);
+    rb_define_method(rb_cInteger, "downto", int_downto, 1);
+    rb_define_method(rb_cInteger, "times", int_dotimes, 0);
+    rb_include_module(rb_cInteger, rb_mPrecision);
+    rb_define_method(rb_cInteger, "succ", int_succ, 0);
+    rb_define_method(rb_cInteger, "next", int_succ, 0);
+    rb_define_method(rb_cInteger, "chr", int_chr, 0);
+    rb_define_method(rb_cInteger, "to_i", int_to_i, 0);
+    rb_define_method(rb_cInteger, "to_int", int_to_i, 0);
+    rb_define_method(rb_cInteger, "floor", int_to_i, 0);
+    rb_define_method(rb_cInteger, "ceil", int_to_i, 0);
+    rb_define_method(rb_cInteger, "round", int_to_i, 0);
+    rb_define_method(rb_cInteger, "truncate", int_to_i, 0);
+
+    rb_cFixnum = rb_define_class("Fixnum", rb_cInteger);
+    rb_include_module(rb_cFixnum, rb_mPrecision);
+    rb_define_singleton_method(rb_cFixnum, "induced_from", rb_fix_induced_from, 1);
+    rb_define_singleton_method(rb_cInteger, "induced_from", rb_int_induced_from, 1);
+
+    rb_define_method(rb_cFixnum, "to_s", fix_to_s, -1);
+
+    rb_define_method(rb_cFixnum, "id2name", fix_id2name, 0);
+    rb_define_method(rb_cFixnum, "to_sym", fix_to_sym, 0);
+
+    rb_define_method(rb_cFixnum, "-@", fix_uminus, 0);
+    rb_define_method(rb_cFixnum, "+", fix_plus, 1);
+    rb_define_method(rb_cFixnum, "-", fix_minus, 1);
+    rb_define_method(rb_cFixnum, "*", fix_mul, 1);
+    rb_define_method(rb_cFixnum, "/", fix_div, 1);
+    rb_define_method(rb_cFixnum, "div", fix_div, 1);
+    rb_define_method(rb_cFixnum, "%", fix_mod, 1);
+    rb_define_method(rb_cFixnum, "modulo", fix_mod, 1);
+    rb_define_method(rb_cFixnum, "divmod", fix_divmod, 1);
+    rb_define_method(rb_cFixnum, "quo", fix_quo, 1);
+    rb_define_method(rb_cFixnum, "**", fix_pow, 1);
+
+    rb_define_method(rb_cFixnum, "abs", fix_abs, 0);
+
+    rb_define_method(rb_cFixnum, "==", fix_equal, 1);
+    rb_define_method(rb_cFixnum, "<=>", fix_cmp, 1);
+    rb_define_method(rb_cFixnum, ">",  fix_gt, 1);
+    rb_define_method(rb_cFixnum, ">=", fix_ge, 1);
+    rb_define_method(rb_cFixnum, "<",  fix_lt, 1);
+    rb_define_method(rb_cFixnum, "<=", fix_le, 1);
+
+    rb_define_method(rb_cFixnum, "~", fix_rev, 0);
+    rb_define_method(rb_cFixnum, "&", fix_and, 1);
+    rb_define_method(rb_cFixnum, "|", fix_or,  1);
+    rb_define_method(rb_cFixnum, "^", fix_xor, 1);
+    rb_define_method(rb_cFixnum, "[]", fix_aref, 1);
+
+    rb_define_method(rb_cFixnum, "<<", rb_fix_lshift, 1);
+    rb_define_method(rb_cFixnum, ">>", rb_fix_rshift, 1);
+
+    rb_define_method(rb_cFixnum, "to_f", fix_to_f, 0);
+    rb_define_method(rb_cFixnum, "size", fix_size, 0);
+    rb_define_method(rb_cFixnum, "zero?", fix_zero_p, 0);
+
+    rb_cFloat  = rb_define_class("Float", rb_cNumeric);
+
+    rb_undef_alloc_func(rb_cFloat);
+    rb_undef_method(CLASS_OF(rb_cFloat), "new");
+
+    rb_define_singleton_method(rb_cFloat, "induced_from", rb_flo_induced_from, 1);
+    rb_include_module(rb_cFloat, rb_mPrecision);
+
+    rb_define_const(rb_cFloat, "ROUNDS", INT2FIX(FLT_ROUNDS));
+    rb_define_const(rb_cFloat, "RADIX", INT2FIX(FLT_RADIX));
+    rb_define_const(rb_cFloat, "MANT_DIG", INT2FIX(DBL_MANT_DIG));
+    rb_define_const(rb_cFloat, "DIG", INT2FIX(DBL_DIG));
+    rb_define_const(rb_cFloat, "MIN_EXP", INT2FIX(DBL_MIN_EXP));
+    rb_define_const(rb_cFloat, "MAX_EXP", INT2FIX(DBL_MAX_EXP));
+    rb_define_const(rb_cFloat, "MIN_10_EXP", INT2FIX(DBL_MIN_10_EXP));
+    rb_define_const(rb_cFloat, "MAX_10_EXP", INT2FIX(DBL_MAX_10_EXP));
+    rb_define_const(rb_cFloat, "MIN", rb_float_new(DBL_MIN));
+    rb_define_const(rb_cFloat, "MAX", rb_float_new(DBL_MAX));
+    rb_define_const(rb_cFloat, "EPSILON", rb_float_new(DBL_EPSILON));
+
+    rb_define_method(rb_cFloat, "to_s", flo_to_s, 0);
+    rb_define_method(rb_cFloat, "coerce", flo_coerce, 1);
+    rb_define_method(rb_cFloat, "-@", flo_uminus, 0);
+    rb_define_method(rb_cFloat, "+", flo_plus, 1);
+    rb_define_method(rb_cFloat, "-", flo_minus, 1);
+    rb_define_method(rb_cFloat, "*", flo_mul, 1);
+    rb_define_method(rb_cFloat, "/", flo_div, 1);
+    rb_define_method(rb_cFloat, "%", flo_mod, 1);
+    rb_define_method(rb_cFloat, "modulo", flo_mod, 1);
+    rb_define_method(rb_cFloat, "divmod", flo_divmod, 1);
+    rb_define_method(rb_cFloat, "**", flo_pow, 1);
+    rb_define_method(rb_cFloat, "==", flo_eq, 1);
+    rb_define_method(rb_cFloat, "<=>", flo_cmp, 1);
+    rb_define_method(rb_cFloat, ">",  flo_gt, 1);
+    rb_define_method(rb_cFloat, ">=", flo_ge, 1);
+    rb_define_method(rb_cFloat, "<",  flo_lt, 1);
+    rb_define_method(rb_cFloat, "<=", flo_le, 1);
+    rb_define_method(rb_cFloat, "eql?", flo_eql, 1);
+    rb_define_method(rb_cFloat, "hash", flo_hash, 0);
+    rb_define_method(rb_cFloat, "to_f", flo_to_f, 0);
+    rb_define_method(rb_cFloat, "abs", flo_abs, 0);
+    rb_define_method(rb_cFloat, "zero?", flo_zero_p, 0);
+
+    rb_define_method(rb_cFloat, "to_i", flo_truncate, 0);
+    rb_define_method(rb_cFloat, "to_int", flo_truncate, 0);
+    rb_define_method(rb_cFloat, "floor", flo_floor, 0);
+    rb_define_method(rb_cFloat, "ceil", flo_ceil, 0);
+    rb_define_method(rb_cFloat, "round", flo_round, 0);
+    rb_define_method(rb_cFloat, "truncate", flo_truncate, 0);
+
+    rb_define_method(rb_cFloat, "nan?",      flo_is_nan_p, 0);
+    rb_define_method(rb_cFloat, "infinite?", flo_is_infinite_p, 0);
+    rb_define_method(rb_cFloat, "finite?",   flo_is_finite_p, 0);
+}
diff --git a/ruby_1_8_6/object.c b/ruby_1_8_6/object.c
new file mode 100644
index 0000000000..706455713c
--- /dev/null
+++ b/ruby_1_8_6/object.c
@@ -0,0 +1,2825 @@
+/**********************************************************************
+
+  object.c -
+
+  $Author$
+  $Date$
+  created at: Thu Jul 15 12:01:24 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "st.h"
+#include "util.h"
+#include <stdio.h>
+#include <errno.h>
+#include <ctype.h>
+#include <math.h>
+
+VALUE rb_mKernel;
+VALUE rb_cObject;
+VALUE rb_cModule;
+VALUE rb_cClass;
+VALUE rb_cData;
+
+VALUE rb_cNilClass;
+VALUE rb_cTrueClass;
+VALUE rb_cFalseClass;
+VALUE rb_cSymbol;
+
+static ID id_eq, id_eql, id_inspect, id_init_copy;
+
+/*
+ *  call-seq:
+ *     obj === other   => true or false
+ *  
+ *  Case Equality---For class <code>Object</code>, effectively the same
+ *  as calling  <code>#==</code>, but typically overridden by descendents
+ *  to provide meaningful semantics in <code>case</code> statements.
+ */
+
+VALUE
+rb_equal(obj1, obj2)
+    VALUE obj1, obj2;
+{
+    VALUE result;
+
+    if (obj1 == obj2) return Qtrue;
+    result = rb_funcall(obj1, id_eq, 1, obj2);
+    if (RTEST(result)) return Qtrue;
+    return Qfalse;
+}
+
+int
+rb_eql(obj1, obj2)
+    VALUE obj1, obj2;
+{
+    return RTEST(rb_funcall(obj1, id_eql, 1, obj2));
+}
+
+/*
+ *  call-seq:
+ *     obj == other        => true or false
+ *     obj.equal?(other)   => true or false
+ *     obj.eql?(other)     => true or false
+ *  
+ *  Equality---At the <code>Object</code> level, <code>==</code> returns
+ *  <code>true</code> only if <i>obj</i> and <i>other</i> are the
+ *  same object. Typically, this method is overridden in descendent
+ *  classes to provide class-specific meaning.
+ *
+ *  Unlike <code>==</code>, the <code>equal?</code> method should never be
+ *  overridden by subclasses: it is used to determine object identity
+ *  (that is, <code>a.equal?(b)</code> iff <code>a</code> is the same
+ *  object as <code>b</code>).
+ *
+ *  The <code>eql?</code> method returns <code>true</code> if
+    <i>obj</i> and <i>anObject</i> have the
+ *  same value. Used by <code>Hash</code> to test members for equality.
+ *  For objects of class <code>Object</code>, <code>eql?</code> is
+ *  synonymous with <code>==</code>. Subclasses normally continue this
+ *  tradition, but there are exceptions. <code>Numeric</code> types, for
+ *  example, perform type conversion across <code>==</code>, but not
+ *  across <code>eql?</code>, so:
+ *     
+ *     1 == 1.0     #=> true
+ *     1.eql? 1.0   #=> false
+ */
+
+static VALUE
+rb_obj_equal(obj1, obj2)
+    VALUE obj1, obj2;
+{
+    if (obj1 == obj2) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     obj.id    => fixnum
+ *  
+ *  Soon-to-be deprecated version of <code>Object#object_id</code>.
+ */
+
+VALUE
+rb_obj_id_obsolete(obj)
+    VALUE obj;
+{
+    rb_warn("Object#id will be deprecated; use Object#object_id");
+    return rb_obj_id(obj);
+}
+
+VALUE
+rb_class_real(cl)
+    VALUE cl;
+{
+    while (FL_TEST(cl, FL_SINGLETON) || TYPE(cl) == T_ICLASS) {
+	cl = RCLASS(cl)->super;
+    }
+    return cl;
+}
+
+/*
+ *  call-seq:
+ *     obj.type   => class
+ *  
+ *  Deprecated synonym for <code>Object#class</code>.
+ */
+
+VALUE
+rb_obj_type(obj)
+    VALUE obj;
+{
+    rb_warn("Object#type is deprecated; use Object#class");
+    return rb_class_real(CLASS_OF(obj));
+}
+
+
+/*
+ *  call-seq:
+ *     obj.class    => class
+ *  
+ *  Returns the class of <i>obj</i>, now preferred over
+ *  <code>Object#type</code>, as an object's type in Ruby is only
+ *  loosely tied to that object's class. This method must always be
+ *  called with an explicit receiver, as <code>class</code> is also a
+ *  reserved word in Ruby.
+ *     
+ *     1.class      #=> Fixnum
+ *     self.class   #=> Object
+ */
+
+VALUE
+rb_obj_class(obj)
+    VALUE obj;
+{
+    return rb_class_real(CLASS_OF(obj));
+}
+
+static void
+init_copy(dest, obj)
+    VALUE dest, obj;
+{
+    if (OBJ_FROZEN(dest)) {
+        rb_raise(rb_eTypeError, "[bug] frozen object (%s) allocated", rb_obj_classname(dest));
+    }
+    RBASIC(dest)->flags &= ~(T_MASK|FL_EXIVAR);
+    RBASIC(dest)->flags |= RBASIC(obj)->flags & (T_MASK|FL_EXIVAR|FL_TAINT);
+    if (FL_TEST(obj, FL_EXIVAR)) {
+	rb_copy_generic_ivar(dest, obj);
+    }
+    rb_gc_copy_finalizer(dest, obj);
+    switch (TYPE(obj)) {
+      case T_OBJECT:
+      case T_CLASS:
+      case T_MODULE:
+	if (ROBJECT(dest)->iv_tbl) {
+	    st_free_table(ROBJECT(dest)->iv_tbl);
+	    ROBJECT(dest)->iv_tbl = 0;
+	}
+	if (ROBJECT(obj)->iv_tbl) {
+	    ROBJECT(dest)->iv_tbl = st_copy(ROBJECT(obj)->iv_tbl);
+	}
+    }
+    rb_funcall(dest, id_init_copy, 1, obj);
+}
+
+/*
+ *  call-seq:
+ *     obj.clone -> an_object
+ *  
+ *  Produces a shallow copy of <i>obj</i>---the instance variables of
+ *  <i>obj</i> are copied, but not the objects they reference. Copies
+ *  the frozen and tainted state of <i>obj</i>. See also the discussion
+ *  under <code>Object#dup</code>.
+ *     
+ *     class Klass
+ *        attr_accessor :str
+ *     end
+ *     s1 = Klass.new      #=> #<Klass:0x401b3a38>
+ *     s1.str = "Hello"    #=> "Hello"
+ *     s2 = s1.clone       #=> #<Klass:0x401b3998 @str="Hello">
+ *     s2.str[1,4] = "i"   #=> "i"
+ *     s1.inspect          #=> "#<Klass:0x401b3a38 @str=\"Hi\">"
+ *     s2.inspect          #=> "#<Klass:0x401b3998 @str=\"Hi\">"
+ *
+ *  This method may have class-specific behavior.  If so, that
+ *  behavior will be documented under the #+initialize_copy+ method of
+ *  the class.
+ */
+
+VALUE
+rb_obj_clone(obj)
+    VALUE obj;
+{
+    VALUE clone;
+
+    if (rb_special_const_p(obj)) {
+        rb_raise(rb_eTypeError, "can't clone %s", rb_obj_classname(obj));
+    }
+    clone = rb_obj_alloc(rb_obj_class(obj));
+    RBASIC(clone)->klass = rb_singleton_class_clone(obj);
+    RBASIC(clone)->flags = (RBASIC(obj)->flags | FL_TEST(clone, FL_TAINT)) & ~(FL_FREEZE|FL_FINALIZE);
+    init_copy(clone, obj);
+    RBASIC(clone)->flags |= RBASIC(obj)->flags & FL_FREEZE;
+
+    return clone;
+}
+
+/*
+ *  call-seq:
+ *     obj.dup -> an_object
+ *  
+ *  Produces a shallow copy of <i>obj</i>---the instance variables of
+ *  <i>obj</i> are copied, but not the objects they reference.
+ *  <code>dup</code> copies the tainted state of <i>obj</i>. See also
+ *  the discussion under <code>Object#clone</code>. In general,
+ *  <code>clone</code> and <code>dup</code> may have different semantics
+ *  in descendent classes. While <code>clone</code> is used to duplicate
+ *  an object, including its internal state, <code>dup</code> typically
+ *  uses the class of the descendent object to create the new instance.
+ *
+ *  This method may have class-specific behavior.  If so, that
+ *  behavior will be documented under the #+initialize_copy+ method of
+ *  the class.
+ */
+
+VALUE
+rb_obj_dup(obj)
+    VALUE obj;
+{
+    VALUE dup;
+
+    if (rb_special_const_p(obj)) {
+        rb_raise(rb_eTypeError, "can't dup %s", rb_obj_classname(obj));
+    }
+    dup = rb_obj_alloc(rb_obj_class(obj));
+    init_copy(dup, obj);
+
+    return dup;
+}
+
+/* :nodoc: */
+VALUE
+rb_obj_init_copy(obj, orig)
+    VALUE obj, orig;
+{
+    if (obj == orig) return obj;
+    rb_check_frozen(obj);
+    if (TYPE(obj) != TYPE(orig) || rb_obj_class(obj) != rb_obj_class(orig)) {
+	rb_raise(rb_eTypeError, "initialize_copy should take same class object");
+    }
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     obj.to_a -> anArray
+ *  
+ *  Returns an array representation of <i>obj</i>. For objects of class
+ *  <code>Object</code> and others that don't explicitly override the
+ *  method, the return value is an array containing <code>self</code>. 
+ *  However, this latter behavior will soon be obsolete.
+ *     
+ *     self.to_a       #=> -:1: warning: default `to_a' will be obsolete
+ *     "hello".to_a    #=> ["hello"]
+ *     Time.new.to_a   #=> [39, 54, 8, 9, 4, 2003, 3, 99, true, "CDT"]
+ */
+
+
+static VALUE
+rb_any_to_a(obj)
+    VALUE obj;
+{
+    rb_warn("default `to_a' will be obsolete");
+    return rb_ary_new3(1, obj);
+}
+
+
+/*
+ *  call-seq:
+ *     obj.to_s    => string
+ *  
+ *  Returns a string representing <i>obj</i>. The default
+ *  <code>to_s</code> prints the object's class and an encoding of the
+ *  object id. As a special case, the top-level object that is the
+ *  initial execution context of Ruby programs returns ``main.''
+ */
+
+VALUE
+rb_any_to_s(obj)
+    VALUE obj;
+{
+    char *cname = rb_obj_classname(obj);
+    size_t len;
+    VALUE str;
+
+    len = strlen(cname)+6+16;
+    str = rb_str_new(0, len); /* 6:tags 16:addr */
+    snprintf(RSTRING(str)->ptr, len+1, "#<%s:0x%lx>", cname, obj);
+    RSTRING(str)->len = strlen(RSTRING(str)->ptr);
+    if (OBJ_TAINTED(obj)) OBJ_TAINT(str);
+
+    return str;
+}
+
+VALUE
+rb_inspect(obj)
+    VALUE obj;
+{
+    return rb_obj_as_string(rb_funcall(obj, id_inspect, 0, 0));
+}
+
+static int
+inspect_i(id, value, str)
+    ID id;
+    VALUE value;
+    VALUE str;
+{
+    VALUE str2;
+    char *ivname;
+
+    /* need not to show internal data */
+    if (CLASS_OF(value) == 0) return ST_CONTINUE;
+    if (!rb_is_instance_id(id)) return ST_CONTINUE;
+    if (RSTRING(str)->ptr[0] == '-') { /* first element */
+	RSTRING(str)->ptr[0] = '#';
+	rb_str_cat2(str, " ");
+    }
+    else {
+	rb_str_cat2(str, ", ");
+    }
+    ivname = rb_id2name(id);
+    rb_str_cat2(str, ivname);
+    rb_str_cat2(str, "=");
+    str2 = rb_inspect(value);
+    rb_str_append(str, str2);
+    OBJ_INFECT(str, str2);
+
+    return ST_CONTINUE;
+}
+
+static VALUE
+inspect_obj(obj, str)
+    VALUE obj, str;
+{
+    st_foreach_safe(ROBJECT(obj)->iv_tbl, inspect_i, str);
+    rb_str_cat2(str, ">");
+    RSTRING(str)->ptr[0] = '#';
+    OBJ_INFECT(str, obj);
+
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     obj.inspect   => string
+ *  
+ *  Returns a string containing a human-readable representation of
+ *  <i>obj</i>. If not overridden, uses the <code>to_s</code> method to
+ *  generate the string.
+ *     
+ *     [ 1, 2, 3..4, 'five' ].inspect   #=> "[1, 2, 3..4, \"five\"]"
+ *     Time.new.inspect                 #=> "Wed Apr 09 08:54:39 CDT 2003"
+ */
+
+
+static VALUE
+rb_obj_inspect(obj)
+    VALUE obj;
+{
+    if (TYPE(obj) == T_OBJECT
+	&& ROBJECT(obj)->iv_tbl
+	&& ROBJECT(obj)->iv_tbl->num_entries > 0) {
+	VALUE str;
+	size_t len;
+	char *c;
+
+	c = rb_obj_classname(obj);
+	if (rb_inspecting_p(obj)) {
+	    len = strlen(c)+10+16+1;
+	    str = rb_str_new(0, len); /* 10:tags 16:addr 1:nul */
+	    snprintf(RSTRING(str)->ptr, len, "#<%s:0x%lx ...>", c, obj);
+	    RSTRING(str)->len = strlen(RSTRING(str)->ptr);
+	    return str;
+	}
+	len = strlen(c)+6+16+1;
+	str = rb_str_new(0, len);     /* 6:tags 16:addr 1:nul */
+	snprintf(RSTRING(str)->ptr, len, "-<%s:0x%lx", c, obj);
+	RSTRING(str)->len = strlen(RSTRING(str)->ptr);
+	return rb_protect_inspect(inspect_obj, obj, str);
+    }
+    return rb_funcall(obj, rb_intern("to_s"), 0, 0);
+}
+
+
+/*
+ *  call-seq:
+ *     obj.instance_of?(class)    => true or false
+ *  
+ *  Returns <code>true</code> if <i>obj</i> is an instance of the given
+ *  class. See also <code>Object#kind_of?</code>.
+ */
+
+VALUE
+rb_obj_is_instance_of(obj, c)
+    VALUE obj, c;
+{
+    switch (TYPE(c)) {
+      case T_MODULE:
+      case T_CLASS:
+      case T_ICLASS:
+	break;
+      default:
+	rb_raise(rb_eTypeError, "class or module required");
+    }
+
+    if (rb_obj_class(obj) == c) return Qtrue;
+    return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     obj.is_a?(class)       => true or false
+ *     obj.kind_of?(class)    => true or false
+ *  
+ *  Returns <code>true</code> if <i>class</i> is the class of
+ *  <i>obj</i>, or if <i>class</i> is one of the superclasses of
+ *  <i>obj</i> or modules included in <i>obj</i>.
+ *     
+ *     module M;    end
+ *     class A
+ *       include M
+ *     end
+ *     class B < A; end
+ *     class C < B; end
+ *     b = B.new
+ *     b.instance_of? A   #=> false
+ *     b.instance_of? B   #=> true
+ *     b.instance_of? C   #=> false
+ *     b.instance_of? M   #=> false
+ *     b.kind_of? A       #=> true
+ *     b.kind_of? B       #=> true
+ *     b.kind_of? C       #=> false
+ *     b.kind_of? M       #=> true
+ */
+
+VALUE
+rb_obj_is_kind_of(obj, c)
+    VALUE obj, c;
+{
+    VALUE cl = CLASS_OF(obj);
+
+    switch (TYPE(c)) {
+      case T_MODULE:
+      case T_CLASS:
+      case T_ICLASS:
+	break;
+
+      default:
+	rb_raise(rb_eTypeError, "class or module required");
+    }
+
+    while (cl) {
+	if (cl == c || RCLASS(cl)->m_tbl == RCLASS(c)->m_tbl)
+	    return Qtrue;
+	cl = RCLASS(cl)->super;
+    }
+    return Qfalse;
+}
+
+
+/*
+ * Document-method: inherited
+ *
+ * call-seq:
+ *    inherited(subclass)
+ *
+ * Callback invoked whenever a subclass of the current class is created.
+ *
+ * Example:
+ *
+ *    class Foo
+ *       def self.inherited(subclass)
+ *          puts "New subclass: #{subclass}"
+ *       end
+ *    end
+ *
+ *    class Bar < Foo
+ *    end
+ *
+ *    class Baz < Bar
+ *    end
+ *
+ * produces:
+ *
+ *    New subclass: Bar
+ *    New subclass: Baz
+ */
+
+/*
+ * Document-method: singleton_method_added
+ *
+ *  call-seq:
+ *     singleton_method_added(symbol)
+ *  
+ *  Invoked as a callback whenever a singleton method is added to the
+ *  receiver.
+ *     
+ *     module Chatty
+ *       def Chatty.singleton_method_added(id)
+ *         puts "Adding #{id.id2name}"
+ *       end
+ *       def self.one()     end
+ *       def two()          end
+ *       def Chatty.three() end
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Adding singleton_method_added
+ *     Adding one
+ *     Adding three
+ *     
+ */
+
+/*
+ * Document-method: singleton_method_removed
+ *
+ *  call-seq:
+ *     singleton_method_removed(symbol)
+ *  
+ *  Invoked as a callback whenever a singleton method is removed from
+ *  the receiver.
+ *     
+ *     module Chatty
+ *       def Chatty.singleton_method_removed(id)
+ *         puts "Removing #{id.id2name}"
+ *       end
+ *       def self.one()     end
+ *       def two()          end
+ *       def Chatty.three() end
+ *       class <<self
+ *         remove_method :three
+ *         remove_method :one
+ *       end
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Removing three
+ *     Removing one
+ */
+
+/*
+ * Document-method: singleton_method_undefined
+ *
+ *  call-seq:
+ *     singleton_method_undefined(symbol)
+ *  
+ *  Invoked as a callback whenever a singleton method is undefined in
+ *  the receiver.
+ *     
+ *     module Chatty
+ *       def Chatty.singleton_method_undefined(id)
+ *         puts "Undefining #{id.id2name}"
+ *       end
+ *       def Chatty.one()   end
+ *       class << self
+ *          undef_method(:one)
+ *       end
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Undefining one
+ */
+
+
+/*
+ * Document-method: included
+ *
+ * call-seq:
+ *    included( othermod )
+ *
+ * Callback invoked whenever the receiver is included in another
+ * module or class. This should be used in preference to
+ * <tt>Module.append_features</tt> if your code wants to perform some
+ * action when a module is included in another.
+ *
+ *        module A
+ *          def A.included(mod)
+ *            puts "#{self} included in #{mod}"
+ *          end
+ *        end
+ *        module Enumerable
+ *          include A
+ *        end
+ */
+
+
+/*
+ * Not documented
+ */
+
+static VALUE
+rb_obj_dummy()
+{
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     obj.tainted?    => true or false
+ *  
+ *  Returns <code>true</code> if the object is tainted.
+ */
+
+VALUE
+rb_obj_tainted(obj)
+    VALUE obj;
+{
+    if (OBJ_TAINTED(obj))
+	return Qtrue;
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     obj.taint -> obj
+ *  
+ *  Marks <i>obj</i> as tainted---if the <code>$SAFE</code> level is
+ *  set appropriately, many method calls which might alter the running
+ *  programs environment will refuse to accept tainted strings.
+ */
+
+VALUE
+rb_obj_taint(obj)
+    VALUE obj;
+{
+    rb_secure(4);
+    if (!OBJ_TAINTED(obj)) {
+	if (OBJ_FROZEN(obj)) {
+	    rb_error_frozen("object");
+	}
+	OBJ_TAINT(obj);
+    }
+    return obj;
+}
+
+
+/*
+ *  call-seq:
+ *     obj.untaint    => obj
+ *  
+ *  Removes the taint from <i>obj</i>.
+ */
+
+VALUE
+rb_obj_untaint(obj)
+    VALUE obj;
+{
+    rb_secure(3);
+    if (OBJ_TAINTED(obj)) {
+	if (OBJ_FROZEN(obj)) {
+	    rb_error_frozen("object");
+	}
+	FL_UNSET(obj, FL_TAINT);
+    }
+    return obj;
+}
+
+void
+rb_obj_infect(obj1, obj2)
+    VALUE obj1, obj2;
+{
+    OBJ_INFECT(obj1, obj2);
+}
+
+
+/*
+ *  call-seq:
+ *     obj.freeze    => obj
+ *  
+ *  Prevents further modifications to <i>obj</i>. A
+ *  <code>TypeError</code> will be raised if modification is attempted.
+ *  There is no way to unfreeze a frozen object. See also
+ *  <code>Object#frozen?</code>.
+ *     
+ *     a = [ "a", "b", "c" ]
+ *     a.freeze
+ *     a << "z"
+ *     
+ *  <em>produces:</em>
+ *     
+ *     prog.rb:3:in `<<': can't modify frozen array (TypeError)
+ *     	from prog.rb:3
+ */
+
+VALUE
+rb_obj_freeze(obj)
+    VALUE obj;
+{
+    if (!OBJ_FROZEN(obj)) {
+	if (rb_safe_level() >= 4 && !OBJ_TAINTED(obj)) {
+	    rb_raise(rb_eSecurityError, "Insecure: can't freeze object");
+	}
+	OBJ_FREEZE(obj);
+    }
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     obj.frozen?    => true or false
+ *  
+ *  Returns the freeze status of <i>obj</i>.
+ *     
+ *     a = [ "a", "b", "c" ]
+ *     a.freeze    #=> ["a", "b", "c"]
+ *     a.frozen?   #=> true
+ */
+
+static VALUE
+rb_obj_frozen_p(obj)
+    VALUE obj;
+{
+    if (OBJ_FROZEN(obj)) return Qtrue;
+    return Qfalse;
+}
+
+
+/*
+ * Document-class: NilClass
+ *
+ *  The class of the singleton object <code>nil</code>.
+ */
+
+/*
+ *  call-seq:
+ *     nil.to_i => 0
+ *  
+ *  Always returns zero.
+ *     
+ *     nil.to_i   #=> 0
+ */
+
+
+static VALUE
+nil_to_i(obj)
+    VALUE obj;
+{
+    return INT2FIX(0);
+}
+
+/*
+ *  call-seq:
+ *     nil.to_f    => 0.0
+ *  
+ *  Always returns zero.
+ *     
+ *     nil.to_f   #=> 0.0
+ */
+
+static VALUE
+nil_to_f(obj)
+    VALUE obj;
+{
+    return rb_float_new(0.0);
+}
+
+/*
+ *  call-seq:
+ *     nil.to_s    => ""
+ *  
+ *  Always returns the empty string.
+ *     
+ *     nil.to_s   #=> ""
+ */
+
+static VALUE
+nil_to_s(obj)
+    VALUE obj;
+{
+    return rb_str_new2("");
+}
+
+/*
+ *  call-seq:
+ *     nil.to_a    => []
+ *  
+ *  Always returns an empty array.
+ *     
+ *     nil.to_a   #=> []
+ */
+
+static VALUE
+nil_to_a(obj)
+    VALUE obj;
+{
+    return rb_ary_new2(0);
+}
+
+/*
+ *  call-seq:
+ *    nil.inspect  => "nil"
+ *
+ *  Always returns the string "nil".
+ */
+
+static VALUE
+nil_inspect(obj)
+    VALUE obj;
+{
+    return rb_str_new2("nil");
+}
+
+#ifdef NIL_PLUS
+static VALUE
+nil_plus(x, y)
+    VALUE x, y;
+{
+    switch (TYPE(y)) {
+      case T_NIL:
+      case T_FIXNUM:
+      case T_FLOAT:
+      case T_BIGNUM:
+      case T_STRING:
+      case T_ARRAY:
+	return y;
+      default:
+	rb_raise(rb_eTypeError, "tried to add %s(%s) to nil",
+		 RSTRING(rb_inspect(y))->ptr,
+		 rb_obj_classname(y));
+    }
+    /* not reached */
+}
+#endif
+
+static VALUE
+main_to_s(obj)
+    VALUE obj;
+{
+    return rb_str_new2("main");
+}
+
+
+/***********************************************************************
+ *  Document-class: TrueClass
+ *
+ *  The global value <code>true</code> is the only instance of class
+ *  <code>TrueClass</code> and represents a logically true value in
+ *  boolean expressions. The class provides operators allowing
+ *  <code>true</code> to be used in logical expressions.
+ */
+
+
+/*
+ * call-seq:
+ *   true.to_s   =>  "true"
+ *
+ * The string representation of <code>true</code> is "true".
+ */
+
+static VALUE
+true_to_s(obj)
+    VALUE obj;
+{
+    return rb_str_new2("true");
+}
+
+
+/*
+ *  call-seq:
+ *     true & obj    => true or false
+ *  
+ *  And---Returns <code>false</code> if <i>obj</i> is
+ *  <code>nil</code> or <code>false</code>, <code>true</code> otherwise.
+ */
+
+static VALUE
+true_and(obj, obj2)
+    VALUE obj, obj2;
+{
+    return RTEST(obj2)?Qtrue:Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     true | obj   => true
+ *  
+ *  Or---Returns <code>true</code>. As <i>anObject</i> is an argument to
+ *  a method call, it is always evaluated; there is no short-circuit
+ *  evaluation in this case.
+ *     
+ *     true |  puts("or")
+ *     true || puts("logical or")
+ *     
+ *  <em>produces:</em>
+ *     
+ *     or
+ */
+
+static VALUE
+true_or(obj, obj2)
+    VALUE obj, obj2;
+{
+    return Qtrue;
+}
+
+
+/*
+ *  call-seq:
+ *     true ^ obj   => !obj
+ *  
+ *  Exclusive Or---Returns <code>true</code> if <i>obj</i> is
+ *  <code>nil</code> or <code>false</code>, <code>false</code>
+ *  otherwise.
+ */
+
+static VALUE
+true_xor(obj, obj2)
+    VALUE obj, obj2;
+{
+    return RTEST(obj2)?Qfalse:Qtrue;
+}
+
+
+/*
+ *  Document-class: FalseClass
+ *
+ *  The global value <code>false</code> is the only instance of class
+ *  <code>FalseClass</code> and represents a logically false value in
+ *  boolean expressions. The class provides operators allowing
+ *  <code>false</code> to participate correctly in logical expressions.
+ *     
+ */
+
+/*
+ * call-seq:
+ *   false.to_s   =>  "false"
+ *
+ * 'nuf said...
+ */
+
+static VALUE
+false_to_s(obj)
+    VALUE obj;
+{
+    return rb_str_new2("false");
+}
+
+/*
+ *  call-seq:
+ *     false & obj   => false
+ *     nil & obj     => false
+ *  
+ *  And---Returns <code>false</code>. <i>obj</i> is always
+ *  evaluated as it is the argument to a method call---there is no
+ *  short-circuit evaluation in this case.
+ */
+
+static VALUE
+false_and(obj, obj2)
+    VALUE obj, obj2;
+{
+    return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     false | obj   =>   true or false
+ *     nil   | obj   =>   true or false
+ *  
+ *  Or---Returns <code>false</code> if <i>obj</i> is
+ *  <code>nil</code> or <code>false</code>; <code>true</code> otherwise.
+ */
+
+static VALUE
+false_or(obj, obj2)
+    VALUE obj, obj2;
+{
+    return RTEST(obj2)?Qtrue:Qfalse;
+}
+
+
+
+/*
+ *  call-seq:
+ *     false ^ obj    => true or false
+ *     nil   ^ obj    => true or false
+ *  
+ *  Exclusive Or---If <i>obj</i> is <code>nil</code> or
+ *  <code>false</code>, returns <code>false</code>; otherwise, returns
+ *  <code>true</code>.
+ *     
+ */
+
+static VALUE
+false_xor(obj, obj2)
+    VALUE obj, obj2;
+{
+    return RTEST(obj2)?Qtrue:Qfalse;
+}
+
+/*
+ * call_seq:
+ *   nil.nil?               => true
+ *
+ * Only the object <i>nil</i> responds <code>true</code> to <code>nil?</code>.
+ */
+
+static VALUE
+rb_true(obj)
+    VALUE obj;
+{
+    return Qtrue;
+}
+
+/*
+ * call_seq:
+ *   nil.nil?               => true
+ *   <anything_else>.nil?   => false
+ *
+ * Only the object <i>nil</i> responds <code>true</code> to <code>nil?</code>.
+ */
+
+
+static VALUE
+rb_false(obj)
+    VALUE obj;
+{
+    return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     obj =~ other  => false
+ *  
+ *  Pattern Match---Overridden by descendents (notably
+ *  <code>Regexp</code> and <code>String</code>) to provide meaningful
+ *  pattern-match semantics.
+ */
+
+static VALUE
+rb_obj_pattern_match(obj1, obj2)
+    VALUE obj1, obj2;
+{
+    return Qfalse;
+}
+
+/**********************************************************************
+ * Document-class: Symbol
+ *
+ *  <code>Symbol</code> objects represent names and some strings
+ *  inside the Ruby
+ *  interpreter. They are generated using the <code>:name</code> and
+ *  <code>:"string"</code> literals
+ *  syntax, and by the various <code>to_sym</code> methods. The same
+ *  <code>Symbol</code> object will be created for a given name or string
+ *  for the duration of a program's execution, regardless of the context
+ *  or meaning of that name. Thus if <code>Fred</code> is a constant in
+ *  one context, a method in another, and a class in a third, the
+ *  <code>Symbol</code> <code>:Fred</code> will be the same object in
+ *  all three contexts.
+ *     
+ *     module One
+ *       class Fred
+ *       end
+ *       $f1 = :Fred
+ *     end
+ *     module Two
+ *       Fred = 1
+ *       $f2 = :Fred
+ *     end
+ *     def Fred()
+ *     end
+ *     $f3 = :Fred
+ *     $f1.id   #=> 2514190
+ *     $f2.id   #=> 2514190
+ *     $f3.id   #=> 2514190
+ *     
+ */
+
+/*
+ *  call-seq:
+ *     sym.to_i      => fixnum
+ *  
+ *  Returns an integer that is unique for each symbol within a
+ *  particular execution of a program.
+ *     
+ *     :fred.to_i           #=> 9809
+ *     "fred".to_sym.to_i   #=> 9809
+ */
+
+static VALUE
+sym_to_i(sym)
+    VALUE sym;
+{
+    ID id = SYM2ID(sym);
+
+    return LONG2FIX(id);
+}
+
+
+/* :nodoc: */
+
+static VALUE
+sym_to_int(sym)
+    VALUE sym;
+{
+    rb_warning("treating Symbol as an integer");
+    return sym_to_i(sym);
+}
+
+
+/*
+ *  call-seq:
+ *     sym.inspect    => string
+ *  
+ *  Returns the representation of <i>sym</i> as a symbol literal.
+ *     
+ *     :fred.inspect   #=> ":fred"
+ */
+
+static VALUE
+sym_inspect(sym)
+    VALUE sym;
+{
+    VALUE str;
+    char *name;
+    ID id = SYM2ID(sym);
+
+    name = rb_id2name(id);
+    str = rb_str_new(0, strlen(name)+1);
+    RSTRING(str)->ptr[0] = ':';
+    strcpy(RSTRING(str)->ptr+1, name);
+    if (!rb_symname_p(name)) {
+	str = rb_str_dump(str);
+	strncpy(RSTRING(str)->ptr, ":\"", 2);
+    }
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     sym.id2name   => string
+ *     sym.to_s      => string
+ *  
+ *  Returns the name or string corresponding to <i>sym</i>.
+ *     
+ *     :fred.id2name   #=> "fred"
+ */
+
+
+static VALUE
+sym_to_s(sym)
+    VALUE sym;
+{
+    return rb_str_new2(rb_id2name(SYM2ID(sym)));
+}
+
+
+/*
+ * call-seq:
+ *   sym.to_sym   => sym
+ *
+ * In general, <code>to_sym</code> returns the <code>Symbol</code> corresponding
+ * to an object. As <i>sym</i> is already a symbol, <code>self</code> is returned
+ * in this case.
+ */
+
+static VALUE
+sym_to_sym(sym)
+    VALUE sym;
+{
+    return sym;
+}
+
+
+/***********************************************************************
+ *
+ * Document-class: Module
+ *
+ *  A <code>Module</code> is a collection of methods and constants. The
+ *  methods in a module may be instance methods or module methods.
+ *  Instance methods appear as methods in a class when the module is
+ *  included, module methods do not. Conversely, module methods may be
+ *  called without creating an encapsulating object, while instance
+ *  methods may not. (See <code>Module#module_function</code>)
+ *     
+ *  In the descriptions that follow, the parameter <i>syml</i> refers
+ *  to a symbol, which is either a quoted string or a
+ *  <code>Symbol</code> (such as <code>:name</code>).
+ *     
+ *     module Mod
+ *       include Math
+ *       CONST = 1
+ *       def meth
+ *         #  ...
+ *       end
+ *     end
+ *     Mod.class              #=> Module
+ *     Mod.constants          #=> ["E", "PI", "CONST"]
+ *     Mod.instance_methods   #=> ["meth"]
+ *     
+ */
+
+/*
+ * call-seq:
+ *   mod.to_s   => string
+ *
+ * Return a string representing this module or class. For basic
+ * classes and modules, this is the name. For singletons, we
+ * show information on the thing we're attached to as well.
+ */
+
+static VALUE
+rb_mod_to_s(klass)
+    VALUE klass;
+
+{
+    if (FL_TEST(klass, FL_SINGLETON)) {
+	VALUE s = rb_str_new2("#<");
+	VALUE v = rb_iv_get(klass, "__attached__");
+
+	rb_str_cat2(s, "Class:");
+	switch (TYPE(v)) {
+	  case T_CLASS: case T_MODULE:
+	    rb_str_append(s, rb_inspect(v));
+	    break;
+	  default:
+	    rb_str_append(s, rb_any_to_s(v));
+	    break;
+	}
+	rb_str_cat2(s, ">");
+
+	return s;
+    }
+    return rb_str_dup(rb_class_name(klass));
+}
+
+/*
+ *  call-seq:
+ *     mod.freeze
+ *  
+ *  Prevents further modifications to <i>mod</i>.
+ */
+
+static VALUE
+rb_mod_freeze(mod)
+    VALUE mod;
+{
+    rb_mod_to_s(mod);
+    return rb_obj_freeze(mod);
+}
+
+/*
+ *  call-seq:
+ *     mod === obj    => true or false
+ *  
+ *  Case Equality---Returns <code>true</code> if <i>anObject</i> is an
+ *  instance of <i>mod</i> or one of <i>mod</i>'s descendents. Of
+ *  limited use for modules, but can be used in <code>case</code>
+ *  statements to classify objects by class.
+ */
+
+static VALUE
+rb_mod_eqq(mod, arg)
+    VALUE mod, arg;
+{
+    return rb_obj_is_kind_of(arg, mod);
+}
+
+/*
+ * call-seq:
+ *   mod <= other   =>  true, false, or nil
+ *
+ * Returns true if <i>mod</i> is a subclass of <i>other</i> or
+ * is the same as <i>other</i>. Returns 
+ * <code>nil</code> if there's no relationship between the two. 
+ * (Think of the relationship in terms of the class definition: 
+ * "class A<B" implies "A<B").
+ *
+ */
+
+VALUE
+rb_class_inherited_p(mod, arg)
+    VALUE mod, arg;
+{
+    VALUE start = mod;
+
+    if (mod == arg) return Qtrue;
+    switch (TYPE(arg)) {
+      case T_MODULE:
+      case T_CLASS:
+	break;
+      default:
+	rb_raise(rb_eTypeError, "compared with non class/module");
+    }
+
+    if (FL_TEST(mod, FL_SINGLETON)) {
+	if (RCLASS(mod)->m_tbl == RCLASS(arg)->m_tbl)
+	    return Qtrue;
+	mod = RBASIC(mod)->klass;
+    }
+    while (mod) {
+	if (RCLASS(mod)->m_tbl == RCLASS(arg)->m_tbl)
+	    return Qtrue;
+	mod = RCLASS(mod)->super;
+    }
+    /* not mod < arg; check if mod > arg */
+    while (arg) {
+	if (RCLASS(arg)->m_tbl == RCLASS(start)->m_tbl)
+	    return Qfalse;
+	arg = RCLASS(arg)->super;
+    }
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   mod < other   =>  true, false, or nil
+ *
+ * Returns true if <i>mod</i> is a subclass of <i>other</i>. Returns 
+ * <code>nil</code> if there's no relationship between the two. 
+ * (Think of the relationship in terms of the class definition: 
+ * "class A<B" implies "A<B").
+ *
+ */
+
+static VALUE
+rb_mod_lt(mod, arg)
+    VALUE mod, arg;
+{
+    if (mod == arg) return Qfalse;
+    return rb_class_inherited_p(mod, arg);
+}
+
+
+/*
+ * call-seq:
+ *   mod >= other   =>  true, false, or nil
+ *
+ * Returns true if <i>mod</i> is an ancestor of <i>other</i>, or the
+ * two modules are the same. Returns 
+ * <code>nil</code> if there's no relationship between the two. 
+ * (Think of the relationship in terms of the class definition: 
+ * "class A<B" implies "B>A").
+ *
+ */
+
+static VALUE
+rb_mod_ge(mod, arg)
+    VALUE mod, arg;
+{
+    switch (TYPE(arg)) {
+      case T_MODULE:
+      case T_CLASS:
+	break;
+      default:
+	rb_raise(rb_eTypeError, "compared with non class/module");
+    }
+
+    return rb_class_inherited_p(arg, mod);
+}
+
+/*
+ * call-seq:
+ *   mod > other   =>  true, false, or nil
+ *
+ * Returns true if <i>mod</i> is an ancestor of <i>other</i>. Returns 
+ * <code>nil</code> if there's no relationship between the two. 
+ * (Think of the relationship in terms of the class definition: 
+ * "class A<B" implies "B>A").
+ *
+ */
+
+static VALUE
+rb_mod_gt(mod, arg)
+    VALUE mod, arg;
+{
+    if (mod == arg) return Qfalse;
+    return rb_mod_ge(mod, arg);
+}
+
+/*
+ *  call-seq:
+ *     mod <=> other_mod   => -1, 0, +1, or nil
+ *  
+ *  Comparison---Returns -1 if <i>mod</i> includes <i>other_mod</i>, 0 if
+ *  <i>mod</i> is the same as <i>other_mod</i>, and +1 if <i>mod</i> is
+ *  included by <i>other_mod</i> or if <i>mod</i> has no relationship with
+ *  <i>other_mod</i>. Returns <code>nil</code> if <i>other_mod</i> is
+ *  not a module.
+ */
+
+static VALUE
+rb_mod_cmp(mod, arg)
+    VALUE mod, arg;
+{
+    VALUE cmp;
+
+    if (mod == arg) return INT2FIX(0);
+    switch (TYPE(arg)) {
+      case T_MODULE:
+      case T_CLASS:
+	break;
+      default:
+	return Qnil;
+    }
+
+    cmp = rb_class_inherited_p(mod, arg);
+    if (NIL_P(cmp)) return Qnil;
+    if (cmp) {
+	return INT2FIX(-1);
+    }
+    return INT2FIX(1);
+}
+
+static VALUE rb_module_s_alloc _((VALUE));
+static VALUE
+rb_module_s_alloc(klass)
+    VALUE klass;
+{
+    VALUE mod = rb_module_new();
+
+    RBASIC(mod)->klass = klass;
+    return mod;
+}
+
+static VALUE rb_class_s_alloc _((VALUE));
+static VALUE
+rb_class_s_alloc(klass)
+    VALUE klass;
+{
+    return rb_class_boot(0);
+}
+
+/*
+ *  call-seq:
+ *    Module.new                  => mod
+ *    Module.new {|mod| block }   => mod
+ *  
+ *  Creates a new anonymous module. If a block is given, it is passed
+ *  the module object, and the block is evaluated in the context of this
+ *  module using <code>module_eval</code>.
+ *     
+ *     Fred = Module.new do
+ *       def meth1
+ *         "hello"
+ *       end
+ *       def meth2
+ *         "bye"
+ *       end
+ *     end
+ *     a = "my string"
+ *     a.extend(Fred)   #=> "my string"
+ *     a.meth1          #=> "hello"
+ *     a.meth2          #=> "bye"
+ */
+
+static VALUE
+rb_mod_initialize(module)
+    VALUE module;
+{
+    if (rb_block_given_p()) {
+	rb_mod_module_eval(0, 0, module);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     Class.new(super_class=Object)   =>    a_class
+ *  
+ *  Creates a new anonymous (unnamed) class with the given superclass
+ *  (or <code>Object</code> if no parameter is given). You can give a
+ *  class a name by assigning the class object to a constant.
+ *     
+ */
+
+static VALUE
+rb_class_initialize(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE super;
+
+    if (RCLASS(klass)->super != 0) {
+	rb_raise(rb_eTypeError, "already initialized class");
+    }
+    if (rb_scan_args(argc, argv, "01", &super) == 0) {
+	super = rb_cObject;
+    }
+    else {
+	rb_check_inheritable(super);
+    }
+    RCLASS(klass)->super = super;
+    rb_make_metaclass(klass, RBASIC(super)->klass);
+    rb_mod_initialize(klass);
+    rb_class_inherited(super, klass);
+
+    return klass;
+}
+
+/*
+ *  call-seq:
+ *     class.allocate()   =>   obj
+ *  
+ *  Allocates space for a new object of <i>class</i>'s class. The
+ *  returned object must be an instance of <i>class</i>.
+ *     
+ */
+
+VALUE
+rb_obj_alloc(klass)
+    VALUE klass;
+{
+    VALUE obj;
+
+    if (RCLASS(klass)->super == 0) {
+	rb_raise(rb_eTypeError, "can't instantiate uninitialized class");
+    }
+    if (FL_TEST(klass, FL_SINGLETON)) {
+	rb_raise(rb_eTypeError, "can't create instance of virtual class");
+    }
+    obj = rb_funcall(klass, ID_ALLOCATOR, 0, 0);
+    if (rb_obj_class(obj) != rb_class_real(klass)) {
+	rb_raise(rb_eTypeError, "wrong instance allocation");
+    }
+    return obj;
+}
+
+static VALUE rb_class_allocate_instance _((VALUE));
+static VALUE
+rb_class_allocate_instance(klass)
+    VALUE klass;
+{
+    NEWOBJ(obj, struct RObject);
+    OBJSETUP(obj, klass, T_OBJECT);
+    return (VALUE)obj;
+}
+
+/*
+ *  call-seq:
+ *     class.new(args, ...)    =>  obj
+ *  
+ *  Calls <code>allocate</code> to create a new object of
+ *  <i>class</i>'s class, then invokes that object's
+ *  <code>initialize</code> method, passing it <i>args</i>.
+ *  This is the method that ends up getting called whenever
+ *  an object is constructed using .new.
+ *     
+ */
+
+VALUE
+rb_class_new_instance(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE obj;
+
+    obj = rb_obj_alloc(klass);
+    rb_obj_call_init(obj, argc, argv);
+
+    return obj;
+}
+
+/*
+ *  call-seq:
+ *     class.superclass -> a_super_class or nil
+ *  
+ *  Returns the superclass of <i>class</i>, or <code>nil</code>.
+ *     
+ *     File.superclass     #=> IO
+ *     IO.superclass       #=> Object
+ *     Object.superclass   #=> nil
+ *     
+ */
+
+static VALUE
+rb_class_superclass(klass)
+    VALUE klass;
+{
+    VALUE super = RCLASS(klass)->super;
+
+    if (!super) {
+	rb_raise(rb_eTypeError, "uninitialized class");
+    }
+    if (FL_TEST(klass, FL_SINGLETON)) {
+	super = RBASIC(klass)->klass;
+    }
+    while (TYPE(super) == T_ICLASS) {
+	super = RCLASS(super)->super;
+    }
+    if (!super) {
+	return Qnil;
+    }
+    return super;
+}
+
+static ID
+str_to_id(str)
+    VALUE str;
+{
+    VALUE sym = rb_str_intern(str);
+
+    return SYM2ID(sym);
+}
+
+ID
+rb_to_id(name)
+    VALUE name;
+{
+    VALUE tmp;
+    ID id;
+
+    switch (TYPE(name)) {
+      case T_STRING:
+	return str_to_id(name);
+      case T_FIXNUM:
+	rb_warn("do not use Fixnums as Symbols");
+	id = FIX2LONG(name);
+	if (!rb_id2name(id)) {
+	    rb_raise(rb_eArgError, "%ld is not a symbol", id);
+	}
+	break;
+      case T_SYMBOL:
+	id = SYM2ID(name);
+	break;
+      default:
+	tmp = rb_check_string_type(name);
+	if (!NIL_P(tmp)) {
+	    return str_to_id(tmp);
+	}
+	rb_raise(rb_eTypeError, "%s is not a symbol", RSTRING(rb_inspect(name))->ptr);
+    }
+    return id;
+}
+
+/*
+ *  call-seq:
+ *     attr(symbol, writable=false)    => nil
+ *  
+ *  Defines a named attribute for this module, where the name is
+ *  <i>symbol.</i><code>id2name</code>, creating an instance variable
+ *  (<code>@name</code>) and a corresponding access method to read it.
+ *  If the optional <i>writable</i> argument is <code>true</code>, also
+ *  creates a method called <code>name=</code> to set the attribute.
+ *     
+ *     module Mod
+ *       attr  :size, true
+ *     end
+ *     
+ *  <em>is equivalent to:</em>
+ *     
+ *     module Mod
+ *       def size
+ *         @size
+ *       end
+ *       def size=(val)
+ *         @size = val
+ *       end
+ *     end
+ */
+
+static VALUE
+rb_mod_attr(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE name, pub;
+
+    rb_scan_args(argc, argv, "11", &name, &pub);
+    rb_attr(klass, rb_to_id(name), 1, RTEST(pub), Qtrue);
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     attr_reader(symbol, ...)    => nil
+ *  
+ *  Creates instance variables and corresponding methods that return the
+ *  value of each instance variable. Equivalent to calling
+ *  ``<code>attr</code><i>:name</i>'' on each name in turn.
+ */
+
+static VALUE
+rb_mod_attr_reader(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    int i;
+
+    for (i=0; i<argc; i++) {
+	rb_attr(klass, rb_to_id(argv[i]), 1, 0, Qtrue);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *      attr_writer(symbol, ...)    => nil
+ *  
+ *  Creates an accessor method to allow assignment to the attribute
+ *  <i>aSymbol</i><code>.id2name</code>.
+ */
+
+static VALUE
+rb_mod_attr_writer(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    int i;
+
+    for (i=0; i<argc; i++) {
+	rb_attr(klass, rb_to_id(argv[i]), 0, 1, Qtrue);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     attr_accessor(symbol, ...)    => nil
+ *  
+ *  Equivalent to calling ``<code>attr</code><i>symbol</i><code>,
+ *  true</code>'' on each <i>symbol</i> in turn.
+ *     
+ *     module Mod
+ *       attr_accessor(:one, :two)
+ *     end
+ *     Mod.instance_methods.sort   #=> ["one", "one=", "two", "two="]
+ */
+
+static VALUE
+rb_mod_attr_accessor(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    int i;
+
+    for (i=0; i<argc; i++) {
+	rb_attr(klass, rb_to_id(argv[i]), 1, 1, Qtrue);
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     mod.const_get(sym)    => obj
+ *  
+ *  Returns the value of the named constant in <i>mod</i>.
+ *     
+ *     Math.const_get(:PI)   #=> 3.14159265358979
+ */
+
+static VALUE
+rb_mod_const_get(mod, name)
+    VALUE mod, name;
+{
+    ID id = rb_to_id(name);
+
+    if (!rb_is_const_id(id)) {
+	rb_name_error(id, "wrong constant name %s", rb_id2name(id));
+    }
+    return rb_const_get(mod, id);
+}
+
+/*
+ *  call-seq:
+ *     mod.const_set(sym, obj)    => obj
+ *  
+ *  Sets the named constant to the given object, returning that object.
+ *  Creates a new constant if no constant with the given name previously
+ *  existed.
+ *     
+ *     Math.const_set("HIGH_SCHOOL_PI", 22.0/7.0)   #=> 3.14285714285714
+ *     Math::HIGH_SCHOOL_PI - Math::PI              #=> 0.00126448926734968
+ */
+
+static VALUE
+rb_mod_const_set(mod, name, value)
+    VALUE mod, name, value;
+{
+    ID id = rb_to_id(name);
+
+    if (!rb_is_const_id(id)) {
+	rb_name_error(id, "wrong constant name %s", rb_id2name(id));
+    }
+    rb_const_set(mod, id, value);
+    return value;
+}
+
+/*
+ *  call-seq:
+ *     mod.const_defined?(sym)   => true or false
+ *  
+ *  Returns <code>true</code> if a constant with the given name is
+ *  defined by <i>mod</i>.
+ *     
+ *     Math.const_defined? "PI"   #=> true
+ */
+
+static VALUE
+rb_mod_const_defined(mod, name)
+    VALUE mod, name;
+{
+    ID id = rb_to_id(name);
+
+    if (!rb_is_const_id(id)) {
+	rb_name_error(id, "wrong constant name %s", rb_id2name(id));
+    }
+    return rb_const_defined_at(mod, id);
+}
+
+/*
+ *  call-seq:
+ *     obj.methods    => array
+ *  
+ *  Returns a list of the names of methods publicly accessible in
+ *  <i>obj</i>. This will include all the methods accessible in
+ *  <i>obj</i>'s ancestors.
+ *     
+ *     class Klass
+ *       def kMethod()
+ *       end
+ *     end
+ *     k = Klass.new
+ *     k.methods[0..9]    #=> ["kMethod", "freeze", "nil?", "is_a?", 
+ *                             "class", "instance_variable_set",
+ *                              "methods", "extend", "__send__", "instance_eval"]
+ *     k.methods.length   #=> 42
+ */
+
+static VALUE
+rb_obj_methods(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+  retry:
+    if (argc == 0) {
+	VALUE args[1];
+
+	args[0] = Qtrue;
+	return rb_class_instance_methods(1, args, CLASS_OF(obj));
+    }
+    else {
+	VALUE recur;
+
+	rb_scan_args(argc, argv, "1", &recur);
+	if (RTEST(recur)) {
+	    argc = 0;
+	    goto retry;
+	}
+	return rb_obj_singleton_methods(argc, argv, obj);
+    }
+}
+
+/*
+ *  call-seq:
+ *     obj.protected_methods(all=true)   => array
+ *  
+ *  Returns the list of protected methods accessible to <i>obj</i>. If
+ *  the <i>all</i> parameter is set to <code>false</code>, only those methods
+ *  in the receiver will be listed.
+ */
+
+static VALUE
+rb_obj_protected_methods(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    if (argc == 0) {		/* hack to stop warning */
+	VALUE args[1];
+
+	args[0] = Qtrue;
+	return rb_class_protected_instance_methods(1, args, CLASS_OF(obj));
+    }
+    return rb_class_protected_instance_methods(argc, argv, CLASS_OF(obj));
+}
+
+/*
+ *  call-seq:
+ *     obj.private_methods(all=true)   => array
+ *  
+ *  Returns the list of private methods accessible to <i>obj</i>. If
+ *  the <i>all</i> parameter is set to <code>false</code>, only those methods
+ *  in the receiver will be listed.
+ */
+
+static VALUE
+rb_obj_private_methods(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    if (argc == 0) {		/* hack to stop warning */
+	VALUE args[1];
+
+	args[0] = Qtrue;
+	return rb_class_private_instance_methods(1, args, CLASS_OF(obj));
+    }
+    return rb_class_private_instance_methods(argc, argv, CLASS_OF(obj));
+}
+
+/*
+ *  call-seq:
+ *     obj.public_methods(all=true)   => array
+ *  
+ *  Returns the list of public methods accessible to <i>obj</i>. If
+ *  the <i>all</i> parameter is set to <code>false</code>, only those methods
+ *  in the receiver will be listed.
+ */
+
+static VALUE
+rb_obj_public_methods(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    if (argc == 0) {		/* hack to stop warning */
+	VALUE args[1];
+
+	args[0] = Qtrue;
+	return rb_class_public_instance_methods(1, args, CLASS_OF(obj));
+    }
+    return rb_class_public_instance_methods(argc, argv, CLASS_OF(obj));
+}
+
+/*
+ *  call-seq:
+ *     obj.instance_variable_get(symbol)    => obj
+ *
+ *  Returns the value of the given instance variable, or nil if the
+ *  instance variable is not set. The <code>@</code> part of the
+ *  variable name should be included for regular instance
+ *  variables. Throws a <code>NameError</code> exception if the
+ *  supplied symbol is not valid as an instance variable name.
+ *     
+ *     class Fred
+ *       def initialize(p1, p2)
+ *         @a, @b = p1, p2
+ *       end
+ *     end
+ *     fred = Fred.new('cat', 99)
+ *     fred.instance_variable_get(:@a)    #=> "cat"
+ *     fred.instance_variable_get("@b")   #=> 99
+ */
+
+static VALUE
+rb_obj_ivar_get(obj, iv)
+    VALUE obj, iv;
+{
+    ID id = rb_to_id(iv);
+
+    if (!rb_is_instance_id(id)) {
+	rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
+    }
+    return rb_ivar_get(obj, id);
+}
+
+/*
+ *  call-seq:
+ *     obj.instance_variable_set(symbol, obj)    => obj
+ *  
+ *  Sets the instance variable names by <i>symbol</i> to
+ *  <i>object</i>, thereby frustrating the efforts of the class's
+ *  author to attempt to provide proper encapsulation. The variable
+ *  did not have to exist prior to this call.
+ *     
+ *     class Fred
+ *       def initialize(p1, p2)
+ *         @a, @b = p1, p2
+ *       end
+ *     end
+ *     fred = Fred.new('cat', 99)
+ *     fred.instance_variable_set(:@a, 'dog')   #=> "dog"
+ *     fred.instance_variable_set(:@c, 'cat')   #=> "cat"
+ *     fred.inspect                             #=> "#<Fred:0x401b3da8 @a=\"dog\", @b=99, @c=\"cat\">"
+ */
+
+static VALUE
+rb_obj_ivar_set(obj, iv, val)
+    VALUE obj, iv, val;
+{
+    ID id = rb_to_id(iv);
+
+    if (!rb_is_instance_id(id)) {
+	rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
+    }
+    return rb_ivar_set(obj, id, val);
+}
+
+/*
+ *  call-seq:
+ *     obj.instance_variable_defined?(symbol)    => true or false
+ *
+ *  Returns <code>true</code> if the given instance variable is
+ *  defined in <i>obj</i>.
+ *
+ *     class Fred
+ *       def initialize(p1, p2)
+ *         @a, @b = p1, p2
+ *       end
+ *     end
+ *     fred = Fred.new('cat', 99)
+ *     fred.instance_variable_defined?(:@a)    #=> true
+ *     fred.instance_variable_defined?("@b")   #=> true
+ *     fred.instance_variable_defined?("@c")   #=> false
+ */
+
+static VALUE
+rb_obj_ivar_defined(obj, iv)
+    VALUE obj, iv;
+{
+    ID id = rb_to_id(iv);
+
+    if (!rb_is_instance_id(id)) {
+	rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
+    }
+    return rb_ivar_defined(obj, id);
+}
+
+/*
+ *  call-seq:
+ *     mod.class_variable_get(symbol)    => obj
+ *  
+ *  Returns the value of the given class variable (or throws a
+ *  <code>NameError</code> exception). The <code>@@</code> part of the
+ *  variable name should be included for regular class variables
+ *     
+ *     class Fred
+ *       @@foo = 99
+ *     end
+ *
+ *     def Fred.foo
+ *       class_variable_get(:@@foo)     #=> 99
+ *     end
+ */
+
+static VALUE
+rb_mod_cvar_get(obj, iv)
+    VALUE obj, iv;
+{
+    ID id = rb_to_id(iv);
+
+    if (!rb_is_class_id(id)) {
+	rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
+    }
+    return rb_cvar_get(obj, id);
+}
+
+/*
+ *  call-seq:
+ *     obj.class_variable_set(symbol, obj)    => obj
+ *  
+ *  Sets the class variable names by <i>symbol</i> to
+ *  <i>object</i>.
+ *     
+ *     class Fred
+ *       @@foo = 99
+ *       def foo
+ *         @@foo
+ *       end
+ *     end
+ *
+ *     def Fred.foo
+ *       class_variable_set(:@@foo, 101)      #=> 101
+ *     end
+ *     Fred.foo
+ *     Fred.new.foo                             #=> 101
+ */
+
+static VALUE
+rb_mod_cvar_set(obj, iv, val)
+    VALUE obj, iv, val;
+{
+    ID id = rb_to_id(iv);
+
+    if (!rb_is_class_id(id)) {
+	rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
+    }
+    rb_cvar_set(obj, id, val, Qfalse);
+    return val;
+}
+
+/*
+ *  call-seq:
+ *     obj.class_variable_defined?(symbol)    => true or false
+ *
+ *  Returns <code>true</code> if the given class variable is defined
+ *  in <i>obj</i>.
+ *
+ *     class Fred
+ *       @@foo = 99
+ *     end
+ *     Fred.class_variable_defined?(:@@foo)    #=> true
+ *     Fred.class_variable_defined?(:@@bar)    #=> false
+ */
+
+static VALUE
+rb_mod_cvar_defined(obj, iv)
+    VALUE obj, iv;
+{
+    ID id = rb_to_id(iv);
+
+    if (!rb_is_class_id(id)) {
+	rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
+    }
+    return rb_cvar_defined(obj, id);
+}
+
+static VALUE
+convert_type(val, tname, method, raise)
+    VALUE val;
+    const char *tname, *method;
+    int raise;
+{
+    ID m;
+
+    m = rb_intern(method);
+    if (!rb_respond_to(val, m)) {
+	if (raise) {
+	    rb_raise(rb_eTypeError, "can't convert %s into %s",
+		     NIL_P(val) ? "nil" :
+		     val == Qtrue ? "true" :
+		     val == Qfalse ? "false" :
+		     rb_obj_classname(val), 
+		     tname);
+	}
+	else {
+	    return Qnil;
+	}
+    }
+    return rb_funcall(val, m, 0);
+}
+
+VALUE
+rb_convert_type(val, type, tname, method)
+    VALUE val;
+    int type;
+    const char *tname, *method;
+{
+    VALUE v;
+
+    if (TYPE(val) == type) return val;
+    v = convert_type(val, tname, method, Qtrue);
+    if (TYPE(v) != type) {
+	rb_raise(rb_eTypeError, "%s#%s should return %s",
+		 rb_obj_classname(val), method, tname);
+    }
+    return v;
+}
+
+VALUE
+rb_check_convert_type(val, type, tname, method)
+    VALUE val;
+    int type;
+    const char *tname, *method;
+{
+    VALUE v;
+
+    /* always convert T_DATA */
+    if (TYPE(val) == type && type != T_DATA) return val;
+    v = convert_type(val, tname, method, Qfalse);
+    if (NIL_P(v)) return Qnil;
+    if (TYPE(v) != type) {
+	rb_raise(rb_eTypeError, "%s#%s should return %s",
+		 rb_obj_classname(val), method, tname);
+    }
+    return v;
+}
+
+
+static VALUE
+rb_to_integer(val, method)
+    VALUE val;
+    const char *method;
+{
+    VALUE v = convert_type(val, "Integer", method, Qtrue);
+    if (!rb_obj_is_kind_of(v, rb_cInteger)) {
+	rb_raise(rb_eTypeError, "%s#%s should return Integer",
+		 rb_obj_classname(val), method);
+    }
+    return v;
+}
+
+VALUE
+rb_to_int(val)
+    VALUE val;
+{
+    return rb_to_integer(val, "to_int");
+}
+
+VALUE
+rb_Integer(val)
+    VALUE val;
+{
+    VALUE tmp;
+
+    switch (TYPE(val)) {
+      case T_FLOAT:
+	if (RFLOAT(val)->value <= (double)FIXNUM_MAX
+	    && RFLOAT(val)->value >= (double)FIXNUM_MIN) {
+	    break;
+	}
+	return rb_dbl2big(RFLOAT(val)->value);
+
+      case T_FIXNUM:
+      case T_BIGNUM:
+	return val;
+
+      case T_STRING:
+	return rb_str_to_inum(val, 0, Qtrue);
+
+      default:
+	break;
+    }
+    tmp = convert_type(val, "Integer", "to_int", Qfalse);
+    if (NIL_P(tmp)) {
+	return rb_to_integer(val, "to_i");
+    }
+    return tmp;
+}
+
+/*
+ *  call-seq:
+ *     Integer(arg)    => integer
+ *  
+ *  Converts <i>arg</i> to a <code>Fixnum</code> or <code>Bignum</code>.
+ *  Numeric types are converted directly (with floating point numbers
+ *  being truncated). If <i>arg</i> is a <code>String</code>, leading
+ *  radix indicators (<code>0</code>, <code>0b</code>, and
+ *  <code>0x</code>) are honored. Others are converted using
+ *  <code>to_int</code> and <code>to_i</code>. This behavior is
+ *  different from that of <code>String#to_i</code>.
+ *     
+ *     Integer(123.999)    #=> 123
+ *     Integer("0x1a")     #=> 26
+ *     Integer(Time.new)   #=> 1049896590
+ */
+
+static VALUE
+rb_f_integer(obj, arg)
+    VALUE obj, arg;
+{
+    return rb_Integer(arg);
+}
+
+double
+rb_cstr_to_dbl(p, badcheck)
+    const char *p;
+    int badcheck;
+{
+    const char *q;
+    char *end;
+    double d;
+    const char *ellipsis = "";
+    int w;
+#define OutOfRange() (((w = end - p) > 20) ? (w = 20, ellipsis = "...") : (ellipsis = ""))
+
+    if (!p) return 0.0;
+    q = p;
+    if (badcheck) {
+	while (ISSPACE(*p)) p++;
+    }
+    else {
+	while (ISSPACE(*p) || *p == '_') p++;
+    }
+    d = strtod(p, &end);
+    if (errno == ERANGE) {
+	OutOfRange();
+	rb_warn("Float %.*s%s out of range", w, p, ellipsis);
+	errno = 0;
+    }
+    if (p == end) {
+	if (badcheck) {
+	  bad:
+	    rb_invalid_str(q, "Float()");
+	}
+	return d;
+    }
+    if (*end) {
+	char *buf = ALLOCA_N(char, strlen(p)+1);
+	char *n = buf;
+
+	while (p < end) *n++ = *p++;
+	while (*p) {
+	    if (*p == '_') {
+		/* remove underscores between digits */
+		if (badcheck) {
+		    if (n == buf || !ISDIGIT(n[-1])) goto bad;
+		    ++p;
+		    if (!ISDIGIT(*p)) goto bad;
+		}
+		else {
+		    while (*++p == '_');
+		    continue;
+		}
+	    }
+	    *n++ = *p++;
+	}
+	*n = '\0';
+	p = buf;
+	d = strtod(p, &end);
+	if (errno == ERANGE) {
+	    OutOfRange();
+	    rb_warn("Float %.*s%s out of range", w, p, ellipsis);
+	    errno = 0;
+	}
+	if (badcheck) {
+	    if (!end || p == end) goto bad;
+	    while (*end && ISSPACE(*end)) end++;
+	    if (*end) goto bad;
+	}
+    }
+    if (errno == ERANGE) {
+	errno = 0;
+	OutOfRange();
+	rb_raise(rb_eArgError, "Float %.*s%s out of range", w, q, ellipsis);
+    }
+    return d;
+}
+
+double
+rb_str_to_dbl(str, badcheck)
+    VALUE str;
+    int badcheck;
+{
+    char *s;
+    long len;
+
+    StringValue(str);
+    s = RSTRING(str)->ptr;
+    len = RSTRING(str)->len;
+    if (s) {
+	if (s[len]) {		/* no sentinel somehow */
+	    char *p = ALLOCA_N(char, len+1);
+
+	    MEMCPY(p, s, char, len);
+	    p[len] = '\0';
+	    s = p;
+	}
+	if (badcheck && len != strlen(s)) {
+	    rb_raise(rb_eArgError, "string for Float contains null byte");
+	}
+    }
+    return rb_cstr_to_dbl(s, badcheck);
+}
+
+VALUE
+rb_Float(val)
+    VALUE val;
+{
+    switch (TYPE(val)) {
+      case T_FIXNUM:
+	return rb_float_new((double)FIX2LONG(val));
+
+      case T_FLOAT:
+	return val;
+
+      case T_BIGNUM:
+	return rb_float_new(rb_big2dbl(val));
+
+      case T_STRING:
+	return rb_float_new(rb_str_to_dbl(val, Qtrue));
+
+      case T_NIL:
+	rb_raise(rb_eTypeError, "can't convert nil into Float");
+	break;
+
+      default:
+      {
+	  VALUE f = rb_convert_type(val, T_FLOAT, "Float", "to_f");
+	  if (isnan(RFLOAT(f)->value)) {
+	      rb_raise(rb_eArgError, "invalid value for Float()");
+	  }
+	  return f;
+      }
+    }
+}
+
+/*
+ *  call-seq:
+ *     Float(arg)    => float
+ *  
+ *  Returns <i>arg</i> converted to a float. Numeric types are converted
+ *  directly, the rest are converted using <i>arg</i>.to_f. As of Ruby
+ *  1.8, converting <code>nil</code> generates a <code>TypeError</code>.
+ *     
+ *     Float(1)           #=> 1.0
+ *     Float("123.456")   #=> 123.456
+ */
+
+static VALUE
+rb_f_float(obj, arg)
+    VALUE obj, arg;
+{
+    return rb_Float(arg);
+}
+
+double
+rb_num2dbl(val)
+    VALUE val;
+{
+    switch (TYPE(val)) {
+      case T_FLOAT:
+	return RFLOAT(val)->value;
+
+      case T_STRING:
+	rb_raise(rb_eTypeError, "no implicit conversion to float from string");
+	break;
+
+      case T_NIL:
+	rb_raise(rb_eTypeError, "no implicit conversion to float from nil");
+	break;
+
+      default:
+	break;
+    }
+
+    return RFLOAT(rb_Float(val))->value;
+}
+
+char*
+rb_str2cstr(str, len)
+    VALUE str;
+    long *len;
+{
+    StringValue(str);
+    if (len) *len = RSTRING(str)->len;
+    else if (RTEST(ruby_verbose) && RSTRING(str)->len != strlen(RSTRING(str)->ptr)) {
+	rb_warn("string contains \\0 character");
+    }
+    return RSTRING(str)->ptr;
+}
+
+VALUE
+rb_String(val)
+    VALUE val;
+{
+    return rb_convert_type(val, T_STRING, "String", "to_s");
+}
+
+
+/*
+ *  call-seq:
+ *     String(arg)   => string
+ *  
+ *  Converts <i>arg</i> to a <code>String</code> by calling its
+ *  <code>to_s</code> method.
+ *     
+ *     String(self)        #=> "main"
+ *     String(self.class   #=> "Object"
+ *     String(123456)      #=> "123456"
+ */
+
+static VALUE
+rb_f_string(obj, arg)
+    VALUE obj, arg;
+{
+    return rb_String(arg);
+}
+
+#if 0
+VALUE
+rb_Array(val)
+    VALUE val;
+{
+    VALUE tmp = rb_check_array_type(val);
+
+    if (NIL_P(tmp)) {
+	tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_a");
+	if (NIL_P(tmp)) {
+	    return rb_ary_new3(1, val);
+	}
+    }
+    return tmp;
+}
+#endif
+
+/*
+ *  call-seq:
+ *     Array(arg)    => array
+ *  
+ *  Returns <i>arg</i> as an <code>Array</code>. First tries to call
+ *  <i>arg</i><code>.to_ary</code>, then <i>arg</i><code>.to_a</code>.
+ *  If both fail, creates a single element array containing <i>arg</i>
+ *  (unless <i>arg</i> is <code>nil</code>).
+ *     
+ *     Array(1..5)   #=> [1, 2, 3, 4, 5]
+ */
+
+static VALUE
+rb_f_array(obj, arg)
+    VALUE obj, arg;
+{
+    return rb_Array(arg);
+}
+
+static VALUE
+boot_defclass(name, super)
+    char *name;
+    VALUE super;
+{
+    extern st_table *rb_class_tbl;
+    VALUE obj = rb_class_boot(super);
+    ID id = rb_intern(name);
+
+    rb_name_class(obj, id);
+    st_add_direct(rb_class_tbl, id, obj);
+    rb_const_set((rb_cObject ? rb_cObject : obj), id, obj);
+    return obj;
+}
+
+VALUE ruby_top_self;
+
+/*
+ *  Document-class: Class
+ *
+ *  Classes in Ruby are first-class objects---each is an instance of
+ *  class <code>Class</code>.
+ *     
+ *  When a new class is created (typically using <code>class Name ...
+ *  end</code>), an object of type <code>Class</code> is created and
+ *  assigned to a global constant (<code>Name</code> in this case). When
+ *  <code>Name.new</code> is called to create a new object, the
+ *  <code>new</code> method in <code>Class</code> is run by default.
+ *  This can be demonstrated by overriding <code>new</code> in
+ *  <code>Class</code>:
+ *     
+ *     class Class
+ *        alias oldNew  new
+ *        def new(*args)
+ *          print "Creating a new ", self.name, "\n"
+ *          oldNew(*args)
+ *        end
+ *      end
+ *     
+ *     
+ *      class Name
+ *      end
+ *     
+ *     
+ *      n = Name.new
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Creating a new Name
+ *     
+ *  Classes, modules, and objects are interrelated. In the diagram
+ *  that follows, the vertical arrows represent inheritance, and the
+ *  parentheses meta-classes. All metaclasses are instances 
+ *  of the class `Class'.
+ *
+ *                            +------------------+
+ *                            |                  |
+ *              Object---->(Object)              |
+ *               ^  ^        ^  ^                |
+ *               |  |        |  |                |
+ *               |  |  +-----+  +---------+      |
+ *               |  |  |                  |      |
+ *               |  +-----------+         |      |
+ *               |     |        |         |      |
+ *        +------+     |     Module--->(Module)  |
+ *        |            |        ^         ^      |
+ *   OtherClass-->(OtherClass)  |         |      |
+ *                              |         |      |
+ *                            Class---->(Class)  |
+ *                              ^                |
+ *                              |                |
+ *                              +----------------+
+ */
+
+
+/*
+ *  <code>Object</code> is the parent class of all classes in Ruby. Its
+ *  methods are therefore available to all objects unless explicitly
+ *  overridden.
+ *     
+ *  <code>Object</code> mixes in the <code>Kernel</code> module, making
+ *  the built-in kernel functions globally accessible. Although the
+ *  instance methods of <code>Object</code> are defined by the
+ *  <code>Kernel</code> module, we have chosen to document them here for
+ *  clarity.
+ *     
+ *  In the descriptions of Object's methods, the parameter <i>symbol</i> refers
+ *  to a symbol, which is either a quoted string or a
+ *  <code>Symbol</code> (such as <code>:name</code>).
+ */
+
+void
+Init_Object()
+{
+    VALUE metaclass;
+
+    rb_cObject = boot_defclass("Object", 0);
+    rb_cModule = boot_defclass("Module", rb_cObject);
+    rb_cClass =  boot_defclass("Class",  rb_cModule);
+
+    metaclass = rb_make_metaclass(rb_cObject, rb_cClass);
+    metaclass = rb_make_metaclass(rb_cModule, metaclass);
+    metaclass = rb_make_metaclass(rb_cClass, metaclass);
+
+    rb_mKernel = rb_define_module("Kernel");
+    rb_include_module(rb_cObject, rb_mKernel);
+    rb_define_alloc_func(rb_cObject, rb_class_allocate_instance);
+    rb_define_private_method(rb_cObject, "initialize", rb_obj_dummy, 0);
+    rb_define_private_method(rb_cClass, "inherited", rb_obj_dummy, 1);
+    rb_define_private_method(rb_cModule, "included", rb_obj_dummy, 1);
+    rb_define_private_method(rb_cModule, "extended", rb_obj_dummy, 1);
+    rb_define_private_method(rb_cModule, "method_added", rb_obj_dummy, 1);
+    rb_define_private_method(rb_cModule, "method_removed", rb_obj_dummy, 1);
+    rb_define_private_method(rb_cModule, "method_undefined", rb_obj_dummy, 1);
+
+
+    rb_define_method(rb_mKernel, "nil?", rb_false, 0);
+    rb_define_method(rb_mKernel, "==", rb_obj_equal, 1);
+    rb_define_method(rb_mKernel, "equal?", rb_obj_equal, 1);
+    rb_define_method(rb_mKernel, "===", rb_equal, 1); 
+    rb_define_method(rb_mKernel, "=~", rb_obj_pattern_match, 1);
+
+    rb_define_method(rb_mKernel, "eql?", rb_obj_equal, 1);
+
+    rb_define_method(rb_mKernel, "id", rb_obj_id_obsolete, 0);
+    rb_define_method(rb_mKernel, "type", rb_obj_type, 0);
+    rb_define_method(rb_mKernel, "class", rb_obj_class, 0);
+
+    rb_define_method(rb_mKernel, "clone", rb_obj_clone, 0);
+    rb_define_method(rb_mKernel, "dup", rb_obj_dup, 0);
+    rb_define_method(rb_mKernel, "initialize_copy", rb_obj_init_copy, 1);
+
+    rb_define_method(rb_mKernel, "taint", rb_obj_taint, 0);
+    rb_define_method(rb_mKernel, "tainted?", rb_obj_tainted, 0);
+    rb_define_method(rb_mKernel, "untaint", rb_obj_untaint, 0);
+    rb_define_method(rb_mKernel, "freeze", rb_obj_freeze, 0);
+    rb_define_method(rb_mKernel, "frozen?", rb_obj_frozen_p, 0);
+
+    rb_define_method(rb_mKernel, "to_a", rb_any_to_a, 0); /* to be removed */
+    rb_define_method(rb_mKernel, "to_s", rb_any_to_s, 0);
+    rb_define_method(rb_mKernel, "inspect", rb_obj_inspect, 0);
+    rb_define_method(rb_mKernel, "methods", rb_obj_methods, -1);
+    rb_define_method(rb_mKernel, "singleton_methods", 
+		     rb_obj_singleton_methods, -1); /* in class.c */
+    rb_define_method(rb_mKernel, "protected_methods", 
+		     rb_obj_protected_methods, -1);
+    rb_define_method(rb_mKernel, "private_methods", rb_obj_private_methods, -1);
+    rb_define_method(rb_mKernel, "public_methods", rb_obj_public_methods, -1);
+    rb_define_method(rb_mKernel, "instance_variables", 
+		     rb_obj_instance_variables, 0); /* in variable.c */
+    rb_define_method(rb_mKernel, "instance_variable_get", rb_obj_ivar_get, 1);
+    rb_define_method(rb_mKernel, "instance_variable_set", rb_obj_ivar_set, 2);
+    rb_define_method(rb_mKernel, "instance_variable_defined?", rb_obj_ivar_defined, 1);
+    rb_define_private_method(rb_mKernel, "remove_instance_variable",
+			     rb_obj_remove_instance_variable, 1); /* in variable.c */
+
+    rb_define_method(rb_mKernel, "instance_of?", rb_obj_is_instance_of, 1);
+    rb_define_method(rb_mKernel, "kind_of?", rb_obj_is_kind_of, 1);
+    rb_define_method(rb_mKernel, "is_a?", rb_obj_is_kind_of, 1);
+
+    rb_define_private_method(rb_mKernel, "singleton_method_added", rb_obj_dummy, 1);
+    rb_define_private_method(rb_mKernel, "singleton_method_removed", rb_obj_dummy, 1);
+    rb_define_private_method(rb_mKernel, "singleton_method_undefined", rb_obj_dummy, 1);
+
+    rb_define_global_function("sprintf", rb_f_sprintf, -1); /* in sprintf.c */
+    rb_define_global_function("format", rb_f_sprintf, -1);  /* in sprintf.c  */
+
+    rb_define_global_function("Integer", rb_f_integer, 1);
+    rb_define_global_function("Float", rb_f_float, 1);
+
+    rb_define_global_function("String", rb_f_string, 1);
+    rb_define_global_function("Array", rb_f_array, 1);
+
+    rb_cNilClass = rb_define_class("NilClass", rb_cObject);
+    rb_define_method(rb_cNilClass, "to_i", nil_to_i, 0);
+    rb_define_method(rb_cNilClass, "to_f", nil_to_f, 0);
+    rb_define_method(rb_cNilClass, "to_s", nil_to_s, 0);
+    rb_define_method(rb_cNilClass, "to_a", nil_to_a, 0);
+    rb_define_method(rb_cNilClass, "inspect", nil_inspect, 0);
+    rb_define_method(rb_cNilClass, "&", false_and, 1);
+    rb_define_method(rb_cNilClass, "|", false_or, 1);
+    rb_define_method(rb_cNilClass, "^", false_xor, 1);
+
+    rb_define_method(rb_cNilClass, "nil?", rb_true, 0);
+    rb_undef_alloc_func(rb_cNilClass);
+    rb_undef_method(CLASS_OF(rb_cNilClass), "new");
+    rb_define_global_const("NIL", Qnil);
+
+    rb_cSymbol = rb_define_class("Symbol", rb_cObject);
+    rb_define_singleton_method(rb_cSymbol, "all_symbols", 
+			       rb_sym_all_symbols, 0); /* in parse.y */
+    rb_undef_alloc_func(rb_cSymbol);
+    rb_undef_method(CLASS_OF(rb_cSymbol), "new");
+
+    rb_define_method(rb_cSymbol, "to_i", sym_to_i, 0);
+    rb_define_method(rb_cSymbol, "to_int", sym_to_int, 0);
+    rb_define_method(rb_cSymbol, "inspect", sym_inspect, 0);
+    rb_define_method(rb_cSymbol, "to_s", sym_to_s, 0);
+    rb_define_method(rb_cSymbol, "id2name", sym_to_s, 0);
+    rb_define_method(rb_cSymbol, "to_sym", sym_to_sym, 0);
+    rb_define_method(rb_cSymbol, "===", rb_obj_equal, 1); 
+
+    rb_define_method(rb_cModule, "freeze", rb_mod_freeze, 0);
+    rb_define_method(rb_cModule, "===", rb_mod_eqq, 1);
+    rb_define_method(rb_cModule, "==", rb_obj_equal, 1);
+    rb_define_method(rb_cModule, "<=>",  rb_mod_cmp, 1);
+    rb_define_method(rb_cModule, "<",  rb_mod_lt, 1);
+    rb_define_method(rb_cModule, "<=", rb_class_inherited_p, 1);
+    rb_define_method(rb_cModule, ">",  rb_mod_gt, 1);
+    rb_define_method(rb_cModule, ">=", rb_mod_ge, 1);
+    rb_define_method(rb_cModule, "initialize_copy", rb_mod_init_copy, 1); /* in class.c */
+    rb_define_method(rb_cModule, "to_s", rb_mod_to_s, 0);
+    rb_define_method(rb_cModule, "included_modules", 
+		     rb_mod_included_modules, 0); /* in class.c */
+    rb_define_method(rb_cModule, "include?", rb_mod_include_p, 1); /* in class.c */
+    rb_define_method(rb_cModule, "name", rb_mod_name, 0);  /* in variable.c */
+    rb_define_method(rb_cModule, "ancestors", rb_mod_ancestors, 0); /* in class.c */
+
+    rb_define_private_method(rb_cModule, "attr", rb_mod_attr, -1);
+    rb_define_private_method(rb_cModule, "attr_reader", rb_mod_attr_reader, -1);
+    rb_define_private_method(rb_cModule, "attr_writer", rb_mod_attr_writer, -1);
+    rb_define_private_method(rb_cModule, "attr_accessor", rb_mod_attr_accessor, -1);
+
+    rb_define_alloc_func(rb_cModule, rb_module_s_alloc);
+    rb_define_method(rb_cModule, "initialize", rb_mod_initialize, 0);
+    rb_define_method(rb_cModule, "instance_methods", 
+		     rb_class_instance_methods, -1);           /* in class.c */
+    rb_define_method(rb_cModule, "public_instance_methods", 
+		     rb_class_public_instance_methods, -1);    /* in class.c */
+    rb_define_method(rb_cModule, "protected_instance_methods", 
+		     rb_class_protected_instance_methods, -1); /* in class.c */
+    rb_define_method(rb_cModule, "private_instance_methods", 
+		     rb_class_private_instance_methods, -1);   /* in class.c */
+
+    rb_define_method(rb_cModule, "class_variable_defined?", rb_mod_cvar_defined, 1);
+    rb_define_method(rb_cModule, "constants", rb_mod_constants, 0); /* in variable.c */
+    rb_define_method(rb_cModule, "const_get", rb_mod_const_get, 1);
+    rb_define_method(rb_cModule, "const_set", rb_mod_const_set, 2);
+    rb_define_method(rb_cModule, "const_defined?", rb_mod_const_defined, 1);
+    rb_define_private_method(rb_cModule, "remove_const", 
+			     rb_mod_remove_const, 1); /* in variable.c */
+    rb_define_method(rb_cModule, "const_missing", 
+		     rb_mod_const_missing, 1); /* in variable.c */
+    rb_define_method(rb_cModule, "class_variables", 
+		     rb_mod_class_variables, 0); /* in variable.c */
+    rb_define_private_method(rb_cModule, "remove_class_variable", 
+			     rb_mod_remove_cvar, 1); /* in variable.c */
+    rb_define_private_method(rb_cModule, "class_variable_get", rb_mod_cvar_get, 1);
+    rb_define_private_method(rb_cModule, "class_variable_set", rb_mod_cvar_set, 2);
+
+    rb_define_method(rb_cClass, "allocate", rb_obj_alloc, 0);
+    rb_define_method(rb_cClass, "new", rb_class_new_instance, -1);
+    rb_define_method(rb_cClass, "initialize", rb_class_initialize, -1);
+    rb_define_method(rb_cClass, "initialize_copy", rb_class_init_copy, 1); /* in class.c */
+    rb_define_method(rb_cClass, "superclass", rb_class_superclass, 0);
+    rb_define_alloc_func(rb_cClass, rb_class_s_alloc);
+    rb_undef_method(rb_cClass, "extend_object");
+    rb_undef_method(rb_cClass, "append_features");
+
+    rb_cData = rb_define_class("Data", rb_cObject);
+    rb_undef_alloc_func(rb_cData);
+
+    rb_global_variable(&ruby_top_self);
+    ruby_top_self = rb_obj_alloc(rb_cObject);
+    rb_define_singleton_method(ruby_top_self, "to_s", main_to_s, 0);
+
+    rb_cTrueClass = rb_define_class("TrueClass", rb_cObject);
+    rb_define_method(rb_cTrueClass, "to_s", true_to_s, 0);
+    rb_define_method(rb_cTrueClass, "&", true_and, 1);
+    rb_define_method(rb_cTrueClass, "|", true_or, 1);
+    rb_define_method(rb_cTrueClass, "^", true_xor, 1);
+    rb_undef_alloc_func(rb_cTrueClass);
+    rb_undef_method(CLASS_OF(rb_cTrueClass), "new");
+    rb_define_global_const("TRUE", Qtrue);
+
+    rb_cFalseClass = rb_define_class("FalseClass", rb_cObject);
+    rb_define_method(rb_cFalseClass, "to_s", false_to_s, 0);
+    rb_define_method(rb_cFalseClass, "&", false_and, 1);
+    rb_define_method(rb_cFalseClass, "|", false_or, 1);
+    rb_define_method(rb_cFalseClass, "^", false_xor, 1);
+    rb_undef_alloc_func(rb_cFalseClass);
+    rb_undef_method(CLASS_OF(rb_cFalseClass), "new");
+    rb_define_global_const("FALSE", Qfalse);
+
+    id_eq = rb_intern("==");
+    id_eql = rb_intern("eql?");
+    id_inspect = rb_intern("inspect");
+    id_init_copy = rb_intern("initialize_copy");
+}
diff --git a/ruby_1_8_6/pack.c b/ruby_1_8_6/pack.c
new file mode 100644
index 0000000000..e5324d1e8e
--- /dev/null
+++ b/ruby_1_8_6/pack.c
@@ -0,0 +1,2120 @@
+/**********************************************************************
+
+  pack.c -
+
+  $Author$
+  $Date$
+  created at: Thu Feb 10 15:17:05 JST 1994
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+#include <sys/types.h>
+#include <ctype.h>
+
+#define SIZE16 2
+#define SIZE32 4
+
+#if SIZEOF_SHORT != 2 || SIZEOF_LONG != 4
+# define NATINT_PACK
+#endif
+
+#ifdef NATINT_PACK
+# define OFF16B(p) ((char*)(p) + (natint?0:(sizeof(short) - SIZE16)))
+# define OFF32B(p) ((char*)(p) + (natint?0:(sizeof(long) - SIZE32)))
+# define NATINT_LEN(type,len) (natint?sizeof(type):(len))
+# ifdef WORDS_BIGENDIAN
+#   define OFF16(p) OFF16B(p)
+#   define OFF32(p) OFF32B(p)
+# endif
+# define NATINT_HTOVS(x) (natint?htovs(x):htov16(x))
+# define NATINT_HTOVL(x) (natint?htovl(x):htov32(x))
+# define NATINT_HTONS(x) (natint?htons(x):hton16(x))
+# define NATINT_HTONL(x) (natint?htonl(x):hton32(x))
+#else
+# define NATINT_LEN(type,len) sizeof(type)
+# define NATINT_HTOVS(x) htovs(x)
+# define NATINT_HTOVL(x) htovl(x)
+# define NATINT_HTONS(x) htons(x)
+# define NATINT_HTONL(x) htonl(x)
+#endif
+
+#ifndef OFF16
+# define OFF16(p) (char*)(p)
+# define OFF32(p) (char*)(p)
+#endif
+#ifndef OFF16B
+# define OFF16B(p) (char*)(p)
+# define OFF32B(p) (char*)(p)
+#endif
+
+#define define_swapx(x, xtype)		\
+static xtype				\
+TOKEN_PASTE(swap,x)(z)			\
+    xtype z;				\
+{					\
+    xtype r;				\
+    xtype *zp;				\
+    unsigned char *s, *t;		\
+    int i;				\
+					\
+    zp = xmalloc(sizeof(xtype));	\
+    *zp = z;				\
+    s = (unsigned char*)zp;		\
+    t = xmalloc(sizeof(xtype));		\
+    for (i=0; i<sizeof(xtype); i++) {	\
+	t[sizeof(xtype)-i-1] = s[i];	\
+    }					\
+    r = *(xtype *)t;			\
+    free(t);				\
+    free(zp);				\
+    return r;				\
+}
+
+#ifndef swap16
+#define swap16(x)	((((x)&0xFF)<<8) | (((x)>>8)&0xFF))
+#endif
+#if SIZEOF_SHORT == 2
+#define swaps(x)	swap16(x)
+#else
+#if SIZEOF_SHORT == 4
+#define swaps(x)	((((x)&0xFF)<<24)	\
+			|(((x)>>24)&0xFF)	\
+			|(((x)&0x0000FF00)<<8)	\
+			|(((x)&0x00FF0000)>>8)	)
+#else
+define_swapx(s,short)
+#endif
+#endif
+
+#ifndef swap32
+#define swap32(x)	((((x)&0xFF)<<24)	\
+			|(((x)>>24)&0xFF)	\
+			|(((x)&0x0000FF00)<<8)	\
+			|(((x)&0x00FF0000)>>8)	)
+#endif
+#if SIZEOF_LONG == 4
+#define swapl(x)	swap32(x)
+#else
+#if SIZEOF_LONG == 8
+#define swapl(x)        ((((x)&0x00000000000000FF)<<56)	\
+			|(((x)&0xFF00000000000000)>>56)	\
+			|(((x)&0x000000000000FF00)<<40)	\
+			|(((x)&0x00FF000000000000)>>40)	\
+			|(((x)&0x0000000000FF0000)<<24)	\
+			|(((x)&0x0000FF0000000000)>>24)	\
+			|(((x)&0x00000000FF000000)<<8)	\
+			|(((x)&0x000000FF00000000)>>8))
+#else
+define_swapx(l,long)
+#endif
+#endif
+
+#if SIZEOF_FLOAT == 4
+#if SIZEOF_LONG == 4	/* SIZEOF_FLOAT == 4 == SIZEOF_LONG */
+#define swapf(x)	swapl(x)
+#define FLOAT_SWAPPER	unsigned long
+#else
+#if SIZEOF_SHORT == 4	/* SIZEOF_FLOAT == 4 == SIZEOF_SHORT */
+#define swapf(x)	swaps(x)
+#define FLOAT_SWAPPER	unsigned short
+#else	/* SIZEOF_FLOAT == 4 but undivide by known size of int */
+define_swapx(f,float)
+#endif	/* #if SIZEOF_SHORT == 4 */
+#endif	/* #if SIZEOF_LONG == 4 */
+#else	/* SIZEOF_FLOAT != 4 */
+define_swapx(f,float)
+#endif	/* #if SIZEOF_FLOAT == 4 */
+
+#if SIZEOF_DOUBLE == 8
+#if SIZEOF_LONG == 8	/* SIZEOF_DOUBLE == 8 == SIZEOF_LONG */
+#define swapd(x)	swapl(x)
+#define DOUBLE_SWAPPER	unsigned long
+#else
+#if SIZEOF_LONG == 4	/* SIZEOF_DOUBLE == 8 && 4 == SIZEOF_LONG */
+static double
+swapd(d)
+    const double d;
+{
+    double dtmp = d;
+    unsigned long utmp[2];
+    unsigned long utmp0;
+
+    utmp[0] = 0; utmp[1] = 0;
+    memcpy(utmp,&dtmp,sizeof(double));
+    utmp0 = utmp[0];
+    utmp[0] = swapl(utmp[1]);
+    utmp[1] = swapl(utmp0);
+    memcpy(&dtmp,utmp,sizeof(double));
+    return dtmp;
+}
+#else
+#if SIZEOF_SHORT == 4	/* SIZEOF_DOUBLE == 8 && 4 == SIZEOF_SHORT */
+static double
+swapd(d)
+    const double d;
+{
+    double dtmp = d;
+    unsigned short utmp[2];
+    unsigned short utmp0;
+
+    utmp[0] = 0; utmp[1] = 0;
+    memcpy(utmp,&dtmp,sizeof(double));
+    utmp0 = utmp[0];
+    utmp[0] = swaps(utmp[1]);
+    utmp[1] = swaps(utmp0);
+    memcpy(&dtmp,utmp,sizeof(double));
+    return dtmp;
+}
+#else	/* SIZEOF_DOUBLE == 8 but undivied by known size of int */
+define_swapx(d, double)
+#endif	/* #if SIZEOF_SHORT == 4 */
+#endif	/* #if SIZEOF_LONG == 4 */
+#endif	/* #if SIZEOF_LONG == 8 */
+#else	/* SIZEOF_DOUBLE != 8 */
+define_swapx(d, double)
+#endif	/* #if SIZEOF_DOUBLE == 8 */
+
+#undef define_swapx
+
+#ifdef DYNAMIC_ENDIAN
+#ifdef ntohs
+#undef ntohs
+#undef ntohl
+#undef htons
+#undef htonl
+#endif
+static int
+endian()
+{
+    static int init = 0;
+    static int endian_value;
+    char *p;
+
+    if (init) return endian_value;
+    init = 1;
+    p = (char*)&init;
+    return endian_value = p[0]?0:1;
+}
+
+#define ntohs(x) (endian()?(x):swaps(x))
+#define ntohl(x) (endian()?(x):swapl(x))
+#define ntohf(x) (endian()?(x):swapf(x))
+#define ntohd(x) (endian()?(x):swapd(x))
+#define htons(x) (endian()?(x):swaps(x))
+#define htonl(x) (endian()?(x):swapl(x))
+#define htonf(x) (endian()?(x):swapf(x))
+#define htond(x) (endian()?(x):swapd(x))
+#define htovs(x) (endian()?swaps(x):(x))
+#define htovl(x) (endian()?swapl(x):(x))
+#define htovf(x) (endian()?swapf(x):(x))
+#define htovd(x) (endian()?swapd(x):(x))
+#define vtohs(x) (endian()?swaps(x):(x))
+#define vtohl(x) (endian()?swapl(x):(x))
+#define vtohf(x) (endian()?swapf(x):(x))
+#define vtohd(x) (endian()?swapd(x):(x))
+# ifdef NATINT_PACK
+#define htov16(x) (endian()?swap16(x):(x))
+#define htov32(x) (endian()?swap32(x):(x))
+#define hton16(x) (endian()?(x):swap16(x))
+#define hton32(x) (endian()?(x):swap32(x))
+# endif
+#else
+#ifdef WORDS_BIGENDIAN
+#ifndef ntohs
+#define ntohs(x) (x)
+#define ntohl(x) (x)
+#define htons(x) (x)
+#define htonl(x) (x)
+#endif
+#define ntohf(x) (x)
+#define ntohd(x) (x)
+#define htonf(x) (x)
+#define htond(x) (x)
+#define htovs(x) swaps(x)
+#define htovl(x) swapl(x)
+#define htovf(x) swapf(x)
+#define htovd(x) swapd(x)
+#define vtohs(x) swaps(x)
+#define vtohl(x) swapl(x)
+#define vtohf(x) swapf(x)
+#define vtohd(x) swapd(x)
+# ifdef NATINT_PACK
+#define htov16(x) swap16(x)
+#define htov32(x) swap32(x)
+#define hton16(x) (x)
+#define hton32(x) (x)
+# endif
+#else /* LITTLE ENDIAN */
+#ifdef ntohs
+#undef ntohs
+#undef ntohl
+#undef htons
+#undef htonl
+#endif
+#define ntohs(x) swaps(x)
+#define ntohl(x) swapl(x)
+#define htons(x) swaps(x)
+#define htonl(x) swapl(x)
+#define ntohf(x) swapf(x)
+#define ntohd(x) swapd(x)
+#define htonf(x) swapf(x)
+#define htond(x) swapd(x)
+#define htovs(x) (x)
+#define htovl(x) (x)
+#define htovf(x) (x)
+#define htovd(x) (x)
+#define vtohs(x) (x)
+#define vtohl(x) (x)
+#define vtohf(x) (x)
+#define vtohd(x) (x)
+# ifdef NATINT_PACK
+#define htov16(x) (x)
+#define htov32(x) (x)
+#define hton16(x) swap16(x)
+#define hton32(x) swap32(x)
+# endif
+#endif
+#endif
+
+#ifdef FLOAT_SWAPPER
+#define FLOAT_CONVWITH(y)	FLOAT_SWAPPER y;
+#define HTONF(x,y)	(memcpy(&y,&x,sizeof(float)),	\
+			 y = htonf((FLOAT_SWAPPER)y),	\
+			 memcpy(&x,&y,sizeof(float)),	\
+			 x)
+#define HTOVF(x,y)	(memcpy(&y,&x,sizeof(float)),	\
+			 y = htovf((FLOAT_SWAPPER)y),	\
+			 memcpy(&x,&y,sizeof(float)),	\
+			 x)
+#define NTOHF(x,y)	(memcpy(&y,&x,sizeof(float)),	\
+			 y = ntohf((FLOAT_SWAPPER)y),	\
+			 memcpy(&x,&y,sizeof(float)),	\
+			 x)
+#define VTOHF(x,y)	(memcpy(&y,&x,sizeof(float)),	\
+			 y = vtohf((FLOAT_SWAPPER)y),	\
+			 memcpy(&x,&y,sizeof(float)),	\
+			 x)
+#else
+#define FLOAT_CONVWITH(y)
+#define HTONF(x,y)	htonf(x)
+#define HTOVF(x,y)	htovf(x)
+#define NTOHF(x,y)	ntohf(x)
+#define VTOHF(x,y)	vtohf(x)
+#endif
+
+#ifdef DOUBLE_SWAPPER
+#define DOUBLE_CONVWITH(y)	DOUBLE_SWAPPER y;
+#define HTOND(x,y)	(memcpy(&y,&x,sizeof(double)),	\
+			 y = htond((DOUBLE_SWAPPER)y),	\
+			 memcpy(&x,&y,sizeof(double)),	\
+			 x)
+#define HTOVD(x,y)	(memcpy(&y,&x,sizeof(double)),	\
+			 y = htovd((DOUBLE_SWAPPER)y),	\
+			 memcpy(&x,&y,sizeof(double)),	\
+			 x)
+#define NTOHD(x,y)	(memcpy(&y,&x,sizeof(double)),	\
+			 y = ntohd((DOUBLE_SWAPPER)y),	\
+			 memcpy(&x,&y,sizeof(double)),	\
+			 x)
+#define VTOHD(x,y)	(memcpy(&y,&x,sizeof(double)),	\
+			 y = vtohd((DOUBLE_SWAPPER)y),	\
+			 memcpy(&x,&y,sizeof(double)),	\
+			 x)
+#else
+#define DOUBLE_CONVWITH(y)
+#define HTOND(x,y)	htond(x)
+#define HTOVD(x,y)	htovd(x)
+#define NTOHD(x,y)	ntohd(x)
+#define VTOHD(x,y)	vtohd(x)
+#endif
+
+unsigned long rb_big2ulong_pack _((VALUE x));
+
+static unsigned long
+num2i32(x)
+    VALUE x;
+{
+    x = rb_to_int(x); /* is nil OK? (should not) */
+
+    if (FIXNUM_P(x)) return FIX2LONG(x);
+    if (TYPE(x) == T_BIGNUM) {
+	return rb_big2ulong_pack(x);
+    }
+    rb_raise(rb_eTypeError, "can't convert %s to `integer'", rb_obj_classname(x));
+    return 0;			/* not reached */
+}
+
+#if SIZEOF_LONG == SIZE32
+# define EXTEND32(x) 
+#else
+/* invariant in modulo 1<<31 */
+# define EXTEND32(x) do { if (!natint) {(x) = (((1L<<31)-1-(x))^~(~0L<<31));}} while(0)
+#endif
+#if SIZEOF_SHORT == SIZE16
+# define EXTEND16(x) 
+#else
+# define EXTEND16(x) do { if (!natint) {(x) = (short)(((1<<15)-1-(x))^~(~0<<15));}} while(0)
+#endif
+
+#ifdef HAVE_LONG_LONG
+# define QUAD_SIZE sizeof(LONG_LONG)
+#else
+# define QUAD_SIZE 8
+#endif
+static const char toofew[] = "too few arguments";
+
+static void encodes _((VALUE,char*,long,int));
+static void qpencode _((VALUE,VALUE,long));
+
+static int uv_to_utf8 _((char*,unsigned long));
+static unsigned long utf8_to_uv _((char*,long*));
+
+/*
+ *  call-seq:
+ *     arr.pack ( aTemplateString ) -> aBinaryString
+ *  
+ *  Packs the contents of <i>arr</i> into a binary sequence according to
+ *  the directives in <i>aTemplateString</i> (see the table below)
+ *  Directives ``A,'' ``a,'' and ``Z'' may be followed by a count,
+ *  which gives the width of the resulting field. The remaining
+ *  directives also may take a count, indicating the number of array
+ *  elements to convert. If the count is an asterisk
+ *  (``<code>*</code>''), all remaining array elements will be
+ *  converted. Any of the directives ``<code>sSiIlL</code>'' may be
+ *  followed by an underscore (``<code>_</code>'') to use the underlying
+ *  platform's native size for the specified type; otherwise, they use a
+ *  platform-independent size. Spaces are ignored in the template
+ *  string. See also <code>String#unpack</code>.
+ *     
+ *     a = [ "a", "b", "c" ]
+ *     n = [ 65, 66, 67 ]
+ *     a.pack("A3A3A3")   #=> "a  b  c  "
+ *     a.pack("a3a3a3")   #=> "a\000\000b\000\000c\000\000"
+ *     n.pack("ccc")      #=> "ABC"
+ *     
+ *  Directives for +pack+.
+ *
+ *   Directive    Meaning
+ *   ---------------------------------------------------------------
+ *       @     |  Moves to absolute position
+ *       A     |  ASCII string (space padded, count is width)
+ *       a     |  ASCII string (null padded, count is width)
+ *       B     |  Bit string (descending bit order)
+ *       b     |  Bit string (ascending bit order)
+ *       C     |  Unsigned char
+ *       c     |  Char
+ *       D, d  |  Double-precision float, native format
+ *       E     |  Double-precision float, little-endian byte order
+ *       e     |  Single-precision float, little-endian byte order
+ *       F, f  |  Single-precision float, native format
+ *       G     |  Double-precision float, network (big-endian) byte order
+ *       g     |  Single-precision float, network (big-endian) byte order
+ *       H     |  Hex string (high nibble first)
+ *       h     |  Hex string (low nibble first)
+ *       I     |  Unsigned integer
+ *       i     |  Integer
+ *       L     |  Unsigned long
+ *       l     |  Long
+ *       M     |  Quoted printable, MIME encoding (see RFC2045)
+ *       m     |  Base64 encoded string
+ *       N     |  Long, network (big-endian) byte order
+ *       n     |  Short, network (big-endian) byte-order
+ *       P     |  Pointer to a structure (fixed-length string)
+ *       p     |  Pointer to a null-terminated string
+ *       Q, q  |  64-bit number
+ *       S     |  Unsigned short
+ *       s     |  Short
+ *       U     |  UTF-8
+ *       u     |  UU-encoded string
+ *       V     |  Long, little-endian byte order
+ *       v     |  Short, little-endian byte order
+ *       w     |  BER-compressed integer\fnm
+ *       X     |  Back up a byte
+ *       x     |  Null byte
+ *       Z     |  Same as ``a'', except that null is added with *
+ */
+
+static VALUE
+pack_pack(ary, fmt)
+    VALUE ary, fmt;
+{
+    static char *nul10 = "\0\0\0\0\0\0\0\0\0\0";
+    static char *spc10 = "          ";
+    char *p, *pend;
+    VALUE res, from, associates = 0;
+    char type;
+    long items, len, idx, plen;
+    char *ptr;
+#ifdef NATINT_PACK
+    int natint;		/* native integer */
+#endif
+
+    StringValue(fmt);
+    p = RSTRING(fmt)->ptr;
+    pend = p + RSTRING(fmt)->len;
+    res = rb_str_buf_new(0);
+
+    items = RARRAY(ary)->len;
+    idx = 0;
+
+#define TOO_FEW (rb_raise(rb_eArgError, toofew), 0)
+#define THISFROM (items > 0 ? RARRAY(ary)->ptr[idx] : TOO_FEW)
+#define NEXTFROM (items-- > 0 ? RARRAY(ary)->ptr[idx++] : TOO_FEW)
+
+    while (p < pend) {
+	if (RSTRING(fmt)->ptr + RSTRING(fmt)->len != pend) {
+	    rb_raise(rb_eRuntimeError, "format string modified");
+	}
+	type = *p++;		/* get data type */
+#ifdef NATINT_PACK
+	natint = 0;
+#endif
+
+	if (ISSPACE(type)) continue;
+	if (type == '#') {
+	    while ((p < pend) && (*p != '\n')) {
+		p++;
+	    }
+	    continue;
+	}
+        if (*p == '_' || *p == '!') {
+	    const char *natstr = "sSiIlL";
+
+	    if (strchr(natstr, type)) {
+#ifdef NATINT_PACK
+		natint = 1;
+#endif
+		p++;
+	    }
+	    else {
+		rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, natstr);
+	    }
+	}
+	if (*p == '*') {	/* set data length */
+	    len = strchr("@Xxu", type) ? 0 : items;
+	    p++;
+	}
+	else if (ISDIGIT(*p)) {
+	    len = strtoul(p, (char**)&p, 10);
+	}
+	else {
+	    len = 1;
+	}
+
+	switch (type) {
+	  case 'A': case 'a': case 'Z':
+	  case 'B': case 'b':
+	  case 'H': case 'h':
+	    from = NEXTFROM;
+	    if (NIL_P(from)) {
+		ptr = "";
+		plen = 0;
+	    }
+	    else {
+		StringValue(from);
+		ptr = RSTRING(from)->ptr;
+		plen = RSTRING(from)->len;
+		OBJ_INFECT(res, from);
+	    }
+
+	    if (p[-1] == '*')
+		len = plen;
+
+	    switch (type) {
+	      case 'a':		/* arbitrary binary string (null padded)  */
+	      case 'A':		/* ASCII string (space padded) */
+	      case 'Z':		/* null terminated ASCII string  */
+		if (plen >= len) {
+		    rb_str_buf_cat(res, ptr, len);
+		    if (p[-1] == '*' && type == 'Z')
+			rb_str_buf_cat(res, nul10, 1);
+		}
+		else {
+		    rb_str_buf_cat(res, ptr, plen);
+		    len -= plen;
+		    while (len >= 10) {
+			rb_str_buf_cat(res, (type == 'A')?spc10:nul10, 10);
+			len -= 10;
+		    }
+		    rb_str_buf_cat(res, (type == 'A')?spc10:nul10, len);
+		}
+		break;
+
+	      case 'b':		/* bit string (ascending) */
+		{
+		    int byte = 0;
+		    long i, j = 0;
+
+		    if (len > plen) {
+			j = (len - plen + 1)/2;
+			len = plen;
+		    }
+		    for (i=0; i++ < len; ptr++) {
+			if (*ptr & 1)
+			    byte |= 128;
+			if (i & 7)
+			    byte >>= 1;
+			else {
+			    char c = byte & 0xff;
+			    rb_str_buf_cat(res, &c, 1);
+			    byte = 0;
+			}
+		    }
+		    if (len & 7) {
+			char c;
+			byte >>= 7 - (len & 7);
+			c = byte & 0xff;
+			rb_str_buf_cat(res, &c, 1);
+		    }
+		    len = j;
+		    goto grow;
+		}
+		break;
+
+	      case 'B':		/* bit string (descending) */
+		{
+		    int byte = 0;
+		    long i, j = 0;
+
+		    if (len > plen) {
+			j = (len - plen + 1)/2;
+			len = plen;
+		    }
+		    for (i=0; i++ < len; ptr++) {
+			byte |= *ptr & 1;
+			if (i & 7)
+			    byte <<= 1;
+			else {
+			    char c = byte & 0xff;
+			    rb_str_buf_cat(res, &c, 1);
+			    byte = 0;
+			}
+		    }
+		    if (len & 7) {
+			char c;
+			byte <<= 7 - (len & 7);
+			c = byte & 0xff;
+			rb_str_buf_cat(res, &c, 1);
+		    }
+		    len = j;
+		    goto grow;
+		}
+		break;
+
+	      case 'h':		/* hex string (low nibble first) */
+		{
+		    int byte = 0;
+		    long i, j = 0;
+
+		    if (len > plen) {
+			j = (len - plen + 1)/2;
+			len = plen;
+		    }
+		    for (i=0; i++ < len; ptr++) {
+			if (ISALPHA(*ptr))
+			    byte |= (((*ptr & 15) + 9) & 15) << 4;
+			else
+			    byte |= (*ptr & 15) << 4;
+			if (i & 1)
+			    byte >>= 4;
+			else {
+			    char c = byte & 0xff;
+			    rb_str_buf_cat(res, &c, 1);
+			    byte = 0;
+			}
+		    }
+		    if (len & 1) {
+			char c = byte & 0xff;
+			rb_str_buf_cat(res, &c, 1);
+		    }
+		    len = j;
+		    goto grow;
+		}
+		break;
+
+	      case 'H':		/* hex string (high nibble first) */
+		{
+		    int byte = 0;
+		    long i, j = 0;
+
+		    if (len > plen) {
+			j = (len - plen + 1)/2;
+			len = plen;
+		    }
+		    for (i=0; i++ < len; ptr++) {
+			if (ISALPHA(*ptr))
+			    byte |= ((*ptr & 15) + 9) & 15;
+			else
+			    byte |= *ptr & 15;
+			if (i & 1)
+			    byte <<= 4;
+			else {
+			    char c = byte & 0xff;
+			    rb_str_buf_cat(res, &c, 1);
+			    byte = 0;
+			}
+		    }
+		    if (len & 1) {
+			char c = byte & 0xff;
+			rb_str_buf_cat(res, &c, 1);
+		    }
+		    len = j;
+		    goto grow;
+		}
+		break;
+	    }
+	    break;
+
+	  case 'c':		/* signed char */
+	  case 'C':		/* unsigned char */
+	    while (len-- > 0) {
+		char c;
+
+		from = NEXTFROM;
+		c = num2i32(from);
+		rb_str_buf_cat(res, &c, sizeof(char));
+	    }
+	    break;
+
+	  case 's':		/* signed short */
+	  case 'S':		/* unsigned short */
+	    while (len-- > 0) {
+		short s;
+
+		from = NEXTFROM;
+		s = num2i32(from);
+		rb_str_buf_cat(res, OFF16(&s), NATINT_LEN(short,2));
+	    }
+	    break;
+
+	  case 'i':		/* signed int */
+	  case 'I':		/* unsigned int */
+	    while (len-- > 0) {
+		long i;
+
+		from = NEXTFROM;
+		i = num2i32(from);
+		rb_str_buf_cat(res, OFF32(&i), NATINT_LEN(int,4));
+	    }
+	    break;
+
+	  case 'l':		/* signed long */
+	  case 'L':		/* unsigned long */
+	    while (len-- > 0) {
+		long l;
+
+		from = NEXTFROM;
+		l = num2i32(from);
+		rb_str_buf_cat(res, OFF32(&l), NATINT_LEN(long,4));
+	    }
+	    break;
+
+	  case 'q':		/* signed quad (64bit) int */
+	  case 'Q':		/* unsigned quad (64bit) int */
+	    while (len-- > 0) {
+		char tmp[QUAD_SIZE];
+
+		from = NEXTFROM;
+		rb_quad_pack(tmp, from);
+		rb_str_buf_cat(res, (char*)&tmp, QUAD_SIZE);
+	    }
+	    break;
+
+	  case 'n':		/* unsigned short (network byte-order)  */
+	    while (len-- > 0) {
+		unsigned short s;
+
+		from = NEXTFROM;
+		s = num2i32(from);
+		s = NATINT_HTONS(s);
+		rb_str_buf_cat(res, OFF16(&s), NATINT_LEN(short,2));
+	    }
+	    break;
+
+	  case 'N':		/* unsigned long (network byte-order) */
+	    while (len-- > 0) {
+		unsigned long l;
+
+		from = NEXTFROM;
+		l = num2i32(from);
+		l = NATINT_HTONL(l);
+		rb_str_buf_cat(res, OFF32(&l), NATINT_LEN(long,4));
+	    }
+	    break;
+
+	  case 'v':		/* unsigned short (VAX byte-order) */
+	    while (len-- > 0) {
+		unsigned short s;
+
+		from = NEXTFROM;
+		s = num2i32(from);
+		s = NATINT_HTOVS(s);
+		rb_str_buf_cat(res, OFF16(&s), NATINT_LEN(short,2));
+	    }
+	    break;
+
+	  case 'V':		/* unsigned long (VAX byte-order) */
+	    while (len-- > 0) {
+		unsigned long l;
+
+		from = NEXTFROM;
+		l = num2i32(from);
+		l = NATINT_HTOVL(l);
+		rb_str_buf_cat(res, OFF32(&l), NATINT_LEN(long,4));
+	    }
+	    break;
+
+	  case 'f':		/* single precision float in native format */
+	  case 'F':		/* ditto */
+	    while (len-- > 0) {
+		float f;
+
+		from = NEXTFROM;
+		f = RFLOAT(rb_Float(from))->value;
+		rb_str_buf_cat(res, (char*)&f, sizeof(float));
+	    }
+	    break;
+
+	  case 'e':		/* single precision float in VAX byte-order */
+	    while (len-- > 0) {
+		float f;
+		FLOAT_CONVWITH(ftmp);
+
+		from = NEXTFROM;
+		f = RFLOAT(rb_Float(from))->value;
+		f = HTOVF(f,ftmp);
+		rb_str_buf_cat(res, (char*)&f, sizeof(float));
+	    }
+	    break;
+
+	  case 'E':		/* double precision float in VAX byte-order */
+	    while (len-- > 0) {
+		double d;
+		DOUBLE_CONVWITH(dtmp);
+
+		from = NEXTFROM;
+		d = RFLOAT(rb_Float(from))->value;
+		d = HTOVD(d,dtmp);
+		rb_str_buf_cat(res, (char*)&d, sizeof(double));
+	    }
+	    break;
+
+	  case 'd':		/* double precision float in native format */
+	  case 'D':		/* ditto */
+	    while (len-- > 0) {
+		double d;
+
+		from = NEXTFROM;
+		d = RFLOAT(rb_Float(from))->value;
+		rb_str_buf_cat(res, (char*)&d, sizeof(double));
+	    }
+	    break;
+
+	  case 'g':		/* single precision float in network byte-order */
+	    while (len-- > 0) {
+		float f;
+		FLOAT_CONVWITH(ftmp);
+
+		from = NEXTFROM;
+		f = RFLOAT(rb_Float(from))->value;
+		f = HTONF(f,ftmp);
+		rb_str_buf_cat(res, (char*)&f, sizeof(float));
+	    }
+	    break;
+
+	  case 'G':		/* double precision float in network byte-order */
+	    while (len-- > 0) {
+		double d;
+		DOUBLE_CONVWITH(dtmp);
+
+		from = NEXTFROM;
+		d = RFLOAT(rb_Float(from))->value;
+		d = HTOND(d,dtmp);
+		rb_str_buf_cat(res, (char*)&d, sizeof(double));
+	    }
+	    break;
+
+	  case 'x':		/* null byte */
+	  grow:
+	    while (len >= 10) {
+		rb_str_buf_cat(res, nul10, 10);
+		len -= 10;
+	    }
+	    rb_str_buf_cat(res, nul10, len);
+	    break;
+
+	  case 'X':		/* back up byte */
+	  shrink:
+	    plen = RSTRING(res)->len;
+	    if (plen < len)
+		rb_raise(rb_eArgError, "X outside of string");
+	    RSTRING(res)->len = plen - len;
+	    RSTRING(res)->ptr[plen - len] = '\0';
+	    break;
+
+	  case '@':		/* null fill to absolute position */
+	    len -= RSTRING(res)->len;
+	    if (len > 0) goto grow;
+	    len = -len;
+	    if (len > 0) goto shrink;
+	    break;
+
+	  case '%':
+	    rb_raise(rb_eArgError, "%% is not supported");
+	    break;
+
+	  case 'U':		/* Unicode character */
+	    while (len-- > 0) {
+		long l;
+		char buf[8];
+		int le;
+
+		from = NEXTFROM;
+		from = rb_to_int(from);
+		l = NUM2INT(from);
+		if (l < 0) {
+		    rb_raise(rb_eRangeError, "pack(U): value out of range");
+		}
+		le = uv_to_utf8(buf, l);
+		rb_str_buf_cat(res, (char*)buf, le);
+	    }
+	    break;
+
+	  case 'u':		/* uuencoded string */
+	  case 'm':		/* base64 encoded string */
+	    from = NEXTFROM;
+	    StringValue(from);
+	    ptr = RSTRING(from)->ptr;
+	    plen = RSTRING(from)->len;
+
+	    if (len <= 2)
+		len = 45;
+	    else
+		len = len / 3 * 3;
+	    while (plen > 0) {
+		long todo;
+
+		if (plen > len)
+		    todo = len;
+		else
+		    todo = plen;
+		encodes(res, ptr, todo, type);
+		plen -= todo;
+		ptr += todo;
+	    }
+	    break;
+
+	  case 'M':		/* quoted-printable encoded string */
+	    from = rb_obj_as_string(NEXTFROM);
+	    if (len <= 1)
+		len = 72;
+	    qpencode(res, from, len);
+	    break;
+
+	  case 'P':		/* pointer to packed byte string */
+	    from = THISFROM;
+	    if (!NIL_P(from)) {
+		StringValue(from);
+		if (RSTRING(from)->len < len) {
+		    rb_raise(rb_eArgError, "too short buffer for P(%ld for %ld)",
+			     RSTRING(from)->len, len);
+		}
+	    }
+	    len = 1;
+	    /* FALL THROUGH */
+	  case 'p':		/* pointer to string */
+	    while (len-- > 0) {
+		char *t;
+		from = NEXTFROM;
+		if (NIL_P(from)) {
+		    t = 0;
+		}
+		else {
+		    t = StringValuePtr(from);
+		}
+		if (!associates) {
+		    associates = rb_ary_new();
+		}
+		rb_ary_push(associates, from);
+		rb_obj_taint(from);
+		rb_str_buf_cat(res, (char*)&t, sizeof(char*));
+	    }
+	    break;
+
+	  case 'w':		/* BER compressed integer  */
+	    while (len-- > 0) {
+		unsigned long ul;
+		VALUE buf = rb_str_new(0, 0);
+		char c, *bufs, *bufe;
+
+		from = NEXTFROM;
+		if (TYPE(from) == T_BIGNUM) {
+		    VALUE big128 = rb_uint2big(128);
+		    while (TYPE(from) == T_BIGNUM) {
+			from = rb_big_divmod(from, big128);
+			c = NUM2INT(RARRAY(from)->ptr[1]) | 0x80; /* mod */
+			rb_str_buf_cat(buf, &c, sizeof(char));
+			from = RARRAY(from)->ptr[0]; /* div */
+		    }
+		}
+
+		{
+		    long l = NUM2LONG(from);
+		    if (l < 0) {
+			rb_raise(rb_eArgError, "can't compress negative numbers");
+		    }
+		    ul = l;
+		}
+
+		while (ul) {
+		    c = ((ul & 0x7f) | 0x80);
+		    rb_str_buf_cat(buf, &c, sizeof(char));
+		    ul >>=  7;
+		}
+
+		if (RSTRING(buf)->len) {
+		    bufs = RSTRING(buf)->ptr;
+		    bufe = bufs + RSTRING(buf)->len - 1;
+		    *bufs &= 0x7f; /* clear continue bit */
+		    while (bufs < bufe) { /* reverse */
+			c = *bufs;
+			*bufs++ = *bufe;
+			*bufe-- = c;
+		    }
+		    rb_str_buf_cat(res, RSTRING(buf)->ptr, RSTRING(buf)->len);
+		}
+		else {
+		    c = 0;
+		    rb_str_buf_cat(res, &c, sizeof(char));
+		}
+	    }
+	    break;
+
+	  default:
+	    break;
+	}
+    }
+
+    if (associates) {
+	rb_str_associate(res, associates);
+    }
+    return res;
+}
+
+static char uu_table[] =
+"`!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_";
+static char b64_table[] =
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+static void
+encodes(str, s, len, type)
+    VALUE str;
+    char *s;
+    long len;
+    int type;
+{
+    char *buff = ALLOCA_N(char, len * 4 / 3 + 6);
+    long i = 0;
+    char *trans = type == 'u' ? uu_table : b64_table;
+    int padding;
+
+    if (type == 'u') {
+	buff[i++] = len + ' ';
+	padding = '`';
+    }
+    else {
+	padding = '=';
+    }
+    while (len >= 3) {
+	buff[i++] = trans[077 & (*s >> 2)];
+	buff[i++] = trans[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))];
+	buff[i++] = trans[077 & (((s[1] << 2) & 074) | ((s[2] >> 6) & 03))];
+	buff[i++] = trans[077 & s[2]];
+	s += 3;
+	len -= 3;
+    }
+    if (len == 2) {
+	buff[i++] = trans[077 & (*s >> 2)];
+	buff[i++] = trans[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))];
+	buff[i++] = trans[077 & (((s[1] << 2) & 074) | (('\0' >> 6) & 03))];
+	buff[i++] = padding;
+    }
+    else if (len == 1) {
+	buff[i++] = trans[077 & (*s >> 2)];
+	buff[i++] = trans[077 & (((*s << 4) & 060) | (('\0' >> 4) & 017))];
+	buff[i++] = padding;
+	buff[i++] = padding;
+    }
+    buff[i++] = '\n';
+    rb_str_buf_cat(str, buff, i);
+}
+
+static char hex_table[] = "0123456789ABCDEF";
+
+static void
+qpencode(str, from, len)
+    VALUE str, from;
+    long len;
+{
+    char buff[1024];
+    long i = 0, n = 0, prev = EOF;
+    unsigned char *s = (unsigned char*)RSTRING(from)->ptr;
+    unsigned char *send = s + RSTRING(from)->len;
+
+    while (s < send) {
+        if ((*s > 126) ||
+	    (*s < 32 && *s != '\n' && *s != '\t') ||
+	    (*s == '=')) {
+	    buff[i++] = '=';
+	    buff[i++] = hex_table[*s >> 4];
+	    buff[i++] = hex_table[*s & 0x0f];
+            n += 3;
+            prev = EOF;
+        }
+	else if (*s == '\n') {
+            if (prev == ' ' || prev == '\t') {
+		buff[i++] = '=';
+		buff[i++] = *s;
+            }
+	    buff[i++] = *s;
+            n = 0;
+            prev = *s;
+        }
+	else {
+	    buff[i++] = *s;
+            n++;
+            prev = *s;
+        }
+        if (n > len) {
+	    buff[i++] = '=';
+	    buff[i++] = '\n';
+            n = 0;
+            prev = '\n';
+        }
+	if (i > 1024 - 5) {
+	    rb_str_buf_cat(str, buff, i);
+	    i = 0;
+	}
+	s++;
+    }
+    if (n > 0) {
+	buff[i++] = '=';
+	buff[i++] = '\n';
+    }
+    if (i > 0) {
+	rb_str_buf_cat(str, buff, i);
+    }
+}
+
+static inline int
+hex2num(c)
+    char c;
+{
+    switch (c) {
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
+        return c - '0';
+    case 'a': case 'b': case 'c':
+    case 'd': case 'e': case 'f':
+	return c - 'a' + 10;
+    case 'A': case 'B': case 'C':
+    case 'D': case 'E': case 'F':
+	return c - 'A' + 10;
+    default:
+	return -1;
+    }
+}
+
+#define PACK_LENGTH_ADJUST_SIZE(sz) do {	\
+    tmp = 0;					\
+    if (len > (send-s)/sz) {			\
+        if (!star) {				\
+	    tmp = len-(send-s)/sz;		\
+        }					\
+	len = (send-s)/sz;			\
+    }						\
+} while (0)
+
+#ifdef NATINT_PACK
+#define PACK_LENGTH_ADJUST(type,sz) do {	\
+    int t__len = NATINT_LEN(type,(sz));		\
+    PACK_LENGTH_ADJUST_SIZE(t__len);		\
+} while (0)
+#else
+#define PACK_LENGTH_ADJUST(type,sz) 		\
+    PACK_LENGTH_ADJUST_SIZE(sizeof(type))
+#endif
+
+#define PACK_ITEM_ADJUST() while (tmp--) rb_ary_push(ary, Qnil)
+
+static VALUE
+infected_str_new(ptr, len, str)
+    const char *ptr;
+    long len;
+    VALUE str;
+{
+    VALUE s = rb_str_new(ptr, len);
+
+    OBJ_INFECT(s, str);
+    return s;
+}
+    
+/*
+ *  call-seq:
+ *     str.unpack(format)   => anArray
+ *  
+ *  Decodes <i>str</i> (which may contain binary data) according to the
+ *  format string, returning an array of each value extracted. The
+ *  format string consists of a sequence of single-character directives,
+ *  summarized in the table at the end of this entry.
+ *  Each directive may be followed
+ *  by a number, indicating the number of times to repeat with this
+ *  directive. An asterisk (``<code>*</code>'') will use up all
+ *  remaining elements. The directives <code>sSiIlL</code> may each be
+ *  followed by an underscore (``<code>_</code>'') to use the underlying
+ *  platform's native size for the specified type; otherwise, it uses a
+ *  platform-independent consistent size. Spaces are ignored in the
+ *  format string. See also <code>Array#pack</code>.
+ *     
+ *     "abc \0\0abc \0\0".unpack('A6Z6')   #=> ["abc", "abc "]
+ *     "abc \0\0".unpack('a3a3')           #=> ["abc", " \000\000"]
+ *     "abc \0abc \0".unpack('Z*Z*')       #=> ["abc ", "abc "]
+ *     "aa".unpack('b8B8')                 #=> ["10000110", "01100001"]
+ *     "aaa".unpack('h2H2c')               #=> ["16", "61", 97]
+ *     "\xfe\xff\xfe\xff".unpack('sS')     #=> [-2, 65534]
+ *     "now=20is".unpack('M*')             #=> ["now is"]
+ *     "whole".unpack('xax2aX2aX1aX2a')    #=> ["h", "e", "l", "l", "o"]
+ *
+ *  This table summarizes the various formats and the Ruby classes
+ *  returned by each.
+ *     
+ *     Format | Returns | Function
+ *     -------+---------+-----------------------------------------
+ *       A    | String  | with trailing nulls and spaces removed
+ *     -------+---------+-----------------------------------------
+ *       a    | String  | string
+ *     -------+---------+-----------------------------------------
+ *       B    | String  | extract bits from each character (msb first)
+ *     -------+---------+-----------------------------------------
+ *       b    | String  | extract bits from each character (lsb first)
+ *     -------+---------+-----------------------------------------
+ *       C    | Fixnum  | extract a character as an unsigned integer
+ *     -------+---------+-----------------------------------------
+ *       c    | Fixnum  | extract a character as an integer
+ *     -------+---------+-----------------------------------------
+ *       d,D  | Float   | treat sizeof(double) characters as
+ *            |         | a native double
+ *     -------+---------+-----------------------------------------
+ *       E    | Float   | treat sizeof(double) characters as
+ *            |         | a double in little-endian byte order
+ *     -------+---------+-----------------------------------------
+ *       e    | Float   | treat sizeof(float) characters as
+ *            |         | a float in little-endian byte order
+ *     -------+---------+-----------------------------------------
+ *       f,F  | Float   | treat sizeof(float) characters as
+ *            |         | a native float
+ *     -------+---------+-----------------------------------------
+ *       G    | Float   | treat sizeof(double) characters as
+ *            |         | a double in network byte order
+ *     -------+---------+-----------------------------------------
+ *       g    | Float   | treat sizeof(float) characters as a
+ *            |         | float in network byte order
+ *     -------+---------+-----------------------------------------
+ *       H    | String  | extract hex nibbles from each character
+ *            |         | (most significant first)
+ *     -------+---------+-----------------------------------------
+ *       h    | String  | extract hex nibbles from each character
+ *            |         | (least significant first)
+ *     -------+---------+-----------------------------------------
+ *       I    | Integer | treat sizeof(int) (modified by _)
+ *            |         | successive characters as an unsigned
+ *            |         | native integer
+ *     -------+---------+-----------------------------------------
+ *       i    | Integer | treat sizeof(int) (modified by _)
+ *            |         | successive characters as a signed
+ *            |         | native integer
+ *     -------+---------+-----------------------------------------
+ *       L    | Integer | treat four (modified by _) successive
+ *            |         | characters as an unsigned native
+ *            |         | long integer
+ *     -------+---------+-----------------------------------------
+ *       l    | Integer | treat four (modified by _) successive
+ *            |         | characters as a signed native
+ *            |         | long integer
+ *     -------+---------+-----------------------------------------
+ *       M    | String  | quoted-printable
+ *     -------+---------+-----------------------------------------
+ *       m    | String  | base64-encoded
+ *     -------+---------+-----------------------------------------
+ *       N    | Integer | treat four characters as an unsigned
+ *            |         | long in network byte order
+ *     -------+---------+-----------------------------------------
+ *       n    | Fixnum  | treat two characters as an unsigned
+ *            |         | short in network byte order
+ *     -------+---------+-----------------------------------------
+ *       P    | String  | treat sizeof(char *) characters as a
+ *            |         | pointer, and  return \emph{len} characters
+ *            |         | from the referenced location
+ *     -------+---------+-----------------------------------------
+ *       p    | String  | treat sizeof(char *) characters as a
+ *            |         | pointer to a  null-terminated string
+ *     -------+---------+-----------------------------------------
+ *       Q    | Integer | treat 8 characters as an unsigned 
+ *            |         | quad word (64 bits)
+ *     -------+---------+-----------------------------------------
+ *       q    | Integer | treat 8 characters as a signed 
+ *            |         | quad word (64 bits)
+ *     -------+---------+-----------------------------------------
+ *       S    | Fixnum  | treat two (different if _ used)
+ *            |         | successive characters as an unsigned
+ *            |         | short in native byte order
+ *     -------+---------+-----------------------------------------
+ *       s    | Fixnum  | Treat two (different if _ used) 
+ *            |         | successive characters as a signed short
+ *            |         | in native byte order
+ *     -------+---------+-----------------------------------------
+ *       U    | Integer | UTF-8 characters as unsigned integers
+ *     -------+---------+-----------------------------------------
+ *       u    | String  | UU-encoded
+ *     -------+---------+-----------------------------------------
+ *       V    | Fixnum  | treat four characters as an unsigned
+ *            |         | long in little-endian byte order
+ *     -------+---------+-----------------------------------------
+ *       v    | Fixnum  | treat two characters as an unsigned
+ *            |         | short in little-endian byte order
+ *     -------+---------+-----------------------------------------
+ *       w    | Integer | BER-compressed integer (see Array.pack)
+ *     -------+---------+-----------------------------------------
+ *       X    | ---     | skip backward one character
+ *     -------+---------+-----------------------------------------
+ *       x    | ---     | skip forward one character
+ *     -------+---------+-----------------------------------------
+ *       Z    | String  | with trailing nulls removed
+ *            |         | upto first null with *
+ *     -------+---------+-----------------------------------------
+ *       @    | ---     | skip to the offset given by the 
+ *            |         | length argument
+ *     -------+---------+-----------------------------------------
+ */
+
+static VALUE
+pack_unpack(str, fmt)
+    VALUE str, fmt;
+{
+    static char *hexdigits = "0123456789abcdef0123456789ABCDEFx";
+    char *s, *send;
+    char *p, *pend;
+    VALUE ary;
+    char type;
+    long len;
+    int tmp, star;
+#ifdef NATINT_PACK
+    int natint;			/* native integer */
+#endif
+
+    StringValue(str);
+    StringValue(fmt);
+    s = RSTRING(str)->ptr;
+    send = s + RSTRING(str)->len;
+    p = RSTRING(fmt)->ptr;
+    pend = p + RSTRING(fmt)->len;
+
+    ary = rb_ary_new();
+    while (p < pend) {
+	type = *p++;
+#ifdef NATINT_PACK
+	natint = 0;
+#endif
+
+	if (ISSPACE(type)) continue;
+	if (type == '#') {
+	    while ((p < pend) && (*p != '\n')) {
+		p++;
+	    }
+	    continue;
+	}
+	star = 0;
+	if (*p == '_' || *p == '!') {
+	    char *natstr = "sSiIlL";
+
+	    if (strchr(natstr, type)) {
+#ifdef NATINT_PACK
+		natint = 1;
+#endif
+		p++;
+	    }
+	    else {
+		rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, natstr);
+	    }
+	}
+	if (p >= pend)
+	    len = 1;
+	else if (*p == '*') {
+	    star = 1;
+	    len = send - s;
+	    p++;
+	}
+	else if (ISDIGIT(*p)) {
+	    len = strtoul(p, (char**)&p, 10);
+	}
+	else {
+	    len = (type != '@');
+	}
+
+	switch (type) {
+	  case '%':
+	    rb_raise(rb_eArgError, "%% is not supported");
+	    break;
+
+	  case 'A':
+	    if (len > send - s) len = send - s;
+	    {
+		long end = len;
+		char *t = s + len - 1;
+
+		while (t >= s) {
+		    if (*t != ' ' && *t != '\0') break;
+		    t--; len--;
+		}
+		rb_ary_push(ary, infected_str_new(s, len, str));
+		s += end;
+	    }
+	    break;
+
+	  case 'Z':
+	    {
+		char *t = s;
+
+		if (len > send-s) len = send-s;
+		while (t < s+len && *t) t++;
+		rb_ary_push(ary, infected_str_new(s, t-s, str));
+		if (t < send) t++;
+		s = star ? t : s+len;
+	    }
+	    break;
+
+	  case 'a':
+	    if (len > send - s) len = send - s;
+	    rb_ary_push(ary, infected_str_new(s, len, str));
+	    s += len;
+	    break;
+
+	  case 'b':
+	    {
+		VALUE bitstr;
+		char *t;
+		int bits;
+		long i;
+
+		if (p[-1] == '*' || len > (send - s) * 8)
+		    len = (send - s) * 8;
+		bits = 0;
+		rb_ary_push(ary, bitstr = rb_str_new(0, len));
+		t = RSTRING(bitstr)->ptr;
+		for (i=0; i<len; i++) {
+		    if (i & 7) bits >>= 1;
+		    else bits = *s++;
+		    *t++ = (bits & 1) ? '1' : '0';
+		}
+	    }
+	    break;
+
+	  case 'B':
+	    {
+		VALUE bitstr;
+		char *t;
+		int bits;
+		long i;
+
+		if (p[-1] == '*' || len > (send - s) * 8)
+		    len = (send - s) * 8;
+		bits = 0;
+		rb_ary_push(ary, bitstr = rb_str_new(0, len));
+		t = RSTRING(bitstr)->ptr;
+		for (i=0; i<len; i++) {
+		    if (i & 7) bits <<= 1;
+		    else bits = *s++;
+		    *t++ = (bits & 128) ? '1' : '0';
+		}
+	    }
+	    break;
+
+	  case 'h':
+	    {
+		VALUE bitstr;
+		char *t;
+		int bits;
+		long i;
+
+		if (p[-1] == '*' || len > (send - s) * 2)
+		    len = (send - s) * 2;
+		bits = 0;
+		rb_ary_push(ary, bitstr = rb_str_new(0, len));
+		t = RSTRING(bitstr)->ptr;
+		for (i=0; i<len; i++) {
+		    if (i & 1)
+			bits >>= 4;
+		    else
+			bits = *s++;
+		    *t++ = hexdigits[bits & 15];
+		}
+	    }
+	    break;
+
+	  case 'H':
+	    {
+		VALUE bitstr;
+		char *t;
+		int bits;
+		long i;
+
+		if (p[-1] == '*' || len > (send - s) * 2)
+		    len = (send - s) * 2;
+		bits = 0;
+		rb_ary_push(ary, bitstr = rb_str_new(0, len));
+		t = RSTRING(bitstr)->ptr;
+		for (i=0; i<len; i++) {
+		    if (i & 1)
+			bits <<= 4;
+		    else
+			bits = *s++;
+		    *t++ = hexdigits[(bits >> 4) & 15];
+		}
+	    }
+	    break;
+
+	  case 'c':
+	    PACK_LENGTH_ADJUST(char,sizeof(char));
+	    while (len-- > 0) {
+                int c = *s++;
+                if (c > (char)127) c-=256;
+		rb_ary_push(ary, INT2FIX(c));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'C':
+	    PACK_LENGTH_ADJUST(unsigned char,sizeof(unsigned char));
+	    while (len-- > 0) {
+		unsigned char c = *s++;
+		rb_ary_push(ary, INT2FIX(c));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 's':
+	    PACK_LENGTH_ADJUST(short,2);
+	    while (len-- > 0) {
+		short tmp = 0;
+		memcpy(OFF16(&tmp), s, NATINT_LEN(short,2));
+		EXTEND16(tmp);
+		s += NATINT_LEN(short,2);
+		rb_ary_push(ary, INT2FIX(tmp));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'S':
+	    PACK_LENGTH_ADJUST(unsigned short,2);
+	    while (len-- > 0) {
+		unsigned short tmp = 0;
+		memcpy(OFF16(&tmp), s, NATINT_LEN(unsigned short,2));
+		s += NATINT_LEN(unsigned short,2);
+		rb_ary_push(ary, INT2FIX(tmp));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'i':
+	    PACK_LENGTH_ADJUST(int,sizeof(int));
+	    while (len-- > 0) {
+		int tmp;
+		memcpy(&tmp, s, sizeof(int));
+		s += sizeof(int);
+		rb_ary_push(ary, INT2NUM(tmp));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'I':
+	    PACK_LENGTH_ADJUST(unsigned int,sizeof(unsigned int));
+	    while (len-- > 0) {
+		unsigned int tmp;
+		memcpy(&tmp, s, sizeof(unsigned int));
+		s += sizeof(unsigned int);
+		rb_ary_push(ary, UINT2NUM(tmp));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'l':
+	    PACK_LENGTH_ADJUST(long,4);
+	    while (len-- > 0) {
+		long tmp = 0;
+		memcpy(OFF32(&tmp), s, NATINT_LEN(long,4));
+		EXTEND32(tmp);
+		s += NATINT_LEN(long,4);
+		rb_ary_push(ary, LONG2NUM(tmp));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'L':
+	    PACK_LENGTH_ADJUST(unsigned long,4);
+	    while (len-- > 0) {
+		unsigned long tmp = 0;
+		memcpy(OFF32(&tmp), s, NATINT_LEN(unsigned long,4));
+		s += NATINT_LEN(unsigned long,4);
+		rb_ary_push(ary, ULONG2NUM(tmp));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'q':
+	    PACK_LENGTH_ADJUST_SIZE(QUAD_SIZE);
+	    while (len-- > 0) {
+		char *tmp = (char*)s;
+		s += QUAD_SIZE;
+		rb_ary_push(ary, rb_quad_unpack(tmp, 1));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'Q':
+	    PACK_LENGTH_ADJUST_SIZE(QUAD_SIZE);
+	    while (len-- > 0) {
+		char *tmp = (char*)s;
+		s += QUAD_SIZE;
+		rb_ary_push(ary, rb_quad_unpack(tmp, 0));
+	    }
+	    break;
+
+	  case 'n':
+	    PACK_LENGTH_ADJUST(unsigned short,2);
+	    while (len-- > 0) {
+		unsigned short tmp = 0;
+		memcpy(OFF16B(&tmp), s, NATINT_LEN(unsigned short,2));
+		s += NATINT_LEN(unsigned short,2);
+		rb_ary_push(ary, UINT2NUM(ntohs(tmp)));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'N':
+	    PACK_LENGTH_ADJUST(unsigned long,4);
+	    while (len-- > 0) {
+		unsigned long tmp = 0;
+		memcpy(OFF32B(&tmp), s, NATINT_LEN(unsigned long,4));
+		s += NATINT_LEN(unsigned long,4);
+		rb_ary_push(ary, ULONG2NUM(ntohl(tmp)));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'v':
+	    PACK_LENGTH_ADJUST(unsigned short,2);
+	    while (len-- > 0) {
+		unsigned short tmp = 0;
+		memcpy(OFF16(&tmp), s, NATINT_LEN(unsigned short,2));
+		s += NATINT_LEN(unsigned short,2);
+		rb_ary_push(ary, UINT2NUM(vtohs(tmp)));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'V':
+	    PACK_LENGTH_ADJUST(unsigned long,4);
+	    while (len-- > 0) {
+		unsigned long tmp = 0;
+		memcpy(OFF32(&tmp), s, NATINT_LEN(long,4));
+		s += NATINT_LEN(long,4);
+		rb_ary_push(ary, ULONG2NUM(vtohl(tmp)));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'f':
+	  case 'F':
+	    PACK_LENGTH_ADJUST(float,sizeof(float));
+	    while (len-- > 0) {
+		float tmp;
+		memcpy(&tmp, s, sizeof(float));
+		s += sizeof(float);
+		rb_ary_push(ary, rb_float_new((double)tmp));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'e':
+	    PACK_LENGTH_ADJUST(float,sizeof(float));
+	    while (len-- > 0) {
+	        float tmp;
+		FLOAT_CONVWITH(ftmp);
+
+		memcpy(&tmp, s, sizeof(float));
+		s += sizeof(float);
+		tmp = VTOHF(tmp,ftmp);
+		rb_ary_push(ary, rb_float_new((double)tmp));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+	    
+	  case 'E':
+	    PACK_LENGTH_ADJUST(double,sizeof(double));
+	    while (len-- > 0) {
+		double tmp;
+		DOUBLE_CONVWITH(dtmp);
+
+		memcpy(&tmp, s, sizeof(double));
+		s += sizeof(double);
+		tmp = VTOHD(tmp,dtmp);
+		rb_ary_push(ary, rb_float_new(tmp));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+	    
+	  case 'D':
+	  case 'd':
+	    PACK_LENGTH_ADJUST(double,sizeof(double));
+	    while (len-- > 0) {
+		double tmp;
+		memcpy(&tmp, s, sizeof(double));
+		s += sizeof(double);
+		rb_ary_push(ary, rb_float_new(tmp));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+
+	  case 'g':
+	    PACK_LENGTH_ADJUST(float,sizeof(float));
+	    while (len-- > 0) {
+	        float tmp;
+		FLOAT_CONVWITH(ftmp;)
+
+		memcpy(&tmp, s, sizeof(float));
+		s += sizeof(float);
+		tmp = NTOHF(tmp,ftmp);
+		rb_ary_push(ary, rb_float_new((double)tmp));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+	    
+	  case 'G':
+	    PACK_LENGTH_ADJUST(double,sizeof(double));
+	    while (len-- > 0) {
+		double tmp;
+		DOUBLE_CONVWITH(dtmp);
+
+		memcpy(&tmp, s, sizeof(double));
+		s += sizeof(double);
+		tmp = NTOHD(tmp,dtmp);
+		rb_ary_push(ary, rb_float_new(tmp));
+	    }
+	    PACK_ITEM_ADJUST();
+	    break;
+	    
+	  case 'U':
+	    if (len > send - s) len = send - s;
+	    while (len > 0 && s < send) {
+		long alen = send - s;
+		unsigned long l;
+
+		l = utf8_to_uv(s, &alen);
+		s += alen; len--;
+		rb_ary_push(ary, ULONG2NUM(l));
+	    }
+	    break;
+
+	  case 'u':
+	    {
+		VALUE buf = infected_str_new(0, (send - s)*3/4, str);
+		char *ptr = RSTRING(buf)->ptr;
+		long total = 0;
+
+		while (s < send && *s > ' ' && *s < 'a') {
+		    long a,b,c,d;
+		    char hunk[4];
+
+		    hunk[3] = '\0';
+		    len = (*s++ - ' ') & 077;
+		    total += len;
+		    if (total > RSTRING(buf)->len) {
+			len -= total - RSTRING(buf)->len;
+			total = RSTRING(buf)->len;
+		    }
+
+		    while (len > 0) {
+			long mlen = len > 3 ? 3 : len;
+
+			if (s < send && *s >= ' ')
+			    a = (*s++ - ' ') & 077;
+			else
+			    a = 0;
+			if (s < send && *s >= ' ')
+			    b = (*s++ - ' ') & 077;
+			else
+			    b = 0;
+			if (s < send && *s >= ' ')
+			    c = (*s++ - ' ') & 077;
+			else
+			    c = 0;
+			if (s < send && *s >= ' ')
+			    d = (*s++ - ' ') & 077;
+			else
+			    d = 0;
+			hunk[0] = a << 2 | b >> 4;
+			hunk[1] = b << 4 | c >> 2;
+			hunk[2] = c << 6 | d;
+			memcpy(ptr, hunk, mlen);
+			ptr += mlen;
+			len -= mlen;
+		    }
+		    if (*s == '\r') s++;
+		    if (*s == '\n') s++;
+		    else if (s < send && (s+1 == send || s[1] == '\n'))
+			s += 2;	/* possible checksum byte */
+		}
+		
+		RSTRING(buf)->ptr[total] = '\0';
+		RSTRING(buf)->len = total;
+		rb_ary_push(ary, buf);
+	    }
+	    break;
+
+	  case 'm':
+	    {
+		VALUE buf = infected_str_new(0, (send - s)*3/4, str);
+		char *ptr = RSTRING(buf)->ptr;
+		int a = -1,b = -1,c = 0,d;
+		static int first = 1;
+		static int b64_xtable[256];
+
+		if (first) {
+		    int i;
+		    first = 0;
+
+		    for (i = 0; i < 256; i++) {
+			b64_xtable[i] = -1;
+		    }
+		    for (i = 0; i < 64; i++) {
+			b64_xtable[(int)b64_table[i]] = i;
+		    }
+		}
+		while (s < send) {
+		    a = b = c = d = -1;
+		    while((a = b64_xtable[(int)(*(unsigned char*)s)]) == -1 && s < send) { s++; }
+		    if( s >= send ) break;
+		    s++;
+		    while((b = b64_xtable[(int)(*(unsigned char*)s)]) == -1 && s < send) { s++; }
+		    if( s >= send ) break;
+		    s++;
+		    while((c = b64_xtable[(int)(*(unsigned char*)s)]) == -1 && s < send) { if( *s == '=' ) break; s++; }
+		    if( *s == '=' || s >= send ) break;
+		    s++;
+		    while((d = b64_xtable[(int)(*(unsigned char*)s)]) == -1 && s < send) { if( *s == '=' ) break; s++; }
+		    if( *s == '=' || s >= send ) break;
+		    s++;
+		    *ptr++ = a << 2 | b >> 4;
+		    *ptr++ = b << 4 | c >> 2;
+		    *ptr++ = c << 6 | d;
+		}
+		if (a != -1 && b != -1) {
+		    if (c == -1 && *s == '=')
+			*ptr++ = a << 2 | b >> 4;
+		    else if (c != -1 && *s == '=') {
+			*ptr++ = a << 2 | b >> 4;
+			*ptr++ = b << 4 | c >> 2;
+		    }
+		}
+		*ptr = '\0';
+		RSTRING(buf)->len = ptr - RSTRING(buf)->ptr;
+		rb_ary_push(ary, buf);
+	    }
+	    break;
+
+	  case 'M':
+	    {
+		VALUE buf = infected_str_new(0, send - s, str);
+		char *ptr = RSTRING(buf)->ptr;
+		int c1, c2;
+
+		while (s < send) {
+		    if (*s == '=') {
+			if (++s == send) break;
+                       if (s+1 < send && *s == '\r' && *(s+1) == '\n')
+                         s++;
+			if (*s != '\n') {
+			    if ((c1 = hex2num(*s)) == -1) break;
+			    if (++s == send) break;
+			    if ((c2 = hex2num(*s)) == -1) break;
+			    *ptr++ = c1 << 4 | c2;
+			}
+		    }
+		    else {
+			*ptr++ = *s;
+		    }
+		    s++;
+		}
+		*ptr = '\0';
+		RSTRING(buf)->len = ptr - RSTRING(buf)->ptr;
+		rb_ary_push(ary, buf);
+	    }
+	    break;
+
+	  case '@':
+	    if (len > RSTRING(str)->len)
+		rb_raise(rb_eArgError, "@ outside of string");
+	    s = RSTRING(str)->ptr + len;
+	    break;
+
+	  case 'X':
+	    if (len > s - RSTRING(str)->ptr)
+		rb_raise(rb_eArgError, "X outside of string");
+	    s -= len;
+	    break;
+
+	  case 'x':
+	    if (len > send - s)
+		rb_raise(rb_eArgError, "x outside of string");
+	    s += len;
+	    break;
+
+	  case 'P':
+	    if (sizeof(char *) <= send - s) {
+		char *t;
+		VALUE tmp;
+
+		memcpy(&t, s, sizeof(char *));
+		s += sizeof(char *);
+
+		if (t) {
+		    VALUE a, *p, *pend;
+
+		    if (!(a = rb_str_associated(str))) {
+			rb_raise(rb_eArgError, "no associated pointer");
+		    }
+		    p = RARRAY(a)->ptr;
+		    pend = p + RARRAY(a)->len;
+		    while (p < pend) {
+			if (TYPE(*p) == T_STRING && RSTRING(*p)->ptr == t) {
+			    if (len < RSTRING(*p)->len) {
+				tmp = rb_tainted_str_new(t, len);
+				rb_str_associate(tmp, a);
+			    }
+			    else {
+				tmp = *p;
+			    }
+			    break;
+			}
+			p++;
+		    }
+		    if (p == pend) {
+			rb_raise(rb_eArgError, "non associated pointer");
+		    }
+		}
+		else {
+		    tmp = Qnil;
+		}
+		rb_ary_push(ary, tmp);
+	    }
+	    break;
+
+	  case 'p':
+	    if (len > (send - s) / sizeof(char *))
+		len = (send - s) / sizeof(char *);
+	    while (len-- > 0) {
+		if (send - s < sizeof(char *))
+		    break;
+		else {
+		    VALUE tmp;
+		    char *t;
+
+		    memcpy(&t, s, sizeof(char *));
+		    s += sizeof(char *);
+
+		    if (t) {
+			VALUE a, *p, *pend;
+
+			if (!(a = rb_str_associated(str))) {
+			    rb_raise(rb_eArgError, "no associated pointer");
+			}
+			p = RARRAY(a)->ptr;
+			pend = p + RARRAY(a)->len;
+			while (p < pend) {
+			    if (TYPE(*p) == T_STRING && RSTRING(*p)->ptr == t) {
+				tmp = *p;
+				break;
+			    }
+			    p++;
+			}
+			if (p == pend) {
+			    rb_raise(rb_eArgError, "non associated pointer");
+			}
+		    }
+		    else {
+			tmp = Qnil;
+		    }
+		    rb_ary_push(ary, tmp);
+		}
+	    }
+	    break;
+
+	  case 'w':
+	    {
+		unsigned long ul = 0;
+		unsigned long ulmask = 0xfeUL << ((sizeof(unsigned long) - 1) * 8);
+
+		while (len > 0 && s < send) {
+		    ul <<= 7;
+		    ul |= (*s & 0x7f);
+		    if (!(*s++ & 0x80)) {
+			rb_ary_push(ary, ULONG2NUM(ul));
+			len--;
+			ul = 0;
+		    }
+		    else if (ul & ulmask) {
+			VALUE big = rb_uint2big(ul);
+			VALUE big128 = rb_uint2big(128);
+			while (s < send) {
+			    big = rb_big_mul(big, big128);
+			    big = rb_big_plus(big, rb_uint2big(*s & 0x7f));
+			    if (!(*s++ & 0x80)) {
+				rb_ary_push(ary, big);
+				len--;
+				ul = 0;
+				break;
+			    }
+			}
+		    }
+		}
+	    }
+	    break;
+
+	  default:
+	    break;
+	}
+    }
+
+    return ary;
+}
+
+#define BYTEWIDTH 8
+
+static int
+uv_to_utf8(buf, uv)
+    char *buf;
+    unsigned long uv;
+{
+    if (uv <= 0x7f) {
+	buf[0] = (char)uv;
+	return 1;
+    }
+    if (uv <= 0x7ff) {
+	buf[0] = ((uv>>6)&0xff)|0xc0;
+	buf[1] = (uv&0x3f)|0x80;
+	return 2;
+    }
+    if (uv <= 0xffff) {
+	buf[0] = ((uv>>12)&0xff)|0xe0;
+	buf[1] = ((uv>>6)&0x3f)|0x80;
+	buf[2] = (uv&0x3f)|0x80;
+	return 3;
+    }
+    if (uv <= 0x1fffff) {
+	buf[0] = ((uv>>18)&0xff)|0xf0;
+	buf[1] = ((uv>>12)&0x3f)|0x80;
+	buf[2] = ((uv>>6)&0x3f)|0x80;
+	buf[3] = (uv&0x3f)|0x80;
+	return 4;
+    }
+    if (uv <= 0x3ffffff) {
+	buf[0] = ((uv>>24)&0xff)|0xf8;
+	buf[1] = ((uv>>18)&0x3f)|0x80;
+	buf[2] = ((uv>>12)&0x3f)|0x80;
+	buf[3] = ((uv>>6)&0x3f)|0x80;
+	buf[4] = (uv&0x3f)|0x80;
+	return 5;
+    }
+    if (uv <= 0x7fffffff) {
+	buf[0] = ((uv>>30)&0xff)|0xfc;
+	buf[1] = ((uv>>24)&0x3f)|0x80;
+	buf[2] = ((uv>>18)&0x3f)|0x80;
+	buf[3] = ((uv>>12)&0x3f)|0x80;
+	buf[4] = ((uv>>6)&0x3f)|0x80;
+	buf[5] = (uv&0x3f)|0x80;
+	return 6;
+    }
+    rb_raise(rb_eRangeError, "pack(U): value out of range");
+}
+
+static const unsigned long utf8_limits[] = {
+    0x0,			/* 1 */
+    0x80,			/* 2 */
+    0x800,			/* 3 */
+    0x10000,			/* 4 */
+    0x200000,			/* 5 */
+    0x4000000,			/* 6 */
+    0x80000000,			/* 7 */
+};
+
+static unsigned long
+utf8_to_uv(p, lenp)
+    char *p;
+    long *lenp;
+{
+    int c = *p++ & 0xff;
+    unsigned long uv = c;
+    long n;
+
+    if (!(uv & 0x80)) {
+	*lenp = 1;
+        return uv;
+    }
+    if (!(uv & 0x40)) {
+	*lenp = 1;
+	rb_raise(rb_eArgError, "malformed UTF-8 character");
+    }
+
+    if      (!(uv & 0x20)) { n = 2; uv &= 0x1f; }
+    else if (!(uv & 0x10)) { n = 3; uv &= 0x0f; }
+    else if (!(uv & 0x08)) { n = 4; uv &= 0x07; }
+    else if (!(uv & 0x04)) { n = 5; uv &= 0x03; }
+    else if (!(uv & 0x02)) { n = 6; uv &= 0x01; }
+    else {
+	*lenp = 1;
+	rb_raise(rb_eArgError, "malformed UTF-8 character");
+    }
+    if (n > *lenp) {
+	rb_raise(rb_eArgError, "malformed UTF-8 character (expected %d bytes, given %d bytes)",
+		 n, *lenp);
+    }
+    *lenp = n--;
+    if (n != 0) {
+	while (n--) {
+	    c = *p++ & 0xff;
+	    if ((c & 0xc0) != 0x80) {
+		*lenp -= n + 1;
+		rb_raise(rb_eArgError, "malformed UTF-8 character");
+	    }
+	    else {
+		c &= 0x3f;
+		uv = uv << 6 | c;
+	    }
+	}
+    }
+    n = *lenp - 1;
+    if (uv < utf8_limits[n]) {
+	rb_raise(rb_eArgError, "redundant UTF-8 sequence");
+    }
+    return uv;
+}
+
+void
+Init_pack()
+{
+    rb_define_method(rb_cArray, "pack", pack_pack, 1);
+    rb_define_method(rb_cString, "unpack", pack_unpack, 1);
+}
diff --git a/ruby_1_8_6/parse.y b/ruby_1_8_6/parse.y
new file mode 100644
index 0000000000..7aa04c8837
--- /dev/null
+++ b/ruby_1_8_6/parse.y
@@ -0,0 +1,6345 @@
+/**********************************************************************
+
+  parse.y -
+
+  $Author$
+  $Date$
+  created at: Fri May 28 18:02:42 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+%{
+
+#define YYDEBUG 1
+#define YYERROR_VERBOSE 1
+#ifndef YYSTACK_USE_ALLOCA
+#define YYSTACK_USE_ALLOCA 0
+#endif
+
+#include "ruby.h"
+#include "env.h"
+#include "intern.h"
+#include "node.h"
+#include "st.h"
+#include <stdio.h>
+#include <errno.h>
+#include <ctype.h>
+
+#define YYMALLOC	rb_parser_malloc
+#define YYREALLOC	rb_parser_realloc
+#define YYCALLOC	rb_parser_calloc
+#define YYFREE 	rb_parser_free
+#define malloc	YYMALLOC
+#define realloc	YYREALLOC
+#define calloc	YYCALLOC
+#define free	YYFREE
+static void *rb_parser_malloc _((size_t));
+static void *rb_parser_realloc _((void *, size_t));
+static void *rb_parser_calloc _((size_t, size_t));
+static void rb_parser_free _((void *));
+
+#define yyparse ruby_yyparse
+#define yylex ruby_yylex
+#define yyerror ruby_yyerror
+#define yylval ruby_yylval
+#define yychar ruby_yychar
+#define yydebug ruby_yydebug
+
+#define ID_SCOPE_SHIFT 3
+#define ID_SCOPE_MASK 0x07
+#define ID_LOCAL    0x01
+#define ID_INSTANCE 0x02
+#define ID_GLOBAL   0x03
+#define ID_ATTRSET  0x04
+#define ID_CONST    0x05
+#define ID_CLASS    0x06
+#define ID_JUNK     0x07
+#define ID_INTERNAL ID_JUNK
+
+#define is_notop_id(id) ((id)>tLAST_TOKEN)
+#define is_local_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_LOCAL)
+#define is_global_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_GLOBAL)
+#define is_instance_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_INSTANCE)
+#define is_attrset_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_ATTRSET)
+#define is_const_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_CONST)
+#define is_class_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_CLASS)
+#define is_junk_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_JUNK)
+
+#define is_asgn_or_id(id) ((is_notop_id(id)) && \
+	(((id)&ID_SCOPE_MASK) == ID_GLOBAL || \
+	 ((id)&ID_SCOPE_MASK) == ID_INSTANCE || \
+	 ((id)&ID_SCOPE_MASK) == ID_CLASS))
+
+NODE *ruby_eval_tree_begin = 0;
+NODE *ruby_eval_tree = 0;
+
+char *ruby_sourcefile;		/* current source file */
+int   ruby_sourceline;		/* current line no. */
+
+static int yylex();
+static int yyerror();
+
+static enum lex_state {
+    EXPR_BEG,			/* ignore newline, +/- is a sign. */
+    EXPR_END,			/* newline significant, +/- is an operator. */
+    EXPR_ARG,			/* newline significant, +/- is an operator. */
+    EXPR_CMDARG,		/* newline significant, +/- is an operator. */
+    EXPR_ENDARG,		/* newline significant, +/- is an operator. */
+    EXPR_MID,			/* newline significant, +/- is an operator. */
+    EXPR_FNAME,			/* ignore newline, no reserved words. */
+    EXPR_DOT,			/* right after `.' or `::', no reserved words. */
+    EXPR_CLASS,			/* immediate after `class', no here document. */
+} lex_state;
+static NODE *lex_strterm;
+
+#ifdef HAVE_LONG_LONG
+typedef unsigned LONG_LONG stack_type;
+#else
+typedef unsigned long stack_type;
+#endif
+
+#define BITSTACK_PUSH(stack, n)	(stack = (stack<<1)|((n)&1))
+#define BITSTACK_POP(stack)	(stack >>= 1)
+#define BITSTACK_LEXPOP(stack)	(stack = (stack >> 1) | (stack & 1))
+#define BITSTACK_SET_P(stack)	(stack&1)
+
+static stack_type cond_stack = 0;
+#define COND_PUSH(n)	BITSTACK_PUSH(cond_stack, n)
+#define COND_POP()	BITSTACK_POP(cond_stack)
+#define COND_LEXPOP()	BITSTACK_LEXPOP(cond_stack)
+#define COND_P()	BITSTACK_SET_P(cond_stack)
+
+static stack_type cmdarg_stack = 0;
+#define CMDARG_PUSH(n)	BITSTACK_PUSH(cmdarg_stack, n)
+#define CMDARG_POP()	BITSTACK_POP(cmdarg_stack)
+#define CMDARG_LEXPOP()	BITSTACK_LEXPOP(cmdarg_stack)
+#define CMDARG_P()	BITSTACK_SET_P(cmdarg_stack)
+
+static int class_nest = 0;
+static int in_single = 0;
+static int in_def = 0;
+static int compile_for_eval = 0;
+static ID cur_mid = 0;
+static int command_start = Qtrue;
+
+static NODE *cond();
+static NODE *logop();
+static int cond_negative();
+
+static NODE *newline_node();
+static void fixpos();
+
+static int value_expr0();
+static void void_expr0();
+static void void_stmts();
+static NODE *remove_begin();
+#define value_expr(node) value_expr0((node) = remove_begin(node))
+#define void_expr(node) void_expr0((node) = remove_begin(node))
+
+static NODE *block_append();
+static NODE *list_append();
+static NODE *list_concat();
+static NODE *arg_concat();
+static NODE *arg_prepend();
+static NODE *literal_concat();
+static NODE *new_evstr();
+static NODE *evstr2dstr();
+static NODE *call_op();
+static int in_defined = 0;
+
+static NODE *negate_lit();
+static NODE *ret_args();
+static NODE *arg_blk_pass();
+static NODE *new_call();
+static NODE *new_fcall();
+static NODE *new_super();
+static NODE *new_yield();
+
+static NODE *gettable();
+static NODE *assignable();
+static NODE *aryset();
+static NODE *attrset();
+static void rb_backref_error();
+static NODE *node_assign();
+
+static NODE *match_gen();
+static void local_push();
+static void local_pop();
+static int  local_append();
+static int  local_cnt();
+static int  local_id();
+static ID  *local_tbl();
+static ID   internal_id();
+
+static struct RVarmap *dyna_push();
+static void dyna_pop();
+static int dyna_in_block();
+static NODE *dyna_init();
+
+static void top_local_init();
+static void top_local_setup();
+
+#define RE_OPTION_ONCE 0x80
+
+#define NODE_STRTERM NODE_ZARRAY	/* nothing to gc */
+#define NODE_HEREDOC NODE_ARRAY 	/* 1, 3 to gc */
+#define SIGN_EXTEND(x,n) (((1<<(n)-1)^((x)&~(~0<<(n))))-(1<<(n)-1))
+#define nd_func u1.id
+#if SIZEOF_SHORT == 2
+#define nd_term(node) ((signed short)(node)->u2.id)
+#else
+#define nd_term(node) SIGN_EXTEND((node)->u2.id, CHAR_BIT*2)
+#endif
+#define nd_paren(node) (char)((node)->u2.id >> CHAR_BIT*2)
+#define nd_nest u3.id
+
+/* Older versions of Yacc set YYMAXDEPTH to a very low value by default (150,
+   for instance).  This is too low for Ruby to parse some files, such as
+   date/format.rb, therefore bump the value up to at least Bison's default. */
+#ifdef OLD_YACC
+#ifndef YYMAXDEPTH
+#define YYMAXDEPTH 10000
+#endif
+#endif
+
+%}
+
+%union {
+    NODE *node;
+    ID id;
+    int num;
+    struct RVarmap *vars;
+}
+
+%token  kCLASS
+	kMODULE
+	kDEF
+	kUNDEF
+	kBEGIN
+	kRESCUE
+	kENSURE
+	kEND
+	kIF
+	kUNLESS
+	kTHEN
+	kELSIF
+	kELSE
+	kCASE
+	kWHEN
+	kWHILE
+	kUNTIL
+	kFOR
+	kBREAK
+	kNEXT
+	kREDO
+	kRETRY
+	kIN
+	kDO
+	kDO_COND
+	kDO_BLOCK
+	kRETURN
+	kYIELD
+	kSUPER
+	kSELF
+	kNIL
+	kTRUE
+	kFALSE
+	kAND
+	kOR
+	kNOT
+	kIF_MOD
+	kUNLESS_MOD
+	kWHILE_MOD
+	kUNTIL_MOD
+	kRESCUE_MOD
+	kALIAS
+	kDEFINED
+	klBEGIN
+	klEND
+	k__LINE__
+	k__FILE__
+
+%token <id>   tIDENTIFIER tFID tGVAR tIVAR tCONSTANT tCVAR
+%token <node> tINTEGER tFLOAT tSTRING_CONTENT
+%token <node> tNTH_REF tBACK_REF
+%token <num>  tREGEXP_END
+
+%type <node> singleton strings string string1 xstring regexp
+%type <node> string_contents xstring_contents string_content
+%type <node> words qwords word_list qword_list word
+%type <node> literal numeric dsym cpath
+%type <node> bodystmt compstmt stmts stmt expr arg primary command command_call method_call
+%type <node> expr_value arg_value primary_value
+%type <node> if_tail opt_else case_body cases opt_rescue exc_list exc_var opt_ensure
+%type <node> args when_args call_args call_args2 open_args paren_args opt_paren_args
+%type <node> command_args aref_args opt_block_arg block_arg var_ref var_lhs
+%type <node> mrhs superclass block_call block_command
+%type <node> f_arglist f_args f_optarg f_opt f_rest_arg f_block_arg opt_f_block_arg
+%type <node> assoc_list assocs assoc undef_list backref string_dvar
+%type <node> block_var opt_block_var brace_block cmd_brace_block do_block lhs none fitem
+%type <node> mlhs mlhs_head mlhs_basic mlhs_entry mlhs_item mlhs_node
+%type <id>   fsym variable sym symbol operation operation2 operation3
+%type <id>   cname fname op
+%type <num>  f_norm_arg f_arg
+%token tUPLUS 		/* unary+ */
+%token tUMINUS 		/* unary- */
+%token tPOW		/* ** */
+%token tCMP  		/* <=> */
+%token tEQ  		/* == */
+%token tEQQ  		/* === */
+%token tNEQ  		/* != */
+%token tGEQ  		/* >= */
+%token tLEQ  		/* <= */
+%token tANDOP tOROP	/* && and || */
+%token tMATCH tNMATCH	/* =~ and !~ */
+%token tDOT2 tDOT3	/* .. and ... */
+%token tAREF tASET	/* [] and []= */
+%token tLSHFT tRSHFT	/* << and >> */
+%token tCOLON2		/* :: */
+%token tCOLON3		/* :: at EXPR_BEG */
+%token <id> tOP_ASGN	/* +=, -=  etc. */
+%token tASSOC		/* => */
+%token tLPAREN		/* ( */
+%token tLPAREN_ARG	/* ( */
+%token tRPAREN		/* ) */
+%token tLBRACK		/* [ */
+%token tLBRACE		/* { */
+%token tLBRACE_ARG	/* { */
+%token tSTAR		/* * */
+%token tAMPER		/* & */
+%token tSYMBEG tSTRING_BEG tXSTRING_BEG tREGEXP_BEG tWORDS_BEG tQWORDS_BEG
+%token tSTRING_DBEG tSTRING_DVAR tSTRING_END
+
+/*
+ *	precedence table
+ */
+
+%nonassoc tLOWEST
+%nonassoc tLBRACE_ARG
+
+%nonassoc  kIF_MOD kUNLESS_MOD kWHILE_MOD kUNTIL_MOD
+%left  kOR kAND
+%right kNOT
+%nonassoc kDEFINED
+%right '=' tOP_ASGN
+%left kRESCUE_MOD
+%right '?' ':'
+%nonassoc tDOT2 tDOT3
+%left  tOROP
+%left  tANDOP
+%nonassoc  tCMP tEQ tEQQ tNEQ tMATCH tNMATCH
+%left  '>' tGEQ '<' tLEQ
+%left  '|' '^'
+%left  '&'
+%left  tLSHFT tRSHFT
+%left  '+' '-'
+%left  '*' '/' '%'
+%right tUMINUS_NUM tUMINUS
+%right tPOW
+%right '!' '~' tUPLUS
+
+%token tLAST_TOKEN
+
+%%
+program		:  {
+			lex_state = EXPR_BEG;
+                        top_local_init();
+			if (ruby_class == rb_cObject) class_nest = 0;
+			else class_nest = 1;
+		    }
+		  compstmt
+		    {
+			if ($2 && !compile_for_eval) {
+                            /* last expression should not be void */
+			    if (nd_type($2) != NODE_BLOCK) void_expr($2);
+			    else {
+				NODE *node = $2;
+				while (node->nd_next) {
+				    node = node->nd_next;
+				}
+				void_expr(node->nd_head);
+			    }
+			}
+			ruby_eval_tree = block_append(ruby_eval_tree, $2);
+                        top_local_setup();
+			class_nest = 0;
+		    }
+		;
+
+bodystmt	: compstmt
+		  opt_rescue
+		  opt_else
+		  opt_ensure
+		    {
+		        $$ = $1;
+			if ($2) {
+			    $$ = NEW_RESCUE($1, $2, $3);
+			}
+			else if ($3) {
+			    rb_warn("else without rescue is useless");
+			    $$ = block_append($$, $3);
+			}
+			if ($4) {
+			    $$ = NEW_ENSURE($$, $4);
+			}
+			fixpos($$, $1);
+		    }
+		;
+
+compstmt	: stmts opt_terms
+		    {
+			void_stmts($1);
+		        $$ = $1;
+		    }
+		;
+
+stmts		: none
+		| stmt
+		    {
+			$$ = newline_node($1);
+		    }
+		| stmts terms stmt
+		    {
+			$$ = block_append($1, newline_node($3));
+		    }
+		| error stmt
+		    {
+			$$ = $2;
+		    }
+		;
+
+stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
+		    {
+		        $$ = NEW_ALIAS($2, $4);
+		    }
+		| kALIAS tGVAR tGVAR
+		    {
+		        $$ = NEW_VALIAS($2, $3);
+		    }
+		| kALIAS tGVAR tBACK_REF
+		    {
+			char buf[3];
+
+			sprintf(buf, "$%c", (char)$3->nd_nth);
+		        $$ = NEW_VALIAS($2, rb_intern(buf));
+		    }
+		| kALIAS tGVAR tNTH_REF
+		    {
+		        yyerror("can't make alias for the number variables");
+		        $$ = 0;
+		    }
+		| kUNDEF undef_list
+		    {
+			$$ = $2;
+		    }
+		| stmt kIF_MOD expr_value
+		    {
+			$$ = NEW_IF(cond($3), $1, 0);
+		        fixpos($$, $3);
+			if (cond_negative(&$$->nd_cond)) {
+		            $$->nd_else = $$->nd_body;
+		            $$->nd_body = 0;
+			}
+		    }
+		| stmt kUNLESS_MOD expr_value
+		    {
+			$$ = NEW_UNLESS(cond($3), $1, 0);
+		        fixpos($$, $3);
+			if (cond_negative(&$$->nd_cond)) {
+		            $$->nd_body = $$->nd_else;
+		            $$->nd_else = 0;
+			}
+		    }
+		| stmt kWHILE_MOD expr_value
+		    {
+			if ($1 && nd_type($1) == NODE_BEGIN) {
+			    $$ = NEW_WHILE(cond($3), $1->nd_body, 0);
+			}
+			else {
+			    $$ = NEW_WHILE(cond($3), $1, 1);
+			}
+			if (cond_negative(&$$->nd_cond)) {
+			    nd_set_type($$, NODE_UNTIL);
+			}
+		    }
+		| stmt kUNTIL_MOD expr_value
+		    {
+			if ($1 && nd_type($1) == NODE_BEGIN) {
+			    $$ = NEW_UNTIL(cond($3), $1->nd_body, 0);
+			}
+			else {
+			    $$ = NEW_UNTIL(cond($3), $1, 1);
+			}
+			if (cond_negative(&$$->nd_cond)) {
+			    nd_set_type($$, NODE_WHILE);
+			}
+		    }
+		| stmt kRESCUE_MOD stmt
+		    {
+			$$ = NEW_RESCUE($1, NEW_RESBODY(0,$3,0), 0);
+		    }
+		| klBEGIN
+		    {
+			if (in_def || in_single) {
+			    yyerror("BEGIN in method");
+			}
+			local_push(0);
+		    }
+		  '{' compstmt '}'
+		    {
+			ruby_eval_tree_begin = block_append(ruby_eval_tree_begin,
+						            NEW_PREEXE($4));
+		        local_pop();
+		        $$ = 0;
+		    }
+		| klEND '{' compstmt '}'
+		    {
+			if (in_def || in_single) {
+			    rb_warn("END in method; use at_exit");
+			}
+
+			$$ = NEW_ITER(0, NEW_POSTEXE(), $3);
+		    }
+		| lhs '=' command_call
+		    {
+			$$ = node_assign($1, $3);
+		    }
+		| mlhs '=' command_call
+		    {
+			value_expr($3);
+			$1->nd_value = ($1->nd_head) ? NEW_TO_ARY($3) : NEW_ARRAY($3);
+			$$ = $1;
+		    }
+		| var_lhs tOP_ASGN command_call
+		    {
+			value_expr($3);
+			if ($1) {
+			    ID vid = $1->nd_vid;
+			    if ($2 == tOROP) {
+				$1->nd_value = $3;
+				$$ = NEW_OP_ASGN_OR(gettable(vid), $1);
+				if (is_asgn_or_id(vid)) {
+				    $$->nd_aid = vid;
+				}
+			    }
+			    else if ($2 == tANDOP) {
+				$1->nd_value = $3;
+				$$ = NEW_OP_ASGN_AND(gettable(vid), $1);
+			    }
+			    else {
+				$$ = $1;
+				$$->nd_value = call_op(gettable(vid),$2,1,$3);
+			    }
+			}
+			else {
+			    $$ = 0;
+			}
+		    }
+		| primary_value '[' aref_args ']' tOP_ASGN command_call
+		    {
+                        NODE *args;
+
+			value_expr($6);
+			if (!$3) $3 = NEW_ZARRAY();
+			args = arg_concat($6, $3);
+			if ($5 == tOROP) {
+			    $5 = 0;
+			}
+			else if ($5 == tANDOP) {
+			    $5 = 1;
+			}
+			$$ = NEW_OP_ASGN1($1, $5, args);
+		        fixpos($$, $1);
+		    }
+		| primary_value '.' tIDENTIFIER tOP_ASGN command_call
+		    {
+			value_expr($5);
+			if ($4 == tOROP) {
+			    $4 = 0;
+			}
+			else if ($4 == tANDOP) {
+			    $4 = 1;
+			}
+			$$ = NEW_OP_ASGN2($1, $3, $4, $5);
+		        fixpos($$, $1);
+		    }
+		| primary_value '.' tCONSTANT tOP_ASGN command_call
+		    {
+			value_expr($5);
+			if ($4 == tOROP) {
+			    $4 = 0;
+			}
+			else if ($4 == tANDOP) {
+			    $4 = 1;
+			}
+			$$ = NEW_OP_ASGN2($1, $3, $4, $5);
+		        fixpos($$, $1);
+		    }
+		| primary_value tCOLON2 tIDENTIFIER tOP_ASGN command_call
+		    {
+			value_expr($5);
+			if ($4 == tOROP) {
+			    $4 = 0;
+			}
+			else if ($4 == tANDOP) {
+			    $4 = 1;
+			}
+			$$ = NEW_OP_ASGN2($1, $3, $4, $5);
+		        fixpos($$, $1);
+		    }
+		| backref tOP_ASGN command_call
+		    {
+		        rb_backref_error($1);
+			$$ = 0;
+		    }
+		| lhs '=' mrhs
+		    {
+			$$ = node_assign($1, NEW_SVALUE($3));
+		    }
+		| mlhs '=' arg_value
+		    {
+			$1->nd_value = ($1->nd_head) ? NEW_TO_ARY($3) : NEW_ARRAY($3);
+			$$ = $1;
+		    }
+		| mlhs '=' mrhs
+		    {
+			$1->nd_value = $3;
+			$$ = $1;
+		    }
+		| expr
+		;
+
+expr		: command_call
+		| expr kAND expr
+		    {
+			$$ = logop(NODE_AND, $1, $3);
+		    }
+		| expr kOR expr
+		    {
+			$$ = logop(NODE_OR, $1, $3);
+		    }
+		| kNOT expr
+		    {
+			$$ = NEW_NOT(cond($2));
+		    }
+		| '!' command_call
+		    {
+			$$ = NEW_NOT(cond($2));
+		    }
+		| arg
+		;
+
+expr_value	: expr
+		    {
+			value_expr($$);
+			$$ = $1;
+		    }
+		;
+
+command_call	: command
+		| block_command
+		| kRETURN call_args
+		    {
+			$$ = NEW_RETURN(ret_args($2));
+		    }
+		| kBREAK call_args
+		    {
+			$$ = NEW_BREAK(ret_args($2));
+		    }
+		| kNEXT call_args
+		    {
+			$$ = NEW_NEXT(ret_args($2));
+		    }
+		;
+
+block_command	: block_call
+		| block_call '.' operation2 command_args
+		    {
+			$$ = new_call($1, $3, $4);
+		    }
+		| block_call tCOLON2 operation2 command_args
+		    {
+			$$ = new_call($1, $3, $4);
+		    }
+		;
+
+cmd_brace_block	: tLBRACE_ARG
+		    {
+			$<vars>$ = dyna_push();
+			$<num>1 = ruby_sourceline;
+		    }
+		  opt_block_var {$<vars>$ = ruby_dyna_vars;}
+		  compstmt
+		  '}'
+		    {
+			$$ = NEW_ITER($3, 0, dyna_init($5, $<vars>4));
+			nd_set_line($$, $<num>1);
+			dyna_pop($<vars>2);
+		    }
+		;
+
+command		: operation command_args       %prec tLOWEST
+		    {
+			$$ = new_fcall($1, $2);
+		        fixpos($$, $2);
+		   }
+		| operation command_args cmd_brace_block
+		    {
+			$$ = new_fcall($1, $2);
+			if ($3) {
+			    if (nd_type($$) == NODE_BLOCK_PASS) {
+				rb_compile_error("both block arg and actual block given");
+			    }
+			    $3->nd_iter = $$;
+			    $$ = $3;
+			}
+		        fixpos($$, $2);
+		   }
+		| primary_value '.' operation2 command_args	%prec tLOWEST
+		    {
+			$$ = new_call($1, $3, $4);
+		        fixpos($$, $1);
+		    }
+		| primary_value '.' operation2 command_args cmd_brace_block
+		    {
+			$$ = new_call($1, $3, $4);
+			if ($5) {
+			    if (nd_type($$) == NODE_BLOCK_PASS) {
+				rb_compile_error("both block arg and actual block given");
+			    }
+			    $5->nd_iter = $$;
+			    $$ = $5;
+			}
+		        fixpos($$, $1);
+		   }
+		| primary_value tCOLON2 operation2 command_args	%prec tLOWEST
+		    {
+			$$ = new_call($1, $3, $4);
+		        fixpos($$, $1);
+		    }
+		| primary_value tCOLON2 operation2 command_args cmd_brace_block
+		    {
+			$$ = new_call($1, $3, $4);
+			if ($5) {
+			    if (nd_type($$) == NODE_BLOCK_PASS) {
+				rb_compile_error("both block arg and actual block given");
+			    }
+			    $5->nd_iter = $$;
+			    $$ = $5;
+			}
+		        fixpos($$, $1);
+		   }
+		| kSUPER command_args
+		    {
+			$$ = new_super($2);
+		        fixpos($$, $2);
+		    }
+		| kYIELD command_args
+		    {
+			$$ = new_yield($2);
+		        fixpos($$, $2);
+		    }
+		;
+
+mlhs		: mlhs_basic
+		| tLPAREN mlhs_entry ')'
+		    {
+			$$ = $2;
+		    }
+		;
+
+mlhs_entry	: mlhs_basic
+		| tLPAREN mlhs_entry ')'
+		    {
+			$$ = NEW_MASGN(NEW_LIST($2), 0);
+		    }
+		;
+
+mlhs_basic	: mlhs_head
+		    {
+			$$ = NEW_MASGN($1, 0);
+		    }
+		| mlhs_head mlhs_item
+		    {
+			$$ = NEW_MASGN(list_append($1,$2), 0);
+		    }
+		| mlhs_head tSTAR mlhs_node
+		    {
+			$$ = NEW_MASGN($1, $3);
+		    }
+		| mlhs_head tSTAR
+		    {
+			$$ = NEW_MASGN($1, -1);
+		    }
+		| tSTAR mlhs_node
+		    {
+			$$ = NEW_MASGN(0, $2);
+		    }
+		| tSTAR
+		    {
+			$$ = NEW_MASGN(0, -1);
+		    }
+		;
+
+mlhs_item	: mlhs_node
+		| tLPAREN mlhs_entry ')'
+		    {
+			$$ = $2;
+		    }
+		;
+
+mlhs_head	: mlhs_item ','
+		    {
+			$$ = NEW_LIST($1);
+		    }
+		| mlhs_head mlhs_item ','
+		    {
+			$$ = list_append($1, $2);
+		    }
+		;
+
+mlhs_node	: variable
+		    {
+			$$ = assignable($1, 0);
+		    }
+		| primary_value '[' aref_args ']'
+		    {
+			$$ = aryset($1, $3);
+		    }
+		| primary_value '.' tIDENTIFIER
+		    {
+			$$ = attrset($1, $3);
+		    }
+		| primary_value tCOLON2 tIDENTIFIER
+		    {
+			$$ = attrset($1, $3);
+		    }
+		| primary_value '.' tCONSTANT
+		    {
+			$$ = attrset($1, $3);
+		    }
+		| primary_value tCOLON2 tCONSTANT
+		    {
+			if (in_def || in_single)
+			    yyerror("dynamic constant assignment");
+			$$ = NEW_CDECL(0, 0, NEW_COLON2($1, $3));
+		    }
+		| tCOLON3 tCONSTANT
+		    {
+			if (in_def || in_single)
+			    yyerror("dynamic constant assignment");
+			$$ = NEW_CDECL(0, 0, NEW_COLON3($2));
+		    }
+		| backref
+		    {
+		        rb_backref_error($1);
+			$$ = 0;
+		    }
+		;
+
+lhs		: variable
+		    {
+			$$ = assignable($1, 0);
+		    }
+		| primary_value '[' aref_args ']'
+		    {
+			$$ = aryset($1, $3);
+		    }
+		| primary_value '.' tIDENTIFIER
+		    {
+			$$ = attrset($1, $3);
+		    }
+		| primary_value tCOLON2 tIDENTIFIER
+		    {
+			$$ = attrset($1, $3);
+		    }
+		| primary_value '.' tCONSTANT
+		    {
+			$$ = attrset($1, $3);
+		    }
+		| primary_value tCOLON2 tCONSTANT
+		    {
+			if (in_def || in_single)
+			    yyerror("dynamic constant assignment");
+			$$ = NEW_CDECL(0, 0, NEW_COLON2($1, $3));
+		    }
+		| tCOLON3 tCONSTANT
+		    {
+			if (in_def || in_single)
+			    yyerror("dynamic constant assignment");
+			$$ = NEW_CDECL(0, 0, NEW_COLON3($2));
+		    }
+		| backref
+		    {
+		        rb_backref_error($1);
+			$$ = 0;
+		    }
+		;
+
+cname		: tIDENTIFIER
+		    {
+			yyerror("class/module name must be CONSTANT");
+		    }
+		| tCONSTANT
+		;
+
+cpath		: tCOLON3 cname
+		    {
+			$$ = NEW_COLON3($2);
+		    }
+		| cname
+		    {
+			$$ = NEW_COLON2(0, $$);
+		    }
+		| primary_value tCOLON2 cname
+		    {
+			$$ = NEW_COLON2($1, $3);
+		    }
+		;
+
+fname		: tIDENTIFIER
+		| tCONSTANT
+		| tFID
+		| op
+		    {
+			lex_state = EXPR_END;
+			$$ = $1;
+		    }
+		| reswords
+		    {
+			lex_state = EXPR_END;
+			$$ = $<id>1;
+		    }
+		;
+
+fsym		: fname
+		| symbol
+		;
+
+fitem		: fsym
+		    {
+			$$ = NEW_LIT(ID2SYM($1));
+		    }
+		| dsym
+		;
+
+undef_list	: fitem
+		    {
+			$$ = NEW_UNDEF($1);
+		    }
+		| undef_list ',' {lex_state = EXPR_FNAME;} fitem
+		    {
+			$$ = block_append($1, NEW_UNDEF($4));
+		    }
+		;
+
+op		: '|'		{ $$ = '|'; }
+		| '^'		{ $$ = '^'; }
+		| '&'		{ $$ = '&'; }
+		| tCMP		{ $$ = tCMP; }
+		| tEQ		{ $$ = tEQ; }
+		| tEQQ		{ $$ = tEQQ; }
+		| tMATCH	{ $$ = tMATCH; }
+		| '>'		{ $$ = '>'; }
+		| tGEQ		{ $$ = tGEQ; }
+		| '<'		{ $$ = '<'; }
+		| tLEQ		{ $$ = tLEQ; }
+		| tLSHFT	{ $$ = tLSHFT; }
+		| tRSHFT	{ $$ = tRSHFT; }
+		| '+'		{ $$ = '+'; }
+		| '-'		{ $$ = '-'; }
+		| '*'		{ $$ = '*'; }
+		| tSTAR		{ $$ = '*'; }
+		| '/'		{ $$ = '/'; }
+		| '%'		{ $$ = '%'; }
+		| tPOW		{ $$ = tPOW; }
+		| '~'		{ $$ = '~'; }
+		| tUPLUS	{ $$ = tUPLUS; }
+		| tUMINUS	{ $$ = tUMINUS; }
+		| tAREF		{ $$ = tAREF; }
+		| tASET		{ $$ = tASET; }
+		| '`'		{ $$ = '`'; }
+		;
+
+reswords	: k__LINE__ | k__FILE__  | klBEGIN | klEND
+		| kALIAS | kAND | kBEGIN | kBREAK | kCASE | kCLASS | kDEF
+		| kDEFINED | kDO | kELSE | kELSIF | kEND | kENSURE | kFALSE
+		| kFOR | kIN | kMODULE | kNEXT | kNIL | kNOT
+		| kOR | kREDO | kRESCUE | kRETRY | kRETURN | kSELF | kSUPER
+		| kTHEN | kTRUE | kUNDEF | kWHEN | kYIELD
+		| kIF | kUNLESS | kWHILE | kUNTIL
+		;
+
+arg		: lhs '=' arg
+		    {
+			$$ = node_assign($1, $3);
+		    }
+		| lhs '=' arg kRESCUE_MOD arg
+		    {
+			$$ = node_assign($1, NEW_RESCUE($3, NEW_RESBODY(0,$5,0), 0));
+		    }
+		| var_lhs tOP_ASGN arg
+		    {
+			value_expr($3);
+			if ($1) {
+			    ID vid = $1->nd_vid;
+			    if ($2 == tOROP) {
+				$1->nd_value = $3;
+				$$ = NEW_OP_ASGN_OR(gettable(vid), $1);
+				if (is_asgn_or_id(vid)) {
+				    $$->nd_aid = vid;
+				}
+			    }
+			    else if ($2 == tANDOP) {
+				$1->nd_value = $3;
+				$$ = NEW_OP_ASGN_AND(gettable(vid), $1);
+			    }
+			    else {
+				$$ = $1;
+				$$->nd_value = call_op(gettable(vid),$2,1,$3);
+			    }
+			}
+			else {
+			    $$ = 0;
+			}
+		    }
+		| primary_value '[' aref_args ']' tOP_ASGN arg
+		    {
+                        NODE *args;
+
+			value_expr($6);
+			if (!$3) $3 = NEW_ZARRAY();
+			args = arg_concat($6, $3);
+			if ($5 == tOROP) {
+			    $5 = 0;
+			}
+			else if ($5 == tANDOP) {
+			    $5 = 1;
+			}
+			$$ = NEW_OP_ASGN1($1, $5, args);
+		        fixpos($$, $1);
+		    }
+		| primary_value '.' tIDENTIFIER tOP_ASGN arg
+		    {
+			value_expr($5);
+			if ($4 == tOROP) {
+			    $4 = 0;
+			}
+			else if ($4 == tANDOP) {
+			    $4 = 1;
+			}
+			$$ = NEW_OP_ASGN2($1, $3, $4, $5);
+		        fixpos($$, $1);
+		    }
+		| primary_value '.' tCONSTANT tOP_ASGN arg
+		    {
+			value_expr($5);
+			if ($4 == tOROP) {
+			    $4 = 0;
+			}
+			else if ($4 == tANDOP) {
+			    $4 = 1;
+			}
+			$$ = NEW_OP_ASGN2($1, $3, $4, $5);
+		        fixpos($$, $1);
+		    }
+		| primary_value tCOLON2 tIDENTIFIER tOP_ASGN arg
+		    {
+			value_expr($5);
+			if ($4 == tOROP) {
+			    $4 = 0;
+			}
+			else if ($4 == tANDOP) {
+			    $4 = 1;
+			}
+			$$ = NEW_OP_ASGN2($1, $3, $4, $5);
+		        fixpos($$, $1);
+		    }
+		| primary_value tCOLON2 tCONSTANT tOP_ASGN arg
+		    {
+			yyerror("constant re-assignment");
+			$$ = 0;
+		    }
+		| tCOLON3 tCONSTANT tOP_ASGN arg
+		    {
+			yyerror("constant re-assignment");
+			$$ = 0;
+		    }
+		| backref tOP_ASGN arg
+		    {
+		        rb_backref_error($1);
+			$$ = 0;
+		    }
+		| arg tDOT2 arg
+		    {
+			value_expr($1);
+			value_expr($3);
+			if (nd_type($1) == NODE_LIT && FIXNUM_P($1->nd_lit) &&
+			    nd_type($3) == NODE_LIT && FIXNUM_P($3->nd_lit)) {
+			    $1->nd_lit = rb_range_new($1->nd_lit, $3->nd_lit, Qfalse);
+			    $$ = $1;
+			}
+			else {
+			    $$ = NEW_DOT2($1, $3);
+			}
+		    }
+		| arg tDOT3 arg
+		    {
+			value_expr($1);
+			value_expr($3);
+			if (nd_type($1) == NODE_LIT && FIXNUM_P($1->nd_lit) &&
+			    nd_type($3) == NODE_LIT && FIXNUM_P($3->nd_lit)) {
+			    $1->nd_lit = rb_range_new($1->nd_lit, $3->nd_lit, Qtrue);
+			    $$ = $1;
+			}
+			else {
+			    $$ = NEW_DOT3($1, $3);
+			}
+		    }
+		| arg '+' arg
+		    {
+			$$ = call_op($1, '+', 1, $3);
+		    }
+		| arg '-' arg
+		    {
+		        $$ = call_op($1, '-', 1, $3);
+		    }
+		| arg '*' arg
+		    {
+		        $$ = call_op($1, '*', 1, $3);
+		    }
+		| arg '/' arg
+		    {
+			$$ = call_op($1, '/', 1, $3);
+		    }
+		| arg '%' arg
+		    {
+			$$ = call_op($1, '%', 1, $3);
+		    }
+		| arg tPOW arg
+		    {
+			$$ = call_op($1, tPOW, 1, $3);
+		    }
+		| tUMINUS_NUM tINTEGER tPOW arg
+		    {
+			$$ = call_op(call_op($2, tPOW, 1, $4), tUMINUS, 0, 0);
+		    }
+		| tUMINUS_NUM tFLOAT tPOW arg
+		    {
+			$$ = call_op(call_op($2, tPOW, 1, $4), tUMINUS, 0, 0);
+		    }
+		| tUPLUS arg
+		    {
+			if ($2 && nd_type($2) == NODE_LIT) {
+			    $$ = $2;
+			}
+			else {
+			    $$ = call_op($2, tUPLUS, 0, 0);
+			}
+		    }
+		| tUMINUS arg
+		    {
+			$$ = call_op($2, tUMINUS, 0, 0);
+		    }
+		| arg '|' arg
+		    {
+		        $$ = call_op($1, '|', 1, $3);
+		    }
+		| arg '^' arg
+		    {
+			$$ = call_op($1, '^', 1, $3);
+		    }
+		| arg '&' arg
+		    {
+			$$ = call_op($1, '&', 1, $3);
+		    }
+		| arg tCMP arg
+		    {
+			$$ = call_op($1, tCMP, 1, $3);
+		    }
+		| arg '>' arg
+		    {
+			$$ = call_op($1, '>', 1, $3);
+		    }
+		| arg tGEQ arg
+		    {
+			$$ = call_op($1, tGEQ, 1, $3);
+		    }
+		| arg '<' arg
+		    {
+			$$ = call_op($1, '<', 1, $3);
+		    }
+		| arg tLEQ arg
+		    {
+			$$ = call_op($1, tLEQ, 1, $3);
+		    }
+		| arg tEQ arg
+		    {
+			$$ = call_op($1, tEQ, 1, $3);
+		    }
+		| arg tEQQ arg
+		    {
+			$$ = call_op($1, tEQQ, 1, $3);
+		    }
+		| arg tNEQ arg
+		    {
+			$$ = NEW_NOT(call_op($1, tEQ, 1, $3));
+		    }
+		| arg tMATCH arg
+		    {
+			$$ = match_gen($1, $3);
+		    }
+		| arg tNMATCH arg
+		    {
+			$$ = NEW_NOT(match_gen($1, $3));
+		    }
+		| '!' arg
+		    {
+			$$ = NEW_NOT(cond($2));
+		    }
+		| '~' arg
+		    {
+			$$ = call_op($2, '~', 0, 0);
+		    }
+		| arg tLSHFT arg
+		    {
+			$$ = call_op($1, tLSHFT, 1, $3);
+		    }
+		| arg tRSHFT arg
+		    {
+			$$ = call_op($1, tRSHFT, 1, $3);
+		    }
+		| arg tANDOP arg
+		    {
+			$$ = logop(NODE_AND, $1, $3);
+		    }
+		| arg tOROP arg
+		    {
+			$$ = logop(NODE_OR, $1, $3);
+		    }
+		| kDEFINED opt_nl {in_defined = 1;} arg
+		    {
+		        in_defined = 0;
+			$$ = NEW_DEFINED($4);
+		    }
+		| arg '?' arg ':' arg
+		    {
+			$$ = NEW_IF(cond($1), $3, $5);
+		        fixpos($$, $1);
+		    }
+		| primary
+		    {
+			$$ = $1;
+		    }
+		;
+
+arg_value	: arg
+		    {
+			value_expr($1);
+			$$ = $1;
+		    }
+		;
+
+aref_args	: none
+		| command opt_nl
+		    {
+		        rb_warn("parenthesize argument(s) for future version");
+			$$ = NEW_LIST($1);
+		    }
+		| args trailer
+		    {
+			$$ = $1;
+		    }
+		| args ',' tSTAR arg opt_nl
+		    {
+			value_expr($4);
+			$$ = arg_concat($1, $4);
+		    }
+		| assocs trailer
+		    {
+			$$ = NEW_LIST(NEW_HASH($1));
+		    }
+		| tSTAR arg opt_nl
+		    {
+			value_expr($2);
+			$$ = NEW_NEWLINE(NEW_SPLAT($2));
+		    }
+		;
+
+paren_args	: '(' none ')'
+		    {
+			$$ = $2;
+		    }
+		| '(' call_args opt_nl ')'
+		    {
+			$$ = $2;
+		    }
+		| '(' block_call opt_nl ')'
+		    {
+		        rb_warn("parenthesize argument for future version");
+			$$ = NEW_LIST($2);
+		    }
+		| '(' args ',' block_call opt_nl ')'
+		    {
+		        rb_warn("parenthesize argument for future version");
+			$$ = list_append($2, $4);
+		    }
+		;
+
+opt_paren_args	: none
+		| paren_args
+		;
+
+call_args	: command
+		    {
+		        rb_warn("parenthesize argument(s) for future version");
+			$$ = NEW_LIST($1);
+		    }
+		| args opt_block_arg
+		    {
+			$$ = arg_blk_pass($1, $2);
+		    }
+		| args ',' tSTAR arg_value opt_block_arg
+		    {
+			$$ = arg_concat($1, $4);
+			$$ = arg_blk_pass($$, $5);
+		    }
+		| assocs opt_block_arg
+		    {
+			$$ = NEW_LIST(NEW_HASH($1));
+			$$ = arg_blk_pass($$, $2);
+		    }
+		| assocs ',' tSTAR arg_value opt_block_arg
+		    {
+			$$ = arg_concat(NEW_LIST(NEW_HASH($1)), $4);
+			$$ = arg_blk_pass($$, $5);
+		    }
+		| args ',' assocs opt_block_arg
+		    {
+			$$ = list_append($1, NEW_HASH($3));
+			$$ = arg_blk_pass($$, $4);
+		    }
+		| args ',' assocs ',' tSTAR arg opt_block_arg
+		    {
+			value_expr($6);
+			$$ = arg_concat(list_append($1, NEW_HASH($3)), $6);
+			$$ = arg_blk_pass($$, $7);
+		    }
+		| tSTAR arg_value opt_block_arg
+		    {
+			$$ = arg_blk_pass(NEW_SPLAT($2), $3);
+		    }
+		| block_arg
+		;
+
+call_args2	: arg_value ',' args opt_block_arg
+		    {
+			$$ = arg_blk_pass(list_concat(NEW_LIST($1),$3), $4);
+		    }
+		| arg_value ',' block_arg
+		    {
+                        $$ = arg_blk_pass($1, $3);
+                    }
+		| arg_value ',' tSTAR arg_value opt_block_arg
+		    {
+			$$ = arg_concat(NEW_LIST($1), $4);
+			$$ = arg_blk_pass($$, $5);
+		    }
+		| arg_value ',' args ',' tSTAR arg_value opt_block_arg
+		    {
+                       $$ = arg_concat(list_concat(NEW_LIST($1),$3), $6);
+			$$ = arg_blk_pass($$, $7);
+		    }
+		| assocs opt_block_arg
+		    {
+			$$ = NEW_LIST(NEW_HASH($1));
+			$$ = arg_blk_pass($$, $2);
+		    }
+		| assocs ',' tSTAR arg_value opt_block_arg
+		    {
+			$$ = arg_concat(NEW_LIST(NEW_HASH($1)), $4);
+			$$ = arg_blk_pass($$, $5);
+		    }
+		| arg_value ',' assocs opt_block_arg
+		    {
+			$$ = list_append(NEW_LIST($1), NEW_HASH($3));
+			$$ = arg_blk_pass($$, $4);
+		    }
+		| arg_value ',' args ',' assocs opt_block_arg
+		    {
+			$$ = list_append(list_concat(NEW_LIST($1),$3), NEW_HASH($5));
+			$$ = arg_blk_pass($$, $6);
+		    }
+		| arg_value ',' assocs ',' tSTAR arg_value opt_block_arg
+		    {
+			$$ = arg_concat(list_append(NEW_LIST($1), NEW_HASH($3)), $6);
+			$$ = arg_blk_pass($$, $7);
+		    }
+		| arg_value ',' args ',' assocs ',' tSTAR arg_value opt_block_arg
+		    {
+			$$ = arg_concat(list_append(list_concat(NEW_LIST($1), $3), NEW_HASH($5)), $8);
+			$$ = arg_blk_pass($$, $9);
+		    }
+		| tSTAR arg_value opt_block_arg
+		    {
+			$$ = arg_blk_pass(NEW_SPLAT($2), $3);
+		    }
+		| block_arg
+		;
+
+command_args	:  {
+			$<num>$ = cmdarg_stack;
+			CMDARG_PUSH(1);
+		    }
+		  open_args
+		    {
+			/* CMDARG_POP() */
+		        cmdarg_stack = $<num>1;
+			$$ = $2;
+		    }
+		;
+
+open_args	: call_args
+		| tLPAREN_ARG  {lex_state = EXPR_ENDARG;} ')'
+		    {
+		        rb_warn("don't put space before argument parentheses");
+			$$ = 0;
+		    }
+		| tLPAREN_ARG call_args2 {lex_state = EXPR_ENDARG;} ')'
+		    {
+		        rb_warn("don't put space before argument parentheses");
+			$$ = $2;
+		    }
+		;
+
+block_arg	: tAMPER arg_value
+		    {
+			$$ = NEW_BLOCK_PASS($2);
+		    }
+		;
+
+opt_block_arg	: ',' block_arg
+		    {
+			$$ = $2;
+		    }
+		| none
+		;
+
+args 		: arg_value
+		    {
+			$$ = NEW_LIST($1);
+		    }
+		| args ',' arg_value
+		    {
+			$$ = list_append($1, $3);
+		    }
+		;
+
+mrhs		: args ',' arg_value
+		    {
+			$$ = list_append($1, $3);
+		    }
+		| args ',' tSTAR arg_value
+		    {
+			$$ = arg_concat($1, $4);
+		    }
+		| tSTAR arg_value
+		    {
+			$$ = NEW_SPLAT($2);
+		    }
+		;
+
+primary		: literal
+		| strings
+		| xstring
+		| regexp
+		| words
+		| qwords
+		| var_ref
+		| backref
+		| tFID
+		    {
+			$$ = NEW_FCALL($1, 0);
+		    }
+		| kBEGIN
+		    {
+			$<num>1 = ruby_sourceline;
+		    }
+		  bodystmt
+		  kEND
+		    {
+			if ($3 == NULL)
+			    $$ = NEW_NIL();
+			else
+			    $$ = NEW_BEGIN($3);
+			nd_set_line($$, $<num>1);
+		    }
+		| tLPAREN_ARG expr {lex_state = EXPR_ENDARG;} opt_nl ')'
+		    {
+		        rb_warning("(...) interpreted as grouped expression");
+			$$ = $2;
+		    }
+		| tLPAREN compstmt ')'
+		    {
+			if (!$2) $$ = NEW_NIL();
+			else $$ = $2;
+		    }
+		| primary_value tCOLON2 tCONSTANT
+		    {
+			$$ = NEW_COLON2($1, $3);
+		    }
+		| tCOLON3 tCONSTANT
+		    {
+			$$ = NEW_COLON3($2);
+		    }
+		| primary_value '[' aref_args ']'
+		    {
+			if ($1 && nd_type($1) == NODE_SELF)
+			    $$ = NEW_FCALL(tAREF, $3);
+			else
+			    $$ = NEW_CALL($1, tAREF, $3);
+			fixpos($$, $1);
+		    }
+		| tLBRACK aref_args ']'
+		    {
+		        if ($2 == 0) {
+			    $$ = NEW_ZARRAY(); /* zero length array*/
+			}
+			else {
+			    $$ = $2;
+			}
+		    }
+		| tLBRACE assoc_list '}'
+		    {
+			$$ = NEW_HASH($2);
+		    }
+		| kRETURN
+		    {
+			$$ = NEW_RETURN(0);
+		    }
+		| kYIELD '(' call_args ')'
+		    {
+			$$ = new_yield($3);
+		    }
+		| kYIELD '(' ')'
+		    {
+			$$ = NEW_YIELD(0, Qfalse);
+		    }
+		| kYIELD
+		    {
+			$$ = NEW_YIELD(0, Qfalse);
+		    }
+		| kDEFINED opt_nl '(' {in_defined = 1;} expr ')'
+		    {
+		        in_defined = 0;
+			$$ = NEW_DEFINED($5);
+		    }
+		| operation brace_block
+		    {
+			$2->nd_iter = NEW_FCALL($1, 0);
+			$$ = $2;
+			fixpos($2->nd_iter, $2);
+		    }
+		| method_call
+		| method_call brace_block
+		    {
+			if ($1 && nd_type($1) == NODE_BLOCK_PASS) {
+			    rb_compile_error("both block arg and actual block given");
+			}
+			$2->nd_iter = $1;
+			$$ = $2;
+		        fixpos($$, $1);
+		    }
+		| kIF expr_value then
+		  compstmt
+		  if_tail
+		  kEND
+		    {
+			$$ = NEW_IF(cond($2), $4, $5);
+		        fixpos($$, $2);
+			if (cond_negative(&$$->nd_cond)) {
+		            NODE *tmp = $$->nd_body;
+		            $$->nd_body = $$->nd_else;
+		            $$->nd_else = tmp;
+			}
+		    }
+		| kUNLESS expr_value then
+		  compstmt
+		  opt_else
+		  kEND
+		    {
+			$$ = NEW_UNLESS(cond($2), $4, $5);
+		        fixpos($$, $2);
+			if (cond_negative(&$$->nd_cond)) {
+		            NODE *tmp = $$->nd_body;
+		            $$->nd_body = $$->nd_else;
+		            $$->nd_else = tmp;
+			}
+		    }
+		| kWHILE {COND_PUSH(1);} expr_value do {COND_POP();}
+		  compstmt
+		  kEND
+		    {
+			$$ = NEW_WHILE(cond($3), $6, 1);
+		        fixpos($$, $3);
+			if (cond_negative(&$$->nd_cond)) {
+			    nd_set_type($$, NODE_UNTIL);
+			}
+		    }
+		| kUNTIL {COND_PUSH(1);} expr_value do {COND_POP();}
+		  compstmt
+		  kEND
+		    {
+			$$ = NEW_UNTIL(cond($3), $6, 1);
+		        fixpos($$, $3);
+			if (cond_negative(&$$->nd_cond)) {
+			    nd_set_type($$, NODE_WHILE);
+			}
+		    }
+		| kCASE expr_value opt_terms
+		  case_body
+		  kEND
+		    {
+			$$ = NEW_CASE($2, $4);
+		        fixpos($$, $2);
+		    }
+		| kCASE opt_terms case_body kEND
+		    {
+			$$ = $3;
+		    }
+		| kCASE opt_terms kELSE compstmt kEND
+		    {
+			$$ = $4;
+		    }
+		| kFOR block_var kIN {COND_PUSH(1);} expr_value do {COND_POP();}
+		  compstmt
+		  kEND
+		    {
+			$$ = NEW_FOR($2, $5, $8);
+		        fixpos($$, $2);
+		    }
+		| kCLASS cpath superclass
+		    {
+			if (in_def || in_single)
+			    yyerror("class definition in method body");
+			class_nest++;
+			local_push(0);
+		        $<num>$ = ruby_sourceline;
+		    }
+		  bodystmt
+		  kEND
+		    {
+		        $$ = NEW_CLASS($2, $5, $3);
+		        nd_set_line($$, $<num>4);
+		        local_pop();
+			class_nest--;
+		    }
+		| kCLASS tLSHFT expr
+		    {
+			$<num>$ = in_def;
+		        in_def = 0;
+		    }
+		  term
+		    {
+		        $<num>$ = in_single;
+		        in_single = 0;
+			class_nest++;
+			local_push(0);
+		    }
+		  bodystmt
+		  kEND
+		    {
+		        $$ = NEW_SCLASS($3, $7);
+		        fixpos($$, $3);
+		        local_pop();
+			class_nest--;
+		        in_def = $<num>4;
+		        in_single = $<num>6;
+		    }
+		| kMODULE cpath
+		    {
+			if (in_def || in_single)
+			    yyerror("module definition in method body");
+			class_nest++;
+			local_push(0);
+		        $<num>$ = ruby_sourceline;
+		    }
+		  bodystmt
+		  kEND
+		    {
+		        $$ = NEW_MODULE($2, $4);
+		        nd_set_line($$, $<num>3);
+		        local_pop();
+			class_nest--;
+		    }
+		| kDEF fname
+		    {
+			$<id>$ = cur_mid;
+			cur_mid = $2;
+			in_def++;
+			local_push(0);
+		    }
+		  f_arglist
+		  bodystmt
+		  kEND
+		    {
+			if (!$5) $5 = NEW_NIL();
+			$$ = NEW_DEFN($2, $4, $5, NOEX_PRIVATE);
+		        fixpos($$, $4);
+		        local_pop();
+			in_def--;
+			cur_mid = $<id>3;
+		    }
+		| kDEF singleton dot_or_colon {lex_state = EXPR_FNAME;} fname
+		    {
+			in_single++;
+			local_push(0);
+		        lex_state = EXPR_END; /* force for args */
+		    }
+		  f_arglist
+		  bodystmt
+		  kEND
+		    {
+			$$ = NEW_DEFS($2, $5, $7, $8);
+		        fixpos($$, $2);
+		        local_pop();
+			in_single--;
+		    }
+		| kBREAK
+		    {
+			$$ = NEW_BREAK(0);
+		    }
+		| kNEXT
+		    {
+			$$ = NEW_NEXT(0);
+		    }
+		| kREDO
+		    {
+			$$ = NEW_REDO();
+		    }
+		| kRETRY
+		    {
+			$$ = NEW_RETRY();
+		    }
+		;
+
+primary_value 	: primary
+		    {
+			value_expr($1);
+			$$ = $1;
+		    }
+		;
+
+then		: term
+		| ':'
+		| kTHEN
+		| term kTHEN
+		;
+
+do		: term
+		| ':'
+		| kDO_COND
+		;
+
+if_tail		: opt_else
+		| kELSIF expr_value then
+		  compstmt
+		  if_tail
+		    {
+			$$ = NEW_IF(cond($2), $4, $5);
+		        fixpos($$, $2);
+		    }
+		;
+
+opt_else	: none
+		| kELSE compstmt
+		    {
+			$$ = $2;
+		    }
+		;
+
+block_var	: lhs
+		| mlhs
+		;
+
+opt_block_var	: none
+		| '|' /* none */ '|'
+		    {
+			$$ = (NODE*)1;
+		    }
+		| tOROP
+		    {
+			$$ = (NODE*)1;
+		    }
+		| '|' block_var '|'
+		    {
+			$$ = $2;
+		    }
+		;
+
+do_block	: kDO_BLOCK
+		    {
+		        $<vars>$ = dyna_push();
+			$<num>1 = ruby_sourceline;
+		    }
+		  opt_block_var {$<vars>$ = ruby_dyna_vars;}
+		  compstmt
+		  kEND
+		    {
+			$$ = NEW_ITER($3, 0, dyna_init($5, $<vars>4));
+			nd_set_line($$, $<num>1);
+			dyna_pop($<vars>2);
+		    }
+		;
+
+block_call	: command do_block
+		    {
+			if ($1 && nd_type($1) == NODE_BLOCK_PASS) {
+			    rb_compile_error("both block arg and actual block given");
+			}
+			$2->nd_iter = $1;
+			$$ = $2;
+		        fixpos($$, $1);
+		    }
+		| block_call '.' operation2 opt_paren_args
+		    {
+			$$ = new_call($1, $3, $4);
+		    }
+		| block_call tCOLON2 operation2 opt_paren_args
+		    {
+			$$ = new_call($1, $3, $4);
+		    }
+		;
+
+method_call	: operation paren_args
+		    {
+			$$ = new_fcall($1, $2);
+		        fixpos($$, $2);
+		    }
+		| primary_value '.' operation2 opt_paren_args
+		    {
+			$$ = new_call($1, $3, $4);
+		        fixpos($$, $1);
+		    }
+		| primary_value tCOLON2 operation2 paren_args
+		    {
+			$$ = new_call($1, $3, $4);
+		        fixpos($$, $1);
+		    }
+		| primary_value tCOLON2 operation3
+		    {
+			$$ = new_call($1, $3, 0);
+		    }
+		| kSUPER paren_args
+		    {
+			$$ = new_super($2);
+		    }
+		| kSUPER
+		    {
+			$$ = NEW_ZSUPER();
+		    }
+		;
+
+brace_block	: '{'
+		    {
+		        $<vars>$ = dyna_push();
+			$<num>1 = ruby_sourceline;
+		    }
+		  opt_block_var {$<vars>$ = ruby_dyna_vars;}
+		  compstmt '}'
+		    {
+			$$ = NEW_ITER($3, 0, dyna_init($5, $<vars>4));
+			nd_set_line($$, $<num>1);
+			dyna_pop($<vars>2);
+		    }
+		| kDO
+		    {
+		        $<vars>$ = dyna_push();
+			$<num>1 = ruby_sourceline;
+		    }
+		  opt_block_var {$<vars>$ = ruby_dyna_vars;}
+		  compstmt kEND
+		    {
+			$$ = NEW_ITER($3, 0, dyna_init($5, $<vars>4));
+			nd_set_line($$, $<num>1);
+			dyna_pop($<vars>2);
+		    }
+		;
+
+case_body	: kWHEN when_args then
+		  compstmt
+		  cases
+		    {
+			$$ = NEW_WHEN($2, $4, $5);
+		    }
+		;
+when_args	: args
+		| args ',' tSTAR arg_value
+		    {
+			$$ = list_append($1, NEW_WHEN($4, 0, 0));
+		    }
+		| tSTAR arg_value
+		    {
+			$$ = NEW_LIST(NEW_WHEN($2, 0, 0));
+		    }
+		;
+
+cases		: opt_else
+		| case_body
+		;
+
+opt_rescue	: kRESCUE exc_list exc_var then
+		  compstmt
+		  opt_rescue
+		    {
+		        if ($3) {
+		            $3 = node_assign($3, NEW_GVAR(rb_intern("$!")));
+			    $5 = block_append($3, $5);
+			}
+			$$ = NEW_RESBODY($2, $5, $6);
+		        fixpos($$, $2?$2:$5);
+		    }
+		| none
+		;
+
+exc_list	: arg_value
+		    {
+			$$ = NEW_LIST($1);
+		    }
+		| mrhs
+		| none
+		;
+
+exc_var		: tASSOC lhs
+		    {
+			$$ = $2;
+		    }
+		| none
+		;
+
+opt_ensure	: kENSURE compstmt
+		    {
+			if ($2)
+			    $$ = $2;
+			else
+			    /* place holder */
+			    $$ = NEW_NIL();
+		    }
+		| none
+		;
+
+literal		: numeric
+		| symbol
+		    {
+			$$ = NEW_LIT(ID2SYM($1));
+		    }
+		| dsym
+		;
+
+strings		: string
+		    {
+			NODE *node = $1;
+			if (!node) {
+			    node = NEW_STR(rb_str_new(0, 0));
+			}
+			else {
+			    node = evstr2dstr(node);
+			}
+			$$ = node;
+		    }
+		;
+
+string		: string1
+		| string string1
+		    {
+			$$ = literal_concat($1, $2);
+		    }
+		;
+
+string1		: tSTRING_BEG string_contents tSTRING_END
+		    {
+			$$ = $2;
+		    }
+		;
+
+xstring		: tXSTRING_BEG xstring_contents tSTRING_END
+		    {
+			NODE *node = $2;
+			if (!node) {
+			    node = NEW_XSTR(rb_str_new(0, 0));
+			}
+			else {
+			    switch (nd_type(node)) {
+			      case NODE_STR:
+				nd_set_type(node, NODE_XSTR);
+				break;
+			      case NODE_DSTR:
+				nd_set_type(node, NODE_DXSTR);
+				break;
+			      default:
+				node = NEW_NODE(NODE_DXSTR, rb_str_new(0, 0), 1, NEW_LIST(node));
+				break;
+			    }
+			}
+			$$ = node;
+		    }
+		;
+
+regexp		: tREGEXP_BEG xstring_contents tREGEXP_END
+		    {
+			int options = $3;
+			NODE *node = $2;
+			if (!node) {
+			    node = NEW_LIT(rb_reg_new("", 0, options & ~RE_OPTION_ONCE));
+			}
+			else switch (nd_type(node)) {
+			  case NODE_STR:
+			    {
+				VALUE src = node->nd_lit;
+				nd_set_type(node, NODE_LIT);
+				node->nd_lit = rb_reg_new(RSTRING(src)->ptr,
+							  RSTRING(src)->len,
+							  options & ~RE_OPTION_ONCE);
+			    }
+			    break;
+			  default:
+			    node = NEW_NODE(NODE_DSTR, rb_str_new(0, 0), 1, NEW_LIST(node));
+			  case NODE_DSTR:
+			    if (options & RE_OPTION_ONCE) {
+				nd_set_type(node, NODE_DREGX_ONCE);
+			    }
+			    else {
+				nd_set_type(node, NODE_DREGX);
+			    }
+			    node->nd_cflag = options & ~RE_OPTION_ONCE;
+			    break;
+			}
+			$$ = node;
+		    }
+		;
+
+words		: tWORDS_BEG ' ' tSTRING_END
+		    {
+			$$ = NEW_ZARRAY();
+		    }
+		| tWORDS_BEG word_list tSTRING_END
+		    {
+			$$ = $2;
+		    }
+		;
+
+word_list	: /* none */
+		    {
+			$$ = 0;
+		    }
+		| word_list word ' '
+		    {
+			$$ = list_append($1, evstr2dstr($2));
+		    }
+		;
+
+word		: string_content
+		| word string_content
+		    {
+			$$ = literal_concat($1, $2);
+		    }
+		;
+
+qwords		: tQWORDS_BEG ' ' tSTRING_END
+		    {
+			$$ = NEW_ZARRAY();
+		    }
+		| tQWORDS_BEG qword_list tSTRING_END
+		    {
+			$$ = $2;
+		    }
+		;
+
+qword_list	: /* none */
+		    {
+			$$ = 0;
+		    }
+		| qword_list tSTRING_CONTENT ' '
+		    {
+			$$ = list_append($1, $2);
+		    }
+		;
+
+string_contents : /* none */
+		    {
+			$$ = 0;
+		    }
+		| string_contents string_content
+		    {
+			$$ = literal_concat($1, $2);
+		    }
+		;
+
+xstring_contents: /* none */
+		    {
+			$$ = 0;
+		    }
+		| xstring_contents string_content
+		    {
+			$$ = literal_concat($1, $2);
+		    }
+		;
+
+string_content	: tSTRING_CONTENT
+		| tSTRING_DVAR
+		    {
+			$<node>$ = lex_strterm;
+			lex_strterm = 0;
+			lex_state = EXPR_BEG;
+		    }
+		  string_dvar
+		    {
+			lex_strterm = $<node>2;
+		        $$ = NEW_EVSTR($3);
+		    }
+		| tSTRING_DBEG
+		    {
+			$<node>$ = lex_strterm;
+			lex_strterm = 0;
+			lex_state = EXPR_BEG;
+			COND_PUSH(0);
+			CMDARG_PUSH(0);
+		    }
+		  compstmt '}'
+		    {
+			lex_strterm = $<node>2;
+			COND_LEXPOP();
+			CMDARG_LEXPOP();
+			if (($$ = $3) && nd_type($$) == NODE_NEWLINE) {
+			    $$ = $$->nd_next;
+			    rb_gc_force_recycle((VALUE)$3);
+			}
+			$$ = new_evstr($$);
+		    }
+		;
+
+string_dvar	: tGVAR {$$ = NEW_GVAR($1);}
+		| tIVAR {$$ = NEW_IVAR($1);}
+		| tCVAR {$$ = NEW_CVAR($1);}
+		| backref
+		;
+
+symbol		: tSYMBEG sym
+		    {
+		        lex_state = EXPR_END;
+			$$ = $2;
+		    }
+		;
+
+sym		: fname
+		| tIVAR
+		| tGVAR
+		| tCVAR
+		;
+
+dsym		: tSYMBEG xstring_contents tSTRING_END
+		    {
+		        lex_state = EXPR_END;
+			if (!($$ = $2)) {
+			    $$ = NEW_NIL();
+			    yyerror("empty symbol literal");
+			}
+			else {
+			    VALUE lit;
+
+			    switch (nd_type($$)) {
+			      case NODE_DSTR:
+				nd_set_type($$, NODE_DSYM);
+				break;
+			      case NODE_STR:
+				lit = $$->nd_lit;
+				if (RSTRING(lit)->len == 0) {
+				    yyerror("empty symbol literal");
+				    break;
+				}
+				if (strlen(RSTRING(lit)->ptr) == RSTRING(lit)->len) {
+				    $$->nd_lit = ID2SYM(rb_intern(RSTRING($$->nd_lit)->ptr));
+				    nd_set_type($$, NODE_LIT);
+				    break;
+				}
+				/* fall through */
+			      default:
+				$$ = NEW_NODE(NODE_DSYM, rb_str_new(0, 0), 1, NEW_LIST($$));
+				break;
+			    }
+			}
+		    }
+		;
+
+numeric		: tINTEGER
+		| tFLOAT
+		| tUMINUS_NUM tINTEGER	       %prec tLOWEST
+		    {
+			$$ = negate_lit($2);
+		    }
+		| tUMINUS_NUM tFLOAT	       %prec tLOWEST
+		    {
+			$$ = negate_lit($2);
+		    }
+		;
+
+variable	: tIDENTIFIER
+		| tIVAR
+		| tGVAR
+		| tCONSTANT
+		| tCVAR
+		| kNIL {$$ = kNIL;}
+		| kSELF {$$ = kSELF;}
+		| kTRUE {$$ = kTRUE;}
+		| kFALSE {$$ = kFALSE;}
+		| k__FILE__ {$$ = k__FILE__;}
+		| k__LINE__ {$$ = k__LINE__;}
+		;
+
+var_ref		: variable
+		    {
+			$$ = gettable($1);
+		    }
+		;
+
+var_lhs		: variable
+		    {
+			$$ = assignable($1, 0);
+		    }
+		;
+
+backref		: tNTH_REF
+		| tBACK_REF
+		;
+
+superclass	: term
+		    {
+			$$ = 0;
+		    }
+		| '<'
+		    {
+			lex_state = EXPR_BEG;
+		    }
+		  expr_value term
+		    {
+			$$ = $3;
+		    }
+		| error term {yyerrok; $$ = 0;}
+		;
+
+f_arglist	: '(' f_args opt_nl ')'
+		    {
+			$$ = $2;
+			lex_state = EXPR_BEG;
+		        command_start = Qtrue;
+		    }
+		| f_args term
+		    {
+			$$ = $1;
+		    }
+		;
+
+f_args		: f_arg ',' f_optarg ',' f_rest_arg opt_f_block_arg
+		    {
+			$$ = block_append(NEW_ARGS($1, $3, $5), $6);
+		    }
+		| f_arg ',' f_optarg opt_f_block_arg
+		    {
+			$$ = block_append(NEW_ARGS($1, $3, 0), $4);
+		    }
+		| f_arg ',' f_rest_arg opt_f_block_arg
+		    {
+			$$ = block_append(NEW_ARGS($1, 0, $3), $4);
+		    }
+		| f_arg opt_f_block_arg
+		    {
+			$$ = block_append(NEW_ARGS($1, 0, 0), $2);
+		    }
+		| f_optarg ',' f_rest_arg opt_f_block_arg
+		    {
+			$$ = block_append(NEW_ARGS(0, $1, $3), $4);
+		    }
+		| f_optarg opt_f_block_arg
+		    {
+			$$ = block_append(NEW_ARGS(0, $1, 0), $2);
+		    }
+		| f_rest_arg opt_f_block_arg
+		    {
+			$$ = block_append(NEW_ARGS(0, 0, $1), $2);
+		    }
+		| f_block_arg
+		    {
+			$$ = block_append(NEW_ARGS(0, 0, 0), $1);
+		    }
+		| /* none */
+		    {
+			$$ = NEW_ARGS(0, 0, 0);
+		    }
+		;
+
+f_norm_arg	: tCONSTANT
+		    {
+			yyerror("formal argument cannot be a constant");
+		    }
+                | tIVAR
+		    {
+                        yyerror("formal argument cannot be an instance variable");
+		    }
+                | tGVAR
+		    {
+                        yyerror("formal argument cannot be a global variable");
+		    }
+                | tCVAR
+		    {
+                        yyerror("formal argument cannot be a class variable");
+		    }
+		| tIDENTIFIER
+		    {
+			if (!is_local_id($1))
+			    yyerror("formal argument must be local variable");
+			else if (local_id($1))
+			    yyerror("duplicate argument name");
+			local_cnt($1);
+			$$ = 1;
+		    }
+		;
+
+f_arg		: f_norm_arg
+		| f_arg ',' f_norm_arg
+		    {
+			$$ += 1;
+		    }
+		;
+
+f_opt		: tIDENTIFIER '=' arg_value
+		    {
+			if (!is_local_id($1))
+			    yyerror("formal argument must be local variable");
+			else if (local_id($1))
+			    yyerror("duplicate optional argument name");
+			$$ = assignable($1, $3);
+		    }
+		;
+
+f_optarg	: f_opt
+		    {
+			$$ = NEW_BLOCK($1);
+			$$->nd_end = $$;
+		    }
+		| f_optarg ',' f_opt
+		    {
+			$$ = block_append($1, $3);
+		    }
+		;
+
+restarg_mark	: '*'
+		| tSTAR
+		;
+
+f_rest_arg	: restarg_mark tIDENTIFIER
+		    {
+			if (!is_local_id($2))
+			    yyerror("rest argument must be local variable");
+			if (dyna_in_block()) {
+			    rb_dvar_push($2, Qnil);
+			}
+			$$ = assignable($2, 0);
+		    }
+		| restarg_mark
+		    {
+			if (dyna_in_block()) {
+			    $$ = NEW_DASGN_CURR(internal_id(), 0);
+			}
+			else {
+			    $$ = NEW_NODE(NODE_LASGN,0,0,local_append(0));
+			}
+		    }
+		;
+
+blkarg_mark	: '&'
+		| tAMPER
+		;
+
+f_block_arg	: blkarg_mark tIDENTIFIER
+		    {
+			if (!is_local_id($2))
+			    yyerror("block argument must be local variable");
+			else if (local_id($2))
+			    yyerror("duplicate block argument name");
+			$$ = NEW_BLOCK_ARG($2);
+		    }
+		;
+
+opt_f_block_arg	: ',' f_block_arg
+		    {
+			$$ = $2;
+		    }
+		| none
+		;
+
+singleton	: var_ref
+		    {
+			$$ = $1;
+			value_expr($$);
+		    }
+		| '(' {lex_state = EXPR_BEG;} expr opt_nl ')'
+		    {
+			if ($3 == 0) {
+			    yyerror("can't define singleton method for ().");
+			}
+			else {
+			    switch (nd_type($3)) {
+			      case NODE_STR:
+			      case NODE_DSTR:
+			      case NODE_XSTR:
+			      case NODE_DXSTR:
+			      case NODE_DREGX:
+			      case NODE_LIT:
+			      case NODE_ARRAY:
+			      case NODE_ZARRAY:
+				yyerror("can't define singleton method for literals");
+			      default:
+				value_expr($3);
+				break;
+			    }
+			}
+			$$ = $3;
+		    }
+		;
+
+assoc_list	: none
+		| assocs trailer
+		    {
+			$$ = $1;
+		    }
+		| args trailer
+		    {
+			if ($1->nd_alen%2 != 0) {
+			    yyerror("odd number list for Hash");
+			}
+			$$ = $1;
+		    }
+		;
+
+assocs		: assoc
+		| assocs ',' assoc
+		    {
+			$$ = list_concat($1, $3);
+		    }
+		;
+
+assoc		: arg_value tASSOC arg_value
+		    {
+			$$ = list_append(NEW_LIST($1), $3);
+		    }
+		;
+
+operation	: tIDENTIFIER
+		| tCONSTANT
+		| tFID
+		;
+
+operation2	: tIDENTIFIER
+		| tCONSTANT
+		| tFID
+		| op
+		;
+
+operation3	: tIDENTIFIER
+		| tFID
+		| op
+		;
+
+dot_or_colon	: '.'
+		| tCOLON2
+		;
+
+opt_terms	: /* none */
+		| terms
+		;
+
+opt_nl		: /* none */
+		| '\n'
+		;
+
+trailer		: /* none */
+		| '\n'
+		| ','
+		;
+
+term		: ';' {yyerrok;}
+		| '\n'
+		;
+
+terms		: term
+		| terms ';' {yyerrok;}
+		;
+
+none		: /* none */ {$$ = 0;}
+		;
+%%
+#ifdef yystacksize
+#undef YYMALLOC
+#endif
+
+#include "regex.h"
+#include "util.h"
+
+/* We remove any previous definition of `SIGN_EXTEND_CHAR',
+   since ours (we hope) works properly with all combinations of
+   machines, compilers, `char' and `unsigned char' argument types.
+   (Per Bothner suggested the basic approach.)  */
+#undef SIGN_EXTEND_CHAR
+#if __STDC__
+# define SIGN_EXTEND_CHAR(c) ((signed char)(c))
+#else  /* not __STDC__ */
+/* As in Harbison and Steele.  */
+# define SIGN_EXTEND_CHAR(c) ((((unsigned char)(c)) ^ 128) - 128)
+#endif
+#define is_identchar(c) (SIGN_EXTEND_CHAR(c)!=-1&&(ISALNUM(c) || (c) == '_' || ismbchar(c)))
+
+static char *tokenbuf = NULL;
+static int   tokidx, toksiz = 0;
+
+#define LEAVE_BS 1
+
+static VALUE (*lex_gets)();	/* gets function */
+static VALUE lex_input;		/* non-nil if File */
+static VALUE lex_lastline;	/* gc protect */
+static char *lex_pbeg;
+static char *lex_p;
+static char *lex_pend;
+
+static int
+yyerror(msg)
+    const char *msg;
+{
+    char *p, *pe, *buf;
+    int len, i;
+
+    rb_compile_error("%s", msg);
+    p = lex_p;
+    while (lex_pbeg <= p) {
+	if (*p == '\n') break;
+	p--;
+    }
+    p++;
+
+    pe = lex_p;
+    while (pe < lex_pend) {
+	if (*pe == '\n') break;
+	pe++;
+    }
+
+    len = pe - p;
+    if (len > 4) {
+	buf = ALLOCA_N(char, len+2);
+	MEMCPY(buf, p, char, len);
+	buf[len] = '\0';
+	rb_compile_error_append("%s", buf);
+
+	i = lex_p - p;
+	p = buf; pe = p + len;
+
+	while (p < pe) {
+	    if (*p != '\t') *p = ' ';
+	    p++;
+	}
+	buf[i] = '^';
+	buf[i+1] = '\0';
+	rb_compile_error_append("%s", buf);
+    }
+
+    return 0;
+}
+
+static int heredoc_end;
+
+int ruby_in_compile = 0;
+int ruby__end__seen;
+
+static VALUE ruby_debug_lines;
+#ifdef YYMALLOC
+static NODE *parser_heap;
+#endif
+
+static NODE*
+yycompile(f, line)
+    char *f;
+    int line;
+{
+    int n;
+    NODE *node = 0;
+    struct RVarmap *vp, *vars = ruby_dyna_vars;
+
+    ruby_in_compile = 1;
+    if (!compile_for_eval && rb_safe_level() == 0 &&
+	rb_const_defined(rb_cObject, rb_intern("SCRIPT_LINES__"))) {
+	VALUE hash, fname;
+
+	hash = rb_const_get(rb_cObject, rb_intern("SCRIPT_LINES__"));
+	if (TYPE(hash) == T_HASH) {
+	    fname = rb_str_new2(f);
+	    ruby_debug_lines = rb_hash_aref(hash, fname);
+	    if (NIL_P(ruby_debug_lines)) {
+		ruby_debug_lines = rb_ary_new();
+		rb_hash_aset(hash, fname, ruby_debug_lines);
+	    }
+	}
+	if (line > 1) {
+	    VALUE str = rb_str_new(0,0);
+	    while (line > 1) {
+		rb_ary_push(ruby_debug_lines, str);
+		line--;
+	    }
+	}
+    }
+
+    ruby__end__seen = 0;
+    ruby_eval_tree = 0;
+    heredoc_end = 0;
+    lex_strterm = 0;
+    ruby_current_node = 0;
+    ruby_sourcefile = rb_source_filename(f);
+    n = yyparse();
+    ruby_debug_lines = 0;
+    compile_for_eval = 0;
+    ruby_in_compile = 0;
+    cond_stack = 0;
+    cmdarg_stack = 0;
+    command_start = 1;
+    class_nest = 0;
+    in_single = 0;
+    in_def = 0;
+    cur_mid = 0;
+
+    vp = ruby_dyna_vars;
+    ruby_dyna_vars = vars;
+    lex_strterm = 0;
+    while (vp && vp != vars) {
+	struct RVarmap *tmp = vp;
+	vp = vp->next;
+	rb_gc_force_recycle((VALUE)tmp);
+    }
+    if (n == 0) node = ruby_eval_tree;
+    else ruby_eval_tree_begin = 0;
+    return node;
+}
+
+static int lex_gets_ptr;
+
+static VALUE
+lex_get_str(s)
+    VALUE s;
+{
+    char *beg, *end, *pend;
+
+    beg = RSTRING(s)->ptr;
+    if (lex_gets_ptr) {
+	if (RSTRING(s)->len == lex_gets_ptr) return Qnil;
+	beg += lex_gets_ptr;
+    }
+    pend = RSTRING(s)->ptr + RSTRING(s)->len;
+    end = beg;
+    while (end < pend) {
+	if (*end++ == '\n') break;
+    }
+    lex_gets_ptr = end - RSTRING(s)->ptr;
+    return rb_str_new(beg, end - beg);
+}
+
+static VALUE
+lex_getline()
+{
+    VALUE line = (*lex_gets)(lex_input);
+    if (ruby_debug_lines && !NIL_P(line)) {
+	rb_ary_push(ruby_debug_lines, line);
+    }
+    return line;
+}
+
+NODE*
+rb_compile_string(f, s, line)
+    const char *f;
+    VALUE s;
+    int line;
+{
+    lex_gets = lex_get_str;
+    lex_gets_ptr = 0;
+    lex_input = s;
+    lex_pbeg = lex_p = lex_pend = 0;
+    ruby_sourceline = line - 1;
+    compile_for_eval = ruby_in_eval;
+
+    return yycompile(f, line);
+}
+
+NODE*
+rb_compile_cstr(f, s, len, line)
+    const char *f, *s;
+    int len, line;
+{
+    return rb_compile_string(f, rb_str_new(s, len), line);
+}
+
+NODE*
+rb_compile_file(f, file, start)
+    const char *f;
+    VALUE file;
+    int start;
+{
+    lex_gets = rb_io_gets;
+    lex_input = file;
+    lex_pbeg = lex_p = lex_pend = 0;
+    ruby_sourceline = start - 1;
+
+    return yycompile(f, start);
+}
+
+static inline int
+nextc()
+{
+    int c;
+
+    if (lex_p == lex_pend) {
+	if (lex_input) {
+	    VALUE v = lex_getline();
+
+	    if (NIL_P(v)) return -1;
+	    if (heredoc_end > 0) {
+		ruby_sourceline = heredoc_end;
+		heredoc_end = 0;
+	    }
+	    ruby_sourceline++;
+	    lex_pbeg = lex_p = RSTRING(v)->ptr;
+	    lex_pend = lex_p + RSTRING(v)->len;
+	    lex_lastline = v;
+	}
+	else {
+	    lex_lastline = 0;
+	    return -1;
+	}
+    }
+    c = (unsigned char)*lex_p++;
+    if (c == '\r' && lex_p < lex_pend && *lex_p == '\n') {
+	lex_p++;
+	c = '\n';
+    }
+
+    return c;
+}
+
+static void
+pushback(c)
+    int c;
+{
+    if (c == -1) return;
+    lex_p--;
+}
+
+#define was_bol() (lex_p == lex_pbeg + 1)
+#define peek(c) (lex_p != lex_pend && (c) == *lex_p)
+
+#define tokfix() (tokenbuf[tokidx]='\0')
+#define tok() tokenbuf
+#define toklen() tokidx
+#define toklast() (tokidx>0?tokenbuf[tokidx-1]:0)
+
+static char*
+newtok()
+{
+    tokidx = 0;
+    if (!tokenbuf) {
+	toksiz = 60;
+	tokenbuf = ALLOC_N(char, 60);
+    }
+    if (toksiz > 4096) {
+	toksiz = 60;
+	REALLOC_N(tokenbuf, char, 60);
+    }
+    return tokenbuf;
+}
+
+static void
+tokadd(c)
+    char c;
+{
+    tokenbuf[tokidx++] = c;
+    if (tokidx >= toksiz) {
+	toksiz *= 2;
+	REALLOC_N(tokenbuf, char, toksiz);
+    }
+}
+
+static int
+read_escape()
+{
+    int c;
+
+    switch (c = nextc()) {
+      case '\\':	/* Backslash */
+	return c;
+
+      case 'n':	/* newline */
+	return '\n';
+
+      case 't':	/* horizontal tab */
+	return '\t';
+
+      case 'r':	/* carriage-return */
+	return '\r';
+
+      case 'f':	/* form-feed */
+	return '\f';
+
+      case 'v':	/* vertical tab */
+	return '\13';
+
+      case 'a':	/* alarm(bell) */
+	return '\007';
+
+      case 'e':	/* escape */
+	return 033;
+
+      case '0': case '1': case '2': case '3': /* octal constant */
+      case '4': case '5': case '6': case '7':
+	{
+	    int numlen;
+
+	    pushback(c);
+	    c = scan_oct(lex_p, 3, &numlen);
+	    lex_p += numlen;
+	}
+	return c;
+
+      case 'x':	/* hex constant */
+	{
+	    int numlen;
+
+	    c = scan_hex(lex_p, 2, &numlen);
+	    if (numlen == 0) {
+		yyerror("Invalid escape character syntax");
+		return 0;
+	    }
+	    lex_p += numlen;
+	}
+	return c;
+
+      case 'b':	/* backspace */
+	return '\010';
+
+      case 's':	/* space */
+	return ' ';
+
+      case 'M':
+	if ((c = nextc()) != '-') {
+	    yyerror("Invalid escape character syntax");
+	    pushback(c);
+	    return '\0';
+	}
+	if ((c = nextc()) == '\\') {
+	    return read_escape() | 0x80;
+	}
+	else if (c == -1) goto eof;
+	else {
+	    return ((c & 0xff) | 0x80);
+	}
+
+      case 'C':
+	if ((c = nextc()) != '-') {
+	    yyerror("Invalid escape character syntax");
+	    pushback(c);
+	    return '\0';
+	}
+      case 'c':
+	if ((c = nextc())== '\\') {
+	    c = read_escape();
+	}
+	else if (c == '?')
+	    return 0177;
+	else if (c == -1) goto eof;
+	return c & 0x9f;
+
+      eof:
+      case -1:
+        yyerror("Invalid escape character syntax");
+	return '\0';
+
+      default:
+	return c;
+    }
+}
+
+static int
+tokadd_escape(term)
+    int term;
+{
+    int c;
+
+    switch (c = nextc()) {
+      case '\n':
+	return 0;		/* just ignore */
+
+      case '0': case '1': case '2': case '3': /* octal constant */
+      case '4': case '5': case '6': case '7':
+	{
+	    int i;
+
+	    tokadd('\\');
+	    tokadd(c);
+	    for (i=0; i<2; i++) {
+		c = nextc();
+		if (c == -1) goto eof;
+		if (c < '0' || '7' < c) {
+		    pushback(c);
+		    break;
+		}
+		tokadd(c);
+	    }
+	}
+	return 0;
+
+      case 'x':	/* hex constant */
+	{
+	    int numlen;
+
+	    tokadd('\\');
+	    tokadd(c);
+	    scan_hex(lex_p, 2, &numlen);
+	    if (numlen == 0) {
+		yyerror("Invalid escape character syntax");
+		return -1;
+	    }
+	    while (numlen--)
+		tokadd(nextc());
+	}
+	return 0;
+
+      case 'M':
+	if ((c = nextc()) != '-') {
+	    yyerror("Invalid escape character syntax");
+	    pushback(c);
+	    return 0;
+	}
+	tokadd('\\'); tokadd('M'); tokadd('-');
+	goto escaped;
+
+      case 'C':
+	if ((c = nextc()) != '-') {
+	    yyerror("Invalid escape character syntax");
+	    pushback(c);
+	    return 0;
+	}
+	tokadd('\\'); tokadd('C'); tokadd('-');
+	goto escaped;
+
+      case 'c':
+	tokadd('\\'); tokadd('c');
+      escaped:
+	if ((c = nextc()) == '\\') {
+	    return tokadd_escape(term);
+	}
+	else if (c == -1) goto eof;
+	tokadd(c);
+	return 0;
+
+      eof:
+      case -1:
+        yyerror("Invalid escape character syntax");
+	return -1;
+
+      default:
+	if (c != '\\' || c != term)
+	    tokadd('\\');
+	tokadd(c);
+    }
+    return 0;
+}
+
+static int
+regx_options()
+{
+    char kcode = 0;
+    int options = 0;
+    int c;
+
+    newtok();
+    while (c = nextc(), ISALPHA(c)) {
+	switch (c) {
+	  case 'i':
+	    options |= RE_OPTION_IGNORECASE;
+	    break;
+	  case 'x':
+	    options |= RE_OPTION_EXTENDED;
+	    break;
+	  case 'm':
+	    options |= RE_OPTION_MULTILINE;
+	    break;
+	  case 'o':
+	    options |= RE_OPTION_ONCE;
+	    break;
+	  case 'n':
+	    kcode = 16;
+	    break;
+	  case 'e':
+	    kcode = 32;
+	    break;
+	  case 's':
+	    kcode = 48;
+	    break;
+	  case 'u':
+	    kcode = 64;
+	    break;
+	  default:
+	    tokadd(c);
+	    break;
+	}
+    }
+    pushback(c);
+    if (toklen()) {
+	tokfix();
+	rb_compile_error("unknown regexp option%s - %s",
+			 toklen() > 1 ? "s" : "", tok());
+    }
+    return options | kcode;
+}
+
+#define STR_FUNC_ESCAPE 0x01
+#define STR_FUNC_EXPAND 0x02
+#define STR_FUNC_REGEXP 0x04
+#define STR_FUNC_QWORDS 0x08
+#define STR_FUNC_SYMBOL 0x10
+#define STR_FUNC_INDENT 0x20
+
+enum string_type {
+    str_squote = (0),
+    str_dquote = (STR_FUNC_EXPAND),
+    str_xquote = (STR_FUNC_EXPAND),
+    str_regexp = (STR_FUNC_REGEXP|STR_FUNC_ESCAPE|STR_FUNC_EXPAND),
+    str_sword  = (STR_FUNC_QWORDS),
+    str_dword  = (STR_FUNC_QWORDS|STR_FUNC_EXPAND),
+    str_ssym   = (STR_FUNC_SYMBOL),
+    str_dsym   = (STR_FUNC_SYMBOL|STR_FUNC_EXPAND),
+};
+
+static void
+dispose_string(str)
+    VALUE str;
+{
+    xfree(RSTRING(str)->ptr);
+    rb_gc_force_recycle(str);
+}
+
+static int
+tokadd_string(func, term, paren, nest)
+    int func, term, paren, *nest;
+{
+    int c;
+
+    while ((c = nextc()) != -1) {
+	if (paren && c == paren) {
+	    ++*nest;
+	}
+	else if (c == term) {
+	    if (!nest || !*nest) {
+		pushback(c);
+		break;
+	    }
+	    --*nest;
+	}
+	else if ((func & STR_FUNC_EXPAND) && c == '#' && lex_p < lex_pend) {
+	    int c2 = *lex_p;
+	    if (c2 == '$' || c2 == '@' || c2 == '{') {
+		pushback(c);
+		break;
+	    }
+	}
+	else if (c == '\\') {
+	    c = nextc();
+	    switch (c) {
+	      case '\n':
+		if (func & STR_FUNC_QWORDS) break;
+		if (func & STR_FUNC_EXPAND) continue;
+		tokadd('\\');
+		break;
+
+	      case '\\':
+		if (func & STR_FUNC_ESCAPE) tokadd(c);
+		break;
+
+	      default:
+		if (func & STR_FUNC_REGEXP) {
+		    pushback(c);
+		    if (tokadd_escape(term) < 0)
+			return -1;
+		    continue;
+		}
+		else if (func & STR_FUNC_EXPAND) {
+		    pushback(c);
+		    if (func & STR_FUNC_ESCAPE) tokadd('\\');
+		    c = read_escape();
+		}
+		else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
+		    /* ignore backslashed spaces in %w */
+		}
+		else if (c != term && !(paren && c == paren)) {
+		    tokadd('\\');
+		}
+	    }
+	}
+	else if (ismbchar(c)) {
+	    int i, len = mbclen(c)-1;
+
+	    for (i = 0; i < len; i++) {
+		tokadd(c);
+		c = nextc();
+	    }
+	}
+	else if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
+	    pushback(c);
+	    break;
+	}
+	if (!c && (func & STR_FUNC_SYMBOL)) {
+	    func &= ~STR_FUNC_SYMBOL;
+	    rb_compile_error("symbol cannot contain '\\0'");
+	    continue;
+	}
+	tokadd(c);
+    }
+    return c;
+}
+
+#define NEW_STRTERM(func, term, paren) \
+	rb_node_newnode(NODE_STRTERM, (func), (term) | ((paren) << (CHAR_BIT * 2)), 0)
+
+static int
+parse_string(quote)
+    NODE *quote;
+{
+    int func = quote->nd_func;
+    int term = nd_term(quote);
+    int paren = nd_paren(quote);
+    int c, space = 0;
+
+    if (func == -1) return tSTRING_END;
+    c = nextc();
+    if ((func & STR_FUNC_QWORDS) && ISSPACE(c)) {
+	do {c = nextc();} while (ISSPACE(c));
+	space = 1;
+    }
+    if (c == term && !quote->nd_nest) {
+	if (func & STR_FUNC_QWORDS) {
+	    quote->nd_func = -1;
+	    return ' ';
+	}
+	if (!(func & STR_FUNC_REGEXP)) return tSTRING_END;
+	yylval.num = regx_options();
+	return tREGEXP_END;
+    }
+    if (space) {
+	pushback(c);
+	return ' ';
+    }
+    newtok();
+    if ((func & STR_FUNC_EXPAND) && c == '#') {
+	switch (c = nextc()) {
+	  case '$':
+	  case '@':
+	    pushback(c);
+	    return tSTRING_DVAR;
+	  case '{':
+	    return tSTRING_DBEG;
+	}
+	tokadd('#');
+    }
+    pushback(c);
+    if (tokadd_string(func, term, paren, &quote->nd_nest) == -1) {
+	ruby_sourceline = nd_line(quote);
+	rb_compile_error("unterminated string meets end of file");
+	return tSTRING_END;
+    }
+
+    tokfix();
+    yylval.node = NEW_STR(rb_str_new(tok(), toklen()));
+    return tSTRING_CONTENT;
+}
+
+static int
+heredoc_identifier()
+{
+    int c = nextc(), term, func = 0, len;
+
+    if (c == '-') {
+	c = nextc();
+	func = STR_FUNC_INDENT;
+    }
+    switch (c) {
+      case '\'':
+	func |= str_squote; goto quoted;
+      case '"':
+	func |= str_dquote; goto quoted;
+      case '`':
+	func |= str_xquote;
+      quoted:
+	newtok();
+	tokadd(func);
+	term = c;
+	while ((c = nextc()) != -1 && c != term) {
+	    len = mbclen(c);
+	    do {tokadd(c);} while (--len > 0 && (c = nextc()) != -1);
+	}
+	if (c == -1) {
+	    rb_compile_error("unterminated here document identifier");
+	    return 0;
+	}
+	break;
+
+      default:
+	if (!is_identchar(c)) {
+	    pushback(c);
+	    if (func & STR_FUNC_INDENT) {
+		pushback('-');
+	    }
+	    return 0;
+	}
+	newtok();
+	term = '"';
+	tokadd(func |= str_dquote);
+	do {
+	    len = mbclen(c);
+	    do {tokadd(c);} while (--len > 0 && (c = nextc()) != -1);
+	} while ((c = nextc()) != -1 && is_identchar(c));
+	pushback(c);
+	break;
+    }
+
+    tokfix();
+    len = lex_p - lex_pbeg;
+    lex_p = lex_pend;
+    lex_strterm = rb_node_newnode(NODE_HEREDOC,
+				  rb_str_new(tok(), toklen()),	/* nd_lit */
+				  len,				/* nd_nth */
+				  lex_lastline);		/* nd_orig */
+    return term == '`' ? tXSTRING_BEG : tSTRING_BEG;
+}
+
+static void
+heredoc_restore(here)
+    NODE *here;
+{
+    VALUE line = here->nd_orig;
+    lex_lastline = line;
+    lex_pbeg = RSTRING(line)->ptr;
+    lex_pend = lex_pbeg + RSTRING(line)->len;
+    lex_p = lex_pbeg + here->nd_nth;
+    heredoc_end = ruby_sourceline;
+    ruby_sourceline = nd_line(here);
+    dispose_string(here->nd_lit);
+    rb_gc_force_recycle((VALUE)here);
+}
+
+static int
+whole_match_p(eos, len, indent)
+    char *eos;
+    int len, indent;
+{
+    char *p = lex_pbeg;
+    int n;
+
+    if (indent) {
+	while (*p && ISSPACE(*p)) p++;
+    }
+    n= lex_pend - (p + len);
+    if (n < 0 || (n > 0 && p[len] != '\n' && p[len] != '\r')) return Qfalse;
+    if (strncmp(eos, p, len) == 0) return Qtrue;
+    return Qfalse;
+}
+
+static int
+here_document(here)
+    NODE *here;
+{
+    int c, func, indent = 0;
+    char *eos, *p, *pend;
+    long len;
+    VALUE str = 0;
+
+    eos = RSTRING(here->nd_lit)->ptr;
+    len = RSTRING(here->nd_lit)->len - 1;
+    indent = (func = *eos++) & STR_FUNC_INDENT;
+
+    if ((c = nextc()) == -1) {
+      error:
+	rb_compile_error("can't find string \"%s\" anywhere before EOF", eos);
+	heredoc_restore(lex_strterm);
+	lex_strterm = 0;
+	return 0;
+    }
+    if (was_bol() && whole_match_p(eos, len, indent)) {
+	heredoc_restore(lex_strterm);
+	return tSTRING_END;
+    }
+
+    if (!(func & STR_FUNC_EXPAND)) {
+	do {
+	    p = RSTRING(lex_lastline)->ptr;
+	    pend = lex_pend;
+	    if (pend > p) {
+		switch (pend[-1]) {
+		  case '\n':
+		    if (--pend == p || pend[-1] != '\r') {
+			pend++;
+			break;
+		    }
+		  case '\r':
+		    --pend;
+		}
+	    }
+	    if (str)
+		rb_str_cat(str, p, pend - p);
+	    else
+		str = rb_str_new(p, pend - p);
+	    if (pend < lex_pend) rb_str_cat(str, "\n", 1);
+	    lex_p = lex_pend;
+	    if (nextc() == -1) {
+		if (str) dispose_string(str);
+		goto error;
+	    }
+	} while (!whole_match_p(eos, len, indent));
+    }
+    else {
+	newtok();
+	if (c == '#') {
+	    switch (c = nextc()) {
+	      case '$':
+	      case '@':
+		pushback(c);
+		return tSTRING_DVAR;
+	      case '{':
+		return tSTRING_DBEG;
+	    }
+	    tokadd('#');
+	}
+	do {
+	    pushback(c);
+	    if ((c = tokadd_string(func, '\n', 0, NULL)) == -1) goto error;
+	    if (c != '\n') {
+		yylval.node = NEW_STR(rb_str_new(tok(), toklen()));
+		return tSTRING_CONTENT;
+	    }
+	    tokadd(nextc());
+	    if ((c = nextc()) == -1) goto error;
+	} while (!whole_match_p(eos, len, indent));
+	str = rb_str_new(tok(), toklen());
+    }
+    heredoc_restore(lex_strterm);
+    lex_strterm = NEW_STRTERM(-1, 0, 0);
+    yylval.node = NEW_STR(str);
+    return tSTRING_CONTENT;
+}
+
+#include "lex.c"
+
+static void
+arg_ambiguous()
+{
+    rb_warning("ambiguous first argument; put parentheses or even spaces");
+}
+
+#define IS_ARG() (lex_state == EXPR_ARG || lex_state == EXPR_CMDARG)
+
+static int
+yylex()
+{
+    register int c;
+    int space_seen = 0;
+    int cmd_state;
+    enum lex_state last_state;
+
+    if (lex_strterm) {
+	int token;
+	if (nd_type(lex_strterm) == NODE_HEREDOC) {
+	    token = here_document(lex_strterm);
+	    if (token == tSTRING_END) {
+		lex_strterm = 0;
+		lex_state = EXPR_END;
+	    }
+	}
+	else {
+	    token = parse_string(lex_strterm);
+	    if (token == tSTRING_END || token == tREGEXP_END) {
+		rb_gc_force_recycle((VALUE)lex_strterm);
+		lex_strterm = 0;
+		lex_state = EXPR_END;
+	    }
+	}
+	return token;
+    }
+    cmd_state = command_start;
+    command_start = Qfalse;
+  retry:
+    switch (c = nextc()) {
+      case '\0':		/* NUL */
+      case '\004':		/* ^D */
+      case '\032':		/* ^Z */
+      case -1:			/* end of script. */
+	return 0;
+
+	/* white spaces */
+      case ' ': case '\t': case '\f': case '\r':
+      case '\13': /* '\v' */
+	space_seen++;
+	goto retry;
+
+      case '#':		/* it's a comment */
+	while ((c = nextc()) != '\n') {
+	    if (c == -1)
+		return 0;
+	}
+	/* fall through */
+      case '\n':
+	switch (lex_state) {
+	  case EXPR_BEG:
+	  case EXPR_FNAME:
+	  case EXPR_DOT:
+	  case EXPR_CLASS:
+	    goto retry;
+	  default:
+	    break;
+	}
+	command_start = Qtrue;
+	lex_state = EXPR_BEG;
+	return '\n';
+
+      case '*':
+	if ((c = nextc()) == '*') {
+	    if ((c = nextc()) == '=') {
+		yylval.id = tPOW;
+		lex_state = EXPR_BEG;
+		return tOP_ASGN;
+	    }
+	    pushback(c);
+	    c = tPOW;
+	}
+	else {
+	    if (c == '=') {
+		yylval.id = '*';
+		lex_state = EXPR_BEG;
+		return tOP_ASGN;
+	    }
+	    pushback(c);
+	    if (IS_ARG() && space_seen && !ISSPACE(c)){
+		rb_warning("`*' interpreted as argument prefix");
+		c = tSTAR;
+	    }
+	    else if (lex_state == EXPR_BEG || lex_state == EXPR_MID) {
+		c = tSTAR;
+	    }
+	    else {
+		c = '*';
+	    }
+	}
+	switch (lex_state) {
+	  case EXPR_FNAME: case EXPR_DOT:
+	    lex_state = EXPR_ARG; break;
+	  default:
+	    lex_state = EXPR_BEG; break;
+	}
+	return c;
+
+      case '!':
+	lex_state = EXPR_BEG;
+	if ((c = nextc()) == '=') {
+	    return tNEQ;
+	}
+	if (c == '~') {
+	    return tNMATCH;
+	}
+	pushback(c);
+	return '!';
+
+      case '=':
+	if (was_bol()) {
+	    /* skip embedded rd document */
+	    if (strncmp(lex_p, "begin", 5) == 0 && ISSPACE(lex_p[5])) {
+		for (;;) {
+		    lex_p = lex_pend;
+		    c = nextc();
+		    if (c == -1) {
+			rb_compile_error("embedded document meets end of file");
+			return 0;
+		    }
+		    if (c != '=') continue;
+		    if (strncmp(lex_p, "end", 3) == 0 &&
+			(lex_p + 3 == lex_pend || ISSPACE(lex_p[3]))) {
+			break;
+		    }
+		}
+		lex_p = lex_pend;
+		goto retry;
+	    }
+	}
+
+	switch (lex_state) {
+	  case EXPR_FNAME: case EXPR_DOT:
+	    lex_state = EXPR_ARG; break;
+	  default:
+	    lex_state = EXPR_BEG; break;
+	}
+	if ((c = nextc()) == '=') {
+	    if ((c = nextc()) == '=') {
+		return tEQQ;
+	    }
+	    pushback(c);
+	    return tEQ;
+	}
+	if (c == '~') {
+	    return tMATCH;
+	}
+	else if (c == '>') {
+	    return tASSOC;
+	}
+	pushback(c);
+	return '=';
+
+      case '<':
+	c = nextc();
+	if (c == '<' &&
+	    lex_state != EXPR_END &&
+	    lex_state != EXPR_DOT &&
+	    lex_state != EXPR_ENDARG &&
+	    lex_state != EXPR_CLASS &&
+	    (!IS_ARG() || space_seen)) {
+	    int token = heredoc_identifier();
+	    if (token) return token;
+	}
+	switch (lex_state) {
+	  case EXPR_FNAME: case EXPR_DOT:
+	    lex_state = EXPR_ARG; break;
+	  default:
+	    lex_state = EXPR_BEG; break;
+	}
+	if (c == '=') {
+	    if ((c = nextc()) == '>') {
+		return tCMP;
+	    }
+	    pushback(c);
+	    return tLEQ;
+	}
+	if (c == '<') {
+	    if ((c = nextc()) == '=') {
+		yylval.id = tLSHFT;
+		lex_state = EXPR_BEG;
+		return tOP_ASGN;
+	    }
+	    pushback(c);
+	    return tLSHFT;
+	}
+	pushback(c);
+	return '<';
+
+      case '>':
+	switch (lex_state) {
+	  case EXPR_FNAME: case EXPR_DOT:
+	    lex_state = EXPR_ARG; break;
+	  default:
+	    lex_state = EXPR_BEG; break;
+	}
+	if ((c = nextc()) == '=') {
+	    return tGEQ;
+	}
+	if (c == '>') {
+	    if ((c = nextc()) == '=') {
+		yylval.id = tRSHFT;
+		lex_state = EXPR_BEG;
+		return tOP_ASGN;
+	    }
+	    pushback(c);
+	    return tRSHFT;
+	}
+	pushback(c);
+	return '>';
+
+      case '"':
+	lex_strterm = NEW_STRTERM(str_dquote, '"', 0);
+	return tSTRING_BEG;
+
+      case '`':
+	if (lex_state == EXPR_FNAME) {
+	    lex_state = EXPR_END;
+	    return c;
+	}
+	if (lex_state == EXPR_DOT) {
+	    if (cmd_state)
+		lex_state = EXPR_CMDARG;
+	    else
+		lex_state = EXPR_ARG;
+	    return c;
+	}
+	lex_strterm = NEW_STRTERM(str_xquote, '`', 0);
+	return tXSTRING_BEG;
+
+      case '\'':
+	lex_strterm = NEW_STRTERM(str_squote, '\'', 0);
+	return tSTRING_BEG;
+
+      case '?':
+	if (lex_state == EXPR_END || lex_state == EXPR_ENDARG) {
+	    lex_state = EXPR_BEG;
+	    return '?';
+	}
+	c = nextc();
+	if (c == -1) {
+	    rb_compile_error("incomplete character syntax");
+	    return 0;
+	}
+	if (ISSPACE(c)){
+	    if (!IS_ARG()){
+		int c2 = 0;
+		switch (c) {
+		  case ' ':
+		    c2 = 's';
+		    break;
+		  case '\n':
+		    c2 = 'n';
+		    break;
+		  case '\t':
+		    c2 = 't';
+		    break;
+		  case '\v':
+		    c2 = 'v';
+		    break;
+		  case '\r':
+		    c2 = 'r';
+		    break;
+		  case '\f':
+		    c2 = 'f';
+		    break;
+		}
+		if (c2) {
+		    rb_warn("invalid character syntax; use ?\\%c", c2);
+		}
+	    }
+	  ternary:
+	    pushback(c);
+	    lex_state = EXPR_BEG;
+	    return '?';
+	}
+	else if (ismbchar(c)) {
+	    rb_warn("multibyte character literal not supported yet; use ?\\%.3o", c);
+	    goto ternary;
+	}
+	else if ((ISALNUM(c) || c == '_') && lex_p < lex_pend && is_identchar(*lex_p)) {
+	    goto ternary;
+	}
+	else if (c == '\\') {
+	    c = read_escape();
+	}
+	c &= 0xff;
+	lex_state = EXPR_END;
+	yylval.node = NEW_LIT(INT2FIX(c));
+	return tINTEGER;
+
+      case '&':
+	if ((c = nextc()) == '&') {
+	    lex_state = EXPR_BEG;
+	    if ((c = nextc()) == '=') {
+		yylval.id = tANDOP;
+		lex_state = EXPR_BEG;
+		return tOP_ASGN;
+	    }
+	    pushback(c);
+	    return tANDOP;
+	}
+	else if (c == '=') {
+	    yylval.id = '&';
+	    lex_state = EXPR_BEG;
+	    return tOP_ASGN;
+	}
+	pushback(c);
+	if (IS_ARG() && space_seen && !ISSPACE(c)){
+	    rb_warning("`&' interpreted as argument prefix");
+	    c = tAMPER;
+	}
+	else if (lex_state == EXPR_BEG || lex_state == EXPR_MID) {
+	    c = tAMPER;
+	}
+	else {
+	    c = '&';
+	}
+	switch (lex_state) {
+	  case EXPR_FNAME: case EXPR_DOT:
+	    lex_state = EXPR_ARG; break;
+	  default:
+	    lex_state = EXPR_BEG;
+	}
+	return c;
+
+      case '|':
+	if ((c = nextc()) == '|') {
+	    lex_state = EXPR_BEG;
+	    if ((c = nextc()) == '=') {
+		yylval.id = tOROP;
+		lex_state = EXPR_BEG;
+		return tOP_ASGN;
+	    }
+	    pushback(c);
+	    return tOROP;
+	}
+	if (c == '=') {
+	    yylval.id = '|';
+	    lex_state = EXPR_BEG;
+	    return tOP_ASGN;
+	}
+	if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
+	    lex_state = EXPR_ARG;
+	}
+	else {
+	    lex_state = EXPR_BEG;
+	}
+	pushback(c);
+	return '|';
+
+      case '+':
+	c = nextc();
+	if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
+	    lex_state = EXPR_ARG;
+	    if (c == '@') {
+		return tUPLUS;
+	    }
+	    pushback(c);
+	    return '+';
+	}
+	if (c == '=') {
+	    yylval.id = '+';
+	    lex_state = EXPR_BEG;
+	    return tOP_ASGN;
+	}
+	if (lex_state == EXPR_BEG || lex_state == EXPR_MID ||
+	    (IS_ARG() && space_seen && !ISSPACE(c))) {
+	    if (IS_ARG()) arg_ambiguous();
+	    lex_state = EXPR_BEG;
+	    pushback(c);
+	    if (ISDIGIT(c)) {
+		c = '+';
+		goto start_num;
+	    }
+	    return tUPLUS;
+	}
+	lex_state = EXPR_BEG;
+	pushback(c);
+	return '+';
+
+      case '-':
+	c = nextc();
+	if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
+	    lex_state = EXPR_ARG;
+	    if (c == '@') {
+		return tUMINUS;
+	    }
+	    pushback(c);
+	    return '-';
+	}
+	if (c == '=') {
+	    yylval.id = '-';
+	    lex_state = EXPR_BEG;
+	    return tOP_ASGN;
+	}
+	if (lex_state == EXPR_BEG || lex_state == EXPR_MID ||
+	    (IS_ARG() && space_seen && !ISSPACE(c))) {
+	    if (IS_ARG()) arg_ambiguous();
+	    lex_state = EXPR_BEG;
+	    pushback(c);
+	    if (ISDIGIT(c)) {
+		return tUMINUS_NUM;
+	    }
+	    return tUMINUS;
+	}
+	lex_state = EXPR_BEG;
+	pushback(c);
+	return '-';
+
+      case '.':
+	lex_state = EXPR_BEG;
+	if ((c = nextc()) == '.') {
+	    if ((c = nextc()) == '.') {
+		return tDOT3;
+	    }
+	    pushback(c);
+	    return tDOT2;
+	}
+	pushback(c);
+	if (ISDIGIT(c)) {
+	    yyerror("no .<digit> floating literal anymore; put 0 before dot");
+	}
+	lex_state = EXPR_DOT;
+	return '.';
+
+      start_num:
+      case '0': case '1': case '2': case '3': case '4':
+      case '5': case '6': case '7': case '8': case '9':
+	{
+	    int is_float, seen_point, seen_e, nondigit;
+
+	    is_float = seen_point = seen_e = nondigit = 0;
+	    lex_state = EXPR_END;
+	    newtok();
+	    if (c == '-' || c == '+') {
+		tokadd(c);
+		c = nextc();
+	    }
+	    if (c == '0') {
+		int start = toklen();
+		c = nextc();
+		if (c == 'x' || c == 'X') {
+		    /* hexadecimal */
+		    c = nextc();
+		    if (ISXDIGIT(c)) {
+			do {
+			    if (c == '_') {
+				if (nondigit) break;
+				nondigit = c;
+				continue;
+			    }
+			    if (!ISXDIGIT(c)) break;
+			    nondigit = 0;
+			    tokadd(c);
+			} while ((c = nextc()) != -1);
+		    }
+		    pushback(c);
+		    tokfix();
+		    if (toklen() == start) {
+			yyerror("numeric literal without digits");
+		    }
+		    else if (nondigit) goto trailing_uc;
+		    yylval.node = NEW_LIT(rb_cstr_to_inum(tok(), 16, Qfalse));
+		    return tINTEGER;
+		}
+		if (c == 'b' || c == 'B') {
+		    /* binary */
+		    c = nextc();
+		    if (c == '0' || c == '1') {
+			do {
+			    if (c == '_') {
+				if (nondigit) break;
+				nondigit = c;
+				continue;
+			    }
+			    if (c != '0' && c != '1') break;
+			    nondigit = 0;
+			    tokadd(c);
+			} while ((c = nextc()) != -1);
+		    }
+		    pushback(c);
+		    tokfix();
+		    if (toklen() == start) {
+			yyerror("numeric literal without digits");
+		    }
+		    else if (nondigit) goto trailing_uc;
+		    yylval.node = NEW_LIT(rb_cstr_to_inum(tok(), 2, Qfalse));
+		    return tINTEGER;
+		}
+		if (c == 'd' || c == 'D') {
+		    /* decimal */
+		    c = nextc();
+		    if (ISDIGIT(c)) {
+			do {
+			    if (c == '_') {
+				if (nondigit) break;
+				nondigit = c;
+				continue;
+			    }
+			    if (!ISDIGIT(c)) break;
+			    nondigit = 0;
+			    tokadd(c);
+			} while ((c = nextc()) != -1);
+		    }
+		    pushback(c);
+		    tokfix();
+		    if (toklen() == start) {
+			yyerror("numeric literal without digits");
+		    }
+		    else if (nondigit) goto trailing_uc;
+		    yylval.node = NEW_LIT(rb_cstr_to_inum(tok(), 10, Qfalse));
+		    return tINTEGER;
+		}
+		if (c == '_') {
+		    /* 0_0 */
+		    goto octal_number;
+		}
+		if (c == 'o' || c == 'O') {
+		    /* prefixed octal */
+		    c = nextc();
+		    if (c == '_') {
+			yyerror("numeric literal without digits");
+		    }
+		}
+		if (c >= '0' && c <= '7') {
+		    /* octal */
+		  octal_number:
+	            do {
+			if (c == '_') {
+			    if (nondigit) break;
+			    nondigit = c;
+			    continue;
+			}
+			if (c < '0' || c > '7') break;
+			nondigit = 0;
+			tokadd(c);
+		    } while ((c = nextc()) != -1);
+		    if (toklen() > start) {
+			pushback(c);
+			tokfix();
+			if (nondigit) goto trailing_uc;
+			yylval.node = NEW_LIT(rb_cstr_to_inum(tok(), 8, Qfalse));
+			return tINTEGER;
+		    }
+		    if (nondigit) {
+			pushback(c);
+			goto trailing_uc;
+		    }
+		}
+		if (c > '7' && c <= '9') {
+		    yyerror("Illegal octal digit");
+		}
+		else if (c == '.' || c == 'e' || c == 'E') {
+		    tokadd('0');
+		}
+		else {
+		    pushback(c);
+		    yylval.node = NEW_LIT(INT2FIX(0));
+		    return tINTEGER;
+		}
+	    }
+
+	    for (;;) {
+		switch (c) {
+		  case '0': case '1': case '2': case '3': case '4':
+		  case '5': case '6': case '7': case '8': case '9':
+		    nondigit = 0;
+		    tokadd(c);
+		    break;
+
+		  case '.':
+		    if (nondigit) goto trailing_uc;
+		    if (seen_point || seen_e) {
+			goto decode_num;
+		    }
+		    else {
+			int c0 = nextc();
+			if (!ISDIGIT(c0)) {
+			    pushback(c0);
+			    goto decode_num;
+			}
+			c = c0;
+		    }
+		    tokadd('.');
+		    tokadd(c);
+		    is_float++;
+		    seen_point++;
+		    nondigit = 0;
+		    break;
+
+		  case 'e':
+		  case 'E':
+		    if (nondigit) {
+			pushback(c);
+			c = nondigit;
+			goto decode_num;
+		    }
+		    if (seen_e) {
+			goto decode_num;
+		    }
+		    tokadd(c);
+		    seen_e++;
+		    is_float++;
+		    nondigit = c;
+		    c = nextc();
+		    if (c != '-' && c != '+') continue;
+		    tokadd(c);
+		    nondigit = c;
+		    break;
+
+		  case '_':	/* `_' in number just ignored */
+		    if (nondigit) goto decode_num;
+		    nondigit = c;
+		    break;
+
+		  default:
+		    goto decode_num;
+		}
+		c = nextc();
+	    }
+
+	  decode_num:
+	    pushback(c);
+	    tokfix();
+	    if (nondigit) {
+		char tmp[30];
+	      trailing_uc:
+		sprintf(tmp, "trailing `%c' in number", nondigit);
+		yyerror(tmp);
+	    }
+	    if (is_float) {
+		double d = strtod(tok(), 0);
+		if (errno == ERANGE) {
+		    rb_warn("Float %s out of range", tok());
+		    errno = 0;
+		}
+		yylval.node = NEW_LIT(rb_float_new(d));
+		return tFLOAT;
+	    }
+	    yylval.node = NEW_LIT(rb_cstr_to_inum(tok(), 10, Qfalse));
+	    return tINTEGER;
+	}
+
+      case ']':
+      case '}':
+      case ')':
+	COND_LEXPOP();
+	CMDARG_LEXPOP();
+	lex_state = EXPR_END;
+	return c;
+
+      case ':':
+	c = nextc();
+	if (c == ':') {
+	    if (lex_state == EXPR_BEG ||  lex_state == EXPR_MID ||
+		lex_state == EXPR_CLASS || (IS_ARG() && space_seen)) {
+		lex_state = EXPR_BEG;
+		return tCOLON3;
+	    }
+	    lex_state = EXPR_DOT;
+	    return tCOLON2;
+	}
+	if (lex_state == EXPR_END || lex_state == EXPR_ENDARG || ISSPACE(c)) {
+	    pushback(c);
+	    lex_state = EXPR_BEG;
+	    return ':';
+	}
+	switch (c) {
+	  case '\'':
+	    lex_strterm = NEW_STRTERM(str_ssym, c, 0);
+	    break;
+	  case '"':
+	    lex_strterm = NEW_STRTERM(str_dsym, c, 0);
+	    break;
+	  default:
+	    pushback(c);
+	    break;
+	}
+	lex_state = EXPR_FNAME;
+	return tSYMBEG;
+
+      case '/':
+	if (lex_state == EXPR_BEG || lex_state == EXPR_MID) {
+	    lex_strterm = NEW_STRTERM(str_regexp, '/', 0);
+	    return tREGEXP_BEG;
+	}
+	if ((c = nextc()) == '=') {
+	    yylval.id = '/';
+	    lex_state = EXPR_BEG;
+	    return tOP_ASGN;
+	}
+	pushback(c);
+	if (IS_ARG() && space_seen) {
+	    if (!ISSPACE(c)) {
+		arg_ambiguous();
+		lex_strterm = NEW_STRTERM(str_regexp, '/', 0);
+		return tREGEXP_BEG;
+	    }
+	}
+	switch (lex_state) {
+	  case EXPR_FNAME: case EXPR_DOT:
+	    lex_state = EXPR_ARG; break;
+	  default:
+	    lex_state = EXPR_BEG; break;
+	}
+	return '/';
+
+      case '^':
+	if ((c = nextc()) == '=') {
+	    yylval.id = '^';
+	    lex_state = EXPR_BEG;
+	    return tOP_ASGN;
+	}
+	switch (lex_state) {
+	  case EXPR_FNAME: case EXPR_DOT:
+	    lex_state = EXPR_ARG; break;
+	  default:
+	    lex_state = EXPR_BEG; break;
+	}
+	pushback(c);
+	return '^';
+
+      case ';':
+	command_start = Qtrue;
+      case ',':
+	lex_state = EXPR_BEG;
+	return c;
+
+      case '~':
+	if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
+	    if ((c = nextc()) != '@') {
+		pushback(c);
+	    }
+	}
+	switch (lex_state) {
+	  case EXPR_FNAME: case EXPR_DOT:
+	    lex_state = EXPR_ARG; break;
+	  default:
+	    lex_state = EXPR_BEG; break;
+	}
+	return '~';
+
+      case '(':
+	command_start = Qtrue;
+	if (lex_state == EXPR_BEG || lex_state == EXPR_MID) {
+	    c = tLPAREN;
+	}
+	else if (space_seen) {
+	    if (lex_state == EXPR_CMDARG) {
+		c = tLPAREN_ARG;
+	    }
+	    else if (lex_state == EXPR_ARG) {
+		rb_warn("don't put space before argument parentheses");
+		c = '(';
+	    }
+	}
+	COND_PUSH(0);
+	CMDARG_PUSH(0);
+	lex_state = EXPR_BEG;
+	return c;
+
+      case '[':
+	if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
+	    lex_state = EXPR_ARG;
+	    if ((c = nextc()) == ']') {
+		if ((c = nextc()) == '=') {
+		    return tASET;
+		}
+		pushback(c);
+		return tAREF;
+	    }
+	    pushback(c);
+	    return '[';
+	}
+	else if (lex_state == EXPR_BEG || lex_state == EXPR_MID) {
+	    c = tLBRACK;
+	}
+	else if (IS_ARG() && space_seen) {
+	    c = tLBRACK;
+	}
+	lex_state = EXPR_BEG;
+	COND_PUSH(0);
+	CMDARG_PUSH(0);
+	return c;
+
+      case '{':
+	if (IS_ARG() || lex_state == EXPR_END)
+	    c = '{';          /* block (primary) */
+	else if (lex_state == EXPR_ENDARG)
+	    c = tLBRACE_ARG;  /* block (expr) */
+	else
+	    c = tLBRACE;      /* hash */
+	COND_PUSH(0);
+	CMDARG_PUSH(0);
+	lex_state = EXPR_BEG;
+	return c;
+
+      case '\\':
+	c = nextc();
+	if (c == '\n') {
+	    space_seen = 1;
+	    goto retry; /* skip \\n */
+	}
+	pushback(c);
+	return '\\';
+
+      case '%':
+	if (lex_state == EXPR_BEG || lex_state == EXPR_MID) {
+	    int term;
+	    int paren;
+
+	    c = nextc();
+	  quotation:
+	    if (!ISALNUM(c)) {
+		term = c;
+		c = 'Q';
+	    }
+	    else {
+		term = nextc();
+		if (ISALNUM(term) || ismbchar(term)) {
+		    yyerror("unknown type of %string");
+		    return 0;
+		}
+	    }
+	    if (c == -1 || term == -1) {
+		rb_compile_error("unterminated quoted string meets end of file");
+		return 0;
+	    }
+	    paren = term;
+	    if (term == '(') term = ')';
+	    else if (term == '[') term = ']';
+	    else if (term == '{') term = '}';
+	    else if (term == '<') term = '>';
+	    else paren = 0;
+
+	    switch (c) {
+	      case 'Q':
+		lex_strterm = NEW_STRTERM(str_dquote, term, paren);
+		return tSTRING_BEG;
+
+	      case 'q':
+		lex_strterm = NEW_STRTERM(str_squote, term, paren);
+		return tSTRING_BEG;
+
+	      case 'W':
+		lex_strterm = NEW_STRTERM(str_dword, term, paren);
+		do {c = nextc();} while (ISSPACE(c));
+		pushback(c);
+		return tWORDS_BEG;
+
+	      case 'w':
+		lex_strterm = NEW_STRTERM(str_sword, term, paren);
+		do {c = nextc();} while (ISSPACE(c));
+		pushback(c);
+		return tQWORDS_BEG;
+
+	      case 'x':
+		lex_strterm = NEW_STRTERM(str_xquote, term, paren);
+		return tXSTRING_BEG;
+
+	      case 'r':
+		lex_strterm = NEW_STRTERM(str_regexp, term, paren);
+		return tREGEXP_BEG;
+
+	      case 's':
+		lex_strterm = NEW_STRTERM(str_ssym, term, paren);
+		lex_state = EXPR_FNAME;
+		return tSYMBEG;
+
+	      default:
+		yyerror("unknown type of %string");
+		return 0;
+	    }
+	}
+	if ((c = nextc()) == '=') {
+	    yylval.id = '%';
+	    lex_state = EXPR_BEG;
+	    return tOP_ASGN;
+	}
+	if (IS_ARG() && space_seen && !ISSPACE(c)) {
+	    goto quotation;
+	}
+	switch (lex_state) {
+	  case EXPR_FNAME: case EXPR_DOT:
+	    lex_state = EXPR_ARG; break;
+	  default:
+	    lex_state = EXPR_BEG; break;
+	}
+	pushback(c);
+	return '%';
+
+      case '$':
+	last_state = lex_state;
+	lex_state = EXPR_END;
+	newtok();
+	c = nextc();
+	switch (c) {
+	  case '_':		/* $_: last read line string */
+	    c = nextc();
+	    if (is_identchar(c)) {
+		tokadd('$');
+		tokadd('_');
+		break;
+	    }
+	    pushback(c);
+	    c = '_';
+	    /* fall through */
+	  case '~':		/* $~: match-data */
+	    local_cnt(c);
+	    /* fall through */
+	  case '*':		/* $*: argv */
+	  case '$':		/* $$: pid */
+	  case '?':		/* $?: last status */
+	  case '!':		/* $!: error string */
+	  case '@':		/* $@: error position */
+	  case '/':		/* $/: input record separator */
+	  case '\\':		/* $\: output record separator */
+	  case ';':		/* $;: field separator */
+	  case ',':		/* $,: output field separator */
+	  case '.':		/* $.: last read line number */
+	  case '=':		/* $=: ignorecase */
+	  case ':':		/* $:: load path */
+	  case '<':		/* $<: reading filename */
+	  case '>':		/* $>: default output handle */
+	  case '\"':		/* $": already loaded files */
+	    tokadd('$');
+	    tokadd(c);
+	    tokfix();
+	    yylval.id = rb_intern(tok());
+	    return tGVAR;
+
+	  case '-':
+	    tokadd('$');
+	    tokadd(c);
+	    c = nextc();
+	    if (is_identchar(c)) {
+		tokadd(c);
+	    }
+	    else {
+		pushback(c);
+	    }
+	  gvar:
+	    tokfix();
+	    yylval.id = rb_intern(tok());
+	    /* xxx shouldn't check if valid option variable */
+	    return tGVAR;
+
+	  case '&':		/* $&: last match */
+	  case '`':		/* $`: string before last match */
+	  case '\'':		/* $': string after last match */
+	  case '+':		/* $+: string matches last paren. */
+	    if (last_state == EXPR_FNAME) {
+		tokadd('$');
+		tokadd(c);
+		goto gvar;
+	    }
+	    yylval.node = NEW_BACK_REF(c);
+	    return tBACK_REF;
+
+	  case '1': case '2': case '3':
+	  case '4': case '5': case '6':
+	  case '7': case '8': case '9':
+	    tokadd('$');
+	    do {
+		tokadd(c);
+		c = nextc();
+	    } while (ISDIGIT(c));
+	    pushback(c);
+	    if (last_state == EXPR_FNAME) goto gvar;
+	    tokfix();
+	    yylval.node = NEW_NTH_REF(atoi(tok()+1));
+	    return tNTH_REF;
+
+	  default:
+	    if (!is_identchar(c)) {
+		pushback(c);
+		return '$';
+	    }
+	  case '0':
+	    tokadd('$');
+	}
+	break;
+
+      case '@':
+	c = nextc();
+	newtok();
+	tokadd('@');
+	if (c == '@') {
+	    tokadd('@');
+	    c = nextc();
+	}
+	if (ISDIGIT(c)) {
+	    if (tokidx == 1) {
+		rb_compile_error("`@%c' is not allowed as an instance variable name", c);
+	    }
+	    else {
+		rb_compile_error("`@@%c' is not allowed as a class variable name", c);
+	    }
+	    return 0;
+	}
+	if (!is_identchar(c)) {
+	    pushback(c);
+	    return '@';
+	}
+	break;
+
+      case '_':
+	if (was_bol() && whole_match_p("__END__", 7, 0)) {
+	    ruby__end__seen = 1;
+	    lex_lastline = 0;
+	    return -1;
+	}
+	newtok();
+	break;
+
+      default:
+	if (!is_identchar(c)) {
+	    rb_compile_error("Invalid char `\\%03o' in expression", c);
+	    goto retry;
+	}
+
+	newtok();
+	break;
+    }
+
+    do {
+	tokadd(c);
+	if (ismbchar(c)) {
+	    int i, len = mbclen(c)-1;
+
+	    for (i = 0; i < len; i++) {
+		c = nextc();
+		tokadd(c);
+	    }
+	}
+	c = nextc();
+    } while (is_identchar(c));
+    if ((c == '!' || c == '?') && is_identchar(tok()[0]) && !peek('=')) {
+	tokadd(c);
+    }
+    else {
+	pushback(c);
+    }
+    tokfix();
+
+    {
+	int result = 0;
+
+	last_state = lex_state;
+	switch (tok()[0]) {
+	  case '$':
+	    lex_state = EXPR_END;
+	    result = tGVAR;
+	    break;
+	  case '@':
+	    lex_state = EXPR_END;
+	    if (tok()[1] == '@')
+		result = tCVAR;
+	    else
+		result = tIVAR;
+	    break;
+
+	  default:
+	    if (toklast() == '!' || toklast() == '?') {
+		result = tFID;
+	    }
+	    else {
+		if (lex_state == EXPR_FNAME) {
+		    if ((c = nextc()) == '=' && !peek('~') && !peek('>') &&
+			(!peek('=') || (lex_p + 1 < lex_pend && lex_p[1] == '>'))) {
+			result = tIDENTIFIER;
+			tokadd(c);
+			tokfix();
+		    }
+		    else {
+			pushback(c);
+		    }
+		}
+		if (result == 0 && ISUPPER(tok()[0])) {
+		    result = tCONSTANT;
+		}
+		else {
+		    result = tIDENTIFIER;
+		}
+	    }
+
+	    if (lex_state != EXPR_DOT) {
+		struct kwtable *kw;
+
+		/* See if it is a reserved word.  */
+		kw = rb_reserved_word(tok(), toklen());
+		if (kw) {
+		    enum lex_state state = lex_state;
+		    lex_state = kw->state;
+		    if (state == EXPR_FNAME) {
+			yylval.id = rb_intern(kw->name);
+			return kw->id[0];
+		    }
+		    if (kw->id[0] == kDO) {
+			if (COND_P()) return kDO_COND;
+			if (CMDARG_P() && state != EXPR_CMDARG)
+			    return kDO_BLOCK;
+			if (state == EXPR_ENDARG)
+			    return kDO_BLOCK;
+			return kDO;
+		    }
+		    if (state == EXPR_BEG)
+			return kw->id[0];
+		    else {
+			if (kw->id[0] != kw->id[1])
+			    lex_state = EXPR_BEG;
+			return kw->id[1];
+		    }
+		}
+	    }
+
+	    if (lex_state == EXPR_BEG ||
+		lex_state == EXPR_MID ||
+		lex_state == EXPR_DOT ||
+		lex_state == EXPR_ARG ||
+		lex_state == EXPR_CMDARG) {
+		if (cmd_state) {
+		    lex_state = EXPR_CMDARG;
+		}
+		else {
+		    lex_state = EXPR_ARG;
+		}
+	    }
+	    else {
+		lex_state = EXPR_END;
+	    }
+	}
+	yylval.id = rb_intern(tok());
+	if (is_local_id(yylval.id) &&
+	    last_state != EXPR_DOT &&
+	    ((dyna_in_block() && rb_dvar_defined(yylval.id)) || local_id(yylval.id))) {
+	    lex_state = EXPR_END;
+	}
+	return result;
+    }
+}
+
+NODE*
+rb_node_newnode(type, a0, a1, a2)
+    enum node_type type;
+    VALUE a0, a1, a2;
+{
+    NODE *n = (NODE*)rb_newobj();
+
+    n->flags |= T_NODE;
+    nd_set_type(n, type);
+    nd_set_line(n, ruby_sourceline);
+    n->nd_file = ruby_sourcefile;
+
+    n->u1.value = a0;
+    n->u2.value = a1;
+    n->u3.value = a2;
+
+    return n;
+}
+
+static enum node_type
+nodetype(node)			/* for debug */
+    NODE *node;
+{
+    return (enum node_type)nd_type(node);
+}
+
+static int
+nodeline(node)
+    NODE *node;
+{
+    return nd_line(node);
+}
+
+static NODE*
+newline_node(node)
+    NODE *node;
+{
+    NODE *nl = 0;
+    if (node) {
+	if (nd_type(node) == NODE_NEWLINE) return node;
+        nl = NEW_NEWLINE(node);
+        fixpos(nl, node);
+        nl->nd_nth = nd_line(node);
+    }
+    return nl;
+}
+
+static void
+fixpos(node, orig)
+    NODE *node, *orig;
+{
+    if (!node) return;
+    if (!orig) return;
+    if (orig == (NODE*)1) return;
+    node->nd_file = orig->nd_file;
+    nd_set_line(node, nd_line(orig));
+}
+
+static void
+parser_warning(node, mesg)
+    NODE *node;
+    const char *mesg;
+{
+    int line = ruby_sourceline;
+    ruby_sourceline = nd_line(node);
+    rb_warning("%s", mesg);
+    ruby_sourceline = line;
+}
+
+static void
+parser_warn(node, mesg)
+    NODE *node;
+    const char *mesg;
+{
+    int line = ruby_sourceline;
+    ruby_sourceline = nd_line(node);
+    rb_warn("%s", mesg);
+    ruby_sourceline = line;
+}
+
+static NODE*
+block_append(head, tail)
+    NODE *head, *tail;
+{
+    NODE *end, *h = head;
+
+    if (tail == 0) return head;
+
+  again:
+    if (h == 0) return tail;
+    switch (nd_type(h)) {
+      case NODE_NEWLINE:
+	h = h->nd_next;
+	goto again;
+      case NODE_LIT:
+      case NODE_STR:
+	parser_warning(h, "unused literal ignored");
+	return tail;
+      default:
+	h = end = NEW_BLOCK(head);
+	end->nd_end = end;
+	fixpos(end, head);
+	head = end;
+	break;
+      case NODE_BLOCK:
+	end = h->nd_end;
+	break;
+    }
+
+    if (RTEST(ruby_verbose)) {
+	NODE *nd = end->nd_head;
+      newline:
+	switch (nd_type(nd)) {
+	  case NODE_RETURN:
+	  case NODE_BREAK:
+	  case NODE_NEXT:
+	  case NODE_REDO:
+	  case NODE_RETRY:
+	    parser_warning(nd, "statement not reached");
+	    break;
+
+	case NODE_NEWLINE:
+	    nd = nd->nd_next;
+	    goto newline;
+
+	  default:
+	    break;
+	}
+    }
+
+    if (nd_type(tail) != NODE_BLOCK) {
+	tail = NEW_BLOCK(tail);
+	tail->nd_end = tail;
+    }
+    end->nd_next = tail;
+    h->nd_end = tail->nd_end;
+    return head;
+}
+
+/* append item to the list */
+static NODE*
+list_append(list, item)
+    NODE *list, *item;
+{
+    NODE *last;
+
+    if (list == 0) return NEW_LIST(item);
+    if (list->nd_next) {
+	last = list->nd_next->nd_end;
+    }
+    else {
+	last = list;
+    }
+
+    list->nd_alen += 1;
+    last->nd_next = NEW_LIST(item);
+    list->nd_next->nd_end = last->nd_next;
+    return list;
+}
+
+/* concat two lists */
+static NODE*
+list_concat(head, tail)
+    NODE *head, *tail;
+{
+    NODE *last;
+
+    if (head->nd_next) {
+	last = head->nd_next->nd_end;
+    }
+    else {
+	last = head;
+    }
+
+    head->nd_alen += tail->nd_alen;
+    last->nd_next = tail;
+    if (tail->nd_next) {
+	head->nd_next->nd_end = tail->nd_next->nd_end;
+    }
+    else {
+	head->nd_next->nd_end = tail;
+    }
+
+    return head;
+}
+
+/* concat two string literals */
+static NODE *
+literal_concat(head, tail)
+    NODE *head, *tail;
+{
+    enum node_type htype;
+
+    if (!head) return tail;
+    if (!tail) return head;
+
+    htype = nd_type(head);
+    if (htype == NODE_EVSTR) {
+	NODE *node = NEW_DSTR(rb_str_new(0, 0));
+	head = list_append(node, head);
+    }
+    switch (nd_type(tail)) {
+      case NODE_STR:
+	if (htype == NODE_STR) {
+	    rb_str_concat(head->nd_lit, tail->nd_lit);
+	    rb_gc_force_recycle((VALUE)tail);
+	}
+	else {
+	    list_append(head, tail);
+	}
+	break;
+
+      case NODE_DSTR:
+	if (htype == NODE_STR) {
+	    rb_str_concat(head->nd_lit, tail->nd_lit);
+	    tail->nd_lit = head->nd_lit;
+	    rb_gc_force_recycle((VALUE)head);
+	    head = tail;
+	}
+	else {
+	    nd_set_type(tail, NODE_ARRAY);
+	    tail->nd_head = NEW_STR(tail->nd_lit);
+	    list_concat(head, tail);
+	}
+	break;
+
+      case NODE_EVSTR:
+	if (htype == NODE_STR) {
+	    nd_set_type(head, NODE_DSTR);
+	    head->nd_alen = 1;
+	}
+	list_append(head, tail);
+	break;
+    }
+    return head;
+}
+
+static NODE *
+evstr2dstr(node)
+    NODE *node;
+{
+    if (nd_type(node) == NODE_EVSTR) {
+	node = list_append(NEW_DSTR(rb_str_new(0, 0)), node);
+    }
+    return node;
+}
+
+static NODE *
+new_evstr(node)
+    NODE *node;
+{
+    NODE *head = node;
+
+  again:
+    if (node) {
+	switch (nd_type(node)) {
+	  case NODE_STR: case NODE_DSTR: case NODE_EVSTR:
+	    return node;
+	  case NODE_NEWLINE:
+	    node = node->nd_next;
+	    goto again;
+	}
+    }
+    return NEW_EVSTR(head);
+}
+
+static NODE *
+call_op(recv, id, narg, arg1)
+    NODE *recv;
+    ID id;
+    int narg;
+    NODE *arg1;
+{
+    value_expr(recv);
+    if (narg == 1) {
+	value_expr(arg1);
+	arg1 = NEW_LIST(arg1);
+    }
+    else {
+	arg1 = 0;
+    }
+    return NEW_CALL(recv, id, arg1);
+}
+
+static NODE*
+match_gen(node1, node2)
+    NODE *node1;
+    NODE *node2;
+{
+    local_cnt('~');
+
+    value_expr(node1);
+    value_expr(node2);
+    if (node1) {
+	switch (nd_type(node1)) {
+	  case NODE_DREGX:
+	  case NODE_DREGX_ONCE:
+	    return NEW_MATCH2(node1, node2);
+
+	  case NODE_LIT:
+	    if (TYPE(node1->nd_lit) == T_REGEXP) {
+		return NEW_MATCH2(node1, node2);
+	    }
+	}
+    }
+
+    if (node2) {
+	switch (nd_type(node2)) {
+	  case NODE_DREGX:
+	  case NODE_DREGX_ONCE:
+	    return NEW_MATCH3(node2, node1);
+
+	  case NODE_LIT:
+	    if (TYPE(node2->nd_lit) == T_REGEXP) {
+		return NEW_MATCH3(node2, node1);
+	    }
+	}
+    }
+
+    return NEW_CALL(node1, tMATCH, NEW_LIST(node2));
+}
+
+static NODE*
+gettable(id)
+    ID id;
+{
+    if (id == kSELF) {
+	return NEW_SELF();
+    }
+    else if (id == kNIL) {
+	return NEW_NIL();
+    }
+    else if (id == kTRUE) {
+	return NEW_TRUE();
+    }
+    else if (id == kFALSE) {
+	return NEW_FALSE();
+    }
+    else if (id == k__FILE__) {
+	return NEW_STR(rb_str_new2(ruby_sourcefile));
+    }
+    else if (id == k__LINE__) {
+	return NEW_LIT(INT2FIX(ruby_sourceline));
+    }
+    else if (is_local_id(id)) {
+	if (dyna_in_block() && rb_dvar_defined(id)) return NEW_DVAR(id);
+	if (local_id(id)) return NEW_LVAR(id);
+	/* method call without arguments */
+#if 0
+	/* Rite will warn this */
+	rb_warn("ambiguous identifier; %s() or self.%s is better for method call",
+		rb_id2name(id), rb_id2name(id));
+#endif
+	return NEW_VCALL(id);
+    }
+    else if (is_global_id(id)) {
+	return NEW_GVAR(id);
+    }
+    else if (is_instance_id(id)) {
+	return NEW_IVAR(id);
+    }
+    else if (is_const_id(id)) {
+	return NEW_CONST(id);
+    }
+    else if (is_class_id(id)) {
+	return NEW_CVAR(id);
+    }
+    rb_compile_error("identifier %s is not valid", rb_id2name(id));
+    return 0;
+}
+
+static VALUE dyna_var_lookup _((ID id));
+
+static NODE*
+assignable(id, val)
+    ID id;
+    NODE *val;
+{
+    value_expr(val);
+    if (id == kSELF) {
+	yyerror("Can't change the value of self");
+    }
+    else if (id == kNIL) {
+	yyerror("Can't assign to nil");
+    }
+    else if (id == kTRUE) {
+	yyerror("Can't assign to true");
+    }
+    else if (id == kFALSE) {
+	yyerror("Can't assign to false");
+    }
+    else if (id == k__FILE__) {
+	yyerror("Can't assign to __FILE__");
+    }
+    else if (id == k__LINE__) {
+	yyerror("Can't assign to __LINE__");
+    }
+    else if (is_local_id(id)) {
+	if (rb_dvar_curr(id)) {
+	    return NEW_DASGN_CURR(id, val);
+	}
+	else if (dyna_var_lookup(id)) {
+	    return NEW_DASGN(id, val);
+	}
+	else if (local_id(id) || !dyna_in_block()) {
+	    return NEW_LASGN(id, val);
+	}
+	else{
+	    rb_dvar_push(id, Qnil);
+	    return NEW_DASGN_CURR(id, val);
+	}
+    }
+    else if (is_global_id(id)) {
+	return NEW_GASGN(id, val);
+    }
+    else if (is_instance_id(id)) {
+	return NEW_IASGN(id, val);
+    }
+    else if (is_const_id(id)) {
+	if (in_def || in_single)
+	    yyerror("dynamic constant assignment");
+	return NEW_CDECL(id, val, 0);
+    }
+    else if (is_class_id(id)) {
+	if (in_def || in_single) return NEW_CVASGN(id, val);
+	return NEW_CVDECL(id, val);
+    }
+    else {
+	rb_compile_error("identifier %s is not valid", rb_id2name(id));
+    }
+    return 0;
+}
+
+static NODE *
+aryset(recv, idx)
+    NODE *recv, *idx;
+{
+    if (recv && nd_type(recv) == NODE_SELF)
+	recv = (NODE *)1;
+    else
+	value_expr(recv);
+    return NEW_ATTRASGN(recv, tASET, idx);
+}
+
+ID
+rb_id_attrset(id)
+    ID id;
+{
+    id &= ~ID_SCOPE_MASK;
+    id |= ID_ATTRSET;
+    return id;
+}
+
+static NODE *
+attrset(recv, id)
+    NODE *recv;
+    ID id;
+{
+    if (recv && nd_type(recv) == NODE_SELF)
+	recv = (NODE *)1;
+    else
+	value_expr(recv);
+    return NEW_ATTRASGN(recv, rb_id_attrset(id), 0);
+}
+
+static void
+rb_backref_error(node)
+    NODE *node;
+{
+    switch (nd_type(node)) {
+      case NODE_NTH_REF:
+	rb_compile_error("Can't set variable $%d", node->nd_nth);
+	break;
+      case NODE_BACK_REF:
+	rb_compile_error("Can't set variable $%c", (int)node->nd_nth);
+	break;
+    }
+}
+
+static NODE *
+arg_concat(node1, node2)
+    NODE *node1;
+    NODE *node2;
+{
+    if (!node2) return node1;
+    return NEW_ARGSCAT(node1, node2);
+}
+
+static NODE *
+arg_add(node1, node2)
+    NODE *node1;
+    NODE *node2;
+{
+    if (!node1) return NEW_LIST(node2);
+    if (nd_type(node1) == NODE_ARRAY) {
+	return list_append(node1, node2);
+    }
+    else {
+	return NEW_ARGSPUSH(node1, node2);
+    }
+}
+
+static NODE*
+node_assign(lhs, rhs)
+    NODE *lhs, *rhs;
+{
+    if (!lhs) return 0;
+
+    value_expr(rhs);
+    switch (nd_type(lhs)) {
+      case NODE_GASGN:
+      case NODE_IASGN:
+      case NODE_LASGN:
+      case NODE_DASGN:
+      case NODE_DASGN_CURR:
+      case NODE_MASGN:
+      case NODE_CDECL:
+      case NODE_CVDECL:
+      case NODE_CVASGN:
+	lhs->nd_value = rhs;
+	break;
+
+      case NODE_ATTRASGN:
+      case NODE_CALL:
+	lhs->nd_args = arg_add(lhs->nd_args, rhs);
+	break;
+
+      default:
+	/* should not happen */
+	break;
+    }
+
+    return lhs;
+}
+
+static int
+value_expr0(node)
+    NODE *node;
+{
+    int cond = 0;
+
+    while (node) {
+	switch (nd_type(node)) {
+	  case NODE_DEFN:
+	  case NODE_DEFS:
+	    parser_warning(node, "void value expression");
+	    return Qfalse;
+
+	  case NODE_RETURN:
+	  case NODE_BREAK:
+	  case NODE_NEXT:
+	  case NODE_REDO:
+	  case NODE_RETRY:
+	    if (!cond) yyerror("void value expression");
+	    /* or "control never reach"? */
+	    return Qfalse;
+
+	  case NODE_BLOCK:
+	    while (node->nd_next) {
+		node = node->nd_next;
+	    }
+	    node = node->nd_head;
+	    break;
+
+	  case NODE_BEGIN:
+	    node = node->nd_body;
+	    break;
+
+	  case NODE_IF:
+	    if (!value_expr(node->nd_body)) return Qfalse;
+	    node = node->nd_else;
+	    break;
+
+	  case NODE_AND:
+	  case NODE_OR:
+	    cond = 1;
+	    node = node->nd_2nd;
+	    break;
+
+	  case NODE_NEWLINE:
+	    node = node->nd_next;
+	    break;
+
+	  default:
+	    return Qtrue;
+	}
+    }
+
+    return Qtrue;
+}
+
+static void
+void_expr0(node)
+    NODE *node;
+{
+    char *useless = 0;
+
+    if (!RTEST(ruby_verbose)) return;
+
+  again:
+    if (!node) return;
+    switch (nd_type(node)) {
+      case NODE_NEWLINE:
+	node = node->nd_next;
+	goto again;
+
+      case NODE_CALL:
+	switch (node->nd_mid) {
+	  case '+':
+	  case '-':
+	  case '*':
+	  case '/':
+	  case '%':
+	  case tPOW:
+	  case tUPLUS:
+	  case tUMINUS:
+	  case '|':
+	  case '^':
+	  case '&':
+	  case tCMP:
+	  case '>':
+	  case tGEQ:
+	  case '<':
+	  case tLEQ:
+	  case tEQ:
+	  case tNEQ:
+	    useless = rb_id2name(node->nd_mid);
+	    break;
+	}
+	break;
+
+      case NODE_LVAR:
+      case NODE_DVAR:
+      case NODE_GVAR:
+      case NODE_IVAR:
+      case NODE_CVAR:
+      case NODE_NTH_REF:
+      case NODE_BACK_REF:
+	useless = "a variable";
+	break;
+      case NODE_CONST:
+      case NODE_CREF:
+	useless = "a constant";
+	break;
+      case NODE_LIT:
+      case NODE_STR:
+      case NODE_DSTR:
+      case NODE_DREGX:
+      case NODE_DREGX_ONCE:
+	useless = "a literal";
+	break;
+      case NODE_COLON2:
+      case NODE_COLON3:
+	useless = "::";
+	break;
+      case NODE_DOT2:
+	useless = "..";
+	break;
+      case NODE_DOT3:
+	useless = "...";
+	break;
+      case NODE_SELF:
+	useless = "self";
+	break;
+      case NODE_NIL:
+	useless = "nil";
+	break;
+      case NODE_TRUE:
+	useless = "true";
+	break;
+      case NODE_FALSE:
+	useless = "false";
+	break;
+      case NODE_DEFINED:
+	useless = "defined?";
+	break;
+    }
+
+    if (useless) {
+	int line = ruby_sourceline;
+
+	ruby_sourceline = nd_line(node);
+	rb_warn("useless use of %s in void context", useless);
+	ruby_sourceline = line;
+    }
+}
+
+static void
+void_stmts(node)
+    NODE *node;
+{
+    if (!RTEST(ruby_verbose)) return;
+    if (!node) return;
+    if (nd_type(node) != NODE_BLOCK) return;
+
+    for (;;) {
+	if (!node->nd_next) return;
+	void_expr(node->nd_head);
+	node = node->nd_next;
+    }
+}
+
+static NODE *
+remove_begin(node)
+    NODE *node;
+{
+    NODE **n = &node;
+    while (*n) {
+	switch (nd_type(*n)) {
+	  case NODE_NEWLINE:
+	    n = &(*n)->nd_next;
+	    continue;
+	  case NODE_BEGIN:
+	    *n = (*n)->nd_body;
+	  default:
+	    return node;
+	}
+    }
+    return node;
+}
+
+static int
+assign_in_cond(node)
+    NODE *node;
+{
+    switch (nd_type(node)) {
+      case NODE_MASGN:
+	yyerror("multiple assignment in conditional");
+	return 1;
+
+      case NODE_LASGN:
+      case NODE_DASGN:
+      case NODE_GASGN:
+      case NODE_IASGN:
+	break;
+
+      case NODE_NEWLINE:
+      default:
+	return 0;
+    }
+
+    switch (nd_type(node->nd_value)) {
+      case NODE_LIT:
+      case NODE_STR:
+      case NODE_NIL:
+      case NODE_TRUE:
+      case NODE_FALSE:
+	/* reports always */
+	parser_warn(node->nd_value, "found = in conditional, should be ==");
+	return 1;
+
+      case NODE_DSTR:
+      case NODE_XSTR:
+      case NODE_DXSTR:
+      case NODE_EVSTR:
+      case NODE_DREGX:
+      default:
+	break;
+    }
+#if 0
+    if (assign_in_cond(node->nd_value) == 0) {
+	parser_warning(node->nd_value, "assignment in condition");
+    }
+#endif
+    return 1;
+}
+
+static int
+e_option_supplied()
+{
+    if (strcmp(ruby_sourcefile, "-e") == 0)
+	return Qtrue;
+    return Qfalse;
+}
+
+static void
+warn_unless_e_option(node, str)
+    NODE *node;
+    const char *str;
+{
+    if (!e_option_supplied()) parser_warn(node, str);
+}
+
+static void
+warning_unless_e_option(node, str)
+    NODE *node;
+    const char *str;
+{
+    if (!e_option_supplied()) parser_warning(node, str);
+}
+
+static NODE *cond0();
+
+static NODE*
+range_op(node)
+    NODE *node;
+{
+    enum node_type type;
+
+    if (!e_option_supplied()) return node;
+    if (node == 0) return 0;
+
+    value_expr(node);
+    node = cond0(node);
+    type = nd_type(node);
+    if (type == NODE_NEWLINE) {
+	node = node->nd_next;
+	type = nd_type(node);
+    }
+    if (type == NODE_LIT && FIXNUM_P(node->nd_lit)) {
+	warn_unless_e_option(node, "integer literal in conditional range");
+	return call_op(node,tEQ,1,NEW_GVAR(rb_intern("$.")));
+    }
+    return node;
+}
+
+static int
+literal_node(node)
+    NODE *node;
+{
+    if (!node) return 1;	/* same as NODE_NIL */
+    switch (nd_type(node)) {
+      case NODE_LIT:
+      case NODE_STR:
+      case NODE_DSTR:
+      case NODE_EVSTR:
+      case NODE_DREGX:
+      case NODE_DREGX_ONCE:
+      case NODE_DSYM:
+	return 2;
+      case NODE_TRUE:
+      case NODE_FALSE:
+      case NODE_NIL:
+	return 1;
+    }
+    return 0;
+}
+
+static NODE*
+cond0(node)
+    NODE *node;
+{
+    if (node == 0) return 0;
+    assign_in_cond(node);
+
+    switch (nd_type(node)) {
+      case NODE_DSTR:
+      case NODE_EVSTR:
+      case NODE_STR:
+	rb_warn("string literal in condition");
+	break;
+
+      case NODE_DREGX:
+      case NODE_DREGX_ONCE:
+	warning_unless_e_option(node, "regex literal in condition");
+	local_cnt('_');
+	local_cnt('~');
+	return NEW_MATCH2(node, NEW_GVAR(rb_intern("$_")));
+
+      case NODE_AND:
+      case NODE_OR:
+	node->nd_1st = cond0(node->nd_1st);
+	node->nd_2nd = cond0(node->nd_2nd);
+	break;
+
+      case NODE_DOT2:
+      case NODE_DOT3:
+	node->nd_beg = range_op(node->nd_beg);
+	node->nd_end = range_op(node->nd_end);
+	if (nd_type(node) == NODE_DOT2) nd_set_type(node,NODE_FLIP2);
+	else if (nd_type(node) == NODE_DOT3) nd_set_type(node, NODE_FLIP3);
+	node->nd_cnt = local_append(internal_id());
+	if (!e_option_supplied()) {
+	    int b = literal_node(node->nd_beg);
+	    int e = literal_node(node->nd_end);
+	    if ((b == 1 && e == 1) || (b + e >= 2 && RTEST(ruby_verbose))) {
+		parser_warn(node, "range literal in condition");
+	    }
+	}
+	break;
+
+      case NODE_DSYM:
+	parser_warning(node, "literal in condition");
+	break;
+
+      case NODE_LIT:
+	if (TYPE(node->nd_lit) == T_REGEXP) {
+	    warn_unless_e_option(node, "regex literal in condition");
+	    nd_set_type(node, NODE_MATCH);
+	    local_cnt('_');
+	    local_cnt('~');
+	}
+	else {
+	    parser_warning(node, "literal in condition");
+	}
+      default:
+	break;
+    }
+    return node;
+}
+
+static NODE*
+cond(node)
+    NODE *node;
+{
+    if (node == 0) return 0;
+    value_expr(node);
+    if (nd_type(node) == NODE_NEWLINE){
+	node->nd_next = cond0(node->nd_next);
+	return node;
+    }
+    return cond0(node);
+}
+
+static NODE*
+logop(type, left, right)
+    enum node_type type;
+    NODE *left, *right;
+{
+    value_expr(left);
+    if (left && nd_type(left) == type) {
+	NODE *node = left, *second;
+	while ((second = node->nd_2nd) != 0 && nd_type(second) == type) {
+	    node = second;
+	}
+	node->nd_2nd = NEW_NODE(type, second, right, 0);
+	return left;
+    }
+    return NEW_NODE(type, left, right, 0);
+}
+
+static int
+cond_negative(nodep)
+    NODE **nodep;
+{
+    NODE *c = *nodep;
+
+    if (!c) return 0;
+    switch (nd_type(c)) {
+      case NODE_NOT:
+	*nodep = c->nd_body;
+	return 1;
+      case NODE_NEWLINE:
+	if (c->nd_next && nd_type(c->nd_next) == NODE_NOT) {
+	    c->nd_next = c->nd_next->nd_body;
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+static void
+no_blockarg(node)
+    NODE *node;
+{
+    if (node && nd_type(node) == NODE_BLOCK_PASS) {
+	rb_compile_error("block argument should not be given");
+    }
+}
+
+static NODE *
+ret_args(node)
+    NODE *node;
+{
+    if (node) {
+	no_blockarg(node);
+	if (nd_type(node) == NODE_ARRAY && node->nd_next == 0) {
+	    node = node->nd_head;
+	}
+	if (node && nd_type(node) == NODE_SPLAT) {
+	    node = NEW_SVALUE(node);
+	}
+    }
+    return node;
+}
+
+static NODE *
+new_yield(node)
+    NODE *node;
+{
+    long state = Qtrue;
+
+    if (node) {
+        no_blockarg(node);
+        if (nd_type(node) == NODE_ARRAY && node->nd_next == 0) {
+            node = node->nd_head;
+            state = Qfalse;
+        }
+        if (node && nd_type(node) == NODE_SPLAT) {
+            state = Qtrue;
+        }
+    }
+    else {
+        state = Qfalse;
+    }
+    return NEW_YIELD(node, state);
+}
+
+static NODE*
+negate_lit(node)
+    NODE *node;
+{
+    switch (TYPE(node->nd_lit)) {
+      case T_FIXNUM:
+	node->nd_lit = LONG2FIX(-FIX2LONG(node->nd_lit));
+	break;
+      case T_BIGNUM:
+	node->nd_lit = rb_funcall(node->nd_lit,tUMINUS,0,0);
+	break;
+      case T_FLOAT:
+	RFLOAT(node->nd_lit)->value = -RFLOAT(node->nd_lit)->value;
+	break;
+      default:
+	break;
+    }
+    return node;
+}
+
+static NODE *
+arg_blk_pass(node1, node2)
+    NODE *node1;
+    NODE *node2;
+{
+    if (node2) {
+	node2->nd_head = node1;
+	return node2;
+    }
+    return node1;
+}
+
+static NODE*
+arg_prepend(node1, node2)
+    NODE *node1, *node2;
+{
+    switch (nd_type(node2)) {
+      case NODE_ARRAY:
+	return list_concat(NEW_LIST(node1), node2);
+
+      case NODE_SPLAT:
+	return arg_concat(node1, node2->nd_head);
+
+      case NODE_BLOCK_PASS:
+	node2->nd_body = arg_prepend(node1, node2->nd_body);
+	return node2;
+
+      default:
+	rb_bug("unknown nodetype(%d) for arg_prepend", nd_type(node2));
+    }
+    return 0;			/* not reached */
+}
+
+static NODE*
+new_call(r,m,a)
+    NODE *r;
+    ID m;
+    NODE *a;
+{
+    if (a && nd_type(a) == NODE_BLOCK_PASS) {
+	a->nd_iter = NEW_CALL(r,m,a->nd_head);
+	return a;
+    }
+    return NEW_CALL(r,m,a);
+}
+
+static NODE*
+new_fcall(m,a)
+    ID m;
+    NODE *a;
+{
+    if (a && nd_type(a) == NODE_BLOCK_PASS) {
+	a->nd_iter = NEW_FCALL(m,a->nd_head);
+	return a;
+    }
+    return NEW_FCALL(m,a);
+}
+
+static NODE*
+new_super(a)
+    NODE *a;
+{
+    if (a && nd_type(a) == NODE_BLOCK_PASS) {
+	a->nd_iter = NEW_SUPER(a->nd_head);
+	return a;
+    }
+    return NEW_SUPER(a);
+}
+
+static struct local_vars {
+    ID *tbl;
+    int nofree;
+    int cnt;
+    int dlev;
+    struct RVarmap* dyna_vars;
+    struct local_vars *prev;
+} *lvtbl;
+
+static void
+local_push(top)
+    int top;
+{
+    struct local_vars *local;
+
+    local = ALLOC(struct local_vars);
+    local->prev = lvtbl;
+    local->nofree = 0;
+    local->cnt = 0;
+    local->tbl = 0;
+    local->dlev = 0;
+    local->dyna_vars = ruby_dyna_vars;
+    lvtbl = local;
+    if (!top) {
+	/* preserve reference for GC, but link should be cut. */
+	rb_dvar_push(0, (VALUE)ruby_dyna_vars);
+	ruby_dyna_vars->next = 0;
+    }
+}
+
+static void
+local_pop()
+{
+    struct local_vars *local = lvtbl->prev;
+
+    if (lvtbl->tbl) {
+	if (!lvtbl->nofree) xfree(lvtbl->tbl);
+	else lvtbl->tbl[0] = lvtbl->cnt;
+    }
+    ruby_dyna_vars = lvtbl->dyna_vars;
+    xfree(lvtbl);
+    lvtbl = local;
+}
+
+static ID*
+local_tbl()
+{
+    lvtbl->nofree = 1;
+    return lvtbl->tbl;
+}
+
+static int
+local_append(id)
+    ID id;
+{
+    if (lvtbl->tbl == 0) {
+	lvtbl->tbl = ALLOC_N(ID, 4);
+	lvtbl->tbl[0] = 0;
+	lvtbl->tbl[1] = '_';
+	lvtbl->tbl[2] = '~';
+	lvtbl->cnt = 2;
+	if (id == '_') return 0;
+	if (id == '~') return 1;
+    }
+    else {
+	REALLOC_N(lvtbl->tbl, ID, lvtbl->cnt+2);
+    }
+
+    lvtbl->tbl[lvtbl->cnt+1] = id;
+    return lvtbl->cnt++;
+}
+
+static int
+local_cnt(id)
+    ID id;
+{
+    int cnt, max;
+
+    if (id == 0) return lvtbl->cnt;
+
+    for (cnt=1, max=lvtbl->cnt+1; cnt<max;cnt++) {
+	if (lvtbl->tbl[cnt] == id) return cnt-1;
+    }
+    return local_append(id);
+}
+
+static int
+local_id(id)
+    ID id;
+{
+    int i, max;
+
+    if (lvtbl == 0) return Qfalse;
+    for (i=3, max=lvtbl->cnt+1; i<max; i++) {
+	if (lvtbl->tbl[i] == id) return Qtrue;
+    }
+    return Qfalse;
+}
+
+static void
+top_local_init()
+{
+    local_push(1);
+    lvtbl->cnt = ruby_scope->local_tbl?ruby_scope->local_tbl[0]:0;
+    if (lvtbl->cnt > 0) {
+	lvtbl->tbl = ALLOC_N(ID, lvtbl->cnt+3);
+	MEMCPY(lvtbl->tbl, ruby_scope->local_tbl, ID, lvtbl->cnt+1);
+    }
+    else {
+	lvtbl->tbl = 0;
+    }
+    if (ruby_dyna_vars)
+	lvtbl->dlev = 1;
+    else
+	lvtbl->dlev = 0;
+}
+
+static void
+top_local_setup()
+{
+    int len = lvtbl->cnt;
+    int i;
+
+    if (len > 0) {
+	i = ruby_scope->local_tbl?ruby_scope->local_tbl[0]:0;
+
+	if (i < len) {
+	    if (i == 0 || (ruby_scope->flags & SCOPE_MALLOC) == 0) {
+		VALUE *vars = ALLOC_N(VALUE, len+1);
+		if (ruby_scope->local_vars) {
+		    *vars++ = ruby_scope->local_vars[-1];
+		    MEMCPY(vars, ruby_scope->local_vars, VALUE, i);
+		    rb_mem_clear(vars+i, len-i);
+		}
+		else {
+		    *vars++ = (VALUE)ruby_scope;
+		    rb_mem_clear(vars, len);
+		}
+		ruby_scope->local_vars = vars;
+		ruby_scope->flags |= SCOPE_MALLOC;
+	    }
+	    else {
+		VALUE *vars = ruby_scope->local_vars-1;
+		REALLOC_N(vars, VALUE, len+1);
+		ruby_scope->local_vars = vars+1;
+		rb_mem_clear(ruby_scope->local_vars+i, len-i);
+	    }
+	    if (ruby_scope->local_tbl && ruby_scope->local_vars[-1] == 0) {
+               if (!(ruby_scope->flags & SCOPE_CLONE))
+                   xfree(ruby_scope->local_tbl);
+	    }
+	    ruby_scope->local_tbl = local_tbl();
+	}
+    }
+    local_pop();
+}
+
+#define DVAR_USED FL_USER6
+
+static VALUE
+dyna_var_lookup(id)
+    ID id;
+{
+    struct RVarmap *vars = ruby_dyna_vars;
+
+    while (vars) {
+	if (vars->id == id) {
+	    FL_SET(vars, DVAR_USED);
+	    return Qtrue;
+	}
+	vars = vars->next;
+    }
+    return Qfalse;
+}
+
+static struct RVarmap*
+dyna_push()
+{
+    struct RVarmap* vars = ruby_dyna_vars;
+
+    rb_dvar_push(0, 0);
+    lvtbl->dlev++;
+    return vars;
+}
+
+static void
+dyna_pop(vars)
+    struct RVarmap* vars;
+{
+    lvtbl->dlev--;
+    ruby_dyna_vars = vars;
+}
+
+static int
+dyna_in_block()
+{
+    return (lvtbl->dlev > 0);
+}
+
+static NODE *
+dyna_init(node, pre)
+    NODE *node;
+    struct RVarmap *pre;
+{
+    struct RVarmap *post = ruby_dyna_vars;
+    NODE *var;
+
+    if (!node || !post || pre == post) return node;
+    for (var = 0; post != pre && post->id; post = post->next) {
+	if (FL_TEST(post, DVAR_USED)) {
+	    var = NEW_DASGN_CURR(post->id, var);
+	}
+    }
+    return block_append(var, node);
+}
+
+int
+ruby_parser_stack_on_heap()
+{
+#if defined(YYMALLOC)
+    return Qfalse;
+#else
+    return Qtrue;
+#endif
+}
+
+void
+rb_gc_mark_parser()
+{
+#if defined YYMALLOC
+    rb_gc_mark((VALUE)parser_heap);
+#elif defined yystacksize
+    if (yyvsp) rb_gc_mark_locations((VALUE *)yyvs, (VALUE *)yyvsp);
+#endif
+
+    if (!ruby_in_compile) return;
+
+    rb_gc_mark_maybe((VALUE)yylval.node);
+    rb_gc_mark(ruby_debug_lines);
+    rb_gc_mark(lex_lastline);
+    rb_gc_mark(lex_input);
+    rb_gc_mark((VALUE)lex_strterm);
+}
+
+void
+rb_parser_append_print()
+{
+    ruby_eval_tree =
+	block_append(ruby_eval_tree,
+		     NEW_FCALL(rb_intern("print"),
+			       NEW_ARRAY(NEW_GVAR(rb_intern("$_")))));
+}
+
+void
+rb_parser_while_loop(chop, split)
+    int chop, split;
+{
+    if (split) {
+	ruby_eval_tree =
+	    block_append(NEW_GASGN(rb_intern("$F"),
+				   NEW_CALL(NEW_GVAR(rb_intern("$_")),
+					    rb_intern("split"), 0)),
+				   ruby_eval_tree);
+    }
+    if (chop) {
+	ruby_eval_tree =
+	    block_append(NEW_CALL(NEW_GVAR(rb_intern("$_")),
+				  rb_intern("chop!"), 0), ruby_eval_tree);
+    }
+    ruby_eval_tree = NEW_OPT_N(ruby_eval_tree);
+}
+
+static struct {
+    ID token;
+    char *name;
+} op_tbl[] = {
+    {tDOT2,	".."},
+    {tDOT3,	"..."},
+    {'+',	"+"},
+    {'-',	"-"},
+    {'+',	"+(binary)"},
+    {'-',	"-(binary)"},
+    {'*',	"*"},
+    {'/',	"/"},
+    {'%',	"%"},
+    {tPOW,	"**"},
+    {tUPLUS,	"+@"},
+    {tUMINUS,	"-@"},
+    {tUPLUS,	"+(unary)"},
+    {tUMINUS,	"-(unary)"},
+    {'|',	"|"},
+    {'^',	"^"},
+    {'&',	"&"},
+    {tCMP,	"<=>"},
+    {'>',	">"},
+    {tGEQ,	">="},
+    {'<',	"<"},
+    {tLEQ,	"<="},
+    {tEQ,	"=="},
+    {tEQQ,	"==="},
+    {tNEQ,	"!="},
+    {tMATCH,	"=~"},
+    {tNMATCH,	"!~"},
+    {'!',	"!"},
+    {'~',	"~"},
+    {'!',	"!(unary)"},
+    {'~',	"~(unary)"},
+    {'!',	"!@"},
+    {'~',	"~@"},
+    {tAREF,	"[]"},
+    {tASET,	"[]="},
+    {tLSHFT,	"<<"},
+    {tRSHFT,	">>"},
+    {tCOLON2,	"::"},
+    {'`',	"`"},
+    {0,	0}
+};
+
+static st_table *sym_tbl;
+static st_table *sym_rev_tbl;
+
+void
+Init_sym()
+{
+    sym_tbl = st_init_strtable_with_size(200);
+    sym_rev_tbl = st_init_numtable_with_size(200);
+}
+
+static ID last_id = tLAST_TOKEN;
+
+static ID
+internal_id()
+{
+    return ID_INTERNAL | (++last_id << ID_SCOPE_SHIFT);
+}
+
+static int
+is_special_global_name(m)
+    const char *m;
+{
+    switch (*m) {
+      case '~': case '*': case '$': case '?': case '!': case '@':
+      case '/': case '\\': case ';': case ',': case '.': case '=':
+      case ':': case '<': case '>': case '\"':
+      case '&': case '`': case '\'': case '+':
+      case '0':
+	++m;
+	break;
+      case '-':
+	++m;
+	if (is_identchar(*m)) m += mbclen(*m);
+	break;
+      default:
+	if (!ISDIGIT(*m)) return 0;
+	do ++m; while (ISDIGIT(*m));
+    }
+    return !*m;
+}
+
+int
+rb_symname_p(name)
+    const char *name;
+{
+    const char *m = name;
+    int localid = Qfalse;
+
+    if (!m) return Qfalse;
+    switch (*m) {
+      case '\0':
+	return Qfalse;
+
+      case '$':
+	if (is_special_global_name(++m)) return Qtrue;
+	goto id;
+
+      case '@':
+	if (*++m == '@') ++m;
+	goto id;
+
+      case '<':
+	switch (*++m) {
+	  case '<': ++m; break;
+	  case '=': if (*++m == '>') ++m; break;
+	  default: break;
+	}
+	break;
+
+      case '>':
+	switch (*++m) {
+	  case '>': case '=': ++m; break;
+	}
+	break;
+
+      case '=':
+	switch (*++m) {
+	  case '~': ++m; break;
+	  case '=': if (*++m == '=') ++m; break;
+	  default: return Qfalse;
+	}
+	break;
+
+      case '*':
+	if (*++m == '*') ++m;
+	break;
+
+      case '+': case '-':
+	if (*++m == '@') ++m;
+	break;
+
+      case '|': case '^': case '&': case '/': case '%': case '~': case '`':
+	++m;
+	break;
+
+      case '[':
+	if (*++m != ']') return Qfalse;
+	if (*++m == '=') ++m;
+	break;
+
+      default:
+	localid = !ISUPPER(*m);
+      id:
+	if (*m != '_' && !ISALPHA(*m) && !ismbchar(*m)) return Qfalse;
+	while (is_identchar(*m)) m += mbclen(*m);
+	if (localid) {
+	    switch (*m) {
+	      case '!': case '?': case '=': ++m;
+	    }
+	}
+	break;
+    }
+    return *m ? Qfalse : Qtrue;
+}
+
+int
+rb_sym_interned_p(str)
+    VALUE str;
+{
+    ID id;
+
+    if (st_lookup(sym_tbl, (st_data_t)RSTRING(str)->ptr, (st_data_t *)&id))
+	return Qtrue;
+    return Qfalse;
+}
+
+ID
+rb_intern(name)
+    const char *name;
+{
+    const char *m = name;
+    ID id;
+    int last;
+
+    if (st_lookup(sym_tbl, (st_data_t)name, (st_data_t *)&id))
+	return id;
+
+    last = strlen(name)-1;
+    id = 0;
+    switch (*name) {
+      case '$':
+	id |= ID_GLOBAL;
+	if (is_special_global_name(++m)) goto new_id;
+	break;
+      case '@':
+	if (name[1] == '@') {
+	    m++;
+	    id |= ID_CLASS;
+	}
+	else {
+	    id |= ID_INSTANCE;
+	}
+	m++;
+	break;
+      default:
+	if (name[0] != '_' && ISASCII(name[0]) && !ISALNUM(name[0])) {
+	    /* operators */
+	    int i;
+
+	    for (i=0; op_tbl[i].token; i++) {
+		if (*op_tbl[i].name == *name &&
+		    strcmp(op_tbl[i].name, name) == 0) {
+		    id = op_tbl[i].token;
+		    goto id_regist;
+		}
+	    }
+	}
+
+	if (name[last] == '=') {
+	    /* attribute assignment */
+	    char *buf = ALLOCA_N(char,last+1);
+
+	    strncpy(buf, name, last);
+	    buf[last] = '\0';
+	    id = rb_intern(buf);
+	    if (id > tLAST_TOKEN && !is_attrset_id(id)) {
+		id = rb_id_attrset(id);
+		goto id_regist;
+	    }
+	    id = ID_ATTRSET;
+	}
+	else if (ISUPPER(name[0])) {
+	    id = ID_CONST;
+        }
+	else {
+	    id = ID_LOCAL;
+	}
+	break;
+    }
+    if (!ISDIGIT(*m)) {
+	while (m <= name + last && is_identchar(*m)) {
+	    m += mbclen(*m);
+	}
+    }
+    if (*m) id = ID_JUNK;
+  new_id:
+    id |= ++last_id << ID_SCOPE_SHIFT;
+  id_regist:
+    name = strdup(name);
+    st_add_direct(sym_tbl, (st_data_t)name, id);
+    st_add_direct(sym_rev_tbl, id, (st_data_t)name);
+    return id;
+}
+
+char *
+rb_id2name(id)
+    ID id;
+{
+    char *name;
+
+    if (id < tLAST_TOKEN) {
+	int i;
+
+	for (i=0; op_tbl[i].token; i++) {
+	    if (op_tbl[i].token == id)
+		return op_tbl[i].name;
+	}
+    }
+
+    if (st_lookup(sym_rev_tbl, id, (st_data_t *)&name))
+	return name;
+
+    if (is_attrset_id(id)) {
+	ID id2 = (id & ~ID_SCOPE_MASK) | ID_LOCAL;
+
+      again:
+	name = rb_id2name(id2);
+	if (name) {
+	    char *buf = ALLOCA_N(char, strlen(name)+2);
+
+	    strcpy(buf, name);
+	    strcat(buf, "=");
+	    rb_intern(buf);
+	    return rb_id2name(id);
+	}
+	if (is_local_id(id2)) {
+	    id2 = (id & ~ID_SCOPE_MASK) | ID_CONST;
+	    goto again;
+	}
+    }
+    return 0;
+}
+
+static int
+symbols_i(key, value, ary)
+    char *key;
+    ID value;
+    VALUE ary;
+{
+    rb_ary_push(ary, ID2SYM(value));
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     Symbol.all_symbols    => array
+ *  
+ *  Returns an array of all the symbols currently in Ruby's symbol
+ *  table.
+ *     
+ *     Symbol.all_symbols.size    #=> 903
+ *     Symbol.all_symbols[1,20]   #=> [:floor, :ARGV, :Binding, :symlink,
+ *                                     :chown, :EOFError, :$;, :String, 
+ *                                     :LOCK_SH, :"setuid?", :$<, 
+ *                                     :default_proc, :compact, :extend, 
+ *                                     :Tms, :getwd, :$=, :ThreadGroup,
+ *                                     :wait2, :$>]
+ */
+
+VALUE
+rb_sym_all_symbols()
+{
+    VALUE ary = rb_ary_new2(sym_tbl->num_entries);
+
+    st_foreach(sym_tbl, symbols_i, ary);
+    return ary;
+}
+
+int
+rb_is_const_id(id)
+    ID id;
+{
+    if (is_const_id(id)) return Qtrue;
+    return Qfalse;
+}
+
+int
+rb_is_class_id(id)
+    ID id;
+{
+    if (is_class_id(id)) return Qtrue;
+    return Qfalse;
+}
+
+int
+rb_is_instance_id(id)
+    ID id;
+{
+    if (is_instance_id(id)) return Qtrue;
+    return Qfalse;
+}
+
+int
+rb_is_local_id(id)
+    ID id;
+{
+    if (is_local_id(id)) return Qtrue;
+    return Qfalse;
+}
+
+int
+rb_is_junk_id(id)
+    ID id;
+{
+    if (is_junk_id(id)) return Qtrue;
+    return Qfalse;
+}
+
+static void
+special_local_set(c, val)
+    char c;
+    VALUE val;
+{
+    int cnt;
+
+    top_local_init();
+    cnt = local_cnt(c);
+    top_local_setup();
+    ruby_scope->local_vars[cnt] = val;
+}
+
+VALUE
+rb_backref_get()
+{
+    VALUE *var = rb_svar(1);
+    if (var) {
+	return *var;
+    }
+    return Qnil;
+}
+
+void
+rb_backref_set(val)
+    VALUE val;
+{
+    VALUE *var = rb_svar(1);
+    if (var) {
+	*var = val;
+    }
+    else {
+	special_local_set('~', val);
+    }
+}
+
+VALUE
+rb_lastline_get()
+{
+    VALUE *var = rb_svar(0);
+    if (var) {
+	return *var;
+    }
+    return Qnil;
+}
+
+void
+rb_lastline_set(val)
+    VALUE val;
+{
+    VALUE *var = rb_svar(0);
+    if (var) {
+	*var = val;
+    }
+    else {
+	special_local_set('_', val);
+    }
+}
+
+#ifdef YYMALLOC
+#define HEAPCNT(n, size) ((n) * (size) / sizeof(YYSTYPE))
+#define NEWHEAP() rb_node_newnode(NODE_ALLOCA, 0, (VALUE)parser_heap, 0)
+#define ADD2HEAP(n, c, p) ((parser_heap = (n))->u1.node = (p), \
+			   (n)->u3.cnt = (c), (p))
+
+static void *
+rb_parser_malloc(size)
+    size_t size;
+{
+    size_t cnt = HEAPCNT(1, size);
+    NODE *n = NEWHEAP();
+    void *ptr = xmalloc(size);
+
+    return ADD2HEAP(n, cnt, ptr);
+}
+
+static void *
+rb_parser_calloc(nelem, size)
+    size_t nelem, size;
+{
+    size_t cnt = HEAPCNT(nelem, size);
+    NODE *n = NEWHEAP();
+    void *ptr = xcalloc(nelem, size);
+
+    return ADD2HEAP(n, cnt, ptr);
+}
+
+static void *
+rb_parser_realloc(ptr, size)
+    void *ptr;
+    size_t size;
+{
+    NODE *n;
+    size_t cnt = HEAPCNT(1, size);
+
+    if (ptr && (n = parser_heap) != NULL) {
+	do {
+	    if (n->u1.node == ptr) {
+		n->u1.node = ptr = xrealloc(ptr, size);
+		if (n->u3.cnt) n->u3.cnt = cnt;
+		return ptr;
+	    }
+	} while ((n = n->u2.node) != NULL);
+    }
+    n = NEWHEAP();
+    ptr = xrealloc(ptr, size);
+    return ADD2HEAP(n, cnt, ptr);
+}
+
+static void
+rb_parser_free(ptr)
+    void *ptr;
+{
+    NODE **prev = &parser_heap, *n;
+
+    while (n = *prev) {
+	if (n->u1.node == ptr) {
+	    *prev = n->u2.node;
+	    rb_gc_force_recycle((VALUE)n);
+	    break;
+	}
+	prev = &n->u2.node;
+    }
+    xfree(ptr);
+}
+#endif
diff --git a/ruby_1_8_6/prec.c b/ruby_1_8_6/prec.c
new file mode 100644
index 0000000000..7b215fba09
--- /dev/null
+++ b/ruby_1_8_6/prec.c
@@ -0,0 +1,141 @@
+/**********************************************************************
+
+  prec.c -
+
+  $Author$
+  $Date$
+  created at: Tue Jan 26 02:40:41 2000
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+
+VALUE rb_mPrecision;
+
+static ID prc_pr, prc_if;
+
+
+/*
+ *  call-seq:
+ *   num.prec(klass)   => a_klass
+ *
+ *  Converts _self_ into an instance of _klass_. By default,
+ *  +prec+ invokes 
+ *
+ *     klass.induced_from(num)
+ *
+ *  and returns its value. So, if <code>klass.induced_from</code>
+ *  doesn't return an instance of _klass_, it will be necessary
+ *  to reimplement +prec+.
+ */
+
+static VALUE
+prec_prec(x, klass)
+    VALUE x, klass;
+{
+    return rb_funcall(klass, prc_if, 1, x);
+}
+
+/*
+ *  call-seq:
+ *    num.prec_i  =>  Integer
+ *
+ *  Returns an +Integer+ converted from _num_. It is equivalent 
+ *  to <code>prec(Integer)</code>.
+ */
+
+static VALUE
+prec_prec_i(x)
+    VALUE x;
+{
+    VALUE klass = rb_cInteger;
+
+    return rb_funcall(x, prc_pr, 1, klass);
+}
+
+/*
+ *  call-seq:
+ *    num.prec_f  =>  Float
+ *
+ *  Returns a +Float+ converted from _num_. It is equivalent 
+ *  to <code>prec(Float)</code>.
+ */
+
+static VALUE
+prec_prec_f(x)
+    VALUE x;
+{
+    VALUE klass = rb_cFloat;
+
+    return rb_funcall(x, prc_pr, 1, klass);
+}
+
+/*
+ * call-seq:
+ *   Mod.induced_from(number)  =>  a_mod
+ * 
+ * Creates an instance of mod from. This method is overridden
+ * by concrete +Numeric+ classes, so that (for example)
+ *
+ *   Fixnum.induced_from(9.9)   #=>  9
+ *
+ * Note that a use of +prec+ in a redefinition may cause
+ * an infinite loop.
+ */
+
+static VALUE
+prec_induced_from(module, x)
+    VALUE module, x;
+{
+    rb_raise(rb_eTypeError, "undefined conversion from %s into %s",
+            rb_obj_classname(x), rb_class2name(module));
+    return Qnil;		/* not reached */
+}
+
+/*
+ * call_seq:
+ *   included
+ *
+ * When the +Precision+ module is mixed-in to a class, this +included+
+ * method is used to add our default +induced_from+ implementation
+ * to the host class.
+ */
+
+static VALUE
+prec_included(module, include)
+    VALUE module, include;
+{
+    switch (TYPE(include)) {
+      case T_CLASS:
+      case T_MODULE:
+       break;
+      default:
+       Check_Type(include, T_CLASS);
+       break;
+    }
+    rb_define_singleton_method(include, "induced_from", prec_induced_from, 1);
+    return module;
+}
+
+/*
+ * Precision is a mixin for concrete numeric classes with
+ * precision.  Here, `precision' means the fineness of approximation
+ * of a real number, so, this module should not be included into
+ * anything which is not a subset of Real (so it should not be
+ * included in classes such as +Complex+ or +Matrix+).
+*/
+
+void
+Init_Precision()
+{
+    rb_mPrecision = rb_define_module("Precision");
+    rb_define_singleton_method(rb_mPrecision, "included", prec_included, 1);
+    rb_define_method(rb_mPrecision, "prec", prec_prec, 1);
+    rb_define_method(rb_mPrecision, "prec_i", prec_prec_i, 0);
+    rb_define_method(rb_mPrecision, "prec_f", prec_prec_f, 0);
+
+    prc_pr = rb_intern("prec");
+    prc_if = rb_intern("induced_from");
+}
diff --git a/ruby_1_8_6/process.c b/ruby_1_8_6/process.c
new file mode 100644
index 0000000000..624aeaefc8
--- /dev/null
+++ b/ruby_1_8_6/process.c
@@ -0,0 +1,3716 @@
+/**********************************************************************
+
+  process.c -
+
+  $Author$
+  $Date$
+  created at: Tue Aug 10 14:30:50 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "rubysig.h"
+#include <stdio.h>
+#include <errno.h>
+#include <signal.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef __DJGPP__
+#include <process.h>
+#endif
+
+#include <time.h>
+#include <ctype.h>
+
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+
+struct timeval rb_time_interval _((VALUE));
+
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+#ifdef HAVE_GETPRIORITY
+# include <sys/resource.h>
+#endif
+#include "st.h"
+
+#ifdef __EMX__
+#undef HAVE_GETPGRP
+#endif
+
+#ifdef HAVE_SYS_TIMES_H
+#include <sys/times.h>
+#endif
+
+#ifdef HAVE_GRP_H
+#include <grp.h>
+#endif
+
+#if defined(HAVE_TIMES) || defined(_WIN32)
+static VALUE S_Tms;
+#endif
+
+#ifndef WIFEXITED
+#define WIFEXITED(w)    (((w) & 0xff) == 0)
+#endif
+#ifndef WIFSIGNALED
+#define WIFSIGNALED(w)  (((w) & 0x7f) > 0 && (((w) & 0x7f) < 0x7f))
+#endif
+#ifndef WIFSTOPPED
+#define WIFSTOPPED(w)   (((w) & 0xff) == 0x7f)
+#endif
+#ifndef WEXITSTATUS
+#define WEXITSTATUS(w)  (((w) >> 8) & 0xff)
+#endif
+#ifndef WTERMSIG
+#define WTERMSIG(w)     ((w) & 0x7f)
+#endif
+#ifndef WSTOPSIG
+#define WSTOPSIG        WEXITSTATUS
+#endif
+
+#if defined(__APPLE__) && ( defined(__MACH__) || defined(__DARWIN__) ) && !defined(__MacOS_X__)
+#define __MacOS_X__ 1
+#endif
+
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
+#define HAVE_44BSD_SETUID 1
+#define HAVE_44BSD_SETGID 1
+#endif
+
+#ifdef __NetBSD__
+#undef HAVE_SETRUID
+#undef HAVE_SETRGID
+#endif
+
+#if defined(__MacOS_X__) || defined(__bsdi__)
+#define BROKEN_SETREUID 1
+#define BROKEN_SETREGID 1
+#endif
+
+#ifdef BROKEN_SETREUID
+#define setreuid ruby_setreuid
+#endif
+#ifdef BROKEN_SETREGID
+#define setregid ruby_setregid
+#endif
+
+#if defined(HAVE_44BSD_SETUID) || defined(__MacOS_X__)
+#if !defined(USE_SETREUID) && !defined(BROKEN_SETREUID)
+#define OBSOLETE_SETREUID 1
+#endif
+#if !defined(USE_SETREGID) && !defined(BROKEN_SETREGID)
+#define OBSOLETE_SETREGID 1
+#endif
+#endif
+
+#define preserving_errno(stmts) \
+	do {int saved_errno = errno; stmts; errno = saved_errno;} while (0)
+
+
+/*
+ *  call-seq:
+ *     Process.pid   => fixnum
+ *
+ *  Returns the process id of this process. Not available on all
+ *  platforms.
+ *
+ *     Process.pid   #=> 27415
+ */
+
+static VALUE
+get_pid()
+{
+    rb_secure(2);
+    return INT2FIX(getpid());
+}
+
+
+/*
+ *  call-seq:
+ *     Process.ppid   => fixnum
+ *
+ *  Returns the process id of the parent of this process. Always
+ *  returns 0 on NT. Not available on all platforms.
+ *
+ *     puts "I am #{Process.pid}"
+ *     Process.fork { puts "Dad is #{Process.ppid}" }
+ *
+ *  <em>produces:</em>
+ *
+ *     I am 27417
+ *     Dad is 27417
+ */
+
+static VALUE
+get_ppid()
+{
+    rb_secure(2);
+#ifdef _WIN32
+    return INT2FIX(0);
+#else
+    return INT2FIX(getppid());
+#endif
+}
+
+
+/*********************************************************************
+ *
+ * Document-class: Process::Status
+ *
+ *  <code>Process::Status</code> encapsulates the information on the
+ *  status of a running or terminated system process. The built-in
+ *  variable <code>$?</code> is either +nil+ or a
+ *  <code>Process::Status</code> object.
+ *
+ *     fork { exit 99 }   #=> 26557
+ *     Process.wait       #=> 26557
+ *     $?.class           #=> Process::Status
+ *     $?.to_i            #=> 25344
+ *     $? >> 8            #=> 99
+ *     $?.stopped?        #=> false
+ *     $?.exited?         #=> true
+ *     $?.exitstatus      #=> 99
+ *
+ *  Posix systems record information on processes using a 16-bit
+ *  integer.  The lower bits record the process status (stopped,
+ *  exited, signaled) and the upper bits possibly contain additional
+ *  information (for example the program's return code in the case of
+ *  exited processes). Pre Ruby 1.8, these bits were exposed directly
+ *  to the Ruby program. Ruby now encapsulates these in a
+ *  <code>Process::Status</code> object. To maximize compatibility,
+ *  however, these objects retain a bit-oriented interface. In the
+ *  descriptions that follow, when we talk about the integer value of
+ *  _stat_, we're referring to this 16 bit value.
+ */
+
+static VALUE rb_cProcStatus;
+VALUE rb_last_status = Qnil;
+
+static void
+last_status_set(status, pid)
+    int status, pid;
+{
+    rb_last_status = rb_obj_alloc(rb_cProcStatus);
+    rb_iv_set(rb_last_status, "status", INT2FIX(status));
+    rb_iv_set(rb_last_status, "pid", INT2FIX(pid));
+}
+
+
+/*
+ *  call-seq:
+ *     stat.to_i     => fixnum
+ *     stat.to_int   => fixnum
+ *
+ *  Returns the bits in _stat_ as a <code>Fixnum</code>. Poking
+ *  around in these bits is platform dependent.
+ *
+ *     fork { exit 0xab }         #=> 26566
+ *     Process.wait               #=> 26566
+ *     sprintf('%04x', $?.to_i)   #=> "ab00"
+ */
+
+static VALUE
+pst_to_i(st)
+    VALUE st;
+{
+    return rb_iv_get(st, "status");
+}
+
+
+/*
+ *  call-seq:
+ *     stat.to_s   => string
+ *
+ *  Equivalent to _stat_<code>.to_i.to_s</code>.
+ */
+
+static VALUE
+pst_to_s(st)
+    VALUE st;
+{
+    return rb_fix2str(pst_to_i(st), 10);
+}
+
+
+/*
+ *  call-seq:
+ *     stat.pid   => fixnum
+ *
+ *  Returns the process ID that this status object represents.
+ *
+ *     fork { exit }   #=> 26569
+ *     Process.wait    #=> 26569
+ *     $?.pid          #=> 26569
+ */
+
+static VALUE
+pst_pid(st)
+    VALUE st;
+{
+    return rb_iv_get(st, "pid");
+}
+
+
+/*
+ *  call-seq:
+ *     stat.inspect   => string
+ *
+ *  Override the inspection method.
+ */
+
+static VALUE
+pst_inspect(st)
+    VALUE st;
+{
+    VALUE pid;
+    int status;
+    VALUE str;
+    char buf[256];
+
+    pid = pst_pid(st);
+    status = NUM2INT(st);
+
+    snprintf(buf, sizeof(buf), "#<%s: pid=%ld", rb_class2name(CLASS_OF(st)), NUM2LONG(pid));
+    str = rb_str_new2(buf);
+    if (WIFSTOPPED(status)) {
+	int stopsig = WSTOPSIG(status);
+	const char *signame = ruby_signal_name(stopsig);
+	if (signame) {
+	    snprintf(buf, sizeof(buf), ",stopped(SIG%s=%d)", signame, stopsig);
+	}
+	else {
+	    snprintf(buf, sizeof(buf), ",stopped(%d)", stopsig);
+	}
+	rb_str_cat2(str, buf);
+    }
+    if (WIFSIGNALED(status)) {
+	int termsig = WTERMSIG(status);
+	const char *signame = ruby_signal_name(termsig);
+	if (signame) {
+	    snprintf(buf, sizeof(buf), ",signaled(SIG%s=%d)", signame, termsig);
+	}
+	else {
+	    snprintf(buf, sizeof(buf), ",signaled(%d)", termsig);
+	}
+	rb_str_cat2(str, buf);
+    }
+    if (WIFEXITED(status)) {
+	snprintf(buf, sizeof(buf), ",exited(%d)", WEXITSTATUS(status));
+	rb_str_cat2(str, buf);
+    }
+#ifdef WCOREDUMP
+    if (WCOREDUMP(status)) {
+	rb_str_cat2(str, ",coredumped");
+    }
+#endif
+    rb_str_cat2(str, ">");
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     stat == other   => true or false
+ *
+ *  Returns +true+ if the integer value of _stat_
+ *  equals <em>other</em>.
+ */
+
+static VALUE
+pst_equal(st1, st2)
+    VALUE st1, st2;
+{
+    if (st1 == st2) return Qtrue;
+    return rb_equal(pst_to_i(st1), st2);
+}
+
+
+/*
+ *  call-seq:
+ *     stat & num   => fixnum
+ *
+ *  Logical AND of the bits in _stat_ with <em>num</em>.
+ *
+ *     fork { exit 0x37 }
+ *     Process.wait
+ *     sprintf('%04x', $?.to_i)       #=> "3700"
+ *     sprintf('%04x', $? & 0x1e00)   #=> "1600"
+ */
+
+static VALUE
+pst_bitand(st1, st2)
+    VALUE st1, st2;
+{
+    int status = NUM2INT(st1) & NUM2INT(st2);
+
+    return INT2NUM(status);
+}
+
+
+/*
+ *  call-seq:
+ *     stat >> num   => fixnum
+ *
+ *  Shift the bits in _stat_ right <em>num</em> places.
+ *
+ *     fork { exit 99 }   #=> 26563
+ *     Process.wait       #=> 26563
+ *     $?.to_i            #=> 25344
+ *     $? >> 8            #=> 99
+ */
+
+static VALUE
+pst_rshift(st1, st2)
+    VALUE st1, st2;
+{
+    int status = NUM2INT(st1) >> NUM2INT(st2);
+
+    return INT2NUM(status);
+}
+
+
+/*
+ *  call-seq:
+ *     stat.stopped?   => true or false
+ *
+ *  Returns +true+ if this process is stopped. This is only
+ *  returned if the corresponding <code>wait</code> call had the
+ *  <code>WUNTRACED</code> flag set.
+ */
+
+static VALUE
+pst_wifstopped(st)
+    VALUE st;
+{
+    int status = NUM2INT(st);
+
+    if (WIFSTOPPED(status))
+	return Qtrue;
+    else
+	return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     stat.stopsig   => fixnum or nil
+ *
+ *  Returns the number of the signal that caused _stat_ to stop
+ *  (or +nil+ if self is not stopped).
+ */
+
+static VALUE
+pst_wstopsig(st)
+    VALUE st;
+{
+    int status = NUM2INT(st);
+
+    if (WIFSTOPPED(status))
+	return INT2NUM(WSTOPSIG(status));
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     stat.signaled?   => true or false
+ *
+ *  Returns +true+ if _stat_ terminated because of
+ *  an uncaught signal.
+ */
+
+static VALUE
+pst_wifsignaled(st)
+    VALUE st;
+{
+    int status = NUM2INT(st);
+
+    if (WIFSIGNALED(status))
+	return Qtrue;
+    else
+	return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     stat.termsig   => fixnum or nil
+ *
+ *  Returns the number of the signal that caused _stat_ to
+ *  terminate (or +nil+ if self was not terminated by an
+ *  uncaught signal).
+ */
+
+static VALUE
+pst_wtermsig(st)
+    VALUE st;
+{
+    int status = NUM2INT(st);
+
+    if (WIFSIGNALED(status))
+	return INT2NUM(WTERMSIG(status));
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     stat.exited?   => true or false
+ *
+ *  Returns +true+ if _stat_ exited normally (for
+ *  example using an <code>exit()</code> call or finishing the
+ *  program).
+ */
+
+static VALUE
+pst_wifexited(st)
+    VALUE st;
+{
+    int status = NUM2INT(st);
+
+    if (WIFEXITED(status))
+	return Qtrue;
+    else
+	return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     stat.exitstatus   => fixnum or nil
+ *
+ *  Returns the least significant eight bits of the return code of
+ *  _stat_. Only available if <code>exited?</code> is
+ *  +true+.
+ *
+ *     fork { }           #=> 26572
+ *     Process.wait       #=> 26572
+ *     $?.exited?         #=> true
+ *     $?.exitstatus      #=> 0
+ *
+ *     fork { exit 99 }   #=> 26573
+ *     Process.wait       #=> 26573
+ *     $?.exited?         #=> true
+ *     $?.exitstatus      #=> 99
+ */
+
+static VALUE
+pst_wexitstatus(st)
+    VALUE st;
+{
+    int status = NUM2INT(st);
+
+    if (WIFEXITED(status))
+	return INT2NUM(WEXITSTATUS(status));
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     stat.success?   => true, false or nil
+ *
+ *  Returns +true+ if _stat_ is successful, +false+ if not.
+ *  Returns +nil+ if <code>exited?</code> is not +true+.
+ */
+
+static VALUE
+pst_success_p(st)
+    VALUE st;
+{
+    int status = NUM2INT(st);
+
+    if (!WIFEXITED(status))
+	return Qnil;
+    return WEXITSTATUS(status) == EXIT_SUCCESS ? Qtrue : Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     stat.coredump?   => true or false
+ *
+ *  Returns +true+ if _stat_ generated a coredump
+ *  when it terminated. Not available on all platforms.
+ */
+
+static VALUE
+pst_wcoredump(st)
+    VALUE st;
+{
+#ifdef WCOREDUMP
+    int status = NUM2INT(st);
+
+    if (WCOREDUMP(status))
+	return Qtrue;
+    else
+	return Qfalse;
+#else
+    return Qfalse;
+#endif
+}
+
+#if !defined(HAVE_WAITPID) && !defined(HAVE_WAIT4)
+#define NO_WAITPID
+static st_table *pid_tbl;
+#endif
+
+int
+rb_waitpid(pid, st, flags)
+    int pid;
+    int *st;
+    int flags;
+{
+    int result;
+#ifndef NO_WAITPID
+    int oflags = flags;
+    if (!rb_thread_alone()) {	/* there're other threads to run */
+	flags |= WNOHANG;
+    }
+
+  retry:
+    TRAP_BEG;
+#ifdef HAVE_WAITPID
+    result = waitpid(pid, st, flags);
+#else  /* HAVE_WAIT4 */
+    result = wait4(pid, st, flags, NULL);
+#endif
+    TRAP_END;
+    if (result < 0) {
+	if (errno == EINTR) {
+	    rb_thread_polling();
+	    goto retry;
+	}
+	return -1;
+    }
+    if (result == 0) {
+	if (oflags & WNOHANG) return 0;
+	rb_thread_polling();
+	if (rb_thread_alone()) flags = oflags;
+	goto retry;
+    }
+#else  /* NO_WAITPID */
+    if (pid_tbl && st_lookup(pid_tbl, pid, st)) {
+	last_status_set(*st, pid);
+	st_delete(pid_tbl, (st_data_t*)&pid, NULL);
+	return pid;
+    }
+
+    if (flags) {
+	rb_raise(rb_eArgError, "can't do waitpid with flags");
+    }
+
+    for (;;) {
+	TRAP_BEG;
+	result = wait(st);
+	TRAP_END;
+	if (result < 0) {
+	    if (errno == EINTR) {
+		rb_thread_schedule();
+		continue;
+	    }
+	    return -1;
+	}
+	if (result == pid) {
+	    break;
+	}
+	if (!pid_tbl)
+	    pid_tbl = st_init_numtable();
+	st_insert(pid_tbl, pid, st);
+	if (!rb_thread_alone()) rb_thread_schedule();
+    }
+#endif
+    if (result > 0) {
+	last_status_set(*st, result);
+    }
+    return result;
+}
+
+#ifdef NO_WAITPID
+struct wait_data {
+    int pid;
+    int status;
+};
+
+static int
+wait_each(pid, status, data)
+    int pid, status;
+    struct wait_data *data;
+{
+    if (data->status != -1) return ST_STOP;
+
+    data->pid = pid;
+    data->status = status;
+    return ST_DELETE;
+}
+
+static int
+waitall_each(pid, status, ary)
+    int pid, status;
+    VALUE ary;
+{
+    last_status_set(status, pid);
+    rb_ary_push(ary, rb_assoc_new(INT2NUM(pid), rb_last_status));
+    return ST_DELETE;
+}
+#endif
+
+
+/* [MG]:FIXME: I wasn't sure how this should be done, since ::wait()
+   has historically been documented as if it didn't take any arguments
+   despite the fact that it's just an alias for ::waitpid(). The way I
+   have it below is more truthful, but a little confusing.
+
+   I also took the liberty of putting in the pid values, as they're
+   pretty useful, and it looked as if the original 'ri' output was
+   supposed to contain them after "[...]depending on the value of
+   aPid:".
+
+   The 'ansi' and 'bs' formats of the ri output don't display the
+   definition list for some reason, but the plain text one does.
+ */
+
+/*
+ *  call-seq:
+ *     Process.wait()                     => fixnum
+ *     Process.wait(pid=-1, flags=0)      => fixnum
+ *     Process.waitpid(pid=-1, flags=0)   => fixnum
+ *
+ *  Waits for a child process to exit, returns its process id, and
+ *  sets <code>$?</code> to a <code>Process::Status</code> object
+ *  containing information on that process. Which child it waits on
+ *  depends on the value of _pid_:
+ *
+ *  > 0::   Waits for the child whose process ID equals _pid_.
+ *
+ *  0::     Waits for any child whose process group ID equals that of the
+ *          calling process.
+ *
+ *  -1::    Waits for any child process (the default if no _pid_ is
+ *          given).
+ *
+ *  < -1::  Waits for any child whose process group ID equals the absolute
+ *          value of _pid_.
+ *
+ *  The _flags_ argument may be a logical or of the flag values
+ *  <code>Process::WNOHANG</code> (do not block if no child available)
+ *  or <code>Process::WUNTRACED</code> (return stopped children that
+ *  haven't been reported). Not all flags are available on all
+ *  platforms, but a flag value of zero will work on all platforms.
+ *
+ *  Calling this method raises a <code>SystemError</code> if there are
+ *  no child processes. Not available on all platforms.
+ *
+ *     include Process
+ *     fork { exit 99 }                 #=> 27429
+ *     wait                             #=> 27429
+ *     $?.exitstatus                    #=> 99
+ *
+ *     pid = fork { sleep 3 }           #=> 27440
+ *     Time.now                         #=> Wed Apr 09 08:57:09 CDT 2003
+ *     waitpid(pid, Process::WNOHANG)   #=> nil
+ *     Time.now                         #=> Wed Apr 09 08:57:09 CDT 2003
+ *     waitpid(pid, 0)                  #=> 27440
+ *     Time.now                         #=> Wed Apr 09 08:57:12 CDT 2003
+ */
+
+static VALUE
+proc_wait(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE vpid, vflags;
+    int pid, flags, status;
+
+    rb_secure(2);
+    flags = 0;
+    rb_scan_args(argc, argv, "02", &vpid, &vflags);
+    if (argc == 0) {
+	pid = -1;
+    }
+    else {
+	pid = NUM2INT(vpid);
+	if (argc == 2 && !NIL_P(vflags)) {
+	    flags = NUM2UINT(vflags);
+	}
+    }
+    if ((pid = rb_waitpid(pid, &status, flags)) < 0)
+	rb_sys_fail(0);
+    if (pid == 0) {
+	return rb_last_status = Qnil;
+    }
+    return INT2FIX(pid);
+}
+
+
+/*
+ *  call-seq:
+ *     Process.wait2(pid=-1, flags=0)      => [pid, status]
+ *     Process.waitpid2(pid=-1, flags=0)   => [pid, status]
+ *
+ *  Waits for a child process to exit (see Process::waitpid for exact
+ *  semantics) and returns an array containing the process id and the
+ *  exit status (a <code>Process::Status</code> object) of that
+ *  child. Raises a <code>SystemError</code> if there are no child
+ *  processes.
+ *
+ *     Process.fork { exit 99 }   #=> 27437
+ *     pid, status = Process.wait2
+ *     pid                        #=> 27437
+ *     status.exitstatus          #=> 99
+ */
+
+static VALUE
+proc_wait2(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE pid = proc_wait(argc, argv);
+    if (NIL_P(pid)) return Qnil;
+    return rb_assoc_new(pid, rb_last_status);
+}
+
+
+/*
+ *  call-seq:
+ *     Process.waitall   => [ [pid1,status1], ...]
+ *
+ *  Waits for all children, returning an array of
+ *  _pid_/_status_ pairs (where _status_ is a
+ *  <code>Process::Status</code> object).
+ *
+ *     fork { sleep 0.2; exit 2 }   #=> 27432
+ *     fork { sleep 0.1; exit 1 }   #=> 27433
+ *     fork {            exit 0 }   #=> 27434
+ *     p Process.waitall
+ *
+ *  <em>produces</em>:
+ *
+ *     [[27434, #<Process::Status: pid=27434,exited(0)>],
+ *      [27433, #<Process::Status: pid=27433,exited(1)>],
+ *      [27432, #<Process::Status: pid=27432,exited(2)>]]
+ */
+
+static VALUE
+proc_waitall()
+{
+    VALUE result;
+    int pid, status;
+
+    rb_secure(2);
+    result = rb_ary_new();
+#ifdef NO_WAITPID
+    if (pid_tbl) {
+	st_foreach(pid_tbl, waitall_each, result);
+    }
+
+    for (pid = -1;;) {
+	pid = wait(&status);
+	if (pid == -1) {
+	    if (errno == ECHILD)
+		break;
+	    if (errno == EINTR) {
+		rb_thread_schedule();
+		continue;
+	    }
+	    rb_sys_fail(0);
+	}
+	last_status_set(status, pid);
+	rb_ary_push(result, rb_assoc_new(INT2NUM(pid), rb_last_status));
+    }
+#else
+    rb_last_status = Qnil;
+    for (pid = -1;;) {
+	pid = rb_waitpid(-1, &status, 0);
+	if (pid == -1) {
+	    if (errno == ECHILD)
+		break;
+	    rb_sys_fail(0);
+	}
+	rb_ary_push(result, rb_assoc_new(INT2NUM(pid), rb_last_status));
+    }
+#endif
+    return result;
+}
+
+static VALUE
+detach_process_watcher(pid_p)
+    int *pid_p;
+{
+    int cpid, status;
+
+    for (;;) {
+	cpid = rb_waitpid(*pid_p, &status, WNOHANG);
+	if (cpid != 0) return Qnil;
+	rb_thread_sleep(1);
+    }
+}
+
+VALUE
+rb_detach_process(pid)
+    int pid;
+{
+    return rb_thread_create(detach_process_watcher, (void*)&pid);
+}
+
+
+/*
+ *  call-seq:
+ *     Process.detach(pid)   => thread
+ *
+ *  Some operating systems retain the status of terminated child
+ *  processes until the parent collects that status (normally using
+ *  some variant of <code>wait()</code>. If the parent never collects
+ *  this status, the child stays around as a <em>zombie</em> process.
+ *  <code>Process::detach</code> prevents this by setting up a
+ *  separate Ruby thread whose sole job is to reap the status of the
+ *  process _pid_ when it terminates. Use <code>detach</code>
+ *  only when you do not intent to explicitly wait for the child to
+ *  terminate.  <code>detach</code> only checks the status
+ *  periodically (currently once each second).
+ *
+ *  In this first example, we don't reap the first child process, so
+ *  it appears as a zombie in the process status display.
+ *
+ *     p1 = fork { sleep 0.1 }
+ *     p2 = fork { sleep 0.2 }
+ *     Process.waitpid(p2)
+ *     sleep 2
+ *     system("ps -ho pid,state -p #{p1}")
+ *
+ *  <em>produces:</em>
+ *
+ *     27389 Z
+ *
+ *  In the next example, <code>Process::detach</code> is used to reap
+ *  the child automatically.
+ *
+ *     p1 = fork { sleep 0.1 }
+ *     p2 = fork { sleep 0.2 }
+ *     Process.detach(p1)
+ *     Process.waitpid(p2)
+ *     sleep 2
+ *     system("ps -ho pid,state -p #{p1}")
+ *
+ *  <em>(produces no output)</em>
+ */
+
+static VALUE
+proc_detach(VALUE obj, VALUE pid)
+{
+    rb_secure(2);
+    return rb_detach_process(NUM2INT(pid));
+}
+
+#ifndef HAVE_STRING_H
+char *strtok();
+#endif
+
+#ifdef HAVE_SETITIMER
+#define before_exec() rb_thread_stop_timer()
+#define after_exec() rb_thread_start_timer()
+#else
+#define before_exec()
+#define after_exec()
+#endif
+
+extern char *dln_find_exe();
+
+static void
+security(str)
+    char *str;
+{
+    if (rb_env_path_tainted()) {
+	if (rb_safe_level() > 0) {
+	    rb_raise(rb_eSecurityError, "Insecure PATH - %s", str);
+	}
+    }
+}
+
+static int
+proc_exec_v(argv, prog)
+    char **argv;
+    char *prog;
+{
+    if (!prog)
+	prog = argv[0];
+    security(prog);
+    prog = dln_find_exe(prog, 0);
+    if (!prog)
+	return -1;
+
+#if (defined(MSDOS) && !defined(DJGPP)) || defined(__human68k__) || defined(__EMX__) || defined(OS2)
+    {
+#if defined(__human68k__)
+#define COMMAND "command.x"
+#endif
+#if defined(__EMX__) || defined(OS2) /* OS/2 emx */
+#define COMMAND "cmd.exe"
+#endif
+#if (defined(MSDOS) && !defined(DJGPP))
+#define COMMAND "command.com"
+#endif
+	char *extension;
+
+	if ((extension = strrchr(prog, '.')) != NULL && strcasecmp(extension, ".bat") == 0) {
+	    char **new_argv;
+	    char *p;
+	    int n;
+
+	    for (n = 0; argv[n]; n++)
+		/* no-op */;
+	    new_argv = ALLOCA_N(char*, n + 2);
+	    for (; n > 0; n--)
+		new_argv[n + 1] = argv[n];
+	    new_argv[1] = strcpy(ALLOCA_N(char, strlen(argv[0]) + 1), argv[0]);
+	    for (p = new_argv[1]; *p != '\0'; p++)
+		if (*p == '/')
+		    *p = '\\';
+	    new_argv[0] = COMMAND;
+	    argv = new_argv;
+	    prog = dln_find_exe(argv[0], 0);
+	    if (!prog) {
+		errno = ENOENT;
+		return -1;
+	    }
+	}
+    }
+#endif /* MSDOS or __human68k__ or __EMX__ */
+    before_exec();
+    rb_thread_cancel_timer();
+    execv(prog, argv);
+    preserving_errno(after_exec());
+    return -1;
+}
+
+static int
+proc_exec_n(argc, argv, progv)
+    int argc;
+    VALUE *argv;
+    VALUE progv;
+{
+    char *prog = 0;
+    char **args;
+    int i;
+
+    if (progv) {
+	prog = RSTRING(progv)->ptr;
+    }
+    args = ALLOCA_N(char*, argc+1);
+    for (i=0; i<argc; i++) {
+	SafeStringValue(argv[i]);
+	args[i] = RSTRING(argv[i])->ptr;
+    }
+    args[i] = 0;
+    if (args[0]) {
+	return proc_exec_v(args, prog);
+    }
+    return -1;
+}
+
+int
+rb_proc_exec(str)
+    const char *str;
+{
+    const char *s = str;
+    char *ss, *t;
+    char **argv, **a;
+
+    while (*str && ISSPACE(*str))
+	str++;
+
+#ifdef _WIN32
+    before_exec();
+    do_spawn(P_OVERLAY, (char *)str);
+    after_exec();
+#else
+    for (s=str; *s; s++) {
+	if (*s != ' ' && !ISALPHA(*s) && strchr("*?{}[]<>()~&|\\$;'`\"\n",*s)) {
+#if defined(MSDOS)
+	    int status;
+	    before_exec();
+	    status = system(str);
+	    after_exec();
+	    if (status != -1)
+		exit(status);
+#else
+#if defined(__human68k__) || defined(__CYGWIN32__) || defined(__EMX__)
+	    char *shell = dln_find_exe("sh", 0);
+	    int status = -1;
+	    before_exec();
+	    if (shell)
+		execl(shell, "sh", "-c", str, (char *) NULL);
+	    else
+		status = system(str);
+	    after_exec();
+	    if (status != -1)
+		exit(status);
+#else
+	    before_exec();
+	    execl("/bin/sh", "sh", "-c", str, (char *)NULL);
+	    preserving_errno(after_exec());
+#endif
+#endif
+	    return -1;
+	}
+    }
+    a = argv = ALLOCA_N(char*, (s-str)/2+2);
+    ss = ALLOCA_N(char, s-str+1);
+    strcpy(ss, str);
+    if (*a++ = strtok(ss, " \t")) {
+	while (t = strtok(NULL, " \t")) {
+	    *a++ = t;
+	}
+	*a = NULL;
+    }
+    if (argv[0]) {
+	return proc_exec_v(argv, 0);
+    }
+    errno = ENOENT;
+#endif	/* _WIN32 */
+    return -1;
+}
+
+#if defined(__human68k__) || defined(__DJGPP__) || defined(_WIN32)
+static int
+proc_spawn_v(argv, prog)
+    char **argv;
+    char *prog;
+{
+    char *extension;
+    int status;
+
+    if (!prog)
+	prog = argv[0];
+    security(prog);
+    prog = dln_find_exe(prog, 0);
+    if (!prog)
+	return -1;
+
+#if defined(__human68k__)
+    if ((extension = strrchr(prog, '.')) != NULL && strcasecmp(extension, ".bat") == 0) {
+	char **new_argv;
+	char *p;
+	int n;
+
+	for (n = 0; argv[n]; n++)
+	    /* no-op */;
+	new_argv = ALLOCA_N(char*, n + 2);
+	for (; n > 0; n--)
+	    new_argv[n + 1] = argv[n];
+	new_argv[1] = strcpy(ALLOCA_N(char, strlen(argv[0]) + 1), argv[0]);
+	for (p = new_argv[1]; *p != '\0'; p++)
+	    if (*p == '/')
+		*p = '\\';
+	new_argv[0] = COMMAND;
+	argv = new_argv;
+	prog = dln_find_exe(argv[0], 0);
+	if (!prog) {
+	    errno = ENOENT;
+	    return -1;
+	}
+    }
+#endif
+    before_exec();
+#if defined(_WIN32)
+    status = do_aspawn(P_WAIT, prog, argv);
+#else
+    status = spawnv(P_WAIT, prog, argv);
+#endif
+    after_exec();
+    return status;
+}
+
+static int
+proc_spawn_n(argc, argv, prog)
+    int argc;
+    VALUE *argv;
+    VALUE prog;
+{
+    char **args;
+    int i;
+
+    args = ALLOCA_N(char*, argc + 1);
+    for (i = 0; i < argc; i++) {
+	SafeStringValue(argv[i]);
+	args[i] = StringValueCStr(argv[i]);
+    }
+    if (prog)
+	SafeStringValue(prog);
+    args[i] = (char*) 0;
+    if (args[0])
+	return proc_spawn_v(args, prog ? StringValueCStr(prog) : 0);
+    return -1;
+}
+
+#if !defined(_WIN32)
+static int
+proc_spawn(sv)
+    VALUE sv;
+{
+    char *str;
+    char *s, *t;
+    char **argv, **a;
+    int status;
+
+    SafeStringValue(sv);
+    str = s = StringValueCStr(sv);
+    for (s = str; *s; s++) {
+	if (*s != ' ' && !ISALPHA(*s) && strchr("*?{}[]<>()~&|\\$;'`\"\n",*s)) {
+	    char *shell = dln_find_exe("sh", 0);
+	    before_exec();
+	    status = shell?spawnl(P_WAIT,shell,"sh","-c",str,(char*)NULL):system(str);
+	    after_exec();
+	    return status;
+	}
+    }
+    a = argv = ALLOCA_N(char*, (s - str) / 2 + 2);
+    s = ALLOCA_N(char, s - str + 1);
+    strcpy(s, str);
+    if (*a++ = strtok(s, " \t")) {
+	while (t = strtok(NULL, " \t"))
+	    *a++ = t;
+	*a = NULL;
+    }
+    return argv[0] ? proc_spawn_v(argv, 0) : -1;
+}
+#endif
+#endif
+
+/*
+ *  call-seq:
+ *     exec(command [, arg, ...])
+ *
+ *  Replaces the current process by running the given external _command_.
+ *  If +exec+ is given a single argument, that argument is
+ *  taken as a line that is subject to shell expansion before being
+ *  executed. If multiple arguments are given, the second and subsequent
+ *  arguments are passed as parameters to _command_ with no shell
+ *  expansion. If the first argument is a two-element array, the first
+ *  element is the command to be executed, and the second argument is
+ *  used as the <code>argv[0]</code> value, which may show up in process
+ *  listings. In MSDOS environments, the command is executed in a
+ *  subshell; otherwise, one of the <code>exec(2)</code> system calls is
+ *  used, so the running command may inherit some of the environment of
+ *  the original program (including open file descriptors).
+ *
+ *     exec "echo *"       # echoes list of files in current directory
+ *     # never get here
+ *
+ *
+ *     exec "echo", "*"    # echoes an asterisk
+ *     # never get here
+ */
+
+VALUE
+rb_f_exec(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE prog = 0;
+    VALUE tmp;
+
+    if (argc == 0) {
+	rb_raise(rb_eArgError, "wrong number of arguments");
+    }
+
+    tmp = rb_check_array_type(argv[0]);
+    if (!NIL_P(tmp)) {
+	if (RARRAY(tmp)->len != 2) {
+	    rb_raise(rb_eArgError, "wrong first argument");
+	}
+	prog = RARRAY(tmp)->ptr[0];
+	argv[0] = RARRAY(tmp)->ptr[1];
+	SafeStringValue(prog);
+    }
+    if (argc == 1 && prog == 0) {
+	VALUE cmd = argv[0];
+
+	SafeStringValue(cmd);
+	rb_proc_exec(RSTRING(cmd)->ptr);
+    }
+    else {
+	proc_exec_n(argc, argv, prog);
+    }
+    rb_sys_fail(RSTRING(argv[0])->ptr);
+    return Qnil;		/* dummy */
+}
+
+
+/*
+ *  call-seq:
+ *     Kernel.fork  [{ block }]   => fixnum or nil
+ *     Process.fork [{ block }]   => fixnum or nil
+ *
+ *  Creates a subprocess. If a block is specified, that block is run
+ *  in the subprocess, and the subprocess terminates with a status of
+ *  zero. Otherwise, the +fork+ call returns twice, once in
+ *  the parent, returning the process ID of the child, and once in
+ *  the child, returning _nil_. The child process can exit using
+ *  <code>Kernel.exit!</code> to avoid running any
+ *  <code>at_exit</code> functions. The parent process should
+ *  use <code>Process.wait</code> to collect the termination statuses
+ *  of its children or use <code>Process.detach</code> to register
+ *  disinterest in their status; otherwise, the operating system
+ *  may accumulate zombie processes.
+ *
+ *  The thread calling fork is the only thread in the created child process.
+ *  fork doesn't copy other threads.
+ */
+
+static VALUE
+rb_f_fork(obj)
+    VALUE obj;
+{
+#if !defined(__human68k__) && !defined(_WIN32) && !defined(__MACOS__) && !defined(__EMX__) && !defined(__VMS)
+    int pid;
+
+    rb_secure(2);
+
+#ifndef __VMS
+    fflush(stdout);
+    fflush(stderr);
+#endif
+
+    switch (pid = fork()) {
+      case 0:
+#ifdef linux
+	after_exec();
+#endif
+	rb_thread_atfork();
+	if (rb_block_given_p()) {
+	    int status;
+
+	    rb_protect(rb_yield, Qundef, &status);
+	    ruby_stop(status);
+	}
+	return Qnil;
+
+      case -1:
+	rb_sys_fail("fork(2)");
+	return Qnil;
+
+      default:
+	return INT2FIX(pid);
+    }
+#else
+    rb_notimplement();
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process.exit!(fixnum=-1)
+ *
+ *  Exits the process immediately. No exit handlers are
+ *  run. <em>fixnum</em> is returned to the underlying system as the
+ *  exit status.
+ *
+ *     Process.exit!(0)
+ */
+
+static VALUE
+rb_f_exit_bang(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE status;
+    int istatus;
+
+    rb_secure(4);
+    if (rb_scan_args(argc, argv, "01", &status) == 1) {
+	switch (status) {
+	  case Qtrue:
+	    istatus = EXIT_SUCCESS;
+	    break;
+	  case Qfalse:
+	    istatus = EXIT_FAILURE;
+	    break;
+	  default:
+	    istatus = NUM2INT(status);
+	    break;
+	}
+    }
+    else {
+	istatus = EXIT_FAILURE;
+    }
+    _exit(istatus);
+
+    return Qnil;		/* not reached */
+}
+
+#if defined(sun)
+#define signal(a,b) sigset(a,b)
+#endif
+
+void
+rb_syswait(pid)
+    int pid;
+{
+    static int overriding;
+#ifdef SIGHUP
+    RETSIGTYPE (*hfunc)_((int));
+#endif
+#ifdef SIGQUIT
+    RETSIGTYPE (*qfunc)_((int));
+#endif
+    RETSIGTYPE (*ifunc)_((int));
+    int status;
+    int i, hooked = Qfalse;
+
+    if (!overriding) {
+#ifdef SIGHUP
+	hfunc = signal(SIGHUP, SIG_IGN);
+#endif
+#ifdef SIGQUIT
+	qfunc = signal(SIGQUIT, SIG_IGN);
+#endif
+	ifunc = signal(SIGINT, SIG_IGN);
+	overriding = Qtrue;
+	hooked = Qtrue;
+    }
+
+    do {
+	i = rb_waitpid(pid, &status, 0);
+    } while (i == -1 && errno == EINTR);
+
+    if (hooked) {
+#ifdef SIGHUP
+	signal(SIGHUP, hfunc);
+#endif
+#ifdef SIGQUIT
+	signal(SIGQUIT, qfunc);
+#endif
+	signal(SIGINT, ifunc);
+	overriding = Qfalse;
+    }
+}
+
+/*
+ *  call-seq:
+ *     system(cmd [, arg, ...])    => true or false
+ *
+ *  Executes _cmd_ in a subshell, returning +true+ if
+ *  the command was found and ran successfully, +false+
+ *  otherwise. An error status is available in <code>$?</code>. The
+ *  arguments are processed in the same way as for
+ *  <code>Kernel::exec</code>.
+ *
+ *     system("echo *")
+ *     system("echo", "*")
+ *
+ *  <em>produces:</em>
+ *
+ *     config.h main.rb
+ *     *
+ */
+
+static VALUE
+rb_f_system(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    int status;
+#if defined(__EMX__)
+    VALUE cmd;
+
+    fflush(stdout);
+    fflush(stderr);
+    if (argc == 0) {
+	rb_last_status = Qnil;
+	rb_raise(rb_eArgError, "wrong number of arguments");
+    }
+
+    if (TYPE(argv[0]) == T_ARRAY) {
+	if (RARRAY(argv[0])->len != 2) {
+	    rb_raise(rb_eArgError, "wrong first argument");
+	}
+	argv[0] = RARRAY(argv[0])->ptr[0];
+    }
+    cmd = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
+
+    SafeStringValue(cmd);
+    status = do_spawn(RSTRING(cmd)->ptr);
+    last_status_set(status, 0);
+#elif defined(__human68k__) || defined(__DJGPP__) || defined(_WIN32)
+    volatile VALUE prog = 0;
+
+    fflush(stdout);
+    fflush(stderr);
+    if (argc == 0) {
+	rb_last_status = Qnil;
+	rb_raise(rb_eArgError, "wrong number of arguments");
+    }
+
+    if (TYPE(argv[0]) == T_ARRAY) {
+	if (RARRAY(argv[0])->len != 2) {
+	    rb_raise(rb_eArgError, "wrong first argument");
+	}
+	prog = RARRAY(argv[0])->ptr[0];
+	argv[0] = RARRAY(argv[0])->ptr[1];
+    }
+
+    if (argc == 1 && prog == 0) {
+#if defined(_WIN32)
+	SafeStringValue(argv[0]);
+	status = do_spawn(P_WAIT, StringValueCStr(argv[0]));
+#else
+	status = proc_spawn(argv[0]);
+#endif
+    }
+    else {
+	status = proc_spawn_n(argc, argv, prog);
+    }
+#if !defined(_WIN32)
+    last_status_set(status == -1 ? 127 : status, 0);
+#endif
+#elif defined(__VMS)
+    VALUE cmd;
+
+    if (argc == 0) {
+	rb_last_status = Qnil;
+	rb_raise(rb_eArgError, "wrong number of arguments");
+    }
+
+    if (TYPE(argv[0]) == T_ARRAY) {
+	if (RARRAY(argv[0])->len != 2) {
+	    rb_raise(rb_eArgError, "wrong first argument");
+	}
+	argv[0] = RARRAY(argv[0])->ptr[0];
+    }
+    cmd = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
+
+    SafeStringValue(cmd);
+    status = system(StringValueCStr(cmd));
+    last_status_set((status & 0xff) << 8, 0);
+#else
+    volatile VALUE prog = 0;
+    int pid;
+    int i;
+    RETSIGTYPE (*chfunc)(int);
+
+    fflush(stdout);
+    fflush(stderr);
+    if (argc == 0) {
+	rb_last_status = Qnil;
+	rb_raise(rb_eArgError, "wrong number of arguments");
+    }
+
+    if (TYPE(argv[0]) == T_ARRAY) {
+	if (RARRAY(argv[0])->len != 2) {
+	    rb_raise(rb_eArgError, "wrong first argument");
+	}
+	prog = RARRAY(argv[0])->ptr[0];
+	argv[0] = RARRAY(argv[0])->ptr[1];
+    }
+
+    if (prog) {
+	SafeStringValue(prog);
+	StringValueCStr(prog);
+    }
+    for (i = 0; i < argc; i++) {
+	SafeStringValue(argv[i]);
+	StringValueCStr(argv[i]);
+    }
+    security(RSTRING(prog ? prog : argv[0])->ptr);
+    chfunc = signal(SIGCHLD, SIG_DFL);
+  retry:
+    pid = fork();
+    if (pid == 0) {
+	/* child process */
+	if (argc == 1 && prog == 0) {
+	    rb_proc_exec(RSTRING(argv[0])->ptr);
+	}
+	else {
+	    proc_exec_n(argc, argv, prog);
+	}
+	_exit(127);
+    }
+    if (pid < 0) {
+	if (errno == EAGAIN) {
+	    rb_thread_sleep(1);
+	    goto retry;
+	}
+    }
+    else {
+	rb_syswait(pid);
+    }
+    signal(SIGCHLD, chfunc);
+    if (pid < 0) rb_sys_fail(0);
+    status = NUM2INT(rb_last_status);
+#endif
+
+    if (status == EXIT_SUCCESS) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     sleep([duration])    => fixnum
+ *
+ *  Suspends the current thread for _duration_ seconds (which may be any number,
+ *  including a +Float+ with fractional seconds). Returns the actual number of
+ *  seconds slept (rounded), which may be less than that asked for if another
+ *  thread calls <code>Thread#run</code>. Zero arguments causes +sleep+ to sleep
+ *  forever.
+ *
+ *     Time.new    #=> Wed Apr 09 08:56:32 CDT 2003
+ *     sleep 1.2   #=> 1
+ *     Time.new    #=> Wed Apr 09 08:56:33 CDT 2003
+ *     sleep 1.9   #=> 2
+ *     Time.new    #=> Wed Apr 09 08:56:35 CDT 2003
+ */
+
+static VALUE
+rb_f_sleep(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    int beg, end;
+
+    beg = time(0);
+    if (argc == 0) {
+	rb_thread_sleep_forever();
+    }
+    else if (argc == 1) {
+	rb_thread_wait_for(rb_time_interval(argv[0]));
+    }
+    else {
+	rb_raise(rb_eArgError, "wrong number of arguments");
+    }
+
+    end = time(0) - beg;
+
+    return INT2FIX(end);
+}
+
+
+/*
+ *  call-seq:
+ *     Process.getpgrp   => integer
+ *
+ *  Returns the process group ID for this process. Not available on
+ *  all platforms.
+ *
+ *     Process.getpgid(0)   #=> 25527
+ *     Process.getpgrp      #=> 25527
+ */
+
+#if defined(SIGCLD) && !defined(SIGCHLD)
+# define SIGCHLD SIGCLD
+#endif
+
+static VALUE
+proc_getpgrp()
+{
+    int pgrp;
+
+    rb_secure(2);
+#if defined(HAVE_GETPGRP) && defined(GETPGRP_VOID)
+    pgrp = getpgrp();
+    if (pgrp < 0) rb_sys_fail(0);
+    return INT2FIX(pgrp);
+#else
+# ifdef HAVE_GETPGID
+    pgrp = getpgid(0);
+    if (pgrp < 0) rb_sys_fail(0);
+    return INT2FIX(pgrp);
+# else
+    rb_notimplement();
+# endif
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process.setpgrp   => 0
+ *
+ *  Equivalent to <code>setpgid(0,0)</code>. Not available on all
+ *  platforms.
+ */
+
+static VALUE
+proc_setpgrp()
+{
+    rb_secure(2);
+  /* check for posix setpgid() first; this matches the posix */
+  /* getpgrp() above.  It appears that configure will set SETPGRP_VOID */
+  /* even though setpgrp(0,0) would be prefered. The posix call avoids */
+  /* this confusion. */
+#ifdef HAVE_SETPGID
+    if (setpgid(0,0) < 0) rb_sys_fail(0);
+#elif defined(HAVE_SETPGRP) && defined(SETPGRP_VOID)
+    if (setpgrp() < 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return INT2FIX(0);
+}
+
+
+/*
+ *  call-seq:
+ *     Process.getpgid(pid)   => integer
+ *
+ *  Returns the process group ID for the given process id. Not
+ *  available on all platforms.
+ *
+ *     Process.getpgid(Process.ppid())   #=> 25527
+ */
+
+static VALUE
+proc_getpgid(obj, pid)
+    VALUE obj, pid;
+{
+#if defined(HAVE_GETPGID) && !defined(__CHECKER__)
+    int i;
+
+    rb_secure(2);
+    i = getpgid(NUM2INT(pid));
+    if (i < 0) rb_sys_fail(0);
+    return INT2NUM(i);
+#else
+    rb_notimplement();
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process.setpgid(pid, integer)   => 0
+ *
+ *  Sets the process group ID of _pid_ (0 indicates this
+ *  process) to <em>integer</em>. Not available on all platforms.
+ */
+
+static VALUE
+proc_setpgid(obj, pid, pgrp)
+    VALUE obj, pid, pgrp;
+{
+#ifdef HAVE_SETPGID
+    int ipid, ipgrp;
+
+    rb_secure(2);
+    ipid = NUM2INT(pid);
+    ipgrp = NUM2INT(pgrp);
+
+    if (setpgid(ipid, ipgrp) < 0) rb_sys_fail(0);
+    return INT2FIX(0);
+#else
+    rb_notimplement();
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process.setsid   => fixnum
+ *
+ *  Establishes this process as a new session and process group
+ *  leader, with no controlling tty. Returns the session id. Not
+ *  available on all platforms.
+ *
+ *     Process.setsid   #=> 27422
+ */
+
+static VALUE
+proc_setsid()
+{
+#if defined(HAVE_SETSID)
+    int pid;
+
+    rb_secure(2);
+    pid = setsid();
+    if (pid < 0) rb_sys_fail(0);
+    return INT2FIX(pid);
+#elif defined(HAVE_SETPGRP) && defined(TIOCNOTTY)
+  rb_pid_t pid;
+  int ret;
+
+  rb_secure(2);
+  pid = getpid();
+#if defined(SETPGRP_VOID)
+  ret = setpgrp();
+  /* If `pid_t setpgrp(void)' is equivalent to setsid(),
+     `ret' will be the same value as `pid', and following open() will fail.
+     In Linux, `int setpgrp(void)' is equivalent to setpgid(0, 0). */
+#else
+  ret = setpgrp(0, pid);
+#endif
+  if (ret == -1) rb_sys_fail(0);
+
+  if ((fd = open("/dev/tty", O_RDWR)) >= 0) {
+    ioctl(fd, TIOCNOTTY, NULL);
+    close(fd);
+  }
+  return INT2FIX(pid);
+#else
+    rb_notimplement();
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process.getpriority(kind, integer)   => fixnum
+ *
+ *  Gets the scheduling priority for specified process, process group,
+ *  or user. <em>kind</em> indicates the kind of entity to find: one
+ *  of <code>Process::PRIO_PGRP</code>,
+ *  <code>Process::PRIO_USER</code>, or
+ *  <code>Process::PRIO_PROCESS</code>. _integer_ is an id
+ *  indicating the particular process, process group, or user (an id
+ *  of 0 means _current_). Lower priorities are more favorable
+ *  for scheduling. Not available on all platforms.
+ *
+ *     Process.getpriority(Process::PRIO_USER, 0)      #=> 19
+ *     Process.getpriority(Process::PRIO_PROCESS, 0)   #=> 19
+ */
+
+static VALUE
+proc_getpriority(obj, which, who)
+    VALUE obj, which, who;
+{
+#ifdef HAVE_GETPRIORITY
+    int prio, iwhich, iwho;
+
+    rb_secure(2);
+    iwhich = NUM2INT(which);
+    iwho   = NUM2INT(who);
+
+    errno = 0;
+    prio = getpriority(iwhich, iwho);
+    if (errno) rb_sys_fail(0);
+    return INT2FIX(prio);
+#else
+    rb_notimplement();
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process.setpriority(kind, integer, priority)   => 0
+ *
+ *  See <code>Process#getpriority</code>.
+ *
+ *     Process.setpriority(Process::PRIO_USER, 0, 19)      #=> 0
+ *     Process.setpriority(Process::PRIO_PROCESS, 0, 19)   #=> 0
+ *     Process.getpriority(Process::PRIO_USER, 0)          #=> 19
+ *     Process.getpriority(Process::PRIO_PROCESS, 0)       #=> 19
+ */
+
+static VALUE
+proc_setpriority(obj, which, who, prio)
+    VALUE obj, which, who, prio;
+{
+#ifdef HAVE_GETPRIORITY
+    int iwhich, iwho, iprio;
+
+    rb_secure(2);
+    iwhich = NUM2INT(which);
+    iwho   = NUM2INT(who);
+    iprio  = NUM2INT(prio);
+
+    if (setpriority(iwhich, iwho, iprio) < 0)
+	rb_sys_fail(0);
+    return INT2FIX(0);
+#else
+    rb_notimplement();
+#endif
+}
+
+#if SIZEOF_RLIM_T == SIZEOF_INT
+# define RLIM2NUM(v) UINT2NUM(v)
+# define NUM2RLIM(v) NUM2UINT(v)
+#elif SIZEOF_RLIM_T == SIZEOF_LONG
+# define RLIM2NUM(v) ULONG2NUM(v)
+# define NUM2RLIM(v) NUM2ULONG(v)
+#elif SIZEOF_RLIM_T == SIZEOF_LONG_LONG
+# define RLIM2NUM(v) ULL2NUM(v)
+# define NUM2RLIM(v) NUM2ULL(v)
+#endif
+
+/*
+ *  call-seq:
+ *     Process.getrlimit(resource)   => [cur_limit, max_limit]
+ *
+ *  Gets the resource limit of the process.
+ *  _cur_limit_ means current (soft) limit and
+ *  _max_limit_ means maximum (hard) limit.
+ *
+ *  _resource_ indicates the kind of resource to limit:
+ *  such as <code>Process::RLIMIT_CORE</code>,
+ *  <code>Process::RLIMIT_CPU</code>, etc.
+ *  See Process.setrlimit for details.
+ *
+ *  _cur_limit_ and _max_limit_ may be <code>Process::RLIM_INFINITY</code>,
+ *  <code>Process::RLIM_SAVED_MAX</code> or
+ *  <code>Process::RLIM_SAVED_CUR</code>.
+ *  See Process.setrlimit and the system getrlimit(2) manual for details.
+ */
+
+static VALUE
+proc_getrlimit(VALUE obj, VALUE resource)
+{
+#if defined(HAVE_GETRLIMIT) && defined(RLIM2NUM)
+    struct rlimit rlim;
+
+    rb_secure(2);
+
+    if (getrlimit(NUM2INT(resource), &rlim) < 0) {
+        rb_sys_fail("getrlimit");
+    }
+    return rb_assoc_new(RLIM2NUM(rlim.rlim_cur), RLIM2NUM(rlim.rlim_max));
+#else
+    rb_notimplement();
+#endif
+}
+
+/*
+ *  call-seq:
+ *     Process.setrlimit(resource, cur_limit, max_limit)        => nil
+ *     Process.setrlimit(resource, cur_limit)                   => nil
+ *
+ *  Sets the resource limit of the process.
+ *  _cur_limit_ means current (soft) limit and
+ *  _max_limit_ means maximum (hard) limit.
+ *
+ *  If _max_limit_ is not given, _cur_limit_ is used.
+ *
+ *  _resource_ indicates the kind of resource to limit.
+ *  The list of resources are OS dependent.
+ *  Ruby may support following resources.
+ *
+ *  [Process::RLIMIT_CORE] core size (bytes) (SUSv3)
+ *  [Process::RLIMIT_CPU] CPU time (seconds) (SUSv3)
+ *  [Process::RLIMIT_DATA] data segment (bytes) (SUSv3)
+ *  [Process::RLIMIT_FSIZE] file size (bytes) (SUSv3)
+ *  [Process::RLIMIT_NOFILE] file descriptors (number) (SUSv3)
+ *  [Process::RLIMIT_STACK] stack size (bytes) (SUSv3)
+ *  [Process::RLIMIT_AS] total available memory (bytes) (SUSv3, NetBSD, FreeBSD, OpenBSD but 4.4BSD-Lite)
+ *  [Process::RLIMIT_MEMLOCK] total size for mlock(2) (bytes) (4.4BSD, GNU/Linux)
+ *  [Process::RLIMIT_NPROC] number of processes for the user (number) (4.4BSD, GNU/Linux)
+ *  [Process::RLIMIT_RSS] resident memory size (bytes) (4.2BSD, GNU/Linux)
+ *  [Process::RLIMIT_SBSIZE] all socket buffers (bytes) (NetBSD, FreeBSD)
+ *
+ *  Other <code>Process::RLIMIT_???</code> constants may be defined.
+ *
+ *  _cur_limit_ and _max_limit_ may be <code>Process::RLIM_INFINITY</code>,
+ *  which means that the resource is not limited.
+ *  They may be <code>Process::RLIM_SAVED_MAX</code> or
+ *  <code>Process::RLIM_SAVED_CUR</code> too.
+ *  See system setrlimit(2) manual for details.
+ *
+ */
+
+static VALUE
+proc_setrlimit(int argc, VALUE *argv, VALUE obj)
+{
+#if defined(HAVE_SETRLIMIT) && defined(NUM2RLIM)
+    VALUE resource, rlim_cur, rlim_max;
+    struct rlimit rlim;
+
+    rb_secure(2);
+
+    rb_scan_args(argc, argv, "21", &resource, &rlim_cur, &rlim_max);
+    if (rlim_max == Qnil)
+        rlim_max = rlim_cur;
+
+    rlim.rlim_cur = NUM2RLIM(rlim_cur);
+    rlim.rlim_max = NUM2RLIM(rlim_max);
+
+    if (setrlimit(NUM2INT(resource), &rlim) < 0) {
+        rb_sys_fail("setrlimit");
+    }
+    return Qnil;
+#else
+    rb_notimplement();
+#endif
+}
+
+static int under_uid_switch = 0;
+static void
+check_uid_switch()
+{
+    rb_secure(2);
+    if (under_uid_switch) {
+	rb_raise(rb_eRuntimeError, "can't handle UID while evaluating block given to Process::UID.switch method");
+    }
+}
+
+static int under_gid_switch = 0;
+static void
+check_gid_switch()
+{
+    rb_secure(2);
+    if (under_gid_switch) {
+	rb_raise(rb_eRuntimeError, "can't handle GID while evaluating block given to Process::UID.switch method");
+    }
+}
+
+
+/*********************************************************************
+ * Document-class: Process::Sys
+ *
+ *  The <code>Process::Sys</code> module contains UID and GID
+ *  functions which provide direct bindings to the system calls of the
+ *  same names instead of the more-portable versions of the same
+ *  functionality found in the <code>Process</code>,
+ *  <code>Process::UID</code>, and <code>Process::GID</code> modules.
+ */
+
+
+/*
+ *  call-seq:
+ *     Process::Sys.setuid(integer)   => nil
+ *
+ *  Set the user ID of the current process to _integer_. Not
+ *  available on all platforms.
+ *
+ */
+
+static VALUE
+p_sys_setuid(obj, id)
+    VALUE obj, id;
+{
+#if defined HAVE_SETUID
+    check_uid_switch();
+    if (setuid(NUM2INT(id)) != 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return Qnil;
+}
+
+
+
+/*
+ *  call-seq:
+ *     Process::Sys.setruid(integer)   => nil
+ *
+ *  Set the real user ID of the calling process to _integer_.
+ *  Not available on all platforms.
+ *
+ */
+
+static VALUE
+p_sys_setruid(obj, id)
+    VALUE obj, id;
+{
+#if defined HAVE_SETRUID
+    check_uid_switch();
+    if (setruid(NUM2INT(id)) != 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     Process::Sys.seteuid(integer)   => nil
+ *
+ *  Set the effective user ID of the calling process to
+ *  _integer_.  Not available on all platforms.
+ *
+ */
+
+static VALUE
+p_sys_seteuid(obj, id)
+    VALUE obj, id;
+{
+#if defined HAVE_SETEUID
+    check_uid_switch();
+    if (seteuid(NUM2INT(id)) != 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     Process::Sys.setreuid(rid, eid)   => nil
+ *
+ *  Sets the (integer) real and/or effective user IDs of the current
+ *  process to _rid_ and _eid_, respectively. A value of
+ *  <code>-1</code> for either means to leave that ID unchanged. Not
+ *  available on all platforms.
+ *
+ */
+
+static VALUE
+p_sys_setreuid(obj, rid, eid)
+    VALUE obj, rid, eid;
+{
+#if defined HAVE_SETREUID
+    check_uid_switch();
+    if (setreuid(NUM2INT(rid),NUM2INT(eid)) != 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     Process::Sys.setresuid(rid, eid, sid)   => nil
+ *
+ *  Sets the (integer) real, effective, and saved user IDs of the
+ *  current process to _rid_, _eid_, and _sid_ respectively. A
+ *  value of <code>-1</code> for any value means to
+ *  leave that ID unchanged. Not available on all platforms.
+ *
+ */
+
+static VALUE
+p_sys_setresuid(obj, rid, eid, sid)
+    VALUE obj, rid, eid, sid;
+{
+#if defined HAVE_SETRESUID
+    check_uid_switch();
+    if (setresuid(NUM2INT(rid),NUM2INT(eid),NUM2INT(sid)) != 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     Process.uid           => fixnum
+ *     Process::UID.rid      => fixnum
+ *     Process::Sys.getuid   => fixnum
+ *
+ *  Returns the (real) user ID of this process.
+ *
+ *     Process.uid   #=> 501
+ */
+
+static VALUE
+proc_getuid(obj)
+    VALUE obj;
+{
+    int uid = getuid();
+    return INT2FIX(uid);
+}
+
+
+/*
+ *  call-seq:
+ *     Process.uid= integer   => numeric
+ *
+ *  Sets the (integer) user ID for this process. Not available on all
+ *  platforms.
+ */
+
+static VALUE
+proc_setuid(obj, id)
+    VALUE obj, id;
+{
+    int uid = NUM2INT(id);
+
+    check_uid_switch();
+#if defined(HAVE_SETRESUID) &&  !defined(__CHECKER__)
+    if (setresuid(uid, -1, -1) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETREUID
+    if (setreuid(uid, -1) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETRUID
+    if (setruid(uid) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETUID
+    {
+	if (geteuid() == uid) {
+	    if (setuid(uid) < 0) rb_sys_fail(0);
+	}
+	else {
+	    rb_notimplement();
+	}
+    }
+#else
+    rb_notimplement();
+#endif
+    return INT2FIX(uid);
+}
+
+
+/********************************************************************
+ *
+ * Document-class: Process::UID
+ *
+ *  The <code>Process::UID</code> module contains a collection of
+ *  module functions which can be used to portably get, set, and
+ *  switch the current process's real, effective, and saved user IDs.
+ *
+ */
+
+static int SAVED_USER_ID = -1;
+
+#ifdef BROKEN_SETREUID
+int
+setreuid(ruid, euid)
+    rb_uid_t ruid, euid;
+{
+    if (ruid != -1 && ruid != getuid()) {
+	if (euid == -1) euid = geteuid();
+	if (setuid(ruid) < 0) return -1;
+    }
+    if (euid != -1 && euid != geteuid()) {
+	if (seteuid(euid) < 0) return -1;
+    }
+    return 0;
+}
+#endif
+
+/*
+ *  call-seq:
+ *     Process::UID.change_privilege(integer)   => fixnum
+ *
+ *  Change the current process's real and effective user ID to that
+ *  specified by _integer_. Returns the new user ID. Not
+ *  available on all platforms.
+ *
+ *     [Process.uid, Process.euid]          #=> [0, 0]
+ *     Process::UID.change_privilege(31)    #=> 31
+ *     [Process.uid, Process.euid]          #=> [31, 31]
+ */
+
+static VALUE
+p_uid_change_privilege(obj, id)
+    VALUE obj, id;
+{
+    int uid;
+
+    check_uid_switch();
+
+    uid = NUM2INT(id);
+
+    if (geteuid() == 0) { /* root-user */
+#if defined(HAVE_SETRESUID)
+	if (setresuid(uid, uid, uid) < 0) rb_sys_fail(0);
+	SAVED_USER_ID = uid;
+#elif defined(HAVE_SETUID)
+	if (setuid(uid) < 0) rb_sys_fail(0);
+	SAVED_USER_ID = uid;
+#elif defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID)
+	if (getuid() == uid) {
+	    if (SAVED_USER_ID == uid) {
+		if (setreuid(-1, uid) < 0) rb_sys_fail(0);
+	    } else {
+		if (uid == 0) { /* (r,e,s) == (root, root, x) */
+		    if (setreuid(-1, SAVED_USER_ID) < 0) rb_sys_fail(0);
+		    if (setreuid(SAVED_USER_ID, 0) < 0) rb_sys_fail(0);
+		    SAVED_USER_ID = 0; /* (r,e,s) == (x, root, root) */
+		    if (setreuid(uid, uid) < 0) rb_sys_fail(0);
+		    SAVED_USER_ID = uid;
+		} else {
+		    if (setreuid(0, -1) < 0) rb_sys_fail(0);
+		    SAVED_USER_ID = 0;
+		    if (setreuid(uid, uid) < 0) rb_sys_fail(0);
+		    SAVED_USER_ID = uid;
+		}
+	    }
+	} else {
+	    if (setreuid(uid, uid) < 0) rb_sys_fail(0);
+	    SAVED_USER_ID = uid;
+	}
+#elif defined(HAVE_SETRUID) && defined(HAVE_SETEUID)
+	if (getuid() == uid) {
+	    if (SAVED_USER_ID == uid) {
+		if (seteuid(uid) < 0) rb_sys_fail(0);
+	    } else {
+		if (uid == 0) {
+		    if (setruid(SAVED_USER_ID) < 0) rb_sys_fail(0);
+		    SAVED_USER_ID = 0;
+		    if (setruid(0) < 0) rb_sys_fail(0);
+		} else {
+		    if (setruid(0) < 0) rb_sys_fail(0);
+		    SAVED_USER_ID = 0;
+		    if (seteuid(uid) < 0) rb_sys_fail(0);
+		    if (setruid(uid) < 0) rb_sys_fail(0);
+		    SAVED_USER_ID = uid;
+		}
+	    }
+	} else {
+	    if (seteuid(uid) < 0) rb_sys_fail(0);
+	    if (setruid(uid) < 0) rb_sys_fail(0);
+	    SAVED_USER_ID = uid;
+	}
+#else
+	rb_notimplement();
+#endif
+    } else { /* unprivileged user */
+#if defined(HAVE_SETRESUID)
+	if (setresuid((getuid() == uid)? -1: uid,
+		      (geteuid() == uid)? -1: uid,
+		      (SAVED_USER_ID == uid)? -1: uid) < 0) rb_sys_fail(0);
+	SAVED_USER_ID = uid;
+#elif defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID)
+	if (SAVED_USER_ID == uid) {
+	    if (setreuid((getuid() == uid)? -1: uid,
+			 (geteuid() == uid)? -1: uid) < 0) rb_sys_fail(0);
+	} else if (getuid() != uid) {
+	    if (setreuid(uid, (geteuid() == uid)? -1: uid) < 0) rb_sys_fail(0);
+	    SAVED_USER_ID = uid;
+	} else if (/* getuid() == uid && */ geteuid() != uid) {
+	    if (setreuid(geteuid(), uid) < 0) rb_sys_fail(0);
+	    SAVED_USER_ID = uid;
+	    if (setreuid(uid, -1) < 0) rb_sys_fail(0);
+	} else { /* getuid() == uid && geteuid() == uid */
+	    if (setreuid(-1, SAVED_USER_ID) < 0) rb_sys_fail(0);
+	    if (setreuid(SAVED_USER_ID, uid) < 0) rb_sys_fail(0);
+	    SAVED_USER_ID = uid;
+	    if (setreuid(uid, -1) < 0) rb_sys_fail(0);
+	}
+#elif defined(HAVE_SETRUID) && defined(HAVE_SETEUID)
+	if (SAVED_USER_ID == uid) {
+	    if (geteuid() != uid && seteuid(uid) < 0) rb_sys_fail(0);
+	    if (getuid() != uid && setruid(uid) < 0) rb_sys_fail(0);
+	} else if (/* SAVED_USER_ID != uid && */ geteuid() == uid) {
+	    if (getuid() != uid) {
+		if (setruid(uid) < 0) rb_sys_fail(0);
+		SAVED_USER_ID = uid;
+	    } else {
+		if (setruid(SAVED_USER_ID) < 0) rb_sys_fail(0);
+		SAVED_USER_ID = uid;
+		if (setruid(uid) < 0) rb_sys_fail(0);
+	    }
+	} else if (/* geteuid() != uid && */ getuid() == uid) {
+	    if (seteuid(uid) < 0) rb_sys_fail(0);
+	    if (setruid(SAVED_USER_ID) < 0) rb_sys_fail(0);
+	    SAVED_USER_ID = uid;
+	    if (setruid(uid) < 0) rb_sys_fail(0);
+	} else {
+	    errno = EPERM;
+	    rb_sys_fail(0);
+	}
+#elif defined HAVE_44BSD_SETUID
+	if (getuid() == uid) {
+	    /* (r,e,s)==(uid,?,?) ==> (uid,uid,uid) */
+	    if (setuid(uid) < 0) rb_sys_fail(0);
+	    SAVED_USER_ID = uid;
+	} else {
+	    errno = EPERM;
+	    rb_sys_fail(0);
+	}
+#elif defined HAVE_SETEUID
+	if (getuid() == uid && SAVED_USER_ID == uid) {
+	    if (seteuid(uid) < 0) rb_sys_fail(0);
+	} else {
+	    errno = EPERM;
+	    rb_sys_fail(0);
+	}
+#elif defined HAVE_SETUID
+	if (getuid() == uid && SAVED_USER_ID == uid) {
+	    if (setuid(uid) < 0) rb_sys_fail(0);
+	} else {
+	    errno = EPERM;
+	    rb_sys_fail(0);
+	}
+#else
+	rb_notimplement();
+#endif
+    }
+    return INT2FIX(uid);
+}
+
+
+
+/*
+ *  call-seq:
+ *     Process::Sys.setgid(integer)   => nil
+ *
+ *  Set the group ID of the current process to _integer_. Not
+ *  available on all platforms.
+ *
+ */
+
+static VALUE
+p_sys_setgid(obj, id)
+    VALUE obj, id;
+{
+#if defined HAVE_SETGID
+    check_gid_switch();
+    if (setgid(NUM2INT(id)) != 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     Process::Sys.setrgid(integer)   => nil
+ *
+ *  Set the real group ID of the calling process to _integer_.
+ *  Not available on all platforms.
+ *
+ */
+
+static VALUE
+p_sys_setrgid(obj, id)
+    VALUE obj, id;
+{
+#if defined HAVE_SETRGID
+    check_gid_switch();
+    if (setrgid(NUM2INT(id)) != 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return Qnil;
+}
+
+
+
+/*
+ *  call-seq:
+ *     Process::Sys.setegid(integer)   => nil
+ *
+ *  Set the effective group ID of the calling process to
+ *  _integer_.  Not available on all platforms.
+ *
+ */
+
+static VALUE
+p_sys_setegid(obj, id)
+    VALUE obj, id;
+{
+#if defined HAVE_SETEGID
+    check_gid_switch();
+    if (setegid(NUM2INT(id)) != 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     Process::Sys.setregid(rid, eid)   => nil
+ *
+ *  Sets the (integer) real and/or effective group IDs of the current
+ *  process to <em>rid</em> and <em>eid</em>, respectively. A value of
+ *  <code>-1</code> for either means to leave that ID unchanged. Not
+ *  available on all platforms.
+ *
+ */
+
+static VALUE
+p_sys_setregid(obj, rid, eid)
+    VALUE obj, rid, eid;
+{
+#if defined HAVE_SETREGID
+    check_gid_switch();
+    if (setregid(NUM2INT(rid),NUM2INT(eid)) != 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     Process::Sys.setresgid(rid, eid, sid)   => nil
+ *
+ *  Sets the (integer) real, effective, and saved user IDs of the
+ *  current process to <em>rid</em>, <em>eid</em>, and <em>sid</em>
+ *  respectively. A value of <code>-1</code> for any value means to
+ *  leave that ID unchanged. Not available on all platforms.
+ *
+ */
+
+static VALUE
+p_sys_setresgid(obj, rid, eid, sid)
+    VALUE obj, rid, eid, sid;
+{
+#if defined HAVE_SETRESGID
+    check_gid_switch();
+    if (setresgid(NUM2INT(rid),NUM2INT(eid),NUM2INT(sid)) != 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     Process::Sys.issetugid   => true or false
+ *
+ *  Returns +true+ if the process was created as a result
+ *  of an execve(2) system call which had either of the setuid or
+ *  setgid bits set (and extra privileges were given as a result) or
+ *  if it has changed any of its real, effective or saved user or
+ *  group IDs since it began execution.
+ *
+ */
+
+static VALUE
+p_sys_issetugid(obj)
+    VALUE obj;
+{
+#if defined HAVE_ISSETUGID
+    rb_secure(2);
+    if (issetugid()) {
+	return Qtrue;
+    } else {
+	return Qfalse;
+    }
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process.gid           => fixnum
+ *     Process::GID.rid      => fixnum
+ *     Process::Sys.getgid   => fixnum
+ *
+ *  Returns the (real) group ID for this process.
+ *
+ *     Process.gid   #=> 500
+ */
+
+static VALUE
+proc_getgid(obj)
+    VALUE obj;
+{
+    int gid = getgid();
+    return INT2FIX(gid);
+}
+
+
+/*
+ *  call-seq:
+ *     Process.gid= fixnum   => fixnum
+ *
+ *  Sets the group ID for this process.
+ */
+
+static VALUE
+proc_setgid(obj, id)
+    VALUE obj, id;
+{
+    int gid = NUM2INT(id);
+
+    check_gid_switch();
+#if defined(HAVE_SETRESGID) && !defined(__CHECKER__)
+    if (setresgid(gid, -1, -1) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETREGID
+    if (setregid(gid, -1) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETRGID
+    if (setrgid(gid) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETGID
+    {
+	if (getegid() == gid) {
+	    if (setgid(gid) < 0) rb_sys_fail(0);
+	}
+	else {
+	    rb_notimplement();
+	}
+    }
+#else
+    rb_notimplement();
+#endif
+    return INT2FIX(gid);
+}
+
+
+static size_t maxgroups = 32;
+
+
+/*
+ *  call-seq:
+ *     Process.groups   => array
+ *
+ *  Get an <code>Array</code> of the gids of groups in the
+ *  supplemental group access list for this process.
+ *
+ *     Process.groups   #=> [27, 6, 10, 11]
+ *
+ */
+
+static VALUE
+proc_getgroups(VALUE obj)
+{
+#ifdef HAVE_GETGROUPS
+    VALUE ary;
+    size_t ngroups;
+    rb_gid_t *groups;
+    int i;
+
+    groups = ALLOCA_N(rb_gid_t, maxgroups);
+
+    ngroups = getgroups(maxgroups, groups);
+    if (ngroups == -1)
+	rb_sys_fail(0);
+
+    ary = rb_ary_new();
+    for (i = 0; i < ngroups; i++)
+	rb_ary_push(ary, INT2NUM(groups[i]));
+
+    return ary;
+#else
+    rb_notimplement();
+    return Qnil;
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process.groups= array   => array
+ *
+ *  Set the supplemental group access list to the given
+ *  <code>Array</code> of group IDs.
+ *
+ *     Process.groups   #=> [0, 1, 2, 3, 4, 6, 10, 11, 20, 26, 27]
+ *     Process.groups = [27, 6, 10, 11]   #=> [27, 6, 10, 11]
+ *     Process.groups   #=> [27, 6, 10, 11]
+ *
+ */
+
+static VALUE
+proc_setgroups(VALUE obj, VALUE ary)
+{
+#ifdef HAVE_SETGROUPS
+    size_t ngroups;
+    rb_gid_t *groups;
+    int i;
+    struct group *gr;
+
+    Check_Type(ary, T_ARRAY);
+
+    ngroups = RARRAY(ary)->len;
+    if (ngroups > maxgroups)
+	rb_raise(rb_eArgError, "too many groups, %d max", maxgroups);
+
+    groups = ALLOCA_N(rb_gid_t, ngroups);
+
+    for (i = 0; i < ngroups && i < RARRAY(ary)->len; i++) {
+	VALUE g = RARRAY(ary)->ptr[i];
+
+	if (FIXNUM_P(g)) {
+	    groups[i] = FIX2INT(g);
+	}
+	else {
+	    VALUE tmp = rb_check_string_type(g);
+
+	    if (NIL_P(tmp)) {
+		groups[i] = NUM2INT(g);
+	    }
+	    else {
+		gr = getgrnam(RSTRING(tmp)->ptr);
+		if (gr == NULL)
+		    rb_raise(rb_eArgError,
+			     "can't find group for %s", RSTRING(tmp)->ptr);
+		groups[i] = gr->gr_gid;
+	    }
+	}
+    }
+
+    i = setgroups(ngroups, groups);
+    if (i == -1)
+	rb_sys_fail(0);
+
+    return proc_getgroups(obj);
+#else
+    rb_notimplement();
+    return Qnil;
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process.initgroups(username, gid)   => array
+ *
+ *  Initializes the supplemental group access list by reading the
+ *  system group database and using all groups of which the given user
+ *  is a member. The group with the specified <em>gid</em> is also
+ *  added to the list. Returns the resulting <code>Array</code> of the
+ *  gids of all the groups in the supplementary group access list. Not
+ *  available on all platforms.
+ *
+ *     Process.groups   #=> [0, 1, 2, 3, 4, 6, 10, 11, 20, 26, 27]
+ *     Process.initgroups( "mgranger", 30 )   #=> [30, 6, 10, 11]
+ *     Process.groups   #=> [30, 6, 10, 11]
+ *
+ */
+
+static VALUE
+proc_initgroups(obj, uname, base_grp)
+    VALUE obj, uname, base_grp;
+{
+#ifdef HAVE_INITGROUPS
+    if (initgroups(StringValuePtr(uname), (rb_gid_t)NUM2INT(base_grp)) != 0) {
+	rb_sys_fail(0);
+    }
+    return proc_getgroups(obj);
+#else
+    rb_notimplement();
+    return Qnil;
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process.maxgroups   => fixnum
+ *
+ *  Returns the maximum number of gids allowed in the supplemental
+ *  group access list.
+ *
+ *     Process.maxgroups   #=> 32
+ */
+
+static VALUE
+proc_getmaxgroups(obj)
+    VALUE obj;
+{
+    return INT2FIX(maxgroups);
+}
+
+
+/*
+ *  call-seq:
+ *     Process.maxgroups= fixnum   => fixnum
+ *
+ *  Sets the maximum number of gids allowed in the supplemental group
+ *  access list.
+ */
+
+static VALUE
+proc_setmaxgroups(VALUE obj, VALUE val)
+{
+    size_t  ngroups = FIX2INT(val);
+
+    if (ngroups > 4096)
+	ngroups = 4096;
+
+    maxgroups = ngroups;
+
+    return INT2FIX(maxgroups);
+}
+
+
+/********************************************************************
+ *
+ * Document-class: Process::GID
+ *
+ *  The <code>Process::GID</code> module contains a collection of
+ *  module functions which can be used to portably get, set, and
+ *  switch the current process's real, effective, and saved group IDs.
+ *
+ */
+
+static int SAVED_GROUP_ID = -1;
+
+#ifdef BROKEN_SETREGID
+int
+setregid(rgid, egid)
+    rb_gid_t rgid, egid;
+{
+    if (rgid != -1 && rgid != getgid()) {
+	if (egid == -1) egid = getegid();
+	if (setgid(rgid) < 0) return -1;
+    }
+    if (egid != -1 && egid != getegid()) {
+	if (setegid(egid) < 0) return -1;
+    }
+    return 0;
+}
+#endif
+
+/*
+ *  call-seq:
+ *     Process::GID.change_privilege(integer)   => fixnum
+ *
+ *  Change the current process's real and effective group ID to that
+ *  specified by _integer_. Returns the new group ID. Not
+ *  available on all platforms.
+ *
+ *     [Process.gid, Process.egid]          #=> [0, 0]
+ *     Process::GID.change_privilege(33)    #=> 33
+ *     [Process.gid, Process.egid]          #=> [33, 33]
+ */
+
+static VALUE
+p_gid_change_privilege(obj, id)
+    VALUE obj, id;
+{
+    int gid;
+
+    check_gid_switch();
+
+    gid = NUM2INT(id);
+
+    if (geteuid() == 0) { /* root-user */
+#if defined(HAVE_SETRESGID)
+	if (setresgid(gid, gid, gid) < 0) rb_sys_fail(0);
+	SAVED_GROUP_ID = gid;
+#elif defined HAVE_SETGID
+	if (setgid(gid) < 0) rb_sys_fail(0);
+	SAVED_GROUP_ID = gid;
+#elif defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID)
+	if (getgid() == gid) {
+	    if (SAVED_GROUP_ID == gid) {
+		if (setregid(-1, gid) < 0) rb_sys_fail(0);
+	    } else {
+		if (gid == 0) { /* (r,e,s) == (root, y, x) */
+		    if (setregid(-1, SAVED_GROUP_ID) < 0) rb_sys_fail(0);
+		    if (setregid(SAVED_GROUP_ID, 0) < 0) rb_sys_fail(0);
+		    SAVED_GROUP_ID = 0; /* (r,e,s) == (x, root, root) */
+		    if (setregid(gid, gid) < 0) rb_sys_fail(0);
+		    SAVED_GROUP_ID = gid;
+		} else { /* (r,e,s) == (z, y, x) */
+		    if (setregid(0, 0) < 0) rb_sys_fail(0);
+		    SAVED_GROUP_ID = 0;
+		    if (setregid(gid, gid) < 0) rb_sys_fail(0);
+		    SAVED_GROUP_ID = gid;
+		}
+	    }
+	} else {
+	    if (setregid(gid, gid) < 0) rb_sys_fail(0);
+	    SAVED_GROUP_ID = gid;
+	}
+#elif defined(HAVE_SETRGID) && defined (HAVE_SETEGID)
+	if (getgid() == gid) {
+	    if (SAVED_GROUP_ID == gid) {
+		if (setegid(gid) < 0) rb_sys_fail(0);
+	    } else {
+		if (gid == 0) {
+		    if (setegid(gid) < 0) rb_sys_fail(0);
+		    if (setrgid(SAVED_GROUP_ID) < 0) rb_sys_fail(0);
+		    SAVED_GROUP_ID = 0;
+		    if (setrgid(0) < 0) rb_sys_fail(0);
+		} else {
+		    if (setrgid(0) < 0) rb_sys_fail(0);
+		    SAVED_GROUP_ID = 0;
+		    if (setegid(gid) < 0) rb_sys_fail(0);
+		    if (setrgid(gid) < 0) rb_sys_fail(0);
+		    SAVED_GROUP_ID = gid;
+		}
+	    }
+	} else {
+	    if (setegid(gid) < 0) rb_sys_fail(0);
+	    if (setrgid(gid) < 0) rb_sys_fail(0);
+	    SAVED_GROUP_ID = gid;
+	}
+#else
+	rb_notimplement();
+#endif
+    } else { /* unprivileged user */
+#if defined(HAVE_SETRESGID)
+	if (setresgid((getgid() == gid)? -1: gid,
+		      (getegid() == gid)? -1: gid,
+		      (SAVED_GROUP_ID == gid)? -1: gid) < 0) rb_sys_fail(0);
+	SAVED_GROUP_ID = gid;
+#elif defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID)
+	if (SAVED_GROUP_ID == gid) {
+	    if (setregid((getgid() == gid)? -1: gid,
+			 (getegid() == gid)? -1: gid) < 0) rb_sys_fail(0);
+	} else if (getgid() != gid) {
+	    if (setregid(gid, (getegid() == gid)? -1: gid) < 0) rb_sys_fail(0);
+	    SAVED_GROUP_ID = gid;
+	} else if (/* getgid() == gid && */ getegid() != gid) {
+	    if (setregid(getegid(), gid) < 0) rb_sys_fail(0);
+	    SAVED_GROUP_ID = gid;
+	    if (setregid(gid, -1) < 0) rb_sys_fail(0);
+	} else { /* getgid() == gid && getegid() == gid */
+	    if (setregid(-1, SAVED_GROUP_ID) < 0) rb_sys_fail(0);
+	    if (setregid(SAVED_GROUP_ID, gid) < 0) rb_sys_fail(0);
+	    SAVED_GROUP_ID = gid;
+	    if (setregid(gid, -1) < 0) rb_sys_fail(0);
+	}
+#elif defined(HAVE_SETRGID) && defined(HAVE_SETEGID)
+	if (SAVED_GROUP_ID == gid) {
+	    if (getegid() != gid && setegid(gid) < 0) rb_sys_fail(0);
+	    if (getgid() != gid && setrgid(gid) < 0) rb_sys_fail(0);
+	} else if (/* SAVED_GROUP_ID != gid && */ getegid() == gid) {
+	    if (getgid() != gid) {
+		if (setrgid(gid) < 0) rb_sys_fail(0);
+		SAVED_GROUP_ID = gid;
+	    } else {
+		if (setrgid(SAVED_GROUP_ID) < 0) rb_sys_fail(0);
+		SAVED_GROUP_ID = gid;
+		if (setrgid(gid) < 0) rb_sys_fail(0);
+	    }
+	} else if (/* getegid() != gid && */ getgid() == gid) {
+	    if (setegid(gid) < 0) rb_sys_fail(0);
+	    if (setrgid(SAVED_GROUP_ID) < 0) rb_sys_fail(0);
+	    SAVED_GROUP_ID = gid;
+	    if (setrgid(gid) < 0) rb_sys_fail(0);
+	} else {
+	    errno = EPERM;
+	    rb_sys_fail(0);
+	}
+#elif defined HAVE_44BSD_SETGID
+	if (getgid() == gid) {
+	    /* (r,e,s)==(gid,?,?) ==> (gid,gid,gid) */
+	    if (setgid(gid) < 0) rb_sys_fail(0);
+	    SAVED_GROUP_ID = gid;
+	} else {
+	    errno = EPERM;
+	    rb_sys_fail(0);
+	}
+#elif defined HAVE_SETEGID
+	if (getgid() == gid && SAVED_GROUP_ID == gid) {
+	    if (setegid(gid) < 0) rb_sys_fail(0);
+	} else {
+	    errno = EPERM;
+	    rb_sys_fail(0);
+	}
+#elif defined HAVE_SETGID
+	if (getgid() == gid && SAVED_GROUP_ID == gid) {
+	    if (setgid(gid) < 0) rb_sys_fail(0);
+	} else {
+	    errno = EPERM;
+	    rb_sys_fail(0);
+	}
+#else
+	rb_notimplement();
+#endif
+    }
+    return INT2FIX(gid);
+}
+
+
+/*
+ *  call-seq:
+ *     Process.euid           => fixnum
+ *     Process::UID.eid       => fixnum
+ *     Process::Sys.geteuid   => fixnum
+ *
+ *  Returns the effective user ID for this process.
+ *
+ *     Process.euid   #=> 501
+ */
+
+static VALUE
+proc_geteuid(obj)
+    VALUE obj;
+{
+    int euid = geteuid();
+    return INT2FIX(euid);
+}
+
+
+/*
+ *  call-seq:
+ *     Process.euid= integer
+ *
+ *  Sets the effective user ID for this process. Not available on all
+ *  platforms.
+ */
+
+static VALUE
+proc_seteuid(obj, euid)
+    VALUE obj, euid;
+{
+    check_uid_switch();
+#if defined(HAVE_SETRESUID) && !defined(__CHECKER__)
+    if (setresuid(-1, NUM2INT(euid), -1) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETREUID
+    if (setreuid(-1, NUM2INT(euid)) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETEUID
+    if (seteuid(NUM2INT(euid)) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETUID
+    euid = NUM2INT(euid);
+    if (euid == getuid()) {
+	if (setuid(euid) < 0) rb_sys_fail(0);
+    }
+    else {
+	rb_notimplement();
+    }
+#else
+    rb_notimplement();
+#endif
+    return euid;
+}
+
+static VALUE
+rb_seteuid_core(euid)
+    int euid;
+{
+    int uid;
+
+    check_uid_switch();
+
+    uid = getuid();
+
+#if defined(HAVE_SETRESUID) && !defined(__CHECKER__)
+    if (uid != euid) {
+	if (setresuid(-1,euid,euid) < 0) rb_sys_fail(0);
+	SAVED_USER_ID = euid;
+    } else {
+	if (setresuid(-1,euid,-1) < 0) rb_sys_fail(0);
+    }
+#elif defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID)
+    if (setreuid(-1, euid) < 0) rb_sys_fail(0);
+    if (uid != euid) {
+	if (setreuid(euid,uid) < 0) rb_sys_fail(0);
+	if (setreuid(uid,euid) < 0) rb_sys_fail(0);
+	SAVED_USER_ID = euid;
+    }
+#elif defined HAVE_SETEUID
+    if (seteuid(euid) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETUID
+    if (geteuid() == 0) rb_sys_fail(0);
+    if (setuid(euid) < 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return INT2FIX(euid);
+}
+
+
+/*
+ *  call-seq:
+ *     Process::UID.grant_privilege(integer)   => fixnum
+ *     Process::UID.eid= integer               => fixnum
+ *
+ *  Set the effective user ID, and if possible, the saved user ID of
+ *  the process to the given _integer_. Returns the new
+ *  effective user ID. Not available on all platforms.
+ *
+ *     [Process.uid, Process.euid]          #=> [0, 0]
+ *     Process::UID.grant_privilege(31)     #=> 31
+ *     [Process.uid, Process.euid]          #=> [0, 31]
+ */
+
+static VALUE
+p_uid_grant_privilege(obj, id)
+    VALUE obj, id;
+{
+    return rb_seteuid_core(NUM2INT(id));
+}
+
+
+/*
+ *  call-seq:
+ *     Process.egid          => fixnum
+ *     Process::GID.eid      => fixnum
+ *     Process::Sys.geteid   => fixnum
+ *
+ *  Returns the effective group ID for this process. Not available on
+ *  all platforms.
+ *
+ *     Process.egid   #=> 500
+ */
+
+static VALUE
+proc_getegid(obj)
+    VALUE obj;
+{
+    int egid = getegid();
+
+    return INT2FIX(egid);
+}
+
+
+/*
+ *  call-seq:
+ *     Process.egid = fixnum   => fixnum
+ *
+ *  Sets the effective group ID for this process. Not available on all
+ *  platforms.
+ */
+
+static VALUE
+proc_setegid(obj, egid)
+    VALUE obj, egid;
+{
+    check_gid_switch();
+
+#if defined(HAVE_SETRESGID) && !defined(__CHECKER__)
+    if (setresgid(-1, NUM2INT(egid), -1) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETREGID
+    if (setregid(-1, NUM2INT(egid)) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETEGID
+    if (setegid(NUM2INT(egid)) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETGID
+    egid = NUM2INT(egid);
+    if (egid == getgid()) {
+	if (setgid(egid) < 0) rb_sys_fail(0);
+    }
+    else {
+	rb_notimplement();
+    }
+#else
+    rb_notimplement();
+#endif
+    return egid;
+}
+
+static VALUE
+rb_setegid_core(egid)
+    int egid;
+{
+    int gid;
+
+    check_gid_switch();
+
+    gid = getgid();
+
+#if defined(HAVE_SETRESGID) && !defined(__CHECKER__)
+    if (gid != egid) {
+	if (setresgid(-1,egid,egid) < 0) rb_sys_fail(0);
+	SAVED_GROUP_ID = egid;
+    } else {
+	if (setresgid(-1,egid,-1) < 0) rb_sys_fail(0);
+    }
+#elif defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID)
+    if (setregid(-1, egid) < 0) rb_sys_fail(0);
+    if (gid != egid) {
+	if (setregid(egid,gid) < 0) rb_sys_fail(0);
+	if (setregid(gid,egid) < 0) rb_sys_fail(0);
+	SAVED_GROUP_ID = egid;
+    }
+#elif defined HAVE_SETEGID
+    if (setegid(egid) < 0) rb_sys_fail(0);
+#elif defined HAVE_SETGID
+    if (geteuid() == 0 /* root user */) rb_sys_fail(0);
+    if (setgid(egid) < 0) rb_sys_fail(0);
+#else
+    rb_notimplement();
+#endif
+    return INT2FIX(egid);
+}
+
+
+/*
+ *  call-seq:
+ *     Process::GID.grant_privilege(integer)    => fixnum
+ *     Process::GID.eid = integer               => fixnum
+ *
+ *  Set the effective group ID, and if possible, the saved group ID of
+ *  the process to the given _integer_. Returns the new
+ *  effective group ID. Not available on all platforms.
+ *
+ *     [Process.gid, Process.egid]          #=> [0, 0]
+ *     Process::GID.grant_privilege(31)     #=> 33
+ *     [Process.gid, Process.egid]          #=> [0, 33]
+ */
+
+static VALUE
+p_gid_grant_privilege(obj, id)
+    VALUE obj, id;
+{
+    return rb_setegid_core(NUM2INT(id));
+}
+
+
+/*
+ *  call-seq:
+ *     Process::UID.re_exchangeable?   => true or false
+ *
+ *  Returns +true+ if the real and effective user IDs of a
+ *  process may be exchanged on the current platform.
+ *
+ */
+
+static VALUE
+p_uid_exchangeable()
+{
+#if defined(HAVE_SETRESUID) &&  !defined(__CHECKER__)
+    return Qtrue;
+#elif defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID)
+    return Qtrue;
+#else
+    return Qfalse;
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process::UID.re_exchange   => fixnum
+ *
+ *  Exchange real and effective user IDs and return the new effective
+ *  user ID. Not available on all platforms.
+ *
+ *     [Process.uid, Process.euid]   #=> [0, 31]
+ *     Process::UID.re_exchange      #=> 0
+ *     [Process.uid, Process.euid]   #=> [31, 0]
+ */
+
+static VALUE
+p_uid_exchange(obj)
+    VALUE obj;
+{
+    int uid, euid;
+
+    check_uid_switch();
+
+    uid = getuid();
+    euid = geteuid();
+
+#if defined(HAVE_SETRESUID) &&  !defined(__CHECKER__)
+    if (setresuid(euid, uid, uid) < 0) rb_sys_fail(0);
+    SAVED_USER_ID = uid;
+#elif defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID)
+    if (setreuid(euid,uid) < 0) rb_sys_fail(0);
+    SAVED_USER_ID = uid;
+#else
+    rb_notimplement();
+#endif
+    return INT2FIX(uid);
+}
+
+
+/*
+ *  call-seq:
+ *     Process::GID.re_exchangeable?   => true or false
+ *
+ *  Returns +true+ if the real and effective group IDs of a
+ *  process may be exchanged on the current platform.
+ *
+ */
+
+static VALUE
+p_gid_exchangeable()
+{
+#if defined(HAVE_SETRESGID) &&  !defined(__CHECKER__)
+    return Qtrue;
+#elif defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID)
+    return Qtrue;
+#else
+    return Qfalse;
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process::GID.re_exchange   => fixnum
+ *
+ *  Exchange real and effective group IDs and return the new effective
+ *  group ID. Not available on all platforms.
+ *
+ *     [Process.gid, Process.egid]   #=> [0, 33]
+ *     Process::GID.re_exchange      #=> 0
+ *     [Process.gid, Process.egid]   #=> [33, 0]
+ */
+
+static VALUE
+p_gid_exchange(obj)
+    VALUE obj;
+{
+    int gid, egid;
+
+    check_gid_switch();
+
+    gid = getgid();
+    egid = getegid();
+
+#if defined(HAVE_SETRESGID) &&  !defined(__CHECKER__)
+    if (setresgid(egid, gid, gid) < 0) rb_sys_fail(0);
+    SAVED_GROUP_ID = gid;
+#elif defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID)
+    if (setregid(egid,gid) < 0) rb_sys_fail(0);
+    SAVED_GROUP_ID = gid;
+#else
+    rb_notimplement();
+#endif
+    return INT2FIX(gid);
+}
+
+/* [MG] :FIXME: Is this correct? I'm not sure how to phrase this. */
+
+/*
+ *  call-seq:
+ *     Process::UID.sid_available?   => true or false
+ *
+ *  Returns +true+ if the current platform has saved user
+ *  ID functionality.
+ *
+ */
+
+static VALUE
+p_uid_have_saved_id()
+{
+#if defined(HAVE_SETRESUID) || defined(HAVE_SETEUID) || defined(_POSIX_SAVED_IDS)
+    return Qtrue;
+#else
+    return Qfalse;
+#endif
+}
+
+
+#if defined(HAVE_SETRESUID) || defined(HAVE_SETEUID) || defined(_POSIX_SAVED_IDS)
+static VALUE
+p_uid_sw_ensure(id)
+    int id;
+{
+    under_uid_switch = 0;
+    return rb_seteuid_core(id);
+}
+
+
+/*
+ *  call-seq:
+ *     Process::UID.switch              => fixnum
+ *     Process::UID.switch {|| block}   => object
+ *
+ *  Switch the effective and real user IDs of the current process. If
+ *  a <em>block</em> is given, the user IDs will be switched back
+ *  after the block is executed. Returns the new effective user ID if
+ *  called without a block, and the return value of the block if one
+ *  is given.
+ *
+ */
+
+static VALUE
+p_uid_switch(obj)
+    VALUE obj;
+{
+    int uid, euid;
+
+    check_uid_switch();
+
+    uid = getuid();
+    euid = geteuid();
+
+    if (uid != euid) {
+	proc_seteuid(obj, INT2FIX(uid));
+	if (rb_block_given_p()) {
+	    under_uid_switch = 1;
+	    return rb_ensure(rb_yield, Qnil, p_uid_sw_ensure, SAVED_USER_ID);
+	} else {
+	    return INT2FIX(euid);
+	}
+    } else if (euid != SAVED_USER_ID) {
+	proc_seteuid(obj, INT2FIX(SAVED_USER_ID));
+	if (rb_block_given_p()) {
+	    under_uid_switch = 1;
+	    return rb_ensure(rb_yield, Qnil, p_uid_sw_ensure, euid);
+	} else {
+	    return INT2FIX(uid);
+	}
+    } else {
+	errno = EPERM;
+	rb_sys_fail(0);
+    }
+
+#else
+static VALUE
+p_uid_sw_ensure(obj)
+    VALUE obj;
+{
+    under_uid_switch = 0;
+    return p_uid_exchange(obj);
+}
+
+static VALUE
+p_uid_switch(obj)
+    VALUE obj;
+{
+    int uid, euid;
+
+    check_uid_switch();
+
+    uid = getuid();
+    euid = geteuid();
+
+    if (uid == euid) {
+	errno = EPERM;
+	rb_sys_fail(0);
+    }
+    p_uid_exchange(obj);
+    if (rb_block_given_p()) {
+	under_uid_switch = 1;
+	return rb_ensure(rb_yield, Qnil, p_uid_sw_ensure, obj);
+    } else {
+	return INT2FIX(euid);
+    }
+#endif
+}
+
+
+/* [MG] :FIXME: Is this correct? I'm not sure how to phrase this. */
+
+/*
+ *  call-seq:
+ *     Process::GID.sid_available?   => true or false
+ *
+ *  Returns +true+ if the current platform has saved group
+ *  ID functionality.
+ *
+ */
+
+static VALUE
+p_gid_have_saved_id()
+{
+#if defined(HAVE_SETRESGID) || defined(HAVE_SETEGID) || defined(_POSIX_SAVED_IDS)
+    return Qtrue;
+#else
+    return Qfalse;
+#endif
+}
+
+#if defined(HAVE_SETRESGID) || defined(HAVE_SETEGID) || defined(_POSIX_SAVED_IDS)
+static VALUE
+p_gid_sw_ensure(id)
+    int id;
+{
+    under_gid_switch = 0;
+    return rb_setegid_core(id);
+}
+
+
+/*
+ *  call-seq:
+ *     Process::GID.switch              => fixnum
+ *     Process::GID.switch {|| block}   => object
+ *
+ *  Switch the effective and real group IDs of the current process. If
+ *  a <em>block</em> is given, the group IDs will be switched back
+ *  after the block is executed. Returns the new effective group ID if
+ *  called without a block, and the return value of the block if one
+ *  is given.
+ *
+ */
+
+static VALUE
+p_gid_switch(obj)
+    VALUE obj;
+{
+    int gid, egid;
+
+    check_gid_switch();
+
+    gid = getgid();
+    egid = getegid();
+
+    if (gid != egid) {
+	proc_setegid(obj, INT2FIX(gid));
+	if (rb_block_given_p()) {
+	    under_gid_switch = 1;
+	    return rb_ensure(rb_yield, Qnil, p_gid_sw_ensure, SAVED_GROUP_ID);
+	} else {
+	    return INT2FIX(egid);
+	}
+    } else if (egid != SAVED_GROUP_ID) {
+	proc_setegid(obj, INT2FIX(SAVED_GROUP_ID));
+	if (rb_block_given_p()) {
+	    under_gid_switch = 1;
+	    return rb_ensure(rb_yield, Qnil, p_gid_sw_ensure, egid);
+	} else {
+	    return INT2FIX(gid);
+	}
+    } else {
+	errno = EPERM;
+	rb_sys_fail(0);
+    }
+#else
+static VALUE
+p_gid_sw_ensure(obj)
+    VALUE obj;
+{
+    under_gid_switch = 0;
+    return p_gid_exchange(obj);
+}
+
+static VALUE
+p_gid_switch(obj)
+    VALUE obj;
+{
+    int gid, egid;
+
+    check_gid_switch();
+
+    gid = getgid();
+    egid = getegid();
+
+    if (gid == egid) {
+	errno = EPERM;
+	rb_sys_fail(0);
+    }
+    p_gid_exchange(obj);
+    if (rb_block_given_p()) {
+	under_gid_switch = 1;
+	return rb_ensure(rb_yield, Qnil, p_gid_sw_ensure, obj);
+    } else {
+	return INT2FIX(egid);
+    }
+#endif
+}
+
+
+/*
+ *  call-seq:
+ *     Process.times   => aStructTms
+ *
+ *  Returns a <code>Tms</code> structure (see <code>Struct::Tms</code>
+ *  on page 388) that contains user and system CPU times for this
+ *  process.
+ *
+ *     t = Process.times
+ *     [ t.utime, t.stime ]   #=> [0.0, 0.02]
+ */
+
+VALUE
+rb_proc_times(obj)
+    VALUE obj;
+{
+#if defined(HAVE_TIMES) && !defined(__CHECKER__)
+    const double hertz =
+#ifdef HAVE__SC_CLK_TCK
+	(double)sysconf(_SC_CLK_TCK);
+#else
+#ifndef HZ
+# ifdef CLK_TCK
+#   define HZ CLK_TCK
+# else
+#   define HZ 60
+# endif
+#endif /* HZ */
+	HZ;
+#endif
+    struct tms buf;
+    volatile VALUE utime, stime, cutime, sctime;
+
+    times(&buf);
+    return rb_struct_new(S_Tms,
+			 utime = rb_float_new(buf.tms_utime / hertz),
+			 stime = rb_float_new(buf.tms_stime / hertz),
+			 cutime = rb_float_new(buf.tms_cutime / hertz),
+			 sctime = rb_float_new(buf.tms_cstime / hertz));
+#else
+    rb_notimplement();
+#endif
+}
+
+VALUE rb_mProcess;
+VALUE rb_mProcUID;
+VALUE rb_mProcGID;
+VALUE rb_mProcID_Syscall;
+
+
+/*
+ *  The <code>Process</code> module is a collection of methods used to
+ *  manipulate processes.
+ */
+
+void
+Init_process()
+{
+    rb_define_virtual_variable("$$", get_pid, 0);
+    rb_define_readonly_variable("$?", &rb_last_status);
+    rb_define_global_function("exec", rb_f_exec, -1);
+    rb_define_global_function("fork", rb_f_fork, 0);
+    rb_define_global_function("exit!", rb_f_exit_bang, -1);
+    rb_define_global_function("system", rb_f_system, -1);
+    rb_define_global_function("sleep", rb_f_sleep, -1);
+
+    rb_mProcess = rb_define_module("Process");
+
+#if !defined(_WIN32) && !defined(DJGPP)
+#ifdef WNOHANG
+    rb_define_const(rb_mProcess, "WNOHANG", INT2FIX(WNOHANG));
+#else
+    rb_define_const(rb_mProcess, "WNOHANG", INT2FIX(0));
+#endif
+#ifdef WUNTRACED
+    rb_define_const(rb_mProcess, "WUNTRACED", INT2FIX(WUNTRACED));
+#else
+    rb_define_const(rb_mProcess, "WUNTRACED", INT2FIX(0));
+#endif
+#endif
+
+    rb_define_singleton_method(rb_mProcess, "fork", rb_f_fork, 0);
+    rb_define_singleton_method(rb_mProcess, "exit!", rb_f_exit_bang, -1);
+    rb_define_singleton_method(rb_mProcess, "exit", rb_f_exit, -1);   /* in eval.c */
+    rb_define_singleton_method(rb_mProcess, "abort", rb_f_abort, -1); /* in eval.c */
+
+    rb_define_module_function(rb_mProcess, "kill", rb_f_kill, -1); /* in signal.c */
+    rb_define_module_function(rb_mProcess, "wait", proc_wait, -1);
+    rb_define_module_function(rb_mProcess, "wait2", proc_wait2, -1);
+    rb_define_module_function(rb_mProcess, "waitpid", proc_wait, -1);
+    rb_define_module_function(rb_mProcess, "waitpid2", proc_wait2, -1);
+    rb_define_module_function(rb_mProcess, "waitall", proc_waitall, 0);
+    rb_define_module_function(rb_mProcess, "detach", proc_detach, 1);
+
+    rb_cProcStatus = rb_define_class_under(rb_mProcess, "Status", rb_cObject);
+    rb_undef_method(CLASS_OF(rb_cProcStatus), "new");
+
+    rb_define_method(rb_cProcStatus, "==", pst_equal, 1);
+    rb_define_method(rb_cProcStatus, "&", pst_bitand, 1);
+    rb_define_method(rb_cProcStatus, ">>", pst_rshift, 1);
+    rb_define_method(rb_cProcStatus, "to_i", pst_to_i, 0);
+    rb_define_method(rb_cProcStatus, "to_int", pst_to_i, 0);
+    rb_define_method(rb_cProcStatus, "to_s", pst_to_s, 0);
+    rb_define_method(rb_cProcStatus, "inspect", pst_inspect, 0);
+
+    rb_define_method(rb_cProcStatus, "pid", pst_pid, 0);
+
+    rb_define_method(rb_cProcStatus, "stopped?", pst_wifstopped, 0);
+    rb_define_method(rb_cProcStatus, "stopsig", pst_wstopsig, 0);
+    rb_define_method(rb_cProcStatus, "signaled?", pst_wifsignaled, 0);
+    rb_define_method(rb_cProcStatus, "termsig", pst_wtermsig, 0);
+    rb_define_method(rb_cProcStatus, "exited?", pst_wifexited, 0);
+    rb_define_method(rb_cProcStatus, "exitstatus", pst_wexitstatus, 0);
+    rb_define_method(rb_cProcStatus, "success?", pst_success_p, 0);
+    rb_define_method(rb_cProcStatus, "coredump?", pst_wcoredump, 0);
+
+    rb_define_module_function(rb_mProcess, "pid", get_pid, 0);
+    rb_define_module_function(rb_mProcess, "ppid", get_ppid, 0);
+
+    rb_define_module_function(rb_mProcess, "getpgrp", proc_getpgrp, 0);
+    rb_define_module_function(rb_mProcess, "setpgrp", proc_setpgrp, 0);
+    rb_define_module_function(rb_mProcess, "getpgid", proc_getpgid, 1);
+    rb_define_module_function(rb_mProcess, "setpgid", proc_setpgid, 2);
+
+    rb_define_module_function(rb_mProcess, "setsid", proc_setsid, 0);
+
+    rb_define_module_function(rb_mProcess, "getpriority", proc_getpriority, 2);
+    rb_define_module_function(rb_mProcess, "setpriority", proc_setpriority, 3);
+
+#ifdef HAVE_GETPRIORITY
+    rb_define_const(rb_mProcess, "PRIO_PROCESS", INT2FIX(PRIO_PROCESS));
+    rb_define_const(rb_mProcess, "PRIO_PGRP", INT2FIX(PRIO_PGRP));
+    rb_define_const(rb_mProcess, "PRIO_USER", INT2FIX(PRIO_USER));
+#endif
+
+    rb_define_module_function(rb_mProcess, "getrlimit", proc_getrlimit, 1);
+    rb_define_module_function(rb_mProcess, "setrlimit", proc_setrlimit, -1);
+#ifdef RLIM2NUM
+#ifdef RLIM_INFINITY
+    rb_define_const(rb_mProcess, "RLIM_INFINITY", RLIM2NUM(RLIM_INFINITY));
+#endif
+#ifdef RLIM_SAVED_MAX
+    rb_define_const(rb_mProcess, "RLIM_SAVED_MAX", RLIM2NUM(RLIM_SAVED_MAX));
+#endif
+#ifdef RLIM_SAVED_CUR
+    rb_define_const(rb_mProcess, "RLIM_SAVED_CUR", RLIM2NUM(RLIM_SAVED_CUR));
+#endif
+#ifdef RLIMIT_CORE
+    rb_define_const(rb_mProcess, "RLIMIT_CORE", INT2FIX(RLIMIT_CORE));
+#endif
+#ifdef RLIMIT_CPU
+    rb_define_const(rb_mProcess, "RLIMIT_CPU", INT2FIX(RLIMIT_CPU));
+#endif
+#ifdef RLIMIT_DATA
+    rb_define_const(rb_mProcess, "RLIMIT_DATA", INT2FIX(RLIMIT_DATA));
+#endif
+#ifdef RLIMIT_FSIZE
+    rb_define_const(rb_mProcess, "RLIMIT_FSIZE", INT2FIX(RLIMIT_FSIZE));
+#endif
+#ifdef RLIMIT_NOFILE
+    rb_define_const(rb_mProcess, "RLIMIT_NOFILE", INT2FIX(RLIMIT_NOFILE));
+#endif
+#ifdef RLIMIT_STACK
+    rb_define_const(rb_mProcess, "RLIMIT_STACK", INT2FIX(RLIMIT_STACK));
+#endif
+#ifdef RLIMIT_AS
+    rb_define_const(rb_mProcess, "RLIMIT_AS", INT2FIX(RLIMIT_AS));
+#endif
+#ifdef RLIMIT_MEMLOCK
+    rb_define_const(rb_mProcess, "RLIMIT_MEMLOCK", INT2FIX(RLIMIT_MEMLOCK));
+#endif
+#ifdef RLIMIT_NPROC
+    rb_define_const(rb_mProcess, "RLIMIT_NPROC", INT2FIX(RLIMIT_NPROC));
+#endif
+#ifdef RLIMIT_RSS
+    rb_define_const(rb_mProcess, "RLIMIT_RSS", INT2FIX(RLIMIT_RSS));
+#endif
+#ifdef RLIMIT_SBSIZE
+    rb_define_const(rb_mProcess, "RLIMIT_SBSIZE", INT2FIX(RLIMIT_SBSIZE));
+#endif
+#endif
+
+    rb_define_module_function(rb_mProcess, "uid", proc_getuid, 0);
+    rb_define_module_function(rb_mProcess, "uid=", proc_setuid, 1);
+    rb_define_module_function(rb_mProcess, "gid", proc_getgid, 0);
+    rb_define_module_function(rb_mProcess, "gid=", proc_setgid, 1);
+    rb_define_module_function(rb_mProcess, "euid", proc_geteuid, 0);
+    rb_define_module_function(rb_mProcess, "euid=", proc_seteuid, 1);
+    rb_define_module_function(rb_mProcess, "egid", proc_getegid, 0);
+    rb_define_module_function(rb_mProcess, "egid=", proc_setegid, 1);
+    rb_define_module_function(rb_mProcess, "initgroups", proc_initgroups, 2);
+    rb_define_module_function(rb_mProcess, "groups", proc_getgroups, 0);
+    rb_define_module_function(rb_mProcess, "groups=", proc_setgroups, 1);
+    rb_define_module_function(rb_mProcess, "maxgroups", proc_getmaxgroups, 0);
+    rb_define_module_function(rb_mProcess, "maxgroups=", proc_setmaxgroups, 1);
+
+    rb_define_module_function(rb_mProcess, "times", rb_proc_times, 0);
+
+#if defined(HAVE_TIMES) || defined(_WIN32)
+    S_Tms = rb_struct_define("Tms", "utime", "stime", "cutime", "cstime", NULL);
+#endif
+
+    SAVED_USER_ID = geteuid();
+    SAVED_GROUP_ID = getegid();
+
+    rb_mProcUID = rb_define_module_under(rb_mProcess, "UID");
+    rb_mProcGID = rb_define_module_under(rb_mProcess, "GID");
+
+    rb_define_module_function(rb_mProcUID, "rid", proc_getuid, 0);
+    rb_define_module_function(rb_mProcGID, "rid", proc_getgid, 0);
+    rb_define_module_function(rb_mProcUID, "eid", proc_geteuid, 0);
+    rb_define_module_function(rb_mProcGID, "eid", proc_getegid, 0);
+    rb_define_module_function(rb_mProcUID, "change_privilege", p_uid_change_privilege, 1);
+    rb_define_module_function(rb_mProcGID, "change_privilege", p_gid_change_privilege, 1);
+    rb_define_module_function(rb_mProcUID, "grant_privilege", p_uid_grant_privilege, 1);
+    rb_define_module_function(rb_mProcGID, "grant_privilege", p_gid_grant_privilege, 1);
+    rb_define_alias(rb_singleton_class(rb_mProcUID), "eid=", "grant_privilege");
+    rb_define_alias(rb_singleton_class(rb_mProcGID), "eid=", "grant_privilege");
+    rb_define_module_function(rb_mProcUID, "re_exchange", p_uid_exchange, 0);
+    rb_define_module_function(rb_mProcGID, "re_exchange", p_gid_exchange, 0);
+    rb_define_module_function(rb_mProcUID, "re_exchangeable?", p_uid_exchangeable, 0);
+    rb_define_module_function(rb_mProcGID, "re_exchangeable?", p_gid_exchangeable, 0);
+    rb_define_module_function(rb_mProcUID, "sid_available?", p_uid_have_saved_id, 0);
+    rb_define_module_function(rb_mProcGID, "sid_available?", p_gid_have_saved_id, 0);
+    rb_define_module_function(rb_mProcUID, "switch", p_uid_switch, 0);
+    rb_define_module_function(rb_mProcGID, "switch", p_gid_switch, 0);
+
+    rb_mProcID_Syscall = rb_define_module_under(rb_mProcess, "Sys");
+
+    rb_define_module_function(rb_mProcID_Syscall, "getuid", proc_getuid, 0);
+    rb_define_module_function(rb_mProcID_Syscall, "geteuid", proc_geteuid, 0);
+    rb_define_module_function(rb_mProcID_Syscall, "getgid", proc_getgid, 0);
+    rb_define_module_function(rb_mProcID_Syscall, "getegid", proc_getegid, 0);
+
+    rb_define_module_function(rb_mProcID_Syscall, "setuid", p_sys_setuid, 1);
+    rb_define_module_function(rb_mProcID_Syscall, "setgid", p_sys_setgid, 1);
+
+    rb_define_module_function(rb_mProcID_Syscall, "setruid", p_sys_setruid, 1);
+    rb_define_module_function(rb_mProcID_Syscall, "setrgid", p_sys_setrgid, 1);
+
+    rb_define_module_function(rb_mProcID_Syscall, "seteuid", p_sys_seteuid, 1);
+    rb_define_module_function(rb_mProcID_Syscall, "setegid", p_sys_setegid, 1);
+
+    rb_define_module_function(rb_mProcID_Syscall, "setreuid", p_sys_setreuid, 2);
+    rb_define_module_function(rb_mProcID_Syscall, "setregid", p_sys_setregid, 2);
+
+    rb_define_module_function(rb_mProcID_Syscall, "setresuid", p_sys_setresuid, 3);
+    rb_define_module_function(rb_mProcID_Syscall, "setresgid", p_sys_setresgid, 3);
+    rb_define_module_function(rb_mProcID_Syscall, "issetugid", p_sys_issetugid, 0);
+}
diff --git a/ruby_1_8_6/random.c b/ruby_1_8_6/random.c
new file mode 100644
index 0000000000..eb9803af07
--- /dev/null
+++ b/ruby_1_8_6/random.c
@@ -0,0 +1,504 @@
+/**********************************************************************
+
+  random.c -
+
+  $Author$
+  $Date$
+  created at: Fri Dec 24 16:39:21 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+/* 
+This is based on trimmed version of MT19937.  To get the original version,
+contact <http://www.math.keio.ac.jp/~matumoto/emt.html>.
+
+The original copyright notice follows.
+
+   A C-program for MT19937, with initialization improved 2002/2/10.
+   Coded by Takuji Nishimura and Makoto Matsumoto.
+   This is a faster version by taking Shawn Cokus's optimization,
+   Matthe Bellew's simplification, Isaku Wada's real version.
+
+   Before using, initialize the state by using init_genrand(seed) 
+   or init_by_array(init_key, key_length).
+
+   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
+   All rights reserved.                          
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+     1. Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+     3. The names of its contributors may not be used to endorse or promote 
+        products derived from this software without specific prior written 
+        permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+   Any feedback is very welcome.
+   http://www.math.keio.ac.jp/matumoto/emt.html
+   email: matumoto@math.keio.ac.jp
+*/
+
+/* Period parameters */  
+#define N 624
+#define M 397
+#define MATRIX_A 0x9908b0dfUL   /* constant vector a */
+#define UMASK 0x80000000UL /* most significant w-r bits */
+#define LMASK 0x7fffffffUL /* least significant r bits */
+#define MIXBITS(u,v) ( ((u) & UMASK) | ((v) & LMASK) )
+#define TWIST(u,v) ((MIXBITS(u,v) >> 1) ^ ((v)&1UL ? MATRIX_A : 0UL))
+
+static unsigned long state[N]; /* the array for the state vector  */
+static int left = 1;
+static int initf = 0;
+static unsigned long *next;
+
+/* initializes state[N] with a seed */
+static void
+init_genrand(s)
+    unsigned long s;
+{
+    int j;
+    state[0]= s & 0xffffffffUL;
+    for (j=1; j<N; j++) {
+        state[j] = (1812433253UL * (state[j-1] ^ (state[j-1] >> 30)) + j); 
+        /* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */
+        /* In the previous versions, MSBs of the seed affect   */
+        /* only MSBs of the array state[].                        */
+        /* 2002/01/09 modified by Makoto Matsumoto             */
+        state[j] &= 0xffffffffUL;  /* for >32 bit machines */
+    }
+    left = 1; initf = 1;
+}
+
+/* initialize by an array with array-length */
+/* init_key is the array for initializing keys */
+/* key_length is its length */
+/* slight change for C++, 2004/2/26 */
+static void
+init_by_array(unsigned long init_key[], int key_length)
+{
+    int i, j, k;
+    init_genrand(19650218UL);
+    i=1; j=0;
+    k = (N>key_length ? N : key_length);
+    for (; k; k--) {
+        state[i] = (state[i] ^ ((state[i-1] ^ (state[i-1] >> 30)) * 1664525UL))
+          + init_key[j] + j; /* non linear */
+        state[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
+        i++; j++;
+        if (i>=N) { state[0] = state[N-1]; i=1; }
+        if (j>=key_length) j=0;
+    }
+    for (k=N-1; k; k--) {
+        state[i] = (state[i] ^ ((state[i-1] ^ (state[i-1] >> 30)) * 1566083941UL))
+          - i; /* non linear */
+        state[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
+        i++;
+        if (i>=N) { state[0] = state[N-1]; i=1; }
+    }
+
+    state[0] = 0x80000000UL; /* MSB is 1; assuring non-zero initial array */ 
+    left = 1; initf = 1;
+}
+
+static void
+next_state()
+{
+    unsigned long *p=state;
+    int j;
+
+    /* if init_genrand() has not been called, */
+    /* a default initial seed is used         */
+    if (initf==0) init_genrand(5489UL);
+
+    left = N;
+    next = state;
+    
+    for (j=N-M+1; --j; p++) 
+        *p = p[M] ^ TWIST(p[0], p[1]);
+
+    for (j=M; --j; p++) 
+        *p = p[M-N] ^ TWIST(p[0], p[1]);
+
+    *p = p[M-N] ^ TWIST(p[0], state[0]);
+}
+
+/* generates a random number on [0,0xffffffff]-interval */
+static unsigned long
+genrand_int32(void)
+{
+    unsigned long y;
+
+    if (--left == 0) next_state();
+    y = *next++;
+
+    /* Tempering */
+    y ^= (y >> 11);
+    y ^= (y << 7) & 0x9d2c5680UL;
+    y ^= (y << 15) & 0xefc60000UL;
+    y ^= (y >> 18);
+
+    return y;
+}
+
+/* generates a random number on [0,1) with 53-bit resolution*/
+static double
+genrand_real(void) 
+{ 
+    unsigned long a=genrand_int32()>>5, b=genrand_int32()>>6; 
+    return(a*67108864.0+b)*(1.0/9007199254740992.0); 
+} 
+/* These real versions are due to Isaku Wada, 2002/01/09 added */
+
+#undef N
+#undef M
+
+/* These real versions are due to Isaku Wada, 2002/01/09 added */
+
+#include "ruby.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+static int first = 1;
+static VALUE saved_seed = INT2FIX(0);
+
+static VALUE
+rand_init(vseed)
+    VALUE vseed;
+{
+    volatile VALUE seed;
+    VALUE old;
+    long len;
+    unsigned long *buf;
+
+    seed = rb_to_int(vseed);
+    switch (TYPE(seed)) {
+      case T_FIXNUM:
+          len = sizeof(VALUE);
+          break;
+      case T_BIGNUM:
+          len = RBIGNUM(seed)->len * SIZEOF_BDIGITS;
+          if (len == 0)
+              len = 4;
+          break;
+      default:
+          rb_raise(rb_eTypeError, "failed to convert %s into Integer",
+                   rb_obj_classname(vseed));
+    }
+    len = (len + 3) / 4; /* number of 32bit words */
+    buf = ALLOC_N(unsigned long, len); /* allocate longs for init_by_array */
+    memset(buf, 0, len * sizeof(long));
+    if (FIXNUM_P(seed)) {
+        buf[0] = FIX2ULONG(seed) & 0xffffffff;
+#if SIZEOF_LONG > 4
+        buf[1] = FIX2ULONG(seed) >> 32;
+#endif
+    }
+    else {
+        int i, j;
+        for (i = RBIGNUM(seed)->len-1; 0 <= i; i--) {
+            j = i * SIZEOF_BDIGITS / 4;
+#if SIZEOF_BDIGITS < 4
+            buf[j] <<= SIZEOF_BDIGITS * 8;
+#endif
+            buf[j] |= ((BDIGIT *)RBIGNUM(seed)->digits)[i];
+        }
+    }
+    while (1 < len && buf[len-1] == 0) {
+        len--;
+    }
+    if (len <= 1) {
+        init_genrand(buf[0]);
+    }
+    else {
+        if (buf[len-1] == 1) /* remove leading-zero-guard */
+            len--;
+        init_by_array(buf, len);
+    }
+    first = 0;
+    old = saved_seed;
+    saved_seed = seed;
+    free(buf);
+    return old;
+}
+
+static VALUE
+random_seed()
+{
+    static int n = 0;
+    struct timeval tv;
+    int fd;
+    struct stat statbuf;
+
+    int seed_len;
+    BDIGIT *digits;
+    unsigned long *seed;
+    NEWOBJ(big, struct RBignum);
+    OBJSETUP(big, rb_cBignum, T_BIGNUM);
+
+    seed_len = 4 * sizeof(long);
+    big->sign = 1;
+    big->len = seed_len / SIZEOF_BDIGITS + 1;
+    digits = big->digits = ALLOC_N(BDIGIT, big->len);
+    seed = (unsigned long *)big->digits;
+
+    memset(digits, 0, big->len * SIZEOF_BDIGITS);
+
+#ifdef S_ISCHR
+    if ((fd = open("/dev/urandom", O_RDONLY
+#ifdef O_NONBLOCK
+            |O_NONBLOCK
+#endif
+#ifdef O_NOCTTY
+            |O_NOCTTY
+#endif
+#ifdef O_NOFOLLOW
+            |O_NOFOLLOW
+#endif
+            )) >= 0) {
+        if (fstat(fd, &statbuf) == 0 && S_ISCHR(statbuf.st_mode)) {
+            read(fd, seed, seed_len);
+        }
+        close(fd);
+    }
+#endif
+
+    gettimeofday(&tv, 0);
+    seed[0] ^= tv.tv_usec;
+    seed[1] ^= tv.tv_sec;
+    seed[2] ^= getpid() ^ (n++ << 16);
+    seed[3] ^= (unsigned long)&seed;
+
+    /* set leading-zero-guard if need. */
+    digits[big->len-1] = digits[big->len-2] <= 1 ? 1 : 0;
+
+    return rb_big_norm((VALUE)big);
+}
+
+/*
+ *  call-seq:
+ *     srand(number=0)    => old_seed
+ *  
+ *  Seeds the pseudorandom number generator to the value of
+ *  <i>number</i>.<code>to_i.abs</code>. If <i>number</i> is omitted,
+ *  seeds the generator using a combination of the time, the
+ *  process id, and a sequence number. (This is also the behavior if
+ *  <code>Kernel::rand</code> is called without previously calling
+ *  <code>srand</code>, but without the sequence.) By setting the seed
+ *  to a known value, scripts can be made deterministic during testing.
+ *  The previous seed value is returned. Also see <code>Kernel::rand</code>.
+ */
+
+static VALUE
+rb_f_srand(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE seed, old;
+
+    rb_secure(4);
+    if (rb_scan_args(argc, argv, "01", &seed) == 0) {
+	seed = random_seed();
+    }
+    old = rand_init(seed);
+
+    return old;
+}
+
+static unsigned long 
+make_mask(unsigned long x)
+{
+    x = x | x >> 1;
+    x = x | x >> 2;
+    x = x | x >> 4;
+    x = x | x >> 8;
+    x = x | x >> 16;
+#if 4 < SIZEOF_LONG
+    x = x | x >> 32;
+#endif
+    return x;
+}
+
+static unsigned long
+limited_rand(unsigned long limit)
+{
+    unsigned long mask = make_mask(limit);
+    int i;
+    unsigned long val;
+
+  retry:
+    val = 0;
+    for (i = SIZEOF_LONG/4-1; 0 <= i; i--) {
+        if (mask >> (i * 32)) {
+            val |= genrand_int32() << (i * 32);
+            val &= mask;
+            if (limit < val)
+                goto retry;
+        }
+    }
+    return val;
+}
+
+static VALUE
+limited_big_rand(struct RBignum *limit)
+{
+    unsigned long mask, lim, rnd;
+    struct RBignum *val;
+    int i, len, boundary;
+
+    len = (limit->len * SIZEOF_BDIGITS + 3) / 4;
+    val = (struct RBignum *)rb_big_clone((VALUE)limit);
+    val->sign = 1;
+#if SIZEOF_BDIGITS == 2
+# define BIG_GET32(big,i) (((BDIGIT *)(big)->digits)[(i)*2] | \
+                           ((i)*2+1 < (big)->len ? (((BDIGIT *)(big)->digits)[(i)*2+1] << 16) \
+                                                 : 0))
+# define BIG_SET32(big,i,d) ((((BDIGIT *)(big)->digits)[(i)*2] = (d) & 0xffff), \
+                             ((i)*2+1 < (big)->len ? (((BDIGIT *)(big)->digits)[(i)*2+1] = (d) >> 16) \
+                                                   : 0))
+#else
+    /* SIZEOF_BDIGITS == 4 */
+# define BIG_GET32(big,i) (((BDIGIT *)(big)->digits)[i])
+# define BIG_SET32(big,i,d) (((BDIGIT *)(big)->digits)[i] = (d))
+#endif
+  retry:
+    mask = 0;
+    boundary = 1;
+    for (i = len-1; 0 <= i; i--) {
+        lim = BIG_GET32(limit, i);
+        mask = mask ? 0xffffffff : make_mask(lim);
+        if (mask) {
+            rnd = genrand_int32() & mask;
+            if (boundary) {
+                if (lim < rnd)
+                    goto retry;
+                if (rnd < lim)
+                    boundary = 0;
+            }
+        }
+        else {
+            rnd = 0;
+        }
+        BIG_SET32(val, i, rnd);
+    }
+    return rb_big_norm((VALUE)val);
+}
+
+/*
+ *  call-seq:
+ *     rand(max=0)    => number
+ *  
+ *  Converts <i>max</i> to an integer using max1 =
+ *  max<code>.to_i.abs</code>. If the result is zero, returns a
+ *  pseudorandom floating point number greater than or equal to 0.0 and
+ *  less than 1.0. Otherwise, returns a pseudorandom integer greater
+ *  than or equal to zero and less than max1. <code>Kernel::srand</code>
+ *  may be used to ensure repeatable sequences of random numbers between
+ *  different runs of the program. Ruby currently uses a modified
+ *  Mersenne Twister with a period of 2**19937-1.
+ *     
+ *     srand 1234                 #=> 0
+ *     [ rand,  rand ]            #=> [0.191519450163469, 0.49766366626136]
+ *     [ rand(10), rand(1000) ]   #=> [6, 817]
+ *     srand 1234                 #=> 1234
+ *     [ rand,  rand ]            #=> [0.191519450163469, 0.49766366626136]
+ */
+
+static VALUE
+rb_f_rand(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE vmax;
+    long val, max;
+
+    rb_scan_args(argc, argv, "01", &vmax);
+    if (first) {
+	rand_init(random_seed());
+    }
+    switch (TYPE(vmax)) {
+      case T_FLOAT:
+	if (RFLOAT(vmax)->value <= LONG_MAX && RFLOAT(vmax)->value >= LONG_MIN) {
+	    max = (long)RFLOAT(vmax)->value;
+	    break;
+	}
+        if (RFLOAT(vmax)->value < 0)
+            vmax = rb_dbl2big(-RFLOAT(vmax)->value);
+        else
+            vmax = rb_dbl2big(RFLOAT(vmax)->value);
+	/* fall through */
+      case T_BIGNUM:
+      bignum:
+        {
+            struct RBignum *limit = (struct RBignum *)vmax;
+            if (!limit->sign) {
+                limit = (struct RBignum *)rb_big_clone(vmax);
+                limit->sign = 1;
+            }
+            limit = (struct RBignum *)rb_big_minus((VALUE)limit, INT2FIX(1));
+            if (FIXNUM_P((VALUE)limit)) {
+                if (FIX2LONG((VALUE)limit) == -1)
+                    return rb_float_new(genrand_real());
+                return LONG2NUM(limited_rand(FIX2LONG((VALUE)limit)));
+            }
+            return limited_big_rand(limit);
+	}
+      case T_NIL:
+	max = 0;
+	break;
+      default:
+	vmax = rb_Integer(vmax);
+	if (TYPE(vmax) == T_BIGNUM) goto bignum;
+	/* fall through */
+      case T_FIXNUM:
+	max = FIX2LONG(vmax);
+	break;
+    }
+
+    if (max == 0) {
+	return rb_float_new(genrand_real());
+    }
+    if (max < 0) max = -max;
+    val = limited_rand(max-1);
+    return LONG2NUM(val);
+}
+
+void
+Init_Random()
+{
+    rb_define_global_function("srand", rb_f_srand, -1);
+    rb_define_global_function("rand", rb_f_rand, -1);
+    rb_global_variable(&saved_seed);
+}
diff --git a/ruby_1_8_6/range.c b/ruby_1_8_6/range.c
new file mode 100644
index 0000000000..3f575de91b
--- /dev/null
+++ b/ruby_1_8_6/range.c
@@ -0,0 +1,675 @@
+/**********************************************************************
+
+  range.c -
+
+  $Author$
+  $Date$
+  created at: Thu Aug 19 17:46:47 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+
+VALUE rb_cRange;
+static ID id_cmp, id_succ, id_beg, id_end, id_excl;
+
+#define EXCL(r) RTEST(rb_ivar_get((r), id_excl))
+#define SET_EXCL(r,v) rb_ivar_set((r), id_excl, (v) ? Qtrue : Qfalse)
+
+static VALUE
+range_failed()
+{
+    rb_raise(rb_eArgError, "bad value for range");
+    return Qnil;		/* dummy */
+}
+
+static VALUE
+range_check(args)
+    VALUE *args;
+{
+    return rb_funcall(args[0], id_cmp, 1, args[1]);
+}
+
+static void
+range_init(range, beg, end, exclude_end)
+    VALUE range, beg, end;
+    int exclude_end;
+{
+    VALUE args[2];
+
+    args[0] = beg;
+    args[1] = end;
+    
+    if (!FIXNUM_P(beg) || !FIXNUM_P(end)) {
+	VALUE v;
+
+	v = rb_rescue(range_check, (VALUE)args, range_failed, 0);
+	if (NIL_P(v)) range_failed();
+    }
+
+    SET_EXCL(range, exclude_end);
+    rb_ivar_set(range, id_beg, beg);
+    rb_ivar_set(range, id_end, end);
+}
+
+VALUE
+rb_range_new(beg, end, exclude_end)
+    VALUE beg, end;
+    int exclude_end;
+{
+    VALUE range = rb_obj_alloc(rb_cRange);
+
+    range_init(range, beg, end, exclude_end);
+    return range;
+}
+
+/*
+ *  call-seq:
+ *     Range.new(start, end, exclusive=false)    => range
+ *  
+ *  Constructs a range using the given <i>start</i> and <i>end</i>. If the third
+ *  parameter is omitted or is <code>false</code>, the <i>range</i> will include
+ *  the end object; otherwise, it will be excluded.
+ */
+
+static VALUE
+range_initialize(argc, argv, range)
+    int argc;
+    VALUE *argv;
+    VALUE range;
+{
+    VALUE beg, end, flags;
+    
+    rb_scan_args(argc, argv, "21", &beg, &end, &flags);
+    /* Ranges are immutable, so that they should be initialized only once. */
+    if (rb_ivar_defined(range, id_beg)) {
+	rb_name_error(rb_intern("initialize"), "`initialize' called twice");
+    }
+    range_init(range, beg, end, RTEST(flags));
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     rng.exclude_end?    => true or false
+ *  
+ *  Returns <code>true</code> if <i>rng</i> excludes its end value.
+ */
+
+static VALUE
+range_exclude_end_p(range)
+    VALUE range;
+{
+    return EXCL(range) ? Qtrue : Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     rng == obj    => true or false
+ *  
+ *  Returns <code>true</code> only if <i>obj</i> is a Range, has equivalent
+ *  beginning and end items (by comparing them with <code>==</code>), and has
+ *  the same #exclude_end? setting as <i>rng</t>.
+ *     
+ *    (0..2) == (0..2)            #=> true
+ *    (0..2) == Range.new(0,2)    #=> true
+ *    (0..2) == (0...2)           #=> false
+ *     
+ */
+
+static VALUE
+range_eq(range, obj)
+    VALUE range, obj;
+{
+    if (range == obj) return Qtrue;
+    if (!rb_obj_is_instance_of(obj, rb_obj_class(range)))
+	return Qfalse;
+
+    if (!rb_equal(rb_ivar_get(range, id_beg), rb_ivar_get(obj, id_beg)))
+	return Qfalse;
+    if (!rb_equal(rb_ivar_get(range, id_end), rb_ivar_get(obj, id_end)))
+	return Qfalse;
+
+    if (EXCL(range) != EXCL(obj)) return Qfalse;
+
+    return Qtrue;
+}
+
+static int
+r_lt(a, b)
+    VALUE a, b;
+{
+    VALUE r = rb_funcall(a, id_cmp, 1, b);
+
+    if (NIL_P(r)) return Qfalse;
+    if (rb_cmpint(r, a, b) < 0) return Qtrue;
+    return Qfalse;
+}
+
+static int
+r_le(a, b)
+    VALUE a, b;
+{
+    int c;
+    VALUE r = rb_funcall(a, id_cmp, 1, b);
+
+    if (NIL_P(r)) return Qfalse;
+    c = rb_cmpint(r, a, b);
+    if (c == 0) return INT2FIX(0);
+    if (c < 0) return Qtrue;
+    return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     rng.eql?(obj)    => true or false
+ *  
+ *  Returns <code>true</code> only if <i>obj</i> is a Range, has equivalent
+ *  beginning and end items (by comparing them with #eql?), and has the same
+ *  #exclude_end? setting as <i>rng</i>.
+ *     
+ *    (0..2) == (0..2)            #=> true
+ *    (0..2) == Range.new(0,2)    #=> true
+ *    (0..2) == (0...2)           #=> false
+ *     
+ */
+
+static VALUE
+range_eql(range, obj)
+    VALUE range, obj;
+{
+    if (range == obj) return Qtrue;
+    if (!rb_obj_is_instance_of(obj, rb_obj_class(range)))
+	return Qfalse;
+
+    if (!rb_eql(rb_ivar_get(range, id_beg), rb_ivar_get(obj, id_beg)))
+	return Qfalse;
+    if (!rb_eql(rb_ivar_get(range, id_end), rb_ivar_get(obj, id_end)))
+	return Qfalse;
+
+    if (EXCL(range) != EXCL(obj)) return Qfalse;
+
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *   rng.hash    => fixnum
+ *
+ * Generate a hash value such that two ranges with the same start and
+ * end points, and the same value for the "exclude end" flag, generate
+ * the same hash value.
+ */
+
+static VALUE
+range_hash(range)
+    VALUE range;
+{
+    long hash = EXCL(range);
+    VALUE v;
+
+    v = rb_hash(rb_ivar_get(range, id_beg));
+    hash ^= v << 1;
+    v = rb_hash(rb_ivar_get(range, id_end));
+    hash ^= v << 9;
+    hash ^= EXCL(range) << 24;
+
+    return LONG2FIX(hash);
+}
+
+static VALUE
+str_step(args)
+    VALUE *args;
+{
+    return rb_str_upto(args[0], args[1], EXCL(args[2]));
+}
+
+static void
+range_each_func(range, func, v, e, arg)
+    VALUE range;
+    void (*func) _((VALUE, void*));
+    VALUE v, e;
+    void *arg;
+{
+    int c;
+
+    if (EXCL(range)) {
+	while (r_lt(v, e)) {
+	    (*func)(v, arg);
+	    v = rb_funcall(v, id_succ, 0, 0);
+	}
+    }
+    else {
+	while (RTEST(c = r_le(v, e))) {
+	    (*func)(v, arg);
+	    if (c == INT2FIX(0)) break;
+	    v = rb_funcall(v, id_succ, 0, 0);
+	}
+    }
+}
+
+static VALUE
+step_i(i, iter)
+    VALUE i;
+    long *iter;
+{
+    iter[0]--;
+    if (iter[0] == 0) {
+	rb_yield(i);
+	iter[0] = iter[1];
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     rng.step(n=1) {| obj | block }    => rng
+ *  
+ *  Iterates over <i>rng</i>, passing each <i>n</i>th element to the block. If
+ *  the range contains numbers or strings, natural ordering is used.  Otherwise
+ *  <code>step</code> invokes <code>succ</code> to iterate through range
+ *  elements. The following code uses class <code>Xs</code>, which is defined
+ *  in the class-level documentation.
+ *     
+ *     range = Xs.new(1)..Xs.new(10)
+ *     range.step(2) {|x| puts x}
+ *     range.step(3) {|x| puts x}
+ *     
+ *  <em>produces:</em>
+ *     
+ *      1 x
+ *      3 xxx
+ *      5 xxxxx
+ *      7 xxxxxxx
+ *      9 xxxxxxxxx
+ *      1 x
+ *      4 xxxx
+ *      7 xxxxxxx
+ *     10 xxxxxxxxxx
+ */
+
+
+static VALUE
+range_step(argc, argv, range)
+    int argc;
+    VALUE *argv;
+    VALUE range;
+{
+    VALUE b, e, step;
+    long unit;
+
+    b = rb_ivar_get(range, id_beg);
+    e = rb_ivar_get(range, id_end);
+    if (rb_scan_args(argc, argv, "01", &step) == 0) {
+	step = INT2FIX(1);
+    }
+
+    unit = NUM2LONG(step);
+    if (unit < 0) {
+	rb_raise(rb_eArgError, "step can't be negative");
+    } 
+    if (FIXNUM_P(b) && FIXNUM_P(e)) { /* fixnums are special */
+	long end = FIX2LONG(e);
+	long i;
+
+	if (unit == 0) rb_raise(rb_eArgError, "step can't be 0");
+	if (!EXCL(range)) end += 1;
+	for (i=FIX2LONG(b); i<end; i+=unit) {
+	    rb_yield(LONG2NUM(i));
+	}
+    }
+    else {
+	VALUE tmp = rb_check_string_type(b);
+
+	if (!NIL_P(tmp)) {
+	    VALUE args[5];
+	    long iter[2];
+
+	    b = tmp;
+	    if (unit == 0) rb_raise(rb_eArgError, "step can't be 0");
+	    args[0] = b; args[1] = e; args[2] = range;
+	    iter[0] = 1; iter[1] = unit;
+	    rb_iterate((VALUE(*)_((VALUE)))str_step, (VALUE)args, step_i,
+			(VALUE)iter);
+	}
+	else if (rb_obj_is_kind_of(b, rb_cNumeric)) {
+	    ID c = rb_intern(EXCL(range) ? "<" : "<=");
+
+	    if (rb_equal(step, INT2FIX(0))) rb_raise(rb_eArgError, "step can't be 0");
+	    while (RTEST(rb_funcall(b, c, 1, e))) {
+		rb_yield(b);
+		b = rb_funcall(b, '+', 1, step);
+	    }
+	}
+	else {
+	    long args[2];
+
+	    if (unit == 0) rb_raise(rb_eArgError, "step can't be 0");
+	    if (!rb_respond_to(b, id_succ)) {
+		rb_raise(rb_eTypeError, "can't iterate from %s",
+			 rb_obj_classname(b));
+	    }
+	
+	    args[0] = 1;
+	    args[1] = unit;
+	    range_each_func(range, step_i, b, e, args);
+	}
+    }
+    return range;
+}
+
+static void
+each_i(v, arg)
+    VALUE v;
+    void *arg;
+{
+    rb_yield(v);
+}
+
+/*
+ *  call-seq:
+ *     rng.each {| i | block } => rng
+ *  
+ *  Iterates over the elements <i>rng</i>, passing each in turn to the
+ *  block. You can only iterate if the start object of the range
+ *  supports the +succ+ method (which means that you can't iterate over
+ *  ranges of +Float+ objects).
+ *     
+ *     (10..15).each do |n|
+ *        print n, ' '
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     10 11 12 13 14 15
+ */
+
+static VALUE
+range_each(range)
+    VALUE range;
+{
+    VALUE beg, end;
+
+    beg = rb_ivar_get(range, id_beg);
+    end = rb_ivar_get(range, id_end);
+
+    if (!rb_respond_to(beg, id_succ)) {
+	rb_raise(rb_eTypeError, "can't iterate from %s",
+		 rb_obj_classname(beg));
+    }
+    if (FIXNUM_P(beg) && FIXNUM_P(end)) { /* fixnums are special */
+	long lim = FIX2LONG(end);
+	long i;
+
+	if (!EXCL(range)) lim += 1;
+	for (i=FIX2LONG(beg); i<lim; i++) {
+	    rb_yield(LONG2NUM(i));
+	}
+    }
+    else if (TYPE(beg) == T_STRING) {
+	VALUE args[5];
+	long iter[2];
+
+	args[0] = beg; args[1] = end; args[2] = range;
+	iter[0] = 1; iter[1] = 1;
+	rb_iterate((VALUE(*)_((VALUE)))str_step, (VALUE)args, step_i,
+		   (VALUE)iter);
+    }
+    else {
+	range_each_func(range, each_i, beg, end, NULL);
+    }
+    return range;
+}
+
+/*
+ *  call-seq:
+ *     rng.first    => obj
+ *     rng.begin    => obj
+ *  
+ *  Returns the first object in <i>rng</i>.
+ */
+
+static VALUE
+range_first(range)
+    VALUE range;
+{
+    return rb_ivar_get(range, id_beg);
+}
+
+
+/*
+ *  call-seq:
+ *     rng.end    => obj
+ *     rng.last   => obj
+ *  
+ *  Returns the object that defines the end of <i>rng</i>.
+ *     
+ *     (1..10).end    #=> 10
+ *     (1...10).end   #=> 10
+ */
+
+
+static VALUE
+range_last(range)
+    VALUE range;
+{
+    return rb_ivar_get(range, id_end);
+}
+
+VALUE
+rb_range_beg_len(range, begp, lenp, len, err)
+    VALUE range;
+    long *begp, *lenp;
+    long len;
+    int err;
+{
+    long beg, end, b, e;
+
+    if (!rb_obj_is_kind_of(range, rb_cRange)) return Qfalse;
+
+    beg = b = NUM2LONG(rb_ivar_get(range, id_beg));
+    end = e = NUM2LONG(rb_ivar_get(range, id_end));
+
+    if (beg < 0) {
+	beg += len;
+	if (beg < 0) goto out_of_range;
+    }
+    if (err == 0 || err == 2) {
+	if (beg > len) goto out_of_range;
+	if (end > len) end = len;
+    }
+    if (end < 0) end += len;
+    if (!EXCL(range)) end++;	/* include end point */
+    len = end - beg;
+    if (len < 0) len = 0;
+
+    *begp = beg;
+    *lenp = len;
+    return Qtrue;
+
+  out_of_range:
+    if (err) {
+	rb_raise(rb_eRangeError, "%ld..%s%ld out of range",
+		 b, EXCL(range)? "." : "", e);
+    }
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   rng.to_s   => string
+ *
+ * Convert this range object to a printable form.
+ */
+
+static VALUE
+range_to_s(range)
+    VALUE range;
+{
+    VALUE str, str2;
+
+    str = rb_obj_as_string(rb_ivar_get(range, id_beg));
+    str2 = rb_obj_as_string(rb_ivar_get(range, id_end));
+    str = rb_str_dup(str);
+    rb_str_cat(str, "...", EXCL(range)?3:2);
+    rb_str_append(str, str2);
+    OBJ_INFECT(str, str2);
+
+    return str;
+}
+
+/*
+ * call-seq:
+ *   rng.inspect  => string
+ *
+ * Convert this range object to a printable form (using 
+ * <code>inspect</code> to convert the start and end
+ * objects).
+ */
+
+
+static VALUE
+range_inspect(range)
+    VALUE range;
+{
+    VALUE str, str2;
+
+    str = rb_inspect(rb_ivar_get(range, id_beg));
+    str2 = rb_inspect(rb_ivar_get(range, id_end));
+    str = rb_str_dup(str);
+    rb_str_cat(str, "...", EXCL(range)?3:2);
+    rb_str_append(str, str2);
+    OBJ_INFECT(str, str2);
+
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     rng === obj       =>  true or false
+ *     rng.member?(val)  =>  true or false
+ *     rng.include?(val) =>  true or false
+ *  
+ *  Returns <code>true</code> if <i>obj</i> is an element of
+ *  <i>rng</i>, <code>false</code> otherwise. Conveniently,
+ *  <code>===</code> is the comparison operator used by
+ *  <code>case</code> statements.
+ *     
+ *     case 79
+ *     when 1..50   then   print "low\n"
+ *     when 51..75  then   print "medium\n"
+ *     when 76..100 then   print "high\n"
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     high
+ */
+
+static VALUE
+range_include(range, val)
+    VALUE range, val;
+{
+    VALUE beg, end;
+
+    beg = rb_ivar_get(range, id_beg);
+    end = rb_ivar_get(range, id_end);
+    if (r_le(beg, val)) {
+	if (EXCL(range)) {
+	    if (r_lt(val, end)) return Qtrue;
+	}
+	else {
+	    if (r_le(val, end)) return Qtrue;
+	}
+    }
+    return Qfalse;
+}
+
+
+/*  A <code>Range</code> represents an interval---a set of values with a
+ *  start and an end. Ranges may be constructed using the
+ *  <em>s</em><code>..</code><em>e</em> and
+ *  <em>s</em><code>...</code><em>e</em> literals, or with
+ *  <code>Range::new</code>. Ranges constructed using <code>..</code>
+ *  run from the start to the end inclusively. Those created using
+ *  <code>...</code> exclude the end value. When used as an iterator,
+ *  ranges return each value in the sequence.
+ *     
+ *     (-1..-5).to_a      #=> []
+ *     (-5..-1).to_a      #=> [-5, -4, -3, -2, -1]
+ *     ('a'..'e').to_a    #=> ["a", "b", "c", "d", "e"]
+ *     ('a'...'e').to_a   #=> ["a", "b", "c", "d"]
+ *     
+ *  Ranges can be constructed using objects of any type, as long as the
+ *  objects can be compared using their <code><=></code> operator and
+ *  they support the <code>succ</code> method to return the next object
+ *  in sequence.
+ *     
+ *     class Xs                # represent a string of 'x's
+ *       include Comparable
+ *       attr :length
+ *       def initialize(n)
+ *         @length = n
+ *       end
+ *       def succ
+ *         Xs.new(@length + 1)
+ *       end
+ *       def <=>(other)
+ *         @length <=> other.length
+ *       end
+ *       def to_s
+ *         sprintf "%2d #{inspect}", @length
+ *       end
+ *       def inspect
+ *         'x' * @length
+ *       end
+ *     end
+ *     
+ *     r = Xs.new(3)..Xs.new(6)   #=> xxx..xxxxxx
+ *     r.to_a                     #=> [xxx, xxxx, xxxxx, xxxxxx]
+ *     r.member?(Xs.new(5))       #=> true
+ *     
+ *  In the previous code example, class <code>Xs</code> includes the
+ *  <code>Comparable</code> module. This is because
+ *  <code>Enumerable#member?</code> checks for equality using
+ *  <code>==</code>. Including <code>Comparable</code> ensures that the
+ *  <code>==</code> method is defined in terms of the <code><=></code>
+ *  method implemented in <code>Xs</code>.
+ *     
+ */
+
+void
+Init_Range()
+{
+    rb_cRange = rb_define_class("Range", rb_cObject);
+    rb_include_module(rb_cRange, rb_mEnumerable);
+    rb_define_method(rb_cRange, "initialize", range_initialize, -1);
+    rb_define_method(rb_cRange, "==", range_eq, 1);
+    rb_define_method(rb_cRange, "===", range_include, 1);
+    rb_define_method(rb_cRange, "eql?", range_eql, 1);
+    rb_define_method(rb_cRange, "hash", range_hash, 0);
+    rb_define_method(rb_cRange, "each", range_each, 0);
+    rb_define_method(rb_cRange, "step", range_step, -1);
+    rb_define_method(rb_cRange, "first", range_first, 0);
+    rb_define_method(rb_cRange, "last", range_last, 0);
+    rb_define_method(rb_cRange, "begin", range_first, 0);
+    rb_define_method(rb_cRange, "end", range_last, 0);
+    rb_define_method(rb_cRange, "to_s", range_to_s, 0);
+    rb_define_method(rb_cRange, "inspect", range_inspect, 0);
+
+    rb_define_method(rb_cRange, "exclude_end?", range_exclude_end_p, 0);
+
+    rb_define_method(rb_cRange, "member?", range_include, 1);
+    rb_define_method(rb_cRange, "include?", range_include, 1);
+
+    id_cmp = rb_intern("<=>");
+    id_succ = rb_intern("succ");
+    id_beg = rb_intern("begin");
+    id_end = rb_intern("end");
+    id_excl = rb_intern("excl");
+}
diff --git a/ruby_1_8_6/re.c b/ruby_1_8_6/re.c
new file mode 100644
index 0000000000..446ea4fa24
--- /dev/null
+++ b/ruby_1_8_6/re.c
@@ -0,0 +1,2309 @@
+/**********************************************************************
+
+  re.c -
+
+  $Author$
+  created at: Mon Aug  9 18:24:49 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "re.h"
+#include <ctype.h>
+
+VALUE rb_eRegexpError;
+
+#define BEG(no) regs->beg[no]
+#define END(no) regs->end[no]
+
+#if 'a' == 97   /* it's ascii */
+static const char casetable[] = {
+        '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
+        '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
+        '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
+        '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
+        /* ' '     '!'     '"'     '#'     '$'     '%'     '&'     ''' */
+        '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
+        /* '('     ')'     '*'     '+'     ','     '-'     '.'     '/' */
+        '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
+        /* '0'     '1'     '2'     '3'     '4'     '5'     '6'     '7' */
+        '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
+        /* '8'     '9'     ':'     ';'     '<'     '='     '>'     '?' */
+        '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
+        /* '@'     'A'     'B'     'C'     'D'     'E'     'F'     'G' */
+        '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+        /* 'H'     'I'     'J'     'K'     'L'     'M'     'N'     'O' */
+        '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+        /* 'P'     'Q'     'R'     'S'     'T'     'U'     'V'     'W' */
+        '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+        /* 'X'     'Y'     'Z'     '['     '\'     ']'     '^'     '_' */
+        '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
+        /* '`'     'a'     'b'     'c'     'd'     'e'     'f'     'g' */
+        '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
+        /* 'h'     'i'     'j'     'k'     'l'     'm'     'n'     'o' */
+        '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
+        /* 'p'     'q'     'r'     's'     't'     'u'     'v'     'w' */
+        '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
+        /* 'x'     'y'     'z'     '{'     '|'     '}'     '~' */
+        '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
+        '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
+        '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
+        '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
+        '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
+        '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
+        '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
+        '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
+        '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
+        '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
+        '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
+        '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
+        '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
+        '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
+        '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
+        '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
+        '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
+};
+#else
+# error >>> "You lose. You will need a translation table for your character set." <<<
+#endif
+
+int
+rb_memcicmp(x, y, len)
+    const void *x, *y;
+    long len;
+{
+    const unsigned char *p1 = x, *p2 = y;
+    int tmp;
+
+    while (len--) {
+	if (tmp = casetable[(unsigned)*p1++] - casetable[(unsigned)*p2++])
+	    return tmp;
+    }
+    return 0;
+}
+
+int
+rb_memcmp(p1, p2, len)
+    const void *p1, *p2;
+    long len;
+{
+    if (!ruby_ignorecase) {
+	return memcmp(p1, p2, len);
+    }
+    return rb_memcicmp(p1, p2, len);
+}
+
+long
+rb_memsearch(x0, m, y0, n)
+    const void *x0, *y0;
+    long m, n;
+{
+    const unsigned char *x = (unsigned char *)x0, *y = (unsigned char *)y0;
+    const unsigned char *s, *e;
+    long i;
+    int d;
+    unsigned long hx, hy;
+
+#define KR_REHASH(a, b, h) (((h) << 1) - (((unsigned long)(a))<<d) + (b))
+
+    if (m > n) return -1;
+    s = y; e = s + n - m;
+
+    /* Preprocessing */
+    /* computes d = 2^(m-1) with
+       the left-shift operator */
+    d = sizeof(hx) * CHAR_BIT - 1;
+    if (d > m) d = m;
+
+    if (ruby_ignorecase) {
+	if (n == m) {
+	    return rb_memcicmp(x, s, m) == 0 ? 0 : -1;
+	}
+	/* Prepare hash value */
+	for (hy = hx = i = 0; i < d; ++i) {
+	    hx = KR_REHASH(0, casetable[x[i]], hx);
+	    hy = KR_REHASH(0, casetable[s[i]], hy);
+	}
+	/* Searching */
+	while (hx != hy || rb_memcicmp(x, s, m)) {
+	    if (s >= e) return -1;
+	    hy = KR_REHASH(casetable[*s], casetable[*(s+d)], hy);
+	    s++;
+	}
+    }
+    else {
+	if (n == m) {
+	    return memcmp(x, s, m) == 0 ? 0 : -1;
+	}
+	/* Prepare hash value */
+	for (hy = hx = i = 0; i < d; ++i) {
+	    hx = KR_REHASH(0, x[i], hx);
+	    hy = KR_REHASH(0, s[i], hy);
+	}
+	/* Searching */
+	while (hx != hy || memcmp(x, s, m)) {
+	    if (s >= e) return -1;
+	    hy = KR_REHASH(*s, *(s+d), hy);
+	    s++;
+	}
+    }
+    return s-y;
+}
+
+#define REG_LITERAL FL_USER5
+#define REG_CASESTATE  FL_USER0
+#define KCODE_NONE  0
+#define KCODE_EUC   FL_USER1
+#define KCODE_SJIS  FL_USER2
+#define KCODE_UTF8  FL_USER3
+#define KCODE_FIXED FL_USER4
+#define KCODE_MASK (KCODE_EUC|KCODE_SJIS|KCODE_UTF8)
+
+static int reg_kcode = DEFAULT_KCODE;
+
+static void
+kcode_euc(re)
+    struct RRegexp *re;
+{
+    FL_UNSET(re, KCODE_MASK);
+    FL_SET(re, KCODE_EUC);
+    FL_SET(re, KCODE_FIXED);
+}
+
+static void
+kcode_sjis(re)
+    struct RRegexp *re;
+{
+    FL_UNSET(re, KCODE_MASK);
+    FL_SET(re, KCODE_SJIS);
+    FL_SET(re, KCODE_FIXED);
+}
+
+static void
+kcode_utf8(re)
+    struct RRegexp *re;
+{
+    FL_UNSET(re, KCODE_MASK);
+    FL_SET(re, KCODE_UTF8);
+    FL_SET(re, KCODE_FIXED);
+}
+
+static void
+kcode_none(re)
+    struct RRegexp *re;
+{
+    FL_UNSET(re, KCODE_MASK);
+    FL_SET(re, KCODE_FIXED);
+}
+
+static int curr_kcode;
+
+void
+rb_kcode_set_option(re)
+    VALUE re;
+{
+    if (!FL_TEST(re, KCODE_FIXED)) return;
+
+    curr_kcode = RBASIC(re)->flags & KCODE_MASK;
+    if (reg_kcode == curr_kcode) return;
+    switch (curr_kcode) {
+      case KCODE_NONE:
+	re_mbcinit(MBCTYPE_ASCII);
+	break;
+      case KCODE_EUC:
+	re_mbcinit(MBCTYPE_EUC);
+	break;
+      case KCODE_SJIS:
+	re_mbcinit(MBCTYPE_SJIS);
+	break;
+      case KCODE_UTF8:
+	re_mbcinit(MBCTYPE_UTF8);
+	break;
+    }
+}	  
+
+void
+rb_kcode_reset_option()
+{
+    if (reg_kcode == curr_kcode) return;
+    switch (reg_kcode) {
+      case KCODE_NONE:
+	re_mbcinit(MBCTYPE_ASCII);
+	break;
+      case KCODE_EUC:
+	re_mbcinit(MBCTYPE_EUC);
+	break;
+      case KCODE_SJIS:
+	re_mbcinit(MBCTYPE_SJIS);
+	break;
+      case KCODE_UTF8:
+	re_mbcinit(MBCTYPE_UTF8);
+	break;
+    }
+}
+
+int
+rb_reg_mbclen2(c, re)
+    unsigned int c;
+    VALUE re;
+{
+    int len;
+
+    if (!FL_TEST(re, KCODE_FIXED))
+	return mbclen(c);
+    rb_kcode_set_option(re);
+    len = mbclen(c);
+    rb_kcode_reset_option();
+    return len;
+}
+
+static void
+rb_reg_check(re)
+    VALUE re;
+{
+    if (!RREGEXP(re)->ptr || !RREGEXP(re)->str) {
+	rb_raise(rb_eTypeError, "uninitialized Regexp");
+    }
+}
+
+extern int ruby_in_compile;
+
+static void
+rb_reg_expr_str(str, s, len)
+    VALUE str;
+    const char *s;
+    long len;
+{
+    const char *p, *pend;
+    int need_escape = 0;
+
+    p = s; pend = p + len;
+    while (p<pend) {
+	if (*p == '/' || (!ISPRINT(*p) && !ismbchar(*p))) {
+	    need_escape = 1;
+	    break;
+	}
+	p += mbclen(*p);
+    }
+    if (!need_escape) {
+	rb_str_buf_cat(str, s, len);
+    }
+    else {
+	p = s; 
+	while (p<pend) {
+	    if (*p == '\\') {
+		int n = mbclen(p[1]) + 1;
+		rb_str_buf_cat(str, p, n);
+		p += n;
+		continue;
+	    }
+	    else if (*p == '/') {
+		char c = '\\';
+		rb_str_buf_cat(str, &c, 1);
+		rb_str_buf_cat(str, p, 1);
+	    }
+	    else if (ismbchar(*p)) {
+	    	rb_str_buf_cat(str, p, mbclen(*p));
+		p += mbclen(*p);
+		continue;
+	    }
+	    else if (ISPRINT(*p)) {
+		rb_str_buf_cat(str, p, 1);
+	    }
+	    else if (!ISSPACE(*p)) {
+		char b[8];
+
+		sprintf(b, "\\%03o", *p & 0377);
+		rb_str_buf_cat(str, b, 4);
+	    }
+	    else {
+		rb_str_buf_cat(str, p, 1);
+	    }
+	    p++;
+	}
+    }
+}
+
+static VALUE
+rb_reg_desc(s, len, re)
+    const char *s;
+    long len;
+    VALUE re;
+{
+    VALUE str = rb_str_buf_new2("/");
+
+    rb_reg_expr_str(str, s, len);
+    rb_str_buf_cat2(str, "/");
+    if (re) {
+	rb_reg_check(re);
+	if (RREGEXP(re)->ptr->options & RE_OPTION_MULTILINE)
+	    rb_str_buf_cat2(str, "m");
+	if (RREGEXP(re)->ptr->options & RE_OPTION_IGNORECASE)
+	    rb_str_buf_cat2(str, "i");
+	if (RREGEXP(re)->ptr->options & RE_OPTION_EXTENDED)
+	    rb_str_buf_cat2(str, "x");
+	
+	if (FL_TEST(re, KCODE_FIXED)) {
+	    switch ((RBASIC(re)->flags & KCODE_MASK)) {
+	      case KCODE_NONE:
+		rb_str_buf_cat2(str, "n");
+		break;
+	      case KCODE_EUC:
+		rb_str_buf_cat2(str, "e");
+		break;
+	      case KCODE_SJIS:
+		rb_str_buf_cat2(str, "s");
+		break;
+	      case KCODE_UTF8:
+		rb_str_buf_cat2(str, "u");
+		break;
+	    }
+	}
+    }
+    OBJ_INFECT(str, re);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     rxp.source   => str
+ *  
+ *  Returns the original string of the pattern.
+ *     
+ *     /ab+c/ix.source   #=> "ab+c"
+ */
+
+static VALUE
+rb_reg_source(re)
+    VALUE re;
+{
+    VALUE str;
+
+    rb_reg_check(re);
+    str = rb_str_new(RREGEXP(re)->str,RREGEXP(re)->len);
+    if (OBJ_TAINTED(re)) OBJ_TAINT(str);
+    return str;
+}
+
+/*
+ * call-seq:
+ *    rxp.inspect   => string
+ *
+ * Produce a nicely formatted string-version of _rxp_. Perhaps surprisingly,
+ * <code>#inspect</code> actually produces the more natural version of
+ * the string than <code>#to_s</code>.
+ *
+ *     /ab+c/ix.to_s         #=> /ab+c/ix
+*/
+
+static VALUE
+rb_reg_inspect(re)
+    VALUE re;
+{
+    rb_reg_check(re);
+    return rb_reg_desc(RREGEXP(re)->str, RREGEXP(re)->len, re);
+}
+
+
+/*
+ *  call-seq:
+ *     rxp.to_s   => str
+ *  
+ *  Returns a string containing the regular expression and its options (using the
+ *  <code>(?xxx:yyy)</code> notation. This string can be fed back in to
+ *  <code>Regexp::new</code> to a regular expression with the same semantics as
+ *  the original. (However, <code>Regexp#==</code> may not return true when
+ *  comparing the two, as the source of the regular expression itself may
+ *  differ, as the example shows).  <code>Regexp#inspect</code> produces a
+ *  generally more readable version of <i>rxp</i>.
+ *     
+ *     r1 = /ab+c/ix         #=> /ab+c/ix
+ *     s1 = r1.to_s          #=> "(?ix-m:ab+c)"
+ *     r2 = Regexp.new(s1)   #=> /(?ix-m:ab+c)/
+ *     r1 == r2              #=> false
+ *     r1.source             #=> "ab+c"
+ *     r2.source             #=> "(?ix-m:ab+c)"
+ */
+
+static VALUE
+rb_reg_to_s(re)
+    VALUE re;
+{
+    int options;
+    const int embeddable = RE_OPTION_MULTILINE|RE_OPTION_IGNORECASE|RE_OPTION_EXTENDED;
+    long len;
+    const char* ptr;
+    VALUE str = rb_str_buf_new2("(?");
+
+    rb_reg_check(re);
+
+    options = RREGEXP(re)->ptr->options;
+    ptr = RREGEXP(re)->str;
+    len = RREGEXP(re)->len;
+  again:
+    if (len >= 4 && ptr[0] == '(' && ptr[1] == '?') {
+	int err = 1;
+	ptr += 2;
+	if ((len -= 2) > 0) {
+	    do {
+		if (*ptr == 'm') {
+		    options |= RE_OPTION_MULTILINE;
+		}
+		else if (*ptr == 'i') {
+		    options |= RE_OPTION_IGNORECASE;
+		}
+		else if (*ptr == 'x') {
+		    options |= RE_OPTION_EXTENDED;
+		}
+		else break;
+		++ptr;
+	    } while (--len > 0);
+	}
+	if (len > 1 && *ptr == '-') {
+	    ++ptr;
+	    --len;
+	    do {
+		if (*ptr == 'm') {
+		    options &= ~RE_OPTION_MULTILINE;
+		}
+		else if (*ptr == 'i') {
+		    options &= ~RE_OPTION_IGNORECASE;
+		}
+		else if (*ptr == 'x') {
+		    options &= ~RE_OPTION_EXTENDED;
+		}
+		else break;
+		++ptr;
+	    } while (--len > 0);
+	}
+	if (*ptr == ')') {
+	    --len;
+	    ++ptr;
+	    goto again;
+	}
+	if (*ptr == ':' && ptr[len-1] == ')') {
+	    Regexp *rp;
+	    rb_kcode_set_option(re);
+	    rp = ALLOC(Regexp);
+	    MEMZERO((char *)rp, Regexp, 1);
+	    err = re_compile_pattern(++ptr, len -= 2, rp) != 0;
+	    rb_kcode_reset_option();
+	    re_free_pattern(rp);
+	}
+	if (err) {
+	    options = RREGEXP(re)->ptr->options;
+	    ptr = RREGEXP(re)->str;
+	    len = RREGEXP(re)->len;
+	}
+    }
+
+    if (options & RE_OPTION_MULTILINE) rb_str_buf_cat2(str, "m");
+    if (options & RE_OPTION_IGNORECASE) rb_str_buf_cat2(str, "i");
+    if (options & RE_OPTION_EXTENDED) rb_str_buf_cat2(str, "x");
+
+    if ((options & embeddable) != embeddable) {
+	rb_str_buf_cat2(str, "-");
+	if (!(options & RE_OPTION_MULTILINE)) rb_str_buf_cat2(str, "m");
+	if (!(options & RE_OPTION_IGNORECASE)) rb_str_buf_cat2(str, "i");
+	if (!(options & RE_OPTION_EXTENDED)) rb_str_buf_cat2(str, "x");
+    }
+
+    rb_str_buf_cat2(str, ":");
+    rb_reg_expr_str(str, ptr, len);
+    rb_str_buf_cat2(str, ")");
+
+    OBJ_INFECT(str, re);
+    return str;
+}
+
+static void
+rb_reg_raise(s, len, err, re)
+    const char *s;
+    long len;
+    const char *err;
+    VALUE re;
+{
+    VALUE desc = rb_reg_desc(s, len, re);
+
+    if (ruby_in_compile)
+	rb_compile_error("%s: %s", err, RSTRING(desc)->ptr);
+    else
+	rb_raise(rb_eRegexpError, "%s: %s", err, RSTRING(desc)->ptr);
+}
+
+
+/*
+ *  call-seq:
+ *     rxp.casefold?   => true or false
+ *  
+ *  Returns the value of the case-insensitive flag.
+ */
+
+static VALUE
+rb_reg_casefold_p(re)
+    VALUE re;
+{
+    rb_reg_check(re);
+    if (RREGEXP(re)->ptr->options & RE_OPTION_IGNORECASE) return Qtrue;
+    return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     rxp.options   => fixnum
+ *  
+ *  Returns the set of bits corresponding to the options used when creating this
+ *  Regexp (see <code>Regexp::new</code> for details. Note that additional bits
+ *  may be set in the returned options: these are used internally by the regular
+ *  expression code. These extra bits are ignored if the options are passed to
+ *  <code>Regexp::new</code>.
+ *     
+ *     Regexp::IGNORECASE                  #=> 1
+ *     Regexp::EXTENDED                    #=> 2
+ *     Regexp::MULTILINE                   #=> 4
+ *     
+ *     /cat/.options                       #=> 128
+ *     /cat/ix.options                     #=> 131
+ *     Regexp.new('cat', true).options     #=> 129
+ *     Regexp.new('cat', 0, 's').options   #=> 384
+ *     
+ *     r = /cat/ix
+ *     Regexp.new(r.source, r.options)     #=> /cat/ix
+ */
+
+static VALUE
+rb_reg_options_m(re)
+    VALUE re;
+{
+    int options = rb_reg_options(re);
+    return INT2NUM(options);
+}
+
+
+/*
+ *  call-seq:
+ *     rxp.kcode   => str
+ *  
+ *  Returns the character set code for the regexp.
+ */
+
+static VALUE
+rb_reg_kcode_m(re)
+    VALUE re;
+{
+    char *kcode;
+
+    if (FL_TEST(re, KCODE_FIXED)) {
+	switch (RBASIC(re)->flags & KCODE_MASK) {
+	  case KCODE_NONE:
+	    kcode = "none"; break;
+	  case KCODE_EUC:
+	    kcode = "euc"; break;
+	  case KCODE_SJIS:
+	    kcode = "sjis"; break;
+	  case KCODE_UTF8:
+	    kcode = "utf8"; break;
+	  default:
+	    rb_bug("unknown kcode - should not happen");
+	    break;
+	}
+	return rb_str_new2(kcode);
+    }
+    return Qnil;
+}
+
+static Regexp*
+make_regexp(s, len, flags)
+    const char *s;
+    long len;
+    int flags;
+{
+    Regexp *rp;
+    char *err;
+
+    /* Handle escaped characters first. */
+
+    /* Build a copy of the string (in dest) with the
+       escaped characters translated,  and generate the regex
+       from that.
+    */
+
+    rp = ALLOC(Regexp);
+    MEMZERO((char *)rp, Regexp, 1);
+    rp->buffer = ALLOC_N(char, 16);
+    rp->allocated = 16;
+    rp->fastmap = ALLOC_N(char, 256);
+    if (flags) {
+	rp->options = flags;
+    }
+    err = re_compile_pattern(s, len, rp);
+
+    if (err != NULL) {
+	re_free_pattern(rp);
+	rb_reg_raise(s, len, err, 0);
+	return 0;
+    }
+    return rp;
+}
+
+
+/*
+ *  Document-class: MatchData
+ *
+ *  <code>MatchData</code> is the type of the special variable <code>$~</code>,
+ *  and is the type of the object returned by <code>Regexp#match</code> and
+ *  <code>Regexp#last_match</code>. It encapsulates all the results of a pattern
+ *  match, results normally accessed through the special variables
+ *  <code>$&</code>, <code>$'</code>, <code>$`</code>, <code>$1</code>,
+ *  <code>$2</code>, and so on. <code>Matchdata</code> is also known as
+ *  <code>MatchingData</code>.
+ *
+ */
+
+VALUE rb_cMatch;
+
+static VALUE match_alloc _((VALUE));
+static VALUE
+match_alloc(klass)
+    VALUE klass;
+{
+    NEWOBJ(match, struct RMatch);
+    OBJSETUP(match, klass, T_MATCH);
+
+    match->str = 0;
+    match->regs = 0;
+    match->regs = ALLOC(struct re_registers);
+    MEMZERO(match->regs, struct re_registers, 1);
+
+    return (VALUE)match;
+}
+
+/* :nodoc: */
+static VALUE
+match_init_copy(obj, orig)
+    VALUE obj, orig;
+{
+    if (obj == orig) return obj;
+
+    if (!rb_obj_is_instance_of(orig, rb_obj_class(obj))) {
+	rb_raise(rb_eTypeError, "wrong argument class");
+    }
+    RMATCH(obj)->str = RMATCH(orig)->str;
+    re_free_registers(RMATCH(obj)->regs);
+    RMATCH(obj)->regs->allocated = 0;
+    re_copy_registers(RMATCH(obj)->regs, RMATCH(orig)->regs);
+
+    return obj;
+}
+
+
+/*
+ *  call-seq:
+ *     mtch.length   => integer
+ *     mtch.size     => integer
+ *  
+ *  Returns the number of elements in the match array.
+ *     
+ *     m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+ *     m.length   #=> 5
+ *     m.size     #=> 5
+ */
+
+static VALUE
+match_size(match)
+    VALUE match;
+{
+    return INT2FIX(RMATCH(match)->regs->num_regs);
+}
+
+
+/*
+ *  call-seq:
+ *     mtch.offset(n)   => array
+ *  
+ *  Returns a two-element array containing the beginning and ending offsets of
+ *  the <em>n</em>th match.
+ *     
+ *     m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+ *     m.offset(0)   #=> [1, 7]
+ *     m.offset(4)   #=> [6, 7]
+ */
+
+static VALUE
+match_offset(match, n)
+    VALUE match, n;
+{
+    int i = NUM2INT(n);
+
+    if (i < 0 || RMATCH(match)->regs->num_regs <= i)
+	rb_raise(rb_eIndexError, "index %d out of matches", i);
+
+    if (RMATCH(match)->regs->beg[i] < 0)
+	return rb_assoc_new(Qnil, Qnil);
+
+    return rb_assoc_new(INT2FIX(RMATCH(match)->regs->beg[i]),
+			INT2FIX(RMATCH(match)->regs->end[i]));
+}
+
+
+/*
+ *  call-seq:
+ *     mtch.begin(n)   => integer
+ *  
+ *  Returns the offset of the start of the <em>n</em>th element of the match
+ *  array in the string.
+ *     
+ *     m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+ *     m.begin(0)   #=> 1
+ *     m.begin(2)   #=> 2
+ */
+
+static VALUE
+match_begin(match, n)
+    VALUE match, n;
+{
+    int i = NUM2INT(n);
+
+    if (i < 0 || RMATCH(match)->regs->num_regs <= i)
+	rb_raise(rb_eIndexError, "index %d out of matches", i);
+
+    if (RMATCH(match)->regs->beg[i] < 0)
+	return Qnil;
+
+    return INT2FIX(RMATCH(match)->regs->beg[i]);
+}
+
+
+/*
+ *  call-seq:
+ *     mtch.end(n)   => integer
+ *  
+ *  Returns the offset of the character immediately following the end of the
+ *  <em>n</em>th element of the match array in the string.
+ *     
+ *     m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+ *     m.end(0)   #=> 7
+ *     m.end(2)   #=> 3
+ */
+
+static VALUE
+match_end(match, n)
+    VALUE match, n;
+{
+    int i = NUM2INT(n);
+
+    if (i < 0 || RMATCH(match)->regs->num_regs <= i)
+	rb_raise(rb_eIndexError, "index %d out of matches", i);
+
+    if (RMATCH(match)->regs->beg[i] < 0)
+	return Qnil;
+
+    return INT2FIX(RMATCH(match)->regs->end[i]);
+}
+
+#define MATCH_BUSY FL_USER2
+
+void
+rb_match_busy(match)
+    VALUE match;
+{
+    FL_SET(match, MATCH_BUSY);
+}
+
+int ruby_ignorecase;
+static int may_need_recompile;
+
+static void
+rb_reg_prepare_re(re)
+    VALUE re;
+{
+    int need_recompile = 0;
+    int state;
+
+    rb_reg_check(re);
+    state = FL_TEST(re, REG_CASESTATE);
+    /* ignorecase status */
+    if (ruby_ignorecase && !state) {
+	FL_SET(re, REG_CASESTATE);
+	RREGEXP(re)->ptr->options |= RE_OPTION_IGNORECASE;
+	need_recompile = 1;
+    }
+    if (!ruby_ignorecase && state) {
+	FL_UNSET(re, REG_CASESTATE);
+	RREGEXP(re)->ptr->options &= ~RE_OPTION_IGNORECASE;
+	need_recompile = 1;
+    }
+
+    if (!FL_TEST(re, KCODE_FIXED) &&
+	(RBASIC(re)->flags & KCODE_MASK) != reg_kcode) {
+	need_recompile = 1;
+	RBASIC(re)->flags &= ~KCODE_MASK;
+	RBASIC(re)->flags |= reg_kcode;
+    }
+
+    if (need_recompile) {
+	char *err;
+
+	if (FL_TEST(re, KCODE_FIXED))
+	    rb_kcode_set_option(re);
+	rb_reg_check(re);
+	RREGEXP(re)->ptr->fastmap_accurate = 0;
+	err = re_compile_pattern(RREGEXP(re)->str, RREGEXP(re)->len, RREGEXP(re)->ptr);
+	if (err != NULL) {
+	    rb_reg_raise(RREGEXP(re)->str, RREGEXP(re)->len, err, re);
+	}
+    }
+}
+
+long
+rb_reg_adjust_startpos(re, str, pos, reverse)
+    VALUE re, str;
+    long pos, reverse;
+{
+    long range;
+
+    rb_reg_check(re);
+    if (may_need_recompile) rb_reg_prepare_re(re);
+
+    if (FL_TEST(re, KCODE_FIXED))
+	rb_kcode_set_option(re);
+    else if (reg_kcode != curr_kcode)
+	rb_kcode_reset_option();
+
+    if (reverse) {
+	range = -pos;
+    }
+    else {
+	range = RSTRING(str)->len - pos;
+    }
+    return re_adjust_startpos(RREGEXP(re)->ptr,
+			      RSTRING(str)->ptr, RSTRING(str)->len,
+			      pos, range);
+}
+
+long
+rb_reg_search(re, str, pos, reverse)
+    VALUE re, str;
+    long pos, reverse;
+{
+    long result;
+    VALUE match;
+    static struct re_registers regs;
+    long range;
+
+    if (pos > RSTRING(str)->len || pos < 0) {
+	rb_backref_set(Qnil);
+	return -1;
+    }
+
+    rb_reg_check(re);
+    if (may_need_recompile) rb_reg_prepare_re(re);
+
+    if (FL_TEST(re, KCODE_FIXED))
+	rb_kcode_set_option(re);
+    else if (reg_kcode != curr_kcode)
+	rb_kcode_reset_option();
+
+    if (reverse) {
+	range = -pos;
+    }
+    else {
+	range = RSTRING(str)->len - pos;
+    }
+    result = re_search(RREGEXP(re)->ptr,RSTRING(str)->ptr,RSTRING(str)->len,
+		       pos, range, &regs);
+
+    if (FL_TEST(re, KCODE_FIXED))
+	rb_kcode_reset_option();
+
+    if (result == -2) {
+	rb_reg_raise(RREGEXP(re)->str, RREGEXP(re)->len,
+		     "Stack overflow in regexp matcher", re);
+    }
+
+    if (result < 0) {
+	rb_backref_set(Qnil);
+	return result;
+    }
+
+    match = rb_backref_get();
+    if (NIL_P(match) || FL_TEST(match, MATCH_BUSY)) {
+	match = match_alloc(rb_cMatch);
+    }
+    else {
+	if (rb_safe_level() >= 3) 
+	    OBJ_TAINT(match);
+	else
+	    FL_UNSET(match, FL_TAINT);
+    }
+
+    re_copy_registers(RMATCH(match)->regs, &regs);
+    RMATCH(match)->str = rb_str_new4(str);
+    rb_backref_set(match);
+
+    OBJ_INFECT(match, re);
+    OBJ_INFECT(match, str);
+    return result;
+}
+
+VALUE
+rb_reg_nth_defined(nth, match)
+    int nth;
+    VALUE match;
+{
+    if (NIL_P(match)) return Qnil;
+    if (nth >= RMATCH(match)->regs->num_regs) {
+	return Qnil;
+    }
+    if (nth < 0) {
+	nth += RMATCH(match)->regs->num_regs;
+	if (nth <= 0) return Qnil;
+    }
+    if (RMATCH(match)->BEG(nth) == -1) return Qfalse;
+    return Qtrue;
+}
+
+VALUE
+rb_reg_nth_match(nth, match)
+    int nth;
+    VALUE match;
+{
+    VALUE str;
+    long start, end, len;
+
+    if (NIL_P(match)) return Qnil;
+    if (nth >= RMATCH(match)->regs->num_regs) {
+	return Qnil;
+    }
+    if (nth < 0) {
+	nth += RMATCH(match)->regs->num_regs;
+	if (nth <= 0) return Qnil;
+    }
+    start = RMATCH(match)->BEG(nth);
+    if (start == -1) return Qnil;
+    end = RMATCH(match)->END(nth);
+    len = end - start;
+    str = rb_str_substr(RMATCH(match)->str, start, len);
+    OBJ_INFECT(str, match);
+    return str;
+}
+
+VALUE
+rb_reg_last_match(match)
+    VALUE match;
+{
+    return rb_reg_nth_match(0, match);
+}
+
+
+/*
+ *  call-seq:
+ *     mtch.pre_match   => str
+ *  
+ *  Returns the portion of the original string before the current match.
+ *  Equivalent to the special variable <code>$`</code>.
+ *     
+ *     m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+ *     m.pre_match   #=> "T"
+ */
+
+VALUE
+rb_reg_match_pre(match)
+    VALUE match;
+{
+    VALUE str;
+
+    if (NIL_P(match)) return Qnil;
+    if (RMATCH(match)->BEG(0) == -1) return Qnil;
+    str = rb_str_substr(RMATCH(match)->str, 0, RMATCH(match)->BEG(0));
+    if (OBJ_TAINTED(match)) OBJ_TAINT(str);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     mtch.post_match   => str
+ *  
+ *  Returns the portion of the original string after the current match.
+ *  Equivalent to the special variable <code>$'</code>.
+ *     
+ *     m = /(.)(.)(\d+)(\d)/.match("THX1138: The Movie")
+ *     m.post_match   #=> ": The Movie"
+ */
+
+VALUE
+rb_reg_match_post(match)
+    VALUE match;
+{
+    VALUE str;
+    long pos;
+
+    if (NIL_P(match)) return Qnil;
+    if (RMATCH(match)->BEG(0) == -1) return Qnil;
+    str = RMATCH(match)->str;
+    pos = RMATCH(match)->END(0);
+    str = rb_str_substr(str, pos, RSTRING(str)->len - pos);
+    if (OBJ_TAINTED(match)) OBJ_TAINT(str);
+    return str;
+}
+
+VALUE
+rb_reg_match_last(match)
+    VALUE match;
+{
+    int i;
+
+    if (NIL_P(match)) return Qnil;
+    if (RMATCH(match)->BEG(0) == -1) return Qnil;
+
+    for (i=RMATCH(match)->regs->num_regs-1; RMATCH(match)->BEG(i) == -1 && i > 0; i--)
+	;
+    if (i == 0) return Qnil;
+    return rb_reg_nth_match(i, match);
+}
+
+static VALUE
+last_match_getter()
+{
+    return rb_reg_last_match(rb_backref_get());
+}
+
+static VALUE
+prematch_getter()
+{
+    return rb_reg_match_pre(rb_backref_get());
+}
+
+static VALUE
+postmatch_getter()
+{
+    return rb_reg_match_post(rb_backref_get());
+}
+
+static VALUE
+last_paren_match_getter()
+{
+    return rb_reg_match_last(rb_backref_get());
+}
+
+static VALUE
+match_array(match, start)
+    VALUE match;
+    int start;
+{
+    struct re_registers *regs = RMATCH(match)->regs;
+    VALUE ary = rb_ary_new2(regs->num_regs);
+    VALUE target = RMATCH(match)->str;
+    int i;
+    int taint = OBJ_TAINTED(match);
+    
+    for (i=start; i<regs->num_regs; i++) {
+	if (regs->beg[i] == -1) {
+	    rb_ary_push(ary, Qnil);
+	}
+	else {
+	    VALUE str = rb_str_substr(target, regs->beg[i], regs->end[i]-regs->beg[i]);
+	    if (taint) OBJ_TAINT(str);
+	    rb_ary_push(ary, str);
+	}
+    }
+    return ary;
+}
+
+
+/* [MG]:FIXME: I put parens around the /.../.match() in the first line of the
+   second example to prevent the '*' followed by a '/' from ending the
+   comment. */
+
+/*
+ *  call-seq:
+ *     mtch.to_a   => anArray
+ *  
+ *  Returns the array of matches.
+ *     
+ *     m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+ *     m.to_a   #=> ["HX1138", "H", "X", "113", "8"]
+ *     
+ *  Because <code>to_a</code> is called when expanding
+ *  <code>*</code><em>variable</em>, there's a useful assignment
+ *  shortcut for extracting matched fields. This is slightly slower than
+ *  accessing the fields directly (as an intermediate array is
+ *  generated).
+ *     
+ *     all,f1,f2,f3 = *(/(.)(.)(\d+)(\d)/.match("THX1138."))
+ *     all   #=> "HX1138"
+ *     f1    #=> "H"
+ *     f2    #=> "X"
+ *     f3    #=> "113"
+ */
+
+static VALUE
+match_to_a(match)
+    VALUE match;
+{
+    return match_array(match, 0);
+}
+
+
+/*
+ *  call-seq:
+ *     mtch.captures   => array
+ *
+ *  Returns the array of captures; equivalent to <code>mtch.to_a[1..-1]</code>.
+ *
+ *     f1,f2,f3,f4 = /(.)(.)(\d+)(\d)/.match("THX1138.").captures
+ *     f1    #=> "H"
+ *     f2    #=> "X"
+ *     f3    #=> "113"
+ *     f4    #=> "8"
+ */
+static VALUE
+match_captures(match)
+    VALUE match;
+{
+    return match_array(match, 1);
+}
+
+
+/*
+ *  call-seq:
+ *     mtch[i]               => obj
+ *     mtch[start, length]   => array
+ *     mtch[range]           => array
+ *  
+ *  Match Reference---<code>MatchData</code> acts as an array, and may be
+ *  accessed using the normal array indexing techniques.  <i>mtch</i>[0] is
+ *  equivalent to the special variable <code>$&</code>, and returns the entire
+ *  matched string.  <i>mtch</i>[1], <i>mtch</i>[2], and so on return the values
+ *  of the matched backreferences (portions of the pattern between parentheses).
+ *     
+ *     m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+ *     m[0]       #=> "HX1138"
+ *     m[1, 2]    #=> ["H", "X"]
+ *     m[1..3]    #=> ["H", "X", "113"]
+ *     m[-3, 2]   #=> ["X", "113"]
+ */
+
+static VALUE
+match_aref(argc, argv, match)
+    int argc;
+    VALUE *argv;
+    VALUE match;
+{
+    VALUE idx, rest;
+
+    rb_scan_args(argc, argv, "11", &idx, &rest);
+
+    if (!NIL_P(rest) || !FIXNUM_P(idx) || FIX2INT(idx) < 0) {
+	return rb_ary_aref(argc, argv, match_to_a(match));
+    }
+    return rb_reg_nth_match(FIX2INT(idx), match);
+}
+
+static VALUE match_entry _((VALUE, long));
+static VALUE
+match_entry(match, n)
+    VALUE match;
+    long n;
+{
+    return rb_reg_nth_match(n, match);
+}
+
+
+/*
+ *  call-seq:
+ *     mtch.select([index]*)   => array
+ *  
+ *  Uses each <i>index</i> to access the matching values, returning an array of
+ *  the corresponding matches.
+ *     
+ *     m = /(.)(.)(\d+)(\d)/.match("THX1138: The Movie")
+ *     m.to_a               #=> ["HX1138", "H", "X", "113", "8"]
+ *     m.select(0, 2, -2)   #=> ["HX1138", "X", "113"]
+ */
+
+static VALUE
+match_values_at(argc, argv, match)
+    int argc;
+    VALUE *argv;
+    VALUE match;
+{
+    return rb_values_at(match, RMATCH(match)->regs->num_regs, argc, argv, match_entry);
+}
+
+
+/*
+ *  call-seq:
+ *     mtch.select([index]*)   => array
+ *  
+ *  Uses each <i>index</i> to access the matching values, returning an
+ *  array of the corresponding matches.
+ *     
+ *     m = /(.)(.)(\d+)(\d)/.match("THX1138: The Movie")
+ *     m.to_a               #=> ["HX1138", "H", "X", "113", "8"]
+ *     m.select(0, 2, -2)   #=> ["HX1138", "X", "113"]
+ */
+
+static VALUE
+match_select(argc, argv, match)
+    int argc;
+    VALUE *argv;
+    VALUE match;
+{
+    if (argc > 0) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+    }
+    else {
+	struct re_registers *regs = RMATCH(match)->regs;
+	VALUE target = RMATCH(match)->str;
+	VALUE result = rb_ary_new();
+	int i;
+	int taint = OBJ_TAINTED(match);
+
+	for (i=0; i<regs->num_regs; i++) {
+	    VALUE str = rb_str_substr(target, regs->beg[i], regs->end[i]-regs->beg[i]);
+	    if (taint) OBJ_TAINT(str);
+	    if (RTEST(rb_yield(str))) {
+		rb_ary_push(result, str);
+	    }
+	}
+	return result;
+    }
+}
+
+
+/*
+ *  call-seq:
+ *     mtch.to_s   => str
+ *  
+ *  Returns the entire matched string.
+ *     
+ *     m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+ *     m.to_s   #=> "HX1138"
+ */
+
+static VALUE
+match_to_s(match)
+    VALUE match;
+{
+    VALUE str = rb_reg_last_match(match);
+
+    if (NIL_P(str)) str = rb_str_new(0,0);
+    if (OBJ_TAINTED(match)) OBJ_TAINT(str);
+    if (OBJ_TAINTED(RMATCH(match)->str)) OBJ_TAINT(str);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     mtch.string   => str
+ *  
+ *  Returns a frozen copy of the string passed in to <code>match</code>.
+ *     
+ *     m = /(.)(.)(\d+)(\d)/.match("THX1138.")
+ *     m.string   #=> "THX1138."
+ */
+
+static VALUE
+match_string(match)
+    VALUE match;
+{
+    return RMATCH(match)->str;	/* str is frozen */
+}
+
+VALUE rb_cRegexp;
+
+static void
+rb_reg_initialize(obj, s, len, options)
+    VALUE obj;
+    const char *s;
+    long len;
+    int options;		/* CASEFOLD  = 1 */
+				/* EXTENDED  = 2 */
+				/* MULTILINE = 4 */
+				/* CODE_NONE = 16 */
+				/* CODE_EUC  = 32 */
+				/* CODE_SJIS = 48 */
+				/* CODE_UTF8 = 64 */
+{
+    struct RRegexp *re = RREGEXP(obj);
+
+    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify regexp");
+    rb_check_frozen(obj);
+    if (FL_TEST(obj, REG_LITERAL))
+	rb_raise(rb_eSecurityError, "can't modify literal regexp");
+    if (re->ptr) re_free_pattern(re->ptr);
+    if (re->str) free(re->str);
+    re->ptr = 0;
+    re->str = 0;
+
+    switch (options & ~0xf) {
+      case 0:
+      default:
+	FL_SET(re, reg_kcode);
+	break;
+      case 16:
+	kcode_none(re);
+	break;
+      case 32:
+	kcode_euc(re);
+	break;
+      case 48:
+	kcode_sjis(re);
+	break;
+      case 64:
+	kcode_utf8(re);
+	break;
+    }
+
+    if (options & ~0xf) {
+	rb_kcode_set_option((VALUE)re);
+    }
+    if (ruby_ignorecase) {
+	options |= RE_OPTION_IGNORECASE;
+	FL_SET(re, REG_CASESTATE);
+    }
+    re->ptr = make_regexp(s, len, options & 0xf);
+    re->str = ALLOC_N(char, len+1);
+    memcpy(re->str, s, len);
+    re->str[len] = '\0';
+    re->len = len;
+    if (options & ~0xf) {
+	rb_kcode_reset_option();
+    }
+    if (ruby_in_compile) FL_SET(obj, REG_LITERAL);
+}
+
+static VALUE rb_reg_s_alloc _((VALUE));
+static VALUE
+rb_reg_s_alloc(klass)
+    VALUE klass;
+{
+    NEWOBJ(re, struct RRegexp);
+    OBJSETUP(re, klass, T_REGEXP);
+
+    re->ptr = 0;
+    re->len = 0;
+    re->str = 0;
+
+    return (VALUE)re;
+}
+
+VALUE
+rb_reg_new(s, len, options)
+    const char *s;
+    long len;
+    int options;
+{
+    VALUE re = rb_reg_s_alloc(rb_cRegexp);
+
+    rb_reg_initialize(re, s, len, options);
+    return (VALUE)re;
+}
+
+static int case_cache;
+static int kcode_cache;
+static VALUE reg_cache;
+
+VALUE
+rb_reg_regcomp(str)
+    VALUE str;
+{
+    volatile VALUE save_str = str;
+    if (reg_cache && RREGEXP(reg_cache)->len == RSTRING(str)->len
+	&& case_cache == ruby_ignorecase
+	&& kcode_cache == reg_kcode
+	&& memcmp(RREGEXP(reg_cache)->str, RSTRING(str)->ptr, RSTRING(str)->len) == 0)
+	return reg_cache;
+
+    case_cache = ruby_ignorecase;
+    kcode_cache = reg_kcode;
+    return reg_cache = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
+				  ruby_ignorecase);
+}
+
+static int
+rb_reg_cur_kcode(re)
+    VALUE re;
+{
+    if (FL_TEST(re, KCODE_FIXED)) {
+	return RBASIC(re)->flags & KCODE_MASK;
+    }
+    return 0;
+}
+
+/*
+ * call-seq:
+ *   rxp.hash   => fixnum
+ *
+ * Produce a hash based on the text and options of this regular expression.
+ */
+
+static VALUE
+rb_reg_hash(re)
+    VALUE re;
+{
+    int hashval, len;
+    char *p;
+
+    rb_reg_check(re);
+    hashval = RREGEXP(re)->ptr->options;
+    len = RREGEXP(re)->len;
+    p  = RREGEXP(re)->str;
+    while (len--) {
+	hashval = hashval * 33 + *p++;
+    }
+    hashval = hashval + (hashval>>5);
+    
+    return INT2FIX(hashval);
+}
+
+
+/*
+ *  call-seq:
+ *     rxp == other_rxp      => true or false
+ *     rxp.eql?(other_rxp)   => true or false
+ *  
+ *  Equality---Two regexps are equal if their patterns are identical, they have
+ *  the same character set code, and their <code>casefold?</code> values are the
+ *  same.
+ *     
+ *     /abc/  == /abc/x   #=> false
+ *     /abc/  == /abc/i   #=> false
+ *     /abc/u == /abc/n   #=> false
+ */
+
+static VALUE
+rb_reg_equal(re1, re2)
+    VALUE re1, re2;
+{
+    if (re1 == re2) return Qtrue;
+    if (TYPE(re2) != T_REGEXP) return Qfalse;
+    rb_reg_check(re1); rb_reg_check(re2);
+    if (RREGEXP(re1)->len != RREGEXP(re2)->len) return Qfalse;
+    if (memcmp(RREGEXP(re1)->str, RREGEXP(re2)->str, RREGEXP(re1)->len) == 0 &&
+	rb_reg_cur_kcode(re1) == rb_reg_cur_kcode(re2) &&
+	RREGEXP(re1)->ptr->options == RREGEXP(re2)->ptr->options) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+
+/*
+ *  call-seq:
+ *     rxp.match(str)   => matchdata or nil
+ *  
+ *  Returns a <code>MatchData</code> object describing the match, or
+ *  <code>nil</code> if there was no match. This is equivalent to retrieving the
+ *  value of the special variable <code>$~</code> following a normal match.
+ *     
+ *     /(.)(.)(.)/.match("abc")[2]   #=> "b"
+ */
+
+VALUE
+rb_reg_match(re, str)
+    VALUE re, str;
+{
+    long start;
+
+    if (NIL_P(str)) {
+	rb_backref_set(Qnil);
+	return Qnil;
+    }
+    StringValue(str);
+    start = rb_reg_search(re, str, 0, 0);
+    if (start < 0) {
+	return Qnil;
+    }
+    return LONG2FIX(start);
+}
+
+
+/*
+ *  call-seq:
+ *     rxp === str   => true or false
+ *  
+ *  Case Equality---Synonym for <code>Regexp#=~</code> used in case statements.
+ *     
+ *     a = "HELLO"
+ *     case a
+ *     when /^[a-z]*$/; print "Lower case\n"
+ *     when /^[A-Z]*$/; print "Upper case\n"
+ *     else;            print "Mixed case\n"
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Upper case
+ */
+
+VALUE
+rb_reg_eqq(re, str)
+    VALUE re, str;
+{
+    long start;
+
+    if (TYPE(str) != T_STRING) {
+	str = rb_check_string_type(str);
+	if (NIL_P(str)) {
+	    rb_backref_set(Qnil);
+	    return Qfalse;
+	}
+    }
+    StringValue(str);
+    start = rb_reg_search(re, str, 0, 0);
+    if (start < 0) {
+	return Qfalse;
+    }
+    return Qtrue;
+}
+
+
+/*
+ *  call-seq:
+ *     ~ rxp   => integer or nil
+ *  
+ *  Match---Matches <i>rxp</i> against the contents of <code>$_</code>.
+ *  Equivalent to <code><i>rxp</i> =~ $_</code>.
+ *     
+ *     $_ = "input data"
+ *     ~ /at/   #=> 7
+ */
+
+VALUE
+rb_reg_match2(re)
+    VALUE re;
+{
+    long start;
+    VALUE line = rb_lastline_get();
+
+    if (TYPE(line) != T_STRING) {
+	rb_backref_set(Qnil);
+	return Qnil;
+    }
+
+    start = rb_reg_search(re, line, 0, 0);
+    if (start < 0) {
+	return Qnil;
+    }
+    return LONG2FIX(start);
+}
+
+
+/*
+ *  call-seq:
+ *     rxp.match(str)   => matchdata or nil
+ *  
+ *  Returns a <code>MatchData</code> object describing the match, or
+ *  <code>nil</code> if there was no match. This is equivalent to retrieving the
+ *  value of the special variable <code>$~</code> following a normal match.
+ *     
+ *     /(.)(.)(.)/.match("abc")[2]   #=> "b"
+ */
+
+static VALUE
+rb_reg_match_m(re, str)
+    VALUE re, str;
+{
+    VALUE result = rb_reg_match(re, str);
+
+    if (NIL_P(result)) return Qnil;
+    result = rb_backref_get();
+    rb_match_busy(result);
+    return result;
+}
+
+/*
+ * Document-method: compile
+ *
+ * Synonym for <code>Regexp.new</code>
+ */
+
+/*
+ *  call-seq:
+ *     Regexp.new(string [, options [, lang]])       => regexp
+ *     Regexp.new(regexp)                            => regexp
+ *     Regexp.compile(string [, options [, lang]])   => regexp
+ *     Regexp.compile(regexp)                        => regexp
+ *  
+ *  Constructs a new regular expression from <i>pattern</i>, which can be either
+ *  a <code>String</code> or a <code>Regexp</code> (in which case that regexp's
+ *  options are propagated, and new options may not be specified (a change as of
+ *  Ruby 1.8). If <i>options</i> is a <code>Fixnum</code>, it should be one or
+ *  more of the constants <code>Regexp::EXTENDED</code>,
+ *  <code>Regexp::IGNORECASE</code>, and <code>Regexp::MULTILINE</code>,
+ *  <em>or</em>-ed together. Otherwise, if <i>options</i> is not
+ *  <code>nil</code>, the regexp will be case insensitive. The <i>lang</i>
+ *  parameter enables multibyte support for the regexp: `n', `N' = none, `e',
+ *  `E' = EUC, `s', `S' = SJIS, `u', `U' = UTF-8.
+ * 
+ *     r1 = Regexp.new('^a-z+:\\s+\w+')           #=> /^a-z+:\s+\w+/
+ *     r2 = Regexp.new('cat', true)               #=> /cat/i
+ *     r3 = Regexp.new('dog', Regexp::EXTENDED)   #=> /dog/x
+ *     r4 = Regexp.new(r2)                        #=> /cat/i
+ */
+
+static VALUE
+rb_reg_initialize_m(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    const char *s;
+    long len;
+    int flags = 0;
+
+    if (argc == 0 || argc > 3) {
+	rb_raise(rb_eArgError, "wrong number of arguments");
+    }
+    if (TYPE(argv[0]) == T_REGEXP) {
+	if (argc > 1) {
+	    rb_warn("flags%s ignored", (argc == 3) ? " and encoding": "");
+	}
+	rb_reg_check(argv[0]);
+	flags = RREGEXP(argv[0])->ptr->options & 0xf;
+	if (FL_TEST(argv[0], KCODE_FIXED)) {
+	    switch (RBASIC(argv[0])->flags & KCODE_MASK) {
+	      case KCODE_NONE:
+		flags |= 16;
+		break;
+	      case KCODE_EUC:
+		flags |= 32;
+		break;
+	      case KCODE_SJIS:
+		flags |= 48;
+		break;
+	      case KCODE_UTF8:
+		flags |= 64;
+		break;
+	      default:
+		break;
+	    }
+	}
+	s = RREGEXP(argv[0])->str;
+	len = RREGEXP(argv[0])->len;
+    }
+    else {
+	if (argc >= 2) {
+	    if (FIXNUM_P(argv[1])) flags = FIX2INT(argv[1]);
+	    else if (RTEST(argv[1])) flags = RE_OPTION_IGNORECASE;
+	}
+	if (argc == 3 && !NIL_P(argv[2])) {
+	    char *kcode = StringValuePtr(argv[2]);
+
+	    flags &= ~0x70;
+	    switch (kcode[0]) {
+	      case 'n': case 'N':
+		flags |= 16;
+		break;
+	      case 'e': case 'E':
+		flags |= 32;
+		break;
+	      case 's': case 'S':
+		flags |= 48;
+		break;
+	      case 'u': case 'U':
+		flags |= 64;
+		break;
+	      default:
+		break;
+	    }
+	}
+	s = StringValuePtr(argv[0]);
+	len = RSTRING(argv[0])->len;
+    }
+    rb_reg_initialize(self, s, len, flags);
+    return self;
+}
+
+VALUE
+rb_reg_quote(str)
+    VALUE str;
+{
+    char *s, *send, *t;
+    VALUE tmp;
+    int c;
+
+    s = RSTRING(str)->ptr;
+    send = s + RSTRING(str)->len;
+    for (; s < send; s++) {
+	c = *s;
+	if (ismbchar(c)) {
+	    int n = mbclen(c);
+
+	    while (n-- && s < send)
+		s++;
+	    s--;
+	    continue;
+	}
+	switch (c) {
+	  case '[': case ']': case '{': case '}':
+	  case '(': case ')': case '|': case '-':
+	  case '*': case '.': case '\\':
+	  case '?': case '+': case '^': case '$':
+	  case ' ': case '#':
+	  case '\t': case '\f': case '\n': case '\r':
+	    goto meta_found;
+	}
+    }
+    return str;
+
+  meta_found:
+    tmp = rb_str_new(0, RSTRING(str)->len*2);
+    t = RSTRING(tmp)->ptr;
+    /* copy upto metacharacter */
+    memcpy(t, RSTRING(str)->ptr, s - RSTRING(str)->ptr);
+    t += s - RSTRING(str)->ptr;
+
+    for (; s < send; s++) {
+	c = *s;
+	if (ismbchar(c)) {
+	    int n = mbclen(c);
+
+	    while (n-- && s < send)
+		*t++ = *s++;
+	    s--;
+	    continue;
+	}
+	switch (c) {
+	  case '[': case ']': case '{': case '}':
+	  case '(': case ')': case '|': case '-':
+	  case '*': case '.': case '\\':
+	  case '?': case '+': case '^': case '$':
+	  case '#':
+	    *t++ = '\\';
+	    break;
+	  case ' ':
+	    *t++ = '\\';
+	    *t++ = ' ';
+	    continue;
+	  case '\t':
+	    *t++ = '\\';
+	    *t++ = 't';
+	    continue;
+	  case '\n':
+	    *t++ = '\\';
+	    *t++ = 'n';
+	    continue;
+	  case '\r':
+	    *t++ = '\\';
+	    *t++ = 'r';
+	    continue;
+	  case '\f':
+	    *t++ = '\\';
+	    *t++ = 'f';
+	    continue;
+	}
+	*t++ = c;
+    }
+    rb_str_resize(tmp, t - RSTRING(tmp)->ptr);
+    OBJ_INFECT(tmp, str);
+    return tmp;
+}
+
+
+/*
+ *  call-seq:
+ *     Regexp.escape(str)   => a_str
+ *     Regexp.quote(str)    => a_str
+ *  
+ *  Escapes any characters that would have special meaning in a regular
+ *  expression. Returns a new escaped string, or self if no characters are
+ *  escaped.  For any string,
+ *  <code>Regexp.escape(<i>str</i>)=~<i>str</i></code> will be true.
+ *     
+ *     Regexp.escape('\\*?{}.')   #=> \\\\\*\?\{\}\.
+ */
+
+static VALUE
+rb_reg_s_quote(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE str, kcode;
+    int kcode_saved = reg_kcode;
+
+    rb_scan_args(argc, argv, "11", &str, &kcode);
+    if (!NIL_P(kcode)) {
+	rb_set_kcode(StringValuePtr(kcode));
+	curr_kcode = reg_kcode;
+	reg_kcode = kcode_saved;
+    }
+    StringValue(str);
+    str = rb_reg_quote(str);
+    rb_kcode_reset_option();
+    return str;
+}
+
+int
+rb_kcode()
+{
+    switch (reg_kcode) {
+      case KCODE_EUC:
+	return MBCTYPE_EUC;
+      case KCODE_SJIS:
+	return MBCTYPE_SJIS;
+      case KCODE_UTF8:
+	return MBCTYPE_UTF8;
+      case KCODE_NONE:
+	return MBCTYPE_ASCII;
+    }
+    rb_bug("wrong reg_kcode value (0x%x)", reg_kcode);
+}
+
+static int
+rb_reg_get_kcode(re)
+    VALUE re;
+{
+    switch (RBASIC(re)->flags & KCODE_MASK) {
+      case KCODE_NONE:
+	return 16;
+      case KCODE_EUC:
+	return 32;
+      case KCODE_SJIS:
+	return 48;
+      case KCODE_UTF8:
+	return 64;
+      default:
+	return 0;
+    }
+}
+
+int
+rb_reg_options(re)
+    VALUE re;
+{
+    int options;
+
+    rb_reg_check(re);
+    options = RREGEXP(re)->ptr->options &
+	(RE_OPTION_IGNORECASE|RE_OPTION_MULTILINE|RE_OPTION_EXTENDED);
+    if (FL_TEST(re, KCODE_FIXED)) {
+	options |= rb_reg_get_kcode(re);
+    }
+    return options;
+}
+
+
+/*
+ *  call-seq:
+ *     Regexp.union([pattern]*)   => new_str
+ *  
+ *  Return a <code>Regexp</code> object that is the union of the given
+ *  <em>pattern</em>s, i.e., will match any of its parts. The <em>pattern</em>s
+ *  can be Regexp objects, in which case their options will be preserved, or
+ *  Strings. If no arguments are given, returns <code>/(?!)/</code>.
+ *     
+ *     Regexp.union                         #=> /(?!)/
+ *     Regexp.union("penzance")             #=> /penzance/
+ *     Regexp.union("skiing", "sledding")   #=> /skiing|sledding/
+ *     Regexp.union(/dogs/, /cats/i)        #=> /(?-mix:dogs)|(?i-mx:cats)/
+ */
+static VALUE
+rb_reg_s_union(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    if (argc == 0) {
+        VALUE args[1];
+        args[0] = rb_str_new2("(?!)");
+        return rb_class_new_instance(1, args, rb_cRegexp);
+    }
+    else if (argc == 1) {
+        VALUE v;
+        v = rb_check_convert_type(argv[0], T_REGEXP, "Regexp", "to_regexp");
+        if (!NIL_P(v))
+            return v;
+        else {
+            VALUE args[1];
+            args[0] = rb_reg_s_quote(argc, argv);
+            return rb_class_new_instance(1, args, rb_cRegexp);
+        }
+    }
+    else {
+        int i, kcode = -1;
+        VALUE kcode_re = Qnil;
+        VALUE source = rb_str_buf_new(0);
+        VALUE args[3];
+        for (i = 0; i < argc; i++) {
+            volatile VALUE v;
+            if (0 < i)
+                rb_str_buf_cat2(source, "|");
+            v = rb_check_convert_type(argv[i], T_REGEXP, "Regexp", "to_regexp");
+            if (!NIL_P(v)) {
+                if (FL_TEST(v, KCODE_FIXED)) {
+                    if (kcode == -1) {
+                        kcode_re = v;
+                        kcode = RBASIC(v)->flags & KCODE_MASK;
+                    }
+                    else if ((RBASIC(v)->flags & KCODE_MASK) != kcode) {
+                        volatile VALUE str1, str2;
+                        str1 = rb_inspect(kcode_re);
+                        str2 = rb_inspect(v);
+                        rb_raise(rb_eArgError, "mixed kcode: %s and %s",
+                            RSTRING(str1)->ptr, RSTRING(str2)->ptr);
+                    }
+                }
+                v = rb_reg_to_s(v);
+            }
+            else {
+                args[0] = argv[i];
+                v = rb_reg_s_quote(1, args);
+            }
+            rb_str_buf_append(source, v);
+        }
+        args[0] = source;
+        args[1] = Qnil;
+        switch (kcode) {
+          case -1:
+            args[2] = Qnil;
+            break;
+          case KCODE_NONE:
+            args[2] = rb_str_new2("n");
+            break;
+          case KCODE_EUC:
+            args[2] = rb_str_new2("e");
+            break;
+          case KCODE_SJIS:
+            args[2] = rb_str_new2("s");
+            break;
+          case KCODE_UTF8:
+            args[2] = rb_str_new2("u");
+            break;
+        }
+        return rb_class_new_instance(3, args, rb_cRegexp);
+    }
+}
+
+/* :nodoc: */
+static VALUE
+rb_reg_init_copy(copy, re)
+    VALUE copy, re;
+{
+    if (copy == re) return copy;
+    rb_check_frozen(copy);
+    /* need better argument type check */
+    if (!rb_obj_is_instance_of(re, rb_obj_class(copy))) {
+	rb_raise(rb_eTypeError, "wrong argument type");
+    }
+    rb_reg_check(re);
+    rb_reg_initialize(copy, RREGEXP(re)->str, RREGEXP(re)->len,
+		      rb_reg_options(re));
+    return copy;
+}
+
+VALUE
+rb_reg_regsub(str, src, regs)
+    VALUE str, src;
+    struct re_registers *regs;
+{
+    VALUE val = 0;
+    char *p, *s, *e, c;
+    int no;
+
+    p = s = RSTRING(str)->ptr;
+    e = s + RSTRING(str)->len;
+
+    while (s < e) {
+	char *ss = s;
+
+	c = *s++;
+	if (ismbchar(c)) {
+	    s += mbclen(c) - 1;
+	    continue;
+	}
+	if (c != '\\' || s == e) continue;
+
+	if (!val) {
+	    val = rb_str_buf_new(ss-p);
+	    rb_str_buf_cat(val, p, ss-p);
+	}
+	else {
+	    rb_str_buf_cat(val, p, ss-p);
+	}
+
+	c = *s++;
+	p = s;
+	switch (c) {
+	  case '0': case '1': case '2': case '3': case '4':
+	  case '5': case '6': case '7': case '8': case '9':
+	    no = c - '0';
+	    break;
+	  case '&':
+	    no = 0;
+	    break;
+
+	  case '`':
+	    rb_str_buf_cat(val, RSTRING(src)->ptr, BEG(0));
+	    continue;
+
+	  case '\'':
+	    rb_str_buf_cat(val, RSTRING(src)->ptr+END(0), RSTRING(src)->len-END(0));
+	    continue;
+
+	  case '+':
+	    no = regs->num_regs-1;
+	    while (BEG(no) == -1 && no > 0) no--;
+	    if (no == 0) continue;
+	    break;
+
+	  case '\\':
+	    rb_str_buf_cat(val, s-1, 1);
+	    continue;
+
+	  default:
+	    rb_str_buf_cat(val, s-2, 2);
+	    continue;
+	}
+
+	if (no >= 0) {
+	    if (no >= regs->num_regs) continue;
+	    if (BEG(no) == -1) continue;
+	    rb_str_buf_cat(val, RSTRING(src)->ptr+BEG(no), END(no)-BEG(no));
+	}
+    }
+
+    if (p < e) {
+	if (!val) {
+	    val = rb_str_buf_new(e-p);
+	    rb_str_buf_cat(val, p, e-p);
+	}
+	else {
+	    rb_str_buf_cat(val, p, e-p);
+	}
+    }
+    if (!val) return str;
+
+    return val;
+}
+
+const char*
+rb_get_kcode()
+{
+    switch (reg_kcode) {
+      case KCODE_SJIS:
+	return "SJIS";
+      case KCODE_EUC:
+	return "EUC";
+      case KCODE_UTF8:
+	return "UTF8";
+      default:
+	return "NONE";
+    }
+}
+
+static VALUE
+kcode_getter()
+{
+    return rb_str_new2(rb_get_kcode());
+}
+
+void
+rb_set_kcode(code)
+    const char *code;
+{
+    if (code == 0) goto set_no_conversion;
+
+    switch (code[0]) {
+      case 'E':
+      case 'e':
+	reg_kcode = KCODE_EUC;
+	re_mbcinit(MBCTYPE_EUC);
+	break;
+      case 'S':
+      case 's':
+	reg_kcode = KCODE_SJIS;
+	re_mbcinit(MBCTYPE_SJIS);
+	break;
+      case 'U':
+      case 'u':
+	reg_kcode = KCODE_UTF8;
+	re_mbcinit(MBCTYPE_UTF8);
+	break;
+      default:
+      case 'N':
+      case 'n':
+      case 'A':
+      case 'a':
+      set_no_conversion:
+	reg_kcode = KCODE_NONE;
+	re_mbcinit(MBCTYPE_ASCII);
+	break;
+    }
+}
+
+static void
+kcode_setter(val)
+    VALUE val;
+{
+    may_need_recompile = 1;
+    rb_set_kcode(StringValuePtr(val));
+}
+
+static VALUE
+ignorecase_getter()
+{
+    return ruby_ignorecase?Qtrue:Qfalse;
+}
+
+static void
+ignorecase_setter(val, id)
+    VALUE val;
+    ID id;
+{
+    rb_warn("modifying %s is deprecated", rb_id2name(id));
+    may_need_recompile = 1;
+    ruby_ignorecase = RTEST(val);
+}
+
+static VALUE
+match_getter()
+{
+    VALUE match = rb_backref_get();
+
+    if (NIL_P(match)) return Qnil;
+    rb_match_busy(match);
+    return match;
+}
+
+static void
+match_setter(val)
+    VALUE val;
+{
+    if (!NIL_P(val)) {
+	Check_Type(val, T_MATCH);
+    }
+    rb_backref_set(val);
+}
+
+/*
+ *  call-seq:
+ *     Regexp.last_match           => matchdata
+ *     Regexp.last_match(fixnum)   => str
+ *  
+ *  The first form returns the <code>MatchData</code> object generated by the
+ *  last successful pattern match. Equivalent to reading the global variable
+ *  <code>$~</code>. The second form returns the nth field in this
+ *  <code>MatchData</code> object.
+ *     
+ *     /c(.)t/ =~ 'cat'       #=> 0
+ *     Regexp.last_match      #=> #<MatchData:0x401b3d30>
+ *     Regexp.last_match(0)   #=> "cat"
+ *     Regexp.last_match(1)   #=> "a"
+ *     Regexp.last_match(2)   #=> nil
+ */
+
+static VALUE
+rb_reg_s_last_match(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE nth;
+
+    if (rb_scan_args(argc, argv, "01", &nth) == 1) {
+	return rb_reg_nth_match(NUM2INT(nth), rb_backref_get());
+    }
+    return match_getter();
+}
+
+
+/*
+ *  Document-class: Regexp
+ *
+ *  A <code>Regexp</code> holds a regular expression, used to match a pattern
+ *  against strings. Regexps are created using the <code>/.../</code> and
+ *  <code>%r{...}</code> literals, and by the <code>Regexp::new</code>
+ *  constructor.
+ *
+ */
+
+void
+Init_Regexp()
+{
+    rb_eRegexpError = rb_define_class("RegexpError", rb_eStandardError);
+
+    re_set_casetable(casetable);
+#if DEFAULT_KCODE == KCODE_EUC
+    re_mbcinit(MBCTYPE_EUC);
+#else
+#if DEFAULT_KCODE == KCODE_SJIS
+    re_mbcinit(MBCTYPE_SJIS);
+#else
+#if DEFAULT_KCODE == KCODE_UTF8
+    re_mbcinit(MBCTYPE_UTF8);
+#else
+    re_mbcinit(MBCTYPE_ASCII);
+#endif
+#endif
+#endif
+
+    rb_define_virtual_variable("$~", match_getter, match_setter);
+    rb_define_virtual_variable("$&", last_match_getter, 0);
+    rb_define_virtual_variable("$`", prematch_getter, 0);
+    rb_define_virtual_variable("$'", postmatch_getter, 0);
+    rb_define_virtual_variable("$+", last_paren_match_getter, 0);
+
+    rb_define_virtual_variable("$=", ignorecase_getter, ignorecase_setter);
+    rb_define_virtual_variable("$KCODE", kcode_getter, kcode_setter);
+    rb_define_virtual_variable("$-K", kcode_getter, kcode_setter);
+
+    rb_cRegexp = rb_define_class("Regexp", rb_cObject);
+    rb_define_alloc_func(rb_cRegexp, rb_reg_s_alloc);
+    rb_define_singleton_method(rb_cRegexp, "compile", rb_class_new_instance, -1);
+    rb_define_singleton_method(rb_cRegexp, "quote", rb_reg_s_quote, -1);
+    rb_define_singleton_method(rb_cRegexp, "escape", rb_reg_s_quote, -1);
+    rb_define_singleton_method(rb_cRegexp, "union", rb_reg_s_union, -1);
+    rb_define_singleton_method(rb_cRegexp, "last_match", rb_reg_s_last_match, -1);
+
+    rb_define_method(rb_cRegexp, "initialize", rb_reg_initialize_m, -1);
+    rb_define_method(rb_cRegexp, "initialize_copy", rb_reg_init_copy, 1);
+    rb_define_method(rb_cRegexp, "hash", rb_reg_hash, 0);
+    rb_define_method(rb_cRegexp, "eql?", rb_reg_equal, 1);
+    rb_define_method(rb_cRegexp, "==", rb_reg_equal, 1);
+    rb_define_method(rb_cRegexp, "=~", rb_reg_match, 1);
+    rb_define_method(rb_cRegexp, "===", rb_reg_eqq, 1);
+    rb_define_method(rb_cRegexp, "~", rb_reg_match2, 0);
+    rb_define_method(rb_cRegexp, "match", rb_reg_match_m, 1);
+    rb_define_method(rb_cRegexp, "to_s", rb_reg_to_s, 0);
+    rb_define_method(rb_cRegexp, "inspect", rb_reg_inspect, 0);
+    rb_define_method(rb_cRegexp, "source", rb_reg_source, 0);
+    rb_define_method(rb_cRegexp, "casefold?", rb_reg_casefold_p, 0);
+    rb_define_method(rb_cRegexp, "options", rb_reg_options_m, 0);
+    rb_define_method(rb_cRegexp, "kcode", rb_reg_kcode_m, 0);
+
+    rb_define_const(rb_cRegexp, "IGNORECASE", INT2FIX(RE_OPTION_IGNORECASE));
+    rb_define_const(rb_cRegexp, "EXTENDED", INT2FIX(RE_OPTION_EXTENDED));
+    rb_define_const(rb_cRegexp, "MULTILINE", INT2FIX(RE_OPTION_MULTILINE));
+
+    rb_global_variable(&reg_cache);
+
+    rb_cMatch  = rb_define_class("MatchData", rb_cObject);
+    rb_define_global_const("MatchingData", rb_cMatch);
+    rb_define_alloc_func(rb_cMatch, match_alloc);
+    rb_undef_method(CLASS_OF(rb_cMatch), "new");
+
+    rb_define_method(rb_cMatch, "initialize_copy", match_init_copy, 1);
+    rb_define_method(rb_cMatch, "size", match_size, 0);
+    rb_define_method(rb_cMatch, "length", match_size, 0);
+    rb_define_method(rb_cMatch, "offset", match_offset, 1);
+    rb_define_method(rb_cMatch, "begin", match_begin, 1);
+    rb_define_method(rb_cMatch, "end", match_end, 1);
+    rb_define_method(rb_cMatch, "to_a", match_to_a, 0);
+    rb_define_method(rb_cMatch, "[]", match_aref, -1);
+    rb_define_method(rb_cMatch, "captures", match_captures, 0);
+    rb_define_method(rb_cMatch, "select", match_select, -1);
+    rb_define_method(rb_cMatch, "values_at", match_values_at, -1);
+    rb_define_method(rb_cMatch, "pre_match", rb_reg_match_pre, 0);
+    rb_define_method(rb_cMatch, "post_match", rb_reg_match_post, 0);
+    rb_define_method(rb_cMatch, "to_s", match_to_s, 0);
+    rb_define_method(rb_cMatch, "inspect", rb_any_to_s, 0); /* in object.c */
+    rb_define_method(rb_cMatch, "string", match_string, 0);
+}
diff --git a/ruby_1_8_6/re.h b/ruby_1_8_6/re.h
new file mode 100644
index 0000000000..45b2753dd5
--- /dev/null
+++ b/ruby_1_8_6/re.h
@@ -0,0 +1,42 @@
+/**********************************************************************
+
+  re.h -
+
+  $Author$
+  $Date$
+  created at: Thu Sep 30 14:18:32 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef RE_H
+#define RE_H
+
+#include <sys/types.h>
+#include <stdio.h>
+
+#include "regex.h"
+
+typedef struct re_pattern_buffer Regexp;
+
+struct RMatch {
+    struct RBasic basic;
+    VALUE str;
+    struct re_registers *regs;
+};
+
+#define RMATCH(obj)  (R_CAST(RMatch)(obj))
+
+VALUE rb_reg_regcomp _((VALUE));
+long rb_reg_search _((VALUE, VALUE, long, long));
+VALUE rb_reg_regsub _((VALUE, VALUE, struct re_registers *));
+long rb_reg_adjust_startpos _((VALUE, VALUE, long, long));
+void rb_match_busy _((VALUE));
+VALUE rb_reg_quote _((VALUE));
+
+RUBY_EXTERN int ruby_ignorecase;
+
+int rb_reg_mbclen2 _((unsigned int, VALUE));
+#define mbclen2(c,re) rb_reg_mbclen2((c),(re))
+#endif
diff --git a/ruby_1_8_6/regex.c b/ruby_1_8_6/regex.c
new file mode 100644
index 0000000000..fa04871c1b
--- /dev/null
+++ b/ruby_1_8_6/regex.c
@@ -0,0 +1,4648 @@
+/* Extended regular expression matching and search library.
+   Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file LGPL.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+/* Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
+   Last change: May 21, 1993 by t^2  */
+/* removed gapped buffer support, multiple syntax support by matz <matz@nts.co.jp> */
+/* Perl5 extension added by matz <matz@caelum.co.jp> */
+/* UTF-8 extension added Jan 16 1999 by Yoshida Masato  <yoshidam@tau.bekkoame.ne.jp> */
+
+#include "config.h"
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+/* We write fatal error messages on standard error.  */
+#include <stdio.h>
+
+/* isalpha(3) etc. are used for the character classes.  */
+#include <ctype.h>
+#include <sys/types.h>
+
+#ifndef PARAMS
+# if defined __GNUC__ || (defined __STDC__ && __STDC__)
+#  define PARAMS(args) args
+# else
+#  define PARAMS(args) ()
+# endif  /* GCC.  */
+#endif  /* Not PARAMS.  */
+
+#if defined(STDC_HEADERS)
+# include <stddef.h>
+#else
+/* We need this for `regex.h', and perhaps for the Emacs include files.  */
+# include <sys/types.h>
+#endif
+
+#if !defined(__STDC__) && !defined(_MSC_VER)
+# define volatile
+#endif
+
+#ifdef HAVE_PROTOTYPES
+# define _(args) args
+#else
+# define _(args) ()
+#endif
+
+#ifdef RUBY_PLATFORM
+#include "defines.h"
+
+# define RUBY
+extern int rb_prohibit_interrupt;
+extern int rb_trap_pending;
+void rb_trap_exec _((void));
+
+# define CHECK_INTS do {\
+    if (!rb_prohibit_interrupt) {\
+	if (rb_trap_pending) rb_trap_exec();\
+    }\
+} while (0)
+#endif
+
+/* Make alloca work the best possible way.  */
+#ifdef __GNUC__
+# ifndef atarist
+#  ifndef alloca
+#   define alloca __builtin_alloca
+#  endif
+# endif /* atarist */
+#else
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+void *alloca ();
+#   endif
+#  endif /* AIX */
+# endif /* HAVE_ALLOCA_H */
+
+#endif /* __GNUC__ */
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#ifdef C_ALLOCA
+#define FREE_VARIABLES() alloca(0)
+#else
+#define FREE_VARIABLES()
+#endif
+
+#define FREE_AND_RETURN_VOID(stackb)   do {				\
+  FREE_VARIABLES();							\
+  if (stackb != stacka) xfree(stackb);					\
+  return;								\
+} while(0)
+
+#define FREE_AND_RETURN(stackb,val)    do {				\
+  FREE_VARIABLES();							\
+  if (stackb != stacka) xfree(stackb);					\
+  return(val);								\
+} while(0)
+
+#define DOUBLE_STACK(type) do {						\
+  type *stackx;								\
+  unsigned int xlen = stacke - stackb; 					\
+  if (stackb == stacka) {						\
+    stackx = (type*)xmalloc(2 * xlen * sizeof(type));			\
+    memcpy(stackx, stackb, xlen * sizeof (type));			\
+  }									\
+  else {								\
+    stackx = (type*)xrealloc(stackb, 2 * xlen * sizeof(type));		\
+  }									\
+  /* Rearrange the pointers. */						\
+  stackp = stackx + (stackp - stackb);					\
+  stackb = stackx;							\
+  stacke = stackb + 2 * xlen;						\
+} while (0)
+
+#define RE_TALLOC(n,t)  ((t*)alloca((n)*sizeof(t)))
+#define TMALLOC(n,t)    ((t*)xmalloc((n)*sizeof(t)))
+#define TREALLOC(s,n,t) (s=((t*)xrealloc(s,(n)*sizeof(t))))
+
+#define EXPAND_FAIL_STACK() DOUBLE_STACK(unsigned char*)
+#define ENSURE_FAIL_STACK(n)						\
+  do {									\
+    if (stacke - stackp <= (n)) {					\
+	/* if (len > re_max_failures * MAX_NUM_FAILURE_ITEMS)		\
+	   {								\
+	   FREE_AND_RETURN(stackb,(-2));				\
+	   }*/								\
+									\
+        /* Roughly double the size of the stack.  */			\
+        EXPAND_FAIL_STACK();						\
+      }									\
+  } while (0)
+
+/* Get the interface, including the syntax bits.  */
+#include "regex.h"
+
+/* Subroutines for re_compile_pattern.  */
+static void store_jump _((char*, int, char*));
+static void insert_jump _((int, char*, char*, char*));
+static void store_jump_n _((char*, int, char*, unsigned));
+static void insert_jump_n _((int, char*, char*, char*, unsigned));
+static void insert_op _((int, char*, char*));
+static void insert_op_2 _((int, char*, char*, int, int));
+static int memcmp_translate _((unsigned char*, unsigned char*, int));
+
+/* Define the syntax stuff, so we can do the \<, \>, etc.  */
+
+/* This must be nonzero for the wordchar and notwordchar pattern
+   commands in re_match.  */
+#define Sword  1
+#define Sword2 2
+
+#define SYNTAX(c) re_syntax_table[c]
+
+static char re_syntax_table[256];
+static void init_syntax_once _((void));
+static const unsigned char *translate = 0;
+static void init_regs _((struct re_registers*, unsigned int));
+static void bm_init_skip _((int *, unsigned char*, int, const unsigned char*));
+static int current_mbctype = MBCTYPE_ASCII;
+
+#undef P
+
+#ifdef RUBY
+#include "util.h"
+void rb_warn _((const char*, ...));
+# define re_warning(x) rb_warn(x)
+#endif
+
+#ifndef re_warning
+# define re_warning(x)
+#endif
+
+static void
+init_syntax_once()
+{
+   register int c;
+   static int done = 0;
+
+   if (done)
+     return;
+
+   memset(re_syntax_table, 0, sizeof re_syntax_table);
+
+   for (c=0; c<=0x7f; c++)
+     if (isalnum(c)) 
+       re_syntax_table[c] = Sword;
+   re_syntax_table['_'] = Sword;
+
+   for (c=0x80; c<=0xff; c++)
+     if (isalnum(c)) 
+       re_syntax_table[c] = Sword2;
+   done = 1;
+}
+
+void
+re_set_casetable(table)
+     const char *table;
+{
+  translate = (const unsigned char*)table;
+}
+
+/* Jim Meyering writes:
+
+   "... Some ctype macros are valid only for character codes that
+   isascii says are ASCII (SGI's IRIX-4.0.5 is one such system --when
+   using /bin/cc or gcc but without giving an ansi option).  So, all
+   ctype uses should be through macros like ISPRINT...  If
+   STDC_HEADERS is defined, then autoconf has verified that the ctype
+   macros don't need to be guarded with references to isascii. ...
+   Defining isascii to 1 should let any compiler worth its salt
+   eliminate the && through constant folding."
+   Solaris defines some of these symbols so we must undefine them first.  */
+
+#undef ISASCII
+#if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII)
+# define ISASCII(c) 1
+#else
+# define ISASCII(c) isascii(c)
+#endif
+
+#ifdef isblank
+# define ISBLANK(c) (ISASCII(c) && isblank(c))
+#else
+# define ISBLANK(c) ((c) == ' ' || (c) == '\t')
+#endif
+#ifdef isgraph
+# define ISGRAPH(c) (ISASCII(c) && isgraph(c))
+#else
+# define ISGRAPH(c) (ISASCII(c) && isprint(c) && !isspace(c))
+#endif
+
+#undef ISPRINT
+#define ISPRINT(c) (ISASCII(c) && isprint(c))
+#define ISDIGIT(c) (ISASCII(c) && isdigit(c))
+#define ISALNUM(c) (ISASCII(c) && isalnum(c))
+#define ISALPHA(c) (ISASCII(c) && isalpha(c))
+#define ISCNTRL(c) (ISASCII(c) && iscntrl(c))
+#define ISLOWER(c) (ISASCII(c) && islower(c))
+#define ISPUNCT(c) (ISASCII(c) && ispunct(c))
+#define ISSPACE(c) (ISASCII(c) && isspace(c))
+#define ISUPPER(c) (ISASCII(c) && isupper(c))
+#define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
+
+#ifndef NULL
+# define NULL (void *)0
+#endif
+
+/* We remove any previous definition of `SIGN_EXTEND_CHAR',
+   since ours (we hope) works properly with all combinations of
+   machines, compilers, `char' and `unsigned char' argument types.
+   (Per Bothner suggested the basic approach.)  */
+#undef SIGN_EXTEND_CHAR
+#if __STDC__
+# define SIGN_EXTEND_CHAR(c) ((signed char)(c))
+#else  /* not __STDC__ */
+/* As in Harbison and Steele.  */
+# define SIGN_EXTEND_CHAR(c) ((((unsigned char)(c)) ^ 128) - 128)
+#endif
+
+/* These are the command codes that appear in compiled regular
+   expressions, one per byte.  Some command codes are followed by
+   argument bytes.  A command code can specify any interpretation
+   whatsoever for its arguments.  Zero-bytes may appear in the compiled
+   regular expression.
+
+   The value of `exactn' is needed in search.c (search_buffer) in emacs.
+   So regex.h defines a symbol `RE_EXACTN_VALUE' to be 1; the value of
+   `exactn' we use here must also be 1.  */
+
+enum regexpcode
+  {
+    unused=0,
+    exactn=1, /* Followed by one byte giving n, then by n literal bytes.  */
+    begline,  /* Fail unless at beginning of line.  */
+    endline,  /* Fail unless at end of line.  */
+    begbuf,   /* Succeeds if at beginning of buffer (if emacs) or at beginning
+                 of string to be matched (if not).  */
+    endbuf,   /* Analogously, for end of buffer/string.  */
+    endbuf2,  /* End of buffer/string, or newline just before it.  */
+    begpos,   /* Matches where last scan//gsub left off.  */
+    jump,     /* Followed by two bytes giving relative address to jump to.  */
+    jump_past_alt,/* Same as jump, but marks the end of an alternative.  */
+    on_failure_jump,	 /* Followed by two bytes giving relative address of 
+			    place to resume at in case of failure.  */
+    finalize_jump,	 /* Throw away latest failure point and then jump to 
+			    address.  */
+    maybe_finalize_jump, /* Like jump but finalize if safe to do so.
+			    This is used to jump back to the beginning
+			    of a repeat.  If the command that follows
+			    this jump is clearly incompatible with the
+			    one at the beginning of the repeat, such that
+			    we can be sure that there is no use backtracking
+			    out of repetitions already completed,
+			    then we finalize.  */
+    dummy_failure_jump,  /* Jump, and push a dummy failure point. This 
+			    failure point will be thrown away if an attempt 
+                            is made to use it for a failure. A + construct 
+                            makes this before the first repeat.  Also
+                            use it as an intermediary kind of jump when
+                            compiling an or construct.  */
+    push_dummy_failure, /* Push a dummy failure point and continue.  Used at the end of
+			   alternatives.  */
+    succeed_n,	 /* Used like on_failure_jump except has to succeed n times;
+		    then gets turned into an on_failure_jump. The relative
+                    address following it is useless until then.  The
+                    address is followed by two bytes containing n.  */
+    jump_n,	 /* Similar to jump, but jump n times only; also the relative
+		    address following is in turn followed by yet two more bytes
+                    containing n.  */
+    try_next,    /* Jump to next pattern for the first time,
+		    leaving this pattern on the failure stack. */
+    finalize_push,	/* Finalize stack and push the beginning of the pattern
+			   on the stack to retry (used for non-greedy match) */
+    finalize_push_n,	/* Similar to finalize_push, buf finalize n time only */
+    set_number_at,	/* Set the following relative location to the
+			   subsequent number.  */
+    anychar,	 /* Matches any (more or less) one character excluding newlines.  */
+    anychar_repeat,	 /* Matches sequence of characters excluding newlines.  */
+    charset,     /* Matches any one char belonging to specified set.
+		    First following byte is number of bitmap bytes.
+		    Then come bytes for a bitmap saying which chars are in.
+		    Bits in each byte are ordered low-bit-first.
+		    A character is in the set if its bit is 1.
+		    A character too large to have a bit in the map
+		    is automatically not in the set.  */
+    charset_not, /* Same parameters as charset, but match any character
+                    that is not one of those specified.  */
+    start_memory, /* Start remembering the text that is matched, for
+		    storing in a memory register.  Followed by one
+                    byte containing the register number.  Register numbers
+                    must be in the range 0 through RE_NREGS.  */
+    stop_memory, /* Stop remembering the text that is matched
+		    and store it in a memory register.  Followed by
+                    one byte containing the register number. Register
+                    numbers must be in the range 0 through RE_NREGS.  */
+    start_paren,    /* Place holder at the start of (?:..). */
+    stop_paren,    /* Place holder at the end of (?:..). */
+    casefold_on,   /* Turn on casefold flag. */
+    casefold_off,  /* Turn off casefold flag. */
+    option_set,	   /* Turn on multi line match (match with newlines). */
+    start_nowidth, /* Save string point to the stack. */
+    stop_nowidth,  /* Restore string place at the point start_nowidth. */
+    pop_and_fail,  /* Fail after popping nowidth entry from stack. */
+    stop_backtrack,  /* Restore backtrack stack at the point start_nowidth. */
+    duplicate,   /* Match a duplicate of something remembered.
+		    Followed by one byte containing the index of the memory 
+                    register.  */
+    wordchar,    /* Matches any word-constituent character.  */
+    notwordchar, /* Matches any char that is not a word-constituent.  */
+    wordbeg,	 /* Succeeds if at word beginning.  */
+    wordend,	 /* Succeeds if at word end.  */
+    wordbound,   /* Succeeds if at a word boundary.  */
+    notwordbound /* Succeeds if not at a word boundary.  */
+  };
+
+
+/* Number of failure points to allocate space for initially,
+   when matching.  If this number is exceeded, more space is allocated,
+   so it is not a hard limit.  */
+
+#ifndef NFAILURES
+#define NFAILURES 160
+#endif
+
+/* Store NUMBER in two contiguous bytes starting at DESTINATION.  */
+#define STORE_NUMBER(destination, number)				\
+  do { (destination)[0] = (number) & 0377;				\
+    (destination)[1] = (number) >> 8; } while (0)
+
+/* Same as STORE_NUMBER, except increment the destination pointer to
+   the byte after where the number is stored.  Watch out that values for
+   DESTINATION such as p + 1 won't work, whereas p will.  */
+#define STORE_NUMBER_AND_INCR(destination, number)			\
+  do { STORE_NUMBER(destination, number);				\
+    (destination) += 2; } while (0)
+
+
+/* Put into DESTINATION a number stored in two contingous bytes starting
+   at SOURCE.  */
+#define EXTRACT_NUMBER(destination, source)				\
+  do { (destination) = *(source) & 0377;				\
+    (destination) += SIGN_EXTEND_CHAR(*(char*)((source) + 1)) << 8; } while (0)
+
+/* Same as EXTRACT_NUMBER, except increment the pointer for source to
+   point to second byte of SOURCE.  Note that SOURCE has to be a value
+   such as p, not, e.g., p + 1. */
+#define EXTRACT_NUMBER_AND_INCR(destination, source)			\
+  do { EXTRACT_NUMBER(destination, source);				\
+       (source) += 2; } while (0)
+
+
+/* Specify the precise syntax of regexps for compilation.  This provides
+   for compatibility for various utilities which historically have
+   different, incompatible syntaxes.
+
+   The argument SYNTAX is a bit-mask comprised of the various bits
+   defined in regex.h.  */
+
+long
+re_set_syntax(syntax)
+  long syntax;
+{
+    /* obsolete */
+    return 0;
+}
+
+/* Macros for re_compile_pattern, which is found below these definitions.  */
+
+#define TRANSLATE_P() ((options&RE_OPTION_IGNORECASE) && translate)
+#define MAY_TRANSLATE() ((bufp->options&(RE_OPTION_IGNORECASE|RE_MAY_IGNORECASE)) && translate)
+/* Fetch the next character in the uncompiled pattern---translating it 
+   if necessary.  Also cast from a signed character in the constant
+   string passed to us by the user to an unsigned char that we can use
+   as an array index (in, e.g., `translate').  */
+#define PATFETCH(c)							\
+  do {if (p == pend) goto end_of_pattern;				\
+    c = (unsigned char) *p++; 						\
+    if (TRANSLATE_P()) c = (unsigned char)translate[c];	\
+  } while (0)
+
+/* Fetch the next character in the uncompiled pattern, with no
+   translation.  */
+#define PATFETCH_RAW(c)							\
+  do {if (p == pend) goto end_of_pattern;				\
+    c = (unsigned char)*p++; 						\
+  } while (0)
+
+/* Go backwards one character in the pattern.  */
+#define PATUNFETCH p--
+
+#define MBC2WC(c, p)							\
+  do {									\
+    if (current_mbctype == MBCTYPE_UTF8) {				\
+      int n = mbclen(c) - 1;						\
+      c &= (1<<(BYTEWIDTH-2-n)) - 1;					\
+      while (n--) {							\
+	c = c << 6 | (*p++ & ((1<<6)-1));				\
+      }									\
+    }									\
+    else {								\
+      c <<= 8;								\
+      c |= (unsigned char)*(p)++;					\
+    }									\
+  } while (0)
+
+#define PATFETCH_MBC(c)							\
+  do {									\
+    if (p + mbclen(c) - 1 >= pend) goto end_of_pattern;			\
+    MBC2WC(c, p);							\
+  } while(0)
+
+#define WC2MBC1ST(c)							\
+ ((current_mbctype != MBCTYPE_UTF8) ? ((c<0x100) ? (c) : (((c)>>8)&0xff)) : utf8_firstbyte(c))
+
+typedef unsigned int (*mbc_startpos_func_t) _((const char *string, unsigned int pos));
+
+static unsigned int asc_startpos _((const char *string, unsigned int pos));
+static unsigned int euc_startpos _((const char *string, unsigned int pos));
+static unsigned int sjis_startpos _((const char *string, unsigned int pos));
+static unsigned int utf8_startpos _((const char *string, unsigned int pos));
+
+static const mbc_startpos_func_t mbc_startpos_func[4] = {
+  asc_startpos, euc_startpos, sjis_startpos, utf8_startpos
+};
+
+#define mbc_startpos(start, pos) (*mbc_startpos_func[current_mbctype])((start), (pos))
+
+static unsigned int
+utf8_firstbyte(c)
+     unsigned long c;
+{
+  if (c < 0x80) return c;
+  if (c <= 0x7ff) return ((c>>6)&0xff)|0xc0;
+  if (c <= 0xffff) return ((c>>12)&0xff)|0xe0;
+  if (c <= 0x1fffff) return ((c>>18)&0xff)|0xf0;
+  if (c <= 0x3ffffff) return ((c>>24)&0xff)|0xf8;
+  if (c <= 0x7fffffff) return ((c>>30)&0xff)|0xfc;
+#if SIZEOF_INT > 4
+  if (c <= 0xfffffffff) return 0xfe;
+#else
+  return 0xfe;
+#endif
+}
+
+static void
+print_mbc(c)
+     unsigned int c;
+{
+  if (current_mbctype == MBCTYPE_UTF8) {
+    if (c < 0x80)
+      printf("%c", (int)c);
+    else if (c <= 0x7ff)
+      printf("%c%c", (int)utf8_firstbyte(c), (int)(c & 0x3f));
+    else if (c <= 0xffff)
+      printf("%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 6) & 0x3f),
+	     (int)(c & 0x3f));
+    else if (c <= 0x1fffff) 
+      printf("%c%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 12) & 0x3f),
+	     (int)((c >> 6) & 0x3f), (int)(c & 0x3f));
+    else if (c <= 0x3ffffff)
+      printf("%c%c%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 18) & 0x3f),
+	     (int)((c >> 12) & 0x3f), (int)((c >> 6) & 0x3f), (int)(c & 0x3f));
+    else if (c <= 0x7fffffff)
+      printf("%c%c%c%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 24) & 0x3f),
+	     (int)((c >> 18) & 0x3f), (int)((c >> 12) & 0x3f),
+	     (int)((c >> 6) & 0x3f), (int)(c & 0x3f));
+  }
+  else if (c < 0xff) {
+    printf("\\%o", (int)c);
+  }
+  else {
+    printf("%c%c", (int)(c >> BYTEWIDTH), (int)(c &0xff));
+  }
+}
+
+/* If the buffer isn't allocated when it comes in, use this.  */
+#define INIT_BUF_SIZE  28
+
+/* Make sure we have at least N more bytes of space in buffer.  */
+#define GET_BUFFER_SPACE(n)						\
+  do {								        \
+    while (b - bufp->buffer + (n) >= bufp->allocated)			\
+      EXTEND_BUFFER;							\
+  } while (0)
+
+/* Make sure we have one more byte of buffer space and then add CH to it.  */
+#define BUFPUSH(ch)							\
+  do {									\
+    GET_BUFFER_SPACE(1);						\
+    *b++ = (char)(ch);							\
+  } while (0)
+
+/* Extend the buffer by twice its current size via reallociation and
+   reset the pointers that pointed into the old allocation to point to
+   the correct places in the new allocation.  If extending the buffer
+   results in it being larger than 1 << 16, then flag memory exhausted.  */
+#define EXTEND_BUFFER						\
+  do { char *old_buffer = bufp->buffer;					\
+    if (bufp->allocated == (1L<<16)) goto too_big;			\
+    bufp->allocated *= 2;						\
+    if (bufp->allocated > (1L<<16)) bufp->allocated = (1L<<16);		\
+    bufp->buffer = (char*)xrealloc(bufp->buffer, bufp->allocated);	\
+    if (bufp->buffer == 0)						\
+      goto memory_exhausted;						\
+    b = (b - old_buffer) + bufp->buffer;				\
+    if (fixup_alt_jump)							\
+      fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer;	\
+    if (laststart)							\
+      laststart = (laststart - old_buffer) + bufp->buffer;		\
+    begalt = (begalt - old_buffer) + bufp->buffer;			\
+    if (pending_exact)							\
+      pending_exact = (pending_exact - old_buffer) + bufp->buffer;	\
+  } while (0)
+
+
+/* Set the bit for character C in a character set list.  */
+#define SET_LIST_BIT(c)							\
+  (b[(unsigned char)(c) / BYTEWIDTH]					\
+   |= 1 << ((unsigned char)(c) % BYTEWIDTH))
+
+/* Get the next unsigned number in the uncompiled pattern.  */
+#define GET_UNSIGNED_NUMBER(num) 					\
+  do { if (p != pend) { 						\
+        PATFETCH(c); 							\
+	while (ISDIGIT(c)) { 						\
+	  if (num < 0) 							\
+	     num = 0; 							\
+	  num = num * 10 + c - '0'; 					\
+	  if (p == pend) 						\
+	     break; 							\
+	  PATFETCH(c); 							\
+	} 								\
+     } 									\
+  } while (0)
+
+#define STREQ(s1, s2) ((strcmp(s1, s2) == 0))
+
+#define CHAR_CLASS_MAX_LENGTH  6 /* Namely, `xdigit'.  */
+
+#define IS_CHAR_CLASS(string)						\
+   (STREQ(string, "alpha") || STREQ(string, "upper")			\
+    || STREQ(string, "lower") || STREQ(string, "digit")			\
+    || STREQ(string, "alnum") || STREQ(string, "xdigit")		\
+    || STREQ(string, "space") || STREQ(string, "print")			\
+    || STREQ(string, "punct") || STREQ(string, "graph")			\
+    || STREQ(string, "cntrl") || STREQ(string, "blank"))
+
+#define STORE_MBC(p, c)							\
+  do {									\
+    (p)[0] = (unsigned char)(((c) >>24) & 0xff);			\
+    (p)[1] = (unsigned char)(((c) >>16) & 0xff);			\
+    (p)[2] = (unsigned char)(((c) >> 8) & 0xff);			\
+    (p)[3] = (unsigned char)(((c) >> 0) & 0xff);			\
+  } while (0)
+
+#define STORE_MBC_AND_INCR(p, c) 					\
+  do {									\
+    *(p)++ = (unsigned char)(((c) >>24) & 0xff);			\
+    *(p)++ = (unsigned char)(((c) >>16) & 0xff);			\
+    *(p)++ = (unsigned char)(((c) >> 8) & 0xff);			\
+    *(p)++ = (unsigned char)(((c) >> 0) & 0xff);			\
+  } while (0)
+
+#define EXTRACT_MBC(p) 							\
+  ((unsigned int)((unsigned char)(p)[0] << 24 |				\
+		    (unsigned char)(p)[1] << 16 |			\
+                    (unsigned char)(p)[2] <<  8 |			\
+		    (unsigned char)(p)[3]))
+
+#define EXTRACT_MBC_AND_INCR(p) 					\
+  ((unsigned int)((p) += 4, 						\
+		    (unsigned char)(p)[-4] << 24 |			\
+		    (unsigned char)(p)[-3] << 16 |			\
+                    (unsigned char)(p)[-2] <<  8 |			\
+		    (unsigned char)(p)[-1]))
+
+#define EXTRACT_UNSIGNED(p) \
+  ((unsigned char)(p)[0] | (unsigned char)(p)[1] << 8)
+#define EXTRACT_UNSIGNED_AND_INCR(p) \
+  ((p) += 2, (unsigned char)(p)[-2] | (unsigned char)(p)[-1] << 8)
+
+/* Handle (mb)?charset(_not)?.
+
+   Structure of mbcharset(_not)? in compiled pattern.
+
+     struct {
+       unsinged char id;		mbcharset(_not)?
+       unsigned char sbc_size;
+       unsigned char sbc_map[sbc_size];	same as charset(_not)? up to here.
+       unsigned short mbc_size;		number of intervals.
+       struct {
+	 unsigned long beg;		beginning of interval.
+	 unsigned long end;		end of interval.
+       } intervals[mbc_size];
+     }; */
+
+static void
+set_list_bits(c1, c2, b)
+    unsigned long c1, c2;
+    unsigned char *b;
+{
+  unsigned char sbc_size = b[-1];
+  unsigned short mbc_size = EXTRACT_UNSIGNED(&b[sbc_size]);
+  unsigned short beg, end, upb;
+
+  if (c1 > c2)
+    return;
+  b = &b[sbc_size + 2];
+
+  for (beg = 0, upb = mbc_size; beg < upb; ) {
+    unsigned short mid = (unsigned short)(beg + upb) >> 1;
+
+    if ((int)c1 - 1 > (int)EXTRACT_MBC(&b[mid*8+4]))
+      beg = mid + 1;
+    else
+      upb = mid;
+  }
+
+  for (end = beg, upb = mbc_size; end < upb; ) {
+    unsigned short mid = (unsigned short)(end + upb) >> 1;
+
+    if ((int)c2 >= (int)EXTRACT_MBC(&b[mid*8]) - 1)
+      end = mid + 1;
+    else
+      upb = mid;
+  }
+
+  if (beg != end) {
+    if (c1 > EXTRACT_MBC(&b[beg*8]))
+      c1 = EXTRACT_MBC(&b[beg*8]);
+    if (c2 < EXTRACT_MBC(&b[(end - 1)*8+4]))
+      c2 = EXTRACT_MBC(&b[(end - 1)*8+4]);
+  }
+  if (end < mbc_size && end != beg + 1)
+    /* NOTE: memcpy() would not work here.  */
+    memmove(&b[(beg + 1)*8], &b[end*8], (mbc_size - end)*8);
+  STORE_MBC(&b[beg*8 + 0], c1);
+  STORE_MBC(&b[beg*8 + 4], c2);
+  mbc_size += beg - end + 1;
+  STORE_NUMBER(&b[-2], mbc_size);
+}
+
+static int
+is_in_list_sbc(c, b)
+    unsigned long c;
+    const unsigned char *b;
+{
+  unsigned short size;
+
+  size = *b++;
+  return ((int)c / BYTEWIDTH < (int)size && b[c / BYTEWIDTH] & 1 << c % BYTEWIDTH);
+}
+  
+static int
+is_in_list_mbc(c, b)
+    unsigned long c;
+    const unsigned char *b;
+{
+  unsigned short size;
+  unsigned short i, j;
+
+  size = *b++;
+  b += size + 2;
+  size = EXTRACT_UNSIGNED(&b[-2]);
+  if (size == 0) return 0;
+
+  for (i = 0, j = size; i < j; ) {
+    unsigned short k = (unsigned short)(i + j) >> 1;
+
+    if (c > EXTRACT_MBC(&b[k*8+4]))
+      i = k + 1;
+    else
+      j = k;
+  }
+  if (i < size && EXTRACT_MBC(&b[i*8]) <= c)
+    return 1;
+
+  return 0;
+}
+
+static int
+is_in_list(c, b)
+    unsigned long c;
+    const unsigned char *b;
+{
+  return is_in_list_sbc(c, b) || (current_mbctype ? is_in_list_mbc(c, b) : 0);
+}
+
+static void
+print_partial_compiled_pattern(start, end)
+    unsigned char *start;
+    unsigned char *end;
+{
+  int mcnt, mcnt2;
+  unsigned char *p = start;
+  unsigned char *pend = end;
+
+  if (start == NULL) {
+    printf("(null)\n");
+    return;
+  }
+
+  /* Loop over pattern commands.  */
+  while (p < pend) {
+    switch ((enum regexpcode)*p++) {
+    case unused:
+      printf("/unused");
+      break;
+
+    case exactn:
+      mcnt = *p++;
+      printf("/exactn/%d", mcnt);
+      do {
+	putchar('/');
+	printf("%c", *p++);
+      }
+      while (--mcnt);
+      break;
+
+    case start_memory:
+      mcnt = *p++;
+      printf("/start_memory/%d/%d", mcnt, *p++);
+      break;
+
+    case stop_memory:
+      mcnt = *p++;
+      printf("/stop_memory/%d/%d", mcnt, *p++);
+      break;
+
+    case start_paren:
+      printf("/start_paren");
+      break;
+
+    case stop_paren:
+      printf("/stop_paren");
+      break;
+
+    case casefold_on:
+      printf("/casefold_on");
+      break;
+
+    case casefold_off:
+      printf("/casefold_off");
+      break;
+
+    case option_set:
+      printf("/option_set/%d", *p++);
+      break;
+
+    case start_nowidth:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      printf("/start_nowidth//%d", mcnt);
+      break;
+
+    case stop_nowidth:
+      printf("/stop_nowidth//");
+      p += 2;
+      break;
+
+    case pop_and_fail:
+      printf("/pop_and_fail");
+      break;
+
+    case stop_backtrack:
+      printf("/stop_backtrack//");
+      p += 2;
+      break;
+
+    case duplicate:
+      printf("/duplicate/%d", *p++);
+      break;
+
+    case anychar:
+      printf("/anychar");
+      break;
+
+    case anychar_repeat:
+      printf("/anychar_repeat");
+      break;
+
+    case charset:
+    case charset_not:
+      {
+	register int c;
+
+	printf("/charset%s",
+	       (enum regexpcode)*(p - 1) == charset_not ? "_not" : "");
+
+	mcnt = *p++;
+	printf("/%d", mcnt);
+	for (c = 0; c < mcnt; c++) {
+	  unsigned bit;
+	  unsigned char map_byte = p[c];
+
+	  putchar('/');
+
+	  for (bit = 0; bit < BYTEWIDTH; bit++)
+	    if (map_byte & (1 << bit))
+	      printf("%c", c * BYTEWIDTH + bit);
+	}
+	p += mcnt;
+	mcnt = EXTRACT_UNSIGNED_AND_INCR(p);
+	putchar('/');
+	while (mcnt--) {
+	  print_mbc(EXTRACT_MBC_AND_INCR(p));
+	  putchar('-');
+	  print_mbc(EXTRACT_MBC_AND_INCR(p));
+	}
+	break;
+      }
+
+    case begline:
+      printf("/begline");
+      break;
+
+    case endline:
+      printf("/endline");
+      break;
+
+    case on_failure_jump:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      printf("/on_failure_jump//%d", mcnt);
+      break;
+
+    case dummy_failure_jump:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      printf("/dummy_failure_jump//%d", mcnt);
+      break;
+
+    case push_dummy_failure:
+      printf("/push_dummy_failure");
+      break;
+
+    case finalize_jump:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      printf("/finalize_jump//%d", mcnt);
+      break;
+
+    case maybe_finalize_jump:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      printf("/maybe_finalize_jump//%d", mcnt);
+      break;
+
+    case jump_past_alt:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      printf("/jump_past_alt//%d", mcnt);
+      break;
+
+    case jump:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      printf("/jump//%d", mcnt);
+      break;
+
+    case succeed_n: 
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      EXTRACT_NUMBER_AND_INCR(mcnt2, p);
+      printf("/succeed_n//%d//%d", mcnt, mcnt2);
+      break;
+
+    case jump_n: 
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      EXTRACT_NUMBER_AND_INCR(mcnt2, p);
+      printf("/jump_n//%d//%d", mcnt, mcnt2);
+      break;
+
+    case set_number_at: 
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      EXTRACT_NUMBER_AND_INCR(mcnt2, p);
+      printf("/set_number_at//%d//%d", mcnt, mcnt2);
+      break;
+
+    case try_next:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      printf("/try_next//%d", mcnt);
+      break;
+
+    case finalize_push:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      printf("/finalize_push//%d", mcnt);
+      break;
+
+    case finalize_push_n:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      EXTRACT_NUMBER_AND_INCR(mcnt2, p);
+      printf("/finalize_push_n//%d//%d", mcnt, mcnt2);
+      break;
+
+    case wordbound:
+      printf("/wordbound");
+      break;
+
+    case notwordbound:
+      printf("/notwordbound");
+      break;
+
+    case wordbeg:
+      printf("/wordbeg");
+      break;
+
+    case wordend:
+      printf("/wordend");
+
+    case wordchar:
+      printf("/wordchar");
+      break;
+	  
+    case notwordchar:
+      printf("/notwordchar");
+      break;
+
+    case begbuf:
+      printf("/begbuf");
+      break;
+
+    case endbuf:
+      printf("/endbuf");
+      break;
+
+    case endbuf2:
+      printf("/endbuf2");
+      break;
+
+    case begpos:
+      printf("/begpos");
+      break;
+
+    default:
+      printf("?%d", *(p-1));
+    }
+  }
+  printf("/\n");
+}
+
+
+static void
+print_compiled_pattern(bufp)
+     struct re_pattern_buffer *bufp;
+{
+  unsigned char *buffer = (unsigned char*)bufp->buffer;
+
+  print_partial_compiled_pattern(buffer, buffer + bufp->used);
+}
+
+static char*
+calculate_must_string(start, end)
+     char *start;
+     char *end;
+{
+  int mcnt;
+  int max = 0;
+  unsigned char *p = (unsigned char *)start;
+  unsigned char *pend = (unsigned char *)end;
+  char *must = 0;
+
+  if (start == NULL) return 0;
+
+  /* Loop over pattern commands.  */
+  while (p < pend) {
+    switch ((enum regexpcode)*p++) {
+    case unused:
+      break;
+
+    case exactn:
+      mcnt = *p;
+      if (mcnt > max) {
+	must = (char *)p;
+	max = mcnt;
+      }
+      p += mcnt+1;
+      break;
+
+    case start_memory:
+    case stop_memory:
+      p += 2;
+      break;
+
+    case duplicate:
+    case option_set:
+      p++;
+      break;
+
+    case casefold_on:
+    case casefold_off:
+      return 0;		/* should not check must_string */
+
+    case pop_and_fail:
+    case anychar:
+    case anychar_repeat:
+    case begline:
+    case endline:
+    case wordbound:
+    case notwordbound:
+    case wordbeg:
+    case wordend:
+    case wordchar:
+    case notwordchar:
+    case begbuf:
+    case endbuf:
+    case endbuf2:
+    case begpos:
+    case push_dummy_failure:
+    case start_paren:
+    case stop_paren:
+      break;
+
+    case charset:
+    case charset_not:
+      mcnt = *p++;
+      p += mcnt;
+      mcnt = EXTRACT_UNSIGNED_AND_INCR(p);
+      while (mcnt--) {
+	p += 8;
+      }
+      break;
+
+    case on_failure_jump:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      if (mcnt > 0) p += mcnt;
+      if ((enum regexpcode)p[-3] == jump) {
+	p -= 2;
+	EXTRACT_NUMBER_AND_INCR(mcnt, p);
+	if (mcnt > 0) p += mcnt;
+      }
+      break;
+
+    case dummy_failure_jump:
+    case succeed_n: 
+    case try_next:
+    case jump:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      if (mcnt > 0) p += mcnt;
+      break;
+
+    case start_nowidth:
+    case stop_nowidth:
+    case stop_backtrack:
+    case finalize_jump:
+    case maybe_finalize_jump:
+    case finalize_push:
+      p += 2;
+      break;
+
+    case jump_n: 
+    case set_number_at: 
+    case finalize_push_n:
+      p += 4;
+      break;
+
+    default:
+      break;
+    }
+  }
+  return must;
+}
+
+static unsigned int
+read_backslash(c)
+     int c;
+{
+  switch (c) {
+  case 'n':
+    return '\n';
+
+  case 't':
+    return '\t';
+
+  case 'r':
+    return '\r';
+
+  case 'f':
+    return '\f';
+
+  case 'v':
+    return '\v';
+
+  case 'a':
+    return '\007';
+
+  case 'b':
+    return '\010';
+
+  case 'e':
+    return '\033';
+  }
+  return c;
+}
+
+static unsigned int
+read_special(p, pend, pp)
+     const char *p, *pend, **pp;
+{
+  int c;
+
+  PATFETCH_RAW(c);
+  switch (c) {
+  case 'M':
+    PATFETCH_RAW(c);
+    if (c != '-') return -1;
+    PATFETCH_RAW(c);
+    *pp = p;
+    if (c == '\\') {
+      return read_special(--p, pend, pp) | 0x80;
+    }
+    else if (c == -1) return ~0;
+    else {
+      return ((c & 0xff) | 0x80);
+    }
+
+  case 'C':
+    PATFETCH_RAW(c);
+    if (c != '-') return ~0;
+  case 'c':
+    PATFETCH_RAW(c);
+    *pp = p;
+    if (c == '\\') {
+      c = read_special(--p, pend, pp);
+    }
+    else if (c == '?') return 0177;
+    else if (c == -1) return ~0;
+    return c & 0x9f;
+  default:
+    *pp = p + 1;
+    return read_backslash(c);
+  }
+
+ end_of_pattern:
+  return ~0;
+}
+
+/* re_compile_pattern takes a regular-expression string
+   and converts it into a buffer full of byte commands for matching.
+
+   PATTERN   is the address of the pattern string
+   SIZE      is the length of it.
+   BUFP	    is a  struct re_pattern_buffer *  which points to the info
+	     on where to store the byte commands.
+	     This structure contains a  char *  which points to the
+	     actual space, which should have been obtained with malloc.
+	     re_compile_pattern may use realloc to grow the buffer space.
+
+   The number of bytes of commands can be found out by looking in
+   the `struct re_pattern_buffer' that bufp pointed to, after
+   re_compile_pattern returns. */
+
+char *
+re_compile_pattern(pattern, size, bufp)
+     const char *pattern;
+     int size;
+     struct re_pattern_buffer *bufp;
+{
+  register char *b = bufp->buffer;
+  register const char *p = pattern;
+  const char *nextp;
+  const char *pend = pattern + size;
+  register unsigned int c, c1 = 0;
+  const char *p0;
+  int numlen;
+#define ERROR_MSG_MAX_SIZE 200
+  static char error_msg[ERROR_MSG_MAX_SIZE+1];
+
+  /* Address of the count-byte of the most recently inserted `exactn'
+     command.  This makes it possible to tell whether a new exact-match
+     character can be added to that command or requires a new `exactn'
+     command.  */
+
+  char *pending_exact = 0;
+
+  /* Address of the place where a forward-jump should go to the end of
+     the containing expression.  Each alternative of an `or', except the
+     last, ends with a forward-jump of this sort.  */
+
+  char *fixup_alt_jump = 0;
+
+  /* Address of start of the most recently finished expression.
+     This tells postfix * where to find the start of its operand.  */
+
+  char *laststart = 0;
+
+  /* In processing a repeat, 1 means zero matches is allowed.  */
+
+  char zero_times_ok;
+
+  /* In processing a repeat, 1 means many matches is allowed.  */
+
+  char many_times_ok;
+
+  /* In processing a repeat, 1 means non-greedy matches.  */
+
+  char greedy;
+
+  /* Address of beginning of regexp, or inside of last (.  */
+
+  char *begalt = b;
+
+  /* Place in the uncompiled pattern (i.e., the {) to
+     which to go back if the interval is invalid.  */
+  const char *beg_interval;
+
+  /* In processing an interval, at least this many matches must be made.  */
+  int lower_bound;
+
+  /* In processing an interval, at most this many matches can be made.  */
+  int upper_bound;
+
+  /* Stack of information saved by ( and restored by ).
+     Five stack elements are pushed by each (:
+     First, the value of b.
+     Second, the value of fixup_alt_jump.
+     Third, the value of begalt.
+     Fourth, the value of regnum.
+     Fifth, the type of the paren. */
+
+  int stacka[40];
+  int *stackb = stacka;
+  int *stackp = stackb;
+  int *stacke = stackb + 40;
+
+  /* Counts ('s as they are encountered.  Remembered for the matching ),
+     where it becomes the register number to put in the stop_memory
+     command.  */
+
+  int regnum = 1;
+
+  int range = 0;
+  int had_mbchar = 0;
+  int had_num_literal = 0;
+  int had_char_class = 0;
+
+  int options = bufp->options;
+
+  bufp->fastmap_accurate = 0;
+  bufp->must = 0;
+  bufp->must_skip = 0;
+
+  /* Initialize the syntax table.  */
+  init_syntax_once();
+
+  if (bufp->allocated == 0) {
+    bufp->allocated = INIT_BUF_SIZE;
+    /* EXTEND_BUFFER loses when bufp->allocated is 0.  */
+    bufp->buffer = (char*)xrealloc(bufp->buffer, INIT_BUF_SIZE);
+    if (!bufp->buffer) goto memory_exhausted; /* this not happen */
+    begalt = b = bufp->buffer;
+  }
+
+  while (p != pend) {
+    PATFETCH(c);
+
+    switch (c) {
+    case '$':
+      if (bufp->options & RE_OPTION_SINGLELINE) {
+	BUFPUSH(endbuf);
+      }
+      else {
+	p0 = p;
+	/* When testing what follows the $,
+	   look past the \-constructs that don't consume anything.  */
+
+	while (p0 != pend) {
+	  if (*p0 == '\\' && p0 + 1 != pend
+	      && (p0[1] == 'b' || p0[1] == 'B'))
+	    p0 += 2;
+	  else
+	    break;
+	}
+	BUFPUSH(endline);
+      }
+      break;
+
+    case '^':
+      if (bufp->options & RE_OPTION_SINGLELINE)
+	BUFPUSH(begbuf);
+      else
+	BUFPUSH(begline);
+      break;
+
+    case '+':
+    case '?':
+    case '*':
+      /* If there is no previous pattern, char not special. */
+      if (!laststart) {
+	snprintf(error_msg, ERROR_MSG_MAX_SIZE, 
+		 "invalid regular expression; there's no previous pattern, to which '%c' would define cardinality at %d", 
+		 c, p-pattern);
+	FREE_AND_RETURN(stackb, error_msg);
+      }
+      /* If there is a sequence of repetition chars,
+	 collapse it down to just one.  */
+      zero_times_ok = c != '+';
+      many_times_ok = c != '?';
+      greedy = 1;
+      if (p != pend) {
+	PATFETCH(c);
+	switch (c) {
+	case '?':
+	  greedy = 0;
+	  break;
+	case '*':
+	case '+':
+	  goto nested_meta;
+	default:
+	  PATUNFETCH;
+	  break;
+	}
+      }
+
+    repeat:
+      /* Star, etc. applied to an empty pattern is equivalent
+	 to an empty pattern.  */
+      if (!laststart)  
+	break;
+
+      if (greedy && many_times_ok && *laststart == anychar && b - laststart <= 2) {
+	if (b[-1] == stop_paren)
+	  b--;
+	if (zero_times_ok)
+	  *laststart = anychar_repeat;
+	else {
+	  BUFPUSH(anychar_repeat);
+	}
+	break;
+      }
+      /* Now we know whether or not zero matches is allowed
+	 and also whether or not two or more matches is allowed.  */
+      if (many_times_ok) {
+	/* If more than one repetition is allowed, put in at the
+	   end a backward relative jump from b to before the next
+	   jump we're going to put in below (which jumps from
+	   laststart to after this jump).  */
+	GET_BUFFER_SPACE(3);
+	store_jump(b,greedy?maybe_finalize_jump:finalize_push,laststart-3);
+	b += 3;  	/* Because store_jump put stuff here.  */
+      }
+
+      /* On failure, jump from laststart to next pattern, which will be the
+	 end of the buffer after this jump is inserted.  */
+      GET_BUFFER_SPACE(3);
+      insert_jump(on_failure_jump, laststart, b + 3, b);
+      b += 3;
+
+      if (zero_times_ok) {
+	if (greedy == 0) {
+	  GET_BUFFER_SPACE(3);
+	  insert_jump(try_next, laststart, b + 3, b);
+	  b += 3;
+	}
+      }
+      else {
+	/* At least one repetition is required, so insert a
+	   `dummy_failure_jump' before the initial
+	   `on_failure_jump' instruction of the loop. This
+	   effects a skip over that instruction the first time
+	   we hit that loop.  */
+	GET_BUFFER_SPACE(3);
+	insert_jump(dummy_failure_jump, laststart, laststart + 6, b);
+	b += 3;
+      }
+      break;
+
+    case '.':
+      laststart = b;
+      BUFPUSH(anychar);
+      break;
+
+    case '[':
+      if (p == pend)
+	FREE_AND_RETURN(stackb, "invalid regular expression; '[' can't be the last character ie. can't start range at the end of pattern");
+      while ((b - bufp->buffer + 9 + (1 << BYTEWIDTH) / BYTEWIDTH)
+	     > bufp->allocated)
+	EXTEND_BUFFER;
+
+      laststart = b;
+      if (*p == '^') {
+	BUFPUSH(charset_not); 
+	p++;
+      }
+      else
+	BUFPUSH(charset);
+      p0 = p;
+
+      BUFPUSH((1 << BYTEWIDTH) / BYTEWIDTH);
+      /* Clear the whole map */
+      memset(b, 0, (1 << BYTEWIDTH) / BYTEWIDTH + 2);
+
+      had_mbchar = 0;
+      had_num_literal = 0;
+      had_char_class = 0;
+
+      /* Read in characters and ranges, setting map bits.  */
+      for (;;) {
+	int size;
+	unsigned last = (unsigned)-1;
+
+	if ((size = EXTRACT_UNSIGNED(&b[(1 << BYTEWIDTH) / BYTEWIDTH])) || current_mbctype) {
+	  /* Ensure the space is enough to hold another interval
+	     of multi-byte chars in charset(_not)?.  */
+	  size = (1 << BYTEWIDTH) / BYTEWIDTH + 2 + size*8 + 8;
+	  while (b + size + 1 > bufp->buffer + bufp->allocated)
+	    EXTEND_BUFFER;
+	}
+      range_retry:
+	if (range && had_char_class) {
+	  FREE_AND_RETURN(stackb, "invalid regular expression; can't use character class as an end value of range");
+	}
+	PATFETCH_RAW(c);
+
+	if (c == ']') {
+	  if (p == p0 + 1) {
+	    if (p == pend)
+	      FREE_AND_RETURN(stackb, "invalid regular expression; empty character class");
+            re_warning("character class has `]' without escape");
+	  }
+	  else 
+	    /* Stop if this isn't merely a ] inside a bracket
+	       expression, but rather the end of a bracket
+	       expression.  */
+	    break;
+	}
+	/* Look ahead to see if it's a range when the last thing
+	   was a character class.  */
+	if (had_char_class && c == '-' && *p != ']')
+	  FREE_AND_RETURN(stackb, "invalid regular expression; can't use character class as a start value of range");
+	if (ismbchar(c)) {
+	  PATFETCH_MBC(c);
+	  had_mbchar++;
+	}
+	had_char_class = 0;
+
+	if (c == '-' && ((p != p0 + 1 && *p != ']') ||
+                         (p[0] == '-' && p[1] != ']') ||
+                         range))
+          re_warning("character class has `-' without escape");
+        if (c == '[' && *p != ':')
+          re_warning("character class has `[' without escape");
+
+	/* \ escapes characters when inside [...].  */
+	if (c == '\\') {
+	  PATFETCH_RAW(c);
+	  switch (c) {
+	  case 'w':
+	    for (c = 0; c < (1 << BYTEWIDTH); c++) {
+	      if (SYNTAX(c) == Sword ||
+		  (!current_mbctype && SYNTAX(c) == Sword2))
+		SET_LIST_BIT(c);
+	    }
+	    if (current_mbctype) {
+	      set_list_bits(0x80, 0xffffffff, b);
+	    }
+	    had_char_class = 1;
+	    last = -1;
+	    continue;
+
+	  case 'W':
+	    for (c = 0; c < (1 << BYTEWIDTH); c++) {
+	      if (SYNTAX(c) != Sword &&
+		  ((current_mbctype && !re_mbctab[c]) ||
+		  (!current_mbctype && SYNTAX(c) != Sword2)))
+		SET_LIST_BIT(c);
+	    }
+	    had_char_class = 1;
+	    last = -1;
+	    continue;
+
+	  case 's':
+	    for (c = 0; c < 256; c++)
+	      if (ISSPACE(c))
+		SET_LIST_BIT(c);
+	    had_char_class = 1;
+	    last = -1;
+	    continue;
+
+	  case 'S':
+	    for (c = 0; c < 256; c++)
+	      if (!ISSPACE(c))
+		SET_LIST_BIT(c);
+	    if (current_mbctype)
+	      set_list_bits(0x80, 0xffffffff, b);
+	    had_char_class = 1;
+	    last = -1;
+	    continue;
+
+	  case 'd':
+	    for (c = '0'; c <= '9'; c++)
+	      SET_LIST_BIT(c);
+	    had_char_class = 1;
+	    last = -1;
+	    continue;
+
+	  case 'D':
+	    for (c = 0; c < 256; c++)
+	      if (!ISDIGIT(c))
+		SET_LIST_BIT(c);
+	    if (current_mbctype)
+	      set_list_bits(0x80, 0xffffffff, b);
+	    had_char_class = 1;
+	    last = -1;
+	    continue;
+
+	  case 'x':
+	    c = scan_hex(p, 2, &numlen);
+	    if (numlen == 0) goto invalid_escape;
+	    p += numlen;
+	    had_num_literal = 1;
+	    break;
+
+	  case '0': case '1': case '2': case '3': case '4':
+	  case '5': case '6': case '7': case '8': case '9':
+	    PATUNFETCH;
+	    c = scan_oct(p, 3, &numlen);
+	    p += numlen;
+	    had_num_literal = 1;
+	    break;
+
+	  case 'M':
+	  case 'C':
+	  case 'c':
+	    {
+	      const char *pp;
+
+	      --p;
+	      c = read_special(p, pend, &pp);
+	      if (c > 255) goto invalid_escape;
+	      p = pp;
+	      had_num_literal = 1;
+	    }
+	    break;
+
+	  default:
+	    c = read_backslash(c);
+	    if (ismbchar(c)) {
+	      PATFETCH_MBC(c);
+	      had_mbchar++;
+	    }
+	    break;
+	  }
+	}
+        else if (c == '[' && *p == ':') { /* [:...:] */
+	  /* Leave room for the null.  */
+	  char str[CHAR_CLASS_MAX_LENGTH + 1];
+
+	  PATFETCH_RAW(c);
+	  c1 = 0;
+
+	  /* If pattern is `[[:'.  */
+	  if (p == pend) 
+	    FREE_AND_RETURN(stackb, "invalid regular expression; re can't end '[[:'");
+
+	  for (;;) {
+	    PATFETCH_RAW(c);
+	    if (c == ':' || c == ']' || p == pend
+		|| c1 == CHAR_CLASS_MAX_LENGTH)
+	      break;
+	    str[c1++] = c;
+	  }
+	  str[c1] = '\0';
+
+	  /* If isn't a word bracketed by `[:' and `:]':
+	     undo the ending character, the letters, and
+	     the leading `:' and `['.  */
+	  if (c == ':' && *p == ']') {
+	    int ch;
+	    char is_alnum = STREQ(str, "alnum");
+	    char is_alpha = STREQ(str, "alpha");
+	    char is_blank = STREQ(str, "blank");
+	    char is_cntrl = STREQ(str, "cntrl");
+	    char is_digit = STREQ(str, "digit");
+	    char is_graph = STREQ(str, "graph");
+	    char is_lower = STREQ(str, "lower");
+	    char is_print = STREQ(str, "print");
+	    char is_punct = STREQ(str, "punct");
+	    char is_space = STREQ(str, "space");
+	    char is_upper = STREQ(str, "upper");
+	    char is_xdigit = STREQ(str, "xdigit");
+
+	    if (!IS_CHAR_CLASS(str)){
+	      snprintf(error_msg, ERROR_MSG_MAX_SIZE, 
+		       "invalid regular expression; [:%s:] is not a character class", str);
+	      FREE_AND_RETURN(stackb, error_msg);
+	    }
+
+	    /* Throw away the ] at the end of the character class.  */
+	    PATFETCH(c);
+
+	    if (p == pend) 
+	      FREE_AND_RETURN(stackb, "invalid regular expression; range doesn't have ending ']' after a character class");
+
+	    for (ch = 0; ch < 1 << BYTEWIDTH; ch++) {
+	      if (   (is_alnum  && ISALNUM(ch))
+		  || (is_alpha  && ISALPHA(ch))
+		  || (is_blank  && ISBLANK(ch))
+		  || (is_cntrl  && ISCNTRL(ch))
+		  || (is_digit  && ISDIGIT(ch))
+		  || (is_graph  && ISGRAPH(ch))
+		  || (is_lower  && ISLOWER(ch))
+		  || (is_print  && ISPRINT(ch))
+		  || (is_punct  && ISPUNCT(ch))
+		  || (is_space  && ISSPACE(ch))
+		  || (is_upper  && ISUPPER(ch))
+		  || (is_xdigit && ISXDIGIT(ch)))
+		SET_LIST_BIT(ch);
+	    }
+	    had_char_class = 1;
+            continue;
+	  }
+	  else {
+	    c1 += 2;
+	    while (c1--)    
+	      PATUNFETCH;
+            re_warning("character class has `[' without escape");
+            c = '[';
+	  }
+	}
+
+	/* Get a range.  */
+	if (range) {
+	  if (last > c)
+	    goto invalid_pattern;
+
+	  range = 0;
+	  if (had_mbchar == 0) {
+	    if (TRANSLATE_P()) {
+	      for (;last<=c;last++) 
+		SET_LIST_BIT(translate[last]);
+	    }
+	    else {
+	      for (;last<=c;last++) 
+		SET_LIST_BIT(last);
+	    }
+	  }
+	  else if (had_mbchar == 2) {
+	    set_list_bits(last, c, b);
+	  }
+	  else {
+	    /* restriction: range between sbc and mbc */
+	    goto invalid_pattern;
+	  }
+	}
+	else if (p[0] == '-' && p[1] != ']') {
+	  last = c;
+	  PATFETCH_RAW(c1);
+	  range = 1;
+	  goto range_retry;
+	}
+	else {
+	  if (TRANSLATE_P() && c < 0x100) c = (unsigned char)translate[c];
+	  if (had_mbchar == 0 && (!current_mbctype || !had_num_literal)) {
+	    SET_LIST_BIT(c);
+	    had_num_literal = 0;
+	  }
+	  else {
+	    set_list_bits(c, c, b);
+	  }
+	}
+	had_mbchar = 0;
+      }
+
+      /* Discard any character set/class bitmap bytes that are all
+	 0 at the end of the map. Decrement the map-length byte too.  */
+      while ((int)b[-1] > 0 && b[b[-1] - 1] == 0) 
+	b[-1]--; 
+      if (b[-1] != (1 << BYTEWIDTH) / BYTEWIDTH)
+	memmove(&b[(unsigned char)b[-1]], &b[(1 << BYTEWIDTH) / BYTEWIDTH],
+		2 + EXTRACT_UNSIGNED(&b[(1 << BYTEWIDTH) / BYTEWIDTH])*8);
+      b += b[-1] + 2 + EXTRACT_UNSIGNED(&b[(unsigned char)b[-1]])*8;
+      had_num_literal = 0;
+      break;
+
+    case '(':
+      {
+	int old_options = options;
+	int push_option = 0;
+	int casefold = 0;
+
+	PATFETCH(c);
+	if (c == '?') {
+	  int negative = 0;
+
+	  PATFETCH_RAW(c);
+	  switch (c) {
+	  case 'x': case 'm': case 'i': case '-':
+	    for (;;) {
+	      switch (c) {
+	      case '-':
+		negative = 1;
+		break;
+
+	      case ':':
+	      case ')':
+		break;
+
+	      case 'x':
+		if (negative)
+		  options &= ~RE_OPTION_EXTENDED;
+		else
+		  options |= RE_OPTION_EXTENDED;
+		break;
+
+	      case 'm':
+		if (negative) {
+		  if (options&RE_OPTION_MULTILINE) {
+		    options &= ~RE_OPTION_MULTILINE;
+		  }
+		}
+		else if (!(options&RE_OPTION_MULTILINE)) {
+		  options |= RE_OPTION_MULTILINE;
+		}
+		push_option = 1;
+		break;
+
+	      case 'i':
+		if (negative) {
+		  if (options&RE_OPTION_IGNORECASE) {
+		    options &= ~RE_OPTION_IGNORECASE;
+		  }
+		}
+		else if (!(options&RE_OPTION_IGNORECASE)) {
+		  options |= RE_OPTION_IGNORECASE;
+		}
+		casefold = 1;
+		break;
+
+	      default:
+		FREE_AND_RETURN(stackb, "undefined (?...) inline option");
+	      }
+	      if (c == ')') {
+		c = '#';	/* read whole in-line options */
+		break;
+	      }
+	      if (c == ':') break;
+	      PATFETCH_RAW(c);
+	    }
+	    break;
+
+	  case '#':
+	    for (;;) {
+	      PATFETCH(c);
+	      if (c == ')') break;
+	    }
+	    c = '#';
+	    break;
+
+	  case ':':
+	  case '=':
+	  case '!':
+	  case '>':
+	    break;
+
+	  default:
+	    FREE_AND_RETURN(stackb, "undefined (?...) sequence");
+	  }
+	}
+	else {
+	  PATUNFETCH;
+	  c = '(';
+	}
+	if (c == '#') {
+	  if (push_option) {
+	    BUFPUSH(option_set);
+	    BUFPUSH(options);
+	  }
+	  if (casefold) {
+	    if (options & RE_OPTION_IGNORECASE)
+	      BUFPUSH(casefold_on);
+	    else
+	      BUFPUSH(casefold_off);
+	  }
+	  break;
+	}
+	if (stackp+8 >= stacke) {
+	  DOUBLE_STACK(int);
+	}
+
+	/* Laststart should point to the start_memory that we are about
+	   to push (unless the pattern has RE_NREGS or more ('s).  */
+	/* obsolete: now RE_NREGS is just a default register size. */
+	*stackp++ = b - bufp->buffer;    
+	*stackp++ = fixup_alt_jump ? fixup_alt_jump - bufp->buffer + 1 : 0;
+	*stackp++ = begalt - bufp->buffer;
+	switch (c) {
+	case '(':
+	  BUFPUSH(start_memory);
+	  BUFPUSH(regnum);
+	  *stackp++ = regnum++;
+	  *stackp++ = b - bufp->buffer;
+	  BUFPUSH(0);
+	  /* too many ()'s to fit in a byte. (max 254) */
+	  if (regnum >= RE_REG_MAX) goto too_big;
+	  break;
+
+	case '=':
+	case '!':
+	case '>':
+	  BUFPUSH(start_nowidth);
+	  *stackp++ = b - bufp->buffer;
+	  BUFPUSH(0);	/* temporary value */
+	  BUFPUSH(0);
+	  if (c != '!') break;
+
+	  BUFPUSH(on_failure_jump);
+	  *stackp++ = b - bufp->buffer;
+	  BUFPUSH(0);	/* temporary value */
+	  BUFPUSH(0);
+	  break;
+
+	case ':':
+	  BUFPUSH(start_paren);
+	  pending_exact = 0;
+	default:
+	  break;
+	}
+	if (push_option) {
+	  BUFPUSH(option_set);
+	  BUFPUSH(options);
+	}
+	if (casefold) {
+	  if (options & RE_OPTION_IGNORECASE)
+	    BUFPUSH(casefold_on);
+	  else
+	    BUFPUSH(casefold_off);
+	}
+	*stackp++ = c;
+	*stackp++ = old_options;
+	fixup_alt_jump = 0;
+	laststart = 0;
+	begalt = b;
+      }
+      break;
+
+    case ')':
+      if (stackp == stackb) 
+	FREE_AND_RETURN(stackb, "unmatched )");
+
+      pending_exact = 0;
+      if (fixup_alt_jump) {
+	/* Push a dummy failure point at the end of the
+	   alternative for a possible future
+	   `finalize_jump' to pop.  See comments at
+	   `push_dummy_failure' in `re_match'.  */
+	BUFPUSH(push_dummy_failure);
+
+	/* We allocated space for this jump when we assigned
+	   to `fixup_alt_jump', in the `handle_alt' case below.  */
+	store_jump(fixup_alt_jump, jump, b);
+      }
+      if (options != stackp[-1]) {
+	if ((options ^ stackp[-1]) & RE_OPTION_IGNORECASE) {
+	  BUFPUSH((options&RE_OPTION_IGNORECASE)?casefold_off:casefold_on);
+	}
+	if ((options ^ stackp[-1]) != RE_OPTION_IGNORECASE) {
+	  BUFPUSH(option_set);
+	  BUFPUSH(stackp[-1]);
+	}
+      }
+      p0 = b;
+      options = *--stackp;
+      switch (c = *--stackp) {
+      case '(':
+	{
+	  char *loc = bufp->buffer + *--stackp;
+	  *loc = regnum - stackp[-1];
+	  BUFPUSH(stop_memory);
+	  BUFPUSH(stackp[-1]);
+	  BUFPUSH(regnum - stackp[-1]);
+	  stackp--;
+	}
+	break;
+
+      case '!':
+	BUFPUSH(pop_and_fail);
+	/* back patch */
+	STORE_NUMBER(bufp->buffer+stackp[-1], b - bufp->buffer - stackp[-1] - 2);
+	stackp--;
+	/* fall through */
+      case '=':
+	BUFPUSH(stop_nowidth);
+	/* tell stack-pos place to start_nowidth */
+	STORE_NUMBER(bufp->buffer+stackp[-1], b - bufp->buffer - stackp[-1] - 2);
+	BUFPUSH(0);	/* space to hold stack pos */
+	BUFPUSH(0);
+	stackp--;
+	break;
+
+      case '>':
+	BUFPUSH(stop_backtrack);
+	/* tell stack-pos place to start_nowidth */
+	STORE_NUMBER(bufp->buffer+stackp[-1], b - bufp->buffer - stackp[-1] - 2);
+	BUFPUSH(0);	/* space to hold stack pos */
+	BUFPUSH(0);
+	stackp--;
+	break;
+
+      case ':':
+	BUFPUSH(stop_paren);
+	break;
+
+      default:
+	break;
+      }
+      begalt = *--stackp + bufp->buffer;
+      stackp--;
+      fixup_alt_jump = *stackp ? *stackp + bufp->buffer - 1 : 0;
+      laststart = *--stackp + bufp->buffer;
+      if (c == '!' || c == '=') laststart = b;
+      break;
+
+    case '|':
+      /* Insert before the previous alternative a jump which
+	 jumps to this alternative if the former fails.  */
+      GET_BUFFER_SPACE(3);
+      insert_jump(on_failure_jump, begalt, b + 6, b);
+      pending_exact = 0;
+      b += 3;
+      /* The alternative before this one has a jump after it
+	 which gets executed if it gets matched.  Adjust that
+	 jump so it will jump to this alternative's analogous
+	 jump (put in below, which in turn will jump to the next
+	 (if any) alternative's such jump, etc.).  The last such
+	 jump jumps to the correct final destination.  A picture:
+	 _____ _____ 
+	 |   | |   |   
+	 |   v |   v 
+	 a | b   | c   
+
+	 If we are at `b', then fixup_alt_jump right now points to a
+	 three-byte space after `a'.  We'll put in the jump, set
+	 fixup_alt_jump to right after `b', and leave behind three
+	 bytes which we'll fill in when we get to after `c'.  */
+
+      if (fixup_alt_jump)
+	store_jump(fixup_alt_jump, jump_past_alt, b);
+
+      /* Mark and leave space for a jump after this alternative,
+	 to be filled in later either by next alternative or
+	 when know we're at the end of a series of alternatives.  */
+      fixup_alt_jump = b;
+      GET_BUFFER_SPACE(3);
+      b += 3;
+
+      laststart = 0;
+      begalt = b;
+      break;
+
+    case '{':
+      /* If there is no previous pattern, this is an invalid pattern.  */
+      if (!laststart) {
+	snprintf(error_msg, ERROR_MSG_MAX_SIZE, 
+		 "invalid regular expression; there's no previous pattern, to which '{' would define cardinality at %d", 
+		 p-pattern);
+	FREE_AND_RETURN(stackb, error_msg);
+      }
+      if( p == pend)
+	FREE_AND_RETURN(stackb, "invalid regular expression; '{' can't be last character" );
+
+      beg_interval = p - 1;
+
+      lower_bound = -1;			/* So can see if are set.  */
+      upper_bound = -1;
+      GET_UNSIGNED_NUMBER(lower_bound);
+      if (c == ',') {
+	GET_UNSIGNED_NUMBER(upper_bound);
+      }
+      else
+	/* Interval such as `{1}' => match exactly once. */
+	upper_bound = lower_bound;
+
+      if (lower_bound < 0 || c != '}')
+	goto unfetch_interval;
+
+      if (lower_bound >= RE_DUP_MAX || upper_bound >= RE_DUP_MAX)
+	FREE_AND_RETURN(stackb, "too big quantifier in {,}");
+      if (upper_bound < 0) upper_bound = RE_DUP_MAX;
+      if (lower_bound > upper_bound)
+	FREE_AND_RETURN(stackb, "can't do {n,m} with n > m");
+
+      beg_interval = 0;
+      pending_exact = 0;
+
+      greedy = 1;
+      if (p != pend) {
+	PATFETCH(c);
+	if (c == '?') greedy = 0;
+	else PATUNFETCH;
+      }
+
+      if (lower_bound == 0) {
+	zero_times_ok = 1;
+	if (upper_bound == RE_DUP_MAX) {
+	  many_times_ok = 1;
+	  goto repeat;
+	}
+	if (upper_bound == 1) {
+	  many_times_ok = 0;
+	  goto repeat;
+	}
+      }
+      if (lower_bound == 1) {
+	if (upper_bound == 1) {
+	  /* No need to repeat */
+	  break;
+	}
+	if (upper_bound == RE_DUP_MAX) {
+	  many_times_ok = 1;
+	  zero_times_ok = 0;
+	  goto repeat;
+	}
+      }
+
+      /* If upper_bound is zero, don't want to succeed at all; 
+	 jump from laststart to b + 3, which will be the end of
+	 the buffer after this jump is inserted.  */
+
+      if (upper_bound == 0) {
+	GET_BUFFER_SPACE(3);
+	insert_jump(jump, laststart, b + 3, b);
+	b += 3;
+	break;
+      }
+
+      /* If lower_bound == upper_bound, repeat count can be removed */
+      if (lower_bound == upper_bound) {
+	int mcnt;
+	int skip_stop_paren = 0;
+
+	if (b[-1] == stop_paren) {
+	  skip_stop_paren = 1;
+	  b--;
+	}
+
+	if (*laststart == exactn && laststart[1]+2 == b - laststart
+	    && laststart[1]*lower_bound < 256) {
+	  mcnt = laststart[1];
+	  GET_BUFFER_SPACE((lower_bound-1)*mcnt);
+	  laststart[1] = lower_bound*mcnt;
+	  while (--lower_bound) {
+	    memcpy(b, laststart+2, mcnt);
+	    b += mcnt;
+	  }
+	  if (skip_stop_paren) BUFPUSH(stop_paren);
+	  break;
+	}
+
+	if (lower_bound < 5 && b - laststart < 10) {
+	  /* 5 and 10 are the magic numbers */
+
+	  mcnt = b - laststart;
+	  GET_BUFFER_SPACE((lower_bound-1)*mcnt);
+	  while (--lower_bound) {
+	    memcpy(b, laststart, mcnt);
+	    b += mcnt;
+	  }
+	  if (skip_stop_paren) BUFPUSH(stop_paren);
+	  break;
+	}
+	if (skip_stop_paren) b++; /* push back stop_paren */
+      }
+
+      /* Otherwise, we have a nontrivial interval.  When
+	 we're all done, the pattern will look like:
+	 set_number_at <jump count> <upper bound>
+	 set_number_at <succeed_n count> <lower bound>
+	 succeed_n <after jump addr> <succed_n count>
+	 <body of loop>
+	 jump_n <succeed_n addr> <jump count>
+	 (The upper bound and `jump_n' are omitted if
+	 `upper_bound' is 1, though.)  */
+      { /* If the upper bound is > 1, we need to insert
+	   more at the end of the loop.  */
+	unsigned nbytes = upper_bound == 1 ? 10 : 20;
+
+	GET_BUFFER_SPACE(nbytes);
+	/* Initialize lower bound of the `succeed_n', even
+	   though it will be set during matching by its
+	   attendant `set_number_at' (inserted next),
+	   because `re_compile_fastmap' needs to know.
+	   Jump to the `jump_n' we might insert below.  */
+	insert_jump_n(succeed_n, laststart, b + (nbytes/2), 
+		      b, lower_bound);
+	b += 5; 	/* Just increment for the succeed_n here.  */
+
+	/* Code to initialize the lower bound.  Insert 
+	   before the `succeed_n'.  The `5' is the last two
+	   bytes of this `set_number_at', plus 3 bytes of
+	   the following `succeed_n'.  */
+	insert_op_2(set_number_at, laststart, b, 5, lower_bound);
+	b += 5;
+
+	if (upper_bound > 1) {
+	  /* More than one repetition is allowed, so
+	     append a backward jump to the `succeed_n'
+	     that starts this interval.
+
+	     When we've reached this during matching,
+	     we'll have matched the interval once, so
+	     jump back only `upper_bound - 1' times.  */
+	  GET_BUFFER_SPACE(5);
+	  store_jump_n(b, greedy?jump_n:finalize_push_n, laststart + 5,
+		       upper_bound - 1);
+	  b += 5;
+
+	  /* The location we want to set is the second
+	     parameter of the `jump_n'; that is `b-2' as
+	     an absolute address.  `laststart' will be
+	     the `set_number_at' we're about to insert;
+	     `laststart+3' the number to set, the source
+	     for the relative address.  But we are
+	     inserting into the middle of the pattern --
+	     so everything is getting moved up by 5.
+	     Conclusion: (b - 2) - (laststart + 3) + 5,
+	     i.e., b - laststart.
+
+	     We insert this at the beginning of the loop
+	     so that if we fail during matching, we'll
+	     reinitialize the bounds.  */
+	  insert_op_2(set_number_at, laststart, b, b - laststart,
+		      upper_bound - 1);
+	  b += 5;
+	}
+      }
+      break;
+
+    unfetch_interval:
+      /* If an invalid interval, match the characters as literals.  */
+      re_warning("regexp has invalid interval");
+      p = beg_interval;
+      beg_interval = 0;
+
+      /* normal_char and normal_backslash need `c'.  */
+      PATFETCH(c);	
+      goto normal_char;
+
+    case '\\':
+      if (p == pend)
+	FREE_AND_RETURN(stackb, "invalid regular expression; '\\' can't be last character");
+      /* Do not translate the character after the \, so that we can
+	 distinguish, e.g., \B from \b, even if we normally would
+	 translate, e.g., B to b.  */
+      PATFETCH_RAW(c);
+      switch (c) {
+      case 's':
+      case 'S':
+      case 'd':
+      case 'D':
+	while (b - bufp->buffer + 9 + (1 << BYTEWIDTH) / BYTEWIDTH
+	       > bufp->allocated)
+	  EXTEND_BUFFER;
+
+	laststart = b;
+	if (c == 's' || c == 'd') {
+	  BUFPUSH(charset);
+	}
+	else {
+	  BUFPUSH(charset_not);
+	}
+
+	BUFPUSH((1 << BYTEWIDTH) / BYTEWIDTH);
+	memset(b, 0, (1 << BYTEWIDTH) / BYTEWIDTH + 2);
+	if (c == 's' || c == 'S') {
+	  SET_LIST_BIT(' ');
+	  SET_LIST_BIT('\t');
+	  SET_LIST_BIT('\n');
+	  SET_LIST_BIT('\r');
+	  SET_LIST_BIT('\f');
+	}
+	else {
+	  char cc;
+
+	  for (cc = '0'; cc <= '9'; cc++) {
+	    SET_LIST_BIT(cc);
+	  }
+	}
+
+	while ((int)b[-1] > 0 && b[b[-1] - 1] == 0) 
+	  b[-1]--; 
+	if (b[-1] != (1 << BYTEWIDTH) / BYTEWIDTH)
+	  memmove(&b[(unsigned char)b[-1]], &b[(1 << BYTEWIDTH) / BYTEWIDTH],
+		  2 + EXTRACT_UNSIGNED(&b[(1 << BYTEWIDTH) / BYTEWIDTH])*8);
+	b += b[-1] + 2 + EXTRACT_UNSIGNED(&b[(unsigned char)b[-1]])*8;
+	break;
+
+      case 'w':
+	laststart = b;
+	BUFPUSH(wordchar);
+	break;
+
+      case 'W':
+	laststart = b;
+	BUFPUSH(notwordchar);
+	break;
+
+#ifndef RUBY
+      case '<':
+	BUFPUSH(wordbeg);
+	break;
+
+      case '>':
+	BUFPUSH(wordend);
+	break;
+#endif
+
+      case 'b':
+	BUFPUSH(wordbound);
+	break;
+
+      case 'B':
+	BUFPUSH(notwordbound);
+	break;
+
+      case 'A':
+	BUFPUSH(begbuf);
+	break;
+
+      case 'Z':
+	if ((bufp->options & RE_OPTION_SINGLELINE) == 0) {
+	  BUFPUSH(endbuf2);
+	  break;
+	}
+	/* fall through */
+      case 'z':
+	BUFPUSH(endbuf);
+	break;
+
+      case 'G':
+	BUFPUSH(begpos);
+	break;
+
+	/* hex */
+      case 'x':
+	had_mbchar = 0;
+	c = scan_hex(p, 2, &numlen);
+	if (numlen == 0) goto invalid_escape;
+	p += numlen;
+	had_num_literal = 1;
+	goto numeric_char;
+
+	/* octal */
+      case '0':
+	had_mbchar = 0;
+	c = scan_oct(p, 2, &numlen);
+	p += numlen;
+	had_num_literal = 1;
+	goto numeric_char;
+
+	/* back-ref or octal */
+      case '1': case '2': case '3':
+      case '4': case '5': case '6':
+      case '7': case '8': case '9':
+	PATUNFETCH;
+	p0 = p;
+
+	had_mbchar = 0;
+	c1 = 0;
+	GET_UNSIGNED_NUMBER(c1);
+	if (!ISDIGIT(c)) PATUNFETCH;
+
+	if (9 < c1 && c1 >= regnum) {
+	  /* need to get octal */
+	  c = scan_oct(p0, 3, &numlen) & 0xff;
+	  p = p0 + numlen;
+	  c1 = 0;
+	  had_num_literal = 1;
+	  goto numeric_char;
+	}
+
+	laststart = b;
+	BUFPUSH(duplicate);
+	BUFPUSH(c1);
+	break;
+
+      case 'M':
+      case 'C':
+      case 'c':
+	p0 = --p;
+	c = read_special(p, pend, &p0);
+	if (c > 255) goto invalid_escape;
+	p = p0;
+	had_num_literal = 1;
+	goto numeric_char;
+
+      default:
+	c = read_backslash(c);
+	goto normal_char;
+      }
+      break;
+
+    case '#':
+      if (options & RE_OPTION_EXTENDED) {
+	while (p != pend) {
+	  PATFETCH(c);
+	  if (c == '\n') break;
+	}
+	break;
+      }
+      goto normal_char;
+
+    case ' ':
+    case '\t':
+    case '\f':
+    case '\r':
+    case '\n':
+      if (options & RE_OPTION_EXTENDED)
+	break;
+
+    default:
+      if (c == ']')
+        re_warning("regexp has `]' without escape");
+      else if (c == '}')
+        re_warning("regexp has `}' without escape");
+    normal_char:		/* Expects the character in `c'.  */
+      had_mbchar = 0;
+      if (ismbchar(c)) {
+	had_mbchar = 1;
+	c1 = p - pattern;
+      }
+    numeric_char:
+      nextp = p + mbclen(c) - 1;
+      if (!pending_exact || pending_exact + *pending_exact + 1 != b
+	  || *pending_exact >= (c1 ? 0176 : 0177)
+	  || (nextp < pend &&
+	      (   *nextp == '+' || *nextp == '?'
+	       || *nextp == '*' || *nextp == '^'
+	       || *nextp == '{'))) {
+	laststart = b;
+	BUFPUSH(exactn);
+	pending_exact = b;
+	BUFPUSH(0);
+      }
+      if (had_num_literal || c == 0xff) {
+	BUFPUSH(0xff);
+	(*pending_exact)++;
+	had_num_literal = 0;
+      }
+      BUFPUSH(c);
+      (*pending_exact)++;
+      if (had_mbchar) {
+	int len = mbclen(c) - 1;
+	while (len--) {
+	  PATFETCH_RAW(c);
+	  BUFPUSH(c);
+	  (*pending_exact)++;
+	}
+      }
+    }
+  }
+
+  if (fixup_alt_jump)
+    store_jump(fixup_alt_jump, jump, b);
+
+  if (stackp != stackb)
+    FREE_AND_RETURN(stackb, "unmatched (");
+
+  /* set optimize flags */
+  laststart = bufp->buffer;
+  if (laststart != b) {
+    if (*laststart == dummy_failure_jump) laststart += 3;
+    else if (*laststart == try_next) laststart += 3;
+    if (*laststart == anychar_repeat) {
+      bufp->options |= RE_OPTIMIZE_ANCHOR;
+    }
+  }
+
+  bufp->used = b - bufp->buffer;
+  bufp->re_nsub = regnum;
+  laststart = bufp->buffer;
+  if (laststart != b) {
+    if (*laststart == start_memory) laststart += 3;
+    if (*laststart == exactn) {
+      bufp->options |= RE_OPTIMIZE_EXACTN;
+      bufp->must = laststart+1;
+    }
+  }
+  if (!bufp->must) {
+    bufp->must = calculate_must_string(bufp->buffer, b);
+  }
+  if (current_mbctype == MBCTYPE_SJIS) bufp->options |= RE_OPTIMIZE_NO_BM;
+  else if (bufp->must) {
+    int i;
+    int len = (unsigned char)bufp->must[0];
+
+    for (i=1; i<len; i++) {
+      if ((unsigned char)bufp->must[i] == 0xff ||
+	  (current_mbctype && ismbchar(bufp->must[i]))) {
+	bufp->options |= RE_OPTIMIZE_NO_BM;
+	break;
+      }
+    }
+    if (!(bufp->options & RE_OPTIMIZE_NO_BM)) {
+      bufp->must_skip = (int *) xmalloc((1 << BYTEWIDTH)*sizeof(int));
+      bm_init_skip(bufp->must_skip, (unsigned char*)bufp->must+1,
+		   (unsigned char)bufp->must[0],
+		   (unsigned char*)(MAY_TRANSLATE()?translate:0));
+    }
+  }
+
+  bufp->regstart = TMALLOC(regnum, unsigned char*);
+  bufp->regend = TMALLOC(regnum, unsigned char*);
+  bufp->old_regstart = TMALLOC(regnum, unsigned char*);
+  bufp->old_regend = TMALLOC(regnum, unsigned char*);
+  bufp->reg_info = TMALLOC(regnum, register_info_type);
+  bufp->best_regstart = TMALLOC(regnum, unsigned char*);
+  bufp->best_regend = TMALLOC(regnum, unsigned char*);
+  FREE_AND_RETURN(stackb, 0);
+
+ invalid_pattern:
+  FREE_AND_RETURN(stackb, "invalid regular expression");
+
+ end_of_pattern:
+  FREE_AND_RETURN(stackb, "premature end of regular expression");
+
+ too_big:
+  FREE_AND_RETURN(stackb, "regular expression too big");
+
+ memory_exhausted:
+  FREE_AND_RETURN(stackb, "memory exhausted");
+
+ nested_meta:
+  FREE_AND_RETURN(stackb, "nested *?+ in regexp");
+
+ invalid_escape:
+  FREE_AND_RETURN(stackb, "Invalid escape character syntax");
+}
+
+void
+re_free_pattern(bufp)
+     struct re_pattern_buffer *bufp;
+{
+  xfree(bufp->buffer);
+  xfree(bufp->fastmap);
+  if (bufp->must_skip) xfree(bufp->must_skip);
+
+  xfree(bufp->regstart);
+  xfree(bufp->regend);
+  xfree(bufp->old_regstart);
+  xfree(bufp->old_regend);
+  xfree(bufp->best_regstart);
+  xfree(bufp->best_regend);
+  xfree(bufp->reg_info);
+  xfree(bufp);
+}
+
+/* Store a jump of the form <OPCODE> <relative address>.
+   Store in the location FROM a jump operation to jump to relative
+   address FROM - TO.  OPCODE is the opcode to store.  */
+
+static void
+store_jump(from, opcode, to)
+     char *from, *to;
+     int opcode;
+{
+  from[0] = (char)opcode;
+  STORE_NUMBER(from + 1, to - (from + 3));
+}
+
+
+/* Open up space before char FROM, and insert there a jump to TO.
+   CURRENT_END gives the end of the storage not in use, so we know 
+   how much data to copy up. OP is the opcode of the jump to insert.
+
+   If you call this function, you must zero out pending_exact.  */
+
+static void
+insert_jump(op, from, to, current_end)
+     int op;
+     char *from, *to, *current_end;
+{
+  register char *pfrom = current_end;		/* Copy from here...  */
+  register char *pto = current_end + 3;		/* ...to here.  */
+
+  while (pfrom != from)			       
+    *--pto = *--pfrom;
+  store_jump(from, op, to);
+}
+
+
+/* Store a jump of the form <opcode> <relative address> <n> .
+
+   Store in the location FROM a jump operation to jump to relative
+   address FROM - TO.  OPCODE is the opcode to store, N is a number the
+   jump uses, say, to decide how many times to jump.
+
+   If you call this function, you must zero out pending_exact.  */
+
+static void
+store_jump_n(from, opcode, to, n)
+     char *from, *to;
+     int opcode;
+     unsigned n;
+{
+  from[0] = (char)opcode;
+  STORE_NUMBER(from + 1, to - (from + 3));
+  STORE_NUMBER(from + 3, n);
+}
+
+
+/* Similar to insert_jump, but handles a jump which needs an extra
+   number to handle minimum and maximum cases.  Open up space at
+   location FROM, and insert there a jump to TO.  CURRENT_END gives the
+   end of the storage in use, so we know how much data to copy up. OP is
+   the opcode of the jump to insert.
+
+   If you call this function, you must zero out pending_exact.  */
+
+static void
+insert_jump_n(op, from, to, current_end, n)
+     int op;
+     char *from, *to, *current_end;
+     unsigned n;
+{
+  register char *pfrom = current_end;		/* Copy from here...  */
+  register char *pto = current_end + 5;		/* ...to here.  */
+
+  while (pfrom != from)			       
+    *--pto = *--pfrom;
+  store_jump_n(from, op, to, n);
+}
+
+
+/* Open up space at location THERE, and insert operation OP.
+   CURRENT_END gives the end of the storage in use, so
+   we know how much data to copy up.
+
+   If you call this function, you must zero out pending_exact.  */
+
+static void
+insert_op(op, there, current_end)
+     int op;
+     char *there, *current_end;
+{
+  register char *pfrom = current_end;		/* Copy from here...  */
+  register char *pto = current_end + 1;		/* ...to here.  */
+
+  while (pfrom != there)			       
+    *--pto = *--pfrom;
+
+  there[0] = (char)op;
+}
+
+
+/* Open up space at location THERE, and insert operation OP followed by
+   NUM_1 and NUM_2.  CURRENT_END gives the end of the storage in use, so
+   we know how much data to copy up.
+
+   If you call this function, you must zero out pending_exact.  */
+
+static void
+insert_op_2(op, there, current_end, num_1, num_2)
+     int op;
+     char *there, *current_end;
+     int num_1, num_2;
+{
+  register char *pfrom = current_end;		/* Copy from here...  */
+  register char *pto = current_end + 5;		/* ...to here.  */
+
+  while (pfrom != there)			       
+    *--pto = *--pfrom;
+
+  there[0] = (char)op;
+  STORE_NUMBER(there + 1, num_1);
+  STORE_NUMBER(there + 3, num_2);
+}
+
+
+#define trans_eq(c1, c2, translate) (translate?(translate[c1]==translate[c2]):((c1)==(c2)))
+static int
+slow_match(little, lend, big, bend, translate)
+     const unsigned char *little, *lend;
+     const unsigned char *big, *bend;
+     const unsigned char *translate;
+{
+  int c;
+
+  while (little < lend && big < bend) {
+    c = *little++;
+    if (c == 0xff)
+      c = *little++;
+    if (!trans_eq(*big++, c, translate)) break;
+  }
+  if (little == lend) return 1;
+  return 0;
+}
+
+static int
+slow_search(little, llen, big, blen, translate)
+     const unsigned char *little;
+     int llen;
+     const unsigned char *big;
+     int blen;
+     const char *translate;
+{
+  const unsigned char *bsave = big;
+  const unsigned char *bend = big + blen;
+  register int c;
+  int fescape = 0;
+
+  c = *little;
+  if (c == 0xff) {
+    c = little[1];
+    fescape = 1;
+  }
+  else if (translate && !ismbchar(c)) {
+    c = translate[c];
+  }
+
+  while (big < bend) {
+    /* look for first character */
+    if (fescape) {
+      while (big < bend) {
+	if (*big == c) break;
+	big++;
+      }
+    }
+    else if (translate && !ismbchar(c)) {
+      while (big < bend) {
+	if (ismbchar(*big)) big+=mbclen(*big)-1;
+	else if (translate[*big] == c) break;
+	big++;
+      }
+    }
+    else {
+      while (big < bend) {
+	if (*big == c) break;
+	if (ismbchar(*big)) big+=mbclen(*big)-1;
+	big++;
+      }
+    }
+
+    if (slow_match(little, little+llen, big, bend, (unsigned char *)translate))
+      return big - bsave;
+
+    big+=mbclen(*big);
+  }
+  return -1;
+}
+
+static void
+bm_init_skip(skip, pat, m, translate)
+     int *skip;
+     unsigned char *pat;
+     int m;
+     const unsigned char *translate;
+{
+  int j, c;
+
+  for (c=0; c<256; c++) {
+    skip[c] = m;
+  }
+  if (translate) {
+    for (j=0; j<m-1; j++) {
+      skip[translate[pat[j]]] = m-1-j;
+    }
+  }
+  else {
+    for (j=0; j<m-1; j++) {
+      skip[pat[j]] = m-1-j;
+    }
+  }
+}
+
+static int
+bm_search(little, llen, big, blen, skip, translate)
+     const unsigned char *little;
+     int llen;
+     const unsigned char *big;
+     int blen;
+     int *skip;
+     const unsigned char *translate;
+{
+  int i, j, k;
+
+  i = llen-1;
+  if (translate) {
+    while (i < blen) {
+      k = i;
+      j = llen-1;
+      while (j >= 0 && translate[big[k]] == translate[little[j]]) {
+	k--;
+	j--;
+      }
+      if (j < 0) return k+1;
+
+      i += skip[translate[big[i]]];
+    }
+    return -1;
+  }
+  while (i < blen) {
+    k = i;
+    j = llen-1;
+    while (j >= 0 && big[k] == little[j]) {
+      k--;
+      j--;
+    }
+    if (j < 0) return k+1;
+
+    i += skip[big[i]];
+  }
+  return -1;
+}
+
+/* Given a pattern, compute a fastmap from it.  The fastmap records
+   which of the (1 << BYTEWIDTH) possible characters can start a string
+   that matches the pattern.  This fastmap is used by re_search to skip
+   quickly over totally implausible text.
+
+   The caller must supply the address of a (1 << BYTEWIDTH)-byte data 
+   area as bufp->fastmap.
+   The other components of bufp describe the pattern to be used.  */
+void
+re_compile_fastmap(bufp)
+     struct re_pattern_buffer *bufp;
+{
+  unsigned char *pattern = (unsigned char*)bufp->buffer;
+  int size = bufp->used;
+  register char *fastmap = bufp->fastmap;
+  register unsigned char *p = pattern;
+  register unsigned char *pend = pattern + size;
+  register int j, k;
+  unsigned is_a_succeed_n;
+
+  
+  unsigned char *stacka[NFAILURES];
+  unsigned char **stackb = stacka;
+  unsigned char **stackp = stackb;
+  unsigned char **stacke = stackb + NFAILURES;
+  int options = bufp->options;
+
+  memset(fastmap, 0, (1 << BYTEWIDTH));
+  bufp->fastmap_accurate = 1;
+  bufp->can_be_null = 0;
+
+  while (p) {
+    is_a_succeed_n = 0;
+    if (p == pend) {
+      bufp->can_be_null = 1;
+      break;
+    }
+#ifdef SWITCH_ENUM_BUG
+    switch ((int)((enum regexpcode)*p++))
+#else
+    switch ((enum regexpcode)*p++)
+#endif
+      {
+      case exactn:
+	if (p[1] == 0xff) {
+	  if (TRANSLATE_P())
+	    fastmap[translate[p[2]]] = 2;
+	  else
+	    fastmap[p[2]] = 2;
+	  bufp->options |= RE_OPTIMIZE_BMATCH;
+	}
+	else if (TRANSLATE_P())
+	  fastmap[translate[p[1]]] = 1;
+	else
+	  fastmap[p[1]] = 1;
+	break;
+
+      case begline:
+      case begbuf:
+      case begpos:
+      case endbuf:
+      case endbuf2:
+      case wordbound:
+      case notwordbound:
+      case wordbeg:
+      case wordend:
+      case pop_and_fail:
+      case push_dummy_failure:
+      case start_paren:
+      case stop_paren:
+	continue;
+
+      case casefold_on:
+	bufp->options |= RE_MAY_IGNORECASE;
+	options |= RE_OPTION_IGNORECASE;
+	continue;
+
+      case casefold_off:
+	options &= ~RE_OPTION_IGNORECASE;
+	continue;
+
+      case option_set:
+	options = *p++;
+	continue;
+
+      case endline:
+	if (TRANSLATE_P())
+	  fastmap[translate['\n']] = 1;
+	else
+	  fastmap['\n'] = 1;
+	if ((options & RE_OPTION_SINGLELINE) == 0 && bufp->can_be_null == 0)
+	  bufp->can_be_null = 2;
+	break;
+
+      case jump_n:
+      case finalize_jump:
+      case maybe_finalize_jump:
+      case jump:
+      case jump_past_alt:
+      case dummy_failure_jump:
+      case finalize_push:
+      case finalize_push_n:
+	EXTRACT_NUMBER_AND_INCR(j, p);
+	p += j;	
+	if (j > 0)
+	  continue;
+	/* Jump backward reached implies we just went through
+	   the body of a loop and matched nothing.
+	   Opcode jumped to should be an on_failure_jump.
+	   Just treat it like an ordinary jump.
+	   For a * loop, it has pushed its failure point already;
+	   If so, discard that as redundant.  */
+
+	if ((enum regexpcode)*p != on_failure_jump
+	    && (enum regexpcode)*p != try_next
+	    && (enum regexpcode)*p != succeed_n)
+	  continue;
+	p++;
+	EXTRACT_NUMBER_AND_INCR(j, p);
+	p += j;	
+	if (stackp != stackb && *stackp == p)
+	  stackp--;		/* pop */
+	continue;
+
+      case try_next:
+      case start_nowidth:
+      case stop_nowidth:
+      case stop_backtrack:
+	p += 2;
+	continue;
+
+      case succeed_n:
+	is_a_succeed_n = 1;
+	/* Get to the number of times to succeed.  */
+	EXTRACT_NUMBER(k, p + 2);
+	/* Increment p past the n for when k != 0.  */
+	if (k != 0) {
+	  p += 4;
+	  continue;
+	}
+	/* fall through */
+
+      case on_failure_jump:
+      EXTRACT_NUMBER_AND_INCR(j, p);
+      if (p + j < pend) {
+	if (stackp == stacke) {
+	  EXPAND_FAIL_STACK();
+	}
+	*++stackp = p + j;	/* push */
+      }
+      else {
+	bufp->can_be_null = 1;
+      }
+      if (is_a_succeed_n)
+	EXTRACT_NUMBER_AND_INCR(k, p);	/* Skip the n.  */
+      continue;
+
+      case set_number_at:
+	p += 4;
+	continue;
+
+      case start_memory:
+      case stop_memory:
+	p += 2;
+	continue;
+
+      case duplicate:
+	bufp->can_be_null = 1;
+	if (*p >= bufp->re_nsub) break;
+	fastmap['\n'] = 1;
+      case anychar_repeat:
+      case anychar:
+	for (j = 0; j < (1 << BYTEWIDTH); j++) {
+	  if (j != '\n' || (options & RE_OPTION_MULTILINE))
+	    fastmap[j] = 1;
+	}
+	if (bufp->can_be_null) {
+	  FREE_AND_RETURN_VOID(stackb);
+	}
+	/* Don't return; check the alternative paths
+	   so we can set can_be_null if appropriate.  */
+	if ((enum regexpcode)p[-1] == anychar_repeat) {
+	    continue;
+	}
+	break;
+
+      case wordchar:
+	for (j = 0; j < 0x80; j++) {
+	  if (SYNTAX(j) == Sword)
+	    fastmap[j] = 1;
+	}
+	switch (current_mbctype) {
+	case MBCTYPE_ASCII:
+	  for (j = 0x80; j < (1 << BYTEWIDTH); j++) {
+	    if (SYNTAX(j) == Sword2)
+	      fastmap[j] = 1;
+	  }
+	  break;
+	case MBCTYPE_EUC:
+	case MBCTYPE_SJIS:
+	case MBCTYPE_UTF8:
+	  for (j = 0x80; j < (1 << BYTEWIDTH); j++) {
+	    if (re_mbctab[j])
+	      fastmap[j] = 1;
+	  }
+	  break;
+	}
+	break;
+
+      case notwordchar:
+	for (j = 0; j < 0x80; j++)
+	  if (SYNTAX(j) != Sword)
+	    fastmap[j] = 1;
+	switch (current_mbctype) {
+	case MBCTYPE_ASCII:
+	  for (j = 0x80; j < (1 << BYTEWIDTH); j++) {
+	    if (SYNTAX(j) != Sword2)
+	      fastmap[j] = 1;
+	  }
+	  break;
+	case MBCTYPE_EUC:
+	case MBCTYPE_SJIS:
+	case MBCTYPE_UTF8:
+	  for (j = 0x80; j < (1 << BYTEWIDTH); j++) {
+	    if (!re_mbctab[j])
+	      fastmap[j] = 1;
+	  }
+	  break;
+	}
+	break;
+
+      case charset:
+	/* NOTE: Charset for single-byte chars never contain
+	   multi-byte char.  See set_list_bits().  */
+	for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--)
+	  if (p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))) {
+	    int tmp = TRANSLATE_P()?translate[j]:j;
+	    fastmap[tmp] = 1;
+	  }
+	{
+	  unsigned short size;
+	  unsigned long c, beg, end;
+
+	  p += p[-1] + 2;
+	  size = EXTRACT_UNSIGNED(&p[-2]);
+	  for (j = 0; j < (int)size; j++) {
+	    c = EXTRACT_MBC(&p[j*8]);
+	    beg = WC2MBC1ST(c);
+	    c = EXTRACT_MBC(&p[j*8+4]);
+	    end = WC2MBC1ST(c);
+	    /* set bits for 1st bytes of multi-byte chars.  */
+	    while (beg <= end) {
+	      /* NOTE: Charset for multi-byte chars might contain
+		 single-byte chars.  We must reject them. */
+	      if (c < 0x100) {
+		fastmap[beg] = 2;
+		bufp->options |= RE_OPTIMIZE_BMATCH;
+	      }
+	      else if (ismbchar(beg))
+		fastmap[beg] = 1;
+	      beg++;
+	    }
+	  }
+	}
+	break;
+
+      case charset_not:
+	/* S: set of all single-byte chars.
+	   M: set of all first bytes that can start multi-byte chars.
+	   s: any set of single-byte chars.
+	   m: any set of first bytes that can start multi-byte chars.
+
+	   We assume S+M = U.
+	   ___      _   _
+	   s+m = (S*s+M*m).  */
+	/* Chars beyond end of map must be allowed */
+	/* NOTE: Charset_not for single-byte chars might contain
+	   multi-byte chars.  See set_list_bits(). */
+	for (j = *p * BYTEWIDTH; j < (1 << BYTEWIDTH); j++)
+	  if (!ismbchar(j))
+	    fastmap[j] = 1;
+
+	for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--)
+	  if (!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH)))) {
+	    if (!ismbchar(j))
+	      fastmap[j] = 1;
+	  }
+	{
+	  unsigned short size;
+	  unsigned long c, beg;
+	  int num_literal = 0;
+
+	  p += p[-1] + 2;
+	  size = EXTRACT_UNSIGNED(&p[-2]);
+	  if (size == 0) {
+	    for (j = 0x80; j < (1 << BYTEWIDTH); j++)
+	      if (ismbchar(j))
+		fastmap[j] = 1;
+	    break;
+	  }
+	  for (j = 0,c = 0;j < (int)size; j++) {
+	    unsigned int cc = EXTRACT_MBC(&p[j*8]);
+	    beg = WC2MBC1ST(cc);
+	    while (c <= beg) {
+	      if (ismbchar(c))
+		fastmap[c] = 1;
+	      c++;
+	    }
+
+	    cc = EXTRACT_MBC(&p[j*8+4]);
+	    if (cc < 0xff) {
+	      num_literal = 1;
+	      while (c <= cc) {
+		if (ismbchar(c))
+		  fastmap[c] = 1;
+		c++;
+	      }
+	    }
+	    c = WC2MBC1ST(cc);
+	  }
+
+	  for (j = c; j < (1 << BYTEWIDTH); j++) {
+	    if (num_literal)
+	      fastmap[j] = 1;
+	    if (ismbchar(j))
+	      fastmap[j] = 1;
+	  }
+	}
+	break;
+
+      case unused:	/* pacify gcc -Wall */
+	break;
+      }
+
+    /* Get here means we have successfully found the possible starting
+       characters of one path of the pattern.  We need not follow this
+       path any farther.  Instead, look at the next alternative
+       remembered in the stack.  */
+    if (stackp != stackb)
+      p = *stackp--;		/* pop */
+    else
+      break;
+  }
+  FREE_AND_RETURN_VOID(stackb);
+}
+
+/* adjust startpos value to the position between characters. */
+int
+re_adjust_startpos(bufp, string, size, startpos, range)
+     struct re_pattern_buffer *bufp;
+     const char *string;
+     int size, startpos, range;
+{
+  /* Update the fastmap now if not correct already.  */
+  if (!bufp->fastmap_accurate) {
+    re_compile_fastmap(bufp);
+  }
+
+  /* Adjust startpos for mbc string */
+  if (current_mbctype && startpos>0 && !(bufp->options&RE_OPTIMIZE_BMATCH)) {
+    int i = mbc_startpos(string, startpos);
+
+    if (i < startpos) {
+      if (range > 0) {
+	startpos = i + mbclen(string[i]);
+      }
+      else {
+	int len = mbclen(string[i]);
+	if (i + len <= startpos)
+	  startpos = i + len;
+	else
+	  startpos = i;
+      }
+    }
+  }
+  return startpos;
+}
+
+
+static int re_match_exec _((struct re_pattern_buffer *, const char *, int, int, int,
+			    struct re_registers *));
+
+/* Using the compiled pattern in BUFP->buffer, first tries to match
+   STRING, starting first at index STARTPOS, then at STARTPOS + 1, and
+   so on.  RANGE is the number of places to try before giving up.  If
+   RANGE is negative, it searches backwards, i.e., the starting
+   positions tried are STARTPOS, STARTPOS - 1, etc.  STRING is of SIZE.
+   In REGS, return the indices of STRING that matched the entire
+   BUFP->buffer and its contained subexpressions.
+
+   The value returned is the position in the strings at which the match
+   was found, or -1 if no match was found, or -2 if error (such as
+   failure stack overflow).  */
+
+int
+re_search(bufp, string, size, startpos, range, regs)
+     struct re_pattern_buffer *bufp;
+     const char *string;
+     int size, startpos, range;
+     struct re_registers *regs;
+{
+  register char *fastmap = bufp->fastmap;
+  int val, anchor = 0, initpos = startpos;
+
+  /* Check for out-of-range starting position.  */
+  if (startpos < 0  ||  startpos > size)
+    return -1;
+
+  /* Update the fastmap now if not correct already.  */
+  if (fastmap && !bufp->fastmap_accurate) {
+    re_compile_fastmap(bufp);
+  }
+
+
+  /* If the search isn't to be a backwards one, don't waste time in a
+     search for a pattern that must be anchored.  */
+  if (bufp->used > 0) {
+    switch ((enum regexpcode)bufp->buffer[0]) {
+    case begbuf:
+    begbuf_match:
+      if (range > 0) {
+	if (startpos > 0) return -1;
+	else {
+	  val = re_match(bufp, string, size, 0, regs);
+	  if (val >= 0) return 0;
+	  return val;
+	}
+      }
+      break;
+
+    case begline:
+      anchor = 1;
+      break;
+
+    case begpos:
+      val = re_match(bufp, string, size, startpos, regs);
+      if (val >= 0) return startpos;
+      return val;
+
+    default:
+      break;
+    }
+  }
+  if (bufp->options & RE_OPTIMIZE_ANCHOR) {
+    if (bufp->options&RE_OPTION_MULTILINE && range > 0) {
+      goto begbuf_match;
+    }
+    anchor = 1;
+  }
+
+  if (bufp->must) {
+    int len = ((unsigned char*)bufp->must)[0];
+    int pos, pbeg, pend;
+
+    pbeg = startpos;
+    pend = startpos + range;
+    if (pbeg > pend) {		/* swap pbeg,pend */
+      pos = pend; pend = pbeg; pbeg = pos;
+    }
+    pend = size;
+    if (bufp->options & RE_OPTIMIZE_NO_BM) {
+      pos = slow_search((unsigned char *)(bufp->must+1), len,
+			(unsigned char*)(string+pbeg), pend-pbeg,
+			(char *)(MAY_TRANSLATE()?translate:0));
+    }
+    else {
+      pos = bm_search((unsigned char *)(bufp->must+1), len,
+		      (unsigned char *)(string+pbeg), pend-pbeg,
+		      bufp->must_skip,
+		      MAY_TRANSLATE()?translate:0);
+    }
+    if (pos == -1) return -1;
+    if (range > 0 && (bufp->options & RE_OPTIMIZE_EXACTN)) {
+      startpos += pos;
+      range -= pos;
+      if (range < 0) return -1;
+    }
+  }
+
+  for (;;) {
+    /* If a fastmap is supplied, skip quickly over characters that
+       cannot possibly be the start of a match.  Note, however, that
+       if the pattern can possibly match the null string, we must
+       test it at each starting point so that we take the first null
+       string we get.  */
+
+    if (fastmap && startpos < size
+	&& bufp->can_be_null != 1 && !(anchor && startpos == 0)) {
+      if (range > 0) {	/* Searching forwards.  */
+	register unsigned char *p, c;
+	int irange = range;
+
+	p = (unsigned char*)string+startpos;
+
+	while (range > 0) {
+	  c = *p++;
+	  if (ismbchar(c)) {
+	    int len;
+
+	    if (fastmap[c])
+	      break;
+	    len = mbclen(c) - 1;
+	    while (len--) {
+	      c = *p++;
+	      range--;
+	      if (fastmap[c] == 2)
+		goto startpos_adjust;
+	    }
+	  }
+	  else {
+	    if (fastmap[MAY_TRANSLATE() ? translate[c] : c])
+	      break;
+	  }
+	  range--;
+	}
+      startpos_adjust:
+	startpos += irange - range;
+      }
+      else {			/* Searching backwards.  */
+	register unsigned char c;
+
+	c = string[startpos];
+	c &= 0xff;
+	if (MAY_TRANSLATE() ? !fastmap[translate[c]] : !fastmap[c])
+	  goto advance;
+      }
+    }
+
+    if (startpos > size) return -1;
+    if ((anchor || !bufp->can_be_null) && range > 0 && size > 0 && startpos == size)
+      return -1;
+    val = re_match_exec(bufp, string, size, startpos, initpos, regs);
+    if (val >= 0) return startpos;
+    if (val == -2) return -2;
+
+#ifndef NO_ALLOCA
+#ifdef C_ALLOCA
+    alloca(0);
+#endif /* C_ALLOCA */
+#endif /* NO_ALLOCA */
+
+    if (range > 0) {
+      if (anchor && startpos < size &&
+	  (startpos < 1 || string[startpos-1] != '\n')) {
+	while (range > 0 && string[startpos] != '\n') {
+	  range--;
+	  startpos++;
+	}
+      }
+    }
+
+  advance:
+    if (!range) 
+      break;
+    else if (range > 0) {
+      const char *d = string + startpos;
+
+      if (ismbchar(*d)) {
+	int len = mbclen(*d) - 1;
+	range-=len, startpos+=len;
+	if (!range)
+	  break;
+      }
+      range--, startpos++;
+    }
+    else {
+      range++, startpos--;
+      {
+	const char *s, *d, *p;
+
+	s = string; d = string + startpos;
+	for (p = d; p-- > s && ismbchar(*p); )
+	  /* --p >= s would not work on 80[12]?86. 
+	     (when the offset of s equals 0 other than huge model.)  */
+	  ;
+	if (!((d - p) & 1)) {
+	  if (!range)
+	    break;
+	  range++, startpos--;
+	}
+      }
+    }
+  }
+  return -1;
+}
+
+
+
+
+/* The following are used for re_match, defined below:  */
+
+/* Accessing macros used in re_match: */
+
+#define IS_ACTIVE(R)  ((R).bits.is_active)
+#define MATCHED_SOMETHING(R)  ((R).bits.matched_something)
+
+
+/* Macros used by re_match:  */
+
+/* I.e., regstart, regend, and reg_info.  */
+#define NUM_REG_ITEMS  3
+
+/* I.e., ptr and count.  */
+#define NUM_COUNT_ITEMS 2
+
+/* Individual items aside from the registers.  */
+#define NUM_NONREG_ITEMS 4
+
+/* We push at most this many things on the stack whenever we
+   fail.  The `+ 2' refers to PATTERN_PLACE and STRING_PLACE, which are
+   arguments to the PUSH_FAILURE_POINT macro.  */
+#define MAX_NUM_FAILURE_ITEMS   (num_regs * NUM_REG_ITEMS + NUM_NONREG_ITEMS)
+
+/* We push this many things on the stack whenever we fail.  */
+#define NUM_FAILURE_ITEMS  (last_used_reg * NUM_REG_ITEMS + NUM_NONREG_ITEMS + 1)
+
+/* This pushes counter information for succeed_n and jump_n */
+#define PUSH_FAILURE_COUNT(ptr)						\
+  do {									\
+    int c;								\
+    EXTRACT_NUMBER(c, ptr);						\
+    ENSURE_FAIL_STACK(NUM_COUNT_ITEMS);					\
+    *stackp++ = (unsigned char*)(long)c;				\
+    *stackp++ = (ptr);							\
+    num_failure_counts++;						\
+  } while (0)
+
+/* This pushes most of the information about the current state we will want
+   if we ever fail back to it.  */
+
+#define PUSH_FAILURE_POINT(pattern_place, string_place)			\
+  do {									\
+    long last_used_reg, this_reg;					\
+									\
+    /* Find out how many registers are active or have been matched.	\
+       (Aside from register zero, which is only set at the end.) */	\
+    for (last_used_reg = num_regs-1; last_used_reg > 0; last_used_reg--)\
+      if (!REG_UNSET(regstart[last_used_reg]))				\
+        break;								\
+									\
+    ENSURE_FAIL_STACK(NUM_FAILURE_ITEMS);				\
+    *stackp++ = (unsigned char*)(long)num_failure_counts;		\
+    num_failure_counts = 0;						\
+									\
+    /* Now push the info for each of those registers.  */		\
+    for (this_reg = 1; this_reg <= last_used_reg; this_reg++) {		\
+      *stackp++ = regstart[this_reg];					\
+      *stackp++ = regend[this_reg];					\
+      *stackp++ = reg_info[this_reg].word;				\
+    }									\
+									\
+    /* Push how many registers we saved.  */				\
+    *stackp++ = (unsigned char*)last_used_reg;				\
+									\
+    *stackp++ = pattern_place;                                          \
+    *stackp++ = string_place;                                           \
+    *stackp++ = (unsigned char*)(long)options; /* current option status */	\
+    *stackp++ = (unsigned char*)0; /* non-greedy flag */		\
+  } while(0)
+
+#define NON_GREEDY ((unsigned char*)1)
+
+#define POP_FAILURE_COUNT()						\
+  do {									\
+    unsigned char *ptr = *--stackp;					\
+    int count = (long)*--stackp;					\
+    STORE_NUMBER(ptr, count);						\
+  } while (0)
+
+/* This pops what PUSH_FAILURE_POINT pushes.  */
+
+#define POP_FAILURE_POINT()						\
+  do {									\
+    long temp;								\
+    stackp -= NUM_NONREG_ITEMS;	/* Remove failure points (and flag). */	\
+    temp = (long)*--stackp;	/* How many regs pushed.  */	        \
+    temp *= NUM_REG_ITEMS;	/* How much to take off the stack.  */	\
+    stackp -= temp; 		/* Remove the register info.  */	\
+    temp = (long)*--stackp;	/* How many counters pushed.  */	\
+    while (temp--) {							\
+      POP_FAILURE_COUNT();      /* Remove the counter info.  */		\
+    }									\
+    num_failure_counts = 0;	/* Reset num_failure_counts.  */	\
+  } while(0)
+
+     /* Registers are set to a sentinel when they haven't yet matched.  */
+#define REG_UNSET_VALUE ((unsigned char*)-1)
+#define REG_UNSET(e) ((e) == REG_UNSET_VALUE)
+
+#define PREFETCH if (d == dend) goto fail
+
+     /* Call this when have matched something; it sets `matched' flags for the
+   registers corresponding to the subexpressions of which we currently
+   are inside.  */
+#define SET_REGS_MATCHED 						\
+  do { unsigned this_reg;						\
+    for (this_reg = 0; this_reg < num_regs; this_reg++) { 		\
+        if (IS_ACTIVE(reg_info[this_reg]))				\
+          MATCHED_SOMETHING(reg_info[this_reg]) = 1;			\
+        else								\
+          MATCHED_SOMETHING(reg_info[this_reg]) = 0;			\
+      } 								\
+  } while(0)
+
+#define AT_STRINGS_BEG(d)  ((d) == string)
+#define AT_STRINGS_END(d)  ((d) == dend)
+
+#define IS_A_LETTER(d) (SYNTAX(*(d)) == Sword ||			\
+			(current_mbctype ?				\
+			 (re_mbctab[*(d)] && ((d)+mbclen(*(d)))<=dend):	\
+			 SYNTAX(*(d)) == Sword2))
+
+#define PREV_IS_A_LETTER(d) ((current_mbctype == MBCTYPE_SJIS)?		\
+			     IS_A_LETTER((d)-(!AT_STRINGS_BEG((d)-1)&&	\
+					      ismbchar((d)[-2])?2:1)):	\
+                             ((current_mbctype && ((d)[-1] >= 0x80)) ||	\
+			      IS_A_LETTER((d)-1)))
+
+static void
+init_regs(regs, num_regs)
+     struct re_registers *regs;
+     unsigned int num_regs;
+{
+  int i;
+
+  regs->num_regs = num_regs;
+  if (num_regs < RE_NREGS)
+    num_regs = RE_NREGS;
+
+  if (regs->allocated == 0) {
+    regs->beg = TMALLOC(num_regs, int);
+    regs->end = TMALLOC(num_regs, int);
+    regs->allocated = num_regs;
+  }
+  else if (regs->allocated < num_regs) {
+    TREALLOC(regs->beg, num_regs, int);
+    TREALLOC(regs->end, num_regs, int);
+    regs->allocated = num_regs;
+  }
+  for (i=0; i<num_regs; i++) {
+    regs->beg[i] = regs->end[i] = -1;
+  }
+}
+
+/* Match the pattern described by BUFP against STRING, which is of
+   SIZE.  Start the match at index POS in STRING.  In REGS, return the
+   indices of STRING that matched the entire BUFP->buffer and its
+   contained subexpressions.
+
+   If bufp->fastmap is nonzero, then it had better be up to date.
+
+   The reason that the data to match are specified as two components
+   which are to be regarded as concatenated is so this function can be
+   used directly on the contents of an Emacs buffer.
+
+   -1 is returned if there is no match.  -2 is returned if there is an
+   error (such as match stack overflow).  Otherwise the value is the
+   length of the substring which was matched.  */
+
+int
+re_match(bufp, string_arg, size, pos, regs)
+     struct re_pattern_buffer *bufp;
+     const char *string_arg;
+     int size, pos;
+     struct re_registers *regs;
+{
+  return re_match_exec(bufp, string_arg, size, pos, pos, regs);
+}
+
+static int
+re_match_exec(bufp, string_arg, size, pos, beg, regs)
+     struct re_pattern_buffer *bufp;
+     const char *string_arg;
+     int size, pos, beg;
+     struct re_registers *regs;
+{
+  register unsigned char *p = (unsigned char*)bufp->buffer;
+  unsigned char *p1;
+
+  /* Pointer to beyond end of buffer.  */
+  register unsigned char *pend = p + bufp->used;
+
+  unsigned num_regs = bufp->re_nsub;
+
+  unsigned char *string = (unsigned char*)string_arg;
+
+  register unsigned char *d, *dend;
+  register int mcnt;			/* Multipurpose.  */
+  int options = bufp->options;
+
+  /* Failure point stack.  Each place that can handle a failure further
+     down the line pushes a failure point on this stack.  It consists of
+     restart, regend, and reg_info for all registers corresponding to the
+     subexpressions we're currently inside, plus the number of such
+     registers, and, finally, two char *'s.  The first char * is where to
+     resume scanning the pattern; the second one is where to resume
+     scanning the strings.  If the latter is zero, the failure point is a
+     ``dummy''; if a failure happens and the failure point is a dummy, it
+     gets discarded and the next next one is tried.  */
+
+  unsigned char **stacka;
+  unsigned char **stackb;
+  unsigned char **stackp;
+  unsigned char **stacke;
+
+  /* Information on the contents of registers. These are pointers into
+     the input strings; they record just what was matched (on this
+     attempt) by a subexpression part of the pattern, that is, the
+     regnum-th regstart pointer points to where in the pattern we began
+     matching and the regnum-th regend points to right after where we
+     stopped matching the regnum-th subexpression.  (The zeroth register
+     keeps track of what the whole pattern matches.)  */
+
+  unsigned char **regstart = bufp->regstart;
+  unsigned char **regend = bufp->regend;
+
+  /* If a group that's operated upon by a repetition operator fails to
+     match anything, then the register for its start will need to be
+     restored because it will have been set to wherever in the string we
+     are when we last see its open-group operator.  Similarly for a
+     register's end.  */
+  unsigned char **old_regstart = bufp->old_regstart;
+  unsigned char **old_regend = bufp->old_regend;
+
+  /* The is_active field of reg_info helps us keep track of which (possibly
+     nested) subexpressions we are currently in. The matched_something
+     field of reg_info[reg_num] helps us tell whether or not we have
+     matched any of the pattern so far this time through the reg_num-th
+     subexpression.  These two fields get reset each time through any
+     loop their register is in.  */
+
+  register_info_type *reg_info = bufp->reg_info;
+
+  /* The following record the register info as found in the above
+     variables when we find a match better than any we've seen before. 
+     This happens as we backtrack through the failure points, which in
+     turn happens only if we have not yet matched the entire string.  */
+
+  unsigned best_regs_set = 0;
+  unsigned char **best_regstart = bufp->best_regstart;
+  unsigned char **best_regend = bufp->best_regend;
+
+  int num_failure_counts = 0;
+
+  if (regs) {
+    init_regs(regs, num_regs);
+  }
+
+  /* Initialize the stack. */
+  stacka = RE_TALLOC(MAX_NUM_FAILURE_ITEMS * NFAILURES, unsigned char*);
+  stackb = stacka;
+  stackp = stackb;
+  stacke = &stackb[MAX_NUM_FAILURE_ITEMS * NFAILURES];
+
+#ifdef DEBUG_REGEX
+  fprintf(stderr, "Entering re_match(%s)\n", string_arg);
+#endif
+
+  /* Initialize subexpression text positions to -1 to mark ones that no
+     ( or ( and ) or ) has been seen for. Also set all registers to
+     inactive and mark them as not having matched anything or ever
+     failed. */
+  for (mcnt = 0; mcnt < num_regs; mcnt++) {
+    regstart[mcnt] = regend[mcnt]
+      = old_regstart[mcnt] = old_regend[mcnt]
+      = best_regstart[mcnt] = best_regend[mcnt] = REG_UNSET_VALUE;
+#ifdef __CHECKER__
+    reg_info[mcnt].word = 0;
+#endif
+    IS_ACTIVE (reg_info[mcnt]) = 0;
+    MATCHED_SOMETHING (reg_info[mcnt]) = 0;
+  }
+
+  /* Set up pointers to ends of strings.
+     Don't allow the second string to be empty unless both are empty.  */
+
+
+  /* `p' scans through the pattern as `d' scans through the data. `dend'
+     is the end of the input string that `d' points within. `d' is
+     advanced into the following input string whenever necessary, but
+     this happens before fetching; therefore, at the beginning of the
+     loop, `d' can be pointing at the end of a string, but it cannot
+     equal string2.  */
+
+  d = string + pos, dend = string + size;
+
+  /* This loops over pattern commands.  It exits by returning from the
+     function if match is complete, or it drops through if match fails
+     at this starting point in the input data.  */
+
+  for (;;) {
+#ifdef DEBUG_REGEX
+    fprintf(stderr,
+	    "regex loop(%d):  matching 0x%02d\n",
+	    p - (unsigned char*)bufp->buffer,
+	    *p);
+#endif
+    /* End of pattern means we might have succeeded.  */
+    if (p == pend) {
+      /* If not end of string, try backtracking.  Otherwise done.  */
+      if ((bufp->options & RE_OPTION_LONGEST) && d != dend) {
+	if (best_regs_set) /* non-greedy, no need to backtrack */
+	  goto restore_best_regs;
+	while (stackp != stackb && stackp[-1] == NON_GREEDY) {
+	  if (best_regs_set) /* non-greedy, no need to backtrack */
+	    goto restore_best_regs;
+	  POP_FAILURE_POINT();
+	}
+	if (stackp != stackb) {
+	  /* More failure points to try.  */
+
+	  /* If exceeds best match so far, save it.  */
+	  if (! best_regs_set || (d > best_regend[0])) {
+	    best_regs_set = 1;
+	    best_regend[0] = d;	/* Never use regstart[0].  */
+
+	    for (mcnt = 1; mcnt < num_regs; mcnt++) {
+	      best_regstart[mcnt] = regstart[mcnt];
+	      best_regend[mcnt] = regend[mcnt];
+	    }
+	  }
+	  goto fail;	       
+	}
+	/* If no failure points, don't restore garbage.  */
+	else if (best_regs_set) {
+	restore_best_regs:
+	  /* Restore best match.  */
+	  d = best_regend[0];
+
+	  for (mcnt = 0; mcnt < num_regs; mcnt++) {
+	    regstart[mcnt] = best_regstart[mcnt];
+	    regend[mcnt] = best_regend[mcnt];
+	  }
+	}
+      }
+
+      /* If caller wants register contents data back, convert it 
+	 to indices.  */
+      if (regs) {
+	regs->beg[0] = pos;
+	regs->end[0] = d - string;
+	for (mcnt = 1; mcnt < num_regs; mcnt++) {
+	  if (REG_UNSET(regend[mcnt])) {
+	    regs->beg[mcnt] = -1;
+	    regs->end[mcnt] = -1;
+	    continue;
+	  }
+	  regs->beg[mcnt] = regstart[mcnt] - string;
+	  regs->end[mcnt] = regend[mcnt] - string;
+	}
+      }
+      FREE_AND_RETURN(stackb, (d - pos - string));
+    }
+
+    /* Otherwise match next pattern command.  */
+#ifdef SWITCH_ENUM_BUG
+    switch ((int)((enum regexpcode)*p++))
+#else
+    switch ((enum regexpcode)*p++)
+#endif
+      {
+	/* ( [or `(', as appropriate] is represented by start_memory,
+	   ) by stop_memory.  Both of those commands are followed by
+	   a register number in the next byte.  The text matched
+	   within the ( and ) is recorded under that number.  */
+      case start_memory:
+	old_regstart[*p] = regstart[*p];
+	regstart[*p] = d;
+	IS_ACTIVE(reg_info[*p]) = 1;
+	MATCHED_SOMETHING(reg_info[*p]) = 0;
+	p += 2;
+	continue;
+
+      case stop_memory:
+	old_regend[*p] = regend[*p];
+	regend[*p] = d;
+	IS_ACTIVE(reg_info[*p]) = 0;
+	p += 2;
+	continue;
+
+      case start_paren:
+      case stop_paren:
+	break;
+
+	/* \<digit> has been turned into a `duplicate' command which is
+	   followed by the numeric value of <digit> as the register number.  */
+      case duplicate:
+	{
+	  int regno = *p++;   /* Get which register to match against */
+	  register unsigned char *d2, *dend2;
+
+	  /* Check if there's corresponding group */
+	  if (regno >= num_regs) goto fail;
+	  /* Check if corresponding group is still open */
+	  if (IS_ACTIVE(reg_info[regno])) goto fail;
+
+	  /* Where in input to try to start matching.  */
+	  d2 = regstart[regno];
+	  if (REG_UNSET(d2)) goto fail;
+
+	  /* Where to stop matching; if both the place to start and
+	     the place to stop matching are in the same string, then
+	     set to the place to stop, otherwise, for now have to use
+	     the end of the first string.  */
+
+	  dend2 = regend[regno];
+	  if (REG_UNSET(dend2)) goto fail;
+	  for (;;) {
+	    /* At end of register contents => success */
+	    if (d2 == dend2) break;
+
+	    /* If necessary, advance to next segment in data.  */
+	    PREFETCH;
+
+	    /* How many characters left in this segment to match.  */
+	    mcnt = dend - d;
+
+	    /* Want how many consecutive characters we can match in
+	       one shot, so, if necessary, adjust the count.  */
+	    if (mcnt > dend2 - d2)
+	      mcnt = dend2 - d2;
+
+	    /* Compare that many; failure if mismatch, else move
+	       past them.  */
+	    if ((options & RE_OPTION_IGNORECASE) 
+		? memcmp_translate(d, d2, mcnt) 
+		: memcmp((char*)d, (char*)d2, mcnt))
+	      goto fail;
+	    d += mcnt, d2 += mcnt;
+	  }
+	}
+	break;
+
+      case start_nowidth:
+	PUSH_FAILURE_POINT(0, d);
+	if (stackp - stackb > RE_DUP_MAX) {
+	   FREE_AND_RETURN(stackb,(-2));
+	}
+	EXTRACT_NUMBER_AND_INCR(mcnt, p);
+	STORE_NUMBER(p+mcnt, stackp - stackb);
+	continue;
+
+      case stop_nowidth:
+	EXTRACT_NUMBER_AND_INCR(mcnt, p);
+	stackp = stackb + mcnt;
+	d = stackp[-3];
+	POP_FAILURE_POINT();
+	continue;
+
+      case stop_backtrack:
+	EXTRACT_NUMBER_AND_INCR(mcnt, p);
+	stackp = stackb + mcnt;
+	POP_FAILURE_POINT();
+	continue;
+
+      case pop_and_fail:
+	EXTRACT_NUMBER(mcnt, p+1);
+	stackp = stackb + mcnt;
+	POP_FAILURE_POINT();
+	goto fail;
+
+      case anychar:
+	PREFETCH;
+	if (ismbchar(*d)) {
+	  if (d + mbclen(*d) > dend)
+	    goto fail;
+	  SET_REGS_MATCHED;
+	  d += mbclen(*d);
+	  break;
+	}
+	if (!(options&RE_OPTION_MULTILINE)
+	    && (TRANSLATE_P() ? translate[*d] : *d) == '\n')
+	  goto fail;
+	SET_REGS_MATCHED;
+	d++;
+	break;
+
+      case anychar_repeat:
+	for (;;) {
+	  PUSH_FAILURE_POINT(p, d);
+	  PREFETCH;
+	  if (ismbchar(*d)) {
+	    if (d + mbclen(*d) > dend)
+	      goto fail;
+	    SET_REGS_MATCHED;
+	    d += mbclen(*d);
+	    continue;
+	  }
+	  if (!(options&RE_OPTION_MULTILINE) &&
+	      (TRANSLATE_P() ? translate[*d] : *d) == '\n')
+	    goto fail;
+	  SET_REGS_MATCHED;
+	  d++;
+	}
+	break;
+
+      case charset:
+      case charset_not:
+	{
+	  int not;	    /* Nonzero for charset_not.  */
+	  int part = 0;	    /* true if matched part of mbc */
+	  unsigned char *dsave = d + 1;
+	  int cc, c;
+
+	  PREFETCH;
+	  c = (unsigned char)*d++;
+	  if (ismbchar(c)) {
+	    if (d + mbclen(c) - 1 <= dend) {
+	      cc = c;
+	      MBC2WC(c, d);
+	      not = is_in_list_mbc(c, p);
+	      if (!not) {
+		part = not = is_in_list_sbc(cc, p);
+	      }
+	    } else {
+	      not = is_in_list(c, p);
+	    }
+	  }
+	  else {
+	    if (TRANSLATE_P())
+	      c = (unsigned char)translate[c];
+	    not = is_in_list(c, p);
+	  }
+
+	  if (*(p - 1) == (unsigned char)charset_not) {
+	    not = !not;
+	  }
+	  if (!not) goto fail;
+
+	  p += 1 + *p + 2 + EXTRACT_UNSIGNED(&p[1 + *p])*8;
+	  SET_REGS_MATCHED;
+
+	  if (part) d = dsave;
+	  break;
+	}
+
+      case begline:
+	if (size == 0 || AT_STRINGS_BEG(d))
+	  break;
+	if (d[-1] == '\n' && !AT_STRINGS_END(d))
+	  break;
+	goto fail;
+
+      case endline:
+	if (AT_STRINGS_END(d)) {
+	  break;
+	}
+	else if (*d == '\n')
+	  break;
+	goto fail;
+
+	/* Match at the very beginning of the string. */
+      case begbuf:
+	if (AT_STRINGS_BEG(d))
+	  break;
+	goto fail;
+
+	/* Match at the very end of the data. */
+      case endbuf:
+	if (AT_STRINGS_END(d))
+	  break;
+	goto fail;
+
+	/* Match at the very end of the data. */
+      case endbuf2:
+	if (AT_STRINGS_END(d)) {
+	  break;
+	}
+	/* .. or newline just before the end of the data. */
+	if (*d == '\n' && AT_STRINGS_END(d+1))
+	  break;
+	goto fail;
+
+	/* `or' constructs are handled by starting each alternative with
+	   an on_failure_jump that points to the start of the next
+	   alternative.  Each alternative except the last ends with a
+	   jump to the joining point.  (Actually, each jump except for
+	   the last one really jumps to the following jump, because
+	   tensioning the jumps is a hassle.)  */
+
+	/* The start of a stupid repeat has an on_failure_jump that points
+	   past the end of the repeat text. This makes a failure point so 
+	   that on failure to match a repetition, matching restarts past
+	   as many repetitions have been found with no way to fail and
+	   look for another one.  */
+
+	/* A smart repeat is similar but loops back to the on_failure_jump
+	   so that each repetition makes another failure point.  */
+
+	/* Match at the starting position. */
+      case begpos:
+	if (d - string == beg)
+	  break;
+	goto fail;
+
+      case on_failure_jump:
+      on_failure:
+      EXTRACT_NUMBER_AND_INCR(mcnt, p);
+      PUSH_FAILURE_POINT(p + mcnt, d);
+      continue;
+
+      /* The end of a smart repeat has a maybe_finalize_jump back.
+	 Change it either to a finalize_jump or an ordinary jump.  */
+      case maybe_finalize_jump:
+	EXTRACT_NUMBER_AND_INCR(mcnt, p);
+	p1 = p;
+
+	/* Compare the beginning of the repeat with what in the
+	   pattern follows its end. If we can establish that there
+	   is nothing that they would both match, i.e., that we
+	   would have to backtrack because of (as in, e.g., `a*a')
+	   then we can change to finalize_jump, because we'll
+	   never have to backtrack.
+
+	   This is not true in the case of alternatives: in
+	   `(a|ab)*' we do need to backtrack to the `ab' alternative
+	   (e.g., if the string was `ab').  But instead of trying to
+	   detect that here, the alternative has put on a dummy
+	   failure point which is what we will end up popping.  */
+
+	/* Skip over open/close-group commands.  */
+	while (p1 + 2 < pend) {
+	  if ((enum regexpcode)*p1 == stop_memory ||
+	      (enum regexpcode)*p1 == start_memory)
+	    p1 += 3;	/* Skip over args, too.  */
+	  else if (/*(enum regexpcode)*p1 == start_paren ||*/
+		   (enum regexpcode)*p1 == stop_paren)
+	      p1 += 1;
+	  else
+	    break;
+	}
+
+	if (p1 == pend)
+	  p[-3] = (unsigned char)finalize_jump;
+	else if (*p1 == (unsigned char)exactn ||
+		 *p1 == (unsigned char)endline) {
+	  register int c = *p1 == (unsigned char)endline ? '\n' : p1[2];
+	  register unsigned char *p2 = p + mcnt;
+	    /* p2[0] ... p2[2] are an on_failure_jump.
+	       Examine what follows that.  */
+	  if (p2[3] == (unsigned char)exactn && p2[5] != c)
+	    p[-3] = (unsigned char)finalize_jump;
+	  else if (p2[3] == (unsigned char)charset ||
+		   p2[3] == (unsigned char)charset_not) {
+	    int not;
+	    if (ismbchar(c)) {
+	      unsigned char *pp = p1+3;
+	      MBC2WC(c, pp);
+	    }
+	    /* `is_in_list()' is TRUE if c would match */
+	    /* That means it is not safe to finalize.  */
+	    not = is_in_list(c, p2 + 4);
+	    if (p2[3] == (unsigned char)charset_not)
+	      not = !not;
+	    if (!not)
+	      p[-3] = (unsigned char)finalize_jump;
+	  }
+	}
+	p -= 2;		/* Point at relative address again.  */
+	if (p[-1] != (unsigned char)finalize_jump) {
+	  p[-1] = (unsigned char)jump;	
+	  goto nofinalize;
+	}
+	/* Note fall through.  */
+
+	/* The end of a stupid repeat has a finalize_jump back to the
+	   start, where another failure point will be made which will
+	   point to after all the repetitions found so far.  */
+
+	/* Take off failure points put on by matching on_failure_jump 
+	   because didn't fail.  Also remove the register information
+	   put on by the on_failure_jump.  */
+      case finalize_jump:
+	if (stackp > stackb && stackp[-3] == d) {
+	  p = stackp[-4];
+	  POP_FAILURE_POINT();
+	  continue;
+	}
+	POP_FAILURE_POINT(); 
+	/* Note fall through.  */
+
+      /* We need this opcode so we can detect where alternatives end
+	 in `group_match_null_string_p' et al.  */
+      case jump_past_alt:
+	/* fall through */
+
+	/* Jump without taking off any failure points.  */
+      case jump:
+      nofinalize:
+        EXTRACT_NUMBER_AND_INCR(mcnt, p);
+        if (mcnt < 0 && stackp > stackb && stackp[-3] == d) /* avoid infinite loop */
+	   goto fail;
+        p += mcnt;
+        continue;
+
+      case dummy_failure_jump:
+	/* Normally, the on_failure_jump pushes a failure point, which
+	   then gets popped at finalize_jump.  We will end up at
+	   finalize_jump, also, and with a pattern of, say, `a+', we
+	   are skipping over the on_failure_jump, so we have to push
+	   something meaningless for finalize_jump to pop.  */
+	PUSH_FAILURE_POINT(0, 0);
+	goto nofinalize;
+
+	/* At the end of an alternative, we need to push a dummy failure
+	   point in case we are followed by a `finalize_jump', because
+	   we don't want the failure point for the alternative to be
+	   popped.  For example, matching `(a|ab)*' against `aab'
+	   requires that we match the `ab' alternative.  */
+      case push_dummy_failure:
+	/* See comments just above at `dummy_failure_jump' about the
+	   two zeroes.  */
+	p1 = p;
+	/* Skip over open/close-group commands.  */
+	while (p1 + 2 < pend) {
+	  if ((enum regexpcode)*p1 == stop_memory ||
+	      (enum regexpcode)*p1 == start_memory)
+	    p1 += 3;	/* Skip over args, too.  */
+	  else if (/*(enum regexpcode)*p1 == start_paren ||*/
+		   (enum regexpcode)*p1 == stop_paren)
+	      p1 += 1;
+	  else
+	    break;
+	}
+	if (p1 < pend && (enum regexpcode)*p1 == jump)
+	  p[-1] = unused;
+	else
+	  PUSH_FAILURE_POINT(0, 0);
+	break;
+
+	/* Have to succeed matching what follows at least n times.  Then
+	   just handle like an on_failure_jump.  */
+      case succeed_n: 
+	EXTRACT_NUMBER(mcnt, p + 2);
+	/* Originally, this is how many times we HAVE to succeed.  */
+	if (mcnt != 0) {
+	  mcnt--;
+	  p += 2;
+	  PUSH_FAILURE_COUNT(p);
+	  STORE_NUMBER_AND_INCR(p, mcnt);
+	  PUSH_FAILURE_POINT(0, 0);
+	}
+	else  {
+	  goto on_failure;
+	}
+	continue;
+
+      case jump_n:
+	EXTRACT_NUMBER(mcnt, p + 2);
+	/* Originally, this is how many times we CAN jump.  */
+	if (mcnt) {
+	  mcnt--;
+	  PUSH_FAILURE_COUNT(p + 2);
+	  STORE_NUMBER(p + 2, mcnt);
+	  goto nofinalize;	     /* Do the jump without taking off
+					any failure points.  */
+	}
+	/* If don't have to jump any more, skip over the rest of command.  */
+	else      
+	  p += 4;		     
+	continue;
+
+      case set_number_at:
+	EXTRACT_NUMBER_AND_INCR(mcnt, p);
+	p1 = p + mcnt;
+	EXTRACT_NUMBER_AND_INCR(mcnt, p);
+	STORE_NUMBER(p1, mcnt);
+	continue;
+
+      case try_next:
+	EXTRACT_NUMBER_AND_INCR(mcnt, p);
+	if (p + mcnt < pend) {
+	  PUSH_FAILURE_POINT(p, d);
+	  stackp[-1] = NON_GREEDY;
+	}
+	p += mcnt;
+	continue;
+
+      case finalize_push:
+	POP_FAILURE_POINT();
+	EXTRACT_NUMBER_AND_INCR(mcnt, p);
+        if (mcnt < 0 && stackp > stackb  && stackp[-3] == d) /* avoid infinite loop */
+	   goto fail;
+	PUSH_FAILURE_POINT(p + mcnt, d);
+	stackp[-1] = NON_GREEDY;
+	continue;
+
+      case finalize_push_n:
+	EXTRACT_NUMBER(mcnt, p + 2); 
+	/* Originally, this is how many times we CAN jump.  */
+	if (mcnt) {
+	  int pos, i;
+
+	  mcnt--;
+	  STORE_NUMBER(p + 2, mcnt);
+	  EXTRACT_NUMBER(pos, p);
+	  EXTRACT_NUMBER(i, p+pos+5);
+	  if (i > 0) goto nofinalize;
+	  POP_FAILURE_POINT();
+	  EXTRACT_NUMBER_AND_INCR(mcnt, p);
+	  PUSH_FAILURE_POINT(p + mcnt, d);
+	  stackp[-1] = NON_GREEDY;
+	  p += 2;		/* skip n */
+	}
+	/* If don't have to push any more, skip over the rest of command.  */
+	else 
+	  p += 4;   
+	continue;
+
+	/* Ignore these.  Used to ignore the n of succeed_n's which
+	   currently have n == 0.  */
+      case unused:
+	continue;
+
+      case casefold_on:
+	options |= RE_OPTION_IGNORECASE;
+	continue;
+
+      case casefold_off:
+	options &= ~RE_OPTION_IGNORECASE;
+	continue;
+
+      case option_set:
+	options = *p++;
+	continue;
+
+      case wordbound:
+	if (AT_STRINGS_BEG(d)) {
+	  if (AT_STRINGS_END(d)) goto fail;
+	  if (IS_A_LETTER(d)) break;
+	  else goto fail;
+	}
+	if (AT_STRINGS_END(d)) {
+	  if (PREV_IS_A_LETTER(d)) break;
+	  else goto fail;
+	}
+	if (PREV_IS_A_LETTER(d) != IS_A_LETTER(d))
+	  break;
+	goto fail;
+
+      case notwordbound:
+	if (AT_STRINGS_BEG(d)) {
+	  if (IS_A_LETTER(d)) goto fail;
+	  else break;
+	}
+	if (AT_STRINGS_END(d)) {
+	  if (PREV_IS_A_LETTER(d)) goto fail;
+	  else break;
+	}
+	if (PREV_IS_A_LETTER(d) != IS_A_LETTER(d))
+	  goto fail;
+	break;
+
+      case wordbeg:
+	if (IS_A_LETTER(d) && (AT_STRINGS_BEG(d) || !PREV_IS_A_LETTER(d)))
+	  break;
+	goto fail;
+
+      case wordend:
+	if (!AT_STRINGS_BEG(d) && PREV_IS_A_LETTER(d)
+	    && (!IS_A_LETTER(d) || AT_STRINGS_END(d)))
+	  break;
+	goto fail;
+
+      case wordchar:
+	PREFETCH;
+	if (!IS_A_LETTER(d))
+	  goto fail;
+	if (ismbchar(*d) && d + mbclen(*d) - 1 < dend)
+	  d += mbclen(*d) - 1;
+	d++;
+	SET_REGS_MATCHED;
+	break;
+
+      case notwordchar:
+	PREFETCH;
+	if (IS_A_LETTER(d))
+	  goto fail;
+	if (ismbchar(*d) && d + mbclen(*d) - 1 < dend)
+	  d += mbclen(*d) - 1;
+	d++;
+	SET_REGS_MATCHED;
+	break;
+
+      case exactn:
+	/* Match the next few pattern characters exactly.
+	   mcnt is how many characters to match.  */
+	mcnt = *p++;
+	/* This is written out as an if-else so we don't waste time
+	   testing `translate' inside the loop.  */
+	if (TRANSLATE_P()) {
+	  do {
+	    unsigned char c;
+
+	    PREFETCH;
+	    if (*p == 0xff) {
+	      p++;  
+	      if (!--mcnt
+		  || AT_STRINGS_END(d)
+		  || (unsigned char)*d++ != (unsigned char)*p++)
+		goto fail;
+	      continue;
+	    }
+	    c = *d++;
+	    if (ismbchar(c)) {
+	      int n;
+
+	      if (c != (unsigned char)*p++)
+		goto fail;
+	      for (n = mbclen(c) - 1; n > 0; n--)
+		if (!--mcnt	/* redundant check if pattern was
+				   compiled properly. */
+		    || AT_STRINGS_END(d)
+		    || (unsigned char)*d++ != (unsigned char)*p++)
+		  goto fail;
+	      continue;
+	    }
+	    /* compiled code translation needed for ruby */
+	    if ((unsigned char)translate[c] != (unsigned char)translate[*p++])
+	      goto fail;
+	  }
+	  while (--mcnt);
+	}
+	else {
+	  do {
+	    PREFETCH;
+	    if (*p == 0xff) {p++; mcnt--;}
+	    if (*d++ != *p++) goto fail;
+	  }
+	  while (--mcnt);
+	}
+	SET_REGS_MATCHED;
+	break;
+      }
+#ifdef RUBY
+    CHECK_INTS;
+#endif
+    continue;  /* Successfully executed one pattern command; keep going.  */
+
+    /* Jump here if any matching operation fails. */
+  fail:
+    if (stackp != stackb) {
+      /* A restart point is known.  Restart there and pop it. */
+      short last_used_reg, this_reg;
+
+      /* If this failure point is from a dummy_failure_point, just
+	 skip it.  */
+      if (stackp[-4] == 0 || (best_regs_set && stackp[-1] == NON_GREEDY)) {
+	POP_FAILURE_POINT();
+	goto fail;
+      }
+      stackp--;		/* discard greedy flag */
+      options = (long)*--stackp;
+      d = *--stackp;
+      p = *--stackp;
+      /* Restore register info.  */
+      last_used_reg = (long)*--stackp;
+
+      /* Make the ones that weren't saved -1 or 0 again. */
+      for (this_reg = num_regs - 1; this_reg > last_used_reg; this_reg--) {
+	regend[this_reg] = REG_UNSET_VALUE;
+	regstart[this_reg] = REG_UNSET_VALUE;
+	IS_ACTIVE(reg_info[this_reg]) = 0;
+	MATCHED_SOMETHING(reg_info[this_reg]) = 0;
+      }
+
+      /* And restore the rest from the stack.  */
+      for ( ; this_reg > 0; this_reg--) {
+	reg_info[this_reg].word = *--stackp;
+	regend[this_reg] = *--stackp;
+	regstart[this_reg] = *--stackp;
+      }
+      mcnt = (long)*--stackp;
+      while (mcnt--) {
+	POP_FAILURE_COUNT();
+      }
+      if (p < pend) {
+	int is_a_jump_n = 0;
+	int failed_paren = 0;
+
+	p1 = p;
+	/* If failed to a backwards jump that's part of a repetition
+	   loop, need to pop this failure point and use the next one.  */
+	switch ((enum regexpcode)*p1) {
+	case jump_n:
+	case finalize_push_n:
+	  is_a_jump_n = 1;
+	case maybe_finalize_jump:
+	case finalize_jump:
+	case finalize_push:
+	case jump:
+	  p1++;
+	  EXTRACT_NUMBER_AND_INCR(mcnt, p1);
+
+	  if (mcnt >= 0) break;	/* should be backward jump */
+	  p1 += mcnt;
+
+	  if (( is_a_jump_n && (enum regexpcode)*p1 == succeed_n) ||
+	      (!is_a_jump_n && (enum regexpcode)*p1 == on_failure_jump)) {
+	    if (failed_paren) {
+	      p1++;
+	      EXTRACT_NUMBER_AND_INCR(mcnt, p1);
+	      PUSH_FAILURE_POINT(p1 + mcnt, d);
+	    }
+	    goto fail;
+	  }
+	  break;
+	default:
+	  /* do nothing */;
+	}
+      }
+    }
+    else
+      break;   /* Matching at this starting point really fails.  */
+  }
+
+  if (best_regs_set)
+    goto restore_best_regs;
+
+  FREE_AND_RETURN(stackb,(-1)); 	/* Failure to match.  */
+}
+
+
+static int
+memcmp_translate(s1, s2, len)
+     unsigned char *s1, *s2;
+     register int len;
+{
+  register unsigned char *p1 = s1, *p2 = s2, c;
+  while (len) {
+    c = *p1++;
+    if (ismbchar(c)) {
+      int n;
+
+      if (c != *p2++) return 1;
+      for (n = mbclen(c) - 1; n > 0; n--)
+	if (!--len || *p1++ != *p2++)
+	  return 1;
+    }
+    else
+      if (translate[c] != translate[*p2++])
+	return 1;
+    len--;
+  }
+  return 0;
+}
+
+void
+re_copy_registers(regs1, regs2)
+     struct re_registers *regs1, *regs2;
+{
+  int i;
+
+  if (regs1 == regs2) return;
+  if (regs1->allocated == 0) {
+    regs1->beg = TMALLOC(regs2->num_regs, int);
+    regs1->end = TMALLOC(regs2->num_regs, int);
+    regs1->allocated = regs2->num_regs;
+  }
+  else if (regs1->allocated < regs2->num_regs) {
+    TREALLOC(regs1->beg, regs2->num_regs, int);
+    TREALLOC(regs1->end, regs2->num_regs, int);
+    regs1->allocated = regs2->num_regs;
+  }
+  for (i=0; i<regs2->num_regs; i++) {
+    regs1->beg[i] = regs2->beg[i];
+    regs1->end[i] = regs2->end[i];
+  }
+  regs1->num_regs = regs2->num_regs;
+}
+
+void
+re_free_registers(regs)
+     struct re_registers *regs;
+{
+  if (regs->allocated == 0) return;
+  if (regs->beg) xfree(regs->beg);
+  if (regs->end) xfree(regs->end);
+}
+
+/* Functions for multi-byte support.
+   Created for grep multi-byte extension Jul., 1993 by t^2 (Takahiro Tanimoto)
+   Last change: Jul. 9, 1993 by t^2  */
+static const unsigned char mbctab_ascii[] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static const unsigned char mbctab_euc[] = { /* 0xA1-0xFE */
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+};
+
+static const unsigned char mbctab_sjis[] = { /* 0x81-0x9F,0xE0-0xFC */
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0
+};
+
+static const unsigned char mbctab_sjis_trail[] = { /* 0x40-0x7E,0x80-0xFC */
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0
+};
+
+static const unsigned char mbctab_utf8[] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 0, 0,
+};
+
+const unsigned char *re_mbctab = mbctab_ascii;
+
+void
+re_mbcinit(mbctype)
+     int mbctype;
+{
+  switch (mbctype) {
+  case MBCTYPE_ASCII:
+    re_mbctab = mbctab_ascii;
+    current_mbctype = MBCTYPE_ASCII;
+    break;
+  case MBCTYPE_EUC:
+    re_mbctab = mbctab_euc;
+    current_mbctype = MBCTYPE_EUC;
+    break;
+  case MBCTYPE_SJIS:
+    re_mbctab = mbctab_sjis;
+    current_mbctype = MBCTYPE_SJIS;
+    break;
+  case MBCTYPE_UTF8:
+    re_mbctab = mbctab_utf8;
+    current_mbctype = MBCTYPE_UTF8;
+    break;
+  }
+}
+
+#define mbc_isfirst(t, c) (t)[(unsigned char)(c)]
+#define mbc_len(t, c)     ((t)[(unsigned char)(c)]+1)
+
+static unsigned int
+asc_startpos(string, pos)
+     const char *string;
+     unsigned int pos;
+{
+  return pos;
+}
+
+#define euc_islead(c)  ((unsigned char)((c) - 0xa1) > 0xfe - 0xa1)
+#define euc_mbclen(c)  mbc_len(mbctab_euc, (c))
+static unsigned int
+euc_startpos(string, pos)
+     const char *string;
+     unsigned int pos;
+{
+  unsigned int i = pos, w;
+
+  while (i > 0 && !euc_islead(string[i])) {
+    --i;
+  }
+  if (i == pos || i + (w = euc_mbclen(string[i])) > pos) {
+    return i;
+  }
+  i += w;
+  return i + ((pos - i) & ~1);
+}
+
+#define sjis_isfirst(c) mbc_isfirst(mbctab_sjis, (c))
+#define sjis_istrail(c) mbctab_sjis_trail[(unsigned char)(c)]
+#define sjis_mbclen(c)  mbc_len(mbctab_sjis, (c))
+static unsigned int
+sjis_startpos(string, pos)
+     const char *string;
+     unsigned int pos;
+{
+  unsigned int i = pos, w;
+
+  if (i > 0 && sjis_istrail(string[i])) {
+    do {
+      if (!sjis_isfirst(string[--i])) {
+	++i;
+	break;
+      }
+    } while (i > 0);
+  }
+  if (i == pos || i + (w = sjis_mbclen(string[i])) > pos) {
+    return i;
+  }
+  i += w;
+  return i + ((pos - i) & ~1);
+}
+
+#define utf8_islead(c)  ((unsigned char)((c) & 0xc0) != 0x80)
+#define utf8_mbclen(c)  mbc_len(mbctab_utf8, (c))
+static unsigned int
+utf8_startpos(string, pos)
+     const char *string;
+     unsigned int pos;
+{
+  unsigned int i = pos, w;
+
+  while (i > 0 && !utf8_islead(string[i])) {
+    --i;
+  }
+  if (i == pos || i + (w = utf8_mbclen(string[i])) > pos) {
+    return i;
+  }
+  return i + w;
+}
+
+/*
+  vi: sw=2 ts=8
+  Local variables:
+  mode		 : C
+  c-file-style	 : "gnu"
+  tab-width	 : 8
+  End		 :
+*/
diff --git a/ruby_1_8_6/regex.h b/ruby_1_8_6/regex.h
new file mode 100644
index 0000000000..88868e2b4c
--- /dev/null
+++ b/ruby_1_8_6/regex.h
@@ -0,0 +1,221 @@
+/* Definitions for data structures and routines for the regular
+   expression library, version 0.12.
+   Copyright (C) 1985,89,90,91,92,93,95,96,97,98 Free Software Foundation, Inc.
+
+   This file is part of the GNU C Library.  Its master source is NOT part of
+   the C library, however.  The master source lives in /gd/gnu/lib.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file LGPL.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+/* Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
+   Last change: May 21, 1993 by t^2  */
+/* modified for Ruby by matz@netlab.co.jp */
+
+#ifndef REGEX_H
+#define REGEX_H
+
+/* symbol mangling for ruby */
+#ifdef RUBY
+# define re_adjust_startpos ruby_re_adjust_startpos
+# define re_compile_fastmap ruby_re_compile_fastmap
+# define re_compile_pattern ruby_re_compile_pattern
+# define re_copy_registers ruby_re_copy_registers
+# define re_free_pattern ruby_re_free_pattern
+# define re_free_registers ruby_re_free_registers
+# define re_match ruby_re_match
+# define re_mbcinit ruby_re_mbcinit
+# define re_search ruby_re_search
+# define re_set_casetable ruby_re_set_casetable
+# define register_info_type ruby_register_info_type
+#endif
+
+#include <stddef.h>
+
+/* Define number of parens for which we record the beginnings and ends.
+   This affects how much space the `struct re_registers' type takes up.  */
+#ifndef RE_NREGS
+#define RE_NREGS 10
+#endif
+
+#define BYTEWIDTH 8
+
+#define RE_REG_MAX ((1<<BYTEWIDTH)-1)
+
+/* Maximum number of duplicates an interval can allow.  */
+#ifndef RE_DUP_MAX
+#define RE_DUP_MAX  ((1 << 15) - 1) 
+#endif
+
+
+/* If this bit is set, then character classes are supported; they are:
+     [:alpha:],	[:upper:], [:lower:],  [:digit:], [:alnum:], [:xdigit:],
+     [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:].
+   If not set, then character classes are not supported.  */
+#define RE_CHAR_CLASSES (1L << 9)
+
+/* match will be done case insensetively */
+#define RE_OPTION_IGNORECASE (1L)
+/* perl-style extended pattern available */
+#define RE_OPTION_EXTENDED   (RE_OPTION_IGNORECASE<<1)
+/* newline will be included for . */
+#define RE_OPTION_MULTILINE  (RE_OPTION_EXTENDED<<1)
+/* ^ and $ ignore newline */
+#define RE_OPTION_SINGLELINE (RE_OPTION_MULTILINE<<1)
+/* search for longest match, in accord with POSIX regexp */
+#define RE_OPTION_LONGEST    (RE_OPTION_SINGLELINE<<1)
+
+#define RE_MAY_IGNORECASE    (RE_OPTION_LONGEST<<1)
+#define RE_OPTIMIZE_ANCHOR   (RE_MAY_IGNORECASE<<1)
+#define RE_OPTIMIZE_EXACTN   (RE_OPTIMIZE_ANCHOR<<1)
+#define RE_OPTIMIZE_NO_BM    (RE_OPTIMIZE_EXACTN<<1)
+#define RE_OPTIMIZE_BMATCH   (RE_OPTIMIZE_NO_BM<<1)
+
+/* For multi-byte char support */
+#define MBCTYPE_ASCII 0
+#define MBCTYPE_EUC 1
+#define MBCTYPE_SJIS 2
+#define MBCTYPE_UTF8 3
+
+extern
+#if defined _WIN32 && !defined __GNUC__ && !defined RUBY_EXPORT
+__declspec(dllimport)
+# endif
+const unsigned char *re_mbctab;
+#if defined(__STDC__)
+void re_mbcinit (int);
+#else
+void re_mbcinit ();
+#endif
+
+#undef ismbchar
+#define ismbchar(c) re_mbctab[(unsigned char)(c)]
+#define mbclen(c)   (re_mbctab[(unsigned char)(c)]+1)
+
+/* Structure used in re_match() */
+
+typedef union
+{
+  unsigned char *word;
+  struct {
+    unsigned is_active : 1;
+    unsigned matched_something : 1;
+  } bits;
+} register_info_type;
+
+/* This data structure is used to represent a compiled pattern.  */
+
+struct re_pattern_buffer
+  {
+    char *buffer;	/* Space holding the compiled pattern commands.  */
+    int allocated;	/* Size of space that `buffer' points to. */
+    int used;		/* Length of portion of buffer actually occupied  */
+    char *fastmap;	/* Pointer to fastmap, if any, or zero if none.  */
+			/* re_search uses the fastmap, if there is one,
+			   to skip over totally implausible characters.  */
+    char *must;	        /* Pointer to exact pattern which strings should have
+			   to be matched.  */
+    int *must_skip;     /* Pointer to exact pattern skip table for bm_search */
+    long options;	/* Flags for options such as extended_pattern. */
+    long re_nsub;	/* Number of subexpressions found by the compiler. */
+    char fastmap_accurate;
+			/* Set to zero when a new pattern is stored,
+			   set to one when the fastmap is updated from it.  */
+    char can_be_null;   /* Set to one by compiling fastmap
+			   if this pattern might match the null string.
+			   It does not necessarily match the null string
+			   in that case, but if this is zero, it cannot.
+			   2 as value means can match null string
+			   but at end of range or before a character
+			   listed in the fastmap.  */
+
+    /* stack & working area for re_match() */
+    unsigned char **regstart;
+    unsigned char **regend;
+    unsigned char **old_regstart;
+    unsigned char **old_regend;
+    register_info_type *reg_info;
+    unsigned char **best_regstart;
+    unsigned char **best_regend;
+  };
+
+typedef struct re_pattern_buffer regex_t;
+
+/* Structure to store register contents data in.
+
+   Pass the address of such a structure as an argument to re_match, etc.,
+   if you want this information back.
+
+   For i from 1 to RE_NREGS - 1, start[i] records the starting index in
+   the string of where the ith subexpression matched, and end[i] records
+   one after the ending index.  start[0] and end[0] are analogous, for
+   the entire pattern.  */
+
+struct re_registers
+  {
+    int allocated;
+    int num_regs;
+    int *beg;
+    int *end;
+  };
+
+/* Type for byte offsets within the string.  POSIX mandates this.  */
+typedef size_t regoff_t;
+
+/* POSIX specification for registers.  Aside from the different names than
+   `re_registers', POSIX uses an array of structures, instead of a
+   structure of arrays.  */
+typedef struct
+{
+  regoff_t rm_so;  /* Byte offset from string's start to substring's start.  */
+  regoff_t rm_eo;  /* Byte offset from string's start to substring's end.  */
+} regmatch_t;
+
+#ifdef __STDC__
+
+extern char *re_compile_pattern (const char *, int, struct re_pattern_buffer *);
+void re_free_pattern (struct re_pattern_buffer *);
+/* Is this really advertised?  */
+extern int re_adjust_startpos (struct re_pattern_buffer *, const char*, int, int, int);
+extern void re_compile_fastmap (struct re_pattern_buffer *);
+extern int re_search (struct re_pattern_buffer *, const char*, int, int, int,
+		      struct re_registers *);
+extern int re_match (struct re_pattern_buffer *, const char *, int, int,
+		     struct re_registers *);
+extern void re_set_casetable (const char *table);
+extern void re_copy_registers (struct re_registers*, struct re_registers*);
+extern void re_free_registers (struct re_registers*);
+
+#ifndef RUBY
+/* 4.2 bsd compatibility.  */
+extern char *re_comp (const char *);
+extern int re_exec (const char *);
+#endif
+
+#else /* !__STDC__ */
+
+extern char *re_compile_pattern ();
+void re_free_regexp ();
+/* Is this really advertised? */
+extern int re_adjust_startpos ();
+extern void re_compile_fastmap ();
+extern int re_search ();
+extern int re_match ();
+extern void re_set_casetable ();
+extern void re_copy_registers ();
+extern void re_free_registers ();
+
+#endif /* __STDC__ */
+
+#endif /* !REGEX_H */
diff --git a/ruby_1_8_6/ruby.1 b/ruby_1_8_6/ruby.1
new file mode 100644
index 0000000000..f240f2f22b
--- /dev/null
+++ b/ruby_1_8_6/ruby.1
@@ -0,0 +1,351 @@
+.\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
+.Dd December 31, 2002
+.Dt RUBY(1) "" "Ruby Programmers Reference Guide"
+.\".Dt RUBY 1
+.Os UNIX
+.Sh NAME
+.Nm ruby
+.Nd Interpreted object-oriented scripting language
+.Sh SYNOPSIS
+.Nm
+.Op Fl -copyright
+.Op Fl -version
+.Op Fl Sacdlnpswvy
+.Op Fl 0 Ns Op Ar octal
+.Op Fl C Ar directory
+.Op Fl F Ar pattern
+.Op Fl I Ar directory
+.Op Fl K Ar c
+.Op Fl T Ns Op Ar level
+.Op Fl e Ar command
+.Op Fl i Ns Op Ar extension
+.Op Fl r Ar library
+.Op Fl x Ns Op Ar directory
+.Op Fl -
+.Op Ar program_file
+.Op Ar argument ...
+.Sh DESCRIPTION
+Ruby is an interpreted scripting language for quick and easy
+object-oriented programming.  It has many features to process text
+files and to do system management tasks (as in Perl).  It is simple,
+straight-forward, and extensible.
+.Pp
+If you want a language for easy object-oriented programming, or you
+don't like the Perl ugliness, or you do like the concept of LISP, but
+don't like too much parentheses, Ruby may be the language of your
+choice.
+.Sh FEATURES
+Ruby's features are as follows:
+.Bl -tag -width 6n
+.It Sy "Interpretive"
+Ruby is an interpreted language, so you don't have to recompile
+programs written in Ruby to execute them.
+.Pp
+.It Sy "Variables have no type (dynamic typing)"
+Variables in Ruby can contain data of any type.  You don't have to
+worry about variable typing.  Consequently, it has a weaker compile
+time check.
+.Pp
+.It Sy "No declaration needed"
+You can use variables in your Ruby programs without any declarations.
+Variable names denote their scope, local, global, instance, etc.
+.Pp
+.It Sy "Simple syntax"
+Ruby has a simple syntax influenced slightly from Eiffel.
+.Pp
+.It Sy "No user-level memory management"
+Ruby has automatic memory management.  Objects no longer referenced
+from anywhere are automatically collected by the garbage collector
+built into the interpreter.
+.Pp
+.It Sy "Everything is an object"
+Ruby is the purely object-oriented language, and was so since its
+creation.  Even such basic data as integers are seen as objects.
+.Pp
+.It Sy "Class, inheritance, and methods"
+Of course, as an object-oriented language, Ruby has such basic
+features like classes, inheritance, and methods.
+.Pp
+.It Sy "Singleton methods"
+Ruby has the ability to define methods for certain objects.  For
+example, you can define a press-button action for certain widget by
+defining a singleton method for the button.  Or, you can make up your
+own prototype based object system using singleton methods, if you want
+to.
+.Pp
+.It Sy "Mix-in by modules"
+Ruby intentionally does not have the multiple inheritance as it is a
+source of confusion.  Instead, Ruby has the ability to share
+implementations across the inheritance tree.  This is often called
+.Sq Mix-in .
+.Pp
+.It Sy "Iterators"
+Ruby has iterators for loop abstraction.
+.Pp
+.It Sy "Closures"
+In Ruby, you can objectify the procedure.
+.Pp
+.It Sy "Text processing and regular expression"
+Ruby has a bunch of text processing features like in Perl.
+.Pp
+.It Sy "Bignums"
+With built-in bignums, you can for example calculate factorial(400).
+.Pp
+.It Sy "Exception handling"
+As in Java(tm).
+.Pp
+.It Sy "Direct access to the OS"
+Ruby can use most
+.Ux
+system calls, often used in system programming.
+.Pp
+.It Sy "Dynamic loading"
+On most
+.Ux
+systems, you can load object files into the Ruby interpreter
+on-the-fly.
+.El
+.Pp
+.Sh OPTIONS
+Ruby interpreter accepts following command-line options (switches).
+They are quite similar to those of
+.Xr perl 1 .
+.Bl -tag -width "1234567890123" -compact
+.Pp
+.It Fl -copyright
+Prints the copyright notice.
+.Pp
+.It Fl -version
+Prints the version of Ruby interpreter.
+.Pp
+.It Fl 0 Ns Op Ar octal
+(The digit
+.Dq zero . )
+Specifies the input record separator
+.Pf ( Li "$/" )
+as an octal number. If no digit is given, the null character is taken
+as the separator.  Other switches may follow the digits.
+.Fl 00
+turns Ruby into paragraph mode.
+.Fl 0777
+makes Ruby read whole file at once as a single string since there is
+no legal character with that value.
+.Pp
+.It Fl C Ar directory
+Causes Ruby to switch to the directory.
+.Pp
+.It Fl F Ar pattern
+Specifies input field separator
+.Pf ( Li "$;" ) .
+.Pp
+.It Fl I Ar directory
+Used to tell Ruby where to load the library scripts.  Directory path
+will be added to the load-path variable
+.Pf ( Li "$:" ) .
+.Pp
+.It Fl K Ar kcode
+Specifies KANJI (Japanese) encoding.
+.Pp
+.It Fl S
+Makes Ruby use the
+.Ev PATH
+environment variable to search for script, unless if its name begins
+with a slash.  This is used to emulate
+.Li #!
+on machines that don't support it, in the following manner:
+.Bd -literal -offset indent
+#! /usr/local/bin/ruby
+# This line makes the next one a comment in Ruby \e
+  exec /usr/local/bin/ruby -S $0 $*
+.Ed
+.Pp
+.It Fl T Ns Op Ar level
+Turns on taint checks at the specified level (default 1).
+.Pp
+.It Fl a
+Turns on auto-split mode when used with
+.Fl n
+or
+.Fl p .
+In auto-split mode, Ruby executes
+.Dl $F = $_.split
+at beginning of each loop.
+.Pp
+.It Fl c
+Causes Ruby to check the syntax of the script and exit without
+executing. If there are no syntax errors, Ruby will print
+.Dq Syntax OK
+to the standard output.
+.Pp
+.It Fl d
+.It Fl -debug
+Turns on debug mode.
+.Li "$DEBUG"
+will be set to true.
+.Pp
+.It Fl e Ar command
+Specifies script from command-line while telling Ruby not to search
+the rest of arguments for a script file name.
+.Pp
+.It Fl h
+.It Fl -help
+Prints a summary of the options.
+.Pp
+.It Fl i Ar extension
+Specifies in-place-edit mode.  The extension, if specified, is added
+to old file name to make a backup copy.  For example:
+.Bd -literal -offset indent
+% echo matz > /tmp/junk
+% cat /tmp/junk
+matz
+% ruby -p -i.bak -e '$_.upcase!' /tmp/junk
+% cat /tmp/junk
+MATZ
+% cat /tmp/junk.bak
+matz
+.Ed
+.Pp
+.It Fl l
+(The lowercase letter
+.Dq ell . )
+Enables automatic line-ending processing, which means to firstly set
+.Li "$\e"
+to the value of
+.Li "$/" ,
+and secondly chops every line read using
+.Li chop! .
+.Pp
+.It Fl n
+Causes Ruby to assume the following loop around your script, which
+makes it iterate over file name arguments somewhat like
+.Nm sed
+.Fl n
+or
+.Nm awk .
+.Bd -literal -offset indent
+while gets
+  ...
+end
+.Ed
+.Pp
+.It Fl p
+Acts mostly same as -n switch, but print the value of variable
+.Li "$_"
+at the each end of the loop.  For example:
+.Bd -literal -offset indent
+% echo matz | ruby -p -e '$_.tr! "a-z", "A-Z"'
+MATZ
+.Ed
+.Pp
+.It Fl r Ar library
+Causes Ruby to load the library using require.  It is useful when using
+.Fl n
+or
+.Fl p .
+.Pp
+.It Fl s
+Enables some switch parsing for switches after script name but before
+any file name arguments (or before a
+.Fl - ) .
+Any switches found there are removed from
+.Li ARGV
+and set the corresponding variable in the script.  For example:
+.Bd -literal -offset indent
+#! /usr/local/bin/ruby -s
+# prints "true" if invoked with `-xyz' switch.
+print "true\en" if $xyz
+.Ed
+.Pp
+On some systems
+.Li "$0"
+does not always contain the full pathname, so you need the
+.Fl S
+switch to tell Ruby to search for the script if necessary.  To handle
+embedded spaces or such.  A better construct than
+.Li "$*"
+would be
+.Li ${1+"$@"} ,
+but it does not work if the script is being interpreted by
+.Xr csh 1 .
+.Pp
+.It Fl v
+.It Fl -verbose
+Enables verbose mode.  Ruby will print its version at the beginning,
+and set the variable
+.Li "$VERBOSE"
+to true.  Some methods print extra messages if this variable is true.
+If this switch is given, and no other switches are present, Ruby quits
+after printing its version.
+.Pp
+.It Fl w
+Enables verbose mode without printing version message at the
+beginning.  It sets the
+.Li "$VERBOSE"
+variable to true.
+.Pp
+.It Fl x Ns Op Ar directory
+Tells Ruby that the script is embedded in a message.  Leading garbage
+will be discarded until the first that starts with
+.Dq #!
+and contains the string,
+.Dq ruby .
+Any meaningful switches on that line will applied.  The end of script
+must be specified with either
+.Li EOF ,
+.Li "^D" ( Li "control-D" ) ,
+.Li "^Z" ( Li "control-Z" ) ,
+or reserved word
+.Li __END__ .
+If the directory name is specified, Ruby will switch to that directory
+before executing script.
+.Pp
+.It Fl y
+.It Fl -yydebug
+Turns on compiler debug mode.  Ruby will print a bunch of internal
+state messages during compiling scripts.  You don't have to specify
+this switch, unless you are going to debug the Ruby interpreter.
+.El
+.Pp
+.Sh ENVIRONMENT
+.Bl -tag -width "RUBYLIB_PREFIX" -compact
+.It Ev RUBYLIB
+A colon-separated list of directories that are added to Ruby's
+library load path
+.Pf ( Li "$:" ) . Directories from this environment variable are searched
+before the standard load path is searched.
+.Pp
+e.g.:
+.Dl RUBYLIB="$HOME/lib/ruby:$HOME/lib/rubyext"
+.Pp
+.It Ev RUBYOPT
+Additional Ruby options.
+.Pp
+e.g.
+.Dl RUBYOPT="-w -Ke"
+.Pp
+.It Ev RUBYPATH
+A colon-separated list of directories that Ruby searches for
+Ruby programs when the
+.Fl S
+flag is specified.  This variable precedes the
+.Ev PATH
+environment variable.
+.Pp
+.It Ev RUBYSHELL
+The path to the system shell command.  This environment variable is
+enabled for only mswin32, mingw32, and OS/2 platforms.  If this
+variable is not defined, Ruby refers to
+.Ev COMSPEC .
+.Pp
+.It Ev PATH
+Ruby refers to the
+.Ev PATH
+environment variable on calling Kernel#system.
+.Pp
+.It Ev RUBYLIB_PREFIX
+This variable is obsolete.
+.El
+.Pp
+.Sh AUTHORS
+Ruby is designed and implemented by
+.An Yukihiro Matsumoto Aq matz@netlab.jp .
diff --git a/ruby_1_8_6/ruby.c b/ruby_1_8_6/ruby.c
new file mode 100644
index 0000000000..5d544e7cad
--- /dev/null
+++ b/ruby_1_8_6/ruby.c
@@ -0,0 +1,1230 @@
+/**********************************************************************
+
+  ruby.c -
+
+  $Author$
+  $Date$
+  created at: Tue Aug 10 12:47:31 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#if defined _WIN32 || defined __CYGWIN__
+#include <windows.h>
+#endif
+#if defined __CYGWIN__
+#include <sys/cygwin.h>
+#endif
+#ifdef _WIN32_WCE
+#include <winsock.h>
+#include "wince.h"
+#endif
+#include "ruby.h"
+#include "dln.h"
+#include "node.h"
+#include <stdio.h>
+#include <sys/types.h>
+#include <ctype.h>
+
+#ifdef __hpux
+#include <sys/pstat.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifndef HAVE_STRING_H
+char *strchr _((const char*,const char));
+char *strrchr _((const char*,const char));
+char *strstr _((const char*,const char*));
+#endif
+
+#include "util.h"
+
+#ifndef HAVE_STDLIB_H
+char *getenv();
+#endif
+
+VALUE ruby_debug = Qfalse;
+VALUE ruby_verbose = Qfalse;
+static int sflag = 0;
+static int xflag = 0;
+extern int ruby_yydebug;
+
+char *ruby_inplace_mode = Qfalse;
+
+static void load_stdin _((void));
+static void load_file _((const char *, int));
+static void forbid_setid _((const char *));
+
+static VALUE do_loop = Qfalse, do_print = Qfalse;
+static VALUE do_check = Qfalse, do_line = Qfalse;
+static VALUE do_split = Qfalse;
+
+static char *script;
+
+static int origargc;
+static char **origargv;
+
+static void
+usage(name)
+    const char *name;
+{
+    /* This message really ought to be max 23 lines.
+     * Removed -h because the user already knows that option. Others? */
+
+    static char *usage_msg[] = {
+"-0[octal]       specify record separator (\\0, if no argument)",
+"-a              autosplit mode with -n or -p (splits $_ into $F)",
+"-c              check syntax only",
+"-Cdirectory     cd to directory, before executing your script",
+"-d              set debugging flags (set $DEBUG to true)",
+"-e 'command'    one line of script. Several -e's allowed. Omit [programfile]",
+"-Fpattern       split() pattern for autosplit (-a)",
+"-i[extension]   edit ARGV files in place (make backup if extension supplied)",
+"-Idirectory     specify $LOAD_PATH directory (may be used more than once)",
+"-Kkcode         specifies KANJI (Japanese) code-set",
+"-l              enable line ending processing",
+"-n              assume 'while gets(); ... end' loop around your script",
+"-p              assume loop like -n but print line also like sed",
+"-rlibrary       require the library, before executing your script",
+"-s              enable some switch parsing for switches after script name",
+"-S              look for the script using PATH environment variable",
+"-T[level]       turn on tainting checks",
+"-v              print version number, then turn on verbose mode",
+"-w              turn warnings on for your script",
+"-W[level]       set warning level; 0=silence, 1=medium, 2=verbose (default)",
+"-x[directory]   strip off text before #!ruby line and perhaps cd to directory",
+"--copyright     print the copyright",
+"--version       print the version",
+NULL
+};
+    char **p = usage_msg;
+
+    printf("Usage: %s [switches] [--] [programfile] [arguments]\n", name);
+    while (*p)
+	printf("  %s\n", *p++);
+}
+
+extern VALUE rb_load_path;
+
+#ifndef CharNext		/* defined as CharNext[AW] on Windows. */
+#define CharNext(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
+#endif
+
+#if defined DOSISH || defined __CYGWIN__
+static inline void
+translate_char(char *p, int from, int to)
+{
+    while (*p) {
+	if ((unsigned char)*p == from)
+	    *p = to;
+	p = CharNext(p);
+    }
+}
+#endif
+
+#if defined _WIN32 || defined __CYGWIN__ || defined __DJGPP__
+static VALUE
+rubylib_mangled_path(const char *s, unsigned int l)
+{
+    static char *newp, *oldp;
+    static int newl, oldl, notfound;
+    char *ptr;
+    VALUE ret;
+
+    if (!newp && !notfound) {
+	newp = getenv("RUBYLIB_PREFIX");
+	if (newp) {
+	    oldp = newp = strdup(newp);
+	    while (*newp && !ISSPACE(*newp) && *newp != ';') {
+		newp = CharNext(newp);	/* Skip digits. */
+	    }
+	    oldl = newp - oldp;
+	    while (*newp && (ISSPACE(*newp) || *newp == ';')) {
+		newp = CharNext(newp);	/* Skip whitespace. */
+	    }
+	    newl = strlen(newp);
+	    if (newl == 0 || oldl == 0) {
+		rb_fatal("malformed RUBYLIB_PREFIX");
+	    }
+	    translate_char(newp, '\\', '/');
+	}
+	else {
+	    notfound = 1;
+	}
+    }
+    if (!newp || l < oldl || strncasecmp(oldp, s, oldl) != 0) {
+	return rb_str_new(s, l);
+    }
+    ret = rb_str_new(0, l + newl - oldl);
+    ptr = RSTRING_PTR(ret);
+    memcpy(ptr, newp, newl);
+    memcpy(ptr + newl, s + oldl, l - oldl);
+    ptr[l + newl - oldl] = 0;
+    return ret;
+}
+
+static VALUE
+rubylib_mangled_path2(const char *s)
+{
+    return rubylib_mangled_path(s, strlen(s));
+}
+#else
+#define rubylib_mangled_path rb_str_new
+#define rubylib_mangled_path2 rb_str_new2
+#endif
+
+static void push_include _((const char *path));
+
+static void
+push_include(path)
+    const char *path;
+{
+    const char sep = PATH_SEP_CHAR;
+    const char *p, *s;
+
+    p = path;
+    while (*p) {
+	while (*p == sep)
+	    p++;
+	if (!*p) break;
+	for (s = p; *s && *s != sep; s = CharNext(s));
+	rb_ary_push(rb_load_path, rubylib_mangled_path(p, s - p));
+	p = s;
+    }
+}
+
+#ifdef __CYGWIN__
+static void
+push_include_cygwin(const char *path)
+{
+    const char *p, *s;
+    char rubylib[FILENAME_MAX];
+    VALUE buf = 0;
+
+    p = path;
+    while (*p) {
+	unsigned int len;
+	while (*p == ';')
+	    p++;
+	if (!*p) break;
+	for (s = p; *s && *s != ';'; s = CharNext(s));
+	len = s - p;
+	if (*s) {
+	    if (!buf) {
+		buf = rb_str_new(p, len);
+		p = RSTRING_PTR(buf);
+	    }
+	    else {
+		rb_str_resize(buf, len);
+		p = strncpy(RSTRING_PTR(buf), p, len);
+	    }
+	}
+	if (cygwin_conv_to_posix_path(p, rubylib) == 0)
+	    p = rubylib;
+	push_include(p);
+	if (!*s) break;
+	p = s + 1;
+    }
+}
+
+#define push_include push_include_cygwin
+#endif
+
+void
+ruby_incpush(path)
+    const char *path;
+{
+    if (path == 0)
+	return;
+    push_include(path);
+}
+
+#if defined DOSISH || defined __CYGWIN__
+#define LOAD_RELATIVE 1
+#endif
+
+void
+ruby_init_loadpath()
+{
+#if defined LOAD_RELATIVE
+    char libpath[FILENAME_MAX+1];
+    char *p;
+    int rest;
+#if defined _WIN32 || defined __CYGWIN__
+    HMODULE libruby = NULL;
+    MEMORY_BASIC_INFORMATION m;
+
+#ifndef _WIN32_WCE
+    memset(&m, 0, sizeof(m));
+    if (VirtualQuery(ruby_init_loadpath, &m, sizeof(m)) && m.State == MEM_COMMIT)
+	libruby = (HMODULE)m.AllocationBase;
+#endif
+    GetModuleFileName(libruby, libpath, sizeof libpath);
+#elif defined(DJGPP)
+    extern char *__dos_argv0;
+    strncpy(libpath, __dos_argv0, FILENAME_MAX);
+#elif defined(__human68k__)
+    extern char **_argv;
+    strncpy(libpath, _argv[0], FILENAME_MAX);
+#elif defined(__EMX__)
+    _execname(libpath, FILENAME_MAX);
+#endif
+
+    libpath[FILENAME_MAX] = '\0';
+#if defined DOSISH
+    translate_char(libpath, '\\', '/');
+#elif defined __CYGWIN__
+    {
+	char rubylib[FILENAME_MAX];
+	cygwin_conv_to_posix_path(libpath, rubylib);
+	strncpy(libpath, rubylib, sizeof(libpath));
+    }
+#endif
+    p = strrchr(libpath, '/');
+    if (p) {
+	*p = 0;
+	if (p - libpath > 3 && !strcasecmp(p - 4, "/bin")) {
+	    p -= 4;
+	    *p = 0;
+	}
+    }
+    else {
+	strcpy(libpath, ".");
+	p = libpath + 1;
+    }
+
+    rest = FILENAME_MAX - (p - libpath);
+
+#define RUBY_RELATIVE(path) (strncpy(p, (path), rest), libpath)
+#else
+#define RUBY_RELATIVE(path) (path)
+#endif
+#define incpush(path) rb_ary_push(rb_load_path, rubylib_mangled_path2(path))
+
+    if (rb_safe_level() == 0) {
+	ruby_incpush(getenv("RUBYLIB"));
+    }
+
+#ifdef RUBY_SEARCH_PATH
+    incpush(RUBY_RELATIVE(RUBY_SEARCH_PATH));
+#endif
+
+    incpush(RUBY_RELATIVE(RUBY_SITE_LIB2));
+#ifdef RUBY_SITE_THIN_ARCHLIB
+    incpush(RUBY_RELATIVE(RUBY_SITE_THIN_ARCHLIB));
+#endif
+    incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
+    incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
+
+    incpush(RUBY_RELATIVE(RUBY_LIB));
+#ifdef RUBY_THIN_ARCHLIB
+    incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB));
+#endif
+    incpush(RUBY_RELATIVE(RUBY_ARCHLIB));
+
+    if (rb_safe_level() == 0) {
+	incpush(".");
+    }
+}
+
+struct req_list {
+    char *name;
+    struct req_list *next;
+};
+static struct req_list req_list_head, *req_list_last = &req_list_head;
+
+static void
+add_modules(mod)
+    const char *mod;
+{
+    struct req_list *list;
+
+    list = ALLOC(struct req_list);
+    list->name = ALLOC_N(char, strlen(mod)+1);
+    strcpy(list->name, mod);
+    list->next = 0;
+    req_list_last->next = list;
+    req_list_last = list;
+}
+
+extern void Init_ext _((void));
+
+static void
+require_libraries()
+{
+    extern NODE *ruby_eval_tree;
+    extern NODE *ruby_eval_tree_begin;
+    NODE *save[3];
+    struct req_list *list = req_list_head.next;
+    struct req_list *tmp;
+
+    save[0] = ruby_eval_tree;
+    save[1] = ruby_eval_tree_begin;
+    save[2] = NEW_NEWLINE(0);
+    ruby_eval_tree = ruby_eval_tree_begin = 0;
+    ruby_current_node = 0;
+    Init_ext();		/* should be called here for some reason :-( */
+    ruby_current_node = save[2];
+    ruby_set_current_source();
+    req_list_last = 0;
+    while (list) {
+	int state;
+
+	ruby_current_node = 0;
+	rb_protect((VALUE (*)(VALUE))rb_require, (VALUE)list->name, &state);
+	if (state) rb_jump_tag(state);
+	tmp = list->next;
+	free(list->name);
+	free(list);
+	list = tmp;
+	ruby_current_node = save[2];
+	ruby_set_current_source();
+    }
+    req_list_head.next = 0;
+    ruby_eval_tree = save[0];
+    ruby_eval_tree_begin = save[1];
+    rb_gc_force_recycle((VALUE)save[2]);
+    ruby_current_node = 0;
+}
+
+static void
+process_sflag()
+{
+    if (sflag) {
+	long n;
+	VALUE *args;
+
+	n = RARRAY(rb_argv)->len;
+	args = RARRAY(rb_argv)->ptr;
+	while (n > 0) {
+	    VALUE v = *args++;
+	    char *s = StringValuePtr(v);
+	    char *p;
+	    int hyphen = Qfalse;
+
+	    if (s[0] != '-') break;
+	    n--;
+	    if (s[1] == '-' && s[2] == '\0') break;
+
+	    v = Qtrue;
+	    /* check if valid name before replacing - with _ */
+	    for (p = s + 1; *p; p++) {
+		if (*p == '=') {
+		    *p++ = '\0';
+		    v = rb_str_new2(p);
+		    break;
+		}
+		if (*p == '-') {
+		    hyphen = Qtrue;
+		}
+		else if (*p != '_' && !ISALNUM(*p)) {
+		    VALUE name_error[2];
+		    name_error[0] = rb_str_new2("invalid name for global variable - ");
+		    if (!(p = strchr(p, '='))) {
+			rb_str_cat2(name_error[0], s);
+		    }
+		    else {
+			rb_str_cat(name_error[0], s, p - s);
+		    }
+		    name_error[1] = args[-1];
+		    rb_exc_raise(rb_class_new_instance(2, name_error, rb_eNameError));
+		}
+	    }
+	    s[0] = '$';
+	    if (hyphen) {
+		for (p = s + 1; *p; ++p) {
+		    if (*p == '-') *p = '_';
+		}
+	    }
+	    rb_gv_set(s, v);
+	}
+	n = RARRAY(rb_argv)->len - n;
+	while (n--) {
+	    rb_ary_shift(rb_argv);
+	}
+    }
+    sflag = 0;
+}
+
+static void proc_options _((int argc, char **argv));
+
+static char*
+moreswitches(s)
+    char *s;
+{
+    int argc; char *argv[3];
+    char *p = s;
+
+    argc = 2; argv[0] = argv[2] = 0;
+    while (*s && !ISSPACE(*s))
+	s++;
+    argv[1] = ALLOCA_N(char, s-p+2);
+    argv[1][0] = '-';
+    strncpy(argv[1]+1, p, s-p);
+    argv[1][s-p+1] = '\0';
+    proc_options(argc, argv);
+    while (*s && ISSPACE(*s))
+	s++;
+    return s;
+}
+
+static void
+proc_options(argc, argv)
+    int argc;
+    char **argv;
+{
+    char *argv0 = argv[0];
+    int do_search;
+    char *s;
+    NODE *volatile script_node = 0;
+
+    int version = 0;
+    int copyright = 0;
+    int verbose = 0;
+    VALUE e_script = Qfalse;
+
+    if (argc == 0) return;
+
+    do_search = Qfalse;
+
+    for (argc--,argv++; argc > 0; argc--,argv++) {
+	if (argv[0][0] != '-' || !argv[0][1]) break;
+
+	s = argv[0]+1;
+      reswitch:
+	switch (*s) {
+	  case 'a':
+	    do_split = Qtrue;
+	    s++;
+	    goto reswitch;
+
+	  case 'p':
+	    do_print = Qtrue;
+	    /* through */
+	  case 'n':
+	    do_loop = Qtrue;
+	    s++;
+	    goto reswitch;
+
+	  case 'd':
+	    ruby_debug = Qtrue;
+	    ruby_verbose = Qtrue;
+	    s++;
+	    goto reswitch;
+
+	  case 'y':
+	    ruby_yydebug = 1;
+	    s++;
+	    goto reswitch;
+
+	  case 'v':
+	    if (argv0 == 0 || verbose) {
+		s++;
+		goto reswitch;
+	    }
+	    ruby_show_version();
+	    verbose = 1;
+	  case 'w':
+	    ruby_verbose = Qtrue;
+	    s++;
+	    goto reswitch;
+
+	  case 'W':
+	    {
+		int numlen;
+		int v = 2;	/* -W as -W2 */
+
+		if (*++s) {
+		    v = scan_oct(s, 1, &numlen);
+		    if (numlen == 0) v = 1;
+		    s += numlen;
+		}
+		switch (v) {
+		  case 0:
+		    ruby_verbose = Qnil; break;
+		  case 1:
+		    ruby_verbose = Qfalse; break;
+		  default:
+		    ruby_verbose = Qtrue; break;
+		}
+	    }
+	    goto reswitch;
+
+	  case 'c':
+	    do_check = Qtrue;
+	    s++;
+	    goto reswitch;
+
+	  case 's':
+	    forbid_setid("-s");
+	    sflag = 1;
+	    s++;
+	    goto reswitch;
+
+	  case 'h':
+	    usage(origargv[0]);
+	    exit(0);
+
+	  case 'l':
+	    do_line = Qtrue;
+	    rb_output_rs = rb_rs;
+	    s++;
+	    goto reswitch;
+
+	  case 'S':
+	    forbid_setid("-S");
+	    do_search = Qtrue;
+	    s++;
+	    goto reswitch;
+
+	  case 'e':
+	    forbid_setid("-e");
+	    if (!*++s) {
+		s = argv[1];
+		argc--,argv++;
+	    }
+	    if (!s) {
+		fprintf(stderr, "%s: no code specified for -e\n", origargv[0]);
+		exit(2);
+	    }
+	    if (!e_script) {
+		e_script = rb_str_new(0,0);
+		if (script == 0) script = "-e";
+	    }
+	    rb_str_cat2(e_script, s);
+	    rb_str_cat2(e_script, "\n");
+	    break;
+
+	  case 'r':
+	    forbid_setid("-r");
+	    if (*++s) {
+		add_modules(s);
+	    }
+	    else if (argv[1]) {
+		add_modules(argv[1]);
+		argc--,argv++;
+	    }
+	    break;
+
+	  case 'i':
+	    forbid_setid("-i");
+	    if (ruby_inplace_mode) free(ruby_inplace_mode);
+	    ruby_inplace_mode = strdup(s+1);
+	    break;
+
+	  case 'x':
+	    xflag = Qtrue;
+	    s++;
+	    if (*s && chdir(s) < 0) {
+		rb_fatal("Can't chdir to %s", s);
+	    }
+	    break;
+
+	  case 'C':
+	  case 'X':
+	    s++;
+	    if (!*s) {
+		s = argv[1];
+		argc--,argv++;
+	    }
+	    if (!s || !*s) {
+		rb_fatal("Can't chdir");
+	    }
+	    if (chdir(s) < 0) {
+		rb_fatal("Can't chdir to %s", s);
+	    }
+	    break;
+
+	  case 'F':
+	    if (*++s) {
+		rb_fs = rb_reg_new(s, strlen(s), 0);
+	    }
+	    break;
+
+	  case 'K':
+	    if (*++s) {
+		rb_set_kcode(s);
+		s++;
+	    }
+	    goto reswitch;
+
+	  case 'T':
+	    {
+		int numlen;
+		int v = 1;
+
+		if (*++s) {
+		    v = scan_oct(s, 2, &numlen);
+		    if (numlen == 0) v = 1;
+		    s += numlen;
+		}
+		rb_set_safe_level(v);
+	    }
+	    goto reswitch;
+
+	  case 'I':
+	    forbid_setid("-I");
+	    if (*++s)
+		ruby_incpush(s);
+	    else if (argv[1]) {
+		ruby_incpush(argv[1]);
+		argc--,argv++;
+	    }
+	    break;
+
+	  case '0':
+	    {
+		int numlen;
+		int v;
+		char c;
+
+		v = scan_oct(s, 4, &numlen);
+		s += numlen;
+		if (v > 0377) rb_rs = Qnil;
+		else if (v == 0 && numlen >= 2) {
+		    rb_rs = rb_str_new2("\n\n");
+		}
+		else {
+		    c = v & 0xff;
+		    rb_rs = rb_str_new(&c, 1);
+		}
+	    }
+	    goto reswitch;
+
+	  case '-':
+	    if (!s[1] || (s[1] == '\r' && !s[2])) {
+		argc--,argv++;
+		goto switch_end;
+	    }
+	    s++;
+	    if (strcmp("copyright", s) == 0)
+		copyright = 1;
+	    else if (strcmp("debug", s) == 0) {
+		ruby_debug = Qtrue;
+                ruby_verbose = Qtrue;
+            }
+	    else if (strcmp("version", s) == 0)
+		version = 1;
+	    else if (strcmp("verbose", s) == 0) {
+		verbose = 1;
+		ruby_verbose = Qtrue;
+	    }
+	    else if (strcmp("yydebug", s) == 0)
+		ruby_yydebug = 1;
+	    else if (strcmp("help", s) == 0) {
+		usage(origargv[0]);
+		exit(0);
+	    }
+	    else {
+		fprintf(stderr, "%s: invalid option --%s  (-h will show valid options)\n",
+			origargv[0], s);
+		exit(2);
+	    }
+	    break;
+
+	  case '\r':
+	    if (!s[1]) break;
+
+	  default:
+	    {
+		const char *format;
+		if (ISPRINT(*s)) {
+		    format = "%s: invalid option -%c  (-h will show valid options)\n";
+		}
+		else {
+		    format = "%s: invalid option -\\%03o  (-h will show valid options)\n";
+		}
+		fprintf(stderr, format, origargv[0], (int)(unsigned char)*s);
+	    }
+	    exit(2);
+
+	  case 0:
+	    break;
+	}
+    }
+
+  switch_end:
+    if (argv0 == 0) return;
+
+    if (rb_safe_level() == 0 && (s = getenv("RUBYOPT"))) {
+	while (ISSPACE(*s)) s++;
+	if (*s == 'T' || (*s == '-' && *(s+1) == 'T')) {
+	    int numlen;
+	    int v = 1;
+
+	    if (*s != 'T') ++s;
+	    if (*++s) {
+		v = scan_oct(s, 2, &numlen);
+		if (numlen == 0) v = 1;
+	    }
+	    rb_set_safe_level(v);
+	}
+	else {
+	    while (s && *s) {
+		if (*s == '-') {
+		    s++;
+		    if (ISSPACE(*s)) {
+			do {s++;} while (ISSPACE(*s));
+			continue;
+		    }
+		}
+		if (!*s) break;
+		if (!strchr("IdvwrK", *s))
+		    rb_raise(rb_eRuntimeError, "illegal switch in RUBYOPT: -%c", *s);
+		s = moreswitches(s);
+	    }
+	}
+    }
+
+    if (version) {
+	ruby_show_version();
+	exit(0);
+    }
+    if (copyright) {
+	ruby_show_copyright();
+    }
+
+    if (rb_safe_level() >= 4) {
+	OBJ_TAINT(rb_argv);
+	OBJ_TAINT(rb_load_path);
+    }
+
+    if (!e_script) {
+	if (argc == 0) {	/* no more args */
+	    if (verbose) exit(0);
+	    script = "-";
+	}
+	else {
+	    script = argv[0];
+	    if (script[0] == '\0') {
+		script = "-";
+	    }
+	    else if (do_search) {
+		char *path = getenv("RUBYPATH");
+
+		script = 0;
+		if (path) {
+		    script = dln_find_file(argv[0], path);
+		}
+		if (!script) {
+		    script = dln_find_file(argv[0], getenv(PATH_ENV));
+		}
+		if (!script) script = argv[0];
+		script = ruby_sourcefile = rb_source_filename(script);
+		script_node = NEW_NEWLINE(0);
+	    }
+#if defined DOSISH || defined __CYGWIN__
+	    translate_char(script, '\\', '/');
+#endif
+	    argc--; argv++;
+	}
+    }
+
+    ruby_script(script);
+    ruby_set_argv(argc, argv);
+    process_sflag();
+
+    ruby_init_loadpath();
+    ruby_sourcefile = rb_source_filename(argv0);
+    if (e_script) {
+	require_libraries();
+	rb_compile_string(script, e_script, 1);
+    }
+    else if (strlen(script) == 1 && script[0] == '-') {
+	load_stdin();
+    }
+    else {
+	load_file(script, 1);
+    }
+
+    process_sflag();
+    xflag = 0;
+
+    if (rb_safe_level() >= 4) {
+	FL_UNSET(rb_argv, FL_TAINT);
+	FL_UNSET(rb_load_path, FL_TAINT);
+    }
+}
+
+extern int ruby__end__seen;
+
+static void
+load_file(fname, script)
+    const char *fname;
+    int script;
+{
+    extern VALUE rb_stdin;
+    VALUE f;
+    int line_start = 1;
+
+    if (!fname) rb_load_fail(fname);
+    if (strcmp(fname, "-") == 0) {
+	f = rb_stdin;
+    }
+    else {
+	FILE *fp = fopen(fname, "r");
+
+	if (fp == NULL) {
+	    rb_load_fail(fname);
+	}
+	fclose(fp);
+
+	f = rb_file_open(fname, "r");
+#if defined DOSISH || defined __CYGWIN__
+	{
+	    char *ext = strrchr(fname, '.');
+	    if (ext && strcasecmp(ext, ".exe") == 0)
+		rb_io_binmode(f);
+	}
+#endif
+    }
+
+    if (script) {
+	VALUE c = 1;		/* something not nil */
+	VALUE line;
+	char *p;
+
+	if (xflag) {
+	    forbid_setid("-x");
+	    xflag = Qfalse;
+	    while (!NIL_P(line = rb_io_gets(f))) {
+		line_start++;
+		if (RSTRING(line)->len > 2
+		    && RSTRING(line)->ptr[0] == '#'
+		    && RSTRING(line)->ptr[1] == '!') {
+		    if ((p = strstr(RSTRING(line)->ptr, "ruby")) != 0) {
+			goto start_read;
+		    }
+		}
+	    }
+	    rb_raise(rb_eLoadError, "no Ruby script found in input");
+	}
+
+	c = rb_io_getc(f);
+	if (c == INT2FIX('#')) {
+	    line = rb_io_gets(f);
+	    if (NIL_P(line)) return;
+	    line_start++;
+
+	    if (RSTRING(line)->len > 2 && RSTRING(line)->ptr[0] == '!') {
+		if ((p = strstr(RSTRING(line)->ptr, "ruby")) == 0) {
+		    /* not ruby script, kick the program */
+		    char **argv;
+		    char *path;
+		    char *pend = RSTRING(line)->ptr + RSTRING(line)->len;
+
+		    p = RSTRING(line)->ptr + 1;	/* skip `#!' */
+		    if (pend[-1] == '\n') pend--; /* chomp line */
+		    if (pend[-1] == '\r') pend--;
+		    *pend = '\0';
+		    while (p < pend && ISSPACE(*p))
+			p++;
+		    path = p;	/* interpreter path */
+		    while (p < pend && !ISSPACE(*p))
+			p++;
+		    *p++ = '\0';
+		    if (p < pend) {
+			argv = ALLOCA_N(char*, origargc+3);
+			argv[1] = p;
+			MEMCPY(argv+2, origargv+1, char*, origargc);
+		    }
+		    else {
+			argv = origargv;
+		    }
+		    argv[0] = path;
+		    execv(path, argv);
+
+		    ruby_sourcefile = rb_source_filename(fname);
+		    ruby_sourceline = 1;
+		    rb_fatal("Can't exec %s", path);
+		}
+
+	      start_read:
+		p += 4;
+		RSTRING(line)->ptr[RSTRING(line)->len-1] = '\0';
+		if (RSTRING(line)->ptr[RSTRING(line)->len-2] == '\r')
+		    RSTRING(line)->ptr[RSTRING(line)->len-2] = '\0';
+		if ((p = strstr(p, " -")) != 0) {
+		    p++;	/* skip space before `-' */
+		    while (*p == '-') {
+			p = moreswitches(p+1);
+		    }
+		}
+	    }
+	}
+	else if (!NIL_P(c)) {
+	    rb_io_ungetc(f, c);
+	}
+	require_libraries();	/* Why here? unnatural */
+	if (NIL_P(c)) return;
+    }
+    rb_compile_file(fname, f, line_start);
+    if (script && ruby__end__seen) {
+	rb_define_global_const("DATA", f);
+    }
+    else if (f != rb_stdin) {
+	rb_io_close(f);
+    }
+
+    if (ruby_parser_stack_on_heap()) {
+        rb_gc();
+    }
+}
+
+void
+rb_load_file(fname)
+    const char *fname;
+{
+    load_file(fname, 0);
+}
+
+static void
+load_stdin()
+{
+    forbid_setid("program input from stdin");
+    load_file("-", 1);
+}
+
+VALUE rb_progname;
+VALUE rb_argv;
+VALUE rb_argv0;
+
+#if defined(PSTAT_SETCMD) || defined(HAVE_SETPROCTITLE)
+#elif defined(_WIN32)
+#elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
+#else
+#define USE_ENVSPACE_FOR_ARG0
+#endif
+
+#ifdef USE_ENVSPACE_FOR_ARG0
+static struct {
+    char *begin, *end;
+} envspace;
+extern char **environ;
+
+static void
+set_arg0space()
+{
+    char *s;
+    int i;
+
+    if (!environ || (s = environ[0]) == NULL) return;
+    envspace.begin = s;
+    s += strlen(s);
+    for (i = 1; environ[i]; i++) {
+	if (environ[i] == s + 1) {
+	    s++;
+	    s += strlen(s);	/* this one is ok too */
+	}
+    }
+    envspace.end = s;
+}
+#else
+#define set_arg0space() ((void)0)
+#endif
+
+static void
+set_arg0(val, id)
+    VALUE val;
+    ID id;
+{
+    char *s;
+    long i;
+#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
+    static int len;
+#endif
+
+    if (origargv == 0) rb_raise(rb_eRuntimeError, "$0 not initialized");
+    StringValue(val);
+    s = RSTRING(val)->ptr;
+    i = RSTRING(val)->len;
+#if defined(PSTAT_SETCMD)
+    if (i >= PST_CLEN) {
+	union pstun j;
+	j.pst_command = s;
+	i = PST_CLEN;
+	RSTRING(val)->len = i;
+	*(s + i) = '\0';
+	pstat(PSTAT_SETCMD, j, PST_CLEN, 0, 0);
+    }
+    else {
+	union pstun j;
+	j.pst_command = s;
+	pstat(PSTAT_SETCMD, j, i, 0, 0);
+    }
+    rb_progname = rb_tainted_str_new(s, i);
+#elif defined(HAVE_SETPROCTITLE)
+    setproctitle("%.*s", (int)i, s);
+    rb_progname = rb_tainted_str_new(s, i);
+#else
+    if (len == 0) {
+	char *s = origargv[0];
+	int i;
+
+	s += strlen(s);
+	/* See if all the arguments are contiguous in memory */
+	for (i = 1; i < origargc; i++) {
+	    if (origargv[i] == s + 1) {
+		s++;
+		s += strlen(s);	/* this one is ok too */
+	    }
+	    else {
+		break;
+	    }
+	}
+#if defined(USE_ENVSPACE_FOR_ARG0)
+	if (s + 1 == envspace.begin) {
+	    s = envspace.end;
+	    ruby_setenv("", NULL); /* duplicate environ vars */
+	}
+#endif
+	len = s - origargv[0];
+    }
+
+    if (i >= len) {
+	i = len;
+    }
+    memcpy(origargv[0], s, i);
+    s = origargv[0] + i;
+    *s = '\0';
+    if (++i < len) memset(s + 1, ' ', len - i);
+    for (i = 1; i < origargc; i++)
+	origargv[i] = s;
+    rb_progname = rb_tainted_str_new2(origargv[0]);
+#endif
+}
+
+void
+ruby_script(name)
+    const char *name;
+{
+    if (name) {
+	rb_progname = rb_tainted_str_new2(name);
+	ruby_sourcefile = rb_source_filename(name);
+    }
+}
+
+static int uid, euid, gid, egid;
+
+static void
+init_ids()
+{
+    uid = (int)getuid();
+    euid = (int)geteuid();
+    gid = (int)getgid();
+    egid = (int)getegid();
+#ifdef VMS
+    uid |= gid << 16;
+    euid |= egid << 16;
+#endif
+    if (uid && (euid != uid || egid != gid)) {
+	rb_set_safe_level(1);
+    }
+}
+
+static void
+forbid_setid(s)
+    const char *s;
+{
+    if (euid != uid)
+        rb_raise(rb_eSecurityError, "no %s allowed while running setuid", s);
+    if (egid != gid)
+        rb_raise(rb_eSecurityError, "no %s allowed while running setgid", s);
+    if (rb_safe_level() > 0)
+        rb_raise(rb_eSecurityError, "no %s allowed in tainted mode", s);
+}
+
+static void
+verbose_setter(val, id, variable)
+    VALUE val;
+    ID id;
+    VALUE *variable;
+{
+    ruby_verbose = RTEST(val) ? Qtrue : val;
+}
+
+void
+ruby_prog_init()
+{
+    init_ids();
+
+    ruby_sourcefile = rb_source_filename("ruby");
+    rb_define_hooked_variable("$VERBOSE", &ruby_verbose, 0, verbose_setter);
+    rb_define_hooked_variable("$-v", &ruby_verbose, 0, verbose_setter);
+    rb_define_hooked_variable("$-w", &ruby_verbose, 0, verbose_setter);
+    rb_define_variable("$DEBUG", &ruby_debug);
+    rb_define_variable("$-d", &ruby_debug);
+    rb_define_readonly_variable("$-p", &do_print);
+    rb_define_readonly_variable("$-l", &do_line);
+
+    rb_define_hooked_variable("$0", &rb_progname, 0, set_arg0);
+    rb_define_hooked_variable("$PROGRAM_NAME", &rb_progname, 0, set_arg0);
+
+    rb_define_readonly_variable("$*", &rb_argv);
+    rb_argv = rb_ary_new();
+    rb_define_global_const("ARGV", rb_argv);
+    rb_define_readonly_variable("$-a", &do_split);
+    rb_global_variable(&rb_argv0);
+
+#ifdef MSDOS
+    /*
+     * There is no way we can refer to them from ruby, so close them to save
+     * space.
+     */
+    (void)fclose(stdaux);
+    (void)fclose(stdprn);
+#endif
+}
+
+void
+ruby_set_argv(argc, argv)
+    int argc;
+    char **argv;
+{
+    int i;
+
+#if defined(USE_DLN_A_OUT)
+    if (origargv) dln_argv0 = origargv[0];
+    else          dln_argv0 = argv[0];
+#endif
+    rb_ary_clear(rb_argv);
+    for (i=0; i < argc; i++) {
+	VALUE arg = rb_tainted_str_new2(argv[i]);
+
+	OBJ_FREEZE(arg);
+	rb_ary_push(rb_argv, arg);
+    }
+}
+
+void
+ruby_process_options(argc, argv)
+    int argc;
+    char **argv;
+{
+    origargc = argc; origargv = argv;
+
+    ruby_script(argv[0]);	/* for the time being */
+    rb_argv0 = rb_progname;
+#if defined(USE_DLN_A_OUT)
+    dln_argv0 = argv[0];
+#endif
+    set_arg0space();
+    proc_options(argc, argv);
+
+    if (do_check && ruby_nerrs == 0) {
+	printf("Syntax OK\n");
+	exit(0);
+    }
+    if (do_print) {
+	rb_parser_append_print();
+    }
+    if (do_loop) {
+	rb_parser_while_loop(do_line, do_split);
+    }
+}
diff --git a/ruby_1_8_6/ruby.h b/ruby_1_8_6/ruby.h
new file mode 100644
index 0000000000..40c95f2050
--- /dev/null
+++ b/ruby_1_8_6/ruby.h
@@ -0,0 +1,759 @@
+/**********************************************************************
+
+  ruby.h -
+
+  $Author$
+  created at: Thu Jun 10 14:26:32 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#ifndef RUBY_H
+#define RUBY_H
+
+#if defined(__cplusplus)
+extern "C" {
+#if 0
+} /* satisfy cc-mode */
+#endif
+#endif
+
+#include "config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
+#define NORETURN_STYLE_NEW 1
+#ifndef NORETURN
+# define NORETURN(x) x
+#endif
+#ifndef NOINLINE
+# define NOINLINE(x) x
+#endif
+
+#include "defines.h"
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#ifdef HAVE_INTRINSICS_H
+# include <intrinsics.h>
+#endif
+
+#include <stddef.h>
+#include <stdio.h>
+
+/* need to include <ctype.h> to use these macros */
+#ifndef ISPRINT
+#define ISASCII(c) isascii((int)(unsigned char)(c))
+#undef ISPRINT
+#define ISPRINT(c) (ISASCII(c) && isprint((int)(unsigned char)(c)))
+#define ISSPACE(c) (ISASCII(c) && isspace((int)(unsigned char)(c)))
+#define ISUPPER(c) (ISASCII(c) && isupper((int)(unsigned char)(c)))
+#define ISLOWER(c) (ISASCII(c) && islower((int)(unsigned char)(c)))
+#define ISALNUM(c) (ISASCII(c) && isalnum((int)(unsigned char)(c)))
+#define ISALPHA(c) (ISASCII(c) && isalpha((int)(unsigned char)(c)))
+#define ISDIGIT(c) (ISASCII(c) && isdigit((int)(unsigned char)(c)))
+#define ISXDIGIT(c) (ISASCII(c) && isxdigit((int)(unsigned char)(c)))
+#endif
+
+#if defined(HAVE_ALLOCA_H)
+#include <alloca.h>
+#else
+#  ifdef _AIX
+#pragma alloca
+#  endif
+#endif
+
+#if defined(__VMS)
+# pragma builtins
+# define alloca __alloca
+#endif
+
+#if SIZEOF_LONG != SIZEOF_VOIDP
+# error ---->> ruby requires sizeof(void*) == sizeof(long) to be compiled. <<----
+#else
+typedef unsigned long VALUE;
+typedef unsigned long ID;
+#endif
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# ifndef LONG_MAX
+#  ifdef HAVE_LIMITS_H
+#   include <limits.h>
+#  else
+    /* assuming 32bit(2's compliment) long */
+#   define LONG_MAX 2147483647
+#  endif
+# endif
+# ifndef LONG_MIN
+#  define LONG_MIN (-LONG_MAX-1)
+# endif
+# ifndef CHAR_BIT
+#  define CHAR_BIT 8
+# endif
+#endif
+
+#ifdef HAVE_LONG_LONG
+# ifndef LLONG_MAX
+#  ifdef LONG_LONG_MAX
+#   define LLONG_MAX  LONG_LONG_MAX
+#  else
+#   ifdef _I64_MAX
+#    define LLONG_MAX _I64_MAX
+#   else
+    /* assuming 64bit(2's complement) long long */
+#    define LLONG_MAX 9223372036854775807LL
+#   endif
+#  endif
+# endif
+# ifndef LLONG_MIN
+#  ifdef LONG_LONG_MIN
+#   define LLONG_MIN  LONG_LONG_MIN
+#  else
+#   ifdef _I64_MIN
+#    define LLONG_MIN _I64_MIN
+#   else
+#    define LLONG_MIN (-LLONG_MAX-1)
+#   endif
+#  endif
+# endif
+#endif
+
+#define FIXNUM_MAX (LONG_MAX>>1)
+#define FIXNUM_MIN RSHIFT((long)LONG_MIN,1)
+
+#define FIXNUM_FLAG 0x01
+#define INT2FIX(i) ((VALUE)(((long)(i))<<1 | FIXNUM_FLAG))
+#define LONG2FIX(i) INT2FIX(i)
+#define rb_fix_new(v) INT2FIX(v)
+VALUE rb_int2inum _((long));
+#define INT2NUM(v) rb_int2inum(v)
+#define LONG2NUM(v) INT2NUM(v)
+#define rb_int_new(v) rb_int2inum(v)
+VALUE rb_uint2inum _((unsigned long));
+#define UINT2NUM(v) rb_uint2inum(v)
+#define ULONG2NUM(v) UINT2NUM(v)
+#define rb_uint_new(v) rb_uint2inum(v)
+
+#ifdef HAVE_LONG_LONG
+VALUE rb_ll2inum _((LONG_LONG));
+#define LL2NUM(v) rb_ll2inum(v)
+VALUE rb_ull2inum _((unsigned LONG_LONG));
+#define ULL2NUM(v) rb_ull2inum(v)
+#endif
+
+#if SIZEOF_OFF_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
+# define OFFT2NUM(v) LL2NUM(v)
+#elif SIZEOF_OFF_T == SIZEOF_LONG
+# define OFFT2NUM(v) LONG2NUM(v)
+#else
+# define OFFT2NUM(v) INT2NUM(v)
+#endif
+
+#define FIX2LONG(x) RSHIFT((long)x,1)
+#define FIX2ULONG(x) (((unsigned long)(x))>>1)
+#define FIXNUM_P(f) (((long)(f))&FIXNUM_FLAG)
+#define POSFIXABLE(f) ((f) <= FIXNUM_MAX)
+#define NEGFIXABLE(f) ((f) >= FIXNUM_MIN)
+#define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f))
+
+#define IMMEDIATE_MASK 0x03
+#define IMMEDIATE_P(x) ((VALUE)(x) & IMMEDIATE_MASK)
+
+#define SYMBOL_FLAG 0x0e
+#define SYMBOL_P(x) (((VALUE)(x)&0xff)==SYMBOL_FLAG)
+#define ID2SYM(x) ((VALUE)(((long)(x))<<8|SYMBOL_FLAG))
+#define SYM2ID(x) RSHIFT((unsigned long)x,8)
+
+/* special contants - i.e. non-zero and non-fixnum constants */
+#define Qfalse ((VALUE)0)
+#define Qtrue  ((VALUE)2)
+#define Qnil   ((VALUE)4)
+#define Qundef ((VALUE)6)	/* undefined value for placeholder */
+
+#define RTEST(v) (((VALUE)(v) & ~Qnil) != 0)
+#define NIL_P(v) ((VALUE)(v) == Qnil)
+
+#define CLASS_OF(v) rb_class_of((VALUE)(v))
+
+#define T_NONE   0x00
+
+#define T_NIL    0x01
+#define T_OBJECT 0x02
+#define T_CLASS  0x03
+#define T_ICLASS 0x04
+#define T_MODULE 0x05
+#define T_FLOAT  0x06
+#define T_STRING 0x07
+#define T_REGEXP 0x08
+#define T_ARRAY  0x09
+#define T_FIXNUM 0x0a
+#define T_HASH   0x0b
+#define T_STRUCT 0x0c
+#define T_BIGNUM 0x0d
+#define T_FILE   0x0e
+
+#define T_TRUE   0x20
+#define T_FALSE  0x21
+#define T_DATA   0x22
+#define T_MATCH  0x23
+#define T_SYMBOL 0x24
+
+#define T_BLKTAG 0x3b
+#define T_UNDEF  0x3c
+#define T_VARMAP 0x3d
+#define T_SCOPE  0x3e
+#define T_NODE   0x3f
+
+#define T_MASK   0x3f
+
+#define BUILTIN_TYPE(x) (((struct RBasic*)(x))->flags & T_MASK)
+
+#define TYPE(x) rb_type((VALUE)(x))
+
+void rb_check_type _((VALUE,int));
+#define Check_Type(v,t) rb_check_type((VALUE)(v),t)
+
+VALUE rb_str_to_str _((VALUE));
+VALUE rb_string_value _((volatile VALUE*));
+char *rb_string_value_ptr _((volatile VALUE*));
+char *rb_string_value_cstr _((volatile VALUE*));
+
+#define StringValue(v) rb_string_value(&(v))
+#define StringValuePtr(v) rb_string_value_ptr(&(v))
+#define StringValueCStr(v) rb_string_value_cstr(&(v))
+
+void rb_check_safe_obj _((VALUE));
+void rb_check_safe_str _((VALUE));
+#define SafeStringValue(v) do {\
+    StringValue(v);\
+    rb_check_safe_obj(v);\
+} while (0)
+/* obsolete macro - use SafeStringValue(v) */
+#define Check_SafeStr(v) rb_check_safe_str((VALUE)(v))
+
+void rb_secure _((int));
+RUBY_EXTERN int ruby_safe_level;
+#define rb_safe_level() (ruby_safe_level)
+void rb_set_safe_level _((int));
+void rb_secure_update _((VALUE));
+
+long rb_num2long _((VALUE));
+unsigned long rb_num2ulong _((VALUE));
+#define NUM2LONG(x) (FIXNUM_P(x)?FIX2LONG(x):rb_num2long((VALUE)x))
+#define NUM2ULONG(x) rb_num2ulong((VALUE)x)
+#if SIZEOF_INT < SIZEOF_LONG
+long rb_num2int _((VALUE));
+#define NUM2INT(x) (FIXNUM_P(x)?FIX2INT(x):rb_num2int((VALUE)x))
+long rb_fix2int _((VALUE));
+#define FIX2INT(x) rb_fix2int((VALUE)x)
+unsigned long rb_num2uint _((VALUE));
+#define NUM2UINT(x) rb_num2uint(x)
+unsigned long rb_fix2uint _((VALUE));
+#define FIX2UINT(x) rb_fix2uint(x)
+#else
+#define NUM2INT(x) ((int)NUM2LONG(x))
+#define NUM2UINT(x) ((unsigned int)NUM2ULONG(x))
+#define FIX2INT(x) ((int)FIX2LONG(x))
+#define FIX2UINT(x) ((unsigned int)FIX2ULONG(x))
+#endif
+
+#ifdef HAVE_LONG_LONG
+LONG_LONG rb_num2ll _((VALUE));
+unsigned LONG_LONG rb_num2ull _((VALUE));
+# define NUM2LL(x) (FIXNUM_P(x)?FIX2LONG(x):rb_num2ll((VALUE)x))
+# define NUM2ULL(x) rb_num2ull((VALUE)x)
+#endif
+
+#if defined(HAVE_LONG_LONG) && SIZEOF_OFF_T > SIZEOF_LONG
+# define NUM2OFFT(x) ((off_t)NUM2LL(x))
+#else
+# define NUM2OFFT(x) NUM2LONG(x)
+#endif
+
+double rb_num2dbl _((VALUE));
+#define NUM2DBL(x) rb_num2dbl((VALUE)(x))
+
+/* obsolete API - use StringValue() */
+char *rb_str2cstr _((VALUE,long*));
+/* obsolete API - use StringValuePtr() */
+#define STR2CSTR(x) rb_str2cstr((VALUE)(x),0)
+
+#define NUM2CHR(x) (((TYPE(x) == T_STRING)&&(RSTRING(x)->len>=1))?\
+                     RSTRING(x)->ptr[0]:(char)(NUM2INT(x)&0xff))
+#define CHR2FIX(x) INT2FIX((long)((x)&0xff))
+
+VALUE rb_newobj _((void));
+#define NEWOBJ(obj,type) type *obj = (type*)rb_newobj()
+#define OBJSETUP(obj,c,t) do {\
+    RBASIC(obj)->flags = (t);\
+    RBASIC(obj)->klass = (c);\
+    if (rb_safe_level() >= 3) FL_SET(obj, FL_TAINT);\
+} while (0)
+#define CLONESETUP(clone,obj) do {\
+    OBJSETUP(clone,rb_singleton_class_clone((VALUE)obj),RBASIC(obj)->flags);\
+    rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);\
+    if (FL_TEST(obj, FL_EXIVAR)) rb_copy_generic_ivar((VALUE)clone,(VALUE)obj);\
+} while (0)
+#define DUPSETUP(dup,obj) do {\
+    OBJSETUP(dup,rb_obj_class(obj),(RBASIC(obj)->flags)&(T_MASK|FL_EXIVAR|FL_TAINT));\
+    if (FL_TEST(obj, FL_EXIVAR)) rb_copy_generic_ivar((VALUE)dup,(VALUE)obj);\
+} while (0)
+
+struct RBasic {
+    unsigned long flags;
+    VALUE klass;
+};
+
+struct RObject {
+    struct RBasic basic;
+    struct st_table *iv_tbl;
+};
+
+struct RClass {
+    struct RBasic basic;
+    struct st_table *iv_tbl;
+    struct st_table *m_tbl;
+    VALUE super;
+};
+
+struct RFloat {
+    struct RBasic basic;
+    double value;
+};
+
+#define ELTS_SHARED FL_USER2
+
+struct RString {
+    struct RBasic basic;
+    long len;
+    char *ptr;
+    union {
+	long capa;
+	VALUE shared;
+    } aux;
+};
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+
+struct RArray {
+    struct RBasic basic;
+    long len;
+    union {
+	long capa;
+	VALUE shared;
+    } aux;
+    VALUE *ptr;
+};
+#define RARRAY_PTR(s) (RARRAY(s)->ptr)
+#define RARRAY_LEN(s) (RARRAY(s)->len)
+
+struct RRegexp {
+    struct RBasic basic;
+    struct re_pattern_buffer *ptr;
+    long len;
+    char *str;
+};
+
+struct RHash {
+    struct RBasic basic;
+    struct st_table *tbl;
+    int iter_lev;
+    VALUE ifnone;
+};
+
+struct RFile {
+    struct RBasic basic;
+    struct OpenFile *fptr;
+};
+
+struct RData {
+    struct RBasic basic;
+    void (*dmark) _((void*));
+    void (*dfree) _((void*));
+    void *data;
+};
+
+#define DATA_PTR(dta) (RDATA(dta)->data)
+
+/*
+#define RUBY_DATA_FUNC(func) ((void (*)_((void*)))func)
+*/
+typedef void (*RUBY_DATA_FUNC) _((void*));
+
+VALUE rb_data_object_alloc _((VALUE,void*,RUBY_DATA_FUNC,RUBY_DATA_FUNC));
+
+#define Data_Wrap_Struct(klass,mark,free,sval)\
+    rb_data_object_alloc(klass,sval,(RUBY_DATA_FUNC)mark,(RUBY_DATA_FUNC)free)
+
+#define Data_Make_Struct(klass,type,mark,free,sval) (\
+    sval = ALLOC(type),\
+    memset(sval, 0, sizeof(type)),\
+    Data_Wrap_Struct(klass,mark,free,sval)\
+)
+
+#define Data_Get_Struct(obj,type,sval) do {\
+    Check_Type(obj, T_DATA); \
+    sval = (type*)DATA_PTR(obj);\
+} while (0)
+
+struct RStruct {
+    struct RBasic basic;
+    long len;
+    VALUE *ptr;
+};
+#define RSTRUCT_LEN(st) (RSTRUCT(st)->len)
+#define RSTRUCT_PTR(st) (RSTRUCT(st)->ptr)
+
+struct RBignum {
+    struct RBasic basic;
+    char sign;
+    long len;
+    void *digits;
+};
+
+#define R_CAST(st)   (struct st*)
+#define RBASIC(obj)  (R_CAST(RBasic)(obj))
+#define ROBJECT(obj) (R_CAST(RObject)(obj))
+#define RCLASS(obj)  (R_CAST(RClass)(obj))
+#define RMODULE(obj) RCLASS(obj)
+#define RFLOAT(obj)  (R_CAST(RFloat)(obj))
+#define RSTRING(obj) (R_CAST(RString)(obj))
+#define RREGEXP(obj) (R_CAST(RRegexp)(obj))
+#define RARRAY(obj)  (R_CAST(RArray)(obj))
+#define RHASH(obj)   (R_CAST(RHash)(obj))
+#define RDATA(obj)   (R_CAST(RData)(obj))
+#define RSTRUCT(obj) (R_CAST(RStruct)(obj))
+#define RBIGNUM(obj) (R_CAST(RBignum)(obj))
+#define RFILE(obj)   (R_CAST(RFile)(obj))
+
+#define FL_SINGLETON FL_USER0
+#define FL_MARK      (1<<6)
+#define FL_FINALIZE  (1<<7)
+#define FL_TAINT     (1<<8)
+#define FL_EXIVAR    (1<<9)
+#define FL_FREEZE    (1<<10)
+
+#define FL_USHIFT    11
+
+#define FL_USER0     (1<<(FL_USHIFT+0))
+#define FL_USER1     (1<<(FL_USHIFT+1))
+#define FL_USER2     (1<<(FL_USHIFT+2))
+#define FL_USER3     (1<<(FL_USHIFT+3))
+#define FL_USER4     (1<<(FL_USHIFT+4))
+#define FL_USER5     (1<<(FL_USHIFT+5))
+#define FL_USER6     (1<<(FL_USHIFT+6))
+#define FL_USER7     (1<<(FL_USHIFT+7))
+
+#define FL_UMASK  (0xff<<FL_USHIFT)
+
+#define SPECIAL_CONST_P(x) (IMMEDIATE_P(x) || !RTEST(x))
+
+#define FL_ABLE(x) (!SPECIAL_CONST_P(x))
+#define FL_TEST(x,f) (FL_ABLE(x)?(RBASIC(x)->flags&(f)):0)
+#define FL_SET(x,f) do {if (FL_ABLE(x)) RBASIC(x)->flags |= (f);} while (0)
+#define FL_UNSET(x,f) do {if (FL_ABLE(x)) RBASIC(x)->flags &= ~(f);} while (0)
+#define FL_REVERSE(x,f) do {if (FL_ABLE(x)) RBASIC(x)->flags ^= (f);} while (0)
+
+#define OBJ_TAINTED(x) FL_TEST((x), FL_TAINT)
+#define OBJ_TAINT(x) FL_SET((x), FL_TAINT)
+#define OBJ_INFECT(x,s) do {if (FL_ABLE(x) && FL_ABLE(s)) RBASIC(x)->flags |= RBASIC(s)->flags & FL_TAINT;} while (0)
+
+#define OBJ_FROZEN(x) FL_TEST((x), FL_FREEZE)
+#define OBJ_FREEZE(x) FL_SET((x), FL_FREEZE)
+
+#define ALLOC_N(type,n) (type*)xmalloc(sizeof(type)*(n))
+#define ALLOC(type) (type*)xmalloc(sizeof(type))
+#define REALLOC_N(var,type,n) (var)=(type*)xrealloc((char*)(var),sizeof(type)*(n))
+
+#define ALLOCA_N(type,n) (type*)alloca(sizeof(type)*(n))
+
+#define MEMZERO(p,type,n) memset((p), 0, sizeof(type)*(n))
+#define MEMCPY(p1,p2,type,n) memcpy((p1), (p2), sizeof(type)*(n))
+#define MEMMOVE(p1,p2,type,n) memmove((p1), (p2), sizeof(type)*(n))
+#define MEMCMP(p1,p2,type,n) memcmp((p1), (p2), sizeof(type)*(n))
+
+void rb_obj_infect _((VALUE,VALUE));
+
+typedef int ruby_glob_func(const char*,VALUE);
+void rb_glob _((const char*,void(*)(const char*,VALUE),VALUE));
+void rb_globi _((const char*,void(*)(const char*,VALUE),VALUE));
+int ruby_brace_expand _((const char*,int,ruby_glob_func*,VALUE));
+int ruby_brace_glob _((const char*,int,ruby_glob_func*,VALUE));
+
+VALUE rb_define_class _((const char*,VALUE));
+VALUE rb_define_module _((const char*));
+VALUE rb_define_class_under _((VALUE, const char*, VALUE));
+VALUE rb_define_module_under _((VALUE, const char*));
+
+void rb_include_module _((VALUE,VALUE));
+void rb_extend_object _((VALUE,VALUE));
+
+void rb_define_variable _((const char*,VALUE*));
+void rb_define_virtual_variable _((const char*,VALUE(*)(ANYARGS),void(*)(ANYARGS)));
+void rb_define_hooked_variable _((const char*,VALUE*,VALUE(*)(ANYARGS),void(*)(ANYARGS)));
+int ruby_glob _((const char*,int,int(*)(const char*,VALUE),VALUE));
+int ruby_globi _((const char*,int,int(*)(const char*,VALUE),VALUE));
+void rb_define_readonly_variable _((const char*,VALUE*));
+void rb_define_const _((VALUE,const char*,VALUE));
+void rb_define_global_const _((const char*,VALUE));
+
+#define RUBY_METHOD_FUNC(func) ((VALUE (*)(ANYARGS))func)
+void rb_define_method _((VALUE,const char*,VALUE(*)(ANYARGS),int));
+void rb_define_module_function _((VALUE,const char*,VALUE(*)(ANYARGS),int));
+void rb_define_global_function _((const char*,VALUE(*)(ANYARGS),int));
+
+void rb_undef_method _((VALUE,const char*));
+void rb_define_alias _((VALUE,const char*,const char*));
+void rb_define_attr _((VALUE,const char*,int,int));
+
+void rb_global_variable _((VALUE*));
+void rb_gc_register_address _((VALUE*));
+void rb_gc_unregister_address _((VALUE*));
+
+ID rb_intern _((const char*));
+char *rb_id2name _((ID));
+ID rb_to_id _((VALUE));
+
+char *rb_class2name _((VALUE));
+char *rb_obj_classname _((VALUE));
+
+void rb_p _((VALUE));
+
+VALUE rb_eval_string _((const char*));
+VALUE rb_eval_string_protect _((const char*, int*));
+VALUE rb_eval_string_wrap _((const char*, int*));
+VALUE rb_funcall __((VALUE, ID, int, ...));
+VALUE rb_funcall2 _((VALUE, ID, int, const VALUE*));
+VALUE rb_funcall3 _((VALUE, ID, int, const VALUE*));
+int rb_scan_args __((int, const VALUE*, const char*, ...));
+VALUE rb_call_super _((int, const VALUE*));
+
+VALUE rb_gv_set _((const char*, VALUE));
+VALUE rb_gv_get _((const char*));
+VALUE rb_iv_get _((VALUE, const char*));
+VALUE rb_iv_set _((VALUE, const char*, VALUE));
+
+VALUE rb_equal _((VALUE,VALUE));
+
+RUBY_EXTERN VALUE ruby_verbose, ruby_debug;
+
+NORETURN(void rb_raise __((VALUE, const char*, ...)));
+NORETURN(void rb_fatal __((const char*, ...)));
+NORETURN(void rb_bug __((const char*, ...)));
+NORETURN(void rb_sys_fail _((const char*)));
+NORETURN(void rb_iter_break _((void)));
+NORETURN(void rb_exit _((int)));
+NORETURN(void rb_notimplement _((void)));
+
+void rb_warning __((const char*, ...));		/* reports if `-w' specified */
+void rb_sys_warning __((const char*, ...));	/* reports if `-w' specified */
+void rb_warn __((const char*, ...));		/* reports always */
+
+VALUE rb_each _((VALUE));
+VALUE rb_yield _((VALUE));
+VALUE rb_yield_values __((int n, ...));
+VALUE rb_yield_splat _((VALUE));
+int rb_block_given_p _((void));
+void rb_need_block _((void));
+VALUE rb_iterate _((VALUE(*)(VALUE),VALUE,VALUE(*)(ANYARGS),VALUE));
+VALUE rb_rescue _((VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE));
+VALUE rb_rescue2 __((VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE,...));
+VALUE rb_ensure _((VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE));
+VALUE rb_catch _((const char*,VALUE(*)(ANYARGS),VALUE));
+NORETURN(void rb_throw _((const char*,VALUE)));
+
+VALUE rb_require _((const char*));
+
+#ifdef __ia64
+void ruby_init_stack(VALUE*, void*);
+#define RUBY_INIT_STACK \
+    VALUE variable_in_this_stack_frame; \
+    ruby_init_stack(&variable_in_this_stack_frame, rb_ia64_bsp());
+#else
+void ruby_init_stack(VALUE*);
+#define RUBY_INIT_STACK \
+    VALUE variable_in_this_stack_frame; \
+    ruby_init_stack(&variable_in_this_stack_frame);
+#endif
+void ruby_init _((void));
+void ruby_options _((int, char**));
+NORETURN(void ruby_run _((void)));
+
+RUBY_EXTERN VALUE rb_mKernel;
+RUBY_EXTERN VALUE rb_mComparable;
+RUBY_EXTERN VALUE rb_mEnumerable;
+RUBY_EXTERN VALUE rb_mPrecision;
+RUBY_EXTERN VALUE rb_mErrno;
+RUBY_EXTERN VALUE rb_mFileTest;
+RUBY_EXTERN VALUE rb_mGC;
+RUBY_EXTERN VALUE rb_mMath;
+RUBY_EXTERN VALUE rb_mProcess;
+
+RUBY_EXTERN VALUE rb_cObject;
+RUBY_EXTERN VALUE rb_cArray;
+RUBY_EXTERN VALUE rb_cBignum;
+RUBY_EXTERN VALUE rb_cBinding;
+RUBY_EXTERN VALUE rb_cClass;
+RUBY_EXTERN VALUE rb_cCont;
+RUBY_EXTERN VALUE rb_cDir;
+RUBY_EXTERN VALUE rb_cData;
+RUBY_EXTERN VALUE rb_cFalseClass;
+RUBY_EXTERN VALUE rb_cFile;
+RUBY_EXTERN VALUE rb_cFixnum;
+RUBY_EXTERN VALUE rb_cFloat;
+RUBY_EXTERN VALUE rb_cHash;
+RUBY_EXTERN VALUE rb_cInteger;
+RUBY_EXTERN VALUE rb_cIO;
+RUBY_EXTERN VALUE rb_cMatch;
+RUBY_EXTERN VALUE rb_cMethod;
+RUBY_EXTERN VALUE rb_cModule;
+RUBY_EXTERN VALUE rb_cNameErrorMesg;
+RUBY_EXTERN VALUE rb_cNilClass;
+RUBY_EXTERN VALUE rb_cNumeric;
+RUBY_EXTERN VALUE rb_cProc;
+RUBY_EXTERN VALUE rb_cRange;
+RUBY_EXTERN VALUE rb_cRegexp;
+RUBY_EXTERN VALUE rb_cStat;
+RUBY_EXTERN VALUE rb_cString;
+RUBY_EXTERN VALUE rb_cStruct;
+RUBY_EXTERN VALUE rb_cSymbol;
+RUBY_EXTERN VALUE rb_cThread;
+RUBY_EXTERN VALUE rb_cTime;
+RUBY_EXTERN VALUE rb_cTrueClass;
+RUBY_EXTERN VALUE rb_cUnboundMethod;
+
+RUBY_EXTERN VALUE rb_eException;
+RUBY_EXTERN VALUE rb_eStandardError;
+RUBY_EXTERN VALUE rb_eSystemExit;
+RUBY_EXTERN VALUE rb_eInterrupt;
+RUBY_EXTERN VALUE rb_eSignal;
+RUBY_EXTERN VALUE rb_eFatal;
+RUBY_EXTERN VALUE rb_eArgError;
+RUBY_EXTERN VALUE rb_eEOFError;
+RUBY_EXTERN VALUE rb_eIndexError;
+RUBY_EXTERN VALUE rb_eRangeError;
+RUBY_EXTERN VALUE rb_eIOError;
+RUBY_EXTERN VALUE rb_eRuntimeError;
+RUBY_EXTERN VALUE rb_eSecurityError;
+RUBY_EXTERN VALUE rb_eSystemCallError;
+RUBY_EXTERN VALUE rb_eThreadError;
+RUBY_EXTERN VALUE rb_eTypeError;
+RUBY_EXTERN VALUE rb_eZeroDivError;
+RUBY_EXTERN VALUE rb_eNotImpError;
+RUBY_EXTERN VALUE rb_eNoMemError;
+RUBY_EXTERN VALUE rb_eNoMethodError;
+RUBY_EXTERN VALUE rb_eFloatDomainError;
+RUBY_EXTERN VALUE rb_eLocalJumpError;
+RUBY_EXTERN VALUE rb_eSysStackError;
+RUBY_EXTERN VALUE rb_eRegexpError;
+
+RUBY_EXTERN VALUE rb_eScriptError;
+RUBY_EXTERN VALUE rb_eNameError;
+RUBY_EXTERN VALUE rb_eSyntaxError;
+RUBY_EXTERN VALUE rb_eLoadError;
+
+RUBY_EXTERN VALUE rb_stdin, rb_stdout, rb_stderr;
+RUBY_EXTERN VALUE ruby_errinfo;
+
+static inline VALUE
+#if defined(HAVE_PROTOTYPES)
+rb_class_of(VALUE obj)
+#else
+rb_class_of(obj)
+    VALUE obj;
+#endif
+{
+    if (FIXNUM_P(obj)) return rb_cFixnum;
+    if (obj == Qnil) return rb_cNilClass;
+    if (obj == Qfalse) return rb_cFalseClass;
+    if (obj == Qtrue) return rb_cTrueClass;
+    if (SYMBOL_P(obj)) return rb_cSymbol;
+
+    return RBASIC(obj)->klass;
+}
+
+static inline int
+#if defined(HAVE_PROTOTYPES)
+rb_type(VALUE obj)
+#else
+rb_type(obj)
+   VALUE obj;
+#endif
+{
+    if (FIXNUM_P(obj)) return T_FIXNUM;
+    if (obj == Qnil) return T_NIL;
+    if (obj == Qfalse) return T_FALSE;
+    if (obj == Qtrue) return T_TRUE;
+    if (obj == Qundef) return T_UNDEF;
+    if (SYMBOL_P(obj)) return T_SYMBOL;
+    return BUILTIN_TYPE(obj);
+}
+
+static inline int
+#if defined(HAVE_PROTOTYPES)
+rb_special_const_p(VALUE obj)
+#else
+rb_special_const_p(obj)
+    VALUE obj;
+#endif
+{
+    if (SPECIAL_CONST_P(obj)) return Qtrue;
+    return Qfalse;
+}
+
+#include "missing.h"
+#include "intern.h"
+
+#if defined(EXTLIB) && defined(USE_DLN_A_OUT)
+/* hook for external modules */
+static char *dln_libs_to_be_linked[] = { EXTLIB, 0 };
+#endif
+
+#if defined(HAVE_LIBPTHREAD)
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+typedef pthread_t rb_nativethread_t;
+# define NATIVETHREAD_CURRENT() pthread_self()
+# define NATIVETHREAD_EQUAL(t1,t2) pthread_equal((t1),(t2))
+# define HAVE_NATIVETHREAD
+
+# define NATIVETHREAD_KILL(th,sig) pthread_kill((th),(sig))
+# define HAVE_NATIVETHREAD_KILL
+#elif defined(_WIN32) || defined(_WIN32_WCE)
+typedef DWORD rb_nativethread_t;
+# define NATIVETHREAD_CURRENT() GetCurrentThreadId()
+# define NATIVETHREAD_EQUAL(t1,t2) ((t1) == (t2))
+# define HAVE_NATIVETHREAD
+#endif
+#ifdef HAVE_NATIVETHREAD
+int is_ruby_native_thread _((void));
+#else
+#define is_ruby_native_thread() (1)
+#endif
+#ifdef HAVE_NATIVETHREAD_KILL
+void ruby_native_thread_kill _((int));
+#endif
+
+#if defined(__cplusplus)
+#if 0
+{ /* satisfy cc-mode */
+#endif
+}  /* extern "C" { */
+#endif
+
+#endif /* ifndef RUBY_H */
diff --git a/ruby_1_8_6/rubyio.h b/ruby_1_8_6/rubyio.h
new file mode 100644
index 0000000000..ac28ead77b
--- /dev/null
+++ b/ruby_1_8_6/rubyio.h
@@ -0,0 +1,88 @@
+/**********************************************************************
+
+  rubyio.h -
+
+  $Author$
+  $Date$
+  created at: Fri Nov 12 16:47:09 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef RUBYIO_H
+#define RUBYIO_H
+
+#include <stdio.h>
+#include <errno.h>
+
+#if defined(HAVE_STDIO_EXT_H)
+#include <stdio_ext.h>
+#endif
+
+typedef struct OpenFile {
+    FILE *f;			/* stdio ptr for read/write */
+    FILE *f2;			/* additional ptr for rw pipes */
+    int mode;			/* mode flags */
+    int pid;			/* child's pid (for pipes) */
+    int lineno;			/* number of lines read */
+    char *path;			/* pathname for file */
+    void (*finalize) _((struct OpenFile*,int)); /* finalize proc */
+} OpenFile;
+
+#define FMODE_READABLE  1
+#define FMODE_WRITABLE  2
+#define FMODE_READWRITE 3
+#define FMODE_APPEND   64
+#define FMODE_CREATE  128
+#define FMODE_BINMODE   4
+#define FMODE_SYNC      8
+#define FMODE_WBUF     16
+#define FMODE_RBUF     32
+#define FMODE_WSPLIT  0x200
+#define FMODE_WSPLIT_INITIALIZED  0x400
+
+#define GetOpenFile(obj,fp) rb_io_check_closed((fp) = RFILE(rb_io_taint_check(obj))->fptr)
+
+#define MakeOpenFile(obj, fp) do {\
+    if (RFILE(obj)->fptr) {\
+	rb_io_close(obj);\
+	free(RFILE(obj)->fptr);\
+	RFILE(obj)->fptr = 0;\
+    }\
+    fp = 0;\
+    fp = RFILE(obj)->fptr = ALLOC(OpenFile);\
+    fp->f = fp->f2 = NULL;\
+    fp->mode = 0;\
+    fp->pid = 0;\
+    fp->lineno = 0;\
+    fp->path = NULL;\
+    fp->finalize = 0;\
+} while (0)
+
+#define GetReadFile(fptr) ((fptr)->f)
+#define GetWriteFile(fptr) (((fptr)->f2) ? (fptr)->f2 : (fptr)->f)
+
+FILE *rb_fopen _((const char*, const char*));
+FILE *rb_fdopen _((int, const char*));
+int rb_getc _((FILE*));
+long rb_io_fread _((char *, long, FILE *));
+long rb_io_fwrite _((const char *, long, FILE *));
+int  rb_io_mode_flags _((const char*));
+int  rb_io_modenum_flags _((int));
+void rb_io_check_writable _((OpenFile*));
+void rb_io_check_readable _((OpenFile*));
+void rb_io_fptr_finalize _((OpenFile*));
+void rb_io_synchronized _((OpenFile*));
+void rb_io_check_initialized _((OpenFile*));
+void rb_io_check_closed _((OpenFile*));
+int rb_io_wait_readable _((int));
+int rb_io_wait_writable _((int));
+void rb_io_set_nonblock(OpenFile *fptr);
+
+VALUE rb_io_taint_check _((VALUE));
+NORETURN(void rb_eof_error _((void)));
+
+void rb_read_check _((FILE*));
+int rb_read_pending _((FILE*));
+#endif
diff --git a/ruby_1_8_6/rubysig.h b/ruby_1_8_6/rubysig.h
new file mode 100644
index 0000000000..f716824877
--- /dev/null
+++ b/ruby_1_8_6/rubysig.h
@@ -0,0 +1,105 @@
+/**********************************************************************
+
+  rubysig.h -
+
+  $Author$
+  $Date$
+  created at: Wed Aug 16 01:15:38 JST 1995
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef SIG_H
+#define SIG_H
+#include <errno.h>
+
+#ifdef _WIN32
+typedef LONG rb_atomic_t;
+
+# define ATOMIC_TEST(var) InterlockedExchange(&(var), 0)
+# define ATOMIC_SET(var, val) InterlockedExchange(&(var), (val))
+# define ATOMIC_INC(var) InterlockedIncrement(&(var))
+# define ATOMIC_DEC(var) InterlockedDecrement(&(var))
+
+/* Windows doesn't allow interrupt while system calls */
+# define TRAP_BEG do {\
+    int saved_errno = 0;\
+    rb_atomic_t trap_immediate = ATOMIC_SET(rb_trap_immediate, 1)
+# define TRAP_END\
+    ATOMIC_SET(rb_trap_immediate, trap_immediate);\
+    saved_errno = errno;\
+    CHECK_INTS;\
+    errno = saved_errno;\
+} while (0)
+# define RUBY_CRITICAL(statements) do {\
+    rb_w32_enter_critical();\
+    statements;\
+    rb_w32_leave_critical();\
+} while (0)
+#else
+typedef int rb_atomic_t;
+
+# define ATOMIC_TEST(var) ((var) ? ((var) = 0, 1) : 0)
+# define ATOMIC_SET(var, val) ((var) = (val))
+# define ATOMIC_INC(var) (++(var))
+# define ATOMIC_DEC(var) (--(var))
+
+# define TRAP_BEG do {\
+    int saved_errno = 0;\
+    int trap_immediate = rb_trap_immediate;\
+    rb_trap_immediate = 1
+# define TRAP_END rb_trap_immediate = trap_immediate;\
+    saved_errno = errno;\
+    CHECK_INTS;\
+    errno = saved_errno;\
+} while (0)
+
+# define RUBY_CRITICAL(statements) do {\
+    int trap_immediate = rb_trap_immediate;\
+    rb_trap_immediate = 0;\
+    statements;\
+    rb_trap_immediate = trap_immediate;\
+} while (0)
+#endif
+RUBY_EXTERN rb_atomic_t rb_trap_immediate;
+
+RUBY_EXTERN int rb_prohibit_interrupt;
+#define DEFER_INTS (rb_prohibit_interrupt++)
+#define ALLOW_INTS do {\
+    rb_prohibit_interrupt--;\
+    CHECK_INTS;\
+} while (0)
+#define ENABLE_INTS (rb_prohibit_interrupt--)
+
+VALUE rb_with_disable_interrupt _((VALUE(*)(ANYARGS),VALUE));
+
+RUBY_EXTERN rb_atomic_t rb_trap_pending;
+void rb_trap_restore_mask _((void));
+
+RUBY_EXTERN int rb_thread_critical;
+void rb_thread_schedule _((void));
+#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
+RUBY_EXTERN int rb_thread_pending;
+# define CHECK_INTS do {\
+    if (!(rb_prohibit_interrupt || rb_thread_critical)) {\
+        if (rb_thread_pending) rb_thread_schedule();\
+	if (rb_trap_pending) rb_trap_exec();\
+    }\
+} while (0)
+#else
+/* pseudo preemptive thread switching */
+RUBY_EXTERN int rb_thread_tick;
+#define THREAD_TICK 500
+#define CHECK_INTS do {\
+    if (!(rb_prohibit_interrupt || rb_thread_critical)) {\
+	if (rb_thread_tick-- <= 0) {\
+	    rb_thread_tick = THREAD_TICK;\
+            rb_thread_schedule();\
+	}\
+    }\
+    if (rb_trap_pending) rb_trap_exec();\
+} while (0)
+#endif
+
+#endif
diff --git a/ruby_1_8_6/rubytest.rb b/ruby_1_8_6/rubytest.rb
new file mode 100755
index 0000000000..8ae637c00e
--- /dev/null
+++ b/ruby_1_8_6/rubytest.rb
@@ -0,0 +1,49 @@
+#! ./miniruby
+
+exit if defined?(CROSS_COMPILING)
+load './rbconfig.rb'
+include Config
+
+ruby = "./#{CONFIG['ruby_install_name']}#{CONFIG['EXEEXT']}"
+unless File.exist? ruby
+  print "#{ruby} is not found.\n"
+  print "Try `make' first, then `make test', please.\n"
+  exit false
+end
+
+if File.exist? CONFIG['LIBRUBY_SO']
+  case RUBY_PLATFORM
+  when /-hpux/
+    dldpath = "SHLIB_PATH"
+  when /-aix/
+    dldpath = "LIBPATH"
+  when /-beos/
+    dldpath = "LIBRARY_PATH"
+  when /-darwin/
+    dldpath = "DYLD_LIBRARY_PATH"
+  else
+    dldpath = "LD_LIBRARY_PATH"
+  end
+  x = ENV[dldpath]
+  x = x ? ".:"+x : "."
+  ENV[dldpath] = x
+end
+
+if /linux/ =~ RUBY_PLATFORM and File.exist? CONFIG['LIBRUBY_SO']
+  ENV["LD_PRELOAD"] = "./#{CONFIG['LIBRUBY_SO']}"
+end
+
+$stderr.reopen($stdout)
+error = ''
+
+srcdir = File.dirname(__FILE__)
+`#{ruby} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each do |line|
+  if line =~ /^end of test/
+    print "test succeeded\n"
+    exit 0
+  end
+  error << line if line =~ %r:^(sample/test.rb|not):
+end
+print error
+print "test failed\n"
+exit 1
diff --git a/ruby_1_8_6/runruby.rb b/ruby_1_8_6/runruby.rb
new file mode 100755
index 0000000000..cbc5e57582
--- /dev/null
+++ b/ruby_1_8_6/runruby.rb
@@ -0,0 +1,60 @@
+#!./miniruby
+
+while arg = ARGV[0]
+  break ARGV.shift if arg == '--'
+  /\A--([-\w]+)(?:=(.*))?\z/ =~ arg or break
+  arg, value = $1, $2
+  re = Regexp.new('\A'+arg.gsub(/\w+\b/, '\&\\w*')+'\z', "i")
+  case
+  when re =~ "srcdir"
+    srcdir = value
+  when re =~ "archdir"
+    archdir = value
+  when re =~ "extout"
+    extout = value
+  else
+    break
+  end
+  ARGV.shift
+end
+
+srcdir ||= File.dirname(__FILE__)
+archdir ||= '.'
+
+abs_archdir = File.expand_path(archdir)
+$:.unshift(abs_archdir)
+
+require 'rbconfig'
+config = Config::CONFIG
+
+ruby = File.join(archdir, config["RUBY_INSTALL_NAME"]+config['EXEEXT'])
+unless File.exist?(ruby)
+  abort "#{ruby} is not found.\nTry `make' first, then `make test', please.\n"
+end
+
+libs = [abs_archdir, File.expand_path("lib", srcdir)]
+if extout
+  abs_extout = File.expand_path(extout)
+  libs << File.expand_path("common", abs_extout) << File.expand_path(RUBY_PLATFORM, abs_extout)
+end
+config["bindir"] = abs_archdir
+ENV["RUBY"] = File.expand_path(ruby)
+ENV["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
+
+  libs << File.expand_path("ext", srcdir) << "-"
+ENV["RUBYLIB"] = $:.replace(libs).join(File::PATH_SEPARATOR)
+
+libruby_so = File.join(abs_archdir, config['LIBRUBY_SO'])
+if File.file?(libruby_so)
+  if e = config['LIBPATHENV'] and !e.empty?
+    ENV[e] = [abs_archdir, ENV[e]].compact.join(File::PATH_SEPARATOR)
+  end
+  if /linux/ =~ RUBY_PLATFORM
+    ENV["LD_PRELOAD"] = [libruby_so, ENV["LD_PRELOAD"]].compact.join(' ')
+  end
+end
+
+cmd = [ruby]
+cmd << "-rpurelib.rb"
+cmd.concat(ARGV)
+exec(*cmd)
diff --git a/ruby_1_8_6/sample/README b/ruby_1_8_6/sample/README
new file mode 100644
index 0000000000..53d16de335
--- /dev/null
+++ b/ruby_1_8_6/sample/README
@@ -0,0 +1,52 @@
+README		this file
+biorhythm.rb	biorhythm calculator
+cal.rb		cal(1) clone
+cbreak.rb	no echo done by ioctl
+clnt.rb		socket client
+dbmtest.rb	test for dbm
+dir.rb		directory access
+dualstack-fetch.rb	IPv6 demo
+dualstack-httpd.rb	IPv6 demo
+dstore.rb	object database on dbm
+eval.rb		simple evaluator
+export.rb	method access example
+exyacc.rb	extrace BNF from yacc file
+fact.rb		factorial calculator
+fib.awk		Fibonacci number (AWK)
+fib.pl		Fibonacci number (Perl)
+fib.py		Fibonacci number (Python)
+fib.rb		Fibonacci number (Ruby)
+fib.scm		Fibonacci number (Scheme)
+freq.rb		count word occurrence
+from.rb		scan mail spool
+fullpath.rb	convert ls -lR to fullpath format
+getopts.test	test fot getopt.rb
+goodfriday.rb	print various christian calendar event.
+io.rb		io test
+irb.rb		interactive ruby
+less.rb		front end for less
+list.rb		stupid object sample
+list2.rb	stupid object sample
+list3.rb	stupid object sample
+mine.rb		simple mine sweeper	
+mkproto.rb     extract prototype from C
+mpart.rb	split file int multi part
+mrshtest.rb	test marshal
+observ.rb	observer design pattern sample
+occur.pl	count word occurrence (Perl)
+occur.rb	count word occurrence (Ruby)
+occur2.rb	count word occurrence - another style
+philos.rb	famous dining philosophers
+pi.rb		calculate PI
+rcs.awk		random character stereogram (AWK)
+rcs.rb		random character stereogram (Ruby)
+rcs.dat		data for random character stereogram
+rd2html.rb	rd (Ruby Document) to HTML translator
+regx.rb		regular expression tester
+sieve.rb	sieve of Eratosthenes
+svr.rb		socket server
+test.rb		test suite used by `make test'
+time.rb		/usr/bin/time clone
+trojan.rb	simple tool to find file that may be trojan horse.
+tsvr.rb		socket server using thread
+uumerge.rb	merge files and uudecode them
diff --git a/ruby_1_8_6/sample/biorhythm.rb b/ruby_1_8_6/sample/biorhythm.rb
new file mode 100644
index 0000000000..c7e26c4fff
--- /dev/null
+++ b/ruby_1_8_6/sample/biorhythm.rb
@@ -0,0 +1,160 @@
+#!/usr/local/bin/ruby
+#
+#               biorhythm.rb - 
+#                       $Release Version: $
+#                       $Revision$
+#                       $Date$
+#                       by Yasuo OHBA(STAFS Development Room)
+#
+# --
+#
+#       
+#
+
+# probably based on:
+#
+# Newsgroups: comp.sources.misc,de.comp.sources.os9
+# From: fkk@stasys.sta.sub.org (Frank Kaefer)
+# Subject: v41i126:  br - Biorhythm v3.0, Part01/01
+# Message-ID: <1994Feb1.070616.15982@sparky.sterling.com>
+# Sender: kent@sparky.sterling.com (Kent Landfield)
+# Organization: Sterling Software
+# Date: Tue, 1 Feb 1994 07:06:16 GMT
+#
+# Posting-number: Volume 41, Issue 126
+# Archive-name: br/part01
+# Environment: basic, dos, os9
+
+include Math
+require "date.rb"
+require "parsearg.rb"
+require "parsedate.rb"
+
+def usage()
+  print "Usage:\n"
+  print "biorhythm.rb [options]\n"
+  print "  options...\n"
+  print "    -D YYYYMMDD(birthday)     : use default values.\n"
+  print "    --sdate | --date YYYYMMDD : use system date; use specified date.\n"
+  print "    --birthday YYYYMMDD       : specifies your birthday.\n"
+  print "    -v | -g                   : show values or graph.\n"
+  print "    --days DAYS               : graph range (only in effect for graphs).\n"
+  print "    --help                    : help\n"
+end
+$USAGE = 'usage'
+
+def printHeader(y, m, d, p, w)
+  print "\n>>> Biorhythm <<<\n"
+  printf "The birthday %04d.%02d.%02d is a %s\n", y, m, d, w
+  printf "Age in days: [%d]\n\n", p
+end
+
+def getPosition(z)
+  pi = Math::PI
+  z = Integer(z)
+  phys = (50.0 * (1.0 + sin((z / 23.0 - (z / 23)) * 360.0 * pi / 180.0))).to_i
+  emot = (50.0 * (1.0 + sin((z / 28.0 - (z / 28)) * 360.0 * pi / 180.0))).to_i
+  geist =(50.0 * (1.0 + sin((z / 33.0 - (z / 33)) * 360.0 * pi / 180.0))).to_i
+  return phys, emot, geist
+end
+
+def parsedate(s)
+  ParseDate::parsedate(s).values_at(0, 1, 2)
+end
+
+def name_of_week(date)
+  Date::DAYNAMES[date.wday]
+end
+
+#
+# main program
+#
+parseArgs(0, nil, "vg", "D:", "sdate", "date:", "birthday:", "days:")
+
+if $OPT_D
+  dd = Date.today
+  bd = Date.new(*parsedate($OPT_D))
+  ausgabeart = "g"
+else
+  if $OPT_birthday
+    bd = Date.new(*parsedate($OPT_birthday))
+  else
+    STDERR.print("Birthday                      (YYYYMMDD) : ")
+    unless (si = STDIN.gets.chop).empty?
+      bd = Date.new(*parsedate(si))
+    end
+  end
+  if !bd
+    STDERR.print "BAD Input Birthday!!\n"
+    exit()
+  end
+
+  if $OPT_sdate
+    dd = Date.today
+  elsif $OPT_date
+    dd = Date.new(*parsedate($OPT_date))
+  else
+    STDERR.print("Date        [<RETURN> for Systemdate] (YYYYMMDD) : ")
+    unless (si = STDIN.gets.chop).empty?
+      dd = Date.new(*parsedate(si))
+    end
+  end
+  dd ||= Date.today
+
+  if $OPT_v
+    ausgabeart = "v"
+  elsif $OPT_g
+    ausgabeart = "g"
+  else
+    STDERR.print("Values for today or Graph  (v/g) [default g] : ")
+    ausgabeart = STDIN.gets.chop
+  end
+end
+if ausgabeart == "v"
+  printHeader(bd.year, bd.month, bd.day, dd - bd, name_of_week(bd))
+  print "\n"
+  
+  phys, emot, geist = getPosition(dd - bd)
+  printf "Biorhythm:   %04d.%02d.%02d\n", dd.year, dd.month, dd.day
+  printf "Physical:    %d%%\n", phys
+  printf "Emotional:   %d%%\n", emot
+  printf "Mental:      %d%%\n", geist
+  print "\n"
+else
+  if $OPT_days
+    display_period = $OPT_days.to_i
+  elsif $OPT_D
+    display_period = 9
+  else
+    STDERR.printf("Graph for how many days     [default 10] : ")
+    display_period = STDIN.gets.chop
+    if display_period.empty?
+      display_period = 9
+    else
+      display_period = display_period.to_i - 1
+    end
+  end
+
+  printHeader(bd.year, bd.month, bd.day, dd - bd, name_of_week(bd))
+  print "                     P=physical, E=emotional, M=mental\n"
+  print "             -------------------------+-------------------------\n"
+  print "                     Bad Condition    |    Good Condition\n"
+  print "             -------------------------+-------------------------\n"
+  
+  (dd - bd).step(dd - bd + display_period) do |z|
+    phys, emot, geist = getPosition(z)
+    
+    printf "%04d.%02d.%02d : ", dd.year, dd.month, dd.day
+    p = (phys / 2.0 + 0.5).to_i
+    e = (emot / 2.0 + 0.5).to_i
+    g = (geist / 2.0 + 0.5).to_i
+    graph = "." * 51
+    graph[25] = ?|
+    graph[p] = ?P
+    graph[e] = ?E
+    graph[g] = ?M
+    print graph, "\n"
+    dd = dd + 1
+  end
+  print "             -------------------------+-------------------------\n\n"
+end
diff --git a/ruby_1_8_6/sample/cal.rb b/ruby_1_8_6/sample/cal.rb
new file mode 100644
index 0000000000..fa20352f71
--- /dev/null
+++ b/ruby_1_8_6/sample/cal.rb
@@ -0,0 +1,154 @@
+#! /usr/bin/env ruby
+
+# cal.rb: Written by Tadayoshi Funaba 1998-2004
+# $Id: cal.rb,v 2.7 2004-01-10 23:52:51+09 tadf Exp $
+
+require 'date'
+
+class Cal
+
+  START =
+    {
+    'cn' => true,    # China
+    'de' => 2342032, # Germany (protestant states)
+    'dk' => 2342032, # Denmark
+    'es' => 2299161, # Spain
+    'fi' => 2361390, # Finland
+    'fr' => 2299227, # France
+    'gb' => 2361222, # United Kingdom
+    'gr' => 2423868, # Greece
+    'hu' => 2301004, # Hungary
+    'it' => 2299161, # Italy
+    'jp' => true,    # Japan
+    'no' => 2342032, # Norway
+    'pl' => 2299161, # Poland
+    'pt' => 2299161, # Portugal
+    'ru' => 2421639, # Russia
+    'se' => 2361390, # Sweden
+    'us' => 2361222, # United States
+    'os' => false,   # (old style)
+    'ns' => true     # (new style)
+  }
+
+  DEFAULT_START = 'gb'
+
+  def initialize
+    opt_j; opt_m; opt_t; opt_y; opt_c
+  end
+
+  def opt_j(flag=false) @opt_j = flag end
+  def opt_m(flag=false) @opt_m = flag end
+  def opt_t(flag=false) @opt_t = flag end
+  def opt_y(flag=false) @opt_y = flag end
+
+  def opt_c(arg=DEFAULT_START) @start = START[arg] end
+
+  def set_params
+    @dw = if @opt_j then 3 else 2 end
+    @mw = (@dw + 1) * 7 - 1
+    @mn = if @opt_j then 2 else 3 end
+    @tw = (@mw + 2) * @mn - 2
+    @k  = if @opt_m then 1 else 0 end
+    @da = if @opt_j then :yday else :mday end
+  end
+
+  def pict(y, m)
+    d = (1..31).detect{|d| Date.valid_date?(y, m, d, @start)}
+    fi = Date.new(y, m, d, @start)
+    fi -= (fi.jd - @k + 1) % 7
+
+    ve  = (fi..fi +  6).collect{|cu|
+      %w(S M Tu W Th F S)[cu.wday]
+    }
+    ve += (fi..fi + 41).collect{|cu|
+      if cu.mon == m then cu.send(@da) end.to_s
+    }
+
+    ve = ve.collect{|e| e.rjust(@dw)}
+
+    gr = group(ve, 7)
+    gr = trans(gr) if @opt_t
+    ta = gr.collect{|xs| xs.join(' ')}
+
+    ca = %w(January February March April May June July
+	    August September October November December)[m - 1]
+    ca = ca + ' ' + y.to_s if not @opt_y
+    ca = ca.center(@mw)
+
+    ta.unshift(ca)
+  end
+
+  def group(xs, n)
+    (0..xs.size / n - 1).collect{|i| xs[i * n, n]}
+  end
+
+  def trans(xs)
+    (0..xs[0].size - 1).collect{|i| xs.collect{|x| x[i]}}
+  end
+
+  def stack(xs)
+    if xs.empty? then [] else xs[0] + stack(xs[1..-1]) end
+  end
+
+  def block(xs, n)
+    stack(group(xs, n).collect{|ys| trans(ys).collect{|zs| zs.join('  ')}})
+  end
+
+  def unlines(xs)
+    xs.collect{|x| x + "\n"}.join
+  end
+
+  def monthly(y, m)
+    unlines(pict(y, m))
+  end
+
+  def addmon(y, m, n)
+    y, m = (y * 12 + (m - 1) + n).divmod(12)
+    return y, m + 1
+  end
+
+  def yearly(y)
+    y.to_s.center(@tw) + "\n\n" +
+      unlines(block((0..11).collect{|n| pict(*addmon(y, 1, n))}, @mn)) + "\n"
+  end
+
+  def print(y, m)
+    set_params
+    if @opt_y then yearly(y) else monthly(y, m) end
+  end
+
+end
+
+if __FILE__ == $0
+
+  require 'getopts'
+
+  def usage
+    warn 'usage: cal [-c iso3166] [-jmty] [[month] year]'
+    exit 1
+  end
+
+  usage unless getopts('jmty', "c:#{Cal::DEFAULT_START}")
+
+  y, m = ARGV.values_at(1, 0).compact.collect{|x| x.to_i}
+  $OPT_y ||= (y and not m)
+
+  to = Date.today
+  y ||= to.year
+  m ||= to.mon
+
+  usage unless m >= 1 and m <= 12
+  usage unless y >= -4712
+  usage if Cal::START[$OPT_c].nil?
+
+  cal = Cal.new
+
+  cal.opt_j($OPT_j)
+  cal.opt_m($OPT_m)
+  cal.opt_t($OPT_t)
+  cal.opt_y($OPT_y)
+  cal.opt_c($OPT_c)
+
+  print cal.print(y, m)
+
+end
diff --git a/ruby_1_8_6/sample/cbreak.rb b/ruby_1_8_6/sample/cbreak.rb
new file mode 100644
index 0000000000..cbb15d2f41
--- /dev/null
+++ b/ruby_1_8_6/sample/cbreak.rb
@@ -0,0 +1,36 @@
+# ioctl example works on Sun
+
+CBREAK = 0x00000002
+ECHO = 0x00000008
+TIOCGETP = 0x40067408
+TIOCSETP = 0x80067409
+
+def cbreak ()
+  set_cbreak(TRUE)
+end
+
+def cooked ()
+  set_cbreak(FALSE)
+end
+
+def set_cbreak (on)
+  tty = "\0" * 256
+  STDIN.ioctl(TIOCGETP, tty)
+  ttys = tty.unpack("C4 S")
+  if on
+    ttys[4] |= CBREAK
+    ttys[4] &= ~ECHO
+  else
+    ttys[4] &= ~CBREAK
+    ttys[4] |= ECHO
+  end
+  tty = ttys.pack("C4 S")
+  STDIN.ioctl(TIOCSETP, tty)
+end
+cbreak();
+
+print("this is no-echo line: ");
+readline().print
+cooked();
+print("this is echo line: ");
+readline()
diff --git a/ruby_1_8_6/sample/clnt.rb b/ruby_1_8_6/sample/clnt.rb
new file mode 100644
index 0000000000..0f3d17bf19
--- /dev/null
+++ b/ruby_1_8_6/sample/clnt.rb
@@ -0,0 +1,21 @@
+# socket example - client side
+# usage: ruby clnt.rb [host] port
+
+require "socket"
+
+if ARGV.length >= 2
+  host = ARGV.shift
+else
+  host = "localhost"
+end
+print("Trying ", host, " ...")
+STDOUT.flush
+s = TCPSocket.open(host, ARGV.shift)
+print(" done\n")
+print("addr: ", s.addr.join(":"), "\n")
+print("peer: ", s.peeraddr.join(":"), "\n")
+while line = gets()
+  s.write(line)
+  print(s.readline)
+end
+s.close
diff --git a/ruby_1_8_6/sample/dbmtest.rb b/ruby_1_8_6/sample/dbmtest.rb
new file mode 100644
index 0000000000..c77cc2065b
--- /dev/null
+++ b/ruby_1_8_6/sample/dbmtest.rb
@@ -0,0 +1,14 @@
+# ruby dbm acess
+require "dbm"
+
+d = DBM.open("test")
+keys = d.keys
+if keys.length > 0 then
+  for k in keys; print k, "\n"; end
+  for v in d.values; print v, "\n"; end
+else
+  d['foobar'] = 'FB'
+  d['baz'] = 'BZ'
+  d['quux'] = 'QX'
+end
+
diff --git a/ruby_1_8_6/sample/dir.rb b/ruby_1_8_6/sample/dir.rb
new file mode 100644
index 0000000000..b627383946
--- /dev/null
+++ b/ruby_1_8_6/sample/dir.rb
@@ -0,0 +1,12 @@
+# directory access
+# list all files but .*/*~/*.o
+dirp = Dir.open(".")
+for f in dirp
+  case f
+  when /^\./, /~$/, /\.o/
+    # do not print
+  else
+    print f, "\n"
+  end
+end
+dirp.close
diff --git a/ruby_1_8_6/sample/drb/README.rd b/ruby_1_8_6/sample/drb/README.rd
new file mode 100644
index 0000000000..5cf1f51913
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/README.rd
@@ -0,0 +1,56 @@
+= Sample scripts
+
+* array and iteretor
+  * darray.rb --- server
+  * darrayc.rb --- client
+
+* simple chat
+  * dchats.rb --- server
+  * dchatc.rb --- client
+
+* distributed chasen (for Japanese)
+  * dhasen.rb --- server
+  * dhasenc.rb --- client
+
+* simple log server
+  * dlogd.rb --- server
+  * dlogc.rb --- client
+
+* Queue server, and DRbUnknown demo
+  * dqueue.rb --- server
+  * dqin.rb --- client. push DQEntry objects.
+  * dqout.rb --- client. pop DQEntry objects.
+  * dqlib.rb --- define DQEntry
+
+* IdConv customize demo: reference by name 
+  * name.rb --- server
+  * namec.rb --- client
+
+* extserv
+  * extserv_test.rb
+
+* IdConv customize demo 2: using TimerIdConv
+  * holders.rb --- server
+  * holderc.rb --- client
+
+* rinda, remote tuplespace
+  * rinda_ts.rb --- TupleSpace server.
+  * rindas.rb --- provide simple service via TupleSpace.
+  * rindac.rb --- service user
+
+* observer
+  cdbiff - ((<URI:http://namazu.org/~satoru/cdbiff/>))
+  * dbiff.rb --- dcdbiff server
+  * dcdbiff.rb --- dcdbiff client
+
+* drbssl
+  * drbssl_s.rb
+  * drbssl_c.rb
+  
+* add DRbProtocl
+  * http0.rb
+  * http0serv.rb
+
+* Rinda::Ring
+  * ring_place.rb
+  * ring_echo.rb
diff --git a/ruby_1_8_6/sample/drb/README.rd.ja b/ruby_1_8_6/sample/drb/README.rd.ja
new file mode 100644
index 0000000000..04143b9ad5
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/README.rd.ja
@@ -0,0 +1,59 @@
+= サンプルスクリプト
+
+* Arrayをリモートから利用してイテレータを試す。
+  * darray.rb --- server
+  * darrayc.rb --- client
+
+* 簡易チャット
+  * dchats.rb --- server
+  * dchatc.rb --- client
+
+* 分散chasen
+  * dhasen.rb --- server
+  * dhasenc.rb --- client
+
+* 簡易ログサーバ
+  * dlogd.rb --- server
+  * dlogc.rb --- client
+
+* Queueサーバ。
+  クライアントdqin.rbはQueueサーバの知らないオブジェクト(DQEntry)を
+  pushするがDRbUnknownによりクライアントdqout.rbがpopできる。
+  * dqueue.rb --- server
+  * dqin.rb --- client。DQEntryオブジェクトをpushする
+  * dqout.rb --- client。DQEntryオブジェクトをpopする
+  * dqlib.rb --- DQEntryを定義したライブラリ
+
+* 名前による参照
+  IdConvをカスタマイズしてidでなく名前で参照する例
+  * name.rb --- server
+  * namec.rb --- client
+
+* extservのサンプル
+  * extserv_test.rb
+
+* TimerIdConvの使用例
+  * holders.rb --- server。ruby -d hodlers.rbとするとTimerIdConvを使用する。
+  * holderc.rb --- client
+
+* rinda.rbの使用例
+  * rinda_ts.rb --- TupleSpaceサーバ。
+  * rindac.rb --- TupleSpaceのclientでアプリケーションのclient
+  * rindas.rb --- TupleSpaceのclientでアプリケーションのserver
+
+* observerの使用例
+  cdbiff - ((<URI:http://namazu.org/~satoru/cdbiff/>))
+  * dbiff.rb --- dcdbiff server
+  * dcdbiff.rb --- dcdbiff client
+
+* drbsslの使用例
+  * drbssl_s.rb
+  * drbssl_c.rb
+
+* DRbProtoclの追加例
+  * http0.rb
+  * http0serv.rb
+
+* ringの使用例
+  * ring_place.rb
+  * ring_echo.rb
diff --git a/ruby_1_8_6/sample/drb/darray.rb b/ruby_1_8_6/sample/drb/darray.rb
new file mode 100644
index 0000000000..95ee01ff03
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/darray.rb
@@ -0,0 +1,12 @@
+=begin
+ distributed Ruby --- Array
+ 	Copyright (c) 1999-2001 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+
+here = ARGV.shift
+DRb.start_service(here, [1, 2, "III", 4, "five", 6])
+puts DRb.uri
+DRb.thread.join
+
diff --git a/ruby_1_8_6/sample/drb/darrayc.rb b/ruby_1_8_6/sample/drb/darrayc.rb
new file mode 100644
index 0000000000..6f5ff6bb5d
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/darrayc.rb
@@ -0,0 +1,59 @@
+=begin
+ distributed Ruby --- Array client
+ 	Copyright (c) 1999-2001 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+
+there = ARGV.shift || raise("usage: #{$0} <server_uri>")
+
+DRb.start_service(nil, nil)
+ro = DRbObject.new(nil, there)
+p ro.size
+
+puts "# collect"
+a = ro.collect { |x|
+  x + x
+}
+p a
+
+puts "# find"
+p ro.find { |x| x.kind_of? String }
+  
+puts "# each, break"
+ro.each do |x|
+  next if x == "five"
+  puts x
+end
+
+puts "# each, break"
+ro.each do |x|
+  break if x == "five"
+  puts x
+end
+
+puts "# each, next"
+ro.each do |x|
+  next if x == "five"
+  puts x
+end
+
+puts "# each, redo"
+count = 0
+ro.each do |x|
+  count += 1
+  puts count
+  redo if count == 3
+end
+
+puts "# each, retry"
+retried = false
+ro.each do |x|
+  puts x
+  if x == 4 && !retried
+    puts 'retry'
+    retried = true
+    retry
+  end
+end
+
diff --git a/ruby_1_8_6/sample/drb/dbiff.rb b/ruby_1_8_6/sample/drb/dbiff.rb
new file mode 100644
index 0000000000..8faef50b07
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/dbiff.rb
@@ -0,0 +1,51 @@
+#
+# dbiff.rb - distributed cdbiff (server)
+#  * original: cdbiff by Satoru Takabayashi <http://namazu.org/~satoru/cdbiff>
+
+require 'drb/drb'
+require 'drb/eq'
+require 'drb/observer'
+
+class Biff
+  include DRb::DRbObservable
+
+  def initialize(filename, interval)
+    super()
+    @filename = filename
+    @interval = interval
+  end
+
+  def run
+    last = Time.now
+    while true
+      begin 
+	sleep(@interval)
+	current = File::mtime(@filename)
+	if current > last
+	  changed
+	  begin
+	    notify_observers(@filename, current) 
+	  rescue Error
+	  end
+	  last = current
+	end
+      rescue
+	next
+      end
+    end
+  end
+end
+
+def main
+  filename = "/var/mail/#{ENV['USER']}"
+  interval = 15
+  uri = 'druby://:19903'
+
+  biff = Biff.new(filename, interval)
+
+  DRb.start_service(uri, biff)
+  biff.run
+end
+
+main
+
diff --git a/ruby_1_8_6/sample/drb/dcdbiff.rb b/ruby_1_8_6/sample/drb/dcdbiff.rb
new file mode 100644
index 0000000000..6a24680c33
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/dcdbiff.rb
@@ -0,0 +1,43 @@
+#
+# dcdbiff.rb - distributed cdbiff (client)
+#  * original: cdbiff by Satoru Takabayashi <http://namazu.org/~satoru/cdbiff>
+
+require 'drb/drb'
+require 'drb/eq'
+
+class Notify
+  include DRbUndumped
+
+  def initialize(biff, command)
+    @biff = biff
+    @command = command
+
+    @biff.add_observer(self)
+  end
+
+  def update(filename, time)
+    p [filename, time] if $DEBUG
+    system(@command)
+  end
+
+  def done
+    begin
+      @biff.delete_observer(self)
+    rescue
+    end
+  end
+end
+
+def main
+  command = 'eject'
+  uri = 'druby://localhost:19903'
+
+  DRb.start_service
+  biff = DRbObject.new(nil, uri)
+  notify = Notify.new(biff, command)
+
+  trap("INT"){ notify.done }
+  DRb.thread.join
+end
+
+main
diff --git a/ruby_1_8_6/sample/drb/dchatc.rb b/ruby_1_8_6/sample/drb/dchatc.rb
new file mode 100644
index 0000000000..b506f5bbba
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/dchatc.rb
@@ -0,0 +1,41 @@
+=begin
+ distributed Ruby --- chat client
+ 	Copyright (c) 1999-2000 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+
+class ChatClient
+  include DRbUndumped  
+
+  def initialize(name)
+    @name = name
+    @key = nil
+  end
+  attr_reader(:name)
+  attr_accessor(:key)
+
+  def message(there, str)
+    raise 'invalid key' unless @key == there
+    puts str
+  end
+end
+
+if __FILE__ == $0
+  begin
+    there = ARGV.shift
+    name = ARGV.shift
+    raise "usage" unless (there and name)
+  rescue
+    $stderr.puts("usage: #{$0} <server_uri> <your_name>")
+    exit 1
+  end
+  DRb.start_service
+  ro = DRbObject.new(nil, there)
+
+  chat = ChatClient.new(name)
+  entry = ro.add_member(chat)
+  while gets
+    entry.say($_)
+  end
+end
diff --git a/ruby_1_8_6/sample/drb/dchats.rb b/ruby_1_8_6/sample/drb/dchats.rb
new file mode 100644
index 0000000000..012dfeeebe
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/dchats.rb
@@ -0,0 +1,70 @@
+=begin
+ distributed Ruby --- chat server
+ 	Copyright (c) 1999-2000 Masatoshi SEKI 
+=end
+require 'thread'
+require 'drb/drb'
+
+class ChatEntry
+  include DRbUndumped
+
+  def initialize(server, there)
+    @server = server
+    @there = there
+    @name = there.name
+    @key = there.key = Time.now
+  end
+  attr :name, true
+  attr :there
+
+  def say(str)
+    @server.distribute(@there, str)
+  end
+
+  def listen(str)
+    @there.message(@key, str)
+  end
+end
+
+
+class ChatServer
+  def initialize
+    @mutex = Mutex.new
+    @members = {}
+  end
+
+  def add_member(there)
+    client = ChatEntry.new(self, there)
+    @mutex.synchronize do
+      @members[there] = client
+    end
+    client
+  end
+
+  def distribute(there, str)
+    name = @members[there].name
+    msg = "<#{name}> #{str}"
+    msg2 = ">#{name}< #{str}"
+    @mutex.synchronize do
+      for m in @members.keys
+	begin
+	  if m == there
+	    @members[m].listen(msg2)
+	   else
+	    @members[m].listen(msg)
+	  end
+	rescue
+	  p $!
+	  @members.delete(m)
+	end
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+  here = ARGV.shift
+  DRb.start_service(here, ChatServer.new)
+  puts DRb.uri
+  DRb.thread.join
+end
diff --git a/ruby_1_8_6/sample/drb/dhasen.rb b/ruby_1_8_6/sample/drb/dhasen.rb
new file mode 100644
index 0000000000..fb1724afa3
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/dhasen.rb
@@ -0,0 +1,42 @@
+=begin
+ distributed Ruby --- dRuby Sample Server --- chasen server
+ 	Copyright (c) 1999-2001 Masatoshi SEKI 
+=end
+
+=begin
+ How to play.
+
+ Terminal 1
+ | % ruby dhasen.rb 
+ | druby://yourhost:7640
+
+ Terminal 2
+ | % ruby dhasenc.rb druby://yourhost:7640
+
+=end
+
+require 'drb/drb'
+require 'chasen'
+require 'thread'
+
+class Dhasen
+  include DRbUndumped
+
+  def initialize
+    @mutex = Mutex.new
+  end
+
+  def sparse(str, *arg)
+    @mutex.synchronize do
+      Chasen.getopt(*arg)
+      Chasen.sparse(str)
+    end
+  end
+end
+
+if __FILE__ == $0
+  DRb.start_service(nil, Dhasen.new)
+  puts DRb.uri
+  DRb.thread.join
+end
+
diff --git a/ruby_1_8_6/sample/drb/dhasenc.rb b/ruby_1_8_6/sample/drb/dhasenc.rb
new file mode 100644
index 0000000000..8114e9228d
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/dhasenc.rb
@@ -0,0 +1,13 @@
+=begin
+ distributed Ruby --- dRuby Sample Client -- chasen client
+ 	Copyright (c) 1999-2001 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+
+there = ARGV.shift || raise("usage: #{$0} <server_uri>")
+DRb.start_service
+dhasen = DRbObject.new(nil, there)
+
+print dhasen.sparse("本日は、晴天なり。", "-F", '(%BB %m %M)\n', "-j")
+print dhasen.sparse("本日は、晴天なり。", "-F", '(%m %M)\n')
diff --git a/ruby_1_8_6/sample/drb/dlogc.rb b/ruby_1_8_6/sample/drb/dlogc.rb
new file mode 100644
index 0000000000..c75bc7b520
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/dlogc.rb
@@ -0,0 +1,16 @@
+=begin
+ distributed Ruby --- Log test
+ 	Copyright (c) 1999-2001 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+
+there = ARGV.shift || raise("usage: #{$0} <server_uri>")
+
+DRb.start_service
+ro = DRbObject.new(nil, there)
+ro.log(123)
+ro.log("hello")
+sleep 2
+ro.log("wakeup")
+
diff --git a/ruby_1_8_6/sample/drb/dlogd.rb b/ruby_1_8_6/sample/drb/dlogd.rb
new file mode 100644
index 0000000000..9f9aa2fd56
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/dlogd.rb
@@ -0,0 +1,39 @@
+=begin
+ distributed Ruby --- Log server
+ 	Copyright (c) 1999-2000 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+require 'thread'
+
+class Logger
+  def initialize(fname)
+    @fname = fname.to_s
+    @fp = File.open(@fname, "a+")
+    @queue = Queue.new
+    @th = Thread.new { self.flush }
+  end
+
+  def log(str)
+    @queue.push("#{Time.now}\t" + str.to_s)
+  end
+
+  def flush
+    begin
+      while(1)
+	@fp.puts(@queue.pop)
+	@fp.flush
+      end
+    ensure
+      @fp.close
+    end
+  end
+end
+
+if __FILE__ == $0
+  here = ARGV.shift
+  DRb.start_service(here, Logger.new('/usr/tmp/dlogd.log'))
+  puts DRb.uri
+  DRb.thread.join
+end
+
diff --git a/ruby_1_8_6/sample/drb/dqin.rb b/ruby_1_8_6/sample/drb/dqin.rb
new file mode 100644
index 0000000000..3ba1caa80c
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/dqin.rb
@@ -0,0 +1,13 @@
+=begin
+ distributed Ruby --- store
+ 	Copyright (c) 1999-2000 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+require 'dqlib'
+
+there = ARGV.shift || raise("usage: #{$0} <server_uri>")
+
+DRb.start_service
+queue = DRbObject.new(nil, there)
+queue.push(DQEntry.new(DRb.uri))
diff --git a/ruby_1_8_6/sample/drb/dqlib.rb b/ruby_1_8_6/sample/drb/dqlib.rb
new file mode 100644
index 0000000000..75f2e6115b
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/dqlib.rb
@@ -0,0 +1,14 @@
+class DQEntry
+  def initialize(name)
+    @name = name
+  end
+
+  def greeting
+    "Hello, This is #{@name}."
+  end
+  alias to_s greeting
+end
+
+if __FILE__ == $0
+  puts DQEntry.new('DQEntry')
+end
diff --git a/ruby_1_8_6/sample/drb/dqout.rb b/ruby_1_8_6/sample/drb/dqout.rb
new file mode 100644
index 0000000000..4700e55cf7
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/dqout.rb
@@ -0,0 +1,14 @@
+=begin
+ distributed Ruby --- fetch
+ 	Copyright (c) 1999-2000 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+require 'dqlib'
+
+there = ARGV.shift || raise("usage: #{$0} <server_uri>")
+
+DRb.start_service
+queue = DRbObject.new(nil, there)
+entry = queue.pop
+puts entry.greeting
diff --git a/ruby_1_8_6/sample/drb/dqueue.rb b/ruby_1_8_6/sample/drb/dqueue.rb
new file mode 100644
index 0000000000..a5a43655fd
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/dqueue.rb
@@ -0,0 +1,12 @@
+=begin
+ distributed Ruby --- Queue
+ 	Copyright (c) 1999-2000 Masatoshi SEKI 
+=end
+
+require 'thread'
+require 'drb/drb'
+
+DRb.start_service(nil, Queue.new)
+puts DRb.uri
+DRb.thread.join
+
diff --git a/ruby_1_8_6/sample/drb/drbc.rb b/ruby_1_8_6/sample/drb/drbc.rb
new file mode 100644
index 0000000000..00132b46c8
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/drbc.rb
@@ -0,0 +1,45 @@
+=begin
+ distributed Ruby --- dRuby Sample Client
+ 	Copyright (c) 1999-2000 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+
+class DRbEx2
+  include DRbUndumped
+
+  def initialize(n)
+    @n = n
+  end
+
+  def to_i
+    @n.to_i
+  end
+end
+
+if __FILE__ == $0
+  there = ARGV.shift
+  unless there
+    $stderr.puts("usage: #{$0} <server_uri>")
+    exit 1
+  end
+
+  DRb.start_service()
+  ro = DRbObject.new_with_uri(there)
+
+  puts ro
+  p ro.to_a
+  puts ro.hello
+  p ro.hello
+  puts ro.sample(DRbEx2.new(1), 2, 3)
+  puts ro.sample(1, ro.sample(DRbEx2.new(1), 2, 3), DRbEx2.new(3))
+
+  begin
+    ro.err
+  rescue DRb::DRbUnknownError
+    p $!
+    p $!.unknown
+  rescue RuntimeError
+    p $!
+  end
+end
diff --git a/ruby_1_8_6/sample/drb/drbch.rb b/ruby_1_8_6/sample/drb/drbch.rb
new file mode 100644
index 0000000000..495ff1c346
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/drbch.rb
@@ -0,0 +1,48 @@
+=begin
+ distributed Ruby --- dRuby Sample Client
+ 	Copyright (c) 1999-2000 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+require 'drb/http'
+
+class DRbEx2
+  include DRbUndumped
+
+  def initialize(n)
+    @n = n
+  end
+
+  def to_i
+    @n.to_i
+  end
+end
+
+if __FILE__ == $0
+  there = ARGV.shift
+  unless there
+    $stderr.puts("usage: #{$0} <server_uri>")
+    exit 1
+  end
+
+  DRb::DRbConn.proxy_map['x68k'] = 'http://x68k/~mas/http_cgi.rb'
+
+  DRb.start_service()
+  ro = DRbObject.new(nil, there)
+
+  puts ro
+  p ro.to_a
+  puts ro.hello
+  p ro.hello
+  puts ro.sample(DRbEx2.new(1), 2, 3)
+  puts ro.sample(1, ro.sample(DRbEx2.new(1), 2, 3), DRbEx2.new(3))
+
+  begin
+    ro.err
+  rescue DRb::DRbUnknownError
+    p $!
+    p $!.unknown
+  rescue RuntimeError
+    p $!
+  end
+end
diff --git a/ruby_1_8_6/sample/drb/drbm.rb b/ruby_1_8_6/sample/drb/drbm.rb
new file mode 100644
index 0000000000..74a15a4696
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/drbm.rb
@@ -0,0 +1,60 @@
+=begin
+ multiple DRbServer
+ 	Copyright (c) 1999-2002 Masatoshi SEKI 
+=end
+
+=begin
+ How to play.
+
+ Terminal 1
+ | % ruby drbm.rb 
+ | druby://yourhost:7640 druby://yourhost:7641
+
+ Terminal 2
+ | % ruby drbmc.rb druby://yourhost:7640 druby://yourhost:7641
+ | [#<DRb::DRbObject .... @uri="druby://yourhost:7640">, "FOO"]
+ | [#<DRb::DRbObject .... @uri="druby://yourhost:7641">, "FOO"]
+
+=end
+
+require 'drb/drb'
+
+class Hoge
+  include DRbUndumped
+  def initialize(s)
+    @str = s
+  end
+  
+  def to_s
+    @str
+  end
+end
+
+class Foo
+  def initialize(s='FOO')
+    @hoge = Hoge.new(s)
+  end
+
+  def hello
+    @hoge
+  end
+end
+
+class Bar < Foo
+  def initialize(foo)
+    @hoge = foo.hello
+  end
+end
+
+
+if __FILE__ == $0
+  foo = Foo.new
+  s1 = DRb::DRbServer.new('druby://:7640', foo)
+  s2 = DRb::DRbServer.new('druby://:7641', Bar.new(foo))
+
+  puts "#{s1.uri} #{s2.uri}"
+
+  s1.thread.join
+  s2.thread.join
+end
+
diff --git a/ruby_1_8_6/sample/drb/drbmc.rb b/ruby_1_8_6/sample/drb/drbmc.rb
new file mode 100644
index 0000000000..c654fcea05
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/drbmc.rb
@@ -0,0 +1,22 @@
+=begin
+  multiple DRbServer client
+ 	Copyright (c) 1999-2002 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+
+if __FILE__ == $0
+  s1 = ARGV.shift
+  s2 = ARGV.shift
+  unless s1 && s2
+    $stderr.puts("usage: #{$0} <server_uri1> <server_uri2>")
+    exit 1
+  end
+
+  DRb.start_service()
+  r1 = DRbObject.new(nil, s1)
+  r2 = DRbObject.new(nil, s2)
+
+  p [r1.hello, r1.hello.to_s]
+  p [r2.hello, r2.hello.to_s]
+end
diff --git a/ruby_1_8_6/sample/drb/drbs-acl.rb b/ruby_1_8_6/sample/drb/drbs-acl.rb
new file mode 100644
index 0000000000..151dd945d8
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/drbs-acl.rb
@@ -0,0 +1,51 @@
+=begin
+ distributed Ruby --- dRuby Sample Server
+ 	Copyright (c) 1999-2000 Masatoshi SEKI 
+=end
+
+=begin
+ How to play.
+
+ Terminal 1
+ | % ruby drbs.rb 
+ | druby://yourhost:7640
+
+ Terminal 2
+ | % ruby drbc.rb druby://yourhost:7640
+ | "hello"
+ | 6
+ | 10
+
+=end
+
+require 'drb/drb'
+require 'acl'
+
+class DRbEx
+  def initialize
+    @hello = 'hello'
+  end
+
+  def hello
+    info = Thread.current['DRb']
+    p info['socket'].peeraddr if info
+    @hello
+  end
+
+  def sample(a, b, c)
+    a.to_i + b.to_i + c.to_i
+  end
+end
+
+if __FILE__ == $0
+  acl = ACL.new(%w(deny all
+                   allow 192.168.1.*
+                   allow localhost))
+  
+  DRb.install_acl(acl)
+
+  DRb.start_service(nil, DRbEx.new)
+  puts DRb.uri
+  DRb.thread.join
+end
+
diff --git a/ruby_1_8_6/sample/drb/drbs.rb b/ruby_1_8_6/sample/drb/drbs.rb
new file mode 100644
index 0000000000..b76e283c80
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/drbs.rb
@@ -0,0 +1,64 @@
+=begin
+ distributed Ruby --- dRuby Sample Server
+ 	Copyright (c) 1999-2000,2002 Masatoshi SEKI 
+=end
+
+=begin
+ How to play.
+
+ Terminal 1
+ | % ruby drbs.rb 
+ | druby://yourhost:7640
+
+ Terminal 2
+ | % ruby drbc.rb druby://yourhost:7640
+ | "hello"
+ | ....
+
+=end
+
+require 'drb/drb'
+
+class DRbEx
+  include DRbUndumped
+
+  def initialize
+    @hello = 'hello'
+  end
+
+  def hello
+    cntxt = Thread.current['DRb']
+    if cntxt
+      p cntxt['server'].uri
+      p cntxt['client'].peeraddr
+    end
+    Foo::Unknown.new
+  end
+
+  def err
+    raise FooError
+  end
+
+  def sample(a, b, c)
+    a.to_i + b.to_i + c.to_i
+  end
+end
+
+class Foo
+  class Unknown
+  end
+end
+
+class FooError < RuntimeError
+end
+
+if __FILE__ == $0
+  DRb.start_service(ARGV.shift || 'druby://:7640', DRbEx.new)
+  puts DRb.uri
+  Thread.new do
+    sleep 10
+    DRb.stop_service
+  end
+  DRb.thread.join
+end
+
diff --git a/ruby_1_8_6/sample/drb/drbssl_c.rb b/ruby_1_8_6/sample/drb/drbssl_c.rb
new file mode 100644
index 0000000000..65112f6e78
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/drbssl_c.rb
@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+require 'drb'
+require 'drb/ssl'
+
+there = ARGV.shift || "drbssl://localhost:3456"
+
+config = Hash.new
+config[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER
+config[:SSLVerifyCallback] = lambda{|ok,x509_store|
+  p [ok, x509_store.error_string]
+  true
+}
+
+DRb.start_service(nil,nil,config)
+h = DRbObject.new(nil, there)
+while line = gets
+  p h.hello(line.chomp)
+end
diff --git a/ruby_1_8_6/sample/drb/drbssl_s.rb b/ruby_1_8_6/sample/drb/drbssl_s.rb
new file mode 100644
index 0000000000..4d96f591d4
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/drbssl_s.rb
@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'drb'
+require 'drb/ssl'
+
+here = ARGV.shift || "drbssl://localhost:3456"
+
+class HelloWorld
+  include DRbUndumped
+
+  def hello(name)
+    "Hello, #{name}."
+  end
+end
+
+config = Hash.new
+config[:verbose] = true
+begin
+  data = open("sample.key"){|io| io.read }
+  config[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(data)
+  data = open("sample.crt"){|io| io.read }
+  config[:SSLCertificate] = OpenSSL::X509::Certificate.new(data)
+rescue
+  $stderr.puts "Switching to use self-signed certificate"
+  config[:SSLCertName] =
+    [ ["C","JP"], ["O","Foo.DRuby.Org"], ["CN", "Sample"] ]
+end
+
+DRb.start_service(here, HelloWorld.new, config)
+puts DRb.uri
+DRb.thread.join
diff --git a/ruby_1_8_6/sample/drb/extserv_test.rb b/ruby_1_8_6/sample/drb/extserv_test.rb
new file mode 100644
index 0000000000..83d871a6a2
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/extserv_test.rb
@@ -0,0 +1,80 @@
+=begin
+ dRuby sample
+ 	Copyright (c) 2000 Masatoshi SEKI 
+
+= How to play
+
+* Terminal 1
+  
+  % ruby -I. extserv_test.rb server
+  druby://yourhost:12345
+
+* Terminal 2
+
+  % ruby -I. extserv_test.rb druby://yourhost:12345
+  ...
+
+=end
+
+require 'drb/drb'
+
+def ARGV.shift
+  it = super()
+  raise "usage:\nserver: #{$0} server [<uri>]\nclient: #{$0} [quit] <uri>" unless it
+  it
+end
+
+class Foo
+  include DRbUndumped
+  
+  def initialize(str)
+    @str = str
+  end
+  
+  def hello(it)
+    "#{it}: #{self}"
+  end
+
+  def to_s
+    @str
+  end
+end
+
+cmd = ARGV.shift
+case cmd
+when 'itest1', 'itest2'
+  require 'drb/extserv'
+
+  front = Foo.new(cmd)
+  server = DRb::DRbServer.new(nil, front)
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift, server)
+  server.thread.join
+
+when 'server'
+  require 'drb/extservm'
+
+  DRb::ExtServManager.command['itest1'] = "ruby -I. #{$0} itest1"
+  DRb::ExtServManager.command['itest2'] = "ruby -I. #{$0} itest2"
+  
+  s = DRb::ExtServManager.new
+  DRb.start_service(ARGV.shift, s)
+  puts DRb.uri
+  DRb.thread.join
+
+
+else
+  uri = (cmd == 'quit') ? ARGV.shift : cmd
+
+  DRb.start_service
+  s = DRbObject.new(nil, uri)
+  t1 = s.service('itest1').front
+  puts t1
+  t2 = s.service('itest2').front
+  puts t2
+  puts t1.hello(t2)
+  if (cmd == 'quit') 
+    s.service('itest1').stop_service
+    s.service('itest2').stop_service
+  end
+end
+
diff --git a/ruby_1_8_6/sample/drb/gw_ct.rb b/ruby_1_8_6/sample/drb/gw_ct.rb
new file mode 100644
index 0000000000..0622784018
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/gw_ct.rb
@@ -0,0 +1,29 @@
+require 'drb/drb'
+
+class Foo
+  include DRbUndumped
+
+  def foo(n)
+    n + n
+  end
+
+  def bar(n)
+    yield(n) + yield(n)
+  end
+end
+
+DRb.start_service(nil)
+puts DRb.uri
+
+ro = DRbObject.new(nil, ARGV.shift)
+ro[:tcp] = Foo.new
+gets
+
+it = ro[:unix]
+p [it, it.foo(1)]
+gets
+
+p it.bar('2') {|n| n * 3}
+gets
+
+
diff --git a/ruby_1_8_6/sample/drb/gw_cu.rb b/ruby_1_8_6/sample/drb/gw_cu.rb
new file mode 100644
index 0000000000..0e5ed36b8f
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/gw_cu.rb
@@ -0,0 +1,28 @@
+require 'drb/drb'
+require 'drb/unix'
+
+class Foo
+  include DRbUndumped
+
+  def foo(n)
+    n + n
+  end
+
+  def bar(n)
+    yield(n) + yield(n)
+  end
+end
+
+DRb.start_service('drubyunix:', nil)
+puts DRb.uri
+
+ro = DRbObject.new(nil, ARGV.shift)
+ro[:unix] = Foo.new
+gets
+
+it = ro[:tcp]
+p [it, it.foo(1)]
+gets
+
+p it.bar('2') {|n| n * 3}
+gets
diff --git a/ruby_1_8_6/sample/drb/gw_s.rb b/ruby_1_8_6/sample/drb/gw_s.rb
new file mode 100644
index 0000000000..c2bea0baad
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/gw_s.rb
@@ -0,0 +1,10 @@
+require 'drb/drb'
+require 'drb/unix'
+require 'drb/gw'
+
+DRb.install_id_conv(DRb::GWIdConv.new)
+gw = DRb::GW.new
+s1 = DRb::DRbServer.new(ARGV.shift, gw)
+s2 = DRb::DRbServer.new(ARGV.shift, gw)
+s1.thread.join
+s2.thread.join
diff --git a/ruby_1_8_6/sample/drb/holderc.rb b/ruby_1_8_6/sample/drb/holderc.rb
new file mode 100644
index 0000000000..8dd72ebd11
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/holderc.rb
@@ -0,0 +1,22 @@
+require 'drb/drb'
+
+begin
+  there = ARGV.shift || raise
+rescue
+  $stderr.puts("usage: #{$0} <server_uri>")
+  exit 1
+end
+
+DRb.start_service()
+ro = DRbObject.new(nil, there)
+
+ary = []
+10.times do 
+  ary.push(ro.gen)
+end
+
+sleep 5 if $DEBUG
+
+ary.each do |e|
+  p e.sample([1])
+end
diff --git a/ruby_1_8_6/sample/drb/holders.rb b/ruby_1_8_6/sample/drb/holders.rb
new file mode 100644
index 0000000000..2d9974f3fc
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/holders.rb
@@ -0,0 +1,63 @@
+=begin
+= How to play.
+
+==  with timeridconv:
+  % ruby -d holders.rb
+  druby://yourhost:1234
+
+  % ruby holderc.rb druby://yourhost:1234
+
+
+==  without timeridconv:
+  % ruby holders.rb
+  druby://yourhost:1234
+
+  % ruby holderc.rb druby://yourhost:1234
+=end
+  
+
+require 'drb/drb'
+
+class DRbEx3
+  include DRbUndumped
+
+  def initialize(n)
+    @v = n
+  end
+
+  def sample(list)
+    sum = 0
+    list.each do |e|
+      sum += e.to_i
+    end
+    @v * sum
+  end
+end
+
+class DRbEx4
+  include DRbUndumped
+  
+  def initialize
+    @curr = 1
+  end
+  
+  def gen
+    begin
+      @curr += 1
+      DRbEx3.new(@curr)
+    ensure
+      GC.start
+    end
+  end
+end
+
+if __FILE__ == $0
+  if $DEBUG
+    require 'drb/timeridconv'
+    DRb.install_id_conv(DRb::TimerIdConv.new(2))
+  end
+
+  DRb.start_service(nil, DRbEx4.new)
+  puts DRb.uri
+  DRb.thread.join
+end
diff --git a/ruby_1_8_6/sample/drb/http0.rb b/ruby_1_8_6/sample/drb/http0.rb
new file mode 100644
index 0000000000..7649925282
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/http0.rb
@@ -0,0 +1,77 @@
+require 'drb/drb'
+require 'net/http'
+require 'uri'
+
+module DRb
+  module HTTP0
+    class StrStream
+      def initialize(str='')
+	@buf = str
+      end
+      attr_reader :buf
+
+      def read(n)
+	begin
+	  return @buf[0,n]
+	ensure
+	  @buf[0,n] = ''
+	end
+      end
+
+      def write(s)
+	@buf.concat s
+      end
+    end
+
+    def self.uri_option(uri, config)
+      return uri, nil
+    end
+
+    def self.open(uri, config)
+      unless /^http:/ =~ uri
+	raise(DRbBadScheme, uri) unless uri =~ /^http:/
+	raise(DRbBadURI, 'can\'t parse uri:' + uri)
+      end
+      ClientSide.new(uri, config)
+    end
+
+    class ClientSide
+      def initialize(uri, config)
+	@uri = uri
+	@res = nil
+	@config = config
+	@msg = DRbMessage.new(config)
+	@proxy = ENV['HTTP_PROXY']
+      end
+
+      def close; end
+      def alive?; false; end
+      
+      def send_request(ref, msg_id, *arg, &b)
+	stream = StrStream.new
+	@msg.send_request(stream, ref, msg_id, *arg, &b)
+	@reply_stream = StrStream.new
+	post(@uri, stream.buf)
+      end
+      
+      def recv_reply
+	@msg.recv_reply(@reply_stream)
+      end
+
+      def post(url, data)
+	it = URI.parse(url)
+	path = [(it.path=='' ? '/' : it.path), it.query].compact.join('?')
+	http = Net::HTTP.new(it.host, it.port)
+	sio = StrStream.new
+	http.post(path, data, {'Content-Type'=>'application/octetstream;'}) do |str|
+	  sio.write(str)
+	  if @config[:load_limit] < sio.buf.size
+	    raise TypeError, 'too large packet' 
+	  end
+	end
+	@reply_stream = sio
+      end
+    end
+  end
+  DRbProtocol.add_protocol(HTTP0)
+end
diff --git a/ruby_1_8_6/sample/drb/http0serv.rb b/ruby_1_8_6/sample/drb/http0serv.rb
new file mode 100644
index 0000000000..100d126b8f
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/http0serv.rb
@@ -0,0 +1,119 @@
+require 'webrick'
+require 'drb/drb'
+require 'drb/http0'
+require 'thread'
+
+module DRb
+  module HTTP0
+    
+    def self.open_server(uri, config)
+      unless /^http:/ =~ uri
+	raise(DRbBadScheme, uri) unless uri =~ /^http:/
+	raise(DRbBadURI, 'can\'t parse uri:' + uri)
+      end
+      Server.new(uri, config)
+    end
+
+    class Callback < WEBrick::HTTPServlet::AbstractServlet
+      def initialize(config, drb)
+	@config = config
+	@drb = drb
+	@queue = Queue.new
+      end
+      
+      def do_POST(req, res)
+	@req = req
+	@res = res
+	@drb.push(self)
+	@res.body = @queue.pop
+	@res['content-type'] = 'application/octet-stream;'
+      end
+      
+      def req_body
+	@req.body
+      end
+
+      def reply(body)
+	@queue.push(body)
+      end
+      
+      def close
+	@queue.push('')
+      end
+    end
+
+    class Server
+      def initialize(uri, config)
+	@uri = uri
+	@config = config
+	@queue = Queue.new
+	setup_webrick(uri)
+      end
+      attr_reader :uri
+
+      def close
+	@server.shutdown if @server
+	@server = nil
+      end
+
+      def push(callback)
+	@queue.push(callback)
+      end
+
+      def accept
+	client = @queue.pop
+	ServerSide.new(client, @config)
+      end
+
+      def setup_webrick(uri)
+	logger = WEBrick::Log::new($stderr, WEBrick::Log::FATAL)
+	u = URI.parse(uri)
+	s = WEBrick::HTTPServer.new(:Port => u.port,
+				    :AddressFamily => Socket::AF_INET,
+				    :BindAddress => u.host,
+				    :Logger => logger,
+				    :ServerType => Thread)
+	s.mount(u.path, Callback, self)
+	@server = s
+	s.start
+      end
+    end
+    
+    class ServerSide
+      def initialize(callback, config)
+	@callback = callback
+	@config = config
+	@msg = DRbMessage.new(@config)
+	@req_stream = StrStream.new(@callback.req_body)
+      end
+      
+      def close
+	@callback.close if @callback
+	@callback = nil
+      end
+
+      def alive?; false; end
+
+      def recv_request
+	begin
+	  @msg.recv_request(@req_stream)
+	rescue
+	  close
+	  raise $!
+	end
+      end
+
+      def send_reply(succ, result)
+	begin
+	  return unless @callback
+	  stream = StrStream.new
+	  @msg.send_reply(stream, succ, result)
+	  @callback.reply(stream.buf)
+	rescue
+	  close
+	  raise $!
+	end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/sample/drb/name.rb b/ruby_1_8_6/sample/drb/name.rb
new file mode 100644
index 0000000000..86b478fbec
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/name.rb
@@ -0,0 +1,117 @@
+=begin
+ distributed Ruby --- NamedObject Sample
+ 	Copyright (c) 2000-2001 Masatoshi SEKI 
+=end
+
+=begin
+How to play.
+
+* start server 
+ Terminal 1
+ | % ruby name.rb druby://yourhost:7640
+ | druby://yourhost:7640
+ | [return] to exit
+
+* start client
+ Terminal 2
+ | % ruby namec.rb druby://yourhost:7640
+ | #<DRb::DRbObject:0x40164174 @uri="druby://yourhost:7640", @ref="seq">
+ | #<DRb::DRbObject:0x40163c9c @uri="druby://yourhost:7640", @ref="mutex">
+ | 1
+ | 2
+ | [return] to continue
+
+* restart server
+ Terminal 1
+ type [return]
+ | % ruby name.rb druby://yourhost:7640
+ | druby://yourhost:7640
+ | [return] to exit
+
+* continue client 
+ Terminal 2
+ type [return] 
+ | 1
+ | 2
+=end
+
+require 'thread.rb'
+require 'drb/drb'
+
+module DRbNamedObject
+  DRbNAMEDICT = {}
+  attr_reader(:drb_name)
+
+  def drb_name=(name)
+    @drb_name = name
+    Thread.exclusive do 
+      raise(IndexError, name) if DRbNAMEDICT[name]
+      DRbNAMEDICT[name] = self
+    end
+  end
+end
+
+class DRbNamedIdConv < DRb::DRbIdConv
+  def initialize
+    @dict = DRbNamedObject::DRbNAMEDICT
+  end
+
+  def to_obj(ref)
+    @dict.fetch(ref) do super end
+  end
+
+  def to_id(obj)
+    if obj.kind_of? DRbNamedObject
+      return obj.drb_name 
+    else
+      return super
+    end
+  end
+end
+
+class Seq
+  include DRbUndumped
+  include DRbNamedObject
+
+  def initialize(v, name)
+    @counter = v
+    @mutex = Mutex.new
+    self.drb_name = name
+  end
+
+  def next_value
+    @mutex.synchronize do
+      @counter += 1
+      return @counter
+    end
+  end
+end
+
+class Front
+  def initialize
+    seq = Seq.new(0, 'seq')
+    mutex = Mutex.new
+    mutex.extend(DRbUndumped)
+    mutex.extend(DRbNamedObject)
+    mutex.drb_name = 'mutex'
+    @name = {}
+    @name['seq'] = seq
+    @name['mutex'] = mutex
+  end
+    
+  def [](k)
+    @name[k]
+  end
+end
+
+if __FILE__ == $0
+  uri = ARGV.shift
+
+  name_conv = DRbNamedIdConv.new
+  
+  DRb.install_id_conv(name_conv)
+  DRb.start_service(uri, Front.new)
+  puts DRb.uri
+  DRb.thread.join
+end
+
diff --git a/ruby_1_8_6/sample/drb/namec.rb b/ruby_1_8_6/sample/drb/namec.rb
new file mode 100644
index 0000000000..f6db6f3022
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/namec.rb
@@ -0,0 +1,36 @@
+=begin
+ distributed Ruby --- NamedObject Sample Client
+ 	Copyright (c) 2000-2001 Masatoshi SEKI 
+=end
+
+require 'drb/drb'
+
+begin
+  there = ARGV.shift || raise
+rescue
+  puts "usage: #{$0} <server_uri>"
+  exit 1
+end
+
+DRb.start_service()
+ro = DRbObject.new(nil, there)
+
+seq = ro["seq"]
+mutex = ro["mutex"]
+
+p seq
+p mutex
+
+mutex.synchronize do
+  p seq.next_value
+  p seq.next_value
+end
+
+puts '[return] to continue'
+gets
+
+mutex.synchronize do
+  p seq.next_value
+  p seq.next_value
+end
+
diff --git a/ruby_1_8_6/sample/drb/old_tuplespace.rb b/ruby_1_8_6/sample/drb/old_tuplespace.rb
new file mode 100644
index 0000000000..3e13b92ee1
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/old_tuplespace.rb
@@ -0,0 +1,214 @@
+#!/usr/local/bin/ruby
+# TupleSpace
+# Copyright (c) 1999-2000 Masatoshi SEKI
+# You can redistribute it and/or modify it under the same terms as Ruby.
+
+require 'thread'
+
+class TupleSpace
+  class Template
+    def initialize(list)
+      @list = list
+      @check_idx = []
+      @list.each_with_index do |x, i|
+	@check_idx.push i if x
+      end
+      @size = @list.size
+    end
+
+    attr :size
+    alias length size
+
+    def match(tuple)
+      return nil if tuple.size != self.size
+      @check_idx.each do |i|
+	unless @list[i] === tuple[i]
+	  return false
+	end
+      end
+      return true
+    end
+  end
+
+  def initialize
+    @que = {}
+    @waiting = {}
+    @que.taint		# enable tainted comunication
+    @waiting.taint
+    self.taint
+  end
+
+  def wakeup_waiting(tuple)
+    sz = tuple.length
+    return nil unless @waiting[sz]
+
+    x = nil
+    i = -1
+    found = false
+    @waiting[sz] = @waiting[sz].find_all { |x|
+      if x[0].match(tuple)
+	begin
+	  x[1].wakeup
+	rescue ThreadError
+	end
+	false
+      else
+	true
+      end
+    }
+  end
+
+  def put_waiting(template, thread)
+    sz = template.length
+    @waiting[sz] = [] unless @waiting[sz]
+    @waiting[sz].push([Template.new(template), thread])
+  end
+  private :wakeup_waiting
+  private :put_waiting
+
+  def get_que(template)
+    sz = template.length
+    return nil unless @que[sz]
+
+    template = Template.new(template)
+
+    x = nil
+    i = -1
+    found = false
+    @que[sz].each_with_index do |x, i|
+      if template.match(x)
+	found = true
+	break
+      end
+    end
+    return nil unless found
+    
+    @que[sz].delete_at(i)
+
+    return x
+  end
+
+  def put_que(tuple)
+    sz = tuple.length
+    @que[sz] = [] unless @que[sz]
+    @que[sz].push tuple
+  end
+  private :get_que
+  private :put_que
+
+  def out(*tuples)
+    tuples.each do |tuple|
+      Thread.critical = true
+      put_que(tuple)
+      wakeup_waiting(tuple)
+      Thread.critical = false
+    end
+  end
+  alias put out
+  alias write out
+
+  def in(template, non_block=false)
+    begin
+      loop do
+	Thread.critical = true
+	tuple = get_que(template)
+	unless tuple
+	  if non_block
+	    raise ThreadError, "queue empty"
+	  end
+	  put_waiting(template, Thread.current)
+	  Thread.stop
+	else
+	  return tuple
+	end
+      end
+    ensure
+      Thread.critical = false
+    end
+  end
+  alias get in
+  alias take in
+
+  def rd(template, non_block=false)
+    tuple = self.in(template, non_block)
+    out(tuple)
+    tuple
+  end
+  alias read rd
+
+  def mv(dest, template, non_block=false)
+    tuple = self.in(template, non_block)
+    begin
+      dest.out(tuple)
+    rescue
+      self.out(tuple)
+    end
+  end
+  alias move mv
+end
+
+if __FILE__ == $0
+  ts = TupleSpace.new
+  clients = []
+  servers = []
+
+  def server(ts, id)
+    Thread.start {
+      loop do
+	req = ts.in(['req', nil, nil])
+	ac = req[1]
+	num = req[2]
+	sleep id
+	ts.out([ac, id, num, num * num])
+      end
+    }
+  end
+
+  def client(ts, n)
+    Thread.start {
+      ac = Object.new
+      tuples = (1..10).collect { |i| 
+	['req', ac, i * 10 + n]
+      }
+      ts.out(*tuples)
+      ts.out(tuples[0])
+      puts "out: #{n}"
+      11.times do |i|
+	ans = ts.in([ac, nil, nil, nil])
+	puts "client(#{n}) server(#{ans[1]}) #{ans[2]} #{ans[3]}"
+      end
+    }
+  end
+
+  def watcher(ts)
+    Thread.start {
+      loop do
+	begin
+	  sleep 1
+	  p ts.rd(['req', nil, nil], true)
+	rescue ThreadError
+	  puts "'req' not found."
+	end
+      end
+    }
+  end
+
+  (0..3).each do |n|
+    servers.push(server(ts, n))
+  end
+
+  (1..6).each do |n|
+    clients.push(client(ts, n))
+  end
+
+  (1..3).each do 
+    watcher(ts)
+  end
+
+  clients.each do |t|
+    t.join
+  end
+end
+
+
+
diff --git a/ruby_1_8_6/sample/drb/rinda_ts.rb b/ruby_1_8_6/sample/drb/rinda_ts.rb
new file mode 100644
index 0000000000..6f2fae5c0f
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/rinda_ts.rb
@@ -0,0 +1,7 @@
+require 'drb/drb'
+require 'rinda/tuplespace'
+
+uri = ARGV.shift
+DRb.start_service(uri, Rinda::TupleSpace.new)
+puts DRb.uri
+DRb.thread.join
diff --git a/ruby_1_8_6/sample/drb/rindac.rb b/ruby_1_8_6/sample/drb/rindac.rb
new file mode 100644
index 0000000000..72be09deaf
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/rindac.rb
@@ -0,0 +1,17 @@
+require 'drb/drb'
+require 'rinda/rinda'
+
+uri = ARGV.shift || raise("usage: #{$0} <server_uri>")
+
+DRb.start_service
+ts = Rinda::TupleSpaceProxy.new(DRbObject.new(nil, uri))
+
+(1..10).each do |n|
+  ts.write(['sum', DRb.uri, n])
+end
+
+(1..10).each do |n|
+  ans = ts.take(['ans', DRb.uri, n, nil])
+  p [ans[2], ans[3]]
+end
+
diff --git a/ruby_1_8_6/sample/drb/rindas.rb b/ruby_1_8_6/sample/drb/rindas.rb
new file mode 100644
index 0000000000..9fd9ada2d1
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/rindas.rb
@@ -0,0 +1,18 @@
+require 'drb/drb'
+require 'rinda/rinda'
+
+def do_it(v)
+  puts "do_it(#{v})"
+  v + v
+end
+
+uri = ARGV.shift || raise("usage: #{$0} <server_uri>")
+
+DRb.start_service
+ts = Rinda::TupleSpaceProxy.new(DRbObject.new(nil, uri))
+
+while true
+  r = ts.take(['sum', nil, nil])
+  v = do_it(r[2])
+  ts.write(['ans', r[1], r[2], v])
+end
diff --git a/ruby_1_8_6/sample/drb/ring_echo.rb b/ruby_1_8_6/sample/drb/ring_echo.rb
new file mode 100644
index 0000000000..0633aa839a
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/ring_echo.rb
@@ -0,0 +1,30 @@
+require 'drb/drb'
+require 'drb/eq'
+require 'rinda/ring'
+require 'thread'
+
+class RingEcho
+  include DRbUndumped
+  def initialize(name)
+    @name = name
+  end
+  
+  def echo(str)
+    "#{@name}: #{str}"
+  end
+end
+
+DRb.start_service
+
+renewer = Rinda::SimpleRenewer.new
+
+finder = Rinda::RingFinger.new
+ts = finder.lookup_ring_any
+ts.read_all([:name, :RingEcho, nil, nil]).each do |tuple|
+  p tuple[2]
+  puts tuple[2].echo('Hello, World') rescue nil
+end
+ts.write([:name, :RingEcho, RingEcho.new(DRb.uri), ''], renewer)
+
+DRb.thread.join
+
diff --git a/ruby_1_8_6/sample/drb/ring_inspect.rb b/ruby_1_8_6/sample/drb/ring_inspect.rb
new file mode 100644
index 0000000000..c096cd7034
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/ring_inspect.rb
@@ -0,0 +1,30 @@
+require 'rinda/ring'
+require 'drb/drb'
+
+class Inspector
+  def initialize
+  end
+
+  def primary
+    Rinda::RingFinger.primary
+  end
+
+  def list_place
+    Rinda::RingFinger.to_a
+  end
+
+  def list(idx = -1)
+    if idx < 0
+      ts = primary
+    else
+      ts = list_place[idx]
+      raise "RingNotFound" unless ts
+    end
+    ts.read_all([:name, nil, nil, nil])
+  end
+end
+
+def main
+  DRb.start_service
+  r = Inspector.new
+end
diff --git a/ruby_1_8_6/sample/drb/ring_place.rb b/ruby_1_8_6/sample/drb/ring_place.rb
new file mode 100644
index 0000000000..0ceef7c65a
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/ring_place.rb
@@ -0,0 +1,25 @@
+require 'drb/drb'
+require 'rinda/ring'
+require 'rinda/tuplespace'
+
+unless $DEBUG
+  # Run as a daemon...
+  exit!( 0 ) if fork
+  Process.setsid
+  exit!( 0 ) if fork
+end
+
+DRb.start_service(ARGV.shift)
+
+ts = Rinda::TupleSpace.new
+place = Rinda::RingServer.new(ts)
+
+if $DEBUG
+  puts DRb.uri
+  DRb.thread.join
+else
+  STDIN.reopen('/dev/null')
+  STDOUT.reopen('/dev/null', 'w')
+  STDERR.reopen('/dev/null', 'w')
+  DRb.thread.join
+end
diff --git a/ruby_1_8_6/sample/drb/simpletuple.rb b/ruby_1_8_6/sample/drb/simpletuple.rb
new file mode 100644
index 0000000000..3ae9208c79
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/simpletuple.rb
@@ -0,0 +1,91 @@
+#!/usr/local/bin/ruby
+# SimpleTupleSpace
+# Copyright (c) 1999-2000 Masatoshi SEKI
+# You can redistribute it and/or modify it under the same terms as Ruby.
+
+require 'thread'
+
+class SimpleTupleSpace
+  def initialize
+    @hash = {}
+    @waiting = {}
+    @hash.taint
+    @waiting.taint
+    self.taint
+  end
+   
+  def out(key, obj)
+    Thread.critical = true
+    @hash[key] ||= []
+    @waiting[key] ||= []
+    @hash[key].push obj
+    begin
+      t = @waiting[key].shift
+      @waiting.delete(key) if @waiting[key].length == 0
+      t.wakeup if t
+    rescue ThreadError
+      retry
+    ensure
+      Thread.critical = false
+    end
+  end
+
+  def in(key)
+    Thread.critical = true
+    @hash[key] ||= []
+    @waiting[key] ||= []
+    begin
+      loop do
+        if @hash[key].length == 0
+          @waiting[key].push Thread.current
+          Thread.stop
+        else
+          return @hash[key].shift
+        end
+      end
+    ensure
+      @hash.delete(key) if @hash[key].length == 0
+      Thread.critical = false
+    end
+  end
+end  
+
+if __FILE__ == $0
+  ts = SimpleTupleSpace.new
+  clients = []
+  servers = []
+
+  def server(ts)
+    Thread.start {
+      loop do
+	req = ts.in('req')
+	ac = req[0]
+	num = req[1]
+	ts.out(ac, num * num)
+      end
+    }
+  end
+
+  def client(ts, n)
+    Thread.start {
+      ac = Object.new
+      ts.out('req', [ac, n])
+      ans = ts.in(ac)
+      puts "#{n}: #{ans}"
+    }
+  end
+
+  3.times do 
+    servers.push(server(ts))
+  end
+
+  (1..6).each do |n|
+    clients.push(client(ts, n))
+  end
+
+  clients.each do |t|
+    t.join
+  end
+end
+
+
diff --git a/ruby_1_8_6/sample/drb/speedc.rb b/ruby_1_8_6/sample/drb/speedc.rb
new file mode 100644
index 0000000000..14d526d48d
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/speedc.rb
@@ -0,0 +1,21 @@
+#!/usr/local/bin/ruby
+
+uri = ARGV.shift || raise("usage: #{$0} URI")
+N = (ARGV.shift || 100).to_i
+
+case uri
+when /^tcpromp:/, /^unixromp:/
+  require 'romp'
+
+  client = ROMP::Client.new(uri, false)
+  foo = client.resolve("foo")
+when /^druby:/
+  require 'drb/drb'
+  
+  DRb.start_service
+  foo = DRbObject.new(nil, uri)
+end
+
+N.times do |n|
+  foo.foo(n)
+end
diff --git a/ruby_1_8_6/sample/drb/speeds.rb b/ruby_1_8_6/sample/drb/speeds.rb
new file mode 100644
index 0000000000..76b4b29dba
--- /dev/null
+++ b/ruby_1_8_6/sample/drb/speeds.rb
@@ -0,0 +1,31 @@
+class Foo
+  attr_reader :i
+  def initialize
+    @i = 0
+  end
+  
+  def foo(i)
+    @i = i
+    i + i
+  end
+end
+
+# server = ROMP::Server.new('tcpromp://localhost:4242', nil, true)
+
+uri = ARGV.shift || raise("usage: #{$0} URI")
+foo = Foo.new
+
+case uri
+when /^tcpromp:/, /^unixromp:/
+  require 'romp'
+
+  server = ROMP::Server.new(uri, nil, true)
+  server.bind(foo, "foo")
+
+when /^druby:/
+  require 'drb/drb'
+  
+  DRb.start_service(uri, Foo.new)
+end
+
+DRb.thread.join
diff --git a/ruby_1_8_6/sample/dualstack-fetch.rb b/ruby_1_8_6/sample/dualstack-fetch.rb
new file mode 100644
index 0000000000..1897a3d8e9
--- /dev/null
+++ b/ruby_1_8_6/sample/dualstack-fetch.rb
@@ -0,0 +1,48 @@
+# simple webpage fetcher
+
+# The code demonstrates how a multi-protocol client should be written.
+# TCPSocket is using getaddrinfo() internally, so there should be no problem.
+
+require "socket"
+
+if ARGV.size != 1
+  STDERR.print "requires URL\n"
+  exit
+end
+
+url = ARGV[0]
+if url !~ /^http:\/\/([^\/]+)(\/.*)$/
+  STDERR.print "only http with full hostname is supported\n"
+  exit
+end
+
+# split URL into host, port and path
+hostport = $1
+path = $2
+if (hostport =~ /^(.*):([0-9]+)$/)
+  host = $1
+  port = $2
+else
+  host = hostport
+  port = 80
+end
+if host =~ /^\[(.*)\]$/
+  host = $1
+end
+
+#STDERR.print "url=<#{ARGV[0]}>\n"
+#STDERR.print "host=<#{host}>\n"
+#STDERR.print "port=<#{port}>\n"
+#STDERR.print "path=<#{path}>\n"
+
+STDERR.print "conntecting to #{host} port #{port}\n"
+c = TCPSocket.new(host, port)
+dest = Socket.getnameinfo(c.getpeername,
+		Socket::NI_NUMERICHOST|Socket::NI_NUMERICSERV)
+STDERR.print "conntected to #{dest[0]} port #{dest[1]}\n"
+c.print "GET #{path} HTTP/1.0\n"
+c.print "Host: #{host}\n"
+c.print "\n"
+while c.gets
+  print
+end
diff --git a/ruby_1_8_6/sample/dualstack-httpd.rb b/ruby_1_8_6/sample/dualstack-httpd.rb
new file mode 100644
index 0000000000..893b29feba
--- /dev/null
+++ b/ruby_1_8_6/sample/dualstack-httpd.rb
@@ -0,0 +1,55 @@
+# simple httpd
+
+# The code demonstrates how a multi-protocol daemon should be written.
+
+require "socket"
+require "thread"
+
+port = 8888
+res = Socket.getaddrinfo(nil, port, nil, Socket::SOCK_STREAM, nil, Socket::AI_PASSIVE)
+sockpool = []
+names = []
+threads = []
+
+res.each do |i|
+  s = TCPserver.new(i[3], i[1])
+  n = Socket.getnameinfo(s.getsockname, Socket::NI_NUMERICHOST|Socket::NI_NUMERICSERV).join(" port ")
+  sockpool.push s
+  names.push n
+end
+
+(0 .. sockpool.size - 1).each do |i|
+  mysock = sockpool[i]
+  myname = names[i]
+  STDERR.print "socket #{mysock} started, address #{myname}\n"
+  threads[i] = Thread.start do		# Thread.start cannot be used here!
+    ls = mysock	# copy to dynamic variable
+    t = Thread.current
+    STDERR.print "socket #{myname} listener started, pid #{$$} thread #{t}\n"
+    while TRUE
+      as = ls.accept
+      Thread.start do
+	STDERR.print "socket #{myname} accepted, thread ", Thread.current, "\n"
+	s = as	# copy to dynamic variable
+	str = ''
+	while line = s.gets
+	  break if line == "\r\n" or line == "\n"
+	  str << line
+	end
+	STDERR.print "socket #{myname} got string\n"
+	s.write("HTTP/1.0 200 OK\n")
+	s.write("Content-type: text/plain\n\n")
+	s.write("this is test: my name is #{myname}, you sent:\n")
+	s.write("---start\n")
+	s.write(str)
+	s.write("---end\n")
+	s.close
+	STDERR.print "socket #{myname} processed, thread ", Thread.current, " terminating\n"
+      end
+    end
+  end
+end
+
+for t in threads
+  t.join
+end
diff --git a/ruby_1_8_6/sample/eval.rb b/ruby_1_8_6/sample/eval.rb
new file mode 100644
index 0000000000..90b839e873
--- /dev/null
+++ b/ruby_1_8_6/sample/eval.rb
@@ -0,0 +1,41 @@
+line = ''
+indent = 0
+$stdout.sync = TRUE
+print "ruby> "
+loop do
+  l = gets
+  if l.nil?
+    break if line.empty?
+  else
+    line += l
+    if l =~ /,\s*$/
+      print "ruby| "
+      next
+    end
+    if l =~ /^\s*(class|module|def|if|unless|case|while|until|for|begin)\b[^_]/
+      indent += 1
+    end
+    if l =~ /^\s*end\b[^_]/
+      indent -= 1
+    end
+    if l =~ /\{\s*(\|.*\|)?\s*$/
+      indent += 1
+    end
+    if l =~ /^\s*\}/
+      indent -= 1
+    end
+    if indent > 0
+      print "ruby| "
+      next
+    end
+  end
+  begin
+    print eval(line).inspect, "\n"
+  rescue ScriptError, StandardError
+    printf "ERR: %s\n", $! || 'exception raised'
+  end
+  break if l.nil?
+  line = ''
+  print "ruby> "
+end
+print "\n"
diff --git a/ruby_1_8_6/sample/export.rb b/ruby_1_8_6/sample/export.rb
new file mode 100644
index 0000000000..949e5b10bf
--- /dev/null
+++ b/ruby_1_8_6/sample/export.rb
@@ -0,0 +1,40 @@
+# method access permission
+# output:
+#	foobar
+#	Foo
+
+class Foo
+  public :printf
+  def baz
+    print "baz\n"
+  end
+  private :baz
+
+  def quux
+    print "in QUUX "
+    baz()
+  end
+end
+
+def foobar
+  print "foobar\n"
+end
+
+f = Foo.new
+#Foo.private :printf
+class Foo			# redefines foobar's scope
+  public :foobar
+end
+f.foobar
+f.printf "%s\n", Foo
+
+f.quux
+
+class Bar<Foo
+  def quux
+    super
+    baz()
+  end
+end
+
+Bar.new.quux
diff --git a/ruby_1_8_6/sample/exyacc.rb b/ruby_1_8_6/sample/exyacc.rb
new file mode 100644
index 0000000000..5818825e25
--- /dev/null
+++ b/ruby_1_8_6/sample/exyacc.rb
@@ -0,0 +1,22 @@
+#! /usr/local/bin/ruby -Kn
+# usage: exyacc.rb [yaccfiles]
+# this is coverted from exyacc.pl in the camel book
+
+$/ = nil
+
+while gets()
+  sbeg = $_.index("\n%%") + 1
+  send = $_.rindex("\n%%") + 1
+  $_ = $_[sbeg, send-sbeg]
+  sub!(/.*\n/, "")
+  gsub!(/'\{'/, "'\001'")
+  gsub!(/'\}'/, "'\002'")
+  gsub!(%r{\*/}, "\003\003")
+  gsub!(%r{/\*[^\003]*\003\003}, '')
+  while gsub!(/\{[^{}]*\}/, ''); end
+  gsub!(/'\001'/, "'{'")
+  gsub!(/'\002'/, "'}'")
+  while gsub!(/^[ \t]*\n(\s)/, '\1'); end
+  gsub!(/([:|])[ \t\n]+(\w)/, '\1 \2')
+  print $_
+end
diff --git a/ruby_1_8_6/sample/fact.rb b/ruby_1_8_6/sample/fact.rb
new file mode 100644
index 0000000000..d8147a40f1
--- /dev/null
+++ b/ruby_1_8_6/sample/fact.rb
@@ -0,0 +1,9 @@
+def fact(n)
+  return 1 if n == 0
+  f = 1
+  n.downto(1) do |i|
+    f *= i
+  end
+  return f
+end
+print fact(ARGV[0].to_i), "\n"
diff --git a/ruby_1_8_6/sample/fib.awk b/ruby_1_8_6/sample/fib.awk
new file mode 100644
index 0000000000..7ebe8930f5
--- /dev/null
+++ b/ruby_1_8_6/sample/fib.awk
@@ -0,0 +1,5 @@
+   function fib(n) {
+       if ( n<2 ) return n; else return fib(n-2) + fib(n-1)
+   }
+
+   BEGIN { print fib(20); }
diff --git a/ruby_1_8_6/sample/fib.pl b/ruby_1_8_6/sample/fib.pl
new file mode 100644
index 0000000000..945a4929a7
--- /dev/null
+++ b/ruby_1_8_6/sample/fib.pl
@@ -0,0 +1,11 @@
+sub fib {
+    my($n)=@_;
+    if ($n<2) {
+	return $n;
+    }
+    else {
+	return fib($n-2)+fib($n-1);
+    }
+}
+
+print fib(20), "\n";
diff --git a/ruby_1_8_6/sample/fib.py b/ruby_1_8_6/sample/fib.py
new file mode 100644
index 0000000000..8318021d24
--- /dev/null
+++ b/ruby_1_8_6/sample/fib.py
@@ -0,0 +1,10 @@
+# calculate Fibonacci(20)
+# for benchmark
+def fib(n):
+  if n<2:
+    return n
+  else:
+    return fib(n-2)+fib(n-1)
+
+print fib(20)
+
diff --git a/ruby_1_8_6/sample/fib.rb b/ruby_1_8_6/sample/fib.rb
new file mode 100644
index 0000000000..cde4fba082
--- /dev/null
+++ b/ruby_1_8_6/sample/fib.rb
@@ -0,0 +1,10 @@
+# calculate Fibonacci(20)
+# for benchmark
+def fib(n)
+  if n<2
+    n
+  else
+    fib(n-2)+fib(n-1)
+  end
+end
+print(fib(20), "\n");
diff --git a/ruby_1_8_6/sample/fib.scm b/ruby_1_8_6/sample/fib.scm
new file mode 100644
index 0000000000..b246ca50ac
--- /dev/null
+++ b/ruby_1_8_6/sample/fib.scm
@@ -0,0 +1,8 @@
+(define (fib n)
+  (if (< n 2)
+      n
+      (+ (fib (- n 2)) (fib (- n 1)))))
+
+(display (fib 20))
+(newline)
+(quit)
diff --git a/ruby_1_8_6/sample/freq.rb b/ruby_1_8_6/sample/freq.rb
new file mode 100644
index 0000000000..362753f71f
--- /dev/null
+++ b/ruby_1_8_6/sample/freq.rb
@@ -0,0 +1,12 @@
+# word occurrence listing
+# usege: ruby freq.rb file..
+freq = Hash.new(0)
+while line = gets()
+  line.scan(/\w+/) do |word|
+    freq[word] += 1
+  end
+end
+
+for word in freq.keys.sort!
+  print word, " -- ", freq[word], "\n"
+end
diff --git a/ruby_1_8_6/sample/from.rb b/ruby_1_8_6/sample/from.rb
new file mode 100644
index 0000000000..59cc387792
--- /dev/null
+++ b/ruby_1_8_6/sample/from.rb
@@ -0,0 +1,98 @@
+#! /usr/local/bin/ruby
+
+require "parsedate"
+require "kconv"
+require "mailread"
+
+include ParseDate
+include Kconv
+
+class String
+
+  def kconv(code = Kconv::EUC)
+    Kconv.kconv(self, code, Kconv::AUTO)
+  end
+
+  def kjust(len)
+    len += 1
+    me = self[0, len].ljust(len)
+    if me =~ /.$/ and $&.size == 2
+      me[-2..-1] = '  '
+      me[-2, 2] = '  '
+    end
+    me.chop!
+  end
+
+end
+
+if ARGV[0] == '-w'
+  wait = TRUE
+  ARGV.shift
+end
+
+if ARGV.length == 0
+  file = ENV['MAIL']
+  user = ENV['USER'] || ENV['USERNAME'] || ENV['LOGNAME'] 
+else
+  file = user = ARGV[0]
+  ARGV.clear
+end
+
+if file == nil or !File.exist? file
+  [ENV['SPOOLDIR'], '/usr/spool', '/var/spool', '/usr', '/var'].each do |m|
+    if File.exist? f = "#{m}/mail/#{user}"
+      file = f
+      break 
+    end
+  end
+end
+
+$outcount = 0;
+def fromout(date, from, subj)
+  return if !date
+  y, m, d = parsedate(date) if date
+  y ||= 0; m ||= 0; d ||= 0
+  if from
+    from.gsub! /\n/, ""
+  else
+    from = "sombody@somewhere"
+  end
+  if subj
+    subj.gsub! /\n/, ""
+  else
+    subj = "(nil)"
+  end
+  if ENV['LANG'] =~ /sjis/i
+    lang = Kconv::SJIS
+  else
+    lang = Kconv::EUC
+  end
+  from = from.kconv(lang).kjust(28)
+  subj = subj.kconv(lang).kjust(40)
+  printf "%02d/%02d/%02d [%s] %s\n",y%100,m,d,from,subj
+  $outcount += 1
+end
+
+if File.exist?(file)
+  atime = File.atime(file)
+  mtime = File.mtime(file)
+  f = open(file, "r")
+  begin
+    until f.eof?
+      mail = Mail.new(f)
+      fromout mail.header['Date'],mail.header['From'],mail.header['Subject']
+    end
+  ensure
+    f.close
+    File.utime(atime, mtime, file)
+  end
+end
+
+if $outcount == 0
+  print "You have no mail.\n"
+  sleep 2 if wait
+elsif wait
+  system "stty cbreak -echo"
+  getc()
+  system "stty cooked echo"
+end
diff --git a/ruby_1_8_6/sample/fullpath.rb b/ruby_1_8_6/sample/fullpath.rb
new file mode 100644
index 0000000000..8472e5d8f4
--- /dev/null
+++ b/ruby_1_8_6/sample/fullpath.rb
@@ -0,0 +1,23 @@
+#! /usr/local/bin/ruby
+# convert ls-lR filename into fullpath.
+
+if ARGV[0] =~ /-p/
+  ARGV.shift
+  path = ARGV.shift 
+end
+
+if path == nil
+  path = ""
+elsif path !~ %r|/$|
+  path += "/"
+end
+
+while line = gets()
+  case line
+  when /:$/
+    path = line.chop.chop + "/"
+  when /^total/, /^d/
+  when /^(.*\d )(.+)$/
+    print($1, path, $2, "\n")
+  end
+end
diff --git a/ruby_1_8_6/sample/getopts.test b/ruby_1_8_6/sample/getopts.test
new file mode 100644
index 0000000000..2866bccea8
--- /dev/null
+++ b/ruby_1_8_6/sample/getopts.test
@@ -0,0 +1,36 @@
+#! /usr/local/bin/ruby
+
+load("parsearg.rb")
+
+def usage()
+  printf "Usage:\n"
+  printf "%s -d [-x x] [-y y] [--geometry geom] [--version] [string ...]\n", $0
+end
+
+$USAGE = 'usage'
+parseArgs(0, "d&(x|y)", "dfg", "x:", "y:", "geometry:800x600", "version")
+if ($OPT_d)
+  if $OPT_version
+    printf "version 1.0\n"
+  end
+  if ($OPT_x)
+    printf("x = %d\n", $OPT_x.to_i)
+  end
+  if ($OPT_y)
+    printf("y = %d\n", $OPT_y.to_i)
+  end
+  if ($OPT_geometry)
+    printf("geometry = %s\n", $OPT_geometry)
+  end
+  if $OPT_f
+    printf "f = TRUE\n"
+  end
+  if $OPT_g
+    printf "g = TRUE\n"
+  end
+end
+
+while (ARGV.length != 0)
+  print "other = ", ARGV[0], "\n"
+  ARGV.shift
+end
diff --git a/ruby_1_8_6/sample/goodfriday.rb b/ruby_1_8_6/sample/goodfriday.rb
new file mode 100644
index 0000000000..a95cfe819f
--- /dev/null
+++ b/ruby_1_8_6/sample/goodfriday.rb
@@ -0,0 +1,48 @@
+#! /usr/bin/env ruby
+
+# goodfriday.rb: Written by Tadayoshi Funaba 1998, 2000, 2002
+# $Id: goodfriday.rb,v 1.1 1998-03-08 18:44:44+09 tadf Exp $
+
+require 'date'
+
+def easter(y)
+  g = (y % 19) + 1
+  c = (y / 100) + 1
+  x = (3 * c / 4) - 12
+  z = ((8 * c + 5) / 25) - 5
+  d = (5 * y / 4) - x - 10
+  e = (11 * g + 20 + z - x) % 30
+  e += 1 if e == 25 and g > 11 or e == 24
+  n = 44 - e
+  n += 30 if n < 21
+  n = n + 7 - ((d + n) % 7)
+  if n <= 31 then [y, 3, n] else [y, 4, n - 31] end
+end
+
+es = Date.new(*easter(Time.now.year))
+[[-9*7, 'Septuagesima Sunday'],
+ [-8*7, 'Sexagesima Sunday'],
+ [-7*7, 'Quinquagesima Sunday (Shrove Sunday)'],
+ [-48,  'Shrove Monday'],
+ [-47,  'Shrove Tuesday'],
+ [-46,  'Ash Wednesday'],
+ [-6*7, 'Quadragesima Sunday'],
+ [-3*7, 'Mothering Sunday'],
+ [-2*7, 'Passion Sunday'],
+ [-7,   'Palm Sunday'],
+ [-3,   'Maunday Thursday'],
+ [-2,   'Good Friday'],
+ [-1,   'Easter Eve'],
+ [0,    'Easter Day'],
+ [1,    'Easter Monday'],
+ [7,    'Low Sunday'],
+ [5*7,  'Rogation Sunday'],
+ [39,   'Ascension Day (Holy Thursday)'],
+ [42,   'Sunday after Ascension Day'],
+ [7*7,  'Pentecost (Whitsunday)'],
+ [50,   'Whitmonday'],
+ [8*7,  'Trinity Sunday'],
+ [60,   'Corpus Christi (Thursday after Trinity)']].
+each do |xs|
+  puts((es + xs.shift).to_s + '  ' + xs.shift)
+end
diff --git a/ruby_1_8_6/sample/less.rb b/ruby_1_8_6/sample/less.rb
new file mode 100644
index 0000000000..8be359108f
--- /dev/null
+++ b/ruby_1_8_6/sample/less.rb
@@ -0,0 +1,17 @@
+#! /usr/local/bin/ruby
+
+ZCAT = "/usr/local/bin/zcat"
+LESS = "/usr/local/bin/less"
+
+FILE = ARGV.pop
+OPTION = (if ARGV.length == 0; "" else ARGV.join(" "); end)
+
+if FILE =~ /\.(Z|gz)$/
+  exec(format("%s %s | %s %s", ZCAT, FILE, LESS, OPTION))
+elsif FILE == nil
+  exec(format("%s %s", LESS, OPTION))
+else
+  print(format("%s %s %s", LESS, OPTION, FILE), "\n")
+  exec(format("%s %s %s", LESS, OPTION, FILE))
+end
+exit()
diff --git a/ruby_1_8_6/sample/list.rb b/ruby_1_8_6/sample/list.rb
new file mode 100644
index 0000000000..221f7edb16
--- /dev/null
+++ b/ruby_1_8_6/sample/list.rb
@@ -0,0 +1,80 @@
+# Linked list example
+class MyElem
+  # object initializer called from Class#new
+  def initialize(item)
+    # @variables are instance variable, no declaration needed
+    @data = item
+    @succ = nil
+  end
+
+  def data
+    @data
+  end
+
+  def succ
+    @succ
+  end
+
+  # the method invoked by ``obj.data = val''
+  def succ=(new)
+    @succ = new
+  end
+end
+
+class MyList
+  def add_to_list(obj)
+    elt = MyElem.new(obj)
+    if @head
+      @tail.succ = elt
+    else
+      @head = elt
+    end
+    @tail = elt
+  end
+
+  def each
+    elt = @head
+    while elt
+      yield elt
+      elt = elt.succ
+    end
+  end
+
+  # the method to convert object into string.
+  # redefining this will affect print.
+  def to_s
+    str = "<MyList:\n";
+    for elt in self
+      # short form of ``str = str + elt.data.to_s + "\n"''
+      str += elt.data.to_s + "\n"
+    end
+    str += ">"
+    str
+  end
+end
+
+class Point
+  def initialize(x, y)
+    @x = x; @y = y
+    self
+  end
+
+  def to_s
+    sprintf("%d@%d", @x, @y)
+  end
+end
+
+# global variable name starts with `$'.
+$list1 = MyList.new
+$list1.add_to_list(10)
+$list1.add_to_list(20)
+$list1.add_to_list(Point.new(2, 3))
+$list1.add_to_list(Point.new(4, 5))
+$list2 = MyList.new
+$list2.add_to_list(20)
+$list2.add_to_list(Point.new(4, 5))
+$list2.add_to_list($list1)
+
+# parenthesises around method arguments can be ommitted unless ambiguous.
+print "list1:\n", $list1, "\n"
+print "list2:\n", $list2, "\n"
diff --git a/ruby_1_8_6/sample/list2.rb b/ruby_1_8_6/sample/list2.rb
new file mode 100644
index 0000000000..914cb8996e
--- /dev/null
+++ b/ruby_1_8_6/sample/list2.rb
@@ -0,0 +1,16 @@
+# Linked list example -- short version
+class Point
+  def initialize(x, y)
+    @x = x; @y = y
+    self
+  end
+
+  def to_s
+    sprintf("%d@%d", @x, @y)
+  end
+end
+    
+list1 = [10, 20, Point.new(2, 3), Point.new(4, 5)]
+list2 = [20, Point.new(4, 5), list1]
+print("list1:\n", list1.join("\n"), "\n")
+print("list2:\n", list2.join("\n"), "\n")
diff --git a/ruby_1_8_6/sample/list3.rb b/ruby_1_8_6/sample/list3.rb
new file mode 100644
index 0000000000..1d756fdff0
--- /dev/null
+++ b/ruby_1_8_6/sample/list3.rb
@@ -0,0 +1,18 @@
+# Linked list example -- short version
+# using inspect
+
+class Point
+  def initialize(x, y)
+    @x = x; @y = y
+    self
+  end
+
+  def to_s
+    sprintf("%d@%d", @x, @y)
+  end
+end
+    
+list1 = [10, 20, Point.new(2, 3), Point.new(4, 5)]
+list2 = [20, Point.new(4, 5), list1]
+print("list1: ", list1.inspect, "\n")
+print("list2: ", list2.inspect, "\n")
diff --git a/ruby_1_8_6/sample/logger/app.rb b/ruby_1_8_6/sample/logger/app.rb
new file mode 100644
index 0000000000..924bcba4b0
--- /dev/null
+++ b/ruby_1_8_6/sample/logger/app.rb
@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+require 'logger'
+
+class MyApp < Logger::Application
+  def initialize(a, b, c)
+    super('MyApp')
+
+    # Set logDevice here.
+    logfile = 'app.log'
+    self.log = logfile
+    self.level = INFO
+
+    # Initialize your application...
+    @a = a
+    @b = b
+    @c = c
+  end
+
+  def run
+    @log.info  { 'Started.' }
+
+    @log.info  { "This block isn't evaled because 'debug' is not severe here." }
+    @log.debug { "Result = " << foo(0) }
+    @log.info  { "So nothing is dumped." }
+
+    @log.info  { "This block is evaled because 'info' is enough severe here." }
+    @log.info  { "Result = " << foo(0) }
+    @log.info  { "Above causes exception, so not reached here." }
+
+    @log.info  { 'Finished.' }
+  end
+
+private
+
+  def foo(var)
+    1 / var
+  end
+end
+
+status = MyApp.new(1, 2, 3).start
+
+if status != 0
+  puts 'Some error(s) occured.'
+  puts 'See "app.log".'
+end
diff --git a/ruby_1_8_6/sample/logger/log.rb b/ruby_1_8_6/sample/logger/log.rb
new file mode 100644
index 0000000000..aab80e462e
--- /dev/null
+++ b/ruby_1_8_6/sample/logger/log.rb
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require 'logger'
+
+log = Logger.new(STDERR)
+
+def do_log(log)
+  log.debug('do_log1') { "debug" }
+  log.info('do_log2') { "info" }
+  log.warn('do_log3') { "warn" }
+  log.error('do_log4') { "error" }
+  log.fatal('do_log6') { "fatal" }
+  log.unknown('do_log7') { "unknown" }
+end
+
+log.level = Logger::DEBUG	# Default.
+do_log(log)
+
+puts "Set severity threshold 'WARN'."
+
+log.level = Logger::WARN
+do_log(log)
+
+puts "Change datetime format.  Thanks to Daniel Berger."
+
+log.datetime_format = "%d-%b-%Y@%H:%M:%S"
+do_log(log)
diff --git a/ruby_1_8_6/sample/logger/shifting.rb b/ruby_1_8_6/sample/logger/shifting.rb
new file mode 100644
index 0000000000..bd8852a4ae
--- /dev/null
+++ b/ruby_1_8_6/sample/logger/shifting.rb
@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require 'logger'
+
+logfile = 'shifting.log'
+# Max 3 age ... logShifting.log, logShifting.log.0, and logShifting.log.1
+shift_age = 3
+# Shift log file about for each 1024 bytes.
+shift_size = 1024
+
+log = Logger.new(logfile, shift_age, shift_size)
+
+def do_log(log)
+  log.debug('do_log1') { 'd' * rand(100) }
+  log.info('do_log2') { 'i' * rand(100) }
+  log.warn('do_log3') { 'w' * rand(100) }
+  log.error('do_log4') { 'e' * rand(100) }
+  log.fatal('do_log5') { 'f' * rand(100) }
+  log.unknown('do_log6') { 'u' * rand(100) }
+end
+
+(1..10).each do
+  do_log(log)
+end
+
+puts 'See shifting.log and shifting.log.[01].'
diff --git a/ruby_1_8_6/sample/mine.rb b/ruby_1_8_6/sample/mine.rb
new file mode 100644
index 0000000000..8fc27e0c6d
--- /dev/null
+++ b/ruby_1_8_6/sample/mine.rb
@@ -0,0 +1,175 @@
+#! /usr/bin/ruby -Ke
+
+class Board
+  def clr
+    print "\e[2J"
+  end
+  def pos(x,y)
+    printf "\e[%d;%dH", y+1, x*2+1
+  end
+  def colorstr(id,s)
+    printf "\e[%dm%s\e[0m", id, s
+  end
+  def put(x, y, col, str)
+    pos(x,y); colorstr(43,str)
+    pos(0,@hi); print "残り:",@mc,"/",@total,"   "
+    pos(x,y)
+  end
+  private :clr, :pos, :colorstr, :put
+  CHR=["・","１","２","３","４","５","６","７","８","★","●","@@"]
+  COL=[46,43,45] # default,opened,over
+  def initialize(h,w,m)
+    # ゲーム盤の生成(h:縦，w:横，m:爆弾の数)
+    @hi=h; @wi=w; @m=m
+    reset
+  end
+  def reset
+    # ゲーム盤を(再)初期化する
+    srand()
+    @cx=0; @cy=0; @mc=@m
+    @over=false
+    @data=Array.new(@hi*@wi)
+    @state=Array.new(@hi*@wi)
+    @total=@hi*@wi
+    @total.times {|i| @data[i]=0}
+    @m.times do
+       loop do
+         j=rand(@total-1)
+         if @data[j] == 0 then
+           @data[j]=1
+           break
+         end
+       end
+    end
+    clr; pos(0,0)
+    @hi.times{|y| pos(0,y); colorstr(COL[0],CHR[0]*@wi)}
+    pos(@cx,@cy)
+  end
+  def mark
+    # 現在のカーソル位置にマークをつける
+    if @state[@wi*@cy+@cx] != nil then return end
+    @state[@wi*@cy+@cx] = "MARK"
+    @mc=@mc-1;
+    @total=@total-1;
+    put(@cx, @cy, COL[1], CHR[9])
+  end
+  def open(x=@cx,y=@cy)
+    # 現在のカーソル位置をオープンにする
+    # 爆弾があればゲームオーバー
+    if @state[@wi*y+x] =="OPEN"  then return 0 end
+    if @state[@wi*y+x] == nil then @total=@total-1 end
+    if @state[@wi*y+x] =="MARK" then @mc=@mc+1 end
+    @state[@wi*y+x]="OPEN"
+    if fetch(x,y) == 1 then @over = 1; return end
+    c = count(x,y)
+    put(x, y, COL[1], CHR[c])
+    return 0 if c != 0
+    if x > 0 && y > 0         then open(x-1,y-1) end
+    if y > 0                  then open(x,  y-1) end
+    if x < @wi-1 && y > 0     then open(x+1,y-1) end
+    if x > 0                  then open(x-1,y) end
+    if x < @wi-1              then open(x+1,y) end
+    if x > 0 && y < @hi-1     then open(x-1,y+1) end
+    if y < @hi -1             then open(x,y+1) end
+    if x < @wi-1 && y < @hi-1 then open(x+1,y+1) end
+    pos(@cx,@cy)
+  end
+  def fetch(x,y)
+    # (x,y)の位置の爆弾の数(0 or 1)を返す
+    if x < 0 then 0
+    elsif x >= @wi then 0
+    elsif y < 0 then 0
+    elsif y >= @hi then 0
+    else
+      @data[y*@wi+x]
+    end
+  end
+  def count(x,y)
+    # (x,y)に隣接する爆弾の数を返す
+    fetch(x-1,y-1)+fetch(x,y-1)+fetch(x+1,y-1)+
+    fetch(x-1,y)  +             fetch(x+1,y)+
+    fetch(x-1,y+1)+fetch(x,y+1)+fetch(x+1,y+1)
+  end
+  def over(win)
+    # ゲームの終了
+    quit
+    unless win
+      pos(@cx,@cy); print CHR[11]
+    end
+    pos(0,@hi)
+    if win then print "*** YOU WIN !! ***"
+    else print "*** GAME OVER ***"
+    end
+  end
+  def over?
+    # ゲームの終了チェック
+    # 終了処理も呼び出す
+    remain = (@mc+@total == 0)
+    if @over || remain
+      over(remain)
+      true
+    else
+      false
+    end
+  end
+  def quit
+    # ゲームの中断(または終了)
+    # 盤面を全て見せる
+    @hi.times do|y|
+      pos(0,y)
+      @wi.times do|x|
+	colorstr(if @state[y*@wi+x] == "MARK" then COL[1] else COL[2] end,
+		 if fetch(x,y)==1 then CHR[10] else CHR[count(x,y)] end)
+      end
+    end
+  end
+  def down
+    # カーソルを下に
+    if @cy < @hi-1 then @cy=@cy+1; pos(@cx, @cy) end
+  end
+  def up
+    # カーソルを上に
+    if @cy > 0 then @cy=@cy-1; pos(@cx, @cy) end
+  end
+  def left
+    # カーソルを左に
+    if @cx > 0 then @cx=@cx-1; pos(@cx, @cy) end
+  end
+  def right
+    # カーソルを右に
+    if @cx < @wi-1 then @cx=@cx+1; pos(@cx, @cy) end
+  end
+end
+
+bd=Board.new(10,10,10)
+system("stty raw -echo")
+begin
+  loop do
+    case STDIN.getc
+    when ?n  # new game
+      bd.reset
+    when ?m  # mark
+      bd.mark
+    when ?j
+      bd.down
+    when ?k
+      bd.up
+    when ?h
+      bd.left
+    when ?l
+      bd.right
+    when ?\s
+      bd.open
+    when ?q,?\C-c  # quit game
+      bd.quit
+      break
+    end
+    if bd.over?
+      if STDIN.getc == ?q then break end
+      bd.reset
+    end
+  end
+ensure
+  system("stty -raw echo")
+end
+print "\n"
diff --git a/ruby_1_8_6/sample/mkproto.rb b/ruby_1_8_6/sample/mkproto.rb
new file mode 100644
index 0000000000..754ca2dff2
--- /dev/null
+++ b/ruby_1_8_6/sample/mkproto.rb
@@ -0,0 +1,27 @@
+$/ = nil
+while line = gets()
+  if /^((void|VALUE|int|char *\*|ID|struct [\w_]+ *\*|st_table *\*) *)?\n([\w\d_]+)\(.*\)\n\s*((.+;\n)*)\{/ =~ line
+    line = $'
+    printf "%s %s(", $2, $3
+    args = []
+    for arg in $4.split(/;\n\s*/)
+      arg.gsub!(/ +/, ' ')
+      if arg =~ /,/
+	if arg =~ /(([^*]+) *\** *[\w\d_]+),/
+	  type = $2.strip
+	  args.push $1.strip
+	  arg = $'
+	else
+	  type = ""
+	end
+	while arg.sub!(/(\** *[\w\d_]+)(,|$)/, "") && $~
+	  args.push type + " " + $1.strip
+	end
+      else
+	args.push arg.strip
+      end
+    end
+    printf "%s);\n", args.join(', ')
+    redo
+  end
+end
diff --git a/ruby_1_8_6/sample/mpart.rb b/ruby_1_8_6/sample/mpart.rb
new file mode 100644
index 0000000000..a88eba0ef6
--- /dev/null
+++ b/ruby_1_8_6/sample/mpart.rb
@@ -0,0 +1,44 @@
+#! ./ruby
+# split into multi part
+# usage: mpart.rb [-nnn] file..
+
+lines = 1000
+
+if (ARGV[0] =~ /^-(\d+)$/ )
+  lines = $1.to_i;
+  ARGV.shift;
+end
+
+basename = ARGV[0]
+extname = "part"
+
+part = 1
+line = 0
+
+fline = 0
+for i in ifp = open(basename)
+  fline = fline + 1
+end
+ifp.close
+
+parts = fline / lines + 1
+
+for i in ifp = open(basename)
+  if line == 0
+    ofp = open(sprintf("%s.%s%02d", basename, extname, part), "w")
+    printf(ofp, "%s part%02d/%02d\n", basename, part, parts)
+    ofp.write("BEGIN--cut here--cut here\n")
+  end
+  ofp.write(i)
+  line = line + 1
+  if line >= lines and !ifp.eof?
+    ofp.write("END--cut here--cut here\n")
+    ofp.close
+    part = part + 1
+    line = 0
+  end
+end
+ofp.write("END--cut here--cut here\n")
+ofp.close
+
+ifp.close
diff --git a/ruby_1_8_6/sample/mrshtest.rb b/ruby_1_8_6/sample/mrshtest.rb
new file mode 100644
index 0000000000..8d2dc9936b
--- /dev/null
+++ b/ruby_1_8_6/sample/mrshtest.rb
@@ -0,0 +1,13 @@
+include Marshal
+a = 25.6;
+pt = Struct.new('Point', :x,:y);
+x = pt.new(10, 10)
+y = pt.new(20, 20)
+rt = Struct.new('Rectangle', :origin,:corner);
+z = rt.new(x, y)
+c = Object.new
+s = [a, x, z, c, c, "fff"];
+p s
+d = dump(s);
+p d
+p load(d)
diff --git a/ruby_1_8_6/sample/observ.rb b/ruby_1_8_6/sample/observ.rb
new file mode 100644
index 0000000000..72e5178b38
--- /dev/null
+++ b/ruby_1_8_6/sample/observ.rb
@@ -0,0 +1,32 @@
+#! /usr/local/bin/ruby
+
+require "thread"
+require "observer"
+
+class Tick
+  include Observable
+  def initialize
+    Thread.start do
+      loop do
+	sleep 0.999
+	now = Time.now
+	changed
+	notify_observers(now.hour, now.min, now.sec)
+      end
+    end
+  end
+end
+
+class Clock
+  def initialize(tick)
+    @tick = tick
+    @tick.add_observer(self)
+  end
+  def update(h, m, s)
+    printf "\e[8D%02d:%02d:%02d", h, m, s
+    STDOUT.flush
+  end
+end
+
+clock = Clock.new(Tick.new)
+sleep
diff --git a/ruby_1_8_6/sample/occur.pl b/ruby_1_8_6/sample/occur.pl
new file mode 100644
index 0000000000..1f5fcf27a4
--- /dev/null
+++ b/ruby_1_8_6/sample/occur.pl
@@ -0,0 +1,9 @@
+while (<>) {
+    for (split(/\W+/)) {
+	$freq{$_}++;
+    }
+}
+
+for (sort keys %freq) {
+    print "$_ -- $freq{$_}\n";
+}
diff --git a/ruby_1_8_6/sample/occur.rb b/ruby_1_8_6/sample/occur.rb
new file mode 100644
index 0000000000..8bb09e15ad
--- /dev/null
+++ b/ruby_1_8_6/sample/occur.rb
@@ -0,0 +1,12 @@
+# word occurrence listing
+# usege: ruby occur.rb file..
+freq = Hash.new(0)
+while gets()
+  for word in split(/\W+/)
+    freq[word] += 1
+  end
+end
+
+for word in freq.keys.sort!
+  print word, " -- ", freq[word], "\n"
+end
diff --git a/ruby_1_8_6/sample/occur2.rb b/ruby_1_8_6/sample/occur2.rb
new file mode 100644
index 0000000000..53885c0ba7
--- /dev/null
+++ b/ruby_1_8_6/sample/occur2.rb
@@ -0,0 +1,16 @@
+# word occurrence listing
+# usege: ruby occur2.rb file..
+freq = {}
+while gets()
+  for word in split(/\W+/)
+    begin
+      freq[word] += 1
+    rescue NameError
+      freq[word] = 1
+    end
+  end
+end
+
+for word in freq.keys.sort
+  printf("%s -- %d\n", word, freq[word])
+end
diff --git a/ruby_1_8_6/sample/openssl/c_rehash.rb b/ruby_1_8_6/sample/openssl/c_rehash.rb
new file mode 100644
index 0000000000..afbb654517
--- /dev/null
+++ b/ruby_1_8_6/sample/openssl/c_rehash.rb
@@ -0,0 +1,174 @@
+#!/usr/bin/env ruby
+
+require 'openssl'
+require 'digest/md5'
+
+class CHashDir
+  include Enumerable
+
+  def initialize(dirpath)
+    @dirpath = dirpath
+    @fingerprint_cache = @cert_cache = @crl_cache = nil
+  end
+
+  def hash_dir(silent = false)
+    # ToDo: Should lock the directory...
+    @silent = silent
+    @fingerprint_cache = Hash.new
+    @cert_cache = Hash.new
+    @crl_cache = Hash.new
+    do_hash_dir
+  end
+
+  def get_certs(name = nil)
+    if name
+      @cert_cache[hash_name(name)]
+    else
+      @cert_cache.values.flatten
+    end
+  end
+
+  def get_crls(name = nil)
+    if name
+      @crl_cache[hash_name(name)]
+    else
+      @crl_cache.values.flatten
+    end
+  end
+
+  def delete_crl(crl)
+    File.unlink(crl_filename(crl))
+    hash_dir(true)
+  end
+
+  def add_crl(crl)
+    File.open(crl_filename(crl), "w") do |f|
+      f << crl.to_pem
+    end
+    hash_dir(true)
+  end
+
+  def load_pem_file(filepath)
+    str = File.read(filepath)
+    begin
+      OpenSSL::X509::Certificate.new(str)
+    rescue
+      begin
+	OpenSSL::X509::CRL.new(str)
+      rescue
+	begin
+	  OpenSSL::X509::Request.new(str)
+	rescue
+	  nil
+	end
+      end
+    end
+  end
+
+private
+
+  def crl_filename(crl)
+    path(hash_name(crl.issuer)) + '.pem'
+  end
+
+  def do_hash_dir
+    Dir.chdir(@dirpath) do
+      delete_symlink
+      Dir.glob('*.pem') do |pemfile|
+	cert = load_pem_file(pemfile)
+	case cert
+	when OpenSSL::X509::Certificate
+	  link_hash_cert(pemfile, cert)
+	when OpenSSL::X509::CRL
+	  link_hash_crl(pemfile, cert)
+	else
+	  STDERR.puts("WARNING: #{pemfile} does not contain a certificate or CRL: skipping") unless @silent
+	end
+      end
+    end
+  end
+
+  def delete_symlink
+    Dir.entries(".").each do |entry|
+      next unless /^[\da-f]+\.r{0,1}\d+$/ =~ entry
+      File.unlink(entry) if FileTest.symlink?(entry)
+    end
+  end
+
+  def link_hash_cert(org_filename, cert)
+    name_hash = hash_name(cert.subject)
+    fingerprint = fingerprint(cert.to_der)
+    filepath = link_hash(org_filename, name_hash, fingerprint) { |idx|
+      "#{name_hash}.#{idx}"
+    }
+    unless filepath
+      unless @silent
+	STDERR.puts("WARNING: Skipping duplicate certificate #{org_filename}")
+      end
+    else
+      (@cert_cache[name_hash] ||= []) << path(filepath)
+    end
+  end
+
+  def link_hash_crl(org_filename, crl)
+    name_hash = hash_name(crl.issuer)
+    fingerprint = fingerprint(crl.to_der)
+    filepath = link_hash(org_filename, name_hash, fingerprint) { |idx|
+      "#{name_hash}.r#{idx}"
+    }
+    unless filepath
+      unless @silent
+	STDERR.puts("WARNING: Skipping duplicate CRL #{org_filename}")
+      end
+    else
+      (@crl_cache[name_hash] ||= []) << path(filepath)
+    end
+  end
+
+  def link_hash(org_filename, name, fingerprint)
+    idx = 0
+    filepath = nil
+    while true
+      filepath = yield(idx)
+      break unless FileTest.symlink?(filepath) or FileTest.exist?(filepath)
+      if @fingerprint_cache[filepath] == fingerprint
+	return false
+      end
+      idx += 1
+    end
+    STDOUT.puts("#{org_filename} => #{filepath}") unless @silent
+    symlink(org_filename, filepath)
+    @fingerprint_cache[filepath] = fingerprint
+    filepath
+  end
+
+  def symlink(from, to)
+    begin
+      File.symlink(from, to)
+    rescue
+      File.open(to, "w") do |f|
+	f << File.read(from)
+      end
+    end
+  end
+
+  def path(filename)
+    File.join(@dirpath, filename)
+  end
+
+  def hash_name(name)
+    sprintf("%x", name.hash)
+  end
+
+  def fingerprint(der)
+    Digest::MD5.hexdigest(der).upcase
+  end
+end
+
+if $0 == __FILE__
+  dirlist = ARGV
+  dirlist << '/usr/ssl/certs' if dirlist.empty?
+  dirlist.each do |dir|
+    CHashDir.new(dir).hash_dir
+  end
+end
diff --git a/ruby_1_8_6/sample/openssl/cert2text.rb b/ruby_1_8_6/sample/openssl/cert2text.rb
new file mode 100644
index 0000000000..50da224e76
--- /dev/null
+++ b/ruby_1_8_6/sample/openssl/cert2text.rb
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+require 'openssl'
+include OpenSSL::X509
+
+def cert2text(cert_str)
+  [Certificate, CRL, Request].each do |klass|
+    begin
+      puts klass.new(cert_str).to_text
+      return
+    rescue
+    end
+  end
+  raise ArgumentError.new('Unknown format.')
+end
+
+if ARGV.empty?
+  cert2text(STDIN.read)
+else
+  ARGV.each do |file|
+    cert2text(File.read(file))
+  end
+end
diff --git a/ruby_1_8_6/sample/openssl/cert_store_view.rb b/ruby_1_8_6/sample/openssl/cert_store_view.rb
new file mode 100644
index 0000000000..26c4d527f7
--- /dev/null
+++ b/ruby_1_8_6/sample/openssl/cert_store_view.rb
@@ -0,0 +1,911 @@
+#!/usr/bin/env ruby
+
+require 'fox'
+require 'openssl'
+require 'time'
+require 'certstore'
+require 'getopts'
+
+include Fox
+
+module CertDumpSupport
+  def cert_label(cert)
+    subject_alt_name =
+      cert.extensions.find { |ext| ext.oid == 'subjectAltName' }
+    if subject_alt_name
+      subject_alt_name.value.split(/\s*,\s/).each do |alt_name_pair|
+	alt_tag, alt_name = alt_name_pair.split(/:/)
+	return alt_name
+      end
+    end
+    name_label(cert.subject)
+  end
+
+  def name_label(name)
+    ary = name.to_a
+    if (cn = ary.find { |rdn| rdn[0] == 'CN' })
+      return cn[1]
+    end
+    if ary.last[0] == 'OU'
+      return ary.last[1]
+    end
+    name.to_s
+  end
+
+  def name_text(name)
+    name.to_a.collect { |tag, value|
+      "#{tag} = #{value}"
+    }.reverse.join("\n")
+  end
+
+  def bn_label(bn)
+    ("0" << sprintf("%X", bn)).scan(/../).join(" ")
+  end
+end
+
+class CertDump
+  include CertDumpSupport
+
+  def initialize(cert)
+    @cert = cert
+  end
+
+  def get_dump(tag)
+    case tag
+    when 'Version'
+      version
+    when 'Serial'
+      serial
+    when 'Signature Algorithm'
+      signature_algorithm
+    when 'Issuer'
+      issuer
+    when 'Validity'
+      validity
+    when 'Not before'
+      not_before
+    when 'Not after'
+      not_after
+    when 'Subject'
+      subject
+    when 'Public key'
+      public_key
+    else
+      ext(tag)
+    end
+  end
+
+  def get_dump_line(tag)
+    case tag
+    when 'Version'
+      version_line
+    when 'Serial'
+      serial_line
+    when 'Signature Algorithm'
+      signature_algorithm_line
+    when 'Subject'
+      subject_line
+    when 'Issuer'
+      issuer_line
+    when 'Validity'
+      validity_line
+    when 'Not before'
+      not_before_line
+    when 'Not after'
+      not_after_line
+    when 'Public key'
+      public_key_line
+    else
+      ext_line(tag)
+    end
+  end
+
+private
+
+  def version
+    "Version: #{@cert.version + 1}"
+  end
+
+  def version_line
+    version
+  end
+
+  def serial
+    bn_label(@cert.serial)
+  end
+
+  def serial_line
+    serial
+  end
+
+  def signature_algorithm
+    @cert.signature_algorithm
+  end
+
+  def signature_algorithm_line
+    signature_algorithm
+  end
+
+  def subject
+    name_text(@cert.subject)
+  end
+
+  def subject_line
+    @cert.subject.to_s
+  end
+
+  def issuer
+    name_text(@cert.issuer)
+  end
+
+  def issuer_line
+    @cert.issuer.to_s
+  end
+
+  def validity
+    <<EOS
+Not before: #{not_before}
+Not after: #{not_after}
+EOS
+  end
+
+  def validity_line
+    "from #{@cert.not_before.iso8601} to #{@cert.not_after.iso8601}"
+  end
+
+  def not_before
+    @cert.not_before.to_s
+  end
+
+  def not_before_line
+    not_before
+  end
+
+  def not_after
+    @cert.not_after.to_s
+  end
+
+  def not_after_line
+    not_after
+  end
+
+  def public_key
+    @cert.public_key.to_text
+  end
+
+  def public_key_line
+    "#{@cert.public_key.class} -- " << public_key.scan(/\A[^\n]*/)[0] << '...'
+  end
+
+  def ext(tag)
+    @cert.extensions.each do |ext|
+      if ext.oid == tag
+	return ext_detail(tag, ext.value)
+      end
+    end
+    "(unknown)"
+  end
+
+  def ext_line(tag)
+    ext(tag).tr("\r\n", '')
+  end
+
+  def ext_detail(tag, value)
+    value
+  end
+end
+
+class CrlDump
+  include CertDumpSupport
+
+  def initialize(crl)
+    @crl = crl
+  end
+
+  def get_dump(tag)
+    case tag
+    when 'Version'
+      version
+    when 'Signature Algorithm'
+      signature_algorithm
+    when 'Issuer'
+      issuer
+    when 'Last update'
+      last_update
+    when 'Next update'
+      next_update
+    else
+      ext(tag)
+    end
+  end
+
+  def get_dump_line(tag)
+    case tag
+    when 'Version'
+      version_line
+    when 'Signature Algorithm'
+      signature_algorithm_line
+    when 'Issuer'
+      issuer_line
+    when 'Last update'
+      last_update_line
+    when 'Next update'
+      next_update_line
+    else
+      ext_line(tag)
+    end
+  end
+
+private
+
+  def version
+    "Version: #{@crl.version + 1}"
+  end
+
+  def version_line
+    version
+  end
+
+  def signature_algorithm
+    @crl.signature_algorithm
+  end
+
+  def signature_algorithm_line
+    signature_algorithm
+  end
+
+  def issuer
+    name_text(@crl.issuer)
+  end
+
+  def issuer_line
+    @crl.issuer.to_s
+  end
+
+  def last_update
+    @crl.last_update.to_s
+  end
+
+  def last_update_line
+    last_update
+  end
+
+  def next_update
+    @crl.next_update.to_s
+  end
+
+  def next_update_line
+    next_update
+  end
+
+  def ext(tag)
+    @crl.extensions.each do |ext|
+      if ext.oid == tag
+	return ext_detail(tag, ext.value)
+      end
+    end
+    "(unknown)"
+  end
+
+  def ext_line(tag)
+    ext(tag).tr("\r\n", '')
+  end
+
+  def ext_detail(tag, value)
+    value
+  end
+end
+
+class RevokedDump
+  include CertDumpSupport
+
+  def initialize(revoked)
+    @revoked = revoked
+  end
+
+  def get_dump(tag)
+    case tag
+    when 'Serial'
+      serial
+    when 'Time'
+      time
+    else
+      ext(tag)
+    end
+  end
+
+  def get_dump_line(tag)
+    case tag
+    when 'Serial'
+      serial_line
+    when 'Time'
+      time_line
+    else
+      ext_line(tag)
+    end
+  end
+
+private
+
+  def serial
+    bn_label(@revoked.serial)
+  end
+
+  def serial_line
+    serial
+  end
+
+  def time
+    @revoked.time.to_s
+  end
+
+  def time_line
+    time
+  end
+
+  def ext(tag)
+    @revoked.extensions.each do |ext|
+      if ext.oid == tag
+	return ext_detail(tag, ext.value)
+      end
+    end
+    "(unknown)"
+  end
+
+  def ext_line(tag)
+    ext(tag).tr("\r\n", '')
+  end
+
+  def ext_detail(tag, value)
+    value
+  end
+end
+
+class RequestDump
+  include CertDumpSupport
+
+  def initialize(req)
+    @req = req
+  end
+
+  def get_dump(tag)
+    case tag
+    when 'Version'
+      version
+    when 'Signature Algorithm'
+      signature_algorithm
+    when 'Subject'
+      subject
+    when 'Public key'
+      public_key
+    else
+      attributes(tag)
+    end
+  end
+
+  def get_dump_line(tag)
+    case tag
+    when 'Version'
+      version_line
+    when 'Signature Algorithm'
+      signature_algorithm_line
+    when 'Subject'
+      subject_line
+    when 'Public key'
+      public_key_line
+    else
+      attributes_line(tag)
+    end
+  end
+
+private
+
+  def version
+    "Version: #{@req.version + 1}"
+  end
+
+  def version_line
+    version
+  end
+
+  def signature_algorithm
+    @req.signature_algorithm
+  end
+
+  def signature_algorithm_line
+    signature_algorithm
+  end
+
+  def subject
+    name_text(@req.subject)
+  end
+
+  def subject_line
+    @req.subject.to_s
+  end
+
+  def public_key
+    @req.public_key.to_text
+  end
+
+  def public_key_line
+    "#{@req.public_key.class} -- " << public_key.scan(/\A[^\n]*/)[0] << '...'
+  end
+
+  def attributes(tag)
+    "(unknown)"
+  end
+
+  def attributes_line(tag)
+    attributes(tag).tr("\r\n", '')
+  end
+end
+
+class CertStoreView < FXMainWindow
+  class CertTree
+    include CertDumpSupport
+
+    def initialize(observer, tree)
+      @observer = observer
+      @tree = tree
+      @tree.connect(SEL_COMMAND) do |sender, sel, item|
+       	if item.data
+  	  @observer.getApp().beginWaitCursor do
+  	    @observer.show_item(item.data)
+  	  end
+	else
+	  @observer.show_item(nil)
+  	end
+      end
+    end
+
+    def show(cert_store)
+      @tree.clearItems
+      @self_signed_ca_node = add_item_last(nil, "Trusted root CA")
+      @other_ca_node = add_item_last(nil, "Intermediate CA")
+      @ee_node = add_item_last(nil, "Personal")
+      @crl_node = add_item_last(nil, "CRL")
+      @request_node = add_item_last(nil, "Request")
+      @verify_path_node = add_item_last(nil, "Certification path")
+      show_certs(cert_store)
+    end
+
+    def show_certs(cert_store)
+      remove_items(@self_signed_ca_node)
+      remove_items(@other_ca_node)
+      remove_items(@ee_node)
+      remove_items(@crl_node)
+      remove_items(@request_node)
+      import_certs(cert_store)
+    end
+
+    def show_request(req)
+      node = add_item_last(@request_node, name_label(req.subject), req)
+      @tree.selectItem(node)
+      @observer.show_item(req)
+    end
+
+    def show_verify_path(verify_path)
+      add_verify_path(verify_path)
+    end
+
+  private
+
+    def open_node(node)
+      node.expanded = node.opened = true
+    end
+
+    def close_node(node)
+      node.expanded = node.opened = false
+    end
+
+    def import_certs(cert_store)
+      cert_store.self_signed_ca.each do |cert|
+	add_item_last(@self_signed_ca_node, cert_label(cert), cert)
+      end
+      cert_store.other_ca.each do |cert|
+	add_item_last(@other_ca_node, cert_label(cert), cert)
+      end
+      cert_store.ee.each do |cert|
+	add_item_last(@ee_node, cert_label(cert), cert)
+      end
+      cert_store.crl.each do |crl|
+	node = add_item_last(@crl_node, name_label(crl.issuer), crl)
+	close_node(node)
+	crl.revoked.each do |revoked|
+	  add_item_last(node, bn_label(revoked.serial), revoked)
+	end
+      end
+      cert_store.request.each do |req|
+	add_item_last(@requestnode, name_label(req.subject), req)
+      end
+    end
+
+    def add_verify_path(verify_path)
+      node = @verify_path_node
+      last_cert = nil
+      verify_path.reverse_each do |ok, cert, crl_check, error_string|
+	warn = []
+	if @observer.cert_store.is_ca?(cert)
+	  warn << 'NO ARL' unless crl_check
+	else
+	  warn << 'NO CRL' unless crl_check
+	end
+	warn_str = '(' << warn.join(", ") << ')'
+	warn_mark = warn.empty? ? '' : '!'
+	label = if ok
+	    "OK#{warn_mark}..." + cert_label(cert)
+	  else
+	    "NG(#{error_string})..." + cert_label(cert)
+	  end
+	label << warn_str unless warn.empty?
+	node = add_item_last(node, label, cert)
+	node.expanded = true
+	last_cert = cert
+      end
+      if last_cert
+	@tree.selectItem(node)
+	@observer.show_item(last_cert)
+      end
+    end
+
+    def add_item_last(parent, label, obj = nil)
+      node = @tree.addItemLast(parent, FXTreeItem.new(label))
+      node.data = obj if obj
+      open_node(node)
+      node
+    end
+
+    def remove_items(node)
+      while node.getNumChildren > 0
+	@tree.removeItem(node.getFirst)
+      end
+    end
+  end
+
+  class CertInfo
+    def initialize(observer, table)
+      @observer = observer
+      @table = table
+      @table.leadingRows = 0
+      @table.leadingCols = 0
+      @table.trailingRows = 0
+      @table.trailingCols = 0
+      @table.showVertGrid(false)
+      @table.showHorzGrid(false)
+      @table.setTableSize(1, 2)
+      @table.setColumnWidth(0, 125)
+      @table.setColumnWidth(1, 350)
+    end
+
+    def show(item)
+      @observer.show_detail(nil, nil)
+      if item.nil?
+	set_column_size(1)
+	return
+      end
+      case item
+      when OpenSSL::X509::Certificate
+	show_cert(item)
+      when OpenSSL::X509::CRL
+	show_crl(item)
+      when OpenSSL::X509::Revoked
+	show_revoked(item)
+      when OpenSSL::X509::Request
+	show_request(item)
+      else
+	raise NotImplementedError.new("Unknown item type #{item.class}.")
+      end
+    end
+
+  private
+
+    def show_cert(cert)
+      wrap = CertDump.new(cert)
+      items = []
+      items << ['Version', wrap.get_dump_line('Version')]
+      items << ['Signature Algorithm', wrap.get_dump_line('Signature Algorithm')]
+      items << ['Issuer', wrap.get_dump_line('Issuer')]
+      items << ['Serial', wrap.get_dump_line('Serial')]
+      #items << ['Not before', wrap.get_dump_line('Not before')]
+      #items << ['Not after', wrap.get_dump_line('Not after')]
+      items << ['Subject', wrap.get_dump_line('Subject')]
+      items << ['Public key', wrap.get_dump_line('Public key')]
+      items << ['Validity', wrap.get_dump_line('Validity')]
+      (cert.extensions.sort { |a, b| a.oid <=> b.oid }).each do |ext|
+	items << [ext.oid, wrap.get_dump_line(ext.oid)]
+      end
+      show_items(cert, items)
+    end
+
+    def show_crl(crl)
+      wrap = CrlDump.new(crl)
+      items = []
+      items << ['Version', wrap.get_dump_line('Version')]
+      items << ['Signature Algorithm', wrap.get_dump_line('Signature Algorithm')]
+      items << ['Issuer', wrap.get_dump_line('Issuer')]
+      items << ['Last update', wrap.get_dump_line('Last update')]
+      items << ['Next update', wrap.get_dump_line('Next update')]
+      crl.extensions.each do |ext|
+	items << [ext.oid, wrap.get_dump_line(ext.oid)]
+      end
+      show_items(crl, items)
+    end
+
+    def show_revoked(revoked)
+      wrap = RevokedDump.new(revoked)
+      items = []
+      items << ['Serial', wrap.get_dump_line('Serial')]
+      items << ['Time', wrap.get_dump_line('Time')]
+      revoked.extensions.each do |ext|
+	items << [ext.oid, wrap.get_dump_line(ext.oid)]
+      end
+      show_items(revoked, items)
+    end
+
+    def show_request(req)
+      wrap = RequestDump.new(req)
+      items = []
+      items << ['Version', wrap.get_dump_line('Version')]
+      items << ['Signature Algorithm', wrap.get_dump_line('Signature Algorithm')]
+      items << ['Subject', wrap.get_dump_line('Subject')]
+      items << ['Public key', wrap.get_dump_line('Public key')]
+      req.attributes.each do |attr|
+	items << [attr.attr, wrap.get_dump_line(attr.oid)]
+      end
+      show_items(req, items)
+    end
+
+    def show_items(obj, items)
+      set_column_size(items.size)
+      items.each_with_index do |ele, idx|
+	tag, value = ele
+	@table.setItemText(idx, 0, tag)
+	@table.getItem(idx, 0).data = tag
+	@table.setItemText(idx, 1, value.to_s)
+	@table.getItem(idx, 1).data = tag
+      end
+      @table.connect(SEL_COMMAND) do |sender, sel, loc|
+	item = @table.getItem(loc.row, loc.col)
+	@observer.show_detail(obj, item.data)
+      end
+      justify_table
+    end
+
+    def set_column_size(size)
+      col0_width = @table.getColumnWidth(0)
+      col1_width = @table.getColumnWidth(1)
+      @table.setTableSize(size, 2)
+      @table.setColumnWidth(0, col0_width)
+      @table.setColumnWidth(1, col1_width)
+    end
+
+    def justify_table
+      for col in 0..@table.numCols-1
+      	for row in 0..@table.numRows-1
+  	  @table.getItem(row, col).justify = FXTableItem::LEFT
+   	end
+      end
+    end
+  end
+
+  class CertDetail
+    def initialize(observer, detail)
+      @observer = observer
+      @detail = detail
+    end
+
+    def show(item, tag)
+      if item.nil?
+	@detail.text = ''
+	return
+      end
+      case item
+      when OpenSSL::X509::Certificate
+	show_cert(item, tag)
+      when OpenSSL::X509::CRL
+	show_crl(item, tag)
+      when OpenSSL::X509::Revoked
+	show_revoked(item, tag)
+      when OpenSSL::X509::Request
+	show_request(item, tag)
+      else
+	raise NotImplementedError.new("Unknown item type #{item.class}.")
+      end
+    end
+
+  private
+
+    def show_cert(cert, tag)
+      wrap = CertDump.new(cert)
+      @detail.text = wrap.get_dump(tag)
+    end
+
+    def show_crl(crl, tag)
+      wrap = CrlDump.new(crl)
+      @detail.text = wrap.get_dump(tag)
+    end
+
+    def show_revoked(revoked, tag)
+      wrap = RevokedDump.new(revoked)
+      @detail.text = wrap.get_dump(tag)
+    end
+
+    def show_request(request, tag)
+      wrap = RequestDump.new(request)
+      @detail.text = wrap.get_dump(tag)
+    end
+  end
+
+  attr_reader :cert_store
+
+  def initialize(app, cert_store)
+    @cert_store = cert_store
+    @verify_filter = 0
+    @verify_filename = nil
+    full_width = 800
+    full_height = 500
+    horz_pos = 300
+
+    super(app, "Certificate store", nil, nil, DECOR_ALL, 0, 0, full_width,
+      full_height)
+
+    FXTooltip.new(self.getApp())
+
+    menubar = FXMenubar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
+    file_menu = FXMenuPane.new(self)
+    FXMenuTitle.new(menubar, "&File", nil, file_menu)
+    file_open_menu = FXMenuPane.new(self)
+    FXMenuCommand.new(file_open_menu, "&Directory\tCtl-O").connect(SEL_COMMAND,
+      method(:on_cmd_file_open_dir))
+    FXMenuCascade.new(file_menu, "&Open\tCtl-O", nil, file_open_menu)
+    FXMenuCommand.new(file_menu, "&Quit\tCtl-Q", nil, getApp(), FXApp::ID_QUIT)
+
+    tool_menu = FXMenuPane.new(self)
+    FXMenuTitle.new(menubar, "&Tool", nil, tool_menu)
+    FXMenuCommand.new(tool_menu, "&Verify\tCtl-N").connect(SEL_COMMAND,
+      method(:on_cmd_tool_verify))
+    FXMenuCommand.new(tool_menu, "&Show Request\tCtl-R").connect(SEL_COMMAND,
+      method(:on_cmd_tool_request))
+
+    base_frame = FXHorizontalFrame.new(self, LAYOUT_FILL_X | LAYOUT_FILL_Y)
+    splitter_horz = FXSplitter.new(base_frame, LAYOUT_SIDE_TOP | LAYOUT_FILL_X |
+    LAYOUT_FILL_Y | SPLITTER_TRACKING | SPLITTER_HORIZONTAL)
+
+    # Cert tree
+    cert_tree_frame = FXHorizontalFrame.new(splitter_horz, LAYOUT_FILL_X |
+      LAYOUT_FILL_Y | FRAME_SUNKEN | FRAME_THICK)
+    cert_tree_frame.setWidth(horz_pos)
+    cert_tree = FXTreeList.new(cert_tree_frame, 0, nil, 0,
+      TREELIST_BROWSESELECT | TREELIST_SHOWS_LINES | TREELIST_SHOWS_BOXES |
+      TREELIST_ROOT_BOXES | LAYOUT_FILL_X | LAYOUT_FILL_Y)
+    @cert_tree = CertTree.new(self, cert_tree)
+
+    # Cert info
+    splitter_vert = FXSplitter.new(splitter_horz, LAYOUT_SIDE_TOP |
+      LAYOUT_FILL_X | LAYOUT_FILL_Y | SPLITTER_TRACKING | SPLITTER_VERTICAL |
+      SPLITTER_REVERSED)
+    cert_list_base = FXVerticalFrame.new(splitter_vert, LAYOUT_FILL_X |
+      LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0)
+    cert_list_frame = FXHorizontalFrame.new(cert_list_base, FRAME_SUNKEN |
+      FRAME_THICK | LAYOUT_FILL_X | LAYOUT_FILL_Y)
+    cert_info = FXTable.new(cert_list_frame, 2, 10, nil, 0, FRAME_SUNKEN |
+      TABLE_COL_SIZABLE | LAYOUT_FILL_X | LAYOUT_FILL_Y, 0, 0, 0, 0, 2, 2, 2, 2)
+    @cert_info = CertInfo.new(self, cert_info)
+
+    cert_detail_base = FXVerticalFrame.new(splitter_vert, LAYOUT_FILL_X |
+      LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0)
+    cert_detail_frame = FXHorizontalFrame.new(cert_detail_base, FRAME_SUNKEN |
+      FRAME_THICK | LAYOUT_FILL_X | LAYOUT_FILL_Y)
+    cert_detail = FXText.new(cert_detail_frame, nil, 0, TEXT_READONLY |
+      LAYOUT_FILL_X | LAYOUT_FILL_Y)
+    @cert_detail = CertDetail.new(self, cert_detail)
+
+    show_init
+  end
+
+  def create
+    super
+    show(PLACEMENT_SCREEN)
+  end
+
+  def show_init
+    @cert_tree.show(@cert_store)
+    show_item(nil)
+  end
+
+  def show_certs
+    @cert_tree.show_certs(@cert_store)
+  end
+
+  def show_request(req)
+    @cert_tree.show_request(req)
+  end
+
+  def show_verify_path(verify_path)
+    @cert_tree.show_verify_path(verify_path)
+  end
+
+  def show_item(item)
+    @cert_info.show(item) if @cert_info
+  end
+
+  def show_detail(item, tag)
+    @cert_detail.show(item, tag) if @cert_detail
+  end
+
+  def verify(certfile)
+    path = verify_certfile(certfile)
+    show_certs	# CRL could be change.
+    show_verify_path(path)
+  end
+
+private
+
+  def on_cmd_file_open_dir(sender, sel, ptr)
+    dir = FXFileDialog.getOpenDirectory(self, "Open certificate directory", ".")
+    unless dir.empty?
+      begin
+	@cert_store = CertStore.new(dir)
+      rescue
+	show_error($!)
+      end
+      show_init
+    end
+    1
+  end
+
+  def on_cmd_tool_verify(sender, sel, ptr)
+    dialog = FXFileDialog.new(self, "Verify certificate")
+    dialog.filename = ''
+    dialog.patternList = ["All Files (*)", "PEM formatted certificate (*.pem)"]
+    dialog.currentPattern = @verify_filter
+    if dialog.execute != 0
+      @verify_filename = dialog.filename
+      verify(@verify_filename)
+    end
+    @verify_filter = dialog.currentPattern
+    1
+  end
+
+  def on_cmd_tool_request(sender, sel, ptr)
+    dialog = FXFileDialog.new(self, "Show request")
+    dialog.filename = ''
+    dialog.patternList = ["All Files (*)", "PEM formatted certificate (*.pem)"]
+    if dialog.execute != 0
+      req = @cert_store.generate_cert(dialog.filename)
+      show_request(req)
+    end
+    1
+  end
+
+  def verify_certfile(filename)
+    begin
+      cert = @cert_store.generate_cert(filename)
+      result = @cert_store.verify(cert)
+      @cert_store.scan_certs
+      result
+    rescue
+      show_error($!)
+      []
+    end
+  end
+
+  def show_error(e)
+    msg = e.inspect + "\n" + e.backtrace.join("\n")
+    FXMessageBox.error(self, MBOX_OK, "Error", msg)
+  end
+end
+
+getopts nil, "cert:"
+
+certs_dir = ARGV.shift or raise "#{$0} cert_dir"
+certfile = $OPT_cert
+app = FXApp.new("CertStore", "FoxTest")
+cert_store = CertStore.new(certs_dir)
+w = CertStoreView.new(app, cert_store)
+app.create
+if certfile
+  w.verify(certfile)
+end
+app.run
diff --git a/ruby_1_8_6/sample/openssl/certstore.rb b/ruby_1_8_6/sample/openssl/certstore.rb
new file mode 100644
index 0000000000..bbc637f668
--- /dev/null
+++ b/ruby_1_8_6/sample/openssl/certstore.rb
@@ -0,0 +1,161 @@
+require 'c_rehash'
+require 'crlstore'
+
+
+class CertStore
+  include OpenSSL
+  include X509
+
+  attr_reader :self_signed_ca
+  attr_reader :other_ca
+  attr_reader :ee
+  attr_reader :crl
+  attr_reader :request
+
+  def initialize(certs_dir)
+    @certs_dir = certs_dir
+    @c_store = CHashDir.new(@certs_dir)
+    @c_store.hash_dir(true)
+    @crl_store = CrlStore.new(@c_store)
+    @x509store = Store.new
+    @self_signed_ca = @other_ca = @ee = @crl = nil
+
+    # Uncomment this line to let OpenSSL to check CRL for each certs.
+    # @x509store.flags = V_FLAG_CRL_CHECK | V_FLAG_CRL_CHECK_ALL
+
+    add_path
+    scan_certs
+  end
+
+  def generate_cert(filename)
+    @c_store.load_pem_file(filename)
+  end
+
+  def verify(cert)
+    error, crl_map = do_verify(cert)
+    if error
+      [[false, cert, crl_map[cert.subject], error]]
+    else
+      @x509store.chain.collect { |c| [true, c, crl_map[c.subject], nil] }
+    end
+  end
+
+  def match_cert(cert1, cert2)
+    (cert1.issuer.cmp(cert2.issuer) == 0) and cert1.serial == cert2.serial
+  end
+
+  def is_ca?(cert)
+    case guess_cert_type(cert)
+    when CERT_TYPE_SELF_SIGNED
+      true
+    when CERT_TYPE_OTHER 
+      true
+    else
+      false
+    end
+  end
+
+  def scan_certs
+    @self_signed_ca = []
+    @other_ca = []
+    @ee = []
+    @crl = []
+    @request = []
+    load_certs
+  end
+
+private
+
+  def add_path
+    @x509store.add_path(@certs_dir)
+  end
+
+  def do_verify(cert)
+    error_map = {}
+    crl_map = {}
+    result = @x509store.verify(cert) do |ok, ctx|
+      cert = ctx.current_cert
+      if ctx.current_crl
+	crl_map[cert.subject] = true
+      end
+      if ok
+	if !ctx.current_crl
+	  if crl = @crl_store.find_crl(cert)
+	    crl_map[cert.subject] = true
+	    if crl.revoked.find { |revoked| revoked.serial == cert.serial }
+	      ok = false
+	      error_string = 'certification revoked'
+	    end
+	  end
+	end
+      end
+      error_map[cert.subject] = error_string if error_string
+      ok
+    end
+    error = if result
+	nil
+      else
+	error_map[cert.subject] || @x509store.error_string
+      end
+    return error, crl_map
+  end
+
+  def load_certs
+    @c_store.get_certs.each do |certfile|
+      cert = generate_cert(certfile)
+      case guess_cert_type(cert)
+      when CERT_TYPE_SELF_SIGNED
+	@self_signed_ca << cert
+      when CERT_TYPE_OTHER
+	@other_ca << cert
+      when CERT_TYPE_EE
+	@ee << cert
+      else
+	raise "Unknown cert type."
+      end
+    end
+    @c_store.get_crls.each do |crlfile|
+      @crl << generate_cert(crlfile)
+    end
+  end
+
+  CERT_TYPE_SELF_SIGNED = 0
+  CERT_TYPE_OTHER = 1
+  CERT_TYPE_EE = 2
+  def guess_cert_type(cert)
+    ca = self_signed = is_cert_self_signed(cert)
+    cert.extensions.each do |ext|
+      # Ignores criticality of extensions.  It's 'guess'ing.
+      case ext.oid
+      when 'basicConstraints'
+	/CA:(TRUE|FALSE), pathlen:(\d+)/ =~ ext.value
+	ca = ($1 == 'TRUE') unless ca
+      when 'keyUsage'
+	usage = ext.value.split(/\s*,\s*/)
+	ca = usage.include?('Certificate Sign') unless ca
+      when 'nsCertType'
+	usage = ext.value.split(/\s*,\s*/)
+	ca = usage.include?('SSL CA') unless ca
+      end
+    end
+    if ca
+      if self_signed
+	CERT_TYPE_SELF_SIGNED
+      else
+	CERT_TYPE_OTHER
+      end
+    else
+      CERT_TYPE_EE
+    end
+  end
+
+  def is_cert_self_signed(cert)
+    # cert.subject.cmp(cert.issuer) == 0
+    cert.subject.to_s == cert.issuer.to_s
+  end
+end
+
+
+if $0 == __FILE__
+  c = CertStore.new("trust_certs")
+end
diff --git a/ruby_1_8_6/sample/openssl/cipher.rb b/ruby_1_8_6/sample/openssl/cipher.rb
new file mode 100644
index 0000000000..6e8cdb9427
--- /dev/null
+++ b/ruby_1_8_6/sample/openssl/cipher.rb
@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+require 'openssl'
+
+text = "abcdefghijklmnopqrstuvwxyz"
+pass = "secret password"
+salt = "8 octets"        # or nil
+alg = "DES-EDE3-CBC"
+#alg = "AES-128-CBC"
+
+puts "--Setup--"
+puts %(clear text:    "#{text}")
+puts %(password:      "#{pass}")
+puts %(salt:          "#{salt}")
+puts %(cipher alg:    "#{alg}")
+puts
+
+puts "--Encrypting--"
+des = OpenSSL::Cipher::Cipher.new(alg)
+des.pkcs5_keyivgen(pass, salt)
+des.encrypt
+cipher =  des.update(text)
+cipher << des.final
+puts %(encrypted text: #{cipher.inspect})
+puts
+
+puts "--Decrypting--"
+des = OpenSSL::Cipher::Cipher.new(alg)
+des.pkcs5_keyivgen(pass, salt)
+des.decrypt
+out =  des.update(cipher)
+out << des.final
+puts %(decrypted text: "#{out}")
+puts
diff --git a/ruby_1_8_6/sample/openssl/crlstore.rb b/ruby_1_8_6/sample/openssl/crlstore.rb
new file mode 100644
index 0000000000..b305913eb0
--- /dev/null
+++ b/ruby_1_8_6/sample/openssl/crlstore.rb
@@ -0,0 +1,122 @@
+begin
+  require 'http-access2'
+rescue LoadError
+  STDERR.puts("Cannot load http-access2.  CRL might not be fetched.")
+end
+require 'c_rehash'
+
+
+class CrlStore
+  def initialize(c_store)
+    @c_store = c_store
+    @c_store.hash_dir(true)
+  end
+
+  def find_crl(cert)
+    do_find_crl(cert)
+  end
+
+private
+
+  def do_find_crl(cert)
+    unless ca = find_ca(cert)
+      return nil
+    end
+    unless crlfiles = @c_store.get_crls(ca.subject)
+      if crl = renew_crl(cert, ca)
+	@c_store.add_crl(crl)
+	return crl
+      end
+      return nil
+    end
+    crlfiles.each do |crlfile|
+      next unless crl = load_crl(crlfile)
+      if crl.next_update < Time.now
+	if new_crl = renew_crl(cert, ca)
+	  @c_store.delete_crl(crl)
+	  @c_store.add_crl(new_crl)
+	  crl = new_crl
+	end
+      end
+      if check_valid(crl, ca)
+	return crl
+      end
+    end
+    nil
+  end
+
+  def find_ca(cert)
+    @c_store.get_certs(cert.issuer).each do |cafile|
+      ca = load_cert(cafile)
+      if cert.verify(ca.public_key)
+	return ca
+      end
+    end
+    nil
+  end
+
+  def fetch(location)
+    if /\AURI:(.*)\z/ =~ location
+      begin
+	c = HTTPAccess2::Client.new(ENV['http_proxy'] || ENV['HTTP_PROXY'])
+	c.get_content($1)
+      rescue NameError, StandardError
+	nil
+      end
+    else
+      nil
+    end
+  end
+
+  def load_cert(certfile)
+    load_cert_str(File.read(certfile))
+  end
+
+  def load_crl(crlfile)
+    load_crl_str(File.read(crlfile))
+  end
+
+  def load_cert_str(cert_str)
+    OpenSSL::X509::Certificate.new(cert_str)
+  end
+
+  def load_crl_str(crl_str)
+    OpenSSL::X509::CRL.new(crl_str)
+  end
+
+  def check_valid(crl, ca)
+    unless crl.verify(ca.public_key)
+      return false
+    end
+    crl.last_update <= Time.now
+  end
+
+  RE_CDP = /\AcrlDistributionPoints\z/
+  def get_cdp(cert)
+    if cdp_ext = cert.extensions.find { |ext| RE_CDP =~ ext.oid }
+      cdp_ext.value.chomp
+    else
+      false
+    end
+  end
+
+  def renew_crl(cert, ca)
+    if cdp = get_cdp(cert)
+      if new_crl_str = fetch(cdp)
+	new_crl = load_crl_str(new_crl_str)
+	if check_valid(new_crl, ca)
+	  return new_crl
+	end
+      end
+    end
+    false
+  end
+end
+
+if $0 == __FILE__
+  dir = "trust_certs"
+  c_store = CHashDir.new(dir)
+  s = CrlStore.new(c_store)
+  c = OpenSSL::X509::Certificate.new(File.read("cert_store/google_codesign.pem"))
+  p s.find_crl(c)
+end
diff --git a/ruby_1_8_6/sample/openssl/echo_cli.rb b/ruby_1_8_6/sample/openssl/echo_cli.rb
new file mode 100644
index 0000000000..29b356a7ad
--- /dev/null
+++ b/ruby_1_8_6/sample/openssl/echo_cli.rb
@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+
+require 'socket'
+require 'openssl'
+require 'getopts'
+
+getopts nil, "p:2000", "c:", "k:", "C:"
+
+host      = ARGV[0] || "localhost"
+port      = $OPT_p
+cert_file = $OPT_c
+key_file  = $OPT_k
+ca_path   = $OPT_C
+
+ctx = OpenSSL::SSL::SSLContext.new()
+if cert_file && key_file
+  ctx.cert = OpenSSL::X509::Certificate.new(File::read(cert_file))
+  ctx.key  = OpenSSL::PKey::RSA.new(File::read(key_file))
+end
+if ca_path
+  ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
+  ctx.ca_path = ca_path
+else
+  $stderr.puts "!!! WARNING: PEER CERTIFICATE WON'T BE VERIFIED !!!"
+end
+
+s = TCPSocket.new(host, port)
+ssl = OpenSSL::SSL::SSLSocket.new(s, ctx)
+ssl.connect # start SSL session
+ssl.sync_close = true  # if true the underlying socket will be
+                       # closed in SSLSocket#close. (default: false)
+while line = $stdin.gets
+  ssl.write line
+  print ssl.gets
+end
+
+ssl.close
diff --git a/ruby_1_8_6/sample/openssl/echo_svr.rb b/ruby_1_8_6/sample/openssl/echo_svr.rb
new file mode 100644
index 0000000000..be8e10fa26
--- /dev/null
+++ b/ruby_1_8_6/sample/openssl/echo_svr.rb
@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+
+require 'socket'
+require 'openssl'
+require 'getopts'
+
+getopts nil, "p:2000", "c:", "k:", "C:"
+
+port      = $OPT_p
+cert_file = $OPT_c
+key_file  = $OPT_k
+ca_path   = $OPT_C
+
+if cert_file && key_file
+  cert = OpenSSL::X509::Certificate.new(File::read(cert_file))
+  key  = OpenSSL::PKey::RSA.new(File::read(key_file))
+else
+  key = OpenSSL::PKey::RSA.new(512){ print "." }
+  puts
+  cert = OpenSSL::X509::Certificate.new
+  cert.version = 2
+  cert.serial = 0
+  name = OpenSSL::X509::Name.new([["C","JP"],["O","TEST"],["CN","localhost"]])
+  cert.subject = name
+  cert.issuer = name
+  cert.not_before = Time.now
+  cert.not_after = Time.now + 3600
+  cert.public_key = key.public_key
+  ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
+  cert.extensions = [
+    ef.create_extension("basicConstraints","CA:FALSE"),
+    ef.create_extension("subjectKeyIdentifier","hash"),
+    ef.create_extension("extendedKeyUsage","serverAuth"),
+    ef.create_extension("keyUsage",
+                        "keyEncipherment,dataEncipherment,digitalSignature")
+  ]
+  ef.issuer_certificate = cert
+  cert.add_extension ef.create_extension("authorityKeyIdentifier",
+                                         "keyid:always,issuer:always")
+  cert.sign(key, OpenSSL::Digest::SHA1.new)
+end
+
+ctx = OpenSSL::SSL::SSLContext.new()
+ctx.key = key
+ctx.cert = cert
+if ca_path
+  ctx.verify_mode =
+    OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+  ctx.ca_path = ca_path
+else
+  $stderr.puts "!!! WARNING: PEER CERTIFICATE WON'T BE VERIFIED !!!"
+end
+
+tcps = TCPServer.new(port)
+ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
+loop do
+  ns = ssls.accept
+  while line = ns.gets
+    ns.write line
+  end
+  ns.close
+end
diff --git a/ruby_1_8_6/sample/openssl/gen_csr.rb b/ruby_1_8_6/sample/openssl/gen_csr.rb
new file mode 100644
index 0000000000..5858acd9f2
--- /dev/null
+++ b/ruby_1_8_6/sample/openssl/gen_csr.rb
@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+
+require 'getopts'
+require 'openssl'
+
+include OpenSSL
+
+def usage
+  myname = File::basename($0)
+  $stderr.puts <<EOS
+Usage: #{myname} [--key keypair_file] name
+  name ... ex. /C=JP/O=RRR/OU=CA/CN=NaHi/emailAddress=nahi@example.org
+EOS
+  exit
+end
+
+getopts nil, "key:", "csrout:", "keyout:"
+keypair_file = $OPT_key
+csrout = $OPT_csrout || "csr.pem"
+keyout = $OPT_keyout || "keypair.pem"
+
+$stdout.sync = true
+name_str = ARGV.shift or usage()
+p name_str
+name = X509::Name.parse(name_str)
+
+keypair = nil
+if keypair_file
+  keypair = PKey::RSA.new(File.open(keypair_file).read)
+else
+  keypair = PKey::RSA.new(1024) { putc "." }
+  puts
+  puts "Writing #{keyout}..."
+  File.open(keyout, "w", 0400) do |f|
+    f << keypair.to_pem
+  end
+end
+
+puts "Generating CSR for #{name_str}"
+
+req = X509::Request.new
+req.version = 0
+req.subject = name
+req.public_key = keypair.public_key
+req.sign(keypair, Digest::MD5.new)
+
+puts "Writing #{csrout}..."
+File.open(csrout, "w") do |f|
+  f << req.to_pem
+end
diff --git a/ruby_1_8_6/sample/openssl/smime_read.rb b/ruby_1_8_6/sample/openssl/smime_read.rb
new file mode 100644
index 0000000000..0f08f54f7e
--- /dev/null
+++ b/ruby_1_8_6/sample/openssl/smime_read.rb
@@ -0,0 +1,23 @@
+require 'getopts'
+require 'openssl'
+include OpenSSL
+
+getopts nil, "c:", "k:", "C:"
+
+cert_file = $OPT_c
+key_file  = $OPT_k
+ca_path   = $OPT_C
+
+data = $stdin.read
+
+cert = X509::Certificate.new(File::read(cert_file))
+key = PKey::RSA.new(File::read(key_file))
+p7enc = PKCS7::read_smime(data)
+data = p7enc.decrypt(key, cert)
+
+store = X509::Store.new
+store.add_path(ca_path)
+p7sig = PKCS7::read_smime(data)
+if p7sig.verify([], store)
+  puts p7sig.data
+end
diff --git a/ruby_1_8_6/sample/openssl/smime_write.rb b/ruby_1_8_6/sample/openssl/smime_write.rb
new file mode 100644
index 0000000000..ce32cd8146
--- /dev/null
+++ b/ruby_1_8_6/sample/openssl/smime_write.rb
@@ -0,0 +1,23 @@
+require 'openssl'
+require 'getopts'
+include OpenSSL
+
+getopts nil, "c:", "k:", "r:"
+
+cert_file = $OPT_c
+key_file  = $OPT_k
+rcpt_file = $OPT_r
+
+cert = X509::Certificate.new(File::read(cert_file))
+key = PKey::RSA.new(File::read(key_file))
+
+data  = "Content-Type: text/plain\r\n"
+data << "\r\n"
+data << "This is a clear-signed message.\r\n"
+
+p7sig  = PKCS7::sign(cert, key, data, [], PKCS7::DETACHED)
+smime0 = PKCS7::write_smime(p7sig)
+
+rcpt  = X509::Certificate.new(File::read(rcpt_file))
+p7enc = PKCS7::encrypt([rcpt], smime0)
+print PKCS7::write_smime(p7enc)   
diff --git a/ruby_1_8_6/sample/openssl/wget.rb b/ruby_1_8_6/sample/openssl/wget.rb
new file mode 100644
index 0000000000..0362ab980d
--- /dev/null
+++ b/ruby_1_8_6/sample/openssl/wget.rb
@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+require 'net/https'
+require 'getopts'
+
+getopts nil, 'C:'
+
+ca_path = $OPT_C
+
+uri = URI.parse(ARGV[0])
+if proxy = ENV['HTTP_PROXY']
+  prx_uri = URI.parse(proxy)
+  prx_host = prx_uri.host
+  prx_port = prx_uri.port
+end
+
+h = Net::HTTP.new(uri.host, uri.port, prx_host, prx_port)
+h.set_debug_output($stderr) if $DEBUG
+if uri.scheme == "https"
+  h.use_ssl = true
+  if ca_path
+    h.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    h.ca_path = ca_path
+  else
+    $stderr.puts "!!! WARNING: PEER CERTIFICATE WON'T BE VERIFIED !!!"
+  end
+end
+
+path = uri.path.empty? ? "/" : uri.path
+h.get2(path){|resp|
+  STDERR.puts h.peer_cert.inspect if h.peer_cert
+  print resp.body
+}
diff --git a/ruby_1_8_6/sample/optparse/opttest.rb b/ruby_1_8_6/sample/optparse/opttest.rb
new file mode 100644
index 0000000000..61b157bce5
--- /dev/null
+++ b/ruby_1_8_6/sample/optparse/opttest.rb
@@ -0,0 +1,85 @@
+#!/usr/bin/ruby -I.
+
+require 'optparse'
+require 'optparse/time'
+require 'pp'
+
+# keywords
+CODES = %w[iso-2022-jp shift_jis euc-jp utf8 binary]
+CODE_ALIASES = {"jis" => "iso-2022-jp", "sjis" => "shift_jis"}
+POSSIBLE_CODES = "(#{(CODES+CODE_ALIASES.keys).join(',')})"
+
+ARGV.options do
+  |opts|
+  opts.banner << " argv..."
+
+  # separater
+  opts.on_tail
+  opts.on_tail("common options:")
+
+  # no argument, shows at tail
+  opts.on_tail("--help", "show this message") {puts opts; exit}
+
+  # mandatory argument
+  opts.on("-r", "--require=LIBRARY", String,
+	  "require the LIBRARY, before",
+	  "executing your script") {|@library|}
+
+  # optional argument
+  opts.on("-i", "--inplace=[EXTENSION]",
+	  "edit ARGV files in place", # multiline description
+	  "(make backup if EXTENSION supplied)") {|@inplace| @inplace ||= ''}
+
+  opts.on("-N=[NUM]", Integer) {|@number|}
+
+  # additional class
+  opts.on("-t", "--[no-]time[=TIME]", Time, "it's the time") {|@time|}
+
+  # limit argument syntax
+  opts.on("-[0-7]", "-F", "--irs=[OCTAL]", OptionParser::OctalInteger,
+	  "specify record separator", "(\\0, if no argument)") {|@irs|}
+
+  # boolean switch(default true)
+  @exec = true
+  opts.on("-n", "--no-exec[=FLAG]", TrueClass, "not really execute") {|@exec|}
+
+  # array
+  opts.on("-a", "--list[=LIST,LIST]", Array, "list") {|@list|}
+
+  # fixed size array
+  opts.on("--pair[=car,cdr]", Array, "pair") {|@x, @y|}
+
+  # keyword completion
+  opts.on("--code=CODE", CODES, CODE_ALIASES, "select coding system",
+	  "("+CODES.join(",")+",", " "+CODE_ALIASES.keys.join(",")+")") {|@code|}
+
+  # optional argument with keyword completion
+  opts.on("--type[=TYPE]", [:text, :binary], "select type(text, binary)") {|@type|}
+
+  # boolean switch with optional argument(default false)
+  opts.on("-v", "--[no-]verbose=[FLAG]", "run verbosely") {|@verbose|}
+
+  # easy way, set local variable
+  opts.on("-q", "--quit", "quit when ARGV is empty") {|@quit|}
+
+  # adding on the fly
+  opts.on("--add=SWITCH=[ARG]", "add option on the fly", /\A(\w+)(?:=.+)?\Z/) do
+    |opt, var|
+    opts.on("--#{opt}", "added in runtime", &eval("proc {|@#{var}|}"))
+  end
+
+  opts.on_head("specific options:")
+
+  # no argument
+  opts.on_tail("--version", "show version") do
+    puts OptionParser::Version.join('.')
+    exit
+  end
+  opts.parse!
+end
+
+pp self
+(print ARGV.options; exit) if @quit
+ARGV.options = nil		# no more parse
+puts "ARGV = #{ARGV.join(' ')}" if !ARGV.empty?
+#opts.variable.each {|sym| puts "#{sym} = #{opts.send(sym).inspect}"}
diff --git a/ruby_1_8_6/sample/optparse/subcommand.rb b/ruby_1_8_6/sample/optparse/subcommand.rb
new file mode 100755
index 0000000000..21c42dd60a
--- /dev/null
+++ b/ruby_1_8_6/sample/optparse/subcommand.rb
@@ -0,0 +1,19 @@
+#! /usr/bin/ruby
+# contributed by Minero Aoki.
+
+require 'optparse'
+
+parser = OptionParser.new
+parser.on('-i') { puts "-i" }
+parser.on('-o') { puts '-o' }
+
+subparsers = Hash.new {|h,k|
+  $stderr.puts "no such subcommand: #{k}"
+  exit 1
+}
+subparsers['add'] = OptionParser.new.on('-i') { puts "add -i" }
+subparsers['del'] = OptionParser.new.on('-i') { puts "del -i" }
+subparsers['list'] = OptionParser.new.on('-i') { puts "list -i" }
+
+parser.order!(ARGV)
+subparsers[ARGV.shift].parse!(ARGV) unless ARGV.empty?
diff --git a/ruby_1_8_6/sample/philos.rb b/ruby_1_8_6/sample/philos.rb
new file mode 100644
index 0000000000..119e7c36b9
--- /dev/null
+++ b/ruby_1_8_6/sample/philos.rb
@@ -0,0 +1,54 @@
+#
+# The Dining Philosophers - thread example
+#
+require "thread"
+
+srand
+#srand
+N=9				# number of philosophers
+$forks = []
+for i in 0..N-1
+  $forks[i] = Mutex.new
+end
+$state = "-o"*N
+
+def wait
+  sleep rand(20)/10.0
+end
+
+def think(n)
+  wait
+end
+
+def eat(n)
+  wait
+end
+
+def philosopher(n)
+  while TRUE
+    think n
+    $forks[n].lock
+    if not $forks[(n+1)%N].try_lock
+      $forks[n].unlock		# avoid deadlock
+      next
+    end
+    $state[n*2] = ?|;
+    $state[(n+1)%N*2] = ?|;
+    $state[n*2+1] = ?*;
+    print $state, "\n"
+    eat(n)
+    $state[n*2] = ?-;
+    $state[(n+1)%N*2] = ?-;
+    $state[n*2+1] = ?o;
+    print $state, "\n"
+    $forks[n].unlock
+    $forks[(n+1)%N].unlock
+  end
+end
+
+for n in 0..N-1
+  Thread.start(n){|i| philosopher(i)}
+  sleep 0.1
+end
+
+sleep
diff --git a/ruby_1_8_6/sample/pi.rb b/ruby_1_8_6/sample/pi.rb
new file mode 100644
index 0000000000..63be974285
--- /dev/null
+++ b/ruby_1_8_6/sample/pi.rb
@@ -0,0 +1,18 @@
+#!/usr/local/bin/ruby
+
+k, a, b, a1, b1 = 2, 4, 1, 12, 4
+
+loop do
+  # Next approximation
+  p, q, k = k*k, 2*k+1, k+1
+  a, b, a1, b1 = a1, b1, p*a+q*a1, p*b+q*b1
+  # Print common digits
+  d = a / b
+  d1 = a1 / b1
+  while d == d1
+    print d
+    $stdout.flush
+    a, a1 = 10*(a%b), 10*(a1%b1)
+    d, d1 = a/b, a1/b1
+  end
+end
diff --git a/ruby_1_8_6/sample/rcs.awk b/ruby_1_8_6/sample/rcs.awk
new file mode 100644
index 0000000000..08979285c9
--- /dev/null
+++ b/ruby_1_8_6/sample/rcs.awk
@@ -0,0 +1,33 @@
+BEGIN {
+    sw = 40.0;
+    dw = 78.0;
+    hdw = dw / 2.0;
+    w = 20.0;
+    h =1.0;
+    d = 0.2;
+    ss="abcdefghijklmnopqrstuvwxyz0123456789!#$%^&*()-=\\[];'`,./";
+    rnd = srand();
+}
+
+{
+    xr = -hdw; y = h * 1.0; maxxl = -999;
+    s = "";
+    while (xr < hdw) {
+	x = xr * (1 + y) - y * w / 2;
+	i = (x / (1 + h) + sw /2);
+	c = (0 < i && i < length($0)) ? substr($0, i, 1) : "0";
+	y = h - d * c;
+	xl = xr - w * y / (1 + y);
+	if (xl < -hdw || xl >= hdw || xl <= maxxl) {
+	    t = rand() * length(ss);
+	    c = substr(ss, t, 1);
+	}
+	else {
+	    c = substr(s, xl + hdw, 1);
+	    maxxl = xl;
+	}
+	s = s c;
+	xr = xr + 1;
+    }
+    print s;
+}
diff --git a/ruby_1_8_6/sample/rcs.dat b/ruby_1_8_6/sample/rcs.dat
new file mode 100644
index 0000000000..61c88bff89
--- /dev/null
+++ b/ruby_1_8_6/sample/rcs.dat
@@ -0,0 +1,17 @@
+0000000000000000220000000000000000
+0000000000000111221110000000000000
+0000000000111112222111110000000000
+0000000111111112222111111110000000
+0000111111111122222211111111110000
+0111111111111222222221111111111110
+2222222222222222222222222222222222
+1122222222222222222222222222222211
+0111122222222222222222222222211110
+0011111122222222222222222211111100
+0001111111222222222222221111111000
+0000111112222222222222222111110000
+0000011122222222112222222211100000
+0000001122222221111222222211000000
+0000000122221111111111222210000000
+0000000221111111111111111220000000
+0000000000000000000000000000000000
diff --git a/ruby_1_8_6/sample/rcs.rb b/ruby_1_8_6/sample/rcs.rb
new file mode 100644
index 0000000000..0bdf81c45d
--- /dev/null
+++ b/ruby_1_8_6/sample/rcs.rb
@@ -0,0 +1,39 @@
+# random dot steraogram
+# usage: rcs.rb rcs.dat
+
+sw = 40.0	# width of original pattern
+dw = 78.0	# width of generating Random Character Streogram
+hdw = dw / 2.0
+w = 20.0	# distance between eyes
+h =1.0		# distance from screen and base plane
+d = 0.2		# z value unit
+ss="abcdefghijklmnopqrstuvwxyz0123456789#!$%^&*()-=\\[];'`,./"
+rnd = srand()	# You don't actually need this in ruby - srand() is called
+		# on the first call of rand().
+
+while gets()
+#  print($_)
+  xr = -hdw; y = h * 1.0; maxxl = -999
+  s = ""
+  while xr < hdw
+    x = xr * (1 + y) - y * w / 2
+    i = (x / (1 + h) + sw / 2)
+    if (1 < i && i < $_.length)
+      c = $_[i, 1].to_i
+    else
+      c = 0
+    end
+    y = h - d * c
+    xl = xr - w * y / (1 + y)
+    if xl < -hdw || xl >= hdw || xl <= maxxl
+      tt = rand(ss.length)
+      c = ss[tt, 1]
+    else
+      c = s[xl + hdw, 1]
+      maxxl = xl
+    end
+    s += c
+    xr += 1
+  end
+  print(s, "\n")
+end
diff --git a/ruby_1_8_6/sample/regx.rb b/ruby_1_8_6/sample/regx.rb
new file mode 100644
index 0000000000..aaf4b5f1ee
--- /dev/null
+++ b/ruby_1_8_6/sample/regx.rb
@@ -0,0 +1,23 @@
+st = "\033[7m"
+en = "\033[m"
+#st = "<<"
+#en = ">>"
+
+while TRUE
+  print "str> "
+  STDOUT.flush
+  input = gets
+  break if not input
+  if input != ""
+    str = input
+    str.chop!
+  end
+  print "pat> "
+  STDOUT.flush
+  re = gets
+  break if not re
+  re.chop!
+  str.gsub! re, "#{st}\\&#{en}"
+  print str, "\n"
+end
+print "\n"
diff --git a/ruby_1_8_6/sample/rss/blend.rb b/ruby_1_8_6/sample/rss/blend.rb
new file mode 100755
index 0000000000..2fbd6efed6
--- /dev/null
+++ b/ruby_1_8_6/sample/rss/blend.rb
@@ -0,0 +1,73 @@
+#!/usr/bin/env ruby
+
+require "rss"
+
+feeds = []
+verbose = false
+encoding = "UTF-8"
+
+def error(exception)
+  mark = "=" * 20
+  mark = "#{mark} error #{mark}"
+  STDERR.puts mark
+  STDERR.puts exception.class
+  STDERR.puts exception.message
+  STDERR.puts exception.backtrace
+  STDERR.puts mark
+end
+
+before_time = Time.now
+ARGV.each do |fname|
+  if fname == '-v'
+    verbose = true
+    next
+  end
+  rss = nil
+  f = File.new(fname).read
+  begin
+    ## do validate parse
+    rss = RSS::Parser.parse(f)
+  rescue RSS::InvalidRSSError
+    error($!) if verbose
+    ## do non validate parse for invalid RSS 1.0
+    begin
+      rss = RSS::Parser.parse(f, false)
+    rescue RSS::Error
+      ## invalid RSS.
+      error($!) if verbose
+    end
+  rescue RSS::Error
+    error($!) if verbose
+  end
+  if rss.nil?
+    STDERR.puts "#{fname} does not include RSS 1.0 or 0.9x/2.0"
+  else
+    begin
+      rss.output_encoding = encoding
+    rescue RSS::UnknownConversionMethodError
+      error($!) if verbose
+    end
+    feeds << rss
+  end
+end
+processing_time = Time.now - before_time
+
+rss = RSS::Maker.make("1.0") do |maker|
+  maker.encoding = encoding
+  maker.channel.about = "http://example.com/blend.rdf"
+  maker.channel.title = "blended feeds"
+  maker.channel.link = "http://example.com/"
+  maker.channel.description = "blended feeds generated by RSS Parser"
+
+  feeds.each do |feed|
+    feed.items.each do |item|
+      item.setup_maker(maker.items)
+    end
+  end
+  maker.items.do_sort = true
+  maker.items.max_size = 15
+end
+puts rss
+
+STDERR.puts "Used XML parser: #{RSS::Parser.default_parser}"
+STDERR.puts "Processing time: #{processing_time}s"
diff --git a/ruby_1_8_6/sample/rss/convert.rb b/ruby_1_8_6/sample/rss/convert.rb
new file mode 100755
index 0000000000..394b13e8eb
--- /dev/null
+++ b/ruby_1_8_6/sample/rss/convert.rb
@@ -0,0 +1,69 @@
+#!/usr/bin/env ruby
+
+require "rss"
+
+feeds = []
+verbose = false
+encoding = "UTF-8"
+to_version = "1.0"
+
+def error(exception)
+  mark = "=" * 20
+  mark = "#{mark} error #{mark}"
+  STDERR.puts mark
+  STDERR.puts exception.class
+  STDERR.puts exception.message
+  STDERR.puts exception.backtrace
+  STDERR.puts mark
+end
+
+before_time = Time.now
+ARGV.each do |fname|
+  case fname
+  when '-v'
+    verbose = true
+    next
+  when /^-t(0\.91|1\.0|2\.0)$/
+    to_version = $1
+    next
+  end
+  rss = nil
+  f = File.read(fname)
+  begin
+    ## do validate parse
+    rss = RSS::Parser.parse(f)
+  rescue RSS::InvalidRSSError
+    error($!) if verbose
+    ## do non validate parse for invalid RSS 1.0
+    begin
+      rss = RSS::Parser.parse(f, false)
+    rescue RSS::Error
+      ## invalid RSS.
+      error($!) if verbose
+    end
+  rescue RSS::Error
+    error($!) if verbose
+  end
+  if rss.nil?
+    STDERR.puts "#{fname} does not include RSS 1.0 or 0.9x/2.0"
+  else
+    begin
+      rss.output_encoding = encoding
+    rescue RSS::UnknownConversionMethodError
+      error($!) if verbose
+    end
+    feeds << [fname, rss]
+  end
+end
+processing_time = Time.now - before_time
+
+feeds.each do |fname, rss|
+  converted_rss = rss.to_xml(to_version)
+  output_name = fname.sub(/(\.[^\.]+)$/, "-#{to_version}\\1")
+  File.open(output_name, "w") do |output|
+    output.print(converted_rss)
+  end
+end
+
+STDERR.puts "Used XML parser: #{RSS::Parser.default_parser}"
+STDERR.puts "Processing time: #{processing_time}s"
diff --git a/ruby_1_8_6/sample/rss/list_description.rb b/ruby_1_8_6/sample/rss/list_description.rb
new file mode 100644
index 0000000000..bb1f9636e2
--- /dev/null
+++ b/ruby_1_8_6/sample/rss/list_description.rb
@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+
+require "nkf"
+class String
+  # From tdiary.rb
+  def shorten( len = 120 )
+    lines = NKF::nkf( "-e -m0 -f#{len}", self.gsub( /\n/, ' ' ) ).split( /\n/ )
+    lines[0].concat( '...' ) if lines[0] and lines[1]
+    lines[0]
+  end
+end
+
+require "rss"
+
+channels = {}
+verbose = false
+
+def error(exception)
+  mark = "=" * 20
+  mark = "#{mark} error #{mark}"
+  puts mark
+  puts exception.class
+  puts exception.message
+  puts exception.backtrace
+  puts mark
+end
+
+before_time = Time.now
+ARGV.each do |fname|
+  if fname == '-v'
+    verbose = true
+    next
+  end
+  rss = nil
+  f = File.new(fname).read
+  begin
+    ## do validate parse
+    rss = RSS::Parser.parse(f)
+  rescue RSS::InvalidRSSError
+    error($!) if verbose
+    ## do non validate parse for invalid RSS 1.0
+    begin
+      rss = RSS::Parser.parse(f, false)
+    rescue RSS::Error
+      ## invalid RSS.
+      error($!) if verbose
+    end
+  rescue RSS::Error
+    error($!) if verbose
+  end
+  if rss.nil?
+    puts "#{fname} does not include RSS 1.0 or 0.9x/2.0"
+  else
+    begin
+      rss.output_encoding = "euc-jp"
+    rescue RSS::UnknownConversionMethodError
+      error($!) if verbose
+    end
+    rss.channel.title ||= "Unknown"
+    rss.items.each do |item|
+      item.title ||= "Unknown"
+      channels[rss.channel.title] ||= []
+      channels[rss.channel.title] << item if item.description
+    end
+  end
+end
+processing_time = Time.now - before_time
+
+channels.sort do |x, y|
+  x[0] <=> y[0]
+end[0..20].each do |title, items|
+  puts "Channel: #{title}" unless items.empty?
+  items.sort do |x, y|
+    x.title <=> y.title
+  end[0..10].each do |item|
+    puts "  Item: #{item.title.shorten(50)}"
+    puts "    Description: #{item.description.shorten(50)}"
+  end
+end
+
+puts "Used XML parser: #{RSS::Parser.default_parser}"
+puts "Processing time: #{processing_time}s"
diff --git a/ruby_1_8_6/sample/rss/re_read.rb b/ruby_1_8_6/sample/rss/re_read.rb
new file mode 100755
index 0000000000..c19a5099bb
--- /dev/null
+++ b/ruby_1_8_6/sample/rss/re_read.rb
@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+
+require "rss"
+
+def error(exception)
+  mark = "=" * 20
+  mark = "#{mark} error #{mark}"
+  puts mark
+  puts exception.class
+  puts exception.message
+  puts exception.backtrace
+  puts mark
+end
+
+verbose = false
+before_time = Time.now
+
+ARGV.each do |fname|
+  if fname == '-v'
+    verbose = true
+    next
+  end
+  source = nil
+  File.open(fname) do |f|
+    source = f.read
+  end
+  
+  rss = nil
+  read = false
+  begin
+    rss = RSS::Parser.parse(source)
+    puts "Re-read valid RSS: #{fname}"
+    RSS::Parser.parse(rss.to_s)
+    read = true
+  rescue RSS::InvalidRSSError
+    error($!) if verbose
+    ## do non validate parse for invalid RSS 1.0
+    begin
+      rss = RSS::Parser.parse(source, false)
+    rescue RSS::Error
+      ## invalid RSS.
+      error($!) if verbose
+    end
+  rescue RSS::Error
+    error($!) if verbose
+  end
+  
+  if rss.nil?
+    puts "Invalid RSS: #{fname}"
+  elsif !read
+    puts "Re-read invalid RSS: #{fname}"
+    begin
+      RSS::Parser.parse(rss.to_s)
+    rescue RSS::Error
+      puts "  Error occurred: #{fname}"
+      error($!) if verbose
+    end
+  end
+end
+
+processing_time = Time.now - before_time
+
+puts "Used XML parser: #{RSS::Parser.default_parser}"
+puts "Processing time: #{processing_time}s"
diff --git a/ruby_1_8_6/sample/rss/rss_recent.rb b/ruby_1_8_6/sample/rss/rss_recent.rb
new file mode 100644
index 0000000000..7821df5c7b
--- /dev/null
+++ b/ruby_1_8_6/sample/rss/rss_recent.rb
@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+
+require "nkf"
+class String
+  # From tdiary.rb
+  def shorten( len = 120 )
+    lines = NKF::nkf( "-e -m0 -f#{len}", self.gsub( /\n/, ' ' ) ).split( /\n/ )
+    lines[0].concat( '...' ) if lines[0] and lines[1]
+    lines[0]
+  end
+end
+
+require "rss"
+
+items = []
+verbose = false
+
+def error(exception)
+  mark = "=" * 20
+  mark = "#{mark} error #{mark}"
+  puts mark
+  puts exception.class
+  puts exception.message
+  puts exception.backtrace
+  puts mark
+end
+before_time = Time.now
+ARGV.each do |fname|
+  if fname == '-v'
+    verbose = true
+    next
+  end
+  rss = nil
+  f = File.new(fname).read
+  begin
+    ## do validate parse
+    rss = RSS::Parser.parse(f)
+  rescue RSS::InvalidRSSError
+    error($!) if verbose
+    ## do non validate parse for invalid RSS 1.0
+    begin
+      rss = RSS::Parser.parse(f, false)
+    rescue RSS::Error
+      ## invalid RSS.
+      error($!) if verbose
+    end
+  rescue RSS::Error
+    error($!) if verbose
+  end
+  if rss.nil?
+    puts "#{fname} does not include RSS 1.0 or 0.9x/2.0"
+  else
+    begin
+      rss.output_encoding = "euc-jp"
+    rescue RSS::UnknownConversionMethodError
+      error($!) if verbose
+    end
+    rss.items.each do |item|
+      if item.respond_to?(:pubDate) and item.pubDate
+        class << item
+          alias_method(:dc_date, :pubDate)
+        end
+      end
+      if item.respond_to?(:dc_date) and item.dc_date
+        items << [rss.channel, item]
+      end
+    end
+  end
+end
+processing_time = Time.now - before_time
+
+items.sort do |x, y|
+  y[1].dc_date <=> x[1].dc_date
+end[0..20].each do |channel, item|
+  puts "#{item.dc_date.localtime.iso8601}: " <<
+    "#{channel.title}: #{item.title}"
+  puts " Description: #{item.description.shorten(50)}" if item.description
+end
+
+puts "Used XML parser: #{RSS::Parser.default_parser}"
+puts "Processing time: #{processing_time}s"
diff --git a/ruby_1_8_6/sample/sieve.rb b/ruby_1_8_6/sample/sieve.rb
new file mode 100644
index 0000000000..e0bb21d640
--- /dev/null
+++ b/ruby_1_8_6/sample/sieve.rb
@@ -0,0 +1,14 @@
+# sieve of Eratosthenes
+max = Integer(ARGV.shift || 100)
+sieve = []
+for i in 2 .. max
+  sieve[i] = i
+end
+
+for i in 2 .. Math.sqrt(max)
+  next unless sieve[i]
+  (i*i).step(max, i) do |j|
+    sieve[j] = nil
+  end
+end
+puts sieve.compact.join(", ")
diff --git a/ruby_1_8_6/sample/svr.rb b/ruby_1_8_6/sample/svr.rb
new file mode 100644
index 0000000000..11cfc5fbfe
--- /dev/null
+++ b/ruby_1_8_6/sample/svr.rb
@@ -0,0 +1,34 @@
+# socket example - server side
+# usage: ruby svr.rb
+
+# this server might be blocked by an ill-behaved client.
+# see tsvr.rb which is safe from client blocking.
+
+require "socket"
+
+gs = TCPserver.open(0)
+addr = gs.addr
+addr.shift
+printf("server is on %s\n", addr.join(":"))
+socks = [gs]
+
+loop do
+  nsock = select(socks);
+  next if nsock == nil
+  for s in nsock[0]
+    if s == gs
+      ns = s.accept
+      socks.push(ns)
+      print(s, " is accepted\n")
+    else
+      if s.eof?
+	print(s, " is gone\n")
+	s.close
+	socks.delete(s)
+      # single thread gets may block whole service
+      elsif str = s.gets   
+	  s.write(str)
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/sample/test.rb b/ruby_1_8_6/sample/test.rb
new file mode 100644
index 0000000000..e7f2d251b7
--- /dev/null
+++ b/ruby_1_8_6/sample/test.rb
@@ -0,0 +1,2036 @@
+#! /usr/bin/env ruby
+
+$KCODE = "none"
+$testnum=0
+$ntest=0
+$failed = 0
+
+def test_check(what)
+  printf "%s\n", what
+  $what = what
+  $testnum = 0
+end
+
+def test_ok(cond,n=1)
+  $testnum+=1
+  $ntest+=1
+  if cond
+    printf "ok %d\n", $testnum
+  else
+    where = caller(n)[0]
+    printf "not ok %s %d -- %s\n", $what, $testnum, where
+    $failed+=1 
+  end
+end
+
+# make sure conditional operators work
+
+test_check "assignment"
+
+a=[]; a[0] ||= "bar";
+test_ok(a[0] == "bar")
+h={}; h["foo"] ||= "bar";
+test_ok(h["foo"] == "bar")
+
+aa = 5
+aa ||= 25
+test_ok(aa == 5)
+bb ||= 25
+test_ok(bb == 25)
+cc &&=33
+test_ok(cc == nil)
+cc = 5
+cc &&=44
+test_ok(cc == 44)
+
+a = nil; test_ok(a == nil)
+a = 1; test_ok(a == 1)
+a = []; test_ok(a == [])
+a = [1]; test_ok(a == [1])
+a = [nil]; test_ok(a == [nil])
+a = [[]]; test_ok(a == [[]])
+a = [1,2]; test_ok(a == [1,2])
+a = [*[]]; test_ok(a == [])
+a = [*[1]]; test_ok(a == [1])
+a = [*[1,2]]; test_ok(a == [1,2])
+
+a = *nil; test_ok(a == nil)
+a = *1; test_ok(a == 1)
+a = *[]; test_ok(a == nil)
+a = *[1]; test_ok(a == 1)
+a = *[nil]; test_ok(a == nil)
+a = *[[]]; test_ok(a == [])
+a = *[1,2]; test_ok(a == [1,2])
+a = *[*[]]; test_ok(a == nil)
+a = *[*[1]]; test_ok(a == 1)
+a = *[*[1,2]]; test_ok(a == [1,2])
+
+*a = nil; test_ok(a == [nil])
+*a = 1; test_ok(a == [1])
+*a = []; test_ok(a == [[]])
+*a = [1]; test_ok(a == [[1]])
+*a = [nil]; test_ok(a == [[nil]])
+*a = [[]]; test_ok(a == [[[]]])
+*a = [1,2]; test_ok(a == [[1,2]])
+*a = [*[]]; test_ok(a == [[]])
+*a = [*[1]]; test_ok(a == [[1]])
+*a = [*[1,2]]; test_ok(a == [[1,2]])
+
+*a = *nil; test_ok(a == [nil])
+*a = *1; test_ok(a == [1])
+*a = *[]; test_ok(a == [])
+*a = *[1]; test_ok(a == [1])
+*a = *[nil]; test_ok(a == [nil])
+*a = *[[]]; test_ok(a == [[]])
+*a = *[1,2]; test_ok(a == [1,2])
+*a = *[*[]]; test_ok(a == [])
+*a = *[*[1]]; test_ok(a == [1])
+*a = *[*[1,2]]; test_ok(a == [1,2])
+
+a,b,*c = nil; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = 1; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = []; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = [1]; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = [nil]; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = [[]]; test_ok([a,b,c] == [[],nil,[]])
+a,b,*c = [1,2]; test_ok([a,b,c] == [1,2,[]])
+a,b,*c = [*[]]; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = [*[1]]; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = [*[1,2]]; test_ok([a,b,c] == [1,2,[]])
+
+a,b,*c = *nil; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = *1; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = *[]; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = *[1]; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = *[nil]; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = *[[]]; test_ok([a,b,c] == [[],nil,[]])
+a,b,*c = *[1,2]; test_ok([a,b,c] == [1,2,[]])
+a,b,*c = *[*[]]; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = *[*[1]]; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = *[*[1,2]]; test_ok([a,b,c] == [1,2,[]])
+
+def f; yield nil; end; f {|a| test_ok(a == nil)}
+def f; yield 1; end; f {|a| test_ok(a == 1)}
+def f; yield []; end; f {|a| test_ok(a == [])}
+def f; yield [1]; end; f {|a| test_ok(a == [1])}
+def f; yield [nil]; end; f {|a| test_ok(a == [nil])}
+def f; yield [[]]; end; f {|a| test_ok(a == [[]])}
+def f; yield [*[]]; end; f {|a| test_ok(a == [])}
+def f; yield [*[1]]; end; f {|a| test_ok(a == [1])}
+def f; yield [*[1,2]]; end; f {|a| test_ok(a == [1,2])}
+
+def f; yield *nil; end; f {|a| test_ok(a == nil)}
+def f; yield *1; end; f {|a| test_ok(a == 1)}
+def f; yield *[1]; end; f {|a| test_ok(a == 1)}
+def f; yield *[nil]; end; f {|a| test_ok(a == nil)}
+def f; yield *[[]]; end; f {|a| test_ok(a == [])}
+def f; yield *[*[1]]; end; f {|a| test_ok(a == 1)}
+
+def f; yield; end; f {|*a| test_ok(a == [])}
+def f; yield nil; end; f {|*a| test_ok(a == [nil])}
+def f; yield 1; end; f {|*a| test_ok(a == [1])}
+def f; yield []; end; f {|*a| test_ok(a == [[]])}
+def f; yield [1]; end; f {|*a| test_ok(a == [[1]])}
+def f; yield [nil]; end; f {|*a| test_ok(a == [[nil]])}
+def f; yield [[]]; end; f {|*a| test_ok(a == [[[]]])}
+def f; yield [1,2]; end; f {|*a| test_ok(a == [[1,2]])}
+def f; yield [*[]]; end; f {|*a| test_ok(a == [[]])}
+def f; yield [*[1]]; end; f {|*a| test_ok(a == [[1]])}
+def f; yield [*[1,2]]; end; f {|*a| test_ok(a == [[1,2]])}
+
+def f; yield *nil; end; f {|*a| test_ok(a == [nil])}
+def f; yield *1; end; f {|*a| test_ok(a == [1])}
+def f; yield *[]; end; f {|*a| test_ok(a == [])}
+def f; yield *[1]; end; f {|*a| test_ok(a == [1])}
+def f; yield *[nil]; end; f {|*a| test_ok(a == [nil])}
+def f; yield *[[]]; end; f {|*a| test_ok(a == [[]])}
+def f; yield *[*[]]; end; f {|*a| test_ok(a == [])}
+def f; yield *[*[1]]; end; f {|*a| test_ok(a == [1])}
+def f; yield *[*[1,2]]; end; f {|*a| test_ok(a == [1,2])}
+
+def f; yield; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield nil; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield 1; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
+def f; yield []; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield [1]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
+def f; yield [nil]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield [[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[],nil,[]])}
+def f; yield [*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield [*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
+def f; yield [*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,2,[]])}
+
+def f; yield *nil; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield *1; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
+def f; yield *[]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield *[1]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
+def f; yield *[nil]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield *[[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[],nil,[]])}
+def f; yield *[*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield *[*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
+def f; yield *[*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,2,[]])}
+
+def r; return; end; a = r(); test_ok(a == nil)
+def r; return nil; end; a = r(); test_ok(a == nil)
+def r; return 1; end; a = r(); test_ok(a == 1)
+def r; return []; end; a = r(); test_ok(a == [])
+def r; return [1]; end; a = r(); test_ok(a == [1])
+def r; return [nil]; end; a = r(); test_ok(a == [nil])
+def r; return [[]]; end; a = r(); test_ok(a == [[]])
+def r; return [*[]]; end; a = r(); test_ok(a == [])
+def r; return [*[1]]; end; a = r(); test_ok(a == [1])
+def r; return [*[1,2]]; end; a = r(); test_ok(a == [1,2])
+
+def r; return *nil; end; a = r(); test_ok(a == nil)
+def r; return *1; end; a = r(); test_ok(a == 1)
+def r; return *[]; end; a = r(); test_ok(a == nil)
+def r; return *[1]; end; a = r(); test_ok(a == 1)
+def r; return *[nil]; end; a = r(); test_ok(a == nil)
+def r; return *[[]]; end; a = r(); test_ok(a == [])
+def r; return *[*[]]; end; a = r(); test_ok(a == nil)
+def r; return *[*[1]]; end; a = r(); test_ok(a == 1)
+def r; return *[*[1,2]]; end; a = r(); test_ok(a == [1,2])
+
+def r; return *nil; end; a = *r(); test_ok(a == nil)
+def r; return *1; end; a = *r(); test_ok(a == 1)
+def r; return *[]; end; a = *r(); test_ok(a == nil)
+def r; return *[1]; end; a = *r(); test_ok(a == 1)
+def r; return *[nil]; end; a = *r(); test_ok(a == nil)
+def r; return *[[]]; end; a = *r(); test_ok(a == nil)
+def r; return *[*[]]; end; a = *r(); test_ok(a == nil)
+def r; return *[*[1]]; end; a = *r(); test_ok(a == 1)
+def r; return *[*[1,2]]; end; a = *r(); test_ok(a == [1,2])
+
+def r; return; end; *a = r(); test_ok(a == [nil])
+def r; return nil; end; *a = r(); test_ok(a == [nil])
+def r; return 1; end; *a = r(); test_ok(a == [1])
+def r; return []; end; *a = r(); test_ok(a == [[]])
+def r; return [1]; end; *a = r(); test_ok(a == [[1]])
+def r; return [nil]; end; *a = r(); test_ok(a == [[nil]])
+def r; return [[]]; end; *a = r(); test_ok(a == [[[]]])
+def r; return [1,2]; end; *a = r(); test_ok(a == [[1,2]])
+def r; return [*[]]; end; *a = r(); test_ok(a == [[]])
+def r; return [*[1]]; end; *a = r(); test_ok(a == [[1]])
+def r; return [*[1,2]]; end; *a = r(); test_ok(a == [[1,2]])
+
+def r; return *nil; end; *a = r(); test_ok(a == [nil])
+def r; return *1; end; *a = r(); test_ok(a == [1])
+def r; return *[]; end; *a = r(); test_ok(a == [nil])
+def r; return *[1]; end; *a = r(); test_ok(a == [1])
+def r; return *[nil]; end; *a = r(); test_ok(a == [nil])
+def r; return *[[]]; end; *a = r(); test_ok(a == [[]])
+def r; return *[1,2]; end; *a = r(); test_ok(a == [[1,2]])
+def r; return *[*[]]; end; *a = r(); test_ok(a == [nil])
+def r; return *[*[1]]; end; *a = r(); test_ok(a == [1])
+def r; return *[*[1,2]]; end; *a = r(); test_ok(a == [[1,2]])
+
+def r; return *nil; end; *a = *r(); test_ok(a == [nil])
+def r; return *1; end; *a = *r(); test_ok(a == [1])
+def r; return *[]; end; *a = *r(); test_ok(a == [nil])
+def r; return *[1]; end; *a = *r(); test_ok(a == [1])
+def r; return *[nil]; end; *a = *r(); test_ok(a == [nil])
+def r; return *[[]]; end; *a = *r(); test_ok(a == [])
+def r; return *[1,2]; end; *a = *r(); test_ok(a == [1,2])
+def r; return *[*[]]; end; *a = *r(); test_ok(a == [nil])
+def r; return *[*[1]]; end; *a = *r(); test_ok(a == [1])
+def r; return *[*[1,2]]; end; *a = *r(); test_ok(a == [1,2])
+
+def r; return; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return nil; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return 1; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
+def r; return []; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return [1]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
+def r; return [nil]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return [[]]; end; a,b,*c = r(); test_ok([a,b,c] == [[],nil,[]])
+def r; return [1,2]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]])
+def r; return [*[]]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return [*[1]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
+def r; return [*[1,2]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]])
+
+def r; return *nil; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return *1; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
+def r; return *[]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return *[1]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
+def r; return *[nil]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return *[[]]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return *[1,2]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]])
+def r; return *[*[]]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return *[*[1]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
+def r; return *[*[1,2]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]])
+
+f = lambda {|r,| test_ok([] == r)}
+f.call([], *[])
+
+f = lambda {|r,*l| test_ok([] == r); test_ok([1] == l)}
+f.call([], *[1])
+
+f = lambda{|x| x}
+test_ok(f.call(42) == 42)
+test_ok(f.call([42]) == [42])
+test_ok(f.call([[42]]) == [[42]])
+test_ok(f.call([42,55]) == [42,55])
+
+f = lambda{|x,| x}
+test_ok(f.call(42) == 42)
+test_ok(f.call([42]) == [42])
+test_ok(f.call([[42]]) == [[42]])
+test_ok(f.call([42,55]) == [42,55])
+
+f = lambda{|*x| x}
+test_ok(f.call(42) == [42])
+test_ok(f.call([42]) == [[42]])
+test_ok(f.call([[42]]) == [[[42]]])
+test_ok(f.call([42,55]) == [[42,55]])
+test_ok(f.call(42,55) == [42,55])
+
+a,=*[1]
+test_ok(a == 1)
+a,=*[[1]]
+test_ok(a == [1])
+a,=*[[[1]]]
+test_ok(a == [[1]])
+
+x, (y, z) = 1, 2, 3
+test_ok([1,2,nil] == [x,y,z])
+x, (y, z) = 1, [2,3]
+test_ok([1,2,3] == [x,y,z])
+x, (y, z) = 1, [2]
+test_ok([1,2,nil] == [x,y,z])
+
+a = loop do break; end; test_ok(a == nil)
+a = loop do break nil; end; test_ok(a == nil)
+a = loop do break 1; end; test_ok(a == 1)
+a = loop do break []; end; test_ok(a == [])
+a = loop do break [1]; end; test_ok(a == [1])
+a = loop do break [nil]; end; test_ok(a == [nil])
+a = loop do break [[]]; end; test_ok(a == [[]])
+a = loop do break [*[]]; end; test_ok(a == [])
+a = loop do break [*[1]]; end; test_ok(a == [1])
+a = loop do break [*[1,2]]; end; test_ok(a == [1,2])
+
+a = loop do break *nil; end; test_ok(a == nil)
+a = loop do break *1; end; test_ok(a == 1)
+a = loop do break *[]; end; test_ok(a == nil)
+a = loop do break *[1]; end; test_ok(a == 1)
+a = loop do break *[nil]; end; test_ok(a == nil)
+a = loop do break *[[]]; end; test_ok(a == [])
+a = loop do break *[*[]]; end; test_ok(a == nil)
+a = loop do break *[*[1]]; end; test_ok(a == 1)
+a = loop do break *[*[1,2]]; end; test_ok(a == [1,2])
+
+*a = loop do break; end; test_ok(a == [nil])
+*a = loop do break nil; end; test_ok(a == [nil])
+*a = loop do break 1; end; test_ok(a == [1])
+*a = loop do break []; end; test_ok(a == [[]])
+*a = loop do break [1]; end; test_ok(a == [[1]])
+*a = loop do break [nil]; end; test_ok(a == [[nil]])
+*a = loop do break [[]]; end; test_ok(a == [[[]]])
+*a = loop do break [1,2]; end; test_ok(a == [[1,2]])
+*a = loop do break [*[]]; end; test_ok(a == [[]])
+*a = loop do break [*[1]]; end; test_ok(a == [[1]])
+*a = loop do break [*[1,2]]; end; test_ok(a == [[1,2]])
+
+*a = loop do break *nil; end; test_ok(a == [nil])
+*a = loop do break *1; end; test_ok(a == [1])
+*a = loop do break *[]; end; test_ok(a == [nil])
+*a = loop do break *[1]; end; test_ok(a == [1])
+*a = loop do break *[nil]; end; test_ok(a == [nil])
+*a = loop do break *[[]]; end; test_ok(a == [[]])
+*a = loop do break *[1,2]; end; test_ok(a == [[1,2]])
+*a = loop do break *[*[]]; end; test_ok(a == [nil])
+*a = loop do break *[*[1]]; end; test_ok(a == [1])
+*a = loop do break *[*[1,2]]; end; test_ok(a == [[1,2]])
+
+*a = *loop do break *nil; end; test_ok(a == [nil])
+*a = *loop do break *1; end; test_ok(a == [1])
+*a = *loop do break *[]; end; test_ok(a == [nil])
+*a = *loop do break *[1]; end; test_ok(a == [1])
+*a = *loop do break *[nil]; end; test_ok(a == [nil])
+*a = *loop do break *[[]]; end; test_ok(a == [])
+*a = *loop do break *[1,2]; end; test_ok(a == [1,2])
+*a = *loop do break *[*[]]; end; test_ok(a == [nil])
+*a = *loop do break *[*[1]]; end; test_ok(a == [1])
+*a = *loop do break *[*[1,2]]; end; test_ok(a == [1,2])
+
+a,b,*c = loop do break; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break nil; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break 1; end; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = loop do break []; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break [1]; end; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = loop do break [nil]; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break [[]]; end; test_ok([a,b,c] == [[],nil,[]])
+a,b,*c = loop do break [1,2]; end; test_ok([a,b,c] == [1,2,[]])
+a,b,*c = loop do break [*[]]; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break [*[1]]; end; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = loop do break [*[1,2]]; end; test_ok([a,b,c] == [1,2,[]])
+
+a,b,*c = loop do break *nil; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break *1; end; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = loop do break *[]; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break *[1]; end; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = loop do break *[nil]; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break *[[]]; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break *[1,2]; end; test_ok([a,b,c] == [1,2,[]])
+a,b,*c = loop do break *[*[]]; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break *[*[1]]; end; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = loop do break *[*[1,2]]; end; test_ok([a,b,c] == [1,2,[]])
+
+def r(val); a = yield(); test_ok(a == val, 2); end
+r(nil){next}
+r(nil){next nil}
+r(1){next 1}
+r([]){next []}
+r([1]){next [1]}
+r([nil]){next [nil]}
+r([[]]){next [[]]}
+r([]){next [*[]]}
+r([1]){next [*[1]]}
+r([1,2]){next [*[1,2]]}
+
+r(nil){next *nil}
+r(1){next *1}
+r(nil){next *[]}
+r(1){next *[1]}
+r(nil){next *[nil]}
+r([]){next *[[]]}
+r(nil){next *[*[]]}
+r(1){next *[*[1]]}
+r([1,2]){next *[*[1,2]]}
+
+def r(val); *a = yield(); test_ok(a == val, 2); end
+r([nil]){next}
+r([nil]){next nil}
+r([1]){next 1}
+r([[]]){next []}
+r([[1]]){next [1]}
+r([[nil]]){next [nil]}
+r([[[]]]){next [[]]}
+r([[1,2]]){next [1,2]}
+r([[]]){next [*[]]}
+r([[1]]){next [*[1]]}
+r([[1,2]]){next [*[1,2]]}
+
+def r(val); *a = *yield(); test_ok(a == val, 2); end
+r([nil]){next *nil}
+r([1]){next *1}
+r([nil]){next *[]}
+r([1]){next *[1]}
+r([nil]){next *[nil]}
+r([]){next *[[]]}
+r([1,2]){next *[1,2]}
+r([nil]){next *[*[]]}
+r([1]){next *[*[1]]}
+r([1,2]){next *[*[1,2]]}
+
+def r(val); a,b,*c = yield(); test_ok([a,b,c] == val, 2); end
+r([nil,nil,[]]){next}
+r([nil,nil,[]]){next nil}
+r([1,nil,[]]){next 1}
+r([nil,nil,[]]){next []}
+r([1,nil,[]]){next [1]}
+r([nil,nil,[]]){next [nil]}
+r([[],nil,[]]){next [[]]}
+r([1,2,[]]){next [1,2]}
+r([nil,nil,[]]){next [*[]]}
+r([1,nil,[]]){next [*[1]]}
+r([1,2,[]]){next [*[1,2]]}
+
+def r(val); a,b,*c = *yield(); test_ok([a,b,c] == val, 2); end
+r([nil,nil,[]]){next *nil}
+r([1,nil,[]]){next *1}
+r([nil,nil,[]]){next *[]}
+r([1,nil,[]]){next *[1]}
+r([nil,nil,[]]){next *[nil]}
+r([nil,nil,[]]){next *[[]]}
+r([1,2,[]]){next *[1,2]}
+r([nil,nil,[]]){next *[*[]]}
+r([1,nil,[]]){next *[*[1]]}
+r([1,2,[]]){next *[*[1,2]]}
+
+test_check "condition"
+
+$x = '0';
+
+$x == $x && test_ok(true)
+$x != $x && test_ok(false)
+$x == $x || test_ok(false)
+$x != $x || test_ok(true)
+
+# first test to see if we can run the tests.
+
+test_check "if/unless";
+
+$x = 'test';
+test_ok(if $x == $x then true else false end)
+$bad = false
+unless $x == $x
+  $bad = true
+end
+test_ok(!$bad)
+test_ok(unless $x != $x then true else false end)
+
+test_check "case"
+
+case 5
+when 1, 2, 3, 4, 6, 7, 8
+  test_ok(false)
+when 5
+  test_ok(true)
+end
+
+case 5
+when 5
+  test_ok(true)
+when 1..10
+  test_ok(false)
+end
+
+case 5
+when 1..10
+  test_ok(true)
+else
+  test_ok(false)
+end
+
+case 5
+when 5
+  test_ok(true)
+else
+  test_ok(false)
+end
+
+case "foobar"
+when /^f.*r$/
+  test_ok(true)
+else
+  test_ok(false)
+end
+
+test_check "while/until";
+
+tmp = open("while_tmp", "w")
+tmp.print "tvi925\n";
+tmp.print "tvi920\n";
+tmp.print "vt100\n";
+tmp.print "Amiga\n";
+tmp.print "paper\n";
+tmp.close
+
+# test break
+
+tmp = open("while_tmp", "r")
+test_ok(tmp.kind_of?(File))
+
+while line = tmp.gets()
+  break if /vt100/ =~ line
+end
+
+test_ok(!tmp.eof? && /vt100/ =~ line)
+tmp.close
+
+# test next
+$bad = false
+tmp = open("while_tmp", "r")
+while line = tmp.gets()
+  next if /vt100/ =~ line
+  $bad = 1 if /vt100/ =~ line
+end
+test_ok(!(!tmp.eof? || /vt100/ =~ line || $bad))
+tmp.close
+
+# test redo
+$bad = false
+tmp = open("while_tmp", "r")
+while tmp.gets()
+  line = $_
+  gsub(/vt100/, 'VT100')
+  if $_ != line
+    $_.gsub!('VT100', 'Vt100')
+    redo
+  end
+  $bad = 1 if /vt100/ =~ $_
+  $bad = 1 if /VT100/ =~ $_
+end
+test_ok(tmp.eof? && !$bad)
+tmp.close
+
+sum=0
+for i in 1..10
+  sum += i
+  i -= 1
+  if i > 0
+    redo
+  end
+end
+test_ok(sum == 220)
+
+# test interval
+$bad = false
+tmp = open("while_tmp", "r")
+while line = tmp.gets()
+  break if 3
+  case line
+  when /vt100/, /Amiga/, /paper/
+    $bad = true
+  end
+end
+test_ok(!$bad)
+tmp.close
+
+File.unlink "while_tmp" or `/bin/rm -f "while_tmp"`
+test_ok(!File.exist?("while_tmp"))
+
+i = 0
+until i>4
+  i+=1
+end
+test_ok(i>4)
+
+
+# exception handling
+test_check "exception";
+
+begin
+  raise "this must be handled"
+  test_ok(false)
+rescue
+  test_ok(true)
+end
+
+$bad = true
+begin
+  raise "this must be handled no.2"
+rescue
+  if $bad
+    $bad = false
+    retry
+    test_ok(false)
+  end
+end
+test_ok(true)
+
+# exception in rescue clause
+$string = "this must be handled no.3"
+begin
+  begin
+    raise "exception in rescue clause"
+  rescue 
+    raise $string
+  end
+  test_ok(false)
+rescue
+  test_ok(true) if $! == $string
+end
+  
+# exception in ensure clause
+begin
+  begin
+    raise "this must be handled no.4"
+  ensure 
+    raise "exception in ensure clause"
+  end
+  test_ok(false)
+rescue
+  test_ok(true)
+end
+
+$bad = true
+begin
+  begin
+    raise "this must be handled no.5"
+  ensure
+    $bad = false
+  end
+rescue
+end
+test_ok(!$bad)
+
+$bad = true
+begin
+  begin
+    raise "this must be handled no.6"
+  ensure
+    $bad = false
+  end
+rescue
+end
+test_ok(!$bad)
+
+$bad = true
+while true
+  begin
+    break
+  ensure
+    $bad = false
+  end
+end
+test_ok(!$bad)
+
+test_ok(catch(:foo) {
+     loop do
+       loop do
+	 throw :foo, true
+	 break
+       end
+       break
+       test_ok(false)			# should no reach here
+     end
+     false
+   })
+
+test_check "array"
+test_ok([1, 2] + [3, 4] == [1, 2, 3, 4])
+test_ok([1, 2] * 2 == [1, 2, 1, 2])
+test_ok([1, 2] * ":" == "1:2")
+
+test_ok([1, 2].hash == [1, 2].hash)
+
+test_ok([1,2,3] & [2,3,4] == [2,3])
+test_ok([1,2,3] | [2,3,4] == [1,2,3,4])
+test_ok([1,2,3] - [2,3] == [1])
+
+$x = [0, 1, 2, 3, 4, 5]
+test_ok($x[2] == 2)
+test_ok($x[1..3] == [1, 2, 3])
+test_ok($x[1,3] == [1, 2, 3])
+
+$x[0, 2] = 10
+test_ok($x[0] == 10 && $x[1] == 2)
+  
+$x[0, 0] = -1
+test_ok($x[0] == -1 && $x[1] == 10)
+
+$x[-1, 1] = 20
+test_ok($x[-1] == 20 && $x.pop == 20)
+
+# array and/or
+test_ok(([1,2,3]&[2,4,6]) == [2])
+test_ok(([1,2,3]|[2,4,6]) == [1,2,3,4,6])
+
+# compact
+$x = [nil, 1, nil, nil, 5, nil, nil]
+$x.compact!
+test_ok($x == [1, 5])
+
+# uniq
+$x = [1, 1, 4, 2, 5, 4, 5, 1, 2]
+$x.uniq!
+test_ok($x == [1, 4, 2, 5])
+
+# empty?
+test_ok(!$x.empty?)
+$x = []
+test_ok($x.empty?)
+
+# sort
+$x = ["it", "came", "to", "pass", "that", "..."]
+$x = $x.sort.join(" ")
+test_ok($x == "... came it pass that to")
+$x = [2,5,3,1,7]
+$x.sort!{|a,b| a<=>b}		# sort with condition
+test_ok($x == [1,2,3,5,7])
+$x.sort!{|a,b| b-a}		# reverse sort
+test_ok($x == [7,5,3,2,1])
+
+# split test
+$x = "The Book of Mormon"
+test_ok($x.split(//).reverse!.join == $x.reverse)
+test_ok($x.reverse == $x.reverse!)
+test_ok("1 byte string".split(//).reverse.join(":") == "g:n:i:r:t:s: :e:t:y:b: :1")
+$x = "a b c  d"
+test_ok($x.split == ['a', 'b', 'c', 'd'])
+test_ok($x.split(' ') == ['a', 'b', 'c', 'd'])
+test_ok(defined? "a".chomp)
+test_ok("abc".scan(/./) == ["a", "b", "c"])
+test_ok("1a2b3c".scan(/(\d.)/) == [["1a"], ["2b"], ["3c"]])
+# non-greedy match
+test_ok("a=12;b=22".scan(/(.*?)=(\d*);?/) == [["a", "12"], ["b", "22"]])
+
+$x = [1]
+test_ok(($x * 5).join(":") == '1:1:1:1:1')
+test_ok(($x * 1).join(":") == '1')
+test_ok(($x * 0).join(":") == '')
+
+*$x = *(1..7).to_a
+test_ok($x.size == 7)
+test_ok($x == [1, 2, 3, 4, 5, 6, 7])
+
+$x = [1,2,3]
+$x[1,0] = $x
+test_ok($x == [1,1,2,3,2,3])
+
+$x = [1,2,3]
+$x[-1,0] = $x
+test_ok($x == [1,2,1,2,3,3])
+
+$x = [1,2,3]
+$x.concat($x)
+test_ok($x == [1,2,3,1,2,3])
+
+test_check "hash"
+$x = {1=>2, 2=>4, 3=>6}
+$y = {1, 2, 2, 4, 3, 6}
+
+test_ok($x[1] == 2)
+
+test_ok(begin   
+     for k,v in $y
+       raise if k*2 != v
+     end
+     true
+   rescue
+     false
+   end)
+
+test_ok($x.length == 3)
+test_ok($x.has_key?(1))
+test_ok($x.has_value?(4))
+test_ok($x.values_at(2,3) == [4,6])
+test_ok($x == {1=>2, 2=>4, 3=>6})
+
+$z = $y.keys.sort.join(":")
+test_ok($z == "1:2:3")
+
+$z = $y.values.sort.join(":")
+test_ok($z == "2:4:6")
+test_ok($x == $y)
+
+$y.shift
+test_ok($y.length == 2)
+
+$z = [1,2]
+$y[$z] = 256
+test_ok($y[$z] == 256)
+
+$x = Hash.new(0)
+$x[1] = 1
+test_ok($x[1] == 1)
+test_ok($x[2] == 0)
+
+$x = Hash.new([])
+test_ok($x[22] == [])
+test_ok($x[22].equal?($x[22]))
+
+$x = Hash.new{[]}
+test_ok($x[22] == [])
+test_ok(!$x[22].equal?($x[22]))
+
+$x = Hash.new{|h,k| $z = k; h[k] = k*2}
+$z = 0
+test_ok($x[22] == 44)
+test_ok($z == 22)
+$z = 0
+test_ok($x[22] == 44)
+test_ok($z == 0)
+$x.default = 5
+test_ok($x[23] == 5)
+
+$x = Hash.new
+def $x.default(k)
+  $z = k
+  self[k] = k*2
+end
+$z = 0
+test_ok($x[22] == 44)
+test_ok($z == 22)
+$z = 0
+test_ok($x[22] == 44)
+test_ok($z == 0)
+
+test_check "iterator"
+
+test_ok(!iterator?)
+
+def ttt
+  test_ok(iterator?)
+end
+ttt{}
+
+# yield at top level
+test_ok(!defined?(yield))
+
+$x = [1, 2, 3, 4]
+$y = []
+
+# iterator over array
+for i in $x
+  $y.push i
+end
+test_ok($x == $y)
+
+# nested iterator
+def tt
+  1.upto(10) {|i|
+    yield i
+  }
+end
+
+tt{|i| break if i == 5}
+test_ok(i == 5)
+
+def tt2(dummy)
+  yield 1
+end
+
+def tt3(&block)
+  tt2(raise(ArgumentError,""),&block)
+end
+
+$x = false
+begin
+  tt3{}
+rescue ArgumentError
+  $x = true
+rescue Exception
+end
+test_ok($x)
+
+def tt4 &block
+  tt2(raise(ArgumentError,""),&block)
+end
+$x = false
+begin
+  tt4{}
+rescue ArgumentError
+  $x = true
+rescue Exception
+end
+test_ok($x)
+
+# iterator break/redo/next/retry
+done = true
+loop{
+  break
+  done = false			# should not reach here
+}
+test_ok(done)
+
+done = false
+$bad = false
+loop {
+  break if done
+  done = true
+  next
+  $bad = true			# should not reach here
+}
+test_ok(!$bad)
+
+done = false
+$bad = false
+loop {
+  break if done
+  done = true
+  redo
+  $bad = true			# should not reach here
+}
+test_ok(!$bad)
+
+$x = []
+for i in 1 .. 7
+  $x.push i
+end
+test_ok($x.size == 7)
+test_ok($x == [1, 2, 3, 4, 5, 6, 7])
+
+$done = false
+$x = []
+for i in 1 .. 7			# see how retry works in iterator loop
+  if i == 4 and not $done
+    $done = true
+    retry
+  end
+  $x.push(i)
+end
+test_ok($x.size == 10)
+test_ok($x == [1, 2, 3, 1, 2, 3, 4, 5, 6, 7])
+
+# append method to built-in class
+class Array
+  def iter_test1
+    collect{|e| [e, yield(e)]}.sort{|a,b|a[1]<=>b[1]}
+  end
+  def iter_test2
+    a = collect{|e| [e, yield(e)]}
+    a.sort{|a,b|a[1]<=>b[1]}
+  end
+end
+$x = [[1,2],[3,4],[5,6]]
+test_ok($x.iter_test1{|x|x} == $x.iter_test2{|x|x})
+
+class IterTest
+  def initialize(e); @body = e; end
+
+  def each0(&block); @body.each(&block); end
+  def each1(&block); @body.each {|*x| block.call(*x) } end
+  def each2(&block); @body.each {|*x| block.call(x) } end
+  def each3(&block); @body.each {|x| block.call(*x) } end
+  def each4(&block); @body.each {|x| block.call(x) } end
+  def each5; @body.each {|*x| yield(*x) } end
+  def each6; @body.each {|*x| yield(x) } end
+  def each7; @body.each {|x| yield(*x) } end
+  def each8; @body.each {|x| yield(x) } end
+
+  def f(a)
+    a
+  end
+end
+test_ok(IterTest.new(nil).method(:f).to_proc.call([1]) == [1])
+m = /\w+/.match("abc")
+test_ok(IterTest.new(nil).method(:f).to_proc.call([m]) == [m])
+
+IterTest.new([0]).each0 {|x| test_ok(x == 0)}
+IterTest.new([1]).each1 {|x| test_ok(x == 1)}
+IterTest.new([2]).each2 {|x| test_ok(x == [2])}
+IterTest.new([3]).each3 {|x| test_ok(x == 3)}
+IterTest.new([4]).each4 {|x| test_ok(x == 4)}
+IterTest.new([5]).each5 {|x| test_ok(x == 5)}
+IterTest.new([6]).each6 {|x| test_ok(x == [6])}
+IterTest.new([7]).each7 {|x| test_ok(x == 7)}
+IterTest.new([8]).each8 {|x| test_ok(x == 8)}
+
+IterTest.new([[0]]).each0 {|x| test_ok(x == [0])}
+IterTest.new([[1]]).each1 {|x| test_ok(x == [1])}
+IterTest.new([[2]]).each2 {|x| test_ok(x == [[2]])}
+IterTest.new([[3]]).each3 {|x| test_ok(x == 3)}
+IterTest.new([[4]]).each4 {|x| test_ok(x == [4])}
+IterTest.new([[5]]).each5 {|x| test_ok(x == [5])}
+IterTest.new([[6]]).each6 {|x| test_ok(x == [[6]])}
+IterTest.new([[7]]).each7 {|x| test_ok(x == 7)}
+IterTest.new([[8]]).each8 {|x| test_ok(x == [8])}
+
+IterTest.new([[0,0]]).each0 {|x| test_ok(x == [0,0])}
+IterTest.new([[8,8]]).each8 {|x| test_ok(x == [8,8])}
+
+def m
+  test_ok(block_given?)
+end
+m{p 'test'}
+
+def m
+  test_ok(block_given?,&proc{})
+end
+m{p 'test'}
+
+class C
+  include Enumerable
+  def initialize
+    @a = [1,2,3]
+  end
+  def each(&block)
+    @a.each(&block)
+  end
+end
+
+test_ok(C.new.collect{|n| n} == [1,2,3])
+
+test_ok(Proc == lambda{}.class)
+test_ok(Proc == Proc.new{}.class)
+lambda{|a|test_ok(a==1)}.call(1)
+def block_test(klass, &block)
+  test_ok(klass === block)
+end
+
+block_test(NilClass)
+block_test(Proc){}
+
+def argument_test(state, proc, *args)
+  x = state
+  begin
+    proc.call(*args)
+  rescue ArgumentError
+    x = !x
+  end
+  test_ok(x,2)
+end
+
+argument_test(true, lambda{||})
+argument_test(false, lambda{||}, 1)
+argument_test(true, lambda{|a,|}, 1)
+argument_test(false, lambda{|a,|})
+argument_test(false, lambda{|a,|}, 1,2)
+
+def get_block(&block)
+  block
+end
+
+test_ok(Proc == get_block{}.class)
+argument_test(true, get_block{||})
+argument_test(true, get_block{||}, 1)
+argument_test(true, get_block{|a,|}, 1)
+argument_test(true, get_block{|a,|})
+argument_test(true, get_block{|a,|}, 1,2)
+
+argument_test(true, get_block(&lambda{||}))
+argument_test(false, get_block(&lambda{||}),1)
+argument_test(true, get_block(&lambda{|a,|}),1)
+argument_test(false, get_block(&lambda{|a,|}),1,2)
+
+block = get_block{11}
+test_ok(block.class == Proc)
+test_ok(block.to_proc.class == Proc)
+test_ok(block.clone.call == 11)
+test_ok(get_block(&block).class == Proc)
+
+lambda = lambda{44}
+test_ok(lambda.class == Proc)
+test_ok(lambda.to_proc.class == Proc)
+test_ok(lambda.clone.call == 44)
+test_ok(get_block(&lambda).class == Proc)
+
+test_ok(Proc.new{|a,| a}.call(1,2,3) == 1)
+argument_test(true, Proc.new{|a,|}, 1,2)
+
+def test_return1
+  Proc.new {
+    return 55
+  }.call + 5
+end
+test_ok(test_return1() == 55)
+def test_return2
+  lambda {
+    return 55
+  }.call + 5
+end
+test_ok(test_return2() == 60)
+
+def proc_call(&b)
+  b.call
+end
+def proc_yield()
+  yield
+end
+def proc_return1
+  proc_call{return 42}+1
+end
+test_ok(proc_return1() == 42)
+def proc_return2
+  proc_yield{return 42}+1
+end
+test_ok(proc_return2() == 42)
+
+def ljump_test(state, proc, *args)
+  x = state
+  begin
+    proc.call(*args)
+  rescue LocalJumpError
+    x = !x
+  end
+  test_ok(x,2)
+end
+
+ljump_test(false, get_block{break})
+ljump_test(true, lambda{break})
+
+test_ok(block.arity == -1)
+test_ok(lambda.arity == -1)
+test_ok(lambda{||}.arity == 0)
+test_ok(lambda{|a|}.arity == 1)
+test_ok(lambda{|a,|}.arity == 1)
+test_ok(lambda{|a,b|}.arity == 2)
+
+def marity_test(m)
+  method = method(m)
+  test_ok(method.arity == method.to_proc.arity)
+end
+marity_test(:test_ok)
+marity_test(:marity_test)
+marity_test(:p)
+
+lambda(&method(:test_ok)).call(true)
+lambda(&get_block{|a,n| test_ok(a,n)}).call(true, 2)
+
+class ITER_TEST1
+   def a
+     block_given?
+   end
+end
+
+class ITER_TEST2 < ITER_TEST1
+   def a
+     test_ok(super)
+     super
+   end
+end
+test_ok(ITER_TEST2.new.a {})
+
+class ITER_TEST3
+  def foo x
+    return yield if block_given?
+    x
+  end
+end
+
+class ITER_TEST4 < ITER_TEST3
+  def foo x
+    test_ok(super == yield)
+    test_ok(super(x, &nil) == x)
+  end
+end
+
+ITER_TEST4.new.foo(44){55}   
+
+test_check "float"
+test_ok(2.6.floor == 2)
+test_ok((-2.6).floor == -3)
+test_ok(2.6.ceil == 3)
+test_ok((-2.6).ceil == -2)
+test_ok(2.6.truncate == 2)
+test_ok((-2.6).truncate == -2)
+test_ok(2.6.round == 3)
+test_ok((-2.4).truncate == -2)
+test_ok((13.4 % 1 - 0.4).abs < 0.0001)
+nan = 0.0/0
+def nan_test(x,y)
+  test_ok(x != y)
+  test_ok((x < y) == false)
+  test_ok((x > y) == false)
+  test_ok((x <= y) == false)
+  test_ok((x >= y) == false)
+end
+nan_test(nan, nan)
+nan_test(nan, 0)
+nan_test(nan, 1)
+nan_test(nan, -1)
+nan_test(nan, 1000)
+nan_test(nan, -1000)
+nan_test(nan, 1_000_000_000_000)
+nan_test(nan, -1_000_000_000_000)
+nan_test(nan, 100.0);
+nan_test(nan, -100.0);
+nan_test(nan, 0.001);
+nan_test(nan, -0.001);
+nan_test(nan, 1.0/0);
+nan_test(nan, -1.0/0);
+
+#s = "3.7517675036461267e+17"
+#test_ok(s == sprintf("%.16e", s.to_f))
+f = 3.7517675036461267e+17
+test_ok(f == sprintf("%.16e", f).to_f)
+
+
+test_check "bignum"
+def fact(n)
+  return 1 if n == 0
+  f = 1
+  while n>0
+    f *= n
+    n -= 1
+  end
+  return f
+end
+$x = fact(40)
+test_ok($x == $x)
+test_ok($x == fact(40))
+test_ok($x < $x+2)
+test_ok($x > $x-2)
+test_ok($x == 815915283247897734345611269596115894272000000000)
+test_ok($x != 815915283247897734345611269596115894272000000001)
+test_ok($x+1 == 815915283247897734345611269596115894272000000001)
+test_ok($x/fact(20) == 335367096786357081410764800000)
+$x = -$x
+test_ok($x == -815915283247897734345611269596115894272000000000)
+test_ok(2-(2**32) == -(2**32-2))
+test_ok(2**32 - 5 == (2**32-3)-2)
+
+$good = true;
+for i in 1000..1014
+  $good = false if ((1 << i) != (2**i))
+end
+test_ok($good)
+
+$good = true;
+n1= 1 << 1000
+for i in 1000..1014
+  $good = false if ((1 << i) != n1)
+  n1 *= 2
+end
+test_ok($good)
+
+$good = true;
+n2=n1
+for i in 1..10
+  n1 = n1 / 2
+  n2 = n2 >> 1
+  $good = false if (n1 != n2)
+end
+test_ok($good)
+
+$good = true;
+for i in 4000..4096
+  n1 = 1 << i;
+  if (n1**2-1) / (n1+1) != (n1-1)
+    p i
+    $good = false
+  end
+end
+test_ok($good)
+
+b = 10**80
+a = b * 9 + 7
+test_ok(7 == a.modulo(b))
+test_ok(-b + 7 == a.modulo(-b))
+test_ok(b + -7 == (-a).modulo(b))
+test_ok(-7 == (-a).modulo(-b))
+test_ok(7 == a.remainder(b))
+test_ok(7 == a.remainder(-b))
+test_ok(-7 == (-a).remainder(b))
+test_ok(-7 == (-a).remainder(-b))
+
+test_ok(10**40+10**20 == 10000000000000000000100000000000000000000)
+test_ok(10**40/10**20 == 100000000000000000000)
+
+a = 677330545177305025495135714080
+b = 14269972710765292560
+test_ok(a % b == 0)
+test_ok(-a % b == 0)
+
+def shift_test(a)
+  b = a / (2 ** 32)
+  c = a >> 32
+  test_ok(b == c)
+
+  b = a * (2 ** 32)
+  c = a << 32
+  test_ok(b == c)
+end
+
+shift_test(-4518325415524767873)
+shift_test(-0xfffffffffffffffff)
+
+test_check "string & char"
+
+test_ok("abcd" == "abcd")
+test_ok("abcd" =~ /abcd/)
+test_ok("abcd" === "abcd")
+# compile time string concatenation
+test_ok("ab" "cd" == "abcd")
+test_ok("#{22}aa" "cd#{44}" == "22aacd44")
+test_ok("#{22}aa" "cd#{44}" "55" "#{66}" == "22aacd445566")
+test_ok("abc" !~ /^$/)
+test_ok("abc\n" !~ /^$/)
+test_ok("abc" !~ /^d*$/)
+test_ok(("abc" =~ /d*$/) == 3)
+test_ok("" =~ /^$/)
+test_ok("\n" =~ /^$/)
+test_ok("a\n\n" =~ /^$/)
+test_ok("abcabc" =~ /.*a/ && $& == "abca")
+test_ok("abcabc" =~ /.*c/ && $& == "abcabc")
+test_ok("abcabc" =~ /.*?a/ && $& == "a")
+test_ok("abcabc" =~ /.*?c/ && $& == "abc")
+test_ok(/(.|\n)*?\n(b|\n)/ =~ "a\nb\n\n" && $& == "a\nb")
+
+test_ok(/^(ab+)+b/ =~ "ababb" && $& == "ababb")
+test_ok(/^(?:ab+)+b/ =~ "ababb" && $& == "ababb")
+test_ok(/^(ab+)+/ =~ "ababb" && $& == "ababb")
+test_ok(/^(?:ab+)+/ =~ "ababb" && $& == "ababb")
+
+test_ok(/(\s+\d+){2}/ =~ " 1 2" && $& == " 1 2")
+test_ok(/(?:\s+\d+){2}/ =~ " 1 2" && $& == " 1 2")
+
+$x = <<END;
+ABCD
+ABCD
+END
+$x.gsub!(/((.|\n)*?)B((.|\n)*?)D/){$1+$3}
+test_ok($x == "AC\nAC\n")
+
+test_ok("foobar" =~ /foo(?=(bar)|(baz))/)
+test_ok("foobaz" =~ /foo(?=(bar)|(baz))/)
+
+$foo = "abc"
+test_ok("#$foo = abc" == "abc = abc")
+test_ok("#{$foo} = abc" == "abc = abc")
+
+foo = "abc"
+test_ok("#{foo} = abc" == "abc = abc")
+
+test_ok('-' * 5 == '-----')
+test_ok('-' * 1 == '-')
+test_ok('-' * 0 == '')
+
+foo = '-'
+test_ok(foo * 5 == '-----')
+test_ok(foo * 1 == '-')
+test_ok(foo * 0 == '')
+
+$x = "a.gif"
+test_ok($x.sub(/.*\.([^\.]+)$/, '\1') == "gif")
+test_ok($x.sub(/.*\.([^\.]+)$/, 'b.\1') == "b.gif")
+test_ok($x.sub(/.*\.([^\.]+)$/, '\2') == "")
+test_ok($x.sub(/.*\.([^\.]+)$/, 'a\2b') == "ab")
+test_ok($x.sub(/.*\.([^\.]+)$/, '<\&>') == "<a.gif>")
+
+# character constants(assumes ASCII)
+test_ok("a"[0] == ?a)
+test_ok(?a == ?a)
+test_ok(?\C-a == 1)
+test_ok(?\M-a == 225)
+test_ok(?\M-\C-a == 129)
+test_ok("a".upcase![0] == ?A)
+test_ok("A".downcase![0] == ?a)
+test_ok("abc".tr!("a-z", "A-Z") == "ABC")
+test_ok("aabbcccc".tr_s!("a-z", "A-Z") == "ABC")
+test_ok("abcc".squeeze!("a-z") == "abc")
+test_ok("abcd".delete!("bc") == "ad")
+
+$x = "abcdef"
+$y = [ ?a, ?b, ?c, ?d, ?e, ?f ]
+$bad = false
+$x.each_byte {|i|
+  if i != $y.shift
+    $bad = true
+    break
+  end
+}
+test_ok(!$bad)
+
+s = "a string"
+s[0..s.size]="another string"
+test_ok(s == "another string")
+
+s = <<EOS
+#{
+[1,2,3].join(",")
+}
+EOS
+test_ok(s == "1,2,3\n")
+test_ok("Just".to_i(36) == 926381)
+test_ok("-another".to_i(36) == -23200231779)
+test_ok(1299022.to_s(36) == "ruby")
+test_ok(-1045307475.to_s(36) == "-hacker")
+test_ok("Just_another_Ruby_hacker".to_i(36) == 265419172580680477752431643787347)
+test_ok(-265419172580680477752431643787347.to_s(36) == "-justanotherrubyhacker")
+
+a = []
+(0..255).each {|n|
+  ch = [n].pack("C")                     
+  a.push ch if /a#{Regexp.quote ch}b/x =~ "ab" 
+}
+test_ok(a.size == 0)
+
+test_check "assignment"
+a = nil
+test_ok(defined?(a))
+test_ok(a == nil)
+
+# multiple asignment
+a, b = 1, 2
+test_ok(a == 1 && b == 2)
+
+a, b = b, a
+test_ok(a == 2 && b == 1)
+
+a, = 1,2
+test_ok(a == 1)
+
+a, *b = 1, 2, 3
+test_ok(a == 1 && b == [2, 3])
+
+a, (b, c), d = 1, [2, 3], 4
+test_ok(a == 1 && b == 2 && c == 3 && d == 4)
+
+*a = 1, 2, 3
+test_ok(a == [1, 2, 3])
+
+*a = 4
+test_ok(a == [4])
+
+*a = nil
+test_ok(a == [nil])
+
+test_check "call"
+def aaa(a, b=100, *rest)
+  res = [a, b]
+  res += rest if rest
+  return res
+end
+
+# not enough argument
+begin
+  aaa()				# need at least 1 arg
+  test_ok(false)
+rescue
+  test_ok(true)
+end
+
+begin
+  aaa				# no arg given (exception raised)
+  test_ok(false)
+rescue
+  test_ok(true)
+end
+
+test_ok(aaa(1) == [1, 100])
+test_ok(aaa(1, 2) == [1, 2])
+test_ok(aaa(1, 2, 3, 4) == [1, 2, 3, 4])
+test_ok(aaa(1, *[2, 3, 4]) == [1, 2, 3, 4])
+
+test_check "proc"
+$proc = proc{|i| i}
+test_ok($proc.call(2) == 2)
+test_ok($proc.call(3) == 3)
+
+$proc = proc{|i| i*2}
+test_ok($proc.call(2) == 4)
+test_ok($proc.call(3) == 6)
+
+proc{
+  iii=5				# nested local variable
+  $proc = proc{|i|
+    iii = i
+  }
+  $proc2 = proc {
+    $x = iii			# nested variables shared by procs
+  }
+  # scope of nested variables
+  test_ok(defined?(iii))
+}.call
+test_ok(!defined?(iii))		# out of scope
+
+loop{iii=5; test_ok(eval("defined? iii")); break}
+loop {
+  iii = 10
+  def dyna_var_check
+    loop {
+      test_ok(!defined?(iii))
+      break
+    }
+  end
+  dyna_var_check
+  break
+}
+$x=0
+$proc.call(5)
+$proc2.call
+test_ok($x == 5)
+
+if defined? Process.kill
+  test_check "signal"
+
+  $x = 0
+  trap "SIGINT", proc{|sig| $x = 2}
+  Process.kill "SIGINT", $$
+  sleep 0.1
+  test_ok($x == 2)
+
+  trap "SIGINT", proc{raise "Interrupt"}
+
+  x = false
+  begin
+    Process.kill "SIGINT", $$
+    sleep 0.1
+  rescue
+    x = $!
+  end
+  test_ok(x && /Interrupt/ =~ x.message)
+end
+
+test_check "eval"
+test_ok(eval("") == nil)
+$bad=false
+eval 'while false; $bad = true; print "foo\n" end'
+test_ok(!$bad)
+
+test_ok(eval('TRUE'))
+test_ok(eval('true'))
+test_ok(!eval('NIL'))
+test_ok(!eval('nil'))
+test_ok(!eval('FALSE'))
+test_ok(!eval('false'))
+
+$foo = 'test_ok(true)'
+begin
+  eval $foo
+rescue
+  test_ok(false)
+end
+
+test_ok(eval("$foo") == 'test_ok(true)')
+test_ok(eval("true") == true)
+i = 5
+test_ok(eval("i == 5"))
+test_ok(eval("i") == 5)
+test_ok(eval("defined? i"))
+
+# eval with binding
+def test_ev
+  local1 = "local1"
+  lambda {
+    local2 = "local2"
+    return binding
+  }.call
+end
+
+$x = test_ev
+test_ok(eval("local1", $x) == "local1") # normal local var
+test_ok(eval("local2", $x) == "local2") # nested local var
+$bad = true
+begin
+  p eval("local1")
+rescue NameError		# must raise error
+  $bad = false
+end
+test_ok(!$bad)
+
+module EvTest
+  EVTEST1 = 25
+  evtest2 = 125
+  $x = binding
+end
+test_ok(eval("EVTEST1", $x) == 25)	# constant in module
+test_ok(eval("evtest2", $x) == 125)	# local var in module
+$bad = true
+begin
+  eval("EVTEST1")
+rescue NameError		# must raise error
+  $bad = false
+end
+test_ok(!$bad)
+
+x = proc{}
+eval "i4 = 1", x
+test_ok(eval("i4", x) == 1)
+x = proc{proc{}}.call
+eval "i4 = 22", x
+test_ok(eval("i4", x) == 22)
+$x = []
+x = proc{proc{}}.call
+eval "(0..9).each{|i5| $x[i5] = proc{i5*2}}", x
+test_ok($x[4].call == 8)
+
+x = binding
+eval "i = 1", x
+test_ok(eval("i", x) == 1)
+x = proc{binding}.call
+eval "i = 22", x
+test_ok(eval("i", x) == 22)
+$x = []
+x = proc{binding}.call
+eval "(0..9).each{|i5| $x[i5] = proc{i5*2}}", x
+test_ok($x[4].call == 8)
+x = proc{binding}.call
+eval "for i6 in 1..1; j6=i6; end", x
+test_ok(eval("defined? i6", x))
+test_ok(eval("defined? j6", x))
+
+proc {
+  p = binding
+  eval "foo11 = 1", p
+  foo22 = 5
+  proc{foo11=22}.call
+  proc{foo22=55}.call
+  test_ok(eval("foo11", p) == eval("foo11"))
+  test_ok(eval("foo11") == 1)
+  test_ok(eval("foo22", p) == eval("foo22"))
+  test_ok(eval("foo22") == 55)
+}.call
+
+p1 = proc{i7 = 0; proc{i7}}.call
+test_ok(p1.call == 0)
+eval "i7=5", p1
+test_ok(p1.call == 5)
+test_ok(!defined?(i7))
+
+p1 = proc{i7 = 0; proc{i7}}.call
+i7 = nil
+test_ok(p1.call == 0)
+eval "i7=1", p1
+test_ok(p1.call == 1)
+eval "i7=5", p1
+test_ok(p1.call == 5)
+test_ok(i7 == nil)
+
+test_check "system"
+test_ok(`echo foobar` == "foobar\n")
+test_ok(`./miniruby -e 'print "foobar"'` == 'foobar')
+
+tmp = open("script_tmp", "w")
+tmp.print "print $zzz\n";
+tmp.close
+
+test_ok(`./miniruby -s script_tmp -zzz` == 'true')
+test_ok(`./miniruby -s script_tmp -zzz=555` == '555')
+
+tmp = open("script_tmp", "w")
+tmp.print "#! /usr/local/bin/ruby -s\n";
+tmp.print "print $zzz\n";
+tmp.close
+
+test_ok(`./miniruby script_tmp -zzz=678` == '678')
+
+tmp = open("script_tmp", "w")
+tmp.print "this is a leading junk\n";
+tmp.print "#! /usr/local/bin/ruby -s\n";
+tmp.print "print $zzz\n";
+tmp.print "__END__\n";
+tmp.print "this is a trailing junk\n";
+tmp.close
+
+test_ok(`./miniruby -x script_tmp` == 'nil')
+test_ok(`./miniruby -x script_tmp -zzz=555` == '555')
+
+tmp = open("script_tmp", "w")
+for i in 1..5
+  tmp.print i, "\n"
+end
+tmp.close
+
+`./miniruby -i.bak -pe 'sub(/^[0-9]+$/){$&.to_i * 5}' script_tmp`
+done = true
+tmp = open("script_tmp", "r")
+while tmp.gets
+  if $_.to_i % 5 != 0
+    done = false
+    break
+  end
+end
+tmp.close
+test_ok(done)
+  
+File.unlink "script_tmp" or `/bin/rm -f "script_tmp"`
+File.unlink "script_tmp.bak" or `/bin/rm -f "script_tmp.bak"`
+
+$bad = false
+if (dir = File.dirname(File.dirname($0))) == '.'
+  dir = ""
+else
+  dir << "/"
+end
+
+def valid_syntax?(code, fname)
+  eval("BEGIN {return true}\n#{code}", nil, fname, 0)
+rescue Exception
+  puts $!.message
+  false
+end
+
+for script in Dir["#{dir}{lib,sample,ext}/**/*.rb"]
+  unless valid_syntax? IO::read(script), script
+    $bad = true
+  end
+end
+test_ok(!$bad)
+
+test_check "const"
+TEST1 = 1
+TEST2 = 2
+
+module Const
+  TEST3 = 3
+  TEST4 = 4
+end
+
+module Const2
+  TEST3 = 6
+  TEST4 = 8
+end
+
+include Const
+
+test_ok([TEST1,TEST2,TEST3,TEST4] == [1,2,3,4])
+
+include Const2
+STDERR.print "intentionally redefines TEST3, TEST4\n" if $VERBOSE
+test_ok([TEST1,TEST2,TEST3,TEST4] == [1,2,6,8])
+
+
+test_ok((String <=> Object) == -1)
+test_ok((Object <=> String) == 1)
+test_ok((Array <=> String) == nil)
+
+test_check "clone"
+foo = Object.new
+def foo.test
+  "test"
+end
+bar = foo.clone
+def bar.test2
+  "test2"
+end
+
+test_ok(bar.test2 == "test2")
+test_ok(bar.test == "test")
+test_ok(foo.test == "test")  
+
+begin
+  foo.test2
+  test_ok false
+rescue NoMethodError
+  test_ok true
+end
+
+module M001; end
+module M002; end
+module M003; include M002; end
+module M002; include M001; end
+module M003; include M002; end
+
+test_ok(M003.ancestors == [M003, M002, M001])
+
+test_check "marshal"
+$x = [1,2,3,[4,5,"foo"],{1=>"bar"},2.5,fact(30)]
+$y = Marshal.dump($x)
+test_ok($x == Marshal.load($y))
+
+StrClone=String.clone;
+test_ok(Marshal.load(Marshal.dump(StrClone.new("abc"))).class == StrClone)
+
+[[1,2,3,4], [81, 2, 118, 3146]].each { |w,x,y,z|
+  a = (x.to_f + y.to_f / z.to_f) * Math.exp(w.to_f / (x.to_f + y.to_f / z.to_f))
+  ma = Marshal.dump(a)
+  b = Marshal.load(ma)
+  test_ok(a == b)
+}
+
+test_check "pack"
+
+$format = "c2x5CCxsdils_l_a6";
+# Need the expression in here to force ary[5] to be numeric.  This avoids
+# test2 failing because ary2 goes str->numeric->str and ary does not.
+ary = [1,-100,127,128,32767,987.654321098 / 100.0,12345,123456,-32767,-123456,"abcdef"]
+$x = ary.pack($format)
+ary2 = $x.unpack($format)
+
+test_ok(ary.length == ary2.length)
+test_ok(ary.join(':') == ary2.join(':'))
+test_ok($x =~ /def/)
+
+$x = [-1073741825]
+test_ok($x.pack("q").unpack("q") == $x)
+
+test_check "math"
+test_ok(Math.sqrt(4) == 2)
+
+include Math
+test_ok(sqrt(4) == 2)
+
+test_check "struct"
+struct_test = Struct.new("Test", :foo, :bar)
+test_ok(struct_test == Struct::Test)
+
+test = struct_test.new(1, 2)
+test_ok(test.foo == 1 && test.bar == 2)
+test_ok(test[0] == 1 && test[1] == 2)
+
+a, b = test.to_a
+test_ok(a == 1 && b == 2)
+
+test[0] = 22
+test_ok(test.foo == 22)
+
+test.bar = 47
+test_ok(test.bar == 47)
+
+test_check "variable"
+test_ok($$.instance_of?(Fixnum))
+
+# read-only variable
+begin
+  $$ = 5
+  test_ok false
+rescue NameError
+  test_ok true
+end
+
+foobar = "foobar"
+$_ = foobar
+test_ok($_ == foobar)
+
+class Gods
+  @@rule = "Uranus"
+  def ruler0
+    @@rule
+  end
+
+  def self.ruler1		# <= per method definition style
+    @@rule
+  end		   
+  class << self			# <= multiple method definition style
+    def ruler2
+      @@rule
+    end
+  end
+end
+
+module Olympians
+ @@rule ="Zeus"
+ def ruler3
+    @@rule
+  end
+end
+
+class Titans < Gods
+  @@rule = "Cronus"
+  include Olympians           	# OK to cause warning (intentional)
+end
+
+test_ok(Gods.new.ruler0 == "Cronus")
+test_ok(Gods.ruler1 == "Cronus")
+test_ok(Gods.ruler2 == "Cronus")
+test_ok(Titans.ruler1 == "Cronus")
+test_ok(Titans.ruler2 == "Cronus")
+atlas = Titans.new
+test_ok(atlas.ruler0 == "Cronus")
+test_ok(atlas.ruler3 == "Zeus")
+
+test_check "trace"
+$x = 1234
+$y = 0
+trace_var :$x, proc{$y = $x}
+$x = 40414
+test_ok($y == $x)
+
+untrace_var :$x
+$x = 19660208
+test_ok($y != $x)
+
+trace_var :$x, proc{$x *= 2}
+$x = 5
+test_ok($x == 10)
+
+untrace_var :$x
+
+test_check "defined?"
+
+test_ok(defined?($x))		# global variable
+test_ok(defined?($x) == 'global-variable')# returns description
+
+foo=5
+test_ok(defined?(foo))		# local variable
+
+test_ok(defined?(Array))	# constant
+test_ok(defined?(Object.new))	# method
+test_ok(!defined?(Object.print))# private method
+test_ok(defined?(1 == 2))	# operator expression
+
+class Foo
+  def foo
+    p :foo
+  end
+  protected :foo
+  def bar(f)
+    test_ok(defined?(self.foo))
+    test_ok(defined?(f.foo))
+  end
+end
+f = Foo.new
+test_ok(defined?(f.foo) == nil)
+f.bar(f)
+
+def defined_test
+  return !defined?(yield)
+end
+
+test_ok(defined_test)		# not iterator
+test_ok(!defined_test{})	# called as iterator
+
+test_check "alias"
+class Alias0
+  def foo; "foo" end
+end
+class Alias1<Alias0
+  alias bar foo
+  def foo; "foo+" + super end
+end
+class Alias2<Alias1
+  alias baz foo
+  undef foo
+end
+
+x = Alias2.new
+test_ok(x.bar == "foo")
+test_ok(x.baz == "foo+foo")
+
+# test_check for cache
+test_ok(x.baz == "foo+foo")
+
+class Alias3<Alias2
+  def foo
+    defined? super
+  end
+  def bar
+    defined? super
+  end
+  def quux
+    defined? super
+  end
+end
+x = Alias3.new
+test_ok(!x.foo)
+test_ok(x.bar)
+test_ok(!x.quux)
+
+test_check "path"
+test_ok(File.basename("a") == "a")
+test_ok(File.basename("a/b") == "b")
+test_ok(File.basename("a/b/") == "b")
+test_ok(File.basename("/") == "/")
+test_ok(File.basename("//") == "/")
+test_ok(File.basename("///") == "/")
+test_ok(File.basename("a/b////") == "b")
+test_ok(File.basename("a.rb", ".rb") == "a")
+test_ok(File.basename("a.rb///", ".rb") == "a")
+test_ok(File.basename("a.rb///", ".*") == "a")
+test_ok(File.basename("a.rb///", ".c") == "a.rb")
+test_ok(File.dirname("a") == ".")
+test_ok(File.dirname("/") == "/")
+test_ok(File.dirname("/a") == "/")
+test_ok(File.dirname("a/b") == "a")
+test_ok(File.dirname("a/b/c") == "a/b")
+test_ok(File.dirname("/a/b/c") == "/a/b")
+test_ok(File.dirname("/a/b/") == "/a")
+test_ok(File.dirname("/a/b///") == "/a")
+case Dir.pwd
+when %r'\A\w:'
+  test_ok(/\A\w:\/\z/ =~ File.expand_path(".", "/"))
+  test_ok(/\A\w:\/a\z/ =~ File.expand_path("a", "/"))
+  dosish = true
+when %r'\A//'
+  test_ok(%r'\A//[^/]+/[^/]+\z' =~ File.expand_path(".", "/"))
+  test_ok(%r'\A//[^/]+/[^/]+/a\z' =~ File.expand_path(".", "/"))
+  dosish = true
+else
+  test_ok(File.expand_path(".", "/") == "/")
+  test_ok(File.expand_path("sub", "/") == "/sub")
+end
+if dosish
+  test_ok(File.expand_path("/", "//machine/share/sub") == "//machine/share")
+  test_ok(File.expand_path("/dir", "//machine/share/sub") == "//machine/share/dir")
+  test_ok(File.expand_path("/", "z:/sub") == "z:/")
+  test_ok(File.expand_path("/dir", "z:/sub") == "z:/dir")
+end
+test_ok(File.expand_path(".", "//") == "//")
+test_ok(File.expand_path("sub", "//") == "//sub")
+
+test_check "gc"
+begin
+  1.upto(10000) {
+    tmp = [0,1,2,3,4,5,6,7,8,9]
+  }
+  tmp = nil
+  test_ok true
+rescue
+  test_ok false
+end
+class S
+  def initialize(a)
+    @a = a
+  end
+end
+l=nil
+100000.times {
+  l = S.new(l)
+}
+GC.start
+test_ok true   # reach here or dumps core
+l = []
+100000.times {
+  l.push([l])
+}
+GC.start
+test_ok true   # reach here or dumps core
+
+if $failed > 0
+  printf "test: %d failed %d\n", $ntest, $failed
+else
+  printf "end of test(test: %d)\n", $ntest
+end
diff --git a/ruby_1_8_6/sample/testunit/adder.rb b/ruby_1_8_6/sample/testunit/adder.rb
new file mode 100644
index 0000000000..aa5c88cc7b
--- /dev/null
+++ b/ruby_1_8_6/sample/testunit/adder.rb
@@ -0,0 +1,13 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+class Adder
+  def initialize(number)
+    @number = number
+  end
+  def add(number)
+    return @number + number
+  end
+end
+
diff --git a/ruby_1_8_6/sample/testunit/subtracter.rb b/ruby_1_8_6/sample/testunit/subtracter.rb
new file mode 100644
index 0000000000..2c08247805
--- /dev/null
+++ b/ruby_1_8_6/sample/testunit/subtracter.rb
@@ -0,0 +1,12 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+class Subtracter
+  def initialize(number)
+    @number = number
+  end
+  def subtract(number)
+    return @number - number
+  end
+end
diff --git a/ruby_1_8_6/sample/testunit/tc_adder.rb b/ruby_1_8_6/sample/testunit/tc_adder.rb
new file mode 100644
index 0000000000..8453beb20a
--- /dev/null
+++ b/ruby_1_8_6/sample/testunit/tc_adder.rb
@@ -0,0 +1,18 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+require 'adder'
+
+class TC_Adder < Test::Unit::TestCase
+  def setup
+    @adder = Adder.new(5)
+  end
+  def test_add
+    assert_equal(7, @adder.add(2), "Should have added correctly")
+  end
+  def teardown
+    @adder = nil
+  end
+end
diff --git a/ruby_1_8_6/sample/testunit/tc_subtracter.rb b/ruby_1_8_6/sample/testunit/tc_subtracter.rb
new file mode 100644
index 0000000000..d2c8313350
--- /dev/null
+++ b/ruby_1_8_6/sample/testunit/tc_subtracter.rb
@@ -0,0 +1,18 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+require 'subtracter'
+
+class TC_Subtracter < Test::Unit::TestCase
+  def setup
+    @subtracter = Subtracter.new(5)
+  end
+  def test_subtract
+    assert_equal(3, @subtracter.subtract(2), "Should have subtracted correctly")
+  end
+  def teardown
+    @subtracter = nil
+  end
+end
diff --git a/ruby_1_8_6/sample/testunit/ts_examples.rb b/ruby_1_8_6/sample/testunit/ts_examples.rb
new file mode 100644
index 0000000000..3d24dd6522
--- /dev/null
+++ b/ruby_1_8_6/sample/testunit/ts_examples.rb
@@ -0,0 +1,7 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+require 'tc_adder'
+require 'tc_subtracter'
diff --git a/ruby_1_8_6/sample/time.rb b/ruby_1_8_6/sample/time.rb
new file mode 100644
index 0000000000..84fa9e1a8d
--- /dev/null
+++ b/ruby_1_8_6/sample/time.rb
@@ -0,0 +1,8 @@
+#! /usr/local/bin/ruby
+cmd = ARGV.join(" ")
+b = Time.now
+system(cmd)
+e = Time.now
+ut, st, cut, cst = Time.times.to_a
+total = (e - b).to_f
+STDERR.printf "%11.1f real %11.1f user %11.1f sys\n", total, cut, cst
diff --git a/ruby_1_8_6/sample/trojan.rb b/ruby_1_8_6/sample/trojan.rb
new file mode 100644
index 0000000000..3a35ac21c2
--- /dev/null
+++ b/ruby_1_8_6/sample/trojan.rb
@@ -0,0 +1,15 @@
+#! /usr/local/bin/ruby
+
+path = ENV['PATH'].split(File::PATH_SEPARATOR)
+
+for dir in path
+  if File.directory?(dir)
+    for f in d = Dir.open(dir)
+      fpath = File.join(dir, f)  
+      if File.file?(fpath) && (File.stat(fpath).mode & 022) != 0
+	printf("file %s is writable from other users\n", fpath)
+      end
+    end
+    d.close
+  end
+end
diff --git a/ruby_1_8_6/sample/tsvr.rb b/ruby_1_8_6/sample/tsvr.rb
new file mode 100644
index 0000000000..52cdd32dce
--- /dev/null
+++ b/ruby_1_8_6/sample/tsvr.rb
@@ -0,0 +1,20 @@
+# socket example - server side using thread
+# usage: ruby tsvr.rb
+
+require "socket"
+
+gs = TCPserver.open(0)
+addr = gs.addr
+addr.shift
+printf("server is on %s\n", addr.join(":"))
+
+loop do
+  Thread.start(gs.accept) do |s|
+    print(s, " is accepted\n")
+    while line = s.gets
+      s.write(line)
+    end
+    print(s, " is gone\n")
+    s.close
+  end
+end
diff --git a/ruby_1_8_6/sample/uumerge.rb b/ruby_1_8_6/sample/uumerge.rb
new file mode 100644
index 0000000000..2576bcb864
--- /dev/null
+++ b/ruby_1_8_6/sample/uumerge.rb
@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+
+if ARGV[0] == "-c"
+  out_stdout = 1
+  ARGV.shift
+end
+
+$sawbegin = 0
+$sawend = 0
+
+while line = gets()
+  if /^begin\s*(\d*)\s*(\S*)/ =~ line
+    $mode, $file = $1, $2
+    $sawbegin+=1
+    if out_stdout
+      out = STDOUT
+    else
+      out = open($file, "w") if $file != ""
+    end
+    out.binmode
+    break
+  end
+end
+
+raise "missing begin" unless $sawbegin
+
+out.binmode
+while line = gets()
+  if /^end/ =~ line
+    $sawend+=1
+    out.close unless out_stdout
+    File.chmod $mode.oct, $file unless out_stdout
+    next
+  end
+  line.sub!(/[a-z]+$/, "")	# handle stupid trailing lowercase letters
+  next if /[a-z]/ =~ line
+  next if !(((($_[0] - 32) & 077) + 2) / 3 == $_.length / 4)
+  out << $_.unpack("u") if $sawbegin > $sawend
+end
+
+raise "missing end" if $sawbegin > $sawend
+raise "missing begin" if ! $sawbegin
+exit 0
diff --git a/ruby_1_8_6/sample/webrick/demo-app.rb b/ruby_1_8_6/sample/webrick/demo-app.rb
new file mode 100644
index 0000000000..c7a2a0a6a4
--- /dev/null
+++ b/ruby_1_8_6/sample/webrick/demo-app.rb
@@ -0,0 +1,66 @@
+require "pp"
+
+module DemoApplication
+  def initialize(config, enctype)
+    super
+    @enctype = enctype
+  end
+
+  def do_GET(req, res)
+    if req.path_info != "/"
+      res.set_redirect(WEBrick::HTTPStatus::Found, req.script_name + "/")
+    end
+    res.body =<<-_end_of_html_
+      <HTML>
+       <FORM method="POST" enctype=#{@enctype}>
+        text: <INPUT type="text" name="text"><BR>
+        file: <INPUT type="file" name="file"><BR>
+        check:
+        <INPUT type="checkbox" name="check" value="a">a,
+        <INPUT type="checkbox" name="check" value="b">b,
+        <INPUT type="checkbox" name="check" value="c">c,
+        <BR>
+        <INPUT type="submit">
+       </FORM>
+      </HTML>
+    _end_of_html_
+    res['content-type'] = 'text/html; charset=iso-8859-1'
+  end
+
+  def do_POST(req, res)
+    if req["content-length"].to_i > 1024*10
+      raise WEBrick::HTTPStatus::Forbidden, "file size too large"
+    end
+    res.body =<<-_end_of_html_
+      <HTML>
+       <H2>Query Parameters</H2>
+       #{display_query(req.query)}
+       <A href="#{req.path}">return</A>
+       <H2>Request</H2>
+       <PRE>#{WEBrick::HTMLUtils::escape(PP::pp(req, "", 80))}</PRE>
+       <H2>Response</H2>
+       <PRE>#{WEBrick::HTMLUtils::escape(PP::pp(res, "", 80))}</PRE>
+      </HTML>
+    _end_of_html_
+    res['content-type'] = 'text/html; charset=iso-8859-1'
+  end
+
+  private
+
+  def display_query(q)
+    ret = ""
+    q.each{|key, val|
+      ret << "<H3>#{WEBrick::HTMLUtils::escape(key)}</H3>"
+      ret << "<TABLE border=1>"
+      ret << make_tr("val", val.inspect)
+      ret << make_tr("val.to_a", val.to_a.inspect)
+      ret << make_tr("val.to_ary", val.to_ary.inspect)
+      ret << "</TABLE>"
+    }
+    ret
+  end
+
+  def make_tr(arg0, arg1)
+    "<TR><TD>#{arg0}</TD><TD>#{WEBrick::HTMLUtils::escape(arg1)}</TD></TR>"
+  end
+end
diff --git a/ruby_1_8_6/sample/webrick/demo-multipart.cgi b/ruby_1_8_6/sample/webrick/demo-multipart.cgi
new file mode 100644
index 0000000000..0893fadadf
--- /dev/null
+++ b/ruby_1_8_6/sample/webrick/demo-multipart.cgi
@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require "webrick/cgi"
+require "webrick/https" # should load if it runs on HTTPS server
+require "./demo-app"
+
+class DemoCGI < WEBrick::CGI
+  include DemoApplication
+end
+
+config = { :NPH => false }
+cgi = DemoCGI.new(config, "multipart/form-data")
+cgi.start
diff --git a/ruby_1_8_6/sample/webrick/demo-servlet.rb b/ruby_1_8_6/sample/webrick/demo-servlet.rb
new file mode 100644
index 0000000000..9c18cc65d1
--- /dev/null
+++ b/ruby_1_8_6/sample/webrick/demo-servlet.rb
@@ -0,0 +1,6 @@
+require "webrick"
+require "./demo-app"
+
+class DemoServlet < WEBrick::HTTPServlet::AbstractServlet
+  include DemoApplication
+end
diff --git a/ruby_1_8_6/sample/webrick/demo-urlencoded.cgi b/ruby_1_8_6/sample/webrick/demo-urlencoded.cgi
new file mode 100644
index 0000000000..e4706f8b59
--- /dev/null
+++ b/ruby_1_8_6/sample/webrick/demo-urlencoded.cgi
@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require "webrick/cgi"
+require "webrick/https"  # should load if it runs on HTTPS server 
+require "./demo-app"
+
+class DemoCGI < WEBrick::CGI
+  include DemoApplication
+end
+
+config = { :NPH => false } 
+cgi = DemoCGI.new(config, "application/x-www-form-urlencoded")
+cgi.start
diff --git a/ruby_1_8_6/sample/webrick/hello.cgi b/ruby_1_8_6/sample/webrick/hello.cgi
new file mode 100644
index 0000000000..35d2240df0
--- /dev/null
+++ b/ruby_1_8_6/sample/webrick/hello.cgi
@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+require "webrick/cgi"
+
+class HelloCGI < WEBrick::CGI
+  def do_GET(req, res)
+    res["content-type"] = "text/plain"
+    res.body = "Hello, world.\n"
+  end
+end
+
+HelloCGI.new.start
diff --git a/ruby_1_8_6/sample/webrick/hello.rb b/ruby_1_8_6/sample/webrick/hello.rb
new file mode 100644
index 0000000000..4d02676818
--- /dev/null
+++ b/ruby_1_8_6/sample/webrick/hello.rb
@@ -0,0 +1,8 @@
+require "webrick"
+
+class HelloServlet < WEBrick::HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    res["content-type"] = "text/plain"
+    res.body = "Hello, world.\n"
+  end
+end
diff --git a/ruby_1_8_6/sample/webrick/httpd.rb b/ruby_1_8_6/sample/webrick/httpd.rb
new file mode 100644
index 0000000000..b0edf47582
--- /dev/null
+++ b/ruby_1_8_6/sample/webrick/httpd.rb
@@ -0,0 +1,23 @@
+require "webrick"
+
+httpd = WEBrick::HTTPServer.new(
+  :DocumentRoot => File::dirname(__FILE__),
+  :Port         => 10080,
+  :Logger       => WEBrick::Log.new($stderr, WEBrick::Log::DEBUG),
+  :AccessLog    => [
+    [ $stderr, WEBrick::AccessLog::COMMON_LOG_FORMAT  ],
+    [ $stderr, WEBrick::AccessLog::REFERER_LOG_FORMAT ],
+    [ $stderr, WEBrick::AccessLog::AGENT_LOG_FORMAT   ],
+  ],
+  :CGIPathEnv   => ENV["PATH"]   # PATH environment variable for CGI.
+)
+
+require "./hello"
+httpd.mount("/hello", HelloServlet)
+
+require "./demo-servlet"
+httpd.mount("/urlencoded", DemoServlet, "application/x-www-form-urlencoded")
+httpd.mount("/multipart", DemoServlet, "multipart/form-data")
+
+trap(:INT){ httpd.shutdown }
+httpd.start
diff --git a/ruby_1_8_6/sample/webrick/httpproxy.rb b/ruby_1_8_6/sample/webrick/httpproxy.rb
new file mode 100644
index 0000000000..bca0cc4626
--- /dev/null
+++ b/ruby_1_8_6/sample/webrick/httpproxy.rb
@@ -0,0 +1,26 @@
+require "webrick"
+require "webrick/httpproxy"
+
+# :ProxyContentHandler will be invoked before sending
+# response to User-Agenge. You can inspect the pair of
+# request and response messages (or can edit the response
+# message if necessary).
+
+pch = Proc.new{|req, res|
+  p [ req.request_line, res.status_line ]
+}
+
+def upstream_proxy
+  if prx = ENV["http_proxy"]
+    return URI.parse(prx)
+  end
+  return nil
+end
+
+httpd = WEBrick::HTTPProxyServer.new(
+  :Port     => 10080,
+  :ProxyContentHandler => pch,
+  :ProxyURI => upstream_proxy
+)
+Signal.trap(:INT){ httpd.shutdown }
+httpd.start
diff --git a/ruby_1_8_6/sample/webrick/httpsd.rb b/ruby_1_8_6/sample/webrick/httpsd.rb
new file mode 100644
index 0000000000..a120782c3c
--- /dev/null
+++ b/ruby_1_8_6/sample/webrick/httpsd.rb
@@ -0,0 +1,33 @@
+require "webrick"
+require "webrick/https"
+
+hostname = WEBrick::Utils::getservername
+subject = [["O", "ruby-lang.org"], ["OU", "sample"], ["CN", hostname]]
+comment = "Comment for self-signed certificate"
+
+httpd = WEBrick::HTTPServer.new(
+  :DocumentRoot   => File::dirname(__FILE__),
+  :Port           => 10443,
+  :SSLEnable      => true,
+
+  # Specify key pair and server certificate.
+  # :SSLPrivateKey  => OpenSSL::PKey::RSA.new(File.read("server.key")),
+  # :SSLCertificate => OpenSSL::X509::Certificate.new(File.read("server.crt")),
+
+  # specify the following SSL options if you want to use auto
+  # generated self-signed certificate.
+  :SSLCertName    => subject,
+  :SSLComment     => comment,
+
+  :CGIPathEnv     => ENV["PATH"]  # PATH environment variable for CGI.
+)
+
+require "./hello"
+httpd.mount("/hello", HelloServlet)
+
+require "./demo-servlet"
+httpd.mount("/urlencoded", DemoServlet, "application/x-www-form-urlencoded")
+httpd.mount("/multipart", DemoServlet, "multipart/form-data")
+
+trap(:INT){ httpd.shutdown }
+httpd.start
diff --git a/ruby_1_8_6/signal.c b/ruby_1_8_6/signal.c
new file mode 100644
index 0000000000..0f1171b30b
--- /dev/null
+++ b/ruby_1_8_6/signal.c
@@ -0,0 +1,1113 @@
+/**********************************************************************
+
+  signal.c -
+
+  $Author$
+  $Date$
+  created at: Tue Dec 20 10:13:44 JST 1994
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "rubysig.h"
+#include <signal.h>
+#include <stdio.h>
+
+#ifdef __BEOS__
+#undef SIGBUS
+#endif
+
+#ifndef NSIG
+# ifdef DJGPP
+#  define NSIG SIGMAX
+# else
+#  define NSIG (_SIGMAX + 1)      /* For QNX */
+# endif
+#endif
+
+static struct signals {
+    char *signm;
+    int  signo;
+} siglist [] = {
+    {"EXIT", 0},
+#ifdef SIGHUP
+    {"HUP", SIGHUP},
+#endif
+    {"INT", SIGINT},
+#ifdef SIGQUIT
+    {"QUIT", SIGQUIT},
+#endif
+#ifdef SIGILL
+    {"ILL", SIGILL},
+#endif
+#ifdef SIGTRAP
+    {"TRAP", SIGTRAP},
+#endif
+#ifdef SIGIOT
+    {"IOT", SIGIOT},
+#endif
+#ifdef SIGABRT
+    {"ABRT", SIGABRT},
+#endif
+#ifdef SIGEMT
+    {"EMT", SIGEMT},
+#endif
+#ifdef SIGFPE
+    {"FPE", SIGFPE},
+#endif
+#ifdef SIGKILL
+    {"KILL", SIGKILL},
+#endif
+#ifdef SIGBUS
+    {"BUS", SIGBUS},
+#endif
+#ifdef SIGSEGV
+    {"SEGV", SIGSEGV},
+#endif
+#ifdef SIGSYS
+    {"SYS", SIGSYS},
+#endif
+#ifdef SIGPIPE
+    {"PIPE", SIGPIPE},
+#endif
+#ifdef SIGALRM
+    {"ALRM", SIGALRM},
+#endif
+#ifdef SIGTERM
+    {"TERM", SIGTERM},
+#endif
+#ifdef SIGURG
+    {"URG", SIGURG},
+#endif
+#ifdef SIGSTOP
+    {"STOP", SIGSTOP},
+#endif
+#ifdef SIGTSTP
+    {"TSTP", SIGTSTP},
+#endif
+#ifdef SIGCONT
+    {"CONT", SIGCONT},
+#endif
+#ifdef SIGCHLD
+    {"CHLD", SIGCHLD},
+#endif
+#ifdef SIGCLD
+    {"CLD", SIGCLD},
+#else
+# ifdef SIGCHLD
+    {"CLD", SIGCHLD},
+# endif
+#endif
+#ifdef SIGTTIN
+    {"TTIN", SIGTTIN},
+#endif
+#ifdef SIGTTOU
+    {"TTOU", SIGTTOU},
+#endif
+#ifdef SIGIO
+    {"IO", SIGIO},
+#endif
+#ifdef SIGXCPU
+    {"XCPU", SIGXCPU},
+#endif
+#ifdef SIGXFSZ
+    {"XFSZ", SIGXFSZ},
+#endif
+#ifdef SIGVTALRM
+    {"VTALRM", SIGVTALRM},
+#endif
+#ifdef SIGPROF
+    {"PROF", SIGPROF},
+#endif
+#ifdef SIGWINCH
+    {"WINCH", SIGWINCH},
+#endif
+#ifdef SIGUSR1
+    {"USR1", SIGUSR1},
+#endif
+#ifdef SIGUSR2
+    {"USR2", SIGUSR2},
+#endif
+#ifdef SIGLOST
+    {"LOST", SIGLOST},
+#endif
+#ifdef SIGMSG
+    {"MSG", SIGMSG},
+#endif
+#ifdef SIGPWR
+    {"PWR", SIGPWR},
+#endif
+#ifdef SIGPOLL
+    {"POLL", SIGPOLL},
+#endif
+#ifdef SIGDANGER
+    {"DANGER", SIGDANGER},
+#endif
+#ifdef SIGMIGRATE
+    {"MIGRATE", SIGMIGRATE},
+#endif
+#ifdef SIGPRE
+    {"PRE", SIGPRE},
+#endif
+#ifdef SIGGRANT
+    {"GRANT", SIGGRANT},
+#endif
+#ifdef SIGRETRACT
+    {"RETRACT", SIGRETRACT},
+#endif
+#ifdef SIGSOUND
+    {"SOUND", SIGSOUND},
+#endif
+#ifdef SIGINFO
+    {"INFO", SIGINFO},
+#endif
+    {NULL, 0}
+};
+
+static int
+signm2signo(nm)
+    const char *nm;
+{
+    struct signals *sigs;
+
+    for (sigs = siglist; sigs->signm; sigs++)
+	if (strcmp(sigs->signm, nm) == 0)
+	    return sigs->signo;
+    return 0;
+}
+
+static char*
+signo2signm(no)
+    int no;
+{
+    struct signals *sigs;
+
+    for (sigs = siglist; sigs->signm; sigs++)
+	if (sigs->signo == no)
+	    return sigs->signm;
+    return 0;
+}
+
+const char *
+ruby_signal_name(no)
+    int no;
+{
+    return signo2signm(no);
+}
+
+/*
+ * call-seq:
+ *    SignalException.new(sig)   =>  signal_exception
+ *
+ *  Construct a new SignalException object.  +sig+ should be a known
+ *  signal name, or a signal number.
+ */
+
+static VALUE
+esignal_init(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    int argnum = 1;
+    VALUE sig = Qnil;
+    int signo;
+    const char *signm;
+    char tmpnm[(sizeof(int)*CHAR_BIT)/3+4];
+
+    if (argc > 0) {
+	sig = argv[0];
+	if (FIXNUM_P(sig)) argnum = 2;
+    }
+    if (argc < 1 || argnum < argc) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+		 argc, argnum);
+    }
+    if (argnum == 2) {
+	signo = FIX2INT(sig);
+	if (signo < 0 || signo > NSIG) {
+	    rb_raise(rb_eArgError, "invalid signal number (%d)", signo);
+	}
+	if (argc > 1) {
+	    sig = argv[1];
+	}
+	else {
+	    signm = signo2signm(signo);
+	    if (signm) {
+		snprintf(tmpnm, sizeof(tmpnm), "SIG%s", signm);
+	    }
+	    else {
+		snprintf(tmpnm, sizeof(tmpnm), "SIG%u", signo);
+	    }
+	    sig = rb_str_new2(signm = tmpnm);
+	}
+    }
+    else {
+	signm = SYMBOL_P(sig) ? rb_id2name(SYM2ID(sig)) : StringValuePtr(sig);
+	if (strncmp(signm, "SIG", 3) == 0) signm += 3;
+	signo = signm2signo(signm);
+	if (!signo) {
+	    rb_raise(rb_eArgError, "unsupported name `SIG%s'", signm);
+	}
+	if (SYMBOL_P(sig)) {
+	    sig = rb_str_new2(signm);
+	}
+    }
+    rb_call_super(1, &sig);
+    rb_iv_set(self, "signo", INT2NUM(signo));
+
+    return self;
+}
+
+static VALUE
+interrupt_init(self, mesg)
+    VALUE self, mesg;
+{
+    VALUE argv[2];
+
+    argv[0] = INT2FIX(SIGINT);
+    argv[1] = mesg;
+    return rb_call_super(2, argv);
+}
+
+void
+ruby_default_signal(sig)
+    int sig;
+{
+#ifndef MACOS_UNUSE_SIGNAL
+    extern rb_pid_t getpid _((void));
+
+    signal(sig, SIG_DFL);
+    kill(getpid(), sig);
+#endif
+}
+
+/*
+ *  call-seq:
+ *     Process.kill(signal, pid, ...)    => fixnum
+ *  
+ *  Sends the given signal to the specified process id(s), or to the
+ *  current process if _pid_ is zero. _signal_ may be an
+ *  integer signal number or a POSIX signal name (either with or without
+ *  a +SIG+ prefix). If _signal_ is negative (or starts
+ *  with a minus sign), kills process groups instead of
+ *  processes. Not all signals are available on all platforms.
+ *     
+ *     pid = fork do
+ *        Signal.trap("HUP") { puts "Ouch!"; exit }
+ *        # ... do some work ...
+ *     end
+ *     # ...
+ *     Process.kill("HUP", pid)
+ *     Process.wait
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Ouch!
+ */
+
+VALUE
+rb_f_kill(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    int negative = 0;
+    int sig;
+    int i;
+    char *s;
+
+    rb_secure(2);
+    if (argc < 2)
+	rb_raise(rb_eArgError, "wrong number of arguments -- kill(sig, pid...)");
+    switch (TYPE(argv[0])) {
+      case T_FIXNUM:
+	sig = FIX2INT(argv[0]);
+	break;
+
+      case T_SYMBOL:
+	s = rb_id2name(SYM2ID(argv[0]));
+	if (!s) rb_raise(rb_eArgError, "bad signal");
+	goto str_signal;
+
+      case T_STRING:
+	s = RSTRING(argv[0])->ptr;
+	if (s[0] == '-') {
+	    negative++;
+	    s++;
+	}
+      str_signal:
+	if (strncmp("SIG", s, 3) == 0)
+	    s += 3;
+	if((sig = signm2signo(s)) == 0)
+	    rb_raise(rb_eArgError, "unsupported name `SIG%s'", s);
+
+	if (negative)
+	    sig = -sig;
+	break;
+
+      default:
+        {
+	    VALUE str;
+
+	    str = rb_check_string_type(argv[0]);
+	    if (!NIL_P(str)) {
+		s = RSTRING(str)->ptr;
+		goto str_signal;
+	    }
+	    rb_raise(rb_eArgError, "bad signal type %s",
+		     rb_obj_classname(argv[0]));
+	}
+	break;
+    }
+
+    if (sig < 0) {
+	sig = -sig;
+	for (i=1; i<argc; i++) {
+	    int pid = NUM2INT(argv[i]);
+#ifdef HAS_KILLPG
+	    if (killpg(pid, sig) < 0)
+#else
+	    if (kill(-pid, sig) < 0)
+#endif
+		rb_sys_fail(0);
+	}
+    }
+    else {
+	for (i=1; i<argc; i++) {
+	    Check_Type(argv[i], T_FIXNUM);
+	    if (kill(FIX2INT(argv[i]), sig) < 0)
+		rb_sys_fail(0);
+	}
+    }
+    return INT2FIX(i-1);
+}
+
+static struct {
+    VALUE cmd;
+    int safe;
+} trap_list[NSIG];
+static rb_atomic_t trap_pending_list[NSIG];
+static char rb_trap_accept_nativethreads[NSIG];
+rb_atomic_t rb_trap_pending;
+rb_atomic_t rb_trap_immediate;
+int rb_prohibit_interrupt = 1;
+
+void
+rb_gc_mark_trap_list()
+{
+#ifndef MACOS_UNUSE_SIGNAL
+    int i;
+
+    for (i=0; i<NSIG; i++) {
+	if (trap_list[i].cmd)
+	    rb_gc_mark(trap_list[i].cmd);
+    }
+#endif /* MACOS_UNUSE_SIGNAL */
+}
+
+#ifdef __dietlibc__
+#define sighandler_t sh_t
+#endif
+
+typedef RETSIGTYPE (*sighandler_t)_((int));
+
+#ifdef POSIX_SIGNAL
+static sighandler_t
+ruby_signal(signum, handler)
+    int signum;
+    sighandler_t handler;
+{
+    struct sigaction sigact, old;
+
+    rb_trap_accept_nativethreads[signum] = 0;
+
+    sigact.sa_handler = handler;
+    sigemptyset(&sigact.sa_mask);
+    sigact.sa_flags = 0;
+# ifdef SA_NOCLDWAIT
+    if (signum == SIGCHLD && handler == SIG_IGN)
+	sigact.sa_flags |= SA_NOCLDWAIT;
+# endif
+    sigaction(signum, &sigact, &old);
+    return old.sa_handler;
+}
+
+void
+posix_signal(signum, handler)
+    int signum;
+    sighandler_t handler;
+{
+    ruby_signal(signum, handler);
+}
+
+# ifdef HAVE_NATIVETHREAD
+static sighandler_t
+ruby_nativethread_signal(signum, handler)
+    int signum;
+    sighandler_t handler;
+{
+    sighandler_t old;
+
+    old = ruby_signal(signum, handler);
+    rb_trap_accept_nativethreads[signum] = 1;
+    return old;
+}
+
+void
+posix_nativethread_signal(signum, handler)
+    int signum;
+    sighandler_t handler;
+{
+    ruby_nativethread_signal(signum, handler);
+}
+# endif
+
+#else /* !POSIX_SIGNAL */
+#define ruby_signal(sig,handler) (rb_trap_accept_nativethreads[sig] = 0, signal((sig),(handler)))
+
+# ifdef HAVE_NATIVETHREAD
+static sighandler_t
+ruby_nativethread_signal(signum, handler)
+    int signum;
+    sighandler_t handler;
+{
+    sighandler_t old;
+
+    old = signal(signum, handler);
+    rb_trap_accept_nativethreads[signum] = 1;
+    return old;
+}
+# endif
+#endif /* POSIX_SIGNAL */
+
+static void signal_exec _((int sig));
+static void
+signal_exec(sig)
+    int sig;
+{
+    if (trap_list[sig].cmd == 0) {
+	switch (sig) {
+	  case SIGINT:
+	    rb_thread_interrupt();
+	    break;
+#ifdef SIGHUP
+	  case SIGHUP:
+#endif
+#ifdef SIGQUIT
+	  case SIGQUIT:
+#endif
+#ifdef SIGTERM
+	  case SIGTERM:
+#endif
+#ifdef SIGALRM
+	  case SIGALRM:
+#endif
+#ifdef SIGUSR1
+	  case SIGUSR1:
+#endif
+#ifdef SIGUSR2
+	  case SIGUSR2:
+#endif
+	    rb_thread_signal_raise(sig);
+	    break;
+	}
+    }
+    else if (trap_list[sig].cmd == Qundef) {
+	rb_thread_signal_exit();
+    }
+    else {
+	rb_thread_trap_eval(trap_list[sig].cmd, sig, trap_list[sig].safe);
+    }
+}
+
+#if defined(HAVE_NATIVETHREAD) && defined(HAVE_NATIVETHREAD_KILL)
+static void
+sigsend_to_ruby_thread(int sig)
+{
+# ifdef HAVE_SIGPROCMASK
+    sigset_t mask, old_mask;
+# else
+    int mask, old_mask;
+# endif
+
+# ifdef HAVE_SIGPROCMASK
+    sigfillset(&mask);
+    sigprocmask(SIG_BLOCK, &mask, &old_mask);
+# else
+    mask = sigblock(~0);
+    sigsetmask(mask);
+# endif
+
+    ruby_native_thread_kill(sig);
+}
+#endif
+
+static RETSIGTYPE sighandler _((int));
+static RETSIGTYPE
+sighandler(sig)
+    int sig;
+{
+#ifdef _WIN32
+#define IN_MAIN_CONTEXT(f, a) (rb_w32_main_context(a, f) ? (void)0 : f(a))
+#else
+#define IN_MAIN_CONTEXT(f, a) f(a)
+#endif
+
+    if (sig >= NSIG) {
+	rb_bug("trap_handler: Bad signal %d", sig);
+    }
+
+#if defined(HAVE_NATIVETHREAD) && defined(HAVE_NATIVETHREAD_KILL)
+    if (!is_ruby_native_thread() && !rb_trap_accept_nativethreads[sig]) {
+        sigsend_to_ruby_thread(sig);
+        return;
+    }
+#endif
+
+#if !defined(BSD_SIGNAL) && !defined(POSIX_SIGNAL)
+    if (rb_trap_accept_nativethreads[sig]) {
+        ruby_nativethread_signal(sig, sighandler);
+    } else {
+        ruby_signal(sig, sighandler);
+    }
+#endif
+
+    if (trap_list[sig].cmd == 0 && ATOMIC_TEST(rb_trap_immediate)) {
+	IN_MAIN_CONTEXT(signal_exec, sig);
+	ATOMIC_SET(rb_trap_immediate, 1);
+    }
+    else {
+	ATOMIC_INC(rb_trap_pending);
+	ATOMIC_INC(trap_pending_list[sig]);
+#ifdef _WIN32
+	rb_w32_interrupted();
+#endif
+    }
+}
+
+#ifdef SIGBUS
+static RETSIGTYPE sigbus _((int));
+static RETSIGTYPE
+sigbus(sig)
+    int sig;
+{
+#if defined(HAVE_NATIVETHREAD) && defined(HAVE_NATIVETHREAD_KILL)
+    if (!is_ruby_native_thread() && !rb_trap_accept_nativethreads[sig]) {
+        sigsend_to_ruby_thread(sig);
+        return;
+    }
+#endif
+
+    rb_bug("Bus Error");
+}
+#endif
+
+#ifdef SIGSEGV
+static RETSIGTYPE sigsegv _((int));
+static RETSIGTYPE
+sigsegv(sig)
+    int sig;
+{
+#if defined(HAVE_NATIVETHREAD) && defined(HAVE_NATIVETHREAD_KILL)
+    if (!is_ruby_native_thread() && !rb_trap_accept_nativethreads[sig]) {
+        sigsend_to_ruby_thread(sig);
+        return;
+    }
+#endif
+
+    rb_bug("Segmentation fault");
+}
+#endif
+
+#ifdef SIGPIPE
+static RETSIGTYPE sigpipe _((int));
+static RETSIGTYPE
+sigpipe(sig)
+    int sig;
+{
+    /* do nothing */
+}
+#endif
+
+void
+rb_trap_exit()
+{
+#ifndef MACOS_UNUSE_SIGNAL
+    if (trap_list[0].cmd) {
+	VALUE trap_exit = trap_list[0].cmd;
+
+	trap_list[0].cmd = 0;
+	rb_eval_cmd(trap_exit, rb_ary_new3(1, INT2FIX(0)), trap_list[0].safe);
+    }
+#endif
+}
+
+void
+rb_trap_exec()
+{
+#ifndef MACOS_UNUSE_SIGNAL
+    int i;
+
+    for (i=0; i<NSIG; i++) {
+	if (trap_pending_list[i]) {
+	    trap_pending_list[i] = 0;
+	    signal_exec(i);
+	}
+    }
+#endif /* MACOS_UNUSE_SIGNAL */
+    rb_trap_pending = 0;
+}
+
+struct trap_arg {
+#ifndef _WIN32
+# ifdef HAVE_SIGPROCMASK
+    sigset_t mask;
+# else
+    int mask;
+# endif
+#endif
+    VALUE sig, cmd;
+};
+
+# ifdef HAVE_SIGPROCMASK
+static sigset_t trap_last_mask;
+# else
+static int trap_last_mask;
+# endif
+
+static RETSIGTYPE sigexit _((int));
+static RETSIGTYPE
+sigexit(sig)
+    int sig;
+{
+    rb_thread_signal_exit();
+}
+
+static VALUE
+trap(arg)
+    struct trap_arg *arg;
+{
+    sighandler_t func, oldfunc;
+    VALUE command, oldcmd;
+    int sig = -1;
+    char *s;
+
+    func = sighandler;
+    command = arg->cmd;
+    if (NIL_P(command)) {
+	func = SIG_IGN;
+    }
+    else if (TYPE(command) == T_STRING) {
+	SafeStringValue(command);	/* taint check */
+	if (RSTRING(command)->len == 0) {
+	    func = SIG_IGN;
+	}
+	else if (RSTRING(command)->len == 7) {
+	    if (strncmp(RSTRING(command)->ptr, "SIG_IGN", 7) == 0) {
+		func = SIG_IGN;
+	    }
+	    else if (strncmp(RSTRING(command)->ptr, "SIG_DFL", 7) == 0) {
+		func = SIG_DFL;
+	    }
+	    else if (strncmp(RSTRING(command)->ptr, "DEFAULT", 7) == 0) {
+		func = SIG_DFL;
+	    }
+	}
+	else if (RSTRING(command)->len == 6) {
+	    if (strncmp(RSTRING(command)->ptr, "IGNORE", 6) == 0) {
+		func = SIG_IGN;
+	    }
+	}
+	else if (RSTRING(command)->len == 4) {
+	    if (strncmp(RSTRING(command)->ptr, "EXIT", 4) == 0) {
+		func = sigexit;
+	    }
+	}
+    }
+    if (func == SIG_IGN || func == SIG_DFL) {
+	command = 0;
+    }
+
+    switch (TYPE(arg->sig)) {
+      case T_FIXNUM:
+	sig = FIX2INT(arg->sig);
+	break;
+
+      case T_SYMBOL:
+	s = rb_id2name(SYM2ID(arg->sig));
+	if (!s) rb_raise(rb_eArgError, "bad signal");
+	goto str_signal;
+
+      case T_STRING:
+	s = RSTRING(arg->sig)->ptr;
+
+      str_signal:
+	if (strncmp("SIG", s, 3) == 0)
+	    s += 3;
+	sig = signm2signo(s);
+	if (sig == 0 && strcmp(s, "EXIT") != 0)
+	    rb_raise(rb_eArgError, "unsupported signal SIG%s", s);
+    }
+
+    if (sig < 0 || sig >= NSIG) {
+	rb_raise(rb_eArgError, "invalid signal number (%d)", sig);
+    }
+#if defined(HAVE_SETITIMER)
+    if (sig == SIGVTALRM) {
+	rb_raise(rb_eArgError, "SIGVTALRM reserved for Thread; can't set handler");
+    }
+#endif
+    if (func == SIG_DFL) {
+	switch (sig) {
+	  case SIGINT:
+#ifdef SIGHUP
+	  case SIGHUP:
+#endif
+#ifdef SIGQUIT
+	  case SIGQUIT:
+#endif
+#ifdef SIGTERM
+	  case SIGTERM:
+#endif
+#ifdef SIGALRM
+	  case SIGALRM:
+#endif
+#ifdef SIGUSR1
+	  case SIGUSR1:
+#endif
+#ifdef SIGUSR2
+	  case SIGUSR2:
+#endif
+	    func = sighandler;
+	    break;
+#ifdef SIGBUS
+	  case SIGBUS:
+	    func = sigbus;
+	    break;
+#endif
+#ifdef SIGSEGV
+	  case SIGSEGV:
+	    func = sigsegv;
+	    break;
+#endif
+#ifdef SIGPIPE
+	  case SIGPIPE:
+	    func = sigpipe;
+	    break;
+#endif
+	}
+    }
+    oldfunc = ruby_signal(sig, func);
+    oldcmd = trap_list[sig].cmd;
+    if (!oldcmd) {
+	if (oldfunc == SIG_IGN) oldcmd = rb_str_new2("IGNORE");
+	else if (oldfunc == sighandler) oldcmd = rb_str_new2("DEFAULT");
+	else oldcmd = Qnil;
+    }
+
+    trap_list[sig].cmd = command;
+    trap_list[sig].safe = ruby_safe_level;
+    /* enable at least specified signal. */
+#ifndef _WIN32
+#ifdef HAVE_SIGPROCMASK
+    sigdelset(&arg->mask, sig);
+#else
+    arg->mask &= ~sigmask(sig);
+#endif
+#endif
+    return oldcmd;
+}
+
+#ifndef _WIN32
+static VALUE
+trap_ensure(arg)
+    struct trap_arg *arg;
+{
+    /* enable interrupt */
+#ifdef HAVE_SIGPROCMASK
+    sigprocmask(SIG_SETMASK, &arg->mask, NULL);
+#else
+    sigsetmask(arg->mask);
+#endif
+    trap_last_mask = arg->mask;
+    return 0;
+}
+#endif
+
+void
+rb_trap_restore_mask()
+{
+#ifndef _WIN32
+# ifdef HAVE_SIGPROCMASK
+    sigprocmask(SIG_SETMASK, &trap_last_mask, NULL);
+# else
+    sigsetmask(trap_last_mask);
+# endif
+#endif
+}
+
+/*
+ * call-seq:
+ *   Signal.trap( signal, proc ) => obj
+ *   Signal.trap( signal ) {| | block } => obj
+ *
+ * Specifies the handling of signals. The first parameter is a signal
+ * name (a string such as ``SIGALRM'', ``SIGUSR1'', and so on) or a
+ * signal number. The characters ``SIG'' may be omitted from the
+ * signal name. The command or block specifies code to be run when the
+ * signal is raised. If the command is the string ``IGNORE'' or
+ * ``SIG_IGN'', the signal will be ignored. If the command is
+ * ``DEFAULT'' or ``SIG_DFL'', the operating system's default handler
+ * will be invoked. If the command is ``EXIT'', the script will be
+ * terminated by the signal. Otherwise, the given command or block
+ * will be run.
+ * The special signal name ``EXIT'' or signal number zero will be
+ * invoked just prior to program termination.
+ * trap returns the previous handler for the given signal.
+ *
+ *     Signal.trap(0, proc { puts "Terminating: #{$$}" })
+ *     Signal.trap("CLD")  { puts "Child died" }
+ *     fork && Process.wait
+ *
+ * produces:
+ *     Terminating: 27461
+ *     Child died
+ *     Terminating: 27460
+ */
+static VALUE
+sig_trap(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    struct trap_arg arg;
+
+    rb_secure(2);
+    if (argc == 0 || argc > 2) {
+	rb_raise(rb_eArgError, "wrong number of arguments -- trap(sig, cmd)/trap(sig){...}");
+    }
+
+    arg.sig = argv[0];
+    if (argc == 1) {
+	arg.cmd = rb_block_proc();
+    }
+    else if (argc == 2) {
+	arg.cmd = argv[1];
+    }
+
+    if (OBJ_TAINTED(arg.cmd)) {
+	rb_raise(rb_eSecurityError, "Insecure: tainted signal trap");
+    }
+#ifndef _WIN32
+    /* disable interrupt */
+# ifdef HAVE_SIGPROCMASK
+    sigfillset(&arg.mask);
+    sigprocmask(SIG_BLOCK, &arg.mask, &arg.mask);
+# else
+    arg.mask = sigblock(~0);
+# endif
+
+    return rb_ensure(trap, (VALUE)&arg, trap_ensure, (VALUE)&arg);
+#else
+    return trap(&arg);
+#endif
+}
+
+/*
+ * call-seq:
+ *   Signal.list => a_hash
+ *
+ * Returns a list of signal names mapped to the corresponding
+ * underlying signal numbers.
+ *
+ * Signal.list   #=> {"ABRT"=>6, "ALRM"=>14, "BUS"=>7, "CHLD"=>17, "CLD"=>17, "CONT"=>18, "FPE"=>8, "HUP"=>1, "ILL"=>4, "INT"=>2, "IO"=>29, "IOT"=>6, "KILL"=>9, "PIPE"=>13, "POLL"=>29, "PROF"=>27, "PWR"=>30, "QUIT"=>3, "SEGV"=>11, "STOP"=>19, "SYS"=>31, "TERM"=>15, "TRAP"=>5, "TSTP"=>20, "TTIN"=>21, "TTOU"=>22, "URG"=>23, "USR1"=>10, "USR2"=>12, "VTALRM"=>26, "WINCH"=>28, "XCPU"=>24, "XFSZ"=>25}
+ */
+static VALUE
+sig_list()
+{
+    VALUE h = rb_hash_new();
+    struct signals *sigs;
+
+    for (sigs = siglist; sigs->signm; sigs++) {
+	rb_hash_aset(h, rb_str_new2(sigs->signm), INT2FIX(sigs->signo));
+    }
+    return h;
+}
+
+static void
+install_sighandler(signum, handler)
+    int signum;
+    sighandler_t handler;
+{
+    sighandler_t old;
+
+    old = ruby_signal(signum, handler);
+    if (old != SIG_DFL) {
+	ruby_signal(signum, old);
+    }
+}
+
+#if 0
+/* 
+ *   If you write a handler which works on any native thread
+ *   (even if the thread is NOT a ruby's one), please enable
+ *   this function and use it to install the handler, instead
+ *   of `install_sighandler()'.
+ */
+#ifdef HAVE_NATIVETHREAD
+static void
+install_nativethread_sighandler(signum, handler)
+    int signum;
+    sighandler_t handler;
+{
+    sighandler_t old;
+    int old_st;
+
+    old_st = rb_trap_accept_nativethreads[signum];
+    old = ruby_nativethread_signal(signum, handler);
+    if (old != SIG_DFL) {
+        if (old_st) {
+            ruby_nativethread_signal(signum, old);
+        } else {
+            ruby_signal(signum, old);
+        }
+    }
+}
+#endif
+#endif
+
+static void
+init_sigchld(sig)
+    int sig;
+{
+    sighandler_t oldfunc;
+#ifndef _WIN32
+# ifdef HAVE_SIGPROCMASK
+    sigset_t mask;
+# else
+    int mask;
+# endif
+#endif
+
+#ifndef _WIN32
+    /* disable interrupt */
+# ifdef HAVE_SIGPROCMASK
+    sigfillset(&mask);
+    sigprocmask(SIG_BLOCK, &mask, &mask);
+# else
+    mask = sigblock(~0);
+# endif
+#endif
+
+    oldfunc = ruby_signal(sig, SIG_DFL);
+    if (oldfunc != SIG_DFL && oldfunc != SIG_IGN) {
+	ruby_signal(sig, oldfunc);
+    } else {
+	trap_list[sig].cmd = 0;
+    }
+
+#ifndef _WIN32
+#ifdef HAVE_SIGPROCMASK
+    sigdelset(&mask, sig);
+    sigprocmask(SIG_SETMASK, &mask, NULL);
+#else
+    mask &= ~sigmask(sig);
+    sigsetmask(mask);
+#endif
+    trap_last_mask = mask;
+#endif
+}
+
+/*
+ * Many operating systems allow signals to be sent to running
+ * processes. Some signals have a defined effect on the process, while
+ * others may be trapped at the code level and acted upon. For
+ * example, your process may trap the USR1 signal and use it to toggle
+ * debugging, and may use TERM to initiate a controlled shutdown.
+ *
+ *     pid = fork do
+ *       Signal.trap("USR1") do
+ *         $debug = !$debug
+ *         puts "Debug now: #$debug"
+ *       end
+ *       Signal.trap("TERM") do
+ *         puts "Terminating..."
+ *         shutdown()
+ *       end
+ *       # . . . do some work . . .
+ *     end
+ *
+ *     Process.detach(pid)
+ *
+ *     # Controlling program:
+ *     Process.kill("USR1", pid)
+ *     # ...
+ *     Process.kill("USR1", pid)
+ *     # ...
+ *     Process.kill("TERM", pid)
+ *
+ * produces:
+ *     Debug now: true
+ *     Debug now: false
+ *    Terminating...
+ *
+ * The list of available signal names and their interpretation is
+ * system dependent. Signal delivery semantics may also vary between
+ * systems; in particular signal delivery may not always be reliable.
+ */
+void
+Init_signal()
+{
+#ifndef MACOS_UNUSE_SIGNAL
+    VALUE mSignal = rb_define_module("Signal");
+
+    rb_define_global_function("trap", sig_trap, -1);
+    rb_define_module_function(mSignal, "trap", sig_trap, -1);
+    rb_define_module_function(mSignal, "list", sig_list, 0);
+
+    rb_define_method(rb_eSignal, "initialize", esignal_init, -1);
+    rb_attr(rb_eSignal, rb_intern("signo"), 1, 0, 0);
+    rb_alias(rb_eSignal, rb_intern("signm"), rb_intern("message"));
+    rb_define_method(rb_eInterrupt, "initialize", interrupt_init, 1);
+
+    install_sighandler(SIGINT, sighandler);
+#ifdef SIGHUP
+    install_sighandler(SIGHUP, sighandler);
+#endif
+#ifdef SIGQUIT
+    install_sighandler(SIGQUIT, sighandler);
+#endif
+#ifdef SIGTERM
+    install_sighandler(SIGTERM, sighandler);
+#endif
+#ifdef SIGALRM
+    install_sighandler(SIGALRM, sighandler);
+#endif
+#ifdef SIGUSR1
+    install_sighandler(SIGUSR1, sighandler);
+#endif
+#ifdef SIGUSR2
+    install_sighandler(SIGUSR2, sighandler);
+#endif
+
+#ifdef SIGBUS
+    install_sighandler(SIGBUS, sigbus);
+#endif
+#ifdef SIGSEGV
+    install_sighandler(SIGSEGV, sigsegv);
+#endif
+#ifdef SIGPIPE
+    install_sighandler(SIGPIPE, sigpipe);
+#endif
+
+#if defined(SIGCLD)
+    init_sigchld(SIGCLD);
+#elif defined(SIGCHLD)
+    init_sigchld(SIGCHLD);
+#endif
+
+#endif /* MACOS_UNUSE_SIGNAL */
+}
diff --git a/ruby_1_8_6/sprintf.c b/ruby_1_8_6/sprintf.c
new file mode 100644
index 0000000000..de997098ba
--- /dev/null
+++ b/ruby_1_8_6/sprintf.c
@@ -0,0 +1,835 @@
+/**********************************************************************
+
+  sprintf.c -
+
+  $Author$
+  $Date$
+  created at: Fri Oct 15 10:39:26 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "re.h"
+#include <ctype.h>
+#include <math.h>
+
+#define BIT_DIGITS(N)   (((N)*146)/485 + 1)  /* log2(10) =~ 146/485 */
+
+static void fmt_setup _((char*,int,int,int,int));
+
+static char*
+remove_sign_bits(str, base)
+    char *str;
+    int base;
+{
+    char *s, *t;
+    
+    s = t = str;
+
+    if (base == 16) {
+	while (*t == 'f') {
+	    t++;
+	}
+    }
+    else if (base == 8) {
+	if (*t == '3') t++;
+	while (*t == '7') {
+	    t++;
+	}
+    }
+    else if (base == 2) {
+	while (*t == '1') {
+	    t++;
+	}
+    }
+    if (t > s) {
+	while (*t) *s++ = *t++;
+	*s = '\0';
+    }
+
+    return str;
+}
+
+static char
+sign_bits(base, p)
+    int base;
+    const char *p;
+{
+    char c = '.';
+
+    switch (base) {
+      case 16:
+	if (*p == 'X') c = 'F';
+	else c = 'f';
+	break;
+      case 8:
+	c = '7'; break;
+      case 2:
+	c = '1'; break;
+    }
+    return c;
+}
+
+#define FNONE  0
+#define FSHARP 1
+#define FMINUS 2
+#define FPLUS  4
+#define FZERO  8
+#define FSPACE 16
+#define FWIDTH 32
+#define FPREC  64
+#define FPREC0 128
+
+#define CHECK(l) do {\
+    while (blen + (l) >= bsiz) {\
+	bsiz*=2;\
+    }\
+    rb_str_resize(result, bsiz);\
+    buf = RSTRING(result)->ptr;\
+} while (0)
+
+#define PUSH(s, l) do { \
+    CHECK(l);\
+    memcpy(&buf[blen], s, l);\
+    blen += (l);\
+} while (0)
+
+#define GETARG() (nextvalue != Qundef ? nextvalue : \
+    posarg < 0 ? \
+    (rb_raise(rb_eArgError, "unnumbered(%d) mixed with numbered", nextarg), 0) : \
+    (posarg = nextarg++, GETNTHARG(posarg)))
+
+#define GETPOSARG(n) (posarg > 0 ? \
+    (rb_raise(rb_eArgError, "numbered(%d) after unnumbered(%d)", n, posarg), 0) : \
+    ((n < 1) ? (rb_raise(rb_eArgError, "invalid index - %d$", n), 0) : \
+	       (posarg = -1, GETNTHARG(n))))
+
+#define GETNTHARG(nth) \
+    ((nth >= argc) ? (rb_raise(rb_eArgError, "too few arguments"), 0) : argv[nth])
+
+#define GETNUM(n, val) \
+    for (; p < end && ISDIGIT(*p); p++) { \
+	int next_n = 10 * n + (*p - '0'); \
+        if (next_n / 10 != n) {\
+	    rb_raise(rb_eArgError, #val " too big"); \
+	} \
+	n = next_n; \
+    } \
+    if (p >= end) { \
+	rb_raise(rb_eArgError, "malformed format string - %%*[0-9]"); \
+    }
+
+#define GETASTER(val) do { \
+    t = p++; \
+    n = 0; \
+    GETNUM(n, val); \
+    if (*p == '$') { \
+	tmp = GETPOSARG(n); \
+    } \
+    else { \
+	tmp = GETARG(); \
+	p = t; \
+    } \
+    val = NUM2INT(tmp); \
+} while (0)
+
+
+/*
+ *  call-seq:
+ *     format(format_string [, arguments...] )   => string
+ *     sprintf(format_string [, arguments...] )  => string
+ *  
+ *  Returns the string resulting from applying <i>format_string</i> to
+ *  any additional arguments. Within the format string, any characters
+ *  other than format sequences are copied to the result. A format
+ *  sequence consists of a percent sign, followed by optional flags,
+ *  width, and precision indicators, then terminated with a field type
+ *  character. The field type controls how the corresponding
+ *  <code>sprintf</code> argument is to be interpreted, while the flags
+ *  modify that interpretation. The field type characters are listed
+ *  in the table at the end of this section. The flag characters are:
+ *
+ *    Flag     | Applies to   | Meaning
+ *    ---------+--------------+-----------------------------------------
+ *    space    | bdeEfgGiouxX | Leave a space at the start of 
+ *             |              | positive numbers.
+ *    ---------+--------------+-----------------------------------------
+ *    (digit)$ | all          | Specifies the absolute argument number
+ *             |              | for this field. Absolute and relative
+ *             |              | argument numbers cannot be mixed in a
+ *             |              | sprintf string.
+ *    ---------+--------------+-----------------------------------------
+ *     #       | beEfgGoxX    | Use an alternative format. For the
+ *             |              | conversions `o', `x', `X', and `b', 
+ *             |              | prefix the result with ``0'', ``0x'', ``0X'',
+ *             |              |  and ``0b'', respectively. For `e',
+ *             |              | `E', `f', `g', and 'G', force a decimal
+ *             |              | point to be added, even if no digits follow.
+ *             |              | For `g' and 'G', do not remove trailing zeros.
+ *    ---------+--------------+-----------------------------------------
+ *    +        | bdeEfgGiouxX | Add a leading plus sign to positive numbers.
+ *    ---------+--------------+-----------------------------------------
+ *    -        | all          | Left-justify the result of this conversion.
+ *    ---------+--------------+-----------------------------------------
+ *    0 (zero) | bdeEfgGiouxX | Pad with zeros, not spaces.
+ *    ---------+--------------+-----------------------------------------
+ *    *        | all          | Use the next argument as the field width. 
+ *             |              | If negative, left-justify the result. If the
+ *             |              | asterisk is followed by a number and a dollar 
+ *             |              | sign, use the indicated argument as the width.
+ *
+ *     
+ *  The field width is an optional integer, followed optionally by a
+ *  period and a precision. The width specifies the minimum number of
+ *  characters that will be written to the result for this field. For
+ *  numeric fields, the precision controls the number of decimal places
+ *  displayed. For string fields, the precision determines the maximum
+ *  number of characters to be copied from the string. (Thus, the format
+ *  sequence <code>%10.10s</code> will always contribute exactly ten
+ *  characters to the result.)
+ *
+ *  The field types are:
+ *
+ *      Field |  Conversion
+ *      ------+--------------------------------------------------------------
+ *        b   | Convert argument as a binary number.
+ *        c   | Argument is the numeric code for a single character.
+ *        d   | Convert argument as a decimal number.
+ *        E   | Equivalent to `e', but uses an uppercase E to indicate
+ *            | the exponent.
+ *        e   | Convert floating point argument into exponential notation 
+ *            | with one digit before the decimal point. The precision
+ *            | determines the number of fractional digits (defaulting to six).
+ *        f   | Convert floating point argument as [-]ddd.ddd, 
+ *            |  where the precision determines the number of digits after
+ *            | the decimal point.
+ *        G   | Equivalent to `g', but use an uppercase `E' in exponent form.
+ *        g   | Convert a floating point number using exponential form
+ *            | if the exponent is less than -4 or greater than or
+ *            | equal to the precision, or in d.dddd form otherwise.
+ *        i   | Identical to `d'.
+ *        o   | Convert argument as an octal number.
+ *        p   | The valuing of argument.inspect.
+ *        s   | Argument is a string to be substituted. If the format
+ *            | sequence contains a precision, at most that many characters
+ *            | will be copied.
+ *        u   | Treat argument as an unsigned decimal number. Negative integers
+ *            | are displayed as a 32 bit two's complement plus one for the
+ *            | underlying architecture; that is, 2 ** 32 + n.  However, since
+ *            | Ruby has no inherent limit on bits used to represent the
+ *            | integer, this value is preceded by two dots (..) in order to
+ *            | indicate a infinite number of leading sign bits.
+ *        X   | Convert argument as a hexadecimal number using uppercase
+ *            | letters. Negative numbers will be displayed with two
+ *            | leading periods (representing an infinite string of
+ *            | leading 'FF's.
+ *        x   | Convert argument as a hexadecimal number.
+ *            | Negative numbers will be displayed with two
+ *            | leading periods (representing an infinite string of
+ *            | leading 'ff's.
+ *     
+ *  Examples:
+ *
+ *     sprintf("%d %04x", 123, 123)               #=> "123 007b"
+ *     sprintf("%08b '%4s'", 123, 123)            #=> "01111011 ' 123'"
+ *     sprintf("%1$*2$s %2$d %1$s", "hello", 8)   #=> "   hello 8 hello"
+ *     sprintf("%1$*2$s %2$d", "hello", -8)       #=> "hello    -8"
+ *     sprintf("%+g:% g:%-g", 1.23, 1.23, 1.23)   #=> "+1.23: 1.23:1.23"
+ *     sprintf("%u", -123)                        #=> "..4294967173"
+ */
+
+VALUE
+rb_f_sprintf(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE fmt;
+    const char *p, *end;
+    char *buf;
+    int blen, bsiz;
+    VALUE result;
+
+    int width, prec, flags = FNONE;
+    int nextarg = 1;
+    int posarg = 0;
+    int tainted = 0;
+    VALUE nextvalue;
+    VALUE tmp;
+    VALUE str;
+
+#define CHECK_FOR_WIDTH(f)				 \
+    if ((f) & FWIDTH) {					 \
+	rb_raise(rb_eArgError, "width given twice");	 \
+    }							 \
+    if ((f) & FPREC0) {					 \
+	rb_raise(rb_eArgError, "width after precision"); \
+    }
+#define CHECK_FOR_FLAGS(f)				 \
+    if ((f) & FWIDTH) {					 \
+	rb_raise(rb_eArgError, "flag after width");	 \
+    }							 \
+    if ((f) & FPREC0) {					 \
+	rb_raise(rb_eArgError, "flag after precision"); \
+    }
+
+    fmt = GETNTHARG(0);
+    if (OBJ_TAINTED(fmt)) tainted = 1;
+    StringValue(fmt);
+    fmt = rb_str_new4(fmt);
+    p = RSTRING(fmt)->ptr;
+    end = p + RSTRING(fmt)->len;
+    blen = 0;
+    bsiz = 120;
+    result = rb_str_buf_new(bsiz);
+    buf = RSTRING(result)->ptr;
+
+    for (; p < end; p++) {
+	const char *t;
+	int n;
+
+	for (t = p; t < end && *t != '%'; t++) ;
+	PUSH(p, t - p);
+	if (t >= end) {
+	    /* end of fmt string */
+	    goto sprint_exit;
+	}
+	p = t + 1;		/* skip `%' */
+
+	width = prec = -1;
+	nextvalue = Qundef;
+      retry:
+	switch (*p) {
+	  default:
+	    if (ISPRINT(*p))
+		rb_raise(rb_eArgError, "malformed format string - %%%c", *p);
+	    else
+		rb_raise(rb_eArgError, "malformed format string");
+	    break;
+
+	  case ' ':
+	    CHECK_FOR_FLAGS(flags);
+	    flags |= FSPACE;
+	    p++;
+	    goto retry;
+
+	  case '#':
+	    CHECK_FOR_FLAGS(flags);
+	    flags |= FSHARP;
+	    p++;
+	    goto retry;
+
+	  case '+':
+	    CHECK_FOR_FLAGS(flags);
+	    flags |= FPLUS;
+	    p++;
+	    goto retry;
+
+	  case '-':
+	    CHECK_FOR_FLAGS(flags);
+	    flags |= FMINUS;
+	    p++;
+	    goto retry;
+
+	  case '0':
+	    CHECK_FOR_FLAGS(flags);
+	    flags |= FZERO;
+	    p++;
+	    goto retry;
+
+	  case '1': case '2': case '3': case '4':
+	  case '5': case '6': case '7': case '8': case '9':
+	    n = 0;
+	    GETNUM(n, width);
+	    if (*p == '$') {
+		if (nextvalue != Qundef) {
+		    rb_raise(rb_eArgError, "value given twice - %d$", n);
+		}
+		nextvalue = GETPOSARG(n);
+		p++;
+		goto retry;
+	    }
+	    CHECK_FOR_WIDTH(flags);
+	    width = n;
+	    flags |= FWIDTH;
+	    goto retry;
+
+	  case '*':
+	    CHECK_FOR_WIDTH(flags);
+	    flags |= FWIDTH;
+	    GETASTER(width);
+	    if (width < 0) {
+		flags |= FMINUS;
+		width = -width;
+	    }
+	    p++;
+	    goto retry;
+
+	  case '.':
+	    if (flags & FPREC0) {
+		rb_raise(rb_eArgError, "precision given twice");
+	    }
+	    flags |= FPREC|FPREC0;
+
+	    prec = 0;
+	    p++;
+	    if (*p == '*') {
+		GETASTER(prec);
+		if (prec < 0) {	/* ignore negative precision */
+		    flags &= ~FPREC;
+		}
+		p++;
+		goto retry;
+	    }
+
+	    GETNUM(prec, precision);
+	    goto retry;
+
+	  case '\n':
+	  case '\0':
+	    p--;
+	  case '%':
+	    if (flags != FNONE) {
+		rb_raise(rb_eArgError, "illegal format character - %%");
+	    }
+	    PUSH("%", 1);
+	    break;
+
+	  case 'c':
+	    {
+		VALUE val = GETARG();
+		char c;
+
+		if (!(flags & FMINUS))
+		    while (--width > 0)
+			PUSH(" ", 1);
+		c = NUM2INT(val) & 0xff;
+		PUSH(&c, 1);
+		while (--width > 0)
+		    PUSH(" ", 1);
+	    }
+	    break;
+
+	  case 's':
+	  case 'p':
+	    {
+		VALUE arg = GETARG();
+		long len;
+
+		if (*p == 'p') arg = rb_inspect(arg);
+		str = rb_obj_as_string(arg);
+		if (OBJ_TAINTED(str)) tainted = 1;
+		len = RSTRING(str)->len;
+		if (flags&FPREC) {
+		    if (prec < len) {
+			len = prec;
+		    }
+		}
+		/* need to adjust multi-byte string pos */
+		if (flags&FWIDTH) {
+		    if (width > len) {
+			CHECK(width);
+			width -= len;
+			if (!(flags&FMINUS)) {
+			    while (width--) {
+				buf[blen++] = ' ';
+			    }
+			}
+			memcpy(&buf[blen], RSTRING_PTR(str), len);
+			blen += len;
+			if (flags&FMINUS) {
+			    while (width--) {
+				buf[blen++] = ' ';
+			    }
+			}
+			break;
+		    }
+		}
+		PUSH(RSTRING(str)->ptr, len);
+	    }
+	    break;
+
+	  case 'd':
+	  case 'i':
+	  case 'o':
+	  case 'x':
+	  case 'X':
+	  case 'b':
+	  case 'B':
+	  case 'u':
+	    {
+		volatile VALUE val = GETARG();
+		char fbuf[32], nbuf[64], *s, *t;
+		const char *prefix = 0;
+		int sign = 0;
+		char sc = 0;
+		long v = 0;
+		int base, bignum = 0;
+		int len, pos;
+		VALUE tmp;
+                volatile VALUE tmp1;
+
+		switch (*p) {
+		  case 'd':
+		  case 'i':
+		    sign = 1; break;
+		  case 'o':
+		  case 'x':
+		  case 'X':
+		  case 'b':
+		  case 'B':
+		  case 'u':
+		  default:
+		    if (flags&(FPLUS|FSPACE)) sign = 1;
+		    break;
+		}
+		if (flags & FSHARP) {
+		    switch (*p) {
+		      case 'o':
+			prefix = "0"; break;
+		      case 'x':
+			prefix = "0x"; break;
+		      case 'X':
+			prefix = "0X"; break;
+		      case 'b':
+			prefix = "0b"; break;
+		      case 'B':
+			prefix = "0B"; break;
+		    }
+		    if (prefix) {
+			width -= strlen(prefix);
+		    }
+		}
+
+	      bin_retry:
+		switch (TYPE(val)) {
+		  case T_FLOAT:
+		    val = rb_dbl2big(RFLOAT(val)->value);
+		    if (FIXNUM_P(val)) goto bin_retry;
+		    bignum = 1;
+		    break;
+		  case T_STRING:
+		    val = rb_str_to_inum(val, 0, Qtrue);
+		    goto bin_retry;
+		  case T_BIGNUM:
+		    bignum = 1;
+		    break;
+		  case T_FIXNUM:
+		    v = FIX2LONG(val);
+		    break;
+		  default:
+		    val = rb_Integer(val);
+		    goto bin_retry;
+		}
+
+		switch (*p) {
+		  case 'o':
+		    base = 8; break;
+		  case 'x':
+		  case 'X':
+		    base = 16; break;
+		  case 'b':
+		  case 'B':
+		    base = 2; break;
+		  case 'u':
+		  case 'd':
+		  case 'i':
+		  default:
+		    base = 10; break;
+		}
+
+		if (!bignum) {
+		    if (base == 2) {
+			val = rb_int2big(v);
+			goto bin_retry;
+		    }
+		    if (sign) {
+			char c = *p;
+			if (c == 'i') c = 'd'; /* %d and %i are identical */
+			if (v < 0) {
+			    v = -v;
+			    sc = '-';
+			    width--;
+			}
+			else if (flags & FPLUS) {
+			    sc = '+';
+			    width--;
+			}
+			else if (flags & FSPACE) {
+			    sc = ' ';
+			    width--;
+			}
+			sprintf(fbuf, "%%l%c", c);
+			sprintf(nbuf, fbuf, v);
+			s = nbuf;
+			goto format_integer;
+		    }
+		    s = nbuf;
+		    if (v < 0) {
+			if (base == 10) {
+			    rb_warning("negative number for %%u specifier");
+			}
+			if (!(flags&(FPREC|FZERO))) {
+			    strcpy(s, "..");
+			    s += 2;
+			}
+		    }
+		    sprintf(fbuf, "%%l%c", *p == 'X' ? 'x' : *p);
+		    sprintf(s, fbuf, v);
+		    if (v < 0) {
+			char d = 0;
+
+			remove_sign_bits(s, base);
+			switch (base) {
+			  case 16:
+			    d = 'f'; break;
+			  case 8:
+			    d = '7'; break;
+			}
+			if (d && *s != d) {
+			    memmove(s+1, s, strlen(s)+1);
+			    *s = d;
+			}
+		    }
+		    s = nbuf;
+		    goto format_integer;
+		}
+
+		if (sign) {
+		    tmp = rb_big2str(val, base);
+		    s = RSTRING(tmp)->ptr;
+		    if (s[0] == '-') {
+			s++;
+			sc = '-';
+                        width--;
+		    }
+		    else if (flags & FPLUS) {
+			sc = '+';
+                        width--;
+		    }
+		    else if (flags & FSPACE) {
+			sc = ' ';
+                        width--;
+		    }
+		    goto format_integer;
+		}
+		if (!RBIGNUM(val)->sign) {
+		    val = rb_big_clone(val);
+		    rb_big_2comp(val);
+		}
+		tmp1 = tmp = rb_big2str0(val, base, RBIGNUM(val)->sign);
+		s = RSTRING(tmp)->ptr;
+		if (*s == '-') {
+		    if (base == 10) {
+			rb_warning("negative number for %%u specifier");
+		    }
+		    remove_sign_bits(++s, base);
+		    tmp = rb_str_new(0, 3+strlen(s));
+		    t = RSTRING(tmp)->ptr;
+		    if (!(flags&(FPREC|FZERO))) {
+			strcpy(t, "..");
+			t += 2;
+		    }
+		    switch (base) {
+		      case 16:
+			if (s[0] != 'f') strcpy(t++, "f"); break;
+		      case 8:
+			if (s[0] != '7') strcpy(t++, "7"); break;
+		      case 2:
+			if (s[0] != '1') strcpy(t++, "1"); break;
+		    }
+		    strcpy(t, s);
+		    bignum = 2;
+		}
+		s = RSTRING(tmp)->ptr;
+
+	      format_integer:
+		pos = -1;
+		len = strlen(s);
+
+		if (*p == 'X') {
+		    char *pp = s;
+		    while (*pp) {
+			*pp = toupper(*pp);
+			pp++;
+		    }
+		}
+		if ((flags&(FZERO|FPREC)) == FZERO) {
+		    prec = width;
+		    width = 0;
+		}
+		else {
+		    if (prec < len) prec = len;
+		    width -= prec;
+		}
+		if (!(flags&FMINUS)) {
+		    CHECK(width);
+		    while (width-- > 0) {
+			buf[blen++] = ' ';
+		    }
+		}
+		if (sc) PUSH(&sc, 1);
+		if (prefix) {
+		    int plen = strlen(prefix);
+		    PUSH(prefix, plen);
+		}
+		CHECK(prec - len);
+		if (!bignum && v < 0) {
+		    char c = sign_bits(base, p);
+		    while (len < prec--) {
+			buf[blen++] = c;
+		    }
+		}
+		else {
+		    char c;
+
+		    if (!sign && bignum && !RBIGNUM(val)->sign)
+			c = sign_bits(base, p);
+		    else
+			c = '0';
+		    while (len < prec--) {
+			buf[blen++] = c;
+		    }
+		}
+		PUSH(s, len);
+		CHECK(width);
+		while (width-- > 0) {
+		    buf[blen++] = ' ';
+		}
+	    }
+	    break;
+
+	  case 'f':
+	  case 'g':
+	  case 'G':
+	  case 'e':
+	  case 'E':
+	    {
+		VALUE val = GETARG();
+		double fval;
+		int i, need = 6;
+		char fbuf[32];
+
+		fval = RFLOAT(rb_Float(val))->value;
+#if defined(_WIN32) && !defined(__BORLANDC__)
+		if (isnan(fval) || isinf(fval)) {
+		    char *expr;
+
+		    if  (isnan(fval)) {
+			expr = "NaN";
+		    }
+		    else {
+			expr = "Inf";
+		    }
+		    need = strlen(expr);
+		    if ((!isnan(fval) && fval < 0.0) || (flags & FPLUS))
+			need++;
+		    if ((flags & FWIDTH) && need < width)
+			need = width;
+
+		    CHECK(need);
+		    sprintf(&buf[blen], "%*s", need, "");
+		    if (flags & FMINUS) {
+			if (!isnan(fval) && fval < 0.0)
+			    buf[blen++] = '-';
+			else if (flags & FPLUS)
+			    buf[blen++] = '+';
+			else if (flags & FSPACE)
+			    blen++;
+			strncpy(&buf[blen], expr, strlen(expr));
+		    }
+		    else if (flags & FZERO) {
+			if (!isnan(fval) && fval < 0.0) {
+			    buf[blen++] = '-';
+			    need--;
+			}
+			else if (flags & FPLUS) {
+			    buf[blen++] = '+';
+			    need--;
+			}
+			else if (flags & FSPACE) {
+			    blen++;
+			    need--;
+			}
+			while (need-- - strlen(expr) > 0) {
+			    buf[blen++] = '0';
+			}
+			strncpy(&buf[blen], expr, strlen(expr));
+		    }
+		    else {
+			if (!isnan(fval) && fval < 0.0)
+			    buf[blen + need - strlen(expr) - 1] = '-';
+			else if (flags & FPLUS)
+			    buf[blen + need - strlen(expr) - 1] = '+';
+			strncpy(&buf[blen + need - strlen(expr)], expr,
+				strlen(expr));
+		    }
+		    blen += strlen(&buf[blen]);
+		    break;
+		}
+#endif	/* defined(_WIN32) && !defined(__BORLANDC__) */
+		fmt_setup(fbuf, *p, flags, width, prec);
+		need = 0;
+		if (*p != 'e' && *p != 'E') {
+		    i = INT_MIN;
+		    frexp(fval, &i);
+		    if (i > 0)
+			need = BIT_DIGITS(i);
+		}
+		need += (flags&FPREC) ? prec : 6;
+		if ((flags&FWIDTH) && need < width)
+		    need = width;
+		need += 20;
+
+		CHECK(need);
+		sprintf(&buf[blen], fbuf, fval);
+		blen += strlen(&buf[blen]);
+	    }
+	    break;
+	}
+	flags = FNONE;
+    }
+
+  sprint_exit:
+    /* XXX - We cannot validiate the number of arguments if (digit)$ style used.
+     */
+    if (posarg >= 0 && nextarg < argc) {
+	const char *mesg = "too many arguments for format string";
+	if (RTEST(ruby_debug)) rb_raise(rb_eArgError, mesg);
+	if (RTEST(ruby_verbose)) rb_warn(mesg);
+    }
+    rb_str_resize(result, blen);
+
+    if (tainted) OBJ_TAINT(result);
+    return result;
+}
+
+static void
+fmt_setup(buf, c, flags, width, prec)
+    char *buf;
+    int c;
+    int flags, width, prec;
+{
+    *buf++ = '%';
+    if (flags & FSHARP) *buf++ = '#';
+    if (flags & FPLUS)  *buf++ = '+';
+    if (flags & FMINUS) *buf++ = '-';
+    if (flags & FZERO)  *buf++ = '0';
+    if (flags & FSPACE) *buf++ = ' ';
+
+    if (flags & FWIDTH) {
+	sprintf(buf, "%d", width);
+	buf += strlen(buf);
+    }
+
+    if (flags & FPREC) {
+	sprintf(buf, ".%d", prec);
+	buf += strlen(buf);
+    }
+
+    *buf++ = c;
+    *buf = '\0';
+}
diff --git a/ruby_1_8_6/st.c b/ruby_1_8_6/st.c
new file mode 100644
index 0000000000..c16c3109a8
--- /dev/null
+++ b/ruby_1_8_6/st.c
@@ -0,0 +1,575 @@
+/* This is a public domain general purpose hash table package written by Peter Moore @ UCB. */
+
+/* static	char	sccsid[] = "@(#) st.c 5.1 89/12/14 Crucible"; */
+
+#include "config.h"
+#include "defines.h"
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
+#include "st.h"
+
+typedef struct st_table_entry st_table_entry;
+
+struct st_table_entry {
+    unsigned int hash;
+    st_data_t key;
+    st_data_t record;
+    st_table_entry *next;
+};
+
+#define ST_DEFAULT_MAX_DENSITY 5
+#define ST_DEFAULT_INIT_TABLE_SIZE 11
+
+    /*
+     * DEFAULT_MAX_DENSITY is the default for the largest we allow the
+     * average number of items per bin before increasing the number of
+     * bins
+     *
+     * DEFAULT_INIT_TABLE_SIZE is the default for the number of bins
+     * allocated initially
+     *
+     */
+static int numcmp(long, long);
+static int numhash(long);
+static struct st_hash_type type_numhash = {
+    numcmp,
+    numhash,
+};
+
+/* extern int strcmp(const char *, const char *); */
+static int strhash(const char *);
+static struct st_hash_type type_strhash = {
+    strcmp,
+    strhash,
+};
+
+static void rehash(st_table *);
+
+#ifdef RUBY
+#define malloc xmalloc
+#define calloc xcalloc
+#endif
+
+#define alloc(type) (type*)malloc((unsigned)sizeof(type))
+#define Calloc(n,s) (char*)calloc((n),(s))
+
+#define EQUAL(table,x,y) ((x)==(y) || (*table->type->compare)((x),(y)) == 0)
+
+#define do_hash(key,table) (unsigned int)(*(table)->type->hash)((key))
+#define do_hash_bin(key,table) (do_hash(key, table)%(table)->num_bins)
+
+/*
+ * MINSIZE is the minimum size of a dictionary.
+ */
+
+#define MINSIZE 8
+
+/*
+Table of prime numbers 2^n+a, 2<=n<=30.
+*/
+static long primes[] = {
+	8 + 3,
+	16 + 3,
+	32 + 5,
+	64 + 3,
+	128 + 3,
+	256 + 27,
+	512 + 9,
+	1024 + 9,
+	2048 + 5,
+	4096 + 3,
+	8192 + 27,
+	16384 + 43,
+	32768 + 3,
+	65536 + 45,
+	131072 + 29,
+	262144 + 3,
+	524288 + 21,
+	1048576 + 7,
+	2097152 + 17,
+	4194304 + 15,
+	8388608 + 9,
+	16777216 + 43,
+	33554432 + 35,
+	67108864 + 15,
+	134217728 + 29,
+	268435456 + 3,
+	536870912 + 11,
+	1073741824 + 85,
+	0
+};
+
+static int
+new_size(size)
+    int size;
+{
+    int i;
+
+#if 0
+    for (i=3; i<31; i++) {
+	if ((1<<i) > size) return 1<<i;
+    }
+    return -1;
+#else
+    int newsize;
+
+    for (i = 0, newsize = MINSIZE;
+	 i < sizeof(primes)/sizeof(primes[0]);
+	 i++, newsize <<= 1)
+    {
+	if (newsize > size) return primes[i];
+    }
+    /* Ran out of polynomials */
+    return -1;			/* should raise exception */
+#endif
+}
+
+#ifdef HASH_LOG
+static int collision = 0;
+static int init_st = 0;
+
+static void
+stat_col()
+{
+    FILE *f = fopen("/tmp/col", "w");
+    fprintf(f, "collision: %d\n", collision);
+    fclose(f);
+}
+#endif
+
+st_table*
+st_init_table_with_size(type, size)
+    struct st_hash_type *type;
+    int size;
+{
+    st_table *tbl;
+
+#ifdef HASH_LOG
+    if (init_st == 0) {
+	init_st = 1;
+	atexit(stat_col);
+    }
+#endif
+
+    size = new_size(size);	/* round up to prime number */
+
+    tbl = alloc(st_table);
+    tbl->type = type;
+    tbl->num_entries = 0;
+    tbl->num_bins = size;
+    tbl->bins = (st_table_entry **)Calloc(size, sizeof(st_table_entry*));
+
+    return tbl;
+}
+
+st_table*
+st_init_table(type)
+    struct st_hash_type *type;
+{
+    return st_init_table_with_size(type, 0);
+}
+
+st_table*
+st_init_numtable(void)
+{
+    return st_init_table(&type_numhash);
+}
+
+st_table*
+st_init_numtable_with_size(size)
+    int size;
+{
+    return st_init_table_with_size(&type_numhash, size);
+}
+
+st_table*
+st_init_strtable(void)
+{
+    return st_init_table(&type_strhash);
+}
+
+st_table*
+st_init_strtable_with_size(size)
+    int size;
+{
+    return st_init_table_with_size(&type_strhash, size);
+}
+
+void
+st_free_table(table)
+    st_table *table;
+{
+    register st_table_entry *ptr, *next;
+    int i;
+
+    for(i = 0; i < table->num_bins; i++) {
+	ptr = table->bins[i];
+	while (ptr != 0) {
+	    next = ptr->next;
+	    free(ptr);
+	    ptr = next;
+	}
+    }
+    free(table->bins);
+    free(table);
+}
+
+#define PTR_NOT_EQUAL(table, ptr, hash_val, key) \
+((ptr) != 0 && (ptr->hash != (hash_val) || !EQUAL((table), (key), (ptr)->key)))
+
+#ifdef HASH_LOG
+#define COLLISION collision++
+#else
+#define COLLISION
+#endif
+
+#define FIND_ENTRY(table, ptr, hash_val, bin_pos) do {\
+    bin_pos = hash_val%(table)->num_bins;\
+    ptr = (table)->bins[bin_pos];\
+    if (PTR_NOT_EQUAL(table, ptr, hash_val, key)) {\
+	COLLISION;\
+	while (PTR_NOT_EQUAL(table, ptr->next, hash_val, key)) {\
+	    ptr = ptr->next;\
+	}\
+	ptr = ptr->next;\
+    }\
+} while (0)
+
+int
+st_lookup(table, key, value)
+    st_table *table;
+    register st_data_t key;
+    st_data_t *value;
+{
+    unsigned int hash_val, bin_pos;
+    register st_table_entry *ptr;
+
+    hash_val = do_hash(key, table);
+    FIND_ENTRY(table, ptr, hash_val, bin_pos);
+
+    if (ptr == 0) {
+	return 0;
+    }
+    else {
+	if (value != 0)  *value = ptr->record;
+	return 1;
+    }
+}
+
+#define ADD_DIRECT(table, key, value, hash_val, bin_pos)\
+do {\
+    st_table_entry *entry;\
+    if (table->num_entries/(table->num_bins) > ST_DEFAULT_MAX_DENSITY) {\
+	rehash(table);\
+        bin_pos = hash_val % table->num_bins;\
+    }\
+    \
+    entry = alloc(st_table_entry);\
+    \
+    entry->hash = hash_val;\
+    entry->key = key;\
+    entry->record = value;\
+    entry->next = table->bins[bin_pos];\
+    table->bins[bin_pos] = entry;\
+    table->num_entries++;\
+} while (0)
+
+int
+st_insert(table, key, value)
+    register st_table *table;
+    register st_data_t key;
+    st_data_t value;
+{
+    unsigned int hash_val, bin_pos;
+    register st_table_entry *ptr;
+
+    hash_val = do_hash(key, table);
+    FIND_ENTRY(table, ptr, hash_val, bin_pos);
+
+    if (ptr == 0) {
+	ADD_DIRECT(table, key, value, hash_val, bin_pos);
+	return 0;
+    }
+    else {
+	ptr->record = value;
+	return 1;
+    }
+}
+
+void
+st_add_direct(table, key, value)
+    st_table *table;
+    st_data_t key;
+    st_data_t value;
+{
+    unsigned int hash_val, bin_pos;
+
+    hash_val = do_hash(key, table);
+    bin_pos = hash_val % table->num_bins;
+    ADD_DIRECT(table, key, value, hash_val, bin_pos);
+}
+
+static void
+rehash(table)
+    register st_table *table;
+{
+    register st_table_entry *ptr, *next, **new_bins;
+    int i, old_num_bins = table->num_bins, new_num_bins;
+    unsigned int hash_val;
+
+    new_num_bins = new_size(old_num_bins+1);
+    new_bins = (st_table_entry**)Calloc(new_num_bins, sizeof(st_table_entry*));
+
+    for(i = 0; i < old_num_bins; i++) {
+	ptr = table->bins[i];
+	while (ptr != 0) {
+	    next = ptr->next;
+	    hash_val = ptr->hash % new_num_bins;
+	    ptr->next = new_bins[hash_val];
+	    new_bins[hash_val] = ptr;
+	    ptr = next;
+	}
+    }
+    free(table->bins);
+    table->num_bins = new_num_bins;
+    table->bins = new_bins;
+}
+
+st_table*
+st_copy(old_table)
+    st_table *old_table;
+{
+    st_table *new_table;
+    st_table_entry *ptr, *entry;
+    int i, num_bins = old_table->num_bins;
+
+    new_table = alloc(st_table);
+    if (new_table == 0) {
+	return 0;
+    }
+
+    *new_table = *old_table;
+    new_table->bins = (st_table_entry**)
+	Calloc((unsigned)num_bins, sizeof(st_table_entry*));
+
+    if (new_table->bins == 0) {
+	free(new_table);
+	return 0;
+    }
+
+    for(i = 0; i < num_bins; i++) {
+	new_table->bins[i] = 0;
+	ptr = old_table->bins[i];
+	while (ptr != 0) {
+	    entry = alloc(st_table_entry);
+	    if (entry == 0) {
+		free(new_table->bins);
+		free(new_table);
+		return 0;
+	    }
+	    *entry = *ptr;
+	    entry->next = new_table->bins[i];
+	    new_table->bins[i] = entry;
+	    ptr = ptr->next;
+	}
+    }
+    return new_table;
+}
+
+int
+st_delete(table, key, value)
+    register st_table *table;
+    register st_data_t *key;
+    st_data_t *value;
+{
+    unsigned int hash_val;
+    st_table_entry *tmp;
+    register st_table_entry *ptr;
+
+    hash_val = do_hash_bin(*key, table);
+    ptr = table->bins[hash_val];
+
+    if (ptr == 0) {
+	if (value != 0) *value = 0;
+	return 0;
+    }
+
+    if (EQUAL(table, *key, ptr->key)) {
+	table->bins[hash_val] = ptr->next;
+	table->num_entries--;
+	if (value != 0) *value = ptr->record;
+	*key = ptr->key;
+	free(ptr);
+	return 1;
+    }
+
+    for(; ptr->next != 0; ptr = ptr->next) {
+	if (EQUAL(table, ptr->next->key, *key)) {
+	    tmp = ptr->next;
+	    ptr->next = ptr->next->next;
+	    table->num_entries--;
+	    if (value != 0) *value = tmp->record;
+	    *key = tmp->key;
+	    free(tmp);
+	    return 1;
+	}
+    }
+
+    return 0;
+}
+
+int
+st_delete_safe(table, key, value, never)
+    register st_table *table;
+    register st_data_t *key;
+    st_data_t *value;
+    st_data_t never;
+{
+    unsigned int hash_val;
+    register st_table_entry *ptr;
+
+    hash_val = do_hash_bin(*key, table);
+    ptr = table->bins[hash_val];
+
+    if (ptr == 0) {
+	if (value != 0) *value = 0;
+	return 0;
+    }
+
+    for(; ptr != 0; ptr = ptr->next) {
+	if ((ptr->key != never) && EQUAL(table, ptr->key, *key)) {
+	    table->num_entries--;
+	    *key = ptr->key;
+	    if (value != 0) *value = ptr->record;
+	    ptr->key = ptr->record = never;
+	    return 1;
+	}
+    }
+
+    return 0;
+}
+
+static int
+delete_never(key, value, never)
+    st_data_t key, value, never;
+{
+    if (value == never) return ST_DELETE;
+    return ST_CONTINUE;
+}
+
+void
+st_cleanup_safe(table, never)
+    st_table *table;
+    st_data_t never;
+{
+    int num_entries = table->num_entries;
+
+    st_foreach(table, delete_never, never);
+    table->num_entries = num_entries;
+}
+
+int
+st_foreach(table, func, arg)
+    st_table *table;
+    int (*func)();
+    st_data_t arg;
+{
+    st_table_entry *ptr, *last, *tmp;
+    enum st_retval retval;
+    int i;
+
+    for(i = 0; i < table->num_bins; i++) {
+	last = 0;
+	for(ptr = table->bins[i]; ptr != 0;) {
+	    retval = (*func)(ptr->key, ptr->record, arg);
+	    switch (retval) {
+	    case ST_CHECK:	/* check if hash is modified during iteration */
+	        tmp = 0;
+		if (i < table->num_bins) {
+		    for (tmp = table->bins[i]; tmp; tmp=tmp->next) {
+			if (tmp == ptr) break;
+		    }
+		}
+		if (!tmp) {
+		    /* call func with error notice */
+		    return 1;
+		}
+		/* fall through */
+	    case ST_CONTINUE:
+		last = ptr;
+		ptr = ptr->next;
+		break;
+	    case ST_STOP:
+	        return 0;
+	    case ST_DELETE:
+		tmp = ptr;
+		if (last == 0) {
+		    table->bins[i] = ptr->next;
+		}
+		else {
+		    last->next = ptr->next;
+		}
+		ptr = ptr->next;
+		free(tmp);
+		table->num_entries--;
+	    }
+	}
+    }
+    return 0;
+}
+
+static int
+strhash(string)
+    register const char *string;
+{
+    register int c;
+
+#ifdef HASH_ELFHASH
+    register unsigned int h = 0, g;
+
+    while ((c = *string++) != '\0') {
+	h = ( h << 4 ) + c;
+	if ( g = h & 0xF0000000 )
+	    h ^= g >> 24;
+	h &= ~g;
+    }
+    return h;
+#elif defined(HASH_PERL)
+    register int val = 0;
+
+    while ((c = *string++) != '\0') {
+	val += c;
+	val += (val << 10);
+	val ^= (val >> 6);
+    }
+    val += (val << 3);
+    val ^= (val >> 11);
+
+    return val + (val << 15);
+#else
+    register int val = 0;
+
+    while ((c = *string++) != '\0') {
+	val = val*997 + c;
+    }
+
+    return val + (val>>5);
+#endif
+}
+
+static int
+numcmp(x, y)
+    long x, y;
+{
+    return x != y;
+}
+
+static int
+numhash(n)
+    long n;
+{
+    return n;
+}
diff --git a/ruby_1_8_6/st.h b/ruby_1_8_6/st.h
new file mode 100644
index 0000000000..fb56f5ffad
--- /dev/null
+++ b/ruby_1_8_6/st.h
@@ -0,0 +1,72 @@
+/* This is a public domain general purpose hash table package written by Peter Moore @ UCB. */
+
+/* @(#) st.h 5.1 89/12/14 */
+
+#ifndef ST_INCLUDED
+
+#define ST_INCLUDED
+
+#if SIZEOF_LONG == SIZEOF_VOIDP
+typedef unsigned long st_data_t;
+#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
+typedef unsigned LONG_LONG st_data_t;
+#else
+# error ---->> st.c requires sizeof(void*) == sizeof(long) to be compiled. <<---
+-
+#endif
+#define ST_DATA_T_DEFINED
+
+typedef struct st_table st_table;
+
+struct st_hash_type {
+    int (*compare)();
+    int (*hash)();
+};
+
+struct st_table {
+    struct st_hash_type *type;
+    int num_bins;
+    int num_entries;
+    struct st_table_entry **bins;
+};
+
+#define st_is_member(table,key) st_lookup(table,key,(st_data_t *)0)
+
+enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE, ST_CHECK};
+
+#ifndef _
+# define _(args) args
+#endif
+#ifndef ANYARGS
+# ifdef __cplusplus
+#   define ANYARGS ...
+# else
+#   define ANYARGS
+# endif
+#endif
+
+st_table *st_init_table _((struct st_hash_type *));
+st_table *st_init_table_with_size _((struct st_hash_type *, int));
+st_table *st_init_numtable _((void));
+st_table *st_init_numtable_with_size _((int));
+st_table *st_init_strtable _((void));
+st_table *st_init_strtable_with_size _((int));
+int st_delete _((st_table *, st_data_t *, st_data_t *));
+int st_delete_safe _((st_table *, st_data_t *, st_data_t *, st_data_t));
+int st_insert _((st_table *, st_data_t, st_data_t));
+int st_lookup _((st_table *, st_data_t, st_data_t *));
+int st_foreach _((st_table *, int (*)(ANYARGS), st_data_t));
+void st_add_direct _((st_table *, st_data_t, st_data_t));
+void st_free_table _((st_table *));
+void st_cleanup_safe _((st_table *, st_data_t));
+st_table *st_copy _((st_table *));
+
+#define ST_NUMCMP	((int (*)()) 0)
+#define ST_NUMHASH	((int (*)()) -2)
+
+#define st_numcmp	ST_NUMCMP
+#define st_numhash	ST_NUMHASH
+
+int st_strhash();
+
+#endif /* ST_INCLUDED */
diff --git a/ruby_1_8_6/string.c b/ruby_1_8_6/string.c
new file mode 100644
index 0000000000..08c958d8e4
--- /dev/null
+++ b/ruby_1_8_6/string.c
@@ -0,0 +1,4770 @@
+/**********************************************************************
+
+  string.c -
+
+  $Author$
+  $Date$
+  created at: Mon Aug  9 17:12:58 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "re.h"
+
+#define BEG(no) regs->beg[no]
+#define END(no) regs->end[no]
+
+#include <math.h>
+#include <ctype.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+VALUE rb_cString;
+
+#define STR_TMPLOCK FL_USER1
+#define STR_ASSOC   FL_USER3
+#define STR_NOCAPA  (ELTS_SHARED|STR_ASSOC)
+
+#define RESIZE_CAPA(str,capacity) do {\
+    REALLOC_N(RSTRING(str)->ptr, char, (capacity)+1);\
+    if (!FL_TEST(str, STR_NOCAPA))\
+        RSTRING(str)->aux.capa = (capacity);\
+} while (0)
+
+VALUE rb_fs;
+
+static inline void
+str_mod_check(s, p, len)
+    VALUE s;
+    char *p;
+    long len;
+{
+    if (RSTRING(s)->ptr != p || RSTRING(s)->len != len) {
+	rb_raise(rb_eRuntimeError, "string modified");
+    }
+}
+
+static inline void
+str_frozen_check(s)
+    VALUE s;
+{
+    if (OBJ_FROZEN(s)) {
+	rb_raise(rb_eRuntimeError, "string frozen");
+    }
+}
+
+static VALUE str_alloc _((VALUE));
+static VALUE
+str_alloc(klass)
+    VALUE klass;
+{
+    NEWOBJ(str, struct RString);
+    OBJSETUP(str, klass, T_STRING);
+
+    str->ptr = 0;
+    str->len = 0;
+    str->aux.capa = 0;
+
+    return (VALUE)str;
+}
+
+static VALUE
+str_new(klass, ptr, len)
+    VALUE klass;
+    const char *ptr;
+    long len;
+{
+    VALUE str;
+
+    if (len < 0) {
+	rb_raise(rb_eArgError, "negative string size (or size too big)");
+    }
+
+    str = str_alloc(klass);
+    RSTRING(str)->len = len;
+    RSTRING(str)->aux.capa = len;
+    RSTRING(str)->ptr = ALLOC_N(char,len+1);
+    if (ptr) {
+	memcpy(RSTRING(str)->ptr, ptr, len);
+    }
+    RSTRING(str)->ptr[len] = '\0';
+    return str;
+}
+
+VALUE
+rb_str_new(ptr, len)
+    const char *ptr;
+    long len;
+{
+    return str_new(rb_cString, ptr, len);
+}
+
+VALUE
+rb_str_new2(ptr)
+    const char *ptr;
+{
+    if (!ptr) {
+	rb_raise(rb_eArgError, "NULL pointer given");
+    }
+    return rb_str_new(ptr, strlen(ptr));
+}
+
+VALUE
+rb_tainted_str_new(ptr, len)
+    const char *ptr;
+    long len;
+{
+    VALUE str = rb_str_new(ptr, len);
+
+    OBJ_TAINT(str);
+    return str;
+}
+
+VALUE
+rb_tainted_str_new2(ptr)
+    const char *ptr;
+{
+    VALUE str = rb_str_new2(ptr);
+
+    OBJ_TAINT(str);
+    return str;
+}
+
+static VALUE
+str_new3(klass, str)
+    VALUE klass, str;
+{
+    VALUE str2 = str_alloc(klass);
+
+    RSTRING(str2)->len = RSTRING(str)->len;
+    RSTRING(str2)->ptr = RSTRING(str)->ptr;
+    RSTRING(str2)->aux.shared = str;
+    FL_SET(str2, ELTS_SHARED);
+
+    return str2;
+}
+
+VALUE
+rb_str_new3(str)
+    VALUE str;
+{
+    VALUE str2 = str_new3(rb_obj_class(str), str);
+
+    OBJ_INFECT(str2, str);
+    return str2;
+}
+
+static VALUE
+str_new4(klass, str)
+    VALUE klass, str;
+{
+    VALUE str2 = str_alloc(klass);
+
+    RSTRING(str2)->len = RSTRING(str)->len;
+    RSTRING(str2)->ptr = RSTRING(str)->ptr;
+    if (FL_TEST(str, ELTS_SHARED)) {
+	FL_SET(str2, ELTS_SHARED);
+	RSTRING(str2)->aux.shared = RSTRING(str)->aux.shared;
+    }
+    else {
+	FL_SET(str, ELTS_SHARED);
+	RSTRING(str)->aux.shared = str2;
+    }
+
+    return str2;
+}
+
+VALUE
+rb_str_new4(orig)
+    VALUE orig;
+{
+    VALUE klass, str;
+
+    if (OBJ_FROZEN(orig)) return orig;
+    klass = rb_obj_class(orig);
+    if (FL_TEST(orig, ELTS_SHARED) && (str = RSTRING(orig)->aux.shared) && klass == RBASIC(str)->klass) {
+	long ofs;
+	ofs = RSTRING(str)->len - RSTRING(orig)->len;
+	if ((ofs > 0) || (!OBJ_TAINTED(str) && OBJ_TAINTED(orig))) {
+	    str = str_new3(klass, str);
+	    RSTRING(str)->ptr += ofs;
+	    RSTRING(str)->len -= ofs;
+	}
+    }
+    else if (FL_TEST(orig, STR_ASSOC)) {
+	str = str_new(klass, RSTRING(orig)->ptr, RSTRING(orig)->len);
+    }
+    else {
+	str = str_new4(klass, orig);
+    }
+    OBJ_INFECT(str, orig);
+    OBJ_FREEZE(str);
+    return str;
+}
+
+VALUE
+rb_str_new5(obj, ptr, len)
+    VALUE obj;
+    const char *ptr;
+    long len;
+{
+    return str_new(rb_obj_class(obj), ptr, len);
+}
+
+#define STR_BUF_MIN_SIZE 128
+
+VALUE
+rb_str_buf_new(capa)
+    long capa;
+{
+    VALUE str = str_alloc(rb_cString);
+
+    if (capa < STR_BUF_MIN_SIZE) {
+	capa = STR_BUF_MIN_SIZE;
+    }
+    RSTRING(str)->ptr = 0;
+    RSTRING(str)->len = 0;
+    RSTRING(str)->aux.capa = capa;
+    RSTRING(str)->ptr = ALLOC_N(char, capa+1);
+    RSTRING(str)->ptr[0] = '\0';
+
+    return str;
+}
+
+VALUE
+rb_str_buf_new2(ptr)
+    const char *ptr;
+{
+    VALUE str;
+    long len = strlen(ptr);
+
+    str = rb_str_buf_new(len);
+    rb_str_buf_cat(str, ptr, len);
+
+    return str;
+}
+
+VALUE
+rb_str_to_str(str)
+    VALUE str;
+{
+    return rb_convert_type(str, T_STRING, "String", "to_str");
+}
+
+static void
+rb_str_shared_replace(str, str2)
+    VALUE str, str2;
+{
+    if (str == str2) return;
+    rb_str_modify(str);
+    if (!FL_TEST(str, ELTS_SHARED)) free(RSTRING(str)->ptr);
+    if (NIL_P(str2)) {
+	RSTRING(str)->ptr = 0;
+	RSTRING(str)->len = 0;
+	RSTRING(str)->aux.capa = 0;
+	FL_UNSET(str, STR_NOCAPA);
+	return;
+    }
+    RSTRING(str)->ptr = RSTRING(str2)->ptr;
+    RSTRING(str)->len = RSTRING(str2)->len;
+    FL_UNSET(str, STR_NOCAPA);
+    if (FL_TEST(str2, STR_NOCAPA)) {
+	FL_SET(str, RBASIC(str2)->flags & STR_NOCAPA);
+	RSTRING(str)->aux.shared = RSTRING(str2)->aux.shared;
+    }
+    else {
+	RSTRING(str)->aux.capa = RSTRING(str2)->aux.capa;
+    }
+    RSTRING(str2)->ptr = 0;	/* abandon str2 */
+    RSTRING(str2)->len = 0;
+    RSTRING(str2)->aux.capa = 0;
+    FL_UNSET(str2, STR_NOCAPA);
+    if (OBJ_TAINTED(str2)) OBJ_TAINT(str);
+}
+
+static ID id_to_s;
+
+VALUE
+rb_obj_as_string(obj)
+    VALUE obj;
+{
+    VALUE str;
+
+    if (TYPE(obj) == T_STRING) {
+	return obj;
+    }
+    str = rb_funcall(obj, id_to_s, 0);
+    if (TYPE(str) != T_STRING)
+	return rb_any_to_s(obj);
+    if (OBJ_TAINTED(obj)) OBJ_TAINT(str);
+    return str;
+}
+
+static VALUE rb_str_replace _((VALUE, VALUE));
+
+VALUE
+rb_str_dup(str)
+    VALUE str;
+{
+    VALUE dup = str_alloc(rb_obj_class(str));
+    rb_str_replace(dup, str);
+    return dup;
+}
+
+
+/*
+ *  call-seq:
+ *     String.new(str="")   => new_str
+ *  
+ *  Returns a new string object containing a copy of <i>str</i>.
+ */
+
+static VALUE
+rb_str_init(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    VALUE orig;
+
+    if (rb_scan_args(argc, argv, "01", &orig) == 1)
+	rb_str_replace(str, orig);
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     str.length   => integer
+ *  
+ *  Returns the length of <i>str</i>.
+ */
+
+static VALUE
+rb_str_length(str)
+    VALUE str;
+{
+    return LONG2NUM(RSTRING(str)->len);
+}
+
+/*
+ *  call-seq:
+ *     str.empty?   => true or false
+ *  
+ *  Returns <code>true</code> if <i>str</i> has a length of zero.
+ *     
+ *     "hello".empty?   #=> false
+ *     "".empty?        #=> true
+ */
+
+static VALUE
+rb_str_empty(str)
+    VALUE str;
+{
+    if (RSTRING(str)->len == 0)
+	return Qtrue;
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     str + other_str   => new_str
+ *  
+ *  Concatenation---Returns a new <code>String</code> containing
+ *  <i>other_str</i> concatenated to <i>str</i>.
+ *     
+ *     "Hello from " + self.to_s   #=> "Hello from main"
+ */
+
+VALUE
+rb_str_plus(str1, str2)
+    VALUE str1, str2;
+{
+    VALUE str3;
+
+    StringValue(str2);
+    str3 = rb_str_new(0, RSTRING(str1)->len+RSTRING(str2)->len);
+    memcpy(RSTRING(str3)->ptr, RSTRING(str1)->ptr, RSTRING(str1)->len);
+    memcpy(RSTRING(str3)->ptr + RSTRING(str1)->len,
+	   RSTRING(str2)->ptr, RSTRING(str2)->len);
+    RSTRING(str3)->ptr[RSTRING(str3)->len] = '\0';
+
+    if (OBJ_TAINTED(str1) || OBJ_TAINTED(str2))
+	OBJ_TAINT(str3);
+    return str3;
+}
+
+/*
+ *  call-seq:
+ *     str * integer   => new_str
+ *  
+ *  Copy---Returns a new <code>String</code> containing <i>integer</i> copies of
+ *  the receiver.
+ *     
+ *     "Ho! " * 3   #=> "Ho! Ho! Ho! "
+ */
+
+VALUE
+rb_str_times(str, times)
+    VALUE str;
+    VALUE times;
+{
+    VALUE str2;
+    long i, len;
+
+    len = NUM2LONG(times);
+    if (len < 0) {
+	rb_raise(rb_eArgError, "negative argument");
+    }
+    if (len && LONG_MAX/len <  RSTRING(str)->len) {
+	rb_raise(rb_eArgError, "argument too big");
+    }
+
+    str2 = rb_str_new5(str,0, len *= RSTRING(str)->len);
+    for (i = 0; i < len; i += RSTRING(str)->len) {
+	memcpy(RSTRING(str2)->ptr + i,
+	       RSTRING(str)->ptr, RSTRING(str)->len);
+    }
+    RSTRING(str2)->ptr[RSTRING(str2)->len] = '\0';
+
+    OBJ_INFECT(str2, str);
+
+    return str2;
+}
+
+/*
+ *  call-seq:
+ *     str % arg   => new_str
+ *  
+ *  Format---Uses <i>str</i> as a format specification, and returns the result
+ *  of applying it to <i>arg</i>. If the format specification contains more than
+ *  one substitution, then <i>arg</i> must be an <code>Array</code> containing
+ *  the values to be substituted. See <code>Kernel::sprintf</code> for details
+ *  of the format string.
+ *     
+ *     "%05d" % 123                       #=> "00123"
+ *     "%-5s: %08x" % [ "ID", self.id ]   #=> "ID   : 200e14d6"
+ */
+
+static VALUE
+rb_str_format(str, arg)
+    VALUE str, arg;
+{
+    VALUE *argv;
+
+    if (TYPE(arg) == T_ARRAY) {
+	argv = ALLOCA_N(VALUE, RARRAY(arg)->len + 1);
+	argv[0] = str;
+	MEMCPY(argv+1, RARRAY(arg)->ptr, VALUE, RARRAY(arg)->len);
+	return rb_f_sprintf(RARRAY(arg)->len+1, argv);
+    }
+
+    argv = ALLOCA_N(VALUE, 2);
+    argv[0] = str;
+    argv[1] = arg;
+    return rb_f_sprintf(2, argv);
+}
+
+static int
+str_independent(str)
+    VALUE str;
+{
+    if (FL_TEST(str, STR_TMPLOCK)) {
+	rb_raise(rb_eRuntimeError, "can't modify string; temporarily locked");
+    }
+    if (OBJ_FROZEN(str)) rb_error_frozen("string");
+    if (!OBJ_TAINTED(str) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify string");
+    if (!FL_TEST(str, ELTS_SHARED)) return 1;
+    return 0;
+}
+
+static void
+str_make_independent(str)
+    VALUE str;
+{
+    char *ptr;
+
+    ptr = ALLOC_N(char, RSTRING(str)->len+1);
+    if (RSTRING(str)->ptr) {
+	memcpy(ptr, RSTRING(str)->ptr, RSTRING(str)->len);
+    }
+    ptr[RSTRING(str)->len] = 0;
+    RSTRING(str)->ptr = ptr;
+    RSTRING(str)->aux.capa = RSTRING(str)->len;
+    FL_UNSET(str, STR_NOCAPA);
+}
+
+void
+rb_str_modify(str)
+    VALUE str;
+{
+    if (!str_independent(str))
+	str_make_independent(str);
+}
+
+void
+rb_str_associate(str, add)
+    VALUE str, add;
+{
+    if (FL_TEST(str, STR_ASSOC)) {
+	/* already associated */
+	rb_ary_concat(RSTRING(str)->aux.shared, add);
+    }
+    else {
+	if (FL_TEST(str, ELTS_SHARED)) {
+	    str_make_independent(str);
+	}
+	else if (RSTRING(str)->aux.capa != RSTRING(str)->len) {
+	    RESIZE_CAPA(str, RSTRING(str)->len);
+	}
+	RSTRING(str)->aux.shared = add;
+	FL_SET(str, STR_ASSOC);
+    }
+}
+
+VALUE
+rb_str_associated(str)
+    VALUE str;
+{
+    if (FL_TEST(str, STR_ASSOC)) {
+	return RSTRING(str)->aux.shared;
+    }
+    return Qfalse;
+}
+
+static char *null_str = "";
+
+VALUE
+rb_string_value(ptr)
+    volatile VALUE *ptr;
+{
+    VALUE s = *ptr;
+    if (TYPE(s) != T_STRING) {
+	s = rb_str_to_str(s);
+	*ptr = s;
+    }
+    if (!RSTRING(s)->ptr) {
+	FL_SET(s, ELTS_SHARED);
+	RSTRING(s)->ptr = null_str;
+    }
+    return s;
+}
+
+char *
+rb_string_value_ptr(ptr)
+    volatile VALUE *ptr;
+{
+    return RSTRING(rb_string_value(ptr))->ptr;
+}
+
+char *
+rb_string_value_cstr(ptr)
+    volatile VALUE *ptr;
+{
+    VALUE str = rb_string_value(ptr);
+    char *s = RSTRING(str)->ptr;
+
+    if (!s || RSTRING(str)->len != strlen(s)) {
+	rb_raise(rb_eArgError, "string contains null byte");
+    }
+    return s;
+}
+
+VALUE
+rb_check_string_type(str)
+    VALUE str;
+{
+    str = rb_check_convert_type(str, T_STRING, "String", "to_str");
+    if (!NIL_P(str) && !RSTRING(str)->ptr) {
+	FL_SET(str, ELTS_SHARED);
+	RSTRING(str)->ptr = null_str;
+    }
+    return str;
+}
+
+VALUE
+rb_str_substr(str, beg, len)
+    VALUE str;
+    long beg, len;
+{
+    VALUE str2;
+
+    if (len < 0) return Qnil;
+    if (beg > RSTRING(str)->len) return Qnil;
+    if (beg < 0) {
+	beg += RSTRING(str)->len;
+	if (beg < 0) return Qnil;
+    }
+    if (beg + len > RSTRING(str)->len) {
+	len = RSTRING(str)->len - beg;
+    }
+    if (len < 0) {
+	len = 0;
+    }
+    if (len == 0) {
+	str2 = rb_str_new5(str,0,0);
+    }
+    else if (len > sizeof(struct RString)/2 &&
+	beg + len == RSTRING(str)->len && !FL_TEST(str, STR_ASSOC)) {
+	str2 = rb_str_new4(str);
+	str2 = str_new3(rb_obj_class(str2), str2);
+	RSTRING(str2)->ptr += RSTRING(str2)->len - len;
+	RSTRING(str2)->len = len;
+    }
+    else {
+	str2 = rb_str_new5(str, RSTRING(str)->ptr+beg, len);
+    }
+    OBJ_INFECT(str2, str);
+
+    return str2;
+}
+
+VALUE
+rb_str_freeze(str)
+    VALUE str;
+{
+    return rb_obj_freeze(str);
+}
+
+VALUE
+rb_str_dup_frozen(str)
+    VALUE str;
+{
+    if (FL_TEST(str, ELTS_SHARED) && RSTRING(str)->aux.shared) {
+	VALUE shared = RSTRING(str)->aux.shared;
+	if (RSTRING(shared)->len == RSTRING(str)->len) {
+	    OBJ_FREEZE(shared);
+	    return shared;
+	}
+    }
+    if (OBJ_FROZEN(str)) return str;
+    str = rb_str_dup(str);
+    OBJ_FREEZE(str);
+    return str;
+}
+
+VALUE
+rb_str_locktmp(str)
+    VALUE str;
+{
+    if (FL_TEST(str, STR_TMPLOCK)) {
+	rb_raise(rb_eRuntimeError, "temporal locking already locked string");
+    }
+    FL_SET(str, STR_TMPLOCK);
+    return str;
+}
+
+VALUE
+rb_str_unlocktmp(str)
+    VALUE str;
+{
+    if (!FL_TEST(str, STR_TMPLOCK)) {
+	rb_raise(rb_eRuntimeError, "temporal unlocking already unlocked string");
+    }
+    FL_UNSET(str, STR_TMPLOCK);
+    return str;
+}
+
+VALUE
+rb_str_resize(str, len)
+    VALUE str;
+    long len;
+{
+    if (len < 0) {
+	rb_raise(rb_eArgError, "negative string size (or size too big)");
+    }
+
+    rb_str_modify(str);
+    if (len != RSTRING(str)->len) {
+	if (RSTRING(str)->len < len || RSTRING(str)->len - len > 1024) {
+	    REALLOC_N(RSTRING(str)->ptr, char, len+1);
+	    if (!FL_TEST(str, STR_NOCAPA)) {
+		RSTRING(str)->aux.capa = len;
+	    }
+	}
+	RSTRING(str)->len = len;
+	RSTRING(str)->ptr[len] = '\0';	/* sentinel */
+    }
+    return str;
+}
+
+VALUE
+rb_str_buf_cat(str, ptr, len)
+    VALUE str;
+    const char *ptr;
+    long len;
+{
+    long capa, total;
+
+    if (len == 0) return str;
+    if (len < 0) {
+	rb_raise(rb_eArgError, "negative string size (or size too big)");
+    }
+    rb_str_modify(str);
+    if (FL_TEST(str, STR_ASSOC)) {
+	FL_UNSET(str, STR_ASSOC);
+	capa = RSTRING(str)->aux.capa = RSTRING(str)->len;
+    }
+    else {
+	capa = RSTRING(str)->aux.capa;
+    }
+    total = RSTRING(str)->len+len;
+    if (capa <= total) {
+	while (total > capa) {
+	    capa = (capa + 1) * 2;
+	}
+	RESIZE_CAPA(str, capa);
+    }
+    memcpy(RSTRING(str)->ptr + RSTRING(str)->len, ptr, len);
+    RSTRING(str)->len = total;
+    RSTRING(str)->ptr[total] = '\0'; /* sentinel */
+
+    return str;
+}
+
+VALUE
+rb_str_buf_cat2(str, ptr)
+    VALUE str;
+    const char *ptr;
+{
+    return rb_str_buf_cat(str, ptr, strlen(ptr));
+}
+
+VALUE
+rb_str_cat(str, ptr, len)
+    VALUE str;
+    const char *ptr;
+    long len;
+{
+    if (len < 0) {
+	rb_raise(rb_eArgError, "negative string size (or size too big)");
+    }
+    if (FL_TEST(str, STR_ASSOC)) {
+	rb_str_modify(str);
+	REALLOC_N(RSTRING(str)->ptr, char, RSTRING(str)->len+len);
+	memcpy(RSTRING(str)->ptr + RSTRING(str)->len, ptr, len);
+	RSTRING(str)->len += len;
+	RSTRING(str)->ptr[RSTRING(str)->len] = '\0'; /* sentinel */
+	return str;
+    }
+
+    return rb_str_buf_cat(str, ptr, len);
+}
+
+VALUE
+rb_str_cat2(str, ptr)
+    VALUE str;
+    const char *ptr;
+{
+    return rb_str_cat(str, ptr, strlen(ptr));
+}
+
+VALUE
+rb_str_buf_append(str, str2)
+    VALUE str, str2;
+{
+    long capa, len;
+
+    rb_str_modify(str);
+    if (FL_TEST(str, STR_ASSOC)) {
+	FL_UNSET(str, STR_ASSOC);
+	capa = RSTRING(str)->aux.capa = RSTRING(str)->len;
+    }
+    else {
+	capa = RSTRING(str)->aux.capa;
+    }
+    len = RSTRING(str)->len+RSTRING(str2)->len;
+    if (capa <= len) {
+	while (len > capa) {
+	    capa = (capa + 1) * 2;
+	}
+	RESIZE_CAPA(str, capa);
+    }
+    memcpy(RSTRING(str)->ptr + RSTRING(str)->len,
+	   RSTRING(str2)->ptr, RSTRING(str2)->len);
+    RSTRING(str)->len += RSTRING(str2)->len;
+    RSTRING(str)->ptr[RSTRING(str)->len] = '\0'; /* sentinel */
+    OBJ_INFECT(str, str2);
+
+    return str;
+}
+
+VALUE
+rb_str_append(str, str2)
+    VALUE str, str2;
+{
+    StringValue(str2);
+    rb_str_modify(str);
+    if (RSTRING(str2)->len > 0) {
+	if (FL_TEST(str, STR_ASSOC)) {
+	    long len = RSTRING(str)->len+RSTRING(str2)->len;
+	    REALLOC_N(RSTRING(str)->ptr, char, len+1);
+	    memcpy(RSTRING(str)->ptr + RSTRING(str)->len,
+		   RSTRING(str2)->ptr, RSTRING(str2)->len);
+	    RSTRING(str)->ptr[len] = '\0'; /* sentinel */
+	    RSTRING(str)->len = len;
+	}
+	else {
+	    return rb_str_buf_append(str, str2);
+	}
+    }
+    OBJ_INFECT(str, str2);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str << fixnum        => str
+ *     str.concat(fixnum)   => str
+ *     str << obj           => str
+ *     str.concat(obj)      => str
+ *  
+ *  Append---Concatenates the given object to <i>str</i>. If the object is a
+ *  <code>Fixnum</code> between 0 and 255, it is converted to a character before
+ *  concatenation.
+ *     
+ *     a = "hello "
+ *     a << "world"   #=> "hello world"
+ *     a.concat(33)   #=> "hello world!"
+ */
+
+VALUE
+rb_str_concat(str1, str2)
+    VALUE str1, str2;
+{
+    if (FIXNUM_P(str2)) {
+	int i = FIX2INT(str2);
+	if (0 <= i && i <= 0xff) { /* byte */
+	    char c = i;
+	    return rb_str_cat(str1, &c, 1);
+	}
+    }
+    str1 = rb_str_append(str1, str2);
+
+    return str1;
+}
+
+int
+rb_str_hash(str)
+    VALUE str;
+{
+    register long len = RSTRING(str)->len;
+    register char *p = RSTRING(str)->ptr;
+    register int key = 0;
+
+#if defined(HASH_ELFHASH)
+    register unsigned int g;
+
+    while (len--) {
+	key = (key << 4) + *p++;
+	if (g = key & 0xF0000000)
+	    key ^= g >> 24;
+	key &= ~g;
+    }
+#elif defined(HASH_PERL)
+    while (len--) {
+	key += *p++;
+	key += (key << 10);
+	key ^= (key >> 6);
+    }
+    key += (key << 3);
+    key ^= (key >> 11);
+    key += (key << 15);
+#else
+    while (len--) {
+	key = key*65599 + *p;
+	p++;
+    }
+    key = key + (key>>5);
+#endif
+    return key;
+}
+
+/*
+ * call-seq:
+ *    str.hash   => fixnum
+ *
+ * Return a hash based on the string's length and content.
+ */
+
+static VALUE
+rb_str_hash_m(str)
+    VALUE str;
+{
+    int key = rb_str_hash(str);
+    return INT2FIX(key);
+}
+
+#define lesser(a,b) (((a)>(b))?(b):(a))
+
+int
+rb_str_cmp(str1, str2)
+    VALUE str1, str2;
+{
+    long len;
+    int retval;
+
+    len = lesser(RSTRING(str1)->len, RSTRING(str2)->len);
+    retval = rb_memcmp(RSTRING(str1)->ptr, RSTRING(str2)->ptr, len);
+    if (retval == 0) {
+	if (RSTRING(str1)->len == RSTRING(str2)->len) return 0;
+	if (RSTRING(str1)->len > RSTRING(str2)->len) return 1;
+	return -1;
+    }
+    if (retval > 0) return 1;
+    return -1;
+}
+
+
+/*
+ *  call-seq:
+ *     str == obj   => true or false
+ *  
+ *  Equality---If <i>obj</i> is not a <code>String</code>, returns
+ *  <code>false</code>. Otherwise, returns <code>true</code> if <i>str</i>
+ *  <code><=></code> <i>obj</i> returns zero.
+ */
+
+static VALUE
+rb_str_equal(str1, str2)
+    VALUE str1, str2;
+{
+    if (str1 == str2) return Qtrue;
+    if (TYPE(str2) != T_STRING) {
+	if (!rb_respond_to(str2, rb_intern("to_str"))) {
+	    return Qfalse;
+	}
+	return rb_equal(str2, str1);
+    }
+    if (RSTRING(str1)->len == RSTRING(str2)->len &&
+	rb_str_cmp(str1, str2) == 0) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+#define IS_EVSTR(p,e) ((p) < (e) && (*(p) == '$' || *(p) == '@' || *(p) == '{'))
+
+/*
+ * call-seq:
+ *   str.eql?(other)   => true or false
+ *
+ * Two strings are equal if the have the same length and content.
+ */
+
+static VALUE
+rb_str_eql(str1, str2)
+    VALUE str1, str2;
+{
+    if (TYPE(str2) != T_STRING || RSTRING(str1)->len != RSTRING(str2)->len)
+	return Qfalse;
+
+    if (memcmp(RSTRING(str1)->ptr, RSTRING(str2)->ptr,
+	       lesser(RSTRING(str1)->len, RSTRING(str2)->len)) == 0)
+	return Qtrue;
+
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     str <=> other_str   => -1, 0, +1
+ *  
+ *  Comparison---Returns -1 if <i>other_str</i> is less than, 0 if
+ *  <i>other_str</i> is equal to, and +1 if <i>other_str</i> is greater than
+ *  <i>str</i>. If the strings are of different lengths, and the strings are
+ *  equal when compared up to the shortest length, then the longer string is
+ *  considered greater than the shorter one. If the variable <code>$=</code> is
+ *  <code>false</code>, the comparison is based on comparing the binary values
+ *  of each character in the string. In older versions of Ruby, setting
+ *  <code>$=</code> allowed case-insensitive comparisons; this is now deprecated
+ *  in favor of using <code>String#casecmp</code>.
+ *
+ *  <code><=></code> is the basis for the methods <code><</code>,
+ *  <code><=</code>, <code>></code>, <code>>=</code>, and <code>between?</code>,
+ *  included from module <code>Comparable</code>.  The method
+ *  <code>String#==</code> does not use <code>Comparable#==</code>.
+ *     
+ *     "abcdef" <=> "abcde"     #=> 1
+ *     "abcdef" <=> "abcdef"    #=> 0
+ *     "abcdef" <=> "abcdefg"   #=> -1
+ *     "abcdef" <=> "ABCDEF"    #=> 1
+ */
+
+static VALUE
+rb_str_cmp_m(str1, str2)
+    VALUE str1, str2;
+{
+    long result;
+
+    if (TYPE(str2) != T_STRING) {
+	if (!rb_respond_to(str2, rb_intern("to_str"))) {
+	    return Qnil;
+	}
+	else if (!rb_respond_to(str2, rb_intern("<=>"))) {
+	    return Qnil;
+	}
+	else {
+	    VALUE tmp = rb_funcall(str2, rb_intern("<=>"), 1, str1);
+
+	    if (NIL_P(tmp)) return Qnil;
+	    if (!FIXNUM_P(tmp)) {
+		return rb_funcall(LONG2FIX(0), '-', 1, tmp);
+	    }
+	    result = -FIX2LONG(tmp);
+	}
+    }
+    else {
+	result = rb_str_cmp(str1, str2);
+    }
+    return LONG2NUM(result);
+}
+
+/*
+ *  call-seq:
+ *     str.casecmp(other_str)   => -1, 0, +1
+ *  
+ *  Case-insensitive version of <code>String#<=></code>.
+ *     
+ *     "abcdef".casecmp("abcde")     #=> 1
+ *     "aBcDeF".casecmp("abcdef")    #=> 0
+ *     "abcdef".casecmp("abcdefg")   #=> -1
+ *     "abcdef".casecmp("ABCDEF")    #=> 0
+ */
+
+static VALUE
+rb_str_casecmp(str1, str2)
+    VALUE str1, str2;
+{
+    long len;
+    int retval;
+
+    StringValue(str2);
+    len = lesser(RSTRING(str1)->len, RSTRING(str2)->len);
+    retval = rb_memcicmp(RSTRING(str1)->ptr, RSTRING(str2)->ptr, len);
+    if (retval == 0) {
+	if (RSTRING(str1)->len == RSTRING(str2)->len) return INT2FIX(0);
+	if (RSTRING(str1)->len > RSTRING(str2)->len) return INT2FIX(1);
+	return INT2FIX(-1);
+    }
+    if (retval == 0) return INT2FIX(0);
+    if (retval > 0) return INT2FIX(1);
+    return INT2FIX(-1);
+}
+
+static long
+rb_str_index(str, sub, offset)
+    VALUE str, sub;
+    long offset;
+{
+    long pos;
+
+    if (offset < 0) {
+	offset += RSTRING(str)->len;
+	if (offset < 0) return -1;
+    }
+    if (RSTRING(str)->len - offset < RSTRING(sub)->len) return -1;
+    if (RSTRING(sub)->len == 0) return offset;
+    pos = rb_memsearch(RSTRING(sub)->ptr, RSTRING(sub)->len,
+		       RSTRING(str)->ptr+offset, RSTRING(str)->len-offset);
+    if (pos < 0) return pos;
+    return pos + offset;
+}
+
+
+/*
+ *  call-seq:
+ *     str.index(substring [, offset])   => fixnum or nil
+ *     str.index(fixnum [, offset])      => fixnum or nil
+ *     str.index(regexp [, offset])      => fixnum or nil
+ *  
+ *  Returns the index of the first occurrence of the given <i>substring</i>,
+ *  character (<i>fixnum</i>), or pattern (<i>regexp</i>) in <i>str</i>. Returns
+ *  <code>nil</code> if not found. If the second parameter is present, it
+ *  specifies the position in the string to begin the search.
+ *     
+ *     "hello".index('e')             #=> 1
+ *     "hello".index('lo')            #=> 3
+ *     "hello".index('a')             #=> nil
+ *     "hello".index(101)             #=> 1
+ *     "hello".index(/[aeiou]/, -3)   #=> 4
+ */
+
+static VALUE
+rb_str_index_m(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    VALUE sub;
+    VALUE initpos;
+    long pos;
+
+    if (rb_scan_args(argc, argv, "11", &sub, &initpos) == 2) {
+	pos = NUM2LONG(initpos);
+    }
+    else {
+	pos = 0;
+    }
+    if (pos < 0) {
+	pos += RSTRING(str)->len;
+	if (pos < 0) {
+	    if (TYPE(sub) == T_REGEXP) {
+		rb_backref_set(Qnil);
+	    }
+	    return Qnil;
+	}
+    }
+
+    switch (TYPE(sub)) {
+      case T_REGEXP:
+	pos = rb_reg_adjust_startpos(sub, str, pos, 0);
+	pos = rb_reg_search(sub, str, pos, 0);
+	break;
+
+      case T_FIXNUM:
+      {
+	  int c = FIX2INT(sub);
+	  long len = RSTRING(str)->len;
+	  unsigned char *p = (unsigned char*)RSTRING(str)->ptr;
+
+	  for (;pos<len;pos++) {
+	      if (p[pos] == c) return LONG2NUM(pos);
+	  }
+	  return Qnil;
+      }
+
+      default: {
+	  VALUE tmp;
+
+	  tmp = rb_check_string_type(sub);
+	  if (NIL_P(tmp)) {
+	      rb_raise(rb_eTypeError, "type mismatch: %s given",
+		       rb_obj_classname(sub));
+	  }
+	  sub = tmp;
+      }
+	/* fall through */
+      case T_STRING:
+	pos = rb_str_index(str, sub, pos);
+	break;
+    }
+
+    if (pos == -1) return Qnil;
+    return LONG2NUM(pos);
+}
+
+static long
+rb_str_rindex(str, sub, pos)
+    VALUE str, sub;
+    long pos;
+{
+    long len = RSTRING(sub)->len;
+    char *s, *sbeg, *t;
+
+    /* substring longer than string */
+    if (RSTRING(str)->len < len) return -1;
+    if (RSTRING(str)->len - pos < len) {
+	pos = RSTRING(str)->len - len;
+    }
+    sbeg = RSTRING(str)->ptr;
+    s = RSTRING(str)->ptr + pos;
+    t = RSTRING(sub)->ptr;
+    if (len) {
+	while (sbeg <= s) {
+	    if (rb_memcmp(s, t, len) == 0) {
+		return s - RSTRING(str)->ptr;
+	    }
+	    s--;
+	}
+	return -1;
+    }
+    else {
+	return pos;
+    }
+}
+
+
+/*
+ *  call-seq:
+ *     str.rindex(substring [, fixnum])   => fixnum or nil
+ *     str.rindex(fixnum [, fixnum])   => fixnum or nil
+ *     str.rindex(regexp [, fixnum])   => fixnum or nil
+ *  
+ *  Returns the index of the last occurrence of the given <i>substring</i>,
+ *  character (<i>fixnum</i>), or pattern (<i>regexp</i>) in <i>str</i>. Returns
+ *  <code>nil</code> if not found. If the second parameter is present, it
+ *  specifies the position in the string to end the search---characters beyond
+ *  this point will not be considered.
+ *     
+ *     "hello".rindex('e')             #=> 1
+ *     "hello".rindex('l')             #=> 3
+ *     "hello".rindex('a')             #=> nil
+ *     "hello".rindex(101)             #=> 1
+ *     "hello".rindex(/[aeiou]/, -2)   #=> 1
+ */
+
+static VALUE
+rb_str_rindex_m(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    VALUE sub;
+    VALUE position;
+    long pos;
+
+    if (rb_scan_args(argc, argv, "11", &sub, &position) == 2) {
+	pos = NUM2LONG(position);
+	if (pos < 0) {
+	    pos += RSTRING(str)->len;
+	    if (pos < 0) {
+		if (TYPE(sub) == T_REGEXP) {
+		    rb_backref_set(Qnil);
+		}
+		return Qnil;
+	    }
+	}
+	if (pos > RSTRING(str)->len) pos = RSTRING(str)->len;
+    }
+    else {
+	pos = RSTRING(str)->len;
+    }
+
+    switch (TYPE(sub)) {
+      case T_REGEXP:
+	if (RREGEXP(sub)->len) {
+	    pos = rb_reg_adjust_startpos(sub, str, pos, 1);
+	    pos = rb_reg_search(sub, str, pos, 1);
+	}
+	if (pos >= 0) return LONG2NUM(pos);
+	break;
+
+      case T_STRING:
+	pos = rb_str_rindex(str, sub, pos);
+	if (pos >= 0) return LONG2NUM(pos);
+	break;
+
+      case T_FIXNUM:
+      {
+	  int c = FIX2INT(sub);
+	  unsigned char *p = (unsigned char*)RSTRING(str)->ptr + pos;
+	  unsigned char *pbeg = (unsigned char*)RSTRING(str)->ptr;
+
+	  if (pos == RSTRING(str)->len) {
+	      if (pos == 0) return Qnil;
+	      --p;
+	  }
+	  while (pbeg <= p) {
+	      if (*p == c) return LONG2NUM((char*)p - RSTRING(str)->ptr);
+	      p--;
+	  }
+	  return Qnil;
+      }
+
+      default:
+	rb_raise(rb_eTypeError, "type mismatch: %s given",
+		 rb_obj_classname(sub));
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     str =~ obj   => fixnum or nil
+ *  
+ *  Match---If <i>obj</i> is a <code>Regexp</code>, use it as a pattern to match
+ *  against <i>str</i>,and returns the position the match starts, or 
+ *  <code>nil</code> if there is no match. Otherwise, invokes
+ *  <i>obj.=~</i>, passing <i>str</i> as an argument. The default
+ *  <code>=~</code> in <code>Object</code> returns <code>false</code>.
+ *     
+ *     "cat o' 9 tails" =~ /\d/   #=> 7
+ *     "cat o' 9 tails" =~ 9      #=> false
+ */
+
+static VALUE
+rb_str_match(x, y)
+    VALUE x, y;
+{
+    switch (TYPE(y)) {
+      case T_STRING:
+	rb_raise(rb_eTypeError, "type mismatch: String given");
+
+      case T_REGEXP:
+	return rb_reg_match(y, x);
+
+      default:
+	return rb_funcall(y, rb_intern("=~"), 1, x);
+    }
+}
+
+
+static VALUE get_pat _((VALUE, int));
+
+
+/*
+ *  call-seq:
+ *     str.match(pattern)   => matchdata or nil
+ *  
+ *  Converts <i>pattern</i> to a <code>Regexp</code> (if it isn't already one),
+ *  then invokes its <code>match</code> method on <i>str</i>.
+ *     
+ *     'hello'.match('(.)\1')      #=> #<MatchData:0x401b3d30>
+ *     'hello'.match('(.)\1')[0]   #=> "ll"
+ *     'hello'.match(/(.)\1/)[0]   #=> "ll"
+ *     'hello'.match('xx')         #=> nil
+ */
+
+static VALUE
+rb_str_match_m(str, re)
+    VALUE str, re;
+{
+    return rb_funcall(get_pat(re, 0), rb_intern("match"), 1, str);
+}
+
+static char
+succ_char(s)
+    char *s;
+{
+    char c = *s;
+
+    /* numerics */
+    if ('0' <= c && c < '9') (*s)++;
+    else if (c == '9') {
+	*s = '0';
+	return '1';
+    }
+    /* small alphabets */
+    else if ('a' <= c && c < 'z') (*s)++;
+    else if (c == 'z') {
+	return *s = 'a';
+    }
+    /* capital alphabets */
+    else if ('A' <= c && c < 'Z') (*s)++;
+    else if (c == 'Z') {
+	return *s = 'A';
+    }
+    return 0;
+}
+
+
+/*
+ *  call-seq:
+ *     str.succ   => new_str
+ *     str.next   => new_str
+ *  
+ *  Returns the successor to <i>str</i>. The successor is calculated by
+ *  incrementing characters starting from the rightmost alphanumeric (or
+ *  the rightmost character if there are no alphanumerics) in the
+ *  string. Incrementing a digit always results in another digit, and
+ *  incrementing a letter results in another letter of the same case.
+ *  Incrementing nonalphanumerics uses the underlying character set's
+ *  collating sequence.
+ *     
+ *  If the increment generates a ``carry,'' the character to the left of
+ *  it is incremented. This process repeats until there is no carry,
+ *  adding an additional character if necessary.
+ *     
+ *     "abcd".succ        #=> "abce"
+ *     "THX1138".succ     #=> "THX1139"
+ *     "<<koala>>".succ   #=> "<<koalb>>"
+ *     "1999zzz".succ     #=> "2000aaa"
+ *     "ZZZ9999".succ     #=> "AAAA0000"
+ *     "***".succ         #=> "**+"
+ */
+
+static VALUE
+rb_str_succ(orig)
+    VALUE orig;
+{
+    VALUE str;
+    char *sbeg, *s;
+    int c = -1;
+    long n = 0;
+
+    str = rb_str_new5(orig, RSTRING(orig)->ptr, RSTRING(orig)->len);
+    OBJ_INFECT(str, orig);
+    if (RSTRING(str)->len == 0) return str;
+
+    sbeg = RSTRING(str)->ptr; s = sbeg + RSTRING(str)->len - 1;
+
+    while (sbeg <= s) {
+	if (ISALNUM(*s)) {
+	    if ((c = succ_char(s)) == 0) break;
+	    n = s - sbeg;
+	}
+	s--;
+    }
+    if (c == -1) {		/* str contains no alnum */
+	sbeg = RSTRING(str)->ptr; s = sbeg + RSTRING(str)->len - 1;
+	c = '\001';
+	while (sbeg <= s) {
+	    if ((*s += 1) != 0) break;
+	    s--;
+	}
+    }
+    if (s < sbeg) {
+	RESIZE_CAPA(str, RSTRING(str)->len + 1);
+	s = RSTRING(str)->ptr + n;
+	memmove(s+1, s, RSTRING(str)->len - n);
+	*s = c;
+	RSTRING(str)->len += 1;
+	RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+    }
+
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.succ!   => str
+ *     str.next!   => str
+ *  
+ *  Equivalent to <code>String#succ</code>, but modifies the receiver in
+ *  place.
+ */
+
+static VALUE
+rb_str_succ_bang(str)
+    VALUE str;
+{
+    rb_str_shared_replace(str, rb_str_succ(str));
+
+    return str;
+}
+
+VALUE
+rb_str_upto(beg, end, excl)
+    VALUE beg, end;
+    int excl;
+{
+    VALUE current, after_end;
+    ID succ = rb_intern("succ");
+    int n;
+
+    StringValue(end);
+    n = rb_str_cmp(beg, end);
+    if (n > 0 || (excl && n == 0)) return beg;
+    after_end = rb_funcall(end, succ, 0, 0);
+    current = beg;
+    while (!rb_str_equal(current, after_end)) {
+	rb_yield(current);
+	if (!excl && rb_str_equal(current, end)) break;
+	current = rb_funcall(current, succ, 0, 0);
+	StringValue(current);
+	if (excl && rb_str_equal(current, end)) break;
+	StringValue(current);
+	if (RSTRING(current)->len > RSTRING(end)->len || RSTRING(current)->len == 0)
+	    break;
+    }
+
+    return beg;
+}
+
+
+/*
+ *  call-seq:
+ *     str.upto(other_str) {|s| block }   => str
+ *  
+ *  Iterates through successive values, starting at <i>str</i> and
+ *  ending at <i>other_str</i> inclusive, passing each value in turn to
+ *  the block. The <code>String#succ</code> method is used to generate
+ *  each value.
+ *     
+ *     "a8".upto("b6") {|s| print s, ' ' }
+ *     for s in "a8".."b6"
+ *       print s, ' '
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     a8 a9 b0 b1 b2 b3 b4 b5 b6
+ *     a8 a9 b0 b1 b2 b3 b4 b5 b6
+ */
+
+static VALUE
+rb_str_upto_m(beg, end)
+    VALUE beg, end;
+{
+    return rb_str_upto(beg, end, Qfalse);
+}
+
+static VALUE
+rb_str_subpat(str, re, nth)
+    VALUE str, re;
+    int nth;
+{
+    if (rb_reg_search(re, str, 0, 0) >= 0) {
+	return rb_reg_nth_match(nth, rb_backref_get());
+    }
+    return Qnil;
+}
+
+static VALUE
+rb_str_aref(str, indx)
+    VALUE str;
+    VALUE indx;
+{
+    long idx;
+
+    switch (TYPE(indx)) {
+      case T_FIXNUM:
+	idx = FIX2LONG(indx);
+
+      num_index:
+	if (idx < 0) {
+	    idx = RSTRING(str)->len + idx;
+	}
+	if (idx < 0 || RSTRING(str)->len <= idx) {
+	    return Qnil;
+	}
+	return INT2FIX(RSTRING(str)->ptr[idx] & 0xff);
+
+      case T_REGEXP:
+	return rb_str_subpat(str, indx, 0);
+
+      case T_STRING:
+	if (rb_str_index(str, indx, 0) != -1)
+	    return rb_str_dup(indx);
+	return Qnil;
+
+      default:
+	/* check if indx is Range */
+	{
+	    long beg, len;
+	    VALUE tmp;
+
+	    switch (rb_range_beg_len(indx, &beg, &len, RSTRING(str)->len, 0)) {
+	      case Qfalse:
+		break;
+	      case Qnil:
+		return Qnil;
+	      default:
+		tmp = rb_str_substr(str, beg, len);
+		OBJ_INFECT(tmp, indx);
+		return tmp;
+	    }
+	}
+	idx = NUM2LONG(indx);
+	goto num_index;
+    }
+    return Qnil;		/* not reached */
+}
+
+
+/*
+ *  call-seq:
+ *     str[fixnum]                 => fixnum or nil
+ *     str[fixnum, fixnum]         => new_str or nil
+ *     str[range]                  => new_str or nil
+ *     str[regexp]                 => new_str or nil
+ *     str[regexp, fixnum]         => new_str or nil
+ *     str[other_str]              => new_str or nil
+ *     str.slice(fixnum)           => fixnum or nil
+ *     str.slice(fixnum, fixnum)   => new_str or nil
+ *     str.slice(range)            => new_str or nil
+ *     str.slice(regexp)           => new_str or nil
+ *     str.slice(regexp, fixnum)   => new_str or nil
+ *     str.slice(other_str)        => new_str or nil
+ *  
+ *  Element Reference---If passed a single <code>Fixnum</code>, returns the code
+ *  of the character at that position. If passed two <code>Fixnum</code>
+ *  objects, returns a substring starting at the offset given by the first, and
+ *  a length given by the second. If given a range, a substring containing
+ *  characters at offsets given by the range is returned. In all three cases, if
+ *  an offset is negative, it is counted from the end of <i>str</i>. Returns
+ *  <code>nil</code> if the initial offset falls outside the string, the length
+ *  is negative, or the beginning of the range is greater than the end.
+ *     
+ *  If a <code>Regexp</code> is supplied, the matching portion of <i>str</i> is
+ *  returned. If a numeric parameter follows the regular expression, that
+ *  component of the <code>MatchData</code> is returned instead. If a
+ *  <code>String</code> is given, that string is returned if it occurs in
+ *  <i>str</i>. In both cases, <code>nil</code> is returned if there is no
+ *  match.
+ *     
+ *     a = "hello there"
+ *     a[1]                   #=> 101
+ *     a[1,3]                 #=> "ell"
+ *     a[1..3]                #=> "ell"
+ *     a[-3,2]                #=> "er"
+ *     a[-4..-2]              #=> "her"
+ *     a[12..-1]              #=> nil
+ *     a[-2..-4]              #=> ""
+ *     a[/[aeiou](.)\1/]      #=> "ell"
+ *     a[/[aeiou](.)\1/, 0]   #=> "ell"
+ *     a[/[aeiou](.)\1/, 1]   #=> "l"
+ *     a[/[aeiou](.)\1/, 2]   #=> nil
+ *     a["lo"]                #=> "lo"
+ *     a["bye"]               #=> nil
+ */
+
+static VALUE
+rb_str_aref_m(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    if (argc == 2) {
+	if (TYPE(argv[0]) == T_REGEXP) {
+	    return rb_str_subpat(str, argv[0], NUM2INT(argv[1]));
+	}
+	return rb_str_substr(str, NUM2LONG(argv[0]), NUM2LONG(argv[1]));
+    }
+    if (argc != 1) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+    }
+    return rb_str_aref(str, argv[0]);
+}
+
+static void
+rb_str_splice(str, beg, len, val)
+    VALUE str;
+    long beg, len;
+    VALUE val;
+{
+    if (len < 0) rb_raise(rb_eIndexError, "negative length %ld", len);
+
+    StringValue(val);
+    rb_str_modify(str);
+
+    if (RSTRING(str)->len < beg) {
+      out_of_range:
+	rb_raise(rb_eIndexError, "index %ld out of string", beg);
+    }
+    if (beg < 0) {
+	if (-beg > RSTRING(str)->len) {
+	    goto out_of_range;
+	}
+	beg += RSTRING(str)->len;
+    }
+    if (RSTRING(str)->len < beg + len) {
+	len = RSTRING(str)->len - beg;
+    }
+
+    if (len < RSTRING(val)->len) {
+	/* expand string */
+	RESIZE_CAPA(str, RSTRING(str)->len + RSTRING(val)->len - len + 1);
+    }
+
+    if (RSTRING(val)->len != len) {
+	memmove(RSTRING(str)->ptr + beg + RSTRING(val)->len,
+		RSTRING(str)->ptr + beg + len,
+		RSTRING(str)->len - (beg + len));
+    }
+    if (RSTRING(str)->len < beg && len < 0) {
+	MEMZERO(RSTRING(str)->ptr + RSTRING(str)->len, char, -len);
+    }
+    if (RSTRING(val)->len > 0) {
+	memmove(RSTRING(str)->ptr+beg, RSTRING(val)->ptr, RSTRING(val)->len);
+    }
+    RSTRING(str)->len += RSTRING(val)->len - len;
+    if (RSTRING(str)->ptr) {
+	RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+    }
+    OBJ_INFECT(str, val);
+}
+
+void
+rb_str_update(str, beg, len, val)
+    VALUE str;
+    long beg, len;
+    VALUE val;
+{
+    rb_str_splice(str, beg, len, val);
+}
+
+static void
+rb_str_subpat_set(str, re, nth, val)
+    VALUE str, re;
+    int nth;
+    VALUE val;
+{
+    VALUE match;
+    long start, end, len;
+
+    if (rb_reg_search(re, str, 0, 0) < 0) {
+	rb_raise(rb_eIndexError, "regexp not matched");
+    }
+    match = rb_backref_get();
+    if (nth >= RMATCH(match)->regs->num_regs) {
+      out_of_range:
+	rb_raise(rb_eIndexError, "index %d out of regexp", nth);
+    }
+    if (nth < 0) {
+	if (-nth >= RMATCH(match)->regs->num_regs) {
+	    goto out_of_range;
+	}
+	nth += RMATCH(match)->regs->num_regs;
+    }
+
+    start = RMATCH(match)->BEG(nth);
+    if (start == -1) {
+	rb_raise(rb_eIndexError, "regexp group %d not matched", nth);
+    }
+    end = RMATCH(match)->END(nth);
+    len = end - start;
+    rb_str_splice(str, start, len, val);
+}
+
+static VALUE
+rb_str_aset(str, indx, val)
+    VALUE str;
+    VALUE indx, val;
+{
+    long idx, beg;
+
+    switch (TYPE(indx)) {
+      case T_FIXNUM:
+	idx = FIX2LONG(indx);
+      num_index:
+	if (RSTRING(str)->len <= idx) {
+	  out_of_range:
+	    rb_raise(rb_eIndexError, "index %ld out of string", idx);
+	}
+	if (idx < 0) {
+	    if (-idx > RSTRING(str)->len)
+		goto out_of_range;
+	    idx += RSTRING(str)->len;
+	}
+	if (FIXNUM_P(val)) {
+	    rb_str_modify(str);
+	    if (RSTRING(str)->len == idx) {
+		RSTRING(str)->len += 1;
+		RESIZE_CAPA(str, RSTRING(str)->len);
+	    }
+	    RSTRING(str)->ptr[idx] = FIX2INT(val) & 0xff;
+	}
+	else {
+	    rb_str_splice(str, idx, 1, val);
+	}
+	return val;
+
+      case T_REGEXP:
+	rb_str_subpat_set(str, indx, 0, val);
+	return val;
+
+      case T_STRING:
+	beg = rb_str_index(str, indx, 0);
+	if (beg < 0) {
+	    rb_raise(rb_eIndexError, "string not matched");
+	}
+	rb_str_splice(str, beg, RSTRING(indx)->len, val);
+	return val;
+
+      default:
+	/* check if indx is Range */
+	{
+	    long beg, len;
+	    if (rb_range_beg_len(indx, &beg, &len, RSTRING(str)->len, 2)) {
+		rb_str_splice(str, beg, len, val);
+		return val;
+	    }
+	}
+	idx = NUM2LONG(indx);
+	goto num_index;
+    }
+}
+
+/*
+ *  call-seq:
+ *     str[fixnum] = fixnum
+ *     str[fixnum] = new_str
+ *     str[fixnum, fixnum] = new_str
+ *     str[range] = aString
+ *     str[regexp] = new_str
+ *     str[regexp, fixnum] = new_str
+ *     str[other_str] = new_str
+ *  
+ *  Element Assignment---Replaces some or all of the content of <i>str</i>. The
+ *  portion of the string affected is determined using the same criteria as
+ *  <code>String#[]</code>. If the replacement string is not the same length as
+ *  the text it is replacing, the string will be adjusted accordingly. If the
+ *  regular expression or string is used as the index doesn't match a position
+ *  in the string, <code>IndexError</code> is raised. If the regular expression
+ *  form is used, the optional second <code>Fixnum</code> allows you to specify
+ *  which portion of the match to replace (effectively using the
+ *  <code>MatchData</code> indexing rules. The forms that take a
+ *  <code>Fixnum</code> will raise an <code>IndexError</code> if the value is
+ *  out of range; the <code>Range</code> form will raise a
+ *  <code>RangeError</code>, and the <code>Regexp</code> and <code>String</code>
+ *  forms will silently ignore the assignment.
+ */
+
+static VALUE
+rb_str_aset_m(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    if (argc == 3) {
+	if (TYPE(argv[0]) == T_REGEXP) {
+	    rb_str_subpat_set(str, argv[0], NUM2INT(argv[1]), argv[2]);
+	}
+	else {
+	    rb_str_splice(str, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
+	}
+	return argv[2];
+    }
+    if (argc != 2) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
+    }
+    return rb_str_aset(str, argv[0], argv[1]);
+}
+
+/*
+ *  call-seq:
+ *     str.insert(index, other_str)   => str
+ *  
+ *  Inserts <i>other_str</i> before the character at the given
+ *  <i>index</i>, modifying <i>str</i>. Negative indices count from the
+ *  end of the string, and insert <em>after</em> the given character.
+ *  The intent is insert <i>aString</i> so that it starts at the given
+ *  <i>index</i>.
+ *     
+ *     "abcd".insert(0, 'X')    #=> "Xabcd"
+ *     "abcd".insert(3, 'X')    #=> "abcXd"
+ *     "abcd".insert(4, 'X')    #=> "abcdX"
+ *     "abcd".insert(-3, 'X')   #=> "abXcd"
+ *     "abcd".insert(-1, 'X')   #=> "abcdX"
+ */
+
+static VALUE
+rb_str_insert(str, idx, str2)
+    VALUE str, idx, str2;
+{
+    long pos = NUM2LONG(idx);
+
+    if (pos == -1) {
+	pos = RSTRING(str)->len;
+    }
+    else if (pos < 0) {
+	pos++;
+    }
+    rb_str_splice(str, pos, 0, str2);
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     str.slice!(fixnum)           => fixnum or nil
+ *     str.slice!(fixnum, fixnum)   => new_str or nil
+ *     str.slice!(range)            => new_str or nil
+ *     str.slice!(regexp)           => new_str or nil
+ *     str.slice!(other_str)        => new_str or nil
+ *  
+ *  Deletes the specified portion from <i>str</i>, and returns the portion
+ *  deleted. The forms that take a <code>Fixnum</code> will raise an
+ *  <code>IndexError</code> if the value is out of range; the <code>Range</code>
+ *  form will raise a <code>RangeError</code>, and the <code>Regexp</code> and
+ *  <code>String</code> forms will silently ignore the assignment.
+ *     
+ *     string = "this is a string"
+ *     string.slice!(2)        #=> 105
+ *     string.slice!(3..6)     #=> " is "
+ *     string.slice!(/s.*t/)   #=> "sa st"
+ *     string.slice!("r")      #=> "r"
+ *     string                  #=> "thing"
+ */
+
+static VALUE
+rb_str_slice_bang(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    VALUE result;
+    VALUE buf[3];
+    int i;
+
+    if (argc < 1 || 2 < argc) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+    }
+    for (i=0; i<argc; i++) {
+	buf[i] = argv[i];
+    }
+    buf[i] = rb_str_new(0,0);
+    result = rb_str_aref_m(argc, buf, str);
+    if (!NIL_P(result)) {
+	rb_str_aset_m(argc+1, buf, str);
+    }
+    return result;
+}
+
+static VALUE
+get_pat(pat, quote)
+    VALUE pat;
+    int quote;
+{
+    VALUE val;
+
+    switch (TYPE(pat)) {
+      case T_REGEXP:
+	return pat;
+
+      case T_STRING:
+	break;
+
+      default:
+	val = rb_check_string_type(pat);
+	if (NIL_P(val)) {
+	    Check_Type(pat, T_REGEXP);
+	}
+	pat = val;
+    }
+
+    if (quote) {
+	pat = rb_reg_quote(pat);
+    }
+
+    return rb_reg_regcomp(pat);
+}
+
+
+/*
+ *  call-seq:
+ *     str.sub!(pattern, replacement)          => str or nil
+ *     str.sub!(pattern) {|match| block }      => str or nil
+ *  
+ *  Performs the substitutions of <code>String#sub</code> in place,
+ *  returning <i>str</i>, or <code>nil</code> if no substitutions were
+ *  performed.
+ */
+
+static VALUE
+rb_str_sub_bang(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    VALUE pat, repl, match;
+    struct re_registers *regs;
+    int iter = 0;
+    int tainted = 0;
+    long plen;
+
+    if (argc == 1 && rb_block_given_p()) {
+	iter = 1;
+    }
+    else if (argc == 2) {
+	repl = argv[1];
+	StringValue(repl);
+	if (OBJ_TAINTED(repl)) tainted = 1;
+    }
+    else {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
+    }
+
+    pat = get_pat(argv[0], 1);
+    if (rb_reg_search(pat, str, 0, 0) >= 0) {
+	match = rb_backref_get();
+	regs = RMATCH(match)->regs;
+
+	if (iter) {
+	    char *p = RSTRING(str)->ptr; long len = RSTRING(str)->len;
+
+	    rb_match_busy(match);
+	    repl = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match)));
+	    str_mod_check(str, p, len);
+	    str_frozen_check(str);
+	    rb_backref_set(match);
+	}
+	else {
+	    repl = rb_reg_regsub(repl, str, regs);
+	}
+	rb_str_modify(str);
+	if (OBJ_TAINTED(repl)) tainted = 1;
+	plen = END(0) - BEG(0);
+	if (RSTRING(repl)->len > plen) {
+	    RESIZE_CAPA(str, RSTRING(str)->len + RSTRING(repl)->len - plen);
+	}
+	if (RSTRING(repl)->len != plen) {
+	    memmove(RSTRING(str)->ptr + BEG(0) + RSTRING(repl)->len,
+		    RSTRING(str)->ptr + BEG(0) + plen,
+		    RSTRING(str)->len - BEG(0) - plen);
+	}
+	memcpy(RSTRING(str)->ptr + BEG(0),
+	       RSTRING(repl)->ptr, RSTRING(repl)->len);
+	RSTRING(str)->len += RSTRING(repl)->len - plen;
+	RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+	if (tainted) OBJ_TAINT(str);
+
+	return str;
+    }
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.sub(pattern, replacement)         => new_str
+ *     str.sub(pattern) {|match| block }     => new_str
+ *  
+ *  Returns a copy of <i>str</i> with the <em>first</em> occurrence of
+ *  <i>pattern</i> replaced with either <i>replacement</i> or the value of the
+ *  block. The <i>pattern</i> will typically be a <code>Regexp</code>; if it is
+ *  a <code>String</code> then no regular expression metacharacters will be
+ *  interpreted (that is <code>/\d/</code> will match a digit, but
+ *  <code>'\d'</code> will match a backslash followed by a 'd').
+ *     
+ *  If the method call specifies <i>replacement</i>, special variables such as
+ *  <code>$&</code> will not be useful, as substitution into the string occurs
+ *  before the pattern match starts. However, the sequences <code>\1</code>,
+ *  <code>\2</code>, etc., may be used.
+ *     
+ *  In the block form, the current match string is passed in as a parameter, and
+ *  variables such as <code>$1</code>, <code>$2</code>, <code>$`</code>,
+ *  <code>$&</code>, and <code>$'</code> will be set appropriately. The value
+ *  returned by the block will be substituted for the match on each call.
+ *     
+ *  The result inherits any tainting in the original string or any supplied
+ *  replacement string.
+ *     
+ *     "hello".sub(/[aeiou]/, '*')               #=> "h*llo"
+ *     "hello".sub(/([aeiou])/, '<\1>')          #=> "h<e>llo"
+ *     "hello".sub(/./) {|s| s[0].to_s + ' ' }   #=> "104 ello"
+ */
+
+static VALUE
+rb_str_sub(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    str = rb_str_dup(str);
+    rb_str_sub_bang(argc, argv, str);
+    return str;
+}
+
+static VALUE
+str_gsub(argc, argv, str, bang)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+    int bang;
+{
+    VALUE pat, val, repl, match, dest;
+    struct re_registers *regs;
+    long beg, n;
+    long offset, blen, slen, len;
+    int iter = 0;
+    char *buf, *bp, *sp, *cp;
+    int tainted = 0;
+
+    if (argc == 1 && rb_block_given_p()) {
+	iter = 1;
+    }
+    else if (argc == 2) {
+	repl = argv[1];
+	StringValue(repl);
+	if (OBJ_TAINTED(repl)) tainted = 1;
+    }
+    else {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
+    }
+
+    pat = get_pat(argv[0], 1);
+    offset=0; n=0;
+    beg = rb_reg_search(pat, str, 0, 0);
+    if (beg < 0) {
+	if (bang) return Qnil;	/* no match, no substitution */
+	return rb_str_dup(str);
+    }
+
+    blen = RSTRING(str)->len + 30; /* len + margin */
+    dest = str_new(0, 0, blen);
+    buf = RSTRING(dest)->ptr;
+    bp = buf;
+    sp = cp = RSTRING(str)->ptr;
+    slen = RSTRING(str)->len;
+
+    rb_str_locktmp(dest);
+    while (beg >= 0) {
+	n++;
+	match = rb_backref_get();
+	regs = RMATCH(match)->regs;
+	if (iter) {
+	    rb_match_busy(match);
+	    val = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match)));
+	    str_mod_check(str, sp, slen);
+	    if (bang) str_frozen_check(str);
+	    if (val == dest) {  /* paranoid chack [ruby-dev:24827] */
+		rb_raise(rb_eRuntimeError, "block should not cheat");
+	    }
+	    rb_backref_set(match);
+	}
+	else {
+	    val = rb_reg_regsub(repl, str, regs);
+	}
+	if (OBJ_TAINTED(val)) tainted = 1;
+	len = (bp - buf) + (beg - offset) + RSTRING(val)->len + 3;
+	if (blen < len) {
+	    while (blen < len) blen *= 2;
+	    len = bp - buf;
+	    RESIZE_CAPA(dest, blen);
+	    RSTRING(dest)->len = blen;
+	    buf = RSTRING(dest)->ptr;
+	    bp = buf + len;
+	}
+	len = beg - offset;	/* copy pre-match substr */
+	memcpy(bp, cp, len);
+	bp += len;
+	memcpy(bp, RSTRING(val)->ptr, RSTRING(val)->len);
+	bp += RSTRING(val)->len;
+	offset = END(0);
+	if (BEG(0) == END(0)) {
+	    /*
+	     * Always consume at least one character of the input string
+	     * in order to prevent infinite loops.
+	     */
+	    if (RSTRING(str)->len <= END(0)) break;
+	    len = mbclen2(RSTRING(str)->ptr[END(0)], pat);
+	    memcpy(bp, RSTRING(str)->ptr+END(0), len);
+	    bp += len;
+	    offset = END(0) + len;
+	}
+	cp = RSTRING(str)->ptr + offset;
+	if (offset > RSTRING(str)->len) break;
+	beg = rb_reg_search(pat, str, offset, 0);
+    }
+    if (RSTRING(str)->len > offset) {
+	len = bp - buf;
+	if (blen - len < RSTRING(str)->len - offset) {
+	    blen = len + RSTRING(str)->len - offset;
+	    RESIZE_CAPA(dest, blen);
+	    buf = RSTRING(dest)->ptr;
+	    bp = buf + len;
+	}
+	memcpy(bp, cp, RSTRING(str)->len - offset);
+	bp += RSTRING(str)->len - offset;
+    }
+    rb_backref_set(match);
+    *bp = '\0';
+    rb_str_unlocktmp(dest);
+    if (bang) {
+	if (str_independent(str)) {
+	    free(RSTRING(str)->ptr);
+	}
+	FL_UNSET(str, STR_NOCAPA);
+	RSTRING(str)->ptr = buf;
+	RSTRING(str)->aux.capa = blen;
+	RSTRING(dest)->ptr = 0;
+	RSTRING(dest)->len = 0;
+    }
+    else {
+	RBASIC(dest)->klass = rb_obj_class(str);
+	OBJ_INFECT(dest, str);
+	str = dest;
+    }
+    RSTRING(str)->len = bp - buf;
+
+    if (tainted) OBJ_TAINT(str);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.gsub!(pattern, replacement)        => str or nil
+ *     str.gsub!(pattern) {|match| block }    => str or nil
+ *  
+ *  Performs the substitutions of <code>String#gsub</code> in place, returning
+ *  <i>str</i>, or <code>nil</code> if no substitutions were performed.
+ */
+
+static VALUE
+rb_str_gsub_bang(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    return str_gsub(argc, argv, str, 1);
+}
+
+
+/*
+ *  call-seq:
+ *     str.gsub(pattern, replacement)       => new_str
+ *     str.gsub(pattern) {|match| block }   => new_str
+ *  
+ *  Returns a copy of <i>str</i> with <em>all</em> occurrences of <i>pattern</i>
+ *  replaced with either <i>replacement</i> or the value of the block. The
+ *  <i>pattern</i> will typically be a <code>Regexp</code>; if it is a
+ *  <code>String</code> then no regular expression metacharacters will be
+ *  interpreted (that is <code>/\d/</code> will match a digit, but
+ *  <code>'\d'</code> will match a backslash followed by a 'd').
+ *     
+ *  If a string is used as the replacement, special variables from the match
+ *  (such as <code>$&</code> and <code>$1</code>) cannot be substituted into it,
+ *  as substitution into the string occurs before the pattern match
+ *  starts. However, the sequences <code>\1</code>, <code>\2</code>, and so on
+ *  may be used to interpolate successive groups in the match.
+ *     
+ *  In the block form, the current match string is passed in as a parameter, and
+ *  variables such as <code>$1</code>, <code>$2</code>, <code>$`</code>,
+ *  <code>$&</code>, and <code>$'</code> will be set appropriately. The value
+ *  returned by the block will be substituted for the match on each call.
+ *     
+ *  The result inherits any tainting in the original string or any supplied
+ *  replacement string.
+ *     
+ *     "hello".gsub(/[aeiou]/, '*')              #=> "h*ll*"
+ *     "hello".gsub(/([aeiou])/, '<\1>')         #=> "h<e>ll<o>"
+ *     "hello".gsub(/./) {|s| s[0].to_s + ' '}   #=> "104 101 108 108 111 "
+ */
+
+static VALUE
+rb_str_gsub(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    return str_gsub(argc, argv, str, 0);
+}
+
+
+/*
+ *  call-seq:
+ *     str.replace(other_str)   => str
+ *  
+ *  Replaces the contents and taintedness of <i>str</i> with the corresponding
+ *  values in <i>other_str</i>.
+ *     
+ *     s = "hello"         #=> "hello"
+ *     s.replace "world"   #=> "world"
+ */
+
+static VALUE
+rb_str_replace(str, str2)
+    VALUE str, str2;
+{
+    if (str == str2) return str;
+
+    StringValue(str2);
+    if (FL_TEST(str2, ELTS_SHARED)) {
+	if (str_independent(str)) {
+	    free(RSTRING(str)->ptr);
+	}
+	RSTRING(str)->len = RSTRING(str2)->len;
+	RSTRING(str)->ptr = RSTRING(str2)->ptr;
+	FL_SET(str, ELTS_SHARED);
+	FL_UNSET(str, STR_ASSOC);
+	RSTRING(str)->aux.shared = RSTRING(str2)->aux.shared;
+    }
+    else {
+	rb_str_modify(str);
+	rb_str_resize(str, RSTRING(str2)->len);
+	memcpy(RSTRING(str)->ptr, RSTRING(str2)->ptr, RSTRING(str2)->len);
+	if (FL_TEST(str2, STR_ASSOC)) {
+	    FL_SET(str, STR_ASSOC);
+	    RSTRING(str)->aux.shared = RSTRING(str2)->aux.shared;
+	}
+    }
+
+    OBJ_INFECT(str, str2);
+    return str;
+}
+
+static VALUE
+uscore_get()
+{
+    VALUE line;
+
+    line = rb_lastline_get();
+    if (TYPE(line) != T_STRING) {
+	rb_raise(rb_eTypeError, "$_ value need to be String (%s given)",
+		 NIL_P(line) ? "nil" : rb_obj_classname(line));
+    }
+    return line;
+}
+
+/*
+ *  call-seq:
+ *     sub!(pattern, replacement)    => $_ or nil
+ *     sub!(pattern) {|...| block }  => $_ or nil
+ *  
+ *  Equivalent to <code>$_.sub!(<i>args</i>)</code>.
+ */
+
+static VALUE
+rb_f_sub_bang(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    return rb_str_sub_bang(argc, argv, uscore_get());
+}
+
+/*
+ *  call-seq:
+ *     sub(pattern, replacement)   => $_
+ *     sub(pattern) { block }      => $_
+ *  
+ *  Equivalent to <code>$_.sub(<i>args</i>)</code>, except that
+ *  <code>$_</code> will be updated if substitution occurs.
+ */
+
+static VALUE
+rb_f_sub(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE str = rb_str_dup(uscore_get());
+
+    if (NIL_P(rb_str_sub_bang(argc, argv, str)))
+	return str;
+    rb_lastline_set(str);
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     gsub!(pattern, replacement)    => string or nil
+ *     gsub!(pattern) {|...| block }  => string or nil
+ *  
+ *  Equivalent to <code>Kernel::gsub</code>, except <code>nil</code> is
+ *  returned if <code>$_</code> is not modified.
+ *     
+ *     $_ = "quick brown fox"
+ *     gsub! /cat/, '*'   #=> nil
+ *     $_                 #=> "quick brown fox"
+ */
+
+static VALUE
+rb_f_gsub_bang(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    return rb_str_gsub_bang(argc, argv, uscore_get());
+}
+
+/*
+ *  call-seq:
+ *     gsub(pattern, replacement)    => string
+ *     gsub(pattern) {|...| block }  => string
+ *  
+ *  Equivalent to <code>$_.gsub...</code>, except that <code>$_</code>
+ *  receives the modified result.
+ *     
+ *     $_ = "quick brown fox"
+ *     gsub /[aeiou]/, '*'   #=> "q**ck br*wn f*x"
+ *     $_                    #=> "q**ck br*wn f*x"
+ */
+
+static VALUE
+rb_f_gsub(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE str = rb_str_dup(uscore_get());
+
+    if (NIL_P(rb_str_gsub_bang(argc, argv, str)))
+	return str;
+    rb_lastline_set(str);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.reverse!   => str
+ *  
+ *  Reverses <i>str</i> in place.
+ */
+
+static VALUE
+rb_str_reverse_bang(str)
+    VALUE str;
+{
+    char *s, *e;
+    char c;
+
+    if (RSTRING(str)->len > 1) {
+	rb_str_modify(str);
+	s = RSTRING(str)->ptr;
+	e = s + RSTRING(str)->len - 1;
+	while (s < e) {
+	    c = *s;
+	    *s++ = *e;
+	    *e-- = c;
+	}
+    }
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.reverse   => new_str
+ *  
+ *  Returns a new string with the characters from <i>str</i> in reverse order.
+ *     
+ *     "stressed".reverse   #=> "desserts"
+ */
+
+static VALUE
+rb_str_reverse(str)
+    VALUE str;
+{
+    VALUE obj;
+    char *s, *e, *p;
+
+    if (RSTRING(str)->len <= 1) return rb_str_dup(str);
+
+    obj = rb_str_new5(str, 0, RSTRING(str)->len);
+    s = RSTRING(str)->ptr; e = s + RSTRING(str)->len - 1;
+    p = RSTRING(obj)->ptr;
+
+    while (e >= s) {
+	*p++ = *e--;
+    }
+    OBJ_INFECT(obj, str);
+
+    return obj;
+}
+
+
+/*
+ *  call-seq:
+ *     str.include? other_str   => true or false
+ *     str.include? fixnum      => true or false
+ *  
+ *  Returns <code>true</code> if <i>str</i> contains the given string or
+ *  character.
+ *     
+ *     "hello".include? "lo"   #=> true
+ *     "hello".include? "ol"   #=> false
+ *     "hello".include? ?h     #=> true
+ */
+
+static VALUE
+rb_str_include(str, arg)
+    VALUE str, arg;
+{
+    long i;
+
+    if (FIXNUM_P(arg)) {
+	if (memchr(RSTRING(str)->ptr, FIX2INT(arg), RSTRING(str)->len))
+	    return Qtrue;
+	return Qfalse;
+    }
+
+    StringValue(arg);
+    i = rb_str_index(str, arg, 0);
+
+    if (i == -1) return Qfalse;
+    return Qtrue;
+}
+
+
+/*
+ *  call-seq:
+ *     str.to_i(base=10)   => integer
+ *  
+ *  Returns the result of interpreting leading characters in <i>str</i> as an
+ *  integer base <i>base</i> (2, 8, 10, or 16). Extraneous characters past the
+ *  end of a valid number are ignored. If there is not a valid number at the
+ *  start of <i>str</i>, <code>0</code> is returned. This method never raises an
+ *  exception.
+ *     
+ *     "12345".to_i             #=> 12345
+ *     "99 red balloons".to_i   #=> 99
+ *     "0a".to_i                #=> 0
+ *     "0a".to_i(16)            #=> 10
+ *     "hello".to_i             #=> 0
+ *     "1100101".to_i(2)        #=> 101
+ *     "1100101".to_i(8)        #=> 294977
+ *     "1100101".to_i(10)       #=> 1100101
+ *     "1100101".to_i(16)       #=> 17826049
+ */
+
+static VALUE
+rb_str_to_i(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    VALUE b;
+    int base;
+
+    rb_scan_args(argc, argv, "01", &b);
+    if (argc == 0) base = 10;
+    else base = NUM2INT(b);
+
+    if (base < 0) {
+	rb_raise(rb_eArgError, "illegal radix %d", base);
+    }
+    return rb_str_to_inum(str, base, Qfalse);
+}
+
+
+/*
+ *  call-seq:
+ *     str.to_f   => float
+ *  
+ *  Returns the result of interpreting leading characters in <i>str</i> as a
+ *  floating point number. Extraneous characters past the end of a valid number
+ *  are ignored. If there is not a valid number at the start of <i>str</i>,
+ *  <code>0.0</code> is returned. This method never raises an exception.
+ *     
+ *     "123.45e1".to_f        #=> 1234.5
+ *     "45.67 degrees".to_f   #=> 45.67
+ *     "thx1138".to_f         #=> 0.0
+ */
+
+static VALUE
+rb_str_to_f(str)
+    VALUE str;
+{
+    return rb_float_new(rb_str_to_dbl(str, Qfalse));
+}
+
+
+/*
+ *  call-seq:
+ *     str.to_s     => str
+ *     str.to_str   => str
+ *  
+ *  Returns the receiver.
+ */
+
+static VALUE
+rb_str_to_s(str)
+    VALUE str;
+{
+    if (rb_obj_class(str) != rb_cString) {
+	VALUE dup = str_alloc(rb_cString);
+	rb_str_replace(dup, str);
+	return dup;
+    }
+    return str;
+}
+
+/*
+ * call-seq:
+ *   str.inspect   => string
+ *
+ * Returns a printable version of _str_, with special characters
+ * escaped.
+ *
+ *    str = "hello"
+ *    str[3] = 8
+ *    str.inspect       #=> "hel\010o"
+ */
+
+VALUE
+rb_str_inspect(str)
+    VALUE str;
+{
+    char *p, *pend;
+    VALUE result = rb_str_buf_new2("\"");
+    char s[5];
+
+    p = RSTRING(str)->ptr; pend = p + RSTRING(str)->len;
+    while (p < pend) {
+	char c = *p++;
+	if (ismbchar(c) && p < pend) {
+	    int len = mbclen(c);
+	    rb_str_buf_cat(result, p - 1, len);
+	    p += len - 1;
+	}
+	else if (c == '"'|| c == '\\' || (c == '#' && IS_EVSTR(p, pend))) {
+	    s[0] = '\\'; s[1] = c;
+	    rb_str_buf_cat(result, s, 2);
+	}
+	else if (ISPRINT(c)) {
+	    s[0] = c;
+	    rb_str_buf_cat(result, s, 1);
+	}
+	else if (c == '\n') {
+	    s[0] = '\\'; s[1] = 'n';
+	    rb_str_buf_cat(result, s, 2);
+	}
+	else if (c == '\r') {
+	    s[0] = '\\'; s[1] = 'r';
+	    rb_str_buf_cat(result, s, 2);
+	}
+	else if (c == '\t') {
+	    s[0] = '\\'; s[1] = 't';
+	    rb_str_buf_cat(result, s, 2);
+	}
+	else if (c == '\f') {
+	    s[0] = '\\'; s[1] = 'f';
+	    rb_str_buf_cat(result, s, 2);
+	}
+	else if (c == '\013') {
+	    s[0] = '\\'; s[1] = 'v';
+	    rb_str_buf_cat(result, s, 2);
+	}
+	else if (c == '\010') {
+	    s[0] = '\\'; s[1] = 'b';
+	    rb_str_buf_cat(result, s, 2);
+	}
+	else if (c == '\007') {
+	    s[0] = '\\'; s[1] = 'a';
+	    rb_str_buf_cat(result, s, 2);
+	}
+	else if (c == 033) {
+	    s[0] = '\\'; s[1] = 'e';
+	    rb_str_buf_cat(result, s, 2);
+	}
+	else {
+	    sprintf(s, "\\%03o", c & 0377);
+	    rb_str_buf_cat2(result, s);
+	}
+    }
+    rb_str_buf_cat2(result, "\"");
+
+    OBJ_INFECT(result, str);
+    return result;
+}
+
+
+/*
+ *  call-seq:
+ *     str.dump   => new_str
+ *  
+ *  Produces a version of <i>str</i> with all nonprinting characters replaced by
+ *  <code>\nnn</code> notation and all special characters escaped.
+ */
+
+VALUE
+rb_str_dump(str)
+    VALUE str;
+{
+    long len;
+    char *p, *pend;
+    char *q, *qend;
+    VALUE result;
+
+    len = 2;			/* "" */
+    p = RSTRING(str)->ptr; pend = p + RSTRING(str)->len;
+    while (p < pend) {
+	char c = *p++;
+	switch (c) {
+	  case '"':  case '\\':
+	  case '\n': case '\r':
+	  case '\t': case '\f':
+	  case '\013': case '\010': case '\007': case '\033':
+	    len += 2;
+	    break;
+
+	  case '#':
+	    len += IS_EVSTR(p, pend) ? 2 : 1;
+	    break;
+
+	  default:
+	    if (ISPRINT(c)) {
+		len++;
+	    }
+	    else {
+		len += 4;		/* \nnn */
+	    }
+	    break;
+	}
+    }
+
+    result = rb_str_new5(str, 0, len);
+    p = RSTRING(str)->ptr; pend = p + RSTRING(str)->len;
+    q = RSTRING(result)->ptr; qend = q + len;
+
+    *q++ = '"';
+    while (p < pend) {
+	char c = *p++;
+
+	if (c == '"' || c == '\\') {
+	    *q++ = '\\';
+	    *q++ = c;
+	}
+	else if (c == '#') {
+	    if (IS_EVSTR(p, pend)) *q++ = '\\';
+	    *q++ = '#';
+	}
+	else if (ISPRINT(c)) {
+	    *q++ = c;
+	}
+	else if (c == '\n') {
+	    *q++ = '\\';
+	    *q++ = 'n';
+	}
+	else if (c == '\r') {
+	    *q++ = '\\';
+	    *q++ = 'r';
+	}
+	else if (c == '\t') {
+	    *q++ = '\\';
+	    *q++ = 't';
+	}
+	else if (c == '\f') {
+	    *q++ = '\\';
+	    *q++ = 'f';
+	}
+	else if (c == '\013') {
+	    *q++ = '\\';
+	    *q++ = 'v';
+	}
+	else if (c == '\010') {
+	    *q++ = '\\';
+	    *q++ = 'b';
+	}
+	else if (c == '\007') {
+	    *q++ = '\\';
+	    *q++ = 'a';
+	}
+	else if (c == '\033') {
+	    *q++ = '\\';
+	    *q++ = 'e';
+	}
+	else {
+	    *q++ = '\\';
+	    sprintf(q, "%03o", c&0xff);
+	    q += 3;
+	}
+    }
+    *q++ = '"';
+
+    OBJ_INFECT(result, str);
+    return result;
+}
+
+
+/*
+ *  call-seq:
+ *     str.upcase!   => str or nil
+ *  
+ *  Upcases the contents of <i>str</i>, returning <code>nil</code> if no changes
+ *  were made.
+ */
+
+static VALUE
+rb_str_upcase_bang(str)
+    VALUE str;
+{
+    char *s, *send;
+    int modify = 0;
+
+    rb_str_modify(str);
+    s = RSTRING(str)->ptr; send = s + RSTRING(str)->len;
+    while (s < send) {
+	if (ismbchar(*s)) {
+	    s+=mbclen(*s) - 1;
+	}
+	else if (ISLOWER(*s)) {
+	    *s = toupper(*s);
+	    modify = 1;
+	}
+	s++;
+    }
+
+    if (modify) return str;
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.upcase   => new_str
+ *  
+ *  Returns a copy of <i>str</i> with all lowercase letters replaced with their
+ *  uppercase counterparts. The operation is locale insensitive---only
+ *  characters ``a'' to ``z'' are affected.
+ *     
+ *     "hEllO".upcase   #=> "HELLO"
+ */
+
+static VALUE
+rb_str_upcase(str)
+    VALUE str;
+{
+    str = rb_str_dup(str);
+    rb_str_upcase_bang(str);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.downcase!   => str or nil
+ *  
+ *  Downcases the contents of <i>str</i>, returning <code>nil</code> if no
+ *  changes were made.
+ */
+
+static VALUE
+rb_str_downcase_bang(str)
+    VALUE str;
+{
+    char *s, *send;
+    int modify = 0;
+
+    rb_str_modify(str);
+    s = RSTRING(str)->ptr; send = s + RSTRING(str)->len;
+    while (s < send) {
+	if (ismbchar(*s)) {
+	    s+=mbclen(*s) - 1;
+	}
+	else if (ISUPPER(*s)) {
+	    *s = tolower(*s);
+	    modify = 1;
+	}
+	s++;
+    }
+
+    if (modify) return str;
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.downcase   => new_str
+ *  
+ *  Returns a copy of <i>str</i> with all uppercase letters replaced with their
+ *  lowercase counterparts. The operation is locale insensitive---only
+ *  characters ``A'' to ``Z'' are affected.
+ *     
+ *     "hEllO".downcase   #=> "hello"
+ */
+
+static VALUE
+rb_str_downcase(str)
+    VALUE str;
+{
+    str = rb_str_dup(str);
+    rb_str_downcase_bang(str);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.capitalize!   => str or nil
+ *  
+ *  Modifies <i>str</i> by converting the first character to uppercase and the
+ *  remainder to lowercase. Returns <code>nil</code> if no changes are made.
+ *     
+ *     a = "hello"
+ *     a.capitalize!   #=> "Hello"
+ *     a               #=> "Hello"
+ *     a.capitalize!   #=> nil
+ */
+
+static VALUE
+rb_str_capitalize_bang(str)
+    VALUE str;
+{
+    char *s, *send;
+    int modify = 0;
+
+    rb_str_modify(str);
+    if (RSTRING(str)->len == 0 || !RSTRING(str)->ptr) return Qnil;
+    s = RSTRING(str)->ptr; send = s + RSTRING(str)->len;
+    if (ISLOWER(*s)) {
+	*s = toupper(*s);
+	modify = 1;
+    }
+    while (++s < send) {
+	if (ismbchar(*s)) {
+	    s+=mbclen(*s) - 1;
+	}
+	else if (ISUPPER(*s)) {
+	    *s = tolower(*s);
+	    modify = 1;
+	}
+    }
+    if (modify) return str;
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.capitalize   => new_str
+ *  
+ *  Returns a copy of <i>str</i> with the first character converted to uppercase
+ *  and the remainder to lowercase.
+ *     
+ *     "hello".capitalize    #=> "Hello"
+ *     "HELLO".capitalize    #=> "Hello"
+ *     "123ABC".capitalize   #=> "123abc"
+ */
+
+static VALUE
+rb_str_capitalize(str)
+    VALUE str;
+{
+    str = rb_str_dup(str);
+    rb_str_capitalize_bang(str);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.swapcase!   => str or nil
+ *  
+ *  Equivalent to <code>String#swapcase</code>, but modifies the receiver in
+ *  place, returning <i>str</i>, or <code>nil</code> if no changes were made.
+ */
+
+static VALUE
+rb_str_swapcase_bang(str)
+    VALUE str;
+{
+    char *s, *send;
+    int modify = 0;
+
+    rb_str_modify(str);
+    s = RSTRING(str)->ptr; send = s + RSTRING(str)->len;
+    while (s < send) {
+	if (ismbchar(*s)) {
+	    s+=mbclen(*s) - 1;
+	}
+	else if (ISUPPER(*s)) {
+	    *s = tolower(*s);
+	    modify = 1;
+	}
+	else if (ISLOWER(*s)) {
+	    *s = toupper(*s);
+	    modify = 1;
+	}
+	s++;
+    }
+
+    if (modify) return str;
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.swapcase   => new_str
+ *  
+ *  Returns a copy of <i>str</i> with uppercase alphabetic characters converted
+ *  to lowercase and lowercase characters converted to uppercase.
+ *     
+ *     "Hello".swapcase          #=> "hELLO"
+ *     "cYbEr_PuNk11".swapcase   #=> "CyBeR_pUnK11"
+ */
+
+static VALUE
+rb_str_swapcase(str)
+    VALUE str;
+{
+    str = rb_str_dup(str);
+    rb_str_swapcase_bang(str);
+    return str;
+}
+
+typedef unsigned char *USTR;
+
+struct tr {
+    int gen, now, max;
+    char *p, *pend;
+};
+
+static int
+trnext(t)
+    struct tr *t;
+{
+    for (;;) {
+	if (!t->gen) {
+	    if (t->p == t->pend) return -1;
+	    if (t->p < t->pend - 1 && *t->p == '\\') {
+		t->p++;
+	    }
+	    t->now = *(USTR)t->p++;
+	    if (t->p < t->pend - 1 && *t->p == '-') {
+		t->p++;
+		if (t->p < t->pend) {
+		    if (t->now > *(USTR)t->p) {
+			t->p++;
+			continue;
+		    }
+		    t->gen = 1;
+		    t->max = *(USTR)t->p++;
+		}
+	    }
+	    return t->now;
+	}
+	else if (++t->now < t->max) {
+	    return t->now;
+	}
+	else {
+	    t->gen = 0;
+	    return t->max;
+	}
+    }
+}
+
+static VALUE rb_str_delete_bang _((int,VALUE*,VALUE));
+
+static VALUE
+tr_trans(str, src, repl, sflag)
+    VALUE str, src, repl;
+    int sflag;
+{
+    struct tr trsrc, trrepl;
+    int cflag = 0;
+    int trans[256];
+    int i, c, modify = 0;
+    char *s, *send;
+
+    StringValue(src);
+    StringValue(repl);
+    if (RSTRING(str)->len == 0 || !RSTRING(str)->ptr) return Qnil;
+    trsrc.p = RSTRING(src)->ptr; trsrc.pend = trsrc.p + RSTRING(src)->len;
+    if (RSTRING(src)->len >= 2 && RSTRING(src)->ptr[0] == '^') {
+	cflag++;
+	trsrc.p++;
+    }
+    if (RSTRING(repl)->len == 0) {
+	return rb_str_delete_bang(1, &src, str);
+    }
+    trrepl.p = RSTRING(repl)->ptr;
+    trrepl.pend = trrepl.p + RSTRING(repl)->len;
+    trsrc.gen = trrepl.gen = 0;
+    trsrc.now = trrepl.now = 0;
+    trsrc.max = trrepl.max = 0;
+
+    if (cflag) {
+	for (i=0; i<256; i++) {
+	    trans[i] = 1;
+	}
+	while ((c = trnext(&trsrc)) >= 0) {
+	    trans[c & 0xff] = -1;
+	}
+	while ((c = trnext(&trrepl)) >= 0)
+	    /* retrieve last replacer */;
+	for (i=0; i<256; i++) {
+	    if (trans[i] >= 0) {
+		trans[i] = trrepl.now;
+	    }
+	}
+    }
+    else {
+	int r;
+
+	for (i=0; i<256; i++) {
+	    trans[i] = -1;
+	}
+	while ((c = trnext(&trsrc)) >= 0) {
+	    r = trnext(&trrepl);
+	    if (r == -1) r = trrepl.now;
+	    trans[c & 0xff] = r;
+	}
+    }
+
+    rb_str_modify(str);
+    s = RSTRING(str)->ptr; send = s + RSTRING(str)->len;
+    if (sflag) {
+	char *t = s;
+	int c0, last = -1;
+
+	while (s < send) {
+	    c0 = *s++;
+	    if ((c = trans[c0 & 0xff]) >= 0) {
+		if (last == c) continue;
+		last = c;
+		*t++ = c & 0xff;
+		modify = 1;
+	    }
+	    else {
+		last = -1;
+		*t++ = c0;
+	    }
+	}
+	if (RSTRING(str)->len > (t - RSTRING(str)->ptr)) {
+	    RSTRING(str)->len = (t - RSTRING(str)->ptr);
+	    modify = 1;
+	    *t = '\0';
+	}
+    }
+    else {
+	while (s < send) {
+	    if ((c = trans[*s & 0xff]) >= 0) {
+		*s = c & 0xff;
+		modify = 1;
+	    }
+	    s++;
+	}
+    }
+
+    if (modify) return str;
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.tr!(from_str, to_str)   => str or nil
+ *  
+ *  Translates <i>str</i> in place, using the same rules as
+ *  <code>String#tr</code>. Returns <i>str</i>, or <code>nil</code> if no
+ *  changes were made.
+ */
+
+static VALUE
+rb_str_tr_bang(str, src, repl)
+    VALUE str, src, repl;
+{
+    return tr_trans(str, src, repl, 0);
+}
+
+
+/*
+ *  call-seq:
+ *     str.tr(from_str, to_str)   => new_str
+ *  
+ *  Returns a copy of <i>str</i> with the characters in <i>from_str</i> replaced
+ *  by the corresponding characters in <i>to_str</i>. If <i>to_str</i> is
+ *  shorter than <i>from_str</i>, it is padded with its last character. Both
+ *  strings may use the c1--c2 notation to denote ranges of characters, and
+ *  <i>from_str</i> may start with a <code>^</code>, which denotes all
+ *  characters except those listed.
+ *     
+ *     "hello".tr('aeiou', '*')    #=> "h*ll*"
+ *     "hello".tr('^aeiou', '*')   #=> "*e**o"
+ *     "hello".tr('el', 'ip')      #=> "hippo"
+ *     "hello".tr('a-y', 'b-z')    #=> "ifmmp"
+ */
+
+static VALUE
+rb_str_tr(str, src, repl)
+    VALUE str, src, repl;
+{
+    str = rb_str_dup(str);
+    tr_trans(str, src, repl, 0);
+    return str;
+}
+
+static void
+tr_setup_table(str, table, init)
+    VALUE str;
+    char table[256];
+    int init;
+{
+    char buf[256];
+    struct tr tr;
+    int i, c;
+    int cflag = 0;
+
+    tr.p = RSTRING(str)->ptr; tr.pend = tr.p + RSTRING(str)->len;
+    tr.gen = tr.now = tr.max = 0;
+    if (RSTRING(str)->len > 1 && RSTRING(str)->ptr[0] == '^') {
+	cflag = 1;
+	tr.p++;
+    }
+
+    if (init) {
+	for (i=0; i<256; i++) {
+	    table[i] = 1;
+	}
+    }
+    for (i=0; i<256; i++) {
+	buf[i] = cflag;
+    }
+    while ((c = trnext(&tr)) >= 0) {
+	buf[c & 0xff] = !cflag;
+    }
+    for (i=0; i<256; i++) {
+	table[i] = table[i] && buf[i];
+    }
+}
+
+
+/*
+ *  call-seq:
+ *     str.delete!([other_str]+>)   => str or nil
+ *  
+ *  Performs a <code>delete</code> operation in place, returning <i>str</i>, or
+ *  <code>nil</code> if <i>str</i> was not modified.
+ */
+
+static VALUE
+rb_str_delete_bang(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    char *s, *send, *t;
+    char squeez[256];
+    int modify = 0;
+    int init = 1;
+    int i;
+
+    if (argc < 1) {
+	rb_raise(rb_eArgError, "wrong number of arguments");
+    }
+    for (i=0; i<argc; i++) {
+	VALUE s = argv[i];
+
+	StringValue(s);
+	tr_setup_table(s, squeez, init);
+	init = 0;
+    }
+
+    rb_str_modify(str);
+    s = t = RSTRING(str)->ptr;
+    if (!s || RSTRING(str)->len == 0) return Qnil;
+    send = s + RSTRING(str)->len;
+    while (s < send) {
+	if (squeez[*s & 0xff])
+	    modify = 1;
+	else
+	    *t++ = *s;
+	s++;
+    }
+    *t = '\0';
+    RSTRING(str)->len = t - RSTRING(str)->ptr;
+
+    if (modify) return str;
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.delete([other_str]+)   => new_str
+ *  
+ *  Returns a copy of <i>str</i> with all characters in the intersection of its
+ *  arguments deleted. Uses the same rules for building the set of characters as
+ *  <code>String#count</code>.
+ *     
+ *     "hello".delete "l","lo"        #=> "heo"
+ *     "hello".delete "lo"            #=> "he"
+ *     "hello".delete "aeiou", "^e"   #=> "hell"
+ *     "hello".delete "ej-m"          #=> "ho"
+ */
+
+static VALUE
+rb_str_delete(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    str = rb_str_dup(str);
+    rb_str_delete_bang(argc, argv, str);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.squeeze!([other_str]*)   => str or nil
+ *  
+ *  Squeezes <i>str</i> in place, returning either <i>str</i>, or
+ *  <code>nil</code> if no changes were made.
+ */
+
+static VALUE
+rb_str_squeeze_bang(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    char squeez[256];
+    char *s, *send, *t;
+    int c, save, modify = 0;
+    int init = 1;
+    int i;
+
+    if (argc == 0) {
+	for (i=0; i<256; i++) {
+	    squeez[i] = 1;
+	}
+    }
+    else {
+	for (i=0; i<argc; i++) {
+	    VALUE s = argv[i];
+
+	    StringValue(s);
+	    tr_setup_table(s, squeez, init);
+	    init = 0;
+	}
+    }
+
+    rb_str_modify(str);
+    s = t = RSTRING(str)->ptr;
+    if (!s || RSTRING(str)->len == 0) return Qnil;
+    send = s + RSTRING(str)->len;
+    save = -1;
+    while (s < send) {
+	c = *s++ & 0xff;
+	if (c != save || !squeez[c]) {
+	    *t++ = save = c;
+	}
+    }
+    *t = '\0';
+    if (t - RSTRING(str)->ptr != RSTRING(str)->len) {
+	RSTRING(str)->len = t - RSTRING(str)->ptr;
+	modify = 1;
+    }
+
+    if (modify) return str;
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.squeeze([other_str]*)    => new_str
+ *  
+ *  Builds a set of characters from the <i>other_str</i> parameter(s) using the
+ *  procedure described for <code>String#count</code>. Returns a new string
+ *  where runs of the same character that occur in this set are replaced by a
+ *  single character. If no arguments are given, all runs of identical
+ *  characters are replaced by a single character.
+ *     
+ *     "yellow moon".squeeze                  #=> "yelow mon"
+ *     "  now   is  the".squeeze(" ")         #=> " now is the"
+ *     "putters shoot balls".squeeze("m-z")   #=> "puters shot balls"
+ */
+
+static VALUE
+rb_str_squeeze(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    str = rb_str_dup(str);
+    rb_str_squeeze_bang(argc, argv, str);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.tr_s!(from_str, to_str)   => str or nil
+ *  
+ *  Performs <code>String#tr_s</code> processing on <i>str</i> in place,
+ *  returning <i>str</i>, or <code>nil</code> if no changes were made.
+ */
+
+static VALUE
+rb_str_tr_s_bang(str, src, repl)
+    VALUE str, src, repl;
+{
+    return tr_trans(str, src, repl, 1);
+}
+
+
+/*
+ *  call-seq:
+ *     str.tr_s(from_str, to_str)   => new_str
+ *  
+ *  Processes a copy of <i>str</i> as described under <code>String#tr</code>,
+ *  then removes duplicate characters in regions that were affected by the
+ *  translation.
+ *     
+ *     "hello".tr_s('l', 'r')     #=> "hero"
+ *     "hello".tr_s('el', '*')    #=> "h*o"
+ *     "hello".tr_s('el', 'hx')   #=> "hhxo"
+ */
+
+static VALUE
+rb_str_tr_s(str, src, repl)
+    VALUE str, src, repl;
+{
+    str = rb_str_dup(str);
+    tr_trans(str, src, repl, 1);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.count([other_str]+)   => fixnum
+ *  
+ *  Each <i>other_str</i> parameter defines a set of characters to count.  The
+ *  intersection of these sets defines the characters to count in
+ *  <i>str</i>. Any <i>other_str</i> that starts with a caret (^) is
+ *  negated. The sequence c1--c2 means all characters between c1 and c2.
+ *     
+ *     a = "hello world"
+ *     a.count "lo"            #=> 5
+ *     a.count "lo", "o"       #=> 2
+ *     a.count "hello", "^l"   #=> 4
+ *     a.count "ej-m"          #=> 4
+ */
+
+static VALUE
+rb_str_count(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    char table[256];
+    char *s, *send;
+    int init = 1;
+    int i;
+
+    if (argc < 1) {
+	rb_raise(rb_eArgError, "wrong number of arguments");
+    }
+    for (i=0; i<argc; i++) {
+	VALUE s = argv[i];
+
+	StringValue(s);
+	tr_setup_table(s, table, init);
+	init = 0;
+    }
+
+    s = RSTRING(str)->ptr;
+    if (!s || RSTRING(str)->len == 0) return INT2FIX(0);
+    send = s + RSTRING(str)->len;
+    i = 0;
+    while (s < send) {
+	if (table[*s++ & 0xff]) {
+	    i++;
+	}
+    }
+    return INT2NUM(i);
+}
+
+
+/*
+ *  call-seq:
+ *     str.split(pattern=$;, [limit])   => anArray
+ *  
+ *  Divides <i>str</i> into substrings based on a delimiter, returning an array
+ *  of these substrings.
+ *     
+ *  If <i>pattern</i> is a <code>String</code>, then its contents are used as
+ *  the delimiter when splitting <i>str</i>. If <i>pattern</i> is a single
+ *  space, <i>str</i> is split on whitespace, with leading whitespace and runs
+ *  of contiguous whitespace characters ignored.
+ *     
+ *  If <i>pattern</i> is a <code>Regexp</code>, <i>str</i> is divided where the
+ *  pattern matches. Whenever the pattern matches a zero-length string,
+ *  <i>str</i> is split into individual characters.
+ *     
+ *  If <i>pattern</i> is omitted, the value of <code>$;</code> is used.  If
+ *  <code>$;</code> is <code>nil</code> (which is the default), <i>str</i> is
+ *  split on whitespace as if ` ' were specified.
+ *     
+ *  If the <i>limit</i> parameter is omitted, trailing null fields are
+ *  suppressed. If <i>limit</i> is a positive number, at most that number of
+ *  fields will be returned (if <i>limit</i> is <code>1</code>, the entire
+ *  string is returned as the only entry in an array). If negative, there is no
+ *  limit to the number of fields returned, and trailing null fields are not
+ *  suppressed.
+ *     
+ *     " now's  the time".split        #=> ["now's", "the", "time"]
+ *     " now's  the time".split(' ')   #=> ["now's", "the", "time"]
+ *     " now's  the time".split(/ /)   #=> ["", "now's", "", "the", "time"]
+ *     "1, 2.34,56, 7".split(%r{,\s*}) #=> ["1", "2.34", "56", "7"]
+ *     "hello".split(//)               #=> ["h", "e", "l", "l", "o"]
+ *     "hello".split(//, 3)            #=> ["h", "e", "llo"]
+ *     "hi mom".split(%r{\s*})         #=> ["h", "i", "m", "o", "m"]
+ *     
+ *     "mellow yellow".split("ello")   #=> ["m", "w y", "w"]
+ *     "1,2,,3,4,,".split(',')         #=> ["1", "2", "", "3", "4"]
+ *     "1,2,,3,4,,".split(',', 4)      #=> ["1", "2", "", "3,4,,"]
+ *     "1,2,,3,4,,".split(',', -4)     #=> ["1", "2", "", "3", "4", "", ""]
+ */
+
+static VALUE
+rb_str_split_m(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    VALUE spat;
+    VALUE limit;
+    int awk_split = Qfalse;
+    long beg, end, i = 0;
+    int lim = 0;
+    VALUE result, tmp;
+
+    if (rb_scan_args(argc, argv, "02", &spat, &limit) == 2) {
+	lim = NUM2INT(limit);
+	if (lim <= 0) limit = Qnil;
+	else if (lim == 1) {
+	    if (RSTRING(str)->len == 0)
+		return rb_ary_new2(0);
+	    return rb_ary_new3(1, str);
+	}
+	i = 1;
+    }
+
+    if (NIL_P(spat)) {
+	if (!NIL_P(rb_fs)) {
+	    spat = rb_fs;
+	    goto fs_set;
+	}
+	awk_split = Qtrue;
+    }
+    else {
+      fs_set:
+	if (TYPE(spat) == T_STRING && RSTRING(spat)->len == 1) {
+	    if (RSTRING(spat)->ptr[0] == ' ') {
+		awk_split = Qtrue;
+	    }
+	    else {
+		spat = rb_reg_regcomp(rb_reg_quote(spat));
+	    }
+	}
+	else {
+	    spat = get_pat(spat, 1);
+	}
+    }
+
+    result = rb_ary_new();
+    beg = 0;
+    if (awk_split) {
+	char *ptr = RSTRING(str)->ptr;
+	long len = RSTRING(str)->len;
+	char *eptr = ptr + len;
+	int skip = 1;
+
+	for (end = beg = 0; ptr<eptr; ptr++) {
+	    if (skip) {
+		if (ISSPACE(*ptr)) {
+		    beg++;
+		}
+		else {
+		    end = beg+1;
+		    skip = 0;
+		    if (!NIL_P(limit) && lim <= i) break;
+		}
+	    }
+	    else {
+		if (ISSPACE(*ptr)) {
+		    rb_ary_push(result, rb_str_substr(str, beg, end-beg));
+		    skip = 1;
+		    beg = end + 1;
+		    if (!NIL_P(limit)) ++i;
+		}
+		else {
+		    end++;
+		}
+	    }
+	}
+    }
+    else {
+	long start = beg;
+	long idx;
+	int last_null = 0;
+	struct re_registers *regs;
+
+	while ((end = rb_reg_search(spat, str, start, 0)) >= 0) {
+	    regs = RMATCH(rb_backref_get())->regs;
+	    if (start == end && BEG(0) == END(0)) {
+		if (!RSTRING(str)->ptr) {
+		    rb_ary_push(result, rb_str_new("", 0));
+		    break;
+		}
+		else if (last_null == 1) {
+		    rb_ary_push(result, rb_str_substr(str, beg, mbclen2(RSTRING(str)->ptr[beg],spat)));
+		    beg = start;
+		}
+		else {
+		    start += mbclen2(RSTRING(str)->ptr[start],spat);
+		    last_null = 1;
+		    continue;
+		}
+	    }
+	    else {
+		rb_ary_push(result, rb_str_substr(str, beg, end-beg));
+		beg = start = END(0);
+	    }
+	    last_null = 0;
+
+	    for (idx=1; idx < regs->num_regs; idx++) {
+		if (BEG(idx) == -1) continue;
+		if (BEG(idx) == END(idx))
+		    tmp = rb_str_new5(str, 0, 0);
+		else
+		    tmp = rb_str_substr(str, BEG(idx), END(idx)-BEG(idx));
+		rb_ary_push(result, tmp);
+	    }
+	    if (!NIL_P(limit) && lim <= ++i) break;
+	}
+    }
+    if (RSTRING(str)->len > 0 && (!NIL_P(limit) || RSTRING(str)->len > beg || lim < 0)) {
+	if (RSTRING(str)->len == beg)
+	    tmp = rb_str_new5(str, 0, 0);
+	else
+	    tmp = rb_str_substr(str, beg, RSTRING(str)->len-beg);
+	rb_ary_push(result, tmp);
+    }
+    if (NIL_P(limit) && lim == 0) {
+	while (RARRAY(result)->len > 0 &&
+	       RSTRING(RARRAY(result)->ptr[RARRAY(result)->len-1])->len == 0)
+	    rb_ary_pop(result);
+    }
+
+    return result;
+}
+
+VALUE
+rb_str_split(str, sep0)
+    VALUE str;
+    const char *sep0;
+{
+    VALUE sep;
+
+    StringValue(str);
+    sep = rb_str_new2(sep0);
+    return rb_str_split_m(1, &sep, str);
+}
+
+/*
+ *  call-seq:
+ *     split([pattern [, limit]])    => array
+ *  
+ *  Equivalent to <code>$_.split(<i>pattern</i>, <i>limit</i>)</code>.
+ *  See <code>String#split</code>.
+ */
+
+static VALUE
+rb_f_split(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    return rb_str_split_m(argc, argv, uscore_get());
+}
+
+/*
+ *  call-seq:
+ *     str.each(separator=$/) {|substr| block }        => str
+ *     str.each_line(separator=$/) {|substr| block }   => str
+ *  
+ *  Splits <i>str</i> using the supplied parameter as the record separator
+ *  (<code>$/</code> by default), passing each substring in turn to the supplied
+ *  block. If a zero-length record separator is supplied, the string is split on
+ *  <code>\n</code> characters, except that multiple successive newlines are
+ *  appended together.
+ *     
+ *     print "Example one\n"
+ *     "hello\nworld".each {|s| p s}
+ *     print "Example two\n"
+ *     "hello\nworld".each('l') {|s| p s}
+ *     print "Example three\n"
+ *     "hello\n\n\nworld".each('') {|s| p s}
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Example one
+ *     "hello\n"
+ *     "world"
+ *     Example two
+ *     "hel"
+ *     "l"
+ *     "o\nworl"
+ *     "d"
+ *     Example three
+ *     "hello\n\n\n"
+ *     "world"
+ */
+
+static VALUE
+rb_str_each_line(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    VALUE rs;
+    int newline;
+    char *p = RSTRING(str)->ptr, *pend = p + RSTRING(str)->len, *s;
+    char *ptr = p;
+    long len = RSTRING(str)->len, rslen;
+    VALUE line;
+
+    if (rb_scan_args(argc, argv, "01", &rs) == 0) {
+	rs = rb_rs;
+    }
+
+    if (NIL_P(rs)) {
+	rb_yield(str);
+	return str;
+    }
+    StringValue(rs);
+    rslen = RSTRING(rs)->len;
+    if (rslen == 0) {
+	newline = '\n';
+    }
+    else {
+	newline = RSTRING(rs)->ptr[rslen-1];
+    }
+
+    for (s = p, p += rslen; p < pend; p++) {
+	if (rslen == 0 && *p == '\n') {
+	    if (*++p != '\n') continue;
+	    while (*p == '\n') p++;
+	}
+	if (RSTRING(str)->ptr < p && p[-1] == newline &&
+	    (rslen <= 1 ||
+	     rb_memcmp(RSTRING(rs)->ptr, p-rslen, rslen) == 0)) {
+	    line = rb_str_new5(str, s, p - s);
+	    OBJ_INFECT(line, str);
+	    rb_yield(line);
+	    str_mod_check(str, ptr, len);
+	    s = p;
+	}
+    }
+
+    if (s != pend) {
+	if (p > pend) p = pend;
+	line = rb_str_new5(str, s, p - s);
+	OBJ_INFECT(line, str);
+	rb_yield(line);
+    }
+
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.each_byte {|fixnum| block }    => str
+ *  
+ *  Passes each byte in <i>str</i> to the given block.
+ *     
+ *     "hello".each_byte {|c| print c, ' ' }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     104 101 108 108 111
+ */
+
+static VALUE
+rb_str_each_byte(str)
+    VALUE str;
+{
+    long i;
+
+    for (i=0; i<RSTRING(str)->len; i++) {
+	rb_yield(INT2FIX(RSTRING(str)->ptr[i] & 0xff));
+    }
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.chop!   => str or nil
+ *  
+ *  Processes <i>str</i> as for <code>String#chop</code>, returning <i>str</i>,
+ *  or <code>nil</code> if <i>str</i> is the empty string.  See also
+ *  <code>String#chomp!</code>.
+ */
+
+static VALUE
+rb_str_chop_bang(str)
+    VALUE str;
+{
+    if (RSTRING(str)->len > 0) {
+	rb_str_modify(str);
+	RSTRING(str)->len--;
+	if (RSTRING(str)->ptr[RSTRING(str)->len] == '\n') {
+	    if (RSTRING(str)->len > 0 &&
+		RSTRING(str)->ptr[RSTRING(str)->len-1] == '\r') {
+		RSTRING(str)->len--;
+	    }
+	}
+	RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+	return str;
+    }
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.chop   => new_str
+ *  
+ *  Returns a new <code>String</code> with the last character removed.  If the
+ *  string ends with <code>\r\n</code>, both characters are removed. Applying
+ *  <code>chop</code> to an empty string returns an empty
+ *  string. <code>String#chomp</code> is often a safer alternative, as it leaves
+ *  the string unchanged if it doesn't end in a record separator.
+ *     
+ *     "string\r\n".chop   #=> "string"
+ *     "string\n\r".chop   #=> "string\n"
+ *     "string\n".chop     #=> "string"
+ *     "string".chop       #=> "strin"
+ *     "x".chop.chop       #=> ""
+ */
+
+static VALUE
+rb_str_chop(str)
+    VALUE str;
+{
+    str = rb_str_dup(str);
+    rb_str_chop_bang(str);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     chop!    => $_ or nil
+ *  
+ *  Equivalent to <code>$_.chop!</code>.
+ *     
+ *     a  = "now\r\n"
+ *     $_ = a
+ *     chop!   #=> "now"
+ *     chop!   #=> "no"
+ *     chop!   #=> "n"
+ *     chop!   #=> ""
+ *     chop!   #=> nil
+ *     $_      #=> ""
+ *     a       #=> ""
+ */
+
+static VALUE
+rb_f_chop_bang(str)
+    VALUE str;
+{
+    return rb_str_chop_bang(uscore_get());
+}
+
+/*
+ *  call-seq:
+ *     chop   => string
+ *  
+ *  Equivalent to <code>($_.dup).chop!</code>, except <code>nil</code>
+ *  is never returned. See <code>String#chop!</code>.
+ *     
+ *     a  =  "now\r\n"
+ *     $_ = a
+ *     chop   #=> "now"
+ *     $_     #=> "now"
+ *     chop   #=> "no"
+ *     chop   #=> "n"
+ *     chop   #=> ""
+ *     chop   #=> ""
+ *     a      #=> "now\r\n"
+ */
+
+static VALUE
+rb_f_chop()
+{
+    VALUE str = uscore_get();
+
+    if (RSTRING(str)->len > 0) {
+	str = rb_str_dup(str);
+	rb_str_chop_bang(str);
+	rb_lastline_set(str);
+    }
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.chomp!(separator=$/)   => str or nil
+ *  
+ *  Modifies <i>str</i> in place as described for <code>String#chomp</code>,
+ *  returning <i>str</i>, or <code>nil</code> if no modifications were made.
+ */
+
+static VALUE
+rb_str_chomp_bang(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    VALUE rs;
+    int newline;
+    char *p;
+    long len, rslen;
+
+    if (rb_scan_args(argc, argv, "01", &rs) == 0) {
+	len = RSTRING(str)->len;
+	if (len == 0) return Qnil;
+	p = RSTRING(str)->ptr;
+	rs = rb_rs;
+	if (rs == rb_default_rs) {
+	  smart_chomp:
+	    rb_str_modify(str);
+	    if (RSTRING(str)->ptr[len-1] == '\n') {
+		RSTRING(str)->len--;
+		if (RSTRING(str)->len > 0 &&
+		    RSTRING(str)->ptr[RSTRING(str)->len-1] == '\r') {
+		    RSTRING(str)->len--;
+		}
+	    }
+	    else if (RSTRING(str)->ptr[len-1] == '\r') {
+		RSTRING(str)->len--;
+	    }
+	    else {
+		return Qnil;
+	    }
+	    RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+	    return str;
+	}
+    }
+    if (NIL_P(rs)) return Qnil;
+    StringValue(rs);
+    len = RSTRING(str)->len;
+    if (len == 0) return Qnil;
+    p = RSTRING(str)->ptr;
+    rslen = RSTRING(rs)->len;
+    if (rslen == 0) {
+	while (len>0 && p[len-1] == '\n') {
+	    len--;
+	    if (len>0 && p[len-1] == '\r')
+		len--;
+	}
+	if (len < RSTRING(str)->len) {
+	    rb_str_modify(str);
+	    RSTRING(str)->len = len;
+	    RSTRING(str)->ptr[len] = '\0';
+	    return str;
+	}
+	return Qnil;
+    }
+    if (rslen > len) return Qnil;
+    newline = RSTRING(rs)->ptr[rslen-1];
+    if (rslen == 1 && newline == '\n')
+	goto smart_chomp;
+
+    if (p[len-1] == newline &&
+	(rslen <= 1 ||
+	 rb_memcmp(RSTRING(rs)->ptr, p+len-rslen, rslen) == 0)) {
+	rb_str_modify(str);
+	RSTRING(str)->len -= rslen;
+	RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+	return str;
+    }
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.chomp(separator=$/)   => new_str
+ *  
+ *  Returns a new <code>String</code> with the given record separator removed
+ *  from the end of <i>str</i> (if present). If <code>$/</code> has not been
+ *  changed from the default Ruby record separator, then <code>chomp</code> also
+ *  removes carriage return characters (that is it will remove <code>\n</code>,
+ *  <code>\r</code>, and <code>\r\n</code>).
+ *     
+ *     "hello".chomp            #=> "hello"
+ *     "hello\n".chomp          #=> "hello"
+ *     "hello\r\n".chomp        #=> "hello"
+ *     "hello\n\r".chomp        #=> "hello\n"
+ *     "hello\r".chomp          #=> "hello"
+ *     "hello \n there".chomp   #=> "hello \n there"
+ *     "hello".chomp("llo")     #=> "he"
+ */
+
+static VALUE
+rb_str_chomp(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    str = rb_str_dup(str);
+    rb_str_chomp_bang(argc, argv, str);
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     chomp!             => $_ or nil
+ *     chomp!(string)     => $_ or nil
+ *  
+ *  Equivalent to <code>$_.chomp!(<em>string</em>)</code>. See
+ *  <code>String#chomp!</code>
+ *     
+ *     $_ = "now\n"
+ *     chomp!       #=> "now"
+ *     $_           #=> "now"
+ *     chomp! "x"   #=> nil
+ *     $_           #=> "now"
+ */
+
+static VALUE
+rb_f_chomp_bang(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    return rb_str_chomp_bang(argc, argv, uscore_get());
+}
+
+/*
+ *  call-seq:
+ *     chomp            => $_
+ *     chomp(string)    => $_
+ *  
+ *  Equivalent to <code>$_ = $_.chomp(<em>string</em>)</code>. See
+ *  <code>String#chomp</code>.
+ *     
+ *     $_ = "now\n"
+ *     chomp         #=> "now"
+ *     $_            #=> "now"
+ *     chomp "ow"    #=> "n"
+ *     $_            #=> "n"
+ *     chomp "xxx"   #=> "n"
+ *     $_            #=> "n"
+ */
+
+static VALUE
+rb_f_chomp(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE str = uscore_get();
+    VALUE dup = rb_str_dup(str);
+
+    if (NIL_P(rb_str_chomp_bang(argc, argv, dup)))
+	return str;
+    rb_lastline_set(dup);
+    return dup;
+}
+
+
+/*
+ *  call-seq:
+ *     str.lstrip!   => self or nil
+ *  
+ *  Removes leading whitespace from <i>str</i>, returning <code>nil</code> if no
+ *  change was made. See also <code>String#rstrip!</code> and
+ *  <code>String#strip!</code>.
+ *     
+ *     "  hello  ".lstrip   #=> "hello  "
+ *     "hello".lstrip!      #=> nil
+ */
+
+static VALUE
+rb_str_lstrip_bang(str)
+    VALUE str;
+{
+    char *s, *t, *e;
+
+    s = RSTRING(str)->ptr;
+    if (!s || RSTRING(str)->len == 0) return Qnil;
+    e = t = s + RSTRING(str)->len;
+    /* remove spaces at head */
+    while (s < t && ISSPACE(*s)) s++;
+
+    if (s > RSTRING(str)->ptr) {
+	rb_str_modify(str);
+	RSTRING(str)->len = t-s;
+	memmove(RSTRING(str)->ptr, s, RSTRING(str)->len);
+	RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+	return str;
+    }
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.lstrip   => new_str
+ *  
+ *  Returns a copy of <i>str</i> with leading whitespace removed. See also
+ *  <code>String#rstrip</code> and <code>String#strip</code>.
+ *     
+ *     "  hello  ".lstrip   #=> "hello  "
+ *     "hello".lstrip       #=> "hello"
+ */
+
+static VALUE
+rb_str_lstrip(str)
+    VALUE str;
+{
+    str = rb_str_dup(str);
+    rb_str_lstrip_bang(str);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.rstrip!   => self or nil
+ *  
+ *  Removes trailing whitespace from <i>str</i>, returning <code>nil</code> if
+ *  no change was made. See also <code>String#lstrip!</code> and
+ *  <code>String#strip!</code>.
+ *     
+ *     "  hello  ".rstrip   #=> "  hello"
+ *     "hello".rstrip!      #=> nil
+ */
+
+static VALUE
+rb_str_rstrip_bang(str)
+    VALUE str;
+{
+    char *s, *t, *e;
+
+    s = RSTRING(str)->ptr;
+    if (!s || RSTRING(str)->len == 0) return Qnil;
+    e = t = s + RSTRING(str)->len;
+
+    /* remove trailing '\0's */
+    while (s < t && t[-1] == '\0') t--;
+
+    /* remove trailing spaces */
+    while (s < t && ISSPACE(*(t-1))) t--;
+
+    if (t < e) {
+	rb_str_modify(str);
+	RSTRING(str)->len = t-s;
+	RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+	return str;
+    }
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.rstrip   => new_str
+ *  
+ *  Returns a copy of <i>str</i> with trailing whitespace removed. See also
+ *  <code>String#lstrip</code> and <code>String#strip</code>.
+ *     
+ *     "  hello  ".rstrip   #=> "  hello"
+ *     "hello".rstrip       #=> "hello"
+ */
+
+static VALUE
+rb_str_rstrip(str)
+    VALUE str;
+{
+    str = rb_str_dup(str);
+    rb_str_rstrip_bang(str);
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.strip!   => str or nil
+ *  
+ *  Removes leading and trailing whitespace from <i>str</i>. Returns
+ *  <code>nil</code> if <i>str</i> was not altered.
+ */
+
+static VALUE
+rb_str_strip_bang(str)
+    VALUE str;
+{
+    VALUE l = rb_str_lstrip_bang(str);
+    VALUE r = rb_str_rstrip_bang(str);
+
+    if (NIL_P(l) && NIL_P(r)) return Qnil;
+    return str;
+}
+
+
+/*
+ *  call-seq:
+ *     str.strip   => new_str
+ *  
+ *  Returns a copy of <i>str</i> with leading and trailing whitespace removed.
+ *     
+ *     "    hello    ".strip   #=> "hello"
+ *     "\tgoodbye\r\n".strip   #=> "goodbye"
+ */
+
+static VALUE
+rb_str_strip(str)
+    VALUE str;
+{
+    str = rb_str_dup(str);
+    rb_str_strip_bang(str);
+    return str;
+}
+
+static VALUE
+scan_once(str, pat, start)
+    VALUE str, pat;
+    long *start;
+{
+    VALUE result, match;
+    struct re_registers *regs;
+    long i;
+
+    if (rb_reg_search(pat, str, *start, 0) >= 0) {
+	match = rb_backref_get();
+	regs = RMATCH(match)->regs;
+	if (BEG(0) == END(0)) {
+	    /*
+	     * Always consume at least one character of the input string
+	     */
+	    if (RSTRING(str)->len > END(0))
+		*start = END(0)+mbclen2(RSTRING(str)->ptr[END(0)],pat);
+	    else
+		*start = END(0)+1;
+	}
+	else {
+	    *start = END(0);
+	}
+	if (regs->num_regs == 1) {
+	    return rb_reg_nth_match(0, match);
+	}
+	result = rb_ary_new2(regs->num_regs);
+	for (i=1; i < regs->num_regs; i++) {
+	    rb_ary_push(result, rb_reg_nth_match(i, match));
+	}
+
+	return result;
+    }
+    return Qnil;
+}
+
+
+/*
+ *  call-seq:
+ *     str.scan(pattern)                         => array
+ *     str.scan(pattern) {|match, ...| block }   => str
+ *  
+ *  Both forms iterate through <i>str</i>, matching the pattern (which may be a
+ *  <code>Regexp</code> or a <code>String</code>). For each match, a result is
+ *  generated and either added to the result array or passed to the block. If
+ *  the pattern contains no groups, each individual result consists of the
+ *  matched string, <code>$&</code>.  If the pattern contains groups, each
+ *  individual result is itself an array containing one entry per group.
+ *     
+ *     a = "cruel world"
+ *     a.scan(/\w+/)        #=> ["cruel", "world"]
+ *     a.scan(/.../)        #=> ["cru", "el ", "wor"]
+ *     a.scan(/(...)/)      #=> [["cru"], ["el "], ["wor"]]
+ *     a.scan(/(..)(..)/)   #=> [["cr", "ue"], ["l ", "wo"]]
+ *     
+ *  And the block form:
+ *     
+ *     a.scan(/\w+/) {|w| print "<<#{w}>> " }
+ *     print "\n"
+ *     a.scan(/(.)(.)/) {|x,y| print y, x }
+ *     print "\n"
+ *     
+ *  <em>produces:</em>
+ *     
+ *     <<cruel>> <<world>>
+ *     rceu lowlr
+ */
+
+static VALUE
+rb_str_scan(str, pat)
+    VALUE str, pat;
+{
+    VALUE result;
+    long start = 0;
+    VALUE match = Qnil;
+    char *p = RSTRING(str)->ptr; long len = RSTRING(str)->len;
+
+    pat = get_pat(pat, 1);
+    if (!rb_block_given_p()) {
+	VALUE ary = rb_ary_new();
+
+	while (!NIL_P(result = scan_once(str, pat, &start))) {
+	    match = rb_backref_get();
+	    rb_ary_push(ary, result);
+	}
+	rb_backref_set(match);
+	return ary;
+    }
+
+    while (!NIL_P(result = scan_once(str, pat, &start))) {
+	match = rb_backref_get();
+	rb_match_busy(match);
+	rb_yield(result);
+	str_mod_check(str, p, len);
+	rb_backref_set(match);	/* restore $~ value */
+    }
+    rb_backref_set(match);
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     scan(pattern)                   => array
+ *     scan(pattern) {|///| block }    => $_
+ *  
+ *  Equivalent to calling <code>$_.scan</code>. See
+ *  <code>String#scan</code>.
+ */
+
+static VALUE
+rb_f_scan(self, pat)
+    VALUE self, pat;
+{
+    return rb_str_scan(uscore_get(), pat);
+}
+
+
+/*
+ *  call-seq:
+ *     str.hex   => integer
+ *  
+ *  Treats leading characters from <i>str</i> as a string of hexadecimal digits
+ *  (with an optional sign and an optional <code>0x</code>) and returns the
+ *  corresponding number. Zero is returned on error.
+ *     
+ *     "0x0a".hex     #=> 10
+ *     "-1234".hex    #=> -4660
+ *     "0".hex        #=> 0
+ *     "wombat".hex   #=> 0
+ */
+
+static VALUE
+rb_str_hex(str)
+    VALUE str;
+{
+    return rb_str_to_inum(str, 16, Qfalse);
+}
+
+
+/*
+ *  call-seq:
+ *     str.oct   => integer
+ *  
+ *  Treats leading characters of <i>str</i> as a string of octal digits (with an
+ *  optional sign) and returns the corresponding number.  Returns 0 if the
+ *  conversion fails.
+ *     
+ *     "123".oct       #=> 83
+ *     "-377".oct      #=> -255
+ *     "bad".oct       #=> 0
+ *     "0377bad".oct   #=> 255
+ */
+
+static VALUE
+rb_str_oct(str)
+    VALUE str;
+{
+    return rb_str_to_inum(str, -8, Qfalse);
+}
+
+
+/*
+ *  call-seq:
+ *     str.crypt(other_str)   => new_str
+ *  
+ *  Applies a one-way cryptographic hash to <i>str</i> by invoking the standard
+ *  library function <code>crypt</code>. The argument is the salt string, which
+ *  should be two characters long, each character drawn from
+ *  <code>[a-zA-Z0-9./]</code>.
+ */
+
+static VALUE
+rb_str_crypt(str, salt)
+    VALUE str, salt;
+{
+    extern char *crypt();
+    VALUE result;
+    char *s;
+
+    StringValue(salt);
+    if (RSTRING(salt)->len < 2)
+	rb_raise(rb_eArgError, "salt too short(need >=2 bytes)");
+
+    if (RSTRING(str)->ptr) s = RSTRING(str)->ptr;
+    else s = "";
+    result = rb_str_new2(crypt(s, RSTRING(salt)->ptr));
+    OBJ_INFECT(result, str);
+    OBJ_INFECT(result, salt);
+    return result;
+}
+
+
+/*
+ *  call-seq:
+ *     str.intern   => symbol
+ *     str.to_sym   => symbol
+ *  
+ *  Returns the <code>Symbol</code> corresponding to <i>str</i>, creating the
+ *  symbol if it did not previously exist. See <code>Symbol#id2name</code>.
+ *     
+ *     "Koala".intern         #=> :Koala
+ *     s = 'cat'.to_sym       #=> :cat
+ *     s == :cat              #=> true
+ *     s = '@cat'.to_sym      #=> :@cat
+ *     s == :@cat             #=> true
+ *
+ *  This can also be used to create symbols that cannot be represented using the
+ *  <code>:xxx</code> notation.
+ *     
+ *     'cat and dog'.to_sym   #=> :"cat and dog"
+ */
+
+VALUE
+rb_str_intern(s)
+    VALUE s;
+{
+    volatile VALUE str = s;
+    ID id;
+
+    if (!RSTRING(str)->ptr || RSTRING(str)->len == 0) {
+	rb_raise(rb_eArgError, "interning empty string");
+    }
+    if (strlen(RSTRING(str)->ptr) != RSTRING(str)->len)
+	rb_raise(rb_eArgError, "symbol string may not contain `\\0'");
+    if (OBJ_TAINTED(str) && rb_safe_level() >= 1 && !rb_sym_interned_p(str)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't intern tainted string");
+    }
+    id = rb_intern(RSTRING(str)->ptr);
+    return ID2SYM(id);
+}
+
+
+/*
+ *  call-seq:
+ *     str.sum(n=16)   => integer
+ *  
+ *  Returns a basic <em>n</em>-bit checksum of the characters in <i>str</i>,
+ *  where <em>n</em> is the optional <code>Fixnum</code> parameter, defaulting
+ *  to 16. The result is simply the sum of the binary value of each character in
+ *  <i>str</i> modulo <code>2n - 1</code>. This is not a particularly good
+ *  checksum.
+ */
+
+static VALUE
+rb_str_sum(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    VALUE vbits;
+    int bits;
+    char *ptr, *p, *pend;
+    long len;
+
+    if (rb_scan_args(argc, argv, "01", &vbits) == 0) {
+	bits = 16;
+    }
+    else bits = NUM2INT(vbits);
+
+    ptr = p = RSTRING(str)->ptr;
+    len = RSTRING(str)->len;
+    pend = p + len;
+    if (bits >= sizeof(long)*CHAR_BIT) {
+	VALUE sum = INT2FIX(0);
+
+	while (p < pend) {
+	    str_mod_check(str, ptr, len);
+	    sum = rb_funcall(sum, '+', 1, INT2FIX((unsigned char)*p));
+	    p++;
+	}
+	if (bits != 0) {
+	    VALUE mod;
+
+	    mod = rb_funcall(INT2FIX(1), rb_intern("<<"), 1, INT2FIX(bits));
+	    mod = rb_funcall(mod, '-', 1, INT2FIX(1));
+	    sum = rb_funcall(sum, '&', 1, mod);
+	}
+	return sum;
+    }
+    else {
+       unsigned long sum = 0;
+
+	while (p < pend) {
+	    str_mod_check(str, ptr, len);
+	    sum += (unsigned char)*p;
+	    p++;
+	}
+	if (bits != 0) {
+           sum &= (((unsigned long)1)<<bits)-1;
+	}
+	return rb_int2inum(sum);
+    }
+}
+
+static VALUE
+rb_str_justify(argc, argv, str, jflag)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+    char jflag;
+{
+    VALUE w;
+    long width, flen = 0;
+    VALUE res;
+    char *p, *pend, *f = " ";
+    long n;
+    VALUE pad;
+
+    rb_scan_args(argc, argv, "11", &w, &pad);
+    width = NUM2LONG(w);
+    if (argc == 2) {
+	StringValue(pad);
+	f = RSTRING(pad)->ptr;
+	flen = RSTRING(pad)->len;
+	if (flen == 0) {
+	    rb_raise(rb_eArgError, "zero width padding");
+	}
+    }
+    if (width < 0 || RSTRING(str)->len >= width) return rb_str_dup(str);
+    res = rb_str_new5(str, 0, width);
+    p = RSTRING(res)->ptr;
+    if (jflag != 'l') {
+	n = width - RSTRING(str)->len;
+	pend = p + ((jflag == 'r') ? n : n/2);
+	if (flen <= 1) {
+	    while (p < pend) {
+		*p++ = *f;
+	    }
+	}
+	else {
+	    char *q = f;
+	    while (p + flen <= pend) {
+		memcpy(p,f,flen);
+		p += flen;
+	    }
+	    while (p < pend) {
+		*p++ = *q++;
+	    }
+	}
+    }
+    memcpy(p, RSTRING(str)->ptr, RSTRING(str)->len);
+    if (jflag != 'r') {
+	p += RSTRING(str)->len; pend = RSTRING(res)->ptr + width;
+	if (flen <= 1) {
+	    while (p < pend) {
+		*p++ = *f;
+	    }
+	}
+	else {
+	    while (p + flen <= pend) {
+		memcpy(p,f,flen);
+		p += flen;
+	    }
+	    while (p < pend) {
+		*p++ = *f++;
+	    }
+	}
+    }
+    OBJ_INFECT(res, str);
+    if (flen > 0) OBJ_INFECT(res, pad);
+    return res;
+}
+
+
+/*
+ *  call-seq:
+ *     str.ljust(integer, padstr=' ')   => new_str
+ *  
+ *  If <i>integer</i> is greater than the length of <i>str</i>, returns a new
+ *  <code>String</code> of length <i>integer</i> with <i>str</i> left justified
+ *  and padded with <i>padstr</i>; otherwise, returns <i>str</i>.
+ *     
+ *     "hello".ljust(4)            #=> "hello"
+ *     "hello".ljust(20)           #=> "hello               "
+ *     "hello".ljust(20, '1234')   #=> "hello123412341234123"
+ */
+
+static VALUE
+rb_str_ljust(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    return rb_str_justify(argc, argv, str, 'l');
+}
+
+
+/*
+ *  call-seq:
+ *     str.rjust(integer, padstr=' ')   => new_str
+ *  
+ *  If <i>integer</i> is greater than the length of <i>str</i>, returns a new
+ *  <code>String</code> of length <i>integer</i> with <i>str</i> right justified
+ *  and padded with <i>padstr</i>; otherwise, returns <i>str</i>.
+ *     
+ *     "hello".rjust(4)            #=> "hello"
+ *     "hello".rjust(20)           #=> "               hello"
+ *     "hello".rjust(20, '1234')   #=> "123412341234123hello"
+ */
+
+static VALUE
+rb_str_rjust(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    return rb_str_justify(argc, argv, str, 'r');
+}
+
+
+/*
+ *  call-seq:
+ *     str.center(integer, padstr)   => new_str
+ *  
+ *  If <i>integer</i> is greater than the length of <i>str</i>, returns a new
+ *  <code>String</code> of length <i>integer</i> with <i>str</i> centered and
+ *  padded with <i>padstr</i>; otherwise, returns <i>str</i>.
+ *     
+ *     "hello".center(4)         #=> "hello"
+ *     "hello".center(20)        #=> "       hello        "
+ *     "hello".center(20, '123') #=> "1231231hello12312312"
+ */
+
+static VALUE
+rb_str_center(argc, argv, str)
+    int argc;
+    VALUE *argv;
+    VALUE str;
+{
+    return rb_str_justify(argc, argv, str, 'c');
+}
+
+void
+rb_str_setter(val, id, var)
+    VALUE val;
+    ID id;
+    VALUE *var;
+{
+    if (!NIL_P(val) && TYPE(val) != T_STRING) {
+	rb_raise(rb_eTypeError, "value of %s must be String", rb_id2name(id));
+    }
+    *var = val;
+}
+
+
+/*
+ *  A <code>String</code> object holds and manipulates an arbitrary sequence of
+ *  bytes, typically representing characters. String objects may be created
+ *  using <code>String::new</code> or as literals.
+ *     
+ *  Because of aliasing issues, users of strings should be aware of the methods
+ *  that modify the contents of a <code>String</code> object.  Typically,
+ *  methods with names ending in ``!'' modify their receiver, while those
+ *  without a ``!'' return a new <code>String</code>.  However, there are
+ *  exceptions, such as <code>String#[]=</code>.
+ *     
+ */
+
+void
+Init_String()
+{
+    rb_cString  = rb_define_class("String", rb_cObject);
+    rb_include_module(rb_cString, rb_mComparable);
+    rb_include_module(rb_cString, rb_mEnumerable);
+    rb_define_alloc_func(rb_cString, str_alloc);
+    rb_define_method(rb_cString, "initialize", rb_str_init, -1);
+    rb_define_method(rb_cString, "initialize_copy", rb_str_replace, 1);
+    rb_define_method(rb_cString, "<=>", rb_str_cmp_m, 1);
+    rb_define_method(rb_cString, "==", rb_str_equal, 1);
+    rb_define_method(rb_cString, "eql?", rb_str_eql, 1);
+    rb_define_method(rb_cString, "hash", rb_str_hash_m, 0);
+    rb_define_method(rb_cString, "casecmp", rb_str_casecmp, 1);
+    rb_define_method(rb_cString, "+", rb_str_plus, 1);
+    rb_define_method(rb_cString, "*", rb_str_times, 1);
+    rb_define_method(rb_cString, "%", rb_str_format, 1);
+    rb_define_method(rb_cString, "[]", rb_str_aref_m, -1);
+    rb_define_method(rb_cString, "[]=", rb_str_aset_m, -1);
+    rb_define_method(rb_cString, "insert", rb_str_insert, 2);
+    rb_define_method(rb_cString, "length", rb_str_length, 0);
+    rb_define_method(rb_cString, "size", rb_str_length, 0);
+    rb_define_method(rb_cString, "empty?", rb_str_empty, 0);
+    rb_define_method(rb_cString, "=~", rb_str_match, 1);
+    rb_define_method(rb_cString, "match", rb_str_match_m, 1);
+    rb_define_method(rb_cString, "succ", rb_str_succ, 0);
+    rb_define_method(rb_cString, "succ!", rb_str_succ_bang, 0);
+    rb_define_method(rb_cString, "next", rb_str_succ, 0);
+    rb_define_method(rb_cString, "next!", rb_str_succ_bang, 0);
+    rb_define_method(rb_cString, "upto", rb_str_upto_m, 1);
+    rb_define_method(rb_cString, "index", rb_str_index_m, -1);
+    rb_define_method(rb_cString, "rindex", rb_str_rindex_m, -1);
+    rb_define_method(rb_cString, "replace", rb_str_replace, 1);
+
+    rb_define_method(rb_cString, "to_i", rb_str_to_i, -1);
+    rb_define_method(rb_cString, "to_f", rb_str_to_f, 0);
+    rb_define_method(rb_cString, "to_s", rb_str_to_s, 0);
+    rb_define_method(rb_cString, "to_str", rb_str_to_s, 0);
+    rb_define_method(rb_cString, "inspect", rb_str_inspect, 0);
+    rb_define_method(rb_cString, "dump", rb_str_dump, 0);
+
+    rb_define_method(rb_cString, "upcase", rb_str_upcase, 0);
+    rb_define_method(rb_cString, "downcase", rb_str_downcase, 0);
+    rb_define_method(rb_cString, "capitalize", rb_str_capitalize, 0);
+    rb_define_method(rb_cString, "swapcase", rb_str_swapcase, 0);
+
+    rb_define_method(rb_cString, "upcase!", rb_str_upcase_bang, 0);
+    rb_define_method(rb_cString, "downcase!", rb_str_downcase_bang, 0);
+    rb_define_method(rb_cString, "capitalize!", rb_str_capitalize_bang, 0);
+    rb_define_method(rb_cString, "swapcase!", rb_str_swapcase_bang, 0);
+
+    rb_define_method(rb_cString, "hex", rb_str_hex, 0);
+    rb_define_method(rb_cString, "oct", rb_str_oct, 0);
+    rb_define_method(rb_cString, "split", rb_str_split_m, -1);
+    rb_define_method(rb_cString, "reverse", rb_str_reverse, 0);
+    rb_define_method(rb_cString, "reverse!", rb_str_reverse_bang, 0);
+    rb_define_method(rb_cString, "concat", rb_str_concat, 1);
+    rb_define_method(rb_cString, "<<", rb_str_concat, 1);
+    rb_define_method(rb_cString, "crypt", rb_str_crypt, 1);
+    rb_define_method(rb_cString, "intern", rb_str_intern, 0);
+    rb_define_method(rb_cString, "to_sym", rb_str_intern, 0);
+
+    rb_define_method(rb_cString, "include?", rb_str_include, 1);
+
+    rb_define_method(rb_cString, "scan", rb_str_scan, 1);
+
+    rb_define_method(rb_cString, "ljust", rb_str_ljust, -1);
+    rb_define_method(rb_cString, "rjust", rb_str_rjust, -1);
+    rb_define_method(rb_cString, "center", rb_str_center, -1);
+
+    rb_define_method(rb_cString, "sub", rb_str_sub, -1);
+    rb_define_method(rb_cString, "gsub", rb_str_gsub, -1);
+    rb_define_method(rb_cString, "chop", rb_str_chop, 0);
+    rb_define_method(rb_cString, "chomp", rb_str_chomp, -1);
+    rb_define_method(rb_cString, "strip", rb_str_strip, 0);
+    rb_define_method(rb_cString, "lstrip", rb_str_lstrip, 0);
+    rb_define_method(rb_cString, "rstrip", rb_str_rstrip, 0);
+
+    rb_define_method(rb_cString, "sub!", rb_str_sub_bang, -1);
+    rb_define_method(rb_cString, "gsub!", rb_str_gsub_bang, -1);
+    rb_define_method(rb_cString, "chop!", rb_str_chop_bang, 0);
+    rb_define_method(rb_cString, "chomp!", rb_str_chomp_bang, -1);
+    rb_define_method(rb_cString, "strip!", rb_str_strip_bang, 0);
+    rb_define_method(rb_cString, "lstrip!", rb_str_lstrip_bang, 0);
+    rb_define_method(rb_cString, "rstrip!", rb_str_rstrip_bang, 0);
+
+    rb_define_method(rb_cString, "tr", rb_str_tr, 2);
+    rb_define_method(rb_cString, "tr_s", rb_str_tr_s, 2);
+    rb_define_method(rb_cString, "delete", rb_str_delete, -1);
+    rb_define_method(rb_cString, "squeeze", rb_str_squeeze, -1);
+    rb_define_method(rb_cString, "count", rb_str_count, -1);
+
+    rb_define_method(rb_cString, "tr!", rb_str_tr_bang, 2);
+    rb_define_method(rb_cString, "tr_s!", rb_str_tr_s_bang, 2);
+    rb_define_method(rb_cString, "delete!", rb_str_delete_bang, -1);
+    rb_define_method(rb_cString, "squeeze!", rb_str_squeeze_bang, -1);
+
+    rb_define_method(rb_cString, "each_line", rb_str_each_line, -1);
+    rb_define_method(rb_cString, "each", rb_str_each_line, -1);
+    rb_define_method(rb_cString, "each_byte", rb_str_each_byte, 0);
+
+    rb_define_method(rb_cString, "sum", rb_str_sum, -1);
+
+    rb_define_global_function("sub", rb_f_sub, -1);
+    rb_define_global_function("gsub", rb_f_gsub, -1);
+
+    rb_define_global_function("sub!", rb_f_sub_bang, -1);
+    rb_define_global_function("gsub!", rb_f_gsub_bang, -1);
+
+    rb_define_global_function("chop", rb_f_chop, 0);
+    rb_define_global_function("chop!", rb_f_chop_bang, 0);
+
+    rb_define_global_function("chomp", rb_f_chomp, -1);
+    rb_define_global_function("chomp!", rb_f_chomp_bang, -1);
+
+    rb_define_global_function("split", rb_f_split, -1);
+    rb_define_global_function("scan", rb_f_scan, 1);
+
+    rb_define_method(rb_cString, "slice", rb_str_aref_m, -1);
+    rb_define_method(rb_cString, "slice!", rb_str_slice_bang, -1);
+
+    id_to_s = rb_intern("to_s");
+
+    rb_fs = Qnil;
+    rb_define_variable("$;", &rb_fs);
+    rb_define_variable("$-F", &rb_fs);
+}
diff --git a/ruby_1_8_6/struct.c b/ruby_1_8_6/struct.c
new file mode 100644
index 0000000000..88357dedc9
--- /dev/null
+++ b/ruby_1_8_6/struct.c
@@ -0,0 +1,917 @@
+/**********************************************************************
+
+  struct.c -
+
+  $Author$
+  $Date$
+  created at: Tue Mar 22 18:44:30 JST 1995
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "env.h"
+
+VALUE rb_cStruct;
+
+static VALUE struct_alloc _((VALUE));
+
+VALUE
+rb_struct_iv_get(c, name)
+    VALUE c;
+    char *name;
+{
+    ID id;
+
+    id = rb_intern(name);
+    for (;;) {
+	if (rb_ivar_defined(c, id))
+	    return rb_ivar_get(c, id);
+	c = RCLASS(c)->super;
+	if (c == 0 || c == rb_cStruct)
+	    return Qnil;
+    }
+}
+
+VALUE
+rb_struct_s_members(klass)
+    VALUE klass;
+{
+    VALUE members = rb_struct_iv_get(klass, "__members__");
+
+    if (NIL_P(members)) {
+	rb_bug("non-initialized struct");
+    }
+    return members;
+}
+
+VALUE
+rb_struct_members(s)
+    VALUE s;
+{
+    VALUE members = rb_struct_s_members(rb_obj_class(s));
+
+    if (RSTRUCT(s)->len != RARRAY(members)->len) {
+	rb_raise(rb_eTypeError, "struct size differs (%d required %d given)",
+		 RARRAY(members)->len, RSTRUCT(s)->len);
+    }
+    return members;
+}
+
+static VALUE
+rb_struct_s_members_m(klass)
+    VALUE klass;
+{
+    VALUE members, ary;
+    VALUE *p, *pend;
+
+    members = rb_struct_s_members(klass);
+    ary = rb_ary_new2(RARRAY(members)->len);
+    p = RARRAY(members)->ptr; pend = p + RARRAY(members)->len;
+    while (p < pend) {
+	rb_ary_push(ary, rb_str_new2(rb_id2name(SYM2ID(*p))));
+	p++;
+    }
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     struct.members    => array
+ *  
+ *  Returns an array of strings representing the names of the instance
+ *  variables.
+ *     
+ *     Customer = Struct.new(:name, :address, :zip)
+ *     joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
+ *     joe.members   #=> ["name", "address", "zip"]
+ */
+
+static VALUE
+rb_struct_members_m(obj)
+    VALUE obj;
+{
+    return rb_struct_s_members_m(rb_obj_class(obj));
+}
+
+VALUE
+rb_struct_getmember(obj, id)
+    VALUE obj;
+    ID id;
+{
+    VALUE members, slot;
+    long i;
+
+    members = rb_struct_members(obj);
+    slot = ID2SYM(id);
+    for (i=0; i<RARRAY(members)->len; i++) {
+	if (RARRAY(members)->ptr[i] == slot) {
+	    return RSTRUCT(obj)->ptr[i];
+	}
+    }
+    rb_name_error(id, "%s is not struct member", rb_id2name(id));
+    return Qnil;		/* not reached */
+}
+
+static VALUE
+rb_struct_ref(obj)
+    VALUE obj;
+{
+    return rb_struct_getmember(obj, ruby_frame->orig_func);
+}
+
+static VALUE rb_struct_ref0(obj) VALUE obj; {return RSTRUCT(obj)->ptr[0];}
+static VALUE rb_struct_ref1(obj) VALUE obj; {return RSTRUCT(obj)->ptr[1];}
+static VALUE rb_struct_ref2(obj) VALUE obj; {return RSTRUCT(obj)->ptr[2];}
+static VALUE rb_struct_ref3(obj) VALUE obj; {return RSTRUCT(obj)->ptr[3];}
+static VALUE rb_struct_ref4(obj) VALUE obj; {return RSTRUCT(obj)->ptr[4];}
+static VALUE rb_struct_ref5(obj) VALUE obj; {return RSTRUCT(obj)->ptr[5];}
+static VALUE rb_struct_ref6(obj) VALUE obj; {return RSTRUCT(obj)->ptr[6];}
+static VALUE rb_struct_ref7(obj) VALUE obj; {return RSTRUCT(obj)->ptr[7];}
+static VALUE rb_struct_ref8(obj) VALUE obj; {return RSTRUCT(obj)->ptr[8];}
+static VALUE rb_struct_ref9(obj) VALUE obj; {return RSTRUCT(obj)->ptr[9];}
+
+static VALUE (*ref_func[10])() = {
+    rb_struct_ref0,
+    rb_struct_ref1,
+    rb_struct_ref2,
+    rb_struct_ref3,
+    rb_struct_ref4,
+    rb_struct_ref5,
+    rb_struct_ref6,
+    rb_struct_ref7,
+    rb_struct_ref8,
+    rb_struct_ref9,
+};
+
+static void
+rb_struct_modify(s)
+    VALUE s;
+{
+    if (OBJ_FROZEN(s)) rb_error_frozen("Struct");
+    if (!OBJ_TAINTED(s) && rb_safe_level() >= 4)
+       rb_raise(rb_eSecurityError, "Insecure: can't modify Struct");
+}
+
+static VALUE
+rb_struct_set(obj, val)
+    VALUE obj, val;
+{
+    VALUE members, slot;
+    ID id;
+    long i;
+
+    members = rb_struct_members(obj);
+    rb_struct_modify(obj);
+    id = ruby_frame->orig_func;
+    for (i=0; i<RARRAY(members)->len; i++) {
+	slot = RARRAY(members)->ptr[i];
+	if (rb_id_attrset(SYM2ID(slot)) == id) {
+	    return RSTRUCT(obj)->ptr[i] = val;
+	}
+    }
+    rb_name_error(ruby_frame->last_func, "`%s' is not a struct member",
+		  rb_id2name(id));
+    return Qnil;		/* not reached */
+}
+
+static VALUE
+make_struct(name, members, klass)
+    VALUE name, members, klass;
+{
+    VALUE nstr;
+    ID id;
+    long i;
+
+    OBJ_FREEZE(members);
+    if (NIL_P(name)) {
+	nstr = rb_class_new(klass);
+	rb_make_metaclass(nstr, RBASIC(klass)->klass);
+	rb_class_inherited(klass, nstr);
+    }
+    else {
+	char *cname = StringValuePtr(name);
+	id = rb_intern(cname);
+	if (!rb_is_const_id(id)) {
+	    rb_name_error(id, "identifier %s needs to be constant", cname);
+	}
+	if (rb_const_defined_at(klass, id)) {
+	    rb_warn("redefining constant Struct::%s", cname);
+	    rb_mod_remove_const(klass, ID2SYM(id));
+	}
+	nstr = rb_define_class_under(klass, rb_id2name(id), klass);
+    }
+    rb_iv_set(nstr, "__size__", LONG2NUM(RARRAY(members)->len));
+    rb_iv_set(nstr, "__members__", members);
+
+    rb_define_alloc_func(nstr, struct_alloc);
+    rb_define_singleton_method(nstr, "new", rb_class_new_instance, -1);
+    rb_define_singleton_method(nstr, "[]", rb_class_new_instance, -1);
+    rb_define_singleton_method(nstr, "members", rb_struct_s_members_m, 0);
+    for (i=0; i< RARRAY(members)->len; i++) {
+	ID id = SYM2ID(RARRAY(members)->ptr[i]);
+	if (rb_is_local_id(id) || rb_is_const_id(id)) {
+	    if (i<10) {
+		rb_define_method_id(nstr, id, ref_func[i], 0);
+	    }
+	    else {
+		rb_define_method_id(nstr, id, rb_struct_ref, 0);
+	    }
+	    rb_define_method_id(nstr, rb_id_attrset(id), rb_struct_set, 1);
+	}
+    }
+
+    return nstr;
+}
+
+#ifdef HAVE_STDARG_PROTOTYPES
+#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_struct_define(const char *name, ...)
+#else
+rb_struct_define(name, va_alist)
+    const char *name;
+    va_dcl
+#endif
+{
+    va_list ar;
+    VALUE nm, ary;
+    char *mem;
+
+    if (!name) nm = Qnil;
+    else nm = rb_str_new2(name);
+    ary = rb_ary_new();
+
+    va_init_list(ar, name);
+    while ((mem = va_arg(ar, char*)) != 0) {
+	ID slot = rb_intern(mem);
+	rb_ary_push(ary, ID2SYM(slot));
+    }
+    va_end(ar);
+
+    return make_struct(nm, ary, rb_cStruct);
+}
+
+/*
+ *  call-seq:
+ *     Struct.new( [aString] [, aSym]+> )    => StructClass
+ *     StructClass.new(arg, ...)             => obj
+ *     StructClass[arg, ...]                 => obj
+ *
+ *  Creates a new class, named by <i>aString</i>, containing accessor
+ *  methods for the given symbols. If the name <i>aString</i> is
+ *  omitted, an anonymous structure class will be created. Otherwise,
+ *  the name of this struct will appear as a constant in class
+ *  <code>Struct</code>, so it must be unique for all
+ *  <code>Struct</code>s in the system and should start with a capital
+ *  letter. Assigning a structure class to a constant effectively gives
+ *  the class the name of the constant.
+ *     
+ *  <code>Struct::new</code> returns a new <code>Class</code> object,
+ *  which can then be used to create specific instances of the new
+ *  structure. The number of actual parameters must be
+ *  less than or equal to the number of attributes defined for this
+ *  class; unset parameters default to \nil{}.  Passing too many
+ *  parameters will raise an \E{ArgumentError}.
+ *
+ *  The remaining methods listed in this section (class and instance)
+ *  are defined for this generated class. 
+ *     
+ *     # Create a structure with a name in Struct
+ *     Struct.new("Customer", :name, :address)    #=> Struct::Customer
+ *     Struct::Customer.new("Dave", "123 Main")   #=> #<Struct::Customer name="Dave", address="123 Main">
+ *     
+ *     # Create a structure named by its constant
+ *     Customer = Struct.new(:name, :address)     #=> Customer
+ *     Customer.new("Dave", "123 Main")           #=> #<Customer name="Dave", address="123 Main">
+ */
+
+static VALUE
+rb_struct_s_def(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE name, rest;
+    long i;
+    VALUE st;
+    ID id;
+
+    rb_scan_args(argc, argv, "1*", &name, &rest);
+    for (i=0; i<RARRAY(rest)->len; i++) {
+	id = rb_to_id(RARRAY(rest)->ptr[i]);
+	RARRAY(rest)->ptr[i] = ID2SYM(id);
+    }
+    if (!NIL_P(name)) {
+	VALUE tmp = rb_check_string_type(name);
+
+	if (NIL_P(tmp)) {
+	    id = rb_to_id(name);
+	    rb_ary_unshift(rest, ID2SYM(id));
+	    name = Qnil;
+	}
+    }
+    st = make_struct(name, rest, klass);
+    if (rb_block_given_p()) {
+	rb_mod_module_eval(0, 0, st);
+    }
+
+    return st;
+}
+
+/*
+ */
+
+static VALUE
+rb_struct_initialize(self, values)
+    VALUE self, values;
+{
+    VALUE klass = rb_obj_class(self);
+    VALUE size;
+    long n;
+
+    rb_struct_modify(self);
+    size = rb_struct_iv_get(klass, "__size__");
+    n = FIX2LONG(size);
+    if (n < RARRAY(values)->len) {
+	rb_raise(rb_eArgError, "struct size differs");
+    }
+    MEMCPY(RSTRUCT(self)->ptr, RARRAY(values)->ptr, VALUE, RARRAY(values)->len);
+    if (n > RARRAY(values)->len) {
+	rb_mem_clear(RSTRUCT(self)->ptr+RARRAY(values)->len,
+		     n-RARRAY(values)->len);
+    }
+    return Qnil;
+}
+
+static VALUE
+struct_alloc(klass)
+    VALUE klass;
+{
+    VALUE size;
+    long n;
+    NEWOBJ(st, struct RStruct);
+    OBJSETUP(st, klass, T_STRUCT);
+
+    size = rb_struct_iv_get(klass, "__size__");
+    n = FIX2LONG(size);
+
+    st->ptr = ALLOC_N(VALUE, n);
+    rb_mem_clear(st->ptr, n);
+    st->len = n;
+
+    return (VALUE)st;
+}
+
+VALUE
+rb_struct_alloc(klass, values)
+    VALUE klass, values;
+{
+    return rb_class_new_instance(RARRAY(values)->len, RARRAY(values)->ptr, klass);
+}
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_struct_new(VALUE klass, ...)
+#else
+rb_struct_new(klass, va_alist)
+    VALUE klass;
+    va_dcl
+#endif
+{
+    VALUE sz, *mem;
+    long size, i;
+    va_list args;
+
+    sz = rb_struct_iv_get(klass, "__size__");
+    size = FIX2LONG(sz); 
+    mem = ALLOCA_N(VALUE, size);
+    va_init_list(args, klass);
+    for (i=0; i<size; i++) {
+	mem[i] = va_arg(args, VALUE);
+    }
+    va_end(args);
+
+    return rb_class_new_instance(size, mem, klass);
+}
+
+/*
+ *  call-seq:
+ *     struct.each {|obj| block }  => struct
+ *  
+ *  Calls <i>block</i> once for each instance variable, passing the
+ *  value as a parameter.
+ *     
+ *     Customer = Struct.new(:name, :address, :zip)
+ *     joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
+ *     joe.each {|x| puts(x) }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     Joe Smith
+ *     123 Maple, Anytown NC
+ *     12345
+ */
+
+static VALUE
+rb_struct_each(s)
+    VALUE s;
+{
+    long i;
+
+    for (i=0; i<RSTRUCT(s)->len; i++) {
+	rb_yield(RSTRUCT(s)->ptr[i]);
+    }
+    return s;
+}
+
+/*
+ *  call-seq:
+ *     struct.each_pair {|sym, obj| block }     => struct
+ *  
+ *  Calls <i>block</i> once for each instance variable, passing the name
+ *  (as a symbol) and the value as parameters.
+ *     
+ *     Customer = Struct.new(:name, :address, :zip)
+ *     joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
+ *     joe.each_pair {|name, value| puts("#{name} => #{value}") }
+ *     
+ *  <em>produces:</em>
+ *     
+ *     name => Joe Smith
+ *     address => 123 Maple, Anytown NC
+ *     zip => 12345
+ */
+
+static VALUE
+rb_struct_each_pair(s)
+    VALUE s;
+{
+    VALUE members;
+    long i;
+
+    members = rb_struct_members(s);
+    for (i=0; i<RSTRUCT(s)->len; i++) {
+	rb_yield_values(2, rb_ary_entry(members, i), RSTRUCT(s)->ptr[i]);
+    }
+    return s;
+}
+
+static VALUE
+inspect_struct(s)
+    VALUE s;
+{
+    char *cname = rb_class2name(rb_obj_class(s));
+    VALUE str, members;
+    long i;
+
+    members = rb_struct_members(s);
+    str = rb_str_buf_new2("#<struct ");
+    rb_str_cat2(str, cname);
+    rb_str_cat2(str, " ");
+    for (i=0; i<RSTRUCT(s)->len; i++) {
+	VALUE slot;
+	ID id;
+	char *p;
+
+	if (i > 0) {
+	    rb_str_cat2(str, ", ");
+	}
+	slot = RARRAY(members)->ptr[i];
+	id = SYM2ID(slot);
+	if (rb_is_local_id(id) || rb_is_const_id(id)) {
+	    p = rb_id2name(id);
+	    rb_str_cat2(str, p);
+	}
+	else {
+	    rb_str_append(str, rb_inspect(slot));
+	}
+	rb_str_cat2(str, "=");
+	rb_str_append(str, rb_inspect(RSTRUCT(s)->ptr[i]));
+    }
+    rb_str_cat2(str, ">");
+    OBJ_INFECT(str, s);
+
+    return str;
+}
+
+/*
+ * call-seq:
+ *   struct.to_s      => string
+ *   struct.inspect   => string
+ *
+ * Describe the contents of this struct in a string.
+ */
+
+static VALUE
+rb_struct_inspect(s)
+    VALUE s;
+{
+    if (rb_inspecting_p(s)) {
+	char *cname = rb_class2name(rb_obj_class(s));
+	size_t len = strlen(cname) + 14;
+	VALUE str = rb_str_new(0, len);
+
+	snprintf(RSTRING(str)->ptr, len+1, "#<struct %s:...>", cname);
+	RSTRING(str)->len = strlen(RSTRING(str)->ptr);
+	return str;
+    }
+    return rb_protect_inspect(inspect_struct, s, 0);
+}
+
+/*
+ *  call-seq:
+ *     struct.to_a     => array
+ *     struct.values   => array
+ *  
+ *  Returns the values for this instance as an array.
+ *     
+ *     Customer = Struct.new(:name, :address, :zip)
+ *     joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
+ *     joe.to_a[1]   #=> "123 Maple, Anytown NC"
+ */
+
+static VALUE
+rb_struct_to_a(s)
+    VALUE s;
+{
+    return rb_ary_new4(RSTRUCT(s)->len, RSTRUCT(s)->ptr);
+}
+
+/* :nodoc: */
+static VALUE
+rb_struct_init_copy(copy, s)
+    VALUE copy, s;
+{
+    if (copy == s) return copy;
+    rb_check_frozen(copy);
+    if (!rb_obj_is_instance_of(s, rb_obj_class(copy))) {
+	rb_raise(rb_eTypeError, "wrong argument class");
+    }
+    if (RSTRUCT(copy)->len != RSTRUCT(s)->len) {
+	rb_raise(rb_eTypeError, "struct size mismatch");
+    }
+    MEMCPY(RSTRUCT(copy)->ptr, RSTRUCT(s)->ptr, VALUE, RSTRUCT(copy)->len);
+
+    return copy;
+}
+
+static VALUE
+rb_struct_aref_id(s, id)
+    VALUE s;
+    ID id;
+{
+    VALUE members;
+    long i, len;
+
+    members = rb_struct_members(s);
+    len = RARRAY(members)->len;
+    for (i=0; i<len; i++) {
+	if (SYM2ID(RARRAY(members)->ptr[i]) == id) {
+	    return RSTRUCT(s)->ptr[i];
+	}
+    }
+    rb_name_error(id, "no member '%s' in struct", rb_id2name(id));
+    return Qnil;		/* not reached */
+}
+
+/*
+ *  call-seq:
+ *     struct[symbol]    => anObject
+ *     struct[fixnum]    => anObject 
+ *  
+ *  Attribute Reference---Returns the value of the instance variable
+ *  named by <i>symbol</i>, or indexed (0..length-1) by
+ *  <i>fixnum</i>. Will raise <code>NameError</code> if the named
+ *  variable does not exist, or <code>IndexError</code> if the index is
+ *  out of range.
+ *     
+ *     Customer = Struct.new(:name, :address, :zip)
+ *     joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
+ *     
+ *     joe["name"]   #=> "Joe Smith"
+ *     joe[:name]    #=> "Joe Smith"
+ *     joe[0]        #=> "Joe Smith"
+ */
+
+VALUE
+rb_struct_aref(s, idx)
+    VALUE s, idx;
+{
+    long i;
+
+    if (TYPE(idx) == T_STRING || TYPE(idx) == T_SYMBOL) {
+	return rb_struct_aref_id(s, rb_to_id(idx));
+    }
+
+    i = NUM2LONG(idx);
+    if (i < 0) i = RSTRUCT(s)->len + i;
+    if (i < 0)
+        rb_raise(rb_eIndexError, "offset %ld too small for struct(size:%ld)",
+		 i, RSTRUCT(s)->len);
+    if (RSTRUCT(s)->len <= i)
+        rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)",
+		 i, RSTRUCT(s)->len);
+    return RSTRUCT(s)->ptr[i];
+}
+
+static VALUE
+rb_struct_aset_id(s, id, val)
+    VALUE s, val;
+    ID id;
+{
+    VALUE members;
+    long i, len;
+
+    members = rb_struct_members(s);
+    rb_struct_modify(s);
+    len = RARRAY(members)->len;
+    if (RSTRUCT(s)->len != RARRAY(members)->len) {
+	rb_raise(rb_eTypeError, "struct size differs (%d required %d given)",
+		 RARRAY(members)->len, RSTRUCT(s)->len);
+    }
+    for (i=0; i<len; i++) {
+	if (SYM2ID(RARRAY(members)->ptr[i]) == id) {
+	    RSTRUCT(s)->ptr[i] = val;
+	    return val;
+	}
+    }
+    rb_name_error(id, "no member '%s' in struct", rb_id2name(id));
+}
+
+/*
+ *  call-seq:
+ *     struct[symbol] = obj    => obj
+ *     struct[fixnum] = obj    => obj
+ *  
+ *  Attribute Assignment---Assigns to the instance variable named by
+ *  <i>symbol</i> or <i>fixnum</i> the value <i>obj</i> and
+ *  returns it. Will raise a <code>NameError</code> if the named
+ *  variable does not exist, or an <code>IndexError</code> if the index
+ *  is out of range.
+ *     
+ *     Customer = Struct.new(:name, :address, :zip)
+ *     joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
+ *     
+ *     joe["name"] = "Luke"
+ *     joe[:zip]   = "90210"
+ *     
+ *     joe.name   #=> "Luke"
+ *     joe.zip    #=> "90210"
+ */
+
+VALUE
+rb_struct_aset(s, idx, val)
+    VALUE s, idx, val;
+{
+    long i;
+
+    if (TYPE(idx) == T_STRING || TYPE(idx) == T_SYMBOL) {
+	return rb_struct_aset_id(s, rb_to_id(idx), val);
+    }
+
+    i = NUM2LONG(idx);
+    if (i < 0) i = RSTRUCT(s)->len + i;
+    if (i < 0) {
+        rb_raise(rb_eIndexError, "offset %ld too small for struct(size:%ld)",
+		 i, RSTRUCT(s)->len);
+    }
+    if (RSTRUCT(s)->len <= i) {
+        rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)",
+		 i, RSTRUCT(s)->len);
+    }
+    rb_struct_modify(s);
+    return RSTRUCT(s)->ptr[i] = val;
+}
+
+static VALUE struct_entry _((VALUE, long));
+static VALUE
+struct_entry(s, n)
+    VALUE s;
+    long n;
+{
+    return rb_struct_aref(s, LONG2NUM(n));
+}
+
+/* 
+ * call-seq:
+ *   struct.values_at(selector,... )  => an_array
+ *
+ *   Returns an array containing the elements in
+ *   _self_ corresponding to the given selector(s). The selectors
+ *   may be either integer indices or ranges. 
+ *   See also </code>.select<code>.
+ * 
+ *      a = %w{ a b c d e f }
+ *      a.values_at(1, 3, 5)
+ *      a.values_at(1, 3, 5, 7)
+ *      a.values_at(-1, -3, -5, -7)
+ *      a.values_at(1..3, 2...5)
+ */
+
+static VALUE
+rb_struct_values_at(argc, argv, s)
+    int argc;
+    VALUE *argv;
+    VALUE s;
+{
+    return rb_values_at(s, RSTRUCT(s)->len, argc, argv, struct_entry);
+}
+
+/*
+ *  call-seq:
+ *     struct.select {|i| block }    => array
+ *  
+ *  Invokes the block passing in successive elements from
+ *  <i>struct</i>, returning an array containing those elements
+ *  for which the block returns a true value (equivalent to
+ *  <code>Enumerable#select</code>).
+ *     
+ *     Lots = Struct.new(:a, :b, :c, :d, :e, :f)
+ *     l = Lots.new(11, 22, 33, 44, 55, 66)
+ *     l.select {|v| (v % 2).zero? }   #=> [22, 44, 66]
+ */
+
+static VALUE
+rb_struct_select(argc, argv, s)
+    int argc;
+    VALUE *argv;
+    VALUE s;
+{
+    VALUE result;
+    long i;
+
+    if (argc > 0) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+    }
+    result = rb_ary_new();
+    for (i = 0; i < RSTRUCT(s)->len; i++) {
+	if (RTEST(rb_yield(RSTRUCT(s)->ptr[i]))) {
+	    rb_ary_push(result, RSTRUCT(s)->ptr[i]);
+	}
+    }
+
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     struct == other_struct     => true or false
+ *  
+ *  Equality---Returns <code>true</code> if <i>other_struct</i> is
+ *  equal to this one: they must be of the same class as generated by
+ *  <code>Struct::new</code>, and the values of all instance variables
+ *  must be equal (according to <code>Object#==</code>).
+ *     
+ *     Customer = Struct.new(:name, :address, :zip)
+ *     joe   = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
+ *     joejr = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
+ *     jane  = Customer.new("Jane Doe", "456 Elm, Anytown NC", 12345)
+ *     joe == joejr   #=> true
+ *     joe == jane    #=> false
+ */
+
+static VALUE
+rb_struct_equal(s, s2)
+    VALUE s, s2;
+{
+    long i;
+
+    if (s == s2) return Qtrue;
+    if (TYPE(s2) != T_STRUCT) return Qfalse;
+    if (rb_obj_class(s) != rb_obj_class(s2)) return Qfalse;
+    if (RSTRUCT(s)->len != RSTRUCT(s2)->len) {
+	rb_bug("inconsistent struct"); /* should never happen */
+    }
+
+    for (i=0; i<RSTRUCT(s)->len; i++) {
+	if (!rb_equal(RSTRUCT(s)->ptr[i], RSTRUCT(s2)->ptr[i])) return Qfalse;
+    }
+    return Qtrue;
+}
+
+/*
+ * call-seq:
+ *   struct.hash   => fixnum
+ *
+ * Return a hash value based on this struct's contents.
+ */
+
+static VALUE
+rb_struct_hash(s)
+    VALUE s;
+{
+    long i, h;
+    VALUE n;
+
+    h = rb_hash(rb_obj_class(s));
+    for (i = 0; i < RSTRUCT(s)->len; i++) {
+	h = (h << 1) | (h<0 ? 1 : 0);
+	n = rb_hash(RSTRUCT(s)->ptr[i]);
+	h ^= NUM2LONG(n);
+    }
+    return LONG2FIX(h);
+}
+
+/*
+ * code-seq:
+ *   struct.eql?(other)   => true or false
+ *
+ * Two structures are equal if they are the same object, or if all their
+ * fields are equal (using <code>eql?</code>).
+ */
+
+static VALUE
+rb_struct_eql(s, s2)
+    VALUE s, s2;
+{
+    long i;
+
+    if (s == s2) return Qtrue;
+    if (TYPE(s2) != T_STRUCT) return Qfalse;
+    if (rb_obj_class(s) != rb_obj_class(s2)) return Qfalse;
+    if (RSTRUCT(s)->len != RSTRUCT(s2)->len) {
+	rb_bug("inconsistent struct"); /* should never happen */
+    }
+
+    for (i=0; i<RSTRUCT(s)->len; i++) {
+	if (!rb_eql(RSTRUCT(s)->ptr[i], RSTRUCT(s2)->ptr[i])) return Qfalse;
+    }
+    return Qtrue;
+}
+
+/*
+ *  call-seq:
+ *     struct.length    => fixnum
+ *     struct.size      => fixnum
+ *  
+ *  Returns the number of instance variables.
+ *     
+ *     Customer = Struct.new(:name, :address, :zip)
+ *     joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
+ *     joe.length   #=> 3
+ */
+
+static VALUE
+rb_struct_size(s)
+    VALUE s;
+{
+    return LONG2FIX(RSTRUCT(s)->len);
+}
+
+/*
+ *  A <code>Struct</code> is a convenient way to bundle a number of
+ *  attributes together, using accessor methods, without having to write
+ *  an explicit class.
+ *     
+ *  The <code>Struct</code> class is a generator of specific classes,
+ *  each one of which is defined to hold a set of variables and their
+ *  accessors. In these examples, we'll call the generated class
+ *  ``<i>Customer</i>Class,'' and we'll show an example instance of that
+ *  class as ``<i>Customer</i>Inst.''
+ *     
+ *  In the descriptions that follow, the parameter <i>symbol</i> refers
+ *  to a symbol, which is either a quoted string or a
+ *  <code>Symbol</code> (such as <code>:name</code>).
+ */
+void
+Init_Struct()
+{
+    rb_cStruct = rb_define_class("Struct", rb_cObject);
+    rb_include_module(rb_cStruct, rb_mEnumerable);
+
+    rb_undef_alloc_func(rb_cStruct);
+    rb_define_singleton_method(rb_cStruct, "new", rb_struct_s_def, -1);
+
+    rb_define_method(rb_cStruct, "initialize", rb_struct_initialize, -2);
+    rb_define_method(rb_cStruct, "initialize_copy", rb_struct_init_copy, 1);
+
+    rb_define_method(rb_cStruct, "==", rb_struct_equal, 1);
+    rb_define_method(rb_cStruct, "eql?", rb_struct_eql, 1);
+    rb_define_method(rb_cStruct, "hash", rb_struct_hash, 0);
+
+    rb_define_method(rb_cStruct, "to_s", rb_struct_inspect, 0);
+    rb_define_method(rb_cStruct, "inspect", rb_struct_inspect, 0);
+    rb_define_method(rb_cStruct, "to_a", rb_struct_to_a, 0);
+    rb_define_method(rb_cStruct, "values", rb_struct_to_a, 0);
+    rb_define_method(rb_cStruct, "size", rb_struct_size, 0);
+    rb_define_method(rb_cStruct, "length", rb_struct_size, 0);
+
+    rb_define_method(rb_cStruct, "each", rb_struct_each, 0);
+    rb_define_method(rb_cStruct, "each_pair", rb_struct_each_pair, 0);
+    rb_define_method(rb_cStruct, "[]", rb_struct_aref, 1);
+    rb_define_method(rb_cStruct, "[]=", rb_struct_aset, 2);
+    rb_define_method(rb_cStruct, "select", rb_struct_select, -1);
+    rb_define_method(rb_cStruct, "values_at", rb_struct_values_at, -1);
+
+    rb_define_method(rb_cStruct, "members", rb_struct_members_m, 0);
+}
diff --git a/ruby_1_8_6/test/csv/test_csv.rb b/ruby_1_8_6/test/csv/test_csv.rb
new file mode 100644
index 0000000000..1db540921b
--- /dev/null
+++ b/ruby_1_8_6/test/csv/test_csv.rb
@@ -0,0 +1,1753 @@
+require 'test/unit'
+require 'tempfile'
+require 'fileutils'
+
+require 'csv'
+
+class CSV
+  class StreamBuf
+    # Let buffer work hard.
+    remove_const("BufSize")
+    BufSize = 2
+  end
+end
+
+
+module CSVTestSupport
+  def d(data)
+    data
+  end
+end
+
+
+class TestCSV < Test::Unit::TestCase
+  file = Tempfile.new("crlf")
+  file << "\n"
+  file.open
+  file.binmode
+  RSEP = file.read
+  file.close
+
+  include CSVTestSupport
+
+  class << self
+    include CSVTestSupport
+  end
+
+  @@simpleCSVData = {
+    [nil] => '',
+    [''] => '""',
+    [nil, nil] => ',',
+    [nil, nil, nil] => ',,',
+    ['foo'] => 'foo',
+    [','] => '","',
+    [',', ','] => '",",","',
+    [';'] => ';',
+    [';', ';'] => ';,;',
+    ["\"\r", "\"\r"] => "\"\"\"\r\",\"\"\"\r\"",
+    ["\"\n", "\"\n"] => "\"\"\"\n\",\"\"\"\n\"",
+    ["\t"] => "\t",
+    ["\t", "\t"] => "\t,\t",
+    ['foo', 'bar'] => 'foo,bar',
+    ['foo', '"bar"', 'baz'] => 'foo,"""bar""",baz',
+    ['foo', 'foo,bar', 'baz'] => 'foo,"foo,bar",baz',
+    ['foo', '""', 'baz'] => 'foo,"""""",baz',
+    ['foo', '', 'baz'] => 'foo,"",baz',
+    ['foo', nil, 'baz'] => 'foo,,baz',
+    [nil, 'foo', 'bar'] => ',foo,bar',
+    ['foo', 'bar', nil] => 'foo,bar,',
+    ['foo', "\r", 'baz'] => "foo,\"\r\",baz",
+    ['foo', "\n", 'baz'] => "foo,\"\n\",baz",
+    ['foo', "\r\n\r", 'baz'] => "foo,\"\r\n\r\",baz",
+    ['foo', "\r\n", 'baz'] => "foo,\"\r\n\",baz",
+    ['foo', "\r.\n", 'baz'] => "foo,\"\r.\n\",baz",
+    ['foo', "\r\n\n", 'baz'] => "foo,\"\r\n\n\",baz",
+    ['foo', '"', 'baz'] => 'foo,"""",baz',
+  }
+
+  @@fullCSVData = {
+    [d(nil)] => '',
+    [d('')] => '""',
+    [d(nil), d(nil)] => ',',
+    [d(nil), d(nil), d(nil)] => ',,',
+    [d('foo')] => 'foo',
+    [d('foo'), d('bar')] => 'foo,bar',
+    [d('foo'), d('"bar"'), d('baz')] => 'foo,"""bar""",baz',
+    [d('foo'), d('foo,bar'), d('baz')] => 'foo,"foo,bar",baz',
+    [d('foo'), d('""'), d('baz')] => 'foo,"""""",baz',
+    [d('foo'), d(''), d('baz')] => 'foo,"",baz',
+    [d('foo'), d(nil), d('baz')] => 'foo,,baz',
+    [d('foo'), d("\r"), d('baz')] => "foo,\"\r\",baz",
+    [d('foo'), d("\n"), d('baz')] => "foo,\"\n\",baz",
+    [d('foo'), d("\r\n"), d('baz')] => "foo,\"\r\n\",baz",
+    [d('foo'), d("\r.\n"), d('baz')] => "foo,\"\r.\n\",baz",
+    [d('foo'), d("\r\n\n"), d('baz')] => "foo,\"\r\n\n\",baz",
+    [d('foo'), d('"'), d('baz')] => 'foo,"""",baz',
+  }
+
+  @@fullCSVDataArray = @@fullCSVData.collect { |key, value| key }
+
+  def ssv2csv(ssvStr, row_sep = nil)
+    sepConv(ssvStr, ?;, ?,, row_sep)
+  end
+
+  def csv2ssv(csvStr, row_sep = nil)
+    sepConv(csvStr, ?,, ?;, row_sep)
+  end
+
+  def tsv2csv(tsvStr, row_sep = nil)
+    sepConv(tsvStr, ?\t, ?,, row_sep)
+  end
+
+  def csv2tsv(csvStr, row_sep = nil)
+    sepConv(csvStr, ?,, ?\t, row_sep)
+  end
+
+  def sepConv(srcStr, srcSep, destSep, row_sep = nil)
+    rows = []
+    cols, idx = CSV.parse_row(srcStr, 0, rows, srcSep, row_sep)
+    destStr = ''
+    cols = CSV.generate_row(rows, rows.size, destStr, destSep, row_sep)
+    destStr
+  end
+
+public
+
+  def setup
+    @tmpdir = File.join(Dir.tmpdir, "ruby_test_csv_tmp_#{$$}")
+    Dir.mkdir(@tmpdir)
+    @infile = File.join(@tmpdir, 'in.csv')
+    @infiletsv = File.join(@tmpdir, 'in.tsv')
+    @emptyfile = File.join(@tmpdir, 'empty.csv')
+    @outfile = File.join(@tmpdir, 'out.csv')
+    @bomfile = File.join(@tmpdir, "bom.csv")
+    @macfile = File.join(@tmpdir, "mac.csv")
+
+    CSV.open(@infile, "wb") do |writer|
+      @@fullCSVDataArray.each do |row|
+	writer.add_row(row)
+      end
+    end
+
+    CSV.open(@infiletsv, "wb", ?\t) do |writer|
+      @@fullCSVDataArray.each do |row|
+	writer.add_row(row)
+      end
+    end
+
+    CSV.generate(@emptyfile) do |writer|
+      # Create empty file.
+    end
+
+    File.open(@bomfile, "wb") do |f|
+      f.write("\357\273\277\"foo\"\r\n\"bar\"\r\n")
+    end
+
+    File.open(@macfile, "wb") do |f|
+      f.write("\"Avenches\",\"aus Umgebung\"\r\"Bad Hersfeld\",\"Ausgrabung\"")
+    end
+  end
+
+  def teardown
+    FileUtils.rm_rf(@tmpdir)
+  end
+
+  #### CSV::Reader unit test
+  
+  def test_Reader_each
+    file = File.open(@infile, "rb")
+    begin
+      reader = CSV::Reader.create(file)
+      expectedArray = @@fullCSVDataArray.dup
+      first = true
+      ret = reader.each { |row|
+	if first
+	  assert_instance_of(Array, row)
+	  first = false
+	end
+	expected = expectedArray.shift
+	assert_equal(expected, row)
+      }
+      assert_nil(ret, "Return is nil")
+      assert(expectedArray.empty?)
+    ensure
+      file.close
+    end
+
+    # Illegal format.
+    reader = CSV::Reader.create("a,b\r\na,b,\"c\"\ra")
+    assert_raises(CSV::IllegalFormatError) do
+      reader.each do |row|
+      end
+    end
+
+    reader = CSV::Reader.create("a,b\r\n\"")
+    assert_raises(CSV::IllegalFormatError) do
+      reader.each do |row|
+      end
+    end
+  end
+
+  def test_Reader_shift
+    file = File.open(@infile, "rb")
+    begin
+      reader = CSV::Reader.create(file)
+      first = true
+      checked = 0
+      @@fullCSVDataArray.each do |expected|
+	actual = reader.shift
+	if first
+	  assert_instance_of(Array, actual)
+	  first = false
+	end
+	assert_equal(expected, actual)
+	checked += 1
+      end
+      assert(checked == @@fullCSVDataArray.size)
+    ensure
+      file.close
+    end
+
+    # Illegal format.
+    reader = CSV::Reader.create("a,b\r\na,b,\"c\"\ra")
+    assert_raises(CSV::IllegalFormatError) do
+      reader.shift
+      reader.shift
+    end
+
+    reader = CSV::Reader.create("a,b\r\na,b,\"c\"\ra")
+    assert_raises(CSV::IllegalFormatError) do
+      reader.shift
+      reader.shift
+    end
+  end
+
+  def test_Reader_getRow
+    if CSV::Reader.respond_to?(:allocate)
+      obj = CSV::Reader.allocate
+      assert_raises(NotImplementedError) do
+	row = []
+	obj.shift
+      end
+    end
+  end
+
+  def test_IOReader_close_on_terminate
+    f = File.open(@infile, "r")
+    reader = CSV::IOReader.create(f)
+    reader.close
+    assert(!f.closed?)
+    f.close
+
+    f = File.open(@infile, "r")
+    writer = CSV::IOReader.create(f)
+    writer.close_on_terminate
+    writer.close
+    assert(f.closed?)
+  end
+
+  def test_Reader_close
+    f = File.open(@infile, "r")
+    reader = CSV::IOReader.create(f)
+    reader.close_on_terminate
+    reader.close
+    assert(f.closed?)
+  end
+
+  def test_Reader_s_new
+    assert_raises(RuntimeError) do
+      CSV::Reader.new(nil)
+    end
+  end
+
+  def test_Reader_s_create
+    reader = CSV::Reader.create("abc")
+    assert_instance_of(CSV::StringReader, reader, "With a String")
+
+    file = File.open(@infile, "rb")
+    reader = CSV::Reader.create(file)
+    assert_instance_of(CSV::IOReader, reader, 'With an IO')
+
+    obj = Object.new
+    def obj.sysread(size)
+      "abc"
+    end
+    def obj.read(size)
+      "abc"
+    end
+    reader = CSV::Reader.create(obj)
+    assert_instance_of(CSV::IOReader, reader, "With not an IO or String")
+
+    # No need to test Tempfile because it's a pseudo IO.  I test this here
+    # fors other tests.
+    reader = CSV::Reader.create(Tempfile.new("in.csv"))
+    assert_instance_of(CSV::IOReader, reader, "With an pseudo IO.")
+    file.close
+  end
+
+  def test_IOReader_s_create_binmode
+    file = File.open(@outfile, "wb")
+    file << "\"\r\n\",\"\r\",\"\n\"\r1,2,3"
+    file.close
+
+    file = File.open(@outfile, "rb")
+    begin
+      reader = CSV::IOReader.new(file, ?,, ?\r)
+      assert_equal(["\r\n", "\r", "\n"], reader.shift.to_a)
+      assert_equal(["1", "2", "3"], reader.shift.to_a)
+      reader.close
+    ensure
+      file.close
+    end
+
+    file = File.open(@outfile, "r")	# not "rb"
+    begin
+      lfincell = (RSEP == "\n" ? "\r\n" : "\n")
+      reader = CSV::IOReader.new(file, ?,, ?\r)
+      assert_equal([lfincell, "\r", "\n"], reader.shift.to_a)
+      assert_equal(["1", "2", "3"], reader.shift.to_a)
+      reader.close
+    ensure
+      file.close
+    end
+  end
+
+  def test_Reader_s_parse
+    ret = CSV::Reader.parse("a,b,c") { |row|
+      assert_instance_of(Array, row, "Block parameter")
+    }
+    assert_nil(ret, "Return is nil")
+
+    ret = CSV::Reader.parse("a;b;c", ?;) { |row|
+      assert_instance_of(Array, row, "Block parameter")
+    }
+
+    file = Tempfile.new("in.csv")
+    file << "a,b,c"
+    file.open
+    ret = CSV::Reader.parse(file) { |row|
+      assert_instance_of(Array, row, "Block parameter")
+    }
+    assert_nil(ret, "Return is nil")
+
+    file = Tempfile.new("in.csv")
+    file << "a,b,c"
+    file.open
+    ret = CSV::Reader.parse(file, ?,) { |row|
+      assert_instance_of(Array, row, "Block parameter")
+    }
+
+    # Illegal format.
+    assert_raises(CSV::IllegalFormatError) do
+      CSV::Reader.parse("a,b\r\na,b,\"c\"\ra") do |row|
+      end
+    end
+
+    assert_raises(CSV::IllegalFormatError) do
+      CSV::Reader.parse("a,b\r\na,b\"") do |row|
+      end
+    end
+  end
+
+
+  #### CSV::Writer unit test
+  
+  def test_Writer_s_new
+    assert_raises(RuntimeError) do
+      CSV::Writer.new(nil)
+    end
+  end
+
+  def test_Writer_s_generate
+    ret = CSV::Writer.generate(STDOUT) { |writer|
+      assert_instance_of(CSV::BasicWriter, writer, "Block parameter")
+    }
+
+    ret = CSV::Writer.generate(STDOUT, ?;) { |writer|
+      assert_instance_of(CSV::BasicWriter, writer, "Block parameter")
+    }
+
+    assert_nil(ret, "Return is nil")
+  end
+
+  def test_Writer_s_create
+    writer = CSV::Writer.create(STDERR)
+    assert_instance_of(CSV::BasicWriter, writer, "String")
+
+    writer = CSV::Writer.create(STDERR, ?;)
+    assert_instance_of(CSV::BasicWriter, writer, "String")
+
+    writer = CSV::Writer.create(Tempfile.new("out.csv"))
+    assert_instance_of(CSV::BasicWriter, writer, "IO")
+  end
+
+  def test_Writer_LSHIFT # '<<'
+    file = Tempfile.new("out.csv")
+    CSV::Writer.generate(file) do |writer|
+      ret = writer << ['a', 'b', 'c']
+      assert_instance_of(CSV::BasicWriter, ret, 'Return is self')
+
+      writer << [nil, 'e', 'f'] << [nil, nil, '']
+    end
+    file.open
+    file.binmode
+    str = file.read
+    assert_equal("a,b,c#{RSEP},e,f#{RSEP},,\"\"#{RSEP}", str, 'Normal')
+
+    file = Tempfile.new("out2.csv")
+    CSV::Writer.generate(file) do |writer|
+      ret = writer << [d('a'), d('b'), d('c')]
+      assert_instance_of(CSV::BasicWriter, ret, 'Return is self')
+
+      writer << [d(nil), d('e'), d('f')] << [d(nil), d(nil), d('')]
+    end
+    file.open
+    file.binmode
+    str = file.read
+    assert_equal("a,b,c#{RSEP},e,f#{RSEP},,\"\"#{RSEP}", str, 'Normal')
+  end
+
+  def test_Writer_add_row
+    file = Tempfile.new("out.csv")
+    CSV::Writer.generate(file) do |writer|
+      ret = writer.add_row(
+	[d('a'), d('b'), d('c')])
+      assert_instance_of(CSV::BasicWriter, ret, 'Return is self')
+
+      writer.add_row(
+	[d(nil), d('e'), d('f')]
+     ).add_row(
+	[d(nil), d(nil), d('')]
+     )
+    end
+    file.open
+    file.binmode
+    str = file.read
+    assert_equal("a,b,c#{RSEP},e,f#{RSEP},,\"\"#{RSEP}", str, 'Normal')
+  end
+
+  def test_Writer_close
+    f = File.open(@outfile, "w")
+    writer = CSV::BasicWriter.create(f)
+    writer.close_on_terminate
+    writer.close
+    assert(f.closed?)
+  end
+
+  def test_BasicWriter_close_on_terminate
+    f = File.open(@outfile, "w")
+    writer = CSV::BasicWriter.create(f)
+    writer.close
+    assert(!f.closed?)
+    f.close
+
+    f = File.open(@outfile, "w")
+    writer = CSV::BasicWriter.new(f)
+    writer.close_on_terminate
+    writer.close
+    assert(f.closed?)
+  end
+
+  def test_BasicWriter_s_create_binmode
+    file = File.open(@outfile, "w")	# not "wb"
+    begin
+      writer = CSV::BasicWriter.new(file, ?,, ?\r)
+      writer << ["\r\n", "\r", "\n"]
+      writer << ["1", "2", "3"]
+      writer.close
+    ensure
+      file.close
+    end
+
+    file = File.open(@outfile, "rb")
+    str = file.read
+    file.close
+    assert_equal("\"\r#{RSEP}\",\"\r\",\"#{RSEP}\"\r1,2,3\r", str)
+  end
+
+  #### CSV unit test
+
+  def test_s_open_reader
+    assert_raises(ArgumentError, 'Illegal mode') do
+      CSV.open("temp", "a")
+    end
+
+    assert_raises(ArgumentError, 'Illegal mode') do
+      CSV.open("temp", "a", ?;)
+    end
+
+    reader = CSV.open(@infile, "r")
+    assert_instance_of(CSV::IOReader, reader)
+    reader.close
+
+    reader = CSV.open(@infile, "rb")
+    assert_instance_of(CSV::IOReader, reader)
+    reader.close
+
+    reader = CSV.open(@infile, "r", ?;)
+    assert_instance_of(CSV::IOReader, reader)
+    reader.close
+
+    CSV.open(@infile, "r") do |row|
+      assert_instance_of(Array, row)
+      break
+    end
+
+    CSV.open(@infiletsv, "r", ?\t) do |row|
+      assert_instance_of(Array, row)
+      break
+    end
+
+    assert_raises(Errno::ENOENT) do
+      CSV.open("NoSuchFileOrDirectory", "r")
+    end
+
+    assert_raises(Errno::ENOENT) do
+      CSV.open("NoSuchFileOrDirectory", "r", ?;)
+    end
+
+    # Illegal format.
+    File.open(@outfile, "wb") do |f|
+      f << "a,b\r\na,b,\"c\"\ra"
+    end
+    assert_raises(CSV::IllegalFormatError) do
+      CSV.open(@outfile, "r") do |row|
+      end
+    end
+
+    File.open(@outfile, "wb") do |f|
+      f << "a,b\r\na,b\""
+    end
+    assert_raises(CSV::IllegalFormatError) do
+      CSV.open(@outfile, "r") do |row|
+      end
+    end
+
+    CSV.open(@emptyfile, "r") do |row|
+      assert_fail("Must not reach here")
+    end
+  end
+
+  def test_s_parse
+    result = CSV.parse(File.read(@infile))
+    assert_instance_of(Array, result)
+    assert_instance_of(Array, result[0])
+
+    result = CSV.parse(File.read(@infile))
+    assert_instance_of(Array, result)
+    assert_instance_of(Array, result[0])
+
+    assert_equal([], CSV.parse(""))
+    assert_equal([[nil]], CSV.parse("\n"))
+
+    CSV.parse(File.read(@infile)) do |row|
+      assert_instance_of(Array, row)
+      break
+    end
+
+    CSV.parse(File.read(@infiletsv), ?\t) do |row|
+      assert_instance_of(Array, row)
+      break
+    end
+
+    CSV.parse("") do |row|
+      assert(false)
+    end
+
+    count = 0
+    CSV.parse("\n") do |row|
+      assert_equal([nil], row)
+      count += 1
+    end
+    assert_equal(1, count)
+
+    assert_equal([["a|b-c|d"]], CSV.parse("a|b-c|d"))
+    assert_equal([["a", "b"], ["c", "d"]], CSV.parse("a|b-c|d", "|", "-"))
+  end
+
+  def test_s_open_writer
+    writer = CSV.open(@outfile, "w")
+    assert_instance_of(CSV::BasicWriter, writer)
+    writer.close
+
+    writer = CSV.open(@outfile, "wb")
+    assert_instance_of(CSV::BasicWriter, writer)
+    writer.close
+
+    writer = CSV.open(@outfile, "wb", ?;)
+    assert_instance_of(CSV::BasicWriter, writer)
+    writer.close
+
+    CSV.open(@outfile, "w") do |writer|
+      assert_instance_of(CSV::BasicWriter, writer)
+    end
+
+    CSV.open(@outfile, "w", ?;) do |writer|
+      assert_instance_of(CSV::BasicWriter, writer)
+    end
+
+    begin
+      CSV.open(@tmpdir, "w")
+      assert(false)
+    rescue Exception => ex
+      assert(ex.is_a?(Errno::EEXIST) || ex.is_a?(Errno::EISDIR) || ex.is_a?(Errno::EACCES))
+    end
+  end
+
+  def test_s_generate
+    writer = CSV.generate(@outfile)
+    assert_instance_of(CSV::BasicWriter, writer)
+    writer.close
+
+    writer = CSV.generate(@outfile, ?;)
+    assert_instance_of(CSV::BasicWriter, writer)
+    writer.close
+
+    CSV.generate(@outfile) do |writer|
+      assert_instance_of(CSV::BasicWriter, writer)
+    end
+
+    CSV.generate(@outfile, ?;) do |writer|
+      assert_instance_of(CSV::BasicWriter, writer)
+    end
+
+    begin
+      CSV.generate(@tmpdir)
+      assert(false)
+    rescue Exception => ex
+      assert(ex.is_a?(Errno::EEXIST) || ex.is_a?(Errno::EISDIR) || ex.is_a?(Errno::EACCES))
+    end
+  end
+
+  def test_s_generate_line
+    str = CSV.generate_line([])
+    assert_equal('', str, "Extra boundary check.")
+
+    str = CSV.generate_line([], ?;)
+    assert_equal('', str, "Extra boundary check.")
+
+    @@simpleCSVData.each do |col, str|
+      buf = CSV.generate_line(col)
+      assert_equal(str, buf)
+    end
+
+    @@simpleCSVData.each do |col, str|
+      buf = CSV.generate_line(col, ?;)
+      assert_equal(str + "\n", ssv2csv(buf))
+    end
+
+    @@simpleCSVData.each do |col, str|
+      buf = CSV.generate_line(col, ?\t)
+      assert_equal(str + "\n", tsv2csv(buf))
+    end
+
+    str = CSV.generate_line(['a', 'b'], nil, ?|)
+    assert_equal('a,b', str)
+
+    str = CSV.generate_line(['a', 'b'], nil, "a")
+    assert_equal('"a",b', str)
+  end
+
+  def test_s_generate_row
+    buf = ''
+    cols = CSV.generate_row([], 0, buf)
+    assert_equal(0, cols)
+    assert_equal("\n", buf, "Extra boundary check.")
+
+    buf = ''
+    cols = CSV.generate_row([], 0, buf, ?;)
+    assert_equal(0, cols)
+    assert_equal("\n", buf, "Extra boundary check.")
+
+    buf = ''
+    cols = CSV.generate_row([], 0, buf, ?\t)
+    assert_equal(0, cols)
+    assert_equal("\n", buf, "Extra boundary check.")
+
+    buf = ''
+    cols = CSV.generate_row([], 0, buf, ?\t, ?|)
+    assert_equal(0, cols)
+    assert_equal("|", buf, "Extra boundary check.")
+
+    buf = ''
+    cols = CSV.generate_row([d('1')], 2, buf)
+    assert_equal('1,', buf)
+
+    buf = ''
+    cols = CSV.generate_row([d('1')], 2, buf, ?;)
+    assert_equal('1;', buf)
+
+    buf = ''
+    cols = CSV.generate_row([d('1')], 2, buf, ?\t)
+    assert_equal("1\t", buf)
+
+    buf = ''
+    cols = CSV.generate_row([d('1')], 2, buf, ?\t, ?|)
+    assert_equal("1\t", buf)
+
+    buf = ''
+    cols = CSV.generate_row([d('1'), d('2')], 1, buf)
+    assert_equal("1\n", buf)
+
+    buf = ''
+    cols = CSV.generate_row([d('1'), d('2')], 1, buf, ?;)
+    assert_equal("1\n", buf)
+
+    buf = ''
+    cols = CSV.generate_row([d('1'), d('2')], 1, buf, ?\t)
+    assert_equal("1\n", buf)
+
+    buf = ''
+    cols = CSV.generate_row([d('1'), d('2')], 1, buf, ?\t, ?\n)
+    assert_equal("1\n", buf)
+
+    buf = ''
+    cols = CSV.generate_row([d('1'), d('2')], 1, buf, ?\t, ?\r)
+    assert_equal("1\r", buf)
+
+    buf = ''
+    cols = CSV.generate_row([d('1'), d('2')], 1, buf, ?\t, ?|)
+    assert_equal("1|", buf)
+
+    @@fullCSVData.each do |col, str|
+      buf = ''
+      cols = CSV.generate_row(col, col.size, buf)
+      assert_equal(col.size, cols)
+      assert_equal(str + "\n", buf)
+    end
+
+    @@fullCSVData.each do |col, str|
+      buf = ''
+      cols = CSV.generate_row(col, col.size, buf, ?;)
+      assert_equal(col.size, cols)
+      assert_equal(str + "\n", ssv2csv(buf))
+    end
+
+    @@fullCSVData.each do |col, str|
+      buf = ''
+      cols = CSV.generate_row(col, col.size, buf, ?\t)
+      assert_equal(col.size, cols)
+      assert_equal(str + "\n", tsv2csv(buf))
+    end
+
+    # row separator
+    @@fullCSVData.each do |col, str|
+      buf = ''
+      cols = CSV.generate_row(col, col.size, buf, ?,, ?|)
+      assert_equal(col.size, cols)
+      assert_equal(str + "|", buf)
+    end
+
+    # col and row separator
+    @@fullCSVData.each do |col, str|
+      buf = ''
+      cols = CSV.generate_row(col, col.size, buf, ?\t, ?|)
+      assert_equal(col.size, cols)
+      assert_equal(str + "|", tsv2csv(buf, ?|))
+    end
+
+    buf = ''
+    toBe = ''
+    cols = 0
+    colsToBe = 0
+    @@fullCSVData.each do |col, str|
+      cols += CSV.generate_row(col, col.size, buf)
+      toBe << str << "\n"
+      colsToBe += col.size
+    end
+    assert_equal(colsToBe, cols)
+    assert_equal(toBe, buf)
+
+    buf = ''
+    toBe = ''
+    cols = 0
+    colsToBe = 0
+    @@fullCSVData.each do |col, str|
+      lineBuf = ''
+      cols += CSV.generate_row(col, col.size, lineBuf, ?;)
+      buf << ssv2csv(lineBuf) << "\n"
+      toBe << ssv2csv(lineBuf) << "\n"
+      colsToBe += col.size
+    end
+    assert_equal(colsToBe, cols)
+    assert_equal(toBe, buf)
+
+    buf = ''
+    toBe = ''
+    cols = 0
+    colsToBe = 0
+    @@fullCSVData.each do |col, str|
+      lineBuf = ''
+      cols += CSV.generate_row(col, col.size, lineBuf, ?\t)
+      buf << tsv2csv(lineBuf) << "\n"
+      toBe << tsv2csv(lineBuf) << "\n"
+      colsToBe += col.size
+    end
+    assert_equal(colsToBe, cols)
+    assert_equal(toBe, buf)
+
+    buf = ''
+    toBe = ''
+    cols = 0
+    colsToBe = 0
+    @@fullCSVData.each do |col, str|
+      lineBuf = ''
+      cols += CSV.generate_row(col, col.size, lineBuf, ?|)
+      buf << tsv2csv(lineBuf, ?|)
+      toBe << tsv2csv(lineBuf, ?|)
+      colsToBe += col.size
+    end
+    assert_equal(colsToBe, cols)
+    assert_equal(toBe, buf)
+  end
+
+  def test_s_parse_line
+    @@simpleCSVData.each do |col, str|
+      row = CSV.parse_line(str)
+      assert_instance_of(Array, row)
+      assert_equal(col.size, row.size)
+      assert_equal(col, row)
+    end
+
+    @@simpleCSVData.each do |col, str|
+      str = csv2ssv(str)
+      row = CSV.parse_line(str, ?;)
+      assert_instance_of(Array, row)
+      assert_equal(col.size, row.size, str.inspect)
+      assert_equal(col, row, str.inspect)
+    end
+
+    @@simpleCSVData.each do |col, str|
+      str = csv2tsv(str)
+      row = CSV.parse_line(str, ?\t)
+      assert_instance_of(Array, row)
+      assert_equal(col.size, row.size)
+      assert_equal(col, row)
+    end
+
+    assert_equal(['a', 'b', 'c'], CSV.parse_line("a,b,c", nil, nil))
+    assert_equal(['a', nil], CSV.parse_line("a,b,c", nil, ?b))
+    assert_equal(['a', 'b', nil], CSV.parse_line("a,b,c", nil, "c"))
+    assert_equal([nil], CSV.parse_line(""))
+    assert_equal([nil], CSV.parse_line("\n"))
+    assert_equal([""], CSV.parse_line("\"\"\n"))
+    
+    # Illegal format.
+    buf = []
+    row = CSV.parse_line("a,b,\"c\"\ra")
+    assert_instance_of(Array, row)
+    assert_equal(0, row.size)
+
+    buf = Array.new
+    row = CSV.parse_line("a;b;\"c\"\ra", ?;)
+    assert_instance_of(Array, row)
+    assert_equal(0, row.size)
+
+    buf = Array.new
+    row = CSV.parse_line("a\tb\t\"c\"\ra", ?\t)
+    assert_instance_of(Array, row)
+    assert_equal(0, row.size)
+
+    row = CSV.parse_line("a,b\"")
+    assert_instance_of(Array, row)
+    assert_equal(0, row.size)
+
+    row = CSV.parse_line("a;b\"", ?;)
+    assert_instance_of(Array, row)
+    assert_equal(0, row.size)
+
+    row = CSV.parse_line("a\tb\"", ?\t)
+    assert_instance_of(Array, row)
+    assert_equal(0, row.size)
+
+    row = CSV.parse_line("\"a,b\"\r,")
+    assert_instance_of(Array, row)
+    assert_equal(0, row.size)
+
+    row = CSV.parse_line("\"a;b\"\r;", ?;)
+    assert_instance_of(Array, row)
+    assert_equal(0, row.size)
+
+    row = CSV.parse_line("\"a\tb\"\r\t", ?\t)
+    assert_instance_of(Array, row)
+    assert_equal(0, row.size)
+
+    row = CSV.parse_line("\"a,b\"\r\"")
+    assert_instance_of(Array, row)
+    assert_equal(0, row.size)
+
+    row = CSV.parse_line("\"a;b\"\r\"", ?;)
+    assert_instance_of(Array, row)
+    assert_equal(0, row.size)
+
+    row = CSV.parse_line("\"a\tb\"\r\"", ?\t)
+    assert_instance_of(Array, row)
+    assert_equal(0, row.size)
+  end
+
+  def test_s_parse_row
+    @@fullCSVData.each do |col, str|
+      buf = Array.new
+      cols, idx = CSV.parse_row(str + "\r\n", 0, buf)
+      assert_equal(cols, buf.size, "Reported size.")
+      assert_equal(col.size, buf.size, "Size.")
+      assert_equal(col, buf, str.inspect)
+
+      buf = Array.new
+      cols, idx = CSV.parse_row(str + "\n", 0, buf, ?,, ?\n)
+      assert_equal(cols, buf.size, "Reported size.")
+      assert_equal(col.size, buf.size, "Size.")
+      assert_equal(col, buf, str.inspect)
+
+      # separator: |
+      buf = Array.new
+      cols, idx = CSV.parse_row(str + "|", 0, buf, ?,)
+      assert_not_equal(col, buf)
+      buf = Array.new
+      cols, idx = CSV.parse_row(str + "|", 0, buf, ?,, ?|)
+      assert_equal(cols, buf.size, "Reported size.")
+      assert_equal(col.size, buf.size, "Size.")
+      assert_equal(col, buf, str.inspect)
+    end
+
+    @@fullCSVData.each do |col, str|
+      str = csv2ssv(str)
+      buf = Array.new
+      cols, idx = CSV.parse_row(str + "\r\n", 0, buf, ?;)
+      assert_equal(cols, buf.size, "Reported size.")
+      assert_equal(col.size, buf.size, "Size.")
+      assert_equal(col, buf, str)
+    end
+
+    @@fullCSVData.each do |col, str|
+      str = csv2tsv(str)
+      buf = Array.new
+      cols, idx = CSV.parse_row(str + "\r\n", 0, buf, ?\t)
+      assert_equal(cols, buf.size, "Reported size.")
+      assert_equal(col.size, buf.size, "Size.")
+      assert_equal(col, buf, str)
+    end
+
+    @@fullCSVData.each do |col, str|
+      str = csv2tsv(str, ?|)
+      buf = Array.new
+      cols, idx = CSV.parse_row(str + "|", 0, buf, ?\t, ?|)
+      assert_equal(cols, buf.size, "Reported size.")
+      assert_equal(col.size, buf.size, "Size.")
+      assert_equal(col, buf, str)
+    end
+
+    buf = []
+    CSV.parse_row("a,b,c", 0, buf, nil, nil)
+    assert_equal(['a', 'b', 'c'], buf)
+
+    buf = []
+    CSV.parse_row("a,b,c", 0, buf, nil, ?b)
+    assert_equal(['a', nil], buf)
+
+    buf = []
+    CSV.parse_row("a,b,c", 0, buf, nil, "c")
+    assert_equal(['a', 'b', nil], buf)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a,b,\"c\r\"", 0, buf)
+    assert_equal(["a", "b", "c\r"], buf.to_a)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a;b;\"c\r\"", 0, buf, ?;)
+    assert_equal(["a", "b", "c\r"], buf.to_a)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a\tb\t\"c\r\"", 0, buf, ?\t)
+    assert_equal(["a", "b", "c\r"], buf.to_a)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a,b,c\n", 0, buf, ?,, ?\n)
+    assert_equal(["a", "b", "c"], buf.to_a)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a\tb\tc\n", 0, buf, ?\t, ?\n)
+    assert_equal(["a", "b", "c"], buf.to_a)
+
+    # Illegal format.
+    buf = Array.new
+    cols, idx = CSV.parse_row("a,b,c\"", 0, buf)
+    assert_equal(0, cols, "Illegal format; unbalanced double-quote.")
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a;b;c\"", 0, buf, ?;)
+    assert_equal(0, cols, "Illegal format; unbalanced double-quote.")
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a,b,\"c\"\ra", 0, buf)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a,b,\"c\"\ra", 0, buf, ?;)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a,b\"", 0, buf)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a;b\"", 0, buf, ?;)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("\"a,b\"\r,", 0, buf)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a\r,", 0, buf)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a\r", 0, buf)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a\rbc", 0, buf)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a\r\"\"", 0, buf)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("a\r\rabc,", 0, buf)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("\"a;b\"\r;", 0, buf, ?;)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("\"a,b\"\r\"", 0, buf)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+
+    buf = Array.new
+    cols, idx = CSV.parse_row("\"a;b\"\r\"", 0, buf, ?;)
+    assert_equal(0, cols)
+    assert_equal(0, idx)
+  end
+
+  def test_s_parse_rowEOF
+    @@fullCSVData.each do |col, str|
+      if str == ''
+	# String "" is not allowed.
+	next
+      end
+      buf = Array.new
+      cols, idx = CSV.parse_row(str, 0, buf)
+      assert_equal(col.size, cols, "Reported size.")
+      assert_equal(col.size, buf.size, "Size.")
+      assert_equal(col, buf)
+    end
+  end
+
+  def test_s_parse_rowConcat
+    buf = ''
+    toBe = []
+    @@fullCSVData.each do |col, str|
+      buf  << str << "\r\n"
+      toBe.concat(col)
+    end
+    idx = 0
+    cols = 0
+    parsed = Array.new
+    parsedCols = 0
+    begin
+      cols, idx = CSV.parse_row(buf, idx, parsed)
+      parsedCols += cols
+    end while cols > 0
+    assert_equal(toBe.size, parsedCols)
+    assert_equal(toBe.size, parsed.size)
+    assert_equal(toBe, parsed)
+
+    buf = ''
+    toBe = []
+    @@fullCSVData.each do |col, str|
+      buf  << str << "\n"
+      toBe.concat(col)
+    end
+    idx = 0
+    cols = 0
+    parsed = Array.new
+    parsedCols = 0
+    begin
+      cols, idx = CSV.parse_row(buf, idx, parsed, ?,, ?\n)
+      parsedCols += cols
+    end while cols > 0
+    assert_equal(toBe.size, parsedCols)
+    assert_equal(toBe.size, parsed.size)
+    assert_equal(toBe, parsed)
+
+    buf = ''
+    toBe = []
+    @@fullCSVData.sort { |a, b|
+      a[0].length <=> b[0].length
+    }.each do |col, str|
+      buf  << str << "\n"
+      toBe.concat(col)
+    end
+    idx = 0
+    cols = 0
+    parsed = Array.new
+    parsedCols = 0
+    begin
+      cols, idx = CSV.parse_row(buf, idx, parsed, ?,, ?\n)
+      parsedCols += cols
+    end while cols > 0
+    assert_equal(toBe.size, parsedCols)
+    assert_equal(toBe.size, parsed.size)
+    assert_equal(toBe, parsed)
+
+    buf = ''
+    toBe = []
+    @@fullCSVData.each do |col, str|
+      buf  << str << "|"
+      toBe.concat(col)
+    end
+    idx = 0
+    cols = 0
+    parsed = []
+    parsedCols = 0
+    begin
+      cols, idx = CSV.parse_row(buf, idx, parsed, ?,, ?|)
+      parsedCols += cols
+    end while cols > 0
+    assert_equal(toBe.size, parsedCols)
+    assert_equal(toBe.size, parsed.size)
+    assert_equal(toBe, parsed)
+  end
+
+  def test_utf8
+    rows = []
+    CSV.open(@bomfile, "r") do |row|
+      rows << row.to_a
+    end
+    assert_equal([["foo"], ["bar"]], rows)
+
+    rows = []
+    file = File.open(@bomfile)
+    CSV::Reader.parse(file) do |row|
+      rows << row.to_a
+    end
+    assert_equal([["foo"], ["bar"]], rows)
+    file.close
+  end
+
+  def test_macCR
+    rows = []
+    CSV.open(@macfile, "r", ?,, ?\r) do |row|
+      rows << row.to_a
+    end
+    assert_equal([["Avenches", "aus Umgebung"], ["Bad Hersfeld", "Ausgrabung"]], rows)
+
+    rows = []
+    assert_raises(CSV::IllegalFormatError) do
+      CSV.open(@macfile, "r") do |row|
+        rows << row.to_a
+      end
+      assert_equal([["Avenches", "aus Umgebung\r\"Bad Hersfeld", "Ausgrabung"]], rows)
+    end
+
+    rows = []
+    file = File.open(@macfile)
+    begin
+      CSV::Reader.parse(file, ?,, ?\r) do |row|
+        rows << row.to_a
+      end
+      assert_equal([["Avenches", "aus Umgebung"], ["Bad Hersfeld", "Ausgrabung"]], rows)
+    ensure
+      file.close
+    end
+
+    rows = []
+    file = File.open(@macfile)
+    begin
+      assert_raises(CSV::IllegalFormatError) do
+        CSV::Reader.parse(file, ?,) do |row|
+          rows << row.to_a
+        end
+        assert_equal([["Avenches", "aus Umgebung\r\"Bad Hersfeld", "Ausgrabung"]], rows)
+      end
+    ensure
+      file.close
+    end
+  end
+
+
+  #### CSV unit test
+
+  InputStreamPattern = '0123456789'
+  InputStreamPatternSize = InputStreamPattern.size
+  def expChar(idx)
+    InputStreamPattern[idx % InputStreamPatternSize]
+  end
+
+  def expStr(idx, n)
+    if n > InputStreamPatternSize
+      InputStreamPattern + expStr(0, n - InputStreamPatternSize)
+    else
+      InputStreamPattern[idx % InputStreamPatternSize, n]
+    end
+  end
+
+  def setupInputStream(size, bufSize = nil)
+    setBufSize(bufSize) if bufSize
+    m = ((size / InputStreamPatternSize) + 1).to_i
+    File.open(@outfile, "wb") do |f|
+      f << (InputStreamPattern * m)[0, size]
+    end
+    file = File.open(@outfile, "rb")
+    buf = CSV::IOBuf.new(file)
+    if block_given?
+      yield(buf)
+      file.close
+      nil
+    else
+      buf
+    end
+  end
+
+  def setBufSize(size)
+    CSV::StreamBuf.module_eval('remove_const("BufSize")')
+    CSV::StreamBuf.module_eval("BufSize = #{ size }")
+  end
+
+  class StrBuf < CSV::StreamBuf
+  private
+    def initialize(string)
+      @str = string
+      @idx = 0
+      super()
+    end
+
+    def read(size)
+      str = @str[@idx, size]
+      if str.empty?
+        nil
+      else
+        @idx += str.size
+        str
+      end
+    end
+  end
+
+  class ErrBuf < CSV::StreamBuf
+    class Error < RuntimeError; end
+  private
+    def initialize
+      @first = true
+      super()
+    end
+
+    def read(size)
+      if @first
+	@first = false
+	"a" * size
+      else
+	raise ErrBuf::Error.new
+      end
+    end
+  end
+
+  def test_StreamBuf_MyBuf
+    # At first, check ruby's behaviour.
+    s = "abc"
+    assert_equal(?a, s[0])
+    assert_equal(?b, s[1])
+    assert_equal(?c, s[2])
+    assert_equal(nil, s[3])
+    assert_equal("a", s[0, 1])
+    assert_equal("b", s[1, 1])
+    assert_equal("c", s[2, 1])
+    assert_equal("", s[3, 1])
+    assert_equal(nil, s[4, 1])
+
+    s = StrBuf.new("abc")
+    assert_equal(?a, s[0])
+    assert_equal(?b, s.get(1))
+    assert_equal(?c, s[2])
+    assert_equal(nil, s.get(3))
+    assert_equal("a", s[0, 1])
+    assert_equal("b", s.get(1, 1))
+    assert_equal("c", s[2, 1])
+    assert_equal("", s.get(3, 1))
+    assert_equal(nil, s[4, 1])
+
+    dropped = s.drop(1)
+    assert_equal(1, dropped)
+    assert_equal(?b, s[0])
+    assert(!s.is_eos?)
+    dropped = s.drop(1)
+    assert_equal(1, dropped)
+    assert_equal(?c, s[0])
+    assert(!s.is_eos?)
+    dropped = s.drop(1)
+    assert_equal(1, dropped)
+    assert_equal(nil, s[0])
+    assert(s.is_eos?)
+    dropped = s.drop(1)
+    assert_equal(0, dropped)
+    assert_equal(nil, s[0])
+    assert(s.is_eos?)
+
+    s = StrBuf.new("")
+    assert_equal(nil, s[0])
+
+    s = StrBuf.new("")
+    dropped = s.drop(1)
+    assert_equal(0, dropped)
+
+    assert_raises(TestCSV::ErrBuf::Error) do
+      s = ErrBuf.new
+      s[1024]
+    end
+
+    assert_raises(TestCSV::ErrBuf::Error) do
+      s = ErrBuf.new
+      s.drop(1024)
+    end
+  end
+
+  def test_StreamBuf_AREF # '[idx]'
+    setupInputStream(22, 1024) do |s|
+      [0, 1, 9, 10, 19, 20, 21].each do |idx|
+	assert_equal(expChar(idx), s[idx], idx.to_s)
+      end
+      [22, 23].each do |idx|
+	assert_equal(nil, s[idx], idx.to_s)
+      end
+      assert_equal(nil, s[-1])
+    end
+
+    setupInputStream(22, 1) do |s|
+      [0, 1, 9, 10, 19, 20, 21].each do |idx|
+	assert_equal(expChar(idx), s[idx], idx.to_s)
+      end
+      [22, 23].each do |idx|
+	assert_equal(nil, s[idx], idx.to_s)
+      end
+    end
+
+    setupInputStream(1024, 1) do |s|
+      [1023, 0].each do |idx|
+	assert_equal(expChar(idx), s[idx], idx.to_s)
+      end
+      [1024, 1025].each do |idx|
+	assert_equal(nil, s[idx], idx.to_s)
+      end
+    end
+
+    setupInputStream(1, 1) do |s|
+      [0].each do |idx|
+	assert_equal(expChar(idx), s[idx], idx.to_s)
+      end
+      [1, 2].each do |idx|
+	assert_equal(nil, s[idx], idx.to_s)
+      end
+    end
+  end
+
+  def test_StreamBuf_AREF_n # '[idx, n]'
+    # At first, check ruby's behaviour.
+    assert_equal("", "abc"[3, 1])
+    assert_equal(nil, "abc"[4, 1])
+    
+    setupInputStream(22, 1024) do |s|
+      [0, 1, 9, 10, 19, 20, 21].each do |idx|
+	assert_equal(expStr(idx, 1), s[idx, 1], idx.to_s)
+      end
+      assert_equal("", s[22, 1])
+      assert_equal(nil, s[23, 1])
+    end
+
+    setupInputStream(22, 1) do |s|
+      [0, 1, 9, 10, 19, 20, 21].each do |idx|
+	assert_equal(expStr(idx, 1), s[idx, 1], idx.to_s)
+      end
+      assert_equal("", s[22, 1])
+      assert_equal(nil, s[23, 1])
+    end
+
+    setupInputStream(1024, 1) do |s|
+      [1023, 0].each do |idx|
+	assert_equal(expStr(idx, 1), s[idx, 1], idx.to_s)
+      end
+      assert_equal("", s[1024, 1])
+      assert_equal(nil, s[1025, 1])
+    end
+
+    setupInputStream(1, 1) do |s|
+      [0].each do |idx|
+	assert_equal(expStr(idx, 1), s[idx, 1], idx.to_s)
+      end
+      assert_equal("", s[1, 1])
+      assert_equal(nil, s[2, 1])
+    end
+
+    setupInputStream(22, 11) do |s|
+      [0, 1, 10, 11, 20].each do  |idx|
+	assert_equal(expStr(idx, 2), s[idx, 2], idx.to_s)
+      end
+      assert_equal(expStr(21, 1), s[21, 2])
+
+      assert_equal(expStr(0, 12), s[0, 12])
+      assert_equal(expStr(10, 12), s[10, 12])
+      assert_equal(expStr(10, 12), s[10, 13])
+      assert_equal(expStr(10, 12), s[10, 14])
+      assert_equal(expStr(10, 12), s[10, 1024])
+
+      assert_equal(nil, s[0, -1])
+      assert_equal(nil, s[21, -1])
+
+      assert_equal(nil, s[-1, 10])
+      assert_equal(nil, s[-1, -1])
+    end
+  end
+
+  def test_StreamBuf_get
+    setupInputStream(22, 1024) do |s|
+      [0, 1, 9, 10, 19, 20, 21].each do |idx|
+	assert_equal(expChar(idx), s.get(idx), idx.to_s)
+      end
+      [22, 23].each do |idx|
+	assert_equal(nil, s.get(idx), idx.to_s)
+      end
+      assert_equal(nil, s.get(-1))
+    end
+  end
+  
+  def test_StreamBuf_get_n
+    setupInputStream(22, 1024) do |s|
+      [0, 1, 9, 10, 19, 20, 21].each do |idx|
+	assert_equal(expStr(idx, 1), s.get(idx, 1), idx.to_s)
+      end
+      assert_equal("", s.get(22, 1))
+      assert_equal(nil, s.get(23, 1))
+
+      assert_equal(nil, s.get(-1, 1))
+      assert_equal(nil, s.get(-1, -1))
+    end
+  end
+
+  def test_StreamBuf_drop
+    setupInputStream(22, 1024) do |s|
+      assert_equal(expChar(0), s[0])
+      assert_equal(expChar(21), s[21])
+      assert_equal(nil, s[22])
+
+      dropped = s.drop(-1)
+      assert_equal(0, dropped)
+      assert_equal(expChar(0), s[0])
+
+      dropped = s.drop(0)
+      assert_equal(0, dropped)
+      assert_equal(expChar(0), s[0])
+
+      dropped = s.drop(1)
+      assert_equal(1, dropped)
+      assert_equal(expChar(1), s[0])
+      assert_equal(expChar(2), s[1])
+
+      dropped = s.drop(1)
+      assert_equal(1, dropped)
+      assert_equal(expChar(2), s[0])
+      assert_equal(expChar(3), s[1])
+    end
+
+    setupInputStream(4, 2) do |s|
+      dropped = s.drop(2)
+      assert_equal(2, dropped)
+      assert_equal(expChar(2), s[0])
+      assert_equal(expChar(3), s[1])
+      dropped = s.drop(1)
+      assert_equal(1, dropped)
+      assert_equal(expChar(3), s[0])
+      assert_equal(nil, s[1])
+      dropped = s.drop(1)
+      assert_equal(1, dropped)
+      assert_equal(nil, s[0])
+      assert_equal(nil, s[1])
+      dropped = s.drop(0)
+      assert_equal(0, dropped)
+      assert_equal(nil, s[0])
+      assert_equal(nil, s[1])
+    end
+
+    setupInputStream(6, 3) do |s|
+      dropped = s.drop(2)
+      assert_equal(2, dropped)
+      dropped = s.drop(2)
+      assert_equal(2, dropped)
+      assert_equal(expChar(4), s[0])
+      assert_equal(expChar(5), s[1])
+      dropped = s.drop(3)
+      assert_equal(2, dropped)
+      assert_equal(nil, s[0])
+      assert_equal(nil, s[1])
+    end
+  end
+
+  def test_StreamBuf_is_eos?
+    setupInputStream(3, 1024) do |s|
+      assert(!s.is_eos?)
+      s.drop(1)
+      assert(!s.is_eos?)
+      s.drop(1)
+      assert(!s.is_eos?)
+      s.drop(1)
+      assert(s.is_eos?)
+      s.drop(1)
+      assert(s.is_eos?)
+    end
+
+    setupInputStream(3, 2) do |s|
+      assert(!s.is_eos?)
+      s.drop(1)
+      assert(!s.is_eos?)
+      s.drop(1)
+      assert(!s.is_eos?)
+      s.drop(1)
+      assert(s.is_eos?)
+      s.drop(1)
+      assert(s.is_eos?)
+    end
+  end
+
+  def test_StreamBuf_s_new
+    # NotImplementedError should be raised from StreamBuf#read.
+    assert_raises(NotImplementedError) do
+      CSV::StreamBuf.new
+    end
+  end
+
+  def test_IOBuf_close
+    f = File.open(@outfile, "wb")
+    f << "tst"
+    f.close
+
+    f = File.open(@outfile, "rb")
+    iobuf = CSV::IOBuf.new(f)
+    iobuf.close
+    assert(true)	# iobuf.close does not raise any exception.
+    f.close
+  end
+
+  def test_IOBuf_s_new
+    iobuf = CSV::IOBuf.new(Tempfile.new("in.csv"))
+    assert_instance_of(CSV::IOBuf, iobuf)
+  end
+
+
+  #### CSV functional test
+
+  # sample data
+  #
+  #  1      2       3         4       5        6      7    8
+  # +------+-------+---------+-------+--------+------+----+------+
+  # | foo  | "foo" | foo,bar | ""    |(empty) |(null)| \r | \r\n |
+  # +------+-------+---------+-------+--------+------+----+------+
+  # | NaHi | "Na"  | Na,Hi   | \r.\n | \r\n\n | "    | \n | \r\n |
+  # +------+-------+---------+-------+--------+------+----+------+
+  #
+  def test_s_parseAndCreate
+    colSize = 8
+    csvStr = "foo,!!!foo!!!,!foo,bar!,!!!!!!,!!,,!\r!,!\r\n!\nNaHi,!!!Na!!!,!Na,Hi!,!\r.\n!,!\r\n\n!,!!!!,!\n!,!\r\n!".gsub!('!', '"')
+    csvStrTerminated = csvStr + "\n"
+
+    myStr = csvStr.dup
+    res1 = []; res2 = []
+    idx = 0
+    col, idx = CSV::parse_row(myStr, 0, res1)
+    col, idx = CSV::parse_row(myStr, idx, res2)
+
+    buf = ''
+    col = CSV::generate_row(res1, colSize, buf)
+    col = CSV::generate_row(res2, colSize, buf)
+    assert_equal(csvStrTerminated, buf)
+
+    parsed = []
+    CSV::Reader.parse(csvStrTerminated) do |row|
+      parsed << row
+    end
+
+    buf = ''
+    CSV::Writer.generate(buf) do |writer|
+      parsed.each do |row|
+	writer.add_row(row)
+      end
+    end
+    assert_equal(csvStrTerminated, buf)
+
+    buf = ''
+    CSV::Writer.generate(buf) do |writer|
+      parsed.each do |row|
+	writer << row
+      end
+    end
+    assert_equal(csvStrTerminated, buf)
+  end
+
+  def test_writer_fs_rs_generate
+    buf = ''
+    CSV::Writer.generate(buf, ",,") do |writer|
+      writer << []
+    end
+    assert_equal("\n", buf)
+
+    buf = ''
+    CSV::Writer.generate(buf, ",,") do |writer|
+      writer << [] << []
+    end
+    assert_equal("\n\n", buf)
+
+    buf = ''
+    CSV::Writer.generate(buf, ",,") do |writer|
+      writer << [1]
+    end
+    assert_equal("1\n", buf)
+
+    buf = ''
+    CSV::Writer.generate(buf, ",,") do |writer|
+      writer << [1, 2, 3]
+      writer << [4, ",,", 5]
+    end
+    assert_equal("1,,2,,3\n4,,\",,\",,5\n", buf)
+
+    buf = ''
+    CSV::Writer.generate(buf, ",,:", ",,;") do |writer|
+      writer << [nil, nil, nil]
+      writer << [nil, ",,", nil]
+    end
+    assert_equal(",,:,,:,,;,,:,,,,:,,;", buf)
+
+    buf = ''
+    CSV::Writer.generate(buf, "---") do |writer|
+      writer << [1, 2, 3]
+      writer << [4, "---\"---", 5]
+    end
+    assert_equal("1---2---3\n4---\"---\"\"---\"---5\n", buf)
+
+    buf = ''
+    CSV::Writer.generate(buf, nil) do |writer|
+      writer << [1, 2, 3]
+      writer << [4, ",\",", 5]
+    end
+    assert_equal("1,2,3\n4,\",\"\",\",5\n", buf)
+  end
+
+  def test_writer_fs_rs_parse
+    reader = CSV::Reader.create('a||b--c||d', '||', '--')
+    assert_equal(['a', 'b'], reader.shift)
+    assert_equal(['c', 'd'], reader.shift)
+
+    reader = CSV::Reader.create("a@|b@-c@|d", "@|", "@-")
+    assert_equal(['a', 'b'], reader.shift)
+    assert_equal(['c', 'd'], reader.shift)
+
+    reader = CSV::Reader.create("ababfsababrs", "abfs", "abrs")
+    assert_equal(['ab', 'ab'], reader.shift)
+
+    reader = CSV::Reader.create('"ab"abfsababrs', "abfs", "abrs")
+    assert_equal(['ab', 'ab'], reader.shift)
+
+    reader = CSV::Reader.create('"ab"aabfsababrs', "abfs", "abrs")
+    assert_raises(CSV::IllegalFormatError) do
+      reader.shift
+    end
+
+    # fs match while matching rs progress
+    reader = CSV::Reader.create("ab,ababrs", nil, "abrs")
+    assert_equal(['ab', 'ab'], reader.shift)
+
+    reader = CSV::Reader.create(',ababrs', nil, "abrs")
+    assert_equal([nil, 'ab'], reader.shift)
+
+    reader = CSV::Reader.create('"",ababrs', nil, "abrs")
+    assert_equal(['', 'ab'], reader.shift)
+
+    reader = CSV::Reader.create('ab,"ab"abrs', nil, "abrs")
+    assert_equal(['ab', 'ab'], reader.shift)
+
+    reader = CSV::Reader.create('ab,"ab"aabrs', nil, "abrs")
+    assert_raises(CSV::IllegalFormatError) do
+      reader.shift
+    end
+
+    # rs match while matching fs progress
+    reader = CSV::Reader.create("ab|abc", 'ab-', "ab|")
+    assert_equal([nil], reader.shift)
+    assert_equal(['abc'], reader.shift)
+
+    reader = CSV::Reader.create("ab\ncdabcef", "abc", "\n")
+    assert_equal(['ab'], reader.shift)
+    assert_equal(['cd', "ef"], reader.shift)
+
+    # EOF while fs/rs matching
+    reader = CSV::Reader.create("ab", 'ab-', "xyz")
+    assert_equal(['ab'], reader.shift)
+
+    reader = CSV::Reader.create("ab", 'xyz', "ab|")
+    assert_equal(['ab'], reader.shift)
+
+    reader = CSV::Reader.create("ab", 'ab-', "ab|")
+    assert_equal(['ab'], reader.shift)
+
+    reader = CSV::Reader.create(",,:,,:,,;,,:,,,,:,,;", ",,:", ",,;")
+    assert_equal([nil, nil, nil], reader.shift)
+    assert_equal([nil, ",,", nil], reader.shift)
+  end
+
+  def test_s_foreach
+    File.open(@outfile, "w") do |f|
+      f << "1,2,3\n4,5,6"
+    end
+    row = []
+    CSV.foreach(@outfile) { |line|
+      row << line
+    }
+    assert_equal([['1', '2', '3'], ['4', '5', '6']], row)
+
+    File.open(@outfile, "w") do |f|
+      f << "1,2,3\r4,5,6"
+    end
+    row = []
+    CSV.foreach(@outfile, "\r") { |line|
+      row << line
+    }
+    assert_equal([['1', '2', '3'], ['4', '5', '6']], row)
+  end
+
+  def test_s_readlines
+    File.open(@outfile, "w") do |f|
+      f << "1,2,3\n4,5,6"
+    end
+    assert_equal([["1", "2", "3"], ["4", "5", "6"]], CSV.readlines(@outfile))
+    assert_equal([["1", "2", nil], [nil, "5", "6"]], CSV.readlines(@outfile, "3\n4"))
+  end
+
+  def test_s_read
+    File.open(@outfile, "w") do |f|
+      f << "1,2,3\n4,5,6"
+    end
+    assert_equal([["1", "2", "3"], ["4", "5", "6"]], CSV.read(@outfile))
+    assert_equal([["1", "2"]], CSV.read(@outfile, 3))
+    assert_equal([[nil], ["4", nil]], CSV.read(@outfile, 3, 5))
+  end
+end
diff --git a/ruby_1_8_6/test/dbm/test_dbm.rb b/ruby_1_8_6/test/dbm/test_dbm.rb
new file mode 100644
index 0000000000..941e139946
--- /dev/null
+++ b/ruby_1_8_6/test/dbm/test_dbm.rb
@@ -0,0 +1,545 @@
+require 'test/unit'
+
+begin
+  require 'dbm'
+rescue LoadError
+end
+
+if defined? DBM
+  require 'tmpdir'
+  require 'fileutils'
+
+  class TestDBM < Test::Unit::TestCase
+    def TestDBM.uname_s
+      require 'rbconfig'
+      case Config::CONFIG['target_os']
+      when 'cygwin'
+        require 'Win32API'
+        uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
+        utsname = ' ' * 100
+        raise 'cannot get system name' if uname.call(utsname) == -1
+
+        utsname.unpack('A20' * 5)[0]
+      else
+        Config::CONFIG['target_os']
+      end
+    end
+    SYSTEM = uname_s
+
+    def setup
+      @path = "tmptest_dbm_"
+      assert_instance_of(DBM, @dbm = DBM.new(@path))
+
+      # prepare to make readonly DBM file
+      DBM.open("tmptest_dbm_rdonly") {|dbm|
+        dbm['foo'] = 'FOO'
+      }
+      
+      File.chmod(0400, *Dir.glob("tmptest_dbm_rdonly.*"))
+
+      assert_instance_of(DBM, @dbm_rdonly = DBM.new("tmptest_dbm_rdonly", nil))
+    end
+    def teardown
+      assert_nil(@dbm.close)
+      assert_nil(@dbm_rdonly.close)
+      ObjectSpace.each_object(DBM) do |obj|
+        obj.close unless obj.closed?
+      end
+      File.delete *Dir.glob("tmptest_dbm*").to_a
+      p Dir.glob("tmptest_dbm*") if $DEBUG
+    end
+
+    def check_size(expect, dbm=@dbm)
+      assert_equal(expect, dbm.size)
+      n = 0
+      dbm.each { n+=1 }
+      assert_equal(expect, n)
+      if expect == 0
+        assert_equal(true, dbm.empty?)
+      else
+        assert_equal(false, dbm.empty?)
+      end
+    end
+
+    def have_fork?
+      begin
+        fork{}
+        true
+      rescue NotImplementedError
+        false
+      end
+    end
+
+    def test_s_new_has_no_block
+      # DBM.new ignore the block
+      foo = true
+      assert_instance_of(DBM, dbm = DBM.new("tmptest_dbm") { foo = false })
+      assert_equal(foo, true)
+      assert_nil(dbm.close)
+    end
+    def test_s_open_no_create
+      assert_nil(dbm = DBM.open("tmptest_dbm", nil))
+    ensure
+      dbm.close if dbm
+    end
+    def test_s_open_with_block
+      assert_equal(DBM.open("tmptest_dbm") { :foo }, :foo)
+    end
+
+    def test_close
+      assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm"))
+      assert_nil(dbm.close)
+
+      # closed DBM file
+      assert_raise(DBMError) { dbm.close }
+    end
+
+    def test_aref
+      assert_equal('bar', @dbm['foo'] = 'bar')
+      assert_equal('bar', @dbm['foo'])
+
+      assert_nil(@dbm['bar'])
+    end
+
+    def test_fetch
+      assert_equal('bar', @dbm['foo']='bar')
+      assert_equal('bar', @dbm.fetch('foo'))
+
+      # key not found
+      assert_raise(IndexError) {
+        @dbm.fetch('bar')
+      }
+
+      # test for `ifnone' arg
+      assert_equal('baz', @dbm.fetch('bar', 'baz'))
+
+      # test for `ifnone' block
+      assert_equal('foobar', @dbm.fetch('bar') {|key| 'foo' + key })
+    end
+
+    def test_aset
+      num = 0
+      2.times {|i|
+        assert_equal('foo', @dbm['foo'] = 'foo')
+        assert_equal('foo', @dbm['foo'])
+        assert_equal('bar', @dbm['foo'] = 'bar')
+        assert_equal('bar', @dbm['foo'])
+
+        num += 1 if i == 0
+        assert_equal(num, @dbm.size)
+
+        # assign nil
+        assert_equal('', @dbm['bar'] = '')
+        assert_equal('', @dbm['bar'])
+
+        num += 1 if i == 0
+        assert_equal(num, @dbm.size)
+
+        # empty string
+        assert_equal('', @dbm[''] = '')
+        assert_equal('', @dbm[''])
+
+        num += 1 if i == 0
+        assert_equal(num, @dbm.size)
+
+        # Fixnum
+        assert_equal('200', @dbm['100'] = '200')
+        assert_equal('200', @dbm['100'])
+
+        num += 1 if i == 0
+        assert_equal(num, @dbm.size)
+
+        # Big key and value
+        assert_equal('y' * 100, @dbm['x' * 100] = 'y' * 100)
+        assert_equal('y' * 100, @dbm['x' * 100])
+
+        num += 1 if i == 0
+        assert_equal(num, @dbm.size)
+      }
+    end
+
+    def test_index
+      assert_equal('bar', @dbm['foo'] = 'bar')
+      assert_equal('foo', @dbm.index('bar'))
+      assert_nil(@dbm['bar'])
+    end
+
+    def test_indexes
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+      @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+      assert_equal(values.reverse, @dbm.indexes(*keys.reverse))
+    end
+
+    def test_values_at
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+      @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+      assert_equal(values.reverse, @dbm.values_at(*keys.reverse))
+    end
+
+    def test_select_with_block
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+      @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+      ret = @dbm.select {|k,v|
+        assert_equal(k.upcase, v)
+        k != "bar"
+      }
+      assert_equal([['baz', 'BAZ'], ['foo', 'FOO']],
+                    ret.sort)
+    end
+
+    def test_length
+      num = 10
+      assert_equal(0, @dbm.size)
+      num.times {|i|
+        i = i.to_s
+        @dbm[i] = i
+      }
+      assert_equal(num, @dbm.size)
+
+      @dbm.shift
+
+      assert_equal(num - 1, @dbm.size)
+    end
+
+    def test_empty?
+      assert_equal(true, @dbm.empty?)
+      @dbm['foo'] = 'FOO'
+      assert_equal(false, @dbm.empty?)
+    end
+
+    def test_each_pair
+      n = 0
+      @dbm.each_pair { n += 1 }
+      assert_equal(0, n)
+
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+
+      @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+      n = 0
+      ret = @dbm.each_pair {|key, val|
+        assert_not_nil(i = keys.index(key))
+        assert_equal(val, values[i])
+
+        n += 1
+      }
+      assert_equal(keys.size, n)
+      assert_equal(@dbm, ret)
+    end
+
+    def test_each_value
+      n = 0
+      @dbm.each_value { n += 1 }
+      assert_equal(0, n)
+
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+
+      @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+      n = 0
+      ret = @dbm.each_value {|val|
+        assert_not_nil(key = @dbm.index(val))
+        assert_not_nil(i = keys.index(key))
+        assert_equal(val, values[i])
+
+        n += 1
+      }
+      assert_equal(keys.size, n)
+      assert_equal(@dbm, ret)
+    end
+
+    def test_each_key
+      n = 0
+      @dbm.each_key { n += 1 }
+      assert_equal(0, n)
+
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+
+      @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+      n = 0
+      ret = @dbm.each_key {|key|
+        assert_not_nil(i = keys.index(key))
+        assert_equal(@dbm[key], values[i])
+
+        n += 1
+      }
+      assert_equal(keys.size, n)
+      assert_equal(@dbm, ret)
+    end
+
+    def test_keys
+      assert_equal([], @dbm.keys)
+
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+
+      @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+      assert_equal(keys.sort, @dbm.keys.sort)
+      assert_equal(values.sort, @dbm.values.sort)
+    end
+
+    def test_values
+      test_keys
+    end
+
+    def test_shift
+      assert_nil(@dbm.shift)
+      assert_equal(0, @dbm.size)
+
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+
+      @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+      ret_keys = []
+      ret_values = []
+      while ret = @dbm.shift
+        ret_keys.push ret[0]
+        ret_values.push ret[1]
+
+        assert_equal(keys.size - ret_keys.size, @dbm.size)
+      end
+
+      assert_equal(keys.sort, ret_keys.sort)
+      assert_equal(values.sort, ret_values.sort)
+    end
+
+    def test_delete
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+      key = keys[1]
+
+      assert_nil(@dbm.delete(key))
+      assert_equal(0, @dbm.size)
+
+      @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+      assert_equal('BAR', @dbm.delete(key))
+      assert_nil(@dbm[key])
+      assert_equal(2, @dbm.size)
+
+      assert_nil(@dbm.delete(key))
+
+      if /^CYGWIN_9/ !~ SYSTEM
+        assert_raise(DBMError) {
+          @dbm_rdonly.delete("foo")
+        }
+
+        assert_nil(@dbm_rdonly.delete("bar"))
+      end
+    end
+    def test_delete_with_block
+      key = 'no called block'
+      @dbm[key] = 'foo'
+      assert_equal('foo', @dbm.delete(key) {|k| k.replace 'called block'})
+      assert_equal('no called block', key)
+      assert_equal(0, @dbm.size)
+
+      key = 'no called block'
+      assert_equal(:blockval,
+                    @dbm.delete(key) {|k| k.replace 'called block'; :blockval})
+      assert_equal('called block', key)
+      assert_equal(0, @dbm.size)
+    end
+
+    def test_delete_if
+      v = "0"
+      100.times {@dbm[v] = v; v = v.next}
+
+      ret = @dbm.delete_if {|key, val| key.to_i < 50}
+      assert_equal(@dbm, ret)
+      check_size(50, @dbm)
+
+      ret = @dbm.delete_if {|key, val| key.to_i >= 50}
+      assert_equal(@dbm, ret)
+      check_size(0, @dbm)
+
+      # break
+      v = "0"
+      100.times {@dbm[v] = v; v = v.next}
+      check_size(100, @dbm)
+      n = 0;
+      @dbm.delete_if {|key, val|
+        break if n > 50
+        n+=1
+        true
+      }
+      assert_equal(51, n)
+      check_size(49, @dbm)
+
+      @dbm.clear
+
+      # raise
+      v = "0"
+      100.times {@dbm[v] = v; v = v.next}
+      check_size(100, @dbm)
+      n = 0;
+      begin
+        @dbm.delete_if {|key, val|
+          raise "runtime error" if n > 50
+          n+=1
+          true
+        }
+      rescue
+      end
+      assert_equal(51, n)
+      check_size(49, @dbm)
+    end
+
+    def test_reject
+      v = "0"
+      100.times {@dbm[v] = v; v = v.next}
+
+      hash = @dbm.reject {|key, val| key.to_i < 50}
+      assert_instance_of(Hash, hash)
+      assert_equal(100, @dbm.size)
+
+      assert_equal(50, hash.size)
+      hash.each_pair {|key,val|
+        assert_equal(false, key.to_i < 50)
+        assert_equal(key, val)
+      }
+
+      hash = @dbm.reject {|key, val| key.to_i < 100}
+      assert_instance_of(Hash, hash)
+      assert_equal(true, hash.empty?)
+    end
+
+    def test_clear
+      v = "1"
+      100.times {v = v.next; @dbm[v] = v}
+
+      assert_equal(@dbm, @dbm.clear)
+
+      # validate DBM#size
+      i = 0
+      @dbm.each { i += 1 }
+      assert_equal(@dbm.size, i)
+      assert_equal(0, i)
+    end
+
+    def test_invert
+      v = "0"
+      100.times {@dbm[v] = v; v = v.next}
+
+      hash = @dbm.invert
+      assert_instance_of(Hash, hash)
+      assert_equal(100, hash.size)
+      hash.each_pair {|key, val|
+        assert_equal(key.to_i, val.to_i)
+      }
+    end
+
+    def test_update
+      hash = {}
+      v = "0"
+      100.times {v = v.next; hash[v] = v}
+
+      @dbm["101"] = "101"
+      @dbm.update hash
+      assert_equal(101, @dbm.size)
+      @dbm.each_pair {|key, val|
+        assert_equal(key.to_i, val.to_i)
+      }
+    end
+
+    def test_replace
+      hash = {}
+      v = "0"
+      100.times {v = v.next; hash[v] = v}
+
+      @dbm["101"] = "101"
+      @dbm.replace hash
+      assert_equal(100, @dbm.size)
+      @dbm.each_pair {|key, val|
+        assert_equal(key.to_i, val.to_i)
+      }
+    end
+
+    def test_haskey?
+      assert_equal('bar', @dbm['foo']='bar')
+      assert_equal(true,  @dbm.has_key?('foo'))
+      assert_equal(false, @dbm.has_key?('bar'))
+    end
+
+    def test_has_value?
+      assert_equal('bar', @dbm['foo']='bar')
+      assert_equal(true,  @dbm.has_value?('bar'))
+      assert_equal(false, @dbm.has_value?('foo'))
+    end
+
+    def test_to_a
+      v = "0"
+      100.times {v = v.next; @dbm[v] = v}
+
+      ary = @dbm.to_a
+      assert_instance_of(Array, ary)
+      assert_equal(100, ary.size)
+      ary.each {|key,val|
+        assert_equal(key.to_i, val.to_i)
+      }
+    end
+
+    def test_to_hash
+      v = "0"
+      100.times {v = v.next; @dbm[v] = v}
+
+      hash = @dbm.to_hash
+      assert_instance_of(Hash, hash)
+      assert_equal(100, hash.size)
+      hash.each {|key,val|
+        assert_equal(key.to_i, val.to_i)
+      }
+    end
+  end
+
+  class TestDBM2 < Test::Unit::TestCase
+    TMPROOT = "#{Dir.tmpdir}/ruby-dbm.#{$$}"
+
+    def setup
+      Dir.mkdir TMPROOT
+    end
+
+    def teardown
+      FileUtils.rm_rf TMPROOT if File.directory?(TMPROOT)
+    end
+
+    def test_reader_open
+      DBM.open("#{TMPROOT}/a") {}
+      v = DBM.open("#{TMPROOT}/a", nil, DBM::READER) {|d|
+        # Errno::EPERM is raised on Solaris which use ndbm.
+        # DBMError is raised on Debian which use gdbm. 
+        assert_raises(Errno::EPERM, DBMError) { d["k"] = "v" }
+        true
+      }
+      assert(v)
+    end
+
+    def test_newdb_open
+      DBM.open("#{TMPROOT}/a") {|dbm|
+        dbm["k"] = "v"
+      }
+      v = DBM.open("#{TMPROOT}/a", nil, DBM::NEWDB) {|d|
+        assert_equal(0, d.length)
+        assert_nil(d["k"])
+        true
+      }
+      assert(v)
+    end
+
+    def test_freeze
+      DBM.open("#{TMPROOT}/a") {|d|
+        d.freeze
+        assert_raises(TypeError) { d["k"] = "v" }
+      }
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/digest/test_digest.rb b/ruby_1_8_6/test/digest/test_digest.rb
new file mode 100644
index 0000000000..fa12086300
--- /dev/null
+++ b/ruby_1_8_6/test/digest/test_digest.rb
@@ -0,0 +1,120 @@
+#!/usr/bin/env ruby
+#
+# $RoughId: test.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
+# $Id$
+
+require 'test/unit'
+
+require 'digest'
+%w[digest/md5 digest/rmd160 digest/sha1 digest/sha2].each do |lib|
+  begin
+    require lib
+  rescue LoadError
+  end
+end
+
+module TestDigest
+  Data1 = "abc"
+  Data2 = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+
+  def test_s_hexdigest
+    self.class::DATA.each do |str, digest|
+      assert_equal(digest, self.class::ALGO.hexdigest(str))
+    end
+  end
+
+  def test_s_digest
+    self.class::DATA.each do |str, digest|
+      assert_equal([digest].pack("H*"), self.class::ALGO.digest(str))
+    end
+  end
+
+  def test_update
+    # This test is also for digest() and hexdigest()
+
+    str = "ABC"
+
+    md = self.class::ALGO.new
+    md.update str
+    assert_equal(self.class::ALGO.hexdigest(str), md.hexdigest)
+    assert_equal(self.class::ALGO.digest(str), md.digest)
+  end
+
+  def test_eq
+    # This test is also for clone()
+
+    md1 = self.class::ALGO.new
+    md1 << "ABC"
+
+    assert_equal(md1, md1.clone, self.class::ALGO)
+
+    md2 = self.class::ALGO.new
+    md2 << "A"
+
+    assert(md1 != md2, self.class::ALGO)
+
+    md2 << "BC"
+
+    assert_equal(md1, md2, self.class::ALGO)
+  end
+
+  def test_instance_eval
+    assert_nothing_raised {
+      self.class::ALGO.new.instance_eval { update "a" }
+    }
+  end
+
+  class TestMD5 < Test::Unit::TestCase
+    include TestDigest
+    ALGO = Digest::MD5
+    DATA = {
+      Data1 => "900150983cd24fb0d6963f7d28e17f72",
+      Data2 => "8215ef0796a20bcaaae116d3876c664a",
+    }
+  end if defined?(Digest::MD5)
+
+  class TestSHA1 < Test::Unit::TestCase
+    include TestDigest
+    ALGO = Digest::SHA1
+    DATA = {
+      Data1 => "a9993e364706816aba3e25717850c26c9cd0d89d",
+      Data2 => "84983e441c3bd26ebaae4aa1f95129e5e54670f1",
+    }
+  end if defined?(Digest::SHA1)
+
+  class TestSHA256 < Test::Unit::TestCase
+    include TestDigest
+    ALGO = Digest::SHA256
+    DATA = {
+      Data1 => "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
+      Data2 => "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1",
+    }
+  end if defined?(Digest::SHA256)
+
+  class TestSHA384 < Test::Unit::TestCase
+    include TestDigest
+    ALGO = Digest::SHA384
+    DATA = {
+      Data1 => "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7",
+      Data2 => "3391fdddfc8dc7393707a65b1b4709397cf8b1d162af05abfe8f450de5f36bc6b0455a8520bc4e6f5fe95b1fe3c8452b",
+    }
+  end if defined?(Digest::SHA384)
+
+  class TestSHA512 < Test::Unit::TestCase
+    include TestDigest
+    ALGO = Digest::SHA512
+    DATA = {
+      Data1 => "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
+      Data2 => "204a8fc6dda82f0a0ced7beb8e08a41657c16ef468b228a8279be331a703c33596fd15c13b1b07f9aa1d3bea57789ca031ad85c7a71dd70354ec631238ca3445",
+    }
+  end if defined?(Digest::SHA512)
+
+  class TestRMD160 < Test::Unit::TestCase
+    include TestDigest
+    ALGO = Digest::RMD160
+    DATA = {
+      Data1 => "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc",
+      Data2 => "12a053384a9c0c88e405a06c27dcf49ada62eb2b",
+    }
+  end if defined?(Digest::RMD160)
+end
diff --git a/ruby_1_8_6/test/drb/drbtest.rb b/ruby_1_8_6/test/drb/drbtest.rb
new file mode 100644
index 0000000000..faf6c059d9
--- /dev/null
+++ b/ruby_1_8_6/test/drb/drbtest.rb
@@ -0,0 +1,351 @@
+require 'test/unit'
+require 'drb/drb'
+require 'drb/extservm'
+require 'timeout'
+begin
+  loadpath = $:.dup
+  $:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
+  require 'envutil'
+ensure
+  $:.replace(loadpath)
+end
+
+class DRbService
+  @@manager = DRb::ExtServManager.new
+  @@ruby = EnvUtil.rubybin
+  @@ruby += " -d" if $DEBUG
+  def self.add_service_command(nm)
+    dir = File.dirname(File.expand_path(__FILE__))
+    DRb::ExtServManager.command[nm] = "\"#{@@ruby}\" \"#{dir}/#{nm}\""
+  end
+
+  %w(ut_drb.rb ut_array.rb ut_port.rb ut_large.rb ut_safe1.rb ut_eval.rb).each do |nm|
+    add_service_command(nm)
+  end
+  @server = @@server = DRb::DRbServer.new(nil, @@manager, {})
+  @@manager.uri = @@server.uri
+  def self.manager
+    @@manager
+  end
+  def self.server
+    @server || @@server
+  end
+  def self.ext_service(name)
+    timeout(100, RuntimeError) do
+      manager.service(name)
+    end
+  end
+end
+
+class Onecky
+  include DRbUndumped
+  def initialize(n)
+    @num = n
+  end
+
+  def to_i
+    @num.to_i
+  end
+
+  def sleep(n)
+    Kernel.sleep(n)
+    to_i
+  end
+end
+
+class FailOnecky < Onecky
+  class OneckyError < RuntimeError; end
+  def to_i
+    raise(OneckyError, @num.to_s)
+  end
+end
+
+class XArray < Array
+  def initialize(ary)
+    ary.each do |x|
+      self.push(x)
+    end
+  end
+end
+
+module DRbCore
+  def setup
+    @ext = DRbService.ext_service('ut_drb.rb')
+    @there = @ext.front
+  end
+
+  def teardown
+    @ext.stop_service if @ext
+  end
+
+  def test_00_DRbObject
+    ro = DRbObject.new(nil, 'druby://localhost:12345')
+    assert_equal('druby://localhost:12345', ro.__drburi)
+    assert_equal(nil, ro.__drbref)
+
+    ro = DRbObject.new_with_uri('druby://localhost:12345')
+    assert_equal('druby://localhost:12345', ro.__drburi)
+    assert_equal(nil, ro.__drbref)
+
+    ro = DRbObject.new_with_uri('druby://localhost:12345?foobar')
+    assert_equal('druby://localhost:12345', ro.__drburi)
+    assert_equal(DRb::DRbURIOption.new('foobar'), ro.__drbref)
+  end
+
+  def test_01
+    assert_equal("hello", @there.hello)
+    onecky = Onecky.new('3')
+    assert_equal(6, @there.sample(onecky, 1, 2))
+    ary = @there.to_a
+    assert_kind_of(DRb::DRbObject, ary)
+    
+    assert(@there.respond_to?(:to_a, true))
+    assert(@there.respond_to?(:eval, true))
+    assert(! @there.respond_to?(:eval, false))
+    assert(! @there.respond_to?(:eval))
+  end
+
+  def test_01_02_loop
+    onecky = Onecky.new('3')
+    50.times do
+      assert_equal(6, @there.sample(onecky, 1, 2))
+      ary = @there.to_a
+      assert_kind_of(DRb::DRbObject, ary)
+    end
+  end
+
+  def test_02_unknown
+    obj = @there.unknown_class
+    assert_kind_of(DRb::DRbUnknown, obj)
+    assert_equal('Unknown2', obj.name)
+
+    obj = @there.unknown_module
+    assert_kind_of(DRb::DRbUnknown, obj)
+    if RUBY_VERSION >= '1.8'
+      assert_equal('DRbEx::', obj.name)
+    else
+      assert_equal('DRbEx', obj.name)
+    end
+
+    assert_raises(DRb::DRbUnknownError) do
+      @there.unknown_error
+    end
+
+    onecky = FailOnecky.new('3')
+
+    assert_raises(FailOnecky::OneckyError) do
+      @there.sample(onecky, 1, 2)
+    end
+  end
+
+  def test_03
+    assert_equal(8, @there.sum(1, 1, 1, 1, 1, 1, 1, 1))
+    assert_raises(ArgumentError) do
+      @there.sum(1, 1, 1, 1, 1, 1, 1, 1, 1)
+    end
+    assert_raises(DRb::DRbConnError) do
+      @there.sum('1' * 4096)
+    end
+  end
+
+  def test_04
+    assert_respond_to(@there, 'sum')
+    assert(!(@there.respond_to? "foobar"))
+  end
+
+  def test_05_eq
+    a = @there.to_a[0]
+    b = @there.to_a[0]
+    assert(a.object_id != b.object_id)
+    assert(a == b)
+    assert_equal(a, b)
+    assert(a == @there)
+    assert_equal(a.hash, b.hash)
+    assert_equal(a.hash, @there.hash)
+    assert(a.eql?(b))
+    assert(a.eql?(@there))
+  end
+
+  def test_06_timeout
+    ten = Onecky.new(10)
+    assert_raises(TimeoutError) do
+      @there.do_timeout(ten)
+    end
+    assert_raises(TimeoutError) do
+      @there.do_timeout(ten)
+    end
+  end
+
+  def test_07_public_private_protected_missing
+    assert_nothing_raised() {
+      begin
+	@there.method_missing(:eval)
+      rescue NoMethodError
+	assert_match(/^private method \`eval\'/, $!.message)
+      end
+    }
+    assert_nothing_raised() {
+      begin
+        @there.call_private_method
+      rescue NoMethodError
+        assert_equal(NoMethodError, $!.class)
+	assert_match(/^private method \`call_private_method\'/, $!.message)
+      end
+    }
+    assert_nothing_raised() {
+      begin
+        @there.call_protected_method
+      rescue NoMethodError
+        assert_equal(NoMethodError, $!.class)
+	assert_match(/^protected method \`call_protected_method\'/, $!.message)
+      end
+    }
+    assert_nothing_raised() {
+      begin
+	@there.method_missing(:undefined_method_test)
+      rescue NoMethodError
+        assert_equal(NoMethodError, $!.class)
+	assert_match(/^undefined method \`undefined_method_test\'/, $!.message)
+      end
+    }
+    assert_raises(SecurityError) do
+      @there.method_missing(:__send__, :to_s)
+    end
+    assert_equal(true, @there.missing)
+  end
+
+  def test_08_here
+    ro = DRbObject.new(nil, DRb.uri)
+    assert_kind_of(String, ro.to_s)
+
+    ro = DRbObject.new_with_uri(DRb.uri)
+    assert_kind_of(String, ro.to_s)
+  end
+
+  def uri_concat_option(uri, opt)
+    "#{uri}?#{opt}"
+  end
+
+  def test_09_option
+    uri = uri_concat_option(@there.__drburi, "foo")
+    ro = DRbObject.new_with_uri(uri)
+    assert_equal(ro.__drburi, @there.__drburi)
+    assert_equal(3, ro.size)
+
+    uri = uri_concat_option(@there.__drburi, "")
+    ro = DRbObject.new_with_uri(uri)
+    assert_equal(ro.__drburi, @there.__drburi)
+    assert_equal(DRb::DRbURIOption.new(''), ro.__drbref)
+
+    uri = uri_concat_option(@there.__drburi, "hello?world")
+    ro = DRbObject.new_with_uri(uri)
+    assert_equal(DRb::DRbURIOption.new('hello?world'), ro.__drbref)
+
+    uri = uri_concat_option(@there.__drburi, "?hello?world")
+    ro = DRbObject.new_with_uri(uri)
+    assert_equal(DRb::DRbURIOption.new('?hello?world'), ro.__drbref)
+  end
+
+  def test_10_yield
+    @there.simple_hash.each do |k, v|
+      assert_kind_of(String, k)
+      assert_kind_of(Symbol, v)
+    end
+  end
+
+  def test_10_yield_undumped
+    @there.xarray2_hash.each do |k, v|
+      assert_kind_of(String, k)
+      assert_kind_of(DRbObject, v)
+    end
+  end
+
+  def test_11_remote_no_method_error
+    assert_raises(DRb::DRbRemoteError) do
+      @there.remote_no_method_error
+    end
+    begin
+      @there.remote_no_method_error
+    rescue
+      error = $!
+      assert_match(/^undefined method .*\(NoMethodError\)/, error.message)
+      assert_equal('NoMethodError', error.reason)
+    end
+  end
+end
+
+module DRbAry
+  def setup
+    @ext = DRbService.ext_service('ut_array.rb')
+    @there = @ext.front
+  end
+
+  def teardown
+    @ext.stop_service if @ext
+  end
+
+  def test_01
+    assert_kind_of(DRb::DRbObject, @there)
+  end
+
+  def test_02_collect
+    ary = @there.collect do |x| x + x end
+    assert_kind_of(Array, ary)
+    assert_equal([2, 4, 'IIIIII', 8, 'fivefive', 12], ary)
+  end
+
+  def test_03_redo
+    ary = []
+    count = 0
+    @there.each do |x|
+      count += 1
+      ary.push x
+      redo if count == 3
+    end
+    assert_equal([1, 2, 'III', 'III', 4, 'five', 6], ary)
+  end
+
+  def test_04_retry
+    retried = false
+    ary = []
+    @there.each do |x|
+      ary.push x
+      if x == 4 && !retried
+	retried = true
+	retry
+      end
+    end
+    assert_equal([1, 2, 'III', 4, 1, 2, 'III', 4, 'five', 6], ary)
+  end
+
+  def test_05_break
+    ary = []
+    @there.each do |x|
+      ary.push x
+      break if x == 4
+    end
+    assert_equal([1, 2, 'III', 4], ary)
+  end
+
+  def test_06_next
+    ary = []
+    @there.each do |x|
+      next if String === x
+      ary.push x
+    end
+    assert_equal([1, 2, 4, 6], ary)
+  end
+
+  class_eval <<EOS
+  def test_07_break_18
+    ary = []
+    result = @there.each do |x|
+      ary.push x
+      break(:done) if x == 4
+    end
+    assert_equal([1, 2, 'III', 4], ary)
+    assert_equal(:done, result)
+  end
+EOS
+
+end
diff --git a/ruby_1_8_6/test/drb/ignore_test_drb.rb b/ruby_1_8_6/test/drb/ignore_test_drb.rb
new file mode 100644
index 0000000000..d0bb1f49b0
--- /dev/null
+++ b/ruby_1_8_6/test/drb/ignore_test_drb.rb
@@ -0,0 +1,24 @@
+require 'drbtest'
+
+class TestDRbReusePort < Test::Unit::TestCase
+  include DRbAry
+
+  def setup
+    @ext = DRbService.ext_service('ut_port.rb')
+    @there = @ext.front
+  end
+
+  def teardown
+    return unless @ext
+    @ext.stop_service
+    while true
+      sleep 0.1
+      begin
+        @ext.alive?
+      rescue DRb::DRbConnError
+        break
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/test/drb/test_acl.rb b/ruby_1_8_6/test/drb/test_acl.rb
new file mode 100644
index 0000000000..d8955e0e75
--- /dev/null
+++ b/ruby_1_8_6/test/drb/test_acl.rb
@@ -0,0 +1,195 @@
+# acltest.rb - ACL unit test
+# Copyright (c) 2000 Masatoshi SEKI
+#
+# acltest.rb is copyrighted free software by Masatoshi SEKI.
+# You can redistribute it and/or modify it under the same terms as Ruby.
+
+require 'test/unit'
+require 'drb/acl'
+
+class SampleHosts
+  def initialize
+    list = %w(127.0.0.1 localhost
+              192.168.1.1 x68k.linux.or.jp
+              192.168.1.2 lc630.macos.or.jp
+              192.168.1.3 lib30.win32.or.jp
+              192.168.1.4 ns00.linux.or.jp
+              192.168.1.5 yum.macos.or.jp
+              ::ffff:192.168.1.5 ipv6.macos.or.jp
+              ::192.168.1.5 too.yumipv6.macos.or.jp
+              192.168.1.254 comstarz.foo.or.jp)
+
+    @hostlist = Array.new(list.size / 2)
+    @hostlist.each_index do |idx|
+      @hostlist[idx] = ["AF_INET", 10000, list[idx * 2 + 1], list[idx * 2]]
+    end
+
+    @hosts = Hash.new
+    @hostlist.each do |h|
+      @hosts[h[2].split('.')[0]] = h
+    end
+  end
+  attr_reader(:hostlist, :hosts)
+end
+
+
+class ACLEntryTest < Test::Unit::TestCase
+  HOSTS = SampleHosts.new
+
+  def setup
+    @hostlist = HOSTS.hostlist
+    @hosts = HOSTS.hosts
+  end
+
+  def test_all
+    a = ACL::ACLEntry.new("*")
+    b = ACL::ACLEntry.new("all")
+    @hostlist.each do |h|
+      assert(a.match(h))
+      assert(b.match(h))
+    end
+  end
+
+  def test_ip_v6
+    a = ACL::ACLEntry.new('::ffff:192.0.0.0/104')
+    assert(! a.match(@hosts['localhost']))
+    assert(a.match(@hosts['yum']))
+    assert(a.match(@hosts['ipv6']))
+    assert(! a.match(@hosts['too']))
+  end
+
+  def test_ip
+    a = ACL::ACLEntry.new('192.0.0.0/8')
+    assert(! a.match(@hosts['localhost']))
+    assert(a.match(@hosts['yum']))
+
+    a = ACL::ACLEntry.new('192.168.0.1/255.255.0.255')
+    assert(! a.match(@hosts['localhost']))
+    assert(! a.match(@hosts['yum']))
+    assert(a.match(@hosts['x68k']))
+
+    a = ACL::ACLEntry.new('192.168.1.0/24')
+    assert(! a.match(@hosts['localhost']))
+    assert(a.match(@hosts['yum']))
+    assert(a.match(@hosts['x68k']))
+
+    a = ACL::ACLEntry.new('92.0.0.0/8')
+    assert(! a.match(@hosts['localhost']))
+    assert(! a.match(@hosts['yum']))
+    assert(! a.match(@hosts['x68k']))
+
+    a = ACL::ACLEntry.new('127.0.0.1/255.0.0.255')
+    assert(a.match(@hosts['localhost']))
+    assert(! a.match(@hosts['yum']))
+    assert(! a.match(@hosts['x68k']))
+  end
+
+  def test_name
+    a = ACL::ACLEntry.new('*.jp')
+    assert(! a.match(@hosts['localhost']))
+    assert(a.match(@hosts['yum']))
+
+    a = ACL::ACLEntry.new('yum.*.jp')
+    assert(a.match(@hosts['yum']))
+    assert(! a.match(@hosts['lc630']))
+
+    a = ACL::ACLEntry.new('*.macos.or.jp')
+    assert(a.match(@hosts['yum']))
+    assert(a.match(@hosts['lc630']))
+    assert(! a.match(@hosts['lib30']))
+  end
+end
+
+class ACLListTest < Test::Unit::TestCase
+  HOSTS = SampleHosts.new
+
+  def setup
+    @hostlist = HOSTS.hostlist
+    @hosts = HOSTS.hosts
+  end
+
+  private
+  def build(list)
+    acl= ACL::ACLList.new
+    list.each do |s|
+      acl.add s
+    end
+    acl
+  end
+
+  public
+  def test_all_1
+    a = build(%w(all))
+    @hostlist.each do |h|
+      assert(a.match(h))
+    end
+  end
+
+  def test_all_2
+    a = build(%w(localhost 127.0.0.0/8 yum.* *))
+    @hostlist.each do |h|
+      assert(a.match(h))
+    end
+  end
+
+  def test_1
+    a = build(%w(192.0.0.1/255.0.0.255 yum.*.jp))
+    assert(a.match(@hosts['yum']))
+    assert(a.match(@hosts['x68k']))
+    assert(! a.match(@hosts['lc630']))
+  end
+
+  def test_2
+    a = build(%w(*.linux.or.jp))
+    assert(!a.match(@hosts['yum']))
+    assert(a.match(@hosts['x68k']))
+    assert(!a.match(@hosts['lc630']))
+  end
+end
+
+class ACLTest < Test::Unit::TestCase
+  HOSTS = SampleHosts.new
+
+  def setup
+    @hostlist = HOSTS.hostlist
+    @hosts = HOSTS.hosts
+  end
+
+  def test_0
+    a = ACL.new
+    @hostlist.each do |h|
+      assert(a.allow_addr?(h))
+    end
+  end
+
+  def test_not_0
+    a = ACL.new([], ACL::ALLOW_DENY)
+    @hostlist.each do |h|
+      assert(! a.allow_addr?(h))
+    end
+  end
+
+  def test_1
+    data = %w(deny all
+              allow localhost
+              allow x68k.*)
+
+    a = ACL.new(data)
+    assert(a.allow_addr?(@hosts['x68k']))
+    assert(a.allow_addr?(@hosts['localhost']))
+    assert(! a.allow_addr?(@hosts['lc630']))
+  end
+
+  def test_not_1
+    data = %w(deny 192.0.0.0/8
+              allow localhost
+              allow x68k.*)
+
+    a = ACL.new(data, ACL::ALLOW_DENY)
+    assert(!a.allow_addr?(@hosts['x68k']))
+    assert(a.allow_addr?(@hosts['localhost']))
+    assert(! a.allow_addr?(@hosts['lc630']))
+  end
+end
+
+  
diff --git a/ruby_1_8_6/test/drb/test_drb.rb b/ruby_1_8_6/test/drb/test_drb.rb
new file mode 100644
index 0000000000..5719f60b80
--- /dev/null
+++ b/ruby_1_8_6/test/drb/test_drb.rb
@@ -0,0 +1,301 @@
+require 'drbtest'
+
+class TestDRbCore < Test::Unit::TestCase
+  include DRbCore
+end
+
+class TestDRbYield < Test::Unit::TestCase
+  def setup
+    @ext = DRbService.ext_service('ut_drb.rb')
+    @there = @ext.front
+  end
+
+  def teardown
+    @ext.stop_service if @ext
+  end
+
+  def test_01_one
+    @there.echo_yield_1([]) {|one|
+      assert_equal([], one)
+    }
+    
+    @there.echo_yield_1(1) {|one|
+      assert_equal(1, one)
+    }
+    
+    @there.echo_yield_1(nil) {|one|
+      assert_equal(nil, one)
+    }
+  end
+
+  def test_02_two
+    @there.echo_yield_2([], []) {|one, two|
+      assert_equal([], one)
+      assert_equal([], two)
+    }
+
+    @there.echo_yield_2(1, 2) {|one, two|
+      assert_equal(1, one)
+      assert_equal(2, two)
+    }
+
+    @there.echo_yield_2(3, nil) {|one, two|
+      assert_equal(3, one)
+      assert_equal(nil, two)
+    }
+
+    @there.echo_yield_1([:key, :value]) {|one, two|
+      assert_equal(:key, one)
+      assert_equal(:value, two)
+    }
+  end
+
+  def test_03_many
+    @there.echo_yield_0 {|*s|
+      assert_equal([], s)
+    }
+    @there.echo_yield(nil) {|*s|
+      assert_equal([nil], s)
+    }
+    @there.echo_yield(1) {|*s|
+      assert_equal([1], s)
+    }
+    @there.echo_yield(1, 2) {|*s|
+      assert_equal([1, 2], s)
+    }
+    @there.echo_yield(1, 2, 3) {|*s|
+      assert_equal([1, 2, 3], s)
+    }
+    @there.echo_yield([], []) {|*s|
+      assert_equal([[], []], s)
+    }
+    @there.echo_yield([]) {|*s|
+      assert_equal([[]], s) # !
+    }
+  end
+
+  def test_04_many_to_one
+    @there.echo_yield_0 {|*s|
+      assert_equal([], s)
+    }
+    @there.echo_yield(nil) {|*s|
+      assert_equal([nil], s)
+    }
+    @there.echo_yield(1) {|*s|
+      assert_equal([1], s)
+    }
+    @there.echo_yield(1, 2) {|*s|
+      assert_equal([1, 2], s)
+    }
+    @there.echo_yield(1, 2, 3) {|*s|
+      assert_equal([1, 2, 3], s)
+    }
+    @there.echo_yield([], []) {|*s|
+      assert_equal([[], []], s)
+    }
+    @there.echo_yield([]) {|*s|
+      assert_equal([[]], s)
+    }
+  end
+
+  def test_05_array_subclass
+    @there.xarray_each {|x| assert_kind_of(XArray, x)}
+    @there.xarray_each {|*x| assert_kind_of(XArray, x[0])}
+  end
+
+  def test_06_taint
+    x = proc {}
+    assert(! x.tainted?)
+    @there.echo_yield(x) {|o|
+      assert_equal(x, o)
+      assert(! x.tainted?)
+    }
+  end
+end
+
+class TestRubyYield < TestDRbYield
+  def echo_yield(*arg)
+    yield(*arg)
+  end
+
+  def echo_yield_0
+    yield
+  end
+
+  def echo_yield_1(a)
+    yield(a)
+  end
+
+  def echo_yield_2(a, b)
+    yield(a, b)
+  end
+
+  def xarray_each
+    xary = [XArray.new([0])]
+    xary.each do |x|
+      yield(x)
+    end
+  end
+
+  def setup
+    @there = self
+  end
+  
+  def teardown
+  end
+end
+
+class TestRuby18Yield < TestRubyYield
+  class YieldTest18
+    def echo_yield(*arg, &proc)
+      proc.call(*arg)
+    end
+    
+    def echo_yield_0(&proc)
+      proc.call
+    end
+    
+    def echo_yield_1(a, &proc)
+      proc.call(a)
+    end
+    
+    def echo_yield_2(a, b, &proc)
+      proc.call(a, b)
+    end
+
+    def xarray_each(&proc)
+      xary = [XArray.new([0])]
+      xary.each(&proc)
+    end
+
+  end
+
+  def setup
+    @there = YieldTest18.new
+  end
+end
+
+class TestDRbAry < Test::Unit::TestCase
+  include DRbAry
+end
+
+class TestDRbMServer < Test::Unit::TestCase
+  def setup
+    @ext = DRbService.ext_service('ut_drb.rb')
+    @there = @ext.front
+    @server = (1..3).collect do |n|
+      DRb::DRbServer.new(nil, Onecky.new(n.to_s))
+    end
+  end
+
+  def teardown
+    @server.each do |s|
+      s.stop_service
+    end
+    @ext.stop_service if @ext
+  end
+
+  def test_01
+    assert_equal(6, @there.sample(@server[0].front, @server[1].front, @server[2].front))
+  end
+end
+
+class TestDRbSafe1 < TestDRbAry
+  def setup
+    @ext = DRbService.ext_service('ut_safe1.rb')
+    @there = @ext.front
+  end
+end
+
+class TestDRbEval < Test::Unit::TestCase
+  def setup
+    super
+    @ext = DRbService.ext_service('ut_eval.rb')
+    @there = @ext.front
+  end
+
+  def teardown
+    @ext.stop_service if @ext
+  end
+  
+  def test_01_safe1_safe4_eval
+    assert_raises(SecurityError) do
+      @there.method_missing(:instance_eval, 'ENV.inspect')
+    end
+
+    assert_raises(SecurityError) do
+      @there.method_missing(:send, :eval, 'ENV.inspect')
+    end
+
+    remote_class = @there.remote_class
+
+    assert_raises(SecurityError) do
+      remote_class.class_eval('ENV.inspect')
+    end
+
+    assert_raises(SecurityError) do
+      remote_class.module_eval('ENV.inspect')
+    end
+
+    four = @there.four
+    assert_equal(1, four.method_missing(:send, :eval, '1'))
+    
+    remote_class = four.remote_class
+
+    assert_equal(1, remote_class.class_eval('1'))
+
+    assert_equal(1, remote_class.module_eval('1'))
+
+    assert_raises(SecurityError) do
+      remote_class.class_eval('ENV = {}')
+    end
+
+    assert_raises(SecurityError) do
+      remote_class.module_eval('ENV = {}')
+    end
+  end
+end
+
+class TestDRbLarge < Test::Unit::TestCase
+  def setup
+    @ext = DRbService.ext_service('ut_large.rb')
+    @there = @ext.front
+  end
+
+  def teardown
+    @ext.stop_service if @ext
+  end
+
+  def test_01_large_ary
+    ary = [2] * 10240
+    assert_equal(10240, @there.size(ary))
+    assert_equal(20480, @there.sum(ary))
+  end
+
+  def test_02_large_ary
+    ary = ["Hello, World"] * 10240
+    assert_equal(10240, @there.size(ary))
+  end
+
+  def test_03_large_ary
+    ary = [Thread.current] * 10240
+    assert_equal(10240, @there.size(ary))
+  end
+
+  def test_04_many_arg
+    assert_raises(ArgumentError) {
+      @there.arg_test(1, 2, 3, 4, 5, 6, 7, 8, 9, 0)
+    }
+  end
+
+  def test_05_too_large_ary
+    ary = ["Hello, World"] * 102400
+    exception = nil
+    begin
+      @there.size(ary)      
+    rescue StandardError
+      exception = $!
+    end
+    assert_kind_of(StandardError, exception)
+  end
+end
diff --git a/ruby_1_8_6/test/drb/test_drbssl.rb b/ruby_1_8_6/test/drb/test_drbssl.rb
new file mode 100644
index 0000000000..cfb3bc36a4
--- /dev/null
+++ b/ruby_1_8_6/test/drb/test_drbssl.rb
@@ -0,0 +1,62 @@
+require 'drbtest'
+
+begin
+  require 'drb/ssl'
+rescue LoadError
+end
+
+if Object.const_defined?("OpenSSL")
+
+
+class DRbSSLService < DRbService
+  %w(ut_drb_drbssl.rb ut_array_drbssl.rb).each do |nm|
+    add_service_command(nm)
+  end
+  config = Hash.new
+
+  config[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER
+  config[:SSLVerifyCallback] = lambda{ |ok,x509_store|
+    true
+  }
+  begin
+    data = open("sample.key"){|io| io.read }
+    config[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(data)
+    data = open("sample.crt"){|io| io.read }
+    config[:SSLCertificate] = OpenSSL::X509::Certificate.new(data)
+  rescue
+    # $stderr.puts "Switching to use self-signed certificate"
+    config[:SSLCertName] =
+      [ ["C","JP"], ["O","Foo.DRuby.Org"], ["CN", "Sample"] ]
+  end
+
+  uri = ARGV.shift if $0 == __FILE__
+  @server = DRb::DRbServer.new(uri || 'drbssl://:0', self.manager, config)
+end
+
+class TestDRbSSLCore < Test::Unit::TestCase
+  include DRbCore
+  def setup
+    @ext = DRbSSLService.ext_service('ut_drb_drbssl.rb')
+    @there = @ext.front
+  end
+
+  def test_02_unknown
+  end
+
+  def test_01_02_loop
+  end
+
+  def test_05_eq
+  end
+end
+
+class TestDRbSSLAry < Test::Unit::TestCase
+  include DRbAry
+  def setup
+    @ext = DRbSSLService.ext_service('ut_array_drbssl.rb')
+    @there = @ext.front
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/drb/test_drbunix.rb b/ruby_1_8_6/test/drb/test_drbunix.rb
new file mode 100644
index 0000000000..e1a17edd3d
--- /dev/null
+++ b/ruby_1_8_6/test/drb/test_drbunix.rb
@@ -0,0 +1,46 @@
+require 'drbtest'
+
+begin
+  require 'drb/unix'
+rescue LoadError
+end
+
+if Object.const_defined?("UNIXServer")
+
+
+class DRbUNIXService < DRbService
+  %w(ut_drb_drbunix.rb ut_array_drbunix.rb).each do |nm|
+    add_service_command(nm)
+  end
+
+  uri = ARGV.shift if $0 == __FILE__
+  @server = DRb::DRbServer.new(uri || 'drbunix:', self.manager, {})
+end
+
+class TestDRbUNIXCore < Test::Unit::TestCase
+  include DRbCore
+  def setup
+    @ext = DRbUNIXService.ext_service('ut_drb_drbunix.rb')
+    @there = @ext.front
+  end
+
+  def test_02_unknown
+  end
+
+  def test_01_02_loop
+  end
+
+  def test_05_eq
+  end
+end
+
+class TestDRbUNIXAry < Test::Unit::TestCase
+  include DRbAry
+  def setup
+    @ext = DRbUNIXService.ext_service('ut_array_drbunix.rb')
+    @there = @ext.front
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/drb/ut_array.rb b/ruby_1_8_6/test/drb/ut_array.rb
new file mode 100644
index 0000000000..6d9778ffbc
--- /dev/null
+++ b/ruby_1_8_6/test/drb/ut_array.rb
@@ -0,0 +1,15 @@
+require 'drb/drb'
+require 'drb/extserv'
+
+if __FILE__ == $0
+  def ARGV.shift
+    it = super()
+    raise "usage: #{$0} <uri> <name>" unless it
+    it
+  end
+
+  DRb.start_service(nil, [1, 2, 'III', 4, "five", 6])
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+  DRb.thread.join
+end
+
diff --git a/ruby_1_8_6/test/drb/ut_array_drbssl.rb b/ruby_1_8_6/test/drb/ut_array_drbssl.rb
new file mode 100644
index 0000000000..5644af5600
--- /dev/null
+++ b/ruby_1_8_6/test/drb/ut_array_drbssl.rb
@@ -0,0 +1,24 @@
+require 'drb/drb'
+require 'drb/extserv'
+require 'drb/ssl'
+
+if __FILE__ == $0
+  def ARGV.shift
+    it = super()
+    raise "usage: #{$0} <uri> <name>" unless it
+    it
+  end
+
+  config = Hash.new
+  config[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER
+  config[:SSLVerifyCallback] = lambda{|ok,x509_store|
+    true
+  }
+  config[:SSLCertName] =
+    [ ["C","JP"], ["O","Foo.DRuby.Org"], ["CN", "Sample"] ]
+
+  DRb.start_service('drbssl://:0', [1, 2, 'III', 4, "five", 6], config)
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+  DRb.thread.join
+end
+
diff --git a/ruby_1_8_6/test/drb/ut_array_drbunix.rb b/ruby_1_8_6/test/drb/ut_array_drbunix.rb
new file mode 100644
index 0000000000..76d2a610af
--- /dev/null
+++ b/ruby_1_8_6/test/drb/ut_array_drbunix.rb
@@ -0,0 +1,15 @@
+require 'drb/drb'
+require 'drb/extserv'
+
+if __FILE__ == $0
+  def ARGV.shift
+    it = super()
+    raise "usage: #{$0} <uri> <name>" unless it
+    it
+  end
+
+  DRb.start_service('drbunix:', [1, 2, 'III', 4, "five", 6])
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+  DRb.thread.join
+end
+
diff --git a/ruby_1_8_6/test/drb/ut_drb.rb b/ruby_1_8_6/test/drb/ut_drb.rb
new file mode 100644
index 0000000000..f5720cfca2
--- /dev/null
+++ b/ruby_1_8_6/test/drb/ut_drb.rb
@@ -0,0 +1,160 @@
+require 'drb/drb'
+require 'drb/extserv'
+require 'timeout'
+
+class XArray < Array
+  def initialize(ary)
+    ary.each do |x|
+      self.push(x)
+    end
+  end
+end
+
+class XArray2 < XArray
+  include DRbUndumped
+end
+
+class Unknown2
+  def initialize
+    @foo = 'unknown2'
+  end
+end
+
+class DRbEx
+  include DRbUndumped
+
+  class FooBar
+    def initialize
+      @foo = 'bar'
+    end
+  end
+
+  class UError < RuntimeError; end
+
+  def initialize
+    @hello = 'hello'
+  end
+  attr_reader :hello
+
+  def sample(a, b, c)
+    a.to_i + b.to_i + c.to_i
+  end
+
+  def sum(*a)
+    s = 0
+    a.each do |e|
+      s += e.to_i
+    end
+    s
+  end
+
+  def do_timeout(n)
+    timeout(0.1) do
+      n.sleep(2)
+    end
+  end
+
+  def unknown_module
+    FooBar.new
+  end
+
+  def unknown_class
+    Unknown2.new
+  end
+
+  def unknown_error
+    raise UError
+  end
+
+  def remote_no_method_error
+    invoke_no_method(self)
+  end
+
+  def test_yield
+    yield
+    yield([])
+    yield(*[])
+  end
+
+  def echo_yield(*arg)
+    yield(*arg)
+    nil
+  end
+
+  def echo_yield_0
+    yield
+    nil
+  end
+
+  def echo_yield_1(one)
+    yield(one)
+    nil
+  end
+
+  def echo_yield_2(one, two)
+    yield(one, two)
+    nil
+  end
+
+  def xarray_each
+    xary = [XArray.new([0])]
+    xary.each do |x|
+      yield(x)
+    end
+    nil
+  end
+
+  def xarray2_hash
+    unless @xary2_hash
+      @xary2_hash = { "a" => XArray2.new([0]), "b" => XArray2.new([1]) }
+    end
+    DRbObject.new(@xary2_hash)
+  end
+
+  def simple_hash
+    unless @hash
+      @hash = { 'a'=>:a, 'b'=>:b }
+    end
+    DRbObject.new(@hash)
+  end
+
+  def [](key)
+    key.to_s
+  end
+
+  def to_a
+    [self]
+  end
+
+  def method_missing(msg, *a, &b)
+    if msg == :missing
+      return true
+    else
+      super(msg, *a, &b)
+    end
+  end
+
+  private
+  def call_private_method
+    true
+  end
+
+  protected
+  def call_protected_method
+    true
+  end
+end
+
+if __FILE__ == $0
+  def ARGV.shift
+    it = super()
+    raise "usage: #{$0} <manager-uri> <name>" unless it
+    it
+  end
+
+  DRb::DRbServer.default_argc_limit(8)
+  DRb::DRbServer.default_load_limit(4096)
+  DRb.start_service('druby://localhost:0', DRbEx.new)
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+  DRb.thread.join
+end
diff --git a/ruby_1_8_6/test/drb/ut_drb_drbssl.rb b/ruby_1_8_6/test/drb/ut_drb_drbssl.rb
new file mode 100644
index 0000000000..0a2191e71a
--- /dev/null
+++ b/ruby_1_8_6/test/drb/ut_drb_drbssl.rb
@@ -0,0 +1,25 @@
+require "#{File.dirname(File.expand_path(__FILE__))}/ut_drb"
+require 'drb/ssl'
+
+if __FILE__ == $0
+  def ARGV.shift
+    it = super()
+    raise "usage: #{$0} <manager-uri> <name>" unless it
+    it
+  end
+
+  config = Hash.new
+  config[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER
+  config[:SSLVerifyCallback] = lambda{|ok,x509_store|
+    true
+  }
+  config[:SSLCertName] =
+    [ ["C","JP"], ["O","Foo.DRuby.Org"], ["CN", "Sample"] ]
+
+  DRb::DRbServer.default_argc_limit(8)
+  DRb::DRbServer.default_load_limit(4096)
+  DRb.start_service('drbssl://localhost:0', DRbEx.new, config)
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+  DRb.thread.join
+end
+
diff --git a/ruby_1_8_6/test/drb/ut_drb_drbunix.rb b/ruby_1_8_6/test/drb/ut_drb_drbunix.rb
new file mode 100644
index 0000000000..8b9484cf9c
--- /dev/null
+++ b/ruby_1_8_6/test/drb/ut_drb_drbunix.rb
@@ -0,0 +1,16 @@
+require "#{File.dirname(File.expand_path(__FILE__))}/ut_drb"
+
+if __FILE__ == $0
+  def ARGV.shift
+    it = super()
+    raise "usage: #{$0} <manager-uri> <name>" unless it
+    it
+  end
+
+  DRb::DRbServer.default_argc_limit(8)
+  DRb::DRbServer.default_load_limit(4096)
+  DRb.start_service('drbunix:', DRbEx.new)
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+  DRb.thread.join
+end
+
diff --git a/ruby_1_8_6/test/drb/ut_eval.rb b/ruby_1_8_6/test/drb/ut_eval.rb
new file mode 100644
index 0000000000..4df963e7cd
--- /dev/null
+++ b/ruby_1_8_6/test/drb/ut_eval.rb
@@ -0,0 +1,31 @@
+require 'drb/drb'
+require 'drb/extserv'
+
+class EvalAttack
+  def initialize
+    @four = DRb::DRbServer.new('druby://localhost:0', self, {:safe_level => 4})
+  end
+
+  def four
+    DRbObject.new_with_uri(@four.uri)
+  end
+
+  def remote_class
+    DRbObject.new(self.class)
+  end
+end
+
+
+if __FILE__ == $0
+  def ARGV.shift
+    it = super()
+    raise "usage: #{$0} <uri> <name>" unless it
+    it
+  end
+
+  $SAFE = 1
+
+  DRb.start_service('druby://localhost:0', EvalAttack.new, {:safe_level => 2})
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+  DRb.thread.join
+end
diff --git a/ruby_1_8_6/test/drb/ut_large.rb b/ruby_1_8_6/test/drb/ut_large.rb
new file mode 100644
index 0000000000..d6717c5589
--- /dev/null
+++ b/ruby_1_8_6/test/drb/ut_large.rb
@@ -0,0 +1,38 @@
+require 'drb/drb'
+require 'drb/extserv'
+require 'timeout'
+
+class DRbLarge
+  include DRbUndumped
+
+  def size(ary)
+    ary.size 
+  end
+
+  def sum(ary)
+    sum = 0
+    ary.each do |e|
+      sum += e.to_i
+    end
+    sum
+  end
+
+  def arg_test(*arg)
+    # nop
+  end
+end
+
+if __FILE__ == $0
+  def ARGV.shift
+    it = super()
+    raise "usage: #{$0} <manager-uri> <name>" unless it
+    it
+  end
+
+  DRb::DRbServer.default_argc_limit(3)
+  DRb::DRbServer.default_load_limit(100000)
+  DRb.start_service('druby://localhost:0', DRbLarge.new)
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+  DRb.thread.join
+end
+
diff --git a/ruby_1_8_6/test/drb/ut_port.rb b/ruby_1_8_6/test/drb/ut_port.rb
new file mode 100644
index 0000000000..337e0eda86
--- /dev/null
+++ b/ruby_1_8_6/test/drb/ut_port.rb
@@ -0,0 +1,14 @@
+require 'drb/drb'
+require 'drb/extserv'
+
+if __FILE__ == $0
+  def ARGV.shift
+    it = super()
+    raise "usage: #{$0} <uri> <name>" unless it
+    it
+  end
+
+  DRb.start_service('druby://:8473', [1, 2, 'III', 4, "five", 6])
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+  DRb.thread.join
+end
diff --git a/ruby_1_8_6/test/drb/ut_safe1.rb b/ruby_1_8_6/test/drb/ut_safe1.rb
new file mode 100644
index 0000000000..4df8e1e5a1
--- /dev/null
+++ b/ruby_1_8_6/test/drb/ut_safe1.rb
@@ -0,0 +1,15 @@
+require 'drb/drb'
+require 'drb/extserv'
+
+if __FILE__ == $0
+  def ARGV.shift
+    it = super()
+    raise "usage: #{$0} <uri> <name>" unless it
+    it
+  end
+
+  DRb.start_service('druby://localhost:0', [1, 2, 'III', 4, "five", 6], 
+                    {:safe_level => 1})
+  es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
+  DRb.thread.join
+end
diff --git a/ruby_1_8_6/test/drb/ut_timerholder.rb b/ruby_1_8_6/test/drb/ut_timerholder.rb
new file mode 100644
index 0000000000..141cb73302
--- /dev/null
+++ b/ruby_1_8_6/test/drb/ut_timerholder.rb
@@ -0,0 +1,49 @@
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+require 'timerholder'
+
+class TimerHolderTest < RUNIT::TestCase
+  def do_test(timeout, keeper_sleep = nil)
+    holder = TimerHolder.new(timeout)
+    holder.keeper_sleep = keeper_sleep if keeper_sleep
+    key = holder.add(self)
+    sleep(timeout * 0.5)
+    assert_equal(holder.peek(key), self)
+    holder.delete(key)
+    assert(!holder.include?(key))
+    key = holder.add(self)
+    sleep(timeout+0.5)
+    assert_equal(holder.fetch(key), nil)
+    key = holder.add(self)
+    assert_equal(holder.fetch(key), self)
+    holder.store(key, true)
+    assert_equal(holder.fetch(key), true)
+    assert_equal(holder.include?(key), true)
+    sleep(timeout+0.5)
+    assert_exception(TimerHolder::InvalidIndexError) do
+      holder.store(key, 1)
+    end
+    assert_equal(holder.include?(key), false)
+    key = holder.add(self)
+    sleep(timeout * 0.5)
+    assert(holder.include?(key))
+    holder.extend(key, timeout)
+    sleep(timeout * 0.5)
+    assert(holder.include?(key))
+    sleep(timeout * 0.6)
+    assert(!holder.include?(key))
+    holder.delete(key)
+  end
+  
+  def test_00
+    do_test(0.5)
+  end
+
+  def test_01
+    do_test(1, 0.5)
+  end
+end
+
+if __FILE__ == $0
+  RUNIT::CUI::TestRunner.run(TimerHolderTest.suite)
+end
diff --git a/ruby_1_8_6/test/erb/test_erb.rb b/ruby_1_8_6/test/erb/test_erb.rb
new file mode 100644
index 0000000000..8641197414
--- /dev/null
+++ b/ruby_1_8_6/test/erb/test_erb.rb
@@ -0,0 +1,40 @@
+require 'test/unit'
+require 'erb'
+
+class TestERB < Test::Unit::TestCase
+  class MyError < RuntimeError ; end
+
+  def test_without_filename
+    erb = ERB.new("<% raise ::TestERB::MyError %>")
+    e = assert_raise(MyError) {
+      erb.result
+    }
+    assert_equal("(erb):1", e.backtrace[0])
+  end
+
+  def test_with_filename
+    erb = ERB.new("<% raise ::TestERB::MyError %>")
+    erb.filename = "test filename"
+    e = assert_raise(MyError) {
+      erb.result
+    }
+    assert_equal("test filename:1", e.backtrace[0])
+  end
+
+  def test_without_filename_with_safe_level
+    erb = ERB.new("<% raise ::TestERB::MyError %>", 1)
+    e = assert_raise(MyError) {
+      erb.result
+    }
+    assert_equal("(erb):1", e.backtrace[0])
+  end
+
+  def test_with_filename_and_safe_level
+    erb = ERB.new("<% raise ::TestERB::MyError %>", 1)
+    erb.filename = "test filename"
+    e = assert_raise(MyError) {
+      erb.result
+    }
+    assert_equal("test filename:1", e.backtrace[0])
+  end
+end
diff --git a/ruby_1_8_6/test/fileutils/fileasserts.rb b/ruby_1_8_6/test/fileutils/fileasserts.rb
new file mode 100644
index 0000000000..c2e9244a96
--- /dev/null
+++ b/ruby_1_8_6/test/fileutils/fileasserts.rb
@@ -0,0 +1,67 @@
+# $Id$
+
+module Test
+  module Unit
+    module Assertions   # redefine
+
+      def assert_same_file(from, to)
+        _wrap_assertion {
+          assert_block("file #{from} != #{to}") {
+            File.read(from) == File.read(to)
+          }
+        }
+      end
+
+      def assert_same_entry(from, to)
+        a = File.stat(from)
+        b = File.stat(to)
+        assert_equal a.mode, b.mode, "mode #{a.mode} != #{b.mode}"
+        #assert_equal a.atime, b.atime
+        assert_equal a.mtime, b.mtime, "mtime #{a.mtime} != #{b.mtime}"
+        assert_equal a.uid, b.uid, "uid #{a.uid} != #{b.uid}"
+        assert_equal a.gid, b.gid, "gid #{a.gid} != #{b.gid}"
+      end
+
+      def assert_file_exist(path)
+        _wrap_assertion {
+          assert_block("file not exist: #{path}") {
+            File.exist?(path)
+          }
+        }
+      end
+
+      def assert_file_not_exist(path)
+        _wrap_assertion {
+          assert_block("file not exist: #{path}") {
+            not File.exist?(path)
+          }
+        }
+      end
+
+      def assert_directory(path)
+        _wrap_assertion {
+          assert_block("is not directory: #{path}") {
+            File.directory?(path)
+          }
+        }
+      end
+
+      def assert_symlink(path)
+        _wrap_assertion {
+          assert_block("is not a symlink: #{path}") {
+            File.symlink?(path)
+          }
+        }
+      end
+
+      def assert_not_symlink(path)
+        _wrap_assertion {
+          assert_block("is a symlink: #{path}") {
+            not File.symlink?(path)
+          }
+        }
+      end
+
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/fileutils/test_dryrun.rb b/ruby_1_8_6/test/fileutils/test_dryrun.rb
new file mode 100644
index 0000000000..2fdd65d2f6
--- /dev/null
+++ b/ruby_1_8_6/test/fileutils/test_dryrun.rb
@@ -0,0 +1,25 @@
+# $Id$
+
+require 'test/unit'
+require 'fileutils'
+
+class TestFileUtilsDryRun < Test::Unit::TestCase
+
+  include FileUtils::DryRun
+
+  def test_visibility
+    FileUtils::METHODS.each do |m|
+      assert_equal true, FileUtils::DryRun.respond_to?(m, true),
+                   "FileUtils::DryRun.#{m} not defined"
+      assert_equal true, FileUtils::DryRun.respond_to?(m, false),
+                   "FileUtils::DryRun.#{m} not public"
+    end
+    FileUtils::METHODS.each do |m|
+      assert_equal true, respond_to?(m, true)
+                   "FileUtils::DryRun\##{m} is not defined"
+      assert_equal true, FileUtils::DryRun.private_method_defined?(m),
+                   "FileUtils::DryRun\##{m} is not private"
+    end
+  end
+
+end
diff --git a/ruby_1_8_6/test/fileutils/test_fileutils.rb b/ruby_1_8_6/test/fileutils/test_fileutils.rb
new file mode 100644
index 0000000000..cab51c9e8c
--- /dev/null
+++ b/ruby_1_8_6/test/fileutils/test_fileutils.rb
@@ -0,0 +1,1085 @@
+# $Id$
+
+require 'fileutils'
+require 'fileasserts'
+require 'pathname'
+require 'tmpdir'
+require 'test/unit'
+
+class TestFileUtils < Test::Unit::TestCase
+  TMPROOT = "#{Dir.tmpdir}/fileutils.rb.#{$$}"
+end
+
+prevdir = Dir.pwd
+tmproot = TestFileUtils::TMPROOT
+Dir.mkdir tmproot unless File.directory?(tmproot)
+Dir.chdir tmproot
+
+def have_drive_letter?
+  /djgpp|mswin(?!ce)|mingw|bcc|emx/ =~ RUBY_PLATFORM
+end
+
+def have_file_perm?
+  /djgpp|mswin|mingw|bcc|wince|emx/ !~ RUBY_PLATFORM
+end
+
+$fileutils_rb_have_symlink = nil
+
+def have_symlink?
+  if $fileutils_rb_have_symlink == nil
+    $fileutils_rb_have_symlink = check_have_symlink?
+  end
+  $fileutils_rb_have_symlink
+end
+
+def check_have_symlink?
+  File.symlink nil, nil
+rescue NotImplementedError
+  return false
+rescue
+  return true
+end
+
+$fileutils_rb_have_hardlink = nil
+
+def have_hardlink?
+  if $fileutils_rb_have_hardlink == nil
+    $fileutils_rb_have_hardlink = check_have_hardlink?
+  end
+  $fileutils_rb_have_hardlink
+end
+
+def check_have_hardlink?
+  File.link nil, nil
+rescue NotImplementedError
+  return false
+rescue
+  return true
+end
+
+begin
+  Dir.mkdir("\n")
+  Dir.rmdir("\n")
+  def lf_in_path_allowed?
+    true
+  end
+rescue
+  def lf_in_path_allowed?
+    false
+  end
+end
+
+Dir.chdir prevdir
+Dir.rmdir tmproot
+
+class TestFileUtils
+
+  include FileUtils
+
+  def check_singleton(name)
+    assert_equal true, ::FileUtils.public_methods.include?(name.to_s)
+  end
+
+  def my_rm_rf(path)
+    if File.exist?('/bin/rm')
+      system %Q[/bin/rm -rf "#{path}"]
+    else
+      FileUtils.rm_rf path
+    end
+  end
+
+  def mymkdir(path)
+    Dir.mkdir path
+    File.chown nil, Process.gid, path if have_file_perm?
+  end
+
+  def setup
+    @prevdir = Dir.pwd
+    tmproot = TMPROOT
+    mymkdir tmproot unless File.directory?(tmproot)
+    Dir.chdir tmproot
+    my_rm_rf 'data'; mymkdir 'data'
+    my_rm_rf 'tmp';  mymkdir 'tmp'
+    prepare_data_file
+  end
+
+  def teardown
+    tmproot = Dir.pwd
+    Dir.chdir @prevdir
+    my_rm_rf tmproot
+  end
+
+
+  TARGETS = %w( data/a data/all data/random data/zero )
+
+  def prepare_data_file
+    File.open('data/a', 'w') {|f|
+      32.times do
+        f.puts 'a' * 50
+      end
+    }
+
+    all_chars = (0..255).map {|n| n.chr }.join('')
+    File.open('data/all', 'w') {|f|
+      32.times do
+        f.puts all_chars
+      end
+    }
+
+    random_chars = (0...50).map { rand(256).chr }.join('')
+    File.open('data/random', 'w') {|f|
+      32.times do
+        f.puts random_chars
+      end
+    }
+
+    File.open('data/zero', 'w') {|f|
+      ;
+    }
+  end
+
+  BIGFILE = 'data/big'
+
+  def prepare_big_file
+    File.open('data/big', 'w') {|f|
+      (4 * 1024 * 1024 / 256).times do   # 4MB
+        f.print "aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa\n"
+      end
+    }
+  end
+
+  def prepare_time_data
+    File.open('data/old',    'w') {|f| f.puts 'dummy' }
+    File.open('data/newer',  'w') {|f| f.puts 'dummy' }
+    File.open('data/newest', 'w') {|f| f.puts 'dummy' }
+    t = Time.now
+    File.utime t-8, t-8, 'data/old'
+    File.utime t-4, t-4, 'data/newer'
+  end
+
+  def each_srcdest
+    TARGETS.each do |path|
+      yield path, "tmp/#{File.basename(path)}"
+    end
+  end
+
+  #
+  # Test Cases
+  #
+
+  def test_pwd
+    check_singleton :pwd
+
+    assert_equal Dir.pwd, pwd()
+
+    cwd = Dir.pwd
+if have_drive_letter?
+    cd('C:/') {
+      assert_equal 'C:/', pwd()
+    }
+    assert_equal cwd, pwd()
+else
+    cd('/') {
+      assert_equal '/', pwd()
+    }
+    assert_equal cwd, pwd()
+end
+  end
+
+  def test_cmp
+    check_singleton :cmp
+
+    TARGETS.each do |fname|
+      assert cmp(fname, fname), 'not same?'
+    end
+    assert_raises(ArgumentError) {
+      cmp TARGETS[0], TARGETS[0], :undefinedoption => true
+    }
+
+    # pathname
+    touch 'tmp/cmptmp'
+    assert_nothing_raised {
+      cmp Pathname.new('tmp/cmptmp'), 'tmp/cmptmp'
+      cmp 'tmp/cmptmp', Pathname.new('tmp/cmptmp')
+      cmp Pathname.new('tmp/cmptmp'), Pathname.new('tmp/cmptmp')
+    }
+  end
+
+  def test_cp
+    check_singleton :cp
+
+    each_srcdest do |srcpath, destpath|
+      cp srcpath, destpath
+      assert_same_file srcpath, destpath
+
+      cp srcpath, File.dirname(destpath)
+      assert_same_file srcpath, destpath
+
+      cp srcpath, File.dirname(destpath) + '/'
+      assert_same_file srcpath, destpath
+
+      cp srcpath, destpath, :preserve => true
+      assert_same_file srcpath, destpath
+      assert_same_entry srcpath, destpath
+    end
+
+    # src==dest (1) same path
+    touch 'tmp/cptmp'
+    assert_raises(ArgumentError) {
+      cp 'tmp/cptmp', 'tmp/cptmp'
+    }
+if have_symlink?
+    # src==dest (2) symlink and its target
+    File.symlink 'cptmp', 'tmp/cptmp_symlink'
+    assert_raises(ArgumentError) {
+      cp 'tmp/cptmp', 'tmp/cptmp_symlink'
+    }
+    assert_raises(ArgumentError) {
+      cp 'tmp/cptmp_symlink', 'tmp/cptmp'
+    }
+    # src==dest (3) looped symlink
+    File.symlink 'symlink', 'tmp/symlink'
+    assert_raises(Errno::ELOOP) {
+      cp 'tmp/symlink', 'tmp/symlink'
+    }
+end
+
+    # pathname
+    assert_nothing_raised {
+      cp 'tmp/cptmp', Pathname.new('tmp/tmpdest')
+      cp Pathname.new('tmp/cptmp'), 'tmp/tmpdest'
+      cp Pathname.new('tmp/cptmp'), Pathname.new('tmp/tmpdest')
+      mkdir 'tmp/tmpdir'
+      cp ['tmp/cptmp', 'tmp/tmpdest'], Pathname.new('tmp/tmpdir')
+    }
+  end
+
+  def test_cp_r
+    check_singleton :cp_r
+
+    cp_r 'data', 'tmp'
+    TARGETS.each do |fname|
+      assert_same_file fname, "tmp/#{fname}"
+    end
+
+    cp_r 'data', 'tmp2', :preserve => true
+    TARGETS.each do |fname|
+      assert_same_entry fname, "tmp2/#{File.basename(fname)}"
+      assert_same_file fname, "tmp2/#{File.basename(fname)}"
+    end
+
+    # a/* -> b/*
+    mkdir 'tmp/cpr_src'
+    mkdir 'tmp/cpr_dest'
+    File.open('tmp/cpr_src/a', 'w') {|f| f.puts 'a' }
+    File.open('tmp/cpr_src/b', 'w') {|f| f.puts 'b' }
+    File.open('tmp/cpr_src/c', 'w') {|f| f.puts 'c' }
+    mkdir 'tmp/cpr_src/d'
+    cp_r 'tmp/cpr_src/.', 'tmp/cpr_dest'
+    assert_same_file 'tmp/cpr_src/a', 'tmp/cpr_dest/a'
+    assert_same_file 'tmp/cpr_src/b', 'tmp/cpr_dest/b'
+    assert_same_file 'tmp/cpr_src/c', 'tmp/cpr_dest/c'
+    assert_directory 'tmp/cpr_dest/d'
+    my_rm_rf 'tmp/cpr_src'
+    my_rm_rf 'tmp/cpr_dest'
+
+if have_symlink?
+    # symlink in a directory
+    mkdir 'tmp/cpr_src'
+    ln_s 'SLdest', 'tmp/cpr_src/symlink'
+    cp_r 'tmp/cpr_src', 'tmp/cpr_dest'
+    assert_symlink 'tmp/cpr_dest/symlink'
+    assert_equal 'SLdest', File.readlink('tmp/cpr_dest/symlink')
+
+    # root is a symlink
+    ln_s 'cpr_src', 'tmp/cpr_src2'
+    cp_r 'tmp/cpr_src2', 'tmp/cpr_dest2'
+    assert_directory 'tmp/cpr_dest2'
+    #assert_not_symlink 'tmp/cpr_dest2'
+    # * 2005-05-26: feature change on trunk
+    #assert_symlink 'tmp/cpr_dest2'
+    # * 2005-09-19: revert for 1.8 (:dereference_root => true by default)
+    assert_not_symlink 'tmp/cpr_dest2'
+    assert_symlink 'tmp/cpr_dest2/symlink'
+    assert_equal 'SLdest', File.readlink('tmp/cpr_dest2/symlink')
+end
+
+    # pathname
+    touch 'tmp/cprtmp'
+    assert_nothing_raised {
+      cp_r Pathname.new('tmp/cprtmp'), 'tmp/tmpdest'
+      cp_r 'tmp/cprtmp', Pathname.new('tmp/tmpdest')
+      cp_r Pathname.new('tmp/cprtmp'), Pathname.new('tmp/tmpdest')
+    }
+  end
+
+  def test_mv
+    check_singleton :mv
+
+    mkdir 'tmp/dest'
+    TARGETS.each do |fname|
+      cp fname, 'tmp/mvsrc'
+      mv 'tmp/mvsrc', 'tmp/mvdest'
+      assert_same_file fname, 'tmp/mvdest'
+
+      mv 'tmp/mvdest', 'tmp/dest/'
+      assert_same_file fname, 'tmp/dest/mvdest'
+
+      mv 'tmp/dest/mvdest', 'tmp'
+      assert_same_file fname, 'tmp/mvdest'
+    end
+
+    # [ruby-talk:124368]
+    mkdir 'tmp/tmpdir'
+    mkdir_p 'tmp/dest2/tmpdir'
+    assert_raises(Errno::EEXIST) {
+      mv 'tmp/tmpdir', 'tmp/dest2'
+    }
+    mkdir 'tmp/dest2/tmpdir/junk'
+    assert_raises(Errno::EEXIST) {
+      mv 'tmp/tmpdir', 'tmp/dest2'
+    }
+
+    # src==dest (1) same path
+    touch 'tmp/cptmp'
+    assert_raises(ArgumentError) {
+      mv 'tmp/cptmp', 'tmp/cptmp'
+    }
+if have_symlink?
+    # src==dest (2) symlink and its target
+    File.symlink 'cptmp', 'tmp/cptmp_symlink'
+    assert_raises(ArgumentError) {
+      mv 'tmp/cptmp', 'tmp/cptmp_symlink'
+    }
+    assert_raises(ArgumentError) {
+      mv 'tmp/cptmp_symlink', 'tmp/cptmp'
+    }
+    # src==dest (3) looped symlink
+    File.symlink 'symlink', 'tmp/symlink'
+    assert_raises(Errno::ELOOP) {
+      mv 'tmp/symlink', 'tmp/symlink'
+    }
+end
+
+    # pathname
+    assert_nothing_raised {
+      touch 'tmp/mvtmpsrc'
+      mv Pathname.new('tmp/mvtmpsrc'), 'tmp/mvtmpdest'
+      touch 'tmp/mvtmpsrc'
+      mv 'tmp/mvtmpsrc', Pathname.new('tmp/mvtmpdest')
+      touch 'tmp/mvtmpsrc'
+      mv Pathname.new('tmp/mvtmpsrc'), Pathname.new('tmp/mvtmpdest')
+    }
+  end
+
+  def test_rm
+    check_singleton :rm
+
+    TARGETS.each do |fname|
+      cp fname, 'tmp/rmsrc'
+      rm 'tmp/rmsrc'
+      assert_file_not_exist 'tmp/rmsrc'
+    end
+
+    # pathname
+    touch 'tmp/rmtmp1'
+    touch 'tmp/rmtmp2'
+    touch 'tmp/rmtmp3'
+    assert_nothing_raised {
+      rm Pathname.new('tmp/rmtmp1')
+      rm [Pathname.new('tmp/rmtmp2'), Pathname.new('tmp/rmtmp3')]
+    }
+    assert_file_not_exist 'tmp/rmtmp1'
+    assert_file_not_exist 'tmp/rmtmp2'
+    assert_file_not_exist 'tmp/rmtmp3'
+  end
+
+  def test_rm_f
+    check_singleton :rm_f
+
+    TARGETS.each do |fname|
+      cp fname, 'tmp/rmsrc'
+      rm_f 'tmp/rmsrc'
+      assert_file_not_exist 'tmp/rmsrc'
+    end
+
+if have_symlink?
+    File.open('tmp/lnf_symlink_src', 'w') {|f| f.puts 'dummy' }
+    File.symlink 'tmp/lnf_symlink_src', 'tmp/lnf_symlink_dest'
+    rm_f 'tmp/lnf_symlink_dest'
+    assert_file_not_exist 'tmp/lnf_symlink_dest'
+    assert_file_exist     'tmp/lnf_symlink_src'
+end
+
+    rm_f 'notexistdatafile'
+    rm_f 'tmp/notexistdatafile'
+    my_rm_rf 'tmpdatadir'
+    Dir.mkdir 'tmpdatadir'
+    # rm_f 'tmpdatadir'
+    Dir.rmdir 'tmpdatadir'
+
+    Dir.mkdir 'tmp/tmpdir'
+    File.open('tmp/tmpdir/a', 'w') {|f| f.puts 'dummy' }
+    File.open('tmp/tmpdir/c', 'w') {|f| f.puts 'dummy' }
+    rm_f ['tmp/tmpdir/a', 'tmp/tmpdir/b', 'tmp/tmpdir/c']
+    assert_file_not_exist 'tmp/tmpdir/a'
+    assert_file_not_exist 'tmp/tmpdir/c'
+    Dir.rmdir 'tmp/tmpdir'
+
+    # pathname
+    touch 'tmp/rmtmp1'
+    touch 'tmp/rmtmp2'
+    touch 'tmp/rmtmp3'
+    touch 'tmp/rmtmp4'
+    assert_nothing_raised {
+      rm_f Pathname.new('tmp/rmtmp1')
+      rm_f [Pathname.new('tmp/rmtmp2'), Pathname.new('tmp/rmtmp3')]
+    }
+    assert_file_not_exist 'tmp/rmtmp1'
+    assert_file_not_exist 'tmp/rmtmp2'
+    assert_file_not_exist 'tmp/rmtmp3'
+    assert_file_exist 'tmp/rmtmp4'
+  end
+
+  def test_rm_r
+    check_singleton :rm_r
+
+    my_rm_rf 'tmpdatadir'
+
+    Dir.mkdir 'tmpdatadir'
+    rm_r 'tmpdatadir'
+    assert_file_not_exist 'tmpdatadir'
+
+    Dir.mkdir 'tmpdatadir'
+    rm_r 'tmpdatadir/'
+    assert_file_not_exist 'tmpdatadir'
+
+    Dir.mkdir 'tmp/tmpdir'
+    rm_r 'tmp/tmpdir/'
+    assert_file_not_exist 'tmp/tmpdir'
+    assert_file_exist     'tmp'
+
+    Dir.mkdir 'tmp/tmpdir'
+    rm_r 'tmp/tmpdir'
+    assert_file_not_exist 'tmp/tmpdir'
+    assert_file_exist     'tmp'
+
+    Dir.mkdir 'tmp/tmpdir'
+    File.open('tmp/tmpdir/a', 'w') {|f| f.puts 'dummy' }
+    File.open('tmp/tmpdir/b', 'w') {|f| f.puts 'dummy' }
+    File.open('tmp/tmpdir/c', 'w') {|f| f.puts 'dummy' }
+    rm_r 'tmp/tmpdir'
+    assert_file_not_exist 'tmp/tmpdir'
+    assert_file_exist     'tmp'
+
+    Dir.mkdir 'tmp/tmpdir'
+    File.open('tmp/tmpdir/a', 'w') {|f| f.puts 'dummy' }
+    File.open('tmp/tmpdir/c', 'w') {|f| f.puts 'dummy' }
+    rm_r ['tmp/tmpdir/a', 'tmp/tmpdir/b', 'tmp/tmpdir/c'], :force => true
+    assert_file_not_exist 'tmp/tmpdir/a'
+    assert_file_not_exist 'tmp/tmpdir/c'
+    Dir.rmdir 'tmp/tmpdir'
+
+if have_symlink?
+    # [ruby-talk:94635] a symlink to the directory
+    Dir.mkdir 'tmp/tmpdir'
+    File.symlink '..', 'tmp/tmpdir/symlink_to_dir'
+    rm_r 'tmp/tmpdir'
+    assert_file_not_exist 'tmp/tmpdir'
+    assert_file_exist     'tmp'
+end
+
+    # pathname
+    Dir.mkdir 'tmp/tmpdir1'; touch 'tmp/tmpdir1/tmp'
+    Dir.mkdir 'tmp/tmpdir2'; touch 'tmp/tmpdir2/tmp'
+    Dir.mkdir 'tmp/tmpdir3'; touch 'tmp/tmpdir3/tmp'
+    assert_nothing_raised {
+      rm_r Pathname.new('tmp/tmpdir1')
+      rm_r [Pathname.new('tmp/tmpdir2'), Pathname.new('tmp/tmpdir3')]
+    }
+    assert_file_not_exist 'tmp/tmpdir1'
+    assert_file_not_exist 'tmp/tmpdir2'
+    assert_file_not_exist 'tmp/tmpdir3'
+  end
+
+  def test_remove_entry_secure
+    check_singleton :remove_entry_secure
+
+    my_rm_rf 'tmpdatadir'
+
+    Dir.mkdir 'tmpdatadir'
+    remove_entry_secure 'tmpdatadir'
+    assert_file_not_exist 'tmpdatadir'
+
+    Dir.mkdir 'tmpdatadir'
+    remove_entry_secure 'tmpdatadir/'
+    assert_file_not_exist 'tmpdatadir'
+
+    Dir.mkdir 'tmp/tmpdir'
+    remove_entry_secure 'tmp/tmpdir/'
+    assert_file_not_exist 'tmp/tmpdir'
+    assert_file_exist     'tmp'
+
+    Dir.mkdir 'tmp/tmpdir'
+    remove_entry_secure 'tmp/tmpdir'
+    assert_file_not_exist 'tmp/tmpdir'
+    assert_file_exist     'tmp'
+
+    Dir.mkdir 'tmp/tmpdir'
+    File.open('tmp/tmpdir/a', 'w') {|f| f.puts 'dummy' }
+    File.open('tmp/tmpdir/b', 'w') {|f| f.puts 'dummy' }
+    File.open('tmp/tmpdir/c', 'w') {|f| f.puts 'dummy' }
+    remove_entry_secure 'tmp/tmpdir'
+    assert_file_not_exist 'tmp/tmpdir'
+    assert_file_exist     'tmp'
+
+    Dir.mkdir 'tmp/tmpdir'
+    File.open('tmp/tmpdir/a', 'w') {|f| f.puts 'dummy' }
+    File.open('tmp/tmpdir/c', 'w') {|f| f.puts 'dummy' }
+    remove_entry_secure 'tmp/tmpdir/a', true
+    remove_entry_secure 'tmp/tmpdir/b', true
+    remove_entry_secure 'tmp/tmpdir/c', true
+    assert_file_not_exist 'tmp/tmpdir/a'
+    assert_file_not_exist 'tmp/tmpdir/c'
+    Dir.rmdir 'tmp/tmpdir'
+
+if have_symlink?
+    # [ruby-talk:94635] a symlink to the directory
+    Dir.mkdir 'tmp/tmpdir'
+    File.symlink '..', 'tmp/tmpdir/symlink_to_dir'
+    remove_entry_secure 'tmp/tmpdir'
+    assert_file_not_exist 'tmp/tmpdir'
+    assert_file_exist     'tmp'
+end
+
+    # pathname
+    Dir.mkdir 'tmp/tmpdir1'; touch 'tmp/tmpdir1/tmp'
+    assert_nothing_raised {
+      remove_entry_secure Pathname.new('tmp/tmpdir1')
+    }
+    assert_file_not_exist 'tmp/tmpdir1'
+  end
+
+  def test_with_big_file
+    prepare_big_file
+
+    cp BIGFILE, 'tmp/cpdest'
+    assert_same_file BIGFILE, 'tmp/cpdest'
+    assert cmp(BIGFILE, 'tmp/cpdest'), 'orig != copied'
+
+    mv 'tmp/cpdest', 'tmp/mvdest'
+    assert_same_file BIGFILE, 'tmp/mvdest'
+    assert_file_not_exist 'tmp/cpdest'
+
+    rm 'tmp/mvdest'
+    assert_file_not_exist 'tmp/mvdest'
+  end
+
+if have_hardlink?
+  def test_ln
+    TARGETS.each do |fname|
+      ln fname, 'tmp/lndest'
+      assert_same_file fname, 'tmp/lndest'
+      File.unlink 'tmp/lndest'
+    end
+
+    ln TARGETS, 'tmp'
+    TARGETS.each do |fname|
+      assert_same_file fname, 'tmp/' + File.basename(fname)
+    end
+    TARGETS.each do |fname|
+      File.unlink 'tmp/' + File.basename(fname)
+    end
+
+    # src==dest (1) same path
+    touch 'tmp/cptmp'
+    assert_raises(Errno::EEXIST) {
+      ln 'tmp/cptmp', 'tmp/cptmp'
+    }
+if have_symlink?
+    # src==dest (2) symlink and its target
+    File.symlink 'cptmp', 'tmp/symlink'
+    assert_raises(Errno::EEXIST) {
+      ln 'tmp/cptmp', 'tmp/symlink'   # normal file -> symlink
+    }
+    assert_raises(Errno::EEXIST) {
+      ln 'tmp/symlink', 'tmp/cptmp'   # symlink -> normal file
+    }
+    # src==dest (3) looped symlink
+    File.symlink 'cptmp_symlink', 'tmp/cptmp_symlink'
+    begin
+      ln 'tmp/cptmp_symlink', 'tmp/cptmp_symlink'
+    rescue => err
+      assert_kind_of SystemCallError, err
+    end
+end
+
+    # pathname
+    touch 'tmp/lntmp'
+    assert_nothing_raised {
+      ln Pathname.new('tmp/lntmp'), 'tmp/lndesttmp1'
+      ln 'tmp/lntmp', Pathname.new('tmp/lndesttmp2')
+      ln Pathname.new('tmp/lntmp'), Pathname.new('tmp/lndesttmp3')
+    }
+  end
+end
+
+if have_symlink?
+  def test_ln_s
+    check_singleton :ln_s
+
+    TARGETS.each do |fname|
+      ln_s fname, 'tmp/lnsdest'
+      assert FileTest.symlink?('tmp/lnsdest'), 'not symlink'
+      assert_equal fname, File.readlink('tmp/lnsdest')
+      rm_f 'tmp/lnsdest'
+    end
+    assert_nothing_raised {
+      ln_s 'symlink', 'tmp/symlink'
+    }
+    assert_symlink 'tmp/symlink'
+
+    # pathname
+    touch 'tmp/lnsdest'
+    assert_nothing_raised {
+      ln_s Pathname.new('lnsdest'), 'tmp/symlink_tmp1'
+      ln_s 'lnsdest', Pathname.new('tmp/symlink_tmp2')
+      ln_s Pathname.new('lnsdest'), Pathname.new('tmp/symlink_tmp3')
+    }
+  end
+end
+
+if have_symlink?
+  def test_ln_sf
+    check_singleton :ln_sf
+
+    TARGETS.each do |fname|
+      ln_sf fname, 'tmp/lnsdest'
+      assert FileTest.symlink?('tmp/lnsdest'), 'not symlink'
+      assert_equal fname, File.readlink('tmp/lnsdest')
+      ln_sf fname, 'tmp/lnsdest'
+      ln_sf fname, 'tmp/lnsdest'
+    end
+    assert_nothing_raised {
+      ln_sf 'symlink', 'tmp/symlink'
+    }
+
+    # pathname
+    touch 'tmp/lns_dest'
+    assert_nothing_raised {
+      ln_sf Pathname.new('lns_dest'), 'tmp/symlink_tmp1'
+      ln_sf 'lns_dest', Pathname.new('tmp/symlink_tmp2')
+      ln_sf Pathname.new('lns_dest'), Pathname.new('tmp/symlink_tmp3')
+    }
+  end
+end
+
+  def test_mkdir
+    check_singleton :mkdir
+
+    my_rm_rf 'tmpdatadir'
+    mkdir 'tmpdatadir'
+    assert_directory 'tmpdatadir'
+    Dir.rmdir 'tmpdatadir'
+
+    mkdir 'tmpdatadir/'
+    assert_directory 'tmpdatadir'
+    Dir.rmdir 'tmpdatadir'
+
+    mkdir 'tmp/mkdirdest'
+    assert_directory 'tmp/mkdirdest'
+    Dir.rmdir 'tmp/mkdirdest'
+
+    mkdir 'tmp/tmp', :mode => 0700
+    assert_directory 'tmp/tmp'
+    assert_equal 0700, (File.stat('tmp/tmp').mode & 0777) if have_file_perm?
+    Dir.rmdir 'tmp/tmp'
+
+if have_file_perm?
+    mkdir 'tmp/tmp', :mode => 07777
+    assert_directory 'tmp/tmp'
+    assert_equal 07777, (File.stat('tmp/tmp').mode & 07777)
+    Dir.rmdir 'tmp/tmp'
+end
+
+if lf_in_path_allowed?
+    mkdir "tmp-first-line\ntmp-second-line"
+    assert_directory "tmp-first-line\ntmp-second-line"
+    Dir.rmdir "tmp-first-line\ntmp-second-line"
+end
+
+    # pathname
+    assert_nothing_raised {
+      mkdir Pathname.new('tmp/tmpdirtmp')
+      mkdir [Pathname.new('tmp/tmpdirtmp2'), Pathname.new('tmp/tmpdirtmp3')]
+    }
+  end
+
+  def test_mkdir_p
+    check_singleton :mkdir_p
+
+    dirs = %w(
+      tmpdir/dir/
+      tmpdir/dir/./
+      tmpdir/dir/./.././dir/
+      tmpdir/a
+      tmpdir/a/
+      tmpdir/a/b
+      tmpdir/a/b/
+      tmpdir/a/b/c/
+      tmpdir/a/b/c
+      tmpdir/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a
+      tmpdir/a/a
+    )
+    my_rm_rf 'tmpdir'
+    dirs.each do |d|
+      mkdir_p d
+      assert_directory d
+      assert_file_not_exist "#{d}/a"
+      assert_file_not_exist "#{d}/b"
+      assert_file_not_exist "#{d}/c"
+      my_rm_rf 'tmpdir'
+    end
+    dirs.each do |d|
+      mkdir_p d
+      assert_directory d
+    end
+    rm_rf 'tmpdir'
+    dirs.each do |d|
+      mkdir_p "#{Dir.pwd}/#{d}"
+      assert_directory d
+    end
+    rm_rf 'tmpdir'
+
+    mkdir_p 'tmp/tmp/tmp', :mode => 0700
+    assert_directory 'tmp/tmp'
+    assert_directory 'tmp/tmp/tmp'
+    assert_equal 0700, (File.stat('tmp/tmp').mode & 0777) if have_file_perm?
+    assert_equal 0700, (File.stat('tmp/tmp/tmp').mode & 0777) if have_file_perm?
+    rm_rf 'tmp/tmp'
+
+    mkdir_p 'tmp/tmp', :mode => 0
+    assert_directory 'tmp/tmp'
+    assert_equal 0, (File.stat('tmp/tmp').mode & 0777) if have_file_perm?
+    # DO NOT USE rm_rf here.
+    # (rm(1) try to chdir to parent directory, it fails to remove directory.)
+    Dir.rmdir 'tmp/tmp'
+    Dir.rmdir 'tmp'
+
+if have_file_perm?
+    mkdir_p 'tmp/tmp/tmp', :mode => 07777
+    assert_directory 'tmp/tmp/tmp'
+    assert_equal 07777, (File.stat('tmp/tmp/tmp').mode & 07777)
+    Dir.rmdir 'tmp/tmp/tmp'
+    Dir.rmdir 'tmp/tmp'
+end
+
+    # pathname
+    assert_nothing_raised {
+      mkdir_p Pathname.new('tmp/tmp/tmp')
+    }
+  end
+
+  def test_install
+    check_singleton :install
+
+    File.open('tmp/aaa', 'w') {|f| f.puts 'aaa' }
+    File.open('tmp/bbb', 'w') {|f| f.puts 'bbb' }
+    install 'tmp/aaa', 'tmp/bbb', :mode => 0600
+    assert_equal "aaa\n", File.read('tmp/bbb')
+    assert_equal 0600, (File.stat('tmp/bbb').mode & 0777) if have_file_perm?
+
+    t = File.mtime('tmp/bbb')
+    install 'tmp/aaa', 'tmp/bbb'
+    assert_equal "aaa\n", File.read('tmp/bbb')
+    assert_equal 0600, (File.stat('tmp/bbb').mode & 0777) if have_file_perm?
+    assert_equal t, File.mtime('tmp/bbb')
+
+    File.unlink 'tmp/aaa'
+    File.unlink 'tmp/bbb'
+
+    # src==dest (1) same path
+    touch 'tmp/cptmp'
+    assert_raises(ArgumentError) {
+      install 'tmp/cptmp', 'tmp/cptmp'
+    }
+if have_symlink?
+    # src==dest (2) symlink and its target
+    File.symlink 'cptmp', 'tmp/cptmp_symlink'
+    assert_raises(ArgumentError) {
+      install 'tmp/cptmp', 'tmp/cptmp_symlink'
+    }
+    assert_raises(ArgumentError) {
+      install 'tmp/cptmp_symlink', 'tmp/cptmp'
+    }
+    # src==dest (3) looped symlink
+    File.symlink 'symlink', 'tmp/symlink'
+    assert_raises(Errno::ELOOP) {
+      # File#install invokes open(2), always ELOOP must be raised
+      install 'tmp/symlink', 'tmp/symlink'
+    }
+end
+
+    # pathname
+    assert_nothing_raised {
+      rm_f 'tmp/a'; touch 'tmp/a'
+      install 'tmp/a', Pathname.new('tmp/b')
+      rm_f 'tmp/a'; touch 'tmp/a'
+      install Pathname.new('tmp/a'), 'tmp/b'
+      rm_f 'tmp/a'; touch 'tmp/a'
+      install Pathname.new('tmp/a'), Pathname.new('tmp/b')
+      rm_f 'tmp/a'
+      touch 'tmp/a'
+      touch 'tmp/b'
+      mkdir 'tmp/dest'
+      install [Pathname.new('tmp/a'), Pathname.new('tmp/b')], 'tmp/dest'
+      my_rm_rf 'tmp/dest'
+      mkdir 'tmp/dest'
+      install [Pathname.new('tmp/a'), Pathname.new('tmp/b')], Pathname.new('tmp/dest')
+    }
+  end
+
+if have_file_perm?
+  def test_chmod
+    check_singleton :chmod
+
+    touch 'tmp/a'
+    chmod 0700, 'tmp/a'
+    assert_equal 0700, File.stat('tmp/a').mode & 0777
+    chmod 0500, 'tmp/a'
+    assert_equal 0500, File.stat('tmp/a').mode & 0777
+  end
+
+  def test_chmod_R
+    check_singleton :chmod_R
+
+    mkdir_p 'tmp/dir/dir'
+    touch %w( tmp/dir/file tmp/dir/dir/file )
+    chmod_R 0700, 'tmp/dir'
+    assert_equal 0700, File.stat('tmp/dir').mode & 0777
+    assert_equal 0700, File.stat('tmp/dir/file').mode & 0777
+    assert_equal 0700, File.stat('tmp/dir/dir').mode & 0777
+    assert_equal 0700, File.stat('tmp/dir/dir/file').mode & 0777
+    chmod_R 0500, 'tmp/dir'
+    assert_equal 0500, File.stat('tmp/dir').mode & 0777
+    assert_equal 0500, File.stat('tmp/dir/file').mode & 0777
+    assert_equal 0500, File.stat('tmp/dir/dir').mode & 0777
+    assert_equal 0500, File.stat('tmp/dir/dir/file').mode & 0777
+    chmod_R 0700, 'tmp/dir'   # to remove
+  end
+
+  # FIXME: How can I test this method?
+  def test_chown
+    check_singleton :chown
+  end
+
+  # FIXME: How can I test this method?
+  def test_chown_R
+    check_singleton :chown_R
+  end
+end
+
+  def test_copy_entry
+    check_singleton :copy_entry
+
+    each_srcdest do |srcpath, destpath|
+      copy_entry srcpath, destpath
+      assert_same_file srcpath, destpath
+      assert_equal File.stat(srcpath).ftype, File.stat(destpath).ftype
+    end
+if have_symlink?
+    # root is a symlink
+    File.symlink 'somewhere', 'tmp/symsrc'
+    copy_entry 'tmp/symsrc', 'tmp/symdest'
+    assert_symlink 'tmp/symdest'
+    assert_equal 'somewhere', File.readlink('tmp/symdest')
+
+    # content is a symlink
+    mkdir 'tmp/dir'
+    File.symlink 'somewhere', 'tmp/dir/sym'
+    copy_entry 'tmp/dir', 'tmp/dirdest'
+    assert_directory 'tmp/dirdest'
+    assert_not_symlink 'tmp/dirdest'
+    assert_symlink 'tmp/dirdest/sym'
+    assert_equal 'somewhere', File.readlink('tmp/dirdest/sym')
+end
+  end
+
+  def test_copy_file
+    check_singleton :copy_file
+
+    each_srcdest do |srcpath, destpath|
+      copy_file srcpath, destpath
+      assert_same_file srcpath, destpath
+    end
+  end
+
+  def test_copy_stream
+    check_singleton :copy_stream
+    # IO
+    each_srcdest do |srcpath, destpath|
+      File.open(srcpath) {|src|
+        File.open(destpath, 'w') {|dest|
+          copy_stream src, dest
+        }
+      }
+      assert_same_file srcpath, destpath
+    end
+
+    # duck typing test  [ruby-dev:25369]
+    my_rm_rf 'tmp'
+    Dir.mkdir 'tmp'
+    each_srcdest do |srcpath, destpath|
+      File.open(srcpath) {|src|
+        File.open(destpath, 'w') {|dest|
+          copy_stream Stream.new(src), Stream.new(dest)
+        }
+      }
+      assert_same_file srcpath, destpath
+    end
+  end
+
+  def test_remove_file
+    check_singleton :remove_file
+    File.open('data/tmp', 'w') {|f| f.puts 'dummy' }
+    remove_file 'data/tmp'
+    assert_file_not_exist 'data/tmp'
+if have_file_perm?
+    File.open('data/tmp', 'w') {|f| f.puts 'dummy' }
+    File.chmod 0, 'data/tmp'
+    remove_file 'data/tmp'
+    assert_file_not_exist 'data/tmp'
+end
+  end
+
+  def test_remove_dir
+    check_singleton :remove_dir
+    Dir.mkdir 'data/tmpdir'
+    File.open('data/tmpdir/a', 'w') {|f| f.puts 'dummy' }
+    remove_dir 'data/tmpdir'
+    assert_file_not_exist 'data/tmpdir'
+if have_file_perm?
+    Dir.mkdir 'data/tmpdir'
+    File.chmod 0555, 'data/tmpdir'
+    remove_dir 'data/tmpdir'
+    assert_file_not_exist 'data/tmpdir'
+end
+  end
+
+  def test_compare_file
+    check_singleton :compare_file
+    # FIXME
+  end
+
+  def test_compare_stream
+    check_singleton :compare_stream
+    # FIXME
+  end
+
+  class Stream
+    def initialize(f)
+      @f = f
+    end
+
+    def read(n)
+      @f.read(n)
+    end
+
+    def write(str)
+      @f.write str
+    end
+  end
+
+  def test_uptodate?
+    check_singleton :uptodate?
+    prepare_time_data
+    Dir.chdir('data') {
+      assert(   uptodate?('newest', %w(old newer notexist)) )
+      assert( ! uptodate?('newer', %w(old newest notexist)) )
+      assert( ! uptodate?('notexist', %w(old newest newer)) )
+    }
+
+    # pathname
+    touch 'tmp/a'
+    touch 'tmp/b'
+    touch 'tmp/c'
+    assert_nothing_raised {
+      uptodate? Pathname.new('tmp/a'), ['tmp/b', 'tmp/c']
+      uptodate? 'tmp/a', [Pathname.new('tmp/b'), 'tmp/c']
+      uptodate? 'tmp/a', ['tmp/b', Pathname.new('tmp/c')]
+      uptodate? Pathname.new('tmp/a'), [Pathname.new('tmp/b'), Pathname.new('tmp/c')]
+    }
+  end
+
+  def test_cd
+    check_singleton :cd
+  end
+
+  def test_chdir
+    check_singleton :chdir
+  end
+
+  def test_getwd
+    check_singleton :getwd
+  end
+
+  def test_identical?
+    check_singleton :identical?
+  end
+
+  def test_link
+    check_singleton :link
+  end
+
+  def test_makedirs
+    check_singleton :makedirs
+  end
+
+  def test_mkpath
+    check_singleton :mkpath
+  end
+
+  def test_move
+    check_singleton :move
+  end
+
+  def test_rm_rf
+    check_singleton :rm_rf
+  end
+
+  def test_rmdir
+    check_singleton :rmdir
+  end
+
+  def test_rmtree
+    check_singleton :rmtree
+  end
+
+  def test_safe_unlink
+    check_singleton :safe_unlink
+  end
+
+  def test_symlink
+    check_singleton :symlink
+  end
+
+  def test_touch
+    check_singleton :touch
+  end
+
+  def test_collect_methods
+  end
+
+  def test_commands
+  end
+
+  def test_have_option?
+  end
+
+  def test_options
+  end
+
+  def test_options_of
+  end
+
+end
diff --git a/ruby_1_8_6/test/fileutils/test_nowrite.rb b/ruby_1_8_6/test/fileutils/test_nowrite.rb
new file mode 100644
index 0000000000..369f8ca608
--- /dev/null
+++ b/ruby_1_8_6/test/fileutils/test_nowrite.rb
@@ -0,0 +1,99 @@
+# $Id$
+
+require 'fileutils'
+require 'fileasserts'
+require 'tmpdir'
+require 'test/unit'
+
+class TestFileUtilsNoWrite < Test::Unit::TestCase
+
+  include FileUtils::NoWrite
+
+  def test_visibility
+    FileUtils::METHODS.each do |m|
+      assert_equal true, FileUtils::NoWrite.respond_to?(m, true),
+                   "FileUtils::NoWrite.#{m} is not defined"
+      assert_equal true, FileUtils::NoWrite.respond_to?(m, false),
+                   "FileUtils::NoWrite.#{m} is not public"
+    end
+    FileUtils::METHODS.each do |m|
+      assert_equal true, respond_to?(m, true),
+                   "FileUtils::NoWrite\##{m} is not defined"
+      assert_equal true, FileUtils::NoWrite.private_method_defined?(m),
+                   "FileUtils::NoWrite\##{m} is not private"
+    end
+  end
+
+  def my_rm_rf(path)
+    if File.exist?('/bin/rm')
+      system %Q[/bin/rm -rf "#{path}"]
+    else
+      FileUtils.rm_rf path
+    end
+  end
+
+  SRC  = 'data/src'
+  COPY = 'data/copy'
+
+  def setup
+    @prevdir = Dir.pwd
+    tmproot = "#{Dir.tmpdir}/fileutils.rb.#{$$}"
+    Dir.mkdir tmproot unless File.directory?(tmproot)
+    Dir.chdir tmproot
+    my_rm_rf 'data'; Dir.mkdir 'data'
+    my_rm_rf 'tmp'; Dir.mkdir 'tmp'
+    File.open(SRC,  'w') {|f| f.puts 'dummy' }
+    File.open(COPY, 'w') {|f| f.puts 'dummy' }
+  end
+
+  def teardown
+    tmproot = Dir.pwd
+    Dir.chdir @prevdir
+    my_rm_rf tmproot
+  end
+
+  def test_cp
+    cp SRC, 'tmp/cp'
+    check 'tmp/cp'
+  end
+
+  def test_mv
+    mv SRC, 'tmp/mv'
+    check 'tmp/mv'
+  end
+
+  def check(dest)
+    assert_file_not_exist dest
+    assert_file_exist SRC
+    assert_same_file SRC, COPY
+  end
+
+  def test_rm
+    rm SRC
+    assert_file_exist SRC
+    assert_same_file SRC, COPY
+  end
+
+  def test_rm_f
+    rm_f SRC
+    assert_file_exist SRC
+    assert_same_file SRC, COPY
+  end
+
+  def test_rm_rf
+    rm_rf SRC
+    assert_file_exist SRC
+    assert_same_file SRC, COPY
+  end
+
+  def test_mkdir
+    mkdir 'dir'
+    assert_file_not_exist 'dir'
+  end
+
+  def test_mkdir_p
+    mkdir 'dir/dir/dir'
+    assert_file_not_exist 'dir'
+  end
+
+end
diff --git a/ruby_1_8_6/test/fileutils/test_verbose.rb b/ruby_1_8_6/test/fileutils/test_verbose.rb
new file mode 100644
index 0000000000..e60e85ea4e
--- /dev/null
+++ b/ruby_1_8_6/test/fileutils/test_verbose.rb
@@ -0,0 +1,25 @@
+# $Id$
+
+require 'test/unit'
+require 'fileutils'
+
+class TestFileUtilsVerbose < Test::Unit::TestCase
+
+  include FileUtils::Verbose
+
+  def test_visibility
+    FileUtils::METHODS.each do |m|
+      assert_equal true, FileUtils::Verbose.respond_to?(m, true),
+                   "FileUtils::Verbose.#{m} is not defined"
+      assert_equal true, FileUtils::Verbose.respond_to?(m, false),
+                   "FileUtils::Verbose.#{m} is not public"
+    end
+    FileUtils::METHODS.each do |m|
+      assert_equal true, respond_to?(m, true),
+                   "FileUtils::Verbose.#{m} is not defined"
+      assert_equal true, FileUtils::Verbose.private_method_defined?(m),
+                   "FileUtils::Verbose.#{m} is not private"
+    end
+  end
+
+end
diff --git a/ruby_1_8_6/test/gdbm/test_gdbm.rb b/ruby_1_8_6/test/gdbm/test_gdbm.rb
new file mode 100644
index 0000000000..b84221e547
--- /dev/null
+++ b/ruby_1_8_6/test/gdbm/test_gdbm.rb
@@ -0,0 +1,692 @@
+require 'test/unit'
+
+begin
+  require 'gdbm'
+rescue LoadError
+end
+
+if defined? GDBM
+  require 'tmpdir'
+  require 'fileutils'
+
+  class TestGDBM < Test::Unit::TestCase
+    def TestGDBM.uname_s
+      require 'rbconfig'
+      case Config::CONFIG['target_os']
+      when 'cygwin'
+        require 'Win32API'
+        uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
+        utsname = ' ' * 100
+        raise 'cannot get system name' if uname.call(utsname) == -1
+
+        utsname.unpack('A20' * 5)[0]
+      else
+        Config::CONFIG['target_os']
+      end
+    end
+    SYSTEM = uname_s
+
+    def setup
+      @path = "tmptest_gdbm_"
+      assert_instance_of(GDBM, @gdbm = GDBM.new(@path))
+
+      # prepare to make readonly GDBM file
+      GDBM.open("tmptest_gdbm_rdonly", 0400) {|gdbm|
+        gdbm['foo'] = 'FOO'
+      }
+      assert_instance_of(GDBM, @gdbm_rdonly = GDBM.new("tmptest_gdbm_rdonly", nil))
+    end
+    def teardown
+      assert_nil(@gdbm.close)
+      assert_nil(@gdbm_rdonly.close)
+      ObjectSpace.each_object(GDBM) do |obj|
+        obj.close unless obj.closed?
+      end
+      File.delete *Dir.glob("*tmptest_gdbm*").to_a
+      p Dir.glob("*tmptest_gdbm*") if $DEBUG
+    end
+
+    def check_size(expect, gdbm=@gdbm)
+      assert_equal(expect, gdbm.size)
+      n = 0
+      gdbm.each { n+=1 }
+      assert_equal(expect, n)
+      if expect == 0
+        assert_equal(true, gdbm.empty?)
+      else
+        assert_equal(false, gdbm.empty?)
+      end
+    end
+
+    def have_fork?
+      begin
+        fork{}
+        true
+      rescue NotImplementedError
+        false
+      end
+    end
+
+    def test_s_new_has_no_block
+      # GDBM.new ignore the block
+      foo = true
+      assert_instance_of(GDBM, gdbm = GDBM.new("tmptest_gdbm") { foo = false })
+      assert_equal(foo, true)
+      assert_nil(gdbm.close)
+    end
+    def test_s_open_create_new
+      return if /^CYGWIN_9/ =~ SYSTEM
+
+      save_mask = File.umask(0)
+      begin
+        assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm"))
+        gdbm.close
+        assert_equal(File.stat("tmptest_gdbm").mode & 0777, 0666)
+        assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm2", 0644))
+        gdbm.close
+        assert_equal(File.stat("tmptest_gdbm2").mode & 0777, 0644)
+      ensure
+        File.umask save_mask
+      end
+    end
+    def test_s_open_no_create
+      # this test is failed on libgdbm 1.8.0
+      assert_nil(gdbm = GDBM.open("tmptest_gdbm", nil))
+    ensure
+      gdbm.close if gdbm
+    end
+    def test_s_open_3rd_arg
+      assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0644,
+                                                GDBM::FAST))
+      gdbm.close
+
+      # gdbm 1.8.0 specific
+      if defined? GDBM::SYNC
+        assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0644,
+                                                  GDBM::SYNC))
+        gdbm.close
+      end
+      # gdbm 1.8.0 specific
+      if defined? GDBM::NOLOCK
+        assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0644,
+                                                  GDBM::NOLOCK))
+        gdbm.close
+      end
+    end
+    def test_s_open_with_block
+      assert_equal(GDBM.open("tmptest_gdbm") { :foo }, :foo)
+    end
+    def test_s_open_lock
+      return unless have_fork?	# snip this test
+      pid = fork() {
+        assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644))
+        sleep 2
+      }
+      begin
+        sleep 1
+        assert_raise(Errno::EWOULDBLOCK) {
+          begin
+            assert_instance_of(GDBM, gdbm2 = GDBM.open("tmptest_gdbm", 0644))
+          rescue Errno::EAGAIN, Errno::EACCES
+            raise Errno::EWOULDBLOCK
+          end
+        }
+      ensure
+        Process.wait pid
+      end
+    end
+
+=begin
+    # Is it guaranteed on many OS?
+    def test_s_open_lock_one_process
+      # locking on one process
+      assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644))
+      assert_raise(Errno::EWOULDBLOCK) {
+        begin
+          GDBM.open("tmptest_gdbm", 0644)
+        rescue Errno::EAGAIN
+          raise Errno::EWOULDBLOCK
+        end
+      }
+    end
+=end
+
+    def test_s_open_nolock
+      # gdbm 1.8.0 specific
+      if not defined? GDBM::NOLOCK
+        return
+      end
+      return unless have_fork?	# snip this test
+
+      pid = fork() {
+        assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644,
+                                                  GDBM::NOLOCK))
+        sleep 2
+      }
+      sleep 1
+      begin
+        gdbm2 = nil
+        assert_nothing_raised(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+          assert_instance_of(GDBM, gdbm2 = GDBM.open("tmptest_gdbm", 0644))
+        }
+      ensure
+        Process.wait pid
+        gdbm2.close if gdbm2
+      end
+
+      p Dir.glob("tmptest_gdbm*") if $DEBUG
+
+      pid = Process.fork() {
+        assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644))
+        sleep 2
+      }
+      begin
+        sleep 1
+        gdbm2 = nil
+        assert_nothing_raised(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+          # this test is failed on Cygwin98 (???)
+          assert_instance_of(GDBM, gdbm2 = GDBM.open("tmptest_gdbm", 0644,
+                                                     GDBM::NOLOCK))
+        }
+      ensure
+        Process.wait pid
+        gdbm2.close if gdbm2
+      end
+    end
+
+    def test_s_open_error
+      return if /(ms|bcc)win|mingw|djgpp/ =~ RUBY_PLATFORM
+      assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0))
+      assert_raise(Errno::EACCES) {
+        GDBM.open("tmptest_gdbm", 0)
+      }
+      gdbm.close
+    end
+
+    def test_close
+      assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm"))
+      assert_nil(gdbm.close)
+
+      # closed GDBM file
+      assert_raise(RuntimeError) { gdbm.close }
+    end
+
+    def test_aref
+      assert_equal('bar', @gdbm['foo'] = 'bar')
+      assert_equal('bar', @gdbm['foo'])
+
+      assert_nil(@gdbm['bar'])
+    end
+
+    def test_fetch
+      assert_equal('bar', @gdbm['foo']='bar')
+      assert_equal('bar', @gdbm.fetch('foo'))
+
+      # key not found
+      assert_raise(IndexError) {
+        @gdbm.fetch('bar')
+      }
+
+      # test for `ifnone' arg
+      assert_equal('baz', @gdbm.fetch('bar', 'baz'))
+
+      # test for `ifnone' block
+      assert_equal('foobar', @gdbm.fetch('bar') {|key| 'foo' + key })
+    end
+
+    def test_aset
+      num = 0
+      2.times {|i|
+        assert_equal('foo', @gdbm['foo'] = 'foo')
+        assert_equal('foo', @gdbm['foo'])
+        assert_equal('bar', @gdbm['foo'] = 'bar')
+        assert_equal('bar', @gdbm['foo'])
+
+        num += 1 if i == 0
+        assert_equal(num, @gdbm.size)
+
+        # assign nil
+        assert_equal('', @gdbm['bar'] = '')
+        assert_equal('', @gdbm['bar'])
+
+        num += 1 if i == 0
+        assert_equal(num, @gdbm.size)
+
+        # empty string
+        assert_equal('', @gdbm[''] = '')
+        assert_equal('', @gdbm[''])
+
+        num += 1 if i == 0
+        assert_equal(num, @gdbm.size)
+
+        # Fixnum
+        assert_equal('200', @gdbm['100'] = '200')
+        assert_equal('200', @gdbm['100'])
+
+        num += 1 if i == 0
+        assert_equal(num, @gdbm.size)
+
+        # Big key and value
+        assert_equal('y' * 100, @gdbm['x' * 100] = 'y' * 100)
+        assert_equal('y' * 100, @gdbm['x' * 100])
+
+        num += 1 if i == 0
+        assert_equal(num, @gdbm.size)
+      }
+    end
+
+    def test_index
+      assert_equal('bar', @gdbm['foo'] = 'bar')
+      assert_equal('foo', @gdbm.index('bar'))
+      assert_nil(@gdbm['bar'])
+    end
+
+    def test_values_at
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+      @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+      assert_equal(values.reverse, @gdbm.values_at(*keys.reverse))
+    end
+
+    def test_select_with_block
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+      @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+      ret = @gdbm.select {|k,v|
+        assert_equal(k.upcase, v)
+        k != "bar"
+      }
+      assert_equal([['baz', 'BAZ'], ['foo', 'FOO']],
+                    ret.sort)
+    end
+
+    def test_length
+      num = 10
+      assert_equal(0, @gdbm.size)
+      num.times {|i|
+        i = i.to_s
+        @gdbm[i] = i
+      }
+      assert_equal(num, @gdbm.size)
+
+      @gdbm.shift
+
+      assert_equal(num - 1, @gdbm.size)
+    end
+
+    def test_empty?
+      assert_equal(true, @gdbm.empty?)
+      @gdbm['foo'] = 'FOO'
+      assert_equal(false, @gdbm.empty?)
+    end
+
+    def test_each_pair
+      n = 0
+      @gdbm.each_pair { n += 1 }
+      assert_equal(0, n)
+
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+
+      @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+      n = 0
+      ret = @gdbm.each_pair {|key, val|
+        assert_not_nil(i = keys.index(key))
+        assert_equal(val, values[i])
+
+        n += 1
+      }
+      assert_equal(keys.size, n)
+      assert_equal(@gdbm, ret)
+    end
+
+    def test_each_value
+      n = 0
+      @gdbm.each_value { n += 1 }
+      assert_equal(0, n)
+
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+
+      @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+      n = 0
+      ret = @gdbm.each_value {|val|
+        assert_not_nil(key = @gdbm.index(val))
+        assert_not_nil(i = keys.index(key))
+        assert_equal(val, values[i])
+
+        n += 1
+      }
+      assert_equal(keys.size, n)
+      assert_equal(@gdbm, ret)
+    end
+
+    def test_each_key
+      n = 0
+      @gdbm.each_key { n += 1 }
+      assert_equal(0, n)
+
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+
+      @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+      n = 0
+      ret = @gdbm.each_key {|key|
+        assert_not_nil(i = keys.index(key))
+        assert_equal(@gdbm[key], values[i])
+
+        n += 1
+      }
+      assert_equal(keys.size, n)
+      assert_equal(@gdbm, ret)
+    end
+
+    def test_keys
+      assert_equal([], @gdbm.keys)
+
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+
+      @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+      assert_equal(keys.sort, @gdbm.keys.sort)
+      assert_equal(values.sort, @gdbm.values.sort)
+    end
+
+    def test_values
+      test_keys
+    end
+
+    def test_shift
+      assert_nil(@gdbm.shift)
+      assert_equal(0, @gdbm.size)
+
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+
+      @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+      ret_keys = []
+      ret_values = []
+      while ret = @gdbm.shift
+        ret_keys.push ret[0]
+        ret_values.push ret[1]
+
+        assert_equal(keys.size - ret_keys.size, @gdbm.size)
+      end
+
+      assert_equal(keys.sort, ret_keys.sort)
+      assert_equal(values.sort, ret_values.sort)
+    end
+
+    def test_delete
+      keys = %w(foo bar baz)
+      values = %w(FOO BAR BAZ)
+      key = keys[1]
+
+      assert_nil(@gdbm.delete(key))
+      assert_equal(0, @gdbm.size)
+
+      @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+      assert_equal('BAR', @gdbm.delete(key))
+      assert_nil(@gdbm[key])
+      assert_equal(2, @gdbm.size)
+
+      assert_nil(@gdbm.delete(key))
+
+      if /^CYGWIN_9/ !~ SYSTEM
+        assert_raise(GDBMError) {
+          @gdbm_rdonly.delete("foo")
+        }
+
+        assert_nil(@gdbm_rdonly.delete("bar"))
+      end
+    end
+    def test_delete_with_block
+      key = 'no called block'
+      @gdbm[key] = 'foo'
+      assert_equal('foo', @gdbm.delete(key) {|k| k.replace 'called block'})
+      assert_equal('no called block', key)
+      assert_equal(0, @gdbm.size)
+
+      key = 'no called block'
+      assert_equal(:blockval,
+                    @gdbm.delete(key) {|k| k.replace 'called block'; :blockval})
+      assert_equal('called block', key)
+      assert_equal(0, @gdbm.size)
+    end
+
+    def test_delete_if
+      v = "0"
+      100.times {@gdbm[v] = v; v = v.next}
+
+      ret = @gdbm.delete_if {|key, val| key.to_i < 50}
+      assert_equal(@gdbm, ret)
+      check_size(50, @gdbm)
+
+      ret = @gdbm.delete_if {|key, val| key.to_i >= 50}
+      assert_equal(@gdbm, ret)
+      check_size(0, @gdbm)
+
+      # break
+      v = "0"
+      100.times {@gdbm[v] = v; v = v.next}
+      check_size(100, @gdbm)
+      n = 0;
+      @gdbm.delete_if {|key, val|
+        break if n > 50
+        n+=1
+        true
+      }
+      assert_equal(51, n)
+      check_size(49, @gdbm)
+
+      @gdbm.clear
+
+      # raise
+      v = "0"
+      100.times {@gdbm[v] = v; v = v.next}
+      check_size(100, @gdbm)
+      n = 0;
+      begin
+        @gdbm.delete_if {|key, val|
+          raise "runtime error" if n > 50
+          n+=1
+          true
+        }
+      rescue
+      end
+      assert_equal(51, n)
+      check_size(49, @gdbm)
+    end
+
+    def test_reject
+      v = "0"
+      100.times {@gdbm[v] = v; v = v.next}
+
+      hash = @gdbm.reject {|key, val| key.to_i < 50}
+      assert_instance_of(Hash, hash)
+      assert_equal(100, @gdbm.size)
+
+      assert_equal(50, hash.size)
+      hash.each_pair {|key,val|
+        assert_equal(false, key.to_i < 50)
+        assert_equal(key, val)
+      }
+
+      hash = @gdbm.reject {|key, val| key.to_i < 100}
+      assert_instance_of(Hash, hash)
+      assert_equal(true, hash.empty?)
+    end
+
+    def test_clear
+      v = "1"
+      100.times {v = v.next; @gdbm[v] = v}
+
+      assert_equal(@gdbm, @gdbm.clear)
+
+      # validate GDBM#size
+      i = 0
+      @gdbm.each { i += 1 }
+      assert_equal(@gdbm.size, i)
+      assert_equal(0, i)
+    end
+
+    def test_invert
+      v = "0"
+      100.times {@gdbm[v] = v; v = v.next}
+
+      hash = @gdbm.invert
+      assert_instance_of(Hash, hash)
+      assert_equal(100, hash.size)
+      hash.each_pair {|key, val|
+        assert_equal(key.to_i, val.to_i)
+      }
+    end
+
+    def test_update
+      hash = {}
+      v = "0"
+      100.times {v = v.next; hash[v] = v}
+
+      @gdbm["101"] = "101"
+      @gdbm.update hash
+      assert_equal(101, @gdbm.size)
+      @gdbm.each_pair {|key, val|
+        assert_equal(key.to_i, val.to_i)
+      }
+    end
+
+    def test_replace
+      hash = {}
+      v = "0"
+      100.times {v = v.next; hash[v] = v}
+
+      @gdbm["101"] = "101"
+      @gdbm.replace hash
+      assert_equal(100, @gdbm.size)
+      @gdbm.each_pair {|key, val|
+        assert_equal(key.to_i, val.to_i)
+      }
+    end
+
+    def test_reorganize
+      size1 = File.size(@path)
+      i = "1"
+      1000.times {i = i.next; @gdbm[i] = i}
+      @gdbm.clear
+      @gdbm.sync
+
+      size2 = File.size(@path)
+      @gdbm.reorganize
+      size3 = File.size(@path)
+
+      # p [size1, size2, size3]
+      assert_equal(true, size1 < size2)
+      # this test is failed on Cygwin98. `GDBM version 1.8.0, as of May 19, 1999'
+      assert_equal(true, size3 < size2)
+      assert_equal(size1, size3)
+    end
+
+    def test_sync
+      assert_instance_of(GDBM, gdbm = GDBM.open('tmptest_gdbm', 0666, GDBM::FAST))
+      assert_equal(gdbm.sync, gdbm)
+      gdbm.close
+      assert_instance_of(GDBM, gdbm = GDBM.open('tmptest_gdbm', 0666))
+      assert_equal(gdbm.sync, gdbm)
+      gdbm.close
+    end
+
+    def test_cachesize=
+        assert_equal(@gdbm.cachesize = 1024, 1024)
+    end
+
+    def test_fastmode=
+        assert_equal(@gdbm.fastmode = true, true)
+    end
+
+    def test_syncmode=
+        assert_equal(@gdbm.syncmode = true, true)
+    end
+
+    def test_haskey?
+      assert_equal('bar', @gdbm['foo']='bar')
+      assert_equal(true,  @gdbm.has_key?('foo'))
+      assert_equal(false, @gdbm.has_key?('bar'))
+    end
+
+    def test_has_value?
+      assert_equal('bar', @gdbm['foo']='bar')
+      assert_equal(true,  @gdbm.has_value?('bar'))
+      assert_equal(false, @gdbm.has_value?('foo'))
+    end
+
+    def test_to_a
+      v = "0"
+      100.times {v = v.next; @gdbm[v] = v}
+
+      ary = @gdbm.to_a
+      assert_instance_of(Array, ary)
+      assert_equal(100, ary.size)
+      ary.each {|key,val|
+        assert_equal(key.to_i, val.to_i)
+      }
+    end
+
+    def test_to_hash
+      v = "0"
+      100.times {v = v.next; @gdbm[v] = v}
+
+      hash = @gdbm.to_hash
+      assert_instance_of(Hash, hash)
+      assert_equal(100, hash.size)
+      hash.each {|key,val|
+        assert_equal(key.to_i, val.to_i)
+      }
+    end
+  end
+
+  class TestGDBM2 < Test::Unit::TestCase
+    TMPROOT = "#{Dir.tmpdir}/ruby-gdbm.#{$$}"
+
+    def setup
+      Dir.mkdir TMPROOT
+    end
+
+    def teardown
+      FileUtils.rm_rf TMPROOT if File.directory?(TMPROOT)
+    end
+
+    def test_reader_open
+      GDBM.open("#{TMPROOT}/a.dbm") {}
+      v = GDBM.open("#{TMPROOT}/a.dbm", nil, GDBM::READER) {|d|
+        assert_raises(GDBMError) { d["k"] = "v" }
+        true
+      }
+      assert(v)
+    end
+
+    def test_newdb_open
+      GDBM.open("#{TMPROOT}/a.dbm") {|dbm|
+        dbm["k"] = "v"
+      } 
+      v = GDBM.open("#{TMPROOT}/a.dbm", nil, GDBM::NEWDB) {|d|
+        assert_equal(0, d.length)
+        assert_nil(d["k"])
+        true
+      }
+      assert(v)
+    end
+
+    def test_freeze
+      GDBM.open("#{TMPROOT}/a.dbm") {|d|
+        d.freeze
+        assert_raises(TypeError) { d["k"] = "v" }
+      }
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/io/nonblock/test_flush.rb b/ruby_1_8_6/test/io/nonblock/test_flush.rb
new file mode 100644
index 0000000000..2afbba300e
--- /dev/null
+++ b/ruby_1_8_6/test/io/nonblock/test_flush.rb
@@ -0,0 +1,28 @@
+require 'test/unit'
+begin
+  require 'io/nonblock'
+rescue LoadError
+end
+
+class TestIONonblock < Test::Unit::TestCase
+  def test_flush                # [ruby-dev:24985]
+    r,w = IO.pipe
+    w.nonblock = true
+    w.sync = false
+    w << "b"
+    w.flush
+    w << "a" * 4096
+    Thread.new {
+      Thread.pass
+      w.close
+    }
+    result = ""
+    t = Thread.new {
+      while (Thread.pass; s = r.read(4096))
+        result << s
+      end
+    }
+    assert_raise(IOError) {w.flush}
+    assert_nothing_raised {t.join}
+  end
+end if IO.method_defined?(:nonblock)
diff --git a/ruby_1_8_6/test/logger/test_logger.rb b/ruby_1_8_6/test/logger/test_logger.rb
new file mode 100644
index 0000000000..ab578a1b81
--- /dev/null
+++ b/ruby_1_8_6/test/logger/test_logger.rb
@@ -0,0 +1,376 @@
+require 'test/unit'
+require 'logger'
+require 'tempfile'
+
+
+class TestLoggerSeverity < Test::Unit::TestCase
+  def test_enum
+    logger_levels = Logger.constants
+    levels = ["WARN", "UNKNOWN", "INFO", "FATAL", "DEBUG", "ERROR"]
+    Logger::Severity.constants.each do |level|
+      assert(levels.include?(level))
+      assert(logger_levels.include?(level))
+    end
+    assert_equal(levels.size, Logger::Severity.constants.size)
+  end
+end
+
+
+class TestLogger < Test::Unit::TestCase
+  include Logger::Severity
+
+  def setup
+    @logger = Logger.new(nil)
+  end
+
+  class Log
+    attr_reader :label, :datetime, :pid, :severity, :progname, :msg
+    def initialize(line)
+      /\A(\w+), \[([^#]*)#(\d+)\]\s+(\w+) -- (\w*): ([\x0-\xff]*)/ =~ line
+      @label, @datetime, @pid, @severity, @progname, @msg = $1, $2, $3, $4, $5, $6
+    end
+  end
+
+  def log_add(logger, severity, msg, progname = nil, &block)
+    log(logger, :add, severity, msg, progname, &block)
+  end
+
+  def log(logger, msg_id, *arg, &block)
+    Log.new(log_raw(logger, msg_id, *arg, &block))
+  end
+
+  def log_raw(logger, msg_id, *arg, &block)
+    logdev = Tempfile.new(File.basename(__FILE__) + '.log')
+    logger.instance_eval { @logdev = Logger::LogDevice.new(logdev) }
+    logger.__send__(msg_id, *arg, &block)
+    logdev.open
+    msg = logdev.read
+    logdev.close
+    msg
+  end
+
+  def test_level
+    @logger.level = UNKNOWN
+    assert_equal(UNKNOWN, @logger.level)
+    @logger.level = INFO
+    assert_equal(INFO, @logger.level)
+    @logger.sev_threshold = ERROR
+    assert_equal(ERROR, @logger.sev_threshold)
+    @logger.sev_threshold = WARN
+    assert_equal(WARN, @logger.sev_threshold)
+    assert_equal(WARN, @logger.level)
+
+    @logger.level = DEBUG
+    assert(@logger.debug?)
+    assert(@logger.info?)
+    @logger.level = INFO
+    assert(!@logger.debug?)
+    assert(@logger.info?)
+    assert(@logger.warn?)
+    @logger.level = WARN
+    assert(!@logger.info?)
+    assert(@logger.warn?)
+    assert(@logger.error?)
+    @logger.level = ERROR
+    assert(!@logger.warn?)
+    assert(@logger.error?)
+    assert(@logger.fatal?)
+    @logger.level = FATAL
+    assert(!@logger.error?)
+    assert(@logger.fatal?)
+    @logger.level = UNKNOWN
+    assert(!@logger.error?)
+    assert(!@logger.fatal?)
+  end
+
+  def test_progname
+    assert_nil(@logger.progname)
+    @logger.progname = "name"
+    assert_equal("name", @logger.progname)
+  end
+
+  def test_datetime_format
+    dummy = STDERR
+    logger = Logger.new(dummy)
+    log = log_add(logger, INFO, "foo")
+    assert_match(/^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d.\s*\d+ $/, log.datetime)
+    logger.datetime_format = "%d%b%Y@%H:%M:%S"
+    log = log_add(logger, INFO, "foo")
+    assert_match(/^\d\d\w\w\w\d\d\d\d@\d\d:\d\d:\d\d$/, log.datetime)
+    logger.datetime_format = ""
+    log = log_add(logger, INFO, "foo")
+    assert_match(/^$/, log.datetime)
+  end
+
+  def test_formatter
+    dummy = STDERR
+    logger = Logger.new(dummy)
+    # default
+    log = log(logger, :info, "foo")
+    assert_equal("foo\n", log.msg)
+    # config
+    logger.formatter = proc { |severity, timestamp, progname, msg|
+      "#{severity}:#{msg}\n\n"
+    }
+    line = log_raw(logger, :info, "foo")
+    assert_equal("INFO:foo\n\n", line)
+    # recover
+    logger.formatter = nil
+    log = log(logger, :info, "foo")
+    assert_equal("foo\n", log.msg)
+    # again
+    o = Object.new
+    def o.call(severity, timestamp, progname, msg)
+      "<<#{severity}-#{msg}>>\n"
+    end
+    logger.formatter = o
+    line = log_raw(logger, :info, "foo")
+    assert_equal("<<INFO-foo>>\n", line)
+  end
+
+  def test_initialize
+    logger = Logger.new(STDERR)
+    assert_nil(logger.progname)
+    assert_equal(DEBUG, logger.level)
+    assert_nil(logger.datetime_format)
+  end
+
+  def test_add
+    logger = Logger.new(nil)
+    logger.progname = "my_progname"
+    assert(logger.add(INFO))
+    log = log_add(logger, nil, "msg")
+    assert_equal("ANY", log.severity)
+    assert_equal("my_progname", log.progname)
+    logger.level = WARN
+    assert(logger.log(INFO))
+    assert_nil(log_add(logger, INFO, "msg").msg)
+    log = log_add(logger, WARN, nil) { "msg" }
+    assert_equal("msg\n", log.msg)
+    log = log_add(logger, WARN, "") { "msg" }
+    assert_equal("\n", log.msg)
+    assert_equal("my_progname", log.progname)
+    log = log_add(logger, WARN, nil, "progname?")
+    assert_equal("progname?\n", log.msg)
+    assert_equal("my_progname", log.progname)
+  end
+
+  def test_level_log
+    logger = Logger.new(nil)
+    logger.progname = "my_progname"
+    log = log(logger, :debug, "custom_progname") { "msg" }
+    assert_equal("msg\n", log.msg)
+    assert_equal("custom_progname", log.progname)
+    assert_equal("DEBUG", log.severity)
+    assert_equal("D", log.label)
+    #
+    log = log(logger, :debug) { "msg_block" }
+    assert_equal("msg_block\n", log.msg)
+    assert_equal("my_progname", log.progname)
+    log = log(logger, :debug, "msg_inline")
+    assert_equal("msg_inline\n", log.msg)
+    assert_equal("my_progname", log.progname)
+    #
+    log = log(logger, :info, "custom_progname") { "msg" }
+    assert_equal("msg\n", log.msg)
+    assert_equal("custom_progname", log.progname)
+    assert_equal("INFO", log.severity)
+    assert_equal("I", log.label)
+    #
+    log = log(logger, :warn, "custom_progname") { "msg" }
+    assert_equal("msg\n", log.msg)
+    assert_equal("custom_progname", log.progname)
+    assert_equal("WARN", log.severity)
+    assert_equal("W", log.label)
+    #
+    log = log(logger, :error, "custom_progname") { "msg" }
+    assert_equal("msg\n", log.msg)
+    assert_equal("custom_progname", log.progname)
+    assert_equal("ERROR", log.severity)
+    assert_equal("E", log.label)
+    #
+    log = log(logger, :fatal, "custom_progname") { "msg" }
+    assert_equal("msg\n", log.msg)
+    assert_equal("custom_progname", log.progname)
+    assert_equal("FATAL", log.severity)
+    assert_equal("F", log.label)
+    #
+    log = log(logger, :unknown, "custom_progname") { "msg" }
+    assert_equal("msg\n", log.msg)
+    assert_equal("custom_progname", log.progname)
+    assert_equal("ANY", log.severity)
+    assert_equal("A", log.label)
+  end
+
+  def test_close
+    r, w = IO.pipe
+    assert(!w.closed?)
+    logger = Logger.new(w)
+    logger.close
+    assert(w.closed?)
+    r.close
+  end
+
+  class MyError < StandardError
+  end
+
+  class MyMsg
+    def inspect
+      "my_msg"
+    end
+  end
+
+  def test_format
+    logger = Logger.new(nil)
+    log = log_add(logger, INFO, "msg\n")
+    assert_equal("msg\n\n", log.msg)
+    begin
+      raise MyError.new("excn")
+    rescue MyError => e
+      log = log_add(logger, INFO, e)
+      assert_match(/^excn \(TestLogger::MyError\)/, log.msg)
+      # expects backtrace is dumped across multi lines.  10 might be changed.
+      assert(log.msg.split(/\n/).size >= 10)
+    end
+    log = log_add(logger, INFO, MyMsg.new)
+    assert_equal("my_msg\n", log.msg)
+  end
+
+  def test_lshift
+    r, w = IO.pipe
+    logger = Logger.new(w)
+    logger << "msg"
+    read_ready, = IO.select([r], nil, nil, 0.1)
+    w.close
+    msg = r.read
+    r.close
+    assert_equal("msg", msg)
+    #
+    r, w = IO.pipe
+    logger = Logger.new(w)
+    logger << "msg2\n\n"
+    read_ready, = IO.select([r], nil, nil, 0.1)
+    w.close
+    msg = r.read
+    r.close
+    assert_equal("msg2\n\n", msg)
+  end
+end
+
+class TestLogDevice < Test::Unit::TestCase
+  def d(log)
+    Logger::LogDevice.new(log)
+  end
+
+  def test_initialize
+    logdev = d(STDERR)
+    assert_equal(STDERR, logdev.dev)
+    assert_nil(logdev.filename)
+    assert_raises(TypeError) do
+      d(nil)
+    end
+    #
+    filename = __FILE__ + ".#{$$}"
+    begin
+      logdev = d(filename)
+      assert(File.exist?(filename))
+      assert(logdev.dev.sync)
+      assert_equal(filename, logdev.filename)
+    ensure
+      logdev.close
+      File.unlink(filename)
+    end
+  end
+
+  def test_write
+    r, w = IO.pipe
+    logdev = d(w)
+    logdev.write("msg2\n\n")
+    read_ready, = IO.select([r], nil, nil, 0.1)
+    w.close
+    msg = r.read
+    r.close
+    assert_equal("msg2\n\n", msg)
+  end
+
+  def test_close
+    r, w = IO.pipe
+    logdev = d(w)
+    logdev.write("msg2\n\n")
+    read_ready, = IO.select([r], nil, nil, 0.1)
+    assert(!w.closed?)
+    logdev.close
+    assert(w.closed?)
+    r.close
+  end
+
+  def test_shifting_size
+    logfile = File.basename(__FILE__) + '_1.log'
+    logfile0 = logfile + '.0'
+    logfile1 = logfile + '.1'
+    logfile2 = logfile + '.2'
+    logfile3 = logfile + '.3'
+    File.unlink(logfile) if File.exist?(logfile)
+    File.unlink(logfile0) if File.exist?(logfile0)
+    File.unlink(logfile1) if File.exist?(logfile1)
+    File.unlink(logfile2) if File.exist?(logfile2)
+    logger = Logger.new(logfile, 4, 100)
+    logger.error("0" * 15)
+    assert(File.exist?(logfile))
+    assert(!File.exist?(logfile0))
+    logger.error("0" * 15)
+    assert(File.exist?(logfile0))
+    assert(!File.exist?(logfile1))
+    logger.error("0" * 15)
+    assert(File.exist?(logfile1))
+    assert(!File.exist?(logfile2))
+    logger.error("0" * 15)
+    assert(File.exist?(logfile2))
+    assert(!File.exist?(logfile3))
+    logger.error("0" * 15)
+    assert(!File.exist?(logfile3))
+    logger.error("0" * 15)
+    assert(!File.exist?(logfile3))
+    logger.close
+    File.unlink(logfile)
+    File.unlink(logfile0)
+    File.unlink(logfile1)
+    File.unlink(logfile2)
+
+    logfile = File.basename(__FILE__) + '_2.log'
+    logfile0 = logfile + '.0'
+    logfile1 = logfile + '.1'
+    logfile2 = logfile + '.2'
+    logfile3 = logfile + '.3'
+    logger = Logger.new(logfile, 4, 150)
+    logger.error("0" * 15)
+    assert(File.exist?(logfile))
+    assert(!File.exist?(logfile0))
+    logger.error("0" * 15)
+    assert(!File.exist?(logfile0))
+    logger.error("0" * 15)
+    assert(File.exist?(logfile0))
+    assert(!File.exist?(logfile1))
+    logger.error("0" * 15)
+    assert(!File.exist?(logfile1))
+    logger.error("0" * 15)
+    assert(File.exist?(logfile1))
+    assert(!File.exist?(logfile2))
+    logger.error("0" * 15)
+    assert(!File.exist?(logfile2))
+    logger.error("0" * 15)
+    assert(File.exist?(logfile2))
+    assert(!File.exist?(logfile3))
+    logger.error("0" * 15)
+    assert(!File.exist?(logfile3))
+    logger.error("0" * 15)
+    assert(!File.exist?(logfile3))
+    logger.error("0" * 15)
+    assert(!File.exist?(logfile3))
+    logger.close
+    File.unlink(logfile)
+    File.unlink(logfile0)
+    File.unlink(logfile1)
+    File.unlink(logfile2)
+  end
+end
diff --git a/ruby_1_8_6/test/monitor/test_monitor.rb b/ruby_1_8_6/test/monitor/test_monitor.rb
new file mode 100644
index 0000000000..b539cb3cca
--- /dev/null
+++ b/ruby_1_8_6/test/monitor/test_monitor.rb
@@ -0,0 +1,161 @@
+require "monitor"
+require "thread"
+
+require "test/unit"
+
+class TestMonitor < Test::Unit::TestCase
+  def setup
+    @monitor = Monitor.new
+  end
+
+  def test_enter
+    ary = []
+    queue = Queue.new
+    th = Thread.start {
+      queue.pop
+      @monitor.enter
+      for i in 6 .. 10
+        ary.push(i)
+        Thread.pass
+      end
+      @monitor.exit
+    }
+    @monitor.enter
+    queue.enq(nil)
+    for i in 1 .. 5
+      ary.push(i)
+      Thread.pass
+    end
+    @monitor.exit
+    th.join
+    assert_equal((1..10).to_a, ary)
+  end
+
+  def test_synchronize
+    ary = []
+    queue = Queue.new
+    th = Thread.start {
+      queue.pop
+      @monitor.synchronize do
+        for i in 6 .. 10
+          ary.push(i)
+          Thread.pass
+        end
+      end
+    }
+    @monitor.synchronize do
+      queue.enq(nil)
+      for i in 1 .. 5
+        ary.push(i)
+        Thread.pass
+      end
+    end
+    th.join
+    assert_equal((1..10).to_a, ary)
+  end
+
+  def test_try_enter
+    queue1 = Queue.new
+    queue2 = Queue.new
+    th = Thread.start {
+      queue1.deq
+      @monitor.enter
+      queue2.enq(nil)
+      queue1.deq
+      @monitor.exit
+      queue2.enq(nil)
+    }
+    assert_equal(true, @monitor.try_enter)
+    @monitor.exit
+    queue1.enq(nil)
+    queue2.deq
+    assert_equal(false, @monitor.try_enter)
+    queue1.enq(nil)
+    queue2.deq
+    assert_equal(true, @monitor.try_enter)
+  end
+
+  def test_cond
+    cond = @monitor.new_cond
+
+    a = "foo"
+    queue1 = Queue.new
+    Thread.start do
+      queue1.deq
+      @monitor.synchronize do
+        a = "bar"
+        cond.signal
+      end
+    end
+    @monitor.synchronize do
+      queue1.enq(nil)
+      assert_equal("foo", a)
+      result1 = cond.wait
+      assert_equal(true, result1)
+      assert_equal("bar", a)
+    end
+
+    b = "foo"
+    queue2 = Queue.new
+    Thread.start do
+      queue2.deq
+      @monitor.synchronize do
+        b = "bar"
+        cond.signal
+      end
+    end
+    @monitor.synchronize do
+      queue2.enq(nil)
+      assert_equal("foo", b)
+      result2 = cond.wait(0.1)
+      assert_equal(true, result2)
+      assert_equal("bar", b)
+    end
+
+    c = "foo"
+    queue3 = Queue.new
+    Thread.start do
+      queue3.deq
+      @monitor.synchronize do
+        c = "bar"
+        cond.signal
+      end
+    end
+    @monitor.synchronize do
+      assert_equal("foo", c)
+      result3 = cond.wait(0.1)
+      assert_equal(false, result3)
+      assert_equal("foo", c)
+      queue3.enq(nil)
+      result4 = cond.wait
+      assert_equal(true, result4)
+      assert_equal("bar", c)
+    end
+
+#     d = "foo"
+#     cumber_thread = Thread.start {
+#       loop do
+#         @monitor.synchronize do
+#           d = "foo"
+#         end
+#       end
+#     }
+#     queue3 = Queue.new
+#     Thread.start do
+#       queue3.pop
+#       @monitor.synchronize do
+#         d = "bar"
+#         cond.signal
+#       end
+#     end
+#     @monitor.synchronize do
+#       queue3.enq(nil)
+#       assert_equal("foo", d)
+#       result5 = cond.wait
+#       assert_equal(true, result5)
+#       # this thread has priority over cumber_thread
+#       assert_equal("bar", d)
+#     end
+#     cumber_thread.kill
+  end
+end
diff --git a/ruby_1_8_6/test/net/http/test_httpheader.rb b/ruby_1_8_6/test/net/http/test_httpheader.rb
new file mode 100644
index 0000000000..3ba1b217c0
--- /dev/null
+++ b/ruby_1_8_6/test/net/http/test_httpheader.rb
@@ -0,0 +1,317 @@
+require 'net/http'
+require 'test/unit'
+
+class HTTPHeaderTest < Test::Unit::TestCase
+
+  class C
+    include Net::HTTPHeader
+    def initialize
+      initialize_http_header({})
+    end
+    attr_accessor :body
+  end
+
+  def setup
+    @c = C.new
+  end
+
+  def test_size
+    assert_equal 0, @c.size
+    @c['a'] = 'a'
+    assert_equal 1, @c.size
+    @c['b'] = 'b'
+    assert_equal 2, @c.size
+    @c['b'] = 'b'
+    assert_equal 2, @c.size
+    @c['c'] = 'c'
+    assert_equal 3, @c.size
+  end
+
+  def test_ASET
+    @c['My-Header'] = 'test string'
+    @c['my-Header'] = 'test string'
+    @c['My-header'] = 'test string'
+    @c['my-header'] = 'test string'
+    @c['MY-HEADER'] = 'test string'
+    assert_equal 1, @c.size
+
+    @c['AaA'] = 'aaa'
+    @c['aaA'] = 'aaa'
+    @c['AAa'] = 'aaa'
+    assert_equal 2, @c.length
+  end
+
+  def test_AREF
+    @c['My-Header'] = 'test string'
+    assert_equal 'test string', @c['my-header']
+    assert_equal 'test string', @c['MY-header']
+    assert_equal 'test string', @c['my-HEADER']
+
+    @c['Next-Header'] = 'next string'
+    assert_equal 'next string', @c['next-header']
+  end
+
+  def test_add_field
+    @c.add_field 'My-Header', 'a'
+    assert_equal 'a', @c['My-Header']
+    assert_equal ['a'], @c.get_fields('My-Header')
+    @c.add_field 'My-Header', 'b'
+    assert_equal 'a, b', @c['My-Header']
+    assert_equal ['a', 'b'], @c.get_fields('My-Header')
+    @c.add_field 'My-Header', 'c'
+    assert_equal 'a, b, c', @c['My-Header']
+    assert_equal ['a', 'b', 'c'], @c.get_fields('My-Header')
+    @c.add_field 'My-Header', 'd, d'
+    assert_equal 'a, b, c, d, d', @c['My-Header']
+    assert_equal ['a', 'b', 'c', 'd, d'], @c.get_fields('My-Header')
+  end
+
+  def test_get_fields
+    @c['My-Header'] = 'test string'
+    assert_equal ['test string'], @c.get_fields('my-header')
+    assert_equal ['test string'], @c.get_fields('My-header')
+    assert_equal ['test string'], @c.get_fields('my-Header')
+
+    assert_nil @c.get_fields('not-found')
+    assert_nil @c.get_fields('Not-Found')
+
+    @c.get_fields('my-header').push 'junk'
+    assert_equal ['test string'], @c.get_fields('my-header')
+    @c.get_fields('my-header').clear
+    assert_equal ['test string'], @c.get_fields('my-header')
+  end
+
+  def test_delete
+    @c['My-Header'] = 'test'
+    assert_equal 'test', @c['My-Header']
+    assert_nil @c['not-found']
+    @c.delete 'My-Header'
+    assert_nil @c['My-Header']
+    assert_nil @c['not-found']
+    @c.delete 'My-Header'
+    @c.delete 'My-Header'
+    assert_nil @c['My-Header']
+    assert_nil @c['not-found']
+  end
+
+  def test_each
+    @c['My-Header'] = 'test'
+    @c.each do |k, v|
+      assert_equal 'my-header', k
+      assert_equal 'test', v
+    end
+    @c.each do |k, v|
+      assert_equal 'my-header', k
+      assert_equal 'test', v
+    end
+  end
+
+  def test_each_key
+    @c['My-Header'] = 'test'
+    @c.each_key do |k|
+      assert_equal 'my-header', k
+    end
+    @c.each_key do |k|
+      assert_equal 'my-header', k
+    end
+  end
+
+  def test_each_value
+    @c['My-Header'] = 'test'
+    @c.each_value do |v|
+      assert_equal 'test', v
+    end
+    @c.each_value do |v|
+      assert_equal 'test', v
+    end
+  end
+
+  def test_canonical_each
+    @c['my-header'] = ['a', 'b']
+    @c.canonical_each do |k,v|
+      assert_equal 'My-Header', k
+      assert_equal 'a, b', v
+    end
+  end
+
+  def test_each_capitalized
+    @c['my-header'] = ['a', 'b']
+    @c.each_capitalized do |k,v|
+      assert_equal 'My-Header', k
+      assert_equal 'a, b', v
+    end
+  end
+
+  def test_key?
+    @c['My-Header'] = 'test'
+    assert_equal true, @c.key?('My-Header')
+    assert_equal true, @c.key?('my-header')
+    assert_equal false, @c.key?('Not-Found')
+    assert_equal false, @c.key?('not-found')
+    assert_equal false, @c.key?('')
+    assert_equal false, @c.key?('x' * 1024)
+  end
+
+  def test_to_hash
+  end
+
+  def test_range
+    try_range(1..5,     '1-5')
+    try_range(234..567, '234-567')
+    try_range(-5..-1,   '-5')
+    try_range(1..-1,    '1-')
+  end
+
+  def try_range(r, s)
+    @c['range'] = "bytes=#{s}"
+    assert_equal r, Array(@c.range)[0]
+  end
+
+  def test_range=
+    @c.range = 0..499
+    assert_equal 'bytes=0-499', @c['range']
+    @c.range = 0...500
+    assert_equal 'bytes=0-499', @c['range']
+    @c.range = 300
+    assert_equal 'bytes=0-299', @c['range']
+    @c.range = -400
+    assert_equal 'bytes=-400', @c['range']
+    @c.set_range 0, 500
+    assert_equal 'bytes=0-499', @c['range']
+  end
+
+  def test_content_range
+  end
+
+  def test_range_length
+    @c['Content-Range'] = "bytes 0-499/1000"
+    assert_equal 500, @c.range_length
+    @c['Content-Range'] = "bytes 1-500/1000"
+    assert_equal 500, @c.range_length
+    @c['Content-Range'] = "bytes 1-1/1000"
+    assert_equal 1, @c.range_length
+  end
+
+  def test_chunked?
+    try_chunked true, 'chunked'
+    try_chunked true, '  chunked  '
+    try_chunked true, '(OK)chunked'
+
+    try_chunked false, 'not-chunked'
+    try_chunked false, 'chunked-but-not-chunked'
+  end
+
+  def try_chunked(bool, str)
+    @c['transfer-encoding'] = str
+    assert_equal bool, @c.chunked?
+  end
+
+  def test_content_length
+    @c.delete('content-length')
+    assert_nil @c['content-length']
+
+    try_content_length 500, '500'
+    try_content_length 10000_0000_0000, '1000000000000'
+    try_content_length 123, '  123'
+    try_content_length 1,   '1 23'
+    try_content_length 500, '(OK)500'
+    assert_raises(Net::HTTPHeaderSyntaxError, 'here is no digit, but') {
+      @c['content-length'] = 'no digit'
+      @c.content_length
+    }
+  end
+
+  def try_content_length(len, str)
+    @c['content-length'] = str
+    assert_equal len, @c.content_length
+  end
+
+  def test_content_length=
+    @c.content_length = 0
+    assert_equal 0, @c.content_length
+    @c.content_length = 1
+    assert_equal 1, @c.content_length
+    @c.content_length = 999
+    assert_equal 999, @c.content_length
+    @c.content_length = 10000000000000
+    assert_equal 10000000000000, @c.content_length
+  end
+
+  def test_content_type
+    assert_nil @c.content_type
+    @c.content_type = 'text/html'
+    assert_equal 'text/html', @c.content_type
+    @c.content_type = 'application/pdf'
+    assert_equal 'application/pdf', @c.content_type
+    @c.set_content_type 'text/html', {'charset' => 'iso-2022-jp'}
+    assert_equal 'text/html', @c.content_type
+    @c.content_type = 'text'
+    assert_equal 'text', @c.content_type
+  end
+
+  def test_main_type
+    assert_nil @c.main_type
+    @c.content_type = 'text/html'
+    assert_equal 'text', @c.main_type
+    @c.content_type = 'application/pdf'
+    assert_equal 'application', @c.main_type
+    @c.set_content_type 'text/html', {'charset' => 'iso-2022-jp'}
+    assert_equal 'text', @c.main_type
+    @c.content_type = 'text'
+    assert_equal 'text', @c.main_type
+  end
+
+  def test_sub_type
+    assert_nil @c.sub_type
+    @c.content_type = 'text/html'
+    assert_equal 'html', @c.sub_type
+    @c.content_type = 'application/pdf'
+    assert_equal 'pdf', @c.sub_type
+    @c.set_content_type 'text/html', {'charset' => 'iso-2022-jp'}
+    assert_equal 'html', @c.sub_type
+    @c.content_type = 'text'
+    assert_nil @c.sub_type
+  end
+
+  def test_type_params
+    assert_equal({}, @c.type_params)
+    @c.content_type = 'text/html'
+    assert_equal({}, @c.type_params)
+    @c.content_type = 'application/pdf'
+    assert_equal({}, @c.type_params)
+    @c.set_content_type 'text/html', {'charset' => 'iso-2022-jp'}
+    assert_equal({'charset' => 'iso-2022-jp'}, @c.type_params)
+    @c.content_type = 'text'
+    assert_equal({}, @c.type_params)
+  end
+
+  def test_set_content_type
+  end
+
+  def test_form_data=
+    @c.form_data = {"cmd"=>"search", "q"=>"ruby", "max"=>"50"}
+    assert_equal 'application/x-www-form-urlencoded', @c.content_type
+    assert_equal %w( cmd=search max=50 q=ruby ), @c.body.split('&').sort
+  end
+
+  def test_set_form_data
+    @c.set_form_data "cmd"=>"search", "q"=>"ruby", "max"=>"50"
+    assert_equal 'application/x-www-form-urlencoded', @c.content_type
+    assert_equal %w( cmd=search max=50 q=ruby ), @c.body.split('&').sort
+
+    @c.set_form_data "cmd"=>"search", "q"=>"ruby", "max"=>50
+    assert_equal 'application/x-www-form-urlencoded', @c.content_type
+    assert_equal %w( cmd=search max=50 q=ruby ), @c.body.split('&').sort
+
+    @c.set_form_data({"cmd"=>"search", "q"=>"ruby", "max"=>"50"}, ';')
+    assert_equal 'application/x-www-form-urlencoded', @c.content_type
+    assert_equal %w( cmd=search max=50 q=ruby ), @c.body.split(';').sort
+  end
+
+  def test_basic_auth
+  end
+
+  def test_proxy_basic_auth
+  end
+
+end
diff --git a/ruby_1_8_6/test/net/http/test_https_proxy.rb b/ruby_1_8_6/test/net/http/test_https_proxy.rb
new file mode 100644
index 0000000000..6332319f26
--- /dev/null
+++ b/ruby_1_8_6/test/net/http/test_https_proxy.rb
@@ -0,0 +1,30 @@
+begin
+  require 'net/https'
+rescue LoadError
+end
+require 'test/unit'
+
+class HTTPSProxyTest < Test::Unit::TestCase
+  def test_https_proxy_authentication
+    TCPServer.open("127.0.0.1", 0) {|serv|
+      _, port, _, _ = serv.addr
+      t = Thread.new {
+        proxy = Net::HTTP.Proxy("127.0.0.1", port, 'user', 'password')
+        http = proxy.new("foo.example.org", 8000)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        http.start
+      }
+      sock = serv.accept
+      proxy_request = sock.gets("\r\n\r\n")
+      assert_equal(
+        "CONNECT foo.example.org:8000 HTTP/1.1\r\n" +
+        "Host: foo.example.org:8000\r\n" +
+        "Proxy-Authorization: Basic dXNlcjpwYXNzd29yZA==\r\n" +
+        "\r\n",
+        proxy_request,
+        "[ruby-dev:25673]")
+    }
+  end
+end if defined?(OpenSSL)
+ 
diff --git a/ruby_1_8_6/test/net/imap/test_imap.rb b/ruby_1_8_6/test/net/imap/test_imap.rb
new file mode 100644
index 0000000000..0ee217965c
--- /dev/null
+++ b/ruby_1_8_6/test/net/imap/test_imap.rb
@@ -0,0 +1,11 @@
+require "net/imap"
+require "test/unit"
+
+class IMAPTest < Test::Unit::TestCase
+  def test_parse_nomodesq
+    parser = Net::IMAP::ResponseParser.new
+    r = parser.parse(%Q'* OK [NOMODSEQ] Sorry, modsequences have not been enabled on this mailbox\r\n')
+    assert_equal("OK", r.name)
+    assert_equal("NOMODSEQ", r.data.code.name)
+  end
+end
diff --git a/ruby_1_8_6/test/nkf/test_kconv.rb b/ruby_1_8_6/test/nkf/test_kconv.rb
new file mode 100644
index 0000000000..2533424705
--- /dev/null
+++ b/ruby_1_8_6/test/nkf/test_kconv.rb
@@ -0,0 +1,71 @@
+require 'test/unit'
+require 'kconv'
+
+class TestKconv < Test::Unit::TestCase
+  EUC_STR = "\
+\xa5\xaa\xa5\xd6\xa5\xb8\xa5\xa7\xa5\xaf\xa5\xc8\xbb\xd8\xb8\xfe\
+\xa5\xd7\xa5\xed\xa5\xb0\xa5\xe9\xa5\xdf\xa5\xf3\xa5\xb0\xb8\xc0\xb8\xec
+\x52\x75\x62\x79"
+  UTF8_STR = "\
+\xe3\x82\xaa\xe3\x83\x96\xe3\x82\xb8\xe3\x82\xa7\
+\xe3\x82\xaf\xe3\x83\x88\xe6\x8c\x87\xe5\x90\x91\
+\xe3\x83\x97\xe3\x83\xad\xe3\x82\xb0\xe3\x83\xa9\xe3\x83\x9f\
+\xe3\x83\xb3\xe3\x82\xb0\xe8\xa8\x80\xe8\xaa\x9e
+\x52\x75\x62\x79"
+  SJIS_STR = "\
+\x83\x49\x83\x75\x83\x57\x83\x46\x83\x4e\x83\x67\x8e\x77\x8c\xfc\
+\x83\x76\x83\x8d\x83\x4f\x83\x89\x83\x7e\x83\x93\x83\x4f\x8c\xbe\x8c\xea
+\x52\x75\x62\x79"
+  JIS_STR = "\
+\x1b\x24\x42\x25\x2a\x25\x56\x25\x38\x25\x27\x25\x2f\x25\x48\x3b\x58\x38\x7e\
+\x25\x57\x25\x6d\x25\x30\x25\x69\x25\x5f\x25\x73\x25\x30\x38\x40\x38\x6c\x1b\x28\x42
+\x52\x75\x62\x79"
+
+  def test_eucjp
+    assert(EUC_STR.iseuc)
+    assert_equal(::Kconv::EUC, Kconv.guess(EUC_STR))
+    assert_equal(EUC_STR, EUC_STR.toeuc)
+    assert_equal(EUC_STR, SJIS_STR.toeuc)
+    assert_equal(EUC_STR, UTF8_STR.toeuc)
+    assert_equal(EUC_STR, JIS_STR.toeuc)
+    assert_equal(EUC_STR, EUC_STR.kconv(::NKF::EUC))
+    assert_equal(EUC_STR, SJIS_STR.kconv(::NKF::EUC))
+    assert_equal(EUC_STR, UTF8_STR.kconv(::NKF::EUC))
+    assert_equal(EUC_STR, JIS_STR.kconv(::NKF::EUC))
+  end
+  def test_shiftjis
+    assert(SJIS_STR.issjis)
+    assert_equal(::Kconv::SJIS, Kconv.guess(SJIS_STR))
+    assert_equal(SJIS_STR, EUC_STR.tosjis)
+    assert_equal(SJIS_STR, SJIS_STR.tosjis)
+    assert_equal(SJIS_STR, UTF8_STR.tosjis)
+    assert_equal(SJIS_STR, JIS_STR.tosjis)
+    assert_equal(SJIS_STR, EUC_STR.kconv(::NKF::SJIS))
+    assert_equal(SJIS_STR, SJIS_STR.kconv(::NKF::SJIS))
+    assert_equal(SJIS_STR, UTF8_STR.kconv(::NKF::SJIS))
+    assert_equal(SJIS_STR, JIS_STR.kconv(::NKF::SJIS))
+  end
+  def test_utf8
+    assert(UTF8_STR.isutf8)
+    assert_equal(::Kconv::UTF8, Kconv.guess(UTF8_STR))
+    assert_equal(UTF8_STR, EUC_STR.toutf8)
+    assert_equal(UTF8_STR, SJIS_STR.toutf8)
+    assert_equal(UTF8_STR, UTF8_STR.toutf8)
+    assert_equal(UTF8_STR, JIS_STR.toutf8)
+    assert_equal(UTF8_STR, EUC_STR.kconv(::NKF::UTF8))
+    assert_equal(UTF8_STR, SJIS_STR.kconv(::NKF::UTF8))
+    assert_equal(UTF8_STR, UTF8_STR.kconv(::NKF::UTF8))
+    assert_equal(UTF8_STR, JIS_STR.kconv(::NKF::UTF8))
+  end
+  def test_jis
+    assert_equal(::Kconv::JIS, Kconv.guess(JIS_STR))
+    assert_equal(JIS_STR, EUC_STR.tojis)
+    assert_equal(JIS_STR, SJIS_STR.tojis)
+    assert_equal(JIS_STR, UTF8_STR.tojis)
+    assert_equal(JIS_STR, JIS_STR.tojis)
+    assert_equal(JIS_STR, EUC_STR.kconv(::NKF::JIS))
+    assert_equal(JIS_STR, SJIS_STR.kconv(::NKF::JIS))
+    assert_equal(JIS_STR, UTF8_STR.kconv(::NKF::JIS))
+    assert_equal(JIS_STR, JIS_STR.kconv(::NKF::JIS))
+  end
+end
diff --git a/ruby_1_8_6/test/nkf/test_nkf.rb b/ruby_1_8_6/test/nkf/test_nkf.rb
new file mode 100644
index 0000000000..279ad59e1a
--- /dev/null
+++ b/ruby_1_8_6/test/nkf/test_nkf.rb
@@ -0,0 +1,16 @@
+require 'test/unit'
+require 'nkf'
+
+class TestNKF < Test::Unit::TestCase
+  EUC_STR = "\xa5\xaa\xa5\xd6\xa5\xb8\xa5\xa7\xa5\xaf\xa5\xc8\xbb\xd8\xb8\xfe\
+\xa5\xb9\xa5\xaf\xa5\xea\xa5\xd7\xa5\xc8\xb8\xc0\xb8\xec\
+Ruby"
+
+  def test_guess
+    str_euc = EUC_STR
+    str_jis = NKF.nkf('-j', str_euc)
+    assert_equal(::NKF::JIS, NKF.guess(str_jis))
+    assert_equal(::NKF::EUC, NKF.guess(str_euc))
+  end
+
+end
diff --git a/ruby_1_8_6/test/openssl/ssl_server.rb b/ruby_1_8_6/test/openssl/ssl_server.rb
new file mode 100644
index 0000000000..6e620629c5
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/ssl_server.rb
@@ -0,0 +1,81 @@
+require "socket"
+require "thread"
+require "openssl"
+require File.join(File.dirname(__FILE__), "utils.rb")
+
+def get_pem(io=$stdin)
+  buf = ""
+  while line = io.gets
+    if /^-----BEGIN / =~ line
+      buf << line
+      break
+    end
+  end
+  while line = io.gets
+    buf << line
+    if /^-----END / =~ line
+      break
+    end
+  end
+  return buf
+end
+
+def make_key(pem)
+  begin
+    return OpenSSL::PKey::RSA.new(pem)
+  rescue
+    return OpenSSL::PKey::DSA.new(pem)
+  end
+end
+
+ca_cert  = OpenSSL::X509::Certificate.new(get_pem)
+ssl_cert = OpenSSL::X509::Certificate.new(get_pem)
+ssl_key  = make_key(get_pem)
+port = Integer(ARGV.shift)
+verify_mode = Integer(ARGV.shift)
+start_immediately = (/yes/ =~ ARGV.shift)
+
+store = OpenSSL::X509::Store.new
+store.add_cert(ca_cert)
+store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
+ctx = OpenSSL::SSL::SSLContext.new
+ctx.cert_store = store
+#ctx.extra_chain_cert = [ ca_cert ]
+ctx.cert = ssl_cert
+ctx.key = ssl_key
+ctx.verify_mode = verify_mode
+
+Socket.do_not_reverse_lookup = true
+tcps = nil
+100.times{|i|
+  begin
+    tcps = TCPServer.new("0.0.0.0", port+i)
+    port = port + i
+    break
+  rescue Errno::EADDRINUSE
+    next 
+  end
+}
+ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
+ssls.start_immediately = start_immediately
+
+$stdout.sync = true
+$stdout.puts Process.pid
+$stdout.puts port
+
+loop do
+  ssl = ssls.accept rescue next
+  Thread.start{
+    q = Queue.new
+    th = Thread.start{ ssl.write(q.shift) while true }
+    while line = ssl.gets
+      if line =~ /^STARTTLS$/
+        ssl.accept
+        next
+      end
+      q.push(line)
+    end
+    th.kill if q.empty?
+    ssl.close
+  }
+end
diff --git a/ruby_1_8_6/test/openssl/test_asn1.rb b/ruby_1_8_6/test/openssl/test_asn1.rb
new file mode 100644
index 0000000000..f196bc48fb
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_asn1.rb
@@ -0,0 +1,197 @@
+begin
+  require "openssl"
+  require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require 'test/unit'
+
+class  OpenSSL::TestASN1 < Test::Unit::TestCase
+  def test_decode
+    subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA")
+    key = OpenSSL::TestUtils::TEST_KEY_RSA1024
+    now = Time.at(Time.now.to_i) # suppress usec
+    s = 0xdeadbeafdeadbeafdeadbeafdeadbeaf
+    exts = [
+      ["basicConstraints","CA:TRUE,pathlen:1",true],
+      ["keyUsage","keyCertSign, cRLSign",true],
+      ["subjectKeyIdentifier","hash",false],
+    ]
+    dgst = OpenSSL::Digest::SHA1.new
+    cert = OpenSSL::TestUtils.issue_cert(
+      subj, key, s, now, now+3600, exts, nil, nil, dgst)
+
+
+    asn1 = OpenSSL::ASN1.decode(cert)
+    assert_equal(OpenSSL::ASN1::Sequence, asn1.class)
+    assert_equal(3, asn1.value.size)
+    tbs_cert, sig_alg, sig_val = *asn1.value
+
+    assert_equal(OpenSSL::ASN1::Sequence, tbs_cert.class)
+    assert_equal(8, tbs_cert.value.size)
+
+    version = tbs_cert.value[0]
+    assert_equal(:CONTEXT_SPECIFIC, version.tag_class)
+    assert_equal(0, version.tag)
+    assert_equal(1, version.value.size)
+    assert_equal(OpenSSL::ASN1::Integer, version.value[0].class)
+    assert_equal(2, version.value[0].value)
+
+    serial = tbs_cert.value[1]
+    assert_equal(OpenSSL::ASN1::Integer, serial.class)
+    assert_equal(0xdeadbeafdeadbeafdeadbeafdeadbeaf, serial.value)
+
+    sig = tbs_cert.value[2]
+    assert_equal(OpenSSL::ASN1::Sequence, sig.class)
+    assert_equal(2, sig.value.size)
+    assert_equal(OpenSSL::ASN1::ObjectId, sig.value[0].class)
+    assert_equal("1.2.840.113549.1.1.5", sig.value[0].oid)
+    assert_equal(OpenSSL::ASN1::Null, sig.value[1].class)
+
+    dn = tbs_cert.value[3] # issuer
+    assert_equal(subj.hash, OpenSSL::X509::Name.new(dn).hash)
+    assert_equal(OpenSSL::ASN1::Sequence, dn.class)
+    assert_equal(3, dn.value.size)
+    assert_equal(OpenSSL::ASN1::Set, dn.value[0].class)
+    assert_equal(OpenSSL::ASN1::Set, dn.value[1].class)
+    assert_equal(OpenSSL::ASN1::Set, dn.value[2].class)
+    assert_equal(1, dn.value[0].value.size)
+    assert_equal(1, dn.value[1].value.size)
+    assert_equal(1, dn.value[2].value.size)
+    assert_equal(OpenSSL::ASN1::Sequence, dn.value[0].value[0].class)
+    assert_equal(OpenSSL::ASN1::Sequence, dn.value[1].value[0].class)
+    assert_equal(OpenSSL::ASN1::Sequence, dn.value[2].value[0].class)
+    assert_equal(2, dn.value[0].value[0].value.size)
+    assert_equal(2, dn.value[1].value[0].value.size)
+    assert_equal(2, dn.value[2].value[0].value.size)
+    oid, value = *dn.value[0].value[0].value
+    assert_equal(OpenSSL::ASN1::ObjectId, oid.class)
+    assert_equal("0.9.2342.19200300.100.1.25", oid.oid)
+    assert_equal(OpenSSL::ASN1::IA5String, value.class)
+    assert_equal("org", value.value)
+    oid, value = *dn.value[1].value[0].value
+    assert_equal(OpenSSL::ASN1::ObjectId, oid.class)
+    assert_equal("0.9.2342.19200300.100.1.25", oid.oid)
+    assert_equal(OpenSSL::ASN1::IA5String, value.class)
+    assert_equal("ruby-lang", value.value)
+    oid, value = *dn.value[2].value[0].value
+    assert_equal(OpenSSL::ASN1::ObjectId, oid.class)
+    assert_equal("2.5.4.3", oid.oid)
+    assert_equal(OpenSSL::ASN1::UTF8String, value.class)
+    assert_equal("TestCA", value.value)
+
+    validity = tbs_cert.value[4]
+    assert_equal(OpenSSL::ASN1::Sequence, validity.class)
+    assert_equal(2, validity.value.size)
+    assert_equal(OpenSSL::ASN1::UTCTime, validity.value[0].class)
+    assert_equal(now, validity.value[0].value)
+    assert_equal(OpenSSL::ASN1::UTCTime, validity.value[1].class)
+    assert_equal(now+3600, validity.value[1].value)
+
+    dn = tbs_cert.value[5] # subject
+    assert_equal(subj.hash, OpenSSL::X509::Name.new(dn).hash)
+    assert_equal(OpenSSL::ASN1::Sequence, dn.class)
+    assert_equal(3, dn.value.size)
+    assert_equal(OpenSSL::ASN1::Set, dn.value[0].class)
+    assert_equal(OpenSSL::ASN1::Set, dn.value[1].class)
+    assert_equal(OpenSSL::ASN1::Set, dn.value[2].class)
+    assert_equal(1, dn.value[0].value.size)
+    assert_equal(1, dn.value[1].value.size)
+    assert_equal(1, dn.value[2].value.size)
+    assert_equal(OpenSSL::ASN1::Sequence, dn.value[0].value[0].class)
+    assert_equal(OpenSSL::ASN1::Sequence, dn.value[1].value[0].class)
+    assert_equal(OpenSSL::ASN1::Sequence, dn.value[2].value[0].class)
+    assert_equal(2, dn.value[0].value[0].value.size)
+    assert_equal(2, dn.value[1].value[0].value.size)
+    assert_equal(2, dn.value[2].value[0].value.size)
+    oid, value = *dn.value[0].value[0].value
+    assert_equal(OpenSSL::ASN1::ObjectId, oid.class)
+    assert_equal("0.9.2342.19200300.100.1.25", oid.oid)
+    assert_equal(OpenSSL::ASN1::IA5String, value.class)
+    assert_equal("org", value.value)
+    oid, value = *dn.value[1].value[0].value
+    assert_equal(OpenSSL::ASN1::ObjectId, oid.class)
+    assert_equal("0.9.2342.19200300.100.1.25", oid.oid)
+    assert_equal(OpenSSL::ASN1::IA5String, value.class)
+    assert_equal("ruby-lang", value.value)
+    oid, value = *dn.value[2].value[0].value
+    assert_equal(OpenSSL::ASN1::ObjectId, oid.class)
+    assert_equal("2.5.4.3", oid.oid)
+    assert_equal(OpenSSL::ASN1::UTF8String, value.class)
+    assert_equal("TestCA", value.value)
+
+    pkey = tbs_cert.value[6]
+    assert_equal(OpenSSL::ASN1::Sequence, pkey.class)
+    assert_equal(2, pkey.value.size)
+    assert_equal(OpenSSL::ASN1::Sequence, pkey.value[0].class)
+    assert_equal(2, pkey.value[0].value.size)
+    assert_equal(OpenSSL::ASN1::ObjectId, pkey.value[0].value[0].class)
+    assert_equal("1.2.840.113549.1.1.1", pkey.value[0].value[0].oid)
+    assert_equal(OpenSSL::ASN1::BitString, pkey.value[1].class)
+    assert_equal(0, pkey.value[1].unused_bits)
+    spkey = OpenSSL::ASN1.decode(pkey.value[1].value)
+    assert_equal(OpenSSL::ASN1::Sequence, spkey.class)
+    assert_equal(2, spkey.value.size)
+    assert_equal(OpenSSL::ASN1::Integer, spkey.value[0].class)
+    assert_equal(143085709396403084580358323862163416700436550432664688288860593156058579474547937626086626045206357324274536445865308750491138538454154232826011964045825759324933943290377903384882276841880081931690695505836279972214003660451338124170055999155993192881685495391496854691199517389593073052473319331505702779271, spkey.value[0].value)
+    assert_equal(OpenSSL::ASN1::Integer, spkey.value[1].class)
+    assert_equal(65537, spkey.value[1].value)
+
+    extensions = tbs_cert.value[7]
+    assert_equal(:CONTEXT_SPECIFIC, extensions.tag_class)
+    assert_equal(3, extensions.tag)
+    assert_equal(1, extensions.value.size)
+    assert_equal(OpenSSL::ASN1::Sequence, extensions.value[0].class)
+    assert_equal(3, extensions.value[0].value.size)
+
+    ext = extensions.value[0].value[0]  # basicConstraints
+    assert_equal(OpenSSL::ASN1::Sequence, ext.class)
+    assert_equal(3, ext.value.size)
+    assert_equal(OpenSSL::ASN1::ObjectId, ext.value[0].class)
+    assert_equal("2.5.29.19",  ext.value[0].oid)
+    assert_equal(OpenSSL::ASN1::Boolean, ext.value[1].class)
+    assert_equal(true, ext.value[1].value)
+    assert_equal(OpenSSL::ASN1::OctetString, ext.value[2].class)
+    extv = OpenSSL::ASN1.decode(ext.value[2].value)
+    assert_equal(OpenSSL::ASN1::Sequence, extv.class)
+    assert_equal(2, extv.value.size)
+    assert_equal(OpenSSL::ASN1::Boolean, extv.value[0].class)
+    assert_equal(true, extv.value[0].value)
+    assert_equal(OpenSSL::ASN1::Integer, extv.value[1].class)
+    assert_equal(1, extv.value[1].value)
+
+    ext = extensions.value[0].value[1]  # keyUsage
+    assert_equal(OpenSSL::ASN1::Sequence, ext.class)
+    assert_equal(3, ext.value.size)
+    assert_equal(OpenSSL::ASN1::ObjectId, ext.value[0].class)
+    assert_equal("2.5.29.15",  ext.value[0].oid)
+    assert_equal(OpenSSL::ASN1::Boolean, ext.value[1].class)
+    assert_equal(true, ext.value[1].value)
+    assert_equal(OpenSSL::ASN1::OctetString, ext.value[2].class)
+    extv = OpenSSL::ASN1.decode(ext.value[2].value)
+    assert_equal(OpenSSL::ASN1::BitString, extv.class)
+    str = "\000"; str[0] = 0b00000110
+    assert_equal(str, extv.value)
+
+    ext = extensions.value[0].value[2]  # subjetKeyIdentifier
+    assert_equal(OpenSSL::ASN1::Sequence, ext.class)
+    assert_equal(2, ext.value.size)
+    assert_equal(OpenSSL::ASN1::ObjectId, ext.value[0].class)
+    assert_equal("2.5.29.14",  ext.value[0].oid)
+    assert_equal(OpenSSL::ASN1::OctetString, ext.value[1].class)
+    extv = OpenSSL::ASN1.decode(ext.value[1].value)
+    assert_equal(OpenSSL::ASN1::OctetString, extv.class)
+    sha1 = OpenSSL::Digest::SHA1.new
+    sha1.update(pkey.value[1].value)
+    assert_equal(sha1.digest, extv.value)
+
+    assert_equal(OpenSSL::ASN1::Sequence, sig_alg.class)
+    assert_equal(2, sig_alg.value.size)
+    assert_equal(OpenSSL::ASN1::ObjectId, pkey.value[0].value[0].class)
+    assert_equal("1.2.840.113549.1.1.1", pkey.value[0].value[0].oid)
+    assert_equal(OpenSSL::ASN1::Null, pkey.value[0].value[1].class)
+
+    assert_equal(OpenSSL::ASN1::BitString, sig_val.class)
+    cululated_sig = key.sign(OpenSSL::Digest::SHA1.new, tbs_cert.to_der)
+    assert_equal(cululated_sig, sig_val.value)
+  end
+end if defined?(OpenSSL)
diff --git a/ruby_1_8_6/test/openssl/test_cipher.rb b/ruby_1_8_6/test/openssl/test_cipher.rb
new file mode 100644
index 0000000000..d671908165
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_cipher.rb
@@ -0,0 +1,95 @@
+begin
+  require "openssl"
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestCipher < Test::Unit::TestCase
+  def setup
+    @c1 = OpenSSL::Cipher::Cipher.new("DES-EDE3-CBC")
+    @c2 = OpenSSL::Cipher::DES.new(:EDE3, "CBC")
+    @key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+    @iv = "\0\0\0\0\0\0\0\0"
+    @hexkey = "0000000000000000000000000000000000000000000000"
+    @hexiv = "0000000000000000"
+    @data = "DATA"
+  end
+
+  def teardown
+    @c1 = @c2 = nil
+  end
+
+  def test_crypt
+    @c1.encrypt.pkcs5_keyivgen(@key, @iv)
+    @c2.encrypt.pkcs5_keyivgen(@key, @iv)
+    s1 = @c1.update(@data) + @c1.final
+    s2 = @c2.update(@data) + @c2.final
+    assert_equal(s1, s2, "encrypt")
+
+    @c1.decrypt.pkcs5_keyivgen(@key, @iv)
+    @c2.decrypt.pkcs5_keyivgen(@key, @iv)
+    assert_equal(@data, @c1.update(s1)+@c1.final, "decrypt")
+    assert_equal(@data, @c2.update(s2)+@c2.final, "decrypt")
+  end
+
+  def test_info
+    assert_equal("DES-EDE3-CBC", @c1.name, "name")
+    assert_equal("DES-EDE3-CBC", @c2.name, "name")
+    assert_kind_of(Fixnum, @c1.key_len, "key_len")
+    assert_kind_of(Fixnum, @c1.iv_len, "iv_len")
+  end
+
+  def test_dup
+    assert_equal(@c1.name, @c1.dup.name, "dup")
+    assert_equal(@c1.name, @c1.clone.name, "clone")
+    @c1.encrypt
+    @c1.key = @key
+    @c1.iv = @iv
+    tmpc = @c1.dup
+    s1 = @c1.update(@data) + @c1.final
+    s2 = tmpc.update(@data) + tmpc.final
+    assert_equal(s1, s2, "encrypt dup")
+  end
+
+  def test_reset
+    @c1.encrypt
+    @c1.key = @key
+    @c1.iv = @iv
+    s1 = @c1.update(@data) + @c1.final
+    @c1.reset
+    s2 = @c1.update(@data) + @c1.final
+    assert_equal(s1, s2, "encrypt reset")
+  end
+
+  def test_empty_data
+    @c1.encrypt
+    assert_raises(ArgumentError){ @c1.update("") }
+  end
+
+  if OpenSSL::OPENSSL_VERSION_NUMBER > 0x00907000
+    def test_ciphers
+      OpenSSL::Cipher.ciphers.each{|name|
+        assert(OpenSSL::Cipher::Cipher.new(name).is_a?(OpenSSL::Cipher::Cipher))
+      }
+    end
+
+    def test_AES
+      pt = File.read(__FILE__)
+      %w(ECB CBC CFB OFB).each{|mode|
+        c1 = OpenSSL::Cipher::AES256.new(mode)
+        c1.encrypt
+        c1.pkcs5_keyivgen("passwd")
+        ct = c1.update(pt) + c1.final
+
+        c2 = OpenSSL::Cipher::AES256.new(mode)
+        c2.decrypt
+        c2.pkcs5_keyivgen("passwd")
+        assert_equal(pt, c2.update(ct) + c2.final)
+      }
+    end
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_digest.rb b/ruby_1_8_6/test/openssl/test_digest.rb
new file mode 100644
index 0000000000..8941588b97
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_digest.rb
@@ -0,0 +1,88 @@
+begin
+  require "openssl"
+rescue LoadError
+end
+require "digest/md5"
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestDigest < Test::Unit::TestCase
+  def setup
+    @d1 = OpenSSL::Digest::Digest::new("MD5")
+    @d2 = OpenSSL::Digest::MD5.new
+    @md = Digest::MD5.new
+    @data = "DATA"
+  end
+
+  def teardown
+    @d1 = @d2 = @md = nil
+  end
+
+  def test_digest
+    assert_equal(@md.digest, @d1.digest)
+    assert_equal(@md.hexdigest, @d1.hexdigest)
+    @d1 << @data
+    @d2 << @data
+    @md << @data
+    assert_equal(@md.digest, @d1.digest)
+    assert_equal(@md.hexdigest, @d1.hexdigest)
+    assert_equal(@d1.digest, @d2.digest)
+    assert_equal(@d1.hexdigest, @d2.hexdigest)
+    assert_equal(@md.digest, OpenSSL::Digest::MD5.digest(@data))
+    assert_equal(@md.hexdigest, OpenSSL::Digest::MD5.hexdigest(@data))
+  end
+
+  def test_eql
+    assert(@d1 == @d2, "==")
+    d = @d1.clone
+    assert(d == @d1, "clone")
+  end
+
+  def test_info
+    assert_equal("MD5", @d1.name, "name")
+    assert_equal("MD5", @d2.name, "name")
+    assert_equal(16, @d1.size, "size")
+  end
+
+  def test_dup
+    @d1.update(@data)
+    assert_equal(@d1.name, @d1.dup.name, "dup")
+    assert_equal(@d1.name, @d1.clone.name, "clone")
+    assert_equal(@d1.digest, @d1.clone.digest, "clone .digest")
+  end
+
+  def test_reset
+    @d1.update(@data)
+    dig1 = @d1.digest
+    @d1.reset
+    @d1.update(@data)
+    dig2 = @d1.digest
+    assert_equal(dig1, dig2, "reset")
+  end
+
+  if OpenSSL::OPENSSL_VERSION_NUMBER > 0x00908000
+    def encode16(str)
+      str.unpack("H*").first
+    end
+
+    def test_098_features
+      sha224_a = "abd37534c7d9a2efb9465de931cd7055ffdb8879563ae98078d6d6d5"
+      sha256_a = "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+      sha384_a = "54a59b9f22b0b80880d8427e548b7c23abd873486e1f035dce9cd697e85175033caa88e6d57bc35efae0b5afd3145f31"
+      sha512_a = "1f40fc92da241694750979ee6cf582f2d5d7d28e18335de05abc54d0560e0f5302860c652bf08d560252aa5e74210546f369fbbbce8c12cfc7957b2652fe9a75"
+
+      assert_equal(sha224_a, OpenSSL::Digest::SHA224.hexdigest("a"))
+      assert_equal(sha256_a, OpenSSL::Digest::SHA256.hexdigest("a"))
+      assert_equal(sha384_a, OpenSSL::Digest::SHA384.hexdigest("a"))
+      assert_equal(sha512_a, OpenSSL::Digest::SHA512.hexdigest("a"))
+
+      assert_equal(sha224_a, encode16(OpenSSL::Digest::SHA224.digest("a")))
+      assert_equal(sha256_a, encode16(OpenSSL::Digest::SHA256.digest("a")))
+      assert_equal(sha384_a, encode16(OpenSSL::Digest::SHA384.digest("a")))
+      assert_equal(sha512_a, encode16(OpenSSL::Digest::SHA512.digest("a")))
+    end
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_hmac.rb b/ruby_1_8_6/test/openssl/test_hmac.rb
new file mode 100644
index 0000000000..2f8d6bba20
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_hmac.rb
@@ -0,0 +1,34 @@
+begin
+  require "openssl"
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestHMAC < Test::Unit::TestCase
+  def setup
+    @digest = OpenSSL::Digest::MD5.new
+    @key = "KEY"
+    @data = "DATA"
+    @h1 = OpenSSL::HMAC.new(@key, @digest)
+    @h2 = OpenSSL::HMAC.new(@key, @digest)
+  end
+
+  def teardown
+  end
+
+  def test_hmac
+    @h1.update(@data)
+    assert_equal(OpenSSL::HMAC.digest(@digest, @key, @data), @h1.digest, "digest")
+    assert_equal(OpenSSL::HMAC.hexdigest(@digest, @key, @data), @h1.hexdigest, "hexdigest")
+  end
+
+  def test_dup
+    @h1.update(@data)
+    h = @h1.dup
+    assert_equal(@h1.digest, h.digest, "dup digest")
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_ns_spki.rb b/ruby_1_8_6/test/openssl/test_ns_spki.rb
new file mode 100644
index 0000000000..3937132aa0
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_ns_spki.rb
@@ -0,0 +1,59 @@
+begin
+  require "openssl"
+  require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(OpenSSL)
+
+
+class OpenSSL::TestNSSPI < Test::Unit::TestCase
+  def setup
+    # This request data is adopt from the specification of
+    # "Netscape Extensions for User Key Generation".
+    # -- http://wp.netscape.com/eng/security/comm4-keygen.html
+    @b64  = "MIHFMHEwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAnX0TILJrOMUue+PtwBRE6XfV"
+    @b64 << "WtKQbsshxk5ZhcUwcwyvcnIq9b82QhJdoACdD34rqfCAIND46fXKQUnb0mvKzQID"
+    @b64 << "AQABFhFNb3ppbGxhSXNNeUZyaWVuZDANBgkqhkiG9w0BAQQFAANBAAKv2Eex2n/S"
+    @b64 << "r/7iJNroWlSzSMtTiQTEB+ADWHGj9u1xrUrOilq/o2cuQxIfZcNZkYAkWP4DubqW"
+    @b64 << "i0//rgBvmco="
+  end
+
+  def teardown
+  end
+
+  def test_build_data
+    key1 = OpenSSL::TestUtils::TEST_KEY_RSA1024
+    key2 = OpenSSL::TestUtils::TEST_KEY_RSA2048
+    spki = OpenSSL::Netscape::SPKI.new
+    spki.challenge = "RandomString"
+    spki.public_key = key1.public_key
+    spki.sign(key1, OpenSSL::Digest::SHA1.new)
+    assert(spki.verify(spki.public_key))
+    assert(spki.verify(key1.public_key))
+    assert(!spki.verify(key2.public_key))
+
+    der = spki.to_der
+    spki = OpenSSL::Netscape::SPKI.new(der)
+    assert_equal("RandomString", spki.challenge)
+    assert_equal(key1.public_key.to_der, spki.public_key.to_der)
+    assert(spki.verify(spki.public_key))
+  end
+
+  def test_decode_data
+    spki = OpenSSL::Netscape::SPKI.new(@b64)
+    assert_equal(@b64, spki.to_pem)
+    assert_equal(@b64.unpack("m").first, spki.to_der)
+    assert_equal("MozillaIsMyFriend", spki.challenge)
+    assert_equal(OpenSSL::PKey::RSA, spki.public_key.class)
+
+    spki = OpenSSL::Netscape::SPKI.new(@b64.unpack("m").first)
+    assert_equal(@b64, spki.to_pem)
+    assert_equal(@b64.unpack("m").first, spki.to_der)
+    assert_equal("MozillaIsMyFriend", spki.challenge)
+    assert_equal(OpenSSL::PKey::RSA, spki.public_key.class)
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_pair.rb b/ruby_1_8_6/test/openssl/test_pair.rb
new file mode 100644
index 0000000000..7273554362
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_pair.rb
@@ -0,0 +1,144 @@
+begin
+  require "openssl"
+rescue LoadError
+end
+require 'test/unit'
+
+if defined?(OpenSSL)
+
+require 'socket'
+dir = File.expand_path(__FILE__)
+2.times {dir = File.dirname(dir)}
+$:.replace([File.join(dir, "ruby")] | $:)
+require 'ut_eof'
+
+module SSLPair
+  def server
+    host = "127.0.0.1"
+    port = 0
+    ctx = OpenSSL::SSL::SSLContext.new()
+    ctx.ciphers = "ADH"
+    tcps = TCPServer.new(host, port)
+    ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
+    return ssls
+  end
+
+  def client(port)
+    host = "127.0.0.1"
+    ctx = OpenSSL::SSL::SSLContext.new()
+    ctx.ciphers = "ADH"
+    s = TCPSocket.new(host, port)
+    ssl = OpenSSL::SSL::SSLSocket.new(s, ctx)
+    ssl.connect
+    ssl.sync_close = true
+    ssl
+  end
+
+  def ssl_pair
+    ssls = server
+    th = Thread.new {
+      ns = ssls.accept
+      ssls.close
+      ns
+    }
+    port = ssls.to_io.addr[1]
+    c = client(port)
+    s = th.value
+    if block_given?
+      begin
+        yield c, s
+      ensure
+        c.close unless c.closed?
+        s.close unless s.closed?
+      end
+    else
+      return c, s
+    end
+  end
+end
+
+class OpenSSL::TestEOF1 < Test::Unit::TestCase
+  include TestEOF
+  include SSLPair
+
+  def open_file(content)
+    s1, s2 = ssl_pair
+    Thread.new { s2 << content; s2.close }
+    yield s1
+  end
+end
+
+class OpenSSL::TestEOF2 < Test::Unit::TestCase
+  include TestEOF
+  include SSLPair
+
+  def open_file(content)
+    s1, s2 = ssl_pair
+    Thread.new { s1 << content; s1.close }
+    yield s2
+  end
+end
+
+class OpenSSL::TestPair < Test::Unit::TestCase
+  include SSLPair
+
+  def test_getc
+    ssl_pair {|s1, s2|
+      s1 << "a"
+      assert_equal(?a, s2.getc)
+    }
+  end
+
+  def test_readpartial
+    ssl_pair {|s1, s2|
+      s2.write "a\nbcd"
+      assert_equal("a\n", s1.gets)
+      assert_equal("bcd", s1.readpartial(10))
+      s2.write "efg"
+      assert_equal("efg", s1.readpartial(10))
+      s2.close
+      assert_raise(EOFError) { s1.readpartial(10) }
+      assert_raise(EOFError) { s1.readpartial(10) }
+      assert_equal("", s1.readpartial(0))
+    }
+  end
+
+  def test_readall
+    ssl_pair {|s1, s2|
+      s2.close
+      assert_equal("", s1.read)
+    }
+  end
+
+  def test_readline
+    ssl_pair {|s1, s2|
+      s2.close
+      assert_raise(EOFError) { s1.readline }
+    }
+  end
+
+  def test_puts_meta
+    ssl_pair {|s1, s2|
+      begin
+        old = $/
+        $/ = '*'
+        s1.puts 'a'
+      ensure
+        $/ = old
+      end
+      s1.close
+      assert_equal("a\n", s2.read)
+    }
+  end
+
+  def test_puts_empty
+    ssl_pair {|s1, s2|
+      s1.puts
+      s1.close
+      assert_equal("\n", s2.read)
+    }
+  end
+
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_pkcs7.rb b/ruby_1_8_6/test/openssl/test_pkcs7.rb
new file mode 100644
index 0000000000..9b472c1795
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_pkcs7.rb
@@ -0,0 +1,154 @@
+begin
+  require "openssl"
+  require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestPKCS7 < Test::Unit::TestCase
+  def setup
+    @rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024
+    @rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048
+    ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
+    ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
+    ee2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE2")
+
+    now = Time.now
+    ca_exts = [
+      ["basicConstraints","CA:TRUE",true],
+      ["keyUsage","keyCertSign, cRLSign",true],
+      ["subjectKeyIdentifier","hash",false],
+      ["authorityKeyIdentifier","keyid:always",false],
+    ]
+    @ca_cert = issue_cert(ca, @rsa2048, 1, Time.now, Time.now+3600, ca_exts,
+                           nil, nil, OpenSSL::Digest::SHA1.new)
+    ee_exts = [
+      ["keyUsage","Non Repudiation, Digital Signature, Key Encipherment",true],
+      ["authorityKeyIdentifier","keyid:always",false],
+      ["extendedKeyUsage","clientAuth, emailProtection, codeSigning",false],
+    ]
+    @ee1_cert = issue_cert(ee1, @rsa1024, 2, Time.now, Time.now+1800, ee_exts,
+                           @ca_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    @ee2_cert = issue_cert(ee2, @rsa1024, 3, Time.now, Time.now+1800, ee_exts,
+                           @ca_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+  end
+
+  def issue_cert(*args)             
+    OpenSSL::TestUtils.issue_cert(*args)
+  end
+
+  def test_signed
+    store = OpenSSL::X509::Store.new
+    store.add_cert(@ca_cert)
+    ca_certs = [@ca_cert]
+
+    data = "aaaaa\r\nbbbbb\r\nccccc\r\n"
+    tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs)
+    p7 = OpenSSL::PKCS7::PKCS7.new(tmp.to_der)
+    certs = p7.certificates
+    signers = p7.signers
+    assert(p7.verify([], store))
+    assert_equal(data, p7.data)
+    assert_equal(2, certs.size)
+    assert_equal(@ee1_cert.subject.to_s, certs[0].subject.to_s)
+    assert_equal(@ca_cert.subject.to_s, certs[1].subject.to_s)
+    assert_equal(1, signers.size)
+    assert_equal(@ee1_cert.serial, signers[0].serial)
+    assert_equal(@ee1_cert.issuer.to_s, signers[0].issuer.to_s)
+
+    # Normaly OpenSSL tries to translate the supplied content into canonical
+    # MIME format (e.g. a newline character is converted into CR+LF).
+    # If the content is a binary, PKCS7::BINARY flag should be used.
+
+    data = "aaaaa\nbbbbb\nccccc\n"
+    flag = OpenSSL::PKCS7::BINARY
+    tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs, flag)
+    p7 = OpenSSL::PKCS7::PKCS7.new(tmp.to_der)
+    certs = p7.certificates
+    signers = p7.signers
+    assert(p7.verify([], store))
+    assert_equal(data, p7.data)
+    assert_equal(2, certs.size)
+    assert_equal(@ee1_cert.subject.to_s, certs[0].subject.to_s)
+    assert_equal(@ca_cert.subject.to_s, certs[1].subject.to_s)
+    assert_equal(1, signers.size)
+    assert_equal(@ee1_cert.serial, signers[0].serial)
+    assert_equal(@ee1_cert.issuer.to_s, signers[0].issuer.to_s)
+
+    # A signed-data which have multiple signatures can be created 
+    # through the following steps.
+    #   1. create two signed-data
+    #   2. copy signerInfo and certificate from one to another
+
+    tmp1 = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, [], flag)
+    tmp2 = OpenSSL::PKCS7.sign(@ee2_cert, @rsa1024, data, [], flag)
+    tmp1.add_signer(tmp2.signers[0])
+    tmp1.add_certificate(@ee2_cert)  
+
+    p7 = OpenSSL::PKCS7::PKCS7.new(tmp1.to_der)
+    certs = p7.certificates
+    signers = p7.signers
+    assert(p7.verify([], store))
+    assert_equal(data, p7.data)
+    assert_equal(2, certs.size)
+    assert_equal(2, signers.size)
+    assert_equal(@ee1_cert.serial, signers[0].serial)
+    assert_equal(@ee1_cert.issuer.to_s, signers[0].issuer.to_s)
+    assert_equal(@ee2_cert.serial, signers[1].serial)
+    assert_equal(@ee2_cert.issuer.to_s, signers[1].issuer.to_s)
+  end
+
+  def test_detached_sign
+    store = OpenSSL::X509::Store.new
+    store.add_cert(@ca_cert)
+    ca_certs = [@ca_cert]
+
+    data = "aaaaa\nbbbbb\nccccc\n"
+    flag = OpenSSL::PKCS7::BINARY|OpenSSL::PKCS7::DETACHED
+    tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs, flag)
+    p7 = OpenSSL::PKCS7::PKCS7.new(tmp.to_der)
+    a1 = OpenSSL::ASN1.decode(p7)
+
+    certs = p7.certificates
+    signers = p7.signers
+    assert(!p7.verify([], store))
+    assert(p7.verify([], store, data))
+    assert_equal(data, p7.data)
+    assert_equal(2, certs.size)
+    assert_equal(@ee1_cert.subject.to_s, certs[0].subject.to_s)
+    assert_equal(@ca_cert.subject.to_s, certs[1].subject.to_s)
+    assert_equal(1, signers.size)
+    assert_equal(@ee1_cert.serial, signers[0].serial)
+    assert_equal(@ee1_cert.issuer.to_s, signers[0].issuer.to_s)
+  end
+
+  def test_enveloped
+    if OpenSSL::OPENSSL_VERSION_NUMBER <= 0x0090704f
+      # PKCS7_encrypt() of OpenSSL-0.9.7d goes to SEGV.
+      # http://www.mail-archive.com/openssl-dev@openssl.org/msg17376.html
+      return
+    end
+
+    certs = [@ee1_cert, @ee2_cert]
+    cipher = OpenSSL::Cipher::AES.new("128-CBC")
+    data = "aaaaa\nbbbbb\nccccc\n"
+
+    tmp = OpenSSL::PKCS7.encrypt(certs, data, cipher, OpenSSL::PKCS7::BINARY)
+    p7 = OpenSSL::PKCS7::PKCS7.new(tmp.to_der)
+    recip = p7.recipients
+    assert_equal(:enveloped, p7.type)
+    assert_equal(2, recip.size)
+
+    assert_equal(@ca_cert.subject.to_s, recip[0].issuer.to_s)
+    assert_equal(2, recip[0].serial)
+    assert_equal(data, p7.decrypt(@rsa1024, @ee1_cert))
+
+    assert_equal(@ca_cert.subject.to_s, recip[1].issuer.to_s)
+    assert_equal(3, recip[1].serial)
+    assert_equal(data, p7.decrypt(@rsa1024, @ee2_cert))
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_pkey_rsa.rb b/ruby_1_8_6/test/openssl/test_pkey_rsa.rb
new file mode 100644
index 0000000000..401cb6c3e0
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_pkey_rsa.rb
@@ -0,0 +1,49 @@
+begin
+  require "openssl"
+  require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require 'test/unit'
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestPKeyRSA < Test::Unit::TestCase
+  def test_padding
+    key = OpenSSL::PKey::RSA.new(512, 3)
+
+    # Need right size for raw mode
+    plain0 = "x" * (512/8)
+    cipher = key.private_encrypt(plain0, OpenSSL::PKey::RSA::NO_PADDING)
+    plain1 = key.public_decrypt(cipher, OpenSSL::PKey::RSA::NO_PADDING)
+    assert_equal(plain0, plain1)
+
+    # Need smaller size for pkcs1 mode
+    plain0 = "x" * (512/8 - 11)
+    cipher1 = key.private_encrypt(plain0, OpenSSL::PKey::RSA::PKCS1_PADDING)
+    plain1 = key.public_decrypt(cipher1, OpenSSL::PKey::RSA::PKCS1_PADDING)
+    assert_equal(plain0, plain1)
+
+    cipherdef = key.private_encrypt(plain0) # PKCS1_PADDING is default
+    plain1 = key.public_decrypt(cipherdef)
+    assert_equal(plain0, plain1)
+    assert_equal(cipher1, cipherdef)
+
+    # Failure cases
+    assert_raise(ArgumentError){ key.private_encrypt() }
+    assert_raise(ArgumentError){ key.private_encrypt("hi", 1, nil) }
+    assert_raise(OpenSSL::PKey::RSAError){ key.private_encrypt(plain0, 666) }
+  end
+
+  def test_private
+    key = OpenSSL::PKey::RSA.new(512, 3)
+    assert(key.private?)
+    key2 = OpenSSL::PKey::RSA.new(key.to_der)
+    assert(key2.private?)
+    key3 = key.public_key
+    assert(!key3.private?)
+    key4 = OpenSSL::PKey::RSA.new(key3.to_der)
+    assert(!key4.private?)
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_ssl.rb b/ruby_1_8_6/test/openssl/test_ssl.rb
new file mode 100644
index 0000000000..ec1bf6b8c8
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_ssl.rb
@@ -0,0 +1,286 @@
+begin
+  require "openssl"
+  require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require "rbconfig"
+require "socket"
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestSSL < Test::Unit::TestCase
+  RUBY = ENV["RUBY"] || File.join(
+    ::Config::CONFIG["bindir"],
+    ::Config::CONFIG["ruby_install_name"] + ::Config::CONFIG["EXEEXT"]
+  )
+  SSL_SERVER = File.join(File.dirname(__FILE__), "ssl_server.rb")
+  PORT = 20443
+  ITERATIONS = ($0 == __FILE__) ? 100 : 10
+
+  def setup
+    @ca_key  = OpenSSL::TestUtils::TEST_KEY_RSA2048
+    @svr_key = OpenSSL::TestUtils::TEST_KEY_RSA1024
+    @cli_key = OpenSSL::TestUtils::TEST_KEY_DSA256
+    @ca  = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
+    @svr = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
+    @cli = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
+
+    now = Time.at(Time.now.to_i)
+    ca_exts = [
+      ["basicConstraints","CA:TRUE",true],
+      ["keyUsage","cRLSign,keyCertSign",true],
+    ]
+    ee_exts = [
+      ["keyUsage","keyEncipherment,digitalSignature",true],
+    ]
+    @ca_cert  = issue_cert(@ca, @ca_key, 1, now, now+3600, ca_exts,
+                           nil, nil, OpenSSL::Digest::SHA1.new)
+    @svr_cert = issue_cert(@svr, @svr_key, 2, now, now+1800, ee_exts,
+                           @ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
+    @cli_cert = issue_cert(@cli, @cli_key, 3, now, now+1800, ee_exts,
+                           @ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
+    @server = nil
+  end
+
+  def teardown
+  end
+
+  def issue_cert(*arg)
+    OpenSSL::TestUtils.issue_cert(*arg)
+  end
+
+  def issue_crl(*arg)
+    OpenSSL::TestUtils.issue_crl(*arg)
+  end
+
+  def start_server(port0, verify_mode, start_immediately, &block)
+    server = nil
+    begin
+      cmd = [RUBY]
+      cmd << "-d" if $DEBUG
+      cmd << SSL_SERVER << port0.to_s << verify_mode.to_s
+      cmd << (start_immediately ? "yes" : "no")
+      server = IO.popen(cmd.join(" "), "w+")
+      server.write(@ca_cert.to_pem)
+      server.write(@svr_cert.to_pem)
+      server.write(@svr_key.to_pem)
+      pid = Integer(server.gets)
+      if port = server.gets
+        if $DEBUG
+          $stderr.printf("%s started: pid=%d port=%d\n", SSL_SERVER, pid, port)
+        end
+        block.call(server, port.to_i)
+      end
+    ensure
+      if server
+        Process.kill(:KILL, pid)
+        server.close
+      end
+    end
+  end
+
+  def starttls(ssl)
+    ssl.puts("STARTTLS")
+
+    sleep 1   # When this line is eliminated, process on Cygwin blocks
+              # forever at ssl.connect. But I don't know why it does.
+
+    ssl.connect
+  end
+
+  def test_connect_and_close
+    start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|s, p|
+      sock = TCPSocket.new("127.0.0.1", p)
+      ssl = OpenSSL::SSL::SSLSocket.new(sock)
+      assert(ssl.connect)
+      ssl.close
+      assert(!sock.closed?)
+      sock.close
+
+      sock = TCPSocket.new("127.0.0.1", p)
+      ssl = OpenSSL::SSL::SSLSocket.new(sock)
+      ssl.sync_close = true  # !!
+      assert(ssl.connect)
+      ssl.close
+      assert(sock.closed?)
+    }
+  end
+
+  def test_read_and_write
+    start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|s, p|
+      sock = TCPSocket.new("127.0.0.1", p)
+      ssl = OpenSSL::SSL::SSLSocket.new(sock)
+      ssl.sync_close = true
+      ssl.connect
+
+      # syswrite and sysread
+      ITERATIONS.times{|i|
+        str = "x" * 100 + "\n"
+        ssl.syswrite(str)
+        assert_equal(str, ssl.sysread(str.size))
+
+        str = "x" * i * 100 + "\n"
+        buf = ""
+        ssl.syswrite(str)
+        assert_equal(buf.object_id, ssl.sysread(str.size, buf).object_id)
+        assert_equal(str, buf)
+      }
+
+      # puts and gets
+      ITERATIONS.times{
+        str = "x" * 100 + "\n"
+        ssl.puts(str)
+        assert_equal(str, ssl.gets)
+      }
+
+      # read and write
+      ITERATIONS.times{|i|
+        str = "x" * 100 + "\n"
+        ssl.write(str)
+        assert_equal(str, ssl.read(str.size))
+
+        str = "x" * i * 100 + "\n"
+        buf = ""
+        ssl.write(str)
+        assert_equal(buf.object_id, ssl.read(str.size, buf).object_id)
+        assert_equal(str, buf)
+      }
+
+      ssl.close
+    }
+  end
+
+  def test_client_auth
+    vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+    start_server(PORT, vflag, true){|s, p|
+      assert_raises(OpenSSL::SSL::SSLError){
+        sock = TCPSocket.new("127.0.0.1", p)
+        ssl = OpenSSL::SSL::SSLSocket.new(sock)
+        ssl.connect
+      }
+
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.key = @cli_key
+      ctx.cert = @cli_cert
+      sock = TCPSocket.new("127.0.0.1", p)
+      ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+      ssl.sync_close = true
+      ssl.connect
+      ssl.puts("foo")
+      assert_equal("foo\n", ssl.gets)
+      ssl.close
+
+      called = nil
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.client_cert_cb = Proc.new{|ssl|
+        called = true
+        [@cli_cert, @cli_key]
+      }
+      sock = TCPSocket.new("127.0.0.1", p)
+      ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+      ssl.sync_close = true
+      ssl.connect
+      assert(called)
+      ssl.puts("foo")
+      assert_equal("foo\n", ssl.gets)
+      ssl.close
+    }
+  end
+
+  def test_starttls
+    start_server(PORT, OpenSSL::SSL::VERIFY_NONE, false){|s, p|
+      sock = TCPSocket.new("127.0.0.1", p)
+      ssl = OpenSSL::SSL::SSLSocket.new(sock)
+      ssl.sync_close = true
+      str = "x" * 1000 + "\n"
+
+      ITERATIONS.times{
+        ssl.puts(str)
+        assert_equal(str, ssl.gets)
+      }
+
+      starttls(ssl)
+
+      ITERATIONS.times{
+        ssl.puts(str)
+        assert_equal(str, ssl.gets)
+      }
+
+      ssl.close
+    }
+  end
+
+  def test_parallel
+    GC.start
+    start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|s, p|
+      ssls = []
+      10.times{
+        sock = TCPSocket.new("127.0.0.1", p)
+        ssl = OpenSSL::SSL::SSLSocket.new(sock)
+        ssl.connect
+        ssl.sync_close = true
+        ssls << ssl
+      }
+      str = "x" * 1000 + "\n"
+      ITERATIONS.times{
+        ssls.each{|ssl|
+          ssl.puts(str)
+          assert_equal(str, ssl.gets)
+        }
+      }
+      ssls.each{|ssl| ssl.close }
+    }
+  end
+
+  def test_post_connection_check
+    sslerr = OpenSSL::SSL::SSLError
+
+    start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|s, p|
+      sock = TCPSocket.new("127.0.0.1", p)
+      ssl = OpenSSL::SSL::SSLSocket.new(sock)
+      ssl.connect
+      assert_raises(sslerr){ssl.post_connection_check("localhost.localdomain")}
+      assert_raises(sslerr){ssl.post_connection_check("127.0.0.1")}
+      assert(ssl.post_connection_check("localhost"))
+      assert_raises(sslerr){ssl.post_connection_check("foo.example.com")}
+    }
+
+    now = Time.now
+    exts = [
+      ["keyUsage","keyEncipherment,digitalSignature",true],
+      ["subjectAltName","DNS:localhost.localdomain",false],
+      ["subjectAltName","IP:127.0.0.1",false],
+    ]
+    @svr_cert = issue_cert(@svr, @svr_key, 4, now, now+1800, exts,
+                           @ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
+    start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|s, p|
+      sock = TCPSocket.new("127.0.0.1", p)
+      ssl = OpenSSL::SSL::SSLSocket.new(sock)
+      ssl.connect
+      assert(ssl.post_connection_check("localhost.localdomain"))
+      assert(ssl.post_connection_check("127.0.0.1"))
+      assert_raises(sslerr){ssl.post_connection_check("localhost")}
+      assert_raises(sslerr){ssl.post_connection_check("foo.example.com")}
+    }
+
+    now = Time.now
+    exts = [
+      ["keyUsage","keyEncipherment,digitalSignature",true],
+      ["subjectAltName","DNS:*.localdomain",false],
+    ]
+    @svr_cert = issue_cert(@svr, @svr_key, 5, now, now+1800, exts,
+                           @ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
+    start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|s, p|
+      sock = TCPSocket.new("127.0.0.1", p)
+      ssl = OpenSSL::SSL::SSLSocket.new(sock)
+      ssl.connect
+      assert(ssl.post_connection_check("localhost.localdomain"))
+      assert_raises(sslerr){ssl.post_connection_check("127.0.0.1")}
+      assert_raises(sslerr){ssl.post_connection_check("localhost")}
+      assert_raises(sslerr){ssl.post_connection_check("foo.example.com")}
+    }
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_x509cert.rb b/ruby_1_8_6/test/openssl/test_x509cert.rb
new file mode 100644
index 0000000000..a5a75ff1b6
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_x509cert.rb
@@ -0,0 +1,175 @@
+begin
+  require "openssl"
+  require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestX509Certificate < Test::Unit::TestCase
+  def setup
+    @rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024
+    @rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048
+    @dsa256  = OpenSSL::TestUtils::TEST_KEY_DSA256
+    @dsa512  = OpenSSL::TestUtils::TEST_KEY_DSA512
+    @ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
+    @ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
+    @ee2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE2")
+  end
+
+  def teardown
+  end
+
+  def issue_cert(*args)
+    OpenSSL::TestUtils.issue_cert(*args)
+  end
+
+  def test_serial
+    [1, 2**32, 2**100].each{|s|
+      cert = issue_cert(@ca, @rsa2048, s, Time.now, Time.now+3600, [],
+                        nil, nil, OpenSSL::Digest::SHA1.new) 
+      assert_equal(s, cert.serial)
+      cert = OpenSSL::X509::Certificate.new(cert.to_der)
+      assert_equal(s, cert.serial)
+    }
+  end
+
+  def test_public_key
+    exts = [
+      ["basicConstraints","CA:TRUE",true],
+      ["subjectKeyIdentifier","hash",false],
+      ["authorityKeyIdentifier","keyid:always",false],
+    ]
+
+    sha1 = OpenSSL::Digest::SHA1.new
+    dss1 = OpenSSL::Digest::DSS1.new
+    [
+      [@rsa1024, sha1], [@rsa2048, sha1], [@dsa256, dss1], [@dsa512, dss1],
+    ].each{|pk, digest|
+      cert = issue_cert(@ca, pk, 1, Time.now, Time.now+3600, exts,
+                        nil, nil, digest)
+      assert_equal(cert.extensions[1].value,
+                   OpenSSL::TestUtils.get_subject_key_id(cert))
+      cert = OpenSSL::X509::Certificate.new(cert.to_der)
+      assert_equal(cert.extensions[1].value,
+                   OpenSSL::TestUtils.get_subject_key_id(cert))
+    }
+  end
+
+  def test_validity
+    now = Time.now until now && now.usec != 0
+    cert = issue_cert(@ca, @rsa2048, 1, now, now+3600, [],
+                      nil, nil, OpenSSL::Digest::SHA1.new) 
+    assert_not_equal(now, cert.not_before)
+    assert_not_equal(now+3600, cert.not_after)
+
+    now = Time.at(now.to_i)
+    cert = issue_cert(@ca, @rsa2048, 1, now, now+3600, [],
+                      nil, nil, OpenSSL::Digest::SHA1.new) 
+    assert_equal(now.getutc, cert.not_before)
+    assert_equal((now+3600).getutc, cert.not_after)
+
+    now = Time.at(0)
+    cert = issue_cert(@ca, @rsa2048, 1, now, now, [],
+                      nil, nil, OpenSSL::Digest::SHA1.new) 
+    assert_equal(now.getutc, cert.not_before)
+    assert_equal(now.getutc, cert.not_after)
+
+    now = Time.at(0x7fffffff)
+    cert = issue_cert(@ca, @rsa2048, 1, now, now, [],
+                      nil, nil, OpenSSL::Digest::SHA1.new) 
+    assert_equal(now.getutc, cert.not_before)
+    assert_equal(now.getutc, cert.not_after)
+  end
+
+  def test_extension
+    ca_exts = [
+      ["basicConstraints","CA:TRUE",true],
+      ["keyUsage","keyCertSign, cRLSign",true],
+      ["subjectKeyIdentifier","hash",false],
+      ["authorityKeyIdentifier","keyid:always",false],
+    ]
+    ca_cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, ca_exts,
+                         nil, nil, OpenSSL::Digest::SHA1.new) 
+    ca_cert.extensions.each_with_index{|ext, i|
+      assert_equal(ca_exts[i].first, ext.oid)
+      assert_equal(ca_exts[i].last, ext.critical?)
+    }
+
+    ee1_exts = [
+      ["keyUsage","Non Repudiation, Digital Signature, Key Encipherment",true],
+      ["subjectKeyIdentifier","hash",false],
+      ["authorityKeyIdentifier","keyid:always",false],
+      ["extendedKeyUsage","clientAuth, emailProtection, codeSigning",false],
+      ["subjectAltName","email:ee1@ruby-lang.org",false],
+    ]
+    ee1_cert = issue_cert(@ee1, @rsa1024, 2, Time.now, Time.now+1800, ee1_exts,
+                          ca_cert, @rsa2048, OpenSSL::Digest::SHA1.new) 
+    assert_equal(ca_cert.subject.to_der, ee1_cert.issuer.to_der)
+    ee1_cert.extensions.each_with_index{|ext, i|
+      assert_equal(ee1_exts[i].first, ext.oid)
+      assert_equal(ee1_exts[i].last, ext.critical?)
+    }
+
+    ee2_exts = [
+      ["keyUsage","Non Repudiation, Digital Signature, Key Encipherment",true],
+      ["subjectKeyIdentifier","hash",false],
+      ["authorityKeyIdentifier","issuer:always",false],
+      ["extendedKeyUsage","clientAuth, emailProtection, codeSigning",false],
+      ["subjectAltName","email:ee2@ruby-lang.org",false],
+    ]
+    ee2_cert = issue_cert(@ee2, @rsa1024, 3, Time.now, Time.now+1800, ee2_exts,
+                          ca_cert, @rsa2048, OpenSSL::Digest::MD5.new) 
+    assert_equal(ca_cert.subject.to_der, ee2_cert.issuer.to_der)
+    ee2_cert.extensions.each_with_index{|ext, i|
+      assert_equal(ee2_exts[i].first, ext.oid)
+      assert_equal(ee2_exts[i].last, ext.critical?)
+    }
+
+  end
+
+  def test_sign_and_verify
+    cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
+                      nil, nil, OpenSSL::Digest::SHA1.new) 
+    assert_equal(false, cert.verify(@rsa1024))
+    assert_equal(true,  cert.verify(@rsa2048))
+    assert_equal(false, cert.verify(@dsa256))
+    assert_equal(false, cert.verify(@dsa512))
+    cert.serial = 2
+    assert_equal(false, cert.verify(@rsa2048))
+
+    cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
+                      nil, nil, OpenSSL::Digest::MD5.new) 
+    assert_equal(false, cert.verify(@rsa1024))
+    assert_equal(true,  cert.verify(@rsa2048))
+    assert_equal(false, cert.verify(@dsa256))
+    assert_equal(false, cert.verify(@dsa512))
+    cert.subject = @ee1
+    assert_equal(false, cert.verify(@rsa2048))
+
+    cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
+                      nil, nil, OpenSSL::Digest::DSS1.new) 
+    assert_equal(false, cert.verify(@rsa1024))
+    assert_equal(false, cert.verify(@rsa2048))
+    assert_equal(false, cert.verify(@dsa256))
+    assert_equal(true,  cert.verify(@dsa512))
+    cert.not_after = Time.now 
+    assert_equal(false, cert.verify(@dsa512))
+
+    assert_raises(OpenSSL::X509::CertificateError){
+      cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
+                        nil, nil, OpenSSL::Digest::DSS1.new) 
+    }
+    assert_raises(OpenSSL::X509::CertificateError){
+      cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
+                        nil, nil, OpenSSL::Digest::MD5.new) 
+    }
+    assert_raises(OpenSSL::X509::CertificateError){
+      cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
+                        nil, nil, OpenSSL::Digest::SHA1.new) 
+    }
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_x509crl.rb b/ruby_1_8_6/test/openssl/test_x509crl.rb
new file mode 100644
index 0000000000..444a00a586
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_x509crl.rb
@@ -0,0 +1,218 @@
+begin
+  require "openssl"
+  require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestX509CRL < Test::Unit::TestCase
+  def setup
+    @rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024
+    @rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048
+    @dsa256  = OpenSSL::TestUtils::TEST_KEY_DSA256
+    @dsa512  = OpenSSL::TestUtils::TEST_KEY_DSA512
+    @ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
+    @ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
+    @ee2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE2")
+  end
+
+  def teardown
+  end
+
+  def issue_crl(*args)
+    OpenSSL::TestUtils.issue_crl(*args)
+  end
+
+  def issue_cert(*args)
+    OpenSSL::TestUtils.issue_cert(*args)
+  end
+
+  def test_basic
+    now = Time.at(Time.now.to_i)
+
+    cert = issue_cert(@ca, @rsa2048, 1, now, now+3600, [],
+                      nil, nil, OpenSSL::Digest::SHA1.new)
+    crl = issue_crl([], 1, now, now+1600, [],
+                    cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    assert_equal(1, crl.version)
+    assert_equal(cert.issuer.to_der, crl.issuer.to_der)
+    assert_equal(now, crl.last_update)
+    assert_equal(now+1600, crl.next_update)
+
+    crl = OpenSSL::X509::CRL.new(crl.to_der)
+    assert_equal(1, crl.version)
+    assert_equal(cert.issuer.to_der, crl.issuer.to_der)
+    assert_equal(now, crl.last_update)
+    assert_equal(now+1600, crl.next_update)
+  end
+
+  def test_revoked
+
+    # CRLReason ::= ENUMERATED {
+    #      unspecified             (0),
+    #      keyCompromise           (1),
+    #      cACompromise            (2),
+    #      affiliationChanged      (3),
+    #      superseded              (4),
+    #      cessationOfOperation    (5),
+    #      certificateHold         (6),
+    #      removeFromCRL           (8),
+    #      privilegeWithdrawn      (9),
+    #      aACompromise           (10) }
+
+    now = Time.at(Time.now.to_i)
+    revoke_info = [
+      [1, Time.at(0),          1],
+      [2, Time.at(0x7fffffff), 2],
+      [3, now,                 3],
+      [4, now,                 4],
+      [5, now,                 5],
+    ]
+    cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
+                      nil, nil, OpenSSL::Digest::SHA1.new)
+    crl = issue_crl(revoke_info, 1, Time.now, Time.now+1600, [],
+                    cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    revoked = crl.revoked
+    assert_equal(5, revoked.size)
+    assert_equal(1, revoked[0].serial)
+    assert_equal(2, revoked[1].serial)
+    assert_equal(3, revoked[2].serial)
+    assert_equal(4, revoked[3].serial)
+    assert_equal(5, revoked[4].serial)
+
+    assert_equal(Time.at(0), revoked[0].time)
+    assert_equal(Time.at(0x7fffffff), revoked[1].time)
+    assert_equal(now, revoked[2].time)
+    assert_equal(now, revoked[3].time)
+    assert_equal(now, revoked[4].time)
+
+    assert_equal("CRLReason", revoked[0].extensions[0].oid)
+    assert_equal("CRLReason", revoked[1].extensions[0].oid)
+    assert_equal("CRLReason", revoked[2].extensions[0].oid)
+    assert_equal("CRLReason", revoked[3].extensions[0].oid)
+    assert_equal("CRLReason", revoked[4].extensions[0].oid)
+
+    assert_equal("Key Compromise", revoked[0].extensions[0].value)
+    assert_equal("CA Compromise", revoked[1].extensions[0].value)
+    assert_equal("Affiliation Changed", revoked[2].extensions[0].value)
+    assert_equal("Superseded", revoked[3].extensions[0].value)
+    assert_equal("Cessation Of Operation", revoked[4].extensions[0].value)
+
+    assert_equal(false, revoked[0].extensions[0].critical?)
+    assert_equal(false, revoked[1].extensions[0].critical?)
+    assert_equal(false, revoked[2].extensions[0].critical?)
+    assert_equal(false, revoked[3].extensions[0].critical?)
+    assert_equal(false, revoked[4].extensions[0].critical?)
+
+    crl = OpenSSL::X509::CRL.new(crl.to_der)
+    assert_equal("Key Compromise", revoked[0].extensions[0].value)
+    assert_equal("CA Compromise", revoked[1].extensions[0].value)
+    assert_equal("Affiliation Changed", revoked[2].extensions[0].value)
+    assert_equal("Superseded", revoked[3].extensions[0].value)
+    assert_equal("Cessation Of Operation", revoked[4].extensions[0].value)
+
+    revoke_info = (1..1000).collect{|i| [i, now, 0] }
+    crl = issue_crl(revoke_info, 1, Time.now, Time.now+1600, [],
+                    cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    revoked = crl.revoked
+    assert_equal(1000, revoked.size)
+    assert_equal(1, revoked[0].serial)
+    assert_equal(1000, revoked[999].serial)
+  end
+
+  def test_extension
+    cert_exts = [
+      ["basicConstraints", "CA:TRUE", true],
+      ["subjectKeyIdentifier", "hash", false], 
+      ["authorityKeyIdentifier", "keyid:always", false], 
+      ["subjectAltName", "email:xyzzy@ruby-lang.org", false],
+      ["keyUsage", "cRLSign, keyCertSign", true],
+    ]
+    crl_exts = [
+      ["authorityKeyIdentifier", "keyid:always", false], 
+      ["issuerAltName", "issuer:copy", false],
+    ]
+
+    cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, cert_exts,
+                      nil, nil, OpenSSL::Digest::SHA1.new)
+    crl = issue_crl([], 1, Time.now, Time.now+1600, crl_exts,
+                    cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    exts = crl.extensions
+    assert_equal(3, exts.size)
+    assert_equal("1", exts[0].value)
+    assert_equal("crlNumber", exts[0].oid)
+    assert_equal(false, exts[0].critical?)
+
+    assert_equal("authorityKeyIdentifier", exts[1].oid)
+    keyid = OpenSSL::TestUtils.get_subject_key_id(cert)
+    assert_match(/^keyid:#{keyid}/, exts[1].value)
+    assert_equal(false, exts[1].critical?)
+
+    assert_equal("issuerAltName", exts[2].oid)
+    assert_equal("email:xyzzy@ruby-lang.org", exts[2].value)
+    assert_equal(false, exts[2].critical?)
+
+    crl = OpenSSL::X509::CRL.new(crl.to_der)
+    exts = crl.extensions
+    assert_equal(3, exts.size)
+    assert_equal("1", exts[0].value)
+    assert_equal("crlNumber", exts[0].oid)
+    assert_equal(false, exts[0].critical?)
+
+    assert_equal("authorityKeyIdentifier", exts[1].oid)
+    keyid = OpenSSL::TestUtils.get_subject_key_id(cert)
+    assert_match(/^keyid:#{keyid}/, exts[1].value)
+    assert_equal(false, exts[1].critical?)
+
+    assert_equal("issuerAltName", exts[2].oid)
+    assert_equal("email:xyzzy@ruby-lang.org", exts[2].value)
+    assert_equal(false, exts[2].critical?)
+  end
+
+  def test_crlnumber
+    cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
+                      nil, nil, OpenSSL::Digest::SHA1.new)
+    crl = issue_crl([], 1, Time.now, Time.now+1600, [],
+                    cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    assert_match(1.to_s, crl.extensions[0].value)
+    assert_match(/X509v3 CRL Number:\s+#{1}/m, crl.to_text)
+
+    crl = issue_crl([], 2**32, Time.now, Time.now+1600, [],
+                    cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    assert_match((2**32).to_s, crl.extensions[0].value)
+    assert_match(/X509v3 CRL Number:\s+#{2**32}/m, crl.to_text)
+
+    crl = issue_crl([], 2**100, Time.now, Time.now+1600, [],
+                    cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    assert_match(/X509v3 CRL Number:\s+#{2**100}/m, crl.to_text)
+    assert_match((2**100).to_s, crl.extensions[0].value)
+  end
+
+  def test_sign_and_verify
+    cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
+                      nil, nil, OpenSSL::Digest::SHA1.new)
+    crl = issue_crl([], 1, Time.now, Time.now+1600, [],
+                    cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    assert_equal(false, crl.verify(@rsa1024))
+    assert_equal(true,  crl.verify(@rsa2048))
+    assert_equal(false, crl.verify(@dsa256))
+    assert_equal(false, crl.verify(@dsa512))
+    crl.version = 0
+    assert_equal(false, crl.verify(@rsa2048))
+
+    cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
+                      nil, nil, OpenSSL::Digest::DSS1.new)
+    crl = issue_crl([], 1, Time.now, Time.now+1600, [],
+                    cert, @dsa512, OpenSSL::Digest::DSS1.new)
+    assert_equal(false, crl.verify(@rsa1024))
+    assert_equal(false, crl.verify(@rsa2048))
+    assert_equal(false, crl.verify(@dsa256))
+    assert_equal(true,  crl.verify(@dsa512))
+    crl.version = 0
+    assert_equal(false, crl.verify(@dsa512))
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_x509ext.rb b/ruby_1_8_6/test/openssl/test_x509ext.rb
new file mode 100644
index 0000000000..d43bbd6bd3
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_x509ext.rb
@@ -0,0 +1,74 @@
+begin
+  require "openssl"
+  require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestX509Extension < Test::Unit::TestCase
+  def setup
+    @basic_constraints_value = OpenSSL::ASN1::Sequence([
+      OpenSSL::ASN1::Boolean(true),   # CA
+      OpenSSL::ASN1::Integer(2)       # pathlen
+    ])
+    @basic_constraints = OpenSSL::ASN1::Sequence([
+      OpenSSL::ASN1::ObjectId("basicConstraints"),
+      OpenSSL::ASN1::Boolean(true),
+      OpenSSL::ASN1::OctetString(@basic_constraints_value.to_der),
+    ])
+  end
+
+  def teardown
+  end
+
+  def test_new
+    ext = OpenSSL::X509::Extension.new(@basic_constraints.to_der)
+    assert_equal("basicConstraints", ext.oid)
+    assert_equal(true, ext.critical?)
+    assert_equal("CA:TRUE, pathlen:2", ext.value)
+
+    ext = OpenSSL::X509::Extension.new("2.5.29.19",
+                                       @basic_constraints_value.to_der, true)
+    assert_equal(@basic_constraints.to_der, ext.to_der)
+  end
+
+  def test_create_by_factory
+    ef = OpenSSL::X509::ExtensionFactory.new
+
+    bc = ef.create_extension("basicConstraints", "critical, CA:TRUE, pathlen:2")
+    assert_equal(@basic_constraints.to_der, bc.to_der)
+
+    bc = ef.create_extension("basicConstraints", "CA:TRUE, pathlen:2", true)
+    assert_equal(@basic_constraints.to_der, bc.to_der)
+
+    begin
+      ef.config = OpenSSL::Config.parse(<<-_end_of_cnf_)
+      [crlDistPts]
+      URI.1 = http://www.example.com/crl
+      URI.2 = ldap://ldap.example.com/cn=ca?certificateRevocationList;binary
+      _end_of_cnf_
+    rescue NotImplementedError
+      return
+    end
+
+    cdp = ef.create_extension("crlDistributionPoints", "@crlDistPts")
+    assert_equal(false, cdp.critical?)
+    assert_equal("crlDistributionPoints", cdp.oid)
+    assert_match(%{URI:http://www\.example\.com/crl}, cdp.value)
+    assert_match(
+      %r{URI:ldap://ldap\.example\.com/cn=ca\?certificateRevocationList;binary},
+      cdp.value)
+
+    cdp = ef.create_extension("crlDistributionPoints", "critical, @crlDistPts")
+    assert_equal(true, cdp.critical?)
+    assert_equal("crlDistributionPoints", cdp.oid)
+    assert_match(%{URI:http://www.example.com/crl}, cdp.value)
+    assert_match(
+      %r{URI:ldap://ldap.example.com/cn=ca\?certificateRevocationList;binary},
+      cdp.value)
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_x509name.rb b/ruby_1_8_6/test/openssl/test_x509name.rb
new file mode 100644
index 0000000000..fb5a1ae4ff
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_x509name.rb
@@ -0,0 +1,266 @@
+begin
+  require "openssl"
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestX509Name < Test::Unit::TestCase
+  OpenSSL::ASN1::ObjectId.register(
+    "1.2.840.113549.1.9.1", "emailAddress", "emailAddress")
+  OpenSSL::ASN1::ObjectId.register(
+    "2.5.4.5", "serialNumber", "serialNumber")
+
+  def setup
+    @obj_type_tmpl = Hash.new(OpenSSL::ASN1::PRINTABLESTRING)
+    @obj_type_tmpl.update(OpenSSL::X509::Name::OBJECT_TYPE_TEMPLATE)
+  end
+
+  def teardown
+  end
+
+  def test_s_new
+    dn = [ ["C", "JP"], ["O", "example"], ["CN", "www.example.jp"] ]
+    name = OpenSSL::X509::Name.new(dn)
+    ary = name.to_a
+    assert_equal("/C=JP/O=example/CN=www.example.jp", name.to_s)
+    assert_equal("C", ary[0][0])
+    assert_equal("O", ary[1][0])
+    assert_equal("CN", ary[2][0])
+    assert_equal("JP", ary[0][1])
+    assert_equal("example", ary[1][1])
+    assert_equal("www.example.jp", ary[2][1])
+    assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[0][2])
+    assert_equal(OpenSSL::ASN1::UTF8STRING, ary[1][2])
+    assert_equal(OpenSSL::ASN1::UTF8STRING, ary[2][2])
+
+    dn = [
+      ["countryName", "JP"],
+      ["organizationName", "example"],
+      ["commonName", "www.example.jp"]
+    ]
+    name = OpenSSL::X509::Name.new(dn)
+    ary = name.to_a
+    assert_equal("/C=JP/O=example/CN=www.example.jp", name.to_s)
+    assert_equal("C", ary[0][0])
+    assert_equal("O", ary[1][0])
+    assert_equal("CN", ary[2][0])
+    assert_equal("JP", ary[0][1])
+    assert_equal("example", ary[1][1])
+    assert_equal("www.example.jp", ary[2][1])
+    assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[0][2])
+    assert_equal(OpenSSL::ASN1::UTF8STRING, ary[1][2])
+    assert_equal(OpenSSL::ASN1::UTF8STRING, ary[2][2])
+
+    name = OpenSSL::X509::Name.new(dn, @obj_type_tmpl)
+    ary = name.to_a
+    assert_equal("/C=JP/O=example/CN=www.example.jp", name.to_s)
+    assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[0][2])
+    assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[1][2])
+    assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[2][2])
+
+    dn = [
+      ["countryName", "JP", OpenSSL::ASN1::PRINTABLESTRING],
+      ["organizationName", "example", OpenSSL::ASN1::PRINTABLESTRING],
+      ["commonName", "www.example.jp", OpenSSL::ASN1::PRINTABLESTRING]
+    ]
+    name = OpenSSL::X509::Name.new(dn)
+    ary = name.to_a
+    assert_equal("/C=JP/O=example/CN=www.example.jp", name.to_s)
+    assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[0][2])
+    assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[1][2])
+    assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[2][2])
+
+    dn = [
+      ["DC", "org"],
+      ["DC", "ruby-lang"],
+      ["CN", "GOTOU Yuuzou"],
+      ["emailAddress", "gotoyuzo@ruby-lang.org"],
+      ["serialNumber", "123"],
+    ]
+    name = OpenSSL::X509::Name.new(dn)
+    ary = name.to_a
+    assert_equal("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou/emailAddress=gotoyuzo@ruby-lang.org/serialNumber=123", name.to_s)
+    assert_equal("DC", ary[0][0])
+    assert_equal("DC", ary[1][0])
+    assert_equal("CN", ary[2][0])
+    assert_equal("emailAddress", ary[3][0])
+    assert_equal("serialNumber", ary[4][0])
+    assert_equal("org", ary[0][1])
+    assert_equal("ruby-lang", ary[1][1])
+    assert_equal("GOTOU Yuuzou", ary[2][1])
+    assert_equal("gotoyuzo@ruby-lang.org", ary[3][1])
+    assert_equal("123", ary[4][1])
+    assert_equal(OpenSSL::ASN1::IA5STRING, ary[0][2])
+    assert_equal(OpenSSL::ASN1::IA5STRING, ary[1][2])
+    assert_equal(OpenSSL::ASN1::UTF8STRING, ary[2][2])
+    assert_equal(OpenSSL::ASN1::IA5STRING, ary[3][2])
+    assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[4][2])
+
+    name_from_der = OpenSSL::X509::Name.new(name.to_der)
+    assert_equal(name_from_der.to_s, name.to_s)
+    assert_equal(name_from_der.to_a, name.to_a)
+    assert_equal(name_from_der.to_der, name.to_der)
+  end
+
+  def test_s_parse
+    dn = "/DC=org/DC=ruby-lang/CN=www.ruby-lang.org"
+    name = OpenSSL::X509::Name.parse(dn)
+    assert_equal(dn, name.to_s)
+    ary = name.to_a
+    assert_equal("DC", ary[0][0])
+    assert_equal("DC", ary[1][0])
+    assert_equal("CN", ary[2][0])
+    assert_equal("org", ary[0][1])
+    assert_equal("ruby-lang", ary[1][1])
+    assert_equal("www.ruby-lang.org", ary[2][1])
+    assert_equal(OpenSSL::ASN1::IA5STRING, ary[0][2])
+    assert_equal(OpenSSL::ASN1::IA5STRING, ary[1][2])
+    assert_equal(OpenSSL::ASN1::UTF8STRING, ary[2][2])
+
+    dn2 = "DC=org, DC=ruby-lang, CN=www.ruby-lang.org"
+    name = OpenSSL::X509::Name.parse(dn)
+    ary = name.to_a
+    assert_equal(dn, name.to_s)
+    assert_equal("org", ary[0][1])
+    assert_equal("ruby-lang", ary[1][1])
+    assert_equal("www.ruby-lang.org", ary[2][1])
+
+    name = OpenSSL::X509::Name.parse(dn, @obj_type_tmpl)
+    ary = name.to_a
+    assert_equal(OpenSSL::ASN1::IA5STRING, ary[0][2])
+    assert_equal(OpenSSL::ASN1::IA5STRING, ary[1][2])
+    assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[2][2])
+  end
+
+  def test_s_parse_rfc2253
+    scanner = OpenSSL::X509::Name::RFC2253DN.method(:scan)
+
+    assert_equal([["C", "JP"]], scanner.call("C=JP"))
+    assert_equal([
+        ["DC", "org"],
+        ["DC", "ruby-lang"],
+        ["CN", "GOTOU Yuuzou"],
+        ["emailAddress", "gotoyuzo@ruby-lang.org"],
+      ],
+      scanner.call(
+        "emailAddress=gotoyuzo@ruby-lang.org,CN=GOTOU Yuuzou,"+
+        "DC=ruby-lang,DC=org")
+    )
+
+    u8 = OpenSSL::ASN1::UTF8STRING
+    assert_equal([
+        ["DC", "org"],
+        ["DC", "ruby-lang"],
+        ["O", ",=+<>#;"],
+        ["O", ",=+<>#;"],
+        ["OU", ""],
+        ["OU", ""],
+        ["L", "aaa=\"bbb, ccc\""],
+        ["L", "aaa=\"bbb, ccc\""],
+        ["CN", "\345\276\214\350\227\244\350\243\225\350\224\265"],
+        ["CN", "\345\276\214\350\227\244\350\243\225\350\224\265"],
+        ["CN", "\345\276\214\350\227\244\350\243\225\350\224\265"],
+        ["CN", "\345\276\214\350\227\244\350\243\225\350\224\265", u8],
+        ["2.5.4.3", "GOTOU, Yuuzou"],
+        ["2.5.4.3", "GOTOU, Yuuzou"],
+        ["2.5.4.3", "GOTOU, Yuuzou"],
+        ["2.5.4.3", "GOTOU, Yuuzou"],
+        ["CN", "GOTOU \"gotoyuzo\" Yuuzou"],
+        ["CN", "GOTOU \"gotoyuzo\" Yuuzou"],
+        ["1.2.840.113549.1.9.1", "gotoyuzo@ruby-lang.org"],
+        ["emailAddress", "gotoyuzo@ruby-lang.org"],
+      ],
+      scanner.call(
+        "emailAddress=gotoyuzo@ruby-lang.org," +
+        "1.2.840.113549.1.9.1=gotoyuzo@ruby-lang.org," +
+        'CN=GOTOU \"gotoyuzo\" Yuuzou,' +
+        'CN="GOTOU \"gotoyuzo\" Yuuzou",' +
+        '2.5.4.3=GOTOU\,\20Yuuzou,' +
+        '2.5.4.3=GOTOU\, Yuuzou,' +
+        '2.5.4.3="GOTOU, Yuuzou",' +
+        '2.5.4.3="GOTOU\, Yuuzou",' +
+        "CN=#0C0CE5BE8CE897A4E8A395E894B5," +
+        'CN=\E5\BE\8C\E8\97\A4\E8\A3\95\E8\94\B5,' +
+        "CN=\"\xE5\xBE\x8C\xE8\x97\xA4\xE8\xA3\x95\xE8\x94\xB5\"," +
+        "CN=\xE5\xBE\x8C\xE8\x97\xA4\xE8\xA3\x95\xE8\x94\xB5," +
+        'L=aaa\=\"bbb\, ccc\",' +
+        'L="aaa=\"bbb, ccc\"",' +
+        'OU=,' +
+        'OU="",' +
+        'O=\,\=\+\<\>\#\;,' +
+        'O=",=+<>#;",' +
+        "DC=ruby-lang," +
+        "DC=org")
+    )
+
+    [
+      "DC=org+DC=jp",
+      "DC=org,DC=ruby-lang+DC=rubyist,DC=www"
+    ].each{|dn|
+      ex = scanner.call(dn) rescue $!
+      dn_r = Regexp.escape(dn)
+      assert_match(/^multi-valued RDN is not supported: #{dn_r}/, ex.message)
+    }
+
+    [
+      ["DC=org,DC=exapmle,CN", "CN"],
+      ["DC=org,DC=example,", ""],
+      ["DC=org,DC=exapmle,CN=www.example.org;", "CN=www.example.org;"],
+      ["DC=org,DC=exapmle,CN=#www.example.org", "CN=#www.example.org"],
+      ["DC=org,DC=exapmle,CN=#777777.example.org", "CN=#777777.example.org"],
+      ["DC=org,DC=exapmle,CN=\"www.example\".org", "CN=\"www.example\".org"],
+      ["DC=org,DC=exapmle,CN=www.\"example.org\"", "CN=www.\"example.org\""],
+      ["DC=org,DC=exapmle,CN=www.\"example\".org", "CN=www.\"example\".org"],
+    ].each{|dn, msg|
+      ex = scanner.call(dn) rescue $!
+      assert_match(/^malformed RDN: .*=>#{Regexp.escape(msg)}/, ex.message)
+    }
+
+    dn = "CN=www.ruby-lang.org,DC=ruby-lang,DC=org"
+    name = OpenSSL::X509::Name.parse_rfc2253(dn)
+    assert_equal(dn, name.to_s(OpenSSL::X509::Name::RFC2253))
+    ary = name.to_a
+    assert_equal("DC", ary[0][0])
+    assert_equal("DC", ary[1][0])
+    assert_equal("CN", ary[2][0])
+    assert_equal("org", ary[0][1])
+    assert_equal("ruby-lang", ary[1][1])
+    assert_equal("www.ruby-lang.org", ary[2][1])
+    assert_equal(OpenSSL::ASN1::IA5STRING, ary[0][2])
+    assert_equal(OpenSSL::ASN1::IA5STRING, ary[1][2])
+    assert_equal(OpenSSL::ASN1::UTF8STRING, ary[2][2])
+  end
+
+  def test_add_entry
+    dn = [
+      ["DC", "org"],
+      ["DC", "ruby-lang"],
+      ["CN", "GOTOU Yuuzou"],
+      ["emailAddress", "gotoyuzo@ruby-lang.org"],
+      ["serialNumber", "123"],
+    ]
+    name = OpenSSL::X509::Name.new
+    dn.each{|attr| name.add_entry(*attr) }
+    ary = name.to_a
+    assert_equal("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou/emailAddress=gotoyuzo@ruby-lang.org/serialNumber=123", name.to_s)
+    assert_equal("DC", ary[0][0])
+    assert_equal("DC", ary[1][0])
+    assert_equal("CN", ary[2][0])
+    assert_equal("emailAddress", ary[3][0])
+    assert_equal("serialNumber", ary[4][0])
+    assert_equal("org", ary[0][1])
+    assert_equal("ruby-lang", ary[1][1])
+    assert_equal("GOTOU Yuuzou", ary[2][1])
+    assert_equal("gotoyuzo@ruby-lang.org", ary[3][1])
+    assert_equal("123", ary[4][1])
+    assert_equal(OpenSSL::ASN1::IA5STRING, ary[0][2])
+    assert_equal(OpenSSL::ASN1::IA5STRING, ary[1][2])
+    assert_equal(OpenSSL::ASN1::UTF8STRING, ary[2][2])
+    assert_equal(OpenSSL::ASN1::IA5STRING, ary[3][2])
+    assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[4][2])
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_x509req.rb b/ruby_1_8_6/test/openssl/test_x509req.rb
new file mode 100644
index 0000000000..a37ed5c5ef
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_x509req.rb
@@ -0,0 +1,140 @@
+begin
+  require "openssl"
+  require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestX509Request < Test::Unit::TestCase
+  def setup
+    @rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024
+    @rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048
+    @dsa256  = OpenSSL::TestUtils::TEST_KEY_DSA256
+    @dsa512  = OpenSSL::TestUtils::TEST_KEY_DSA512
+    @dn = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou")
+  end
+
+  def issue_csr(ver, dn, key, digest)
+    req = OpenSSL::X509::Request.new
+    req.version = ver
+    req.subject = dn
+    req.public_key = key.public_key
+    req.sign(key, digest)
+    req
+  end
+
+  def test_public_key
+    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::SHA1.new)
+    assert_equal(@rsa1024.public_key.to_der, req.public_key.to_der)
+    req = OpenSSL::X509::Request.new(req.to_der)
+    assert_equal(@rsa1024.public_key.to_der, req.public_key.to_der)
+
+    req = issue_csr(0, @dn, @dsa512, OpenSSL::Digest::DSS1.new)
+    assert_equal(@dsa512.public_key.to_der, req.public_key.to_der)
+    req = OpenSSL::X509::Request.new(req.to_der)
+    assert_equal(@dsa512.public_key.to_der, req.public_key.to_der)
+  end
+
+  def test_version
+    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::SHA1.new)
+    assert_equal(0, req.version)
+    req = OpenSSL::X509::Request.new(req.to_der)
+    assert_equal(0, req.version)
+
+    req = issue_csr(1, @dn, @rsa1024, OpenSSL::Digest::SHA1.new)
+    assert_equal(1, req.version)
+    req = OpenSSL::X509::Request.new(req.to_der)
+    assert_equal(1, req.version)
+  end
+
+  def test_subject
+    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::SHA1.new)
+    assert_equal(@dn.to_der, req.subject.to_der)
+    req = OpenSSL::X509::Request.new(req.to_der)
+    assert_equal(@dn.to_der, req.subject.to_der)
+  end
+
+  def create_ext_req(exts)
+    ef = OpenSSL::X509::ExtensionFactory.new
+    exts = exts.collect{|e| ef.create_extension(*e) }
+    return OpenSSL::ASN1::Set([OpenSSL::ASN1::Sequence(exts)])
+  end
+
+  def get_ext_req(ext_req_value)
+    set = OpenSSL::ASN1.decode(ext_req_value)
+    seq = set.value[0]
+    seq.value.collect{|asn1ext|
+      OpenSSL::X509::Extension.new(asn1ext).to_a
+    }
+  end
+
+  def test_attr
+    exts = [
+      ["keyUsage", "Digital Signature, Key Encipherment", true],
+      ["subjectAltName", "email:gotoyuzo@ruby-lang.org", false],
+    ]
+    attrval = create_ext_req(exts)
+    attrs = [
+      OpenSSL::X509::Attribute.new("extReq", attrval),
+      OpenSSL::X509::Attribute.new("msExtReq", attrval),
+    ]
+
+    req0 = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::SHA1.new)
+    attrs.each{|attr| req0.add_attribute(attr) }
+    req1 = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::SHA1.new)
+    req1.attributes = attrs
+    assert_equal(req0.to_der, req1.to_der)
+
+    attrs = req0.attributes
+    assert_equal(2, attrs.size)
+    assert_equal("extReq", attrs[0].oid)
+    assert_equal("msExtReq", attrs[1].oid)
+    assert_equal(exts, get_ext_req(attrs[0].value))
+    assert_equal(exts, get_ext_req(attrs[1].value))
+
+    req = OpenSSL::X509::Request.new(req0.to_der)
+    attrs = req.attributes
+    assert_equal(2, attrs.size)
+    assert_equal("extReq", attrs[0].oid)
+    assert_equal("msExtReq", attrs[1].oid)
+    assert_equal(exts, get_ext_req(attrs[0].value))
+    assert_equal(exts, get_ext_req(attrs[1].value))
+  end
+
+  def test_sign_and_verify
+    req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::SHA1.new)
+    assert_equal(true,  req.verify(@rsa1024))
+    assert_equal(false, req.verify(@rsa2048))
+    assert_equal(false, req.verify(@dsa256))
+    assert_equal(false, req.verify(@dsa512))
+    req.version = 1
+    assert_equal(false, req.verify(@rsa1024))
+
+    req = issue_csr(0, @dn, @rsa2048, OpenSSL::Digest::MD5.new)
+    assert_equal(false, req.verify(@rsa1024))
+    assert_equal(true,  req.verify(@rsa2048))
+    assert_equal(false, req.verify(@dsa256))
+    assert_equal(false, req.verify(@dsa512))
+    req.subject = OpenSSL::X509::Name.parse("/C=JP/CN=FooBar")
+    assert_equal(false, req.verify(@rsa2048))
+
+    req = issue_csr(0, @dn, @dsa512, OpenSSL::Digest::DSS1.new)
+    assert_equal(false, req.verify(@rsa1024))
+    assert_equal(false, req.verify(@rsa2048))
+    assert_equal(false, req.verify(@dsa256))
+    assert_equal(true,  req.verify(@dsa512))
+    req.public_key = @rsa1024.public_key
+    assert_equal(false, req.verify(@dsa512))
+
+    assert_raise(OpenSSL::X509::RequestError){
+      issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::DSS1.new) }
+    assert_raise(OpenSSL::X509::RequestError){
+      issue_csr(0, @dn, @dsa512, OpenSSL::Digest::SHA1.new) }
+    assert_raise(OpenSSL::X509::RequestError){
+      issue_csr(0, @dn, @dsa512, OpenSSL::Digest::MD5.new) }
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/test_x509store.rb b/ruby_1_8_6/test/openssl/test_x509store.rb
new file mode 100644
index 0000000000..b0fe597262
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/test_x509store.rb
@@ -0,0 +1,218 @@
+begin
+  require "openssl"
+  require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestX509Store < Test::Unit::TestCase
+  def setup
+    @rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024
+    @rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048
+    @dsa256  = OpenSSL::TestUtils::TEST_KEY_DSA256
+    @dsa512  = OpenSSL::TestUtils::TEST_KEY_DSA512
+    @ca1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA1")
+    @ca2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA2")
+    @ee1 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE1")
+    @ee2 = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=EE2")
+  end
+
+  def teardown
+  end
+
+  def issue_cert(*args)
+    OpenSSL::TestUtils.issue_cert(*args)
+  end
+
+  def issue_crl(*args)
+    OpenSSL::TestUtils.issue_crl(*args)
+  end
+
+  def test_verify
+    now = Time.at(Time.now.to_i)
+    ca_exts = [
+      ["basicConstraints","CA:TRUE",true],
+      ["keyUsage","cRLSign,keyCertSign",true],
+    ]
+    ee_exts = [
+      ["keyUsage","keyEncipherment,digitalSignature",true],
+    ]
+    ca1_cert = issue_cert(@ca1, @rsa2048, 1, now, now+3600, ca_exts,
+                          nil, nil, OpenSSL::Digest::SHA1.new)
+    ca2_cert = issue_cert(@ca2, @rsa1024, 2, now, now+1800, ca_exts,
+                          ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    ee1_cert = issue_cert(@ee1, @dsa256, 10, now, now+1800, ee_exts,
+                          ca2_cert, @rsa1024, OpenSSL::Digest::SHA1.new)
+    ee2_cert = issue_cert(@ee2, @dsa512, 20, now, now+1800, ee_exts,
+                          ca2_cert, @rsa1024, OpenSSL::Digest::SHA1.new)
+    ee3_cert = issue_cert(@ee2, @dsa512, 30, now-100, now-1, ee_exts,
+                          ca2_cert, @rsa1024, OpenSSL::Digest::SHA1.new)
+    ee4_cert = issue_cert(@ee2, @dsa512, 40, now+1000, now+2000, ee_exts,
+                          ca2_cert, @rsa1024, OpenSSL::Digest::SHA1.new)
+
+    revoke_info = []
+    crl1   = issue_crl(revoke_info, 1, now, now+1800, [],
+                       ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    revoke_info = [ [2, now, 1], ]
+    crl1_2 = issue_crl(revoke_info, 2, now, now+1800, [],
+                       ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    revoke_info = [ [20, now, 1], ]
+    crl2   = issue_crl(revoke_info, 1, now, now+1800, [],
+                       ca2_cert, @rsa1024, OpenSSL::Digest::SHA1.new)
+    revoke_info = []
+    crl2_2 = issue_crl(revoke_info, 2, now-100, now-1, [],
+                       ca2_cert, @rsa1024, OpenSSL::Digest::SHA1.new)
+
+    assert(true, ca1_cert.verify(ca1_cert.public_key))   # self signed
+    assert(true, ca2_cert.verify(ca1_cert.public_key))   # issued by ca1
+    assert(true, ee1_cert.verify(ca2_cert.public_key))   # issued by ca2
+    assert(true, ee2_cert.verify(ca2_cert.public_key))   # issued by ca2
+    assert(true, ee3_cert.verify(ca2_cert.public_key))   # issued by ca2
+    assert(true, crl1.verify(ca1_cert.public_key))       # issued by ca1
+    assert(true, crl1_2.verify(ca1_cert.public_key))     # issued by ca1
+    assert(true, crl2.verify(ca2_cert.public_key))       # issued by ca2
+    assert(true, crl2_2.verify(ca2_cert.public_key))     # issued by ca2
+
+    store = OpenSSL::X509::Store.new
+    assert_equal(false, store.verify(ca1_cert))
+    assert_not_equal(OpenSSL::X509::V_OK, store.error)
+
+    assert_equal(false, store.verify(ca2_cert))
+    assert_not_equal(OpenSSL::X509::V_OK, store.error)
+
+    store.add_cert(ca1_cert)
+    assert_equal(true, store.verify(ca2_cert))
+    assert_equal(OpenSSL::X509::V_OK, store.error)
+    assert_equal("ok", store.error_string)
+    chain = store.chain
+    assert_equal(2, chain.size)
+    assert_equal(@ca2.to_der, chain[0].subject.to_der)
+    assert_equal(@ca1.to_der, chain[1].subject.to_der)
+
+    store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
+    assert_equal(false, store.verify(ca2_cert))
+    assert_not_equal(OpenSSL::X509::V_OK, store.error)
+
+    store.purpose = OpenSSL::X509::PURPOSE_CRL_SIGN
+    assert_equal(true, store.verify(ca2_cert))
+    assert_equal(OpenSSL::X509::V_OK, store.error)
+
+    store.add_cert(ca2_cert)
+    store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
+    assert_equal(true, store.verify(ee1_cert))
+    assert_equal(true, store.verify(ee2_cert))
+    assert_equal(OpenSSL::X509::V_OK, store.error)
+    assert_equal("ok", store.error_string)
+    chain = store.chain
+    assert_equal(3, chain.size)
+    assert_equal(@ee2.to_der, chain[0].subject.to_der)
+    assert_equal(@ca2.to_der, chain[1].subject.to_der)
+    assert_equal(@ca1.to_der, chain[2].subject.to_der)
+    assert_equal(false, store.verify(ee3_cert))
+    assert_equal(OpenSSL::X509::V_ERR_CERT_HAS_EXPIRED, store.error)
+    assert_match(/expire/i, store.error_string)
+    assert_equal(false, store.verify(ee4_cert))
+    assert_equal(OpenSSL::X509::V_ERR_CERT_NOT_YET_VALID, store.error)
+    assert_match(/not yet valid/i, store.error_string)
+
+    store = OpenSSL::X509::Store.new
+    store.add_cert(ca1_cert)
+    store.add_cert(ca2_cert)
+    store.time = now + 1500
+    assert_equal(true, store.verify(ca1_cert))
+    assert_equal(true, store.verify(ca2_cert))
+    assert_equal(true, store.verify(ee4_cert))
+    store.time = now + 1900
+    assert_equal(true, store.verify(ca1_cert))
+    assert_equal(false, store.verify(ca2_cert))
+    assert_equal(OpenSSL::X509::V_ERR_CERT_HAS_EXPIRED, store.error)
+    assert_equal(false, store.verify(ee4_cert))
+    assert_equal(OpenSSL::X509::V_ERR_CERT_HAS_EXPIRED, store.error)
+    store.time = now + 4000
+    assert_equal(false, store.verify(ee1_cert))
+    assert_equal(OpenSSL::X509::V_ERR_CERT_HAS_EXPIRED, store.error)
+    assert_equal(false, store.verify(ee4_cert))
+    assert_equal(OpenSSL::X509::V_ERR_CERT_HAS_EXPIRED, store.error)
+
+    # the underlying X509 struct caches the result of the last
+    # verification for signature and not-before. so the following code
+    # rebuilds new objects to avoid site effect.
+    store.time = Time.now - 4000
+    assert_equal(false, store.verify(OpenSSL::X509::Certificate.new(ca2_cert)))
+    assert_equal(OpenSSL::X509::V_ERR_CERT_NOT_YET_VALID, store.error)
+    assert_equal(false, store.verify(OpenSSL::X509::Certificate.new(ee1_cert)))
+    assert_equal(OpenSSL::X509::V_ERR_CERT_NOT_YET_VALID, store.error)
+
+    return unless defined?(OpenSSL::X509::V_FLAG_CRL_CHECK)
+
+    store = OpenSSL::X509::Store.new
+    store.purpose = OpenSSL::X509::PURPOSE_ANY
+    store.flags = OpenSSL::X509::V_FLAG_CRL_CHECK
+    store.add_cert(ca1_cert)
+    store.add_crl(crl1)   # revoke no cert
+    store.add_crl(crl2)   # revoke ee2_cert
+    assert_equal(true,  store.verify(ca1_cert))
+    assert_equal(true,  store.verify(ca2_cert))
+    assert_equal(true,  store.verify(ee1_cert, [ca2_cert]))
+    assert_equal(false, store.verify(ee2_cert, [ca2_cert]))
+
+    store = OpenSSL::X509::Store.new
+    store.purpose = OpenSSL::X509::PURPOSE_ANY
+    store.flags = OpenSSL::X509::V_FLAG_CRL_CHECK
+    store.add_cert(ca1_cert)
+    store.add_crl(crl1_2) # revoke ca2_cert
+    store.add_crl(crl2)   # revoke ee2_cert
+    assert_equal(true,  store.verify(ca1_cert))
+    assert_equal(false, store.verify(ca2_cert))
+    assert_equal(true,  store.verify(ee1_cert, [ca2_cert]),
+      "This test is expected to be success with OpenSSL 0.9.7c or later.")
+    assert_equal(false, store.verify(ee2_cert, [ca2_cert]))
+
+    store.flags =
+      OpenSSL::X509::V_FLAG_CRL_CHECK|OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
+    assert_equal(true,  store.verify(ca1_cert))
+    assert_equal(false, store.verify(ca2_cert))
+    assert_equal(false, store.verify(ee1_cert, [ca2_cert]))
+    assert_equal(false, store.verify(ee2_cert, [ca2_cert]))
+
+    store = OpenSSL::X509::Store.new
+    store.purpose = OpenSSL::X509::PURPOSE_ANY
+    store.flags =
+      OpenSSL::X509::V_FLAG_CRL_CHECK|OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
+    store.add_cert(ca1_cert)
+    store.add_cert(ca2_cert)
+    store.add_crl(crl1)
+    store.add_crl(crl2_2) # issued by ca2 but expired.
+    assert_equal(true, store.verify(ca1_cert))
+    assert_equal(true, store.verify(ca2_cert))
+    assert_equal(false, store.verify(ee1_cert))
+    assert_equal(OpenSSL::X509::V_ERR_CRL_HAS_EXPIRED, store.error)
+    assert_equal(false, store.verify(ee2_cert))
+  end
+
+  def test_set_errors
+    now = Time.now
+    ca1_cert = issue_cert(@ca1, @rsa2048, 1, now, now+3600, [],
+                          nil, nil, OpenSSL::Digest::SHA1.new)
+    store = OpenSSL::X509::Store.new
+    store.add_cert(ca1_cert)
+    assert_raises(OpenSSL::X509::StoreError){
+      store.add_cert(ca1_cert)  # add same certificate twice
+    }
+
+    revoke_info = []
+    crl1 = issue_crl(revoke_info, 1, now, now+1800, [],
+                     ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    revoke_info = [ [2, now, 1], ]
+    crl2 = issue_crl(revoke_info, 2, now+1800, now+3600, [],
+                     ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
+    store.add_crl(crl1)
+    assert_raises(OpenSSL::X509::StoreError){
+      store.add_crl(crl2) # add CRL issued by same CA twice.
+    }
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/openssl/utils.rb b/ruby_1_8_6/test/openssl/utils.rb
new file mode 100644
index 0000000000..c923705b86
--- /dev/null
+++ b/ruby_1_8_6/test/openssl/utils.rb
@@ -0,0 +1,135 @@
+require "openssl"
+require "test/unit"
+
+module OpenSSL::TestUtils
+  TEST_KEY_RSA1024 = OpenSSL::PKey::RSA.new <<-_end_of_pem_
+-----BEGIN RSA PRIVATE KEY-----
+MIICXgIBAAKBgQDLwsSw1ECnPtT+PkOgHhcGA71nwC2/nL85VBGnRqDxOqjVh7Cx
+aKPERYHsk4BPCkE3brtThPWc9kjHEQQ7uf9Y1rbCz0layNqHyywQEVLFmp1cpIt/
+Q3geLv8ZD9pihowKJDyMDiN6ArYUmZczvW4976MU3+l54E6lF/JfFEU5hwIDAQAB
+AoGBAKSl/MQarye1yOysqX6P8fDFQt68VvtXkNmlSiKOGuzyho0M+UVSFcs6k1L0
+maDE25AMZUiGzuWHyaU55d7RXDgeskDMakD1v6ZejYtxJkSXbETOTLDwUWTn618T
+gnb17tU1jktUtU67xK/08i/XodlgnQhs6VoHTuCh3Hu77O6RAkEA7+gxqBuZR572
+74/akiW/SuXm0SXPEviyO1MuSRwtI87B02D0qgV8D1UHRm4AhMnJ8MCs1809kMQE
+JiQUCrp9mQJBANlt2ngBO14us6NnhuAseFDTBzCHXwUUu1YKHpMMmxpnGqaldGgX
+sOZB3lgJsT9VlGf3YGYdkLTNVbogQKlKpB8CQQDiSwkb4vyQfDe8/NpU5Not0fII
+8jsDUCb+opWUTMmfbxWRR3FBNu8wnym/m19N4fFj8LqYzHX4KY0oVPu6qvJxAkEA
+wa5snNekFcqONLIE4G5cosrIrb74sqL8GbGb+KuTAprzj5z1K8Bm0UW9lTjVDjDi
+qRYgZfZSL+x1P/54+xTFSwJAY1FxA/N3QPCXCjPh5YqFxAMQs2VVYTfg+t0MEcJD
+dPMQD5JX6g5HKnHFg2mZtoXQrWmJSn7p8GJK8yNTopEErA==
+-----END RSA PRIVATE KEY-----
+  _end_of_pem_
+
+  TEST_KEY_RSA2048 = OpenSSL::PKey::RSA.new <<-_end_of_pem_
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAuV9ht9J7k4NBs38jOXvvTKY9gW8nLICSno5EETR1cuF7i4pN
+s9I1QJGAFAX0BEO4KbzXmuOvfCpD3CU+Slp1enenfzq/t/e/1IRW0wkJUJUFQign
+4CtrkJL+P07yx18UjyPlBXb81ApEmAB5mrJVSrWmqbjs07JbuS4QQGGXLc+Su96D
+kYKmSNVjBiLxVVSpyZfAY3hD37d60uG+X8xdW5v68JkRFIhdGlb6JL8fllf/A/bl
+NwdJOhVr9mESHhwGjwfSeTDPfd8ZLE027E5lyAVX9KZYcU00mOX+fdxOSnGqS/8J
+DRh0EPHDL15RcJjV2J6vZjPb0rOYGDoMcH+94wIDAQABAoIBAAzsamqfYQAqwXTb
+I0CJtGg6msUgU7HVkOM+9d3hM2L791oGHV6xBAdpXW2H8LgvZHJ8eOeSghR8+dgq
+PIqAffo4x1Oma+FOg3A0fb0evyiACyrOk+EcBdbBeLo/LcvahBtqnDfiUMQTpy6V
+seSoFCwuN91TSCeGIsDpRjbG1vxZgtx+uI+oH5+ytqJOmfCksRDCkMglGkzyfcl0
+Xc5CUhIJ0my53xijEUQl19rtWdMnNnnkdbG8PT3LZlOta5Do86BElzUYka0C6dUc
+VsBDQ0Nup0P6rEQgy7tephHoRlUGTYamsajGJaAo1F3IQVIrRSuagi7+YpSpCqsW
+wORqorkCgYEA7RdX6MDVrbw7LePnhyuaqTiMK+055/R1TqhB1JvvxJ1CXk2rDL6G
+0TLHQ7oGofd5LYiemg4ZVtWdJe43BPZlVgT6lvL/iGo8JnrncB9Da6L7nrq/+Rvj
+XGjf1qODCK+LmreZWEsaLPURIoR/Ewwxb9J2zd0CaMjeTwafJo1CZvcCgYEAyCgb
+aqoWvUecX8VvARfuA593Lsi50t4MEArnOXXcd1RnXoZWhbx5rgO8/ATKfXr0BK/n
+h2GF9PfKzHFm/4V6e82OL7gu/kLy2u9bXN74vOvWFL5NOrOKPM7Kg+9I131kNYOw
+Ivnr/VtHE5s0dY7JChYWE1F3vArrOw3T00a4CXUCgYEA0SqY+dS2LvIzW4cHCe9k
+IQqsT0yYm5TFsUEr4sA3xcPfe4cV8sZb9k/QEGYb1+SWWZ+AHPV3UW5fl8kTbSNb
+v4ng8i8rVVQ0ANbJO9e5CUrepein2MPL0AkOATR8M7t7dGGpvYV0cFk8ZrFx0oId
+U0PgYDotF/iueBWlbsOM430CgYEAqYI95dFyPI5/AiSkY5queeb8+mQH62sdcCCr
+vd/w/CZA/K5sbAo4SoTj8dLk4evU6HtIa0DOP63y071eaxvRpTNqLUOgmLh+D6gS
+Cc7TfLuFrD+WDBatBd5jZ+SoHccVrLR/4L8jeodo5FPW05A+9gnKXEXsTxY4LOUC
+9bS4e1kCgYAqVXZh63JsMwoaxCYmQ66eJojKa47VNrOeIZDZvd2BPVf30glBOT41
+gBoDG3WMPZoQj9pb7uMcrnvs4APj2FIhMU8U15LcPAj59cD6S6rWnAxO8NFK7HQG
+4Jxg3JNNf8ErQoCHb1B3oVdXJkmbJkARoDpBKmTCgKtP8ADYLmVPQw==
+-----END RSA PRIVATE KEY-----
+  _end_of_pem_
+
+  TEST_KEY_DSA256 = OpenSSL::PKey::DSA.new <<-_end_of_pem_
+-----BEGIN DSA PRIVATE KEY-----
+MIH3AgEAAkEAhk2libbY2a8y2Pt21+YPYGZeW6wzaW2yfj5oiClXro9XMR7XWLkE
+9B7XxLNFCS2gmCCdMsMW1HulaHtLFQmB2wIVAM43JZrcgpu6ajZ01VkLc93gu/Ed
+AkAOhujZrrKV5CzBKutKLb0GVyVWmdC7InoNSMZEeGU72rT96IjM59YzoqmD0pGM
+3I1o4cGqg1D1DfM1rQlnN1eSAkBq6xXfEDwJ1mLNxF6q8Zm/ugFYWR5xcX/3wFiT
+b4+EjHP/DbNh9Vm5wcfnDBJ1zKvrMEf2xqngYdrV/3CiGJeKAhRvL57QvJZcQGvn
+ISNX5cMzFHRW3Q==
+-----END DSA PRIVATE KEY-----
+  _end_of_pem_
+
+  TEST_KEY_DSA512 = OpenSSL::PKey::DSA.new <<-_end_of_pem_
+-----BEGIN DSA PRIVATE KEY-----
+MIH4AgEAAkEA5lB4GvEwjrsMlGDqGsxrbqeFRh6o9OWt6FgTYiEEHaOYhkIxv0Ok
+RZPDNwOG997mDjBnvDJ1i56OmS3MbTnovwIVAJgub/aDrSDB4DZGH7UyarcaGy6D
+AkB9HdFw/3td8K4l1FZHv7TCZeJ3ZLb7dF3TWoGUP003RCqoji3/lHdKoVdTQNuR
+S/m6DlCwhjRjiQ/lBRgCLCcaAkEAjN891JBjzpMj4bWgsACmMggFf57DS0Ti+5++
+Q1VB8qkJN7rA7/2HrCR3gTsWNb1YhAsnFsoeRscC+LxXoXi9OAIUBG98h4tilg6S
+55jreJD3Se3slps=
+-----END DSA PRIVATE KEY-----
+  _end_of_pem_
+
+  module_function
+
+  def issue_cert(dn, key, serial, not_before, not_after, extensions,
+                 issuer, issuer_key, digest)
+    cert = OpenSSL::X509::Certificate.new
+    issuer = cert unless issuer
+    issuer_key = key unless issuer_key
+    cert.version = 2
+    cert.serial = serial
+    cert.subject = dn
+    cert.issuer = issuer.subject
+    cert.public_key = key.public_key
+    cert.not_before = not_before
+    cert.not_after = not_after
+    ef = OpenSSL::X509::ExtensionFactory.new
+    ef.subject_certificate = cert
+    ef.issuer_certificate = issuer
+    extensions.each{|oid, value, critical|
+      cert.add_extension(ef.create_extension(oid, value, critical))
+    }
+    cert.sign(issuer_key, digest)
+    cert
+  end
+
+  def issue_crl(revoke_info, serial, lastup, nextup, extensions, 
+                issuer, issuer_key, digest)
+    crl = OpenSSL::X509::CRL.new
+    crl.issuer = issuer.subject
+    crl.version = 1
+    crl.last_update = lastup
+    crl.next_update = nextup
+    revoke_info.each{|serial, time, reason_code|
+      revoked = OpenSSL::X509::Revoked.new
+      revoked.serial = serial
+      revoked.time = time
+      enum = OpenSSL::ASN1::Enumerated(reason_code)
+      ext = OpenSSL::X509::Extension.new("CRLReason", enum)
+      revoked.add_extension(ext)
+      crl.add_revoked(revoked)
+    }
+    ef = OpenSSL::X509::ExtensionFactory.new
+    ef.issuer_certificate = issuer
+    ef.crl = crl
+    crlnum = OpenSSL::ASN1::Integer(serial)
+    crl.add_extension(OpenSSL::X509::Extension.new("crlNumber", crlnum))
+    extensions.each{|oid, value, critical|
+      crl.add_extension(ef.create_extension(oid, value, critical))
+    }
+    crl.sign(issuer_key, digest)
+    crl
+  end
+
+  def get_subject_key_id(cert)
+    asn1_cert = OpenSSL::ASN1.decode(cert)
+    tbscert   = asn1_cert.value[0]
+    pkinfo    = tbscert.value[6]
+    publickey = pkinfo.value[1]
+    pkvalue   = publickey.value
+    OpenSSL::Digest::SHA1.hexdigest(pkvalue).scan(/../).join(":").upcase
+  end
+end
diff --git a/ruby_1_8_6/test/optparse/test_getopts.rb b/ruby_1_8_6/test/optparse/test_getopts.rb
new file mode 100644
index 0000000000..fdefe5f3e5
--- /dev/null
+++ b/ruby_1_8_6/test/optparse/test_getopts.rb
@@ -0,0 +1,31 @@
+require 'test/unit'
+
+class TestOptionParserGetopts < Test::Unit::TestCase
+  def setup
+    @opt = OptionParser.new
+  end
+
+  def test_short_noarg
+    o = @opt.getopts(%w[-a], "ab")
+    assert_equal(true, o['a'])
+    assert_equal(false, o['b'])
+  end
+
+  def test_short_arg
+    o = @opt.getopts(%w[-a1], "a:b:")
+    assert_equal("1", o['a'])
+    assert_equal(nil, o['b'])
+  end
+
+  def test_long_noarg
+    o = @opt.getopts(%w[--foo], "", "foo", "bar")
+    assert_equal(true, o['foo'])
+    assert_equal(false, o['bar'])
+  end
+
+  def test_long_arg
+    o = @opt.getopts(%w[--bar ZOT], "", "foo:FOO", "bar:BAR")
+    assert_equal("FOO", o['foo'])
+    assert_equal("ZOT", o['bar'])
+  end
+end
diff --git a/ruby_1_8_6/test/optparse/test_noarg.rb b/ruby_1_8_6/test/optparse/test_noarg.rb
new file mode 100644
index 0000000000..28c469093d
--- /dev/null
+++ b/ruby_1_8_6/test/optparse/test_noarg.rb
@@ -0,0 +1,57 @@
+require 'test_optparse'
+
+module TestOptionParser::NoArg
+  class Def1 < TestOptionParser
+    include NoArg
+    def setup
+      super
+      @opt.def_option("-x") {|x| @flag = x}
+      @opt.def_option("--option") {|x| @flag = x}
+    end
+  end
+  class Def2 < TestOptionParser
+    include NoArg
+    def setup
+      super
+      @opt.def_option("-x", "--option") {|x| @flag = x}
+    end
+  end
+
+  def test_short
+    assert_raises(OptionParser::InvalidOption) {@opt.parse!(%w"-xq")}
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x")})
+    assert_equal(true, @flag)
+    @flag = nil
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"-x foo")})
+    assert_equal(true, @flag)
+  end
+
+  def test_abbrev
+    assert_raises(OptionParser::InvalidOption) {@opt.parse!(%w"-oq")}
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o")})
+    assert_equal(true, @flag)
+    @flag = nil
+    assert_raises(OptionParser::InvalidOption) {@opt.parse!(%w"-O")}
+    assert_nil(@flag)
+    @flag = nil
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"-o foo")})
+    assert_equal(true, @flag)
+  end
+
+  def test_long
+    assert_raises(OptionParser::NeedlessArgument) {@opt.parse!(%w"--option=x")}
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt")})
+    assert_equal(true, @flag)
+    @flag = nil
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"--opt foo")})
+    assert_equal(true, @flag)
+  end
+
+  def test_ambiguous
+    @opt.def_option("--open") {|x|}
+    assert_raises(OptionParser::AmbiguousOption) {@opt.parse!(%w"--op")}
+    assert_raises(OptionParser::AmbiguousOption) {@opt.parse!(%w"-o")}
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt")})
+    assert_equal(true, @flag)
+  end
+end
diff --git a/ruby_1_8_6/test/optparse/test_optarg.rb b/ruby_1_8_6/test/optparse/test_optarg.rb
new file mode 100644
index 0000000000..49cb1b93ec
--- /dev/null
+++ b/ruby_1_8_6/test/optparse/test_optarg.rb
@@ -0,0 +1,44 @@
+require 'test_optparse'
+
+class TestOptionParser::OptArg < TestOptionParser
+  def setup
+    super
+    @opt.def_option("-x[VAL]") {|x| @flag = x}
+    @opt.def_option("--option[=VAL]") {|x| @flag = x}
+  end
+
+  def test_short
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x")})
+    assert_equal(nil, @flag)
+    @flag = false
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"-x foo")})
+    assert_equal(nil, @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-xfoo")})
+    assert_equal("foo", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x=")})
+    assert_equal("=", @flag)
+  end
+
+  def test_abbrev
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o")})
+    assert_equal(nil, @flag)
+    @flag = false
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"-o foo")})
+    assert_equal(nil, @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-ofoo")})
+    assert_equal("foo", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o=")})
+    assert_equal("=", @flag)
+  end
+
+  def test_long
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt")})
+    assert_equal(nil, @flag)
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"--opt= foo")})
+    assert_equal("", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt=foo")})
+    assert_equal("foo", @flag)
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"--opt foo")})
+    assert_equal(nil, @flag)
+  end
+end
diff --git a/ruby_1_8_6/test/optparse/test_optparse.rb b/ruby_1_8_6/test/optparse/test_optparse.rb
new file mode 100644
index 0000000000..9c73399f5b
--- /dev/null
+++ b/ruby_1_8_6/test/optparse/test_optparse.rb
@@ -0,0 +1,46 @@
+require 'test/unit'
+require 'optparse'
+
+class TestOptionParser < Test::Unit::TestCase
+  def setup
+    @opt = OptionParser.new
+    @flag = self.class		# cannot set by option
+  end
+  def no_error(*args)
+    assert_nothing_raised(*args) {return yield}
+  end
+
+  def test_permute
+    assert_equal(%w"", no_error {@opt.permute!(%w"")})
+    assert_equal(self.class, @flag)
+    assert_equal(%w"foo bar", no_error {@opt.permute!(%w"foo bar")})
+    assert_equal(self.class, @flag)
+    assert_equal(%w"- foo bar", no_error {@opt.permute!(%w"- foo bar")})
+    assert_equal(self.class, @flag)
+    assert_equal(%w"foo bar", no_error {@opt.permute!(%w"-- foo bar")})
+    assert_equal(self.class, @flag)
+    assert_equal(%w"foo - bar", no_error {@opt.permute!(%w"foo - bar")})
+    assert_equal(self.class, @flag)
+    assert_equal(%w"foo bar", no_error {@opt.permute!(%w"foo -- bar")})
+    assert_equal(self.class, @flag)
+    assert_equal(%w"foo --help bar", no_error {@opt.permute!(%w"foo -- --help bar")})
+    assert_equal(self.class, @flag)
+  end
+
+  def test_order
+    assert_equal(%w"", no_error {@opt.order!(%w"")})
+    assert_equal(self.class, @flag)
+    assert_equal(%w"foo bar", no_error {@opt.order!(%w"foo bar")})
+    assert_equal(self.class, @flag)
+    assert_equal(%w"- foo bar", no_error {@opt.order!(%w"- foo bar")})
+    assert_equal(self.class, @flag)
+    assert_equal(%w"foo bar", no_error {@opt.permute!(%w"-- foo bar")})
+    assert_equal(self.class, @flag)
+    assert_equal(%w"foo - bar", no_error {@opt.order!(%w"foo - bar")})
+    assert_equal(self.class, @flag)
+    assert_equal(%w"foo -- bar", no_error {@opt.order!(%w"foo -- bar")})
+    assert_equal(self.class, @flag)
+    assert_equal(%w"foo -- --help bar", no_error {@opt.order!(%w"foo -- --help bar")})
+    assert_equal(self.class, @flag)
+  end
+end
diff --git a/ruby_1_8_6/test/optparse/test_placearg.rb b/ruby_1_8_6/test/optparse/test_placearg.rb
new file mode 100644
index 0000000000..f4fd249b7f
--- /dev/null
+++ b/ruby_1_8_6/test/optparse/test_placearg.rb
@@ -0,0 +1,45 @@
+require 'test_optparse'
+
+class TestOptionParser::PlaceArg < TestOptionParser
+  def setup
+    super
+    @opt.def_option("-x [VAL]") {|x| @flag = x}
+    @opt.def_option("--option [VAL]") {|x| @flag = x}
+    @opt.def_option("-n") {}
+  end
+
+  def test_short
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x -n")})
+    assert_equal(nil, @flag)
+    @flag = false
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x foo")})
+    assert_equal("foo", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-xbar")})
+    assert_equal("bar", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x=")})
+    assert_equal("=", @flag)
+  end
+
+  def test_abbrev
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o -n")})
+    assert_equal(nil, @flag)
+    @flag = false
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o foo")})
+    assert_equal("foo", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-obar")})
+    assert_equal("bar", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o=")})
+    assert_equal("=", @flag)
+  end
+
+  def test_long
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt -n")})
+    assert_equal(nil, @flag)
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"--opt= foo")})
+    assert_equal("", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt=foo")})
+    assert_equal("foo", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt bar")})
+    assert_equal("bar", @flag)
+  end
+end
diff --git a/ruby_1_8_6/test/optparse/test_reqarg.rb b/ruby_1_8_6/test/optparse/test_reqarg.rb
new file mode 100644
index 0000000000..0999e5e603
--- /dev/null
+++ b/ruby_1_8_6/test/optparse/test_reqarg.rb
@@ -0,0 +1,63 @@
+require 'test_optparse'
+
+module TestOptionParser::ReqArg
+  class Def1 < TestOptionParser
+    include ReqArg
+    def setup
+      super
+      @opt.def_option("-xVAL") {|x| @flag = x}
+      @opt.def_option("--option=VAL") {|x| @flag = x}
+    end
+  end
+  class Def2 < TestOptionParser
+    include ReqArg
+    def setup
+      super
+      @opt.def_option("-x", "--option=VAL") {|x| @flag = x}
+    end
+  end
+  class Def3 < TestOptionParser
+    include ReqArg
+    def setup
+      super
+      @opt.def_option("--option=VAL", "-x") {|x| @flag = x}
+    end
+  end
+  class Def4 < TestOptionParser
+    include ReqArg
+    def setup
+      super
+      @opt.def_option("-xVAL", "--option=VAL") {|x| @flag = x}
+    end
+  end
+
+  def test_short
+    assert_raises(OptionParser::MissingArgument) {@opt.parse!(%w"-x")}
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x foo")})
+    assert_equal("foo", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-xbar")})
+    assert_equal("bar", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x=")})
+    assert_equal("=", @flag)
+  end
+
+  def test_abbrev
+    assert_raises(OptionParser::MissingArgument) {@opt.parse!(%w"-o")}
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o foo")})
+    assert_equal("foo", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-obar")})
+    assert_equal("bar", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o=")})
+    assert_equal("=", @flag)
+  end
+
+  def test_long
+    assert_raises(OptionParser::MissingArgument) {@opt.parse!(%w"--opt")}
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt foo")})
+    assert_equal("foo", @flag)
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"--opt= foo")})
+    assert_equal("", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt=foo")})
+    assert_equal("foo", @flag)
+  end
+end
diff --git a/ruby_1_8_6/test/ostruct/test_ostruct.rb b/ruby_1_8_6/test/ostruct/test_ostruct.rb
new file mode 100644
index 0000000000..24ed17f800
--- /dev/null
+++ b/ruby_1_8_6/test/ostruct/test_ostruct.rb
@@ -0,0 +1,23 @@
+require 'test/unit'
+require 'ostruct'
+
+class TC_OpenStruct < Test::Unit::TestCase
+  def test_equality
+    o1 = OpenStruct.new
+    o2 = OpenStruct.new
+    assert_equal(o1, o2)
+
+    o1.a = 'a'
+    assert_not_equal(o1, o2)
+
+    o2.a = 'a'
+    assert_equal(o1, o2)
+
+    o1.a = 'b'
+    assert_not_equal(o1, o2)
+
+    o2 = Object.new
+    o2.instance_eval{@table = {:a => 'b'}}
+    assert_not_equal(o1, o2)
+  end
+end
diff --git a/ruby_1_8_6/test/pathname/test_pathname.rb b/ruby_1_8_6/test/pathname/test_pathname.rb
new file mode 100644
index 0000000000..ecf7a71be5
--- /dev/null
+++ b/ruby_1_8_6/test/pathname/test_pathname.rb
@@ -0,0 +1,486 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'pathname'
+
+require 'fileutils'
+require 'tmpdir'
+require 'enumerator'
+
+class TestPathname < Test::Unit::TestCase
+
+  if RUBY_VERSION < "1.9"
+    FUNCALL = :__send__
+  else
+    FUNCALL = :funcall
+  end
+
+  def self.define_assertion(name, &block)
+    @defassert_num ||= {}
+    @defassert_num[name] ||= 0
+    @defassert_num[name] += 1
+    define_method("test_#{name}_#{@defassert_num[name]}", &block)
+  end
+
+  def self.defassert(name, result, *args)
+    define_assertion(name) {
+      assert_equal(result, self.send(name, *args), "#{name}(#{args.map {|a| a.inspect }.join(', ')})")
+    }
+  end
+
+  DOSISH = File::ALT_SEPARATOR != nil
+  DOSISH_DRIVE_LETTER = File.dirname("A:") == "A:."
+  DOSISH_UNC = File.dirname("//") == "//"
+
+  def cleanpath_aggressive(path)
+    Pathname.new(path).cleanpath.to_s
+  end
+
+  defassert(:cleanpath_aggressive, '/',       '/')
+  defassert(:cleanpath_aggressive, '.',       '')
+  defassert(:cleanpath_aggressive, '.',       '.')
+  defassert(:cleanpath_aggressive, '..',      '..')
+  defassert(:cleanpath_aggressive, 'a',       'a')
+  defassert(:cleanpath_aggressive, '/',       '/.')
+  defassert(:cleanpath_aggressive, '/',       '/..')
+  defassert(:cleanpath_aggressive, '/a',      '/a')
+  defassert(:cleanpath_aggressive, '.',       './')
+  defassert(:cleanpath_aggressive, '..',      '../')
+  defassert(:cleanpath_aggressive, 'a',       'a/')
+  defassert(:cleanpath_aggressive, 'a/b',     'a//b')
+  defassert(:cleanpath_aggressive, 'a',       'a/.')
+  defassert(:cleanpath_aggressive, 'a',       'a/./')
+  defassert(:cleanpath_aggressive, '.',       'a/..')
+  defassert(:cleanpath_aggressive, '.',       'a/../')
+  defassert(:cleanpath_aggressive, '/a',      '/a/.')
+  defassert(:cleanpath_aggressive, '..',      './..')
+  defassert(:cleanpath_aggressive, '..',      '../.')
+  defassert(:cleanpath_aggressive, '..',      './../')
+  defassert(:cleanpath_aggressive, '..',      '.././')
+  defassert(:cleanpath_aggressive, '/',       '/./..')
+  defassert(:cleanpath_aggressive, '/',       '/../.')
+  defassert(:cleanpath_aggressive, '/',       '/./../')
+  defassert(:cleanpath_aggressive, '/',       '/.././')
+  defassert(:cleanpath_aggressive, 'a/b/c',   'a/b/c')
+  defassert(:cleanpath_aggressive, 'b/c',     './b/c')
+  defassert(:cleanpath_aggressive, 'a/c',     'a/./c')
+  defassert(:cleanpath_aggressive, 'a/b',     'a/b/.')
+  defassert(:cleanpath_aggressive, '.',       'a/../.')
+  defassert(:cleanpath_aggressive, '/a',      '/../.././../a')
+  defassert(:cleanpath_aggressive, '../../d', 'a/b/../../../../c/../d')
+
+  if DOSISH_UNC
+    defassert(:cleanpath_aggressive, '//a/b/c', '//a/b/c/')
+  else
+    defassert(:cleanpath_aggressive, '/',       '///')
+    defassert(:cleanpath_aggressive, '/a',      '///a')
+    defassert(:cleanpath_aggressive, '/',       '///..')
+    defassert(:cleanpath_aggressive, '/',       '///.')
+    defassert(:cleanpath_aggressive, '/',       '///a/../..')
+  end
+
+  def cleanpath_conservative(path)
+    Pathname.new(path).cleanpath(true).to_s
+  end
+
+  defassert(:cleanpath_conservative, '/',      '/')
+  defassert(:cleanpath_conservative, '.',      '')
+  defassert(:cleanpath_conservative, '.',      '.')
+  defassert(:cleanpath_conservative, '..',     '..')
+  defassert(:cleanpath_conservative, 'a',      'a')
+  defassert(:cleanpath_conservative, '/',      '/.')
+  defassert(:cleanpath_conservative, '/',      '/..')
+  defassert(:cleanpath_conservative, '/a',     '/a')
+  defassert(:cleanpath_conservative, '.',      './')
+  defassert(:cleanpath_conservative, '..',     '../')
+  defassert(:cleanpath_conservative, 'a/',     'a/')
+  defassert(:cleanpath_conservative, 'a/b',    'a//b')
+  defassert(:cleanpath_conservative, 'a/.',    'a/.')
+  defassert(:cleanpath_conservative, 'a/.',    'a/./')
+  defassert(:cleanpath_conservative, 'a/..',   'a/../')
+  defassert(:cleanpath_conservative, '/a/.',   '/a/.')
+  defassert(:cleanpath_conservative, '..',     './..')
+  defassert(:cleanpath_conservative, '..',     '../.')
+  defassert(:cleanpath_conservative, '..',     './../')
+  defassert(:cleanpath_conservative, '..',     '.././')
+  defassert(:cleanpath_conservative, '/',      '/./..')
+  defassert(:cleanpath_conservative, '/',      '/../.')
+  defassert(:cleanpath_conservative, '/',      '/./../')
+  defassert(:cleanpath_conservative, '/',      '/.././')
+  defassert(:cleanpath_conservative, 'a/b/c',  'a/b/c')
+  defassert(:cleanpath_conservative, 'b/c',    './b/c')
+  defassert(:cleanpath_conservative, 'a/c',    'a/./c')
+  defassert(:cleanpath_conservative, 'a/b/.',  'a/b/.')
+  defassert(:cleanpath_conservative, 'a/..',   'a/../.')
+  defassert(:cleanpath_conservative, '/a',     '/../.././../a')
+  defassert(:cleanpath_conservative, 'a/b/../../../../c/../d', 'a/b/../../../../c/../d')
+
+  if DOSISH_UNC
+    defassert(:cleanpath_conservative, '//',     '//')
+  else
+    defassert(:cleanpath_conservative, '/',      '//')
+  end
+
+  # has_trailing_separator?(path) -> bool
+  def has_trailing_separator?(path)
+    Pathname.allocate.send(FUNCALL, :has_trailing_separator?, path)
+  end
+
+  defassert(:has_trailing_separator?, false, "/")
+  defassert(:has_trailing_separator?, false, "///")
+  defassert(:has_trailing_separator?, false, "a")
+  defassert(:has_trailing_separator?, true, "a/")
+
+  def add_trailing_separator(path)
+    Pathname.allocate.send(FUNCALL, :add_trailing_separator, path)
+  end
+
+  def del_trailing_separator(path)
+    Pathname.allocate.send(FUNCALL, :del_trailing_separator, path)
+  end
+
+  defassert(:del_trailing_separator, "/", "/")
+  defassert(:del_trailing_separator, "/a", "/a")
+  defassert(:del_trailing_separator, "/a", "/a/")
+  defassert(:del_trailing_separator, "/a", "/a//")
+  defassert(:del_trailing_separator, ".", ".")
+  defassert(:del_trailing_separator, ".", "./")
+  defassert(:del_trailing_separator, ".", ".//")
+
+  if DOSISH_DRIVE_LETTER
+    defassert(:del_trailing_separator, "A:", "A:")
+    defassert(:del_trailing_separator, "A:/", "A:/")
+    defassert(:del_trailing_separator, "A:/", "A://")
+    defassert(:del_trailing_separator, "A:.", "A:.")
+    defassert(:del_trailing_separator, "A:.", "A:./")
+    defassert(:del_trailing_separator, "A:.", "A:.//")
+  end
+
+  if DOSISH_UNC
+    defassert(:del_trailing_separator, "//", "//")
+    defassert(:del_trailing_separator, "//a", "//a")
+    defassert(:del_trailing_separator, "//a", "//a/")
+    defassert(:del_trailing_separator, "//a", "//a//")
+    defassert(:del_trailing_separator, "//a/b", "//a/b")
+    defassert(:del_trailing_separator, "//a/b", "//a/b/")
+    defassert(:del_trailing_separator, "//a/b", "//a/b//")
+    defassert(:del_trailing_separator, "//a/b/c", "//a/b/c")
+    defassert(:del_trailing_separator, "//a/b/c", "//a/b/c/")
+    defassert(:del_trailing_separator, "//a/b/c", "//a/b/c//")
+  else
+    defassert(:del_trailing_separator, "/", "///")
+    defassert(:del_trailing_separator, "///a", "///a/")
+  end
+
+  if DOSISH
+    defassert(:del_trailing_separator, "a", "a\\")
+    defassert(:del_trailing_separator, "\225\\", "\225\\\\") # SJIS
+  end
+
+  def plus(path1, path2) # -> path
+    (Pathname.new(path1) + Pathname.new(path2)).to_s
+  end
+
+  defassert(:plus, '/', '/', '/')
+  defassert(:plus, 'a/b', 'a', 'b')
+  defassert(:plus, 'a', 'a', '.')
+  defassert(:plus, 'b', '.', 'b')
+  defassert(:plus, '.', '.', '.')
+  defassert(:plus, '/b', 'a', '/b')
+
+  defassert(:plus, '/', '/', '..')
+  defassert(:plus, '.', 'a', '..')
+  defassert(:plus, 'a', 'a/b', '..')
+  defassert(:plus, '../..', '..', '..')
+  defassert(:plus, '/c', '/', '../c')
+  defassert(:plus, 'c', 'a', '../c')
+  defassert(:plus, 'a/c', 'a/b', '../c')
+  defassert(:plus, '../../c', '..', '../c')
+
+  defassert(:plus, 'a//b/d//e', 'a//b/c', '../d//e')
+
+  def relative?(path)
+    Pathname.new(path).relative?
+  end
+
+  defassert(:relative?, false, '/')
+  defassert(:relative?, false, '/a')
+  defassert(:relative?, false, '/..')
+  defassert(:relative?, true, 'a')
+  defassert(:relative?, true, 'a/b')
+
+  if DOSISH_DRIVE_LETTER
+    defassert(:relative?, false, 'A:')
+    defassert(:relative?, false, 'A:/')
+    defassert(:relative?, false, 'A:/a')
+  end
+
+  if File.dirname('//') == '//'
+    defassert(:relative?, false, '//')
+    defassert(:relative?, false, '//a')
+    defassert(:relative?, false, '//a/')
+    defassert(:relative?, false, '//a/b')
+    defassert(:relative?, false, '//a/b/')
+    defassert(:relative?, false, '//a/b/c')
+  end
+
+  def relative_path_from(dest_directory, base_directory)
+    Pathname.new(dest_directory).relative_path_from(Pathname.new(base_directory)).to_s
+  end
+
+  defassert(:relative_path_from, "../a", "a", "b")
+  defassert(:relative_path_from, "../a", "a", "b/")
+  defassert(:relative_path_from, "../a", "a/", "b")
+  defassert(:relative_path_from, "../a", "a/", "b/")
+  defassert(:relative_path_from, "../a", "/a", "/b")
+  defassert(:relative_path_from, "../a", "/a", "/b/")
+  defassert(:relative_path_from, "../a", "/a/", "/b")
+  defassert(:relative_path_from, "../a", "/a/", "/b/")
+
+  defassert(:relative_path_from, "../b", "a/b", "a/c")
+  defassert(:relative_path_from, "../a", "../a", "../b")
+
+  defassert(:relative_path_from, "a", "a", ".")
+  defassert(:relative_path_from, "..", ".", "a")
+
+  defassert(:relative_path_from, ".", ".", ".")
+  defassert(:relative_path_from, ".", "..", "..")
+  defassert(:relative_path_from, "..", "..", ".")
+
+  defassert(:relative_path_from, "c/d", "/a/b/c/d", "/a/b")
+  defassert(:relative_path_from, "../..", "/a/b", "/a/b/c/d")
+  defassert(:relative_path_from, "../../../../e", "/e", "/a/b/c/d")
+  defassert(:relative_path_from, "../b/c", "a/b/c", "a/d")
+
+  defassert(:relative_path_from, "../a", "/../a", "/b")
+  defassert(:relative_path_from, "../../a", "../a", "b")
+  defassert(:relative_path_from, ".", "/a/../../b", "/b")
+  defassert(:relative_path_from, "..", "a/..", "a")
+  defassert(:relative_path_from, ".", "a/../b", "b")
+
+  defassert(:relative_path_from, "a", "a", "b/..")
+  defassert(:relative_path_from, "b/c", "b/c", "b/..")
+
+  def self.defassert_raise(name, exc, *args)
+    define_assertion(name) {
+      message = "#{name}(#{args.map {|a| a.inspect }.join(', ')})"
+      assert_raise(exc, message) { self.send(name, *args) }
+    }
+  end
+
+  defassert_raise(:relative_path_from, ArgumentError, "/", ".")
+  defassert_raise(:relative_path_from, ArgumentError, ".", "/")
+  defassert_raise(:relative_path_from, ArgumentError, "a", "..")
+  defassert_raise(:relative_path_from, ArgumentError, ".", "..")
+
+  def realpath(path)
+    Pathname.new(path).realpath.to_s
+  end
+
+  def test_realpath
+    begin
+      File.symlink(nil, nil)
+    rescue NotImplementedError
+      return
+    rescue TypeError
+    end
+    dir = "#{Dir.tmpdir}/tst-pathname-#$$"
+    Dir.mkdir(dir)
+    begin
+      File.symlink("not-exist-target", "#{dir}/not-exist")
+      assert_raise(Errno::ENOENT) { realpath("#{dir}/not-exist") }
+      File.symlink("loop", "#{dir}/loop")
+      assert_raise(Errno::ELOOP) { realpath("#{dir}/loop") }
+    ensure
+      FileUtils.rmtree(dir)
+    end
+  end
+
+  def descend(path)
+    Pathname.new(path).enum_for(:descend).map {|v| v.to_s }
+  end
+
+  defassert(:descend, %w[/ /a /a/b /a/b/c], "/a/b/c")
+  defassert(:descend, %w[a a/b a/b/c], "a/b/c")
+  defassert(:descend, %w[. ./a ./a/b ./a/b/c], "./a/b/c")
+  defassert(:descend, %w[a/], "a/")
+
+  def ascend(path)
+    Pathname.new(path).enum_for(:ascend).map {|v| v.to_s }
+  end
+
+  defassert(:ascend, %w[/a/b/c /a/b /a /], "/a/b/c")
+  defassert(:ascend, %w[a/b/c a/b a], "a/b/c")
+  defassert(:ascend, %w[./a/b/c ./a/b ./a .], "./a/b/c")
+  defassert(:ascend, %w[a/], "a/")
+
+  def test_initialize
+    p1 = Pathname.new('a')
+    assert_equal('a', p1.to_s)
+    p2 = Pathname.new(p1)
+    assert_equal(p1, p2)
+  end
+
+  def test_initialize_nul
+    assert_raise(ArgumentError) { Pathname.new("a\0") }
+  end
+
+  class AnotherStringLike # :nodoc:
+    def initialize(s) @s = s end
+    def to_str() @s end
+    def ==(other) @s == other end
+  end
+
+  def test_equality
+    obj = Pathname.new("a")
+    str = "a"
+    sym = :a
+    ano = AnotherStringLike.new("a")
+    assert_equal(false, obj == str)
+    assert_equal(false, str == obj)
+    assert_equal(false, obj == ano)
+    assert_equal(false, ano == obj)
+    assert_equal(false, obj == sym)
+    assert_equal(false, sym == obj)
+
+    obj2 = Pathname.new("a")
+    assert_equal(true, obj == obj2)
+    assert_equal(true, obj === obj2)
+    assert_equal(true, obj.eql?(obj2))
+  end
+
+  def test_hashkey
+    h = {}
+    h[Pathname.new("a")] = 1
+    h[Pathname.new("a")] = 2
+    assert_equal(1, h.size)
+  end
+
+  def assert_pathname_cmp(e, s1, s2)
+    p1 = Pathname.new(s1)
+    p2 = Pathname.new(s2)
+    r = p1 <=> p2
+    assert(e == r,
+      "#{p1.inspect} <=> #{p2.inspect}: <#{e}> expected but was <#{r}>")
+  end
+  def test_comparison
+    assert_pathname_cmp( 0, "a", "a")
+    assert_pathname_cmp( 1, "b", "a")
+    assert_pathname_cmp(-1, "a", "b")
+    ss = %w(
+      a
+      a/
+      a/b
+      a.
+      a0
+    )
+    s1 = ss.shift
+    ss.each {|s2|
+      assert_pathname_cmp(-1, s1, s2)
+      s1 = s2
+    }
+  end
+
+  def test_comparison_string
+    assert_equal(nil, Pathname.new("a") <=> "a")
+    assert_equal(nil, "a" <=> Pathname.new("a"))
+  end
+
+  def pathsub(path, pat, repl) Pathname.new(path).sub(pat, repl).to_s end
+  defassert(:pathsub, "a.o", "a.c", /\.c\z/, ".o")
+
+  def root?(path)
+    Pathname.new(path).root?
+  end
+
+  defassert(:root?, true, "/")
+  defassert(:root?, true, "//")
+  defassert(:root?, true, "///")
+  defassert(:root?, false, "")
+  defassert(:root?, false, "a")
+
+  def test_destructive_update
+    path = Pathname.new("a")
+    path.to_s.replace "b"
+    assert_equal(Pathname.new("a"), path)
+  end
+
+  def test_null_character
+    assert_raise(ArgumentError) { Pathname.new("\0") }
+  end
+
+  def test_taint
+    obj = Pathname.new("a"); assert_same(obj, obj.taint)
+    obj = Pathname.new("a"); assert_same(obj, obj.untaint)
+
+    assert_equal(false, Pathname.new("a"      )           .tainted?)
+    assert_equal(false, Pathname.new("a"      )      .to_s.tainted?)
+    assert_equal(true,  Pathname.new("a"      ).taint     .tainted?)
+    assert_equal(true,  Pathname.new("a"      ).taint.to_s.tainted?)
+    assert_equal(true,  Pathname.new("a".taint)           .tainted?)
+    assert_equal(true,  Pathname.new("a".taint)      .to_s.tainted?)
+    assert_equal(true,  Pathname.new("a".taint).taint     .tainted?)
+    assert_equal(true,  Pathname.new("a".taint).taint.to_s.tainted?)
+
+    str = "a"
+    path = Pathname.new(str)
+    str.taint
+    assert_equal(false, path     .tainted?)
+    assert_equal(false, path.to_s.tainted?)
+  end
+
+  def test_untaint
+    obj = Pathname.new("a"); assert_same(obj, obj.untaint)
+
+    assert_equal(false, Pathname.new("a").taint.untaint     .tainted?)
+    assert_equal(false, Pathname.new("a").taint.untaint.to_s.tainted?)
+
+    str = "a".taint
+    path = Pathname.new(str)
+    str.untaint
+    assert_equal(true, path     .tainted?)
+    assert_equal(true, path.to_s.tainted?)
+  end
+
+  def test_freeze
+    obj = Pathname.new("a"); assert_same(obj, obj.freeze)
+
+    assert_equal(false, Pathname.new("a"       )            .frozen?)
+    assert_equal(false, Pathname.new("a".freeze)            .frozen?)
+    assert_equal(true,  Pathname.new("a"       ).freeze     .frozen?)
+    assert_equal(true,  Pathname.new("a".freeze).freeze     .frozen?)
+    assert_equal(false, Pathname.new("a"       )       .to_s.frozen?)
+    assert_equal(false, Pathname.new("a".freeze)       .to_s.frozen?)
+    assert_equal(false, Pathname.new("a"       ).freeze.to_s.frozen?)
+    assert_equal(false, Pathname.new("a".freeze).freeze.to_s.frozen?)
+  end
+
+  def test_to_s
+    str = "a"
+    obj = Pathname.new(str)
+    assert_equal(str, obj.to_s)
+    assert_not_same(str, obj.to_s)
+    assert_not_same(obj.to_s, obj.to_s)
+  end
+
+  def test_kernel_open
+    count = 0
+    result = Kernel.open(Pathname.new(__FILE__)) {|f|
+      assert(File.identical?(__FILE__, f))
+      count += 1
+      2
+    }
+    assert_equal(1, count)
+    assert_equal(2, result)
+  end
+
+  def test_each_filename
+    result = []
+    Pathname.new("/usr/bin/ruby").each_filename {|f| result << f }
+    assert_equal(%w[usr bin ruby], result)
+  end
+
+  def test_kernel_pathname
+    assert_equal(Pathname.new("a"), Pathname("a"))
+  end
+end
diff --git a/ruby_1_8_6/test/rdoc/parsers/test_parse_c.rb b/ruby_1_8_6/test/rdoc/parsers/test_parse_c.rb
new file mode 100644
index 0000000000..6157a9e1d4
--- /dev/null
+++ b/ruby_1_8_6/test/rdoc/parsers/test_parse_c.rb
@@ -0,0 +1,261 @@
+require 'stringio'
+require 'tempfile'
+require 'test/unit'
+require 'rdoc/parsers/parse_c'
+
+class RDoc::C_Parser
+  attr_accessor :classes
+
+  public :do_classes, :do_constants
+end
+
+class TestRdocC_Parser < Test::Unit::TestCase
+
+  def setup
+    @tempfile = Tempfile.new self.class.name
+    filename = @tempfile.path
+
+    @top_level = RDoc::TopLevel.new filename
+    @fn = filename
+    @options = Options.instance
+    @stats = RDoc::Stats.new
+
+    @progress = StringIO.new
+  end
+
+  def teardown
+    @tempfile.unlink
+  end
+
+  def test_do_classes_boot_class
+    content = <<-EOF
+/* Document-class: Foo
+ * this is the Foo boot class
+ */
+VALUE cFoo = boot_defclass("Foo", 0);
+    EOF
+
+    klass = util_get_class content, 'cFoo'
+    assert_equal "   this is the Foo boot class\n   ", klass.comment
+  end
+
+  def test_do_classes_class
+    content = <<-EOF
+/* Document-class: Foo
+ * this is the Foo class
+ */
+VALUE cFoo = rb_define_class("Foo", rb_cObject);
+    EOF
+
+    klass = util_get_class content, 'cFoo'
+    assert_equal "   this is the Foo class\n   ", klass.comment
+  end
+
+  def test_do_classes_class_under
+    content = <<-EOF
+/* Document-class: Kernel::Foo
+ * this is the Foo class under Kernel
+ */
+VALUE cFoo = rb_define_class_under(rb_mKernel, "Foo", rb_cObject);
+    EOF
+
+    klass = util_get_class content, 'cFoo'
+    assert_equal "   this is the Foo class under Kernel\n   ", klass.comment
+  end
+
+  def test_do_classes_module
+    content = <<-EOF
+/* Document-module: Foo
+ * this is the Foo module
+ */
+VALUE mFoo = rb_define_module("Foo");
+    EOF
+
+    klass = util_get_class content, 'mFoo'
+    assert_equal "   this is the Foo module\n   ", klass.comment
+  end
+
+  def test_do_classes_module_under
+    content = <<-EOF
+/* Document-module: Kernel::Foo
+ * this is the Foo module under Kernel
+ */
+VALUE mFoo = rb_define_module_under(rb_mKernel, "Foo");
+    EOF
+
+    klass = util_get_class content, 'mFoo'
+    assert_equal "   this is the Foo module under Kernel\n   ", klass.comment
+  end
+
+  def test_do_constants
+    content = <<-EOF
+#include <ruby.h>
+
+void Init_foo(){
+   VALUE cFoo = rb_define_class("Foo", rb_cObject);
+
+   /* 300: The highest possible score in bowling */
+   rb_define_const(cFoo, "PERFECT", INT2FIX(300));
+
+   /* Huzzah!: What you cheer when you roll a perfect game */
+   rb_define_const(cFoo, "CHEER", rb_str_new2("Huzzah!"));
+
+   /* TEST\:TEST: Checking to see if escaped semicolon works */
+   rb_define_const(cFoo, "TEST", rb_str_new2("TEST:TEST"));
+
+   /* \\: The file separator on MS Windows */
+   rb_define_const(cFoo, "MSEPARATOR", rb_str_new2("\\"));
+
+   /* /: The file separator on Unix */
+   rb_define_const(cFoo, "SEPARATOR", rb_str_new2("/"));
+
+   /* C:\\Program Files\\Stuff: A directory on MS Windows */
+   rb_define_const(cFoo, "STUFF", rb_str_new2("C:\\Program Files\\Stuff"));
+
+   /* Default definition */
+   rb_define_const(cFoo, "NOSEMI", INT2FIX(99));
+
+   rb_define_const(cFoo, "NOCOMMENT", rb_str_new2("No comment"));
+
+   /*
+    * Multiline comment goes here because this comment spans multiple lines.
+    * Multiline comment goes here because this comment spans multiple lines.
+    */
+   rb_define_const(cFoo, "MULTILINE", INT2FIX(1));
+
+   /*
+    * 1: Multiline comment goes here because this comment spans multiple lines.
+    * Multiline comment goes here because this comment spans multiple lines.
+    */
+   rb_define_const(cFoo, "MULTILINE_VALUE", INT2FIX(1));
+
+   /* Multiline comment goes here because this comment spans multiple lines.
+    * Multiline comment goes here because this comment spans multiple lines.
+    */
+   rb_define_const(cFoo, "MULTILINE_NOT_EMPTY", INT2FIX(1));
+
+}
+    EOF
+
+    parser = util_parser content
+
+    parser.do_classes
+    parser.do_constants
+
+    klass = parser.classes['cFoo']
+    assert klass
+
+    constants = klass.constants
+    assert !klass.constants.empty?
+
+    constants = constants.map { |c| [c.name, c.value, c.comment] }
+
+    assert_equal ['PERFECT', '300',
+                  "\n      The highest possible score in bowling   \n   "],
+                 constants.shift
+    assert_equal ['CHEER', 'Huzzah!',
+                  "\n      What you cheer when you roll a perfect game   \n   "],
+                 constants.shift
+    assert_equal ['TEST', 'TEST:TEST',
+                  "\n      Checking to see if escaped semicolon works   \n   "],
+                 constants.shift
+    assert_equal ['MSEPARATOR', '\\',
+                  "\n      The file separator on MS Windows   \n   "],
+                 constants.shift
+    assert_equal ['SEPARATOR', '/',
+                  "\n      The file separator on Unix   \n   "],
+                 constants.shift
+    assert_equal ['STUFF', 'C:\\Program Files\\Stuff',
+                  "\n      A directory on MS Windows   \n   "],
+                 constants.shift
+    assert_equal ['NOSEMI', 'INT2FIX(99)',
+                  "\n      Default definition   \n   "],
+                 constants.shift
+    assert_equal ['NOCOMMENT', 'rb_str_new2("No comment")', nil],
+                 constants.shift
+
+    comment = <<-EOF.chomp
+
+     
+      Multiline comment goes here because this comment spans multiple lines.
+      Multiline comment goes here because this comment spans multiple lines.
+      
+   
+    EOF
+    assert_equal ['MULTILINE', 'INT2FIX(1)', comment], constants.shift
+    assert_equal ['MULTILINE_VALUE', '1', comment], constants.shift
+
+    comment = <<-EOF.chomp
+
+      Multiline comment goes here because this comment spans multiple lines.
+      Multiline comment goes here because this comment spans multiple lines.
+      
+   
+    EOF
+    assert_equal ['MULTILINE_NOT_EMPTY', 'INT2FIX(1)', comment], constants.shift
+
+    assert constants.empty?, constants.inspect
+  end
+
+  def test_find_class_comment_init
+    content = <<-EOF
+/*
+ * a comment for class Foo
+ */
+void
+Init_Foo(void) {
+  VALUE foo = rb_define_class("Foo", rb_cObject);
+}
+    EOF
+
+    klass = util_get_class content, 'foo'
+
+    assert_equal "  \n   a comment for class Foo\n   \n", klass.comment
+  end
+
+  def test_find_class_comment_define_class
+    content = <<-EOF
+/*
+ * a comment for class Foo
+ */
+VALUE foo = rb_define_class("Foo", rb_cObject);
+    EOF
+
+    klass = util_get_class content, 'foo'
+
+    assert_equal "  \n   a comment for class Foo\n   ", klass.comment
+  end
+
+  def test_find_class_comment_define_class
+    content = <<-EOF
+/*
+ * a comment for class Foo on Init
+ */
+void
+Init_Foo(void) {
+    /*
+     * a comment for class Foo on rb_define_class
+     */
+    VALUE foo = rb_define_class("Foo", rb_cObject);
+}
+    EOF
+
+    klass = util_get_class content, 'foo'
+
+    assert_equal "  \n   a comment for class Foo on Init\n   \n", klass.comment
+  end
+
+  def util_get_class(content, name)
+    parser = util_parser content
+    parser.do_classes
+    parser.classes[name]
+  end
+
+  def util_parser(content)
+    parser = RDoc::C_Parser.new @top_level, @fn, content, @options, @stats
+    parser.progress = @progress
+    parser
+  end
+
+end
+
diff --git a/ruby_1_8_6/test/readline/test_readline.rb b/ruby_1_8_6/test/readline/test_readline.rb
new file mode 100644
index 0000000000..edc3aa09b9
--- /dev/null
+++ b/ruby_1_8_6/test/readline/test_readline.rb
@@ -0,0 +1,84 @@
+begin
+  require "readline"
+rescue LoadError
+end
+
+if defined?(Readline) && !/EditLine/n.match(Readline::VERSION)
+
+require "test/unit"
+require "tempfile"
+
+class TestReadline < Test::Unit::TestCase
+  def test_readline
+    stdin = Tempfile.new("test_readline_stdin")
+    stdout = Tempfile.new("test_readline_stdout")
+    begin
+      stdin.write("hello\n")
+      stdin.close
+      stdout.close
+      line = replace_stdio(stdin.path, stdout.path) {
+        Readline.readline("> ", true)
+      }
+      assert_equal("hello", line)
+      assert_equal(true, line.tainted?)
+      stdout.open
+      assert_equal("> ", stdout.read(2))
+      assert_equal(1, Readline::HISTORY.length)
+      assert_equal("hello", Readline::HISTORY[0])
+      assert_raises(SecurityError) do
+        Thread.start {
+          $SAFE = 1
+          replace_stdio(stdin.path, stdout.path) do
+            Readline.readline("> ".taint)
+          end
+        }.join
+      end
+      assert_raises(SecurityError) do
+        Thread.start {
+          $SAFE = 4
+          replace_stdio(stdin.path, stdout.path) { Readline.readline("> ") }
+        }.join
+      end
+    ensure
+      stdin.close(true)
+      stdout.close(true)
+    end
+  end
+
+  def test_completion_append_character
+    begin
+      Readline.completion_append_character = "x"
+      assert_equal("x", Readline.completion_append_character)
+      Readline.completion_append_character = "xyz"
+      assert_equal("x", Readline.completion_append_character)
+      Readline.completion_append_character = nil
+      assert_equal(nil, Readline.completion_append_character)
+      Readline.completion_append_character = ""
+      assert_equal(nil, Readline.completion_append_character)
+    rescue NotImplementedError
+    end
+  end
+
+  private
+
+  def replace_stdio(stdin_path, stdout_path)
+    open(stdin_path, "r"){|stdin|
+      open(stdout_path, "w"){|stdout|
+        orig_stdin = STDIN.dup
+        orig_stdout = STDOUT.dup
+        STDIN.reopen(stdin)
+        STDOUT.reopen(stdout)
+        begin
+          yield
+        ensure
+          STDIN.reopen(orig_stdin)
+          STDOUT.reopen(orig_stdout)
+          orig_stdin.close
+          orig_stdout.close
+        end
+      }
+    }
+  end
+end
+
+end
diff --git a/ruby_1_8_6/test/rinda/test_rinda.rb b/ruby_1_8_6/test/rinda/test_rinda.rb
new file mode 100644
index 0000000000..553d3078fe
--- /dev/null
+++ b/ruby_1_8_6/test/rinda/test_rinda.rb
@@ -0,0 +1,539 @@
+require 'test/unit'
+
+require 'drb/drb'
+require 'drb/eq'
+require 'rinda/tuplespace'
+
+require 'singleton'
+
+module Rinda
+
+class MockClock
+  include Singleton
+
+  class MyTS < Rinda::TupleSpace
+    def keeper
+      nil
+    end
+  end
+  
+  def initialize
+    @now = 2
+    @reso = 0.1
+    @ts = MyTS.new
+    @ts.write([2, :now])
+    @inf = 2**31 - 1
+  end
+
+  def now
+    @now.to_f
+  end
+
+  def at(n)
+    n
+  end
+    
+  def _forward(n=nil)
+    now ,= @ts.take([nil, :now])
+    @now = now + n
+    n = @reso if n.nil?
+    @ts.write([@now, :now])
+  end
+
+  def forward(n=nil)
+    while n > 0
+      _forward(@reso)
+      n -= @reso
+    end
+  end
+
+  def rewind
+    now ,= @ts.take([nil, :now])
+    @ts.write([@inf, :now])
+    @ts.take([nil, :now])
+    @now = 2
+    @ts.write([2, :now])
+  end
+
+  def sleep(n=nil)
+    while will_deadlock? 
+      n -= @reso
+      forward
+      return 0 if n <= 0
+    end
+    now ,= @ts.read([nil, :now])
+    @ts.read([(now + n)..@inf, :now])
+    0
+  end
+
+  def will_deadlock?
+    sz = Thread.current.group.list.find_all {|x| x.status != 'sleep'}.size
+    sz <= 1
+  end
+end
+
+module Time
+  def sleep(n)
+    @m.sleep(n)
+  end
+  module_function :sleep
+
+  def at(n)
+    n
+  end
+  module_function :at
+
+  def now
+    @m ? @m.now : 2
+  end
+  module_function :now
+
+  def rewind
+    @m.rewind
+  end
+  module_function :rewind
+
+  def forward(n)
+    @m.forward(n)
+  end
+  module_function :forward
+
+  @m = MockClock.instance
+end
+
+class TupleSpace
+  def sleep(n)
+    Time.sleep(n)
+  end
+end
+
+module TupleSpaceTestModule
+  def sleep(n)
+    if Thread.current == Thread.main
+      Time.forward(n)
+    else
+      Time.sleep(n)
+    end
+  end
+  
+  def test_00_tuple
+    tuple = Rinda::TupleEntry.new([1,2,3])
+    assert(!tuple.canceled?)
+    assert(!tuple.expired?)
+    assert(tuple.alive?)
+  end
+
+  def test_00_template
+    tmpl = Rinda::Template.new([1,2,3])
+    assert_equal(3, tmpl.size)
+    assert_equal(3, tmpl[2])
+    assert(tmpl.match([1,2,3]))
+    assert(!tmpl.match([1,nil,3]))
+
+    tmpl = Rinda::Template.new([/^rinda/i, nil, :hello])
+    assert_equal(3, tmpl.size)
+    assert(tmpl.match(['Rinda', 2, :hello]))
+    assert(!tmpl.match(['Rinda', 2, Symbol]))
+    assert(!tmpl.match([1, 2, :hello]))
+    assert(tmpl.match([/^rinda/i, 2, :hello]))
+
+    tmpl = Rinda::Template.new([Symbol])
+    assert_equal(1, tmpl.size)
+    assert(tmpl.match([:hello]))
+    assert(tmpl.match([Symbol]))
+    assert(!tmpl.match(['Symbol']))
+
+    tmpl = Rinda::Template.new({"message"=>String, "name"=>String})
+    assert_equal(2, tmpl.size)
+    assert(tmpl.match({"message"=>"Hello", "name"=>"Foo"}))
+    assert(!tmpl.match({"message"=>"Hello", "name"=>"Foo", "1"=>2}))
+    assert(!tmpl.match({"message"=>"Hi", "name"=>"Foo", "age"=>1}))
+    assert(!tmpl.match({"message"=>"Hello", "no_name"=>"Foo"}))
+
+    assert_raises(Rinda::InvalidHashTupleKey) do
+      tmpl = Rinda::Template.new({:message=>String, "name"=>String})
+    end
+    tmpl = Rinda::Template.new({"name"=>String})
+    assert_equal(1, tmpl.size)
+    assert(tmpl.match({"name"=>"Foo"}))
+    assert(!tmpl.match({"message"=>"Hello", "name"=>"Foo"}))
+    assert(!tmpl.match({"message"=>:symbol, "name"=>"Foo", "1"=>2}))
+    assert(!tmpl.match({"message"=>"Hi", "name"=>"Foo", "age"=>1}))
+    assert(!tmpl.match({"message"=>"Hello", "no_name"=>"Foo"}))
+
+    tmpl = Rinda::Template.new({"message"=>String, "name"=>String})
+    assert_equal(2, tmpl.size)
+    assert(tmpl.match({"message"=>"Hello", "name"=>"Foo"}))
+    assert(!tmpl.match({"message"=>"Hello", "name"=>"Foo", "1"=>2}))
+    assert(!tmpl.match({"message"=>"Hi", "name"=>"Foo", "age"=>1}))
+    assert(!tmpl.match({"message"=>"Hello", "no_name"=>"Foo"}))
+
+    tmpl = Rinda::Template.new({"message"=>String})
+    assert_equal(1, tmpl.size)
+    assert(tmpl.match({"message"=>"Hello"}))
+    assert(!tmpl.match({"message"=>"Hello", "name"=>"Foo"}))
+    assert(!tmpl.match({"message"=>"Hello", "name"=>"Foo", "1"=>2}))
+    assert(!tmpl.match({"message"=>"Hi", "name"=>"Foo", "age"=>1}))
+    assert(!tmpl.match({"message"=>"Hello", "no_name"=>"Foo"}))
+
+    tmpl = Rinda::Template.new({"message"=>String, "name"=>nil})
+    assert_equal(2, tmpl.size)
+    assert(tmpl.match({"message"=>"Hello", "name"=>"Foo"}))
+    assert(!tmpl.match({"message"=>"Hello", "name"=>"Foo", "1"=>2}))
+    assert(!tmpl.match({"message"=>"Hi", "name"=>"Foo", "age"=>1}))
+    assert(!tmpl.match({"message"=>"Hello", "no_name"=>"Foo"}))
+
+    assert_raises(Rinda::InvalidHashTupleKey) do
+      @ts.write({:message=>String, "name"=>String})
+    end
+
+    @ts.write([1, 2, 3])
+    assert_equal([1, 2, 3], @ts.take([1, 2, 3]))
+
+    @ts.write({'1'=>1, '2'=>2, '3'=>3})
+    assert_equal({'1'=>1, '2'=>2, '3'=>3}, @ts.take({'1'=>1, '2'=>2, '3'=>3}))
+
+    entry = @ts.write(['1'=>1, '2'=>2, '3'=>3])
+    assert_raises(Rinda::RequestExpiredError) do
+      assert_equal({'1'=>1, '2'=>2, '3'=>3}, @ts.read({'1'=>1}, 0))
+    end
+    entry.cancel
+  end
+
+  def test_00_DRbObject
+    ro = DRbObject.new(nil, "druby://host:1234")
+    tmpl = Rinda::DRbObjectTemplate.new
+    assert(tmpl === ro)
+
+    tmpl = Rinda::DRbObjectTemplate.new("druby://host:1234")
+    assert(tmpl === ro)
+
+    tmpl = Rinda::DRbObjectTemplate.new("druby://host:12345")
+    assert(!(tmpl === ro))
+
+    tmpl = Rinda::DRbObjectTemplate.new(/^druby:\/\/host:/)
+    assert(tmpl === ro)
+
+    ro = DRbObject.new_with(12345, 1234)
+    assert(!(tmpl === ro))
+
+    ro = DRbObject.new_with("druby://foo:12345", 1234)
+    assert(!(tmpl === ro))
+
+    tmpl = Rinda::DRbObjectTemplate.new(/^druby:\/\/(foo|bar):/)
+    assert(tmpl === ro)
+
+    ro = DRbObject.new_with("druby://bar:12345", 1234)
+    assert(tmpl === ro)
+
+    ro = DRbObject.new_with("druby://baz:12345", 1234)
+    assert(!(tmpl === ro))
+  end
+
+  def test_inp_rdp
+    assert_raises(Rinda::RequestExpiredError) do
+      @ts.take([:empty], 0)
+    end
+
+    assert_raises(Rinda::RequestExpiredError) do
+      @ts.read([:empty], 0)
+    end
+  end
+
+  def test_ruby_talk_264062
+    th = Thread.new { @ts.take([:empty], 1) }
+    sleep 2
+    assert_raises(Rinda::RequestExpiredError) do
+      th.value
+    end
+
+    th = Thread.new { @ts.read([:empty], 1) }
+    sleep 2
+    assert_raises(Rinda::RequestExpiredError) do
+      th.value
+    end
+  end
+
+  def test_core_01
+    5.times do |n|
+      @ts.write([:req, 2])
+    end
+
+    assert_equal([[:req, 2], [:req, 2], [:req, 2], [:req, 2], [:req, 2]],
+		 @ts.read_all([nil, nil]))
+
+    taker = Thread.new do
+      s = 0
+      while true
+	begin
+	  tuple = @ts.take([:req, Integer], 0.5)
+	  assert_equal(2, tuple[1])
+	  s += tuple[1]
+	rescue Rinda::RequestExpiredError
+	  break
+	end
+      end
+      @ts.write([:ans, s])
+      s
+    end
+    
+    sleep(20)
+    tuple = @ts.take([:ans, nil])
+    assert_equal(10, tuple[1])
+    assert_equal(10, taker.value)
+  end
+
+  def test_core_02
+    taker = Thread.new do
+      s = 0
+      while true
+	begin
+	  tuple = @ts.take([:req, Integer], 1.0)
+	  assert_equal(2, tuple[1])
+	  s += tuple[1]
+	rescue Rinda::RequestExpiredError
+	  break
+	end
+      end
+      @ts.write([:ans, s])
+      s
+    end
+
+    5.times do |n|
+      @ts.write([:req, 2])
+    end
+
+    sleep(20)
+    tuple = @ts.take([:ans, nil])
+    assert_equal(10, tuple[1])
+    assert_equal(10, taker.value)
+    assert_equal([], @ts.read_all([nil, nil]))
+  end
+  
+  def test_core_03_notify
+    notify1 = @ts.notify(nil, [:req, Integer])
+    notify2 = @ts.notify(nil, [:ans, Integer], 5)
+    notify3 = @ts.notify(nil, {"message"=>String, "name"=>String}, 5)
+
+    @ts.write({"message"=>"first", "name"=>"3"}, 3)
+    @ts.write({"message"=>"second", "name"=>"1"}, 1)
+    @ts.write({"message"=>"third", "name"=>"0"})
+    @ts.take({"message"=>"third", "name"=>"0"})
+
+    listener1 = Thread.new do
+      lv = 0
+      n = 0
+      notify1.each  do |ev, tuple|
+	n += 1
+	if ev == 'write'
+	  lv = lv + 1
+	elsif ev == 'take'
+	  lv = lv - 1
+	else
+	  break
+	end
+	assert(lv >= 0)
+	assert_equal([:req, 2], tuple)
+      end
+      [lv, n]
+    end
+
+    listener2 = Thread.new do
+      result = nil
+      lv = 0
+      n = 0
+      notify2.each  do |ev|
+	n += 1
+	if ev[0] == 'write'
+	  lv = lv + 1
+	elsif ev[0] == 'take'
+	  lv = lv - 1
+	elsif ev[0] == 'close'
+	  result = [lv, n]
+	else
+	  break
+	end
+	assert(lv >= 0)
+	assert_equal([:ans, 10], ev[1])
+      end
+      result
+    end
+
+    taker = Thread.new do
+      s = 0
+      while true
+	begin
+	  tuple = @ts.take([:req, Integer], 1.0)
+	  s += tuple[1]
+	rescue Rinda::RequestExpiredError
+	  break
+	end
+      end
+      @ts.write([:ans, s])
+      s
+    end
+
+    writer = Thread.new do
+      5.times do |n|
+	@ts.write([:req, 2])
+	sleep 0.1
+      end
+    end
+
+    @ts.take({"message"=>"first", "name"=>"3"})
+
+    sleep(4)
+    tuple = @ts.take([:ans, nil])
+    assert_equal(10, tuple[1])
+    assert_equal(10, taker.value)
+    assert_equal([], @ts.read_all([nil, nil]))
+    
+    notify1.cancel
+    sleep(3) # notify2 expired
+    
+    assert_equal([0, 11], listener1.value)
+    assert_equal([0, 3], listener2.value)
+
+    ary = []
+    ary.push(["write", {"message"=>"first", "name"=>"3"}])
+    ary.push(["write", {"message"=>"second", "name"=>"1"}])
+    ary.push(["write", {"message"=>"third", "name"=>"0"}])
+    ary.push(["take", {"message"=>"third", "name"=>"0"}])
+    ary.push(["take", {"message"=>"first", "name"=>"3"}])
+    ary.push(["delete", {"message"=>"second", "name"=>"1"}])
+    ary.push(["close"])
+
+    notify3.each do |ev|
+      assert_equal(ary.shift, ev)
+    end
+    assert_equal([], ary)
+  end
+
+  def test_cancel_01
+    entry = @ts.write([:removeme, 1])
+    assert_equal([[:removeme, 1]], @ts.read_all([nil, nil]))
+    entry.cancel
+    assert_equal([], @ts.read_all([nil, nil]))
+    
+    template = nil
+    taker = Thread.new do
+      @ts.take([:take, nil], 10) do |template|
+	Thread.new do
+	  sleep 0.2
+	  template.cancel
+	end
+      end
+    end
+    
+    sleep(1)
+    assert(template.canceled?)
+    
+    @ts.write([:take, 1])
+
+    assert_raises(Rinda::RequestCanceledError) do
+      assert_nil(taker.value)
+    end
+
+    assert_equal([[:take, 1]], @ts.read_all([nil, nil]))
+  end
+
+  def test_cancel_02
+    entry = @ts.write([:removeme, 1])
+    assert_equal([[:removeme, 1]], @ts.read_all([nil, nil]))
+    entry.cancel
+    assert_equal([], @ts.read_all([nil, nil]))
+
+    template = nil
+    reader = Thread.new do
+      @ts.read([:take, nil], 10) do |template|
+	Thread.new do
+	  sleep 0.2
+	  template.cancel
+	end
+      end
+    end
+
+    sleep(1)
+    assert(template.canceled?)
+    
+    @ts.write([:take, 1])
+
+    assert_raises(Rinda::RequestCanceledError) do
+      assert_nil(reader.value)
+    end
+
+    assert_equal([[:take, 1]], @ts.read_all([nil, nil]))
+  end
+
+  class SimpleRenewer
+    def initialize(sec, n = 1)
+      @sec = sec
+      @n = n
+    end
+    
+    def renew
+      return -1 if @n <= 0
+      @n -= 1
+      return @sec
+    end
+  end
+
+  def test_00_renewer
+    tuple = Rinda::TupleEntry.new([1,2,3], true)
+    assert(!tuple.canceled?)
+    assert(tuple.expired?)
+    assert(!tuple.alive?)
+    
+    tuple = Rinda::TupleEntry.new([1,2,3], 1)
+    assert(!tuple.canceled?)
+    assert(!tuple.expired?)
+    assert(tuple.alive?)
+    sleep(2)
+    assert(tuple.expired?)
+    assert(!tuple.alive?)
+
+    tuple = Rinda::TupleEntry.new([1,2,3], SimpleRenewer.new(1,2))
+    assert(!tuple.canceled?)
+    assert(!tuple.expired?)
+    assert(tuple.alive?)
+    sleep(1.5)
+    assert(!tuple.canceled?)
+    assert(!tuple.expired?)
+    assert(tuple.alive?)
+    sleep(1.5)
+    assert(tuple.expired?)
+    assert(!tuple.alive?)
+  end
+end
+
+class TupleSpaceTest < Test::Unit::TestCase
+  include TupleSpaceTestModule
+
+  def setup
+    ThreadGroup.new.add(Thread.current)
+    @ts = Rinda::TupleSpace.new(1)
+  end
+end
+
+class TupleSpaceProxyTest < Test::Unit::TestCase
+  include TupleSpaceTestModule
+
+  def setup
+    ThreadGroup.new.add(Thread.current)
+    @ts_base = Rinda::TupleSpace.new(1)
+    @ts = Rinda::TupleSpaceProxy.new(@ts_base)
+  end
+
+  def test_remote_array_and_hash
+    @ts.write(DRbObject.new([1, 2, 3]))
+    assert_equal([1, 2, 3], @ts.take([1, 2, 3], 0))
+    @ts.write(DRbObject.new({'head' => 1, 'tail' => 2}))
+    assert_equal({'head' => 1, 'tail' => 2},
+                 @ts.take({'head' => 1, 'tail' => 2}, 0))
+  end
+
+  @server = DRb.primary_server || DRb.start_service
+end
+
+end
+
diff --git a/ruby_1_8_6/test/rss/rss-assertions.rb b/ruby_1_8_6/test/rss/rss-assertions.rb
new file mode 100644
index 0000000000..1e926bb84d
--- /dev/null
+++ b/ruby_1_8_6/test/rss/rss-assertions.rb
@@ -0,0 +1,506 @@
+module Test
+  module Unit
+    module Assertions
+      # For backward compatibility
+      unless instance_methods.include?("assert_raise")
+        def assert_raise(*args, &block)
+          assert_raises(*args, &block)
+        end
+      end
+    end
+  end
+end
+
+module RSS
+  module Assertions
+    
+    def assert_parse(rss, assert_method, *args)
+      __send__("assert_#{assert_method}", *args) do
+        ::RSS::Parser.parse(rss)
+      end
+      __send__("assert_#{assert_method}", *args) do
+        ::RSS::Parser.parse(rss, false).validate
+      end
+    end
+    
+    def assert_ns(prefix, uri)
+      _wrap_assertion do
+        begin
+          yield
+          flunk("Not raise NSError")
+        rescue ::RSS::NSError => e
+          assert_equal(prefix, e.prefix)
+          assert_equal(uri, e.uri)
+        end
+      end
+    end
+    
+    def assert_missing_tag(tag, parent)
+      _wrap_assertion do
+        begin
+          yield
+          flunk("Not raise MissingTagError")
+        rescue ::RSS::MissingTagError => e
+          assert_equal(tag, e.tag)
+          assert_equal(parent, e.parent)
+        end
+      end
+    end
+    
+    def assert_too_much_tag(tag, parent)
+      _wrap_assertion do
+        begin
+          yield
+          flunk("Not raise TooMuchTagError")
+        rescue ::RSS::TooMuchTagError => e
+          assert_equal(tag, e.tag)
+          assert_equal(parent, e.parent)
+        end
+      end
+    end
+    
+    def assert_missing_attribute(tag, attrname)
+      _wrap_assertion do
+        begin
+          yield
+          flunk("Not raise MissingAttributeError")
+        rescue ::RSS::MissingAttributeError => e
+          assert_equal(tag, e.tag)
+          assert_equal(attrname, e.attribute)
+        end
+      end
+    end
+    
+    def assert_not_expected_tag(tag, uri, parent)
+      _wrap_assertion do
+        begin
+          yield
+          flunk("Not raise NotExpectedTagError")
+        rescue ::RSS::NotExpectedTagError => e
+          assert_equal(tag, e.tag)
+          assert_equal(uri, e.uri)
+          assert_equal(parent, e.parent)
+        end
+      end
+    end
+    
+    def assert_not_available_value(tag, value, attribute=nil)
+      _wrap_assertion do
+        begin
+          yield
+          flunk("Not raise NotAvailableValueError")
+        rescue ::RSS::NotAvailableValueError => e
+          assert_equal(tag, e.tag)
+          assert_equal(value, e.value)
+          assert_equal(attribute, e.attribute)
+        end
+      end
+    end
+
+    def assert_not_set_error(name, variables)
+      _wrap_assertion do
+        begin
+          yield
+          flunk("Not raise NotSetError")
+        rescue ::RSS::NotSetError => e
+          assert_equal(name, e.name)
+          assert_equal(variables.sort, e.variables.sort)
+        end
+      end
+    end
+    
+    def assert_xml_declaration(version, encoding, standalone, rss)
+      _wrap_assertion do
+        assert_equal(version, rss.version)
+        assert_equal(encoding, rss.encoding)
+        assert_equal(standalone, rss.standalone)
+      end
+    end
+    
+    def assert_xml_stylesheet_attrs(attrs, xsl)
+      _wrap_assertion do
+        n_attrs = normalized_attrs(attrs)
+        ::RSS::XMLStyleSheet::ATTRIBUTES.each do |name|
+          assert_equal(n_attrs[name], xsl.__send__(name))
+        end
+      end
+    end
+    
+    def assert_xml_stylesheet(target, attrs, xsl)
+      _wrap_assertion do
+        if attrs.has_key?(:href)
+          if !attrs.has_key?(:type) and attrs.has_key?(:guess_type)
+            attrs[:type] = attrs[:guess_type]
+          end
+          assert_equal("xml-stylesheet", target)
+          assert_xml_stylesheet_attrs(attrs, xsl)
+        else
+          assert_nil(target)
+          assert_equal("", xsl.to_s)
+        end
+      end
+    end
+    
+    def assert_xml_stylesheet_pis(attrs_ary, rss=nil)
+      _wrap_assertion do
+        rss ||= ::RSS::RDF.new()
+        xss_strs = []
+        attrs_ary.each do |attrs|
+          xss = ::RSS::XMLStyleSheet.new(*attrs)
+          xss_strs.push(xss.to_s)
+          rss.xml_stylesheets.push(xss)
+        end
+        pi_str = rss.to_s.gsub(/<\?xml .*\n/, "").gsub(/\s*<[^\?].*\z/m, "")
+        assert_equal(xss_strs.join("\n"), pi_str)
+      end
+    end
+
+    def assert_xml_stylesheets(attrs, xss)
+      _wrap_assertion do
+        xss.each_with_index do |xs, i|
+          assert_xml_stylesheet_attrs(attrs[i], xs)
+        end
+      end
+    end
+
+    
+    def assert_channel10(attrs, channel)
+      _wrap_assertion do
+        n_attrs = normalized_attrs(attrs)
+        
+        names = %w(about title link description)
+        assert_attributes(attrs, names, channel)
+
+        %w(image items textinput).each do |name|
+          value = n_attrs[name]
+          if value
+            target = channel.__send__(name)
+            __send__("assert_channel10_#{name}", value, target)
+          end
+        end
+      end
+    end
+
+    def assert_channel10_image(attrs, image)
+      _wrap_assertion do
+        assert_attributes(attrs, %w(resource), image)
+      end
+    end
+    
+    def assert_channel10_textinput(attrs, textinput)
+      _wrap_assertion do
+        assert_attributes(attrs, %w(resource), textinput)
+      end
+    end
+
+    def assert_channel10_items(attrs, items)
+      _wrap_assertion do
+        assert_equal(items.resources, items.Seq.lis.collect {|x| x.resource})
+        items.Seq.lis.each_with_index do |li, i|
+          assert_attributes(attrs[i], %w(resource), li)
+        end
+      end
+    end
+
+    def assert_image10(attrs, image)
+      _wrap_assertion do
+        names = %w(about title url link)
+        assert_attributes(attrs, names, image)
+      end
+    end
+
+    def assert_items10(attrs, items)
+      _wrap_assertion do
+        names = %w(about title link description)
+        items.each_with_index do |item, i|
+          assert_attributes(attrs[i], names, item)
+        end
+      end
+    end
+
+    def assert_textinput10(attrs, textinput)
+      _wrap_assertion do
+        names = %w(about title description name link)
+        assert_attributes(attrs, names, textinput)
+      end
+    end
+
+
+    def assert_channel09(attrs, channel)
+      _wrap_assertion do
+        n_attrs = normalized_attrs(attrs)
+
+        names = %w(title description link language rating
+                   copyright pubDate lastBuildDate docs
+                   managingEditor webMaster)
+        assert_attributes(attrs, names, channel)
+        
+        %w(skipHours skipDays).each do |name|
+          value = n_attrs[name]
+          if value
+            target = channel.__send__(name)
+            __send__("assert_channel09_#{name}", value, target)
+          end
+        end
+      end
+    end
+
+    def assert_channel09_skipDays(contents, skipDays)
+      _wrap_assertion do
+        days = skipDays.days
+        contents.each_with_index do |content, i|
+          assert_equal(content, days[i].content)
+        end
+      end
+    end
+    
+    def assert_channel09_skipHours(contents, skipHours)
+      _wrap_assertion do
+        hours = skipHours.hours
+        contents.each_with_index do |content, i|
+          assert_equal(content.to_i, hours[i].content)
+        end
+      end
+    end
+    
+    def assert_image09(attrs, image)
+      _wrap_assertion do
+        names = %w(url link title description)
+        names << ["width", :integer]
+        names << ["height", :integer]
+        assert_attributes(attrs, names, image)
+      end
+    end
+
+    def assert_items09(attrs, items)
+      _wrap_assertion do
+        names = %w(title link description)
+        items.each_with_index do |item, i|
+          assert_attributes(attrs[i], names, item)
+        end
+      end
+    end
+    
+    def assert_textinput09(attrs, textinput)
+      _wrap_assertion do
+        names = %w(title description name link)
+        assert_attributes(attrs, names, textinput)
+      end
+    end
+
+
+    def assert_channel20(attrs, channel)
+      _wrap_assertion do
+        n_attrs = normalized_attrs(attrs)
+        
+        names = %w(title link description language copyright
+                   managingEditor webMaster pubDate
+                   lastBuildDate generator docs rating)
+        names << ["ttl", :integer]
+        assert_attributes(attrs, names, channel)
+
+        %w(cloud categories skipHours skipDays).each do |name|
+          value = n_attrs[name]
+          if value
+            target = channel.__send__(name)
+            __send__("assert_channel20_#{name}", value, target)
+          end
+        end
+      end
+    end
+
+    def assert_channel20_skipDays(contents, skipDays)
+      assert_channel09_skipDays(contents, skipDays)
+    end
+    
+    def assert_channel20_skipHours(contents, skipHours)
+      assert_channel09_skipHours(contents, skipHours)
+    end
+    
+    def assert_channel20_cloud(attrs, cloud)
+      _wrap_assertion do
+        names = %w(domain path registerProcedure protocol)
+        names << ["port", :integer]
+        assert_attributes(attrs, names, cloud)
+      end
+    end
+    
+    def assert_channel20_categories(attrs, categories)
+      _wrap_assertion do
+        names = %w(domain content)
+        categories.each_with_index do |category, i|
+          assert_attributes(attrs[i], names, category)
+        end
+      end
+    end
+    
+    def assert_image20(attrs, image)
+      _wrap_assertion do
+        names = %w(url link title description)
+        names << ["width", :integer]
+        names << ["height", :integer]
+        assert_attributes(attrs, names, image)
+      end
+    end
+
+    def assert_items20(attrs, items)
+      _wrap_assertion do
+        names = %w(about title link description)
+        items.each_with_index do |item, i|
+          assert_attributes(attrs[i], names, item)
+
+          n_attrs = normalized_attrs(attrs[i])
+
+          %w(source enclosure categories guid).each do |name|
+            value = n_attrs[name]
+            if value
+              target = item.__send__(name)
+              __send__("assert_items20_#{name}", value, target)
+            end
+          end
+        end
+      end
+    end
+
+    def assert_items20_source(attrs, source)
+      _wrap_assertion do
+        assert_attributes(attrs, %w(url content), source)
+      end
+    end
+    
+    def assert_items20_enclosure(attrs, enclosure)
+      _wrap_assertion do
+        names = ["url", ["length", :integer], "type"]
+        assert_attributes(attrs, names, enclosure)
+      end
+    end
+    
+    def assert_items20_categories(attrs, categories)
+      _wrap_assertion do
+        assert_channel20_categories(attrs, categories)
+      end
+    end
+    
+    def assert_items20_guid(attrs, guid)
+      _wrap_assertion do
+        names = [["isPermaLink", :boolean], ["content"]]
+        assert_attributes(attrs, names, guid)
+      end
+    end
+
+    def assert_textinput20(attrs, textinput)
+      _wrap_assertion do
+        names = %w(title description name link)
+        assert_attributes(attrs, names, textinput)
+      end
+    end
+
+
+    def assert_dublin_core(elems, target)
+      _wrap_assertion do
+        elems.each do |name, value|
+          assert_equal(value, target.__send__("dc_#{name}"))
+        end
+      end
+    end
+    
+    def assert_multiple_dublin_core(elems, target)
+      _wrap_assertion do
+        elems.each do |name, values, plural|
+          plural ||= "#{name}s"
+          actual = target.__send__("dc_#{plural}").collect{|x| x.value}
+          assert_equal(values, actual)
+        end
+      end
+    end
+    
+    def assert_syndication(elems, target)
+      _wrap_assertion do
+        elems.each do |name, value|
+          meth = "sy_#{name}"
+          value = value.to_i if meth == "sy_updateFrequency"
+          assert_equal(value, target.__send__(meth ))
+        end
+      end
+    end
+    
+    def assert_content(elems, target)
+      _wrap_assertion do
+        elems.each do |name, value|
+          assert_equal(value, target.__send__("content_#{name}"))
+        end
+      end
+    end
+    
+    def assert_trackback(attrs, target)
+      _wrap_assertion do
+        n_attrs = normalized_attrs(attrs)
+        if n_attrs["ping"]
+          assert_equal(n_attrs["ping"], target.trackback_ping)
+        end
+        if n_attrs["abouts"]
+          n_attrs["abouts"].each_with_index do |about, i|
+            assert_equal(about, target.trackback_abouts[i].value)
+          end
+        end
+      end
+    end
+
+    def assert_taxo_topic(topics, target)
+      _wrap_assertion do
+        topics.each_with_index do |topic, i|
+          taxo_topic = target.taxo_topics[i]
+          topic.each do |name, value|
+            case name
+            when :link
+              assert_equal(value, taxo_topic.about)
+              assert_equal(value, taxo_topic.taxo_link)
+            when :topics
+              assert_equal(value, taxo_topic.taxo_topics.resources)
+            else
+              assert_equal(value, taxo_topic.__send__("dc_#{name}"))
+            end
+          end
+        end
+      end
+    end
+
+
+    def assert_attributes(attrs, names, target)
+      _wrap_assertion do
+        n_attrs = normalized_attrs(attrs)
+        names.each do |info|
+          if info.is_a?(String)
+            name = info
+            type = nil
+          else
+            name, type = info
+          end
+          value = n_attrs[name]
+          if value.is_a?(Time)
+            actual = target.__send__(name)
+            assert_instance_of(Time, actual)
+            assert_equal(value.to_i, actual.to_i)
+          elsif value
+            case type
+            when :integer
+              value = value.to_i
+            when :boolean
+              value = value == "true" if value.is_a?(String)
+            end
+            assert_equal(value, target.__send__(name))
+          end
+        end
+      end
+    end
+    
+    def normalized_attrs(attrs)
+      n_attrs = {}
+      attrs.each do |name, value|
+        n_attrs[name.to_s] = value
+      end
+      n_attrs
+    end
+    
+  end
+end
diff --git a/ruby_1_8_6/test/rss/rss-testcase.rb b/ruby_1_8_6/test/rss/rss-testcase.rb
new file mode 100644
index 0000000000..21670bc05c
--- /dev/null
+++ b/ruby_1_8_6/test/rss/rss-testcase.rb
@@ -0,0 +1,286 @@
+require "erb"
+
+require "test/unit"
+require 'rss-assertions'
+
+module RSS
+  class TestCase < Test::Unit::TestCase
+    include ERB::Util
+
+    include RSS
+    include Assertions
+
+    XMLDECL_VERSION = "1.0"
+    XMLDECL_ENCODING = "UTF-8"
+    XMLDECL_STANDALONE = "no"
+
+    RDF_ABOUT = "http://www.xml.com/xml/news.rss"
+    RDF_RESOURCE = "http://xml.com/universal/images/xml_tiny.gif"
+    TITLE_VALUE = "XML.com"
+    LINK_VALUE = "http://xml.com/pub"
+    URL_VALUE = "http://xml.com/universal/images/xml_tiny.gif"
+    NAME_VALUE = "hogehoge"
+    LANGUAGE_VALUE = "ja"
+    DESCRIPTION_VALUE = "
+    XML.com features a rich mix of information and services 
+    for the XML community.
+    "
+    RESOURCES = [
+      "http://xml.com/pub/2000/08/09/xslt/xslt.html",
+      "http://xml.com/pub/2000/08/09/rdfdb/index.html",
+    ]
+
+    CLOUD_DOMAIN = "data.ourfavoritesongs.com"
+    CLOUD_PORT = "80"
+    CLOUD_PATH = "/RPC2"
+    CLOUD_REGISTER_PROCEDURE = "ourFavoriteSongs.rssPleaseNotify"
+    CLOUD_PROTOCOL = "xml-rpc"
+    
+    ENCLOSURE_URL = "http://www.scripting.com/mp3s/weatherReportSuite.mp3"
+    ENCLOSURE_LENGTH = "12216320"
+    ENCLOSURE_TYPE = "audio/mpeg"
+    
+    CATEGORY_DOMAIN = "http://www.superopendirectory.com/"
+
+    def default_test
+      # This class isn't tested
+    end
+
+    private
+    def make_xmldecl(v=XMLDECL_VERSION, e=XMLDECL_ENCODING, s=XMLDECL_STANDALONE)
+      rv = "<?xml version='#{v}'"
+      rv << " encoding='#{e}'" if e
+      rv << " standalone='#{s}'" if s
+      rv << "?>"
+      rv
+    end
+
+    def make_RDF(content=nil, xmlns=[])
+      <<-EORSS
+#{make_xmldecl}
+<rdf:RDF xmlns="#{URI}" xmlns:rdf="#{RDF::URI}"
+#{xmlns.collect {|pre, uri| "xmlns:#{pre}='#{uri}'"}.join(' ')}>
+#{block_given? ? yield : content}
+</rdf:RDF>
+EORSS
+    end
+
+    def make_channel(content=nil)
+      <<-EOC
+<channel rdf:about="#{RDF_ABOUT}">
+  <title>#{TITLE_VALUE}</title>
+  <link>#{LINK_VALUE}</link>
+  <description>#{DESCRIPTION_VALUE}</description>
+
+  <image rdf:resource="#{RDF_RESOURCE}" />
+
+  <items>
+    <rdf:Seq>
+#{RESOURCES.collect do |res| '<rdf:li resource="' + res + '" />' end.join("\n")}
+    </rdf:Seq>
+  </items>
+
+  <textinput rdf:resource="#{RDF_RESOURCE}" />
+
+#{block_given? ? yield : content}
+</channel>
+EOC
+    end
+
+    def make_image(content=nil)
+      <<-EOI
+<image rdf:about="#{RDF_ABOUT}">
+  <title>#{TITLE_VALUE}</title>
+  <url>#{URL_VALUE}</url>
+  <link>#{LINK_VALUE}</link>
+#{block_given? ? yield : content}
+</image>
+EOI
+    end
+
+    def make_item(content=nil)
+      <<-EOI
+<item rdf:about="#{RDF_ABOUT}">
+  <title>#{TITLE_VALUE}</title>
+  <link>#{LINK_VALUE}</link>
+  <description>#{DESCRIPTION_VALUE}</description>
+#{block_given? ? yield : content}
+</item>
+EOI
+    end
+
+    def make_textinput(content=nil)
+      <<-EOT
+<textinput rdf:about="#{RDF_ABOUT}">
+  <title>#{TITLE_VALUE}</title>
+  <description>#{DESCRIPTION_VALUE}</description>
+  <name>#{NAME_VALUE}</name>
+  <link>#{LINK_VALUE}</link>
+#{block_given? ? yield : content}
+</textinput>
+EOT
+    end
+
+    def make_sample_RDF
+      make_RDF(<<-EOR)
+#{make_channel}
+#{make_image}
+#{make_item}
+#{make_textinput}
+EOR
+    end
+
+    def make_rss20(content=nil, xmlns=[])
+      <<-EORSS
+#{make_xmldecl}
+<rss version="2.0"
+#{xmlns.collect {|pre, uri| "xmlns:#{pre}='#{uri}'"}.join(' ')}>
+#{block_given? ? yield : content}
+</rss>
+EORSS
+    end
+
+    def make_sample_items20
+      RESOURCES.collect do |res|
+        elems = ["<link>#{res}</link>"]
+        elems << "<title>title of #{res}</title>"
+        elems = elems.join("\n")
+        item = "<item>\n#{elems}\n</item>"
+      end.join("\n")
+    end
+
+    def make_channel20(content=nil)
+      <<-EOC
+<channel>
+  <title>#{TITLE_VALUE}</title>
+  <link>#{LINK_VALUE}</link>
+  <description>#{DESCRIPTION_VALUE}</description>
+  <language>#{LANGUAGE_VALUE}</language>
+
+  <image>
+    <url>#{RDF_RESOURCE}</url>
+    <title>#{TITLE_VALUE}</title>
+    <link>#{LINK_VALUE}</link>
+  </image>
+
+#{make_sample_items20}
+
+  <textInput>
+    <title>#{TITLE_VALUE}</title>
+    <description>#{DESCRIPTION_VALUE}</description>
+    <name>#{NAME_VALUE}</name>
+    <link>#{RDF_RESOURCE}</link>
+  </textInput>
+
+#{block_given? ? yield : content}
+</channel>
+EOC
+    end
+
+    def make_item20(content=nil)
+      <<-EOI
+<item>
+  <title>#{TITLE_VALUE}</title>
+  <link>#{LINK_VALUE}</link>
+  <description>#{DESCRIPTION_VALUE}</description>
+#{block_given? ? yield : content}
+</item>
+EOI
+    end
+
+    def make_cloud20
+      <<-EOC
+<cloud
+  domain="#{CLOUD_DOMAIN}"
+  port="#{CLOUD_PORT}"
+  path="#{CLOUD_PATH}"
+  registerProcedure="#{CLOUD_REGISTER_PROCEDURE}"
+  protocol="#{CLOUD_PROTOCOL}" />
+EOC
+    end
+
+    def make_sample_rss20
+      make_rss20(<<-EOR)
+#{make_channel20}
+EOR
+    end
+
+    def make_element(elem_name, attrs, contents)
+      attrs_str = attrs.collect do |name, value|
+        "#{h name}='#{h value}'"
+      end.join(" ")
+      contents_str = contents.collect do |name, value|
+        "#{Element::INDENT}<#{h name}>#{h value}</#{h name}>"
+      end.join("\n")
+
+      "<#{h elem_name} #{attrs_str}>\n#{contents_str}\n</#{h elem_name}>"
+    end
+    
+    private
+    def setup_dummy_channel(maker)
+      about = "http://hoge.com"
+      title = "fugafuga"
+      link = "http://hoge.com"
+      description = "fugafugafugafuga"
+      language = "ja"
+
+      maker.channel.about = about
+      maker.channel.title = title
+      maker.channel.link = link
+      maker.channel.description = description
+      maker.channel.language = language
+    end
+
+    def setup_dummy_image(maker)
+      title = "fugafuga"
+      link = "http://hoge.com"
+      url = "http://hoge.com/hoge.png"
+
+      maker.channel.link = link if maker.channel.link.nil?
+      
+      maker.image.title = title
+      maker.image.url = url
+    end
+
+    def setup_dummy_textinput(maker)
+      title = "fugafuga"
+      description = "text hoge fuga"
+      name = "hoge"
+      link = "http://hoge.com/search.cgi"
+
+      maker.textinput.title = title
+      maker.textinput.description = description
+      maker.textinput.name = name
+      maker.textinput.link = link
+    end
+
+    def setup_dummy_item(maker)
+      title = "TITLE"
+      link = "http://hoge.com/"
+
+      item = maker.items.new_item
+      item.title = title
+      item.link = link
+    end
+    
+    def setup_taxo_topic(target, topics)
+      topics.each do |topic|
+        taxo_topic = target.taxo_topics.new_taxo_topic
+        topic.each do |name, value|
+          case name
+          when :link
+            taxo_topic.taxo_link = value
+          when :topics
+            value.each do |t|
+              taxo_topic.taxo_topics << t
+            end
+          else
+            dc_elems = taxo_topic.__send__("dc_#{name}s")
+            dc_elem = dc_elems.__send__("new_#{name}")
+            dc_elem.value = value
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_1.0.rb b/ruby_1_8_6/test/rss/test_1.0.rb
new file mode 100644
index 0000000000..ff3c8a402e
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_1.0.rb
@@ -0,0 +1,249 @@
+require "rexml/document"
+
+require "rss-testcase"
+
+require "rss/1.0"
+
+module RSS
+  class TestRSS10Core < TestCase
+    
+    def setup
+      @rdf_prefix = "rdf"
+      @rdf_uri = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+      @uri = "http://purl.org/rss/1.0/"
+    end
+    
+    def test_RDF
+      version = "1.0"
+      encoding = "UTF-8"
+      standalone = false
+      
+      rdf = RDF.new(version, encoding, standalone)
+      
+      doc = REXML::Document.new(rdf.to_s(false))
+      
+      xmldecl = doc.xml_decl
+      
+      %w(version encoding).each do |x|
+        assert_equal(instance_eval(x), xmldecl.__send__(x))
+      end
+      assert_equal(standalone, !xmldecl.standalone.nil?)
+      
+      assert_equal(@rdf_uri, doc.root.namespace)
+    end
+    
+    def test_not_displayed_xml_stylesheets
+      rdf = RDF.new()
+      plain_rdf = rdf.to_s
+      3.times do
+        rdf.xml_stylesheets.push(XMLStyleSheet.new)
+        assert_equal(plain_rdf, rdf.to_s)
+      end
+    end
+    
+    def test_xml_stylesheets
+      [
+        [{:href => "a.xsl", :type => "text/xsl"}],
+        [
+          {:href => "a.xsl", :type => "text/xsl"},
+          {:href => "a.css", :type => "text/css"},
+        ],
+      ].each do |attrs_ary|
+        assert_xml_stylesheet_pis(attrs_ary)
+      end
+    end
+    
+    def test_channel
+      about = "http://hoge.com"
+      title = "fugafuga"
+      link = "http://hoge.com"
+      description = "fugafugafugafuga"
+      resource = "http://hoge.com/hoge.png"
+      image = RDF::Channel::Image.new(resource)
+      items = RDF::Channel::Items.new
+      textinput = RDF::Channel::Textinput.new(resource)
+      
+      channel = RDF::Channel.new(about)
+      %w(title link description image items textinput).each do |x|
+        channel.__send__("#{x}=", instance_eval(x))
+      end
+      
+      doc = REXML::Document.new(make_RDF(channel.to_s))
+      c = doc.root.elements[1]
+      
+      assert_equal(about, c.attributes["about"])
+      %w(title link description image textinput).each do |x|
+        elem = c.elements[x]
+        assert_equal(x, elem.name)
+        assert_equal(@uri, elem.namespace)
+        if x == "image" or x == "textinput"
+          excepted = resource
+          res = elem.attributes.get_attribute("resource")
+          assert_equal(@rdf_uri, res.namespace)
+          value = res.value
+        else
+          excepted = instance_eval(x)
+          value = elem.text
+        end
+        assert_equal(excepted, value)
+      end
+      assert_equal(@uri, c.elements["items"].namespace)
+      assert_equal("items", c.elements["items"].name)
+    end
+    
+    def test_channel_image
+      resource = "http://hoge.com/hoge.png"
+      image = RDF::Channel::Image.new(resource)
+      
+      doc = REXML::Document.new(make_RDF(image.to_s))
+      i = doc.root.elements[1]
+      
+      assert_equal("image", i.name)
+      assert_equal(@uri, i.namespace)
+      
+      res = i.attributes.get_attribute("resource")
+      
+      assert_equal(@rdf_uri, res.namespace)
+      assert_equal(resource, res.value)
+    end
+    
+    def test_channel_textinput
+      resource = "http://hoge.com/hoge.png"
+      textinput = RDF::Channel::Textinput.new(resource)
+      
+      doc = REXML::Document.new(make_RDF(textinput.to_s))
+      t = doc.root.elements[1]
+      
+      assert_equal("textinput", t.name)
+      assert_equal(@uri, t.namespace)
+      
+      res = t.attributes.get_attribute("resource")
+      
+      assert_equal(@rdf_uri, res.namespace)
+      assert_equal(resource, res.value)
+    end
+    
+    def test_items
+      items = RDF::Channel::Items.new
+      
+      doc = REXML::Document.new(make_RDF(items.to_s))
+      i = doc.root.elements[1]
+      
+      assert_equal("items", i.name)
+      assert_equal(@uri, i.namespace)
+      
+      assert_equal(1, i.elements.size)
+      assert_equal("Seq", i.elements[1].name)
+      assert_equal(@rdf_uri, i.elements[1].namespace)
+    end
+    
+    def test_seq
+      seq = RDF::Seq.new
+      
+      doc = REXML::Document.new(make_RDF(seq.to_s))
+      s = doc.root.elements[1]
+      
+      assert_equal("Seq", s.name)
+      assert_equal(@rdf_uri, s.namespace)
+    end
+    
+    def test_li
+      resource = "http://hoge.com/"
+      li = RDF::Li.new(resource)
+      
+      doc = REXML::Document.new(make_RDF(li.to_s))
+      l = doc.root.elements[1]
+      
+      assert_equal("li", l.name)
+      assert_equal(@rdf_uri, l.namespace(l.prefix))
+      
+      res = l.attributes.get_attribute("resource")
+      
+      assert_equal('', res.instance_eval("@prefix"))
+      assert_equal(resource, res.value)
+    end
+    
+    def test_image
+      about = "http://hoge.com"
+      title = "fugafuga"
+      url = "http://hoge.com/hoge"
+      link = "http://hoge.com/fuga"
+      
+      image = RDF::Image.new(about)
+      %w(title url link).each do |x|
+        image.__send__("#{x}=", instance_eval(x))
+      end
+      
+      doc = REXML::Document.new(make_RDF(image.to_s))
+      i = doc.root.elements[1]
+      
+      assert_equal(about, i.attributes["about"])
+      %w(title url link).each do |x|
+        elem = i.elements[x]
+        assert_equal(x, elem.name)
+        assert_equal(@uri, elem.namespace)
+        assert_equal(instance_eval(x), elem.text)
+      end
+    end
+    
+    def test_item
+      about = "http://hoge.com"
+      title = "fugafuga"
+      link = "http://hoge.com/fuga"
+      description = "hogehogehoge"
+      
+      item = RDF::Item.new(about)
+      %w(title link description).each do |x|
+        item.__send__("#{x}=", instance_eval(x))
+      end
+      
+      doc = REXML::Document.new(make_RDF(item.to_s))
+      i = doc.root.elements[1]
+      
+      assert_equal(about, i.attributes["about"])
+      %w(title link description).each do |x|
+        elem = i.elements[x]
+        assert_equal(x, elem.name)
+        assert_equal(@uri, elem.namespace)
+        assert_equal(instance_eval(x), elem.text)
+      end
+    end
+    
+    def test_textinput
+      about = "http://hoge.com"
+      title = "fugafuga"
+      link = "http://hoge.com/fuga"
+      name = "foo"
+      description = "hogehogehoge"
+      
+      textinput = RDF::Textinput.new(about)
+      %w(title link name description).each do |x|
+        textinput.__send__("#{x}=", instance_eval(x))
+      end
+      
+      doc = REXML::Document.new(make_RDF(textinput.to_s))
+      t = doc.root.elements[1]
+      
+      assert_equal(about, t.attributes["about"])
+      %w(title link name description).each do |x|
+        elem = t.elements[x]
+        assert_equal(x, elem.name)
+        assert_equal(@uri, elem.namespace)
+        assert_equal(instance_eval(x), elem.text)
+      end
+    end
+
+    def test_to_xml
+      rss = RSS::Parser.parse(make_sample_RDF)
+      assert_equal(rss.to_s, rss.to_xml)
+      assert_equal(rss.to_s, rss.to_xml("1.0"))
+      rss09 = rss.to_xml("0.91") do |maker|
+        maker.channel.language = "en-us"
+      end
+      rss09 = RSS::Parser.parse(rss09)
+      assert_equal("0.91", rss09.rss_version)
+      rss20 = RSS::Parser.parse(rss.to_xml("2.0"))
+      assert_equal("2.0", rss20.rss_version)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_2.0.rb b/ruby_1_8_6/test/rss/test_2.0.rb
new file mode 100644
index 0000000000..d39c297ab7
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_2.0.rb
@@ -0,0 +1,390 @@
+require "rexml/document"
+
+require "rss-testcase"
+
+require "rss/2.0"
+
+module RSS
+  class TestRSS20Core < TestCase
+
+    def setup
+      @rss_version = "2.0"
+    end
+    
+    def test_Rss
+      version = "1.0"
+      encoding = "UTF-8"
+      standalone = false
+      
+      rss = Rss.new(@rss_version, version, encoding, standalone)
+      
+      doc = REXML::Document.new(rss.to_s(false))
+      
+      xmldecl = doc.xml_decl
+      
+      %w(version encoding).each do |x|
+        assert_equal(instance_eval(x), xmldecl.__send__(x))
+      end
+      assert_equal(standalone, !xmldecl.standalone.nil?)
+      
+      assert_equal("", doc.root.namespace)
+      assert_equal(@rss_version, doc.root.attributes["version"])
+    end
+    
+    def test_not_displayed_xml_stylesheets
+      rss = Rss.new(@rss_version)
+      plain_rss = rss.to_s
+      3.times do
+        rss.xml_stylesheets.push(XMLStyleSheet.new)
+        assert_equal(plain_rss, rss.to_s)
+      end
+    end
+    
+    def test_xml_stylesheets
+      [
+        [{:href => "a.xsl", :type => "text/xsl"}],
+        [
+          {:href => "a.xsl", :type => "text/xsl"},
+          {:href => "a.css", :type => "text/css"},
+        ],
+      ].each do |attrs_ary|
+        assert_xml_stylesheet_pis(attrs_ary, Rss.new(@rss_version))
+      end
+    end
+
+    def test_channel
+      title = "fugafuga"
+      link = "http://hoge.com"
+      description = "fugafugafugafuga"
+      
+      language = "en-us"
+      copyright = "Copyright 2002, Spartanburg Herald-Journal"
+      managingEditor = "geo@herald.com (George Matesky)"
+      webMaster = "betty@herald.com (Betty Guernsey)"
+      pubDate = Time.parse("Sat, 07 Sep 2002 00:00:01 GMT")
+      lastBuildDate = Time.parse("Sat, 07 Sep 2002 09:42:31 GMT")
+      categories = [
+        {
+          :content => "Newspapers",
+        },
+        {
+          :domain => "Syndic8",
+          :content => "1765",
+        }
+      ]
+      generator = "MightyInHouse Content System v2.3"
+      docs = "http://blogs.law.harvard.edu/tech/rss"
+
+      ttl = "60"
+
+      rating = '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))'
+
+      channel = Rss::Channel.new
+      
+      elems = %w(title link description language copyright
+                 managingEditor webMaster pubDate lastBuildDate
+                 generator docs ttl rating)
+      elems.each do |x|
+        value = instance_eval(x)
+        value = value.rfc822 if %w(pubDate lastBuildDate).include?(x)
+        channel.__send__("#{x}=", value)
+      end
+      categories.each do |cat|
+        channel.categories << Rss::Channel::Category.new(cat[:domain],
+                                                         cat[:content])
+      end
+      
+      doc = REXML::Document.new(make_rss20(channel.to_s))
+      c = doc.root.elements[1]
+      
+      elems.each do |x|
+        elem = c.elements[x]
+        assert_equal(x, elem.name)
+        assert_equal("", elem.namespace)
+        expected = instance_eval(x)
+        case x
+        when "pubDate", "lastBuildDate"
+          assert_equal(expected, Time.parse(elem.text))
+        when "ttl"
+          expected = channel.__send__(x)
+          assert_equal(expected, elem.text.to_i)
+        else
+          assert_equal(expected, elem.text)
+        end
+      end
+      categories.each_with_index do |cat, i|
+        cat = cat.dup
+        cat[:domain] ||= nil
+        category = c.elements["category[#{i+1}]"]
+        actual = {
+          :domain => category.attributes["domain"],
+          :content => category.text,
+        }
+        assert_equal(cat, actual)
+      end
+    end
+
+    def test_channel_cloud
+      cloud_params = {
+        :domain => "rpc.sys.com",
+        :port => "80",
+        :path => "/RPC2",
+        :registerProcedure => "myCloud.rssPleaseNotify",
+        :protocol => "xml-rpc",
+      }
+      cloud = Rss::Channel::Cloud.new(cloud_params[:domain],
+                                      cloud_params[:port],
+                                      cloud_params[:path],
+                                      cloud_params[:registerProcedure],
+                                      cloud_params[:protocol])
+      cloud_params[:port] = cloud.port
+      
+      doc = REXML::Document.new(cloud.to_s)
+      cloud_elem = doc.root
+      
+      actual = {}
+      cloud_elem.attributes.each do |name, value|
+        value = value.to_i if name == "port"
+        actual[name.intern] = value
+      end
+      assert_equal(cloud_params, actual)
+    end
+
+    def test_channel_image
+      image_params = {
+        :url => "http://hoge.com/hoge.png",
+        :title => "fugafuga",
+        :link => "http://hoge.com",
+        :width => "144",
+        :height => "400",
+        :description => "an image",
+      }
+      image = Rss::Channel::Image.new(image_params[:url],
+                                      image_params[:title],
+                                      image_params[:link],
+                                      image_params[:width],
+                                      image_params[:height],
+                                      image_params[:description])
+
+      doc = REXML::Document.new(image.to_s)
+      image_elem = doc.root
+      
+      image_params.each do |name, value|
+        value = image.__send__(name)
+        actual = image_elem.elements[name.to_s].text
+        actual = actual.to_i if [:width, :height].include?(name)
+        assert_equal(value, actual)
+      end
+    end
+    
+    def test_channel_textInput
+      textInput_params = {
+        :title => "fugafuga",
+        :description => "text hoge fuga",
+        :name => "hoge",
+        :link => "http://hoge.com",
+      }
+      textInput = Rss::Channel::TextInput.new(textInput_params[:title],
+                                              textInput_params[:description],
+                                              textInput_params[:name],
+                                              textInput_params[:link])
+
+      doc = REXML::Document.new(textInput.to_s)
+      input_elem = doc.root
+      
+      textInput_params.each do |name, value|
+        actual = input_elem.elements[name.to_s].text
+        assert_equal(value, actual)
+      end
+    end
+    
+    def test_channel_skip_days
+      skipDays_values = [
+        "Sunday",
+        "Monday",
+      ]
+      skipDays = Rss::Channel::SkipDays.new
+      skipDays_values.each do |value|
+        skipDays.days << Rss::Channel::SkipDays::Day.new(value)
+      end
+      
+      doc = REXML::Document.new(skipDays.to_s)
+      days_elem = doc.root
+      
+      skipDays_values.each_with_index do |value, i|
+        assert_equal(value, days_elem.elements[i + 1].text)
+      end
+    end
+    
+    def test_channel_skip_hours
+      skipHours_values = [
+        "0",
+        "13",
+      ]
+      skipHours = Rss::Channel::SkipHours.new
+      skipHours_values.each do |value|
+        skipHours.hours << Rss::Channel::SkipHours::Hour.new(value)
+      end
+
+      doc = REXML::Document.new(skipHours.to_s)
+      hours_elem = doc.root
+      
+      skipHours_values.each_with_index do |value, i|
+        expected = skipHours.hours[i].content
+        assert_equal(expected, hours_elem.elements[i + 1].text.to_i)
+      end
+    end
+
+    def test_item
+      title = "fugafuga"
+      link = "http://hoge.com/"
+      description = "text hoge fuga"
+      author = "oprah@oxygen.net"
+      categories = [
+        {
+          :content => "Newspapers",
+        },
+        {
+          :domain => "Syndic8",
+          :content => "1765",
+        }
+      ]
+      comments = "http://www.myblog.org/cgi-local/mt/mt-comments.cgi?entry_id=290"
+      pubDate = Time.parse("Sat, 07 Sep 2002 00:00:01 GMT")
+
+      channel = Rss::Channel.new
+      item = Rss::Channel::Item.new
+      channel.items << item
+      
+      elems = %w(title link description author comments pubDate)
+      elems.each do |x|
+        value = instance_eval(x)
+        value = value.rfc822 if x == "pubDate"
+        item.__send__("#{x}=", value)
+      end
+      categories.each do |cat|
+        item.categories << Rss::Channel::Category.new(cat[:domain],
+                                                      cat[:content])
+      end
+      
+      doc = REXML::Document.new(channel.to_s)
+      channel_elem = doc.root
+
+      item_elem = channel_elem.elements["item[1]"]
+      elems.each do |x|
+        elem = item_elem.elements[x]
+        assert_equal(x, elem.name)
+        assert_equal("", elem.namespace)
+        expected = instance_eval(x)
+        case x
+        when "pubDate"
+          assert_equal(expected, Time.parse(elem.text))
+        else
+          assert_equal(expected, elem.text)
+        end
+      end
+      categories.each_with_index do |cat, i|
+        cat = cat.dup
+        cat[:domain] ||= nil
+        category = item_elem.elements["category[#{i+1}]"]
+        actual = {
+          :domain => category.attributes["domain"],
+          :content => category.text,
+        }
+        assert_equal(cat, actual)
+      end
+    end
+
+    def test_item_enclosure
+      enclosure_params = {
+        :url => "http://www.scripting.com/mp3s/weatherReportSuite.mp3",
+        :length => "12216320",
+        :type => "audio/mpeg",
+      }
+
+      enclosure = Rss::Channel::Item::Enclosure.new(enclosure_params[:url],
+                                                    enclosure_params[:length],
+                                                    enclosure_params[:type])
+      enclosure_params[:length] = enclosure.length
+      
+      doc = REXML::Document.new(enclosure.to_s)
+      enclosure_elem = doc.root
+
+      actual = {}
+      enclosure_elem.attributes.each do |name, value|
+        value = value.to_i if name == "length"
+        actual[name.intern] = value
+      end
+      assert_equal(enclosure_params, actual)
+    end
+    
+    def test_item_guid
+      test_params = [
+        {
+          :content => "http://some.server.com/weblogItem3207",
+        },
+        {
+          :isPermaLink => "true",
+          :content => "http://inessential.com/2002/09/01.php#a2",
+        },
+      ]
+
+      test_params.each do |guid_params|
+        guid = Rss::Channel::Item::Guid.new(guid_params[:isPermaLink],
+                                            guid_params[:content])
+        if guid_params.has_key?(:isPermaLink)
+          guid_params[:isPermaLink] = guid.isPermaLink
+        end
+        if guid.isPermaLink.nil?
+          assert_equal(true, guid.PermaLink?)
+        else
+          assert_equal(guid.isPermaLink, guid.PermaLink?)
+        end
+        
+        doc = REXML::Document.new(guid.to_s)
+        guid_elem = doc.root
+      
+        actual = {}
+        actual[:content] = guid_elem.text if guid_elem.text
+        guid_elem.attributes.each do |name, value|
+          value = value == "true" if name == "isPermaLink"
+          actual[name.intern] = value
+        end
+        assert_equal(guid_params, actual)
+      end
+    end
+    
+    def test_item_source
+      source_params = {
+        :url => "http://www.tomalak.org/links2.xml",
+        :content => "Tomalak's Realm",
+      }
+
+      source = Rss::Channel::Item::Source.new(source_params[:url],
+                                              source_params[:content])
+
+      doc = REXML::Document.new(source.to_s)
+      source_elem = doc.root
+      
+      actual = {}
+      actual[:content] = source_elem.text
+      source_elem.attributes.each do |name, value|
+        actual[name.intern] = value
+      end
+      assert_equal(source_params, actual)
+    end
+
+    def test_to_xml
+      rss = RSS::Parser.parse(make_sample_rss20)
+      assert_equal(rss.to_s, rss.to_xml)
+      assert_equal(rss.to_s, rss.to_xml("2.0"))
+      rss09 = RSS::Parser.parse(rss.to_xml("0.91"))
+      assert_equal("0.91", rss09.rss_version)
+      rss10 = rss.to_xml("1.0") do |maker|
+        maker.channel.about = "http://www.example.com/index.rdf"
+      end
+      rss10 = RSS::Parser.parse(rss10)
+      assert_equal("1.0", rss10.rss_version)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_accessor.rb b/ruby_1_8_6/test/rss/test_accessor.rb
new file mode 100644
index 0000000000..ceb31fc9c2
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_accessor.rb
@@ -0,0 +1,103 @@
+require "rss-testcase"
+
+require "rss/1.0"
+require "rss/2.0"
+require "rss/syndication"
+require "rss/image"
+
+module RSS
+  class TestAccessor < TestCase
+    def test_date
+      channel = Rss::Channel.new
+      channel.pubDate = nil
+      assert_nil(channel.pubDate)
+      
+      time = Time.now
+      channel.pubDate = time
+      assert_equal(time, channel.pubDate)
+      
+      time = Time.parse(Time.now.rfc822)
+      channel.pubDate = time.rfc822
+      assert_equal(time, channel.pubDate)
+
+      time = Time.parse(Time.now.iso8601)
+      value = time.iso8601
+      assert_not_available_value("pubDate", value) do
+        channel.pubDate = value
+      end
+      
+      channel.do_validate = false
+      time = Time.parse(Time.now.iso8601)
+      value = time.iso8601
+      channel.pubDate = value
+      assert_equal(time, channel.pubDate)
+      
+      channel.pubDate = nil
+      assert_nil(channel.pubDate)
+    end
+    
+    def test_integer
+      image_item = RDF::Item::ImageItem.new
+
+      image_item.width = nil
+      assert_nil(image_item.width)
+      
+      width = 10
+      image_item.width = width
+      assert_equal(width, image_item.width)
+      
+      width = 10.0
+      image_item.width = width
+      assert_equal(width, image_item.width)
+      
+      width = "10"
+      image_item.width = width
+      assert_equal(width.to_i, image_item.width)
+      
+      width = "10.0"
+      assert_not_available_value("image:width", width) do
+        image_item.width = width
+      end
+
+      image_item.do_validate = false
+      width = "10.0"
+      image_item.width = width
+      assert_equal(width.to_i, image_item.width)
+      
+      image_item.width = nil
+      assert_nil(image_item.width)
+    end
+    
+    def test_positive_integer
+      channel = RDF::Channel.new
+
+      channel.sy_updateFrequency = nil
+      assert_nil(channel.sy_updateFrequency)
+      
+      freq = 10
+      channel.sy_updateFrequency = freq
+      assert_equal(freq, channel.sy_updateFrequency)
+      
+      freq = 10.0
+      channel.sy_updateFrequency = freq
+      assert_equal(freq, channel.sy_updateFrequency)
+      
+      freq = "10"
+      channel.sy_updateFrequency = freq
+      assert_equal(freq.to_i, channel.sy_updateFrequency)
+      
+      freq = "10.0"
+      assert_not_available_value("sy:updateFrequency", freq) do
+        channel.sy_updateFrequency = freq
+      end
+
+      channel.do_validate = false
+      freq = "10.0"
+      channel.sy_updateFrequency = freq
+      assert_equal(freq.to_i, channel.sy_updateFrequency)
+      
+      channel.sy_updateFrequency = nil
+      assert_nil(channel.sy_updateFrequency)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_content.rb b/ruby_1_8_6/test/rss/test_content.rb
new file mode 100644
index 0000000000..70d456fa2f
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_content.rb
@@ -0,0 +1,94 @@
+require "cgi"
+require "rexml/document"
+
+require "rss-testcase"
+
+require "rss/1.0"
+require "rss/content"
+
+module RSS
+  class TestContent < TestCase
+    
+    def setup
+      @prefix = "content"
+      @uri = "http://purl.org/rss/1.0/modules/content/"
+      
+      @parents = %w(item)
+      
+      @elems = {
+        :encoded => "<em>ATTENTION</em>",
+      }
+      
+      @content_nodes = @elems.collect do |name, value|
+        "<#{@prefix}:#{name}>#{CGI.escapeHTML(value.to_s)}</#{@prefix}:#{name}>"
+      end.join("\n")
+      
+      @rss_source = make_RDF(<<-EOR, {@prefix =>  @uri})
+#{make_channel()}
+#{make_image()}
+#{make_item(@content_nodes)}
+#{make_textinput()}
+EOR
+
+      @rss = Parser.parse(@rss_source)
+    end
+  
+    def test_parser
+
+      assert_nothing_raised do
+        Parser.parse(@rss_source)
+      end
+    
+      @elems.each do |tag, value|
+        assert_too_much_tag(tag.to_s, "item") do
+          Parser.parse(make_RDF(<<-EOR, {@prefix => @uri}))
+#{make_channel()}
+#{make_item(("<" + @prefix + ":" + tag.to_s + ">" +
+  CGI.escapeHTML(value.to_s) +
+  "</" + @prefix + ":" + tag.to_s + ">") * 2)}
+EOR
+        end
+      end
+
+    end
+  
+    def test_accessor
+    
+      new_value = {
+        :encoded => "<![CDATA[<it>hoge</it>]]>",
+      }
+
+      @elems.each do |name, value|
+        @parents.each do |parent|
+          meth = "#{RSS::CONTENT_PREFIX}_#{name}"
+          assert_equal(value, @rss.__send__(parent).__send__(meth))
+          @rss.__send__(parent).__send__("#{meth}=", new_value[name].to_s)
+          assert_equal(new_value[name], @rss.__send__(parent).__send__(meth))
+        end
+      end
+
+    end
+    
+    def test_to_s
+      @elems.each do |name, value|
+        excepted = "<#{@prefix}:#{name}>#{CGI.escapeHTML(value)}</#{@prefix}:#{name}>"
+        @parents.each do |parent|
+          meth = "#{RSS::CONTENT_PREFIX}_#{name}_element"
+          assert_equal(excepted, @rss.__send__(parent).__send__(meth))
+        end
+      end
+
+      REXML::Document.new(@rss_source).root.each_element do |parent|
+        if @parents.include?(parent.name)
+          parent.each_element do |elem|
+            if elem.namespace == @uri
+              assert_equal(elem.text, @elems[elem.name.intern].to_s)
+            end
+          end
+        end
+      end
+      
+    end
+  
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_dublincore.rb b/ruby_1_8_6/test/rss/test_dublincore.rb
new file mode 100644
index 0000000000..e5a4919362
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_dublincore.rb
@@ -0,0 +1,189 @@
+require "cgi"
+require "rexml/document"
+
+require "rss-testcase"
+
+require "rss/1.0"
+require "rss/dublincore"
+
+module RSS
+  class TestDublinCore < TestCase
+
+    def setup
+      @prefix = "dc"
+      @uri = "http://purl.org/dc/elements/1.1/"
+      
+      @parents = %w(channel image item textinput)
+      
+      t = Time.iso8601("2000-01-01T12:00:05+00:00")
+      class << t
+        alias_method(:to_s, :iso8601)
+      end
+      
+      @elems = {
+        :title => "hoge",
+        :description =>
+          " XML is placing increasingly heavy loads on
+          the existing technical infrastructure of the Internet.",
+        :creator => "Rael Dornfest (mailto:rael@oreilly.com)",
+        :subject => "XML",
+        :publisher => "The O'Reilly Network",
+        :contributor => "hogehoge",
+        :type => "fugafuga",
+        :format => "hohoho",
+        :identifier => "fufufu",
+        :source => "barbar",
+        :language => "ja",
+        :relation => "cococo",
+        :rights => "Copyright (c) 2000 O'Reilly &amp; Associates, Inc.",
+        :date => t,
+      }
+
+      @dc_nodes = @elems.collect do |name, value|
+        "<#{@prefix}:#{name}>#{value}</#{@prefix}:#{name}>"
+      end.join("\n")
+
+      @rss_source = make_RDF(<<-EOR, {@prefix =>  @uri})
+#{make_channel(@dc_nodes)}
+#{make_image(@dc_nodes)}
+#{make_item(@dc_nodes)}
+#{make_textinput(@dc_nodes)}
+EOR
+
+      @rss = Parser.parse(@rss_source)
+    end
+  
+    def test_parser
+      assert_nothing_raised do
+        Parser.parse(@rss_source)
+      end
+    
+      @elems.each do |tag, value|
+        rss = nil
+        assert_nothing_raised do
+          rss = Parser.parse(make_RDF(<<-EOR, {@prefix => @uri}))
+#{make_channel(("<" + @prefix + ":" + tag.to_s + ">" +
+  value.to_s +
+  "</" + @prefix + ":" + tag.to_s + ">") * 2)}
+#{make_item}
+EOR
+        end
+        plural_reader = "dc_#{tag}" + (tag == :rights ? "es" : "s")
+        values = rss.channel.__send__(plural_reader).collect do |x|
+          val = x.value
+          if val.kind_of?(String)
+            CGI.escapeHTML(val)
+          else
+            val
+          end
+        end
+        assert_equal([value, value], values)
+      end
+
+    end
+
+    def test_singular_accessor
+      new_value = "hoge"
+
+      @elems.each do |name, value|
+        @parents.each do |parent|
+          parsed_value = @rss.__send__(parent).__send__("dc_#{name}")
+          if parsed_value.kind_of?(String)
+            parsed_value = CGI.escapeHTML(parsed_value)
+          end
+          assert_equal(value, parsed_value)
+          if name == :date
+            t = Time.iso8601("2003-01-01T02:30:23+09:00")
+            class << t
+              alias_method(:to_s, :iso8601)
+            end
+            @rss.__send__(parent).__send__("dc_#{name}=", t.iso8601)
+            assert_equal(t, @rss.__send__(parent).__send__("dc_#{name}"))
+            assert_equal(t, @rss.__send__(parent).date)
+            
+            @rss.__send__(parent).date = value
+            assert_equal(value, @rss.__send__(parent).date)
+            assert_equal(value, @rss.__send__(parent).__send__("dc_#{name}"))
+          else
+            @rss.__send__(parent).__send__("dc_#{name}=", new_value)
+            assert_equal(new_value,
+                         @rss.__send__(parent).__send__("dc_#{name}"))
+          end
+        end
+      end
+    end
+
+    def test_plural_accessor
+      new_value = "hoge"
+      
+      @elems.each do |name, value|
+        @parents.each do |parent|
+          parsed_value = @rss.__send__(parent).__send__("dc_#{name}")
+          if parsed_value.kind_of?(String)
+            parsed_value = CGI.escapeHTML(parsed_value)
+          end
+          assert_equal(value, parsed_value)
+
+          plural_reader = "dc_#{name}" + (name == :rights ? "es" : "s")
+          klass_name = "DublinCore#{Utils.to_class_name(name.to_s)}"
+          klass = DublinCoreModel.const_get(klass_name)
+          if name == :date
+            t = Time.iso8601("2003-01-01T02:30:23+09:00")
+            class << t
+              alias_method(:to_s, :iso8601)
+            end
+            elems = @rss.__send__(parent).__send__(plural_reader)
+            elems << klass.new(t.iso8601)
+            new_elems = @rss.__send__(parent).__send__(plural_reader)
+            values = new_elems.collect{|x| x.value}
+            assert_equal([@rss.__send__(parent).__send__("dc_#{name}"), t],
+                         values)
+          else
+            elems = @rss.__send__(parent).__send__(plural_reader)
+            elems << klass.new(new_value)
+            new_elems = @rss.__send__(parent).__send__(plural_reader)
+            values = new_elems.collect{|x| x.value}
+            assert_equal([
+                          @rss.__send__(parent).__send__("dc_#{name}"),
+                          new_value
+                         ],
+                         values)
+          end
+        end
+      end
+    end
+
+    def test_to_s
+      @elems.each do |name, value|
+        excepted = "<#{@prefix}:#{name}>#{value}</#{@prefix}:#{name}>"
+        @parents.each do |parent|
+          assert_equal(excepted,
+                       @rss.__send__(parent).__send__("dc_#{name}_elements"))
+        end
+        
+        excepted = Array.new(2, excepted).join("\n")
+        @parents.each do |parent|
+          reader = "dc_#{name}" + (name == :rights ? "es" : "s")
+          elems = @rss.__send__(parent).__send__(reader)
+          klass_name = "DublinCore#{Utils.to_class_name(name.to_s)}"
+          klass = DublinCoreModel.const_get(klass_name)
+          elems << klass.new(@rss.__send__(parent).__send__("dc_#{name}"))
+          assert_equal(excepted,
+                       @rss.__send__(parent).__send__("dc_#{name}_elements"))
+        end
+      end
+      
+      REXML::Document.new(@rss_source).root.each_element do |parent|
+        if @parents.include?(parent.name)
+          parent.each_element do |elem|
+            if elem.namespace == @uri
+              assert_equal(CGI.escapeHTML(elem.text),
+                           @elems[elem.name.intern].to_s)
+            end
+          end
+        end
+      end
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_image.rb b/ruby_1_8_6/test/rss/test_image.rb
new file mode 100644
index 0000000000..241fdafb7d
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_image.rb
@@ -0,0 +1,191 @@
+require "cgi"
+require "rexml/document"
+
+require "rss-testcase"
+
+require "rss/1.0"
+require "rss/image"
+
+module RSS
+  class TestImage < TestCase
+
+    def setup
+      @prefix = "image"
+      @uri = "http://web.resource.org/rss/1.0/modules/image/"
+
+      @favicon_attrs = {
+        "rdf:about" => "http://www.kuro5hin.org/favicon.ico",
+        "#{@prefix}:size" => "small",
+      }
+      @favicon_contents = {"dc:title" => "Kuro5hin",}
+      @items = [
+        [
+          {
+            "rdf:about" => "http://www.example.org/item.png",
+            "rdf:resource" => "http://www.example.org/item",
+          },
+          {
+            "dc:title" => "Example Image",
+            "#{@prefix}:width" => "100",
+            "#{@prefix}:height" => "65",
+          },
+        ],
+        [
+          {
+            "rdf:about" => "http://www.kuro5hin.org/images/topics/culture.jpg",
+          },
+          {
+            "dc:title" => "Culture",
+            "#{@prefix}:width" => "80",
+            "#{@prefix}:height" => "50",
+          },
+        ]
+      ]
+
+
+      @channel_nodes = make_element("#{@prefix}:favicon",
+                                    @favicon_attrs,
+                                    @favicon_contents)
+      items = ""
+      @items.each do |attrs, contents|
+        image_item = make_element("#{@prefix}:item", attrs, contents)
+        items << make_item(image_item)
+      end
+
+      @ns = {
+        @prefix => @uri,
+        DC_PREFIX => DC_URI,
+      }
+      @rss_source = make_RDF(<<-EOR, @ns)
+#{make_channel(@channel_nodes)}
+#{make_image}
+#{items}
+#{make_textinput}
+EOR
+
+      @rss = Parser.parse(@rss_source)
+    end
+  
+    def test_parser
+      assert_nothing_raised do
+        Parser.parse(@rss_source)
+      end
+      
+      assert_too_much_tag("favicon", "channel") do
+        Parser.parse(make_RDF(<<-EOR, @ns))
+#{make_channel(@channel_nodes * 2)}
+#{make_item}
+EOR
+      end
+    end
+  
+    def test_favicon_accessor
+      favicon = @rss.channel.image_favicon
+      [
+        %w(about rdf:about http://example.com/favicon.ico),
+        %w(size image:size large),
+        %w(image_size image:size medium),
+      ].each do |name, full_name, new_value|
+        assert_equal(@favicon_attrs[full_name], favicon.__send__(name))
+        favicon.__send__("#{name}=", new_value)
+        assert_equal(new_value, favicon.__send__(name))
+        favicon.__send__("#{name}=", @favicon_attrs[full_name])
+        assert_equal(@favicon_attrs[full_name], favicon.__send__(name))
+      end
+
+      %w(small medium large).each do |value|
+        assert_nothing_raised do
+          favicon.size = value
+          favicon.image_size = value
+        end
+      end
+
+      %w(aaa AAA SMALL MEDIUM LARGE).each do |value|
+        args = ["#{@prefix}:favicon", value, "#{@prefix}:size"]
+        assert_not_available_value(*args) do
+          favicon.size = value
+        end
+        assert_not_available_value(*args) do
+          favicon.image_size = value
+        end
+      end
+
+      [
+        %w(dc_title dc:title sample-favicon),
+      ].each do |name, full_name, new_value|
+        assert_equal(@favicon_contents[full_name], favicon.__send__(name))
+        favicon.__send__("#{name}=", new_value)
+        assert_equal(new_value, favicon.__send__(name))
+        favicon.__send__("#{name}=", @favicon_contents[full_name])
+        assert_equal(@favicon_contents[full_name], favicon.__send__(name))
+      end
+    end
+
+    def test_item_accessor
+      @rss.items.each_with_index do |item, i|
+        image_item = item.image_item
+        attrs, contents = @items[i]
+        [
+          %w(about rdf:about http://example.com/image.png),
+          %w(resource rdf:resource http://example.com/),
+        ].each do |name, full_name, new_value|
+          assert_equal(attrs[full_name], image_item.__send__(name))
+          image_item.__send__("#{name}=", new_value)
+          assert_equal(new_value, image_item.__send__(name))
+          image_item.__send__("#{name}=", attrs[full_name])
+          assert_equal(attrs[full_name], image_item.__send__(name))
+        end
+        
+        [
+          ["width", "image:width", "111"],
+          ["image_width", "image:width", "44"],
+          ["height", "image:height", "222"],
+          ["image_height", "image:height", "88"],
+        ].each do |name, full_name, new_value|
+          assert_equal(contents[full_name].to_i, image_item.__send__(name))
+          image_item.__send__("#{name}=", new_value)
+          assert_equal(new_value.to_i, image_item.__send__(name))
+          image_item.__send__("#{name}=", contents[full_name])
+          assert_equal(contents[full_name].to_i, image_item.__send__(name))
+        end
+
+        [
+          ["dc_title", "dc:title", "sample-image"],
+        ].each do |name, full_name, new_value|
+          assert_equal(contents[full_name], image_item.__send__(name))
+          image_item.__send__("#{name}=", new_value)
+          assert_equal(new_value, image_item.__send__(name))
+          image_item.__send__("#{name}=", contents[full_name])
+          assert_equal(contents[full_name], image_item.__send__(name))
+        end
+      end
+    end
+
+    def test_favicon_to_s
+      favicon = @rss.channel.image_favicon
+      expected = REXML::Document.new(make_element("#{@prefix}:favicon",
+                                                  @favicon_attrs,
+                                                  @favicon_contents))
+      actual = REXML::Document.new(favicon.to_s(false, ""))
+      assert_equal(expected.to_s, actual.to_s)
+    end
+
+    def test_item_to_s
+      @rss.items.each_with_index do |item, i|
+        attrs, contents = @items[i]
+        expected_s = make_element("#{@prefix}:item", attrs, contents)
+        expected = REXML::Document.new(expected_s)
+        actual = REXML::Document.new(item.image_item.to_s(false, ""))
+
+        assert_equal(expected[0].attributes, actual[0].attributes)
+        
+        %w(image:height image:width dc:title).each do |name|
+          actual_target = actual.elements["//#{name}"]
+          expected_target = expected.elements["//#{name}"]
+          assert_equal(expected_target.to_s, actual_target.to_s)
+        end
+      end
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_inherit.rb b/ruby_1_8_6/test/rss/test_inherit.rb
new file mode 100644
index 0000000000..fc4bbbe76a
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_inherit.rb
@@ -0,0 +1,41 @@
+require "rss-testcase"
+
+require "rss/1.0"
+
+module RSS
+  class TestInherit < TestCase
+
+    class InheritedImage < RSS::RDF::Image
+      def self.indent_size; 1; end
+      def self.tag_name; 'image'; end
+    end
+    
+    def setup
+      @rss = make_RDF(<<-EOR)
+#{make_channel}
+#{make_image}
+#{make_item}
+#{make_textinput}
+EOR
+    end
+    
+    def test_inherit
+      rss = RSS::Parser.parse(@rss)
+      orig_image = rss.image
+      prefix = "[INHERIT]"
+      image = InheritedImage.new("#{prefix} #{orig_image.about}")
+      image.title = "#{prefix} #{orig_image.title}"
+      image.url = "#{prefix} #{orig_image.url}"
+      image.link = "#{prefix} #{orig_image.link}"
+      rss.image = image
+
+      new_rss = RSS::Parser.parse(rss.to_s)
+      new_image = new_rss.image
+      assert_equal("#{prefix} #{orig_image.about}", new_image.about)
+      assert_equal("#{prefix} #{orig_image.title}", new_image.title)
+      assert_equal("#{prefix} #{orig_image.url}", new_image.url)
+      assert_equal("#{prefix} #{orig_image.link}", new_image.link)
+    end
+    
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_maker_0.9.rb b/ruby_1_8_6/test/rss/test_maker_0.9.rb
new file mode 100644
index 0000000000..820d567289
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_maker_0.9.rb
@@ -0,0 +1,399 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestMaker09 < TestCase
+
+    def test_rss
+      rss = RSS::Maker.make("0.91")
+      assert_nil(rss)
+      
+      rss = RSS::Maker.make("0.9") do |maker|
+        setup_dummy_channel(maker)
+      end
+      assert_equal("0.91", rss.rss_version)
+      
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+      end
+      assert_equal("0.91", rss.rss_version)
+
+      
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.encoding = "EUC-JP"
+      end
+      assert_equal("0.91", rss.rss_version)
+      assert_equal("EUC-JP", rss.encoding)
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.standalone = "yes"
+      end
+      assert_equal("0.91", rss.rss_version)
+      assert_equal("yes", rss.standalone)
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.encoding = "EUC-JP"
+        maker.standalone = "yes"
+      end
+      assert_equal("0.91", rss.rss_version)
+      assert_equal("EUC-JP", rss.encoding)
+      assert_equal("yes", rss.standalone)
+    end
+
+    def test_channel
+      title = "fugafuga"
+      link = "http://hoge.com"
+      description = "fugafugafugafuga"
+      language = "ja"
+      copyright = "foo"
+      managingEditor = "bar"
+      webMaster = "web master"
+      rating = '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))'
+      docs = "http://foo.com/doc"
+      skipDays = [
+        "Sunday",
+        "Monday",
+      ]
+      skipHours = [
+        "0",
+        "13",
+      ]
+      pubDate = Time.now
+      lastBuildDate = Time.now
+      
+      rss = RSS::Maker.make("0.91") do |maker|
+        maker.channel.title = title
+        maker.channel.link = link
+        maker.channel.description = description
+        maker.channel.language = language
+        maker.channel.copyright = copyright
+        maker.channel.managingEditor = managingEditor
+        maker.channel.webMaster = webMaster
+        maker.channel.rating = rating
+        maker.channel.docs = docs
+        maker.channel.pubDate = pubDate
+        maker.channel.lastBuildDate = lastBuildDate
+
+        skipDays.each do |day|
+          maker.channel.skipDays.new_day do |new_day|
+            new_day.content = day
+          end
+        end
+        skipHours.each do |hour|
+          maker.channel.skipHours.new_hour do |new_hour|
+            new_hour.content = hour
+          end
+        end
+      end
+      channel = rss.channel
+      
+      assert_equal(title, channel.title)
+      assert_equal(link, channel.link)
+      assert_equal(description, channel.description)
+      assert_equal(language, channel.language)
+      assert_equal(copyright, channel.copyright)
+      assert_equal(managingEditor, channel.managingEditor)
+      assert_equal(webMaster, channel.webMaster)
+      assert_equal(rating, channel.rating)
+      assert_equal(docs, channel.docs)
+      assert_equal(pubDate, channel.pubDate)
+      assert_equal(pubDate, channel.date)
+      assert_equal(lastBuildDate, channel.lastBuildDate)
+
+      skipDays.each_with_index do |day, i|
+        assert_equal(day, channel.skipDays.days[i].content)
+      end
+      skipHours.each_with_index do |hour, i|
+        assert_equal(hour.to_i, channel.skipHours.hours[i].content)
+      end
+      
+      assert(channel.items.empty?)
+      assert_nil(channel.image)
+      assert_nil(channel.textInput)
+    end
+
+    def test_not_valid_channel
+      title = "fugafuga"
+      link = "http://hoge.com"
+      description = "fugafugafugafuga"
+      language = "ja"
+
+      assert_not_set_error("maker.channel", %w(title)) do
+        RSS::Maker.make("0.91") do |maker|
+          # maker.channel.title = title
+          maker.channel.link = link
+          maker.channel.description = description
+          maker.channel.language = language
+        end
+      end
+
+      assert_not_set_error("maker.channel", %w(link)) do
+        RSS::Maker.make("0.91") do |maker|
+          maker.channel.title = title
+          # maker.channel.link = link
+          maker.channel.link = nil
+          maker.channel.description = description
+          maker.channel.language = language
+        end
+      end
+
+      assert_not_set_error("maker.channel", %w(description)) do
+        RSS::Maker.make("0.91") do |maker|
+          maker.channel.title = title
+          maker.channel.link = link
+          # maker.channel.description = description
+          maker.channel.language = language
+        end
+      end
+
+      assert_not_set_error("maker.channel", %w(language)) do
+        RSS::Maker.make("0.91") do |maker|
+          maker.channel.title = title
+          maker.channel.link = link
+          maker.channel.description = description
+          # maker.channel.language = language
+        end
+      end
+    end
+    
+    def test_image
+      title = "fugafuga"
+      link = "http://hoge.com"
+      url = "http://hoge.com/hoge.png"
+      width = "144"
+      height = "400"
+      description = "an image"
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.link = link
+        
+        maker.image.title = title
+        maker.image.url = url
+        maker.image.width = width
+        maker.image.height = height
+        maker.image.description = description
+      end
+      image = rss.image
+      assert_equal(title, image.title)
+      assert_equal(link, image.link)
+      assert_equal(url, image.url)
+      assert_equal(width.to_i, image.width)
+      assert_equal(height.to_i, image.height)
+      assert_equal(description, image.description)
+
+      assert_not_set_error("maker.channel", %w(description title language)) do
+        RSS::Maker.make("0.91") do |maker|
+          # setup_dummy_channel(maker)
+          maker.channel.link = link
+        
+          maker.image.title = title
+          maker.image.url = url
+          maker.image.width = width
+          maker.image.height = height
+          maker.image.description = description
+        end
+      end
+    end
+
+    def test_not_valid_image
+      title = "fugafuga"
+      link = "http://hoge.com"
+      url = "http://hoge.com/hoge.png"
+      width = "144"
+      height = "400"
+      description = "an image"
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.link = link
+        
+        # maker.image.title = title
+        maker.image.url = url
+        maker.image.width = width
+        maker.image.height = height
+        maker.image.description = description
+      end
+      assert_nil(rss.channel.image)
+
+      assert_not_set_error("maker.channel", %w(link)) do
+        RSS::Maker.make("0.91") do |maker|
+          setup_dummy_channel(maker)
+          # maker.channel.link = link
+          maker.channel.link = nil
+        
+          maker.image.title = title
+          maker.image.url = url
+          maker.image.width = width
+          maker.image.height = height
+          maker.image.description = description
+        end
+      end
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.link = link
+        
+        maker.image.title = title
+        # maker.image.url = url
+        maker.image.width = width
+        maker.image.height = height
+        maker.image.description = description
+      end
+      assert_nil(rss.channel.image)
+    end
+    
+    def test_items
+      title = "TITLE"
+      link = "http://hoge.com/"
+      description = "text hoge fuga"
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+      end
+      assert(rss.channel.items.empty?)
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.items.new_item do |item|
+          item.title = title
+          item.link = link
+          # item.description = description
+        end
+      end
+      assert_equal(1, rss.channel.items.size)
+      item = rss.channel.items.first
+      assert_equal(title, item.title)
+      assert_equal(link, item.link)
+      assert_nil(item.description)
+
+
+      item_size = 5
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+          end
+        end
+        maker.items.do_sort = true
+      end
+      assert_equal(item_size, rss.items.size)
+      rss.channel.items.each_with_index do |item, i|
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+      end
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+          end
+        end
+        maker.items.do_sort = Proc.new do |x, y|
+          y.title[-1] <=> x.title[-1]
+        end
+      end
+      assert_equal(item_size, rss.items.size)
+      rss.channel.items.reverse.each_with_index do |item, i|
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+      end
+    end
+
+    def test_textInput
+      title = "fugafuga"
+      description = "text hoge fuga"
+      name = "hoge"
+      link = "http://hoge.com"
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+
+        maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+        maker.textinput.link = link
+      end
+      textInput = rss.channel.textInput
+      assert_equal(title, textInput.title)
+      assert_equal(description, textInput.description)
+      assert_equal(name, textInput.name)
+      assert_equal(link, textInput.link)
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        # setup_dummy_channel(maker)
+
+        maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+        maker.textinput.link = link
+      end
+      assert_nil(rss)
+    end
+    
+    def test_not_valid_textInput
+      title = "fugafuga"
+      description = "text hoge fuga"
+      name = "hoge"
+      link = "http://hoge.com"
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+
+        # maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+        maker.textinput.link = link
+      end
+      assert_nil(rss.channel.textInput)
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.textinput.title = title
+        # maker.textinput.description = description
+        maker.textinput.name = name
+        maker.textinput.link = link
+      end
+      assert_nil(rss.channel.textInput)
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.textinput.title = title
+        maker.textinput.description = description
+        # maker.textinput.name = name
+        maker.textinput.link = link
+      end
+      assert_nil(rss.channel.textInput)
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+        # maker.textinput.link = link
+      end
+      assert_nil(rss.channel.textInput)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_maker_1.0.rb b/ruby_1_8_6/test/rss/test_maker_1.0.rb
new file mode 100644
index 0000000000..e15432146d
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_maker_1.0.rb
@@ -0,0 +1,431 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestMaker10 < TestCase
+
+    def test_rdf
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+      end
+      assert_equal("1.0", rss.rss_version)
+      
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.encoding = "EUC-JP"
+      end
+      assert_equal("1.0", rss.rss_version)
+      assert_equal("EUC-JP", rss.encoding)
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.standalone = "yes"
+      end
+      assert_equal("1.0", rss.rss_version)
+      assert_equal("yes", rss.standalone)
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.encoding = "EUC-JP"
+        maker.standalone = "yes"
+      end
+      assert_equal("1.0", rss.rss_version)
+      assert_equal("EUC-JP", rss.encoding)
+      assert_equal("yes", rss.standalone)
+    end
+
+    def test_channel
+      about = "http://hoge.com"
+      title = "fugafuga"
+      link = "http://hoge.com"
+      description = "fugafugafugafuga"
+
+      rss = RSS::Maker.make("1.0")
+      assert_nil(rss)
+      
+      rss = RSS::Maker.make("1.0") do |maker|
+        maker.channel.about = about
+        maker.channel.title = title
+        maker.channel.link = link
+        maker.channel.description = description
+      end
+      channel = rss.channel
+      assert_equal(about, channel.about)
+      assert_equal(title, channel.title)
+      assert_equal(link, channel.link)
+      assert_equal(description, channel.description)
+      assert(channel.items.Seq.lis.empty?)
+      assert_nil(channel.image)
+      assert_nil(channel.textinput)
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        maker.channel.about = about
+        maker.channel.title = title
+        maker.channel.link = link
+        maker.channel.description = description
+
+        setup_dummy_image(maker)
+
+        setup_dummy_textinput(maker)
+      end
+      channel = rss.channel
+      assert_equal(about, channel.about)
+      assert_equal(title, channel.title)
+      assert_equal(link, channel.link)
+      assert_equal(description, channel.description)
+      assert(channel.items.Seq.lis.empty?)
+      assert_equal(rss.image.about, channel.image.resource)
+      assert_equal(rss.textinput.about, channel.textinput.resource)
+    end
+
+    def test_not_valid_channel
+      about = "http://hoge.com"
+      title = "fugafuga"
+      link = "http://hoge.com"
+      description = "fugafugafugafuga"
+
+      assert_not_set_error("maker.channel", %w(about)) do
+        RSS::Maker.make("1.0") do |maker|
+          # maker.channel.about = about
+          maker.channel.title = title
+          maker.channel.link = link
+          maker.channel.description = description
+        end
+      end
+
+      assert_not_set_error("maker.channel", %w(title)) do
+        RSS::Maker.make("1.0") do |maker|
+          maker.channel.about = about
+          # maker.channel.title = title
+          maker.channel.link = link
+          maker.channel.description = description
+        end
+      end
+
+      assert_not_set_error("maker.channel", %w(link)) do
+        RSS::Maker.make("1.0") do |maker|
+          maker.channel.about = about
+          maker.channel.title = title
+          # maker.channel.link = link
+          maker.channel.description = description
+        end
+      end
+
+      assert_not_set_error("maker.channel", %w(description)) do
+        RSS::Maker.make("1.0") do |maker|
+          maker.channel.about = about
+          maker.channel.title = title
+          maker.channel.link = link
+          # maker.channel.description = description
+        end
+      end
+    end
+    
+    
+    def test_image
+      title = "fugafuga"
+      link = "http://hoge.com"
+      url = "http://hoge.com/hoge.png"
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.link = link
+        
+        maker.image.title = title
+        maker.image.url = url
+      end
+      image = rss.image
+      assert_equal(url, image.about)
+      assert_equal(url, rss.channel.image.resource)
+      assert_equal(title, image.title)
+      assert_equal(link, image.link)
+      assert_equal(url, image.url)
+
+      assert_not_set_error("maker.channel", %w(about title description)) do
+        RSS::Maker.make("1.0") do |maker|
+          # setup_dummy_channel(maker)
+          maker.channel.link = link
+          
+          maker.image.title = title
+          maker.image.url = url
+        end
+      end
+    end
+
+    def test_not_valid_image
+      title = "fugafuga"
+      link = "http://hoge.com"
+      url = "http://hoge.com/hoge.png"
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.link = link
+        
+        # maker.image.url = url
+        maker.image.title = title
+      end
+      assert_nil(rss.channel.image)
+      assert_nil(rss.image)
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.link = link
+        
+        maker.image.url = url
+        # maker.image.title = title
+      end
+      assert_nil(rss.channel.image)
+      assert_nil(rss.image)
+
+      assert_not_set_error("maker.channel", %w(link)) do
+        RSS::Maker.make("1.0") do |maker|
+          setup_dummy_channel(maker)
+          # maker.channel.link = link
+          maker.channel.link = nil
+          
+          maker.image.url = url
+          maker.image.title = title
+        end
+      end
+    end
+    
+    def test_items
+      title = "TITLE"
+      link = "http://hoge.com/"
+      description = "text hoge fuga"
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+      end
+      assert(rss.items.empty?)
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.items.new_item do |item|
+          item.title = title
+          item.link = link
+          # item.description = description
+        end
+      end
+      assert_equal(1, rss.items.size)
+      item = rss.items.first
+      assert_equal(link, item.about)
+      assert_equal(title, item.title)
+      assert_equal(link, item.link)
+      assert_nil(item.description)
+
+      
+      item_size = 5
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+          end
+        end
+        maker.items.do_sort = true
+      end
+      assert_equal(item_size, rss.items.size)
+      rss.items.each_with_index do |item, i|
+        assert_equal("#{link}#{i}", item.about)
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+      end
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+          end
+        end
+        maker.items.do_sort = Proc.new do |x, y|
+          y.title[-1] <=> x.title[-1]
+        end
+      end
+      assert_equal(item_size, rss.items.size)
+      rss.items.reverse.each_with_index do |item, i|
+        assert_equal("#{link}#{i}", item.about)
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+      end
+
+      max_size = item_size / 2
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+          end
+        end
+        maker.items.max_size = max_size
+      end
+      assert_equal(max_size, rss.items.size)
+      rss.items.each_with_index do |item, i|
+        assert_equal("#{link}#{i}", item.about)
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+      end
+
+      max_size = 0
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+          end
+        end
+        maker.items.max_size = max_size
+      end
+      assert_equal(max_size, rss.items.size)
+
+      max_size = -2
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+          end
+        end
+        maker.items.max_size = max_size
+      end
+      assert_equal(item_size + max_size + 1, rss.items.size)
+      rss.items.each_with_index do |item, i|
+        assert_equal("#{link}#{i}", item.about)
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+      end
+    end
+
+    def test_not_valid_items
+      title = "TITLE"
+      link = "http://hoge.com/"
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.items.new_item do |item|
+          # item.title = title
+          item.link = link
+        end
+      end
+      assert(rss.items.empty?)
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.items.new_item do |item|
+          item.title = title
+          # item.link = link
+        end
+      end
+      assert(rss.items.empty?)
+    end
+    
+    def test_textinput
+      title = "fugafuga"
+      description = "text hoge fuga"
+      name = "hoge"
+      link = "http://hoge.com"
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.textinput.link = link
+        maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+      end
+      textinput = rss.textinput
+      assert_equal(link, textinput.about)
+      assert_equal(link, rss.channel.textinput.resource)
+      assert_equal(title, textinput.title)
+      assert_equal(name, textinput.name)
+      assert_equal(description, textinput.description)
+      assert_equal(link, textinput.link)
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        # setup_dummy_channel(maker)
+
+        maker.textinput.link = link
+        maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+      end
+      assert_nil(rss)
+    end
+    
+    def test_not_valid_textinput
+      title = "fugafuga"
+      description = "text hoge fuga"
+      name = "hoge"
+      link = "http://hoge.com"
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+
+        # maker.textinput.link = link
+        maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+      end
+      assert_nil(rss.channel.textinput)
+      assert_nil(rss.textinput)
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.textinput.link = link
+        # maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+      end
+      assert_nil(rss.channel.textinput)
+      assert_nil(rss.textinput)
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.textinput.link = link
+        maker.textinput.title = title
+        # maker.textinput.description = description
+        maker.textinput.name = name
+      end
+      assert_nil(rss.channel.textinput)
+      assert_nil(rss.textinput)
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.textinput.link = link
+        maker.textinput.title = title
+        maker.textinput.description = description
+        # maker.textinput.name = name
+      end
+      assert_nil(rss.channel.textinput)
+      assert_nil(rss.textinput)
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_maker_2.0.rb b/ruby_1_8_6/test/rss/test_maker_2.0.rb
new file mode 100644
index 0000000000..ec5f3abb8e
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_maker_2.0.rb
@@ -0,0 +1,667 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestMaker20 < TestCase
+
+    def test_rss
+      rss = RSS::Maker.make("2.0")
+      assert_nil(rss)
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+      end
+      assert_equal("2.0", rss.rss_version)
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.encoding = "EUC-JP"
+      end
+      assert_equal("2.0", rss.rss_version)
+      assert_equal("EUC-JP", rss.encoding)
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.standalone = "yes"
+      end
+      assert_equal("2.0", rss.rss_version)
+      assert_equal("yes", rss.standalone)
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.encoding = "EUC-JP"
+        maker.standalone = "yes"
+      end
+      assert_equal("2.0", rss.rss_version)
+      assert_equal("EUC-JP", rss.encoding)
+      assert_equal("yes", rss.standalone)
+    end
+
+    def test_channel
+      title = "fugafuga"
+      link = "http://hoge.com"
+      description = "fugafugafugafuga"
+      language = "ja"
+      copyright = "foo"
+      managingEditor = "bar"
+      webMaster = "web master"
+      rating = '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))'
+      docs = "http://foo.com/doc"
+      skipDays = [
+        "Sunday",
+        "Monday",
+      ]
+      skipHours = [
+        "0",
+        "13",
+      ]
+      pubDate = Time.now
+      lastBuildDate = Time.now
+      categories = [
+        "Nespapers",
+        "misc",
+      ]
+      generator = "RSS Maker"
+      ttl = "60"
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        maker.channel.title = title
+        maker.channel.link = link
+        maker.channel.description = description
+        maker.channel.language = language
+        maker.channel.copyright = copyright
+        maker.channel.managingEditor = managingEditor
+        maker.channel.webMaster = webMaster
+        maker.channel.rating = rating
+        maker.channel.docs = docs
+        maker.channel.pubDate = pubDate
+        maker.channel.lastBuildDate = lastBuildDate
+
+        skipDays.each do |day|
+          maker.channel.skipDays.new_day do |new_day|
+            new_day.content = day
+          end
+        end
+        skipHours.each do |hour|
+          maker.channel.skipHours.new_hour do |new_hour|
+            new_hour.content = hour
+          end
+        end
+        
+        categories.each do |category|
+          maker.channel.categories.new_category do |new_category|
+            new_category.content = category
+          end
+        end
+        
+        maker.channel.generator = generator
+        maker.channel.ttl = ttl
+      end
+      channel = rss.channel
+      
+      assert_equal(title, channel.title)
+      assert_equal(link, channel.link)
+      assert_equal(description, channel.description)
+      assert_equal(language, channel.language)
+      assert_equal(copyright, channel.copyright)
+      assert_equal(managingEditor, channel.managingEditor)
+      assert_equal(webMaster, channel.webMaster)
+      assert_equal(rating, channel.rating)
+      assert_equal(docs, channel.docs)
+      assert_equal(pubDate, channel.pubDate)
+      assert_equal(pubDate, channel.date)
+      assert_equal(lastBuildDate, channel.lastBuildDate)
+
+      skipDays.each_with_index do |day, i|
+        assert_equal(day, channel.skipDays.days[i].content)
+      end
+      skipHours.each_with_index do |hour, i|
+        assert_equal(hour.to_i, channel.skipHours.hours[i].content)
+      end
+      
+      channel.categories.each_with_index do |category, i|
+        assert_equal(categories[i], category.content)
+      end
+      
+      assert_equal(generator, channel.generator)
+      assert_equal(ttl.to_i, channel.ttl)
+
+      assert(channel.items.empty?)
+      assert_nil(channel.image)
+      assert_nil(channel.textInput)
+    end
+
+    def test_not_valid_channel
+      title = "fugafuga"
+      link = "http://hoge.com"
+      description = "fugafugafugafuga"
+      language = "ja"
+      
+      assert_not_set_error("maker.channel", %w(title)) do
+        RSS::Maker.make("2.0") do |maker|
+          # maker.channel.title = title
+          maker.channel.link = link
+          maker.channel.description = description
+          maker.channel.language = language
+        end
+      end
+
+      assert_not_set_error("maker.channel", %w(link)) do
+        RSS::Maker.make("2.0") do |maker|
+          maker.channel.title = title
+          # maker.channel.link = link
+          maker.channel.description = description
+          maker.channel.language = language
+        end
+      end
+
+      assert_not_set_error("maker.channel", %w(description)) do
+        RSS::Maker.make("2.0") do |maker|
+          maker.channel.title = title
+          maker.channel.link = link
+          # maker.channel.description = description
+          maker.channel.language = language
+        end
+      end
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        maker.channel.title = title
+        maker.channel.link = link
+        maker.channel.description = description
+        # maker.channel.language = language
+      end
+      assert_not_nil(rss)
+    end
+
+    
+    def test_cloud
+      domain = "rpc.sys.com"
+      port = "80"
+      path = "/RPC2"
+      registerProcedure = "myCloud.rssPleaseNotify"
+      protocol = "xml-rpc"
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+
+        maker.channel.cloud.domain = domain
+        maker.channel.cloud.port = port
+        maker.channel.cloud.path = path
+        maker.channel.cloud.registerProcedure = registerProcedure
+        maker.channel.cloud.protocol = protocol
+      end
+      cloud = rss.channel.cloud
+      assert_equal(domain, cloud.domain)
+      assert_equal(port.to_i, cloud.port)
+      assert_equal(path, cloud.path)
+      assert_equal(registerProcedure, cloud.registerProcedure)
+      assert_equal(protocol, cloud.protocol)
+    end
+    
+    def test_not_valid_cloud
+      domain = "rpc.sys.com"
+      port = "80"
+      path = "/RPC2"
+      registerProcedure = "myCloud.rssPleaseNotify"
+      protocol = "xml-rpc"
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+
+        # maker.channel.cloud.domain = domain
+        maker.channel.cloud.port = port
+        maker.channel.cloud.path = path
+        maker.channel.cloud.registerProcedure = registerProcedure
+        maker.channel.cloud.protocol = protocol
+      end
+      assert_nil(rss.channel.cloud)
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+
+        maker.channel.cloud.domain = domain
+        # maker.channel.cloud.port = port
+        maker.channel.cloud.path = path
+        maker.channel.cloud.registerProcedure = registerProcedure
+        maker.channel.cloud.protocol = protocol
+      end
+      assert_nil(rss.channel.cloud)
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+
+        maker.channel.cloud.domain = domain
+        maker.channel.cloud.port = port
+        # maker.channel.cloud.path = path
+        maker.channel.cloud.registerProcedure = registerProcedure
+        maker.channel.cloud.protocol = protocol
+      end
+      assert_nil(rss.channel.cloud)
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+
+        maker.channel.cloud.domain = domain
+        maker.channel.cloud.port = port
+        maker.channel.cloud.path = path
+        # maker.channel.cloud.registerProcedure = registerProcedure
+        maker.channel.cloud.protocol = protocol
+      end
+      assert_nil(rss.channel.cloud)
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+
+        maker.channel.cloud.domain = domain
+        maker.channel.cloud.port = port
+        maker.channel.cloud.path = path
+        maker.channel.cloud.registerProcedure = registerProcedure
+        # maker.channel.cloud.protocol = protocol
+      end
+      assert_nil(rss.channel.cloud)
+    end
+    
+
+    def test_image
+      title = "fugafuga"
+      link = "http://hoge.com"
+      url = "http://hoge.com/hoge.png"
+      width = "144"
+      height = "400"
+      description = "an image"
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.link = link
+        
+        maker.image.title = title
+        maker.image.url = url
+        maker.image.width = width
+        maker.image.height = height
+        maker.image.description = description
+      end
+      image = rss.image
+      assert_equal(title, image.title)
+      assert_equal(link, image.link)
+      assert_equal(url, image.url)
+      assert_equal(width.to_i, image.width)
+      assert_equal(height.to_i, image.height)
+      assert_equal(description, image.description)
+
+      assert_not_set_error("maker.channel", %w(title description)) do
+        RSS::Maker.make("2.0") do |maker|
+          # setup_dummy_channel(maker)
+          maker.channel.link = link
+        
+          maker.image.title = title
+          maker.image.url = url
+          maker.image.width = width
+          maker.image.height = height
+          maker.image.description = description
+        end
+      end
+    end
+
+    def test_not_valid_image
+      title = "fugafuga"
+      link = "http://hoge.com"
+      url = "http://hoge.com/hoge.png"
+      width = "144"
+      height = "400"
+      description = "an image"
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.link = link
+        
+        # maker.image.title = title
+        maker.image.url = url
+        maker.image.width = width
+        maker.image.height = height
+        maker.image.description = description
+      end
+      assert_nil(rss.image)
+
+      assert_not_set_error("maker.channel", %w(link)) do
+        RSS::Maker.make("2.0") do |maker|
+          setup_dummy_channel(maker)
+          # maker.channel.link = link
+          maker.channel.link = nil
+        
+          maker.image.title = title
+          maker.image.url = url
+          maker.image.width = width
+          maker.image.height = height
+          maker.image.description = description
+        end
+      end
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.link = link
+        
+        maker.image.title = title
+        # maker.image.url = url
+        maker.image.width = width
+        maker.image.height = height
+        maker.image.description = description
+      end
+      assert_nil(rss.image)
+    end
+    
+    def test_items
+      title = "TITLE"
+      link = "http://hoge.com/"
+      description = "text hoge fuga"
+      author = "oprah@oxygen.net"
+      comments = "http://www.myblog.org/cgi-local/mt/mt-comments.cgi?entry_id=290"
+      pubDate = Time.now
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+      end
+      assert(rss.channel.items.empty?)
+
+      item_size = 5
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+            item.author = "#{author}#{i}"
+            item.comments = "#{comments}#{i}"
+            item.date = pubDate
+          end
+        end
+        maker.items.do_sort = true
+      end
+      assert_equal(item_size, rss.items.size)
+      rss.channel.items.each_with_index do |item, i|
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+        assert_equal("#{author}#{i}", item.author)
+        assert_equal("#{comments}#{i}", item.comments)
+        assert_equal(pubDate, item.pubDate)
+        assert_equal(pubDate, item.date)
+      end
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+            item.author = "#{author}#{i}"
+            item.comments = "#{comments}#{i}"
+            item.date = pubDate
+          end
+        end
+        maker.items.do_sort = Proc.new do |x, y|
+          y.title[-1] <=> x.title[-1]
+        end
+      end
+      assert_equal(item_size, rss.items.size)
+      rss.channel.items.reverse.each_with_index do |item, i|
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+        assert_equal("#{author}#{i}", item.author)
+        assert_equal("#{comments}#{i}", item.comments)
+        assert_equal(pubDate, item.pubDate)
+        assert_equal(pubDate, item.date)
+      end
+    end
+
+    def test_guid
+      isPermaLink = "true"
+      content = "http://inessential.com/2002/09/01.php#a2"
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        setup_dummy_item(maker)
+
+        guid = maker.items.last.guid
+        guid.isPermaLink = isPermaLink
+        guid.content = content
+      end
+      guid = rss.channel.items.last.guid
+      assert_equal(isPermaLink == "true", guid.isPermaLink)
+      assert_equal(content, guid.content)
+    end
+
+    def test_not_valid_guid
+      content = "http://inessential.com/2002/09/01.php#a2"
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        setup_dummy_item(maker)
+
+        guid = maker.items.last.guid
+        # guid.content = content
+      end
+      assert_nil(rss.channel.items.last.guid)
+    end
+    
+    def test_enclosure
+      url = "http://www.scripting.com/mp3s/weatherReportSuite.mp3"
+      length = "12216320"
+      type = "audio/mpeg"
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        setup_dummy_item(maker)
+
+        enclosure = maker.items.last.enclosure
+        enclosure.url = url
+        enclosure.length = length
+        enclosure.type = type
+      end
+      enclosure = rss.channel.items.last.enclosure
+      assert_equal(url, enclosure.url)
+      assert_equal(length.to_i, enclosure.length)
+      assert_equal(type, enclosure.type)
+    end
+
+    def test_not_valid_enclosure
+      url = "http://www.scripting.com/mp3s/weatherReportSuite.mp3"
+      length = "12216320"
+      type = "audio/mpeg"
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        setup_dummy_item(maker)
+
+        enclosure = maker.items.last.enclosure
+        # enclosure.url = url
+        enclosure.length = length
+        enclosure.type = type
+      end
+      assert_nil(rss.channel.items.last.enclosure)
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        setup_dummy_item(maker)
+
+        enclosure = maker.items.last.enclosure
+        enclosure.url = url
+        # enclosure.length = length
+        enclosure.type = type
+      end
+      assert_nil(rss.channel.items.last.enclosure)
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        setup_dummy_item(maker)
+
+        enclosure = maker.items.last.enclosure
+        enclosure.url = url
+        enclosure.length = length
+        # enclosure.type = type
+      end
+      assert_nil(rss.channel.items.last.enclosure)
+    end
+
+
+    def test_source
+      url = "http://static.userland.com/tomalak/links2.xml"
+      content = "Tomalak's Realm"
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        setup_dummy_item(maker)
+
+        source = maker.items.last.source
+        source.url = url
+        source.content = content
+      end
+      source = rss.channel.items.last.source
+      assert_equal(url, source.url)
+      assert_equal(content, source.content)
+    end
+
+    def test_not_valid_source
+      url = "http://static.userland.com/tomalak/links2.xml"
+      content = "Tomalak's Realm"
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        setup_dummy_item(maker)
+
+        source = maker.items.last.source
+        # source.url = url
+        source.content = content
+      end
+      assert_nil(rss.channel.items.last.source)
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        setup_dummy_item(maker)
+
+        source = maker.items.last.source
+        source.url = url
+        # source.content = content
+      end
+      assert_nil(rss.channel.items.last.source)
+    end
+    
+    def test_category
+      domain = "http://www.fool.com/cusips"
+      content = "MSFT"
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        setup_dummy_item(maker)
+
+        maker.items.last.categories.new_category do |category|
+          category.domain = domain
+          category.content = content
+        end
+      end
+      category = rss.channel.items.last.categories.last
+      assert_equal(domain, category.domain)
+      assert_equal(content, category.content)
+    end
+
+    def test_not_valid_category
+      content = "Grateful Dead"
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        setup_dummy_item(maker)
+
+        maker.items.last.categories.new_category do |category|
+          # category.content = content
+        end
+      end
+      assert(rss.channel.items.last.categories.empty?)
+    end
+    
+    def test_textInput
+      title = "fugafuga"
+      description = "text hoge fuga"
+      name = "hoge"
+      link = "http://hoge.com"
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+
+        maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+        maker.textinput.link = link
+      end
+      textInput = rss.channel.textInput
+      assert_equal(title, textInput.title)
+      assert_equal(description, textInput.description)
+      assert_equal(name, textInput.name)
+      assert_equal(link, textInput.link)
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        # setup_dummy_channel(maker)
+
+        maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+        maker.textinput.link = link
+      end
+      assert_nil(rss)
+    end
+    
+    def test_not_valid_textInput
+      title = "fugafuga"
+      description = "text hoge fuga"
+      name = "hoge"
+      link = "http://hoge.com"
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+
+        # maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+        maker.textinput.link = link
+      end
+      assert_nil(rss.channel.textInput)
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.textinput.title = title
+        # maker.textinput.description = description
+        maker.textinput.name = name
+        maker.textinput.link = link
+      end
+      assert_nil(rss.channel.textInput)
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.textinput.title = title
+        maker.textinput.description = description
+        # maker.textinput.name = name
+        maker.textinput.link = link
+      end
+      assert_nil(rss.channel.textInput)
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+        # maker.textinput.link = link
+      end
+      assert_nil(rss.channel.textInput)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_maker_content.rb b/ruby_1_8_6/test/rss/test_maker_content.rb
new file mode 100644
index 0000000000..c29d75a649
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_maker_content.rb
@@ -0,0 +1,34 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestMakerContent < TestCase
+
+    def setup
+      @uri = "http://purl.org/rss/1.0/modules/content/"
+      
+      @elements = {
+        :encoded => "<em>ATTENTION</em>",
+      }
+    end
+
+    def test_rss10
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+
+        setup_dummy_item(maker)
+        item = maker.items.last
+        @elements.each do |name, value|
+          item.__send__("#{accessor_name(name)}=", value)
+        end
+      end
+      assert_content(@elements, rss.items.last)
+    end
+
+    private
+    def accessor_name(name)
+      "content_#{name}"
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_maker_dc.rb b/ruby_1_8_6/test/rss/test_maker_dc.rb
new file mode 100644
index 0000000000..6266e953aa
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_maker_dc.rb
@@ -0,0 +1,145 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestMakerDublinCore < TestCase
+
+    def setup
+      @uri = "http://purl.org/dc/elements/1.1/"
+      
+      t = Time.iso8601("2000-01-01T12:00:05+00:00")
+      class << t
+        alias_method(:to_s, :iso8601)
+      end
+      
+      @elements = {
+        :title => "hoge",
+        :description =>
+          " XML is placing increasingly heavy loads on
+          the existing technical infrastructure of the Internet.",
+        :creator => "Rael Dornfest (mailto:rael@oreilly.com)",
+        :subject => "XML",
+        :publisher => "The O'Reilly Network",
+        :contributor => "hogehoge",
+        :type => "fugafuga",
+        :format => "hohoho",
+        :identifier => "fufufu",
+        :source => "barbar",
+        :language => "ja",
+        :relation => "cococo",
+        :rights => "Copyright (c) 2000 O'Reilly &amp; Associates, Inc.",
+        :date => t,
+      }
+    end
+
+    def test_rss10
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        set_elements(maker.channel)
+
+        setup_dummy_image(maker)
+        set_elements(maker.image)
+
+        setup_dummy_item(maker)
+        item = maker.items.last
+        @elements.each do |name, value|
+          item.__send__("#{accessor_name(name)}=", value)
+        end
+
+        setup_dummy_textinput(maker)
+        set_elements(maker.textinput)
+      end
+      assert_dublin_core(@elements, rss.channel)
+      assert_dublin_core(@elements, rss.image)
+      assert_dublin_core(@elements, rss.items.last)
+      assert_dublin_core(@elements, rss.textinput)
+    end
+
+    def test_rss10_multiple
+      elems = []
+      @elements.each do |name, value|
+        plural = name.to_s + (name == :rights ? "es" : "s")
+        values = [value]
+        if name == :date
+          values << value + 60
+        else
+          values << value * 2
+        end
+        elems << [name, values, plural]
+      end
+      
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        set_multiple_elements(maker.channel, elems)
+
+        setup_dummy_image(maker)
+        set_multiple_elements(maker.image, elems)
+
+        setup_dummy_item(maker)
+        item = maker.items.last
+        elems.each do |name, values, plural|
+          dc_elems = item.__send__("dc_#{plural}")
+          values.each do |value|
+            dc_elems.__send__("new_#{name}") do |elem|
+              elem.value = value
+            end
+          end
+        end
+
+        setup_dummy_textinput(maker)
+        set_multiple_elements(maker.textinput, elems)
+      end
+      assert_multiple_dublin_core(elems, rss.channel)
+      assert_multiple_dublin_core(elems, rss.image)
+      assert_multiple_dublin_core(elems, rss.items.last)
+      assert_multiple_dublin_core(elems, rss.textinput)
+    end
+
+    def test_date
+      t1 = Time.iso8601("2000-01-01T12:00:05+00:00")
+      t2 = Time.iso8601("2005-01-01T12:00:05+00:00")
+      
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.date = t1
+        maker.channel.dc_dates.new_date do |date|
+          date.value = t2
+        end
+
+        setup_dummy_item(maker)
+        item = maker.items.last
+        item.date = t2
+        item.dc_dates.new_date do |date|
+          date.value = t1
+        end
+      end
+      assert_equal([t1, t2], rss.channel.dc_dates.collect{|x| x.value})
+      assert_equal([t2, t1], rss.items.last.dc_dates.collect{|x| x.value})
+    end
+    
+    private
+    def accessor_name(name)
+      "dc_#{name}"
+    end
+
+    def set_elements(target, elems=@elements)
+      elems.each do |name, value|
+        target.__send__("#{accessor_name(name)}=", value)
+      end
+    end
+
+    def set_multiple_elements(target, elems)
+      elems.each do |name, values, plural|
+        plural ||= "#{name}s"
+        dc_elems = target.__send__("dc_#{plural}")
+        values.each do |value|
+          dc_elems.__send__("new_#{name}") do |new_dc_elem|
+            new_dc_elem.value = value
+          end
+        end
+      end
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_maker_image.rb b/ruby_1_8_6/test/rss/test_maker_image.rb
new file mode 100644
index 0000000000..1fc8076c46
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_maker_image.rb
@@ -0,0 +1,62 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestMakerImage < TestCase
+
+    def setup
+      @uri = "http://web.resource.org/rss/1.0/modules/image/"
+
+      @favicon_infos = {
+        "about" => "http://www.kuro5hin.org/favicon.ico",
+        "image_size" => "small",
+        "dc_title" => "example",
+      }
+      @item_infos = {
+        "about" => "http://www.example.org/item.png",
+        "resource" => "http://www.example.org/item",
+        "dc_title" => "Example Image",
+        "image_width" => "100",
+        "image_height" => "65",
+      }
+    end
+
+    def test_rss10
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        @favicon_infos.each do |name, value|
+          maker.channel.image_favicon.__send__("#{name}=", value)
+        end
+
+        setup_dummy_image(maker)
+
+        setup_dummy_item(maker)
+        item = maker.items.last
+        @item_infos.each do |name, value|
+          item.image_item.__send__("#{name}=", value)
+        end
+
+        setup_dummy_textinput(maker)
+      end
+      
+      setup_rss = RSS::Maker.make("1.0") do |maker|
+        rss.setup_maker(maker)
+      end
+
+      [rss, setup_rss].each_with_index do |target, i|
+        favicon = target.channel.image_favicon
+        assert_equal(@favicon_infos["about"], favicon.about)
+        assert_equal(@favicon_infos["image_size"], favicon.image_size)
+        assert_equal(@favicon_infos["dc_title"], favicon.dc_title)
+        
+        item = target.items.last.image_item
+        assert_equal(@item_infos["about"], item.about)
+        assert_equal(@item_infos["resource"], item.resource)
+        assert_equal(@item_infos["image_width"].to_i, item.image_width)
+        assert_equal(@item_infos["image_height"].to_i, item.image_height)
+        assert_equal(@item_infos["dc_title"], item.dc_title)
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_maker_sy.rb b/ruby_1_8_6/test/rss/test_maker_sy.rb
new file mode 100644
index 0000000000..fd6df9a0eb
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_maker_sy.rb
@@ -0,0 +1,43 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestMakerSyndication < TestCase
+
+    def setup
+      @uri = "http://purl.org/rss/1.0/modules/syndication/"
+      
+      t = Time.iso8601("2000-01-01T12:00:05+00:00")
+      class << t
+        alias_method(:to_s, :iso8601)
+      end
+      
+      @elements = {
+        :updatePeriod => "hourly",
+        :updateFrequency => "2",
+        :updateBase => t,
+      }
+    end
+
+    def test_rss10
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        set_elements(maker.channel)
+      end
+      assert_syndication(@elements, rss.channel)
+    end
+
+    private
+    def accessor_name(name)
+      "sy_#{name}"
+    end
+
+    def set_elements(target)
+      @elements.each do |name, value|
+        target.__send__("#{accessor_name(name)}=", value)
+      end
+    end
+
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_maker_taxo.rb b/ruby_1_8_6/test/rss/test_maker_taxo.rb
new file mode 100644
index 0000000000..8feb4e1d33
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_maker_taxo.rb
@@ -0,0 +1,81 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestMakerTaxonomy < TestCase
+
+    def setup
+      @uri = "http://purl.org/rss/1.0/modules/taxonomy/"
+      
+      @resources = [
+        "http://meerkat.oreillynet.com/?c=cat23",
+        "http://meerkat.oreillynet.com/?c=47",
+        "http://dmoz.org/Computers/Data_Formats/Markup_Languages/XML/",
+      ]
+
+      @topics = [
+        {
+          :link => "http://meerkat.oreillynet.com/?c=cat23",
+          :title => "Data: XML",
+          :description => "A Meerkat channel",
+         },
+        {
+          :link => "http://dmoz.org/Computers/Data_Formats/Markup_Languages/XML/",
+          :title => "XML",
+          :subject => "XML",
+          :description => "DMOZ category",
+          :topics => [
+            "http://meerkat.oreillynet.com/?c=cat23",
+            "http://dmoz.org/Computers/Data_Formats/Markup_Languages/SGML/",
+            "http://dmoz.org/Computers/Programming/Internet/",
+          ]
+         },
+       ]
+    end
+
+    def test_rss10
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        set_topics(maker.channel)
+
+        setup_dummy_item(maker)
+        set_topics(maker.items.last)
+
+        setup_taxo_topic(maker, @topics)
+      end
+      assert_equal(@resources, rss.channel.taxo_topics.resources)
+      assert_equal(@resources, rss.items.last.taxo_topics.resources)
+      assert_taxo_topic(@topics, rss)
+    end
+
+    def _test_date
+      t1 = Time.iso8601("2000-01-01T12:00:05+00:00")
+      t2 = Time.iso8601("2005-01-01T12:00:05+00:00")
+      
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.date = t1
+        maker.channel.dc_dates.new_date do |date|
+          date.value = t2
+        end
+
+        setup_dummy_item(maker)
+        item = maker.items.last
+        item.date = t2
+        item.dc_dates.new_date do |date|
+          date.value = t1
+        end
+      end
+      assert_equal([t1, t2], rss.channel.dc_dates.collect{|x| x.value})
+      assert_equal([t2, t1], rss.items.last.dc_dates.collect{|x| x.value})
+    end
+    
+    private
+    def set_topics(target, resources=@resources)
+      resources.each do |value|
+        target.taxo_topics << value
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_maker_trackback.rb b/ruby_1_8_6/test/rss/test_maker_trackback.rb
new file mode 100644
index 0000000000..58705c6f80
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_maker_trackback.rb
@@ -0,0 +1,41 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestMakerTrackBack < TestCase
+
+    def setup
+      @uri = "http://madskills.com/public/xml/rss/module/trackback/"
+      
+      @elements = {
+        :ping => "http://bar.com/tb.cgi?tb_id=rssplustrackback",
+        :abouts => [
+          "http://foo.com/trackback/tb.cgi?tb_id=20020923",
+          "http://bar.com/trackback/tb.cgi?tb_id=20041114",
+        ],
+      }
+    end
+
+    def test_rss10
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+
+        setup_dummy_item(maker)
+        item = maker.items.last
+        item.trackback_ping = @elements[:ping]
+        @elements[:abouts].each do |about|
+          item.trackback_abouts.new_about do |new_about|
+            new_about.value = about
+          end
+        end
+      end
+      assert_trackback(@elements, rss.items.last)
+    end
+
+    private
+    def accessor_name(name)
+      "trackback_#{name}"
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_maker_xml-stylesheet.rb b/ruby_1_8_6/test/rss/test_maker_xml-stylesheet.rb
new file mode 100644
index 0000000000..c380f21dc3
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_maker_xml-stylesheet.rb
@@ -0,0 +1,79 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestMakerXMLStyleSheet < TestCase
+
+    def test_xml_stylesheet
+      href = 'a.xsl'
+      type = 'text/xsl'
+      title = 'sample'
+      media = 'printer'
+      charset = 'UTF-8'
+      alternate = 'yes'
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        maker.xml_stylesheets.new_xml_stylesheet do |xss|
+          xss.href = href
+          xss.type = type
+          xss.title = title
+          xss.media = media
+          xss.charset = charset
+          xss.alternate = alternate
+        end
+
+        setup_dummy_channel(maker)
+      end
+
+      xss = rss.xml_stylesheets.first
+      assert_equal(href, xss.href)
+      assert_equal(type, xss.type)
+      assert_equal(title, xss.title)
+      assert_equal(media, xss.media)
+      assert_equal(charset, xss.charset)
+      assert_equal(alternate, xss.alternate)
+
+      
+      href = 'http://example.com/index.xsl'
+      type = 'text/xsl'
+      rss = RSS::Maker.make("1.0") do |maker|
+        maker.xml_stylesheets.new_xml_stylesheet do |xss|
+          xss.href = href
+        end
+
+        setup_dummy_channel(maker)
+      end
+
+      xss = rss.xml_stylesheets.first
+      assert_equal(href, xss.href)
+      assert_equal(type, xss.type)
+    end
+
+    def test_not_valid_xml_stylesheet
+      href = 'xss.XXX'
+      type = "text/xsl"
+      
+      rss = RSS::Maker.make("1.0") do |maker|
+        maker.xml_stylesheets.new_xml_stylesheet do |xss|
+          # xss.href = href
+          xss.type = type
+        end
+
+        setup_dummy_channel(maker)
+      end
+      assert(rss.xml_stylesheets.empty?)
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        maker.xml_stylesheets.new_xml_stylesheet do |xss|
+          xss.href = href
+          # xss.type = type
+        end
+
+        setup_dummy_channel(maker)
+      end
+      assert(rss.xml_stylesheets.empty?)
+    end
+    
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_parser.rb b/ruby_1_8_6/test/rss/test_parser.rb
new file mode 100644
index 0000000000..49b441bf96
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_parser.rb
@@ -0,0 +1,60 @@
+begin
+  require "fileutils"
+rescue LoadError
+  module FileUtils
+    module_function
+    def rm_f(target)
+      File.unlink(target)
+    rescue Errno::ENOENT
+    end
+  end
+end
+
+require "rss-testcase"
+
+require "rss/1.0"
+require "rss/dublincore"
+
+module RSS
+  class TestParser < TestCase
+    def setup
+      @_default_parser = Parser.default_parser
+      @rss10 = make_RDF(<<-EOR)
+#{make_channel}
+#{make_item}
+#{make_textinput}
+#{make_image}
+EOR
+      @rss_file = "rss10.rdf"
+      File.open(@rss_file, "w") {|f| f.print(@rss10)}
+    end
+    
+    def teardown
+      Parser.default_parser = @_default_parser
+      FileUtils.rm_f(@rss_file)
+    end
+
+    def test_default_parser
+      assert_nothing_raised do
+        Parser.default_parser = RSS::AVAILABLE_PARSERS.first
+      end
+
+      assert_raise(RSS::NotValidXMLParser) do
+        Parser.default_parser = RSS::Parser
+      end
+    end
+
+    def test_parse
+      assert_not_nil(RSS::Parser.parse(@rss_file))
+
+      garbage_rss_file = @rss_file + "-garbage"
+      if RSS::Parser.default_parser.name == "RSS::XMLParserParser"
+        assert_raise(RSS::NotWellFormedError) do
+          RSS::Parser.parse(garbage_rss_file)
+        end
+      else
+        assert_nil(RSS::Parser.parse(garbage_rss_file))
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_parser_1.0.rb b/ruby_1_8_6/test/rss/test_parser_1.0.rb
new file mode 100644
index 0000000000..472602b04a
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_parser_1.0.rb
@@ -0,0 +1,503 @@
+require "rss-testcase"
+
+require "rss/1.0"
+require "rss/dublincore"
+
+module RSS
+  class TestParser10 < TestCase
+    def test_RDF
+      assert_ns("", RDF::URI) do
+        Parser.parse(<<-EOR)
+#{make_xmldecl}
+<RDF/>
+EOR
+      end
+
+      assert_ns("", RDF::URI) do
+        Parser.parse(<<-EOR)
+#{make_xmldecl}
+<RDF xmlns="hoge"/>
+EOR
+      end
+
+      assert_ns("rdf", RDF::URI) do
+        Parser.parse(<<-EOR)
+#{make_xmldecl}
+<rdf:RDF xmlns:rdf="hoge"/>
+EOR
+      end
+
+      assert_parse(<<-EOR, :missing_tag, "channel", "RDF")
+#{make_xmldecl}
+<rdf:RDF xmlns:rdf="#{RSS::RDF::URI}"/>
+EOR
+
+      assert_parse(<<-EOR, :missing_tag, "channel", "RDF")
+#{make_xmldecl}
+<RDF xmlns="#{RSS::RDF::URI}"/>
+EOR
+
+      assert_parse(<<-EOR, :missing_tag, "channel", "RDF")
+#{make_xmldecl}
+<RDF xmlns="#{RSS::RDF::URI}"/>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "item", "RDF")
+#{make_channel}
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "item", "RDF")
+#{make_channel}
+#{make_image}
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "item", "RDF")
+#{make_channel}
+#{make_textinput}
+EOR
+
+      assert_too_much_tag("image", "RDF") do
+        Parser.parse(make_RDF(<<-EOR))
+#{make_channel}
+#{make_image}
+#{make_image}
+#{make_item}
+#{make_textinput}
+EOR
+      end
+
+      assert_parse(make_RDF(<<-EOR), :nothing_raised)
+#{make_channel}
+#{make_item}
+#{make_image}
+#{make_textinput}
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :nothing_raised)
+#{make_channel}
+#{make_item}
+#{make_textinput}
+#{make_image}
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :nothing_raised)
+#{make_channel}
+#{make_image}
+#{make_item}
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :nothing_raised)
+#{make_channel}
+#{make_image}
+#{make_item}
+#{make_textinput}
+EOR
+
+      1.step(15, 3) do |i|
+        rss = make_RDF() do
+          res = make_channel
+          i.times { res << make_item }
+          res
+        end
+        assert_parse(rss, :nothing_raised)
+      end
+    end
+
+    def test_undefined_entity
+      return unless RSS::Parser.default_parser.raise_for_undefined_entity?
+      assert_parse(make_RDF(<<-EOR), :raises, RSS::NotWellFormedError)
+#{make_channel}
+#{make_image}
+<item rdf:about="#{RDF_ABOUT}">
+  <title>#{TITLE_VALUE} &UNKNOWN_ENTITY;</title>
+  <link>#{LINK_VALUE}</link>
+  <description>#{DESCRIPTION_VALUE}</description>
+</item>
+#{make_textinput}
+EOR
+    end
+
+    def test_channel
+      assert_parse(make_RDF(<<-EOR), :missing_attribute, "channel", "rdf:about")
+<channel />
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "title", "channel")
+<channel rdf:about="http://example.com/"/>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "link", "channel")
+<channel rdf:about="http://example.com/">
+  <title>hoge</title>
+</channel>
+EOR
+
+      assert_parse(make_RDF(<<EOR), :missing_tag, "description", "channel")
+<channel rdf:about="http://example.com/">
+  <title>hoge</title>
+  <link>http://example.com/</link>
+</channel>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "items", "channel")
+<channel rdf:about="http://example.com/">
+  <title>hoge</title>
+  <link>http://example.com/</link>
+  <description>hogehoge</description>
+</channel>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_attribute, "image", "rdf:resource")
+<channel rdf:about="http://example.com/">
+  <title>hoge</title>
+  <link>http://example.com/</link>
+  <description>hogehoge</description>
+  <image/>
+</channel>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "items", "channel")
+<channel rdf:about="http://example.com/">
+  <title>hoge</title>
+  <link>http://example.com/</link>
+  <description>hogehoge</description>
+  <image rdf:resource="http://example.com/hoge.png" />
+</channel>
+EOR
+
+      rss = make_RDF(<<-EOR)
+<channel rdf:about="http://example.com/">
+  <title>hoge</title>
+  <link>http://example.com/</link>
+  <description>hogehoge</description>
+  <image rdf:resource="http://example.com/hoge.png" />
+  <items/>
+</channel>
+EOR
+
+      assert_missing_tag("Seq", "items") do
+        Parser.parse(rss)
+      end
+
+      assert_missing_tag("item", "RDF") do
+        Parser.parse(rss, false).validate
+      end
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "item", "RDF")
+<channel rdf:about="http://example.com/">
+  <title>hoge</title>
+  <link>http://example.com/</link>
+  <description>hogehoge</description>
+  <image rdf:resource="http://example.com/hoge.png" />
+  <items>
+    <rdf:Seq>
+    </rdf:Seq>
+  </items>
+</channel>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_attribute, "textinput", "rdf:resource")
+<channel rdf:about="http://example.com/">
+  <title>hoge</title>
+  <link>http://example.com/</link>
+  <description>hogehoge</description>
+  <image rdf:resource="http://example.com/hoge.png" />
+  <items>
+    <rdf:Seq>
+    </rdf:Seq>
+  </items>
+  <textinput/>
+</channel>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "item", "RDF")
+<channel rdf:about="http://example.com/">
+  <title>hoge</title>
+  <link>http://example.com/</link>
+  <description>hogehoge</description>
+  <image rdf:resource="http://example.com/hoge.png" />
+  <items>
+    <rdf:Seq>
+    </rdf:Seq>
+  </items>
+  <textinput rdf:resource="http://example.com/search" />
+</channel>
+EOR
+    end
+
+    def test_rdf_li
+      rss = make_RDF(<<-EOR)
+<channel rdf:about="http://example.com/">
+  <title>hoge</title>
+  <link>http://example.com/</link>
+  <description>hogehoge</description>
+  <image rdf:resource="http://example.com/hoge.png" />
+  <items>
+    <rdf:Seq>
+      <rdf:li \#{rdf_li_attr}/>
+    </rdf:Seq>
+  </items>
+  <textinput rdf:resource="http://example.com/search" />
+</channel>
+#{make_item}
+EOR
+
+      source = Proc.new do |rdf_li_attr|
+        eval(%Q[%Q[#{rss}]], binding)
+      end
+
+      attr = %q[resource="http://example.com/hoge"]
+      assert_parse(source.call(attr), :nothing_raised)
+
+      attr = %q[rdf:resource="http://example.com/hoge"]
+      assert_parse(source.call(attr), :nothing_raised)
+
+      assert_parse(source.call(""), :missing_attribute, "li", "resource")
+    end
+
+    def test_image
+      assert_parse(make_RDF(<<-EOR), :missing_attribute, "image", "rdf:about")
+#{make_channel}
+<image>
+</image>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "title", "image")
+#{make_channel}
+<image rdf:about="http://example.com/hoge.png">
+</image>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "url", "image")
+#{make_channel}
+<image rdf:about="http://example.com/hoge.png">
+  <title>hoge</title>
+</image>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "link", "image")
+#{make_channel}
+<image rdf:about="http://example.com/hoge.png">
+  <title>hoge</title>
+  <url>http://example.com/hoge.png</url>
+</image>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "item", "RDF")
+#{make_channel}
+<image rdf:about="http://example.com/hoge.png">
+  <title>hoge</title>
+  <url>http://example.com/hoge.png</url>
+  <link>http://example.com/</link>
+</image>
+EOR
+
+      rss = make_RDF(<<-EOR)
+#{make_channel}
+<image rdf:about="http://example.com/hoge.png">
+  <link>http://example.com/</link>
+  <url>http://example.com/hoge.png</url>
+  <title>hoge</title>
+</image>
+EOR
+
+      assert_missing_tag("item", "RDF") do
+        Parser.parse(rss)
+      end
+
+      assert_missing_tag("item", "RDF") do
+        Parser.parse(rss, false).validate
+      end
+    end
+
+    def test_item
+      assert_parse(make_RDF(<<-EOR), :missing_attribute, "item", "rdf:about")
+#{make_channel}
+#{make_image}
+<item>
+</item>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "title", "item")
+#{make_channel}
+#{make_image}
+<item rdf:about="http://example.com/hoge.html">
+</item>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "link", "item")
+#{make_channel}
+#{make_image}
+<item rdf:about="http://example.com/hoge.html">
+  <title>hoge</title>
+</item>
+EOR
+
+      assert_too_much_tag("title", "item") do
+        Parser.parse(make_RDF(<<-EOR))
+#{make_channel}
+#{make_image}
+<item rdf:about="http://example.com/hoge.html">
+  <title>hoge</title>
+  <title>hoge</title>
+  <link>http://example.com/hoge.html</link>
+</item>
+EOR
+      end
+
+      assert_parse(make_RDF(<<-EOR), :nothing_raised)
+#{make_channel}
+#{make_image}
+<item rdf:about="http://example.com/hoge.html">
+  <title>hoge</title>
+  <link>http://example.com/hoge.html</link>
+</item>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :nothing_raised)
+#{make_channel}
+#{make_image}
+<item rdf:about="http://example.com/hoge.html">
+  <title>hoge</title>
+  <link>http://example.com/hoge.html</link>
+  <description>hogehoge</description>
+</item>
+EOR
+    end
+
+    def test_textinput
+      assert_parse(make_RDF(<<-EOR), :missing_attribute, "textinput", "rdf:about")
+#{make_channel}
+#{make_image}
+#{make_item}
+<textinput>
+</textinput>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "title", "textinput")
+#{make_channel}
+#{make_image}
+#{make_item}
+<textinput rdf:about="http://example.com/search.html">
+</textinput>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "description", "textinput")
+#{make_channel}
+#{make_image}
+#{make_item}
+<textinput rdf:about="http://example.com/search.html">
+  <title>hoge</title>
+</textinput>
+EOR
+
+      assert_too_much_tag("title", "textinput") do
+        Parser.parse(make_RDF(<<-EOR))
+#{make_channel}
+#{make_image}
+#{make_item}
+<textinput rdf:about="http://example.com/search.html">
+  <title>hoge</title>
+  <title>hoge</title>
+  <description>hogehoge</description>
+</textinput>
+EOR
+      end
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "name", "textinput")
+#{make_channel}
+#{make_image}
+#{make_item}
+<textinput rdf:about="http://example.com/search.html">
+  <title>hoge</title>
+  <description>hogehoge</description>
+</textinput>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :missing_tag, "link", "textinput")
+#{make_channel}
+#{make_image}
+#{make_item}
+<textinput rdf:about="http://example.com/search.html">
+  <title>hoge</title>
+  <description>hogehoge</description>
+  <name>key</name>
+</textinput>
+EOR
+
+      assert_parse(make_RDF(<<-EOR), :nothing_raised)
+#{make_channel}
+#{make_image}
+#{make_item}
+<textinput rdf:about="http://example.com/search.html">
+  <title>hoge</title>
+  <description>hogehoge</description>
+  <name>key</name>
+  <link>http://example.com/search.html</link>
+</textinput>
+EOR
+    end
+
+    def test_ignore
+      name = "a"
+      rss = make_RDF(<<-EOR)
+#{make_channel}
+#{make_item}
+<#{name}/>
+EOR
+      assert_not_expected_tag(name, ::RSS::URI, "RDF") do
+        Parser.parse(rss, true, false)
+      end
+
+      uri = ""
+      name = "a"
+      rss = make_RDF(<<-EOR)
+#{make_channel}
+#{make_item}
+<#{name} xmlns=""/>
+EOR
+      assert_parse(rss, :nothing_raised)
+      assert_not_expected_tag(name, uri, "RDF") do
+        Parser.parse(rss, true, false)
+      end
+
+      uri = "http://example.com/"
+      name = "a"
+      rss = make_RDF(<<-EOR)
+#{make_channel}
+#{make_item}
+<x:#{name} xmlns:x="#{uri}"/>
+EOR
+      assert_parse(rss, :nothing_raised)
+      assert_not_expected_tag(name, uri, "RDF") do
+        Parser.parse(rss, true, false)
+      end
+
+      uri = ::RSS::URI
+      name = "a"
+      rss = make_RDF(<<-EOR)
+#{make_channel}
+#{make_item}
+#{make_image("<#{name}/>")}
+EOR
+      assert_parse(rss, :nothing_raised)
+      assert_not_expected_tag(name, uri, "image") do
+        Parser.parse(rss, true, false)
+      end
+      
+      uri = CONTENT_URI
+      name = "encoded"
+      elem = "<#{name} xmlns='#{uri}'/>"
+      rss = make_RDF(<<-EOR)
+#{make_channel}
+#{make_item}
+#{make_image(elem)}
+EOR
+      assert_parse(rss, :nothing_raised)
+      assert_not_expected_tag(name, uri, "image") do
+        Parser.parse(rss, true, false)
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/test/rss/test_parser_2.0.rb b/ruby_1_8_6/test/rss/test_parser_2.0.rb
new file mode 100644
index 0000000000..249347d3dc
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_parser_2.0.rb
@@ -0,0 +1,122 @@
+require "rss-testcase"
+
+require "rss/2.0"
+
+module RSS
+  class TestParser20 < TestCase
+    def test_rss20
+      assert_parse(make_rss20(<<-EOR), :missing_tag, "channel", "rss")
+EOR
+
+      assert_parse(make_rss20(<<-EOR), :nothing_raised)
+#{make_channel20("")}
+EOR
+    end
+
+    def test_cloud20
+      attrs = [
+        ["domain", CLOUD_DOMAIN],
+        ["port", CLOUD_PORT],
+        ["path", CLOUD_PATH],
+        ["registerProcedure", CLOUD_REGISTER_PROCEDURE],
+        ["protocol", CLOUD_PROTOCOL],
+      ]
+
+      (attrs.size + 1).times do |i|
+        missing_attr = attrs[i]
+        if missing_attr
+          meth = :missing_attribute
+          args = ["cloud", missing_attr[0]]
+        else
+          meth = :nothing_raised
+          args = []
+        end
+
+        cloud_attrs = []
+        attrs.each_with_index do |attr, j|
+          unless i == j
+            cloud_attrs << %Q[#{attr[0]}="#{attr[1]}"]
+          end
+        end
+
+        assert_parse(make_rss20(<<-EOR), meth, *args)
+#{make_channel20(%Q[<cloud #{cloud_attrs.join("\n")}/>])}
+EOR
+      end
+    end
+
+    def test_source20
+        assert_parse(make_rss20(<<-EOR), :missing_attribute, "source", "url")
+#{make_channel20(make_item20(%Q[<source>Example</source>]))}
+EOR
+
+        assert_parse(make_rss20(<<-EOR), :nothing_raised)
+#{make_channel20(make_item20(%Q[<source url="http://example.com/" />]))}
+EOR
+
+        assert_parse(make_rss20(<<-EOR), :nothing_raised)
+#{make_channel20(make_item20(%Q[<source url="http://example.com/">Example</source>]))}
+EOR
+    end
+
+    def test_enclosure20
+      attrs = [
+        ["url", ENCLOSURE_URL],
+        ["length", ENCLOSURE_LENGTH],
+        ["type", ENCLOSURE_TYPE],
+      ]
+
+      (attrs.size + 1).times do |i|
+        missing_attr = attrs[i]
+        if missing_attr
+          meth = :missing_attribute
+          args = ["enclosure", missing_attr[0]]
+        else
+          meth = :nothing_raised
+          args = []
+        end
+
+        enclosure_attrs = []
+        attrs.each_with_index do |attr, j|
+          unless i == j
+            enclosure_attrs << %Q[#{attr[0]}="#{attr[1]}"]
+          end
+        end
+
+        assert_parse(make_rss20(<<-EOR), meth, *args)
+#{make_channel20(%Q[
+#{make_item20(%Q[
+<enclosure
+  #{enclosure_attrs.join("\n")} />
+    ])}
+  ])}
+EOR
+      end
+    end
+
+    def test_category20
+      values = [nil, CATEGORY_DOMAIN]
+      values.each do |value|
+        domain = ""
+        domain << %Q[domain="#{value}"] if value
+
+        ["", "Example Text"].each do |text|
+          rss_src = make_rss20(<<-EOR)
+#{make_channel20(%Q[
+#{make_item20(%Q[
+<category #{domain}>#{text}</category>
+    ])}
+  ])}
+EOR
+          assert_parse(rss_src, :nothing_raised)
+
+          rss = RSS::Parser.parse(rss_src)
+          category = rss.items.last.categories.first
+          assert_equal(value, category.domain)
+          assert_equal(text, category.content)
+        end
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/test/rss/test_setup_maker_0.9.rb b/ruby_1_8_6/test/rss/test_setup_maker_0.9.rb
new file mode 100644
index 0000000000..9408728371
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_setup_maker_0.9.rb
@@ -0,0 +1,233 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestSetupMaker09 < TestCase
+
+    def test_setup_maker_channel
+      title = "fugafuga"
+      link = "http://hoge.com"
+      description = "fugafugafugafuga"
+      language = "ja"
+      copyright = "foo"
+      managingEditor = "bar"
+      webMaster = "web master"
+      rating = '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))'
+      docs = "http://foo.com/doc"
+      skipDays = [
+        "Sunday",
+        "Monday",
+      ]
+      skipHours = [
+        "0",
+        "13",
+      ]
+      pubDate = Time.now
+      lastBuildDate = Time.now
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        maker.channel.title = title
+        maker.channel.link = link
+        maker.channel.description = description
+        maker.channel.language = language
+        maker.channel.copyright = copyright
+        maker.channel.managingEditor = managingEditor
+        maker.channel.webMaster = webMaster
+        maker.channel.rating = rating
+        maker.channel.docs = docs
+        maker.channel.pubDate = pubDate
+        maker.channel.lastBuildDate = lastBuildDate
+
+        skipDays.each do |day|
+          maker.channel.skipDays.new_day do |new_day|
+            new_day.content = day
+          end
+        end
+        skipHours.each do |hour|
+          maker.channel.skipHours.new_hour do |new_hour|
+            new_hour.content = hour
+          end
+        end
+      end
+
+      new_rss = RSS::Maker.make("0.91") do |maker|
+        rss.channel.setup_maker(maker)
+      end
+      channel = new_rss.channel
+      
+      assert_equal(title, channel.title)
+      assert_equal(link, channel.link)
+      assert_equal(description, channel.description)
+      assert_equal(language, channel.language)
+      assert_equal(copyright, channel.copyright)
+      assert_equal(managingEditor, channel.managingEditor)
+      assert_equal(webMaster, channel.webMaster)
+      assert_equal(rating, channel.rating)
+      assert_equal(docs, channel.docs)
+      assert_equal(pubDate, channel.pubDate)
+      assert_equal(lastBuildDate, channel.lastBuildDate)
+
+      skipDays.each_with_index do |day, i|
+        assert_equal(day, channel.skipDays.days[i].content)
+      end
+      skipHours.each_with_index do |hour, i|
+        assert_equal(hour.to_i, channel.skipHours.hours[i].content)
+      end
+      
+      assert(channel.items.empty?)
+      assert_nil(channel.image)
+      assert_nil(channel.textInput)
+    end
+
+    def test_setup_maker_image
+      title = "fugafuga"
+      link = "http://hoge.com"
+      url = "http://hoge.com/hoge.png"
+      width = "144"
+      height = "400"
+      description = "an image"
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.link = link
+        
+        maker.image.title = title
+        maker.image.url = url
+        maker.image.width = width
+        maker.image.height = height
+        maker.image.description = description
+      end
+      
+      new_rss = RSS::Maker.make("0.91") do |maker|
+        rss.channel.setup_maker(maker)
+        rss.image.setup_maker(maker)
+      end
+      
+      image = new_rss.image
+      assert_equal(title, image.title)
+      assert_equal(link, image.link)
+      assert_equal(url, image.url)
+      assert_equal(width.to_i, image.width)
+      assert_equal(height.to_i, image.height)
+      assert_equal(description, image.description)
+    end
+    
+    def test_setup_maker_textinput
+      title = "fugafuga"
+      description = "text hoge fuga"
+      name = "hoge"
+      link = "http://hoge.com"
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+
+        maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+        maker.textinput.link = link
+      end
+
+      new_rss = RSS::Maker.make("0.91") do |maker|
+        rss.channel.setup_maker(maker)
+        rss.textinput.setup_maker(maker)
+      end
+      
+      textInput = new_rss.channel.textInput
+      assert_equal(title, textInput.title)
+      assert_equal(description, textInput.description)
+      assert_equal(name, textInput.name)
+      assert_equal(link, textInput.link)
+    end
+
+    def test_setup_maker_items(for_backward_compatibility=false)
+      title = "TITLE"
+      link = "http://hoge.com/"
+      description = "text hoge fuga"
+
+      item_size = 5
+      
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+          end
+        end
+      end
+      
+      new_rss = RSS::Maker.make("0.91") do |maker|
+        rss.channel.setup_maker(maker)
+
+        rss.items.each do |item|
+          if for_backward_compatibility
+            item.setup_maker(maker)
+          else
+            item.setup_maker(maker.items)
+          end
+        end
+      end
+      
+      assert_equal(item_size, new_rss.items.size)
+      new_rss.items.each_with_index do |item, i|
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+      end
+
+    end
+
+    def test_setup_maker_items_backward_compatibility
+      test_setup_maker_items(true)
+    end
+    
+    def test_setup_maker
+      encoding = "EUC-JP"
+      standalone = true
+      
+      href = 'a.xsl'
+      type = 'text/xsl'
+      title = 'sample'
+      media = 'printer'
+      charset = 'UTF-8'
+      alternate = 'yes'
+
+      rss = RSS::Maker.make("0.91") do |maker|
+        maker.encoding = encoding
+        maker.standalone = standalone
+
+        maker.xml_stylesheets.new_xml_stylesheet do |xss|
+          xss.href = href
+          xss.type = type
+          xss.title = title
+          xss.media = media
+          xss.charset = charset
+          xss.alternate = alternate
+        end
+
+        setup_dummy_channel(maker)
+      end
+      
+      new_rss = RSS::Maker.make("0.91") do |maker|
+        rss.setup_maker(maker)
+      end
+      
+      assert_equal("0.91", new_rss.rss_version)
+      assert_equal(encoding, new_rss.encoding)
+      assert_equal(standalone, new_rss.standalone)
+
+      xss = rss.xml_stylesheets.first
+      assert_equal(1, rss.xml_stylesheets.size)
+      assert_equal(href, xss.href)
+      assert_equal(type, xss.type)
+      assert_equal(title, xss.title)
+      assert_equal(media, xss.media)
+      assert_equal(charset, xss.charset)
+      assert_equal(alternate, xss.alternate)
+    end
+    
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_setup_maker_1.0.rb b/ruby_1_8_6/test/rss/test_setup_maker_1.0.rb
new file mode 100644
index 0000000000..51a4d146c7
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_setup_maker_1.0.rb
@@ -0,0 +1,534 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestSetupMaker10 < TestCase
+
+    def setup
+      t = Time.iso8601("2000-01-01T12:00:05+00:00")
+      class << t
+        alias_method(:to_s, :iso8601)
+      end
+      
+      @dc_elems = {
+        :title => "hoge",
+        :description =>
+          " XML is placing increasingly heavy loads on
+          the existing technical infrastructure of the Internet.",
+        :creator => "Rael Dornfest (mailto:rael@oreilly.com)",
+        :subject => "XML",
+        :publisher => "The O'Reilly Network",
+        :contributor => "hogehoge",
+        :type => "fugafuga",
+        :format => "hohoho",
+        :identifier => "fufufu",
+        :source => "barbar",
+        :language => "ja",
+        :relation => "cococo",
+        :rights => "Copyright (c) 2000 O'Reilly &amp; Associates, Inc.",
+        :date => t,
+      }
+
+      @sy_elems = {
+        :updatePeriod => "hourly",
+        :updateFrequency => "2",
+        :updateBase => t,
+      }
+
+      @content_elems = {
+        :encoded => "<em>ATTENTION</em>",
+      }
+      
+      @trackback_elems = {
+        :ping => "http://bar.com/tb.cgi?tb_id=rssplustrackback",
+        :about => [
+          "http://foo.com/trackback/tb.cgi?tb_id=20020923",
+          "http://foo.com/trackback/tb.cgi?tb_id=20021010",
+        ],
+      }
+
+      @taxo_topic_elems = [
+        {
+          :link => "http://meerkat.oreillynet.com/?c=cat23",
+          :title => "Data: XML",
+          :description => "A Meerkat channel",
+        },
+        {
+          :link => "http://dmoz.org/Computers/Data_Formats/Markup_Languages/XML/",
+          :title => "XML",
+          :subject => "XML",
+          :description => "DMOZ category",
+          :topics => [
+            "http://meerkat.oreillynet.com/?c=cat23",
+            "http://dmoz.org/Computers/Data_Formats/Markup_Languages/SGML/",
+            "http://dmoz.org/Computers/Programming/Internet/",
+          ]
+        },
+      ]
+    end
+    
+    def test_setup_maker_channel
+      about = "http://hoge.com"
+      title = "fugafuga"
+      link = "http://hoge.com"
+      description = "fugafugafugafuga"
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        maker.channel.about = about
+        maker.channel.title = title
+        maker.channel.link = link
+        maker.channel.description = description
+        
+        @dc_elems.each do |var, value|
+          maker.channel.__send__("dc_#{var}=", value)
+        end
+
+        @sy_elems.each do |var, value|
+          maker.channel.__send__("sy_#{var}=", value)
+        end
+      end
+
+      new_rss = RSS::Maker.make("1.0") do |maker|
+        rss.channel.setup_maker(maker)
+      end
+      channel = new_rss.channel
+      
+      assert_equal(about, channel.about)
+      assert_equal(title, channel.title)
+      assert_equal(link, channel.link)
+      assert_equal(description, channel.description)
+      assert_equal(true, channel.items.Seq.lis.empty?)
+      assert_nil(channel.image)
+      assert_nil(channel.textinput)
+
+      @dc_elems.each do |var, value|
+        assert_equal(value, channel.__send__("dc_#{var}"))
+      end
+      
+      @sy_elems.each do |var, value|
+        value = value.to_i if var == :updateFrequency
+        assert_equal(value, channel.__send__("sy_#{var}"))
+      end
+      
+    end
+
+    def test_setup_maker_image
+      title = "fugafuga"
+      link = "http://hoge.com"
+      url = "http://hoge.com/hoge.png"
+      
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.link = link
+        
+        maker.image.title = title
+        maker.image.url = url
+
+        @dc_elems.each do |var, value|
+          maker.image.__send__("dc_#{var}=", value)
+        end
+      end
+      
+      new_rss = RSS::Maker.make("1.0") do |maker|
+        rss.channel.setup_maker(maker)
+        rss.image.setup_maker(maker)
+      end
+      
+      image = new_rss.image
+      assert_equal(url, image.about)
+      assert_equal(url, new_rss.channel.image.resource)
+      assert_equal(title, image.title)
+      assert_equal(link, image.link)
+      assert_equal(url, image.url)
+
+      @dc_elems.each do |var, value|
+        assert_equal(image.__send__("dc_#{var}"), value)
+      end
+    end
+    
+    def test_setup_maker_textinput
+      title = "fugafuga"
+      description = "text hoge fuga"
+      name = "hoge"
+      link = "http://hoge.com"
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        maker.textinput.link = link
+        maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+
+        @dc_elems.each do |var, value|
+          maker.textinput.__send__("dc_#{var}=", value)
+        end
+      end
+      
+      new_rss = RSS::Maker.make("1.0") do |maker|
+        rss.channel.setup_maker(maker)
+        rss.textinput.setup_maker(maker)
+      end
+      
+      textinput = new_rss.textinput
+      assert_equal(link, textinput.about)
+      assert_equal(link, new_rss.channel.textinput.resource)
+      assert_equal(title, textinput.title)
+      assert_equal(name, textinput.name)
+      assert_equal(description, textinput.description)
+      assert_equal(link, textinput.link)
+
+      @dc_elems.each do |var, value|
+        assert_equal(textinput.__send__("dc_#{var}"), value)
+      end
+    end
+
+    def test_setup_maker_items(for_backward_compatibility=false)
+      title = "TITLE"
+      link = "http://hoge.com/"
+      description = "text hoge fuga"
+
+      item_size = 5
+      
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+
+            @dc_elems.each do |var, value|
+              item.__send__("dc_#{var}=", value)
+            end
+
+            @content_elems.each do |var, value|
+              item.__send__("content_#{var}=", value)
+            end
+
+            item.trackback_ping = @trackback_elems[:ping]
+            @trackback_elems[:about].each do |value|
+              item.trackback_abouts.new_about do |new_about|
+                new_about.value = value
+              end
+            end
+          end
+        end
+      end
+      
+      new_rss = RSS::Maker.make("1.0") do |maker|
+        rss.channel.setup_maker(maker)
+
+        rss.items.each do |item|
+          if for_backward_compatibility
+            item.setup_maker(maker)
+          else
+            item.setup_maker(maker.items)
+          end
+        end
+      end
+      
+      assert_equal(item_size, new_rss.items.size)
+      new_rss.items.each_with_index do |item, i|
+        assert_equal("#{link}#{i}", item.about)
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+
+        @dc_elems.each do |var, value|
+          assert_equal(item.__send__("dc_#{var}"), value)
+        end
+      
+        @content_elems.each do |var, value|
+          assert_equal(item.__send__("content_#{var}"), value)
+        end
+      
+        assert_equal(@trackback_elems[:ping], item.trackback_ping)
+        assert_equal(@trackback_elems[:about].size, item.trackback_abouts.size)
+        item.trackback_abouts.each_with_index do |about, i|
+          assert_equal(@trackback_elems[:about][i], about.value)
+        end
+      end
+    end
+
+    def test_setup_maker_items_sort
+      title = "TITLE"
+      link = "http://hoge.com/"
+      description = "text hoge fuga"
+
+      item_size = 5
+      
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          item = RSS::RDF::Item.new("#{link}#{i}")
+          item.title = "#{title}#{i}"
+          item.link = "#{link}#{i}"
+          item.description = "#{description}#{i}"
+          item.dc_date = Time.now + i * 60
+          item.setup_maker(maker.items)
+        end
+        maker.items.do_sort = false
+      end
+      assert_equal(item_size, rss.items.size)
+      rss.items.each_with_index do |item, i|
+        assert_equal("#{link}#{i}", item.about)
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+      end
+
+      
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          item = RSS::RDF::Item.new("#{link}#{i}")
+          item.title = "#{title}#{i}"
+          item.link = "#{link}#{i}"
+          item.description = "#{description}#{i}"
+          item.dc_date = Time.now + i * 60
+          item.setup_maker(maker.items)
+        end
+        maker.items.do_sort = true
+      end
+      assert_equal(item_size, rss.items.size)
+      rss.items.reverse.each_with_index do |item, i|
+        assert_equal("#{link}#{i}", item.about)
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+      end
+    end
+
+    def test_setup_maker_items_backward_compatibility
+      test_setup_maker_items(true)
+    end
+    
+    def test_setup_maker
+      encoding = "EUC-JP"
+      standalone = true
+      
+      href = 'a.xsl'
+      type = 'text/xsl'
+      title = 'sample'
+      media = 'printer'
+      charset = 'UTF-8'
+      alternate = 'yes'
+
+      rss = RSS::Maker.make("1.0") do |maker|
+        maker.encoding = encoding
+        maker.standalone = standalone
+
+        maker.xml_stylesheets.new_xml_stylesheet do |xss|
+          xss.href = href
+          xss.type = type
+          xss.title = title
+          xss.media = media
+          xss.charset = charset
+          xss.alternate = alternate
+        end
+
+        setup_dummy_channel(maker)
+      end
+      
+      new_rss = RSS::Maker.make("1.0") do |maker|
+        rss.setup_maker(maker)
+      end
+      
+      assert_equal("1.0", new_rss.rss_version)
+      assert_equal(encoding, new_rss.encoding)
+      assert_equal(standalone, new_rss.standalone)
+
+      xss = new_rss.xml_stylesheets.first
+      assert_equal(1, new_rss.xml_stylesheets.size)
+      assert_equal(href, xss.href)
+      assert_equal(type, xss.type)
+      assert_equal(title, xss.title)
+      assert_equal(media, xss.media)
+      assert_equal(charset, xss.charset)
+      assert_equal(alternate, xss.alternate)
+    end
+
+    def test_setup_maker_full
+      encoding = "EUC-JP"
+      standalone = true
+      
+      href = 'a.xsl'
+      type = 'text/xsl'
+      title = 'sample'
+      media = 'printer'
+      charset = 'UTF-8'
+      alternate = 'yes'
+
+      channel_about = "http://hoge.com"
+      channel_title = "fugafuga"
+      channel_link = "http://hoge.com"
+      channel_description = "fugafugafugafuga"
+
+      image_title = "fugafuga"
+      image_url = "http://hoge.com/hoge.png"
+      
+      textinput_title = "fugafuga"
+      textinput_description = "text hoge fuga"
+      textinput_name = "hoge"
+      textinput_link = "http://hoge.com"
+      
+      item_title = "TITLE"
+      item_link = "http://hoge.com/"
+      item_description = "text hoge fuga"
+
+      item_size = 5
+      
+      rss = RSS::Maker.make("1.0") do |maker|
+        maker.encoding = encoding
+        maker.standalone = standalone
+
+        maker.xml_stylesheets.new_xml_stylesheet do |xss|
+          xss.href = href
+          xss.type = type
+          xss.title = title
+          xss.media = media
+          xss.charset = charset
+          xss.alternate = alternate
+        end
+
+        maker.channel.about = channel_about
+        maker.channel.title = channel_title
+        maker.channel.link = channel_link
+        maker.channel.description = channel_description
+        @dc_elems.each do |var, value|
+          maker.channel.__send__("dc_#{var}=", value)
+        end
+        @sy_elems.each do |var, value|
+          maker.channel.__send__("sy_#{var}=", value)
+        end
+        
+        maker.image.title = image_title
+        maker.image.url = image_url
+        @dc_elems.each do |var, value|
+          maker.image.__send__("dc_#{var}=", value)
+        end
+        
+        maker.textinput.link = textinput_link
+        maker.textinput.title = textinput_title
+        maker.textinput.description = textinput_description
+        maker.textinput.name = textinput_name
+        @dc_elems.each do |var, value|
+          maker.textinput.__send__("dc_#{var}=", value)
+        end
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{item_title}#{i}"
+            item.link = "#{item_link}#{i}"
+            item.description = "#{item_description}#{i}"
+
+            @dc_elems.each do |var, value|
+              item.__send__("dc_#{var}=", value)
+            end
+
+            @content_elems.each do |var, value|
+              item.__send__("content_#{var}=", value)
+            end
+
+            item.trackback_ping = @trackback_elems[:ping]
+            @trackback_elems[:about].each do |value|
+              item.trackback_abouts.new_about do |new_about|
+                new_about.value = value
+              end
+            end
+          end
+        end
+
+        setup_taxo_topic(maker, @taxo_topic_elems)
+      end
+      
+      new_rss = RSS::Maker.make("1.0") do |maker|
+        rss.setup_maker(maker)
+      end
+      
+      assert_equal("1.0", new_rss.rss_version)
+      assert_equal(encoding, new_rss.encoding)
+      assert_equal(standalone, new_rss.standalone)
+
+      xss = new_rss.xml_stylesheets.first
+      assert_equal(1, new_rss.xml_stylesheets.size)
+      assert_equal(href, xss.href)
+      assert_equal(type, xss.type)
+      assert_equal(title, xss.title)
+      assert_equal(media, xss.media)
+      assert_equal(charset, xss.charset)
+      assert_equal(alternate, xss.alternate)
+
+      channel = new_rss.channel
+      assert_equal(channel_about, channel.about)
+      assert_equal(channel_title, channel.title)
+      assert_equal(channel_link, channel.link)
+      assert_equal(channel_description, channel.description)
+      item_resources = []
+      item_size.times do |i|
+        item_resources << "#{item_link}#{i}"
+      end
+      assert_equal(item_resources, channel.items.resources)
+      assert_equal(image_url, channel.image.resource)
+      assert_equal(textinput_link, channel.textinput.resource)
+      @dc_elems.each do |var, value|
+        assert_equal(value, channel.__send__("dc_#{var}"))
+      end
+      @sy_elems.each do |var, value|
+        value = value.to_i if var == :updateFrequency
+        assert_equal(value, channel.__send__("sy_#{var}"))
+      end
+
+      image = new_rss.image
+      assert_equal(image_url, image.about)
+      assert_equal(image_url, new_rss.channel.image.resource)
+      assert_equal(image_title, image.title)
+      assert_equal(channel_link, image.link)
+      assert_equal(image_url, image.url)
+      @dc_elems.each do |var, value|
+        assert_equal(image.__send__("dc_#{var}"), value)
+      end
+      
+      textinput = new_rss.textinput
+      assert_equal(textinput_link, textinput.about)
+      assert_equal(textinput_link, new_rss.channel.textinput.resource)
+      assert_equal(textinput_title, textinput.title)
+      assert_equal(textinput_name, textinput.name)
+      assert_equal(textinput_description, textinput.description)
+      assert_equal(textinput_link, textinput.link)
+      @dc_elems.each do |var, value|
+        assert_equal(textinput.__send__("dc_#{var}"), value)
+      end
+
+      assert_equal(item_size, new_rss.items.size)
+      new_rss.items.each_with_index do |item, i|
+        assert_equal("#{item_link}#{i}", item.about)
+        assert_equal("#{item_title}#{i}", item.title)
+        assert_equal("#{item_link}#{i}", item.link)
+        assert_equal("#{item_description}#{i}", item.description)
+
+        @dc_elems.each do |var, value|
+          assert_equal(item.__send__("dc_#{var}"), value)
+        end
+      
+        @content_elems.each do |var, value|
+          assert_equal(item.__send__("content_#{var}"), value)
+        end
+      
+        assert_equal(@trackback_elems[:ping], item.trackback_ping)
+        assert_equal(@trackback_elems[:about].size, item.trackback_abouts.size)
+        item.trackback_abouts.each_with_index do |about, i|
+          assert_equal(@trackback_elems[:about][i], about.value)
+        end
+      end
+
+      assert_taxo_topic(@taxo_topic_elems, new_rss)
+    end
+    
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_setup_maker_2.0.rb b/ruby_1_8_6/test/rss/test_setup_maker_2.0.rb
new file mode 100644
index 0000000000..8fb727de8d
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_setup_maker_2.0.rb
@@ -0,0 +1,308 @@
+require "rss-testcase"
+
+require "rss/maker"
+
+module RSS
+  class TestSetupMaker20 < TestCase
+
+    def test_setup_maker_channel
+      title = "fugafuga"
+      link = "http://hoge.com"
+      description = "fugafugafugafuga"
+      language = "ja"
+      copyright = "foo"
+      managingEditor = "bar"
+      webMaster = "web master"
+      rating = '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))'
+      docs = "http://foo.com/doc"
+      skipDays = [
+        "Sunday",
+        "Monday",
+      ]
+      skipHours = [
+        "0",
+        "13",
+      ]
+      pubDate = Time.now
+      lastBuildDate = Time.now
+      categories = [
+        "Nespapers",
+        "misc",
+      ]
+      generator = "RSS Maker"
+      ttl = "60"
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        maker.channel.title = title
+        maker.channel.link = link
+        maker.channel.description = description
+        maker.channel.language = language
+        maker.channel.copyright = copyright
+        maker.channel.managingEditor = managingEditor
+        maker.channel.webMaster = webMaster
+        maker.channel.rating = rating
+        maker.channel.docs = docs
+        maker.channel.pubDate = pubDate
+        maker.channel.lastBuildDate = lastBuildDate
+
+        skipDays.each do |day|
+          maker.channel.skipDays.new_day do |new_day|
+            new_day.content = day
+          end
+        end
+        skipHours.each do |hour|
+          maker.channel.skipHours.new_hour do |new_hour|
+            new_hour.content = hour
+          end
+        end
+
+
+        categories.each do |category|
+          maker.channel.categories.new_category do |new_category|
+            new_category.content = category
+          end
+        end
+        
+        maker.channel.generator = generator
+        maker.channel.ttl = ttl
+      end
+
+      new_rss = RSS::Maker.make("2.0") do |maker|
+        rss.channel.setup_maker(maker)
+      end
+      channel = new_rss.channel
+      
+      assert_equal(title, channel.title)
+      assert_equal(link, channel.link)
+      assert_equal(description, channel.description)
+      assert_equal(language, channel.language)
+      assert_equal(copyright, channel.copyright)
+      assert_equal(managingEditor, channel.managingEditor)
+      assert_equal(webMaster, channel.webMaster)
+      assert_equal(rating, channel.rating)
+      assert_equal(docs, channel.docs)
+      assert_equal(pubDate, channel.pubDate)
+      assert_equal(lastBuildDate, channel.lastBuildDate)
+
+      skipDays.each_with_index do |day, i|
+        assert_equal(day, channel.skipDays.days[i].content)
+      end
+      skipHours.each_with_index do |hour, i|
+        assert_equal(hour.to_i, channel.skipHours.hours[i].content)
+      end
+      
+
+      channel.categories.each_with_index do |category, i|
+        assert_equal(categories[i], category.content)
+      end
+      
+      assert_equal(generator, channel.generator)
+      assert_equal(ttl.to_i, channel.ttl)
+
+
+      assert(channel.items.empty?)
+      assert_nil(channel.image)
+      assert_nil(channel.textInput)
+    end
+
+    def test_setup_maker_image
+      title = "fugafuga"
+      link = "http://hoge.com"
+      url = "http://hoge.com/hoge.png"
+      width = "144"
+      height = "400"
+      description = "an image"
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        maker.channel.link = link
+        
+        maker.image.title = title
+        maker.image.url = url
+        maker.image.width = width
+        maker.image.height = height
+        maker.image.description = description
+      end
+      
+      new_rss = RSS::Maker.make("2.0") do |maker|
+        rss.channel.setup_maker(maker)
+        rss.image.setup_maker(maker)
+      end
+      
+      image = new_rss.image
+      assert_equal(title, image.title)
+      assert_equal(link, image.link)
+      assert_equal(url, image.url)
+      assert_equal(width.to_i, image.width)
+      assert_equal(height.to_i, image.height)
+      assert_equal(description, image.description)
+    end
+    
+    def test_setup_maker_textinput
+      title = "fugafuga"
+      description = "text hoge fuga"
+      name = "hoge"
+      link = "http://hoge.com"
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+
+        maker.textinput.title = title
+        maker.textinput.description = description
+        maker.textinput.name = name
+        maker.textinput.link = link
+      end
+
+      new_rss = RSS::Maker.make("2.0") do |maker|
+        rss.channel.setup_maker(maker)
+        rss.textinput.setup_maker(maker)
+      end
+      
+      textInput = new_rss.channel.textInput
+      assert_equal(title, textInput.title)
+      assert_equal(description, textInput.description)
+      assert_equal(name, textInput.name)
+      assert_equal(link, textInput.link)
+    end
+
+    def test_setup_maker_items(for_backward_compatibility=false)
+      title = "TITLE"
+      link = "http://hoge.com/"
+      description = "text hoge fuga"
+      author = "oprah@oxygen.net"
+      comments = "http://www.myblog.org/cgi-local/mt/mt-comments.cgi?entry_id=290"
+      pubDate = Time.now
+
+      guid_isPermaLink = "true"
+      guid_content = "http://inessential.com/2002/09/01.php#a2"
+      
+      enclosure_url = "http://www.scripting.com/mp3s/weatherReportSuite.mp3"
+      enclosure_length = "12216320"
+      enclosure_type = "audio/mpeg"
+
+      source_url = "http://static.userland.com/tomalak/links2.xml"
+      source_content = "Tomalak's Realm"
+      
+      category_domain = "http://www.fool.com/cusips"
+      category_content = "MSFT"
+      
+      item_size = 5
+      
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_dummy_channel(maker)
+        
+        item_size.times do |i|
+          maker.items.new_item do |item|
+            item.title = "#{title}#{i}"
+            item.link = "#{link}#{i}"
+            item.description = "#{description}#{i}"
+            item.author = "#{author}#{i}"
+            item.comments = "#{comments}#{i}"
+            item.date = pubDate
+
+            item.guid.isPermaLink = guid_isPermaLink
+            item.guid.content = guid_content
+
+            item.enclosure.url = enclosure_url
+            item.enclosure.length = enclosure_length
+            item.enclosure.type = enclosure_type
+
+            item.source.url = source_url
+            item.source.content = source_content
+
+            category = item.categories.new_category
+            category.domain = category_domain
+            category.content = category_content
+          end
+        end
+      end
+      
+      new_rss = RSS::Maker.make("2.0") do |maker|
+        rss.channel.setup_maker(maker)
+
+        rss.items.each do |item|
+          if for_backward_compatibility
+            item.setup_maker(maker)
+          else
+            item.setup_maker(maker.items)
+          end
+        end
+      end
+      
+      assert_equal(item_size, new_rss.items.size)
+      new_rss.items.each_with_index do |item, i|
+        assert_equal("#{title}#{i}", item.title)
+        assert_equal("#{link}#{i}", item.link)
+        assert_equal("#{description}#{i}", item.description)
+        assert_equal("#{author}#{i}", item.author)
+        assert_equal("#{comments}#{i}", item.comments)
+        assert_equal(pubDate, item.pubDate)
+
+        assert_equal(guid_isPermaLink == "true", item.guid.isPermaLink)
+        assert_equal(guid_content, item.guid.content)
+
+        assert_equal(enclosure_url, item.enclosure.url)
+        assert_equal(enclosure_length.to_i, item.enclosure.length)
+        assert_equal(enclosure_type, item.enclosure.type)
+
+        assert_equal(source_url, item.source.url)
+        assert_equal(source_content, item.source.content)
+
+        assert_equal(1, item.categories.size)
+        assert_equal(category_domain, item.category.domain)
+        assert_equal(category_content, item.category.content)
+      end
+
+    end
+
+    def test_setup_maker_items_backward_compatibility
+      test_setup_maker_items(true)
+    end
+    
+    def test_setup_maker
+      encoding = "EUC-JP"
+      standalone = true
+      
+      href = 'a.xsl'
+      type = 'text/xsl'
+      title = 'sample'
+      media = 'printer'
+      charset = 'UTF-8'
+      alternate = 'yes'
+
+      rss = RSS::Maker.make("2.0") do |maker|
+        maker.encoding = encoding
+        maker.standalone = standalone
+
+        maker.xml_stylesheets.new_xml_stylesheet do |xss|
+          xss.href = href
+          xss.type = type
+          xss.title = title
+          xss.media = media
+          xss.charset = charset
+          xss.alternate = alternate
+        end
+
+        setup_dummy_channel(maker)
+      end
+      
+      new_rss = RSS::Maker.make("2.0") do |maker|
+        rss.setup_maker(maker)
+      end
+      
+      assert_equal("2.0", new_rss.rss_version)
+      assert_equal(encoding, new_rss.encoding)
+      assert_equal(standalone, new_rss.standalone)
+
+      xss = rss.xml_stylesheets.first
+      assert_equal(1, rss.xml_stylesheets.size)
+      assert_equal(href, xss.href)
+      assert_equal(type, xss.type)
+      assert_equal(title, xss.title)
+      assert_equal(media, xss.media)
+      assert_equal(charset, xss.charset)
+      assert_equal(alternate, xss.alternate)
+    end
+    
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_syndication.rb b/ruby_1_8_6/test/rss/test_syndication.rb
new file mode 100644
index 0000000000..697ff439e4
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_syndication.rb
@@ -0,0 +1,127 @@
+require "cgi"
+require "rexml/document"
+
+require "rss-testcase"
+
+require "rss/1.0"
+require "rss/syndication"
+
+module RSS
+  class TestSyndication < TestCase
+    
+    def setup
+      @prefix = "sy"
+      @uri = "http://purl.org/rss/1.0/modules/syndication/"
+      
+      @parents = %w(channel)
+      
+      t = Time.iso8601("2000-01-01T12:00:05+00:00")
+      class << t
+        alias_method(:to_s, :iso8601)
+      end
+      
+      @elems = {
+        :updatePeriod => "hourly",
+        :updateFrequency => "2",
+        :updateBase => t,
+      }
+      
+      @sy_nodes = @elems.collect do |name, value|
+        "<#{@prefix}:#{name}>#{CGI.escapeHTML(value.to_s)}</#{@prefix}:#{name}>"
+      end.join("\n")
+      
+      @rss_source = make_RDF(<<-EOR, {@prefix =>  @uri})
+#{make_channel(@sy_nodes)}
+#{make_image()}
+#{make_item()}
+#{make_textinput()}
+EOR
+
+      @rss = Parser.parse(@rss_source)
+    end
+  
+    def test_parser
+      
+      assert_nothing_raised do
+        Parser.parse(@rss_source)
+      end
+      
+      @elems.each do |tag, value|
+        assert_too_much_tag(tag.to_s, "channel") do
+          Parser.parse(make_RDF(<<-EOR, {@prefix => @uri}))
+#{make_channel(("<" + @prefix + ":" + tag.to_s + ">" +
+  CGI.escapeHTML(value.to_s) +
+  "</" + @prefix + ":" + tag.to_s + ">") * 2)}
+#{make_item}
+EOR
+        end
+      end
+
+    end
+  
+    def test_accessor
+      
+      t = Time.iso8601("2003-01-01T12:00:23+09:00")
+      class << t
+        alias_method(:to_s, :iso8601)
+      end
+      
+      new_value = {
+        :updatePeriod => "daily",
+        :updateFrequency => "11",
+        :updateBase => t,
+      }
+      
+      @elems.each do |name, value|
+        value = value.to_i if name == :updateFrequency
+        @parents.each do |parent|
+          assert_equal(value, @rss.__send__(parent).__send__("sy_#{name}"))
+          @rss.__send__(parent).__send__("sy_#{name}=", new_value[name])
+          new_val = new_value[name]
+          new_val = new_val.to_i if name == :updateFrequency
+          assert_equal(new_val, @rss.__send__(parent).__send__("sy_#{name}"))
+        end
+      end
+      
+      %w(hourly daily weekly monthly yearly).each do |x|
+        @parents.each do |parent|
+          assert_nothing_raised do
+            @rss.__send__(parent).sy_updatePeriod = x
+          end
+        end
+      end
+      
+      %w(-2 0.3 -0.4).each do |x|
+        @parents.each do |parent|
+          assert_not_available_value("updateBase", x) do
+            @rss.__send__(parent).sy_updateBase = x
+          end
+        end
+      end
+      
+    end
+
+    def test_to_s
+      
+      @elems.each do |name, value|
+        excepted = "<#{@prefix}:#{name}>#{value}</#{@prefix}:#{name}>"
+        @parents.each do |parent|
+          assert_equal(excepted,
+                       @rss.__send__(parent).__send__("sy_#{name}_element"))
+        end
+      end
+      
+      REXML::Document.new(@rss_source).root.each_element do |parent|
+        if @parents.include?(parent.name)
+          parent.each_element do |elem|
+            if elem.namespace == @uri
+              assert_equal(elem.text, @elems[elem.name.intern].to_s)
+            end
+          end
+        end
+      end
+      
+    end
+  
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_taxonomy.rb b/ruby_1_8_6/test/rss/test_taxonomy.rb
new file mode 100644
index 0000000000..10ae55190a
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_taxonomy.rb
@@ -0,0 +1,160 @@
+require "cgi"
+
+require "rss-testcase"
+
+require "rss/1.0"
+require "rss/2.0"
+require "rss/taxonomy"
+
+module RSS
+  class TestTaxonomy < TestCase
+    
+    def setup
+      @prefix = "taxo"
+      @uri = "http://purl.org/rss/1.0/modules/taxonomy/"
+      @dc_prefix = "dc"
+      @dc_uri = "http://purl.org/dc/elements/1.1/"
+
+      @ns = {
+        @prefix => @uri,
+        @dc_prefix => @dc_uri,
+      }
+      
+      @topics_parents = %w(channel item)
+      
+      @topics_lis = [
+        "http://meerkat.oreillynet.com/?c=cat23",
+        "http://meerkat.oreillynet.com/?c=47",
+        "http://dmoz.org/Computers/Data_Formats/Markup_Languages/XML/",
+      ]
+
+      @topics_node = "<#{@prefix}:topics>\n"
+      @topics_node << "  <rdf:Bag>\n"
+      @topics_lis.each do |value|
+        resource = CGI.escapeHTML(value)
+        @topics_node << "    <rdf:li resource=\"#{resource}\"/>\n"
+      end
+      @topics_node << "  </rdf:Bag>\n"
+      @topics_node << "</#{@prefix}:topics>"
+
+      @topic_topics_lis = \
+      [
+       "http://meerkat.oreillynet.com/?c=cat23",
+       "http://dmoz.org/Computers/Data_Formats/Markup_Languages/SGML/",
+       "http://dmoz.org/Computers/Programming/Internet/",
+      ]
+
+      @topic_contents = \
+      [
+       {
+         :link => "http://meerkat.oreillynet.com/?c=cat23",
+         :title => "Data: XML",
+         :description => "A Meerkat channel",
+       },
+       {
+         :link => "http://dmoz.org/Computers/Data_Formats/Markup_Languages/XML/",
+         :title => "XML",
+         :subject => "XML",
+         :description => "DMOZ category",
+         :topics => @topic_topics_lis,
+       }
+      ]
+
+      @topic_nodes = @topic_contents.collect do |info|
+        link = info[:link]
+        rv = "<#{@prefix}:topic rdf:about=\"#{link}\">\n"
+        info.each do |name, value|
+          case name
+          when :topics
+            rv << "  <#{@prefix}:topics>\n"
+            rv << "    <rdf:Bag>\n"
+            value.each do |li|
+              resource = CGI.escapeHTML(li)
+              rv << "      <rdf:li resource=\"#{resource}\"/>\n"
+            end
+            rv << "    </rdf:Bag>\n"
+            rv << "  </#{@prefix}:topics>\n"
+          else
+            prefix = (name == :link ? @prefix : @dc_prefix)
+            rv << "  <#{prefix}:#{name}>#{value}</#{prefix}:#{name}>\n"
+          end
+        end
+        rv << "</#{@prefix}:topic>"
+      end
+      
+      @rss_source = make_RDF(<<-EOR, @ns)
+#{make_channel(@topics_node)}
+#{make_image()}
+#{make_item(@topics_node)}
+#{make_textinput()}
+#{@topic_nodes.join("\n")}
+EOR
+
+      @rss = Parser.parse(@rss_source)
+    end
+
+    def test_parser
+      assert_nothing_raised do
+        Parser.parse(@rss_source)
+      end
+      
+      assert_too_much_tag("topics", "channel") do
+        Parser.parse(make_RDF(<<-EOR, @ns))
+#{make_channel(@topics_node * 2)}
+#{make_item()}
+EOR
+      end
+
+      assert_too_much_tag("topics", "item") do
+        Parser.parse(make_RDF(<<-EOR, @ns))
+#{make_channel()}
+#{make_item(@topics_node * 2)}
+EOR
+      end
+    end
+  
+    def test_accessor
+      topics = @rss.channel.taxo_topics
+      assert_equal(@topics_lis.sort,
+                   topics.Bag.lis.collect {|li| li.resource}.sort)
+      assert_equal(@topics_lis.sort, topics.resources.sort)
+
+      assert_equal(@rss.taxo_topics.first, @rss.taxo_topic)
+
+      @topic_contents.each_with_index do |info, i|
+        topic = @rss.taxo_topics[i]
+        info.each do |name, value|
+          case name
+          when :link
+            assert_equal(value, topic.about)
+            assert_equal(value, topic.taxo_link)
+          when :topics
+            assert_equal(value.sort, topic.taxo_topics.resources.sort)
+          else
+            assert_equal(value, topic.__send__("dc_#{name}"))
+          end
+        end
+      end
+    end
+    
+    def test_to_s
+      @topics_parents.each do |parent|
+        meth = "taxo_topics_element"
+        assert_equal(@topics_node, @rss.__send__(parent).__send__(meth))
+      end
+
+      @topic_nodes.each_with_index do |node, i|
+        expected = REXML::Document.new(node).root
+        actual = REXML::Document.new(@rss.taxo_topics[i].to_s(true, "")).root
+        expected_elems = expected.reject {|x| x.is_a?(REXML::Text)}
+        actual_elems = actual.reject {|x| x.is_a?(REXML::Text)}
+        expected_elems.sort! {|x, y| x.name <=> y.name}
+        actual_elems.sort! {|x, y| x.name <=> y.name}
+        assert_equal(expected_elems.collect {|x| x.to_s},
+                     actual_elems.collect {|x| x.to_s})
+        assert_equal(expected.attributes.sort, actual.attributes.sort)
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/test/rss/test_to_s.rb b/ruby_1_8_6/test/rss/test_to_s.rb
new file mode 100644
index 0000000000..1538534034
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_to_s.rb
@@ -0,0 +1,440 @@
+require "rexml/document"
+
+require "rss-testcase"
+
+require "rss/maker"
+require "rss/1.0"
+require "rss/2.0"
+require "rss/content"
+require "rss/dublincore"
+require "rss/syndication"
+require "rss/trackback"
+
+module RSS
+  class TestToS < TestCase
+    
+    def setup
+      @image_url = "http://example.com/foo.png"
+      @textinput_link = "http://example.com/search.cgi"
+      @item_links = [
+        "http://example.com/1",
+        "http://example.com/2",
+      ]
+      
+      setup_xml_declaration_info
+      setup_xml_stylesheet_infos
+      setup_channel_info
+      setup_item_infos
+      setup_image_info
+      setup_textinput_info
+
+      setup_dublin_core_info
+      setup_syndication_info
+      setup_content_info
+      setup_trackback_info
+    end
+
+    def test_to_s_10
+      rss = RSS::Maker.make("1.0") do |maker|
+        setup_full(maker)
+      end
+
+      assert_xml_declaration(@version, @encoding, @standalone, rss)
+      assert_xml_stylesheets(@xs_infos, rss.xml_stylesheets)
+      assert_channel10(@channel_info, rss.channel)
+      assert_items10(@item_infos, rss.items)
+      rss.items.each do |item|
+        assert_trackback(@trackback_info, item)
+      end
+      assert_image10(@image_info, rss.image)
+      assert_textinput10(@textinput_info, rss.textinput)
+
+      rss = RSS::Parser.parse(rss.to_s)
+
+      assert_xml_declaration(@version, @encoding, @standalone, rss)
+      assert_xml_stylesheets(@xs_infos, rss.xml_stylesheets)
+      assert_channel10(@channel_info, rss.channel)
+      assert_items10(@item_infos, rss.items)
+      assert_image10(@image_info, rss.image)
+      assert_textinput10(@textinput_info, rss.textinput)
+    end
+    
+    def test_to_s_09
+      rss = RSS::Maker.make("0.91") do |maker|
+        setup_full(maker)
+      end
+
+      assert_xml_declaration(@version, @encoding, @standalone, rss)
+      assert_xml_stylesheets(@xs_infos, rss.xml_stylesheets)
+      assert_channel09(@channel_info, rss.channel)
+      assert_items09(@item_infos, rss.items)
+      assert_image09(@image_info, rss.image)
+      assert_textinput09(@textinput_info, rss.textinput)
+
+      rss = RSS::Parser.parse(rss.to_s)
+
+      assert_xml_declaration(@version, @encoding, @standalone, rss)
+      assert_xml_stylesheets(@xs_infos, rss.xml_stylesheets)
+      assert_channel09(@channel_info, rss.channel)
+      assert_items09(@item_infos, rss.items)
+      assert_image09(@image_info, rss.image)
+      assert_textinput09(@textinput_info, rss.textinput)
+    end
+    
+    def test_to_s_20
+      rss = RSS::Maker.make("2.0") do |maker|
+        setup_full(maker)
+      end
+
+      assert_xml_declaration(@version, @encoding, @standalone, rss)
+      assert_xml_stylesheets(@xs_infos, rss.xml_stylesheets)
+      assert_channel20(@channel_info, rss.channel)
+      assert_items20(@item_infos, rss.items)
+      assert_image20(@image_info, rss.image)
+      assert_textinput20(@textinput_info, rss.textinput)
+
+      rss = RSS::Parser.parse(rss.to_s)
+
+      assert_xml_declaration(@version, @encoding, @standalone, rss)
+      assert_xml_stylesheets(@xs_infos, rss.xml_stylesheets)
+      assert_channel20(@channel_info, rss.channel)
+      assert_items20(@item_infos, rss.items)
+      assert_image20(@image_info, rss.image)
+      assert_textinput20(@textinput_info, rss.textinput)
+    end
+    
+    private
+    def setup_xml_declaration_info
+      @version = "1.0"
+      @encoding = "UTF-8"
+      @standalone = false
+    end
+
+    def setup_xml_stylesheet_infos
+      @xs_infos = [
+        {
+          "href" => "XXX.xsl",
+          "type" => "text/xsl",
+          "title" => "XXX",
+          "media" => "print",
+          "alternate" => "no",
+        },
+        {
+          "href" => "YYY.css",
+          "type" => "text/css",
+          "title" => "YYY",
+          "media" => "all",
+          "alternate" => "no",
+        },
+      ]
+    end
+
+    def setup_channel_info
+      @channel_info = {
+        "about" => "http://example.com/index.rdf",
+        "title" => "Sample RSS",
+        "link" => "http://example.com/",
+        "description" => "Sample\n\n\n\n\nSite",
+        "language" => "en",
+        "copyright" => "FDL",
+        "managingEditor" => "foo@example.com",
+        "webMaster" => "webmaster@example.com",
+        "rating" => '(PICS-1.1 "http://www.rsac.org/ratingsv01.html" l gen true comment "RSACi North America Server" for "http://www.rsac.org" on "1996.04.16T08:15-0500" r (n 0 s 0 v 0 l 0))',
+        "docs" => "http://backend.userland.com/rss091",
+        "skipDays" => [
+          "Monday",
+          "Friday",
+        ],
+        "skipHours" => [
+          "12",
+          "23",
+        ],
+        "date" => Time.now,
+        "lastBuildDate" => Time.now - 3600,
+        "generator" => "RSS Maker",
+        "ttl" => "60",
+        "cloud" => {
+          "domain" => "rpc.sys.com",
+          "port" => "80",
+          "path" => "/RPC2",
+          "registerProcedure" => "myCloud.rssPleaseNotify",
+          "protocol" => "xml-rpc",
+        },
+        "category" => {
+          "domain" => "http://example.com/misc/",
+          "content" => "misc",
+        },
+
+        "image" => {
+          "resource" => @image_url,
+        },
+
+        "textinput" => {
+          "resource" => @textinput_link,
+        },
+
+        "items" => @item_links.collect{|link| {"resource" => link}},
+      }
+    end
+
+    def setup_item_infos
+      @item_infos = [
+        {
+          "title" => "Sample item1",
+          "link" => @item_links[0],
+          "description" => "Sample description1",
+          "date" => Time.now - 3600,
+          "author" => "foo@example.com",
+          "comments" => "http://example.com/1/comments",
+          "guid" => {
+            "isPermaLink" => "true",
+            "content" => "http://example.com/1",
+          },
+          "enclosure" => {
+            "url" => "http://example.com/1.mp3",
+            "length" => "100",
+            "type" => "audio/mpeg",
+          },
+          "source" => {
+            "url" => "http:/example.com/",
+            "content" => "Sample site",
+          },
+          "category" => {
+            "domain" => "http://example.com/misc/",
+            "content" => "misc",
+          },
+        },
+
+        {
+          "title" => "Sample item2",
+          "link" => @item_links[1],
+          "description" => "Sample description2",
+          "date" => Time.now - 7200,
+          "author" => "foo@example.com",
+          "comments" => "http://example.com/2/comments",
+          "guid" => {
+            "isPermaLink" => "false",
+            "content" => "http://example.com/2",
+          },
+          "enclosure" => {
+            "url" => "http://example.com/2.mp3",
+            "length" => "200",
+            "type" => "audio/mpeg",
+          },
+          "source" => {
+            "url" => "http:/example.com/",
+            "content" => "Sample site",
+          },
+          "category" => {
+            "domain" => "http://example.com/misc/",
+            "content" => "misc",
+          },
+        },
+      ]
+    end
+
+    def setup_image_info
+      @image_info = {
+        "title" => "Sample image",
+        "url" => @image_url,
+        "width" => "88",
+        "height" => "31",
+        "description" => "Sample",
+      }
+    end
+
+    def setup_textinput_info
+      @textinput_info = {
+        "title" => "Sample textinput",
+        "description" => "Search",
+        "name" => "key",
+        "link" => @textinput_link,
+      }
+    end
+
+    def setup_dublin_core_info
+      @dc_info = {
+        "title" => "DC title",
+        "description" => "DC desc",
+        "creator" => "DC creator",
+        "subject" => "DC subject",
+        "publisher" => "DC publisher",
+        "contributor" => "DC contributor",
+        "type" => "DC type",
+        "format" => "DC format",
+        "identifier" => "DC identifier",
+        "source" => "DC source",
+        "language" => "ja",
+        "relation" => "DC relation",
+        "coverage" => "DC coverage",
+        "rights" => "DC rights",
+        "date" => Time.now - 60,
+      }
+    end
+
+    def setup_syndication_info
+      @sy_info = {
+        "updatePeriod" => "hourly",
+        "updateFrequency" => "2",
+        "updateBase" => Time.now - 3600,
+      }
+    end
+    
+    def setup_content_info
+      @content_info = {
+        "encoded" => "<p>p</p>",
+      }
+    end
+    
+    def setup_trackback_info
+      @trackback_info = {
+        "ping" => "http://example.com/tb.cgi?tb_id=XXX",
+        "abouts" => [
+          "http://example.net/tb.cgi?tb_id=YYY",
+          "http://example.org/tb.cgi?tb_id=ZZZ",
+        ]
+      }
+    end
+
+
+    def setup_full(maker)
+      setup_xml_declaration(maker)
+      setup_xml_stylesheets(maker)
+      setup_channel(maker)
+      setup_image(maker)
+      setup_items(maker)
+      setup_textinput(maker)
+    end
+
+    def setup_xml_declaration(maker)
+      %w(version encoding standalone).each do |name|
+        maker.__send__("#{name}=", instance_eval("@#{name}"))
+      end
+    end
+
+    def setup_xml_stylesheets(maker)
+      @xs_infos.each do |info|
+        xs = maker.xml_stylesheets.new_xml_stylesheet
+        info.each do |name, value|
+          xs.__send__("#{name}=", value)
+        end
+      end
+    end
+
+    def setup_channel(maker)
+      channel = maker.channel
+      info = @channel_info
+      
+      %w(about title link description language copyright
+         managingEditor webMaster rating docs date
+         lastBuildDate generator ttl).each do |name|
+        channel.__send__("#{name}=", info[name])
+      end
+
+      skipDays = channel.skipDays
+      info["skipDays"].each do |day|
+        new_day = skipDays.new_day
+        new_day.content = day
+      end
+
+      skipHours = channel.skipHours
+      info["skipHours"].each do |hour|
+        new_hour = skipHours.new_hour
+        new_hour.content = hour
+      end
+      
+      cloud = channel.cloud
+      %w(domain port path registerProcedure protocol).each do |name|
+        cloud.__send__("#{name}=", info["cloud"][name])
+      end
+
+      category = channel.categories.new_category
+      %w(domain content).each do |name|
+        category.__send__("#{name}=", info["category"][name])
+      end
+    end
+    
+    def setup_image(maker)
+      image = maker.image
+      info = @image_info
+
+      %w(title url width height description).each do |name|
+        image.__send__("#{name}=", info[name])
+      end
+    end
+    
+    def setup_items(maker)
+      items = maker.items
+
+      @item_infos.each do |info|
+        item = items.new_item
+        %w(title link description date author comments).each do |name|
+          item.__send__("#{name}=", info[name])
+        end
+        
+        guid = item.guid
+        %w(isPermaLink content).each do |name|
+          guid.__send__("#{name}=", info["guid"][name])
+        end
+
+        enclosure = item.enclosure
+        %w(url length type).each do |name|
+          enclosure.__send__("#{name}=", info["enclosure"][name])
+        end
+
+        source = item.source
+        %w(url content).each do |name|
+          source.__send__("#{name}=", info["source"][name])
+        end
+
+        category = item.categories.new_category
+        %w(domain content).each do |name|
+          category.__send__("#{name}=", info["category"][name])
+        end
+
+        setup_trackback(item)
+      end
+    end
+
+    def setup_textinput(maker)
+      textinput = maker.textinput
+      info = @textinput_info
+
+      %w(title description name link).each do |name|
+        textinput.__send__("#{name}=", info[name])
+      end
+    end
+
+    def setup_content(target)
+      prefix = "content"
+      %w(encoded).each do |name|
+        target.__send__("#{prefix}_#{name}=", @content_info[name])
+      end
+    end
+    
+    def setup_dublin_core(target)
+      prefix = "dc"
+      %w(title description creator subject publisher
+        contributor type format identifier source language
+        relation coverage rights).each do |name|
+        target.__send__("#{prefix}_#{name}=", @dc_info[name])
+      end
+    end
+    
+    def setup_syndicate(target)
+      prefix = "sy"
+      %w(updatePeriod updateFrequency updateBase).each do |name|
+        target.__send__("#{prefix}_#{name}=", @sy_info[name])
+      end
+    end
+    
+    def setup_trackback(target)
+      target.trackback_ping = @trackback_info["ping"]
+      @trackback_info["abouts"].each do |about|
+        new_about = target.trackback_abouts.new_about
+        new_about.value = about
+      end
+    end
+    
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_trackback.rb b/ruby_1_8_6/test/rss/test_trackback.rb
new file mode 100644
index 0000000000..26812d9010
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_trackback.rb
@@ -0,0 +1,135 @@
+require "cgi"
+require "rexml/document"
+
+require "rss-testcase"
+
+require "rss/1.0"
+require "rss/2.0"
+require "rss/trackback"
+
+module RSS
+  class TestTrackBack < TestCase
+    
+    def setup
+      @prefix = "trackback"
+      @uri = "http://madskills.com/public/xml/rss/module/trackback/"
+      
+      @parents = %w(item)
+      
+      @elems = {
+        :ping => "http://bar.com/tb.cgi?tb_id=rssplustrackback",
+        :about => "http://foo.com/trackback/tb.cgi?tb_id=20020923",
+      }
+      
+      @content_nodes = @elems.collect do |name, value|
+        "<#{@prefix}:#{name} rdf:resource=\"#{CGI.escapeHTML(value.to_s)}\"/>"
+      end.join("\n")
+      
+      @content_nodes2 = @elems.collect do |name, value|
+        "<#{@prefix}:#{name}>#{CGI.escapeHTML(value.to_s)}</#{@prefix}:#{name}>"
+      end.join("\n")
+      
+      @rss_source = make_RDF(<<-EOR, {@prefix =>  @uri})
+#{make_channel()}
+#{make_image()}
+#{make_item(@content_nodes)}
+#{make_textinput()}
+EOR
+
+      @rss = Parser.parse(@rss_source)
+
+      @rss20_source = make_rss20(nil, {@prefix =>  @uri}) do
+        make_channel20(nil) do
+          make_item20(@content_nodes2)
+        end
+      end
+
+      @rss20 = Parser.parse(@rss20_source, false)
+    end
+
+    def test_parser
+
+      assert_nothing_raised do
+        Parser.parse(@rss_source)
+      end
+
+      @elems.find_all{|k, v| k == :ping}.each do |tag, value|
+        assert_too_much_tag(tag.to_s, "item") do
+          Parser.parse(make_RDF(<<-EOR, {@prefix => @uri}))
+#{make_channel()}
+#{make_item(("<" + @prefix + ":" + tag.to_s + " rdf:resource=\"" +
+  CGI.escapeHTML(value.to_s) +
+  "\"/>") * 2)}
+EOR
+        end
+      end
+
+      @elems.find_all{|k, v| k == :about}.each do |tag, value|
+        assert_missing_tag("trackback:ping", "item") do
+          Parser.parse(make_RDF(<<-EOR, {@prefix => @uri}))
+#{make_channel()}
+#{make_item(("<" + @prefix + ":" + tag.to_s + " rdf:resource=\"" +
+  CGI.escapeHTML(value.to_s) +
+  "\"/>") * 2)}
+EOR
+        end
+
+      end
+
+    end
+  
+    def test_accessor
+      
+      new_value = {
+        :ping => "http://baz.com/trackback/tb.cgi?tb_id=20030808",
+        :about => "http://hoge.com/trackback/tb.cgi?tb_id=90030808",
+      }
+      
+      @elems.each do |name, value|
+        @parents.each do |parent|
+          accessor = "#{RSS::TRACKBACK_PREFIX}_#{name}"
+          target = @rss.__send__(parent)
+          target20 = @rss20.channel.__send__(parent, -1)
+          assert_equal(value, target.__send__(accessor))
+          assert_equal(value, target20.__send__(accessor))
+          if name == :about
+            # abount is zero or more
+            target.__send__("#{accessor}=", 0, new_value[name].to_s)
+            target20.__send__("#{accessor}=", 0, new_value[name].to_s)
+          else
+            target.__send__("#{accessor}=", new_value[name].to_s)
+            target20.__send__("#{accessor}=", new_value[name].to_s)
+          end
+          assert_equal(new_value[name], target.__send__(accessor))
+          assert_equal(new_value[name], target20.__send__(accessor))
+        end
+      end
+      
+    end
+
+    def test_to_s
+      
+      @elems.each do |name, value|
+        excepted = %Q!<#{@prefix}:#{name} rdf:resource="#{CGI.escapeHTML(value)}"/>!
+        @parents.each do |parent|
+          meth = "#{RSS::TRACKBACK_PREFIX}_#{name}_element"
+          meth << "s" if name == :about
+          assert_equal(excepted, @rss.__send__(parent).__send__(meth))
+        end
+      end
+      
+      REXML::Document.new(@rss_source).root.each_element do |parent|
+        if @parents.include?(parent.name)
+          parent.each_element do |elem|
+            if elem.namespace == @uri
+              assert_equal(elem.attributes["resource"], @elems[elem.name.intern])
+            end
+          end
+        end
+      end
+      
+    end
+    
+  end
+end
+
diff --git a/ruby_1_8_6/test/rss/test_version.rb b/ruby_1_8_6/test/rss/test_version.rb
new file mode 100644
index 0000000000..237f364b20
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_version.rb
@@ -0,0 +1,9 @@
+require "rss-testcase"
+
+module RSS
+  class TestVersion < TestCase
+    def test_version
+      assert_equal("0.1.6", ::RSS::VERSION)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/rss/test_xml-stylesheet.rb b/ruby_1_8_6/test/rss/test_xml-stylesheet.rb
new file mode 100644
index 0000000000..c88a858f56
--- /dev/null
+++ b/ruby_1_8_6/test/rss/test_xml-stylesheet.rb
@@ -0,0 +1,108 @@
+require "rexml/document"
+
+require "rss-testcase"
+
+require "rss/1.0"
+require "rss/xml-stylesheet"
+
+module RSS
+  class TestXMLStyleSheet < TestCase
+    
+    def test_accessor
+      [
+        {:href => "a.xsl", :type => "text/xsl"},
+        {:media => "print", :title => "FOO"},
+        {:charset => "UTF-8", :alternate => "yes"},
+      ].each do |attrs|
+        assert_xml_stylesheet_attrs(attrs, XMLStyleSheet.new(*attrs))
+      end
+    end
+    
+    def test_to_s
+      [
+        {:href => "a.xsl", :type => "text/xsl"},
+        {:type => "text/xsl"},
+        {:href => "a.xsl", :guess_type => "text/xsl"},
+        {:href => "a.css", :type => "text/css"},
+        {:href => "a.css", :type => "text/xsl",
+         :guess_type => "text/css"},
+        {:href => "a.xsl", :type => "text/xsl",
+         :title => "sample", :media => "printer",
+         :charset => "UTF-8", :alternate => "yes"},
+        {:href => "a.css", :guess_type => "text/css",
+         :alternate => "no"},
+        {:type => "text/xsl", :title => "sample",
+         :media => "printer", :charset => "UTF-8",
+         :alternate => "yes"},
+      ].each do |attrs|
+        target, contents = parse_pi(XMLStyleSheet.new(*attrs).to_s)
+        assert_xml_stylesheet(target, attrs, XMLStyleSheet.new(*contents))
+      end
+    end
+    
+    def test_bad_alternate
+      %w(a ___ ??? BAD_ALTERNATE).each do |value|
+        xss = XMLStyleSheet.new
+        assert_raise(NotAvailableValueError) do
+          xss.alternate = value
+        end
+        xss.do_validate = false
+        assert_nothing_raised do
+          xss.alternate = value
+        end
+        assert_nil(xss.alternate)
+      end
+    end
+    
+    def test_parse
+      [
+        [{:href => "a.xsl", :type => "text/xsl"},],
+        [{:media => "print", :title => "FOO"},],
+        [{:charset => "UTF-8", :alternate => "yes"},],
+        [{:href => "a.xsl", :type => "text/xsl"},
+         {:type => "text/xsl"},
+         {:href => "a.xsl", :guess_type => "text/xsl"},
+         {:href => "a.css", :type => "text/css"},
+         {:href => "a.css", :type => "text/xsl",
+          :guess_type => "text/css"},
+         {:href => "a.xsl", :type => "text/xsl",
+          :title => "sample", :media => "printer",
+          :charset => "UTF-8", :alternate => "yes"},
+         {:href => "a.css", :guess_type => "text/css",
+          :alternate => "no"},
+         {:type => "text/xsl", :title => "sample",
+          :media => "printer", :charset => "UTF-8",
+          :alternate => "yes"},],
+      ].each do |xsss|
+        doc = REXML::Document.new(make_sample_RDF)
+        root = doc.root
+        xsss.each do |xss|
+          content = xss.collect do |key, name|
+            %Q[#{key}="#{name}"]
+          end.join(" ")
+          pi = REXML::Instruction.new("xml-stylesheet", content)
+          root.previous_sibling = pi
+        end
+        rss = Parser.parse(doc.to_s)
+        have_href_xsss = xsss.find_all {|xss| xss.has_key?(:href)}
+        assert_equal(have_href_xsss.size, rss.xml_stylesheets.size)
+        rss.xml_stylesheets.each_with_index do |stylesheet, i|
+          target, = parse_pi(stylesheet.to_s)
+          assert_xml_stylesheet(target, have_href_xsss[i], stylesheet)
+        end
+      end
+    end
+    
+    def parse_pi(pi)
+      /\A\s*<\?(\S+)([^(?:\?>)]+)\?>\s*\z/ =~ pi
+      target = $1
+      dummy = REXML::Document.new("<dummy #{$2}/>").root
+      contents = {}
+      dummy.attributes.each do |name, value|
+        contents[name] = value
+      end
+      [target, contents]
+    end
+    
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/beginmainend.rb b/ruby_1_8_6/test/ruby/beginmainend.rb
new file mode 100644
index 0000000000..646140dd22
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/beginmainend.rb
@@ -0,0 +1,80 @@
+errout = ARGV.shift
+
+BEGIN {
+  puts "b1"
+  local_begin1 = "local_begin1"
+  $global_begin1 = "global_begin1"
+  ConstBegin1 = "ConstBegin1"
+}
+
+BEGIN {
+  puts "b2"
+
+  BEGIN {
+    puts "b2-1"
+  }
+}
+
+# for scope check
+raise if defined?(local_begin1)
+raise unless defined?($global_begin1)
+raise unless defined?(::ConstBegin1)
+local_for_end2 = "e2"
+$global_for_end1 = "e1"
+
+puts "main"
+
+END {
+  puts local_for_end2	# e2
+}
+
+eval <<EOE
+  BEGIN {
+    puts "b3"
+
+    BEGIN {
+      puts "b3-1"
+    }
+  }
+
+  BEGIN {
+    puts "b4"
+  }
+
+  END {
+    puts "e3"
+  }
+
+  END {
+    puts "e4"
+
+    END {
+      puts "e4-1"
+
+      END {
+	puts "e4-1-1"
+      }
+    }
+
+    END {
+      puts "e4-2"
+    }
+  }
+EOE
+
+END {
+  exit
+  puts "should not be dumped"
+
+  END {
+    puts "not reached"
+  }
+}
+
+END {
+  puts $global_for_end1	# e1
+
+  END {
+    puts "e1-1"
+  }
+}
diff --git a/ruby_1_8_6/test/ruby/endblockwarn.rb b/ruby_1_8_6/test/ruby/endblockwarn.rb
new file mode 100644
index 0000000000..7b7f97f597
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/endblockwarn.rb
@@ -0,0 +1,12 @@
+def end1
+  END {}
+end
+
+end1
+
+eval <<EOE
+  def end2
+    END {}
+  end
+EOE
+
diff --git a/ruby_1_8_6/test/ruby/envutil.rb b/ruby_1_8_6/test/ruby/envutil.rb
new file mode 100644
index 0000000000..c481326288
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/envutil.rb
@@ -0,0 +1,28 @@
+module EnvUtil
+  def rubybin
+    if ruby = ENV["RUBY"]
+      return ruby
+    end
+    ruby = "ruby"
+    rubyexe = ruby+".exe"
+    3.times do
+      if File.exist? ruby and File.executable? ruby and !File.directory? ruby
+        return File.expand_path(ruby)
+      end
+      if File.exist? rubyexe and File.executable? rubyexe
+        return File.expand_path(ruby)
+      end
+      ruby = File.join("..", ruby)
+    end
+    begin
+      require "rbconfig"
+      File.join(
+        Config::CONFIG["bindir"],
+	Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
+      )
+    rescue LoadError
+      "ruby"
+    end
+  end
+  module_function :rubybin
+end
diff --git a/ruby_1_8_6/test/ruby/marshaltestlib.rb b/ruby_1_8_6/test/ruby/marshaltestlib.rb
new file mode 100644
index 0000000000..891f43b1f7
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/marshaltestlib.rb
@@ -0,0 +1,494 @@
+module MarshalTestLib
+  # include this module to a Test::Unit::TestCase and definde encode(o) and
+  # decode(s) methods.  e.g.
+  #
+  # def encode(o)
+  #   SOAPMarshal.dump(o)
+  # end
+  #
+  # def decode(s)
+  #   SOAPMarshal.load(s)
+  # end
+
+  NegativeZero = (-1.0 / (1.0 / 0.0))
+
+  module Mod1; end
+  module Mod2; end
+
+  def marshaltest(o1)
+    str = encode(o1)
+    print str, "\n" if $DEBUG
+    o2 = decode(str)
+    o2
+  end
+
+  def marshal_equal(o1, msg = nil)
+    msg = msg ? msg + "(#{ caller[0] })" : caller[0]
+    o2 = marshaltest(o1)
+    assert_equal(o1.class, o2.class, msg)
+    iv1 = o1.instance_variables.sort
+    iv2 = o2.instance_variables.sort
+    assert_equal(iv1, iv2)
+    val1 = iv1.map {|var| o1.instance_eval {eval var}}
+    val2 = iv1.map {|var| o2.instance_eval {eval var}}
+    assert_equal(val1, val2, msg)
+    if block_given?
+      assert_equal(yield(o1), yield(o2), msg)
+    else
+      assert_equal(o1, o2, msg)
+    end
+  end
+
+  class MyObject; def initialize(v) @v = v end; attr_reader :v; end
+  def test_object
+    o1 = Object.new
+    o1.instance_eval { @iv = 1 }
+    marshal_equal(o1) {|o| o.instance_eval { @iv }}
+  end
+
+  def test_object_subclass
+    marshal_equal(MyObject.new(2)) {|o| o.v}
+  end
+
+  def test_object_extend
+    o1 = Object.new
+    o1.extend(Mod1)
+    marshal_equal(o1) { |o|
+      (class << self; self; end).ancestors
+    }
+    o1.extend(Mod2)
+    marshal_equal(o1) { |o|
+      (class << self; self; end).ancestors
+    }
+  end
+
+  def test_object_subclass_extend
+    o1 = MyObject.new(2)
+    o1.extend(Mod1)
+    marshal_equal(o1) { |o|
+      (class << self; self; end).ancestors
+    }
+    o1.extend(Mod2)
+    marshal_equal(o1) { |o|
+      (class << self; self; end).ancestors
+    }
+  end
+
+  class MyArray < Array
+    def initialize(v, *args)
+      super(args)
+      @v = v
+    end
+  end
+  def test_array
+    marshal_equal(5)
+    marshal_equal([1,2,3])
+  end
+
+  def test_array_subclass
+    marshal_equal(MyArray.new(0, 1, 2, 3))
+  end
+
+  def test_array_ivar
+    o1 = Array.new
+    o1.instance_eval { @iv = 1 }
+    marshal_equal(o1) {|o| o.instance_eval { @iv }}
+  end
+
+  class MyException < Exception; def initialize(v, *args) super(*args); @v = v; end; attr_reader :v; end
+  def test_exception
+    marshal_equal(Exception.new('foo')) {|o| o.message}
+    marshal_equal(assert_raise(NoMethodError) {no_such_method()}) {|o| o.message}
+  end
+
+  def test_exception_subclass
+    marshal_equal(MyException.new(20, "bar")) {|o| [o.message, o.v]}
+  end
+
+  def test_false
+    marshal_equal(false)
+  end
+
+  class MyHash < Hash; def initialize(v, *args) super(*args); @v = v; end end
+  def test_hash
+    marshal_equal({1=>2, 3=>4})
+  end
+
+  def test_hash_default
+    h = Hash.new(:default)
+    h[5] = 6
+    marshal_equal(h)
+  end
+
+  def test_hash_subclass
+    h = MyHash.new(7, 8)
+    h[4] = 5
+    marshal_equal(h)
+  end
+
+  def test_hash_default_proc
+    h = Hash.new {}
+    assert_raises(TypeError) { marshaltest(h) }
+  end
+
+  def test_hash_ivar
+    o1 = Hash.new
+    o1.instance_eval { @iv = 1 }
+    marshal_equal(o1) {|o| o.instance_eval { @iv }}
+  end
+
+  def test_hash_extend
+    o1 = Hash.new
+    o1.extend(Mod1)
+    marshal_equal(o1) { |o|
+      (class << self; self; end).ancestors
+    }
+    o1.extend(Mod2)
+    marshal_equal(o1) { |o|
+      (class << self; self; end).ancestors
+    }
+  end
+
+  def test_hash_subclass_extend
+    o1 = MyHash.new(2)
+    o1.extend(Mod1)
+    marshal_equal(o1) { |o|
+      (class << self; self; end).ancestors
+    }
+    o1.extend(Mod2)
+    marshal_equal(o1) { |o|
+      (class << self; self; end).ancestors
+    }
+  end
+
+  def test_bignum
+    marshal_equal(-0x4000_0000_0000_0001)
+    marshal_equal(-0x4000_0001)
+    marshal_equal(0x4000_0000)
+    marshal_equal(0x4000_0000_0000_0000)
+  end
+
+  def test_fixnum
+    marshal_equal(-0x4000_0000)
+    marshal_equal(-0x3fff_ffff)
+    marshal_equal(-1)
+    marshal_equal(0)
+    marshal_equal(1)
+    marshal_equal(0x3fff_ffff)
+  end
+
+  def test_fixnum_ivar
+    o1 = 1
+    o1.instance_eval { @iv = 2 }
+    marshal_equal(o1) {|o| o.instance_eval { @iv }}
+  ensure
+    1.instance_eval { remove_instance_variable("@iv") }
+  end
+
+  def test_fixnum_ivar_self
+    o1 = 1
+    o1.instance_eval { @iv = 1 }
+    marshal_equal(o1) {|o| o.instance_eval { @iv }}
+  ensure
+    1.instance_eval { remove_instance_variable("@iv") }
+  end
+
+  def test_float
+    marshal_equal(-1.0)
+    marshal_equal(0.0)
+    marshal_equal(1.0)
+  end
+
+  def test_float_inf_nan
+    marshal_equal(1.0/0.0)
+    marshal_equal(-1.0/0.0)
+    marshal_equal(0.0/0.0) {|o| o.nan?}
+    marshal_equal(NegativeZero) {|o| 1.0/o}
+  end
+
+  def test_float_ivar
+    o1 = 1.23
+    o1.instance_eval { @iv = 1 }
+    marshal_equal(o1) {|o| o.instance_eval { @iv }}
+  end
+
+  def test_float_ivar_self
+    o1 = 5.5
+    o1.instance_eval { @iv = o1 }
+    marshal_equal(o1) {|o| o.instance_eval { @iv }}
+  end
+
+  def test_float_extend
+    o1 = 0.0/0.0
+    o1.extend(Mod1)
+    marshal_equal(o1) { |o|
+      (class << self; self; end).ancestors
+    }
+    o1.extend(Mod2)
+    marshal_equal(o1) { |o|
+      (class << self; self; end).ancestors
+    }
+  end
+
+  class MyRange < Range; def initialize(v, *args) super(*args); @v = v; end end
+  def test_range
+    marshal_equal(1..2)
+    marshal_equal(1...3)
+  end
+
+  def test_range_subclass
+    marshal_equal(MyRange.new(4,5,8, false))
+  end
+
+  class MyRegexp < Regexp; def initialize(v, *args) super(*args); @v = v; end end
+  def test_regexp
+    marshal_equal(/a/)
+    marshal_equal(/A/i)
+    marshal_equal(/A/mx)
+  end
+
+  def test_regexp_subclass
+    marshal_equal(MyRegexp.new(10, "a"))
+  end
+
+  class MyString < String; def initialize(v, *args) super(*args); @v = v; end end
+  def test_string
+    marshal_equal("abc")
+  end
+
+  def test_string_ivar
+    o1 = ""
+    o1.instance_eval { @iv = 1 }
+    marshal_equal(o1) {|o| o.instance_eval { @iv }}
+  end
+
+  def test_string_subclass
+    marshal_equal(MyString.new(10, "a"))
+  end
+
+  def test_string_subclass_cycle
+    str = MyString.new(10, "b")
+    str.instance_eval { @v = str }
+    marshal_equal(str) { |o|
+      assert_equal(o.__id__, o.instance_eval { @v }.__id__)
+      o.instance_eval { @v }
+    }
+  end
+
+  def test_string_subclass_extend
+    o = "abc"
+    o.extend(Mod1)
+    str = MyString.new(o, "c")
+    marshal_equal(str) { |o|
+      assert(o.instance_eval { @v }).kind_of?(Mod1)
+    }
+  end
+
+  MyStruct = Struct.new("MyStruct", :a, :b)
+  if RUBY_VERSION < "1.8.0"
+    # Struct#== is not defined in ruby/1.6
+    class MyStruct
+      def ==(rhs)
+	return true if __id__ == rhs.__id__
+	return false unless rhs.is_a?(::Struct) 
+	return false if self.class != rhs.class
+	members.each do |member|
+	  return false if self.__send__(member) != rhs.__send__(member)
+	end
+	return true
+      end
+    end
+  end
+  class MySubStruct < MyStruct; def initialize(v, *args) super(*args); @v = v; end end
+  def test_struct
+    marshal_equal(MyStruct.new(1,2))
+  end
+
+  def test_struct_subclass
+    if RUBY_VERSION < "1.8.0"
+      # Substruct instance cannot be dumped in ruby/1.6
+      # ::Marshal.dump(MySubStruct.new(10, 1, 2)) #=> uninitialized struct
+      return false
+    end
+    marshal_equal(MySubStruct.new(10,1,2))
+  end
+
+  def test_struct_ivar
+    o1 = MyStruct.new
+    o1.instance_eval { @iv = 1 }
+    marshal_equal(o1) {|o| o.instance_eval { @iv }}
+  end
+
+  def test_struct_subclass_extend
+    o1 = MyStruct.new
+    o1.extend(Mod1)
+    marshal_equal(o1) { |o|
+      (class << self; self; end).ancestors
+    }
+    o1.extend(Mod2)
+    marshal_equal(o1) { |o|
+      (class << self; self; end).ancestors
+    }
+  end
+
+  def test_symbol
+    marshal_equal(:a)
+    marshal_equal(:a?)
+    marshal_equal(:a!)
+    marshal_equal(:a=)
+    marshal_equal(:|)
+    marshal_equal(:^)
+    marshal_equal(:&)
+    marshal_equal(:<=>)
+    marshal_equal(:==)
+    marshal_equal(:===)
+    marshal_equal(:=~)
+    marshal_equal(:>)
+    marshal_equal(:>=)
+    marshal_equal(:<)
+    marshal_equal(:<=)
+    marshal_equal(:<<)
+    marshal_equal(:>>)
+    marshal_equal(:+)
+    marshal_equal(:-)
+    marshal_equal(:*)
+    marshal_equal(:/)
+    marshal_equal(:%)
+    marshal_equal(:**)
+    marshal_equal(:~)
+    marshal_equal(:+@)
+    marshal_equal(:-@)
+    marshal_equal(:[])
+    marshal_equal(:[]=)
+    marshal_equal(:`)   #`
+    marshal_equal("a b".intern)
+  end
+
+  class MyTime < Time; def initialize(v, *args) super(*args); @v = v; end end
+  def test_time
+    # once there was a bug caused by usec overflow.  try a little harder.
+    10.times do
+      t = Time.now
+      marshal_equal(t, t.usec.to_s)
+    end
+  end
+
+  def test_time_subclass
+    marshal_equal(MyTime.new(10))
+  end
+
+  def test_time_ivar
+    o1 = Time.now
+    o1.instance_eval { @iv = 1 }
+    marshal_equal(o1) {|o| o.instance_eval { @iv }}
+  end
+
+  def test_true
+    marshal_equal(true)
+  end
+
+  def test_nil
+    marshal_equal(nil)
+  end
+
+  def test_share
+    o = [:share]
+    o1 = [o, o]
+    o2 = marshaltest(o1)
+    assert_same(o2.first, o2.last)
+  end
+
+  class CyclicRange < Range
+    def <=>(other); true; end
+  end
+  def test_range_cyclic
+    return unless CyclicRange.respond_to?(:allocate) # test for 1.8
+    o1 = CyclicRange.allocate
+    o1.instance_eval { initialize(o1, o1) }
+    o2 = marshaltest(o1)
+    assert_same(o2, o2.begin)
+    assert_same(o2, o2.end)
+  end
+
+  def test_singleton
+    o = Object.new
+    def o.m() end
+    assert_raises(TypeError) { marshaltest(o) }
+    o = Object.new
+    c = class << o
+      @v = 1
+      class C; self; end
+    end
+    assert_raises(TypeError) { marshaltest(o) }
+    assert_raises(TypeError) { marshaltest(c) }
+    assert_raises(TypeError) { marshaltest(ARGF) }
+    assert_raises(TypeError) { marshaltest(ENV) }
+  end
+
+  def test_extend
+    o = Object.new
+    o.extend Mod1
+    marshal_equal(o) { |obj| obj.kind_of? Mod1 }
+    o = Object.new
+    o.extend Mod1
+    o.extend Mod2
+    marshal_equal(o) {|obj| class << obj; ancestors end}
+    o = Object.new
+    o.extend Module.new
+    assert_raises(TypeError) { marshaltest(o) }
+  end
+
+  def test_extend_string
+    o = ""
+    o.extend Mod1
+    marshal_equal(o) { |obj| obj.kind_of? Mod1 }
+    o = ""
+    o.extend Mod1
+    o.extend Mod2
+    marshal_equal(o) {|obj| class << obj; ancestors end}
+    o = ""
+    o.extend Module.new
+    assert_raises(TypeError) { marshaltest(o) }
+  end
+
+  def test_anonymous
+    c = Class.new
+    assert_raises(TypeError) { marshaltest(c) }
+    o = c.new
+    assert_raises(TypeError) { marshaltest(o) }
+    m = Module.new
+    assert_raises(TypeError) { marshaltest(m) }
+  end
+
+  def test_string_empty
+    marshal_equal("")
+  end
+
+  def test_string_crlf
+    marshal_equal("\r\n")
+  end
+
+  def test_string_escape
+    marshal_equal("\0<;;>\1;;")
+  end
+
+  MyStruct2 = Struct.new(:a, :b)
+  if RUBY_VERSION < "1.8.0"
+    # Struct#== is not defined in ruby/1.6
+    class MyStruct2
+      def ==(rhs)
+	return true if __id__ == rhs.__id__
+	return false unless rhs.is_a?(::Struct) 
+	return false if self.class != rhs.class
+	members.each do |member|
+	  return false if self.__send__(member) != rhs.__send__(member)
+	end
+	return true
+      end
+    end
+  end
+  def test_struct_toplevel
+    o = MyStruct2.new(1,2)
+    marshal_equal(o)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/suicide.rb b/ruby_1_8_6/test/ruby/suicide.rb
new file mode 100644
index 0000000000..2687ed04cd
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/suicide.rb
@@ -0,0 +1,2 @@
+STDERR.reopen(STDOUT)
+at_exit{Process.kill(:INT, $$)}
diff --git a/ruby_1_8_6/test/ruby/test_alias.rb b/ruby_1_8_6/test/ruby/test_alias.rb
new file mode 100644
index 0000000000..83f897fb00
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_alias.rb
@@ -0,0 +1,40 @@
+require 'test/unit'
+
+class TestAlias < Test::Unit::TestCase
+  class Alias0
+    def foo; "foo" end
+  end
+  class Alias1<Alias0
+    alias bar foo
+    def foo; "foo+" + super end
+  end
+  class Alias2<Alias1
+    alias baz foo
+    undef foo
+  end
+  class Alias3<Alias2
+    def foo
+      defined? super
+    end
+    def bar
+      defined? super
+    end
+    def quux
+      defined? super
+    end
+  end
+
+  def test_alias
+    x = Alias2.new
+    assert_equal("foo", x.bar)
+    assert_equal("foo+foo", x.baz)
+
+    # test_check for cache
+    assert_equal("foo+foo", x.baz)
+
+    x = Alias3.new
+    assert(!x.foo)
+    assert(x.bar)
+    assert(!x.quux)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_array.rb b/ruby_1_8_6/test/ruby/test_array.rb
new file mode 100644
index 0000000000..c56f06c3b2
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_array.rb
@@ -0,0 +1,145 @@
+require 'test/unit'
+
+class TestArray < Test::Unit::TestCase
+  def test_array
+    assert_equal([1, 2, 3, 4], [1, 2] + [3, 4])
+    assert_equal([1, 2, 1, 2], [1, 2] * 2)
+    assert_equal("1:2", [1, 2] * ":")
+
+    assert_equal([1, 2].hash, [1, 2].hash)
+
+    assert_equal([2,3], [1,2,3] & [2,3,4])
+    assert_equal([1,2,3,4], [1,2,3] | [2,3,4])
+    assert_equal([1,2,3] - [2,3], [1])
+
+    x = [0, 1, 2, 3, 4, 5]
+    assert_equal(2, x[2])
+    assert_equal([1, 2, 3], x[1..3])
+    assert_equal([1, 2, 3], x[1,3])
+
+    x[0, 2] = 10
+    assert(x[0] == 10 && x[1] == 2)
+
+    x[0, 0] = -1
+    assert(x[0] == -1 && x[1] == 10)
+
+    x[-1, 1] = 20
+    assert(x[-1] == 20 && x.pop == 20)
+  end
+
+  def test_array_andor
+    assert_equal([2], ([1,2,3]&[2,4,6]))
+    assert_equal([1,2,3,4,6], ([1,2,3]|[2,4,6]))
+  end
+
+  def test_compact
+    x = [nil, 1, nil, nil, 5, nil, nil]
+    x.compact!
+    assert_equal([1, 5], x)
+  end
+
+  def test_uniq
+    x = [1, 1, 4, 2, 5, 4, 5, 1, 2]
+    x.uniq!
+    assert_equal([1, 4, 2, 5], x)
+
+    # empty?
+    assert(!x.empty?)
+    x = []
+    assert(x.empty?)
+  end
+
+  def test_sort
+    x = ["it", "came", "to", "pass", "that", "..."]
+    x = x.sort.join(" ")
+    assert_equal("... came it pass that to", x)
+    x = [2,5,3,1,7]
+    x.sort!{|a,b| a<=>b}		# sort with condition
+    assert_equal([1,2,3,5,7], x)
+    x.sort!{|a,b| b-a}		# reverse sort
+    assert_equal([7,5,3,2,1], x)
+  end
+
+  def test_split
+    x = "The Boassert of Mormon"
+    assert_equal(x.reverse, x.split(//).reverse!.join)
+    assert_equal(x.reverse, x.reverse!)
+    assert_equal("g:n:i:r:t:s: :e:t:y:b: :1", "1 byte string".split(//).reverse.join(":"))
+    x = "a b c  d"
+    assert_equal(['a', 'b', 'c', 'd'], x.split)
+    assert_equal(['a', 'b', 'c', 'd'], x.split(' '))
+  end
+
+  def test_misc
+    assert(defined? "a".chomp)
+    assert_equal(["a", "b", "c"], "abc".scan(/./))
+    assert_equal([["1a"], ["2b"], ["3c"]], "1a2b3c".scan(/(\d.)/))
+    # non-greedy match
+    assert_equal([["a", "12"], ["b", "22"]], "a=12;b=22".scan(/(.*?)=(\d*);?/))
+
+    x = [1]
+    assert_equal('1:1:1:1:1', (x * 5).join(":"))
+    assert_equal('1', (x * 1).join(":"))
+    assert_equal('', (x * 0).join(":"))
+
+    *x = *(1..7).to_a
+    assert_equal(7, x.size)
+    assert_equal([1, 2, 3, 4, 5, 6, 7], x)
+
+    x = [1,2,3]
+    x[1,0] = x
+    assert_equal([1,1,2,3,2,3], x)
+
+    x = [1,2,3]
+    x[-1,0] = x
+    assert_equal([1,2,1,2,3,3], x)
+
+    x = [1,2,3]
+    x.concat(x)
+    assert_equal([1,2,3,1,2,3], x)
+
+    x = [1,2,3]
+    x.clear
+    assert_equal([], x)
+
+    x = [1,2,3]
+    y = x.dup
+    x << 4
+    y << 5
+    assert_equal([1,2,3,4], x)
+    assert_equal([1,2,3,5], y)
+  end
+
+  def test_find_all
+    assert_respond_to([], :find_all)
+    assert_respond_to([], :select)       # Alias
+    assert_equal([], [].find_all{ |obj| obj == "foo"})
+
+    x = ["foo", "bar", "baz", "baz", 1, 2, 3, 3, 4]
+    assert_equal(["baz","baz"], x.find_all{ |obj| obj == "baz" })
+    assert_equal([3,3], x.find_all{ |obj| obj == 3 })
+  end
+
+  def test_fill
+    assert_equal([-1, -1, -1, -1, -1, -1], [0, 1, 2, 3, 4, 5].fill(-1))
+    assert_equal([0, 1, 2, -1, -1, -1], [0, 1, 2, 3, 4, 5].fill(-1, 3))
+    assert_equal([0, 1, 2, -1, -1, 5], [0, 1, 2, 3, 4, 5].fill(-1, 3, 2))
+    assert_equal([0, 1, 2, -1, -1, -1, -1, -1], [0, 1, 2, 3, 4, 5].fill(-1, 3, 5))
+    assert_equal([0, 1, -1, -1, 4, 5], [0, 1, 2, 3, 4, 5].fill(-1, 2, 2))
+    assert_equal([0, 1, -1, -1, -1, -1, -1], [0, 1, 2, 3, 4, 5].fill(-1, 2, 5))
+    assert_equal([0, 1, 2, 3, -1, 5], [0, 1, 2, 3, 4, 5].fill(-1, -2, 1))
+    assert_equal([0, 1, 2, 3, -1, -1, -1], [0, 1, 2, 3, 4, 5].fill(-1, -2, 3))
+    assert_equal([0, 1, 2, -1, -1, 5], [0, 1, 2, 3, 4, 5].fill(-1, 3..4))
+    assert_equal([0, 1, 2, -1, 4, 5], [0, 1, 2, 3, 4, 5].fill(-1, 3...4))
+    assert_equal([0, 1, -1, -1, -1, 5], [0, 1, 2, 3, 4, 5].fill(-1, 2..-2))
+    assert_equal([0, 1, -1, -1, 4, 5], [0, 1, 2, 3, 4, 5].fill(-1, 2...-2))
+    assert_equal([10, 11, 12, 13, 14, 15], [0, 1, 2, 3, 4, 5].fill{|i| i+10})
+    assert_equal([0, 1, 2, 13, 14, 15], [0, 1, 2, 3, 4, 5].fill(3){|i| i+10})
+    assert_equal([0, 1, 2, 13, 14, 5], [0, 1, 2, 3, 4, 5].fill(3, 2){|i| i+10})
+    assert_equal([0, 1, 2, 13, 14, 15, 16, 17], [0, 1, 2, 3, 4, 5].fill(3, 5){|i| i+10})
+    assert_equal([0, 1, 2, 13, 14, 5], [0, 1, 2, 3, 4, 5].fill(3..4){|i| i+10})
+    assert_equal([0, 1, 2, 13, 4, 5], [0, 1, 2, 3, 4, 5].fill(3...4){|i| i+10})
+    assert_equal([0, 1, 12, 13, 14, 5], [0, 1, 2, 3, 4, 5].fill(2..-2){|i| i+10})
+    assert_equal([0, 1, 12, 13, 4, 5], [0, 1, 2, 3, 4, 5].fill(2...-2){|i| i+10})
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_assignment.rb b/ruby_1_8_6/test/ruby/test_assignment.rb
new file mode 100644
index 0000000000..63f37a9d73
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_assignment.rb
@@ -0,0 +1,467 @@
+require 'test/unit'
+
+class TestAssignment < Test::Unit::TestCase
+  def test_assign
+    a=[]; a[0] ||= "bar";
+    assert_equal("bar", a[0])
+    h={}; h["foo"] ||= "bar";
+    assert_equal("bar", h["foo"])
+
+    aa = 5
+    aa ||= 25
+    assert_equal(5, aa)
+    bb ||= 25
+    assert_equal(25, bb)
+    cc &&=33
+    assert_nil(cc)
+    cc = 5
+    cc &&=44
+    assert_equal(44, cc)
+
+    a = nil; assert_nil(a)
+    a = 1; assert_equal(1, a)
+    a = []; assert_equal([], a)
+    a = [1]; assert_equal([1], a)
+    a = [nil]; assert_equal([nil], a)
+    a = [[]]; assert_equal([[]], a)
+    a = [1,2]; assert_equal([1,2], a)
+    a = [*[]]; assert_equal([], a)
+    a = [*[1]]; assert_equal([1], a)
+    a = [*[1,2]]; assert_equal([1,2], a)
+
+    a = *nil; assert_nil(a)
+    a = *1; assert_equal(1, a)
+    a = *[]; assert_nil(a)
+    a = *[1]; assert_equal(1, a)
+    a = *[nil]; assert_nil(a)
+    a = *[[]]; assert_equal([], a)
+    a = *[1,2]; assert_equal([1,2], a)
+    a = *[*[]]; assert_nil(a)
+    a = *[*[1]]; assert_equal(1, a)
+    a = *[*[1,2]]; assert_equal([1,2], a)
+
+    *a = nil; assert_equal([nil], a)
+    *a = 1; assert_equal([1], a)
+    *a = []; assert_equal([[]], a)
+    *a = [1]; assert_equal([[1]], a)
+    *a = [nil]; assert_equal([[nil]], a)
+    *a = [[]]; assert_equal([[[]]], a)
+    *a = [1,2]; assert_equal([[1,2]], a)
+    *a = [*[]]; assert_equal([[]], a)
+    *a = [*[1]]; assert_equal([[1]], a)
+    *a = [*[1,2]]; assert_equal([[1,2]], a)
+
+    *a = *nil; assert_equal([nil], a)
+    *a = *1; assert_equal([1], a)
+    *a = *[]; assert_equal([], a)
+    *a = *[1]; assert_equal([1], a)
+    *a = *[nil]; assert_equal([nil], a)
+    *a = *[[]]; assert_equal([[]], a)
+    *a = *[1,2]; assert_equal([1,2], a)
+    *a = *[*[]]; assert_equal([], a)
+    *a = *[*[1]]; assert_equal([1], a)
+    *a = *[*[1,2]]; assert_equal([1,2], a)
+
+    a,b,*c = nil; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = 1; assert_equal([1,nil,[]], [a,b,c])
+    a,b,*c = []; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = [1]; assert_equal([1,nil,[]], [a,b,c])
+    a,b,*c = [nil]; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = [[]]; assert_equal([[],nil,[]], [a,b,c])
+    a,b,*c = [1,2]; assert_equal([1,2,[]], [a,b,c])
+    a,b,*c = [*[]]; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = [*[1]]; assert_equal([1,nil,[]], [a,b,c])
+    a,b,*c = [*[1,2]]; assert_equal([1,2,[]], [a,b,c])
+
+    a,b,*c = *nil; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = *1; assert_equal([1,nil,[]], [a,b,c])
+    a,b,*c = *[]; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = *[1]; assert_equal([1,nil,[]], [a,b,c])
+    a,b,*c = *[nil]; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = *[[]]; assert_equal([[],nil,[]], [a,b,c])
+    a,b,*c = *[1,2]; assert_equal([1,2,[]], [a,b,c])
+    a,b,*c = *[*[]]; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = *[*[1]]; assert_equal([1,nil,[]], [a,b,c])
+    a,b,*c = *[*[1,2]]; assert_equal([1,2,[]], [a,b,c])
+  end
+
+  def test_yield
+    def f; yield nil; end; f {|a| assert_nil(a)}
+    def f; yield 1; end; f {|a| assert_equal(1, a)}
+    def f; yield []; end; f {|a| assert_equal([], a)}
+    def f; yield [1]; end; f {|a| assert_equal([1], a)}
+    def f; yield [nil]; end; f {|a| assert_equal([nil], a)}
+    def f; yield [[]]; end; f {|a| assert_equal([[]], a)}
+    def f; yield [*[]]; end; f {|a| assert_equal([], a)}
+    def f; yield [*[1]]; end; f {|a| assert_equal([1], a)}
+    def f; yield [*[1,2]]; end; f {|a| assert_equal([1,2], a)}
+
+    def f; yield *nil; end; f {|a| assert_nil(a)}
+    def f; yield *1; end; f {|a| assert_equal(1, a)}
+    def f; yield *[1]; end; f {|a| assert_equal(1, a)}
+    def f; yield *[nil]; end; f {|a| assert_nil(a)}
+    def f; yield *[[]]; end; f {|a| assert_equal([], a)}
+    def f; yield *[*[1]]; end; f {|a| assert_equal(1, a)}
+
+    def f; yield; end; f {|*a| assert_equal([], a)}
+    def f; yield nil; end; f {|*a| assert_equal([nil], a)}
+    def f; yield 1; end; f {|*a| assert_equal([1], a)}
+    def f; yield []; end; f {|*a| assert_equal([[]], a)}
+    def f; yield [1]; end; f {|*a| assert_equal([[1]], a)}
+    def f; yield [nil]; end; f {|*a| assert_equal([[nil]], a)}
+    def f; yield [[]]; end; f {|*a| assert_equal([[[]]], a)}
+    def f; yield [1,2]; end; f {|*a| assert_equal([[1,2]], a)}
+    def f; yield [*[]]; end; f {|*a| assert_equal([[]], a)}
+    def f; yield [*[1]]; end; f {|*a| assert_equal([[1]], a)}
+    def f; yield [*[1,2]]; end; f {|*a| assert_equal([[1,2]], a)}
+
+    def f; yield *nil; end; f {|*a| assert_equal([nil], a)}
+    def f; yield *1; end; f {|*a| assert_equal([1], a)}
+    def f; yield *[]; end; f {|*a| assert_equal([], a)}
+    def f; yield *[1]; end; f {|*a| assert_equal([1], a)}
+    def f; yield *[nil]; end; f {|*a| assert_equal([nil], a)}
+    def f; yield *[[]]; end; f {|*a| assert_equal([[]], a)}
+    def f; yield *[*[]]; end; f {|*a| assert_equal([], a)}
+    def f; yield *[*[1]]; end; f {|*a| assert_equal([1], a)}
+    def f; yield *[*[1,2]]; end; f {|*a| assert_equal([1,2], a)}
+
+    def f; yield; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}
+    def f; yield nil; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}
+    def f; yield 1; end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])}
+    def f; yield []; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}
+    def f; yield [1]; end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])}
+    def f; yield [nil]; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}
+    def f; yield [[]]; end; f {|a,b,*c| assert_equal([[],nil,[]], [a,b,c])}
+    def f; yield [*[]]; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}
+    def f; yield [*[1]]; end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])}
+    def f; yield [*[1,2]]; end; f {|a,b,*c| assert_equal([1,2,[]], [a,b,c])}
+
+    def f; yield *nil; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}
+    def f; yield *1; end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])}
+    def f; yield *[]; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}
+    def f; yield *[1]; end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])}
+    def f; yield *[nil]; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}
+    def f; yield *[[]]; end; f {|a,b,*c| assert_equal([[],nil,[]], [a,b,c])}
+    def f; yield *[*[]]; end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}
+    def f; yield *[*[1]]; end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])}
+    def f; yield *[*[1,2]]; end; f {|a,b,*c| assert_equal([1,2,[]], [a,b,c])}
+  end
+
+  def test_return
+    def r; return; end; a = r(); assert_nil(a)
+    def r; return nil; end; a = r(); assert_nil(a)
+    def r; return 1; end; a = r(); assert_equal(1, a)
+    def r; return []; end; a = r(); assert_equal([], a)
+    def r; return [1]; end; a = r(); assert_equal([1], a)
+    def r; return [nil]; end; a = r(); assert_equal([nil], a)
+    def r; return [[]]; end; a = r(); assert_equal([[]], a)
+    def r; return [*[]]; end; a = r(); assert_equal([], a)
+    def r; return [*[1]]; end; a = r(); assert_equal([1], a)
+    def r; return [*[1,2]]; end; a = r(); assert_equal([1,2], a)
+
+    def r; return *nil; end; a = r(); assert_nil(a)
+    def r; return *1; end; a = r(); assert_equal(1, a)
+    def r; return *[]; end; a = r(); assert_nil(a)
+    def r; return *[1]; end; a = r(); assert_equal(1, a)
+    def r; return *[nil]; end; a = r(); assert_nil(a)
+    def r; return *[[]]; end; a = r(); assert_equal([], a)
+    def r; return *[*[]]; end; a = r(); assert_nil(a)
+    def r; return *[*[1]]; end; a = r(); assert_equal(1, a)
+    def r; return *[*[1,2]]; end; a = r(); assert_equal([1,2], a)
+
+    def r; return *nil; end; a = *r(); assert_nil(a)
+    def r; return *1; end; a = *r(); assert_equal(1, a)
+    def r; return *[]; end; a = *r(); assert_nil(a)
+    def r; return *[1]; end; a = *r(); assert_equal(1, a)
+    def r; return *[nil]; end; a = *r(); assert_nil(a)
+    def r; return *[[]]; end; a = *r(); assert_nil(a)
+    def r; return *[*[]]; end; a = *r(); assert_nil(a)
+    def r; return *[*[1]]; end; a = *r(); assert_equal(1, a)
+    def r; return *[*[1,2]]; end; a = *r(); assert_equal([1,2], a)
+
+    def r; return; end; *a = r(); assert_equal([nil], a)
+    def r; return nil; end; *a = r(); assert_equal([nil], a)
+    def r; return 1; end; *a = r(); assert_equal([1], a)
+    def r; return []; end; *a = r(); assert_equal([[]], a)
+    def r; return [1]; end; *a = r(); assert_equal([[1]], a)
+    def r; return [nil]; end; *a = r(); assert_equal([[nil]], a)
+    def r; return [[]]; end; *a = r(); assert_equal([[[]]], a)
+    def r; return [1,2]; end; *a = r(); assert_equal([[1,2]], a)
+    def r; return [*[]]; end; *a = r(); assert_equal([[]], a)
+    def r; return [*[1]]; end; *a = r(); assert_equal([[1]], a)
+    def r; return [*[1,2]]; end; *a = r(); assert_equal([[1,2]], a)
+
+    def r; return *nil; end; *a = r(); assert_equal([nil], a)
+    def r; return *1; end; *a = r(); assert_equal([1], a)
+    def r; return *[]; end; *a = r(); assert_equal([nil], a)
+    def r; return *[1]; end; *a = r(); assert_equal([1], a)
+    def r; return *[nil]; end; *a = r(); assert_equal([nil], a)
+    def r; return *[[]]; end; *a = r(); assert_equal([[]], a)
+    def r; return *[1,2]; end; *a = r(); assert_equal([[1,2]], a)
+    def r; return *[*[]]; end; *a = r(); assert_equal([nil], a)
+    def r; return *[*[1]]; end; *a = r(); assert_equal([1], a)
+    def r; return *[*[1,2]]; end; *a = r(); assert_equal([[1,2]], a)
+
+    def r; return *nil; end; *a = *r(); assert_equal([nil], a)
+    def r; return *1; end; *a = *r(); assert_equal([1], a)
+    def r; return *[]; end; *a = *r(); assert_equal([nil], a)
+    def r; return *[1]; end; *a = *r(); assert_equal([1], a)
+    def r; return *[nil]; end; *a = *r(); assert_equal([nil], a)
+    def r; return *[[]]; end; *a = *r(); assert_equal([], a)
+    def r; return *[1,2]; end; *a = *r(); assert_equal([1,2], a)
+    def r; return *[*[]]; end; *a = *r(); assert_equal([nil], a)
+    def r; return *[*[1]]; end; *a = *r(); assert_equal([1], a)
+    def r; return *[*[1,2]]; end; *a = *r(); assert_equal([1,2], a)
+
+    def r; return; end; a,b,*c = r(); assert_equal([nil,nil,[]], [a,b,c])
+    def r; return nil; end; a,b,*c = r(); assert_equal([nil,nil,[]], [a,b,c])
+    def r; return 1; end; a,b,*c = r(); assert_equal([1,nil,[]], [a,b,c])
+    def r; return []; end; a,b,*c = r(); assert_equal([nil,nil,[]], [a,b,c])
+    def r; return [1]; end; a,b,*c = r(); assert_equal([1,nil,[]], [a,b,c])
+    def r; return [nil]; end; a,b,*c = r(); assert_equal([nil,nil,[]], [a,b,c])
+    def r; return [[]]; end; a,b,*c = r(); assert_equal([[],nil,[]], [a,b,c])
+    def r; return [1,2]; end; a,b,*c = r(); assert_equal([1,2,[]], [a,b,c])
+    def r; return [*[]]; end; a,b,*c = r(); assert_equal([nil,nil,[]], [a,b,c])
+    def r; return [*[1]]; end; a,b,*c = r(); assert_equal([1,nil,[]], [a,b,c])
+    def r; return [*[1,2]]; end; a,b,*c = r(); assert_equal([1,2,[]], [a,b,c])
+
+    def r; return *nil; end; a,b,*c = r(); assert_equal([nil,nil,[]], [a,b,c])
+    def r; return *1; end; a,b,*c = r(); assert_equal([1,nil,[]], [a,b,c])
+    def r; return *[]; end; a,b,*c = r(); assert_equal([nil,nil,[]], [a,b,c])
+    def r; return *[1]; end; a,b,*c = r(); assert_equal([1,nil,[]], [a,b,c])
+    def r; return *[nil]; end; a,b,*c = r(); assert_equal([nil,nil,[]], [a,b,c])
+    def r; return *[[]]; end; a,b,*c = r(); assert_equal([nil,nil,[]], [a,b,c])
+    def r; return *[1,2]; end; a,b,*c = r(); assert_equal([1,2,[]], [a,b,c])
+    def r; return *[*[]]; end; a,b,*c = r(); assert_equal([nil,nil,[]], [a,b,c])
+    def r; return *[*[1]]; end; a,b,*c = r(); assert_equal([1,nil,[]], [a,b,c])
+    def r; return *[*[1,2]]; end; a,b,*c = r(); assert_equal([1,2,[]], [a,b,c])
+  end
+
+  def test_lambda
+    f = lambda {|r,| assert_equal([], r)}
+    f.call([], *[])
+
+    f = lambda {|r,*l| assert_equal([], r); assert_equal([1], l)}
+    f.call([], *[1])
+
+    f = lambda{|x| x}
+    assert_equal(42, f.call(42))
+    assert_equal([42], f.call([42]))
+    assert_equal([[42]], f.call([[42]]))
+    assert_equal([42,55], f.call([42,55]))
+
+    f = lambda{|x,| x}
+    assert_equal(42, f.call(42))
+    assert_equal([42], f.call([42]))
+    assert_equal([[42]], f.call([[42]]))
+    assert_equal([42,55], f.call([42,55]))
+
+    f = lambda{|*x| x}
+    assert_equal([42], f.call(42))
+    assert_equal([[42]], f.call([42]))
+    assert_equal([[[42]]], f.call([[42]]))
+    assert_equal([[42,55]], f.call([42,55]))
+    assert_equal([42,55], f.call(42,55))
+  end
+
+  def test_multi
+    a,=*[1]
+    assert_equal(1, a)
+    a,=*[[1]]
+    assert_equal([1], a)
+    a,=*[[[1]]]
+    assert_equal([[1]], a)
+
+    x, (y, z) = 1, 2, 3
+    assert_equal([1,2,nil], [x,y,z])
+    x, (y, z) = 1, [2,3]
+    assert_equal([1,2,3], [x,y,z])
+    x, (y, z) = 1, [2]
+    assert_equal([1,2,nil], [x,y,z])
+  end
+
+  def test_break
+    a = loop do break; end; assert_nil(a)
+    a = loop do break nil; end; assert_nil(a)
+    a = loop do break 1; end; assert_equal(1, a)
+    a = loop do break []; end; assert_equal([], a)
+    a = loop do break [1]; end; assert_equal([1], a)
+    a = loop do break [nil]; end; assert_equal([nil], a)
+    a = loop do break [[]]; end; assert_equal([[]], a)
+    a = loop do break [*[]]; end; assert_equal([], a)
+    a = loop do break [*[1]]; end; assert_equal([1], a)
+    a = loop do break [*[1,2]]; end; assert_equal([1,2], a)
+
+    a = loop do break *nil; end; assert_nil(a)
+    a = loop do break *1; end; assert_equal(1, a)
+    a = loop do break *[]; end; assert_nil(a)
+    a = loop do break *[1]; end; assert_equal(1, a)
+    a = loop do break *[nil]; end; assert_nil(a)
+    a = loop do break *[[]]; end; assert_equal([], a)
+    a = loop do break *[*[]]; end; assert_nil(a)
+    a = loop do break *[*[1]]; end; assert_equal(1, a)
+    a = loop do break *[*[1,2]]; end; assert_equal([1,2], a)
+
+    *a = loop do break; end; assert_equal([nil], a)
+    *a = loop do break nil; end; assert_equal([nil], a)
+    *a = loop do break 1; end; assert_equal([1], a)
+    *a = loop do break []; end; assert_equal([[]], a)
+    *a = loop do break [1]; end; assert_equal([[1]], a)
+    *a = loop do break [nil]; end; assert_equal([[nil]], a)
+    *a = loop do break [[]]; end; assert_equal([[[]]], a)
+    *a = loop do break [1,2]; end; assert_equal([[1,2]], a)
+    *a = loop do break [*[]]; end; assert_equal([[]], a)
+    *a = loop do break [*[1]]; end; assert_equal([[1]], a)
+    *a = loop do break [*[1,2]]; end; assert_equal([[1,2]], a)
+
+    *a = loop do break *nil; end; assert_equal([nil], a)
+    *a = loop do break *1; end; assert_equal([1], a)
+    *a = loop do break *[]; end; assert_equal([nil], a)
+    *a = loop do break *[1]; end; assert_equal([1], a)
+    *a = loop do break *[nil]; end; assert_equal([nil], a)
+    *a = loop do break *[[]]; end; assert_equal([[]], a)
+    *a = loop do break *[1,2]; end; assert_equal([[1,2]], a)
+    *a = loop do break *[*[]]; end; assert_equal([nil], a)
+    *a = loop do break *[*[1]]; end; assert_equal([1], a)
+    *a = loop do break *[*[1,2]]; end; assert_equal([[1,2]], a)
+
+    *a = *loop do break *nil; end; assert_equal([nil], a)
+    *a = *loop do break *1; end; assert_equal([1], a)
+    *a = *loop do break *[]; end; assert_equal([nil], a)
+    *a = *loop do break *[1]; end; assert_equal([1], a)
+    *a = *loop do break *[nil]; end; assert_equal([nil], a)
+    *a = *loop do break *[[]]; end; assert_equal([], a)
+    *a = *loop do break *[1,2]; end; assert_equal([1,2], a)
+    *a = *loop do break *[*[]]; end; assert_equal([nil], a)
+    *a = *loop do break *[*[1]]; end; assert_equal([1], a)
+    *a = *loop do break *[*[1,2]]; end; assert_equal([1,2], a)
+
+    a,b,*c = loop do break; end; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = loop do break nil; end; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = loop do break 1; end; assert_equal([1,nil,[]], [a,b,c])
+    a,b,*c = loop do break []; end; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = loop do break [1]; end; assert_equal([1,nil,[]], [a,b,c])
+    a,b,*c = loop do break [nil]; end; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = loop do break [[]]; end; assert_equal([[],nil,[]], [a,b,c])
+    a,b,*c = loop do break [1,2]; end; assert_equal([1,2,[]], [a,b,c])
+    a,b,*c = loop do break [*[]]; end; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = loop do break [*[1]]; end; assert_equal([1,nil,[]], [a,b,c])
+    a,b,*c = loop do break [*[1,2]]; end; assert_equal([1,2,[]], [a,b,c])
+
+    a,b,*c = loop do break *nil; end; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = loop do break *1; end; assert_equal([1,nil,[]], [a,b,c])
+    a,b,*c = loop do break *[]; end; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = loop do break *[1]; end; assert_equal([1,nil,[]], [a,b,c])
+    a,b,*c = loop do break *[nil]; end; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = loop do break *[[]]; end; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = loop do break *[1,2]; end; assert_equal([1,2,[]], [a,b,c])
+    a,b,*c = loop do break *[*[]]; end; assert_equal([nil,nil,[]], [a,b,c])
+    a,b,*c = loop do break *[*[1]]; end; assert_equal([1,nil,[]], [a,b,c])
+    a,b,*c = loop do break *[*[1,2]]; end; assert_equal([1,2,[]], [a,b,c])
+  end
+
+  def test_next
+    def r(val); a = yield(); assert_equal(val, a); end
+    r(nil){next}
+    r(nil){next nil}
+    r(1){next 1}
+    r([]){next []}
+    r([1]){next [1]}
+    r([nil]){next [nil]}
+    r([[]]){next [[]]}
+    r([]){next [*[]]}
+    r([1]){next [*[1]]}
+    r([1,2]){next [*[1,2]]}
+
+    r(nil){next *nil}
+    r(1){next *1}
+    r(nil){next *[]}
+    r(1){next *[1]}
+    r(nil){next *[nil]}
+    r([]){next *[[]]}
+    r(nil){next *[*[]]}
+    r(1){next *[*[1]]}
+    r([1,2]){next *[*[1,2]]}
+
+    def r(val); *a = yield(); assert_equal(val, a); end
+    r([nil]){next}
+    r([nil]){next nil}
+    r([1]){next 1}
+    r([[]]){next []}
+    r([[1]]){next [1]}
+    r([[nil]]){next [nil]}
+    r([[[]]]){next [[]]}
+    r([[1,2]]){next [1,2]}
+    r([[]]){next [*[]]}
+    r([[1]]){next [*[1]]}
+    r([[1,2]]){next [*[1,2]]}
+
+    def r(val); *a = *yield(); assert_equal(val, a); end
+    r([nil]){next *nil}
+    r([1]){next *1}
+    r([nil]){next *[]}
+    r([1]){next *[1]}
+    r([nil]){next *[nil]}
+    r([]){next *[[]]}
+    r([1,2]){next *[1,2]}
+    r([nil]){next *[*[]]}
+    r([1]){next *[*[1]]}
+    r([1,2]){next *[*[1,2]]}
+
+    def r(val); a,b,*c = yield(); assert_equal(val, [a,b,c]); end
+    r([nil,nil,[]]){next}
+    r([nil,nil,[]]){next nil}
+    r([1,nil,[]]){next 1}
+    r([nil,nil,[]]){next []}
+    r([1,nil,[]]){next [1]}
+    r([nil,nil,[]]){next [nil]}
+    r([[],nil,[]]){next [[]]}
+    r([1,2,[]]){next [1,2]}
+    r([nil,nil,[]]){next [*[]]}
+    r([1,nil,[]]){next [*[1]]}
+    r([1,2,[]]){next [*[1,2]]}
+
+    def r(val); a,b,*c = *yield(); assert_equal(val, [a,b,c]); end
+    r([nil,nil,[]]){next *nil}
+    r([1,nil,[]]){next *1}
+    r([nil,nil,[]]){next *[]}
+    r([1,nil,[]]){next *[1]}
+    r([nil,nil,[]]){next *[nil]}
+    r([nil,nil,[]]){next *[[]]}
+    r([1,2,[]]){next *[1,2]}
+    r([nil,nil,[]]){next *[*[]]}
+    r([1,nil,[]]){next *[*[1]]}
+    r([1,2,[]]){next *[*[1,2]]}
+  end
+
+  def test_assign2
+    a = nil
+    assert(defined?(a))
+    assert_nil(a)
+
+    # multiple asignment
+    a, b = 1, 2
+    assert(a == 1 && b == 2)
+
+    a, b = b, a
+    assert(a == 2 && b == 1)
+
+    a, = 1,2
+    assert_equal(1, a)
+
+    a, *b = 1, 2, 3
+    assert(a == 1 && b == [2, 3])
+
+    a, (b, c), d = 1, [2, 3], 4
+    assert(a == 1 && b == 2 && c == 3 && d == 4)
+
+    *a = 1, 2, 3
+    assert_equal([1, 2, 3], a)
+
+    *a = 4
+    assert_equal([4], a)
+
+    *a = nil
+    assert_equal([nil], a)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_beginendblock.rb b/ruby_1_8_6/test/ruby/test_beginendblock.rb
new file mode 100644
index 0000000000..a60e41b848
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_beginendblock.rb
@@ -0,0 +1,86 @@
+require 'test/unit'
+require 'tempfile'
+$:.replace([File.dirname(File.expand_path(__FILE__))] | $:)
+require 'envutil'
+
+class TestBeginEndBlock < Test::Unit::TestCase
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  def q(content)
+    "\"#{content}\""
+  end
+
+  def test_beginendblock
+    ruby = EnvUtil.rubybin
+    target = File.join(DIR, 'beginmainend.rb')
+    io = IO.popen("#{q(ruby)} #{q(target)}")
+    assert_equal(%w(b1 b2-1 b2 main b3-1 b3 b4 e1 e4 e3 e2 e4-2 e4-1 e1-1 e4-1-1), io.read.split)
+    io.close
+  end
+
+  def test_begininmethod
+    assert_raises(SyntaxError) do
+      eval("def foo; BEGIN {}; end")
+    end
+
+    assert_raises(SyntaxError) do
+      eval('eval("def foo; BEGIN {}; end")')
+    end
+  end
+
+  def test_endblockwarn
+    ruby = EnvUtil.rubybin
+    # Use Tempfile to create temporary file path.
+    launcher = Tempfile.new(self.class.name)
+    errout = Tempfile.new(self.class.name)
+
+    launcher << <<EOF
+errout = ARGV.shift
+STDERR.reopen(File.open(errout, "w"))
+STDERR.sync = true
+Dir.chdir(#{q(DIR)})
+cmd = "\\"#{ruby}\\" \\"endblockwarn.rb\\""
+system(cmd)
+EOF
+    launcher.close
+    launcherpath = launcher.path
+    errout.close
+    erroutpath = errout.path
+    system("#{q(ruby)} #{q(launcherpath)} #{q(erroutpath)}")
+    expected = <<EOW
+endblockwarn.rb:2: warning: END in method; use at_exit
+(eval):2: warning: END in method; use at_exit
+EOW
+    assert_equal(expected, File.read(erroutpath))
+    # expecting Tempfile to unlink launcher and errout file.
+  end
+
+  def test_raise_in_at_exit
+    # [ruby-core:09675]
+    ruby = EnvUtil.rubybin
+    out = IO.popen("#{q(ruby)} -e 'STDERR.reopen(STDOUT);" \
+		   "at_exit{raise %[SomethingBad]};" \
+		   "raise %[SomethingElse]'") {|f|
+      f.read
+    }
+    assert_match /SomethingBad/, out
+    assert_match /SomethingElse/, out
+  end
+
+  def test_should_propagate_exit_code
+    ruby = EnvUtil.rubybin
+    assert_equal false, system(ruby, '-e', 'at_exit{exit 2}')
+    assert_equal 2, $?.exitstatus
+    assert_nil $?.termsig
+  end
+
+  def test_should_propagate_signaled
+    ruby = EnvUtil.rubybin
+    out = IO.popen("#{ruby} #{File.dirname(__FILE__)}/suicide.rb"){|f|
+      f.read
+    }
+    assert_match /Interrupt$/, out
+    assert_nil $?.exitstatus
+    assert_equal Signal.list["INT"], $?.termsig
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_bignum.rb b/ruby_1_8_6/test/ruby/test_bignum.rb
new file mode 100644
index 0000000000..c238337db5
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_bignum.rb
@@ -0,0 +1,87 @@
+require 'test/unit'
+
+class TestBignum < Test::Unit::TestCase
+  def fact(n)
+    return 1 if n == 0
+    f = 1
+    while n>0
+      f *= n
+      n -= 1
+    end
+    return f
+  end
+
+  def test_bignum
+    $x = fact(40)
+    assert_equal($x, $x)
+    assert_equal($x, fact(40))
+    assert($x < $x+2)
+    assert($x > $x-2)
+    assert_equal(815915283247897734345611269596115894272000000000, $x)
+    assert_not_equal(815915283247897734345611269596115894272000000001, $x)
+    assert_equal(815915283247897734345611269596115894272000000001, $x+1)
+    assert_equal(335367096786357081410764800000, $x/fact(20))
+    $x = -$x
+    assert_equal(-815915283247897734345611269596115894272000000000, $x)
+    assert_equal(2-(2**32), -(2**32-2))
+    assert_equal(2**32 - 5, (2**32-3)-2)
+
+    for i in 1000..1014
+      assert_equal(2 ** i, 1 << i)
+    end
+
+    n1 = 1 << 1000
+    for i in 1000..1014
+      assert_equal(n1, 1 << i)
+      n1 *= 2
+    end
+
+    n2=n1
+    for i in 1..10
+      n1 = n1 / 2
+      n2 = n2 >> 1
+      assert_equal(n1, n2)
+    end
+
+    for i in 4000..4096
+      n1 = 1 << i;
+      assert_equal(n1-1, (n1**2-1) / (n1+1))
+    end
+  end
+
+  def test_calc
+    b = 10**80
+    a = b * 9 + 7
+    assert_equal(7, a.modulo(b))
+    assert_equal(-b + 7, a.modulo(-b))
+    assert_equal(b + -7, (-a).modulo(b))
+    assert_equal(-7, (-a).modulo(-b))
+    assert_equal(7, a.remainder(b))
+    assert_equal(7, a.remainder(-b))
+    assert_equal(-7, (-a).remainder(b))
+    assert_equal(-7, (-a).remainder(-b))
+
+    assert_equal(10000000000000000000100000000000000000000, 10**40+10**20)
+    assert_equal(100000000000000000000, 10**40/10**20)
+
+    a = 677330545177305025495135714080
+    b = 14269972710765292560
+    assert_equal(0, a % b)
+    assert_equal(0, -a % b)
+  end
+
+  def shift_test(a)
+    b = a / (2 ** 32)
+    c = a >> 32
+    assert_equal(b, c)
+
+    b = a * (2 ** 32)
+    c = a << 32
+    assert_equal(b, c)
+  end
+
+  def test_shift
+    shift_test(-4518325415524767873)
+    shift_test(-0xfffffffffffffffff)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_call.rb b/ruby_1_8_6/test/ruby/test_call.rb
new file mode 100644
index 0000000000..da7ee93c73
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_call.rb
@@ -0,0 +1,19 @@
+require 'test/unit'
+
+class TestCall < Test::Unit::TestCase
+  def aaa(a, b=100, *rest)
+    res = [a, b]
+    res += rest if rest
+    return res
+  end
+
+  def test_call
+    assert_raises(ArgumentError) {aaa()}
+    assert_raises(ArgumentError) {aaa}
+
+    assert_equal([1, 100], aaa(1))
+    assert_equal([1, 2], aaa(1, 2))
+    assert_equal([1, 2, 3, 4], aaa(1, 2, 3, 4))
+    assert_equal([1, 2, 3, 4], aaa(1, *[2, 3, 4]))
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_case.rb b/ruby_1_8_6/test/ruby/test_case.rb
new file mode 100644
index 0000000000..41a22038a0
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_case.rb
@@ -0,0 +1,49 @@
+require 'test/unit'
+
+class TestCase < Test::Unit::TestCase
+  def test_case
+    case 5
+    when 1, 2, 3, 4, 6, 7, 8
+      assert(false)
+    when 5
+      assert(true)
+    end
+
+    case 5
+    when 5
+      assert(true)
+    when 1..10
+      assert(false)
+    end
+
+    case 5
+    when 1..10
+      assert(true)
+    else
+      assert(false)
+    end
+
+    case 5
+    when 5
+      assert(true)
+    else
+      assert(false)
+    end
+
+    case "foobar"
+    when /^f.*r$/
+      assert(true)
+    else
+      assert(false)
+    end
+
+    case
+    when true
+      assert(true)
+    when false, nil
+      assert(false)
+    else
+      assert(false)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_clone.rb b/ruby_1_8_6/test/ruby/test_clone.rb
new file mode 100644
index 0000000000..43c0cffa1d
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_clone.rb
@@ -0,0 +1,28 @@
+require 'test/unit'
+
+class TestClone < Test::Unit::TestCase
+  module M001; end
+  module M002; end
+  module M003; include M002; end
+  module M002; include M001; end
+  module M003; include M002; end
+
+  def test_clone
+    foo = Object.new
+    def foo.test
+      "test"
+    end
+    bar = foo.clone
+    def bar.test2
+      "test2"
+    end
+
+    assert_equal("test2", bar.test2)
+    assert_equal("test", bar.test)
+    assert_equal("test", foo.test)
+
+    assert_raises(NoMethodError) {foo.test2}
+
+    assert_equal([M003, M002, M001], M003.ancestors)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_condition.rb b/ruby_1_8_6/test/ruby/test_condition.rb
new file mode 100644
index 0000000000..ba2e0688f3
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_condition.rb
@@ -0,0 +1,16 @@
+require 'test/unit'
+
+class TestCondition < Test::Unit::TestCase
+
+  # [should] first test to see if we can run the tests.
+
+  def test_condition
+    $x = '0';
+
+    $x == $x && assert(true)
+    $x != $x && assert(false)
+    $x == $x || assert(false)
+    $x != $x || assert(true)
+
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_const.rb b/ruby_1_8_6/test/ruby/test_const.rb
new file mode 100644
index 0000000000..8d01379dbd
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_const.rb
@@ -0,0 +1,33 @@
+require 'test/unit'
+
+class TestConst < Test::Unit::TestCase
+  TEST1 = 1
+  TEST2 = 2
+
+  module Const
+    TEST3 = 3
+    TEST4 = 4
+  end
+
+  module Const2
+    TEST3 = 6
+    TEST4 = 8
+  end
+
+  def test_const
+    self.class.class_eval {
+      include Const
+    }
+    assert_equal([1,2,3,4], [TEST1,TEST2,TEST3,TEST4])
+
+    self.class.class_eval {
+      include Const2
+    }
+    STDERR.print "intentionally redefines TEST3, TEST4\n" if $VERBOSE
+    assert_equal([1,2,6,8], [TEST1,TEST2,TEST3,TEST4])
+
+    assert_equal(-1, (String <=> Object))
+    assert_equal(1, (Object <=> String))
+    assert_equal(nil, (Array <=> String))
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_defined.rb b/ruby_1_8_6/test/ruby/test_defined.rb
new file mode 100644
index 0000000000..8a7fcf45a9
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_defined.rb
@@ -0,0 +1,43 @@
+require 'test/unit'
+
+class TestDefined < Test::Unit::TestCase
+  class Foo
+    def foo
+      p :foo
+    end
+    protected :foo
+    def bar(f)
+      yield(defined?(self.foo))
+      yield(defined?(f.foo))
+    end
+  end
+
+  def defined_test
+    return !defined?(yield)
+  end
+
+  def test_defined
+    $x = nil
+
+    assert(defined?($x))		# global variable
+    assert_equal('global-variable', defined?($x))# returns description
+
+    assert_nil(defined?(foo))		# undefined
+    foo=5
+    assert(defined?(foo))		# local variable
+
+    assert(defined?(Array))		# constant
+    assert(defined?(::Array))		# toplevel constant
+    assert(defined?(File::Constants))	# nested constant
+    assert(defined?(Object.new))	# method
+    assert(!defined?(Object.print))	# private method
+    assert(defined?(1 == 2))		# operator expression
+
+    f = Foo.new
+    assert_nil(defined?(f.foo))
+    f.bar(f) { |v| assert(v) }
+
+    assert(defined_test)		# not iterator
+    assert(!defined_test{})	# called as iterator
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_dir.rb b/ruby_1_8_6/test/ruby/test_dir.rb
new file mode 100644
index 0000000000..09685bee8f
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_dir.rb
@@ -0,0 +1,42 @@
+require 'test/unit'
+
+require 'tmpdir'
+require 'fileutils'
+
+class TestDir < Test::Unit::TestCase
+
+  ROOT = File.join(Dir.tmpdir, "__test_dir__#{$$}")
+
+  def setup
+    Dir.mkdir(ROOT)
+    for i in ?a..?z
+      if i % 2 == 0
+        FileUtils.touch(File.join(ROOT, i.chr))
+      else
+        FileUtils.mkdir(File.join(ROOT, i.chr))
+      end
+    end
+  end
+
+  def teardown
+    FileUtils.rm_rf ROOT if File.directory?(ROOT)
+  end
+
+  def test_seek
+    dir = Dir.open(ROOT)
+    begin
+      cache = []
+      loop do
+        pos = dir.tell
+        break unless name = dir.read
+        cache << [pos, name]
+      end
+      for x in cache.sort_by {|x| x[0] % 3 } # shuffle
+        dir.seek(x[0])
+        assert_equal(x[1], dir.read)
+      end
+    ensure
+      dir.close
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_env.rb b/ruby_1_8_6/test/ruby/test_env.rb
new file mode 100644
index 0000000000..3a65f91fa4
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_env.rb
@@ -0,0 +1,82 @@
+require 'test/unit'
+
+class TestEnv < Test::Unit::TestCase
+  IGNORE_CASE = /djgpp|bccwin|mswin|mingw/ =~ RUBY_PLATFORM
+
+  def setup
+    @backup = ENV.delete('test')
+    @BACKUP = ENV.delete('TEST')
+  end
+
+  def teardown
+    ENV['test'] = @backup if @backup
+    ENV['TEST'] = @BACKUP if @BACKUP
+  end
+
+  def test_bracket
+    assert_nil(ENV['test'])
+    assert_nil(ENV['TEST'])
+    ENV['test'] = 'foo'
+    assert_equal('foo', ENV['test'])
+    if IGNORE_CASE
+      assert_equal('foo', ENV['TEST'])
+    else
+      assert_nil(ENV['TEST'])
+    end
+    ENV['TEST'] = 'bar'
+    assert_equal('bar', ENV['TEST'])
+    if IGNORE_CASE
+      assert_equal('bar', ENV['test'])
+    else
+      assert_equal('foo', ENV['test'])
+    end
+
+    assert_raises(TypeError) {
+      tmp = ENV[1]
+    }
+    assert_raises(TypeError) {
+      ENV[1] = 'foo'
+    }
+    assert_raises(TypeError) {
+      ENV['test'] = 0
+    }
+  end
+
+  def test_has_value
+    val = 'a'
+    val.succ! while ENV.has_value?(val) && ENV.has_value?(val.upcase)
+    ENV['test'] = val[0...-1]
+
+    assert_equal(false, ENV.has_value?(val))
+    assert_equal(false, ENV.has_value?(val.upcase))
+    ENV['test'] = val
+    assert_equal(true, ENV.has_value?(val))
+    assert_equal(false, ENV.has_value?(val.upcase))
+    ENV['test'] = val.upcase
+    assert_equal(false, ENV.has_value?(val))
+    assert_equal(true, ENV.has_value?(val.upcase))
+  end
+
+  def test_index
+    val = 'a'
+    val.succ! while ENV.has_value?(val) && ENV.has_value?(val.upcase)
+    ENV['test'] = val[0...-1]
+
+    assert_nil(ENV.index(val))
+    assert_nil(ENV.index(val.upcase))
+    ENV['test'] = val
+    if IGNORE_CASE
+      assert_equal('TEST', ENV.index(val).upcase)
+    else
+      assert_equal('test', ENV.index(val))
+    end
+    assert_nil(ENV.index(val.upcase))
+    ENV['test'] = val.upcase
+    assert_nil(ENV.index(val))
+    if IGNORE_CASE
+      assert_equal('TEST', ENV.index(val.upcase).upcase)
+    else
+      assert_equal('test', ENV.index(val.upcase))
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_eval.rb b/ruby_1_8_6/test/ruby/test_eval.rb
new file mode 100644
index 0000000000..6b3fea7bb4
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_eval.rb
@@ -0,0 +1,157 @@
+require 'test/unit'
+
+class TestEval < Test::Unit::TestCase
+  # eval with binding
+  def test_ev
+    local1 = "local1"
+    lambda {
+      local2 = "local2"
+      return binding
+    }.call
+  end
+
+  def test_eval
+    assert_nil(eval(""))
+    $bad=false
+    eval 'while false; $bad = true; print "foo\n" end'
+    assert(!$bad)
+
+    assert(eval('TRUE'))
+    assert(eval('true'))
+    assert(!eval('NIL'))
+    assert(!eval('nil'))
+    assert(!eval('FALSE'))
+    assert(!eval('false'))
+
+    $foo = 'assert(true)'
+    begin
+      eval $foo
+    rescue
+      assert(false)
+    end
+
+    assert_equal('assert(true)', eval("$foo"))
+    assert_equal(true, eval("true"))
+    i = 5
+    assert(eval("i == 5"))
+    assert_equal(5, eval("i"))
+    assert(eval("defined? i"))
+
+    $x = test_ev
+    assert_equal("local1", eval("local1", $x)) # normal local var
+    assert_equal("local2", eval("local2", $x)) # nested local var
+    $bad = true
+    begin
+      p eval("local1")
+    rescue NameError		# must raise error
+      $bad = false
+    end
+    assert(!$bad)
+
+    # !! use class_eval to avoid nested definition
+    self.class.class_eval %q(
+      module EvTest
+	EVTEST1 = 25
+	evtest2 = 125
+	$x = binding
+      end
+    )
+    assert_equal(25, eval("EVTEST1", $x))	# constant in module
+    assert_equal(125, eval("evtest2", $x))	# local var in module
+    $bad = true
+    begin
+      eval("EVTEST1")
+    rescue NameError		# must raise error
+      $bad = false
+    end
+    assert(!$bad)
+
+    x = proc{}
+    eval "i4 = 1", x
+    assert_equal(1, eval("i4", x))
+    x = proc{proc{}}.call
+    eval "i4 = 22", x
+    assert_equal(22, eval("i4", x))
+    $x = []
+    x = proc{proc{}}.call
+    eval "(0..9).each{|i5| $x[i5] = proc{i5*2}}", x
+    assert_equal(8, $x[4].call)
+
+    x = binding
+    eval "i = 1", x
+    assert_equal(1, eval("i", x))
+    x = proc{binding}.call
+    eval "i = 22", x
+    assert_equal(22, eval("i", x))
+    $x = []
+    x = proc{binding}.call
+    eval "(0..9).each{|i5| $x[i5] = proc{i5*2}}", x
+    assert_equal(8, $x[4].call)
+    x = proc{binding}.call
+    eval "for i6 in 1..1; j6=i6; end", x
+    assert(eval("defined? i6", x))
+    assert(eval("defined? j6", x))
+
+    proc {
+      p = binding
+      eval "foo11 = 1", p
+      foo22 = 5
+      proc{foo11=22}.call
+      proc{foo22=55}.call
+      assert_equal(eval("foo11"), eval("foo11", p))
+      assert_equal(1, eval("foo11"))
+      assert_equal(eval("foo22"), eval("foo22", p))
+      assert_equal(55, eval("foo22"))
+    }.call
+
+    p1 = proc{i7 = 0; proc{i7}}.call
+    assert_equal(0, p1.call)
+    eval "i7=5", p1
+    assert_equal(5, p1.call)
+    assert(!defined?(i7))
+
+    p1 = proc{i7 = 0; proc{i7}}.call
+    i7 = nil
+    assert_equal(0, p1.call)
+    eval "i7=1", p1
+    assert_equal(1, p1.call)
+    eval "i7=5", p1
+    assert_equal(5, p1.call)
+    assert_nil(i7)
+  end
+
+  def test_nil_instance_eval_cvar # [ruby-dev:24103]
+    def nil.test_binding
+      binding
+    end
+    bb = eval("nil.instance_eval \"binding\"", nil.test_binding)
+    assert_raise(NameError) { eval("@@a", bb) }
+    class << nil
+      remove_method :test_binding
+    end
+  end
+
+  def test_fixnum_instance_eval_cvar # [ruby-dev:24213]
+    assert_raise(NameError) { 1.instance_eval "@@a" }
+  end
+
+  def test_cvar_scope_with_instance_eval # [ruby-dev:24223]
+    Fixnum.class_eval "@@test_cvar_scope_with_instance_eval = 1" # depends on [ruby-dev:24229]
+    @@test_cvar_scope_with_instance_eval = 4
+    assert_equal(4, 1.instance_eval("@@test_cvar_scope_with_instance_eval"))
+    Fixnum.__send__(:remove_class_variable, :@@test_cvar_scope_with_instance_eval)
+  end
+
+  def test_eval_and_define_method # [ruby-dev:24228]
+    assert_nothing_raised {
+      def temporally_method_for_test_eval_and_define_method(&block)
+        lambda {
+          class << Object.new; self end.__send__(:define_method, :zzz, &block)
+        }
+      end
+      v = eval("temporally_method_for_test_eval_and_define_method {}")
+      {}[0] = {}
+      v.call
+    }
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_exception.rb b/ruby_1_8_6/test/ruby/test_exception.rb
new file mode 100644
index 0000000000..4c27c52f3c
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_exception.rb
@@ -0,0 +1,187 @@
+require 'test/unit'
+
+class TestException < Test::Unit::TestCase
+  def test_exception
+    begin
+      raise "this must be handled"
+      assert(false)
+    rescue
+      assert(true)
+    end
+
+    $bad = true
+    begin
+      raise "this must be handled no.2"
+    rescue
+      if $bad
+        $bad = false
+        retry
+        assert(false)
+      end
+    end
+    assert(true)
+
+    # exception in rescue clause
+    $string = "this must be handled no.3"
+    e = assert_raises(RuntimeError) do
+      begin
+        raise "exception in rescue clause"
+      rescue
+        raise $string
+      end
+      assert(false)
+    end
+    assert_equal($string, e.message)
+
+    # exception in ensure clause
+    $string = "exception in ensure clause"
+    e = assert_raises(RuntimeError) do
+      begin
+        raise "this must be handled no.4"
+      ensure
+        assert_instance_of(RuntimeError, $!)
+        assert_equal("this must be handled no.4", $!.message)
+        raise "exception in ensure clause"
+      end
+      assert(false)
+    end
+    assert_equal($string, e.message)
+
+    $bad = true
+    begin
+      begin
+        raise "this must be handled no.5"
+      ensure
+        $bad = false
+      end
+    rescue
+    end
+    assert(!$bad)
+
+    $bad = true
+    begin
+      begin
+        raise "this must be handled no.6"
+      ensure
+        $bad = false
+      end
+    rescue
+    end
+    assert(!$bad)
+
+    $bad = true
+    while true
+      begin
+        break
+      ensure
+        $bad = false
+      end
+    end
+    assert(!$bad)
+
+    assert(catch(:foo) {
+         loop do
+           loop do
+    	 throw :foo, true
+    	 break
+           end
+           break
+           assert(false)			# should no reach here
+         end
+         false
+       })
+
+  end
+
+  def test_else
+    begin
+      assert(true)
+    rescue
+      assert(false)
+    else
+      assert(true)
+    end
+
+    begin
+      assert(true)
+      raise
+      assert(false)
+    rescue
+      assert(true)
+    else
+      assert(false)
+    end
+
+    begin
+      assert(true)
+      begin
+	assert(true)
+      rescue
+	assert(false)
+      else
+	assert(true)
+      end
+      assert(true)
+    rescue
+      assert(false)
+    else
+      assert(true)
+    end
+
+    begin
+      assert(true)
+      begin
+	assert(true)
+	raise
+	assert(false)
+      rescue
+	assert(true)
+      else
+	assert(false)
+      end
+      assert(true)
+    rescue
+      assert(false)
+    else
+      assert(true)
+    end
+
+    begin
+      assert(true)
+      begin
+	assert(true)
+      rescue
+	assert(false)
+      else
+	assert(true)
+      end
+      assert(true)
+      raise
+      assert(false)
+    rescue
+      assert(true)
+    else
+      assert(false)
+    end
+
+    begin
+      assert(true)
+      begin
+	assert(true)
+	raise
+	assert(false)
+      rescue
+	assert(true)
+      else
+	assert(false)
+      end
+      assert(true)
+      raise
+      assert(false)
+    rescue
+      assert(true)
+    else
+      assert(false)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_file.rb b/ruby_1_8_6/test/ruby/test_file.rb
new file mode 100644
index 0000000000..2458dde347
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_file.rb
@@ -0,0 +1,108 @@
+require 'test/unit'
+require 'tempfile'
+$:.replace([File.dirname(File.expand_path(__FILE__))] | $:)
+require 'ut_eof'
+
+class TestFile < Test::Unit::TestCase
+
+  # I don't know Ruby's spec about "unlink-before-close" exactly.
+  # This test asserts current behaviour.
+  def test_unlink_before_close
+    filename = File.basename(__FILE__) + ".#{$$}"
+    w = File.open(filename, "w")
+    w << "foo"
+    w.close
+    r = File.open(filename, "r")
+    begin
+      if /(mswin|bccwin|mingw|emx)/ =~ RUBY_PLATFORM
+	begin
+	  File.unlink(filename)
+	  assert(false)
+	rescue Errno::EACCES
+	  assert(true)
+	end
+      else
+	File.unlink(filename)
+	assert(true)
+      end
+    ensure
+      r.close
+      File.unlink(filename) if File.exist?(filename)
+    end
+  end
+
+  include TestEOF
+  def open_file(content)
+    f = Tempfile.new("test-eof")
+    f << content
+    f.rewind
+    yield f
+  end
+  alias open_file_rw open_file
+
+  include TestEOF::Seek
+
+  def test_fnmatch
+    # from [ruby-dev:22815] and [ruby-dev:22819]
+    assert(true, File.fnmatch('\[1\]' , '[1]'))
+    assert(true, File.fnmatch('*?', 'a'))
+  end
+
+  def test_truncate_wbuf # [ruby-dev:24191]
+    f = Tempfile.new("test-truncate")
+    f.print "abc"
+    f.truncate(0)
+    f.print "def"
+    f.close
+    assert_equal("\0\0\0def", File.read(f.path))
+  end
+
+  def test_truncate_rbuf # [ruby-dev:24197]
+    f = Tempfile.new("test-truncate")
+    f.puts "abc"
+    f.puts "def"
+    f.close
+    f.open
+    assert_equal("abc\n", f.gets)
+    f.truncate(3)
+    assert_equal(nil, f.gets)
+  end
+
+  def test_read_all_extended_file
+    f = Tempfile.new("test-extended-file")
+    assert_nil(f.getc)
+    open(f.path, "w") {|g| g.print "a" }
+    assert_equal("a", f.read)
+  end
+
+  def test_gets_extended_file
+    f = Tempfile.new("test-extended-file")
+    assert_nil(f.getc)
+    open(f.path, "w") {|g| g.print "a" }
+    assert_equal("a", f.gets("a"))
+  end
+
+  def test_gets_para_extended_file
+    f = Tempfile.new("test-extended-file")
+    assert_nil(f.getc)
+    open(f.path, "w") {|g| g.print "\na" }
+    assert_equal("a", f.gets(""))
+  end
+
+  def test_each_byte_extended_file
+    f = Tempfile.new("test-extended-file")
+    assert_nil(f.getc)
+    open(f.path, "w") {|g| g.print "a" }
+    result = []
+    f.each_byte {|b| result << b }
+    assert_equal([?a], result)
+  end
+
+  def test_getc_extended_file
+    f = Tempfile.new("test-extended-file")
+    assert_nil(f.getc)
+    open(f.path, "w") {|g| g.print "a" }
+    assert_equal(?a, f.getc)
+  end
+
+end
diff --git a/ruby_1_8_6/test/ruby/test_float.rb b/ruby_1_8_6/test/ruby/test_float.rb
new file mode 100644
index 0000000000..d559ce5cab
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_float.rb
@@ -0,0 +1,113 @@
+require 'test/unit'
+
+class TestFloat < Test::Unit::TestCase
+  def test_float
+    assert_equal(2, 2.6.floor)
+    assert_equal(-3, (-2.6).floor)
+    assert_equal(3, 2.6.ceil)
+    assert_equal(-2, (-2.6).ceil)
+    assert_equal(2, 2.6.truncate)
+    assert_equal(-2, (-2.6).truncate)
+    assert_equal(3, 2.6.round)
+    assert_equal(-2, (-2.4).truncate)
+    assert((13.4 % 1 - 0.4).abs < 0.0001)
+  end
+
+  def nan_test(x,y)
+    extend Test::Unit::Assertions
+    assert(x != y)
+    assert_equal(false, (x < y))
+    assert_equal(false, (x > y))
+    assert_equal(false, (x <= y))
+    assert_equal(false, (x >= y))
+  end
+  def test_nan
+    nan = 0.0/0
+    nan_test(nan, nan)
+    nan_test(nan, 0)
+    nan_test(nan, 1)
+    nan_test(nan, -1)
+    nan_test(nan, 1000)
+    nan_test(nan, -1000)
+    nan_test(nan, 1_000_000_000_000)
+    nan_test(nan, -1_000_000_000_000)
+    nan_test(nan, 100.0);
+    nan_test(nan, -100.0);
+    nan_test(nan, 0.001);
+    nan_test(nan, -0.001);
+    nan_test(nan, 1.0/0);
+    nan_test(nan, -1.0/0);
+  end
+
+  def test_precision
+    u = 3.7517675036461267e+17
+    v = sprintf("%.16e", u).to_f
+    assert_in_delta(u, v, u.abs * Float::EPSILON)
+    assert_in_delta(u, v, v.abs * Float::EPSILON)
+  end
+
+  def test_symmetry_bignum # [ruby-bugs-ja:118]
+    a = 100000000000000000000000
+    b = 100000000000000000000000.0
+    assert_equal(a == b, b == a)
+  end
+
+  def test_strtod
+    a = Float("0")
+    assert(a.abs < Float::EPSILON)
+    a = Float("0.0")
+    assert(a.abs < Float::EPSILON)
+    a = Float("+0.0")
+    assert(a.abs < Float::EPSILON)
+    a = Float("-0.0")
+    assert(a.abs < Float::EPSILON)
+    a = Float("0.0000000000000000001")
+    assert(a != 0.0)
+    a = Float("+0.0000000000000000001")
+    assert(a != 0.0)
+    a = Float("-0.0000000000000000001")
+    assert(a != 0.0)
+    a = Float(".0")
+    assert(a.abs < Float::EPSILON)
+    a = Float("+.0")
+    assert(a.abs < Float::EPSILON)
+    a = Float("-.0")
+    assert(a.abs < Float::EPSILON)
+    assert(a.abs < Float::EPSILON)
+    assert_raise(ArgumentError){Float(".")}
+    assert_raise(ArgumentError){Float("+")}
+    assert_raise(ArgumentError){Float("+.")}
+    assert_raise(ArgumentError){Float("-")}
+    assert_raise(ArgumentError){Float("-.")}
+    assert_raise(ArgumentError){Float("1e")}
+    # add expected behaviour here.
+  end
+
+  def test_divmod
+    assert_equal([2, 3.5], 11.5.divmod(4))
+    assert_equal([-3, -0.5], 11.5.divmod(-4))
+    assert_equal([-3, 0.5], (-11.5).divmod(4))
+    assert_equal([2, -3.5], (-11.5).divmod(-4))
+  end
+
+  def test_div
+    assert_equal(2, 11.5.div(4))
+    assert_equal(-3, 11.5.div(-4))
+    assert_equal(-3, (-11.5).div(4))
+    assert_equal(2, (-11.5).div(-4))
+  end
+
+  def test_modulo
+    assert_equal(3.5, 11.5.modulo(4))
+    assert_equal(-0.5, 11.5.modulo(-4))
+    assert_equal(0.5, (-11.5).modulo(4))
+    assert_equal(-3.5, (-11.5).modulo(-4))
+  end
+
+  def test_remainder
+    assert_equal(3.5, 11.5.remainder(4))
+    assert_equal(3.5, 11.5.remainder(-4))
+    assert_equal(-3.5, (-11.5).remainder(4))
+    assert_equal(-3.5, (-11.5).remainder(-4))
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_gc.rb b/ruby_1_8_6/test/ruby/test_gc.rb
new file mode 100644
index 0000000000..d0b4e3df77
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_gc.rb
@@ -0,0 +1,30 @@
+require 'test/unit'
+
+class TestGc < Test::Unit::TestCase
+  class S
+    def initialize(a)
+      @a = a
+    end
+  end
+
+  def test_gc
+    assert_nothing_raised do
+      1.upto(10000) {
+        tmp = [0,1,2,3,4,5,6,7,8,9]
+      }
+      tmp = nil
+    end
+    l=nil
+    100000.times {
+      l = S.new(l)
+    }
+    GC.start
+    assert true   # reach here or dumps core
+    l = []
+    100000.times {
+      l.push([l])
+    }
+    GC.start
+    assert true   # reach here or dumps core
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_hash.rb b/ruby_1_8_6/test/ruby/test_hash.rb
new file mode 100644
index 0000000000..38d72f701b
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_hash.rb
@@ -0,0 +1,638 @@
+require 'test/unit'
+
+class TestHash < Test::Unit::TestCase
+
+  def test_hash
+    x = {1=>2, 2=>4, 3=>6}
+    y = {1, 2, 2, 4, 3, 6}
+
+    assert_equal(2, x[1])
+
+    assert(begin
+         for k,v in y
+           raise if k*2 != v
+         end
+         true
+       rescue
+         false
+       end)
+
+    assert_equal(3, x.length)
+    assert(x.has_key?(1))
+    assert(x.has_value?(4))
+    assert_equal([4,6], x.values_at(2,3))
+    assert_equal({1=>2, 2=>4, 3=>6}, x)
+
+    z = y.keys.join(":")
+    assert_equal("1:2:3", z)
+
+    z = y.values.join(":")
+    assert_equal("2:4:6", z)
+    assert_equal(x, y)
+
+    y.shift
+    assert_equal(2, y.length)
+
+    z = [1,2]
+    y[z] = 256
+    assert_equal(256, y[z])
+
+    x = Hash.new(0)
+    x[1] = 1
+    assert_equal(1, x[1])
+    assert_equal(0, x[2])
+
+    x = Hash.new([])
+    assert_equal([], x[22])
+    assert_same(x[22], x[22])
+
+    x = Hash.new{[]}
+    assert_equal([], x[22])
+    assert_not_same(x[22], x[22])
+
+    x = Hash.new{|h,k| z = k; h[k] = k*2}
+    z = 0
+    assert_equal(44, x[22])
+    assert_equal(22, z)
+    z = 0
+    assert_equal(44, x[22])
+    assert_equal(0, z)
+    x.default = 5
+    assert_equal(5, x[23])
+
+    x = Hash.new
+    def x.default(k)
+      $z = k
+      self[k] = k*2
+    end
+    $z = 0
+    assert_equal(44, x[22])
+    assert_equal(22, $z)
+    $z = 0
+    assert_equal(44, x[22])
+    assert_equal(0, $z)
+  end
+
+  # From rubicon
+
+  def setup
+    @cls = Hash
+    @h = @cls[
+      1 => 'one', 2 => 'two', 3 => 'three',
+      self => 'self', true => 'true', nil => 'nil',
+      'nil' => nil
+    ]
+  end
+
+  def test_s_AREF
+    h = @cls["a" => 100, "b" => 200]
+    assert_equal(100, h['a'])
+    assert_equal(200, h['b'])
+    assert_nil(h['c'])
+
+    h = @cls.[]("a" => 100, "b" => 200)
+    assert_equal(100, h['a'])
+    assert_equal(200, h['b'])
+    assert_nil(h['c'])
+  end
+
+  def test_s_new
+    h = @cls.new
+    assert_instance_of(@cls, h)
+    assert_nil(h.default)
+    assert_nil(h['spurious'])
+
+    h = @cls.new('default')
+    assert_instance_of(@cls, h)
+    assert_equal('default', h.default)
+    assert_equal('default', h['spurious'])
+    
+  end
+
+  def test_AREF # '[]'
+    t = Time.now
+    h = @cls[
+      1 => 'one', 2 => 'two', 3 => 'three',
+      self => 'self', t => 'time', nil => 'nil',
+      'nil' => nil
+    ]
+
+    assert_equal('one',   h[1])
+    assert_equal('two',   h[2])
+    assert_equal('three', h[3])
+    assert_equal('self',  h[self])
+    assert_equal('time',  h[t])
+    assert_equal('nil',   h[nil])
+    assert_equal(nil,     h['nil'])
+    assert_equal(nil,     h['koala'])
+
+    h1 = h.dup
+    h1.default = :default
+
+    assert_equal('one',    h1[1])
+    assert_equal('two',    h1[2])
+    assert_equal('three',  h1[3])
+    assert_equal('self',   h1[self])
+    assert_equal('time',   h1[t])
+    assert_equal('nil',    h1[nil])
+    assert_equal(nil,      h1['nil'])
+    assert_equal(:default, h1['koala'])
+
+
+  end
+
+  def test_ASET # '[]='
+    t = Time.now
+    h = @cls.new
+    h[1]     = 'one'
+    h[2]     = 'two'
+    h[3]     = 'three'
+    h[self]  = 'self'
+    h[t]     = 'time'
+    h[nil]   = 'nil'
+    h['nil'] = nil
+    assert_equal('one',   h[1])
+    assert_equal('two',   h[2])
+    assert_equal('three', h[3])
+    assert_equal('self',  h[self])
+    assert_equal('time',  h[t])
+    assert_equal('nil',   h[nil])
+    assert_equal(nil,     h['nil'])
+    assert_equal(nil,     h['koala'])
+
+    h[1] = 1
+    h[nil] = 99
+    h['nil'] = nil
+    z = [1,2]
+    h[z] = 256
+    assert_equal(1,       h[1])
+    assert_equal('two',   h[2])
+    assert_equal('three', h[3])
+    assert_equal('self',  h[self])
+    assert_equal('time',  h[t])
+    assert_equal(99,      h[nil])
+    assert_equal(nil,     h['nil'])
+    assert_equal(nil,     h['koala'])
+    assert_equal(256,     h[z])
+  end
+
+  def test_EQUAL # '=='
+    h1 = @cls[ "a" => 1, "c" => 2 ]
+    h2 = @cls[ "a" => 1, "c" => 2, 7 => 35 ]
+    h3 = @cls[ "a" => 1, "c" => 2, 7 => 35 ]
+    h4 = @cls[ ]
+    assert(h1 == h1)
+    assert(h2 == h2)
+    assert(h3 == h3)
+    assert(h4 == h4)
+    assert(!(h1 == h2))
+    assert(h2 == h3)
+    assert(!(h3 == h4))
+  end
+
+  def test_clear
+    assert(@h.size > 0)
+    @h.clear
+    assert_equal(0, @h.size)
+    assert_nil(@h[1])
+  end
+
+  def test_clone
+    for taint in [ false, true ]
+      for frozen in [ false, true ]
+        a = @h.clone
+        a.taint  if taint
+        a.freeze if frozen
+        b = a.clone
+
+        assert_equal(a, b)
+        assert(a.__id__ != b.__id__)
+        assert_equal(a.frozen?, b.frozen?)
+        assert_equal(a.tainted?, b.tainted?)
+      end
+    end
+  end
+
+  def test_default
+    assert_nil(@h.default)
+    h = @cls.new(:xyzzy)
+    assert_equal(:xyzzy, h.default)
+  end
+
+  def test_default=
+    assert_nil(@h.default)
+    @h.default = :xyzzy
+    assert_equal(:xyzzy, @h.default)
+  end
+
+  def test_delete
+    h1 = @cls[ 1 => 'one', 2 => 'two', true => 'true' ]
+    h2 = @cls[ 1 => 'one', 2 => 'two' ]
+    h3 = @cls[ 2 => 'two' ]
+
+    assert_equal('true', h1.delete(true))
+    assert_equal(h2, h1)
+
+    assert_equal('one', h1.delete(1))
+    assert_equal(h3, h1)
+
+    assert_equal('two', h1.delete(2))
+    assert_equal(@cls[], h1)
+
+    assert_nil(h1.delete(99))
+    assert_equal(@cls[], h1)
+
+    assert_equal('default 99', h1.delete(99) {|i| "default #{i}" })
+  end
+
+  def test_delete_if
+    base = @cls[ 1 => 'one', 2 => false, true => 'true', 'cat' => 99 ]
+    h1   = @cls[ 1 => 'one', 2 => false, true => 'true' ]
+    h2   = @cls[ 2 => false, 'cat' => 99 ]
+    h3   = @cls[ 2 => false ]
+
+    h = base.dup
+    assert_equal(h, h.delete_if { false })
+    assert_equal(@cls[], h.delete_if { true })
+
+    h = base.dup
+    assert_equal(h1, h.delete_if {|k,v| k.instance_of?(String) })
+    assert_equal(h1, h)
+
+    h = base.dup
+    assert_equal(h2, h.delete_if {|k,v| v.instance_of?(String) })
+    assert_equal(h2, h)
+
+    h = base.dup
+    assert_equal(h3, h.delete_if {|k,v| v })
+    assert_equal(h3, h)
+
+    h = base.dup
+    n = 0
+    h.delete_if {|*a|
+      n += 1
+      assert_equal(2, a.size)
+      assert_equal(base[a[0]], a[1])
+      h.shift
+      true
+    }
+    assert_equal(base.size, n)
+  end
+
+  def test_dup
+    for taint in [ false, true ]
+      for frozen in [ false, true ]
+        a = @h.dup
+        a.taint  if taint
+        a.freeze if frozen
+        b = a.dup
+
+        assert_equal(a, b)
+        assert(a.__id__ != b.__id__)
+        assert_equal(false, b.frozen?)
+        assert_equal(a.tainted?, b.tainted?)
+      end
+    end
+  end
+
+  def test_each
+    count = 0
+    @cls[].each { |k, v| count + 1 }
+    assert_equal(0, count)
+
+    h = @h
+    h.each do |k, v|
+      assert_equal(v, h.delete(k))
+    end
+    assert_equal(@cls[], h)
+  end
+
+  def test_each_key
+    count = 0
+    @cls[].each_key { |k| count + 1 }
+    assert_equal(0, count)
+
+    h = @h
+    h.each_key do |k|
+      h.delete(k)
+    end
+    assert_equal(@cls[], h)
+  end
+
+  def test_each_pair
+    count = 0
+    @cls[].each_pair { |k, v| count + 1 }
+    assert_equal(0, count)
+
+    h = @h
+    h.each_pair do |k, v|
+      assert_equal(v, h.delete(k))
+    end
+    assert_equal(@cls[], h)
+  end
+
+  def test_each_value
+    res = []
+    @cls[].each_value { |v| res << v }
+    assert_equal(0, [].length)
+
+    @h.each_value { |v| res << v }
+    assert_equal(0, [].length)
+
+    expected = []
+    @h.each { |k, v| expected << v }
+
+    assert_equal([], expected - res)
+    assert_equal([], res - expected)
+  end
+
+  def test_empty?
+    assert(@cls[].empty?)
+    assert(!@h.empty?)
+  end
+
+  def test_fetch
+    assert_raise(IndexError) { @cls[].fetch(1) }
+    assert_raise(IndexError) { @h.fetch('gumby') }
+    assert_equal('gumbygumby', @h.fetch('gumby') {|k| k * 2 })
+    assert_equal('pokey', @h.fetch('gumby', 'pokey'))
+
+    assert_equal('one', @h.fetch(1))
+    assert_equal(nil, @h.fetch('nil'))
+    assert_equal('nil', @h.fetch(nil))
+  end
+
+  def test_key?
+    assert(!@cls[].key?(1))
+    assert(!@cls[].key?(nil))
+    assert(@h.key?(nil))
+    assert(@h.key?(1))
+    assert(!@h.key?('gumby'))
+  end
+
+  def test_value?
+    assert(!@cls[].value?(1))
+    assert(!@cls[].value?(nil))
+    assert(@h.value?('one'))
+    assert(@h.value?(nil))
+    assert(!@h.value?('gumby'))
+  end
+
+  def test_include?
+    assert(!@cls[].include?(1))
+    assert(!@cls[].include?(nil))
+    assert(@h.include?(nil))
+    assert(@h.include?(1))
+    assert(!@h.include?('gumby'))
+  end
+
+  def test_values_at
+    res = @h.values_at('dog', 'cat', 'horse')
+    assert(res.length == 3)
+    assert_equal([nil, nil, nil], res)
+
+    res = @h.values_at
+    assert(res.length == 0)
+
+    res = @h.values_at(3, 2, 1, nil)
+    assert_equal 4, res.length
+    assert_equal %w( three two one nil ), res
+
+    res = @h.values_at(3, 99, 1, nil)
+    assert_equal 4, res.length
+    assert_equal ['three', nil, 'one', 'nil'], res
+  end
+
+
+  def test_invert
+    h = @h.invert
+    assert_equal(1, h['one'])
+    assert_equal(true, h['true'])
+    assert_equal(nil,  h['nil'])
+
+    h.each do |k, v|
+      assert(@h.key?(v))    # not true in general, but works here
+    end
+
+    h = @cls[ 'a' => 1, 'b' => 2, 'c' => 1].invert
+    assert_equal(2, h.length)
+    assert(h[1] == 'a' || h[1] == 'c')
+    assert_equal('b', h[2])
+  end
+
+  def test_key?
+    assert(!@cls[].key?(1))
+    assert(!@cls[].key?(nil))
+    assert(@h.key?(nil))
+    assert(@h.key?(1))
+    assert(!@h.key?('gumby'))
+  end
+
+  def test_keys
+    assert_equal([], @cls[].keys)
+
+    keys = @h.keys
+    expected = []
+    @h.each { |k, v| expected << k }
+    assert_equal([], keys - expected)
+    assert_equal([], expected - keys)
+  end
+
+  def test_length
+    assert_equal(0, @cls[].length)
+    assert_equal(7, @h.length)
+  end
+
+  def test_member?
+    assert(!@cls[].member?(1))
+    assert(!@cls[].member?(nil))
+    assert(@h.member?(nil))
+    assert(@h.member?(1))
+    assert(!@h.member?('gumby'))
+  end
+
+  def test_rehash
+    a = [ "a", "b" ]
+    c = [ "c", "d" ]
+    h = @cls[ a => 100, c => 300 ]
+    assert_equal(100, h[a])
+    a[0] = "z"
+    assert_nil(h[a])
+    h.rehash
+    assert_equal(100, h[a])
+  end
+
+  def test_reject
+    base = @cls[ 1 => 'one', 2 => false, true => 'true', 'cat' => 99 ]
+    h1   = @cls[ 1 => 'one', 2 => false, true => 'true' ]
+    h2   = @cls[ 2 => false, 'cat' => 99 ]
+    h3   = @cls[ 2 => false ]
+
+    h = base.dup
+    assert_equal(h, h.reject { false })
+    assert_equal(@cls[], h.reject { true })
+
+    h = base.dup
+    assert_equal(h1, h.reject {|k,v| k.instance_of?(String) })
+
+    assert_equal(h2, h.reject {|k,v| v.instance_of?(String) })
+
+    assert_equal(h3, h.reject {|k,v| v })
+    assert_equal(base, h)
+  end
+
+  def test_reject!
+    base = @cls[ 1 => 'one', 2 => false, true => 'true', 'cat' => 99 ]
+    h1   = @cls[ 1 => 'one', 2 => false, true => 'true' ]
+    h2   = @cls[ 2 => false, 'cat' => 99 ]
+    h3   = @cls[ 2 => false ]
+
+    h = base.dup
+    assert_equal(nil, h.reject! { false })
+    assert_equal(@cls[],  h.reject! { true })
+
+    h = base.dup
+    assert_equal(h1, h.reject! {|k,v| k.instance_of?(String) })
+    assert_equal(h1, h)
+
+    h = base.dup
+    assert_equal(h2, h.reject! {|k,v| v.instance_of?(String) })
+    assert_equal(h2, h)
+
+    h = base.dup
+    assert_equal(h3, h.reject! {|k,v| v })
+    assert_equal(h3, h)
+  end
+
+  def test_replace
+    h = @cls[ 1 => 2, 3 => 4 ]
+    h1 = h.replace(@cls[ 9 => 8, 7 => 6 ])
+    assert_equal(h, h1)
+    assert_equal(8, h[9])
+    assert_equal(6, h[7])
+    assert_nil(h[1])
+    assert_nil(h[2])
+  end
+
+  def test_shift
+    h = @h.dup
+    
+    @h.length.times {
+      k, v = h.shift
+      assert(@h.key?(k))
+      assert_equal(@h[k], v)
+    }
+
+    assert_equal(0, h.length)
+  end
+
+  def test_size
+    assert_equal(0, @cls[].length)
+    assert_equal(7, @h.length)
+  end
+
+  def test_sort
+    h = @cls[].sort
+    assert_equal([], h)
+
+    h = @cls[ 1 => 1, 2 => 1 ].sort
+    assert_equal([[1,1], [2,1]], h)
+
+    h = @cls[ 'cat' => 'feline', 'ass' => 'asinine', 'bee' => 'beeline' ]
+    h1 = h.sort
+    assert_equal([ %w(ass asinine), %w(bee beeline), %w(cat feline)], h1)
+  end
+
+  def test_store
+    t = Time.now
+    h = @cls.new
+    h.store(1, 'one')
+    h.store(2, 'two')
+    h.store(3, 'three')
+    h.store(self, 'self')
+    h.store(t,  'time')
+    h.store(nil, 'nil')
+    h.store('nil', nil)
+    assert_equal('one',   h[1])
+    assert_equal('two',   h[2])
+    assert_equal('three', h[3])
+    assert_equal('self',  h[self])
+    assert_equal('time',  h[t])
+    assert_equal('nil',   h[nil])
+    assert_equal(nil,     h['nil'])
+    assert_equal(nil,     h['koala'])
+
+    h.store(1, 1)
+    h.store(nil,  99)
+    h.store('nil', nil)
+    assert_equal(1,       h[1])
+    assert_equal('two',   h[2])
+    assert_equal('three', h[3])
+    assert_equal('self',  h[self])
+    assert_equal('time',  h[t])
+    assert_equal(99,      h[nil])
+    assert_equal(nil,     h['nil'])
+    assert_equal(nil,     h['koala'])
+  end
+
+  def test_to_a
+    assert_equal([], @cls[].to_a)
+    assert_equal([[1,2]], @cls[ 1=>2 ].to_a)
+    a = @cls[ 1=>2, 3=>4, 5=>6 ].to_a
+    assert_equal([1,2], a.delete([1,2]))
+    assert_equal([3,4], a.delete([3,4]))
+    assert_equal([5,6], a.delete([5,6]))
+    assert_equal(0, a.length)
+  end
+
+  def test_to_hash
+    h = @h.to_hash
+    assert_equal(@h, h)
+  end
+
+  def test_to_s
+    h = @cls[ 1 => 2, "cat" => "dog", 1.5 => :fred ]
+    assert_equal(h.to_a.join, h.to_s)
+    $, = ":"
+    assert_equal(h.to_a.join, h.to_s)
+    h = @cls[]
+    assert_equal(h.to_a.join, h.to_s)
+    $, = nil
+  end
+
+  def test_update
+    h1 = @cls[ 1 => 2, 2 => 3, 3 => 4 ]
+    h2 = @cls[ 2 => 'two', 4 => 'four' ]
+
+    ha = @cls[ 1 => 2, 2 => 'two', 3 => 4, 4 => 'four' ]
+    hb = @cls[ 1 => 2, 2 => 3, 3 => 4, 4 => 'four' ]
+
+    assert_equal(ha, h1.update(h2))
+    assert_equal(ha, h1)
+
+    h1 = @cls[ 1 => 2, 2 => 3, 3 => 4 ]
+    h2 = @cls[ 2 => 'two', 4 => 'four' ]
+
+    assert_equal(hb, h2.update(h1))
+    assert_equal(hb, h2)
+  end
+
+  def test_value?
+    assert(!@cls[].value?(1))
+    assert(!@cls[].value?(nil))
+    assert(@h.value?(nil))
+    assert(@h.value?('one'))
+    assert(!@h.value?('gumby'))
+  end
+
+  def test_values
+    assert_equal([], @cls[].values)
+
+    vals = @h.values
+    expected = []
+    @h.each { |k, v| expected << v }
+    assert_equal([], vals - expected)
+    assert_equal([], expected - vals)
+  end
+
+end
diff --git a/ruby_1_8_6/test/ruby/test_ifunless.rb b/ruby_1_8_6/test/ruby/test_ifunless.rb
new file mode 100644
index 0000000000..bffc794512
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_ifunless.rb
@@ -0,0 +1,14 @@
+require 'test/unit'
+
+class TestIfunless < Test::Unit::TestCase
+  def test_if_unless
+    $x = 'test';
+    assert(if $x == $x then true else false end)
+    $bad = false
+    unless $x == $x
+      $bad = true
+    end
+    assert(!$bad)
+    assert(unless $x != $x then true else false end)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_io.rb b/ruby_1_8_6/test/ruby/test_io.rb
new file mode 100644
index 0000000000..642c8f4430
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_io.rb
@@ -0,0 +1,11 @@
+require 'test/unit'
+
+class TestIO < Test::Unit::TestCase
+  def test_gets_rs
+    r, w = IO.pipe
+    w.print "\377xyz"
+    w.close
+    assert_equal("\377", r.gets("\377"), "[ruby-dev:24460]")
+    r.close
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_iterator.rb b/ruby_1_8_6/test/ruby/test_iterator.rb
new file mode 100644
index 0000000000..2cd48b29a4
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_iterator.rb
@@ -0,0 +1,477 @@
+require 'test/unit'
+
+class Array
+  def iter_test1
+    collect{|e| [e, yield(e)]}.sort{|a,b|a[1]<=>b[1]}
+  end
+  def iter_test2
+    a = collect{|e| [e, yield(e)]}
+    a.sort{|a,b|a[1]<=>b[1]}
+  end
+end
+
+class TestIterator < Test::Unit::TestCase
+  def ttt
+    assert(iterator?)
+  end
+
+  def test_iterator
+    assert(!iterator?)
+
+    ttt{}
+
+    # yield at top level	!! here's not toplevel
+    assert(!defined?(yield))
+  end
+
+  def test_array
+    $x = [1, 2, 3, 4]
+    $y = []
+
+    # iterator over array
+    for i in $x
+      $y.push i
+    end
+    assert_equal($x, $y)
+  end
+
+  def tt
+    1.upto(10) {|i|
+      yield i
+    }
+  end
+
+  def tt2(dummy)
+    yield 1
+  end
+
+  def tt3(&block)
+    tt2(raise(ArgumentError,""),&block)
+  end
+
+  def test_nested_iterator
+    i = 0
+    tt{|i| break if i == 5}
+    assert_equal(5, i)
+
+    assert_raises(ArgumentError) do
+      tt3{}
+    end
+  end
+
+  def tt4 &block
+    tt2(raise(ArgumentError,""),&block)
+  end
+
+  def test_block_argument_without_paren
+    assert_raises(ArgumentError) do
+      tt4{}
+    end
+  end
+
+  # iterator break/redo/next/retry
+  def test_break
+    done = true
+    loop{
+      break
+      done = false			# should not reach here
+    }
+    assert(done)
+
+    done = false
+    $bad = false
+    loop {
+      break if done
+      done = true
+      next
+      $bad = true			# should not reach here
+    }
+    assert(!$bad)
+
+    done = false
+    $bad = false
+    loop {
+      break if done
+      done = true
+      redo
+      $bad = true			# should not reach here
+    }
+    assert(!$bad)
+
+    $x = []
+    for i in 1 .. 7
+      $x.push i
+    end
+    assert_equal(7, $x.size)
+    assert_equal([1, 2, 3, 4, 5, 6, 7], $x)
+
+    $done = false
+    $x = []
+    for i in 1 .. 7			# see how retry works in iterator loop
+      if i == 4 and not $done
+	$done = true
+	retry
+      end
+      $x.push(i)
+    end
+    assert_equal(10, $x.size)
+    assert_equal([1, 2, 3, 1, 2, 3, 4, 5, 6, 7], $x)
+  end
+
+  def test_append_method_to_built_in_class
+    $x = [[1,2],[3,4],[5,6]]
+    assert_equal($x.iter_test1{|x|x}, $x.iter_test2{|x|x})
+  end
+
+  class IterTest
+    def initialize(e); @body = e; end
+
+    def each0(&block); @body.each(&block); end
+    def each1(&block); @body.each {|*x| block.call(*x) } end
+    def each2(&block); @body.each {|*x| block.call(x) } end
+    def each3(&block); @body.each {|x| block.call(*x) } end
+    def each4(&block); @body.each {|x| block.call(x) } end
+    def each5; @body.each {|*x| yield(*x) } end
+    def each6; @body.each {|*x| yield(x) } end
+    def each7; @body.each {|x| yield(*x) } end
+    def each8; @body.each {|x| yield(x) } end
+
+    def f(a)
+      a
+    end
+  end
+
+  def test_itertest
+    assert_equal([1], IterTest.new(nil).method(:f).to_proc.call([1]))
+    m = /\w+/.match("abc")
+    assert_equal([m], IterTest.new(nil).method(:f).to_proc.call([m]))
+
+    IterTest.new([0]).each0 {|x| assert_equal(0, x)}
+    IterTest.new([1]).each1 {|x| assert_equal(1, x)}
+    IterTest.new([2]).each2 {|x| assert_equal([2], x)}
+    IterTest.new([3]).each3 {|x| assert_equal(3, x)}
+    IterTest.new([4]).each4 {|x| assert_equal(4, x)}
+    IterTest.new([5]).each5 {|x| assert_equal(5, x)}
+    IterTest.new([6]).each6 {|x| assert_equal([6], x)}
+    IterTest.new([7]).each7 {|x| assert_equal(7, x)}
+    IterTest.new([8]).each8 {|x| assert_equal(8, x)}
+
+    IterTest.new([[0]]).each0 {|x| assert_equal([0], x)}
+    IterTest.new([[1]]).each1 {|x| assert_equal([1], x)}
+    IterTest.new([[2]]).each2 {|x| assert_equal([[2]], x)}
+    IterTest.new([[3]]).each3 {|x| assert_equal(3, x)}
+    IterTest.new([[4]]).each4 {|x| assert_equal([4], x)}
+    IterTest.new([[5]]).each5 {|x| assert_equal([5], x)}
+    IterTest.new([[6]]).each6 {|x| assert_equal([[6]], x)}
+    IterTest.new([[7]]).each7 {|x| assert_equal(7, x)}
+    IterTest.new([[8]]).each8 {|x| assert_equal([8], x)}
+
+    IterTest.new([[0,0]]).each0 {|x| assert_equal([0,0], x)}
+    IterTest.new([[8,8]]).each8 {|x| assert_equal([8,8], x)}
+  end
+
+  def m(var)
+    var
+  end
+
+  def m1
+    m(block_given?)
+  end
+
+  def m2
+    m(block_given?,&proc{})
+  end
+
+  def test_block_given
+    assert(m1{p 'test'})
+    assert(m2{p 'test'})
+    assert(!m1())
+    assert(!m2())
+  end
+
+  def m3(var, &block)
+    m(yield(var), &block)
+  end
+
+  def m4(&block)
+    m(m1(), &block)
+  end
+
+  def test_block_passing
+    assert(!m4())
+    assert(!m4 {})
+    assert_equal(100, m3(10) {|x|x*x})
+  end
+
+  class C
+    include Enumerable
+    def initialize
+      @a = [1,2,3]
+    end
+    def each(&block)
+      @a.each(&block)
+    end
+  end
+
+  def test_collect
+    assert_equal([1,2,3], C.new.collect{|n| n})
+  end
+
+  def test_proc
+    assert_instance_of(Proc, lambda{})
+    assert_instance_of(Proc, Proc.new{})
+    lambda{|a|assert_equal(a, 1)}.call(1)
+  end
+
+  def test_block
+    assert_instance_of(NilClass, get_block)
+    assert_instance_of(Proc, get_block{})
+  end
+
+  def test_argument
+    assert_nothing_raised {lambda{||}.call}
+    assert_raises(ArgumentError) {lambda{||}.call(1)}
+    assert_nothing_raised {lambda{|a,|}.call(1)}
+    assert_raises(ArgumentError) {lambda{|a,|}.call()}
+    assert_raises(ArgumentError) {lambda{|a,|}.call(1,2)}
+  end
+
+  def get_block(&block)
+    block
+  end
+
+  def test_get_block
+    assert_instance_of(Proc, get_block{})
+    assert_nothing_raised {get_block{||}.call()}
+    assert_nothing_raised {get_block{||}.call(1)}
+    assert_nothing_raised {get_block{|a,|}.call(1)}
+    assert_nothing_raised {get_block{|a,|}.call()}
+    assert_nothing_raised {get_block{|a,|}.call(1,2)}
+
+    assert_nothing_raised {get_block(&lambda{||}).call()}
+    assert_raises(ArgumentError) {get_block(&lambda{||}).call(1)}
+    assert_nothing_raised {get_block(&lambda{|a,|}).call(1)}
+    assert_raises(ArgumentError) {get_block(&lambda{|a,|}).call(1,2)}
+
+    block = get_block{11}
+    assert_instance_of(Proc, block)
+    assert_instance_of(Proc, block.to_proc)
+    assert_equal(block.clone.call, 11)
+    assert_instance_of(Proc, get_block(&block))
+
+    lambda = lambda{44}
+    assert_instance_of(Proc, lambda)
+    assert_instance_of(Proc, lambda.to_proc)
+    assert_equal(lambda.clone.call, 44)
+    assert_instance_of(Proc, get_block(&lambda))
+
+    assert_equal(1, Proc.new{|a,| a}.call(1,2,3))
+    assert_nothing_raised {Proc.new{|a,|}.call(1,2)}
+  end
+
+  def return1_test
+    Proc.new {
+      return 55
+    }.call + 5
+  end
+
+  def test_return1
+    assert_equal(55, return1_test())
+  end
+
+  def return2_test
+    lambda {
+      return 55
+    }.call + 5
+  end
+
+  def test_return2
+    assert_equal(60, return2_test())
+  end
+
+  def proc_call(&b)
+    b.call
+  end
+  def proc_yield()
+    yield
+  end
+  def proc_return1
+    proc_call{return 42}+1
+  end
+
+  def test_proc_return1
+    assert_equal(42, proc_return1())
+  end
+
+  def proc_return2
+    proc_yield{return 42}+1
+  end
+
+  def test_proc_return2
+    assert_equal(42, proc_return2())
+  end
+
+  def test_ljump
+    block = get_block{11}
+    lambda = lambda{44}
+    assert_raises(LocalJumpError) {get_block{break}.call}
+    assert_nothing_raised {lambda{break}.call}
+    assert_instance_of(LocalJumpError, (get_block{break}.call rescue $!))
+
+    assert_equal(-1, block.arity)
+    assert_equal(-1, lambda.arity)
+    assert_equal(0, lambda{||}.arity)
+    assert_equal(1, lambda{|a|}.arity)
+    assert_equal(1, lambda{|a,|}.arity)
+    assert_equal(2, lambda{|a,b|}.arity)
+  end
+
+  def marity_test(m)
+    method = method(m)
+    assert_equal(method.arity, method.to_proc.arity)
+  end
+
+  def test_marity
+    marity_test(:assert)
+    marity_test(:marity_test)
+    marity_test(:p)
+
+    lambda(&method(:assert)).call(true)
+    lambda(&get_block{|a,n| assert(a,n)}).call(true, "marity")
+  end
+
+  def foo
+    yield([:key, :value])
+  end
+  def bar(&blk)
+    blk.call([:key, :value])
+  end
+
+  def test_yield_vs_call
+    foo{|k,v| assert_equal([:key, :value], [k,v])}
+    bar{|k,v| assert_equal([:key, :value], [k,v])}
+  end
+
+  class H
+    def each
+      yield [:key, :value]
+    end
+  end
+
+  def test_assoc_yield
+    [{:key=>:value}, H.new].each {|h|
+      h.each{|a| assert_equal([:key, :value], a)}
+      h.each{|*a| assert_equal([[:key, :value]], a)}
+      h.each{|k,v| assert_equal([:key, :value], [k,v])}
+    }
+  end
+
+  class ITER_TEST1
+    def a
+      block_given?
+    end
+  end
+
+  class ITER_TEST2 < ITER_TEST1
+    include Test::Unit::Assertions
+    def a
+      assert(super)
+      super
+    end
+  end
+
+  def test_iter_test2
+    assert(ITER_TEST2.new.a {})
+  end
+
+  class ITER_TEST3
+    def foo x
+      return yield if block_given?
+      x
+    end
+  end
+
+  class ITER_TEST4 < ITER_TEST3
+    include Test::Unit::Assertions
+    def foo x
+      assert_equal(super, yield)
+      assert_equal(x, super(x, &nil))
+    end
+  end
+
+  def test_iter4
+    ITER_TEST4.new.foo(44){55}
+  end
+
+  def test_break__nested_loop1
+    _test_break__nested_loop1 do
+      break
+    end
+  end
+
+  def _test_break__nested_loop1
+    while true
+      yield
+    end
+    assert(false, "must not reach here")
+  end
+
+  def test_break__nested_loop2
+    _test_break__nested_loop2 do
+      break
+    end
+  end
+
+  def _test_break__nested_loop2
+    until false
+      yield
+    end
+    assert(false, "must not reach here")
+  end
+
+  def test_break__nested_loop3
+    _test_break__nested_loop3 do
+      break
+    end
+  end
+
+  def _test_break__nested_loop3
+    loop do
+      yield
+    end
+    assert(false, "must not reach here")
+  end
+
+  def test_break_from_enum
+    result = ["a"].inject("ng") {|x,y| break "ok"}
+    assert_equal("ok", result)
+  end
+
+  def _test_return_trace_func(x)
+    set_trace_func(proc {})
+    [].fetch(2) {return x}
+  ensure
+    set_trace_func(nil)
+  end
+
+  def test_return_trace_func
+    ok = "returned gracefully"
+    result = "skipped"
+    result = _test_return_trace_func(ok)
+  ensure
+    assert_equal(ok, result)
+    return
+  end
+
+  class IterString < ::String
+    def ===(other)
+      super if !block_given?
+    end
+  end
+
+  # Check that the block passed to an iterator
+  # does not get propagated inappropriately
+  def test_block_given_within_iterator
+    assert_equal(["b"], ["a", "b", "c"].grep(IterString.new("b")) {|s| s})
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_marshal.rb b/ruby_1_8_6/test/ruby/test_marshal.rb
new file mode 100644
index 0000000000..9c9fd9470b
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_marshal.rb
@@ -0,0 +1,48 @@
+require 'test/unit'
+dir = File.dirname(File.expand_path(__FILE__))
+orgpath = $:.dup
+begin
+  $:.push(dir)
+  require 'marshaltestlib'
+ensure
+  $:.replace(orgpath)
+end
+
+class TestMarshal < Test::Unit::TestCase
+  include MarshalTestLib
+
+  def encode(o)
+    Marshal.dump(o)
+  end
+
+  def decode(s)
+    Marshal.load(s)
+  end
+
+  def fact(n)
+    return 1 if n == 0
+    f = 1
+    while n>0
+      f *= n
+      n -= 1
+    end
+    return f
+  end
+
+  StrClone=String.clone;
+
+  def test_marshal
+    $x = [1,2,3,[4,5,"foo"],{1=>"bar"},2.5,fact(30)]
+    $y = Marshal.dump($x)
+    assert_equal($x, Marshal.load($y))
+
+    assert_instance_of(StrClone, Marshal.load(Marshal.dump(StrClone.new("abc"))))
+
+    [[1,2,3,4], [81, 2, 118, 3146]].each { |w,x,y,z|
+      a = (x.to_f + y.to_f / z.to_f) * Math.exp(w.to_f / (x.to_f + y.to_f / z.to_f))
+      ma = Marshal.dump(a)
+      b = Marshal.load(ma)
+      assert_equal(a, b)
+    }
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_math.rb b/ruby_1_8_6/test/ruby/test_math.rb
new file mode 100644
index 0000000000..e1e49dba01
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_math.rb
@@ -0,0 +1,12 @@
+require 'test/unit'
+
+class TestMath < Test::Unit::TestCase
+  def test_math
+    assert_equal(2, Math.sqrt(4))
+
+    self.class.class_eval {
+      include Math
+    }
+    assert_equal(2, sqrt(4))
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_method.rb b/ruby_1_8_6/test/ruby/test_method.rb
new file mode 100644
index 0000000000..ef28098dce
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_method.rb
@@ -0,0 +1,53 @@
+require 'test/unit'
+
+class TestMethod < Test::Unit::TestCase
+  def m0() end
+  def m1(a) end
+  def m2(a, b) end
+  def mo1(a = nil, &b) end
+  def mo2(a, b = nil) end
+  def mo3(*a) end
+  def mo4(a, *b, &c) end
+
+  class Base
+    def foo() :base end
+    def bar() :bar end
+  end
+  module SuperBar
+    def bar() super end
+  end
+  class Derived < Base
+    include SuperBar
+    def foo() :derived end
+  end
+
+  def test_arity
+    assert_equal(0, method(:m0).arity)
+    assert_equal(1, method(:m1).arity)
+    assert_equal(2, method(:m2).arity)
+    assert_equal(-1, method(:mo1).arity)
+    assert_equal(-2, method(:mo2).arity)
+    assert_equal(-1, method(:mo3).arity)
+    assert_equal(-2, method(:mo4).arity)
+  end
+
+  def test_unbind
+    assert_equal(:derived, Derived.new.foo)
+    um = Derived.new.method(:foo).unbind
+    assert_instance_of(UnboundMethod, um)
+    Derived.class_eval do
+      def foo() :changed end
+    end
+    assert_equal(:changed, Derived.new.foo)
+    assert_equal(:derived, um.bind(Derived.new).call)
+    assert_raise(TypeError) do
+      um.bind(Base.new)
+    end
+  end
+
+  def test_method_super
+    assert_nothing_raised do
+      assert_equal(:bar, Derived.new.method(:bar).call)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_objectspace.rb b/ruby_1_8_6/test/ruby/test_objectspace.rb
new file mode 100644
index 0000000000..a2d0164954
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_objectspace.rb
@@ -0,0 +1,36 @@
+require 'test/unit'
+
+class TestObjectSpace < Test::Unit::TestCase
+  def self.deftest_id2ref(obj)
+    /:(\d+)/ =~ caller[0]
+    file = $`
+    line = $1.to_i
+    code = <<"End"
+    define_method("test_id2ref_#{line}") {\
+      o = ObjectSpace._id2ref(obj.object_id);\
+      assert_same(obj, o, "didn't round trip: \#{obj.inspect}");\
+    }
+End
+    eval code, binding, file, line
+  end
+
+  deftest_id2ref(-0x4000000000000001)
+  deftest_id2ref(-0x4000000000000000)
+  deftest_id2ref(-0x40000001)
+  deftest_id2ref(-0x40000000)
+  deftest_id2ref(-1)
+  deftest_id2ref(0)
+  deftest_id2ref(1)
+  deftest_id2ref(0x3fffffff)
+  deftest_id2ref(0x40000000)
+  deftest_id2ref(0x3fffffffffffffff)
+  deftest_id2ref(0x4000000000000000)
+  deftest_id2ref(:a)
+  deftest_id2ref(:abcdefghijilkjl)
+  deftest_id2ref(:==)
+  deftest_id2ref(Object.new)
+  deftest_id2ref(self)
+  deftest_id2ref(true)
+  deftest_id2ref(false)
+  deftest_id2ref(nil)
+end
diff --git a/ruby_1_8_6/test/ruby/test_pack.rb b/ruby_1_8_6/test/ruby/test_pack.rb
new file mode 100644
index 0000000000..e67465b33a
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_pack.rb
@@ -0,0 +1,60 @@
+require 'test/unit'
+
+class TestPack < Test::Unit::TestCase
+  def test_pack
+    $format = "c2x5CCxsdils_l_a6";
+    # Need the expression in here to force ary[5] to be numeric.  This avoids
+    # test2 failing because ary2 goes str->numeric->str and ary does not.
+    ary = [1,-100,127,128,32767,987.654321098 / 100.0,12345,123456,-32767,-123456,"abcdef"]
+    $x = ary.pack($format)
+    ary2 = $x.unpack($format)
+
+    assert_equal(ary.length, ary2.length)
+    assert_equal(ary.join(':'), ary2.join(':'))
+    assert_match(/def/, $x)
+
+    $x = [-1073741825]
+    assert_equal($x, $x.pack("q").unpack("q"))
+
+    $x = [-1]
+    assert_equal($x, $x.pack("l").unpack("l"))
+  end
+
+  def test_pack_N
+    assert_equal "\000\000\000\000", [0].pack('N')
+    assert_equal "\000\000\000\001", [1].pack('N')
+    assert_equal "\000\000\000\002", [2].pack('N')
+    assert_equal "\000\000\000\003", [3].pack('N')
+    assert_equal "\377\377\377\376", [4294967294].pack('N')
+    assert_equal "\377\377\377\377", [4294967295].pack('N')
+
+    assert_equal "\200\000\000\000", [2**31].pack('N')
+    assert_equal "\177\377\377\377", [-2**31-1].pack('N')
+    assert_equal "\377\377\377\377", [-1].pack('N')
+
+    assert_equal "\000\000\000\001\000\000\000\001", [1,1].pack('N*')
+    assert_equal "\000\000\000\001\000\000\000\001\000\000\000\001", [1,1,1].pack('N*')
+  end
+
+  def test_unpack_N
+    assert_equal 1, "\000\000\000\001".unpack('N')[0]
+    assert_equal 2, "\000\000\000\002".unpack('N')[0]
+    assert_equal 3, "\000\000\000\003".unpack('N')[0]
+    assert_equal 3, "\000\000\000\003".unpack('N')[0]
+    assert_equal 4294967295, "\377\377\377\377".unpack('N')[0]
+    assert_equal [1,1], "\000\000\000\001\000\000\000\001".unpack('N*')
+    assert_equal [1,1,1], "\000\000\000\001\000\000\000\001\000\000\000\001".unpack('N*')
+  end
+
+  def test_pack_U
+    assert_raises(RangeError) { [-0x40000001].pack("U") }
+    assert_raises(RangeError) { [-0x40000000].pack("U") }
+    assert_raises(RangeError) { [-1].pack("U") }
+    assert_equal "\000", [0].pack("U")
+    assert_equal "\374\277\277\277\277\277", [0x3fffffff].pack("U")
+    assert_equal "\375\200\200\200\200\200", [0x40000000].pack("U")
+    assert_equal "\375\277\277\277\277\277", [0x7fffffff].pack("U")
+    assert_raises(RangeError) { [0x80000000].pack("U") }
+    assert_raises(RangeError) { [0x100000000].pack("U") }
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_path.rb b/ruby_1_8_6/test/ruby/test_path.rb
new file mode 100644
index 0000000000..63dbd07346
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_path.rb
@@ -0,0 +1,224 @@
+require 'test/unit'
+
+class TestPath < Test::Unit::TestCase
+  def test_path
+    assert_equal("a", File.basename("a"))
+    assert_equal("b", File.basename("a/b"))
+    assert_equal("b", File.basename("a/b/"))
+    assert_equal("/", File.basename("/"))
+    assert_equal("/", File.basename("//"))
+    assert_equal("/", File.basename("///"))
+    assert_equal("b", File.basename("a/b////"))
+    assert_equal("a", File.basename("a.rb", ".rb"))
+    assert_equal("a", File.basename("a.rb///", ".rb"))
+    assert_equal("a", File.basename("a.rb///", ".*"))
+    assert_equal("a.rb", File.basename("a.rb///", ".c"))
+    assert_equal(".", File.dirname("a"))
+    assert_equal("/", File.dirname("/"))
+    assert_equal("/", File.dirname("/a"))
+    assert_equal("a", File.dirname("a/b"))
+    assert_equal("a/b", File.dirname("a/b/c"))
+    assert_equal("/a/b", File.dirname("/a/b/c"))
+    assert_equal("/a", File.dirname("/a/b/"))
+    assert_equal("/a", File.dirname("/a/b///"))
+    case Dir.pwd
+    when %r'\A\w:'
+      assert_match(/\A\w:\/\z/, File.expand_path(".", "/"))
+      assert_match(/\A\w:\/a\z/, File.expand_path("a", "/"))
+      dosish = true
+    when %r'\A//'
+      assert_match(%r'\A//[^/]+/[^/]+\z', File.expand_path(".", "/"))
+      assert_match(%r'\A//[^/]+/[^/]+/a\z', File.expand_path(".", "/"))
+      dosish = true
+    else
+      assert_equal("/", File.expand_path(".", "/"))
+      assert_equal("/sub", File.expand_path("sub", "/"))
+    end
+    if dosish
+      assert_equal("//machine/share", File.expand_path("/", "//machine/share/sub"))
+      assert_equal("//machine/share/dir", File.expand_path("/dir", "//machine/share/sub"))
+      assert_equal("z:/", File.expand_path("/", "z:/sub"))
+      assert_equal("z:/dir", File.expand_path("/dir", "z:/sub"))
+    end
+    assert_equal("//", File.expand_path(".", "//"))
+    assert_equal("//sub", File.expand_path("sub", "//"))
+  end
+
+  def test_dirname # [ruby-dev:27738]
+    if /(bcc|ms)win\d|mingw|cygwin|djgpp|human|emx/ =~ RUBY_PLATFORM
+      # DOSISH_DRIVE_LETTER
+      assert_equal('C:.', File.dirname('C:'))
+      assert_equal('C:.', File.dirname('C:a'))
+      assert_equal('C:.', File.dirname('C:a/'))
+      assert_equal('C:a', File.dirname('C:a/b'))
+
+      assert_equal('C:/', File.dirname('C:/'))
+      assert_equal('C:/', File.dirname('C:/a'))
+      assert_equal('C:/', File.dirname('C:/a/'))
+      assert_equal('C:/a', File.dirname('C:/a/b'))
+
+      assert_equal('C:/', File.dirname('C://'))
+      assert_equal('C:/', File.dirname('C://a'))
+      assert_equal('C:/', File.dirname('C://a/'))
+      assert_equal('C:/a', File.dirname('C://a/b'))
+
+      assert_equal('C:/', File.dirname('C:///'))
+      assert_equal('C:/', File.dirname('C:///a'))
+      assert_equal('C:/', File.dirname('C:///a/'))
+      assert_equal('C:/a', File.dirname('C:///a/b'))
+    else
+      # others
+      assert_equal('.', File.dirname('C:'))
+      assert_equal('.', File.dirname('C:a'))
+      assert_equal('.', File.dirname('C:a/'))
+      assert_equal('C:a', File.dirname('C:a/b'))
+
+      assert_equal('.', File.dirname('C:/'))
+      assert_equal('C:', File.dirname('C:/a'))
+      assert_equal('C:', File.dirname('C:/a/'))
+      assert_equal('C:/a', File.dirname('C:/a/b'))
+
+      assert_equal('.', File.dirname('C://'))
+      assert_equal('C:', File.dirname('C://a'))
+      assert_equal('C:', File.dirname('C://a/'))
+      # not spec.
+      #assert_equal('C://a', File.dirname('C://a/b'))
+
+      assert_equal('.', File.dirname('C:///'))
+      assert_equal('C:', File.dirname('C:///a'))
+      assert_equal('C:', File.dirname('C:///a/'))
+      # not spec.
+      #assert_equal('C:///a', File.dirname('C:///a/b'))
+    end
+
+    assert_equal('.', File.dirname(''))
+    assert_equal('.', File.dirname('a'))
+    assert_equal('.', File.dirname('a/'))
+    assert_equal('a', File.dirname('a/b'))
+
+    assert_equal('/', File.dirname('/'))
+    assert_equal('/', File.dirname('/a'))
+    assert_equal('/', File.dirname('/a/'))
+    assert_equal('/a', File.dirname('/a/b'))
+
+    if /(bcc|ms|cyg)win|mingw|djgpp|human|emx/ =~ RUBY_PLATFORM
+      # DOSISH_UNC
+      assert_equal('//', File.dirname('//'))
+      assert_equal('//a', File.dirname('//a'))
+      assert_equal('//a', File.dirname('//a/'))
+      assert_equal('//a/b', File.dirname('//a/b'))
+      assert_equal('//a/b', File.dirname('//a/b/'))
+      assert_equal('//a/b', File.dirname('//a/b/c'))
+
+      assert_equal('//', File.dirname('///'))
+      assert_equal('//a', File.dirname('///a'))
+      assert_equal('//a', File.dirname('///a/'))
+      assert_equal('//a/b', File.dirname('///a/b'))
+      assert_equal('//a/b', File.dirname('///a/b/'))
+      assert_equal('//a/b', File.dirname('///a/b/c'))
+    else
+      # others
+      assert_equal('/', File.dirname('//'))
+      assert_equal('/', File.dirname('//a'))
+      assert_equal('/', File.dirname('//a/'))
+      assert_equal('/a', File.dirname('//a/b'))
+      assert_equal('/a', File.dirname('//a/b/'))
+      assert_equal('/a/b', File.dirname('//a/b/c'))
+
+      assert_equal('/', File.dirname('///'))
+      assert_equal('/', File.dirname('///a'))
+      assert_equal('/', File.dirname('///a/'))
+      assert_equal('/a', File.dirname('///a/b'))
+      assert_equal('/a', File.dirname('///a/b/'))
+      assert_equal('/a/b', File.dirname('///a/b/c'))
+    end
+  end
+
+  def test_basename # [ruby-dev:27766]
+    if /(bcc|ms)win\d|mingw|cygwin|djgpp|human|emx/ =~ RUBY_PLATFORM
+      # DOSISH_DRIVE_LETTER
+      assert_equal('', File.basename('C:'))
+      assert_equal('a', File.basename('C:a'))
+      assert_equal('a', File.basename('C:a/'))
+      assert_equal('b', File.basename('C:a/b'))
+
+      assert_equal('/', File.basename('C:/'))
+      assert_equal('a', File.basename('C:/a'))
+      assert_equal('a', File.basename('C:/a/'))
+      assert_equal('b', File.basename('C:/a/b'))
+
+      assert_equal('/', File.basename('C://'))
+      assert_equal('a', File.basename('C://a'))
+      assert_equal('a', File.basename('C://a/'))
+      assert_equal('b', File.basename('C://a/b'))
+
+      assert_equal('/', File.basename('C:///'))
+      assert_equal('a', File.basename('C:///a'))
+      assert_equal('a', File.basename('C:///a/'))
+      assert_equal('b', File.basename('C:///a/b'))
+    else
+      # others
+      assert_equal('C:', File.basename('C:'))
+      assert_equal('C:a', File.basename('C:a'))
+      assert_equal('C:a', File.basename('C:a/'))
+      assert_equal('b', File.basename('C:a/b'))
+
+      assert_equal('C:', File.basename('C:/'))
+      assert_equal('a', File.basename('C:/a'))
+      assert_equal('a', File.basename('C:/a/'))
+      assert_equal('b', File.basename('C:/a/b'))
+
+      assert_equal('C:', File.basename('C://'))
+      assert_equal('a', File.basename('C://a'))
+      assert_equal('a', File.basename('C://a/'))
+      assert_equal('b', File.basename('C://a/b'))
+
+      assert_equal('C:', File.basename('C:///'))
+      assert_equal('a', File.basename('C:///a'))
+      assert_equal('a', File.basename('C:///a/'))
+      assert_equal('b', File.basename('C:///a/b'))
+    end
+
+    assert_equal('', File.basename(''))
+    assert_equal('a', File.basename('a'))
+    assert_equal('a', File.basename('a/'))
+    assert_equal('b', File.basename('a/b'))
+
+    assert_equal('/', File.basename('/'))
+    assert_equal('a', File.basename('/a'))
+    assert_equal('a', File.basename('/a/'))
+    assert_equal('b', File.basename('/a/b'))
+
+    if /(bcc|ms|cyg)win|mingw|djgpp|human|emx/ =~ RUBY_PLATFORM
+      # DOSISH_UNC
+      assert_equal('/', File.basename('//'))
+      assert_equal('/', File.basename('//a'))
+      assert_equal('/', File.basename('//a/'))
+      assert_equal('/', File.basename('//a/b'))
+      assert_equal('/', File.basename('//a/b/'))
+      assert_equal('c', File.basename('//a/b/c'))
+
+      assert_equal('/', File.basename('///'))
+      assert_equal('/', File.basename('///a'))
+      assert_equal('/', File.basename('///a/'))
+      assert_equal('/', File.basename('///a/b'))
+      assert_equal('/', File.basename('///a/b/'))
+      assert_equal('c', File.basename('///a/b/c'))
+    else
+      # others
+      assert_equal('/', File.basename('//'))
+      assert_equal('a', File.basename('//a'))
+      assert_equal('a', File.basename('//a/'))
+      assert_equal('b', File.basename('//a/b'))
+      assert_equal('b', File.basename('//a/b/'))
+      assert_equal('c', File.basename('//a/b/c'))
+
+      assert_equal('/', File.basename('///'))
+      assert_equal('a', File.basename('///a'))
+      assert_equal('a', File.basename('///a/'))
+      assert_equal('b', File.basename('///a/b'))
+      assert_equal('b', File.basename('///a/b/'))
+      assert_equal('c', File.basename('///a/b/c'))
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_pipe.rb b/ruby_1_8_6/test/ruby/test_pipe.rb
new file mode 100644
index 0000000000..c3b4d29c0a
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_pipe.rb
@@ -0,0 +1,18 @@
+require 'test/unit'
+$:.replace([File.dirname(File.expand_path(__FILE__))] | $:)
+require 'ut_eof'
+require 'envutil'
+
+class TestPipe < Test::Unit::TestCase
+  include TestEOF
+  def open_file(content)
+    r, w = IO.pipe
+    w << content
+    w.close
+    begin
+      yield r
+    ensure
+      r.close
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_proc.rb b/ruby_1_8_6/test/ruby/test_proc.rb
new file mode 100644
index 0000000000..f0b78ffb23
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_proc.rb
@@ -0,0 +1,89 @@
+require 'test/unit'
+
+class TestProc < Test::Unit::TestCase
+  def test_proc
+    p1 = proc{|i| i}
+    assert_equal(2, p1.call(2))
+    assert_equal(3, p1.call(3))
+
+    p1 = proc{|i| i*2}
+    assert_equal(4, p1.call(2))
+    assert_equal(6, p1.call(3))
+
+    p2 = nil
+    x=0
+
+    proc{
+      iii=5				# nested local variable
+      p1 = proc{|i|
+        iii = i
+      }
+      p2 = proc {
+        x = iii                 	# nested variables shared by procs
+      }
+      # scope of nested variables
+      assert(defined?(iii))
+    }.call
+    assert(!defined?(iii))		# out of scope
+
+    loop{iii=5; assert(eval("defined? iii")); break}
+    loop {
+      iii = 10
+      def self.dyna_var_check
+        loop {
+          assert(!defined?(iii))
+          break
+        }
+      end
+      dyna_var_check
+      break
+    }
+    p1.call(5)
+    p2.call
+    assert_equal(5, x)
+  end
+
+  def assert_arity(n)
+    meta = class << self; self; end
+    meta.class_eval {define_method(:foo, Proc.new)}
+    assert_equal(n, method(:foo).arity)
+  end
+
+  def test_arity
+    assert_equal(-1, proc{}.arity)
+    assert_equal(0, proc{||}.arity)
+    assert_equal(1, proc{|x|}.arity)
+    assert_equal(2, proc{|x, y|}.arity)
+    assert_equal(-2, proc{|x, *y|}.arity)
+    assert_equal(-1, proc{|*x|}.arity)
+    assert_equal(-1, proc{|*|}.arity)
+
+    assert_arity(-1) {}
+    assert_arity(0) {||}
+    assert_arity(1) {|x|}
+    assert_arity(2) {|x, y|}
+    assert_arity(-2) {|x, *y|}
+    assert_arity(-1) {|*x|}
+    assert_arity(-1) {|*|}
+  end
+
+  # [ruby-dev:22592]
+  def m(x)
+    lambda { x }
+  end
+  def test_eq
+    # [ruby-dev:22592]
+    a = m(1)
+    b = m(2)
+    assert_not_equal(a, b)
+    assert_not_equal(a.call, b.call)
+
+    # [ruby-dev:22599]
+    assert_not_equal(proc {||}, proc {|x,y|})
+
+    # [ruby-dev:22601]
+    a = lambda {|x| lambda {} }.call(1)
+    b = lambda {}
+    assert_not_equal(a, b)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_process.rb b/ruby_1_8_6/test/ruby/test_process.rb
new file mode 100644
index 0000000000..93eb871edc
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_process.rb
@@ -0,0 +1,41 @@
+require 'test/unit'
+
+class TestProcess < Test::Unit::TestCase
+  def test_rlimit_availability
+    begin
+      Process.getrlimit(nil)
+    rescue NotImplementedError
+      assert_raise(NotImplementedError) { Process.setrlimit }
+    rescue TypeError
+      assert_raise(ArgumentError) { Process.setrlimit }
+    end
+  end
+
+  def rlimit_exist?
+    Process.getrlimit(nil)
+  rescue NotImplementedError
+    return false
+  rescue TypeError
+    return true
+  end
+
+  def test_rlimit_nofile
+    return unless rlimit_exist?
+    pid = fork {
+      cur_nofile, max_nofile = Process.getrlimit(Process::RLIMIT_NOFILE)
+      begin
+        Process.setrlimit(Process::RLIMIT_NOFILE, 0, max_nofile)
+      rescue Errno::EINVAL
+        exit 0
+      end
+      begin
+        IO.pipe
+      rescue Errno::EMFILE
+        exit 0
+      end
+      exit 1
+    }
+    Process.wait pid
+    assert_equal(0, $?.to_i)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_rand.rb b/ruby_1_8_6/test/ruby/test_rand.rb
new file mode 100644
index 0000000000..e2fd127f9c
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_rand.rb
@@ -0,0 +1,131 @@
+require 'test/unit'
+
+class TestRand < Test::Unit::TestCase
+  def test_mt
+    srand(0x00000456_00000345_00000234_00000123)
+    %w(1067595299  955945823  477289528 4107218783 4228976476).each {|w|
+      assert_equal(w.to_i, rand(0x100000000))
+    }
+  end
+
+  def test_0x3fffffff
+    srand(0)
+    %w(209652396 398764591 924231285 404868288 441365315).each {|w|
+      assert_equal(w.to_i, rand(0x3fffffff))
+    }
+  end
+
+  def test_0x40000000
+    srand(0)
+    %w(209652396 398764591 924231285 404868288 441365315).each {|w|
+      assert_equal(w.to_i, rand(0x40000000))
+    }
+  end
+
+  def test_0x40000001
+    srand(0)
+    %w(209652396 398764591 924231285 441365315 192771779).each {|w|
+      assert_equal(w.to_i, rand(0x40000001))
+    }
+  end
+
+  def test_0xffffffff
+    srand(0)
+    %w(2357136044 2546248239 3071714933 3626093760 2588848963).each {|w|
+      assert_equal(w.to_i, rand(0xffffffff))
+    }
+  end
+
+  def test_0x100000000
+    srand(0)
+    %w(2357136044 2546248239 3071714933 3626093760 2588848963).each {|w|
+      assert_equal(w.to_i, rand(0x100000000))
+    }
+  end
+
+  def test_0x100000001
+    srand(0)
+    %w(2546248239 1277901399 243580376 1171049868 2051556033).each {|w|
+      assert_equal(w.to_i, rand(0x100000001))
+    }
+  end
+
+  def test_rand_0x100000000
+    srand(311702798)
+    %w(4119812344 3870378946 80324654 4294967296 410016213).each {|w|
+      assert_equal(w.to_i, rand(0x100000001))
+    }
+  end
+
+  def test_0x1000000000000
+    srand(0)
+    %w(11736396900911
+       183025067478208
+       197104029029115
+       130583529618791
+       180361239846611).each {|w|
+      assert_equal(w.to_i, rand(0x1000000000000))
+    }
+  end
+
+  def test_0x1000000000001
+    srand(0)
+    %w(187121911899765
+       197104029029115
+       180361239846611
+       236336749852452
+       208739549485656).each {|w|
+      assert_equal(w.to_i, rand(0x1000000000001))
+    }
+  end
+
+  def test_0x3fffffffffffffff
+    srand(0)
+    %w(900450186894289455
+       3969543146641149120
+       1895649597198586619
+       827948490035658087
+       3203365596207111891).each {|w|
+      assert_equal(w.to_i, rand(0x3fffffffffffffff))
+    }
+  end
+
+  def test_0x4000000000000000
+    srand(0)
+    %w(900450186894289455
+       3969543146641149120
+       1895649597198586619
+       827948490035658087
+       3203365596207111891).each {|w|
+      assert_equal(w.to_i, rand(0x4000000000000000))
+    }
+  end
+
+  def test_0x4000000000000001
+    srand(0)
+    %w(900450186894289455
+       3969543146641149120
+       1895649597198586619
+       827948490035658087
+       2279347887019741461).each {|w|
+      assert_equal(w.to_i, rand(0x4000000000000001))
+    }
+  end
+
+  def test_neg_0x10000000000
+    ws = %w(455570294424 1073054410371 790795084744 2445173525 1088503892627)
+    srand(3)
+    ws.each {|w| assert_equal(w.to_i, rand(0x10000000000)) }
+    srand(3)
+    ws.each {|w| assert_equal(w.to_i, rand(-0x10000000000)) }
+  end
+
+  def test_neg_0x10000
+    ws = %w(2732 43567 42613 52416 45891)
+    srand(0)
+    ws.each {|w| assert_equal(w.to_i, rand(0x10000)) }
+    srand(0)
+    ws.each {|w| assert_equal(w.to_i, rand(-0x10000)) }
+  end
+
+end
diff --git a/ruby_1_8_6/test/ruby/test_range.rb b/ruby_1_8_6/test/ruby/test_range.rb
new file mode 100644
index 0000000000..455175087d
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_range.rb
@@ -0,0 +1,17 @@
+require 'test/unit'
+
+class TestRange < Test::Unit::TestCase
+  def test_range_string
+    # XXX: Is this really the test of Range?
+    assert_equal([], ("a" ... "a").to_a)
+    assert_equal(["a"], ("a" .. "a").to_a)
+    assert_equal(["a"], ("a" ... "b").to_a)
+    assert_equal(["a", "b"], ("a" .. "b").to_a)
+  end
+
+  def test_evaluation_order
+    arr = [1,2]
+    r = (arr.shift)..(arr.shift)
+    assert_equal(1..2, r, "[ruby-dev:26383]")
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_readpartial.rb b/ruby_1_8_6/test/ruby/test_readpartial.rb
new file mode 100644
index 0000000000..3877e21f85
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_readpartial.rb
@@ -0,0 +1,74 @@
+require 'test/unit'
+require 'timeout'
+require 'fcntl'
+
+class TestReadPartial < Test::Unit::TestCase
+  def make_pipe
+    r, w = IO.pipe
+    begin
+      yield r, w
+    ensure
+      r.close unless r.closed?
+      w.close unless w.closed?
+    end
+  end
+
+  def pipe
+    make_pipe {|r, w|
+      yield r, w
+    }
+    return unless defined?(Fcntl::F_SETFL)
+    return unless defined?(Fcntl::F_GETFL)
+    return unless defined?(Fcntl::O_NONBLOCK)
+    make_pipe {|r, w|
+      r.fcntl(Fcntl::F_SETFL, r.fcntl(Fcntl::F_GETFL) | Fcntl::O_NONBLOCK)
+      yield r, w
+    }
+  end
+
+  def test_length_zero
+    pipe {|r, w|
+      assert_equal('', r.readpartial(0))
+    }
+  end
+
+  def test_closed_pipe
+    pipe {|r, w|
+      w << 'abc'
+      w.close
+      assert_equal('ab', r.readpartial(2))
+      assert_equal('c', r.readpartial(2))
+      assert_raises(EOFError) { r.readpartial(2) }
+      assert_raises(EOFError) { r.readpartial(2) }
+    }
+  end
+
+  if !File::ALT_SEPARATOR # read on pipe cannot timeout on Windows.
+  def test_open_pipe
+    pipe {|r, w|
+      w << 'abc'
+      assert_equal('ab', r.readpartial(2))
+      assert_equal('c', r.readpartial(2))
+      assert_raises(TimeoutError) {
+        timeout(0.1) { r.readpartial(2) }
+      }
+    }
+  end
+
+  def test_with_stdio
+    pipe {|r, w|
+      w << "abc\ndef\n"
+      assert_equal("abc\n", r.gets)
+      w << "ghi\n"
+      assert_equal("de", r.readpartial(2))
+      assert_equal("f\n", r.readpartial(4096))
+      assert_equal("ghi\n", r.readpartial(4096))
+      assert_raises(TimeoutError) {
+        timeout(0.1) { r.readpartial(2) }
+      }
+    }
+  end
+  end
+
+end
+
diff --git a/ruby_1_8_6/test/ruby/test_settracefunc.rb b/ruby_1_8_6/test/ruby/test_settracefunc.rb
new file mode 100644
index 0000000000..39e1b035d8
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_settracefunc.rb
@@ -0,0 +1,138 @@
+require 'test/unit'
+
+class TestSetTraceFunc < Test::Unit::TestCase
+  def foo; end;
+
+  def bar
+    events = []
+    set_trace_func(Proc.new { |event, file, lineno, mid, bidning, klass|
+      events << [event, lineno, mid, klass]
+    })
+    return events
+  end
+
+  def test_event
+    events = []
+    set_trace_func(Proc.new { |event, file, lineno, mid, bidning, klass|
+      events << [event, lineno, mid, klass]
+    })
+    a = 1
+    foo
+    a
+    b = 1 + 2
+    if b == 3
+      case b
+      when 2
+        c = "b == 2"
+      when 3
+        c = "b == 3"
+      end
+    end
+    begin
+      raise "error"
+    rescue
+    end
+    eval("class Foo; end")
+    set_trace_func nil
+
+    assert_equal(["line", 19, :test_event, TestSetTraceFunc],
+                 events.shift)     # a = 1
+    assert_equal(["line", 20, :test_event, TestSetTraceFunc],
+                 events.shift)     # foo
+    assert_equal(["call", 4, :foo, TestSetTraceFunc],
+                 events.shift)     # foo
+    assert_equal(["return", 4, :foo, TestSetTraceFunc],
+                 events.shift)     # foo
+    assert_equal(["line", 21, :test_event, TestSetTraceFunc],
+                 events.shift)     # a
+    assert_equal(["line", 22, :test_event, TestSetTraceFunc],
+                 events.shift)     # b = 1 + 2
+    assert_equal(["c-call", 22, :+, Fixnum],
+                 events.shift)     # 1 + 2
+    assert_equal(["c-return", 22, :+, Fixnum],
+                 events.shift)     # 1 + 2
+    assert_equal(["line", 23, :test_event, TestSetTraceFunc],
+                 events.shift)     # if b == 3
+    assert_equal(["line", 23, :test_event, TestSetTraceFunc],
+                 events.shift)     # if b == 3
+    assert_equal(["c-call", 23, :==, Fixnum],
+                 events.shift)     # b == 3
+    assert_equal(["c-return", 23, :==, Fixnum],
+                 events.shift)     # b == 3
+    assert_equal(["line", 24, :test_event, TestSetTraceFunc],
+                 events.shift)     # case b
+    assert_equal(["line", 25, :test_event, TestSetTraceFunc],
+                 events.shift)     # when 2
+    assert_equal(["c-call", 25, :===, Kernel],
+                 events.shift)     # when 2
+    assert_equal(["c-call", 25, :==, Fixnum],
+                 events.shift)     # when 2
+    assert_equal(["c-return", 25, :==, Fixnum],
+                 events.shift)     # when 2
+    assert_equal(["c-return", 25, :===, Kernel],
+                 events.shift)     # when 2
+    assert_equal(["line", 27, :test_event, TestSetTraceFunc],
+                 events.shift)     # when 3
+    assert_equal(["c-call", 27, :===, Kernel],
+                 events.shift)     # when 3
+    assert_equal(["c-return", 27, :===, Kernel],
+                 events.shift)     # when 3
+    assert_equal(["line", 28, :test_event, TestSetTraceFunc],
+                 events.shift)     # c = "b == 3"
+    assert_equal(["line", 31, :test_event, TestSetTraceFunc],
+                 events.shift)     # begin
+    assert_equal(["line", 32, :test_event, TestSetTraceFunc],
+                 events.shift)     # raise "error"
+    assert_equal(["c-call", 32, :raise, Kernel],
+                 events.shift)     # raise "error"
+    assert_equal(["c-call", 32, :new, Class],
+                 events.shift)     # raise "error"
+    assert_equal(["c-call", 32, :initialize, Exception],
+                 events.shift)     # raise "error"
+    assert_equal(["c-return", 32, :initialize, Exception],
+                 events.shift)     # raise "error"
+    assert_equal(["c-return", 32, :new, Class],
+                 events.shift)     # raise "error"
+    assert_equal(["c-call", 32, :backtrace, Exception],
+                 events.shift)     # raise "error"
+    assert_equal(["c-return", 32, :backtrace, Exception],
+                 events.shift)     # raise "error"
+    assert_equal(["c-call", 32, :set_backtrace, Exception],
+                 events.shift)     # raise "error"
+    assert_equal(["c-return", 32, :set_backtrace, Exception],
+                 events.shift)     # raise "error"
+    assert_equal(["raise", 32, :test_event, TestSetTraceFunc],
+                 events.shift)     # raise "error"
+    assert_equal(["c-return", 32, :raise, Kernel],
+                 events.shift)     # raise "error"
+    assert_equal(["line", 35, :test_event, TestSetTraceFunc],
+                 events.shift)     # eval(<<EOF)
+    assert_equal(["c-call", 35, :eval, Kernel],
+                 events.shift)     # eval(<<EOF)
+    assert_equal(["line", 1, :test_event, TestSetTraceFunc],
+                 events.shift)     # class Foo
+    assert_equal(["c-call", 1, :inherited, Class],
+                 events.shift)     # class Foo
+    assert_equal(["c-return", 1, :inherited, Class],
+                 events.shift)     # class Foo
+    assert_equal(["class", 1, :test_event, TestSetTraceFunc],
+                 events.shift)     # class Foo
+    assert_equal(["end", 1, :test_event, TestSetTraceFunc],
+                 events.shift)     # class Foo
+    assert_equal(["c-return", 35, :eval, Kernel],
+                 events.shift)     # eval(<<EOF)
+    assert_equal(["line", 36, :test_event, TestSetTraceFunc],
+                 events.shift)     # set_trace_func nil
+    assert_equal(["c-call", 36, :set_trace_func, Kernel],
+                 events.shift)     # set_trace_func nil
+    assert_equal([], events)
+
+    events = bar
+    set_trace_func(nil)
+    assert_equal(["line", 11, :bar, TestSetTraceFunc], events.shift)
+    assert_equal(["return", 7, :bar, TestSetTraceFunc], events.shift)
+    assert_equal(["line", 131, :test_event, TestSetTraceFunc], events.shift)
+    assert_equal(["c-call", 131, :set_trace_func, Kernel], events.shift)
+    assert_equal([], events)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_signal.rb b/ruby_1_8_6/test/ruby/test_signal.rb
new file mode 100644
index 0000000000..43e16b8c79
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_signal.rb
@@ -0,0 +1,68 @@
+require 'test/unit'
+require 'timeout'
+
+class TestSignal < Test::Unit::TestCase
+  def have_fork?
+    begin
+      fork{}
+      true
+    rescue NotImplementedError
+      false
+    end
+  end
+
+  def test_signal
+    defined?(Process.kill) or return
+    begin
+      $x = 0
+      oldtrap = trap "SIGINT", proc{|sig| $x = 2}
+      Process.kill "SIGINT", $$
+      sleep 0.1
+      assert_equal(2, $x)
+
+      trap "SIGINT", proc{raise "Interrupt"}
+
+      x = assert_raises(RuntimeError) do
+        Process.kill "SIGINT", $$
+        sleep 0.1
+      end
+      assert(x)
+      assert_match(/Interrupt/, x.message)
+    ensure
+      trap "SIGINT", oldtrap
+    end
+  end
+
+  def test_exit_action
+    return unless have_fork?	# snip this test
+    begin
+      r, w = IO.pipe
+      r0, w0 = IO.pipe
+      pid = fork {
+        trap(:USR1, "EXIT")
+        w0.close
+        w.syswrite("a")
+        Thread.start { Thread.pass }
+        r0.sysread(4096)
+      }
+      r.sysread(1)
+      sleep 0.1
+      assert_nothing_raised("[ruby-dev:26128]") {
+        Process.kill(:USR1, pid)
+        begin
+          Timeout.timeout(10) {
+            Process.waitpid pid
+          }
+        rescue Timeout::Error
+          Process.kill(:TERM, pid)
+          raise
+        end
+      }
+    ensure
+      r.close
+      w.close
+      r0.close
+      w0.close
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_string.rb b/ruby_1_8_6/test/ruby/test_string.rb
new file mode 100644
index 0000000000..f8938cad84
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_string.rb
@@ -0,0 +1,19 @@
+require 'test/unit'
+
+class TestString < Test::Unit::TestCase
+  def check_sum(str, bits=16)
+    sum = 0
+    str.each_byte {|c| sum += c}
+    sum = sum & ((1 << bits) - 1) if bits != 0
+    assert_equal(sum, str.sum(bits))
+  end
+  def test_sum
+    assert_equal(0, "".sum)
+    assert_equal(294, "abc".sum)
+    check_sum("abc")
+    check_sum("\x80")
+    0.upto(70) {|bits|
+      check_sum("xyz", bits)
+    }
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_stringchar.rb b/ruby_1_8_6/test/ruby/test_stringchar.rb
new file mode 100644
index 0000000000..34934e87bd
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_stringchar.rb
@@ -0,0 +1,166 @@
+require 'test/unit'
+
+class TestStringchar < Test::Unit::TestCase
+  def test_string
+    assert_equal("abcd", "abcd")
+    assert_match(/abcd/, "abcd")
+    assert("abcd" === "abcd")
+    # compile time string concatenation
+    assert_equal("abcd", "ab" "cd")
+    assert_equal("22aacd44", "#{22}aa" "cd#{44}")
+    assert_equal("22aacd445566", "#{22}aa" "cd#{44}" "55" "#{66}")
+    assert("abc" !~ /^$/)
+    assert("abc\n" !~ /^$/)
+    assert("abc" !~ /^d*$/)
+    assert_equal(3, ("abc" =~ /d*$/))
+    assert("" =~ /^$/)
+    assert("\n" =~ /^$/)
+    assert("a\n\n" =~ /^$/)
+    assert("abcabc" =~ /.*a/); assert_equal("abca", $&)
+    assert("abcabc" =~ /.*c/); assert_equal("abcabc", $&)
+    assert("abcabc" =~ /.*?a/); assert_equal("a", $&)
+    assert("abcabc" =~ /.*?c/); assert_equal("abc", $&)
+    assert(/(.|\n)*?\n(b|\n)/ =~ "a\nb\n\n"); assert_equal("a\nb", $&)
+
+    assert(/^(ab+)+b/ =~ "ababb"); assert_equal("ababb", $&)
+    assert(/^(?:ab+)+b/ =~ "ababb"); assert_equal("ababb", $&)
+    assert(/^(ab+)+/ =~ "ababb"); assert_equal("ababb", $&)
+    assert(/^(?:ab+)+/ =~ "ababb"); assert_equal("ababb", $&)
+
+    assert(/(\s+\d+){2}/ =~ " 1 2"); assert_equal(" 1 2", $&)
+    assert(/(?:\s+\d+){2}/ =~ " 1 2"); assert_equal(" 1 2", $&)
+
+    $x = <<END;
+ABCD
+ABCD
+END
+    $x.gsub!(/((.|\n)*?)B((.|\n)*?)D/){$1+$3}
+    assert_equal("AC\nAC\n", $x)
+
+    assert("foobar" =~ /foo(?=(bar)|(baz))/)
+    assert("foobaz" =~ /foo(?=(bar)|(baz))/)
+
+    $foo = "abc"
+    assert_equal("abc = abc", "#$foo = abc")
+    assert_equal("abc = abc", "#{$foo} = abc")
+
+    foo = "abc"
+    assert_equal("abc = abc", "#{foo} = abc")
+
+    assert_equal('-----', '-' * 5)
+    assert_equal('-', '-' * 1)
+    assert_equal('', '-' * 0)
+
+    foo = '-'
+    assert_equal('-----', foo * 5)
+    assert_equal('-', foo * 1)
+    assert_equal('', foo * 0)
+
+    $x = "a.gif"
+    assert_equal("gif", $x.sub(/.*\.([^\.]+)$/, '\1'))
+    assert_equal("b.gif", $x.sub(/.*\.([^\.]+)$/, 'b.\1'))
+    assert_equal("", $x.sub(/.*\.([^\.]+)$/, '\2'))
+    assert_equal("ab", $x.sub(/.*\.([^\.]+)$/, 'a\2b'))
+    assert_equal("<a.gif>", $x.sub(/.*\.([^\.]+)$/, '<\&>'))
+  end
+
+  def test_char
+    # character constants(assumes ASCII)
+    assert_equal(?a, "a"[0])
+    assert_equal(?a, ?a)
+    assert_equal(1, ?\C-a)
+    assert_equal(225, ?\M-a)
+    assert_equal(129, ?\M-\C-a)
+    assert_equal(?A, "a".upcase![0])
+    assert_equal(?a, "A".downcase![0])
+    assert_equal("ABC", "abc".tr!("a-z", "A-Z"))
+    assert_equal("ABC", "aabbcccc".tr_s!("a-z", "A-Z"))
+    assert_equal("abc", "abcc".squeeze!("a-z"))
+    assert_equal("ad", "abcd".delete!("bc"))
+
+    $x = "abcdef"
+    $y = [ ?a, ?b, ?c, ?d, ?e, ?f ]
+    $bad = false
+    $x.each_byte {|i|
+      if i != $y.shift
+        $bad = true
+        break
+      end
+    }
+    assert(!$bad)
+
+    s = "a string"
+    s[0..s.size]="another string"
+    assert_equal("another string", s)
+
+    s = <<EOS
+#{
+[1,2,3].join(",")
+}
+EOS
+    assert_equal("1,2,3\n", s)
+    assert_equal(926381, "Just".to_i(36))
+    assert_equal(-23200231779, "-another".to_i(36))
+    assert_equal("ruby", 1299022.to_s(36))
+    assert_equal("-hacker", -1045307475.to_s(36))
+    assert_equal(265419172580680477752431643787347, "Just_another_Ruby_hacker".to_i(36))
+    assert_equal("-justanotherrubyhacker", -265419172580680477752431643787347.to_s(36))
+
+    a = []
+    (0..255).each {|n|
+      ch = [n].pack("C")
+      a.push ch if /a#{Regexp.quote ch}b/x =~ "ab"
+    }
+    assert_equal(0, a.size)
+  end
+
+  def test_bang
+    s = "aBc"
+    s.upcase
+    assert_equal("aBc", s)
+    s.upcase!
+    assert_equal("ABC", s)
+
+    s = "aBc"
+    s.downcase
+    assert_equal("aBc", s)
+    s.downcase!
+    assert_equal("abc", s)
+
+    s = "aBc"
+    s.swapcase
+    assert_equal("aBc", s)
+    s.swapcase!
+    assert_equal("AbC", s)
+
+    s = "aBc"
+    s.capitalize
+    assert_equal("aBc", s)
+    s.capitalize!
+    assert_equal("Abc", s)
+
+    s = "aBc"
+    s.tr("a-z", "A-Z")
+    assert_equal("aBc", s)
+    s.tr!("a-z", "A-Z")
+    assert_equal("ABC", s)
+
+    s = "aaBBcc"
+    s.tr_s("a-z", "A-Z")
+    assert_equal("aaBBcc", s)
+    s.tr_s!("a-z", "A-Z")
+    assert_equal("ABBC", s)
+
+    s = "aaBBcc"
+    s.squeeze("a-z")
+    assert_equal("aaBBcc", s)
+    s.squeeze!("a-z")
+    assert_equal("aBBc", s)
+
+    s = "aaBBcc"
+    s.delete("a-z")
+    assert_equal("aaBBcc", s)
+    s.delete!("a-z")
+    assert_equal("BB", s)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_struct.rb b/ruby_1_8_6/test/ruby/test_struct.rb
new file mode 100644
index 0000000000..fa1bb1549a
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_struct.rb
@@ -0,0 +1,24 @@
+require 'test/unit'
+
+class TestStruct < Test::Unit::TestCase
+  def test_struct
+    struct_test = Struct.new("Test", :foo, :bar)
+    assert_equal(Struct::Test, struct_test)
+
+    test = struct_test.new(1, 2)
+    assert_equal(1, test.foo)
+    assert_equal(2, test.bar)
+    assert_equal(1, test[0])
+    assert_equal(2, test[1])
+
+    a, b = test.to_a
+    assert_equal(1, a)
+    assert_equal(2, b)
+
+    test[0] = 22
+    assert_equal(22, test.foo)
+
+    test.bar = 47
+    assert_equal(47, test.bar)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_super.rb b/ruby_1_8_6/test/ruby/test_super.rb
new file mode 100644
index 0000000000..900fe997e6
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_super.rb
@@ -0,0 +1,134 @@
+require 'test/unit'
+
+class TestSuper < Test::Unit::TestCase
+  class Base
+    def single(a) a end
+    def double(a, b) [a,b] end
+    def array(*a) a end
+    def optional(a = 0) a end
+  end
+  class Single1 < Base
+    def single(*) super end
+  end
+  class Single2 < Base
+    def single(a,*) super end
+  end
+  class Double1 < Base
+    def double(*) super end
+  end
+  class Double2 < Base
+    def double(a,*) super end
+  end
+  class Double3 < Base
+    def double(a,b,*) super end
+  end
+  class Array1 < Base
+    def array(*) super end
+  end
+  class Array2 < Base
+    def array(a,*) super end
+  end
+  class Array3 < Base
+    def array(a,b,*) super end
+  end
+  class Array4 < Base
+    def array(a,b,c,*) super end
+  end
+  class Optional1 < Base
+    def optional(a = 1) super end
+  end
+  class Optional2 < Base
+    def optional(a, b = 1) super end
+  end
+  class Optional3 < Base
+    def single(a = 1) super end
+  end
+  class Optional4 < Base
+    def array(a = 1, *) super end
+  end
+  class Optional5 < Base
+    def array(a = 1, b = 2, *) super end
+  end
+
+  def test_single1
+    assert_equal(1, Single1.new.single(1))
+  end
+  def test_single2
+    assert_equal(1, Single2.new.single(1))
+  end
+  def test_double1
+    assert_equal([1, 2], Double1.new.double(1, 2))
+  end
+  def test_double2
+    assert_equal([1, 2], Double2.new.double(1, 2))
+  end
+  def test_double3
+    assert_equal([1, 2], Double3.new.double(1, 2))
+  end
+  def test_array1
+    assert_equal([], Array1.new.array())
+    assert_equal([1], Array1.new.array(1))
+  end
+  def test_array2
+    assert_equal([1], Array2.new.array(1))
+    assert_equal([1,2], Array2.new.array(1, 2))
+  end
+  def test_array3
+    assert_equal([1,2], Array3.new.array(1, 2))
+    assert_equal([1,2,3], Array3.new.array(1, 2, 3))
+  end
+  def test_array4
+    assert_equal([1,2,3], Array4.new.array(1, 2, 3))
+    assert_equal([1,2,3,4], Array4.new.array(1, 2, 3, 4))
+  end
+  def test_optional1
+    assert_equal(9, Optional1.new.optional(9))
+    assert_equal(1, Optional1.new.optional)
+  end
+  def test_optional2
+    assert_raise(ArgumentError) do
+      # call Base#optional with 2 arguments; the 2nd arg is supplied
+      assert_equal(9, Optional2.new.optional(9))
+    end
+    assert_raise(ArgumentError) do
+      # call Base#optional with 2 arguments
+      assert_equal(9, Optional2.new.optional(9, 2))
+    end
+  end
+  def test_optional3
+    assert_equal(9, Optional3.new.single(9))
+    # call Base#single with 1 argument; the arg is supplied
+    assert_equal(1, Optional3.new.single)
+  end
+  def test_optional4
+    assert_equal([1], Optional4.new.array)
+    assert_equal([9], Optional4.new.array(9))
+    assert_equal([9, 8], Optional4.new.array(9, 8))
+  end
+  def test_optional5
+    assert_equal([1, 2], Optional5.new.array)
+    assert_equal([9, 2], Optional5.new.array(9))
+    assert_equal([9, 8], Optional5.new.array(9, 8))
+    assert_equal([9, 8, 7], Optional5.new.array(9, 8, 7))
+  end
+
+  class A
+    def tt(aa)
+      "A#tt"
+    end
+
+    def uu(a)
+      class << self
+        define_method(:tt) do |sym|
+          super
+        end
+      end
+    end
+  end
+
+  def test_define_method # [ruby-core:03856]
+    a = A.new
+    a.uu(12)
+    assert_equal("A#tt", a.tt(12))
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_symbol.rb b/ruby_1_8_6/test/ruby/test_symbol.rb
new file mode 100644
index 0000000000..2ccfe64c92
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_symbol.rb
@@ -0,0 +1,77 @@
+require 'test/unit'
+
+class TestSymbol < Test::Unit::TestCase
+  # [ruby-core:3573]
+
+  def assert_eval_inspected(sym)
+    n = sym.inspect
+    assert_nothing_raised(SyntaxError) {assert_equal(sym, eval(n))}
+  end
+
+  def test_inspect_invalid
+    # 2) Symbol#inspect sometimes returns invalid symbol representations:
+    assert_eval_inspected(:"!")
+    assert_eval_inspected(:"=")
+    assert_eval_inspected(:"0")
+    assert_eval_inspected(:"$1")
+    assert_eval_inspected(:"@1")
+    assert_eval_inspected(:"@@1")
+    assert_eval_inspected(:"@")
+    assert_eval_inspected(:"@@")
+  end
+
+  def assert_inspect_evaled(n)
+    assert_nothing_raised(SyntaxError) {assert_equal(n, eval(n).inspect)}
+  end
+
+  def test_inspect_suboptimal
+    # 3) Symbol#inspect sometimes returns suboptimal symbol representations:
+    assert_inspect_evaled(':foo')
+    assert_inspect_evaled(':foo!')
+    assert_inspect_evaled(':bar?')
+    assert_inspect_evaled(':<<')
+    assert_inspect_evaled(':>>')
+    assert_inspect_evaled(':<=')
+    assert_inspect_evaled(':>=')
+    assert_inspect_evaled(':=~')
+    assert_inspect_evaled(':==')
+    assert_inspect_evaled(':===')
+    assert_raise(SyntaxError) {eval ':='}
+    assert_inspect_evaled(':*')
+    assert_inspect_evaled(':**')
+    assert_raise(SyntaxError) {eval ':***'}
+    assert_inspect_evaled(':+')
+    assert_inspect_evaled(':-')
+    assert_inspect_evaled(':+@')
+    assert_inspect_evaled(':-@')
+    assert_inspect_evaled(':|')
+    assert_inspect_evaled(':^')
+    assert_inspect_evaled(':&')
+    assert_inspect_evaled(':/')
+    assert_inspect_evaled(':%')
+    assert_inspect_evaled(':~')
+    assert_inspect_evaled(':`')
+    assert_inspect_evaled(':[]')
+    assert_inspect_evaled(':[]=')
+    assert_raise(SyntaxError) {eval ':||'}
+    assert_raise(SyntaxError) {eval ':&&'}
+    assert_raise(SyntaxError) {eval ':['}
+  end
+
+  def test_inspect_dollar
+    # 4) :$- always treats next character literally:
+    sym = "$-".intern
+    assert_nothing_raised(SyntaxError) {assert_equal(sym, eval(':$-'))}
+    assert_nothing_raised(SyntaxError) {assert_equal(sym, eval(":$-\n"))}
+    assert_nothing_raised(SyntaxError) {assert_equal(sym, eval(":$- "))}
+    assert_nothing_raised(SyntaxError) {assert_equal(sym, eval(":$-#"))}
+    assert_raise(SyntaxError) {eval ':$-('}
+  end
+
+  def test_inspect_number
+    # 5) Inconsistency between :$0 and :$1? The first one is valid, but the 
+    # latter isn't.
+    assert_inspect_evaled(':$0')
+    assert_inspect_evaled(':$1')
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_system.rb b/ruby_1_8_6/test/ruby/test_system.rb
new file mode 100644
index 0000000000..f3a71598f7
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_system.rb
@@ -0,0 +1,64 @@
+require 'test/unit'
+$:.replace([File.dirname(File.expand_path(__FILE__))] | $:)
+require 'envutil'
+
+class TestSystem < Test::Unit::TestCase
+  def valid_syntax?(code, fname)
+    eval("BEGIN {return true}\n#{code}", nil, fname, 0)
+  end
+
+  def test_system
+    ruby = EnvUtil.rubybin
+    assert_equal("foobar\n", `echo foobar`)
+    assert_equal('foobar', `#{ruby} -e 'print "foobar"'`)
+
+    tmp = open("script_tmp", "w")
+    tmp.print "print $zzz\n";
+    tmp.close
+
+    assert_equal('true', `#{ruby} -s script_tmp -zzz`)
+    assert_equal('555', `#{ruby} -s script_tmp -zzz=555`)
+
+    tmp = open("script_tmp", "w")
+    tmp.print "#! /usr/local/bin/ruby -s\n";
+    tmp.print "print $zzz\n";
+    tmp.close
+
+    assert_equal('678', `#{ruby} script_tmp -zzz=678`)
+
+    tmp = open("script_tmp", "w")
+    tmp.print "this is a leading junk\n";
+    tmp.print "#! /usr/local/bin/ruby -s\n";
+    tmp.print "print $zzz\n";
+    tmp.print "__END__\n";
+    tmp.print "this is a trailing junk\n";
+    tmp.close
+
+    assert_equal('nil', `#{ruby} -x script_tmp`)
+    assert_equal('555', `#{ruby} -x script_tmp -zzz=555`)
+
+    tmp = open("script_tmp", "w")
+    for i in 1..5
+      tmp.print i, "\n"
+    end
+    tmp.close
+
+    `#{ruby} -i.bak -pe 'sub(/^[0-9]+$/){$&.to_i * 5}' script_tmp`
+    tmp = open("script_tmp", "r")
+    while tmp.gets
+      assert_equal(0, $_.to_i % 5)
+    end
+    tmp.close
+
+    File.unlink "script_tmp" or `/bin/rm -f "script_tmp"`
+    File.unlink "script_tmp.bak" or `/bin/rm -f "script_tmp.bak"`
+  end
+
+  def test_syntax
+    assert_nothing_raised(Exception) do
+      for script in Dir[File.expand_path("../../../{lib,sample,ext}/**/*.rb", __FILE__)]
+        valid_syntax? IO::read(script), script
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_time.rb b/ruby_1_8_6/test/ruby/test_time.rb
new file mode 100644
index 0000000000..ad9b64ae0e
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_time.rb
@@ -0,0 +1,74 @@
+require 'test/unit'
+
+class TestTime < Test::Unit::TestCase
+  def test_time_add()
+    assert_equal(Time.utc(2000, 3, 21, 3, 30) + 3 * 3600,
+                 Time.utc(2000, 3, 21, 6, 30))
+    assert_equal(Time.utc(2000, 3, 21, 3, 30) + (-3 * 3600),
+                 Time.utc(2000, 3, 21, 0, 30))
+    assert_equal(0, (Time.at(1.1) + 0.9).usec)
+  end
+
+  def test_time_subt()
+    assert_equal(Time.utc(2000, 3, 21, 3, 30) - 3 * 3600,
+                 Time.utc(2000, 3, 21, 0, 30))
+    assert_equal(Time.utc(2000, 3, 21, 3, 30) - (-3 * 3600),
+                 Time.utc(2000, 3, 21, 6, 30))
+    assert_equal(900000, (Time.at(1.1) - 0.2).usec)
+  end
+
+  def test_time_time()
+    assert_equal(Time.utc(2000, 3, 21, 3, 30)  \
+                -Time.utc(2000, 3, 21, 0, 30), 3*3600)
+    assert_equal(Time.utc(2000, 3, 21, 0, 30)  \
+                -Time.utc(2000, 3, 21, 3, 30), -3*3600)
+  end
+
+  def negative_time_t?
+    begin
+      Time.at(-1)
+      true
+    rescue ArgumentError
+      false
+    end
+  end
+
+  def test_timegm
+    if negative_time_t?
+      assert_equal(-0x80000000, Time.utc(1901, 12, 13, 20, 45, 52).tv_sec)
+      assert_equal(-2, Time.utc(1969, 12, 31, 23, 59, 58).tv_sec)
+      assert_equal(-1, Time.utc(1969, 12, 31, 23, 59, 59).tv_sec)
+    end
+
+    assert_equal(0, Time.utc(1970, 1, 1, 0, 0, 0).tv_sec) # the Epoch
+    assert_equal(1, Time.utc(1970, 1, 1, 0, 0, 1).tv_sec)
+    assert_equal(31535999, Time.utc(1970, 12, 31, 23, 59, 59).tv_sec)
+    assert_equal(31536000, Time.utc(1971, 1, 1, 0, 0, 0).tv_sec)
+    assert_equal(78796799, Time.utc(1972, 6, 30, 23, 59, 59).tv_sec)
+
+    # 1972-06-30T23:59:60Z is the first leap second.
+    if Time.utc(1972, 7, 1, 0, 0, 0) - Time.utc(1972, 6, 30, 23, 59, 59) == 1
+      # no leap second.
+      assert_equal(78796800, Time.utc(1972, 7, 1, 0, 0, 0).tv_sec)
+      assert_equal(78796801, Time.utc(1972, 7, 1, 0, 0, 1).tv_sec)
+      assert_equal(946684800, Time.utc(2000, 1, 1, 0, 0, 0).tv_sec)
+      assert_equal(0x7fffffff, Time.utc(2038, 1, 19, 3, 14, 7).tv_sec)
+    else
+      # leap seconds supported.
+      assert_equal(2, Time.utc(1972, 7, 1, 0, 0, 0) - Time.utc(1972, 6, 30, 23, 59, 59))
+      assert_equal(78796800, Time.utc(1972, 6, 30, 23, 59, 60).tv_sec)
+      assert_equal(78796801, Time.utc(1972, 7, 1, 0, 0, 0).tv_sec)
+      assert_equal(78796802, Time.utc(1972, 7, 1, 0, 0, 1).tv_sec)
+      assert_equal(946684822, Time.utc(2000, 1, 1, 0, 0, 0).tv_sec)
+    end
+  end
+
+  def test_huge_difference # [ruby-dev:22619]
+    if negative_time_t?
+      assert_equal(Time.at(-0x80000000), Time.at(0x7fffffff) - 0xffffffff)
+      assert_equal(Time.at(-0x80000000), Time.at(0x7fffffff) + (-0xffffffff))
+      assert_equal(Time.at(0x7fffffff), Time.at(-0x80000000) + 0xffffffff)
+      assert_equal(Time.at(0x7fffffff), Time.at(-0x80000000) - (-0xffffffff))
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_trace.rb b/ruby_1_8_6/test/ruby/test_trace.rb
new file mode 100644
index 0000000000..6adfe0bf64
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_trace.rb
@@ -0,0 +1,21 @@
+require 'test/unit'
+
+class TestTrace < Test::Unit::TestCase
+  def test_trace
+    $x = 1234
+    $y = 0
+    trace_var :$x, proc{$y = $x}
+    $x = 40414
+    assert_equal($x, $y)
+    
+    untrace_var :$x
+    $x = 19660208
+    assert_not_equal($x, $y)
+    
+    trace_var :$x, proc{$x *= 2}
+    $x = 5
+    assert_equal(10, $x)
+    
+    untrace_var :$x
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_variable.rb b/ruby_1_8_6/test/ruby/test_variable.rb
new file mode 100644
index 0000000000..8726160826
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_variable.rb
@@ -0,0 +1,53 @@
+require 'test/unit'
+
+class TestVariable < Test::Unit::TestCase
+  class Gods
+    @@rule = "Uranus"
+    def ruler0
+      @@rule
+    end
+
+    def self.ruler1		# <= per method definition style
+      @@rule
+    end
+    class << self			# <= multiple method definition style
+      def ruler2
+	@@rule
+      end
+    end
+  end
+
+  module Olympians
+    @@rule ="Zeus"
+    def ruler3
+      @@rule
+    end
+  end
+
+  class Titans < Gods
+    @@rule = "Cronus"
+    include Olympians           	# OK to cause warning (intentional)
+  end
+
+  def test_variable
+    assert_instance_of(Fixnum, $$)
+    
+    # read-only variable
+    assert_raises(NameError) do
+      $$ = 5
+    end
+
+    foobar = "foobar"
+    $_ = foobar
+    assert_equal(foobar, $_)
+
+    assert_equal("Cronus", Gods.new.ruler0)
+    assert_equal("Cronus", Gods.ruler1)
+    assert_equal("Cronus", Gods.ruler2)
+    assert_equal("Cronus", Titans.ruler1)
+    assert_equal("Cronus", Titans.ruler2)
+    atlas = Titans.new
+    assert_equal("Cronus", atlas.ruler0)
+    assert_equal("Zeus", atlas.ruler3)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/test_whileuntil.rb b/ruby_1_8_6/test/ruby/test_whileuntil.rb
new file mode 100644
index 0000000000..6faed31160
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/test_whileuntil.rb
@@ -0,0 +1,77 @@
+require 'test/unit'
+
+class TestWhileuntil < Test::Unit::TestCase
+  def test_while
+    tmp = open("while_tmp", "w")
+    tmp.print "tvi925\n";
+    tmp.print "tvi920\n";
+    tmp.print "vt100\n";
+    tmp.print "Amiga\n";
+    tmp.print "paper\n";
+    tmp.close
+
+    tmp = open("while_tmp", "r")
+    assert_instance_of(File, tmp)
+    
+    while line = tmp.gets()
+      break if /vt100/ =~ line
+    end
+
+    assert(!tmp.eof?)
+    assert_match(/vt100/, line)
+    tmp.close
+
+    tmp = open("while_tmp", "r")
+    while line = tmp.gets()
+      next if /vt100/ =~ line
+      assert_no_match(/vt100/, line)
+    end
+    assert(tmp.eof?)
+    assert_no_match(/vt100/, line)
+    tmp.close
+
+    tmp = open("while_tmp", "r")
+    while tmp.gets()
+      line = $_
+      gsub(/vt100/, 'VT100')
+      if $_ != line
+        $_.gsub!('VT100', 'Vt100')
+        redo
+      end
+      assert_no_match(/vt100/, $_)
+      assert_no_match(/VT100/, $_)
+    end
+    assert(tmp.eof?)
+    tmp.close
+
+    sum=0
+    for i in 1..10
+      sum += i
+      i -= 1
+      if i > 0
+        redo
+      end
+    end
+    assert_equal(220, sum)
+
+    tmp = open("while_tmp", "r")
+    while line = tmp.gets()
+      break if 3
+      assert_no_match(/vt100/, line)
+      assert_no_match(/Amiga/, line)
+      assert_no_match(/paper/, line)
+    end
+    tmp.close
+
+    File.unlink "while_tmp" or `/bin/rm -f "while_tmp"`
+    assert(!File.exist?("while_tmp"))
+  end
+
+  def test_until
+    i = 0
+    until i>4
+      i+=1
+    end
+    assert(i>4)
+  end
+end
diff --git a/ruby_1_8_6/test/ruby/ut_eof.rb b/ruby_1_8_6/test/ruby/ut_eof.rb
new file mode 100644
index 0000000000..e6f6eddd6f
--- /dev/null
+++ b/ruby_1_8_6/test/ruby/ut_eof.rb
@@ -0,0 +1,128 @@
+require 'test/unit'
+
+module TestEOF
+  def test_eof_0
+    open_file("") {|f|
+      assert_equal("", f.read(0))
+      assert_equal("", f.read(0))
+      assert_equal("", f.read)
+      assert_nil(f.read(0))
+      assert_nil(f.read(0))
+    }
+    open_file("") {|f|
+      assert_nil(f.read(1))
+      assert_equal("", f.read)
+      assert_nil(f.read(1))
+    }
+    open_file("") {|f|
+      s = "x"
+      assert_equal("", f.read(nil, s))
+      assert_equal("", s)
+    }
+    open_file("") {|f|
+      s = "x"
+      assert_nil(f.read(10, s))
+      assert_equal("", s)
+    }
+  end
+
+  def test_eof_0_rw
+    return unless respond_to? :open_file_rw
+    open_file_rw("") {|f|
+      assert_equal("", f.read)
+      assert_equal("", f.read)
+      assert_equal(0, f.syswrite(""))
+      assert_equal("", f.read)
+    }
+  end
+
+  def test_eof_1
+    open_file("a") {|f|
+      assert_equal("", f.read(0))
+      assert_equal("a", f.read(1))
+      assert_equal("" , f.read(0))
+      assert_equal("" , f.read(0))
+      assert_equal("", f.read)
+      assert_nil(f.read(0))
+      assert_nil(f.read(0))
+    }
+    open_file("a") {|f|
+      assert_equal("a", f.read(1))
+      assert_nil(f.read(1))
+    }
+    open_file("a") {|f|
+      assert_equal("a", f.read(2))
+      assert_nil(f.read(1))
+      assert_equal("", f.read)
+      assert_nil(f.read(1))
+    }
+    open_file("a") {|f|
+      assert_equal("a", f.read)
+      assert_nil(f.read(1))
+      assert_equal("", f.read)
+      assert_nil(f.read(1))
+    }
+    open_file("a") {|f|
+      assert_equal("a", f.read(2))
+      assert_equal("", f.read)
+      assert_equal("", f.read)
+    }
+    open_file("a") {|f|
+      assert_equal("a", f.read)
+      assert_nil(f.read(0))
+    }
+    open_file("a") {|f|
+      s = "x"
+      assert_equal("a", f.read(nil, s))
+      assert_equal("a", s)
+    }
+    open_file("a") {|f|
+      s = "x"
+      assert_equal("a", f.read(10, s))
+      assert_equal("a", s)
+    }
+  end
+
+  def test_eof_2
+    open_file("") {|f|
+      assert_equal("", f.read)
+      assert(f.eof?)
+    }
+  end
+
+  def test_eof_3
+    open_file("") {|f|
+      assert(f.eof?)
+    }
+  end
+
+  module Seek
+    def open_file_seek(content, pos)
+      open_file(content) do |f|
+        f.seek(pos)
+        yield f
+      end
+    end
+
+    def test_eof_0_seek
+      open_file_seek("", 10) {|f|
+        assert_equal(10, f.pos)
+        assert_equal("", f.read(0))
+        assert_equal("", f.read)
+        assert_nil(f.read(0))
+        assert_equal("", f.read)
+      }
+    end
+
+    def test_eof_1_seek
+      open_file_seek("a", 10) {|f|
+        assert_equal("", f.read)
+        assert_equal("", f.read)
+      }
+      open_file_seek("a", 1) {|f|
+        assert_equal("", f.read)
+        assert_equal("", f.read)
+      }
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/runner.rb b/ruby_1_8_6/test/runner.rb
new file mode 100644
index 0000000000..d274bc8929
--- /dev/null
+++ b/ruby_1_8_6/test/runner.rb
@@ -0,0 +1,7 @@
+require 'test/unit'
+
+rcsid = %w$Id$
+Version = rcsid[2].scan(/\d+/).collect!(&method(:Integer)).freeze
+Release = rcsid[3].freeze
+
+exit Test::Unit::AutoRunner.run(true, File.dirname($0))
diff --git a/ruby_1_8_6/test/sdbm/test_sdbm.rb b/ruby_1_8_6/test/sdbm/test_sdbm.rb
new file mode 100644
index 0000000000..8789d719dd
--- /dev/null
+++ b/ruby_1_8_6/test/sdbm/test_sdbm.rb
@@ -0,0 +1,534 @@
+require 'test/unit'
+
+begin
+  require 'sdbm'
+rescue LoadError
+end
+
+class TestSDBM < Test::Unit::TestCase
+  def setup
+    @path = "tmptest_sdbm_"
+    assert_instance_of(SDBM, @sdbm = SDBM.new(@path))
+  end
+  def teardown
+    assert_nil(@sdbm.close)
+    ObjectSpace.each_object(SDBM) do |obj|
+      obj.close unless obj.closed?
+    end
+    File.delete *Dir.glob("tmptest_sdbm*").to_a
+    p Dir.glob("tmptest_sdbm*") if $DEBUG
+  end
+
+  def check_size(expect, sdbm=@sdbm)
+    assert_equal(expect, sdbm.size)
+    n = 0
+    sdbm.each { n+=1 }
+    assert_equal(expect, n)
+    if expect == 0
+      assert_equal(true, sdbm.empty?)
+    else
+      assert_equal(false, sdbm.empty?)
+    end
+  end
+
+  def have_fork?
+    begin
+      fork{}
+      true
+    rescue NotImplementedError
+      false
+    end
+  end
+
+  def test_version
+    assert(! SDBM.const_defined?(:VERSION))
+  end
+
+  def test_s_new_has_no_block
+    # SDBM.new ignore the block
+    foo = true
+    assert_instance_of(SDBM, sdbm = SDBM.new("tmptest_sdbm") { foo = false })
+    assert_equal(foo, true)
+    assert_nil(sdbm.close)
+  end
+  def test_s_open_no_create
+    assert_nil(sdbm = SDBM.open("tmptest_sdbm", nil))
+  ensure
+    sdbm.close if sdbm
+  end
+  def test_s_open_with_block
+    assert_equal(SDBM.open("tmptest_sdbm") { :foo }, :foo)
+  end
+=begin
+  # Is it guaranteed on many OS?
+  def test_s_open_lock_one_process
+    # locking on one process
+    assert_instance_of(SDBM, sdbm  = SDBM.open("tmptest_sdbm", 0644))
+    assert_raise(Errno::EWOULDBLOCK) {
+      begin
+	SDBM.open("tmptest_sdbm", 0644)
+      rescue Errno::EAGAIN
+	raise Errno::EWOULDBLOCK
+      end
+    }
+  end
+=end
+
+  def test_s_open_nolock
+    # sdbm 1.8.0 specific
+    if not defined? SDBM::NOLOCK
+      return
+    end
+    return unless have_fork?	# snip this test
+
+    fork() {
+      assert_instance_of(SDBM, sdbm  = SDBM.open("tmptest_sdbm", 0644,
+						SDBM::NOLOCK))
+      sleep 2
+    }
+    sleep 1
+    begin
+      sdbm2 = nil
+      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+	assert_instance_of(SDBM, sdbm2 = SDBM.open("tmptest_sdbm", 0644))
+      }
+    ensure
+      Process.wait
+      sdbm2.close if sdbm2
+    end
+
+    p Dir.glob("tmptest_sdbm*") if $DEBUG
+
+    fork() {
+      assert_instance_of(SDBM, sdbm  = SDBM.open("tmptest_sdbm", 0644))
+      sleep 2
+    }
+    begin
+      sleep 1
+      sdbm2 = nil
+      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+	# this test is failed on Cygwin98 (???)
+	assert_instance_of(SDBM, sdbm2 = SDBM.open("tmptest_sdbm", 0644,
+						   SDBM::NOLOCK))
+      }
+    ensure
+      Process.wait
+      sdbm2.close if sdbm2
+    end
+  end
+
+  def test_s_open_error
+    return if /(ms|bcc)win|mingw|djgpp/ =~ RUBY_PLATFORM
+    assert_instance_of(SDBM, sdbm = SDBM.open("tmptest_sdbm", 0))
+    assert_raise(Errno::EACCES) {
+      SDBM.open("tmptest_sdbm", 0)
+    }
+    sdbm.close
+  end
+
+  def test_close
+    assert_instance_of(SDBM, sdbm = SDBM.open("tmptest_sdbm"))
+    assert_nil(sdbm.close)
+
+    # closed SDBM file
+    assert_raise(SDBMError) { sdbm.close }
+  end
+
+  def test_aref
+    assert_equal('bar', @sdbm['foo'] = 'bar')
+    assert_equal('bar', @sdbm['foo'])
+
+    assert_nil(@sdbm['bar'])
+  end
+
+  def test_fetch
+    assert_equal('bar', @sdbm['foo']='bar')
+    assert_equal('bar', @sdbm.fetch('foo'))
+
+    # key not found
+    assert_raise(IndexError) {
+      @sdbm.fetch('bar')
+    }
+
+    # test for `ifnone' arg
+    assert_equal('baz', @sdbm.fetch('bar', 'baz'))
+
+    # test for `ifnone' block
+    assert_equal('foobar', @sdbm.fetch('bar') {|key| 'foo' + key })
+  end
+
+  def test_aset
+    num = 0
+    2.times {|i|
+      assert_equal('foo', @sdbm['foo'] = 'foo')
+      assert_equal('foo', @sdbm['foo'])
+      assert_equal('bar', @sdbm['foo'] = 'bar')
+      assert_equal('bar', @sdbm['foo'])
+
+      num += 1 if i == 0
+      assert_equal(num, @sdbm.size)
+
+      # assign nil
+      assert_equal('', @sdbm['bar'] = '')
+      assert_equal('', @sdbm['bar'])
+
+      num += 1 if i == 0
+      assert_equal(num, @sdbm.size)
+
+      # empty string
+      assert_equal('', @sdbm[''] = '')
+      assert_equal('', @sdbm[''])
+
+      num += 1 if i == 0
+      assert_equal(num, @sdbm.size)
+
+      # Fixnum
+      assert_equal('200', @sdbm['100'] = '200')
+      assert_equal('200', @sdbm['100'])
+
+      num += 1 if i == 0
+      assert_equal(num, @sdbm.size)
+
+      # Big key and value
+      assert_equal('y' * 100, @sdbm['x' * 100] = 'y' * 100)
+      assert_equal('y' * 100, @sdbm['x' * 100])
+
+      num += 1 if i == 0
+      assert_equal(num, @sdbm.size)
+    }
+  end
+
+  def test_index
+    assert_equal('bar', @sdbm['foo'] = 'bar')
+    assert_equal('foo', @sdbm.index('bar'))
+    assert_nil(@sdbm['bar'])
+  end
+
+  def test_indexes
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+    assert_equal(values.reverse, @sdbm.indexes(*keys.reverse))
+  end
+
+  def test_values_at
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+    assert_equal(values.reverse, @sdbm.values_at(*keys.reverse))
+  end
+
+  def test_select_with_block
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+    ret = @sdbm.select {|k,v|
+      assert_equal(k.upcase, v)
+      k != "bar"
+    }
+    assert_equal([['baz', 'BAZ'], ['foo', 'FOO']],
+		  ret.sort)
+  end
+
+  def test_length
+    num = 10
+    assert_equal(0, @sdbm.size)
+    num.times {|i|
+      i = i.to_s
+      @sdbm[i] = i
+    }
+    assert_equal(num, @sdbm.size)
+
+    @sdbm.shift
+
+    assert_equal(num - 1, @sdbm.size)
+  end
+
+  def test_empty?
+    assert_equal(true, @sdbm.empty?)
+    @sdbm['foo'] = 'FOO'
+    assert_equal(false, @sdbm.empty?)
+  end
+
+  def test_each_pair
+    n = 0
+    @sdbm.each_pair { n += 1 }
+    assert_equal(0, n)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    n = 0
+    ret = @sdbm.each_pair {|key, val|
+      assert_not_nil(i = keys.index(key))
+      assert_equal(val, values[i])
+
+      n += 1
+    }
+    assert_equal(keys.size, n)
+    assert_equal(@sdbm, ret)
+  end
+
+  def test_each_value
+    n = 0
+    @sdbm.each_value { n += 1 }
+    assert_equal(0, n)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    n = 0
+    ret = @sdbm.each_value {|val|
+      assert_not_nil(key = @sdbm.index(val))
+      assert_not_nil(i = keys.index(key))
+      assert_equal(val, values[i])
+
+      n += 1
+    }
+    assert_equal(keys.size, n)
+    assert_equal(@sdbm, ret)
+  end
+
+  def test_each_key
+    n = 0
+    @sdbm.each_key { n += 1 }
+    assert_equal(0, n)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    n = 0
+    ret = @sdbm.each_key {|key|
+      assert_not_nil(i = keys.index(key))
+      assert_equal(@sdbm[key], values[i])
+
+      n += 1
+    }
+    assert_equal(keys.size, n)
+    assert_equal(@sdbm, ret)
+  end
+
+  def test_keys
+    assert_equal([], @sdbm.keys)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    assert_equal(keys.sort, @sdbm.keys.sort)
+    assert_equal(values.sort, @sdbm.values.sort)
+  end
+
+  def test_values
+    test_keys
+  end
+
+  def test_shift
+    assert_nil(@sdbm.shift)
+    assert_equal(0, @sdbm.size)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    ret_keys = []
+    ret_values = []
+    while ret = @sdbm.shift
+      ret_keys.push ret[0]
+      ret_values.push ret[1]
+
+      assert_equal(keys.size - ret_keys.size, @sdbm.size)
+    end
+
+    assert_equal(keys.sort, ret_keys.sort)
+    assert_equal(values.sort, ret_values.sort)
+  end
+
+  def test_delete
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    key = keys[1]
+
+    assert_nil(@sdbm.delete(key))
+    assert_equal(0, @sdbm.size)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    assert_equal('BAR', @sdbm.delete(key))
+    assert_nil(@sdbm[key])
+    assert_equal(2, @sdbm.size)
+
+    assert_nil(@sdbm.delete(key))
+  end
+  def test_delete_with_block
+    key = 'no called block'
+    @sdbm[key] = 'foo'
+    assert_equal('foo', @sdbm.delete(key) {|k| k.replace 'called block'})
+    assert_equal('no called block', key)
+    assert_equal(0, @sdbm.size)
+
+    key = 'no called block'
+    assert_equal(:blockval,
+		  @sdbm.delete(key) {|k| k.replace 'called block'; :blockval})
+    assert_equal('called block', key)
+    assert_equal(0, @sdbm.size)
+  end
+
+  def test_delete_if
+    v = "0"
+    100.times {@sdbm[v] = v; v = v.next}
+
+    ret = @sdbm.delete_if {|key, val| key.to_i < 50}
+    assert_equal(@sdbm, ret)
+    check_size(50, @sdbm)
+
+    ret = @sdbm.delete_if {|key, val| key.to_i >= 50}
+    assert_equal(@sdbm, ret)
+    check_size(0, @sdbm)
+
+    # break
+    v = "0"
+    100.times {@sdbm[v] = v; v = v.next}
+    check_size(100, @sdbm)
+    n = 0;
+    @sdbm.delete_if {|key, val|
+      break if n > 50
+      n+=1
+      true
+    }
+    assert_equal(51, n)
+    check_size(49, @sdbm)
+
+    @sdbm.clear
+
+    # raise
+    v = "0"
+    100.times {@sdbm[v] = v; v = v.next}
+    check_size(100, @sdbm)
+    n = 0;
+    begin
+      @sdbm.delete_if {|key, val|
+	raise "runtime error" if n > 50
+	n+=1
+	true
+      }
+    rescue
+    end
+    assert_equal(51, n)
+    check_size(49, @sdbm)
+  end
+
+  def test_reject
+    v = "0"
+    100.times {@sdbm[v] = v; v = v.next}
+
+    hash = @sdbm.reject {|key, val| key.to_i < 50}
+    assert_instance_of(Hash, hash)
+    assert_equal(100, @sdbm.size)
+
+    assert_equal(50, hash.size)
+    hash.each_pair {|key,val|
+      assert_equal(false, key.to_i < 50)
+      assert_equal(key, val)
+    }
+
+    hash = @sdbm.reject {|key, val| key.to_i < 100}
+    assert_instance_of(Hash, hash)
+    assert_equal(true, hash.empty?)
+  end
+
+  def test_clear
+    v = "1"
+    100.times {v = v.next; @sdbm[v] = v}
+
+    assert_equal(@sdbm, @sdbm.clear)
+
+    # validate SDBM#size
+    i = 0
+    @sdbm.each { i += 1 }
+    assert_equal(@sdbm.size, i)
+    assert_equal(0, i)
+  end
+
+  def test_invert
+    v = "0"
+    100.times {@sdbm[v] = v; v = v.next}
+
+    hash = @sdbm.invert
+    assert_instance_of(Hash, hash)
+    assert_equal(100, hash.size)
+    hash.each_pair {|key, val|
+      assert_equal(key.to_i, val.to_i)
+    }
+  end
+
+  def test_update
+    hash = {}
+    v = "0"
+    100.times {v = v.next; hash[v] = v}
+
+    @sdbm["101"] = "101"
+    @sdbm.update hash
+    assert_equal(101, @sdbm.size)
+    @sdbm.each_pair {|key, val|
+      assert_equal(key.to_i, val.to_i)
+    }
+  end
+
+  def test_replace
+    hash = {}
+    v = "0"
+    100.times {v = v.next; hash[v] = v}
+
+    @sdbm["101"] = "101"
+    @sdbm.replace hash
+    assert_equal(100, @sdbm.size)
+    @sdbm.each_pair {|key, val|
+      assert_equal(key.to_i, val.to_i)
+    }
+  end
+
+  def test_haskey?
+    assert_equal('bar', @sdbm['foo']='bar')
+    assert_equal(true,  @sdbm.has_key?('foo'))
+    assert_equal(false, @sdbm.has_key?('bar'))
+  end
+
+  def test_has_value?
+    assert_equal('bar', @sdbm['foo']='bar')
+    assert_equal(true,  @sdbm.has_value?('bar'))
+    assert_equal(false, @sdbm.has_value?('foo'))
+  end
+
+  def test_to_a
+    v = "0"
+    100.times {v = v.next; @sdbm[v] = v}
+
+    ary = @sdbm.to_a
+    assert_instance_of(Array, ary)
+    assert_equal(100, ary.size)
+    ary.each {|key,val|
+      assert_equal(key.to_i, val.to_i)
+    }
+  end
+
+  def test_to_hash
+    v = "0"
+    100.times {v = v.next; @sdbm[v] = v}
+
+    hash = @sdbm.to_hash
+    assert_instance_of(Hash, hash)
+    assert_equal(100, hash.size)
+    hash.each {|key,val|
+      assert_equal(key.to_i, val.to_i)
+    }
+  end
+end
diff --git a/ruby_1_8_6/test/soap/asp.net/hello.wsdl b/ruby_1_8_6/test/soap/asp.net/hello.wsdl
new file mode 100644
index 0000000000..b94129c152
--- /dev/null
+++ b/ruby_1_8_6/test/soap/asp.net/hello.wsdl
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+xmlns:s="http://www.w3.org/2001/XMLSchema"
+xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+xmlns:tns="http://localhost/WebService/"
+xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/"
+xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+targetNamespace="http://localhost/WebService/"
+xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <s:schema elementFormDefault="qualified"
+targetNamespace="http://localhost/WebService/">
+      <s:element name="HelloWorld">
+        <s:complexType />
+      </s:element>
+      <s:element name="HelloWorldResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1"
+name="HelloWorldResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="SayHello">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="name"
+type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="SayHelloResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1"
+name="SayHelloResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+    </s:schema>
+  </wsdl:types>
+  <wsdl:message name="HelloWorldSoapIn">
+    <wsdl:part name="parameters" element="tns:HelloWorld" />
+  </wsdl:message>
+  <wsdl:message name="HelloWorldSoapOut">
+    <wsdl:part name="parameters" element="tns:HelloWorldResponse" />
+  </wsdl:message>
+  <wsdl:message name="SayHelloSoapIn">
+    <wsdl:part name="parameters" element="tns:SayHello" />
+  </wsdl:message>
+  <wsdl:message name="SayHelloSoapOut">
+    <wsdl:part name="parameters" element="tns:SayHelloResponse" />
+  </wsdl:message>
+  <wsdl:portType name="Service1Soap">
+    <wsdl:operation name="HelloWorld">
+      <wsdl:input message="tns:HelloWorldSoapIn" />
+      <wsdl:output message="tns:HelloWorldSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="SayHello">
+      <wsdl:input message="tns:SayHelloSoapIn" />
+      <wsdl:output message="tns:SayHelloSoapOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="Service1Soap" type="tns:Service1Soap">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http"
+style="document" />
+    <wsdl:operation name="HelloWorld">
+      <soap:operation
+soapAction="http://localhost/WebService/HelloWorld" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="SayHello">
+      <soap:operation soapAction="http://localhost/WebService/SayHello"
+style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="Service1">
+    <documentation xmlns="http://schemas.xmlsoap.org/wsdl/" />
+    <wsdl:port name="Service1Soap" binding="tns:Service1Soap">
+      <soap:address
+location="http://localhost/WebService/Service1.asmx" />
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
diff --git a/ruby_1_8_6/test/soap/asp.net/test_aspdotnet.rb b/ruby_1_8_6/test/soap/asp.net/test_aspdotnet.rb
new file mode 100644
index 0000000000..7d5f3fd288
--- /dev/null
+++ b/ruby_1_8_6/test/soap/asp.net/test_aspdotnet.rb
@@ -0,0 +1,111 @@
+require 'test/unit'
+require 'soap/rpc/standaloneServer'
+require 'soap/rpc/driver'
+
+
+module SOAP; module ASPDotNet
+
+
+class TestASPDotNet < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::StandaloneServer
+    Namespace = "http://localhost/WebService/"
+
+    def on_init
+      add_document_method(
+        self,
+        Namespace + 'SayHello',
+        'sayHello',
+        XSD::QName.new(Namespace, 'SayHello'),
+        XSD::QName.new(Namespace, 'SayHelloResponse')
+      )
+    end
+  
+    def sayHello(arg)
+      name = arg['name']
+      "Hello #{name}"
+    end
+  end
+
+  Port = 17171
+  Endpoint = "http://localhost:#{Port}/"
+
+  def setup
+    setup_server
+    @client = nil
+  end
+
+  def teardown
+    teardown_server
+    @client.reset_stream if @client
+  end
+
+  def setup_server
+    @server = Server.new('Test', Server::Namespace, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def test_document_method
+    @client = SOAP::RPC::Driver.new(Endpoint, Server::Namespace)
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.add_document_method('sayHello', Server::Namespace + 'SayHello',
+      XSD::QName.new(Server::Namespace, 'SayHello'),
+      XSD::QName.new(Server::Namespace, 'SayHelloResponse'))
+    assert_equal("Hello Mike", @client.sayHello(:name => "Mike"))
+  end
+
+  def test_aspdotnethandler
+    @client = SOAP::RPC::Driver.new(Endpoint, Server::Namespace)
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.add_method_with_soapaction('sayHello', Server::Namespace + 'SayHello', 'name')
+    @client.default_encodingstyle = SOAP::EncodingStyle::ASPDotNetHandler::Namespace
+    assert_equal("Hello Mike", @client.sayHello("Mike"))
+  end
+
+  if defined?(HTTPAccess2)
+
+    # qualified!
+    REQUEST_ASPDOTNETHANDLER =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:sayHello xmlns:n1="http://localhost/WebService/">
+      <n1:name>Mike</n1:name>
+    </n1:sayHello>
+  </env:Body>
+</env:Envelope>]
+
+    def test_aspdotnethandler_envelope
+      @client = SOAP::RPC::Driver.new(Endpoint, Server::Namespace)
+      @client.wiredump_dev = str = ''
+      @client.add_method_with_soapaction('sayHello', Server::Namespace + 'SayHello', 'name')
+      @client.default_encodingstyle = SOAP::EncodingStyle::ASPDotNetHandler::Namespace
+      assert_equal("Hello Mike", @client.sayHello("Mike"))
+      assert_equal(REQUEST_ASPDOTNETHANDLER, parse_requestxml(str))
+    end
+
+    def parse_requestxml(str)
+      str.split(/\r?\n\r?\n/)[3]
+    end
+
+  end
+end
+
+
+end; end
diff --git a/ruby_1_8_6/test/soap/calc/calc.rb b/ruby_1_8_6/test/soap/calc/calc.rb
new file mode 100644
index 0000000000..6bc78803b3
--- /dev/null
+++ b/ruby_1_8_6/test/soap/calc/calc.rb
@@ -0,0 +1,17 @@
+module CalcService
+  def self.add(lhs, rhs)
+    lhs + rhs
+  end
+
+  def self.sub(lhs, rhs)
+    lhs - rhs
+  end
+
+  def self.multi(lhs, rhs)
+    lhs * rhs
+  end
+
+  def self.div(lhs, rhs)
+    lhs / rhs
+  end
+end
diff --git a/ruby_1_8_6/test/soap/calc/calc2.rb b/ruby_1_8_6/test/soap/calc/calc2.rb
new file mode 100644
index 0000000000..69495730e7
--- /dev/null
+++ b/ruby_1_8_6/test/soap/calc/calc2.rb
@@ -0,0 +1,29 @@
+class CalcService2
+  def initialize(value = 0)
+    @value = value
+  end
+
+  def set_value(value)
+    @value = value
+  end
+
+  def get_value
+    @value
+  end
+
+  def +(rhs)
+    @value + rhs
+  end
+
+  def -(rhs)
+    @value - rhs
+  end
+
+  def *(rhs)
+    @value * rhs
+  end
+
+  def /(rhs)
+    @value / rhs
+  end
+end
diff --git a/ruby_1_8_6/test/soap/calc/server.cgi b/ruby_1_8_6/test/soap/calc/server.cgi
new file mode 100644
index 0000000000..1eb0d1d864
--- /dev/null
+++ b/ruby_1_8_6/test/soap/calc/server.cgi
@@ -0,0 +1,13 @@
+require 'soap/rpc/cgistub'
+
+class CalcServer < SOAP::RPC::CGIStub
+  def initialize(*arg)
+    super
+
+    require 'calc'
+    servant = CalcService
+    add_servant(servant, 'http://tempuri.org/calcService')
+  end
+end
+
+status = CalcServer.new('CalcServer', nil).start
diff --git a/ruby_1_8_6/test/soap/calc/server.rb b/ruby_1_8_6/test/soap/calc/server.rb
new file mode 100644
index 0000000000..a93774d909
--- /dev/null
+++ b/ruby_1_8_6/test/soap/calc/server.rb
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'soap/rpc/standaloneServer'
+require 'calc'
+
+class CalcServer < SOAP::RPC::StandaloneServer
+  def initialize(*arg)
+    super
+
+    servant = CalcService
+    add_servant(servant, 'http://tempuri.org/calcService')
+  end
+end
+
+if $0 == __FILE__
+  status = CalcServer.new('CalcServer', nil, '0.0.0.0', 17171).start
+end
diff --git a/ruby_1_8_6/test/soap/calc/server2.rb b/ruby_1_8_6/test/soap/calc/server2.rb
new file mode 100644
index 0000000000..01c6d75289
--- /dev/null
+++ b/ruby_1_8_6/test/soap/calc/server2.rb
@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require 'soap/rpc/standaloneServer'
+require 'calc2'
+
+class CalcServer2 < SOAP::RPC::StandaloneServer
+  def on_init
+    servant = CalcService2.new
+    add_method(servant, 'set_value', 'newValue')
+    add_method(servant, 'get_value')
+    add_method_as(servant, '+', 'add', 'lhs')
+    add_method_as(servant, '-', 'sub', 'lhs')
+    add_method_as(servant, '*', 'multi', 'lhs')
+    add_method_as(servant, '/', 'div', 'lhs')
+  end
+end
+
+if $0 == __FILE__
+  status = CalcServer2.new('CalcServer', 'http://tempuri.org/calcService', '0.0.0.0', 17171).start
+end
diff --git a/ruby_1_8_6/test/soap/calc/test_calc.rb b/ruby_1_8_6/test/soap/calc/test_calc.rb
new file mode 100644
index 0000000000..88738716a6
--- /dev/null
+++ b/ruby_1_8_6/test/soap/calc/test_calc.rb
@@ -0,0 +1,49 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'server.rb'
+
+
+module SOAP
+module Calc
+
+
+class TestCalc < Test::Unit::TestCase
+  Port = 17171
+
+  def setup
+    @server = CalcServer.new(self.class.name, nil, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      @server.start
+    }
+    @endpoint = "http://localhost:#{Port}/"
+    @calc = SOAP::RPC::Driver.new(@endpoint, 'http://tempuri.org/calcService')
+    @calc.add_method('add', 'lhs', 'rhs')
+    @calc.add_method('sub', 'lhs', 'rhs')
+    @calc.add_method('multi', 'lhs', 'rhs')
+    @calc.add_method('div', 'lhs', 'rhs')
+  end
+
+  def teardown
+    @server.shutdown
+    @t.kill
+    @t.join
+    @calc.reset_stream
+  end
+
+  def test_calc
+    assert_equal(3, @calc.add(1, 2))
+    assert_equal(-1.1, @calc.sub(1.1, 2.2))
+    assert_equal(2.42, @calc.multi(1.1, 2.2))
+    assert_equal(2, @calc.div(5, 2))
+    assert_equal(2.5, @calc.div(5.0, 2))
+    assert_equal(1.0/0.0, @calc.div(1.1, 0))
+    assert_raises(ZeroDivisionError) do
+      @calc.div(1, 0)
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/soap/calc/test_calc2.rb b/ruby_1_8_6/test/soap/calc/test_calc2.rb
new file mode 100644
index 0000000000..f334b29bdb
--- /dev/null
+++ b/ruby_1_8_6/test/soap/calc/test_calc2.rb
@@ -0,0 +1,53 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'server2.rb'
+
+
+module SOAP
+module Calc
+
+
+class TestCalc2 < Test::Unit::TestCase
+  Port = 17171
+
+  def setup
+    @server = CalcServer2.new('CalcServer', 'http://tempuri.org/calcService', '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      Thread.current.abort_on_exception = true
+      @server.start
+    }
+    @endpoint = "http://localhost:#{Port}/"
+    @var = SOAP::RPC::Driver.new(@endpoint, 'http://tempuri.org/calcService')
+    @var.wiredump_dev = STDERR if $DEBUG
+    @var.add_method('set_value', 'newValue')
+    @var.add_method('get_value')
+    @var.add_method_as('+', 'add', 'rhs')
+    @var.add_method_as('-', 'sub', 'rhs')
+    @var.add_method_as('*', 'multi', 'rhs')
+    @var.add_method_as('/', 'div', 'rhs')
+  end
+
+  def teardown
+    @server.shutdown
+    @t.kill
+    @t.join
+    @var.reset_stream
+  end
+
+  def test_calc2
+    assert_equal(1, @var.set_value(1))
+    assert_equal(3, @var + 2)
+    assert_equal(-1.2, @var - 2.2)
+    assert_equal(2.2, @var * 2.2)
+    assert_equal(0, @var / 2)
+    assert_equal(0.5, @var / 2.0)
+    assert_raises(ZeroDivisionError) do
+      @var / 0
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/soap/calc/test_calc_cgi.rb b/ruby_1_8_6/test/soap/calc/test_calc_cgi.rb
new file mode 100644
index 0000000000..d28830629f
--- /dev/null
+++ b/ruby_1_8_6/test/soap/calc/test_calc_cgi.rb
@@ -0,0 +1,69 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'logger'
+require 'webrick'
+require 'rbconfig'
+
+
+module SOAP
+module Calc
+
+
+class TestCalcCGI < Test::Unit::TestCase
+  # This test shuld be run after installing ruby.
+  RUBYBIN = File.join(
+    Config::CONFIG["bindir"],
+    Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
+  )
+  RUBYBIN << " -d" if $DEBUG
+
+  Port = 17171
+
+  def setup
+    logger = Logger.new(STDERR)
+    logger.level = Logger::Severity::ERROR
+    @server = WEBrick::HTTPServer.new(
+      :BindAddress => "0.0.0.0",
+      :Logger => logger,
+      :Port => Port,
+      :AccessLog => [],
+      :DocumentRoot => File.dirname(File.expand_path(__FILE__)),
+      :CGIPathEnv => ENV['PATH'],
+      :CGIInterpreter => RUBYBIN
+    )
+    @t = Thread.new {
+      Thread.current.abort_on_exception = true
+      @server.start
+    }
+    @endpoint = "http://localhost:#{Port}/server.cgi"
+    @calc = SOAP::RPC::Driver.new(@endpoint, 'http://tempuri.org/calcService')
+    @calc.wiredump_dev = STDERR if $DEBUG
+    @calc.add_method('add', 'lhs', 'rhs')
+    @calc.add_method('sub', 'lhs', 'rhs')
+    @calc.add_method('multi', 'lhs', 'rhs')
+    @calc.add_method('div', 'lhs', 'rhs')
+  end
+
+  def teardown
+    @server.shutdown
+    @t.kill
+    @t.join
+    @calc.reset_stream
+  end
+
+  def test_calc_cgi
+    assert_equal(3, @calc.add(1, 2))
+    assert_equal(-1.1, @calc.sub(1.1, 2.2))
+    assert_equal(2.42, @calc.multi(1.1, 2.2))
+    assert_equal(2, @calc.div(5, 2))
+    assert_equal(2.5, @calc.div(5.0, 2))
+    assert_equal(1.0/0.0, @calc.div(1.1, 0))
+    assert_raises(ZeroDivisionError) do
+      @calc.div(1, 0)
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/soap/fault/test_customfault.rb b/ruby_1_8_6/test/soap/fault/test_customfault.rb
new file mode 100644
index 0000000000..2f7bc2be6e
--- /dev/null
+++ b/ruby_1_8_6/test/soap/fault/test_customfault.rb
@@ -0,0 +1,58 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'soap/rpc/standaloneServer'
+
+
+module SOAP
+module Fault
+
+
+class TestCustomFault < Test::Unit::TestCase
+  Port = 17171
+
+  class CustomFaultServer < SOAP::RPC::StandaloneServer
+    def on_init
+      add_method(self, 'fault', 'msg')
+    end
+
+    def fault(msg)
+      SOAPFault.new(SOAPString.new("mycustom"),
+        SOAPString.new("error: #{msg}"),
+        SOAPString.new(self.class.name))
+    end
+  end
+
+  def setup
+    @server = CustomFaultServer.new('customfault', 'urn:customfault', '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      Thread.current.abort_on_exception = true
+      @server.start
+    }
+    @endpoint = "http://localhost:#{Port}/"
+    @client = SOAP::RPC::Driver.new(@endpoint, 'urn:customfault')
+    @client.wiredump_dev = STDERR if $DEBUG
+    @client.add_method("fault", "msg")
+  end
+
+  def teardown
+    @server.shutdown
+    @t.kill
+    @t.join
+    @client.reset_stream
+  end
+
+  def test_custom_fault
+    begin
+      @client.fault("message")
+      assert(false, 'exception not raised')
+    rescue SOAP::FaultError => e
+      assert(true, 'exception raised')
+      assert_equal('error: message', e.message)
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/soap/header/server.cgi b/ruby_1_8_6/test/soap/header/server.cgi
new file mode 100644
index 0000000000..2a188538d9
--- /dev/null
+++ b/ruby_1_8_6/test/soap/header/server.cgi
@@ -0,0 +1,119 @@
+require 'pstore'
+require 'soap/rpc/cgistub'
+require 'soap/header/simplehandler'
+
+
+class AuthHeaderPortServer < SOAP::RPC::CGIStub
+  PortName = 'http://tempuri.org/authHeaderPort'
+  SupportPortName = 'http://tempuri.org/authHeaderSupportPort'
+  MyHeaderName = XSD::QName.new("http://tempuri.org/authHeader", "auth")
+  SessionDB = File.join(File.expand_path(File.dirname(__FILE__)), 'session.pstoredb')
+
+  class AuthHeaderService
+    def self.create
+      new
+    end
+
+    def deposit(amt)
+      "deposit #{amt} OK"
+    end
+
+    def withdrawal(amt)
+      "withdrawal #{amt} OK"
+    end
+  end
+
+  class AuthHeaderSupportService
+    def delete_sessiondb
+      File.unlink(SessionDB) if File.file?(SessionDB)
+      backup = SessionDB + "~"
+      File.unlink(backup) if File.file?(backup)
+    end
+  end
+
+  def initialize(*arg)
+    super
+    add_rpc_servant(AuthHeaderService.new, PortName)
+    add_rpc_servant(AuthHeaderSupportService.new, SupportPortName)
+    add_rpc_headerhandler(ServerAuthHeaderHandler.new)
+  end
+
+  class ServerAuthHeaderHandler < SOAP::Header::SimpleHandler
+    Users = {
+      'NaHi' => 'passwd',
+      'HiNa' => 'wspass'
+    }
+
+    def initialize
+      super(MyHeaderName)
+      @db = PStore.new(SessionDB)
+      @db.transaction do
+	@db["root"] = {} unless @db.root?("root")
+      end
+      @userid = @sessionid = nil
+    end
+
+    def login(userid, passwd)
+      userid and passwd and Users[userid] == passwd
+    end
+
+    def auth(sessionid)
+      in_sessiondb do |root|
+	root[sessionid][0]
+      end
+    end
+
+    def create_session(userid)
+      in_sessiondb do |root|
+	while true
+  	  key = create_sessionkey
+  	  break unless root[key]
+   	end
+    	root[key] = [userid]
+     	key
+      end
+    end
+
+    def destroy_session(sessionkey)
+      in_sessiondb do |root|
+	root.delete(sessionkey)
+      end
+    end
+
+    def on_simple_outbound
+      { "sessionid" => @sessionid }
+    end
+
+    def on_simple_inbound(my_header, mu)
+      succeeded = false
+      userid = my_header["userid"]
+      passwd = my_header["passwd"]
+      if login(userid, passwd)
+	succeeded = true
+      elsif sessionid = my_header["sessionid"]
+	if userid = auth(sessionid)
+	  destroy_session(sessionid)
+	  succeeded = true
+	end
+      end
+      raise RuntimeError.new("authentication failed") unless succeeded
+      @userid = userid
+      @sessionid = create_session(userid)
+    end
+
+  private
+
+    def create_sessionkey
+      Time.now.usec.to_s
+    end
+
+    def in_sessiondb
+      @db.transaction do
+	yield(@db["root"])
+      end
+    end
+  end
+end
+
+
+status = AuthHeaderPortServer.new('AuthHeaderPortServer', nil).start
diff --git a/ruby_1_8_6/test/soap/header/test_authheader.rb b/ruby_1_8_6/test/soap/header/test_authheader.rb
new file mode 100644
index 0000000000..47e1e76b82
--- /dev/null
+++ b/ruby_1_8_6/test/soap/header/test_authheader.rb
@@ -0,0 +1,240 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'soap/rpc/standaloneServer'
+require 'soap/header/simplehandler'
+
+
+module SOAP
+module Header
+
+
+class TestAuthHeader < Test::Unit::TestCase
+  Port = 17171
+  PortName = 'http://tempuri.org/authHeaderPort'
+  MyHeaderName = XSD::QName.new("http://tempuri.org/authHeader", "auth")
+  DummyHeaderName = XSD::QName.new("http://tempuri.org/authHeader", "dummy")
+
+  class AuthHeaderPortServer < SOAP::RPC::StandaloneServer
+    class AuthHeaderService
+      def self.create
+	new
+      end
+
+      def deposit(amt)
+	"deposit #{amt} OK"
+      end
+
+      def withdrawal(amt)
+	"withdrawal #{amt} OK"
+      end
+    end
+
+    def initialize(*arg)
+      super
+      add_rpc_servant(AuthHeaderService.new, PortName)
+      ServerAuthHeaderHandler.init
+      add_request_headerhandler(ServerAuthHeaderHandler)
+    end
+
+    class ServerAuthHeaderHandler < SOAP::Header::SimpleHandler
+      class << self
+	def create
+	  new
+	end
+
+	def init
+	  @users = {
+	    'NaHi' => 'passwd',
+	    'HiNa' => 'wspass'
+	  }
+	  @sessions = {}
+	end
+
+	def login(userid, passwd)
+	  userid and passwd and @users[userid] == passwd
+	end
+
+	def auth(sessionid)
+	  @sessions[sessionid][0]
+	end
+
+	def create_session(userid)
+	  while true
+	    key = create_sessionkey
+	    break unless @sessions[key]
+	  end
+	  @sessions[key] = [userid]
+	  key
+	end
+
+	def destroy_session(sessionkey)
+	  @sessions.delete(sessionkey)
+	end
+
+	def sessions
+	  @sessions
+	end
+
+      private
+
+	def create_sessionkey
+	  Time.now.usec.to_s
+	end
+      end
+
+      def initialize
+	super(MyHeaderName)
+	@userid = @sessionid = nil
+      end
+
+      def on_simple_outbound
+	{ "sessionid" => @sessionid }
+      end
+
+      def on_simple_inbound(my_header, mu)
+	auth = false
+	userid = my_header["userid"]
+	passwd = my_header["passwd"]
+	if self.class.login(userid, passwd)
+	  auth = true
+	elsif sessionid = my_header["sessionid"]
+	  if userid = self.class.auth(sessionid)
+	    self.class.destroy_session(sessionid)
+	    auth = true
+	  end
+	end
+	raise RuntimeError.new("authentication failed") unless auth
+	@userid = userid
+	@sessionid = self.class.create_session(userid)
+      end
+    end
+  end
+
+  class ClientAuthHeaderHandler < SOAP::Header::SimpleHandler
+    def initialize(userid, passwd, mustunderstand)
+      super(MyHeaderName)
+      @sessionid = nil
+      @userid = userid
+      @passwd = passwd
+      @mustunderstand = mustunderstand
+    end
+
+    def on_simple_outbound
+      if @sessionid
+	{ "sessionid" => @sessionid }
+      else
+	{ "userid" => @userid, "passwd" => @passwd }
+      end
+    end
+
+    def on_simple_inbound(my_header, mustunderstand)
+      @sessionid = my_header["sessionid"]
+    end
+
+    def sessionid
+      @sessionid
+    end
+  end
+
+  class DummyHeaderHandler < SOAP::Header::SimpleHandler
+    def initialize(mustunderstand)
+      super(DummyHeaderName)
+      @mustunderstand = mustunderstand
+    end
+
+    def on_simple_outbound
+      { XSD::QName.new("foo", "bar") => nil }
+    end
+
+    def on_simple_inbound(my_header, mustunderstand)
+    end
+  end
+
+  def setup
+    @endpoint = "http://localhost:#{Port}/"
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = AuthHeaderPortServer.new(self.class.name, nil, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      @server.start
+    }
+  end
+
+  def setup_client
+    @client = SOAP::RPC::Driver.new(@endpoint, PortName)
+    @client.wiredump_dev = STDERR if $DEBUG
+    @client.add_method('deposit', 'amt')
+    @client.add_method('withdrawal', 'amt')
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @t.kill
+    @t.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def test_success_no_mu
+    h = ClientAuthHeaderHandler.new('NaHi', 'passwd', false)
+    @client.headerhandler << h
+    do_transaction_check(h)
+  end
+
+  def test_success_mu
+    h = ClientAuthHeaderHandler.new('NaHi', 'passwd', true)
+    @client.headerhandler << h
+    do_transaction_check(h)
+  end
+
+  def test_no_mu
+    h = ClientAuthHeaderHandler.new('NaHi', 'passwd', true)
+    @client.headerhandler << h
+    @client.headerhandler << DummyHeaderHandler.new(false)
+    do_transaction_check(h)
+  end
+
+  def test_mu
+    h = ClientAuthHeaderHandler.new('NaHi', 'passwd', true)
+    @client.headerhandler << h
+    @client.headerhandler << (h2 = DummyHeaderHandler.new(true))
+    assert_raise(SOAP::UnhandledMustUnderstandHeaderError) do
+      assert_equal("deposit 150 OK", @client.deposit(150))
+    end
+    @client.headerhandler.delete(h2)
+    @client.headerhandler << (h2 = DummyHeaderHandler.new(false))
+    do_transaction_check(h)
+  end
+
+  def do_transaction_check(h)
+    assert_equal("deposit 150 OK", @client.deposit(150))
+    serversess = AuthHeaderPortServer::ServerAuthHeaderHandler.sessions[h.sessionid]
+    assert_equal("NaHi", serversess[0])
+    assert_equal("withdrawal 120 OK", @client.withdrawal(120))
+    serversess = AuthHeaderPortServer::ServerAuthHeaderHandler.sessions[h.sessionid]
+    assert_equal("NaHi", serversess[0])
+  end
+
+  def test_authfailure
+    h = ClientAuthHeaderHandler.new('NaHi', 'pa', false)
+    @client.headerhandler << h
+    assert_raises(RuntimeError) do
+      @client.deposit(150)
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/soap/header/test_authheader_cgi.rb b/ruby_1_8_6/test/soap/header/test_authheader_cgi.rb
new file mode 100644
index 0000000000..d70b022ad8
--- /dev/null
+++ b/ruby_1_8_6/test/soap/header/test_authheader_cgi.rb
@@ -0,0 +1,121 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'soap/rpc/standaloneServer'
+require 'soap/header/simplehandler'
+require 'logger'
+require 'webrick'
+require 'rbconfig'
+
+
+module SOAP
+module Header
+
+
+class TestAuthHeaderCGI < Test::Unit::TestCase
+  # This test shuld be run after installing ruby.
+  RUBYBIN = File.join(
+    Config::CONFIG["bindir"],
+    Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
+  )
+  RUBYBIN << " -d" if $DEBUG
+  
+  Port = 17171
+  PortName = 'http://tempuri.org/authHeaderPort'
+  SupportPortName = 'http://tempuri.org/authHeaderSupportPort'
+  MyHeaderName = XSD::QName.new("http://tempuri.org/authHeader", "auth")
+
+  class ClientAuthHeaderHandler < SOAP::Header::SimpleHandler
+    def initialize(userid, passwd)
+      super(MyHeaderName)
+      @sessionid = nil
+      @userid = userid
+      @passwd = passwd
+    end
+
+    def on_simple_outbound
+      if @sessionid
+	{ "sessionid" => @sessionid }
+      else
+	{ "userid" => @userid, "passwd" => @passwd }
+      end
+    end
+
+    def on_simple_inbound(my_header, mustunderstand)
+      @sessionid = my_header["sessionid"]
+    end
+
+    def sessionid
+      @sessionid
+    end
+  end
+
+  def setup
+    @endpoint = "http://localhost:#{Port}/"
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @endpoint = "http://localhost:#{Port}/server.cgi"
+    logger = Logger.new(STDERR)
+    logger.level = Logger::Severity::ERROR
+    @server = WEBrick::HTTPServer.new(
+      :BindAddress => "0.0.0.0",
+      :Logger => logger,
+      :Port => Port,
+      :AccessLog => [],
+      :DocumentRoot => File.dirname(File.expand_path(__FILE__)),
+      :CGIPathEnv => ENV['PATH'],
+      :CGIInterpreter => RUBYBIN
+    )
+    @t = Thread.new {
+      Thread.current.abort_on_exception = true
+      @server.start
+    }
+  end
+
+  def setup_client
+    @client = SOAP::RPC::Driver.new(@endpoint, PortName)
+    @client.wiredump_dev = STDERR if $DEBUG
+    @client.add_method('deposit', 'amt')
+    @client.add_method('withdrawal', 'amt')
+    @supportclient = SOAP::RPC::Driver.new(@endpoint, SupportPortName)
+    @supportclient.add_method('delete_sessiondb')
+  end
+
+  def teardown
+    @supportclient.delete_sessiondb
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @t.kill
+    @t.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+    @supportclient.reset_stream
+  end
+
+  def test_success
+    h = ClientAuthHeaderHandler.new('NaHi', 'passwd')
+    @client.headerhandler << h
+    assert_equal("deposit 150 OK", @client.deposit(150))
+    assert_equal("withdrawal 120 OK", @client.withdrawal(120))
+  end
+
+  def test_authfailure
+    h = ClientAuthHeaderHandler.new('NaHi', 'pa')
+    @client.headerhandler << h
+    assert_raises(RuntimeError) do
+      @client.deposit(150)
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/soap/header/test_simplehandler.rb b/ruby_1_8_6/test/soap/header/test_simplehandler.rb
new file mode 100644
index 0000000000..75dbd4a550
--- /dev/null
+++ b/ruby_1_8_6/test/soap/header/test_simplehandler.rb
@@ -0,0 +1,116 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'soap/rpc/standaloneServer'
+require 'soap/header/simplehandler'
+
+
+module SOAP
+module Header
+
+
+class TestSimpleHandler < Test::Unit::TestCase
+  Port = 17171
+  PortName = 'http://tempuri.org/authHeaderPort'
+
+  class PingPortServer < SOAP::RPC::StandaloneServer
+    class PingService
+      def self.create
+	new
+      end
+
+      def ping
+        Thread.current[:pingheader]
+      end
+    end
+
+    def initialize(*arg)
+      super
+      add_rpc_servant(PingService.new, PortName)
+      add_request_headerhandler(PingServerHeaderHandler)
+    end
+
+    class PingServerHeaderHandler < SOAP::Header::SimpleHandler
+      MyHeaderName = XSD::QName.new("http://xmlsoap.org/Ping", "PingHeader")
+  
+      def self.create
+        new
+      end
+
+      def initialize()
+        super(MyHeaderName)
+      end
+
+      def on_simple_outbound
+        "dummy"
+      end
+
+      def on_simple_inbound(my_header, mu)
+        Thread.current[:pingheader] = my_header
+      end
+    end
+  end
+
+  class PingClientHeaderHandler < SOAP::Header::SimpleHandler
+    MyHeaderName = XSD::QName.new("http://xmlsoap.org/Ping", "PingHeader")
+
+    def initialize(pingHeader)
+      super(MyHeaderName)
+      @pingHeader = pingHeader
+      @mustunderstand = false
+    end
+
+    def on_simple_outbound
+      @pingHeader # --- note, not a Hash
+    end
+
+    def on_simple_inbound(my_header, mustunderstand)
+      Thread.current[:pingheader] = my_header
+    end
+  end
+
+  def setup
+    @endpoint = "http://localhost:#{Port}/"
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = PingPortServer.new(self.class.name, nil, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      @server.start
+    }
+  end
+
+  def setup_client
+    @client = SOAP::RPC::Driver.new(@endpoint, PortName)
+    @client.wiredump_dev = STDERR if $DEBUG
+    @client.add_method('ping')
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @t.kill
+    @t.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def test_string
+    h = PingClientHeaderHandler.new('pingheader')
+    @client.headerhandler << h
+    assert_equal("pingheader", @client.ping)
+    assert_equal("dummy", Thread.current[:pingheader])
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/soap/helloworld/hw_s.rb b/ruby_1_8_6/test/soap/helloworld/hw_s.rb
new file mode 100644
index 0000000000..1a54adb924
--- /dev/null
+++ b/ruby_1_8_6/test/soap/helloworld/hw_s.rb
@@ -0,0 +1,16 @@
+require 'soap/rpc/standaloneServer'
+
+class HelloWorldServer < SOAP::RPC::StandaloneServer
+  def on_init
+    add_method(self, 'hello_world', 'from')
+  end
+
+  def hello_world(from)
+    "Hello World, from #{ from }"
+  end
+end
+
+if $0 == __FILE__
+  server = HelloWorldServer.new('hws', 'urn:hws', '0.0.0.0', 17171)
+  server.start
+end
diff --git a/ruby_1_8_6/test/soap/helloworld/test_helloworld.rb b/ruby_1_8_6/test/soap/helloworld/test_helloworld.rb
new file mode 100644
index 0000000000..40c35b57fb
--- /dev/null
+++ b/ruby_1_8_6/test/soap/helloworld/test_helloworld.rb
@@ -0,0 +1,40 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'hw_s.rb'
+
+
+module SOAP
+module HelloWorld
+
+
+class TestHelloWorld < Test::Unit::TestCase
+  Port = 17171
+
+  def setup
+    @server = HelloWorldServer.new('hws', 'urn:hws', '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      Thread.current.abort_on_exception = true
+      @server.start
+    }
+    @endpoint = "http://localhost:#{Port}/"
+    @client = SOAP::RPC::Driver.new(@endpoint, 'urn:hws')
+    @client.add_method("hello_world", "from")
+  end
+
+  def teardown
+    @server.shutdown
+    @t.kill
+    @t.join
+    @client.reset_stream
+  end
+
+  def test_hello_world
+    assert_equal("Hello World, from NaHi", @client.hello_world("NaHi"))
+    assert_equal("Hello World, from <&>", @client.hello_world("<&>"))
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/soap/marshal/test_digraph.rb b/ruby_1_8_6/test/soap/marshal/test_digraph.rb
new file mode 100644
index 0000000000..d7f30654f8
--- /dev/null
+++ b/ruby_1_8_6/test/soap/marshal/test_digraph.rb
@@ -0,0 +1,56 @@
+require 'test/unit'
+require 'soap/marshal'
+
+
+module SOAP
+module Marshal
+
+
+class Node; include SOAP::Marshallable
+  attr_reader :first, :second, :str
+
+  def initialize(*init_next)
+    @first = init_next[0]
+    @second = init_next[1]
+  end
+end
+
+class TestDigraph < Test::Unit::TestCase
+  def setup
+    @n9 = Node.new
+    @n81 = Node.new(@n9)
+    @n82 = Node.new(@n9)
+    @n7 = Node.new(@n81, @n82)
+    @n61 = Node.new(@n7)
+    @n62 = Node.new(@n7)
+    @n5 = Node.new(@n61, @n62)
+    @n41 = Node.new(@n5)
+    @n42 = Node.new(@n5)
+    @n3 = Node.new(@n41, @n42)
+    @n21 = Node.new(@n3)
+    @n22 = Node.new(@n3)
+    @n1 = Node.new(@n21, @n22)
+  end
+
+  def test_marshal
+    f = File.open("digraph_marshalled_string.soap", "wb")
+    SOAP::Marshal.dump(@n1, f)
+    f.close
+    f = File.open("digraph_marshalled_string.soap")
+    str = f.read
+    f.close
+    newnode = SOAP::Marshal.unmarshal(str)
+    assert_equal(newnode.first.first.__id__, newnode.second.first.__id__)
+    assert_equal(newnode.first.first.first.first.__id__, newnode.second.first.second.first.__id__)
+  end
+
+  def teardown
+    if File.exist?("digraph_marshalled_string.soap")
+      File.unlink("digraph_marshalled_string.soap")
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/soap/marshal/test_marshal.rb b/ruby_1_8_6/test/soap/marshal/test_marshal.rb
new file mode 100644
index 0000000000..5cc30a2b5d
--- /dev/null
+++ b/ruby_1_8_6/test/soap/marshal/test_marshal.rb
@@ -0,0 +1,26 @@
+require 'test/unit'
+require 'soap/marshal'
+dir = File.join(File.dirname(File.expand_path(__FILE__)), '../../ruby')
+orgpath = $:.dup
+begin
+  $:.push(dir)
+  require 'marshaltestlib'
+ensure
+  $:.replace(orgpath)
+end
+
+module SOAP
+module Marshal
+class TestMarshal < Test::Unit::TestCase
+  include MarshalTestLib
+
+  def encode(o)
+    SOAPMarshal.dump(o)
+  end
+
+  def decode(s)
+    SOAPMarshal.load(s)
+  end
+end
+end
+end
diff --git a/ruby_1_8_6/test/soap/marshal/test_struct.rb b/ruby_1_8_6/test/soap/marshal/test_struct.rb
new file mode 100644
index 0000000000..33975c31b0
--- /dev/null
+++ b/ruby_1_8_6/test/soap/marshal/test_struct.rb
@@ -0,0 +1,47 @@
+require 'test/unit'
+require 'soap/marshal'
+
+
+module SOAP
+module Marshal
+
+
+Foo1 = ::Struct.new("Foo1", :m)
+Foo2 = ::Struct.new(:m)
+class Foo3
+  attr_accessor :m
+end
+
+class TestStruct < Test::Unit::TestCase
+  def test_foo1
+    org = Foo1.new
+    org.m = org
+    obj = convert(org)
+    assert_equal(Foo1, obj.class)
+    assert_equal(obj.m, obj)
+  end
+
+  def test_foo2
+    org = Foo2.new
+    org.m = org
+    obj = convert(org)
+    assert_equal(Foo2, obj.class)
+    assert_equal(obj.m, obj)
+  end
+
+  def test_foo3
+    org = Foo3.new
+    org.m = org
+    obj = convert(org)
+    assert_equal(Foo3, obj.class)
+    assert_equal(obj.m, obj)
+  end
+
+  def convert(obj)
+    SOAP::Marshal.unmarshal(SOAP::Marshal.marshal(obj))
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/soap/ssl/README b/ruby_1_8_6/test/soap/ssl/README
new file mode 100644
index 0000000000..98ebcf7c23
--- /dev/null
+++ b/ruby_1_8_6/test/soap/ssl/README
@@ -0,0 +1 @@
+* certificates and keys in this directory is copied from http-access2 test.
diff --git a/ruby_1_8_6/test/soap/ssl/ca.cert b/ruby_1_8_6/test/soap/ssl/ca.cert
new file mode 100644
index 0000000000..bcabbee4ad
--- /dev/null
+++ b/ruby_1_8_6/test/soap/ssl/ca.cert
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID0DCCArigAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MQswCQYDVQQGDAJKUDES
+MBAGA1UECgwJSklOLkdSLkpQMQwwCgYDVQQLDANSUlIxCzAJBgNVBAMMAkNBMB4X
+DTA0MDEzMDAwNDIzMloXDTM2MDEyMjAwNDIzMlowPDELMAkGA1UEBgwCSlAxEjAQ
+BgNVBAoMCUpJTi5HUi5KUDEMMAoGA1UECwwDUlJSMQswCQYDVQQDDAJDQTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANbv0x42BTKFEQOE+KJ2XmiSdZpR
+wjzQLAkPLRnLB98tlzs4xo+y4RyY/rd5TT9UzBJTIhP8CJi5GbS1oXEerQXB3P0d
+L5oSSMwGGyuIzgZe5+vZ1kgzQxMEKMMKlzA73rbMd4Jx3u5+jdbP0EDrPYfXSvLY
+bS04n2aX7zrN3x5KdDrNBfwBio2/qeaaj4+9OxnwRvYP3WOvqdW0h329eMfHw0pi
+JI0drIVdsEqClUV4pebT/F+CPUPkEh/weySgo9wANockkYu5ujw2GbLFcO5LXxxm
+dEfcVr3r6t6zOA4bJwL0W/e6LBcrwiG/qPDFErhwtgTLYf6Er67SzLyA66UCAwEA
+AaOB3DCB2TAPBgNVHRMBAf8EBTADAQH/MDEGCWCGSAGG+EIBDQQkFiJSdWJ5L09w
+ZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRJ7Xd380KzBV7f
+USKIQ+O/vKbhDzAOBgNVHQ8BAf8EBAMCAQYwZAYDVR0jBF0wW4AUSe13d/NCswVe
+31EiiEPjv7ym4Q+hQKQ+MDwxCzAJBgNVBAYMAkpQMRIwEAYDVQQKDAlKSU4uR1Iu
+SlAxDDAKBgNVBAsMA1JSUjELMAkGA1UEAwwCQ0GCAQAwDQYJKoZIhvcNAQEFBQAD
+ggEBAIu/mfiez5XN5tn2jScgShPgHEFJBR0BTJBZF6xCk0jyqNx/g9HMj2ELCuK+
+r/Y7KFW5c5M3AQ+xWW0ZSc4kvzyTcV7yTVIwj2jZ9ddYMN3nupZFgBK1GB4Y05GY
+MJJFRkSu6d/Ph5ypzBVw2YMT/nsOo5VwMUGLgS7YVjU+u/HNWz80J3oO17mNZllj
+PvORJcnjwlroDnS58KoJ7GDgejv3ESWADvX1OHLE4cRkiQGeLoEU4pxdCxXRqX0U
+PbwIkZN9mXVcrmPHq8MWi4eC/V7hnbZETMHuWhUoiNdOEfsAXr3iP4KjyyRdwc7a
+d/xgcK06UVQRL/HbEYGiQL056mc=
+-----END CERTIFICATE-----
diff --git a/ruby_1_8_6/test/soap/ssl/client.cert b/ruby_1_8_6/test/soap/ssl/client.cert
new file mode 100644
index 0000000000..ad13c4b735
--- /dev/null
+++ b/ruby_1_8_6/test/soap/ssl/client.cert
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDKDCCAhCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADA8MQswCQYDVQQGDAJKUDES
+MBAGA1UECgwJSklOLkdSLkpQMQwwCgYDVQQLDANSUlIxCzAJBgNVBAMMAkNBMB4X
+DTA0MDEzMTAzMTQ1OFoXDTM1MDEyMzAzMTQ1OFowZTELMAkGA1UEBgwCSlAxEjAQ
+BgNVBAoMCUpJTi5HUi5KUDEMMAoGA1UECwwDUlJSMRAwDgYDVQQDDAdleGFtcGxl
+MSIwIAYJKoZIhvcNAQkBDBNleGFtcGxlQGV4YW1wbGUub3JnMIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQDRWssrK8Gyr+500hpLjCGR3+AHL8/hEJM5zKi/MgLW
+jTkvsgOwbYwXOiNtAbR9y4/ucDq7EY+cMUMHES4uFaPTcOaAV0aZRmk8AgslN1tQ
+gNS6ew7/Luq3DcVeWkX8PYgR9VG0mD1MPfJ6+IFA5d3vKpdBkBgN4l46jjO0/2Xf
+ewIDAQABo4GPMIGMMAwGA1UdEwEB/wQCMAAwMQYJYIZIAYb4QgENBCQWIlJ1Ynkv
+T3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOFvay0H7lr2
+xUx6waYEV2bVDYQhMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADggEBABd2dYWqbDIWf5sWFvslezxJv8gI
+w64KCJBuyJAiDuf+oazr3016kMzAlt97KecLZDusGNagPrq02UX7YMoQFsWJBans
+cDtHrkM0al5r6/WGexNMgtYbNTYzt/IwodISGBgZ6dsOuhznwms+IBsTNDAvWeLP
+lt2tOqD8kEmjwMgn0GDRuKjs4EoboA3kMULb1p9akDV9ZESU3eOtpS5/G5J5msLI
+9WXbYBjcjvkLuJH9VsJhb+R58Vl0ViemvAHhPilSl1SPWVunGhv6FcIkdBEi1k9F
+e8BNMmsEjFiANiIRvpdLRbiGBt0KrKTndVfsmoKCvY48oCOvnzxtahFxfs8=
+-----END CERTIFICATE-----
diff --git a/ruby_1_8_6/test/soap/ssl/client.key b/ruby_1_8_6/test/soap/ssl/client.key
new file mode 100644
index 0000000000..37bc62f259
--- /dev/null
+++ b/ruby_1_8_6/test/soap/ssl/client.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQDRWssrK8Gyr+500hpLjCGR3+AHL8/hEJM5zKi/MgLWjTkvsgOw
+bYwXOiNtAbR9y4/ucDq7EY+cMUMHES4uFaPTcOaAV0aZRmk8AgslN1tQgNS6ew7/
+Luq3DcVeWkX8PYgR9VG0mD1MPfJ6+IFA5d3vKpdBkBgN4l46jjO0/2XfewIDAQAB
+AoGAZcz8llWErtsV3QB9gNb3S/PNADGjqBFjReva8n3jG2k4sZSibpwWTwUaTNtT
+ZQgjSRKRvH1hk9XwffNAvXAQZNNkuj/16gO2oO45nyLj4dO365ujLptWnVIWDHOE
+uN0GeiZO+VzcCisT0WCq4tvtLeH8svrxzA8cbXIEyOK7NiECQQDwo2zPFyKAZ/Cu
+lDJ6zKT+RjfWwW7DgWzirAlTrt4ViMaW+IaDH29TmQpb4V4NuR3Xi+2Xl4oicu6S
+36TW9+/FAkEA3rgfOQJuLlWSnw1RTGwvnC816a/W7iYYY7B+0U4cDbfWl7IoXT4y
+M8nV/HESooviZLqBwzAYSoj3fFKYBKpGPwJAUO8GN5iWWA2dW3ooiDiv/X1sZmRk
+dojfMFWgRW747tEzya8Ivq0h6kH8w+5GjeMG8Gn1nRiwsulo6Ckj7dEx6QJACyui
+7UIQ8qP6GZ4aYMHgVW4Mvy7Bkeo5OO7GPYs0Xv/EdJFL8vlGnVBXOjUVoS9w6Gpu
+TbLg1QQvnX2rADjmEwJANxZO2GUkaWGsEif8aGW0x5g/IdaMGG27pTWk5zqix7P3
+1UDrdo/JOXhptovhRi06EppIxAxYmbh9vd9VN8Itlw==
+-----END RSA PRIVATE KEY-----
diff --git a/ruby_1_8_6/test/soap/ssl/server.cert b/ruby_1_8_6/test/soap/ssl/server.cert
new file mode 100644
index 0000000000..998ccc5892
--- /dev/null
+++ b/ruby_1_8_6/test/soap/ssl/server.cert
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIC/zCCAeegAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGDAJKUDES
+MBAGA1UECgwJSklOLkdSLkpQMQwwCgYDVQQLDANSUlIxDjAMBgNVBAMMBVN1YkNB
+MB4XDTA0MDEzMTAzMTMxNloXDTMzMDEyMzAzMTMxNlowQzELMAkGA1UEBgwCSlAx
+EjAQBgNVBAoMCUpJTi5HUi5KUDEMMAoGA1UECwwDUlJSMRIwEAYDVQQDDAlsb2Nh
+bGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFJTxWqup3nV9dsJAku
+p+WaXnPNIzcpAA3qMGZDJTJsfa8Du7ZxTP0XJK5mETttBrn711cJxAuP3KjqnW9S
+vtZ9lY2sXJ6Zj62sN5LwG3VVe25dI28yR1EsbHjJ5Zjf9tmggMC6am52dxuHbt5/
+vHo4ngJuKE/U+eeGRivMn6gFAgMBAAGjgYUwgYIwDAYDVR0TAQH/BAIwADAxBglg
+hkgBhvhCAQ0EJBYiUnVieS9PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
+BgNVHQ4EFgQUpZIyygD9JxFYHHOTEuWOLbCKfckwCwYDVR0PBAQDAgWgMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4IBAQBwAIj5SaBHaA5X31IP
+CFCJiep96awfp7RANO0cuUj+ZpGoFn9d6FXY0g+Eg5wAkCNIzZU5NHN9xsdOpnUo
+zIBbyTfQEPrge1CMWMvL6uGaoEXytq84VTitF/xBTky4KtTn6+es4/e7jrrzeUXQ
+RC46gkHObmDT91RkOEGjHLyld2328jo3DIN/VTHIryDeVHDWjY5dENwpwdkhhm60
+DR9IrNBbXWEe9emtguNXeN0iu1ux0lG1Hc6pWGQxMlRKNvGh0yZB9u5EVe38tOV0
+jQaoNyL7qzcQoXD3Dmbi1p0iRmg/+HngISsz8K7k7MBNVsSclztwgCzTZOBiVtkM
+rRlQ
+-----END CERTIFICATE-----
diff --git a/ruby_1_8_6/test/soap/ssl/server.key b/ruby_1_8_6/test/soap/ssl/server.key
new file mode 100644
index 0000000000..9ba2218a03
--- /dev/null
+++ b/ruby_1_8_6/test/soap/ssl/server.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDRSU8Vqrqd51fXbCQJLqflml5zzSM3KQAN6jBmQyUybH2vA7u2
+cUz9FySuZhE7bQa5+9dXCcQLj9yo6p1vUr7WfZWNrFyemY+trDeS8Bt1VXtuXSNv
+MkdRLGx4yeWY3/bZoIDAumpudncbh27ef7x6OJ4CbihP1PnnhkYrzJ+oBQIDAQAB
+AoGBAIf4CstW2ltQO7+XYGoex7Hh8s9lTSW/G2vu5Hbr1LTHy3fzAvdq8MvVR12O
+rk9fa+lU9vhzPc0NMB0GIDZ9GcHuhW5hD1Wg9OSCbTOkZDoH3CAFqonjh4Qfwv5W
+IPAFn9KHukdqGXkwEMdErsUaPTy9A1V/aROVEaAY+HJgq/eZAkEA/BP1QMV04WEZ
+Oynzz7/lLizJGGxp2AOvEVtqMoycA/Qk+zdKP8ufE0wbmCE3Qd6GoynavsHb6aGK
+gQobb8zDZwJBANSK6MrXlrZTtEaeZuyOB4mAmRzGzOUVkUyULUjEx2GDT93ujAma
+qm/2d3E+wXAkNSeRpjUmlQXy/2oSqnGvYbMCQQDRM+cYyEcGPUVpWpnj0shrF/QU
+9vSot/X1G775EMTyaw6+BtbyNxVgOIu2J+rqGbn3c+b85XqTXOPL0A2RLYkFAkAm
+syhSDtE9X55aoWsCNZY/vi+i4rvaFoQ/WleogVQAeGVpdo7/DK9t9YWoFBIqth0L
+mGSYFu9ZhvZkvQNV8eYrAkBJ+rOIaLDsmbrgkeDruH+B/9yrm4McDtQ/rgnOGYnH
+LjLpLLOrgUxqpzLWe++EwSLwK2//dHO+SPsQJ4xsyQJy
+-----END RSA PRIVATE KEY-----
diff --git a/ruby_1_8_6/test/soap/ssl/sslsvr.rb b/ruby_1_8_6/test/soap/ssl/sslsvr.rb
new file mode 100644
index 0000000000..4f67eb9485
--- /dev/null
+++ b/ruby_1_8_6/test/soap/ssl/sslsvr.rb
@@ -0,0 +1,57 @@
+require 'webrick/https'
+require 'logger'
+require 'rbconfig'
+
+require 'soap/rpc/httpserver'
+
+class HelloWorldServer < SOAP::RPC::HTTPServer
+private
+
+  def on_init
+    self.level = Logger::Severity::FATAL
+    @default_namespace = 'urn:ssltst'
+    add_method(self, 'hello_world', 'from')
+  end
+
+  def hello_world(from)
+    "Hello World, from #{ from }"
+  end
+end
+
+
+if $0 == __FILE__
+  PORT = 17171
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  def cert(filename)
+    OpenSSL::X509::Certificate.new(File.open(File.join(DIR, filename)) { |f|
+      f.read
+    })
+  end
+
+  def key(filename)
+    OpenSSL::PKey::RSA.new(File.open(File.join(DIR, filename)) { |f|
+      f.read
+    })
+  end
+
+  $server = HelloWorldServer.new(
+    :BindAddress => "0.0.0.0",
+    :Port => PORT,
+    :AccessLog => [],
+    :SSLEnable => true,
+    :SSLCACertificateFile => File.join(DIR, 'ca.cert'),
+    :SSLCertificate => cert('server.cert'),
+    :SSLPrivateKey => key('server.key'),
+    :SSLVerifyClient => nil, #OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT|OpenSSL::SSL::VERIFY_PEER,
+    :SSLClientCA => cert('ca.cert'),
+    :SSLCertName => nil
+  )
+  t = Thread.new {
+    Thread.current.abort_on_exception = true
+    $server.start
+  }
+  STDOUT.sync = true
+  puts $$
+  t.join
+end
diff --git a/ruby_1_8_6/test/soap/ssl/subca.cert b/ruby_1_8_6/test/soap/ssl/subca.cert
new file mode 100644
index 0000000000..1e471851b8
--- /dev/null
+++ b/ruby_1_8_6/test/soap/ssl/subca.cert
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA8MQswCQYDVQQGDAJKUDES
+MBAGA1UECgwJSklOLkdSLkpQMQwwCgYDVQQLDANSUlIxCzAJBgNVBAMMAkNBMB4X
+DTA0MDEzMDAwNDMyN1oXDTM1MDEyMjAwNDMyN1owPzELMAkGA1UEBgwCSlAxEjAQ
+BgNVBAoMCUpJTi5HUi5KUDEMMAoGA1UECwwDUlJSMQ4wDAYDVQQDDAVTdWJDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ0Ou7AyRcRXnB/kVHv/6kwe
+ANzgg/DyJfsAUqW90m7Lu1nqyug8gK0RBd77yU0w5HOAMHTVSdpjZK0g2sgx4Mb1
+d/213eL9TTl5MRVEChTvQr8q5DVG/8fxPPE7fMI8eOAzd98/NOAChk+80r4Sx7fC
+kGVEE1bKwY1MrUsUNjOY2d6t3M4HHV3HX1V8ShuKfsHxgCmLzdI8U+5CnQedFgkm
+3e+8tr8IX5RR1wA1Ifw9VadF7OdI/bGMzog/Q8XCLf+WPFjnK7Gcx6JFtzF6Gi4x
+4dp1Xl45JYiVvi9zQ132wu8A1pDHhiNgQviyzbP+UjcB/tsOpzBQF8abYzgEkWEC
+AwEAAaNyMHAwDwYDVR0TAQH/BAUwAwEB/zAxBglghkgBhvhCAQ0EJBYiUnVieS9P
+cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUlCjXWLsReYzH
+LzsxwVnCXmKoB/owCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQCJ/OyN
+rT8Cq2Y+G2yA/L1EMRvvxwFBqxavqaqHl/6rwsIBFlB3zbqGA/0oec6MAVnYynq4
+c4AcHTjx3bQ/S4r2sNTZq0DH4SYbQzIobx/YW8PjQUJt8KQdKMcwwi7arHP7A/Ha
+LKu8eIC2nsUBnP4NhkYSGhbmpJK+PFD0FVtD0ZIRlY/wsnaZNjWWcnWF1/FNuQ4H
+ySjIblqVQkPuzebv3Ror6ZnVDukn96Mg7kP4u6zgxOeqlJGRe1M949SS9Vudjl8X
+SF4aZUUB9pQGhsqQJVqaz2OlhGOp9D0q54xko/rekjAIcuDjl1mdX4F2WRrzpUmZ
+uY/bPeOBYiVsOYVe
+-----END CERTIFICATE-----
diff --git a/ruby_1_8_6/test/soap/ssl/test_ssl.rb b/ruby_1_8_6/test/soap/ssl/test_ssl.rb
new file mode 100644
index 0000000000..f0a1e18971
--- /dev/null
+++ b/ruby_1_8_6/test/soap/ssl/test_ssl.rb
@@ -0,0 +1,204 @@
+require 'test/unit'
+begin
+  require 'http-access2'
+rescue LoadError
+end
+require 'soap/rpc/driver'
+
+if defined?(HTTPAccess2) and defined?(OpenSSL)
+
+module SOAP; module SSL
+
+
+class TestSSL < Test::Unit::TestCase
+  PORT = 17171
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+  require 'rbconfig'
+  RUBY = File.join(
+    Config::CONFIG["bindir"],
+    Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
+  )
+
+  def setup
+    @url = "https://localhost:#{PORT}/hello"
+    @serverpid = @client = nil
+    @verify_callback_called = false
+    setup_server
+    setup_client
+  end
+
+  def teardown
+    teardown_client
+    teardown_server
+  end
+
+  def test_options
+    cfg = @client.streamhandler.client.ssl_config
+    assert_nil(cfg.client_cert)
+    assert_nil(cfg.client_key)
+    assert_nil(cfg.client_ca)
+    assert_equal(OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT, cfg.verify_mode)
+    assert_nil(cfg.verify_callback)
+    assert_nil(cfg.timeout)
+    assert_equal(OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv2, cfg.options)
+    assert_equal("ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH", cfg.ciphers)
+    assert_instance_of(OpenSSL::X509::Store, cfg.cert_store)
+    # dummy call to ensure sslsvr initialization finished.
+    assert_raise(OpenSSL::SSL::SSLError) do
+      @client.hello_world("ssl client")
+    end
+  end
+
+  def test_verification
+    cfg = @client.options
+    cfg["protocol.http.ssl_config.verify_callback"] = method(:verify_callback).to_proc
+    @verify_callback_called = false
+    ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
+    assert_equal("certificate verify failed", ssle.message)
+    assert(@verify_callback_called)
+    #
+    cfg["protocol.http.ssl_config.client_cert"] = File.join(DIR, "client.cert")
+    cfg["protocol.http.ssl_config.client_key"] = File.join(DIR, "client.key")
+    @verify_callback_called = false
+    ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
+    assert_equal("certificate verify failed", ssle.message)
+    assert(@verify_callback_called)
+    #
+    cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "ca.cert")
+    @verify_callback_called = false
+    ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
+    assert_equal("certificate verify failed", ssle.message)
+    assert(@verify_callback_called)
+    #
+    cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "subca.cert")
+    @verify_callback_called = false
+    assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
+    assert(@verify_callback_called)
+    #
+    cfg["protocol.http.ssl_config.verify_depth"] = "1"
+    @verify_callback_called = false
+    ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
+    assert_equal("certificate verify failed", ssle.message)
+    assert(@verify_callback_called)
+    #
+    cfg["protocol.http.ssl_config.verify_depth"] = ""
+    cfg["protocol.http.ssl_config.cert_store"] = OpenSSL::X509::Store.new
+    cfg["protocol.http.ssl_config.verify_mode"] = OpenSSL::SSL::VERIFY_PEER.to_s
+    ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
+    assert_equal("certificate verify failed", ssle.message)
+    #
+    cfg["protocol.http.ssl_config.verify_mode"] = ""
+    assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
+  end
+
+  def test_property
+    testpropertyname = File.join(DIR, 'soapclient.properties')
+    File.open(testpropertyname, "w") do |f|
+      f <<<<__EOP__
+protocol.http.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_PEER
+# depth: 1 causes an error (intentional)
+protocol.http.ssl_config.verify_depth = 1
+protocol.http.ssl_config.client_cert = #{File.join(DIR, 'client.cert')}
+protocol.http.ssl_config.client_key = #{File.join(DIR, 'client.key')}
+protocol.http.ssl_config.ca_file = #{File.join(DIR, 'ca.cert')}
+protocol.http.ssl_config.ca_file = #{File.join(DIR, 'subca.cert')}
+protocol.http.ssl_config.ciphers = ALL
+__EOP__
+    end
+    begin
+      @client.loadproperty(testpropertyname)
+      @client.options["protocol.http.ssl_config.verify_callback"] = method(:verify_callback).to_proc
+      @verify_callback_called = false
+      # NG with String
+      ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
+      assert_equal("certificate verify failed", ssle.message)
+      assert(@verify_callback_called)
+      # NG with Integer
+      @client.options["protocol.http.ssl_config.verify_depth"] = 0
+      ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
+      assert_equal("certificate verify failed", ssle.message)
+      assert(@verify_callback_called)
+      # OK with empty
+      @client.options["protocol.http.ssl_config.verify_depth"] = ""
+      @verify_callback_called = false
+      assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
+      assert(@verify_callback_called)
+      # OK with nil
+      @client.options["protocol.http.ssl_config.verify_depth"] = nil
+      @verify_callback_called = false
+      assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
+      assert(@verify_callback_called)
+      # OK with String
+      @client.options["protocol.http.ssl_config.verify_depth"] = "3"
+      @verify_callback_called = false
+      assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
+      assert(@verify_callback_called)
+      # OK with Integer
+      @client.options["protocol.http.ssl_config.verify_depth"] = 3
+      @verify_callback_called = false
+      assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
+      assert(@verify_callback_called)
+    ensure
+      File.unlink(testpropertyname)
+    end
+  end
+
+  def test_ciphers
+    cfg = @client.options
+    cfg["protocol.http.ssl_config.client_cert"] = File.join(DIR, 'client.cert')
+    cfg["protocol.http.ssl_config.client_key"] = File.join(DIR, 'client.key')
+    cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "ca.cert")
+    cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "subca.cert")
+    #cfg.timeout = 123
+    cfg["protocol.http.ssl_config.ciphers"] = "!ALL"
+    #
+    ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
+    # depends on OpenSSL version. (?:0.9.8|0.9.7)
+    assert_match(/\A(?:SSL_CTX_set_cipher_list:: no cipher match|no ciphers available)\z/, ssle.message)
+    #
+    cfg["protocol.http.ssl_config.ciphers"] = "ALL"
+    assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
+  end
+
+private
+
+  def q(str)
+    %Q["#{str}"]
+  end
+
+  def setup_server
+    svrcmd = "#{q(RUBY)} "
+    #svrcmd << "-d " if $DEBUG
+    svrcmd << File.join(DIR, "sslsvr.rb")
+    svrout = IO.popen(svrcmd)
+    @serverpid = Integer(svrout.gets.chomp)
+  end
+
+  def setup_client
+    @client = SOAP::RPC::Driver.new(@url, 'urn:ssltst')
+    @client.add_method("hello_world", "from")
+  end
+
+  def teardown_server
+    if @serverpid
+      Process.kill('KILL', @serverpid)
+      Process.waitpid(@serverpid)
+    end
+  end
+
+  def teardown_client
+    @client.reset_stream if @client
+  end
+
+  def verify_callback(ok, cert)
+    @verify_callback_called = true
+    p ["client", ok, cert] if $DEBUG
+    ok
+  end
+end
+
+
+end; end
+
+end
diff --git a/ruby_1_8_6/test/soap/struct/test_struct.rb b/ruby_1_8_6/test/soap/struct/test_struct.rb
new file mode 100644
index 0000000000..d92f4bc18a
--- /dev/null
+++ b/ruby_1_8_6/test/soap/struct/test_struct.rb
@@ -0,0 +1,77 @@
+require 'test/unit'
+require 'soap/rpc/httpserver'
+require 'soap/rpc/driver'
+
+
+module SOAP; module Struct
+
+
+class TestStruct < Test::Unit::TestCase
+  Namespace = "urn:example.com:simpletype-rpc"
+  class Server < ::SOAP::RPC::HTTPServer
+    @@test_struct = ::Struct.new(:one, :two)
+
+    def on_init
+      add_method(self, 'a_method')
+    end
+  
+    def a_method
+      @@test_struct.new("string", 1)
+    end
+  end
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = Server.new(
+      :Port => Port,
+      :BindAddress => "0.0.0.0",
+      :AccessLog => [],
+      :SOAPDefaultNamespace => Namespace
+    )
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_client
+    @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/", Namespace)
+    @client.wiredump_dev = STDERR if $DEBUG
+    @client.add_method('a_method')
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def test_struct
+    assert_equal("string", @client.a_method.one)
+    assert_equal(1, @client.a_method.two)
+  end
+end
+
+
+end; end
diff --git a/ruby_1_8_6/test/soap/swa/test_file.rb b/ruby_1_8_6/test/soap/swa/test_file.rb
new file mode 100644
index 0000000000..1ec7aa92a7
--- /dev/null
+++ b/ruby_1_8_6/test/soap/swa/test_file.rb
@@ -0,0 +1,73 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'soap/rpc/standaloneServer'
+require 'soap/attachment'
+
+
+module SOAP
+module SWA
+
+
+class TestFile < Test::Unit::TestCase
+  Port = 17171
+  THIS_FILE = File.expand_path(__FILE__)
+
+  class SwAService
+    def get_file
+      return {
+     	'name' => $0,
+	'file' => SOAP::Attachment.new(File.open(THIS_FILE)) # closed when GCed.
+      }
+    end
+  
+    def put_file(name, file)
+      "File '#{name}' was received ok."
+    end
+  end
+
+  def setup
+    @server = SOAP::RPC::StandaloneServer.new('SwAServer',
+      'http://www.acmetron.com/soap', '0.0.0.0', Port)
+    @server.add_servant(SwAService.new)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      @server.start
+    }
+    @endpoint = "http://localhost:#{Port}/"
+    @client = SOAP::RPC::Driver.new(@endpoint, 'http://www.acmetron.com/soap')
+    @client.add_method('get_file')
+    @client.add_method('put_file', 'name', 'file')
+    @client.wiredump_dev = STDERR if $DEBUG
+  end
+
+  def teardown
+    @server.shutdown
+    @t.kill
+    @t.join
+    @client.reset_stream
+  end
+
+  def test_get_file
+    assert_equal(
+      File.open(THIS_FILE) { |f| f.read },
+      @client.get_file['file'].content
+    )
+  end
+
+  def test_put_file
+    assert_equal(
+      "File 'foo' was received ok.",
+      @client.put_file('foo',
+	SOAP::Attachment.new(File.open(THIS_FILE)))
+    )
+    assert_equal(
+      "File 'bar' was received ok.",
+      @client.put_file('bar',
+	SOAP::Attachment.new(File.open(THIS_FILE) { |f| f.read }))
+    )
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/soap/test_basetype.rb b/ruby_1_8_6/test/soap/test_basetype.rb
new file mode 100644
index 0000000000..3785873560
--- /dev/null
+++ b/ruby_1_8_6/test/soap/test_basetype.rb
@@ -0,0 +1,970 @@
+require 'test/unit'
+require 'soap/baseData'
+
+
+module SOAP
+
+
+class TestSOAP < Test::Unit::TestCase
+  NegativeZero = (-1.0 / (1.0 / 0.0))
+
+  def setup
+    # Nothing to do.
+  end
+
+  def teardown
+    # Nothing to do.
+  end
+
+  def assert_parsed_result(klass, str)
+    o = klass.new(str)
+    assert_equal(str, o.to_s)
+  end
+
+  def test_SOAPNil
+    o = SOAP::SOAPNil.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::NilLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    o = SOAP::SOAPNil.new(nil)
+    assert_equal(true, o.is_nil)
+    assert_equal(nil, o.data)
+    assert_equal("", o.to_s)
+    o = SOAP::SOAPNil.new('var')
+    assert_equal(false, o.is_nil)
+    assert_equal('var', o.data)
+    assert_equal('var', o.to_s)
+  end
+
+  def test_SOAPString
+    o = SOAP::SOAPString.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::StringLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    str = "abc"
+    assert_equal(str, SOAP::SOAPString.new(str).data)
+    assert_equal(str, SOAP::SOAPString.new(str).to_s)
+    assert_raises(XSD::ValueSpaceError) do
+      SOAP::SOAPString.new("\0")
+    end
+    assert_raises(XSD::ValueSpaceError) do
+      p SOAP::SOAPString.new("\xC0\xC0").to_s
+    end
+  end
+
+  def test_SOAPBoolean
+    o = SOAP::SOAPBoolean.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::BooleanLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      ["true", true],
+      ["1", true],
+      ["false", false],
+      ["0", false],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPBoolean.new(data).data)
+      assert_equal(expected.to_s, SOAP::SOAPBoolean.new(data).to_s)
+    end
+
+    assert_raises(XSD::ValueSpaceError) do
+      SOAP::SOAPBoolean.new("nil").to_s
+    end
+  end
+
+  def test_SOAPDecimal
+    o = SOAP::SOAPDecimal.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::DecimalLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      1000000000,
+      -9999999999,
+      12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
+      12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
+      -1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789,
+    ]
+    targets.each do |dec|
+      assert_equal(dec.to_s, SOAP::SOAPDecimal.new(dec).data)
+    end
+
+    targets = [
+      "0",
+      "0.00000001",
+      "1000000000",
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+      "-12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123.45678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789",
+    ]
+    targets.each do |str|
+      assert_equal(str, SOAP::SOAPDecimal.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["0.0", "0"],
+      ["-0.0", "0"],
+      ["+0.0", "0"],
+      ["0.", "0"],
+      [".0", "0"],
+      [
+	"+0.12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+	"0.1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+      ],
+      [
+	".0000012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+	"0.000001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+      ],
+      [
+	"-12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890.",
+	"-12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+      ],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPDecimal.new(data).to_s)
+    end
+
+    targets = [
+      "0.000000000000a",
+      "00a.0000000000001",
+      "+-5",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	SOAP::SOAPDecimal.new(d)
+      end
+    end
+  end
+
+  def test_SOAPFloat
+    o = SOAP::SOAPFloat.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::FloatLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      3.14159265358979,
+      12.34e36,
+      1.402e-45,
+      -1.402e-45,
+    ]
+    targets.each do |f|
+      assert_equal(f, SOAP::SOAPFloat.new(f).data)
+    end
+
+    targets = [
+      "+3.141592654",
+      "+1.234e+37",
+      "+1.402e-45",
+      "-1.402e-45",
+    ]
+    targets.each do |f|
+      assert_equal(f, SOAP::SOAPFloat.new(f).to_s)
+    end
+
+    targets = [
+      [3, "+3"], 	# should be 3.0?
+      [-2, "-2"],	# ditto
+      [3.14159265358979, "+3.141592654"],
+      [12.34e36, "+1.234e+37"],
+      [1.402e-45, "+1.402e-45"],
+      [-1.402e-45, "-1.402e-45"],
+      ["1.402e", "+1.402"],
+      ["12.34E36", "+1.234e+37"],
+      ["1.402E-45", "+1.402e-45"],
+      ["-1.402E-45", "-1.402e-45"],
+      ["1.402E", "+1.402"],
+    ]
+    targets.each do |f, str|
+      assert_equal(str, SOAP::SOAPFloat.new(f).to_s)
+    end
+
+    assert_equal("+0", SOAP::SOAPFloat.new(+0.0).to_s)
+    assert_equal("-0", SOAP::SOAPFloat.new(NegativeZero).to_s)
+    assert(SOAP::SOAPFloat.new(0.0/0.0).data.nan?)
+    assert_equal("INF", SOAP::SOAPFloat.new(1.0/0.0).to_s)
+    assert_equal(1, SOAP::SOAPFloat.new(1.0/0.0).data.infinite?)
+    assert_equal("-INF", SOAP::SOAPFloat.new(-1.0/0.0).to_s)
+    assert_equal(-1, SOAP::SOAPFloat.new(-1.0/0.0).data.infinite?)
+
+    targets = [
+      "0.000000000000a",
+      "00a.0000000000001",
+      "+-5",
+      "5_0",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	SOAP::SOAPFloat.new(d)
+      end
+    end
+  end
+
+  def test_SOAPDouble
+    o = SOAP::SOAPDouble.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::DoubleLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      3.14159265358979,
+      12.34e36,
+      1.402e-45,
+      -1.402e-45,
+    ]
+    targets.each do |f|
+      assert_equal(f, SOAP::SOAPDouble.new(f).data)
+    end
+
+    targets = [
+      "+3.14159265358979",
+      "+1.234e+37",
+      "+1.402e-45",
+      "-1.402e-45",
+    ]
+    targets.each do |f|
+      assert_equal(f, SOAP::SOAPDouble.new(f).to_s)
+    end
+
+    targets = [
+      [3, "+3"],	# should be 3.0?
+      [-2, "-2"],	# ditto.
+      [3.14159265358979, "+3.14159265358979"],
+      [12.34e36, "+1.234e+37"],
+      [1.402e-45, "+1.402e-45"],
+      [-1.402e-45, "-1.402e-45"],
+      ["1.402e", "+1.402"],
+      ["12.34E36", "+1.234e+37"],
+      ["1.402E-45", "+1.402e-45"],
+      ["-1.402E-45", "-1.402e-45"],
+      ["1.402E", "+1.402"],
+    ]
+    targets.each do |f, str|
+      assert_equal(str, SOAP::SOAPDouble.new(f).to_s)
+    end
+
+    assert_equal("+0", SOAP::SOAPFloat.new(+0.0).to_s)
+    assert_equal("-0", SOAP::SOAPFloat.new(NegativeZero).to_s)
+    assert_equal("NaN", SOAP::SOAPDouble.new(0.0/0.0).to_s)
+    assert(SOAP::SOAPDouble.new(0.0/0.0).data.nan?)
+    assert_equal("INF", SOAP::SOAPDouble.new(1.0/0.0).to_s)
+    assert_equal(1, SOAP::SOAPDouble.new(1.0/0.0).data.infinite?)
+    assert_equal("-INF", SOAP::SOAPDouble.new(-1.0/0.0).to_s)
+    assert_equal(-1, SOAP::SOAPDouble.new(-1.0/0.0).data.infinite?)
+
+    targets = [
+      "0.000000000000a",
+      "00a.0000000000001",
+      "+-5",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	SOAP::SOAPDouble.new(d)
+      end
+    end
+  end
+
+  def test_SOAPDuration
+    o = SOAP::SOAPDuration.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::DurationLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "P1Y2M3DT4H5M6S",
+      "P1234Y5678M9012DT3456H7890M1234.5678S",
+      "P0DT3456H7890M1234.5678S",
+      "P1234Y5678M9012D",
+      "-P1234Y5678M9012DT3456H7890M1234.5678S",
+      "P5678M9012DT3456H7890M1234.5678S",
+      "-P1234Y9012DT3456H7890M1234.5678S",
+      "+P1234Y5678MT3456H7890M1234.5678S",
+      "P1234Y5678M9012DT7890M1234.5678S",
+      "-P1234Y5678M9012DT3456H1234.5678S",
+      "+P1234Y5678M9012DT3456H7890M",
+      "P123400000000000Y",
+      "-P567800000000000M",
+      "+P901200000000000D",
+      "P0DT345600000000000H",
+      "-P0DT789000000000000M",
+      "+P0DT123400000000000.000000000005678S",
+      "P1234YT1234.5678S",
+      "-P5678MT7890M",
+      "+P9012DT3456H",
+    ]
+    targets.each do |str|
+      assert_parsed_result(SOAP::SOAPDuration, str)
+    end
+
+    targets = [
+      ["P0Y0M0DT0H0M0S",
+        "P0D"],
+      ["-P0DT0S",
+        "-P0D"],
+      ["P01234Y5678M9012DT3456H7890M1234.5678S",
+        "P1234Y5678M9012DT3456H7890M1234.5678S"],
+      ["P1234Y005678M9012DT3456H7890M1234.5678S",
+        "P1234Y5678M9012DT3456H7890M1234.5678S"],
+      ["P1234Y5678M0009012DT3456H7890M1234.5678S",
+        "P1234Y5678M9012DT3456H7890M1234.5678S"],
+      ["P1234Y5678M9012DT00003456H7890M1234.5678S",
+        "P1234Y5678M9012DT3456H7890M1234.5678S"],
+      ["P1234Y5678M9012DT3456H000007890M1234.5678S",
+        "P1234Y5678M9012DT3456H7890M1234.5678S"],
+      ["P1234Y5678M9012DT3456H7890M0000001234.5678S",
+        "P1234Y5678M9012DT3456H7890M1234.5678S"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPDuration.new(data).to_s)
+    end
+  end
+
+  def test_SOAPDateTime
+    o = SOAP::SOAPDateTime.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::DateTimeLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "2002-05-18T16:52:20Z",
+      "0001-01-01T00:00:00Z",
+      "9999-12-31T23:59:59Z",
+      "19999-12-31T23:59:59Z",
+      "2002-12-31T23:59:59.999Z",
+      "2002-12-31T23:59:59.001Z",
+      "2002-12-31T23:59:59.99999999999999999999Z",
+      "2002-12-31T23:59:59.00000000000000000001Z",
+      "2002-12-31T23:59:59+09:00",
+      "2002-12-31T23:59:59+00:01",
+      "2002-12-31T23:59:59-00:01",
+      "2002-12-31T23:59:59-23:59",
+      "2002-12-31T23:59:59.00000000000000000001+13:30",
+      "2002-12-31T23:59:59.51375Z",
+      "2002-12-31T23:59:59.51345+12:34",
+      "-2002-05-18T16:52:20Z",
+      "-4711-12-31T23:59:59Z",
+      "-4713-01-01T12:00:00Z",
+      "-19999-12-31T23:59:59Z",
+      "-2002-12-31T23:59:59+00:01",
+      "-0001-12-31T23:59:59.00000000000000000001+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(SOAP::SOAPDateTime, str)
+    end
+
+    targets = [
+      ["2002-12-31T23:59:59.00",
+	"2002-12-31T23:59:59Z"],
+      ["2002-12-31T23:59:59+00:00",
+	"2002-12-31T23:59:59Z"],
+      ["2002-12-31T23:59:59-00:00",
+	"2002-12-31T23:59:59Z"],
+      ["-2002-12-31T23:59:59.00",
+	"-2002-12-31T23:59:59Z"],
+      ["-2002-12-31T23:59:59+00:00",
+	"-2002-12-31T23:59:59Z"],
+      ["-2002-12-31T23:59:59-00:00",
+	"-2002-12-31T23:59:59Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPDateTime.new(data).to_s)
+      d = DateTime.parse(data)
+      d >>= 12 if d.year < 0    # XSDDateTime.year(-1) == DateTime.year(0)
+      assert_equal(expected, SOAP::SOAPDateTime.new(d).to_s)
+    end
+
+    targets = [
+      "1-05-18T16:52:20Z",
+      "05-18T16:52:20Z",
+      "2002-05T16:52:20Z",
+      "2002-05-18T16:52Z",
+      "",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError, d.to_s) do
+	SOAP::SOAPDateTime.new(d)
+      end
+    end
+  end
+
+  def test_SOAPTime
+    o = SOAP::SOAPTime.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::TimeLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "16:52:20Z",
+      "00:00:00Z",
+      "23:59:59Z",
+      "23:59:59.999Z",
+      "23:59:59.001Z",
+      "23:59:59.99999999999999999999Z",
+      "23:59:59.00000000000000000001Z",
+      "23:59:59+09:00",
+      "23:59:59+00:01",
+      "23:59:59-00:01",
+      "23:59:59-23:59",
+      "23:59:59.00000000000000000001+13:30",
+      "23:59:59.51375Z",
+      "23:59:59.51375+12:34",
+      "23:59:59+00:01",
+    ]
+    targets.each do |str|
+      assert_parsed_result(SOAP::SOAPTime, str)
+    end
+
+    targets = [
+      ["23:59:59.00",
+	"23:59:59Z"],
+      ["23:59:59+00:00",
+	"23:59:59Z"],
+      ["23:59:59-00:00",
+	"23:59:59Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPTime.new(data).to_s)
+    end
+  end
+
+  def test_SOAPDate
+    o = SOAP::SOAPDate.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::DateLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "2002-05-18Z",
+      "0001-01-01Z",
+      "9999-12-31Z",
+      "19999-12-31Z",
+      "2002-12-31+09:00",
+      "2002-12-31+00:01",
+      "2002-12-31-00:01",
+      "2002-12-31-23:59",
+      "2002-12-31+13:30",
+      "-2002-05-18Z",
+      "-19999-12-31Z",
+      "-2002-12-31+00:01",
+      "-0001-12-31+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(SOAP::SOAPDate, str)
+    end
+
+    targets = [
+      ["2002-12-31",
+	"2002-12-31Z"],
+      ["2002-12-31+00:00",
+	"2002-12-31Z"],
+      ["2002-12-31-00:00",
+	"2002-12-31Z"],
+      ["-2002-12-31",
+	"-2002-12-31Z"],
+      ["-2002-12-31+00:00",
+	"-2002-12-31Z"],
+      ["-2002-12-31-00:00",
+	"-2002-12-31Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPDate.new(data).to_s)
+      d = Date.parse(data)
+      d >>= 12 if d.year < 0    # XSDDate.year(-1) == Date.year(0)
+      assert_equal(expected, SOAP::SOAPDate.new(d).to_s)
+    end
+  end
+
+  def test_SOAPGYearMonth
+    o = SOAP::SOAPGYearMonth.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::GYearMonthLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "2002-05Z",
+      "0001-01Z",
+      "9999-12Z",
+      "19999-12Z",
+      "2002-12+09:00",
+      "2002-12+00:01",
+      "2002-12-00:01",
+      "2002-12-23:59",
+      "2002-12+13:30",
+      "-2002-05Z",
+      "-19999-12Z",
+      "-2002-12+00:01",
+      "-0001-12+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(SOAP::SOAPGYearMonth, str)
+    end
+
+    targets = [
+      ["2002-12",
+	"2002-12Z"],
+      ["2002-12+00:00",
+	"2002-12Z"],
+      ["2002-12-00:00",
+	"2002-12Z"],
+      ["-2002-12",
+	"-2002-12Z"],
+      ["-2002-12+00:00",
+	"-2002-12Z"],
+      ["-2002-12-00:00",
+	"-2002-12Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPGYearMonth.new(data).to_s)
+    end
+  end
+
+  def test_SOAPGYear
+    o = SOAP::SOAPGYear.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::GYearLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "2002Z",
+      "0001Z",
+      "9999Z",
+      "19999Z",
+      "2002+09:00",
+      "2002+00:01",
+      "2002-00:01",
+      "2002-23:59",
+      "2002+13:30",
+      "-2002Z",
+      "-19999Z",
+      "-2002+00:01",
+      "-0001+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(SOAP::SOAPGYear, str)
+    end
+
+    targets = [
+      ["2002",
+	"2002Z"],
+      ["2002+00:00",
+	"2002Z"],
+      ["2002-00:00",
+	"2002Z"],
+      ["-2002",
+	"-2002Z"],
+      ["-2002+00:00",
+	"-2002Z"],
+      ["-2002-00:00",
+	"-2002Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPGYear.new(data).to_s)
+    end
+  end
+
+  def test_SOAPGMonthDay
+    o = SOAP::SOAPGMonthDay.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::GMonthDayLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "05-18Z",
+      "01-01Z",
+      "12-31Z",
+      "12-31+09:00",
+      "12-31+00:01",
+      "12-31-00:01",
+      "12-31-23:59",
+      "12-31+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(SOAP::SOAPGMonthDay, str)
+    end
+
+    targets = [
+      ["12-31",
+	"12-31Z"],
+      ["12-31+00:00",
+	"12-31Z"],
+      ["12-31-00:00",
+	"12-31Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPGMonthDay.new(data).to_s)
+    end
+  end
+
+  def test_SOAPGDay
+    o = SOAP::SOAPGDay.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::GDayLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "18Z",
+      "01Z",
+      "31Z",
+      "31+09:00",
+      "31+00:01",
+      "31-00:01",
+      "31-23:59",
+      "31+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(SOAP::SOAPGDay, str)
+    end
+
+    targets = [
+      ["31",
+	"31Z"],
+      ["31+00:00",
+	"31Z"],
+      ["31-00:00",
+	"31Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPGDay.new(data).to_s)
+    end
+  end
+
+  def test_SOAPGMonth
+    o = SOAP::SOAPGMonth.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::GMonthLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "05Z",
+      "01Z",
+      "12Z",
+      "12+09:00",
+      "12+00:01",
+      "12-00:01",
+      "12-23:59",
+      "12+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(SOAP::SOAPGMonth, str)
+    end
+
+    targets = [
+      ["12",
+	"12Z"],
+      ["12+00:00",
+	"12Z"],
+      ["12-00:00",
+	"12Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPGMonth.new(data).to_s)
+    end
+  end
+
+  def test_SOAPHexBinary
+    o = SOAP::SOAPHexBinary.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::HexBinaryLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "abcdef",
+      "\xe3\x81\xaa\xe3\x81\xb2",
+      "\0",
+      "",
+    ]
+    targets.each do |str|
+      assert_equal(str, SOAP::SOAPHexBinary.new(str).string)
+      assert_equal(str.unpack("H*")[0].tr('a-f', 'A-F'),
+	SOAP::SOAPHexBinary.new(str).data)
+      o = SOAP::SOAPHexBinary.new
+      o.set_encoded(str.unpack("H*")[0].tr('a-f', 'A-F'))
+      assert_equal(str, o.string)
+      o.set_encoded(str.unpack("H*")[0].tr('A-F', 'a-f'))
+      assert_equal(str, o.string)
+    end
+
+    targets = [
+      "0FG7",
+      "0fg7",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError, d.to_s) do
+	o = SOAP::SOAPHexBinary.new
+	o.set_encoded(d)
+	p o.string
+      end
+    end
+  end
+
+  def test_SOAPBase64Binary
+    o = SOAP::SOAPBase64.new
+    assert_equal(SOAP::EncodingNamespace, o.type.namespace)
+    assert_equal(SOAP::Base64Literal, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "abcdef",
+      "\xe3\x81\xaa\xe3\x81\xb2",
+      "\0",
+      "",
+    ]
+    targets.each do |str|
+      assert_equal(str, SOAP::SOAPBase64.new(str).string)
+      assert_equal([str].pack("m").chomp, SOAP::SOAPBase64.new(str).data)
+      o = SOAP::SOAPBase64.new
+      o.set_encoded([str].pack("m").chomp)
+      assert_equal(str, o.string)
+    end
+
+    targets = [
+      "-",
+      "*",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError, d.to_s) do
+	o = SOAP::SOAPBase64.new
+	o.set_encoded(d)
+	p o.string
+      end
+    end
+  end
+
+  def test_SOAPAnyURI
+    o = SOAP::SOAPAnyURI.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::AnyURILiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    # Too few tests here I know.  Believe uri module. :)
+    targets = [
+      "foo",
+      "http://foo",
+      "http://foo/bar/baz",
+      "http://foo/bar#baz",
+      "http://foo/bar%20%20?a+b",
+      "HTTP://FOO/BAR%20%20?A+B",
+    ]
+    targets.each do |str|
+      assert_parsed_result(SOAP::SOAPAnyURI, str)
+    end
+  end
+
+  def test_SOAPQName
+    o = SOAP::SOAPQName.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::QNameLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    # More strict test is needed but current implementation allows all non-':'
+    # chars like ' ', C0 or C1...
+    targets = [
+      "foo",
+      "foo:bar",
+      "a:b",
+    ]
+    targets.each do |str|
+      assert_parsed_result(SOAP::SOAPQName, str)
+    end
+  end
+
+
+  ###
+  ## Derived types
+  #
+
+  def test_SOAPInteger
+    o = SOAP::SOAPInteger.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::IntegerLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      1000000000,
+      -9999999999,
+      12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
+      12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
+      -1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789,
+    ]
+    targets.each do |int|
+      assert_equal(int, SOAP::SOAPInteger.new(int).data)
+    end
+
+    targets = [
+      "0",
+      "1000000000",
+      "-9999999999",
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+      "-1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789",
+    ]
+    targets.each do |str|
+      assert_equal(str, SOAP::SOAPInteger.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      ["-000123", "-123"],
+      [
+	"+12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+	"12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+      ],
+   ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPInteger.new(data).to_s)
+    end
+
+    targets = [
+      "0.0",
+      "-5.2",
+      "0.000000000000a",
+      "+-5",
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890."
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	SOAP::SOAPInteger.new(d)
+      end
+    end
+  end
+
+  def test_SOAPLong
+    o = SOAP::SOAPLong.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::LongLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      123,
+      -123,
+      9223372036854775807,
+      -9223372036854775808,
+    ]
+    targets.each do |lng|
+      assert_equal(lng, SOAP::SOAPLong.new(lng).data)
+    end
+
+    targets = [
+      "0",
+      "123",
+      "-123",
+      "9223372036854775807",
+      "-9223372036854775808",
+    ]
+    targets.each do |str|
+      assert_equal(str, SOAP::SOAPLong.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      ["-000123", "-123"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPLong.new(data).to_s)
+    end
+
+    targets = [
+      9223372036854775808,
+      -9223372036854775809,
+      "0.0",
+      "-5.2",
+      "0.000000000000a",
+      "+-5",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	SOAP::SOAPLong.new(d)
+      end
+    end
+  end
+
+  def test_SOAPInt
+    o = SOAP::SOAPInt.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::IntLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      123,
+      -123,
+      2147483647,
+      -2147483648,
+    ]
+    targets.each do |lng|
+      assert_equal(lng, SOAP::SOAPInt.new(lng).data)
+    end
+
+    targets = [
+      "0",
+      "123",
+      "-123",
+      "2147483647",
+      "-2147483648",
+    ]
+    targets.each do |str|
+      assert_equal(str, SOAP::SOAPInt.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      ["-000123", "-123"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, SOAP::SOAPInt.new(data).to_s)
+    end
+
+    targets = [
+      2147483648,
+      -2147483649,
+      "0.0",
+      "-5.2",
+      "0.000000000000a",
+      "+-5",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	SOAP::SOAPInt.new(d)
+      end
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/soap/test_envelopenamespace.rb b/ruby_1_8_6/test/soap/test_envelopenamespace.rb
new file mode 100644
index 0000000000..5b7d281341
--- /dev/null
+++ b/ruby_1_8_6/test/soap/test_envelopenamespace.rb
@@ -0,0 +1,92 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'webrick'
+require 'logger'
+
+
+module SOAP
+
+
+class TestEnvelopeNamespace < Test::Unit::TestCase
+  Port = 17171
+  TemporaryNamespace = 'urn:foo'
+
+  def setup
+    @logger = Logger.new(STDERR)
+    @logger.level = Logger::Severity::ERROR
+    @url = "http://localhost:#{Port}/"
+    @server = @client = nil
+    @server_thread = nil
+    setup_server
+    setup_client
+  end
+
+  def teardown
+    teardown_client
+    teardown_server
+  end
+
+  def setup_server
+    @server = WEBrick::HTTPServer.new(
+      :BindAddress => "0.0.0.0",
+      :Logger => @logger,
+      :Port => Port,
+      :AccessLog => [],
+      :DocumentRoot => File.dirname(File.expand_path(__FILE__))
+    )
+    @server.mount(
+      '/',
+      WEBrick::HTTPServlet::ProcHandler.new(method(:do_server_proc).to_proc)
+    )
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_client
+    @client = SOAP::RPC::Driver.new(@url, '')
+    @client.add_method("do_server_proc")
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def do_server_proc(req, res)
+    res['content-type'] = 'text/xml'
+    res.body = <<__EOX__
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:env="#{TemporaryNamespace}">
+  <env:Body>
+    <n1:do_server_proc xmlns:n1="urn:foo" env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <return>hello world</return>
+    </n1:do_server_proc>
+  </env:Body>
+</env:Envelope>
+__EOX__
+  end
+
+  def test_normal
+    assert_raise(SOAP::ResponseFormatError) do
+      @client.do_server_proc
+    end
+    @client.options["soap.envelope.requestnamespace"] = TemporaryNamespace
+    @client.options["soap.envelope.responsenamespace"] = TemporaryNamespace
+    assert_equal('hello world', @client.do_server_proc)
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/soap/test_httpconfigloader.rb b/ruby_1_8_6/test/soap/test_httpconfigloader.rb
new file mode 100644
index 0000000000..b06243f661
--- /dev/null
+++ b/ruby_1_8_6/test/soap/test_httpconfigloader.rb
@@ -0,0 +1,39 @@
+require 'test/unit'
+require 'soap/httpconfigloader'
+require 'soap/rpc/driver'
+
+if defined?(HTTPAccess2)
+
+module SOAP
+
+
+class TestHTTPConfigLoader < Test::Unit::TestCase
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  def setup
+    @client = SOAP::RPC::Driver.new(nil, nil)
+  end
+
+  def test_property
+    testpropertyname = File.join(DIR, 'soapclient.properties')
+    File.open(testpropertyname, "w") do |f|
+      f <<<<__EOP__
+protocol.http.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_PEER
+# depth: 1 causes an error (intentional)
+protocol.http.ssl_config.verify_depth = 1
+protocol.http.ssl_config.ciphers = ALL
+__EOP__
+    end
+    begin
+      @client.loadproperty(testpropertyname)
+      assert_equal('ALL', @client.options['protocol.http.ssl_config.ciphers'])
+    ensure
+      File.unlink(testpropertyname)
+    end
+  end
+end
+
+
+end
+
+end
diff --git a/ruby_1_8_6/test/soap/test_mapping.rb b/ruby_1_8_6/test/soap/test_mapping.rb
new file mode 100644
index 0000000000..26222e6719
--- /dev/null
+++ b/ruby_1_8_6/test/soap/test_mapping.rb
@@ -0,0 +1,59 @@
+require 'test/unit'
+require 'soap/mapping'
+
+
+module SOAP
+
+
+class TestMapping < Test::Unit::TestCase
+  def test_date
+    targets = [
+      ["2002-12-31",
+	"2002-12-31Z"],
+      ["2002-12-31+00:00",
+	"2002-12-31Z"],
+      ["2002-12-31-00:00",
+	"2002-12-31Z"],
+      ["-2002-12-31",
+	"-2002-12-31Z"],
+      ["-2002-12-31+00:00",
+	"-2002-12-31Z"],
+      ["-2002-12-31-00:00",
+	"-2002-12-31Z"],
+    ]
+    targets.each do |str, expectec|
+      d = Date.parse(str)
+      assert_equal(d.class, convert(d).class)
+      assert_equal(d, convert(d))
+    end
+  end
+
+  def test_datetime
+    targets = [
+      ["2002-12-31T23:59:59.00",
+	"2002-12-31T23:59:59Z"],
+      ["2002-12-31T23:59:59+00:00",
+	"2002-12-31T23:59:59Z"],
+      ["2002-12-31T23:59:59-00:00",
+	"2002-12-31T23:59:59Z"],
+      ["-2002-12-31T23:59:59.00",
+	"-2002-12-31T23:59:59Z"],
+      ["-2002-12-31T23:59:59+00:00",
+	"-2002-12-31T23:59:59Z"],
+      ["-2002-12-31T23:59:59-00:00",
+	"-2002-12-31T23:59:59Z"],
+    ]
+    targets.each do |str, expectec|
+      d = DateTime.parse(str)
+      assert_equal(d.class, convert(d).class)
+      assert_equal(d, convert(d))
+    end
+  end
+
+  def convert(obj)
+    SOAP::Mapping.soap2obj(SOAP::Mapping.obj2soap(obj))
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/soap/test_no_indent.rb b/ruby_1_8_6/test/soap/test_no_indent.rb
new file mode 100644
index 0000000000..f49fb7389f
--- /dev/null
+++ b/ruby_1_8_6/test/soap/test_no_indent.rb
@@ -0,0 +1,86 @@
+require 'test/unit'
+require 'soap/rpc/standaloneServer'
+require 'soap/rpc/driver'
+
+if defined?(HTTPAccess2)
+
+module SOAP
+
+
+class TestNoIndent < Test::Unit::TestCase
+  Port = 17171
+
+  class NopServer < SOAP::RPC::StandaloneServer
+    def initialize(*arg)
+      super
+      add_rpc_method(self, 'nop')
+    end
+
+    def nop
+      SOAP::RPC::SOAPVoid.new
+    end
+  end
+
+  def setup
+    @server = NopServer.new(self.class.name, nil, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      @server.start
+    }
+    @endpoint = "http://localhost:#{Port}/"
+    @client = SOAP::RPC::Driver.new(@endpoint)
+    @client.add_rpc_method('nop')
+  end
+
+  def teardown
+    @server.shutdown
+    @t.kill
+    @t.join
+    @client.reset_stream
+  end
+
+  INDENT_XML =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <nop env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+    </nop>
+  </env:Body>
+</env:Envelope>]
+
+  NO_INDENT_XML =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<env:Body>
+<nop env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+</nop>
+</env:Body>
+</env:Envelope>]
+
+  def test_indent
+    @client.wiredump_dev = str = ''
+    @client.options["soap.envelope.no_indent"] = false
+    @client.nop
+    assert_equal(INDENT_XML, parse_requestxml(str))
+  end
+
+  def test_no_indent
+    @client.wiredump_dev = str = ''
+    @client.options["soap.envelope.no_indent"] = true
+    @client.nop
+    assert_equal(NO_INDENT_XML, parse_requestxml(str))
+  end
+
+  def parse_requestxml(str)
+    str.split(/\r?\n\r?\n/)[3]
+  end
+end
+
+
+end
+
+end
diff --git a/ruby_1_8_6/test/soap/test_property.rb b/ruby_1_8_6/test/soap/test_property.rb
new file mode 100644
index 0000000000..7acd2c8437
--- /dev/null
+++ b/ruby_1_8_6/test/soap/test_property.rb
@@ -0,0 +1,424 @@
+require 'test/unit'
+require 'soap/property'
+
+
+module SOAP
+
+
+class TestProperty < Test::Unit::TestCase
+  FrozenError = (RUBY_VERSION >= "1.9.0") ? RuntimeError : TypeError
+
+  def setup
+    @prop = ::SOAP::Property.new
+  end
+
+  def teardown
+    # Nothing to do.
+  end
+
+  def test_s_load
+    propstr = <<__EOP__
+
+# comment1
+
+# comment2\r
+# comment2
+
+\r
+a.b.0 = 1
+a.b.1 = 2
+a.b.2 = 3
+client.protocol.http.proxy=http://myproxy:8080   \r
+client.protocol.http.no_proxy:  intranet.example.com,local.example.com\r
+client.protocol.http.protocol_version = 1.0
+foo\\:bar\\=baz = qux
+foo\\\\.bar.baz=\tq\\\\ux\ttab
+  a\\ b                            =                          1   
+[ppp.qqq.rrr]
+sss = 3
+ttt.uuu = 4
+
+[ sss.ttt.uuu  ]
+vvv.www = 5
+[  ]
+xxx.yyy.zzz = 6
+__EOP__
+    prop = Property.load(propstr)
+    assert_equal(["1", "2", "3"], prop["a.b"].values.sort)
+    assert_equal("intranet.example.com,local.example.com",
+      prop["client.protocol.http.no_proxy"])
+    assert_equal("http://myproxy:8080", prop["client.protocol.http.proxy"])
+    assert_equal("1.0", prop["client.protocol.http.protocol_version"])
+    assert_equal("q\\ux\ttab", prop['foo\.bar.baz'])
+    assert_equal("1", prop['a b'])
+    assert_equal("3", prop['ppp.qqq.rrr.sss'])
+    assert_equal("4", prop['ppp.qqq.rrr.ttt.uuu'])
+    assert_equal("5", prop['sss.ttt.uuu.vvv.www'])
+    assert_equal("6", prop['xxx.yyy.zzz'])
+  end
+
+  def test_load
+    prop = Property.new
+    hooked = false
+    prop.add_hook("foo.bar.baz") do |name, value|
+      assert_equal(["foo", "bar", "baz"], name)
+      assert_equal("123", value)
+      hooked = true
+    end
+    prop.lock
+    prop["foo.bar"].lock
+    prop.load("foo.bar.baz = 123")
+    assert(hooked)
+    assert_raises(FrozenError) do
+      prop.load("foo.bar.qux = 123")
+    end
+    prop.load("foo.baz = 456")
+    assert_equal("456", prop["foo.baz"])
+  end
+
+  def test_initialize
+    prop = ::SOAP::Property.new
+    # store is empty
+    assert_nil(prop["a"])
+    # does hook work?
+    assert_equal(1, prop["a"] = 1)
+  end
+
+  def test_aref
+    # name_to_a
+    assert_nil(@prop[:foo])
+    assert_nil(@prop["foo"])
+    assert_nil(@prop[[:foo]])
+    assert_nil(@prop[["foo"]])
+    assert_raises(ArgumentError) do
+      @prop[1]
+    end
+    @prop[:foo] = :foo
+    assert_equal(:foo, @prop[:foo])
+    assert_equal(:foo, @prop["foo"])
+    assert_equal(:foo, @prop[[:foo]])
+    assert_equal(:foo, @prop[["foo"]])
+  end
+
+  def test_referent
+    # referent(1)
+    assert_nil(@prop["foo.foo"])
+    assert_nil(@prop[["foo", "foo"]])
+    assert_nil(@prop[["foo", :foo]])
+    @prop["foo.foo"] = :foo
+    assert_equal(:foo, @prop["foo.foo"])
+    assert_equal(:foo, @prop[["foo", "foo"]])
+    assert_equal(:foo, @prop[[:foo, "foo"]])
+    # referent(2)
+    @prop["bar.bar.bar"] = :bar
+    assert_equal(:bar, @prop["bar.bar.bar"])
+    assert_equal(:bar, @prop[["bar", "bar", "bar"]])
+    assert_equal(:bar, @prop[[:bar, "bar", :bar]])
+  end
+
+  def test_to_key_and_deref
+    @prop["foo.foo"] = :foo
+    assert_equal(:foo, @prop["fOo.FoO"])
+    assert_equal(:foo, @prop[[:fOO, :FOO]])
+    assert_equal(:foo, @prop[["FoO", :Foo]])
+    # deref_key negative test
+    assert_raises(ArgumentError) do
+      @prop["baz"] = 1
+      @prop["baz.qux"] = 2
+    end
+  end
+
+  def test_hook_name
+    tag = Object.new
+    tested = false
+    @prop.add_hook("foo.bar") do |key, value|
+      assert_raise(FrozenError) do
+	key << "baz"
+      end
+      tested = true
+    end
+    @prop["foo.bar"] = tag
+    assert(tested)
+  end
+
+  def test_value_hook
+    tag = Object.new
+    tested = false
+    @prop.add_hook("FOO.BAR.BAZ") do |key, value|
+      assert_equal(["Foo", "baR", "baZ"], key)
+      assert_equal(tag, value)
+      tested = true
+    end
+    @prop["Foo.baR.baZ"] = tag
+    assert_equal(tag, @prop["foo.bar.baz"])
+    assert(tested)
+    @prop["foo.bar"] = 1	# unhook the above block
+    assert_equal(1, @prop["foo.bar"])
+  end
+
+  def test_key_hook_no_cascade
+    tag = Object.new
+    tested = 0
+    @prop.add_hook do |key, value|
+      assert(false)
+    end
+    @prop.add_hook(false) do |key, value|
+      assert(false)
+    end
+    @prop.add_hook("foo") do |key, value|
+      assert(false)
+    end
+    @prop.add_hook("foo.bar", false) do |key, value|
+      assert(false)
+    end
+    @prop.add_hook("foo.bar.baz") do |key, value|
+      assert(false)
+    end
+    @prop.add_hook("foo.bar.baz.qux", false) do |key, value|
+      assert_equal(["foo", "bar", "baz", "qux"], key)
+      assert_equal(tag, value)
+      tested += 1
+    end
+    @prop["foo.bar.baz.qux"] = tag
+    assert_equal(tag, @prop["foo.bar.baz.qux"])
+    assert_equal(1, tested)
+  end
+
+  def test_key_hook_cascade
+    tag = Object.new
+    tested = 0
+    @prop.add_hook(true) do |key, value|
+      assert_equal(["foo", "bar", "baz", "qux"], key)
+      assert_equal(tag, value)
+      tested += 1
+    end
+    @prop.add_hook("foo", true) do |key, value|
+      assert_equal(["foo", "bar", "baz", "qux"], key)
+      assert_equal(tag, value)
+      tested += 1
+    end
+    @prop.add_hook("foo.bar", true) do |key, value|
+      assert_equal(["foo", "bar", "baz", "qux"], key)
+      assert_equal(tag, value)
+      tested += 1
+    end
+    @prop.add_hook("foo.bar.baz", true) do |key, value|
+      assert_equal(["foo", "bar", "baz", "qux"], key)
+      assert_equal(tag, value)
+      tested += 1
+    end
+    @prop.add_hook("foo.bar.baz.qux", true) do |key, value|
+      assert_equal(["foo", "bar", "baz", "qux"], key)
+      assert_equal(tag, value)
+      tested += 1
+    end
+    @prop["foo.bar.baz.qux"] = tag
+    assert_equal(tag, @prop["foo.bar.baz.qux"])
+    assert_equal(5, tested)
+  end
+
+  def test_keys
+    assert(@prop.keys.empty?)
+    @prop["foo"] = 1
+    @prop["bar"]
+    @prop["BAz"] = 2
+    assert_equal(2, @prop.keys.size)
+    assert(@prop.keys.member?("foo"))
+    assert(@prop.keys.member?("baz"))
+    #
+    assert_nil(@prop["a"])
+    @prop["a.a"] = 1
+    assert_instance_of(::SOAP::Property, @prop["a"])
+    @prop["a.b"] = 1
+    @prop["a.c"] = 1
+    assert_equal(3, @prop["a"].keys.size)
+    assert(@prop["a"].keys.member?("a"))
+    assert(@prop["a"].keys.member?("b"))
+    assert(@prop["a"].keys.member?("c"))
+  end
+
+  def test_lshift
+    assert(@prop.empty?)
+    @prop << 1
+    assert_equal([1], @prop.values)
+    assert_equal(1, @prop["0"])
+    @prop << 1
+    assert_equal([1, 1], @prop.values)
+    assert_equal(1, @prop["1"])
+    @prop << 1
+    assert_equal([1, 1, 1], @prop.values)
+    assert_equal(1, @prop["2"])
+    #
+    @prop["abc.def"] = o = SOAP::Property.new
+    tested = 0
+    o.add_hook do |k, v|
+      tested += 1
+    end
+    @prop["abc.def"] << 1
+    @prop["abc.def"] << 2
+    @prop["abc.def"] << 3
+    @prop["abc.def"] << 4
+    assert_equal(4, tested)
+  end
+
+  def test_lock_each
+    @prop["a.b.c.d.e"] = 1
+    @prop["a.b.d"] = branch = ::SOAP::Property.new
+    @prop["a.b.d.e.f"] = 2
+    @prop.lock
+    assert(@prop.locked?)
+    assert_instance_of(::SOAP::Property, @prop["a"])
+    assert_raises(FrozenError) do
+      @prop["b"]
+    end
+    #
+    @prop["a"].lock
+    assert_raises(FrozenError) do
+      @prop["a"]
+    end
+    assert_instance_of(::SOAP::Property, @prop["a.b"])
+    #
+    @prop["a.b"].lock
+    assert_raises(FrozenError) do
+      @prop["a.b"]
+    end
+    assert_raises(FrozenError) do
+      @prop["a"]
+    end
+    #
+    @prop["a.b.c.d"].lock
+    assert_instance_of(::SOAP::Property, @prop["a.b.c"])
+    assert_raises(FrozenError) do
+      @prop["a.b.c.d"]
+    end
+    assert_instance_of(::SOAP::Property, @prop["a.b.d"])
+    #
+    branch["e"].lock
+    assert_instance_of(::SOAP::Property, @prop["a.b.d"])
+    assert_raises(FrozenError) do
+      @prop["a.b.d.e"]
+    end
+    assert_raises(FrozenError) do
+      branch["e"]
+    end
+  end
+
+  def test_lock_cascade
+    @prop["a.a"] = nil
+    @prop["a.b.c"] = 1
+    @prop["b"] = false
+    @prop.lock(true)
+    assert(@prop.locked?)
+    assert_equal(nil, @prop["a.a"])
+    assert_equal(1, @prop["a.b.c"])
+    assert_equal(false, @prop["b"])
+    assert_raises(FrozenError) do
+      @prop["c"]
+    end
+    assert_raises(FrozenError) do
+      @prop["c"] = 2
+    end
+    assert_raises(FrozenError) do
+      @prop["a.b.R"]
+    end
+    assert_raises(FrozenError) do
+      @prop.add_hook do
+	assert(false)
+      end
+    end
+    assert_raises(FrozenError) do
+      @prop.add_hook("c") do
+	assert(false)
+      end
+    end
+    assert_raises(FrozenError) do
+      @prop.add_hook("a.c") do
+	assert(false)
+      end
+    end
+    assert_nil(@prop["a.a"])
+    @prop["a.a"] = 2
+    assert_equal(2, @prop["a.a"])
+    #
+    @prop.unlock(true)
+    assert_nil(@prop["c"])
+    @prop["c"] = 2
+    assert_equal(2, @prop["c"])
+    @prop["a.d.a.a"] = :foo
+    assert_equal(:foo, @prop["a.d.a.a"])
+    tested = false
+    @prop.add_hook("a.c") do |name, value|
+      assert(true)
+      tested = true
+    end
+    @prop["a.c"] = 3
+    assert(tested)
+  end
+
+  def test_hook_then_lock
+    tested = false
+    @prop.add_hook("a.b.c") do |name, value|
+      assert_equal(["a", "b", "c"], name)
+      tested = true
+    end
+    @prop["a.b"].lock
+    assert(!tested)
+    @prop["a.b.c"] = 5
+    assert(tested)
+    assert_equal(5, @prop["a.b.c"])
+    assert_raises(FrozenError) do
+      @prop["a.b.d"] = 5
+    end
+  end
+
+  def test_lock_unlock_return
+    assert_equal(@prop, @prop.lock)
+    assert_equal(@prop, @prop.unlock)
+  end
+
+  def test_lock_split
+    @prop["a.b.c"] = 1
+    assert_instance_of(::SOAP::Property, @prop["a.b"])
+    @prop["a.b.d"] = branch = ::SOAP::Property.new
+    @prop["a.b.d.e"] = 2
+    assert_equal(branch, @prop["a.b.d"])
+    assert_equal(branch, @prop[:a][:b][:d])
+    @prop.lock(true)
+    # split error 1
+    assert_raises(FrozenError) do
+      @prop["a.b"]
+    end
+    # split error 2
+    assert_raises(FrozenError) do
+      @prop["a"]
+    end
+    @prop["a.b.c"] = 2
+    assert_equal(2, @prop["a.b.c"])
+    # replace error
+    assert_raises(FrozenError) do
+      @prop["a.b.c"] = ::SOAP::Property.new
+    end
+    # override error
+    assert_raises(FrozenError) do
+      @prop["a.b"] = 1
+    end
+    #
+    assert_raises(FrozenError) do
+      @prop["a.b.d"] << 1
+    end
+    assert_raises(FrozenError) do
+      branch << 1
+    end
+    branch.unlock(true)
+    branch << 1
+    branch << 2
+    branch << 3
+    assert_equal(2, @prop["a.b.d.e"])
+    assert_equal(1, @prop["a.b.d.1"])
+    assert_equal(2, @prop["a.b.d.2"])
+    assert_equal(3, @prop["a.b.d.3"])
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/soap/test_soapelement.rb b/ruby_1_8_6/test/soap/test_soapelement.rb
new file mode 100644
index 0000000000..66e2a836a4
--- /dev/null
+++ b/ruby_1_8_6/test/soap/test_soapelement.rb
@@ -0,0 +1,122 @@
+require 'test/unit'
+require 'soap/baseData'
+require 'soap/mapping'
+
+
+module SOAP
+
+
+class TestSOAPElement < Test::Unit::TestCase
+  include SOAP
+
+  def setup
+    # Nothing to do.
+  end
+
+  def teardown
+    # Nothing to do.
+  end
+
+  def d(elename = nil, text = nil)
+    elename ||= n(nil, nil)
+    if text
+      SOAPElement.new(elename, text)
+    else
+      SOAPElement.new(elename)	# do not merge.
+    end
+  end
+
+  def n(namespace, name)
+    XSD::QName.new(namespace, name)
+  end
+
+  def test_initialize
+    elename = n(nil, nil)
+    obj = d(elename)
+    assert_equal(elename, obj.elename)
+    assert_equal(LiteralNamespace, obj.encodingstyle)
+    assert_equal({}, obj.extraattr)
+    assert_equal([], obj.precedents)
+    assert_equal(nil, obj.qualified)
+    assert_equal(nil, obj.text)
+    assert(obj.members.empty?)
+
+    obj = d("foo", "text")
+    assert_equal(n(nil, "foo"), obj.elename)
+    assert_equal("text", obj.text)
+  end
+
+  def test_add
+    obj = d()
+    child = d("abc")
+    obj.add(child)
+    assert(obj.key?("abc"))
+    assert_same(child, obj["abc"])
+    assert_same(child, obj.abc)
+    def obj.foo; 1; end
+    child = d("foo")
+    obj.add(child)
+    assert_equal(1, obj.foo)
+    assert_equal(child, obj.var_foo)
+    child = d("_?a?b_")
+    obj.add(child)
+    assert_equal(child, obj.__send__('_?a?b_'))
+  end
+
+  def test_member
+    obj = d()
+    c1 = d("c1")
+    obj.add(c1)
+    c2 = d("c2")
+    obj.add(c2)
+    assert(obj.key?("c1"))
+    assert(obj.key?("c2"))
+    assert_equal(c1, obj["c1"])
+    assert_equal(c2, obj["c2"])
+    c22 = d("c22")
+    obj["c2"] = c22
+    assert(obj.key?("c2"))
+    assert_equal(c22, obj["c2"])
+    assert_equal(["c1", "c2"], obj.members.sort)
+    #
+    k_expect = ["c1", "c2"]
+    v_expect = [c1, c22]
+    obj.each do |k, v|
+      assert(k_expect.include?(k))
+      assert(v_expect.include?(v))
+      k_expect.delete(k)
+      v_expect.delete(v)
+    end
+    assert(k_expect.empty?)
+    assert(v_expect.empty?)
+  end
+
+  def test_to_obj
+    obj = d("root")
+    ct1 = d("ct1", "t1")
+    obj.add(ct1)
+    c2 = d("c2")
+    ct2 = d("ct2", "t2")
+    c2.add(ct2)
+    obj.add(c2)
+    assert_equal({ "ct1" => "t1", "c2" => { "ct2" => "t2" }}, obj.to_obj) 
+    #
+    assert_equal(nil, d().to_obj)
+    assert_equal("abc", d(nil, "abc").to_obj)
+    assert_equal(nil, d("abc", nil).to_obj)
+  end
+
+  def test_from_obj
+    source = { "ct1" => "t1", "c2" => { "ct2" => "t2" }}
+    assert_equal(source, SOAPElement.from_obj(source).to_obj)
+    source = { "1" => nil }
+    assert_equal(source, SOAPElement.from_obj(source).to_obj)
+    source = {}
+    assert_equal(nil, SOAPElement.from_obj(source).to_obj)	# not {}
+    source = nil
+    assert_equal(nil, SOAPElement.from_obj(source).to_obj)
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/soap/test_streamhandler.rb b/ruby_1_8_6/test/soap/test_streamhandler.rb
new file mode 100644
index 0000000000..c31254513f
--- /dev/null
+++ b/ruby_1_8_6/test/soap/test_streamhandler.rb
@@ -0,0 +1,209 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'webrick'
+require 'webrick/httpproxy'
+require 'logger'
+
+
+module SOAP
+
+
+class TestStreamHandler < Test::Unit::TestCase
+  Port = 17171
+  ProxyPort = 17172
+
+  def setup
+    @logger = Logger.new(STDERR)
+    @logger.level = Logger::Severity::ERROR
+    @url = "http://localhost:#{Port}/"
+    @proxyurl = "http://localhost:#{ProxyPort}/"
+    @server = @proxyserver = @client = nil
+    @server_thread = @proxyserver_thread = nil
+    setup_server
+    setup_client
+  end
+
+  def teardown
+    teardown_client
+    teardown_proxyserver if @proxyserver
+    teardown_server
+  end
+
+  def setup_server
+    @server = WEBrick::HTTPServer.new(
+      :BindAddress => "0.0.0.0",
+      :Logger => @logger,
+      :Port => Port,
+      :AccessLog => [],
+      :DocumentRoot => File.dirname(File.expand_path(__FILE__))
+    )
+    @server.mount(
+      '/',
+      WEBrick::HTTPServlet::ProcHandler.new(method(:do_server_proc).to_proc)
+    )
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_proxyserver
+    @proxyserver = WEBrick::HTTPProxyServer.new(
+      :BindAddress => "0.0.0.0",
+      :Logger => @logger,
+      :Port => ProxyPort,
+      :AccessLog => []
+    )
+    @proxyserver_thread = start_server_thread(@proxyserver)
+  end
+
+  def setup_client
+    @client = SOAP::RPC::Driver.new(@url, '')
+    @client.add_method("do_server_proc")
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_proxyserver
+    @proxyserver.shutdown
+    @proxyserver_thread.kill
+    @proxyserver_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def do_server_proc(req, res)
+    res['content-type'] = 'text/xml'
+    res.body = <<__EOX__
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:do_server_proc xmlns:n1="urn:foo" env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <return xsi:nil="true"/>
+    </n1:do_server_proc>
+  </env:Body>
+</env:Envelope>
+__EOX__
+  end
+
+  def parse_req_header(str)
+    if ::SOAP::HTTPStreamHandler::Client.to_s == 'SOAP::NetHttpClient'
+      str = eval(str.split(/\r?\n/)[4][3..-1])
+    end
+    parse_req_header_http_access2(str)
+  end
+
+  def parse_req_header_http_access2(str)
+    headerp = false
+    headers = {}
+    req = nil
+    str.split(/(?:\r?\n)/).each do |line|
+      if headerp and /^$/ =~line
+	headerp = false
+	break
+      end
+      if headerp
+	k, v = line.scan(/^([^:]+):\s*(.*)$/)[0]
+	headers[k.downcase] = v
+      end
+      if /^POST/ =~ line
+	req = line
+	headerp = true
+      end
+    end
+    return req, headers
+  end
+
+  def test_normal
+    str = ""
+    @client.wiredump_dev = str
+    assert_nil(@client.do_server_proc)
+    r, h = parse_req_header(str)
+    assert_match(%r"POST / HTTP/1.", r)
+    assert(/^text\/xml;/ =~ h["content-type"])
+  end
+
+  def test_uri
+    # initialize client with URI object
+    @client = SOAP::RPC::Driver.new(URI.parse(@url), '')
+    @client.add_method("do_server_proc")
+    # same as test_normal
+    str = ""
+    @client.wiredump_dev = str
+    assert_nil(@client.do_server_proc)
+    r, h = parse_req_header(str)
+    assert_match(%r"POST / HTTP/1.", r)
+    assert(/^text\/xml;/ =~ h["content-type"])
+  end
+
+  def test_basic_auth
+    unless Object.const_defined?('HTTPAccess2')
+      # soap4r + net/http + basic_auth is not supported.
+      # use http-access2 instead.
+      assert(true)
+      return
+    end
+    str = ""
+    @client.wiredump_dev = str
+    @client.options["protocol.http.basic_auth"] << [@url, "foo", "bar"]
+    assert_nil(@client.do_server_proc)
+    r, h = parse_req_header(str)
+    assert_equal("Basic Zm9vOmJhcg==", h["authorization"])
+  end
+
+  def test_proxy
+    if Object.const_defined?('HTTPAccess2')
+      backup = HTTPAccess2::Client::NO_PROXY_HOSTS.dup
+      HTTPAccess2::Client::NO_PROXY_HOSTS.clear
+    else
+      backup = SOAP::NetHttpClient::NO_PROXY_HOSTS.dup
+      SOAP::NetHttpClient::NO_PROXY_HOSTS.clear
+    end
+    setup_proxyserver
+    str = ""
+    @client.wiredump_dev = str
+    @client.options["protocol.http.proxy"] = @proxyurl
+    assert_nil(@client.do_server_proc)
+    r, h = parse_req_header(str)
+    assert_match(%r"POST http://localhost:17171/ HTTP/1.", r)
+    # illegal proxy uri
+    assert_raise(ArgumentError) do
+      @client.options["protocol.http.proxy"] = 'ftp://foo:8080'
+    end
+  ensure
+    if Object.const_defined?('HTTPAccess2')
+      HTTPAccess2::Client::NO_PROXY_HOSTS.replace(backup)
+    else
+      SOAP::NetHttpClient::NO_PROXY_HOSTS.replace(backup)
+    end
+  end
+
+  def test_charset
+    str = ""
+    @client.wiredump_dev = str
+    @client.options["protocol.http.charset"] = "iso-8859-8"
+    assert_nil(@client.do_server_proc)
+    r, h = parse_req_header(str)
+    assert_equal("text/xml; charset=iso-8859-8", h["content-type"])
+    #
+    str.replace("")
+    @client.options["protocol.http.charset"] = "iso-8859-3"
+    assert_nil(@client.do_server_proc)
+    r, h = parse_req_header(str)
+    assert_equal("text/xml; charset=iso-8859-3", h["content-type"])
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/soap/test_styleuse.rb b/ruby_1_8_6/test/soap/test_styleuse.rb
new file mode 100644
index 0000000000..4ea321848d
--- /dev/null
+++ b/ruby_1_8_6/test/soap/test_styleuse.rb
@@ -0,0 +1,333 @@
+require 'test/unit'
+require 'soap/rpc/httpserver'
+require 'soap/rpc/driver'
+
+
+module SOAP
+
+
+class TestStyleUse < Test::Unit::TestCase
+  # rpc driver: obj in(Hash allowed for literal), obj out
+  # 
+  #   style: not visible from user
+  #     rpc: wrapped element
+  #     document: unwrappted element
+  #
+  #   use:
+  #     encoding: a graph (SOAP Data Model)
+  #     literal: not a graph (SOAPElement)
+  #
+  # rpc stub: obj in, obj out(Hash is allowed for literal)
+  #
+  #   style: not visible from user
+  #     rpc: wrapped element
+  #     document: unwrappted element
+  #
+  #   use:
+  #     encoding: a graph (SOAP Data Model)
+  #     literal: not a graph (SOAPElement)
+  #
+  # document driver: SOAPElement in, SOAPElement out? [not implemented]
+  #
+  #   style: ditto
+  #   use: ditto
+  #
+  #
+  # document stub: SOAPElement in, SOAPElement out? [not implemented]
+  #
+  #   style: ditto
+  #   use: ditto
+  #
+  class GenericServant
+    # method name style: requeststyle_requestuse_responsestyle_responseuse
+
+    # 2 params -> array
+    def rpc_enc_rpc_enc(obj1, obj2)
+      [obj1, [obj1, obj2]]
+    end
+
+    # 2 objs -> array
+    def rpc_lit_rpc_enc(obj1, obj2)
+      [obj2, obj1]
+    end
+
+    # 2 params -> 2 params
+    def rpc_enc_rpc_lit(obj1, obj2)
+      klass = [obj1.class.name, obj2.class.name]
+      [obj2, obj1]
+    end
+
+    # 2 objs -> 2 objs
+    def rpc_lit_rpc_lit(obj1, obj2)
+      [obj1, obj2]
+    end
+
+    # 2 params -> array
+    def doc_enc_doc_enc(obj1, obj2)
+      [obj1, [obj1, obj2]]
+    end
+
+    # 2 objs -> array
+    def doc_lit_doc_enc(obj1, obj2)
+      [obj2, obj1]
+    end
+
+    # 2 params -> 2 hashes
+    def doc_enc_doc_lit(obj1, obj2)
+      klass = [obj1.class.name, obj2.class.name]
+      return {'obj1' => {'klass' => klass}, 'misc' => 'hash does not have an order'},
+        {'obj2' => {'klass' => klass}}
+    end
+
+    # 2 objs -> 2 objs
+    def doc_lit_doc_lit(obj1, obj2)
+      return obj1, obj2
+    end
+  end
+
+  Namespace = "urn:styleuse"
+
+  module Op
+    def self.opt(request_style, request_use, response_style, response_use)
+      {
+        :request_style => request_style,
+        :request_use => request_use,
+        :response_style => response_style,
+        :response_use => response_use
+      }
+    end
+
+    Op_rpc_enc_rpc_enc = [
+      XSD::QName.new(Namespace, 'rpc_enc_rpc_enc'),
+      nil,
+      'rpc_enc_rpc_enc', [
+        ['in', 'obj1', nil],
+        ['in', 'obj2', nil],
+        ['retval', 'return', nil]],
+      opt(:rpc, :encoded, :rpc, :encoded)
+    ]
+
+    Op_rpc_lit_rpc_enc = [
+      XSD::QName.new(Namespace, 'rpc_lit_rpc_enc'),
+      nil,
+      'rpc_lit_rpc_enc', [
+        ['in', 'obj1', nil],
+        ['in', 'obj2', nil],
+        ['retval', 'return', nil]],
+      opt(:rpc, :literal, :rpc, :encoded)
+    ]
+
+    Op_rpc_enc_rpc_lit = [
+      XSD::QName.new(Namespace, 'rpc_enc_rpc_lit'),
+      nil,
+      'rpc_enc_rpc_lit', [
+        ['in', 'obj1', nil],
+        ['in', 'obj2', nil],
+        ['retval', 'ret1', nil],
+        ['out', 'ret2', nil]],
+      opt(:rpc, :encoded, :rpc, :literal)
+    ]
+
+    Op_rpc_lit_rpc_lit = [
+      XSD::QName.new(Namespace, 'rpc_lit_rpc_lit'),
+      nil,
+      'rpc_lit_rpc_lit', [
+        ['in', 'obj1', nil],
+        ['in', 'obj2', nil],
+        ['retval', 'ret1', nil],
+        ['out', 'ret2', nil]],
+      opt(:rpc, :literal, :rpc, :literal)
+    ]
+
+    Op_doc_enc_doc_enc = [
+      Namespace + 'doc_enc_doc_enc',
+      'doc_enc_doc_enc', [
+        ['in', 'obj1', [nil, Namespace, 'obj1']],
+        ['in', 'obj2', [nil, Namespace, 'obj2']],
+        ['out', 'ret1', [nil, Namespace, 'ret1']],
+        ['out', 'ret2', [nil, Namespace, 'ret2']]],
+      opt(:document, :encoded, :document, :encoded)
+    ]
+
+    Op_doc_lit_doc_enc = [
+      Namespace + 'doc_lit_doc_enc',
+      'doc_lit_doc_enc', [
+        ['in', 'obj1', [nil, Namespace, 'obj1']],
+        ['in', 'obj2', [nil, Namespace, 'obj2']],
+        ['out', 'ret1', [nil, Namespace, 'ret1']],
+        ['out', 'ret2', [nil, Namespace, 'ret2']]],
+      opt(:document, :literal, :document, :encoded)
+    ]
+
+    Op_doc_enc_doc_lit = [
+      Namespace + 'doc_enc_doc_lit',
+      'doc_enc_doc_lit', [
+        ['in', 'obj1', [nil, Namespace, 'obj1']],
+        ['in', 'obj2', [nil, Namespace, 'obj2']],
+        ['out', 'ret1', [nil, Namespace, 'ret1']],
+        ['out', 'ret2', [nil, Namespace, 'ret2']]],
+      opt(:document, :encoded, :document, :literal)
+    ]
+
+    Op_doc_lit_doc_lit = [
+      Namespace + 'doc_lit_doc_lit',
+      'doc_lit_doc_lit', [
+        ['in', 'obj1', [nil, Namespace, 'obj1']],
+        ['in', 'obj2', [nil, Namespace, 'obj2']],
+        ['out', 'ret1', [nil, Namespace, 'ret1']],
+        ['out', 'ret2', [nil, Namespace, 'ret2']]],
+      opt(:document, :literal, :document, :literal)
+    ]
+  end
+
+  include Op
+
+  class Server < ::SOAP::RPC::HTTPServer
+    include Op
+
+    def on_init
+      @servant = GenericServant.new
+      add_rpc_operation(@servant, *Op_rpc_enc_rpc_enc)
+      add_rpc_operation(@servant, *Op_rpc_lit_rpc_enc)
+      add_rpc_operation(@servant, *Op_rpc_enc_rpc_lit)
+      add_rpc_operation(@servant, *Op_rpc_lit_rpc_lit)
+      add_document_operation(@servant, *Op_doc_enc_doc_enc)
+      add_document_operation(@servant, *Op_doc_lit_doc_enc)
+      add_document_operation(@servant, *Op_doc_enc_doc_lit)
+      add_document_operation(@servant, *Op_doc_lit_doc_lit)
+    end
+  end
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = Server.new(
+      :BindAddress => "0.0.0.0",
+      :Port => Port,
+      :AccessLog => [],
+      :SOAPDefaultNamespace => Namespace
+    )
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_client
+    @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/", Namespace)
+    @client.wiredump_dev = STDERR if $DEBUG
+    @client.add_rpc_operation(*Op_rpc_enc_rpc_enc)
+    @client.add_rpc_operation(*Op_rpc_lit_rpc_enc)
+    @client.add_rpc_operation(*Op_rpc_enc_rpc_lit)
+    @client.add_rpc_operation(*Op_rpc_lit_rpc_lit)
+    @client.add_document_operation(*Op_doc_enc_doc_enc)
+    @client.add_document_operation(*Op_doc_lit_doc_enc)
+    @client.add_document_operation(*Op_doc_enc_doc_lit)
+    @client.add_document_operation(*Op_doc_lit_doc_lit)
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def test_rpc_enc_rpc_enc
+    o = "hello"
+    obj1 = o
+    obj2 = [1]
+    ret = @client.rpc_enc_rpc_enc(obj1, obj2)
+    # server returns [obj1, [obj1, obj2]]
+    assert_equal([obj1, [obj1, obj2]], ret)
+    assert_same(ret[0], ret[1][0])
+  end
+
+  S1 = ::Struct.new(:a)
+  S2 = ::Struct.new(:c)
+  def test_rpc_lit_rpc_enc
+    ret1, ret2 = @client.rpc_lit_rpc_enc(S1.new('b'), S2.new('d'))
+    assert_equal('d', ret1.c)
+    assert_equal('b', ret2.a)
+    # Hash is allowed for literal
+    ret1, ret2 = @client.rpc_lit_rpc_enc({'a' => 'b'}, {'c' => 'd'})
+    assert_equal('d', ret1.c)
+    assert_equal('b', ret2.a)
+    # simple value
+    assert_equal(
+      ['1', 'a'],
+      @client.rpc_lit_rpc_enc('a', 1)
+    )
+  end
+
+  def test_rpc_enc_rpc_lit
+    assert_equal(
+      ['1', 'a'],
+      @client.rpc_enc_rpc_lit('a', '1')
+    )
+  end
+
+  def test_rpc_lit_rpc_lit
+    ret1, ret2 = @client.rpc_lit_rpc_lit({'a' => 'b'}, {'c' => 'd'})
+    assert_equal('b', ret1["a"])
+    assert_equal('d', ret2["c"])
+  end
+
+  def test_doc_enc_doc_enc
+    o = "hello"
+    obj1 = o
+    obj2 = [1]
+    ret = @client.rpc_enc_rpc_enc(obj1, obj2)
+    # server returns [obj1, [obj1, obj2]]
+    assert_equal([obj1, [obj1, obj2]], ret)
+    assert_same(ret[0], ret[1][0])
+  end
+
+  def test_doc_lit_doc_enc
+    ret1, ret2 = @client.doc_lit_doc_enc({'a' => 'b'}, {'c' => 'd'})
+    assert_equal('d', ret1.c)
+    assert_equal('b', ret2.a)
+    assert_equal(
+      ['a', '1'],
+      @client.doc_lit_doc_enc(1, 'a')
+    )
+  end
+
+  def test_doc_enc_doc_lit
+    ret1, ret2 = @client.doc_enc_doc_lit('a', 1)
+    # literal Array
+    assert_equal(['String', 'Fixnum'], ret1['obj1']['klass'])
+    # same value
+    assert_equal(ret1['obj1']['klass'], ret2['obj2']['klass'])
+    # not the same object (not encoded)
+    assert_not_same(ret1['obj1']['klass'], ret2['obj2']['klass'])
+  end
+
+  def test_doc_lit_doc_lit
+    ret1, ret2 = @client.doc_lit_doc_lit({'a' => 'b'}, {'c' => 'd'})
+    assert_equal('b', ret1["a"])
+    assert_equal('d', ret2["c"])
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/soap/wsdlDriver/README.txt b/ruby_1_8_6/test/soap/wsdlDriver/README.txt
new file mode 100644
index 0000000000..b4d45a0486
--- /dev/null
+++ b/ruby_1_8_6/test/soap/wsdlDriver/README.txt
@@ -0,0 +1,2 @@
+echo_version.rb is generated by wsdl2ruby.rb;
+% wsdl2ruby.rb --wsdl simpletype.wsdl --classdef --force
diff --git a/ruby_1_8_6/test/soap/wsdlDriver/calc.wsdl b/ruby_1_8_6/test/soap/wsdlDriver/calc.wsdl
new file mode 100644
index 0000000000..694a01e87e
--- /dev/null
+++ b/ruby_1_8_6/test/soap/wsdlDriver/calc.wsdl
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--generated by GLUE Standard 4.0.1 on Wed Mar 09 10:20:07 GMT-08:00
+2005-->
+<wsdl:definitions name='Calculator'
+targetNamespace='http://www.themindelectric.com/wsdl/Calculator/'
+    xmlns:tns='http://www.themindelectric.com/wsdl/Calculator/'
+    xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+    xmlns:http='http://schemas.xmlsoap.org/wsdl/http/'
+    xmlns:mime='http://schemas.xmlsoap.org/wsdl/mime/'
+    xmlns:xsd='http://www.w3.org/2001/XMLSchema'
+    xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/'
+    xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'
+    xmlns:tme='http://www.themindelectric.com/'>
+    <wsdl:message name='add0In'>
+        <wsdl:part name='x' type='xsd:float'/>
+        <wsdl:part name='y' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='add0Out'>
+        <wsdl:part name='Result' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='divide1In'>
+        <wsdl:part name='numerator' type='xsd:float'/>
+        <wsdl:part name='denominator' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='divide1Out'>
+        <wsdl:part name='Result' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='multiply2In'>
+        <wsdl:part name='x' type='xsd:float'/>
+        <wsdl:part name='y' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='multiply2Out'>
+        <wsdl:part name='Result' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='subtract3In'>
+        <wsdl:part name='x' type='xsd:float'/>
+        <wsdl:part name='y' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:message name='subtract3Out'>
+        <wsdl:part name='Result' type='xsd:float'/>
+    </wsdl:message>
+    <wsdl:portType name='ICalculator'>
+        <wsdl:operation name='add' parameterOrder='x y'>
+            <wsdl:input name='add0In' message='tns:add0In'/>
+            <wsdl:output name='add0Out' message='tns:add0Out'/>
+        </wsdl:operation>
+        <wsdl:operation name='divide' parameterOrder='numerator
+denominator'>
+            <wsdl:input name='divide1In' message='tns:divide1In'/>
+            <wsdl:output name='divide1Out' message='tns:divide1Out'/>
+        </wsdl:operation>
+        <wsdl:operation name='multiply' parameterOrder='x y'>
+            <wsdl:input name='multiply2In' message='tns:multiply2In'/>
+            <wsdl:output name='multiply2Out'
+message='tns:multiply2Out'/>
+        </wsdl:operation>
+        <wsdl:operation name='subtract' parameterOrder='x y'>
+            <wsdl:input name='subtract3In' message='tns:subtract3In'/>
+            <wsdl:output name='subtract3Out'
+message='tns:subtract3Out'/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name='ICalculator' type='tns:ICalculator'>
+        <soap:binding style='rpc'
+transport='http://schemas.xmlsoap.org/soap/http'/>
+        <wsdl:operation name='add'>
+            <soap:operation soapAction='add' style='rpc'/>
+            <wsdl:input name='add0In'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:input>
+            <wsdl:output name='add0Out'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name='divide'>
+            <soap:operation soapAction='divide' style='rpc'/>
+            <wsdl:input name='divide1In'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:input>
+            <wsdl:output name='divide1Out'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name='multiply'>
+            <soap:operation soapAction='multiply' style='rpc'/>
+            <wsdl:input name='multiply2In'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:input>
+            <wsdl:output name='multiply2Out'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name='subtract'>
+            <soap:operation soapAction='subtract' style='rpc'/>
+            <wsdl:input name='subtract3In'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:input>
+            <wsdl:output name='subtract3Out'>
+                <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name='Calculator'>
+        <wsdl:documentation>calculator service</wsdl:documentation>
+        <wsdl:port name='ICalculator' binding='tns:ICalculator'>
+            <soap:address
+location='http://ukulele:8080/calcapp/services/calculator'/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/ruby_1_8_6/test/soap/wsdlDriver/document.wsdl b/ruby_1_8_6/test/soap/wsdlDriver/document.wsdl
new file mode 100644
index 0000000000..5e9e74b9df
--- /dev/null
+++ b/ruby_1_8_6/test/soap/wsdlDriver/document.wsdl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name="submit_service"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:tns="urn:example.com:document"
+    targetNamespace="urn:example.com:document"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema targetNamespace="urn:example.com:document">
+      <xsd:element name="ruby">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element minOccurs="1" maxOccurs="1" name="myversion" type="tns:myversion"/>
+            <xsd:element minOccurs="0" maxOccurs="1" name="date" type="xsd:dateTime"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:simpleType name="myversion">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="1.6"/>
+          <xsd:enumeration value="1.8"/>
+          <xsd:enumeration value="1.9"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:schema>
+  </types>
+
+  <message name="submit_msg">
+    <part name="parameters" element="tns:ruby"/>
+  </message>
+
+  <portType name="submit_port_type">
+    <operation name="submit">
+      <input message="tns:submit_msg"/>
+      <output message="tns:submit_msg"/>
+    </operation>
+  </portType>
+
+  <binding name="submit_binding" type="tns:submit_port_type">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <operation name="submit">
+      <soap:operation soapAction="urn:example.com:document#submit" style="document"/>
+      <input><soap:body use="literal"/></input>
+      <output><soap:body use="literal"/></output>
+    </operation>
+  </binding>
+
+  <service name="submit_service">
+    <port name="submit_port" binding="tns:submit_binding">
+      <soap:address location="http://localhost:10080"/>
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/soap/wsdlDriver/echo_version.rb b/ruby_1_8_6/test/soap/wsdlDriver/echo_version.rb
new file mode 100644
index 0000000000..7d76fb7587
--- /dev/null
+++ b/ruby_1_8_6/test/soap/wsdlDriver/echo_version.rb
@@ -0,0 +1,20 @@
+# urn:example.com:simpletype-rpc-type
+class Version_struct
+  @@schema_type = "version_struct"
+  @@schema_ns = "urn:example.com:simpletype-rpc-type"
+
+  attr_accessor :version
+  attr_accessor :msg
+
+  def initialize(version = nil, msg = nil)
+    @version = version
+    @msg = msg
+  end
+end
+
+# urn:example.com:simpletype-rpc-type
+module Versions
+  C_16 = "1.6"
+  C_18 = "1.8"
+  C_19 = "1.9"
+end
diff --git a/ruby_1_8_6/test/soap/wsdlDriver/simpletype.wsdl b/ruby_1_8_6/test/soap/wsdlDriver/simpletype.wsdl
new file mode 100644
index 0000000000..6781dda552
--- /dev/null
+++ b/ruby_1_8_6/test/soap/wsdlDriver/simpletype.wsdl
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name="echo_version"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:tns="urn:example.com:simpletype-rpc"
+    xmlns:txd="urn:example.com:simpletype-rpc-type"
+    targetNamespace="urn:example.com:simpletype-rpc"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema targetNamespace="urn:example.com:simpletype-rpc-type">
+      <xsd:complexType name="version_struct">
+	<xsd:all>
+	  <xsd:element name="myversion" type="txd:myversions" />
+	  <xsd:element name="msg" type="xsd:string" />
+	</xsd:all>
+      </xsd:complexType>
+
+      <xsd:simpleType name="myversions">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="1.6"/>
+          <xsd:enumeration value="1.8"/>
+          <xsd:enumeration value="1.9"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:schema>
+  </types>
+
+  <message name="msg_version">
+    <part name="myversion" type="txd:myversions"/>
+  </message>
+
+  <message name="msg_version_struct">
+    <part name="return" type="txd:version_struct"/>
+  </message>
+
+  <portType name="echo_version_port_type">
+    <operation name="echo_version">
+      <input message="tns:msg_version"/>
+      <output message="tns:msg_version_struct"/>
+    </operation>
+  </portType>
+
+  <binding name="echo_version_binding" type="tns:echo_version_port_type">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+    <operation name="echo_version">
+      <soap:operation soapAction="urn:example.com:simpletype-rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="urn:example.com:simpletype-rpc"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="urn:example.com:simpletype-rpc"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+  </binding>
+
+  <service name="echo_version_service">
+    <port name="echo_version_port" binding="tns:echo_version_binding">
+      <soap:address location="http://localhost:10080"/>
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/soap/wsdlDriver/test_calc.rb b/ruby_1_8_6/test/soap/wsdlDriver/test_calc.rb
new file mode 100644
index 0000000000..d031f663a3
--- /dev/null
+++ b/ruby_1_8_6/test/soap/wsdlDriver/test_calc.rb
@@ -0,0 +1,100 @@
+require 'test/unit'
+require 'soap/rpc/httpserver'
+require 'soap/wsdlDriver'
+
+
+module SOAP
+
+
+class TestCalc < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::HTTPServer
+    def on_init
+      add_method(self, 'add', 'x', 'y')
+    end
+  
+    def add(x, y)
+      x.to_f + y.to_f
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = Server.new(
+      :BindAddress => "0.0.0.0",
+      :Port => Port,
+      :AccessLog => [],
+      :SOAPDefaultNamespace => 'http://www.fred.com'
+    )
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_client
+    @wsdl = File.join(DIR, 'calc.wsdl')
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream if @client
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def test_rpc_driver
+    @client = ::SOAP::WSDLDriverFactory.new(@wsdl).create_rpc_driver
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.generate_explicit_type = true
+    assert_equal(0.3, @client.add(0.1, 0.2))
+    @client.generate_explicit_type = false
+    assert_equal(0.3, @client.add(0.1, 0.2))
+  end
+
+  def test_old_driver
+    silent do
+      @client = ::SOAP::WSDLDriverFactory.new(@wsdl).create_driver
+    end
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.generate_explicit_type = true
+    assert_equal(0.3, @client.add(0.1, 0.2))
+    @client.generate_explicit_type = false
+    assert_equal(0.3, @client.add(0.1, 0.2))
+  end
+
+  def silent
+    back = $VERBOSE
+    $VERBOSE = nil
+    begin
+      yield
+    ensure
+      $VERBOSE = back
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/soap/wsdlDriver/test_document.rb b/ruby_1_8_6/test/soap/wsdlDriver/test_document.rb
new file mode 100644
index 0000000000..634b827aae
--- /dev/null
+++ b/ruby_1_8_6/test/soap/wsdlDriver/test_document.rb
@@ -0,0 +1,78 @@
+require 'test/unit'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+
+
+module SOAP
+
+
+class TestDocument < Test::Unit::TestCase
+  Namespace = 'urn:example.com:document'
+
+  class Server < ::SOAP::RPC::StandaloneServer
+    def on_init
+      add_document_method(self, 'urn:example.com:document#submit', 'submit', XSD::QName.new(Namespace, 'ruby'), XSD::QName.new(Namespace, 'ruby'))
+    end
+  
+    def submit(ruby)
+      ruby
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = Server.new('Test', Namespace, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_client
+    wsdl = File.join(DIR, 'document.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def test_document
+    msg = {'myversion' => "1.9", 'date' => "2004-01-01T00:00:00Z"}
+    reply_msg = @client.submit(msg)
+    assert_equal('1.9', reply_msg.myversion)
+    assert_equal('1.9', reply_msg['myversion'])
+    assert_equal('2004-01-01T00:00:00Z', reply_msg.date)
+    assert_equal('2004-01-01T00:00:00Z', reply_msg['date'])
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/soap/wsdlDriver/test_simpletype.rb b/ruby_1_8_6/test/soap/wsdlDriver/test_simpletype.rb
new file mode 100644
index 0000000000..76b3a32df7
--- /dev/null
+++ b/ruby_1_8_6/test/soap/wsdlDriver/test_simpletype.rb
@@ -0,0 +1,87 @@
+require 'test/unit'
+require 'soap/rpc/httpserver'
+require 'soap/wsdlDriver'
+
+
+module SOAP
+
+
+class TestSimpleType < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::HTTPServer
+    def on_init
+      add_method(self, 'echo_version', 'version')
+    end
+  
+    def echo_version(version)
+      # "2.0" is out of range.
+      Version_struct.new(version || "2.0", 'checked')
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+  require File.join(DIR, 'echo_version')
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = Server.new(
+      :BindAddress => "0.0.0.0",
+      :Port => Port,
+      :AccessLog => [],
+      :SOAPDefaultNamespace => "urn:example.com:simpletype-rpc"
+    )
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_client
+    wsdl = File.join(DIR, 'simpletype.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.generate_explicit_type = false
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def test_ping
+    result = @client.echo_version("1.9")
+    assert_equal("1.9", result.version)
+    assert_equal("checked", result.msg)
+    assert_raise(XSD::ValueSpaceError) do
+      @client.echo_version("2.0")
+    end
+    assert_raise(XSD::ValueSpaceError) do
+      @client.echo_version(nil) # nil => "2.0" => out of range
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/socket/test_nonblock.rb b/ruby_1_8_6/test/socket/test_nonblock.rb
new file mode 100644
index 0000000000..ed6487b49f
--- /dev/null
+++ b/ruby_1_8_6/test/socket/test_nonblock.rb
@@ -0,0 +1,179 @@
+begin
+  require "socket"
+rescue LoadError
+end
+
+require "test/unit"
+require "tempfile"
+require "timeout"
+
+class TestNonblockSocket < Test::Unit::TestCase
+  def test_accept_nonblock
+    serv = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+    serv.bind(Socket.sockaddr_in(0, "127.0.0.1"))
+    serv.listen(5)
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { serv.accept_nonblock }
+    c = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+    c.connect(serv.getsockname)
+    s, sockaddr = serv.accept_nonblock
+    assert_equal(Socket.unpack_sockaddr_in(c.getsockname), Socket.unpack_sockaddr_in(sockaddr))
+  ensure
+    serv.close if serv
+    c.close if c
+    s.close if s
+  end
+
+  def test_connect_nonblock
+    serv = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+    serv.bind(Socket.sockaddr_in(0, "127.0.0.1"))
+    serv.listen(5)
+    c = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+    servaddr = serv.getsockname
+    begin
+      c.connect_nonblock(servaddr)
+    rescue Errno::EINPROGRESS
+      IO.select nil, [c]
+      assert_nothing_raised {
+        begin
+          c.connect_nonblock(servaddr)
+        rescue Errno::EISCONN
+        end
+      }
+    end
+    s, sockaddr = serv.accept
+    assert_equal(Socket.unpack_sockaddr_in(c.getsockname), Socket.unpack_sockaddr_in(sockaddr))
+  ensure
+    serv.close if serv
+    c.close if c
+    s.close if s
+  end
+
+  def test_udp_recvfrom_nonblock
+    u1 = UDPSocket.new
+    u2 = UDPSocket.new
+    u1.bind("127.0.0.1", 0)
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { u1.recvfrom_nonblock(100) }
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::EINVAL) { u2.recvfrom_nonblock(100) }
+    u2.send("aaa", 0, u1.getsockname)
+    IO.select [u1]
+    mesg, inet_addr = u1.recvfrom_nonblock(100)
+    assert_equal(4, inet_addr.length)
+    assert_equal("aaa", mesg)
+    af, port, host, addr = inet_addr
+    u2_port, u2_addr = Socket.unpack_sockaddr_in(u2.getsockname)
+    assert_equal(u2_port, port)
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { u1.recvfrom_nonblock(100) }
+    u2.send("", 0, u1.getsockname)
+    assert_nothing_raised("cygwin 1.5.19 has a problem to send an empty UDP packet. [ruby-dev:28915]") {
+      timeout(1) { IO.select [u1] }
+    }
+    mesg, inet_addr = u1.recvfrom_nonblock(100)
+    assert_equal("", mesg)
+  ensure
+    u1.close if u1
+    u2.close if u2
+  end
+
+  def test_udp_recv_nonblock
+    u1 = UDPSocket.new
+    u2 = UDPSocket.new
+    u1.bind("127.0.0.1", 0)
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { u1.recv_nonblock(100) }
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::EINVAL) { u2.recv_nonblock(100) }
+    u2.send("aaa", 0, u1.getsockname)
+    IO.select [u1]
+    mesg = u1.recv_nonblock(100)
+    assert_equal("aaa", mesg)
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { u1.recv_nonblock(100) }
+    u2.send("", 0, u1.getsockname)
+    assert_nothing_raised("cygwin 1.5.19 has a problem to send an empty UDP packet. [ruby-dev:28915]") {
+      timeout(1) { IO.select [u1] }
+    }
+    mesg = u1.recv_nonblock(100)
+    assert_equal("", mesg)
+  ensure
+    u1.close if u1
+    u2.close if u2
+  end
+
+  def test_socket_recvfrom_nonblock
+    s1 = Socket.new(Socket::AF_INET, Socket::SOCK_DGRAM, 0)
+    s1.bind(Socket.sockaddr_in(0, "127.0.0.1"))
+    s2 = Socket.new(Socket::AF_INET, Socket::SOCK_DGRAM, 0)
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { s1.recvfrom_nonblock(100) }
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::EINVAL) { s2.recvfrom_nonblock(100) }
+    s2.send("aaa", 0, s1.getsockname)
+    IO.select [s1]
+    mesg, sockaddr = s1.recvfrom_nonblock(100) 
+    assert_equal("aaa", mesg)
+    port, addr = Socket.unpack_sockaddr_in(sockaddr)
+    s2_port, s2_addr = Socket.unpack_sockaddr_in(s2.getsockname)
+    assert_equal(s2_port, port)
+  ensure
+    s1.close if s1
+    s2.close if s2
+  end
+
+  def tcp_pair
+    serv = TCPServer.new("127.0.0.1", 0)
+    af, port, host, addr = serv.addr
+    c = TCPSocket.new(addr, port)
+    s = serv.accept
+    return c, s
+  ensure
+    serv.close if serv
+  end
+
+  def test_tcp_recv_nonblock
+    c, s = tcp_pair
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { c.recv_nonblock(100) }
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { s.recv_nonblock(100) }
+    c.write("abc")
+    IO.select [s]
+    assert_equal("a", s.recv_nonblock(1))
+    assert_equal("bc", s.recv_nonblock(100))
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { s.recv_nonblock(100) }
+  ensure
+    c.close if c
+    s.close if s
+  end
+
+  def test_read_nonblock
+    c, s = tcp_pair
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { c.read_nonblock(100) }
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { s.read_nonblock(100) }
+    c.write("abc")
+    IO.select [s]
+    assert_equal("a", s.read_nonblock(1))
+    assert_equal("bc", s.read_nonblock(100))
+    assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { s.read_nonblock(100) }
+  ensure
+    c.close if c
+    s.close if s
+  end
+
+=begin
+  def test_write_nonblock
+    c, s = tcp_pair
+    str = "a" * 10000
+    _, ws, _ = IO.select(nil, [c], nil)
+    assert_equal([c], ws)
+    ret = c.write_nonblock(str)
+    assert_operator(ret, :>, 0)
+    loop {
+      assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) {
+        loop {
+          ret = c.write_nonblock(str)
+          assert_operator(ret, :>, 0)
+        }
+      }
+      _, ws, _ = IO.select(nil, [c], nil, 0)
+      break if !ws
+    }
+  ensure
+    c.close if c
+    s.close if s
+  end
+=end
+
+end if defined?(Socket)
diff --git a/ruby_1_8_6/test/socket/test_socket.rb b/ruby_1_8_6/test/socket/test_socket.rb
new file mode 100644
index 0000000000..fc01467f16
--- /dev/null
+++ b/ruby_1_8_6/test/socket/test_socket.rb
@@ -0,0 +1,83 @@
+begin
+  require "socket"
+  require "test/unit"
+rescue LoadError
+end
+
+class TestBasicSocket < Test::Unit::TestCase
+  def inet_stream
+    sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+    yield sock
+  ensure
+    assert_raise(IOError) {sock.close}
+  end
+
+  def test_getsockopt
+    inet_stream do |s|
+      n = s.getsockopt(Socket::SOL_SOCKET, Socket::SO_TYPE)
+      assert_equal([Socket::SOCK_STREAM].pack("i"), n)
+      n = s.getsockopt(Socket::SOL_SOCKET, Socket::SO_ERROR)
+      assert_equal([0].pack("i"), n)
+      val = Object.new
+      class << val; self end.__send__(:define_method, :to_int) {
+        s.close
+        Socket::SO_TYPE
+      }
+      assert_raise(IOError) {
+        n = s.getsockopt(Socket::SOL_SOCKET, val)
+      }
+    end
+  end
+
+  def test_setsockopt # [ruby-dev:25039]
+    s = nil
+    linger = [0, 0].pack("ii")
+
+    val = Object.new
+    class << val; self end.__send__(:define_method, :to_str) {
+      s.close
+      linger
+    }
+    inet_stream do |s|
+      assert_equal(0, s.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, linger))
+
+      assert_raise(IOError) {
+        s.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, val)
+      }
+    end
+
+    val = Object.new
+    class << val; self end.__send__(:define_method, :to_int) {
+      s.close
+      Socket::SO_LINGER
+    }
+    inet_stream do |s|
+      assert_raise(IOError) {
+        s.setsockopt(Socket::SOL_SOCKET, val, linger)
+      }
+    end
+  end
+
+  def test_listen
+    s = nil
+    log = Object.new
+    class << log; self end.__send__(:define_method, :to_int) {
+      s.close
+      2
+    }
+    inet_stream do |s|
+      assert_raise(IOError) {
+        s.listen(log)
+      }
+    end
+  end
+end if defined?(Socket)
+
+class TestSocket < Test::Unit::TestCase
+  def test_unpack_sockaddr
+    sockaddr_in = Socket.sockaddr_in(80, "")
+    assert_raise(ArgumentError) { Socket.unpack_sockaddr_un(sockaddr_in) }
+    sockaddr_un = Socket.sockaddr_un("/tmp/s")
+    assert_raise(ArgumentError) { Socket.unpack_sockaddr_in(sockaddr_un) }
+  end
+end if defined?(Socket) && Socket.respond_to?(:sockaddr_un)
diff --git a/ruby_1_8_6/test/socket/test_unix.rb b/ruby_1_8_6/test/socket/test_unix.rb
new file mode 100644
index 0000000000..14ddd6a4b6
--- /dev/null
+++ b/ruby_1_8_6/test/socket/test_unix.rb
@@ -0,0 +1,141 @@
+begin
+  require "socket"
+rescue LoadError
+end
+
+require "test/unit"
+require "tempfile"
+
+class TestUNIXSocket < Test::Unit::TestCase
+  def test_fd_passing
+    r1, w = IO.pipe
+    s1, s2 = UNIXSocket.pair
+    begin
+      s1.send_io(nil)
+    rescue NotImplementedError
+      assert_raise(NotImplementedError) { s2.recv_io }
+    rescue TypeError
+      s1.send_io(r1)
+      r2 = s2.recv_io
+      assert_equal(r1.stat.ino, r2.stat.ino)
+      assert_not_equal(r1.fileno, r2.fileno)
+      w.syswrite "a"
+      assert_equal("a", r2.sysread(10))
+    ensure
+      s1.close
+      s2.close
+      w.close
+      r1.close
+      r2.close if r2 && !r2.closed?
+    end
+  end
+
+  def bound_unix_socket(klass)
+    tmpfile = Tempfile.new("testrubysock")
+    path = tmpfile.path
+    tmpfile.close(true)
+    yield klass.new(path), path
+  ensure
+    File.unlink path if path && File.socket?(path)
+  end
+
+  def test_addr
+    bound_unix_socket(UNIXServer) {|serv, path|
+      c = UNIXSocket.new(path)
+      s = serv.accept
+      assert_equal(["AF_UNIX", path], c.peeraddr)
+      assert_equal(["AF_UNIX", ""], c.addr)
+      assert_equal(["AF_UNIX", ""], s.peeraddr)
+      assert_equal(["AF_UNIX", path], s.addr)
+      assert_equal(path, s.path)
+      assert_equal("", c.path)
+    }
+  end
+
+  def test_noname_path
+    s1, s2 = UNIXSocket.pair
+    assert_equal("", s1.path)
+    assert_equal("", s2.path)
+  ensure
+    s1.close
+    s2.close
+  end
+
+  def test_noname_addr
+    s1, s2 = UNIXSocket.pair
+    assert_equal(["AF_UNIX", ""], s1.addr)
+    assert_equal(["AF_UNIX", ""], s2.addr)
+  ensure
+    s1.close
+    s2.close
+  end
+
+  def test_noname_peeraddr
+    s1, s2 = UNIXSocket.pair
+    assert_equal(["AF_UNIX", ""], s1.peeraddr)
+    assert_equal(["AF_UNIX", ""], s2.peeraddr)
+  ensure
+    s1.close
+    s2.close
+  end
+
+  def test_noname_unpack_sockaddr_un
+    s1, s2 = UNIXSocket.pair
+    n = nil
+    assert_equal("", Socket.unpack_sockaddr_un(n)) if (n = s1.getsockname) != ""
+    assert_equal("", Socket.unpack_sockaddr_un(n)) if (n = s1.getsockname) != ""
+    assert_equal("", Socket.unpack_sockaddr_un(n)) if (n = s2.getsockname) != ""
+    assert_equal("", Socket.unpack_sockaddr_un(n)) if (n = s1.getpeername) != ""
+    assert_equal("", Socket.unpack_sockaddr_un(n)) if (n = s2.getpeername) != ""
+  ensure
+    s1.close
+    s2.close
+  end
+
+  def test_noname_recvfrom
+    s1, s2 = UNIXSocket.pair
+    s2.write("a")
+    assert_equal(["a", ["AF_UNIX", ""]], s1.recvfrom(10))
+  ensure
+    s1.close
+    s2.close
+  end
+
+  def test_noname_recv_nonblock
+    s1, s2 = UNIXSocket.pair
+    s2.write("a")
+    IO.select [s1]
+    assert_equal("a", s1.recv_nonblock(10))
+  ensure
+    s1.close
+    s2.close
+  end
+
+  def test_too_long_path
+    assert_raise(ArgumentError) { Socket.sockaddr_un("a" * 300) }
+    assert_raise(ArgumentError) { UNIXServer.new("a" * 300) }
+  end
+
+  def test_nul
+    assert_raise(ArgumentError) { Socket.sockaddr_un("a\0b") }
+    assert_raise(ArgumentError) { UNIXServer.new("a\0b") }
+  end
+
+  def test_dgram_pair
+    s1, s2 = UNIXSocket.pair(Socket::SOCK_DGRAM)
+    assert_raise(Errno::EAGAIN) { s1.recv_nonblock(10) }
+    s2.send("", 0)
+    s2.send("haha", 0)
+    s2.send("", 0)
+    s2.send("", 0)
+    assert_equal("", s1.recv(10))
+    assert_equal("haha", s1.recv(10))
+    assert_equal("", s1.recv(10))
+    assert_equal("", s1.recv(10))
+    assert_raise(Errno::EAGAIN) { s1.recv_nonblock(10) }
+  ensure
+    s1.close if s1
+    s2.close if s2
+  end
+
+end if defined?(UNIXSocket) && /cygwin/ !~ RUBY_PLATFORM
diff --git a/ruby_1_8_6/test/stringio/test_stringio.rb b/ruby_1_8_6/test/stringio/test_stringio.rb
new file mode 100644
index 0000000000..de15ab5508
--- /dev/null
+++ b/ruby_1_8_6/test/stringio/test_stringio.rb
@@ -0,0 +1,43 @@
+require 'test/unit'
+require 'stringio'
+dir = File.expand_path(__FILE__)
+2.times {dir = File.dirname(dir)}
+$:.replace([File.join(dir, "ruby")] | $:)
+require 'ut_eof'
+
+class TestStringIO < Test::Unit::TestCase
+  include TestEOF
+  def open_file(content)
+    f = StringIO.new(content)
+    yield f
+  end
+  alias open_file_rw open_file
+
+  include TestEOF::Seek
+
+  def test_truncate # [ruby-dev:24190]
+    io = StringIO.new("")
+    io.puts "abc"
+    io.truncate(0)
+    io.puts "def"
+    assert_equal("\0\0\0\0def\n", io.string)
+  end
+
+  def test_seek_beyond_eof # [ruby-dev:24194]
+    io = StringIO.new
+    n = 100
+    io.seek(n)
+    io.print "last"
+    assert_equal("\0" * n + "last", io.string)
+  end
+
+  def test_overwrite # [ruby-core:03836]
+    stringio = StringIO.new
+    responses = ['', 'just another ruby', 'hacker']
+    responses.each do |resp|
+      stringio.puts(resp)
+      stringio.rewind
+    end
+    assert_equal("hacker\nother ruby\n", stringio.string)
+  end
+end
diff --git a/ruby_1_8_6/test/strscan/test_stringscanner.rb b/ruby_1_8_6/test/strscan/test_stringscanner.rb
new file mode 100644
index 0000000000..75e96c0293
--- /dev/null
+++ b/ruby_1_8_6/test/strscan/test_stringscanner.rb
@@ -0,0 +1,571 @@
+#
+# test/strscan/test_stringscanner.rb
+#
+
+require 'strscan'
+require 'test/unit'
+
+class TestStringScanner < Test::Unit::TestCase
+  def test_s_new
+    s = StringScanner.new('test string')
+    assert_instance_of StringScanner, s
+    assert_equal false, s.eos?
+    assert_equal false, s.tainted?
+
+    str = 'test string'
+    str.taint
+    s = StringScanner.new(str, false)
+    assert_instance_of StringScanner, s
+    assert_equal false, s.eos?
+    assert_same str, s.string
+    assert_equal true, s.string.tainted?
+
+    str = 'test string'
+    str.taint
+    s = StringScanner.new(str)
+    assert_equal true, s.string.tainted?
+  end
+
+  UNINIT_ERROR = ArgumentError
+
+  def test_s_allocate
+    s = StringScanner.allocate
+    assert_equal '#<StringScanner (uninitialized)>', s.inspect.sub(/StringScanner_C/, 'StringScanner')
+    assert_raises(UNINIT_ERROR) { s.eos? }
+    assert_raises(UNINIT_ERROR) { s.scan(/a/) }
+    s.string = 'test'
+    assert_equal '#<StringScanner 0/4 @ "test">', s.inspect.sub(/StringScanner_C/, 'StringScanner')
+    assert_nothing_raised(UNINIT_ERROR) { s.eos? }
+    assert_equal false, s.eos?
+  end
+
+  def test_s_mustc
+    assert_nothing_raised(NotImplementedError) {
+        StringScanner.must_C_version
+    }
+  end
+
+  def test_dup
+    s = StringScanner.new('test string')
+    d = s.dup
+    assert_equal s.inspect, d.inspect
+    assert_equal s.string, d.string
+    assert_equal s.pos, d.pos
+    assert_equal s.matched?, d.matched?
+    assert_equal s.eos?, d.eos?
+
+    s = StringScanner.new('test string')
+    s.scan(/test/)
+    d = s.dup
+    assert_equal s.inspect, d.inspect
+    assert_equal s.string, d.string
+    assert_equal s.pos, d.pos
+    assert_equal s.matched?, d.matched?
+    assert_equal s.eos?, d.eos?
+
+    s = StringScanner.new('test string')
+    s.scan(/test/)
+    s.scan(/NOT MATCH/)
+    d = s.dup
+    assert_equal s.inspect, d.inspect
+    assert_equal s.string, d.string
+    assert_equal s.pos, d.pos
+    assert_equal s.matched?, d.matched?
+    assert_equal s.eos?, d.eos?
+
+    s = StringScanner.new('test string')
+    s.terminate
+    d = s.dup
+    assert_equal s.inspect, d.inspect
+    assert_equal s.string, d.string
+    assert_equal s.pos, d.pos
+    assert_equal s.matched?, d.matched?
+    assert_equal s.eos?, d.eos?
+  end
+
+  def test_const_Version
+    assert_instance_of String, StringScanner::Version
+    assert_equal true, StringScanner::Version.frozen?
+  end
+
+  def test_const_Id
+    assert_instance_of String, StringScanner::Id
+    assert_equal true, StringScanner::Id.frozen?
+  end
+
+  def test_inspect
+    str = 'test string'
+    str.taint
+    s = StringScanner.new(str, false)
+    assert_instance_of String, s.inspect
+    assert_equal s.inspect, s.inspect
+    assert_equal '#<StringScanner 0/11 @ "test ...">', s.inspect.sub(/StringScanner_C/, 'StringScanner')
+    s.get_byte
+    assert_equal '#<StringScanner 1/11 "t" @ "est s...">', s.inspect.sub(/StringScanner_C/, 'StringScanner')
+    assert_equal true, s.inspect.tainted?
+
+    s = StringScanner.new("\n")
+    assert_equal '#<StringScanner 0/1 @ "\n">', s.inspect
+  end
+
+  def test_eos?
+    s = StringScanner.new('test string')
+    assert_equal false, s.eos?
+    assert_equal false, s.eos?
+    s.scan(/\w+/)
+    assert_equal false, s.eos?
+    assert_equal false, s.eos?
+    s.scan(/\s+/)
+    s.scan(/\w+/)
+    assert_equal true, s.eos?
+    assert_equal true, s.eos?
+    s.scan(/\w+/)
+    assert_equal true, s.eos?
+
+    s = StringScanner.new('test')
+    s.scan(/te/)
+    s.string.replace ''
+    assert_equal true, s.eos?
+  end
+
+  def test_bol?
+    s = StringScanner.new("a\nbbb\n\ncccc\nddd\r\neee")
+    assert_equal true, s.bol?
+    assert_equal true, s.bol?
+    s.scan(/a/)
+    assert_equal false, s.bol?
+    assert_equal false, s.bol?
+    s.scan(/\n/)
+    assert_equal true, s.bol?
+    s.scan(/b/)
+    assert_equal false, s.bol?
+    s.scan(/b/)
+    assert_equal false, s.bol?
+    s.scan(/b/)
+    assert_equal false, s.bol?
+    s.scan(/\n/)
+    assert_equal true, s.bol?
+    s.unscan
+    assert_equal false, s.bol?
+    s.scan(/\n/)
+    s.scan(/\n/)
+    assert_equal true, s.bol?
+    s.scan(/c+\n/)
+    assert_equal true, s.bol?
+    s.scan(/d+\r\n/)
+    assert_equal true, s.bol?
+    s.scan(/e+/)
+    assert_equal false, s.bol?
+  end
+
+  def test_string
+    s = StringScanner.new('test')
+    assert_equal 'test', s.string
+    s.string = 'a'
+    assert_equal 'a', s.string
+    s.scan(/a/)
+    s.string = 'b'
+    assert_equal 0, s.pos
+  end
+
+  def test_pos
+    s = StringScanner.new('test string')
+    assert_equal 0, s.pos
+    s.get_byte
+    assert_equal 1, s.pos
+    s.get_byte
+    assert_equal 2, s.pos
+    s.terminate
+    assert_equal 11, s.pos
+  end
+
+  def test_concat
+    s = StringScanner.new('a')
+    s.scan(/a/)
+    s.concat 'b'
+    assert_equal false, s.eos?
+    assert_equal 'b', s.scan(/b/)
+    assert_equal true, s.eos?
+    s.concat 'c'
+    assert_equal false, s.eos?
+    assert_equal 'c', s.scan(/c/)
+    assert_equal true, s.eos?
+  end
+
+  def test_scan
+    s = StringScanner.new('stra strb strc', true)
+    tmp = s.scan(/\w+/)
+    assert_equal 'stra', tmp
+    assert_equal false, tmp.tainted?
+
+    tmp = s.scan(/\s+/)
+    assert_equal ' ', tmp
+    assert_equal false, tmp.tainted?
+
+    assert_equal 'strb', s.scan(/\w+/)
+    assert_equal ' ',    s.scan(/\s+/)
+
+    tmp = s.scan(/\w+/)
+    assert_equal 'strc', tmp
+    assert_equal false, tmp.tainted?
+
+    assert_nil           s.scan(/\w+/)
+    assert_nil           s.scan(/\w+/)
+
+
+    str = 'stra strb strc'
+    str.taint
+    s = StringScanner.new(str, false)
+    tmp = s.scan(/\w+/)
+    assert_equal 'stra', tmp
+    assert_equal true, tmp.tainted?
+
+    tmp = s.scan(/\s+/)
+    assert_equal ' ', tmp
+    assert_equal true, tmp.tainted?
+
+    assert_equal 'strb', s.scan(/\w+/)
+    assert_equal ' ',    s.scan(/\s+/)
+
+    tmp = s.scan(/\w+/)
+    assert_equal 'strc', tmp
+    assert_equal true, tmp.tainted?
+
+    assert_nil           s.scan(/\w+/)
+    assert_nil           s.scan(/\w+/)
+
+    s = StringScanner.new('test')
+    s.scan(/te/)
+    # This assumes #string does not duplicate string,
+    # but it is implementation specific issue.
+    # DO NOT RELY ON THIS FEATURE.
+    s.string.replace ''
+    # unspecified: assert_equal 2, s.pos
+    assert_equal nil, s.scan(/test/)
+
+    # [ruby-bugs:4361]
+    s = StringScanner.new("")
+    assert_equal "", s.scan(//)
+    assert_equal "", s.scan(//)
+
+    # [ruby-dev:29914]
+    %w( NONE EUC SJIS UTF8 ).each do |kcode|
+      begin
+        $KCODE = kcode
+        assert_equal "a", StringScanner.new("a:b").scan(/[^\x01\:]+/n)
+        assert_equal "a", StringScanner.new("a:b").scan(/[^\x01\:]+/e)
+        assert_equal "a", StringScanner.new("a:b").scan(/[^\x01\:]+/s)
+        assert_equal "a", StringScanner.new("a:b").scan(/[^\x01\:]+/u)
+      ensure
+        $KCODE = 'NONE'
+      end
+    end
+  end
+
+  def test_skip
+    s = StringScanner.new('stra strb strc', true)
+    assert_equal 4, s.skip(/\w+/)
+    assert_equal 1, s.skip(/\s+/)
+    assert_equal 4, s.skip(/\w+/)
+    assert_equal 1, s.skip(/\s+/)
+    assert_equal 4, s.skip(/\w+/)
+    assert_nil      s.skip(/\w+/)
+    assert_nil      s.skip(/\s+/)
+    assert_equal true, s.eos?
+
+    s = StringScanner.new('test')
+    s.scan(/te/)
+    s.string.replace ''
+    assert_equal nil, s.skip(/./)
+
+    # [ruby-bugs:4361]
+    s = StringScanner.new("")
+    assert_equal 0, s.skip(//)
+    assert_equal 0, s.skip(//)
+  end
+
+  def test_getch
+    s = StringScanner.new('abcde')
+    assert_equal 'a', s.getch
+    assert_equal 'b', s.getch
+    assert_equal 'c', s.getch
+    assert_equal 'd', s.getch
+    assert_equal 'e', s.getch
+    assert_nil        s.getch
+
+    str = 'abc'
+    str.taint
+    s = StringScanner.new(str)
+    assert_equal true, s.getch.tainted?
+    assert_equal true, s.getch.tainted?
+    assert_equal true, s.getch.tainted?
+    assert_nil s.getch
+
+    kc_backup = $KCODE
+    begin
+      $KCODE = 'EUC'
+      s = StringScanner.new("\244\242")
+      assert_equal "\244\242", s.getch
+      assert_nil s.getch
+    ensure
+      $KCODE = kc_backup
+    end
+
+    s = StringScanner.new('test')
+    s.scan(/te/)
+    s.string.replace ''
+    assert_equal nil, s.getch
+  end
+
+  def test_get_byte
+    s = StringScanner.new('abcde')
+    assert_equal 'a', s.get_byte
+    assert_equal 'b', s.get_byte
+    assert_equal 'c', s.get_byte
+    assert_equal 'd', s.get_byte
+    assert_equal 'e', s.get_byte
+    assert_nil        s.get_byte
+    assert_nil        s.get_byte
+
+    str = 'abc'
+    str.taint
+    s = StringScanner.new(str)
+    assert_equal true, s.get_byte.tainted?
+    assert_equal true, s.get_byte.tainted?
+    assert_equal true, s.get_byte.tainted?
+    assert_nil s.get_byte
+
+    kc_backup = $KCODE
+    begin
+      $KCODE = 'EUC'
+      s = StringScanner.new("\244\242")
+      assert_equal "\244", s.get_byte
+      assert_equal "\242", s.get_byte
+      assert_nil s.get_byte
+    ensure
+      $KCODE = kc_backup
+    end
+
+    s = StringScanner.new('test')
+    s.scan(/te/)
+    s.string.replace ''
+    assert_equal nil, s.get_byte
+  end
+
+  def test_matched
+    s = StringScanner.new('stra strb strc')
+    s.scan(/\w+/)
+    assert_equal 'stra', s.matched
+    assert_equal false, s.matched.tainted?
+    s.scan(/\s+/)
+    assert_equal ' ', s.matched
+    s.scan(/\w+/)
+    assert_equal 'strb', s.matched
+    s.scan(/\s+/)
+    assert_equal ' ', s.matched
+    s.scan(/\w+/)
+    assert_equal 'strc', s.matched
+    s.scan(/\w+/)
+    assert_nil s.matched
+    s.getch
+    assert_nil s.matched
+
+    s = StringScanner.new('stra strb strc')
+    s.getch
+    assert_equal 's', s.matched
+    assert_equal false, s.matched.tainted?
+    s.get_byte
+    assert_equal 't', s.matched
+    assert_equal 't', s.matched
+    assert_equal false, s.matched.tainted?
+
+    str = 'test'
+    str.taint
+    s = StringScanner.new(str)
+    s.scan(/\w+/)
+    assert_equal true, s.matched.tainted?
+    assert_equal true, s.matched.tainted?
+  end
+
+  def test_AREF
+    s = StringScanner.new('stra strb strc')
+
+    s.scan(/\w+/)
+    assert_nil           s[-2]
+    assert_equal 'stra', s[-1]
+    assert_equal 'stra', s[0]
+    assert_nil           s[1]
+
+    assert_equal false,  s[-1].tainted?
+    assert_equal false,  s[0].tainted?
+
+    s.skip(/\s+/)
+    assert_nil           s[-2]
+    assert_equal ' ',    s[-1]
+    assert_equal ' ',    s[0]
+    assert_nil           s[1]
+
+    s.scan(/(s)t(r)b/)
+    assert_nil           s[-100]
+    assert_nil           s[-4]
+    assert_equal 'strb', s[-3]
+    assert_equal 's',    s[-2]
+    assert_equal 'r',    s[-1]
+    assert_equal 'strb', s[0]
+    assert_equal 's',    s[1]
+    assert_equal 'r',    s[2]
+    assert_nil           s[3]
+    assert_nil           s[100]
+
+    s.scan(/\s+/)
+
+    s.getch
+    assert_nil           s[-2]
+    assert_equal 's',    s[-1]
+    assert_equal 's',    s[0]
+    assert_nil           s[1]
+
+    s.get_byte
+    assert_nil           s[-2]
+    assert_equal 't',    s[-1]
+    assert_equal 't',    s[0]
+    assert_nil           s[1]
+
+    s.scan(/.*/)
+    s.scan(/./)
+    assert_nil           s[0]
+    assert_nil           s[0]
+
+
+    kc_backup = $KCODE
+    begin
+      $KCODE = 'EUC'
+      s = StringScanner.new("\244\242")
+      s.getch
+      assert_equal "\244\242", s[0]
+    ensure
+      $KCODE = kc_backup
+    end
+
+
+    str = 'test'
+    str.taint
+    s = StringScanner.new(str)
+    s.scan(/(t)(e)(s)(t)/)
+    assert_equal true, s[0].tainted?
+    assert_equal true, s[1].tainted?
+    assert_equal true, s[2].tainted?
+    assert_equal true, s[3].tainted?
+    assert_equal true, s[4].tainted?
+  end
+
+  def test_pre_match
+    s = StringScanner.new('a b c d e')
+    s.scan(/\w/)
+    assert_equal '', s.pre_match
+    assert_equal false, s.pre_match.tainted?
+    s.skip(/\s/)
+    assert_equal 'a', s.pre_match
+    assert_equal false, s.pre_match.tainted?
+    s.scan(/\w/)
+    assert_equal 'a ', s.pre_match
+    s.scan_until(/c/)
+    assert_equal 'a b ', s.pre_match
+    s.getch
+    assert_equal 'a b c', s.pre_match
+    s.get_byte
+    assert_equal 'a b c ', s.pre_match
+    s.get_byte
+    assert_equal 'a b c d', s.pre_match
+    s.scan(/never match/)
+    assert_nil s.pre_match
+
+    str = 'test string'
+    str.taint
+    s = StringScanner.new(str)
+    s.scan(/\w+/)
+    assert_equal true, s.pre_match.tainted?
+    s.scan(/\s+/)
+    assert_equal true, s.pre_match.tainted?
+    s.scan(/\w+/)
+    assert_equal true, s.pre_match.tainted?
+  end
+
+  def test_post_match
+    s = StringScanner.new('a b c d e')
+    s.scan(/\w/)
+    assert_equal ' b c d e', s.post_match
+    s.skip(/\s/)
+    assert_equal 'b c d e', s.post_match
+    s.scan(/\w/)
+    assert_equal ' c d e', s.post_match
+    s.scan_until(/c/)
+    assert_equal ' d e', s.post_match
+    s.getch
+    assert_equal 'd e', s.post_match
+    s.get_byte
+    assert_equal ' e', s.post_match
+    s.get_byte
+    assert_equal 'e', s.post_match
+    s.scan(/never match/)
+    assert_nil s.post_match
+    s.scan(/./)
+    assert_equal '', s.post_match
+    s.scan(/./)
+    assert_nil s.post_match
+
+    str = 'test string'
+    str.taint
+    s = StringScanner.new(str)
+    s.scan(/\w+/)
+    assert_equal true, s.post_match.tainted?
+    s.scan(/\s+/)
+    assert_equal true, s.post_match.tainted?
+    s.scan(/\w+/)
+    assert_equal true, s.post_match.tainted?
+  end
+
+  def test_terminate
+    s = StringScanner.new('ssss')
+    s.getch
+    s.terminate
+    assert_equal true, s.eos?
+    s.terminate
+    assert_equal true, s.eos?
+  end
+
+  def test_reset
+    s = StringScanner.new('ssss')
+    s.getch
+    s.reset
+    assert_equal 0, s.pos
+    s.scan(/\w+/)
+    s.reset
+    assert_equal 0, s.pos
+    s.reset
+    assert_equal 0, s.pos
+  end
+
+  def test_matched_size
+    s = StringScanner.new('test string')
+    assert_nil s.matched_size
+    s.scan(/test/)
+    assert_equal 4, s.matched_size
+    assert_equal 4, s.matched_size
+    s.scan(//)
+    assert_equal 0, s.matched_size
+    s.scan(/x/)
+    assert_nil s.matched_size
+    assert_nil s.matched_size
+    s.terminate
+    assert_nil s.matched_size
+
+    # obsolete
+    s = StringScanner.new('test string')
+    assert_nil s.matchedsize
+    s.scan(/test/)
+    assert_equal 4, s.matched_size
+    s.terminate
+    assert_nil s.matched_size
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/collector/test_dir.rb b/ruby_1_8_6/test/testunit/collector/test_dir.rb
new file mode 100644
index 0000000000..2de802c5e3
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/collector/test_dir.rb
@@ -0,0 +1,406 @@
+require 'test/unit'
+require 'test/unit/collector/dir'
+require 'pp'
+
+module Test
+  module Unit
+    module Collector
+      class TestDir < TestCase
+        class FileSystem
+          class Directory
+            def initialize(name, fs, parent=self, &block)
+              @name = name
+              @fs = fs
+              @parent = parent
+              @contents = {'.' => self, '..' => parent}
+              instance_eval(&block) if(block)
+            end
+            
+            def file(name, contents)
+              @contents[name] = contents
+            end
+
+            def dir(name, &block)
+              @contents[name] = self.class.new(name, @fs, self, &block)
+            end
+
+            def entries
+              @contents.keys
+            end
+
+            def directory?(name)
+              return true if(name.nil? || name.empty?)
+              return false unless(@contents.include?(name))
+              @contents[name].kind_of?(self.class)
+            end
+
+            def file?(name)
+              return false unless(@contents.include?(name))
+              !directory?(name)
+            end
+
+            def exist?(name)
+              @contents.include?(name)
+            end
+
+            def [](name)
+              raise Errno::ENOENT, name unless(@contents.include?(name))
+              @contents[name]
+            end
+
+            def path_to(name=nil)
+              if(!name)
+                @parent.path_to(@name)
+              elsif(@parent == self)
+                @fs.join('/', name)
+              else
+                @fs.join(@parent.path_to(@name), name)
+              end
+            end
+          end
+
+          class ObjectSpace
+            def initialize
+              @objects = []
+            end
+
+            def each_object(klass, &block)
+              @objects.find_all{|o| o.kind_of?(klass)}.each(&block)
+            end
+
+            def <<(object)
+              @objects << object
+            end
+          end
+
+          attr_reader :object_space
+          
+          def initialize(&block)
+            @root = Directory.new('/', self, &block)
+            @pwd = @root
+            @object_space = ObjectSpace.new
+            @required = []
+          end
+
+          def entries(dir)
+            e = find(dir)
+            require_directory(dir)
+            e.entries
+          end
+
+          def directory?(name)
+            return true if (base = basename(name)) == '/'
+            e = find(dirname(name))
+            return false unless(e)
+            e.directory?(base)
+          end
+
+          def find(path)
+            if(/\A\// =~ path)
+              thing = @root
+            else
+              thing = @pwd
+            end
+            path.scan(/[^\/]+/) do |e|
+              break thing = false unless(thing.kind_of?(Directory))
+              thing = thing[e]
+            end
+            thing
+          end
+
+          def dirname(name)
+            if (name = name.tr_s('/', '/')) == '/'
+              name
+            else
+              name[%r"\A.+(?=/[^/]+/?\z)|\A/"] || "."
+            end
+          end
+
+          def basename(name)
+            name[%r"(\A/|[^/]+)/*\z", 1]
+          end
+
+          def split(name)
+            [dirname(name), basename(name)]
+          end
+
+          def join(*parts)
+            parts.join('/').gsub(%r{/+}, '/')
+          end
+
+          def file?(name)
+            e = find(dirname(name))
+            return false unless(e)
+            e.file?(basename(name))
+          end
+
+          def pwd
+            @pwd.path_to
+          end
+
+          def chdir(to)
+            e = find(to)
+            require_directory(to)
+            @pwd = e
+          end
+
+          def expand_path(path, base = nil)
+            until /\A\// =~ path
+              base ||= pwd
+              path = join(base, path)
+              base = nil
+            end
+            path.gsub!(%r"(?:/\.)+(?=/)", '')
+            nil while path.sub!(%r"/(?!\.\./)[^/]+/\.\.(?=/)", '')
+            path.sub!(%r"\A(?:/\.\.)+(?=/)", '')
+            path.sub!(%r"(?:\A(/)|/)\.\.?\z", '\1')
+            path
+          end
+
+          def require_directory(path)
+            raise Errno::ENOTDIR, path unless(directory?(path))
+          end
+
+          def require(file)
+            return false if(@required.include?(file))
+            begin
+              e = find(file)
+            rescue Errno::ENOENT => e
+              if(/\.rb\Z/ =~ file)
+                raise LoadError, file
+              end
+              e = find(file + '.rb')
+            end
+            @required << file
+            @object_space << e
+            true
+          rescue Errno::ENOENT
+            raise LoadError, file
+          end
+        end
+
+        def test_dir
+          inner_dir = nil
+          dirs = FileSystem::Directory.new('/', nil) do
+            file 'a', nil
+            inner_dir = dir 'b'
+          end
+          assert_equal(inner_dir, dirs['b'])
+        end
+
+        def test_fs
+          fs = FileSystem.new do
+            file 'a', nil
+            dir 'b'
+          end
+          assert_equal(['.', '..', 'a', 'b'].sort, fs.entries('/').sort)
+          assert(fs.directory?('/'))
+          assert(!fs.directory?('/a'))
+          assert(!fs.directory?('/bogus'))
+          assert(fs.file?('/a'))
+          assert(!fs.file?('/'))
+          assert(!fs.file?('/bogus'))
+          assert(fs.directory?('/b'))
+          assert(fs.file?('a'))
+          assert(fs.directory?('b'))
+        end
+
+        def test_fs_sub
+          fs = FileSystem.new do
+            dir 'a' do
+              file 'b', nil
+              dir 'c' do
+                file 'd', nil
+              end
+            end
+          end
+          assert(fs.file?('/a/b'))
+          assert(!fs.file?('/a/b/c/d'))
+          assert(fs.file?('/a/c/d'))
+        end
+
+        def test_fs_pwd
+          fs = FileSystem.new do
+            file 'a', nil
+            dir 'b' do
+              file 'c', nil
+              dir 'd' do
+                file 'e', nil
+              end
+            end
+          end
+          assert_equal('/', fs.pwd)
+          assert_raises(Errno::ENOENT) do
+            fs.chdir('bogus')
+          end
+          assert_raises(Errno::ENOTDIR) do
+            fs.chdir('a')
+          end
+          fs.chdir('b')
+          assert_equal('/b', fs.pwd)
+          fs.chdir('d')
+          assert_equal('/b/d', fs.pwd)
+          fs.chdir('..')
+          assert_equal('/b', fs.pwd)
+          fs.chdir('..')
+          assert_equal('/', fs.pwd)
+        end
+
+        def test_fs_entries
+          fs = FileSystem.new do
+            file 'a', nil
+            dir 'b' do
+              file 'c', nil
+              file 'd', nil
+            end
+            file 'e', nil
+            dir 'f' do
+              file 'g', nil
+              dir 'h' do
+                file 'i', nil
+              end
+            end
+          end
+          assert_equal(['.', '..', 'a', 'b', 'e', 'f'], fs.entries('/').sort)
+          assert_equal(['.', '..', 'a', 'b', 'e', 'f'], fs.entries('.').sort)
+          assert_equal(['.', '..', 'a', 'b', 'e', 'f'], fs.entries('b/..').sort)
+          assert_equal(['.', '..', 'c', 'd'], fs.entries('b').sort)
+          assert_raises(Errno::ENOENT) do
+            fs.entries('z')
+          end
+          assert_raises(Errno::ENOTDIR) do
+            fs.entries('a')
+          end
+          fs.chdir('f')
+          assert_equal(['.', '..', 'i'], fs.entries('h').sort)
+        end
+
+        class TestClass1
+        end
+        class TestClass2
+        end
+        def test_fs_require
+          fs = FileSystem.new do
+            file 'test_class1.rb', TestClass1
+            dir 'dir' do
+              file 'test_class2.rb', TestClass2
+            end
+          end
+          c = []
+          fs.object_space.each_object(Class) do |o|
+            c << o
+          end
+          assert_equal([], c)
+
+          assert_raises(LoadError) do
+            fs.require('bogus')
+          end
+          
+          assert(fs.require('test_class1.rb'))
+          assert(!fs.require('test_class1.rb'))
+          c = []
+          fs.object_space.each_object(Class) do |o|
+            c << o
+          end
+          assert_equal([TestClass1], c)
+
+          fs.require('dir/test_class2')
+          c = []
+          fs.object_space.each_object(Class) do |o|
+            c << o
+          end
+          assert_equal([TestClass1, TestClass2], c)
+
+          c = []
+          fs.object_space.each_object(Time) do |o|
+            c << o
+          end
+          assert_equal([], c)
+        end
+
+        def setup
+          @t1 = t1 = create_test(1)
+          @t2 = t2 = create_test(2)
+          @t3 = t3 = create_test(3)
+          @t4 = t4 = create_test(4)
+          @t5 = t5 = create_test(5)
+          @t6 = t6 = create_test(6)
+          fs = FileSystem.new do
+            file 'test_1.rb', t1
+            file 'test_2.rb', t2
+            dir 'd1' do
+              file 'test_3.rb', t3
+            end
+            file 't4.rb', t4
+            dir 'd2' do
+              file 'test_5', t5
+              file 'test_6.rb', Time
+            end
+            file 't6.rb', t6
+          end
+          fs.require('t6')
+          @c = Dir.new(fs, fs, fs.object_space, fs)
+        end
+
+        def create_test(name)
+          t = Class.new(TestCase)
+          t.class_eval <<-EOC
+            def self.name
+              "T\#{#{name}}"
+            end
+            def test_#{name}a
+            end
+            def test_#{name}b
+            end
+          EOC
+          t
+        end
+
+        def test_simple_collect
+          expected = TestSuite.new('d1')
+          expected << (@t3.suite)
+          assert_equal(expected, @c.collect('d1'))
+        end
+
+        def test_multilevel_collect
+          expected = TestSuite.new('.')
+          expected << @t1.suite << @t2.suite
+          expected << (TestSuite.new('d1') << @t3.suite)
+          assert_equal(expected, @c.collect)
+        end
+
+        def test_collect_file
+          expected = TestSuite.new('test_1.rb')
+          expected << @t1.suite
+          assert_equal(expected, @c.collect('test_1.rb'))
+          
+          expected = TestSuite.new('t4.rb')
+          expected << @t4.suite
+          assert_equal(expected, @c.collect('t4.rb'))
+        end
+
+        def test_nil_pattern
+          expected = TestSuite.new('d2')
+          expected << @t5.suite
+          @c.pattern.clear
+          assert_equal(expected, @c.collect('d2'))
+        end
+
+        def test_filtering
+          expected = TestSuite.new('.')
+          expected << @t1.suite
+          @c.filter = proc{|t| t.method_name == 'test_1a' || t.method_name == 'test_1b'}
+          assert_equal(expected, @c.collect)
+        end
+
+        def test_collect_multi
+          expected = TestSuite.new('[d1, d2]')
+          expected << (TestSuite.new('d1') << @t3.suite)
+          expected << (TestSuite.new('d2') << @t5.suite)
+          @c.pattern.replace([/\btest_/])
+          assert_equal(expected, @c.collect('d1', 'd2'))
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/collector/test_objectspace.rb b/ruby_1_8_6/test/testunit/collector/test_objectspace.rb
new file mode 100644
index 0000000000..a1532ff3e6
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/collector/test_objectspace.rb
@@ -0,0 +1,98 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+require 'test/unit/collector/objectspace'
+
+module Test
+  module Unit
+    module Collector
+      class TC_ObjectSpace < TestCase
+        def setup
+          @tc1 = Class.new(TestCase) do
+            def self.name
+              "tc_1"
+            end
+            def test_1
+            end
+            def test_2
+            end
+          end
+
+          @tc2 = Class.new(TestCase) do
+            def self.name
+              "tc_2"
+            end
+            def test_0
+            end
+          end
+
+          @no_tc = Class.new do
+            def test_4
+            end
+          end
+ 
+          @object_space = {Class => [@tc1, @tc2, @no_tc], String => ['']}
+          def @object_space.each_object(type)
+            self[type].each{|item| yield(item) }
+          end
+
+          @c = ObjectSpace.new(@object_space)
+        end
+
+        def full_suite(name=ObjectSpace::NAME)
+          expected = TestSuite.new(name)
+          expected << (TestSuite.new(@tc1.name) << @tc1.new('test_1') << @tc1.new('test_2'))
+          expected << (TestSuite.new(@tc2.name) << @tc2.new('test_0'))
+        end
+
+        def empty_suite
+          TestSuite.new(ObjectSpace::NAME)
+        end
+        
+        def test_basic_collection
+          assert_equal(full_suite("name"), @c.collect("name"))
+
+          @c.filter = []
+          assert_equal(full_suite("name"), @c.collect("name"))
+        end
+        
+        def test_filtered_collection
+          @c.filter = proc{false}
+          assert_equal(empty_suite, @c.collect)
+
+          @c.filter = proc{true}
+          assert_equal(full_suite, @c.collect)
+
+          @c.filter = proc{nil}
+          assert_equal(full_suite, @c.collect)
+
+          @c.filter = [proc{false}, proc{true}]
+          assert_equal(empty_suite, @c.collect)
+
+          @c.filter = [proc{true}, proc{false}]
+          assert_equal(full_suite, @c.collect)
+
+          @c.filter = [proc{nil}, proc{false}]
+          assert_equal(empty_suite, @c.collect)
+          
+          @c.filter = [proc{nil}, proc{true}]
+          assert_equal(full_suite, @c.collect)
+          
+          expected = TestSuite.new(ObjectSpace::NAME)
+          expected << (TestSuite.new(@tc1.name) << @tc1.new('test_1'))
+          expected << (TestSuite.new(@tc2.name) << @tc2.new('test_0'))
+          @c.filter = proc{|test| ['test_1', 'test_0'].include?(test.method_name)}
+          assert_equal(expected, @c.collect)
+
+          expected = TestSuite.new(ObjectSpace::NAME)
+          expected << (TestSuite.new(@tc1.name) << @tc1.new('test_1'))
+          expected << (TestSuite.new(@tc2.name) << @tc2.new('test_0'))
+          @c.filter = [proc{|t| t.method_name == 'test_1' ? true : nil}, proc{|t| t.method_name == 'test_0' ? true : nil}, proc{false}]
+          assert_equal(expected, @c.collect)
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/runit/test_assert.rb b/ruby_1_8_6/test/testunit/runit/test_assert.rb
new file mode 100644
index 0000000000..a3e62b2b2d
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/runit/test_assert.rb
@@ -0,0 +1,402 @@
+# Author:: Masaki Suketa.
+# Adapted by:: Nathaniel Talbott.
+# Copyright:: Copyright (c) Masaki Suketa. All rights reserved.
+# Copyright:: Copyright (c) 2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'rubyunit'
+
+module RUNIT
+  class TargetAssert
+    include RUNIT::Assert
+  end
+
+  class TestAssert < RUNIT::TestCase
+    def setup
+      @assert = TargetAssert.new
+      @e = nil
+    end
+
+    def test_assert
+      sub_test_assert_pass(true)
+      sub_test_assert_pass(TRUE)
+      sub_test_assert_failure(false)
+      sub_test_assert_failure(FALSE)
+      sub_test_assert_failure(nil)
+      sub_test_assert_pass("")
+      sub_test_assert_pass("ok")
+      sub_test_assert_pass(0)
+      sub_test_assert_pass(1)
+    end
+
+    def test_assert_with_2_argument
+      assert_no_exception {
+        assert(true, "3")
+      }
+      assert_no_exception {
+        assert(true)
+      }
+    end
+
+    def test_assert_equal_float_0_1
+      assert_proc = Proc.new {
+        @assert.assert_equal_float(1.4, 1.35, 0.1)
+      }
+      sub_assert_pass(assert_proc)
+    end
+
+    def test_assert_equal_float_0_5
+      assert_proc = Proc.new {
+        @assert.assert_equal_float(1.4, 1.34, 0.5)
+      }
+      sub_assert_pass(assert_proc)
+    end
+
+    def test_assert_equal_float_0
+      assert_proc = Proc.new {
+        @assert.assert_equal_float(1.4, 1.4, 0)
+      }
+      sub_assert_pass(assert_proc)
+    end
+
+    def test_assert_equal_float_0_raise
+      assert_proc = Proc.new {
+        @assert.assert_equal_float(1.4, 1.34, 0)
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_equal_float_0_01
+      assert_proc = Proc.new {
+        @assert.assert_equal_float(1.4, 1.35, 0.01)
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_equal_float_0_001
+      assert_proc = Proc.new {
+        @assert.assert_equal_float(Math.sqrt(2), 1.414, 0.001)
+      }
+      sub_assert_pass(assert_proc)
+    end
+
+    def test_assert_equal_float_minus_1_0
+      assert_proc = Proc.new {
+        @assert.assert_equal_float(1.4, 1.35, -1.0)
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_fail
+      except = nil
+      begin
+        @assert.assert_fail("failure")
+      rescue Exception
+        except = $!
+      end
+      assert_not_nil(except)
+    end
+
+    def sub_test_assert_pass(obj)
+      assert_proc = Proc.new {
+        @assert.assert(obj)
+      }
+      sub_assert_pass(assert_proc)
+    end
+
+    def sub_test_assert_failure(obj)
+      assert_proc = Proc.new {
+        @assert.assert(obj)
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_equal
+      assert_proc = Proc.new {
+        @assert.assert_equal(2, 2)
+      }
+      sub_assert_pass(assert_proc)
+      assert_proc = Proc.new {
+        @assert.assert_equal(2, 3)
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_nil
+      obj = nil
+      assert_proc = Proc.new {
+        @assert.assert_nil(obj)
+      }
+      sub_assert_pass(assert_proc)
+      obj = 'string'
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_not_nil
+      obj = 'string'
+      assert_proc = Proc.new {
+        @assert.assert_not_nil(obj)
+      }
+      sub_assert_pass(assert_proc)
+
+      obj = nil
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_operator
+      assert_proc = Proc.new {
+        @assert.assert_operator(2, :<, 3)
+      }
+      sub_assert_pass(assert_proc)
+      assert_proc = Proc.new {
+        @assert.assert_operator(2, :>, 3)
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_respond_to
+      sub_test_assert_respond_to('string', 'sub', 'foo')
+      sub_test_assert_respond_to('string', :sub, :foo)
+    end
+
+    def sub_test_assert_respond_to(obj, msg, dummy_msg)
+      assert_proc = Proc.new {
+        @assert.assert_respond_to(msg, obj)
+      }
+      sub_assert_pass(assert_proc)
+      assert_proc = Proc.new {
+        @assert.assert_respond_to(dummy_msg, obj)
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_send
+      assert_proc = Proc.new {
+        ary = []
+        @assert.assert_send ary, :empty?
+      }
+      sub_assert_pass(assert_proc)
+      assert_proc = Proc.new {
+        ary = [2,3]
+        @assert.assert_send ary, :empty?
+      }
+      sub_assert_raise_fail(assert_proc)
+      assert_proc = Proc.new {
+        str = "abc"
+        @assert.assert_send str, :sub!, "z", "y"
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_kind_of
+      assert_proc = Proc.new {
+        @assert.assert_kind_of(String, "string")
+      }
+      sub_assert_pass(assert_proc)
+      assert_proc = Proc.new {
+        @assert.assert_kind_of(Regexp, "string")
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_instance_of
+      assert_proc = Proc.new {
+        @assert.assert_instance_of(String, "string")
+      }
+      sub_assert_pass(assert_proc)
+      assert_proc = Proc.new {
+        @assert.assert_instance_of(Object, "string")
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_match
+      assert_proc = Proc.new{
+        @assert.assert_match('foostring', /foo/)
+      }
+      sub_assert_pass(assert_proc)
+      assert_proc = Proc.new {
+        @assert.assert_match('barstring', /foo/)
+      }
+      sub_assert_raise_fail(assert_proc)
+      match = @assert.assert_match('foostring', /foo/)
+      assert_instance_of(MatchData, match)
+      assert_equal('foo', match[0])
+    end
+
+    def test_assert_matches
+      assert_proc = Proc.new{
+        @assert.assert_matches('foostring', /foo/)
+      }
+      sub_assert_pass(assert_proc)
+      assert_proc = Proc.new {
+        @assert.assert_matches('barstring', /foo/)
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_not_match
+      assert_proc = Proc.new{
+        @assert.assert_not_match('barstring', /foo/)
+      }
+      sub_assert_pass(assert_proc)
+      assert_proc = Proc.new {
+        @assert.assert_not_match('foostring', /foo/)
+      }
+      sub_assert_raise_fail(assert_proc)
+      assert_proc = Proc.new {
+        @assert.assert_not_match('foobarbaz', /ba.+/)
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_same
+      flag = false
+      e = "foo"
+      a = e
+      assert_proc = Proc.new {@assert.assert_same(e, a)}
+      sub_assert_pass(assert_proc)
+
+      a = "foo"
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def test_assert_exception
+      assert_proc = Proc.new{
+        @assert.assert_exception(IOError) {
+    raise IOError
+        }
+      }
+      sub_assert_pass(assert_proc)
+
+      assert_proc = Proc.new{
+        @assert.assert_exception(StandardError) {
+    raise IOError
+        }
+      }
+      sub_assert_raise_fail(assert_proc)
+
+      assert_proc = Proc.new{
+        @assert.assert_exception(IOError, "Exception") {
+    raise StandardError
+        }
+      }
+      sub_assert_raise_fail(assert_proc)
+
+      assert_proc = Proc.new {
+        @assert.assert_exception(StandardError) {
+    "No Exception raised in this block"
+        }
+      }
+      sub_assert_raise_fail(assert_proc)
+
+      assert_proc = Proc.new {
+        @assert.assert_exception(StandardError) {
+    exit(33)
+        }
+      }
+      sub_assert_raise_fail(assert_proc)
+
+      t = @assert.assert_exception(IOError) {
+        raise IOError
+      }
+      assert_instance_of(IOError, t)
+      t = @assert.assert_exception(NameError) {
+        non_existent_method
+      }
+      assert_instance_of(NameError, t)
+      t = @assert.assert_exception(SystemExit) {
+        exit(33)
+      }
+      assert_instance_of(SystemExit, t)
+    end
+
+    def test_assert_no_exception
+      assert_proc = Proc.new{
+        @assert.assert_no_exception(IOError, ArgumentError) {
+    "No Exception raised in this block"
+        }
+      }
+      sub_assert_pass(assert_proc)
+
+      assert_proc = Proc.new{
+        @assert.assert_no_exception(IOError, ArgumentError) {
+    raise StandardError, "Standard Error raised"
+        }
+      }
+      sub_assert_raise_error(assert_proc)
+
+      assert_proc = Proc.new{
+        @assert.assert_no_exception(IOError, ArgumentError) {
+    raise ArgumentError, "Bad Argument"
+        }
+      }
+      sub_assert_raise_fail(assert_proc)
+
+      assert_proc = Proc.new{
+        @assert.assert_no_exception {
+          raise ArgumentError, "Bad Argument"
+        }
+      }
+      sub_assert_raise_fail(assert_proc)
+
+      assert_proc = Proc.new{
+        @assert.assert_no_exception {
+          raise NameError, "Bad Name"
+        }
+      }
+      sub_assert_raise_fail(assert_proc)
+      assert_proc = Proc.new {
+        @assert.assert_no_exception {
+    raise NoMemoryError
+        }
+      }
+      sub_assert_raise_fail(assert_proc)
+    end
+
+    def sub_assert_pass(p)
+      flag = false
+      err = nil
+      begin
+        p.call
+        flag = true
+      rescue
+        err = $!
+        flag = false
+      end
+      assert(flag, err.to_s)
+    end
+
+    def sub_assert_raise_fail(p)
+      flag = false
+      err = nil
+      begin
+        p.call
+        flag = false
+      rescue RUNIT::AssertionFailedError
+        flag = true
+        err = $!
+      rescue Exception
+        flag = false
+        err = $!
+      end
+      assert(flag, err.to_s)
+    end
+      
+    def sub_assert_raise_error(p)
+      flag = false
+      err = nil
+      begin
+        p.call
+        flag = false
+      rescue RUNIT::AssertionFailedError
+        flag = false
+        err = $!
+      rescue Exception
+        flag = true
+        err = $!
+      end
+      assert(flag, err.to_s)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/runit/test_testcase.rb b/ruby_1_8_6/test/testunit/runit/test_testcase.rb
new file mode 100644
index 0000000000..f57e0386e3
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/runit/test_testcase.rb
@@ -0,0 +1,91 @@
+# Author:: Masaki Suketa.
+# Adapted by:: Nathaniel Talbott.
+# Copyright:: Copyright (c) Masaki Suketa. All rights reserved.
+# Copyright:: Copyright (c) 2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'rubyunit'
+
+module RUNIT
+  class DummyError < StandardError
+  end
+
+  class TestTestCase < RUNIT::TestCase
+    def setup
+      @dummy_testcase = Class.new(RUNIT::TestCase) do
+        def self.name
+          "DummyTestCase"
+        end
+        
+        attr_reader :status, :dummy_called, :dummy2_called
+
+        def initialize(*arg)
+          super(*arg)
+          @status = 0
+          @dummy_called = false
+          @dummy2_called = false
+        end
+
+        def setup
+          @status = 1 if @status == 0
+        end
+
+        def test_dummy
+          @status = 2 if @status == 1
+          @dummy_called = true
+        end
+
+        def test_dummy2
+          @status = 2 if @status == 1
+          @dummy2_called = true
+          raise DummyError
+        end
+
+        def teardown
+          @status = 3 if @status == 2
+        end
+      end
+
+      @test1 = @dummy_testcase.new('test_dummy')
+      @test2 = @dummy_testcase.new('test_dummy2', 'TestCase')
+    end
+
+    def test_name
+      assert_equal('DummyTestCase#test_dummy', @test1.name) # The second parameter to #initialize is ignored in emulation
+      assert_equal('DummyTestCase#test_dummy2', @test2.name)
+    end
+
+    def test_run
+      result = RUNIT::TestResult.new
+      @test1.run(result)
+      assert_equal(1, result.run_count)
+    end
+
+    def test_s_suite
+      suite = @dummy_testcase.suite
+      assert_instance_of(RUNIT::TestSuite, suite)
+      assert_equal(2, suite.count_test_cases)
+    end
+
+    def test_teardown_err
+      suite = Class.new(RUNIT::TestCase) do
+        def test_foo
+          assert(false)
+        end
+        
+        def test_bar
+          assert(true)
+        end
+        
+        def teardown
+          raise StandardError
+        end
+      end.suite
+
+      result = RUNIT::TestResult.new
+      suite.run(result)
+      assert_equal(2, result.error_size)
+      assert_equal(1, result.failure_size)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/runit/test_testresult.rb b/ruby_1_8_6/test/testunit/runit/test_testresult.rb
new file mode 100644
index 0000000000..702b88d0c0
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/runit/test_testresult.rb
@@ -0,0 +1,144 @@
+# Author:: Masaki Suketa.
+# Adapted by:: Nathaniel Talbott.
+# Copyright:: Copyright (c) Masaki Suketa. All rights reserved.
+# Copyright:: Copyright (c) 2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'rubyunit'
+
+module RUNIT
+  class TestTestResult < RUNIT::TestCase
+    def setup
+      @result = RUNIT::TestResult.new
+      
+      @normal_suite = Class::new(RUNIT::TestCase) do
+        def test_1
+          assert(true)
+          assert(true)
+        end
+      end.suite
+      
+      @failure_suite = Class::new(RUNIT::TestCase) do
+        def test_1
+          assert(true)
+          assert(false)
+        end
+      end.suite
+      
+      @error_suite = Class::new(RUNIT::TestCase) do
+        def setup
+          raise ScriptError
+        end
+        def test_1
+          assert(true)
+        end
+      end.suite
+      
+      @multi_failure_suite = Class::new(RUNIT::TestCase) do
+        def test1
+          assert(false)
+        end
+        def test2
+          assert(false)
+        end
+        def test3
+          assert(false)
+        end
+      end.suite
+      
+      @with_error_suite = Class::new(RUNIT::TestCase) do
+        def test1
+          raise StandardError
+        end
+      end.suite
+      
+      @multi_error_suite = Class::new(RUNIT::TestCase) do
+        def test1
+          raise StandardError
+        end
+        def test2
+          raise StandardError
+        end
+        def test3
+          raise StandardError
+        end
+      end.suite
+      
+      @multi_suite = Class::new(RUNIT::TestCase) do
+        def test_1
+          assert(true)
+          assert(true)
+        end
+        def test_2
+          assert(true)
+        end
+        def test_3
+          assert(true)
+          assert(false)
+          assert(true)
+        end
+      end.suite
+    end
+
+    def test_error_size
+      @normal_suite.run(@result)
+      assert_equal(0, @result.error_size)
+      @with_error_suite.run(@result)
+      assert_equal(1, @result.error_size)
+      @multi_error_suite.run(@result)
+      assert_equal(4, @result.error_size)
+    end
+
+    def test_errors
+      @normal_suite.run(@result)
+      assert_equal(0, @result.errors.size)
+    end
+
+    def test_failure_size
+      @normal_suite.run(@result)
+      assert_equal(0, @result.failure_size)
+      @failure_suite.run(@result)
+      assert_equal(1, @result.failure_size)
+      @multi_failure_suite.run(@result)
+      assert_equal(4, @result.failure_size)
+    end
+
+    def test_failures
+      @normal_suite.run(@result)
+      assert_equal(0, @result.failures.size)
+      @failure_suite.run(@result)
+      assert_equal(1, @result.failures.size)
+      @multi_failure_suite.run(@result)
+      assert_equal(4, @result.failures.size)
+    end
+
+    def test_run_no_exception
+      assert_no_exception {
+        @error_suite.run(@result)
+      }
+    end
+
+    def test_run_asserts
+      @normal_suite.run(@result)
+      assert_equal(2, @result.run_asserts)
+    end
+
+    def test_run_asserts2
+      @failure_suite.run(@result)
+      assert_equal(2, @result.run_asserts)
+    end
+
+    def test_run_tests
+      assert_equal(0, @result.run_tests)
+      @normal_suite.run(@result)
+      assert_equal(1, @result.run_tests)
+      @multi_suite.run(@result) 
+      assert_equal(4, @result.run_tests)
+    end
+
+    def test_succeed?
+      @normal_suite.run(@result)
+      assert(@result.succeed?)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/runit/test_testsuite.rb b/ruby_1_8_6/test/testunit/runit/test_testsuite.rb
new file mode 100644
index 0000000000..58702d3efe
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/runit/test_testsuite.rb
@@ -0,0 +1,49 @@
+# Author:: Masaki Suketa.
+# Adapted by:: Nathaniel Talbott.
+# Copyright:: Copyright (c) Masaki Suketa. All rights reserved.
+# Copyright:: Copyright (c) 2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'rubyunit'
+
+module RUNIT
+  class TestTestSuite < RUNIT::TestCase
+    def setup
+      @testsuite = RUNIT::TestSuite.new
+      @dummy_test = Class.new(RUNIT::TestCase) do
+        def test_foo
+        end
+        def test_bar
+        end
+      end
+      @dummy_empty_test = Class.new(RUNIT::TestCase){}
+    end
+
+    def test_count_test_cases
+      assert_equal(0, @testsuite.count_test_cases)
+
+      @testsuite.add(@dummy_empty_test.suite)
+      assert_equal(0, @testsuite.count_test_cases)
+
+      @testsuite.add(@dummy_test.suite)
+      assert_equal(2, @testsuite.count_test_cases)
+
+      @testsuite.add(@dummy_test.suite)
+      assert_equal(4, @testsuite.count_test_cases)
+
+      dummytest_foo = @dummy_test.new('test_foo')
+      @testsuite.add(dummytest_foo)
+      assert_equal(5, @testsuite.count_test_cases)
+    end
+
+    def test_add
+      @testsuite.add(@dummy_empty_test.suite)
+      assert_equal(0, @testsuite.size)
+      assert_equal(0, @testsuite.count_test_cases)
+
+      @testsuite.add(@dummy_test.suite)
+      assert_equal(2, @testsuite.size)
+      assert_equal(2, @testsuite.count_test_cases)
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/test_assertions.rb b/ruby_1_8_6/test/testunit/test_assertions.rb
new file mode 100644
index 0000000000..8ccd2a81bd
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/test_assertions.rb
@@ -0,0 +1,528 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+
+module Test
+  module Unit
+    class TC_Assertions < TestCase
+      def check(value, message="")
+        add_assertion
+        if (!value)
+          raise AssertionFailedError.new(message)
+        end
+      end
+
+      def check_assertions(expect_fail, expected_message="", return_value_expected=false)
+        @actual_assertion_count = 0
+        failed = true
+        actual_message = nil
+        @catch_assertions = true
+        return_value = nil
+        begin
+          return_value = yield
+          failed = false
+        rescue AssertionFailedError => error
+          actual_message = error.message
+        end
+        @catch_assertions = false
+        check(expect_fail == failed, (expect_fail ? "Should have failed, but didn't" : "Should not have failed, but did with message\n<#{actual_message}>"))
+        check(1 == @actual_assertion_count, "Should have made one assertion but made <#{@actual_assertion_count}>")
+        if (expect_fail)
+          case expected_message
+            when String
+              check(actual_message == expected_message, "Should have the correct message.\n<#{expected_message.inspect}> expected but was\n<#{actual_message.inspect}>")
+            when Regexp
+              check(actual_message =~ expected_message, "The message should match correctly.\n</#{expected_message.source}/> expected to match\n<#{actual_message.inspect}>")
+            else
+              check(false, "Incorrect expected message type in assert_nothing_failed")
+          end
+        else
+          if (!return_value_expected)
+            check(return_value.nil?, "Should not return a value but returned <#{return_value}>")
+          else
+            check(!return_value.nil?, "Should return a value")
+          end
+        end
+        return return_value
+      end
+      
+      def check_nothing_fails(return_value_expected=false, &proc)
+        check_assertions(false, "", return_value_expected, &proc)
+      end
+      
+      def check_fails(expected_message="", &proc)
+        check_assertions(true, expected_message, &proc)
+      end
+      
+      def test_assert_block
+        check_nothing_fails {
+          assert_block {true}
+        }
+        check_nothing_fails {
+          assert_block("successful assert_block") {true}
+        }
+        check_nothing_fails {
+          assert_block("successful assert_block") {true}
+        }
+        check_fails("assert_block failed.") {
+          assert_block {false}
+        }
+        check_fails("failed assert_block") {
+          assert_block("failed assert_block") {false}
+        }
+      end
+      
+      def test_assert
+        check_nothing_fails{assert("a")}
+        check_nothing_fails{assert(true)}
+        check_nothing_fails{assert(true, "successful assert")}
+        check_fails("<nil> is not true."){assert(nil)}
+        check_fails("<false> is not true."){assert(false)}
+        check_fails("failed assert.\n<false> is not true."){assert(false, "failed assert")}
+      end
+      
+      def test_assert_equal
+        check_nothing_fails {
+          assert_equal("string1", "string1")
+        }
+        check_nothing_fails {
+          assert_equal( "string1", "string1", "successful assert_equal")
+        }
+        check_nothing_fails {
+          assert_equal("string1", "string1", "successful assert_equal")
+        }
+        check_fails(%Q{<"string1"> expected but was\n<"string2">.}) {
+          assert_equal("string1", "string2")
+        }
+        check_fails(%Q{failed assert_equal.\n<"string1"> expected but was\n<"string2">.}) {
+          assert_equal("string1", "string2", "failed assert_equal")
+        }
+        check_fails(%Q{<"1"> expected but was\n<1>.}) do
+          assert_equal("1", 1)
+        end
+      end
+      
+      def test_assert_raise
+        return_value = nil
+        check_nothing_fails(true) {
+          return_value = assert_raise(RuntimeError) {
+            raise "Error"
+          }
+        }
+        check(return_value.kind_of?(Exception), "Should have returned the exception from a successful assert_raise")
+        check(return_value.message == "Error", "Should have returned the correct exception from a successful assert_raise")
+        check_nothing_fails(true) {
+          assert_raise(ArgumentError, "successful assert_raise") {
+            raise ArgumentError.new("Error")
+          }
+        }
+        check_nothing_fails(true) {
+          assert_raise(RuntimeError) {
+            raise "Error"
+          }
+        }
+        check_nothing_fails(true) {
+          assert_raise(RuntimeError, "successful assert_raise") {
+            raise "Error"
+          }
+        }
+        check_fails("<RuntimeError> exception expected but none was thrown.") {
+          assert_raise(RuntimeError) {
+            1 + 1
+          }
+        }
+        check_fails(%r{\Afailed assert_raise.\n<ArgumentError> exception expected but was\nClass: <RuntimeError>\nMessage: <"Error">\n---Backtrace---\n.+\n---------------\Z}m) {
+          assert_raise(ArgumentError, "failed assert_raise") {
+            raise "Error"
+          }
+        }
+        check_fails("Should expect a class of exception, Object.\n<false> is not true.") {
+          assert_nothing_raised(Object) {
+            1 + 1
+          }
+        }
+
+        exceptions = [ArgumentError, TypeError]
+        modules = [Math, Comparable]
+        rescues = exceptions + modules
+        exceptions.each do |exc|
+          check_nothing_fails(true) {
+            return_value = assert_raise(*rescues) {
+              raise exc, "Error"
+            }
+          }
+          check(return_value.instance_of?(exc), "Should have returned #{exc} but was #{return_value.class}")
+          check(return_value.message == "Error", "Should have returned the correct exception from a successful assert_raise")
+        end
+        modules.each do |mod|
+          check_nothing_fails(true) {
+            return_value = assert_raise(*rescues) {
+              raise Exception.new("Error").extend(mod)
+            }
+          }
+          check(mod === return_value, "Should have returned #{mod}")
+          check(return_value.message == "Error", "Should have returned the correct exception from a successful assert_raise")
+        end
+        check_fails("<[ArgumentError, TypeError, Math, Comparable]> exception expected but none was thrown.") {
+          assert_raise(*rescues) {
+            1 + 1
+          }
+        }
+        check_fails(%r{\Afailed assert_raise.
+<\[ArgumentError, TypeError\]> exception expected but was
+Class: <RuntimeError>
+Message: <"Error">
+---Backtrace---
+.+
+---------------\Z}m) {
+          assert_raise(ArgumentError, TypeError, "failed assert_raise") {
+            raise "Error"
+          }
+        }
+      end
+      
+      def test_assert_instance_of
+        check_nothing_fails {
+          assert_instance_of(String, "string")
+        }
+        check_nothing_fails {
+          assert_instance_of(String, "string", "successful assert_instance_of")
+        }
+        check_nothing_fails {
+          assert_instance_of(String, "string", "successful assert_instance_of")
+        }
+        check_fails(%Q{<"string"> expected to be an instance of\n<Hash> but was\n<String>.}) {
+          assert_instance_of(Hash, "string")
+        }
+        check_fails(%Q{failed assert_instance_of.\n<"string"> expected to be an instance of\n<Hash> but was\n<String>.}) {
+          assert_instance_of(Hash, "string", "failed assert_instance_of")
+        }
+      end
+      
+      def test_assert_nil
+        check_nothing_fails {
+          assert_nil(nil)
+        }
+        check_nothing_fails {
+          assert_nil(nil, "successful assert_nil")
+        }
+        check_nothing_fails {
+          assert_nil(nil, "successful assert_nil")
+        }
+        check_fails(%Q{<nil> expected but was\n<"string">.}) {
+          assert_nil("string")
+        }
+        check_fails(%Q{failed assert_nil.\n<nil> expected but was\n<"string">.}) {
+          assert_nil("string", "failed assert_nil")
+        }
+      end
+      
+      def test_assert_not_nil
+        check_nothing_fails{assert_not_nil(false)}
+        check_nothing_fails{assert_not_nil(false, "message")}
+        check_fails("<nil> expected to not be nil."){assert_not_nil(nil)}
+        check_fails("message.\n<nil> expected to not be nil.") {assert_not_nil(nil, "message")}
+      end
+        
+      def test_assert_kind_of
+        check_nothing_fails {
+          assert_kind_of(Module, Array)
+        }
+        check_nothing_fails {
+          assert_kind_of(Object, "string", "successful assert_kind_of")
+        }
+        check_nothing_fails {
+          assert_kind_of(Object, "string", "successful assert_kind_of")
+        }
+        check_nothing_fails {
+          assert_kind_of(Comparable, 1)
+        }
+        check_fails(%Q{<"string">\nexpected to be kind_of?\n<Class> but was\n<String>.}) {
+          assert_kind_of(Class, "string")
+        }
+        check_fails(%Q{failed assert_kind_of.\n<"string">\nexpected to be kind_of?\n<Class> but was\n<String>.}) {
+          assert_kind_of(Class, "string", "failed assert_kind_of")
+        }
+      end
+      
+      def test_assert_match
+        check_nothing_fails {
+          assert_match(/strin./, "string")
+        }
+        check_nothing_fails {
+          assert_match("strin", "string")
+        }
+        check_nothing_fails {
+          assert_match(/strin./, "string", "successful assert_match")
+        }
+        check_nothing_fails {
+          assert_match(/strin./, "string", "successful assert_match")
+        }
+        check_fails(%Q{<"string"> expected to be =~\n</slin./>.}) {
+          assert_match(/slin./, "string")
+        }
+        check_fails(%Q{<"string"> expected to be =~\n</strin\\./>.}) {
+          assert_match("strin.", "string")
+        }
+        check_fails(%Q{failed assert_match.\n<"string"> expected to be =~\n</slin./>.}) {
+          assert_match(/slin./, "string", "failed assert_match")
+        }
+      end
+      
+      def test_assert_same
+        thing = "thing"
+        check_nothing_fails {
+          assert_same(thing, thing)
+        }
+        check_nothing_fails {
+          assert_same(thing, thing, "successful assert_same")
+        }
+        check_nothing_fails {
+          assert_same(thing, thing, "successful assert_same")
+        }
+        thing2 = "thing"
+        check_fails(%Q{<"thing">\nwith id <#{thing.__id__}> expected to be equal? to\n<"thing">\nwith id <#{thing2.__id__}>.}) {
+          assert_same(thing, thing2)
+        }
+        check_fails(%Q{failed assert_same.\n<"thing">\nwith id <#{thing.__id__}> expected to be equal? to\n<"thing">\nwith id <#{thing2.__id__}>.}) {
+          assert_same(thing, thing2, "failed assert_same")
+        }
+      end
+      
+      def test_assert_nothing_raised
+        check_nothing_fails {
+          assert_nothing_raised {
+            1 + 1
+          }
+        }
+        check_nothing_fails {
+          assert_nothing_raised("successful assert_nothing_raised") {
+            1 + 1
+          }
+        }
+        check_nothing_fails {
+          assert_nothing_raised("successful assert_nothing_raised") {
+            1 + 1
+          }
+        }
+        check_nothing_fails {
+          begin
+            assert_nothing_raised(RuntimeError, StandardError, Comparable, "successful assert_nothing_raised") {
+              raise ZeroDivisionError.new("ArgumentError")
+            }
+          rescue ZeroDivisionError
+          end
+        }
+        check_fails("Should expect a class of exception, Object.\n<false> is not true.") {
+          assert_nothing_raised(Object) {
+            1 + 1
+          }
+        }
+        check_fails(%r{\AException raised:\nClass: <RuntimeError>\nMessage: <"Error">\n---Backtrace---\n.+\n---------------\Z}m) {
+          assert_nothing_raised {
+            raise "Error"
+          }
+        }
+        check_fails(%r{\Afailed assert_nothing_raised\.\nException raised:\nClass: <RuntimeError>\nMessage: <"Error">\n---Backtrace---\n.+\n---------------\Z}m) {
+          assert_nothing_raised("failed assert_nothing_raised") {
+            raise "Error"
+          }
+        }
+        check_fails(%r{\AException raised:\nClass: <RuntimeError>\nMessage: <"Error">\n---Backtrace---\n.+\n---------------\Z}m) {
+          assert_nothing_raised(StandardError, RuntimeError) {
+            raise "Error"
+          }
+        }
+        check_fails("Failure.") do
+          assert_nothing_raised do
+            flunk("Failure")
+          end
+        end
+      end
+      
+      def test_flunk
+        check_fails("Flunked.") {
+          flunk
+        }
+        check_fails("flunk message.") {
+          flunk("flunk message")
+        }
+      end
+      
+      def test_assert_not_same
+        thing = "thing"
+        thing2 = "thing"
+        check_nothing_fails {
+          assert_not_same(thing, thing2)
+        }
+        check_nothing_fails {
+          assert_not_same(thing, thing2, "message")
+        }
+        check_fails(%Q{<"thing">\nwith id <#{thing.__id__}> expected to not be equal? to\n<"thing">\nwith id <#{thing.__id__}>.}) {
+          assert_not_same(thing, thing)
+        }
+        check_fails(%Q{message.\n<"thing">\nwith id <#{thing.__id__}> expected to not be equal? to\n<"thing">\nwith id <#{thing.__id__}>.}) {
+          assert_not_same(thing, thing, "message")
+        }
+      end
+      
+      def test_assert_not_equal
+        check_nothing_fails {
+          assert_not_equal("string1", "string2")
+        }
+        check_nothing_fails {
+          assert_not_equal("string1", "string2", "message")
+        }
+        check_fails(%Q{<"string"> expected to be != to\n<"string">.}) {
+          assert_not_equal("string", "string")
+        }
+        check_fails(%Q{message.\n<"string"> expected to be != to\n<"string">.}) {
+          assert_not_equal("string", "string", "message")
+        }
+      end
+      
+      def test_assert_no_match
+        check_nothing_fails{assert_no_match(/sling/, "string")}
+        check_nothing_fails{assert_no_match(/sling/, "string", "message")}
+        check_fails(%Q{The first argument to assert_no_match should be a Regexp.\n<"asdf"> expected to be an instance of\n<Regexp> but was\n<String>.}) do
+          assert_no_match("asdf", "asdf")
+        end
+        check_fails(%Q{</string/> expected to not match\n<"string">.}) do
+          assert_no_match(/string/, "string")
+        end
+        check_fails(%Q{message.\n</string/> expected to not match\n<"string">.}) do
+          assert_no_match(/string/, "string", "message")
+        end
+      end
+      
+      def test_assert_throws
+        check_nothing_fails {
+          assert_throws(:thing, "message") {
+            throw :thing
+          }
+        }
+        check_fails("message.\n<:thing> expected to be thrown but\n<:thing2> was thrown.") {
+          assert_throws(:thing, "message") {
+            throw :thing2
+          }
+        }
+        check_fails("message.\n<:thing> should have been thrown.") {
+          assert_throws(:thing, "message") {
+            1 + 1
+          }
+        }
+      end
+      
+      def test_assert_nothing_thrown
+        check_nothing_fails {
+          assert_nothing_thrown("message") {
+            1 + 1
+          }
+        }
+        check_fails("message.\n<:thing> was thrown when nothing was expected.") {
+          assert_nothing_thrown("message") {
+            throw :thing
+          }
+        }
+      end
+      
+      def test_assert_operator
+        check_nothing_fails {
+          assert_operator("thing", :==, "thing", "message")
+        }
+        check_fails(%Q{<0.15>\ngiven as the operator for #assert_operator must be a Symbol or #respond_to?(:to_str).}) do
+          assert_operator("thing", 0.15, "thing")
+        end
+        check_fails(%Q{message.\n<"thing1"> expected to be\n==\n<"thing2">.}) {
+          assert_operator("thing1", :==, "thing2", "message")
+        }
+      end
+      
+      def test_assert_respond_to
+        check_nothing_fails {
+          assert_respond_to("thing", :to_s, "message")
+        }
+        check_nothing_fails {
+          assert_respond_to("thing", "to_s", "message")
+        }
+        check_fails("<0.15>\ngiven as the method name argument to #assert_respond_to must be a Symbol or #respond_to?(:to_str).") {
+          assert_respond_to("thing", 0.15)
+        }
+        check_fails("message.\n<:symbol>\nof type <Symbol>\nexpected to respond_to?<:non_existent>.") {
+          assert_respond_to(:symbol, :non_existent, "message")
+        }
+      end
+      
+      def test_assert_in_delta
+        check_nothing_fails {
+          assert_in_delta(1.4, 1.4, 0)
+        }
+        check_nothing_fails {
+          assert_in_delta(0.5, 0.4, 0.1, "message")
+        }
+        check_nothing_fails {
+          float_thing = Object.new
+          def float_thing.to_f
+            0.2
+          end
+          assert_in_delta(0.1, float_thing, 0.1)
+        }
+        check_fails("message.\n<0.5> and\n<0.4> expected to be within\n<0.05> of each other.") {
+          assert_in_delta(0.5, 0.4, 0.05, "message")
+        }
+        check_fails(%r{The arguments must respond to to_f; the first float did not\.\n<.+>\nof type <Object>\nexpected to respond_to\?<:to_f>.}) {
+          assert_in_delta(Object.new, 0.4, 0.1)
+        }
+        check_fails("The delta should not be negative.\n<-0.1> expected to be\n>=\n<0.0>.") {
+          assert_in_delta(0.5, 0.4, -0.1, "message")
+        }
+      end
+      
+      def test_assert_send
+        object = Object.new
+        class << object
+          private
+          def return_argument(argument, bogus)
+            return argument
+          end
+        end
+        check_nothing_fails {
+          assert_send([object, :return_argument, true, "bogus"], "message")
+        }
+        check_fails(%r{\Amessage\.\n<.+> expected to respond to\n<return_argument\(\[false, "bogus"\]\)> with a true value.\Z}) {
+          assert_send([object, :return_argument, false, "bogus"], "message")
+        }
+      end
+      
+      def test_condition_invariant
+        object = Object.new
+        def object.inspect
+          @changed = true
+        end
+        def object.==(other)
+          @changed ||= false
+          return (!@changed)
+        end
+        check_nothing_fails {
+          assert_equal(object, object, "message")
+        }
+      end
+  
+      def add_failure(message, location=caller)
+        if (!@catch_assertions)
+          super
+        end
+      end
+      
+      def add_assertion
+        if (!@catch_assertions)
+          super
+        else
+          @actual_assertion_count += 1
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/test_error.rb b/ruby_1_8_6/test/testunit/test_error.rb
new file mode 100644
index 0000000000..56b275b362
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/test_error.rb
@@ -0,0 +1,26 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+
+module Test
+  module Unit
+    class TC_Error < TestCase
+      TF_Exception = Struct.new('TF_Exception', :message, :backtrace)
+      def test_display
+        ex = TF_Exception.new("message1\nmessage2", ['line1', 'line2'])
+        e = Error.new("name", ex)
+        assert_equal("name: #{TF_Exception.name}: message1", e.short_display)
+        assert_equal(<<EOM.strip, e.long_display)
+Error:
+name:
+Struct::TF_Exception: message1
+message2
+    line1
+    line2
+EOM
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/test_failure.rb b/ruby_1_8_6/test/testunit/test_failure.rb
new file mode 100644
index 0000000000..164f942476
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/test_failure.rb
@@ -0,0 +1,33 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+require 'test/unit/failure'
+
+module Test::Unit
+  class TestFailure < TestCase
+    def test_display
+      f = Failure.new("name", [%q{location:1 in 'l'}], "message1\nmessage2")
+      assert_equal("name: message1", f.short_display)
+      assert_equal(<<EOM.strip, f.long_display)
+Failure:
+name [location:1]:
+message1
+message2
+EOM
+
+      f = Failure.new("name", [%q{location1:2 in 'l1'}, 'location2:1', %q{location3:3 in 'l3'}], "message1\nmessage2")
+      assert_equal("name: message1", f.short_display)
+      assert_equal(<<EOM.strip, f.long_display)
+Failure:
+name
+    [location1:2 in 'l1'
+     location2:1
+     location3:3 in 'l3']:
+message1
+message2
+EOM
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/test_testcase.rb b/ruby_1_8_6/test/testunit/test_testcase.rb
new file mode 100644
index 0000000000..2934a92fef
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/test_testcase.rb
@@ -0,0 +1,275 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+
+module Test
+  module Unit
+    class TC_TestCase < TestCase
+      def test_creation
+        tc = Class.new(TestCase) do
+          def test_with_arguments(arg1, arg2)
+          end
+        end
+      
+        caught = true
+        catch(:invalid_test) do
+          tc.new(:test_with_arguments)
+          caught = false
+        end
+        check("Should have caught an invalid test when there are arguments", caught)
+        
+        caught = true
+        catch(:invalid_test) do
+          tc.new(:non_existent_test)
+          caught = false
+        end
+        check("Should have caught an invalid test when the method does not exist", caught)
+      end
+      
+      def setup
+        @tc_failure_error = Class.new(TestCase) do
+          def test_failure
+            assert_block("failure") { false }
+          end
+          def test_error
+            1 / 0
+          end
+          def test_nested_failure
+            nested
+          end
+          def nested
+            assert_block("nested"){false}
+          end
+          def return_passed?
+            return passed?
+          end
+        end
+
+        def @tc_failure_error.name
+          "TC_FailureError"
+        end
+      end
+ 
+      def test_add_failed_assertion
+        test_case = @tc_failure_error.new(:test_failure)
+        check("passed? should start out true", test_case.return_passed?)
+        result = TestResult.new
+        called = false
+        result.add_listener(TestResult::FAULT) {
+          | fault |
+          check("Should have a Failure", fault.instance_of?(Failure))
+          check("The Failure should have the correct message", "failure" == fault.message)
+          check("The Failure should have the correct test_name (was <#{fault.test_name}>)", fault.test_name == "test_failure(TC_FailureError)")
+          r = /\A.*#{Regexp.escape(File.basename(__FILE__))}:\d+:in `test_failure'\Z/
+
+          location = fault.location
+          check("The location should be an array", location.kind_of?(Array))
+          check("The location should have two lines (was: <#{location.inspect}>)", location.size == 2)
+          check("The Failure should have the correct location (was <#{location[0].inspect}>, expected <#{r.inspect}>)", r =~ location[0])
+          called = true
+        }
+        progress = []
+        test_case.run(result) { |*arguments| progress << arguments }
+        check("The failure should have triggered the listener", called)
+        check("The failure should have set passed?", !test_case.return_passed?)
+        check("The progress block should have been updated correctly", [[TestCase::STARTED, test_case.name], [TestCase::FINISHED, test_case.name]] == progress)
+      end
+
+      def test_add_failure_nested
+        test_case = @tc_failure_error.new(:test_nested_failure)
+        check("passed? should start out true", test_case.return_passed?)
+
+        result = TestResult.new
+        called = false
+        result.add_listener(TestResult::FAULT) {
+          | fault |
+          check("Should have a Failure", fault.instance_of?(Failure))
+          check("The Failure should have the correct message", "nested" == fault.message)
+          check("The Failure should have the correct test_name (was <#{fault.test_name}>)", fault.test_name == "test_nested_failure(TC_FailureError)")
+          r = 
+
+          location = fault.location
+          check("The location should be an array", location.kind_of?(Array))
+          check("The location should have the correct number of lines (was: <#{location.inspect}>)", location.size == 3)
+          check("The Failure should have the correct location (was <#{location[0].inspect}>)", /\A.*#{Regexp.escape(File.basename(__FILE__))}:\d+:in `nested'\Z/ =~ location[0])
+          check("The Failure should have the correct location (was <#{location[1].inspect}>)", /\A.*#{Regexp.escape(File.basename(__FILE__))}:\d+:in `test_nested_failure'\Z/ =~ location[1])
+          called = true
+        }
+        test_case.run(result){}
+        check("The failure should have triggered the listener", called)
+      end
+      
+      def test_add_error
+        test_case = @tc_failure_error.new(:test_error)
+        check("passed? should start out true", test_case.return_passed?)
+        result = TestResult.new
+        called = false
+        result.add_listener(TestResult::FAULT) {
+          | fault |
+          check("Should have a TestError", fault.instance_of?(Error))
+          check("The Error should have the correct message", "ZeroDivisionError: divided by 0" == fault.message)
+          check("The Error should have the correct test_name", "test_error(TC_FailureError)" == fault.test_name)
+          check("The Error should have the correct exception", fault.exception.instance_of?(ZeroDivisionError))
+          called = true
+        }
+        test_case.run(result) {}
+        check("The error should have triggered the listener", called)
+        check("The error should have set passed?", !test_case.return_passed?)
+      end
+
+      def test_no_tests      
+        suite = TestCase.suite
+        check("Should have a test suite", suite.instance_of?(TestSuite))
+        check("Should have one test", suite.size == 1)
+        check("Should have the default test", suite.tests.first.name == "default_test(Test::Unit::TestCase)")
+        
+        result = TestResult.new
+        suite.run(result) {}
+        check("Should have had one test run", result.run_count == 1)
+        check("Should have had one test failure", result.failure_count == 1)
+        check("Should have had no errors", result.error_count == 0)
+      end
+
+      def test_suite
+        tc = Class.new(TestCase) do
+          def test_succeed
+            assert_block {true}
+          end
+          def test_fail
+            assert_block {false}
+          end
+          def test_error
+            1/0
+          end
+          def dont_run
+            assert_block {true}
+          end
+          def test_dont_run(argument)
+            assert_block {true}
+          end
+          def test
+            assert_block {true}
+          end
+        end
+      
+        suite = tc.suite
+        check("Should have a test suite", suite.instance_of?(TestSuite))
+        check("Should have three tests", suite.size == 3)
+  
+        result = TestResult.new
+        suite.run(result) {}
+        check("Should have had three test runs", result.run_count == 3)
+        check("Should have had one test failure", result.failure_count == 1)
+        check("Should have had one test error", result.error_count == 1)
+      end
+      
+     
+      def test_setup_teardown
+        tc = Class.new(TestCase) do
+          attr_reader(:setup_called, :teardown_called)
+          def initialize(test)
+            super(test)
+            @setup_called = false
+            @teardown_called = false
+          end
+          def setup
+            @setup_called = true
+          end
+          def teardown
+            @teardown_called = true
+          end
+          def test_succeed
+            assert_block {true}
+          end
+          def test_fail
+            assert_block {false}
+          end
+          def test_error
+            raise "Error!"
+          end
+        end
+        result = TestResult.new
+  
+        test = tc.new(:test_succeed)
+        test.run(result) {}
+        check("Should have called setup the correct number of times", test.setup_called)
+        check("Should have called teardown the correct number of times", test.teardown_called)
+  
+        test = tc.new(:test_fail)
+        test.run(result) {}
+        check("Should have called setup the correct number of times", test.setup_called)
+        check("Should have called teardown the correct number of times", test.teardown_called)
+  
+        test = tc.new(:test_error)
+        test.run(result) {}
+        check("Should have called setup the correct number of times", test.setup_called)
+        check("Should have called teardown the correct number of times", test.teardown_called)
+  
+        check("Should have had two test runs", result.run_count == 3)
+        check("Should have had a test failure", result.failure_count == 1)
+        check("Should have had a test error", result.error_count == 1)
+      end
+      
+      def test_assertion_failed_not_called
+        tc = Class.new(TestCase) do
+          def test_thing
+            raise AssertionFailedError.new
+          end
+        end
+        
+        suite = tc.suite
+        check("Should have one test", suite.size == 1)
+        result = TestResult.new
+        suite.run(result) {}
+        check("Should have had one test run", result.run_count == 1)
+        check("Should have had one assertion failure", result.failure_count == 1)
+        check("Should not have any assertion errors but had #{result.error_count}", result.error_count == 0)
+      end
+      
+      def test_equality
+        tc1 = Class.new(TestCase) do
+          def test_1
+          end
+          def test_2
+          end
+        end
+        
+        tc2 = Class.new(TestCase) do
+          def test_1
+          end
+        end
+      
+        test1 = tc1.new('test_1')
+        test2 = tc1.new('test_1')
+        check("Should be equal", test1 == test2)
+        check("Should be equal", test2 == test1)
+        
+        test1 = tc1.new('test_2')
+        check("Should not be equal", test1 != test2)
+        check("Should not be equal", test2 != test1)
+        
+        test2 = tc1.new('test_2')
+        check("Should be equal", test1 == test2)
+        check("Should be equal", test2 == test1)
+        
+        test1 = tc1.new('test_1')
+        test2 = tc2.new('test_1')
+        check("Should not be equal", test1 != test2)
+        check("Should not be equal", test2 != test1)
+
+        
+        check("Should not be equal", test1 != Object.new)
+        check("Should not be equal", Object.new != test1)
+      end
+      
+      def check(message, passed)
+        @_result.add_assertion
+        if ! passed
+          raise AssertionFailedError.new(message)
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/test_testresult.rb b/ruby_1_8_6/test/testunit/test_testresult.rb
new file mode 100644
index 0000000000..95d631a082
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/test_testresult.rb
@@ -0,0 +1,104 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/testcase'
+require 'test/unit/testresult'
+
+module Test
+  module Unit
+    class TC_TestResult < TestCase
+      def setup
+        @my_result = TestResult.new
+        @my_result.add_assertion()
+        @my_result.add_failure("")
+        @my_result.add_error("")
+      end
+      def test_result_changed_notification
+        called1 = false
+        @my_result.add_listener( TestResult::CHANGED) {
+          |result|
+          assert_block("The result should be correct") { result == @my_result }
+          called1 = true
+        }
+        @my_result.add_assertion
+        assert_block("Should have been notified when the assertion happened") { called1 }
+        
+        called1, called2 = false, false
+        @my_result.add_listener( TestResult::CHANGED) {
+          |result|
+          assert_block("The result should be correct") { result == @my_result }
+          called2 = true
+        }
+        @my_result.add_assertion
+        assert_block("Both listeners should have been notified for a success") { called1 && called2 }
+  
+        called1, called2 = false, false
+        @my_result.add_failure("")
+        assert_block("Both listeners should have been notified for a failure") { called1 && called2 }
+  
+        called1, called2 = false, false    
+        @my_result.add_error("")
+        assert_block("Both listeners should have been notified for an error") { called1 && called2 }
+  
+        called1, called2 = false, false    
+        @my_result.add_run
+        assert_block("Both listeners should have been notified for a run") { called1 && called2 }
+      end
+      def test_fault_notification
+        called1 = false
+        fault = "fault"
+        @my_result.add_listener(TestResult::FAULT) {
+          | passed_fault |
+          assert_block("The fault should be correct") { passed_fault == fault }
+          called1 = true
+        }
+  
+        @my_result.add_assertion
+        assert_block("Should not have been notified when the assertion happened") { !called1 }
+        
+        @my_result.add_failure(fault)
+        assert_block("Should have been notified when the failure happened") { called1 }
+        
+        called1, called2 = false, false
+        @my_result.add_listener(TestResult::FAULT) {
+          | passed_fault |
+          assert_block("The fault should be correct") { passed_fault == fault }
+          called2 = true
+        }
+  
+        @my_result.add_assertion
+        assert_block("Neither listener should have been notified for a success") { !(called1 || called2) }
+  
+        called1, called2 = false, false
+        @my_result.add_failure(fault)
+        assert_block("Both listeners should have been notified for a failure") { called1 && called2 }
+  
+        called1, called2 = false, false    
+        @my_result.add_error(fault)
+        assert_block("Both listeners should have been notified for an error") { called1 && called2 }
+  
+        called1, called2 = false, false
+        @my_result.add_run
+        assert_block("Neither listener should have been notified for a run") { !(called1 || called2) }
+      end
+      def test_passed?
+        result = TestResult.new
+        assert(result.passed?, "An empty result should have passed")
+  
+        result.add_assertion
+        assert(result.passed?, "Adding an assertion should not cause the result to not pass")
+  
+        result.add_run
+        assert(result.passed?, "Adding a run should not cause the result to not pass")
+  
+        result.add_failure("")
+        assert(!result.passed?, "Adding a failed assertion should cause the result to not pass")
+  
+        result = TestResult.new
+        result.add_error("")
+        assert(!result.passed?, "Adding an error should cause the result to not pass")
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/test_testsuite.rb b/ruby_1_8_6/test/testunit/test_testsuite.rb
new file mode 100644
index 0000000000..5f6631d3eb
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/test_testsuite.rb
@@ -0,0 +1,129 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+
+module Test
+  module Unit
+    class TC_TestSuite < TestCase
+      def setup
+        @testcase1 = Class.new(TestCase) do
+          def test_succeed1
+            assert_block { true }
+          end
+          def test_fail
+            assert_block { false }
+          end
+        end
+
+        @testcase2 = Class.new(TestCase) do
+          def test_succeed2
+            assert_block { true }
+          end
+          def test_error
+            raise
+          end
+        end
+      end
+
+      def test_add
+        s = TestSuite.new
+        assert_equal(s, s << self.class.new("test_add"))
+      end
+
+      def test_delete
+        s = TestSuite.new
+        t1 = self.class.new("test_delete")
+        s << t1
+        t2 = self.class.new("test_add")
+        s << t2
+        assert_equal(t1, s.delete(t1))
+        assert_nil(s.delete(t1))
+        assert_equal(TestSuite.new << t2, s)
+      end
+
+      def test_size
+        suite = TestSuite.new
+        suite2 = TestSuite.new
+        suite2 << self.class.new("test_size")
+        suite << suite2
+        suite << self.class.new("test_size")
+        assert_equal(2, suite.size, "The count should be correct")
+      end
+      
+      def test_run
+        progress = []
+        suite = @testcase1.suite
+        result = TestResult.new
+        suite.run(result) { |*values| progress << values }
+  
+        assert_equal(2, result.run_count, "Should have had four test runs")
+        assert_equal(1, result.failure_count, "Should have had one test failure")
+        assert_equal(0, result.error_count, "Should have had one test error")
+        assert_equal([[TestSuite::STARTED, suite.name],
+                [TestCase::STARTED, "test_fail(#{suite.name})"],
+                [TestCase::FINISHED, "test_fail(#{suite.name})"],
+                [TestCase::STARTED, "test_succeed1(#{suite.name})"],
+                [TestCase::FINISHED, "test_succeed1(#{suite.name})"],
+                [TestSuite::FINISHED, suite.name]],
+                progress, "Should have had the correct progress")
+        
+        suite = TestSuite.new
+        suite << @testcase1.suite
+        suite << @testcase2.suite
+        result = TestResult.new
+        progress = []
+        suite.run(result) { |*values| progress << values }
+  
+        assert_equal(4, result.run_count, "Should have had four test runs")
+        assert_equal(1, result.failure_count, "Should have had one test failure")
+        assert_equal(1, result.error_count, "Should have had one test error")
+        assert_equal(14, progress.size, "Should have had the correct number of progress calls")
+      end
+      
+      def test_empty?
+        assert(TestSuite.new.empty?, "A new test suite should be empty?")
+        assert(!@testcase2.suite.empty?, "A test suite with tests should not be empty")
+      end
+      
+      def test_equality
+        suite1 = TestSuite.new
+        suite2 = TestSuite.new
+        assert_equal(suite1, suite2)
+        assert_equal(suite2, suite1)
+        
+        suite1 = TestSuite.new('name')
+        assert_not_equal(suite1, suite2)
+        assert_not_equal(suite2, suite1)
+        
+        suite2 = TestSuite.new('name')
+        assert_equal(suite1, suite2)
+        assert_equal(suite2, suite1)
+        
+        suite1 << 'test'
+        assert_not_equal(suite1, suite2)
+        assert_not_equal(suite2, suite1)
+        
+        suite2 << 'test'
+        assert_equal(suite1, suite2)
+        assert_equal(suite2, suite1)
+        
+        suite2 = Object.new
+        class << suite2
+          def name
+            'name'
+          end
+          def tests
+            ['test']
+          end
+        end
+        assert_not_equal(suite1, suite2)
+        assert_not_equal(suite2, suite1)
+
+        assert_not_equal(suite1, Object.new)
+        assert_not_equal(Object.new, suite1)
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/util/test_backtracefilter.rb b/ruby_1_8_6/test/testunit/util/test_backtracefilter.rb
new file mode 100644
index 0000000000..d4e40ea6ab
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/util/test_backtracefilter.rb
@@ -0,0 +1,41 @@
+require 'test/unit'
+
+require 'test/unit/util/backtracefilter'
+
+module Test::Unit::Util
+  class TestBacktraceFilter < Test::Unit::TestCase
+    include BacktraceFilter
+    
+    def test_filter_backtrace
+      backtrace = [%q{C:\some\old\path/test/unit/assertions.rb:44:in 'assert'},
+        %q{tc_thing.rb:4:in 'a'},
+        %q{tc_thing.rb:4:in 'test_stuff'},
+        %q{C:\some\old\path/test/unit/testcase.rb:44:in 'send'},
+        %q{C:\some\old\path\test\unit\testcase.rb:44:in 'run'},
+        %q{C:\some\old\path\test\unit.rb:44:in 'run'},
+        %q{tc_thing.rb:3}]
+      assert_equal(backtrace[1..2], filter_backtrace(backtrace, %q{C:\some\old\path\test\unit}), "Should filter out all TestUnit-specific lines")
+
+backtrace = [%q{tc_thing.rb:4:in 'a'},
+        %q{tc_thing.rb:4:in 'test_stuff'},
+        %q{tc_thing.rb:3}]
+      assert_equal(backtrace, filter_backtrace(backtrace, %q{C:\some\old\path\test\unit}), "Shouldn't filter too much")
+
+      backtrace = [%q{C:\some\old\path/test/unit/assertions.rb:44:in 'assert'},
+        %q{tc_thing.rb:4:in 'a'},
+        %q{tc_thing.rb:4:in 'test_stuff'},
+        %q{tc_thing.rb:3}]
+      assert_equal(backtrace[1..3], filter_backtrace(backtrace, %q{C:\some\old\path\test\unit}), "Should filter out all TestUnit-specific lines")
+      
+      backtrace = [%q{C:\some\old\path/test/unit/assertions.rb:44:in 'assert'},
+        %q{C:\some\old\path/test/unit/testcase.rb:44:in 'send'},
+        %q{C:\some\old\path\test\unit\testcase.rb:44:in 'run'},
+        %q{C:\some\old\path\test\unit.rb:44:in 'run'}]
+      assert_equal(backtrace, filter_backtrace(backtrace, %q{C:\some\old\path\test\unit}), "Should filter out all TestUnit-specific lines")
+    end
+
+    def test_nil_backtrace
+      assert_equal(["No backtrace"], filter_backtrace(nil))
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/util/test_observable.rb b/ruby_1_8_6/test/testunit/util/test_observable.rb
new file mode 100644
index 0000000000..6cd10184f1
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/util/test_observable.rb
@@ -0,0 +1,102 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/util/observable'
+
+module Test
+  module Unit
+    module Util
+      class TC_Observable < TestCase
+      
+        class TF_Observable
+          include Observable
+        end
+        
+        def setup
+          @observable = TF_Observable.new
+        end
+        
+        def test_simple_observation
+          assert_raises(ArgumentError, "add_listener should throw an exception if no callback is supplied") do
+            @observable.add_listener(:property, "a")
+          end
+      
+          heard = false
+          callback = proc { heard = true }
+          assert_equal("a", @observable.add_listener(:property, "a", &callback), "add_listener should return the listener that was added")
+      
+          count = 0
+          @observable.instance_eval do
+            count = notify_listeners(:property)
+          end
+          assert_equal(1, count, "notify_listeners should have returned the number of listeners that were notified")
+          assert(heard, "Should have heard the property changed")
+      
+          heard = false
+          assert_equal(callback, @observable.remove_listener(:property, "a"), "remove_listener should return the callback")
+          
+          count = 1
+          @observable.instance_eval do
+            count = notify_listeners(:property)
+          end
+          assert_equal(0, count, "notify_listeners should have returned the number of listeners that were notified")
+          assert(!heard, "Should not have heard the property change")
+        end
+        
+        def test_value_observation
+          value = nil
+          @observable.add_listener(:property, "a") do |passed_value|
+            value = passed_value
+          end
+          count = 0
+          @observable.instance_eval do
+            count = notify_listeners(:property, "stuff")
+          end
+          assert_equal(1, count, "Should have update the correct number of listeners")
+          assert_equal("stuff", value, "Should have received the value as an argument to the listener")
+        end
+        
+        def test_multiple_value_observation
+          values = []
+          @observable.add_listener(:property, "a") do |first_value, second_value|
+            values = [first_value, second_value]
+          end
+          count = 0
+          @observable.instance_eval do
+            count = notify_listeners(:property, "stuff", "more stuff")
+          end
+          assert_equal(1, count, "Should have update the correct number of listeners")
+          assert_equal(["stuff", "more stuff"], values, "Should have received the value as an argument to the listener")
+        end
+        
+        def test_add_remove_with_default_listener
+          assert_raises(ArgumentError, "add_listener should throw an exception if no callback is supplied") do
+            @observable.add_listener(:property)
+          end
+      
+          heard = false
+          callback = proc { heard = true }
+          assert_equal(callback, @observable.add_listener(:property, &callback), "add_listener should return the listener that was added")
+      
+          count = 0
+          @observable.instance_eval do
+            count = notify_listeners(:property)
+          end
+          assert_equal(1, count, "notify_listeners should have returned the number of listeners that were notified")
+          assert(heard, "Should have heard the property changed")
+      
+          heard = false
+          assert_equal(callback, @observable.remove_listener(:property, callback), "remove_listener should return the callback")
+      
+          count = 1
+          @observable.instance_eval do
+            count = notify_listeners(:property)
+          end
+          assert_equal(0, count, "notify_listeners should have returned the number of listeners that were notified")
+          assert(!heard, "Should not have heard the property change")
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/testunit/util/test_procwrapper.rb b/ruby_1_8_6/test/testunit/util/test_procwrapper.rb
new file mode 100644
index 0000000000..3e552c7711
--- /dev/null
+++ b/ruby_1_8_6/test/testunit/util/test_procwrapper.rb
@@ -0,0 +1,36 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+require 'test/unit/util/procwrapper'
+
+module Test
+  module Unit
+    module Util
+      class TC_ProcWrapper < TestCase
+        def munge_proc(&a_proc)
+          return a_proc
+        end
+        def setup
+          @original = proc {}
+          @munged = munge_proc(&@original)
+          @wrapped_original = ProcWrapper.new(@original)
+          @wrapped_munged = ProcWrapper.new(@munged)
+        end
+        def test_wrapping
+          assert_same(@original, @wrapped_original.to_proc, "The wrapper should return what was wrapped")
+        end
+        def test_hashing
+      
+          assert_equal(@wrapped_original.hash, @wrapped_munged.hash, "The original and munged should have the same hash when wrapped")
+          assert_equal(@wrapped_original, @wrapped_munged, "The wrappers should be equivalent")
+          
+          a_hash = {@wrapped_original => @original}
+          assert(a_hash[@wrapped_original], "Should be able to access the wrapper in the hash")
+          assert_equal(a_hash[@wrapped_original], @original, "Should be able to access the wrapper in the hash")
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/thread/test_thread.rb b/ruby_1_8_6/test/thread/test_thread.rb
new file mode 100644
index 0000000000..abdcebffcf
--- /dev/null
+++ b/ruby_1_8_6/test/thread/test_thread.rb
@@ -0,0 +1,67 @@
+require 'thread'
+require 'test/unit'
+
+class TC_Thread < Test::Unit::TestCase
+    def setup
+	Thread.abort_on_exception = true
+    end
+    def teardown
+	Thread.abort_on_exception = false
+    end
+    def test_condvar
+	mutex = Mutex.new
+	condvar = ConditionVariable.new
+	result = []
+	mutex.synchronize do
+	    t = Thread.new do
+		mutex.synchronize do
+		    result << 1
+		    condvar.signal
+		end
+	    end
+	
+	    result << 0
+	    condvar.wait(mutex)
+	    result << 2
+	    t.join
+	end
+	assert_equal([0, 1, 2], result)
+    end
+
+    def test_condvar_wait_not_owner
+	mutex = Mutex.new
+	condvar = ConditionVariable.new
+
+	assert_raises(ThreadError) { condvar.wait(mutex) }
+    end
+
+    def test_condvar_wait_exception_handling
+	# Calling wait in the only thread running should raise a ThreadError of
+	# 'stopping only thread'
+	mutex = Mutex.new
+	condvar = ConditionVariable.new
+
+	Thread.abort_on_exception = false
+
+	locked = false
+	thread = Thread.new do
+	    mutex.synchronize do
+		begin
+		    condvar.wait(mutex)
+		rescue Exception
+		    locked = mutex.locked?
+		    raise
+		end
+	    end
+	end
+
+	while !thread.stop?
+	    sleep(0.1)
+	end
+
+	thread.raise Interrupt, "interrupt a dead condition variable"
+	assert_raises(Interrupt) { thread.value }
+	assert(locked)
+    end
+end
+
diff --git a/ruby_1_8_6/test/uri/test_common.rb b/ruby_1_8_6/test/uri/test_common.rb
new file mode 100644
index 0000000000..a159901ea6
--- /dev/null
+++ b/ruby_1_8_6/test/uri/test_common.rb
@@ -0,0 +1,56 @@
+require 'test/unit'
+require 'uri'
+
+module URI
+
+
+class TestCommon < Test::Unit::TestCase
+  def setup
+  end
+
+  def teardown
+  end
+
+  def test_extract
+    # ruby-list:36086
+    assert_equal(['http://example.com'], 
+		 URI.extract('http://example.com'))
+    assert_equal(['http://example.com'], 
+		 URI.extract('(http://example.com)'))
+    assert_equal(['http://example.com/foo)'], 
+		 URI.extract('(http://example.com/foo)'))
+    assert_equal(['http://example.jphttp://example.jp'], 
+		 URI.extract('http://example.jphttp://example.jp'))
+    assert_equal(['http://example.jphttp://example.jp'], 
+		 URI.extract('http://example.jphttp://example.jp', ['http']))
+    assert_equal(['http://', 'mailto:'].sort, 
+		 URI.extract('ftp:// http:// mailto: https://', ['http', 'mailto']).sort)
+    # reported by Doug Kearns <djkea2@mugca.its.monash.edu.au>
+    assert_equal(['From:', 'mailto:xxx@xxx.xxx.xxx]'].sort, 
+		 URI.extract('From: XXX [mailto:xxx@xxx.xxx.xxx]').sort)
+  end
+
+  def test_regexp
+    assert_instance_of Regexp, URI.regexp
+    assert_instance_of Regexp, URI.regexp(['http'])
+    assert_equal URI.regexp, URI.regexp
+    assert_equal 'http://', 'x http:// x'.slice(URI.regexp)
+    assert_equal 'http://', 'x http:// x'.slice(URI.regexp(['http']))
+    assert_equal 'http://', 'x http:// x ftp://'.slice(URI.regexp(['http']))
+    assert_equal nil, 'http://'.slice(URI.regexp([]))
+    assert_equal nil, ''.slice(URI.regexp)
+    assert_equal nil, 'xxxx'.slice(URI.regexp)
+    assert_equal nil, ':'.slice(URI.regexp)
+    assert_equal 'From:', 'From:'.slice(URI.regexp)
+  end
+
+  def test_kernel_uri
+    expected = URI.parse("http://www.ruby-lang.org/")
+    assert_equal(expected, URI("http://www.ruby-lang.org/"))
+    assert_equal(expected, Kernel::URI("http://www.ruby-lang.org/"))
+    assert_raise(NoMethodError) { Object.new.URI("http://www.ruby-lang.org/") }
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/uri/test_ftp.rb b/ruby_1_8_6/test/uri/test_ftp.rb
new file mode 100644
index 0000000000..a7b59efebf
--- /dev/null
+++ b/ruby_1_8_6/test/uri/test_ftp.rb
@@ -0,0 +1,42 @@
+require 'test/unit'
+require 'uri/ftp'
+
+module URI
+
+
+class TestFTP < Test::Unit::TestCase
+  def setup
+  end
+
+  def test_parse
+    url = URI.parse('ftp://user:pass@host.com/abc/def')
+    assert_kind_of(URI::FTP, url)
+
+    exp = [
+      'ftp',
+      'user:pass', 'host.com', URI::FTP.default_port, 
+      '/abc/def', nil,
+    ]
+    ary = [
+      url.scheme, url.userinfo, url.host, url.port,
+      url.path, url.opaque
+    ]
+    assert_equal(exp, ary)
+
+    assert_equal('user', url.user)
+    assert_equal('pass', url.password)
+  end
+
+  def test_select
+    assert_equal(['ftp', 'a.b.c', 21], URI.parse('ftp://a.b.c/').select(:scheme, :host, :port))
+    u = URI.parse('ftp://a.b.c/')
+    ary = u.component.collect {|c| u.send(c)}
+    assert_equal(ary, u.select(*u.component))
+    assert_raises(ArgumentError) do
+      u.select(:scheme, :host, :not_exist, :port)
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/uri/test_generic.rb b/ruby_1_8_6/test/uri/test_generic.rb
new file mode 100644
index 0000000000..8a7feb4982
--- /dev/null
+++ b/ruby_1_8_6/test/uri/test_generic.rb
@@ -0,0 +1,698 @@
+require 'test/unit'
+require 'uri'
+
+module URI
+
+
+class TestGeneric < Test::Unit::TestCase
+  def setup
+    @url = 'http://a/b/c/d;p?q'
+    @base_url = URI.parse(@url)
+  end
+
+  def teardown
+  end
+
+  def uri_to_ary(uri)
+    uri.class.component.collect {|c| uri.send(c)}
+  end
+
+  def test_parse
+    # 0
+    assert_kind_of(URI::HTTP, @base_url)
+
+    exp = [
+      'http', 
+      nil, 'a', URI::HTTP.default_port, 
+      '/b/c/d;p', 
+      'q',
+      nil
+    ]
+    ary = uri_to_ary(@base_url)
+    assert_equal(exp, ary)
+
+    # 1
+    url = URI.parse('ftp://ftp.is.co.za/rfc/rfc1808.txt')
+    assert_kind_of(URI::FTP, url)
+
+    exp = [
+      'ftp', 
+      nil, 'ftp.is.co.za', URI::FTP.default_port, 
+      '/rfc/rfc1808.txt', nil,
+    ]
+    ary = uri_to_ary(url)
+    assert_equal(exp, ary)
+
+    # 2
+    url = URI.parse('gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles')
+    assert_kind_of(URI::Generic, url)
+
+    exp = [
+      'gopher', 
+      nil, 'spinaltap.micro.umn.edu', nil, nil,
+      '/00/Weather/California/Los%20Angeles', nil,
+      nil,
+      nil
+    ]
+    ary = uri_to_ary(url)
+    assert_equal(exp, ary)
+
+    # 3
+    url = URI.parse('http://www.math.uio.no/faq/compression-faq/part1.html')
+    assert_kind_of(URI::HTTP, url)
+
+    exp = [
+      'http', 
+      nil, 'www.math.uio.no', URI::HTTP.default_port, 
+      '/faq/compression-faq/part1.html', 
+      nil,
+      nil
+    ]
+    ary = uri_to_ary(url)
+    assert_equal(exp, ary)
+
+    # 4
+    url = URI.parse('mailto:mduerst@ifi.unizh.ch')
+    assert_kind_of(URI::Generic, url)
+
+    exp = [
+      'mailto', 
+      'mduerst@ifi.unizh.ch',
+      []
+    ]
+    ary = uri_to_ary(url)
+    assert_equal(exp, ary)
+
+    # 5
+    url = URI.parse('news:comp.infosystems.www.servers.unix')
+    assert_kind_of(URI::Generic, url)
+
+    exp = [
+      'news', 
+      nil, nil, nil, nil, 
+      nil, 'comp.infosystems.www.servers.unix',
+      nil,
+      nil
+    ]
+    ary = uri_to_ary(url)
+    assert_equal(exp, ary)
+
+    # 6
+    url = URI.parse('telnet://melvyl.ucop.edu/')
+    assert_kind_of(URI::Generic, url)
+
+    exp = [
+      'telnet', 
+      nil, 'melvyl.ucop.edu', nil, nil, 
+      '/', nil,
+      nil,
+      nil
+    ]
+    ary = uri_to_ary(url)
+    assert_equal(exp, ary)
+
+    # 7
+    # reported by Mr. Kubota <em6t-kbt@asahi-net.or.jp>
+    assert_raises(URI::InvalidURIError) { URI.parse('http://a_b:80/') }
+    assert_raises(URI::InvalidURIError) { URI.parse('http://a_b/') }
+
+    # 8
+    # reported by m_seki
+    uri = URI.parse('file:///foo/bar.txt')
+    assert_kind_of(URI::Generic, url)
+    uri = URI.parse('file:/foo/bar.txt')
+    assert_kind_of(URI::Generic, url)
+
+    # 9
+    # [ruby-dev:25667]
+    url = URI.parse('ftp://:pass@localhost/')
+    assert_equal('', url.user)
+    assert_equal('pass', url.password)
+    assert_equal(':pass', url.userinfo)
+    url = URI.parse('ftp://user@localhost/')
+    assert_equal('user', url.user)
+    assert_equal(nil, url.password)
+    assert_equal('user', url.userinfo)
+    url = URI.parse('ftp://localhost/')
+    assert_equal(nil, url.user)
+    assert_equal(nil, url.password)
+    assert_equal(nil, url.userinfo)
+  end
+
+  def test_merge
+    u1 = URI.parse('http://foo')
+    u2 = URI.parse('http://foo/')
+    u3 = URI.parse('http://foo/bar')
+    u4 = URI.parse('http://foo/bar/')
+
+    assert_equal(URI.parse('http://foo/baz'), u1 + 'baz')
+    assert_equal(URI.parse('http://foo/baz'), u2 + 'baz')
+    assert_equal(URI.parse('http://foo/baz'), u3 + 'baz')
+    assert_equal(URI.parse('http://foo/bar/baz'), u4 + 'baz')
+
+    assert_equal(URI.parse('http://foo/baz'), u1 + '/baz')
+    assert_equal(URI.parse('http://foo/baz'), u2 + '/baz')
+    assert_equal(URI.parse('http://foo/baz'), u3 + '/baz')
+    assert_equal(URI.parse('http://foo/baz'), u4 + '/baz')
+
+    # from [ruby-dev:11508] Re: uri
+    url = URI.parse('http://hoge/a.html') + 'b.html'
+    assert_equal('http://hoge/b.html', url.to_s)
+
+    # reported by Mr. Kubota <em6t-kbt@asahi-net.or.jp>
+    url = URI.parse('http://a/b') + 'http://x/y'
+    assert_equal('http://x/y', url.to_s)
+    assert_equal(url, URI.parse('')                     + 'http://x/y')
+    assert_equal(url, URI.parse('').normalize           + 'http://x/y')
+    assert_equal(url, URI.parse('http://a/b').normalize + 'http://x/y')
+
+    u = URI.parse('http://foo/bar/baz')
+    assert_equal(nil, u.merge!(""))
+    assert_equal(nil, u.merge!(u))
+    assert(nil != u.merge!("."))
+    assert_equal('http://foo/bar/', u.to_s)
+    assert(nil != u.merge!("../baz"))
+    assert_equal('http://foo/baz', u.to_s)
+
+    # [ruby-dev:23628]
+    u0 = URI.parse('mailto:foo@example.com')
+    u1 = URI.parse('mailto:foo@example.com#bar')
+    assert_equal(uri_to_ary(u0 + '#bar'), uri_to_ary(u1))
+
+    # [ruby-list:39838]
+    u0 = URI.parse('http://www.example.com/')
+    u1 = URI.parse('http://www.example.com/foo/..') + './'
+    assert_equal(u0, u1)
+    u0 = URI.parse('http://www.example.com/foo/')
+    u1 = URI.parse('http://www.example.com/foo/bar/..') + './'
+    assert_equal(u0, u1)
+    u0 = URI.parse('http://www.example.com/foo/bar/')
+    u1 = URI.parse('http://www.example.com/foo/bar/baz/..') + './'
+    assert_equal(u0, u1)
+    u0 = URI.parse('http://www.example.com/')
+    u1 = URI.parse('http://www.example.com/foo/bar/../..') + './'
+    assert_equal(u0, u1)
+    u0 = URI.parse('http://www.example.com/foo/')
+    u1 = URI.parse('http://www.example.com/foo/bar/baz/../..') + './'
+    assert_equal(u0, u1)
+
+    # [ruby-list:39844]
+    u = URI.parse('http://www.example.com/')
+    u0 = u + './foo/'
+    u1 = u + './foo/bar/..'
+    assert_equal(u0, u1)
+    u = URI.parse('http://www.example.com/')
+    u0 = u + './'
+    u1 = u + './foo/bar/../..'
+    assert_equal(u0, u1)
+  end
+
+  def test_route
+    url = URI.parse('http://hoge/a.html').route_to('http://hoge/b.html')
+    assert_equal('b.html', url.to_s)
+
+    url = URI.parse('http://hoge/a/').route_to('http://hoge/b/')
+    assert_equal('../b/', url.to_s)
+    url = URI.parse('http://hoge/a/b').route_to('http://hoge/b/')
+    assert_equal('../b/', url.to_s)
+
+    url = URI.parse('http://hoge/a/b/').route_to('http://hoge/b/')
+    assert_equal('../../b/', url.to_s)
+
+    url = URI.parse('http://hoge/a/b/').route_to('http://HOGE/b/')
+    assert_equal('../../b/', url.to_s)
+
+    url = URI.parse('http://hoge/a/b/').route_to('http://MOGE/b/')
+    assert_equal('//MOGE/b/', url.to_s)
+
+    url = URI.parse('file:///a/b/').route_to('file:///a/b/')
+    assert_equal('', url.to_s)
+
+    url = URI.parse('mailto:foo@example.com').route_to('mailto:foo@example.com#bar')
+    assert_equal('#bar', url.to_s)
+
+    url = URI.parse('mailto:foo@example.com#bar').route_to('mailto:foo@example.com')
+    assert_equal('', url.to_s)
+
+    url = URI.parse('mailto:foo@example.com').route_to('mailto:foo@example.com')
+    assert_equal('', url.to_s)
+  end
+
+  def test_rfc2396_examples
+#  http://a/b/c/d;p?q
+#        g:h           =  g:h
+    url = @base_url.merge('g:h')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g:h', url.to_s)
+    url = @base_url.route_to('g:h')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g:h', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g             =  http://a/b/c/g
+    url = @base_url.merge('g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ./g           =  http://a/b/c/g
+    url = @base_url.merge('./g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g')
+    assert_kind_of(URI::Generic, url)
+    assert('./g' != url.to_s) # ok
+    assert_equal('g', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g/            =  http://a/b/c/g/
+    url = @base_url.merge('g/')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g/', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g/')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g/', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        /g            =  http://a/g
+    url = @base_url.merge('/g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/g', url.to_s)
+    url = @base_url.route_to('http://a/g')
+    assert_kind_of(URI::Generic, url)
+    assert('/g' != url.to_s) # ok
+    assert_equal('../../g', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        //g           =  http://g
+    url = @base_url.merge('//g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://g', url.to_s)
+    url = @base_url.route_to('http://g')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('//g', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ?y            =  http://a/b/c/?y
+    url = @base_url.merge('?y')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/?y', url.to_s)
+    url = @base_url.route_to('http://a/b/c/?y')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('?y', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g?y           =  http://a/b/c/g?y
+    url = @base_url.merge('g?y')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g?y', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g?y')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g?y', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        #s            =  (current document)#s
+    url = @base_url.merge('#s')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal(@base_url.to_s + '#s', url.to_s)
+    url = @base_url.route_to(@base_url.to_s + '#s')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('#s', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g#s           =  http://a/b/c/g#s
+    url = @base_url.merge('g#s')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g#s', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g#s')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g#s', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g?y#s         =  http://a/b/c/g?y#s
+    url = @base_url.merge('g?y#s')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g?y#s', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g?y#s')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g?y#s', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ;x            =  http://a/b/c/;x
+    url = @base_url.merge(';x')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/;x', url.to_s)
+    url = @base_url.route_to('http://a/b/c/;x')
+    assert_kind_of(URI::Generic, url)
+    assert_equal(';x', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g;x           =  http://a/b/c/g;x
+    url = @base_url.merge('g;x')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g;x', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g;x')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g;x', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g;x?y#s       =  http://a/b/c/g;x?y#s
+    url = @base_url.merge('g;x?y#s')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g;x?y#s', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g;x?y#s')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g;x?y#s', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        .             =  http://a/b/c/
+    url = @base_url.merge('.')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/', url.to_s)
+    url = @base_url.route_to('http://a/b/c/')
+    assert_kind_of(URI::Generic, url)
+    assert('.' != url.to_s) # ok
+    assert_equal('./', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ./            =  http://a/b/c/
+    url = @base_url.merge('./')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/', url.to_s)
+    url = @base_url.route_to('http://a/b/c/')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('./', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ..            =  http://a/b/
+    url = @base_url.merge('..')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/', url.to_s)
+    url = @base_url.route_to('http://a/b/')
+    assert_kind_of(URI::Generic, url)
+    assert('..' != url.to_s) # ok
+    assert_equal('../', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ../           =  http://a/b/
+    url = @base_url.merge('../')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/', url.to_s)
+    url = @base_url.route_to('http://a/b/')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('../', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ../g          =  http://a/b/g
+    url = @base_url.merge('../g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/g', url.to_s)
+    url = @base_url.route_to('http://a/b/g')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('../g', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ../..         =  http://a/
+    url = @base_url.merge('../..')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/', url.to_s)
+    url = @base_url.route_to('http://a/')
+    assert_kind_of(URI::Generic, url)
+    assert('../..' != url.to_s) # ok
+    assert_equal('../../', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ../../        =  http://a/
+    url = @base_url.merge('../../')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/', url.to_s)
+    url = @base_url.route_to('http://a/')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('../../', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ../../g       =  http://a/g
+    url = @base_url.merge('../../g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/g', url.to_s)
+    url = @base_url.route_to('http://a/g')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('../../g', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        <>            =  (current document)
+    url = @base_url.merge('')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/d;p?q', url.to_s)
+    url = @base_url.route_to('http://a/b/c/d;p?q')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        /./g          =  http://a/./g
+    url = @base_url.merge('/./g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/./g', url.to_s)
+    url = @base_url.route_to('http://a/./g')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('/./g', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        /../g         =  http://a/../g
+    url = @base_url.merge('/../g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/../g', url.to_s)
+    url = @base_url.route_to('http://a/../g')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('/../g', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g.            =  http://a/b/c/g.
+    url = @base_url.merge('g.')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g.', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g.')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g.', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        .g            =  http://a/b/c/.g
+    url = @base_url.merge('.g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/.g', url.to_s)
+    url = @base_url.route_to('http://a/b/c/.g')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('.g', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g..           =  http://a/b/c/g..
+    url = @base_url.merge('g..')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g..', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g..')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g..', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ..g           =  http://a/b/c/..g
+    url = @base_url.merge('..g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/..g', url.to_s)
+    url = @base_url.route_to('http://a/b/c/..g')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('..g', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ../../../g    =  http://a/../g
+    url = @base_url.merge('../../../g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/../g', url.to_s)
+    url = @base_url.route_to('http://a/../g')
+    assert_kind_of(URI::Generic, url)
+    assert('../../../g' != url.to_s) # ok? yes, it confuses you
+    assert_equal('/../g', url.to_s)  # and it is clearly
+
+#  http://a/b/c/d;p?q
+#        ../../../../g =  http://a/../../g
+    url = @base_url.merge('../../../../g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/../../g', url.to_s)
+    url = @base_url.route_to('http://a/../../g')
+    assert_kind_of(URI::Generic, url)
+    assert('../../../../g' != url.to_s) # ok? yes, it confuses you
+    assert_equal('/../../g', url.to_s)  # and it is clearly
+
+#  http://a/b/c/d;p?q
+#        ./../g        =  http://a/b/g
+    url = @base_url.merge('./../g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/g', url.to_s)
+    url = @base_url.route_to('http://a/b/g')
+    assert_kind_of(URI::Generic, url)
+    assert('./../g' != url.to_s) # ok
+    assert_equal('../g', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        ./g/.         =  http://a/b/c/g/
+    url = @base_url.merge('./g/.')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g/', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g/')
+    assert_kind_of(URI::Generic, url)
+    assert('./g/.' != url.to_s) # ok
+    assert_equal('g/', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g/./h         =  http://a/b/c/g/h
+    url = @base_url.merge('g/./h')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g/h', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g/h')
+    assert_kind_of(URI::Generic, url)
+    assert('g/./h' != url.to_s) # ok
+    assert_equal('g/h', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g/../h        =  http://a/b/c/h
+    url = @base_url.merge('g/../h')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/h', url.to_s)
+    url = @base_url.route_to('http://a/b/c/h')
+    assert_kind_of(URI::Generic, url)
+    assert('g/../h' != url.to_s) # ok
+    assert_equal('h', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g;x=1/./y     =  http://a/b/c/g;x=1/y
+    url = @base_url.merge('g;x=1/./y')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g;x=1/y', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g;x=1/y')
+    assert_kind_of(URI::Generic, url)
+    assert('g;x=1/./y' != url.to_s) # ok
+    assert_equal('g;x=1/y', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g;x=1/../y    =  http://a/b/c/y
+    url = @base_url.merge('g;x=1/../y')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/y', url.to_s)
+    url = @base_url.route_to('http://a/b/c/y')
+    assert_kind_of(URI::Generic, url)
+    assert('g;x=1/../y' != url.to_s) # ok
+    assert_equal('y', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g?y/./x       =  http://a/b/c/g?y/./x
+    url = @base_url.merge('g?y/./x')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g?y/./x', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g?y/./x')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g?y/./x', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g?y/../x      =  http://a/b/c/g?y/../x
+    url = @base_url.merge('g?y/../x')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g?y/../x', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g?y/../x')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g?y/../x', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g#s/./x       =  http://a/b/c/g#s/./x
+    url = @base_url.merge('g#s/./x')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g#s/./x', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g#s/./x')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g#s/./x', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        g#s/../x      =  http://a/b/c/g#s/../x
+    url = @base_url.merge('g#s/../x')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http://a/b/c/g#s/../x', url.to_s)
+    url = @base_url.route_to('http://a/b/c/g#s/../x')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('g#s/../x', url.to_s)
+
+#  http://a/b/c/d;p?q
+#        http:g        =  http:g           ; for validating parsers
+#                      |  http://a/b/c/g   ; for backwards compatibility
+    url = @base_url.merge('http:g')
+    assert_kind_of(URI::HTTP, url)
+    assert_equal('http:g', url.to_s)
+    url = @base_url.route_to('http:g')
+    assert_kind_of(URI::Generic, url)
+    assert_equal('http:g', url.to_s)
+  end
+
+  def test_join
+    assert_equal(URI.parse('http://foo/bar'), URI.join('http://foo/bar'))
+    assert_equal(URI.parse('http://foo/bar'), URI.join('http://foo', 'bar'))
+    assert_equal(URI.parse('http://foo/bar/'), URI.join('http://foo', 'bar/'))
+
+    assert_equal(URI.parse('http://foo/baz'), URI.join('http://foo', 'bar', 'baz'))
+    assert_equal(URI.parse('http://foo/baz'), URI.join('http://foo', 'bar', '/baz'))
+    assert_equal(URI.parse('http://foo/baz/'), URI.join('http://foo', 'bar', '/baz/'))
+    assert_equal(URI.parse('http://foo/bar/baz'), URI.join('http://foo', 'bar/', 'baz'))
+    assert_equal(URI.parse('http://foo/hoge'), URI.join('http://foo', 'bar', 'baz', 'hoge'))
+
+    assert_equal(URI.parse('http://foo/bar/baz'), URI.join('http://foo', 'bar/baz'))
+    assert_equal(URI.parse('http://foo/bar/hoge'), URI.join('http://foo', 'bar/baz', 'hoge'))
+    assert_equal(URI.parse('http://foo/bar/baz/hoge'), URI.join('http://foo', 'bar/baz/', 'hoge'))
+    assert_equal(URI.parse('http://foo/hoge'), URI.join('http://foo', 'bar/baz', '/hoge'))
+    assert_equal(URI.parse('http://foo/bar/hoge'), URI.join('http://foo', 'bar/baz', 'hoge'))
+    assert_equal(URI.parse('http://foo/bar/baz/hoge'), URI.join('http://foo', 'bar/baz/', 'hoge'))
+    assert_equal(URI.parse('http://foo/hoge'), URI.join('http://foo', 'bar/baz', '/hoge'))
+  end
+
+  # ruby-dev:16728
+  def test_set_component
+    uri = URI.parse('http://foo:bar@baz')
+    assert_equal('oof', uri.user = 'oof')
+    assert_equal('http://oof:bar@baz', uri.to_s)
+    assert_equal('rab', uri.password = 'rab')
+    assert_equal('http://oof:rab@baz', uri.to_s)
+    assert_equal('foo', uri.userinfo = 'foo')
+    assert_equal('http://foo:rab@baz', uri.to_s)
+    assert_equal(['foo', 'bar'], uri.userinfo = ['foo', 'bar'])
+    assert_equal('http://foo:bar@baz', uri.to_s)
+    assert_equal(['foo'], uri.userinfo = ['foo'])
+    assert_equal('http://foo:bar@baz', uri.to_s)
+    assert_equal('zab', uri.host = 'zab')
+    assert_equal('http://foo:bar@zab', uri.to_s)
+    assert_equal(8080, uri.port = 8080)
+    assert_equal('http://foo:bar@zab:8080', uri.to_s)
+    assert_equal('/', uri.path = '/')
+    assert_equal('http://foo:bar@zab:8080/', uri.to_s)
+    assert_equal('a=1', uri.query = 'a=1')
+    assert_equal('http://foo:bar@zab:8080/?a=1', uri.to_s)
+    assert_equal('b123', uri.fragment = 'b123')
+    assert_equal('http://foo:bar@zab:8080/?a=1#b123', uri.to_s)
+
+    uri = URI.parse('http://example.com')
+    assert_raises(URI::InvalidURIError) { uri.password = 'bar' }
+    uri.userinfo = 'foo:bar'
+    assert_equal('http://foo:bar@example.com', uri.to_s)
+    assert_raises(URI::InvalidURIError) { uri.registry = 'bar' }
+    assert_raises(URI::InvalidURIError) { uri.opaque = 'bar' }
+
+    uri = URI.parse('mailto:foo@example.com')
+    assert_raises(URI::InvalidURIError) { uri.user = 'bar' }
+    assert_raises(URI::InvalidURIError) { uri.password = 'bar' }
+    assert_raises(URI::InvalidURIError) { uri.userinfo = ['bar', 'baz'] }
+    assert_raises(URI::InvalidURIError) { uri.host = 'bar' }
+    assert_raises(URI::InvalidURIError) { uri.port = 'bar' }
+    assert_raises(URI::InvalidURIError) { uri.path = 'bar' }
+    assert_raises(URI::InvalidURIError) { uri.query = 'bar' }
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/uri/test_http.rb b/ruby_1_8_6/test/uri/test_http.rb
new file mode 100644
index 0000000000..a6846141df
--- /dev/null
+++ b/ruby_1_8_6/test/uri/test_http.rb
@@ -0,0 +1,63 @@
+require 'test/unit'
+require 'uri/http'
+
+module URI
+
+
+class TestHTTP < Test::Unit::TestCase
+  def setup
+  end
+
+  def teardown
+  end
+
+  def uri_to_ary(uri)
+    uri.class.component.collect {|c| uri.send(c)}
+  end
+
+  def test_parse
+    u = URI.parse('http://a')
+    assert_kind_of(URI::HTTP, u)
+    assert_equal(['http', 
+		   nil, 'a', URI::HTTP.default_port,
+		   '', nil, nil], uri_to_ary(u))
+  end
+
+  def test_normalize
+    host = 'aBcD'
+    u1 = URI.parse('http://' + host          + '/eFg?HiJ')
+    u2 = URI.parse('http://' + host.downcase + '/eFg?HiJ')
+    assert(u1.normalize.host == 'abcd')
+    assert(u1.normalize.path == u1.path)
+    assert(u1.normalize == u2.normalize)
+    assert(!u1.normalize.host.equal?(u1.host))
+    assert( u2.normalize.host.equal?(u2.host))
+
+    assert_equal('http://abc/', URI.parse('http://abc').normalize.to_s)
+  end
+
+  def test_equal
+    assert(URI.parse('http://abc') == URI.parse('http://ABC'))
+    assert(URI.parse('http://abc/def') == URI.parse('http://ABC/def'))
+    assert(URI.parse('http://abc/def') != URI.parse('http://ABC/DEF'))
+  end
+
+  def test_request_uri
+    assert_equal('/',         URI.parse('http://a.b.c/').request_uri)
+    assert_equal('/?abc=def', URI.parse('http://a.b.c/?abc=def').request_uri)
+    assert_equal('/',         URI.parse('http://a.b.c').request_uri)
+    assert_equal('/?abc=def', URI.parse('http://a.b.c?abc=def').request_uri)
+  end
+
+  def test_select
+    assert_equal(['http', 'a.b.c', 80], URI.parse('http://a.b.c/').select(:scheme, :host, :port))
+    u = URI.parse('http://a.b.c/')
+    assert_equal(uri_to_ary(u), u.select(*u.component))
+    assert_raises(ArgumentError) do
+      u.select(:scheme, :host, :not_exist, :port)
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/uri/test_ldap.rb b/ruby_1_8_6/test/uri/test_ldap.rb
new file mode 100644
index 0000000000..866b7d8066
--- /dev/null
+++ b/ruby_1_8_6/test/uri/test_ldap.rb
@@ -0,0 +1,100 @@
+require 'test/unit'
+require 'uri/ldap'
+
+module URI
+
+
+class TestLDAP < Test::Unit::TestCase
+  def setup
+  end
+
+  def teardown
+  end
+
+  def uri_to_ary(uri)
+    uri.class.component.collect {|c| uri.send(c)}
+  end
+
+  def test_parse
+    url = 'ldap://ldap.jaist.ac.jp/o=JAIST,c=JP?sn?base?(sn=ttate*)'
+    u = URI.parse(url)
+    assert_kind_of(URI::LDAP, u)
+    assert_equal(url, u.to_s)
+    assert_equal('o=JAIST,c=JP', u.dn)
+    assert_equal('sn', u.attributes)
+    assert_equal('base', u.scope)
+    assert_equal('(sn=ttate*)', u.filter)
+    assert_equal(nil, u.extensions)
+
+    u.scope = URI::LDAP::SCOPE_SUB
+    u.attributes = 'sn,cn,mail'
+    assert_equal('ldap://ldap.jaist.ac.jp/o=JAIST,c=JP?sn,cn,mail?sub?(sn=ttate*)', u.to_s)
+    assert_equal('o=JAIST,c=JP', u.dn)
+    assert_equal('sn,cn,mail', u.attributes)
+    assert_equal('sub', u.scope)
+    assert_equal('(sn=ttate*)', u.filter)
+    assert_equal(nil, u.extensions)
+
+    # from RFC2255, section 6.
+    urls = {
+      'ldap:///o=University%20of%20Michigan,c=US' =>
+      ['ldap', nil, URI::LDAP::DEFAULT_PORT, 
+	'o=University%20of%20Michigan,c=US', 
+	nil, nil, nil, nil],
+
+      'ldap://ldap.itd.umich.edu/o=University%20of%20Michigan,c=US' =>
+      ['ldap', 'ldap.itd.umich.edu', URI::LDAP::DEFAULT_PORT, 
+	'o=University%20of%20Michigan,c=US', 
+	nil, nil, nil, nil],
+
+      'ldap://ldap.itd.umich.edu/o=University%20of%20Michigan,c=US?postalAddress' =>
+      ['ldap', 'ldap.itd.umich.edu', URI::LDAP::DEFAULT_PORT, 
+	'o=University%20of%20Michigan,c=US',
+	'postalAddress', nil, nil, nil],
+
+      'ldap://host.com:6666/o=University%20of%20Michigan,c=US??sub?(cn=Babs%20Jensen)' =>
+      ['ldap', 'host.com', 6666, 
+	'o=University%20of%20Michigan,c=US',
+	nil, 'sub', '(cn=Babs%20Jensen)', nil],
+
+      'ldap://ldap.itd.umich.edu/c=GB?objectClass?one' =>
+      ['ldap', 'ldap.itd.umich.edu', URI::LDAP::DEFAULT_PORT, 
+	'c=GB', 
+	'objectClass', 'one', nil, nil],
+
+      'ldap://ldap.question.com/o=Question%3f,c=US?mail' =>
+      ['ldap', 'ldap.question.com', URI::LDAP::DEFAULT_PORT, 
+	'o=Question%3f,c=US',
+	'mail', nil, nil, nil],
+
+      'ldap://ldap.netscape.com/o=Babsco,c=US??(int=%5c00%5c00%5c00%5c04)' =>
+      ['ldap', 'ldap.netscape.com', URI::LDAP::DEFAULT_PORT, 
+	'o=Babsco,c=US',
+	nil, '(int=%5c00%5c00%5c00%5c04)', nil, nil],
+
+      'ldap:///??sub??bindname=cn=Manager%2co=Foo' =>
+      ['ldap', nil, URI::LDAP::DEFAULT_PORT, 
+	'',
+	nil, 'sub', nil, 'bindname=cn=Manager%2co=Foo'],
+
+      'ldap:///??sub??!bindname=cn=Manager%2co=Foo' =>
+      ['ldap', nil, URI::LDAP::DEFAULT_PORT, 
+	'',
+	nil, 'sub', nil, '!bindname=cn=Manager%2co=Foo'],
+    }.each do |url, ary|
+      u = URI.parse(url)
+      assert_equal(ary, uri_to_ary(u))
+    end
+  end
+
+  def test_select
+    u = URI.parse('ldap:///??sub??!bindname=cn=Manager%2co=Foo')
+    assert_equal(uri_to_ary(u), u.select(*u.component))
+    assert_raises(ArgumentError) do
+      u.select(:scheme, :host, :not_exist, :port)
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/uri/test_mailto.rb b/ruby_1_8_6/test/uri/test_mailto.rb
new file mode 100644
index 0000000000..ba437904f8
--- /dev/null
+++ b/ruby_1_8_6/test/uri/test_mailto.rb
@@ -0,0 +1,122 @@
+require 'test/unit'
+require 'uri/mailto'
+
+module URI
+
+
+class TestMailTo < Test::Unit::TestCase
+  def setup
+    @u = URI::MailTo
+  end
+
+  def teardown
+  end
+
+  def uri_to_ary(uri)
+    uri.class.component.collect {|c| uri.send(c)}
+  end
+
+  def test_build
+    ok = []
+    bad = []
+
+    # RFC2368, 6. Examples
+    # mailto:chris@example.com
+    ok << ["mailto:chris@example.com"]
+    ok[-1] << ["chris@example.com", nil]
+    ok[-1] << {:to => "chris@example.com"}
+
+    # mailto:infobot@example.com?subject=current-issue
+    ok << ["mailto:infobot@example.com?subject=current-issue"]
+    ok[-1] << ["infobot@example.com", ["subject=current-issue"]]
+    ok[-1] << {:to => "infobot@example.com", 
+      :headers => ["subject=current-issue"]}
+
+    # mailto:infobot@example.com?body=send%20current-issue
+    ok << ["mailto:infobot@example.com?body=send%20current-issue"]
+    ok[-1] << ["infobot@example.com", ["body=send%20current-issue"]]
+    ok[-1] << {:to => "infobot@example.com", 
+      :headers => ["body=send%20current-issue"]}
+
+    # mailto:infobot@example.com?body=send%20current-issue%0D%0Asend%20index
+    ok << ["mailto:infobot@example.com?body=send%20current-issue%0D%0Asend%20index"]
+    ok[-1] << ["infobot@example.com", 
+      ["body=send%20current-issue%0D%0Asend%20index"]]
+    ok[-1] << {:to => "infobot@example.com", 
+      :headers => ["body=send%20current-issue%0D%0Asend%20index"]}
+
+    # mailto:foobar@example.com?In-Reply-To=%3c3469A91.D10AF4C@example.com
+    ok << ["mailto:foobar@example.com?In-Reply-To=%3c3469A91.D10AF4C@example.com"]
+    ok[-1] << ["foobar@example.com", 
+      ["In-Reply-To=%3c3469A91.D10AF4C@example.com"]]
+    ok[-1] << {:to => "foobar@example.com", 
+      :headers => ["In-Reply-To=%3c3469A91.D10AF4C@example.com"]}
+
+    # mailto:majordomo@example.com?body=subscribe%20bamboo-l
+    ok << ["mailto:majordomo@example.com?body=subscribe%20bamboo-l"]
+    ok[-1] << ["majordomo@example.com", ["body=subscribe%20bamboo-l"]]
+    ok[-1] << {:to => "majordomo@example.com", 
+      :headers => ["body=subscribe%20bamboo-l"]}
+
+    # mailto:joe@example.com?cc=bob@example.com&body=hello
+    ok << ["mailto:joe@example.com?cc=bob@example.com&body=hello"]
+    ok[-1] << ["joe@example.com", ["cc=bob@example.com", "body=hello"]]
+    ok[-1] << {:to => "joe@example.com", 
+      :headers => ["cc=bob@example.com", "body=hello"]}
+
+    # mailto:?to=joe@example.com&cc=bob@example.com&body=hello
+    ok << ["mailto:?to=joe@example.com&cc=bob@example.com&body=hello"]
+    ok[-1] << [nil, 
+      ["to=joe@example.com", "cc=bob@example.com", "body=hello"]]
+    ok[-1] << {:headers => ["to=joe@example.com", 
+	"cc=bob@example.com", "body=hello"]}
+
+    # mailto:gorby%25kremvax@example.com
+    ok << ["mailto:gorby%25kremvax@example.com"]
+    ok[-1] << ["gorby%25kremvax@example.com", nil]
+    ok[-1] << {:to => "gorby%25kremvax@example.com"}
+
+    # mailto:unlikely%3Faddress@example.com?blat=foop
+    ok << ["mailto:unlikely%3Faddress@example.com?blat=foop"]
+    ok[-1] << ["unlikely%3Faddress@example.com", ["blat=foop"]]
+    ok[-1] << {:to => "unlikely%3Faddress@example.com", 
+      :headers => ["blat=foop"]}
+
+    ok_all = ok.flatten.join("\0")
+
+    # mailto:joe@example.com?cc=bob@example.com?body=hello   ; WRONG!
+    bad << ["joe@example.com", ["cc=bob@example.com?body=hello"]]
+
+    # mailto:javascript:alert()
+    bad << ["javascript:alert()", []]
+
+    # '=' which is in hname or hvalue is wrong.
+    bad << ["foo@example.jp?subject=1+1=2", []]
+
+    ok.each do |x|
+      assert_equal(x[0],
+		   @u.build(x[1]).to_s)
+      assert_equal(x[0],
+		   @u.build(x[2]).to_s)
+    end
+
+    bad.each do |x|
+      assert_raises(URI::InvalidComponentError) {
+	@u.build(x)
+      }
+    end
+
+    assert_equal(ok_all, ok.flatten.join("\0"))
+  end
+
+  def test_select
+    u = URI.parse('mailto:joe@example.com?cc=bob@example.com&body=hello')
+    assert_equal(uri_to_ary(u), u.select(*u.component))
+    assert_raises(ArgumentError) do
+      u.select(:scheme, :host, :not_exist, :port)
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/webrick/test_cgi.rb b/ruby_1_8_6/test/webrick/test_cgi.rb
new file mode 100644
index 0000000000..7e3f4ee5f0
--- /dev/null
+++ b/ruby_1_8_6/test/webrick/test_cgi.rb
@@ -0,0 +1,78 @@
+require "webrick"
+require File.join(File.dirname(__FILE__), "utils.rb")
+require "test/unit"
+begin
+  loadpath = $:.dup
+  $:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
+  require 'envutil'
+ensure
+  $:.replace(loadpath)
+end
+
+class TestWEBrickCGI < Test::Unit::TestCase
+  def test_cgi
+    accepted = started = stopped = 0
+    requested0 = requested1 = 0
+    config = {
+      :CGIInterpreter => EnvUtil.rubybin,
+      :DocumentRoot => File.dirname(__FILE__),
+      :DirectoryIndex => ["webrick.cgi"],
+    }
+    if RUBY_PLATFORM =~ /mswin32|mingw|cygwin|bccwin32/
+      config[:CGIPathEnv] = ENV['PATH'] # runtime dll may not be in system dir.
+    end
+    TestWEBrick.start_httpserver(config){|server, addr, port|
+      http = Net::HTTP.new(addr, port)
+      req = Net::HTTP::Get.new("/webrick.cgi")
+      http.request(req){|res| assert_equal("/webrick.cgi", res.body)}
+      req = Net::HTTP::Get.new("/webrick.cgi/path/info")
+      http.request(req){|res| assert_equal("/path/info", res.body)}
+      req = Net::HTTP::Get.new("/webrick.cgi/%3F%3F%3F?foo=bar")
+      http.request(req){|res| assert_equal("/???", res.body)}
+      req = Net::HTTP::Get.new("/webrick.cgi/%A4%DB%A4%B2/%A4%DB%A4%B2")
+      http.request(req){|res|
+        assert_equal("/\xA4\xDB\xA4\xB2/\xA4\xDB\xA4\xB2", res.body)}
+      req = Net::HTTP::Get.new("/webrick.cgi?a=1;a=2;b=x")
+      http.request(req){|res| assert_equal("a=1, a=2, b=x", res.body)}
+      req = Net::HTTP::Get.new("/webrick.cgi?a=1&a=2&b=x")
+      http.request(req){|res| assert_equal("a=1, a=2, b=x", res.body)}
+
+      req = Net::HTTP::Post.new("/webrick.cgi?a=x;a=y;b=1")
+      req["Content-Type"] = "application/x-www-form-urlencoded"
+      http.request(req, "a=1;a=2;b=x"){|res|
+        assert_equal("a=1, a=2, b=x", res.body)}
+      req = Net::HTTP::Post.new("/webrick.cgi?a=x&a=y&b=1")
+      req["Content-Type"] = "application/x-www-form-urlencoded"
+      http.request(req, "a=1&a=2&b=x"){|res|
+        assert_equal("a=1, a=2, b=x", res.body)}
+      req = Net::HTTP::Get.new("/")
+      http.request(req){|res|
+        ary = res.body.to_a
+        assert_match(%r{/$}, ary[0])
+        assert_match(%r{/webrick.cgi$}, ary[1])
+      }
+
+      req = Net::HTTP::Get.new("/webrick.cgi")
+      req["Cookie"] = "CUSTOMER=WILE_E_COYOTE; PART_NUMBER=ROCKET_LAUNCHER_0001"
+      http.request(req){|res|
+        assert_equal(
+          "CUSTOMER=WILE_E_COYOTE\nPART_NUMBER=ROCKET_LAUNCHER_0001\n",
+          res.body)
+      }
+
+      req = Net::HTTP::Get.new("/webrick.cgi")
+      cookie =  %{$Version="1"; }
+      cookie << %{Customer="WILE_E_COYOTE"; $Path="/acme"; }
+      cookie << %{Part_Number="Rocket_Launcher_0001"; $Path="/acme"; }
+      cookie << %{Shipping="FedEx"; $Path="/acme"}
+      req["Cookie"] = cookie
+      http.request(req){|res|
+        assert_equal("Customer=WILE_E_COYOTE, Shipping=FedEx",
+                     res["Set-Cookie"])
+        assert_equal("Customer=WILE_E_COYOTE\n" +
+                     "Part_Number=Rocket_Launcher_0001\n" +
+                     "Shipping=FedEx\n", res.body)
+      }
+    }
+  end
+end
diff --git a/ruby_1_8_6/test/webrick/test_cookie.rb b/ruby_1_8_6/test/webrick/test_cookie.rb
new file mode 100644
index 0000000000..14771fd01c
--- /dev/null
+++ b/ruby_1_8_6/test/webrick/test_cookie.rb
@@ -0,0 +1,104 @@
+require "test/unit"
+require "webrick/cookie"
+
+class TestWEBrickCookie < Test::Unit::TestCase
+  def test_new
+    cookie = WEBrick::Cookie.new("foo","bar")
+    assert_equal("foo", cookie.name)
+    assert_equal("bar", cookie.value)
+    assert_equal("foo=bar", cookie.to_s)
+  end
+
+  def test_time
+    cookie = WEBrick::Cookie.new("foo","bar")
+    t = 1000000000
+    cookie.max_age = t
+    assert_match(t.to_s, cookie.to_s)
+
+    cookie = WEBrick::Cookie.new("foo","bar")
+    t = Time.at(1000000000)
+    cookie.expires = t
+    assert_equal(Time, cookie.expires.class)
+    assert_equal(t, cookie.expires)
+    ts = t.httpdate
+    cookie.expires = ts
+    assert_equal(Time, cookie.expires.class)
+    assert_equal(t, cookie.expires)
+    assert_match(ts, cookie.to_s)
+  end
+
+  def test_parse
+    data = ""
+    data << '$Version="1"; '
+    data << 'Customer="WILE_E_COYOTE"; $Path="/acme"; '
+    data << 'Part_Number="Rocket_Launcher_0001"; $Path="/acme"; '
+    data << 'Shipping="FedEx"; $Path="/acme"'
+    cookies = WEBrick::Cookie.parse(data)
+    assert_equal(1, cookies[0].version)
+    assert_equal("Customer", cookies[0].name)
+    assert_equal("WILE_E_COYOTE", cookies[0].value)
+    assert_equal("/acme", cookies[0].path)
+    assert_equal(1, cookies[1].version)
+    assert_equal("Part_Number", cookies[1].name)
+    assert_equal("Rocket_Launcher_0001", cookies[1].value)
+    assert_equal(1, cookies[2].version)
+    assert_equal("Shipping", cookies[2].name)
+    assert_equal("FedEx", cookies[2].value)
+
+    data = "hoge=moge; __div__session=9865ecfd514be7f7"
+    cookies = WEBrick::Cookie.parse(data)
+    assert_equal(0, cookies[0].version)
+    assert_equal("hoge", cookies[0].name)
+    assert_equal("moge", cookies[0].value)
+    assert_equal("__div__session", cookies[1].name)
+    assert_equal("9865ecfd514be7f7", cookies[1].value)
+  end
+
+  def test_parse_set_cookie
+    data = %(Customer="WILE_E_COYOTE"; Version="1"; Path="/acme")
+    cookie = WEBrick::Cookie.parse_set_cookie(data)
+    assert_equal("Customer", cookie.name)
+    assert_equal("WILE_E_COYOTE", cookie.value)
+    assert_equal(1, cookie.version)
+    assert_equal("/acme", cookie.path)
+
+    data = %(Shipping="FedEx"; Version="1"; Path="/acme"; Secure)
+    cookie = WEBrick::Cookie.parse_set_cookie(data)
+    assert_equal("Shipping", cookie.name)
+    assert_equal("FedEx", cookie.value)
+    assert_equal(1, cookie.version)
+    assert_equal("/acme", cookie.path)
+    assert_equal(true, cookie.secure)
+  end
+
+  def test_parse_set_cookies
+    data = %(Shipping="FedEx"; Version="1"; Path="/acme"; Secure)
+    data << %(, CUSTOMER=WILE_E_COYOTE; path=/; expires=Wednesday, 09-Nov-99 23:12:40 GMT; path=/; Secure)
+    data << %(, name="Aaron"; Version="1"; path="/acme")
+    cookies = WEBrick::Cookie.parse_set_cookies(data)
+    assert_equal(3, cookies.length)
+
+    fed_ex = cookies.find { |c| c.name == 'Shipping' }
+    assert_not_nil(fed_ex)
+    assert_equal("Shipping", fed_ex.name)
+    assert_equal("FedEx", fed_ex.value)
+    assert_equal(1, fed_ex.version)
+    assert_equal("/acme", fed_ex.path)
+    assert_equal(true, fed_ex.secure)
+
+    name = cookies.find { |c| c.name == 'name' }
+    assert_not_nil(name)
+    assert_equal("name", name.name)
+    assert_equal("Aaron", name.value)
+    assert_equal(1, name.version)
+    assert_equal("/acme", name.path)
+
+    customer = cookies.find { |c| c.name == 'CUSTOMER' }
+    assert_not_nil(customer)
+    assert_equal("CUSTOMER", customer.name)
+    assert_equal("WILE_E_COYOTE", customer.value)
+    assert_equal(0, customer.version)
+    assert_equal("/", customer.path)
+    assert_equal(Time.utc(1999, 11, 9, 23, 12, 40), customer.expires)
+  end
+end
diff --git a/ruby_1_8_6/test/webrick/test_filehandler.rb b/ruby_1_8_6/test/webrick/test_filehandler.rb
new file mode 100644
index 0000000000..703fde4d9a
--- /dev/null
+++ b/ruby_1_8_6/test/webrick/test_filehandler.rb
@@ -0,0 +1,65 @@
+require "test/unit"
+require "webrick"
+require "stringio"
+
+class WEBrick::TestFileHandler < Test::Unit::TestCase
+  def default_file_handler(filename)
+    klass = WEBrick::HTTPServlet::DefaultFileHandler
+    klass.new(WEBrick::Config::HTTP, filename)
+  end
+
+  def get_res_body(res)
+    return res.body.read rescue res.body
+  end
+
+  def make_range_request(range_spec)
+    msg = <<-_end_of_request_
+      GET / HTTP/1.0
+      Range: #{range_spec}
+
+    _end_of_request_
+    return StringIO.new(msg.gsub(/^ {6}/, ""))
+  end
+
+  def make_range_response(file, range_spec)
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(make_range_request(range_spec))
+    res = WEBrick::HTTPResponse.new(WEBrick::Config::HTTP)
+    size = File.size(file)
+    handler = default_file_handler(file)
+    handler.make_partial_content(req, res, file, size)
+    return res
+  end
+
+  def test_make_partial_content
+    filename = __FILE__
+    filesize = File.size(filename)
+
+    res = make_range_response(filename, "bytes=#{filesize-100}-")
+    assert_match(%r{^text/plain}, res["content-type"])
+    assert_equal(get_res_body(res).size, 100)
+
+    res = make_range_response(filename, "bytes=-100")
+    assert_match(%r{^text/plain}, res["content-type"])
+    assert_equal(get_res_body(res).size, 100)
+
+    res = make_range_response(filename, "bytes=0-99")
+    assert_match(%r{^text/plain}, res["content-type"])
+    assert_equal(get_res_body(res).size, 100)
+
+    res = make_range_response(filename, "bytes=100-199")
+    assert_match(%r{^text/plain}, res["content-type"])
+    assert_equal(get_res_body(res).size, 100)
+
+    res = make_range_response(filename, "bytes=0-0")
+    assert_match(%r{^text/plain}, res["content-type"])
+    assert_equal(get_res_body(res).size, 1)
+
+    res = make_range_response(filename, "bytes=-1")
+    assert_match(%r{^text/plain}, res["content-type"])
+    assert_equal(get_res_body(res).size, 1)
+
+    res = make_range_response(filename, "bytes=0-0, -2")
+    assert_match(%r{^multipart/byteranges}, res["content-type"])
+  end
+end
diff --git a/ruby_1_8_6/test/webrick/test_httpauth.rb b/ruby_1_8_6/test/webrick/test_httpauth.rb
new file mode 100644
index 0000000000..75926b1624
--- /dev/null
+++ b/ruby_1_8_6/test/webrick/test_httpauth.rb
@@ -0,0 +1,82 @@
+require "test/unit"
+require "net/http"
+require "tempfile"
+require "webrick"
+require "webrick/httpauth/basicauth"
+require File.join(File.dirname(__FILE__), "utils.rb")
+
+class TestWEBrickHTTPAuth < Test::Unit::TestCase
+  def test_basic_auth
+    TestWEBrick.start_httpserver{|server, addr, port|
+      realm = "WEBrick's realm"
+      path = "/basic_auth"
+
+      server.mount_proc(path){|req, res|
+        WEBrick::HTTPAuth.basic_auth(req, res, realm){|user, pass|
+          user == "webrick" && pass == "supersecretpassword"
+        }     
+        res.body = "hoge"
+      }
+      http = Net::HTTP.new(addr, port)
+      g = Net::HTTP::Get.new(path)
+      g.basic_auth("webrick", "supersecretpassword")
+      http.request(g){|res| assert_equal("hoge", res.body)}  
+      g.basic_auth("webrick", "not super")
+      http.request(g){|res| assert_not_equal("hoge", res.body)}
+    }
+  end
+
+  def test_basic_auth2
+    TestWEBrick.start_httpserver{|server, addr, port|
+      realm = "WEBrick's realm"
+      path = "/basic_auth2"
+
+      tmpfile = Tempfile.new("test_webrick_auth")
+      tmpfile.close
+      tmp_pass = WEBrick::HTTPAuth::Htpasswd.new(tmpfile.path)
+      tmp_pass.set_passwd(realm, "webrick", "supersecretpassword")
+      tmp_pass.set_passwd(realm, "foo", "supersecretpassword")
+      tmp_pass.flush
+
+      htpasswd = WEBrick::HTTPAuth::Htpasswd.new(tmpfile.path)
+      users = []
+      htpasswd.each{|user, pass| users << user }
+      assert_equal(2, users.size)
+      assert(users.member?("webrick"))
+      assert(users.member?("foo"))
+
+      server.mount_proc(path){|req, res|
+        auth = WEBrick::HTTPAuth::BasicAuth.new(
+          :Realm => realm, :UserDB => htpasswd,
+          :Logger => server.logger
+        )
+        auth.authenticate(req, res)
+        res.body = "hoge"
+      }
+      http = Net::HTTP.new(addr, port)
+      g = Net::HTTP::Get.new(path)
+      g.basic_auth("webrick", "supersecretpassword")
+      http.request(g){|res| assert_equal("hoge", res.body)}  
+      g.basic_auth("webrick", "not super")
+      http.request(g){|res| assert_not_equal("hoge", res.body)}
+    }
+  end
+
+  def test_basic_auth3
+    tmpfile = Tempfile.new("test_webrick_auth")
+    tmpfile.puts("webrick:{SHA}GJYFRpBbdchp595jlh3Bhfmgp8k=")
+    tmpfile.flush
+    assert_raises(NotImplementedError){
+      WEBrick::HTTPAuth::Htpasswd.new(tmpfile.path)
+    }
+    tmpfile.close(true)
+
+    tmpfile = Tempfile.new("test_webrick_auth")
+    tmpfile.puts("webrick:$apr1$IOVMD/..$rmnOSPXr0.wwrLPZHBQZy0")
+    tmpfile.flush
+    assert_raises(NotImplementedError){
+      WEBrick::HTTPAuth::Htpasswd.new(tmpfile.path)
+    }
+    tmpfile.close(true)
+  end
+end
diff --git a/ruby_1_8_6/test/webrick/test_httprequest.rb b/ruby_1_8_6/test/webrick/test_httprequest.rb
new file mode 100644
index 0000000000..f0cd1a092a
--- /dev/null
+++ b/ruby_1_8_6/test/webrick/test_httprequest.rb
@@ -0,0 +1,272 @@
+require "webrick"
+require "stringio"
+require "test/unit"
+
+class TestWEBrickHTTPRequest < Test::Unit::TestCase
+  def test_parse_09
+    msg = <<-_end_of_message_
+      GET /
+      foobar    # HTTP/0.9 request don't have header nor entity body.
+    _end_of_message_
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+    assert_equal("GET", req.request_method)
+    assert_equal("/", req.unparsed_uri)
+    assert_equal(WEBrick::HTTPVersion.new("0.9"), req.http_version)
+    assert_equal(WEBrick::Config::HTTP[:ServerName], req.host)
+    assert_equal(80, req.port)
+    assert_equal(false, req.keep_alive?)
+    assert_equal(nil, req.body)
+    assert(req.query.empty?)
+  end
+
+  def test_parse_10
+    msg = <<-_end_of_message_
+      GET / HTTP/1.0
+
+    _end_of_message_
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+    assert_equal("GET", req.request_method)
+    assert_equal("/", req.unparsed_uri)
+    assert_equal(WEBrick::HTTPVersion.new("1.0"), req.http_version)
+    assert_equal(WEBrick::Config::HTTP[:ServerName], req.host)
+    assert_equal(80, req.port)
+    assert_equal(false, req.keep_alive?)
+    assert_equal(nil, req.body)
+    assert(req.query.empty?)
+  end
+
+  def test_parse_11
+    msg = <<-_end_of_message_
+      GET /path HTTP/1.1
+
+    _end_of_message_
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+    assert_equal("GET", req.request_method)
+    assert_equal("/path", req.unparsed_uri)
+    assert_equal("", req.script_name)
+    assert_equal("/path", req.path_info)
+    assert_equal(WEBrick::HTTPVersion.new("1.1"), req.http_version)
+    assert_equal(WEBrick::Config::HTTP[:ServerName], req.host)
+    assert_equal(80, req.port)
+    assert_equal(true, req.keep_alive?)
+    assert_equal(nil, req.body)
+    assert(req.query.empty?)
+  end
+
+  def test_parse_headers
+    msg = <<-_end_of_message_
+      GET /path HTTP/1.1
+      Host: test.ruby-lang.org:8080
+      Connection: close
+      Accept: text/*;q=0.3, text/html;q=0.7, text/html;level=1,
+              text/html;level=2;q=0.4, */*;q=0.5
+      Accept-Encoding: compress;q=0.5
+      Accept-Encoding: gzip;q=1.0, identity; q=0.4, *;q=0
+      Accept-Language: en;q=0.5, *; q=0
+      Accept-Language: ja
+      Content-Type: text/plain
+      Content-Length: 7
+
+      foobar
+    _end_of_message_
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+    assert_equal(
+      URI.parse("http://test.ruby-lang.org:8080/path"), req.request_uri)
+    assert_equal("test.ruby-lang.org", req.host)
+    assert_equal(8080, req.port)
+    assert_equal(false, req.keep_alive?)
+    assert_equal(
+      %w(text/html;level=1 text/html */* text/html;level=2 text/*),
+      req.accept)
+    assert_equal(%w(gzip compress identity *), req.accept_encoding)
+    assert_equal(%w(ja en *), req.accept_language)
+    assert_equal(7, req.content_length)
+    assert_equal("text/plain", req.content_type)
+    assert_equal("foobar\n", req.body)
+    assert(req.query.empty?)
+  end
+
+  def test_parse_header2()
+    msg = <<-_end_of_message_
+      POST /foo/bar/../baz?q=a HTTP/1.0
+      Content-Length: 9
+      User-Agent:
+        FOO   BAR
+        BAZ
+
+      hogehoge
+    _end_of_message_
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+    assert_equal("POST", req.request_method)
+    assert_equal("/foo/baz", req.path)
+    assert_equal("", req.script_name)
+    assert_equal("/foo/baz", req.path_info)
+    assert_equal("9", req['content-length'])
+    assert_equal("FOO BAR BAZ", req['user-agent'])
+    assert_equal("hogehoge\n", req.body)
+  end
+
+  def test_parse_headers3
+    msg = <<-_end_of_message_
+      GET /path HTTP/1.1
+      Host: test.ruby-lang.org
+
+    _end_of_message_
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+    assert_equal(URI.parse("http://test.ruby-lang.org/path"), req.request_uri)
+    assert_equal("test.ruby-lang.org", req.host)
+    assert_equal(80, req.port)
+
+    msg = <<-_end_of_message_
+      GET /path HTTP/1.1
+      Host: 192.168.1.1
+
+    _end_of_message_
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+    assert_equal(URI.parse("http://192.168.1.1/path"), req.request_uri)
+    assert_equal("192.168.1.1", req.host)
+    assert_equal(80, req.port)
+
+    msg = <<-_end_of_message_
+      GET /path HTTP/1.1
+      Host: [fe80::208:dff:feef:98c7]
+
+    _end_of_message_
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+    assert_equal(URI.parse("http://[fe80::208:dff:feef:98c7]/path"),
+                 req.request_uri)
+    assert_equal("[fe80::208:dff:feef:98c7]", req.host)
+    assert_equal(80, req.port)
+
+    msg = <<-_end_of_message_
+      GET /path HTTP/1.1
+      Host: 192.168.1.1:8080
+
+    _end_of_message_
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+    assert_equal(URI.parse("http://192.168.1.1:8080/path"), req.request_uri)
+    assert_equal("192.168.1.1", req.host)
+    assert_equal(8080, req.port)
+
+    msg = <<-_end_of_message_
+      GET /path HTTP/1.1
+      Host: [fe80::208:dff:feef:98c7]:8080
+
+    _end_of_message_
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+    assert_equal(URI.parse("http://[fe80::208:dff:feef:98c7]:8080/path"),
+                 req.request_uri)
+    assert_equal("[fe80::208:dff:feef:98c7]", req.host)
+    assert_equal(8080, req.port)
+  end
+
+  def test_parse_get_params
+    param = "foo=1;foo=2;foo=3;bar=x"
+    msg = <<-_end_of_message_
+      GET /path?#{param} HTTP/1.1
+      Host: test.ruby-lang.org:8080
+
+    _end_of_message_
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+    query = req.query
+    assert_equal("1", query["foo"])
+    assert_equal(["1", "2", "3"], query["foo"].to_ary)
+    assert_equal(["1", "2", "3"], query["foo"].list)
+    assert_equal("x", query["bar"])
+    assert_equal(["x"], query["bar"].list)
+  end
+
+  def test_parse_post_params
+    param = "foo=1;foo=2;foo=3;bar=x"
+    msg = <<-_end_of_message_
+      POST /path?foo=x;foo=y;foo=z;bar=1 HTTP/1.1
+      Host: test.ruby-lang.org:8080
+      Content-Length: #{param.size}
+      Content-Type: application/x-www-form-urlencoded
+
+      #{param}
+    _end_of_message_
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+    query = req.query
+    assert_equal("1", query["foo"])
+    assert_equal(["1", "2", "3"], query["foo"].to_ary)
+    assert_equal(["1", "2", "3"], query["foo"].list)
+    assert_equal("x", query["bar"])
+    assert_equal(["x"], query["bar"].list)
+  end
+
+  def test_chunked
+    crlf = "\x0d\x0a"
+    msg = <<-_end_of_message_
+      POST /path HTTP/1.1
+      Host: test.ruby-lang.org:8080
+      Transfer-Encoding: chunked
+
+    _end_of_message_
+    msg.gsub!(/^ {6}/, "")
+    open(__FILE__){|io|
+      while chunk = io.read(100)
+        msg << chunk.size.to_s(16) << crlf
+        msg << chunk << crlf
+      end
+    }
+    msg << "0" << crlf
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(StringIO.new(msg))
+    assert_equal(File.read(__FILE__), req.body)
+  end
+
+  def test_bad_messages
+    param = "foo=1;foo=2;foo=3;bar=x"
+    msg = <<-_end_of_message_
+      POST /path?foo=x;foo=y;foo=z;bar=1 HTTP/1.1
+      Host: test.ruby-lang.org:8080
+      Content-Type: application/x-www-form-urlencoded
+
+      #{param}
+    _end_of_message_
+    assert_raises(WEBrick::HTTPStatus::LengthRequired){
+      req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+      req.body
+    }
+
+    msg = <<-_end_of_message_
+      POST /path?foo=x;foo=y;foo=z;bar=1 HTTP/1.1
+      Host: test.ruby-lang.org:8080
+      Content-Length: 100000
+
+      body is too short.
+    _end_of_message_
+    assert_raises(WEBrick::HTTPStatus::BadRequest){
+      req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+      req.body
+    }
+
+    msg = <<-_end_of_message_
+      POST /path?foo=x;foo=y;foo=z;bar=1 HTTP/1.1
+      Host: test.ruby-lang.org:8080
+      Transfer-Encoding: foobar
+
+      body is too short.
+    _end_of_message_
+    assert_raises(WEBrick::HTTPStatus::NotImplemented){
+      req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
+      req.body
+    }
+  end
+end
diff --git a/ruby_1_8_6/test/webrick/test_httpserver.rb b/ruby_1_8_6/test/webrick/test_httpserver.rb
new file mode 100644
index 0000000000..eb685f916d
--- /dev/null
+++ b/ruby_1_8_6/test/webrick/test_httpserver.rb
@@ -0,0 +1,260 @@
+require "test/unit"
+require "net/http"
+require "webrick"
+require File.join(File.dirname(__FILE__), "utils.rb")
+
+class TestWEBrickHTTPServer < Test::Unit::TestCase
+  def test_mount
+    httpd = WEBrick::HTTPServer.new(
+      :Logger => WEBrick::Log.new(TestWEBrick::NullWriter),
+      :DoNotListen=>true
+    )
+    httpd.mount("/", :Root)
+    httpd.mount("/foo", :Foo)
+    httpd.mount("/foo/bar", :Bar, :bar1)
+    httpd.mount("/foo/bar/baz", :Baz, :baz1, :baz2)
+
+    serv, opts, script_name, path_info = httpd.search_servlet("/")
+    assert_equal(:Root, serv)
+    assert_equal([], opts)
+    assert_equal(script_name, "")
+    assert_equal(path_info, "/")
+
+    serv, opts, script_name, path_info = httpd.search_servlet("/sub")
+    assert_equal(:Root, serv)
+    assert_equal([], opts)
+    assert_equal(script_name, "")
+    assert_equal(path_info, "/sub")
+
+    serv, opts, script_name, path_info = httpd.search_servlet("/sub/")
+    assert_equal(:Root, serv)
+    assert_equal([], opts)
+    assert_equal(script_name, "")
+    assert_equal(path_info, "/sub/")
+
+    serv, opts, script_name, path_info = httpd.search_servlet("/foo")
+    assert_equal(:Foo, serv)
+    assert_equal([], opts)
+    assert_equal(script_name, "/foo")
+    assert_equal(path_info, "")
+
+    serv, opts, script_name, path_info = httpd.search_servlet("/foo/")
+    assert_equal(:Foo, serv)
+    assert_equal([], opts)
+    assert_equal(script_name, "/foo")
+    assert_equal(path_info, "/")
+
+    serv, opts, script_name, path_info = httpd.search_servlet("/foo/sub")
+    assert_equal(:Foo, serv)
+    assert_equal([], opts)
+    assert_equal(script_name, "/foo")
+    assert_equal(path_info, "/sub")
+
+    serv, opts, script_name, path_info = httpd.search_servlet("/foo/bar")
+    assert_equal(:Bar, serv)
+    assert_equal([:bar1], opts)
+    assert_equal(script_name, "/foo/bar")
+    assert_equal(path_info, "")
+
+    serv, opts, script_name, path_info = httpd.search_servlet("/foo/bar/baz")
+    assert_equal(:Baz, serv)
+    assert_equal([:baz1, :baz2], opts)
+    assert_equal(script_name, "/foo/bar/baz")
+    assert_equal(path_info, "")
+  end
+
+  class Req
+    attr_reader :port, :host
+    def initialize(addr, port, host)
+      @addr, @port, @host = addr, port, host
+    end
+    def addr
+      [0,0,0,@addr]
+    end
+  end
+
+  def httpd(addr, port, host, ali)
+    config ={
+      :Logger      => WEBrick::Log.new(TestWEBrick::NullWriter),
+      :DoNotListen => true,
+      :BindAddress => addr,
+      :Port        => port,
+      :ServerName  => host,
+      :ServerAlias => ali,
+    }
+    return WEBrick::HTTPServer.new(config)
+  end
+
+  def assert_eql?(v1, v2)
+    assert_equal(v1.object_id, v2.object_id)
+  end
+
+  def test_lookup_server
+    addr1  = "192.168.100.1"
+    addr2  = "192.168.100.2"
+    addrz  = "192.168.100.254"
+    local  = "127.0.0.1"
+    port1  = 80
+    port2  = 8080
+    port3  = 10080
+    portz  = 32767
+    name1  = "www.example.com"
+    name2  = "www2.example.com"
+    name3  = "www3.example.com"
+    namea  = "www.example.co.jp"
+    nameb  = "www.example.jp"
+    namec  = "www2.example.co.jp"
+    named  = "www2.example.jp"
+    namez  = "foobar.example.com"
+    alias1 = [namea, nameb]
+    alias2 = [namec, named]
+
+    host1 = httpd(nil, port1, name1, nil)
+    hosts = [
+      host2  = httpd(addr1, port1, name1, nil),
+      host3  = httpd(addr1, port1, name2, alias1),
+      host4  = httpd(addr1, port2, name1, nil),
+      host5  = httpd(addr1, port2, name2, alias1),
+      host6  = httpd(addr1, port2, name3, alias2),
+      host7  = httpd(addr2, nil,   name1, nil),
+      host8  = httpd(addr2, nil,   name2, alias1),
+      host9  = httpd(addr2, nil,   name3, alias2),
+      host10 = httpd(local, nil,   nil,   nil),
+      host11 = httpd(nil,   port3, nil,   nil),
+    ].sort_by{ rand }
+    hosts.each{|h| host1.virtual_host(h) }
+
+    # connect to addr1
+    assert_eql?(host2,   host1.lookup_server(Req.new(addr1, port1, name1)))
+    assert_eql?(host3,   host1.lookup_server(Req.new(addr1, port1, name2)))
+    assert_eql?(host3,   host1.lookup_server(Req.new(addr1, port1, namea)))
+    assert_eql?(host3,   host1.lookup_server(Req.new(addr1, port1, nameb)))
+    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, port1, namez)))
+    assert_eql?(host4,   host1.lookup_server(Req.new(addr1, port2, name1)))
+    assert_eql?(host5,   host1.lookup_server(Req.new(addr1, port2, name2)))
+    assert_eql?(host5,   host1.lookup_server(Req.new(addr1, port2, namea)))
+    assert_eql?(host5,   host1.lookup_server(Req.new(addr1, port2, nameb)))
+    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, port2, namez)))
+    assert_eql?(host11,  host1.lookup_server(Req.new(addr1, port3, name1)))
+    assert_eql?(host11,  host1.lookup_server(Req.new(addr1, port3, name2)))
+    assert_eql?(host11,  host1.lookup_server(Req.new(addr1, port3, namea)))
+    assert_eql?(host11,  host1.lookup_server(Req.new(addr1, port3, nameb)))
+    assert_eql?(host11,  host1.lookup_server(Req.new(addr1, port3, namez)))
+    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, portz, name1)))
+    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, portz, name2)))
+    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, portz, namea)))
+    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, portz, nameb)))
+    assert_eql?(nil,     host1.lookup_server(Req.new(addr1, portz, namez)))
+
+    # connect to addr2
+    assert_eql?(host7,  host1.lookup_server(Req.new(addr2, port1, name1)))
+    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port1, name2)))
+    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port1, namea)))
+    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port1, nameb)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addr2, port1, namez)))
+    assert_eql?(host7,  host1.lookup_server(Req.new(addr2, port2, name1)))
+    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port2, name2)))
+    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port2, namea)))
+    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port2, nameb)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addr2, port2, namez)))
+    assert_eql?(host7,  host1.lookup_server(Req.new(addr2, port3, name1)))
+    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port3, name2)))
+    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port3, namea)))
+    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, port3, nameb)))
+    assert_eql?(host11, host1.lookup_server(Req.new(addr2, port3, namez)))
+    assert_eql?(host7,  host1.lookup_server(Req.new(addr2, portz, name1)))
+    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, portz, name2)))
+    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, portz, namea)))
+    assert_eql?(host8,  host1.lookup_server(Req.new(addr2, portz, nameb)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addr2, portz, namez)))
+
+    # connect to addrz
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port1, name1)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port1, name2)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port1, namea)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port1, nameb)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port1, namez)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port2, name1)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port2, name2)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port2, namea)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port2, nameb)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, port2, namez)))
+    assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, name1)))
+    assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, name2)))
+    assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, namea)))
+    assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, nameb)))
+    assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, namez)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, portz, name1)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, portz, name2)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, portz, namea)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, portz, nameb)))
+    assert_eql?(nil,    host1.lookup_server(Req.new(addrz, portz, namez)))
+
+    # connect to localhost
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port1, name1)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port1, name2)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port1, namea)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port1, nameb)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port1, namez)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port2, name1)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port2, name2)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port2, namea)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port2, nameb)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port2, namez)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port3, name1)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port3, name2)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port3, namea)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port3, nameb)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, port3, namez)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, portz, name1)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, portz, name2)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, portz, namea)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, portz, nameb)))
+    assert_eql?(host10, host1.lookup_server(Req.new(local, portz, namez)))
+  end
+
+  def test_callbacks
+    accepted = started = stopped = 0
+    requested0 = requested1 = 0
+    config = {
+      :ServerName => "localhost",
+      :AcceptCallback => Proc.new{ accepted += 1 },
+      :StartCallback => Proc.new{ started += 1 },
+      :StopCallback => Proc.new{ stopped += 1 },
+      :RequestCallback => Proc.new{|req, res| requested0 += 1 },
+    }
+    TestWEBrick.start_httpserver(config){|server, addr, port|
+      vhost_config = {
+        :ServerName => "myhostname",
+        :BindAddress => addr,
+        :Port => port,
+        :DoNotListen => true,
+        :Logger => WEBrick::Log.new(TestWEBrick::NullWriter),
+        :AccessLog => [],
+        :RequestCallback => Proc.new{|req, res| requested1 += 1 },
+      }
+      server.virtual_host(WEBrick::HTTPServer.new(vhost_config))
+
+      true while server.status != :Running
+      assert_equal(started, 1)
+      assert_equal(stopped, 0)
+      assert_equal(accepted, 0)
+
+      http = Net::HTTP.new(addr, port)
+      req = Net::HTTP::Get.new("/")
+      req["Host"] = "myhostname:#{port}"
+      http.request(req){|res| assert_equal("404", res.code)}
+      http.request(req){|res| assert_equal("404", res.code)}
+      http.request(req){|res| assert_equal("404", res.code)}
+      req["Host"] = "localhost:#{port}"
+      http.request(req){|res| assert_equal("404", res.code)}
+      http.request(req){|res| assert_equal("404", res.code)}
+      http.request(req){|res| assert_equal("404", res.code)}
+      assert_equal(6, accepted)
+      assert_equal(3, requested0)
+      assert_equal(3, requested1)
+    }
+    assert_equal(started, 1)
+    assert_equal(stopped, 1)
+  end
+end
diff --git a/ruby_1_8_6/test/webrick/test_httputils.rb b/ruby_1_8_6/test/webrick/test_httputils.rb
new file mode 100644
index 0000000000..9d39ff53ab
--- /dev/null
+++ b/ruby_1_8_6/test/webrick/test_httputils.rb
@@ -0,0 +1,96 @@
+require "test/unit"
+require "webrick/httputils"
+
+class TestWEBrickHTTPUtils < Test::Unit::TestCase
+  include WEBrick::HTTPUtils
+
+  def test_normilize_path
+    assert_equal("/foo",       normalize_path("/foo"))
+    assert_equal("/foo/bar/",  normalize_path("/foo/bar/"))
+
+    assert_equal("/",          normalize_path("/foo/../"))
+    assert_equal("/",          normalize_path("/foo/.."))
+    assert_equal("/",          normalize_path("/foo/bar/../../"))
+    assert_equal("/",          normalize_path("/foo/bar/../.."))
+    assert_equal("/",          normalize_path("/foo/bar/../.."))
+    assert_equal("/baz",       normalize_path("/foo/bar/../../baz"))
+    assert_equal("/baz",       normalize_path("/foo/../bar/../baz"))
+    assert_equal("/baz/",      normalize_path("/foo/../bar/../baz/"))
+    assert_equal("/...",       normalize_path("/bar/../..."))
+    assert_equal("/.../",      normalize_path("/bar/../.../"))
+
+    assert_equal("/foo/",      normalize_path("/foo/./"))
+    assert_equal("/foo/",      normalize_path("/foo/."))
+    assert_equal("/foo/",      normalize_path("/foo/././"))
+    assert_equal("/foo/",      normalize_path("/foo/./."))
+    assert_equal("/foo/bar",   normalize_path("/foo/./bar"))
+    assert_equal("/foo/bar/",  normalize_path("/foo/./bar/."))
+    assert_equal("/foo/bar/",  normalize_path("/./././foo/./bar/."))
+
+    assert_equal("/foo/bar/",  normalize_path("//foo///.//bar/.///.//"))
+    assert_equal("/",          normalize_path("//foo///..///bar/.///..//.//"))
+
+    assert_raises(RuntimeError){ normalize_path("foo/bar") }
+    assert_raises(RuntimeError){ normalize_path("..") }
+    assert_raises(RuntimeError){ normalize_path("/..") }
+    assert_raises(RuntimeError){ normalize_path("/./..") }
+    assert_raises(RuntimeError){ normalize_path("/./../") }
+    assert_raises(RuntimeError){ normalize_path("/./../..") }
+    assert_raises(RuntimeError){ normalize_path("/./../../") }
+    assert_raises(RuntimeError){ normalize_path("/./../") }
+    assert_raises(RuntimeError){ normalize_path("/../..") }
+    assert_raises(RuntimeError){ normalize_path("/../../") }
+    assert_raises(RuntimeError){ normalize_path("/../../..") }
+    assert_raises(RuntimeError){ normalize_path("/../../../") }
+    assert_raises(RuntimeError){ normalize_path("/../foo/../") }
+    assert_raises(RuntimeError){ normalize_path("/../foo/../../") }
+    assert_raises(RuntimeError){ normalize_path("/foo/bar/../../../../") }
+    assert_raises(RuntimeError){ normalize_path("/foo/../bar/../../") }
+    assert_raises(RuntimeError){ normalize_path("/./../bar/") }
+    assert_raises(RuntimeError){ normalize_path("/./../") }
+  end
+
+  def test_split_header_value
+    assert_equal(['foo', 'bar'], split_header_value('foo, bar'))
+    assert_equal(['"foo"', 'bar'], split_header_value('"foo", bar'))
+    assert_equal(['foo', '"bar"'], split_header_value('foo, "bar"'))
+    assert_equal(['*'], split_header_value('*'))
+    assert_equal(['W/"xyzzy"', 'W/"r2d2xxxx"', 'W/"c3piozzzz"'],
+                 split_header_value('W/"xyzzy", W/"r2d2xxxx", W/"c3piozzzz"'))
+  end
+
+  def test_escape
+    assert_equal("/foo/bar", escape("/foo/bar"))
+    assert_equal("/~foo/bar", escape("/~foo/bar"))
+    assert_equal("/~foo%20bar", escape("/~foo bar"))
+    assert_equal("/~foo%20bar", escape("/~foo bar"))
+    assert_equal("/~foo%09bar", escape("/~foo\tbar"))
+    assert_equal("/~foo+bar", escape("/~foo+bar"))
+  end
+
+  def test_escape_form
+    assert_equal("%2Ffoo%2Fbar", escape_form("/foo/bar"))
+    assert_equal("%2F~foo%2Fbar", escape_form("/~foo/bar"))
+    assert_equal("%2F~foo+bar", escape_form("/~foo bar"))
+    assert_equal("%2F~foo+%2B+bar", escape_form("/~foo + bar"))
+  end
+
+  def test_unescape
+    assert_equal("/foo/bar", unescape("%2ffoo%2fbar"))
+    assert_equal("/~foo/bar", unescape("/%7efoo/bar"))
+    assert_equal("/~foo/bar", unescape("%2f%7efoo%2fbar"))
+    assert_equal("/~foo+bar", unescape("/%7efoo+bar"))
+  end
+
+  def test_unescape_form
+    assert_equal("//foo/bar", unescape_form("/%2Ffoo/bar"))
+    assert_equal("//foo/bar baz", unescape_form("/%2Ffoo/bar+baz"))
+    assert_equal("/~foo/bar baz", unescape_form("/%7Efoo/bar+baz"))
+  end
+
+  def test_escape_path
+    assert_equal("/foo/bar", escape_path("/foo/bar"))
+    assert_equal("/foo/bar/", escape_path("/foo/bar/"))
+    assert_equal("/%25foo/bar/", escape_path("/%foo/bar/"))
+  end
+end
diff --git a/ruby_1_8_6/test/webrick/test_httpversion.rb b/ruby_1_8_6/test/webrick/test_httpversion.rb
new file mode 100644
index 0000000000..81a871a226
--- /dev/null
+++ b/ruby_1_8_6/test/webrick/test_httpversion.rb
@@ -0,0 +1,40 @@
+require "test/unit"
+require "webrick/httpversion"
+
+class TestWEBrickHTTPVersion < Test::Unit::TestCase
+  def setup
+    @v09 = WEBrick::HTTPVersion.new("0.9")
+    @v10 = WEBrick::HTTPVersion.new("1.0")
+    @v11 = WEBrick::HTTPVersion.new("1.001")
+  end
+
+  def test_to_s()
+    assert_equal("0.9", @v09.to_s)
+    assert_equal("1.0", @v10.to_s)
+    assert_equal("1.1", @v11.to_s)
+  end
+
+  def test_major()
+    assert_equal(0, @v09.major)
+    assert_equal(1, @v10.major)
+    assert_equal(1, @v11.major)
+  end
+
+  def test_minor()
+    assert_equal(9, @v09.minor)
+    assert_equal(0, @v10.minor)
+    assert_equal(1, @v11.minor)
+  end
+
+  def test_compar()
+    assert_equal(0, @v09 <=> "0.9")
+    assert_equal(0, @v09 <=> "0.09")
+
+    assert_equal(-1, @v09 <=> @v10)
+    assert_equal(-1, @v09 <=> "1.00")
+
+    assert_equal(1, @v11 <=> @v09)
+    assert_equal(1, @v11 <=> "1.0")
+    assert_equal(1, @v11 <=> "0.9")
+  end
+end
diff --git a/ruby_1_8_6/test/webrick/test_server.rb b/ruby_1_8_6/test/webrick/test_server.rb
new file mode 100644
index 0000000000..ce5ee85c6c
--- /dev/null
+++ b/ruby_1_8_6/test/webrick/test_server.rb
@@ -0,0 +1,64 @@
+require "test/unit"
+require "tempfile"
+require "webrick"
+require File.join(File.dirname(__FILE__), "utils.rb")
+
+class TestWEBrickServer < Test::Unit::TestCase
+  class Echo < WEBrick::GenericServer
+    def run(sock)
+      while line = sock.gets
+        sock << line
+      end
+    end
+  end
+
+  def test_server
+    TestWEBrick.start_server(Echo){|server, addr, port|
+      TCPSocket.open(addr, port){|sock|
+        sock.puts("foo"); assert_equal("foo\n", sock.gets)
+        sock.puts("bar"); assert_equal("bar\n", sock.gets)
+        sock.puts("baz"); assert_equal("baz\n", sock.gets)
+        sock.puts("qux"); assert_equal("qux\n", sock.gets)
+      }
+    }
+  end
+
+  def test_callbacks
+    accepted = started = stopped = 0
+    config = {
+      :AcceptCallback => Proc.new{ accepted += 1 },
+      :StartCallback => Proc.new{ started += 1 },
+      :StopCallback => Proc.new{ stopped += 1 },
+    }
+    TestWEBrick.start_server(Echo, config){|server, addr, port|
+      true while server.status != :Running
+      assert_equal(started, 1)
+      assert_equal(stopped, 0)
+      assert_equal(accepted, 0)
+      TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets }
+      TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets }
+      TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets }
+      assert_equal(accepted, 3)
+    }
+    assert_equal(started, 1)
+    assert_equal(stopped, 1)
+  end
+
+  def test_daemon
+    begin
+      r, w = IO.pipe
+      Process.fork{
+        r.close
+        WEBrick::Daemon.start
+        w.puts(Process.pid)
+        sleep
+      }
+      assert(Process.kill(:KILL, r.gets.to_i))
+    rescue NotImplementedError
+      # snip this test
+    ensure
+      r.close
+      w.close
+    end
+  end
+end
diff --git a/ruby_1_8_6/test/webrick/utils.rb b/ruby_1_8_6/test/webrick/utils.rb
new file mode 100644
index 0000000000..f1e6e4b027
--- /dev/null
+++ b/ruby_1_8_6/test/webrick/utils.rb
@@ -0,0 +1,40 @@
+require "webrick"
+begin
+  require "webrick/https"
+rescue LoadError
+end
+require "webrick/httpproxy"
+
+module TestWEBrick
+  NullWriter = Object.new
+  def NullWriter.<<(msg)
+    puts msg if $DEBUG
+    return self
+  end
+
+  module_function
+
+  def start_server(klass, config={}, &block)
+    server = klass.new({
+      :BindAddress => "127.0.0.1", :Port => 0,
+      :Logger => WEBrick::Log.new(NullWriter),
+      :AccessLog => [[NullWriter, ""]]
+    }.update(config))
+    begin
+      thread = Thread.start{ server.start }
+      addr = server.listeners[0].addr
+      block.call([server, addr[3], addr[1]])
+    ensure
+      server.stop
+      thread.join
+    end
+  end
+
+  def start_httpserver(config={}, &block)
+    start_server(WEBrick::HTTPServer, config, &block)
+  end
+
+  def start_httpproxy(config={}, &block)
+    start_server(WEBrick::HTTPProxyServer, config, &block)
+  end
+end
diff --git a/ruby_1_8_6/test/webrick/webrick.cgi b/ruby_1_8_6/test/webrick/webrick.cgi
new file mode 100644
index 0000000000..73ba729407
--- /dev/null
+++ b/ruby_1_8_6/test/webrick/webrick.cgi
@@ -0,0 +1,36 @@
+#!ruby -d
+require "webrick/cgi"
+
+class TestApp < WEBrick::CGI
+  def do_GET(req, res)
+    res["content-type"] = "text/plain"
+    if (p = req.path_info) && p.length > 0
+      res.body = p
+    elsif (q = req.query).size > 0
+      res.body = q.keys.sort.collect{|key|
+        q[key].list.sort.collect{|v|
+          "#{key}=#{v}"
+        }.join(", ")
+      }.join(", ")
+    elsif %r{/$} =~ req.request_uri.to_s
+      res.body = ""
+      res.body << req.request_uri.to_s  << "\n"
+      res.body << req.script_name
+    elsif !req.cookies.empty?
+      res.body = req.cookies.inject(""){|result, cookie|
+        result << "%s=%s\n" % [cookie.name, cookie.value]
+      }
+      res.cookies << WEBrick::Cookie.new("Customer", "WILE_E_COYOTE")
+      res.cookies << WEBrick::Cookie.new("Shipping", "FedEx")
+    else
+      res.body = req.script_name
+    end
+  end
+
+  def do_POST(req, res)
+    do_GET(req, res)
+  end
+end
+
+cgi = TestApp.new
+cgi.start
diff --git a/ruby_1_8_6/test/wsdl/any/any.wsdl b/ruby_1_8_6/test/wsdl/any/any.wsdl
new file mode 100644
index 0000000000..4d1f73a8cd
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/any/any.wsdl
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name="echo"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:tns="urn:example.com:echo"
+    xmlns:txd="urn:example.com:echo-type"
+    targetNamespace="urn:example.com:echo"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema targetNamespace="urn:example.com:echo-type">
+      <xsd:complexType name="foo.bar">
+        <xsd:sequence>
+          <xsd:any />
+        </xsd:sequence>
+      </xsd:complexType>
+    </xsd:schema>
+  </types>
+
+  <message name="msg_echoitem">
+    <part name="echoitem" type="txd:foo.bar"/>
+  </message>
+
+  <portType name="echo_port_type">
+    <operation name="echo">
+      <input message="tns:msg_echoitem"/>
+      <output message="tns:msg_echoitem"/>
+    </operation>
+  </portType>
+
+  <binding name="echo_binding" type="tns:echo_port_type">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+    <operation name="echo">
+      <soap:operation soapAction="urn:example.com:echo"/>
+      <input>
+        <soap:body use="encoded" namespace="urn:example.com:echo"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="urn:example.com:echo"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+  </binding>
+
+  <service name="echo_service">
+    <port name="echo_port" binding="tns:echo_binding">
+      <soap:address location="http://localhost:10080"/>
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/any/expectedDriver.rb b/ruby_1_8_6/test/wsdl/any/expectedDriver.rb
new file mode 100644
index 0000000000..6d1827fb94
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/any/expectedDriver.rb
@@ -0,0 +1,54 @@
+require 'echo.rb'
+
+require 'soap/rpc/driver'
+
+class Echo_port_type < ::SOAP::RPC::Driver
+  DefaultEndpointUrl = "http://localhost:10080"
+  MappingRegistry = ::SOAP::Mapping::Registry.new
+
+  MappingRegistry.set(
+    FooBar,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("urn:example.com:echo-type", "foo.bar") }
+  )
+
+  Methods = [
+    [ XSD::QName.new("urn:example.com:echo", "echo"),
+      "urn:example.com:echo",
+      "echo",
+      [ ["in", "echoitem", ["FooBar", "urn:example.com:echo-type", "foo.bar"]],
+        ["retval", "echoitem", ["FooBar", "urn:example.com:echo-type", "foo.bar"]] ],
+      { :request_style =>  :rpc, :request_use =>  :encoded,
+        :response_style => :rpc, :response_use => :encoded }
+    ]
+  ]
+
+  def initialize(endpoint_url = nil)
+    endpoint_url ||= DefaultEndpointUrl
+    super(endpoint_url, nil)
+    self.mapping_registry = MappingRegistry
+    init_methods
+  end
+
+private
+
+  def init_methods
+    Methods.each do |definitions|
+      opt = definitions.last
+      if opt[:request_style] == :document
+        add_document_operation(*definitions)
+      else
+        add_rpc_operation(*definitions)
+        qname = definitions[0]
+        name = definitions[2]
+        if qname.name != name and qname.name.capitalize == name.capitalize
+          ::SOAP::Mapping.define_singleton_method(self, qname.name) do |*arg|
+            __send__(name, *arg)
+          end
+        end
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/test/wsdl/any/expectedEcho.rb b/ruby_1_8_6/test/wsdl/any/expectedEcho.rb
new file mode 100644
index 0000000000..456950dfef
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/any/expectedEcho.rb
@@ -0,0 +1,14 @@
+require 'xsd/qname'
+
+# {urn:example.com:echo-type}foo.bar
+class FooBar
+  @@schema_type = "foo.bar"
+  @@schema_ns = "urn:example.com:echo-type"
+  @@schema_element = [["any", [nil, XSD::QName.new(nil, "any")]]]
+
+  attr_accessor :any
+
+  def initialize(any = nil)
+    @any = any
+  end
+end
diff --git a/ruby_1_8_6/test/wsdl/any/expectedService.rb b/ruby_1_8_6/test/wsdl/any/expectedService.rb
new file mode 100644
index 0000000000..e3885e7c6c
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/any/expectedService.rb
@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+require 'echoServant.rb'
+
+require 'soap/rpc/standaloneServer'
+require 'soap/mapping/registry'
+
+class Echo_port_type
+  MappingRegistry = ::SOAP::Mapping::Registry.new
+
+  MappingRegistry.set(
+    FooBar,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("urn:example.com:echo-type", "foo.bar") }
+  )
+
+  Methods = [
+    [ XSD::QName.new("urn:example.com:echo", "echo"),
+      "urn:example.com:echo",
+      "echo",
+      [ ["in", "echoitem", ["FooBar", "urn:example.com:echo-type", "foo.bar"]],
+        ["retval", "echoitem", ["FooBar", "urn:example.com:echo-type", "foo.bar"]] ],
+      { :request_style =>  :rpc, :request_use =>  :encoded,
+        :response_style => :rpc, :response_use => :encoded }
+    ]
+  ]
+end
+
+class Echo_port_typeApp < ::SOAP::RPC::StandaloneServer
+  def initialize(*arg)
+    super(*arg)
+    servant = Echo_port_type.new
+    Echo_port_type::Methods.each do |definitions|
+      opt = definitions.last
+      if opt[:request_style] == :document
+        @router.add_document_operation(servant, *definitions)
+      else
+        @router.add_rpc_operation(servant, *definitions)
+      end
+    end
+    self.mapping_registry = Echo_port_type::MappingRegistry
+  end
+end
+
+if $0 == __FILE__
+  # Change listen port.
+  server = Echo_port_typeApp.new('app', nil, '0.0.0.0', 10080)
+  trap(:INT) do
+    server.shutdown
+  end
+  server.start
+end
diff --git a/ruby_1_8_6/test/wsdl/any/test_any.rb b/ruby_1_8_6/test/wsdl/any/test_any.rb
new file mode 100644
index 0000000000..aab5eb631f
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/any/test_any.rb
@@ -0,0 +1,58 @@
+require 'test/unit'
+require 'wsdl/parser'
+require 'wsdl/soap/wsdl2ruby'
+module WSDL; module Any
+
+
+class TestAny < Test::Unit::TestCase
+  DIR = File.dirname(File.expand_path(__FILE__))
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
+
+  def test_any
+    gen = WSDL::SOAP::WSDL2Ruby.new
+    gen.location = pathname("any.wsdl")
+    gen.basedir = DIR
+    gen.logger.level = Logger::FATAL
+    gen.opt['classdef'] = nil
+    gen.opt['driver'] = nil
+    gen.opt['client_skelton'] = nil
+    gen.opt['servant_skelton'] = nil
+    gen.opt['standalone_server_stub'] = nil
+    gen.opt['force'] = true
+    suppress_warning do
+      gen.run
+    end
+    compare("expectedDriver.rb", "echoDriver.rb")
+    compare("expectedEcho.rb", "echo.rb")
+    compare("expectedService.rb", "echo_service.rb")
+
+    File.unlink(pathname("echo_service.rb"))
+    File.unlink(pathname("echo.rb"))
+    File.unlink(pathname("echo_serviceClient.rb"))
+    File.unlink(pathname("echoDriver.rb"))
+    File.unlink(pathname("echoServant.rb"))
+  end
+
+  def compare(expected, actual)
+    assert_equal(loadfile(expected), loadfile(actual), actual)
+  end
+
+  def loadfile(file)
+    File.open(pathname(file)) { |f| f.read }
+  end
+
+  def suppress_warning
+    back = $VERBOSE
+    $VERBOSE = nil
+    begin
+      yield
+    ensure
+      $VERBOSE = back
+    end
+  end
+end
+
+
+end; end
diff --git a/ruby_1_8_6/test/wsdl/axisArray/axisArray.wsdl b/ruby_1_8_6/test/wsdl/axisArray/axisArray.wsdl
new file mode 100644
index 0000000000..3602edb748
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/axisArray/axisArray.wsdl
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name = "itemList"
+    targetNamespace="urn:jp.gr.jin.rrr.example.itemList"
+    xmlns:tns="urn:jp.gr.jin.rrr.example.itemList"
+    xmlns:typens="urn:jp.gr.jin.rrr.example.itemListType"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <wsdl:types>
+    <schema targetNamespace="urn:jp.gr.jin.rrr.example.itemListType"
+	xmlns="http://www.w3.org/2001/XMLSchema">
+      <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+      <complexType name="Item">
+        <sequence>
+          <element name="name" type="xsd:string"/>
+        </sequence>
+      </complexType>
+      <complexType name="ItemList">
+        <sequence>
+          <element maxOccurs="unbounded" minOccurs="0" name="Item" type="typens:Item"/>
+        </sequence>
+      </complexType>
+    </schema>
+  </wsdl:types>
+
+  <wsdl:message name="listItemRequest"/>
+
+  <wsdl:message name="listItemResponse">
+    <wsdl:part name="list" type="typens:ItemList"/>
+  </wsdl:message>
+
+  <wsdl:portType name="ItemListPortType">
+    <wsdl:operation name="listItem">
+      <wsdl:input message="tns:listItemRequest" name="listItemRequest"/>
+      <wsdl:output message="tns:listItemResponse" name="listItemResponse"/>
+    </wsdl:operation>
+  </wsdl:portType>
+
+  <wsdl:binding name="ItemListBinding" type="tns:ItemListPortType">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="listItem">
+      <soap:operation soapAction=""/>
+      <wsdl:input name="listItemRequest">
+	<soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:jp.gr.jin.rrr.example.itemList" use="encoded"/>
+      </wsdl:input>
+      <wsdl:output name="listItemResponse">
+	<soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:jp.gr.jin.rrr.example.itemList" use="encoded"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+
+  <wsdl:service name="ItemListService">
+    <wsdl:port binding="tns:ItemListBinding" name="ItemListPort">
+      <soap:address location="http://localhost:10080/"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
diff --git a/ruby_1_8_6/test/wsdl/axisArray/itemList.rb b/ruby_1_8_6/test/wsdl/axisArray/itemList.rb
new file mode 100644
index 0000000000..b81297ed37
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/axisArray/itemList.rb
@@ -0,0 +1,27 @@
+# Generated by wsdl2ruby.rb with axisArray.wsdl.
+
+# urn:jp.gr.jin.rrr.example.itemListType
+class Item
+  @@schema_type = "Item"
+  @@schema_ns = "urn:jp.gr.jin.rrr.example.itemListType"
+
+  def name
+    @name
+  end
+
+  def name=(value)
+    @name = value
+  end
+
+  def initialize(name = nil)
+    @name = name
+  end
+end
+
+# urn:jp.gr.jin.rrr.example.itemListType
+class ItemList < Array
+  # Contents type should be dumped here...
+  @@schema_type = "ItemList"
+  @@schema_ns = "urn:jp.gr.jin.rrr.example.itemListType"
+end
+
diff --git a/ruby_1_8_6/test/wsdl/axisArray/test_axisarray.rb b/ruby_1_8_6/test/wsdl/axisArray/test_axisarray.rb
new file mode 100644
index 0000000000..9f220bb48a
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/axisArray/test_axisarray.rb
@@ -0,0 +1,69 @@
+require 'test/unit'
+require 'soap/processor'
+require 'soap/mapping'
+require 'soap/rpc/element'
+require 'wsdl/importer'
+require 'itemList.rb'
+
+
+module WSDL
+
+
+class TestAxisArray < Test::Unit::TestCase
+  def setup
+    @xml =<<__EOX__
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <soapenv:Body>
+    <ns1:listItemResponse soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:ns1="urn:jp.gr.jin.rrr.example.itemList">
+      <list href="#id0"/>
+    </ns1:listItemResponse>
+    <multiRef id="id0" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns2:ItemList" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:ns2="urn:jp.gr.jin.rrr.example.itemListType">
+      <Item href="#id1"/>
+      <Item href="#id2"/>
+      <Item href="#id3"/>
+    </multiRef>
+    <multiRef id="id3" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns3:Item" xmlns:ns3="urn:jp.gr.jin.rrr.example.itemListType" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+      <name xsi:type="xsd:string">name3</name>
+    </multiRef>
+    <multiRef id="id1" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns4:Item" xmlns:ns4="urn:jp.gr.jin.rrr.example.itemListType" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+      <name xsi:type="xsd:string">name1</name>
+    </multiRef>
+    <multiRef id="id2" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns5:Item" xmlns:ns5="urn:jp.gr.jin.rrr.example.itemListType" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
+      <name xsi:type="xsd:string">name2</name>
+    </multiRef>
+  </soapenv:Body>
+</soapenv:Envelope>
+__EOX__
+  end
+
+  def test_by_stub
+    header, body = ::SOAP::Processor.unmarshal(@xml)
+    ary = ::SOAP::Mapping.soap2obj(body.response)
+    assert_equal(3, ary.size)
+    assert_equal("name1", ary[0].name)
+    assert_equal("name2", ary[1].name)
+    assert_equal("name3", ary[2].name)
+  end
+
+  def test_by_wsdl
+    wsdlfile = File.join(File.dirname(File.expand_path(__FILE__)), 'axisArray.wsdl')
+    wsdl = WSDL::Importer.import(wsdlfile)
+    service = wsdl.services[0]
+    port = service.ports[0]
+    wsdl_types = wsdl.collect_complextypes
+    rpc_decode_typemap = wsdl_types + wsdl.soap_rpc_complextypes(port.find_binding)
+    opt = {}
+    opt[:default_encodingstyle] = ::SOAP::EncodingNamespace
+    opt[:decode_typemap] = rpc_decode_typemap
+    header, body = ::SOAP::Processor.unmarshal(@xml, opt)
+    ary = ::SOAP::Mapping.soap2obj(body.response)
+    assert_equal(3, ary.size)
+    assert_equal("name1", ary[0].name)
+    assert_equal("name2", ary[1].name)
+    assert_equal("name3", ary[2].name)
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/wsdl/datetime/DatetimeService.rb b/ruby_1_8_6/test/wsdl/datetime/DatetimeService.rb
new file mode 100644
index 0000000000..800e06d66f
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/datetime/DatetimeService.rb
@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+require 'datetimeServant.rb'
+
+require 'soap/rpc/standaloneServer'
+require 'soap/mapping/registry'
+
+class DatetimePortType
+  MappingRegistry = ::SOAP::Mapping::Registry.new
+
+  Methods = [
+    ["now", "now",
+      [
+        ["in", "now", [::SOAP::SOAPDateTime]],
+        ["retval", "now", [::SOAP::SOAPDateTime]]
+      ],
+      "", "urn:jp.gr.jin.rrr.example.datetime", :rpc
+    ]
+  ]
+end
+
+class DatetimePortTypeApp < ::SOAP::RPC::StandaloneServer
+  def initialize(*arg)
+    super(*arg)
+    servant = DatetimePortType.new
+    DatetimePortType::Methods.each do |name_as, name, param_def, soapaction, namespace, style|
+      if style == :document
+        @router.add_document_operation(servant, soapaction, name, param_def)
+      else
+        qname = XSD::QName.new(namespace, name_as)
+        @router.add_rpc_operation(servant, qname, soapaction, name, param_def)
+      end
+    end
+    self.mapping_registry = DatetimePortType::MappingRegistry
+  end
+end
+
+if $0 == __FILE__
+  # Change listen port.
+  server = DatetimePortTypeApp.new('app', nil, '0.0.0.0', 10080)
+  trap(:INT) do
+    server.shutdown
+  end
+  server.start
+end
diff --git a/ruby_1_8_6/test/wsdl/datetime/datetime.rb b/ruby_1_8_6/test/wsdl/datetime/datetime.rb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/datetime/datetime.rb
diff --git a/ruby_1_8_6/test/wsdl/datetime/datetime.wsdl b/ruby_1_8_6/test/wsdl/datetime/datetime.wsdl
new file mode 100644
index 0000000000..4998dc48d6
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/datetime/datetime.wsdl
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name = "datetime"
+    targetNamespace="urn:jp.gr.jin.rrr.example.datetime"
+    xmlns:tns="urn:jp.gr.jin.rrr.example.datetime"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+  <wsdl:message name="nowRequest">
+    <wsdl:part name="now" type="xsd:dateTime"/>
+  </wsdl:message>
+
+  <wsdl:message name="nowResponse">
+    <wsdl:part name="now" type="xsd:dateTime"/>
+  </wsdl:message>
+
+  <wsdl:portType name="DatetimePortType">
+    <wsdl:operation name="now">
+      <wsdl:input message="tns:nowRequest" name="nowRequest"/>
+      <wsdl:output message="tns:nowResponse" name="nowResponse"/>
+    </wsdl:operation>
+  </wsdl:portType>
+
+  <wsdl:binding name="DatetimeBinding" type="tns:DatetimePortType">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="now">
+      <soap:operation soapAction=""/>
+      <wsdl:input name="nowRequest">
+	<soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:jp.gr.jin.rrr.example.datetime" use="encoded"/>
+      </wsdl:input>
+      <wsdl:output name="nowResponse">
+	<soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:jp.gr.jin.rrr.example.datetime" use="encoded"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+
+  <wsdl:service name="DatetimeService">
+    <wsdl:port binding="tns:DatetimeBinding" name="DatetimePort">
+      <soap:address location="http://localhost:10080/"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
diff --git a/ruby_1_8_6/test/wsdl/datetime/datetimeServant.rb b/ruby_1_8_6/test/wsdl/datetime/datetimeServant.rb
new file mode 100644
index 0000000000..14145c42e5
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/datetime/datetimeServant.rb
@@ -0,0 +1,21 @@
+require 'datetime.rb'
+
+class DatetimePortType
+  # SYNOPSIS
+  #   now(now)
+  #
+  # ARGS
+  #   now		 - {http://www.w3.org/2001/XMLSchema}dateTime
+  #
+  # RETURNS
+  #   now		 - {http://www.w3.org/2001/XMLSchema}dateTime
+  #
+  # RAISES
+  #   (undefined)
+  #
+  def now(now)
+    #raise NotImplementedError.new
+    now + 1
+  end
+end
+
diff --git a/ruby_1_8_6/test/wsdl/datetime/test_datetime.rb b/ruby_1_8_6/test/wsdl/datetime/test_datetime.rb
new file mode 100644
index 0000000000..7652318205
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/datetime/test_datetime.rb
@@ -0,0 +1,82 @@
+require 'test/unit'
+require 'soap/wsdlDriver'
+require 'DatetimeService.rb'
+
+
+module WSDL
+module Datetime
+
+
+class TestDatetime < Test::Unit::TestCase
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = DatetimePortTypeApp.new('Datetime server', nil, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      Thread.current.abort_on_exception = true
+      @server.start
+    }
+  end
+
+  def setup_client
+    wsdl = File.join(DIR, 'datetime.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.generate_explicit_type = true
+    @client.wiredump_dev = STDOUT if $DEBUG
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @t.kill
+    @t.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def test_datetime
+    d = DateTime.now
+    d1 = d + 1
+    d2 = @client.now(d)
+    assert_equal(d1.year, d2.year)
+    assert_equal(d1.month, d2.month)
+    assert_equal(d1.day, d2.day)
+    assert_equal(d1.hour, d2.hour)
+    assert_equal(d1.min, d2.min)
+    assert_equal(d1.sec, d2.sec)
+    assert_equal(d1.sec, d2.sec)
+  end
+
+  def test_time
+    d = DateTime.now
+    t = Time.gm(d.year, d.month, d.day, d.hour, d.min, d.sec)
+    d1 = d + 1
+    d2 = @client.now(t)
+    assert_equal(d1.year, d2.year)
+    assert_equal(d1.month, d2.month)
+    assert_equal(d1.day, d2.day)
+    assert_equal(d1.hour, d2.hour)
+    assert_equal(d1.min, d2.min)
+    assert_equal(d1.sec, d2.sec)
+    assert_equal(d1.sec, d2.sec)
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/wsdl/document/document.wsdl b/ruby_1_8_6/test/wsdl/document/document.wsdl
new file mode 100644
index 0000000000..fbf03fae8b
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/document/document.wsdl
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions
+    name="echo"
+    targetNamespace="urn:docrpc"
+    xmlns:tns="urn:docrpc"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema elementFormDefault="unqualified" targetNamespace="urn:docrpc">
+      <xsd:complexType name="echo_struct">
+        <xsd:sequence>
+          <xsd:element minOccurs="0" maxOccurs="1" name="m_string" type="xsd:string" />
+          <xsd:element minOccurs="0" maxOccurs="1" name="m_datetime" type="xsd:dateTime" />
+        </xsd:sequence>
+        <xsd:attribute name="m_attr" type="xsd:string" />
+      </xsd:complexType>
+
+      <xsd:element name="echoele">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element minOccurs="0" maxOccurs="1" name="struct1" type="tns:echo_struct" />
+            <xsd:element minOccurs="0" maxOccurs="1" name="struct-2" type="tns:echo_struct" />
+          </xsd:sequence>
+          <xsd:attribute name="attr_string" type="xsd:string" />
+          <xsd:attribute name="attr-int" type="xsd:int" />
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="echo_response">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element minOccurs="0" maxOccurs="1" name="struct1" type="tns:echo_struct" />
+            <xsd:element minOccurs="0" maxOccurs="1" name="struct-2" type="tns:echo_struct" />
+          </xsd:sequence>
+          <xsd:attribute name="attr_string" type="xsd:string" />
+          <xsd:attribute name="attr-int" type="xsd:int" />
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:schema>
+  </types>
+
+  <message name="echo_in">
+    <part name="parameters" element="tns:echoele" />
+  </message>
+  <message name="echo_out">
+    <part name="parameters" element="tns:echo_response" />
+  </message>
+
+  <portType name="docrpc_porttype">
+    <operation name="echo">
+      <input message="tns:echo_in" />
+      <output message="tns:echo_out" />
+    </operation>
+  </portType>
+
+  <binding name="docrpc_binding" type="tns:docrpc_porttype">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
+    <operation name="echo">
+      <soap:operation soapAction="urn:docrpc:echo" style="document" />
+      <input>
+        <soap:body use="literal" />
+      </input>
+      <output>
+        <soap:body use="literal" />
+      </output>
+    </operation>
+  </binding>
+
+  <service name="docrpc_service">
+    <port name="docprc_service_port" binding="tns:docrpc_binding">
+      <soap:address location="http://localhost:17171/" />
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/document/echo.rb b/ruby_1_8_6/test/wsdl/document/echo.rb
new file mode 100644
index 0000000000..c6df75aca0
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/document/echo.rb
@@ -0,0 +1,92 @@
+require 'xsd/qname'
+
+# {urn:docrpc}echoele
+class Echoele
+  @@schema_type = "echoele"
+  @@schema_ns = "urn:docrpc"
+  @@schema_attribute = {XSD::QName.new(nil, "attr_string") => "SOAP::SOAPString", XSD::QName.new(nil, "attr-int") => "SOAP::SOAPInt"}
+  @@schema_element = [["struct1", ["Echo_struct", XSD::QName.new(nil, "struct1")]], ["struct_2", ["Echo_struct", XSD::QName.new(nil, "struct-2")]]]
+
+  attr_accessor :struct1
+  attr_accessor :struct_2
+
+  def xmlattr_attr_string
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "attr_string")]
+  end
+
+  def xmlattr_attr_string=(value)
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "attr_string")] = value
+  end
+
+  def xmlattr_attr_int
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "attr-int")]
+  end
+
+  def xmlattr_attr_int=(value)
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "attr-int")] = value
+  end
+
+  def initialize(struct1 = nil, struct_2 = nil)
+    @struct1 = struct1
+    @struct_2 = struct_2
+    @__xmlattr = {}
+  end
+end
+
+# {urn:docrpc}echo_response
+class Echo_response
+  @@schema_type = "echo_response"
+  @@schema_ns = "urn:docrpc"
+  @@schema_attribute = {XSD::QName.new(nil, "attr_string") => "SOAP::SOAPString", XSD::QName.new(nil, "attr-int") => "SOAP::SOAPInt"}
+  @@schema_element = [["struct1", ["Echo_struct", XSD::QName.new(nil, "struct1")]], ["struct_2", ["Echo_struct", XSD::QName.new(nil, "struct-2")]]]
+
+  attr_accessor :struct1
+  attr_accessor :struct_2
+
+  def xmlattr_attr_string
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "attr_string")]
+  end
+
+  def xmlattr_attr_string=(value)
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "attr_string")] = value
+  end
+
+  def xmlattr_attr_int
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "attr-int")]
+  end
+
+  def xmlattr_attr_int=(value)
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "attr-int")] = value
+  end
+
+  def initialize(struct1 = nil, struct_2 = nil)
+    @struct1 = struct1
+    @struct_2 = struct_2
+    @__xmlattr = {}
+  end
+end
+
+# {urn:docrpc}echo_struct
+class Echo_struct
+  @@schema_type = "echo_struct"
+  @@schema_ns = "urn:docrpc"
+  @@schema_attribute = {XSD::QName.new(nil, "m_attr") => "SOAP::SOAPString"}
+  @@schema_element = [["m_string", ["SOAP::SOAPString", XSD::QName.new(nil, "m_string")]], ["m_datetime", ["SOAP::SOAPDateTime", XSD::QName.new(nil, "m_datetime")]]]
+
+  attr_accessor :m_string
+  attr_accessor :m_datetime
+
+  def xmlattr_m_attr
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "m_attr")]
+  end
+
+  def xmlattr_m_attr=(value)
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "m_attr")] = value
+  end
+
+  def initialize(m_string = nil, m_datetime = nil)
+    @m_string = m_string
+    @m_datetime = m_datetime
+    @__xmlattr = {}
+  end
+end
diff --git a/ruby_1_8_6/test/wsdl/document/number.wsdl b/ruby_1_8_6/test/wsdl/document/number.wsdl
new file mode 100644
index 0000000000..cc3dd8e9f0
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/document/number.wsdl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions
+    name="foo"
+    targetNamespace="urn:foo"
+    xmlns:tns="urn:foo"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema elementFormDefault="unqualified" targetNamespace="urn:foo">
+      <xsd:element name="get_foo">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element minOccurs="0" maxOccurs="1" name="number" type="xsd:string" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:schema>
+  </types>
+
+  <message name="get_foo_in">
+    <part name="parameters" element="tns:get_foo" />
+  </message>
+  <message name="get_foo_out">
+    <part name="parameters" type="xsd:string" />
+  </message>
+
+  <portType name="foo_porttype">
+    <operation name="get_foo">
+      <input message="tns:get_foo_in" />
+      <output message="tns:get_foo_out" />
+    </operation>
+  </portType>
+
+  <binding name="foo_binding" type="tns:foo_porttype">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http"
+        style="document" />
+    <operation name="get_foo">
+      <soap:operation soapAction="urn:foo:get_foo" style="document" />
+      <input>
+        <soap:body use="literal" />
+      </input>
+      <output>
+        <soap:body use="literal" />
+      </output>
+    </operation>
+  </binding>
+
+  <service name="foo_service">
+    <port name="foo_service_port" binding="tns:foo_binding">
+      <soap:address location="http://localhost:17171/" />
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/document/ping_nosoapaction.wsdl b/ruby_1_8_6/test/wsdl/document/ping_nosoapaction.wsdl
new file mode 100644
index 0000000000..ab9529e456
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/document/ping_nosoapaction.wsdl
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions xmlns:tns="http://xmlsoap.org/Ping"
+xmlns="http://schemas.xmlsoap.org/wsdl/"
+xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+targetNamespace="http://xmlsoap.org/Ping" name="Ping">
+    <types>
+        <schema targetNamespace="http://xmlsoap.org/Ping"
+        xmlns="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified">
+            <complexType name="ping">
+                <sequence>
+                    <element name="scenario" type="xsd:string"
+                    nillable="true"/>
+                    <element name="origin" type="xsd:string"
+                    nillable="true"/>
+                    <element name="text" type="xsd:string"
+                    nillable="true"/>
+                </sequence>
+            </complexType>
+            <complexType name="pingResponse">
+                <sequence>
+                    <element name="scenario" type="xsd:string"
+                    nillable="true"/>
+                    <element name="origin" type="xsd:string"
+                    nillable="true"/>
+                    <element name="text" type="xsd:string"
+                    nillable="true"/>
+                </sequence>
+            </complexType>
+            <element name="Ping" type="tns:ping"/>
+            <element name="PingResponse" type="tns:pingResponse"/>
+        </schema>
+    </types>
+    <message name="PingRequest">
+        <part name="ping" element="tns:Ping"/>
+    </message>
+    <message name="PingResponse">
+        <part name="pingResponse" element="tns:PingResponse"/>
+    </message>
+    <portType name="PingPort">
+        <operation name="Ping">
+            <input message="tns:PingRequest"/>
+            <output message="tns:PingResponse"/>
+        </operation>
+    </portType>
+    <binding name="PingBinding" type="tns:PingPort">
+        <soap:binding style="document"
+        transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="Ping">
+            <soap:operation/>
+            <input>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <service name="PingService">
+        <port name="PingPort" binding="tns:PingBinding">
+            <soap:address
+            location="http://127.0.0.1:8080/axis/services/PingPort"/>
+        </port>
+    </service>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/document/test_nosoapaction.rb b/ruby_1_8_6/test/wsdl/document/test_nosoapaction.rb
new file mode 100644
index 0000000000..77f642fe1b
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/document/test_nosoapaction.rb
@@ -0,0 +1,109 @@
+require 'test/unit'
+require 'wsdl/parser'
+require 'wsdl/soap/wsdl2ruby'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+require 'soap/rpc/driver'
+
+
+module WSDL; module Document
+
+
+class TestNoSOAPAction < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::StandaloneServer
+    Namespace = 'http://xmlsoap.org/Ping'
+
+    def on_init
+      add_document_method(
+        self,
+        Namespace + '/ping',
+        'ping_with_soapaction',
+        XSD::QName.new(Namespace, 'Ping'),
+        XSD::QName.new(Namespace, 'PingResponse')
+      )
+
+      add_document_method(
+        self,
+        nil,
+        'ping',
+        XSD::QName.new(Namespace, 'Ping'),
+        XSD::QName.new(Namespace, 'PingResponse')
+      )
+
+      # When no SOAPAction given, latter method(ping) is called.
+    end
+  
+    def ping(arg)
+      arg.text = 'ping'
+      arg
+    end
+  
+    def ping_with_soapaction(arg)
+      arg.text = 'ping_with_soapaction'
+      arg
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  Port = 17171
+
+  def setup
+    setup_server
+    @client = nil
+  end
+
+  def teardown
+    teardown_server
+    @client.reset_stream if @client
+  end
+
+  def setup_server
+    @server = Server.new('Test', Server::Namespace, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def test_with_soapaction
+    wsdl = File.join(DIR, 'ping_nosoapaction.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+    rv = @client.ping(:scenario => 'scenario', :origin => 'origin',
+      :text => 'text')
+    assert_equal('scenario', rv.scenario)
+    assert_equal('origin', rv.origin)
+    assert_equal('ping', rv.text)
+  end
+
+  def test_without_soapaction
+    @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/",
+      Server::Namespace)
+    @client.add_document_method('ping', Server::Namespace + '/ping',
+      XSD::QName.new(Server::Namespace, 'Ping'),
+      XSD::QName.new(Server::Namespace, 'PingResponse'))
+    @client.wiredump_dev = STDOUT if $DEBUG
+    rv = @client.ping(:scenario => 'scenario', :origin => 'origin',
+      :text => 'text')
+    assert_equal('scenario', rv.scenario)
+    assert_equal('origin', rv.origin)
+    assert_equal('ping_with_soapaction', rv.text)
+  end
+end
+
+
+end; end
diff --git a/ruby_1_8_6/test/wsdl/document/test_number.rb b/ruby_1_8_6/test/wsdl/document/test_number.rb
new file mode 100644
index 0000000000..a640ef2a25
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/document/test_number.rb
@@ -0,0 +1,99 @@
+require 'test/unit'
+require 'wsdl/parser'
+require 'wsdl/soap/wsdl2ruby'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+
+
+module WSDL; module Document
+
+
+class TestNumber < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::StandaloneServer
+    Namespace = 'urn:foo'
+
+    def on_init
+      add_document_method(
+        self,
+        Namespace + ':get_foo',
+        'get_foo',
+        XSD::QName.new(Namespace, 'get_foo'),
+        XSD::QName.new(Namespace, 'get_foo_response')
+      )
+    end
+  
+    def get_foo(arg)
+      arg.number
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_classdef
+    @client = nil
+  end
+
+  def teardown
+    teardown_server
+    File.unlink(pathname('foo.rb'))
+    @client.reset_stream if @client
+  end
+
+  def setup_server
+    @server = Server.new('Test', "urn:rpc", '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_classdef
+    gen = WSDL::SOAP::WSDL2Ruby.new
+    gen.location = pathname("number.wsdl")
+    gen.basedir = DIR
+    gen.logger.level = Logger::FATAL
+    gen.opt['classdef'] = nil
+    gen.opt['force'] = true
+    gen.run
+    require pathname('foo')
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
+
+  def test_wsdl
+    wsdl = File.join(DIR, 'number.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+
+    # with the Struct defined in foo.rb, which is generated from WSDL
+    assert_equal("12345", @client.get_foo(Get_foo.new("12345")))
+
+    # with Hash
+    assert_equal("12345", @client.get_foo({:number => "12345"}))
+
+    # with Original struct
+    get_foo_struct = Struct.new(:number)
+    assert_equal("12345", @client.get_foo(get_foo_struct.new("12345")))
+  end
+end
+
+
+end; end
diff --git a/ruby_1_8_6/test/wsdl/document/test_rpc.rb b/ruby_1_8_6/test/wsdl/document/test_rpc.rb
new file mode 100644
index 0000000000..56cd0677ad
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/document/test_rpc.rb
@@ -0,0 +1,177 @@
+require 'test/unit'
+require 'wsdl/parser'
+require 'wsdl/soap/wsdl2ruby'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+
+
+module WSDL; module Document
+
+
+class TestRPC < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::StandaloneServer
+    Namespace = 'urn:docrpc'
+
+    def on_init
+      add_document_method(
+        self,
+        Namespace + ':echo',
+        'echo',
+        XSD::QName.new(Namespace, 'echo'),
+        XSD::QName.new(Namespace, 'echo_response')
+      )
+    end
+  
+    def echo(arg)
+      if arg.is_a?(Echoele)
+        # swap args
+        tmp = arg.struct1
+        arg.struct1 = arg.struct_2
+        arg.struct_2 = tmp
+        arg
+      else
+        # swap args
+        tmp = arg["struct1"]
+        arg["struct1"] = arg["struct-2"]
+        arg["struct-2"] = tmp
+        arg
+      end
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_classdef
+    @client = nil
+  end
+
+  def teardown
+    teardown_server
+    #File.unlink(pathname('echo.rb'))
+    @client.reset_stream if @client
+  end
+
+  def setup_server
+    @server = Server.new('Test', "urn:rpc", '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_classdef
+    gen = WSDL::SOAP::WSDL2Ruby.new
+    gen.location = pathname("document.wsdl")
+    gen.basedir = DIR
+    gen.logger.level = Logger::FATAL
+    gen.opt['classdef'] = nil
+    gen.opt['force'] = true
+    gen.run
+    require pathname('echo')
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
+
+  def test_wsdl
+    wsdl = File.join(DIR, 'document.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+
+    struct1 = Echo_struct.new("mystring1", now1 = Time.now)
+    struct1.xmlattr_m_attr = 'myattr1'
+    struct2 = Echo_struct.new("mystring2", now2 = Time.now)
+    struct2.xmlattr_m_attr = 'myattr2'
+    echo = Echoele.new(struct1, struct2)
+    echo.xmlattr_attr_string = 'attr_string'
+    echo.xmlattr_attr_int = 5
+    ret = @client.echo(echo)
+
+    # struct#m_datetime in a response is a DateTime even though
+    # struct#m_datetime in a request is a Time.
+    timeformat = "%Y-%m-%dT%H:%M:%S"
+    assert_equal("mystring2", ret.struct1.m_string)
+    assert_equal(now2.strftime(timeformat),
+      date2time(ret.struct1.m_datetime).strftime(timeformat))
+    assert_equal("mystring1", ret.struct_2.m_string)
+    assert_equal(now1.strftime(timeformat),
+      date2time(ret.struct_2.m_datetime).strftime(timeformat))
+    assert_equal("attr_string", ret.xmlattr_attr_string)
+    assert_equal(5, ret.xmlattr_attr_int)
+  end
+
+  def date2time(date)
+    if date.respond_to?(:to_time)
+      date.to_time
+    else
+      d = date.new_offset(0)
+      d.instance_eval {
+        Time.utc(year, mon, mday, hour, min, sec,
+          (sec_fraction * 86400000000).to_i)
+      }.getlocal
+    end
+  end
+
+  include ::SOAP
+  def test_naive
+    @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/")
+    @client.add_document_method('echo', 'urn:docrpc:echo',
+      XSD::QName.new('urn:docrpc', 'echoele'),
+      XSD::QName.new('urn:docrpc', 'echo_response'))
+    @client.wiredump_dev = STDOUT if $DEBUG
+
+    echo = SOAPElement.new('foo')
+    echo.extraattr['attr_string'] = 'attr_string'
+    echo.extraattr['attr-int'] = 5
+    echo.add(struct1 = SOAPElement.new('struct1'))
+    struct1.add(SOAPElement.new('m_string', 'mystring1'))
+    struct1.add(SOAPElement.new('m_datetime', '2005-03-17T19:47:31+01:00'))
+    struct1.extraattr['m_attr'] = 'myattr1'
+    echo.add(struct2 = SOAPElement.new('struct-2'))
+    struct2.add(SOAPElement.new('m_string', 'mystring2'))
+    struct2.add(SOAPElement.new('m_datetime', '2005-03-17T19:47:32+02:00'))
+    struct2.extraattr['m_attr'] = 'myattr2'
+    ret = @client.echo(echo)
+    timeformat = "%Y-%m-%dT%H:%M:%S"
+    assert_equal('mystring2', ret.struct1.m_string)
+    assert_equal('2005-03-17T19:47:32',
+      ret.struct1.m_datetime.strftime(timeformat))
+    assert_equal("mystring1", ret.struct_2.m_string)
+    assert_equal('2005-03-17T19:47:31',
+      ret.struct_2.m_datetime.strftime(timeformat))
+    assert_equal('attr_string', ret.xmlattr_attr_string)
+    assert_equal(5, ret.xmlattr_attr_int)
+
+    echo = {'struct1' => {'m_string' => 'mystring1', 'm_datetime' => '2005-03-17T19:47:31+01:00'}, 
+          'struct-2' => {'m_string' => 'mystring2', 'm_datetime' => '2005-03-17T19:47:32+02:00'}}
+    ret = @client.echo(echo)
+    timeformat = "%Y-%m-%dT%H:%M:%S"
+    assert_equal('mystring2', ret.struct1.m_string)
+    assert_equal('2005-03-17T19:47:32',
+      ret.struct1.m_datetime.strftime(timeformat))
+    assert_equal("mystring1", ret.struct_2.m_string)
+    assert_equal('2005-03-17T19:47:31',
+      ret.struct_2.m_datetime.strftime(timeformat))
+  end
+end
+
+
+end; end
diff --git a/ruby_1_8_6/test/wsdl/emptycomplextype.wsdl b/ruby_1_8_6/test/wsdl/emptycomplextype.wsdl
new file mode 100644
index 0000000000..4f8dc4849c
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/emptycomplextype.wsdl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name = "emptycomplextype"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="urn:jp.gr.jin.rrr.example.emptycomplextype"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+  <types>
+    <xsd:schema elementFormDefault="qualified"
+	targetNamespace="urn:jp.gr.jin.rrr.example.emptycomplextype">
+      <xsd:element name="typeIn">
+        <xsd:complexType />
+      </xsd:element>
+
+      <xsd:element name="typeOut">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element minOccurs="0" maxOccurs="1" name="str1" type="xsd:string" />
+            <xsd:element minOccurs="0" maxOccurs="1" name="str2" type="xsd:string" />
+            <xsd:element minOccurs="0" maxOccurs="1" name="seq">
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:any />
+                </xsd:sequence>
+              </xsd:complexType>
+            </xsd:element>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:schema>
+  </types>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/map/map.wsdl b/ruby_1_8_6/test/wsdl/map/map.wsdl
new file mode 100644
index 0000000000..e418a4cbbd
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/map/map.wsdl
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<definitions
+    name="map"
+    targetNamespace="urn:map"
+    xmlns:tns="urn:map"
+    xmlns:txd="urn:map"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:apachesoap="http://xml.apache.org/xml-soap">
+
+  <types>
+    <schema
+	xmlns="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://xml.apache.org/xml-soap">
+      <complexType name="Map">
+	<sequence>
+	  <element name="item" minOccurs="0" maxOccurs="unbounded">
+	    <complexType>
+	      <sequence>
+		<element name="key" type="xsd:anyType" />
+		<element name="value" type="xsd:anyType" />
+	      </sequence>
+	    </complexType>
+	  </element>
+	</sequence>
+      </complexType>
+    </schema>
+  </types>
+
+  <message name="mapRequest"/>
+  <message name="mapResponse">
+    <part name="return" type="apachesoap:Map"/>
+  </message>
+
+  <message name="map2Request">
+    <part name="arg" type="apachesoap:Map"/>
+  </message>
+  <message name="map2Response">
+    <part name="return" type="apachesoap:Map"/>
+  </message>
+
+  <portType name="MapServicePortType">
+    <operation name="map" parameterOrder="">
+      <input message="tns:mapRequest"/>
+      <output message="tns:mapResponse"/>
+    </operation>
+
+    <operation name="map2" parameterOrder="">
+      <input message="tns:map2Request"/>
+      <output message="tns:map2Response"/>
+    </operation>
+  </portType>
+
+  <binding name="MapServicePortBinding" type="tns:MapServicePortType">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="map">
+      <soap:operation soapAction=""/>
+      <input>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:map"/>
+      </input>
+      <output>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:map"/>
+      </output>
+    </operation>
+
+    <operation name="map2">
+      <soap:operation soapAction=""/>
+      <input>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:map"/>
+      </input>
+      <output>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:map"/>
+      </output>
+    </operation>
+  </binding>
+
+  <service name="MapService">
+    <port name="MapServicePort" binding="tns:MapServicePortBinding">
+      <soap:address location="http://raa.ruby-lang.org/soap/1.0.2/"/>
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/map/map.xml b/ruby_1_8_6/test/wsdl/map/map.xml
new file mode 100644
index 0000000000..7106735ffc
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/map/map.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n2:mapResponse xmlns:n1="http://schemas.xmlsoap.org/soap/encoding/" xmlns:n2="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/" env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <return xmlns:n3="http://xml.apache.org/xml-soap" xsi:type="n3:Map">
+	<item>
+	  <key xsi:type="xsd:string">a</key>
+	  <value xsi:type="n3:Map">
+	    <item>
+	      <key xsi:type="xsd:string">a1</key>
+	      <value xsi:type="n1:Array" n1:arrayType="xsd:anyType[1]">
+		<item xsi:type="xsd:string">a1</item>
+	      </value>
+	    </item>
+	    <item>
+	      <key xsi:type="xsd:string">a2</key>
+	      <value xsi:type="n1:Array" n1:arrayType="xsd:anyType[1]">
+		<item xsi:type="xsd:string">a2</item>
+	      </value>
+	    </item>
+	  </value>
+	</item>
+	<item>
+	  <key xsi:type="xsd:string">b</key>
+	  <value xsi:type="n3:Map">
+	    <item>
+	      <key xsi:type="xsd:string">b1</key>
+	      <value xsi:type="n1:Array" n1:arrayType="xsd:anyType[1]">
+		<item xsi:type="xsd:string">b1</item>
+	      </value>
+	    </item>
+	    <item>
+	      <key xsi:type="xsd:string">b2</key>
+	      <value xsi:type="n1:Array" n1:arrayType="xsd:anyType[1]">
+		<item xsi:type="xsd:string">b2</item>
+	      </value>
+	    </item>
+	  </value>
+	</item>
+      </return>
+    </n2:mapResponse>
+  </env:Body>
+</env:Envelope>
diff --git a/ruby_1_8_6/test/wsdl/map/test_map.rb b/ruby_1_8_6/test/wsdl/map/test_map.rb
new file mode 100644
index 0000000000..68f7d76e05
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/map/test_map.rb
@@ -0,0 +1,99 @@
+require 'test/unit'
+require 'soap/rpc/httpserver'
+require 'soap/wsdlDriver'
+
+
+module WSDL
+
+
+class TestMap < Test::Unit::TestCase
+  Port = 17171
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  class Server < ::SOAP::RPC::HTTPServer
+    def on_init
+      add_method(self, 'map')
+      add_method(self, 'map2', 'arg')
+    end
+
+    def map
+      {1 => "a", 2 => "b"}
+    end
+
+    def map2(arg)
+      arg
+    end
+  end
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = Server.new(
+      :BindAddress => "0.0.0.0",
+      :Port => Port,
+      :AccessLog => [],
+      :SOAPDefaultNamespace => "urn:map"
+    )
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      Thread.current.abort_on_exception = true
+      @server.start
+    }
+  end
+
+  def setup_client
+    wsdl = File.join(DIR, 'map.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.generate_explicit_type = true
+    @client.wiredump_dev = STDOUT if $DEBUG
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @t.kill
+    @t.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def test_by_wsdl
+    dir = File.dirname(File.expand_path(__FILE__))
+    wsdlfile = File.join(dir, 'map.wsdl')
+    xml = File.open(File.join(dir, 'map.xml')) { |f| f.read }
+    wsdl = WSDL::Importer.import(wsdlfile)
+    service = wsdl.services[0]
+    port = service.ports[0]
+    wsdl_types = wsdl.collect_complextypes
+    rpc_decode_typemap = wsdl_types + wsdl.soap_rpc_complextypes(port.find_binding)
+    opt = {}
+    opt[:default_encodingstyle] = ::SOAP::EncodingNamespace
+    opt[:decode_typemap] = rpc_decode_typemap
+    header, body = ::SOAP::Processor.unmarshal(xml, opt)
+    map = ::SOAP::Mapping.soap2obj(body.response)
+    assert_equal(["a1"], map["a"]["a1"])
+    assert_equal(["a2"], map["a"]["a2"])
+    assert_equal(["b1"], map["b"]["b1"])
+    assert_equal(["b2"], map["b"]["b2"])
+  end
+
+  def test_wsdldriver
+    assert_equal({1 => "a", 2 => "b"}, @client.map)
+    assert_equal({1 => 2}, @client.map2({1 => 2}))
+    assert_equal({1 => {2 => 3}}, @client.map2({1 => {2 => 3}}))
+    assert_equal({["a", 2] => {2 => 3}}, @client.map2({["a", 2] => {2 => 3}}))
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/wsdl/marshal/person.wsdl b/ruby_1_8_6/test/wsdl/marshal/person.wsdl
new file mode 100644
index 0000000000..6ea8a04825
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/marshal/person.wsdl
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<definitions name="Person"
+    targetNamespace="http://www.jin.gr.jp/~nahi/xmlns/sample/Person"
+    xmlns:tns="http://www.jin.gr.jp/~nahi/xmlns/sample/Person"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" 
+        targetNamespace="http://www.jin.gr.jp/~nahi/xmlns/sample/Person">
+      <complexType name="Person">
+        <all>
+          <element name="familyname" type="xsd:string"/>
+          <element name="givenname" type="xsd:string"/>
+          <element name="var1" type="xsd:int"/>
+          <element name="var2" type="xsd:double"/>
+          <element name="var3" type="xsd:string"/>
+        </all>
+      </complexType>
+    </xsd:schema>
+  </types>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/marshal/person_org.rb b/ruby_1_8_6/test/wsdl/marshal/person_org.rb
new file mode 100644
index 0000000000..f8c0e0db76
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/marshal/person_org.rb
@@ -0,0 +1,22 @@
+require 'xsd/qname'
+
+# {http://www.jin.gr.jp/~nahi/xmlns/sample/Person}Person
+class Person
+  @@schema_type = "Person"
+  @@schema_ns = "http://www.jin.gr.jp/~nahi/xmlns/sample/Person"
+  @@schema_element = [["familyname", ["SOAP::SOAPString", XSD::QName.new(nil, "familyname")]], ["givenname", ["SOAP::SOAPString", XSD::QName.new(nil, "givenname")]], ["var1", ["SOAP::SOAPInt", XSD::QName.new(nil, "var1")]], ["var2", ["SOAP::SOAPDouble", XSD::QName.new(nil, "var2")]], ["var3", ["SOAP::SOAPString", XSD::QName.new(nil, "var3")]]]
+
+  attr_accessor :familyname
+  attr_accessor :givenname
+  attr_accessor :var1
+  attr_accessor :var2
+  attr_accessor :var3
+
+  def initialize(familyname = nil, givenname = nil, var1 = nil, var2 = nil, var3 = nil)
+    @familyname = familyname
+    @givenname = givenname
+    @var1 = var1
+    @var2 = var2
+    @var3 = var3
+  end
+end
diff --git a/ruby_1_8_6/test/wsdl/marshal/test_wsdlmarshal.rb b/ruby_1_8_6/test/wsdl/marshal/test_wsdlmarshal.rb
new file mode 100644
index 0000000000..cd2bdb198a
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/marshal/test_wsdlmarshal.rb
@@ -0,0 +1,80 @@
+require 'test/unit'
+require 'wsdl/parser'
+require 'soap/mapping/wsdlencodedregistry'
+require 'soap/marshal'
+require 'wsdl/soap/wsdl2ruby'
+
+class WSDLMarshaller
+  include SOAP
+
+  def initialize(wsdlfile)
+    wsdl = WSDL::Parser.new.parse(File.open(wsdlfile) { |f| f.read })
+    types = wsdl.collect_complextypes
+    @opt = {
+      :decode_typemap => types,
+      :generate_explicit_type => false,
+      :pretty => true
+    }
+    @mapping_registry = Mapping::WSDLEncodedRegistry.new(types)
+  end
+
+  def dump(obj, io = nil)
+    type = Mapping.class2element(obj.class)
+    ele =  Mapping.obj2soap(obj, @mapping_registry, type)
+    ele.elename = ele.type
+    Processor.marshal(SOAPEnvelope.new(nil, SOAPBody.new(ele)), @opt, io)
+  end
+
+  def load(io)
+    header, body = Processor.unmarshal(io, @opt)
+    Mapping.soap2obj(body.root_node)
+  end
+end
+
+
+require File.join(File.dirname(__FILE__), 'person_org')
+
+class Person
+  def ==(rhs)
+    @familyname == rhs.familyname and @givenname == rhs.givenname and
+      @var1 == rhs.var1 and @var2 == rhs.var2 and @var3 == rhs.var3
+  end
+end
+
+
+class TestWSDLMarshal < Test::Unit::TestCase
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  def test_marshal
+    marshaller = WSDLMarshaller.new(pathname('person.wsdl'))
+    obj = Person.new("NAKAMURA", "Hiroshi", 1, 1.0,  "1")
+    str = marshaller.dump(obj)
+    obj2 = marshaller.load(str)
+    assert_equal(obj, obj2)
+    assert_equal(str, marshaller.dump(obj2))
+  end
+
+  def test_classdef
+    gen = WSDL::SOAP::WSDL2Ruby.new
+    gen.location = pathname("person.wsdl")
+    gen.basedir = DIR
+    gen.logger.level = Logger::FATAL
+    gen.opt['classdef'] = nil
+    gen.opt['force'] = true
+    gen.run
+    compare("person_org.rb", "Person.rb")
+    File.unlink(pathname('Person.rb'))
+  end
+
+  def compare(expected, actual)
+    assert_equal(loadfile(expected), loadfile(actual), actual)
+  end
+
+  def loadfile(file)
+    File.open(pathname(file)) { |f| f.read }
+  end
+
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
+end
diff --git a/ruby_1_8_6/test/wsdl/multiplefault.wsdl b/ruby_1_8_6/test/wsdl/multiplefault.wsdl
new file mode 100644
index 0000000000..2d928b60b0
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/multiplefault.wsdl
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<definitions name="MultipleFaultTest"
+    targetNamespace="urn:jp.gr.jin.rrr.example.ele"
+    xmlns:tns="urn:jp.gr.jin.rrr.example.ele"
+    xmlns:typens="urn:jp.gr.jin.rrr.example.datatypes"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+  <types>
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="urn:jp.gr.jin.rrr.example.datatypes">
+      <xsd:complexType name="AuthenticationError">
+	<all>
+	  <element name="message" type="xsd:string" />
+	  <element name="backtrace" type="xoapenc:Array" />
+	</all>
+      </xsd:complexType>
+      <xsd:complexType name="AuthorizationError">
+	<all>
+	  <element name="message" type="xsd:string" />
+	  <element name="backtrace" type="xoapenc:Array" />
+	</all>
+      </xsd:complexType>
+    </xsd:schema>
+  </types> 
+
+  <message name="inputmsg"/>
+  <message name="outputmsg"/>
+  <message name="faultmsg1" >
+    <part name="exception" type="typens:AuthenticationError" />
+  </message>
+  <message name="faultmsg2" >
+    <part name="exception" type="typens:AuthorizationError" />
+  </message>
+
+  <portType name="MultipleFaultPortType">
+    <operation name="myoperation">
+      <input message="tns:inputmsg"/>
+      <output message="tns:outputmsg"/>
+      <fault message="tns:faultmsg1"/>
+      <fault message="tns:faultmsg2"/>
+    </operation>
+  </portType>
+
+  <binding name="MultipleFaultBinding" type="tns:MultipleFaultPortType">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="myoperation">
+      <soap:operation soapAction="urn:jp.gr.jin.rrr.example.ele"/>
+      <input>
+        <soap:body use="encoded" namespace="urn:jp.gr.jin.rrr.example.ele"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="urn:jp.gr.jin.rrr.example.ele"
+   	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+  </binding>
+
+  <service name="MultipleFaultService">
+    <port name="MultipleFaultPortType" binding="tns:MultipleFaultBinding">
+      <soap:address location="http://localhost:17171/"/>
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/qualified/lp.rb b/ruby_1_8_6/test/wsdl/qualified/lp.rb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/qualified/lp.rb
diff --git a/ruby_1_8_6/test/wsdl/qualified/lp.wsdl b/ruby_1_8_6/test/wsdl/qualified/lp.wsdl
new file mode 100644
index 0000000000..b107b7b392
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/qualified/lp.wsdl
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions
+    name="lp"
+    targetNamespace="urn:lp"
+    xmlns:tns="urn:lp"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <schema xmlns="http://www.w3.org/2001/XMLSchema">
+      <import namespace="urn:lp" schemaLocation="lp.xsd"/>
+    </schema>
+  </types>
+
+  <message name="login_in">
+    <part name="parameters" element="tns:login" />
+  </message>
+  <message name="login_out">
+    <part name="parameters" element="tns:loginResponse" />
+  </message>
+
+  <portType name="lp_porttype">
+    <operation name="login">
+      <input message="tns:login_in" />
+      <output message="tns:login_out" />
+    </operation>
+  </portType>
+
+  <binding name="lp_binding" type="tns:lp_porttype">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
+    <operation name="login">
+      <soap:operation soapAction="urn:lp:login" style="document" />
+      <input>
+        <soap:body use="literal" />
+      </input>
+      <output>
+        <soap:body use="literal" />
+      </output>
+    </operation>
+  </binding>
+
+  <service name="lp_service">
+    <port name="lp_service_port" binding="tns:lp_binding">
+      <soap:address location="http://localhost:17171/" />
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/qualified/lp.xsd b/ruby_1_8_6/test/wsdl/qualified/lp.xsd
new file mode 100644
index 0000000000..12bcbd8cef
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/qualified/lp.xsd
@@ -0,0 +1,26 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:lp="urn:lp" targetNamespace="urn:lp" elementFormDefault="unqualified">
+
+  <xs:complexType name="login">
+    <xs:sequence>
+      <xs:element name="username" type="xs:string"/>
+      <xs:element name="password" type="xs:string"/>
+      <xs:element name="timezone" type="xs:string" minOccurs="0" maxOccurs="1"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:element name="login" type="lp:login"/>
+
+  <xs:complexType name="loginResponse">
+    <xs:sequence>
+      <xs:element name="loginResult">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="sessionID" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:element name="loginResponse" type="lp:loginResponse"/>
+</xs:schema>
diff --git a/ruby_1_8_6/test/wsdl/qualified/np.wsdl b/ruby_1_8_6/test/wsdl/qualified/np.wsdl
new file mode 100644
index 0000000000..e2b7253d0e
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/qualified/np.wsdl
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www50.brinkster.com/vbfacileinpt/np" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://www50.brinkster.com/vbfacileinpt/np" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <s:schema elementFormDefault="qualified" targetNamespace="http://www50.brinkster.com/vbfacileinpt/np">
+      <s:element name="GetPrimeNumbers">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="Max" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="GetPrimeNumbersResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="GetPrimeNumbersResult" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+    </s:schema>
+  </wsdl:types>
+  <wsdl:message name="GetPrimeNumbersSoapIn">
+    <wsdl:part name="parameters" element="tns:GetPrimeNumbers" />
+  </wsdl:message>
+  <wsdl:message name="GetPrimeNumbersSoapOut">
+    <wsdl:part name="parameters" element="tns:GetPrimeNumbersResponse" />
+  </wsdl:message>
+  <wsdl:portType name="pnumSoap">
+    <wsdl:operation name="GetPrimeNumbers">
+      <wsdl:input message="tns:GetPrimeNumbersSoapIn" />
+      <wsdl:output message="tns:GetPrimeNumbersSoapOut" />
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="pnumSoap" type="tns:pnumSoap">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
+    <wsdl:operation name="GetPrimeNumbers">
+      <soap:operation soapAction="http://www50.brinkster.com/vbfacileinpt/np/GetPrimeNumbers" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="pnum">
+    <wsdl:port name="pnumSoap" binding="tns:pnumSoap">
+      <soap:address location="http://www50.brinkster.com/vbfacileinpt/np.asmx" />
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/ruby_1_8_6/test/wsdl/qualified/test_qualified.rb b/ruby_1_8_6/test/wsdl/qualified/test_qualified.rb
new file mode 100644
index 0000000000..d6c1159a87
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/qualified/test_qualified.rb
@@ -0,0 +1,154 @@
+require 'test/unit'
+require 'wsdl/soap/wsdl2ruby'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+
+if defined?(HTTPAccess2)
+
+module WSDL
+
+
+class TestQualified < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::StandaloneServer
+    Namespace = 'http://www50.brinkster.com/vbfacileinpt/np'
+
+    def on_init
+      add_document_method(
+        self,
+        Namespace + '/GetPrimeNumbers',
+        'GetPrimeNumbers',
+        XSD::QName.new(Namespace, 'GetPrimeNumbers'),
+        XSD::QName.new(Namespace, 'GetPrimeNumbersResponse')
+      )
+    end
+  
+    def GetPrimeNumbers(arg)
+      nil
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_clientdef
+    @client = nil
+  end
+
+  def teardown
+    teardown_server
+    unless $DEBUG
+      File.unlink(pathname('default.rb'))
+      File.unlink(pathname('defaultDriver.rb'))
+    end
+    @client.reset_stream if @client
+  end
+
+  def setup_server
+    @server = Server.new('Test', "urn:lp", '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_clientdef
+    backupdir = Dir.pwd
+    begin
+      Dir.chdir(DIR)
+      gen = WSDL::SOAP::WSDL2Ruby.new
+      gen.location = pathname("np.wsdl")
+      gen.basedir = DIR
+      gen.logger.level = Logger::FATAL
+      gen.opt['classdef'] = nil
+      gen.opt['driver'] = nil
+      gen.opt['force'] = true
+      gen.run
+      require pathname('default.rb')
+    ensure
+      Dir.chdir(backupdir)
+    end
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
+
+  LOGIN_REQUEST_QUALIFIED_NS =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:GetPrimeNumbers xmlns:n1="http://www50.brinkster.com/vbfacileinpt/np">
+      <n1:Max>10</n1:Max>
+    </n1:GetPrimeNumbers>
+  </env:Body>
+</env:Envelope>]
+
+  LOGIN_REQUEST_QUALIFIED =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <GetPrimeNumbers xmlns="http://www50.brinkster.com/vbfacileinpt/np">
+      <Max>10</Max>
+    </GetPrimeNumbers>
+  </env:Body>
+</env:Envelope>]
+
+  def test_wsdl
+    wsdl = File.join(DIR, 'np.wsdl')
+    @client = nil
+    backupdir = Dir.pwd
+    begin
+      Dir.chdir(DIR)
+      @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    ensure
+      Dir.chdir(backupdir)
+    end
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = str = ''
+    @client.GetPrimeNumbers(:Max => 10)
+    assert_equal(LOGIN_REQUEST_QUALIFIED_NS, parse_requestxml(str))
+  end
+
+  include ::SOAP
+  def test_naive
+    backupdir = Dir.pwd
+    begin
+      Dir.chdir(DIR)
+      require pathname('defaultDriver')
+    ensure
+      Dir.chdir(backupdir)
+    end
+    @client = PnumSoap.new("http://localhost:#{Port}/")
+
+    @client.wiredump_dev = str = ''
+    @client.getPrimeNumbers(GetPrimeNumbers.new(10))
+    assert_equal(LOGIN_REQUEST_QUALIFIED, parse_requestxml(str))
+  end
+
+  def parse_requestxml(str)
+    str.split(/\r?\n\r?\n/)[3]
+  end
+end
+
+
+end
+
+end
diff --git a/ruby_1_8_6/test/wsdl/qualified/test_unqualified.rb b/ruby_1_8_6/test/wsdl/qualified/test_unqualified.rb
new file mode 100644
index 0000000000..bcfed73e58
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/qualified/test_unqualified.rb
@@ -0,0 +1,143 @@
+require 'test/unit'
+require 'wsdl/soap/wsdl2ruby'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+
+if defined?(HTTPAccess2)
+
+module WSDL
+
+
+class TestUnqualified < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::StandaloneServer
+    Namespace = 'urn:lp'
+
+    def on_init
+      add_document_method(
+        self,
+        Namespace + ':login',
+        'login',
+        XSD::QName.new(Namespace, 'login'),
+        XSD::QName.new(Namespace, 'loginResponse')
+      )
+    end
+  
+    def login(arg)
+      nil
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_clientdef
+    @client = nil
+  end
+
+  def teardown
+    teardown_server
+    File.unlink(pathname('lp.rb'))
+    File.unlink(pathname('lpDriver.rb'))
+    @client.reset_stream if @client
+  end
+
+  def setup_server
+    @server = Server.new('Test', "urn:lp", '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_clientdef
+    backupdir = Dir.pwd
+    begin
+      Dir.chdir(DIR)
+      gen = WSDL::SOAP::WSDL2Ruby.new
+      gen.location = pathname("lp.wsdl")
+      gen.basedir = DIR
+      gen.logger.level = Logger::FATAL
+      gen.opt['classdef'] = nil
+      gen.opt['driver'] = nil
+      gen.opt['force'] = true
+      gen.run
+      require pathname('lp')
+    ensure
+      Dir.chdir(backupdir)
+    end
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
+
+  LOGIN_REQUEST_QUALIFIED =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:login xmlns:n1="urn:lp">
+      <username>NaHi</username>
+      <password>passwd</password>
+      <timezone>JST</timezone>
+    </n1:login>
+  </env:Body>
+</env:Envelope>]
+
+  def test_wsdl
+    wsdl = File.join(DIR, 'lp.wsdl')
+    @client = nil
+    backupdir = Dir.pwd
+    begin
+      Dir.chdir(DIR)
+      @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    ensure
+      Dir.chdir(backupdir)
+    end
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = str = ''
+    @client.login(:timezone => 'JST', :password => 'passwd',
+      :username => 'NaHi')
+    assert_equal(LOGIN_REQUEST_QUALIFIED, parse_requestxml(str))
+  end
+
+  include ::SOAP
+  def test_naive
+    backupdir = Dir.pwd
+    begin
+      Dir.chdir(DIR)
+      require pathname('lpDriver')
+    ensure
+      Dir.chdir(backupdir)
+    end
+    @client = Lp_porttype.new("http://localhost:#{Port}/")
+
+    @client.wiredump_dev = str = ''
+    @client.login(Login.new('NaHi', 'passwd', 'JST'))
+    assert_equal(LOGIN_REQUEST_QUALIFIED, parse_requestxml(str))
+  end
+
+  def parse_requestxml(str)
+    str.split(/\r?\n\r?\n/)[3]
+  end
+end
+
+
+end
+
+end
diff --git a/ruby_1_8_6/test/wsdl/raa/RAA.rb b/ruby_1_8_6/test/wsdl/raa/RAA.rb
new file mode 100644
index 0000000000..aff0525480
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/raa/RAA.rb
@@ -0,0 +1,243 @@
+# http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/
+class Category
+  @@schema_type = "Category"
+  @@schema_ns = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
+
+  def major
+    @major
+  end
+
+  def major=(value)
+    @major = value
+  end
+
+  def minor
+    @minor
+  end
+
+  def minor=(value)
+    @minor = value
+  end
+
+  def initialize(major = nil,
+      minor = nil)
+    @major = major
+    @minor = minor
+  end
+end
+
+# http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/
+class Product
+  @@schema_type = "Product"
+  @@schema_ns = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
+
+  def id
+    @id
+  end
+
+  def id=(value)
+    @id = value
+  end
+
+  def name
+    @name
+  end
+
+  def name=(value)
+    @name = value
+  end
+
+  def short_description
+    @short_description
+  end
+
+  def short_description=(value)
+    @short_description = value
+  end
+
+  def version
+    @version
+  end
+
+  def version=(value)
+    @version = value
+  end
+
+  def status
+    @status
+  end
+
+  def status=(value)
+    @status = value
+  end
+
+  def homepage
+    @homepage
+  end
+
+  def homepage=(value)
+    @homepage = value
+  end
+
+  def download
+    @download
+  end
+
+  def download=(value)
+    @download = value
+  end
+
+  def license
+    @license
+  end
+
+  def license=(value)
+    @license = value
+  end
+
+  def description
+    @description
+  end
+
+  def description=(value)
+    @description = value
+  end
+
+  def initialize(id = nil,
+      name = nil,
+      short_description = nil,
+      version = nil,
+      status = nil,
+      homepage = nil,
+      download = nil,
+      license = nil,
+      description = nil)
+    @id = id
+    @name = name
+    @short_description = short_description
+    @version = version
+    @status = status
+    @homepage = homepage
+    @download = download
+    @license = license
+    @description = description
+  end
+end
+
+# http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/
+class Owner
+  @@schema_type = "Owner"
+  @@schema_ns = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
+
+  def id
+    @id
+  end
+
+  def id=(value)
+    @id = value
+  end
+
+  def email
+    @email
+  end
+
+  def email=(value)
+    @email = value
+  end
+
+  def name
+    @name
+  end
+
+  def name=(value)
+    @name = value
+  end
+
+  def initialize(id = nil,
+      email = nil,
+      name = nil)
+    @id = id
+    @email = email
+    @name = name
+  end
+end
+
+# http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/
+class Info
+  @@schema_type = "Info"
+  @@schema_ns = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
+
+  def category
+    @category
+  end
+
+  def category=(value)
+    @category = value
+  end
+
+  def product
+    @product
+  end
+
+  def product=(value)
+    @product = value
+  end
+
+  def owner
+    @owner
+  end
+
+  def owner=(value)
+    @owner = value
+  end
+
+  def created
+    @created
+  end
+
+  def created=(value)
+    @created = value
+  end
+
+  def updated
+    @updated
+  end
+
+  def updated=(value)
+    @updated = value
+  end
+
+  def initialize(category = nil,
+      product = nil,
+      owner = nil,
+      created = nil,
+      updated = nil)
+    @category = category
+    @product = product
+    @owner = owner
+    @created = created
+    @updated = updated
+  end
+end
+
+# http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/
+class InfoArray < Array
+  # Contents type should be dumped here...
+  @@schema_type = "InfoArray"
+  @@schema_ns = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
+end
+
+# http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/
+class StringArray < Array
+  # Contents type should be dumped here...
+  @@schema_type = "StringArray"
+  @@schema_ns = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
+end
+
+# http://xml.apache.org/xml-soap
+class Map < Array
+  # Contents type should be dumped here...
+  @@schema_type = "Map"
+  @@schema_ns = "http://xml.apache.org/xml-soap"
+end
+
diff --git a/ruby_1_8_6/test/wsdl/raa/RAAServant.rb b/ruby_1_8_6/test/wsdl/raa/RAAServant.rb
new file mode 100644
index 0000000000..68380f8e48
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/raa/RAAServant.rb
@@ -0,0 +1,99 @@
+class RAABaseServicePortType
+  # SYNOPSIS
+  #   getAllListings
+  #
+  # ARGS
+  #   N/A
+  #
+  # RETURNS
+  #   return		StringArray - {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}StringArray
+  #
+  # RAISES
+  #   (undefined)
+  #
+  def getAllListings
+    #raise NotImplementedError.new
+    ["ruby", "soap4r"]
+  end
+  
+  # SYNOPSIS
+  #   getProductTree
+  #
+  # ARGS
+  #   N/A
+  #
+  # RETURNS
+  #   return		Map - {http://xml.apache.org/xml-soap}Map
+  #
+  # RAISES
+  #   (undefined)
+  #
+  def getProductTree
+    raise NotImplementedError.new
+  end
+  
+  # SYNOPSIS
+  #   getInfoFromCategory(category)
+  #
+  # ARGS
+  #   category		Category - {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}Category
+  #
+  # RETURNS
+  #   return		InfoArray - {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}InfoArray
+  #
+  # RAISES
+  #   (undefined)
+  #
+  def getInfoFromCategory(category)
+    raise NotImplementedError.new
+  end
+  
+  # SYNOPSIS
+  #   getModifiedInfoSince(timeInstant)
+  #
+  # ARGS
+  #   timeInstant		 - {http://www.w3.org/2001/XMLSchema}dateTime
+  #
+  # RETURNS
+  #   return		InfoArray - {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}InfoArray
+  #
+  # RAISES
+  #   (undefined)
+  #
+  def getModifiedInfoSince(timeInstant)
+    raise NotImplementedError.new
+  end
+  
+  # SYNOPSIS
+  #   getInfoFromName(productName)
+  #
+  # ARGS
+  #   productName		 - {http://www.w3.org/2001/XMLSchema}string
+  #
+  # RETURNS
+  #   return		Info - {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}Info
+  #
+  # RAISES
+  #   (undefined)
+  #
+  def getInfoFromName(productName)
+    raise NotImplementedError.new
+  end
+  
+  # SYNOPSIS
+  #   getInfoFromOwnerId(ownerId)
+  #
+  # ARGS
+  #   ownerId		 - {http://www.w3.org/2001/XMLSchema}int
+  #
+  # RETURNS
+  #   return		InfoArray - {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}InfoArray
+  #
+  # RAISES
+  #   (undefined)
+  #
+  def getInfoFromOwnerId(ownerId)
+    raise NotImplementedError.new
+  end
+end
+
diff --git a/ruby_1_8_6/test/wsdl/raa/RAAService.rb b/ruby_1_8_6/test/wsdl/raa/RAAService.rb
new file mode 100644
index 0000000000..9d0813304c
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/raa/RAAService.rb
@@ -0,0 +1,100 @@
+#!/usr/bin/env ruby
+require 'RAAServant.rb'
+
+require 'soap/rpc/standaloneServer'
+
+class RAABaseServicePortType
+  MappingRegistry = SOAP::Mapping::Registry.new
+
+  MappingRegistry.set(
+    StringArray,
+    ::SOAP::SOAPArray,
+    ::SOAP::Mapping::Registry::TypedArrayFactory,
+    { :type => XSD::QName.new("http://www.w3.org/2001/XMLSchema", "string") }
+  )
+  MappingRegistry.set(
+    Map,
+    ::SOAP::SOAPArray,
+    ::SOAP::Mapping::Registry::TypedArrayFactory,
+    { :type => XSD::QName.new("http://www.w3.org/2001/XMLSchema", "anyType") }
+  )
+  MappingRegistry.set(
+    Category,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Category") }
+  )
+  MappingRegistry.set(
+    InfoArray,
+    ::SOAP::SOAPArray,
+    ::SOAP::Mapping::Registry::TypedArrayFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info") }
+  )
+  MappingRegistry.set(
+    Info,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info") }
+  )
+  MappingRegistry.set(
+    Product,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Product") }
+  )
+  MappingRegistry.set(
+    Owner,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Owner") }
+  )
+
+
+  Methods = [
+    ["getAllListings", "getAllListings", [
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.w3.org/2001/XMLSchema", "string"]]], "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getProductTree", "getProductTree", [
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.w3.org/2001/XMLSchema", "anyType"]]], "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getInfoFromCategory", "getInfoFromCategory", [
+      ["in", "category",
+       [::SOAP::SOAPStruct, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Category"]],
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]], "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getModifiedInfoSince", "getModifiedInfoSince", [
+      ["in", "timeInstant",
+       [SOAP::SOAPDateTime]],
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]], "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getInfoFromName", "getInfoFromName", [
+      ["in", "productName",
+       [SOAP::SOAPString]],
+      ["retval", "return",
+       [::SOAP::SOAPStruct, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]], "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getInfoFromOwnerId", "getInfoFromOwnerId", [
+      ["in", "ownerId",
+       [SOAP::SOAPInt]],
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]], "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"]
+  ]
+end
+
+class App < SOAP::RPC::StandaloneServer
+  def initialize(*arg)
+    super
+
+    servant = RAABaseServicePortType.new
+    RAABaseServicePortType::Methods.each do |name_as, name, params, soapaction, namespace|
+      qname = XSD::QName.new(namespace, name_as)
+      @router.add_method(servant, qname, soapaction, name, params)
+    end
+
+    self.mapping_registry = RAABaseServicePortType::MappingRegistry
+  end
+end
+
+# Change listen port.
+if $0 == __FILE__
+  App.new('app', nil, '0.0.0.0', 10080).start
+end
diff --git a/ruby_1_8_6/test/wsdl/raa/README.txt b/ruby_1_8_6/test/wsdl/raa/README.txt
new file mode 100644
index 0000000000..efbaf9d87c
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/raa/README.txt
@@ -0,0 +1,8 @@
+RAAServant.rb: based on the file which is generated with the following command;
+  bin/wsdl2ruby.rb --wsdl raa.wsdl --servant_skelton --force
+
+RAAService.rb: generated with the following command;
+  bin/wsdl2ruby.rb --wsdl raa.wsdl --standalone_server_stub --force
+
+RAA.rb: generated with the following command;
+  bin/wsdl2ruby.rb --wsdl raa.wsdl --classdef --force
diff --git a/ruby_1_8_6/test/wsdl/raa/raa.wsdl b/ruby_1_8_6/test/wsdl/raa/raa.wsdl
new file mode 100644
index 0000000000..78376893dd
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/raa/raa.wsdl
@@ -0,0 +1,264 @@
+<?xml version="1.0"?>
+<definitions
+    name="RAA"
+    targetNamespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
+    xmlns:tns="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
+    xmlns:txd="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+    xmlns:apachesoap="http://xml.apache.org/xml-soap">
+
+  <types>
+    <schema
+	xmlns="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/">
+
+      <complexType name="Category">
+  	<all>
+    	  <element name="major" type="string"/>
+	  <element name="minor" type="string"/>
+  	</all>
+      </complexType>
+
+      <complexType name="Product">
+  	<all>
+    	  <element name="id" type="int"/>
+    	  <element name="name" type="string"/>
+    	  <element name="short_description" type="string"/>
+	  <element name="version" type="string"/>
+	  <element name="status" type="string"/>
+	  <element name="homepage" type="anyURI"/>
+	  <element name="download" type="anyURI"/>
+	  <element name="license" type="string"/>
+	  <element name="description" type="string"/>
+  	</all>
+      </complexType>
+
+      <complexType name="Owner">
+  	<all>
+    	  <element name="id" type="int"/>
+	  <element name="email" type="anyURI"/>
+	  <element name="name" type="string"/>
+  	</all>
+      </complexType>
+
+      <complexType name="Info">
+  	<all>
+    	  <element name="category" type="txd:Category"/>
+    	  <element name="product" type="txd:Product"/>
+	  <element name="owner" type="txd:Owner"/>
+	  <element name="created" type="xsd:dateTime"/>
+	  <element name="updated" type="xsd:dateTime"/>
+  	</all>
+      </complexType>
+
+      <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+      <complexType name="InfoArray">
+	<complexContent>
+  	  <restriction base="soapenc:Array">
+  	    <attribute ref="soapenc:arrayType" wsdl:arrayType="txd:Info[]"/>
+  	  </restriction>
+	</complexContent>
+      </complexType>
+
+      <complexType name="StringArray">
+	<complexContent>
+  	  <restriction base="soapenc:Array">
+  	    <attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[]"/>
+  	  </restriction>
+	</complexContent>
+      </complexType>
+    </schema>
+
+    <!-- type definition for ApacheSOAP's Map -->
+    <schema
+	xmlns="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://xml.apache.org/xml-soap">
+      <complexType name="Map">
+	<sequence>
+	  <element name="item" minOccurs="0" maxOccurs="unbounded">
+	    <complexType>
+	      <sequence>
+		<element name="key" type="anyType" />
+		<element name="value" type="anyType" />
+	      </sequence>
+	    </complexType>
+	  </element>
+	</sequence>
+      </complexType>
+    </schema>
+  </types>
+
+  <message name="getAllListingsRequest"/>
+  <message name="getAllListingsResponse">
+    <part name="return" type="txd:StringArray"/>
+  </message>
+
+  <message name="getProductTreeRequest"/>
+  <message name="getProductTreeResponse">
+    <part name="return" type="apachesoap:Map"/>
+  </message>
+
+  <message name="getInfoFromCategoryRequest">
+    <part name="category" type="txd:Category"/>
+  </message>
+  <message name="getInfoFromCategoryResponse">
+    <part name="return" type="txd:InfoArray"/>
+  </message>
+
+  <message name="getModifiedInfoSinceRequest">
+    <part name="timeInstant" type="xsd:dateTime"/>
+  </message>
+  <message name="getModifiedInfoSinceResponse">
+    <part name="return" type="txd:InfoArray"/>
+  </message>
+
+  <message name="getInfoFromNameRequest">
+    <part name="productName" type="xsd:string"/>
+  </message>
+  <message name="getInfoFromNameResponse">
+    <part name="return" type="txd:Info"/>
+  </message>
+
+  <message name="getInfoFromOwnerIdRequest">
+    <part name="ownerId" type="xsd:int"/>
+  </message>
+  <message name="getInfoFromOwnerIdResponse">
+    <part name="return" type="txd:InfoArray"/>
+  </message>
+
+  <portType name="RAABaseServicePortType">
+    <operation name="getAllListings"
+	parameterOrder="">
+      <input message="tns:getAllListingsRequest"/>
+      <output message="tns:getAllListingsResponse"/>
+    </operation>
+
+    <operation name="getProductTree"
+	parameterOrder="">
+      <input message="tns:getProductTreeRequest"/>
+      <output message="tns:getProductTreeResponse"/>
+    </operation>
+
+    <operation name="getInfoFromCategory"
+	parameterOrder="category">
+      <input message="tns:getInfoFromCategoryRequest"/>
+      <output message="tns:getInfoFromCategoryResponse"/>
+    </operation>
+
+    <operation name="getModifiedInfoSince"
+	parameterOrder="timeInstant">
+      <input message="tns:getModifiedInfoSinceRequest"/>
+      <output message="tns:getModifiedInfoSinceResponse"/>
+    </operation>
+
+    <operation name="getInfoFromName"
+	parameterOrder="productName">
+      <input message="tns:getInfoFromNameRequest"/>
+      <output message="tns:getInfoFromNameResponse"/>
+    </operation>
+
+    <operation name="getInfoFromOwnerId"
+	parameterOrder="ownerId">
+      <input message="tns:getInfoFromOwnerIdRequest"/>
+      <output message="tns:getInfoFromOwnerIdResponse"/>
+    </operation>
+  </portType>
+
+  <binding name="RAABaseServicePortBinding" type="tns:RAABaseServicePortType">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+    <operation name="getAllListings">
+      <soap:operation soapAction=""/>
+      <input>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"/>
+      </input>
+      <output>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"/>
+      </output>
+    </operation>
+
+    <operation name="getProductTree">
+      <soap:operation soapAction=""/>
+      <input>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"/>
+      </input>
+      <output>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"/>
+      </output>
+    </operation>
+
+    <operation name="getInfoFromCategory">
+      <soap:operation soapAction=""/>
+      <input>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"/>
+      </input>
+      <output>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"/>
+      </output>
+    </operation>
+
+    <operation name="getModifiedInfoSince">
+      <soap:operation soapAction=""/>
+      <input>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"/>
+      </input>
+      <output>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"/>
+      </output>
+    </operation>
+
+    <operation name="getInfoFromName">
+      <soap:operation soapAction=""/>
+      <input>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"/>
+      </input>
+      <output>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"/>
+      </output>
+    </operation>
+
+    <operation name="getInfoFromOwnerId">
+      <soap:operation soapAction=""/>
+      <input>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"/>
+      </input>
+      <output>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"/>
+      </output>
+    </operation>
+  </binding>
+
+  <service name="RAAService">
+    <port name="RAABaseServicePort" binding="tns:RAABaseServicePortBinding">
+      <soap:address location="http://raa.ruby-lang.org/soap/1.0.2/"/>
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/raa/server.rb b/ruby_1_8_6/test/wsdl/raa/server.rb
new file mode 100644
index 0000000000..87bbc6f569
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/raa/server.rb
@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby
+require 'soap/rpc/standaloneServer'
+require 'RAA.rb'
+
+class RAABaseServicePortType
+  MappingRegistry = SOAP::Mapping::Registry.new
+
+  MappingRegistry.set(
+    StringArray,
+    ::SOAP::SOAPArray,
+    ::SOAP::Mapping::Registry::TypedArrayFactory,
+    { :type => XSD::QName.new("http://www.w3.org/2001/XMLSchema", "string") }
+  )
+  MappingRegistry.set(
+    Map,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://xml.apache.org/xml-soap", "Map") }
+  )
+  MappingRegistry.set(
+    Category,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Category") }
+  )
+  MappingRegistry.set(
+    InfoArray,
+    ::SOAP::SOAPArray,
+    ::SOAP::Mapping::Registry::TypedArrayFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info") }
+  )
+  MappingRegistry.set(
+    Info,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info") }
+  )
+  MappingRegistry.set(
+    Product,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Product") }
+  )
+  MappingRegistry.set(
+    Owner,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Owner") }
+  )
+  
+  Methods = [
+    ["getAllListings", "getAllListings", [
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.w3.org/2001/XMLSchema", "string"]]],
+     "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getProductTree", "getProductTree", [
+      ["retval", "return",
+       [::SOAP::SOAPStruct, "http://xml.apache.org/xml-soap", "Map"]]],
+     "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getInfoFromCategory", "getInfoFromCategory", [
+      ["in", "category",
+       [::SOAP::SOAPStruct, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Category"]],
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]],
+     "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getModifiedInfoSince", "getModifiedInfoSince", [
+      ["in", "timeInstant",
+       [SOAP::SOAPDateTime]],
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]],
+     "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getInfoFromName", "getInfoFromName", [
+      ["in", "productName",
+       [SOAP::SOAPString]],
+      ["retval", "return",
+       [::SOAP::SOAPStruct, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]],
+     "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"],
+    ["getInfoFromOwnerId", "getInfoFromOwnerId", [
+      ["in", "ownerId",
+       [SOAP::SOAPInt]],
+      ["retval", "return",
+       [::SOAP::SOAPArray, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]],
+     "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"]
+  ]
+
+  def getAllListings
+    ["ruby", "soap4r"]
+  end
+end
+
+class RAABaseServiceServer < SOAP::RPC::StandaloneServer
+  def initialize(*arg)
+    super
+
+    servant = RAABaseServicePortType.new
+    RAABaseServicePortType::Methods.each do |name_as, name, params, soapaction, namespace|
+      qname = XSD::QName.new(namespace, name_as)
+      @router.add_method(servant, qname, soapaction, name, params)
+    end
+
+    self.mapping_registry = RAABaseServicePortType::MappingRegistry
+  end
+end
diff --git a/ruby_1_8_6/test/wsdl/raa/test_raa.rb b/ruby_1_8_6/test/wsdl/raa/test_raa.rb
new file mode 100644
index 0000000000..0b00042ffb
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/raa/test_raa.rb
@@ -0,0 +1,71 @@
+require 'test/unit'
+require 'soap/wsdlDriver'
+require 'RAA.rb'
+require 'RAAServant.rb'
+require 'RAAService.rb'
+
+
+module WSDL
+module RAA
+
+
+class TestRAA < Test::Unit::TestCase
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = App.new('RAA server', nil, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      Thread.current.abort_on_exception = true
+      @server.start
+    }
+  end
+
+  def setup_client
+    wsdl = File.join(DIR, 'raa.wsdl')
+    @raa = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @raa.endpoint_url = "http://localhost:#{Port}/"
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @t.kill
+    @t.join
+  end
+
+  def teardown_client
+    @raa.reset_stream
+  end
+
+  def test_raa
+    assert_equal(["ruby", "soap4r"], @raa.getAllListings)
+  end
+
+  def foo
+    p @raa.getProductTree()
+    p @raa.getInfoFromCategory(Category.new("Library", "XML"))
+    t = Time.at(Time.now.to_i - 24 * 3600)
+    p @raa.getModifiedInfoSince(t)
+    p @raa.getModifiedInfoSince(DateTime.new(t.year, t.mon, t.mday, t.hour, t.min, t.sec))
+    o = @raa.getInfoFromName("SOAP4R")
+    p o.type
+    p o.owner.name
+    p o
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/wsdl/ref/expectedProduct.rb b/ruby_1_8_6/test/wsdl/ref/expectedProduct.rb
new file mode 100644
index 0000000000..91c6e4c566
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/ref/expectedProduct.rb
@@ -0,0 +1,90 @@
+require 'xsd/qname'
+
+# {urn:product}Rating
+module Rating
+  C_0 = "0"
+  C_1 = "+1"
+  C_1_2 = "-1"
+end
+
+# {urn:product}Product-Bag
+class ProductBag
+  @@schema_type = "Product-Bag"
+  @@schema_ns = "urn:product"
+  @@schema_attribute = {XSD::QName.new("urn:product", "version") => "SOAP::SOAPString", XSD::QName.new("urn:product", "yesno") => "SOAP::SOAPString"}
+  @@schema_element = [["bag", ["Product[]", XSD::QName.new(nil, "bag")]], ["rating", ["SOAP::SOAPString[]", XSD::QName.new("urn:product", "Rating")]], ["product_Bag", [nil, XSD::QName.new("urn:product", "Product-Bag")]], ["comment_1", [nil, XSD::QName.new(nil, "comment_1")]], ["comment_2", ["Comment[]", XSD::QName.new(nil, "comment-2")]]]
+
+  attr_accessor :bag
+  attr_accessor :product_Bag
+  attr_accessor :comment_1
+  attr_accessor :comment_2
+
+  def Rating
+    @rating
+  end
+
+  def Rating=(value)
+    @rating = value
+  end
+
+  def xmlattr_version
+    (@__xmlattr ||= {})[XSD::QName.new("urn:product", "version")]
+  end
+
+  def xmlattr_version=(value)
+    (@__xmlattr ||= {})[XSD::QName.new("urn:product", "version")] = value
+  end
+
+  def xmlattr_yesno
+    (@__xmlattr ||= {})[XSD::QName.new("urn:product", "yesno")]
+  end
+
+  def xmlattr_yesno=(value)
+    (@__xmlattr ||= {})[XSD::QName.new("urn:product", "yesno")] = value
+  end
+
+  def initialize(bag = [], rating = [], product_Bag = nil, comment_1 = [], comment_2 = [])
+    @bag = bag
+    @rating = rating
+    @product_Bag = product_Bag
+    @comment_1 = comment_1
+    @comment_2 = comment_2
+    @__xmlattr = {}
+  end
+end
+
+# {urn:product}Creator
+class Creator
+  @@schema_type = "Creator"
+  @@schema_ns = "urn:product"
+  @@schema_element = []
+
+  def initialize
+  end
+end
+
+# {urn:product}Product
+class Product
+  @@schema_type = "Product"
+  @@schema_ns = "urn:product"
+  @@schema_element = [["name", ["SOAP::SOAPString", XSD::QName.new(nil, "name")]], ["rating", ["SOAP::SOAPString", XSD::QName.new("urn:product", "Rating")]]]
+
+  attr_accessor :name
+
+  def Rating
+    @rating
+  end
+
+  def Rating=(value)
+    @rating = value
+  end
+
+  def initialize(name = nil, rating = nil)
+    @name = name
+    @rating = rating
+  end
+end
+
+# {urn:product}Comment
+class Comment < String
+end
diff --git a/ruby_1_8_6/test/wsdl/ref/product.wsdl b/ruby_1_8_6/test/wsdl/ref/product.wsdl
new file mode 100644
index 0000000000..993fe217aa
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/ref/product.wsdl
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<definitions name="product"
+    targetNamespace="urn:product"
+    xmlns:tns="urn:product"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+        targetNamespace="urn:product">
+      <simpleType name="non-empty-string">
+        <restriction base="xsd:string">
+          <minLength value="1"/>
+        </restriction>
+      </simpleType>
+
+      <complexType name="Product">
+        <all>
+          <element name="name" type="xsd:string"/>
+          <element ref="tns:Rating"/>
+        </all>
+      </complexType>
+
+      <complexType name="Comment">
+        <simpleContent>
+          <extension base="xsd:string">
+            <attribute name="msgid" type="xsd:string" use="required"/>
+          </extension>
+        </simpleContent>
+      </complexType>
+
+      <attribute name="version" type="tns:non-empty-string"/>
+
+      <attribute default="Y" name="yesno">
+        <simpleType>
+          <restriction base="xsd:string">
+            <enumeration value="Y"/>
+            <enumeration value="N"/>
+          </restriction>
+        </simpleType>
+      </attribute>
+
+      <element name="Rating">
+        <simpleType>
+          <restriction base="xsd:string">
+            <enumeration value="+1"/>
+            <enumeration value="0"/>
+            <enumeration value="-1"/>
+          </restriction>
+        </simpleType>
+      </element>
+
+      <element name="Product-Bag">
+        <complexType>
+          <sequence>
+            <element name="bag" type="tns:Product" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="tns:Rating" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="tns:Product-Bag"/>
+            <element name="comment_1" minOccurs="0" maxOccurs="unbounded">
+              <complexType>
+                <simpleContent>
+                  <extension base="xsd:string">
+                    <attribute name="msgid" type="xsd:string" use="required"/>
+                  </extension>
+                </simpleContent>
+              </complexType>
+            </element>
+            <element name="comment-2" type="tns:Comment" minOccurs="0" maxOccurs="unbounded"/>
+          </sequence>
+          <attribute ref="tns:version"/>
+          <attribute ref="tns:yesno"/>
+        </complexType>
+      </element>
+
+      <element name="Creator" minOccurs="0" maxOccurs="unbounded">
+        <complexType>
+          <simpleContent>
+            <extension base="xsd:string">
+              <attribute name="Role" type="xs:string" use="required"/>
+            </extension>
+          </simpleContent>
+        </complexType>
+      </element>
+    </xsd:schema>
+  </types>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/ref/test_ref.rb b/ruby_1_8_6/test/wsdl/ref/test_ref.rb
new file mode 100644
index 0000000000..9e29fa31e0
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/ref/test_ref.rb
@@ -0,0 +1,54 @@
+require 'test/unit'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+require 'wsdl/soap/wsdl2ruby'
+
+
+module WSDL
+module Ref
+
+
+class TestRef < Test::Unit::TestCase
+  DIR = File.dirname(File.expand_path(__FILE__))
+  Port = 17171
+
+  def test_classdef
+    gen = WSDL::SOAP::WSDL2Ruby.new
+    gen.location = pathname("product.wsdl")
+    gen.basedir = DIR
+    gen.logger.level = Logger::FATAL
+    gen.opt['classdef'] = nil
+    gen.opt['force'] = true
+    suppress_warning do
+      gen.run
+    end
+    compare("expectedProduct.rb", "product.rb")
+    File.unlink(pathname('product.rb'))
+  end
+
+  def compare(expected, actual)
+    assert_equal(loadfile(expected), loadfile(actual), actual)
+  end
+
+  def loadfile(file)
+    File.open(pathname(file)) { |f| f.read }
+  end
+
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
+
+  def suppress_warning
+    back = $VERBOSE
+    $VERBOSE = nil
+    begin
+      yield
+    ensure
+      $VERBOSE = back
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/wsdl/rpc/echoDriver.rb b/ruby_1_8_6/test/wsdl/rpc/echoDriver.rb
new file mode 100644
index 0000000000..51e82076e7
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/rpc/echoDriver.rb
@@ -0,0 +1,55 @@
+require 'echo.rb'
+
+require 'soap/rpc/driver'
+
+class Echo_port_type < ::SOAP::RPC::Driver
+  DefaultEndpointUrl = "http://localhost:10080"
+  MappingRegistry = ::SOAP::Mapping::Registry.new
+
+  MappingRegistry.set(
+    Person,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("urn:rpc-type", "person") }
+  )
+
+  Methods = [
+    ["echo", "echo",
+      [
+        ["in", "arg1", [::SOAP::SOAPStruct, "urn:rpc-type", "person"]],
+        ["in", "arg2", [::SOAP::SOAPStruct, "urn:rpc-type", "person"]],
+        ["retval", "return", [::SOAP::SOAPStruct, "urn:rpc-type", "person"]]
+      ],
+      "", "urn:rpc", :rpc
+    ]
+  ]
+
+  def initialize(endpoint_url = nil)
+    endpoint_url ||= DefaultEndpointUrl
+    super(endpoint_url, nil)
+    self.mapping_registry = MappingRegistry
+    init_methods
+  end
+
+private
+
+  def init_methods
+    Methods.each do |name_as, name, params, soapaction, namespace, style|
+      qname = XSD::QName.new(namespace, name_as)
+      if style == :document
+        @proxy.add_document_method(soapaction, name, params)
+        add_document_method_interface(name, params)
+      else
+        @proxy.add_rpc_method(qname, soapaction, name, params)
+        add_rpc_method_interface(name, params)
+      end
+      if name_as != name and name_as.capitalize == name.capitalize
+        sclass = class << self; self; end
+        sclass.__send__(:define_method, name_as, proc { |*arg|
+          __send__(name, *arg)
+        })
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/test/wsdl/rpc/echo_serviceClient.rb b/ruby_1_8_6/test/wsdl/rpc/echo_serviceClient.rb
new file mode 100644
index 0000000000..40264834e9
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/rpc/echo_serviceClient.rb
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+require 'echoDriver.rb'
+
+endpoint_url = ARGV.shift
+obj = Echo_port_type.new(endpoint_url)
+
+# Uncomment the below line to see SOAP wiredumps.
+# obj.wiredump_dev = STDERR
+
+# SYNOPSIS
+#   echo(arg1, arg2)
+#
+# ARGS
+#   arg1            Person - {urn:rpc-type}person
+#   arg2            Person - {urn:rpc-type}person
+#
+# RETURNS
+#   v_return        Person - {urn:rpc-type}person
+#
+arg1 = arg2 = nil
+puts obj.echo(arg1, arg2)
+
+
diff --git a/ruby_1_8_6/test/wsdl/rpc/rpc.wsdl b/ruby_1_8_6/test/wsdl/rpc/rpc.wsdl
new file mode 100644
index 0000000000..b0ee5c5e56
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/rpc/rpc.wsdl
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name="echo"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:tns="urn:rpc"
+    xmlns:txd="urn:rpc-type"
+    targetNamespace="urn:rpc"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema targetNamespace="urn:rpc-type">
+      <xsd:complexType name="person">
+	<xsd:all>
+	  <xsd:element name="family-name" type="xsd:string" />
+	  <xsd:element name="given_name" type="xsd:string" />
+	  <xsd:element name="age" type="xsd:int" />
+	  <xsd:element name="link" type="txd:person" />
+	</xsd:all>
+      </xsd:complexType>
+    </xsd:schema>
+  </types>
+
+  <message name="echo_in">
+    <part name="arg1" type="txd:person"/>
+    <part name="arg2" type="txd:person"/>
+  </message>
+
+  <message name="echo_out">
+    <part name="return" type="txd:person"/>
+  </message>
+
+  <portType name="echo_port_type">
+    <operation name="echo">
+      <input message="tns:echo_in"/>
+      <output message="tns:echo_out"/>
+    </operation>
+
+    <operation name="echo_err">
+      <input message="tns:echo_in"/>
+      <output message="tns:echo_out"/>
+    </operation>
+  </portType>
+
+  <binding name="echo_binding" type="tns:echo_port_type">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+    <operation name="echo">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="encoded" namespace="urn:rpc"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="urn:rpc"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+
+    <operation name="echo_err">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="encoded" namespace="urn:rpc"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="urn:rpc"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+  </binding>
+
+  <service name="echo_service">
+    <port name="echo_port" binding="tns:echo_binding">
+      <soap:address location="http://localhost:10080"/>
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/rpc/test-rpc-lit.wsdl b/ruby_1_8_6/test/wsdl/rpc/test-rpc-lit.wsdl
new file mode 100644
index 0000000000..72de747e36
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/rpc/test-rpc-lit.wsdl
@@ -0,0 +1,364 @@
+<?xml version="1.0"?>
+
+<definitions name="RPC-Literal-TestDefinitions"
+  targetNamespace="http://whitemesa.net/wsdl/rpc-lit-test"
+  xmlns="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:tns="http://whitemesa.net/wsdl/rpc-lit-test"
+  xmlns:types="http://soapbuilders.org/rpc-lit-test/types"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://soapbuilders.org/rpc-lit-test/types">
+
+      <element name="stringItem" type="xsd:string" />
+      <complexType name="ArrayOfstring">
+        <sequence>
+          <element ref="types:stringItem" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+      </complexType>
+
+      <complexType name="ArrayOfstringInline">
+        <sequence>
+          <element name="stringItem" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+      </complexType>
+
+      <complexType name="ArrayOfint">
+        <sequence>
+          <element name="integer" type="xsd:int" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+      </complexType>
+
+      <element name="structItem" type="types:SOAPStruct" />
+      <complexType name="SOAPStruct">
+        <all>
+          <element name="varString" type="xsd:string"/>
+          <element name="varInt" type="xsd:int"/>
+          <element name="varFloat" type="xsd:float"/>
+        </all>
+      </complexType>
+
+      <complexType name="ArrayOfSOAPStruct">
+        <sequence>
+          <element ref="types:structItem" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+      </complexType>
+
+      <complexType name="SOAPStructStruct">
+        <all>
+          <element name="varString" type="xsd:string"/>
+          <element name="varInt" type="xsd:int"/>
+          <element name="varFloat" type="xsd:float"/>
+          <element ref="types:structItem" />
+        </all>
+      </complexType>
+
+      <complexType name="SOAPArrayStruct">
+        <all>
+          <element name="varString" type="xsd:string"/>
+          <element name="varInt" type="xsd:int"/>
+          <element name="varFloat" type="xsd:float"/>
+          <element name="varArray" type="types:ArrayOfstring"/>
+        </all>
+      </complexType>
+
+    </schema>
+
+  </types>
+
+  <!-- echoStruct rpc operation -->
+  <message name="echoStructRequest">
+    <part name="inputStruct" type="types:SOAPStruct"/>
+  </message>
+  <message name="echoStructResponse">
+    <part name="return" type="types:SOAPStruct"/>
+  </message>
+
+  <!-- echoStructArray rpc operation -->
+  <message name="echoStructArrayRequest">
+    <part name="inputStructArray" type="types:ArrayOfSOAPStruct"/>
+  </message>
+  <message name="echoStructArrayResponse">
+    <part name="return" type="types:ArrayOfSOAPStruct"/>
+  </message>
+
+  <!-- echoStructAsSimpleTypes rpc operation -->
+  <message name="echoStructAsSimpleTypesRequest">
+    <part name="inputStruct" type="types:SOAPStruct"/>
+  </message>
+  <message name="echoStructAsSimpleTypesResponse">
+    <part name="outputString" type="xsd:string"/>
+    <part name="outputInteger" type="xsd:int"/>
+    <part name="outputFloat" type="xsd:float"/>
+  </message>
+
+  <!-- echoSimpleTypesAsStruct rpc operation -->
+  <message name="echoSimpleTypesAsStructRequest">
+    <part name="inputString" type="xsd:string"/>
+    <part name="inputInteger" type="xsd:int"/>
+    <part name="inputFloat" type="xsd:float"/>
+  </message>
+  <message name="echoSimpleTypesAsStructResponse">
+    <part name="return" type="types:SOAPStruct"/>
+  </message>
+
+  <!-- echoNestedStruct rpc operation -->
+  <message name="echoNestedStructRequest">
+    <part name="inputStruct" type="types:SOAPStructStruct"/>
+  </message>
+  <message name="echoNestedStructResponse">
+    <part name="return" type="types:SOAPStructStruct"/>
+  </message>
+
+  <!-- echoNestedArray rpc operation -->
+  <message name="echoNestedArrayRequest">
+    <part name="inputStruct" type="types:SOAPArrayStruct"/>
+  </message>
+  <message name="echoNestedArrayResponse">
+    <part name="return" type="types:SOAPArrayStruct"/>
+  </message>
+
+  <!-- echoStringArray rpc operation -->
+  <message name="echoStringArrayRequest">
+    <part name="inputStringArray" type="types:ArrayOfstring"/>
+  </message>
+  <message name="echoStringArrayResponse">
+    <part name="return" type="types:ArrayOfstring"/>
+  </message>
+
+  <message name="echoStringArrayInlineRequest">
+    <part name="inputStringArray" type="types:ArrayOfstringInline"/>
+  </message>
+  <message name="echoStringArrayInlineResponse">
+    <part name="return" type="types:ArrayOfstringInline"/>
+  </message>
+
+  <!-- echoIntegerArray rpc operation -->
+  <message name="echoIntegerArrayRequest">
+    <part name="inputIntegerArray" type="types:ArrayOfint"/>
+  </message>
+  <message name="echoIntegerArrayResponse">
+    <part name="return" type="types:ArrayOfint"/>
+  </message>
+
+  <!-- echoBoolean rpc operation -->
+  <message name="echoBooleanRequest">
+    <part name="inputBoolean" type="xsd:boolean"/>
+  </message>
+  <message name="echoBooleanResponse">
+    <part name="return" type="xsd:boolean"/>
+  </message>
+
+  <!-- echoString rpc operation -->
+  <message name="echoStringRequest">
+    <part name="inputString" type="xsd:string"/>
+  </message>
+  <message name="echoStringResponse">
+    <part name="return" type="xsd:string"/>
+  </message>
+
+
+  <portType name="SoapTestPortTypeRpc">
+
+    <!-- echoStruct rpc operation -->
+    <operation name="echoStruct" parameterOrder="inputStruct">
+      <input message="tns:echoStructRequest"/>
+      <output message="tns:echoStructResponse"/>
+    </operation>
+
+    <!-- echoStructArray rpc operation -->
+    <operation name="echoStructArray" parameterOrder="inputStructArray">
+      <input message="tns:echoStructArrayRequest"/>
+      <output message="tns:echoStructArrayResponse"/>
+    </operation>
+
+    <!-- echoStructAsSimpleTypes rpc operation -->
+    <operation name="echoStructAsSimpleTypes" parameterOrder="inputStruct outputString outputInteger outputFloat">
+      <input message="tns:echoStructAsSimpleTypesRequest"/>
+      <output message="tns:echoStructAsSimpleTypesResponse"/>
+    </operation>
+
+    <!-- echoSimpleTypesAsStruct rpc operation -->
+    <operation name="echoSimpleTypesAsStruct" parameterOrder="inputString inputInteger inputFloat">
+      <input message="tns:echoSimpleTypesAsStructRequest"/>
+      <output message="tns:echoSimpleTypesAsStructResponse"/>
+    </operation>
+
+    <!-- echoNestedStruct rpc operation -->
+    <operation name="echoNestedStruct" parameterOrder="inputStruct">
+      <input message="tns:echoNestedStructRequest"/>
+      <output message="tns:echoNestedStructResponse"/>
+    </operation>
+
+    <!-- echoNestedArray rpc operation -->
+    <operation name="echoNestedArray" parameterOrder="inputStruct">
+      <input message="tns:echoNestedArrayRequest"/>
+      <output message="tns:echoNestedArrayResponse"/>
+    </operation>
+
+    <!-- echoStringArray rpc operation -->
+    <operation name="echoStringArray" parameterOrder="inputStringArray">
+      <input message="tns:echoStringArrayRequest"/>
+      <output message="tns:echoStringArrayResponse"/>
+    </operation>
+
+    <operation name="echoStringArrayInline" parameterOrder="inputStringArray">
+      <input message="tns:echoStringArrayInlineRequest"/>
+      <output message="tns:echoStringArrayInlineResponse"/>
+    </operation>
+
+    <!-- echoIntegerArray rpc operation -->
+    <operation name="echoIntegerArray" parameterOrder="inputIntegerArray">
+      <input message="tns:echoIntegerArrayRequest"/>
+      <output message="tns:echoIntegerArrayResponse"/>
+    </operation>
+
+    <!-- echoBoolean rpc operation -->
+    <operation name="echoBoolean" parameterOrder="inputBoolean">
+      <input message="tns:echoBooleanRequest"/>
+      <output message="tns:echoBooleanResponse"/>
+    </operation>
+
+    <!-- echoString rpc operation -->
+    <operation name="echoString" parameterOrder="inputString">
+      <input message="tns:echoStringRequest"/>
+      <output message="tns:echoStringResponse"/>
+    </operation>
+
+  </portType>
+
+  <binding name="Soap11TestRpcLitBinding" type="tns:SoapTestPortTypeRpc">
+    <soap11:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+    <!-- echoStruct rpc operation -->
+    <operation name="echoStruct">
+      <soap11:operation soapAction="http://soapinterop.org/"/>
+      <input>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </input>
+      <output>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </output>
+    </operation>
+
+    <!--  echoStructArray rpc operation -->
+    <operation name="echoStructArray">
+      <soap11:operation soapAction="http://soapinterop.org/"/>
+      <input>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </input>
+      <output>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </output>
+    </operation>
+
+    <!-- echoStructAsSimpleTypes rpc operation -->
+    <operation name="echoStructAsSimpleTypes">
+      <soap11:operation soapAction="http://soapinterop.org/"/>
+      <input>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </input>
+      <output>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </output>
+    </operation>
+
+    <!-- echoSimpleTypesAsStruct rpc operation -->
+    <operation name="echoSimpleTypesAsStruct">
+      <soap11:operation soapAction="http://soapinterop.org/"/>
+      <input>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </input>
+      <output>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </output>
+    </operation>
+
+    <!-- echoNestedStruct rpc operation -->
+    <operation name="echoNestedStruct">
+      <soap11:operation soapAction="http://soapinterop.org/"/>
+      <input>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </input>
+      <output>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </output>
+    </operation>
+
+    <!-- echoNestedArray rpc operation -->
+    <operation name="echoNestedArray">
+      <soap11:operation soapAction="http://soapinterop.org/"/>
+      <input>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </input>
+      <output>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </output>
+    </operation>
+
+    <!-- echoStringArray rpc operation -->
+    <operation name="echoStringArray">
+      <soap11:operation soapAction="http://soapinterop.org/"/>
+      <input>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </input>
+      <output>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </output>
+    </operation>
+
+    <operation name="echoStringArrayInline">
+      <soap11:operation soapAction="http://soapinterop.org/"/>
+      <input>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </input>
+      <output>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </output>
+    </operation>
+
+    <!-- echoIntegerArray rpc operation -->
+    <operation name="echoIntegerArray">
+      <soap11:operation soapAction="http://soapinterop.org/"/>
+      <input>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </input>
+      <output>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </output>
+    </operation>
+
+    <!-- echoBoolean rpc operation -->
+    <operation name="echoBoolean">
+      <soap11:operation soapAction="http://soapinterop.org/"/>
+      <input>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </input>
+      <output>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </output>
+    </operation>
+
+    <!-- echoString rpc operation -->
+    <operation name="echoString">
+      <soap11:operation soapAction="http://soapinterop.org/"/>
+      <input>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </input>
+      <output>
+        <soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+      </output>
+    </operation>
+
+  </binding>
+
+  <service name="WhiteMesaSoapRpcLitTestSvc">
+
+    <port name="Soap11TestRpcLitPort" binding="tns:Soap11TestRpcLitBinding">
+      <soap11:address location="http://www.whitemesa.net/test-rpc-lit"/>
+    </port>
+
+  </service>
+
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/rpc/test-rpc-lit12.wsdl b/ruby_1_8_6/test/wsdl/rpc/test-rpc-lit12.wsdl
new file mode 100644
index 0000000000..901cde6f9c
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/rpc/test-rpc-lit12.wsdl
@@ -0,0 +1,455 @@
+<?xml version="1.0"?>
+
+<definitions name="RPC-Literal-TestDefinitions"
+	targetNamespace="http://whitemesa.net/wsdl/rpc-lit-test"
+	xmlns="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
+	xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:tns="http://whitemesa.net/wsdl/rpc-lit-test"
+	xmlns:types="http://soapbuilders.org/rpc-lit-test/types"
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+	<types>
+		<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://soapbuilders.org/rpc-lit-test/types">
+
+            <element name="stringItem" type="xsd:string" />
+			<complexType name="ArrayOfstring">
+				<sequence>
+					<element ref="types:stringItem" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</complexType>
+
+			<complexType name="ArrayOfint">
+				<sequence>
+					<element name="integer" type="xsd:int" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</complexType>
+
+            <element name="structItem" type="types:SOAPStruct" />
+			<complexType name="SOAPStruct">
+				<all>
+					<element name="varString" type="xsd:string"/>
+					<element name="varInt" type="xsd:int"/>
+					<element name="varFloat" type="xsd:float"/>
+				</all>
+			</complexType>
+			
+			<complexType name="ArrayOfSOAPStruct">
+				<sequence>
+					<element ref="types:structItem" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</complexType>
+
+			<complexType name="SOAPStructStruct">
+				<all>
+					<element name="varString" type="xsd:string"/>
+					<element name="varInt" type="xsd:int"/>
+					<element name="varFloat" type="xsd:float"/>
+					<element ref="types:structItem" />
+				</all>
+			</complexType>
+
+			<complexType name="SOAPArrayStruct">
+				<all>
+					<element name="varString" type="xsd:string"/>
+					<element name="varInt" type="xsd:int"/>
+					<element name="varFloat" type="xsd:float"/>
+					<element name="varArray" type="types:ArrayOfstring"/>
+				</all>
+			</complexType>
+
+		</schema>
+
+	</types>
+
+	<!-- echoStruct rpc operation -->
+	<message name="echoStructRequest">
+		<part name="inputStruct" type="types:SOAPStruct"/>
+	</message>
+	<message name="echoStructResponse">
+		<part name="return" type="types:SOAPStruct"/>
+	</message>
+
+	<!-- echoStructArray rpc operation -->
+	<message name="echoStructArrayRequest">
+		<part name="inputStructArray" type="types:ArrayOfSOAPStruct"/>
+	</message>
+	<message name="echoStructArrayResponse">
+		<part name="return" type="types:ArrayOfSOAPStruct"/>
+	</message>
+
+	<!-- echoStructAsSimpleTypes rpc operation -->
+	<message name="echoStructAsSimpleTypesRequest">
+		<part name="inputStruct" type="types:SOAPStruct"/>
+	</message>
+	<message name="echoStructAsSimpleTypesResponse">
+		<part name="outputString" type="xsd:string"/>
+		<part name="outputInteger" type="xsd:int"/>
+		<part name="outputFloat" type="xsd:float"/>
+	</message>
+
+	<!-- echoSimpleTypesAsStruct rpc operation -->
+	<message name="echoSimpleTypesAsStructRequest">
+		<part name="inputString" type="xsd:string"/>
+		<part name="inputInteger" type="xsd:int"/>
+		<part name="inputFloat" type="xsd:float"/>
+	</message>
+	<message name="echoSimpleTypesAsStructResponse">
+		<part name="return" type="types:SOAPStruct"/>
+	</message>
+
+	<!-- echoNestedStruct rpc operation -->
+	<message name="echoNestedStructRequest">
+		<part name="inputStruct" type="types:SOAPStructStruct"/>
+	</message>
+	<message name="echoNestedStructResponse">
+		<part name="return" type="types:SOAPStructStruct"/>
+	</message>
+
+	<!-- echoNestedArray rpc operation -->
+	<message name="echoNestedArrayRequest">
+		<part name="inputStruct" type="types:SOAPArrayStruct"/>
+	</message>
+	<message name="echoNestedArrayResponse">
+		<part name="return" type="types:SOAPArrayStruct"/>
+	</message>
+
+	<!-- echoStringArray rpc operation -->
+	<message name="echoStringArrayRequest">
+		<part name="inputStringArray" type="types:ArrayOfstring"/>
+	</message>
+	<message name="echoStringArrayResponse">
+		<part name="return" type="types:ArrayOfstring"/>
+	</message>
+
+	<!-- echoIntegerArray rpc operation -->
+	<message name="echoIntegerArrayRequest">
+		<part name="inputIntegerArray" type="types:ArrayOfint"/>
+	</message>
+	<message name="echoIntegerArrayResponse">
+		<part name="return" type="types:ArrayOfint"/>
+	</message>
+
+	<!-- echoBoolean rpc operation -->
+	<message name="echoBooleanRequest">
+		<part name="inputBoolean" type="xsd:boolean"/>
+	</message>
+	<message name="echoBooleanResponse">
+		<part name="return" type="xsd:boolean"/>
+	</message>
+
+	<!-- echoString rpc operation -->
+	<message name="echoStringRequest">
+		<part name="inputString" type="xsd:string"/>
+	</message>
+	<message name="echoStringResponse">
+		<part name="return" type="xsd:string"/>
+	</message>
+
+
+	<portType name="SoapTestPortTypeRpc">
+
+		<!-- echoStruct rpc operation -->
+		<operation name="echoStruct" parameterOrder="inputStruct">
+			<input message="tns:echoStructRequest"/>
+			<output message="tns:echoStructResponse"/>
+		</operation>
+
+		<!-- echoStructArray rpc operation -->
+		<operation name="echoStructArray" parameterOrder="inputStructArray">
+			<input message="tns:echoStructArrayRequest"/>
+			<output message="tns:echoStructArrayResponse"/>
+		</operation>
+
+		<!-- echoStructAsSimpleTypes rpc operation -->
+		<operation name="echoStructAsSimpleTypes" parameterOrder="inputStruct outputString outputInteger outputFloat">
+			<input message="tns:echoStructAsSimpleTypesRequest"/>
+			<output message="tns:echoStructAsSimpleTypesResponse"/>
+		</operation>
+
+		<!-- echoSimpleTypesAsStruct rpc operation -->
+		<operation name="echoSimpleTypesAsStruct" parameterOrder="inputString inputInteger inputFloat">
+			<input message="tns:echoSimpleTypesAsStructRequest"/>
+			<output message="tns:echoSimpleTypesAsStructResponse"/>
+		</operation>
+
+		<!-- echoNestedStruct rpc operation -->
+		<operation name="echoNestedStruct" parameterOrder="inputStruct">
+			<input message="tns:echoNestedStructRequest"/>
+			<output message="tns:echoNestedStructResponse"/>
+		</operation>
+
+		<!-- echoNestedArray rpc operation -->
+		<operation name="echoNestedArray" parameterOrder="inputStruct">
+			<input message="tns:echoNestedArrayRequest"/>
+			<output message="tns:echoNestedArrayResponse"/>
+		</operation>
+
+		<!-- echoStringArray rpc operation -->
+		<operation name="echoStringArray" parameterOrder="inputStringArray">
+			<input message="tns:echoStringArrayRequest"/>
+			<output message="tns:echoStringArrayResponse"/>
+		</operation>
+
+		<!-- echoIntegerArray rpc operation -->
+		<operation name="echoIntegerArray" parameterOrder="inputIntegerArray">
+			<input message="tns:echoIntegerArrayRequest"/>
+			<output message="tns:echoIntegerArrayResponse"/>
+		</operation>
+
+		<!-- echoBoolean rpc operation -->
+		<operation name="echoBoolean" parameterOrder="inputBoolean">
+			<input message="tns:echoBooleanRequest"/>
+			<output message="tns:echoBooleanResponse"/>
+		</operation>
+
+		<!-- echoString rpc operation -->
+		<operation name="echoString" parameterOrder="inputString">
+			<input message="tns:echoStringRequest"/>
+			<output message="tns:echoStringResponse"/>
+		</operation>
+
+	</portType>
+
+	<binding name="Soap11TestRpcLitBinding" type="tns:SoapTestPortTypeRpc">
+		<soap11:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+		<!-- echoStruct rpc operation -->
+		<operation name="echoStruct">
+			<soap11:operation soapAction="http://soapinterop.org/"/>
+			<input>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!--  echoStructArray rpc operation -->
+		<operation name="echoStructArray">
+			<soap11:operation soapAction="http://soapinterop.org/"/>
+			<input>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoStructAsSimpleTypes rpc operation -->
+		<operation name="echoStructAsSimpleTypes">
+			<soap11:operation soapAction="http://soapinterop.org/"/>
+			<input>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoSimpleTypesAsStruct rpc operation -->
+		<operation name="echoSimpleTypesAsStruct">
+			<soap11:operation soapAction="http://soapinterop.org/"/>
+			<input>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoNestedStruct rpc operation -->
+		<operation name="echoNestedStruct">
+			<soap11:operation soapAction="http://soapinterop.org/"/>
+			<input>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoNestedArray rpc operation -->
+		<operation name="echoNestedArray">
+			<soap11:operation soapAction="http://soapinterop.org/"/>
+			<input>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoStringArray rpc operation -->
+		<operation name="echoStringArray">
+			<soap11:operation soapAction="http://soapinterop.org/"/>
+			<input>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoIntegerArray rpc operation -->
+		<operation name="echoIntegerArray">
+			<soap11:operation soapAction="http://soapinterop.org/"/>
+			<input>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoBoolean rpc operation -->
+		<operation name="echoBoolean">
+			<soap11:operation soapAction="http://soapinterop.org/"/>
+			<input>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoString rpc operation -->
+		<operation name="echoString">
+			<soap11:operation soapAction="http://soapinterop.org/"/>
+			<input>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap11:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+	</binding>
+
+	<binding name="Soap12TestRpcLitBinding" type="tns:SoapTestPortTypeRpc">
+		<soap12:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+		<!-- echoStruct rpc operation -->
+		<operation name="echoStruct">
+			<soap12:operation/>
+			<input>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!--  echoStructArray rpc operation -->
+		<operation name="echoStructArray">
+			<soap12:operation/>
+			<input>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoStructAsSimpleTypes rpc operation -->
+		<operation name="echoStructAsSimpleTypes">
+			<soap12:operation/>
+			<input>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoSimpleTypesAsStruct rpc operation -->
+		<operation name="echoSimpleTypesAsStruct">
+			<soap12:operation/>
+			<input>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoNestedStruct rpc operation -->
+		<operation name="echoNestedStruct">
+			<soap12:operation/>
+			<input>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoNestedArray rpc operation -->
+		<operation name="echoNestedArray">
+			<soap12:operation/>
+			<input>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoStringArray rpc operation -->
+		<operation name="echoStringArray">
+			<soap12:operation/>
+			<input>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoIntegerArray rpc operation -->
+		<operation name="echoIntegerArray">
+			<soap12:operation/>
+			<input>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoBoolean rpc operation -->
+		<operation name="echoBoolean">
+			<soap12:operation/>
+			<input>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+		<!-- echoString rpc operation -->
+		<operation name="echoString">
+			<soap12:operation/>
+			<input>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</input>
+			<output>
+				<soap12:body use="literal" namespace="http://soapbuilders.org/rpc-lit-test" />
+			</output>
+		</operation>
+
+	</binding>
+
+	<service name="WhiteMesaSoapRpcLitTestSvc">
+
+  		<port name="Soap12TestRpcLitPort" binding="tns:Soap12TestRpcLitBinding">
+    			<soap12:address location="http://www.whitemesa.net/soap12/test-rpc-lit"/>
+  		</port>
+  		<port name="Soap11TestRpcLitPort" binding="tns:Soap11TestRpcLitBinding">
+    			<soap11:address location="http://www.whitemesa.net/test-rpc-lit"/>
+  		</port>
+
+	</service>
+
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/rpc/test_rpc.rb b/ruby_1_8_6/test/wsdl/rpc/test_rpc.rb
new file mode 100644
index 0000000000..7c4c3a7ad6
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/rpc/test_rpc.rb
@@ -0,0 +1,118 @@
+require 'test/unit'
+require 'wsdl/parser'
+require 'wsdl/soap/wsdl2ruby'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+
+
+module WSDL; module RPC
+
+
+class TestRPC < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::StandaloneServer
+    def on_init
+      self.generate_explicit_type = false
+      add_rpc_method(self, 'echo', 'arg1', 'arg2')
+      add_rpc_method(self, 'echo_err', 'arg1', 'arg2')
+    end
+  
+    DummyPerson = Struct.new("family-name".intern, :given_name)
+    def echo(arg1, arg2)
+      case arg1.family_name
+      when 'normal'
+        arg1.family_name = arg2.family_name
+        arg1.given_name = arg2.given_name
+        arg1.age = arg2.age
+        arg1
+      when 'dummy'
+        DummyPerson.new("family-name", "given_name")
+      else
+        raise
+      end
+    end
+  
+    ErrPerson = Struct.new(:given_name, :no_such_element)
+    def echo_err(arg1, arg2)
+      ErrPerson.new(58, Time.now)
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_classdef
+    @client = nil
+  end
+
+  def teardown
+    teardown_server
+    File.unlink(pathname('echo.rb'))
+    @client.reset_stream if @client
+  end
+
+  def setup_server
+    @server = Server.new('Test', "urn:rpc", '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_classdef
+    gen = WSDL::SOAP::WSDL2Ruby.new
+    gen.location = pathname("rpc.wsdl")
+    gen.basedir = DIR
+    gen.logger.level = Logger::FATAL
+    gen.opt['classdef'] = nil
+    gen.opt['force'] = true
+    gen.run
+    require pathname('echo')
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
+
+  def test_wsdl
+    wsdl = File.join(DIR, 'rpc.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+
+    ret = @client.echo(Person.new("normal", "", 12), Person.new("Hi", "Na", 21))
+    assert_equal(Person, ret.class)
+    assert_equal("Hi", ret.family_name)
+    assert_equal("Na", ret.given_name)
+    assert_equal(21, ret.age)
+
+    ret = @client.echo(Person.new("dummy", "", 12), Person.new("Hi", "Na", 21))
+    assert_equal(Person, ret.class)
+    assert_equal("family-name", ret.family_name)
+    assert_equal("given_name", ret.given_name)
+    assert_equal(nil, ret.age)
+
+    ret = @client.echo_err(Person.new("Na", "Hi"), Person.new("Hi", "Na"))
+    assert_equal(Person, ret.class)
+    assert_equal("58", ret.given_name)
+    assert_equal(nil, ret.family_name)
+    assert_equal(nil, ret.age)
+  end
+end
+
+
+end; end
diff --git a/ruby_1_8_6/test/wsdl/rpc/test_rpc_lit.rb b/ruby_1_8_6/test/wsdl/rpc/test_rpc_lit.rb
new file mode 100644
index 0000000000..080dbb82cf
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/rpc/test_rpc_lit.rb
@@ -0,0 +1,399 @@
+require 'test/unit'
+require 'wsdl/soap/wsdl2ruby'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+
+if defined?(HTTPAccess2) and defined?(OpenSSL)
+
+module WSDL; module RPC
+
+
+class TestRPCLIT < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::StandaloneServer
+    Namespace = "http://soapbuilders.org/rpc-lit-test"
+
+    def on_init
+      self.generate_explicit_type = false
+      add_rpc_operation(self, 
+        XSD::QName.new(Namespace, 'echoStringArray'),
+        nil,
+        'echoStringArray', [
+          ['in', 'inputStringArray', nil],
+          ['retval', 'return', nil]
+        ],
+        {
+          :request_style => :rpc,
+          :request_use => :literal,
+          :response_style => :rpc,
+          :response_use => :literal
+        }
+      )
+      add_rpc_operation(self, 
+        XSD::QName.new(Namespace, 'echoStringArrayInline'),
+        nil,
+        'echoStringArrayInline', [
+          ['in', 'inputStringArray', nil],
+          ['retval', 'return', nil]
+        ],
+        {
+          :request_style => :rpc,
+          :request_use => :literal,
+          :response_style => :rpc,
+          :response_use => :literal
+        }
+      )
+      add_rpc_operation(self, 
+        XSD::QName.new(Namespace, 'echoNestedStruct'),
+        nil,
+        'echoNestedStruct', [
+          ['in', 'inputNestedStruct', nil],
+          ['retval', 'return', nil]
+        ],
+        {
+          :request_style => :rpc,
+          :request_use => :literal,
+          :response_style => :rpc,
+          :response_use => :literal
+        }
+      )
+      add_rpc_operation(self, 
+        XSD::QName.new(Namespace, 'echoStructArray'),
+        nil,
+        'echoStructArray', [
+          ['in', 'inputStructArray', nil],
+          ['retval', 'return', nil]
+        ],
+        {
+          :request_style => :rpc,
+          :request_use => :literal,
+          :response_style => :rpc,
+          :response_use => :literal
+        }
+      )
+    end
+  
+    def echoStringArray(strings)
+      # strings.stringItem => Array
+      ArrayOfstring[*strings.stringItem]
+    end
+
+    def echoStringArrayInline(strings)
+      ArrayOfstringInline[*strings.stringItem]
+    end
+
+    def echoNestedStruct(struct)
+      struct
+    end
+
+    def echoStructArray(ary)
+      ary
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_classdef
+    @client = nil
+  end
+
+  def teardown
+    teardown_server
+    unless $DEBUG
+      File.unlink(pathname('RPC-Literal-TestDefinitions.rb'))
+      File.unlink(pathname('RPC-Literal-TestDefinitionsDriver.rb'))
+    end
+    @client.reset_stream if @client
+  end
+
+  def setup_server
+    @server = Server.new('Test', Server::Namespace, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_classdef
+    gen = WSDL::SOAP::WSDL2Ruby.new
+    gen.location = pathname("test-rpc-lit.wsdl")
+    gen.basedir = DIR
+    gen.logger.level = Logger::FATAL
+    gen.opt['classdef'] = nil
+    gen.opt['driver'] = nil
+    gen.opt['force'] = true
+    gen.run
+    backupdir = Dir.pwd
+    begin
+      Dir.chdir(DIR)
+      require pathname('RPC-Literal-TestDefinitions.rb')
+      require pathname('RPC-Literal-TestDefinitionsDriver.rb')
+    ensure
+      Dir.chdir(backupdir)
+    end
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
+
+  def test_wsdl_echoStringArray
+    wsdl = pathname('test-rpc-lit.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+    # response contains only 1 part.
+    result = @client.echoStringArray(ArrayOfstring["a", "b", "c"])[0]
+    assert_equal(["a", "b", "c"], result.stringItem)
+  end
+
+  ECHO_STRING_ARRAY_REQUEST =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:echoStringArray xmlns:n1="http://soapbuilders.org/rpc-lit-test">
+      <inputStringArray xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
+        <n2:stringItem>a</n2:stringItem>
+        <n2:stringItem>b</n2:stringItem>
+        <n2:stringItem>c</n2:stringItem>
+      </inputStringArray>
+    </n1:echoStringArray>
+  </env:Body>
+</env:Envelope>]
+
+  ECHO_STRING_ARRAY_RESPONSE =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:echoStringArrayResponse xmlns:n1="http://soapbuilders.org/rpc-lit-test">
+      <return xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
+        <n2:stringItem>a</n2:stringItem>
+        <n2:stringItem>b</n2:stringItem>
+        <n2:stringItem>c</n2:stringItem>
+      </return>
+    </n1:echoStringArrayResponse>
+  </env:Body>
+</env:Envelope>]
+
+  def test_stub_echoStringArray
+    drv = SoapTestPortTypeRpc.new("http://localhost:#{Port}/")
+    drv.wiredump_dev = str = ''
+    # response contains only 1 part.
+    result = drv.echoStringArray(ArrayOfstring["a", "b", "c"])[0]
+    assert_equal(["a", "b", "c"], result.stringItem)
+    assert_equal(ECHO_STRING_ARRAY_REQUEST, parse_requestxml(str))
+    assert_equal(ECHO_STRING_ARRAY_RESPONSE, parse_responsexml(str))
+  end
+
+  ECHO_STRING_ARRAY_INLINE_REQUEST =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:echoStringArrayInline xmlns:n1="http://soapbuilders.org/rpc-lit-test">
+      <inputStringArray>
+        <stringItem>a</stringItem>
+        <stringItem>b</stringItem>
+        <stringItem>c</stringItem>
+      </inputStringArray>
+    </n1:echoStringArrayInline>
+  </env:Body>
+</env:Envelope>]
+
+  ECHO_STRING_ARRAY_INLINE_RESPONSE =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:echoStringArrayInlineResponse xmlns:n1="http://soapbuilders.org/rpc-lit-test">
+      <return>
+        <stringItem>a</stringItem>
+        <stringItem>b</stringItem>
+        <stringItem>c</stringItem>
+      </return>
+    </n1:echoStringArrayInlineResponse>
+  </env:Body>
+</env:Envelope>]
+
+  def test_stub_echoStringArrayInline
+    drv = SoapTestPortTypeRpc.new("http://localhost:#{Port}/")
+    drv.wiredump_dev = str = ''
+    # response contains only 1 part.
+    result = drv.echoStringArrayInline(ArrayOfstringInline["a", "b", "c"])[0]
+    assert_equal(["a", "b", "c"], result.stringItem)
+    assert_equal(ECHO_STRING_ARRAY_INLINE_REQUEST, parse_requestxml(str))
+    assert_equal(ECHO_STRING_ARRAY_INLINE_RESPONSE, parse_responsexml(str))
+  end
+
+  ECHO_NESTED_STRUCT_REQUEST =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:echoNestedStruct xmlns:n1="http://soapbuilders.org/rpc-lit-test">
+      <inputStruct xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
+        <varString>str</varString>
+        <varInt>1</varInt>
+        <varFloat>+1</varFloat>
+        <n2:structItem>
+          <varString>str</varString>
+          <varInt>1</varInt>
+          <varFloat>+1</varFloat>
+        </n2:structItem>
+      </inputStruct>
+    </n1:echoNestedStruct>
+  </env:Body>
+</env:Envelope>]
+
+  ECHO_NESTED_STRUCT_RESPONSE =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:echoNestedStructResponse xmlns:n1="http://soapbuilders.org/rpc-lit-test">
+      <return xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
+        <varString>str</varString>
+        <varInt>1</varInt>
+        <varFloat>+1</varFloat>
+        <n2:structItem>
+          <varString>str</varString>
+          <varInt>1</varInt>
+          <varFloat>+1</varFloat>
+        </n2:structItem>
+      </return>
+    </n1:echoNestedStructResponse>
+  </env:Body>
+</env:Envelope>]
+
+  def test_wsdl_echoNestedStruct
+    wsdl = pathname('test-rpc-lit.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = str = ''
+    # response contains only 1 part.
+    result = @client.echoNestedStruct(SOAPStructStruct.new("str", 1, 1.0, SOAPStruct.new("str", 1, 1.0)))[0]
+    assert_equal('str', result.varString)
+    assert_equal('1', result.varInt)
+    assert_equal('+1', result.varFloat)
+    assert_equal('str', result.structItem.varString)
+    assert_equal('1', result.structItem.varInt)
+    assert_equal('+1', result.structItem.varFloat)
+    assert_equal(ECHO_NESTED_STRUCT_REQUEST, parse_requestxml(str))
+    assert_equal(ECHO_NESTED_STRUCT_RESPONSE, parse_responsexml(str))
+  end
+
+  def test_stub_echoNestedStruct
+    drv = SoapTestPortTypeRpc.new("http://localhost:#{Port}/")
+    drv.wiredump_dev = str = ''
+    # response contains only 1 part.
+    result = drv.echoNestedStruct(SOAPStructStruct.new("str", 1, 1.0, SOAPStruct.new("str", 1, 1.0)))[0]
+    assert_equal('str', result.varString)
+    assert_equal('1', result.varInt)
+    assert_equal('+1', result.varFloat)
+    assert_equal('str', result.structItem.varString)
+    assert_equal('1', result.structItem.varInt)
+    assert_equal('+1', result.structItem.varFloat)
+    assert_equal(ECHO_NESTED_STRUCT_REQUEST, parse_requestxml(str))
+    assert_equal(ECHO_NESTED_STRUCT_RESPONSE, parse_responsexml(str))
+  end
+
+  ECHO_STRUCT_ARRAY_REQUEST =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:echoStructArray xmlns:n1="http://soapbuilders.org/rpc-lit-test">
+      <inputStructArray xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
+        <n2:structItem>
+          <varString>str</varString>
+          <varInt>2</varInt>
+          <varFloat>+2.1</varFloat>
+        </n2:structItem>
+        <n2:structItem>
+          <varString>str</varString>
+          <varInt>2</varInt>
+          <varFloat>+2.1</varFloat>
+        </n2:structItem>
+      </inputStructArray>
+    </n1:echoStructArray>
+  </env:Body>
+</env:Envelope>]
+
+  ECHO_STRUCT_ARRAY_RESPONSE =
+%q[<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <n1:echoStructArrayResponse xmlns:n1="http://soapbuilders.org/rpc-lit-test">
+      <return xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
+        <n2:structItem>
+          <varString>str</varString>
+          <varInt>2</varInt>
+          <varFloat>+2.1</varFloat>
+        </n2:structItem>
+        <n2:structItem>
+          <varString>str</varString>
+          <varInt>2</varInt>
+          <varFloat>+2.1</varFloat>
+        </n2:structItem>
+      </return>
+    </n1:echoStructArrayResponse>
+  </env:Body>
+</env:Envelope>]
+
+  def test_wsdl_echoStructArray
+    wsdl = pathname('test-rpc-lit.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = str = ''
+    # response contains only 1 part.
+    e = SOAPStruct.new("str", 2, 2.1)
+    result = @client.echoStructArray(ArrayOfSOAPStruct[e, e])
+    assert_equal(ECHO_STRUCT_ARRAY_REQUEST, parse_requestxml(str))
+    assert_equal(ECHO_STRUCT_ARRAY_RESPONSE, parse_responsexml(str))
+  end
+
+  def test_stub_echoStructArray
+    drv = SoapTestPortTypeRpc.new("http://localhost:#{Port}/")
+    drv.wiredump_dev = str = ''
+    # response contains only 1 part.
+    e = SOAPStruct.new("str", 2, 2.1)
+    result = drv.echoStructArray(ArrayOfSOAPStruct[e, e])
+    assert_equal(ECHO_STRUCT_ARRAY_REQUEST, parse_requestxml(str))
+    assert_equal(ECHO_STRUCT_ARRAY_RESPONSE, parse_responsexml(str))
+  end
+
+  def parse_requestxml(str)
+    str.split(/\r?\n\r?\n/)[3]
+  end
+
+  def parse_responsexml(str)
+    str.split(/\r?\n\r?\n/)[6]
+  end
+end
+
+
+end; end
+
+end
diff --git a/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedClient.rb b/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedClient.rb
new file mode 100644
index 0000000000..55eb58c3dd
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedClient.rb
@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+require 'echo_versionDriver.rb'
+
+endpoint_url = ARGV.shift
+obj = Echo_version_port_type.new(endpoint_url)
+
+# run ruby with -d to see SOAP wiredumps.
+obj.wiredump_dev = STDERR if $DEBUG
+
+# SYNOPSIS
+#   echo_version(version)
+#
+# ARGS
+#   version         Version - {urn:example.com:simpletype-rpc-type}version
+#
+# RETURNS
+#   version_struct  Version_struct - {urn:example.com:simpletype-rpc-type}version_struct
+#
+version = nil
+puts obj.echo_version(version)
+
+# SYNOPSIS
+#   echo_version_r(version_struct)
+#
+# ARGS
+#   version_struct  Version_struct - {urn:example.com:simpletype-rpc-type}version_struct
+#
+# RETURNS
+#   version         Version - {urn:example.com:simpletype-rpc-type}version
+#
+version_struct = nil
+puts obj.echo_version_r(version_struct)
+
+
diff --git a/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedDriver.rb b/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedDriver.rb
new file mode 100644
index 0000000000..81c72d1acf
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedDriver.rb
@@ -0,0 +1,62 @@
+require 'echo_version.rb'
+
+require 'soap/rpc/driver'
+
+class Echo_version_port_type < ::SOAP::RPC::Driver
+  DefaultEndpointUrl = "http://localhost:10080"
+  MappingRegistry = ::SOAP::Mapping::Registry.new
+
+  MappingRegistry.set(
+    Version_struct,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("urn:example.com:simpletype-rpc-type", "version_struct") }
+  )
+
+  Methods = [
+    [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version"),
+      "urn:example.com:simpletype-rpc",
+      "echo_version",
+      [ ["in", "version", ["::SOAP::SOAPString"]],
+        ["retval", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]] ],
+      { :request_style =>  :rpc, :request_use =>  :encoded,
+        :response_style => :rpc, :response_use => :encoded }
+    ],
+    [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version_r"),
+      "urn:example.com:simpletype-rpc",
+      "echo_version_r",
+      [ ["in", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]],
+        ["retval", "version", ["::SOAP::SOAPString"]] ],
+      { :request_style =>  :rpc, :request_use =>  :encoded,
+        :response_style => :rpc, :response_use => :encoded }
+    ]
+  ]
+
+  def initialize(endpoint_url = nil)
+    endpoint_url ||= DefaultEndpointUrl
+    super(endpoint_url, nil)
+    self.mapping_registry = MappingRegistry
+    init_methods
+  end
+
+private
+
+  def init_methods
+    Methods.each do |definitions|
+      opt = definitions.last
+      if opt[:request_style] == :document
+        add_document_operation(*definitions)
+      else
+        add_rpc_operation(*definitions)
+        qname = definitions[0]
+        name = definitions[2]
+        if qname.name != name and qname.name.capitalize == name.capitalize
+          ::SOAP::Mapping.define_singleton_method(self, qname.name) do |*arg|
+            __send__(name, *arg)
+          end
+        end
+      end
+    end
+  end
+end
+
diff --git a/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedEchoVersion.rb b/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedEchoVersion.rb
new file mode 100644
index 0000000000..806ece1626
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedEchoVersion.rb
@@ -0,0 +1,23 @@
+require 'xsd/qname'
+
+# {urn:example.com:simpletype-rpc-type}version_struct
+class Version_struct
+  @@schema_type = "version_struct"
+  @@schema_ns = "urn:example.com:simpletype-rpc-type"
+  @@schema_element = [["version", ["SOAP::SOAPString", XSD::QName.new(nil, "version")]], ["msg", ["SOAP::SOAPString", XSD::QName.new(nil, "msg")]]]
+
+  attr_accessor :version
+  attr_accessor :msg
+
+  def initialize(version = nil, msg = nil)
+    @version = version
+    @msg = msg
+  end
+end
+
+# {urn:example.com:simpletype-rpc-type}version
+module Version
+  C_16 = "1.6"
+  C_18 = "1.8"
+  C_19 = "1.9"
+end
diff --git a/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedServant.rb b/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedServant.rb
new file mode 100644
index 0000000000..81cf50218e
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedServant.rb
@@ -0,0 +1,32 @@
+require 'echo_version.rb'
+
+class Echo_version_port_type
+  # SYNOPSIS
+  #   echo_version(version)
+  #
+  # ARGS
+  #   version         Version - {urn:example.com:simpletype-rpc-type}version
+  #
+  # RETURNS
+  #   version_struct  Version_struct - {urn:example.com:simpletype-rpc-type}version_struct
+  #
+  def echo_version(version)
+    p [version]
+    raise NotImplementedError.new
+  end
+
+  # SYNOPSIS
+  #   echo_version_r(version_struct)
+  #
+  # ARGS
+  #   version_struct  Version_struct - {urn:example.com:simpletype-rpc-type}version_struct
+  #
+  # RETURNS
+  #   version         Version - {urn:example.com:simpletype-rpc-type}version
+  #
+  def echo_version_r(version_struct)
+    p [version_struct]
+    raise NotImplementedError.new
+  end
+end
+
diff --git a/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedService.rb b/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedService.rb
new file mode 100644
index 0000000000..be6f996562
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/simpletype/rpc/expectedService.rb
@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+require 'echo_versionServant.rb'
+
+require 'soap/rpc/standaloneServer'
+require 'soap/mapping/registry'
+
+class Echo_version_port_type
+  MappingRegistry = ::SOAP::Mapping::Registry.new
+
+  MappingRegistry.set(
+    Version_struct,
+    ::SOAP::SOAPStruct,
+    ::SOAP::Mapping::Registry::TypedStructFactory,
+    { :type => XSD::QName.new("urn:example.com:simpletype-rpc-type", "version_struct") }
+  )
+
+  Methods = [
+    [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version"),
+      "urn:example.com:simpletype-rpc",
+      "echo_version",
+      [ ["in", "version", ["::SOAP::SOAPString"]],
+        ["retval", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]] ],
+      { :request_style =>  :rpc, :request_use =>  :encoded,
+        :response_style => :rpc, :response_use => :encoded }
+    ],
+    [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version_r"),
+      "urn:example.com:simpletype-rpc",
+      "echo_version_r",
+      [ ["in", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]],
+        ["retval", "version", ["::SOAP::SOAPString"]] ],
+      { :request_style =>  :rpc, :request_use =>  :encoded,
+        :response_style => :rpc, :response_use => :encoded }
+    ]
+  ]
+end
+
+class Echo_version_port_typeApp < ::SOAP::RPC::StandaloneServer
+  def initialize(*arg)
+    super(*arg)
+    servant = Echo_version_port_type.new
+    Echo_version_port_type::Methods.each do |definitions|
+      opt = definitions.last
+      if opt[:request_style] == :document
+        @router.add_document_operation(servant, *definitions)
+      else
+        @router.add_rpc_operation(servant, *definitions)
+      end
+    end
+    self.mapping_registry = Echo_version_port_type::MappingRegistry
+  end
+end
+
+if $0 == __FILE__
+  # Change listen port.
+  server = Echo_version_port_typeApp.new('app', nil, '0.0.0.0', 10080)
+  trap(:INT) do
+    server.shutdown
+  end
+  server.start
+end
diff --git a/ruby_1_8_6/test/wsdl/simpletype/rpc/rpc.wsdl b/ruby_1_8_6/test/wsdl/simpletype/rpc/rpc.wsdl
new file mode 100644
index 0000000000..91f71a8831
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/simpletype/rpc/rpc.wsdl
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name="echo_version"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:tns="urn:example.com:simpletype-rpc"
+    xmlns:txd="urn:example.com:simpletype-rpc-type"
+    targetNamespace="urn:example.com:simpletype-rpc"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema targetNamespace="urn:example.com:simpletype-rpc-type">
+      <xsd:complexType name="version_struct">
+	<xsd:all>
+	  <xsd:element name="version" type="txd:version" />
+	  <xsd:element name="msg" type="xsd:string" />
+	</xsd:all>
+      </xsd:complexType>
+
+      <xsd:simpleType name="version">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="1.6"/>
+          <xsd:enumeration value="1.8"/>
+          <xsd:enumeration value="1.9"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:schema>
+  </types>
+
+  <message name="msg_version">
+    <part name="version" type="txd:version"/>
+  </message>
+
+  <message name="msg_version_struct">
+    <part name="version_struct" type="txd:version_struct"/>
+  </message>
+
+  <portType name="echo_version_port_type">
+    <operation name="echo_version">
+      <input message="tns:msg_version"/>
+      <output message="tns:msg_version_struct"/>
+    </operation>
+
+    <operation name="echo_version_r">
+      <input message="tns:msg_version_struct"/>
+      <output message="tns:msg_version"/>
+    </operation>
+  </portType>
+
+  <binding name="echo_version_binding" type="tns:echo_version_port_type">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+    <operation name="echo_version">
+      <soap:operation soapAction="urn:example.com:simpletype-rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="urn:example.com:simpletype-rpc"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="urn:example.com:simpletype-rpc"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+
+    <operation name="echo_version_r">
+      <soap:operation soapAction="urn:example.com:simpletype-rpc"/>
+      <input>
+        <soap:body use="encoded" namespace="urn:example.com:simpletype-rpc"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </input>
+      <output>
+        <soap:body use="encoded" namespace="urn:example.com:simpletype-rpc"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </output>
+    </operation>
+  </binding>
+
+  <service name="echo_version_service">
+    <port name="echo_version_port" binding="tns:echo_version_binding">
+      <soap:address location="http://localhost:10080"/>
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/simpletype/rpc/test_rpc.rb b/ruby_1_8_6/test/wsdl/simpletype/rpc/test_rpc.rb
new file mode 100644
index 0000000000..fdd55552d0
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/simpletype/rpc/test_rpc.rb
@@ -0,0 +1,62 @@
+require 'test/unit'
+require 'wsdl/parser'
+require 'wsdl/soap/wsdl2ruby'
+
+
+module WSDL; module SimpleType
+
+
+class TestRPC < Test::Unit::TestCase
+  DIR = File.dirname(File.expand_path(__FILE__))
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
+
+  def test_rpc
+    gen = WSDL::SOAP::WSDL2Ruby.new
+    gen.location = pathname("rpc.wsdl")
+    gen.basedir = DIR
+    gen.logger.level = Logger::FATAL
+    gen.opt['classdef'] = nil
+    gen.opt['driver'] = nil
+    gen.opt['client_skelton'] = nil
+    gen.opt['servant_skelton'] = nil
+    gen.opt['standalone_server_stub'] = nil
+    gen.opt['force'] = true
+    suppress_warning do
+      gen.run
+    end
+    compare("expectedEchoVersion.rb", "echo_version.rb")
+    compare("expectedDriver.rb", "echo_versionDriver.rb")
+    compare("expectedService.rb", "echo_version_service.rb")
+    compare("expectedClient.rb", "echo_version_serviceClient.rb")
+    compare("expectedServant.rb", "echo_versionServant.rb")
+
+    File.unlink(pathname("echo_version.rb"))
+    File.unlink(pathname("echo_versionDriver.rb"))
+    File.unlink(pathname("echo_version_service.rb"))
+    File.unlink(pathname("echo_version_serviceClient.rb"))
+    File.unlink(pathname("echo_versionServant.rb"))
+  end
+
+  def compare(expected, actual)
+    assert_equal(loadfile(expected), loadfile(actual), actual)
+  end
+
+  def loadfile(file)
+    File.open(pathname(file)) { |f| f.read }
+  end
+
+  def suppress_warning
+    back = $VERBOSE
+    $VERBOSE = nil
+    begin
+      yield
+    ensure
+      $VERBOSE = back
+    end
+  end
+end
+
+
+end; end
diff --git a/ruby_1_8_6/test/wsdl/simpletype/simpletype.wsdl b/ruby_1_8_6/test/wsdl/simpletype/simpletype.wsdl
new file mode 100644
index 0000000000..623969c794
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/simpletype/simpletype.wsdl
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name="ping_service"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:tns="urn:example.com:simpletype"
+    targetNamespace="urn:example.com:simpletype"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema targetNamespace="urn:example.com:simpletype">
+      <xsd:element name="ruby">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element minOccurs="1" maxOccurs="1" name="myversion" type="tns:myversion"/>
+            <xsd:element minOccurs="0" maxOccurs="1" name="date" type="xsd:dateTime"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:simpleType name="myversion">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="1.6"/>
+          <xsd:enumeration value="1.8"/>
+          <xsd:enumeration value="1.9"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+
+      <xsd:element name="myid" type="tns:ID"/>
+
+      <xsd:simpleType name="ID">
+        <xsd:restriction base="xsd:string">
+          <xsd:length value="18"/>
+          <xsd:pattern value='[a-zA-Z0-9]{18}'/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:schema>
+  </types>
+
+  <message name="ping_in">
+    <part name="parameters" element="tns:ruby"/>
+  </message>
+
+  <message name="ping_out">
+    <part name="parameters" type="xsd:string"/>
+  </message>
+
+  <message name="ping_id_in">
+    <part name="parameters" element="tns:myid"/>
+  </message>
+
+  <message name="ping_id_out">
+    <part name="parameters" element="tns:myid"/>
+  </message>
+
+  <message name="versionmsg">
+    <part name="myversion" element="tns:myversion"/>
+  </message>
+
+  <portType name="ping_port_type">
+    <operation name="ping">
+      <input message="tns:ping_in"/>
+      <output message="tns:ping_out"/>
+    </operation>
+
+    <operation name="ping_id">
+      <input message="tns:ping_id_in"/>
+      <output message="tns:ping_id_out"/>
+    </operation>
+
+    <operation name="echo_version">
+      <input message="tns:versionmsg"/>
+      <output message="tns:versionmsg"/>
+    </operation>
+  </portType>
+
+  <binding name="ping_binding" type="tns:ping_port_type">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <operation name="ping">
+      <soap:operation soapAction="urn:example.com:simpletype:ping" style="document"/>
+      <input><soap:body use="literal"/></input>
+      <output><soap:body use="literal"/></output>
+    </operation>
+
+    <operation name="ping_id">
+      <soap:operation soapAction="urn:example.com:simpletype:ping_id" style="document"/>
+      <input><soap:body use="literal"/></input>
+      <output><soap:body use="literal"/></output>
+    </operation>
+  </binding>
+
+  <service name="ping_service">
+    <port name="ping_port" binding="tns:ping_binding">
+      <soap:address location="http://localhost:10080"/>
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/simpletype/test_simpletype.rb b/ruby_1_8_6/test/wsdl/simpletype/test_simpletype.rb
new file mode 100644
index 0000000000..7e644c3042
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/simpletype/test_simpletype.rb
@@ -0,0 +1,99 @@
+require 'test/unit'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+
+
+module WSDL
+module SimpleType
+
+
+class TestSimpleType < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::StandaloneServer
+    def on_init
+      add_document_method(self, 'urn:example.com:simpletype:ping', 'ping',
+        XSD::QName.new('urn:example.com:simpletype', 'ruby'),
+        XSD::QName.new('http://www.w3.org/2001/XMLSchema', 'string'))
+      add_document_method(self, 'urn:example.com:simpletype:ping_id', 'ping_id',
+        XSD::QName.new('urn:example.com:simpletype', 'myid'),
+        XSD::QName.new('urn:example.com:simpletype', 'myid'))
+    end
+  
+    def ping(ruby)
+      version = ruby["myversion"]
+      date = ruby["date"]
+      "#{version} (#{date})"
+    end
+
+    def ping_id(id)
+      id
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = Server.new('Test', "urn:example.com:simpletype", '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @server_thread = start_server_thread(@server)
+  end
+
+  def setup_client
+    wsdl = File.join(DIR, 'simpletype.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.generate_explicit_type = false
+    @client.wiredump_dev = STDOUT if $DEBUG
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    t
+  end
+
+  def test_ping
+    ret = @client.ping({:myversion => "1.9", :date => "2004-01-01T00:00:00Z"})
+    assert_equal("1.9 (2004-01-01T00:00:00Z)", ret)
+  end
+
+  def test_ping_id
+    ret = @client.ping_id("012345678901234567")
+    assert_equal("012345678901234567", ret)
+    # length
+    assert_raise(XSD::ValueSpaceError) do
+      @client.ping_id("0123456789012345678")
+    end
+    # pattern
+    assert_raise(XSD::ValueSpaceError) do
+      @client.ping_id("01234567890123456;")
+    end
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/wsdl/soap/soapbodyparts.wsdl b/ruby_1_8_6/test/wsdl/soap/soapbodyparts.wsdl
new file mode 100644
index 0000000000..0e6da0ebee
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/soap/soapbodyparts.wsdl
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<definitions
+    name="soapbodyparts"
+    targetNamespace="urn:www.example.com:soapbodyparts:v1"
+    xmlns:tns="urn:www.example.com:soapbodyparts:v1"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+
+  <types>
+    <schema xmlns="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="urn:www.example.com:soapbodyparts:v1">
+      <import namespace = "http://schemas.xmlsoap.org/soap/encoding/"/>
+      <complexType name="StringArray">
+ 	<complexContent>
+	  <restriction base="soapenc:Array">
+	    <attribute ref="soapenc:arrayType" wsdl:arrayType="string[]"/>
+  	  </restriction>
+  	</complexContent>
+      </complexType>
+    </schema>
+  </types>
+
+  <message name="fooRequest">
+    <part name="param1" type="xsd:string"/>
+    <part name="param2" type="xsd:string"/>
+    <part name="param3" type="xsd:string"/>
+  </message>
+
+  <message name="fooResponse">
+    <part name="return" type="tns:StringArray"/>
+  </message>
+
+  <portType name="FooServicePortType">
+    <operation name="foo"
+	parameterOrder="param3 param2 param1">
+      <input message="tns:fooRequest"/>
+      <output message="tns:fooResponse"/>
+    </operation>
+    <operation name="bar"
+	parameterOrder="param1 param2 param3">
+      <input message="tns:fooRequest"/>
+      <output message="tns:fooResponse"/>
+    </operation>
+    <operation name="baz">
+      <input message="tns:fooRequest"/>
+      <output message="tns:fooResponse"/>
+    </operation>
+  </portType>
+
+  <binding name="FooServicePortBinding" type="tns:FooServicePortType">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="foo">
+      <soap:operation soapAction=""/>
+      <input>
+	<soap:body use="encoded"
+	    parts="param1 param3"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:www.example.com:soapbodyparts:v1"/>
+      </input>
+      <output>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:www.example.com:soapbodyparts:v1"/>
+      </output>
+    </operation>
+    <operation name="bar">
+      <soap:operation soapAction=""/>
+      <input>
+	<soap:body use="encoded"
+	    parts="param3 param2"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:www.example.com:soapbodyparts:v1"/>
+      </input>
+      <output>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:www.example.com:soapbodyparts:v1"/>
+      </output>
+    </operation>
+    <operation name="baz">
+      <soap:operation soapAction=""/>
+      <input>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:www.example.com:soapbodyparts:v1"/>
+      </input>
+      <output>
+	<soap:body use="encoded"
+	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+	    namespace="urn:www.example.com:soapbodyparts:v1"/>
+      </output>
+    </operation>
+  </binding>
+
+  <service name="FooService">
+    <port name="FooServicePort" binding="tns:FooServicePortBinding">
+      <soap:address location="http://raa.ruby-lang.org/soap/1.0.2/"/>
+    </port>
+  </service>
+</definitions>
diff --git a/ruby_1_8_6/test/wsdl/soap/test_soapbodyparts.rb b/ruby_1_8_6/test/wsdl/soap/test_soapbodyparts.rb
new file mode 100644
index 0000000000..291319aedf
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/soap/test_soapbodyparts.rb
@@ -0,0 +1,79 @@
+require 'test/unit'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+
+
+module WSDL
+module SOAP
+
+
+class TestSOAPBodyParts < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::StandaloneServer
+    def on_init
+      add_method(self, 'foo', 'p1', 'p2', 'p3')
+      add_method(self, 'bar', 'p1', 'p2', 'p3')
+      add_method(self, 'baz', 'p1', 'p2', 'p3')
+    end
+  
+    def foo(p1, p2, p3)
+      [p1, p2, p3]
+    end
+
+    alias bar foo
+
+    def baz(p1, p2, p3)
+      [p3, p2, p1]
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  Port = 17171
+
+  def setup
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = Server.new('Test', "urn:www.example.com:soapbodyparts:v1", '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      Thread.current.abort_on_exception = true
+      @server.start
+    }
+  end
+
+  def setup_client
+    wsdl = File.join(DIR, 'soapbodyparts.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDERR if $DEBUG
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @t.kill
+    @t.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  def test_soapbodyparts
+    assert_equal(["1", "2", "3"], @client.foo("1", "2", "3"))
+    assert_equal(["3", "2", "1"], @client.foo("3", "2", "1"))
+    assert_equal(["1", "2", "3"], @client.bar("1", "2", "3"))
+    assert_equal(["3", "2", "1"], @client.baz("1", "2", "3"))
+  end
+end
+
+
+end
+end
diff --git a/ruby_1_8_6/test/wsdl/test_emptycomplextype.rb b/ruby_1_8_6/test/wsdl/test_emptycomplextype.rb
new file mode 100644
index 0000000000..71d1b8641d
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/test_emptycomplextype.rb
@@ -0,0 +1,21 @@
+require 'test/unit'
+require 'wsdl/parser'
+
+
+module WSDL
+
+
+class TestWSDL < Test::Unit::TestCase
+  def setup
+    @file = File.join(File.dirname(File.expand_path(__FILE__)), 'emptycomplextype.wsdl')
+  end
+
+  def test_wsdl
+    @wsdl = WSDL::Parser.new.parse(File.open(@file) { |f| f.read })
+    assert(/\{urn:jp.gr.jin.rrr.example.emptycomplextype\}emptycomplextype/ =~ @wsdl.inspect)
+  end
+end
+
+
+
+end
diff --git a/ruby_1_8_6/test/wsdl/test_fault.rb b/ruby_1_8_6/test/wsdl/test_fault.rb
new file mode 100644
index 0000000000..ec414528ee
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/test_fault.rb
@@ -0,0 +1,51 @@
+require 'test/unit'
+require 'soap/processor'
+require 'soap/mapping'
+require 'soap/rpc/element'
+require 'wsdl/parser'
+
+
+module WSDL
+
+
+class TestFault < Test::Unit::TestCase
+  def setup
+    @xml =<<__EOX__
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <env:Fault xmlns:n1="http://schemas.xmlsoap.org/soap/encoding/"
+        env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <faultcode xsi:type="xsd:string">Server</faultcode>
+      <faultstring xsi:type="xsd:string">faultstring</faultstring>
+      <faultactor xsi:type="xsd:string">faultactor</faultactor>
+      <detail xmlns:n2="http://www.ruby-lang.org/xmlns/ruby/type/custom"
+          xsi:type="n2:SOAPException">
+	<excn_type_name xsi:type="xsd:string">type</excn_type_name>
+	<cause href="#id123"/>
+      </detail>
+    </env:Fault>
+    <cause id="id123" xsi:type="xsd:int">5</cause>
+  </env:Body>
+</env:Envelope>
+__EOX__
+  end
+
+  def test_by_wsdl
+    rpc_decode_typemap = WSDL::Definitions.soap_rpc_complextypes
+    opt = {}
+    opt[:default_encodingstyle] = ::SOAP::EncodingNamespace
+    opt[:decode_typemap] = rpc_decode_typemap
+    header, body = ::SOAP::Processor.unmarshal(@xml, opt)
+    fault = ::SOAP::Mapping.soap2obj(body.response)
+    assert_equal("Server", fault.faultcode)
+    assert_equal("faultstring", fault.faultstring)
+    assert_equal(URI.parse("faultactor"), fault.faultactor)
+    assert_equal(5, fault.detail.cause)
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/wsdl/test_multiplefault.rb b/ruby_1_8_6/test/wsdl/test_multiplefault.rb
new file mode 100644
index 0000000000..7004297dc9
--- /dev/null
+++ b/ruby_1_8_6/test/wsdl/test_multiplefault.rb
@@ -0,0 +1,39 @@
+require 'test/unit'
+require 'wsdl/parser'
+require 'wsdl/soap/classDefCreator'
+
+
+module WSDL
+
+
+class TestMultipleFault < Test::Unit::TestCase
+  def self.setup(filename)
+    @@filename = filename
+  end
+
+  def test_multiplefault
+    @wsdl = WSDL::Parser.new.parse(File.open(@@filename) { |f| f.read })
+    classdefstr = WSDL::SOAP::ClassDefCreator.new(@wsdl).dump
+    yield_eval_binding(classdefstr) do |b|
+      assert_equal(
+	WSDL::TestMultipleFault::AuthenticationError,
+	eval("AuthenticationError", b)
+      )
+      assert_equal(
+	WSDL::TestMultipleFault::AuthorizationError,
+	eval("AuthorizationError", b)
+      )
+    end
+  end
+
+  def yield_eval_binding(evaled)
+    b = binding
+    eval(evaled, b)
+    yield(b)
+  end
+end
+
+TestMultipleFault.setup(File.join(File.dirname(__FILE__), 'multiplefault.wsdl'))
+
+
+end
diff --git a/ruby_1_8_6/test/xmlrpc/data/bug_bool.expected b/ruby_1_8_6/test/xmlrpc/data/bug_bool.expected
new file mode 100644
index 0000000000..121e3a84ba
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/data/bug_bool.expected
@@ -0,0 +1,3 @@
+--- 
+- true
+- false
\ No newline at end of file
diff --git a/ruby_1_8_6/test/xmlrpc/data/bug_bool.xml b/ruby_1_8_6/test/xmlrpc/data/bug_bool.xml
new file mode 100644
index 0000000000..04ed00709e
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/data/bug_bool.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value><boolean>0</boolean></value>
+    </param>
+  </params>
+</methodResponse>
diff --git a/ruby_1_8_6/test/xmlrpc/data/bug_cdata.expected b/ruby_1_8_6/test/xmlrpc/data/bug_cdata.expected
new file mode 100644
index 0000000000..17d7861318
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/data/bug_cdata.expected
@@ -0,0 +1,3 @@
+--- 
+- true
+- test
\ No newline at end of file
diff --git a/ruby_1_8_6/test/xmlrpc/data/bug_cdata.xml b/ruby_1_8_6/test/xmlrpc/data/bug_cdata.xml
new file mode 100644
index 0000000000..ba990e04f1
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/data/bug_cdata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value><string><![CDATA[test]]></string></value>
+    </param>
+  </params>
+</methodResponse>
diff --git a/ruby_1_8_6/test/xmlrpc/data/bug_covert.expected b/ruby_1_8_6/test/xmlrpc/data/bug_covert.expected
new file mode 100644
index 0000000000..a9ac103c64
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/data/bug_covert.expected
@@ -0,0 +1,10 @@
+--- 
+- true
+- >
+  Site,SANs,Array
+
+  Configured Capacity,Array Reserved Capacity,Array Ava
+
+  ilable Capacity,Array % Reserved,Host Allocated,Host Used,Host Free,Host %
+
+  Used
diff --git a/ruby_1_8_6/test/xmlrpc/data/bug_covert.xml b/ruby_1_8_6/test/xmlrpc/data/bug_covert.xml
new file mode 100644
index 0000000000..1d9abd2a06
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/data/bug_covert.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"
+encoding="ISO-8859-1"?><methodResponse><params><param><value>Site,SANs,Array
+Configured Capacity,Array Reserved Capacity,Array Ava
+ilable Capacity,Array % Reserved,Host Allocated,Host Used,Host Free,Host %
+Used
+</value></param></params></methodResponse>
diff --git a/ruby_1_8_6/test/xmlrpc/data/datetime_iso8601.xml b/ruby_1_8_6/test/xmlrpc/data/datetime_iso8601.xml
new file mode 100644
index 0000000000..43d8da6c13
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/data/datetime_iso8601.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<methodResponse>
+  <params>
+    <param>
+      <value><dateTime.iso8601>20041105T01:15:23Z</dateTime.iso8601></value>
+    </param>
+  </params>
+</methodResponse>
diff --git a/ruby_1_8_6/test/xmlrpc/data/fault.xml b/ruby_1_8_6/test/xmlrpc/data/fault.xml
new file mode 100644
index 0000000000..041c464eb3
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/data/fault.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<methodResponse>
+  <fault>
+    <value><struct>
+      <member>
+        <name>faultCode</name>
+        <value><int>4</int></value>
+      </member>
+      <member>
+        <name>faultString</name>
+        <value>an error message</value>
+      </member>
+    </struct></value>
+  </fault>
+</methodResponse>
+
diff --git a/ruby_1_8_6/test/xmlrpc/data/value.expected b/ruby_1_8_6/test/xmlrpc/data/value.expected
new file mode 100644
index 0000000000..9463d02b13
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/data/value.expected
@@ -0,0 +1,7 @@
+--- 
+- Test
+- 
+  - Hallo Leute
+  - "   Hallo   "
+  - ''
+  - "   "
\ No newline at end of file
diff --git a/ruby_1_8_6/test/xmlrpc/data/value.xml b/ruby_1_8_6/test/xmlrpc/data/value.xml
new file mode 100644
index 0000000000..1978616099
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/data/value.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<methodCall>
+  <methodName>Test</methodName>
+  <params>
+    <param>
+      <value>Hallo Leute</value>
+    </param>
+    <param>
+      <value>   Hallo   </value>
+    </param>
+    <param>
+      <value></value>
+    </param>
+    <param>
+      <value>   </value>
+    </param>
+  </params>
+</methodCall>
+
+
+
+
diff --git a/ruby_1_8_6/test/xmlrpc/data/xml1.expected b/ruby_1_8_6/test/xmlrpc/data/xml1.expected
new file mode 100644
index 0000000000..ff96de8df3
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/data/xml1.expected
@@ -0,0 +1,243 @@
+--- 
+- true
+- 
+  - 
+    subscriber: MegaCorp
+    lastName: Baker
+    telephone1: 1-508-791-1267
+    telephone2: 1-800-445-2588
+    password: p1111
+    OID: "1"
+    email: hbaker@yahoo.com
+    adminId: hbaker
+    objectName: AdministratorDO
+  - 
+    subscriber: CornerStore
+    lastName: Dragon
+    telephone1: 1-781-789-9089
+    telephone2: 1-800-445-2588
+    password: p3333
+    OID: "3"
+    email: adragon@yahoo.com
+    adminId: adragon
+    objectName: AdministratorDO
+  - 
+    subscriber: Cyberdyne
+    lastName: Rodman
+    telephone1: 1-617-789-1890
+    telephone2: 1-800-445-2588
+    password: p4444
+    OID: "4"
+    email: mrodman@yahoo.com
+    adminId: mrodman
+    objectName: AdministratorDO
+  - 
+    subscriber: StarSports
+    lastName: Jordan
+    telephone1: 1-617-890-7897
+    telephone2: 1-800-445-2588
+    password: p5555
+    OID: "5"
+    email: mjordan@yahoo.com
+    adminId: mjordan
+    objectName: AdministratorDO
+  - 
+    subscriber: GreatBooks
+    lastName: Pippen
+    telephone1: 1-781-789-9876
+    telephone2: 1-800-445-2588
+    password: p6666
+    OID: "6"
+    email: gpippen@yahoo.com
+    adminId: gpippen
+    objectName: AdministratorDO
+  - 
+    subscriber: AxisChemicals
+    lastName: Andhrew
+    telephone1: 1-781-678-8970
+    telephone2: 1-800-445-2588
+    password: p7777
+    OID: "7"
+    email: aandrew@yahoo.com
+    adminId: aandrew
+    objectName: AdministratorDO
+  - 
+    subscriber: MediaShop
+    lastName: Vincent
+    telephone1: 1-786-897-8908
+    telephone2: 1-800-445-2588
+    password: p8888
+    OID: "8"
+    email: tvincent@yahoo.com
+    adminId: tvincent
+    objectName: AdministratorDO
+  - 
+    subscriber: SmartShop
+    lastName: Richard
+    telephone1: 1-508-789-6789
+    telephone2: 1-800-445-2588
+    password: p9999
+    OID: "9"
+    email: krichard@yahoo.com
+    adminId: krichard
+    objectName: AdministratorDO
+  - 
+    subscriber: HomeNeeds
+    lastName: Cornell
+    telephone1: 1-617-789-8979
+    telephone2: 1-800-445-2588
+    password: paaaa
+    OID: "10"
+    email: gconell@yahoo.com
+    adminId: gcornell
+    objectName: AdministratorDO
+  - 
+    subscriber: MegaCorp
+    lastName: HorstMann
+    telephone1: 1-508-791-1267
+    telephone2: 1-800-445-2588
+    password: p1111
+    OID: "11"
+    email: shorstmann@yahoo.com
+    adminId: shorstmann
+    objectName: AdministratorDO
+  - 
+    subscriber: CornerStore
+    lastName: Bob
+    telephone1: 1-781-789-9089
+    telephone2: 1-800-445-2588
+    password: p3333
+    OID: "13"
+    email: rbob@yahoo.com
+    adminId: rbob
+    objectName: AdministratorDO
+  - 
+    subscriber: Cyberdyne
+    lastName: Peter
+    telephone1: 1-617-789-1890
+    telephone2: 1-800-445-2588
+    password: p4444
+    OID: "14"
+    email: speter@yahoo.com
+    adminId: speter
+    objectName: AdministratorDO
+  - 
+    subscriber: StarSports
+    lastName: Novak
+    telephone1: 1-617-890-7897
+    telephone2: 1-800-445-2588
+    password: p5555
+    OID: "15"
+    email: pnovak@yahoo.com
+    adminId: pnovak
+    objectName: AdministratorDO
+  - 
+    subscriber: GreatBooks
+    lastName: Nancy
+    telephone1: 1-781-789-9876
+    telephone2: 1-800-445-2588
+    password: p6666
+    OID: "16"
+    email: pnancy@yahoo.com
+    adminId: pnancy
+    objectName: AdministratorDO
+  - 
+    subscriber: AxisChemicals
+    lastName: Michel
+    telephone1: 1-781-678-8970
+    telephone2: 1-800-445-2588
+    password: p7777
+    OID: "17"
+    email: hmichel@yahoo.com
+    adminId: hmichel
+    objectName: AdministratorDO
+  - 
+    subscriber: MediaShop
+    lastName: David
+    telephone1: 1-786-897-8908
+    telephone2: 1-800-445-2588
+    password: p8888
+    OID: "18"
+    email: kdavid@yahoo.com
+    adminId: kdavid
+    objectName: AdministratorDO
+  - 
+    subscriber: SmartShop
+    lastName: Valnoor
+    telephone1: 1-508-789-6789
+    telephone2: 1-800-445-2588
+    password: p9999
+    OID: "19"
+    email: pvalnoor@yahoo.com
+    adminId: pvalnoor
+    objectName: AdministratorDO
+  - 
+    subscriber: HomeNeeds
+    lastName: Smith
+    telephone1: 1-617-789-8979
+    telephone2: 1-800-445-2588
+    password: paaaa
+    OID: "20"
+    email: wsmith@yahoo.com
+    adminId: wsmith
+    objectName: AdministratorDO
+  - 
+    subscriber: MegaCorp
+    lastName: Caral
+    telephone1: 1-781-789-9876
+    telephone2: 1-800-445-2588
+    password: p6666
+    OID: "21"
+    email: gcaral@yahoo.com
+    adminId: gcaral
+    objectName: AdministratorDO
+  - 
+    subscriber: CornerStore
+    lastName: Hillary
+    telephone1: 1-786-897-8908
+    telephone2: 1-800-445-2588
+    password: p8888
+    OID: "23"
+    email: phillary@yahoo.com
+    adminId: phillary
+    objectName: AdministratorDO
+  - 
+    subscriber: Cyberdyne
+    lastName: Philip
+    telephone1: 1-508-789-6789
+    telephone2: 1-800-445-2588
+    password: p9999
+    OID: "24"
+    email: bphilip@yahoo.com
+    adminId: bphilip
+    objectName: AdministratorDO
+  - 
+    subscriber: StarSports
+    lastName: Andrea
+    telephone1: 1-617-789-8979
+    telephone2: 1-800-445-2588
+    password: paaaa
+    OID: "25"
+    email: sandrea@yahoo.com
+    adminId: sandrea
+    objectName: AdministratorDO
+  - 
+    subscriber: s4
+    lastName: "null"
+    telephone1: "null"
+    telephone2: "null"
+    password: s4
+    OID: "26"
+    email: "null"
+    adminId: s4
+    objectName: AdministratorDO
+  - 
+    subscriber: BigBank
+    lastName: administrator
+    telephone1: ''
+    telephone2: ''
+    password: admin
+    OID: "82"
+    email: ''
+    adminId: admin
+    objectName: AdministratorDO
\ No newline at end of file
diff --git a/ruby_1_8_6/test/xmlrpc/data/xml1.xml b/ruby_1_8_6/test/xmlrpc/data/xml1.xml
new file mode 100644
index 0000000000..10aa55483b
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/data/xml1.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><array><data><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>hbaker</value></member><member><name>email</name><value>hbaker@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-508-791-1267</value></member><member><name>OID</name><value>1</value></member><member><name>password</name><value>p1111</value></member><member><name>lastName</name><value>Baker</value></member><member><name>subscriber</name><value>MegaCorp</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>adragon</value></member><member><name>email</name><value>adragon@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-789-9089</value></member><member><name>OID</name><value>3</value></member><member><name>password</name><value>p3333</value></member><member><name>lastName</name><value>Dragon</value></member><member><name>subscriber</name><value>CornerStore</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>mrodman</value></member><member><name>email</name><value>mrodman@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-789-1890</value></member><member><name>OID</name><value>4</value></member><member><name>password</name><value>p4444</value></member><member><name>lastName</name><value>Rodman</value></member><member><name>subscriber</name><value>Cyberdyne</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>mjordan</value></member><member><name>email</name><value>mjordan@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-890-7897</value></member><member><name>OID</name><value>5</value></member><member><name>password</name><value>p5555</value></member><member><name>lastName</name><value>Jordan</value></member><member><name>subscriber</name><value>StarSports</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>gpippen</value></member><member><name>email</name><value>gpippen@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-789-9876</value></member><member><name>OID</name><value>6</value></member><member><name>password</name><value>p6666</value></member><member><name>lastName</name><value>Pippen</value></member><member><name>subscriber</name><value>GreatBooks</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>aandrew</value></member><member><name>email</name><value>aandrew@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-678-8970</value></member><member><name>OID</name><value>7</value></member><member><name>password</name><value>p7777</value></member><member><name>lastName</name><value>Andhrew</value></member><member><name>subscriber</name><value>AxisChemicals</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>tvincent</value></member><member><name>email</name><value>tvincent@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-786-897-8908</value></member><member><name>OID</name><value>8</value></member><member><name>password</name><value>p8888</value></member><member><name>lastName</name><value>Vincent</value></member><member><name>subscriber</name><value>MediaShop</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>krichard</value></member><member><name>email</name><value>krichard@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-508-789-6789</value></member><member><name>OID</name><value>9</value></member><member><name>password</name><value>p9999</value></member><member><name>lastName</name><value>Richard</value></member><member><name>subscriber</name><value>SmartShop</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>gcornell</value></member><member><name>email</name><value>gconell@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-789-8979</value></member><member><name>OID</name><value>10</value></member><member><name>password</name><value>paaaa</value></member><member><name>lastName</name><value>Cornell</value></member><member><name>subscriber</name><value>HomeNeeds</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>shorstmann</value></member><member><name>email</name><value>shorstmann@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-508-791-1267</value></member><member><name>OID</name><value>11</value></member><member><name>password</name><value>p1111</value></member><member><name>lastName</name><value>HorstMann</value></member><member><name>subscriber</name><value>MegaCorp</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>rbob</value></member><member><name>email</name><value>rbob@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-789-9089</value></member><member><name>OID</name><value>13</value></member><member><name>password</name><value>p3333</value></member><member><name>lastName</name><value>Bob</value></member><member><name>subscriber</name><value>CornerStore</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>speter</value></member><member><name>email</name><value>speter@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-789-1890</value></member><member><name>OID</name><value>14</value></member><member><name>password</name><value>p4444</value></member><member><name>lastName</name><value>Peter</value></member><member><name>subscriber</name><value>Cyberdyne</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>pnovak</value></member><member><name>email</name><value>pnovak@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-890-7897</value></member><member><name>OID</name><value>15</value></member><member><name>password</name><value>p5555</value></member><member><name>lastName</name><value>Novak</value></member><member><name>subscriber</name><value>StarSports</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>pnancy</value></member><member><name>email</name><value>pnancy@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-789-9876</value></member><member><name>OID</name><value>16</value></member><member><name>password</name><value>p6666</value></member><member><name>lastName</name><value>Nancy</value></member><member><name>subscriber</name><value>GreatBooks</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>hmichel</value></member><member><name>email</name><value>hmichel@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-678-8970</value></member><member><name>OID</name><value>17</value></member><member><name>password</name><value>p7777</value></member><member><name>lastName</name><value>Michel</value></member><member><name>subscriber</name><value>AxisChemicals</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>kdavid</value></member><member><name>email</name><value>kdavid@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-786-897-8908</value></member><member><name>OID</name><value>18</value></member><member><name>password</name><value>p8888</value></member><member><name>lastName</name><value>David</value></member><member><name>subscriber</name><value>MediaShop</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>pvalnoor</value></member><member><name>email</name><value>pvalnoor@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-508-789-6789</value></member><member><name>OID</name><value>19</value></member><member><name>password</name><value>p9999</value></member><member><name>lastName</name><value>Valnoor</value></member><member><name>subscriber</name><value>SmartShop</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>wsmith</value></member><member><name>email</name><value>wsmith@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-789-8979</value></member><member><name>OID</name><value>20</value></member><member><name>password</name><value>paaaa</value></member><member><name>lastName</name><value>Smith</value></member><member><name>subscriber</name><value>HomeNeeds</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>gcaral</value></member><member><name>email</name><value>gcaral@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-781-789-9876</value></member><member><name>OID</name><value>21</value></member><member><name>password</name><value>p6666</value></member><member><name>lastName</name><value>Caral</value></member><member><name>subscriber</name><value>MegaCorp</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>phillary</value></member><member><name>email</name><value>phillary@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-786-897-8908</value></member><member><name>OID</name><value>23</value></member><member><name>password</name><value>p8888</value></member><member><name>lastName</name><value>Hillary</value></member><member><name>subscriber</name><value>CornerStore</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>bphilip</value></member><member><name>email</name><value>bphilip@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-508-789-6789</value></member><member><name>OID</name><value>24</value></member><member><name>password</name><value>p9999</value></member><member><name>lastName</name><value>Philip</value></member><member><name>subscriber</name><value>Cyberdyne</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>sandrea</value></member><member><name>email</name><value>sandrea@yahoo.com</value></member><member><name>telephone2</name><value>1-800-445-2588</value></member><member><name>telephone1</name><value>1-617-789-8979</value></member><member><name>OID</name><value>25</value></member><member><name>password</name><value>paaaa</value></member><member><name>lastName</name><value>Andrea</value></member><member><name>subscriber</name><value>StarSports</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>s4</value></member><member><name>email</name><value>null</value></member><member><name>telephone2</name><value>null</value></member><member><name>telephone1</name><value>null</value></member><member><name>OID</name><value>26</value></member><member><name>password</name><value>s4</value></member><member><name>lastName</name><value>null</value></member><member><name>subscriber</name><value>s4</value></member></struct></value><value><struct><member><name>objectName</name><value>AdministratorDO</value></member><member><name>adminId</name><value>admin</value></member><member><name>email</name><value></value></member><member><name>telephone2</name><value></value></member><member><name>telephone1</name><value></value></member><member><name>OID</name><value>82</value></member><member><name>password</name><value>admin</value></member><member><name>lastName</name><value>administrator</value></member><member><name>subscriber</name><value>BigBank</value></member></struct></value></data></array></value></param></params></methodResponse>
diff --git a/ruby_1_8_6/test/xmlrpc/test_datetime.rb b/ruby_1_8_6/test/xmlrpc/test_datetime.rb
new file mode 100644
index 0000000000..e38cea6f74
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/test_datetime.rb
@@ -0,0 +1,159 @@
+require 'test/unit'
+require "xmlrpc/datetime"
+
+class Test_DateTime < Test::Unit::TestCase
+
+  def test_new
+    dt = createDateTime()
+
+    assert_instance_of(XMLRPC::DateTime, dt)
+  end
+
+  def test_new_exception
+    assert_raises(ArgumentError) { XMLRPC::DateTime.new(4.5, 13, 32, 25, 60, 60) }
+    assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 12, 32, 25, 60, 60) }
+    assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 12, 31, 25, 60, 60) }
+    assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 12, 31, 24, 60, 60) }
+    assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 12, 31, 24, 59, 60) }
+    assert_nothing_raised(ArgumentError) { XMLRPC::DateTime.new(2001, 12, 31, 24, 59, 59) }
+
+    assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 0, 0, -1, -1, -1) }
+    assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 1, 0, -1, -1, -1) }
+    assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 1, 1, -1, -1, -1) }
+    assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 1, 1, 0, -1, -1) }
+    assert_raises(ArgumentError) { XMLRPC::DateTime.new(2001, 1, 1, 0, 0, -1) }
+    assert_nothing_raised(ArgumentError) { XMLRPC::DateTime.new(2001, 1, 1, 0, 0, 0) }
+  end
+
+
+  def test_get_values
+    y, m, d, h, mi, s = 1970, 3, 24, 12, 0, 5
+    dt = XMLRPC::DateTime.new(y, m, d, h, mi, s)
+
+    assert_equal(y, dt.year)
+    assert_equal(m, dt.month)
+    assert_equal(m, dt.mon)
+    assert_equal(d, dt.day)
+
+    assert_equal(h, dt.hour)
+    assert_equal(mi,dt.min)
+    assert_equal(s, dt.sec)
+  end
+
+  def test_set_values
+    dt = createDateTime()
+    y, m, d, h, mi, s = 1950, 12, 9, 8, 52, 30
+
+    dt.year  = y
+    dt.month = m
+    dt.day   = d
+    dt.hour  = h
+    dt.min   = mi
+    dt.sec   = s
+
+    assert_equal(y, dt.year)
+    assert_equal(m, dt.month)
+    assert_equal(m, dt.mon)
+    assert_equal(d, dt.day)
+
+    assert_equal(h, dt.hour)
+    assert_equal(mi,dt.min)
+    assert_equal(s, dt.sec)
+
+    dt.mon = 5
+    assert_equal(5, dt.month)
+    assert_equal(5, dt.mon)
+  end
+
+  def test_set_exception
+    dt = createDateTime()
+    
+    assert_raises(ArgumentError)    { dt.year = 4.5 }
+    assert_nothing_raised(ArgumentError) { dt.year = -2000 }
+ 
+    assert_raises(ArgumentError) { dt.month = 0 }
+    assert_raises(ArgumentError) { dt.month = 13 }
+    assert_nothing_raised(ArgumentError) { dt.month = 7 }
+
+    assert_raises(ArgumentError) { dt.mon = 0 }
+    assert_raises(ArgumentError) { dt.mon = 13 }
+    assert_nothing_raised(ArgumentError) { dt.mon = 7 }
+
+    assert_raises(ArgumentError) { dt.day = 0 }
+    assert_raises(ArgumentError) { dt.day = 32 }
+    assert_nothing_raised(ArgumentError) { dt.day = 16 }
+
+    assert_raises(ArgumentError) { dt.hour = -1 }
+    assert_raises(ArgumentError) { dt.hour = 25 }
+    assert_nothing_raised(ArgumentError) { dt.hour = 12 }
+
+    assert_raises(ArgumentError) { dt.min = -1 }
+    assert_raises(ArgumentError) { dt.min = 60 }
+    assert_nothing_raised(ArgumentError) { dt.min = 30 }
+
+    assert_raises(ArgumentError) { dt.sec = -1 }
+    assert_raises(ArgumentError) { dt.sec = 60 }
+    assert_nothing_raised(ArgumentError) { dt.sec = 30 }
+  end
+
+  def test_to_a
+    y, m, d, h, mi, s = 1970, 3, 24, 12, 0, 5
+    dt = XMLRPC::DateTime.new(y, m, d, h, mi, s)
+    a = dt.to_a 
+
+    assert_instance_of(Array, a)
+    assert_equal(6,  a.size, "Returned array has wrong size")
+
+    assert_equal(y,  a[0])
+    assert_equal(m,  a[1])
+    assert_equal(d,  a[2])
+    assert_equal(h,  a[3])
+    assert_equal(mi, a[4])
+    assert_equal(s,  a[5])
+  end
+
+  def test_to_time1
+    y, m, d, h, mi, s = 1970, 3, 24, 12, 0, 5
+    dt = XMLRPC::DateTime.new(y, m, d, h, mi, s)
+    time = dt.to_time 
+    
+    assert_not_nil(time)
+
+    assert_equal(y,  time.year)
+    assert_equal(m,  time.month)
+    assert_equal(d,  time.day)
+    assert_equal(h,  time.hour)
+    assert_equal(mi, time.min)
+    assert_equal(s,  time.sec)
+  end
+
+  def test_to_time2
+    dt = createDateTime()
+    dt.year = 1969
+    
+    assert_nil(dt.to_time)
+  end
+
+  def test_to_date1
+    y, m, d, h, mi, s = 1970, 3, 24, 12, 0, 5
+    dt = XMLRPC::DateTime.new(y, m, d, h, mi, s)
+    date = dt.to_date 
+ 
+    assert_equal(y, date.year)
+    assert_equal(m, date.month)
+    assert_equal(d, date.day)
+  end
+
+  def test_to_date2
+    dt = createDateTime()
+    dt.year = 666
+    
+    assert_equal(666, dt.to_date.year)
+  end
+
+
+  def createDateTime
+    XMLRPC::DateTime.new(1970, 3, 24, 12, 0, 5)
+  end
+
+end
diff --git a/ruby_1_8_6/test/xmlrpc/test_features.rb b/ruby_1_8_6/test/xmlrpc/test_features.rb
new file mode 100644
index 0000000000..96a6313202
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/test_features.rb
@@ -0,0 +1,48 @@
+require 'test/unit'
+require "xmlrpc/create"
+require "xmlrpc/parser"
+require "xmlrpc/config"
+
+class Test_Features < Test::Unit::TestCase
+
+  def setup
+    @params = [nil, {"test" => nil}, [nil, 1, nil]]
+  end
+
+  def test_nil_create
+    XMLRPC::XMLWriter.each_installed_writer do |writer|
+      c = XMLRPC::Create.new(writer)
+
+      XMLRPC::Config.module_eval {remove_const(:ENABLE_NIL_CREATE)}
+      XMLRPC::Config.const_set(:ENABLE_NIL_CREATE, false)
+      assert_raises(RuntimeError) { str = c.methodCall("test", *@params) }
+
+      XMLRPC::Config.module_eval {remove_const(:ENABLE_NIL_CREATE)}
+      XMLRPC::Config.const_set(:ENABLE_NIL_CREATE, true)
+      assert_nothing_raised { str = c.methodCall("test", *@params) }
+    end
+  end
+
+  def test_nil_parse
+    XMLRPC::Config.module_eval {remove_const(:ENABLE_NIL_CREATE)}
+    XMLRPC::Config.const_set(:ENABLE_NIL_CREATE, true)
+
+    XMLRPC::XMLWriter.each_installed_writer do |writer|
+      c = XMLRPC::Create.new(writer)
+      str = c.methodCall("test", *@params) 
+      XMLRPC::XMLParser.each_installed_parser do |parser|
+        para = nil
+
+        XMLRPC::Config.module_eval {remove_const(:ENABLE_NIL_PARSER)}
+        XMLRPC::Config.const_set(:ENABLE_NIL_PARSER, false)
+        assert_raises(RuntimeError) { para = parser.parseMethodCall(str) }
+
+        XMLRPC::Config.module_eval {remove_const(:ENABLE_NIL_PARSER)}
+        XMLRPC::Config.const_set(:ENABLE_NIL_PARSER, true)
+        assert_nothing_raised { para = parser.parseMethodCall(str) }
+        assert_equal(para[1], @params)
+      end
+    end
+  end
+
+end
diff --git a/ruby_1_8_6/test/xmlrpc/test_marshal.rb b/ruby_1_8_6/test/xmlrpc/test_marshal.rb
new file mode 100644
index 0000000000..38bc8c646f
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/test_marshal.rb
@@ -0,0 +1,93 @@
+require 'test/unit'
+require "xmlrpc/marshal"
+
+class Test_Marshal < Test::Unit::TestCase
+  # for test_parser_values
+  class Person
+    include XMLRPC::Marshallable
+    attr_reader :name
+    def initialize(name)
+      @name = name
+    end
+  end
+
+
+  def test1_dump_response
+    assert_nothing_raised(NameError) {
+      XMLRPC::Marshal.dump_response('arg')
+    }
+  end
+
+  def test1_dump_call
+    assert_nothing_raised(NameError) {
+      XMLRPC::Marshal.dump_call('methodName', 'arg')
+    }
+  end
+
+  def test2_dump_load_response
+    value = [1, 2, 3, {"test" => true}, 3.4]
+    res   = XMLRPC::Marshal.dump_response(value)
+
+    assert_equal(value, XMLRPC::Marshal.load_response(res))
+  end
+
+  def test2_dump_load_call
+    methodName = "testMethod"
+    value      = [1, 2, 3, {"test" => true}, 3.4]
+    exp        = [methodName, [value, value]]
+
+    res   = XMLRPC::Marshal.dump_call(methodName, value, value)
+
+    assert_equal(exp, XMLRPC::Marshal.load_call(res))
+  end
+
+  def test_parser_values
+    v1 = [ 
+      1, -7778,                        # integers
+      1.0, 0.0, -333.0, 2343434343.0,  # floats
+      false, true, true, false,        # booleans
+      "Hallo", "with < and >", ""      # strings
+    ]
+
+    v2 = [
+      [v1, v1, v1],
+      {"a" => v1}
+    ]
+
+    v3 = [
+      XMLRPC::Base64.new("\001"*1000), # base64
+      :aSymbol, :anotherSym            # symbols (-> string)
+    ]
+    v3_exp = [
+      "\001"*1000,
+      "aSymbol", "anotherSym"
+    ]
+    person = Person.new("Michael")
+
+    XMLRPC::XMLParser.each_installed_parser do |parser|
+      m = XMLRPC::Marshal.new(parser)
+
+      assert_equal( v1, m.load_response(m.dump_response(v1)) )
+      assert_equal( v2, m.load_response(m.dump_response(v2)) )
+      assert_equal( v3_exp, m.load_response(m.dump_response(v3)) )
+
+      pers = m.load_response(m.dump_response(person))
+      
+      assert( pers.is_a?(Person) )
+      assert( person.name == pers.name ) 
+    end
+
+    # missing, Date, Time, DateTime
+    # Struct
+  end
+
+  def test_no_params_tag
+    # bug found by Idan Sofer
+
+    expect = %{<?xml version="1.0" ?><methodCall><methodName>myMethod</methodName><params/></methodCall>\n}
+
+    str = XMLRPC::Marshal.dump_call("myMethod")
+    assert_equal(expect, str)
+  end
+
+end
diff --git a/ruby_1_8_6/test/xmlrpc/test_parser.rb b/ruby_1_8_6/test/xmlrpc/test_parser.rb
new file mode 100644
index 0000000000..44ca1f88b7
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/test_parser.rb
@@ -0,0 +1,85 @@
+require 'test/unit'
+require 'xmlrpc/datetime'
+require "xmlrpc/parser"
+require 'yaml'
+
+module GenericParserTest
+  def datafile(base)
+    File.join(File.dirname(__FILE__), "data", base)
+  end
+ 
+  def load_data(name)
+    [File.read(datafile(name) + ".xml"), YAML.load(File.read(datafile(name) + ".expected"))]
+  end
+
+  def setup
+    @xml1, @expected1 = load_data('xml1')
+    @xml2, @expected2 = load_data('bug_covert') 
+    @xml3, @expected3 = load_data('bug_bool') 
+    @xml4, @expected4 = load_data('value') 
+
+    @cdata_xml, @cdata_expected = load_data('bug_cdata')
+
+    @datetime_xml = File.read(datafile('datetime_iso8601.xml'))
+    @datetime_expected = XMLRPC::DateTime.new(2004, 11, 5, 1, 15, 23)
+
+    @fault_doc = File.read(datafile('fault.xml'))
+  end
+
+  # test parseMethodResponse --------------------------------------------------
+  
+  def test_parseMethodResponse1
+    assert_equal(@expected1, @p.parseMethodResponse(@xml1))
+  end
+
+  def test_parseMethodResponse2
+    assert_equal(@expected2, @p.parseMethodResponse(@xml2))
+  end
+
+  def test_parseMethodResponse3
+    assert_equal(@expected3, @p.parseMethodResponse(@xml3))
+  end
+
+  def test_cdata
+    assert_equal(@cdata_expected, @p.parseMethodResponse(@cdata_xml))
+  end
+
+  def test_dateTime
+    assert_equal(@datetime_expected, @p.parseMethodResponse(@datetime_xml)[1])
+  end
+
+  # test parseMethodCall ------------------------------------------------------
+
+  def test_parseMethodCall
+    assert_equal(@expected4, @p.parseMethodCall(@xml4))
+  end
+
+  # test fault ----------------------------------------------------------------
+
+  def test_fault
+    flag, fault = @p.parseMethodResponse(@fault_doc)
+     assert_equal(flag, false)
+     unless fault.is_a? XMLRPC::FaultException
+       assert(false, "must be an instance of class XMLRPC::FaultException")
+     end
+     assert_equal(fault.faultCode, 4)
+     assert_equal(fault.faultString, "an error message")
+  end
+end
+
+# create test class for each installed parser 
+XMLRPC::XMLParser.each_installed_parser do |parser|
+  klass = parser.class
+  name = klass.to_s.split("::").last
+
+  eval %{
+    class Test_#{name} < Test::Unit::TestCase
+      include GenericParserTest
+
+      def setup
+        super
+        @p = #{klass}.new
+      end
+    end
+  }
+end
diff --git a/ruby_1_8_6/test/xmlrpc/test_webrick_server.rb b/ruby_1_8_6/test/xmlrpc/test_webrick_server.rb
new file mode 100644
index 0000000000..4cd63cfa74
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/test_webrick_server.rb
@@ -0,0 +1,98 @@
+require 'test/unit'
+require 'webrick'
+require File.join(File.dirname(__FILE__), 'webrick_testing')
+require "xmlrpc/server"
+require 'xmlrpc/client'
+
+class Test_Webrick < Test::Unit::TestCase
+  include WEBrick_Testing
+
+  def create_servlet
+    s = XMLRPC::WEBrickServlet.new
+
+    s.add_handler("test.add") do |a,b|
+      a + b
+    end
+
+    s.add_handler("test.div") do |a,b|
+      if b == 0
+        raise XMLRPC::FaultException.new(1, "division by zero")
+      else
+        a / b 
+      end
+    end 
+
+    s.set_default_handler do |name, *args|
+      raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
+            " or wrong number of parameters!")
+    end
+
+    s.add_introspection
+
+    return s
+  end
+
+  def setup_http_server(port, use_ssl)
+    option = {
+      :Port => port, 
+      :SSLEnable => use_ssl,
+    }
+    if use_ssl
+      require 'webrick/https'
+      option.update(
+        :SSLVerifyClient => ::OpenSSL::SSL::VERIFY_NONE, 
+        :SSLCertName => []
+      )
+    end
+
+    start_server(option) {|w| w.mount('/RPC2', create_servlet) }
+
+    @s = XMLRPC::Client.new3(:port => port, :use_ssl => use_ssl)
+  end
+
+  PORT = 8070
+  def test_client_server
+    # NOTE: I don't enable SSL testing as this hangs
+    [false].each do |use_ssl|
+      begin
+        setup_http_server(PORT, use_ssl)
+        do_test
+      ensure
+        stop_server
+      end
+    end
+  end
+
+  def do_test
+    # simple call
+    assert_equal 9, @s.call('test.add', 4, 5)
+
+    # fault exception
+    assert_raises(XMLRPC::FaultException) { @s.call('test.div', 1, 0) }
+
+    # fault exception via call2
+    ok, param = @s.call2('test.div', 1, 0)
+    assert_equal false, ok
+    assert_instance_of XMLRPC::FaultException, param
+    assert_equal 1, param.faultCode
+    assert_equal 'division by zero', param.faultString
+
+    # call2 without fault exception
+    ok, param = @s.call2('test.div', 10, 5)
+    assert_equal true, ok
+    assert_equal param, 2
+
+    # introspection
+    assert_equal ["test.add", "test.div", "system.listMethods", "system.methodSignature", "system.methodHelp"], @s.call("system.listMethods")
+
+    # default handler (missing handler)
+    ok, param = @s.call2('test.nonexisting')
+    assert_equal false, ok
+    assert_equal -99, param.faultCode
+
+    # default handler (wrong number of arguments)
+    ok, param = @s.call2('test.add', 1, 2, 3)
+    assert_equal false, ok
+    assert_equal -99, param.faultCode
+  end
+end
diff --git a/ruby_1_8_6/test/xmlrpc/webrick_testing.rb b/ruby_1_8_6/test/xmlrpc/webrick_testing.rb
new file mode 100644
index 0000000000..a6830cece1
--- /dev/null
+++ b/ruby_1_8_6/test/xmlrpc/webrick_testing.rb
@@ -0,0 +1,37 @@
+require 'timeout'
+
+module WEBrick_Testing
+  class DummyLog < WEBrick::BasicLog
+    def initialize() super(self) end
+    def <<(*args) end
+  end
+  
+  def start_server(config={})
+    raise "already started" if @__server
+    @__started = false
+
+    Thread.new {
+      @__server = WEBrick::HTTPServer.new(
+        { 
+          :Logger => DummyLog.new,
+          :AccessLog => [],
+          :StartCallback => proc { @__started = true }
+        }.update(config))
+      yield @__server 
+      @__server.start
+      @__started = false
+    }
+
+    Timeout.timeout(5) {
+      nil until @__started # wait until the server is ready
+    }
+  end
+
+  def stop_server
+    Timeout.timeout(5) {
+      @__server.shutdown
+      nil while @__started # wait until the server is down
+    }
+    @__server = nil
+  end
+end
diff --git a/ruby_1_8_6/test/xsd/codegen/test_classdef.rb b/ruby_1_8_6/test/xsd/codegen/test_classdef.rb
new file mode 100644
index 0000000000..64c4771918
--- /dev/null
+++ b/ruby_1_8_6/test/xsd/codegen/test_classdef.rb
@@ -0,0 +1,214 @@
+require 'test/unit'
+require 'xsd/codegen/classdef'
+
+
+module XSD; module CodeGen
+
+
+class TestClassDefCreator < Test::Unit::TestCase
+  include XSD::CodeGen
+  include GenSupport
+
+  def test_classdef_simple
+    c = ClassDef.new("Foo")
+    assert_equal(format(<<-EOD), c.dump)
+      class Foo
+      end
+    EOD
+  end
+
+  def test_classdef_complex
+    c = ClassDef.new("Foo::Bar::Baz", String)
+    assert_equal(format(<<-EOD), c.dump)
+      module Foo; module Bar
+
+      class Baz < String
+      end
+
+      end; end
+    EOD
+  end
+
+  def test_require
+    c = ClassDef.new("Foo")
+    c.def_require("foo/bar")
+    assert_equal(format(<<-EOD), c.dump)
+      require 'foo/bar'
+
+      class Foo
+      end
+    EOD
+  end
+
+  def test_comment
+    c = ClassDef.new("Foo")
+    c.def_require("foo/bar")
+    c.comment = <<-EOD
+      foo
+    EOD
+    assert_equal(format(<<-EOD), c.dump)
+      require 'foo/bar'
+
+      # foo
+      class Foo
+      end
+    EOD
+    c.comment = <<-EOD
+            foo
+
+              bar
+             baz
+
+    EOD
+    assert_equal(format(<<-EOD), c.dump)
+      require 'foo/bar'
+
+      # foo
+      # 
+      #   bar
+      #  baz
+      # 
+      class Foo
+      end
+    EOD
+  end
+
+  def test_emptymethod
+    c = ClassDef.new("Foo")
+    c.def_method('foo') do
+    end
+    c.def_method('bar') do
+      ''
+    end
+    assert_equal(format(<<-EOD), c.dump)
+      class Foo
+        def foo
+        end
+
+        def bar
+        end
+      end
+    EOD
+  end
+
+  def test_full
+    c = ClassDef.new("Foo::Bar::HobbitName", String)
+    c.def_require("foo/bar")
+    c.comment = <<-EOD
+        foo
+      bar
+        baz
+    EOD
+    c.def_const("FOO", 1)
+    c.def_classvar("@@foo", "var".dump)
+    c.def_classvar("baz", "1".dump)
+    c.def_attr("Foo", true, "foo")
+    c.def_attr("bar")
+    c.def_attr("baz", true)
+    c.def_attr("Foo2", true, "foo2")
+    c.def_attr("foo3", false, "foo3")
+    c.def_method("foo") do
+      <<-EOD
+        foo.bar = 1
+\tbaz.each do |ele|
+\t  ele
+        end
+      EOD
+    end
+    c.def_method("baz", "qux") do
+      <<-EOD
+        [1, 2, 3].each do |i|
+          p i
+        end
+      EOD
+    end
+
+    m = MethodDef.new("qux", "quxx", "quxxx") do
+      <<-EOD
+      p quxx + quxxx
+      EOD
+    end
+    m.comment = "hello world\n123"
+    c.add_method(m)
+    c.def_code <<-EOD
+      Foo.new
+      Bar.z
+    EOD
+    c.def_code <<-EOD
+      Foo.new
+      Bar.z
+    EOD
+    c.def_privatemethod("foo", "baz", "*arg", "&block")
+
+    assert_equal(format(<<-EOD), c.dump)
+    require 'foo/bar'
+
+    module Foo; module Bar
+
+    #   foo
+    # bar
+    #   baz
+    class HobbitName < String
+      @@foo = "var"
+      @@baz = "1"
+
+      FOO = 1
+
+      Foo.new
+      Bar.z
+
+      Foo.new
+      Bar.z
+
+      attr_accessor :bar
+      attr_accessor :baz
+      attr_reader :foo3
+
+      def Foo
+        @foo
+      end
+
+      def Foo=(value)
+        @foo = value
+      end
+
+      def Foo2
+        @foo2
+      end
+
+      def Foo2=(value)
+        @foo2 = value
+      end
+
+      def foo
+        foo.bar = 1
+        baz.each do |ele|
+          ele
+        end
+      end
+
+      def baz(qux)
+        [1, 2, 3].each do |i|
+          p i
+        end
+      end
+
+      # hello world
+      # 123
+      def qux(quxx, quxxx)
+        p quxx + quxxx
+      end
+
+    private
+
+      def foo(baz, *arg, &block)
+      end
+    end
+
+    end; end
+    EOD
+  end
+end
+
+
+end; end
diff --git a/ruby_1_8_6/test/xsd/noencoding.xml b/ruby_1_8_6/test/xsd/noencoding.xml
new file mode 100644
index 0000000000..614ffa34ad
--- /dev/null
+++ b/ruby_1_8_6/test/xsd/noencoding.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="euc-jp"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema">
+  <!-- あいう -->
+</schema>
diff --git a/ruby_1_8_6/test/xsd/test_noencoding.rb b/ruby_1_8_6/test/xsd/test_noencoding.rb
new file mode 100644
index 0000000000..48119ec1f7
--- /dev/null
+++ b/ruby_1_8_6/test/xsd/test_noencoding.rb
@@ -0,0 +1,32 @@
+require 'test/unit'
+require 'wsdl/xmlSchema/parser'
+
+
+module XSD
+
+
+class TestEmptyCharset < Test::Unit::TestCase
+  def setup
+    @file = File.join(File.dirname(File.expand_path(__FILE__)), 'noencoding.xml')
+  end
+
+  def test_wsdl
+    begin
+      xml = WSDL::XMLSchema::Parser.new.parse(File.open(@file) { |f| f.read })
+    rescue RuntimeError
+      if XSD::XMLParser.const_defined?("REXMLParser")
+	STDERR.puts("rexml cannot handle euc-jp without iconv/uconv.")
+	return
+      end
+      raise
+    rescue Errno::EINVAL
+      # unsupported encoding
+      return
+    end
+    assert_equal(WSDL::XMLSchema::Schema, xml.class)
+    assert_equal(0, xml.collect_elements.size)
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/xsd/test_xmlschemaparser.rb b/ruby_1_8_6/test/xsd/test_xmlschemaparser.rb
new file mode 100644
index 0000000000..10dff43e61
--- /dev/null
+++ b/ruby_1_8_6/test/xsd/test_xmlschemaparser.rb
@@ -0,0 +1,22 @@
+require 'test/unit'
+require 'wsdl/xmlSchema/parser'
+
+
+module XSD
+
+
+class TestXMLSchemaParser < Test::Unit::TestCase
+  def setup
+    @file = File.join(File.dirname(File.expand_path(__FILE__)), 'xmlschema.xml')
+  end
+
+  def test_wsdl
+    @wsdl = WSDL::XMLSchema::Parser.new.parse(File.open(@file) { |f| f.read })
+    assert_equal(WSDL::XMLSchema::Schema, @wsdl.class)
+    assert_equal(1, @wsdl.collect_elements.size)
+  end
+end
+
+
+
+end
diff --git a/ruby_1_8_6/test/xsd/test_xsd.rb b/ruby_1_8_6/test/xsd/test_xsd.rb
new file mode 100644
index 0000000000..6302f3128b
--- /dev/null
+++ b/ruby_1_8_6/test/xsd/test_xsd.rb
@@ -0,0 +1,1511 @@
+require 'test/unit'
+require 'xsd/datatypes'
+
+
+module XSD
+
+
+class TestXSD < Test::Unit::TestCase
+  NegativeZero = (-1.0 / (1.0 / 0.0))
+
+  def setup
+  end
+
+  def teardown
+  end
+
+  def assert_parsed_result(klass, str)
+    o = klass.new(str)
+    assert_equal(str, o.to_s)
+  end
+
+  def test_NSDBase
+    o = XSD::NSDBase.new
+    assert_equal(nil, o.type)
+  end
+
+  def test_XSDBase
+    o = XSD::XSDAnySimpleType.new
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+    assert_equal('', o.to_s)
+  end
+
+  def test_XSDNil
+    o = XSD::XSDNil.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::NilLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    o = XSD::XSDNil.new(nil)
+    assert_equal(true, o.is_nil)
+    assert_equal(nil, o.data)
+    assert_equal("", o.to_s)
+    o = XSD::XSDNil.new('var')
+    assert_equal(false, o.is_nil)
+    assert_equal('var', o.data)
+    assert_equal('var', o.to_s)
+  end
+
+  def test_XSDString_UTF8
+    o = XSD::XSDString.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::StringLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    str = "abc"
+    assert_equal(str, XSD::XSDString.new(str).data)
+    assert_equal(str, XSD::XSDString.new(str).to_s)
+    assert_raises(XSD::ValueSpaceError) do
+      XSD::XSDString.new("\0")
+    end
+    assert_raises(XSD::ValueSpaceError) do
+      p XSD::XSDString.new("\xC0\xC0").to_s
+    end
+  end
+
+  def test_XSDString_NONE
+    XSD::Charset.module_eval { @encoding_backup = @encoding; @encoding = "NONE" }
+    begin
+      o = XSD::XSDString.new
+      assert_equal(XSD::Namespace, o.type.namespace)
+      assert_equal(XSD::StringLiteral, o.type.name)
+      assert_equal(nil, o.data)
+      assert_equal(true, o.is_nil)
+
+      str = "abc"
+      assert_equal(str, XSD::XSDString.new(str).data)
+      assert_equal(str, XSD::XSDString.new(str).to_s)
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDString.new("\0")
+      end
+      assert_raises(XSD::ValueSpaceError) do
+	p XSD::XSDString.new("\xC0\xC0").to_s
+      end
+    ensure
+      XSD::Charset.module_eval { @encoding = @encoding_backup }
+    end
+  end
+
+  def test_XSDBoolean
+    o = XSD::XSDBoolean.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::BooleanLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      ["true", true],
+      ["1", true],
+      ["false", false],
+      ["0", false],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDBoolean.new(data).data)
+      assert_equal(expected.to_s, XSD::XSDBoolean.new(data).to_s)
+    end
+
+    assert_raises(XSD::ValueSpaceError) do
+      XSD::XSDBoolean.new("nil").to_s
+    end
+  end
+
+  def test_XSDDecimal
+    o = XSD::XSDDecimal.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::DecimalLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      1000000000,
+      -9999999999,
+      12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
+      12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
+      -1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789,
+    ]
+    targets.each do |dec|
+      assert_equal(dec.to_s, XSD::XSDDecimal.new(dec).data)
+    end
+
+    targets = [
+      "0",
+      "0.00000001",
+      "1000000000",
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+      "-12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123.45678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDDecimal.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["0.0", "0"],
+      ["-0.0", "0"],
+      ["+0.0", "0"],
+      ["0.", "0"],
+      [".0", "0"],
+      [
+	"+0.12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+	"0.1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+     ],
+      [
+	".0000012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+	"0.000001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
+     ],
+      [
+	"-12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890.",
+	"-12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+     ],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDDecimal.new(data).to_s)
+    end
+
+    targets = [
+      "0.000000000000a",
+      "00a.0000000000001",
+      "+-5",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDDecimal.new(d)
+      end
+    end
+  end
+
+  def test_XSDFloat
+    o = XSD::XSDFloat.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::FloatLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      3.14159265358979,
+      12.34e36,
+      1.402e-45,
+      -1.402e-45,
+    ]
+    targets.each do |f|
+      assert_equal(f, XSD::XSDFloat.new(f).data)
+    end
+
+    targets = [
+      "+3.141592654",
+      "+1.234e+37",
+      "+1.402e-45",
+      "-1.402e-45",
+    ]
+    targets.each do |f|
+      assert_equal(f, XSD::XSDFloat.new(f).to_s)
+    end
+
+    targets = [
+      [3, "+3"], 	# should be 3.0?
+      [-2, "-2"],	# ditto
+      [3.14159265358979, "+3.141592654"],
+      [12.34e36, "+1.234e+37"],
+      [1.402e-45, "+1.402e-45"],
+      [-1.402e-45, "-1.402e-45"],
+      ["1.402e", "+1.402"],
+      ["12.34E36", "+1.234e+37"],
+      ["1.402E-45", "+1.402e-45"],
+      ["-1.402E-45", "-1.402e-45"],
+      ["1.402E", "+1.402"],
+    ]
+    targets.each do |f, str|
+      assert_equal(str, XSD::XSDFloat.new(f).to_s)
+    end
+
+    assert_equal("+0", XSD::XSDFloat.new(+0.0).to_s)
+    assert_equal("-0", XSD::XSDFloat.new(NegativeZero).to_s)
+    assert(XSD::XSDFloat.new(0.0/0.0).data.nan?)
+    assert_equal("INF", XSD::XSDFloat.new(1.0/0.0).to_s)
+    assert_equal(1, XSD::XSDFloat.new(1.0/0.0).data.infinite?)
+    assert_equal("-INF", XSD::XSDFloat.new(-1.0/0.0).to_s)
+    assert_equal(-1, XSD::XSDFloat.new(-1.0/0.0).data.infinite?)
+
+    targets = [
+      "0.000000000000a",
+      "00a.0000000000001",
+      "+-5",
+      "5_0",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDFloat.new(d)
+      end
+    end
+  end
+
+  def test_XSDDouble
+    o = XSD::XSDDouble.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::DoubleLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      3.14159265358979,
+      12.34e36,
+      1.402e-45,
+      -1.402e-45,
+    ]
+    targets.each do |f|
+      assert_equal(f, XSD::XSDDouble.new(f).data)
+    end
+
+    targets = [
+      "+3.14159265358979",
+      "+1.234e+37",
+      "+1.402e-45",
+      "-1.402e-45",
+    ]
+    targets.each do |f|
+      assert_equal(f, XSD::XSDDouble.new(f).to_s)
+    end
+
+    targets = [
+      [3, "+3"],	# should be 3.0?
+      [-2, "-2"],	# ditto.
+      [3.14159265358979, "+3.14159265358979"],
+      [12.34e36, "+1.234e+37"],
+      [1.402e-45, "+1.402e-45"],
+      [-1.402e-45, "-1.402e-45"],
+      ["1.402e", "+1.402"],
+      ["12.34E36", "+1.234e+37"],
+      ["1.402E-45", "+1.402e-45"],
+      ["-1.402E-45", "-1.402e-45"],
+      ["1.402E", "+1.402"],
+    ]
+    targets.each do |f, str|
+      assert_equal(str, XSD::XSDDouble.new(f).to_s)
+    end
+
+    assert_equal("+0", XSD::XSDFloat.new(+0.0).to_s)
+    assert_equal("-0", XSD::XSDFloat.new(NegativeZero).to_s)
+    assert_equal("NaN", XSD::XSDDouble.new(0.0/0.0).to_s)
+    assert(XSD::XSDDouble.new(0.0/0.0).data.nan?)
+    assert_equal("INF", XSD::XSDDouble.new(1.0/0.0).to_s)
+    assert_equal(1, XSD::XSDDouble.new(1.0/0.0).data.infinite?)
+    assert_equal("-INF", XSD::XSDDouble.new(-1.0/0.0).to_s)
+    assert_equal(-1, XSD::XSDDouble.new(-1.0/0.0).data.infinite?)
+
+    targets = [
+      "0.000000000000a",
+      "00a.0000000000001",
+      "+-5",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDDouble.new(d)
+      end
+    end
+  end
+
+  def test_XSDDuration
+    o = XSD::XSDDuration.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::DurationLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "P1Y2M3DT4H5M6S",
+      "P1234Y5678M9012DT3456H7890M1234.5678S",
+      "P0DT3456H7890M1234.5678S",
+      "P1234Y5678M9012D",
+      "-P1234Y5678M9012DT3456H7890M1234.5678S",
+      "P5678M9012DT3456H7890M1234.5678S",
+      "-P1234Y9012DT3456H7890M1234.5678S",
+      "+P1234Y5678MT3456H7890M1234.5678S",
+      "P1234Y5678M9012DT7890M1234.5678S",
+      "-P1234Y5678M9012DT3456H1234.5678S",
+      "+P1234Y5678M9012DT3456H7890M",
+      "P123400000000000Y",
+      "-P567800000000000M",
+      "+P901200000000000D",
+      "P0DT345600000000000H",
+      "-P0DT789000000000000M",
+      "+P0DT123400000000000.000000000005678S",
+      "P1234YT1234.5678S",
+      "-P5678MT7890M",
+      "+P9012DT3456H",
+    ]
+    targets.each do |str|
+      assert_parsed_result(XSD::XSDDuration, str)
+    end
+
+    targets = [
+      ["P0Y0M0DT0H0M0S",
+        "P0D"],
+      ["-P0DT0S",
+        "-P0D"],
+      ["P01234Y5678M9012DT3456H7890M1234.5678S",
+        "P1234Y5678M9012DT3456H7890M1234.5678S"],
+      ["P1234Y005678M9012DT3456H7890M1234.5678S",
+        "P1234Y5678M9012DT3456H7890M1234.5678S"],
+      ["P1234Y5678M0009012DT3456H7890M1234.5678S",
+        "P1234Y5678M9012DT3456H7890M1234.5678S"],
+      ["P1234Y5678M9012DT00003456H7890M1234.5678S",
+        "P1234Y5678M9012DT3456H7890M1234.5678S"],
+      ["P1234Y5678M9012DT3456H000007890M1234.5678S",
+        "P1234Y5678M9012DT3456H7890M1234.5678S"],
+      ["P1234Y5678M9012DT3456H7890M0000001234.5678S",
+        "P1234Y5678M9012DT3456H7890M1234.5678S"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDDuration.new(data).to_s)
+    end
+  end
+
+  def test_XSDDateTime
+    o = XSD::XSDDateTime.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::DateTimeLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "2002-05-18T16:52:20Z",
+      "0001-01-01T00:00:00Z",
+      "9999-12-31T23:59:59Z",
+      "19999-12-31T23:59:59Z",
+      "2002-12-31T23:59:59.999Z",
+      "2002-12-31T23:59:59.001Z",
+      "2002-12-31T23:59:59.99999999999999999999Z",
+      "2002-12-31T23:59:59.00000000000000000001Z",
+      "2002-12-31T23:59:59+09:00",
+      "2002-12-31T23:59:59+00:01",
+      "2002-12-31T23:59:59-00:01",
+      "2002-12-31T23:59:59-23:59",
+      "2002-12-31T23:59:59.00000000000000000001+13:30",
+      "2002-12-31T23:59:59.5137Z",
+      "2002-12-31T23:59:59.51375Z",	# 411/800
+      "2002-12-31T23:59:59.51375+12:34",
+      "-2002-05-18T16:52:20Z",
+      "-4713-01-01T12:00:00Z",
+      "-2002-12-31T23:59:59+00:01",
+      "-0001-12-31T23:59:59.00000000000000000001+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(XSD::XSDDateTime, str)
+    end
+
+    targets = [
+      ["2002-12-31T23:59:59.00",
+	"2002-12-31T23:59:59Z"],
+      ["2002-12-31T23:59:59+00:00",
+	"2002-12-31T23:59:59Z"],
+      ["2002-12-31T23:59:59-00:00",
+	"2002-12-31T23:59:59Z"],
+      ["-2002-12-31T23:59:59.00",
+	"-2002-12-31T23:59:59Z"],
+      ["-2002-12-31T23:59:59+00:00",
+	"-2002-12-31T23:59:59Z"],
+      ["-2002-12-31T23:59:59-00:00",
+	"-2002-12-31T23:59:59Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDDateTime.new(data).to_s)
+      d = DateTime.parse(data)
+      d >>= 12 if d.year < 0    # XSDDateTime.year(-1) == DateTime.year(0)
+      assert_equal(expected, XSD::XSDDateTime.new(d).to_s)
+    end
+
+    targets = [
+      "0000-05-18T16:52:20Z",
+      "05-18T16:52:20Z",
+      "2002-05T16:52:20Z",
+      "2002-05-18T16:52Z",
+      "",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError, d.to_s) do
+	XSD::XSDDateTime.new(d)
+      end
+    end
+  end
+
+  def test_XSDTime
+    o = XSD::XSDTime.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::TimeLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "16:52:20Z",
+      "00:00:00Z",
+      "23:59:59Z",
+      "23:59:59.999Z",
+      "23:59:59.001Z",
+      "23:59:59.99999999999999999999Z",
+      "23:59:59.00000000000000000001Z",
+      "23:59:59+09:00",
+      "23:59:59+00:01",
+      "23:59:59-00:01",
+      "23:59:59-23:59",
+      "23:59:59.00000000000000000001+13:30",
+      "23:59:59.51345Z",
+      "23:59:59.51345+12:34",
+      "23:59:59+00:01",
+    ]
+    targets.each do |str|
+      assert_parsed_result(XSD::XSDTime, str)
+    end
+
+    targets = [
+      ["23:59:59.00",
+	"23:59:59Z"],
+      ["23:59:59+00:00",
+	"23:59:59Z"],
+      ["23:59:59-00:00",
+	"23:59:59Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDTime.new(data).to_s)
+    end
+  end
+
+  def test_XSDDate
+    o = XSD::XSDDate.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::DateLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "2002-05-18Z",
+      "0001-01-01Z",
+      "9999-12-31Z",
+      "19999-12-31Z",
+      "2002-12-31+09:00",
+      "2002-12-31+00:01",
+      "2002-12-31-00:01",
+      "2002-12-31-23:59",
+      "2002-12-31+13:30",
+      "-2002-05-18Z",
+      "-19999-12-31Z",
+      "-2002-12-31+00:01",
+      "-0001-12-31+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(XSD::XSDDate, str)
+    end
+
+    targets = [
+      ["2002-12-31",
+	"2002-12-31Z"],
+      ["2002-12-31+00:00",
+	"2002-12-31Z"],
+      ["2002-12-31-00:00",
+	"2002-12-31Z"],
+      ["-2002-12-31",
+	"-2002-12-31Z"],
+      ["-2002-12-31+00:00",
+	"-2002-12-31Z"],
+      ["-2002-12-31-00:00",
+	"-2002-12-31Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDDate.new(data).to_s)
+      d = Date.parse(data)
+      d >>= 12 if d.year < 0    # XSDDate.year(-1) == Date.year(0)
+      assert_equal(expected, XSD::XSDDate.new(d).to_s)
+    end
+  end
+end
+
+class TestXSD2 < Test::Unit::TestCase
+  def setup
+    # Nothing to do.
+  end
+
+  def teardown
+    # Nothing to do.
+  end
+
+  def assert_parsed_result(klass, str)
+    o = klass.new(str)
+    assert_equal(str, o.to_s)
+  end
+
+  def test_XSDGYearMonth
+    o = XSD::XSDGYearMonth.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::GYearMonthLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "2002-05Z",
+      "0001-01Z",
+      "9999-12Z",
+      "19999-12Z",
+      "2002-12+09:00",
+      "2002-12+00:01",
+      "2002-12-00:01",
+      "2002-12-23:59",
+      "2002-12+13:30",
+      "-2002-05Z",
+      "-19999-12Z",
+      "-2002-12+00:01",
+      "-0001-12+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(XSD::XSDGYearMonth, str)
+    end
+
+    targets = [
+      ["2002-12",
+	"2002-12Z"],
+      ["2002-12+00:00",
+	"2002-12Z"],
+      ["2002-12-00:00",
+	"2002-12Z"],
+      ["-2002-12",
+	"-2002-12Z"],
+      ["-2002-12+00:00",
+	"-2002-12Z"],
+      ["-2002-12-00:00",
+	"-2002-12Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDGYearMonth.new(data).to_s)
+    end
+  end
+
+  def test_XSDGYear
+    o = XSD::XSDGYear.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::GYearLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "2002Z",
+      "0001Z",
+      "9999Z",
+      "19999Z",
+      "2002+09:00",
+      "2002+00:01",
+      "2002-00:01",
+      "2002-23:59",
+      "2002+13:30",
+      "-2002Z",
+      "-19999Z",
+      "-2002+00:01",
+      "-0001+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(XSD::XSDGYear, str)
+    end
+
+    targets = [
+      ["2002",
+	"2002Z"],
+      ["2002+00:00",
+	"2002Z"],
+      ["2002-00:00",
+	"2002Z"],
+      ["-2002",
+	"-2002Z"],
+      ["-2002+00:00",
+	"-2002Z"],
+      ["-2002-00:00",
+	"-2002Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDGYear.new(data).to_s)
+    end
+  end
+
+  def test_XSDGMonthDay
+    o = XSD::XSDGMonthDay.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::GMonthDayLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "05-18Z",
+      "01-01Z",
+      "12-31Z",
+      "12-31+09:00",
+      "12-31+00:01",
+      "12-31-00:01",
+      "12-31-23:59",
+      "12-31+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(XSD::XSDGMonthDay, str)
+    end
+
+    targets = [
+      ["12-31",
+	"12-31Z"],
+      ["12-31+00:00",
+	"12-31Z"],
+      ["12-31-00:00",
+	"12-31Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDGMonthDay.new(data).to_s)
+    end
+  end
+
+  def test_XSDGDay
+    o = XSD::XSDGDay.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::GDayLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "18Z",
+      "01Z",
+      "31Z",
+      "31+09:00",
+      "31+00:01",
+      "31-00:01",
+      "31-23:59",
+      "31+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(XSD::XSDGDay, str)
+    end
+
+    targets = [
+      ["31",
+	"31Z"],
+      ["31+00:00",
+	"31Z"],
+      ["31-00:00",
+	"31Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDGDay.new(data).to_s)
+    end
+  end
+
+  def test_XSDGMonth
+    o = XSD::XSDGMonth.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::GMonthLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "05Z",
+      "01Z",
+      "12Z",
+      "12+09:00",
+      "12+00:01",
+      "12-00:01",
+      "12-23:59",
+      "12+13:30",
+    ]
+    targets.each do |str|
+      assert_parsed_result(XSD::XSDGMonth, str)
+    end
+
+    targets = [
+      ["12",
+	"12Z"],
+      ["12+00:00",
+	"12Z"],
+      ["12-00:00",
+	"12Z"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDGMonth.new(data).to_s)
+    end
+  end
+
+  def test_XSDHexBinary
+    o = XSD::XSDHexBinary.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::HexBinaryLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "abcdef",
+      "\xe3\x81\xaa\xe3\x81\xb2",
+      %Q(\0),
+      "",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDHexBinary.new(str).string)
+      assert_equal(str.unpack("H*")[0 ].tr('a-f', 'A-F'),
+	XSD::XSDHexBinary.new(str).data)
+      o = XSD::XSDHexBinary.new
+      o.set_encoded(str.unpack("H*")[0 ].tr('a-f', 'A-F'))
+      assert_equal(str, o.string)
+      o.set_encoded(str.unpack("H*")[0 ].tr('A-F', 'a-f'))
+      assert_equal(str, o.string)
+    end
+
+    targets = [
+      "0FG7",
+      "0fg7",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError, d.to_s) do
+	o = XSD::XSDHexBinary.new
+	o.set_encoded(d)
+	p o.string
+      end
+    end
+  end
+
+  def test_XSDBase64Binary
+    o = XSD::XSDBase64Binary.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::Base64BinaryLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      "abcdef",
+      "\xe3\x81\xaa\xe3\x81\xb2",
+      %Q(\0),
+      "",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDBase64Binary.new(str).string)
+      assert_equal([str ].pack("m").chomp, XSD::XSDBase64Binary.new(str).data)
+      o = XSD::XSDBase64Binary.new
+      o.set_encoded([str ].pack("m").chomp)
+      assert_equal(str, o.string)
+    end
+
+    targets = [
+      "-",
+      "*",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError, d.to_s) do
+	o = XSD::XSDBase64Binary.new
+	o.set_encoded(d)
+	p o.string
+      end
+    end
+  end
+
+  def test_XSDAnyURI
+    o = XSD::XSDAnyURI.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::AnyURILiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    # Too few tests here I know.  Believe uri module. :)
+    targets = [
+      "foo",
+      "http://foo",
+      "http://foo/bar/baz",
+      "http://foo/bar#baz",
+      "http://foo/bar%20%20?a+b",
+      "HTTP://FOO/BAR%20%20?A+B",
+    ]
+    targets.each do |str|
+      assert_parsed_result(XSD::XSDAnyURI, str)
+    end
+  end
+
+  def test_XSDQName
+    o = XSD::XSDQName.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::QNameLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    # More strict test is needed but current implementation allows all non-':'
+    # chars like ' ', C0 or C1...
+    targets = [
+      "foo",
+      "foo:bar",
+      "a:b",
+    ]
+    targets.each do |str|
+      assert_parsed_result(XSD::XSDQName, str)
+    end
+  end
+
+
+  ###
+  ## Derived types
+  #
+
+  def test_XSDInteger
+    o = XSD::XSDInteger.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::IntegerLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      1000000000,
+      -9999999999,
+      12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
+      12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
+      -1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789,
+    ]
+    targets.each do |int|
+      assert_equal(int, XSD::XSDInteger.new(int).data)
+    end
+
+    targets = [
+      "0",
+      "1000000000",
+      "-9999999999",
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+      "-1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDInteger.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      ["-000123", "-123"],
+      [
+	"+12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+	"12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+     ],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDInteger.new(data).to_s)
+    end
+
+    targets = [
+      "0.0",
+      "-5.2",
+      "0.000000000000a",
+      "+-5",
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890."
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDInteger.new(d)
+      end
+    end
+  end
+
+  def test_XSDNonPositiveInteger
+    o = XSD::XSDNonPositiveInteger.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::NonPositiveIntegerLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      -9999999999,
+      -1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789,
+    ]
+    targets.each do |int|
+      assert_equal(int, XSD::XSDNonPositiveInteger.new(int).data)
+    end
+
+    targets = [
+      "0",
+      "-9999999999",
+      "-1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDNonPositiveInteger.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["-000123", "-123"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDNonPositiveInteger.new(data).to_s)
+    end
+
+    targets = [
+      "0.0",
+      "-5.2",
+      "0.000000000000a",
+      "+-5",
+      "-12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890."
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDNonPositiveInteger.new(d)
+      end
+    end
+  end
+
+  def test_XSDNegativeInteger
+    o = XSD::XSDNegativeInteger.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::NegativeIntegerLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      -1,
+      -9999999999,
+      -1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789,
+    ]
+    targets.each do |int|
+      assert_equal(int, XSD::XSDNegativeInteger.new(int).data)
+    end
+
+    targets = [
+      "-1",
+      "-9999999999",
+      "-1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDNegativeInteger.new(str).to_s)
+    end
+
+    targets = [
+      ["-000123", "-123"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDNegativeInteger.new(data).to_s)
+    end
+
+    targets = [
+      "-0.0",
+      "-5.2",
+      "-0.000000000000a",
+      "+-5",
+      "-12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890."
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDNegativeInteger.new(d)
+      end
+    end
+  end
+
+  def test_XSDLong
+    o = XSD::XSDLong.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::LongLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      123,
+      -123,
+      9223372036854775807,
+      -9223372036854775808,
+    ]
+    targets.each do |lng|
+      assert_equal(lng, XSD::XSDLong.new(lng).data)
+    end
+
+    targets = [
+      "0",
+      "123",
+      "-123",
+      "9223372036854775807",
+      "-9223372036854775808",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDLong.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      ["-000123", "-123"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDLong.new(data).to_s)
+    end
+
+    targets = [
+      9223372036854775808,
+      -9223372036854775809,
+      "0.0",
+      "-5.2",
+      "0.000000000000a",
+      "+-5",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDLong.new(d)
+      end
+    end
+  end
+
+  def test_XSDInt
+    o = XSD::XSDInt.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::IntLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      123,
+      -123,
+      2147483647,
+      -2147483648,
+    ]
+    targets.each do |lng|
+      assert_equal(lng, XSD::XSDInt.new(lng).data)
+    end
+
+    targets = [
+      "0",
+      "123",
+      "-123",
+      "2147483647",
+      "-2147483648",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDInt.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      ["-000123", "-123"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDInt.new(data).to_s)
+    end
+
+    targets = [
+      2147483648,
+      -2147483649,
+      "0.0",
+      "-5.2",
+      "0.000000000000a",
+      "+-5",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDInt.new(d)
+      end
+    end
+  end
+
+  def test_XSDShort
+    o = XSD::XSDShort.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::ShortLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      123,
+      -123,
+      32767,
+      -32768,
+    ]
+    targets.each do |lng|
+      assert_equal(lng, XSD::XSDShort.new(lng).data)
+    end
+
+    targets = [
+      "0",
+      "123",
+      "-123",
+      "32767",
+      "-32768",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDShort.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      ["-000123", "-123"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDShort.new(data).to_s)
+    end
+
+    targets = [
+      32768,
+      -32769,
+      "0.0",
+      "-5.2",
+      "0.000000000000a",
+      "+-5",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDShort.new(d)
+      end
+    end
+  end
+
+  def test_XSDByte
+    o = XSD::XSDByte.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::ByteLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      123,
+      -123,
+      127,
+      -128,
+    ]
+    targets.each do |lng|
+      assert_equal(lng, XSD::XSDByte.new(lng).data)
+    end
+
+    targets = [
+      "0",
+      "123",
+      "-123",
+      "127",
+      "-128",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDByte.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      ["-000123", "-123"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDByte.new(data).to_s)
+    end
+
+    targets = [
+      128,
+      -129,
+      "0.0",
+      "-5.2",
+      "0.000000000000a",
+      "+-5",
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDByte.new(d)
+      end
+    end
+  end
+
+  def test_XSDNonNegativeInteger
+    o = XSD::XSDNonNegativeInteger.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::NonNegativeIntegerLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      1000000000,
+      12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
+    ]
+    targets.each do |int|
+      assert_equal(int, XSD::XSDNonNegativeInteger.new(int).data)
+    end
+
+    targets = [
+      "0",
+      "1000000000",
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDNonNegativeInteger.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      [
+	"+12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+	"12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+     ],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDNonNegativeInteger.new(data).to_s)
+    end
+
+    targets = [
+      "0.0",
+      "0.000000000000a",
+      "+-5",
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890."
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDNonNegativeInteger.new(d)
+      end
+    end
+  end
+
+  def test_XSDUnsignedLong
+    o = XSD::XSDUnsignedLong.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::UnsignedLongLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      1000000000,
+      18446744073709551615,
+    ]
+    targets.each do |int|
+      assert_equal(int, XSD::XSDUnsignedLong.new(int).data)
+    end
+
+    targets = [
+      "0",
+      "1000000000",
+      "18446744073709551615",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDUnsignedLong.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      ["+18446744073709551615", "18446744073709551615"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDUnsignedLong.new(data).to_s)
+    end
+
+    targets = [
+      "0.0",
+      "0.000000000000a",
+      "+-5",
+      "18446744073709551615."
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDUnsignedLong.new(d)
+      end
+    end
+  end
+
+  def test_XSDUnsignedInt
+    o = XSD::XSDUnsignedInt.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::UnsignedIntLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      1000000000,
+      4294967295,
+    ]
+    targets.each do |int|
+      assert_equal(int, XSD::XSDUnsignedInt.new(int).data)
+    end
+
+    targets = [
+      "0",
+      "1000000000",
+      "4294967295",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDUnsignedInt.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      ["+4294967295", "4294967295"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDUnsignedInt.new(data).to_s)
+    end
+
+    targets = [
+      "0.0",
+      "0.000000000000a",
+      "+-5",
+      "4294967295."
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDUnsignedInt.new(d)
+      end
+    end
+  end
+
+  def test_XSDUnsignedShort
+    o = XSD::XSDUnsignedShort.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::UnsignedShortLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      10000,
+      65535,
+    ]
+    targets.each do |int|
+      assert_equal(int, XSD::XSDUnsignedShort.new(int).data)
+    end
+
+    targets = [
+      "0",
+      "1000",
+      "65535",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDUnsignedShort.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      ["+65535", "65535"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDUnsignedShort.new(data).to_s)
+    end
+
+    targets = [
+      "0.0",
+      "0.000000000000a",
+      "+-5",
+      "65535."
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDUnsignedShort.new(d)
+      end
+    end
+  end
+
+  def test_XSDUnsignedByte
+    o = XSD::XSDUnsignedByte.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::UnsignedByteLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      0,
+      10,
+      255,
+    ]
+    targets.each do |int|
+      assert_equal(int, XSD::XSDUnsignedByte.new(int).data)
+    end
+
+    targets = [
+      "0",
+      "10",
+      "255",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDUnsignedByte.new(str).to_s)
+    end
+
+    targets = [
+      ["-0", "0"],
+      ["+0", "0"],
+      ["000123", "123"],
+      ["+255", "255"],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDUnsignedByte.new(data).to_s)
+    end
+
+    targets = [
+      "0.0",
+      "0.000000000000a",
+      "+-5",
+      "255."
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDUnsignedByte.new(d)
+      end
+    end
+  end
+
+  def test_XSDPositiveInteger
+    o = XSD::XSDPositiveInteger.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::PositiveIntegerLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    targets = [
+      1,
+      1000000000,
+      12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,
+    ]
+    targets.each do |int|
+      assert_equal(int, XSD::XSDPositiveInteger.new(int).data)
+    end
+
+    targets = [
+      "1",
+      "1000000000",
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+    ]
+    targets.each do |str|
+      assert_equal(str, XSD::XSDPositiveInteger.new(str).to_s)
+    end
+
+    targets = [
+      ["+1", "1"],
+      ["000123", "123"],
+      [
+	"+12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+	"12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+     ],
+    ]
+    targets.each do |data, expected|
+      assert_equal(expected, XSD::XSDPositiveInteger.new(data).to_s)
+    end
+
+    targets = [
+      "1.0",
+      "1.000000000000a",
+      "+-5",
+      "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890."
+    ]
+    targets.each do |d|
+      assert_raises(XSD::ValueSpaceError) do
+	XSD::XSDPositiveInteger.new(d)
+      end
+    end
+  end
+end
+
+
+end
diff --git a/ruby_1_8_6/test/xsd/xmlschema.xml b/ruby_1_8_6/test/xsd/xmlschema.xml
new file mode 100644
index 0000000000..018bd0cc67
--- /dev/null
+++ b/ruby_1_8_6/test/xsd/xmlschema.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema
+    attributeFormDefault="qualified"
+    elementFormDefault="qualified"
+    targetNamespace="urn:jp.gr.jin.rrr.example.fakeschema"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="MessageDataSet">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded" />
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/ruby_1_8_6/test/yaml/test_yaml.rb b/ruby_1_8_6/test/yaml/test_yaml.rb
new file mode 100644
index 0000000000..676310e6fc
--- /dev/null
+++ b/ruby_1_8_6/test/yaml/test_yaml.rb
@@ -0,0 +1,1284 @@
+# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*-
+#												vim:sw=4:ts=4
+# $Id$
+#
+require 'test/unit'
+require 'yaml'
+
+# [ruby-core:01946]
+module YAML_Tests
+    StructTest = Struct::new( :c )
+end
+
+class YAML_Unit_Tests < Test::Unit::TestCase
+	#
+	# Convert between YAML and the object to verify correct parsing and
+	# emitting
+	#
+	def assert_to_yaml( obj, yaml )
+		assert_equal( obj, YAML::load( yaml ) )
+		assert_equal( obj, YAML::parse( yaml ).transform )
+        assert_equal( obj, YAML::load( obj.to_yaml ) )
+		assert_equal( obj, YAML::parse( obj.to_yaml ).transform )
+        assert_equal( obj, YAML::load(
+			obj.to_yaml( :UseVersion => true, :UseHeader => true, :SortKeys => true ) 
+		) )
+	end
+
+	#
+	# Test parser only
+	#
+	def assert_parse_only( obj, yaml )
+		assert_equal( obj, YAML::load( yaml ) )
+		assert_equal( obj, YAML::parse( yaml ).transform )
+	end
+
+    def assert_cycle( obj )
+        assert_equal( obj, YAML::load( obj.to_yaml ) )
+    end
+
+    def assert_path_segments( path, segments )
+        YAML::YPath.each_path( path ) { |choice|
+            assert_equal( choice.segments, segments.shift )
+        }
+        assert_equal( segments.length, 0, "Some segments leftover: #{ segments.inspect }" )
+    end
+
+	#
+	# Make a time with the time zone
+	#
+	def mktime( year, mon, day, hour, min, sec, usec, zone = "Z" )
+        usec = usec.to_s.to_f * 1000000
+		val = Time::utc( year.to_i, mon.to_i, day.to_i, hour.to_i, min.to_i, sec.to_i, usec )
+		if zone != "Z"
+			hour = zone[0,3].to_i * 3600
+			min = zone[3,2].to_i * 60
+			ofs = (hour + min)
+			val = Time.at( val.to_f - ofs )
+		end
+		return val
+	end
+
+	#
+	# Tests modified from 00basic.t in YAML.pm
+	#
+	def test_basic_map
+		# Simple map
+		assert_parse_only(
+			{ 'one' => 'foo', 'three' => 'baz', 'two' => 'bar' }, <<EOY
+one: foo
+two: bar
+three: baz
+EOY
+		)
+	end
+
+	def test_basic_strings
+		# Common string types
+		assert_cycle("x")
+		assert_cycle(":x")
+		assert_cycle(":")
+		assert_parse_only(
+			{ 1 => 'simple string', 2 => 42, 3 => '1 Single Quoted String',
+			  4 => 'YAML\'s Double "Quoted" String', 5 => "A block\n  with several\n    lines.\n",
+			  6 => "A \"chomped\" block", 7 => "A folded\n string\n", 8 => ": started string" },
+			  <<EOY
+1: simple string
+2: 42
+3: '1 Single Quoted String'
+4: "YAML's Double \\\"Quoted\\\" String"
+5: |
+  A block
+    with several
+      lines.
+6: |-
+  A "chomped" block
+7: >
+  A
+  folded
+   string
+8: ": started string"
+EOY
+		)
+	end
+
+	#
+	# Test the specification examples
+	# - Many examples have been changes because of whitespace problems that
+	#   caused the two to be inequivalent, or keys to be sorted wrong
+	#
+
+	def test_spec_simple_implicit_sequence
+	  	# Simple implicit sequence
+		assert_to_yaml(
+			[ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ], <<EOY
+- Mark McGwire
+- Sammy Sosa
+- Ken Griffey
+EOY
+		)
+	end
+
+	def test_spec_simple_implicit_map
+		# Simple implicit map
+		assert_to_yaml(
+			{ 'hr' => 65, 'avg' => 0.278, 'rbi' => 147 }, <<EOY
+avg: 0.278
+hr: 65
+rbi: 147
+EOY
+		)
+	end
+
+	def test_spec_simple_map_with_nested_sequences
+		# Simple mapping with nested sequences
+		assert_to_yaml(
+			{ 'american' => 
+			  [ 'Boston Red Sox', 'Detroit Tigers', 'New York Yankees' ],
+			  'national' =>
+			  [ 'New York Mets', 'Chicago Cubs', 'Atlanta Braves' ] }, <<EOY
+american:
+  - Boston Red Sox
+  - Detroit Tigers
+  - New York Yankees
+national:
+  - New York Mets
+  - Chicago Cubs
+  - Atlanta Braves
+EOY
+		)
+	end
+
+	def test_spec_simple_sequence_with_nested_map
+		# Simple sequence with nested map
+		assert_to_yaml(
+		  [
+		    {'name' => 'Mark McGwire', 'hr' => 65, 'avg' => 0.278},
+			{'name' => 'Sammy Sosa', 'hr' => 63, 'avg' => 0.288}
+		  ], <<EOY
+-
+  avg: 0.278
+  hr: 65
+  name: Mark McGwire
+-
+  avg: 0.288
+  hr: 63
+  name: Sammy Sosa
+EOY
+		)
+	end
+
+	def test_spec_sequence_of_sequences
+		# Simple sequence with inline sequences
+		assert_parse_only(
+		  [ 
+		  	[ 'name', 'hr', 'avg' ],
+			[ 'Mark McGwire', 65, 0.278 ],
+			[ 'Sammy Sosa', 63, 0.288 ]
+		  ], <<EOY
+- [ name         , hr , avg   ]
+- [ Mark McGwire , 65 , 0.278 ]
+- [ Sammy Sosa   , 63 , 0.288 ]
+EOY
+		)
+	end
+
+	def test_spec_mapping_of_mappings
+		# Simple map with inline maps
+		assert_parse_only(
+		  { 'Mark McGwire' =>
+		    { 'hr' => 65, 'avg' => 0.278 },
+			'Sammy Sosa' =>
+		    { 'hr' => 63, 'avg' => 0.288 }
+		  }, <<EOY
+Mark McGwire: {hr: 65, avg: 0.278}
+Sammy Sosa:   {hr: 63,
+               avg: 0.288}
+EOY
+		)
+	end
+
+    def test_ambiguous_comments
+        # [ruby-talk:88012]
+        assert_to_yaml( "Call the method #dave", <<EOY )
+--- "Call the method #dave"
+EOY
+    end
+
+	def test_spec_nested_comments
+		# Map and sequences with comments
+		assert_parse_only(
+		  { 'hr' => [ 'Mark McGwire', 'Sammy Sosa' ],
+		    'rbi' => [ 'Sammy Sosa', 'Ken Griffey' ] }, <<EOY
+hr: # 1998 hr ranking
+  - Mark McGwire
+  - Sammy Sosa
+rbi:
+  # 1998 rbi ranking
+  - Sammy Sosa
+  - Ken Griffey
+EOY
+		)
+	end
+
+	def test_spec_anchors_and_aliases
+		# Anchors and aliases
+		assert_parse_only(
+			{ 'hr' =>
+			  [ 'Mark McGwire', 'Sammy Sosa' ],
+			  'rbi' =>
+			  [ 'Sammy Sosa', 'Ken Griffey' ] }, <<EOY
+hr:
+   - Mark McGwire
+   # Name "Sammy Sosa" scalar SS
+   - &SS Sammy Sosa
+rbi:
+   # So it can be referenced later.
+   - *SS
+   - Ken Griffey
+EOY
+	 	)
+
+        assert_to_yaml(
+            [{"arrival"=>"EDI", "departure"=>"LAX", "fareref"=>"DOGMA", "currency"=>"GBP"}, {"arrival"=>"MEL", "departure"=>"SYD", "fareref"=>"MADF", "currency"=>"AUD"}, {"arrival"=>"MCO", "departure"=>"JFK", "fareref"=>"DFSF", "currency"=>"USD"}], <<EOY
+  -   
+    &F fareref: DOGMA
+    &C currency: GBP
+    &D departure: LAX
+    &A arrival: EDI 
+  - { *F: MADF, *C: AUD, *D: SYD, *A: MEL }
+  - { *F: DFSF, *C: USD, *D: JFK, *A: MCO }
+EOY
+        )
+
+        assert_to_yaml(
+            {"ALIASES"=>["fareref", "currency", "departure", "arrival"], "FARES"=>[{"arrival"=>"EDI", "departure"=>"LAX", "fareref"=>"DOGMA", "currency"=>"GBP"}, {"arrival"=>"MEL", "departure"=>"SYD", "fareref"=>"MADF", "currency"=>"AUD"}, {"arrival"=>"MCO", "departure"=>"JFK", "fareref"=>"DFSF", "currency"=>"USD"}]}, <<EOY
+---
+ALIASES: [&f fareref, &c currency, &d departure, &a arrival]
+FARES:
+- *f: DOGMA
+  *c: GBP
+  *d: LAX
+  *a: EDI
+
+- *f: MADF
+  *c: AUD
+  *d: SYD
+  *a: MEL
+
+- *f: DFSF
+  *c: USD
+  *d: JFK
+  *a: MCO
+
+EOY
+        )
+
+	end
+
+	def test_spec_mapping_between_sequences
+		# Complex key #1
+		dj = Date.new( 2001, 7, 23 )
+		assert_parse_only(
+			{ [ 'Detroit Tigers', 'Chicago Cubs' ] => [ Date.new( 2001, 7, 23 ) ],
+			  [ 'New York Yankees', 'Atlanta Braves' ] => [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ] }, <<EOY
+? # PLAY SCHEDULE
+  - Detroit Tigers
+  - Chicago Cubs
+:  
+  - 2001-07-23
+
+? [ New York Yankees,
+    Atlanta Braves ]
+: [ 2001-07-02, 2001-08-12, 
+    2001-08-14 ]
+EOY
+		)
+
+		# Complex key #2
+		assert_parse_only(
+		  { [ 'New York Yankees', 'Atlanta Braves' ] =>
+		    [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ),
+			  Date.new( 2001, 8, 14 ) ],
+			[ 'Detroit Tigers', 'Chicago Cubs' ] =>
+			[ Date.new( 2001, 7, 23 ) ]
+		  }, <<EOY
+?
+    - New York Yankees
+    - Atlanta Braves
+:
+  - 2001-07-02
+  - 2001-08-12
+  - 2001-08-14
+?
+    - Detroit Tigers
+    - Chicago Cubs
+:
+  - 2001-07-23
+EOY
+		)
+	end
+
+	def test_spec_sequence_key_shortcut
+		# Shortcut sequence map
+		assert_parse_only(
+		  { 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ),
+		    'bill-to' => 'Chris Dumars', 'product' =>
+			[ { 'item' => 'Super Hoop', 'quantity' => 1 },
+			  { 'item' => 'Basketball', 'quantity' => 4 },
+			  { 'item' => 'Big Shoes', 'quantity' => 1 } ] }, <<EOY
+invoice: 34843
+date   : 2001-01-23
+bill-to: Chris Dumars
+product:
+  - item    : Super Hoop
+    quantity: 1
+  - item    : Basketball
+    quantity: 4
+  - item    : Big Shoes
+    quantity: 1
+EOY
+		)
+	end
+
+    def test_spec_sequence_in_sequence_shortcut
+        # Seq-in-seq
+        assert_parse_only( [ [ [ 'one', 'two', 'three' ] ] ], <<EOY )
+- - - one
+    - two
+    - three
+EOY
+    end
+
+    def test_spec_sequence_shortcuts
+        # Sequence shortcuts combined
+        assert_parse_only( 
+[
+  [ 
+    [ [ 'one' ] ],
+    [ 'two', 'three' ],
+    { 'four' => nil },
+    [ { 'five' => [ 'six' ] } ],
+    [ 'seven' ]
+  ],
+  [ 'eight', 'nine' ]
+], <<EOY )
+- - - - one
+  - - two
+    - three
+  - four:
+  - - five:
+      - six
+  - - seven
+- - eight
+  - nine
+EOY
+    end
+
+	def test_spec_single_literal
+		# Literal scalar block
+		assert_parse_only( [ "\\/|\\/|\n/ |  |_\n" ], <<EOY )
+- |
+    \\/|\\/|
+    / |  |_
+EOY
+	end
+
+	def test_spec_single_folded
+		# Folded scalar block
+		assert_parse_only(
+			[ "Mark McGwire's year was crippled by a knee injury.\n" ], <<EOY
+- >
+    Mark McGwire\'s
+    year was crippled
+    by a knee injury.
+EOY
+		)
+	end
+
+	def test_spec_preserve_indent
+		# Preserve indented spaces
+		assert_parse_only(
+			"Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n", <<EOY
+--- >
+ Sammy Sosa completed another
+ fine season with great stats.
+
+   63 Home Runs
+   0.288 Batting Average
+
+ What a year!
+EOY
+		)
+	end
+
+	def test_spec_indentation_determines_scope
+		assert_parse_only(
+			{ 'name' => 'Mark McGwire', 'accomplishment' => "Mark set a major league home run record in 1998.\n",
+			  'stats' => "65 Home Runs\n0.278 Batting Average\n" }, <<EOY
+name: Mark McGwire
+accomplishment: >
+   Mark set a major league
+   home run record in 1998.
+stats: |
+   65 Home Runs
+   0.278 Batting Average
+EOY
+		)
+	end
+
+	def test_spec_multiline_scalars
+		# Multiline flow scalars
+	 	assert_parse_only(
+	 		{ 'plain' => 'This unquoted scalar spans many lines.',
+	 		  'quoted' => "So does this quoted scalar.\n" }, <<EOY
+plain: This unquoted
+       scalar spans
+       many lines.
+quoted: "\\
+  So does this quoted
+  scalar.\\n"
+EOY
+		)
+	end	
+
+	def test_spec_type_int
+		assert_parse_only(
+			{ 'canonical' => 12345, 'decimal' => 12345, 'octal' => '014'.oct, 'hexadecimal' => '0xC'.hex }, <<EOY
+canonical: 12345
+decimal: +12,345
+octal: 014
+hexadecimal: 0xC
+EOY
+		)
+		assert_parse_only(
+            { 'canonical' => 685230, 'decimal' => 685230, 'octal' => 02472256, 'hexadecimal' => 0x0A74AE, 'sexagesimal' => 685230 }, <<EOY)
+canonical: 685230
+decimal: +685,230
+octal: 02472256
+hexadecimal: 0x0A,74,AE
+sexagesimal: 190:20:30
+EOY
+	end
+
+	def test_spec_type_float
+		assert_parse_only(
+			{ 'canonical' => 1230.15, 'exponential' => 1230.15, 'fixed' => 1230.15,
+			  'negative infinity' => -1.0/0.0 }, <<EOY)
+canonical: 1.23015e+3
+exponential: 12.3015e+02
+fixed: 1,230.15
+negative infinity: -.inf
+EOY
+		nan = YAML::load( <<EOY )
+not a number: .NaN
+EOY
+		assert( nan['not a number'].nan? )
+	end
+
+	def test_spec_type_misc
+		assert_parse_only(
+			{ nil => nil, true => true, false => false, 'string' => '12345' }, <<EOY
+null: ~
+true: yes
+false: no
+string: '12345'
+EOY
+		)
+	end
+
+	def test_spec_complex_invoice
+		# Complex invoice type
+		id001 = { 'given' => 'Chris', 'family' => 'Dumars', 'address' =>
+			{ 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak',
+			  'state' => 'MI', 'postal' => 48046 } }
+		assert_parse_only(
+			{ 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ),
+			  'bill-to' => id001, 'ship-to' => id001, 'product' =>
+			  [ { 'sku' => 'BL394D', 'quantity' => 4,
+			      'description' => 'Basketball', 'price' => 450.00 },
+				{ 'sku' => 'BL4438H', 'quantity' => 1,
+				  'description' => 'Super Hoop', 'price' => 2392.00 } ],
+			  'tax' => 251.42, 'total' => 4443.52,
+			  'comments' => "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.\n" }, <<EOY
+invoice: 34843
+date   : 2001-01-23
+bill-to: &id001
+    given  : Chris
+    family : !str Dumars
+    address:
+        lines: |
+            458 Walkman Dr.
+            Suite #292
+        city    : Royal Oak
+        state   : MI
+        postal  : 48046
+ship-to: *id001
+product:
+    - !map
+      sku         : BL394D
+      quantity    : 4
+      description : Basketball
+      price       : 450.00
+    - sku         : BL4438H
+      quantity    : 1
+      description : Super Hoop
+      price       : 2392.00
+tax  : 251.42
+total: 4443.52
+comments: >
+    Late afternoon is best.
+    Backup contact is Nancy
+    Billsmer @ 338-4338.
+EOY
+		)
+	end
+
+	def test_spec_log_file
+		doc_ct = 0
+		YAML::load_documents( <<EOY
+---
+Time: 2001-11-23 15:01:42 -05:00
+User: ed
+Warning: >
+  This is an error message
+  for the log file
+---
+Time: 2001-11-23 15:02:31 -05:00
+User: ed
+Warning: >
+  A slightly different error
+  message.
+---
+Date: 2001-11-23 15:03:17 -05:00
+User: ed
+Fatal: >
+  Unknown variable "bar"
+Stack:
+  - file: TopClass.py
+    line: 23
+    code: |
+      x = MoreObject("345\\n")
+  - file: MoreClass.py
+    line: 58
+    code: |-
+      foo = bar
+EOY
+		) { |doc|
+			case doc_ct
+				when 0
+					assert_equal( doc, { 'Time' => mktime( 2001, 11, 23, 15, 01, 42, 00, "-05:00" ),
+						'User' => 'ed', 'Warning' => "This is an error message for the log file\n" } )
+				when 1
+					assert_equal( doc, { 'Time' => mktime( 2001, 11, 23, 15, 02, 31, 00, "-05:00" ),
+						'User' => 'ed', 'Warning' => "A slightly different error message.\n" } )
+				when 2
+					assert_equal( doc, { 'Date' => mktime( 2001, 11, 23, 15, 03, 17, 00, "-05:00" ),
+						'User' => 'ed', 'Fatal' => "Unknown variable \"bar\"\n",
+						'Stack' => [
+							{ 'file' => 'TopClass.py', 'line' => 23, 'code' => "x = MoreObject(\"345\\n\")\n" },
+							{ 'file' => 'MoreClass.py', 'line' => 58, 'code' => "foo = bar" } ] } )
+			end
+			doc_ct += 1
+		}
+		assert_equal( doc_ct, 3 )
+	end
+
+	def test_spec_root_fold
+		y = YAML::load( <<EOY
+--- >
+This YAML stream contains a single text value.
+The next stream is a log file - a sequence of
+log entries. Adding an entry to the log is a
+simple matter of appending it at the end.
+EOY
+		)
+		assert_equal( y, "This YAML stream contains a single text value. The next stream is a log file - a sequence of log entries. Adding an entry to the log is a simple matter of appending it at the end.\n" )
+	end
+
+	def test_spec_root_mapping
+		y = YAML::load( <<EOY
+# This stream is an example of a top-level mapping.
+invoice : 34843
+date    : 2001-01-23
+total   : 4443.52
+EOY
+		)
+		assert_equal( y, { 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ), 'total' => 4443.52 } )
+	end
+
+	def test_spec_oneline_docs
+		doc_ct = 0
+		YAML::load_documents( <<EOY
+# The following is a sequence of three documents.
+# The first contains an empty mapping, the second
+# an empty sequence, and the last an empty string.
+--- {}
+--- [ ]
+--- ''
+EOY
+		) { |doc|
+			case doc_ct
+				when 0
+					assert_equal( doc, {} )
+				when 1
+					assert_equal( doc, [] )
+				when 2
+					assert_equal( doc, '' )
+			end
+			doc_ct += 1
+		}
+		assert_equal( doc_ct, 3 )
+	end
+
+	def test_spec_domain_prefix
+        customer_proc = proc { |type, val|
+            if Hash === val
+                scheme, domain, type = type.split( ':', 3 )
+                val['type'] = "domain #{type}"
+                val
+            else
+                raise ArgumentError, "Not a Hash in domain.tld,2002/invoice: " + val.inspect
+            end
+        }
+        YAML.add_domain_type( "domain.tld,2002", 'invoice', &customer_proc )
+        YAML.add_domain_type( "domain.tld,2002", 'customer', &customer_proc )
+		assert_parse_only( { "invoice"=> { "customers"=> [ { "given"=>"Chris", "type"=>"domain customer", "family"=>"Dumars" } ], "type"=>"domain invoice" } }, <<EOY
+# 'http://domain.tld,2002/invoice' is some type family.
+invoice: !domain.tld,2002/^invoice
+  # 'seq' is shorthand for 'http://yaml.org/seq'.
+  # This does not effect '^customer' below
+  # because it is does not specify a prefix.
+  customers: !seq
+    # '^customer' is shorthand for the full
+    # notation 'http://domain.tld,2002/customer'.
+    - !^customer
+      given : Chris
+      family : Dumars
+EOY
+		)
+	end
+
+	def test_spec_throwaway
+		assert_parse_only(
+			{"this"=>"contains three lines of text.\nThe third one starts with a\n# character. This isn't a comment.\n"}, <<EOY
+### These are four throwaway comment  ###
+
+### lines (the second line is empty). ###
+this: |   # Comments may trail lines.
+    contains three lines of text.
+    The third one starts with a
+    # character. This isn't a comment.
+
+# These are three throwaway comment
+# lines (the first line is empty).
+EOY
+		)
+	end
+
+	def test_spec_force_implicit
+		# Force implicit
+		assert_parse_only( 
+			{ 'integer' => 12, 'also int' => 12, 'string' => '12' }, <<EOY
+integer: 12
+also int: ! "12"
+string: !str 12
+EOY
+		)
+	end
+
+	def test_spec_private_types
+		doc_ct = 0
+		YAML::parse_documents( <<EOY
+# Private types are per-document.
+---
+pool: !!ball
+   number: 8
+   color: black
+---
+bearing: !!ball
+   material: steel
+EOY
+		) { |doc|
+			case doc_ct
+				when 0
+					assert_equal( doc['pool'].type_id, 'x-private:ball' )
+					assert_equal( doc['pool'].transform.value, { 'number' => 8, 'color' => 'black' } )
+				when 1
+					assert_equal( doc['bearing'].type_id, 'x-private:ball' ) 
+					assert_equal( doc['bearing'].transform.value, { 'material' => 'steel' } )
+			end
+			doc_ct += 1
+		}
+		assert_equal( doc_ct, 2 )
+	end
+
+	def test_spec_url_escaping
+		YAML.add_domain_type( "domain.tld,2002", "type0" ) { |type, val|
+			"ONE: #{val}"
+		}
+		YAML.add_domain_type( "domain.tld,2002", "type%30" ) { |type, val|
+			"TWO: #{val}"
+		}
+		assert_parse_only(
+			{ 'same' => [ 'ONE: value', 'ONE: value' ], 'different' => [ 'TWO: value' ] }, <<EOY
+same:
+  - !domain.tld,2002/type\\x30 value
+  - !domain.tld,2002/type0 value
+different: # As far as the YAML parser is concerned
+  - !domain.tld,2002/type%30 value
+EOY
+		)
+	end
+
+	def test_spec_override_anchor
+		# Override anchor
+		a001 = "The alias node below is a repeated use of this value.\n"
+		assert_parse_only( 
+			{ 'anchor' => 'This scalar has an anchor.', 'override' => a001, 'alias' => a001 }, <<EOY
+anchor : &A001 This scalar has an anchor.
+override : &A001 >
+ The alias node below is a
+ repeated use of this value.
+alias : *A001
+EOY
+		)
+	end
+
+	def test_spec_explicit_families
+        YAML.add_domain_type( "somewhere.com,2002", 'type' ) { |type, val|
+            "SOMEWHERE: #{val}"
+        }
+		assert_parse_only(
+			{ 'not-date' => '2002-04-28', 'picture' => "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236i^\020' \202\n\001\000;", 'hmm' => "SOMEWHERE: family above is short for\nhttp://somewhere.com/type\n" }, <<EOY
+not-date: !str 2002-04-28
+picture: !binary |
+ R0lGODlhDAAMAIQAAP//9/X
+ 17unp5WZmZgAAAOfn515eXv
+ Pz7Y6OjuDg4J+fn5OTk6enp
+ 56enmleECcgggoBADs=
+
+hmm: !somewhere.com,2002/type | 
+ family above is short for
+ http://somewhere.com/type
+EOY
+		)
+	end
+
+	def test_spec_application_family
+		# Testing the clarkevans.com graphs
+		YAML.add_domain_type( "clarkevans.com,2002", 'graph/shape' ) { |type, val|
+			if Array === val
+				val << "Shape Container"
+				val
+			else
+				raise ArgumentError, "Invalid graph of type #{val.class}: " + val.inspect
+			end
+		}
+		one_shape_proc = Proc.new { |type, val|
+			if Hash === val
+                type = type.split( /:/ )
+				val['TYPE'] = "Shape: #{type[2]}"
+				val
+			else
+				raise ArgumentError, "Invalid graph of type #{val.class}: " + val.inspect
+			end
+		}
+		YAML.add_domain_type( "clarkevans.com,2002", 'graph/circle', &one_shape_proc )
+		YAML.add_domain_type( "clarkevans.com,2002", 'graph/line', &one_shape_proc )
+		YAML.add_domain_type( "clarkevans.com,2002", 'graph/text', &one_shape_proc )
+		assert_parse_only(
+			[[{"radius"=>7, "center"=>{"x"=>73, "y"=>129}, "TYPE"=>"Shape: graph/circle"}, {"finish"=>{"x"=>89, "y"=>102}, "TYPE"=>"Shape: graph/line", "start"=>{"x"=>73, "y"=>129}}, {"TYPE"=>"Shape: graph/text", "value"=>"Pretty vector drawing.", "start"=>{"x"=>73, "y"=>129}, "color"=>16772795}, "Shape Container"]], <<EOY
+- !clarkevans.com,2002/graph/^shape
+  - !^circle
+    center: &ORIGIN {x: 73, y: 129}
+    radius: 7
+  - !^line # !clarkevans.com,2002/graph/line
+    start: *ORIGIN
+    finish: { x: 89, y: 102 }
+  - !^text
+    start: *ORIGIN
+    color: 0xFFEEBB
+    value: Pretty vector drawing.
+EOY
+		)
+	end
+
+	def test_spec_float_explicit
+		assert_parse_only(
+			[ 10.0, 10.0, 10.0, 10.0 ], <<EOY
+# All entries in the sequence
+# have the same type and value.
+- 10.0
+- !float 10
+- !yaml.org,2002/^float '10'
+- !yaml.org,2002/float "\\
+  1\\
+  0"
+EOY
+		)
+	end
+
+	def test_spec_builtin_seq
+		# Assortment of sequences
+		assert_parse_only(
+			{ 'empty' => [], 'in-line' => [ 'one', 'two', 'three', 'four', 'five' ],
+			  'nested' => [ 'First item in top sequence', [ 'Subordinate sequence entry' ],
+			  	"A multi-line sequence entry\n", 'Sixth item in top sequence' ] }, <<EOY
+empty: []
+in-line: [ one, two, three # May span lines,
+         , four,           # indentation is
+           five ]          # mostly ignored.
+nested:
+ - First item in top sequence
+ -
+  - Subordinate sequence entry
+ - >
+   A multi-line
+   sequence entry
+ - Sixth item in top sequence
+EOY
+		)
+	end
+
+	def test_spec_builtin_map
+		# Assortment of mappings
+		assert_parse_only( 
+			{ 'empty' => {}, 'in-line' => { 'one' => 1, 'two' => 2 },
+			  'spanning' => { 'one' => 1, 'two' => 2 },
+			  'nested' => { 'first' => 'First entry', 'second' =>
+			  	{ 'key' => 'Subordinate mapping' }, 'third' =>
+				  [ 'Subordinate sequence', {}, 'Previous mapping is empty.',
+					{ 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' },
+					'The previous entry is equal to the following one.',
+					{ 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' } ],
+				  12.0 => 'This key is a float.', "?\n" => 'This key had to be protected.',
+				  "\a" => 'This key had to be escaped.',
+				  "This is a multi-line folded key\n" => "Whose value is also multi-line.\n",
+				  [ 'This key', 'is a sequence' ] => [ 'With a sequence value.' ] } }, <<EOY
+
+empty: {}
+in-line: { one: 1, two: 2 }
+spanning: { one: 1,
+   two: 2 }
+nested:
+ first : First entry
+ second:
+  key: Subordinate mapping
+ third:
+  - Subordinate sequence
+  - { }
+  - Previous mapping is empty.
+  - A key: value pair in a sequence.
+    A second: key:value pair.
+  - The previous entry is equal to the following one.
+  -
+    A key: value pair in a sequence.
+    A second: key:value pair.
+ !float 12 : This key is a float.
+ ? >
+  ?
+ : This key had to be protected.
+ "\\a" : This key had to be escaped.
+ ? >
+   This is a
+   multi-line
+   folded key
+ : >
+   Whose value is
+   also multi-line.
+ ?
+  - This key
+  - is a sequence
+ :
+  - With a sequence value.
+# The following parses correctly,
+# but Ruby 1.6.* fails the comparison!
+# ?
+#  This: key
+#  is a: mapping
+# :
+#  with a: mapping value.
+EOY
+		)
+	end
+
+	def test_spec_builtin_literal_blocks
+		# Assortment of literal scalar blocks
+		assert_parse_only(
+			{"both are equal to"=>"  This has no newline.", "is equal to"=>"The \\ ' \" characters may be\nfreely used. Leading white\n   space is significant.\n\nLine breaks are significant.\nThus this value contains one\nempty line and ends with a\nsingle line break, but does\nnot start with one.\n", "also written as"=>"  This has no newline.", "indented and chomped"=>"  This has no newline.", "empty"=>"", "literal"=>"The \\ ' \" characters may be\nfreely used. Leading white\n   space is significant.\n\nLine breaks are significant.\nThus this value contains one\nempty line and ends with a\nsingle line break, but does\nnot start with one.\n"}, <<EOY
+empty: |
+
+literal: |
+ The \\ ' " characters may be
+ freely used. Leading white
+    space is significant.
+
+ Line breaks are significant.
+ Thus this value contains one
+ empty line and ends with a
+ single line break, but does
+ not start with one.
+
+is equal to: "The \\ ' \\" characters may \\
+ be\\nfreely used. Leading white\\n   space \\
+ is significant.\\n\\nLine breaks are \\
+ significant.\\nThus this value contains \\
+ one\\nempty line and ends with a\\nsingle \\
+ line break, but does\\nnot start with one.\\n"
+
+# Comments may follow a nested
+# scalar value. They must be
+# less indented.
+
+# Modifiers may be combined in any order.
+indented and chomped: |2-
+    This has no newline.
+
+also written as: |-2
+    This has no newline.
+
+both are equal to: "  This has no newline."
+EOY
+		)
+
+		str1 = "This has one newline.\n"
+		str2 = "This has no newline."
+		str3 = "This has two newlines.\n\n"
+		assert_parse_only( 
+			{ 'clipped' => str1, 'same as "clipped" above' => str1, 
+			  'stripped' => str2, 'same as "stripped" above' => str2, 
+			  'kept' => str3, 'same as "kept" above' => str3 }, <<EOY
+clipped: |
+    This has one newline.
+
+same as "clipped" above: "This has one newline.\\n"
+
+stripped: |-
+    This has no newline.
+
+same as "stripped" above: "This has no newline."
+
+kept: |+
+    This has two newlines.
+
+same as "kept" above: "This has two newlines.\\n\\n"
+
+EOY
+		)
+	end
+	
+	def test_spec_span_single_quote
+		assert_parse_only( {"third"=>"a single quote ' must be escaped.", "second"=>"! : \\ etc. can be used freely.", "is same as"=>"this contains six spaces\nand one line break", "empty"=>"", "span"=>"this contains six spaces\nand one line break"}, <<EOY
+empty: ''
+second: '! : \\ etc. can be used freely.'
+third: 'a single quote '' must be escaped.'
+span: 'this contains
+      six spaces
+      
+      and one
+      line break'
+is same as: "this contains six spaces\\nand one line break"
+EOY
+		)
+	end
+
+	def test_spec_span_double_quote
+		assert_parse_only( {"is equal to"=>"this contains four  spaces", "third"=>"a \" or a \\ must be escaped.", "second"=>"! : etc. can be used freely.", "empty"=>"", "fourth"=>"this value ends with an LF.\n", "span"=>"this contains four  spaces"}, <<EOY
+empty: ""
+second: "! : etc. can be used freely."
+third: "a \\\" or a \\\\ must be escaped."
+fourth: "this value ends with an LF.\\n"
+span: "this contains
+  four  \\
+      spaces"
+is equal to: "this contains four  spaces"
+EOY
+		)
+	end
+
+	def test_spec_builtin_time
+		# Time
+		assert_parse_only(
+			{ "space separated" => mktime( 2001, 12, 14, 21, 59, 43, ".10", "-05:00" ), 
+			  "canonical" => mktime( 2001, 12, 15, 2, 59, 43, ".10" ), 
+			  "date (noon UTC)" => Date.new( 2002, 12, 14), 
+			  "valid iso8601" => mktime( 2001, 12, 14, 21, 59, 43, ".10", "-05:00" ) }, <<EOY
+canonical: 2001-12-15T02:59:43.1Z
+valid iso8601: 2001-12-14t21:59:43.10-05:00
+space separated: 2001-12-14 21:59:43.10 -05:00
+date (noon UTC): 2002-12-14
+EOY
+		)
+	end
+
+	def test_spec_builtin_binary
+		arrow_gif = "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236iiiccc\243\243\243\204\204\204\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371!\376\016Made with GIMP\000,\000\000\000\000\f\000\f\000\000\005,  \216\2010\236\343@\024\350i\020\304\321\212\010\034\317\200M$z\357\3770\205p\270\2601f\r\e\316\001\303\001\036\020' \202\n\001\000;"
+		assert_parse_only(
+			{ 'canonical' => arrow_gif, 'base64' => arrow_gif, 
+			  'description' => "The binary value above is a tiny arrow encoded as a gif image.\n" }, <<EOY
+canonical: !binary "\\
+ R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOf\\
+ n515eXvPz7Y6OjuDg4J+fn5OTk6enp56enmlpaW\\
+ NjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++\\
+ f/++f/++f/++f/++f/++f/++f/++SH+Dk1hZGUg\\
+ d2l0aCBHSU1QACwAAAAADAAMAAAFLCAgjoEwnuN\\
+ AFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG84Bww\\
+ EeECcgggoBADs="
+base64: !binary |
+ R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOf
+ n515eXvPz7Y6OjuDg4J+fn5OTk6enp56enmlpaW
+ NjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++
+ f/++f/++f/++f/++f/++f/++f/++SH+Dk1hZGUg
+ d2l0aCBHSU1QACwAAAAADAAMAAAFLCAgjoEwnuN
+ AFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG84Bww
+ EeECcgggoBADs=
+description: >
+ The binary value above is a tiny arrow
+ encoded as a gif image.
+EOY
+		)
+	end
+	def test_ruby_regexp
+		# Test Ruby regular expressions
+		assert_to_yaml( 
+			{ 'simple' => /a.b/, 'complex' => %r'\A"((?:[^"]|\")+)"',
+			  'case-insensitive' => /George McFly/i }, <<EOY
+case-insensitive: !ruby/regexp "/George McFly/i"
+complex: !ruby/regexp "/\\\\A\\"((?:[^\\"]|\\\\\\")+)\\"/"
+simple: !ruby/regexp "/a.b/"
+EOY
+		)
+	end
+
+    #
+    # Test of Ranges
+    #
+    def test_ranges
+
+        # Simple numeric
+        assert_to_yaml( 1..3, <<EOY )
+--- !ruby/range 1..3
+EOY
+
+        # Simple alphabetic
+        assert_to_yaml( 'a'..'z', <<EOY )
+--- !ruby/range a..z
+EOY
+
+        # Float
+        assert_to_yaml( 10.5...30.3, <<EOY )
+--- !ruby/range 10.5...30.3
+EOY
+
+    end
+
+	def test_ruby_struct
+		# Ruby structures
+		book_struct = Struct::new( "BookStruct", :author, :title, :year, :isbn )
+		assert_to_yaml(
+			[ book_struct.new( "Yukihiro Matsumoto", "Ruby in a Nutshell", 2002, "0-596-00214-9" ),
+			  book_struct.new( [ 'Dave Thomas', 'Andy Hunt' ], "The Pickaxe", 2002, 
+				book_struct.new( "This should be the ISBN", "but I have another struct here", 2002, "None" ) 
+			  ) ], <<EOY
+- !ruby/struct:BookStruct
+  author: Yukihiro Matsumoto
+  title: Ruby in a Nutshell
+  year: 2002
+  isbn: 0-596-00214-9
+- !ruby/struct:BookStruct
+  author:
+    - Dave Thomas
+    - Andy Hunt
+  title: The Pickaxe
+  year: 2002
+  isbn: !ruby/struct:BookStruct
+    author: This should be the ISBN
+    title: but I have another struct here
+    year: 2002
+    isbn: None
+EOY
+		)
+
+        assert_to_yaml( YAML_Tests::StructTest.new( 123 ), <<EOY )
+--- !ruby/struct:YAML_Tests::StructTest
+c: 123
+EOY
+
+	end
+
+	def test_emitting_indicators
+		assert_to_yaml( "Hi, from Object 1. You passed: please, pretty please", <<EOY
+--- "Hi, from Object 1. You passed: please, pretty please"
+EOY
+		)
+	end
+
+	#
+	# Test the YAML::Stream class -- INACTIVE at the moment
+	#
+	def test_document
+		y = YAML::Stream.new( :Indent => 2, :UseVersion => 0 )
+		y.add( 
+			{ 'hi' => 'hello', 'map' =>
+				{ 'good' => 'two' },
+			  'time' => Time.now,
+			  'try' => /^po(.*)$/,
+			  'bye' => 'goodbye'
+			}
+		)
+		y.add( { 'po' => 'nil', 'oper' => 90 } )
+		y.add( { 'hi' => 'wow!', 'bye' => 'wow!' } )
+		y.add( { [ 'Red Socks', 'Boston' ] => [ 'One', 'Two', 'Three' ] } )
+		y.add( [ true, false, false ] )
+	end
+
+    #
+    # Test YPath choices parsing
+    #
+    def test_ypath_parsing
+        assert_path_segments( "/*/((one|three)/name|place)|//place",
+          [ ["*", "one", "name"],
+            ["*", "three", "name"],
+            ["*", "place"],
+            ["/", "place"] ]
+        )
+    end
+
+    #
+    # Tests from Tanaka Akira on [ruby-core]
+    #
+    def test_akira
+
+        # Commas in plain scalars [ruby-core:1066]
+        assert_to_yaml(
+            {"A"=>"A,","B"=>"B"}, <<EOY
+A: "A,"
+B: B
+EOY
+        )
+
+        # Double-quoted keys [ruby-core:1069]
+        assert_to_yaml(
+            {"1"=>2, "2"=>3}, <<EOY
+'1': 2
+"2": 3
+EOY
+        )
+
+        # Anchored mapping [ruby-core:1071]
+        assert_to_yaml(
+            [{"a"=>"b"}] * 2, <<EOY
+- &id001
+  a: b
+- *id001
+EOY
+        )
+
+        # Stress test [ruby-core:1071]
+        # a = []; 1000.times { a << {"a"=>"b", "c"=>"d"} }
+        # YAML::load( a.to_yaml )
+
+    end
+
+    #
+    # Test Time.now cycle
+    #
+    def test_time_now_cycle
+        #
+        # From Minero Aoki [ruby-core:2305]
+        #
+        require 'yaml'
+        t = Time.now
+        5.times do
+            assert_cycle(t)
+        end
+    end
+
+    #
+    # Test Range cycle
+    #
+    def test_range_cycle
+      #
+      # From Minero Aoki [ruby-core:02306]
+      #
+      assert_cycle("a".."z")
+
+      #
+      # From Nobu Nakada [ruby-core:02311]
+      #
+      assert_cycle(0..1)
+      assert_cycle(1.0e20 .. 2.0e20)
+      assert_cycle("0".."1")
+      assert_cycle(".."..."...")
+      assert_cycle(".rb"..".pl")
+      assert_cycle(".rb"...".pl")
+      assert_cycle('"'...".")
+      assert_cycle("'"...".")
+    end
+
+    #
+    # Circular references
+    #
+    def test_circular_references
+        a = []; a[0] = a; a[1] = a
+        inspect_str = "[[...], [...]]"
+        assert_equal( inspect_str, YAML::load( a.to_yaml ).inspect )
+    end
+
+    #
+    # Test Symbol cycle
+    #
+    def test_symbol_cycle
+      #
+      # From Aaron Schrab [ruby-Bugs:2535]
+      #
+      assert_cycle(:"^foo")
+    end
+
+    #
+    # Test Numeric cycle
+    #
+    class NumericTest < Numeric
+      def initialize(value)
+        @value = value
+      end
+      def ==(other)
+        @value == other.instance_eval{ @value }
+      end
+    end
+    def test_numeric_cycle
+      assert_cycle(1) # Fixnum
+      assert_cycle(111111111111111111111111111111111) # Bignum
+      assert_cycle(NumericTest.new(3)) # Subclass of Numeric
+    end
+
+    #
+    # Test empty map/seq in map cycle
+    #
+    def test_empty_map_key
+      #
+      # empty seq as key
+      #
+      o = YAML.load({[]=>""}.to_yaml)
+      assert_equal(Hash, o.class)
+      assert_equal([[]], o.keys)
+
+      #
+      # empty map as key
+      #
+      o = YAML.load({{}=>""}.to_yaml)
+      assert_equal(Hash, o.class)
+      assert_equal([{}], o.keys)
+    end
+
+end
+
+if $0 == __FILE__
+  suite = Test::Unit::TestSuite.new('YAML')
+  ObjectSpace.each_object(Class) do |klass|
+    suite << klass.suite if (Test::Unit::TestCase > klass)
+  end
+  require 'test/unit/ui/console/testrunner'
+  Test::Unit::UI::Console::TestRunner.run(suite).passed?
+end
diff --git a/ruby_1_8_6/test/zlib/test_zlib.rb b/ruby_1_8_6/test/zlib/test_zlib.rb
new file mode 100644
index 0000000000..54706099d9
--- /dev/null
+++ b/ruby_1_8_6/test/zlib/test_zlib.rb
@@ -0,0 +1,57 @@
+require 'test/unit/testsuite'
+require 'test/unit/testcase'
+require 'stringio'
+
+begin
+  require 'zlib'
+rescue LoadError
+end
+
+if defined? Zlib
+  class TestZlibGzipReader < Test::Unit::TestCase
+    D0 = "\037\213\010\000S`\017A\000\003\003\000\000\000\000\000\000\000\000\000"
+    def test_read0
+      assert_equal("", Zlib::GzipReader.new(StringIO.new(D0)).read(0))
+    end
+
+    def test_ungetc # [ruby-dev:24060]
+      s = ""
+      w = Zlib::GzipWriter.new(StringIO.new(s))
+      w << (1...1000).to_a.inspect
+      w.close
+      r = Zlib::GzipReader.new(StringIO.new(s))
+      r.read(100)
+      r.ungetc ?a
+      assert_nothing_raised {
+        r.read(100)
+        r.read
+        r.close
+      }
+    end
+
+    def test_ungetc_paragraph # [ruby-dev:24065]
+      s = ""
+      w = Zlib::GzipWriter.new(StringIO.new(s))
+      w << "abc"
+      w.close
+      r = Zlib::GzipReader.new(StringIO.new(s))
+      r.ungetc ?\n
+      assert_equal("abc", r.gets(""))
+      assert_nothing_raised {
+        r.read
+        r.close
+      }
+    end
+  end
+
+  class TestZlibGzipWriter < Test::Unit::TestCase
+    def test_invalid_new
+      # [ruby-dev:23228]
+      assert_raise(NoMethodError) { Zlib::GzipWriter.new(nil).close }
+      # [ruby-dev:23344]
+      assert_raise(NoMethodError) { Zlib::GzipWriter.new(true).close }
+      assert_raise(NoMethodError) { Zlib::GzipWriter.new(0).close }
+      assert_raise(NoMethodError) { Zlib::GzipWriter.new(:hoge).close }
+    end
+  end
+end
diff --git a/ruby_1_8_6/time.c b/ruby_1_8_6/time.c
new file mode 100644
index 0000000000..c749020737
--- /dev/null
+++ b/ruby_1_8_6/time.c
@@ -0,0 +1,2140 @@
+/**********************************************************************
+
+  time.c -
+
+  $Author$
+  $Date$
+  created at: Tue Dec 28 14:31:59 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+#include <sys/types.h>
+#include <time.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <math.h>
+
+VALUE rb_cTime;
+
+struct time_object {
+    struct timeval tv;
+    struct tm tm;
+    int gmt;
+    int tm_got;
+};
+
+#define GetTimeval(obj, tobj) \
+    Data_Get_Struct(obj, struct time_object, tobj)
+
+static void time_free _((void *));
+static VALUE time_utc_offset _((VALUE));
+
+static void
+time_free(tobj)
+    void *tobj;
+{
+    if (tobj) free(tobj);
+}
+
+static VALUE time_s_alloc _((VALUE));
+static VALUE
+time_s_alloc(klass)
+    VALUE klass;
+{
+    VALUE obj;
+    struct time_object *tobj;
+
+    obj = Data_Make_Struct(klass, struct time_object, 0, time_free, tobj);
+    tobj->tm_got=0;
+    tobj->tv.tv_sec = 0;
+    tobj->tv.tv_usec = 0;
+
+    return obj;
+}
+
+static void
+time_modify(time)
+    VALUE time;
+{
+    rb_check_frozen(time);
+    if (!OBJ_TAINTED(time) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify Time");
+}
+
+/*
+ *  Document-method: now
+ *
+ *  Synonym for <code>Time.new</code>. Returns a +Time+ object
+ *  initialized tot he current system time.
+ *
+ *  call-seq:
+ *     Time.new -> time
+ *  
+ *  Returns a <code>Time</code> object initialized to the current system
+ *  time. <b>Note:</b> The object created will be created using the
+ *  resolution available on your system clock, and so may include
+ *  fractional seconds.
+ *     
+ *     a = Time.new      #=> Wed Apr 09 08:56:03 CDT 2003
+ *     b = Time.new      #=> Wed Apr 09 08:56:03 CDT 2003
+ *     a == b            #=> false
+ *     "%.6f" % a.to_f   #=> "1049896563.230740"
+ *     "%.6f" % b.to_f   #=> "1049896563.231466"
+ *     
+ */
+
+static VALUE
+time_init(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    time_modify(time);
+    GetTimeval(time, tobj);
+    tobj->tm_got=0;
+    tobj->tv.tv_sec = 0;
+    tobj->tv.tv_usec = 0;
+    if (gettimeofday(&tobj->tv, 0) < 0) {
+	rb_sys_fail("gettimeofday");
+    }
+
+    return time;
+}
+
+#define NDIV(x,y) (-(-((x)+1)/(y))-1)
+#define NMOD(x,y) ((y)-(-((x)+1)%(y))-1)
+
+static void
+time_overflow_p(secp, usecp)
+    time_t *secp, *usecp;
+{
+    time_t tmp, sec = *secp, usec = *usecp;
+
+    if (usec >= 1000000) {	/* usec positive overflow */
+	tmp = sec + usec / 1000000;
+	usec %= 1000000;
+	if (sec > 0 && tmp < 0) {
+	    rb_raise(rb_eRangeError, "out of Time range");
+	}
+	sec = tmp;
+    }
+    if (usec < 0) {		/* usec negative overflow */
+	tmp = sec + NDIV(usec,1000000); /* negative div */
+	usec = NMOD(usec,1000000);      /* negative mod */
+	if (sec < 0 && tmp > 0) {
+	    rb_raise(rb_eRangeError, "out of Time range");
+	}
+	sec = tmp;
+    }
+#ifndef NEGATIVE_TIME_T
+    if (sec < 0 || (sec == 0 && usec < 0))
+	rb_raise(rb_eArgError, "time must be positive");
+#endif
+    *secp = sec;
+    *usecp = usec;
+}
+
+static VALUE time_new_internal _((VALUE, time_t, time_t));
+static VALUE
+time_new_internal(klass, sec, usec)
+    VALUE klass;
+    time_t sec, usec;
+{
+    VALUE time = time_s_alloc(klass);
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    time_overflow_p(&sec, &usec);
+    tobj->tv.tv_sec = sec;
+    tobj->tv.tv_usec = usec;
+
+    return time;
+}
+
+VALUE
+rb_time_new(sec, usec)
+    time_t sec, usec;
+{
+    return time_new_internal(rb_cTime, sec, usec);
+}
+
+static struct timeval
+time_timeval(time, interval)
+    VALUE time;
+    int interval;
+{
+    struct timeval t;
+    char *tstr = interval ? "time interval" : "time";
+
+#ifndef NEGATIVE_TIME_T
+    interval = 1;
+#endif
+
+    switch (TYPE(time)) {
+      case T_FIXNUM:
+	t.tv_sec = FIX2LONG(time);
+	if (interval && t.tv_sec < 0)
+	    rb_raise(rb_eArgError, "%s must be positive", tstr);
+	t.tv_usec = 0;
+	break;
+
+      case T_FLOAT:
+	if (interval && RFLOAT(time)->value < 0.0)
+	    rb_raise(rb_eArgError, "%s must be positive", tstr);
+	else {
+	    double f, d;
+
+	    d = modf(RFLOAT(time)->value, &f);
+	    t.tv_sec = (time_t)f;
+	    if (f != t.tv_sec) {
+		rb_raise(rb_eRangeError, "%f out of Time range", RFLOAT(time)->value);
+	    }
+	    t.tv_usec = (time_t)(d*1e6+0.5);
+	}
+	break;
+
+      case T_BIGNUM:
+	t.tv_sec = NUM2LONG(time);
+	if (interval && t.tv_sec < 0)
+	    rb_raise(rb_eArgError, "%s must be positive", tstr);
+	t.tv_usec = 0;
+	break;
+
+      default:
+	rb_raise(rb_eTypeError, "can't convert %s into %s",
+		 rb_obj_classname(time), tstr);
+	break;
+    }
+    return t;
+}
+
+struct timeval
+rb_time_interval(time)
+    VALUE time;
+{
+    return time_timeval(time, Qtrue);
+}
+
+struct timeval
+rb_time_timeval(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+    struct timeval t;
+
+    if (TYPE(time) == T_DATA && RDATA(time)->dfree == time_free) {
+	GetTimeval(time, tobj);
+	t = tobj->tv;
+	return t;
+    }
+    return time_timeval(time, Qfalse);
+}
+
+/*
+ *  call-seq:
+ *     Time.at( aTime ) => time
+ *     Time.at( seconds [, microseconds] ) => time
+ *  
+ *  Creates a new time object with the value given by <i>aTime</i>, or
+ *  the given number of <i>seconds</i> (and optional
+ *  <i>microseconds</i>) from epoch. A non-portable feature allows the
+ *  offset to be negative on some systems.
+ *     
+ *     Time.at(0)            #=> Wed Dec 31 18:00:00 CST 1969
+ *     Time.at(946702800)    #=> Fri Dec 31 23:00:00 CST 1999
+ *     Time.at(-284061600)   #=> Sat Dec 31 00:00:00 CST 1960
+ */
+
+static VALUE
+time_s_at(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    struct timeval tv;
+    VALUE time, t;
+
+    if (rb_scan_args(argc, argv, "11", &time, &t) == 2) {
+	tv.tv_sec = NUM2LONG(time);
+	tv.tv_usec = NUM2LONG(t);
+    }
+    else {
+	tv = rb_time_timeval(time);
+    }
+    t = time_new_internal(klass, tv.tv_sec, tv.tv_usec);
+    if (TYPE(time) == T_DATA && RDATA(time)->dfree == time_free) {
+	struct time_object *tobj, *tobj2;
+
+	GetTimeval(time, tobj);
+	GetTimeval(t, tobj2);
+	tobj2->gmt = tobj->gmt;
+    }
+    return t;
+}
+
+static char *months [12] = {
+    "jan", "feb", "mar", "apr", "may", "jun",
+    "jul", "aug", "sep", "oct", "nov", "dec",
+};
+
+static long
+obj2long(obj)
+    VALUE obj;
+{
+    if (TYPE(obj) == T_STRING) {
+	obj = rb_str_to_inum(obj, 10, Qfalse);
+    }
+
+    return NUM2LONG(obj);
+}
+
+static void
+time_arg(argc, argv, tm, usec)
+    int argc;
+    VALUE *argv;
+    struct tm *tm;
+    time_t *usec;
+{
+    VALUE v[8];
+    int i;
+    long year;
+
+    MEMZERO(tm, struct tm, 1);
+    *usec = 0;
+    if (argc == 10) {
+	v[0] = argv[5];
+	v[1] = argv[4];
+	v[2] = argv[3];
+	v[3] = argv[2];
+	v[4] = argv[1];
+	v[5] = argv[0];
+	v[6] = Qnil;
+	tm->tm_isdst = RTEST(argv[8]) ? 1 : 0;
+    }
+    else {
+	rb_scan_args(argc, argv, "17", &v[0],&v[1],&v[2],&v[3],&v[4],&v[5],&v[6],&v[7]);
+	/* v[6] may be usec or zone (parsedate) */
+	/* v[7] is wday (parsedate; ignored) */
+	tm->tm_wday = -1;
+	tm->tm_isdst = -1;
+    }
+
+    year = obj2long(v[0]);
+
+    if (0 <= year && year < 39) {
+	year += 100;
+	rb_warning("2 digits year is used");
+    }
+    else if (69 <= year && year < 139) {
+	rb_warning("2 or 3 digits year is used");
+    }
+    else {
+	year -= 1900;
+    }
+
+    tm->tm_year = year;
+
+    if (NIL_P(v[1])) {
+	tm->tm_mon = 0;
+    }
+    else {
+	VALUE s = rb_check_string_type(v[1]);
+	if (!NIL_P(s)) {
+	    tm->tm_mon = -1;
+	    for (i=0; i<12; i++) {
+		if (RSTRING(s)->len == 3 &&
+		    strcasecmp(months[i], RSTRING(v[1])->ptr) == 0) {
+		    tm->tm_mon = i;
+		    break;
+		}
+	    }
+	    if (tm->tm_mon == -1) {
+		char c = RSTRING(s)->ptr[0];
+
+		if ('0' <= c && c <= '9') {
+		    tm->tm_mon = obj2long(s)-1;
+		}
+	    }
+	}
+	else {
+	    tm->tm_mon = obj2long(v[1])-1;
+	}
+    }
+    if (NIL_P(v[2])) {
+	tm->tm_mday = 1;
+    }
+    else {
+	tm->tm_mday = obj2long(v[2]);
+    }
+    tm->tm_hour = NIL_P(v[3])?0:obj2long(v[3]);
+    tm->tm_min  = NIL_P(v[4])?0:obj2long(v[4]);
+    tm->tm_sec  = NIL_P(v[5])?0:obj2long(v[5]);
+    if (!NIL_P(v[6])) {
+	if (argc == 8) {
+	    /* v[6] is timezone, but ignored */
+	}
+	else if (argc == 7) {
+	    *usec = obj2long(v[6]);
+	}
+    }
+
+    /* value validation */
+    if (
+           tm->tm_year != year ||
+#ifndef NEGATIVE_TIME_T
+           tm->tm_year < 69 ||
+#endif
+	   tm->tm_mon  < 0 || tm->tm_mon  > 11
+	|| tm->tm_mday < 1 || tm->tm_mday > 31
+	|| tm->tm_hour < 0 || tm->tm_hour > 23
+	|| tm->tm_min  < 0 || tm->tm_min  > 59
+	|| tm->tm_sec  < 0 || tm->tm_sec  > 60)
+	rb_raise(rb_eArgError, "argument out of range");
+}
+
+static VALUE time_gmtime _((VALUE));
+static VALUE time_localtime _((VALUE));
+static VALUE time_get_tm _((VALUE, int));
+
+static int
+leap_year_p(y)
+    long y;
+{
+  return ((y % 4 == 0) && (y % 100 != 0)) || (y % 400 == 0);
+}
+
+#define DIV(n,d) ((n)<0 ? NDIV((n),(d)) : (n)/(d))
+
+static time_t
+timegm_noleapsecond(tm)
+    struct tm *tm;
+{
+    static int common_year_yday_offset[] = {
+        -1,
+        -1 + 31,
+        -1 + 31 + 28,
+        -1 + 31 + 28 + 31,
+        -1 + 31 + 28 + 31 + 30,
+        -1 + 31 + 28 + 31 + 30 + 31,
+        -1 + 31 + 28 + 31 + 30 + 31 + 30,
+        -1 + 31 + 28 + 31 + 30 + 31 + 30 + 31,
+        -1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31,
+        -1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
+        -1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
+        -1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30
+          /* 1    2    3    4    5    6    7    8    9    10   11 */
+    };
+    static int leap_year_yday_offset[] = {
+        -1,
+        -1 + 31,
+        -1 + 31 + 29,
+        -1 + 31 + 29 + 31,
+        -1 + 31 + 29 + 31 + 30,
+        -1 + 31 + 29 + 31 + 30 + 31,
+        -1 + 31 + 29 + 31 + 30 + 31 + 30,
+        -1 + 31 + 29 + 31 + 30 + 31 + 30 + 31,
+        -1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31,
+        -1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
+        -1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
+        -1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30
+          /* 1    2    3    4    5    6    7    8    9    10   11 */
+    };
+
+    long tm_year = tm->tm_year;
+    int tm_yday = tm->tm_mday;
+    if (leap_year_p(tm_year + 1900))
+        tm_yday += leap_year_yday_offset[tm->tm_mon];
+    else
+        tm_yday += common_year_yday_offset[tm->tm_mon];
+
+    /*
+     *  `Seconds Since the Epoch' in SUSv3:
+     *  tm_sec + tm_min*60 + tm_hour*3600 + tm_yday*86400 +
+     *  (tm_year-70)*31536000 + ((tm_year-69)/4)*86400 -
+     *  ((tm_year-1)/100)*86400 + ((tm_year+299)/400)*86400
+     */
+    return tm->tm_sec + tm->tm_min*60 + tm->tm_hour*3600 +
+           (time_t)(tm_yday +
+                    (tm_year-70)*365 +
+                    DIV(tm_year-69,4) -
+                    DIV(tm_year-1,100) +
+                    DIV(tm_year+299,400))*86400;
+}
+
+static int
+tmcmp(a, b)
+    struct tm *a;
+    struct tm *b;
+{
+    if (a->tm_year != b->tm_year)
+        return a->tm_year < b->tm_year ? -1 : 1;
+    else if (a->tm_mon != b->tm_mon)
+        return a->tm_mon < b->tm_mon ? -1 : 1;
+    else if (a->tm_mday != b->tm_mday)
+        return a->tm_mday < b->tm_mday ? -1 : 1;
+    else if (a->tm_hour != b->tm_hour)
+        return a->tm_hour < b->tm_hour ? -1 : 1;
+    else if (a->tm_min != b->tm_min)
+        return a->tm_min < b->tm_min ? -1 : 1;
+    else if (a->tm_sec != b->tm_sec)
+        return a->tm_sec < b->tm_sec ? -1 : 1;
+    else
+        return 0;
+}
+
+#if SIZEOF_TIME_T == SIZEOF_LONG
+typedef unsigned long unsigned_time_t;
+#elif SIZEOF_TIME_T == SIZEOF_INT
+typedef unsigned int unsigned_time_t;
+#elif SIZEOF_TIME_T == SIZEOF_LONG_LONG
+typedef unsigned LONG_LONG unsigned_time_t;
+#else
+# error cannot find integer type which size is same as time_t.
+#endif
+
+static time_t
+search_time_t(tptr, utc_p)
+    struct tm *tptr;
+    int utc_p;
+{
+    time_t guess, guess_lo, guess_hi;
+    struct tm *tm, tm_lo, tm_hi;
+    int d, have_guess;
+    int find_dst;
+
+    find_dst = 0 < tptr->tm_isdst;
+
+#ifdef NEGATIVE_TIME_T
+    guess_lo = (time_t)~((unsigned_time_t)~(time_t)0 >> 1);
+#else
+    guess_lo = 0;
+#endif
+    guess_hi = ((time_t)-1) < ((time_t)0) ?
+	       (time_t)((unsigned_time_t)~(time_t)0 >> 1) :
+	       ~(time_t)0;
+
+    guess = timegm_noleapsecond(tptr);
+    tm = (utc_p ? gmtime : localtime)(&guess);
+    if (tm) {
+        d = tmcmp(tptr, tm);
+        if (d == 0) return guess;
+        if (d < 0) {
+            guess_hi = guess;
+            guess -= 24 * 60 * 60;
+        }
+        else {
+            guess_lo = guess;
+            guess += 24 * 60 * 60;
+        }
+        if (guess_lo < guess && guess < guess_hi &&
+            (tm = (utc_p ? gmtime : localtime)(&guess)) != NULL) {
+            d = tmcmp(tptr, tm);
+            if (d == 0) return guess;
+            if (d < 0)
+                guess_hi = guess;
+            else
+                guess_lo = guess;
+        }
+    }
+
+    tm = (utc_p ? gmtime : localtime)(&guess_lo);
+    if (!tm) goto error;
+    d = tmcmp(tptr, tm);
+    if (d < 0) goto out_of_range;
+    if (d == 0) return guess_lo;
+    tm_lo = *tm;
+
+    tm = (utc_p ? gmtime : localtime)(&guess_hi);
+    if (!tm) goto error;
+    d = tmcmp(tptr, tm);
+    if (d > 0) goto out_of_range;
+    if (d == 0) return guess_hi;
+    tm_hi = *tm;
+
+    have_guess = 0;
+
+    while (guess_lo + 1 < guess_hi) {
+      /* there is a gap between guess_lo and guess_hi. */
+      unsigned long range = 0;
+      if (!have_guess) {
+	int a, b;
+	/*
+	  Try precious guess by a linear interpolation at first.
+	  `a' and `b' is a coefficient of guess_lo and guess_hi as:
+
+	    guess = (guess_lo * a + guess_hi * b) / (a + b)
+
+	  However this causes overflow in most cases, following assignment
+	  is used instead:
+
+	    guess = guess_lo / d * a + (guess_lo % d) * a / d
+		  + guess_hi / d * b + (guess_hi % d) * b / d
+	      where d = a + b
+
+	  To avoid overflow in this assignment, `d' is restricted to less than
+	  sqrt(2**31).  By this restriction and other reasons, the guess is
+	  not accurate and some error is expected.  `range' approximates 
+	  the maximum error.
+
+	  When these parameters are not suitable, i.e. guess is not within
+	  guess_lo and guess_hi, simple guess by binary search is used.
+	*/
+	range = 366 * 24 * 60 * 60;
+	a = (tm_hi.tm_year - tptr->tm_year);
+	b = (tptr->tm_year - tm_lo.tm_year);
+	/* 46000 is selected as `some big number less than sqrt(2**31)'. */
+	if (a + b <= 46000 / 12) {
+	  range = 31 * 24 * 60 * 60;
+	  a *= 12;
+	  b *= 12;
+	  a += tm_hi.tm_mon - tptr->tm_mon;
+	  b += tptr->tm_mon - tm_lo.tm_mon;
+	  if (a + b <= 46000 / 31) {
+	    range = 24 * 60 * 60;
+	    a *= 31;
+	    b *= 31;
+	    a += tm_hi.tm_mday - tptr->tm_mday;
+	    b += tptr->tm_mday - tm_lo.tm_mday;
+	    if (a + b <= 46000 / 24) {
+	      range = 60 * 60;
+	      a *= 24;
+	      b *= 24;
+	      a += tm_hi.tm_hour - tptr->tm_hour;
+	      b += tptr->tm_hour - tm_lo.tm_hour;
+	      if (a + b <= 46000 / 60) {
+		range = 60;
+		a *= 60;
+		b *= 60;
+		a += tm_hi.tm_min - tptr->tm_min;
+		b += tptr->tm_min - tm_lo.tm_min;
+		if (a + b <= 46000 / 60) {
+		  range = 1;
+		  a *= 60;
+		  b *= 60;
+		  a += tm_hi.tm_sec - tptr->tm_sec;
+		  b += tptr->tm_sec - tm_lo.tm_sec;
+		}
+	      }
+	    }
+	  }
+	}
+	if (a <= 0) a = 1;
+	if (b <= 0) b = 1;
+	d = a + b;
+	/*
+	  Although `/' and `%' may produce unexpected result with negative
+	  argument, it doesn't cause serious problem because there is a
+	  fail safe.
+	*/
+	guess = guess_lo / d * a + (guess_lo % d) * a / d
+	      + guess_hi / d * b + (guess_hi % d) * b / d;
+	have_guess = 1;
+      }
+
+      if (guess <= guess_lo || guess_hi <= guess) {
+	/* Precious guess is invalid. try binary search. */ 
+	guess = guess_lo / 2 + guess_hi / 2;
+	if (guess <= guess_lo)
+	  guess = guess_lo + 1;
+	else if (guess >= guess_hi)
+	  guess = guess_hi - 1;
+	range = 0;
+      }
+
+      tm = (utc_p ? gmtime : localtime)(&guess);
+      if (!tm) goto error;
+      have_guess = 0;
+
+      d = tmcmp(tptr, tm);
+      if (d < 0) {
+        guess_hi = guess;
+	tm_hi = *tm;
+	if (range) {
+	  guess = guess - range;
+	  range = 0;
+	  if (guess_lo < guess && guess < guess_hi)
+	    have_guess = 1;
+	}
+      }
+      else if (d > 0) {
+        guess_lo = guess;
+	tm_lo = *tm;
+	if (range) {
+	  guess = guess + range;
+	  range = 0;
+	  if (guess_lo < guess && guess < guess_hi)
+	    have_guess = 1;
+	}
+      }
+      else {
+	if (!utc_p) {
+	  /* If localtime is nonmonotonic, another result may exist. */
+	  time_t guess2;
+	  if (find_dst) {
+	    guess2 = guess - 2 * 60 * 60;
+	    tm = localtime(&guess2);
+	    if (tm) {
+	      if (tptr->tm_hour != (tm->tm_hour + 2) % 24 ||
+		  tptr->tm_min != tm->tm_min ||
+		  tptr->tm_sec != tm->tm_sec) {
+		guess2 -= (tm->tm_hour - tptr->tm_hour) * 60 * 60 +
+			  (tm->tm_min - tptr->tm_min) * 60 +
+			  (tm->tm_sec - tptr->tm_sec);
+		if (tptr->tm_mday != tm->tm_mday)
+		  guess2 += 24 * 60 * 60;
+		if (guess != guess2) {
+		  tm = localtime(&guess2);
+		  if (tmcmp(tptr, tm) == 0) {
+		    if (guess < guess2)
+		      return guess;
+		    else
+		      return guess2;
+		  }
+		}
+	      }
+	    }
+	  }
+	  else {
+	    guess2 = guess + 2 * 60 * 60;
+	    tm = localtime(&guess2);
+	    if (tm) {
+	      if ((tptr->tm_hour + 2) % 24 != tm->tm_hour ||
+		  tptr->tm_min != tm->tm_min ||
+		  tptr->tm_sec != tm->tm_sec) {
+		guess2 -= (tm->tm_hour - tptr->tm_hour) * 60 * 60 +
+			  (tm->tm_min - tptr->tm_min) * 60 +
+			  (tm->tm_sec - tptr->tm_sec);
+		if (tptr->tm_mday != tm->tm_mday)
+		  guess2 -= 24 * 60 * 60;
+		if (guess != guess2) {
+		  tm = localtime(&guess2);
+		  if (tmcmp(tptr, tm) == 0) {
+		    if (guess < guess2)
+		      return guess2;
+		    else
+		      return guess;
+		  }
+		}
+	      }
+	    }
+	  }
+	}
+	return guess;
+      }
+    }
+    /* Given argument has no corresponding time_t. Let's outerpolation. */
+    if (tm_lo.tm_year == tptr->tm_year && tm_lo.tm_mon == tptr->tm_mon) {
+      return guess_lo +
+        (tptr->tm_mday - tm_lo.tm_mday) * 24 * 60 * 60 +
+        (tptr->tm_hour - tm_lo.tm_hour) * 60 * 60 +
+        (tptr->tm_min - tm_lo.tm_min) * 60 +
+        (tptr->tm_sec - tm_lo.tm_sec);
+    }
+    else if (tm_hi.tm_year == tptr->tm_year && tm_hi.tm_mon == tptr->tm_mon) {
+      return guess_hi +
+        (tptr->tm_mday - tm_hi.tm_mday) * 24 * 60 * 60 +
+        (tptr->tm_hour - tm_hi.tm_hour) * 60 * 60 +
+        (tptr->tm_min - tm_hi.tm_min) * 60 +
+        (tptr->tm_sec - tm_hi.tm_sec);
+    }
+
+  out_of_range:
+    rb_raise(rb_eArgError, "time out of range");
+
+  error:
+    rb_raise(rb_eArgError, "gmtime/localtime error");
+    return 0;			/* not reached */
+}
+
+static time_t
+make_time_t(tptr, utc_p)
+    struct tm *tptr;
+    int utc_p;
+{
+    time_t t;
+    struct tm *tmp, buf;
+    buf = *tptr;
+    if (utc_p) {
+#if defined(HAVE_TIMEGM)
+	if ((t = timegm(&buf)) != -1)
+            return t;
+#ifdef NEGATIVE_TIME_T
+        if ((tmp = gmtime(&t)) &&
+            tptr->tm_year == tmp->tm_year &&
+            tptr->tm_mon == tmp->tm_mon &&
+            tptr->tm_mday == tmp->tm_mday &&
+            tptr->tm_hour == tmp->tm_hour &&
+            tptr->tm_min == tmp->tm_min &&
+            tptr->tm_sec == tmp->tm_sec)
+            return t;
+#endif
+#endif
+	return search_time_t(&buf, utc_p);
+    }
+    else {
+#if defined(HAVE_MKTIME)
+	if ((t = mktime(&buf)) != -1)
+            return t;
+#ifdef NEGATIVE_TIME_T
+        if ((tmp = localtime(&t)) &&
+            tptr->tm_year == tmp->tm_year &&
+            tptr->tm_mon == tmp->tm_mon &&
+            tptr->tm_mday == tmp->tm_mday &&
+            tptr->tm_hour == tmp->tm_hour &&
+            tptr->tm_min == tmp->tm_min &&
+            tptr->tm_sec == tmp->tm_sec)
+            return t;
+#endif
+#endif
+	return search_time_t(&buf, utc_p);
+    }
+}
+
+static VALUE
+time_utc_or_local(argc, argv, utc_p, klass)
+    int argc;
+    VALUE *argv;
+    int utc_p;
+    VALUE klass;
+{
+    struct tm tm;
+    VALUE time;
+    time_t usec;
+
+    time_arg(argc, argv, &tm, &usec);
+    time = time_new_internal(klass, make_time_t(&tm, utc_p), usec);
+    if (utc_p) return time_gmtime(time);
+    return time_localtime(time);
+}
+
+/*
+ *  call-seq:
+ *     Time.utc( year [, month, day, hour, min, sec, usec] ) => time
+ *     Time.utc( sec, min, hour, day, month, year, wday, yday, isdst, tz
+ *     ) => time
+ *     Time.gm( year [, month, day, hour, min, sec, usec] ) => time
+ *     Time.gm( sec, min, hour, day, month, year, wday, yday, isdst, tz
+ *     ) => time
+ *     
+ *  Creates a time based on given values, interpreted as UTC (GMT). The
+ *  year must be specified. Other values default to the minimum value
+ *  for that field (and may be <code>nil</code> or omitted). Months may
+ *  be specified by numbers from 1 to 12, or by the three-letter English
+ *  month names. Hours are specified on a 24-hour clock (0..23). Raises
+ *  an <code>ArgumentError</code> if any values are out of range. Will
+ *  also accept ten arguments in the order output by
+ *  <code>Time#to_a</code>.
+ *
+ *     Time.utc(2000,"jan",1,20,15,1)  #=> Sat Jan 01 20:15:01 UTC 2000
+ *     Time.gm(2000,"jan",1,20,15,1)   #=> Sat Jan 01 20:15:01 UTC 2000
+ */
+static VALUE
+time_s_mkutc(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    return time_utc_or_local(argc, argv, Qtrue, klass);
+}
+
+/*
+ *  call-seq:
+ *     Time.local( year [, month, day, hour, min, sec, usec] ) => time
+ *     Time.local( sec, min, hour, day, month, year, wday, yday, isdst,
+ *     tz ) => time
+ *     Time.mktime( year, month, day, hour, min, sec, usec )   => time
+ *  
+ *  Same as <code>Time::gm</code>, but interprets the values in the
+ *  local time zone.
+ *     
+ *     Time.local(2000,"jan",1,20,15,1)   #=> Sat Jan 01 20:15:01 CST 2000
+ */
+
+static VALUE
+time_s_mktime(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    return time_utc_or_local(argc, argv, Qfalse, klass);
+}
+
+/*
+ *  call-seq:
+ *     time.to_i   => int
+ *     time.tv_sec => int
+ *  
+ *  Returns the value of <i>time</i> as an integer number of seconds
+ *  since epoch.
+ *     
+ *     t = Time.now
+ *     "%10.5f" % t.to_f   #=> "1049896564.17839"
+ *     t.to_i              #=> 1049896564
+ */
+
+static VALUE
+time_to_i(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    return LONG2NUM(tobj->tv.tv_sec);
+}
+
+/*
+ *  call-seq:
+ *     time.to_f => float
+ *  
+ *  Returns the value of <i>time</i> as a floating point number of
+ *  seconds since epoch.
+ *     
+ *     t = Time.now
+ *     "%10.5f" % t.to_f   #=> "1049896564.13654"
+ *     t.to_i              #=> 1049896564
+ */
+
+static VALUE
+time_to_f(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    return rb_float_new((double)tobj->tv.tv_sec+(double)tobj->tv.tv_usec/1e6);
+}
+
+/*
+ *  call-seq:
+ *     time.usec    => int
+ *     time.tv_usec => int
+ *  
+ *  Returns just the number of microseconds for <i>time</i>.
+ *     
+ *     t = Time.now        #=> Wed Apr 09 08:56:04 CDT 2003
+ *     "%10.6f" % t.to_f   #=> "1049896564.259970"
+ *     t.usec              #=> 259970
+ */
+
+static VALUE
+time_usec(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    return LONG2NUM(tobj->tv.tv_usec);
+}
+
+/*
+ *  call-seq:
+ *     time <=> other_time => -1, 0, +1 
+ *     time <=> numeric    => -1, 0, +1
+ *  
+ *  Comparison---Compares <i>time</i> with <i>other_time</i> or with
+ *  <i>numeric</i>, which is the number of seconds (possibly
+ *  fractional) since epoch.
+ *     
+ *     t = Time.now       #=> Wed Apr 09 08:56:03 CDT 2003
+ *     t2 = t + 2592000   #=> Fri May 09 08:56:03 CDT 2003
+ *     t <=> t2           #=> -1
+ *     t2 <=> t           #=> 1
+ *     t <=> t            #=> 0
+ */
+
+static VALUE
+time_cmp(time1, time2)
+    VALUE time1, time2;
+{
+    struct time_object *tobj1, *tobj2;
+
+    GetTimeval(time1, tobj1);
+    if (TYPE(time2) == T_DATA && RDATA(time2)->dfree == time_free) {
+	GetTimeval(time2, tobj2);
+	if (tobj1->tv.tv_sec == tobj2->tv.tv_sec) {
+	    if (tobj1->tv.tv_usec == tobj2->tv.tv_usec) return INT2FIX(0);
+	    if (tobj1->tv.tv_usec > tobj2->tv.tv_usec) return INT2FIX(1);
+	    return INT2FIX(-1);
+	}
+	if (tobj1->tv.tv_sec > tobj2->tv.tv_sec) return INT2FIX(1);
+	return INT2FIX(-1);
+    }
+
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *  time.eql?(other_time)
+ *
+ * Return <code>true</code> if <i>time</i> and <i>other_time</i> are
+ * both <code>Time</code> objects with the same seconds and fractional
+ * seconds.
+ */
+
+static VALUE
+time_eql(time1, time2)
+    VALUE time1, time2;
+{
+    struct time_object *tobj1, *tobj2;
+
+    GetTimeval(time1, tobj1);
+    if (TYPE(time2) == T_DATA && RDATA(time2)->dfree == time_free) {
+	GetTimeval(time2, tobj2);
+	if (tobj1->tv.tv_sec == tobj2->tv.tv_sec) {
+	    if (tobj1->tv.tv_usec == tobj2->tv.tv_usec) return Qtrue;
+	}
+    }
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     time.utc? => true or false
+ *     time.gmt? => true or false
+ *  
+ *  Returns <code>true</code> if <i>time</i> represents a time in UTC
+ *  (GMT).
+ *     
+ *     t = Time.now                        #=> Wed Apr 09 08:56:04 CDT 2003
+ *     t.utc?                              #=> false
+ *     t = Time.gm(2000,"jan",1,20,15,1)   #=> Sat Jan 01 20:15:01 UTC 2000
+ *     t.utc?                              #=> true
+ *
+ *     t = Time.now                        #=> Wed Apr 09 08:56:03 CDT 2003
+ *     t.gmt?                              #=> false
+ *     t = Time.gm(2000,1,1,20,15,1)       #=> Sat Jan 01 20:15:01 UTC 2000
+ *     t.gmt?                              #=> true
+ */
+
+static VALUE
+time_utc_p(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    if (tobj->gmt) return Qtrue;
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *   time.hash   => fixnum
+ *
+ * Return a hash code for this time object.
+ */
+
+static VALUE
+time_hash(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+    long hash;
+
+    GetTimeval(time, tobj);
+    hash = tobj->tv.tv_sec ^ tobj->tv.tv_usec;
+    return LONG2FIX(hash);
+}
+
+/* :nodoc: */
+static VALUE
+time_init_copy(copy, time)
+    VALUE copy, time;
+{
+    struct time_object *tobj, *tcopy;
+
+    if (copy == time) return copy;
+    time_modify(copy);
+    if (TYPE(time) != T_DATA || RDATA(time)->dfree != time_free) {
+	rb_raise(rb_eTypeError, "wrong argument type");
+    }
+    GetTimeval(time, tobj);
+    GetTimeval(copy, tcopy);
+    MEMCPY(tcopy, tobj, struct time_object, 1);
+
+    return copy;
+}
+
+static VALUE
+time_dup(time)
+    VALUE time;
+{
+    VALUE dup = time_s_alloc(CLASS_OF(time));
+    time_init_copy(dup, time);
+    return dup;
+}
+
+/*
+ *  call-seq:
+ *     time.localtime => time
+ *  
+ *  Converts <i>time</i> to local time (using the local time zone in
+ *  effect for this process) modifying the receiver.
+ *     
+ *     t = Time.gm(2000, "jan", 1, 20, 15, 1)
+ *     t.gmt?        #=> true
+ *     t.localtime   #=> Sat Jan 01 14:15:01 CST 2000
+ *     t.gmt?        #=> false
+ */
+
+static VALUE
+time_localtime(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+    struct tm *tm_tmp;
+    time_t t;
+
+    GetTimeval(time, tobj);
+    if (!tobj->gmt) {
+	if (tobj->tm_got)
+	    return time;
+    }
+    else {
+	time_modify(time);
+    }
+    t = tobj->tv.tv_sec;
+    tm_tmp = localtime(&t);
+    if (!tm_tmp)
+	rb_raise(rb_eArgError, "localtime error");
+    tobj->tm = *tm_tmp;
+    tobj->tm_got = 1;
+    tobj->gmt = 0;
+    return time;
+}
+
+/*
+ *  call-seq:
+ *     time.gmtime    => time
+ *     time.utc       => time
+ *  
+ *  Converts <i>time</i> to UTC (GMT), modifying the receiver.
+ *     
+ *     t = Time.now   #=> Wed Apr 09 08:56:03 CDT 2003
+ *     t.gmt?         #=> false
+ *     t.gmtime       #=> Wed Apr 09 13:56:03 UTC 2003
+ *     t.gmt?         #=> true
+ *
+ *     t = Time.now   #=> Wed Apr 09 08:56:04 CDT 2003
+ *     t.utc?         #=> false
+ *     t.utc          #=> Wed Apr 09 13:56:04 UTC 2003
+ *     t.utc?         #=> true
+ */
+
+static VALUE
+time_gmtime(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+    struct tm *tm_tmp;
+    time_t t;
+
+    GetTimeval(time, tobj);
+    if (tobj->gmt) {
+	if (tobj->tm_got)
+	    return time;
+    }
+    else {
+	time_modify(time);
+    }
+    t = tobj->tv.tv_sec;
+    tm_tmp = gmtime(&t);
+    if (!tm_tmp)
+	rb_raise(rb_eArgError, "gmtime error");
+    tobj->tm = *tm_tmp;
+    tobj->tm_got = 1;
+    tobj->gmt = 1;
+    return time;
+}
+
+/*
+ *  call-seq:
+ *     time.getlocal => new_time
+ *  
+ *  Returns a new <code>new_time</code> object representing <i>time</i> in
+ *  local time (using the local time zone in effect for this process).
+ *     
+ *     t = Time.gm(2000,1,1,20,15,1)   #=> Sat Jan 01 20:15:01 UTC 2000
+ *     t.gmt?                          #=> true
+ *     l = t.getlocal                  #=> Sat Jan 01 14:15:01 CST 2000
+ *     l.gmt?                          #=> false
+ *     t == l                          #=> true
+ */
+
+static VALUE
+time_getlocaltime(time)
+    VALUE time;
+{
+    return time_localtime(time_dup(time));
+}
+
+/*
+ *  call-seq:
+ *     time.getgm  => new_time
+ *     time.getutc => new_time
+ *  
+ *  Returns a new <code>new_time</code> object representing <i>time</i> in
+ *  UTC.
+ *     
+ *     t = Time.local(2000,1,1,20,15,1)   #=> Sat Jan 01 20:15:01 CST 2000
+ *     t.gmt?                             #=> false
+ *     y = t.getgm                        #=> Sun Jan 02 02:15:01 UTC 2000
+ *     y.gmt?                             #=> true
+ *     t == y                             #=> true
+ */
+
+static VALUE
+time_getgmtime(time)
+    VALUE time;
+{
+    return time_gmtime(time_dup(time));
+}
+
+static VALUE
+time_get_tm(time, gmt)
+    VALUE time;
+    int gmt;
+{
+    if (gmt) return time_gmtime(time);
+    return time_localtime(time);
+}
+
+/*
+ *  call-seq:
+ *     time.asctime => string
+ *     time.ctime   => string
+ *  
+ *  Returns a canonical string representation of <i>time</i>.
+ *     
+ *     Time.now.asctime   #=> "Wed Apr  9 08:56:03 2003"
+ */
+
+static VALUE
+time_asctime(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+    char *s;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    s = asctime(&tobj->tm);
+    if (s[24] == '\n') s[24] = '\0';
+
+    return rb_str_new2(s);
+}
+
+/*
+ *  call-seq:
+ *     time.inspect => string
+ *     time.to_s    => string
+ *  
+ *  Returns a string representing <i>time</i>. Equivalent to calling
+ *  <code>Time#strftime</code> with a format string of ``<code>%a</code>
+ *  <code>%b</code> <code>%d</code> <code>%H:%M:%S</code>
+ *  <code>%Z</code> <code>%Y</code>''.
+ *     
+ *     Time.now.to_s   #=> "Wed Apr 09 08:56:04 CDT 2003"
+ */
+
+static VALUE
+time_to_s(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+    char buf[128];
+    int len;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    if (tobj->gmt == 1) {
+	len = strftime(buf, 128, "%a %b %d %H:%M:%S UTC %Y", &tobj->tm);
+    }
+    else {
+	time_t off;
+	char buf2[32];
+	char sign = '+';
+#if defined(HAVE_STRUCT_TM_TM_GMTOFF)
+	off = tobj->tm.tm_gmtoff;
+#else
+	VALUE tmp = time_utc_offset(time);
+	off = NUM2INT(tmp);
+#endif
+	if (off < 0) {
+	    sign = '-';
+	    off = -off;
+	}
+	sprintf(buf2, "%%a %%b %%d %%H:%%M:%%S %c%02d%02d %%Y",
+		sign, (int)(off/3600), (int)(off%3600/60));
+	len = strftime(buf, 128, buf2, &tobj->tm);
+    }
+    return rb_str_new(buf, len);
+}
+
+static VALUE
+time_add(tobj, offset, sign)
+    struct time_object *tobj;
+    VALUE offset;
+    int sign;
+{
+    double v = NUM2DBL(offset);
+    double f, d;
+    unsigned_time_t sec_off;
+    time_t usec_off, sec, usec;
+    VALUE result;
+
+    if (v < 0) {
+        v = -v;
+        sign = -sign;
+    }
+    d = modf(v, &f);
+    sec_off = (unsigned_time_t)f;
+    if (f != (double)sec_off)
+        rb_raise(rb_eRangeError, "time %s %f out of Time range",
+            sign < 0 ? "-" : "+", v);
+    usec_off = (time_t)(d*1e6+0.5);
+
+    if (sign < 0) {
+        sec = tobj->tv.tv_sec - sec_off;
+        usec = tobj->tv.tv_usec - usec_off;
+        if (sec > tobj->tv.tv_sec)
+            rb_raise(rb_eRangeError, "time - %f out of Time range", v);
+    }
+    else {
+        sec = tobj->tv.tv_sec + sec_off;
+        usec = tobj->tv.tv_usec + usec_off;
+        if (sec < tobj->tv.tv_sec)
+            rb_raise(rb_eRangeError, "time + %f out of Time range", v);
+    }
+    result = rb_time_new(sec, usec);
+    if (tobj->gmt) {
+	GetTimeval(result, tobj);
+	tobj->gmt = 1;
+    }
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     time + numeric => time
+ *  
+ *  Addition---Adds some number of seconds (possibly fractional) to
+ *  <i>time</i> and returns that value as a new time.
+ *     
+ *     t = Time.now         #=> Wed Apr 09 08:56:03 CDT 2003
+ *     t + (60 * 60 * 24)   #=> Thu Apr 10 08:56:03 CDT 2003
+ */
+
+static VALUE
+time_plus(time1, time2)
+    VALUE time1, time2;
+{
+    struct time_object *tobj;
+    GetTimeval(time1, tobj);
+
+    if (TYPE(time2) == T_DATA && RDATA(time2)->dfree == time_free) {
+	rb_raise(rb_eTypeError, "time + time?");
+    }
+    return time_add(tobj, time2, 1);
+}
+
+/*
+ *  call-seq:
+ *     time - other_time => float
+ *     time - numeric    => time
+ *  
+ *  Difference---Returns a new time that represents the difference
+ *  between two times, or subtracts the given number of seconds in
+ *  <i>numeric</i> from <i>time</i>.
+ *     
+ *     t = Time.now       #=> Wed Apr 09 08:56:03 CDT 2003
+ *     t2 = t + 2592000   #=> Fri May 09 08:56:03 CDT 2003
+ *     t2 - t             #=> 2592000.0
+ *     t2 - 2592000       #=> Wed Apr 09 08:56:03 CDT 2003
+ */
+
+static VALUE
+time_minus(time1, time2)
+    VALUE time1, time2;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time1, tobj);
+    if (TYPE(time2) == T_DATA && RDATA(time2)->dfree == time_free) {
+	struct time_object *tobj2;
+        double f;
+
+	GetTimeval(time2, tobj2);
+	f = (double)tobj->tv.tv_sec - (double)tobj2->tv.tv_sec;
+	f += ((double)tobj->tv.tv_usec - (double)tobj2->tv.tv_usec)*1e-6;
+	/* XXX: should check float overflow on 64bit time_t platforms */
+
+	return rb_float_new(f);
+    }
+    return time_add(tobj, time2, -1);
+}
+
+/*
+ * call-seq:
+ *   time.succ   => new_time
+ *
+ * Return a new time object, one second later than <code>time</code>.
+ */
+
+static VALUE
+time_succ(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+    int gmt;
+
+    GetTimeval(time, tobj);
+    gmt = tobj->gmt;
+    time = rb_time_new(tobj->tv.tv_sec + 1, tobj->tv.tv_usec);
+    GetTimeval(time, tobj);
+    tobj->gmt = gmt;
+    return time;
+}
+
+/*
+ *  call-seq:
+ *     time.sec => fixnum
+ *  
+ *  Returns the second of the minute (0..60)<em>[Yes, seconds really can
+ *  range from zero to 60. This allows the system to inject leap seconds
+ *  every now and then to correct for the fact that years are not really
+ *  a convenient number of hours long.]</em> for <i>time</i>.
+ *     
+ *     t = Time.now   #=> Wed Apr 09 08:56:04 CDT 2003
+ *     t.sec          #=> 4
+ */
+
+static VALUE
+time_sec(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    return INT2FIX(tobj->tm.tm_sec);
+}
+
+/*
+ *  call-seq:
+ *     time.min => fixnum
+ *  
+ *  Returns the minute of the hour (0..59) for <i>time</i>.
+ *     
+ *     t = Time.now   #=> Wed Apr 09 08:56:03 CDT 2003
+ *     t.min          #=> 56
+ */
+
+static VALUE
+time_min(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    return INT2FIX(tobj->tm.tm_min);
+}
+
+/*
+ *  call-seq:
+ *     time.hour => fixnum
+ *  
+ *  Returns the hour of the day (0..23) for <i>time</i>.
+ *     
+ *     t = Time.now   #=> Wed Apr 09 08:56:03 CDT 2003
+ *     t.hour         #=> 8
+ */
+
+static VALUE
+time_hour(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    return INT2FIX(tobj->tm.tm_hour);
+}
+
+/*
+ *  call-seq:
+ *     time.day  => fixnum
+ *     time.mday => fixnum
+ *  
+ *  Returns the day of the month (1..n) for <i>time</i>.
+ *     
+ *     t = Time.now   #=> Wed Apr 09 08:56:03 CDT 2003
+ *     t.day          #=> 9
+ *     t.mday         #=> 9
+ */
+
+static VALUE
+time_mday(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    return INT2FIX(tobj->tm.tm_mday);
+}
+
+/*
+ *  call-seq:
+ *     time.mon   => fixnum
+ *     time.month => fixnum
+ *  
+ *  Returns the month of the year (1..12) for <i>time</i>.
+ *     
+ *     t = Time.now   #=> Wed Apr 09 08:56:03 CDT 2003
+ *     t.mon          #=> 4
+ *     t.month        #=> 4
+ */
+
+static VALUE
+time_mon(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    return INT2FIX(tobj->tm.tm_mon+1);
+}
+
+/*
+ *  call-seq:
+ *     time.year => fixnum
+ *  
+ *  Returns the year for <i>time</i> (including the century).
+ *     
+ *     t = Time.now   #=> Wed Apr 09 08:56:04 CDT 2003
+ *     t.year         #=> 2003
+ */
+
+static VALUE
+time_year(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    return LONG2NUM((long)tobj->tm.tm_year+1900);
+}
+
+/*
+ *  call-seq:
+ *     time.wday => fixnum
+ *  
+ *  Returns an integer representing the day of the week, 0..6, with
+ *  Sunday == 0.
+ *     
+ *     t = Time.now   #=> Wed Apr 09 08:56:04 CDT 2003
+ *     t.wday         #=> 3
+ */
+
+static VALUE
+time_wday(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    return INT2FIX(tobj->tm.tm_wday);
+}
+
+/*
+ *  call-seq:
+ *     time.yday => fixnum
+ *  
+ *  Returns an integer representing the day of the year, 1..366.
+ *     
+ *     t = Time.now   #=> Wed Apr 09 08:56:04 CDT 2003
+ *     t.yday         #=> 99
+ */
+
+static VALUE
+time_yday(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    return INT2FIX(tobj->tm.tm_yday+1);
+}
+
+/*
+ *  call-seq:
+ *     time.isdst => true or false
+ *     time.dst?  => true or false
+ *  
+ *  Returns <code>true</code> if <i>time</i> occurs during Daylight
+ *  Saving Time in its time zone.
+ *     
+ *     Time.local(2000, 7, 1).isdst   #=> true
+ *     Time.local(2000, 1, 1).isdst   #=> false
+ *     Time.local(2000, 7, 1).dst?    #=> true
+ *     Time.local(2000, 1, 1).dst?    #=> false
+ */
+
+static VALUE
+time_isdst(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    return tobj->tm.tm_isdst?Qtrue:Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     time.zone => string
+ *  
+ *  Returns the name of the time zone used for <i>time</i>. As of Ruby
+ *  1.8, returns ``UTC'' rather than ``GMT'' for UTC times.
+ *     
+ *     t = Time.gm(2000, "jan", 1, 20, 15, 1)
+ *     t.zone   #=> "UTC"
+ *     t = Time.local(2000, "jan", 1, 20, 15, 1)
+ *     t.zone   #=> "CST"
+ */
+
+static VALUE
+time_zone(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+#if !defined(HAVE_TM_ZONE) && (!defined(HAVE_TZNAME) || !defined(HAVE_DAYLIGHT))
+    char buf[64];
+    int len;
+#endif
+    
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+
+    if (tobj->gmt == 1) {
+	return rb_str_new2("UTC");
+    }
+#if defined(HAVE_TM_ZONE)
+    return rb_str_new2(tobj->tm.tm_zone);
+#elif defined(HAVE_TZNAME) && defined(HAVE_DAYLIGHT)
+    return rb_str_new2(tzname[daylight && tobj->tm.tm_isdst]);
+#else
+    len = strftime(buf, 64, "%Z", &tobj->tm);
+    return rb_str_new(buf, len);
+#endif
+}
+
+/*
+ *  call-seq:
+ *     time.gmt_offset => fixnum
+ *     time.gmtoff     => fixnum
+ *     time.utc_offset => fixnum
+ *  
+ *  Returns the offset in seconds between the timezone of <i>time</i>
+ *  and UTC.
+ *     
+ *     t = Time.gm(2000,1,1,20,15,1)   #=> Sat Jan 01 20:15:01 UTC 2000
+ *     t.gmt_offset                    #=> 0
+ *     l = t.getlocal                  #=> Sat Jan 01 14:15:01 CST 2000
+ *     l.gmt_offset                    #=> -21600
+ */
+
+static VALUE
+time_utc_offset(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+
+    if (tobj->gmt == 1) {
+	return INT2FIX(0);
+    }
+    else {
+#if defined(HAVE_STRUCT_TM_TM_GMTOFF)
+	return INT2NUM(tobj->tm.tm_gmtoff);
+#else
+	struct tm *u, *l;
+	time_t t;
+	long off;
+	l = &tobj->tm;
+	t = tobj->tv.tv_sec;
+	u = gmtime(&t);
+	if (!u)
+	    rb_raise(rb_eArgError, "gmtime error");
+	if (l->tm_year != u->tm_year)
+	    off = l->tm_year < u->tm_year ? -1 : 1;
+	else if (l->tm_mon != u->tm_mon)
+	    off = l->tm_mon < u->tm_mon ? -1 : 1;
+	else if (l->tm_mday != u->tm_mday)
+	    off = l->tm_mday < u->tm_mday ? -1 : 1;
+	else
+	    off = 0;
+	off = off * 24 + l->tm_hour - u->tm_hour;
+	off = off * 60 + l->tm_min - u->tm_min;
+	off = off * 60 + l->tm_sec - u->tm_sec;
+	return LONG2FIX(off);
+#endif
+    }
+}
+
+/*
+ *  call-seq:
+ *     time.to_a => array
+ *  
+ *  Returns a ten-element <i>array</i> of values for <i>time</i>:
+ *  {<code>[ sec, min, hour, day, month, year, wday, yday, isdst, zone
+ *  ]</code>}. See the individual methods for an explanation of the
+ *  valid ranges of each value. The ten elements can be passed directly
+ *  to <code>Time::utc</code> or <code>Time::local</code> to create a
+ *  new <code>Time</code>.
+ *     
+ *     now = Time.now   #=> Wed Apr 09 08:56:04 CDT 2003
+ *     t = now.to_a     #=> [4, 56, 8, 9, 4, 2003, 3, 99, true, "CDT"]
+ */
+
+static VALUE
+time_to_a(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    return rb_ary_new3(10,
+		    INT2FIX(tobj->tm.tm_sec),
+		    INT2FIX(tobj->tm.tm_min),
+		    INT2FIX(tobj->tm.tm_hour),
+		    INT2FIX(tobj->tm.tm_mday),
+		    INT2FIX(tobj->tm.tm_mon+1),
+		    LONG2NUM((long)tobj->tm.tm_year+1900),
+		    INT2FIX(tobj->tm.tm_wday),
+		    INT2FIX(tobj->tm.tm_yday+1),
+		    tobj->tm.tm_isdst?Qtrue:Qfalse,
+		    time_zone(time));
+}
+
+#define SMALLBUF 100
+static int
+rb_strftime(buf, format, time)
+    char **buf;
+    const char *format;
+    struct tm *time;
+{
+    int size, len, flen;
+
+    (*buf)[0] = '\0';
+    flen = strlen(format);
+    if (flen == 0) {
+	return 0;
+    }
+    len = strftime(*buf, SMALLBUF, format, time);
+    if (len != 0 || **buf == '\0') return len;
+    for (size=1024; ; size*=2) {
+	*buf = xmalloc(size);
+	(*buf)[0] = '\0';
+	len = strftime(*buf, size, format, time);
+	/*
+	 * buflen can be zero EITHER because there's not enough
+	 * room in the string, or because the control command
+	 * goes to the empty string. Make a reasonable guess that
+	 * if the buffer is 1024 times bigger than the length of the
+	 * format string, it's not failing for lack of room.
+	 */
+	if (len > 0 || size >= 1024 * flen) return len;
+	free(*buf);
+    }
+    /* not reached */
+}
+
+/*
+ *  call-seq:
+ *     time.strftime( string ) => string
+ *  
+ *  Formats <i>time</i> according to the directives in the given format
+ *  string. Any text not listed as a directive will be passed through
+ *  to the output string.
+ *
+ *  Format meaning:
+ *    %a - The abbreviated weekday name (``Sun'')
+ *    %A - The  full  weekday  name (``Sunday'')
+ *    %b - The abbreviated month name (``Jan'')
+ *    %B - The  full  month  name (``January'')
+ *    %c - The preferred local date and time representation
+ *    %d - Day of the month (01..31)
+ *    %H - Hour of the day, 24-hour clock (00..23)
+ *    %I - Hour of the day, 12-hour clock (01..12)
+ *    %j - Day of the year (001..366)
+ *    %m - Month of the year (01..12)
+ *    %M - Minute of the hour (00..59)
+ *    %p - Meridian indicator (``AM''  or  ``PM'')
+ *    %S - Second of the minute (00..60)
+ *    %U - Week  number  of the current year,
+ *            starting with the first Sunday as the first
+ *            day of the first week (00..53)
+ *    %W - Week  number  of the current year,
+ *            starting with the first Monday as the first
+ *            day of the first week (00..53)
+ *    %w - Day of the week (Sunday is 0, 0..6)
+ *    %x - Preferred representation for the date alone, no time
+ *    %X - Preferred representation for the time alone, no date
+ *    %y - Year without a century (00..99)
+ *    %Y - Year with century
+ *    %Z - Time zone name
+ *    %% - Literal ``%'' character
+ *     
+ *     t = Time.now
+ *     t.strftime("Printed on %m/%d/%Y")   #=> "Printed on 04/09/2003"
+ *     t.strftime("at %I:%M%p")            #=> "at 08:56AM"
+ */
+
+static VALUE
+time_strftime(time, format)
+    VALUE time, format;
+{
+    struct time_object *tobj;
+    char buffer[SMALLBUF], *buf = buffer;
+    const char *fmt;
+    long len;
+    VALUE str;
+
+    GetTimeval(time, tobj);
+    if (tobj->tm_got == 0) {
+	time_get_tm(time, tobj->gmt);
+    }
+    StringValue(format);
+    format = rb_str_new4(format);
+    fmt = RSTRING(format)->ptr;
+    len = RSTRING(format)->len;
+    if (len == 0) {
+	rb_warning("strftime called with empty format string");
+    }
+    else if (strlen(fmt) < len) {
+	/* Ruby string may contain \0's. */
+	const char *p = fmt, *pe = fmt + len;
+
+	str = rb_str_new(0, 0);
+	while (p < pe) {
+	    len = rb_strftime(&buf, p, &tobj->tm);
+	    rb_str_cat(str, buf, len);
+	    p += strlen(p);
+	    if (buf != buffer) {
+		free(buf);
+		buf = buffer;
+	    }
+	    for (fmt = p; p < pe && !*p; ++p);
+	    if (p > fmt) rb_str_cat(str, fmt, p - fmt);
+	}
+	return str;
+    }
+    else {
+	len = rb_strftime(&buf, RSTRING(format)->ptr, &tobj->tm);
+    }
+    str = rb_str_new(buf, len);
+    if (buf != buffer) free(buf);
+    return str;
+}
+
+/*
+ *  call-seq:
+ *     Time.times => struct_tms
+ *  
+ *  Deprecated in favor of <code>Process::times</code>
+ */
+
+static VALUE
+time_s_times(obj)
+    VALUE obj;
+{
+    rb_warn("obsolete method Time::times; use Process::times");
+    return rb_proc_times(obj);
+}
+
+/*
+ * undocumented
+ */
+
+static VALUE
+time_mdump(time)
+    VALUE time;
+{
+    struct time_object *tobj;
+    struct tm *tm;
+    unsigned long p, s;
+    char buf[8];
+    time_t t;
+    int i;
+
+    GetTimeval(time, tobj);
+
+    t = tobj->tv.tv_sec;
+    tm = gmtime(&t);
+
+    if ((tm->tm_year & 0xffff) != tm->tm_year)
+	rb_raise(rb_eArgError, "year too big to marshal");
+
+    p = 0x1UL        << 31 | /*  1 */
+	tm->tm_year  << 14 | /* 16 */
+	tm->tm_mon   << 10 | /*  4 */
+	tm->tm_mday  <<  5 | /*  5 */
+	tm->tm_hour;         /*  5 */
+    s = tm->tm_min   << 26 | /*  6 */
+	tm->tm_sec   << 20 | /*  6 */
+	tobj->tv.tv_usec;    /* 20 */
+
+    for (i=0; i<4; i++) {
+	buf[i] = p & 0xff;
+	p = RSHIFT(p, 8);
+    }
+    for (i=4; i<8; i++) {
+	buf[i] = s & 0xff;
+	s = RSHIFT(s, 8);
+    }
+
+    return rb_str_new(buf, 8);
+}
+
+/*
+ * call-seq:
+ *   time._dump   => string
+ *
+ * Dump _time_ for marshaling.
+ */
+
+static VALUE
+time_dump(argc, argv, time)
+    int argc;
+    VALUE *argv;
+    VALUE time;
+{
+    VALUE str;
+
+    rb_scan_args(argc, argv, "01", 0);
+    str = time_mdump(time); 
+    if (FL_TEST(time, FL_EXIVAR)) {
+	rb_copy_generic_ivar(str, time);
+	FL_SET(str, FL_EXIVAR);
+    }
+
+    return str;
+}
+
+/*
+ * undocumented
+ */
+
+static VALUE
+time_mload(time, str)
+    VALUE time, str;
+{
+    struct time_object *tobj;
+    unsigned long p, s;
+    time_t sec, usec;
+    unsigned char *buf;
+    struct tm tm;
+    int i;
+
+    time_modify(time);
+    StringValue(str);
+    buf = (unsigned char *)RSTRING(str)->ptr;
+    if (RSTRING(str)->len != 8) {
+	rb_raise(rb_eTypeError, "marshaled time format differ");
+    }
+
+    p = s = 0;
+    for (i=0; i<4; i++) {
+	p |= buf[i]<<(8*i);
+    }
+    for (i=4; i<8; i++) {
+	s |= buf[i]<<(8*(i-4));
+    }
+
+    if ((p & (1UL<<31)) == 0) {
+	sec = p;
+	usec = s;
+    }
+    else {
+       p &= ~(1UL<<31);
+	tm.tm_year = (p >> 14) & 0xffff;
+	tm.tm_mon  = (p >> 10) & 0xf;
+	tm.tm_mday = (p >>  5) & 0x1f;
+	tm.tm_hour =  p        & 0x1f;
+	tm.tm_min  = (s >> 26) & 0x3f;
+	tm.tm_sec  = (s >> 20) & 0x3f;
+	tm.tm_isdst = 0;
+
+	sec = make_time_t(&tm, Qtrue);
+	usec = (time_t)(s & 0xfffff);
+    }
+    time_overflow_p(&sec, &usec);
+
+    GetTimeval(time, tobj);
+    tobj->tm_got = 0;
+    tobj->tv.tv_sec = sec;
+    tobj->tv.tv_usec = usec;
+    return time;
+}
+
+/*
+ * call-seq:
+ *   Time._load(string)   => time
+ *
+ * Unmarshal a dumped +Time+ object.
+ */
+
+static VALUE
+time_load(klass, str)
+    VALUE klass, str;
+{
+    VALUE time = time_s_alloc(klass);
+
+    if (FL_TEST(str, FL_EXIVAR)) {
+	rb_copy_generic_ivar(time, str);
+	FL_SET(time, FL_EXIVAR);
+    }
+    time_mload(time, str);
+    return time;
+}
+
+/*
+ *  <code>Time</code> is an abstraction of dates and times. Time is
+ *  stored internally as the number of seconds and microseconds since
+ *  the <em>epoch</em>, January 1, 1970 00:00 UTC. On some operating
+ *  systems, this offset is allowed to be negative. Also see the
+ *  library modules <code>Date</code> and <code>ParseDate</code>. The
+ *  <code>Time</code> class treats GMT (Greenwich Mean Time) and UTC
+ *  (Coordinated Universal Time)<em>[Yes, UTC really does stand for
+ *  Coordinated Universal Time. There was a committee involved.]</em>
+ *  as equivalent.  GMT is the older way of referring to these
+ *  baseline times but persists in the names of calls on Posix
+ *  systems.
+ *     
+ *  All times are stored with some number of microseconds. Be aware of
+ *  this fact when comparing times with each other---times that are
+ *  apparently equal when displayed may be different when compared.
+ */
+
+void
+Init_Time()
+{
+    rb_cTime = rb_define_class("Time", rb_cObject);
+    rb_include_module(rb_cTime, rb_mComparable);
+
+    rb_define_alloc_func(rb_cTime, time_s_alloc);
+    rb_define_singleton_method(rb_cTime, "now", rb_class_new_instance, -1);
+    rb_define_singleton_method(rb_cTime, "at", time_s_at, -1);
+    rb_define_singleton_method(rb_cTime, "utc", time_s_mkutc, -1);
+    rb_define_singleton_method(rb_cTime, "gm", time_s_mkutc, -1);
+    rb_define_singleton_method(rb_cTime, "local", time_s_mktime, -1);
+    rb_define_singleton_method(rb_cTime, "mktime", time_s_mktime, -1);
+
+    rb_define_singleton_method(rb_cTime, "times", time_s_times, 0);
+
+    rb_define_method(rb_cTime, "to_i", time_to_i, 0);
+    rb_define_method(rb_cTime, "to_f", time_to_f, 0);
+    rb_define_method(rb_cTime, "<=>", time_cmp, 1);
+    rb_define_method(rb_cTime, "eql?", time_eql, 1);
+    rb_define_method(rb_cTime, "hash", time_hash, 0);
+    rb_define_method(rb_cTime, "initialize", time_init, 0);
+    rb_define_method(rb_cTime, "initialize_copy", time_init_copy, 1);
+
+    rb_define_method(rb_cTime, "localtime", time_localtime, 0);
+    rb_define_method(rb_cTime, "gmtime", time_gmtime, 0);
+    rb_define_method(rb_cTime, "utc", time_gmtime, 0);
+    rb_define_method(rb_cTime, "getlocal", time_getlocaltime, 0);
+    rb_define_method(rb_cTime, "getgm", time_getgmtime, 0);
+    rb_define_method(rb_cTime, "getutc", time_getgmtime, 0);
+
+    rb_define_method(rb_cTime, "ctime", time_asctime, 0);
+    rb_define_method(rb_cTime, "asctime", time_asctime, 0);
+    rb_define_method(rb_cTime, "to_s", time_to_s, 0);
+    rb_define_method(rb_cTime, "inspect", time_to_s, 0);
+    rb_define_method(rb_cTime, "to_a", time_to_a, 0);
+
+    rb_define_method(rb_cTime, "+", time_plus, 1);
+    rb_define_method(rb_cTime, "-", time_minus, 1);
+
+    rb_define_method(rb_cTime, "succ", time_succ, 0);
+    rb_define_method(rb_cTime, "sec", time_sec, 0);
+    rb_define_method(rb_cTime, "min", time_min, 0);
+    rb_define_method(rb_cTime, "hour", time_hour, 0);
+    rb_define_method(rb_cTime, "mday", time_mday, 0);
+    rb_define_method(rb_cTime, "day", time_mday, 0);
+    rb_define_method(rb_cTime, "mon", time_mon, 0);
+    rb_define_method(rb_cTime, "month", time_mon, 0);
+    rb_define_method(rb_cTime, "year", time_year, 0);
+    rb_define_method(rb_cTime, "wday", time_wday, 0);
+    rb_define_method(rb_cTime, "yday", time_yday, 0);
+    rb_define_method(rb_cTime, "isdst", time_isdst, 0);
+    rb_define_method(rb_cTime, "dst?", time_isdst, 0);
+    rb_define_method(rb_cTime, "zone", time_zone, 0);
+    rb_define_method(rb_cTime, "gmtoff", time_utc_offset, 0);
+    rb_define_method(rb_cTime, "gmt_offset", time_utc_offset, 0);
+    rb_define_method(rb_cTime, "utc_offset", time_utc_offset, 0);
+
+    rb_define_method(rb_cTime, "utc?", time_utc_p, 0);
+    rb_define_method(rb_cTime, "gmt?", time_utc_p, 0);
+
+    rb_define_method(rb_cTime, "tv_sec", time_to_i, 0);
+    rb_define_method(rb_cTime, "tv_usec", time_usec, 0);
+    rb_define_method(rb_cTime, "usec", time_usec, 0);
+
+    rb_define_method(rb_cTime, "strftime", time_strftime, 1);
+
+    /* methods for marshaling */
+    rb_define_method(rb_cTime, "_dump", time_dump, -1);
+    rb_define_singleton_method(rb_cTime, "_load", time_load, 1);
+#if 0
+    /* Time will support marshal_dump and marshal_load in the future (1.9 maybe) */
+    rb_define_method(rb_cTime, "marshal_dump", time_mdump, 0);
+    rb_define_method(rb_cTime, "marshal_load", time_mload, 1);
+#endif
+}
diff --git a/ruby_1_8_6/util.c b/ruby_1_8_6/util.c
new file mode 100644
index 0000000000..46c6033313
--- /dev/null
+++ b/ruby_1_8_6/util.c
@@ -0,0 +1,955 @@
+/**********************************************************************
+
+  util.c -
+
+  $Author$
+  $Date$
+  created at: Fri Mar 10 17:22:34 JST 1995
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+
+#include <ctype.h>
+#include <stdio.h>
+#include <errno.h>
+#include <math.h>
+#include <float.h>
+
+#ifdef _WIN32
+#include "missing/file.h"
+#endif
+
+#include "util.h"
+#ifndef HAVE_STRING_H
+char *strchr _((char*,char));
+#endif
+
+unsigned long
+scan_oct(start, len, retlen)
+    const char *start;
+    int len;
+    int *retlen;
+{
+    register const char *s = start;
+    register unsigned long retval = 0;
+
+    while (len-- && *s >= '0' && *s <= '7') {
+	retval <<= 3;
+	retval |= *s++ - '0';
+    }
+    *retlen = s - start;
+    return retval;
+}
+
+unsigned long
+scan_hex(start, len, retlen)
+    const char *start;
+    int len;
+    int *retlen;
+{
+    static char hexdigit[] = "0123456789abcdef0123456789ABCDEF";
+    register const char *s = start;
+    register unsigned long retval = 0;
+    char *tmp;
+
+    while (len-- && *s && (tmp = strchr(hexdigit, *s))) {
+	retval <<= 4;
+	retval |= (tmp - hexdigit) & 15;
+	s++;
+    }
+    *retlen = s - start;
+    return retval;
+}
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if defined(HAVE_FCNTL_H)
+#include <fcntl.h>
+#endif
+
+#ifndef S_ISDIR
+#   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
+#endif
+
+#if defined(MSDOS) || defined(__CYGWIN32__) || defined(_WIN32)
+/*
+ *  Copyright (c) 1993, Intergraph Corporation
+ *
+ *  You may distribute under the terms of either the GNU General Public
+ *  License or the Artistic License, as specified in the perl README file.
+ *
+ *  Various Unix compatibility functions and NT specific functions.
+ *
+ *  Some of this code was derived from the MSDOS port(s) and the OS/2 port.
+ *
+ */
+
+
+/*
+ * Suffix appending for in-place editing under MS-DOS and OS/2 (and now NT!).
+ *
+ * Here are the rules:
+ *
+ * Style 0:  Append the suffix exactly as standard perl would do it.
+ *           If the filesystem groks it, use it.  (HPFS will always
+ *           grok it.  So will NTFS. FAT will rarely accept it.)
+ *
+ * Style 1:  The suffix begins with a '.'.  The extension is replaced.
+ *           If the name matches the original name, use the fallback method.
+ *
+ * Style 2:  The suffix is a single character, not a '.'.  Try to add the 
+ *           suffix to the following places, using the first one that works.
+ *               [1] Append to extension.  
+ *               [2] Append to filename, 
+ *               [3] Replace end of extension, 
+ *               [4] Replace end of filename.
+ *           If the name matches the original name, use the fallback method.
+ *
+ * Style 3:  Any other case:  Ignore the suffix completely and use the
+ *           fallback method.
+ *
+ * Fallback method:  Change the extension to ".$$$".  If that matches the
+ *           original name, then change the extension to ".~~~".
+ *
+ * If filename is more than 1000 characters long, we die a horrible
+ * death.  Sorry.
+ *
+ * The filename restriction is a cheat so that we can use buf[] to store
+ * assorted temporary goo.
+ *
+ * Examples, assuming style 0 failed.
+ *
+ * suffix = ".bak" (style 1)
+ *                foo.bar => foo.bak
+ *                foo.bak => foo.$$$	(fallback)
+ *                foo.$$$ => foo.~~~	(fallback)
+ *                makefile => makefile.bak
+ *
+ * suffix = "~" (style 2)
+ *                foo.c => foo.c~
+ *                foo.c~ => foo.c~~
+ *                foo.c~~ => foo~.c~~
+ *                foo~.c~~ => foo~~.c~~
+ *                foo~~~~~.c~~ => foo~~~~~.$$$ (fallback)
+ *
+ *                foo.pas => foo~.pas
+ *                makefile => makefile.~
+ *                longname.fil => longname.fi~
+ *                longname.fi~ => longnam~.fi~
+ *                longnam~.fi~ => longnam~.$$$
+ *                
+ */
+
+
+static int valid_filename(char *s);
+
+static char suffix1[] = ".$$$";
+static char suffix2[] = ".~~~";
+
+#define ext (&buf[1000])
+
+#define strEQ(s1,s2) (strcmp(s1,s2) == 0)
+
+void
+ruby_add_suffix(str, suffix)
+    VALUE str;
+    char *suffix;
+{
+    int baselen;
+    int extlen = strlen(suffix);
+    char *s, *t, *p;
+    long slen;
+    char buf[1024];
+
+    if (RSTRING(str)->len > 1000)
+        rb_fatal("Cannot do inplace edit on long filename (%ld characters)",
+		 RSTRING(str)->len);
+
+#if defined(DJGPP) || defined(__CYGWIN32__) || defined(_WIN32)
+    /* Style 0 */
+    slen = RSTRING(str)->len;
+    rb_str_cat(str, suffix, extlen);
+#if defined(DJGPP)
+    if (_USE_LFN) return;
+#else
+    if (valid_filename(RSTRING(str)->ptr)) return;
+#endif
+
+    /* Fooey, style 0 failed.  Fix str before continuing. */
+    RSTRING(str)->ptr[RSTRING(str)->len = slen] = '\0';
+#endif
+
+    slen = extlen;
+    t = buf; baselen = 0; s = RSTRING(str)->ptr;
+    while ((*t = *s) && *s != '.') {
+	baselen++;
+	if (*s == '\\' || *s == '/') baselen = 0;
+ 	s++; t++;
+    }
+    p = t;
+
+    t = ext; extlen = 0;
+    while (*t++ = *s++) extlen++;
+    if (extlen == 0) { ext[0] = '.'; ext[1] = 0; extlen++; }
+
+    if (*suffix == '.') {        /* Style 1 */
+        if (strEQ(ext, suffix)) goto fallback;
+	strcpy(p, suffix);
+    }
+    else if (suffix[1] == '\0') {  /* Style 2 */
+        if (extlen < 4) { 
+	    ext[extlen] = *suffix;
+	    ext[++extlen] = '\0';
+        }
+	else if (baselen < 8) {
+   	    *p++ = *suffix;
+	}
+	else if (ext[3] != *suffix) {
+	    ext[3] = *suffix;
+	}
+	else if (buf[7] != *suffix) {
+	    buf[7] = *suffix;
+	}
+	else goto fallback;
+	strcpy(p, ext);
+    }
+    else { /* Style 3:  Panic */
+fallback:
+	(void)memcpy(p, strEQ(ext, suffix1) ? suffix2 : suffix1, 5);
+    }
+    rb_str_resize(str, strlen(buf));
+    memcpy(RSTRING(str)->ptr, buf, RSTRING(str)->len);
+}
+
+#if defined(__CYGWIN32__) || defined(_WIN32)
+static int 
+valid_filename(char *s)
+{
+    int fd;
+
+    /*
+    // if the file exists, then it's a valid filename!
+    */
+
+    if (_access(s, 0) == 0) {
+	return 1;
+    }
+
+    /*
+    // It doesn't exist, so see if we can open it.
+    */
+
+    if ((fd = _open(s, O_CREAT, 0666)) >= 0) {
+	_close(fd);
+	_unlink(s);	/* don't leave it laying around */
+	return 1;
+    }
+    return 0;
+}
+#endif
+#endif
+
+#if defined __DJGPP__
+
+#include <dpmi.h>
+
+static char dbcs_table[256];
+
+int
+make_dbcs_table()
+{
+    __dpmi_regs r;
+    struct {
+	unsigned char start;
+	unsigned char end;
+    } vec;
+    int offset;
+
+    memset(&r, 0, sizeof(r));
+    r.x.ax = 0x6300;
+    __dpmi_int(0x21, &r);
+    offset = r.x.ds * 16 + r.x.si;
+
+    for (;;) {
+	int i;
+	dosmemget(offset, sizeof vec, &vec);
+	if (!vec.start && !vec.end)
+	    break;
+	for (i = vec.start; i <= vec.end; i++)
+	    dbcs_table[i] = 1;
+	offset += 2;
+    }
+}
+
+int
+mblen(const char *s, size_t n)
+{
+    static int need_init = 1;
+    if (need_init) {
+	make_dbcs_table();
+	need_init = 0;
+    }
+    if (s) {
+	if (n == 0 || *s == 0)
+	    return 0;
+	else if (!s[1])
+	    return 1;
+	return dbcs_table[(unsigned char)*s] + 1;
+    }
+    else
+	return 1;
+}
+
+struct PathList {
+    struct PathList *next;
+    char *path;
+};
+
+struct PathInfo {
+    struct PathList *head;
+    int count;
+};
+
+static int
+push_element(const char *path, VALUE vinfo)
+{
+    struct PathList *p;
+    struct PathInfo *info = (struct PathInfo *)vinfo;
+
+    p = ALLOC(struct PathList);
+    MEMZERO(p, struct PathList, 1);
+    p->path = ruby_strdup(path);
+    p->next = info->head;
+    info->head = p;
+    info->count++;
+
+    return 0;
+}
+
+#include <dirent.h>
+int __opendir_flags = __OPENDIR_PRESERVE_CASE;
+
+char **
+__crt0_glob_function(char *path)
+{
+    int len = strlen(path);
+    int i;
+    char **rv;
+    char path_buffer[PATH_MAX];
+    char *buf = path_buffer;
+    char *p;
+    struct PathInfo info;
+    struct PathList *plist;
+
+    if (PATH_MAX <= len)
+	buf = ruby_xmalloc(len + 1);
+
+    strncpy(buf, path, len);
+    buf[len] = '\0';
+
+    for (p = buf; *p; p += mblen(p, MB_CUR_MAX))
+	if (*p == '\\')
+	    *p = '/';
+
+    info.count = 0;
+    info.head = 0;
+
+    ruby_glob(buf, 0, push_element, (VALUE)&info);
+
+    if (buf != path_buffer)
+	ruby_xfree(buf);
+
+    if (info.count == 0)
+	return 0;
+
+    rv = ruby_xmalloc((info.count + 1) * sizeof (char *));
+
+    plist = info.head;
+    i = 0;
+    while (plist) {
+	struct PathList *cur;
+	rv[i] = plist->path;
+	cur = plist;
+	plist = plist->next;
+	ruby_xfree(cur);
+	i++;
+    }
+    rv[i] = 0;
+    return rv;
+}
+
+#endif
+
+/* mm.c */
+
+#define A ((int*)a)
+#define B ((int*)b)
+#define C ((int*)c)
+#define D ((int*)d)
+
+#define mmprepare(base, size) do {\
+ if (((long)base & (0x3)) == 0)\
+   if (size >= 16) mmkind = 1;\
+   else            mmkind = 0;\
+ else              mmkind = -1;\
+ high = (size & (~0xf));\
+ low  = (size &  0x0c);\
+} while (0)\
+
+#define mmarg mmkind, size, high, low
+
+static void mmswap_(a, b, mmarg)
+    register char *a, *b;
+    int mmarg;
+{
+ register int s;
+ if (a == b) return;
+ if (mmkind >= 0) {
+   if (mmkind > 0) {
+     register char *t = a + high;
+     do {
+       s = A[0]; A[0] = B[0]; B[0] = s;
+       s = A[1]; A[1] = B[1]; B[1] = s;
+       s = A[2]; A[2] = B[2]; B[2] = s;
+       s = A[3]; A[3] = B[3]; B[3] = s;  a += 16; b += 16;
+     } while (a < t);
+   }
+   if (low != 0) { s = A[0]; A[0] = B[0]; B[0] = s;
+     if (low >= 8) { s = A[1]; A[1] = B[1]; B[1] = s;
+       if (low == 12) {s = A[2]; A[2] = B[2]; B[2] = s;}}}
+ }
+ else {
+   register char *t = a + size;
+   do {s = *a; *a++ = *b; *b++ = s;} while (a < t);
+ }
+}
+#define mmswap(a,b) mmswap_((a),(b),mmarg)
+
+static void mmrot3_(a, b, c, mmarg)
+    register char *a, *b, *c;
+    int mmarg;
+{
+ register int s;
+ if (mmkind >= 0) {
+   if (mmkind > 0) {
+     register char *t = a + high;
+     do {
+       s = A[0]; A[0] = B[0]; B[0] = C[0]; C[0] = s;
+       s = A[1]; A[1] = B[1]; B[1] = C[1]; C[1] = s;
+       s = A[2]; A[2] = B[2]; B[2] = C[2]; C[2] = s;
+       s = A[3]; A[3] = B[3]; B[3] = C[3]; C[3] = s; a += 16; b += 16; c += 16;
+     } while (a < t);
+   }
+   if (low != 0) { s = A[0]; A[0] = B[0]; B[0] = C[0]; C[0] = s;
+     if (low >= 8) { s = A[1]; A[1] = B[1]; B[1] = C[1]; C[1] = s;
+       if (low == 12) {s = A[2]; A[2] = B[2]; B[2] = C[2]; C[2] = s;}}}
+ }
+ else {
+   register char *t = a + size;
+   do {s = *a; *a++ = *b; *b++ = *c; *c++ = s;} while (a < t);
+ }
+}
+#define mmrot3(a,b,c) mmrot3_((a),(b),(c),mmarg)
+
+/* qs6.c */
+/*****************************************************/
+/*                                                   */
+/*          qs6   (Quick sort function)              */
+/*                                                   */
+/* by  Tomoyuki Kawamura              1995.4.21      */
+/* kawamura@tokuyama.ac.jp                           */
+/*****************************************************/
+
+typedef struct { char *LL, *RR; } stack_node; /* Stack structure for L,l,R,r */
+#define PUSH(ll,rr) do { top->LL = (ll); top->RR = (rr); ++top; } while (0)  /* Push L,l,R,r */
+#define POP(ll,rr)  do { --top; ll = top->LL; rr = top->RR; } while (0)      /* Pop L,l,R,r */
+
+#define med3(a,b,c) ((*cmp)(a,b,d)<0 ?                                   \
+                       ((*cmp)(b,c,d)<0 ? b : ((*cmp)(a,c,d)<0 ? c : a)) : \
+                       ((*cmp)(b,c,d)>0 ? b : ((*cmp)(a,c,d)<0 ? a : c)))
+
+void ruby_qsort (base, nel, size, cmp, d)
+     void* base;
+     const int nel;
+     const int size;
+     int (*cmp)();
+     void *d;
+{
+  register char *l, *r, *m;          	/* l,r:left,right group   m:median point */
+  register int  t, eq_l, eq_r;       	/* eq_l: all items in left group are equal to S */
+  char *L = base;                    	/* left end of curren region */
+  char *R = (char*)base + size*(nel-1); /* right end of current region */
+  int  chklim = 63;                     /* threshold of ordering element check */
+  stack_node stack[32], *top = stack;   /* 32 is enough for 32bit CPU */
+  int mmkind, high, low;
+
+  if (nel <= 1) return;        /* need not to sort */
+  mmprepare(base, size);
+  goto start;
+
+  nxt:
+  if (stack == top) return;    /* return if stack is empty */
+  POP(L,R);
+
+  for (;;) {
+    start:
+    if (L + size == R) {       /* 2 elements */
+      if ((*cmp)(L,R,d) > 0) mmswap(L,R); goto nxt;
+    }
+
+    l = L; r = R;
+    t = (r - l + size) / size;  /* number of elements */
+    m = l + size * (t >> 1);    /* calculate median value */
+
+    if (t >= 60) {
+      register char *m1;
+      register char *m3;
+      if (t >= 200) {
+	t = size*(t>>3); /* number of bytes in splitting 8 */
+	{
+	  register char *p1 = l  + t;
+	  register char *p2 = p1 + t;
+	  register char *p3 = p2 + t;
+	  m1 = med3(p1, p2, p3);
+	  p1 = m  + t;
+	  p2 = p1 + t;
+	  p3 = p2 + t;
+	  m3 = med3(p1, p2, p3);
+	}
+      }
+      else {
+	t = size*(t>>2); /* number of bytes in splitting 4 */
+	m1 = l + t;
+	m3 = m + t;
+      }
+      m = med3(m1, m, m3);
+    }
+
+    if ((t = (*cmp)(l,m,d)) < 0) {                           /*3-5-?*/
+      if ((t = (*cmp)(m,r,d)) < 0) {                         /*3-5-7*/
+	if (chklim && nel >= chklim) {   /* check if already ascending order */
+	  char *p;
+	  chklim = 0;
+	  for (p=l; p<r; p+=size) if ((*cmp)(p,p+size,d) > 0) goto fail;
+	  goto nxt;
+	}
+	fail: goto loopA;                                    /*3-5-7*/
+      }
+      if (t > 0) {
+	if ((*cmp)(l,r,d) <= 0) {mmswap(m,r); goto loopA;}     /*3-5-4*/
+	mmrot3(r,m,l); goto loopA;                           /*3-5-2*/
+      }
+      goto loopB;                                            /*3-5-5*/
+    }
+
+    if (t > 0) {                                             /*7-5-?*/
+      if ((t = (*cmp)(m,r,d)) > 0) {                         /*7-5-3*/
+	if (chklim && nel >= chklim) {   /* check if already ascending order */
+	  char *p;
+	  chklim = 0;
+	  for (p=l; p<r; p+=size) if ((*cmp)(p,p+size,d) < 0) goto fail2;
+	  while (l<r) {mmswap(l,r); l+=size; r-=size;}  /* reverse region */
+	  goto nxt;
+	}
+	fail2: mmswap(l,r); goto loopA;                      /*7-5-3*/
+      }
+      if (t < 0) {
+	if ((*cmp)(l,r,d) <= 0) {mmswap(l,m); goto loopB;}   /*7-5-8*/
+	mmrot3(l,m,r); goto loopA;                           /*7-5-6*/
+      }
+      mmswap(l,r); goto loopA;                               /*7-5-5*/
+    }
+
+    if ((t = (*cmp)(m,r,d)) < 0)  {goto loopA;}              /*5-5-7*/
+    if (t > 0) {mmswap(l,r); goto loopB;}                    /*5-5-3*/
+
+    /* determining splitting type in case 5-5-5 */           /*5-5-5*/
+    for (;;) {
+      if ((l += size) == r)      goto nxt;                   /*5-5-5*/
+      if (l == m) continue;
+      if ((t = (*cmp)(l,m,d)) > 0) {mmswap(l,r); l = L; goto loopA;}/*575-5*/
+      if (t < 0)                 {mmswap(L,l); l = L; goto loopB;}  /*535-5*/
+    }
+
+    loopA: eq_l = 1; eq_r = 1;  /* splitting type A */ /* left <= median < right */
+    for (;;) {
+      for (;;) {
+	if ((l += size) == r)
+	  {l -= size; if (l != m) mmswap(m,l); l -= size; goto fin;}
+	if (l == m) continue;
+	if ((t = (*cmp)(l,m,d)) > 0) {eq_r = 0; break;}
+	if (t < 0) eq_l = 0;
+      }
+      for (;;) {
+	if (l == (r -= size))
+	  {l -= size; if (l != m) mmswap(m,l); l -= size; goto fin;}
+	if (r == m) {m = l; break;}
+	if ((t = (*cmp)(r,m,d)) < 0) {eq_l = 0; break;}
+	if (t == 0) break;
+      }
+      mmswap(l,r);    /* swap left and right */
+    }
+
+    loopB: eq_l = 1; eq_r = 1;  /* splitting type B */ /* left < median <= right */
+    for (;;) {
+      for (;;) {
+	if (l == (r -= size))
+	  {r += size; if (r != m) mmswap(r,m); r += size; goto fin;}
+	if (r == m) continue;
+	if ((t = (*cmp)(r,m,d)) < 0) {eq_l = 0; break;}
+	if (t > 0) eq_r = 0;
+      }
+      for (;;) {
+	if ((l += size) == r)
+	  {r += size; if (r != m) mmswap(r,m); r += size; goto fin;}
+	if (l == m) {m = r; break;}
+	if ((t = (*cmp)(l,m,d)) > 0) {eq_r = 0; break;}
+	if (t == 0) break;
+      }
+      mmswap(l,r);    /* swap left and right */
+    }
+
+    fin:
+    if (eq_l == 0)                         /* need to sort left side */
+      if (eq_r == 0)                       /* need to sort right side */
+	if (l-L < R-r) {PUSH(r,R); R = l;} /* sort left side first */
+	else           {PUSH(L,l); L = r;} /* sort right side first */
+      else R = l;                          /* need to sort left side only */
+    else if (eq_r == 0) L = r;             /* need to sort right side only */
+    else goto nxt;                         /* need not to sort both sides */
+  }
+}
+
+char *
+ruby_strdup(str)
+    const char *str;
+{
+    char *tmp;
+    int len = strlen(str) + 1;
+
+    tmp = xmalloc(len);
+    memcpy(tmp, str, len);
+
+    return tmp;
+}
+
+char *
+ruby_getcwd()
+{
+#ifdef HAVE_GETCWD
+    int size = 200;
+    char *buf = xmalloc(size);
+
+    while (!getcwd(buf, size)) {
+	if (errno != ERANGE) {
+	    free(buf);
+	    rb_sys_fail("getcwd");
+	}
+	size *= 2;
+	buf = xrealloc(buf, size);
+    }
+#else
+# ifndef PATH_MAX
+#  define PATH_MAX 8192
+# endif
+    char *buf = xmalloc(PATH_MAX+1);
+
+    if (!getwd(buf)) {
+	free(buf);
+	rb_sys_fail("getwd");
+    }
+#endif
+    return buf;
+}
+
+/* copyright notice for strtod implementation --
+ *
+ * Copyright (c) 1988-1993 The Regents of the University of California.
+ * Copyright (c) 1994 Sun Microsystems, Inc.
+ *
+ * Permission to use, copy, modify, and distribute this
+ * software and its documentation for any purpose and without
+ * fee is hereby granted, provided that the above copyright
+ * notice appear in all copies.  The University of California
+ * makes no representations about the suitability of this
+ * software for any purpose.  It is provided "as is" without
+ * express or implied warranty.
+ *
+ */
+
+#define MDMINEXPT DBL_MIN_10_EXP
+#define MDMAXEXPT DBL_MAX_10_EXP
+
+static const
+double powersOf10[] = { 	/* Table giving binary powers of 10.  Entry */
+    10.0,			/* is 10^2^i.  Used to convert decimal */
+    100.0,			/* exponents into floating-point numbers. */
+    1.0e4,
+    1.0e8,
+    1.0e16,
+    1.0e32,
+    1.0e64,
+    1.0e128,
+    1.0e256
+};
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * strtod --
+ *
+ *	This procedure converts a floating-point number from an ASCII
+ *	decimal representation to internal double-precision format.
+ *
+ * Results:
+ *	The return value is the double-precision floating-point
+ *	representation of the characters in string.  If endPtr isn't
+ *	NULL, then *endPtr is filled in with the address of the
+ *	next character after the last one that was part of the
+ *	floating-point number.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+double
+ruby_strtod(string, endPtr)
+    const char *string;		/* A decimal ASCII floating-point number,
+				 * optionally preceded by white space.
+				 * Must have form "-I.FE-X", where I is the
+				 * integer part of the mantissa, F is the
+				 * fractional part of the mantissa, and X
+				 * is the exponent.  Either of the signs
+				 * may be "+", "-", or omitted.  Either I
+				 * or F may be omitted, but both cannot be
+				 * ommitted at once. The decimal
+				 * point isn't necessary unless F is present.
+				 * The "E" may actually be an "e".  E and X
+				 * may both be omitted (but not just one).
+				 */
+    char **endPtr;		/* If non-NULL, store terminating character's
+				 * address here. */
+{
+    int sign, expSign = Qfalse;
+    double fraction = 0.0, dblExp;
+    const double *d;
+    register const char *p;
+    register int c;
+    int exp = 0;		/* Exponent read from "EX" field. */
+    int fracExp = 0;		/* Exponent that derives from the fractional
+				 * part.  Under normal circumstatnces, it is
+				 * the negative of the number of digits in F.
+				 * However, if I is very long, the last digits
+				 * of I get dropped (otherwise a long I with a
+				 * large negative exponent could cause an
+				 * unnecessary overflow on I alone).  In this
+				 * case, fracExp is incremented one for each
+				 * dropped digit. */
+    int mantSize = 0;		/* Number of digits in mantissa. */
+    int hasPoint = Qfalse;	/* Decimal point exists. */
+    int hasDigit = Qfalse;	/* I or F exists. */
+    const char *pMant;		/* Temporarily holds location of mantissa
+				 * in string. */
+    const char *pExp;		/* Temporarily holds location of exponent
+				 * in string. */
+
+    /*
+     * Strip off leading blanks and check for a sign.
+     */
+
+    errno = 0;
+    p = string;
+    while (ISSPACE(*p)) p++;
+    if (*p == '-') {
+	sign = Qtrue;
+	p++;
+    }
+    else {
+	if (*p == '+') p++;
+	sign = Qfalse;
+    }
+
+    fraction = 0.;
+    exp = 0;
+
+    /*
+     * Count the number of digits in the mantissa
+     * and also locate the decimal point.
+     */
+
+    for ( ; (c = *p) != '\0'; p++) {
+	if (!ISDIGIT(c)) {
+	    if (c != '.' || hasPoint || !ISDIGIT(p[1])) {
+		break;
+	    }
+	    hasPoint = Qtrue;
+	}
+	else {
+	    if (hasPoint) { /* already in fractional part */
+		fracExp--;
+	    }
+	    if (mantSize) { /* already in mantissa */
+		mantSize++;
+	    }
+	    else if (c != '0') { /* have entered mantissa */
+		mantSize++;
+		pMant = p;
+	    }
+	    hasDigit = Qtrue;
+	}
+    }
+
+    /*
+     * Now suck up the digits in the mantissa.  Use two integers to
+     * collect 9 digits each (this is faster than using floating-point).
+     * If the mantissa has more than 18 digits, ignore the extras, since
+     * they can't affect the value anyway.
+     */
+    
+    pExp = p;
+    if (mantSize) {
+	p = pMant;
+    }
+    if (mantSize > 18) {
+	fracExp += (mantSize - 18);
+	mantSize = 18;
+    }
+    if (!hasDigit) {
+	fraction = 0.0;
+	p = string;
+    }
+    else {
+	double frac1, frac2;
+	frac1 = 0;
+	for ( ; mantSize > 9; mantSize -= 1) {
+	    c = *p;
+	    p += 1;
+	    if (c == '.') {
+		c = *p;
+		p += 1;
+	    }
+	    frac1 = 10*frac1 + (c - '0');
+	}
+	frac2 = 0;
+	for (; mantSize > 0; mantSize -= 1) {
+	    c = *p;
+	    p += 1;
+	    if (c == '.') {
+		c = *p;
+		p += 1;
+	    }
+	    frac2 = 10*frac2 + (c - '0');
+	}
+
+	/*
+	 * Skim off the exponent.
+	 */
+
+	p = pExp;
+	if ((*p == 'E') || (*p == 'e')) {
+	    p++;
+	    if (*p == '-') {
+		expSign = Qtrue;
+		p++;
+	    }
+	    else {
+		if (*p == '+') {
+		    p++;
+		}
+		expSign = Qfalse;
+	    }
+	    if (ISDIGIT(*p)) {
+		do {
+		    exp = exp * 10 + (*p++ - '0');
+		}
+		while (ISDIGIT(*p));
+	    }
+	    else {
+		p = pExp;
+	    }
+	}
+	if (expSign) {
+	    exp = fracExp - exp;
+	}
+	else {
+	    exp = fracExp + exp;
+	}
+
+	/*
+	 * Generate a floating-point number that represents the exponent.
+	 * Do this by processing the exponent one bit at a time to combine
+	 * many powers of 2 of 10. Then combine the exponent with the
+	 * fraction.
+	 */
+    
+	if (exp >= MDMAXEXPT) {
+	    errno = ERANGE;
+	    fraction = HUGE_VAL;
+	    goto ret;
+	}
+	else if (exp < MDMINEXPT) {
+	    errno = ERANGE;
+	    fraction = 0.0;
+	    goto ret;
+	}
+	fracExp = exp;
+	exp += 9;
+	if (exp < 0) {
+	    expSign = Qtrue;
+	    exp = -exp;
+	}
+	else {
+	    expSign = Qfalse;
+	}
+	dblExp = 1.0;
+	for (d = powersOf10; exp != 0; exp >>= 1, d += 1) {
+	    if (exp & 01) {
+		dblExp *= *d;
+	    }
+	}
+	if (expSign) {
+	    frac1 /= dblExp;
+	}
+	else {
+	    frac1 *= dblExp;
+	}
+	exp = fracExp;
+	if (exp < 0) {
+	    expSign = Qtrue;
+	    exp = -exp;
+	}
+	else {
+	    expSign = Qfalse;
+	}
+	dblExp = 1.0;
+	for (d = powersOf10; exp != 0; exp >>= 1, d += 1) {
+	    if (exp & 01) {
+		dblExp *= *d;
+	    }
+	}
+	if (expSign) {
+	    frac2 /= dblExp;
+	}
+	else {
+	    frac2 *= dblExp;
+	}
+	fraction = frac1 + frac2;
+    }
+
+  ret:
+    if (endPtr != NULL) {
+	*endPtr = (char *)p;
+    }
+    if (sign) {
+	return -fraction;
+    }
+    return fraction;
+}
diff --git a/ruby_1_8_6/util.h b/ruby_1_8_6/util.h
new file mode 100644
index 0000000000..b00c096dec
--- /dev/null
+++ b/ruby_1_8_6/util.h
@@ -0,0 +1,67 @@
+/**********************************************************************
+
+  util.h -
+
+  $Author$
+  $Date$
+  created at: Thu Mar  9 11:55:53 JST 1995
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef UTIL_H
+#define UTIL_H
+
+#ifndef _
+#ifdef __cplusplus
+# ifndef  HAVE_PROTOTYPES
+#  define HAVE_PROTOTYPES 1
+# endif
+# ifndef  HAVE_STDARG_PROTOTYPES
+#  define HAVE_STDARG_PROTOTYPES 1
+# endif
+#endif
+#ifdef HAVE_PROTOTYPES
+# define _(args) args
+#else
+# define _(args) ()
+#endif
+#ifdef HAVE_STDARG_PROTOTYPES
+# define __(args) args
+#else
+# define __(args) ()
+#endif
+#endif
+
+#define scan_oct ruby_scan_oct
+unsigned long scan_oct _((const char*, int, int*));
+#define scan_hex ruby_scan_hex
+unsigned long scan_hex _((const char*, int, int*));
+
+#if defined(MSDOS) || defined(__CYGWIN32__) || defined(_WIN32)
+void ruby_add_suffix();
+#endif
+
+void ruby_qsort _((void*, const int, const int, int (*)(), void*));
+#define qsort(b,n,s,c,d) ruby_qsort(b,n,s,c,d)
+
+void ruby_setenv _((const char*, const char*));
+void ruby_unsetenv _((const char*));
+#undef setenv
+#undef unsetenv
+#define setenv(name,val) ruby_setenv(name,val)
+#define unsetenv(name,val) ruby_unsetenv(name);
+
+char *ruby_strdup _((const char*));
+#undef strdup
+#define strdup(s) ruby_strdup(s)
+
+char *ruby_getcwd _((void));
+#define my_getcwd() ruby_getcwd()
+
+double ruby_strtod _((const char*, char **));
+#undef strtod
+#define strtod(s,e) ruby_strtod(s,e)
+
+#endif /* UTIL_H */
diff --git a/ruby_1_8_6/variable.c b/ruby_1_8_6/variable.c
new file mode 100644
index 0000000000..e00f1ef6eb
--- /dev/null
+++ b/ruby_1_8_6/variable.c
@@ -0,0 +1,1965 @@
+/**********************************************************************
+
+  variable.c -
+
+  $Author$
+  $Date$
+  created at: Tue Apr 19 23:55:15 JST 1994
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "env.h"
+#include "node.h"
+#include "st.h"
+#include "util.h"
+
+st_table *rb_global_tbl;
+st_table *rb_class_tbl;
+static ID autoload, classpath, tmp_classpath;
+
+void
+Init_var_tables()
+{
+    rb_global_tbl = st_init_numtable();
+    rb_class_tbl = st_init_numtable();
+    autoload = rb_intern("__autoload__");
+    classpath = rb_intern("__classpath__");
+    tmp_classpath = rb_intern("__tmp_classpath__");
+}
+
+struct fc_result {
+    ID name;
+    VALUE klass;
+    VALUE path;
+    VALUE track;
+    struct fc_result *prev;
+};
+
+static VALUE
+fc_path(fc, name)
+    struct fc_result *fc;
+    ID name;
+{
+    VALUE path, tmp;
+
+    path = rb_str_new2(rb_id2name(name));
+    while (fc) {
+	if (fc->track == rb_cObject) break;
+	if (ROBJECT(fc->track)->iv_tbl &&
+	    st_lookup(ROBJECT(fc->track)->iv_tbl, classpath, &tmp)) {
+	    tmp = rb_str_dup(tmp);
+	    rb_str_cat2(tmp, "::");
+	    rb_str_append(tmp, path);
+
+	    return tmp;
+	}
+	tmp = rb_str_new2(rb_id2name(fc->name));
+	rb_str_cat2(tmp, "::");
+	rb_str_append(tmp, path);
+	path = tmp;
+	fc = fc->prev;
+    }
+    return path;
+}
+
+static int
+fc_i(key, value, res)
+    ID key;
+    VALUE value;
+    struct fc_result *res;
+{
+    if (!rb_is_const_id(key)) return ST_CONTINUE;
+
+    if (value == res->klass) {
+	res->path = fc_path(res, key);
+	return ST_STOP;
+    }
+    switch (TYPE(value)) {
+      case T_MODULE:
+      case T_CLASS:
+	if (!RCLASS(value)->iv_tbl) return ST_CONTINUE;
+	else {
+	    struct fc_result arg;
+	    struct fc_result *list;
+
+	    list = res;
+	    while (list) {
+		if (list->track == value) return ST_CONTINUE;
+		list = list->prev;
+	    }
+
+	    arg.name = key;
+	    arg.path = 0;
+	    arg.klass = res->klass;
+	    arg.track = value;
+	    arg.prev = res;
+	    st_foreach_safe(RCLASS(value)->iv_tbl, fc_i, (st_data_t)&arg);
+	    if (arg.path) {
+		res->path = arg.path;
+		return ST_STOP;
+	    }
+	}
+	break;
+
+      default:
+	break;
+    }
+    return ST_CONTINUE;
+}
+
+static VALUE
+find_class_path(klass)
+    VALUE klass;
+{
+    struct fc_result arg;
+
+    arg.name = 0;
+    arg.path = 0;
+    arg.klass = klass;
+    arg.track = rb_cObject;
+    arg.prev = 0;
+    if (RCLASS(rb_cObject)->iv_tbl) {
+	st_foreach_safe(RCLASS(rb_cObject)->iv_tbl, fc_i, (st_data_t)&arg);
+    }
+    if (arg.path == 0) {
+	st_foreach(rb_class_tbl, fc_i, (st_data_t)&arg);
+    }
+    if (arg.path) {
+	if (!ROBJECT(klass)->iv_tbl) {
+	    ROBJECT(klass)->iv_tbl = st_init_numtable();
+	}
+	st_insert(ROBJECT(klass)->iv_tbl, classpath, arg.path);
+	st_delete(RCLASS(klass)->iv_tbl, &tmp_classpath, 0);
+	return arg.path;
+    }
+    return Qnil;
+}
+
+static VALUE
+classname(klass)
+    VALUE klass;
+{
+    VALUE path = Qnil;
+
+    if (!klass) klass = rb_cObject;
+    if (ROBJECT(klass)->iv_tbl) {
+	if (!st_lookup(ROBJECT(klass)->iv_tbl, classpath, &path)) {
+	    ID classid = rb_intern("__classid__");
+
+	    if (!st_lookup(ROBJECT(klass)->iv_tbl, classid, &path)) {
+		return find_class_path(klass);
+	    }
+	    path = rb_str_new2(rb_id2name(SYM2ID(path)));
+	    st_insert(ROBJECT(klass)->iv_tbl, classpath, path);
+	    st_delete(RCLASS(klass)->iv_tbl, (st_data_t*)&classid, 0);
+	}
+	if (TYPE(path) != T_STRING) {
+	    rb_bug("class path is not set properly");
+	}
+	return path;
+    }
+    return find_class_path(klass);
+}
+
+/*
+ *  call-seq:
+ *     mod.name    => string
+ *  
+ *  Returns the name of the module <i>mod</i>.
+ */
+
+VALUE
+rb_mod_name(mod)
+    VALUE mod;
+{
+    VALUE path = classname(mod);
+
+    if (!NIL_P(path)) return rb_str_dup(path);
+    return rb_str_new(0,0);
+}
+
+VALUE
+rb_class_path(klass)
+    VALUE klass;
+{
+    VALUE path = classname(klass);
+
+    if (!NIL_P(path)) return path;
+    if (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl,
+					   tmp_classpath, &path)) {
+	return path;
+    }
+    else {
+	char *s = "Class";
+	size_t len;
+
+	if (TYPE(klass) == T_MODULE) {
+	    if (rb_obj_class(klass) == rb_cModule) {
+		s = "Module";
+	    }
+	    else {
+		s = rb_class2name(RBASIC(klass)->klass);
+	    }
+	}
+	len = 2 + strlen(s) + 3 + 2 * SIZEOF_LONG + 1;
+	path = rb_str_new(0, len);
+	snprintf(RSTRING(path)->ptr, len+1, "#<%s:0x%lx>", s, klass);
+	RSTRING(path)->len = strlen(RSTRING(path)->ptr);
+	rb_ivar_set(klass, tmp_classpath, path);
+
+	return path;
+    }
+}
+
+void
+rb_set_class_path(klass, under, name)
+    VALUE klass, under;
+    const char *name;
+{
+    VALUE str;
+
+    if (under == rb_cObject) {
+	str = rb_str_new2(name);
+    }
+    else {
+	str = rb_str_dup(rb_class_path(under));
+	rb_str_cat2(str, "::");
+	rb_str_cat2(str, name);
+    }
+    rb_ivar_set(klass, classpath, str);
+}
+
+VALUE
+rb_path2class(path)
+    const char *path;
+{
+    const char *pbeg, *p;
+    ID id;
+    VALUE c = rb_cObject;
+    VALUE str = 0;
+
+    if (path[0] == '#') {
+	rb_raise(rb_eArgError, "can't retrieve anonymous class %s", path);
+    }
+    pbeg = p = path;
+    while (*p) {
+	while (*p && *p != ':') p++;
+	if (str) {
+	    RSTRING(str)->len = 0;
+	    rb_str_cat(str, pbeg, p-pbeg);
+	}
+	else {
+	    str = rb_str_new(pbeg, p-pbeg);
+	}
+	id = rb_intern(RSTRING(str)->ptr);
+	if (p[0] == ':') {
+	    if (p[1] != ':') goto undefined_class;
+	    p += 2;
+	    pbeg = p;
+	}
+	if (!rb_const_defined(c, id)) {
+	  undefined_class:
+	    rb_raise(rb_eArgError, "undefined class/module %.*s", p-path, path);
+	}
+	c = rb_const_get_at(c, id);
+	switch (TYPE(c)) {
+	  case T_MODULE:
+	  case T_CLASS:
+	    break;
+	  default:
+	    rb_raise(rb_eTypeError, "%s does not refer class/module", path);
+	}
+    }
+
+    return c;
+}
+
+void
+rb_name_class(klass, id)
+    VALUE klass;
+    ID id;
+{
+    rb_iv_set(klass, "__classid__", ID2SYM(id));
+}
+
+VALUE
+rb_class_name(klass)
+    VALUE klass;
+{
+    return rb_class_path(rb_class_real(klass));
+}
+
+char *
+rb_class2name(klass)
+    VALUE klass;
+{
+    return RSTRING(rb_class_name(klass))->ptr;
+}
+
+char *
+rb_obj_classname(obj)
+    VALUE obj;
+{
+    return rb_class2name(CLASS_OF(obj));
+}
+
+struct trace_var {
+    int removed;
+    void (*func)();
+    VALUE data;
+    struct trace_var *next;
+};
+
+struct global_variable {
+    int   counter;
+    void *data;
+    VALUE (*getter)();
+    void  (*setter)();
+    void  (*marker)();
+    int block_trace;
+    struct trace_var *trace;
+};
+
+struct global_entry {
+    struct global_variable *var;
+    ID id;
+};
+
+static VALUE undef_getter();
+static void  undef_setter();
+static void  undef_marker();
+
+static VALUE val_getter();
+static void  val_setter();
+static void  val_marker();
+
+static VALUE var_getter();
+static void  var_setter();
+static void  var_marker();
+
+struct global_entry*
+rb_global_entry(id)
+    ID id;
+{
+    struct global_entry *entry;
+
+    if (!st_lookup(rb_global_tbl, id, (st_data_t *)&entry)) {
+	struct global_variable *var;
+	entry = ALLOC(struct global_entry);
+	var = ALLOC(struct global_variable);
+	entry->id = id;
+	entry->var = var;
+	var->counter = 1;
+	var->data = 0;
+	var->getter = undef_getter;
+	var->setter = undef_setter;
+	var->marker = undef_marker;
+
+	var->block_trace = 0;
+	var->trace = 0;
+	st_add_direct(rb_global_tbl, id, (st_data_t)entry);
+    }
+    return entry;
+}
+
+static VALUE
+undef_getter(id)
+    ID id;
+{
+    rb_warning("global variable `%s' not initialized", rb_id2name(id));
+
+    return Qnil;
+}
+
+static void
+undef_setter(val, id, data, var)
+    VALUE val;
+    ID id;
+    void *data;
+    struct global_variable *var;
+{
+    var->getter = val_getter;
+    var->setter = val_setter;
+    var->marker = val_marker;
+
+    var->data = (void*)val;
+}
+
+static void
+undef_marker()
+{
+}
+
+static VALUE
+val_getter(id, val)
+    ID id;
+    VALUE val;
+{
+    return val;
+}
+
+static void
+val_setter(val, id, data, var)
+    VALUE val;
+    ID id;
+    void *data;
+    struct global_variable *var;
+{
+    var->data = (void*)val;
+}
+
+static void
+val_marker(data)
+    VALUE data;
+{
+    if (data) rb_gc_mark_maybe(data);
+}
+
+static VALUE
+var_getter(id, var)
+    ID id;
+    VALUE *var;
+{
+    if (!var) return Qnil;
+    return *var;
+}
+
+static void
+var_setter(val, id, var)
+    VALUE val;
+    ID id;
+    VALUE *var;
+{
+    *var = val;
+}
+
+static void
+var_marker(var)
+    VALUE *var;
+{
+    if (var) rb_gc_mark_maybe(*var);
+}
+
+static void
+readonly_setter(val, id, var)
+    VALUE val;
+    ID id;
+    void *var;
+{
+    rb_name_error(id, "%s is a read-only variable", rb_id2name(id));
+}
+
+static int
+mark_global_entry(key, entry)
+    ID key;
+    struct global_entry *entry;
+{
+    struct trace_var *trace;
+    struct global_variable *var = entry->var;
+
+    (*var->marker)(var->data);
+    trace = var->trace;
+    while (trace) {
+	if (trace->data) rb_gc_mark_maybe(trace->data);
+	trace = trace->next;
+    }
+    return ST_CONTINUE;
+}
+
+void
+rb_gc_mark_global_tbl()
+{
+    if (rb_global_tbl) {
+	st_foreach(rb_global_tbl, mark_global_entry, 0);
+    }
+}
+
+static ID
+global_id(name)
+    const char *name;
+{
+    ID id;
+
+    if (name[0] == '$') id = rb_intern(name);
+    else {
+	char *buf = ALLOCA_N(char, strlen(name)+2);
+	buf[0] = '$';
+	strcpy(buf+1, name);
+	id = rb_intern(buf);
+    }
+    return id;
+}
+
+void
+rb_define_hooked_variable(name, var, getter, setter)
+    const char  *name;
+    VALUE *var;
+    VALUE (*getter)();
+    void  (*setter)();
+{
+    struct global_variable *gvar;
+    ID id = global_id(name);
+
+    gvar = rb_global_entry(id)->var;
+    gvar->data = (void*)var;
+    gvar->getter = getter?getter:var_getter;
+    gvar->setter = setter?setter:var_setter;
+    gvar->marker = var_marker;
+}
+
+void
+rb_define_variable(name, var)
+    const char  *name;
+    VALUE *var;
+{
+    rb_define_hooked_variable(name, var, 0, 0);
+}
+
+void
+rb_define_readonly_variable(name, var)
+    const char  *name;
+    VALUE *var;
+{
+    rb_define_hooked_variable(name, var, 0, readonly_setter);
+}
+
+void
+rb_define_virtual_variable(name, getter, setter)
+    const char  *name;
+    VALUE (*getter)();
+    void  (*setter)();
+{
+    if (!getter) getter = val_getter;
+    if (!setter) setter = readonly_setter;
+    rb_define_hooked_variable(name, 0, getter, setter);
+}
+
+static void
+rb_trace_eval(cmd, val)
+    VALUE cmd, val;
+{
+    rb_eval_cmd(cmd, rb_ary_new3(1, val), 0);
+}
+
+/*
+ *  call-seq:
+ *     trace_var(symbol, cmd )             => nil
+ *     trace_var(symbol) {|val| block }    => nil
+ *  
+ *  Controls tracing of assignments to global variables. The parameter
+ *  +symbol_ identifies the variable (as either a string name or a
+ *  symbol identifier). _cmd_ (which may be a string or a
+ *  +Proc+ object) or block is executed whenever the variable
+ *  is assigned. The block or +Proc+ object receives the
+ *  variable's new value as a parameter. Also see
+ *  <code>Kernel::untrace_var</code>.
+ *     
+ *     trace_var :$_, proc {|v| puts "$_ is now '#{v}'" }
+ *     $_ = "hello"
+ *     $_ = ' there'
+ *     
+ *  <em>produces:</em>
+ *     
+ *     $_ is now 'hello'
+ *     $_ is now ' there'
+ */
+
+VALUE
+rb_f_trace_var(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE var, cmd;
+    struct global_entry *entry;
+    struct trace_var *trace;
+
+    rb_secure(4);
+    if (rb_scan_args(argc, argv, "11", &var, &cmd) == 1) {
+	cmd = rb_block_proc();
+    }
+    if (NIL_P(cmd)) {
+	return rb_f_untrace_var(argc, argv);
+    }
+    entry = rb_global_entry(rb_to_id(var));
+    if (OBJ_TAINTED(cmd)) {
+	rb_raise(rb_eSecurityError, "Insecure: tainted variable trace");
+    }
+    trace = ALLOC(struct trace_var);
+    trace->next = entry->var->trace;
+    trace->func = rb_trace_eval;
+    trace->data = cmd;
+    trace->removed = 0;
+    entry->var->trace = trace;
+
+    return Qnil;
+}
+
+static void
+remove_trace(var)
+    struct global_variable *var;
+{
+    struct trace_var *trace = var->trace;
+    struct trace_var t;
+    struct trace_var *next;
+
+    t.next = trace;
+    trace = &t;
+    while (trace->next) {
+	next = trace->next;
+	if (next->removed) {
+	    trace->next = next->next;
+	    free(next);
+	}
+	else {
+	    trace = next;
+	}
+    }
+    var->trace = t.next;
+}
+
+/*
+ *  call-seq:
+ *     untrace_var(symbol [, cmd] )   => array or nil
+ *  
+ *  Removes tracing for the specified command on the given global
+ *  variable and returns +nil+. If no command is specified,
+ *  removes all tracing for that variable and returns an array
+ *  containing the commands actually removed.
+ */
+
+VALUE
+rb_f_untrace_var(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE var, cmd;
+    ID id;
+    struct global_entry *entry;
+    struct trace_var *trace;
+
+    rb_scan_args(argc, argv, "11", &var, &cmd);
+    id = rb_to_id(var);
+    if (!st_lookup(rb_global_tbl, id, (st_data_t *)&entry)) {
+	rb_name_error(id, "undefined global variable %s", rb_id2name(id));
+    }
+
+    trace = entry->var->trace;
+    if (NIL_P(cmd)) {
+	VALUE ary = rb_ary_new();
+
+	while (trace) {
+	    struct trace_var *next = trace->next;
+	    rb_ary_push(ary, (VALUE)trace->data);
+	    trace->removed = 1;
+	    trace = next;
+	}
+
+	if (!entry->var->block_trace) remove_trace(entry->var);
+	return ary;
+    }
+    else {
+	while (trace) {
+	    if (trace->data == cmd) {
+		trace->removed = 1;
+		if (!entry->var->block_trace) remove_trace(entry->var);
+		return rb_ary_new3(1, cmd);
+	    }
+	    trace = trace->next;
+	}
+    }
+    return Qnil;
+}
+
+VALUE
+rb_gvar_get(entry)
+    struct global_entry *entry;
+{
+    struct global_variable *var = entry->var;
+    return (*var->getter)(entry->id, var->data, var);
+}
+
+struct trace_data {
+    struct trace_var *trace;
+    VALUE val;
+};
+
+static VALUE
+trace_ev(data)
+    struct trace_data *data;
+{
+    struct trace_var *trace = data->trace;
+
+    while (trace) {
+	(*trace->func)(trace->data, data->val);
+	trace = trace->next;
+    }
+    return Qnil;		/* not reached */
+}
+
+static VALUE
+trace_en(var)
+    struct global_variable *var;
+{
+    var->block_trace = 0;
+    remove_trace(var);
+    return Qnil;		/* not reached */
+}
+
+VALUE
+rb_gvar_set(entry, val)
+    struct global_entry *entry;
+    VALUE val;
+{
+    struct trace_data trace;
+    struct global_variable *var = entry->var;
+
+    if (rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't change global variable value");
+    (*var->setter)(val, entry->id, var->data, var);
+
+    if (var->trace && !var->block_trace) {
+	var->block_trace = 1;
+	trace.trace = var->trace;
+	trace.val = val;
+	rb_ensure(trace_ev, (VALUE)&trace, trace_en, (VALUE)var);
+    }
+    return val;
+}
+
+VALUE
+rb_gv_set(name, val)
+    const char *name;
+    VALUE val;
+{
+    struct global_entry *entry;
+
+    entry = rb_global_entry(global_id(name));
+    return rb_gvar_set(entry, val);
+}
+
+VALUE
+rb_gv_get(name)
+    const char *name;
+{
+    struct global_entry *entry;
+
+    entry = rb_global_entry(global_id(name));
+    return rb_gvar_get(entry);
+}
+
+VALUE
+rb_gvar_defined(entry)
+    struct global_entry *entry;
+{
+    if (entry->var->getter == undef_getter) return Qfalse;
+    return Qtrue;
+}
+
+static int
+gvar_i(key, entry, ary)
+    ID key;
+    struct global_entry *entry;
+    VALUE ary;
+{
+    rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     global_variables    => array
+ *  
+ *  Returns an array of the names of global variables.
+ *     
+ *     global_variables.grep /std/   #=> ["$stderr", "$stdout", "$stdin"]
+ */
+
+VALUE
+rb_f_global_variables()
+{
+    VALUE ary = rb_ary_new();
+    char buf[4];
+    char *s = "&`'+123456789";
+
+    st_foreach(rb_global_tbl, gvar_i, ary);
+    if (!NIL_P(rb_backref_get())) {
+	while (*s) {
+	    sprintf(buf, "$%c", *s++);
+	    rb_ary_push(ary, rb_str_new2(buf));
+	}
+    }
+    return ary;
+}
+
+void
+rb_alias_variable(name1, name2)
+    ID name1;
+    ID name2;
+{
+    struct global_entry *entry1, *entry2;
+
+    if (rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't alias global variable");
+
+    entry2 = rb_global_entry(name2);
+    if (!st_lookup(rb_global_tbl, name1, (st_data_t *)&entry1)) {
+	entry1 = ALLOC(struct global_entry);
+	entry1->id = name1;
+	st_add_direct(rb_global_tbl, name1, (st_data_t)entry1);
+    }
+    else if (entry1->var != entry2->var) {
+	struct global_variable *var = entry1->var;
+	if (var->block_trace) {
+	    rb_raise(rb_eRuntimeError, "can't alias in tracer");
+	}
+	var->counter--;
+	if (var->counter == 0) {
+	    struct trace_var *trace = var->trace;
+	    while (trace) {
+		struct trace_var *next = trace->next;
+		free(trace);
+		trace = next;
+	    }
+	    free(var);
+	}
+    }
+    else {
+	return;
+    }
+    entry2->var->counter++;
+    entry1->var = entry2->var;
+}
+
+static int special_generic_ivar = 0;
+static st_table *generic_iv_tbl;
+
+st_table*
+rb_generic_ivar_table(obj)
+    VALUE obj;
+{
+    st_table *tbl;
+
+    if (!FL_TEST(obj, FL_EXIVAR)) return 0;
+    if (!generic_iv_tbl) return 0;
+    if (!st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) return 0;
+    return tbl;
+}
+
+static VALUE
+generic_ivar_get(obj, id, warn)
+    VALUE obj;
+    ID id;
+    int warn;
+{
+    st_table *tbl;
+    VALUE val;
+
+    if (generic_iv_tbl) {
+      if (st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) {
+	if (st_lookup(tbl, id, &val)) {
+	  return val;
+	}
+      }
+    }
+    if (warn) {
+	rb_warning("instance variable %s not initialized", rb_id2name(id));
+    }
+    return Qnil;
+}
+
+static void
+generic_ivar_set(obj, id, val)
+    VALUE obj;
+    ID id;
+    VALUE val;
+{
+    st_table *tbl;
+
+    if (rb_special_const_p(obj)) {
+	special_generic_ivar = 1;
+    }
+    if (!generic_iv_tbl) {
+	generic_iv_tbl = st_init_numtable();
+    }
+
+    if (!st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) {
+	FL_SET(obj, FL_EXIVAR);
+	tbl = st_init_numtable();
+	st_add_direct(generic_iv_tbl, obj, (st_data_t)tbl);
+	st_add_direct(tbl, id, val);
+	return;
+    }
+    st_insert(tbl, id, val);
+}
+
+static VALUE
+generic_ivar_defined(obj, id)
+    VALUE obj;
+    ID id;
+{
+    st_table *tbl;
+    VALUE val;
+
+    if (!generic_iv_tbl) return Qfalse;
+    if (!st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) return Qfalse;
+    if (st_lookup(tbl, id, &val)) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+static int
+generic_ivar_remove(obj, id, valp)
+    VALUE obj;
+    ID id;
+    VALUE *valp;
+{
+    st_table *tbl;
+    int status;
+
+    if (!generic_iv_tbl) return 0;
+    if (!st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) return 0;
+    status = st_delete(tbl, &id, valp);
+    if (tbl->num_entries == 0) {
+	st_delete(generic_iv_tbl, &obj, (st_data_t *)&tbl);
+	st_free_table(tbl);
+    }
+    return status;
+}
+
+void
+rb_mark_generic_ivar(obj)
+    VALUE obj;
+{
+    st_table *tbl;
+
+    if (!generic_iv_tbl) return;
+    if (st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) {
+	rb_mark_tbl(tbl);
+    }
+}
+
+static int
+givar_mark_i(key, value)
+    ID key;
+    VALUE value;
+{
+    rb_gc_mark(value);
+    return ST_CONTINUE;
+}
+
+static int
+givar_i(obj, tbl)
+    VALUE obj;
+    st_table *tbl;
+{
+    if (rb_special_const_p(obj)) {
+	st_foreach(tbl, givar_mark_i, 0);
+    }
+    return ST_CONTINUE;
+}
+
+void
+rb_mark_generic_ivar_tbl()
+{
+    if (!generic_iv_tbl) return;
+    if (special_generic_ivar == 0) return;
+    st_foreach_safe(generic_iv_tbl, givar_i, 0);
+}
+
+void
+rb_free_generic_ivar(obj)
+    VALUE obj;
+{
+    st_table *tbl;
+
+    if (st_delete(generic_iv_tbl, &obj, (st_data_t *)&tbl))
+	st_free_table(tbl);
+}
+
+void
+rb_copy_generic_ivar(clone, obj)
+    VALUE clone, obj;
+{
+    st_table *tbl;
+
+    if (!generic_iv_tbl) return;
+    if (st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) {
+	st_table *old;
+
+	if (st_lookup(generic_iv_tbl, clone, (st_data_t *)&old)) {
+	    st_free_table(old);
+	    st_insert(generic_iv_tbl, clone, (st_data_t)st_copy(tbl));
+	}
+	else {
+	    st_add_direct(generic_iv_tbl, clone, (st_data_t)st_copy(tbl));
+	}
+    }
+}
+
+static VALUE
+ivar_get(obj, id, warn)
+    VALUE obj;
+    ID id;
+    int warn;
+{
+    VALUE val;
+
+    switch (TYPE(obj)) {
+      case T_OBJECT:
+      case T_CLASS:
+      case T_MODULE:
+	if (ROBJECT(obj)->iv_tbl && st_lookup(ROBJECT(obj)->iv_tbl, id, &val))
+	    return val;
+	break;
+      default:
+	if (FL_TEST(obj, FL_EXIVAR) || rb_special_const_p(obj))
+	    return generic_ivar_get(obj, id, warn);
+	break;
+    }
+    if (warn) {
+	rb_warning("instance variable %s not initialized", rb_id2name(id));
+    }
+    return Qnil;
+}
+
+VALUE
+rb_ivar_get(obj, id)
+    VALUE obj;
+    ID id;
+{
+    return ivar_get(obj, id, Qtrue);
+}
+
+VALUE
+rb_attr_get(obj, id)
+    VALUE obj;
+    ID id;
+{
+    return ivar_get(obj, id, Qfalse);
+}
+
+VALUE
+rb_ivar_set(obj, id, val)
+    VALUE obj;
+    ID id;
+    VALUE val;
+{
+    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify instance variable");
+    if (OBJ_FROZEN(obj)) rb_error_frozen("object");
+    switch (TYPE(obj)) {
+      case T_OBJECT:
+      case T_CLASS:
+      case T_MODULE:
+	if (!ROBJECT(obj)->iv_tbl) ROBJECT(obj)->iv_tbl = st_init_numtable();
+	st_insert(ROBJECT(obj)->iv_tbl, id, val);
+	break;
+      default:
+	generic_ivar_set(obj, id, val);
+	break;
+    }
+    return val;
+}
+
+VALUE
+rb_ivar_defined(obj, id)
+    VALUE obj;
+    ID id;
+{
+    switch (TYPE(obj)) {
+      case T_OBJECT:
+      case T_CLASS:
+      case T_MODULE:
+	if (ROBJECT(obj)->iv_tbl && st_lookup(ROBJECT(obj)->iv_tbl, id, 0))
+	    return Qtrue;
+	break;
+      default:
+	if (FL_TEST(obj, FL_EXIVAR) || rb_special_const_p(obj))
+	    return generic_ivar_defined(obj, id);
+	break;
+    }
+    return Qfalse;
+}
+
+static int
+ivar_i(key, entry, ary)
+    ID key;
+    struct global_entry *entry;
+    VALUE ary;
+{
+    if (rb_is_instance_id(key)) {
+	rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     obj.instance_variables    => array
+ *  
+ *  Returns an array of instance variable names for the receiver. Note
+ *  that simply defining an accessor does not create the corresponding
+ *  instance variable.
+ *     
+ *     class Fred
+ *       attr_accessor :a1
+ *       def initialize
+ *         @iv = 3
+ *       end
+ *     end
+ *     Fred.new.instance_variables   #=> ["@iv"]
+ */
+
+VALUE
+rb_obj_instance_variables(obj)
+    VALUE obj;
+{
+    VALUE ary;
+
+    ary = rb_ary_new();
+    switch (TYPE(obj)) {
+      case T_OBJECT:
+      case T_CLASS:
+      case T_MODULE:
+	if (ROBJECT(obj)->iv_tbl) {
+	    st_foreach_safe(ROBJECT(obj)->iv_tbl, ivar_i, ary);
+	}
+	break;
+      default:
+	if (!generic_iv_tbl) break;
+	if (FL_TEST(obj, FL_EXIVAR) || rb_special_const_p(obj)) {
+	    st_table *tbl;
+
+	    if (st_lookup(generic_iv_tbl, obj, (st_data_t *)&tbl)) {
+		st_foreach_safe(tbl, ivar_i, ary);
+	    }
+	}
+	break;
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     obj.remove_instance_variable(symbol)    => obj
+ *  
+ *  Removes the named instance variable from <i>obj</i>, returning that
+ *  variable's value.
+ *     
+ *     class Dummy
+ *       attr_reader :var
+ *       def initialize
+ *         @var = 99
+ *       end
+ *       def remove
+ *         remove_instance_variable(:@var)
+ *       end
+ *     end
+ *     d = Dummy.new
+ *     d.var      #=> 99
+ *     d.remove   #=> 99
+ *     d.var      #=> nil
+ */
+
+VALUE
+rb_obj_remove_instance_variable(obj, name)
+    VALUE obj, name;
+{
+    VALUE val = Qnil;
+    ID id = rb_to_id(name);
+
+    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify instance variable");
+    if (OBJ_FROZEN(obj)) rb_error_frozen("object");
+    if (!rb_is_instance_id(id)) {
+	rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
+    }
+
+    switch (TYPE(obj)) {
+      case T_OBJECT:
+      case T_CLASS:
+      case T_MODULE:
+	if (ROBJECT(obj)->iv_tbl && st_delete(ROBJECT(obj)->iv_tbl, (st_data_t*)&id, &val)) {
+	    return val;
+	}
+	break;
+      default:
+	if (FL_TEST(obj, FL_EXIVAR) || rb_special_const_p(obj)) {
+	    if (generic_ivar_remove(obj, id, &val)) {
+		return val;
+	    }
+	}
+	break;
+    }
+    rb_name_error(id, "instance variable %s not defined", rb_id2name(id));
+    return Qnil;		/* not reached */
+}
+
+NORETURN(static void uninitialized_constant _((VALUE, ID)));
+static void
+uninitialized_constant(klass, id)
+    VALUE klass;
+    ID id;
+{
+    if (klass && klass != rb_cObject)
+	rb_name_error(id, "uninitialized constant %s::%s",
+		      rb_class2name(klass),
+		      rb_id2name(id));
+    else {
+	rb_name_error(id, "uninitialized constant %s", rb_id2name(id));
+    }
+}
+
+static VALUE
+const_missing(klass, id)
+    VALUE klass;
+    ID id;
+{
+    return rb_funcall(klass, rb_intern("const_missing"), 1, ID2SYM(id));
+}
+
+
+/*
+ * call-seq:
+ *    mod.const_missing(sym)    => obj
+ *
+ *  Invoked when a reference is made to an undefined constant in
+ *  <i>mod</i>. It is passed a symbol for the undefined constant, and
+ *  returns a value to be used for that constant. The
+ *  following code is a (very bad) example: if reference is made to
+ *  an undefined constant, it attempts to load a file whose name is
+ *  the lowercase version of the constant (thus class <code>Fred</code> is
+ *  assumed to be in file <code>fred.rb</code>). If found, it returns the
+ *  value of the loaded class. It therefore implements a perverse
+ *  kind of autoload facility.
+ *  
+ *    def Object.const_missing(name)
+ *      @looked_for ||= {}
+ *      str_name = name.to_s
+ *      raise "Class not found: #{name}" if @looked_for[str_name]
+ *      @looked_for[str_name] = 1
+ *      file = str_name.downcase
+ *      require file
+ *      klass = const_get(name)
+ *      return klass if klass
+ *      raise "Class not found: #{name}"
+ *    end
+ *  
+ */
+
+VALUE
+rb_mod_const_missing(klass, name)
+    VALUE klass, name;
+{
+    ruby_frame = ruby_frame->prev; /* pop frame for "const_missing" */
+    uninitialized_constant(klass, rb_to_id(name));
+    return Qnil;		/* not reached */
+}
+
+static struct st_table *
+check_autoload_table(av)
+    VALUE av;
+{
+    Check_Type(av, T_DATA);
+    if (RDATA(av)->dmark != (RUBY_DATA_FUNC)rb_mark_tbl ||
+	RDATA(av)->dfree != (RUBY_DATA_FUNC)st_free_table) {
+	rb_raise(rb_eTypeError, "wrong autoload table: %s", RSTRING(rb_inspect(av))->ptr);
+    }
+    return (struct st_table *)DATA_PTR(av);
+}
+
+void
+rb_autoload(mod, id, file)
+    VALUE mod;
+    ID id;
+    const char *file;
+{
+    VALUE av, fn;
+    struct st_table *tbl;
+
+    if (!rb_is_const_id(id)) {
+	rb_raise(rb_eNameError, "autoload must be constant name", rb_id2name(id));
+    }
+    if (!file || !*file) {
+	rb_raise(rb_eArgError, "empty file name");
+    }
+
+    if ((tbl = RCLASS(mod)->iv_tbl) && st_lookup(tbl, id, &av) && av != Qundef)
+	return;
+
+    rb_const_set(mod, id, Qundef);
+    tbl = RCLASS(mod)->iv_tbl;
+    if (st_lookup(tbl, autoload, &av)) {
+	tbl = check_autoload_table(av);
+    }
+    else {
+	av = Data_Wrap_Struct(0 , rb_mark_tbl, st_free_table, 0);
+	st_add_direct(tbl, autoload, av);
+	DATA_PTR(av) = tbl = st_init_numtable();
+    }
+    fn = rb_str_new2(file);
+    FL_UNSET(fn, FL_TAINT);
+    OBJ_FREEZE(fn);
+    st_insert(tbl, id, (st_data_t)rb_node_newnode(NODE_MEMO, fn, ruby_safe_level, 0));
+}
+
+static NODE*
+autoload_delete(mod, id)
+    VALUE mod;
+    ID id;
+{
+    VALUE val;
+    st_data_t load = 0;
+
+    st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, 0);
+    if (st_lookup(RCLASS(mod)->iv_tbl, autoload, &val)) {
+	struct st_table *tbl = check_autoload_table(val);
+
+	st_delete(tbl, (st_data_t*)&id, &load);
+
+	if (tbl->num_entries == 0) {
+	    DATA_PTR(val) = 0;
+	    st_free_table(tbl);
+	    id = autoload;
+	    if (st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val)) {
+		rb_gc_force_recycle(val);
+	    }
+	}
+    }
+
+    return (NODE *)load;
+}
+
+VALUE
+rb_autoload_load(klass, id)
+    VALUE klass;
+    ID id;
+{
+    VALUE file;
+    NODE *load = autoload_delete(klass, id);
+
+    if (!load || !(file = load->nd_lit) || rb_provided(RSTRING(file)->ptr)) {
+	return Qfalse;
+    }
+    return rb_require_safe(file, load->nd_nth);
+}
+
+static VALUE
+autoload_file(mod, id)
+    VALUE mod;
+    ID id;
+{
+    VALUE val, file;
+    struct st_table *tbl;
+    st_data_t load;
+
+    if (!st_lookup(RCLASS(mod)->iv_tbl, autoload, &val) ||
+	!(tbl = check_autoload_table(val)) || !st_lookup(tbl, id, &load)) {
+	return Qnil;
+    }
+    file = ((NODE *)load)->nd_lit;
+    Check_Type(file, T_STRING);
+    if (!RSTRING(file)->ptr || !*RSTRING(file)->ptr) {
+	rb_raise(rb_eArgError, "empty file name");
+    }
+    if (!rb_provided(RSTRING(file)->ptr)) {
+	return file;
+    }
+
+    /* already loaded but not defined */
+    st_delete(tbl, (st_data_t*)&id, 0);
+    if (!tbl->num_entries) {
+	DATA_PTR(val) = 0;
+	st_free_table(tbl);
+	id = autoload;
+	if (st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val)) {
+	    rb_gc_force_recycle(val);
+	}
+    }
+    return Qnil;
+}
+
+VALUE
+rb_autoload_p(mod, id)
+    VALUE mod;
+    ID id;
+{
+    struct st_table *tbl = RCLASS(mod)->iv_tbl;
+    VALUE val;
+
+    if (!tbl || !st_lookup(tbl, id, &val) || val != Qundef) {
+	return Qnil;
+    }
+    return autoload_file(mod, id);
+}
+
+static VALUE
+rb_const_get_0(klass, id, exclude, recurse)
+    VALUE klass;
+    ID id;
+    int exclude, recurse;
+{
+    VALUE value, tmp;
+    int mod_retry = 0;
+
+    tmp = klass;
+  retry:
+    while (tmp) {
+	while (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl,id,&value)) {
+	    if (value == Qundef) {
+		if (!RTEST(rb_autoload_load(tmp, id))) break;
+		continue;
+	    }
+	    if (exclude && tmp == rb_cObject && klass != rb_cObject) {
+		rb_warn("toplevel constant %s referenced by %s::%s",
+			rb_id2name(id), rb_class2name(klass), rb_id2name(id));
+	    }
+	    return value;
+	}
+	if (!recurse && klass != rb_cObject) break;
+	tmp = RCLASS(tmp)->super;
+    }
+    if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) {
+	mod_retry = 1;
+	tmp = rb_cObject;
+	goto retry;
+    }
+
+    return const_missing(klass, id);
+}
+
+VALUE
+rb_const_get_from(klass, id)
+    VALUE klass;
+    ID id;
+{
+    return rb_const_get_0(klass, id, Qtrue, Qtrue);
+}
+
+VALUE
+rb_const_get(klass, id)
+    VALUE klass;
+    ID id;
+{
+    return rb_const_get_0(klass, id, Qfalse, Qtrue);
+}
+
+VALUE
+rb_const_get_at(klass, id)
+    VALUE klass;
+    ID id;
+{
+    return rb_const_get_0(klass, id, Qtrue, Qfalse);
+}
+
+/*
+ *  call-seq:
+ *     remove_const(sym)   => obj
+ *  
+ *  Removes the definition of the given constant, returning that
+ *  constant's value. Predefined classes and singleton objects (such as
+ *  <i>true</i>) cannot be removed.
+ */
+
+VALUE
+rb_mod_remove_const(mod, name)
+    VALUE mod, name;
+{
+    ID id = rb_to_id(name);
+    VALUE val;
+
+    if (!rb_is_const_id(id)) {
+	rb_name_error(id, "`%s' is not allowed as a constant name", rb_id2name(id));
+    }
+    if (!OBJ_TAINTED(mod) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't remove constant");
+    if (OBJ_FROZEN(mod)) rb_error_frozen("class/module");
+
+    if (RCLASS(mod)->iv_tbl && st_delete(ROBJECT(mod)->iv_tbl, (st_data_t*)&id, &val)) {
+	if (val == Qundef) {
+	    autoload_delete(mod, id);
+	    val = Qnil;
+	}
+	return val;
+    }
+    if (rb_const_defined_at(mod, id)) {
+	rb_name_error(id, "cannot remove %s::%s",
+		 rb_class2name(mod), rb_id2name(id));
+    }
+    rb_name_error(id, "constant %s::%s not defined",
+		  rb_class2name(mod), rb_id2name(id));
+    return Qnil;		/* not reached */
+}
+
+static int
+sv_i(key, value, tbl)
+    ID key;
+    VALUE value;
+    st_table *tbl;
+{
+    if (rb_is_const_id(key)) {
+	if (!st_lookup(tbl, key, 0)) {
+	    st_insert(tbl, key, key);
+	}
+    }
+    return ST_CONTINUE;
+}
+
+void*
+rb_mod_const_at(mod, data)
+    VALUE mod;
+    void *data;
+{
+    st_table *tbl = data;
+    if (!tbl) {
+	tbl = st_init_numtable();
+    }
+    if (RCLASS(mod)->iv_tbl) {
+	st_foreach_safe(RCLASS(mod)->iv_tbl, sv_i, (st_data_t)tbl);
+    }
+    return tbl;
+}
+
+void*
+rb_mod_const_of(mod, data)
+    VALUE mod;
+    void *data;
+{
+    VALUE tmp = mod;
+    for (;;) {
+	data = rb_mod_const_at(tmp, data);
+	tmp = RCLASS(tmp)->super;
+	if (!tmp) break;
+	if (tmp == rb_cObject && mod != rb_cObject) break;
+    }
+    return data;
+}
+
+static int
+list_i(key, value, ary)
+    ID key, value;
+    VALUE ary;
+{
+    rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+    return ST_CONTINUE;
+}
+
+VALUE
+rb_const_list(data)
+    void *data;
+{
+    st_table *tbl = data;
+    VALUE ary;
+
+    if (!tbl) return rb_ary_new2(0);
+    ary = rb_ary_new2(tbl->num_entries);
+    st_foreach(tbl, list_i, ary);
+    st_free_table(tbl);
+
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     mod.constants    => array
+ *  
+ *  Returns an array of the names of the constants accessible in
+ *  <i>mod</i>. This includes the names of constants in any included
+ *  modules (example at start of section).
+ */
+
+VALUE
+rb_mod_constants(mod)
+    VALUE mod;
+{
+    return rb_const_list(rb_mod_const_of(mod, 0));
+}
+
+static int
+rb_const_defined_0(klass, id, exclude, recurse)
+    VALUE klass;
+    ID id;
+    int exclude, recurse;
+{
+    VALUE value, tmp;
+    int mod_retry = 0;
+
+    tmp = klass;
+  retry:
+    while (tmp) {
+	if (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl, id, &value)) {
+	    if (value == Qundef && NIL_P(autoload_file(klass, id)))
+		return Qfalse;
+	    return Qtrue;
+	}
+	if (!recurse && klass != rb_cObject) break;
+	tmp = RCLASS(tmp)->super;
+    }
+    if (!exclude && !mod_retry && BUILTIN_TYPE(klass) == T_MODULE) {
+	mod_retry = 1;
+	tmp = rb_cObject;
+	goto retry;
+    }
+    return Qfalse;
+}
+
+int
+rb_const_defined_from(klass, id)
+    VALUE klass;
+    ID id;
+{
+    return rb_const_defined_0(klass, id, Qtrue, Qtrue);
+}
+
+int
+rb_const_defined(klass, id)
+    VALUE klass;
+    ID id;
+{
+    return rb_const_defined_0(klass, id, Qfalse, Qtrue);
+}
+
+int
+rb_const_defined_at(klass, id)
+    VALUE klass;
+    ID id;
+{
+    return rb_const_defined_0(klass, id, Qtrue, Qfalse);
+}
+
+static void
+mod_av_set(klass, id, val, isconst)
+    VALUE klass;
+    ID id;
+    VALUE val;
+    int isconst;
+{
+    char *dest = isconst ? "constant" : "class variable";
+
+    if (!OBJ_TAINTED(klass) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't set %s", dest);
+    if (OBJ_FROZEN(klass)) {
+	if (BUILTIN_TYPE(klass) == T_MODULE) {
+	    rb_error_frozen("module");
+	}
+	else {
+	    rb_error_frozen("class");
+	}
+    }
+    if (!RCLASS(klass)->iv_tbl) {
+	RCLASS(klass)->iv_tbl = st_init_numtable();
+    }
+    else if (isconst) {
+	VALUE value = Qfalse;
+
+	if (st_lookup(RCLASS(klass)->iv_tbl, id, &value)) {
+	    if (value == Qundef)
+		autoload_delete(klass, id);
+	    else
+		rb_warn("already initialized %s %s", dest, rb_id2name(id));
+	}
+    }
+
+    st_insert(RCLASS(klass)->iv_tbl, id, val);
+}
+
+void
+rb_const_set(klass, id, val)
+    VALUE klass;
+    ID id;
+    VALUE val;
+{
+    if (NIL_P(klass)) {
+	rb_raise(rb_eTypeError, "no class/module to define constant %s",
+		 rb_id2name(id));
+    }
+    mod_av_set(klass, id, val, Qtrue);
+}
+
+void
+rb_define_const(klass, name, val)
+    VALUE klass;
+    const char *name;
+    VALUE val;
+{
+    ID id = rb_intern(name);
+
+    if (!rb_is_const_id(id)) {
+	rb_warn("rb_define_const: invalid name `%s' for constant", name);
+    }
+    if (klass == rb_cObject) {
+	rb_secure(4);
+    }
+    rb_const_set(klass, id, val);
+}
+
+void
+rb_define_global_const(name, val)
+    const char *name;
+    VALUE val;
+{
+    rb_define_const(rb_cObject, name, val);
+}
+
+static VALUE
+original_module(c)
+    VALUE c;
+{
+    if (TYPE(c) == T_ICLASS)
+	return RBASIC(c)->klass;
+    return c;
+}
+
+static void
+cvar_override_check(id, a)
+    ID id;
+    VALUE a;
+{
+    VALUE base = original_module(a);
+
+    a = RCLASS(a)->super;
+    while (a) {
+	if (RCLASS(a)->iv_tbl) {
+	    if (st_lookup(RCLASS(a)->iv_tbl,id,0)) {
+		rb_warning("class variable %s of %s is overridden by %s",
+			   rb_id2name(id), rb_class2name(original_module(a)),
+			   rb_class2name(base));
+	    }
+	}
+	a = RCLASS(a)->super;
+    }
+}
+
+void
+rb_cvar_set(klass, id, val, warn)
+    VALUE klass;
+    ID id;
+    VALUE val;
+    int warn;
+{
+    VALUE tmp;
+
+    tmp = klass;
+    while (tmp) {
+	if (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl,id,0)) {
+	    if (OBJ_FROZEN(tmp)) rb_error_frozen("class/module");
+	    if (!OBJ_TAINTED(tmp) && rb_safe_level() >= 4)
+		rb_raise(rb_eSecurityError, "Insecure: can't modify class variable");
+	    if (warn && RTEST(ruby_verbose) && klass != tmp) {
+		rb_warning("already initialized class variable %s", rb_id2name(id));
+	    }
+	    st_insert(RCLASS(tmp)->iv_tbl,id,val);
+	    if (RTEST(ruby_verbose)) {
+		cvar_override_check(id, tmp);
+	    }
+	    return;
+	}
+	tmp = RCLASS(tmp)->super;
+    }
+
+    mod_av_set(klass, id, val, Qfalse);
+}
+
+VALUE
+rb_cvar_get(klass, id)
+    VALUE klass;
+    ID id;
+{
+    VALUE value;
+    VALUE tmp;
+
+    tmp = klass;
+    while (tmp) {
+	if (RCLASS(tmp)->iv_tbl) {
+	    if (st_lookup(RCLASS(tmp)->iv_tbl,id,&value)) {
+		if (RTEST(ruby_verbose)) {
+		    cvar_override_check(id, tmp);
+		}
+		return value;
+	    }
+	}
+	tmp = RCLASS(tmp)->super;
+    }
+
+    rb_name_error(id,"uninitialized class variable %s in %s",
+		  rb_id2name(id), rb_class2name(klass));
+    return Qnil;		/* not reached */
+}
+
+VALUE
+rb_cvar_defined(klass, id)
+    VALUE klass;
+    ID id;
+{
+    VALUE tmp;
+
+    tmp = klass;
+    while (tmp) {
+	if (RCLASS(tmp)->iv_tbl && st_lookup(RCLASS(tmp)->iv_tbl,id,0)) {
+	    return Qtrue;
+	}
+	tmp = RCLASS(tmp)->super;
+    }
+
+    return Qfalse;
+}
+
+void
+rb_cv_set(klass, name, val)
+    VALUE klass;
+    const char *name;
+    VALUE val;
+{
+    ID id = rb_intern(name);
+    if (!rb_is_class_id(id)) {
+	rb_name_error(id, "wrong class variable name %s", name);
+    }
+    rb_cvar_set(klass, id, val, Qfalse);
+}
+
+VALUE
+rb_cv_get(klass, name)
+    VALUE klass;
+    const char *name;
+{
+    ID id = rb_intern(name);
+    if (!rb_is_class_id(id)) {
+	rb_name_error(id, "wrong class variable name %s", name);
+    }
+    return rb_cvar_get(klass, id);
+}
+
+void
+rb_define_class_variable(klass, name, val)
+    VALUE klass;
+    const char *name;
+    VALUE val;
+{
+    ID id = rb_intern(name);
+
+    if (!rb_is_class_id(id)) {
+	rb_name_error(id, "wrong class variable name %s", name);
+    }
+    rb_cvar_set(klass, id, val, Qtrue);
+}
+
+static int
+cv_i(key, value, ary)
+    ID key;
+    VALUE value;
+    VALUE ary;
+{
+    if (rb_is_class_id(key)) {
+	VALUE kval = rb_str_new2(rb_id2name(key));
+	if (!rb_ary_includes(ary, kval)) {
+	    rb_ary_push(ary, kval);
+	}
+    }
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     mod.class_variables   => array
+ *  
+ *  Returns an array of the names of class variables in <i>mod</i> and
+ *  the ancestors of <i>mod</i>.
+ *     
+ *     class One
+ *       @@var1 = 1
+ *     end
+ *     class Two < One
+ *       @@var2 = 2
+ *     end
+ *     One.class_variables   #=> ["@@var1"]
+ *     Two.class_variables   #=> ["@@var2", "@@var1"]
+ */
+
+VALUE
+rb_mod_class_variables(obj)
+    VALUE obj;
+{
+    VALUE ary = rb_ary_new();
+
+    for (;;) {
+	if (RCLASS(obj)->iv_tbl) {
+	    st_foreach_safe(RCLASS(obj)->iv_tbl, cv_i, ary);
+	}
+	obj = RCLASS(obj)->super;
+	if (!obj) break;
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     remove_class_variable(sym)    => obj
+ *  
+ *  Removes the definition of the <i>sym</i>, returning that
+ *  constant's value.
+ *     
+ *     class Dummy
+ *       @@var = 99
+ *       puts @@var
+ *       remove_class_variable(:@@var)
+ *       puts(defined? @@var)
+ *     end
+ *     
+ *  <em>produces:</em>
+ *     
+ *     99
+ *     nil
+ */
+
+VALUE
+rb_mod_remove_cvar(mod, name)
+    VALUE mod, name;
+{
+    ID id = rb_to_id(name);
+    VALUE val;
+
+    if (!rb_is_class_id(id)) {
+	rb_name_error(id, "wrong class variable name %s", rb_id2name(id));
+    }
+    if (!OBJ_TAINTED(mod) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't remove class variable");
+    if (OBJ_FROZEN(mod)) rb_error_frozen("class/module");
+
+    if (RCLASS(mod)->iv_tbl && st_delete(ROBJECT(mod)->iv_tbl, (st_data_t*)&id, &val)) {
+	return val;
+    }
+    if (rb_cvar_defined(mod, id)) {
+	rb_name_error(id, "cannot remove %s for %s",
+		 rb_id2name(id), rb_class2name(mod));
+    }
+    rb_name_error(id, "class variable %s not defined for %s",
+		  rb_id2name(id), rb_class2name(mod));
+    return Qnil;		/* not reached */
+}
+
+VALUE
+rb_iv_get(obj, name)
+    VALUE obj;
+    const char *name;
+{
+    ID id = rb_intern(name);
+
+    return rb_ivar_get(obj, id);
+}
+
+VALUE
+rb_iv_set(obj, name, val)
+    VALUE obj;
+    const char *name;
+    VALUE val;
+{
+    ID id = rb_intern(name);
+
+    return rb_ivar_set(obj, id, val);
+}
diff --git a/ruby_1_8_6/version.c b/ruby_1_8_6/version.c
new file mode 100644
index 0000000000..b235673001
--- /dev/null
+++ b/ruby_1_8_6/version.c
@@ -0,0 +1,52 @@
+/**********************************************************************
+
+  version.c -
+
+  $Author$
+  $Date$
+  created at: Thu Sep 30 20:08:01 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#include "ruby.h"
+#include "version.h"
+#include <stdio.h>
+
+const char ruby_version[] = RUBY_VERSION;
+const char ruby_release_date[] = RUBY_RELEASE_DATE;
+const char ruby_platform[] = RUBY_PLATFORM;
+const int ruby_patchlevel = RUBY_PATCHLEVEL;
+
+void
+Init_version()
+{
+    VALUE v = rb_obj_freeze(rb_str_new2(ruby_version));
+    VALUE d = rb_obj_freeze(rb_str_new2(ruby_release_date));
+    VALUE p = rb_obj_freeze(rb_str_new2(ruby_platform));
+
+    rb_define_global_const("RUBY_VERSION", v);
+    rb_define_global_const("RUBY_RELEASE_DATE", d);
+    rb_define_global_const("RUBY_PLATFORM", p);
+    rb_define_global_const("RUBY_PATCHLEVEL", INT2FIX(RUBY_PATCHLEVEL));
+
+    /* obsolete constants */
+    rb_define_global_const("VERSION", v);
+    rb_define_global_const("RELEASE_DATE", d);
+    rb_define_global_const("PLATFORM", p);
+}
+
+void
+ruby_show_version()
+{
+    printf("ruby %s (%s patchlevel %d) [%s]\n", RUBY_VERSION, RUBY_RELEASE_DATE, RUBY_PATCHLEVEL, RUBY_PLATFORM);
+    fflush(stdout);
+}
+
+void
+ruby_show_copyright()
+{
+    printf("ruby - Copyright (C) 1993-%d Yukihiro Matsumoto\n", RUBY_RELEASE_YEAR);
+    exit(0);
+}
diff --git a/ruby_1_8_6/version.h b/ruby_1_8_6/version.h
new file mode 100644
index 0000000000..5b1e02470b
--- /dev/null
+++ b/ruby_1_8_6/version.h
@@ -0,0 +1,19 @@
+#define RUBY_VERSION "1.8.6"
+#define RUBY_RELEASE_DATE "2007-08-22"
+#define RUBY_VERSION_CODE 186
+#define RUBY_RELEASE_CODE 20070822
+#define RUBY_PATCHLEVEL 89
+
+#define RUBY_VERSION_MAJOR 1
+#define RUBY_VERSION_MINOR 8
+#define RUBY_VERSION_TEENY 6
+#define RUBY_RELEASE_YEAR 2007
+#define RUBY_RELEASE_MONTH 8
+#define RUBY_RELEASE_DAY 22
+
+#ifdef RUBY_EXTERN
+RUBY_EXTERN const char ruby_version[];
+RUBY_EXTERN const char ruby_release_date[];
+RUBY_EXTERN const char ruby_platform[];
+RUBY_EXTERN const int ruby_patchlevel;
+#endif
diff --git a/ruby_1_8_6/vms/config.h b/ruby_1_8_6/vms/config.h
new file mode 100644
index 0000000000..82d499ae2d
--- /dev/null
+++ b/ruby_1_8_6/vms/config.h
@@ -0,0 +1,102 @@
+/* config.h for OpenVMS */
+
+#ifndef VMS_RUBY_STREAM
+#define VMS_RUBY_STREAM "018"
+#endif
+
+/* #define HAVE_PROTOTYPES 1 */
+#define HAVE_STDARG_PROTOTYPES 1
+/* #define HAVE_ATTR_NORETURN 1 */
+/* #define inline __inline */
+#define HAVE_DIRENT_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_LIMITS_H 1
+
+#define HAVE_SYS_FILE_H 1
+#define HAVE_FCNTL_H 1
+/* #define HAVE_PWD_H 1 */
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TIMES_H 1
+/* #define HAVE_SYS_PARAM_H 1 */
+#define HAVE_SYS_WAIT_H 1
+#define HAVE_STRING_H 1
+#define HAVE_UTIME_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_PID_T 1
+#define HAVE_GID_T 1
+#define HAVE_UID_T 1
+/* #define HAVE_ST_BLKSIZE 1  */
+#define HAVE_ST_RDEV 1
+/* #define GETGROUPS_T gid_t */
+#define GETGROUPS_T int
+#define RETSIGTYPE void
+/* #define HAVE_ALLOCA 1 */
+/* #define vfork fork */
+#define HAVE_FMOD 1
+#define HAVE_RANDOM 1
+#define HAVE_WAITPID 1
+#define HAVE_GETCWD 1
+#define HAVE_TRUNCATE 1
+/* #define HAVE_CHSIZE 1 */
+#define HAVE_TIMES 1
+/* #define HAVE_UTIMES 1 */
+#define HAVE_FCNTL 1
+/* #define HAVE_SETITIMER 1 */
+/* #define HAVE_GETGROUPS 1 */
+#define HAVE_SIGPROCMASK 1
+#define HAVE_GETLOGIN 1
+#define HAVE_TELLDIR 1
+#define HAVE_SEEKDIR 1
+
+#define RSHIFT(x,y) ((x)>>y)
+#define DEFAULT_KCODE KCODE_EUC
+#define DLEXT ".exe"
+/* #define DLEXT2 "" */
+
+#define HAVE_STRERROR 1
+
+#if defined(__vax)
+#define RUBY_PLATFORM     "vax-vms"	/* OpenVMS VAX */
+#elif defined(__alpha)
+#define RUBY_PLATFORM     "alpha-vms"	/* OpenVMS Alpha */
+#elif defined(__ia64)
+#define RUBY_PLATFORM     "ia64-vms"	/* OpenVMS Industry Standard 64 */
+#else
+#define RUBY_PLATFORM     "unknown-vms"	/* unknown processor */
+#endif
+
+#define RUBY_SITE_LIB2    "/RUBY_LIBROOT/site_ruby/" RUBY_PLATFORM
+#define RUBY_SITE_ARCHLIB "/RUBY_LIBROOT/site_ruby/" VMS_RUBY_STREAM "/" RUBY_PLATFORM
+#define RUBY_SITE_LIB     "/RUBY_LIBROOT/site_ruby"
+#define RUBY_LIB          "/RUBY_LIBROOT/" VMS_RUBY_STREAM
+#define RUBY_ARCHLIB      "/RUBY_LIBROOT/" VMS_RUBY_STREAM "/" RUBY_PLATFORM
+
+#define SIZEOF_INT   4
+#define SIZEOF_SHORT 2
+#define SIZEOF_LONG  4
+#define SIZEOF_VOIDP 4
+#define SIZEOF_FLOAT 4
+#define SIZEOF_DOUBLE 8
+
+#define HAVE_MKDIR 	1 /* Dango */
+#define HAVE_SINH 	1 /* Dango */
+#define HAVE_COSH 	1 /* Dango */
+#define HAVE_TANH 	1 /* Dango */
+
+/* function flags for socket ---------------------- */
+
+#define HAVE_GETHOSTNAME 1
+#define HAVE_SENDMSG 1
+#define HAVE_RECVMSG 1
+#define HAVE_GETNAMEINFO 1
+#define HAVE_INET_NTOP 1
+#define HAVE_INET_NTOA 1
+#define HAVE_INET_PTON 1
+#define HAVE_INET_ATON 1
+#define HAVE_GETSERVBYPORT 1
+#define HAVE_UNAME 1
+/*
+#define HAVE_GETHOSTBYNAME2 1
+#define HAVE_GETADDRINFO 1
+*/
diff --git a/ruby_1_8_6/vms/vms.h b/ruby_1_8_6/vms/vms.h
new file mode 100644
index 0000000000..fc57cc8675
--- /dev/null
+++ b/ruby_1_8_6/vms/vms.h
@@ -0,0 +1,10 @@
+#ifndef VMSRUBY_VMS_H_INCLUDED
+#define VMSRUBY_VMS_H_INCLUDED
+
+extern int isinf(double);
+extern int isnan(double);
+extern int flock(int fd, int oper);
+
+extern int vsnprintf();
+
+#endif
diff --git a/ruby_1_8_6/vms/vmsruby_private.c b/ruby_1_8_6/vms/vmsruby_private.c
new file mode 100644
index 0000000000..c1cbfcebec
--- /dev/null
+++ b/ruby_1_8_6/vms/vmsruby_private.c
@@ -0,0 +1,52 @@
+#include "vmsruby_private.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+void _vmsruby_init(void)
+{
+    _vmsruby_set_switch("DECC$WLS", "TRUE");
+}
+
+
+#include <starlet.h>
+#include <string.h>
+#include <descrip.h>
+#include <lnmdef.h>
+
+struct item_list_3 {
+    short buflen;
+    short itmcod;
+    void *bufadr;
+    void *retlen;
+};
+
+long _vmsruby_set_switch(char *name, char *value)
+{
+    long status;
+    struct item_list_3 itemlist[20];
+    int i;
+
+    i = 0;
+    itemlist[i].itmcod = LNM$_STRING;
+    itemlist[i].buflen = strlen(value);
+    itemlist[i].bufadr = value;
+    itemlist[i].retlen = NULL;
+    i++;
+    itemlist[i].itmcod = 0;
+    itemlist[i].buflen = 0;
+
+    $DESCRIPTOR(TABLE_d, "LNM$PROCESS");
+    $DESCRIPTOR(lognam_d, "");
+
+    lognam_d.dsc$a_pointer = name;
+    lognam_d.dsc$w_length  = strlen(name);
+
+    status = sys$crelnm (
+             	 0, 
+             	 &TABLE_d, 
+             	 &lognam_d, 
+             	 0,  /* usermode */
+             	 itemlist);
+
+    return status;
+}
diff --git a/ruby_1_8_6/vms/vmsruby_private.h b/ruby_1_8_6/vms/vmsruby_private.h
new file mode 100644
index 0000000000..24703dc7fc
--- /dev/null
+++ b/ruby_1_8_6/vms/vmsruby_private.h
@@ -0,0 +1,7 @@
+#ifndef VMSRUBY_H_INCLUDED
+#define VMSRUBY_H_INCLUDED
+
+void _vmsruby_init(void);
+long _vmsruby_set_switch(char *, char *);
+
+#endif /* VMSRUBY_H_INCLUDED */
diff --git a/ruby_1_8_6/win32/Makefile.sub b/ruby_1_8_6/win32/Makefile.sub
new file mode 100644
index 0000000000..e555399b2c
--- /dev/null
+++ b/ruby_1_8_6/win32/Makefile.sub
@@ -0,0 +1,520 @@
+# -*- makefile -*-
+
+SHELL = $(COMSPEC)
+MKFILES = Makefile
+NULL = nul
+
+#### Start of system configuration section. ####
+
+## variables may be overridden by $(compile_dir)/Makefile
+!ifndef srcdir
+srcdir = ..
+!endif
+!ifndef RUBY_INSTALL_NAME
+RUBY_INSTALL_NAME = ruby$(RUBY_SUFFIX)
+!endif
+!if !defined(RUBYW_INSTALL_NAME) || "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
+RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
+!endif
+!if "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
+RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
+!endif
+!if !defined(icondirs) && defined(ICONDIRS)
+icondirs=$(ICONDIRS)
+!endif
+!if defined(icondirs)
+icondirs=$(icondirs:\=/)
+iconinc=-I$(icondirs: = -I)
+!endif
+###############
+
+VPATH = $(srcdir);$(srcdir)/missing;$(srcdir)/win32
+.SUFFIXES: .y .def .lib
+
+!if !defined(CC)
+CC = cl
+!endif
+!if !defined(CPP) || "$(CPP)" == "cl"
+CPP = $(CC) -E
+!endif
+!if !defined(YACC)
+YACC = byacc
+!endif
+AR = lib -nologo
+PURIFY =
+AUTOCONF = autoconf
+RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat
+
+!if !defined(PROCESSOR_ARCHITECTURE)
+PROCESSOR_ARCHITECTURE = x86
+!endif
+MACHINE = $(PROCESSOR_ARCHITECTURE)
+!if "$(PROCESSOR_ARCHITECTURE)" == "x86"
+!if !defined(PROCESSOR_LEVEL)
+PROCESSOR_LEVEL = 5
+!endif
+!if 6 < $(PROCESSOR_LEVEL)
+PROCESSOR_LEVEL = 6
+!endif
+!if $(MSC_VER) < 1400
+PROCESSOR_FLAG = -G$(PROCESSOR_LEVEL)
+!endif
+CPU = i$(PROCESSOR_LEVEL)86
+ARCH = i386
+!else
+CPU = $(PROCESSOR_ARCHITECTURE)
+ARCH = $(PROCESSOR_ARCHITECTURE)
+!endif
+!if !defined(DEBUGFLAGS) && $(MSC_VER) < 1400
+DEBUGFLAGS = -Zi
+!endif
+!if !defined(OPTFLAGS)
+!if $(MSC_VER) < 1400
+OPTFLAGS = -O2b2xg-
+!else
+OPTFLAGS = -O2b2xty-
+!endif
+!endif
+!if !defined(OS)
+OS = mswin32
+!endif
+!if !defined(RT)
+!error RT not defined.  Retry from configure pass.
+!endif
+
+!ifndef RUBY_SO_NAME
+RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
+!endif
+
+!if !defined(prefix)
+prefix = /usr
+!endif
+!if !defined(exec_prefix)
+exec_prefix = $(prefix)
+!endif
+!if !defined(libdir)
+libdir = $(exec_prefix)/lib
+!endif
+!if !defined(datadir)
+datadir = /share
+!endif
+!ifndef EXTOUT
+EXTOUT = .ext
+!endif
+!ifndef RIDATADIR
+RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
+!endif
+!ifndef TESTUI
+TESTUI = console
+!endif
+!ifndef TESTS
+TESTS =
+!endif
+!ifndef RDOCTARGET
+RDOCTARGET = install-nodoc
+!endif
+
+OUTFLAG       = -Fe
+!if !defined(CFLAGS)
+CFLAGS = -MD $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG)
+!endif
+!if !defined(LDFLAGS)
+LDFLAGS = -link -incremental:no -debug -opt:ref -opt:icf
+!endif
+!if !defined(XLDFLAGS)
+XLDFLAGS = -stack:$(STACK)
+!endif
+!if !defined(RFLAGS)
+RFLAGS = -r
+!endif
+!if !defined(EXTLIBS)
+EXTLIBS =
+!endif
+!if !defined(USE_WINSOCK2)
+LIBS = oldnames.lib user32.lib advapi32.lib wsock32.lib $(EXTLIBS)
+!else
+LIBS = oldnames.lib user32.lib advapi32.lib ws2_32.lib $(EXTLIBS)
+!endif
+MISSING = acosh.obj crypt.obj erf.obj win32.obj
+
+ARFLAGS = -machine:$(MACHINE) -out:
+CC = $(CC) -nologo
+LD = $(CC)
+LDSHARED = $(LD) -LD
+XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing
+!if $(MSC_VER) >= 1400
+# Prevents VC++ 2005 (cl ver 14) warnings
+CPPFLAGS = $(CPPFLAGS) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+MANIFESTTOOL = mt -nologo
+LDSHARED_1 = $(MANIFESTTOOL) -manifest $(@).manifest -outputresource:$(@);2
+LDSHARED_2 = @$(RM) $(@:/=\).manifest
+!endif
+
+DLDFLAGS = $(LDFLAGS) -dll
+SOLIBS = 
+
+LIBRUBY_LDSHARED = $(LDSHARED)
+LIBRUBY_DLDFLAGS = $(EXTLDFLAGS) -def:$(RUBYDEF)
+
+EXEEXT = .exe
+PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
+WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
+RUBYDEF = $(RUBY_SO_NAME).def
+MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT)
+RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
+
+!if !defined(STACK)
+STACK = 0x2000000
+!endif
+ORGLIBPATH = $(LIB)
+
+#### End of system configuration section. ####
+
+LIBRUBY_A     = $(RUBY_SO_NAME)-static.lib
+LIBRUBY_SO    = $(RUBY_SO_NAME).dll
+LIBRUBY       = $(RUBY_SO_NAME).lib
+LIBRUBYARG    = $(LIBRUBY)
+
+PREP          = miniruby$(EXEEXT)
+
+!if !defined(EXTSTATIC)
+EXTSTATIC     = 
+!endif
+
+OBJEXT = obj
+
+INSTALLED_LIST= .installed.list
+
+WINMAINOBJ    = winmain.$(OBJEXT)
+MINIOBJS      = dmydln.$(OBJEXT)
+
+all: $(srcdir)/win32/Makefile.sub $(srcdir)/common.mk
+
+ruby: $(PROGRAM)
+rubyw: $(WPROGRAM)
+
+!include $(srcdir)/common.mk
+
+CONFIG_H = ./.config.h.time
+
+config: config.status
+
+config.status: $(CONFIG_H)
+
+$(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
+	@echo Creating config.h
+	@$(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat config.h <<
+#if _MSC_VER != $(MSC_VER)
+#error MSC version unmatch
+#endif
+!if defined(USE_WINSOCK2)
+#define USE_WINSOCK2 1
+!endif
+#define STDC_HEADERS 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_MEMORY_H 1
+!if $(MSC_VER) >= 1400
+#define HAVE_LONG_LONG 1
+!endif
+#define HAVE_OFF_T 1
+#define SIZEOF_INT 4
+#define SIZEOF_SHORT 2
+#define SIZEOF_LONG 4
+!if $(MSC_VER) >= 1400
+#define SIZEOF_LONG_LONG 8
+!else
+#define SIZEOF_LONG_LONG 0
+!endif
+#define SIZEOF___INT64 8
+#define SIZEOF_OFF_T 4
+#define SIZEOF_VOIDP 4
+#define SIZEOF_FLOAT 4
+#define SIZEOF_DOUBLE 8
+!if $(MSC_VER) >= 1400
+#define SIZEOF_TIME_T 8
+!else
+#define SIZEOF_TIME_T 4
+!endif
+#define HAVE_PROTOTYPES 1
+#define TOKEN_PASTE(x,y) x##y
+#define HAVE_STDARG_PROTOTYPES 1
+!if $(MSC_VER) > 1100
+#define NORETURN(x) __declspec(noreturn) x
+!endif
+#define RUBY_EXTERN extern __declspec(dllimport)
+#define HAVE_DECL_SYS_NERR 1
+#define HAVE_LIMITS_H 1
+#define HAVE_FCNTL_H 1
+#define HAVE_SYS_UTIME_H 1
+#define HAVE_FLOAT_H 1
+#define rb_pid_t int
+#define rb_gid_t int
+#define rb_uid_t int
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+#define HAVE_ST_RDEV 1
+#define GETGROUPS_T int
+#define RETSIGTYPE void
+#define HAVE_ALLOCA 1
+#define HAVE_DUP2 1
+#define HAVE_MEMCMP 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MKDIR 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_STRERROR 1
+#define HAVE_STRFTIME 1
+#define HAVE_STRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOD 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+#define HAVE_FLOCK 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_ISNAN 1
+#define HAVE_FINITE 1
+#define HAVE_HYPOT 1
+#define HAVE_FMOD 1
+#define HAVE_FREXP 1
+#define HAVE_MODF 1
+#define HAVE_WAITPID 1
+#define HAVE_FSYNC 1
+#define HAVE_GETCWD 1
+#define HAVE_CHSIZE 1
+#define HAVE_TIMES 1
+#define HAVE_FCNTL 1
+#define HAVE_LINK 1
+#define HAVE__SETJMP 1
+#define HAVE_TELLDIR 1
+#define HAVE_SEEKDIR 1
+#define HAVE_MKTIME 1
+#define HAVE_COSH 1
+#define HAVE_SINH 1
+#define HAVE_TANH 1
+#define HAVE_TZNAME 1
+#define HAVE_DAYLIGHT 1
+#define SETPGRP_VOID 1
+#define RSHIFT(x,y) ((x)>>(int)y)
+#define FILE_COUNT _cnt
+#define FILE_READPTR _ptr
+#define inline __inline
+#define NEED_IO_SEEK_BETWEEN_RW 1
+#define STACK_GROW_DIRECTION -1
+#define DEFAULT_KCODE KCODE_NONE
+#define DLEXT ".so"
+#define DLEXT2 ".dll"
+#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
+#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
+#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
+#define RUBY_PLATFORM "$(ARCH)-$(OS)"
+#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
+#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)"
+<<
+	@exit > $(@:/=\)
+
+config.status: $(MKFILES) $(srcdir)/win32/Makefile.sub $(srcdir)/common.mk
+	@echo Creating $@
+	@exit <<$@
+# Generated automatically by Makefile.sub.
+s,@SHELL@,$$(COMSPEC),;t t
+s,@BUILD_FILE_SEPARATOR@,\,;t t
+s,@PATH_SEPARATOR@,;,;t t
+s,@CFLAGS@,$(CFLAGS),;t t
+s,@CPPFLAGS@,$(CPPFLAGS),;t t
+s,@CXXFLAGS@,$(CXXFLAGS),;t t
+s,@FFLAGS@,$(FFLAGS),;t t
+s,@LDFLAGS@,,;t t
+s,@LIBS@,$(LIBS),;t t
+s,@exec_prefix@,$${prefix},;t t
+s,@prefix@,,;t t
+s,@program_transform_name@,s,$$,$(RUBY_SUFFIX),,;t t
+s,@bindir@,$${exec_prefix}/bin,;t t
+s,@sbindir@,$${exec_prefix}/sbin,;t t
+s,@libexecdir@,$${exec_prefix}/libexec,;t t
+s,@datadir@,$${prefix}/share,;t t
+s,@sysconfdir@,$${prefix}/etc,;t t
+s,@sharedstatedir@,/etc,;t t
+s,@localstatedir@,/var,;t t
+s,@libdir@,$${exec_prefix}/lib,;t t
+s,@includedir@,$${prefix}/include,;t t
+s,@oldincludedir@,/usr/include,;t t
+s,@infodir@,$${prefix}/info,;t t
+s,@mandir@,$${prefix}/man,;t t
+s,@build@,$(CPU)-pc-$(OS),;t t
+s,@build_alias@,$(CPU)-$(OS),;t t
+s,@build_cpu@,$(CPU),;t t
+s,@build_vendor@,pc,;t t
+s,@build_os@,$(OS),;t t
+s,@host@,$(CPU)-pc-$(OS),;t t
+s,@host_alias@,$(CPU)-$(OS),;t t
+s,@host_cpu@,$(CPU),;t t
+s,@host_vendor@,pc,;t t
+s,@host_os@,$(OS),;t t
+s,@target@,$(ARCH)-pc-$(OS),;t t
+s,@target_alias@,$(ARCH)-$(OS),;t t
+s,@target_cpu@,$(ARCH),;t t
+s,@target_vendor@,pc,;t t
+s,@target_os@,$(OS),;t t
+s,@CC@,$(CC),;t t
+s,@CPP@,$(CPP),;t t
+s,@YACC@,$(YACC),;t t
+s,@RANLIB@,,;t t
+s,@AR@,$(AR),;t t
+s,@ARFLAGS@,$(ARFLAGS),;t t
+s,@LN_S@,$(LN_S),;t t
+s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@CP@,copy > nul,;t t
+s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
+s,@ALLOCA@,$(ALLOCA),;t t
+s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
+s,@EXEEXT@,.exe,;t t
+s,@OBJEXT@,$(OBJEXT),;t t
+s,@XCFLAGS@,$(XCFLAGS),;t t
+s,@XLDFLAGS@,$(XLDFLAGS),;t t
+s,@DLDFLAGS@,$(DLDFLAGS) $$(LIBPATH) -def:$$(DEFFILE) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb,;t t
+s,@ARCH_FLAG@,$(ARCH_FLAG),;t t
+s,@STATIC@,$(STATIC),;t t
+s,@CCDLFLAGS@,,;t t
+s,@LDSHARED@,$(LDSHARED),;t t
+s,@DLEXT@,so,;t t
+s,@DLEXT2@,dll,;t t
+s,@LIBEXT@,lib,;t t
+s,@STRIP@,$(STRIP),;t t
+s,@EXTSTATIC@,$(EXTSTATIC),;t t
+s,@setup@,Setup,;t t
+s,@MINIRUBY@,$(MINIRUBY),;t t
+s,@PREP@,miniruby$(EXEEXT),;t t
+s,@RUNRUBY@,$(RUNRUBY),;t t
+s,@EXTOUT@,$(EXTOUT),;t t
+s,@ARCHFILE@,,;t t
+s,@RDOCTARGET@,$(RDOCTARGET),;t t
+s,@LIBRUBY_LDSHARED@,$(LIBRUBY_LDSHARED),;t t
+s,@LIBRUBY_DLDFLAGS@,$(LIBRUBY_DLDFLAGS),;t t
+s,@RUBY_INSTALL_NAME@,$(RUBY_INSTALL_NAME),;t t
+s,@rubyw_install_name@,$(RUBYW_INSTALL_NAME),;t t
+s,@RUBYW_INSTALL_NAME@,$(RUBYW_INSTALL_NAME),;t t
+s,@RUBY_SO_NAME@,$(RUBY_SO_NAME),;t t
+s,@LIBRUBY_A@,$$(RUBY_SO_NAME)-static.lib,;t t
+s,@LIBRUBY_SO@,$$(RUBY_SO_NAME).dll,;t t
+s,@LIBRUBY_ALIASES@,$(LIBRUBY_ALIASES),;t t
+s,@LIBRUBY@,$$(RUBY_SO_NAME).lib,;t t
+s,@LIBRUBYARG@,$$(LIBRUBYARG_SHARED),;t t
+s,@LIBRUBYARG_STATIC@,$$(LIBRUBY_A),;t t
+s,@LIBRUBYARG_SHARED@,$$(LIBRUBY),;t t
+s,@SOLIBS@,$(SOLIBS),;t t
+s,@DLDLIBS@,$(DLDLIBS),;t t
+s,@ENABLE_SHARED@,yes,;t t
+s,@OUTFLAG@,$(OUTFLAG),;t t
+s,@CPPOUTFILE@,-P,;t t
+s,@LIBPATHFLAG@, -libpath:"%s",;t t
+s,@RPATHFLAG@,,;t t
+s,@LIBARG@,%s.lib,;t t
+s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) $$(DLDFLAGS),;t t
+!if $(MSC_VER) >= 1400
+s,@LINK_SO@,$(MANIFESTTOOL) -manifest $$(@).manifest -outputresource:$$(@);2,;t t
+s,@LINK_SO@,@$$(RM) $$(@:/=\).manifest,;t t
+!endif
+s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) -c -Tc$$(<:\=/),;t t
+s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -c -Tp$$(<:\=/),;t t
+s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t
+s,@RULE_SUBST@,{.;$$(srcdir);$$(topdir);$$(hdrdir)}%s,;t t
+s,@TRY_LINK@,$$(CC) -Feconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS) -link $$(LDFLAGS) $$(LIBPATH) $$(XLDFLAGS),;t t
+s,@COMMON_LIBS@,m,;t t
+s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN,;t t
+!if defined(USE_WINSOCK2)
+s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
+!else
+s,@COMMON_HEADERS@,windows.h winsock.h,;t t
+!endif
+s,@DISTCLEANFILES@,vc*.pdb,;t t
+s,@EXPORT_PREFIX@, ,;t t
+s,@arch@,$(ARCH)-$(OS),;t t
+s,@sitearch@,$(ARCH)-$(RT),;t t
+s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
+s,@configure_args@,--with-make-prog=nmake --enable-shared $(configure_args),;t t
+s,@configure_input@,$$configure_input,;t t
+s,@srcdir@,$(srcdir),;t t
+s,@top_srcdir@,$(srcdir),;t t
+<<KEEP
+
+miniruby$(EXEEXT):
+		@echo. $(LIBS)
+		$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) -Fe$@ $(LDFLAGS)
+		$(LDSHARED_1)
+		$(LDSHARED_2)
+
+$(PROGRAM):	$(RUBY_INSTALL_NAME).res
+		$(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \
+			$(OUTFLAG)$@ $(LIBRUBYARG) $(LDFLAGS) $(XLDFLAGS)
+		$(LDSHARED_1)
+		$(LDSHARED_2)
+
+$(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
+		$(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \
+			$(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \
+			$(LDFLAGS) $(XLDFLAGS) -subsystem:Windows
+		$(LDSHARED_1)
+		$(LDSHARED_2)
+
+$(LIBRUBY_A):	$(OBJS) $(DMYEXT)
+		$(AR) $(ARFLAGS)$@ $(OBJS) $(DMYEXT)
+
+$(LIBRUBY):	$(RUBYDEF)
+		$(AR) $(ARFLAGS)$@ -def:$(RUBYDEF)
+
+$(LIBRUBY_SO):	$(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
+		@echo. $(DLDOBJS)
+		@-$(PRE_LIBRUBY_UPDATE)
+		$(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \
+			$(RUBY_SO_NAME).res $(LIBS) -Fe$@ $(LDFLAGS) \
+			$(LIBRUBY_DLDFLAGS)
+		$(LDSHARED_1)
+		$(LDSHARED_2)
+
+$(RUBYDEF):	$(LIBRUBY_A) $(PREP)
+		$(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
+
+{$(srcdir)/win32}.def.lib:
+		$(AR) $(ARFLAGS)$@ -def:$<
+
+clean-local::
+		@$(RM) ext\extinit.c ext\extinit.$(OBJEXT) ext\vc*.pdb miniruby.lib
+		@$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
+
+distclean-local::
+		@$(RM) ext\config.cache $(RBCONFIG:/=\)
+		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
+		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
+
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG)
+		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
+			-ruby_name=$(RUBY_INSTALL_NAME) \
+			-rubyw_name=$(RUBYW_INSTALL_NAME) \
+			-so_name=$(RUBY_SO_NAME) \
+			. $(icondirs) $(srcdir)/win32
+
+{$(srcdir)/missing}.c.obj:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+{$(srcdir)/win32}.c.obj:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+{$(srcdir)}.c.obj:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+.c.obj:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+.rc.res:
+	$(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)
+
+{$(srcdir)}.y.c:
+	$(YACC) $(YFLAGS) $(<:\=/)
+	sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $@
+	@del y.tab.c
+
+$(OBJS): {$(srcdir)}win32/win32.h
+
+dir.$(OBJEXT): {$(srcdir)}win32/dir.h
+
+ext/extinit.obj: ext/extinit.c $(SETUP)
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fo$@ -c ext/extinit.c
diff --git a/ruby_1_8_6/win32/README.win32 b/ruby_1_8_6/win32/README.win32
new file mode 100644
index 0000000000..e7d589759c
--- /dev/null
+++ b/ruby_1_8_6/win32/README.win32
@@ -0,0 +1,126 @@
+=begin
+
+= How to build ruby using Visual C++
+
+== Requirement
+
+(1) Visual C++ 5.0 or later.
+
+(2) If you want to run `((%nmake clean%))' or `((%nmake distclean%))'
+    properly, you must install UNIX compatible `((%rm%))' command on
+    your ((|PATH|)) if you want to clean after compile.
+
+(3) Please set environment variable (({INCLUDE})), (({LIB})), (({PATH}))
+    to run required commands properly from the command line.
+
+    Note: building ruby requires following commands.
+     * nmake
+     * cl
+     * lib
+     * dumpbin
+
+== How to compile and install
+
+(1) Execute win32\configure.bat on your build directory.
+    You can specify the target platform as an argument.
+    For example, run `((%configure i686-mswin32%))'
+
+(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
+    if you want to change the name of the executable files. 
+    And add ((|RUBYW_INSTALL_NAME|)) to change the name of the
+    executable without console window if also you want.
+
+(3) Run `((%nmake%))'
+
+(4) If you want to make rubyw.exe, run `((%nmake rubyw.exe%))'
+
+(5) Run `((%nmake test%))'
+
+(6) Run `((%nmake DESTDIR=<install_directory> install%))'
+
+    This command will create following directories and install files onto them.
+      * <install_directory>\bin
+      * <install_directory>\lib
+      * <install_directory>\lib\ruby
+      * <install_directory>\lib\ruby\<MAJOR>.<MINOR>
+      * <install_directory>\lib\ruby\<MAJOR>.<MINOR>\<PLATFORM>
+      * <install_directory>\lib\ruby\site_ruby
+      * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>
+      * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>\<PLATFORM>
+      * <install_directory>\man\man1
+    If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
+    The default ((|<PLATFORM>|)) is `(({i386-mswin32}))'.
+
+== Icons
+
+Any icon files(*.ico) in the build directory, directories specified with
+((|icondirs|)) make variable and (({win32})) directory under the ruby
+source directory will be included in DLL or executable files, according
+to their base names.
+    $(RUBY_INSTALL_NAME).ico or ruby.ico   --> $(RUBY_INSTALL_NAME).exe
+    $(RUBYW_INSTALL_NAME).ico or rubyw.ico --> $(RUBYW_INSTALL_NAME).exe
+    the others                             --> $(RUBY_SO_NAME).dll
+
+Although no icons are distributed with the ruby source or in the official 
+site, you can use anything you like. For example, followings are written 
+in Japanese, but you can download at least.
+
+* ((<URL:http://member.nifty.ne.jp/ueivu/rubyico.html>)) or
+  ((<zipped icons|URL:http://member.nifty.ne.jp/ueivu/Ruby_ico.zip>))
+* ((<URL:http://homepage1.nifty.com/a_nakata/ruby/>)) or
+  ((<icon itself|URL:http://homepage1.nifty.com/a_nakata/ruby/RubyIcon.ico>))
+
+== Build examples
+
+* Build on the ruby source directory.
+
+  ex.)
+    ruby source directory:  C:\ruby
+    build directory:        C:\ruby
+    install directory:      C:\usr\local
+
+    C:
+    cd \ruby
+    win32\configure
+    nmake
+    nmake test
+    nmake DESTDIR=/usr/local install
+
+* Build on the relative directory from the ruby source directory.
+
+  ex.)
+    ruby source directory:  C:\ruby
+    build directory:        C:\ruby\mswin32
+    install directory:      C:\usr\local
+
+    C:
+    cd \ruby
+    mkdir mswin32
+    cd mswin32
+    ..\win32\configure
+    nmake
+    nmake test
+    nmake DESTDIR=/usr/local install
+
+* Build on the different drive.
+
+  ex.)
+    ruby source directory:  C:\src\ruby
+    build directory:        D:\build\ruby
+    install directory:      C:\usr\local
+
+    D:
+    cd D:\build\ruby
+    C:\src\ruby\win32\configure
+    nmake
+    nmake test
+    nmake DESTDIR=C:/usr/local install
+
+== Bugs
+
+You can ((*NOT*)) use a path name contains any white space characters as
+the ruby source directory, this restriction comes from the behavior of
+(({!INCLUDE})) directives of (({NMAKE})).
+((- you may call it a bug. -))
+
+=end
diff --git a/ruby_1_8_6/win32/configure.bat b/ruby_1_8_6/win32/configure.bat
new file mode 100755
index 0000000000..f4f24a5ed7
--- /dev/null
+++ b/ruby_1_8_6/win32/configure.bat
@@ -0,0 +1,100 @@
+@echo off

+::: Don't set environment variable in batch file other than autoexec.bat

+::: to avoid "Out of environment space" problem on Windows 95/98.

+::: set TMPMAKE=~tmp~.mak

+

+echo> ~tmp~.mak ####

+echo>> ~tmp~.mak conf = %0

+echo>> ~tmp~.mak $(conf:\=/): nul

+echo>> ~tmp~.mak 	@del ~tmp~.mak

+echo>> ~tmp~.mak 	@-$(MAKE) -l$(MAKEFLAGS) -f $(@D)/setup.mak \

+:loop

+if "%1" == "" goto :end

+if "%1" == "--prefix" goto :prefix

+if "%1" == "--srcdir" goto :srcdir

+if "%1" == "srcdir" goto :srcdir

+if "%1" == "--target" goto :target

+if "%1" == "target" goto :target

+if "%1" == "--with-static-linked-ext" goto :extstatic

+if "%1" == "--with-winsock2" goto :winsock2

+if "%1" == "--program-suffix" goto :suffix

+if "%1" == "--program-name" goto :installname

+if "%1" == "--install-name" goto :installname

+if "%1" == "--so-name" goto :soname

+if "%1" == "--enable-install-doc" goto :enable-rdoc

+if "%1" == "--disable-install-doc" goto :disable-rdoc

+if "%1" == "--extout" goto :extout

+if "%1" == "-h" goto :help

+if "%1" == "--help" goto :help

+  echo>> ~tmp~.mak 	"%1" \

+  shift

+goto :loop

+:srcdir

+  echo>> ~tmp~.mak 	"srcdir=%2" \

+  shift

+  shift

+goto :loop

+:prefix

+  echo>> ~tmp~.mak 	"prefix=%2" \

+  shift

+  shift

+goto :loop

+:suffix

+  echo>> ~tmp~.mak 	"RUBY_SUFFIX=%2" \

+  shift

+  shift

+goto :loop

+:installname

+  echo>> ~tmp~.mak 	"RUBY_INSTALL_NAME=%2" \

+  shift

+  shift

+goto :loop

+:soname

+  echo>> ~tmp~.mak 	"RUBY_SO_NAME=%2" \

+  shift

+  shift

+goto :loop

+:target

+  echo>> ~tmp~.mak 	"%2" \

+  shift

+  shift

+goto :loop

+:extstatic

+  echo>> ~tmp~.mak 	"EXTSTATIC=static" \

+  shift

+goto :loop

+:winsock2

+  echo>> ~tmp~.mak 	"USE_WINSOCK2=1" \

+  shift

+goto :loop

+:enable-rdoc

+  echo>> ~tmp~.mak 	"RDOCTARGET=install-doc" \

+  shift

+goto :loop

+:disable-rdoc

+  echo>> ~tmp~.mak 	"RDOCTARGET=install-nodoc" \

+  shift

+goto :loop

+:extout

+  echo>> ~tmp~.mak 	"EXTOUT=%2" \

+  shift

+  shift

+goto :loop

+:help

+  echo Configuration:

+  echo   --help                  display this help

+  echo   --srcdir=DIR            find the sources in DIR [configure dir or `..']

+  echo Installation directories:

+  echo   --prefix=PREFIX         install files in PREFIX (ignored currently)

+  echo System types:

+  echo   --target=TARGET         configure for TARGET [i386-mswin32]

+  echo Optional Package:

+  echo   --with-winsock2         link winsock2

+  echo   --with-static-linked-ext link external modules statically

+  echo   --enable-install-doc    install rdoc indexes during install

+  del ~tmp~.mak

+goto :exit

+:end

+echo>> ~tmp~.mak 	WIN32DIR=$(@D)

+nmake -alf ~tmp~.mak

+:exit

diff --git a/ruby_1_8_6/win32/dir.h b/ruby_1_8_6/win32/dir.h
new file mode 100644
index 0000000000..183d9efc4a
--- /dev/null
+++ b/ruby_1_8_6/win32/dir.h
@@ -0,0 +1,39 @@
+#ifdef __BORLANDC__
+#  ifndef WIN32_DIR_H_
+#    define WIN32_DIR_H_
+#    include <sys/types.h>
+#  endif
+#endif
+
+struct direct
+{
+    long d_namlen;
+    ino_t d_ino;
+    char d_name[256];
+    char d_isdir; /* directory */
+    char d_isrep; /* reparse point */
+};
+typedef struct {
+    char *start;
+    char *curr;
+    long size;
+    long nfiles;
+    long loc;  /* [0, nfiles) */
+    struct direct dirstr;
+    char *bits;  /* used for d_isdir and d_isrep */
+} DIR;
+
+
+DIR*           rb_w32_opendir(const char*);
+struct direct* rb_w32_readdir(DIR *);
+long           rb_w32_telldir(DIR *);
+void           rb_w32_seekdir(DIR *, long);
+void           rb_w32_rewinddir(DIR *);
+void           rb_w32_closedir(DIR *);
+
+#define opendir   rb_w32_opendir
+#define readdir   rb_w32_readdir
+#define telldir   rb_w32_telldir
+#define seekdir   rb_w32_seekdir
+#define rewinddir rb_w32_rewinddir
+#define closedir  rb_w32_closedir
diff --git a/ruby_1_8_6/win32/ifchange.bat b/ruby_1_8_6/win32/ifchange.bat
new file mode 100755
index 0000000000..4fca646ea2
--- /dev/null
+++ b/ruby_1_8_6/win32/ifchange.bat
@@ -0,0 +1,32 @@
+@echo off

+:: usage: ifchange target temporary

+

+:: check if fc.exe works.

+echo foo > conftest1.tmp

+echo bar > conftest2.tmp

+fc.exe conftest1.tmp conftest2.tmp > nul

+if not errorlevel 1 goto :brokenfc

+del conftest1.tmp > nul

+del conftest2.tmp > nul

+

+:: target does not exist or new file differs from it.

+if not exist %1 goto :update

+fc.exe %1 %2 > nul

+if errorlevel 1 goto :update

+

+:unchange

+echo %1 unchanged.

+del %2

+goto :end

+

+:brokenfc

+del conftest1.tmp > nul

+del conftest2.tmp > nul

+echo FC.EXE does not work properly.

+echo assuming %1 should be changed.

+

+:update

+echo %1 updated.

+if exist %1 del %1

+copy %2 %1 > nul

+:end

diff --git a/ruby_1_8_6/win32/mkexports.rb b/ruby_1_8_6/win32/mkexports.rb
new file mode 100755
index 0000000000..214e4c6772
--- /dev/null
+++ b/ruby_1_8_6/win32/mkexports.rb
@@ -0,0 +1,32 @@
+#!./miniruby -s
+
+$name = $library = $description = nil
+
+SYM = {}
+
+objs = ARGV.collect {|s| s.tr('/', '\\')}
+IO.foreach("|dumpbin -symbols " + objs.join(' ')) do |l|
+  next if /^[0-9A-F]+ 0+ UNDEF / =~ l
+  next unless l.sub!(/.*\sExternal\s+\|\s+/, '')
+  if l.sub!(/^_/, '')
+    next if /@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l
+  elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')
+    next
+  end
+  SYM[l.strip] = true
+end
+
+exports = []
+if $name
+  exports << "Name " + $name
+elsif $library
+  exports << "Library " + $library
+end
+exports << "Description " + $description.dump if $description
+exports << "EXPORTS" << SYM.keys.sort
+
+if $output
+  open($output, 'w') {|f| f.puts exports.join("\n")}
+else
+  puts exports.join("\n")
+end
diff --git a/ruby_1_8_6/win32/resource.rb b/ruby_1_8_6/win32/resource.rb
new file mode 100755
index 0000000000..1c12075183
--- /dev/null
+++ b/ruby_1_8_6/win32/resource.rb
@@ -0,0 +1,95 @@
+#!./miniruby -sI.
+
+require 'rbconfig'
+
+CONFIG = Config::MAKEFILE_CONFIG
+
+fversion = "#{CONFIG['MAJOR']},#{CONFIG['MINOR']},#{CONFIG['TEENY']},0"
+
+$ruby_name ||= CONFIG["RUBY_INSTALL_NAME"]
+$rubyw_name ||= CONFIG["RUBYW_INSTALL_NAME"] || $ruby_name.sub(/ruby/, '\&w')
+$so_name ||= CONFIG["RUBY_SO_NAME"]
+
+icons = {}
+def icons.find(path)
+  if File.directory?(path)
+    Dir.open(File.expand_path(path)) do |d|
+      d.grep(/\.ico$/i) {|i| self[$`] = i}
+    end
+  else
+    self[File.basename(path, '.ico')] = path
+  end
+  self
+end
+
+if ARGV.empty?
+  icons.find('.')
+else
+  ARGV.each {|i| icons.find(i)}
+end
+
+ruby_icon = rubyw_icon = nil
+[$ruby_name, 'ruby'].find do |i|
+  if i = icons[i]
+    ruby_icon = "1 ICON DISCARDABLE "+i.dump+"\n"
+  end
+end
+[$rubyw_name, 'rubyw'].find do |i|
+  if i = icons[i]
+    rubyw_icon = "1 ICON DISCARDABLE "+i.dump+"\n"
+  end
+end
+dll_icons = []
+icons.keys.sort.each do |i|
+  dll_icons << "#{dll_icons.size + 1} ICON DISCARDABLE "+icons[i].dump+"\n"
+end
+
+[ # base name    extension         file type  desc, icons
+  [$ruby_name,   CONFIG["EXEEXT"], 'VFT_APP', 'CUI', ruby_icon],
+  [$rubyw_name,  CONFIG["EXEEXT"], 'VFT_APP', 'GUI', rubyw_icon || ruby_icon],
+  [$so_name,     '.dll',           'VFT_DLL', 'DLL', dll_icons.join],
+].each do |base, ext, type, desc, icons|
+  open(base + '.rc', "w") { |f|
+    f.binmode if /mingw/ =~ RUBY_PLATFORM
+
+    f.print <<EOF
+#ifndef __BORLANDC__
+#include <windows.h>
+#include <winver.h>
+#endif
+
+#{icons || ''}
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION    #{fversion}
+ PRODUCTVERSION #{fversion}
+ FILEFLAGSMASK  0x3fL
+ FILEFLAGS      0x0L
+ FILEOS         VOS__WINDOWS32
+ FILETYPE       #{type}
+ FILESUBTYPE    VFT2_UNKNOWN
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+  BLOCK "000004b0"
+  BEGIN
+   VALUE "FileDescription",  "Ruby interpreter (#{desc}) #{RUBY_VERSION} [#{RUBY_PLATFORM}]\\0"
+   VALUE "FileVersion",      "#{fversion}\\0"
+   VALUE "Home Page",        "http://www.ruby-lang.org/\\0"
+   VALUE "InternalName",     "#{base + ext}\\0"
+   VALUE "LegalCopyright",   "Copyright (C) 1993-#{RUBY_RELEASE_DATE[/\d+/]} Yukihiro Matsumoto\\0"
+   VALUE "OriginalFilename", "#{base + ext}\\0"
+   VALUE "Platform",         "#{RUBY_PLATFORM}\\0"
+   VALUE "ProductVersion",   "#{fversion}\\0"
+   VALUE "Release Date",     "#{RUBY_RELEASE_DATE}\\0"
+   VALUE "Version",          "#{RUBY_VERSION}\\0"
+  END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+  VALUE "Translation", 0x0, 0x4b0
+ END
+END
+EOF
+  }
+end
+
diff --git a/ruby_1_8_6/win32/rm.bat b/ruby_1_8_6/win32/rm.bat
new file mode 100755
index 0000000000..eb415d67f9
--- /dev/null
+++ b/ruby_1_8_6/win32/rm.bat
@@ -0,0 +1,8 @@
+@echo off

+if "%1" == "-f" shift

+:begin

+if "%1" == "" goto :end

+if exist "%1" del "%1"

+shift

+goto :begin

+:end

diff --git a/ruby_1_8_6/win32/setup.mak b/ruby_1_8_6/win32/setup.mak
new file mode 100644
index 0000000000..13b5edd23f
--- /dev/null
+++ b/ruby_1_8_6/win32/setup.mak
@@ -0,0 +1,182 @@
+# -*- makefile -*-
+
+!if "$(srcdir)" != ""
+WIN32DIR = $(srcdir)/win32
+!elseif "$(WIN32DIR)" == "win32"
+srcdir = .
+!elseif "$(WIN32DIR)" == "$(WIN32DIR:/win32=)/win32"
+srcdir = $(WIN32DIR:/win32=)
+!else
+srcdir = $(WIN32DIR)/..
+!endif
+!ifndef prefix
+prefix = /usr
+!endif
+OS = mswin32
+BANG = !
+APPEND = echo>>$(MAKEFILE)
+!ifdef MAKEFILE
+MAKE = $(MAKE) -f $(MAKEFILE)
+!else
+MAKEFILE = Makefile
+!endif
+ARCH = PROCESSOR_ARCHITECTURE
+CPU = PROCESSOR_LEVEL
+CC = cl -nologo
+CPP = $(CC) -EP
+
+all: -prologue- -generic- -epilogue-
+i386-$(OS): -prologue- -i386- -epilogue-
+i486-$(OS): -prologue- -i486- -epilogue-
+i586-$(OS): -prologue- -i586- -epilogue-
+i686-$(OS): -prologue- -i686- -epilogue-
+alpha-$(OS): -prologue- -alpha- -epilogue-
+
+-prologue-: -basic-vars- -system-vars- -version- -program-name-
+
+-basic-vars-: nul
+	@type << > $(MAKEFILE)
+### Makefile for ruby $(OS) ###
+MAKE = nmake
+srcdir = $(srcdir:\=/)
+prefix = $(prefix:\=/)
+EXTSTATIC = $(EXTSTATIC)
+!if defined(USE_WINSOCK2)
+USE_WINSOCK2 = $(USE_WINSOCK2)
+!endif
+!if defined(RDOCTARGET)
+RDOCTARGET = $(RDOCTARGET)
+!endif
+!if defined(EXTOUT)
+EXTOUT = $(EXTOUT)
+!endif
+<<
+
+-system-vars-: -osname- -runtime-
+
+-osname-: nul
+	@echo OS = mswin32 >>$(MAKEFILE)
+
+-runtime-: nul
+	@$(CC) -MD <<rtname.c user32.lib > nul
+#include <windows.h>
+#include <memory.h>
+#include <string.h>
+#include <stddef.h>
+#include <stdio.h>
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 1024
+#endif
+
+int
+runtime_name()
+{
+    char libpath[MAXPATHLEN+1];
+    char *p, *base = NULL, *ver = NULL;
+    HMODULE msvcrt = NULL;
+    MEMORY_BASIC_INFORMATION m;
+
+    memset(&m, 0, sizeof(m));
+    if (VirtualQuery(stdin, &m, sizeof(m)) && m.State == MEM_COMMIT)
+	msvcrt = (HMODULE)m.AllocationBase;
+    GetModuleFileName(msvcrt, libpath, sizeof libpath);
+
+    libpath[sizeof(libpath) - 1] = '\0';
+    for (p = libpath; *p; p = CharNext(p)) {
+	if (*p == '\\') {
+	    base = ++p;
+	}
+    }
+    if (!base) return 0;
+    if (p = strchr(base, '.')) *p = '\0';
+    for (p = base; *p; p = CharNext(p)) {
+	if (!isascii(*p)) continue;
+	if (isupper(*p)) {
+	    *p = tolower(*p);
+	}
+	if (!isdigit(*p)) {
+	    ver = NULL;
+	} else if (!ver) {
+	    ver = p;
+	}
+    }
+    if (ver) printf("OS = $$(OS)_%s\n", ver);
+    printf("RT = %s\n", base);
+    return 1;
+}
+
+int main(int argc, char **argv)
+{
+    if (!runtime_name()) return EXIT_FAILURE;
+    return EXIT_SUCCESS;
+}
+<<
+	@.\rtname >>$(MAKEFILE)
+	@del rtname.*
+
+-version-: nul
+	@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" >>$(MAKEFILE)
+#include "version.h"
+MAJOR = RUBY_VERSION_MAJOR
+MINOR = RUBY_VERSION_MINOR
+TEENY = RUBY_VERSION_TEENY
+MSC_VER = _MSC_VER
+<<
+
+-program-name-:
+	@type << >>$(MAKEFILE)
+!ifdef RUBY_SUFFIX
+RUBY_SUFFIX = $(RUBY_SUFFIX)
+!endif
+!ifdef RUBY_INSTALL_NAME
+RUBY_INSTALL_NAME = $(RUBY_INSTALL_NAME)
+!endif
+!ifdef RUBY_SO_NAME
+RUBY_SO_NAME = $(RUBY_SO_NAME)
+!endif
+<<
+
+-generic-: nul
+!if defined($(ARCH)) || defined($(CPU))
+	@type << >>$(MAKEFILE)
+!if defined($(ARCH))
+$(ARCH) = $(PROCESSOR_ARCHITECTURE)
+!endif
+!if defined($(CPU))
+$(CPU) = $(PROCESSOR_LEVEL)
+!endif
+
+<<
+!endif
+
+-alpha-: nul
+	@$(APPEND) $(ARCH) = alpha
+-ix86-: nul
+	@$(APPEND) $(ARCH) = x86
+
+-i386-: -ix86-
+	@$(APPEND) $(CPU) = 3
+-i486-: -ix86-
+	@$(APPEND) $(CPU) = 4
+-i586-: -ix86-
+	@$(APPEND) $(CPU) = 5
+-i686-: -ix86-
+	@$(APPEND) $(CPU) = 6
+
+-epilogue-: nul
+	@type << >>$(MAKEFILE)
+# OS = $(OS)
+# RUBY_INSTALL_NAME = ruby
+# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
+# CFLAGS = -nologo -MD $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG)
+# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
+# STACK = 0x2000000
+# LDFLAGS = $$(CFLAGS) -Fm
+# XLDFLAGS = 
+# RFLAGS = -r
+# EXTLIBS =
+
+$(BANG)include $$(srcdir)/win32/Makefile.sub
+<<
+	@$(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat config.h config.status
+	@echo type `$(MAKE)' to make ruby for $(OS).
diff --git a/ruby_1_8_6/win32/win32.c b/ruby_1_8_6/win32/win32.c
new file mode 100644
index 0000000000..0989735faf
--- /dev/null
+++ b/ruby_1_8_6/win32/win32.c
@@ -0,0 +1,3924 @@
+/*
+ *  Copyright (c) 1993, Intergraph Corporation
+ *
+ *  You may distribute under the terms of either the GNU General Public
+ *  License or the Artistic License, as specified in the perl README file.
+ *
+ *  Various Unix compatibility functions and NT specific functions.
+ *
+ *  Some of this code was derived from the MSDOS port(s) and the OS/2 port.
+ *
+ */
+
+#include "ruby.h"
+#include "rubysig.h"
+#include "dln.h"
+#include <fcntl.h>
+#include <process.h>
+#include <sys/stat.h>
+/* #include <sys/wait.h> */
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <assert.h>
+
+#include <windows.h>
+#include <winbase.h>
+#include <wincon.h>
+#ifdef __MINGW32__
+#include <mswsock.h>
+#include <mbstring.h>
+#endif
+#include "win32.h"
+#include "win32/dir.h"
+#ifdef _WIN32_WCE
+#include "wince.h"
+#endif
+#ifndef index
+#define index(x, y) strchr((x), (y))
+#endif
+#define isdirsep(x) ((x) == '/' || (x) == '\\')
+
+#undef stat
+#undef fclose
+#undef close
+#undef setsockopt
+
+#ifndef bool
+#define bool int
+#endif
+
+#if defined __BORLANDC__ || defined _WIN32_WCE
+#  define _filbuf _fgetc
+#  define _flsbuf _fputc
+#  define enough_to_get(n) (--(n) >= 0)
+#  define enough_to_put(n) (++(n) < 0)
+#else
+#  define enough_to_get(n) (--(n) >= 0)
+#  define enough_to_put(n) (--(n) >= 0)
+#endif
+
+#if HAVE_WSAWAITFORMULTIPLEEVENTS
+# define USE_INTERRUPT_WINSOCK
+#endif
+
+#if USE_INTERRUPT_WINSOCK
+# define WaitForMultipleEvents WSAWaitForMultipleEvents
+# define CreateSignal() (HANDLE)WSACreateEvent()
+# define SetSignal(ev) WSASetEvent(ev)
+# define ResetSignal(ev) WSAResetEvent(ev)
+#else  /* USE_INTERRUPT_WINSOCK */
+# define WaitForMultipleEvents WaitForMultipleObjectsEx
+# define CreateSignal() CreateEvent(NULL, FALSE, FALSE, NULL);
+# define SetSignal(ev) SetEvent(ev)
+# define ResetSignal(ev) (void)0
+#endif /* USE_INTERRUPT_WINSOCK */
+
+#ifdef WIN32_DEBUG
+#define Debug(something) something
+#else
+#define Debug(something) /* nothing */
+#endif
+
+#define TO_SOCKET(x)	_get_osfhandle(x)
+
+static struct ChildRecord *CreateChild(const char *, const char *, SECURITY_ATTRIBUTES *, HANDLE, HANDLE, HANDLE);
+static bool has_redirection(const char *);
+static void StartSockets ();
+static DWORD wait_events(HANDLE event, DWORD timeout);
+#if !defined(_WIN32_WCE)
+static int rb_w32_open_osfhandle(long osfhandle, int flags);
+#else
+#define rb_w32_open_osfhandle(osfhandle, flags) _open_osfhandle(osfhandle, flags)
+#endif
+
+/* errno mapping */
+static struct {
+    DWORD winerr;
+    int err;
+} errmap[] = {
+    {	ERROR_INVALID_FUNCTION,		EINVAL		},
+    {	ERROR_FILE_NOT_FOUND,		ENOENT		},
+    {	ERROR_PATH_NOT_FOUND,		ENOENT		},
+    {	ERROR_TOO_MANY_OPEN_FILES,	EMFILE		},
+    {	ERROR_ACCESS_DENIED,		EACCES		},
+    {	ERROR_INVALID_HANDLE,		EBADF		},
+    {	ERROR_ARENA_TRASHED,		ENOMEM		},
+    {	ERROR_NOT_ENOUGH_MEMORY,	ENOMEM		},
+    {	ERROR_INVALID_BLOCK,		ENOMEM		},
+    {	ERROR_BAD_ENVIRONMENT,		E2BIG		},
+    {	ERROR_BAD_FORMAT,		ENOEXEC		},
+    {	ERROR_INVALID_ACCESS,		EINVAL		},
+    {	ERROR_INVALID_DATA,		EINVAL		},
+    {	ERROR_INVALID_DRIVE,		ENOENT		},
+    {	ERROR_CURRENT_DIRECTORY,	EACCES		},
+    {	ERROR_NOT_SAME_DEVICE,		EXDEV		},
+    {	ERROR_NO_MORE_FILES,		ENOENT		},
+    {	ERROR_WRITE_PROTECT,		EROFS		},
+    {	ERROR_BAD_UNIT,			ENODEV		},
+    {	ERROR_NOT_READY,		ENXIO		},
+    {	ERROR_BAD_COMMAND,		EACCES		},
+    {	ERROR_CRC,			EACCES		},
+    {	ERROR_BAD_LENGTH,		EACCES		},
+    {	ERROR_SEEK,			EIO		},
+    {	ERROR_NOT_DOS_DISK,		EACCES		},
+    {	ERROR_SECTOR_NOT_FOUND,		EACCES		},
+    {	ERROR_OUT_OF_PAPER,		EACCES		},
+    {	ERROR_WRITE_FAULT,		EIO		},
+    {	ERROR_READ_FAULT,		EIO		},
+    {	ERROR_GEN_FAILURE,		EACCES		},
+    {	ERROR_LOCK_VIOLATION,		EACCES		},
+    {	ERROR_SHARING_VIOLATION,	EACCES		},
+    {	ERROR_WRONG_DISK,		EACCES		},
+    {	ERROR_SHARING_BUFFER_EXCEEDED,	EACCES		},
+    {	ERROR_BAD_NETPATH,		ENOENT		},
+    {	ERROR_NETWORK_ACCESS_DENIED,	EACCES		},
+    {	ERROR_BAD_NET_NAME,		ENOENT		},
+    {	ERROR_FILE_EXISTS,		EEXIST		},
+    {	ERROR_CANNOT_MAKE,		EACCES		},
+    {	ERROR_FAIL_I24,			EACCES		},
+    {	ERROR_INVALID_PARAMETER,	EINVAL		},
+    {	ERROR_NO_PROC_SLOTS,		EAGAIN		},
+    {	ERROR_DRIVE_LOCKED,		EACCES		},
+    {	ERROR_BROKEN_PIPE,		EPIPE		},
+    {	ERROR_DISK_FULL,		ENOSPC		},
+    {	ERROR_INVALID_TARGET_HANDLE,	EBADF		},
+    {	ERROR_INVALID_HANDLE,		EINVAL		},
+    {	ERROR_WAIT_NO_CHILDREN,		ECHILD		},
+    {	ERROR_CHILD_NOT_COMPLETE,	ECHILD		},
+    {	ERROR_DIRECT_ACCESS_HANDLE,	EBADF		},
+    {	ERROR_NEGATIVE_SEEK,		EINVAL		},
+    {	ERROR_SEEK_ON_DEVICE,		EACCES		},
+    {	ERROR_DIR_NOT_EMPTY,		ENOTEMPTY	},
+    {	ERROR_DIRECTORY,		ENOTDIR		},
+    {	ERROR_NOT_LOCKED,		EACCES		},
+    {	ERROR_BAD_PATHNAME,		ENOENT		},
+    {	ERROR_MAX_THRDS_REACHED,	EAGAIN		},
+    {	ERROR_LOCK_FAILED,		EACCES		},
+    {	ERROR_ALREADY_EXISTS,		EEXIST		},
+    {	ERROR_INVALID_STARTING_CODESEG,	ENOEXEC		},
+    {	ERROR_INVALID_STACKSEG,		ENOEXEC		},
+    {	ERROR_INVALID_MODULETYPE,	ENOEXEC		},
+    {	ERROR_INVALID_EXE_SIGNATURE,	ENOEXEC		},
+    {	ERROR_EXE_MARKED_INVALID,	ENOEXEC		},
+    {	ERROR_BAD_EXE_FORMAT,		ENOEXEC		},
+    {	ERROR_ITERATED_DATA_EXCEEDS_64k,ENOEXEC		},
+    {	ERROR_INVALID_MINALLOCSIZE,	ENOEXEC		},
+    {	ERROR_DYNLINK_FROM_INVALID_RING,ENOEXEC		},
+    {	ERROR_IOPL_NOT_ENABLED,		ENOEXEC		},
+    {	ERROR_INVALID_SEGDPL,		ENOEXEC		},
+    {	ERROR_AUTODATASEG_EXCEEDS_64k,	ENOEXEC		},
+    {	ERROR_RING2SEG_MUST_BE_MOVABLE,	ENOEXEC		},
+    {	ERROR_RELOC_CHAIN_XEEDS_SEGLIM,	ENOEXEC		},
+    {	ERROR_INFLOOP_IN_RELOC_CHAIN,	ENOEXEC		},
+    {	ERROR_FILENAME_EXCED_RANGE,	ENOENT		},
+    {	ERROR_NESTING_NOT_ALLOWED,	EAGAIN		},
+    {	ERROR_NOT_ENOUGH_QUOTA,		ENOMEM		},
+    {	WSAENAMETOOLONG,		ENAMETOOLONG	},
+    {	WSAENOTEMPTY,			ENOTEMPTY	},
+    {	WSAEINTR,			EINTR		},
+    {	WSAEBADF,			EBADF		},
+    {	WSAEACCES,			EACCES		},
+    {	WSAEFAULT,			EFAULT		},
+    {	WSAEINVAL,			EINVAL		},
+    {	WSAEMFILE,			EMFILE		},
+};
+
+static int
+map_errno(DWORD winerr)
+{
+    int i;
+
+    if (winerr == 0) {
+	return 0;
+    }
+
+    for (i = 0; i < sizeof(errmap) / sizeof(*errmap); i++) {
+	if (errmap[i].winerr == winerr) {
+	    return errmap[i].err;
+	}
+    }
+
+    if (winerr >= WSABASEERR) {
+	return winerr;
+    }
+    return EINVAL;
+}
+
+static char *NTLoginName;
+
+#ifdef WIN95
+static DWORD Win32System = (DWORD)-1;
+
+DWORD
+rb_w32_osid(void)
+{
+    static OSVERSIONINFO osver;
+
+    if (osver.dwPlatformId != Win32System) {
+	memset(&osver, 0, sizeof(OSVERSIONINFO));
+	osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+	GetVersionEx(&osver);
+	Win32System = osver.dwPlatformId;
+    }
+    return (Win32System);
+}
+#endif
+
+#define IsWinNT() rb_w32_iswinnt()
+#define IsWin95() rb_w32_iswin95()
+
+/* main thread constants */
+static struct {
+    HANDLE handle;
+    DWORD id;
+} main_thread;
+
+/* interrupt stuff */
+static HANDLE interrupted_event;
+
+HANDLE
+GetCurrentThreadHandle(void)
+{
+    static HANDLE current_process_handle = NULL;
+    HANDLE h;
+
+    if (!current_process_handle)
+	current_process_handle = GetCurrentProcess();
+    if (!DuplicateHandle(current_process_handle, GetCurrentThread(),
+			 current_process_handle, &h,
+			 0, FALSE, DUPLICATE_SAME_ACCESS))
+	return NULL;
+    return h;
+}
+
+/* simulate flock by locking a range on the file */
+
+
+#define LK_ERR(f,i) \
+    do {								\
+	if (f)								\
+	    i = 0;							\
+	else {								\
+	    DWORD err = GetLastError();					\
+	    if (err == ERROR_LOCK_VIOLATION)				\
+		errno = EWOULDBLOCK;					\
+	    else if (err == ERROR_NOT_LOCKED)				\
+		i = 0;							\
+	    else							\
+		errno = map_errno(err);					\
+	}								\
+    } while (0)
+#define LK_LEN      ULONG_MAX
+
+static VALUE
+flock_winnt(VALUE self, int argc, VALUE* argv)
+{
+    OVERLAPPED o;
+    int i = -1;
+    const HANDLE fh = (HANDLE)self;
+    const int oper = argc;
+
+    memset(&o, 0, sizeof(o));
+
+    switch(oper) {
+      case LOCK_SH:		/* shared lock */
+	LK_ERR(LockFileEx(fh, 0, 0, LK_LEN, LK_LEN, &o), i);
+	break;
+      case LOCK_EX:		/* exclusive lock */
+	LK_ERR(LockFileEx(fh, LOCKFILE_EXCLUSIVE_LOCK, 0, LK_LEN, LK_LEN, &o), i);
+	break;
+      case LOCK_SH|LOCK_NB:	/* non-blocking shared lock */
+	LK_ERR(LockFileEx(fh, LOCKFILE_FAIL_IMMEDIATELY, 0, LK_LEN, LK_LEN, &o), i);
+	break;
+      case LOCK_EX|LOCK_NB:	/* non-blocking exclusive lock */
+	LK_ERR(LockFileEx(fh,
+			  LOCKFILE_EXCLUSIVE_LOCK|LOCKFILE_FAIL_IMMEDIATELY,
+			  0, LK_LEN, LK_LEN, &o), i);
+	break;
+      case LOCK_UN:		/* unlock lock */
+      case LOCK_UN|LOCK_NB:	/* unlock is always non-blocking, I hope */
+	LK_ERR(UnlockFileEx(fh, 0, LK_LEN, LK_LEN, &o), i);
+	break;
+      default:            /* unknown */
+	errno = EINVAL;
+	break;
+    }
+    return i;
+}
+
+#ifdef WIN95
+static VALUE
+flock_win95(VALUE self, int argc, VALUE* argv)
+{
+    int i = -1;
+    const HANDLE fh = (HANDLE)self;
+    const int oper = argc;
+
+    switch(oper) {
+      case LOCK_EX:
+	do {
+	    LK_ERR(LockFile(fh, 0, 0, LK_LEN, LK_LEN), i);
+	} while (i && errno == EWOULDBLOCK);
+	break;
+      case LOCK_EX|LOCK_NB:
+	LK_ERR(LockFile(fh, 0, 0, LK_LEN, LK_LEN), i);
+	break;
+      case LOCK_UN:
+      case LOCK_UN|LOCK_NB:
+	LK_ERR(UnlockFile(fh, 0, 0, LK_LEN, LK_LEN), i);
+	break;
+      default:
+	errno = EINVAL;
+	break;
+    }
+    return i;
+}
+#endif
+
+#undef LK_ERR
+
+int
+flock(int fd, int oper)
+{
+#ifdef WIN95
+    static asynchronous_func_t locker = NULL;
+
+    if (!locker) {
+	if (IsWinNT())
+	    locker = flock_winnt;
+	else
+	    locker = flock_win95;
+    }
+#else
+    const asynchronous_func_t locker = flock_winnt;
+#endif
+
+    return rb_w32_asynchronize(locker,
+			      (VALUE)_get_osfhandle(fd), oper, NULL,
+			      (DWORD)-1);
+}
+
+static void init_stdhandle(void);
+
+#if _MSC_VER >= 1400
+static void invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, unsigned int line, uintptr_t dummy)
+{
+    // nothing to do
+}
+#endif
+
+static BOOL fWinsock;
+static char *envarea;
+static void
+exit_handler(void)
+{
+    if (fWinsock) {
+	WSACleanup();
+	fWinsock = FALSE;
+    }
+    if (envarea) {
+	FreeEnvironmentStrings(envarea);
+	envarea = NULL;
+    }
+}
+
+//
+// Initialization stuff
+//
+void
+NtInitialize(int *argc, char ***argv)
+{
+
+    WORD version;
+    int ret;
+
+#if _MSC_VER >= 1400
+    static void set_pioinfo_extra(void);
+
+    _set_invalid_parameter_handler(invalid_parameter);
+    set_pioinfo_extra();
+#endif
+
+    //
+    // subvert cmd.exe's feeble attempt at command line parsing
+    //
+    *argc = rb_w32_cmdvector(GetCommandLine(), argv);
+
+    //
+    // Now set up the correct time stuff
+    //
+
+    tzset();
+
+    init_stdhandle();
+
+    atexit(exit_handler);
+
+    // Initialize Winsock
+    StartSockets();
+
+#ifdef _WIN32_WCE
+    // free commandline buffer
+    wce_FreeCommandLine();
+#endif
+}
+
+char *
+getlogin()
+{
+    char buffer[200];
+    DWORD len = 200;
+    extern char *NTLoginName;
+
+    if (NTLoginName == NULL) {
+	if (GetUserName(buffer, &len)) {
+	    NTLoginName = (char *)malloc(len+1);
+	    if (!NTLoginName) return NULL;
+	    strncpy(NTLoginName, buffer, len);
+	    NTLoginName[len] = '\0';
+	}
+	else {
+	    NTLoginName = "<Unknown>";
+	}
+    }
+    return NTLoginName;
+}
+
+#define MAXCHILDNUM 256	/* max num of child processes */
+
+static struct ChildRecord {
+    HANDLE hProcess;	/* process handle */
+    rb_pid_t pid;	/* process id */
+} ChildRecord[MAXCHILDNUM];
+
+#define FOREACH_CHILD(v) do { \
+    struct ChildRecord* v; \
+    for (v = ChildRecord; v < ChildRecord + sizeof(ChildRecord) / sizeof(ChildRecord[0]); ++v)
+#define END_FOREACH_CHILD } while (0)
+
+static struct ChildRecord *
+FindFirstChildSlot(void)
+{
+    FOREACH_CHILD(child) {
+	if (child->pid) return child;
+    } END_FOREACH_CHILD;
+    return NULL;
+}
+
+static struct ChildRecord *
+FindChildSlot(rb_pid_t pid)
+{
+
+    FOREACH_CHILD(child) {
+	if (child->pid == pid) {
+	    return child;
+	}
+    } END_FOREACH_CHILD;
+    return NULL;
+}
+
+static void
+CloseChildHandle(struct ChildRecord *child)
+{
+    HANDLE h = child->hProcess;
+    child->hProcess = NULL;
+    child->pid = 0;
+    CloseHandle(h);
+}
+
+static struct ChildRecord *
+FindFreeChildSlot(void)
+{
+    FOREACH_CHILD(child) {
+	if (!child->pid) {
+	    child->pid = -1;	/* lock the slot */
+	    child->hProcess = NULL;
+	    return child;
+	}
+    } END_FOREACH_CHILD;
+    return NULL;
+}
+
+
+/*
+  ruby -lne 'BEGIN{$cmds = Hash.new(0); $mask = 1}'
+   -e '$cmds[$_.downcase] |= $mask' -e '$mask <<= 1 if ARGF.eof'
+   -e 'END{$cmds.sort.each{|n,f|puts "    \"\\#{f.to_s(8)}\" #{n.dump} + 1,"}}'
+   98cmd ntcmd
+ */
+static const char *const szInternalCmds[] = {
+    "\2" "assoc" + 1,
+    "\3" "break" + 1,
+    "\3" "call" + 1,
+    "\3" "cd" + 1,
+    "\1" "chcp" + 1,
+    "\3" "chdir" + 1,
+    "\3" "cls" + 1,
+    "\2" "color" + 1,
+    "\3" "copy" + 1,
+    "\1" "ctty" + 1,
+    "\3" "date" + 1,
+    "\3" "del" + 1,
+    "\3" "dir" + 1,
+    "\3" "echo" + 1,
+    "\2" "endlocal" + 1,
+    "\3" "erase" + 1,
+    "\3" "exit" + 1,
+    "\3" "for" + 1,
+    "\2" "ftype" + 1,
+    "\3" "goto" + 1,
+    "\3" "if" + 1,
+    "\1" "lfnfor" + 1,
+    "\1" "lh" + 1,
+    "\1" "lock" + 1,
+    "\3" "md" + 1,
+    "\3" "mkdir" + 1,
+    "\2" "move" + 1,
+    "\3" "path" + 1,
+    "\3" "pause" + 1,
+    "\2" "popd" + 1,
+    "\3" "prompt" + 1,
+    "\2" "pushd" + 1,
+    "\3" "rd" + 1,
+    "\3" "rem" + 1,
+    "\3" "ren" + 1,
+    "\3" "rename" + 1,
+    "\3" "rmdir" + 1,
+    "\3" "set" + 1,
+    "\2" "setlocal" + 1,
+    "\3" "shift" + 1,
+    "\2" "start" + 1,
+    "\3" "time" + 1,
+    "\2" "title" + 1,
+    "\1" "truename" + 1,
+    "\3" "type" + 1,
+    "\1" "unlock" + 1,
+    "\3" "ver" + 1,
+    "\3" "verify" + 1,
+    "\3" "vol" + 1,
+};
+
+static int
+internal_match(const void *key, const void *elem)
+{
+    return strcmp(key, *(const char *const *)elem);
+}
+
+static int
+is_command_com(const char *interp)
+{
+    int i = strlen(interp) - 11;
+
+    if ((i == 0 || i > 0 && isdirsep(interp[i-1])) &&
+	strcasecmp(interp+i, "command.com") == 0) {
+	return 1;
+    }
+    return 0;
+}
+
+static int
+is_internal_cmd(const char *cmd, int nt)
+{
+    char cmdname[9], *b = cmdname, c, **nm;
+
+    do {
+	if (!(c = *cmd++)) return 0;
+    } while (isspace(c));
+    while (isalpha(c)) {
+	*b++ = tolower(c);
+	if (b == cmdname + sizeof(cmdname)) return 0;
+	c = *cmd++;
+    }
+    if (c == '.') c = *cmd;
+    switch (c) {
+      case '<': case '>': case '|':
+	return 1;
+      case '\0': case ' ': case '\t': case '\n':
+	break;
+      default:
+	return 0;
+    }
+    *b = 0;
+    nm = bsearch(cmdname, szInternalCmds,
+		 sizeof(szInternalCmds) / sizeof(*szInternalCmds),
+		 sizeof(*szInternalCmds),
+		 internal_match);
+    if (!nm || !(nm[0][-1] & (nt ? 2 : 1)))
+	return 0;
+    return 1;
+}
+
+
+SOCKET
+rb_w32_get_osfhandle(int fh)
+{
+    return _get_osfhandle(fh);
+}
+
+rb_pid_t
+pipe_exec(char *cmd, int mode, FILE **fpr, FILE **fpw)
+{
+    struct ChildRecord* child;
+    HANDLE hReadIn, hReadOut;
+    HANDLE hWriteIn, hWriteOut;
+    HANDLE hDupInFile, hDupOutFile;
+    HANDLE hCurProc;
+    SECURITY_ATTRIBUTES sa;
+    BOOL fRet;
+    BOOL reading, writing;
+    int fd;
+    int pipemode;
+    char modes[3];
+    int ret;
+
+    /* Figure out what we're doing... */
+    writing = (mode & (O_WRONLY | O_RDWR)) ? TRUE : FALSE;
+    reading = ((mode & O_RDWR) || !writing) ? TRUE : FALSE;
+    if (mode & O_BINARY) {
+	pipemode = O_BINARY;
+	modes[1] = 'b';
+	modes[2] = '\0';
+    }
+    else {
+	pipemode = O_TEXT;
+	modes[1] = '\0';
+    }
+
+    sa.nLength              = sizeof (SECURITY_ATTRIBUTES);
+    sa.lpSecurityDescriptor = NULL;
+    sa.bInheritHandle       = TRUE;
+    ret = -1;
+    hWriteIn = hReadOut = NULL;
+
+    RUBY_CRITICAL(do {
+	/* create pipe */
+	hCurProc = GetCurrentProcess();
+	if (reading) {
+	    fRet = CreatePipe(&hReadIn, &hReadOut, &sa, 2048L);
+	    if (!fRet) {
+		errno = map_errno(GetLastError());
+		break;
+	    }
+	    if (!DuplicateHandle(hCurProc, hReadIn, hCurProc, &hDupInFile, 0,
+				 FALSE, DUPLICATE_SAME_ACCESS)) {
+		errno = map_errno(GetLastError());
+		CloseHandle(hReadIn);
+		CloseHandle(hReadOut);
+		CloseHandle(hCurProc);
+		break;
+	    }
+	    CloseHandle(hReadIn);
+	}
+	if (writing) {
+	    fRet = CreatePipe(&hWriteIn, &hWriteOut, &sa, 2048L);
+	    if (!fRet) {
+		errno = map_errno(GetLastError());
+	      write_pipe_failed:
+		if (reading) {
+		    CloseHandle(hDupInFile);
+		    CloseHandle(hReadOut);
+		}
+		break;
+	    }
+	    if (!DuplicateHandle(hCurProc, hWriteOut, hCurProc, &hDupOutFile, 0,
+				 FALSE, DUPLICATE_SAME_ACCESS)) {
+		errno = map_errno(GetLastError());
+		CloseHandle(hWriteIn);
+		CloseHandle(hWriteOut);
+		CloseHandle(hCurProc);
+		goto write_pipe_failed;
+	    }
+	    CloseHandle(hWriteOut);
+	}
+	CloseHandle(hCurProc);
+
+	/* create child process */
+	child = CreateChild(cmd, NULL, &sa, hWriteIn, hReadOut, NULL);
+	if (!child) {
+	    if (reading) {
+		CloseHandle(hReadOut);
+		CloseHandle(hDupInFile);
+	    }
+	    if (writing) {
+		CloseHandle(hWriteIn);
+		CloseHandle(hDupOutFile);
+	    }
+	    break;
+	}
+
+	/* associate handle to fp */
+	if (reading) {
+	    fd = rb_w32_open_osfhandle((long)hDupInFile,
+				       (_O_RDONLY | pipemode));
+	    CloseHandle(hReadOut);
+	    if (fd == -1) {
+		CloseHandle(hDupInFile);
+	      read_open_failed:
+		if (writing) {
+		    CloseHandle(hWriteIn);
+		    CloseHandle(hDupOutFile);
+		}
+		CloseChildHandle(child);
+		break;
+	    }
+	    modes[0] = 'r';
+	    if ((*fpr = (FILE *)fdopen(fd, modes)) == NULL) {
+		_close(fd);
+		goto read_open_failed;
+	    }
+	}
+	if (writing) {
+	    fd = rb_w32_open_osfhandle((long)hDupOutFile,
+				       (_O_WRONLY | pipemode));
+	    CloseHandle(hWriteIn);
+	    if (fd == -1) {
+		CloseHandle(hDupOutFile);
+	      write_open_failed:
+		if (reading) {
+		    fclose(*fpr);
+		}
+		CloseChildHandle(child);
+		break;
+	    }
+	    modes[0] = 'w';
+	    if ((*fpw = (FILE *)fdopen(fd, modes)) == NULL) {
+		_close(fd);
+		goto write_open_failed;
+	    }
+	}
+	ret = child->pid;
+    } while (0));
+
+    return ret;
+}
+
+extern VALUE rb_last_status;
+
+int
+do_spawn(int mode, char *cmd)
+{
+    struct ChildRecord *child;
+    DWORD exitcode;
+
+    switch (mode) {
+      case P_WAIT:
+      case P_NOWAIT:
+      case P_OVERLAY:
+	break;
+      default:
+	errno = EINVAL;
+	return -1;
+    }
+
+    child = CreateChild(cmd, NULL, NULL, NULL, NULL, NULL);
+    if (!child) {
+	return -1;
+    }
+
+    switch (mode) {
+      case P_WAIT:
+	rb_syswait(child->pid);
+	return NUM2INT(rb_last_status);
+      case P_NOWAIT:
+	return child->pid;
+      case P_OVERLAY:
+	WaitForSingleObject(child->hProcess, INFINITE);
+	GetExitCodeProcess(child->hProcess, &exitcode);
+	CloseChildHandle(child);
+	_exit(exitcode);
+      default:
+	return -1;	/* not reached */
+    }
+}
+
+int
+do_aspawn(int mode, char *prog, char **argv)
+{
+    char *cmd, *p, *q, *s, **t;
+    int len, n, bs, quote;
+    struct ChildRecord *child;
+    DWORD exitcode;
+
+    switch (mode) {
+      case P_WAIT:
+      case P_NOWAIT:
+      case P_OVERLAY:
+	break;
+      default:
+	errno = EINVAL;
+	return -1;
+    }
+
+    for (t = argv, len = 0; *t; t++) {
+	for (p = *t, n = quote = bs = 0; *p; ++p) {
+	    switch (*p) {
+	      case '\\':
+		++bs;
+		break;
+	      case '"':
+		n += bs + 1; bs = 0;
+		quote = 1;
+		break;
+	      case ' ': case '\t':
+		quote = 1;
+	      default:
+		bs = 0;
+		p = CharNext(p) - 1;
+		break;
+	    }
+	}
+	len += p - *t + n + 1;
+	if (quote) len += 2;
+    }
+    cmd = ALLOCA_N(char, len);
+    for (t = argv, q = cmd; p = *t; t++) {
+	quote = 0;
+	s = p;
+	if (!*p || strpbrk(p, " \t\"")) {
+	    quote = 1;
+	    *q++ = '"';
+	}
+	for (bs = 0; *p; ++p) {
+	    switch (*p) {
+	      case '\\':
+		++bs;
+		break;
+	      case '"':
+		memcpy(q, s, n = p - s); q += n; s = p;
+		memset(q, '\\', ++bs); q += bs; bs = 0;
+		break;
+	      default:
+		bs = 0;
+		p = CharNext(p) - 1;
+		break;
+	    }
+	}
+	memcpy(q, s, n = p - s);
+	q += n;
+	if (quote) *q++ = '"';
+	*q++ = ' ';
+    }
+    if (q > cmd) --q;
+    *q = '\0';
+
+    child = CreateChild(cmd, prog, NULL, NULL, NULL, NULL);
+    if (!child) {
+	return -1;
+    }
+
+    switch (mode) {
+      case P_WAIT:
+	rb_syswait(child->pid);
+	return NUM2INT(rb_last_status);
+      case P_NOWAIT:
+	return child->pid;
+      case P_OVERLAY:
+	WaitForSingleObject(child->hProcess, INFINITE);
+	GetExitCodeProcess(child->hProcess, &exitcode);
+	CloseChildHandle(child);
+	_exit(exitcode);
+      default:
+	return -1;	/* not reached */
+    }
+}
+
+static struct ChildRecord *
+CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa,
+	    HANDLE hInput, HANDLE hOutput, HANDLE hError)
+{
+    BOOL fRet;
+    DWORD  dwCreationFlags;
+    STARTUPINFO aStartupInfo;
+    PROCESS_INFORMATION aProcessInformation;
+    SECURITY_ATTRIBUTES sa;
+    const char *shell;
+    struct ChildRecord *child;
+    char *p = NULL;
+
+    if (!cmd && !prog) {
+	errno = EFAULT;
+	return NULL;
+    }
+
+    child = FindFreeChildSlot();
+    if (!child) {
+	errno = EAGAIN;
+	return NULL;
+    }
+
+    if (!psa) {
+	sa.nLength              = sizeof (SECURITY_ATTRIBUTES);
+	sa.lpSecurityDescriptor = NULL;
+	sa.bInheritHandle       = TRUE;
+	psa = &sa;
+    }
+
+    memset(&aStartupInfo, 0, sizeof (STARTUPINFO));
+    memset(&aProcessInformation, 0, sizeof (PROCESS_INFORMATION));
+    aStartupInfo.cb = sizeof (STARTUPINFO);
+    if (hInput || hOutput || hError) {
+	aStartupInfo.dwFlags = STARTF_USESTDHANDLES;
+	if (hInput) {
+	    aStartupInfo.hStdInput  = hInput;
+	}
+	else {
+	    aStartupInfo.hStdInput  = GetStdHandle(STD_INPUT_HANDLE);
+	}
+	if (hOutput) {
+	    aStartupInfo.hStdOutput = hOutput;
+	}
+	else {
+	    aStartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+	}
+	if (hError) {
+	    aStartupInfo.hStdError = hError;
+	}
+	else {
+	    aStartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
+	}
+    }
+
+    dwCreationFlags = (NORMAL_PRIORITY_CLASS);
+
+    if (prog) {
+	if (!(p = dln_find_exe(prog, NULL))) {
+	    shell = prog;
+	}
+    }
+    else {
+	int redir = -1;
+	int len = 0;
+	int nt;
+	while (ISSPACE(*cmd)) cmd++;
+	for (prog = cmd; *prog; prog = CharNext(prog)) {
+	    if (ISSPACE(*prog)) {
+		len = prog - cmd;
+		do ++prog; while (ISSPACE(*prog));
+		if (!*prog--) break;
+	    }
+	    else {
+		len = 0;
+	    }
+	}
+	if (!len) len = strlen(cmd);
+	if ((shell = getenv("RUBYSHELL")) && (redir = has_redirection(cmd))) {
+	    char *tmp = ALLOCA_N(char, strlen(shell) + len + sizeof(" -c ") + 2);
+	    sprintf(tmp, "%s -c \"%.*s\"", shell, len, cmd);
+	    cmd = tmp;
+	}
+	else if ((shell = getenv("COMSPEC")) &&
+		 (nt = !is_command_com(shell),
+		  (redir < 0 ? has_redirection(cmd) : redir) ||
+		  is_internal_cmd(cmd, nt))) {
+	    char *tmp = ALLOCA_N(char, strlen(shell) + len + sizeof(" /c ")
+				 + (nt ? 2 : 0));
+	    sprintf(tmp, nt ? "%s /c \"%.*s\"" : "%s /c %.*s", shell, len, cmd);
+	    cmd = tmp;
+	}
+	else {
+	    shell = NULL;
+	    prog = cmd;
+	    for (;;) {
+		if (!*prog) {
+		    p = dln_find_exe(cmd, NULL);
+		    break;
+		}
+		if (strchr(".:*?\"/\\", *prog)) {
+		    if (cmd[len]) {
+			char *tmp = ALLOCA_N(char, len + 1);
+			memcpy(tmp, cmd, len);
+			tmp[len] = 0;
+			cmd = tmp;
+		    }
+		    break;
+		}
+		if (ISSPACE(*prog) || strchr("<>|", *prog)) {
+		    len = prog - cmd;
+		    p = ALLOCA_N(char, len + 1);
+		    memcpy(p, cmd, len);
+		    p[len] = 0;
+		    p = dln_find_exe(p, NULL);
+		    break;
+		}
+		prog++;
+	    }
+	}
+    }
+    if (p) {
+	shell = p;
+	while (*p) {
+	    if ((unsigned char)*p == '/')
+		*p = '\\';
+	    p = CharNext(p);
+	}
+    }
+
+    RUBY_CRITICAL({
+	fRet = CreateProcess(shell, (char *)cmd, psa, psa,
+			     psa->bInheritHandle, dwCreationFlags, NULL, NULL,
+			     &aStartupInfo, &aProcessInformation);
+	errno = map_errno(GetLastError());
+    });
+
+    if (!fRet) {
+	child->pid = 0;		/* release the slot */
+	return NULL;
+    }
+
+    CloseHandle(aProcessInformation.hThread);
+
+    child->hProcess = aProcessInformation.hProcess;
+    child->pid = (rb_pid_t)aProcessInformation.dwProcessId;
+
+    if (!IsWinNT()) {
+	/* On Win9x, make pid positive similarly to cygwin and perl */
+	child->pid = -child->pid;
+    }
+
+    return child;
+}
+
+typedef struct _NtCmdLineElement {
+    struct _NtCmdLineElement *next;
+    char *str;
+    int len;
+    int flags;
+} NtCmdLineElement;
+
+//
+// Possible values for flags
+//
+
+#define NTGLOB   0x1	// element contains a wildcard
+#define NTMALLOC 0x2	// string in element was malloc'ed
+#define NTSTRING 0x4	// element contains a quoted string
+
+static int
+insert(const char *path, VALUE vinfo)
+{
+    NtCmdLineElement *tmpcurr;
+    NtCmdLineElement ***tail = (NtCmdLineElement ***)vinfo;
+
+    tmpcurr = (NtCmdLineElement *)malloc(sizeof(NtCmdLineElement));
+    if (!tmpcurr) return -1;
+    MEMZERO(tmpcurr, NtCmdLineElement, 1);
+    tmpcurr->len = strlen(path);
+    tmpcurr->str = (char *)malloc(tmpcurr->len + 1);
+    if (!tmpcurr->str) return -1;
+    tmpcurr->flags |= NTMALLOC;
+    strcpy(tmpcurr->str, path);
+    **tail = tmpcurr;
+    *tail = &tmpcurr->next;
+
+    return 0;
+}
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#else
+# define MAXPATHLEN 512
+#endif
+
+
+static NtCmdLineElement **
+cmdglob(NtCmdLineElement *patt, NtCmdLineElement **tail)
+{
+    char buffer[MAXPATHLEN], *buf = buffer;
+    char *p;
+    NtCmdLineElement **last = tail;
+    int status;
+
+    if (patt->len >= MAXPATHLEN)
+	if (!(buf = malloc(patt->len + 1))) return 0;
+
+    strncpy (buf, patt->str, patt->len);
+    buf[patt->len] = '\0';
+    for (p = buf; *p; p = CharNext(p))
+	if (*p == '\\')
+	    *p = '/';
+    status = ruby_glob(buf, 0, insert, (VALUE)&tail);
+    if (buf != buffer)
+	free(buf);
+
+    if (status || last == tail) return 0;
+    if (patt->flags & NTMALLOC)
+	free(patt->str);
+    free(patt);
+    return tail;
+}
+
+// 
+// Check a command string to determine if it has I/O redirection
+// characters that require it to be executed by a command interpreter
+//
+
+static bool
+has_redirection(const char *cmd)
+{
+    char quote = '\0';
+    const char *ptr;
+
+    //
+    // Scan the string, looking for redirection (< or >) or pipe 
+    // characters (|) that are not in a quoted string
+    //
+
+    for (ptr = cmd; *ptr;) {
+	switch (*ptr) {
+	  case '\'':
+	  case '\"':
+	    if (!quote)
+		quote = *ptr;
+	    else if (quote == *ptr)
+		quote = '\0';
+	    ptr++;
+	    break;
+
+	  case '>':
+	  case '<':
+	  case '|':
+	    if (!quote)
+		return TRUE;
+	    ptr++;
+	    break;
+
+	  case '\\':
+	    ptr++;
+	  default:
+	    ptr = CharNext(ptr);
+	    break;
+	}
+    }
+    return FALSE;
+}
+
+static inline char *
+skipspace(char *ptr)
+{
+    while (ISSPACE(*ptr))
+	ptr++;
+    return ptr;
+}
+
+int 
+rb_w32_cmdvector(const char *cmd, char ***vec)
+{
+    int cmdlen, globbing, len, i;
+    int elements, strsz, done;
+    int slashes, escape;
+    char *ptr, *base, *buffer, *cmdline;
+    char **vptr;
+    char quote;
+    NtCmdLineElement *curr, **tail;
+    NtCmdLineElement *cmdhead = NULL, **cmdtail = &cmdhead;
+
+    //
+    // just return if we don't have a command line
+    //
+
+    while (ISSPACE(*cmd))
+	cmd++;
+    if (!*cmd) {
+	*vec = NULL;
+	return 0;
+    }
+
+    ptr = cmdline = strdup(cmd);
+
+    //
+    // Ok, parse the command line, building a list of CmdLineElements.
+    // When we've finished, and it's an input command (meaning that it's
+    // the processes argv), we'll do globing and then build the argument 
+    // vector.
+    // The outer loop does one interation for each element seen. 
+    // The inner loop does one interation for each character in the element.
+    //
+
+    while (*(ptr = skipspace(ptr))) {
+	base = ptr;
+	quote = slashes = globbing = escape = 0;
+	for (done = 0; !done && *ptr; ) {
+	    //
+	    // Switch on the current character. We only care about the
+	    // white-space characters, the  wild-card characters, and the
+	    // quote characters.
+	    //
+
+	    switch (*ptr) {
+	      case '\\':
+		if (quote != '\'') slashes++;
+	        break;
+
+	      case ' ':
+	      case '\t':
+	      case '\n':
+		//
+		// if we're not in a string, then we're finished with this
+		// element
+		//
+
+		if (!quote) {
+		    *ptr = 0;
+		    done = 1;
+		}
+		break;
+
+	      case '*':
+	      case '?':
+	      case '[':
+	      case '{':
+		// 
+		// record the fact that this element has a wildcard character
+		// N.B. Don't glob if inside a single quoted string
+		//
+
+		if (quote != '\'')
+		    globbing++;
+		slashes = 0;
+		break;
+
+	      case '\'':
+	      case '\"':
+		//
+		// if we're already in a string, see if this is the
+		// terminating close-quote. If it is, we're finished with 
+		// the string, but not neccessarily with the element.
+		// If we're not already in a string, start one.
+		//
+
+		if (!(slashes & 1)) {
+		    if (!quote)
+			quote = *ptr;
+		    else if (quote == *ptr)
+			quote = '\0';
+		    escape++;
+		}
+		slashes = 0;
+		break;
+
+	      default:
+		ptr = CharNext(ptr);
+		slashes = 0;
+		continue;
+	    }
+	    ptr++;
+	}
+
+	//
+	// when we get here, we've got a pair of pointers to the element,
+	// base and ptr. Base points to the start of the element while ptr
+	// points to the character following the element.
+	//
+
+	len = ptr - base;
+	if (done) --len;
+
+	//
+	// if it's an input vector element and it's enclosed by quotes, 
+	// we can remove them.
+	//
+
+	if (escape) {
+	    char *p = base;
+	    slashes = quote = 0;
+	    while (p < base + len) {
+		switch (*p) {
+		  case '\\':
+		    p++;
+		    if (quote != '\'') slashes++;
+		    break;
+
+		  case '\'':
+		  case '"':
+		    if (!(slashes & 1)) {
+			if (!quote)
+			    quote = *p;
+			else if (quote == *p)
+			    quote = '\0';
+			else {
+			    p++;
+			    slashes = 0;
+			    break;
+			}
+		    }
+		    if (base + slashes == p) {
+			base += slashes >> 1;
+			len -= slashes >> 1;
+			slashes &= 1;
+		    }
+		    if (base == p) {
+			base = ++p;
+			--len;
+		    }
+		    else {
+			memcpy(p - ((slashes + 1) >> 1), p + (~slashes & 1), base + len - p);
+			slashes >>= 1;
+			p -= slashes;
+			len -= slashes + 1;
+			slashes = 0;
+		    }
+		    break;
+
+		  default:
+		    p = CharNext(p);
+		    slashes = 0;
+		    break;
+		}
+	    }
+	}
+
+	curr = (NtCmdLineElement *)calloc(sizeof(NtCmdLineElement), 1);
+	if (!curr) goto do_nothing;
+	curr->str = base;
+	curr->len = len;
+
+	if (globbing && (tail = cmdglob(curr, cmdtail))) {
+	    cmdtail = tail;
+	}
+	else {
+	    *cmdtail = curr;
+	    cmdtail = &curr->next;
+	}
+    }
+
+    //
+    // Almost done! 
+    // Count up the elements, then allocate space for a vector of pointers
+    // (argv) and a string table for the elements.
+    // 
+
+    for (elements = 0, strsz = 0, curr = cmdhead; curr; curr = curr->next) {
+	elements++;
+	strsz += (curr->len + 1);
+    }
+
+    len = (elements+1)*sizeof(char *) + strsz;
+    buffer = (char *)malloc(len);
+    if (!buffer) {
+      do_nothing:
+	while (curr = cmdhead) {
+	    cmdhead = curr->next;
+	    if (curr->flags & NTMALLOC) free(curr->str);
+	    free(curr);
+	}
+	free(cmdline);
+	for (vptr = *vec; *vptr; ++vptr);
+	return vptr - *vec;
+    }
+    
+    //
+    // make vptr point to the start of the buffer
+    // and ptr point to the area we'll consider the string table.
+    //
+    //   buffer (*vec)
+    //   |
+    //   V       ^---------------------V
+    //   +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    //   |   |       | ....  | NULL  |   | ..... |\0 |   | ..... |\0 |...
+    //   +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
+    //   |-  elements+1             -| ^ 1st element   ^ 2nd element
+
+    vptr = (char **) buffer;
+
+    ptr = buffer + (elements+1) * sizeof(char *);
+
+    while (curr = cmdhead) {
+	strncpy (ptr, curr->str, curr->len);
+	ptr[curr->len] = '\0';
+	*vptr++ = ptr;
+	ptr += curr->len + 1;
+	cmdhead = curr->next;
+	if (curr->flags & NTMALLOC) free(curr->str);
+	free(curr);
+    }
+    *vptr = 0;
+
+    *vec = (char **) buffer;
+    free(cmdline);
+    return elements;
+}
+
+//
+// UNIX compatible directory access functions for NT
+//
+
+#define PATHLEN 1024
+
+//
+// The idea here is to read all the directory names into a string table
+// (separated by nulls) and when one of the other dir functions is called
+// return the pointer to the current file name. 
+//
+
+#define GetBit(bits, i) ((bits)[(i) / CHAR_BIT] &  (1 << (i) % CHAR_BIT))
+#define SetBit(bits, i) ((bits)[(i) / CHAR_BIT] |= (1 << (i) % CHAR_BIT))
+
+#define BitOfIsDir(n) ((n) * 2)
+#define BitOfIsRep(n) ((n) * 2 + 1)
+#define DIRENT_PER_CHAR (CHAR_BIT / 2)
+
+DIR *
+rb_w32_opendir(const char *filename)
+{
+    DIR               *p;
+    long               len;
+    long               idx;
+    char               scannamespc[PATHLEN];
+    char	      *scanname = scannamespc;
+    struct stat	       sbuf;
+    WIN32_FIND_DATA fd;
+    HANDLE          fh;
+
+    //
+    // check to see if we've got a directory
+    //
+
+    if (rb_w32_stat(filename, &sbuf) < 0)
+	return NULL;
+    if (!(sbuf.st_mode & S_IFDIR) &&
+	(!ISALPHA(filename[0]) || filename[1] != ':' || filename[2] != '\0' ||
+	((1 << (filename[0] & 0x5f) - 'A') & GetLogicalDrives()) == 0)) {
+	errno = ENOTDIR;
+	return NULL;
+    }
+
+    //
+    // Get us a DIR structure
+    //
+
+    p = xcalloc(sizeof(DIR), 1);
+    if (p == NULL)
+	return NULL;
+    
+    //
+    // Create the search pattern
+    //
+
+    strcpy(scanname, filename);
+
+    if (index("/\\:", *CharPrev(scanname, scanname + strlen(scanname))) == NULL)
+	strcat(scanname, "/*");
+    else
+	strcat(scanname, "*");
+
+    //
+    // do the FindFirstFile call
+    //
+
+    fh = FindFirstFile(scanname, &fd);
+    if (fh == INVALID_HANDLE_VALUE) {
+	errno = map_errno(GetLastError());
+	free(p);
+	return NULL;
+    }
+
+    //
+    // now allocate the first part of the string table for the
+    // filenames that we find.
+    //
+
+    idx = strlen(fd.cFileName)+1;
+    if (!(p->start = (char *)malloc(idx)) || !(p->bits = (char *)malloc(1))) {
+      error:
+	rb_w32_closedir(p);
+	FindClose(fh);
+	errno = ENOMEM;
+	return NULL;
+    }
+    strcpy(p->start, fd.cFileName);
+    p->bits[0] = 0;
+    if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+	SetBit(p->bits, BitOfIsDir(0));
+    if (fd.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
+	SetBit(p->bits, BitOfIsRep(0));
+    p->nfiles++;
+
+    //
+    // loop finding all the files that match the wildcard
+    // (which should be all of them in this directory!).
+    // the variable idx should point one past the null terminator
+    // of the previous string found.
+    //
+    while (FindNextFile(fh, &fd)) {
+	char *newpath;
+
+	len = strlen(fd.cFileName) + 1;
+
+	//
+	// bump the string table size by enough for the
+	// new name and it's null terminator 
+	//
+
+	newpath = (char *)realloc(p->start, idx + len);
+	if (newpath == NULL) {
+	    goto error;
+	}
+	p->start = newpath;
+	strcpy(&p->start[idx], fd.cFileName);
+
+	if (p->nfiles % DIRENT_PER_CHAR == 0) {
+	    char *tmp = realloc(p->bits, p->nfiles / DIRENT_PER_CHAR + 1);
+	    if (!tmp)
+		goto error;
+	    p->bits = tmp;
+	    p->bits[p->nfiles / DIRENT_PER_CHAR] = 0;
+	}
+	if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+	    SetBit(p->bits, BitOfIsDir(p->nfiles));
+	if (fd.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
+	    SetBit(p->bits, BitOfIsRep(p->nfiles));
+
+	p->nfiles++;
+	idx += len;
+    }
+    FindClose(fh);
+    p->size = idx;
+    p->curr = p->start;
+    return p;
+}
+
+//
+// Move to next entry
+//
+
+static void
+move_to_next_entry(DIR *dirp)
+{
+    if (dirp->curr) {
+	dirp->loc++;
+	dirp->curr += strlen(dirp->curr) + 1;
+	if (dirp->curr >= (dirp->start + dirp->size)) {
+	    dirp->curr = NULL;
+	}
+    }
+}
+
+//
+// Readdir just returns the current string pointer and bumps the
+// string pointer to the next entry.
+//
+
+struct direct  *
+rb_w32_readdir(DIR *dirp)
+{
+    static int  dummy = 0;
+
+    if (dirp->curr) {
+
+	//
+	// first set up the structure to return
+	//
+
+	strcpy(dirp->dirstr.d_name, dirp->curr);
+	dirp->dirstr.d_namlen = strlen(dirp->curr);
+
+	//
+	// Fake inode
+	//
+	dirp->dirstr.d_ino = dummy++;
+
+	//
+	// Attributes
+	//
+	dirp->dirstr.d_isdir = GetBit(dirp->bits, BitOfIsDir(dirp->loc));
+	dirp->dirstr.d_isrep = GetBit(dirp->bits, BitOfIsRep(dirp->loc));
+
+	//
+	// Now set up for the next call to readdir
+	//
+
+	move_to_next_entry(dirp);
+
+	return &(dirp->dirstr);
+
+    } else
+	return NULL;
+}
+
+//
+// Telldir returns the current string pointer position
+//
+
+long
+rb_w32_telldir(DIR *dirp)
+{
+    long loc = 0; char *p = dirp->curr;
+
+    rb_w32_rewinddir(dirp);
+
+    while (p != dirp->curr) {
+	move_to_next_entry(dirp); loc++;
+    }
+
+    return loc;
+}
+
+//
+// Seekdir moves the string pointer to a previously saved position
+// (Saved by telldir).
+
+void
+rb_w32_seekdir(DIR *dirp, long loc)
+{
+    rb_w32_rewinddir(dirp);
+
+    while (dirp->curr && loc-- > 0) {
+	move_to_next_entry(dirp);
+    }
+}
+
+//
+// Rewinddir resets the string pointer to the start
+//
+
+void
+rb_w32_rewinddir(DIR *dirp)
+{
+    dirp->curr = dirp->start;
+}
+
+//
+// This just free's the memory allocated by opendir
+//
+
+void
+rb_w32_closedir(DIR *dirp)
+{
+    free(dirp->start);
+    free(dirp->bits);
+    free(dirp);
+}
+
+EXTERN_C void __cdecl _lock_fhandle(int);
+EXTERN_C void __cdecl _unlock_fhandle(int);
+EXTERN_C void __cdecl _unlock(int);
+
+#if (defined _MT || defined __MSVCRT__) && !defined __BORLANDC__
+#define MSVCRT_THREADS
+#endif
+#ifdef MSVCRT_THREADS
+# define MTHREAD_ONLY(x) x
+# define STHREAD_ONLY(x)
+#elif defined(__BORLANDC__)
+# define MTHREAD_ONLY(x)
+# define STHREAD_ONLY(x)
+#else
+# define MTHREAD_ONLY(x)
+# define STHREAD_ONLY(x) x
+#endif
+
+typedef struct	{
+    long osfhnd;    /* underlying OS file HANDLE */
+    char osfile;    /* attributes of file (e.g., open in text mode?) */
+    char pipech;    /* one char buffer for handles opened on pipes */
+#ifdef MSVCRT_THREADS
+    int lockinitflag;
+    CRITICAL_SECTION lock;
+#if _MSC_VER >= 1400
+    char textmode;
+    char pipech2[2];
+#endif
+#endif
+}	ioinfo;
+
+#if !defined _CRTIMP || defined __MINGW32__
+#undef _CRTIMP
+#define _CRTIMP __declspec(dllimport)
+#endif
+
+#if !defined(__BORLANDC__) && !defined(_WIN32_WCE)
+EXTERN_C _CRTIMP ioinfo * __pioinfo[];
+
+#define IOINFO_L2E			5
+#define IOINFO_ARRAY_ELTS	(1 << IOINFO_L2E)
+#define _pioinfo(i)	((ioinfo*)((char*)(__pioinfo[i >> IOINFO_L2E]) + (i & (IOINFO_ARRAY_ELTS - 1)) * (sizeof(ioinfo) + pioinfo_extra)))
+#define _osfhnd(i)  (_pioinfo(i)->osfhnd)
+#define _osfile(i)  (_pioinfo(i)->osfile)
+#define _pipech(i)  (_pioinfo(i)->pipech)
+
+#if _MSC_VER >= 1400
+static size_t pioinfo_extra = 0;	/* workaround for VC++8 SP1 */
+
+static void
+set_pioinfo_extra(void)
+{
+    int fd;
+
+    fd = open("NUL", O_RDONLY);
+    for (pioinfo_extra = 0; pioinfo_extra <= 64; pioinfo_extra += sizeof(void *)) {
+	if (_osfhnd(fd) == _get_osfhandle(fd)) {
+	    break;
+	}
+    }
+    close(fd);
+
+    if (pioinfo_extra > 64) {
+	/* not found, maybe something wrong... */
+	pioinfo_extra = 0;
+    }
+}
+#else
+#define pioinfo_extra 0
+#endif
+
+#define _set_osfhnd(fh, osfh) (void)(_osfhnd(fh) = osfh)
+#define _set_osflags(fh, flags) (_osfile(fh) = (flags))
+
+#define FOPEN			0x01	/* file handle open */
+#define FNOINHERIT		0x10	/* file handle opened O_NOINHERIT */
+#define FAPPEND			0x20	/* file handle opened O_APPEND */
+#define FDEV			0x40	/* file handle refers to device */
+#define FTEXT			0x80	/* file handle is in text mode */
+
+static int
+rb_w32_open_osfhandle(long osfhandle, int flags)
+{
+    int fh;
+    char fileflags;		/* _osfile flags */
+    HANDLE hF;
+
+    /* copy relevant flags from second parameter */
+    fileflags = FDEV;
+
+    if (flags & O_APPEND)
+	fileflags |= FAPPEND;
+
+    if (flags & O_TEXT)
+	fileflags |= FTEXT;
+
+    if (flags & O_NOINHERIT)
+	fileflags |= FNOINHERIT;
+
+    /* attempt to allocate a C Runtime file handle */
+    hF = CreateFile("NUL", 0, 0, NULL, OPEN_ALWAYS, 0, NULL);
+    fh = _open_osfhandle((long)hF, 0);
+    CloseHandle(hF);
+    if (fh == -1) {
+	errno = EMFILE;		/* too many open files */
+	_doserrno = 0L;		/* not an OS error */
+    }
+    else {
+
+	MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fh)->lock)));
+	/* the file is open. now, set the info in _osfhnd array */
+	_set_osfhnd(fh, osfhandle);
+
+	fileflags |= FOPEN;		/* mark as open */
+
+	_set_osflags(fh, fileflags); /* set osfile entry */
+	MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fh)->lock));
+    }
+    return fh;			/* return handle */
+}
+
+static void
+init_stdhandle(void)
+{
+    if (fileno(stdin) < 0) {
+	stdin->_file = 0;
+    }
+    if (fileno(stdout) < 0) {
+	stdout->_file = 1;
+    }
+    if (fileno(stderr) < 0) {
+	stderr->_file = 2;
+    }
+    setvbuf(stderr, NULL, _IONBF, 0);
+}
+#else
+
+#define _set_osfhnd(fh, osfh) (void)((fh), (osfh))
+#define _set_osflags(fh, flags) (void)((fh), (flags))
+
+static void
+init_stdhandle(void)
+{
+}
+#endif
+
+#ifdef __BORLANDC__
+static int
+rb_w32_open_osfhandle(long osfhandle, int flags)
+{
+    int fd = _open_osfhandle(osfhandle, flags);
+    if (fd == -1) {
+	errno = EMFILE;		/* too many open files */
+	_doserrno = 0L;		/* not an OS error */
+    }
+    return fd;
+}
+#endif
+
+#undef getsockopt
+
+static int
+is_socket(SOCKET fd)
+{
+    char sockbuf[80];
+    int optlen;
+    int retval;
+    int result = TRUE;
+
+    optlen = sizeof(sockbuf);
+    RUBY_CRITICAL({
+	retval = getsockopt(fd, SOL_SOCKET, SO_TYPE, sockbuf, &optlen);
+	if (retval == SOCKET_ERROR) {
+	    int iRet;
+	    iRet = WSAGetLastError();
+	    if (iRet == WSAENOTSOCK || iRet == WSANOTINITIALISED)
+		result = FALSE;
+	}
+    });
+
+    //
+    // If we get here, then fd is actually a socket.
+    //
+
+    return result;
+}
+
+//
+// Since the errors returned by the socket error function 
+// WSAGetLastError() are not known by the library routine strerror
+// we have to roll our own.
+//
+
+#undef strerror
+
+char *
+rb_w32_strerror(int e)
+{
+    static char buffer[512];
+#if !defined __MINGW32__
+    extern int sys_nerr;
+#endif
+    DWORD source = 0;
+    char *p;
+
+#if defined __BORLANDC__ && defined ENOTEMPTY // _sys_errlist is broken
+    switch (e) {
+      case ENAMETOOLONG:
+	return "Filename too long";
+      case ENOTEMPTY:
+	return "Directory not empty";
+    }
+#endif
+
+    if (e < 0 || e > sys_nerr) {
+	if (e < 0)
+	    e = GetLastError();
+	if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM |
+			  FORMAT_MESSAGE_IGNORE_INSERTS, &source, e, 0,
+			  buffer, 512, NULL) == 0) {
+	    strcpy(buffer, "Unknown Error");
+	}
+    }
+    else {
+	strncpy(buffer, strerror(e), sizeof(buffer));
+	buffer[sizeof(buffer) - 1] = 0;
+    }
+
+    p = buffer;
+    while ((p = strpbrk(p, "\r\n")) != NULL) {
+	memmove(p, p + 1, strlen(p));
+    }
+    return buffer;
+}
+
+//
+// various stubs
+//
+
+
+// Ownership
+//
+// Just pretend that everyone is a superuser. NT will let us know if
+// we don't really have permission to do something.
+//
+
+#define ROOT_UID	0
+#define ROOT_GID	0
+
+rb_uid_t
+getuid(void)
+{
+	return ROOT_UID;
+}
+
+rb_uid_t
+geteuid(void)
+{
+	return ROOT_UID;
+}
+
+rb_gid_t
+getgid(void)
+{
+	return ROOT_GID;
+}
+
+rb_gid_t
+getegid(void)
+{
+    return ROOT_GID;
+}
+
+int
+setuid(rb_uid_t uid)
+{ 
+    return (uid == ROOT_UID ? 0 : -1);
+}
+
+int
+setgid(rb_gid_t gid)
+{
+    return (gid == ROOT_GID ? 0 : -1);
+}
+
+//
+// File system stuff
+//
+
+int
+/* ioctl(int i, unsigned int u, char *data) */
+#ifdef __BORLANDC__
+  ioctl(int i, int u, ...)
+#else
+  ioctl(int i, unsigned int u, long data)
+#endif
+{
+    errno = EINVAL;
+    return -1;
+}
+
+#undef FD_SET
+
+void
+rb_w32_fdset(int fd, fd_set *set)
+{
+    unsigned int i;
+    SOCKET s = TO_SOCKET(fd);
+
+    for (i = 0; i < set->fd_count; i++) {
+        if (set->fd_array[i] == s) {
+            return;
+        }
+    }
+    if (i == set->fd_count) {
+        if (set->fd_count < FD_SETSIZE) {
+            set->fd_array[i] = s;
+            set->fd_count++;
+        }
+    }
+}
+
+#undef FD_CLR
+
+void
+rb_w32_fdclr(int fd, fd_set *set)
+{
+    unsigned int i;
+    SOCKET s = TO_SOCKET(fd);
+
+    for (i = 0; i < set->fd_count; i++) {
+        if (set->fd_array[i] == s) {
+            while (i < set->fd_count - 1) {
+                set->fd_array[i] = set->fd_array[i + 1];
+                i++;
+            }
+            set->fd_count--;
+            break;
+        }
+    }
+}
+
+#undef FD_ISSET
+
+int
+rb_w32_fdisset(int fd, fd_set *set)
+{
+    int ret;
+    SOCKET s = TO_SOCKET(fd);
+    if (s == (SOCKET)INVALID_HANDLE_VALUE)
+        return 0;
+    RUBY_CRITICAL(ret = __WSAFDIsSet(s, set));
+    return ret;
+}
+
+//
+// Networking trampolines
+// These are used to avoid socket startup/shutdown overhead in case 
+// the socket routines aren't used.
+//
+
+#undef select
+
+static int NtSocketsInitialized = 0;
+
+static int
+extract_file_fd(fd_set *set, fd_set *fileset)
+{
+    int idx;
+
+    fileset->fd_count = 0;
+    if (!set)
+	return 0;
+    for (idx = 0; idx < set->fd_count; idx++) {
+	SOCKET fd = set->fd_array[idx];
+
+	if (!is_socket(fd)) {
+	    int i;
+
+	    for (i = 0; i < fileset->fd_count; i++) {
+		if (fileset->fd_array[i] == fd) {
+		    break;
+		}
+	    }
+	    if (i == fileset->fd_count) {
+		if (fileset->fd_count < FD_SETSIZE) {
+		    fileset->fd_array[i] = fd;
+		    fileset->fd_count++;
+		}
+	    }
+	}
+    }
+    return fileset->fd_count;
+}
+
+long 
+rb_w32_select (int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
+	       struct timeval *timeout)
+{
+    long r;
+    fd_set file_rd;
+    fd_set file_wr;
+#ifdef USE_INTERRUPT_WINSOCK
+    fd_set trap;
+#endif /* USE_INTERRUPT_WINSOCK */
+    int file_nfds;
+
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    r = 0;
+    if (rd && rd->fd_count > r) r = rd->fd_count;
+    if (wr && wr->fd_count > r) r = wr->fd_count;
+    if (ex && ex->fd_count > r) r = ex->fd_count;
+    if (nfds > r) nfds = r;
+    if (nfds == 0 && timeout) {
+	Sleep(timeout->tv_sec * 1000 + timeout->tv_usec / 1000);
+	return 0;
+    }
+    file_nfds = extract_file_fd(rd, &file_rd);
+    file_nfds += extract_file_fd(wr, &file_wr);
+    if (file_nfds)
+    {
+	// assume normal files are always readable/writable
+	// fake read/write fd_set and return value
+	if (rd) *rd = file_rd;
+	if (wr) *wr = file_wr;
+	return file_nfds;
+    }
+
+#if USE_INTERRUPT_WINSOCK
+    if (ex)
+	trap = *ex;
+    else
+	trap.fd_count = 0;
+    if (trap.fd_count < FD_SETSIZE)
+	trap.fd_array[trap.fd_count++] = (SOCKET)interrupted_event;
+    // else unable to catch interrupt.
+    ex = &trap;
+#endif /* USE_INTERRUPT_WINSOCK */
+
+    RUBY_CRITICAL({
+	r = select(nfds, rd, wr, ex, timeout);
+	if (r == SOCKET_ERROR) {
+	    errno = map_errno(WSAGetLastError());
+	}
+    });
+    return r;
+}
+
+static void
+StartSockets ()
+{
+    WORD version;
+    WSADATA retdata;
+    int ret;
+#ifndef USE_WINSOCK2
+    int iSockOpt;
+#endif
+
+    //
+    // initalize the winsock interface and insure that it's
+    // cleaned up at exit.
+    //
+#ifdef USE_WINSOCK2
+    version = MAKEWORD(2, 0);
+    if (WSAStartup(version, &retdata))
+	rb_fatal ("Unable to locate winsock library!\n");
+    if (LOBYTE(retdata.wVersion) != 2)
+	rb_fatal("could not find version 2 of winsock dll\n");
+#else
+    version = MAKEWORD(1, 1);
+    if (ret = WSAStartup(version, &retdata))
+	rb_fatal ("Unable to locate winsock library!\n");
+    if (LOBYTE(retdata.wVersion) != 1)
+	rb_fatal("could not find version 1 of winsock dll\n");
+
+    if (HIBYTE(retdata.wVersion) != 1)
+	rb_fatal("could not find version 1 of winsock dll\n");
+#endif	/* USE_WINSOCK2 */
+
+    fWinsock = TRUE;
+
+#ifndef USE_WINSOCK2
+# ifndef SO_SYNCHRONOUS_NONALERT
+#  define SO_SYNCHRONOUS_NONALERT 0x20
+# endif
+
+    iSockOpt = SO_SYNCHRONOUS_NONALERT;
+    /*
+     * Enable the use of sockets as filehandles
+     */
+# ifndef SO_OPENTYPE
+#  define SO_OPENTYPE     0x7008
+# endif
+
+    setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE,
+	       (char *)&iSockOpt, sizeof(iSockOpt));
+#endif	/* USE_WINSOCK2 */
+
+    main_thread.handle = GetCurrentThreadHandle();
+    main_thread.id = GetCurrentThreadId();
+
+    interrupted_event = CreateSignal();
+    if (!interrupted_event)
+	rb_fatal("Unable to create interrupt event!\n");
+    NtSocketsInitialized = 1;
+}
+
+#undef accept
+
+int
+rb_w32_accept(int s, struct sockaddr *addr, int *addrlen)
+{
+    SOCKET r;
+
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = accept(TO_SOCKET(s), addr, addrlen);
+	if (r == INVALID_SOCKET) {
+	    errno = map_errno(WSAGetLastError());
+	    s = -1;
+	}
+	else {
+	    s = rb_w32_open_osfhandle(r, O_RDWR|O_BINARY);
+	}
+    });
+    return s;
+}
+
+#undef bind
+
+int 
+rb_w32_bind(int s, struct sockaddr *addr, int addrlen)
+{
+    int r;
+
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = bind(TO_SOCKET(s), addr, addrlen);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef connect
+
+int 
+rb_w32_connect(int s, struct sockaddr *addr, int addrlen)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = connect(TO_SOCKET(s), addr, addrlen);
+	if (r == SOCKET_ERROR) {
+	    r = WSAGetLastError();
+	    if (r != WSAEWOULDBLOCK) {
+		errno = map_errno(r);
+	    }
+	    else {
+		errno = EINPROGRESS;
+		r = -1;
+	    }
+	}
+    });
+    return r;
+}
+
+
+#undef getpeername
+
+int 
+rb_w32_getpeername(int s, struct sockaddr *addr, int *addrlen)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = getpeername(TO_SOCKET(s), addr, addrlen);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef getsockname
+
+int 
+rb_w32_getsockname(int s, struct sockaddr *addr, int *addrlen)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = getsockname(TO_SOCKET(s), addr, addrlen);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+int 
+rb_w32_getsockopt(int s, int level, int optname, char *optval, int *optlen)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = getsockopt(TO_SOCKET(s), level, optname, optval, optlen);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef ioctlsocket
+
+int 
+rb_w32_ioctlsocket(int s, long cmd, u_long *argp)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = ioctlsocket(TO_SOCKET(s), cmd, argp);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef listen
+
+int 
+rb_w32_listen(int s, int backlog)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = listen(TO_SOCKET(s), backlog);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef recv
+
+int 
+rb_w32_recv(int s, char *buf, int len, int flags)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = recv(TO_SOCKET(s), buf, len, flags);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef recvfrom
+
+int 
+rb_w32_recvfrom(int s, char *buf, int len, int flags, 
+		struct sockaddr *from, int *fromlen)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = recvfrom(TO_SOCKET(s), buf, len, flags, from, fromlen);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef send
+
+int 
+rb_w32_send(int s, const char *buf, int len, int flags)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = send(TO_SOCKET(s), buf, len, flags);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef sendto
+
+int 
+rb_w32_sendto(int s, const char *buf, int len, int flags, 
+	      struct sockaddr *to, int tolen)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = sendto(TO_SOCKET(s), buf, len, flags, to, tolen);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef setsockopt
+
+int 
+rb_w32_setsockopt(int s, int level, int optname, char *optval, int optlen)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = setsockopt(TO_SOCKET(s), level, optname, optval, optlen);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+    
+#undef shutdown
+
+int 
+rb_w32_shutdown(int s, int how)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = shutdown(TO_SOCKET(s), how);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#ifdef USE_WINSOCK2
+static SOCKET
+open_ifs_socket(int af, int type, int protocol)
+{
+    unsigned long proto_buffers_len = 0;
+    int error_code;
+    SOCKET out = INVALID_SOCKET;
+
+    if (WSAEnumProtocols(NULL, NULL, &proto_buffers_len) == SOCKET_ERROR) {
+	error_code = WSAGetLastError();
+	if (error_code == WSAENOBUFS) {
+	    WSAPROTOCOL_INFO *proto_buffers;
+	    int protocols_available = 0;
+
+	    proto_buffers = (WSAPROTOCOL_INFO *)malloc(proto_buffers_len);
+	    if (!proto_buffers) {
+		WSASetLastError(WSA_NOT_ENOUGH_MEMORY);
+		return INVALID_SOCKET;
+	    }
+
+	    protocols_available =
+		WSAEnumProtocols(NULL, proto_buffers, &proto_buffers_len);
+	    if (protocols_available != SOCKET_ERROR) {
+		int i;
+		for (i = 0; i < protocols_available; i++) {
+		    if ((af != AF_UNSPEC && af != proto_buffers[i].iAddressFamily) ||
+			(type != proto_buffers[i].iSocketType) ||
+			(protocol != 0 && protocol != proto_buffers[i].iProtocol))
+			continue;
+
+		    if ((proto_buffers[i].dwServiceFlags1 & XP1_IFS_HANDLES) == 0)
+			continue;
+
+		    out = WSASocket(af, type, protocol, &(proto_buffers[i]), 0, 0);
+		    break;
+		}
+	    }
+
+	    free(proto_buffers);
+	}
+    }
+
+    return out;
+}
+#endif	/* USE_WINSOCK2 */
+
+#undef socket
+#ifdef USE_WINSOCK2
+#define open_socket(a, t, p)	open_ifs_socket(a, t, p)
+#else
+#define open_socket(a, t, p)	socket(a, t, p)
+#endif
+
+int 
+rb_w32_socket(int af, int type, int protocol)
+{
+    SOCKET s;
+    int fd;
+
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	s = open_socket(af, type, protocol);
+	if (s == INVALID_SOCKET) {
+	    errno = map_errno(WSAGetLastError());
+	    fd = -1;
+	}
+	else {
+	    fd = rb_w32_open_osfhandle(s, O_RDWR|O_BINARY);
+	}
+    });
+    return fd;
+}
+
+#undef gethostbyaddr
+
+struct hostent *
+rb_w32_gethostbyaddr (char *addr, int len, int type)
+{
+    struct hostent *r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = gethostbyaddr(addr, len, type);
+	if (r == NULL)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef gethostbyname
+
+struct hostent *
+rb_w32_gethostbyname (char *name)
+{
+    struct hostent *r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = gethostbyname(name);
+	if (r == NULL)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef gethostname
+
+int
+rb_w32_gethostname (char *name, int len)
+{
+    int r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = gethostname(name, len);
+	if (r == SOCKET_ERROR)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef getprotobyname
+
+struct protoent *
+rb_w32_getprotobyname (char *name)
+{
+    struct protoent *r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = getprotobyname(name);
+	if (r == NULL)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef getprotobynumber
+
+struct protoent *
+rb_w32_getprotobynumber (int num)
+{
+    struct protoent *r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = getprotobynumber(num);
+	if (r == NULL)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef getservbyname
+
+struct servent *
+rb_w32_getservbyname (char *name, char *proto)
+{
+    struct servent *r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = getservbyname(name, proto);
+	if (r == NULL)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+#undef getservbyport
+
+struct servent *
+rb_w32_getservbyport (int port, char *proto)
+{
+    struct servent *r;
+    if (!NtSocketsInitialized) {
+	StartSockets();
+    }
+    RUBY_CRITICAL({
+	r = getservbyport(port, proto);
+	if (r == NULL)
+	    errno = map_errno(WSAGetLastError());
+    });
+    return r;
+}
+
+//
+// Networking stubs
+//
+
+void endhostent() {}
+void endnetent() {}
+void endprotoent() {}
+void endservent() {}
+
+struct netent *getnetent (void) {return (struct netent *) NULL;}
+
+struct netent *getnetbyaddr(long net, int type) {return (struct netent *)NULL;}
+
+struct netent *getnetbyname(char *name) {return (struct netent *)NULL;}
+
+struct protoent *getprotoent (void) {return (struct protoent *) NULL;}
+
+struct servent *getservent (void) {return (struct servent *) NULL;}
+
+void sethostent (int stayopen) {}
+
+void setnetent (int stayopen) {}
+
+void setprotoent (int stayopen) {}
+
+void setservent (int stayopen) {}
+
+int
+fcntl(int fd, int cmd, ...)
+{
+    SOCKET sock = TO_SOCKET(fd);
+    va_list va;
+    int arg;
+    int ret;
+    u_long ioctlArg;
+
+    if (!is_socket(sock)) {
+	errno = EBADF;
+	return -1;
+    }
+    if (cmd != F_SETFL) {
+	errno = EINVAL;
+	return -1;
+    }
+
+    va_start(va, cmd);
+    arg = va_arg(va, int);
+    va_end(va);
+    if (arg & O_NONBLOCK) {
+	ioctlArg = 1;
+    }
+    else {
+	ioctlArg = 0;
+    }
+    RUBY_CRITICAL({
+	ret = ioctlsocket(sock, FIONBIO, &ioctlArg);
+	if (ret == -1) {
+	    errno = map_errno(WSAGetLastError());
+	}
+    });
+
+    return ret;
+}
+
+#ifndef WNOHANG
+#define WNOHANG -1
+#endif
+
+static rb_pid_t
+poll_child_status(struct ChildRecord *child, int *stat_loc)
+{
+    DWORD exitcode;
+    DWORD err;
+
+    if (!GetExitCodeProcess(child->hProcess, &exitcode)) {
+	/* If an error occured, return immediatly. */
+	err = GetLastError();
+	if (err == ERROR_INVALID_PARAMETER)
+	    errno = ECHILD;
+	else
+	    errno = map_errno(GetLastError());
+	CloseChildHandle(child);
+	return -1;
+    }
+    if (exitcode != STILL_ACTIVE) {
+	/* If already died, return immediatly. */
+	rb_pid_t pid = child->pid;
+	CloseChildHandle(child);
+	if (stat_loc) *stat_loc = exitcode << 8;
+	return pid;
+    }
+    return 0;
+}
+
+rb_pid_t
+waitpid(rb_pid_t pid, int *stat_loc, int options)
+{
+    DWORD timeout;
+
+    if (options == WNOHANG) {
+	timeout = 0;
+    } else {
+	timeout = INFINITE;
+    }
+
+    if (pid == -1) {
+	int count = 0;
+	DWORD ret;
+	HANDLE events[MAXCHILDNUM + 1];
+
+	FOREACH_CHILD(child) {
+	    if (!child->pid || child->pid < 0) continue;
+	    if ((pid = poll_child_status(child, stat_loc))) return pid;
+	    events[count++] = child->hProcess;
+	} END_FOREACH_CHILD;
+	if (!count) {
+	    errno = ECHILD;
+	    return -1;
+	}
+	events[count] = interrupted_event;
+
+	ret = WaitForMultipleEvents(count + 1, events, FALSE, timeout, TRUE);
+	if (ret == WAIT_TIMEOUT) return 0;
+	if ((ret -= WAIT_OBJECT_0) == count) {
+	    ResetSignal(interrupted_event);
+	    errno = EINTR;
+	    return -1;
+	}
+	if (ret > count) {
+	    errno = map_errno(GetLastError());
+	    return -1;
+	}
+
+	return poll_child_status(ChildRecord + ret, stat_loc);
+    }
+    else {
+	struct ChildRecord* child = FindChildSlot(pid);
+	if (!child) {
+	    errno = ECHILD;
+	    return -1;
+	}
+
+	while (!(pid = poll_child_status(child, stat_loc))) {
+	    /* wait... */
+	    if (wait_events(child->hProcess, timeout) != WAIT_OBJECT_0) {
+		/* still active */
+		pid = 0;
+		break;
+	    }
+	}
+    }
+
+    return pid;
+}
+
+#include <sys/timeb.h>
+
+int _cdecl
+gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+    SYSTEMTIME st;
+    time_t t;
+    struct tm tm;
+
+    GetLocalTime(&st);
+    tm.tm_sec = st.wSecond;
+    tm.tm_min = st.wMinute;
+    tm.tm_hour = st.wHour;
+    tm.tm_mday = st.wDay;
+    tm.tm_mon = st.wMonth - 1;
+    tm.tm_year = st.wYear - 1900;
+    tm.tm_isdst = -1;
+    t = mktime(&tm);
+    tv->tv_sec = t;
+    tv->tv_usec = st.wMilliseconds * 1000;
+
+    return 0;
+}
+
+char *
+rb_w32_getcwd(char *buffer, int size)
+{
+    char *p = buffer;
+    char *bp;
+    int len;
+
+    len = GetCurrentDirectory(0, NULL);
+    if (!len) {
+	errno = map_errno(GetLastError());
+	return NULL;
+    }
+
+    if (p) {
+	if (size < len) {
+	    errno = ERANGE;
+	    return NULL;
+	}
+    }
+    else {
+	p = malloc(len);
+	size = len;
+	if (!p) {
+	    errno = ENOMEM;
+	    return NULL;
+	}
+    }
+
+    if (!GetCurrentDirectory(size, p)) {
+	errno = map_errno(GetLastError());
+	if (!buffer)
+	    free(p);
+	return NULL;
+    }
+
+    for (bp = p; *bp != '\0'; bp = CharNext(bp)) {
+	if (*bp == '\\') {
+	    *bp = '/';
+	}
+    }
+
+    return p;
+}
+
+int
+chown(const char *path, int owner, int group)
+{
+	return 0;
+}
+
+int
+kill(int pid, int sig)
+{
+    int ret = 0;
+    DWORD err;
+
+    if (pid <= 0) {
+	errno = EINVAL;
+	return -1;
+    }
+
+    if (IsWin95()) pid = -pid;
+    if ((unsigned int)pid == GetCurrentProcessId() &&
+	(sig != 0 && sig != SIGKILL)) {
+	if ((ret = raise(sig)) != 0) {
+	    /* MSVCRT doesn't set errno... */
+	    errno = EINVAL;
+	}
+	return ret;
+    }
+
+    switch (sig) {
+      case 0:
+	RUBY_CRITICAL({
+	    HANDLE hProc =
+		OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, (DWORD)pid);
+	    if (hProc == NULL || hProc == INVALID_HANDLE_VALUE) {
+		if (GetLastError() == ERROR_INVALID_PARAMETER) {
+		    errno = ESRCH;
+		}
+		else {
+		    errno = EPERM;
+		}
+		ret = -1;
+	    }
+	    else {
+		CloseHandle(hProc);
+	    }
+	});
+	break;
+
+      case SIGINT:
+	RUBY_CRITICAL({
+	    if (!GenerateConsoleCtrlEvent(CTRL_C_EVENT, (DWORD)pid)) {
+		if ((err = GetLastError()) == 0)
+		    errno = EPERM;
+		else
+		    errno = map_errno(GetLastError());
+		ret = -1;
+	    }
+	});
+	break;
+
+      case SIGKILL:
+	RUBY_CRITICAL({
+	    HANDLE hProc = OpenProcess(PROCESS_TERMINATE, FALSE, (DWORD)pid);
+	    if (hProc == NULL || hProc == INVALID_HANDLE_VALUE) {
+		if (GetLastError() == ERROR_INVALID_PARAMETER) {
+		    errno = ESRCH;
+		}
+		else {
+		    errno = EPERM;
+		}
+		ret = -1;
+	    }
+	    else {
+		if (!TerminateProcess(hProc, 0)) {
+		    errno = EPERM;
+		    ret = -1;
+		}
+		CloseHandle(hProc);
+	    }
+	});
+	break;
+
+      default:
+	errno = EINVAL;
+	ret = -1;
+	break;
+    }
+
+    return ret;
+}
+
+int
+link(char *from, char *to)
+{
+    static BOOL (WINAPI *pCreateHardLink)(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES) = NULL;
+    static int myerrno = 0;
+
+    if (!pCreateHardLink && !myerrno) {
+	HANDLE hKernel;
+
+	hKernel = GetModuleHandle("kernel32.dll");
+	if (hKernel) {
+	    pCreateHardLink = (BOOL (WINAPI *)(LPCTSTR, LPCTSTR, LPSECURITY_ATTRIBUTES))GetProcAddress(hKernel, "CreateHardLinkA");
+	    if (!pCreateHardLink) {
+		myerrno = map_errno(GetLastError());
+	    }
+	    CloseHandle(hKernel);
+	}
+	else {
+	    myerrno = map_errno(GetLastError());
+	}
+    }
+    if (!pCreateHardLink) {
+	errno = myerrno;
+	return -1;
+    }
+
+    if (!pCreateHardLink(to, from, NULL)) {
+	errno = map_errno(GetLastError());
+	return -1;
+    }
+
+    return 0;
+}
+
+int
+wait()
+{
+	return 0;
+}
+
+char *
+rb_w32_getenv(const char *name)
+{
+    int len = strlen(name);
+    char *env;
+
+    if (envarea)
+	FreeEnvironmentStrings(envarea);
+    envarea = GetEnvironmentStrings();
+    if (!envarea) {
+	map_errno(GetLastError());
+	return NULL;
+    }
+
+    for (env = envarea; *env; env += strlen(env) + 1)
+	if (strncasecmp(env, name, len) == 0 && *(env + len) == '=')
+	    return env + len + 1;
+
+    return NULL;
+}
+
+int
+rb_w32_rename(const char *oldpath, const char *newpath)
+{
+    int res = 0;
+    int oldatts;
+    int newatts;
+
+    oldatts = GetFileAttributes(oldpath);
+    newatts = GetFileAttributes(newpath);
+
+    if (oldatts == -1) {
+	errno = map_errno(GetLastError());
+	return -1;
+    }
+
+    RUBY_CRITICAL({
+	if (newatts != -1 && newatts & FILE_ATTRIBUTE_READONLY)
+	    SetFileAttributesA(newpath, newatts & ~ FILE_ATTRIBUTE_READONLY);
+
+	if (!MoveFile(oldpath, newpath))
+	    res = -1;
+
+	if (res) {
+	    switch (GetLastError()) {
+	      case ERROR_ALREADY_EXISTS:
+	      case ERROR_FILE_EXISTS:
+		if (IsWinNT()) {
+		    if (MoveFileEx(oldpath, newpath, MOVEFILE_REPLACE_EXISTING))
+			res = 0;
+		} else {
+		    for (;;) {
+			if (!DeleteFile(newpath) && GetLastError() != ERROR_FILE_NOT_FOUND)
+			    break;
+			else if (MoveFile(oldpath, newpath)) {
+			    res = 0;
+			    break;
+			}
+		    }
+		}
+	    }
+	}
+
+	if (res)
+	    errno = map_errno(GetLastError());
+	else
+	    SetFileAttributes(newpath, oldatts);
+    });
+
+    return res;
+}
+
+static int
+isUNCRoot(const char *path)
+{
+    if (path[0] == '\\' && path[1] == '\\') {
+	const char *p;
+	for (p = path + 2; *p; p = CharNext(p)) {
+	    if (*p == '\\')
+		break;
+	}
+	if (p[0] && p[1]) {
+	    for (p++; *p; p = CharNext(p)) {
+		if (*p == '\\')
+		    break;
+	    }
+	    if (!p[0] || !p[1] || (p[1] == '.' && !p[2]))
+		return 1;
+	}
+    }
+    return 0;
+}
+
+static time_t
+filetime_to_unixtime(const FILETIME *ft)
+{
+    FILETIME loc;
+    SYSTEMTIME st;
+    struct tm tm;
+    time_t t;
+
+    if (!FileTimeToLocalFileTime(ft, &loc)) {
+	return 0;
+    }
+    if (!FileTimeToSystemTime(&loc, &st)) {
+	return 0;
+    }
+    memset(&tm, 0, sizeof(tm));
+    tm.tm_year = st.wYear - 1900;
+    tm.tm_mon = st.wMonth - 1;
+    tm.tm_mday = st.wDay;
+    tm.tm_hour = st.wHour;
+    tm.tm_min = st.wMinute;
+    tm.tm_sec = st.wSecond;
+    tm.tm_isdst = -1;
+    t = mktime(&tm);
+    return t == -1 ? 0 : t;
+}
+
+static unsigned
+fileattr_to_unixmode(DWORD attr, const char *path)
+{
+    unsigned mode = 0;
+
+    if (attr & FILE_ATTRIBUTE_READONLY) {
+	mode |= S_IREAD;
+    }
+    else {
+	mode |= S_IREAD | S_IWRITE | S_IWUSR;
+    }
+
+    if (attr & FILE_ATTRIBUTE_DIRECTORY) {
+	mode |= S_IFDIR | S_IEXEC;
+    }
+    else {
+	mode |= S_IFREG;
+    }
+
+    if (path && (mode & S_IFREG)) {
+	const char *end = path + strlen(path);
+	while (path < end) {
+	    end = CharPrev(path, end);
+	    if (*end == '.') {
+		if ((strcmpi(end, ".bat") == 0) ||
+		    (strcmpi(end, ".cmd") == 0) ||
+		    (strcmpi(end, ".com") == 0) ||
+		    (strcmpi(end, ".exe") == 0)) {
+		    mode |= S_IEXEC;
+		}
+		break;
+	    }
+	}
+    }
+
+    mode |= (mode & 0700) >> 3;
+    mode |= (mode & 0700) >> 6;
+
+    return mode;
+}
+
+static int
+winnt_stat(const char *path, struct stat *st)
+{
+    HANDLE h;
+    WIN32_FIND_DATA wfd;
+
+    memset(st, 0, sizeof(struct stat));
+    st->st_nlink = 1;
+
+    if (_mbspbrk(path, "?*")) {
+	errno = ENOENT;
+	return -1;
+    }
+    h = FindFirstFile(path, &wfd);
+    if (h != INVALID_HANDLE_VALUE) {
+	FindClose(h);
+	st->st_mode  = fileattr_to_unixmode(wfd.dwFileAttributes, path);
+	st->st_atime = filetime_to_unixtime(&wfd.ftLastAccessTime);
+	st->st_mtime = filetime_to_unixtime(&wfd.ftLastWriteTime);
+	st->st_ctime = filetime_to_unixtime(&wfd.ftCreationTime);
+	st->st_size  = wfd.nFileSizeLow; /* TODO: 64bit support */
+    }
+    else {
+	// If runtime stat(2) is called for network shares, it fails on WinNT.
+	// Because GetDriveType returns 1 for network shares. (Win98 returns 4)
+	DWORD attr = GetFileAttributes(path);
+	if (attr == -1) {
+	    errno = map_errno(GetLastError());
+	    return -1;
+	}
+	st->st_mode  = fileattr_to_unixmode(attr, path);
+    }
+
+    st->st_dev = st->st_rdev = (isalpha(path[0]) && path[1] == ':') ?
+	toupper(path[0]) - 'A' : _getdrive() - 1;
+
+    return 0;
+}
+
+int
+rb_w32_stat(const char *path, struct stat *st)
+{
+    const char *p;
+    char *buf1, *s, *end;
+    int len;
+    int ret;
+
+    if (!path || !st) {
+	errno = EFAULT;
+	return -1;
+    }
+    buf1 = ALLOCA_N(char, strlen(path) + 2);
+    for (p = path, s = buf1; *p; p++, s++) {
+	if (*p == '/')
+	    *s = '\\';
+	else
+	    *s = *p;
+    }
+    *s = '\0';
+    len = s - buf1;
+    if (!len || '\"' == *(--s)) {
+	errno = ENOENT;
+	return -1;
+    }
+    end = CharPrev(buf1, buf1 + len);
+
+    if (isUNCRoot(buf1)) {
+	if (*end == '.')
+	    *end = '\0';
+	else if (*end != '\\')
+	    strcat(buf1, "\\");
+    } else if (*end == '\\' || (buf1 + 1 == end && *end == ':'))
+	strcat(buf1, ".");
+
+    ret = IsWinNT() ? winnt_stat(buf1, st) : stat(buf1, st);
+    if (ret == 0) {
+	st->st_mode &= ~(S_IWGRP | S_IWOTH);
+    }
+    return ret;
+}
+
+static long
+filetime_to_clock(FILETIME *ft)
+{
+    __int64 qw = ft->dwHighDateTime;
+    qw <<= 32;
+    qw |= ft->dwLowDateTime;
+    qw /= 10000;  /* File time ticks at 0.1uS, clock at 1mS */
+    return (long) qw;
+}
+
+int
+rb_w32_times(struct tms *tmbuf)
+{
+    FILETIME create, exit, kernel, user;
+
+    if (GetProcessTimes(GetCurrentProcess(),&create, &exit, &kernel, &user)) {
+	tmbuf->tms_utime = filetime_to_clock(&user);
+	tmbuf->tms_stime = filetime_to_clock(&kernel);
+	tmbuf->tms_cutime = 0;
+	tmbuf->tms_cstime = 0;
+    }
+    else {
+	tmbuf->tms_utime = clock();
+	tmbuf->tms_stime = 0;
+	tmbuf->tms_cutime = 0;
+	tmbuf->tms_cstime = 0;
+    }
+    return 0;
+}
+
+#undef Sleep
+#define yield_once() Sleep(0)
+#define yield_until(condition) do yield_once(); while (!(condition))
+
+static DWORD
+wait_events(HANDLE event, DWORD timeout)
+{
+    HANDLE events[2];
+    int count = 0;
+    DWORD ret;
+
+    if (event) {
+	events[count++] = event;
+    }
+    events[count++] = interrupted_event;
+
+    ret = WaitForMultipleEvents(count, events, FALSE, timeout, TRUE);
+
+    if (ret == WAIT_OBJECT_0 + count - 1) {
+	ResetSignal(interrupted_event);
+	errno = EINTR;
+    }
+
+    return ret;
+}
+
+static CRITICAL_SECTION *
+system_state(void)
+{
+    static int initialized = 0;
+    static CRITICAL_SECTION syssect;
+
+    if (!initialized) {
+	InitializeCriticalSection(&syssect);
+	initialized = 1;
+    }
+    return &syssect;
+}
+
+static LONG flag_interrupt = -1;
+static volatile DWORD tlsi_interrupt = TLS_OUT_OF_INDEXES;
+
+void
+rb_w32_enter_critical(void)
+{
+    if (IsWinNT()) {
+	EnterCriticalSection(system_state());
+	return;
+    }
+
+    if (tlsi_interrupt == TLS_OUT_OF_INDEXES) {
+	tlsi_interrupt = TlsAlloc();
+    }
+
+    {
+	DWORD ti = (DWORD)TlsGetValue(tlsi_interrupt);
+	while (InterlockedIncrement(&flag_interrupt) > 0 && !ti) {
+	    InterlockedDecrement(&flag_interrupt);
+	    Sleep(1);
+	}
+	TlsSetValue(tlsi_interrupt, (PVOID)++ti);
+    }
+}
+
+void
+rb_w32_leave_critical(void)
+{
+    if (IsWinNT()) {
+	LeaveCriticalSection(system_state());
+	return;
+    }
+
+    InterlockedDecrement(&flag_interrupt);
+    TlsSetValue(tlsi_interrupt, (PVOID)((DWORD)TlsGetValue(tlsi_interrupt) - 1));
+}
+
+struct handler_arg_t {
+    void (*handler)(int);
+    int arg;
+    int status;
+    int finished;
+    HANDLE handshake;
+};
+
+static void
+rb_w32_call_handler(struct handler_arg_t* h)
+{
+    int status;
+    RUBY_CRITICAL(rb_protect((VALUE (*)(VALUE))h->handler, (VALUE)h->arg, &h->status);
+		  status = h->status;
+		  SetEvent(h->handshake));
+    if (status) {
+	rb_jump_tag(status);
+    }
+    h->finished = 1;
+    yield_until(0);
+}
+
+static struct handler_arg_t *
+setup_handler(struct handler_arg_t *harg, int arg, void (*handler)(int),
+	      HANDLE handshake)
+{
+    harg->handler = handler;
+    harg->arg = arg;
+    harg->status = 0;
+    harg->finished = 0;
+    harg->handshake = handshake;
+    return harg;
+}
+
+static void
+setup_call(CONTEXT* ctx, struct handler_arg_t *harg)
+{
+#ifdef _M_IX86
+    DWORD *esp = (DWORD *)ctx->Esp;
+    *--esp = (DWORD)harg;
+    *--esp = ctx->Eip;
+    ctx->Esp = (DWORD)esp;
+    ctx->Eip = (DWORD)rb_w32_call_handler;
+#else
+#ifndef _WIN32_WCE
+#error unsupported processor
+#endif
+#endif
+}
+
+void
+rb_w32_interrupted(void)
+{
+    SetSignal(interrupted_event);
+}
+
+int
+rb_w32_main_context(int arg, void (*handler)(int))
+{
+    static HANDLE interrupt_done = NULL;
+    struct handler_arg_t harg;
+    CONTEXT ctx_orig;
+    HANDLE current_thread = GetCurrentThread();
+    int old_priority = GetThreadPriority(current_thread);
+
+    if (GetCurrentThreadId() == main_thread.id) return FALSE;
+
+    rb_w32_interrupted();
+
+    RUBY_CRITICAL({		/* the main thread must be in user state */
+	CONTEXT ctx;
+
+	SuspendThread(main_thread.handle);
+	SetThreadPriority(current_thread, GetThreadPriority(main_thread.handle));
+
+	ZeroMemory(&ctx, sizeof(CONTEXT));
+	ctx.ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT;
+	GetThreadContext(main_thread.handle, &ctx);
+	ctx_orig = ctx;
+
+	/* handler context setup */
+	if (!interrupt_done) {
+	    interrupt_done = CreateEvent(NULL, FALSE, FALSE, NULL);
+	    /* anonymous one-shot event */
+	}
+	else {
+	    ResetEvent(interrupt_done);
+	}
+	setup_call(&ctx, setup_handler(&harg, arg, handler, interrupt_done));
+
+	ctx.ContextFlags = CONTEXT_CONTROL;
+	SetThreadContext(main_thread.handle, &ctx);
+	ResumeThread(main_thread.handle);
+    });
+
+    /* give a chance to the main thread */
+    yield_once();
+    WaitForSingleObject(interrupt_done, INFINITE); /* handshaking */
+
+    if (!harg.status) {
+	/* no exceptions raised, restore old context. */
+	RUBY_CRITICAL({
+	    /* ensure the main thread is in user state. */
+	    yield_until(harg.finished);
+
+	    SuspendThread(main_thread.handle);
+	    ctx_orig.ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT;
+	    SetThreadContext(main_thread.handle, &ctx_orig);
+	    ResumeThread(main_thread.handle);
+	});
+    }
+    /* otherwise leave the main thread raised */
+
+    SetThreadPriority(current_thread, old_priority);
+
+    return TRUE;
+}
+
+int
+rb_w32_sleep(unsigned long msec)
+{
+    DWORD ret;
+    RUBY_CRITICAL(ret = wait_events(NULL, msec));
+    yield_once();
+    CHECK_INTS;
+    return ret != WAIT_TIMEOUT;
+}
+
+static void
+catch_interrupt(void)
+{
+    yield_once();
+    RUBY_CRITICAL(wait_events(NULL, 0));
+    CHECK_INTS;
+}
+
+#undef fgetc
+int
+rb_w32_getc(FILE* stream)
+{
+    int c, trap_immediate = rb_trap_immediate;
+#ifndef _WIN32_WCE
+    if (enough_to_get(stream->FILE_COUNT)) {
+	c = (unsigned char)*stream->FILE_READPTR++;
+	rb_trap_immediate = trap_immediate;
+    }
+    else 
+#endif
+    {
+	c = _filbuf(stream);
+#if defined __BORLANDC__ || defined _WIN32_WCE
+        if ((c == EOF) && (errno == EPIPE)) {
+	    clearerr(stream);
+        }
+#endif
+	rb_trap_immediate = trap_immediate;
+	catch_interrupt();
+    }
+    return c;
+}
+
+#undef fputc
+int
+rb_w32_putc(int c, FILE* stream)
+{
+    int trap_immediate = rb_trap_immediate;
+#ifndef _WIN32_WCE
+    if (enough_to_put(stream->FILE_COUNT)) {
+	c = (unsigned char)(*stream->FILE_READPTR++ = (char)c);
+	rb_trap_immediate = trap_immediate;
+    }
+    else 
+#endif
+    {
+	c = _flsbuf(c, stream);
+	rb_trap_immediate = trap_immediate;
+	catch_interrupt();
+    }
+    return c;
+}
+
+struct asynchronous_arg_t {
+    /* output field */
+    void* stackaddr;
+    int errnum;
+
+    /* input field */
+    VALUE (*func)(VALUE self, int argc, VALUE* argv);
+    VALUE self;
+    int argc;
+    VALUE* argv;
+};
+
+static DWORD WINAPI
+call_asynchronous(PVOID argp)
+{
+    DWORD ret;
+    struct asynchronous_arg_t *arg = argp;
+    arg->stackaddr = &argp;
+    ret = (DWORD)arg->func(arg->self, arg->argc, arg->argv);
+    arg->errnum = errno;
+    return ret;
+}
+
+VALUE
+rb_w32_asynchronize(asynchronous_func_t func, VALUE self,
+		    int argc, VALUE* argv, VALUE intrval)
+{
+    DWORD val;
+    BOOL interrupted = FALSE;
+    HANDLE thr;
+
+    RUBY_CRITICAL({
+	struct asynchronous_arg_t arg;
+
+	arg.stackaddr = NULL;
+	arg.errnum = 0;
+	arg.func = func;
+	arg.self = self;
+	arg.argc = argc;
+	arg.argv = argv;
+
+	thr = CreateThread(NULL, 0, call_asynchronous, &arg, 0, &val);
+
+	if (thr) {
+	    yield_until(arg.stackaddr);
+
+	    if (wait_events(thr, INFINITE) != WAIT_OBJECT_0) {
+		interrupted = TRUE;
+
+		if (TerminateThread(thr, intrval)) {
+		    yield_once();
+		}
+	    }
+
+	    GetExitCodeThread(thr, &val);
+	    CloseHandle(thr);
+
+	    if (interrupted) {
+		/* must release stack of killed thread, why doesn't Windows? */
+		MEMORY_BASIC_INFORMATION m;
+
+		memset(&m, 0, sizeof(m));
+		if (!VirtualQuery(arg.stackaddr, &m, sizeof(m))) {
+		    Debug(fprintf(stderr, "couldn't get stack base:%p:%d\n",
+				  arg.stackaddr, GetLastError()));
+		}
+		else if (!VirtualFree(m.AllocationBase, 0, MEM_RELEASE)) {
+		    Debug(fprintf(stderr, "couldn't release stack:%p:%d\n",
+				  m.AllocationBase, GetLastError()));
+		}
+		errno = EINTR;
+	    }
+	    else {
+		errno = arg.errnum;
+	    }
+	}
+    });
+
+    if (!thr) {
+	rb_fatal("failed to launch waiter thread:%d", GetLastError());
+    }
+
+    if (interrupted) {
+	CHECK_INTS;
+    }
+
+    return val;
+}
+
+char **
+rb_w32_get_environ(void)
+{
+    char *envtop, *env;
+    char **myenvtop, **myenv;
+    int num;
+
+    /*
+     * We avoid values started with `='. If you want to deal those values,
+     * change this function, and some functions in hash.c which recognize
+     * `=' as delimiter or rb_w32_getenv() and ruby_setenv().
+     * CygWin deals these values by changing first `=' to '!'. But we don't
+     * use such trick and follow cmd.exe's way that just doesn't show these
+     * values.
+     * (U.N. 2001-11-15)
+     */
+    envtop = GetEnvironmentStrings();
+    for (env = envtop, num = 0; *env; env += strlen(env) + 1)
+	if (*env != '=') num++;
+
+    myenvtop = (char **)malloc(sizeof(char *) * (num + 1));
+    for (env = envtop, myenv = myenvtop; *env; env += strlen(env) + 1) {
+	if (*env != '=') {
+	    if (!(*myenv = (char *)malloc(strlen(env) + 1))) {
+		break;
+	    }
+	    strcpy(*myenv, env);
+	    myenv++;
+	}
+    }
+    *myenv = NULL;
+    FreeEnvironmentStrings(envtop);
+
+    return myenvtop;
+}
+
+void
+rb_w32_free_environ(char **env)
+{
+    char **t = env;
+
+    while (*t) free(*t++);
+    free(env);
+}
+
+#undef getpid
+rb_pid_t
+rb_w32_getpid(void)
+{
+    rb_pid_t pid;
+
+    pid = getpid();
+
+    if (IsWin95()) pid = -pid;
+
+    return pid;
+}
+
+int
+rb_w32_fclose(FILE *fp)
+{
+    int fd = fileno(fp);
+    SOCKET sock = TO_SOCKET(fd);
+    int save_errno = errno;
+
+    if (fflush(fp)) return -1;
+    if (!is_socket(sock)) {
+	UnlockFile((HANDLE)sock, 0, 0, LK_LEN, LK_LEN);
+	return fclose(fp);
+    }
+    _set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE);
+    fclose(fp);
+    errno = save_errno;
+    if (closesocket(sock) == SOCKET_ERROR) {
+	errno = map_errno(WSAGetLastError());
+	return -1;
+    }
+    return 0;
+}
+
+int
+rb_w32_close(int fd)
+{
+    SOCKET sock = TO_SOCKET(fd);
+    int save_errno = errno;
+
+    if (!is_socket(sock)) {
+	UnlockFile((HANDLE)sock, 0, 0, LK_LEN, LK_LEN);
+	return _close(fd);
+    }
+    _set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE);
+    _close(fd);
+    errno = save_errno;
+    if (closesocket(sock) == SOCKET_ERROR) {
+	errno = map_errno(WSAGetLastError());
+	return -1;
+    }
+    return 0;
+}
+
+#undef read
+size_t
+rb_w32_read(int fd, void *buf, size_t size)
+{
+    SOCKET sock = TO_SOCKET(fd);
+
+    if (!is_socket(sock))
+	return read(fd, buf, size);
+    else
+	return rb_w32_recv(fd, buf, size, 0);
+}
+
+#undef write
+size_t
+rb_w32_write(int fd, const void *buf, size_t size)
+{
+    SOCKET sock = TO_SOCKET(fd);
+
+    if (!is_socket(sock))
+	return write(fd, buf, size);
+    else
+	return rb_w32_send(fd, buf, size, 0);
+}
+
+static int
+unixtime_to_filetime(time_t time, FILETIME *ft)
+{
+    struct tm *tm;
+    SYSTEMTIME st;
+    FILETIME lt;
+
+    tm = localtime(&time);
+    st.wYear = tm->tm_year + 1900;
+    st.wMonth = tm->tm_mon + 1;
+    st.wDayOfWeek = tm->tm_wday;
+    st.wDay = tm->tm_mday;
+    st.wHour = tm->tm_hour;
+    st.wMinute = tm->tm_min;
+    st.wSecond = tm->tm_sec;
+    st.wMilliseconds = 0;
+    if (!SystemTimeToFileTime(&st, &lt) ||
+	!LocalFileTimeToFileTime(&lt, ft)) {
+	errno = map_errno(GetLastError());
+	return -1;
+    }
+    return 0;
+}
+
+int
+rb_w32_utime(const char *path, struct utimbuf *times)
+{
+    HANDLE hFile;
+    SYSTEMTIME st;
+    FILETIME atime, mtime;
+    struct tm *tm;
+    struct stat stat;
+    int ret = 0;
+
+    if (rb_w32_stat(path, &stat)) {
+	return -1;
+    }
+
+    if (times) {
+	if (unixtime_to_filetime(times->actime, &atime)) {
+	    return -1;
+	}
+	if (unixtime_to_filetime(times->modtime, &mtime)) {
+	    return -1;
+	}
+    }
+    else {
+	GetSystemTimeAsFileTime(&atime);
+	mtime = atime;
+    }
+
+    RUBY_CRITICAL({
+	const DWORD attr = GetFileAttributes(path);
+	if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY))
+	    SetFileAttributes(path, attr & ~FILE_ATTRIBUTE_READONLY);
+	hFile = CreateFile(path, GENERIC_WRITE, 0, 0, OPEN_EXISTING,
+			   IsWin95() ? 0 : FILE_FLAG_BACKUP_SEMANTICS, 0);
+	if (hFile == INVALID_HANDLE_VALUE) {
+	    errno = map_errno(GetLastError());
+	    ret = -1;
+	}
+	else {
+	    if (!SetFileTime(hFile, NULL, &atime, &mtime)) {
+		errno = map_errno(GetLastError());
+		ret = -1;
+	    }
+	    CloseHandle(hFile);
+	}
+	if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY))
+	    SetFileAttributes(path, attr);
+    });
+
+    return ret;
+}
+
+int
+rb_w32_vsnprintf(char *buf, size_t size, const char *format, va_list va)
+{
+    int ret = _vsnprintf(buf, size, format, va);
+    if (size > 0) buf[size - 1] = 0;
+    return ret;
+}
+
+int
+rb_w32_snprintf(char *buf, size_t size, const char *format, ...)
+{
+    int ret;
+    va_list va;
+
+    va_start(va, format);
+    ret = vsnprintf(buf, size, format, va);
+    va_end(va);
+    return ret;
+}
+
+int
+rb_w32_mkdir(const char *path, int mode)
+{
+    int ret = -1;
+    RUBY_CRITICAL(do {
+	if (CreateDirectory(path, NULL) == FALSE) {
+	    errno = map_errno(GetLastError());
+	    break;
+	}
+	if (chmod(path, mode) == -1) {
+	    RemoveDirectory(path);
+	    break;
+	}
+	ret = 0;
+    } while (0));
+    return ret;
+}
+
+int
+rb_w32_rmdir(const char *path)
+{
+    int ret = 0;
+    RUBY_CRITICAL({
+	const DWORD attr = GetFileAttributes(path);
+	if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
+	    SetFileAttributes(path, attr & ~FILE_ATTRIBUTE_READONLY);
+	}
+	if (RemoveDirectory(path) == FALSE) {
+	    errno = map_errno(GetLastError());
+	    ret = -1;
+	    if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
+		SetFileAttributes(path, attr);
+	    }
+	}
+    });
+    return ret;
+}
+
+int
+rb_w32_unlink(const char *path)
+{
+    int ret = 0;
+    RUBY_CRITICAL({
+	const DWORD attr = GetFileAttributes(path);
+	if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
+	    SetFileAttributes(path, attr & ~FILE_ATTRIBUTE_READONLY);
+	}
+	if (DeleteFile(path) == FALSE) {
+	    errno = map_errno(GetLastError());
+	    ret = -1;
+	    if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_READONLY)) {
+		SetFileAttributes(path, attr);
+	    }
+	}
+    });
+    return ret;
+}
+
+#if !defined(__BORLANDC__) && !defined(_WIN32_WCE)
+int
+rb_w32_isatty(int fd)
+{
+    if (!(_osfile(fd) & FOPEN)) {
+	errno = EBADF;
+	return 0;
+    }
+    if (!(_osfile(fd) & FDEV)) {
+	errno = ENOTTY;
+	return 0;
+    }
+    return 1;
+}
+#endif
+
+//
+// Fix bcc32's stdio bug
+//
+
+#ifdef __BORLANDC__
+static int
+too_many_files()
+{
+    FILE *f;
+    for (f = _streams; f < _streams + _nfile; f++) {
+	if (f->fd < 0) return 0;
+    }
+    return 1;
+}
+
+#undef fopen
+FILE *
+rb_w32_fopen(const char *path, const char *mode)
+{
+    FILE *f = (errno = 0, fopen(path, mode));
+    if (f == NULL && errno == 0) {
+	if (too_many_files())
+	    errno = EMFILE;
+    }
+    return f;
+}
+
+FILE *
+rb_w32_fdopen(int handle, const char *type)
+{
+    FILE *f = (errno = 0, _fdopen(handle, (char *)type));
+    if (f == NULL && errno == 0) {
+	if (handle < 0)
+	    errno = EBADF;
+	else if (too_many_files())
+	    errno = EMFILE;
+    }
+    return f;
+}
+
+FILE *
+rb_w32_fsopen(const char *path, const char *mode, int shflags)
+{
+    FILE *f = (errno = 0, _fsopen(path, mode, shflags));
+    if (f == NULL && errno == 0) {
+	if (too_many_files())
+	    errno = EMFILE;
+    }
+    return f;
+}
+#endif
diff --git a/ruby_1_8_6/win32/win32.h b/ruby_1_8_6/win32/win32.h
new file mode 100644
index 0000000000..87f4d4867a
--- /dev/null
+++ b/ruby_1_8_6/win32/win32.h
@@ -0,0 +1,559 @@
+#ifndef RUBY_WIN32_H
+#define RUBY_WIN32_H
+
+/*
+ *  Copyright (c) 1993, Intergraph Corporation
+ *
+ *  You may distribute under the terms of either the GNU General Public
+ *  License or the Artistic License, as specified in the perl README file.
+ *
+ */
+
+//
+// Definitions for NT port of Perl
+//
+
+
+//
+// Ok now we can include the normal include files.
+//
+
+// #include <stdarg.h> conflict with varargs.h?
+// There is function-name conflitct, so we rename it
+#if !defined(IN) && !defined(FLOAT)
+#define OpenFile  WINAPI_OpenFile
+#ifdef __BORLANDC__
+#define USE_WINSOCK2
+#endif
+#ifdef USE_WINSOCK2
+#include <winsock2.h>
+#include <windows.h>
+#else
+#include <windows.h>
+#include <winsock.h>
+#endif
+#undef OpenFile
+#endif
+
+#define NT 1			/* deprecated */
+
+#ifdef _WIN32_WCE
+#undef CharNext
+#define CharNext CharNextA
+#endif
+
+//
+// We're not using Microsoft's "extensions" to C for
+// Structured Exception Handling (SEH) so we can nuke these
+//
+#undef try
+#undef except
+#undef finally
+#undef leave
+
+#if defined(__cplusplus)
+extern "C++" {
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <direct.h>
+#include <process.h>
+#include <time.h>
+#include <math.h>
+#include <signal.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#if !defined(__BORLANDC__)
+# include <sys/utime.h>
+#else
+# include <utime.h>
+#endif
+#include <io.h>
+#include <malloc.h>
+
+#if defined(__cplusplus)
+}
+#endif
+
+#ifdef _M_IX86
+# define WIN95 1
+#else
+# undef  WIN95
+#endif
+
+#ifdef WIN95
+extern DWORD rb_w32_osid(void);
+#define rb_w32_iswinnt()  (rb_w32_osid() == VER_PLATFORM_WIN32_NT)
+#define rb_w32_iswin95()  (rb_w32_osid() == VER_PLATFORM_WIN32_WINDOWS)
+#else
+#define rb_w32_iswinnt()  TRUE
+#define rb_w32_iswin95()  FALSE
+#endif
+
+#define WNOHANG -1
+
+#undef getc
+#undef putc
+#undef fgetc
+#undef fputc
+#undef getchar
+#undef putchar
+#undef fgetchar
+#undef fputchar
+#undef utime
+#define getc(_stream)		rb_w32_getc(_stream)
+#define putc(_c, _stream)	rb_w32_putc(_c, _stream)
+#define fgetc(_stream)		getc(_stream)
+#define fputc(_c, _stream)	putc(_c, _stream)
+#define getchar()		rb_w32_getc(stdin)
+#define putchar(_c)		rb_w32_putc(_c, stdout)
+#define fgetchar()		getchar()
+#define fputchar(_c)		putchar(_c)
+#define utime(_p, _t)		rb_w32_utime(_p, _t)
+
+#define strcasecmp(s1, s2)	stricmp(s1, s2)
+#define strncasecmp(s1, s2, n)	strnicmp(s1, s2, n)
+
+#define close(h)		rb_w32_close(h)
+#define fclose(f)		rb_w32_fclose(f)
+#define read(f, b, s)		rb_w32_read(f, b, s)
+#define write(f, b, s)		rb_w32_write(f, b, s)
+#define getpid()		rb_w32_getpid()
+#define sleep(x)		rb_w32_sleep((x)*1000)
+#ifdef __BORLANDC__
+#define creat(p, m)		_creat(p, m)
+#define eof()			_eof()
+#define filelength(h)		_filelength(h)
+#define mktemp(t)		_mktemp(t)
+#define tell(h)			_tell(h)
+#define unlink(p)		_unlink(p)
+#define _open			_sopen
+#define sopen			_sopen
+#undef fopen
+#define fopen(p, m)		rb_w32_fopen(p, m)
+#undef fdopen
+#define fdopen(h, m)		rb_w32_fdopen(h, m)
+#undef fsopen
+#define fsopen(p, m, sh)	rb_w32_fsopen(p, m, sh)
+#endif
+#define fsync(h)		_commit(h)
+#undef stat
+#define stat(path,st)		rb_w32_stat(path,st)
+#undef execv
+#define execv(path,argv)	do_aspawn(P_OVERLAY,path,argv)
+#if !defined(__BORLANDC__) && !defined(_WIN32_WCE)
+#undef isatty
+#define isatty(h)		rb_w32_isatty(h)
+#endif
+#undef mkdir
+#define mkdir(p, m)		rb_w32_mkdir(p, m)
+#undef rmdir
+#define rmdir(p)		rb_w32_rmdir(p)
+#undef unlink
+#define unlink(p)		rb_w32_unlink(p)
+
+#ifdef __MINGW32__
+struct timezone {
+  int tz_minuteswest;
+  int tz_dsttime;
+};
+#undef isascii
+#define isascii __isascii
+#endif
+extern void   NtInitialize(int *, char ***);
+extern int    rb_w32_cmdvector(const char *, char ***);
+extern rb_pid_t pipe_exec(char *, int, FILE **, FILE **);
+extern int    flock(int fd, int oper);
+extern int    rb_w32_accept(int, struct sockaddr *, int *);
+extern int    rb_w32_bind(int, struct sockaddr *, int);
+extern int    rb_w32_connect(int, struct sockaddr *, int);
+extern void   rb_w32_fdset(int, fd_set*);
+extern void   rb_w32_fdclr(int, fd_set*);
+extern int    rb_w32_fdisset(int, fd_set*);
+extern long   rb_w32_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+extern int    rb_w32_getpeername(int, struct sockaddr *, int *);
+extern int    rb_w32_getsockname(int, struct sockaddr *, int *);
+extern int    rb_w32_getsockopt(int, int, int, char *, int *);
+extern int    rb_w32_ioctlsocket(int, long, u_long *);
+extern int    rb_w32_listen(int, int);
+extern int    rb_w32_recv(int, char *, int, int);
+extern int    rb_w32_recvfrom(int, char *, int, int, struct sockaddr *, int *);
+extern int    rb_w32_send(int, const char *, int, int);
+extern int    rb_w32_sendto(int, const char *, int, int, struct sockaddr *, int);
+extern int    rb_w32_setsockopt(int, int, int, char *, int);
+extern int    rb_w32_shutdown(int, int);
+extern int    rb_w32_socket(int, int, int);
+extern SOCKET rb_w32_get_osfhandle(int);
+extern struct hostent * rb_w32_gethostbyaddr(char *, int, int);
+extern struct hostent * rb_w32_gethostbyname(char *);
+extern int    rb_w32_gethostname(char *, int);
+extern struct protoent * rb_w32_getprotobyname(char *);
+extern struct protoent * rb_w32_getprotobynumber(int);
+extern struct servent  * rb_w32_getservbyname(char *, char *);
+extern struct servent  * rb_w32_getservbyport(int, char *);
+extern char * rb_w32_getcwd(char *, int);
+extern char * rb_w32_getenv(const char *);
+extern int    rb_w32_rename(const char *, const char *);
+extern int    rb_w32_stat(const char *, struct stat *);
+extern char **rb_w32_get_environ(void);
+extern void   rb_w32_free_environ(char **);
+
+#define vsnprintf(s,n,f,l) rb_w32_vsnprintf(s,n,f,l)
+#define snprintf   rb_w32_snprintf
+extern int rb_w32_vsnprintf(char *, size_t, const char *, va_list);
+extern int rb_w32_snprintf(char *, size_t, const char *, ...);
+
+extern int chown(const char *, int, int);
+extern int link(char *, char *);
+extern int gettimeofday(struct timeval *, struct timezone *);
+extern rb_pid_t waitpid (rb_pid_t, int *, int);
+extern int do_spawn(int, char *);
+extern int do_aspawn(int, char *, char **);
+extern int kill(int, int);
+extern int fcntl(int, int, ...);
+extern rb_pid_t rb_w32_getpid(void);
+
+#if !defined(__BORLANDC__) && !defined(_WIN32_WCE)
+extern int rb_w32_isatty(int);
+#endif
+extern int rb_w32_mkdir(const char *, int);
+extern int rb_w32_rmdir(const char *);
+extern int rb_w32_unlink(const char*);
+
+#ifdef __BORLANDC__
+extern FILE *rb_w32_fopen(const char *, const char *);
+extern FILE *rb_w32_fdopen(int, const char *);
+extern FILE *rb_w32_fsopen(const char *, const char *, int);
+#endif
+
+#include <float.h>
+#if !defined __MINGW32__ || defined __NO_ISOCEXT
+#ifndef isnan
+#define isnan(x) _isnan(x)
+#endif
+#ifndef finite
+#define finite(x) _finite(x)
+#endif
+#ifndef copysign
+#define copysign(a, b) _copysign(a, b)
+#endif
+#ifndef scalb
+#define scalb(a, b) _scalb(a, b)
+#endif
+#endif
+
+#if !defined S_IFIFO && defined _S_IFIFO
+#define S_IFIFO _S_IFIFO
+#endif
+
+#ifdef __BORLANDC__
+#undef S_ISDIR
+#undef S_ISFIFO
+#undef S_ISBLK
+#undef S_ISCHR
+#undef S_ISREG
+#define S_ISDIR(m)  (((unsigned short)(m) & S_IFMT) == S_IFDIR)
+#define S_ISFIFO(m) (((unsigned short)(m) & S_IFMT) == S_IFIFO)
+#define S_ISBLK(m)  (((unsigned short)(m) & S_IFMT) == S_IFBLK)
+#define S_ISCHR(m)  (((unsigned short)(m) & S_IFMT) == S_IFCHR)
+#define S_ISREG(m)  (((unsigned short)(m) & S_IFMT) == S_IFREG)
+#endif
+
+#if !defined S_IRUSR && !defined __MINGW32__
+#define S_IRUSR 0400
+#endif
+#ifndef S_IRGRP
+#define S_IRGRP 0040
+#endif
+#ifndef S_IROTH
+#define S_IROTH 0004
+#endif
+
+#if !defined S_IWUSR && !defined __MINGW32__
+#define S_IWUSR 0200
+#endif
+#ifndef S_IWGRP
+#define S_IWGRP 0020
+#endif
+#ifndef S_IWOTH
+#define S_IWOTH 0002
+#endif
+
+#if !defined S_IXUSR && !defined __MINGW32__
+#define S_IXUSR 0100
+#endif
+#ifndef S_IXGRP
+#define S_IXGRP 0010
+#endif
+#ifndef S_IXOTH
+#define S_IXOTH 0001
+#endif
+
+//
+// define this so we can do inplace editing
+//
+
+#define SUFFIX
+
+//
+// stubs
+//
+#if !defined(__BORLANDC__)
+extern int       ioctl (int, unsigned int, long);
+#endif
+extern rb_uid_t  getuid (void);
+extern rb_uid_t  geteuid (void);
+extern rb_gid_t  getgid (void);
+extern rb_gid_t  getegid (void);
+extern int       setuid (rb_uid_t);
+extern int       setgid (rb_gid_t);
+
+extern char *rb_w32_strerror(int);
+
+#define strerror(e) rb_w32_strerror(e)
+
+#define PIPE_BUF 1024
+
+#define LOCK_SH 1
+#define LOCK_EX 2
+#define LOCK_NB 4
+#define LOCK_UN 8
+
+
+#ifndef SIGINT
+#define SIGINT 2
+#endif
+#ifndef SIGKILL
+#define SIGKILL	9
+#endif
+
+
+/* #undef va_start */
+/* #undef va_end */
+
+/* winsock error map */
+#define EWOULDBLOCK	WSAEWOULDBLOCK
+#define EINPROGRESS	WSAEINPROGRESS
+#define EALREADY	WSAEALREADY
+#define ENOTSOCK	WSAENOTSOCK
+#define EDESTADDRREQ	WSAEDESTADDRREQ
+#define EMSGSIZE	WSAEMSGSIZE
+#define EPROTOTYPE	WSAEPROTOTYPE
+#define ENOPROTOOPT	WSAENOPROTOOPT
+#define EPROTONOSUPPORT	WSAEPROTONOSUPPORT
+#define ESOCKTNOSUPPORT	WSAESOCKTNOSUPPORT
+#define EOPNOTSUPP	WSAEOPNOTSUPP
+#define EPFNOSUPPORT	WSAEPFNOSUPPORT
+#define EAFNOSUPPORT	WSAEAFNOSUPPORT
+#define EADDRINUSE	WSAEADDRINUSE
+#define EADDRNOTAVAIL	WSAEADDRNOTAVAIL
+#define ENETDOWN	WSAENETDOWN
+#define ENETUNREACH	WSAENETUNREACH
+#define ENETRESET	WSAENETRESET
+#define ECONNABORTED	WSAECONNABORTED
+#define ECONNRESET	WSAECONNRESET
+#define ENOBUFS		WSAENOBUFS
+#define EISCONN		WSAEISCONN
+#define ENOTCONN	WSAENOTCONN
+#define ESHUTDOWN	WSAESHUTDOWN
+#define ETOOMANYREFS	WSAETOOMANYREFS
+#define ETIMEDOUT	WSAETIMEDOUT
+#define ECONNREFUSED	WSAECONNREFUSED
+#define ELOOP		WSAELOOP
+/*#define ENAMETOOLONG	WSAENAMETOOLONG*/
+#define EHOSTDOWN	WSAEHOSTDOWN
+#define EHOSTUNREACH	WSAEHOSTUNREACH
+/*#define ENOTEMPTY	WSAENOTEMPTY*/
+#define EPROCLIM	WSAEPROCLIM
+#define EUSERS		WSAEUSERS
+#define EDQUOT		WSAEDQUOT
+#define ESTALE		WSAESTALE
+#define EREMOTE		WSAEREMOTE
+
+#define F_SETFL 1
+#define O_NONBLOCK 1
+
+#ifdef accept
+#undef accept
+#endif
+#define accept(s, a, l)		rb_w32_accept(s, a, l)
+
+#ifdef bind
+#undef bind
+#endif
+#define bind(s, a, l)		rb_w32_bind(s, a, l)
+
+#ifdef connect
+#undef connect
+#endif
+#define connect(s, a, l)	rb_w32_connect(s, a, l)
+
+#undef FD_SET
+#define FD_SET(f, s)		rb_w32_fdset(f, s)
+
+#undef FD_CLR
+#define FD_CLR(f, s)		rb_w32_fdclr(f, s)
+
+#undef FD_ISSET
+#define FD_ISSET(f, s)		rb_w32_fdisset(f, s)
+
+#undef select
+#define select(n, r, w, e, t)	rb_w32_select(n, r, w, e, t)
+
+#ifdef getpeername
+#undef getpeername
+#endif
+#define getpeername(s, a, l)	rb_w32_getpeername(s, a, l)
+
+#ifdef getsockname
+#undef getsockname
+#endif
+#define getsockname(s, a, l)	rb_w32_getsockname(s, a, l)
+
+#ifdef getsockopt
+#undef getsockopt
+#endif
+#define getsockopt(s, v, n, o, l) rb_w32_getsockopt(s, v, n, o, l)
+
+#ifdef ioctlsocket
+#undef ioctlsocket
+#endif
+#define ioctlsocket(s, c, a)	rb_w32_ioctlsocket(s, c, a)
+
+#ifdef listen
+#undef listen
+#endif
+#define listen(s, b)		rb_w32_listen(s, b)
+
+#ifdef recv
+#undef recv
+#endif
+#define recv(s, b, l, f)	rb_w32_recv(s, b, l, f)
+
+#ifdef recvfrom
+#undef recvfrom
+#endif
+#define recvfrom(s, b, l, f, fr, frl) rb_w32_recvfrom(s, b, l, f, fr, frl)
+
+#ifdef send
+#undef send
+#endif
+#define send(s, b, l, f)	rb_w32_send(s, b, l, f)
+
+#ifdef sendto
+#undef sendto
+#endif
+#define sendto(s, b, l, f, t, tl) rb_w32_sendto(s, b, l, f, t, tl)
+
+#ifdef setsockopt
+#undef setsockopt
+#endif
+#define setsockopt(s, v, n, o, l) rb_w32_setsockopt(s, v, n, o, l)
+
+#ifdef shutdown
+#undef shutdown
+#endif
+#define shutdown(s, h)		rb_w32_shutdown(s, h)
+
+#ifdef socket
+#undef socket
+#endif
+#define socket(s, t, p)		rb_w32_socket(s, t, p)
+
+#ifdef gethostbyaddr
+#undef gethostbyaddr
+#endif
+#define gethostbyaddr(a, l, t)	rb_w32_gethostbyaddr(a, l, t)
+
+#ifdef gethostbyname
+#undef gethostbyname
+#endif
+#define gethostbyname(n)	rb_w32_gethostbyname(n)
+
+#ifdef gethostname
+#undef gethostname
+#endif
+#define gethostname(n, l)	rb_w32_gethostname(n, l)
+
+#ifdef getprotobyname
+#undef getprotobyname
+#endif
+#define getprotobyname(n)	rb_w32_getprotobyname(n)
+
+#ifdef getprotobynumber
+#undef getprotobynumber
+#endif
+#define getprotobynumber(n)	rb_w32_getprotobynumber(n)
+
+#ifdef getservbyname
+#undef getservbyname
+#endif
+#define getservbyname(n, p)	rb_w32_getservbyname(n, p)
+
+#ifdef getservbyport
+#undef getservbyport
+#endif
+#define getservbyport(p, pr)	rb_w32_getservbyport(p, pr)
+
+#ifdef get_osfhandle
+#undef get_osfhandle
+#endif
+#define get_osfhandle(h)	rb_w32_get_osfhandle(h)
+
+#ifdef getcwd
+#undef getcwd
+#endif
+#define getcwd(b, s)		rb_w32_getcwd(b, s)
+
+#ifdef getenv
+#undef getenv
+#endif
+#define getenv(n)		rb_w32_getenv(n)
+
+#ifdef rename
+#undef rename
+#endif
+#define rename(o, n)		rb_w32_rename(o, n)
+
+struct tms {
+	long	tms_utime;
+	long	tms_stime;
+	long	tms_cutime;
+	long	tms_cstime;
+};
+
+#ifdef times
+#undef times
+#endif
+#define times(t) rb_w32_times(t)
+int rb_w32_times(struct tms *);
+
+/* thread stuff */
+HANDLE GetCurrentThreadHandle(void);
+void rb_w32_interrupted(void);
+int  rb_w32_main_context(int arg, void (*handler)(int));
+int  rb_w32_sleep(unsigned long msec);
+void rb_w32_enter_critical(void);
+void rb_w32_leave_critical(void);
+int  rb_w32_putc(int, FILE*);
+int  rb_w32_getc(FILE*);
+int  rb_w32_close(int);
+int  rb_w32_fclose(FILE*);
+size_t rb_w32_read(int, void *, size_t);
+size_t rb_w32_write(int, const void *, size_t);
+int  rb_w32_utime(const char *, struct utimbuf *);
+#define Sleep(msec) (void)rb_w32_sleep(msec)
+
+/*
+== ***CAUTION***
+Since this function is very dangerous, ((*NEVER*))
+* lock any HANDLEs(i.e. Mutex, Semaphore, CriticalSection and so on) or,
+* use anything like TRAP_BEG...TRAP_END block structure,
+in asynchronous_func_t.
+*/
+typedef DWORD (*asynchronous_func_t)(DWORD self, int argc, DWORD* argv);
+DWORD rb_w32_asynchronize(asynchronous_func_t func, DWORD self, int argc, DWORD* argv, DWORD intrval);
+
+#endif
diff --git a/ruby_1_8_6/win32/winmain.c b/ruby_1_8_6/win32/winmain.c
new file mode 100644
index 0000000000..4902d1daaf
--- /dev/null
+++ b/ruby_1_8_6/win32/winmain.c
@@ -0,0 +1,10 @@
+#include <windows.h>
+#include <stdio.h>
+
+extern int main(int, char**, char**);
+
+int WINAPI
+WinMain(HINSTANCE current, HINSTANCE prev, LPSTR cmdline, int showcmd)
+{
+    return main(0, NULL, NULL);
+}
diff --git a/ruby_1_8_6/wince/Makefile.sub b/ruby_1_8_6/wince/Makefile.sub
new file mode 100644
index 0000000000..dbcad66c1c
--- /dev/null
+++ b/ruby_1_8_6/wince/Makefile.sub
@@ -0,0 +1,505 @@
+# -*- makefile -*-
+
+SHELL = $(COMSPEC)
+MKFILES = Makefile
+NULL = nul
+
+#### Start of system configuration section. ####
+
+## variables may be overridden by $(compile_dir)/Makefile
+!ifndef srcdir
+srcdir = ..
+!endif
+!ifndef RUBY_INSTALL_NAME
+RUBY_INSTALL_NAME = ruby
+!endif
+!if !defined(RUBYW_INSTALL_NAME) || "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
+RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
+!endif
+!if "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
+RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
+!endif
+!if !defined(icondirs) && defined(ICONDIRS)
+icondirs=$(ICONDIRS)
+!endif
+!if defined(icondirs)
+icondirs=$(icondirs:\=/)
+iconinc=-I$(icondirs: = -I)
+!endif
+###############
+
+VPATH = $(srcdir);$(srcdir)/missing;$(srcdir)/wince
+.SUFFIXES: .y .def .lib
+
+!if !defined(CC)
+CC = cl
+!endif
+!if !defined(CPP) || "$(CPP)" == "cl"
+CPP = $(CC) -E
+!endif
+!if !defined(YACC)
+YACC = byacc
+!endif
+AR = lib -nologo
+PURIFY =
+AUTOCONF = autoconf
+RM = $(srcdir)\win32\rm.bat
+
+!if !defined(PROCESSOR_ARCHITECTURE)
+PROCESSOR_ARCHITECTURE = x86
+!endif
+MACHINE = $(PROCESSOR_ARCHITECTURE)
+!if "$(PROCESSOR_ARCHITECTURE)" == "x86"
+!if !defined(PROCESSOR_LEVEL)
+PROCESSOR_LEVEL = 5
+!endif
+!if 6 < $(PROCESSOR_LEVEL)
+PROCESSOR_LEVEL = 6
+!endif
+PROCESSOR_FLAG = -G$(PROCESSOR_LEVEL)
+CPU = i$(PROCESSOR_LEVEL)86
+ARCH = i386
+!else
+CPU = $(PROCESSOR_ARCHITECTURE)
+ARCH = $(PROCESSOR_ARCHITECTURE)
+!endif
+!if !defined(DEBUGFLAGS)
+DEBUGFLAGS = -Zi
+!endif
+!if !defined(OPTFLAGS)
+OPTFLAGS = -w -O2b2xg-
+!endif
+!if !defined(OS) || !defined(RT)
+OS = mswince
+RT = $(OS)
+!endif
+
+!ifndef RUBY_SO_NAME
+RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
+!endif
+!ifndef RUBY_PLATFORM
+RUBY_PLATFORM = $(ARCH)-$(OS)
+!endif
+
+!if !defined(prefix)
+prefix = /usr
+!endif
+!if !defined(exec_prefix)
+exec_prefix = $(prefix)
+!endif
+!if !defined(libdir)
+libdir = $(exec_prefix)/lib
+!endif
+!if !defined(datadir)
+datadir = /share
+!endif
+!ifndef EXTOUT
+EXTOUT = .ext
+!endif
+!ifndef RIDATADIR
+RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
+!endif
+!ifndef RDOCTARGET
+RDOCTARGET = install-doc
+!endif
+
+OUTFLAG       = -Fe
+!if !defined(CFLAGS)
+CFLAGS = $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG)
+!endif
+!if !defined(CPPFLAGS)
+CPPFLAGS = $(CECPUDEF) -DUNDER_CE -D_WIN32_WCE=$(SUBSYSVERSION:.=) \
+           -DFILENAME_MAX=MAX_PATH -DTLS_OUT_OF_INDEXES=0xFFFFFFFF \
+           -DBUFSIZ=512 -D_UNICODE -DUNICODE
+!endif
+!if !defined(LDFLAGS)
+LDFLAGS = -link -incremental:yes -pdb:none -machine:$(MACHINE) -subsystem:$(SUBSYSTEM)
+!endif
+!if !defined(XLDFLAGS)
+XLDFLAGS = -stack:$(STACK) -subsystem:$(SUBSYSTEM)
+!endif
+!if !defined(RFLAGS)
+RFLAGS = -r
+!endif
+!if !defined(EXTLIBS)
+EXTLIBS =
+!endif
+LIBS = coredll.lib ceshell.lib winsock.lib  $(EXTLIBS)
+MISSING = acosh.obj crypt.obj dup2.obj erf.obj hypot.obj \
+          isinf.obj isnan.obj strftime.obj win32.obj \
+          assert.obj direct.obj errno.obj io_wce.obj process_wce.obj \
+          signal_wce.obj stdio.obj stdlib.obj string_wce.obj \
+          time_wce.obj wince.obj winsock2.obj \
+          stat.obj timeb.obj utime.obj
+
+ARFLAGS = -machine:$(MACHINE) -out:
+CC = $(CC) -nologo
+LD = $(CC)
+LDSHARED = $(LD) -LD
+XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing -I$(srcdir)/wince
+DLDFLAGS = $(LDFLAGS) -dll
+SOLIBS = 
+
+LIBRUBY_LDSHARED = $(LDSHARED)
+LIBRUBY_DLDFLAGS = $(EXTLDFLAGS) -def:$(RUBYDEF)
+
+EXEEXT = .exe
+PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
+RUBYDEF = $(RUBY_SO_NAME).def
+MINIRUBY = $(RUBY) -I$(MAKEDIR) -rfake
+RUNRUBY = $(MINIRUBY) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
+!ifndef RUBY
+RUBY = ruby
+!endif
+
+!if !defined(STACK)
+STACK = 0x200000,0x10000
+!endif
+ORGLIBPATH = $(LIB)
+
+#### End of system configuration section. ####
+
+LIBRUBY_A     = $(RUBY_SO_NAME)-static.lib
+LIBRUBY_SO    = $(RUBY_SO_NAME).dll
+LIBRUBY       = $(RUBY_SO_NAME).lib
+LIBRUBYARG    = $(LIBRUBY)
+
+PREP          = fake.rb
+
+!if !defined(EXTSTATIC)
+EXTSTATIC     = 
+!endif
+
+OBJEXT = obj
+
+INSTALLED_LIST= .installed.list
+
+WINMAINOBJ    = wincemain.$(OBJEXT)
+
+all: $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk
+ruby: $(PROGRAM)
+
+CONFIG_H = ./.config.h.time
+
+config: config.status
+
+config.status: $(CONFIG_H)
+
+BANG = !
+
+!if exist(config.h)
+!include config.h
+!endif
+
+$(CONFIG_H): $(MKFILES) $(srcdir)/wince/Makefile.sub
+	@echo Creating config.h
+	@$(srcdir:/=\)\win32\ifchange.bat config.h <<
+#define STDC_HEADERS 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_OFF_T 1
+#define SIZEOF_INT 4
+#define SIZEOF_SHORT 2
+#define SIZEOF_LONG 4
+#define SIZEOF_LONG_LONG 0
+#define SIZEOF___INT64 8
+#define SIZEOF_OFF_T 4
+#define SIZEOF_VOIDP 4
+#define SIZEOF_FLOAT 4
+#define SIZEOF_DOUBLE 8
+#define SIZEOF_TIME_T 4
+#define HAVE_PROTOTYPES 1
+#define TOKEN_PASTE(x,y) x##y
+#define HAVE_STDARG_PROTOTYPES 1
+!if $(MSC_VER) > 1100
+#define NORETURN(x) __declspec(noreturn) x
+!endif
+#define RUBY_EXTERN extern __declspec(dllimport)
+#define HAVE_DECL_SYS_NERR 1
+#define HAVE_FCNTL_H 1
+#define HAVE_SYS_UTIME_H 1
+#define HAVE_FLOAT_H 1
+#define rb_uid_t int
+#define rb_gid_t int
+#define rb_pid_t int
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+#define HAVE_ST_RDEV 1
+#define GETGROUPS_T int
+#define RETSIGTYPE void
+#define HAVE_MEMCMP 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MKDIR 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_STRERROR 1
+#define HAVE_STRFTIME 1
+#define HAVE_STRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOD 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+#define HAVE_FLOCK 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_FINITE 1
+#define HAVE_HYPOT 1
+#define HAVE_FMOD 1
+#define HAVE_FREXP 1
+#define HAVE_MODF 1
+#define HAVE_WAITPID 1
+#define HAVE_GETCWD 1
+#define HAVE_CHSIZE 0
+#define HAVE_TIMES 1
+#define HAVE_FCNTL 1
+#define HAVE_TELLDIR 1
+#define HAVE_SEEKDIR 1
+#define HAVE_MKTIME 1
+#define HAVE_COSH 1
+#define HAVE_SINH 1
+#define HAVE_TANH 1
+#define HAVE_TZNAME 1
+#define HAVE_DAYLIGHT 1
+#define SETPGRP_VOID 1
+#define RSHIFT(x,y) ((x)>>(int)y)
+#define inline __inline
+#define NEED_IO_SEEK_BETWEEN_RW 1
+#define DEFAULT_KCODE KCODE_NONE
+#define DLEXT ".so"
+#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
+#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
+#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
+#define RUBY_PLATFORM "$(ARCH)-$(OS)"
+#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
+#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)"
+#define LIBRUBY_SO "$(LIBRUBY_SO)"
+#if 0
+$(BANG)if "$(RUBY_SO_NAME)"!="$$(RUBY_SO_NAME)" || "$(ARCH)-$(OS)"!="$$(ARCH)-$$(OS)"
+config.h: nul
+$(BANG)endif
+#endif
+#define GC_MALLOC_LIMIT 4000000
+#define stricmp _stricmp
+#define fopen   wce_fopen
+#define open	   _open
+#define read	   _read
+#define write	   _write
+#define lseek      _lseek
+
+#if _WIN32_WCE < 300
+  #define isascii(c) ( (c>=0x00&&c<=0x7f)?1:0 )
+  #define isspace(c) ( ((c>=0x09&&c<=0x0d)||c==0x20)?1:0 )
+  #define isdigit(c) ( (c>=0x30&&c<=0x39)?1:0 )
+  #define isupper(c) ( (c>='A'&&c<='Z')?1:0 )
+  #define isalpha(c) ( ((c>='A'&&c<='Z')||(c>='a'&&c<='z'))?1:0 )
+  #define isprint(c) ( (c>=0x20&&c<=0x7e)?1:0 )
+  #define isalnum(c) ( (isalpha(c)||isdigit(c))?1:0 )
+  #define iscntrl(c) ( ((c>=0x00&&c<=0x1f)||c==0x7f)?1:0 )
+  #define islower(c) ( (c>='a'&&c<='z')?1:0 )
+  #define ispunct(c) ( !(isalnum(c)||isspace(c))?1:0 )
+  #define isxdigit(c) ( ((c>=0&&c<=9)||(c>='A'&&c<='F')||(c>='a'&&c<='f'))?1:0 )
+#endif
+<<
+	@exit > $(@:/=\)
+
+config.status: $(MKFILES) $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk
+	@echo Creating $@
+	@exit <<$@
+# Generated automatically by Makefile.sub.
+s,@SHELL@,$$(COMSPEC),;t t
+s,@BUILD_FILE_SEPARATOR@,\,;t t
+s,@PATH_SEPARATOR@,;,;t t
+s,@CFLAGS@,$(CFLAGS),;t t
+s,@CPPFLAGS@,$(CPPFLAGS),;t t
+s,@CXXFLAGS@,$(CXXFLAGS),;t t
+s,@FFLAGS@,$(FFLAGS),;t t
+s,@LDFLAGS@,,;t t
+s,@LIBS@,$(LIBS),;t t
+s,@exec_prefix@,$${prefix},;t t
+s,@prefix@,,;t t
+s,@program_transform_name@,s,,,,;t t
+s,@bindir@,$${exec_prefix}/bin,;t t
+s,@sbindir@,$${exec_prefix}/sbin,;t t
+s,@libexecdir@,$${exec_prefix}/libexec,;t t
+s,@datadir@,$${prefix}/share,;t t
+s,@sysconfdir@,$${prefix}/etc,;t t
+s,@sharedstatedir@,/etc,;t t
+s,@localstatedir@,/var,;t t
+s,@libdir@,$${exec_prefix}/lib,;t t
+s,@includedir@,$${prefix}/include,;t t
+s,@oldincludedir@,/usr/include,;t t
+s,@infodir@,$${prefix}/info,;t t
+s,@mandir@,$${prefix}/man,;t t
+s,@build@,$(CPU)-pc-$(OS),;t t
+s,@build_alias@,$(CPU)-$(OS),;t t
+s,@build_cpu@,$(CPU),;t t
+s,@build_vendor@,pc,;t t
+s,@build_os@,$(OS),;t t
+s,@host@,$(CPU)-pc-$(OS),;t t
+s,@host_alias@,$(CPU)-$(OS),;t t
+s,@host_cpu@,$(CPU),;t t
+s,@host_vendor@,pc,;t t
+s,@host_os@,$(OS),;t t
+s,@target@,$(ARCH)-pc-$(OS),;t t
+s,@target_alias@,$(ARCH)-$(OS),;t t
+s,@target_cpu@,$(ARCH),;t t
+s,@target_vendor@,pc,;t t
+s,@target_os@,$(OS),;t t
+s,@CC@,$(CC),;t t
+s,@CPP@,$(CPP),;t t
+s,@YACC@,$(YACC),;t t
+s,@RANLIB@,,;t t
+s,@AR@,$(AR),;t t
+s,@ARFLAGS@,$(ARFLAGS),;t t
+s,@LN_S@,$(LN_S),;t t
+s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@CP@,copy > nul,;t t
+s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj isinf.obj isnan.obj,;t t
+s,@ALLOCA@,$(ALLOCA),;t t
+s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
+s,@EXEEXT@,.exe,;t t
+s,@OBJEXT@,$(OBJEXT),;t t
+s,@XCFLAGS@,$(XCFLAGS),;t t
+s,@XLDFLAGS@,$(XLDFLAGS),;t t
+s,@DLDFLAGS@,$(DLDFLAGS) $$(LIBPATH) -def:$$(DEFFILE) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb,;t t
+s,@ARCH_FLAG@,$(ARCH_FLAG),;t t
+s,@STATIC@,$(STATIC),;t t
+s,@CCDLFLAGS@,,;t t
+s,@LDSHARED@,$(LDSHARED),;t t
+s,@DLEXT@,so,;t t
+s,@LIBEXT@,lib,;t t
+s,@STRIP@,$(STRIP),;t t
+s,@EXTSTATIC@,$(EXTSTATIC),;t t
+s,@setup@,Setup,;t t
+s,@MINIRUBY@,$(MINIRUBY),;t t
+s,@PREP@,miniruby$(EXEEXT),;t t
+s,@RUNRUBY@,$(RUNRUBY),;t t
+s,@EXTOUT@,$(EXTOUT),;t t
+s,@ARCHFILE@,,;t t
+s,@RDOCTARGET@,,;t t
+s,@LIBRUBY_LDSHARED@,$(LIBRUBY_LDSHARED),;t t
+s,@LIBRUBY_DLDFLAGS@,$(LIBRUBY_DLDFLAGS),;t t
+s,@RUBY_INSTALL_NAME@,$(RUBY_INSTALL_NAME),;t t
+s,@rubyw_install_name@,$(RUBYW_INSTALL_NAME),;t t
+s,@RUBYW_INSTALL_NAME@,$(RUBYW_INSTALL_NAME),;t t
+s,@RUBY_SO_NAME@,$(RUBY_SO_NAME),;t t
+s,@LIBRUBY_A@,$$(RUBY_SO_NAME)-static.lib,;t t
+s,@LIBRUBY_SO@,$$(RUBY_SO_NAME).dll,;t t
+s,@LIBRUBY_ALIASES@,$(LIBRUBY_ALIASES),;t t
+s,@LIBRUBY@,$$(RUBY_SO_NAME).lib,;t t
+s,@LIBRUBYARG@,$$(LIBRUBYARG_SHARED),;t t
+s,@LIBRUBYARG_STATIC@,$$(LIBRUBY_A),;t t
+s,@LIBRUBYARG_SHARED@,$$(LIBRUBY),;t t
+s,@SOLIBS@,$(SOLIBS),;t t
+s,@DLDLIBS@,$(DLDLIBS),;t t
+s,@ENABLE_SHARED@,yes,;t t
+s,@OUTFLAG@,$(OUTFLAG),;t t
+s,@CPPOUTFILE@,-P,;t t
+s,@LIBPATHFLAG@, -libpath:"%s",;t t
+s,@RPATHFLAG@,,;t t
+s,@LIBARG@,%s.lib,;t t
+s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) $$(DLDFLAGS),;t t
+s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) -c -Tc$$(<:\=/),;t t
+s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -c -Tp$$(<:\=/),;t t
+s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t
+s,@RULE_SUBST@,{.;$$(srcdir);$$(topdir);$$(hdrdir)}%s,;t t
+s,@TRY_LINK@,$$(CC) -Feconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS) -link $$(LDFLAGS) $$(LIBPATH) $$(XLDFLAGS),;t t
+s,@COMMON_LIBS@,coredll winsock,;t t
+s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN,;t t
+s,@COMMON_HEADERS@,winsock.h windows.h,;t t
+s,@EXPORT_PREFIX@, ,;t t
+s,@arch@,$(ARCH)-$(OS),;t t
+s,@sitearch@,$(ARCH)-$(RT),;t t
+s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
+s,@configure_args@,--with-make-prog=nmake --enable-shared $(configure_args),;t t
+s,@configure_input@,$$configure_input,;t t
+s,@srcdir@,$(srcdir),;t t
+s,@top_srcdir@,$(srcdir),;t t
+<<KEEP
+
+$(PROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $*.res
+		$(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) $*.res \
+			-Fe$@ $(LIBRUBYARG) $(LDFLAGS) $(XLDFLAGS)
+
+$(LIBRUBY_A):	$(OBJS) $(DMYEXT)
+		$(AR) $(ARFLAGS)$@ $(OBJS) $(DMYEXT)
+
+$(LIBRUBY):	$(RUBYDEF)
+		$(AR) $(ARFLAGS)$@ -def:$(RUBYDEF)
+
+$(LIBRUBY_SO):	$(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
+		@echo. $(DLDOBJS)
+		@-$(PRE_LIBRUBY_UPDATE)
+		$(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \
+			$(RUBY_SO_NAME).res $(LIBS) -Fe$@ $(LDFLAGS) \
+			$(LIBRUBY_DLDFLAGS)
+
+$(RUBYDEF):	$(LIBRUBY_A) $(PREP)
+		$(MINIRUBY) $(srcdir)/win32/mkexports.rb \
+		  -output=$@ -arch=$(ARCH) $(LIBRUBY_A)
+
+{$(srcdir)/wince}.def.lib:
+		$(AR) $(ARFLAGS)$@ -def:$<
+
+clean-local::
+		@$(RM) ext\extinit.c ext\extinit.$(OBJEXT) ext\vc*.pdb
+		@$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
+
+distclean-local::
+		@$(RM) ext\config.cache $(RBCONFIG:/=\)
+		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
+		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
+
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG)
+		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
+			-ruby_name=$(RUBY_INSTALL_NAME) \
+			-rubyw_name=$(RUBYW_INSTALL_NAME) \
+			-so_name=$(RUBY_SO_NAME) \
+			-wce_ver=$(SUBSYSVERSION) \
+			. $(icondirs) $(srcdir)/wince
+
+fake.rb: $(MKFILES)
+	@echo Creating <<$@
+class Object
+  CROSS_COMPILING = RUBY_PLATFORM
+  remove_const :RUBY_PLATFORM
+  remove_const :RUBY_VERSION
+  RUBY_PLATFORM = "$(ARCH)"
+  RUBY_VERSION = "$(MAJOR).$(MINOR).$(TEENY)"
+end
+class File
+  remove_const :ALT_SEPARATOR
+  ALT_SEPARATOR = "\\"
+end
+<<KEEP
+
+{$(srcdir)/missing}.c.obj:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+{$(srcdir)/win32}.c.obj:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+{$(srcdir)/wince}.c.obj:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+{$(srcdir)/wince/sys}.c.obj:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+{$(srcdir)}.c.obj:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+.c.obj:
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)
+
+.rc.res:
+	$(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)
+
+{$(srcdir)}.y.c:
+	$(YACC) $(YFLAGS) $(<:\=/)
+	sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $@
+	@del y.tab.c
+
+!include $(srcdir)/common.mk
+
+$(OBJS): {$(srcdir)}win32/win32.h
+
+dir.$(OBJEXT): {$(srcdir)}win32/dir.h
+
+ext/extinit.obj: ext/extinit.c $(SETUP)
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fo$@ -c ext/extinit.c
diff --git a/ruby_1_8_6/wince/README.wince b/ruby_1_8_6/wince/README.wince
new file mode 100644
index 0000000000..795dc710e6
--- /dev/null
+++ b/ruby_1_8_6/wince/README.wince
@@ -0,0 +1,121 @@
+=begin
+
+= How to build ruby using eMbedded Visual C++
+
+== Requirement
+
+(1) eMbedded Visual C++ 3.0 or later.
+
+(2) If you want to run `((%nmake clean%))' or `((%nmake distclean%))'
+    properly, you must install UNIX compatible `((%rm%))' command on
+    your ((|PATH|)) if you want to clean after compile.
+
+(3) Please set environment variable (({INCLUDE})), (({LIB})), (({PATH})),
+    (({CE_TOOLS_DIR})), (({EMBEDDED_TOOLS_DIR})) to run required commands
+    properly from the command line.
+
+    Note: building ruby requires following commands.
+     * nmake
+     * clarm or clmips or shcl
+     * lib
+     * dumpbin
+
+== How to compile and install
+
+(1) Execute wince\configure.bat on your build directory.
+    You can specify the target platform as an argument.
+    For example, run `((%configure arm-hpc2k-wince%))'
+
+(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
+    if you want to change the name of the executable files. 
+
+(3) Run `((%nmake%))'
+
+(4) Run `((%nmake DESTDIR=<install_directory> install%))'
+
+    This command will create following directories and copy (not install :-P)
+    files onto them.
+      * <install_directory>\bin
+      * <install_directory>\lib
+      * <install_directory>\lib\ruby
+      * <install_directory>\lib\ruby\<MAJOR>.<MINOR>
+      * <install_directory>\lib\ruby\<MAJOR>.<MINOR>\<PLATFORM>
+      * <install_directory>\lib\ruby\site_ruby
+      * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>
+      * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>\<PLATFORM>
+      * <install_directory>\man\man1
+    If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
+    In case of `mips-hpc2k-wince', The ((|<PLATFORM>|)) is `(({mips-mswince}))'.
+
+(5) Copy <install_directory> to your WindowsCE machine.
+
+== Icons
+
+Any icon files(*.ico) in the build directory, directories specified with
+((|icondirs|)) make variable and (({win32})) directory under the ruby
+source directory will be included in DLL or executable files, according
+to their base names.
+    $(RUBY_INSTALL_NAME).ico or ruby.ico   --> $(RUBY_INSTALL_NAME).exe
+    $(RUBYW_INSTALL_NAME).ico or rubyw.ico --> $(RUBYW_INSTALL_NAME).exe
+    the others                             --> $(RUBY_SO_NAME).dll
+
+Although no icons are distributed with the ruby source or in the official 
+site, you can use anything you like. For example, followings are written 
+in Japanese, but you can download at least.
+
+* ((<URL:http://member.nifty.ne.jp/ueivu/rubyico.html>)) or
+  ((<zipped icons|URL:http://member.nifty.ne.jp/ueivu/Ruby_ico.zip>))
+* ((<URL:http://homepage1.nifty.com/a_nakata/ruby/>)) or
+  ((<icon itself|URL:http://homepage1.nifty.com/a_nakata/ruby/RubyIcon.ico>))
+
+== Build examples
+
+* Build on the ruby source directory.
+
+  ex.)
+    ruby source directory:  C:\ruby
+    build directory:        C:\ruby
+    install directory:      C:\usr\local
+
+    C:
+    cd \ruby
+    win32\configure
+    nmake
+    nmake DESTDIR=/usr/local install
+
+* Build on the relative directory from the ruby source directory.
+
+  ex.)
+    ruby source directory:  C:\ruby
+    build directory:        C:\ruby\mswin32
+    install directory:      C:\usr\local
+
+    C:
+    cd \ruby
+    mkdir mswin32
+    cd mswin32
+    ..\win32\configure
+    nmake
+    nmake DESTDIR=/usr/local install
+
+* Build on the different drive.
+
+  ex.)
+    ruby source directory:  C:\src\ruby
+    build directory:        D:\build\ruby
+    install directory:      C:\usr\local
+
+    D:
+    cd D:\build\ruby
+    C:\src\ruby\win32\configure
+    nmake
+    nmake DESTDIR=C:/usr/local install
+
+== Bugs
+
+You can ((*NOT*)) use a path name contains any white space characters as
+the ruby source directory, this restriction comes from the behavior of
+(({!INCLUDE})) directives of (({NMAKE})).
+((- you may call it a bug. -))
+
+=end
diff --git a/ruby_1_8_6/wince/assert.c b/ruby_1_8_6/wince/assert.c
new file mode 100644
index 0000000000..0f4be68497
--- /dev/null
+++ b/ruby_1_8_6/wince/assert.c
@@ -0,0 +1,11 @@
+#include <windows.h>
+#include <tchar.h>
+#include "assert.h"
+
+
+void assert( int expression )
+{
+	if( expression==0 )
+		exit(2);
+}
+
diff --git a/ruby_1_8_6/wince/assert.h b/ruby_1_8_6/wince/assert.h
new file mode 100644
index 0000000000..c2a4e3ebb7
--- /dev/null
+++ b/ruby_1_8_6/wince/assert.h
@@ -0,0 +1,6 @@
+#ifndef _ASSERT_H_
+#define _ASSERT_H_
+
+void assert( int expression );
+
+#endif
diff --git a/ruby_1_8_6/wince/configure.bat b/ruby_1_8_6/wince/configure.bat
new file mode 100755
index 0000000000..66837bb646
--- /dev/null
+++ b/ruby_1_8_6/wince/configure.bat
@@ -0,0 +1,102 @@
+@echo off

+::: Don't set environment variable in batch file other than autoexec.bat

+::: to avoid "Out of environment space" problem on Windows 95/98.

+::: set TMPMAKE=~tmp~.mak

+

+echo> ~tmp~.mak ####

+echo>> ~tmp~.mak conf = %0

+echo>> ~tmp~.mak $(conf:\=/): nul

+echo>> ~tmp~.mak 	@del ~tmp~.mak

+echo>> ~tmp~.mak 	@-$(MAKE) -l$(MAKEFLAGS) -f $(@D)/setup.mak \

+:loop

+if "%1" == "" goto :end

+if "%1" == "--prefix" goto :prefix

+if "%1" == "--srcdir" goto :srcdir

+if "%1" == "srcdir" goto :srcdir

+if "%1" == "--target" goto :target

+if "%1" == "target" goto :target

+if "%1" == "--with-static-linked-ext" goto :extstatic

+if "%1" == "--program-suffix" goto :suffix

+if "%1" == "--program-name" goto :progname

+if "%1" == "--enable-install-doc" goto :enable-rdoc

+if "%1" == "--disable-install-doc" goto :disable-rdoc

+if "%1" == "--extout" goto :extout

+if "%1" == "-h" goto :help

+if "%1" == "--help" goto :help

+if "%1" == "CC" goto :define

+if "%1" == "EMBEDDED_TOOLS_DIR" goto :define

+if "%1" == "CE_TOOLS_DIR" goto :define

+if "%1" == "EMBEDDED_TOOLS4_DIR" goto :define

+if "%1" == "CE_TOOLS4_DIR" goto :define

+  echo>> ~tmp~.mak 	"%1" \

+  shift

+goto :loop

+:srcdir

+  echo>> ~tmp~.mak 	"srcdir=%2" \

+  shift

+  shift

+goto :loop

+:prefix

+  echo>> ~tmp~.mak 	"prefix=%2" \

+  shift

+  shift

+goto :loop

+:suffix

+  echo>> ~tmp~.mak 	"RUBY_SUFFIX=%2" \

+  shift

+  shift

+goto :loop

+:installname

+  echo>> ~tmp~.mak 	"RUBY_INSTALL_NAME=%2" \

+  shift

+  shift

+goto :loop

+:soname

+  echo>> ~tmp~.mak 	"RUBY_SO_NAME=%2" \

+  shift

+  shift

+goto :loop

+:define

+  echo>> ~tmp~.mak 	"%1=%2" \

+  shift

+  shift

+goto :loop

+:target

+  echo>> ~tmp~.mak 	"%2" \

+  shift

+  shift

+goto :loop

+:extstatic

+  echo>> ~tmp~.mak 	"EXTSTATIC=static" \

+  shift

+goto :loop

+:enable-rdoc

+  echo>> ~tmp~.mak 	"RDOCTARGET=install-doc" \

+  shift

+goto :loop

+:disable-rdoc

+  echo>> ~tmp~.mak 	"RDOCTARGET=install-nodoc" \

+  shift

+goto :loop

+:extout

+  echo>> ~tmp~.mak 	"EXTOUT=%2" \

+  shift

+  shift

+goto :loop

+:help

+  echo Configuration:

+  echo   --help                  display this help

+  echo   --srcdir=DIR            find the sources in DIR [configure dir or `..']

+  echo Installation directories:

+  echo   --prefix=PREFIX         install files in PREFIX (ignored currently)

+  echo System types:

+  echo   --target=TARGET         configure for TARGET [i386-mswin32]

+  echo Optional Package:

+  echo   --with-static-linked-ext link external modules statically

+  echo   --enable-install-doc    install rdoc indexes during install

+  del ~tmp~.mak

+goto :exit

+:end

+echo>> ~tmp~.mak 	WIN32DIR=$(@D)

+nmake -alf ~tmp~.mak

+:exit

diff --git a/ruby_1_8_6/wince/direct.c b/ruby_1_8_6/wince/direct.c
new file mode 100644
index 0000000000..bf0d7cd224
--- /dev/null
+++ b/ruby_1_8_6/wince/direct.c
@@ -0,0 +1,54 @@
+/***************************************************************
+  direct.c
+***************************************************************/
+
+#include <windows.h>
+#include <tchar.h>
+#include <direct.h>
+#include "wince.h" /* for wce_mbtowc */
+
+/* global for chdir, getcwd */
+char _currentdir[MAX_PATH+1];
+
+
+char *getcwd(char* buffer, int maxlen)
+{
+	strcpy( buffer, _currentdir );
+	return buffer;
+}
+
+int _chdir(const char * dirname)
+{
+	if( MAX_PATH < strlen(dirname) )
+		return -1;
+
+	strcpy( _currentdir, dirname );
+	return 0;
+}
+
+int _rmdir(const char * dir)
+{
+	wchar_t *wdir;
+	BOOL rc;
+
+	/* replace with RemoveDirectory. */
+	wdir = wce_mbtowc(dir);
+	rc = RemoveDirectoryW(wdir);
+	free(wdir);
+
+	return rc==TRUE ? 0 : -1;
+}
+
+int _mkdir(const char * dir)
+{
+	wchar_t* wdir;
+	BOOL rc;
+
+	/* replace with CreateDirectory. */
+	wdir = wce_mbtowc(dir);
+	rc = CreateDirectoryW(wdir, NULL);
+	free(wdir);
+
+	return rc==TRUE ? 0 : -1;
+}
+
diff --git a/ruby_1_8_6/wince/direct.h b/ruby_1_8_6/wince/direct.h
new file mode 100644
index 0000000000..7c859b9d3b
--- /dev/null
+++ b/ruby_1_8_6/wince/direct.h
@@ -0,0 +1,22 @@
+#ifndef DIRECT_H
+#define DIRECT_H 1
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char *getcwd(char* buffer, int maxlen);
+int _chdir(const char * dirname);
+int _rmdir(const char * dir);
+int _mkdir(const char * dir);
+
+#ifdef __cplusplus
+};
+#endif
+
+#define chdir      _chdir
+#define rmdir      _rmdir
+#define mkdir      _mkdir
+
+#endif
diff --git a/ruby_1_8_6/wince/errno.c b/ruby_1_8_6/wince/errno.c
new file mode 100644
index 0000000000..705b25428e
--- /dev/null
+++ b/ruby_1_8_6/wince/errno.c
@@ -0,0 +1,11 @@
+/***************************************************************
+  errno.c
+***************************************************************/
+
+#include <errno.h>
+
+
+int errno;
+int _doserrno;
+int _sys_nerr;
+
diff --git a/ruby_1_8_6/wince/errno.h b/ruby_1_8_6/wince/errno.h
new file mode 100644
index 0000000000..2fdd325b32
--- /dev/null
+++ b/ruby_1_8_6/wince/errno.h
@@ -0,0 +1,55 @@
+#ifndef ERRNO_H
+#define ERRNO_H 1
+
+
+#define EPERM           1
+#define ENOENT          2
+#define ESRCH           3
+#define EINTR           4
+#define EIO             5
+#define ENXIO           6
+#define E2BIG           7
+#define ENOEXEC         8
+#define EBADF           9
+#define ECHILD          10
+#define EAGAIN          11
+#define ENOMEM          12
+#define EACCES          13
+#define EFAULT          14
+#define EOSERR          15 // rk
+#define EBUSY           16
+#define EEXIST          17
+#define EXDEV           18
+#define ENODEV          19
+#define ENOTDIR         20
+#define EISDIR          21
+#define EINVAL          22
+#define ENFILE          23
+#define EMFILE          24
+#define ENOTTY          25
+#define EFBIG           27
+#define ENOSPC          28
+#define ESPIPE          29
+#define EROFS           30
+#define EMLINK          31
+#define EPIPE           32
+#define EDOM            33
+#define ERANGE          34
+#define EDEADLK         36
+#define ENOSYS          37
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int errno;
+extern int _doserrno;
+extern int _sys_nerr;
+
+#define sys_nerr _sys_nerr
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif
diff --git a/ruby_1_8_6/wince/fcntl.h b/ruby_1_8_6/wince/fcntl.h
new file mode 100644
index 0000000000..5a6bdc71e6
--- /dev/null
+++ b/ruby_1_8_6/wince/fcntl.h
@@ -0,0 +1,42 @@
+
+#ifndef FCNTL_H
+#define FCNTL_H 1
+
+
+#define F_SETFL         1
+#define F_SETFD         2
+#define F_GETFL         3
+
+#define _O_RDONLY       0x0000  /* open for reading only */
+#define _O_WRONLY       0x0001  /* open for writing only */
+#define _O_RDWR         0x0002  /* open for reading and writing */
+
+#define _O_NONBLOCK     0x0004
+
+#define _O_APPEND       0x0008  /* writes done at eof */
+#define _O_CREAT        0x0100  /* create and open file */
+#define _O_TRUNC        0x0200  /* open and truncate */
+#define _O_EXCL         0x0400  /* open only if file doesn't already exist */
+#define _O_TEXT         0x4000  /* file mode is text (translated) */
+#define _O_BINARY       0x8000  /* file mode is binary (untranslated) */
+#define _O_ACCMODE      0x10000
+
+#define _O_NOINHERIT    0
+#define O_NOINHERIT     _O_NOINHERIT
+
+#define O_RDONLY        _O_RDONLY
+#define O_WRONLY        _O_WRONLY
+#define O_RDWR          _O_RDWR
+
+#define O_NONBLOCK      _O_NONBLOCK
+
+#define O_APPEND        _O_APPEND
+#define O_CREAT         _O_CREAT
+#define O_TRUNC         _O_TRUNC
+#define O_EXCL          _O_EXCL
+#define O_TEXT          _O_TEXT
+#define O_BINARY        _O_BINARY
+#define O_ACCMODE       _O_ACCMODE
+
+
+#endif
diff --git a/ruby_1_8_6/wince/io.h b/ruby_1_8_6/wince/io.h
new file mode 100644
index 0000000000..eb355a4916
--- /dev/null
+++ b/ruby_1_8_6/wince/io.h
@@ -0,0 +1,76 @@
+
+#ifndef _IO_WINCE_H_
+#define _IO_WINCE_H_
+
+#ifndef _TIME_T_DEFINED
+typedef unsigned long time_t;
+#define _TIME_T_DEFINED
+#endif
+
+#ifndef _FSIZE_T_DEFINED
+typedef unsigned long _fsize_t; /* Could be 64 bits for Win32 */
+#define _FSIZE_T_DEFINED
+#endif
+
+#ifndef _FINDDATA_T_DEFINED
+struct _finddata_t {
+        unsigned    attrib;
+        time_t      time_create;    /* -1 for FAT file systems */
+        time_t      time_access;    /* -1 for FAT file systems */
+        time_t      time_write;
+        _fsize_t    size;
+        char        name[260];
+};
+#define _FINDDATA_T_DEFINED
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int _chsize(int handle, long size);
+int _rename (const char *oldname, const char *newname);
+int _unlink(const char *file);
+int _umask(int cmask);
+int _chmod(const char *path, int mode);
+int dup( int handle );
+//int dup2( int handle1, int handle2 );
+int _isatty(int fd);
+int _pipe(int *phandles, unsigned int psize, int textmode);
+int _access(const char *filename, int flags);
+int _open_osfhandle ( long osfhandle, int flags);
+long _get_osfhandle( int filehandle );
+int _open(const char *file, int mode,...);
+int close(int fd);
+int _read(int fd, void *buffer, int length);
+int _write(int fd, const void *buffer, unsigned count);
+long _lseek(int handle, long offset, int origin);
+long _findfirst( char *filespec, struct _finddata_t *fileinfo );
+int _findnext( long handle, struct _finddata_t *fileinfo );
+int _findclose( long handle );
+
+#ifdef __cplusplus
+};
+#endif
+
+#define chmod      _chmod
+#define chsize     _chsize
+#define rename     _rename
+#define unlink	   _unlink
+#define open	   _open
+//#define close	   _close
+#define read	   _read
+#define write	   _write
+#define umask	   _umask
+//#define dup        _dup
+#define isatty	   _isatty
+#define access	   _access
+#define pipe       _pipe
+#define setmode    _setmode
+#define lseek      _lseek
+
+#define _close	   close
+
+#endif
+
diff --git a/ruby_1_8_6/wince/io_wce.c b/ruby_1_8_6/wince/io_wce.c
new file mode 100644
index 0000000000..613934aa66
--- /dev/null
+++ b/ruby_1_8_6/wince/io_wce.c
@@ -0,0 +1,230 @@
+/***************************************************************
+  io.c
+
+  author : uema2
+  date   : Nov 30, 2002
+
+  You can freely use, copy, modify, and redistribute
+  the whole contents.
+***************************************************************/
+
+#include <windows.h>
+#include <stdlib.h>
+#include <io.h>
+#include <fcntl.h>
+#include <time.h>
+#include <errno.h>
+#include "wince.h" /* for wce_mbtowc */
+
+extern int _errno;
+
+
+int _rename(const char *oldname, const char *newname)
+{
+	wchar_t *wold, *wnew;
+	BOOL rc;
+
+	wold = wce_mbtowc(oldname);
+	wnew = wce_mbtowc(newname);
+
+	/* replace with MoveFile. */
+	rc = MoveFileW(wold, wnew);
+
+	free(wold);
+	free(wnew);
+
+	return rc==TRUE ? 0 : -1;
+}
+
+int _unlink(const char *file)
+{
+	wchar_t *wfile;
+	BOOL rc;
+
+	/* replace with DeleteFile. */
+	wfile = wce_mbtowc(file);
+	rc = DeleteFileW(wfile);
+	free(wfile);
+
+	return rc==TRUE ? 0 : -1;
+}
+
+/* replace "open" with "CreateFile", etc. */
+int _open(const char *file, int mode, va_list arg)
+{
+	wchar_t *wfile;
+	DWORD access=0, share=0, create=0;
+	HANDLE h;
+
+	if( (mode&_O_RDWR) != 0 )
+		access = GENERIC_READ|GENERIC_WRITE;
+	else if( (mode&_O_RDONLY) != 0 )
+		access = GENERIC_READ;
+	else if( (mode&_O_WRONLY) != 0 )
+		access = GENERIC_WRITE;
+
+	if( (mode&_O_CREAT) != 0 )
+		create = CREATE_ALWAYS;
+	else
+		create = OPEN_ALWAYS;
+
+	wfile = wce_mbtowc(file);
+
+	h = CreateFileW(wfile, access, share, NULL,
+			create, 0, NULL );
+
+	free(wfile);
+	return (int)h;
+}
+
+int close(int fd)
+{
+	CloseHandle( (HANDLE)fd );
+	return 0;
+}
+
+int _read(int fd, void *buffer, int length)
+{
+	DWORD dw;
+	ReadFile( (HANDLE)fd, buffer, length, &dw, NULL );
+	return (int)dw;
+}
+
+int _write(int fd, const void *buffer, unsigned count)
+{
+	DWORD dw;
+	WriteFile( (HANDLE)fd, buffer, count, &dw, NULL );
+	return (int)dw;
+}
+
+long _lseek(int handle, long offset, int origin)
+{
+	DWORD flag, ret;
+
+	switch(origin)
+	{
+	case SEEK_SET: flag = FILE_BEGIN;   break;
+	case SEEK_CUR: flag = FILE_CURRENT; break;
+	case SEEK_END: flag = FILE_END;     break;
+	default:       flag = FILE_CURRENT; break;
+	}
+
+	ret = SetFilePointer( (HANDLE)handle, offset, NULL, flag );
+	return ret==0xFFFFFFFF ? -1 : 0;
+}
+
+/* _findfirst, _findnext, _findclose. */
+/* replace them with FindFirstFile, etc. */
+long _findfirst( char *file, struct _finddata_t *fi )
+{
+	HANDLE h;
+	WIN32_FIND_DATAA fda;
+
+	h = FindFirstFileA( file, &fda );
+	if( h==NULL )
+	{
+		errno = EINVAL; return -1;
+	}
+
+	fi->attrib      = fda.dwFileAttributes;
+	fi->time_create = wce_FILETIME2time_t( &fda.ftCreationTime );
+	fi->time_access = wce_FILETIME2time_t( &fda.ftLastAccessTime );
+	fi->time_write  = wce_FILETIME2time_t( &fda.ftLastWriteTime );
+	fi->size        = fda.nFileSizeLow + (fda.nFileSizeHigh<<32);
+	strcpy( fi->name, fda.cFileName );
+
+	return (long)h;
+}
+
+int _findnext( long handle, struct _finddata_t *fi )
+{
+	WIN32_FIND_DATAA fda;
+	BOOL b;
+
+	b = FindNextFileA( (HANDLE)handle, &fda );
+
+	if( b==FALSE )
+	{
+		errno = ENOENT; return -1;
+	}
+
+	fi->attrib      = fda.dwFileAttributes;
+	fi->time_create = wce_FILETIME2time_t( &fda.ftCreationTime );
+	fi->time_access = wce_FILETIME2time_t( &fda.ftLastAccessTime );
+	fi->time_write  = wce_FILETIME2time_t( &fda.ftLastWriteTime );
+	fi->size        = fda.nFileSizeLow + (fda.nFileSizeHigh<<32);
+	strcpy( fi->name, fda.cFileName );
+
+	return 0;
+}
+
+int _findclose( long handle )
+{
+	BOOL b;
+	b = FindClose( (HANDLE)handle );
+	return b==FALSE ? -1 : 0;
+}
+
+/* below functions unsupported... */
+/* I have no idea how to replace... */
+int _chsize(int handle, long size)
+{
+	errno = EACCES;
+	return -1;
+}
+
+int _umask(int cmask)
+{
+	return 0;
+}
+
+int _chmod(const char *path, int mode)
+{
+	return 0;
+}
+
+/* WinCE doesn't have dup and dup2.  */
+/* so, we cannot use missing/dup2.c. */
+int dup( int handle )
+{
+	errno = EBADF;
+	return -1;
+}
+/*
+int dup2( int handle1, int handle2 )
+{
+	errno = EBADF;
+	return -1;
+}
+*/
+int _isatty(int fd)
+{
+	if( fd==(int)_fileno(stdin) || 
+		fd==(int)_fileno(stdout)||
+		fd==(int)_fileno(stderr) )
+		return 1;
+	else
+		return 0;
+}
+
+int _pipe(int *phandles, unsigned int psize, int textmode)
+{
+	return -1;
+}
+
+int _access(const char *filename, int flags)
+{
+	return 0;
+}
+
+int _open_osfhandle( long osfhandle, int flags)
+{
+/*	return 0; */
+	return (int)osfhandle;
+}
+
+long _get_osfhandle( int filehandle )
+{
+/*	return 0; */
+	return (long)filehandle;
+}
diff --git a/ruby_1_8_6/wince/mkconfig_wce.rb b/ruby_1_8_6/wince/mkconfig_wce.rb
new file mode 100644
index 0000000000..4d9671cde7
--- /dev/null
+++ b/ruby_1_8_6/wince/mkconfig_wce.rb
@@ -0,0 +1,7 @@
+f = File.open(ARGV[0], File::WRONLY|File::APPEND)
+f.write <<EOM
+class Object
+  remove_const :RUBY_PLATFORM
+  RUBY_PLATFORM = Config::CONFIG[\"RUBY_PLATFORM\"]
+end
+EOM
diff --git a/ruby_1_8_6/wince/mkexports.rb b/ruby_1_8_6/wince/mkexports.rb
new file mode 100644
index 0000000000..8e96649276
--- /dev/null
+++ b/ruby_1_8_6/wince/mkexports.rb
@@ -0,0 +1,35 @@
+#!./miniruby -s
+
+SYM = {}
+
+objs = ARGV.collect {|s| p s+'\n'; s.tr('/', '\\') }
+IO.foreach("|dumpbin -symbols " + objs.join(' ')) do |l|
+  next if /^[0-9A-F]+ 0+ UNDEF / =~ l
+  next unless l.sub!(/.*\sExternal\s+\|\s+/, '')
+  if ARGV[1]=~/sh/
+    if l.sub!(/^_/, '')
+      next if /@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l
+    elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')
+      next
+    end
+  else
+    next if /@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l
+  end
+  SYM[l.strip] = true
+end
+
+
+exports = []
+if $name
+  exports << "Name " + $name
+elsif $library
+  exports << "Library " + $library
+end
+exports << "Description " + $description.dump if $description
+exports << "EXPORTS" << SYM.keys.sort
+
+if $output
+  open($output, 'w') {|f| f.puts exports.join("\n")}
+else
+  puts exports.join("\n")
+end
diff --git a/ruby_1_8_6/wince/process.h b/ruby_1_8_6/wince/process.h
new file mode 100644
index 0000000000..2ef72a4ac1
--- /dev/null
+++ b/ruby_1_8_6/wince/process.h
@@ -0,0 +1,46 @@
+#ifndef PROCESS_H
+#define PROCESS_H 1
+
+
+#define _P_WAIT         0
+#define _P_NOWAIT       1
+#define _P_OVERLAY      2
+#define _P_DETACH       4
+
+#define P_WAIT          _P_WAIT
+#define P_NOWAIT        _P_NOWAIT
+#define P_DETACH        _P_DETACH
+#define P_OVERLAY       _P_OVERLAY
+
+#ifndef _INTPTR_T_DEFINED
+typedef int            intptr_t;
+#define _INTPTR_T_DEFINED
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int _getpid(void);
+
+int _cwait(int *, int, int);
+void abort(void);
+
+int _execl(const char *, const char *, ...);
+//int _execv(const char *, const char * const *);
+int execv(const char *path, char *const argv[]);
+
+intptr_t _spawnle(int, const char *, const char *, ...);
+intptr_t _spawnvpe(int, const char *, const char * const *,
+	      const char * const *);
+
+#ifdef __cplusplus
+};
+#endif
+
+//#define getpid	   _getpid
+#define execl	   _execl
+#define execv	   _execv
+
+
+#endif
diff --git a/ruby_1_8_6/wince/process_wce.c b/ruby_1_8_6/wince/process_wce.c
new file mode 100644
index 0000000000..4415ad024e
--- /dev/null
+++ b/ruby_1_8_6/wince/process_wce.c
@@ -0,0 +1,47 @@
+/***************************************************************
+  process.c
+***************************************************************/
+
+#include <windows.h>
+#include "process.h"
+
+int _getpid(void)
+{
+	return (int)GetCurrentProcessId();
+}
+
+/* I wonder _exec and _swawn should be replaced with CreateProcess... */
+int _execl(const char *cmdname, const char *arg0, 
+		   va_list va_args)
+{
+	return 0;
+}
+
+int execv(const char *path, char *const argv[])
+{
+	return 0;
+}
+
+void abort(void)
+{
+}
+
+int _cwait( int *termstat, int procHandle, int action )
+{
+	return 0;
+}
+
+intptr_t _spawnle(int mode, 
+	const char *cmdname, const char *arg0,
+	va_list va_argn)
+{
+	return 0;
+}
+
+intptr_t _spawnvpe(int mode,
+	const char *cmdname, const char *const *argv,
+	const char *const *envp)
+{
+	return 0;
+}
+
diff --git a/ruby_1_8_6/wince/resource.rb b/ruby_1_8_6/wince/resource.rb
new file mode 100644
index 0000000000..6da6cd017f
--- /dev/null
+++ b/ruby_1_8_6/wince/resource.rb
@@ -0,0 +1,96 @@
+#!./miniruby -sI.
+
+require 'rbconfig'
+
+CONFIG = Config::MAKEFILE_CONFIG
+
+fversion = "#{CONFIG['MAJOR']},#{CONFIG['MINOR']},#{CONFIG['TEENY']},0"
+
+$ruby_name ||= CONFIG["RUBY_INSTALL_NAME"]
+$rubyw_name ||= CONFIG["RUBYW_INSTALL_NAME"] || $ruby_name.sub(/ruby/, '\&w')
+$so_name ||= CONFIG["RUBY_SO_NAME"]
+
+icons = {}
+def icons.find(path)
+  if File.directory?(path)
+    Dir.open(File.expand_path(path)) do |d|
+      d.grep(/\.ico$/i) {|i| self[$`] = i}
+    end
+  else
+    self[File.basename(path, '.ico')] = path
+  end
+  self
+end
+
+if ARGV.empty?
+  icons.find('.')
+else
+  ARGV.each {|i| icons.find(i)}
+end
+
+ruby_icon = rubyw_icon = nil
+[$ruby_name, 'ruby'].each do |i|
+  if i = icons.delete(i)
+    ruby_icon = "1 ICON DISCARDABLE "+i.dump+"\n"
+    break
+  end
+end
+[$rubyw_name, 'rubyw'].each do |i|
+  if i = icons.delete(i)
+    rubyw_icon = "1 ICON DISCARDABLE "+i.dump+"\n"
+    break
+  end
+end
+dll_icons = []
+icons.keys.sort.each do |i|
+  dll_icons << "#{dll_icons.size + 1} ICON DISCARDABLE "+icons[i].dump+"\n"
+end
+
+[ # base name    extension         file type  icons
+  [$ruby_name,   CONFIG["EXEEXT"], 'VFT_APP', ruby_icon],
+  [$rubyw_name,  CONFIG["EXEEXT"], 'VFT_APP', rubyw_icon],
+  [$so_name,     '.dll',           'VFT_DLL', dll_icons],
+].each do |base, ext, type, icons|
+  open(base + '.rc', "w") { |f|
+    f.binmode if /mingw/ =~ RUBY_PLATFORM
+
+    f.print("#include <windows.h>\n")
+    f.print("#include <winver.h>\n") if $wce_ver=="2.11" or $wce_ver=="3.00"
+
+    f.print <<EOF
+
+#{icons}
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION    #{fversion}
+ PRODUCTVERSION #{fversion}
+ FILEFLAGSMASK  0x3fL
+ FILEFLAGS      0x0L
+ FILEOS         VOS__WINDOWS32
+ FILETYPE       #{type}
+ FILESUBTYPE    VFT2_UNKNOWN
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+  BLOCK "000004b0"
+  BEGIN
+   VALUE "FileDescription",  "Ruby interpreter\\0"
+   VALUE "FileVersion",      "#{fversion}\\0"
+   VALUE "Home Page",        "http://www.ruby-lang.org/\\0"
+   VALUE "InternalName",     "#{base + ext}\\0"
+   VALUE "LegalCopyright",   "Copyright (C) 1993-2003 Yukihiro Matsumoto\\0"
+   VALUE "OriginalFilename", "#{base + ext}\\0"
+   VALUE "Platform",         "#{RUBY_PLATFORM}\\0"
+   VALUE "ProductVersion",   "#{fversion}\\0"
+   VALUE "Release Date",     "#{RUBY_RELEASE_DATE}\\0"
+   VALUE "Version",          "#{RUBY_VERSION}\\0"
+  END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+  VALUE "Translation", 0x0, 0x4b0
+ END
+END
+EOF
+  }
+end
+
diff --git a/ruby_1_8_6/wince/setup.mak b/ruby_1_8_6/wince/setup.mak
new file mode 100644
index 0000000000..7b729bf958
--- /dev/null
+++ b/ruby_1_8_6/wince/setup.mak
@@ -0,0 +1,245 @@
+# -*- makefile -*-
+
+!if "$(srcdir)" != ""
+WIN32DIR = $(srcdir)/win32
+!elseif "$(WIN32DIR)" == "win32"
+srcdir = .
+!elseif "$(WIN32DIR)" == "$(WIN32DIR:/win32=)/win32"
+srcdir = $(WIN32DIR:/win32=)
+!else
+srcdir = $(WIN32DIR)/..
+!endif
+!ifndef prefix
+prefix = /usr
+!endif
+OS = mswince
+RT = msvcrt
+INCLUDE = !include
+APPEND = echo>>$(MAKEFILE)
+!ifdef MAKEFILE
+MAKE = $(MAKE) -f $(MAKEFILE)
+!else
+MAKEFILE = Makefile
+!endif
+ARCH = PROCESSOR_ARCHITECTURE
+CPU = PROCESSOR_LEVEL
+CPP = cl -nologo -EP
+
+all: -prologue- -generic- -epilogue-
+i386-$(OS): -prologue- -i386- -epilogue-
+i486-$(OS): -prologue- -i486- -epilogue-
+i586-$(OS): -prologue- -i586- -epilogue-
+i686-$(OS): -prologue- -i686- -epilogue-
+alpha-$(OS): -prologue- -alpha- -epilogue-
+
+# CE
+mips-hpc2k-wince: -prologue- -mips- -hpc2k- -epilogue-
+mips-ppc-wince: -prologue- -mips- -ppc- -epilogue-
+mips-hpcpro-wince: -prologue- -mips- -hpcpro- -epilogue-
+arm-hpc2k-wince: -prologue- -arm- -hpc2k- -epilogue-
+arm-ppc-wince: -prologue- -arm- -ppc- -epilogue-
+arm-hpcpro-wince: -prologue- -arm- -hpcpro- -epilogue-
+sh3-ppc-wince: -prologue- -sh3- -ppc- -epilogue-
+sh3-hpcpro-wince: -prologue- -sh3- -hpcpro- -epilogue-
+sh4-hpcpro-wince: -prologue- -sh4- -hpcpro- -epilogue-
+armv4-.net41-wince: -prologue- -armv4- -.net41- -epilogue-
+armv4t-.net41-wince: -prologue- -armv4t- -.net41- -epilogue-
+armv4i-sig3-wince: -prologue- -armv4i- -sig3- -epilogue-
+
+-prologue-: nul
+	@type << > $(MAKEFILE)
+### Makefile for ruby $(OS) ###
+srcdir = $(srcdir:\=/)
+prefix = $(prefix:\=/)
+EXTSTATIC = $(EXTSTATIC)
+!if defined(RDOCTARGET)
+RDOCTARGET = $(RDOCTARGET)
+!endif
+!if defined(EXTOUT)
+EXTOUT = $(EXTOUT)
+!endif
+<<
+	@$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
+#include "version.h"
+MAJOR = RUBY_VERSION_MAJOR
+MINOR = RUBY_VERSION_MINOR
+TEENY = RUBY_VERSION_TEENY
+MSC_VER = _MSC_VER
+<<
+
+-generic-: nul
+!if defined($(ARCH)) || defined($(CPU))
+	@type << >>$(MAKEFILE)
+!if defined($(ARCH))
+$(ARCH) = $(PROCESSOR_ARCHITECTURE)
+!endif
+!if defined($(CPU))
+$(CPU) = $(PROCESSOR_LEVEL)
+!endif
+
+<<
+!endif
+
+-alpha-: nul
+	@$(APPEND) $(ARCH) = alpha
+-ix86-: nul
+	@$(APPEND) $(ARCH) = x86
+
+-i386-: -ix86-
+	@$(APPEND) $(CPU) = 3
+-i486-: -ix86-
+	@$(APPEND) $(CPU) = 4
+-i586-: -ix86-
+	@$(APPEND) $(CPU) = 5
+-i686-: -ix86-
+	@$(APPEND) $(CPU) = 6
+
+# CE
+-mips- -arm- -sh3- -sh4-::
+	@$(APPEND) $(ARCH) = $(@:-=)
+-mips- -arm-::
+	@$(APPEND) CC = cl$(@:-=)
+-sh3- -sh4-::
+	@$(APPEND) CC = shcl
+-armv4- -armv4i-::
+	@$(APPEND) CC = clarm
+	@$(APPEND) ARCHFOLDER = $(@:-=)
+-armv4t-::
+	@$(APPEND) CC = clthumb
+	@$(APPEND) ARCHFOLDER = $(@:-=)
+
+-arm-::
+	@$(APPEND) CECPUDEF = -DARM -D_ARM_
+-mips-::
+	@$(APPEND) CECPUDEF = -DMIPS -D_MIPS_
+-sh3-::
+	@$(APPEND) CECPUDEF = -DSHx -DSH3 -D_SH3_
+-sh4-::
+	@$(APPEND) CECPUDEF = -DSHx -DSH4 -D_SH4_
+	@$(APPEND) QSH4  = -Qsh4
+-armv4-::
+	@$(APPEND) CECPUDEF = -DARM -D_ARM_ -DARMV4
+	@$(APPEND) $(ARCH) = ARM
+-armv4t- -armv4i-::
+	@$(APPEND) CECPUDEF = -DARM -D_ARM_ -DARMV4T -DTHUMB -D_THUMB_
+	@$(APPEND) $(ARCH) = THUMB
+
+
+-hpc2k-: -hpc2000-
+-ppc-: "-MS Pocket PC-"
+-hpcpro2-: "-MS HPC Pro-"
+-hpcpro-: "-MS HPC Pro--"
+
+-mswin32-:
+	@type << >>$(MAKEFILE)
+OS = mswin32
+RT = msvcrt
+<<
+
+-mswince-:
+	@type << >>$(MAKEFILE)
+!ifdef CE_TOOLS_DIR
+CE_TOOLS_DIR = $(CE_TOOLS_DIR)
+!endif
+!ifdef EMBEDDED_TOOLS_DIR
+EMBEDDED_TOOLS_DIR = $(EMBEDDED_TOOLS_DIR)
+!endif
+
+OS = mswince
+RT = $$(OS)
+<<
+
+-mswince4-:
+	@type << >>$(MAKEFILE)
+!ifdef CE_TOOLS4_DIR
+CE_TOOLS4_DIR = $(CE_TOOLS4_DIR)
+!endif
+!ifdef EMBEDDED_TOOLS4_DIR
+EMBEDDED_TOOLS4_DIR = $(EMBEDDED_TOOLS4_DIR)
+!endif
+
+OS = mswince
+RT = $$(OS)
+<<
+
+
+-mswince-3.00 -mswince-2.11: -mswince-
+	@type << >>$(MAKEFILE)
+SUBSYSVERSION = $(@:-mswince-=)
+PATH = $$(EMBEDDED_TOOLS_DIR)/common/evc/bin;$$(EMBEDDED_TOOLS_DIR)/EVC/WCE$$(SUBSYSVERSION:.=)/bin
+<<
+
+-mswince-4.10: -mswince4-
+	@type << >>$(MAKEFILE)
+SUBSYSVERSION = $(@:-mswince-=)
+EXTLIBS = ws2.lib
+PATH = $$(EMBEDDED_TOOLS4_DIR)/common/evc/bin;$$(EMBEDDED_TOOLS4_DIR)/EVC/WCE$$(SUBSYSVERSION:.=)/bin
+<<
+
+-hpc2000- "-MS Pocket PC-": -mswince-3.00
+"-MS HPC Pro-" "-MS HPC Pro--": -mswince-2.11
+-.net41- -sig3-: -mswince-4.10
+
+-hpc2000-:
+	@type << >>$(MAKEFILE)
+SUBSYSTEM = windowsce,3.0
+INCLUDE = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/$(@:-=)/include
+LIB = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/$(@:-=)/lib/$$(PROCESSOR_ARCHITECTURE)
+<<
+
+"-MS Pocket PC-":
+	@type << >>$(MAKEFILE)
+SUBSYSTEM = windowsce,3.0
+INCLUDE = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/MS Pocket PC/include
+LIB = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/MS Pocket PC/lib/$$(PROCESSOR_ARCHITECTURE)
+<<
+
+
+"-MS HPC Pro--":
+	@type << >>$(MAKEFILE)
+SUBSYSTEM = windowsce,2.11
+INCLUDE = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/MS HPC Pro/include
+LIB = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/MS HPC Pro/lib/$$(PROCESSOR_ARCHITECTURE)
+<<
+
+-.net41-:
+	@type << >>$(MAKEFILE)
+SUBSYSTEM = windowsce,4.1
+INCLUDE = $$(CE_TOOLS4_DIR)/wce400/STANDARDSDK/include/$$(ARCHFOLDER)
+LIB = $$(CE_TOOLS4_DIR)/wce400/STANDARDSDK/lib/$$(ARCHFOLDER)
+<<
+
+-sig3-:
+	@type << >>$(MAKEFILE)
+SUBSYSTEM = windowsce,4.1
+INCLUDE = $$(CE_TOOLS4_DIR)/wce410/sigmarionIII SDK/include/$$(ARCHFOLDER)
+LIB = $$(CE_TOOLS4_DIR)/wce410/sigmarionIII SDK/lib/$$(ARCHFOLDER)
+<<
+
+-epilogue-: nul
+	@type << >>$(MAKEFILE)
+!ifdef RUBY_INSTALL_NAME
+RUBY_INSTALL_NAME = $(RUBY_INSTALL_NAME)
+!else ifdef RUBY_SUFFIX
+RUBY_INSTALL_NAME = ruby$(RUBY_SUFFIX)
+!endif
+!ifdef RUBY_SO_NAME
+RUBY_SO_NAME = $(RUBY_SO_NAME)
+!else
+# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
+!endif
+# CFLAGS = -nologo $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG)
+CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -I$$(srcdir)/wince \
+           $$(CECPUDEF) -DUNDER_CE -D_WIN32_WCE=$$(SUBSYSVERSION:.=) \
+           -DFILENAME_MAX=MAX_PATH -DTLS_OUT_OF_INDEXES=0xFFFFFFFF \
+           -DBUFSIZ=512 -D_UNICODE -DUNICODE $$(QSH4)
+# STACK = 0x10000,0x1000
+# LDFLAGS = $$(CFLAGS) -Fm
+# XLDFLAGS = 
+# RFLAGS = -r
+# EXTLIBS =
+
+$(INCLUDE) $$(srcdir)/wince/Makefile.sub
+<<
+	@$(srcdir:/=\)\win32\rm.bat config.h config.status
+	@echo type `$(MAKE)' to make ruby for $(OS).
diff --git a/ruby_1_8_6/wince/signal.h b/ruby_1_8_6/wince/signal.h
new file mode 100644
index 0000000000..95f857dd88
--- /dev/null
+++ b/ruby_1_8_6/wince/signal.h
@@ -0,0 +1,71 @@
+#ifndef SIGNAL_H
+#define SIGNAL_H 1
+
+#include <sys/types.h>
+
+#define SIGHUP		1
+#define SIGINT      2
+#define SIGQUIT		3
+#define SIGILL      4
+#define SIGPIPE     5
+#define SIGFPE      8
+#define SIGUSR1		10
+#define SIGSEGV     11
+#define SIGUSR2		12
+#define SIGTERM     15
+#define SIGCHLD		17
+#define SIGTSTP		20
+#define SIGBREAK    21
+#define SIGABRT     22
+#define NSIG        22
+
+#define SA_NOCLDSTOP	1
+#define SA_SHIRQ	0x04000000
+#define SA_STACK	0x08000000
+#define SA_RESTART	0x10000000
+#define SA_INTERRUPT	0x20000000
+#define SA_NOMASK	0x40000000
+#define SA_ONESHOT	0x80000000
+
+/* signal action codes */
+
+#define SIG_DFL (void (*)(int))0           /* default signal action */
+#define SIG_IGN (void (*)(int))1           /* ignore signal */
+#define SIG_SGE (void (*)(int))3           /* signal gets error */
+#define SIG_ACK (void (*)(int))4           /* acknowledge */
+#define SIG_ERR (void (*)(int))-1          /* signal error value */
+
+#define SIG_BLOCK          0	/* for blocking signals */
+#define SIG_UNBLOCK        1	/* for unblocking signals */
+#define SIG_SETMASK        2	/* for setting the signal mask */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void (* SIGHANDLER)(int);
+typedef void (* sighandler_t)(int);
+
+typedef int sig_atomic_t;
+typedef unsigned int sigset_t;
+
+struct sigaction{
+	sighandler_t sa_handler;
+	sigset_t sa_mask;
+	unsigned long sa_flags;
+	void (*sa_restorer)(void);
+};
+
+int raise(int sig);
+//#ifndef _WIN32_WCE_EMULATION
+  void (* signal(int sig, void (__cdecl *func)(int)))(int);
+//#else
+//  void (* signal(int sig, void (*func)));
+//#endif
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif
diff --git a/ruby_1_8_6/wince/signal_wce.c b/ruby_1_8_6/wince/signal_wce.c
new file mode 100644
index 0000000000..95f85e0ac8
--- /dev/null
+++ b/ruby_1_8_6/wince/signal_wce.c
@@ -0,0 +1,26 @@
+/***************************************************************
+  signal.c
+***************************************************************/
+
+#include <windows.h>
+#include "signal.h"
+
+/* lazy replacement... (^^; */
+int raise(int sig)
+{
+	return 0;
+}
+
+//#ifdef _WIN32_WCE
+//#ifdef _WIN32_WCE_EMULATION
+//void (* signal(int sig, void (*func)))
+//{
+//	return sig;
+//}
+//#else
+void (* signal(int sig, void (__cdecl *func)(int)))(int)
+{
+	return sig;
+}
+//#endif
+//#endif
diff --git a/ruby_1_8_6/wince/stddef.h b/ruby_1_8_6/wince/stddef.h
new file mode 100644
index 0000000000..227725020e
--- /dev/null
+++ b/ruby_1_8_6/wince/stddef.h
@@ -0,0 +1,5 @@
+
+#ifndef _STDDEF_H_
+#define _STDDEF_H_
+
+#endif
diff --git a/ruby_1_8_6/wince/stdio.c b/ruby_1_8_6/wince/stdio.c
new file mode 100644
index 0000000000..877408d417
--- /dev/null
+++ b/ruby_1_8_6/wince/stdio.c
@@ -0,0 +1,36 @@
+/***************************************************************
+  stdio.c
+***************************************************************/
+
+#include <windows.h>
+#include "wince.h" /* for wce_mbtowc */
+
+
+FILE *freopen(const char *filename, const char *mode, FILE *file)
+{
+	wchar_t *wfilename, *wmode;
+	FILE *fp;
+
+	wfilename = wce_mbtowc(filename);
+	wmode     = wce_mbtowc(mode);
+
+	fp = _wfreopen(wfilename, wmode, file);
+
+	free(wfilename);
+	free(wmode);
+
+	return fp;
+}
+
+FILE *fdopen( int handle, const char *mode )
+{
+	wchar_t *wmode;
+	FILE* fp;
+
+	wmode = wce_mbtowc(mode);
+	fp = _wfdopen( (void*)handle, wmode );
+
+	free(wmode);
+	return fp;
+}
+
diff --git a/ruby_1_8_6/wince/stdlib.c b/ruby_1_8_6/wince/stdlib.c
new file mode 100644
index 0000000000..d371b12f88
--- /dev/null
+++ b/ruby_1_8_6/wince/stdlib.c
@@ -0,0 +1,57 @@
+/***************************************************************
+  stdlib.c
+***************************************************************/
+
+#include <windows.h>
+
+char **environ;
+extern char * rb_w32_getenv(const char *);
+
+/* getenv should replace with rb_w32_getenv. */
+char *getenv(const char *env)
+{
+	return rb_w32_getenv(env);
+}
+
+char *_fullpath(char *absPath, const char *relPath, 
+				size_t maxLength)
+{
+	strcpy( absPath, relPath );
+	return absPath;
+}
+
+int mblen(const char *mbstr, size_t count)
+{
+	const char *p = mbstr;
+	size_t i;
+	int    n=0;
+
+	for( i=0; i<count; i++ )
+	{
+		if( *p=='\0' ) break;
+		if( IsDBCSLeadByteEx( CP_ACP, *p ) )
+			n+=2, p+=2;
+		else
+			n+=1, p+=1;
+	}
+
+	return n;
+}
+
+void *bsearch( const void *key, const void *base,
+			   size_t num, size_t width,
+			   int ( __cdecl *compare )(const void *, const void *))
+{
+	size_t i;
+	const void* p = base;
+	const char* px;
+
+	for( i=0; i<num; i++ )
+	{
+		if( 0==compare( key, p ) )
+			return (void*)p;
+		px = (const char*)p; px+=width; p=(const void*)px;
+	}
+	return NULL;
+}
+
diff --git a/ruby_1_8_6/wince/string_wce.c b/ruby_1_8_6/wince/string_wce.c
new file mode 100644
index 0000000000..257eee101d
--- /dev/null
+++ b/ruby_1_8_6/wince/string_wce.c
@@ -0,0 +1,89 @@
+/***************************************************************
+  string.c
+***************************************************************/
+
+#include <windows.h>
+#include "wince.h" /* for wce_mbtowc */
+
+/* _strdup already exists in stdlib.h? */
+char *strdup(const char * str)
+{
+	char *p;
+
+	p = malloc( strlen(str)+1 );
+	strcpy( p, str );
+	return p;
+}
+
+char* strerror(int errno)
+{
+	static char buf[32]="wince::strerror called.";
+	return buf;
+}
+
+/* strnicmp already exists in stdlib.h? */
+int strnicmp( const char *s1, const char *s2, size_t count )
+{
+	wchar_t *w1, *w2;
+	int n;
+
+	w1 = wce_mbtowc(s1);
+	w2 = wce_mbtowc(s2);
+
+	n = wcsnicmp(w1, w2, count);
+
+	free(w1);
+	free(w2);
+
+	return n;
+}
+
+#if _WIN32_WCE < 300
+#include "..\missing\strtoul.c"
+
+char *strrchr( const char *p, int c )
+{
+	char *pp;
+	for( pp=(char*)p+strlen(p); pp!=p; pp-- )
+	{
+		if( *pp==c ) break;
+	}
+	return pp==p ? NULL : pp;
+}
+
+int stricmp( const char *s1, const char *s2 )
+{
+	wchar_t *w1, *w2;
+	int n;
+
+	w1 = wce_mbtowc(s1);
+	w2 = wce_mbtowc(s2);
+
+	n = wcsicmp(w1, w2);
+
+	free(w1);
+	free(w2);
+
+	return n;
+}
+
+char *strpbrk(const char *str, const char *cs)
+{
+	wchar_t *wstr, *wcs, *w;
+	char *s = NULL;
+
+	wstr = wce_mbtowc(str);
+	wcs  = wce_mbtowc(cs);
+
+	w = wcspbrk(wstr, wcs);
+
+	if( w!=NULL )
+		s = str + (wcs-wstr)/sizeof(wchar_t);
+
+	free(wstr);
+	free(wcs);
+
+	return s;
+}
+
+#endif
diff --git a/ruby_1_8_6/wince/sys/stat.c b/ruby_1_8_6/wince/sys/stat.c
new file mode 100644
index 0000000000..5d51dbf426
--- /dev/null
+++ b/ruby_1_8_6/wince/sys/stat.c
@@ -0,0 +1,102 @@
+/***************************************************************
+  stat.c
+
+  author : uema2
+  date   : Nov 30, 2002
+
+  You can freely use, copy, modify, and redistribute
+  the whole contents.
+***************************************************************/
+
+#include <windows.h>
+#include <sys/stat.h>
+#include <time.h>
+#include "..\wince.h" /* for wce_mbtowc */
+
+
+int _stat(const char *filename, struct _stat *st)
+{
+	DWORD dwAttribute;
+	HANDLE h;
+	DWORD dwSizeLow=0, dwSizeHigh=0, dwError=0;
+	WIN32_FIND_DATAW fd;
+	wchar_t *wfilename;
+
+//	wfilename = wce_mbtowc(filename);
+	wfilename = wce_replaceRelativeDir(filename);
+
+	dwAttribute = GetFileAttributesW(wfilename);
+	if(dwAttribute==0xFFFFFFFF)
+	{
+		free(wfilename);
+		return -1;
+	}
+
+	st->st_mode = 0;
+	if((dwAttribute & FILE_ATTRIBUTE_DIRECTORY) != 0)
+		st->st_mode += S_IFDIR;
+	else
+		st->st_mode += S_IFREG;
+
+	/* initialize */
+	st->st_atime = 0;
+    st->st_mtime = 0;
+    st->st_ctime = 0;
+	st->st_size  = 0;
+	st->st_dev   = 0;
+
+	h = FindFirstFileW(wfilename, &fd);
+	if(h == INVALID_HANDLE_VALUE)
+	{
+		if(wfilename[wcslen(wfilename)-1]	== L'\\')
+		{
+			wfilename[wcslen(wfilename)-1] = L'\0';
+			h = FindFirstFileW(wfilename, &fd);
+			if(h == INVALID_HANDLE_VALUE)
+			{
+				free(wfilename);
+				return 0;
+			}
+		}
+		else
+		{
+			free(wfilename);
+			return 0;
+		}
+	}
+
+	/* FILETIME -> time_t */
+	st->st_atime = wce_FILETIME2time_t(&fd.ftLastAccessTime);
+    st->st_mtime = wce_FILETIME2time_t(&fd.ftLastWriteTime);
+    st->st_ctime = wce_FILETIME2time_t(&fd.ftCreationTime);
+	st->st_size  = fd.nFileSizeLow;
+
+	FindClose( h );
+	free(wfilename);
+	return 0;
+}
+
+int fstat(int file, struct stat *sbuf)
+{
+	/* GetFileSize & GetFileTime */
+	DWORD dwSize;
+	FILETIME ctime, atime, mtime;
+
+	dwSize = GetFileSize( (HANDLE)file, NULL );
+	if( dwSize == 0xFFFFFFFF )
+		return -1;
+
+	sbuf->st_size = dwSize;
+	sbuf->st_dev  = 0;
+	sbuf->st_rdev = 0;
+	sbuf->st_mode = _S_IFREG;
+	sbuf->st_nlink= 1;
+
+	GetFileTime( (HANDLE)file, &ctime, &atime, &mtime );
+	sbuf->st_ctime = wce_FILETIME2time_t(&ctime);
+	sbuf->st_atime = wce_FILETIME2time_t(&atime);
+	sbuf->st_mtime = wce_FILETIME2time_t(&mtime);
+
+	return 0;
+}
+
diff --git a/ruby_1_8_6/wince/sys/stat.h b/ruby_1_8_6/wince/sys/stat.h
new file mode 100644
index 0000000000..e3cdf8b8e7
--- /dev/null
+++ b/ruby_1_8_6/wince/sys/stat.h
@@ -0,0 +1,68 @@
+#ifndef SYS_STAT_H
+#define SYS_STAT_H 1
+
+#include <sys/types.h>
+
+#define _S_IFMT         0170000         /* file type mask */
+#define _S_IFDIR        0040000         /* directory */
+#define _S_IFCHR        0020000         /* character special */
+#define _S_IFIFO        0010000         /* pipe */
+#define _S_IFREG        0100000         /* regular */
+#define _S_IREAD        0000400         /* read permission, owner */
+#define _S_IWRITE       0000200         /* write permission, owner */
+#define _S_IEXEC        0000100         /* execute/search permission, owner */
+
+#define S_IFMT   _S_IFMT
+#define S_IFREG  _S_IFREG
+#define S_IFCHR  _S_IFCHR
+#define S_IFDIR  _S_IFDIR
+#define S_IREAD  _S_IREAD
+#define S_IWRITE _S_IWRITE
+#define S_IEXEC  _S_IEXEC
+
+#ifndef S_ISDIR
+#define S_ISDIR(X) (((X) & S_IFMT) == S_IFDIR)
+#endif
+#ifndef S_ISREG
+#define S_ISREG(X) (((X) & S_IFMT) == S_IFREG)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// in sys/types.h
+//typedef unsigned int _dev_t;
+//typedef long _off_t;
+//typedef unsigned short _ino_t;
+
+#ifndef _STAT_DEFINED
+struct stat 
+{
+  dev_t st_dev;
+  ino_t st_ino;
+  unsigned short st_mode;
+  short st_nlink;
+  short st_uid;
+  short st_gid;
+  dev_t st_rdev;
+  off_t st_size;
+  time_t st_atime;
+  time_t st_mtime;
+  time_t st_ctime;
+};
+#define _STAT_DEFINED
+#endif /* _STAT_DEFINED */
+
+#define _stat stat
+
+int _stat(const char *filename, struct _stat *stat);
+int fstat(int file, struct stat *sbuf);
+
+
+#ifdef __cplusplus
+};
+#endif
+
+
+#endif
diff --git a/ruby_1_8_6/wince/sys/timeb.c b/ruby_1_8_6/wince/sys/timeb.c
new file mode 100644
index 0000000000..838ae0798d
--- /dev/null
+++ b/ruby_1_8_6/wince/sys/timeb.c
@@ -0,0 +1,25 @@
+/***************************************************************
+  timeb.c
+***************************************************************/
+
+#include <windows.h>
+#include <time.h>
+#include <sys/timeb.h>
+
+
+int ftime(struct timeb *tp)
+{
+	SYSTEMTIME s;
+	FILETIME   f;
+
+	GetLocalTime(&s);
+	SystemTimeToFileTime( &s, &f );
+
+	tp->dstflag  = 0;
+	tp->timezone = _timezone/60;
+	tp->time     = wce_FILETIME2time_t(&f);
+	tp->millitm  = s.wMilliseconds;
+
+	return 0;
+}
+
diff --git a/ruby_1_8_6/wince/sys/timeb.h b/ruby_1_8_6/wince/sys/timeb.h
new file mode 100644
index 0000000000..e051b9058c
--- /dev/null
+++ b/ruby_1_8_6/wince/sys/timeb.h
@@ -0,0 +1,26 @@
+#ifndef SYS_TIMEB_H
+#define SYS_TIMEB_H 1
+
+#include <sys/types.h>
+
+struct _timeb {
+	time_t time;
+	unsigned short millitm;
+	short timezone;
+	short dstflag;
+};
+
+#define timeb _timeb
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int ftime(struct timeb *tp);
+
+#ifdef __cplusplus
+};
+#endif
+
+
+#endif
diff --git a/ruby_1_8_6/wince/sys/types.h b/ruby_1_8_6/wince/sys/types.h
new file mode 100644
index 0000000000..541d5e8361
--- /dev/null
+++ b/ruby_1_8_6/wince/sys/types.h
@@ -0,0 +1,60 @@
+#ifndef SYS_TYPES_H
+#define SYS_TYPES_H 1
+
+#define BIG_ENDIAN    1234
+#define LITTLE_ENDIAN 4321
+
+#ifdef MIPS
+#define BYTE_ORDER LITTLE_ENDIAN
+#endif
+
+//#if UNDER_CE > 201
+//  typedef unsigned long time_t;
+//  #define _TIME_T_DEFINED_
+//#endif
+typedef unsigned long dev_t;
+typedef unsigned long ino_t;
+#ifndef _MODE_T_DEFINED_
+  typedef unsigned long mode_t;
+  #define _MODE_T_DEFINED_
+#endif
+
+typedef long clock_t;
+
+#ifndef _PTRDIFF_T_DEFINED
+typedef long ptrdiff_t;
+#define _PTRDIFF_T_DEFINED
+#endif
+
+typedef long off_t;
+
+//typedef unsigned char u_char;
+//typedef unsigned short u_short;
+
+#ifndef _CADDR_T_DEFINED_
+typedef unsigned char * caddr_t;
+#define _CADDR_T_DEFINED_
+#endif
+
+#ifndef _SIZE_T_DEFINED_
+typedef unsigned int size_t;
+#define _SIZE_T_DEFINED_
+#endif
+
+//typedef unsigned char u_int8_t;
+
+//typedef short int16_t;
+//typedef unsigned short u_int16_t;
+
+//typedef int int32_t;
+//typedef unsigned int u_int32_t;
+
+//typedef unsigned long u_long;
+//typedef unsigned int u_int;
+
+//#ifndef _TIME_T_DEFINED_
+//typedef unsigned long time_t;
+//#define _TIME_T_DEFINED_
+//#endif
+
+#endif
diff --git a/ruby_1_8_6/wince/sys/utime.c b/ruby_1_8_6/wince/sys/utime.c
new file mode 100644
index 0000000000..0139c13828
--- /dev/null
+++ b/ruby_1_8_6/wince/sys/utime.c
@@ -0,0 +1,44 @@
+/***************************************************************
+  utime.c
+***************************************************************/
+
+#include <windows.h>
+#include <sys/utime.h>
+#include "..\wince.h" /* for wce_mbtowc */
+
+
+#ifdef _WIN32_WCE
+  #if _WIN32_WCE < 300
+    #define Int32x32To64(a, b) ((LONGLONG)((LONG)(a)) * (LONGLONG)((LONG)(b)))
+/*    #define Int32x32To64(a, b) ((__int64)((LONG)(a)) * (__int64)((LONG)(b))) */
+  #endif
+#endif
+
+int utime(const char *f, struct utimbuf *t)
+{
+	HANDLE h;
+	FILETIME atime={0}, mtime={0};
+	__int64 time64;
+	BOOL rc;
+	wchar_t *w;
+
+	w = wce_mbtowc(f);
+	h = CreateFileW(w, GENERIC_WRITE, 
+			FILE_SHARE_READ|FILE_SHARE_WRITE,
+			NULL, OPEN_EXISTING, 0, 0);
+	free(w);
+
+	if( h==INVALID_HANDLE_VALUE )
+		return -1;
+
+	time64 = Int32x32To64(t->actime, 10000000) + 116444736000000000;
+	atime.dwLowDateTime  = (DWORD)time64;
+	atime.dwHighDateTime = (DWORD)(time64 >> 32);
+	time64 = Int32x32To64(t->modtime, 10000000) + 116444736000000000;
+	mtime.dwLowDateTime  = (DWORD)time64;
+	mtime.dwHighDateTime = (DWORD)(time64 >> 32);
+
+	rc = SetFileTime(h, NULL, &atime, &mtime);
+	return rc==TRUE ? 0 : -1;
+}
+
diff --git a/ruby_1_8_6/wince/sys/utime.h b/ruby_1_8_6/wince/sys/utime.h
new file mode 100644
index 0000000000..b644f02a61
--- /dev/null
+++ b/ruby_1_8_6/wince/sys/utime.h
@@ -0,0 +1,27 @@
+#ifndef SYS_UTIME_H
+#define SYS_UTIME_H 1
+
+#include <time.h>
+
+struct utimbuf 
+{
+  time_t actime;
+  time_t modtime;
+};
+
+#define _utimbuf utimbuf
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int utime(const char *f, struct utimbuf *t);
+
+#ifdef __cplusplus
+};
+#endif
+
+//#define utime _utime
+
+#endif
diff --git a/ruby_1_8_6/wince/time.h b/ruby_1_8_6/wince/time.h
new file mode 100644
index 0000000000..531b2aacfd
--- /dev/null
+++ b/ruby_1_8_6/wince/time.h
@@ -0,0 +1,63 @@
+#ifndef _TIME_WINCE_H
+#define _TIME_WINCE_H 1
+
+#include <winbase.h>
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int daylight;
+extern int _timezone, timezone;
+extern char *tzname[2];
+
+#if 0
+#define _DAY_SEC           (24L * 60L * 60L)    /* secs in a day */
+#define _YEAR_SEC          (365L * _DAY_SEC)    /* secs in a year */
+#define _FOUR_YEAR_SEC     (1461L * _DAY_SEC)   /* secs in a 4 year interval */
+#define _DEC_SEC           315532800L           /* secs in 1970-1979 */
+#define _BASE_YEAR         70L                  /* 1970 is the base year */
+#define _BASE_DOW          4                    /* 01-01-70 was a Thursday */
+#define _LEAP_YEAR_ADJUST  17L                  /* Leap years 1900 - 1970 */
+#define _MAX_YEAR          138L                 /* 2038 is the max year */
+#endif
+
+#ifndef _TM_DEFINED
+struct tm {
+  int tm_sec;     /* seconds after the minute - [0,59] */
+  int tm_min;     /* minutes after the hour - [0,59] */
+  int tm_hour;    /* hours since midnight - [0,23] */
+  int tm_mday;    /* day of the month - [1,31] */
+  int tm_mon;     /* months since January - [0,11] */
+  int tm_year;    /* years since 1900 */
+  int tm_wday;    /* days since Sunday - [0,6] */
+  int tm_yday;    /* days since January 1 - [0,365] */
+  int tm_isdst;   /* daylight savings time flag */
+};
+#define _TM_DEFINED
+#endif
+
+
+typedef struct {
+		int  yr;        // year of interest
+		int  yd;        // day of year 
+		long ms;        // milli-seconds in the day 
+} transitionTime;
+
+time_t mktime(struct tm* pt);
+time_t time( time_t *timer );
+struct tm *localtime(const time_t *ptime);
+struct tm *gmtime(const time_t *tod);
+char* ctime( const time_t *t );
+char* asctime(const struct tm *tptr);
+void tzset();
+int clock(void);
+time_t wce_FILETIME2time_t(const FILETIME* pf);
+
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif
diff --git a/ruby_1_8_6/wince/time_wce.c b/ruby_1_8_6/wince/time_wce.c
new file mode 100644
index 0000000000..ed9b3386bd
--- /dev/null
+++ b/ruby_1_8_6/wince/time_wce.c
@@ -0,0 +1,301 @@
+/***************************************************************
+  time.c
+
+  author : uema2
+  date   : Nov 30, 2002
+
+  You can freely use, copy, modify, and redistribute
+  the whole contents.
+***************************************************************/
+
+/*#define __SCRATCH_TIMEC_DEBUG__ */
+
+#include <windows.h>
+#include <tchar.h>
+#include <time.h>
+
+/* globals */
+const __int64 _onesec_in100ns = (__int64)10000000;
+int   timezone, _timezone, altzone;
+int   daylight;
+char *tzname[2];
+
+
+/* __int64 <--> FILETIME */
+static __int64 wce_FILETIME2int64(FILETIME f)
+{
+	__int64 t;
+
+	t = f.dwHighDateTime;
+	t <<= 32;
+	t |= f.dwLowDateTime;
+	return t;
+}
+
+static FILETIME wce_int642FILETIME(__int64 t)
+{
+	FILETIME f;
+
+	f.dwHighDateTime = (DWORD)((t >> 32) & 0x00000000FFFFFFFF);
+	f.dwLowDateTime  = (DWORD)( t        & 0x00000000FFFFFFFF);
+	return f;
+}
+
+/* FILETIME utility */
+static FILETIME wce_getFILETIMEFromYear(WORD year)
+{
+	SYSTEMTIME s={0};
+	FILETIME f;
+
+	s.wYear      = year;
+	s.wMonth     = 1;
+	s.wDayOfWeek = 1;
+	s.wDay       = 1;
+
+	SystemTimeToFileTime( &s, &f );
+	return f;
+}
+
+static time_t wce_getYdayFromSYSTEMTIME(const SYSTEMTIME* s)
+{
+	__int64 t;
+	FILETIME f1, f2;
+
+	f1 = wce_getFILETIMEFromYear( s->wYear );
+	SystemTimeToFileTime( s, &f2 );
+
+	t = wce_FILETIME2int64(f2)-wce_FILETIME2int64(f1);
+
+	return (time_t)((t/_onesec_in100ns)/(60*60*24));
+}
+
+/* tm <--> SYSTEMTIME */
+static SYSTEMTIME wce_tm2SYSTEMTIME(struct tm *t)
+{
+	SYSTEMTIME s;
+
+	s.wYear      = t->tm_year + 1900;
+	s.wMonth     = t->tm_mon  + 1;
+	s.wDayOfWeek = t->tm_wday;
+	s.wDay       = t->tm_mday;
+	s.wHour      = t->tm_hour;
+	s.wMinute    = t->tm_min;
+	s.wSecond    = t->tm_sec;
+	s.wMilliseconds = 0;
+
+	return s;
+}
+
+static struct tm wce_SYSTEMTIME2tm(SYSTEMTIME *s)
+{
+	struct tm t;
+
+	t.tm_year  = s->wYear - 1900;
+	t.tm_mon   = s->wMonth- 1;
+	t.tm_wday  = s->wDayOfWeek;
+	t.tm_mday  = s->wDay;
+	t.tm_yday  = wce_getYdayFromSYSTEMTIME(s);
+	t.tm_hour  = s->wHour;
+	t.tm_min   = s->wMinute;
+	t.tm_sec   = s->wSecond;
+	t.tm_isdst = 0;
+
+	return t;
+}
+
+/* FILETIME <--> time_t */
+time_t wce_FILETIME2time_t(const FILETIME* f)
+{
+	FILETIME f1601, f1970;
+	__int64 t, offset;
+
+	f1601 = wce_getFILETIMEFromYear(1601);
+	f1970 = wce_getFILETIMEFromYear(1970);
+
+	offset = wce_FILETIME2int64(f1970) - wce_FILETIME2int64(f1601);
+
+	t = wce_FILETIME2int64(*f);
+
+	t -= offset;
+	return (time_t)(t / _onesec_in100ns);
+}
+
+FILETIME wce_time_t2FILETIME(const time_t t)
+{
+	FILETIME f, f1970;
+	__int64 time;
+
+	f1970 = wce_getFILETIMEFromYear(1970);
+
+	time = t;
+	time *= _onesec_in100ns;
+	time += wce_FILETIME2int64(f1970);
+
+	f = wce_int642FILETIME(time);
+
+	return f;
+}
+
+/* time.h difinition */
+time_t time( time_t *timer )
+{
+	SYSTEMTIME s;
+	FILETIME   f;
+
+	if( timer==NULL ) return 0;
+
+	GetSystemTime( &s );
+
+	SystemTimeToFileTime( &s, &f );
+
+	*timer = wce_FILETIME2time_t(&f);
+	return *timer;
+}
+
+struct tm *localtime( const time_t *timer )
+{
+	SYSTEMTIME ss, ls, s;
+	FILETIME   sf, lf, f;
+	__int64 t, diff;
+	static struct tm tms;
+
+	GetSystemTime(&ss);
+	GetLocalTime(&ls);
+
+	SystemTimeToFileTime( &ss, &sf );
+	SystemTimeToFileTime( &ls, &lf );
+
+	diff = wce_FILETIME2int64(sf) - wce_FILETIME2int64(lf);
+
+	f = wce_time_t2FILETIME(*timer);
+	t = wce_FILETIME2int64(f) - diff;
+	f = wce_int642FILETIME(t);
+
+	FileTimeToSystemTime( &f, &s );
+
+	tms = wce_SYSTEMTIME2tm(&s);
+
+	return &tms;
+}
+
+time_t mktime(struct tm* pt)
+{
+	SYSTEMTIME ss, ls, s;
+	FILETIME   sf, lf, f;
+	__int64 diff;
+
+	GetSystemTime(&ss);
+	GetLocalTime(&ls);
+	SystemTimeToFileTime( &ss, &sf );
+	SystemTimeToFileTime( &ls, &lf );
+
+	diff = (wce_FILETIME2int64(lf)-wce_FILETIME2int64(sf))/_onesec_in100ns;
+
+	s = wce_tm2SYSTEMTIME(pt);
+	SystemTimeToFileTime( &s, &f );
+	return wce_FILETIME2time_t(&f) - (time_t)diff;
+}
+
+struct tm *gmtime(const time_t *t)
+{
+	FILETIME f;
+	SYSTEMTIME s;
+	static struct tm tms;
+	
+	f = wce_time_t2FILETIME(*t);
+	FileTimeToSystemTime(&f, &s);
+	tms = wce_SYSTEMTIME2tm(&s);
+	return &tms;
+}
+
+char* ctime( const time_t *t )
+{
+	// Wed Jan 02 02:03:55 1980\n\0
+	static char buf[30]={0};
+	char week[] = "Sun Mon Tue Wed Thr Fri Sat ";
+	char month[]= "Jan Feb Mar Apl May Jun Jul Aug Sep Oct Nov Dec ";
+	struct tm tms;
+
+	tms = *localtime(t);
+
+	strncpy( buf,    week+tms.tm_wday*4, 4 );
+	strncpy( buf+4,  month+tms.tm_mon*4, 4 );
+	sprintf( buf+8,  "%02d ", tms.tm_mday );
+	sprintf( buf+11, "%02d:%02d:%02d %d\n", 
+		tms.tm_hour, tms.tm_min, tms.tm_sec, tms.tm_year+1900 );
+	return buf;
+}
+
+char *asctime(const struct tm *pt)
+{
+	static char buf[30]={0};
+	char week[] = "Sun Mon Tue Wed Thr Fri Sat ";
+	char month[]= "Jan Feb Mar Apl May Jun Jul Aug Sep Oct Nov Dec ";
+
+	strncpy( buf,    week+pt->tm_wday*4, 4 );
+	strncpy( buf+4,  month+pt->tm_mon*4, 4 );
+	sprintf( buf+8,  "%02d ", pt->tm_mday );
+	sprintf( buf+11, "%02d:%02d:%02d %d\n", 
+		pt->tm_hour, pt->tm_min, pt->tm_sec, pt->tm_year+1900 );
+	return buf;
+}
+
+void tzset()
+{
+	daylight = 1;
+	_timezone = 28800;
+	timezone = 28800;
+}
+
+int clock(void)
+{
+	return 1;
+}
+
+//---------------------------------------------------------------
+#ifdef __SCRATCH_TIMEC_DEBUG__
+
+int main()
+{
+	time_t t1, t2;
+	struct tm tm1, tm2;
+
+	time( &t1 );
+	tm1 = *localtime(&t1);
+	t1 = mktime(&tm1);
+	tm1 = *gmtime(&t1);
+
+	_time( &t2 );
+	tm2 = *_localtime(&t2);
+	t2 = _mktime(&tm2);
+	tm2 = *_gmtime(&t2);
+
+	// time, mktime
+	if( t1==t2 )
+		OutputDebugString( "ok\n" );
+	else
+	{
+		static char buf[128];
+		wsprintf( buf, "ng : %d, %d\n", t1, t2 );
+		OutputDebugString( buf );
+	}
+
+	// localtime, gmtime
+	if( 0==memcmp( &tm1, &tm2, sizeof(struct tm) ) )
+		OutputDebugString( "ok\n" );
+	else
+		OutputDebugString( "ng\n" );
+
+	// ctime
+	OutputDebugString( ctime(&t1) );
+	OutputDebugString( _ctime(&t2) );
+
+	// asctime
+	OutputDebugString( asctime(&tm1) );
+	OutputDebugString( _asctime(&tm2) );
+
+	return 0;
+}
+
+#endif
+
diff --git a/ruby_1_8_6/wince/varargs.h b/ruby_1_8_6/wince/varargs.h
new file mode 100644
index 0000000000..2d1d476ccd
--- /dev/null
+++ b/ruby_1_8_6/wince/varargs.h
@@ -0,0 +1,34 @@
+
+#ifndef VARARGS_H
+#define VARARGS_H 1
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#ifndef _VA_LIST_DEFINED
+typedef char *va_list;
+#define _VA_LIST_DEFINED
+#endif
+
+//#ifdef MIPS
+#define va_alist __va_alist, __va_alist2, __va_alist3, __va_alist4
+#define va_dcl int __va_alist, __va_alist2, __va_alist3, __va_alist4;
+#define va_start(list) list = (char *) &__va_alist
+#define va_end(list)
+#define va_arg(list, mode) ((mode *)(list =\
+ (char *) ((((int)list + (__builtin_alignof(mode)<=4?3:7)) &\
+ (__builtin_alignof(mode)<=4?-4:-8))+sizeof(mode))))[-1]
+#else
+#define _INTSIZEOF(n)    ( (sizeof(n) + sizeof(int) - 1) & ~(sizeof(int) - 1) )
+#define va_dcl va_list va_alist;
+#define va_start(ap) ap = (va_list)&va_alist
+#define va_arg(ap,t) ( *(t *)((ap += _INTSIZEOF(t)) - _INTSIZEOF(t)) )
+#define va_end(ap) ap = (va_list)0
+//#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/ruby_1_8_6/wince/wince.c b/ruby_1_8_6/wince/wince.c
new file mode 100644
index 0000000000..c1a950c1c1
--- /dev/null
+++ b/ruby_1_8_6/wince/wince.c
@@ -0,0 +1,583 @@
+/***************************************************************
+  wince.c
+
+  author : uema2
+  date   : Nov 30, 2002
+
+  You can freely use, copy, modify, and redistribute
+  the whole contents.
+***************************************************************/
+
+#include <windows.h>
+#include <tchar.h>
+#include "wince.h"
+
+/* global for GetCommandLineA */
+char *_commandLine;
+
+extern char _currentdir[];
+
+/* make up Win32API except wce_* functions.  */
+
+DWORD GetModuleFileNameA( 
+	HMODULE hModule, LPSTR lpFileName,
+	DWORD size )
+{
+	LPWSTR lpFileNameW;
+	LPSTR  mb;
+	size_t ret;
+
+	if( size==0 ) return 0;
+
+	lpFileNameW = (LPWSTR)malloc( size*sizeof(wchar_t) );
+	ret = GetModuleFileNameW( hModule, lpFileNameW, size );
+	mb = wce_wctomb(lpFileNameW);
+	strcpy(lpFileName, mb);
+	free(mb);
+	free(lpFileNameW);
+
+	return ret;
+}
+
+#if _WIN32_WCE < 300
+FARPROC GetProcAddressA(HMODULE hModule, LPCSTR lpProcName)
+{
+	FARPROC p;
+	LPWSTR  lpwProcName;
+
+	lpwProcName = wce_mbtowc( lpProcName );
+	p = GetProcAddressW( hModule, lpwProcName );
+	free( lpwProcName );
+	return p;
+}
+#endif 
+
+char * GetCommandLineA(void)
+{
+	return _commandLine;
+}
+
+/* this is not Win32API. GetCommandLineA helper. */
+void wce_SetCommandLine(LPCWSTR wcmd)
+{
+	char* acmd;
+
+	acmd = wce_wctomb( wcmd );
+	_commandLine = (char*)malloc( strlen(acmd)+5 );
+	sprintf( _commandLine, "ruby %s", acmd );
+	free(acmd);
+}
+
+/* this is not Win32API. GetCommandLineA helper. */
+void wce_FreeCommandLine(void)
+{
+	free(_commandLine);
+	_commandLine = NULL;
+}
+
+/* I have no idea how to replace this. */
+BOOL GetProcessTimes(HANDLE hprocess,
+	LPFILETIME lpCreationTime, LPFILETIME lpExitTime,
+	LPFILETIME lpKernelTime, LPFILETIME lpUserTime) 
+{
+	return 0;
+}
+
+/* --------------  file attributes functions. ------------------- */
+DWORD GetFileAttributesA(LPCSTR lpFileName)
+{
+	LPWSTR lpwFileName;
+	DWORD dw;
+
+	lpwFileName = wce_mbtowc(lpFileName);
+	dw = GetFileAttributesW(lpwFileName);
+	free(lpwFileName);
+	return dw;
+}
+
+BOOL SetFileAttributesA(
+	LPCSTR lpFileName, DWORD attributes) 
+{
+	LPWSTR lpwFileName;
+	BOOL b;
+
+	lpwFileName = wce_mbtowc(lpFileName);
+	b = SetFileAttributesW(lpwFileName, attributes);
+	free(lpwFileName);
+	return b;
+}
+
+/* ---------------  move and remove functions. ------------------- */
+BOOL MoveFileA(LPCSTR fn1, LPCSTR fn2)
+{
+	LPWSTR wfn1, wfn2;
+	BOOL b;
+
+	wfn1 = wce_mbtowc(fn1);
+	wfn2 = wce_mbtowc(fn2);
+	b = MoveFileW(wfn1, wfn2);
+	free(wfn1);
+	free(wfn2);
+	return 0;
+}
+
+BOOL MoveFileEx(LPCSTR oldname, LPCSTR newname, DWORD dwFlags)
+{
+	LPWSTR woldname, wnewname;
+	BOOL b;
+
+	woldname = wce_mbtowc(oldname);
+	wnewname = wce_mbtowc(newname);
+
+	if( (dwFlags&MOVEFILE_REPLACE_EXISTING)!=0 )
+		DeleteFileW( wnewname );
+
+	b = MoveFileW( woldname, wnewname );
+
+	free(woldname);
+	free(wnewname);
+
+	return b;
+}
+
+BOOL DeleteFileA(LPCSTR path)
+{ 
+	LPWSTR wpath;
+	BOOL b;
+
+	wpath = wce_mbtowc(path);
+	b = DeleteFileW(wpath);
+	free(wpath);
+	return 0;
+}
+
+/* --------------- EnvironmentVariable functions. ----------------- */
+DWORD GetEnvironmentVariable(
+	LPCSTR name, LPSTR value, DWORD size)
+{
+	/* use registry instead of "environment valuable". */
+	HKEY	hk;
+	LONG	lret;
+	LPBYTE	lpData;
+	DWORD	dwType=REG_SZ, cbData;
+	TCHAR   buf[MAX_PATH]={0};
+	LPWSTR  wname;
+	LPSTR   avalue;
+
+	lret = RegOpenKeyEx( HKEY_LOCAL_MACHINE,
+				_T("Software\\ruby_mswince"),
+				0, KEY_QUERY_VALUE, &hk );
+
+	if ( lret != ERROR_SUCCESS )
+	{
+		strcpy( value, "" );
+		return 0;
+	}
+
+	lpData = (LPBYTE)buf;
+	cbData = MAX_PATH*sizeof(*buf);
+	wname  = wce_mbtowc( name );
+
+	lret = RegQueryValueEx( hk, wname,
+		NULL, &dwType, lpData, &cbData );
+	RegCloseKey( hk );
+
+	if ( lret != ERROR_SUCCESS )
+	{
+		strcpy( value, "" );
+		free( wname );
+		return 0;
+	}
+
+	avalue = wce_wctomb( (LPCTSTR)lpData );
+	strcpy( value, avalue );
+	free( avalue );
+	free( wname );
+
+	return strlen(value);
+}
+
+BOOL SetEnvironmentVariable(LPCSTR name, LPCSTR value)
+{
+	/* use registry instead of "environment valuable". */
+	HKEY	hk;
+	LONG	lret;
+	LPBYTE	lpData;
+	DWORD	ret, dwType=REG_SZ, cbData;
+	LPWSTR  wname, wvalue;
+
+	lret = RegCreateKeyEx( HKEY_LOCAL_MACHINE,
+			_T("Software\\ruby_mswince"),
+			0, _T(""), 0,
+			0, NULL, &hk, &ret );
+	if( lret != ERROR_SUCCESS )
+		return FALSE;
+
+	wname  = wce_mbtowc(name);
+	wvalue = wce_mbtowc(value);
+
+	lpData = (LPBYTE)wvalue;
+	cbData = (wcslen(wvalue) + 1) * sizeof(*wvalue);
+	lret = RegSetValueEx( hk, wname,
+		0, dwType, lpData, cbData );
+	RegCloseKey( hk );
+	free(wname);
+	free(wvalue);
+	return lret == ERROR_SUCCESS;
+}
+
+LPVOID GetEnvironmentStrings(VOID)
+{
+	return NULL;
+}
+
+BOOL FreeEnvironmentStrings(LPSTR lpszEnvironmentBlock)
+{
+	return FALSE;
+}
+
+/* DuplicateHandle, LockFile, etc... */
+/* I have no idea...  */
+BOOL GenerateConsoleCtrlEvent(DWORD dwCtrlEvent,
+		DWORD dwProcessGroupID)
+{
+	return 0;
+}
+
+BOOL DuplicateHandle(
+	HANDLE source_process, HANDLE source,
+	HANDLE dest_process, HANDLE *dest,
+	DWORD access, BOOL inherit, DWORD options)
+{
+	return 0;
+}
+
+BOOL LockFile(HANDLE hFile,
+	DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
+	DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh)
+{
+	return FALSE;
+}
+
+BOOL LockFileEx(HANDLE hFile,
+	DWORD dwFlags, DWORD dwReserved,
+	DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh,
+	LPOVERLAPPED lpOverlapped)
+{
+	return FALSE;
+}
+
+BOOL UnlockFile( HFILE hFile,
+	DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
+	DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh)
+{
+	return FALSE;
+}
+
+BOOL UnlockFileEx(HANDLE hFile,
+	DWORD dwReserved, DWORD nNumberOfBytesToUnlockLow,
+	DWORD nNumberOfBytesToUnlockHigh, LPOVERLAPPED lpOverlapped)
+{
+	return FALSE;
+}
+
+/* --------------------- etc, etc, etc... ----------------------- */
+BOOL GetVersionExA(OSVERSIONINFOA *v)
+{
+	OSVERSIONINFOW wv;
+	BOOL b;
+	LPSTR mb;
+
+	b = GetVersionExW(&wv);
+	mb = wce_wctomb(wv.szCSDVersion);
+
+	strcpy( v->szCSDVersion, mb );
+	free(mb);
+	return b;
+}
+
+DWORD WaitForMultipleObjectsEx(DWORD count,
+	const HANDLE *handles, BOOL wait_all,
+	DWORD timeout, BOOL alertable)
+{
+	return WaitForMultipleObjects(
+		count, handles, wait_all,
+		timeout );
+}
+
+BOOL CreateProcessA(LPCSTR appname, LPCSTR commandline,
+	LPSECURITY_ATTRIBUTES att, LPSECURITY_ATTRIBUTES threadatt,
+	BOOL bOpt, DWORD dwFlag, LPVOID lpEnv, LPSTR dir,
+	LPSTARTUPINFO lpsi, LPPROCESS_INFORMATION lppi)
+{
+	LPWSTR wappname, wcommandline, wdir;
+	BOOL b;
+
+	wappname     = wce_mbtowc(appname);
+	wcommandline = wce_mbtowc(commandline);
+	wdir         = wce_mbtowc(dir);
+
+	b = CreateProcessW(wappname, wcommandline,
+			att, threadatt, bOpt, dwFlag, lpEnv,
+			wdir, lpsi, lppi);
+
+	free(wappname);
+	free(wcommandline);
+	free(wdir);
+
+	return b;
+}
+
+HANDLE CreateEventA(SECURITY_ATTRIBUTES *sa, 
+	BOOL manual_reset, BOOL initial_state, LPCSTR name)
+{
+	HANDLE h;
+	LPWSTR wname;
+
+	wname = wce_mbtowc(name);
+	h = CreateEventW(sa, manual_reset,
+		initial_state, wname);
+	free(wname);
+
+	return h;
+}
+
+DWORD FormatMessageA(DWORD dwFlags, LPCVOID lpSource, 
+	DWORD dwMessageId, DWORD dwLanguageId, LPSTR lpBuffer, 
+	DWORD nSize, va_list* args)
+{
+	DWORD dw;
+	LPWSTR lpWBuffer;
+
+	lpWBuffer = wce_mbtowc(lpBuffer);
+	dw = FormatMessageW( dwFlags, lpSource,
+			dwMessageId, dwLanguageId,
+			lpWBuffer, nSize, (va_list*)args );
+	free(lpWBuffer);
+	return dw;
+}
+
+/*---------------- FindFirstFile, FindNextFile ------------------ */
+HANDLE FindFirstFileA(LPCSTR path,
+			WIN32_FIND_DATAA *data)
+{
+	LPWSTR wpath;
+	LPSTR  mb;
+	HANDLE h;
+	WIN32_FIND_DATAW wdata;
+
+	wpath = wce_mbtowc(path);
+	h = FindFirstFileW( wpath, &wdata );
+	free(wpath);
+	
+	mb = wce_wctomb( wdata.cFileName );
+	strcpy( data->cFileName, mb );
+	free(mb);
+
+	return h;
+}
+
+BOOL FindNextFileA(HANDLE handle,
+	WIN32_FIND_DATAA *data)
+{
+	BOOL b;
+	WIN32_FIND_DATAW wdata;
+	LPSTR mb1;
+
+	b = FindNextFileW(handle, &wdata);
+
+	mb1 = wce_wctomb( wdata.cFileName );
+	strcpy( data->cFileName, mb1 );
+	free(mb1);
+
+	return b;
+}
+
+/* CreateFile doesn't support SECURITY_ATTRIBUTES in WinCE. */
+/* it must be NULL. */
+HANDLE CreateFileA(LPCSTR filename, DWORD access,
+	DWORD sharing, LPSECURITY_ATTRIBUTES sa,
+	DWORD creation, DWORD attributes, HANDLE template)
+{
+	LPWSTR wfilename;
+	HANDLE h;
+
+	wfilename = wce_mbtowc(filename);
+	h = CreateFileW(wfilename, access, sharing,
+			NULL, creation, 0, NULL);
+	free(wfilename);
+
+	return 0;
+}
+
+/* ---------------- CharNext, CharPrev. ---------------------*/
+LPSTR CharNextA(LPCSTR a)
+{
+	char *p=(char *)a;
+	if( TRUE==IsDBCSLeadByteEx(CP_ACP, (BYTE)*a) )
+		p+=2;
+	else
+		p++;
+
+	return p;
+}
+
+LPSTR CharPrevA(LPCSTR start, LPCSTR ptr)
+{
+	if( start==ptr ) return (LPSTR)start;
+	else if( start+1==ptr ) return (LPSTR)start;
+	else if( TRUE==IsDBCSLeadByteEx(CP_ACP, (BYTE)*(ptr-2)) )
+		return (LPSTR)(ptr-2);
+	else
+		return (LPSTR)(ptr-1);
+}
+
+/* WinCE doesn't have "drives". */
+DWORD GetLogicalDrives(VOID)
+{
+	return 0;
+}
+
+/* WinCE doesn't have "user name". */
+BOOL GetUserName(LPSTR lpBuffer, LPDWORD nSize)
+{
+	return 0;
+}
+
+/*------------------- LoadLibrary -----------------------*/
+HINSTANCE LoadLibraryA(LPCSTR libname)
+{
+	HINSTANCE h;
+	LPWSTR wlibname;
+
+	// if starts ".\", replace current directory.
+//	wlibname = wce_replaceRelativeDir(libname);
+
+	wlibname = wce_mbtowc(libname);
+	h = LoadLibraryW(wlibname);
+	free(wlibname);
+	return h;
+}
+
+HINSTANCE LoadLibraryExA(LPCSTR lpLibFileName, HANDLE hFile,
+			DWORD dwFlags)
+{
+	HINSTANCE h;
+	LPWSTR wlibname;
+
+	wlibname = wce_mbtowc(lpLibFileName);
+//	wlibname = wce_replaceRelativeDir(lpLibFileName);
+
+#if _WIN32_WCE < 300
+	h = LoadLibraryW(wlibname);
+#else
+	h = LoadLibraryExW(wlibname, hFile, dwFlags);
+#endif
+	free(wlibname);
+	return h;
+}
+
+/* WinCE doesn't have "CreatePipe". */
+BOOL CreatePipe(PHANDLE hReadPipe, PHANDLE hWritePipe,
+	LPSECURITY_ATTRIBUTES lpPipeAttributes, DWORD nSize)
+{
+	return FALSE;
+}
+
+/* WinCE doesn't have "Standard Devices". */
+HANDLE GetStdHandle(DWORD nStdHandle)
+{
+	return NULL;
+}
+
+BOOL SetStdHandle(DWORD nStdHandle, HANDLE h)
+{
+	return FALSE;
+}
+
+#if _WIN32_WCE < 300
+VOID ZeroMemory(PVOID p, DWORD length)
+{
+	memset(p,0,length);
+}
+#endif
+
+
+/* need in ruby/io.c. */
+int ReadDataPending()
+{
+	return 0;
+}
+
+/*---------------- helper functions. ---------------------------- */
+FILE *wce_fopen( const char *fname, const char *mode )
+{
+	TCHAR* tfname = wce_replaceRelativeDir(fname);
+	TCHAR* tmode = wce_mbtowc(mode);
+	FILE* fp = _tfopen(tfname, tmode);
+	free(tfname); free(tmode);
+	return fp;
+}
+
+void wce_SetCurrentDir()
+{
+	WCHAR tbuf[MAX_PATH+1]={0};
+	WCHAR *tp;
+	char *buf;
+
+	GetModuleFileNameW( NULL, tbuf, MAX_PATH );
+	tp = _tcsrchr( tbuf, '\\' );
+	if( tp!=NULL ) *tp=_T('\0');
+	buf = wce_wctomb(tbuf);
+	strcpy( _currentdir, buf );
+	free(buf);
+}
+
+TCHAR *wce_replaceRelativeDir(const char* str)
+{
+	TCHAR *tbuf;
+
+	if( 2<=strlen(str) && str[0]=='.' &&
+		(str[1]=='/' || str[1]=='\\') )
+	{
+		char *buf;
+		int len = strlen(str) + strlen(_currentdir);
+		buf = malloc( len+1 );
+		sprintf(buf, "%s%s", _currentdir, &str[1]);
+		tbuf = wce_mbtowc(buf);
+		free(buf);
+	}
+	else
+		tbuf = wce_mbtowc(str);
+	return tbuf;
+}
+
+/* char -> wchar_t */
+wchar_t* wce_mbtowc(const char* a)
+{
+	int length;
+	wchar_t *wbuf;
+
+	length = MultiByteToWideChar(CP_ACP, 0, 
+		a, -1, NULL, 0);
+	wbuf = (wchar_t*)malloc( (length+1)*sizeof(wchar_t) );
+	MultiByteToWideChar(CP_ACP, 0,
+		a, -1, wbuf, length);
+
+	return wbuf;
+}
+
+/* wchar_t -> char */
+char* wce_wctomb(const wchar_t* w)
+{
+	DWORD charlength;
+	char* pChar;
+
+	charlength = WideCharToMultiByte(CP_ACP, 0, w,
+					-1, NULL, 0, NULL, NULL);
+	pChar = (char*)malloc(charlength+1);
+	WideCharToMultiByte(CP_ACP, 0, w,
+		-1, pChar, charlength, NULL, NULL);
+
+	return pChar;
+}
diff --git a/ruby_1_8_6/wince/wince.h b/ruby_1_8_6/wince/wince.h
new file mode 100644
index 0000000000..7a562f702a
--- /dev/null
+++ b/ruby_1_8_6/wince/wince.h
@@ -0,0 +1,191 @@
+
+#ifndef _EXT_CE_
+#define _EXT_CE_
+
+/* unique difinition in wince platform. */
+
+#ifndef _MIPS_
+  #define CONTEXT_FLOATING_POINT  0x00000002L
+#endif
+
+/* LockFile difinition. */
+#define LOCKFILE_FAIL_IMMEDIATELY   0x00000001
+#define LOCKFILE_EXCLUSIVE_LOCK     0x00000002
+
+/* Dual Mode difinition. */
+#define STARTF_USESHOWWINDOW    0x00000001
+#define STARTF_USESIZE          0x00000002
+#define STARTF_USEPOSITION      0x00000004
+#define STARTF_USECOUNTCHARS    0x00000008
+#define STARTF_USEFILLATTRIBUTE 0x00000010
+#define STARTF_RUNFULLSCREEN    0x00000020
+#define STARTF_FORCEONFEEDBACK  0x00000040
+#define STARTF_FORCEOFFFEEDBACK 0x00000080
+#define STARTF_USESTDHANDLES    0x00000100
+/* #define STARTF_USEHOTKEY        0x00000200 */
+
+#define STD_INPUT_HANDLE    (DWORD)-10
+#define STD_OUTPUT_HANDLE   (DWORD)-11
+#define STD_ERROR_HANDLE    (DWORD)-12
+
+#define NORMAL_PRIORITY_CLASS       0x00000020
+#define IDLE_PRIORITY_CLASS         0x00000040
+#define HIGH_PRIORITY_CLASS         0x00000080
+#define REALTIME_PRIORITY_CLASS     0x00000100
+
+
+/* WINSOCK.H? */
+#define SO_SYNCHRONOUS_NONALERT 0x20
+
+/* MoveFileEx definition. */
+#define MOVEFILE_REPLACE_EXISTING       0x00000001
+/*
+#define MOVEFILE_COPY_ALLOWED           0x00000002
+#define MOVEFILE_DELAY_UNTIL_REBOOT     0x00000004
+#define MOVEFILE_WRITE_THROUGH          0x00000008
+#define MOVEFILE_CREATE_HARDLINK        0x00000010
+#define MOVEFILE_FAIL_IF_NOT_TRACKABLE  0x00000020
+*/
+
+#define _fgetc fgetc
+#define _fputc fputc
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Win32 API redifinition. */
+
+#undef GetCommandLine
+#define GetCommandLine GetCommandLineA
+
+#undef SetFileAttributes
+#define SetFileAttributes SetFileAttributesA
+
+#undef GetFileAttributes
+#define GetFileAttributes GetFileAttributesA
+
+#undef FormatMessage
+#define FormatMessage FormatMessageA
+
+#undef GetModuleFileName
+#define GetModuleFileName GetModuleFileNameA
+
+#undef CreateFile
+#define CreateFile CreateFileA
+
+#undef MoveFile
+#define MoveFile MoveFileA
+
+#undef DeleteFile
+#define DeleteFile DeleteFileA
+
+#undef CreateProcess
+#define CreateProcess CreateProcessA
+
+#undef CharNext
+#define CharNext CharNextA
+
+#undef CharPrev
+#define CharPrev CharPrevA
+
+#undef WIN32_FIND_DATA
+#define WIN32_FIND_DATA WIN32_FIND_DATAA
+
+#undef FindFirstFile
+#define FindFirstFile FindFirstFileA
+
+#undef FindNextFile
+#define FindNextFile FindNextFileA
+
+/* stdio.c */
+FILE *freopen(const char *filename, const char *mode, FILE *file);
+FILE *fdopen( int handle, const char *mode );
+
+//#define fdopen _fdopen
+
+/* stdlib.c */
+char *getenv(const char *charstuff);
+char *_fullpath(char *absPath, const char *relPath, size_t maxLength);
+
+/* string.c */
+char *strdup(const char * str);
+/* char *strerror(int errno); */
+int strnicmp( const char *s1, const char *s2, size_t count );
+
+//#define strnicmp _strnicmp
+#define stricmp _stricmp
+
+/* for win32.c */
+FARPROC GetProcAddressX(HMODULE hModule, LPCSTR lpProcName);
+
+BOOL MoveFileEx(LPCSTR oldname, LPCSTR newname, DWORD dwFlags);
+BOOL DuplicateHandle(
+	HANDLE source_process, HANDLE source,
+	HANDLE dest_process, HANDLE *dest,
+	DWORD access, BOOL inherit, DWORD options);
+BOOL LockFile(HANDLE hFile,
+	DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
+	DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh);
+BOOL LockFileEx(HANDLE hFile,
+	DWORD dwFlags, DWORD dwReserved,
+	DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh,
+	LPOVERLAPPED lpOverlapped);
+BOOL UnlockFile( HFILE hFile,
+	DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
+	DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh);
+BOOL UnlockFileEx(HANDLE hFile,
+	DWORD dwReserved, DWORD nNumberOfBytesToUnlockLow,
+	DWORD nNumberOfBytesToUnlockHigh, LPOVERLAPPED lpOverlapped);
+BOOL GetUserName(LPSTR lpBuffer, LPDWORD nSize);
+BOOL CreatePipe(PHANDLE hReadPipe, PHANDLE hWritePipe,
+	LPSECURITY_ATTRIBUTES lpPipeAttributes, DWORD nSize);
+HANDLE GetStdHandle(DWORD nStdHandle);
+BOOL SetStdHandle(DWORD nStdHandle, HANDLE h);
+DWORD GetLogicalDrives(VOID);
+DWORD WaitForMultipleObjectsEx(DWORD count,
+	const HANDLE *handles, BOOL wait_all,
+	DWORD timeout, BOOL alertable);
+DWORD GetEnvironmentVariable(LPCSTR name, LPSTR value, DWORD size);
+LPVOID GetEnvironmentStrings(VOID);
+BOOL FreeEnvironmentStrings(LPSTR lpszEnvironmentBlock);
+BOOL GenerateConsoleCtrlEvent(DWORD dwCtrlEvent,
+		DWORD dwProcessGroupID);
+BOOL GetProcessTimes(HANDLE hprocess,
+	LPFILETIME lpCreationTime, LPFILETIME lpExitTime,
+	LPFILETIME lpKernelTime, LPFILETIME lpUserTime);
+
+/* char -> wchar_t, wchar_t -> char */
+wchar_t* wce_mbtowc(const char* a);
+char*    wce_wctomb(const wchar_t* w);
+/* other helpers. */
+void wce_SetCommandLine(LPCWSTR wcmd);
+void wce_FreeCommandLine(void);
+TCHAR *wce_replaceRelativeDir(const char* str);
+void wce_SetCurrentDir();
+
+#if _WIN32_WCE < 300
+  /* for Handheld PC Pro. */
+  char *strrchr( const char *p, int c );
+  int stricmp( const char *p1, const char *p2 );
+  VOID ZeroMemory(PVOID p, DWORD length);
+
+  #define isascii(c) ( (c>=0x00&&c<=0x7f)?1:0 )
+  #define isspace(c) ( ((c>=0x09&&c<=0x0d)||c==0x20)?1:0 )
+  #define isdigit(c) ( (c>=0x00&&c<=0x09)?1:0 )
+  #define isupper(c) ( (c>='A'&&c<='Z')?1:0 )
+  #define isalpha(c) ( ((c>='A'&&c<='Z')||(c>='a'&&c<='z'))?1:0 )
+  #define isprint(c) ( (c>=0x20&&c<=0x7e)?1:0 )
+  #define isalnum(c) ( (isalpha(c)||isdigit(c))?1:0 )
+  #define iscntrl(c) ( ((c>=0x00&&c<=0x1f)||c==0x7f)?1:0 )
+  #define islower(c) ( (c>='a'&&c<='z')?1:0 )
+  #define ispunct(c) ( !(isalnum(c)||isspace(c))?1:0 )
+  #define isxdigit(c) ( ((c>=0&&c<=9)||(c>='A'&&c<='F')||(c>='a'&&c<='f'))?1:0 )
+#endif
+
+#ifdef __cplusplus
+};
+#endif
+
+
+#endif /* _EXT_CE_ */
diff --git a/ruby_1_8_6/wince/wincemain.c b/ruby_1_8_6/wince/wincemain.c
new file mode 100644
index 0000000000..fb634a0eea
--- /dev/null
+++ b/ruby_1_8_6/wince/wincemain.c
@@ -0,0 +1,19 @@
+#include <windows.h>
+#include <stdio.h>
+#include "wince.h"
+
+extern int main(int, char**, char**);
+
+
+int WINAPI
+WinMain(HINSTANCE current, HINSTANCE prev, LPWSTR wcmd, int showcmd)
+{
+	/* wchar_t -> char */
+	wce_SetCommandLine(wcmd);
+
+	wce_SetCurrentDir();
+
+	/* main. */
+    return main(0, NULL, NULL);
+}
+
diff --git a/ruby_1_8_6/wince/wincon.h b/ruby_1_8_6/wince/wincon.h
new file mode 100644
index 0000000000..ea50c6ebc6
--- /dev/null
+++ b/ruby_1_8_6/wince/wincon.h
@@ -0,0 +1,7 @@
+
+#ifndef _WINCON_H_
+#define _WINCON_H_
+
+#define CTRL_C_EVENT        0
+
+#endif
diff --git a/ruby_1_8_6/wince/winsock2.c b/ruby_1_8_6/wince/winsock2.c
new file mode 100644
index 0000000000..9b2a5be600
--- /dev/null
+++ b/ruby_1_8_6/wince/winsock2.c
@@ -0,0 +1,338 @@
+/***************************************************************
+  winsock2.c
+***************************************************************/
+
+//#define _WINSOCK2_C_DEBUG_MAIN_
+
+#include <windows.h>
+#include "wince.h"
+#ifdef _WINSOCK2_C_DEBUG_MAIN_
+  #include <winsock.h>
+#endif
+
+#ifndef _WINSOCK2_C_DEBUG_MAIN_
+struct  servent{
+	char*  s_name;     /* official service name */
+	char** s_aliases;  /* alias list */
+	short  s_port;     /* port # */
+	char*  s_proto;    /* protocol to use */
+};
+struct  protoent{
+	char*  p_name;     /* official protocol name */
+	char** p_aliases;  /* alias list */
+	short  p_proto;    /* protocol # */
+};
+#endif
+
+struct sproto{
+	short num;
+	char name[10];
+};
+struct sserv{
+	short num;
+	char protoname[10];
+	char servname[20];
+};
+
+static struct sproto _proto_table[11]={
+	0,  "ip",
+	1,  "icmp",
+	3,  "ggp",
+	6,  "tcp",
+	8,  "egp",
+	12, "pup",
+	17, "udp",
+	20, "hmp",
+	22, "xns-idp",
+	27, "rdp",
+	66, "rvd",
+};
+
+static struct sserv _serv_table[142]={
+	7, "tcp", "echo",
+	7, "udp", "echo",
+	9, "tcp", "discard",
+	9, "udp", "discard",
+	11, "tcp", "systat",
+	11, "udp", "systat",
+	13, "tcp", "daytime",
+	13, "udp", "daytime",
+	15, "tcp", "netstat",
+	17, "tcp", "qotd",
+	17, "udp", "qotd",
+	19, "tcp", "chargen",
+	19, "udp", "chargen",
+	20, "tcp", "ftp-data",
+	21, "tcp", "ftp",
+	23, "tcp", "telnet",
+	25, "tcp", "smtp",
+	37, "tcp", "time",
+	37, "udp", "time",
+	39, "udp", "rlp",
+	42, "tcp", "name",
+	42, "udp", "name",
+	43, "tcp", "whois",
+	53, "tcp", "domain",
+	53, "udp", "domain",
+	53, "tcp", "nameserver",
+	53, "udp", "nameserver",
+	57, "tcp", "mtp",
+	67, "udp", "bootp",
+	69, "udp", "tftp",
+	77, "tcp", "rje",
+	79, "tcp", "finger",
+	87, "tcp", "link",
+	95, "tcp", "supdup",
+	101, "tcp", "hostnames",
+	102, "tcp", "iso-tsap",
+	103, "tcp", "dictionary",
+	103, "tcp", "x400",
+	104, "tcp", "x400-snd",
+	105, "tcp", "csnet-ns",
+	109, "tcp", "pop",
+	109, "tcp", "pop2",
+	110, "tcp", "pop3",
+	111, "tcp", "portmap",
+	111, "udp", "portmap",
+	111, "tcp", "sunrpc",
+	111, "udp", "sunrpc",
+	113, "tcp", "auth",
+	115, "tcp", "sftp",
+	117, "tcp", "path",
+	117, "tcp", "uucp-path",
+	119, "tcp", "nntp",
+	123, "udp", "ntp",
+	137, "udp", "nbname",
+	138, "udp", "nbdatagram",
+	139, "tcp", "nbsession",
+	144, "tcp", "NeWS",
+	153, "tcp", "sgmp",
+	158, "tcp", "tcprepo",
+	161, "tcp", "snmp",
+	162, "tcp", "snmp-trap",
+	170, "tcp", "print-srv",
+	175, "tcp", "vmnet",
+	315, "udp", "load",
+	400, "tcp", "vmnet0",
+	500, "udp", "sytek",
+	512, "udp", "biff",
+	512, "tcp", "exec",
+	513, "tcp", "login",
+	513, "udp", "who",
+	514, "tcp", "shell",
+	514, "udp", "syslog",
+	515, "tcp", "printer",
+	517, "udp", "talk",
+	518, "udp", "ntalk",
+	520, "tcp", "efs",
+	520, "udp", "route",
+	525, "udp", "timed",
+	526, "tcp", "tempo",
+	530, "tcp", "courier",
+	531, "tcp", "conference",
+	531, "udp", "rvd-control",
+	532, "tcp", "netnews",
+	533, "udp", "netwall",
+	540, "tcp", "uucp",
+	543, "tcp", "klogin",
+	544, "tcp", "kshell",
+	550, "udp", "new-rwho",
+	556, "tcp", "remotefs",
+	560, "udp", "rmonitor",
+	561, "udp", "monitor",
+	600, "tcp", "garcon",
+	601, "tcp", "maitrd",
+	602, "tcp", "busboy",
+	700, "udp", "acctmaster",
+	701, "udp", "acctslave",
+	702, "udp", "acct",
+	703, "udp", "acctlogin",
+	704, "udp", "acctprinter",
+	704, "udp", "elcsd",
+	705, "udp", "acctinfo",
+	706, "udp", "acctslave2",
+	707, "udp", "acctdisk",
+	750, "tcp", "kerberos",
+	750, "udp", "kerberos",
+	751, "tcp", "kerberos_master",
+	751, "udp", "kerberos_master",
+	752, "udp", "passwd_server",
+	753, "udp", "userreg_server",
+	754, "tcp", "krb_prop",
+	888, "tcp", "erlogin",
+	1109, "tcp", "kpop",
+	1167, "udp", "phone",
+	1524, "tcp", "ingreslock",
+	1666, "udp", "maze",
+	2049, "udp", "nfs",
+	2053, "tcp", "knetd",
+	2105, "tcp", "eklogin",
+	5555, "tcp", "rmt",
+	5556, "tcp", "mtb",
+	9535, "tcp", "man",
+	9536, "tcp", "w",
+	9537, "tcp", "mantst",
+	10000, "tcp", "bnews",
+	10000, "udp", "rscs0",
+	10001, "tcp", "queue",
+	10001, "udp", "rscs1",
+	10002, "tcp", "poker",
+	10002, "udp", "rscs2",
+	10003, "tcp", "gateway",
+	10003, "udp", "rscs3",
+	10004, "tcp", "remp",
+	10004, "udp", "rscs4",
+	10005, "udp", "rscs5",
+	10006, "udp", "rscs6",
+	10007, "udp", "rscs7",
+	10008, "udp", "rscs8",
+	10009, "udp", "rscs9",
+	10010, "udp", "rscsa",
+	10011, "udp", "rscsb",
+	10012, "tcp", "qmaster",
+	10012, "udp", "qmaster",
+};
+
+/* WinCE doesn't have /etc/protocols. */
+struct protoent* getprotobyname(const char* name)
+{
+	static struct protoent pe;
+	int i;
+	int len = strlen(name);
+
+	memset( &pe, 0, sizeof(struct protoent) );
+
+	for(i=0; i<9; i++)
+	{
+		if( 0==strnicmp(_proto_table[i].name, name, len) )
+		{
+			pe.p_name = _proto_table[i].name;
+			pe.p_proto= _proto_table[i].num;
+			break;
+		}
+	}
+
+	return &pe;
+}
+
+struct protoent* getprotobynumber(int proto)
+{
+	static struct protoent pe={0};
+	int i;
+
+	memset( &pe, 0, sizeof(struct protoent) );
+
+	for(i=0; i<9; i++)
+	{
+		if( proto == _proto_table[i].num )
+		{
+			pe.p_name = _proto_table[i].name;
+			pe.p_proto= _proto_table[i].num;
+			break;
+		}
+	}
+
+	return &pe;
+}
+
+/* WinCE doesn't have /etc/services. */
+struct servent* getservbyname(const char* name,
+                              const char* proto)
+{
+	static struct servent se;
+	int i;
+	int slen = strlen(name), plen = strlen(proto);
+
+	memset( &se, 0, sizeof(struct servent) );
+
+	if( proto==NULL ) return NULL;
+	if( 0!=strnicmp( proto, "tcp", 3 ) &&
+		0!=strnicmp( proto, "udp", 3 ) )
+		return NULL;
+
+	for( i=0; i<142; i++ )
+	{
+		if( 0==strnicmp( name, _serv_table[i].servname, slen ) &&
+			0==strnicmp( proto, _serv_table[i].protoname, plen ) )
+		{
+			char hc, lc;
+			se.s_name = _serv_table[i].servname;
+			se.s_proto= _serv_table[i].protoname;
+			hc = (_serv_table[i].num&0xFF00)>>8;
+			lc = _serv_table[i].num&0xFF;
+			se.s_port = (lc<<8) + hc;
+			break;
+		}
+	}
+
+	return &se;
+}
+
+struct servent* getservbyport(int port, const char* proto)
+{
+	static struct servent se;
+	int i;
+	int plen = strlen(proto);
+	short sport;
+	char  lc, hc;
+
+	hc = (port&0xFF00)>>8;
+	lc = port&0xFF;
+
+	sport = (lc<<8) + hc;
+
+	memset( &se, 0, sizeof(struct servent) );
+
+	if( proto==NULL ) return NULL;
+	if( 0!=strnicmp( proto, "tcp", 3 ) &&
+		0!=strnicmp( proto, "udp", 3 ) )
+		return NULL;
+
+	for( i=0; i<142; i++ )
+	{
+		if( sport == _serv_table[i].num &&
+			0==strnicmp( proto, _serv_table[i].protoname, plen ) )
+		{
+			se.s_name = _serv_table[i].servname;
+			se.s_proto= _serv_table[i].protoname;
+			se.s_port = port;
+			break;
+		}
+	}
+
+	return &se;
+}
+
+
+#ifdef _WINSOCK2_C_DEBUG_MAIN_
+
+int main()
+{
+	WORD wVersionRequested = MAKEWORD(1,1);
+	WSADATA wsaData;
+	int nErrorStatus;
+	struct protoent pe1, pe2;
+	struct servent se1, se2;
+
+	nErrorStatus = WSAStartup(wVersionRequested, &wsaData);
+	if(nErrorStatus != 0)
+		return -1;
+
+	pe1 = *getprotobyname("UDP");
+	pe2 = *_getprotobyname("UDP");
+
+//	pe1 = *getprotobynumber(17);
+//	pe2 = *_getprotobynumber(17);
+
+//	se1 = *getservbyname("gateway", "tcp");
+//	se2 = *_getservbyname("gateway", "tcp");
+
+	se1 = *getservbyport(0x1327, "tcp");
+	se2 = *_getservbyport(0x1327, "tcp");
+
+	WSACleanup();
+
+	return 0;
+}
+
+#endif
diff --git a/ruby_1_8_6/x68/_dtos18.c b/ruby_1_8_6/x68/_dtos18.c
new file mode 100644
index 0000000000..4712a66bf7
--- /dev/null
+++ b/ruby_1_8_6/x68/_dtos18.c
@@ -0,0 +1,250 @@
+/*
+ * PROJECT C Library, X68000 PROGRAMMING INTERFACE DEFINITION
+ * --------------------------------------------------------------------
+ * This file is written by the Project C Library Group,  and completely
+ * in public domain. You can freely use, copy, modify, and redistribute
+ * the whole contents, without this notice.
+ * --------------------------------------------------------------------
+ * $Id$
+ */
+
+/* System headers */
+#include <stdlib.h>
+#include <sys/xstdlib.h>
+
+/*
+** 本関数は浮動小数点を倍精度整数に変換してから文字列にするため、精度的には
+** 倍精度整数に格納できる桁数までしか扱うことができない。したがって最高精度
+** は18桁である。
+*/
+
+/* File scope variables */
+static double _pos1[32] = {
+    1.0e+17,					/* + 0 */
+    1.0e+18,					/* + 1 */
+    1.0e+19,					/* + 2 */
+    1.0e+20,					/* + 3 */
+    1.0e+21,					/* + 4 */
+    1.0e+22,					/* + 5 */
+    1.0e+23,					/* + 6 */
+    1.0e+24,					/* + 7 */
+    1.0e+25,					/* + 8 */
+    1.0e+26,					/* + 9 */
+    1.0e+27,					/* +10 */
+    1.0e+28,					/* +11 */
+    1.0e+29,					/* +12 */
+    1.0e+30,					/* +13 */
+    1.0e+31,					/* +14 */
+    1.0e+32,					/* +15 */
+    1.0e+33,					/* +16 */
+    1.0e+34,					/* +17 */
+    1.0e+35,					/* +18 */
+    1.0e+36,					/* +19 */
+    1.0e+37,					/* +20 */
+    1.0e+38,					/* +21 */
+    1.0e+39,					/* +22 */
+    1.0e+40,					/* +23 */
+    1.0e+41,					/* +24 */
+    1.0e+42,					/* +25 */
+    1.0e+43,					/* +26 */
+    1.0e+44,					/* +27 */
+    1.0e+45,					/* +28 */
+    1.0e+46,					/* +29 */
+    1.0e+47,					/* +30 */
+    1.0e+48,					/* +31 */
+};
+
+/* File scope variables */
+static double _neg1[32] = {
+    1.0e+17,					/* - 0 */
+    1.0e+16,					/* - 1 */
+    1.0e+15,					/* - 2 */
+    1.0e+14,					/* - 3 */
+    1.0e+13,					/* - 4 */
+    1.0e+12,					/* - 5 */
+    1.0e+11,					/* - 6 */
+    1.0e+10,					/* - 7 */
+    1.0e+9,					/* - 8 */
+    1.0e+8,					/* - 9 */
+    1.0e+7,					/* -10 */
+    1.0e+6,					/* -11 */
+    1.0e+5,					/* -12 */
+    1.0e+4,					/* -13 */
+    1.0e+3,					/* -14 */
+    1.0e+2,					/* -15 */
+    1.0e+1,					/* -16 */
+    1.0e+0,					/* -17 */
+    1.0e-1,					/* -18 */
+    1.0e-2,					/* -19 */
+    1.0e-3,					/* -20 */
+    1.0e-4,					/* -21 */
+    1.0e-5,					/* -22 */
+    1.0e-6,					/* -23 */
+    1.0e-7,					/* -24 */
+    1.0e-8,					/* -25 */
+    1.0e-9,					/* -26 */
+    1.0e-10,					/* -27 */
+    1.0e-11,					/* -28 */
+    1.0e-12,					/* -29 */
+    1.0e-13,					/* -30 */
+    1.0e-14,					/* -31 */
+};
+
+/* File scope variables */
+static double _pos2[10] = {
+    1.0e+0,					/* 000 */
+    1.0e+32,					/* 001 */
+    1.0e+64,					/* 010 */
+    1.0e+96,					/* 011 */
+    1.0e+128,					/* 100 */
+    1.0e+160,					/* 101 */
+    1.0e+192,					/* 110 */
+    1.0e+224,					/* 111 */
+    1.0e+256,					/* 1000 */
+    1.0e+288,					/* 1001 */
+};
+
+/* File scope variables */
+static double _neg2[10] = {
+    1.0e-0,					/* 000 */
+    1.0e-32,					/* 001 */
+    1.0e-64,					/* 010 */
+    1.0e-96,					/* 011 */
+    1.0e-128,					/* 100 */
+    1.0e-160,					/* 101 */
+    1.0e-192,					/* 110 */
+    1.0e-224,					/* 111 */
+    1.0e-256,					/* 1000 */
+    1.0e-288,					/* 1001 */
+};
+
+/* File scope functions */
+static int _cmpd (double x, double y)
+{
+    unsigned long vx, vy, rc;
+    unsigned long *x_ptr = (unsigned long *) &x;
+    unsigned long *y_ptr = (unsigned long *) &y;
+
+    /* xの指数ビットを取り出す */
+    vx = x_ptr[0] & 0x7FF00000;
+
+    /* yの指数ビットを取り出す */
+    vy = y_ptr[0] & 0x7FF00000;
+
+    /* 指数ビットだけで判断する */
+    if ((rc = vy - vx) != 0)
+	return rc;
+
+    /* xの有効数字の上位ビットを取り出す */
+    vx = x_ptr[0] & 0x000FFFFF;
+
+    /* yの有効数字の上位ビットを取り出す */
+    vy = y_ptr[0] & 0x000FFFFF;
+
+    /* 上位ビットだけで判断する */
+    if ((rc = vy - vx) != 0)
+	return rc;
+
+    /* xの有効数字の下位ビットを取り出す */
+    vx = x_ptr[1];
+
+    /* yの有効数字の下位ビットを取り出す */
+    vy = y_ptr[1];
+
+    /* 最終判断 */
+    return vy - vx;
+}
+
+/* Functions */
+void _dtos18 (double x, int *decpt, int *sign, char *buffer)
+{
+    short e2;
+    int e, n;
+
+    /* 基数2の指数を求める(バイアスなしの状態) */
+    e2 = (((unsigned short *) &x)[0] & 0x7FF0U) >> 4;
+
+    /* 指数が0の場合は±0.0チェック */
+    if (e2 == 0) {
+
+	unsigned long hi = ((unsigned long *) &x)[0] & 0xFFFFF;
+	unsigned long lo = ((unsigned long *) &x)[1];
+
+	/* 有効数字が全部0かどうか */
+	if (hi == 0 && lo == 0) {
+
+	    /* 文字列を設定 */
+	    buffer[0] = '0';
+
+	    /* NULを設定 */
+	    buffer[1] = '\0';
+
+	    /* 小数点位置を計算 */
+	    *decpt = 1;
+
+	    /* 符号を計算 */
+	    /* *sign = hi & 0x80000000UL; */
+	    *sign = 0;
+
+	    /* 確定 */
+	    return;
+
+	}
+
+    }
+
+    /* 2の指数にバイアスをかけてから10の指数を概算 (approx. log10(2)) */
+    e = ((int) ((e2 - 1023) * 77)) >> 8;
+
+    /* 指数が正の場合 */
+    if (e >= 0) {
+
+	/* 指数が32より小さい場合はテーブル1から */
+	if (e < 32)
+	    x *= _neg1[e];
+
+	/* 指数が32より大きい場合はテーブル1,2から */
+	else
+	    x *= _neg1[e & 31] * _neg2[e >> 5];
+
+    }
+
+    /* 指数が負の場合 */
+    else {
+
+	/* 絶対値を計算 */
+	n = -e;
+
+	/* 絶対値が32より小さい場合はテーブル1から */
+	if (n < 32)
+	    x *= _pos1[n];
+
+	/* 絶対値が32より大きい場合はテーブル1,2から */
+	else {
+	    x *= _pos1[n & 31];
+	    x *= _pos2[n >> 5];
+	}
+
+    }
+
+    /* スケーリングしすぎた場合は戻す */
+    if (_cmpd (1.0e+18, x) >= 0) {
+	e++;
+	x *= 1.0e-1;
+    }
+
+    /* スケーリングし足りない場合は追加 */
+    else if (_cmpd (1.0e+17, x) < 0) {
+	e--;
+	x *= 1.0e+1;
+    }
+
+    /* 小数点位置を計算 */
+    *decpt = e + 1;
+
+    /* 符号を計算 */
+    *sign = ((unsigned char *) &x)[0] & 0x80U;
+
+    /* 文字列に変換 */
+    _ulltoa ((unsigned long long) x, buffer);
+}
diff --git a/ruby_1_8_6/x68/_round.c b/ruby_1_8_6/x68/_round.c
new file mode 100644
index 0000000000..761930fb8c
--- /dev/null
+++ b/ruby_1_8_6/x68/_round.c
@@ -0,0 +1,45 @@
+/*
+ * PROJECT C Library, X68000 PROGRAMMING INTERFACE DEFINITION
+ * --------------------------------------------------------------------
+ * This file is written by the Project C Library Group,  and completely
+ * in public domain. You can freely use, copy, modify, and redistribute
+ * the whole contents, without this notice.
+ * --------------------------------------------------------------------
+ * $Id$
+ */
+/* changed 1997.2.2 by K.Okabe */
+
+/* System headers */
+#include <stdlib.h>
+#include <sys/xstdlib.h>
+
+/* Functions */
+int _round (char *top, char *cur, int undig)
+{
+    char *ptr;
+
+    /* 最後が5未満なら丸めは必要ない */
+    if (undig < '5')
+	return 0;
+
+    /* ポインタ設定 */
+    ptr = cur - 1;
+
+    /* 先頭まで戻りながら丸め処理 */
+    while (ptr >= top) {
+
+	/* 繰り上がらなければそれで終わり */
+	if (++(*ptr) <= '9')
+	    return 0;
+
+	/* その桁を0に戻す */
+	*ptr-- = '0';
+
+    }
+
+    /* 先頭を1にする */
+    *++ptr = '1';
+
+    /* 繰り上がりをしらせる */
+    return 1;
+}
diff --git a/ruby_1_8_6/x68/fconvert.c b/ruby_1_8_6/x68/fconvert.c
new file mode 100644
index 0000000000..9a0bc0e088
--- /dev/null
+++ b/ruby_1_8_6/x68/fconvert.c
@@ -0,0 +1,81 @@
+/*
+ * PROJECT C Library, X68000 PROGRAMMING INTERFACE DEFINITION
+ * --------------------------------------------------------------------
+ * This file is written by the Project C Library Group,  and completely
+ * in public domain. You can freely use, copy, modify, and redistribute
+ * the whole contents, without this notice.
+ * --------------------------------------------------------------------
+ * $Id$
+ */
+/* changed 1997.2.3 by K.Okabe */
+
+/* System headers */
+#include <stdlib.h>
+#include <sys/xstdlib.h>
+
+/* Functions */
+char *fconvert (double x, int ndigit, int *decpt, int *sign, char *buffer)
+{
+    int pos, n;
+    char *src, *dst;
+    char string[24];
+    int figup;
+
+    /* 18桁の文字列に変換 */
+    _dtos18 (x, decpt, sign, string);
+
+    /* コピー元アドレスを設定 */
+    src = string;
+
+    /* コピー先アドレスを設定 */
+    dst = buffer;
+
+    /* 小数点位置を得る */
+    pos = *decpt;
+
+    /* 小数点位置が負なら */
+    if (pos < 0) {
+
+	/* 埋める桁数を計算 */
+	n = min (-pos, ndigit);
+
+	/* 先頭を0で埋める */
+	while (n-- > 0)
+	    *dst++ = '0';
+
+	/* 小数点位置は0になる */
+	*decpt = 0;
+
+    }
+
+    /* 残りのコピー桁数 */
+    n = ndigit + pos;
+
+    /* 格納先にコピー */
+    while (n-- > 0) {
+
+	/* 足りない部分は0で埋める */
+	if (*src == '\0') {
+	    while (n-- >= 0)
+		*dst++ = '0';
+	    break;
+	}
+
+	/* 変換文字列からコピー */
+	*dst++ = *src++;
+
+    }
+
+    /* 丸める */
+    *decpt += (figup = _round (buffer, dst, *src));
+
+    /* 繰り上がりがあれば末尾に0を追加する */
+    if (figup)
+	*dst++ = '0';
+
+    /* 終端に NUL を打つ */
+    *dst = '\0';
+
+    /* アドレスを返す */
+    return buffer;
+}
diff --git a/ruby_1_8_6/x68/select.c b/ruby_1_8_6/x68/select.c
new file mode 100644
index 0000000000..b4bf464032
--- /dev/null
+++ b/ruby_1_8_6/x68/select.c
@@ -0,0 +1,167 @@
+/*
+ * PROJECT C Library, X68000 PROGRAMMING INTERFACE DEFINITION
+ * --------------------------------------------------------------------
+ * This file is written by the Project C Library Group,  and completely
+ * in public domain. You can freely use, copy, modify, and redistribute
+ * the whole contents, without this notice.
+ * --------------------------------------------------------------------
+ * $Id$
+ */
+
+#ifndef __IOCS_INLINE__
+#define __IOCS_INLINE__
+#define __DOS_INLINE__
+#define __DOS_DOSCALL__
+#endif
+
+/* System headers */
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sys/dos.h>
+#include <sys/iocs.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#if 0
+#include <sys/select.h>
+#include <sys/xsocket.h>
+#endif
+#include <sys/xunistd.h>
+
+/* Macros */
+#define XFD_ISSET(fd,fds) ((fds) && FD_ISSET ((fd), (fds)))
+#define isreadable(mode)  ((mode) == O_RDONLY || (mode) == O_RDWR)
+#define iswritable(mode)  ((mode) == O_WRONLY || (mode) == O_RDWR)
+#ifndef _POSIX_FD_SETSIZE
+#define _POSIX_FD_SETSIZE OPEN_MAX
+#endif
+
+/* Functions */
+int
+select (int fds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *timeout)
+{
+  fd_set oread, owrite, oexcept;
+  int ticks, start;
+  int nfds;
+
+  if (fds > _POSIX_FD_SETSIZE)
+    {
+      errno = EINVAL;
+      return -1;
+    }
+
+  FD_ZERO (&oread);
+  FD_ZERO (&owrite);
+  FD_ZERO (&oexcept);
+
+  nfds = 0;
+  ticks = -1;
+
+  if (timeout)
+    {
+      ticks = timeout->tv_sec * 100 + timeout->tv_usec / 10000;
+      if (ticks < 0)
+	{
+	  errno = EINVAL;
+	  return -1;
+	}
+    }
+
+  start = _iocs_ontime ();
+  for (;;)
+    {
+      {
+	int fd;
+	
+	for (fd = 0; fd < fds; fd++)
+	  {
+	    int accmode;
+	    
+	    if (_fddb[fd].inuse == _FD_NOTUSED)
+	      continue;
+	    
+	    accmode = _fddb[fd].oflag & O_ACCMODE;
+	    
+	    if (isatty (fd))
+	      {
+		if (XFD_ISSET (fd, rfds) && isreadable (accmode) && _dos_k_keysns ())
+		  {
+		    FD_SET (fd, &oread);
+		    nfds++;
+		  }
+		
+		if (XFD_ISSET (fd, wfds) && iswritable (accmode))
+		  {
+		    FD_SET (fd, &owrite);
+		    nfds++;
+		  }
+	      }
+#if 0
+	    else if (_fddb[fd].sockno >= 0)
+	      {
+		if (XFD_ISSET (fd, rfds) && _socklen (_fddb[fd].sockno, 0))
+		  {
+		    FD_SET (fd, &oread);
+		    nfds++;
+		  }
+
+		if (XFD_ISSET (fd, wfds) /* && _socklen (_fddb[fd].sockno, 1) == 0 */)
+		  {
+		    FD_SET (fd, &owrite);
+		    nfds++;
+		  }
+	      }
+#endif
+	    else
+	      {
+		if (XFD_ISSET (fd, rfds) && isreadable (accmode) && _dos_ioctrlis (fd))
+		  {
+		    FD_SET (fd, &oread);
+		    nfds++;
+		  }
+		
+		if (XFD_ISSET (fd, wfds) && iswritable (accmode) && _dos_ioctrlos (fd))
+		  {
+		    FD_SET (fd, &owrite);
+		    nfds++;
+		  }
+	      }
+	  }
+      }
+
+      {
+	int rest;
+	
+	if ((rest = (_iocs_ontime () - start) % 8640000) < 0)
+	  rest += 8640000;
+	
+	if (nfds != 0)
+	  {
+	    if (ticks >= 0)
+	      {
+		int left;
+		
+		if ((left = ticks - rest) < 0)
+		  left = 0;
+		
+		timeout->tv_sec = left / 100;
+		timeout->tv_usec = (left % 100) * 10000;
+	      }
+	    
+	    if (rfds)
+	      *rfds = oread;
+	    if (wfds)
+	      *wfds = owrite;
+	    if (efds)
+	      *efds = oexcept;
+	    
+	    return nfds;
+	  }
+	
+	if (ticks >= 0 && rest > ticks)
+	  return 0;
+      }
+
+      _dos_change_pr ();
+    }
+}